diff --git a/asm/nonmatchings/code_317E50/func_802BD758.s b/asm/nonmatchings/code_317E50/func_802BD758.s index b815d5c631..66429a51fa 100644 --- a/asm/nonmatchings/code_317E50/func_802BD758.s +++ b/asm/nonmatchings/code_317E50/func_802BD758.s @@ -546,7 +546,7 @@ glabel func_802BD758 /* 318C8C 802BDF3C E6800020 */ swc1 $f0, 0x20($s4) /* 318C90 802BDF40 C6200040 */ lwc1 $f0, 0x40($s1) /* 318C94 802BDF44 0220202D */ daddu $a0, $s1, $zero -/* 318C98 802BDF48 0C0AF440 */ jal func_802BD100_317E50 +/* 318C98 802BDF48 0C0AF440 */ jal func_802BD100 /* 318C9C 802BDF4C E6800024 */ swc1 $f0, 0x24($s4) /* 318CA0 802BDF50 24020001 */ addiu $v0, $zero, 1 /* 318CA4 802BDF54 3C01802C */ lui $at, 0x802c diff --git a/asm/nonmatchings/code_31B120/func_802BD638.s b/asm/nonmatchings/code_31B120/func_802BD638.s index 121bbe4076..f1ee71ce5c 100644 --- a/asm/nonmatchings/code_31B120/func_802BD638.s +++ b/asm/nonmatchings/code_31B120/func_802BD638.s @@ -514,7 +514,7 @@ glabel func_802BD638 /* 31BE10 802BDDF0 10400027 */ beqz $v0, .L802BDE90 /* 31BE14 802BDDF4 34048000 */ ori $a0, $zero, 0x8000 .L802BDDF8: -/* 31BE18 802BDDF8 0C0AF440 */ jal func_802BD100_31B120 +/* 31BE18 802BDDF8 0C0AF440 */ jal func_802BD100 /* 31BE1C 802BDDFC 0200202D */ daddu $a0, $s0, $zero /* 31BE20 802BDE00 14400004 */ bnez $v0, .L802BDE14 /* 31BE24 802BDE04 2404010C */ addiu $a0, $zero, 0x10c diff --git a/asm/nonmatchings/code_31CC70/func_802BD2B4.s b/asm/nonmatchings/code_31CC70/func_802BD2B4.s index 7248b91393..5114701ac9 100644 --- a/asm/nonmatchings/code_31CC70/func_802BD2B4.s +++ b/asm/nonmatchings/code_31CC70/func_802BD2B4.s @@ -34,7 +34,7 @@ glabel func_802BD2B4 /* 31CE94 802BD324 24420001 */ addiu $v0, $v0, 1 /* 31CE98 802BD328 16400026 */ bnez $s2, .L802BD3C4 /* 31CE9C 802BD32C AE02030C */ sw $v0, 0x30c($s0) -/* 31CEA0 802BD330 0C0AF440 */ jal func_802BD100_31CC70 +/* 31CEA0 802BD330 0C0AF440 */ jal func_802BD100 /* 31CEA4 802BD334 0220202D */ daddu $a0, $s1, $zero /* 31CEA8 802BD338 0C03B52E */ jal update_player_move_history /* 31CEAC 802BD33C 0220202D */ daddu $a0, $s1, $zero diff --git a/asm/nonmatchings/code_31CC70/func_802BDD0C.s b/asm/nonmatchings/code_31CC70/func_802BDD0C.s index ceaa6d3d1f..f1dd8e1757 100644 --- a/asm/nonmatchings/code_31CC70/func_802BDD0C.s +++ b/asm/nonmatchings/code_31CC70/func_802BDD0C.s @@ -13,7 +13,7 @@ glabel func_802BDD0C /* 31D89C 802BDD2C AFB00010 */ sw $s0, 0x10($sp) /* 31D8A0 802BDD30 10A00011 */ beqz $a1, .L802BDD78 /* 31D8A4 802BDD34 8C90014C */ lw $s0, 0x14c($a0) -/* 31D8A8 802BDD38 0C0AF460 */ jal func_802BD180_31CC70 +/* 31D8A8 802BDD38 0C0AF460 */ jal func_802BD180 /* 31D8AC 802BDD3C 00000000 */ nop /* 31D8B0 802BDD40 0C03BA65 */ jal func_800EE994 /* 31D8B4 802BDD44 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_31CC70/func_802BDD9C.s b/asm/nonmatchings/code_31CC70/func_802BDD9C.s index 6029feaccd..8ba983b649 100644 --- a/asm/nonmatchings/code_31CC70/func_802BDD9C.s +++ b/asm/nonmatchings/code_31CC70/func_802BDD9C.s @@ -28,7 +28,7 @@ glabel func_802BDD9C /* 31D964 802BDDF4 0C03BD17 */ jal clear_partner_move_history /* 31D968 802BDDF8 A0C20001 */ sb $v0, 1($a2) .L802BDDFC: -/* 31D96C 802BDDFC 0C0AF460 */ jal func_802BD180_31CC70 +/* 31D96C 802BDDFC 0C0AF460 */ jal func_802BD180 /* 31D970 802BDE00 00000000 */ nop /* 31D974 802BDE04 8FBF0010 */ lw $ra, 0x10($sp) /* 31D978 802BDE08 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_31CC70/func_802BDE10.s b/asm/nonmatchings/code_31CC70/func_802BDE10.s index 24ebece388..9c813fa9f9 100644 --- a/asm/nonmatchings/code_31CC70/func_802BDE10.s +++ b/asm/nonmatchings/code_31CC70/func_802BDE10.s @@ -27,7 +27,7 @@ glabel func_802BDE10 /* 31D9D4 802BDE64 24630010 */ addiu $v1, $v1, 0x10 /* 31D9D8 802BDE68 0C03ACC5 */ jal partner_use_ability /* 31D9DC 802BDE6C 00000000 */ nop -/* 31D9E0 802BDE70 0C0AF440 */ jal func_802BD100_31CC70 +/* 31D9E0 802BDE70 0C0AF440 */ jal func_802BD100 /* 31D9E4 802BDE74 0200202D */ daddu $a0, $s0, $zero .L802BDE78: /* 31D9E8 802BDE78 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_31CC70/func_802BDE88.s b/asm/nonmatchings/code_31CC70/func_802BDE88.s index ccb89a94dd..d5fcc39033 100644 --- a/asm/nonmatchings/code_31CC70/func_802BDE88.s +++ b/asm/nonmatchings/code_31CC70/func_802BDE88.s @@ -34,12 +34,12 @@ glabel func_802BDE88 /* 31DA64 802BDEF4 00000000 */ nop /* 31DA68 802BDEF8 0C03ADF3 */ jal partner_kill_ability_script /* 31DA6C 802BDEFC 00000000 */ nop -/* 31DA70 802BDF00 0C0AF460 */ jal func_802BD180_31CC70 +/* 31DA70 802BDF00 0C0AF460 */ jal func_802BD180 /* 31DA74 802BDF04 00000000 */ nop /* 31DA78 802BDF08 080AF7C6 */ j .L802BDF18 /* 31DA7C 802BDF0C 00000000 */ nop .L802BDF10: -/* 31DA80 802BDF10 0C0AF440 */ jal func_802BD100_31CC70 +/* 31DA80 802BDF10 0C0AF440 */ jal func_802BD100 /* 31DA84 802BDF14 0240202D */ daddu $a0, $s2, $zero .L802BDF18: /* 31DA88 802BDF18 C6220088 */ lwc1 $f2, 0x88($s1) diff --git a/asm/nonmatchings/code_31DE70/func_802BE3A4.s b/asm/nonmatchings/code_31DE70/func_802BE3A4.s index 43cf91cf3e..29495b12e1 100644 --- a/asm/nonmatchings/code_31DE70/func_802BE3A4.s +++ b/asm/nonmatchings/code_31DE70/func_802BE3A4.s @@ -591,7 +591,7 @@ glabel func_802BE3A4 /* 31FA08 802BEC98 00431024 */ and $v0, $v0, $v1 /* 31FA0C 802BEC9C 14400003 */ bnez $v0, .L802BECAC /* 31FA10 802BECA0 00000000 */ nop -/* 31FA14 802BECA4 0C0AF440 */ jal func_802BD100_31DE70 +/* 31FA14 802BECA4 0C0AF440 */ jal func_802BD100 /* 31FA18 802BECA8 00000000 */ nop .L802BECAC: /* 31FA1C 802BECAC 3C06802C */ lui $a2, 0x802c diff --git a/asm/nonmatchings/code_31DE70/func_802BFAB8.s b/asm/nonmatchings/code_31DE70/func_802BFAB8.s index f068b2dc5b..e3d07bbcd4 100644 --- a/asm/nonmatchings/code_31DE70/func_802BFAB8.s +++ b/asm/nonmatchings/code_31DE70/func_802BFAB8.s @@ -145,7 +145,7 @@ glabel func_802BFAB8 /* 320A40 802BFCD0 8E26000C */ lw $a2, 0xc($s1) /* 320A44 802BFCD4 0C00EA95 */ jal npc_move_heading /* 320A48 802BFCD8 0220202D */ daddu $a0, $s1, $zero -/* 320A4C 802BFCDC 0C0AF440 */ jal func_802BD100_31DE70 +/* 320A4C 802BFCDC 0C0AF440 */ jal func_802BD100 /* 320A50 802BFCE0 00000000 */ nop /* 320A54 802BFCE4 8E620074 */ lw $v0, 0x74($s3) /* 320A58 802BFCE8 30420003 */ andi $v0, $v0, 3 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s index 9c32135208..f27aaa6848 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s @@ -26,8 +26,8 @@ glabel func_8013A37C /* D0ACC 8013A3CC 2484F800 */ addiu $a0, $a0, -0x800 /* D0AD0 8013A3D0 0C00A41B */ jal _heap_malloc /* D0AD4 8013A3D4 24052B98 */ addiu $a1, $zero, 0x2b98 -/* D0AD8 8013A3D8 3C038015 */ lui $v1, 0x8015 -/* D0ADC 8013A3DC 24636954 */ addiu $v1, $v1, 0x6954 +/* D0AD8 8013A3D8 3C038015 */ lui $v1, %hi(D_80156954) +/* D0ADC 8013A3DC 24636954 */ addiu $v1, $v1, %lo(D_80156954) /* D0AE0 8013A3E0 AC620000 */ sw $v0, ($v1) /* D0AE4 8013A3E4 0000882D */ daddu $s1, $zero, $zero /* D0AE8 8013A3E8 0060902D */ daddu $s2, $v1, $zero diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s index 54d4c40ee4..598312c593 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s @@ -6,8 +6,8 @@ glabel func_8013A4D0 /* D0BD4 8013A4D4 8C4241F4 */ lw $v0, 0x41f4($v0) /* D0BD8 8013A4D8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* D0BDC 8013A4DC AFB00010 */ sw $s0, 0x10($sp) -/* D0BE0 8013A4E0 3C108015 */ lui $s0, 0x8015 -/* D0BE4 8013A4E4 26106954 */ addiu $s0, $s0, 0x6954 +/* D0BE0 8013A4E0 3C108015 */ lui $s0, %hi(D_80156954) +/* D0BE4 8013A4E4 26106954 */ addiu $s0, $s0, %lo(D_80156954) /* D0BE8 8013A4E8 AFBF0024 */ sw $ra, 0x24($sp) /* D0BEC 8013A4EC AFB40020 */ sw $s4, 0x20($sp) /* D0BF0 8013A4F0 AFB3001C */ sw $s3, 0x1c($sp) @@ -31,8 +31,8 @@ glabel func_8013A4D0 /* D0C38 8013A538 00511025 */ or $v0, $v0, $s1 /* D0C3C 8013A53C AC620014 */ sw $v0, 0x14($v1) .L8013A540: -/* D0C40 8013A540 3C028015 */ lui $v0, 0x8015 -/* D0C44 8013A544 8C426954 */ lw $v0, 0x6954($v0) +/* D0C40 8013A540 3C028015 */ lui $v0, %hi(D_80156954) +/* D0C44 8013A544 8C426954 */ lw $v0, %lo(D_80156954)($v0) /* D0C48 8013A548 02022021 */ addu $a0, $s0, $v0 /* D0C4C 8013A54C 8C820014 */ lw $v0, 0x14($a0) /* D0C50 8013A550 30420001 */ andi $v0, $v0, 1 @@ -48,8 +48,8 @@ glabel func_8013A4D0 /* D0C74 8013A574 1440FFF2 */ bnez $v0, .L8013A540 /* D0C78 8013A578 2610007C */ addiu $s0, $s0, 0x7c /* D0C7C 8013A57C 24110001 */ addiu $s1, $zero, 1 -/* D0C80 8013A580 3C128015 */ lui $s2, 0x8015 -/* D0C84 8013A584 26526954 */ addiu $s2, $s2, 0x6954 +/* D0C80 8013A580 3C128015 */ lui $s2, %hi(D_80156954) +/* D0C84 8013A584 26526954 */ addiu $s2, $s2, %lo(D_80156954) /* D0C88 8013A588 2414000B */ addiu $s4, $zero, 0xb /* D0C8C 8013A58C 2413000C */ addiu $s3, $zero, 0xc /* D0C90 8013A590 2410007C */ addiu $s0, $zero, 0x7c diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s index e4530f35f6..ba1f164c98 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_8013A704 -/* D0E04 8013A704 3C028015 */ lui $v0, 0x8015 -/* D0E08 8013A708 8C426954 */ lw $v0, 0x6954($v0) +/* D0E04 8013A704 3C028015 */ lui $v0, %hi(D_80156954) +/* D0E08 8013A708 8C426954 */ lw $v0, %lo(D_80156954)($v0) /* D0E0C 8013A70C 27BDFFD0 */ addiu $sp, $sp, -0x30 /* D0E10 8013A710 AFB60028 */ sw $s6, 0x28($sp) /* D0E14 8013A714 0080B02D */ daddu $s6, $a0, $zero @@ -42,12 +42,12 @@ glabel func_8013A704 /* D0E88 8013A788 02A0902D */ daddu $s2, $s5, $zero /* D0E8C 8013A78C 2404FFFF */ addiu $a0, $zero, -1 /* D0E90 8013A790 24100001 */ addiu $s0, $zero, 1 -/* D0E94 8013A794 3C148015 */ lui $s4, 0x8015 -/* D0E98 8013A798 26946954 */ addiu $s4, $s4, 0x6954 +/* D0E94 8013A794 3C148015 */ lui $s4, %hi(D_80156954) +/* D0E98 8013A798 26946954 */ addiu $s4, $s4, %lo(D_80156954) /* D0E9C 8013A79C 2411007C */ addiu $s1, $zero, 0x7c .L8013A7A0: -/* D0EA0 8013A7A0 3C038015 */ lui $v1, 0x8015 -/* D0EA4 8013A7A4 8C636954 */ lw $v1, 0x6954($v1) +/* D0EA0 8013A7A0 3C038015 */ lui $v1, %hi(D_80156954) +/* D0EA4 8013A7A4 8C636954 */ lw $v1, %lo(D_80156954)($v1) /* D0EA8 8013A7A8 02231021 */ addu $v0, $s1, $v1 /* D0EAC 8013A7AC 8C420014 */ lw $v0, 0x14($v0) /* D0EB0 8013A7B0 30420001 */ andi $v0, $v0, 1 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A888.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A888.s index f8c1ee4798..66d71b08e4 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A888.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A888.s @@ -12,8 +12,8 @@ glabel func_8013A888 .L8013A8A4: /* D0FA4 8013A8A4 00041140 */ sll $v0, $a0, 5 /* D0FA8 8013A8A8 00441023 */ subu $v0, $v0, $a0 -/* D0FAC 8013A8AC 3C038015 */ lui $v1, 0x8015 -/* D0FB0 8013A8B0 8C636954 */ lw $v1, 0x6954($v1) +/* D0FAC 8013A8AC 3C038015 */ lui $v1, %hi(D_80156954) +/* D0FB0 8013A8B0 8C636954 */ lw $v1, %lo(D_80156954)($v1) /* D0FB4 8013A8B4 00021080 */ sll $v0, $v0, 2 /* D0FB8 8013A8B8 00431021 */ addu $v0, $v0, $v1 /* D0FBC 8013A8BC 0C04EA15 */ jal func_8013A854 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A8E0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A8E0.s index c692482cb0..d25e0b5b8b 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A8E0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A8E0.s @@ -11,8 +11,8 @@ glabel func_8013A8E0 /* D0FF4 8013A8F4 10400008 */ beqz $v0, .L8013A918 /* D0FF8 8013A8F8 00041140 */ sll $v0, $a0, 5 /* D0FFC 8013A8FC 00441023 */ subu $v0, $v0, $a0 -/* D1000 8013A900 3C038015 */ lui $v1, 0x8015 -/* D1004 8013A904 8C636954 */ lw $v1, 0x6954($v1) +/* D1000 8013A900 3C038015 */ lui $v1, %hi(D_80156954) +/* D1004 8013A904 8C636954 */ lw $v1, %lo(D_80156954)($v1) /* D1008 8013A908 00021080 */ sll $v0, $v0, 2 /* D100C 8013A90C 00431021 */ addu $v0, $v0, $v1 /* D1010 8013A910 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A920.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A920.s index 413821b08d..92ace57cb9 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A920.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A920.s @@ -4,8 +4,8 @@ glabel func_8013A920 /* D1020 8013A920 00041940 */ sll $v1, $a0, 5 /* D1024 8013A924 00641823 */ subu $v1, $v1, $a0 -/* D1028 8013A928 3C028015 */ lui $v0, 0x8015 -/* D102C 8013A92C 8C426954 */ lw $v0, 0x6954($v0) +/* D1028 8013A928 3C028015 */ lui $v0, %hi(D_80156954) +/* D102C 8013A92C 8C426954 */ lw $v0, %lo(D_80156954)($v0) /* D1030 8013A930 00031880 */ sll $v1, $v1, 2 /* D1034 8013A934 03E00008 */ jr $ra /* D1038 8013A938 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s index 84552a3a73..7ce895e34b 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s @@ -7,8 +7,8 @@ glabel func_8013AA9C /* D11A4 8013AAA4 00C0802D */ daddu $s0, $a2, $zero /* D11A8 8013AAA8 00041140 */ sll $v0, $a0, 5 /* D11AC 8013AAAC 00441023 */ subu $v0, $v0, $a0 -/* D11B0 8013AAB0 3C038015 */ lui $v1, 0x8015 -/* D11B4 8013AAB4 8C636954 */ lw $v1, 0x6954($v1) +/* D11B0 8013AAB0 3C038015 */ lui $v1, %hi(D_80156954) +/* D11B4 8013AAB4 8C636954 */ lw $v1, %lo(D_80156954)($v1) /* D11B8 8013AAB8 8FA80030 */ lw $t0, 0x30($sp) /* D11BC 8013AABC 8FA60034 */ lw $a2, 0x34($sp) /* D11C0 8013AAC0 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s index b6e0013343..af4a0d370a 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s @@ -4,8 +4,8 @@ glabel func_8013AF20 /* D1620 8013AF20 00041140 */ sll $v0, $a0, 5 /* D1624 8013AF24 00441023 */ subu $v0, $v0, $a0 -/* D1628 8013AF28 3C038015 */ lui $v1, 0x8015 -/* D162C 8013AF2C 8C636954 */ lw $v1, 0x6954($v1) +/* D1628 8013AF28 3C038015 */ lui $v1, %hi(D_80156954) +/* D162C 8013AF2C 8C636954 */ lw $v1, %lo(D_80156954)($v1) /* D1630 8013AF30 00021080 */ sll $v0, $v0, 2 /* D1634 8013AF34 00432021 */ addu $a0, $v0, $v1 /* D1638 8013AF38 8C830014 */ lw $v1, 0x14($a0) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s index fd0c1264bb..cae29d3890 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s @@ -10,8 +10,8 @@ glabel func_8013AF70 /* D1684 8013AF84 0000882D */ daddu $s1, $zero, $zero /* D1688 8013AF88 00081140 */ sll $v0, $t0, 5 /* D168C 8013AF8C 00481023 */ subu $v0, $v0, $t0 -/* D1690 8013AF90 3C038015 */ lui $v1, 0x8015 -/* D1694 8013AF94 8C636954 */ lw $v1, 0x6954($v1) +/* D1690 8013AF90 3C038015 */ lui $v1, %hi(D_80156954) +/* D1694 8013AF94 8C636954 */ lw $v1, %lo(D_80156954)($v1) /* D1698 8013AF98 00021080 */ sll $v0, $v0, 2 /* D169C 8013AF9C AFBF001C */ sw $ra, 0x1c($sp) /* D16A0 8013AFA0 AFB00010 */ sw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s index c5cd68af15..8972baef53 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s @@ -262,8 +262,8 @@ glabel func_8013CFA8 /* D3A94 8013D394 30420002 */ andi $v0, $v0, 2 /* D3A98 8013D398 1040005E */ beqz $v0, .L8013D514 /* D3A9C 8013D39C 0180282D */ daddu $a1, $t4, $zero -/* D3AA0 8013D3A0 3C028015 */ lui $v0, 0x8015 -/* D3AA4 8013D3A4 8C426954 */ lw $v0, 0x6954($v0) +/* D3AA0 8013D3A0 3C028015 */ lui $v0, %hi(D_80156954) +/* D3AA4 8013D3A4 8C426954 */ lw $v0, %lo(D_80156954)($v0) /* D3AA8 8013D3A8 90420000 */ lbu $v0, ($v0) /* D3AAC 8013D3AC 1040005A */ beqz $v0, .L8013D518 /* D3AB0 8013D3B0 01E0302D */ daddu $a2, $t7, $zero @@ -650,8 +650,8 @@ glabel func_8013CFA8 /* D4044 8013D944 30420002 */ andi $v0, $v0, 2 /* D4048 8013D948 10400035 */ beqz $v0, .L8013DA20 /* D404C 8013D94C 3C050100 */ lui $a1, 0x100 -/* D4050 8013D950 3C028015 */ lui $v0, 0x8015 -/* D4054 8013D954 8C426954 */ lw $v0, 0x6954($v0) +/* D4050 8013D950 3C028015 */ lui $v0, %hi(D_80156954) +/* D4054 8013D954 8C426954 */ lw $v0, %lo(D_80156954)($v0) /* D4058 8013D958 90420000 */ lbu $v0, ($v0) /* D405C 8013D95C 10400031 */ beqz $v0, .L8013DA24 /* D4060 8013D960 34A54008 */ ori $a1, $a1, 0x4008 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s index 0246729a89..157ff7f3b9 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s @@ -102,8 +102,8 @@ glabel func_8013DAB4 /* D432C 8013DC2C 30420001 */ andi $v0, $v0, 1 /* D4330 8013DC30 504000E9 */ beql $v0, $zero, .L8013DFD8 /* D4334 8013DC34 3C08070A */ lui $t0, 0x70a -/* D4338 8013DC38 3C028015 */ lui $v0, 0x8015 -/* D433C 8013DC3C 8C426954 */ lw $v0, 0x6954($v0) +/* D4338 8013DC38 3C028015 */ lui $v0, %hi(D_80156954) +/* D433C 8013DC3C 8C426954 */ lw $v0, %lo(D_80156954)($v0) /* D4340 8013DC40 90420000 */ lbu $v0, ($v0) /* D4344 8013DC44 104000E3 */ beqz $v0, .L8013DFD4 /* D4348 8013DC48 3C020018 */ lui $v0, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s index d9a557046d..a9a883d21c 100644 --- a/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s +++ b/asm/nonmatchings/world/area_arn/arn_02/BDD1B0/func_80240C90_BDDE40.s @@ -85,7 +85,7 @@ glabel func_80240C90_BDDE40 /* BDDF70 80240DC0 10400007 */ beqz $v0, .L80240DE0 /* BDDF74 80240DC4 0260202D */ daddu $a0, $s3, $zero /* BDDF78 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* BDDF7C 80240DCC 0C090000 */ jal func_80240000 +/* BDDF7C 80240DCC 0C090000 */ jal func_80240000_BDD1B0 /* BDDF80 80240DD0 0200302D */ daddu $a2, $s0, $zero /* BDDF84 80240DD4 10400002 */ beqz $v0, .L80240DE0 /* BDDF88 80240DD8 24020014 */ addiu $v0, $zero, 0x14 @@ -102,11 +102,11 @@ glabel func_80240C90_BDDE40 /* BDDFB0 80240E00 00000000 */ nop /* BDDFB4 80240E04 0260202D */ daddu $a0, $s3, $zero /* BDDFB8 80240E08 0280282D */ daddu $a1, $s4, $zero -/* BDDFBC 80240E0C 0C090058 */ jal func_80240160 +/* BDDFBC 80240E0C 0C090058 */ jal func_80240160_BDD310 /* BDDFC0 80240E10 0200302D */ daddu $a2, $s0, $zero /* BDDFC4 80240E14 0260202D */ daddu $a0, $s3, $zero /* BDDFC8 80240E18 0280282D */ daddu $a1, $s4, $zero -/* BDDFCC 80240E1C 0C090075 */ jal func_802401D4 +/* BDDFCC 80240E1C 0C090075 */ jal func_802401D4_BDD384 /* BDDFD0 80240E20 0200302D */ daddu $a2, $s0, $zero /* BDDFD4 80240E24 8E630070 */ lw $v1, 0x70($s3) /* BDDFD8 80240E28 24020002 */ addiu $v0, $zero, 2 @@ -114,7 +114,7 @@ glabel func_80240C90_BDDE40 /* BDDFE0 80240E30 0000102D */ daddu $v0, $zero, $zero /* BDDFE4 80240E34 0260202D */ daddu $a0, $s3, $zero /* BDDFE8 80240E38 0280282D */ daddu $a1, $s4, $zero -/* BDDFEC 80240E3C 0C0900C1 */ jal func_80240304 +/* BDDFEC 80240E3C 0C0900C1 */ jal func_80240304_BDD4B4 /* BDDFF0 80240E40 0200302D */ daddu $a2, $s0, $zero /* BDDFF4 80240E44 8E630070 */ lw $v1, 0x70($s3) /* BDDFF8 80240E48 24020003 */ addiu $v0, $zero, 3 @@ -122,7 +122,7 @@ glabel func_80240C90_BDDE40 /* BDE000 80240E50 0000102D */ daddu $v0, $zero, $zero /* BDE004 80240E54 0260202D */ daddu $a0, $s3, $zero /* BDE008 80240E58 0280282D */ daddu $a1, $s4, $zero -/* BDE00C 80240E5C 0C0900E8 */ jal func_802403A0 +/* BDE00C 80240E5C 0C0900E8 */ jal func_802403A0_BDD550 /* BDE010 80240E60 0200302D */ daddu $a2, $s0, $zero /* BDE014 80240E64 8E630070 */ lw $v1, 0x70($s3) /* BDE018 80240E68 24020004 */ addiu $v0, $zero, 4 @@ -130,11 +130,11 @@ glabel func_80240C90_BDDE40 /* BDE020 80240E70 0000102D */ daddu $v0, $zero, $zero /* BDE024 80240E74 0260202D */ daddu $a0, $s3, $zero /* BDE028 80240E78 0280282D */ daddu $a1, $s4, $zero -/* BDE02C 80240E7C 0C09010A */ jal func_80240428 +/* BDE02C 80240E7C 0C09010A */ jal func_80240428_BDD5D8 /* BDE030 80240E80 0200302D */ daddu $a2, $s0, $zero /* BDE034 80240E84 0260202D */ daddu $a0, $s3, $zero /* BDE038 80240E88 0280282D */ daddu $a1, $s4, $zero -/* BDE03C 80240E8C 0C090134 */ jal func_802404D0 +/* BDE03C 80240E8C 0C090134 */ jal func_802404D0_BDD680 /* BDE040 80240E90 0200302D */ daddu $a2, $s0, $zero /* BDE044 80240E94 080903EF */ j .L80240FBC /* BDE048 80240E98 0000102D */ daddu $v0, $zero, $zero @@ -165,23 +165,23 @@ glabel func_80240C90_BDDE40 /* BDE0AC 80240EFC AE620070 */ sw $v0, 0x70($s3) /* BDE0B0 80240F00 0260202D */ daddu $a0, $s3, $zero /* BDE0B4 80240F04 0280282D */ daddu $a1, $s4, $zero -/* BDE0B8 80240F08 0C090191 */ jal func_80240644 +/* BDE0B8 80240F08 0C090191 */ jal func_80240644_BDD7F4 /* BDE0BC 80240F0C 0200302D */ daddu $a2, $s0, $zero /* BDE0C0 80240F10 0260202D */ daddu $a0, $s3, $zero /* BDE0C4 80240F14 0280282D */ daddu $a1, $s4, $zero -/* BDE0C8 80240F18 0C0901A5 */ jal func_80240694 +/* BDE0C8 80240F18 0C0901A5 */ jal func_80240694_BDD844 /* BDE0CC 80240F1C 0200302D */ daddu $a2, $s0, $zero /* BDE0D0 80240F20 080903EF */ j .L80240FBC /* BDE0D4 80240F24 0000102D */ daddu $v0, $zero, $zero /* BDE0D8 80240F28 0260202D */ daddu $a0, $s3, $zero /* BDE0DC 80240F2C 0280282D */ daddu $a1, $s4, $zero -/* BDE0E0 80240F30 0C09020D */ jal func_80240834 +/* BDE0E0 80240F30 0C09020D */ jal func_80240834_BDD9E4 /* BDE0E4 80240F34 0200302D */ daddu $a2, $s0, $zero /* BDE0E8 80240F38 080903EF */ j .L80240FBC /* BDE0EC 80240F3C 0000102D */ daddu $v0, $zero, $zero /* BDE0F0 80240F40 0260202D */ daddu $a0, $s3, $zero /* BDE0F4 80240F44 0280282D */ daddu $a1, $s4, $zero -/* BDE0F8 80240F48 0C090261 */ jal func_80240984 +/* BDE0F8 80240F48 0C090261 */ jal func_80240984_BDDB34 /* BDE0FC 80240F4C 0200302D */ daddu $a2, $s0, $zero /* BDE100 80240F50 8E630070 */ lw $v1, 0x70($s3) /* BDE104 80240F54 24020029 */ addiu $v0, $zero, 0x29 @@ -189,17 +189,17 @@ glabel func_80240C90_BDDE40 /* BDE10C 80240F5C 0000102D */ daddu $v0, $zero, $zero /* BDE110 80240F60 0260202D */ daddu $a0, $s3, $zero /* BDE114 80240F64 0280282D */ daddu $a1, $s4, $zero -/* BDE118 80240F68 0C09028C */ jal func_80240A30 +/* BDE118 80240F68 0C09028C */ jal func_80240A30_BDDBE0 /* BDE11C 80240F6C 0200302D */ daddu $a2, $s0, $zero /* BDE120 80240F70 080903EF */ j .L80240FBC /* BDE124 80240F74 0000102D */ daddu $v0, $zero, $zero /* BDE128 80240F78 0260202D */ daddu $a0, $s3, $zero /* BDE12C 80240F7C 0280282D */ daddu $a1, $s4, $zero -/* BDE130 80240F80 0C0902DA */ jal func_80240B68 +/* BDE130 80240F80 0C0902DA */ jal func_80240B68_BDDD18 /* BDE134 80240F84 0200302D */ daddu $a2, $s0, $zero /* BDE138 80240F88 0260202D */ daddu $a0, $s3, $zero /* BDE13C 80240F8C 0280282D */ daddu $a1, $s4, $zero -/* BDE140 80240F90 0C0902F9 */ jal func_80240BE4 +/* BDE140 80240F90 0C0902F9 */ jal func_80240BE4_BDDD94 /* BDE144 80240F94 0200302D */ daddu $a2, $s0, $zero /* BDE148 80240F98 8E630070 */ lw $v1, 0x70($s3) /* BDE14C 80240F9C 24020034 */ addiu $v0, $zero, 0x34 @@ -207,7 +207,7 @@ glabel func_80240C90_BDDE40 /* BDE154 80240FA4 0000102D */ daddu $v0, $zero, $zero /* BDE158 80240FA8 0260202D */ daddu $a0, $s3, $zero /* BDE15C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* BDE160 80240FB0 0C090313 */ jal func_80240C4C +/* BDE160 80240FB0 0C090313 */ jal func_80240C4C_BDDDFC /* BDE164 80240FB4 0200302D */ daddu $a2, $s0, $zero .L80240FB8: /* BDE168 80240FB8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s index 804efe8beb..31689e2bda 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80240B94_BDF924.s @@ -131,7 +131,7 @@ glabel func_80240B94_BDF924 /* BDFB04 80240D74 00000000 */ nop /* BDFB08 80240D78 0280202D */ daddu $a0, $s4, $zero /* BDFB0C 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* BDFB10 80240D80 0C090000 */ jal func_80240000 +/* BDFB10 80240D80 0C090000 */ jal func_80240000_BDED90 /* BDFB14 80240D84 02A0302D */ daddu $a2, $s5, $zero /* BDFB18 80240D88 0280202D */ daddu $a0, $s4, $zero /* BDFB1C 80240D8C 0260282D */ daddu $a1, $s3, $zero @@ -141,27 +141,27 @@ glabel func_80240B94_BDF924 /* BDFB2C 80240D9C 00000000 */ nop /* BDFB30 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BDFB34 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BDFB38 80240DA8 0C090100 */ jal func_80240400 +/* BDFB38 80240DA8 0C090100 */ jal func_80240400_BDF190 /* BDFB3C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BDFB40 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BDFB44 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* BDFB48 80240DB8 0C090130 */ jal func_802404C0 +/* BDFB48 80240DB8 0C090130 */ jal func_802404C0_BDF250 /* BDFB4C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* BDFB50 80240DC0 0809039A */ j .L80240E68 /* BDFB54 80240DC4 00000000 */ nop /* BDFB58 80240DC8 0280202D */ daddu $a0, $s4, $zero /* BDFB5C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* BDFB60 80240DD0 0C09019F */ jal func_8024067C +/* BDFB60 80240DD0 0C09019F */ jal func_8024067C_BDF40C /* BDFB64 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* BDFB68 80240DD8 0809039A */ j .L80240E68 /* BDFB6C 80240DDC 00000000 */ nop /* BDFB70 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BDFB74 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BDFB78 80240DE8 0C0901CC */ jal func_80240730 +/* BDFB78 80240DE8 0C0901CC */ jal func_80240730_BDF4C0 /* BDFB7C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BDFB80 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BDFB84 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BDFB88 80240DF8 0C0901E9 */ jal func_802407A4 +/* BDFB88 80240DF8 0C0901E9 */ jal func_802407A4_BDF534 /* BDFB8C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BDFB90 80240E00 0809039A */ j .L80240E68 /* BDFB94 80240E04 00000000 */ nop @@ -171,19 +171,19 @@ glabel func_80240B94_BDF924 /* BDFBA4 80240E14 02A0302D */ daddu $a2, $s5, $zero /* BDFBA8 80240E18 0280202D */ daddu $a0, $s4, $zero /* BDFBAC 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* BDFBB0 80240E20 0C090253 */ jal func_8024094C +/* BDFBB0 80240E20 0C090253 */ jal func_8024094C_BDF6DC /* BDFBB4 80240E24 02A0302D */ daddu $a2, $s5, $zero /* BDFBB8 80240E28 0809039A */ j .L80240E68 /* BDFBBC 80240E2C 00000000 */ nop /* BDFBC0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BDFBC4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BDFBC8 80240E38 0C09029B */ jal func_80240A6C +/* BDFBC8 80240E38 0C09029B */ jal func_80240A6C_BDF7FC /* BDFBCC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BDFBD0 80240E40 0809039A */ j .L80240E68 /* BDFBD4 80240E44 00000000 */ nop /* BDFBD8 80240E48 0280202D */ daddu $a0, $s4, $zero /* BDFBDC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* BDFBE0 80240E50 0C0902B5 */ jal func_80240AD4 +/* BDFBE0 80240E50 0C0902B5 */ jal func_80240AD4_BDF864 /* BDFBE4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* BDFBE8 80240E58 0809039A */ j .L80240E68 /* BDFBEC 80240E5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068.s deleted file mode 100644 index f808c645ce..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241068 -/* BDFDF8 80241068 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BDFDFC 8024106C AFB10014 */ sw $s1, 0x14($sp) -/* BDFE00 80241070 0080882D */ daddu $s1, $a0, $zero -/* BDFE04 80241074 AFBF0020 */ sw $ra, 0x20($sp) -/* BDFE08 80241078 AFB3001C */ sw $s3, 0x1c($sp) -/* BDFE0C 8024107C AFB20018 */ sw $s2, 0x18($sp) -/* BDFE10 80241080 AFB00010 */ sw $s0, 0x10($sp) -/* BDFE14 80241084 8E320148 */ lw $s2, 0x148($s1) -/* BDFE18 80241088 86440008 */ lh $a0, 8($s2) -/* BDFE1C 8024108C 0C00EABB */ jal get_npc_unsafe -/* BDFE20 80241090 00A0982D */ daddu $s3, $a1, $zero -/* BDFE24 80241094 0040802D */ daddu $s0, $v0, $zero -/* BDFE28 80241098 9602008E */ lhu $v0, 0x8e($s0) -/* BDFE2C 8024109C 2442FFFF */ addiu $v0, $v0, -1 -/* BDFE30 802410A0 A602008E */ sh $v0, 0x8e($s0) -/* BDFE34 802410A4 00021400 */ sll $v0, $v0, 0x10 -/* BDFE38 802410A8 0441001D */ bgez $v0, .L80241120 -/* BDFE3C 802410AC 00000000 */ nop -/* BDFE40 802410B0 8E220074 */ lw $v0, 0x74($s1) -/* BDFE44 802410B4 2442FFFF */ addiu $v0, $v0, -1 -/* BDFE48 802410B8 04400014 */ bltz $v0, .L8024110C -/* BDFE4C 802410BC AE220074 */ sw $v0, 0x74($s1) -/* BDFE50 802410C0 C600000C */ lwc1 $f0, 0xc($s0) -/* BDFE54 802410C4 3C014334 */ lui $at, 0x4334 -/* BDFE58 802410C8 44816000 */ mtc1 $at, $f12 -/* BDFE5C 802410CC 0C00A6C9 */ jal clamp_angle -/* BDFE60 802410D0 460C0300 */ add.s $f12, $f0, $f12 -/* BDFE64 802410D4 E600000C */ swc1 $f0, 0xc($s0) -/* BDFE68 802410D8 8E640008 */ lw $a0, 8($s3) -/* BDFE6C 802410DC 000417C2 */ srl $v0, $a0, 0x1f -/* BDFE70 802410E0 00822021 */ addu $a0, $a0, $v0 -/* BDFE74 802410E4 00042043 */ sra $a0, $a0, 1 -/* BDFE78 802410E8 0C00A67F */ jal rand_int -/* BDFE7C 802410EC 24840001 */ addiu $a0, $a0, 1 -/* BDFE80 802410F0 8E630008 */ lw $v1, 8($s3) -/* BDFE84 802410F4 000327C2 */ srl $a0, $v1, 0x1f -/* BDFE88 802410F8 00641821 */ addu $v1, $v1, $a0 -/* BDFE8C 802410FC 00031843 */ sra $v1, $v1, 1 -/* BDFE90 80241100 00621821 */ addu $v1, $v1, $v0 -/* BDFE94 80241104 08090448 */ j .L80241120 -/* BDFE98 80241108 A603008E */ sh $v1, 0x8e($s0) -.L8024110C: -/* BDFE9C 8024110C 24020004 */ addiu $v0, $zero, 4 -/* BDFEA0 80241110 AE220070 */ sw $v0, 0x70($s1) -/* BDFEA4 80241114 8E4200CC */ lw $v0, 0xcc($s2) -/* BDFEA8 80241118 8C420000 */ lw $v0, ($v0) -/* BDFEAC 8024111C AE020028 */ sw $v0, 0x28($s0) -.L80241120: -/* BDFEB0 80241120 8FBF0020 */ lw $ra, 0x20($sp) -/* BDFEB4 80241124 8FB3001C */ lw $s3, 0x1c($sp) -/* BDFEB8 80241128 8FB20018 */ lw $s2, 0x18($sp) -/* BDFEBC 8024112C 8FB10014 */ lw $s1, 0x14($sp) -/* BDFEC0 80241130 8FB00010 */ lw $s0, 0x10($sp) -/* BDFEC4 80241134 03E00008 */ jr $ra -/* BDFEC8 80241138 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068_BDFDF8.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068_BDFDF8.s new file mode 100644 index 0000000000..d1b57e14da --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241068_BDFDF8.s @@ -0,0 +1,59 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241068_BDFDF8 +/* BDFDF8 80241068 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* BDFDFC 8024106C AFB10014 */ sw $s1, 0x14($sp) +/* BDFE00 80241070 0080882D */ daddu $s1, $a0, $zero +/* BDFE04 80241074 AFBF0020 */ sw $ra, 0x20($sp) +/* BDFE08 80241078 AFB3001C */ sw $s3, 0x1c($sp) +/* BDFE0C 8024107C AFB20018 */ sw $s2, 0x18($sp) +/* BDFE10 80241080 AFB00010 */ sw $s0, 0x10($sp) +/* BDFE14 80241084 8E320148 */ lw $s2, 0x148($s1) +/* BDFE18 80241088 86440008 */ lh $a0, 8($s2) +/* BDFE1C 8024108C 0C00EABB */ jal get_npc_unsafe +/* BDFE20 80241090 00A0982D */ daddu $s3, $a1, $zero +/* BDFE24 80241094 0040802D */ daddu $s0, $v0, $zero +/* BDFE28 80241098 9602008E */ lhu $v0, 0x8e($s0) +/* BDFE2C 8024109C 2442FFFF */ addiu $v0, $v0, -1 +/* BDFE30 802410A0 A602008E */ sh $v0, 0x8e($s0) +/* BDFE34 802410A4 00021400 */ sll $v0, $v0, 0x10 +/* BDFE38 802410A8 0441001D */ bgez $v0, .L80241120 +/* BDFE3C 802410AC 00000000 */ nop +/* BDFE40 802410B0 8E220074 */ lw $v0, 0x74($s1) +/* BDFE44 802410B4 2442FFFF */ addiu $v0, $v0, -1 +/* BDFE48 802410B8 04400014 */ bltz $v0, .L8024110C +/* BDFE4C 802410BC AE220074 */ sw $v0, 0x74($s1) +/* BDFE50 802410C0 C600000C */ lwc1 $f0, 0xc($s0) +/* BDFE54 802410C4 3C014334 */ lui $at, 0x4334 +/* BDFE58 802410C8 44816000 */ mtc1 $at, $f12 +/* BDFE5C 802410CC 0C00A6C9 */ jal clamp_angle +/* BDFE60 802410D0 460C0300 */ add.s $f12, $f0, $f12 +/* BDFE64 802410D4 E600000C */ swc1 $f0, 0xc($s0) +/* BDFE68 802410D8 8E640008 */ lw $a0, 8($s3) +/* BDFE6C 802410DC 000417C2 */ srl $v0, $a0, 0x1f +/* BDFE70 802410E0 00822021 */ addu $a0, $a0, $v0 +/* BDFE74 802410E4 00042043 */ sra $a0, $a0, 1 +/* BDFE78 802410E8 0C00A67F */ jal rand_int +/* BDFE7C 802410EC 24840001 */ addiu $a0, $a0, 1 +/* BDFE80 802410F0 8E630008 */ lw $v1, 8($s3) +/* BDFE84 802410F4 000327C2 */ srl $a0, $v1, 0x1f +/* BDFE88 802410F8 00641821 */ addu $v1, $v1, $a0 +/* BDFE8C 802410FC 00031843 */ sra $v1, $v1, 1 +/* BDFE90 80241100 00621821 */ addu $v1, $v1, $v0 +/* BDFE94 80241104 08090448 */ j .L80241120 +/* BDFE98 80241108 A603008E */ sh $v1, 0x8e($s0) +.L8024110C: +/* BDFE9C 8024110C 24020004 */ addiu $v0, $zero, 4 +/* BDFEA0 80241110 AE220070 */ sw $v0, 0x70($s1) +/* BDFEA4 80241114 8E4200CC */ lw $v0, 0xcc($s2) +/* BDFEA8 80241118 8C420000 */ lw $v0, ($v0) +/* BDFEAC 8024111C AE020028 */ sw $v0, 0x28($s0) +.L80241120: +/* BDFEB0 80241120 8FBF0020 */ lw $ra, 0x20($sp) +/* BDFEB4 80241124 8FB3001C */ lw $s3, 0x1c($sp) +/* BDFEB8 80241128 8FB20018 */ lw $s2, 0x18($sp) +/* BDFEBC 8024112C 8FB10014 */ lw $s1, 0x14($sp) +/* BDFEC0 80241130 8FB00010 */ lw $s0, 0x10($sp) +/* BDFEC4 80241134 03E00008 */ jr $ra +/* BDFEC8 80241138 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s index 54476641ea..8958916a22 100644 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_8024113C_BDFECC.s @@ -61,27 +61,27 @@ glabel func_8024113C_BDFECC /* BDFFA8 80241218 00000000 */ nop /* BDFFAC 8024121C 0280202D */ daddu $a0, $s4, $zero /* BDFFB0 80241220 0200282D */ daddu $a1, $s0, $zero -/* BDFFB4 80241224 0C090000 */ jal func_80240000 +/* BDFFB4 80241224 0C090000 */ jal func_80240000_BDED90 /* BDFFB8 80241228 0240302D */ daddu $a2, $s2, $zero /* BDFFBC 8024122C 0280202D */ daddu $a0, $s4, $zero /* BDFFC0 80241230 0200282D */ daddu $a1, $s0, $zero -/* BDFFC4 80241234 0C0903A4 */ jal func_80240E90 +/* BDFFC4 80241234 0C0903A4 */ jal func_80240E90_BDFC20 /* BDFFC8 80241238 0240302D */ daddu $a2, $s2, $zero /* BDFFCC 8024123C 0809049F */ j .L8024127C /* BDFFD0 80241240 00000000 */ nop /* BDFFD4 80241244 0280202D */ daddu $a0, $s4, $zero /* BDFFD8 80241248 0200282D */ daddu $a1, $s0, $zero -/* BDFFDC 8024124C 0C090100 */ jal func_80240400 +/* BDFFDC 8024124C 0C090100 */ jal func_80240400_BDF190 /* BDFFE0 80241250 0240302D */ daddu $a2, $s2, $zero /* BDFFE4 80241254 0280202D */ daddu $a0, $s4, $zero /* BDFFE8 80241258 0200282D */ daddu $a1, $s0, $zero -/* BDFFEC 8024125C 0C09041A */ jal func_80241068 +/* BDFFEC 8024125C 0C09041A */ jal func_80241068_BDFDF8 /* BDFFF0 80241260 0240302D */ daddu $a2, $s2, $zero /* BDFFF4 80241264 0809049F */ j .L8024127C /* BDFFF8 80241268 00000000 */ nop /* BDFFFC 8024126C 0280202D */ daddu $a0, $s4, $zero /* BE0000 80241270 0200282D */ daddu $a1, $s0, $zero -/* BE0004 80241274 0C09019F */ jal func_8024067C +/* BE0004 80241274 0C09019F */ jal func_8024067C_BDF40C /* BE0008 80241278 0240302D */ daddu $a2, $s2, $zero .L8024127C: /* BE000C 8024127C C6A0003C */ lwc1 $f0, 0x3c($s5) diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648.s deleted file mode 100644 index aa399458ba..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241648 -/* BE03D8 80241648 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE03DC 8024164C AFBF0010 */ sw $ra, 0x10($sp) -/* BE03E0 80241650 8C82000C */ lw $v0, 0xc($a0) -/* BE03E4 80241654 0C0B1EAF */ jal get_variable -/* BE03E8 80241658 8C450000 */ lw $a1, ($v0) -/* BE03EC 8024165C 3C018024 */ lui $at, 0x8024 -/* BE03F0 80241660 AC221CD0 */ sw $v0, 0x1cd0($at) -/* BE03F4 80241664 24020002 */ addiu $v0, $zero, 2 -/* BE03F8 80241668 8FBF0010 */ lw $ra, 0x10($sp) -/* BE03FC 8024166C 24030001 */ addiu $v1, $zero, 1 -/* BE0400 80241670 3C018024 */ lui $at, 0x8024 -/* BE0404 80241674 AC231CCC */ sw $v1, 0x1ccc($at) -/* BE0408 80241678 03E00008 */ jr $ra -/* BE040C 8024167C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s new file mode 100644 index 0000000000..7d7276e49f --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_03/BDED90/func_80241648_BE03D8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241648_BE03D8 +/* BE03D8 80241648 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BE03DC 8024164C AFBF0010 */ sw $ra, 0x10($sp) +/* BE03E0 80241650 8C82000C */ lw $v0, 0xc($a0) +/* BE03E4 80241654 0C0B1EAF */ jal get_variable +/* BE03E8 80241658 8C450000 */ lw $a1, ($v0) +/* BE03EC 8024165C 3C018024 */ lui $at, 0x8024 +/* BE03F0 80241660 AC221CD0 */ sw $v0, 0x1cd0($at) +/* BE03F4 80241664 24020002 */ addiu $v0, $zero, 2 +/* BE03F8 80241668 8FBF0010 */ lw $ra, 0x10($sp) +/* BE03FC 8024166C 24030001 */ addiu $v1, $zero, 1 +/* BE0400 80241670 3C018024 */ lui $at, 0x8024 +/* BE0404 80241674 AC231CCC */ sw $v1, 0x1ccc($at) +/* BE0408 80241678 03E00008 */ jr $ra +/* BE040C 8024167C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s index 0f82a52971..92ffdfeb18 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80240B94_BE4344.s @@ -131,7 +131,7 @@ glabel func_80240B94_BE4344 /* BE4524 80240D74 00000000 */ nop /* BE4528 80240D78 0280202D */ daddu $a0, $s4, $zero /* BE452C 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* BE4530 80240D80 0C090000 */ jal func_80240000 +/* BE4530 80240D80 0C090000 */ jal func_80240000_BE37B0 /* BE4534 80240D84 02A0302D */ daddu $a2, $s5, $zero /* BE4538 80240D88 0280202D */ daddu $a0, $s4, $zero /* BE453C 80240D8C 0260282D */ daddu $a1, $s3, $zero @@ -141,27 +141,27 @@ glabel func_80240B94_BE4344 /* BE454C 80240D9C 00000000 */ nop /* BE4550 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE4554 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE4558 80240DA8 0C090100 */ jal func_80240400 +/* BE4558 80240DA8 0C090100 */ jal func_80240400_BE3BB0 /* BE455C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE4560 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE4564 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* BE4568 80240DB8 0C090130 */ jal func_802404C0 +/* BE4568 80240DB8 0C090130 */ jal func_802404C0_BE3C70 /* BE456C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* BE4570 80240DC0 0809039A */ j .L80240E68 /* BE4574 80240DC4 00000000 */ nop /* BE4578 80240DC8 0280202D */ daddu $a0, $s4, $zero /* BE457C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* BE4580 80240DD0 0C09019F */ jal func_8024067C +/* BE4580 80240DD0 0C09019F */ jal func_8024067C_BE3E2C /* BE4584 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* BE4588 80240DD8 0809039A */ j .L80240E68 /* BE458C 80240DDC 00000000 */ nop /* BE4590 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE4594 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE4598 80240DE8 0C0901CC */ jal func_80240730 +/* BE4598 80240DE8 0C0901CC */ jal func_80240730_BE3EE0 /* BE459C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE45A0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE45A4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE45A8 80240DF8 0C0901E9 */ jal func_802407A4 +/* BE45A8 80240DF8 0C0901E9 */ jal func_802407A4_BE3F54 /* BE45AC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE45B0 80240E00 0809039A */ j .L80240E68 /* BE45B4 80240E04 00000000 */ nop @@ -171,19 +171,19 @@ glabel func_80240B94_BE4344 /* BE45C4 80240E14 02A0302D */ daddu $a2, $s5, $zero /* BE45C8 80240E18 0280202D */ daddu $a0, $s4, $zero /* BE45CC 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* BE45D0 80240E20 0C090253 */ jal func_8024094C +/* BE45D0 80240E20 0C090253 */ jal func_8024094C_BE40FC /* BE45D4 80240E24 02A0302D */ daddu $a2, $s5, $zero /* BE45D8 80240E28 0809039A */ j .L80240E68 /* BE45DC 80240E2C 00000000 */ nop /* BE45E0 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE45E4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE45E8 80240E38 0C09029B */ jal func_80240A6C +/* BE45E8 80240E38 0C09029B */ jal func_80240A6C_BE421C /* BE45EC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE45F0 80240E40 0809039A */ j .L80240E68 /* BE45F4 80240E44 00000000 */ nop /* BE45F8 80240E48 0280202D */ daddu $a0, $s4, $zero /* BE45FC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* BE4600 80240E50 0C0902B5 */ jal func_80240AD4 +/* BE4600 80240E50 0C0902B5 */ jal func_80240AD4_BE4284 /* BE4604 80240E54 02A0302D */ daddu $a2, $s5, $zero /* BE4608 80240E58 0809039A */ j .L80240E68 /* BE460C 80240E5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728.s deleted file mode 100644 index f7de10b773..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241728 -/* BE4ED8 80241728 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BE4EDC 8024172C AFB3004C */ sw $s3, 0x4c($sp) -/* BE4EE0 80241730 0080982D */ daddu $s3, $a0, $zero -/* BE4EE4 80241734 AFBF0054 */ sw $ra, 0x54($sp) -/* BE4EE8 80241738 AFB40050 */ sw $s4, 0x50($sp) -/* BE4EEC 8024173C AFB20048 */ sw $s2, 0x48($sp) -/* BE4EF0 80241740 AFB10044 */ sw $s1, 0x44($sp) -/* BE4EF4 80241744 AFB00040 */ sw $s0, 0x40($sp) -/* BE4EF8 80241748 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* BE4EFC 8024174C F7B80068 */ sdc1 $f24, 0x68($sp) -/* BE4F00 80241750 F7B60060 */ sdc1 $f22, 0x60($sp) -/* BE4F04 80241754 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BE4F08 80241758 8E710148 */ lw $s1, 0x148($s3) -/* BE4F0C 8024175C 00A0902D */ daddu $s2, $a1, $zero -/* BE4F10 80241760 86240008 */ lh $a0, 8($s1) -/* BE4F14 80241764 0C00EABB */ jal get_npc_unsafe -/* BE4F18 80241768 00C0A02D */ daddu $s4, $a2, $zero -/* BE4F1C 8024176C 0040802D */ daddu $s0, $v0, $zero -/* BE4F20 80241770 C6200078 */ lwc1 $f0, 0x78($s1) -/* BE4F24 80241774 46800020 */ cvt.s.w $f0, $f0 -/* BE4F28 80241778 46000021 */ cvt.d.s $f0, $f0 -/* BE4F2C 8024177C 3C014059 */ lui $at, 0x4059 -/* BE4F30 80241780 44811800 */ mtc1 $at, $f3 -/* BE4F34 80241784 44801000 */ mtc1 $zero, $f2 -/* BE4F38 80241788 8602008E */ lh $v0, 0x8e($s0) -/* BE4F3C 8024178C 9603008E */ lhu $v1, 0x8e($s0) -/* BE4F40 80241790 46220003 */ div.d $f0, $f0, $f2 -/* BE4F44 80241794 46200620 */ cvt.s.d $f24, $f0 -/* BE4F48 80241798 C6200088 */ lwc1 $f0, 0x88($s1) -/* BE4F4C 8024179C 46800020 */ cvt.s.w $f0, $f0 -/* BE4F50 802417A0 46000021 */ cvt.d.s $f0, $f0 -/* BE4F54 802417A4 46220003 */ div.d $f0, $f0, $f2 -/* BE4F58 802417A8 46200020 */ cvt.s.d $f0, $f0 -/* BE4F5C 802417AC 18400003 */ blez $v0, .L802417BC -/* BE4F60 802417B0 4600C680 */ add.s $f26, $f24, $f0 -/* BE4F64 802417B4 2462FFFF */ addiu $v0, $v1, -1 -/* BE4F68 802417B8 A602008E */ sh $v0, 0x8e($s0) -.L802417BC: -/* BE4F6C 802417BC 8E220070 */ lw $v0, 0x70($s1) -/* BE4F70 802417C0 18400034 */ blez $v0, .L80241894 -/* BE4F74 802417C4 00000000 */ nop -/* BE4F78 802417C8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BE4F7C 802417CC 46806320 */ cvt.s.w $f12, $f12 -/* BE4F80 802417D0 44820000 */ mtc1 $v0, $f0 -/* BE4F84 802417D4 00000000 */ nop -/* BE4F88 802417D8 46800020 */ cvt.s.w $f0, $f0 -/* BE4F8C 802417DC 46000021 */ cvt.d.s $f0, $f0 -/* BE4F90 802417E0 46220003 */ div.d $f0, $f0, $f2 -/* BE4F94 802417E4 0C00A8BB */ jal sin_deg -/* BE4F98 802417E8 462005A0 */ cvt.s.d $f22, $f0 -/* BE4F9C 802417EC 8E020000 */ lw $v0, ($s0) -/* BE4FA0 802417F0 30420008 */ andi $v0, $v0, 8 -/* BE4FA4 802417F4 10400003 */ beqz $v0, .L80241804 -/* BE4FA8 802417F8 46000506 */ mov.s $f20, $f0 -/* BE4FAC 802417FC 08090611 */ j .L80241844 -/* BE4FB0 80241800 0000102D */ daddu $v0, $zero, $zero -.L80241804: -/* BE4FB4 80241804 27A50028 */ addiu $a1, $sp, 0x28 -/* BE4FB8 80241808 27A6002C */ addiu $a2, $sp, 0x2c -/* BE4FBC 8024180C C6000038 */ lwc1 $f0, 0x38($s0) -/* BE4FC0 80241810 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE4FC4 80241814 C6040040 */ lwc1 $f4, 0x40($s0) -/* BE4FC8 80241818 3C01447A */ lui $at, 0x447a -/* BE4FCC 8024181C 44813000 */ mtc1 $at, $f6 -/* BE4FD0 80241820 27A20034 */ addiu $v0, $sp, 0x34 -/* BE4FD4 80241824 E7A00028 */ swc1 $f0, 0x28($sp) -/* BE4FD8 80241828 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BE4FDC 8024182C E7A40030 */ swc1 $f4, 0x30($sp) -/* BE4FE0 80241830 E7A60034 */ swc1 $f6, 0x34($sp) -/* BE4FE4 80241834 AFA20010 */ sw $v0, 0x10($sp) -/* BE4FE8 80241838 8E040080 */ lw $a0, 0x80($s0) -/* BE4FEC 8024183C 0C0372DF */ jal func_800DCB7C -/* BE4FF0 80241840 27A70030 */ addiu $a3, $sp, 0x30 -.L80241844: -/* BE4FF4 80241844 10400007 */ beqz $v0, .L80241864 -/* BE4FF8 80241848 00000000 */ nop -/* BE4FFC 8024184C 4616A082 */ mul.s $f2, $f20, $f22 -/* BE5000 80241850 00000000 */ nop -/* BE5004 80241854 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BE5008 80241858 46180000 */ add.s $f0, $f0, $f24 -/* BE500C 8024185C 0809061C */ j .L80241870 -/* BE5010 80241860 46020000 */ add.s $f0, $f0, $f2 -.L80241864: -/* BE5014 80241864 4616A002 */ mul.s $f0, $f20, $f22 -/* BE5018 80241868 00000000 */ nop -/* BE501C 8024186C 4600D000 */ add.s $f0, $f26, $f0 -.L80241870: -/* BE5020 80241870 E600003C */ swc1 $f0, 0x3c($s0) -/* BE5024 80241874 8E220074 */ lw $v0, 0x74($s1) -/* BE5028 80241878 2442000A */ addiu $v0, $v0, 0xa -/* BE502C 8024187C 44826000 */ mtc1 $v0, $f12 -/* BE5030 80241880 00000000 */ nop -/* BE5034 80241884 0C00A6C9 */ jal clamp_angle -/* BE5038 80241888 46806320 */ cvt.s.w $f12, $f12 -/* BE503C 8024188C 4600020D */ trunc.w.s $f8, $f0 -/* BE5040 80241890 E6280074 */ swc1 $f8, 0x74($s1) -.L80241894: -/* BE5044 80241894 8E220090 */ lw $v0, 0x90($s1) -/* BE5048 80241898 1C400040 */ bgtz $v0, .L8024199C -/* BE504C 8024189C 2442FFFF */ addiu $v0, $v0, -1 -/* BE5050 802418A0 860200A8 */ lh $v0, 0xa8($s0) -/* BE5054 802418A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE5058 802418A8 44821000 */ mtc1 $v0, $f2 -/* BE505C 802418AC 00000000 */ nop -/* BE5060 802418B0 468010A0 */ cvt.s.w $f2, $f2 -/* BE5064 802418B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE5068 802418B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE506C 802418BC 46020000 */ add.s $f0, $f0, $f2 -/* BE5070 802418C0 3C014024 */ lui $at, 0x4024 -/* BE5074 802418C4 44812800 */ mtc1 $at, $f5 -/* BE5078 802418C8 44802000 */ mtc1 $zero, $f4 -/* BE507C 802418CC C442002C */ lwc1 $f2, 0x2c($v0) -/* BE5080 802418D0 46000021 */ cvt.d.s $f0, $f0 -/* BE5084 802418D4 46240000 */ add.d $f0, $f0, $f4 -/* BE5088 802418D8 460010A1 */ cvt.d.s $f2, $f2 -/* BE508C 802418DC 4620103C */ c.lt.d $f2, $f0 -/* BE5090 802418E0 00000000 */ nop -/* BE5094 802418E4 4500002E */ bc1f .L802419A0 -/* BE5098 802418E8 0280202D */ daddu $a0, $s4, $zero -/* BE509C 802418EC 24020001 */ addiu $v0, $zero, 1 -/* BE50A0 802418F0 AFA20010 */ sw $v0, 0x10($sp) -/* BE50A4 802418F4 8E460024 */ lw $a2, 0x24($s2) -/* BE50A8 802418F8 8E470028 */ lw $a3, 0x28($s2) -/* BE50AC 802418FC 0C01242D */ jal func_800490B4 -/* BE50B0 80241900 0220282D */ daddu $a1, $s1, $zero -/* BE50B4 80241904 10400026 */ beqz $v0, .L802419A0 -/* BE50B8 80241908 0000202D */ daddu $a0, $zero, $zero -/* BE50BC 8024190C 0200282D */ daddu $a1, $s0, $zero -/* BE50C0 80241910 0000302D */ daddu $a2, $zero, $zero -/* BE50C4 80241914 2412000C */ addiu $s2, $zero, 0xc -/* BE50C8 80241918 860300A8 */ lh $v1, 0xa8($s0) -/* BE50CC 8024191C 3C013F80 */ lui $at, 0x3f80 -/* BE50D0 80241920 44810000 */ mtc1 $at, $f0 -/* BE50D4 80241924 3C014000 */ lui $at, 0x4000 -/* BE50D8 80241928 44811000 */ mtc1 $at, $f2 -/* BE50DC 8024192C 3C01C1A0 */ lui $at, 0xc1a0 -/* BE50E0 80241930 44812000 */ mtc1 $at, $f4 -/* BE50E4 80241934 44834000 */ mtc1 $v1, $f8 -/* BE50E8 80241938 00000000 */ nop -/* BE50EC 8024193C 46804220 */ cvt.s.w $f8, $f8 -/* BE50F0 80241940 44074000 */ mfc1 $a3, $f8 -/* BE50F4 80241944 27A20038 */ addiu $v0, $sp, 0x38 -/* BE50F8 80241948 AFB2001C */ sw $s2, 0x1c($sp) -/* BE50FC 8024194C AFA20020 */ sw $v0, 0x20($sp) -/* BE5100 80241950 E7A00010 */ swc1 $f0, 0x10($sp) -/* BE5104 80241954 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE5108 80241958 0C01BFA4 */ jal fx_emote -/* BE510C 8024195C E7A40018 */ swc1 $f4, 0x18($sp) -/* BE5110 80241960 0200202D */ daddu $a0, $s0, $zero -/* BE5114 80241964 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BE5118 80241968 C480003C */ lwc1 $f0, 0x3c($a0) -/* BE511C 8024196C 3C060020 */ lui $a2, 0x20 -/* BE5120 80241970 0C012530 */ jal func_800494C0 -/* BE5124 80241974 E4800064 */ swc1 $f0, 0x64($a0) -/* BE5128 80241978 8E220018 */ lw $v0, 0x18($s1) -/* BE512C 8024197C 9442002A */ lhu $v0, 0x2a($v0) -/* BE5130 80241980 30420001 */ andi $v0, $v0, 1 -/* BE5134 80241984 10400003 */ beqz $v0, .L80241994 -/* BE5138 80241988 2402000A */ addiu $v0, $zero, 0xa -/* BE513C 8024198C 0809068F */ j .L80241A3C -/* BE5140 80241990 AE620070 */ sw $v0, 0x70($s3) -.L80241994: -/* BE5144 80241994 0809068F */ j .L80241A3C -/* BE5148 80241998 AE720070 */ sw $s2, 0x70($s3) -.L8024199C: -/* BE514C 8024199C AE220090 */ sw $v0, 0x90($s1) -.L802419A0: -/* BE5150 802419A0 8602008C */ lh $v0, 0x8c($s0) -/* BE5154 802419A4 14400025 */ bnez $v0, .L80241A3C -/* BE5158 802419A8 00000000 */ nop -/* BE515C 802419AC 8602008E */ lh $v0, 0x8e($s0) -/* BE5160 802419B0 1C400022 */ bgtz $v0, .L80241A3C -/* BE5164 802419B4 00000000 */ nop -/* BE5168 802419B8 8E620074 */ lw $v0, 0x74($s3) -/* BE516C 802419BC 2442FFFF */ addiu $v0, $v0, -1 -/* BE5170 802419C0 1840001D */ blez $v0, .L80241A38 -/* BE5174 802419C4 AE620074 */ sw $v0, 0x74($s3) -/* BE5178 802419C8 8E220018 */ lw $v0, 0x18($s1) -/* BE517C 802419CC 9442002A */ lhu $v0, 0x2a($v0) -/* BE5180 802419D0 30420010 */ andi $v0, $v0, 0x10 -/* BE5184 802419D4 14400007 */ bnez $v0, .L802419F4 -/* BE5188 802419D8 00000000 */ nop -/* BE518C 802419DC C600000C */ lwc1 $f0, 0xc($s0) -/* BE5190 802419E0 3C014334 */ lui $at, 0x4334 -/* BE5194 802419E4 44816000 */ mtc1 $at, $f12 -/* BE5198 802419E8 0C00A6C9 */ jal clamp_angle -/* BE519C 802419EC 460C0300 */ add.s $f12, $f0, $f12 -/* BE51A0 802419F0 E600000C */ swc1 $f0, 0xc($s0) -.L802419F4: -/* BE51A4 802419F4 0C00A67F */ jal rand_int -/* BE51A8 802419F8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BE51AC 802419FC 3C032E8B */ lui $v1, 0x2e8b -/* BE51B0 80241A00 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BE51B4 80241A04 00430018 */ mult $v0, $v1 -/* BE51B8 80241A08 00021FC3 */ sra $v1, $v0, 0x1f -/* BE51BC 80241A0C 00004010 */ mfhi $t0 -/* BE51C0 80241A10 00082043 */ sra $a0, $t0, 1 -/* BE51C4 80241A14 00832023 */ subu $a0, $a0, $v1 -/* BE51C8 80241A18 00041840 */ sll $v1, $a0, 1 -/* BE51CC 80241A1C 00641821 */ addu $v1, $v1, $a0 -/* BE51D0 80241A20 00031880 */ sll $v1, $v1, 2 -/* BE51D4 80241A24 00641823 */ subu $v1, $v1, $a0 -/* BE51D8 80241A28 00431023 */ subu $v0, $v0, $v1 -/* BE51DC 80241A2C 24420005 */ addiu $v0, $v0, 5 -/* BE51E0 80241A30 0809068F */ j .L80241A3C -/* BE51E4 80241A34 A602008E */ sh $v0, 0x8e($s0) -.L80241A38: -/* BE51E8 80241A38 AE600070 */ sw $zero, 0x70($s3) -.L80241A3C: -/* BE51EC 80241A3C 8FBF0054 */ lw $ra, 0x54($sp) -/* BE51F0 80241A40 8FB40050 */ lw $s4, 0x50($sp) -/* BE51F4 80241A44 8FB3004C */ lw $s3, 0x4c($sp) -/* BE51F8 80241A48 8FB20048 */ lw $s2, 0x48($sp) -/* BE51FC 80241A4C 8FB10044 */ lw $s1, 0x44($sp) -/* BE5200 80241A50 8FB00040 */ lw $s0, 0x40($sp) -/* BE5204 80241A54 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* BE5208 80241A58 D7B80068 */ ldc1 $f24, 0x68($sp) -/* BE520C 80241A5C D7B60060 */ ldc1 $f22, 0x60($sp) -/* BE5210 80241A60 D7B40058 */ ldc1 $f20, 0x58($sp) -/* BE5214 80241A64 03E00008 */ jr $ra -/* BE5218 80241A68 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728_BE4ED8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728_BE4ED8.s new file mode 100644 index 0000000000..2a3ed2271f --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241728_BE4ED8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241728_BE4ED8 +/* BE4ED8 80241728 27BDFF88 */ addiu $sp, $sp, -0x78 +/* BE4EDC 8024172C AFB3004C */ sw $s3, 0x4c($sp) +/* BE4EE0 80241730 0080982D */ daddu $s3, $a0, $zero +/* BE4EE4 80241734 AFBF0054 */ sw $ra, 0x54($sp) +/* BE4EE8 80241738 AFB40050 */ sw $s4, 0x50($sp) +/* BE4EEC 8024173C AFB20048 */ sw $s2, 0x48($sp) +/* BE4EF0 80241740 AFB10044 */ sw $s1, 0x44($sp) +/* BE4EF4 80241744 AFB00040 */ sw $s0, 0x40($sp) +/* BE4EF8 80241748 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* BE4EFC 8024174C F7B80068 */ sdc1 $f24, 0x68($sp) +/* BE4F00 80241750 F7B60060 */ sdc1 $f22, 0x60($sp) +/* BE4F04 80241754 F7B40058 */ sdc1 $f20, 0x58($sp) +/* BE4F08 80241758 8E710148 */ lw $s1, 0x148($s3) +/* BE4F0C 8024175C 00A0902D */ daddu $s2, $a1, $zero +/* BE4F10 80241760 86240008 */ lh $a0, 8($s1) +/* BE4F14 80241764 0C00EABB */ jal get_npc_unsafe +/* BE4F18 80241768 00C0A02D */ daddu $s4, $a2, $zero +/* BE4F1C 8024176C 0040802D */ daddu $s0, $v0, $zero +/* BE4F20 80241770 C6200078 */ lwc1 $f0, 0x78($s1) +/* BE4F24 80241774 46800020 */ cvt.s.w $f0, $f0 +/* BE4F28 80241778 46000021 */ cvt.d.s $f0, $f0 +/* BE4F2C 8024177C 3C014059 */ lui $at, 0x4059 +/* BE4F30 80241780 44811800 */ mtc1 $at, $f3 +/* BE4F34 80241784 44801000 */ mtc1 $zero, $f2 +/* BE4F38 80241788 8602008E */ lh $v0, 0x8e($s0) +/* BE4F3C 8024178C 9603008E */ lhu $v1, 0x8e($s0) +/* BE4F40 80241790 46220003 */ div.d $f0, $f0, $f2 +/* BE4F44 80241794 46200620 */ cvt.s.d $f24, $f0 +/* BE4F48 80241798 C6200088 */ lwc1 $f0, 0x88($s1) +/* BE4F4C 8024179C 46800020 */ cvt.s.w $f0, $f0 +/* BE4F50 802417A0 46000021 */ cvt.d.s $f0, $f0 +/* BE4F54 802417A4 46220003 */ div.d $f0, $f0, $f2 +/* BE4F58 802417A8 46200020 */ cvt.s.d $f0, $f0 +/* BE4F5C 802417AC 18400003 */ blez $v0, .L802417BC +/* BE4F60 802417B0 4600C680 */ add.s $f26, $f24, $f0 +/* BE4F64 802417B4 2462FFFF */ addiu $v0, $v1, -1 +/* BE4F68 802417B8 A602008E */ sh $v0, 0x8e($s0) +.L802417BC: +/* BE4F6C 802417BC 8E220070 */ lw $v0, 0x70($s1) +/* BE4F70 802417C0 18400034 */ blez $v0, .L80241894 +/* BE4F74 802417C4 00000000 */ nop +/* BE4F78 802417C8 C62C0074 */ lwc1 $f12, 0x74($s1) +/* BE4F7C 802417CC 46806320 */ cvt.s.w $f12, $f12 +/* BE4F80 802417D0 44820000 */ mtc1 $v0, $f0 +/* BE4F84 802417D4 00000000 */ nop +/* BE4F88 802417D8 46800020 */ cvt.s.w $f0, $f0 +/* BE4F8C 802417DC 46000021 */ cvt.d.s $f0, $f0 +/* BE4F90 802417E0 46220003 */ div.d $f0, $f0, $f2 +/* BE4F94 802417E4 0C00A8BB */ jal sin_deg +/* BE4F98 802417E8 462005A0 */ cvt.s.d $f22, $f0 +/* BE4F9C 802417EC 8E020000 */ lw $v0, ($s0) +/* BE4FA0 802417F0 30420008 */ andi $v0, $v0, 8 +/* BE4FA4 802417F4 10400003 */ beqz $v0, .L80241804 +/* BE4FA8 802417F8 46000506 */ mov.s $f20, $f0 +/* BE4FAC 802417FC 08090611 */ j .L80241844 +/* BE4FB0 80241800 0000102D */ daddu $v0, $zero, $zero +.L80241804: +/* BE4FB4 80241804 27A50028 */ addiu $a1, $sp, 0x28 +/* BE4FB8 80241808 27A6002C */ addiu $a2, $sp, 0x2c +/* BE4FBC 8024180C C6000038 */ lwc1 $f0, 0x38($s0) +/* BE4FC0 80241810 C602003C */ lwc1 $f2, 0x3c($s0) +/* BE4FC4 80241814 C6040040 */ lwc1 $f4, 0x40($s0) +/* BE4FC8 80241818 3C01447A */ lui $at, 0x447a +/* BE4FCC 8024181C 44813000 */ mtc1 $at, $f6 +/* BE4FD0 80241820 27A20034 */ addiu $v0, $sp, 0x34 +/* BE4FD4 80241824 E7A00028 */ swc1 $f0, 0x28($sp) +/* BE4FD8 80241828 E7A2002C */ swc1 $f2, 0x2c($sp) +/* BE4FDC 8024182C E7A40030 */ swc1 $f4, 0x30($sp) +/* BE4FE0 80241830 E7A60034 */ swc1 $f6, 0x34($sp) +/* BE4FE4 80241834 AFA20010 */ sw $v0, 0x10($sp) +/* BE4FE8 80241838 8E040080 */ lw $a0, 0x80($s0) +/* BE4FEC 8024183C 0C0372DF */ jal func_800DCB7C +/* BE4FF0 80241840 27A70030 */ addiu $a3, $sp, 0x30 +.L80241844: +/* BE4FF4 80241844 10400007 */ beqz $v0, .L80241864 +/* BE4FF8 80241848 00000000 */ nop +/* BE4FFC 8024184C 4616A082 */ mul.s $f2, $f20, $f22 +/* BE5000 80241850 00000000 */ nop +/* BE5004 80241854 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* BE5008 80241858 46180000 */ add.s $f0, $f0, $f24 +/* BE500C 8024185C 0809061C */ j .L80241870 +/* BE5010 80241860 46020000 */ add.s $f0, $f0, $f2 +.L80241864: +/* BE5014 80241864 4616A002 */ mul.s $f0, $f20, $f22 +/* BE5018 80241868 00000000 */ nop +/* BE501C 8024186C 4600D000 */ add.s $f0, $f26, $f0 +.L80241870: +/* BE5020 80241870 E600003C */ swc1 $f0, 0x3c($s0) +/* BE5024 80241874 8E220074 */ lw $v0, 0x74($s1) +/* BE5028 80241878 2442000A */ addiu $v0, $v0, 0xa +/* BE502C 8024187C 44826000 */ mtc1 $v0, $f12 +/* BE5030 80241880 00000000 */ nop +/* BE5034 80241884 0C00A6C9 */ jal clamp_angle +/* BE5038 80241888 46806320 */ cvt.s.w $f12, $f12 +/* BE503C 8024188C 4600020D */ trunc.w.s $f8, $f0 +/* BE5040 80241890 E6280074 */ swc1 $f8, 0x74($s1) +.L80241894: +/* BE5044 80241894 8E220090 */ lw $v0, 0x90($s1) +/* BE5048 80241898 1C400040 */ bgtz $v0, .L8024199C +/* BE504C 8024189C 2442FFFF */ addiu $v0, $v0, -1 +/* BE5050 802418A0 860200A8 */ lh $v0, 0xa8($s0) +/* BE5054 802418A4 C600003C */ lwc1 $f0, 0x3c($s0) +/* BE5058 802418A8 44821000 */ mtc1 $v0, $f2 +/* BE505C 802418AC 00000000 */ nop +/* BE5060 802418B0 468010A0 */ cvt.s.w $f2, $f2 +/* BE5064 802418B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BE5068 802418B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BE506C 802418BC 46020000 */ add.s $f0, $f0, $f2 +/* BE5070 802418C0 3C014024 */ lui $at, 0x4024 +/* BE5074 802418C4 44812800 */ mtc1 $at, $f5 +/* BE5078 802418C8 44802000 */ mtc1 $zero, $f4 +/* BE507C 802418CC C442002C */ lwc1 $f2, 0x2c($v0) +/* BE5080 802418D0 46000021 */ cvt.d.s $f0, $f0 +/* BE5084 802418D4 46240000 */ add.d $f0, $f0, $f4 +/* BE5088 802418D8 460010A1 */ cvt.d.s $f2, $f2 +/* BE508C 802418DC 4620103C */ c.lt.d $f2, $f0 +/* BE5090 802418E0 00000000 */ nop +/* BE5094 802418E4 4500002E */ bc1f .L802419A0 +/* BE5098 802418E8 0280202D */ daddu $a0, $s4, $zero +/* BE509C 802418EC 24020001 */ addiu $v0, $zero, 1 +/* BE50A0 802418F0 AFA20010 */ sw $v0, 0x10($sp) +/* BE50A4 802418F4 8E460024 */ lw $a2, 0x24($s2) +/* BE50A8 802418F8 8E470028 */ lw $a3, 0x28($s2) +/* BE50AC 802418FC 0C01242D */ jal func_800490B4 +/* BE50B0 80241900 0220282D */ daddu $a1, $s1, $zero +/* BE50B4 80241904 10400026 */ beqz $v0, .L802419A0 +/* BE50B8 80241908 0000202D */ daddu $a0, $zero, $zero +/* BE50BC 8024190C 0200282D */ daddu $a1, $s0, $zero +/* BE50C0 80241910 0000302D */ daddu $a2, $zero, $zero +/* BE50C4 80241914 2412000C */ addiu $s2, $zero, 0xc +/* BE50C8 80241918 860300A8 */ lh $v1, 0xa8($s0) +/* BE50CC 8024191C 3C013F80 */ lui $at, 0x3f80 +/* BE50D0 80241920 44810000 */ mtc1 $at, $f0 +/* BE50D4 80241924 3C014000 */ lui $at, 0x4000 +/* BE50D8 80241928 44811000 */ mtc1 $at, $f2 +/* BE50DC 8024192C 3C01C1A0 */ lui $at, 0xc1a0 +/* BE50E0 80241930 44812000 */ mtc1 $at, $f4 +/* BE50E4 80241934 44834000 */ mtc1 $v1, $f8 +/* BE50E8 80241938 00000000 */ nop +/* BE50EC 8024193C 46804220 */ cvt.s.w $f8, $f8 +/* BE50F0 80241940 44074000 */ mfc1 $a3, $f8 +/* BE50F4 80241944 27A20038 */ addiu $v0, $sp, 0x38 +/* BE50F8 80241948 AFB2001C */ sw $s2, 0x1c($sp) +/* BE50FC 8024194C AFA20020 */ sw $v0, 0x20($sp) +/* BE5100 80241950 E7A00010 */ swc1 $f0, 0x10($sp) +/* BE5104 80241954 E7A20014 */ swc1 $f2, 0x14($sp) +/* BE5108 80241958 0C01BFA4 */ jal fx_emote +/* BE510C 8024195C E7A40018 */ swc1 $f4, 0x18($sp) +/* BE5110 80241960 0200202D */ daddu $a0, $s0, $zero +/* BE5114 80241964 240502F4 */ addiu $a1, $zero, 0x2f4 +/* BE5118 80241968 C480003C */ lwc1 $f0, 0x3c($a0) +/* BE511C 8024196C 3C060020 */ lui $a2, 0x20 +/* BE5120 80241970 0C012530 */ jal func_800494C0 +/* BE5124 80241974 E4800064 */ swc1 $f0, 0x64($a0) +/* BE5128 80241978 8E220018 */ lw $v0, 0x18($s1) +/* BE512C 8024197C 9442002A */ lhu $v0, 0x2a($v0) +/* BE5130 80241980 30420001 */ andi $v0, $v0, 1 +/* BE5134 80241984 10400003 */ beqz $v0, .L80241994 +/* BE5138 80241988 2402000A */ addiu $v0, $zero, 0xa +/* BE513C 8024198C 0809068F */ j .L80241A3C +/* BE5140 80241990 AE620070 */ sw $v0, 0x70($s3) +.L80241994: +/* BE5144 80241994 0809068F */ j .L80241A3C +/* BE5148 80241998 AE720070 */ sw $s2, 0x70($s3) +.L8024199C: +/* BE514C 8024199C AE220090 */ sw $v0, 0x90($s1) +.L802419A0: +/* BE5150 802419A0 8602008C */ lh $v0, 0x8c($s0) +/* BE5154 802419A4 14400025 */ bnez $v0, .L80241A3C +/* BE5158 802419A8 00000000 */ nop +/* BE515C 802419AC 8602008E */ lh $v0, 0x8e($s0) +/* BE5160 802419B0 1C400022 */ bgtz $v0, .L80241A3C +/* BE5164 802419B4 00000000 */ nop +/* BE5168 802419B8 8E620074 */ lw $v0, 0x74($s3) +/* BE516C 802419BC 2442FFFF */ addiu $v0, $v0, -1 +/* BE5170 802419C0 1840001D */ blez $v0, .L80241A38 +/* BE5174 802419C4 AE620074 */ sw $v0, 0x74($s3) +/* BE5178 802419C8 8E220018 */ lw $v0, 0x18($s1) +/* BE517C 802419CC 9442002A */ lhu $v0, 0x2a($v0) +/* BE5180 802419D0 30420010 */ andi $v0, $v0, 0x10 +/* BE5184 802419D4 14400007 */ bnez $v0, .L802419F4 +/* BE5188 802419D8 00000000 */ nop +/* BE518C 802419DC C600000C */ lwc1 $f0, 0xc($s0) +/* BE5190 802419E0 3C014334 */ lui $at, 0x4334 +/* BE5194 802419E4 44816000 */ mtc1 $at, $f12 +/* BE5198 802419E8 0C00A6C9 */ jal clamp_angle +/* BE519C 802419EC 460C0300 */ add.s $f12, $f0, $f12 +/* BE51A0 802419F0 E600000C */ swc1 $f0, 0xc($s0) +.L802419F4: +/* BE51A4 802419F4 0C00A67F */ jal rand_int +/* BE51A8 802419F8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* BE51AC 802419FC 3C032E8B */ lui $v1, 0x2e8b +/* BE51B0 80241A00 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* BE51B4 80241A04 00430018 */ mult $v0, $v1 +/* BE51B8 80241A08 00021FC3 */ sra $v1, $v0, 0x1f +/* BE51BC 80241A0C 00004010 */ mfhi $t0 +/* BE51C0 80241A10 00082043 */ sra $a0, $t0, 1 +/* BE51C4 80241A14 00832023 */ subu $a0, $a0, $v1 +/* BE51C8 80241A18 00041840 */ sll $v1, $a0, 1 +/* BE51CC 80241A1C 00641821 */ addu $v1, $v1, $a0 +/* BE51D0 80241A20 00031880 */ sll $v1, $v1, 2 +/* BE51D4 80241A24 00641823 */ subu $v1, $v1, $a0 +/* BE51D8 80241A28 00431023 */ subu $v0, $v0, $v1 +/* BE51DC 80241A2C 24420005 */ addiu $v0, $v0, 5 +/* BE51E0 80241A30 0809068F */ j .L80241A3C +/* BE51E4 80241A34 A602008E */ sh $v0, 0x8e($s0) +.L80241A38: +/* BE51E8 80241A38 AE600070 */ sw $zero, 0x70($s3) +.L80241A3C: +/* BE51EC 80241A3C 8FBF0054 */ lw $ra, 0x54($sp) +/* BE51F0 80241A40 8FB40050 */ lw $s4, 0x50($sp) +/* BE51F4 80241A44 8FB3004C */ lw $s3, 0x4c($sp) +/* BE51F8 80241A48 8FB20048 */ lw $s2, 0x48($sp) +/* BE51FC 80241A4C 8FB10044 */ lw $s1, 0x44($sp) +/* BE5200 80241A50 8FB00040 */ lw $s0, 0x40($sp) +/* BE5204 80241A54 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* BE5208 80241A58 D7B80068 */ ldc1 $f24, 0x68($sp) +/* BE520C 80241A5C D7B60060 */ ldc1 $f22, 0x60($sp) +/* BE5210 80241A60 D7B40058 */ ldc1 $f20, 0x58($sp) +/* BE5214 80241A64 03E00008 */ jr $ra +/* BE5218 80241A68 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C.s deleted file mode 100644 index dbb6456da8..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A6C -/* BE521C 80241A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE5220 80241A70 AFB20018 */ sw $s2, 0x18($sp) -/* BE5224 80241A74 0080902D */ daddu $s2, $a0, $zero -/* BE5228 80241A78 AFBF001C */ sw $ra, 0x1c($sp) -/* BE522C 80241A7C AFB10014 */ sw $s1, 0x14($sp) -/* BE5230 80241A80 AFB00010 */ sw $s0, 0x10($sp) -/* BE5234 80241A84 8E510148 */ lw $s1, 0x148($s2) -/* BE5238 80241A88 0C00EABB */ jal get_npc_unsafe -/* BE523C 80241A8C 86240008 */ lh $a0, 8($s1) -/* BE5240 80241A90 0040802D */ daddu $s0, $v0, $zero -/* BE5244 80241A94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE5248 80241A98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE524C 80241A9C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE5250 80241AA0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE5254 80241AA4 A600008E */ sh $zero, 0x8e($s0) -/* BE5258 80241AA8 8C460028 */ lw $a2, 0x28($v0) -/* BE525C 80241AAC 0C00A720 */ jal atan2 -/* BE5260 80241AB0 8C470030 */ lw $a3, 0x30($v0) -/* BE5264 80241AB4 E600000C */ swc1 $f0, 0xc($s0) -/* BE5268 80241AB8 8E2200CC */ lw $v0, 0xcc($s1) -/* BE526C 80241ABC 8C420020 */ lw $v0, 0x20($v0) -/* BE5270 80241AC0 AE020028 */ sw $v0, 0x28($s0) -/* BE5274 80241AC4 2402000B */ addiu $v0, $zero, 0xb -/* BE5278 80241AC8 AE420070 */ sw $v0, 0x70($s2) -/* BE527C 80241ACC 8FBF001C */ lw $ra, 0x1c($sp) -/* BE5280 80241AD0 8FB20018 */ lw $s2, 0x18($sp) -/* BE5284 80241AD4 8FB10014 */ lw $s1, 0x14($sp) -/* BE5288 80241AD8 8FB00010 */ lw $s0, 0x10($sp) -/* BE528C 80241ADC 03E00008 */ jr $ra -/* BE5290 80241AE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C_BE521C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C_BE521C.s new file mode 100644 index 0000000000..ada6b40866 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241A6C_BE521C.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A6C_BE521C +/* BE521C 80241A6C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BE5220 80241A70 AFB20018 */ sw $s2, 0x18($sp) +/* BE5224 80241A74 0080902D */ daddu $s2, $a0, $zero +/* BE5228 80241A78 AFBF001C */ sw $ra, 0x1c($sp) +/* BE522C 80241A7C AFB10014 */ sw $s1, 0x14($sp) +/* BE5230 80241A80 AFB00010 */ sw $s0, 0x10($sp) +/* BE5234 80241A84 8E510148 */ lw $s1, 0x148($s2) +/* BE5238 80241A88 0C00EABB */ jal get_npc_unsafe +/* BE523C 80241A8C 86240008 */ lh $a0, 8($s1) +/* BE5240 80241A90 0040802D */ daddu $s0, $v0, $zero +/* BE5244 80241A94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BE5248 80241A98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BE524C 80241A9C C60C0038 */ lwc1 $f12, 0x38($s0) +/* BE5250 80241AA0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BE5254 80241AA4 A600008E */ sh $zero, 0x8e($s0) +/* BE5258 80241AA8 8C460028 */ lw $a2, 0x28($v0) +/* BE525C 80241AAC 0C00A720 */ jal atan2 +/* BE5260 80241AB0 8C470030 */ lw $a3, 0x30($v0) +/* BE5264 80241AB4 E600000C */ swc1 $f0, 0xc($s0) +/* BE5268 80241AB8 8E2200CC */ lw $v0, 0xcc($s1) +/* BE526C 80241ABC 8C420020 */ lw $v0, 0x20($v0) +/* BE5270 80241AC0 AE020028 */ sw $v0, 0x28($s0) +/* BE5274 80241AC4 2402000B */ addiu $v0, $zero, 0xb +/* BE5278 80241AC8 AE420070 */ sw $v0, 0x70($s2) +/* BE527C 80241ACC 8FBF001C */ lw $ra, 0x1c($sp) +/* BE5280 80241AD0 8FB20018 */ lw $s2, 0x18($sp) +/* BE5284 80241AD4 8FB10014 */ lw $s1, 0x14($sp) +/* BE5288 80241AD8 8FB00010 */ lw $s0, 0x10($sp) +/* BE528C 80241ADC 03E00008 */ jr $ra +/* BE5290 80241AE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4.s deleted file mode 100644 index 66855806cb..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AE4 -/* BE5294 80241AE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE5298 80241AE8 AFB00010 */ sw $s0, 0x10($sp) -/* BE529C 80241AEC 0080802D */ daddu $s0, $a0, $zero -/* BE52A0 80241AF0 AFBF0014 */ sw $ra, 0x14($sp) -/* BE52A4 80241AF4 8E020148 */ lw $v0, 0x148($s0) -/* BE52A8 80241AF8 0C00EABB */ jal get_npc_unsafe -/* BE52AC 80241AFC 84440008 */ lh $a0, 8($v0) -/* BE52B0 80241B00 9443008E */ lhu $v1, 0x8e($v0) -/* BE52B4 80241B04 C440003C */ lwc1 $f0, 0x3c($v0) -/* BE52B8 80241B08 24640001 */ addiu $a0, $v1, 1 -/* BE52BC 80241B0C 00031C00 */ sll $v1, $v1, 0x10 -/* BE52C0 80241B10 00031B83 */ sra $v1, $v1, 0xe -/* BE52C4 80241B14 A444008E */ sh $a0, 0x8e($v0) -/* BE52C8 80241B18 3C018024 */ lui $at, 0x8024 -/* BE52CC 80241B1C 00230821 */ addu $at, $at, $v1 -/* BE52D0 80241B20 C42236DC */ lwc1 $f2, 0x36dc($at) -/* BE52D4 80241B24 8443008E */ lh $v1, 0x8e($v0) -/* BE52D8 80241B28 46020000 */ add.s $f0, $f0, $f2 -/* BE52DC 80241B2C 28630005 */ slti $v1, $v1, 5 -/* BE52E0 80241B30 14600003 */ bnez $v1, .L80241B40 -/* BE52E4 80241B34 E440003C */ swc1 $f0, 0x3c($v0) -/* BE52E8 80241B38 2402000C */ addiu $v0, $zero, 0xc -/* BE52EC 80241B3C AE020070 */ sw $v0, 0x70($s0) -.L80241B40: -/* BE52F0 80241B40 8FBF0014 */ lw $ra, 0x14($sp) -/* BE52F4 80241B44 8FB00010 */ lw $s0, 0x10($sp) -/* BE52F8 80241B48 03E00008 */ jr $ra -/* BE52FC 80241B4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4_BE5294.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4_BE5294.s new file mode 100644 index 0000000000..30ac9e2e57 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241AE4_BE5294.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AE4_BE5294 +/* BE5294 80241AE4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BE5298 80241AE8 AFB00010 */ sw $s0, 0x10($sp) +/* BE529C 80241AEC 0080802D */ daddu $s0, $a0, $zero +/* BE52A0 80241AF0 AFBF0014 */ sw $ra, 0x14($sp) +/* BE52A4 80241AF4 8E020148 */ lw $v0, 0x148($s0) +/* BE52A8 80241AF8 0C00EABB */ jal get_npc_unsafe +/* BE52AC 80241AFC 84440008 */ lh $a0, 8($v0) +/* BE52B0 80241B00 9443008E */ lhu $v1, 0x8e($v0) +/* BE52B4 80241B04 C440003C */ lwc1 $f0, 0x3c($v0) +/* BE52B8 80241B08 24640001 */ addiu $a0, $v1, 1 +/* BE52BC 80241B0C 00031C00 */ sll $v1, $v1, 0x10 +/* BE52C0 80241B10 00031B83 */ sra $v1, $v1, 0xe +/* BE52C4 80241B14 A444008E */ sh $a0, 0x8e($v0) +/* BE52C8 80241B18 3C018024 */ lui $at, 0x8024 +/* BE52CC 80241B1C 00230821 */ addu $at, $at, $v1 +/* BE52D0 80241B20 C42236DC */ lwc1 $f2, 0x36dc($at) +/* BE52D4 80241B24 8443008E */ lh $v1, 0x8e($v0) +/* BE52D8 80241B28 46020000 */ add.s $f0, $f0, $f2 +/* BE52DC 80241B2C 28630005 */ slti $v1, $v1, 5 +/* BE52E0 80241B30 14600003 */ bnez $v1, .L80241B40 +/* BE52E4 80241B34 E440003C */ swc1 $f0, 0x3c($v0) +/* BE52E8 80241B38 2402000C */ addiu $v0, $zero, 0xc +/* BE52EC 80241B3C AE020070 */ sw $v0, 0x70($s0) +.L80241B40: +/* BE52F0 80241B40 8FBF0014 */ lw $ra, 0x14($sp) +/* BE52F4 80241B44 8FB00010 */ lw $s0, 0x10($sp) +/* BE52F8 80241B48 03E00008 */ jr $ra +/* BE52FC 80241B4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8.s deleted file mode 100644 index 87ef0abaa6..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CE8 -/* BE5498 80241CE8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BE549C 80241CEC AFB20030 */ sw $s2, 0x30($sp) -/* BE54A0 80241CF0 0080902D */ daddu $s2, $a0, $zero -/* BE54A4 80241CF4 AFBF0038 */ sw $ra, 0x38($sp) -/* BE54A8 80241CF8 AFB30034 */ sw $s3, 0x34($sp) -/* BE54AC 80241CFC AFB1002C */ sw $s1, 0x2c($sp) -/* BE54B0 80241D00 AFB00028 */ sw $s0, 0x28($sp) -/* BE54B4 80241D04 F7B60048 */ sdc1 $f22, 0x48($sp) -/* BE54B8 80241D08 F7B40040 */ sdc1 $f20, 0x40($sp) -/* BE54BC 80241D0C 8E510148 */ lw $s1, 0x148($s2) -/* BE54C0 80241D10 86240008 */ lh $a0, 8($s1) -/* BE54C4 80241D14 0C00EABB */ jal get_npc_unsafe -/* BE54C8 80241D18 00A0982D */ daddu $s3, $a1, $zero -/* BE54CC 80241D1C 0040802D */ daddu $s0, $v0, $zero -/* BE54D0 80241D20 0200202D */ daddu $a0, $s0, $zero -/* BE54D4 80241D24 C6220088 */ lwc1 $f2, 0x88($s1) -/* BE54D8 80241D28 468010A0 */ cvt.s.w $f2, $f2 -/* BE54DC 80241D2C 460010A1 */ cvt.d.s $f2, $f2 -/* BE54E0 80241D30 C604001C */ lwc1 $f4, 0x1c($s0) -/* BE54E4 80241D34 C6000014 */ lwc1 $f0, 0x14($s0) -/* BE54E8 80241D38 8E050018 */ lw $a1, 0x18($s0) -/* BE54EC 80241D3C 46002100 */ add.s $f4, $f4, $f0 -/* BE54F0 80241D40 8E06000C */ lw $a2, 0xc($s0) -/* BE54F4 80241D44 C6200078 */ lwc1 $f0, 0x78($s1) -/* BE54F8 80241D48 46800020 */ cvt.s.w $f0, $f0 -/* BE54FC 80241D4C E604001C */ swc1 $f4, 0x1c($s0) -/* BE5500 80241D50 3C014059 */ lui $at, 0x4059 -/* BE5504 80241D54 44812800 */ mtc1 $at, $f5 -/* BE5508 80241D58 44802000 */ mtc1 $zero, $f4 -/* BE550C 80241D5C 46000021 */ cvt.d.s $f0, $f0 -/* BE5510 80241D60 46240003 */ div.d $f0, $f0, $f4 -/* BE5514 80241D64 46200520 */ cvt.s.d $f20, $f0 -/* BE5518 80241D68 46241083 */ div.d $f2, $f2, $f4 -/* BE551C 80241D6C 0C00EA95 */ jal npc_move_heading -/* BE5520 80241D70 462015A0 */ cvt.s.d $f22, $f2 -/* BE5524 80241D74 C604001C */ lwc1 $f4, 0x1c($s0) -/* BE5528 80241D78 44801000 */ mtc1 $zero, $f2 -/* BE552C 80241D7C 44801800 */ mtc1 $zero, $f3 -/* BE5530 80241D80 46002021 */ cvt.d.s $f0, $f4 -/* BE5534 80241D84 4620103E */ c.le.d $f2, $f0 -/* BE5538 80241D88 00000000 */ nop -/* BE553C 80241D8C 45000030 */ bc1f .L80241E50 -/* BE5540 80241D90 00000000 */ nop -/* BE5544 80241D94 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE5548 80241D98 46040000 */ add.s $f0, $f0, $f4 -/* BE554C 80241D9C E600003C */ swc1 $f0, 0x3c($s0) -/* BE5550 80241DA0 8E2200CC */ lw $v0, 0xcc($s1) -/* BE5554 80241DA4 8C420024 */ lw $v0, 0x24($v0) -/* BE5558 80241DA8 AE020028 */ sw $v0, 0x28($s0) -/* BE555C 80241DAC A2200007 */ sb $zero, 7($s1) -/* BE5560 80241DB0 8E020000 */ lw $v0, ($s0) -/* BE5564 80241DB4 30420008 */ andi $v0, $v0, 8 -/* BE5568 80241DB8 14400011 */ bnez $v0, .L80241E00 -/* BE556C 80241DBC 0000102D */ daddu $v0, $zero, $zero -/* BE5570 80241DC0 27A50018 */ addiu $a1, $sp, 0x18 -/* BE5574 80241DC4 27A6001C */ addiu $a2, $sp, 0x1c -/* BE5578 80241DC8 C6000038 */ lwc1 $f0, 0x38($s0) -/* BE557C 80241DCC C602003C */ lwc1 $f2, 0x3c($s0) -/* BE5580 80241DD0 C6040040 */ lwc1 $f4, 0x40($s0) -/* BE5584 80241DD4 3C01447A */ lui $at, 0x447a -/* BE5588 80241DD8 44813000 */ mtc1 $at, $f6 -/* BE558C 80241DDC 27A20024 */ addiu $v0, $sp, 0x24 -/* BE5590 80241DE0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BE5594 80241DE4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BE5598 80241DE8 E7A40020 */ swc1 $f4, 0x20($sp) -/* BE559C 80241DEC E7A60024 */ swc1 $f6, 0x24($sp) -/* BE55A0 80241DF0 AFA20010 */ sw $v0, 0x10($sp) -/* BE55A4 80241DF4 8E040080 */ lw $a0, 0x80($s0) -/* BE55A8 80241DF8 0C0372DF */ jal func_800DCB7C -/* BE55AC 80241DFC 27A70020 */ addiu $a3, $sp, 0x20 -.L80241E00: -/* BE55B0 80241E00 1040000B */ beqz $v0, .L80241E30 -/* BE55B4 80241E04 00000000 */ nop -/* BE55B8 80241E08 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BE55BC 80241E0C 46140080 */ add.s $f2, $f0, $f20 -/* BE55C0 80241E10 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE55C4 80241E14 4600103E */ c.le.s $f2, $f0 -/* BE55C8 80241E18 00000000 */ nop -/* BE55CC 80241E1C 4500008D */ bc1f .L80242054 -/* BE55D0 80241E20 00000000 */ nop -/* BE55D4 80241E24 E602003C */ swc1 $f2, 0x3c($s0) -/* BE55D8 80241E28 08090815 */ j .L80242054 -/* BE55DC 80241E2C AE400070 */ sw $zero, 0x70($s2) -.L80241E30: -/* BE55E0 80241E30 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE55E4 80241E34 C6000064 */ lwc1 $f0, 0x64($s0) -/* BE55E8 80241E38 4602003E */ c.le.s $f0, $f2 -/* BE55EC 80241E3C 00000000 */ nop -/* BE55F0 80241E40 45030084 */ bc1tl .L80242054 -/* BE55F4 80241E44 AE400070 */ sw $zero, 0x70($s2) -/* BE55F8 80241E48 08090815 */ j .L80242054 -/* BE55FC 80241E4C 00000000 */ nop -.L80241E50: -/* BE5600 80241E50 4622003C */ c.lt.d $f0, $f2 -/* BE5604 80241E54 00000000 */ nop -/* BE5608 80241E58 4500007E */ bc1f .L80242054 -/* BE560C 80241E5C 00000000 */ nop -/* BE5610 80241E60 9602008E */ lhu $v0, 0x8e($s0) -/* BE5614 80241E64 24420001 */ addiu $v0, $v0, 1 -/* BE5618 80241E68 A602008E */ sh $v0, 0x8e($s0) -/* BE561C 80241E6C 00021400 */ sll $v0, $v0, 0x10 -/* BE5620 80241E70 8E630020 */ lw $v1, 0x20($s3) -/* BE5624 80241E74 00021403 */ sra $v0, $v0, 0x10 -/* BE5628 80241E78 0043102A */ slt $v0, $v0, $v1 -/* BE562C 80241E7C 14400026 */ bnez $v0, .L80241F18 -/* BE5630 80241E80 00000000 */ nop -/* BE5634 80241E84 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE5638 80241E88 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE563C 80241E8C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE5640 80241E90 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE5644 80241E94 A600008E */ sh $zero, 0x8e($s0) -/* BE5648 80241E98 8C460028 */ lw $a2, 0x28($v0) -/* BE564C 80241E9C 0C00A720 */ jal atan2 -/* BE5650 80241EA0 8C470030 */ lw $a3, 0x30($v0) -/* BE5654 80241EA4 46000506 */ mov.s $f20, $f0 -/* BE5658 80241EA8 C60C000C */ lwc1 $f12, 0xc($s0) -/* BE565C 80241EAC 0C00A70A */ jal get_clamped_angle_diff -/* BE5660 80241EB0 4600A386 */ mov.s $f14, $f20 -/* BE5664 80241EB4 46000086 */ mov.s $f2, $f0 -/* BE5668 80241EB8 8E62001C */ lw $v0, 0x1c($s3) -/* BE566C 80241EBC 46001005 */ abs.s $f0, $f2 -/* BE5670 80241EC0 44822000 */ mtc1 $v0, $f4 -/* BE5674 80241EC4 00000000 */ nop -/* BE5678 80241EC8 46802120 */ cvt.s.w $f4, $f4 -/* BE567C 80241ECC 4600203C */ c.lt.s $f4, $f0 -/* BE5680 80241ED0 00000000 */ nop -/* BE5684 80241ED4 4500000D */ bc1f .L80241F0C -/* BE5688 80241ED8 00000000 */ nop -/* BE568C 80241EDC 44800000 */ mtc1 $zero, $f0 -/* BE5690 80241EE0 C614000C */ lwc1 $f20, 0xc($s0) -/* BE5694 80241EE4 4600103C */ c.lt.s $f2, $f0 -/* BE5698 80241EE8 00000000 */ nop -/* BE569C 80241EEC 45000006 */ bc1f .L80241F08 -/* BE56A0 80241EF0 00021023 */ negu $v0, $v0 -/* BE56A4 80241EF4 44820000 */ mtc1 $v0, $f0 -/* BE56A8 80241EF8 00000000 */ nop -/* BE56AC 80241EFC 46800020 */ cvt.s.w $f0, $f0 -/* BE56B0 80241F00 080907C3 */ j .L80241F0C -/* BE56B4 80241F04 4600A500 */ add.s $f20, $f20, $f0 -.L80241F08: -/* BE56B8 80241F08 4604A500 */ add.s $f20, $f20, $f4 -.L80241F0C: -/* BE56BC 80241F0C 0C00A6C9 */ jal clamp_angle -/* BE56C0 80241F10 4600A306 */ mov.s $f12, $f20 -/* BE56C4 80241F14 E600000C */ swc1 $f0, 0xc($s0) -.L80241F18: -/* BE56C8 80241F18 8E020000 */ lw $v0, ($s0) -/* BE56CC 80241F1C 30420008 */ andi $v0, $v0, 8 -/* BE56D0 80241F20 1040000A */ beqz $v0, .L80241F4C -/* BE56D4 80241F24 27A50018 */ addiu $a1, $sp, 0x18 -/* BE56D8 80241F28 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE56DC 80241F2C C600001C */ lwc1 $f0, 0x1c($s0) -/* BE56E0 80241F30 46001080 */ add.s $f2, $f2, $f0 -/* BE56E4 80241F34 4616103C */ c.lt.s $f2, $f22 -/* BE56E8 80241F38 00000000 */ nop -/* BE56EC 80241F3C 45020045 */ bc1fl .L80242054 -/* BE56F0 80241F40 E602003C */ swc1 $f2, 0x3c($s0) -/* BE56F4 80241F44 08090814 */ j .L80242050 -/* BE56F8 80241F48 E616003C */ swc1 $f22, 0x3c($s0) -.L80241F4C: -/* BE56FC 80241F4C C6000038 */ lwc1 $f0, 0x38($s0) -/* BE5700 80241F50 27A6001C */ addiu $a2, $sp, 0x1c -/* BE5704 80241F54 E7A00018 */ swc1 $f0, 0x18($sp) -/* BE5708 80241F58 860200A8 */ lh $v0, 0xa8($s0) -/* BE570C 80241F5C C600001C */ lwc1 $f0, 0x1c($s0) -/* BE5710 80241F60 C604003C */ lwc1 $f4, 0x3c($s0) -/* BE5714 80241F64 44821000 */ mtc1 $v0, $f2 -/* BE5718 80241F68 00000000 */ nop -/* BE571C 80241F6C 468010A0 */ cvt.s.w $f2, $f2 -/* BE5720 80241F70 46000005 */ abs.s $f0, $f0 -/* BE5724 80241F74 46020000 */ add.s $f0, $f0, $f2 -/* BE5728 80241F78 C6060040 */ lwc1 $f6, 0x40($s0) -/* BE572C 80241F7C 27A20024 */ addiu $v0, $sp, 0x24 -/* BE5730 80241F80 46022100 */ add.s $f4, $f4, $f2 -/* BE5734 80241F84 3C014024 */ lui $at, 0x4024 -/* BE5738 80241F88 44811800 */ mtc1 $at, $f3 -/* BE573C 80241F8C 44801000 */ mtc1 $zero, $f2 -/* BE5740 80241F90 46000021 */ cvt.d.s $f0, $f0 -/* BE5744 80241F94 46220000 */ add.d $f0, $f0, $f2 -/* BE5748 80241F98 E7A60020 */ swc1 $f6, 0x20($sp) -/* BE574C 80241F9C E7A4001C */ swc1 $f4, 0x1c($sp) -/* BE5750 80241FA0 46200020 */ cvt.s.d $f0, $f0 -/* BE5754 80241FA4 E7A00024 */ swc1 $f0, 0x24($sp) -/* BE5758 80241FA8 AFA20010 */ sw $v0, 0x10($sp) -/* BE575C 80241FAC 8E040080 */ lw $a0, 0x80($s0) -/* BE5760 80241FB0 0C0372DF */ jal func_800DCB7C -/* BE5764 80241FB4 27A70020 */ addiu $a3, $sp, 0x20 -/* BE5768 80241FB8 10400015 */ beqz $v0, .L80242010 -/* BE576C 80241FBC 00000000 */ nop -/* BE5770 80241FC0 860200A8 */ lh $v0, 0xa8($s0) -/* BE5774 80241FC4 C604001C */ lwc1 $f4, 0x1c($s0) -/* BE5778 80241FC8 44820000 */ mtc1 $v0, $f0 -/* BE577C 80241FCC 00000000 */ nop -/* BE5780 80241FD0 46800020 */ cvt.s.w $f0, $f0 -/* BE5784 80241FD4 46002085 */ abs.s $f2, $f4 -/* BE5788 80241FD8 46020000 */ add.s $f0, $f0, $f2 -/* BE578C 80241FDC C7A20024 */ lwc1 $f2, 0x24($sp) -/* BE5790 80241FE0 4600103E */ c.le.s $f2, $f0 -/* BE5794 80241FE4 00000000 */ nop -/* BE5798 80241FE8 45000005 */ bc1f .L80242000 -/* BE579C 80241FEC 00000000 */ nop -/* BE57A0 80241FF0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BE57A4 80241FF4 AE00001C */ sw $zero, 0x1c($s0) -/* BE57A8 80241FF8 08090815 */ j .L80242054 -/* BE57AC 80241FFC E600003C */ swc1 $f0, 0x3c($s0) -.L80242000: -/* BE57B0 80242000 C600003C */ lwc1 $f0, 0x3c($s0) -/* BE57B4 80242004 46040000 */ add.s $f0, $f0, $f4 -/* BE57B8 80242008 08090815 */ j .L80242054 -/* BE57BC 8024200C E600003C */ swc1 $f0, 0x3c($s0) -.L80242010: -/* BE57C0 80242010 C606003C */ lwc1 $f6, 0x3c($s0) -/* BE57C4 80242014 860200A8 */ lh $v0, 0xa8($s0) -/* BE57C8 80242018 46163081 */ sub.s $f2, $f6, $f22 -/* BE57CC 8024201C 44820000 */ mtc1 $v0, $f0 -/* BE57D0 80242020 00000000 */ nop -/* BE57D4 80242024 46800020 */ cvt.s.w $f0, $f0 -/* BE57D8 80242028 46001080 */ add.s $f2, $f2, $f0 -/* BE57DC 8024202C C604001C */ lwc1 $f4, 0x1c($s0) -/* BE57E0 80242030 46002005 */ abs.s $f0, $f4 -/* BE57E4 80242034 4602003C */ c.lt.s $f0, $f2 -/* BE57E8 80242038 00000000 */ nop -/* BE57EC 8024203C 45020005 */ bc1fl .L80242054 -/* BE57F0 80242040 AE00001C */ sw $zero, 0x1c($s0) -/* BE57F4 80242044 46043000 */ add.s $f0, $f6, $f4 -/* BE57F8 80242048 08090815 */ j .L80242054 -/* BE57FC 8024204C E600003C */ swc1 $f0, 0x3c($s0) -.L80242050: -/* BE5800 80242050 AE00001C */ sw $zero, 0x1c($s0) -.L80242054: -/* BE5804 80242054 8FBF0038 */ lw $ra, 0x38($sp) -/* BE5808 80242058 8FB30034 */ lw $s3, 0x34($sp) -/* BE580C 8024205C 8FB20030 */ lw $s2, 0x30($sp) -/* BE5810 80242060 8FB1002C */ lw $s1, 0x2c($sp) -/* BE5814 80242064 8FB00028 */ lw $s0, 0x28($sp) -/* BE5818 80242068 D7B60048 */ ldc1 $f22, 0x48($sp) -/* BE581C 8024206C D7B40040 */ ldc1 $f20, 0x40($sp) -/* BE5820 80242070 03E00008 */ jr $ra -/* BE5824 80242074 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8_BE5498.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8_BE5498.s new file mode 100644 index 0000000000..e349ca4271 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80241CE8_BE5498.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CE8_BE5498 +/* BE5498 80241CE8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BE549C 80241CEC AFB20030 */ sw $s2, 0x30($sp) +/* BE54A0 80241CF0 0080902D */ daddu $s2, $a0, $zero +/* BE54A4 80241CF4 AFBF0038 */ sw $ra, 0x38($sp) +/* BE54A8 80241CF8 AFB30034 */ sw $s3, 0x34($sp) +/* BE54AC 80241CFC AFB1002C */ sw $s1, 0x2c($sp) +/* BE54B0 80241D00 AFB00028 */ sw $s0, 0x28($sp) +/* BE54B4 80241D04 F7B60048 */ sdc1 $f22, 0x48($sp) +/* BE54B8 80241D08 F7B40040 */ sdc1 $f20, 0x40($sp) +/* BE54BC 80241D0C 8E510148 */ lw $s1, 0x148($s2) +/* BE54C0 80241D10 86240008 */ lh $a0, 8($s1) +/* BE54C4 80241D14 0C00EABB */ jal get_npc_unsafe +/* BE54C8 80241D18 00A0982D */ daddu $s3, $a1, $zero +/* BE54CC 80241D1C 0040802D */ daddu $s0, $v0, $zero +/* BE54D0 80241D20 0200202D */ daddu $a0, $s0, $zero +/* BE54D4 80241D24 C6220088 */ lwc1 $f2, 0x88($s1) +/* BE54D8 80241D28 468010A0 */ cvt.s.w $f2, $f2 +/* BE54DC 80241D2C 460010A1 */ cvt.d.s $f2, $f2 +/* BE54E0 80241D30 C604001C */ lwc1 $f4, 0x1c($s0) +/* BE54E4 80241D34 C6000014 */ lwc1 $f0, 0x14($s0) +/* BE54E8 80241D38 8E050018 */ lw $a1, 0x18($s0) +/* BE54EC 80241D3C 46002100 */ add.s $f4, $f4, $f0 +/* BE54F0 80241D40 8E06000C */ lw $a2, 0xc($s0) +/* BE54F4 80241D44 C6200078 */ lwc1 $f0, 0x78($s1) +/* BE54F8 80241D48 46800020 */ cvt.s.w $f0, $f0 +/* BE54FC 80241D4C E604001C */ swc1 $f4, 0x1c($s0) +/* BE5500 80241D50 3C014059 */ lui $at, 0x4059 +/* BE5504 80241D54 44812800 */ mtc1 $at, $f5 +/* BE5508 80241D58 44802000 */ mtc1 $zero, $f4 +/* BE550C 80241D5C 46000021 */ cvt.d.s $f0, $f0 +/* BE5510 80241D60 46240003 */ div.d $f0, $f0, $f4 +/* BE5514 80241D64 46200520 */ cvt.s.d $f20, $f0 +/* BE5518 80241D68 46241083 */ div.d $f2, $f2, $f4 +/* BE551C 80241D6C 0C00EA95 */ jal npc_move_heading +/* BE5520 80241D70 462015A0 */ cvt.s.d $f22, $f2 +/* BE5524 80241D74 C604001C */ lwc1 $f4, 0x1c($s0) +/* BE5528 80241D78 44801000 */ mtc1 $zero, $f2 +/* BE552C 80241D7C 44801800 */ mtc1 $zero, $f3 +/* BE5530 80241D80 46002021 */ cvt.d.s $f0, $f4 +/* BE5534 80241D84 4620103E */ c.le.d $f2, $f0 +/* BE5538 80241D88 00000000 */ nop +/* BE553C 80241D8C 45000030 */ bc1f .L80241E50 +/* BE5540 80241D90 00000000 */ nop +/* BE5544 80241D94 C600003C */ lwc1 $f0, 0x3c($s0) +/* BE5548 80241D98 46040000 */ add.s $f0, $f0, $f4 +/* BE554C 80241D9C E600003C */ swc1 $f0, 0x3c($s0) +/* BE5550 80241DA0 8E2200CC */ lw $v0, 0xcc($s1) +/* BE5554 80241DA4 8C420024 */ lw $v0, 0x24($v0) +/* BE5558 80241DA8 AE020028 */ sw $v0, 0x28($s0) +/* BE555C 80241DAC A2200007 */ sb $zero, 7($s1) +/* BE5560 80241DB0 8E020000 */ lw $v0, ($s0) +/* BE5564 80241DB4 30420008 */ andi $v0, $v0, 8 +/* BE5568 80241DB8 14400011 */ bnez $v0, .L80241E00 +/* BE556C 80241DBC 0000102D */ daddu $v0, $zero, $zero +/* BE5570 80241DC0 27A50018 */ addiu $a1, $sp, 0x18 +/* BE5574 80241DC4 27A6001C */ addiu $a2, $sp, 0x1c +/* BE5578 80241DC8 C6000038 */ lwc1 $f0, 0x38($s0) +/* BE557C 80241DCC C602003C */ lwc1 $f2, 0x3c($s0) +/* BE5580 80241DD0 C6040040 */ lwc1 $f4, 0x40($s0) +/* BE5584 80241DD4 3C01447A */ lui $at, 0x447a +/* BE5588 80241DD8 44813000 */ mtc1 $at, $f6 +/* BE558C 80241DDC 27A20024 */ addiu $v0, $sp, 0x24 +/* BE5590 80241DE0 E7A00018 */ swc1 $f0, 0x18($sp) +/* BE5594 80241DE4 E7A2001C */ swc1 $f2, 0x1c($sp) +/* BE5598 80241DE8 E7A40020 */ swc1 $f4, 0x20($sp) +/* BE559C 80241DEC E7A60024 */ swc1 $f6, 0x24($sp) +/* BE55A0 80241DF0 AFA20010 */ sw $v0, 0x10($sp) +/* BE55A4 80241DF4 8E040080 */ lw $a0, 0x80($s0) +/* BE55A8 80241DF8 0C0372DF */ jal func_800DCB7C +/* BE55AC 80241DFC 27A70020 */ addiu $a3, $sp, 0x20 +.L80241E00: +/* BE55B0 80241E00 1040000B */ beqz $v0, .L80241E30 +/* BE55B4 80241E04 00000000 */ nop +/* BE55B8 80241E08 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* BE55BC 80241E0C 46140080 */ add.s $f2, $f0, $f20 +/* BE55C0 80241E10 C600003C */ lwc1 $f0, 0x3c($s0) +/* BE55C4 80241E14 4600103E */ c.le.s $f2, $f0 +/* BE55C8 80241E18 00000000 */ nop +/* BE55CC 80241E1C 4500008D */ bc1f .L80242054 +/* BE55D0 80241E20 00000000 */ nop +/* BE55D4 80241E24 E602003C */ swc1 $f2, 0x3c($s0) +/* BE55D8 80241E28 08090815 */ j .L80242054 +/* BE55DC 80241E2C AE400070 */ sw $zero, 0x70($s2) +.L80241E30: +/* BE55E0 80241E30 C602003C */ lwc1 $f2, 0x3c($s0) +/* BE55E4 80241E34 C6000064 */ lwc1 $f0, 0x64($s0) +/* BE55E8 80241E38 4602003E */ c.le.s $f0, $f2 +/* BE55EC 80241E3C 00000000 */ nop +/* BE55F0 80241E40 45030084 */ bc1tl .L80242054 +/* BE55F4 80241E44 AE400070 */ sw $zero, 0x70($s2) +/* BE55F8 80241E48 08090815 */ j .L80242054 +/* BE55FC 80241E4C 00000000 */ nop +.L80241E50: +/* BE5600 80241E50 4622003C */ c.lt.d $f0, $f2 +/* BE5604 80241E54 00000000 */ nop +/* BE5608 80241E58 4500007E */ bc1f .L80242054 +/* BE560C 80241E5C 00000000 */ nop +/* BE5610 80241E60 9602008E */ lhu $v0, 0x8e($s0) +/* BE5614 80241E64 24420001 */ addiu $v0, $v0, 1 +/* BE5618 80241E68 A602008E */ sh $v0, 0x8e($s0) +/* BE561C 80241E6C 00021400 */ sll $v0, $v0, 0x10 +/* BE5620 80241E70 8E630020 */ lw $v1, 0x20($s3) +/* BE5624 80241E74 00021403 */ sra $v0, $v0, 0x10 +/* BE5628 80241E78 0043102A */ slt $v0, $v0, $v1 +/* BE562C 80241E7C 14400026 */ bnez $v0, .L80241F18 +/* BE5630 80241E80 00000000 */ nop +/* BE5634 80241E84 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BE5638 80241E88 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BE563C 80241E8C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BE5640 80241E90 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BE5644 80241E94 A600008E */ sh $zero, 0x8e($s0) +/* BE5648 80241E98 8C460028 */ lw $a2, 0x28($v0) +/* BE564C 80241E9C 0C00A720 */ jal atan2 +/* BE5650 80241EA0 8C470030 */ lw $a3, 0x30($v0) +/* BE5654 80241EA4 46000506 */ mov.s $f20, $f0 +/* BE5658 80241EA8 C60C000C */ lwc1 $f12, 0xc($s0) +/* BE565C 80241EAC 0C00A70A */ jal get_clamped_angle_diff +/* BE5660 80241EB0 4600A386 */ mov.s $f14, $f20 +/* BE5664 80241EB4 46000086 */ mov.s $f2, $f0 +/* BE5668 80241EB8 8E62001C */ lw $v0, 0x1c($s3) +/* BE566C 80241EBC 46001005 */ abs.s $f0, $f2 +/* BE5670 80241EC0 44822000 */ mtc1 $v0, $f4 +/* BE5674 80241EC4 00000000 */ nop +/* BE5678 80241EC8 46802120 */ cvt.s.w $f4, $f4 +/* BE567C 80241ECC 4600203C */ c.lt.s $f4, $f0 +/* BE5680 80241ED0 00000000 */ nop +/* BE5684 80241ED4 4500000D */ bc1f .L80241F0C +/* BE5688 80241ED8 00000000 */ nop +/* BE568C 80241EDC 44800000 */ mtc1 $zero, $f0 +/* BE5690 80241EE0 C614000C */ lwc1 $f20, 0xc($s0) +/* BE5694 80241EE4 4600103C */ c.lt.s $f2, $f0 +/* BE5698 80241EE8 00000000 */ nop +/* BE569C 80241EEC 45000006 */ bc1f .L80241F08 +/* BE56A0 80241EF0 00021023 */ negu $v0, $v0 +/* BE56A4 80241EF4 44820000 */ mtc1 $v0, $f0 +/* BE56A8 80241EF8 00000000 */ nop +/* BE56AC 80241EFC 46800020 */ cvt.s.w $f0, $f0 +/* BE56B0 80241F00 080907C3 */ j .L80241F0C +/* BE56B4 80241F04 4600A500 */ add.s $f20, $f20, $f0 +.L80241F08: +/* BE56B8 80241F08 4604A500 */ add.s $f20, $f20, $f4 +.L80241F0C: +/* BE56BC 80241F0C 0C00A6C9 */ jal clamp_angle +/* BE56C0 80241F10 4600A306 */ mov.s $f12, $f20 +/* BE56C4 80241F14 E600000C */ swc1 $f0, 0xc($s0) +.L80241F18: +/* BE56C8 80241F18 8E020000 */ lw $v0, ($s0) +/* BE56CC 80241F1C 30420008 */ andi $v0, $v0, 8 +/* BE56D0 80241F20 1040000A */ beqz $v0, .L80241F4C +/* BE56D4 80241F24 27A50018 */ addiu $a1, $sp, 0x18 +/* BE56D8 80241F28 C602003C */ lwc1 $f2, 0x3c($s0) +/* BE56DC 80241F2C C600001C */ lwc1 $f0, 0x1c($s0) +/* BE56E0 80241F30 46001080 */ add.s $f2, $f2, $f0 +/* BE56E4 80241F34 4616103C */ c.lt.s $f2, $f22 +/* BE56E8 80241F38 00000000 */ nop +/* BE56EC 80241F3C 45020045 */ bc1fl .L80242054 +/* BE56F0 80241F40 E602003C */ swc1 $f2, 0x3c($s0) +/* BE56F4 80241F44 08090814 */ j .L80242050 +/* BE56F8 80241F48 E616003C */ swc1 $f22, 0x3c($s0) +.L80241F4C: +/* BE56FC 80241F4C C6000038 */ lwc1 $f0, 0x38($s0) +/* BE5700 80241F50 27A6001C */ addiu $a2, $sp, 0x1c +/* BE5704 80241F54 E7A00018 */ swc1 $f0, 0x18($sp) +/* BE5708 80241F58 860200A8 */ lh $v0, 0xa8($s0) +/* BE570C 80241F5C C600001C */ lwc1 $f0, 0x1c($s0) +/* BE5710 80241F60 C604003C */ lwc1 $f4, 0x3c($s0) +/* BE5714 80241F64 44821000 */ mtc1 $v0, $f2 +/* BE5718 80241F68 00000000 */ nop +/* BE571C 80241F6C 468010A0 */ cvt.s.w $f2, $f2 +/* BE5720 80241F70 46000005 */ abs.s $f0, $f0 +/* BE5724 80241F74 46020000 */ add.s $f0, $f0, $f2 +/* BE5728 80241F78 C6060040 */ lwc1 $f6, 0x40($s0) +/* BE572C 80241F7C 27A20024 */ addiu $v0, $sp, 0x24 +/* BE5730 80241F80 46022100 */ add.s $f4, $f4, $f2 +/* BE5734 80241F84 3C014024 */ lui $at, 0x4024 +/* BE5738 80241F88 44811800 */ mtc1 $at, $f3 +/* BE573C 80241F8C 44801000 */ mtc1 $zero, $f2 +/* BE5740 80241F90 46000021 */ cvt.d.s $f0, $f0 +/* BE5744 80241F94 46220000 */ add.d $f0, $f0, $f2 +/* BE5748 80241F98 E7A60020 */ swc1 $f6, 0x20($sp) +/* BE574C 80241F9C E7A4001C */ swc1 $f4, 0x1c($sp) +/* BE5750 80241FA0 46200020 */ cvt.s.d $f0, $f0 +/* BE5754 80241FA4 E7A00024 */ swc1 $f0, 0x24($sp) +/* BE5758 80241FA8 AFA20010 */ sw $v0, 0x10($sp) +/* BE575C 80241FAC 8E040080 */ lw $a0, 0x80($s0) +/* BE5760 80241FB0 0C0372DF */ jal func_800DCB7C +/* BE5764 80241FB4 27A70020 */ addiu $a3, $sp, 0x20 +/* BE5768 80241FB8 10400015 */ beqz $v0, .L80242010 +/* BE576C 80241FBC 00000000 */ nop +/* BE5770 80241FC0 860200A8 */ lh $v0, 0xa8($s0) +/* BE5774 80241FC4 C604001C */ lwc1 $f4, 0x1c($s0) +/* BE5778 80241FC8 44820000 */ mtc1 $v0, $f0 +/* BE577C 80241FCC 00000000 */ nop +/* BE5780 80241FD0 46800020 */ cvt.s.w $f0, $f0 +/* BE5784 80241FD4 46002085 */ abs.s $f2, $f4 +/* BE5788 80241FD8 46020000 */ add.s $f0, $f0, $f2 +/* BE578C 80241FDC C7A20024 */ lwc1 $f2, 0x24($sp) +/* BE5790 80241FE0 4600103E */ c.le.s $f2, $f0 +/* BE5794 80241FE4 00000000 */ nop +/* BE5798 80241FE8 45000005 */ bc1f .L80242000 +/* BE579C 80241FEC 00000000 */ nop +/* BE57A0 80241FF0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* BE57A4 80241FF4 AE00001C */ sw $zero, 0x1c($s0) +/* BE57A8 80241FF8 08090815 */ j .L80242054 +/* BE57AC 80241FFC E600003C */ swc1 $f0, 0x3c($s0) +.L80242000: +/* BE57B0 80242000 C600003C */ lwc1 $f0, 0x3c($s0) +/* BE57B4 80242004 46040000 */ add.s $f0, $f0, $f4 +/* BE57B8 80242008 08090815 */ j .L80242054 +/* BE57BC 8024200C E600003C */ swc1 $f0, 0x3c($s0) +.L80242010: +/* BE57C0 80242010 C606003C */ lwc1 $f6, 0x3c($s0) +/* BE57C4 80242014 860200A8 */ lh $v0, 0xa8($s0) +/* BE57C8 80242018 46163081 */ sub.s $f2, $f6, $f22 +/* BE57CC 8024201C 44820000 */ mtc1 $v0, $f0 +/* BE57D0 80242020 00000000 */ nop +/* BE57D4 80242024 46800020 */ cvt.s.w $f0, $f0 +/* BE57D8 80242028 46001080 */ add.s $f2, $f2, $f0 +/* BE57DC 8024202C C604001C */ lwc1 $f4, 0x1c($s0) +/* BE57E0 80242030 46002005 */ abs.s $f0, $f4 +/* BE57E4 80242034 4602003C */ c.lt.s $f0, $f2 +/* BE57E8 80242038 00000000 */ nop +/* BE57EC 8024203C 45020005 */ bc1fl .L80242054 +/* BE57F0 80242040 AE00001C */ sw $zero, 0x1c($s0) +/* BE57F4 80242044 46043000 */ add.s $f0, $f6, $f4 +/* BE57F8 80242048 08090815 */ j .L80242054 +/* BE57FC 8024204C E600003C */ swc1 $f0, 0x3c($s0) +.L80242050: +/* BE5800 80242050 AE00001C */ sw $zero, 0x1c($s0) +.L80242054: +/* BE5804 80242054 8FBF0038 */ lw $ra, 0x38($sp) +/* BE5808 80242058 8FB30034 */ lw $s3, 0x34($sp) +/* BE580C 8024205C 8FB20030 */ lw $s2, 0x30($sp) +/* BE5810 80242060 8FB1002C */ lw $s1, 0x2c($sp) +/* BE5814 80242064 8FB00028 */ lw $s0, 0x28($sp) +/* BE5818 80242068 D7B60048 */ ldc1 $f22, 0x48($sp) +/* BE581C 8024206C D7B40040 */ ldc1 $f20, 0x40($sp) +/* BE5820 80242070 03E00008 */ jr $ra +/* BE5824 80242074 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s index c840586267..1b867e8922 100644 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024219C_BE594C.s @@ -46,7 +46,7 @@ glabel func_8024219C_BE594C /* BE59F0 80242240 02A0202D */ daddu $a0, $s5, $zero /* BE59F4 80242244 0240282D */ daddu $a1, $s2, $zero /* BE59F8 80242248 0280302D */ daddu $a2, $s4, $zero -/* BE59FC 8024224C 0C09081E */ jal func_80242078 +/* BE59FC 8024224C 0C09081E */ jal func_80242078_BE5828 /* BE5A00 80242250 0200382D */ daddu $a3, $s0, $zero .L80242254: /* BE5A04 80242254 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_8024219C_BE594C /* BE5A54 802422A4 00000000 */ nop /* BE5A58 802422A8 0280202D */ daddu $a0, $s4, $zero /* BE5A5C 802422AC 0200282D */ daddu $a1, $s0, $zero -/* BE5A60 802422B0 0C0903A4 */ jal func_80240E90 +/* BE5A60 802422B0 0C0903A4 */ jal func_80240E90_BE4640 /* BE5A64 802422B4 0260302D */ daddu $a2, $s3, $zero /* BE5A68 802422B8 0280202D */ daddu $a0, $s4, $zero /* BE5A6C 802422BC 0200282D */ daddu $a1, $s0, $zero -/* BE5A70 802422C0 0C090410 */ jal func_80241040 +/* BE5A70 802422C0 0C090410 */ jal func_80241040_BE47F0 /* BE5A74 802422C4 0260302D */ daddu $a2, $s3, $zero /* BE5A78 802422C8 080908D9 */ j .L80242364 /* BE5A7C 802422CC 0000102D */ daddu $v0, $zero, $zero /* BE5A80 802422D0 0280202D */ daddu $a0, $s4, $zero /* BE5A84 802422D4 0200282D */ daddu $a1, $s0, $zero -/* BE5A88 802422D8 0C09059A */ jal func_80241668 +/* BE5A88 802422D8 0C09059A */ jal func_80241668_BE4E18 /* BE5A8C 802422DC 0260302D */ daddu $a2, $s3, $zero /* BE5A90 802422E0 0280202D */ daddu $a0, $s4, $zero /* BE5A94 802422E4 0200282D */ daddu $a1, $s0, $zero -/* BE5A98 802422E8 0C0905CA */ jal func_80241728 +/* BE5A98 802422E8 0C0905CA */ jal func_80241728_BE4ED8 /* BE5A9C 802422EC 0260302D */ daddu $a2, $s3, $zero /* BE5AA0 802422F0 080908D9 */ j .L80242364 /* BE5AA4 802422F4 0000102D */ daddu $v0, $zero, $zero /* BE5AA8 802422F8 0280202D */ daddu $a0, $s4, $zero /* BE5AAC 802422FC 0200282D */ daddu $a1, $s0, $zero -/* BE5AB0 80242300 0C09069B */ jal func_80241A6C +/* BE5AB0 80242300 0C09069B */ jal func_80241A6C_BE521C /* BE5AB4 80242304 0260302D */ daddu $a2, $s3, $zero /* BE5AB8 80242308 0280202D */ daddu $a0, $s4, $zero /* BE5ABC 8024230C 0200282D */ daddu $a1, $s0, $zero -/* BE5AC0 80242310 0C0906B9 */ jal func_80241AE4 +/* BE5AC0 80242310 0C0906B9 */ jal func_80241AE4_BE5294 /* BE5AC4 80242314 0260302D */ daddu $a2, $s3, $zero /* BE5AC8 80242318 080908D9 */ j .L80242364 /* BE5ACC 8024231C 0000102D */ daddu $v0, $zero, $zero /* BE5AD0 80242320 0280202D */ daddu $a0, $s4, $zero /* BE5AD4 80242324 0200282D */ daddu $a1, $s0, $zero -/* BE5AD8 80242328 0C0906D4 */ jal func_80241B50 +/* BE5AD8 80242328 0C0906D4 */ jal func_80241B50_BE5300 /* BE5ADC 8024232C 0260302D */ daddu $a2, $s3, $zero /* BE5AE0 80242330 080908D9 */ j .L80242364 /* BE5AE4 80242334 0000102D */ daddu $v0, $zero, $zero /* BE5AE8 80242338 0280202D */ daddu $a0, $s4, $zero /* BE5AEC 8024233C 0200282D */ daddu $a1, $s0, $zero -/* BE5AF0 80242340 0C090721 */ jal func_80241C84 +/* BE5AF0 80242340 0C090721 */ jal func_80241C84_BE5434 /* BE5AF4 80242344 0260302D */ daddu $a2, $s3, $zero /* BE5AF8 80242348 080908D9 */ j .L80242364 /* BE5AFC 8024234C 0000102D */ daddu $v0, $zero, $zero /* BE5B00 80242350 0280202D */ daddu $a0, $s4, $zero /* BE5B04 80242354 0200282D */ daddu $a1, $s0, $zero -/* BE5B08 80242358 0C09073A */ jal func_80241CE8 +/* BE5B08 80242358 0C09073A */ jal func_80241CE8_BE5498 /* BE5B0C 8024235C 0260302D */ daddu $a2, $s3, $zero .L80242360: /* BE5B10 80242360 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388.s deleted file mode 100644 index b5bc301238..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242388 -/* BE5B38 80242388 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BE5B3C 8024238C AFBF001C */ sw $ra, 0x1c($sp) -/* BE5B40 80242390 AFB20018 */ sw $s2, 0x18($sp) -/* BE5B44 80242394 AFB10014 */ sw $s1, 0x14($sp) -/* BE5B48 80242398 AFB00010 */ sw $s0, 0x10($sp) -/* BE5B4C 8024239C F7B40020 */ sdc1 $f20, 0x20($sp) -/* BE5B50 802423A0 8C900148 */ lw $s0, 0x148($a0) -/* BE5B54 802423A4 86040008 */ lh $a0, 8($s0) -/* BE5B58 802423A8 3C014387 */ lui $at, 0x4387 -/* BE5B5C 802423AC 4481A000 */ mtc1 $at, $f20 -/* BE5B60 802423B0 0C00EABB */ jal get_npc_unsafe -/* BE5B64 802423B4 00A0882D */ daddu $s1, $a1, $zero -/* BE5B68 802423B8 0200202D */ daddu $a0, $s0, $zero -/* BE5B6C 802423BC 8E26000C */ lw $a2, 0xc($s1) -/* BE5B70 802423C0 8E270010 */ lw $a3, 0x10($s1) -/* BE5B74 802423C4 0040882D */ daddu $s1, $v0, $zero -/* BE5B78 802423C8 3C03800B */ lui $v1, %hi(gCameras) -/* BE5B7C 802423CC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BE5B80 802423D0 3C02800A */ lui $v0, 0x800a -/* BE5B84 802423D4 8442A634 */ lh $v0, -0x59cc($v0) -/* BE5B88 802423D8 0000282D */ daddu $a1, $zero, $zero -/* BE5B8C 802423DC 00028080 */ sll $s0, $v0, 2 -/* BE5B90 802423E0 02028021 */ addu $s0, $s0, $v0 -/* BE5B94 802423E4 00108080 */ sll $s0, $s0, 2 -/* BE5B98 802423E8 02028023 */ subu $s0, $s0, $v0 -/* BE5B9C 802423EC 001010C0 */ sll $v0, $s0, 3 -/* BE5BA0 802423F0 02028021 */ addu $s0, $s0, $v0 -/* BE5BA4 802423F4 001080C0 */ sll $s0, $s0, 3 -/* BE5BA8 802423F8 0C0124FB */ jal func_800493EC -/* BE5BAC 802423FC 02038021 */ addu $s0, $s0, $v1 -/* BE5BB0 80242400 C60C006C */ lwc1 $f12, 0x6c($s0) -/* BE5BB4 80242404 C62E000C */ lwc1 $f14, 0xc($s1) -/* BE5BB8 80242408 0C00A70A */ jal get_clamped_angle_diff -/* BE5BBC 8024240C 0002802B */ sltu $s0, $zero, $v0 -/* BE5BC0 80242410 0C00A6C9 */ jal clamp_angle -/* BE5BC4 80242414 46000306 */ mov.s $f12, $f0 -/* BE5BC8 80242418 3C018024 */ lui $at, 0x8024 -/* BE5BCC 8024241C D4224328 */ ldc1 $f2, 0x4328($at) -/* BE5BD0 80242420 46000021 */ cvt.d.s $f0, $f0 -/* BE5BD4 80242424 4622003C */ c.lt.d $f0, $f2 -/* BE5BD8 80242428 00000000 */ nop -/* BE5BDC 8024242C 45000003 */ bc1f .L8024243C -/* BE5BE0 80242430 00000000 */ nop -/* BE5BE4 80242434 3C0142B4 */ lui $at, 0x42b4 -/* BE5BE8 80242438 4481A000 */ mtc1 $at, $f20 -.L8024243C: -/* BE5BEC 8024243C 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* BE5BF0 80242440 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* BE5BF4 80242444 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BE5BF8 80242448 8E420000 */ lw $v0, ($s2) -/* BE5BFC 8024244C C62E0040 */ lwc1 $f14, 0x40($s1) -/* BE5C00 80242450 8C460028 */ lw $a2, 0x28($v0) -/* BE5C04 80242454 0C00A720 */ jal atan2 -/* BE5C08 80242458 8C470030 */ lw $a3, 0x30($v0) -/* BE5C0C 8024245C 4600A306 */ mov.s $f12, $f20 -/* BE5C10 80242460 0C00A70A */ jal get_clamped_angle_diff -/* BE5C14 80242464 46000386 */ mov.s $f14, $f0 -/* BE5C18 80242468 46000005 */ abs.s $f0, $f0 -/* BE5C1C 8024246C 3C018024 */ lui $at, 0x8024 -/* BE5C20 80242470 D4224330 */ ldc1 $f2, 0x4330($at) -/* BE5C24 80242474 46000021 */ cvt.d.s $f0, $f0 -/* BE5C28 80242478 4620103C */ c.lt.d $f2, $f0 -/* BE5C2C 8024247C 00000000 */ nop -/* BE5C30 80242480 45030001 */ bc1tl .L80242488 -/* BE5C34 80242484 0000802D */ daddu $s0, $zero, $zero -.L80242488: -/* BE5C38 80242488 8E420000 */ lw $v0, ($s2) -/* BE5C3C 8024248C C620003C */ lwc1 $f0, 0x3c($s1) -/* BE5C40 80242490 C442002C */ lwc1 $f2, 0x2c($v0) -/* BE5C44 80242494 46020001 */ sub.s $f0, $f0, $f2 -/* BE5C48 80242498 3C014220 */ lui $at, 0x4220 -/* BE5C4C 8024249C 44811000 */ mtc1 $at, $f2 -/* BE5C50 802424A0 46000005 */ abs.s $f0, $f0 -/* BE5C54 802424A4 4600103E */ c.le.s $f2, $f0 -/* BE5C58 802424A8 00000000 */ nop -/* BE5C5C 802424AC 45030001 */ bc1tl .L802424B4 -/* BE5C60 802424B0 0000802D */ daddu $s0, $zero, $zero -.L802424B4: -/* BE5C64 802424B4 3C038011 */ lui $v1, 0x8011 -/* BE5C68 802424B8 8063EBB3 */ lb $v1, -0x144d($v1) -/* BE5C6C 802424BC 24020009 */ addiu $v0, $zero, 9 -/* BE5C70 802424C0 50620001 */ beql $v1, $v0, .L802424C8 -/* BE5C74 802424C4 0000802D */ daddu $s0, $zero, $zero -.L802424C8: -/* BE5C78 802424C8 0200102D */ daddu $v0, $s0, $zero -/* BE5C7C 802424CC 8FBF001C */ lw $ra, 0x1c($sp) -/* BE5C80 802424D0 8FB20018 */ lw $s2, 0x18($sp) -/* BE5C84 802424D4 8FB10014 */ lw $s1, 0x14($sp) -/* BE5C88 802424D8 8FB00010 */ lw $s0, 0x10($sp) -/* BE5C8C 802424DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* BE5C90 802424E0 03E00008 */ jr $ra -/* BE5C94 802424E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s new file mode 100644 index 0000000000..250ee63511 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242388_BE5B38.s @@ -0,0 +1,96 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242388_BE5B38 +/* BE5B38 80242388 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* BE5B3C 8024238C AFBF001C */ sw $ra, 0x1c($sp) +/* BE5B40 80242390 AFB20018 */ sw $s2, 0x18($sp) +/* BE5B44 80242394 AFB10014 */ sw $s1, 0x14($sp) +/* BE5B48 80242398 AFB00010 */ sw $s0, 0x10($sp) +/* BE5B4C 8024239C F7B40020 */ sdc1 $f20, 0x20($sp) +/* BE5B50 802423A0 8C900148 */ lw $s0, 0x148($a0) +/* BE5B54 802423A4 86040008 */ lh $a0, 8($s0) +/* BE5B58 802423A8 3C014387 */ lui $at, 0x4387 +/* BE5B5C 802423AC 4481A000 */ mtc1 $at, $f20 +/* BE5B60 802423B0 0C00EABB */ jal get_npc_unsafe +/* BE5B64 802423B4 00A0882D */ daddu $s1, $a1, $zero +/* BE5B68 802423B8 0200202D */ daddu $a0, $s0, $zero +/* BE5B6C 802423BC 8E26000C */ lw $a2, 0xc($s1) +/* BE5B70 802423C0 8E270010 */ lw $a3, 0x10($s1) +/* BE5B74 802423C4 0040882D */ daddu $s1, $v0, $zero +/* BE5B78 802423C8 3C03800B */ lui $v1, %hi(gCameras) +/* BE5B7C 802423CC 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* BE5B80 802423D0 3C02800A */ lui $v0, 0x800a +/* BE5B84 802423D4 8442A634 */ lh $v0, -0x59cc($v0) +/* BE5B88 802423D8 0000282D */ daddu $a1, $zero, $zero +/* BE5B8C 802423DC 00028080 */ sll $s0, $v0, 2 +/* BE5B90 802423E0 02028021 */ addu $s0, $s0, $v0 +/* BE5B94 802423E4 00108080 */ sll $s0, $s0, 2 +/* BE5B98 802423E8 02028023 */ subu $s0, $s0, $v0 +/* BE5B9C 802423EC 001010C0 */ sll $v0, $s0, 3 +/* BE5BA0 802423F0 02028021 */ addu $s0, $s0, $v0 +/* BE5BA4 802423F4 001080C0 */ sll $s0, $s0, 3 +/* BE5BA8 802423F8 0C0124FB */ jal func_800493EC +/* BE5BAC 802423FC 02038021 */ addu $s0, $s0, $v1 +/* BE5BB0 80242400 C60C006C */ lwc1 $f12, 0x6c($s0) +/* BE5BB4 80242404 C62E000C */ lwc1 $f14, 0xc($s1) +/* BE5BB8 80242408 0C00A70A */ jal get_clamped_angle_diff +/* BE5BBC 8024240C 0002802B */ sltu $s0, $zero, $v0 +/* BE5BC0 80242410 0C00A6C9 */ jal clamp_angle +/* BE5BC4 80242414 46000306 */ mov.s $f12, $f0 +/* BE5BC8 80242418 3C018024 */ lui $at, 0x8024 +/* BE5BCC 8024241C D4224328 */ ldc1 $f2, 0x4328($at) +/* BE5BD0 80242420 46000021 */ cvt.d.s $f0, $f0 +/* BE5BD4 80242424 4622003C */ c.lt.d $f0, $f2 +/* BE5BD8 80242428 00000000 */ nop +/* BE5BDC 8024242C 45000003 */ bc1f .L8024243C +/* BE5BE0 80242430 00000000 */ nop +/* BE5BE4 80242434 3C0142B4 */ lui $at, 0x42b4 +/* BE5BE8 80242438 4481A000 */ mtc1 $at, $f20 +.L8024243C: +/* BE5BEC 8024243C 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) +/* BE5BF0 80242440 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) +/* BE5BF4 80242444 C62C0038 */ lwc1 $f12, 0x38($s1) +/* BE5BF8 80242448 8E420000 */ lw $v0, ($s2) +/* BE5BFC 8024244C C62E0040 */ lwc1 $f14, 0x40($s1) +/* BE5C00 80242450 8C460028 */ lw $a2, 0x28($v0) +/* BE5C04 80242454 0C00A720 */ jal atan2 +/* BE5C08 80242458 8C470030 */ lw $a3, 0x30($v0) +/* BE5C0C 8024245C 4600A306 */ mov.s $f12, $f20 +/* BE5C10 80242460 0C00A70A */ jal get_clamped_angle_diff +/* BE5C14 80242464 46000386 */ mov.s $f14, $f0 +/* BE5C18 80242468 46000005 */ abs.s $f0, $f0 +/* BE5C1C 8024246C 3C018024 */ lui $at, 0x8024 +/* BE5C20 80242470 D4224330 */ ldc1 $f2, 0x4330($at) +/* BE5C24 80242474 46000021 */ cvt.d.s $f0, $f0 +/* BE5C28 80242478 4620103C */ c.lt.d $f2, $f0 +/* BE5C2C 8024247C 00000000 */ nop +/* BE5C30 80242480 45030001 */ bc1tl .L80242488 +/* BE5C34 80242484 0000802D */ daddu $s0, $zero, $zero +.L80242488: +/* BE5C38 80242488 8E420000 */ lw $v0, ($s2) +/* BE5C3C 8024248C C620003C */ lwc1 $f0, 0x3c($s1) +/* BE5C40 80242490 C442002C */ lwc1 $f2, 0x2c($v0) +/* BE5C44 80242494 46020001 */ sub.s $f0, $f0, $f2 +/* BE5C48 80242498 3C014220 */ lui $at, 0x4220 +/* BE5C4C 8024249C 44811000 */ mtc1 $at, $f2 +/* BE5C50 802424A0 46000005 */ abs.s $f0, $f0 +/* BE5C54 802424A4 4600103E */ c.le.s $f2, $f0 +/* BE5C58 802424A8 00000000 */ nop +/* BE5C5C 802424AC 45030001 */ bc1tl .L802424B4 +/* BE5C60 802424B0 0000802D */ daddu $s0, $zero, $zero +.L802424B4: +/* BE5C64 802424B4 3C038011 */ lui $v1, 0x8011 +/* BE5C68 802424B8 8063EBB3 */ lb $v1, -0x144d($v1) +/* BE5C6C 802424BC 24020009 */ addiu $v0, $zero, 9 +/* BE5C70 802424C0 50620001 */ beql $v1, $v0, .L802424C8 +/* BE5C74 802424C4 0000802D */ daddu $s0, $zero, $zero +.L802424C8: +/* BE5C78 802424C8 0200102D */ daddu $v0, $s0, $zero +/* BE5C7C 802424CC 8FBF001C */ lw $ra, 0x1c($sp) +/* BE5C80 802424D0 8FB20018 */ lw $s2, 0x18($sp) +/* BE5C84 802424D4 8FB10014 */ lw $s1, 0x14($sp) +/* BE5C88 802424D8 8FB00010 */ lw $s0, 0x10($sp) +/* BE5C8C 802424DC D7B40020 */ ldc1 $f20, 0x20($sp) +/* BE5C90 802424E0 03E00008 */ jr $ra +/* BE5C94 802424E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C.s deleted file mode 100644 index b6ebb0d3b5..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024255C -/* BE5D0C 8024255C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BE5D10 80242560 AFB3003C */ sw $s3, 0x3c($sp) -/* BE5D14 80242564 0080982D */ daddu $s3, $a0, $zero -/* BE5D18 80242568 AFBF0044 */ sw $ra, 0x44($sp) -/* BE5D1C 8024256C AFB40040 */ sw $s4, 0x40($sp) -/* BE5D20 80242570 AFB20038 */ sw $s2, 0x38($sp) -/* BE5D24 80242574 AFB10034 */ sw $s1, 0x34($sp) -/* BE5D28 80242578 AFB00030 */ sw $s0, 0x30($sp) -/* BE5D2C 8024257C 8E700148 */ lw $s0, 0x148($s3) -/* BE5D30 80242580 00A0902D */ daddu $s2, $a1, $zero -/* BE5D34 80242584 86040008 */ lh $a0, 8($s0) -/* BE5D38 80242588 0C00EABB */ jal get_npc_unsafe -/* BE5D3C 8024258C 00C0A02D */ daddu $s4, $a2, $zero -/* BE5D40 80242590 8E630074 */ lw $v1, 0x74($s3) -/* BE5D44 80242594 1C600032 */ bgtz $v1, .L80242660 -/* BE5D48 80242598 0040882D */ daddu $s1, $v0, $zero -/* BE5D4C 8024259C 8E420014 */ lw $v0, 0x14($s2) -/* BE5D50 802425A0 AE620074 */ sw $v0, 0x74($s3) -/* BE5D54 802425A4 C640000C */ lwc1 $f0, 0xc($s2) -/* BE5D58 802425A8 3C018024 */ lui $at, 0x8024 -/* BE5D5C 802425AC D4224338 */ ldc1 $f2, 0x4338($at) -/* BE5D60 802425B0 46000021 */ cvt.d.s $f0, $f0 -/* BE5D64 802425B4 46220002 */ mul.d $f0, $f0, $f2 -/* BE5D68 802425B8 00000000 */ nop -/* BE5D6C 802425BC 0280202D */ daddu $a0, $s4, $zero -/* BE5D70 802425C0 AFA00010 */ sw $zero, 0x10($sp) -/* BE5D74 802425C4 8E470010 */ lw $a3, 0x10($s2) -/* BE5D78 802425C8 46200020 */ cvt.s.d $f0, $f0 -/* BE5D7C 802425CC 44060000 */ mfc1 $a2, $f0 -/* BE5D80 802425D0 0C01242D */ jal func_800490B4 -/* BE5D84 802425D4 0200282D */ daddu $a1, $s0, $zero -/* BE5D88 802425D8 10400021 */ beqz $v0, .L80242660 -/* BE5D8C 802425DC 0000202D */ daddu $a0, $zero, $zero -/* BE5D90 802425E0 0220282D */ daddu $a1, $s1, $zero -/* BE5D94 802425E4 0000302D */ daddu $a2, $zero, $zero -/* BE5D98 802425E8 8E0200CC */ lw $v0, 0xcc($s0) -/* BE5D9C 802425EC 3C013F80 */ lui $at, 0x3f80 -/* BE5DA0 802425F0 44810000 */ mtc1 $at, $f0 -/* BE5DA4 802425F4 3C014000 */ lui $at, 0x4000 -/* BE5DA8 802425F8 44811000 */ mtc1 $at, $f2 -/* BE5DAC 802425FC 8C430024 */ lw $v1, 0x24($v0) -/* BE5DB0 80242600 862200A8 */ lh $v0, 0xa8($s1) -/* BE5DB4 80242604 3C01C1A0 */ lui $at, 0xc1a0 -/* BE5DB8 80242608 44812000 */ mtc1 $at, $f4 -/* BE5DBC 8024260C 44823000 */ mtc1 $v0, $f6 -/* BE5DC0 80242610 00000000 */ nop -/* BE5DC4 80242614 468031A0 */ cvt.s.w $f6, $f6 -/* BE5DC8 80242618 44073000 */ mfc1 $a3, $f6 -/* BE5DCC 8024261C 2402000F */ addiu $v0, $zero, 0xf -/* BE5DD0 80242620 AE230028 */ sw $v1, 0x28($s1) -/* BE5DD4 80242624 AFA2001C */ sw $v0, 0x1c($sp) -/* BE5DD8 80242628 27A20028 */ addiu $v0, $sp, 0x28 -/* BE5DDC 8024262C E7A00010 */ swc1 $f0, 0x10($sp) -/* BE5DE0 80242630 E7A20014 */ swc1 $f2, 0x14($sp) -/* BE5DE4 80242634 E7A40018 */ swc1 $f4, 0x18($sp) -/* BE5DE8 80242638 0C01BFA4 */ jal fx_emote -/* BE5DEC 8024263C AFA20020 */ sw $v0, 0x20($sp) -/* BE5DF0 80242640 0220202D */ daddu $a0, $s1, $zero -/* BE5DF4 80242644 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BE5DF8 80242648 0C012530 */ jal func_800494C0 -/* BE5DFC 8024264C 3C060020 */ lui $a2, 0x20 -/* BE5E00 80242650 2402000C */ addiu $v0, $zero, 0xc -/* BE5E04 80242654 A622008E */ sh $v0, 0x8e($s1) -/* BE5E08 80242658 24020002 */ addiu $v0, $zero, 2 -/* BE5E0C 8024265C AE620070 */ sw $v0, 0x70($s3) -.L80242660: -/* BE5E10 80242660 8E620074 */ lw $v0, 0x74($s3) -/* BE5E14 80242664 2442FFFF */ addiu $v0, $v0, -1 -/* BE5E18 80242668 AE620074 */ sw $v0, 0x74($s3) -/* BE5E1C 8024266C 8FBF0044 */ lw $ra, 0x44($sp) -/* BE5E20 80242670 8FB40040 */ lw $s4, 0x40($sp) -/* BE5E24 80242674 8FB3003C */ lw $s3, 0x3c($sp) -/* BE5E28 80242678 8FB20038 */ lw $s2, 0x38($sp) -/* BE5E2C 8024267C 8FB10034 */ lw $s1, 0x34($sp) -/* BE5E30 80242680 8FB00030 */ lw $s0, 0x30($sp) -/* BE5E34 80242684 03E00008 */ jr $ra -/* BE5E38 80242688 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s new file mode 100644 index 0000000000..1d03b9a96b --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_8024255C_BE5D0C.s @@ -0,0 +1,81 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024255C_BE5D0C +/* BE5D0C 8024255C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* BE5D10 80242560 AFB3003C */ sw $s3, 0x3c($sp) +/* BE5D14 80242564 0080982D */ daddu $s3, $a0, $zero +/* BE5D18 80242568 AFBF0044 */ sw $ra, 0x44($sp) +/* BE5D1C 8024256C AFB40040 */ sw $s4, 0x40($sp) +/* BE5D20 80242570 AFB20038 */ sw $s2, 0x38($sp) +/* BE5D24 80242574 AFB10034 */ sw $s1, 0x34($sp) +/* BE5D28 80242578 AFB00030 */ sw $s0, 0x30($sp) +/* BE5D2C 8024257C 8E700148 */ lw $s0, 0x148($s3) +/* BE5D30 80242580 00A0902D */ daddu $s2, $a1, $zero +/* BE5D34 80242584 86040008 */ lh $a0, 8($s0) +/* BE5D38 80242588 0C00EABB */ jal get_npc_unsafe +/* BE5D3C 8024258C 00C0A02D */ daddu $s4, $a2, $zero +/* BE5D40 80242590 8E630074 */ lw $v1, 0x74($s3) +/* BE5D44 80242594 1C600032 */ bgtz $v1, .L80242660 +/* BE5D48 80242598 0040882D */ daddu $s1, $v0, $zero +/* BE5D4C 8024259C 8E420014 */ lw $v0, 0x14($s2) +/* BE5D50 802425A0 AE620074 */ sw $v0, 0x74($s3) +/* BE5D54 802425A4 C640000C */ lwc1 $f0, 0xc($s2) +/* BE5D58 802425A8 3C018024 */ lui $at, 0x8024 +/* BE5D5C 802425AC D4224338 */ ldc1 $f2, 0x4338($at) +/* BE5D60 802425B0 46000021 */ cvt.d.s $f0, $f0 +/* BE5D64 802425B4 46220002 */ mul.d $f0, $f0, $f2 +/* BE5D68 802425B8 00000000 */ nop +/* BE5D6C 802425BC 0280202D */ daddu $a0, $s4, $zero +/* BE5D70 802425C0 AFA00010 */ sw $zero, 0x10($sp) +/* BE5D74 802425C4 8E470010 */ lw $a3, 0x10($s2) +/* BE5D78 802425C8 46200020 */ cvt.s.d $f0, $f0 +/* BE5D7C 802425CC 44060000 */ mfc1 $a2, $f0 +/* BE5D80 802425D0 0C01242D */ jal func_800490B4 +/* BE5D84 802425D4 0200282D */ daddu $a1, $s0, $zero +/* BE5D88 802425D8 10400021 */ beqz $v0, .L80242660 +/* BE5D8C 802425DC 0000202D */ daddu $a0, $zero, $zero +/* BE5D90 802425E0 0220282D */ daddu $a1, $s1, $zero +/* BE5D94 802425E4 0000302D */ daddu $a2, $zero, $zero +/* BE5D98 802425E8 8E0200CC */ lw $v0, 0xcc($s0) +/* BE5D9C 802425EC 3C013F80 */ lui $at, 0x3f80 +/* BE5DA0 802425F0 44810000 */ mtc1 $at, $f0 +/* BE5DA4 802425F4 3C014000 */ lui $at, 0x4000 +/* BE5DA8 802425F8 44811000 */ mtc1 $at, $f2 +/* BE5DAC 802425FC 8C430024 */ lw $v1, 0x24($v0) +/* BE5DB0 80242600 862200A8 */ lh $v0, 0xa8($s1) +/* BE5DB4 80242604 3C01C1A0 */ lui $at, 0xc1a0 +/* BE5DB8 80242608 44812000 */ mtc1 $at, $f4 +/* BE5DBC 8024260C 44823000 */ mtc1 $v0, $f6 +/* BE5DC0 80242610 00000000 */ nop +/* BE5DC4 80242614 468031A0 */ cvt.s.w $f6, $f6 +/* BE5DC8 80242618 44073000 */ mfc1 $a3, $f6 +/* BE5DCC 8024261C 2402000F */ addiu $v0, $zero, 0xf +/* BE5DD0 80242620 AE230028 */ sw $v1, 0x28($s1) +/* BE5DD4 80242624 AFA2001C */ sw $v0, 0x1c($sp) +/* BE5DD8 80242628 27A20028 */ addiu $v0, $sp, 0x28 +/* BE5DDC 8024262C E7A00010 */ swc1 $f0, 0x10($sp) +/* BE5DE0 80242630 E7A20014 */ swc1 $f2, 0x14($sp) +/* BE5DE4 80242634 E7A40018 */ swc1 $f4, 0x18($sp) +/* BE5DE8 80242638 0C01BFA4 */ jal fx_emote +/* BE5DEC 8024263C AFA20020 */ sw $v0, 0x20($sp) +/* BE5DF0 80242640 0220202D */ daddu $a0, $s1, $zero +/* BE5DF4 80242644 240502F4 */ addiu $a1, $zero, 0x2f4 +/* BE5DF8 80242648 0C012530 */ jal func_800494C0 +/* BE5DFC 8024264C 3C060020 */ lui $a2, 0x20 +/* BE5E00 80242650 2402000C */ addiu $v0, $zero, 0xc +/* BE5E04 80242654 A622008E */ sh $v0, 0x8e($s1) +/* BE5E08 80242658 24020002 */ addiu $v0, $zero, 2 +/* BE5E0C 8024265C AE620070 */ sw $v0, 0x70($s3) +.L80242660: +/* BE5E10 80242660 8E620074 */ lw $v0, 0x74($s3) +/* BE5E14 80242664 2442FFFF */ addiu $v0, $v0, -1 +/* BE5E18 80242668 AE620074 */ sw $v0, 0x74($s3) +/* BE5E1C 8024266C 8FBF0044 */ lw $ra, 0x44($sp) +/* BE5E20 80242670 8FB40040 */ lw $s4, 0x40($sp) +/* BE5E24 80242674 8FB3003C */ lw $s3, 0x3c($sp) +/* BE5E28 80242678 8FB20038 */ lw $s2, 0x38($sp) +/* BE5E2C 8024267C 8FB10034 */ lw $s1, 0x34($sp) +/* BE5E30 80242680 8FB00030 */ lw $s0, 0x30($sp) +/* BE5E34 80242684 03E00008 */ jr $ra +/* BE5E38 80242688 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728.s deleted file mode 100644 index 4eb49d9b4c..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242728 -/* BE5ED8 80242728 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE5EDC 8024272C AFB10014 */ sw $s1, 0x14($sp) -/* BE5EE0 80242730 0080882D */ daddu $s1, $a0, $zero -/* BE5EE4 80242734 AFBF0018 */ sw $ra, 0x18($sp) -/* BE5EE8 80242738 AFB00010 */ sw $s0, 0x10($sp) -/* BE5EEC 8024273C 8E220148 */ lw $v0, 0x148($s1) -/* BE5EF0 80242740 0C00EABB */ jal get_npc_unsafe -/* BE5EF4 80242744 84440008 */ lh $a0, 8($v0) -/* BE5EF8 80242748 0040802D */ daddu $s0, $v0, $zero -/* BE5EFC 8024274C 9602008E */ lhu $v0, 0x8e($s0) -/* BE5F00 80242750 2442FFFF */ addiu $v0, $v0, -1 -/* BE5F04 80242754 A602008E */ sh $v0, 0x8e($s0) -/* BE5F08 80242758 00021400 */ sll $v0, $v0, 0x10 -/* BE5F0C 8024275C 1C40000F */ bgtz $v0, .L8024279C -/* BE5F10 80242760 00000000 */ nop -/* BE5F14 80242764 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE5F18 80242768 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE5F1C 8024276C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE5F20 80242770 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE5F24 80242774 8C460028 */ lw $a2, 0x28($v0) -/* BE5F28 80242778 0C00A720 */ jal atan2 -/* BE5F2C 8024277C 8C470030 */ lw $a3, 0x30($v0) -/* BE5F30 80242780 2402001A */ addiu $v0, $zero, 0x1a -/* BE5F34 80242784 A60200A8 */ sh $v0, 0xa8($s0) -/* BE5F38 80242788 24020018 */ addiu $v0, $zero, 0x18 -/* BE5F3C 8024278C A60200A6 */ sh $v0, 0xa6($s0) -/* BE5F40 80242790 24020004 */ addiu $v0, $zero, 4 -/* BE5F44 80242794 E600000C */ swc1 $f0, 0xc($s0) -/* BE5F48 80242798 AE220070 */ sw $v0, 0x70($s1) -.L8024279C: -/* BE5F4C 8024279C 8FBF0018 */ lw $ra, 0x18($sp) -/* BE5F50 802427A0 8FB10014 */ lw $s1, 0x14($sp) -/* BE5F54 802427A4 8FB00010 */ lw $s0, 0x10($sp) -/* BE5F58 802427A8 03E00008 */ jr $ra -/* BE5F5C 802427AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728_BE5ED8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728_BE5ED8.s new file mode 100644 index 0000000000..60359f5a26 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242728_BE5ED8.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242728_BE5ED8 +/* BE5ED8 80242728 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BE5EDC 8024272C AFB10014 */ sw $s1, 0x14($sp) +/* BE5EE0 80242730 0080882D */ daddu $s1, $a0, $zero +/* BE5EE4 80242734 AFBF0018 */ sw $ra, 0x18($sp) +/* BE5EE8 80242738 AFB00010 */ sw $s0, 0x10($sp) +/* BE5EEC 8024273C 8E220148 */ lw $v0, 0x148($s1) +/* BE5EF0 80242740 0C00EABB */ jal get_npc_unsafe +/* BE5EF4 80242744 84440008 */ lh $a0, 8($v0) +/* BE5EF8 80242748 0040802D */ daddu $s0, $v0, $zero +/* BE5EFC 8024274C 9602008E */ lhu $v0, 0x8e($s0) +/* BE5F00 80242750 2442FFFF */ addiu $v0, $v0, -1 +/* BE5F04 80242754 A602008E */ sh $v0, 0x8e($s0) +/* BE5F08 80242758 00021400 */ sll $v0, $v0, 0x10 +/* BE5F0C 8024275C 1C40000F */ bgtz $v0, .L8024279C +/* BE5F10 80242760 00000000 */ nop +/* BE5F14 80242764 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BE5F18 80242768 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BE5F1C 8024276C C60C0038 */ lwc1 $f12, 0x38($s0) +/* BE5F20 80242770 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BE5F24 80242774 8C460028 */ lw $a2, 0x28($v0) +/* BE5F28 80242778 0C00A720 */ jal atan2 +/* BE5F2C 8024277C 8C470030 */ lw $a3, 0x30($v0) +/* BE5F30 80242780 2402001A */ addiu $v0, $zero, 0x1a +/* BE5F34 80242784 A60200A8 */ sh $v0, 0xa8($s0) +/* BE5F38 80242788 24020018 */ addiu $v0, $zero, 0x18 +/* BE5F3C 8024278C A60200A6 */ sh $v0, 0xa6($s0) +/* BE5F40 80242790 24020004 */ addiu $v0, $zero, 4 +/* BE5F44 80242794 E600000C */ swc1 $f0, 0xc($s0) +/* BE5F48 80242798 AE220070 */ sw $v0, 0x70($s1) +.L8024279C: +/* BE5F4C 8024279C 8FBF0018 */ lw $ra, 0x18($sp) +/* BE5F50 802427A0 8FB10014 */ lw $s1, 0x14($sp) +/* BE5F54 802427A4 8FB00010 */ lw $s0, 0x10($sp) +/* BE5F58 802427A8 03E00008 */ jr $ra +/* BE5F5C 802427AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802429CC.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802429CC.s deleted file mode 100644 index 2febe06794..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802429CC.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429CC -/* BE617C 802429CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE6180 802429D0 AFB10014 */ sw $s1, 0x14($sp) -/* BE6184 802429D4 0080882D */ daddu $s1, $a0, $zero -/* BE6188 802429D8 AFBF0018 */ sw $ra, 0x18($sp) -/* BE618C 802429DC AFB00010 */ sw $s0, 0x10($sp) -/* BE6190 802429E0 8E300148 */ lw $s0, 0x148($s1) -/* BE6194 802429E4 0C00EABB */ jal get_npc_unsafe -/* BE6198 802429E8 86040008 */ lh $a0, 8($s0) -/* BE619C 802429EC 96030096 */ lhu $v1, 0x96($s0) -/* BE61A0 802429F0 A443008E */ sh $v1, 0x8e($v0) -/* BE61A4 802429F4 8E0300CC */ lw $v1, 0xcc($s0) -/* BE61A8 802429F8 8C630034 */ lw $v1, 0x34($v1) -/* BE61AC 802429FC AC430028 */ sw $v1, 0x28($v0) -/* BE61B0 80242A00 24020015 */ addiu $v0, $zero, 0x15 -/* BE61B4 80242A04 AE220070 */ sw $v0, 0x70($s1) -/* BE61B8 80242A08 8FBF0018 */ lw $ra, 0x18($sp) -/* BE61BC 80242A0C 8FB10014 */ lw $s1, 0x14($sp) -/* BE61C0 80242A10 8FB00010 */ lw $s0, 0x10($sp) -/* BE61C4 80242A14 03E00008 */ jr $ra -/* BE61C8 80242A18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802429CC_BE617C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802429CC_BE617C.s new file mode 100644 index 0000000000..8df7ef8c06 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_802429CC_BE617C.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429CC_BE617C +/* BE617C 802429CC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BE6180 802429D0 AFB10014 */ sw $s1, 0x14($sp) +/* BE6184 802429D4 0080882D */ daddu $s1, $a0, $zero +/* BE6188 802429D8 AFBF0018 */ sw $ra, 0x18($sp) +/* BE618C 802429DC AFB00010 */ sw $s0, 0x10($sp) +/* BE6190 802429E0 8E300148 */ lw $s0, 0x148($s1) +/* BE6194 802429E4 0C00EABB */ jal get_npc_unsafe +/* BE6198 802429E8 86040008 */ lh $a0, 8($s0) +/* BE619C 802429EC 96030096 */ lhu $v1, 0x96($s0) +/* BE61A0 802429F0 A443008E */ sh $v1, 0x8e($v0) +/* BE61A4 802429F4 8E0300CC */ lw $v1, 0xcc($s0) +/* BE61A8 802429F8 8C630034 */ lw $v1, 0x34($v1) +/* BE61AC 802429FC AC430028 */ sw $v1, 0x28($v0) +/* BE61B0 80242A00 24020015 */ addiu $v0, $zero, 0x15 +/* BE61B4 80242A04 AE220070 */ sw $v0, 0x70($s1) +/* BE61B8 80242A08 8FBF0018 */ lw $ra, 0x18($sp) +/* BE61BC 80242A0C 8FB10014 */ lw $s1, 0x14($sp) +/* BE61C0 80242A10 8FB00010 */ lw $s0, 0x10($sp) +/* BE61C4 80242A14 03E00008 */ jr $ra +/* BE61C8 80242A18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC.s deleted file mode 100644 index 30cbb5fbec..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BBC -/* BE636C 80242BBC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BE6370 80242BC0 AFB3003C */ sw $s3, 0x3c($sp) -/* BE6374 80242BC4 0080982D */ daddu $s3, $a0, $zero -/* BE6378 80242BC8 AFBF0040 */ sw $ra, 0x40($sp) -/* BE637C 80242BCC AFB20038 */ sw $s2, 0x38($sp) -/* BE6380 80242BD0 AFB10034 */ sw $s1, 0x34($sp) -/* BE6384 80242BD4 AFB00030 */ sw $s0, 0x30($sp) -/* BE6388 80242BD8 8E720148 */ lw $s2, 0x148($s3) -/* BE638C 80242BDC 0C00EABB */ jal get_npc_unsafe -/* BE6390 80242BE0 86440008 */ lh $a0, 8($s2) -/* BE6394 80242BE4 0040802D */ daddu $s0, $v0, $zero -/* BE6398 80242BE8 0200202D */ daddu $a0, $s0, $zero -/* BE639C 80242BEC 0C00F598 */ jal func_8003D660 -/* BE63A0 80242BF0 24050001 */ addiu $a1, $zero, 1 -/* BE63A4 80242BF4 8E050018 */ lw $a1, 0x18($s0) -/* BE63A8 80242BF8 8E06000C */ lw $a2, 0xc($s0) -/* BE63AC 80242BFC 0C00EA95 */ jal npc_move_heading -/* BE63B0 80242C00 0200202D */ daddu $a0, $s0, $zero -/* BE63B4 80242C04 8E4300D0 */ lw $v1, 0xd0($s2) -/* BE63B8 80242C08 C6000040 */ lwc1 $f0, 0x40($s0) -/* BE63BC 80242C0C C462001C */ lwc1 $f2, 0x1c($v1) -/* BE63C0 80242C10 468010A0 */ cvt.s.w $f2, $f2 -/* BE63C4 80242C14 C4640024 */ lwc1 $f4, 0x24($v1) -/* BE63C8 80242C18 46802120 */ cvt.s.w $f4, $f4 -/* BE63CC 80242C1C E7A00010 */ swc1 $f0, 0x10($sp) -/* BE63D0 80242C20 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE63D4 80242C24 44051000 */ mfc1 $a1, $f2 -/* BE63D8 80242C28 C4400028 */ lwc1 $f0, 0x28($v0) -/* BE63DC 80242C2C 46800020 */ cvt.s.w $f0, $f0 -/* BE63E0 80242C30 E7A00014 */ swc1 $f0, 0x14($sp) -/* BE63E4 80242C34 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE63E8 80242C38 44062000 */ mfc1 $a2, $f4 -/* BE63EC 80242C3C C440002C */ lwc1 $f0, 0x2c($v0) -/* BE63F0 80242C40 46800020 */ cvt.s.w $f0, $f0 -/* BE63F4 80242C44 E7A00018 */ swc1 $f0, 0x18($sp) -/* BE63F8 80242C48 8C640030 */ lw $a0, 0x30($v1) -/* BE63FC 80242C4C 0C0123F5 */ jal is_point_within_region -/* BE6400 80242C50 8E070038 */ lw $a3, 0x38($s0) -/* BE6404 80242C54 C6000038 */ lwc1 $f0, 0x38($s0) -/* BE6408 80242C58 C602003C */ lwc1 $f2, 0x3c($s0) -/* BE640C 80242C5C C6040040 */ lwc1 $f4, 0x40($s0) -/* BE6410 80242C60 3C013F80 */ lui $at, 0x3f80 -/* BE6414 80242C64 44813000 */ mtc1 $at, $f6 -/* BE6418 80242C68 E7A00020 */ swc1 $f0, 0x20($sp) -/* BE641C 80242C6C E7A20024 */ swc1 $f2, 0x24($sp) -/* BE6420 80242C70 E7A40028 */ swc1 $f4, 0x28($sp) -/* BE6424 80242C74 E7A60010 */ swc1 $f6, 0x10($sp) -/* BE6428 80242C78 C600000C */ lwc1 $f0, 0xc($s0) -/* BE642C 80242C7C 0002882B */ sltu $s1, $zero, $v0 -/* BE6430 80242C80 E7A00014 */ swc1 $f0, 0x14($sp) -/* BE6434 80242C84 860200A8 */ lh $v0, 0xa8($s0) -/* BE6438 80242C88 27A50020 */ addiu $a1, $sp, 0x20 -/* BE643C 80242C8C 44820000 */ mtc1 $v0, $f0 -/* BE6440 80242C90 00000000 */ nop -/* BE6444 80242C94 46800020 */ cvt.s.w $f0, $f0 -/* BE6448 80242C98 E7A00018 */ swc1 $f0, 0x18($sp) -/* BE644C 80242C9C 860200A6 */ lh $v0, 0xa6($s0) -/* BE6450 80242CA0 27A60024 */ addiu $a2, $sp, 0x24 -/* BE6454 80242CA4 44820000 */ mtc1 $v0, $f0 -/* BE6458 80242CA8 00000000 */ nop -/* BE645C 80242CAC 46800020 */ cvt.s.w $f0, $f0 -/* BE6460 80242CB0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BE6464 80242CB4 8E040080 */ lw $a0, 0x80($s0) -/* BE6468 80242CB8 0C037711 */ jal func_800DDC44 -/* BE646C 80242CBC 27A70028 */ addiu $a3, $sp, 0x28 -/* BE6470 80242CC0 54400001 */ bnel $v0, $zero, .L80242CC8 -/* BE6474 80242CC4 24110001 */ addiu $s1, $zero, 1 -.L80242CC8: -/* BE6478 80242CC8 9602008E */ lhu $v0, 0x8e($s0) -/* BE647C 80242CCC 2442FFFF */ addiu $v0, $v0, -1 -/* BE6480 80242CD0 A602008E */ sh $v0, 0x8e($s0) -/* BE6484 80242CD4 00021400 */ sll $v0, $v0, 0x10 -/* BE6488 80242CD8 58400001 */ blezl $v0, .L80242CE0 -/* BE648C 80242CDC 24110001 */ addiu $s1, $zero, 1 -.L80242CE0: -/* BE6490 80242CE0 12200003 */ beqz $s1, .L80242CF0 -/* BE6494 80242CE4 24020004 */ addiu $v0, $zero, 4 -/* BE6498 80242CE8 AE620070 */ sw $v0, 0x70($s3) -/* BE649C 80242CEC A2400007 */ sb $zero, 7($s2) -.L80242CF0: -/* BE64A0 80242CF0 8FBF0040 */ lw $ra, 0x40($sp) -/* BE64A4 80242CF4 8FB3003C */ lw $s3, 0x3c($sp) -/* BE64A8 80242CF8 8FB20038 */ lw $s2, 0x38($sp) -/* BE64AC 80242CFC 8FB10034 */ lw $s1, 0x34($sp) -/* BE64B0 80242D00 8FB00030 */ lw $s0, 0x30($sp) -/* BE64B4 80242D04 03E00008 */ jr $ra -/* BE64B8 80242D08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC_BE636C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC_BE636C.s new file mode 100644 index 0000000000..4303bdd565 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242BBC_BE636C.s @@ -0,0 +1,91 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242BBC_BE636C +/* BE636C 80242BBC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* BE6370 80242BC0 AFB3003C */ sw $s3, 0x3c($sp) +/* BE6374 80242BC4 0080982D */ daddu $s3, $a0, $zero +/* BE6378 80242BC8 AFBF0040 */ sw $ra, 0x40($sp) +/* BE637C 80242BCC AFB20038 */ sw $s2, 0x38($sp) +/* BE6380 80242BD0 AFB10034 */ sw $s1, 0x34($sp) +/* BE6384 80242BD4 AFB00030 */ sw $s0, 0x30($sp) +/* BE6388 80242BD8 8E720148 */ lw $s2, 0x148($s3) +/* BE638C 80242BDC 0C00EABB */ jal get_npc_unsafe +/* BE6390 80242BE0 86440008 */ lh $a0, 8($s2) +/* BE6394 80242BE4 0040802D */ daddu $s0, $v0, $zero +/* BE6398 80242BE8 0200202D */ daddu $a0, $s0, $zero +/* BE639C 80242BEC 0C00F598 */ jal func_8003D660 +/* BE63A0 80242BF0 24050001 */ addiu $a1, $zero, 1 +/* BE63A4 80242BF4 8E050018 */ lw $a1, 0x18($s0) +/* BE63A8 80242BF8 8E06000C */ lw $a2, 0xc($s0) +/* BE63AC 80242BFC 0C00EA95 */ jal npc_move_heading +/* BE63B0 80242C00 0200202D */ daddu $a0, $s0, $zero +/* BE63B4 80242C04 8E4300D0 */ lw $v1, 0xd0($s2) +/* BE63B8 80242C08 C6000040 */ lwc1 $f0, 0x40($s0) +/* BE63BC 80242C0C C462001C */ lwc1 $f2, 0x1c($v1) +/* BE63C0 80242C10 468010A0 */ cvt.s.w $f2, $f2 +/* BE63C4 80242C14 C4640024 */ lwc1 $f4, 0x24($v1) +/* BE63C8 80242C18 46802120 */ cvt.s.w $f4, $f4 +/* BE63CC 80242C1C E7A00010 */ swc1 $f0, 0x10($sp) +/* BE63D0 80242C20 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE63D4 80242C24 44051000 */ mfc1 $a1, $f2 +/* BE63D8 80242C28 C4400028 */ lwc1 $f0, 0x28($v0) +/* BE63DC 80242C2C 46800020 */ cvt.s.w $f0, $f0 +/* BE63E0 80242C30 E7A00014 */ swc1 $f0, 0x14($sp) +/* BE63E4 80242C34 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE63E8 80242C38 44062000 */ mfc1 $a2, $f4 +/* BE63EC 80242C3C C440002C */ lwc1 $f0, 0x2c($v0) +/* BE63F0 80242C40 46800020 */ cvt.s.w $f0, $f0 +/* BE63F4 80242C44 E7A00018 */ swc1 $f0, 0x18($sp) +/* BE63F8 80242C48 8C640030 */ lw $a0, 0x30($v1) +/* BE63FC 80242C4C 0C0123F5 */ jal is_point_within_region +/* BE6400 80242C50 8E070038 */ lw $a3, 0x38($s0) +/* BE6404 80242C54 C6000038 */ lwc1 $f0, 0x38($s0) +/* BE6408 80242C58 C602003C */ lwc1 $f2, 0x3c($s0) +/* BE640C 80242C5C C6040040 */ lwc1 $f4, 0x40($s0) +/* BE6410 80242C60 3C013F80 */ lui $at, 0x3f80 +/* BE6414 80242C64 44813000 */ mtc1 $at, $f6 +/* BE6418 80242C68 E7A00020 */ swc1 $f0, 0x20($sp) +/* BE641C 80242C6C E7A20024 */ swc1 $f2, 0x24($sp) +/* BE6420 80242C70 E7A40028 */ swc1 $f4, 0x28($sp) +/* BE6424 80242C74 E7A60010 */ swc1 $f6, 0x10($sp) +/* BE6428 80242C78 C600000C */ lwc1 $f0, 0xc($s0) +/* BE642C 80242C7C 0002882B */ sltu $s1, $zero, $v0 +/* BE6430 80242C80 E7A00014 */ swc1 $f0, 0x14($sp) +/* BE6434 80242C84 860200A8 */ lh $v0, 0xa8($s0) +/* BE6438 80242C88 27A50020 */ addiu $a1, $sp, 0x20 +/* BE643C 80242C8C 44820000 */ mtc1 $v0, $f0 +/* BE6440 80242C90 00000000 */ nop +/* BE6444 80242C94 46800020 */ cvt.s.w $f0, $f0 +/* BE6448 80242C98 E7A00018 */ swc1 $f0, 0x18($sp) +/* BE644C 80242C9C 860200A6 */ lh $v0, 0xa6($s0) +/* BE6450 80242CA0 27A60024 */ addiu $a2, $sp, 0x24 +/* BE6454 80242CA4 44820000 */ mtc1 $v0, $f0 +/* BE6458 80242CA8 00000000 */ nop +/* BE645C 80242CAC 46800020 */ cvt.s.w $f0, $f0 +/* BE6460 80242CB0 E7A0001C */ swc1 $f0, 0x1c($sp) +/* BE6464 80242CB4 8E040080 */ lw $a0, 0x80($s0) +/* BE6468 80242CB8 0C037711 */ jal func_800DDC44 +/* BE646C 80242CBC 27A70028 */ addiu $a3, $sp, 0x28 +/* BE6470 80242CC0 54400001 */ bnel $v0, $zero, .L80242CC8 +/* BE6474 80242CC4 24110001 */ addiu $s1, $zero, 1 +.L80242CC8: +/* BE6478 80242CC8 9602008E */ lhu $v0, 0x8e($s0) +/* BE647C 80242CCC 2442FFFF */ addiu $v0, $v0, -1 +/* BE6480 80242CD0 A602008E */ sh $v0, 0x8e($s0) +/* BE6484 80242CD4 00021400 */ sll $v0, $v0, 0x10 +/* BE6488 80242CD8 58400001 */ blezl $v0, .L80242CE0 +/* BE648C 80242CDC 24110001 */ addiu $s1, $zero, 1 +.L80242CE0: +/* BE6490 80242CE0 12200003 */ beqz $s1, .L80242CF0 +/* BE6494 80242CE4 24020004 */ addiu $v0, $zero, 4 +/* BE6498 80242CE8 AE620070 */ sw $v0, 0x70($s3) +/* BE649C 80242CEC A2400007 */ sb $zero, 7($s2) +.L80242CF0: +/* BE64A0 80242CF0 8FBF0040 */ lw $ra, 0x40($sp) +/* BE64A4 80242CF4 8FB3003C */ lw $s3, 0x3c($sp) +/* BE64A8 80242CF8 8FB20038 */ lw $s2, 0x38($sp) +/* BE64AC 80242CFC 8FB10034 */ lw $s1, 0x34($sp) +/* BE64B0 80242D00 8FB00030 */ lw $s0, 0x30($sp) +/* BE64B4 80242D04 03E00008 */ jr $ra +/* BE64B8 80242D08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C.s deleted file mode 100644 index 13ec3960af..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D0C -/* BE64BC 80242D0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE64C0 80242D10 AFB20018 */ sw $s2, 0x18($sp) -/* BE64C4 80242D14 0080902D */ daddu $s2, $a0, $zero -/* BE64C8 80242D18 AFBF001C */ sw $ra, 0x1c($sp) -/* BE64CC 80242D1C AFB10014 */ sw $s1, 0x14($sp) -/* BE64D0 80242D20 AFB00010 */ sw $s0, 0x10($sp) -/* BE64D4 80242D24 8E500148 */ lw $s0, 0x148($s2) -/* BE64D8 80242D28 86040008 */ lh $a0, 8($s0) -/* BE64DC 80242D2C 0C00EABB */ jal get_npc_unsafe -/* BE64E0 80242D30 00A0882D */ daddu $s1, $a1, $zero -/* BE64E4 80242D34 0040182D */ daddu $v1, $v0, $zero -/* BE64E8 80242D38 9462008E */ lhu $v0, 0x8e($v1) -/* BE64EC 80242D3C 2442FFFF */ addiu $v0, $v0, -1 -/* BE64F0 80242D40 A462008E */ sh $v0, 0x8e($v1) -/* BE64F4 80242D44 00021400 */ sll $v0, $v0, 0x10 -/* BE64F8 80242D48 1C400015 */ bgtz $v0, .L80242DA0 -/* BE64FC 80242D4C 00000000 */ nop -/* BE6500 80242D50 8E0200CC */ lw $v0, 0xcc($s0) -/* BE6504 80242D54 8C420004 */ lw $v0, 4($v0) -/* BE6508 80242D58 AC620028 */ sw $v0, 0x28($v1) -/* BE650C 80242D5C 8E0200D0 */ lw $v0, 0xd0($s0) -/* BE6510 80242D60 8C420014 */ lw $v0, 0x14($v0) -/* BE6514 80242D64 04410004 */ bgez $v0, .L80242D78 -/* BE6518 80242D68 00000000 */ nop -/* BE651C 80242D6C C6200000 */ lwc1 $f0, ($s1) -/* BE6520 80242D70 08090B66 */ j .L80242D98 -/* BE6524 80242D74 E4600018 */ swc1 $f0, 0x18($v1) -.L80242D78: -/* BE6528 80242D78 3C018024 */ lui $at, 0x8024 -/* BE652C 80242D7C D4224348 */ ldc1 $f2, 0x4348($at) -/* BE6530 80242D80 44820000 */ mtc1 $v0, $f0 -/* BE6534 80242D84 00000000 */ nop -/* BE6538 80242D88 46800021 */ cvt.d.w $f0, $f0 -/* BE653C 80242D8C 46220003 */ div.d $f0, $f0, $f2 -/* BE6540 80242D90 46200020 */ cvt.s.d $f0, $f0 -/* BE6544 80242D94 E4600018 */ swc1 $f0, 0x18($v1) -.L80242D98: -/* BE6548 80242D98 24020029 */ addiu $v0, $zero, 0x29 -/* BE654C 80242D9C AE420070 */ sw $v0, 0x70($s2) -.L80242DA0: -/* BE6550 80242DA0 8FBF001C */ lw $ra, 0x1c($sp) -/* BE6554 80242DA4 8FB20018 */ lw $s2, 0x18($sp) -/* BE6558 80242DA8 8FB10014 */ lw $s1, 0x14($sp) -/* BE655C 80242DAC 8FB00010 */ lw $s0, 0x10($sp) -/* BE6560 80242DB0 03E00008 */ jr $ra -/* BE6564 80242DB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s new file mode 100644 index 0000000000..758925d05d --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242D0C_BE64BC.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D0C_BE64BC +/* BE64BC 80242D0C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BE64C0 80242D10 AFB20018 */ sw $s2, 0x18($sp) +/* BE64C4 80242D14 0080902D */ daddu $s2, $a0, $zero +/* BE64C8 80242D18 AFBF001C */ sw $ra, 0x1c($sp) +/* BE64CC 80242D1C AFB10014 */ sw $s1, 0x14($sp) +/* BE64D0 80242D20 AFB00010 */ sw $s0, 0x10($sp) +/* BE64D4 80242D24 8E500148 */ lw $s0, 0x148($s2) +/* BE64D8 80242D28 86040008 */ lh $a0, 8($s0) +/* BE64DC 80242D2C 0C00EABB */ jal get_npc_unsafe +/* BE64E0 80242D30 00A0882D */ daddu $s1, $a1, $zero +/* BE64E4 80242D34 0040182D */ daddu $v1, $v0, $zero +/* BE64E8 80242D38 9462008E */ lhu $v0, 0x8e($v1) +/* BE64EC 80242D3C 2442FFFF */ addiu $v0, $v0, -1 +/* BE64F0 80242D40 A462008E */ sh $v0, 0x8e($v1) +/* BE64F4 80242D44 00021400 */ sll $v0, $v0, 0x10 +/* BE64F8 80242D48 1C400015 */ bgtz $v0, .L80242DA0 +/* BE64FC 80242D4C 00000000 */ nop +/* BE6500 80242D50 8E0200CC */ lw $v0, 0xcc($s0) +/* BE6504 80242D54 8C420004 */ lw $v0, 4($v0) +/* BE6508 80242D58 AC620028 */ sw $v0, 0x28($v1) +/* BE650C 80242D5C 8E0200D0 */ lw $v0, 0xd0($s0) +/* BE6510 80242D60 8C420014 */ lw $v0, 0x14($v0) +/* BE6514 80242D64 04410004 */ bgez $v0, .L80242D78 +/* BE6518 80242D68 00000000 */ nop +/* BE651C 80242D6C C6200000 */ lwc1 $f0, ($s1) +/* BE6520 80242D70 08090B66 */ j .L80242D98 +/* BE6524 80242D74 E4600018 */ swc1 $f0, 0x18($v1) +.L80242D78: +/* BE6528 80242D78 3C018024 */ lui $at, 0x8024 +/* BE652C 80242D7C D4224348 */ ldc1 $f2, 0x4348($at) +/* BE6530 80242D80 44820000 */ mtc1 $v0, $f0 +/* BE6534 80242D84 00000000 */ nop +/* BE6538 80242D88 46800021 */ cvt.d.w $f0, $f0 +/* BE653C 80242D8C 46220003 */ div.d $f0, $f0, $f2 +/* BE6540 80242D90 46200020 */ cvt.s.d $f0, $f0 +/* BE6544 80242D94 E4600018 */ swc1 $f0, 0x18($v1) +.L80242D98: +/* BE6548 80242D98 24020029 */ addiu $v0, $zero, 0x29 +/* BE654C 80242D9C AE420070 */ sw $v0, 0x70($s2) +.L80242DA0: +/* BE6550 80242DA0 8FBF001C */ lw $ra, 0x1c($sp) +/* BE6554 80242DA4 8FB20018 */ lw $s2, 0x18($sp) +/* BE6558 80242DA8 8FB10014 */ lw $s1, 0x14($sp) +/* BE655C 80242DAC 8FB00010 */ lw $s0, 0x10($sp) +/* BE6560 80242DB0 03E00008 */ jr $ra +/* BE6564 80242DB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8.s deleted file mode 100644 index f16935c258..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DB8 -/* BE6568 80242DB8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BE656C 80242DBC AFB30024 */ sw $s3, 0x24($sp) -/* BE6570 80242DC0 0080982D */ daddu $s3, $a0, $zero -/* BE6574 80242DC4 AFBF0028 */ sw $ra, 0x28($sp) -/* BE6578 80242DC8 AFB20020 */ sw $s2, 0x20($sp) -/* BE657C 80242DCC AFB1001C */ sw $s1, 0x1c($sp) -/* BE6580 80242DD0 AFB00018 */ sw $s0, 0x18($sp) -/* BE6584 80242DD4 8E720148 */ lw $s2, 0x148($s3) -/* BE6588 80242DD8 00A0882D */ daddu $s1, $a1, $zero -/* BE658C 80242DDC 86440008 */ lh $a0, 8($s2) -/* BE6590 80242DE0 0C00EABB */ jal get_npc_unsafe -/* BE6594 80242DE4 00C0802D */ daddu $s0, $a2, $zero -/* BE6598 80242DE8 0200202D */ daddu $a0, $s0, $zero -/* BE659C 80242DEC 0240282D */ daddu $a1, $s2, $zero -/* BE65A0 80242DF0 AFA00010 */ sw $zero, 0x10($sp) -/* BE65A4 80242DF4 8E260024 */ lw $a2, 0x24($s1) -/* BE65A8 80242DF8 8E270028 */ lw $a3, 0x28($s1) -/* BE65AC 80242DFC 0C01242D */ jal func_800490B4 -/* BE65B0 80242E00 0040802D */ daddu $s0, $v0, $zero -/* BE65B4 80242E04 1040000C */ beqz $v0, .L80242E38 -/* BE65B8 80242E08 00000000 */ nop -/* BE65BC 80242E0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE65C0 80242E10 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BE65C4 80242E14 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BE65C8 80242E18 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE65CC 80242E1C 8C460028 */ lw $a2, 0x28($v0) -/* BE65D0 80242E20 0C00A720 */ jal atan2 -/* BE65D4 80242E24 8C470030 */ lw $a3, 0x30($v0) -/* BE65D8 80242E28 2402000C */ addiu $v0, $zero, 0xc -/* BE65DC 80242E2C E600000C */ swc1 $f0, 0xc($s0) -/* BE65E0 80242E30 08090BB5 */ j .L80242ED4 -/* BE65E4 80242E34 AE620070 */ sw $v0, 0x70($s3) -.L80242E38: -/* BE65E8 80242E38 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE65EC 80242E3C 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE65F0 80242E40 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE65F4 80242E44 C4440000 */ lwc1 $f4, ($v0) -/* BE65F8 80242E48 46802120 */ cvt.s.w $f4, $f4 -/* BE65FC 80242E4C 44062000 */ mfc1 $a2, $f4 -/* BE6600 80242E50 C4440008 */ lwc1 $f4, 8($v0) -/* BE6604 80242E54 46802120 */ cvt.s.w $f4, $f4 -/* BE6608 80242E58 44072000 */ mfc1 $a3, $f4 -/* BE660C 80242E5C 0C00A7B5 */ jal dist2D -/* BE6610 80242E60 00000000 */ nop -/* BE6614 80242E64 C6020018 */ lwc1 $f2, 0x18($s0) -/* BE6618 80242E68 4602003E */ c.le.s $f0, $f2 -/* BE661C 80242E6C 00000000 */ nop -/* BE6620 80242E70 45000005 */ bc1f .L80242E88 -/* BE6624 80242E74 2402000A */ addiu $v0, $zero, 0xa -/* BE6628 80242E78 A602008E */ sh $v0, 0x8e($s0) -/* BE662C 80242E7C 24020032 */ addiu $v0, $zero, 0x32 -/* BE6630 80242E80 08090BB5 */ j .L80242ED4 -/* BE6634 80242E84 AE620070 */ sw $v0, 0x70($s3) -.L80242E88: -/* BE6638 80242E88 8602008C */ lh $v0, 0x8c($s0) -/* BE663C 80242E8C 14400011 */ bnez $v0, .L80242ED4 -/* BE6640 80242E90 00000000 */ nop -/* BE6644 80242E94 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BE6648 80242E98 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE664C 80242E9C C60E0040 */ lwc1 $f14, 0x40($s0) -/* BE6650 80242EA0 C4440000 */ lwc1 $f4, ($v0) -/* BE6654 80242EA4 46802120 */ cvt.s.w $f4, $f4 -/* BE6658 80242EA8 44062000 */ mfc1 $a2, $f4 -/* BE665C 80242EAC C4440008 */ lwc1 $f4, 8($v0) -/* BE6660 80242EB0 46802120 */ cvt.s.w $f4, $f4 -/* BE6664 80242EB4 44072000 */ mfc1 $a3, $f4 -/* BE6668 80242EB8 0C00A720 */ jal atan2 -/* BE666C 80242EBC 00000000 */ nop -/* BE6670 80242EC0 8E050018 */ lw $a1, 0x18($s0) -/* BE6674 80242EC4 44060000 */ mfc1 $a2, $f0 -/* BE6678 80242EC8 0200202D */ daddu $a0, $s0, $zero -/* BE667C 80242ECC 0C00EA95 */ jal npc_move_heading -/* BE6680 80242ED0 AC86000C */ sw $a2, 0xc($a0) -.L80242ED4: -/* BE6684 80242ED4 8FBF0028 */ lw $ra, 0x28($sp) -/* BE6688 80242ED8 8FB30024 */ lw $s3, 0x24($sp) -/* BE668C 80242EDC 8FB20020 */ lw $s2, 0x20($sp) -/* BE6690 80242EE0 8FB1001C */ lw $s1, 0x1c($sp) -/* BE6694 80242EE4 8FB00018 */ lw $s0, 0x18($sp) -/* BE6698 80242EE8 03E00008 */ jr $ra -/* BE669C 80242EEC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8_BE6568.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8_BE6568.s new file mode 100644 index 0000000000..90aa3dee54 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242DB8_BE6568.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242DB8_BE6568 +/* BE6568 80242DB8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* BE656C 80242DBC AFB30024 */ sw $s3, 0x24($sp) +/* BE6570 80242DC0 0080982D */ daddu $s3, $a0, $zero +/* BE6574 80242DC4 AFBF0028 */ sw $ra, 0x28($sp) +/* BE6578 80242DC8 AFB20020 */ sw $s2, 0x20($sp) +/* BE657C 80242DCC AFB1001C */ sw $s1, 0x1c($sp) +/* BE6580 80242DD0 AFB00018 */ sw $s0, 0x18($sp) +/* BE6584 80242DD4 8E720148 */ lw $s2, 0x148($s3) +/* BE6588 80242DD8 00A0882D */ daddu $s1, $a1, $zero +/* BE658C 80242DDC 86440008 */ lh $a0, 8($s2) +/* BE6590 80242DE0 0C00EABB */ jal get_npc_unsafe +/* BE6594 80242DE4 00C0802D */ daddu $s0, $a2, $zero +/* BE6598 80242DE8 0200202D */ daddu $a0, $s0, $zero +/* BE659C 80242DEC 0240282D */ daddu $a1, $s2, $zero +/* BE65A0 80242DF0 AFA00010 */ sw $zero, 0x10($sp) +/* BE65A4 80242DF4 8E260024 */ lw $a2, 0x24($s1) +/* BE65A8 80242DF8 8E270028 */ lw $a3, 0x28($s1) +/* BE65AC 80242DFC 0C01242D */ jal func_800490B4 +/* BE65B0 80242E00 0040802D */ daddu $s0, $v0, $zero +/* BE65B4 80242E04 1040000C */ beqz $v0, .L80242E38 +/* BE65B8 80242E08 00000000 */ nop +/* BE65BC 80242E0C C60C0038 */ lwc1 $f12, 0x38($s0) +/* BE65C0 80242E10 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BE65C4 80242E14 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BE65C8 80242E18 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BE65CC 80242E1C 8C460028 */ lw $a2, 0x28($v0) +/* BE65D0 80242E20 0C00A720 */ jal atan2 +/* BE65D4 80242E24 8C470030 */ lw $a3, 0x30($v0) +/* BE65D8 80242E28 2402000C */ addiu $v0, $zero, 0xc +/* BE65DC 80242E2C E600000C */ swc1 $f0, 0xc($s0) +/* BE65E0 80242E30 08090BB5 */ j .L80242ED4 +/* BE65E4 80242E34 AE620070 */ sw $v0, 0x70($s3) +.L80242E38: +/* BE65E8 80242E38 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BE65EC 80242E3C 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE65F0 80242E40 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BE65F4 80242E44 C4440000 */ lwc1 $f4, ($v0) +/* BE65F8 80242E48 46802120 */ cvt.s.w $f4, $f4 +/* BE65FC 80242E4C 44062000 */ mfc1 $a2, $f4 +/* BE6600 80242E50 C4440008 */ lwc1 $f4, 8($v0) +/* BE6604 80242E54 46802120 */ cvt.s.w $f4, $f4 +/* BE6608 80242E58 44072000 */ mfc1 $a3, $f4 +/* BE660C 80242E5C 0C00A7B5 */ jal dist2D +/* BE6610 80242E60 00000000 */ nop +/* BE6614 80242E64 C6020018 */ lwc1 $f2, 0x18($s0) +/* BE6618 80242E68 4602003E */ c.le.s $f0, $f2 +/* BE661C 80242E6C 00000000 */ nop +/* BE6620 80242E70 45000005 */ bc1f .L80242E88 +/* BE6624 80242E74 2402000A */ addiu $v0, $zero, 0xa +/* BE6628 80242E78 A602008E */ sh $v0, 0x8e($s0) +/* BE662C 80242E7C 24020032 */ addiu $v0, $zero, 0x32 +/* BE6630 80242E80 08090BB5 */ j .L80242ED4 +/* BE6634 80242E84 AE620070 */ sw $v0, 0x70($s3) +.L80242E88: +/* BE6638 80242E88 8602008C */ lh $v0, 0x8c($s0) +/* BE663C 80242E8C 14400011 */ bnez $v0, .L80242ED4 +/* BE6640 80242E90 00000000 */ nop +/* BE6644 80242E94 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BE6648 80242E98 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE664C 80242E9C C60E0040 */ lwc1 $f14, 0x40($s0) +/* BE6650 80242EA0 C4440000 */ lwc1 $f4, ($v0) +/* BE6654 80242EA4 46802120 */ cvt.s.w $f4, $f4 +/* BE6658 80242EA8 44062000 */ mfc1 $a2, $f4 +/* BE665C 80242EAC C4440008 */ lwc1 $f4, 8($v0) +/* BE6660 80242EB0 46802120 */ cvt.s.w $f4, $f4 +/* BE6664 80242EB4 44072000 */ mfc1 $a3, $f4 +/* BE6668 80242EB8 0C00A720 */ jal atan2 +/* BE666C 80242EBC 00000000 */ nop +/* BE6670 80242EC0 8E050018 */ lw $a1, 0x18($s0) +/* BE6674 80242EC4 44060000 */ mfc1 $a2, $f0 +/* BE6678 80242EC8 0200202D */ daddu $a0, $s0, $zero +/* BE667C 80242ECC 0C00EA95 */ jal npc_move_heading +/* BE6680 80242ED0 AC86000C */ sw $a2, 0xc($a0) +.L80242ED4: +/* BE6684 80242ED4 8FBF0028 */ lw $ra, 0x28($sp) +/* BE6688 80242ED8 8FB30024 */ lw $s3, 0x24($sp) +/* BE668C 80242EDC 8FB20020 */ lw $s2, 0x20($sp) +/* BE6690 80242EE0 8FB1001C */ lw $s1, 0x1c($sp) +/* BE6694 80242EE4 8FB00018 */ lw $s0, 0x18($sp) +/* BE6698 80242EE8 03E00008 */ jr $ra +/* BE669C 80242EEC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242F6C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242F6C.s deleted file mode 100644 index 6a5e3cd067..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242F6C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F6C -/* BE671C 80242F6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BE6720 80242F70 AFB10014 */ sw $s1, 0x14($sp) -/* BE6724 80242F74 0080882D */ daddu $s1, $a0, $zero -/* BE6728 80242F78 AFBF0018 */ sw $ra, 0x18($sp) -/* BE672C 80242F7C AFB00010 */ sw $s0, 0x10($sp) -/* BE6730 80242F80 8E300148 */ lw $s0, 0x148($s1) -/* BE6734 80242F84 0C00EABB */ jal get_npc_unsafe -/* BE6738 80242F88 86040008 */ lh $a0, 8($s0) -/* BE673C 80242F8C 0040182D */ daddu $v1, $v0, $zero -/* BE6740 80242F90 9462008E */ lhu $v0, 0x8e($v1) -/* BE6744 80242F94 2442FFFF */ addiu $v0, $v0, -1 -/* BE6748 80242F98 A462008E */ sh $v0, 0x8e($v1) -/* BE674C 80242F9C 00021400 */ sll $v0, $v0, 0x10 -/* BE6750 80242FA0 1C400007 */ bgtz $v0, .L80242FC0 -/* BE6754 80242FA4 24020008 */ addiu $v0, $zero, 8 -/* BE6758 80242FA8 A462008E */ sh $v0, 0x8e($v1) -/* BE675C 80242FAC 8E0200CC */ lw $v0, 0xcc($s0) -/* BE6760 80242FB0 8C420038 */ lw $v0, 0x38($v0) -/* BE6764 80242FB4 AC620028 */ sw $v0, 0x28($v1) -/* BE6768 80242FB8 24020034 */ addiu $v0, $zero, 0x34 -/* BE676C 80242FBC AE220070 */ sw $v0, 0x70($s1) -.L80242FC0: -/* BE6770 80242FC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BE6774 80242FC4 8FB10014 */ lw $s1, 0x14($sp) -/* BE6778 80242FC8 8FB00010 */ lw $s0, 0x10($sp) -/* BE677C 80242FCC 03E00008 */ jr $ra -/* BE6780 80242FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242F6C_BE671C.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242F6C_BE671C.s new file mode 100644 index 0000000000..d18b5e940f --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242F6C_BE671C.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F6C_BE671C +/* BE671C 80242F6C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BE6720 80242F70 AFB10014 */ sw $s1, 0x14($sp) +/* BE6724 80242F74 0080882D */ daddu $s1, $a0, $zero +/* BE6728 80242F78 AFBF0018 */ sw $ra, 0x18($sp) +/* BE672C 80242F7C AFB00010 */ sw $s0, 0x10($sp) +/* BE6730 80242F80 8E300148 */ lw $s0, 0x148($s1) +/* BE6734 80242F84 0C00EABB */ jal get_npc_unsafe +/* BE6738 80242F88 86040008 */ lh $a0, 8($s0) +/* BE673C 80242F8C 0040182D */ daddu $v1, $v0, $zero +/* BE6740 80242F90 9462008E */ lhu $v0, 0x8e($v1) +/* BE6744 80242F94 2442FFFF */ addiu $v0, $v0, -1 +/* BE6748 80242F98 A462008E */ sh $v0, 0x8e($v1) +/* BE674C 80242F9C 00021400 */ sll $v0, $v0, 0x10 +/* BE6750 80242FA0 1C400007 */ bgtz $v0, .L80242FC0 +/* BE6754 80242FA4 24020008 */ addiu $v0, $zero, 8 +/* BE6758 80242FA8 A462008E */ sh $v0, 0x8e($v1) +/* BE675C 80242FAC 8E0200CC */ lw $v0, 0xcc($s0) +/* BE6760 80242FB0 8C420038 */ lw $v0, 0x38($v0) +/* BE6764 80242FB4 AC620028 */ sw $v0, 0x28($v1) +/* BE6768 80242FB8 24020034 */ addiu $v0, $zero, 0x34 +/* BE676C 80242FBC AE220070 */ sw $v0, 0x70($s1) +.L80242FC0: +/* BE6770 80242FC0 8FBF0018 */ lw $ra, 0x18($sp) +/* BE6774 80242FC4 8FB10014 */ lw $s1, 0x14($sp) +/* BE6778 80242FC8 8FB00010 */ lw $s0, 0x10($sp) +/* BE677C 80242FCC 03E00008 */ jr $ra +/* BE6780 80242FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4.s deleted file mode 100644 index 379130bd00..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FD4 -/* BE6784 80242FD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BE6788 80242FD8 AFB00010 */ sw $s0, 0x10($sp) -/* BE678C 80242FDC 0080802D */ daddu $s0, $a0, $zero -/* BE6790 80242FE0 AFBF0014 */ sw $ra, 0x14($sp) -/* BE6794 80242FE4 8E020148 */ lw $v0, 0x148($s0) -/* BE6798 80242FE8 0C00EABB */ jal get_npc_unsafe -/* BE679C 80242FEC 84440008 */ lh $a0, 8($v0) -/* BE67A0 80242FF0 9443008E */ lhu $v1, 0x8e($v0) -/* BE67A4 80242FF4 2463FFFF */ addiu $v1, $v1, -1 -/* BE67A8 80242FF8 A443008E */ sh $v1, 0x8e($v0) -/* BE67AC 80242FFC 00031C00 */ sll $v1, $v1, 0x10 -/* BE67B0 80243000 58600001 */ blezl $v1, .L80243008 -/* BE67B4 80243004 AE000070 */ sw $zero, 0x70($s0) -.L80243008: -/* BE67B8 80243008 8FBF0014 */ lw $ra, 0x14($sp) -/* BE67BC 8024300C 8FB00010 */ lw $s0, 0x10($sp) -/* BE67C0 80243010 03E00008 */ jr $ra -/* BE67C4 80243014 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s new file mode 100644 index 0000000000..f61b14e888 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80242FD4_BE6784.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242FD4_BE6784 +/* BE6784 80242FD4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BE6788 80242FD8 AFB00010 */ sw $s0, 0x10($sp) +/* BE678C 80242FDC 0080802D */ daddu $s0, $a0, $zero +/* BE6790 80242FE0 AFBF0014 */ sw $ra, 0x14($sp) +/* BE6794 80242FE4 8E020148 */ lw $v0, 0x148($s0) +/* BE6798 80242FE8 0C00EABB */ jal get_npc_unsafe +/* BE679C 80242FEC 84440008 */ lh $a0, 8($v0) +/* BE67A0 80242FF0 9443008E */ lhu $v1, 0x8e($v0) +/* BE67A4 80242FF4 2463FFFF */ addiu $v1, $v1, -1 +/* BE67A8 80242FF8 A443008E */ sh $v1, 0x8e($v0) +/* BE67AC 80242FFC 00031C00 */ sll $v1, $v1, 0x10 +/* BE67B0 80243000 58600001 */ blezl $v1, .L80243008 +/* BE67B4 80243004 AE000070 */ sw $zero, 0x70($s0) +.L80243008: +/* BE67B8 80243008 8FBF0014 */ lw $ra, 0x14($sp) +/* BE67BC 8024300C 8FB00010 */ lw $s0, 0x10($sp) +/* BE67C0 80243010 03E00008 */ jr $ra +/* BE67C4 80243014 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018.s deleted file mode 100644 index d593ffe162..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243018 -/* BE67C8 80243018 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BE67CC 8024301C AFB3003C */ sw $s3, 0x3c($sp) -/* BE67D0 80243020 0080982D */ daddu $s3, $a0, $zero -/* BE67D4 80243024 AFBF0048 */ sw $ra, 0x48($sp) -/* BE67D8 80243028 AFB50044 */ sw $s5, 0x44($sp) -/* BE67DC 8024302C AFB40040 */ sw $s4, 0x40($sp) -/* BE67E0 80243030 AFB20038 */ sw $s2, 0x38($sp) -/* BE67E4 80243034 AFB10034 */ sw $s1, 0x34($sp) -/* BE67E8 80243038 AFB00030 */ sw $s0, 0x30($sp) -/* BE67EC 8024303C 8E720148 */ lw $s2, 0x148($s3) -/* BE67F0 80243040 86440008 */ lh $a0, 8($s2) -/* BE67F4 80243044 0C00EABB */ jal get_npc_unsafe -/* BE67F8 80243048 00A0882D */ daddu $s1, $a1, $zero -/* BE67FC 8024304C 0260202D */ daddu $a0, $s3, $zero -/* BE6800 80243050 8E70000C */ lw $s0, 0xc($s3) -/* BE6804 80243054 0040A82D */ daddu $s5, $v0, $zero -/* BE6808 80243058 8E050000 */ lw $a1, ($s0) -/* BE680C 8024305C 0C0B1EAF */ jal get_variable -/* BE6810 80243060 26100004 */ addiu $s0, $s0, 4 -/* BE6814 80243064 0260202D */ daddu $a0, $s3, $zero -/* BE6818 80243068 8E050000 */ lw $a1, ($s0) -/* BE681C 8024306C 0C0B1EAF */ jal get_variable -/* BE6820 80243070 0040A02D */ daddu $s4, $v0, $zero -/* BE6824 80243074 AE420094 */ sw $v0, 0x94($s2) -/* BE6828 80243078 AFA00010 */ sw $zero, 0x10($sp) -/* BE682C 8024307C 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE6830 80243080 8C420030 */ lw $v0, 0x30($v0) -/* BE6834 80243084 AFA20014 */ sw $v0, 0x14($sp) -/* BE6838 80243088 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE683C 8024308C 8C42001C */ lw $v0, 0x1c($v0) -/* BE6840 80243090 AFA20018 */ sw $v0, 0x18($sp) -/* BE6844 80243094 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE6848 80243098 8C420024 */ lw $v0, 0x24($v0) -/* BE684C 8024309C AFA2001C */ sw $v0, 0x1c($sp) -/* BE6850 802430A0 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE6854 802430A4 8C420028 */ lw $v0, 0x28($v0) -/* BE6858 802430A8 AFA20020 */ sw $v0, 0x20($sp) -/* BE685C 802430AC 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE6860 802430B0 3C014220 */ lui $at, 0x4220 -/* BE6864 802430B4 44810000 */ mtc1 $at, $f0 -/* BE6868 802430B8 8C42002C */ lw $v0, 0x2c($v0) -/* BE686C 802430BC 27B00010 */ addiu $s0, $sp, 0x10 -/* BE6870 802430C0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BE6874 802430C4 A7A0002C */ sh $zero, 0x2c($sp) -/* BE6878 802430C8 12200012 */ beqz $s1, .L80243114 -/* BE687C 802430CC AFA20024 */ sw $v0, 0x24($sp) -/* BE6880 802430D0 AE600070 */ sw $zero, 0x70($s3) -/* BE6884 802430D4 8EA30000 */ lw $v1, ($s5) -/* BE6888 802430D8 2402F7FF */ addiu $v0, $zero, -0x801 -/* BE688C 802430DC A6A0008E */ sh $zero, 0x8e($s5) -/* BE6890 802430E0 00621824 */ and $v1, $v1, $v0 -/* BE6894 802430E4 AEA30000 */ sw $v1, ($s5) -/* BE6898 802430E8 8E4200D0 */ lw $v0, 0xd0($s2) -/* BE689C 802430EC 8C420034 */ lw $v0, 0x34($v0) -/* BE68A0 802430F0 54400005 */ bnel $v0, $zero, .L80243108 -/* BE68A4 802430F4 2402FDFF */ addiu $v0, $zero, -0x201 -/* BE68A8 802430F8 34620200 */ ori $v0, $v1, 0x200 -/* BE68AC 802430FC 2403FFF7 */ addiu $v1, $zero, -9 -/* BE68B0 80243100 08090C44 */ j .L80243110 -/* BE68B4 80243104 00431024 */ and $v0, $v0, $v1 -.L80243108: -/* BE68B8 80243108 00621024 */ and $v0, $v1, $v0 -/* BE68BC 8024310C 34420008 */ ori $v0, $v0, 8 -.L80243110: -/* BE68C0 80243110 AEA20000 */ sw $v0, ($s5) -.L80243114: -/* BE68C4 80243114 8E4300B0 */ lw $v1, 0xb0($s2) -/* BE68C8 80243118 30620004 */ andi $v0, $v1, 4 -/* BE68CC 8024311C 10400007 */ beqz $v0, .L8024313C -/* BE68D0 80243120 00000000 */ nop -/* BE68D4 80243124 824200B4 */ lb $v0, 0xb4($s2) -/* BE68D8 80243128 14400086 */ bnez $v0, .L80243344 -/* BE68DC 8024312C 0000102D */ daddu $v0, $zero, $zero -/* BE68E0 80243130 2402FFFB */ addiu $v0, $zero, -5 -/* BE68E4 80243134 00621024 */ and $v0, $v1, $v0 -/* BE68E8 80243138 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024313C: -/* BE68EC 8024313C 8E620070 */ lw $v0, 0x70($s3) -/* BE68F0 80243140 2442FFF4 */ addiu $v0, $v0, -0xc -/* BE68F4 80243144 2C420003 */ sltiu $v0, $v0, 3 -/* BE68F8 80243148 10400007 */ beqz $v0, .L80243168 -/* BE68FC 8024314C 0260202D */ daddu $a0, $s3, $zero -/* BE6900 80243150 0280282D */ daddu $a1, $s4, $zero -/* BE6904 80243154 0C0908E2 */ jal func_80242388 -/* BE6908 80243158 0200302D */ daddu $a2, $s0, $zero -/* BE690C 8024315C 10400002 */ beqz $v0, .L80243168 -/* BE6910 80243160 24020014 */ addiu $v0, $zero, 0x14 -/* BE6914 80243164 AE620070 */ sw $v0, 0x70($s3) -.L80243168: -/* BE6918 80243168 8E630070 */ lw $v1, 0x70($s3) -/* BE691C 8024316C 2C620035 */ sltiu $v0, $v1, 0x35 -/* BE6920 80243170 10400073 */ beqz $v0, .L80243340 -/* BE6924 80243174 00031080 */ sll $v0, $v1, 2 -/* BE6928 80243178 3C018024 */ lui $at, 0x8024 -/* BE692C 8024317C 00220821 */ addu $at, $at, $v0 -/* BE6930 80243180 8C224350 */ lw $v0, 0x4350($at) -/* BE6934 80243184 00400008 */ jr $v0 -/* BE6938 80243188 00000000 */ nop -/* BE693C 8024318C 0260202D */ daddu $a0, $s3, $zero -/* BE6940 80243190 0280282D */ daddu $a1, $s4, $zero -/* BE6944 80243194 0C09093A */ jal func_802424E8 -/* BE6948 80243198 0200302D */ daddu $a2, $s0, $zero -/* BE694C 8024319C 0260202D */ daddu $a0, $s3, $zero -/* BE6950 802431A0 0280282D */ daddu $a1, $s4, $zero -/* BE6954 802431A4 0C090957 */ jal func_8024255C -/* BE6958 802431A8 0200302D */ daddu $a2, $s0, $zero -/* BE695C 802431AC 8E630070 */ lw $v1, 0x70($s3) -/* BE6960 802431B0 24020002 */ addiu $v0, $zero, 2 -/* BE6964 802431B4 14620063 */ bne $v1, $v0, .L80243344 -/* BE6968 802431B8 0000102D */ daddu $v0, $zero, $zero -/* BE696C 802431BC 0260202D */ daddu $a0, $s3, $zero -/* BE6970 802431C0 0280282D */ daddu $a1, $s4, $zero -/* BE6974 802431C4 0C0909A3 */ jal func_8024268C -/* BE6978 802431C8 0200302D */ daddu $a2, $s0, $zero -/* BE697C 802431CC 8E630070 */ lw $v1, 0x70($s3) -/* BE6980 802431D0 24020003 */ addiu $v0, $zero, 3 -/* BE6984 802431D4 1462005B */ bne $v1, $v0, .L80243344 -/* BE6988 802431D8 0000102D */ daddu $v0, $zero, $zero -/* BE698C 802431DC 0260202D */ daddu $a0, $s3, $zero -/* BE6990 802431E0 0280282D */ daddu $a1, $s4, $zero -/* BE6994 802431E4 0C0909CA */ jal func_80242728 -/* BE6998 802431E8 0200302D */ daddu $a2, $s0, $zero -/* BE699C 802431EC 8E630070 */ lw $v1, 0x70($s3) -/* BE69A0 802431F0 24020004 */ addiu $v0, $zero, 4 -/* BE69A4 802431F4 14620053 */ bne $v1, $v0, .L80243344 -/* BE69A8 802431F8 0000102D */ daddu $v0, $zero, $zero -/* BE69AC 802431FC 0260202D */ daddu $a0, $s3, $zero -/* BE69B0 80243200 0280282D */ daddu $a1, $s4, $zero -/* BE69B4 80243204 0C0909EC */ jal func_802427B0 -/* BE69B8 80243208 0200302D */ daddu $a2, $s0, $zero -/* BE69BC 8024320C 0260202D */ daddu $a0, $s3, $zero -/* BE69C0 80243210 0280282D */ daddu $a1, $s4, $zero -/* BE69C4 80243214 0C090A16 */ jal func_80242858 -/* BE69C8 80243218 0200302D */ daddu $a2, $s0, $zero -/* BE69CC 8024321C 08090CD1 */ j .L80243344 -/* BE69D0 80243220 0000102D */ daddu $v0, $zero, $zero -/* BE69D4 80243224 0260202D */ daddu $a0, $s3, $zero -/* BE69D8 80243228 0280282D */ daddu $a1, $s4, $zero -/* BE69DC 8024322C 0C0127DF */ jal func_80049F7C -/* BE69E0 80243230 0200302D */ daddu $a2, $s0, $zero -/* BE69E4 80243234 8E630070 */ lw $v1, 0x70($s3) -/* BE69E8 80243238 2402000D */ addiu $v0, $zero, 0xd -/* BE69EC 8024323C 14620041 */ bne $v1, $v0, .L80243344 -/* BE69F0 80243240 0000102D */ daddu $v0, $zero, $zero -/* BE69F4 80243244 0260202D */ daddu $a0, $s3, $zero -/* BE69F8 80243248 0280282D */ daddu $a1, $s4, $zero -/* BE69FC 8024324C 0C012849 */ jal func_8004A124 -/* BE6A00 80243250 0200302D */ daddu $a2, $s0, $zero -/* BE6A04 80243254 8E630070 */ lw $v1, 0x70($s3) -/* BE6A08 80243258 2402000E */ addiu $v0, $zero, 0xe -/* BE6A0C 8024325C 14620039 */ bne $v1, $v0, .L80243344 -/* BE6A10 80243260 0000102D */ daddu $v0, $zero, $zero -/* BE6A14 80243264 96A2008E */ lhu $v0, 0x8e($s5) -/* BE6A18 80243268 2442FFFF */ addiu $v0, $v0, -1 -/* BE6A1C 8024326C A6A2008E */ sh $v0, 0x8e($s5) -/* BE6A20 80243270 00021400 */ sll $v0, $v0, 0x10 -/* BE6A24 80243274 14400033 */ bnez $v0, .L80243344 -/* BE6A28 80243278 0000102D */ daddu $v0, $zero, $zero -/* BE6A2C 8024327C 24020028 */ addiu $v0, $zero, 0x28 -/* BE6A30 80243280 08090CD0 */ j .L80243340 -/* BE6A34 80243284 AE620070 */ sw $v0, 0x70($s3) -/* BE6A38 80243288 0260202D */ daddu $a0, $s3, $zero -/* BE6A3C 8024328C 0280282D */ daddu $a1, $s4, $zero -/* BE6A40 80243290 0C090A73 */ jal func_802429CC -/* BE6A44 80243294 0200302D */ daddu $a2, $s0, $zero -/* BE6A48 80243298 0260202D */ daddu $a0, $s3, $zero -/* BE6A4C 8024329C 0280282D */ daddu $a1, $s4, $zero -/* BE6A50 802432A0 0C090A87 */ jal func_80242A1C -/* BE6A54 802432A4 0200302D */ daddu $a2, $s0, $zero -/* BE6A58 802432A8 08090CD1 */ j .L80243344 -/* BE6A5C 802432AC 0000102D */ daddu $v0, $zero, $zero -/* BE6A60 802432B0 0260202D */ daddu $a0, $s3, $zero -/* BE6A64 802432B4 0280282D */ daddu $a1, $s4, $zero -/* BE6A68 802432B8 0C090AEF */ jal func_80242BBC -/* BE6A6C 802432BC 0200302D */ daddu $a2, $s0, $zero -/* BE6A70 802432C0 08090CD1 */ j .L80243344 -/* BE6A74 802432C4 0000102D */ daddu $v0, $zero, $zero -/* BE6A78 802432C8 0260202D */ daddu $a0, $s3, $zero -/* BE6A7C 802432CC 0280282D */ daddu $a1, $s4, $zero -/* BE6A80 802432D0 0C090B43 */ jal func_80242D0C -/* BE6A84 802432D4 0200302D */ daddu $a2, $s0, $zero -/* BE6A88 802432D8 8E630070 */ lw $v1, 0x70($s3) -/* BE6A8C 802432DC 24020029 */ addiu $v0, $zero, 0x29 -/* BE6A90 802432E0 14620018 */ bne $v1, $v0, .L80243344 -/* BE6A94 802432E4 0000102D */ daddu $v0, $zero, $zero -/* BE6A98 802432E8 0260202D */ daddu $a0, $s3, $zero -/* BE6A9C 802432EC 0280282D */ daddu $a1, $s4, $zero -/* BE6AA0 802432F0 0C090B6E */ jal func_80242DB8 -/* BE6AA4 802432F4 0200302D */ daddu $a2, $s0, $zero -/* BE6AA8 802432F8 08090CD1 */ j .L80243344 -/* BE6AAC 802432FC 0000102D */ daddu $v0, $zero, $zero -/* BE6AB0 80243300 0260202D */ daddu $a0, $s3, $zero -/* BE6AB4 80243304 0280282D */ daddu $a1, $s4, $zero -/* BE6AB8 80243308 0C090BBC */ jal func_80242EF0 -/* BE6ABC 8024330C 0200302D */ daddu $a2, $s0, $zero -/* BE6AC0 80243310 0260202D */ daddu $a0, $s3, $zero -/* BE6AC4 80243314 0280282D */ daddu $a1, $s4, $zero -/* BE6AC8 80243318 0C090BDB */ jal func_80242F6C -/* BE6ACC 8024331C 0200302D */ daddu $a2, $s0, $zero -/* BE6AD0 80243320 8E630070 */ lw $v1, 0x70($s3) -/* BE6AD4 80243324 24020034 */ addiu $v0, $zero, 0x34 -/* BE6AD8 80243328 14620006 */ bne $v1, $v0, .L80243344 -/* BE6ADC 8024332C 0000102D */ daddu $v0, $zero, $zero -/* BE6AE0 80243330 0260202D */ daddu $a0, $s3, $zero -/* BE6AE4 80243334 0280282D */ daddu $a1, $s4, $zero -/* BE6AE8 80243338 0C090BF5 */ jal func_80242FD4 -/* BE6AEC 8024333C 0200302D */ daddu $a2, $s0, $zero -.L80243340: -/* BE6AF0 80243340 0000102D */ daddu $v0, $zero, $zero -.L80243344: -/* BE6AF4 80243344 8FBF0048 */ lw $ra, 0x48($sp) -/* BE6AF8 80243348 8FB50044 */ lw $s5, 0x44($sp) -/* BE6AFC 8024334C 8FB40040 */ lw $s4, 0x40($sp) -/* BE6B00 80243350 8FB3003C */ lw $s3, 0x3c($sp) -/* BE6B04 80243354 8FB20038 */ lw $s2, 0x38($sp) -/* BE6B08 80243358 8FB10034 */ lw $s1, 0x34($sp) -/* BE6B0C 8024335C 8FB00030 */ lw $s0, 0x30($sp) -/* BE6B10 80243360 03E00008 */ jr $ra -/* BE6B14 80243364 27BD0050 */ addiu $sp, $sp, 0x50 -/* BE6B18 80243368 00000000 */ nop -/* BE6B1C 8024336C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s new file mode 100644 index 0000000000..f7c872a56f --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_04/BE37B0/func_80243018_BE67C8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243018_BE67C8 +/* BE67C8 80243018 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BE67CC 8024301C AFB3003C */ sw $s3, 0x3c($sp) +/* BE67D0 80243020 0080982D */ daddu $s3, $a0, $zero +/* BE67D4 80243024 AFBF0048 */ sw $ra, 0x48($sp) +/* BE67D8 80243028 AFB50044 */ sw $s5, 0x44($sp) +/* BE67DC 8024302C AFB40040 */ sw $s4, 0x40($sp) +/* BE67E0 80243030 AFB20038 */ sw $s2, 0x38($sp) +/* BE67E4 80243034 AFB10034 */ sw $s1, 0x34($sp) +/* BE67E8 80243038 AFB00030 */ sw $s0, 0x30($sp) +/* BE67EC 8024303C 8E720148 */ lw $s2, 0x148($s3) +/* BE67F0 80243040 86440008 */ lh $a0, 8($s2) +/* BE67F4 80243044 0C00EABB */ jal get_npc_unsafe +/* BE67F8 80243048 00A0882D */ daddu $s1, $a1, $zero +/* BE67FC 8024304C 0260202D */ daddu $a0, $s3, $zero +/* BE6800 80243050 8E70000C */ lw $s0, 0xc($s3) +/* BE6804 80243054 0040A82D */ daddu $s5, $v0, $zero +/* BE6808 80243058 8E050000 */ lw $a1, ($s0) +/* BE680C 8024305C 0C0B1EAF */ jal get_variable +/* BE6810 80243060 26100004 */ addiu $s0, $s0, 4 +/* BE6814 80243064 0260202D */ daddu $a0, $s3, $zero +/* BE6818 80243068 8E050000 */ lw $a1, ($s0) +/* BE681C 8024306C 0C0B1EAF */ jal get_variable +/* BE6820 80243070 0040A02D */ daddu $s4, $v0, $zero +/* BE6824 80243074 AE420094 */ sw $v0, 0x94($s2) +/* BE6828 80243078 AFA00010 */ sw $zero, 0x10($sp) +/* BE682C 8024307C 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE6830 80243080 8C420030 */ lw $v0, 0x30($v0) +/* BE6834 80243084 AFA20014 */ sw $v0, 0x14($sp) +/* BE6838 80243088 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE683C 8024308C 8C42001C */ lw $v0, 0x1c($v0) +/* BE6840 80243090 AFA20018 */ sw $v0, 0x18($sp) +/* BE6844 80243094 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE6848 80243098 8C420024 */ lw $v0, 0x24($v0) +/* BE684C 8024309C AFA2001C */ sw $v0, 0x1c($sp) +/* BE6850 802430A0 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE6854 802430A4 8C420028 */ lw $v0, 0x28($v0) +/* BE6858 802430A8 AFA20020 */ sw $v0, 0x20($sp) +/* BE685C 802430AC 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE6860 802430B0 3C014220 */ lui $at, 0x4220 +/* BE6864 802430B4 44810000 */ mtc1 $at, $f0 +/* BE6868 802430B8 8C42002C */ lw $v0, 0x2c($v0) +/* BE686C 802430BC 27B00010 */ addiu $s0, $sp, 0x10 +/* BE6870 802430C0 E7A00028 */ swc1 $f0, 0x28($sp) +/* BE6874 802430C4 A7A0002C */ sh $zero, 0x2c($sp) +/* BE6878 802430C8 12200012 */ beqz $s1, .L80243114 +/* BE687C 802430CC AFA20024 */ sw $v0, 0x24($sp) +/* BE6880 802430D0 AE600070 */ sw $zero, 0x70($s3) +/* BE6884 802430D4 8EA30000 */ lw $v1, ($s5) +/* BE6888 802430D8 2402F7FF */ addiu $v0, $zero, -0x801 +/* BE688C 802430DC A6A0008E */ sh $zero, 0x8e($s5) +/* BE6890 802430E0 00621824 */ and $v1, $v1, $v0 +/* BE6894 802430E4 AEA30000 */ sw $v1, ($s5) +/* BE6898 802430E8 8E4200D0 */ lw $v0, 0xd0($s2) +/* BE689C 802430EC 8C420034 */ lw $v0, 0x34($v0) +/* BE68A0 802430F0 54400005 */ bnel $v0, $zero, .L80243108 +/* BE68A4 802430F4 2402FDFF */ addiu $v0, $zero, -0x201 +/* BE68A8 802430F8 34620200 */ ori $v0, $v1, 0x200 +/* BE68AC 802430FC 2403FFF7 */ addiu $v1, $zero, -9 +/* BE68B0 80243100 08090C44 */ j .L80243110 +/* BE68B4 80243104 00431024 */ and $v0, $v0, $v1 +.L80243108: +/* BE68B8 80243108 00621024 */ and $v0, $v1, $v0 +/* BE68BC 8024310C 34420008 */ ori $v0, $v0, 8 +.L80243110: +/* BE68C0 80243110 AEA20000 */ sw $v0, ($s5) +.L80243114: +/* BE68C4 80243114 8E4300B0 */ lw $v1, 0xb0($s2) +/* BE68C8 80243118 30620004 */ andi $v0, $v1, 4 +/* BE68CC 8024311C 10400007 */ beqz $v0, .L8024313C +/* BE68D0 80243120 00000000 */ nop +/* BE68D4 80243124 824200B4 */ lb $v0, 0xb4($s2) +/* BE68D8 80243128 14400086 */ bnez $v0, .L80243344 +/* BE68DC 8024312C 0000102D */ daddu $v0, $zero, $zero +/* BE68E0 80243130 2402FFFB */ addiu $v0, $zero, -5 +/* BE68E4 80243134 00621024 */ and $v0, $v1, $v0 +/* BE68E8 80243138 AE4200B0 */ sw $v0, 0xb0($s2) +.L8024313C: +/* BE68EC 8024313C 8E620070 */ lw $v0, 0x70($s3) +/* BE68F0 80243140 2442FFF4 */ addiu $v0, $v0, -0xc +/* BE68F4 80243144 2C420003 */ sltiu $v0, $v0, 3 +/* BE68F8 80243148 10400007 */ beqz $v0, .L80243168 +/* BE68FC 8024314C 0260202D */ daddu $a0, $s3, $zero +/* BE6900 80243150 0280282D */ daddu $a1, $s4, $zero +/* BE6904 80243154 0C0908E2 */ jal func_80242388_BE5B38 +/* BE6908 80243158 0200302D */ daddu $a2, $s0, $zero +/* BE690C 8024315C 10400002 */ beqz $v0, .L80243168 +/* BE6910 80243160 24020014 */ addiu $v0, $zero, 0x14 +/* BE6914 80243164 AE620070 */ sw $v0, 0x70($s3) +.L80243168: +/* BE6918 80243168 8E630070 */ lw $v1, 0x70($s3) +/* BE691C 8024316C 2C620035 */ sltiu $v0, $v1, 0x35 +/* BE6920 80243170 10400073 */ beqz $v0, .L80243340 +/* BE6924 80243174 00031080 */ sll $v0, $v1, 2 +/* BE6928 80243178 3C018024 */ lui $at, 0x8024 +/* BE692C 8024317C 00220821 */ addu $at, $at, $v0 +/* BE6930 80243180 8C224350 */ lw $v0, 0x4350($at) +/* BE6934 80243184 00400008 */ jr $v0 +/* BE6938 80243188 00000000 */ nop +/* BE693C 8024318C 0260202D */ daddu $a0, $s3, $zero +/* BE6940 80243190 0280282D */ daddu $a1, $s4, $zero +/* BE6944 80243194 0C09093A */ jal func_802424E8_BE5C98 +/* BE6948 80243198 0200302D */ daddu $a2, $s0, $zero +/* BE694C 8024319C 0260202D */ daddu $a0, $s3, $zero +/* BE6950 802431A0 0280282D */ daddu $a1, $s4, $zero +/* BE6954 802431A4 0C090957 */ jal func_8024255C_BE5D0C +/* BE6958 802431A8 0200302D */ daddu $a2, $s0, $zero +/* BE695C 802431AC 8E630070 */ lw $v1, 0x70($s3) +/* BE6960 802431B0 24020002 */ addiu $v0, $zero, 2 +/* BE6964 802431B4 14620063 */ bne $v1, $v0, .L80243344 +/* BE6968 802431B8 0000102D */ daddu $v0, $zero, $zero +/* BE696C 802431BC 0260202D */ daddu $a0, $s3, $zero +/* BE6970 802431C0 0280282D */ daddu $a1, $s4, $zero +/* BE6974 802431C4 0C0909A3 */ jal func_8024268C_BE5E3C +/* BE6978 802431C8 0200302D */ daddu $a2, $s0, $zero +/* BE697C 802431CC 8E630070 */ lw $v1, 0x70($s3) +/* BE6980 802431D0 24020003 */ addiu $v0, $zero, 3 +/* BE6984 802431D4 1462005B */ bne $v1, $v0, .L80243344 +/* BE6988 802431D8 0000102D */ daddu $v0, $zero, $zero +/* BE698C 802431DC 0260202D */ daddu $a0, $s3, $zero +/* BE6990 802431E0 0280282D */ daddu $a1, $s4, $zero +/* BE6994 802431E4 0C0909CA */ jal func_80242728_BE5ED8 +/* BE6998 802431E8 0200302D */ daddu $a2, $s0, $zero +/* BE699C 802431EC 8E630070 */ lw $v1, 0x70($s3) +/* BE69A0 802431F0 24020004 */ addiu $v0, $zero, 4 +/* BE69A4 802431F4 14620053 */ bne $v1, $v0, .L80243344 +/* BE69A8 802431F8 0000102D */ daddu $v0, $zero, $zero +/* BE69AC 802431FC 0260202D */ daddu $a0, $s3, $zero +/* BE69B0 80243200 0280282D */ daddu $a1, $s4, $zero +/* BE69B4 80243204 0C0909EC */ jal func_802427B0_BE5F60 +/* BE69B8 80243208 0200302D */ daddu $a2, $s0, $zero +/* BE69BC 8024320C 0260202D */ daddu $a0, $s3, $zero +/* BE69C0 80243210 0280282D */ daddu $a1, $s4, $zero +/* BE69C4 80243214 0C090A16 */ jal func_80242858_BE6008 +/* BE69C8 80243218 0200302D */ daddu $a2, $s0, $zero +/* BE69CC 8024321C 08090CD1 */ j .L80243344 +/* BE69D0 80243220 0000102D */ daddu $v0, $zero, $zero +/* BE69D4 80243224 0260202D */ daddu $a0, $s3, $zero +/* BE69D8 80243228 0280282D */ daddu $a1, $s4, $zero +/* BE69DC 8024322C 0C0127DF */ jal func_80049F7C +/* BE69E0 80243230 0200302D */ daddu $a2, $s0, $zero +/* BE69E4 80243234 8E630070 */ lw $v1, 0x70($s3) +/* BE69E8 80243238 2402000D */ addiu $v0, $zero, 0xd +/* BE69EC 8024323C 14620041 */ bne $v1, $v0, .L80243344 +/* BE69F0 80243240 0000102D */ daddu $v0, $zero, $zero +/* BE69F4 80243244 0260202D */ daddu $a0, $s3, $zero +/* BE69F8 80243248 0280282D */ daddu $a1, $s4, $zero +/* BE69FC 8024324C 0C012849 */ jal func_8004A124 +/* BE6A00 80243250 0200302D */ daddu $a2, $s0, $zero +/* BE6A04 80243254 8E630070 */ lw $v1, 0x70($s3) +/* BE6A08 80243258 2402000E */ addiu $v0, $zero, 0xe +/* BE6A0C 8024325C 14620039 */ bne $v1, $v0, .L80243344 +/* BE6A10 80243260 0000102D */ daddu $v0, $zero, $zero +/* BE6A14 80243264 96A2008E */ lhu $v0, 0x8e($s5) +/* BE6A18 80243268 2442FFFF */ addiu $v0, $v0, -1 +/* BE6A1C 8024326C A6A2008E */ sh $v0, 0x8e($s5) +/* BE6A20 80243270 00021400 */ sll $v0, $v0, 0x10 +/* BE6A24 80243274 14400033 */ bnez $v0, .L80243344 +/* BE6A28 80243278 0000102D */ daddu $v0, $zero, $zero +/* BE6A2C 8024327C 24020028 */ addiu $v0, $zero, 0x28 +/* BE6A30 80243280 08090CD0 */ j .L80243340 +/* BE6A34 80243284 AE620070 */ sw $v0, 0x70($s3) +/* BE6A38 80243288 0260202D */ daddu $a0, $s3, $zero +/* BE6A3C 8024328C 0280282D */ daddu $a1, $s4, $zero +/* BE6A40 80243290 0C090A73 */ jal func_802429CC_BE617C +/* BE6A44 80243294 0200302D */ daddu $a2, $s0, $zero +/* BE6A48 80243298 0260202D */ daddu $a0, $s3, $zero +/* BE6A4C 8024329C 0280282D */ daddu $a1, $s4, $zero +/* BE6A50 802432A0 0C090A87 */ jal func_80242A1C_BE61CC +/* BE6A54 802432A4 0200302D */ daddu $a2, $s0, $zero +/* BE6A58 802432A8 08090CD1 */ j .L80243344 +/* BE6A5C 802432AC 0000102D */ daddu $v0, $zero, $zero +/* BE6A60 802432B0 0260202D */ daddu $a0, $s3, $zero +/* BE6A64 802432B4 0280282D */ daddu $a1, $s4, $zero +/* BE6A68 802432B8 0C090AEF */ jal func_80242BBC_BE636C +/* BE6A6C 802432BC 0200302D */ daddu $a2, $s0, $zero +/* BE6A70 802432C0 08090CD1 */ j .L80243344 +/* BE6A74 802432C4 0000102D */ daddu $v0, $zero, $zero +/* BE6A78 802432C8 0260202D */ daddu $a0, $s3, $zero +/* BE6A7C 802432CC 0280282D */ daddu $a1, $s4, $zero +/* BE6A80 802432D0 0C090B43 */ jal func_80242D0C_BE64BC +/* BE6A84 802432D4 0200302D */ daddu $a2, $s0, $zero +/* BE6A88 802432D8 8E630070 */ lw $v1, 0x70($s3) +/* BE6A8C 802432DC 24020029 */ addiu $v0, $zero, 0x29 +/* BE6A90 802432E0 14620018 */ bne $v1, $v0, .L80243344 +/* BE6A94 802432E4 0000102D */ daddu $v0, $zero, $zero +/* BE6A98 802432E8 0260202D */ daddu $a0, $s3, $zero +/* BE6A9C 802432EC 0280282D */ daddu $a1, $s4, $zero +/* BE6AA0 802432F0 0C090B6E */ jal func_80242DB8_BE6568 +/* BE6AA4 802432F4 0200302D */ daddu $a2, $s0, $zero +/* BE6AA8 802432F8 08090CD1 */ j .L80243344 +/* BE6AAC 802432FC 0000102D */ daddu $v0, $zero, $zero +/* BE6AB0 80243300 0260202D */ daddu $a0, $s3, $zero +/* BE6AB4 80243304 0280282D */ daddu $a1, $s4, $zero +/* BE6AB8 80243308 0C090BBC */ jal func_80242EF0_BE66A0 +/* BE6ABC 8024330C 0200302D */ daddu $a2, $s0, $zero +/* BE6AC0 80243310 0260202D */ daddu $a0, $s3, $zero +/* BE6AC4 80243314 0280282D */ daddu $a1, $s4, $zero +/* BE6AC8 80243318 0C090BDB */ jal func_80242F6C_BE671C +/* BE6ACC 8024331C 0200302D */ daddu $a2, $s0, $zero +/* BE6AD0 80243320 8E630070 */ lw $v1, 0x70($s3) +/* BE6AD4 80243324 24020034 */ addiu $v0, $zero, 0x34 +/* BE6AD8 80243328 14620006 */ bne $v1, $v0, .L80243344 +/* BE6ADC 8024332C 0000102D */ daddu $v0, $zero, $zero +/* BE6AE0 80243330 0260202D */ daddu $a0, $s3, $zero +/* BE6AE4 80243334 0280282D */ daddu $a1, $s4, $zero +/* BE6AE8 80243338 0C090BF5 */ jal func_80242FD4_BE6784 +/* BE6AEC 8024333C 0200302D */ daddu $a2, $s0, $zero +.L80243340: +/* BE6AF0 80243340 0000102D */ daddu $v0, $zero, $zero +.L80243344: +/* BE6AF4 80243344 8FBF0048 */ lw $ra, 0x48($sp) +/* BE6AF8 80243348 8FB50044 */ lw $s5, 0x44($sp) +/* BE6AFC 8024334C 8FB40040 */ lw $s4, 0x40($sp) +/* BE6B00 80243350 8FB3003C */ lw $s3, 0x3c($sp) +/* BE6B04 80243354 8FB20038 */ lw $s2, 0x38($sp) +/* BE6B08 80243358 8FB10034 */ lw $s1, 0x34($sp) +/* BE6B0C 8024335C 8FB00030 */ lw $s0, 0x30($sp) +/* BE6B10 80243360 03E00008 */ jr $ra +/* BE6B14 80243364 27BD0050 */ addiu $sp, $sp, 0x50 +/* BE6B18 80243368 00000000 */ nop +/* BE6B1C 8024336C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s index 08582dd7a7..0848b56829 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_80240B94_BE8774.s @@ -131,7 +131,7 @@ glabel func_80240B94_BE8774 /* BE8954 80240D74 00000000 */ nop /* BE8958 80240D78 0280202D */ daddu $a0, $s4, $zero /* BE895C 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* BE8960 80240D80 0C090000 */ jal func_80240000 +/* BE8960 80240D80 0C090000 */ jal func_80240000_BE7BE0 /* BE8964 80240D84 02A0302D */ daddu $a2, $s5, $zero /* BE8968 80240D88 0280202D */ daddu $a0, $s4, $zero /* BE896C 80240D8C 0260282D */ daddu $a1, $s3, $zero @@ -141,27 +141,27 @@ glabel func_80240B94_BE8774 /* BE897C 80240D9C 00000000 */ nop /* BE8980 80240DA0 0280202D */ daddu $a0, $s4, $zero /* BE8984 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* BE8988 80240DA8 0C090100 */ jal func_80240400 +/* BE8988 80240DA8 0C090100 */ jal func_80240400_BE7FE0 /* BE898C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* BE8990 80240DB0 0280202D */ daddu $a0, $s4, $zero /* BE8994 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* BE8998 80240DB8 0C090130 */ jal func_802404C0 +/* BE8998 80240DB8 0C090130 */ jal func_802404C0_BE80A0 /* BE899C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* BE89A0 80240DC0 0809039A */ j .L80240E68 /* BE89A4 80240DC4 00000000 */ nop /* BE89A8 80240DC8 0280202D */ daddu $a0, $s4, $zero /* BE89AC 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* BE89B0 80240DD0 0C09019F */ jal func_8024067C +/* BE89B0 80240DD0 0C09019F */ jal func_8024067C_BE825C /* BE89B4 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* BE89B8 80240DD8 0809039A */ j .L80240E68 /* BE89BC 80240DDC 00000000 */ nop /* BE89C0 80240DE0 0280202D */ daddu $a0, $s4, $zero /* BE89C4 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* BE89C8 80240DE8 0C0901CC */ jal func_80240730 +/* BE89C8 80240DE8 0C0901CC */ jal func_80240730_BE8310 /* BE89CC 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* BE89D0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* BE89D4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* BE89D8 80240DF8 0C0901E9 */ jal func_802407A4 +/* BE89D8 80240DF8 0C0901E9 */ jal func_802407A4_BE8384 /* BE89DC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* BE89E0 80240E00 0809039A */ j .L80240E68 /* BE89E4 80240E04 00000000 */ nop @@ -171,19 +171,19 @@ glabel func_80240B94_BE8774 /* BE89F4 80240E14 02A0302D */ daddu $a2, $s5, $zero /* BE89F8 80240E18 0280202D */ daddu $a0, $s4, $zero /* BE89FC 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* BE8A00 80240E20 0C090253 */ jal func_8024094C +/* BE8A00 80240E20 0C090253 */ jal func_8024094C_BE852C /* BE8A04 80240E24 02A0302D */ daddu $a2, $s5, $zero /* BE8A08 80240E28 0809039A */ j .L80240E68 /* BE8A0C 80240E2C 00000000 */ nop /* BE8A10 80240E30 0280202D */ daddu $a0, $s4, $zero /* BE8A14 80240E34 0260282D */ daddu $a1, $s3, $zero -/* BE8A18 80240E38 0C09029B */ jal func_80240A6C +/* BE8A18 80240E38 0C09029B */ jal func_80240A6C_BE864C /* BE8A1C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* BE8A20 80240E40 0809039A */ j .L80240E68 /* BE8A24 80240E44 00000000 */ nop /* BE8A28 80240E48 0280202D */ daddu $a0, $s4, $zero /* BE8A2C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* BE8A30 80240E50 0C0902B5 */ jal func_80240AD4 +/* BE8A30 80240E50 0C0902B5 */ jal func_80240AD4_BE86B4 /* BE8A34 80240E54 02A0302D */ daddu $a2, $s5, $zero /* BE8A38 80240E58 0809039A */ j .L80240E68 /* BE8A3C 80240E5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s index 285fa0ce29..3bea1ed3aa 100644 --- a/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s +++ b/asm/nonmatchings/world/area_arn/arn_05/BE7BE0/func_8024113C_BE8D1C.s @@ -61,27 +61,27 @@ glabel func_8024113C_BE8D1C /* BE8DF8 80241218 00000000 */ nop /* BE8DFC 8024121C 0280202D */ daddu $a0, $s4, $zero /* BE8E00 80241220 0200282D */ daddu $a1, $s0, $zero -/* BE8E04 80241224 0C090000 */ jal func_80240000 +/* BE8E04 80241224 0C090000 */ jal func_80240000_BE7BE0 /* BE8E08 80241228 0240302D */ daddu $a2, $s2, $zero /* BE8E0C 8024122C 0280202D */ daddu $a0, $s4, $zero /* BE8E10 80241230 0200282D */ daddu $a1, $s0, $zero -/* BE8E14 80241234 0C0903A4 */ jal func_80240E90 +/* BE8E14 80241234 0C0903A4 */ jal func_80240E90_BE8A70 /* BE8E18 80241238 0240302D */ daddu $a2, $s2, $zero /* BE8E1C 8024123C 0809049F */ j .L8024127C /* BE8E20 80241240 00000000 */ nop /* BE8E24 80241244 0280202D */ daddu $a0, $s4, $zero /* BE8E28 80241248 0200282D */ daddu $a1, $s0, $zero -/* BE8E2C 8024124C 0C090100 */ jal func_80240400 +/* BE8E2C 8024124C 0C090100 */ jal func_80240400_BE7FE0 /* BE8E30 80241250 0240302D */ daddu $a2, $s2, $zero /* BE8E34 80241254 0280202D */ daddu $a0, $s4, $zero /* BE8E38 80241258 0200282D */ daddu $a1, $s0, $zero -/* BE8E3C 8024125C 0C09041A */ jal func_80241068 +/* BE8E3C 8024125C 0C09041A */ jal func_80241068_BE8C48 /* BE8E40 80241260 0240302D */ daddu $a2, $s2, $zero /* BE8E44 80241264 0809049F */ j .L8024127C /* BE8E48 80241268 00000000 */ nop /* BE8E4C 8024126C 0280202D */ daddu $a0, $s4, $zero /* BE8E50 80241270 0200282D */ daddu $a1, $s0, $zero -/* BE8E54 80241274 0C09019F */ jal func_8024067C +/* BE8E54 80241274 0C09019F */ jal func_8024067C_BE825C /* BE8E58 80241278 0240302D */ daddu $a2, $s2, $zero .L8024127C: /* BE8E5C 8024127C C6A0003C */ lwc1 $f0, 0x3c($s5) diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C.s deleted file mode 100644 index cbb9d577cd..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024152C -/* BEE31C 8024152C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BEE320 80241530 AFB20018 */ sw $s2, 0x18($sp) -/* BEE324 80241534 0080902D */ daddu $s2, $a0, $zero -/* BEE328 80241538 AFBF001C */ sw $ra, 0x1c($sp) -/* BEE32C 8024153C AFB10014 */ sw $s1, 0x14($sp) -/* BEE330 80241540 AFB00010 */ sw $s0, 0x10($sp) -/* BEE334 80241544 8E510148 */ lw $s1, 0x148($s2) -/* BEE338 80241548 0C00EABB */ jal get_npc_unsafe -/* BEE33C 8024154C 86240008 */ lh $a0, 8($s1) -/* BEE340 80241550 0040802D */ daddu $s0, $v0, $zero -/* BEE344 80241554 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BEE348 80241558 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BEE34C 8024155C C60C0038 */ lwc1 $f12, 0x38($s0) -/* BEE350 80241560 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BEE354 80241564 A600008E */ sh $zero, 0x8e($s0) -/* BEE358 80241568 8C460028 */ lw $a2, 0x28($v0) -/* BEE35C 8024156C 0C00A720 */ jal atan2 -/* BEE360 80241570 8C470030 */ lw $a3, 0x30($v0) -/* BEE364 80241574 E600000C */ swc1 $f0, 0xc($s0) -/* BEE368 80241578 8E2200CC */ lw $v0, 0xcc($s1) -/* BEE36C 8024157C 8C420020 */ lw $v0, 0x20($v0) -/* BEE370 80241580 AE020028 */ sw $v0, 0x28($s0) -/* BEE374 80241584 2402000B */ addiu $v0, $zero, 0xb -/* BEE378 80241588 AE420070 */ sw $v0, 0x70($s2) -/* BEE37C 8024158C 8FBF001C */ lw $ra, 0x1c($sp) -/* BEE380 80241590 8FB20018 */ lw $s2, 0x18($sp) -/* BEE384 80241594 8FB10014 */ lw $s1, 0x14($sp) -/* BEE388 80241598 8FB00010 */ lw $s0, 0x10($sp) -/* BEE38C 8024159C 03E00008 */ jr $ra -/* BEE390 802415A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C_BEE31C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C_BEE31C.s new file mode 100644 index 0000000000..19e5dba3a4 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_8024152C_BEE31C.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024152C_BEE31C +/* BEE31C 8024152C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BEE320 80241530 AFB20018 */ sw $s2, 0x18($sp) +/* BEE324 80241534 0080902D */ daddu $s2, $a0, $zero +/* BEE328 80241538 AFBF001C */ sw $ra, 0x1c($sp) +/* BEE32C 8024153C AFB10014 */ sw $s1, 0x14($sp) +/* BEE330 80241540 AFB00010 */ sw $s0, 0x10($sp) +/* BEE334 80241544 8E510148 */ lw $s1, 0x148($s2) +/* BEE338 80241548 0C00EABB */ jal get_npc_unsafe +/* BEE33C 8024154C 86240008 */ lh $a0, 8($s1) +/* BEE340 80241550 0040802D */ daddu $s0, $v0, $zero +/* BEE344 80241554 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BEE348 80241558 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BEE34C 8024155C C60C0038 */ lwc1 $f12, 0x38($s0) +/* BEE350 80241560 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BEE354 80241564 A600008E */ sh $zero, 0x8e($s0) +/* BEE358 80241568 8C460028 */ lw $a2, 0x28($v0) +/* BEE35C 8024156C 0C00A720 */ jal atan2 +/* BEE360 80241570 8C470030 */ lw $a3, 0x30($v0) +/* BEE364 80241574 E600000C */ swc1 $f0, 0xc($s0) +/* BEE368 80241578 8E2200CC */ lw $v0, 0xcc($s1) +/* BEE36C 8024157C 8C420020 */ lw $v0, 0x20($v0) +/* BEE370 80241580 AE020028 */ sw $v0, 0x28($s0) +/* BEE374 80241584 2402000B */ addiu $v0, $zero, 0xb +/* BEE378 80241588 AE420070 */ sw $v0, 0x70($s2) +/* BEE37C 8024158C 8FBF001C */ lw $ra, 0x1c($sp) +/* BEE380 80241590 8FB20018 */ lw $s2, 0x18($sp) +/* BEE384 80241594 8FB10014 */ lw $s1, 0x14($sp) +/* BEE388 80241598 8FB00010 */ lw $s0, 0x10($sp) +/* BEE38C 8024159C 03E00008 */ jr $ra +/* BEE390 802415A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38.s deleted file mode 100644 index 6d92ab70ec..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B38 -/* BEE928 80241B38 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BEE92C 80241B3C AFB00028 */ sw $s0, 0x28($sp) -/* BEE930 80241B40 00A0802D */ daddu $s0, $a1, $zero -/* BEE934 80241B44 AFB1002C */ sw $s1, 0x2c($sp) -/* BEE938 80241B48 00C0882D */ daddu $s1, $a2, $zero -/* BEE93C 80241B4C AFBF0034 */ sw $ra, 0x34($sp) -/* BEE940 80241B50 AFB20030 */ sw $s2, 0x30($sp) -/* BEE944 80241B54 AE200070 */ sw $zero, 0x70($s1) -/* BEE948 80241B58 8C830000 */ lw $v1, ($a0) -/* BEE94C 80241B5C 2402FDFF */ addiu $v0, $zero, -0x201 -/* BEE950 80241B60 A480008E */ sh $zero, 0x8e($a0) -/* BEE954 80241B64 00621824 */ and $v1, $v1, $v0 -/* BEE958 80241B68 34650800 */ ori $a1, $v1, 0x800 -/* BEE95C 80241B6C AC850000 */ sw $a1, ($a0) -/* BEE960 80241B70 8E0200D0 */ lw $v0, 0xd0($s0) -/* BEE964 80241B74 8C420034 */ lw $v0, 0x34($v0) -/* BEE968 80241B78 10400003 */ beqz $v0, .L80241B88 -/* BEE96C 80241B7C 00E0902D */ daddu $s2, $a3, $zero -/* BEE970 80241B80 080906E4 */ j .L80241B90 -/* BEE974 80241B84 34620808 */ ori $v0, $v1, 0x808 -.L80241B88: -/* BEE978 80241B88 2402FFF7 */ addiu $v0, $zero, -9 -/* BEE97C 80241B8C 00A21024 */ and $v0, $a1, $v0 -.L80241B90: -/* BEE980 80241B90 AC820000 */ sw $v0, ($a0) -/* BEE984 80241B94 27A20024 */ addiu $v0, $sp, 0x24 -/* BEE988 80241B98 27A50018 */ addiu $a1, $sp, 0x18 -/* BEE98C 80241B9C C4800038 */ lwc1 $f0, 0x38($a0) -/* BEE990 80241BA0 C482003C */ lwc1 $f2, 0x3c($a0) -/* BEE994 80241BA4 C4840040 */ lwc1 $f4, 0x40($a0) -/* BEE998 80241BA8 3C01447A */ lui $at, 0x447a -/* BEE99C 80241BAC 44813000 */ mtc1 $at, $f6 -/* BEE9A0 80241BB0 27A6001C */ addiu $a2, $sp, 0x1c -/* BEE9A4 80241BB4 E7A00018 */ swc1 $f0, 0x18($sp) -/* BEE9A8 80241BB8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BEE9AC 80241BBC E7A40020 */ swc1 $f4, 0x20($sp) -/* BEE9B0 80241BC0 E7A60024 */ swc1 $f6, 0x24($sp) -/* BEE9B4 80241BC4 AFA20010 */ sw $v0, 0x10($sp) -/* BEE9B8 80241BC8 8C840080 */ lw $a0, 0x80($a0) -/* BEE9BC 80241BCC 0C0372DF */ jal func_800DCB7C -/* BEE9C0 80241BD0 27A70020 */ addiu $a3, $sp, 0x20 -/* BEE9C4 80241BD4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* BEE9C8 80241BD8 3C014059 */ lui $at, 0x4059 -/* BEE9CC 80241BDC 44812800 */ mtc1 $at, $f5 -/* BEE9D0 80241BE0 44802000 */ mtc1 $zero, $f4 -/* BEE9D4 80241BE4 460010A1 */ cvt.d.s $f2, $f2 -/* BEE9D8 80241BE8 46241082 */ mul.d $f2, $f2, $f4 -/* BEE9DC 80241BEC 00000000 */ nop -/* BEE9E0 80241BF0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BEE9E4 80241BF4 46000021 */ cvt.d.s $f0, $f0 -/* BEE9E8 80241BF8 46240002 */ mul.d $f0, $f0, $f4 -/* BEE9EC 80241BFC 00000000 */ nop -/* BEE9F0 80241C00 3C013FE0 */ lui $at, 0x3fe0 -/* BEE9F4 80241C04 44812800 */ mtc1 $at, $f5 -/* BEE9F8 80241C08 44802000 */ mtc1 $zero, $f4 -/* BEE9FC 80241C0C 00000000 */ nop -/* BEEA00 80241C10 46241080 */ add.d $f2, $f2, $f4 -/* BEEA04 80241C14 AE000074 */ sw $zero, 0x74($s0) -/* BEEA08 80241C18 46240000 */ add.d $f0, $f0, $f4 -/* BEEA0C 80241C1C AE000090 */ sw $zero, 0x90($s0) -/* BEEA10 80241C20 4620120D */ trunc.w.d $f8, $f2 -/* BEEA14 80241C24 E6080078 */ swc1 $f8, 0x78($s0) -/* BEEA18 80241C28 4620020D */ trunc.w.d $f8, $f0 -/* BEEA1C 80241C2C E6080088 */ swc1 $f8, 0x88($s0) -/* BEEA20 80241C30 8E420014 */ lw $v0, 0x14($s2) -/* BEEA24 80241C34 AE220074 */ sw $v0, 0x74($s1) -/* BEEA28 80241C38 8E0200B0 */ lw $v0, 0xb0($s0) -/* BEEA2C 80241C3C 34420010 */ ori $v0, $v0, 0x10 -/* BEEA30 80241C40 AE0200B0 */ sw $v0, 0xb0($s0) -/* BEEA34 80241C44 8FBF0034 */ lw $ra, 0x34($sp) -/* BEEA38 80241C48 8FB20030 */ lw $s2, 0x30($sp) -/* BEEA3C 80241C4C 8FB1002C */ lw $s1, 0x2c($sp) -/* BEEA40 80241C50 8FB00028 */ lw $s0, 0x28($sp) -/* BEEA44 80241C54 03E00008 */ jr $ra -/* BEEA48 80241C58 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38_BEE928.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38_BEE928.s new file mode 100644 index 0000000000..87dcb47f21 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241B38_BEE928.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B38_BEE928 +/* BEE928 80241B38 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* BEE92C 80241B3C AFB00028 */ sw $s0, 0x28($sp) +/* BEE930 80241B40 00A0802D */ daddu $s0, $a1, $zero +/* BEE934 80241B44 AFB1002C */ sw $s1, 0x2c($sp) +/* BEE938 80241B48 00C0882D */ daddu $s1, $a2, $zero +/* BEE93C 80241B4C AFBF0034 */ sw $ra, 0x34($sp) +/* BEE940 80241B50 AFB20030 */ sw $s2, 0x30($sp) +/* BEE944 80241B54 AE200070 */ sw $zero, 0x70($s1) +/* BEE948 80241B58 8C830000 */ lw $v1, ($a0) +/* BEE94C 80241B5C 2402FDFF */ addiu $v0, $zero, -0x201 +/* BEE950 80241B60 A480008E */ sh $zero, 0x8e($a0) +/* BEE954 80241B64 00621824 */ and $v1, $v1, $v0 +/* BEE958 80241B68 34650800 */ ori $a1, $v1, 0x800 +/* BEE95C 80241B6C AC850000 */ sw $a1, ($a0) +/* BEE960 80241B70 8E0200D0 */ lw $v0, 0xd0($s0) +/* BEE964 80241B74 8C420034 */ lw $v0, 0x34($v0) +/* BEE968 80241B78 10400003 */ beqz $v0, .L80241B88 +/* BEE96C 80241B7C 00E0902D */ daddu $s2, $a3, $zero +/* BEE970 80241B80 080906E4 */ j .L80241B90 +/* BEE974 80241B84 34620808 */ ori $v0, $v1, 0x808 +.L80241B88: +/* BEE978 80241B88 2402FFF7 */ addiu $v0, $zero, -9 +/* BEE97C 80241B8C 00A21024 */ and $v0, $a1, $v0 +.L80241B90: +/* BEE980 80241B90 AC820000 */ sw $v0, ($a0) +/* BEE984 80241B94 27A20024 */ addiu $v0, $sp, 0x24 +/* BEE988 80241B98 27A50018 */ addiu $a1, $sp, 0x18 +/* BEE98C 80241B9C C4800038 */ lwc1 $f0, 0x38($a0) +/* BEE990 80241BA0 C482003C */ lwc1 $f2, 0x3c($a0) +/* BEE994 80241BA4 C4840040 */ lwc1 $f4, 0x40($a0) +/* BEE998 80241BA8 3C01447A */ lui $at, 0x447a +/* BEE99C 80241BAC 44813000 */ mtc1 $at, $f6 +/* BEE9A0 80241BB0 27A6001C */ addiu $a2, $sp, 0x1c +/* BEE9A4 80241BB4 E7A00018 */ swc1 $f0, 0x18($sp) +/* BEE9A8 80241BB8 E7A2001C */ swc1 $f2, 0x1c($sp) +/* BEE9AC 80241BBC E7A40020 */ swc1 $f4, 0x20($sp) +/* BEE9B0 80241BC0 E7A60024 */ swc1 $f6, 0x24($sp) +/* BEE9B4 80241BC4 AFA20010 */ sw $v0, 0x10($sp) +/* BEE9B8 80241BC8 8C840080 */ lw $a0, 0x80($a0) +/* BEE9BC 80241BCC 0C0372DF */ jal func_800DCB7C +/* BEE9C0 80241BD0 27A70020 */ addiu $a3, $sp, 0x20 +/* BEE9C4 80241BD4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* BEE9C8 80241BD8 3C014059 */ lui $at, 0x4059 +/* BEE9CC 80241BDC 44812800 */ mtc1 $at, $f5 +/* BEE9D0 80241BE0 44802000 */ mtc1 $zero, $f4 +/* BEE9D4 80241BE4 460010A1 */ cvt.d.s $f2, $f2 +/* BEE9D8 80241BE8 46241082 */ mul.d $f2, $f2, $f4 +/* BEE9DC 80241BEC 00000000 */ nop +/* BEE9E0 80241BF0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* BEE9E4 80241BF4 46000021 */ cvt.d.s $f0, $f0 +/* BEE9E8 80241BF8 46240002 */ mul.d $f0, $f0, $f4 +/* BEE9EC 80241BFC 00000000 */ nop +/* BEE9F0 80241C00 3C013FE0 */ lui $at, 0x3fe0 +/* BEE9F4 80241C04 44812800 */ mtc1 $at, $f5 +/* BEE9F8 80241C08 44802000 */ mtc1 $zero, $f4 +/* BEE9FC 80241C0C 00000000 */ nop +/* BEEA00 80241C10 46241080 */ add.d $f2, $f2, $f4 +/* BEEA04 80241C14 AE000074 */ sw $zero, 0x74($s0) +/* BEEA08 80241C18 46240000 */ add.d $f0, $f0, $f4 +/* BEEA0C 80241C1C AE000090 */ sw $zero, 0x90($s0) +/* BEEA10 80241C20 4620120D */ trunc.w.d $f8, $f2 +/* BEEA14 80241C24 E6080078 */ swc1 $f8, 0x78($s0) +/* BEEA18 80241C28 4620020D */ trunc.w.d $f8, $f0 +/* BEEA1C 80241C2C E6080088 */ swc1 $f8, 0x88($s0) +/* BEEA20 80241C30 8E420014 */ lw $v0, 0x14($s2) +/* BEEA24 80241C34 AE220074 */ sw $v0, 0x74($s1) +/* BEEA28 80241C38 8E0200B0 */ lw $v0, 0xb0($s0) +/* BEEA2C 80241C3C 34420010 */ ori $v0, $v0, 0x10 +/* BEEA30 80241C40 AE0200B0 */ sw $v0, 0xb0($s0) +/* BEEA34 80241C44 8FBF0034 */ lw $ra, 0x34($sp) +/* BEEA38 80241C48 8FB20030 */ lw $s2, 0x30($sp) +/* BEEA3C 80241C4C 8FB1002C */ lw $s1, 0x2c($sp) +/* BEEA40 80241C50 8FB00028 */ lw $s0, 0x28($sp) +/* BEEA44 80241C54 03E00008 */ jr $ra +/* BEEA48 80241C58 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s index c8a43374bf..18dfa59d3f 100644 --- a/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s +++ b/asm/nonmatchings/world/area_arn/arn_07/BED740/func_80241C5C_BEEA4C.s @@ -46,7 +46,7 @@ glabel func_80241C5C_BEEA4C /* BEEAF0 80241D00 02A0202D */ daddu $a0, $s5, $zero /* BEEAF4 80241D04 0240282D */ daddu $a1, $s2, $zero /* BEEAF8 80241D08 0280302D */ daddu $a2, $s4, $zero -/* BEEAFC 80241D0C 0C0906CE */ jal func_80241B38 +/* BEEAFC 80241D0C 0C0906CE */ jal func_80241B38_BEE928 /* BEEB00 80241D10 0200382D */ daddu $a3, $s0, $zero .L80241D14: /* BEEB04 80241D14 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_80241C5C_BEEA4C /* BEEB54 80241D64 00000000 */ nop /* BEEB58 80241D68 0280202D */ daddu $a0, $s4, $zero /* BEEB5C 80241D6C 0200282D */ daddu $a1, $s0, $zero -/* BEEB60 80241D70 0C090254 */ jal func_80240950 +/* BEEB60 80241D70 0C090254 */ jal func_80240950_BED740 /* BEEB64 80241D74 0260302D */ daddu $a2, $s3, $zero /* BEEB68 80241D78 0280202D */ daddu $a0, $s4, $zero /* BEEB6C 80241D7C 0200282D */ daddu $a1, $s0, $zero -/* BEEB70 80241D80 0C0902C0 */ jal func_80240B00 +/* BEEB70 80241D80 0C0902C0 */ jal func_80240B00_BED8F0 /* BEEB74 80241D84 0260302D */ daddu $a2, $s3, $zero /* BEEB78 80241D88 08090789 */ j .L80241E24 /* BEEB7C 80241D8C 0000102D */ daddu $v0, $zero, $zero /* BEEB80 80241D90 0280202D */ daddu $a0, $s4, $zero /* BEEB84 80241D94 0200282D */ daddu $a1, $s0, $zero -/* BEEB88 80241D98 0C09044A */ jal func_80241128 +/* BEEB88 80241D98 0C09044A */ jal func_80241128_BEDF18 /* BEEB8C 80241D9C 0260302D */ daddu $a2, $s3, $zero /* BEEB90 80241DA0 0280202D */ daddu $a0, $s4, $zero /* BEEB94 80241DA4 0200282D */ daddu $a1, $s0, $zero -/* BEEB98 80241DA8 0C09047A */ jal func_802411E8 +/* BEEB98 80241DA8 0C09047A */ jal func_802411E8_BEDFD8 /* BEEB9C 80241DAC 0260302D */ daddu $a2, $s3, $zero /* BEEBA0 80241DB0 08090789 */ j .L80241E24 /* BEEBA4 80241DB4 0000102D */ daddu $v0, $zero, $zero /* BEEBA8 80241DB8 0280202D */ daddu $a0, $s4, $zero /* BEEBAC 80241DBC 0200282D */ daddu $a1, $s0, $zero -/* BEEBB0 80241DC0 0C09054B */ jal func_8024152C +/* BEEBB0 80241DC0 0C09054B */ jal func_8024152C_BEE31C /* BEEBB4 80241DC4 0260302D */ daddu $a2, $s3, $zero /* BEEBB8 80241DC8 0280202D */ daddu $a0, $s4, $zero /* BEEBBC 80241DCC 0200282D */ daddu $a1, $s0, $zero -/* BEEBC0 80241DD0 0C090569 */ jal func_802415A4 +/* BEEBC0 80241DD0 0C090569 */ jal func_802415A4_BEE394 /* BEEBC4 80241DD4 0260302D */ daddu $a2, $s3, $zero /* BEEBC8 80241DD8 08090789 */ j .L80241E24 /* BEEBCC 80241DDC 0000102D */ daddu $v0, $zero, $zero /* BEEBD0 80241DE0 0280202D */ daddu $a0, $s4, $zero /* BEEBD4 80241DE4 0200282D */ daddu $a1, $s0, $zero -/* BEEBD8 80241DE8 0C090584 */ jal func_80241610 +/* BEEBD8 80241DE8 0C090584 */ jal func_80241610_BEE400 /* BEEBDC 80241DEC 0260302D */ daddu $a2, $s3, $zero /* BEEBE0 80241DF0 08090789 */ j .L80241E24 /* BEEBE4 80241DF4 0000102D */ daddu $v0, $zero, $zero /* BEEBE8 80241DF8 0280202D */ daddu $a0, $s4, $zero /* BEEBEC 80241DFC 0200282D */ daddu $a1, $s0, $zero -/* BEEBF0 80241E00 0C0905D1 */ jal func_80241744 +/* BEEBF0 80241E00 0C0905D1 */ jal func_80241744_BEE534 /* BEEBF4 80241E04 0260302D */ daddu $a2, $s3, $zero /* BEEBF8 80241E08 08090789 */ j .L80241E24 /* BEEBFC 80241E0C 0000102D */ daddu $v0, $zero, $zero /* BEEC00 80241E10 0280202D */ daddu $a0, $s4, $zero /* BEEC04 80241E14 0200282D */ daddu $a1, $s0, $zero -/* BEEC08 80241E18 0C0905EA */ jal func_802417A8 +/* BEEC08 80241E18 0C0905EA */ jal func_802417A8_BEE598 /* BEEC0C 80241E1C 0260302D */ daddu $a2, $s3, $zero .L80241E20: /* BEEC10 80241E20 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C.s b/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C.s deleted file mode 100644 index 6e54ced747..0000000000 --- a/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024008C -/* BF482C 8024008C 3C018011 */ lui $at, 0x8011 -/* BF4830 80240090 C422EFF4 */ lwc1 $f2, -0x100c($at) -/* BF4834 80240094 3C01C120 */ lui $at, 0xc120 -/* BF4838 80240098 44810000 */ mtc1 $at, $f0 -/* BF483C 8024009C 00000000 */ nop -/* BF4840 802400A0 4600103C */ c.lt.s $f2, $f0 -/* BF4844 802400A4 00000000 */ nop -/* BF4848 802400A8 45010002 */ bc1t .L802400B4 -/* BF484C 802400AC 24020002 */ addiu $v0, $zero, 2 -/* BF4850 802400B0 0000102D */ daddu $v0, $zero, $zero -.L802400B4: -/* BF4854 802400B4 03E00008 */ jr $ra -/* BF4858 802400B8 00000000 */ nop -/* BF485C 802400BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C_BF482C.s b/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C_BF482C.s new file mode 100644 index 0000000000..ae269ecfe6 --- /dev/null +++ b/asm/nonmatchings/world/area_arn/arn_08/BF47A0/func_8024008C_BF482C.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024008C_BF482C +/* BF482C 8024008C 3C018011 */ lui $at, 0x8011 +/* BF4830 80240090 C422EFF4 */ lwc1 $f2, -0x100c($at) +/* BF4834 80240094 3C01C120 */ lui $at, 0xc120 +/* BF4838 80240098 44810000 */ mtc1 $at, $f0 +/* BF483C 8024009C 00000000 */ nop +/* BF4840 802400A0 4600103C */ c.lt.s $f2, $f0 +/* BF4844 802400A4 00000000 */ nop +/* BF4848 802400A8 45010002 */ bc1t .L802400B4 +/* BF484C 802400AC 24020002 */ addiu $v0, $zero, 2 +/* BF4850 802400B0 0000102D */ daddu $v0, $zero, $zero +.L802400B4: +/* BF4854 802400B4 03E00008 */ jr $ra +/* BF4858 802400B8 00000000 */ nop +/* BF485C 802400BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8.s deleted file mode 100644 index d9973e23ae..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409B8 -/* BFE238 802409B8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* BFE23C 802409BC AFB3004C */ sw $s3, 0x4c($sp) -/* BFE240 802409C0 0080982D */ daddu $s3, $a0, $zero -/* BFE244 802409C4 AFBF0054 */ sw $ra, 0x54($sp) -/* BFE248 802409C8 AFB40050 */ sw $s4, 0x50($sp) -/* BFE24C 802409CC AFB20048 */ sw $s2, 0x48($sp) -/* BFE250 802409D0 AFB10044 */ sw $s1, 0x44($sp) -/* BFE254 802409D4 AFB00040 */ sw $s0, 0x40($sp) -/* BFE258 802409D8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* BFE25C 802409DC F7B80068 */ sdc1 $f24, 0x68($sp) -/* BFE260 802409E0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* BFE264 802409E4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* BFE268 802409E8 8E710148 */ lw $s1, 0x148($s3) -/* BFE26C 802409EC 00A0902D */ daddu $s2, $a1, $zero -/* BFE270 802409F0 86240008 */ lh $a0, 8($s1) -/* BFE274 802409F4 0C00EABB */ jal get_npc_unsafe -/* BFE278 802409F8 00C0A02D */ daddu $s4, $a2, $zero -/* BFE27C 802409FC 0040802D */ daddu $s0, $v0, $zero -/* BFE280 80240A00 C6200078 */ lwc1 $f0, 0x78($s1) -/* BFE284 80240A04 46800020 */ cvt.s.w $f0, $f0 -/* BFE288 80240A08 46000021 */ cvt.d.s $f0, $f0 -/* BFE28C 80240A0C 3C014059 */ lui $at, 0x4059 -/* BFE290 80240A10 44811800 */ mtc1 $at, $f3 -/* BFE294 80240A14 44801000 */ mtc1 $zero, $f2 -/* BFE298 80240A18 8602008E */ lh $v0, 0x8e($s0) -/* BFE29C 80240A1C 9603008E */ lhu $v1, 0x8e($s0) -/* BFE2A0 80240A20 46220003 */ div.d $f0, $f0, $f2 -/* BFE2A4 80240A24 46200620 */ cvt.s.d $f24, $f0 -/* BFE2A8 80240A28 C6200088 */ lwc1 $f0, 0x88($s1) -/* BFE2AC 80240A2C 46800020 */ cvt.s.w $f0, $f0 -/* BFE2B0 80240A30 46000021 */ cvt.d.s $f0, $f0 -/* BFE2B4 80240A34 46220003 */ div.d $f0, $f0, $f2 -/* BFE2B8 80240A38 46200020 */ cvt.s.d $f0, $f0 -/* BFE2BC 80240A3C 18400003 */ blez $v0, .L80240A4C -/* BFE2C0 80240A40 4600C680 */ add.s $f26, $f24, $f0 -/* BFE2C4 80240A44 2462FFFF */ addiu $v0, $v1, -1 -/* BFE2C8 80240A48 A602008E */ sh $v0, 0x8e($s0) -.L80240A4C: -/* BFE2CC 80240A4C 8E220070 */ lw $v0, 0x70($s1) -/* BFE2D0 80240A50 18400034 */ blez $v0, .L80240B24 -/* BFE2D4 80240A54 00000000 */ nop -/* BFE2D8 80240A58 C62C0074 */ lwc1 $f12, 0x74($s1) -/* BFE2DC 80240A5C 46806320 */ cvt.s.w $f12, $f12 -/* BFE2E0 80240A60 44820000 */ mtc1 $v0, $f0 -/* BFE2E4 80240A64 00000000 */ nop -/* BFE2E8 80240A68 46800020 */ cvt.s.w $f0, $f0 -/* BFE2EC 80240A6C 46000021 */ cvt.d.s $f0, $f0 -/* BFE2F0 80240A70 46220003 */ div.d $f0, $f0, $f2 -/* BFE2F4 80240A74 0C00A8BB */ jal sin_deg -/* BFE2F8 80240A78 462005A0 */ cvt.s.d $f22, $f0 -/* BFE2FC 80240A7C 8E020000 */ lw $v0, ($s0) -/* BFE300 80240A80 30420008 */ andi $v0, $v0, 8 -/* BFE304 80240A84 10400003 */ beqz $v0, .L80240A94 -/* BFE308 80240A88 46000506 */ mov.s $f20, $f0 -/* BFE30C 80240A8C 080902B5 */ j .L80240AD4 -/* BFE310 80240A90 0000102D */ daddu $v0, $zero, $zero -.L80240A94: -/* BFE314 80240A94 27A50028 */ addiu $a1, $sp, 0x28 -/* BFE318 80240A98 27A6002C */ addiu $a2, $sp, 0x2c -/* BFE31C 80240A9C C6000038 */ lwc1 $f0, 0x38($s0) -/* BFE320 80240AA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFE324 80240AA4 C6040040 */ lwc1 $f4, 0x40($s0) -/* BFE328 80240AA8 3C01447A */ lui $at, 0x447a -/* BFE32C 80240AAC 44813000 */ mtc1 $at, $f6 -/* BFE330 80240AB0 27A20034 */ addiu $v0, $sp, 0x34 -/* BFE334 80240AB4 E7A00028 */ swc1 $f0, 0x28($sp) -/* BFE338 80240AB8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* BFE33C 80240ABC E7A40030 */ swc1 $f4, 0x30($sp) -/* BFE340 80240AC0 E7A60034 */ swc1 $f6, 0x34($sp) -/* BFE344 80240AC4 AFA20010 */ sw $v0, 0x10($sp) -/* BFE348 80240AC8 8E040080 */ lw $a0, 0x80($s0) -/* BFE34C 80240ACC 0C0372DF */ jal func_800DCB7C -/* BFE350 80240AD0 27A70030 */ addiu $a3, $sp, 0x30 -.L80240AD4: -/* BFE354 80240AD4 10400007 */ beqz $v0, .L80240AF4 -/* BFE358 80240AD8 00000000 */ nop -/* BFE35C 80240ADC 4616A082 */ mul.s $f2, $f20, $f22 -/* BFE360 80240AE0 00000000 */ nop -/* BFE364 80240AE4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* BFE368 80240AE8 46180000 */ add.s $f0, $f0, $f24 -/* BFE36C 80240AEC 080902C0 */ j .L80240B00 -/* BFE370 80240AF0 46020000 */ add.s $f0, $f0, $f2 -.L80240AF4: -/* BFE374 80240AF4 4616A002 */ mul.s $f0, $f20, $f22 -/* BFE378 80240AF8 00000000 */ nop -/* BFE37C 80240AFC 4600D000 */ add.s $f0, $f26, $f0 -.L80240B00: -/* BFE380 80240B00 E600003C */ swc1 $f0, 0x3c($s0) -/* BFE384 80240B04 8E220074 */ lw $v0, 0x74($s1) -/* BFE388 80240B08 2442000A */ addiu $v0, $v0, 0xa -/* BFE38C 80240B0C 44826000 */ mtc1 $v0, $f12 -/* BFE390 80240B10 00000000 */ nop -/* BFE394 80240B14 0C00A6C9 */ jal clamp_angle -/* BFE398 80240B18 46806320 */ cvt.s.w $f12, $f12 -/* BFE39C 80240B1C 4600020D */ trunc.w.s $f8, $f0 -/* BFE3A0 80240B20 E6280074 */ swc1 $f8, 0x74($s1) -.L80240B24: -/* BFE3A4 80240B24 8E220090 */ lw $v0, 0x90($s1) -/* BFE3A8 80240B28 1C400040 */ bgtz $v0, .L80240C2C -/* BFE3AC 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* BFE3B0 80240B30 860200A8 */ lh $v0, 0xa8($s0) -/* BFE3B4 80240B34 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFE3B8 80240B38 44821000 */ mtc1 $v0, $f2 -/* BFE3BC 80240B3C 00000000 */ nop -/* BFE3C0 80240B40 468010A0 */ cvt.s.w $f2, $f2 -/* BFE3C4 80240B44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFE3C8 80240B48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFE3CC 80240B4C 46020000 */ add.s $f0, $f0, $f2 -/* BFE3D0 80240B50 3C014024 */ lui $at, 0x4024 -/* BFE3D4 80240B54 44812800 */ mtc1 $at, $f5 -/* BFE3D8 80240B58 44802000 */ mtc1 $zero, $f4 -/* BFE3DC 80240B5C C442002C */ lwc1 $f2, 0x2c($v0) -/* BFE3E0 80240B60 46000021 */ cvt.d.s $f0, $f0 -/* BFE3E4 80240B64 46240000 */ add.d $f0, $f0, $f4 -/* BFE3E8 80240B68 460010A1 */ cvt.d.s $f2, $f2 -/* BFE3EC 80240B6C 4620103C */ c.lt.d $f2, $f0 -/* BFE3F0 80240B70 00000000 */ nop -/* BFE3F4 80240B74 4500002E */ bc1f .L80240C30 -/* BFE3F8 80240B78 0280202D */ daddu $a0, $s4, $zero -/* BFE3FC 80240B7C 24020001 */ addiu $v0, $zero, 1 -/* BFE400 80240B80 AFA20010 */ sw $v0, 0x10($sp) -/* BFE404 80240B84 8E460024 */ lw $a2, 0x24($s2) -/* BFE408 80240B88 8E470028 */ lw $a3, 0x28($s2) -/* BFE40C 80240B8C 0C01242D */ jal func_800490B4 -/* BFE410 80240B90 0220282D */ daddu $a1, $s1, $zero -/* BFE414 80240B94 10400026 */ beqz $v0, .L80240C30 -/* BFE418 80240B98 0000202D */ daddu $a0, $zero, $zero -/* BFE41C 80240B9C 0200282D */ daddu $a1, $s0, $zero -/* BFE420 80240BA0 0000302D */ daddu $a2, $zero, $zero -/* BFE424 80240BA4 2412000C */ addiu $s2, $zero, 0xc -/* BFE428 80240BA8 860300A8 */ lh $v1, 0xa8($s0) -/* BFE42C 80240BAC 3C013F80 */ lui $at, 0x3f80 -/* BFE430 80240BB0 44810000 */ mtc1 $at, $f0 -/* BFE434 80240BB4 3C014000 */ lui $at, 0x4000 -/* BFE438 80240BB8 44811000 */ mtc1 $at, $f2 -/* BFE43C 80240BBC 3C01C1A0 */ lui $at, 0xc1a0 -/* BFE440 80240BC0 44812000 */ mtc1 $at, $f4 -/* BFE444 80240BC4 44834000 */ mtc1 $v1, $f8 -/* BFE448 80240BC8 00000000 */ nop -/* BFE44C 80240BCC 46804220 */ cvt.s.w $f8, $f8 -/* BFE450 80240BD0 44074000 */ mfc1 $a3, $f8 -/* BFE454 80240BD4 27A20038 */ addiu $v0, $sp, 0x38 -/* BFE458 80240BD8 AFB2001C */ sw $s2, 0x1c($sp) -/* BFE45C 80240BDC AFA20020 */ sw $v0, 0x20($sp) -/* BFE460 80240BE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFE464 80240BE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BFE468 80240BE8 0C01BFA4 */ jal fx_emote -/* BFE46C 80240BEC E7A40018 */ swc1 $f4, 0x18($sp) -/* BFE470 80240BF0 0200202D */ daddu $a0, $s0, $zero -/* BFE474 80240BF4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BFE478 80240BF8 C480003C */ lwc1 $f0, 0x3c($a0) -/* BFE47C 80240BFC 3C060020 */ lui $a2, 0x20 -/* BFE480 80240C00 0C012530 */ jal func_800494C0 -/* BFE484 80240C04 E4800064 */ swc1 $f0, 0x64($a0) -/* BFE488 80240C08 8E220018 */ lw $v0, 0x18($s1) -/* BFE48C 80240C0C 9442002A */ lhu $v0, 0x2a($v0) -/* BFE490 80240C10 30420001 */ andi $v0, $v0, 1 -/* BFE494 80240C14 10400003 */ beqz $v0, .L80240C24 -/* BFE498 80240C18 2402000A */ addiu $v0, $zero, 0xa -/* BFE49C 80240C1C 08090333 */ j .L80240CCC -/* BFE4A0 80240C20 AE620070 */ sw $v0, 0x70($s3) -.L80240C24: -/* BFE4A4 80240C24 08090333 */ j .L80240CCC -/* BFE4A8 80240C28 AE720070 */ sw $s2, 0x70($s3) -.L80240C2C: -/* BFE4AC 80240C2C AE220090 */ sw $v0, 0x90($s1) -.L80240C30: -/* BFE4B0 80240C30 8602008C */ lh $v0, 0x8c($s0) -/* BFE4B4 80240C34 14400025 */ bnez $v0, .L80240CCC -/* BFE4B8 80240C38 00000000 */ nop -/* BFE4BC 80240C3C 8602008E */ lh $v0, 0x8e($s0) -/* BFE4C0 80240C40 1C400022 */ bgtz $v0, .L80240CCC -/* BFE4C4 80240C44 00000000 */ nop -/* BFE4C8 80240C48 8E620074 */ lw $v0, 0x74($s3) -/* BFE4CC 80240C4C 2442FFFF */ addiu $v0, $v0, -1 -/* BFE4D0 80240C50 1840001D */ blez $v0, .L80240CC8 -/* BFE4D4 80240C54 AE620074 */ sw $v0, 0x74($s3) -/* BFE4D8 80240C58 8E220018 */ lw $v0, 0x18($s1) -/* BFE4DC 80240C5C 9442002A */ lhu $v0, 0x2a($v0) -/* BFE4E0 80240C60 30420010 */ andi $v0, $v0, 0x10 -/* BFE4E4 80240C64 14400007 */ bnez $v0, .L80240C84 -/* BFE4E8 80240C68 00000000 */ nop -/* BFE4EC 80240C6C C600000C */ lwc1 $f0, 0xc($s0) -/* BFE4F0 80240C70 3C014334 */ lui $at, 0x4334 -/* BFE4F4 80240C74 44816000 */ mtc1 $at, $f12 -/* BFE4F8 80240C78 0C00A6C9 */ jal clamp_angle -/* BFE4FC 80240C7C 460C0300 */ add.s $f12, $f0, $f12 -/* BFE500 80240C80 E600000C */ swc1 $f0, 0xc($s0) -.L80240C84: -/* BFE504 80240C84 0C00A67F */ jal rand_int -/* BFE508 80240C88 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BFE50C 80240C8C 3C032E8B */ lui $v1, 0x2e8b -/* BFE510 80240C90 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BFE514 80240C94 00430018 */ mult $v0, $v1 -/* BFE518 80240C98 00021FC3 */ sra $v1, $v0, 0x1f -/* BFE51C 80240C9C 00004010 */ mfhi $t0 -/* BFE520 80240CA0 00082043 */ sra $a0, $t0, 1 -/* BFE524 80240CA4 00832023 */ subu $a0, $a0, $v1 -/* BFE528 80240CA8 00041840 */ sll $v1, $a0, 1 -/* BFE52C 80240CAC 00641821 */ addu $v1, $v1, $a0 -/* BFE530 80240CB0 00031880 */ sll $v1, $v1, 2 -/* BFE534 80240CB4 00641823 */ subu $v1, $v1, $a0 -/* BFE538 80240CB8 00431023 */ subu $v0, $v0, $v1 -/* BFE53C 80240CBC 24420005 */ addiu $v0, $v0, 5 -/* BFE540 80240CC0 08090333 */ j .L80240CCC -/* BFE544 80240CC4 A602008E */ sh $v0, 0x8e($s0) -.L80240CC8: -/* BFE548 80240CC8 AE600070 */ sw $zero, 0x70($s3) -.L80240CCC: -/* BFE54C 80240CCC 8FBF0054 */ lw $ra, 0x54($sp) -/* BFE550 80240CD0 8FB40050 */ lw $s4, 0x50($sp) -/* BFE554 80240CD4 8FB3004C */ lw $s3, 0x4c($sp) -/* BFE558 80240CD8 8FB20048 */ lw $s2, 0x48($sp) -/* BFE55C 80240CDC 8FB10044 */ lw $s1, 0x44($sp) -/* BFE560 80240CE0 8FB00040 */ lw $s0, 0x40($sp) -/* BFE564 80240CE4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* BFE568 80240CE8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* BFE56C 80240CEC D7B60060 */ ldc1 $f22, 0x60($sp) -/* BFE570 80240CF0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* BFE574 80240CF4 03E00008 */ jr $ra -/* BFE578 80240CF8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s new file mode 100644 index 0000000000..9cf2d05306 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802409B8_BFE238.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409B8_BFE238 +/* BFE238 802409B8 27BDFF88 */ addiu $sp, $sp, -0x78 +/* BFE23C 802409BC AFB3004C */ sw $s3, 0x4c($sp) +/* BFE240 802409C0 0080982D */ daddu $s3, $a0, $zero +/* BFE244 802409C4 AFBF0054 */ sw $ra, 0x54($sp) +/* BFE248 802409C8 AFB40050 */ sw $s4, 0x50($sp) +/* BFE24C 802409CC AFB20048 */ sw $s2, 0x48($sp) +/* BFE250 802409D0 AFB10044 */ sw $s1, 0x44($sp) +/* BFE254 802409D4 AFB00040 */ sw $s0, 0x40($sp) +/* BFE258 802409D8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* BFE25C 802409DC F7B80068 */ sdc1 $f24, 0x68($sp) +/* BFE260 802409E0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* BFE264 802409E4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* BFE268 802409E8 8E710148 */ lw $s1, 0x148($s3) +/* BFE26C 802409EC 00A0902D */ daddu $s2, $a1, $zero +/* BFE270 802409F0 86240008 */ lh $a0, 8($s1) +/* BFE274 802409F4 0C00EABB */ jal get_npc_unsafe +/* BFE278 802409F8 00C0A02D */ daddu $s4, $a2, $zero +/* BFE27C 802409FC 0040802D */ daddu $s0, $v0, $zero +/* BFE280 80240A00 C6200078 */ lwc1 $f0, 0x78($s1) +/* BFE284 80240A04 46800020 */ cvt.s.w $f0, $f0 +/* BFE288 80240A08 46000021 */ cvt.d.s $f0, $f0 +/* BFE28C 80240A0C 3C014059 */ lui $at, 0x4059 +/* BFE290 80240A10 44811800 */ mtc1 $at, $f3 +/* BFE294 80240A14 44801000 */ mtc1 $zero, $f2 +/* BFE298 80240A18 8602008E */ lh $v0, 0x8e($s0) +/* BFE29C 80240A1C 9603008E */ lhu $v1, 0x8e($s0) +/* BFE2A0 80240A20 46220003 */ div.d $f0, $f0, $f2 +/* BFE2A4 80240A24 46200620 */ cvt.s.d $f24, $f0 +/* BFE2A8 80240A28 C6200088 */ lwc1 $f0, 0x88($s1) +/* BFE2AC 80240A2C 46800020 */ cvt.s.w $f0, $f0 +/* BFE2B0 80240A30 46000021 */ cvt.d.s $f0, $f0 +/* BFE2B4 80240A34 46220003 */ div.d $f0, $f0, $f2 +/* BFE2B8 80240A38 46200020 */ cvt.s.d $f0, $f0 +/* BFE2BC 80240A3C 18400003 */ blez $v0, .L80240A4C +/* BFE2C0 80240A40 4600C680 */ add.s $f26, $f24, $f0 +/* BFE2C4 80240A44 2462FFFF */ addiu $v0, $v1, -1 +/* BFE2C8 80240A48 A602008E */ sh $v0, 0x8e($s0) +.L80240A4C: +/* BFE2CC 80240A4C 8E220070 */ lw $v0, 0x70($s1) +/* BFE2D0 80240A50 18400034 */ blez $v0, .L80240B24 +/* BFE2D4 80240A54 00000000 */ nop +/* BFE2D8 80240A58 C62C0074 */ lwc1 $f12, 0x74($s1) +/* BFE2DC 80240A5C 46806320 */ cvt.s.w $f12, $f12 +/* BFE2E0 80240A60 44820000 */ mtc1 $v0, $f0 +/* BFE2E4 80240A64 00000000 */ nop +/* BFE2E8 80240A68 46800020 */ cvt.s.w $f0, $f0 +/* BFE2EC 80240A6C 46000021 */ cvt.d.s $f0, $f0 +/* BFE2F0 80240A70 46220003 */ div.d $f0, $f0, $f2 +/* BFE2F4 80240A74 0C00A8BB */ jal sin_deg +/* BFE2F8 80240A78 462005A0 */ cvt.s.d $f22, $f0 +/* BFE2FC 80240A7C 8E020000 */ lw $v0, ($s0) +/* BFE300 80240A80 30420008 */ andi $v0, $v0, 8 +/* BFE304 80240A84 10400003 */ beqz $v0, .L80240A94 +/* BFE308 80240A88 46000506 */ mov.s $f20, $f0 +/* BFE30C 80240A8C 080902B5 */ j .L80240AD4 +/* BFE310 80240A90 0000102D */ daddu $v0, $zero, $zero +.L80240A94: +/* BFE314 80240A94 27A50028 */ addiu $a1, $sp, 0x28 +/* BFE318 80240A98 27A6002C */ addiu $a2, $sp, 0x2c +/* BFE31C 80240A9C C6000038 */ lwc1 $f0, 0x38($s0) +/* BFE320 80240AA0 C602003C */ lwc1 $f2, 0x3c($s0) +/* BFE324 80240AA4 C6040040 */ lwc1 $f4, 0x40($s0) +/* BFE328 80240AA8 3C01447A */ lui $at, 0x447a +/* BFE32C 80240AAC 44813000 */ mtc1 $at, $f6 +/* BFE330 80240AB0 27A20034 */ addiu $v0, $sp, 0x34 +/* BFE334 80240AB4 E7A00028 */ swc1 $f0, 0x28($sp) +/* BFE338 80240AB8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* BFE33C 80240ABC E7A40030 */ swc1 $f4, 0x30($sp) +/* BFE340 80240AC0 E7A60034 */ swc1 $f6, 0x34($sp) +/* BFE344 80240AC4 AFA20010 */ sw $v0, 0x10($sp) +/* BFE348 80240AC8 8E040080 */ lw $a0, 0x80($s0) +/* BFE34C 80240ACC 0C0372DF */ jal func_800DCB7C +/* BFE350 80240AD0 27A70030 */ addiu $a3, $sp, 0x30 +.L80240AD4: +/* BFE354 80240AD4 10400007 */ beqz $v0, .L80240AF4 +/* BFE358 80240AD8 00000000 */ nop +/* BFE35C 80240ADC 4616A082 */ mul.s $f2, $f20, $f22 +/* BFE360 80240AE0 00000000 */ nop +/* BFE364 80240AE4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* BFE368 80240AE8 46180000 */ add.s $f0, $f0, $f24 +/* BFE36C 80240AEC 080902C0 */ j .L80240B00 +/* BFE370 80240AF0 46020000 */ add.s $f0, $f0, $f2 +.L80240AF4: +/* BFE374 80240AF4 4616A002 */ mul.s $f0, $f20, $f22 +/* BFE378 80240AF8 00000000 */ nop +/* BFE37C 80240AFC 4600D000 */ add.s $f0, $f26, $f0 +.L80240B00: +/* BFE380 80240B00 E600003C */ swc1 $f0, 0x3c($s0) +/* BFE384 80240B04 8E220074 */ lw $v0, 0x74($s1) +/* BFE388 80240B08 2442000A */ addiu $v0, $v0, 0xa +/* BFE38C 80240B0C 44826000 */ mtc1 $v0, $f12 +/* BFE390 80240B10 00000000 */ nop +/* BFE394 80240B14 0C00A6C9 */ jal clamp_angle +/* BFE398 80240B18 46806320 */ cvt.s.w $f12, $f12 +/* BFE39C 80240B1C 4600020D */ trunc.w.s $f8, $f0 +/* BFE3A0 80240B20 E6280074 */ swc1 $f8, 0x74($s1) +.L80240B24: +/* BFE3A4 80240B24 8E220090 */ lw $v0, 0x90($s1) +/* BFE3A8 80240B28 1C400040 */ bgtz $v0, .L80240C2C +/* BFE3AC 80240B2C 2442FFFF */ addiu $v0, $v0, -1 +/* BFE3B0 80240B30 860200A8 */ lh $v0, 0xa8($s0) +/* BFE3B4 80240B34 C600003C */ lwc1 $f0, 0x3c($s0) +/* BFE3B8 80240B38 44821000 */ mtc1 $v0, $f2 +/* BFE3BC 80240B3C 00000000 */ nop +/* BFE3C0 80240B40 468010A0 */ cvt.s.w $f2, $f2 +/* BFE3C4 80240B44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BFE3C8 80240B48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BFE3CC 80240B4C 46020000 */ add.s $f0, $f0, $f2 +/* BFE3D0 80240B50 3C014024 */ lui $at, 0x4024 +/* BFE3D4 80240B54 44812800 */ mtc1 $at, $f5 +/* BFE3D8 80240B58 44802000 */ mtc1 $zero, $f4 +/* BFE3DC 80240B5C C442002C */ lwc1 $f2, 0x2c($v0) +/* BFE3E0 80240B60 46000021 */ cvt.d.s $f0, $f0 +/* BFE3E4 80240B64 46240000 */ add.d $f0, $f0, $f4 +/* BFE3E8 80240B68 460010A1 */ cvt.d.s $f2, $f2 +/* BFE3EC 80240B6C 4620103C */ c.lt.d $f2, $f0 +/* BFE3F0 80240B70 00000000 */ nop +/* BFE3F4 80240B74 4500002E */ bc1f .L80240C30 +/* BFE3F8 80240B78 0280202D */ daddu $a0, $s4, $zero +/* BFE3FC 80240B7C 24020001 */ addiu $v0, $zero, 1 +/* BFE400 80240B80 AFA20010 */ sw $v0, 0x10($sp) +/* BFE404 80240B84 8E460024 */ lw $a2, 0x24($s2) +/* BFE408 80240B88 8E470028 */ lw $a3, 0x28($s2) +/* BFE40C 80240B8C 0C01242D */ jal func_800490B4 +/* BFE410 80240B90 0220282D */ daddu $a1, $s1, $zero +/* BFE414 80240B94 10400026 */ beqz $v0, .L80240C30 +/* BFE418 80240B98 0000202D */ daddu $a0, $zero, $zero +/* BFE41C 80240B9C 0200282D */ daddu $a1, $s0, $zero +/* BFE420 80240BA0 0000302D */ daddu $a2, $zero, $zero +/* BFE424 80240BA4 2412000C */ addiu $s2, $zero, 0xc +/* BFE428 80240BA8 860300A8 */ lh $v1, 0xa8($s0) +/* BFE42C 80240BAC 3C013F80 */ lui $at, 0x3f80 +/* BFE430 80240BB0 44810000 */ mtc1 $at, $f0 +/* BFE434 80240BB4 3C014000 */ lui $at, 0x4000 +/* BFE438 80240BB8 44811000 */ mtc1 $at, $f2 +/* BFE43C 80240BBC 3C01C1A0 */ lui $at, 0xc1a0 +/* BFE440 80240BC0 44812000 */ mtc1 $at, $f4 +/* BFE444 80240BC4 44834000 */ mtc1 $v1, $f8 +/* BFE448 80240BC8 00000000 */ nop +/* BFE44C 80240BCC 46804220 */ cvt.s.w $f8, $f8 +/* BFE450 80240BD0 44074000 */ mfc1 $a3, $f8 +/* BFE454 80240BD4 27A20038 */ addiu $v0, $sp, 0x38 +/* BFE458 80240BD8 AFB2001C */ sw $s2, 0x1c($sp) +/* BFE45C 80240BDC AFA20020 */ sw $v0, 0x20($sp) +/* BFE460 80240BE0 E7A00010 */ swc1 $f0, 0x10($sp) +/* BFE464 80240BE4 E7A20014 */ swc1 $f2, 0x14($sp) +/* BFE468 80240BE8 0C01BFA4 */ jal fx_emote +/* BFE46C 80240BEC E7A40018 */ swc1 $f4, 0x18($sp) +/* BFE470 80240BF0 0200202D */ daddu $a0, $s0, $zero +/* BFE474 80240BF4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* BFE478 80240BF8 C480003C */ lwc1 $f0, 0x3c($a0) +/* BFE47C 80240BFC 3C060020 */ lui $a2, 0x20 +/* BFE480 80240C00 0C012530 */ jal func_800494C0 +/* BFE484 80240C04 E4800064 */ swc1 $f0, 0x64($a0) +/* BFE488 80240C08 8E220018 */ lw $v0, 0x18($s1) +/* BFE48C 80240C0C 9442002A */ lhu $v0, 0x2a($v0) +/* BFE490 80240C10 30420001 */ andi $v0, $v0, 1 +/* BFE494 80240C14 10400003 */ beqz $v0, .L80240C24 +/* BFE498 80240C18 2402000A */ addiu $v0, $zero, 0xa +/* BFE49C 80240C1C 08090333 */ j .L80240CCC +/* BFE4A0 80240C20 AE620070 */ sw $v0, 0x70($s3) +.L80240C24: +/* BFE4A4 80240C24 08090333 */ j .L80240CCC +/* BFE4A8 80240C28 AE720070 */ sw $s2, 0x70($s3) +.L80240C2C: +/* BFE4AC 80240C2C AE220090 */ sw $v0, 0x90($s1) +.L80240C30: +/* BFE4B0 80240C30 8602008C */ lh $v0, 0x8c($s0) +/* BFE4B4 80240C34 14400025 */ bnez $v0, .L80240CCC +/* BFE4B8 80240C38 00000000 */ nop +/* BFE4BC 80240C3C 8602008E */ lh $v0, 0x8e($s0) +/* BFE4C0 80240C40 1C400022 */ bgtz $v0, .L80240CCC +/* BFE4C4 80240C44 00000000 */ nop +/* BFE4C8 80240C48 8E620074 */ lw $v0, 0x74($s3) +/* BFE4CC 80240C4C 2442FFFF */ addiu $v0, $v0, -1 +/* BFE4D0 80240C50 1840001D */ blez $v0, .L80240CC8 +/* BFE4D4 80240C54 AE620074 */ sw $v0, 0x74($s3) +/* BFE4D8 80240C58 8E220018 */ lw $v0, 0x18($s1) +/* BFE4DC 80240C5C 9442002A */ lhu $v0, 0x2a($v0) +/* BFE4E0 80240C60 30420010 */ andi $v0, $v0, 0x10 +/* BFE4E4 80240C64 14400007 */ bnez $v0, .L80240C84 +/* BFE4E8 80240C68 00000000 */ nop +/* BFE4EC 80240C6C C600000C */ lwc1 $f0, 0xc($s0) +/* BFE4F0 80240C70 3C014334 */ lui $at, 0x4334 +/* BFE4F4 80240C74 44816000 */ mtc1 $at, $f12 +/* BFE4F8 80240C78 0C00A6C9 */ jal clamp_angle +/* BFE4FC 80240C7C 460C0300 */ add.s $f12, $f0, $f12 +/* BFE500 80240C80 E600000C */ swc1 $f0, 0xc($s0) +.L80240C84: +/* BFE504 80240C84 0C00A67F */ jal rand_int +/* BFE508 80240C88 240403E8 */ addiu $a0, $zero, 0x3e8 +/* BFE50C 80240C8C 3C032E8B */ lui $v1, 0x2e8b +/* BFE510 80240C90 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* BFE514 80240C94 00430018 */ mult $v0, $v1 +/* BFE518 80240C98 00021FC3 */ sra $v1, $v0, 0x1f +/* BFE51C 80240C9C 00004010 */ mfhi $t0 +/* BFE520 80240CA0 00082043 */ sra $a0, $t0, 1 +/* BFE524 80240CA4 00832023 */ subu $a0, $a0, $v1 +/* BFE528 80240CA8 00041840 */ sll $v1, $a0, 1 +/* BFE52C 80240CAC 00641821 */ addu $v1, $v1, $a0 +/* BFE530 80240CB0 00031880 */ sll $v1, $v1, 2 +/* BFE534 80240CB4 00641823 */ subu $v1, $v1, $a0 +/* BFE538 80240CB8 00431023 */ subu $v0, $v0, $v1 +/* BFE53C 80240CBC 24420005 */ addiu $v0, $v0, 5 +/* BFE540 80240CC0 08090333 */ j .L80240CCC +/* BFE544 80240CC4 A602008E */ sh $v0, 0x8e($s0) +.L80240CC8: +/* BFE548 80240CC8 AE600070 */ sw $zero, 0x70($s3) +.L80240CCC: +/* BFE54C 80240CCC 8FBF0054 */ lw $ra, 0x54($sp) +/* BFE550 80240CD0 8FB40050 */ lw $s4, 0x50($sp) +/* BFE554 80240CD4 8FB3004C */ lw $s3, 0x4c($sp) +/* BFE558 80240CD8 8FB20048 */ lw $s2, 0x48($sp) +/* BFE55C 80240CDC 8FB10044 */ lw $s1, 0x44($sp) +/* BFE560 80240CE0 8FB00040 */ lw $s0, 0x40($sp) +/* BFE564 80240CE4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* BFE568 80240CE8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* BFE56C 80240CEC D7B60060 */ ldc1 $f22, 0x60($sp) +/* BFE570 80240CF0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* BFE574 80240CF4 03E00008 */ jr $ra +/* BFE578 80240CF8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0.s deleted file mode 100644 index 61e2c38081..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE0 -/* BFE660 80240DE0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BFE664 80240DE4 AFB3001C */ sw $s3, 0x1c($sp) -/* BFE668 80240DE8 0080982D */ daddu $s3, $a0, $zero -/* BFE66C 80240DEC AFBF0020 */ sw $ra, 0x20($sp) -/* BFE670 80240DF0 AFB20018 */ sw $s2, 0x18($sp) -/* BFE674 80240DF4 AFB10014 */ sw $s1, 0x14($sp) -/* BFE678 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* BFE67C 80240DFC 8E720148 */ lw $s2, 0x148($s3) -/* BFE680 80240E00 86440008 */ lh $a0, 8($s2) -/* BFE684 80240E04 0C00EABB */ jal get_npc_unsafe -/* BFE688 80240E08 00A0802D */ daddu $s0, $a1, $zero -/* BFE68C 80240E0C 0040882D */ daddu $s1, $v0, $zero -/* BFE690 80240E10 C6420080 */ lwc1 $f2, 0x80($s2) -/* BFE694 80240E14 468010A0 */ cvt.s.w $f2, $f2 -/* BFE698 80240E18 460010A1 */ cvt.d.s $f2, $f2 -/* BFE69C 80240E1C C6400084 */ lwc1 $f0, 0x84($s2) -/* BFE6A0 80240E20 46800020 */ cvt.s.w $f0, $f0 -/* BFE6A4 80240E24 46000021 */ cvt.d.s $f0, $f0 -/* BFE6A8 80240E28 3C014059 */ lui $at, 0x4059 -/* BFE6AC 80240E2C 44812800 */ mtc1 $at, $f5 -/* BFE6B0 80240E30 44802000 */ mtc1 $zero, $f4 -/* BFE6B4 80240E34 8E4200CC */ lw $v0, 0xcc($s2) -/* BFE6B8 80240E38 C62C0038 */ lwc1 $f12, 0x38($s1) -/* BFE6BC 80240E3C C62E0040 */ lwc1 $f14, 0x40($s1) -/* BFE6C0 80240E40 46241083 */ div.d $f2, $f2, $f4 -/* BFE6C4 80240E44 462010A0 */ cvt.s.d $f2, $f2 -/* BFE6C8 80240E48 46240003 */ div.d $f0, $f0, $f4 -/* BFE6CC 80240E4C 8C420020 */ lw $v0, 0x20($v0) -/* BFE6D0 80240E50 46200020 */ cvt.s.d $f0, $f0 -/* BFE6D4 80240E54 E622001C */ swc1 $f2, 0x1c($s1) -/* BFE6D8 80240E58 E6200014 */ swc1 $f0, 0x14($s1) -/* BFE6DC 80240E5C AE220028 */ sw $v0, 0x28($s1) -/* BFE6E0 80240E60 C6000018 */ lwc1 $f0, 0x18($s0) -/* BFE6E4 80240E64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFE6E8 80240E68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFE6EC 80240E6C E6200018 */ swc1 $f0, 0x18($s1) -/* BFE6F0 80240E70 8C460028 */ lw $a2, 0x28($v0) -/* BFE6F4 80240E74 0C00A720 */ jal atan2 -/* BFE6F8 80240E78 8C470030 */ lw $a3, 0x30($v0) -/* BFE6FC 80240E7C E620000C */ swc1 $f0, 0xc($s1) -/* BFE700 80240E80 8E420018 */ lw $v0, 0x18($s2) -/* BFE704 80240E84 AE400074 */ sw $zero, 0x74($s2) -/* BFE708 80240E88 9442002A */ lhu $v0, 0x2a($v0) -/* BFE70C 80240E8C 30420002 */ andi $v0, $v0, 2 -/* BFE710 80240E90 10400005 */ beqz $v0, .L80240EA8 -/* BFE714 80240E94 24020003 */ addiu $v0, $zero, 3 -/* BFE718 80240E98 A622008E */ sh $v0, 0x8e($s1) -/* BFE71C 80240E9C 2402000D */ addiu $v0, $zero, 0xd -/* BFE720 80240EA0 080903BE */ j .L80240EF8 -/* BFE724 80240EA4 AE620070 */ sw $v0, 0x70($s3) -.L80240EA8: -/* BFE728 80240EA8 24030001 */ addiu $v1, $zero, 1 -/* BFE72C 80240EAC 2402000E */ addiu $v0, $zero, 0xe -/* BFE730 80240EB0 A623008E */ sh $v1, 0x8e($s1) -/* BFE734 80240EB4 AE620070 */ sw $v0, 0x70($s3) -/* BFE738 80240EB8 C6200038 */ lwc1 $f0, 0x38($s1) -/* BFE73C 80240EBC 4600018D */ trunc.w.s $f6, $f0 -/* BFE740 80240EC0 44023000 */ mfc1 $v0, $f6 -/* BFE744 80240EC4 00000000 */ nop -/* BFE748 80240EC8 A6420010 */ sh $v0, 0x10($s2) -/* BFE74C 80240ECC C620003C */ lwc1 $f0, 0x3c($s1) -/* BFE750 80240ED0 4600018D */ trunc.w.s $f6, $f0 -/* BFE754 80240ED4 44023000 */ mfc1 $v0, $f6 -/* BFE758 80240ED8 00000000 */ nop -/* BFE75C 80240EDC A6420012 */ sh $v0, 0x12($s2) -/* BFE760 80240EE0 C6200040 */ lwc1 $f0, 0x40($s1) -/* BFE764 80240EE4 A2430007 */ sb $v1, 7($s2) -/* BFE768 80240EE8 4600018D */ trunc.w.s $f6, $f0 -/* BFE76C 80240EEC 44023000 */ mfc1 $v0, $f6 -/* BFE770 80240EF0 00000000 */ nop -/* BFE774 80240EF4 A6420014 */ sh $v0, 0x14($s2) -.L80240EF8: -/* BFE778 80240EF8 8FBF0020 */ lw $ra, 0x20($sp) -/* BFE77C 80240EFC 8FB3001C */ lw $s3, 0x1c($sp) -/* BFE780 80240F00 8FB20018 */ lw $s2, 0x18($sp) -/* BFE784 80240F04 8FB10014 */ lw $s1, 0x14($sp) -/* BFE788 80240F08 8FB00010 */ lw $s0, 0x10($sp) -/* BFE78C 80240F0C 03E00008 */ jr $ra -/* BFE790 80240F10 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s new file mode 100644 index 0000000000..3c843d4fca --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240DE0_BFE660.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DE0_BFE660 +/* BFE660 80240DE0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* BFE664 80240DE4 AFB3001C */ sw $s3, 0x1c($sp) +/* BFE668 80240DE8 0080982D */ daddu $s3, $a0, $zero +/* BFE66C 80240DEC AFBF0020 */ sw $ra, 0x20($sp) +/* BFE670 80240DF0 AFB20018 */ sw $s2, 0x18($sp) +/* BFE674 80240DF4 AFB10014 */ sw $s1, 0x14($sp) +/* BFE678 80240DF8 AFB00010 */ sw $s0, 0x10($sp) +/* BFE67C 80240DFC 8E720148 */ lw $s2, 0x148($s3) +/* BFE680 80240E00 86440008 */ lh $a0, 8($s2) +/* BFE684 80240E04 0C00EABB */ jal get_npc_unsafe +/* BFE688 80240E08 00A0802D */ daddu $s0, $a1, $zero +/* BFE68C 80240E0C 0040882D */ daddu $s1, $v0, $zero +/* BFE690 80240E10 C6420080 */ lwc1 $f2, 0x80($s2) +/* BFE694 80240E14 468010A0 */ cvt.s.w $f2, $f2 +/* BFE698 80240E18 460010A1 */ cvt.d.s $f2, $f2 +/* BFE69C 80240E1C C6400084 */ lwc1 $f0, 0x84($s2) +/* BFE6A0 80240E20 46800020 */ cvt.s.w $f0, $f0 +/* BFE6A4 80240E24 46000021 */ cvt.d.s $f0, $f0 +/* BFE6A8 80240E28 3C014059 */ lui $at, 0x4059 +/* BFE6AC 80240E2C 44812800 */ mtc1 $at, $f5 +/* BFE6B0 80240E30 44802000 */ mtc1 $zero, $f4 +/* BFE6B4 80240E34 8E4200CC */ lw $v0, 0xcc($s2) +/* BFE6B8 80240E38 C62C0038 */ lwc1 $f12, 0x38($s1) +/* BFE6BC 80240E3C C62E0040 */ lwc1 $f14, 0x40($s1) +/* BFE6C0 80240E40 46241083 */ div.d $f2, $f2, $f4 +/* BFE6C4 80240E44 462010A0 */ cvt.s.d $f2, $f2 +/* BFE6C8 80240E48 46240003 */ div.d $f0, $f0, $f4 +/* BFE6CC 80240E4C 8C420020 */ lw $v0, 0x20($v0) +/* BFE6D0 80240E50 46200020 */ cvt.s.d $f0, $f0 +/* BFE6D4 80240E54 E622001C */ swc1 $f2, 0x1c($s1) +/* BFE6D8 80240E58 E6200014 */ swc1 $f0, 0x14($s1) +/* BFE6DC 80240E5C AE220028 */ sw $v0, 0x28($s1) +/* BFE6E0 80240E60 C6000018 */ lwc1 $f0, 0x18($s0) +/* BFE6E4 80240E64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BFE6E8 80240E68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BFE6EC 80240E6C E6200018 */ swc1 $f0, 0x18($s1) +/* BFE6F0 80240E70 8C460028 */ lw $a2, 0x28($v0) +/* BFE6F4 80240E74 0C00A720 */ jal atan2 +/* BFE6F8 80240E78 8C470030 */ lw $a3, 0x30($v0) +/* BFE6FC 80240E7C E620000C */ swc1 $f0, 0xc($s1) +/* BFE700 80240E80 8E420018 */ lw $v0, 0x18($s2) +/* BFE704 80240E84 AE400074 */ sw $zero, 0x74($s2) +/* BFE708 80240E88 9442002A */ lhu $v0, 0x2a($v0) +/* BFE70C 80240E8C 30420002 */ andi $v0, $v0, 2 +/* BFE710 80240E90 10400005 */ beqz $v0, .L80240EA8 +/* BFE714 80240E94 24020003 */ addiu $v0, $zero, 3 +/* BFE718 80240E98 A622008E */ sh $v0, 0x8e($s1) +/* BFE71C 80240E9C 2402000D */ addiu $v0, $zero, 0xd +/* BFE720 80240EA0 080903BE */ j .L80240EF8 +/* BFE724 80240EA4 AE620070 */ sw $v0, 0x70($s3) +.L80240EA8: +/* BFE728 80240EA8 24030001 */ addiu $v1, $zero, 1 +/* BFE72C 80240EAC 2402000E */ addiu $v0, $zero, 0xe +/* BFE730 80240EB0 A623008E */ sh $v1, 0x8e($s1) +/* BFE734 80240EB4 AE620070 */ sw $v0, 0x70($s3) +/* BFE738 80240EB8 C6200038 */ lwc1 $f0, 0x38($s1) +/* BFE73C 80240EBC 4600018D */ trunc.w.s $f6, $f0 +/* BFE740 80240EC0 44023000 */ mfc1 $v0, $f6 +/* BFE744 80240EC4 00000000 */ nop +/* BFE748 80240EC8 A6420010 */ sh $v0, 0x10($s2) +/* BFE74C 80240ECC C620003C */ lwc1 $f0, 0x3c($s1) +/* BFE750 80240ED0 4600018D */ trunc.w.s $f6, $f0 +/* BFE754 80240ED4 44023000 */ mfc1 $v0, $f6 +/* BFE758 80240ED8 00000000 */ nop +/* BFE75C 80240EDC A6420012 */ sh $v0, 0x12($s2) +/* BFE760 80240EE0 C6200040 */ lwc1 $f0, 0x40($s1) +/* BFE764 80240EE4 A2430007 */ sb $v1, 7($s2) +/* BFE768 80240EE8 4600018D */ trunc.w.s $f6, $f0 +/* BFE76C 80240EEC 44023000 */ mfc1 $v0, $f6 +/* BFE770 80240EF0 00000000 */ nop +/* BFE774 80240EF4 A6420014 */ sh $v0, 0x14($s2) +.L80240EF8: +/* BFE778 80240EF8 8FBF0020 */ lw $ra, 0x20($sp) +/* BFE77C 80240EFC 8FB3001C */ lw $s3, 0x1c($sp) +/* BFE780 80240F00 8FB20018 */ lw $s2, 0x18($sp) +/* BFE784 80240F04 8FB10014 */ lw $s1, 0x14($sp) +/* BFE788 80240F08 8FB00010 */ lw $s0, 0x10($sp) +/* BFE78C 80240F0C 03E00008 */ jr $ra +/* BFE790 80240F10 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78.s deleted file mode 100644 index d6e59e203f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F78 -/* BFE7F8 80240F78 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BFE7FC 80240F7C AFB20030 */ sw $s2, 0x30($sp) -/* BFE800 80240F80 0080902D */ daddu $s2, $a0, $zero -/* BFE804 80240F84 AFBF0038 */ sw $ra, 0x38($sp) -/* BFE808 80240F88 AFB30034 */ sw $s3, 0x34($sp) -/* BFE80C 80240F8C AFB1002C */ sw $s1, 0x2c($sp) -/* BFE810 80240F90 AFB00028 */ sw $s0, 0x28($sp) -/* BFE814 80240F94 F7B60048 */ sdc1 $f22, 0x48($sp) -/* BFE818 80240F98 F7B40040 */ sdc1 $f20, 0x40($sp) -/* BFE81C 80240F9C 8E510148 */ lw $s1, 0x148($s2) -/* BFE820 80240FA0 86240008 */ lh $a0, 8($s1) -/* BFE824 80240FA4 0C00EABB */ jal get_npc_unsafe -/* BFE828 80240FA8 00A0982D */ daddu $s3, $a1, $zero -/* BFE82C 80240FAC 0040802D */ daddu $s0, $v0, $zero -/* BFE830 80240FB0 0200202D */ daddu $a0, $s0, $zero -/* BFE834 80240FB4 C6220088 */ lwc1 $f2, 0x88($s1) -/* BFE838 80240FB8 468010A0 */ cvt.s.w $f2, $f2 -/* BFE83C 80240FBC 460010A1 */ cvt.d.s $f2, $f2 -/* BFE840 80240FC0 C604001C */ lwc1 $f4, 0x1c($s0) -/* BFE844 80240FC4 C6000014 */ lwc1 $f0, 0x14($s0) -/* BFE848 80240FC8 8E050018 */ lw $a1, 0x18($s0) -/* BFE84C 80240FCC 46002100 */ add.s $f4, $f4, $f0 -/* BFE850 80240FD0 8E06000C */ lw $a2, 0xc($s0) -/* BFE854 80240FD4 C6200078 */ lwc1 $f0, 0x78($s1) -/* BFE858 80240FD8 46800020 */ cvt.s.w $f0, $f0 -/* BFE85C 80240FDC E604001C */ swc1 $f4, 0x1c($s0) -/* BFE860 80240FE0 3C014059 */ lui $at, 0x4059 -/* BFE864 80240FE4 44812800 */ mtc1 $at, $f5 -/* BFE868 80240FE8 44802000 */ mtc1 $zero, $f4 -/* BFE86C 80240FEC 46000021 */ cvt.d.s $f0, $f0 -/* BFE870 80240FF0 46240003 */ div.d $f0, $f0, $f4 -/* BFE874 80240FF4 46200520 */ cvt.s.d $f20, $f0 -/* BFE878 80240FF8 46241083 */ div.d $f2, $f2, $f4 -/* BFE87C 80240FFC 0C00EA95 */ jal npc_move_heading -/* BFE880 80241000 462015A0 */ cvt.s.d $f22, $f2 -/* BFE884 80241004 C604001C */ lwc1 $f4, 0x1c($s0) -/* BFE888 80241008 44801000 */ mtc1 $zero, $f2 -/* BFE88C 8024100C 44801800 */ mtc1 $zero, $f3 -/* BFE890 80241010 46002021 */ cvt.d.s $f0, $f4 -/* BFE894 80241014 4620103E */ c.le.d $f2, $f0 -/* BFE898 80241018 00000000 */ nop -/* BFE89C 8024101C 45000030 */ bc1f .L802410E0 -/* BFE8A0 80241020 00000000 */ nop -/* BFE8A4 80241024 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFE8A8 80241028 46040000 */ add.s $f0, $f0, $f4 -/* BFE8AC 8024102C E600003C */ swc1 $f0, 0x3c($s0) -/* BFE8B0 80241030 8E2200CC */ lw $v0, 0xcc($s1) -/* BFE8B4 80241034 8C420024 */ lw $v0, 0x24($v0) -/* BFE8B8 80241038 AE020028 */ sw $v0, 0x28($s0) -/* BFE8BC 8024103C A2200007 */ sb $zero, 7($s1) -/* BFE8C0 80241040 8E020000 */ lw $v0, ($s0) -/* BFE8C4 80241044 30420008 */ andi $v0, $v0, 8 -/* BFE8C8 80241048 14400011 */ bnez $v0, .L80241090 -/* BFE8CC 8024104C 0000102D */ daddu $v0, $zero, $zero -/* BFE8D0 80241050 27A50018 */ addiu $a1, $sp, 0x18 -/* BFE8D4 80241054 27A6001C */ addiu $a2, $sp, 0x1c -/* BFE8D8 80241058 C6000038 */ lwc1 $f0, 0x38($s0) -/* BFE8DC 8024105C C602003C */ lwc1 $f2, 0x3c($s0) -/* BFE8E0 80241060 C6040040 */ lwc1 $f4, 0x40($s0) -/* BFE8E4 80241064 3C01447A */ lui $at, 0x447a -/* BFE8E8 80241068 44813000 */ mtc1 $at, $f6 -/* BFE8EC 8024106C 27A20024 */ addiu $v0, $sp, 0x24 -/* BFE8F0 80241070 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFE8F4 80241074 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BFE8F8 80241078 E7A40020 */ swc1 $f4, 0x20($sp) -/* BFE8FC 8024107C E7A60024 */ swc1 $f6, 0x24($sp) -/* BFE900 80241080 AFA20010 */ sw $v0, 0x10($sp) -/* BFE904 80241084 8E040080 */ lw $a0, 0x80($s0) -/* BFE908 80241088 0C0372DF */ jal func_800DCB7C -/* BFE90C 8024108C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241090: -/* BFE910 80241090 1040000B */ beqz $v0, .L802410C0 -/* BFE914 80241094 00000000 */ nop -/* BFE918 80241098 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BFE91C 8024109C 46140080 */ add.s $f2, $f0, $f20 -/* BFE920 802410A0 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFE924 802410A4 4600103E */ c.le.s $f2, $f0 -/* BFE928 802410A8 00000000 */ nop -/* BFE92C 802410AC 4500008D */ bc1f .L802412E4 -/* BFE930 802410B0 00000000 */ nop -/* BFE934 802410B4 E602003C */ swc1 $f2, 0x3c($s0) -/* BFE938 802410B8 080904B9 */ j .L802412E4 -/* BFE93C 802410BC AE400070 */ sw $zero, 0x70($s2) -.L802410C0: -/* BFE940 802410C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFE944 802410C4 C6000064 */ lwc1 $f0, 0x64($s0) -/* BFE948 802410C8 4602003E */ c.le.s $f0, $f2 -/* BFE94C 802410CC 00000000 */ nop -/* BFE950 802410D0 45030084 */ bc1tl .L802412E4 -/* BFE954 802410D4 AE400070 */ sw $zero, 0x70($s2) -/* BFE958 802410D8 080904B9 */ j .L802412E4 -/* BFE95C 802410DC 00000000 */ nop -.L802410E0: -/* BFE960 802410E0 4622003C */ c.lt.d $f0, $f2 -/* BFE964 802410E4 00000000 */ nop -/* BFE968 802410E8 4500007E */ bc1f .L802412E4 -/* BFE96C 802410EC 00000000 */ nop -/* BFE970 802410F0 9602008E */ lhu $v0, 0x8e($s0) -/* BFE974 802410F4 24420001 */ addiu $v0, $v0, 1 -/* BFE978 802410F8 A602008E */ sh $v0, 0x8e($s0) -/* BFE97C 802410FC 00021400 */ sll $v0, $v0, 0x10 -/* BFE980 80241100 8E630020 */ lw $v1, 0x20($s3) -/* BFE984 80241104 00021403 */ sra $v0, $v0, 0x10 -/* BFE988 80241108 0043102A */ slt $v0, $v0, $v1 -/* BFE98C 8024110C 14400026 */ bnez $v0, .L802411A8 -/* BFE990 80241110 00000000 */ nop -/* BFE994 80241114 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFE998 80241118 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFE99C 8024111C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFE9A0 80241120 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFE9A4 80241124 A600008E */ sh $zero, 0x8e($s0) -/* BFE9A8 80241128 8C460028 */ lw $a2, 0x28($v0) -/* BFE9AC 8024112C 0C00A720 */ jal atan2 -/* BFE9B0 80241130 8C470030 */ lw $a3, 0x30($v0) -/* BFE9B4 80241134 46000506 */ mov.s $f20, $f0 -/* BFE9B8 80241138 C60C000C */ lwc1 $f12, 0xc($s0) -/* BFE9BC 8024113C 0C00A70A */ jal get_clamped_angle_diff -/* BFE9C0 80241140 4600A386 */ mov.s $f14, $f20 -/* BFE9C4 80241144 46000086 */ mov.s $f2, $f0 -/* BFE9C8 80241148 8E62001C */ lw $v0, 0x1c($s3) -/* BFE9CC 8024114C 46001005 */ abs.s $f0, $f2 -/* BFE9D0 80241150 44822000 */ mtc1 $v0, $f4 -/* BFE9D4 80241154 00000000 */ nop -/* BFE9D8 80241158 46802120 */ cvt.s.w $f4, $f4 -/* BFE9DC 8024115C 4600203C */ c.lt.s $f4, $f0 -/* BFE9E0 80241160 00000000 */ nop -/* BFE9E4 80241164 4500000D */ bc1f .L8024119C -/* BFE9E8 80241168 00000000 */ nop -/* BFE9EC 8024116C 44800000 */ mtc1 $zero, $f0 -/* BFE9F0 80241170 C614000C */ lwc1 $f20, 0xc($s0) -/* BFE9F4 80241174 4600103C */ c.lt.s $f2, $f0 -/* BFE9F8 80241178 00000000 */ nop -/* BFE9FC 8024117C 45000006 */ bc1f .L80241198 -/* BFEA00 80241180 00021023 */ negu $v0, $v0 -/* BFEA04 80241184 44820000 */ mtc1 $v0, $f0 -/* BFEA08 80241188 00000000 */ nop -/* BFEA0C 8024118C 46800020 */ cvt.s.w $f0, $f0 -/* BFEA10 80241190 08090467 */ j .L8024119C -/* BFEA14 80241194 4600A500 */ add.s $f20, $f20, $f0 -.L80241198: -/* BFEA18 80241198 4604A500 */ add.s $f20, $f20, $f4 -.L8024119C: -/* BFEA1C 8024119C 0C00A6C9 */ jal clamp_angle -/* BFEA20 802411A0 4600A306 */ mov.s $f12, $f20 -/* BFEA24 802411A4 E600000C */ swc1 $f0, 0xc($s0) -.L802411A8: -/* BFEA28 802411A8 8E020000 */ lw $v0, ($s0) -/* BFEA2C 802411AC 30420008 */ andi $v0, $v0, 8 -/* BFEA30 802411B0 1040000A */ beqz $v0, .L802411DC -/* BFEA34 802411B4 27A50018 */ addiu $a1, $sp, 0x18 -/* BFEA38 802411B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* BFEA3C 802411BC C600001C */ lwc1 $f0, 0x1c($s0) -/* BFEA40 802411C0 46001080 */ add.s $f2, $f2, $f0 -/* BFEA44 802411C4 4616103C */ c.lt.s $f2, $f22 -/* BFEA48 802411C8 00000000 */ nop -/* BFEA4C 802411CC 45020045 */ bc1fl .L802412E4 -/* BFEA50 802411D0 E602003C */ swc1 $f2, 0x3c($s0) -/* BFEA54 802411D4 080904B8 */ j .L802412E0 -/* BFEA58 802411D8 E616003C */ swc1 $f22, 0x3c($s0) -.L802411DC: -/* BFEA5C 802411DC C6000038 */ lwc1 $f0, 0x38($s0) -/* BFEA60 802411E0 27A6001C */ addiu $a2, $sp, 0x1c -/* BFEA64 802411E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFEA68 802411E8 860200A8 */ lh $v0, 0xa8($s0) -/* BFEA6C 802411EC C600001C */ lwc1 $f0, 0x1c($s0) -/* BFEA70 802411F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* BFEA74 802411F4 44821000 */ mtc1 $v0, $f2 -/* BFEA78 802411F8 00000000 */ nop -/* BFEA7C 802411FC 468010A0 */ cvt.s.w $f2, $f2 -/* BFEA80 80241200 46000005 */ abs.s $f0, $f0 -/* BFEA84 80241204 46020000 */ add.s $f0, $f0, $f2 -/* BFEA88 80241208 C6060040 */ lwc1 $f6, 0x40($s0) -/* BFEA8C 8024120C 27A20024 */ addiu $v0, $sp, 0x24 -/* BFEA90 80241210 46022100 */ add.s $f4, $f4, $f2 -/* BFEA94 80241214 3C014024 */ lui $at, 0x4024 -/* BFEA98 80241218 44811800 */ mtc1 $at, $f3 -/* BFEA9C 8024121C 44801000 */ mtc1 $zero, $f2 -/* BFEAA0 80241220 46000021 */ cvt.d.s $f0, $f0 -/* BFEAA4 80241224 46220000 */ add.d $f0, $f0, $f2 -/* BFEAA8 80241228 E7A60020 */ swc1 $f6, 0x20($sp) -/* BFEAAC 8024122C E7A4001C */ swc1 $f4, 0x1c($sp) -/* BFEAB0 80241230 46200020 */ cvt.s.d $f0, $f0 -/* BFEAB4 80241234 E7A00024 */ swc1 $f0, 0x24($sp) -/* BFEAB8 80241238 AFA20010 */ sw $v0, 0x10($sp) -/* BFEABC 8024123C 8E040080 */ lw $a0, 0x80($s0) -/* BFEAC0 80241240 0C0372DF */ jal func_800DCB7C -/* BFEAC4 80241244 27A70020 */ addiu $a3, $sp, 0x20 -/* BFEAC8 80241248 10400015 */ beqz $v0, .L802412A0 -/* BFEACC 8024124C 00000000 */ nop -/* BFEAD0 80241250 860200A8 */ lh $v0, 0xa8($s0) -/* BFEAD4 80241254 C604001C */ lwc1 $f4, 0x1c($s0) -/* BFEAD8 80241258 44820000 */ mtc1 $v0, $f0 -/* BFEADC 8024125C 00000000 */ nop -/* BFEAE0 80241260 46800020 */ cvt.s.w $f0, $f0 -/* BFEAE4 80241264 46002085 */ abs.s $f2, $f4 -/* BFEAE8 80241268 46020000 */ add.s $f0, $f0, $f2 -/* BFEAEC 8024126C C7A20024 */ lwc1 $f2, 0x24($sp) -/* BFEAF0 80241270 4600103E */ c.le.s $f2, $f0 -/* BFEAF4 80241274 00000000 */ nop -/* BFEAF8 80241278 45000005 */ bc1f .L80241290 -/* BFEAFC 8024127C 00000000 */ nop -/* BFEB00 80241280 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BFEB04 80241284 AE00001C */ sw $zero, 0x1c($s0) -/* BFEB08 80241288 080904B9 */ j .L802412E4 -/* BFEB0C 8024128C E600003C */ swc1 $f0, 0x3c($s0) -.L80241290: -/* BFEB10 80241290 C600003C */ lwc1 $f0, 0x3c($s0) -/* BFEB14 80241294 46040000 */ add.s $f0, $f0, $f4 -/* BFEB18 80241298 080904B9 */ j .L802412E4 -/* BFEB1C 8024129C E600003C */ swc1 $f0, 0x3c($s0) -.L802412A0: -/* BFEB20 802412A0 C606003C */ lwc1 $f6, 0x3c($s0) -/* BFEB24 802412A4 860200A8 */ lh $v0, 0xa8($s0) -/* BFEB28 802412A8 46163081 */ sub.s $f2, $f6, $f22 -/* BFEB2C 802412AC 44820000 */ mtc1 $v0, $f0 -/* BFEB30 802412B0 00000000 */ nop -/* BFEB34 802412B4 46800020 */ cvt.s.w $f0, $f0 -/* BFEB38 802412B8 46001080 */ add.s $f2, $f2, $f0 -/* BFEB3C 802412BC C604001C */ lwc1 $f4, 0x1c($s0) -/* BFEB40 802412C0 46002005 */ abs.s $f0, $f4 -/* BFEB44 802412C4 4602003C */ c.lt.s $f0, $f2 -/* BFEB48 802412C8 00000000 */ nop -/* BFEB4C 802412CC 45020005 */ bc1fl .L802412E4 -/* BFEB50 802412D0 AE00001C */ sw $zero, 0x1c($s0) -/* BFEB54 802412D4 46043000 */ add.s $f0, $f6, $f4 -/* BFEB58 802412D8 080904B9 */ j .L802412E4 -/* BFEB5C 802412DC E600003C */ swc1 $f0, 0x3c($s0) -.L802412E0: -/* BFEB60 802412E0 AE00001C */ sw $zero, 0x1c($s0) -.L802412E4: -/* BFEB64 802412E4 8FBF0038 */ lw $ra, 0x38($sp) -/* BFEB68 802412E8 8FB30034 */ lw $s3, 0x34($sp) -/* BFEB6C 802412EC 8FB20030 */ lw $s2, 0x30($sp) -/* BFEB70 802412F0 8FB1002C */ lw $s1, 0x2c($sp) -/* BFEB74 802412F4 8FB00028 */ lw $s0, 0x28($sp) -/* BFEB78 802412F8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* BFEB7C 802412FC D7B40040 */ ldc1 $f20, 0x40($sp) -/* BFEB80 80241300 03E00008 */ jr $ra -/* BFEB84 80241304 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s new file mode 100644 index 0000000000..a92b11c029 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80240F78_BFE7F8.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F78_BFE7F8 +/* BFE7F8 80240F78 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BFE7FC 80240F7C AFB20030 */ sw $s2, 0x30($sp) +/* BFE800 80240F80 0080902D */ daddu $s2, $a0, $zero +/* BFE804 80240F84 AFBF0038 */ sw $ra, 0x38($sp) +/* BFE808 80240F88 AFB30034 */ sw $s3, 0x34($sp) +/* BFE80C 80240F8C AFB1002C */ sw $s1, 0x2c($sp) +/* BFE810 80240F90 AFB00028 */ sw $s0, 0x28($sp) +/* BFE814 80240F94 F7B60048 */ sdc1 $f22, 0x48($sp) +/* BFE818 80240F98 F7B40040 */ sdc1 $f20, 0x40($sp) +/* BFE81C 80240F9C 8E510148 */ lw $s1, 0x148($s2) +/* BFE820 80240FA0 86240008 */ lh $a0, 8($s1) +/* BFE824 80240FA4 0C00EABB */ jal get_npc_unsafe +/* BFE828 80240FA8 00A0982D */ daddu $s3, $a1, $zero +/* BFE82C 80240FAC 0040802D */ daddu $s0, $v0, $zero +/* BFE830 80240FB0 0200202D */ daddu $a0, $s0, $zero +/* BFE834 80240FB4 C6220088 */ lwc1 $f2, 0x88($s1) +/* BFE838 80240FB8 468010A0 */ cvt.s.w $f2, $f2 +/* BFE83C 80240FBC 460010A1 */ cvt.d.s $f2, $f2 +/* BFE840 80240FC0 C604001C */ lwc1 $f4, 0x1c($s0) +/* BFE844 80240FC4 C6000014 */ lwc1 $f0, 0x14($s0) +/* BFE848 80240FC8 8E050018 */ lw $a1, 0x18($s0) +/* BFE84C 80240FCC 46002100 */ add.s $f4, $f4, $f0 +/* BFE850 80240FD0 8E06000C */ lw $a2, 0xc($s0) +/* BFE854 80240FD4 C6200078 */ lwc1 $f0, 0x78($s1) +/* BFE858 80240FD8 46800020 */ cvt.s.w $f0, $f0 +/* BFE85C 80240FDC E604001C */ swc1 $f4, 0x1c($s0) +/* BFE860 80240FE0 3C014059 */ lui $at, 0x4059 +/* BFE864 80240FE4 44812800 */ mtc1 $at, $f5 +/* BFE868 80240FE8 44802000 */ mtc1 $zero, $f4 +/* BFE86C 80240FEC 46000021 */ cvt.d.s $f0, $f0 +/* BFE870 80240FF0 46240003 */ div.d $f0, $f0, $f4 +/* BFE874 80240FF4 46200520 */ cvt.s.d $f20, $f0 +/* BFE878 80240FF8 46241083 */ div.d $f2, $f2, $f4 +/* BFE87C 80240FFC 0C00EA95 */ jal npc_move_heading +/* BFE880 80241000 462015A0 */ cvt.s.d $f22, $f2 +/* BFE884 80241004 C604001C */ lwc1 $f4, 0x1c($s0) +/* BFE888 80241008 44801000 */ mtc1 $zero, $f2 +/* BFE88C 8024100C 44801800 */ mtc1 $zero, $f3 +/* BFE890 80241010 46002021 */ cvt.d.s $f0, $f4 +/* BFE894 80241014 4620103E */ c.le.d $f2, $f0 +/* BFE898 80241018 00000000 */ nop +/* BFE89C 8024101C 45000030 */ bc1f .L802410E0 +/* BFE8A0 80241020 00000000 */ nop +/* BFE8A4 80241024 C600003C */ lwc1 $f0, 0x3c($s0) +/* BFE8A8 80241028 46040000 */ add.s $f0, $f0, $f4 +/* BFE8AC 8024102C E600003C */ swc1 $f0, 0x3c($s0) +/* BFE8B0 80241030 8E2200CC */ lw $v0, 0xcc($s1) +/* BFE8B4 80241034 8C420024 */ lw $v0, 0x24($v0) +/* BFE8B8 80241038 AE020028 */ sw $v0, 0x28($s0) +/* BFE8BC 8024103C A2200007 */ sb $zero, 7($s1) +/* BFE8C0 80241040 8E020000 */ lw $v0, ($s0) +/* BFE8C4 80241044 30420008 */ andi $v0, $v0, 8 +/* BFE8C8 80241048 14400011 */ bnez $v0, .L80241090 +/* BFE8CC 8024104C 0000102D */ daddu $v0, $zero, $zero +/* BFE8D0 80241050 27A50018 */ addiu $a1, $sp, 0x18 +/* BFE8D4 80241054 27A6001C */ addiu $a2, $sp, 0x1c +/* BFE8D8 80241058 C6000038 */ lwc1 $f0, 0x38($s0) +/* BFE8DC 8024105C C602003C */ lwc1 $f2, 0x3c($s0) +/* BFE8E0 80241060 C6040040 */ lwc1 $f4, 0x40($s0) +/* BFE8E4 80241064 3C01447A */ lui $at, 0x447a +/* BFE8E8 80241068 44813000 */ mtc1 $at, $f6 +/* BFE8EC 8024106C 27A20024 */ addiu $v0, $sp, 0x24 +/* BFE8F0 80241070 E7A00018 */ swc1 $f0, 0x18($sp) +/* BFE8F4 80241074 E7A2001C */ swc1 $f2, 0x1c($sp) +/* BFE8F8 80241078 E7A40020 */ swc1 $f4, 0x20($sp) +/* BFE8FC 8024107C E7A60024 */ swc1 $f6, 0x24($sp) +/* BFE900 80241080 AFA20010 */ sw $v0, 0x10($sp) +/* BFE904 80241084 8E040080 */ lw $a0, 0x80($s0) +/* BFE908 80241088 0C0372DF */ jal func_800DCB7C +/* BFE90C 8024108C 27A70020 */ addiu $a3, $sp, 0x20 +.L80241090: +/* BFE910 80241090 1040000B */ beqz $v0, .L802410C0 +/* BFE914 80241094 00000000 */ nop +/* BFE918 80241098 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* BFE91C 8024109C 46140080 */ add.s $f2, $f0, $f20 +/* BFE920 802410A0 C600003C */ lwc1 $f0, 0x3c($s0) +/* BFE924 802410A4 4600103E */ c.le.s $f2, $f0 +/* BFE928 802410A8 00000000 */ nop +/* BFE92C 802410AC 4500008D */ bc1f .L802412E4 +/* BFE930 802410B0 00000000 */ nop +/* BFE934 802410B4 E602003C */ swc1 $f2, 0x3c($s0) +/* BFE938 802410B8 080904B9 */ j .L802412E4 +/* BFE93C 802410BC AE400070 */ sw $zero, 0x70($s2) +.L802410C0: +/* BFE940 802410C0 C602003C */ lwc1 $f2, 0x3c($s0) +/* BFE944 802410C4 C6000064 */ lwc1 $f0, 0x64($s0) +/* BFE948 802410C8 4602003E */ c.le.s $f0, $f2 +/* BFE94C 802410CC 00000000 */ nop +/* BFE950 802410D0 45030084 */ bc1tl .L802412E4 +/* BFE954 802410D4 AE400070 */ sw $zero, 0x70($s2) +/* BFE958 802410D8 080904B9 */ j .L802412E4 +/* BFE95C 802410DC 00000000 */ nop +.L802410E0: +/* BFE960 802410E0 4622003C */ c.lt.d $f0, $f2 +/* BFE964 802410E4 00000000 */ nop +/* BFE968 802410E8 4500007E */ bc1f .L802412E4 +/* BFE96C 802410EC 00000000 */ nop +/* BFE970 802410F0 9602008E */ lhu $v0, 0x8e($s0) +/* BFE974 802410F4 24420001 */ addiu $v0, $v0, 1 +/* BFE978 802410F8 A602008E */ sh $v0, 0x8e($s0) +/* BFE97C 802410FC 00021400 */ sll $v0, $v0, 0x10 +/* BFE980 80241100 8E630020 */ lw $v1, 0x20($s3) +/* BFE984 80241104 00021403 */ sra $v0, $v0, 0x10 +/* BFE988 80241108 0043102A */ slt $v0, $v0, $v1 +/* BFE98C 8024110C 14400026 */ bnez $v0, .L802411A8 +/* BFE990 80241110 00000000 */ nop +/* BFE994 80241114 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BFE998 80241118 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BFE99C 8024111C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BFE9A0 80241120 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BFE9A4 80241124 A600008E */ sh $zero, 0x8e($s0) +/* BFE9A8 80241128 8C460028 */ lw $a2, 0x28($v0) +/* BFE9AC 8024112C 0C00A720 */ jal atan2 +/* BFE9B0 80241130 8C470030 */ lw $a3, 0x30($v0) +/* BFE9B4 80241134 46000506 */ mov.s $f20, $f0 +/* BFE9B8 80241138 C60C000C */ lwc1 $f12, 0xc($s0) +/* BFE9BC 8024113C 0C00A70A */ jal get_clamped_angle_diff +/* BFE9C0 80241140 4600A386 */ mov.s $f14, $f20 +/* BFE9C4 80241144 46000086 */ mov.s $f2, $f0 +/* BFE9C8 80241148 8E62001C */ lw $v0, 0x1c($s3) +/* BFE9CC 8024114C 46001005 */ abs.s $f0, $f2 +/* BFE9D0 80241150 44822000 */ mtc1 $v0, $f4 +/* BFE9D4 80241154 00000000 */ nop +/* BFE9D8 80241158 46802120 */ cvt.s.w $f4, $f4 +/* BFE9DC 8024115C 4600203C */ c.lt.s $f4, $f0 +/* BFE9E0 80241160 00000000 */ nop +/* BFE9E4 80241164 4500000D */ bc1f .L8024119C +/* BFE9E8 80241168 00000000 */ nop +/* BFE9EC 8024116C 44800000 */ mtc1 $zero, $f0 +/* BFE9F0 80241170 C614000C */ lwc1 $f20, 0xc($s0) +/* BFE9F4 80241174 4600103C */ c.lt.s $f2, $f0 +/* BFE9F8 80241178 00000000 */ nop +/* BFE9FC 8024117C 45000006 */ bc1f .L80241198 +/* BFEA00 80241180 00021023 */ negu $v0, $v0 +/* BFEA04 80241184 44820000 */ mtc1 $v0, $f0 +/* BFEA08 80241188 00000000 */ nop +/* BFEA0C 8024118C 46800020 */ cvt.s.w $f0, $f0 +/* BFEA10 80241190 08090467 */ j .L8024119C +/* BFEA14 80241194 4600A500 */ add.s $f20, $f20, $f0 +.L80241198: +/* BFEA18 80241198 4604A500 */ add.s $f20, $f20, $f4 +.L8024119C: +/* BFEA1C 8024119C 0C00A6C9 */ jal clamp_angle +/* BFEA20 802411A0 4600A306 */ mov.s $f12, $f20 +/* BFEA24 802411A4 E600000C */ swc1 $f0, 0xc($s0) +.L802411A8: +/* BFEA28 802411A8 8E020000 */ lw $v0, ($s0) +/* BFEA2C 802411AC 30420008 */ andi $v0, $v0, 8 +/* BFEA30 802411B0 1040000A */ beqz $v0, .L802411DC +/* BFEA34 802411B4 27A50018 */ addiu $a1, $sp, 0x18 +/* BFEA38 802411B8 C602003C */ lwc1 $f2, 0x3c($s0) +/* BFEA3C 802411BC C600001C */ lwc1 $f0, 0x1c($s0) +/* BFEA40 802411C0 46001080 */ add.s $f2, $f2, $f0 +/* BFEA44 802411C4 4616103C */ c.lt.s $f2, $f22 +/* BFEA48 802411C8 00000000 */ nop +/* BFEA4C 802411CC 45020045 */ bc1fl .L802412E4 +/* BFEA50 802411D0 E602003C */ swc1 $f2, 0x3c($s0) +/* BFEA54 802411D4 080904B8 */ j .L802412E0 +/* BFEA58 802411D8 E616003C */ swc1 $f22, 0x3c($s0) +.L802411DC: +/* BFEA5C 802411DC C6000038 */ lwc1 $f0, 0x38($s0) +/* BFEA60 802411E0 27A6001C */ addiu $a2, $sp, 0x1c +/* BFEA64 802411E4 E7A00018 */ swc1 $f0, 0x18($sp) +/* BFEA68 802411E8 860200A8 */ lh $v0, 0xa8($s0) +/* BFEA6C 802411EC C600001C */ lwc1 $f0, 0x1c($s0) +/* BFEA70 802411F0 C604003C */ lwc1 $f4, 0x3c($s0) +/* BFEA74 802411F4 44821000 */ mtc1 $v0, $f2 +/* BFEA78 802411F8 00000000 */ nop +/* BFEA7C 802411FC 468010A0 */ cvt.s.w $f2, $f2 +/* BFEA80 80241200 46000005 */ abs.s $f0, $f0 +/* BFEA84 80241204 46020000 */ add.s $f0, $f0, $f2 +/* BFEA88 80241208 C6060040 */ lwc1 $f6, 0x40($s0) +/* BFEA8C 8024120C 27A20024 */ addiu $v0, $sp, 0x24 +/* BFEA90 80241210 46022100 */ add.s $f4, $f4, $f2 +/* BFEA94 80241214 3C014024 */ lui $at, 0x4024 +/* BFEA98 80241218 44811800 */ mtc1 $at, $f3 +/* BFEA9C 8024121C 44801000 */ mtc1 $zero, $f2 +/* BFEAA0 80241220 46000021 */ cvt.d.s $f0, $f0 +/* BFEAA4 80241224 46220000 */ add.d $f0, $f0, $f2 +/* BFEAA8 80241228 E7A60020 */ swc1 $f6, 0x20($sp) +/* BFEAAC 8024122C E7A4001C */ swc1 $f4, 0x1c($sp) +/* BFEAB0 80241230 46200020 */ cvt.s.d $f0, $f0 +/* BFEAB4 80241234 E7A00024 */ swc1 $f0, 0x24($sp) +/* BFEAB8 80241238 AFA20010 */ sw $v0, 0x10($sp) +/* BFEABC 8024123C 8E040080 */ lw $a0, 0x80($s0) +/* BFEAC0 80241240 0C0372DF */ jal func_800DCB7C +/* BFEAC4 80241244 27A70020 */ addiu $a3, $sp, 0x20 +/* BFEAC8 80241248 10400015 */ beqz $v0, .L802412A0 +/* BFEACC 8024124C 00000000 */ nop +/* BFEAD0 80241250 860200A8 */ lh $v0, 0xa8($s0) +/* BFEAD4 80241254 C604001C */ lwc1 $f4, 0x1c($s0) +/* BFEAD8 80241258 44820000 */ mtc1 $v0, $f0 +/* BFEADC 8024125C 00000000 */ nop +/* BFEAE0 80241260 46800020 */ cvt.s.w $f0, $f0 +/* BFEAE4 80241264 46002085 */ abs.s $f2, $f4 +/* BFEAE8 80241268 46020000 */ add.s $f0, $f0, $f2 +/* BFEAEC 8024126C C7A20024 */ lwc1 $f2, 0x24($sp) +/* BFEAF0 80241270 4600103E */ c.le.s $f2, $f0 +/* BFEAF4 80241274 00000000 */ nop +/* BFEAF8 80241278 45000005 */ bc1f .L80241290 +/* BFEAFC 8024127C 00000000 */ nop +/* BFEB00 80241280 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* BFEB04 80241284 AE00001C */ sw $zero, 0x1c($s0) +/* BFEB08 80241288 080904B9 */ j .L802412E4 +/* BFEB0C 8024128C E600003C */ swc1 $f0, 0x3c($s0) +.L80241290: +/* BFEB10 80241290 C600003C */ lwc1 $f0, 0x3c($s0) +/* BFEB14 80241294 46040000 */ add.s $f0, $f0, $f4 +/* BFEB18 80241298 080904B9 */ j .L802412E4 +/* BFEB1C 8024129C E600003C */ swc1 $f0, 0x3c($s0) +.L802412A0: +/* BFEB20 802412A0 C606003C */ lwc1 $f6, 0x3c($s0) +/* BFEB24 802412A4 860200A8 */ lh $v0, 0xa8($s0) +/* BFEB28 802412A8 46163081 */ sub.s $f2, $f6, $f22 +/* BFEB2C 802412AC 44820000 */ mtc1 $v0, $f0 +/* BFEB30 802412B0 00000000 */ nop +/* BFEB34 802412B4 46800020 */ cvt.s.w $f0, $f0 +/* BFEB38 802412B8 46001080 */ add.s $f2, $f2, $f0 +/* BFEB3C 802412BC C604001C */ lwc1 $f4, 0x1c($s0) +/* BFEB40 802412C0 46002005 */ abs.s $f0, $f4 +/* BFEB44 802412C4 4602003C */ c.lt.s $f0, $f2 +/* BFEB48 802412C8 00000000 */ nop +/* BFEB4C 802412CC 45020005 */ bc1fl .L802412E4 +/* BFEB50 802412D0 AE00001C */ sw $zero, 0x1c($s0) +/* BFEB54 802412D4 46043000 */ add.s $f0, $f6, $f4 +/* BFEB58 802412D8 080904B9 */ j .L802412E4 +/* BFEB5C 802412DC E600003C */ swc1 $f0, 0x3c($s0) +.L802412E0: +/* BFEB60 802412E0 AE00001C */ sw $zero, 0x1c($s0) +.L802412E4: +/* BFEB64 802412E4 8FBF0038 */ lw $ra, 0x38($sp) +/* BFEB68 802412E8 8FB30034 */ lw $s3, 0x34($sp) +/* BFEB6C 802412EC 8FB20030 */ lw $s2, 0x30($sp) +/* BFEB70 802412F0 8FB1002C */ lw $s1, 0x2c($sp) +/* BFEB74 802412F4 8FB00028 */ lw $s0, 0x28($sp) +/* BFEB78 802412F8 D7B60048 */ ldc1 $f22, 0x48($sp) +/* BFEB7C 802412FC D7B40040 */ ldc1 $f20, 0x40($sp) +/* BFEB80 80241300 03E00008 */ jr $ra +/* BFEB84 80241304 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308.s deleted file mode 100644 index 9e15f222bf..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241308 -/* BFEB88 80241308 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BFEB8C 8024130C AFB00028 */ sw $s0, 0x28($sp) -/* BFEB90 80241310 00A0802D */ daddu $s0, $a1, $zero -/* BFEB94 80241314 AFB1002C */ sw $s1, 0x2c($sp) -/* BFEB98 80241318 00C0882D */ daddu $s1, $a2, $zero -/* BFEB9C 8024131C AFBF0034 */ sw $ra, 0x34($sp) -/* BFEBA0 80241320 AFB20030 */ sw $s2, 0x30($sp) -/* BFEBA4 80241324 AE200070 */ sw $zero, 0x70($s1) -/* BFEBA8 80241328 8C830000 */ lw $v1, ($a0) -/* BFEBAC 8024132C 2402FDFF */ addiu $v0, $zero, -0x201 -/* BFEBB0 80241330 A480008E */ sh $zero, 0x8e($a0) -/* BFEBB4 80241334 00621824 */ and $v1, $v1, $v0 -/* BFEBB8 80241338 34650800 */ ori $a1, $v1, 0x800 -/* BFEBBC 8024133C AC850000 */ sw $a1, ($a0) -/* BFEBC0 80241340 8E0200D0 */ lw $v0, 0xd0($s0) -/* BFEBC4 80241344 8C420034 */ lw $v0, 0x34($v0) -/* BFEBC8 80241348 10400003 */ beqz $v0, .L80241358 -/* BFEBCC 8024134C 00E0902D */ daddu $s2, $a3, $zero -/* BFEBD0 80241350 080904D8 */ j .L80241360 -/* BFEBD4 80241354 34620808 */ ori $v0, $v1, 0x808 -.L80241358: -/* BFEBD8 80241358 2402FFF7 */ addiu $v0, $zero, -9 -/* BFEBDC 8024135C 00A21024 */ and $v0, $a1, $v0 -.L80241360: -/* BFEBE0 80241360 AC820000 */ sw $v0, ($a0) -/* BFEBE4 80241364 27A20024 */ addiu $v0, $sp, 0x24 -/* BFEBE8 80241368 27A50018 */ addiu $a1, $sp, 0x18 -/* BFEBEC 8024136C C4800038 */ lwc1 $f0, 0x38($a0) -/* BFEBF0 80241370 C482003C */ lwc1 $f2, 0x3c($a0) -/* BFEBF4 80241374 C4840040 */ lwc1 $f4, 0x40($a0) -/* BFEBF8 80241378 3C01447A */ lui $at, 0x447a -/* BFEBFC 8024137C 44813000 */ mtc1 $at, $f6 -/* BFEC00 80241380 27A6001C */ addiu $a2, $sp, 0x1c -/* BFEC04 80241384 E7A00018 */ swc1 $f0, 0x18($sp) -/* BFEC08 80241388 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BFEC0C 8024138C E7A40020 */ swc1 $f4, 0x20($sp) -/* BFEC10 80241390 E7A60024 */ swc1 $f6, 0x24($sp) -/* BFEC14 80241394 AFA20010 */ sw $v0, 0x10($sp) -/* BFEC18 80241398 8C840080 */ lw $a0, 0x80($a0) -/* BFEC1C 8024139C 0C0372DF */ jal func_800DCB7C -/* BFEC20 802413A0 27A70020 */ addiu $a3, $sp, 0x20 -/* BFEC24 802413A4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* BFEC28 802413A8 3C014059 */ lui $at, 0x4059 -/* BFEC2C 802413AC 44812800 */ mtc1 $at, $f5 -/* BFEC30 802413B0 44802000 */ mtc1 $zero, $f4 -/* BFEC34 802413B4 460010A1 */ cvt.d.s $f2, $f2 -/* BFEC38 802413B8 46241082 */ mul.d $f2, $f2, $f4 -/* BFEC3C 802413BC 00000000 */ nop -/* BFEC40 802413C0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BFEC44 802413C4 46000021 */ cvt.d.s $f0, $f0 -/* BFEC48 802413C8 46240002 */ mul.d $f0, $f0, $f4 -/* BFEC4C 802413CC 00000000 */ nop -/* BFEC50 802413D0 3C013FE0 */ lui $at, 0x3fe0 -/* BFEC54 802413D4 44812800 */ mtc1 $at, $f5 -/* BFEC58 802413D8 44802000 */ mtc1 $zero, $f4 -/* BFEC5C 802413DC 00000000 */ nop -/* BFEC60 802413E0 46241080 */ add.d $f2, $f2, $f4 -/* BFEC64 802413E4 AE000074 */ sw $zero, 0x74($s0) -/* BFEC68 802413E8 46240000 */ add.d $f0, $f0, $f4 -/* BFEC6C 802413EC AE000090 */ sw $zero, 0x90($s0) -/* BFEC70 802413F0 4620120D */ trunc.w.d $f8, $f2 -/* BFEC74 802413F4 E6080078 */ swc1 $f8, 0x78($s0) -/* BFEC78 802413F8 4620020D */ trunc.w.d $f8, $f0 -/* BFEC7C 802413FC E6080088 */ swc1 $f8, 0x88($s0) -/* BFEC80 80241400 8E420014 */ lw $v0, 0x14($s2) -/* BFEC84 80241404 AE220074 */ sw $v0, 0x74($s1) -/* BFEC88 80241408 8E0200B0 */ lw $v0, 0xb0($s0) -/* BFEC8C 8024140C 34420010 */ ori $v0, $v0, 0x10 -/* BFEC90 80241410 AE0200B0 */ sw $v0, 0xb0($s0) -/* BFEC94 80241414 8FBF0034 */ lw $ra, 0x34($sp) -/* BFEC98 80241418 8FB20030 */ lw $s2, 0x30($sp) -/* BFEC9C 8024141C 8FB1002C */ lw $s1, 0x2c($sp) -/* BFECA0 80241420 8FB00028 */ lw $s0, 0x28($sp) -/* BFECA4 80241424 03E00008 */ jr $ra -/* BFECA8 80241428 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s new file mode 100644 index 0000000000..087e6894bd --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241308_BFEB88.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241308_BFEB88 +/* BFEB88 80241308 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* BFEB8C 8024130C AFB00028 */ sw $s0, 0x28($sp) +/* BFEB90 80241310 00A0802D */ daddu $s0, $a1, $zero +/* BFEB94 80241314 AFB1002C */ sw $s1, 0x2c($sp) +/* BFEB98 80241318 00C0882D */ daddu $s1, $a2, $zero +/* BFEB9C 8024131C AFBF0034 */ sw $ra, 0x34($sp) +/* BFEBA0 80241320 AFB20030 */ sw $s2, 0x30($sp) +/* BFEBA4 80241324 AE200070 */ sw $zero, 0x70($s1) +/* BFEBA8 80241328 8C830000 */ lw $v1, ($a0) +/* BFEBAC 8024132C 2402FDFF */ addiu $v0, $zero, -0x201 +/* BFEBB0 80241330 A480008E */ sh $zero, 0x8e($a0) +/* BFEBB4 80241334 00621824 */ and $v1, $v1, $v0 +/* BFEBB8 80241338 34650800 */ ori $a1, $v1, 0x800 +/* BFEBBC 8024133C AC850000 */ sw $a1, ($a0) +/* BFEBC0 80241340 8E0200D0 */ lw $v0, 0xd0($s0) +/* BFEBC4 80241344 8C420034 */ lw $v0, 0x34($v0) +/* BFEBC8 80241348 10400003 */ beqz $v0, .L80241358 +/* BFEBCC 8024134C 00E0902D */ daddu $s2, $a3, $zero +/* BFEBD0 80241350 080904D8 */ j .L80241360 +/* BFEBD4 80241354 34620808 */ ori $v0, $v1, 0x808 +.L80241358: +/* BFEBD8 80241358 2402FFF7 */ addiu $v0, $zero, -9 +/* BFEBDC 8024135C 00A21024 */ and $v0, $a1, $v0 +.L80241360: +/* BFEBE0 80241360 AC820000 */ sw $v0, ($a0) +/* BFEBE4 80241364 27A20024 */ addiu $v0, $sp, 0x24 +/* BFEBE8 80241368 27A50018 */ addiu $a1, $sp, 0x18 +/* BFEBEC 8024136C C4800038 */ lwc1 $f0, 0x38($a0) +/* BFEBF0 80241370 C482003C */ lwc1 $f2, 0x3c($a0) +/* BFEBF4 80241374 C4840040 */ lwc1 $f4, 0x40($a0) +/* BFEBF8 80241378 3C01447A */ lui $at, 0x447a +/* BFEBFC 8024137C 44813000 */ mtc1 $at, $f6 +/* BFEC00 80241380 27A6001C */ addiu $a2, $sp, 0x1c +/* BFEC04 80241384 E7A00018 */ swc1 $f0, 0x18($sp) +/* BFEC08 80241388 E7A2001C */ swc1 $f2, 0x1c($sp) +/* BFEC0C 8024138C E7A40020 */ swc1 $f4, 0x20($sp) +/* BFEC10 80241390 E7A60024 */ swc1 $f6, 0x24($sp) +/* BFEC14 80241394 AFA20010 */ sw $v0, 0x10($sp) +/* BFEC18 80241398 8C840080 */ lw $a0, 0x80($a0) +/* BFEC1C 8024139C 0C0372DF */ jal func_800DCB7C +/* BFEC20 802413A0 27A70020 */ addiu $a3, $sp, 0x20 +/* BFEC24 802413A4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* BFEC28 802413A8 3C014059 */ lui $at, 0x4059 +/* BFEC2C 802413AC 44812800 */ mtc1 $at, $f5 +/* BFEC30 802413B0 44802000 */ mtc1 $zero, $f4 +/* BFEC34 802413B4 460010A1 */ cvt.d.s $f2, $f2 +/* BFEC38 802413B8 46241082 */ mul.d $f2, $f2, $f4 +/* BFEC3C 802413BC 00000000 */ nop +/* BFEC40 802413C0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* BFEC44 802413C4 46000021 */ cvt.d.s $f0, $f0 +/* BFEC48 802413C8 46240002 */ mul.d $f0, $f0, $f4 +/* BFEC4C 802413CC 00000000 */ nop +/* BFEC50 802413D0 3C013FE0 */ lui $at, 0x3fe0 +/* BFEC54 802413D4 44812800 */ mtc1 $at, $f5 +/* BFEC58 802413D8 44802000 */ mtc1 $zero, $f4 +/* BFEC5C 802413DC 00000000 */ nop +/* BFEC60 802413E0 46241080 */ add.d $f2, $f2, $f4 +/* BFEC64 802413E4 AE000074 */ sw $zero, 0x74($s0) +/* BFEC68 802413E8 46240000 */ add.d $f0, $f0, $f4 +/* BFEC6C 802413EC AE000090 */ sw $zero, 0x90($s0) +/* BFEC70 802413F0 4620120D */ trunc.w.d $f8, $f2 +/* BFEC74 802413F4 E6080078 */ swc1 $f8, 0x78($s0) +/* BFEC78 802413F8 4620020D */ trunc.w.d $f8, $f0 +/* BFEC7C 802413FC E6080088 */ swc1 $f8, 0x88($s0) +/* BFEC80 80241400 8E420014 */ lw $v0, 0x14($s2) +/* BFEC84 80241404 AE220074 */ sw $v0, 0x74($s1) +/* BFEC88 80241408 8E0200B0 */ lw $v0, 0xb0($s0) +/* BFEC8C 8024140C 34420010 */ ori $v0, $v0, 0x10 +/* BFEC90 80241410 AE0200B0 */ sw $v0, 0xb0($s0) +/* BFEC94 80241414 8FBF0034 */ lw $ra, 0x34($sp) +/* BFEC98 80241418 8FB20030 */ lw $s2, 0x30($sp) +/* BFEC9C 8024141C 8FB1002C */ lw $s1, 0x2c($sp) +/* BFECA0 80241420 8FB00028 */ lw $s0, 0x28($sp) +/* BFECA4 80241424 03E00008 */ jr $ra +/* BFECA8 80241428 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C.s deleted file mode 100644 index eb4b0f68aa..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024142C -/* BFECAC 8024142C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BFECB0 80241430 AFB40040 */ sw $s4, 0x40($sp) -/* BFECB4 80241434 0080A02D */ daddu $s4, $a0, $zero -/* BFECB8 80241438 AFBF0048 */ sw $ra, 0x48($sp) -/* BFECBC 8024143C AFB50044 */ sw $s5, 0x44($sp) -/* BFECC0 80241440 AFB3003C */ sw $s3, 0x3c($sp) -/* BFECC4 80241444 AFB20038 */ sw $s2, 0x38($sp) -/* BFECC8 80241448 AFB10034 */ sw $s1, 0x34($sp) -/* BFECCC 8024144C AFB00030 */ sw $s0, 0x30($sp) -/* BFECD0 80241450 8E920148 */ lw $s2, 0x148($s4) -/* BFECD4 80241454 86440008 */ lh $a0, 8($s2) -/* BFECD8 80241458 8E90000C */ lw $s0, 0xc($s4) -/* BFECDC 8024145C 0C00EABB */ jal get_npc_unsafe -/* BFECE0 80241460 00A0882D */ daddu $s1, $a1, $zero -/* BFECE4 80241464 0280202D */ daddu $a0, $s4, $zero -/* BFECE8 80241468 8E050000 */ lw $a1, ($s0) -/* BFECEC 8024146C 0C0B1EAF */ jal get_variable -/* BFECF0 80241470 0040A82D */ daddu $s5, $v0, $zero -/* BFECF4 80241474 AFA00010 */ sw $zero, 0x10($sp) -/* BFECF8 80241478 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFECFC 8024147C 8C630030 */ lw $v1, 0x30($v1) -/* BFED00 80241480 AFA30014 */ sw $v1, 0x14($sp) -/* BFED04 80241484 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFED08 80241488 8C63001C */ lw $v1, 0x1c($v1) -/* BFED0C 8024148C AFA30018 */ sw $v1, 0x18($sp) -/* BFED10 80241490 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFED14 80241494 8C630024 */ lw $v1, 0x24($v1) -/* BFED18 80241498 AFA3001C */ sw $v1, 0x1c($sp) -/* BFED1C 8024149C 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFED20 802414A0 8C630028 */ lw $v1, 0x28($v1) -/* BFED24 802414A4 27B30010 */ addiu $s3, $sp, 0x10 -/* BFED28 802414A8 AFA30020 */ sw $v1, 0x20($sp) -/* BFED2C 802414AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* BFED30 802414B0 3C0142F0 */ lui $at, 0x42f0 -/* BFED34 802414B4 44810000 */ mtc1 $at, $f0 -/* BFED38 802414B8 8C63002C */ lw $v1, 0x2c($v1) -/* BFED3C 802414BC 0040802D */ daddu $s0, $v0, $zero -/* BFED40 802414C0 E7A00028 */ swc1 $f0, 0x28($sp) -/* BFED44 802414C4 A7A0002C */ sh $zero, 0x2c($sp) -/* BFED48 802414C8 12200006 */ beqz $s1, .L802414E4 -/* BFED4C 802414CC AFA30024 */ sw $v1, 0x24($sp) -/* BFED50 802414D0 02A0202D */ daddu $a0, $s5, $zero -/* BFED54 802414D4 0240282D */ daddu $a1, $s2, $zero -/* BFED58 802414D8 0280302D */ daddu $a2, $s4, $zero -/* BFED5C 802414DC 0C0904C2 */ jal func_80241308 -/* BFED60 802414E0 0200382D */ daddu $a3, $s0, $zero -.L802414E4: -/* BFED64 802414E4 2402FFFE */ addiu $v0, $zero, -2 -/* BFED68 802414E8 A2A200AB */ sb $v0, 0xab($s5) -/* BFED6C 802414EC 8E4300B0 */ lw $v1, 0xb0($s2) -/* BFED70 802414F0 30620004 */ andi $v0, $v1, 4 -/* BFED74 802414F4 10400007 */ beqz $v0, .L80241514 -/* BFED78 802414F8 00000000 */ nop -/* BFED7C 802414FC 824200B4 */ lb $v0, 0xb4($s2) -/* BFED80 80241500 1440003C */ bnez $v0, .L802415F4 -/* BFED84 80241504 0000102D */ daddu $v0, $zero, $zero -/* BFED88 80241508 2402FFFB */ addiu $v0, $zero, -5 -/* BFED8C 8024150C 00621024 */ and $v0, $v1, $v0 -/* BFED90 80241510 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241514: -/* BFED94 80241514 8E830070 */ lw $v1, 0x70($s4) -/* BFED98 80241518 2C62000F */ sltiu $v0, $v1, 0xf -/* BFED9C 8024151C 10400034 */ beqz $v0, .L802415F0 -/* BFEDA0 80241520 00031080 */ sll $v0, $v1, 2 -/* BFEDA4 80241524 3C018026 */ lui $at, 0x8026 -/* BFEDA8 80241528 00220821 */ addu $at, $at, $v0 -/* BFEDAC 8024152C 8C223438 */ lw $v0, 0x3438($at) -/* BFEDB0 80241530 00400008 */ jr $v0 -/* BFEDB4 80241534 00000000 */ nop -/* BFEDB8 80241538 0280202D */ daddu $a0, $s4, $zero -/* BFEDBC 8024153C 0200282D */ daddu $a1, $s0, $zero -/* BFEDC0 80241540 0C090048 */ jal func_80240120 -/* BFEDC4 80241544 0260302D */ daddu $a2, $s3, $zero -/* BFEDC8 80241548 0280202D */ daddu $a0, $s4, $zero -/* BFEDCC 8024154C 0200282D */ daddu $a1, $s0, $zero -/* BFEDD0 80241550 0C0900B4 */ jal func_802402D0 -/* BFEDD4 80241554 0260302D */ daddu $a2, $s3, $zero -/* BFEDD8 80241558 0809057D */ j .L802415F4 -/* BFEDDC 8024155C 0000102D */ daddu $v0, $zero, $zero -/* BFEDE0 80241560 0280202D */ daddu $a0, $s4, $zero -/* BFEDE4 80241564 0200282D */ daddu $a1, $s0, $zero -/* BFEDE8 80241568 0C09023E */ jal func_802408F8 -/* BFEDEC 8024156C 0260302D */ daddu $a2, $s3, $zero -/* BFEDF0 80241570 0280202D */ daddu $a0, $s4, $zero -/* BFEDF4 80241574 0200282D */ daddu $a1, $s0, $zero -/* BFEDF8 80241578 0C09026E */ jal func_802409B8 -/* BFEDFC 8024157C 0260302D */ daddu $a2, $s3, $zero -/* BFEE00 80241580 0809057D */ j .L802415F4 -/* BFEE04 80241584 0000102D */ daddu $v0, $zero, $zero -/* BFEE08 80241588 0280202D */ daddu $a0, $s4, $zero -/* BFEE0C 8024158C 0200282D */ daddu $a1, $s0, $zero -/* BFEE10 80241590 0C09033F */ jal func_80240CFC -/* BFEE14 80241594 0260302D */ daddu $a2, $s3, $zero -/* BFEE18 80241598 0280202D */ daddu $a0, $s4, $zero -/* BFEE1C 8024159C 0200282D */ daddu $a1, $s0, $zero -/* BFEE20 802415A0 0C09035D */ jal func_80240D74 -/* BFEE24 802415A4 0260302D */ daddu $a2, $s3, $zero -/* BFEE28 802415A8 0809057D */ j .L802415F4 -/* BFEE2C 802415AC 0000102D */ daddu $v0, $zero, $zero -/* BFEE30 802415B0 0280202D */ daddu $a0, $s4, $zero -/* BFEE34 802415B4 0200282D */ daddu $a1, $s0, $zero -/* BFEE38 802415B8 0C090378 */ jal func_80240DE0 -/* BFEE3C 802415BC 0260302D */ daddu $a2, $s3, $zero -/* BFEE40 802415C0 0809057D */ j .L802415F4 -/* BFEE44 802415C4 0000102D */ daddu $v0, $zero, $zero -/* BFEE48 802415C8 0280202D */ daddu $a0, $s4, $zero -/* BFEE4C 802415CC 0200282D */ daddu $a1, $s0, $zero -/* BFEE50 802415D0 0C0903C5 */ jal func_80240F14 -/* BFEE54 802415D4 0260302D */ daddu $a2, $s3, $zero -/* BFEE58 802415D8 0809057D */ j .L802415F4 -/* BFEE5C 802415DC 0000102D */ daddu $v0, $zero, $zero -/* BFEE60 802415E0 0280202D */ daddu $a0, $s4, $zero -/* BFEE64 802415E4 0200282D */ daddu $a1, $s0, $zero -/* BFEE68 802415E8 0C0903DE */ jal func_80240F78 -/* BFEE6C 802415EC 0260302D */ daddu $a2, $s3, $zero -.L802415F0: -/* BFEE70 802415F0 0000102D */ daddu $v0, $zero, $zero -.L802415F4: -/* BFEE74 802415F4 8FBF0048 */ lw $ra, 0x48($sp) -/* BFEE78 802415F8 8FB50044 */ lw $s5, 0x44($sp) -/* BFEE7C 802415FC 8FB40040 */ lw $s4, 0x40($sp) -/* BFEE80 80241600 8FB3003C */ lw $s3, 0x3c($sp) -/* BFEE84 80241604 8FB20038 */ lw $s2, 0x38($sp) -/* BFEE88 80241608 8FB10034 */ lw $s1, 0x34($sp) -/* BFEE8C 8024160C 8FB00030 */ lw $s0, 0x30($sp) -/* BFEE90 80241610 03E00008 */ jr $ra -/* BFEE94 80241614 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s new file mode 100644 index 0000000000..e1acd9ab29 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024142C_BFECAC.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024142C_BFECAC +/* BFECAC 8024142C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BFECB0 80241430 AFB40040 */ sw $s4, 0x40($sp) +/* BFECB4 80241434 0080A02D */ daddu $s4, $a0, $zero +/* BFECB8 80241438 AFBF0048 */ sw $ra, 0x48($sp) +/* BFECBC 8024143C AFB50044 */ sw $s5, 0x44($sp) +/* BFECC0 80241440 AFB3003C */ sw $s3, 0x3c($sp) +/* BFECC4 80241444 AFB20038 */ sw $s2, 0x38($sp) +/* BFECC8 80241448 AFB10034 */ sw $s1, 0x34($sp) +/* BFECCC 8024144C AFB00030 */ sw $s0, 0x30($sp) +/* BFECD0 80241450 8E920148 */ lw $s2, 0x148($s4) +/* BFECD4 80241454 86440008 */ lh $a0, 8($s2) +/* BFECD8 80241458 8E90000C */ lw $s0, 0xc($s4) +/* BFECDC 8024145C 0C00EABB */ jal get_npc_unsafe +/* BFECE0 80241460 00A0882D */ daddu $s1, $a1, $zero +/* BFECE4 80241464 0280202D */ daddu $a0, $s4, $zero +/* BFECE8 80241468 8E050000 */ lw $a1, ($s0) +/* BFECEC 8024146C 0C0B1EAF */ jal get_variable +/* BFECF0 80241470 0040A82D */ daddu $s5, $v0, $zero +/* BFECF4 80241474 AFA00010 */ sw $zero, 0x10($sp) +/* BFECF8 80241478 8E4300D0 */ lw $v1, 0xd0($s2) +/* BFECFC 8024147C 8C630030 */ lw $v1, 0x30($v1) +/* BFED00 80241480 AFA30014 */ sw $v1, 0x14($sp) +/* BFED04 80241484 8E4300D0 */ lw $v1, 0xd0($s2) +/* BFED08 80241488 8C63001C */ lw $v1, 0x1c($v1) +/* BFED0C 8024148C AFA30018 */ sw $v1, 0x18($sp) +/* BFED10 80241490 8E4300D0 */ lw $v1, 0xd0($s2) +/* BFED14 80241494 8C630024 */ lw $v1, 0x24($v1) +/* BFED18 80241498 AFA3001C */ sw $v1, 0x1c($sp) +/* BFED1C 8024149C 8E4300D0 */ lw $v1, 0xd0($s2) +/* BFED20 802414A0 8C630028 */ lw $v1, 0x28($v1) +/* BFED24 802414A4 27B30010 */ addiu $s3, $sp, 0x10 +/* BFED28 802414A8 AFA30020 */ sw $v1, 0x20($sp) +/* BFED2C 802414AC 8E4300D0 */ lw $v1, 0xd0($s2) +/* BFED30 802414B0 3C0142F0 */ lui $at, 0x42f0 +/* BFED34 802414B4 44810000 */ mtc1 $at, $f0 +/* BFED38 802414B8 8C63002C */ lw $v1, 0x2c($v1) +/* BFED3C 802414BC 0040802D */ daddu $s0, $v0, $zero +/* BFED40 802414C0 E7A00028 */ swc1 $f0, 0x28($sp) +/* BFED44 802414C4 A7A0002C */ sh $zero, 0x2c($sp) +/* BFED48 802414C8 12200006 */ beqz $s1, .L802414E4 +/* BFED4C 802414CC AFA30024 */ sw $v1, 0x24($sp) +/* BFED50 802414D0 02A0202D */ daddu $a0, $s5, $zero +/* BFED54 802414D4 0240282D */ daddu $a1, $s2, $zero +/* BFED58 802414D8 0280302D */ daddu $a2, $s4, $zero +/* BFED5C 802414DC 0C0904C2 */ jal func_80241308_BFEB88 +/* BFED60 802414E0 0200382D */ daddu $a3, $s0, $zero +.L802414E4: +/* BFED64 802414E4 2402FFFE */ addiu $v0, $zero, -2 +/* BFED68 802414E8 A2A200AB */ sb $v0, 0xab($s5) +/* BFED6C 802414EC 8E4300B0 */ lw $v1, 0xb0($s2) +/* BFED70 802414F0 30620004 */ andi $v0, $v1, 4 +/* BFED74 802414F4 10400007 */ beqz $v0, .L80241514 +/* BFED78 802414F8 00000000 */ nop +/* BFED7C 802414FC 824200B4 */ lb $v0, 0xb4($s2) +/* BFED80 80241500 1440003C */ bnez $v0, .L802415F4 +/* BFED84 80241504 0000102D */ daddu $v0, $zero, $zero +/* BFED88 80241508 2402FFFB */ addiu $v0, $zero, -5 +/* BFED8C 8024150C 00621024 */ and $v0, $v1, $v0 +/* BFED90 80241510 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241514: +/* BFED94 80241514 8E830070 */ lw $v1, 0x70($s4) +/* BFED98 80241518 2C62000F */ sltiu $v0, $v1, 0xf +/* BFED9C 8024151C 10400034 */ beqz $v0, .L802415F0 +/* BFEDA0 80241520 00031080 */ sll $v0, $v1, 2 +/* BFEDA4 80241524 3C018026 */ lui $at, 0x8026 +/* BFEDA8 80241528 00220821 */ addu $at, $at, $v0 +/* BFEDAC 8024152C 8C223438 */ lw $v0, 0x3438($at) +/* BFEDB0 80241530 00400008 */ jr $v0 +/* BFEDB4 80241534 00000000 */ nop +/* BFEDB8 80241538 0280202D */ daddu $a0, $s4, $zero +/* BFEDBC 8024153C 0200282D */ daddu $a1, $s0, $zero +/* BFEDC0 80241540 0C090048 */ jal func_80240120_BFD9A0 +/* BFEDC4 80241544 0260302D */ daddu $a2, $s3, $zero +/* BFEDC8 80241548 0280202D */ daddu $a0, $s4, $zero +/* BFEDCC 8024154C 0200282D */ daddu $a1, $s0, $zero +/* BFEDD0 80241550 0C0900B4 */ jal func_802402D0_BFDB50 +/* BFEDD4 80241554 0260302D */ daddu $a2, $s3, $zero +/* BFEDD8 80241558 0809057D */ j .L802415F4 +/* BFEDDC 8024155C 0000102D */ daddu $v0, $zero, $zero +/* BFEDE0 80241560 0280202D */ daddu $a0, $s4, $zero +/* BFEDE4 80241564 0200282D */ daddu $a1, $s0, $zero +/* BFEDE8 80241568 0C09023E */ jal func_802408F8_BFE178 +/* BFEDEC 8024156C 0260302D */ daddu $a2, $s3, $zero +/* BFEDF0 80241570 0280202D */ daddu $a0, $s4, $zero +/* BFEDF4 80241574 0200282D */ daddu $a1, $s0, $zero +/* BFEDF8 80241578 0C09026E */ jal func_802409B8_BFE238 +/* BFEDFC 8024157C 0260302D */ daddu $a2, $s3, $zero +/* BFEE00 80241580 0809057D */ j .L802415F4 +/* BFEE04 80241584 0000102D */ daddu $v0, $zero, $zero +/* BFEE08 80241588 0280202D */ daddu $a0, $s4, $zero +/* BFEE0C 8024158C 0200282D */ daddu $a1, $s0, $zero +/* BFEE10 80241590 0C09033F */ jal func_80240CFC_BFE57C +/* BFEE14 80241594 0260302D */ daddu $a2, $s3, $zero +/* BFEE18 80241598 0280202D */ daddu $a0, $s4, $zero +/* BFEE1C 8024159C 0200282D */ daddu $a1, $s0, $zero +/* BFEE20 802415A0 0C09035D */ jal func_80240D74_BFE5F4 +/* BFEE24 802415A4 0260302D */ daddu $a2, $s3, $zero +/* BFEE28 802415A8 0809057D */ j .L802415F4 +/* BFEE2C 802415AC 0000102D */ daddu $v0, $zero, $zero +/* BFEE30 802415B0 0280202D */ daddu $a0, $s4, $zero +/* BFEE34 802415B4 0200282D */ daddu $a1, $s0, $zero +/* BFEE38 802415B8 0C090378 */ jal func_80240DE0_BFE660 +/* BFEE3C 802415BC 0260302D */ daddu $a2, $s3, $zero +/* BFEE40 802415C0 0809057D */ j .L802415F4 +/* BFEE44 802415C4 0000102D */ daddu $v0, $zero, $zero +/* BFEE48 802415C8 0280202D */ daddu $a0, $s4, $zero +/* BFEE4C 802415CC 0200282D */ daddu $a1, $s0, $zero +/* BFEE50 802415D0 0C0903C5 */ jal func_80240F14_BFE794 +/* BFEE54 802415D4 0260302D */ daddu $a2, $s3, $zero +/* BFEE58 802415D8 0809057D */ j .L802415F4 +/* BFEE5C 802415DC 0000102D */ daddu $v0, $zero, $zero +/* BFEE60 802415E0 0280202D */ daddu $a0, $s4, $zero +/* BFEE64 802415E4 0200282D */ daddu $a1, $s0, $zero +/* BFEE68 802415E8 0C0903DE */ jal func_80240F78_BFE7F8 +/* BFEE6C 802415EC 0260302D */ daddu $a2, $s3, $zero +.L802415F0: +/* BFEE70 802415F0 0000102D */ daddu $v0, $zero, $zero +.L802415F4: +/* BFEE74 802415F4 8FBF0048 */ lw $ra, 0x48($sp) +/* BFEE78 802415F8 8FB50044 */ lw $s5, 0x44($sp) +/* BFEE7C 802415FC 8FB40040 */ lw $s4, 0x40($sp) +/* BFEE80 80241600 8FB3003C */ lw $s3, 0x3c($sp) +/* BFEE84 80241604 8FB20038 */ lw $s2, 0x38($sp) +/* BFEE88 80241608 8FB10034 */ lw $s1, 0x34($sp) +/* BFEE8C 8024160C 8FB00030 */ lw $s0, 0x30($sp) +/* BFEE90 80241610 03E00008 */ jr $ra +/* BFEE94 80241614 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618.s deleted file mode 100644 index d6e9cf7d74..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241618 -/* BFEE98 80241618 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BFEE9C 8024161C AFB3001C */ sw $s3, 0x1c($sp) -/* BFEEA0 80241620 0080982D */ daddu $s3, $a0, $zero -/* BFEEA4 80241624 AFBF0020 */ sw $ra, 0x20($sp) -/* BFEEA8 80241628 AFB20018 */ sw $s2, 0x18($sp) -/* BFEEAC 8024162C AFB10014 */ sw $s1, 0x14($sp) -/* BFEEB0 80241630 AFB00010 */ sw $s0, 0x10($sp) -/* BFEEB4 80241634 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BFEEB8 80241638 8E720148 */ lw $s2, 0x148($s3) -/* BFEEBC 8024163C 86440008 */ lh $a0, 8($s2) -/* BFEEC0 80241640 0C00EABB */ jal get_npc_unsafe -/* BFEEC4 80241644 00A0882D */ daddu $s1, $a1, $zero -/* BFEEC8 80241648 0040802D */ daddu $s0, $v0, $zero -/* BFEECC 8024164C 9602008E */ lhu $v0, 0x8e($s0) -/* BFEED0 80241650 2442FFFF */ addiu $v0, $v0, -1 -/* BFEED4 80241654 A602008E */ sh $v0, 0x8e($s0) -/* BFEED8 80241658 00021400 */ sll $v0, $v0, 0x10 -/* BFEEDC 8024165C 1C40003C */ bgtz $v0, .L80241750 -/* BFEEE0 80241660 3C03FFDF */ lui $v1, 0xffdf -/* BFEEE4 80241664 8E020000 */ lw $v0, ($s0) -/* BFEEE8 80241668 3463FFFF */ ori $v1, $v1, 0xffff -/* BFEEEC 8024166C 00431024 */ and $v0, $v0, $v1 -/* BFEEF0 80241670 AE020000 */ sw $v0, ($s0) -/* BFEEF4 80241674 8E240020 */ lw $a0, 0x20($s1) -/* BFEEF8 80241678 000417C2 */ srl $v0, $a0, 0x1f -/* BFEEFC 8024167C 00822021 */ addu $a0, $a0, $v0 -/* BFEF00 80241680 00042043 */ sra $a0, $a0, 1 -/* BFEF04 80241684 0C00A67F */ jal rand_int -/* BFEF08 80241688 24840001 */ addiu $a0, $a0, 1 -/* BFEF0C 8024168C 8E230020 */ lw $v1, 0x20($s1) -/* BFEF10 80241690 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BFEF14 80241694 000327C2 */ srl $a0, $v1, 0x1f -/* BFEF18 80241698 00641821 */ addu $v1, $v1, $a0 -/* BFEF1C 8024169C 00031843 */ sra $v1, $v1, 1 -/* BFEF20 802416A0 00621821 */ addu $v1, $v1, $v0 -/* BFEF24 802416A4 A603008E */ sh $v1, 0x8e($s0) -/* BFEF28 802416A8 8E4200CC */ lw $v0, 0xcc($s2) -/* BFEF2C 802416AC C60E0040 */ lwc1 $f14, 0x40($s0) -/* BFEF30 802416B0 8C420020 */ lw $v0, 0x20($v0) -/* BFEF34 802416B4 AE020028 */ sw $v0, 0x28($s0) -/* BFEF38 802416B8 C6200018 */ lwc1 $f0, 0x18($s1) -/* BFEF3C 802416BC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BFEF40 802416C0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BFEF44 802416C4 E6000018 */ swc1 $f0, 0x18($s0) -/* BFEF48 802416C8 8C460028 */ lw $a2, 0x28($v0) -/* BFEF4C 802416CC 0C00A720 */ jal atan2 -/* BFEF50 802416D0 8C470030 */ lw $a3, 0x30($v0) -/* BFEF54 802416D4 46000506 */ mov.s $f20, $f0 -/* BFEF58 802416D8 C60C000C */ lwc1 $f12, 0xc($s0) -/* BFEF5C 802416DC 0C00A70A */ jal get_clamped_angle_diff -/* BFEF60 802416E0 4600A386 */ mov.s $f14, $f20 -/* BFEF64 802416E4 46000086 */ mov.s $f2, $f0 -/* BFEF68 802416E8 8E22001C */ lw $v0, 0x1c($s1) -/* BFEF6C 802416EC 46001005 */ abs.s $f0, $f2 -/* BFEF70 802416F0 44822000 */ mtc1 $v0, $f4 -/* BFEF74 802416F4 00000000 */ nop -/* BFEF78 802416F8 46802120 */ cvt.s.w $f4, $f4 -/* BFEF7C 802416FC 4600203C */ c.lt.s $f4, $f0 -/* BFEF80 80241700 00000000 */ nop -/* BFEF84 80241704 4500000D */ bc1f .L8024173C -/* BFEF88 80241708 00000000 */ nop -/* BFEF8C 8024170C 44800000 */ mtc1 $zero, $f0 -/* BFEF90 80241710 C614000C */ lwc1 $f20, 0xc($s0) -/* BFEF94 80241714 4600103C */ c.lt.s $f2, $f0 -/* BFEF98 80241718 00000000 */ nop -/* BFEF9C 8024171C 45000006 */ bc1f .L80241738 -/* BFEFA0 80241720 00021023 */ negu $v0, $v0 -/* BFEFA4 80241724 44820000 */ mtc1 $v0, $f0 -/* BFEFA8 80241728 00000000 */ nop -/* BFEFAC 8024172C 46800020 */ cvt.s.w $f0, $f0 -/* BFEFB0 80241730 080905CF */ j .L8024173C -/* BFEFB4 80241734 4600A500 */ add.s $f20, $f20, $f0 -.L80241738: -/* BFEFB8 80241738 4604A500 */ add.s $f20, $f20, $f4 -.L8024173C: -/* BFEFBC 8024173C 0C00A6C9 */ jal clamp_angle -/* BFEFC0 80241740 4600A306 */ mov.s $f12, $f20 -/* BFEFC4 80241744 2402000D */ addiu $v0, $zero, 0xd -/* BFEFC8 80241748 E600000C */ swc1 $f0, 0xc($s0) -/* BFEFCC 8024174C AE620070 */ sw $v0, 0x70($s3) -.L80241750: -/* BFEFD0 80241750 8FBF0020 */ lw $ra, 0x20($sp) -/* BFEFD4 80241754 8FB3001C */ lw $s3, 0x1c($sp) -/* BFEFD8 80241758 8FB20018 */ lw $s2, 0x18($sp) -/* BFEFDC 8024175C 8FB10014 */ lw $s1, 0x14($sp) -/* BFEFE0 80241760 8FB00010 */ lw $s0, 0x10($sp) -/* BFEFE4 80241764 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BFEFE8 80241768 03E00008 */ jr $ra -/* BFEFEC 8024176C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s new file mode 100644 index 0000000000..4adaac682f --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241618_BFEE98.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241618_BFEE98 +/* BFEE98 80241618 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* BFEE9C 8024161C AFB3001C */ sw $s3, 0x1c($sp) +/* BFEEA0 80241620 0080982D */ daddu $s3, $a0, $zero +/* BFEEA4 80241624 AFBF0020 */ sw $ra, 0x20($sp) +/* BFEEA8 80241628 AFB20018 */ sw $s2, 0x18($sp) +/* BFEEAC 8024162C AFB10014 */ sw $s1, 0x14($sp) +/* BFEEB0 80241630 AFB00010 */ sw $s0, 0x10($sp) +/* BFEEB4 80241634 F7B40028 */ sdc1 $f20, 0x28($sp) +/* BFEEB8 80241638 8E720148 */ lw $s2, 0x148($s3) +/* BFEEBC 8024163C 86440008 */ lh $a0, 8($s2) +/* BFEEC0 80241640 0C00EABB */ jal get_npc_unsafe +/* BFEEC4 80241644 00A0882D */ daddu $s1, $a1, $zero +/* BFEEC8 80241648 0040802D */ daddu $s0, $v0, $zero +/* BFEECC 8024164C 9602008E */ lhu $v0, 0x8e($s0) +/* BFEED0 80241650 2442FFFF */ addiu $v0, $v0, -1 +/* BFEED4 80241654 A602008E */ sh $v0, 0x8e($s0) +/* BFEED8 80241658 00021400 */ sll $v0, $v0, 0x10 +/* BFEEDC 8024165C 1C40003C */ bgtz $v0, .L80241750 +/* BFEEE0 80241660 3C03FFDF */ lui $v1, 0xffdf +/* BFEEE4 80241664 8E020000 */ lw $v0, ($s0) +/* BFEEE8 80241668 3463FFFF */ ori $v1, $v1, 0xffff +/* BFEEEC 8024166C 00431024 */ and $v0, $v0, $v1 +/* BFEEF0 80241670 AE020000 */ sw $v0, ($s0) +/* BFEEF4 80241674 8E240020 */ lw $a0, 0x20($s1) +/* BFEEF8 80241678 000417C2 */ srl $v0, $a0, 0x1f +/* BFEEFC 8024167C 00822021 */ addu $a0, $a0, $v0 +/* BFEF00 80241680 00042043 */ sra $a0, $a0, 1 +/* BFEF04 80241684 0C00A67F */ jal rand_int +/* BFEF08 80241688 24840001 */ addiu $a0, $a0, 1 +/* BFEF0C 8024168C 8E230020 */ lw $v1, 0x20($s1) +/* BFEF10 80241690 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BFEF14 80241694 000327C2 */ srl $a0, $v1, 0x1f +/* BFEF18 80241698 00641821 */ addu $v1, $v1, $a0 +/* BFEF1C 8024169C 00031843 */ sra $v1, $v1, 1 +/* BFEF20 802416A0 00621821 */ addu $v1, $v1, $v0 +/* BFEF24 802416A4 A603008E */ sh $v1, 0x8e($s0) +/* BFEF28 802416A8 8E4200CC */ lw $v0, 0xcc($s2) +/* BFEF2C 802416AC C60E0040 */ lwc1 $f14, 0x40($s0) +/* BFEF30 802416B0 8C420020 */ lw $v0, 0x20($v0) +/* BFEF34 802416B4 AE020028 */ sw $v0, 0x28($s0) +/* BFEF38 802416B8 C6200018 */ lwc1 $f0, 0x18($s1) +/* BFEF3C 802416BC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BFEF40 802416C0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BFEF44 802416C4 E6000018 */ swc1 $f0, 0x18($s0) +/* BFEF48 802416C8 8C460028 */ lw $a2, 0x28($v0) +/* BFEF4C 802416CC 0C00A720 */ jal atan2 +/* BFEF50 802416D0 8C470030 */ lw $a3, 0x30($v0) +/* BFEF54 802416D4 46000506 */ mov.s $f20, $f0 +/* BFEF58 802416D8 C60C000C */ lwc1 $f12, 0xc($s0) +/* BFEF5C 802416DC 0C00A70A */ jal get_clamped_angle_diff +/* BFEF60 802416E0 4600A386 */ mov.s $f14, $f20 +/* BFEF64 802416E4 46000086 */ mov.s $f2, $f0 +/* BFEF68 802416E8 8E22001C */ lw $v0, 0x1c($s1) +/* BFEF6C 802416EC 46001005 */ abs.s $f0, $f2 +/* BFEF70 802416F0 44822000 */ mtc1 $v0, $f4 +/* BFEF74 802416F4 00000000 */ nop +/* BFEF78 802416F8 46802120 */ cvt.s.w $f4, $f4 +/* BFEF7C 802416FC 4600203C */ c.lt.s $f4, $f0 +/* BFEF80 80241700 00000000 */ nop +/* BFEF84 80241704 4500000D */ bc1f .L8024173C +/* BFEF88 80241708 00000000 */ nop +/* BFEF8C 8024170C 44800000 */ mtc1 $zero, $f0 +/* BFEF90 80241710 C614000C */ lwc1 $f20, 0xc($s0) +/* BFEF94 80241714 4600103C */ c.lt.s $f2, $f0 +/* BFEF98 80241718 00000000 */ nop +/* BFEF9C 8024171C 45000006 */ bc1f .L80241738 +/* BFEFA0 80241720 00021023 */ negu $v0, $v0 +/* BFEFA4 80241724 44820000 */ mtc1 $v0, $f0 +/* BFEFA8 80241728 00000000 */ nop +/* BFEFAC 8024172C 46800020 */ cvt.s.w $f0, $f0 +/* BFEFB0 80241730 080905CF */ j .L8024173C +/* BFEFB4 80241734 4600A500 */ add.s $f20, $f20, $f0 +.L80241738: +/* BFEFB8 80241738 4604A500 */ add.s $f20, $f20, $f4 +.L8024173C: +/* BFEFBC 8024173C 0C00A6C9 */ jal clamp_angle +/* BFEFC0 80241740 4600A306 */ mov.s $f12, $f20 +/* BFEFC4 80241744 2402000D */ addiu $v0, $zero, 0xd +/* BFEFC8 80241748 E600000C */ swc1 $f0, 0xc($s0) +/* BFEFCC 8024174C AE620070 */ sw $v0, 0x70($s3) +.L80241750: +/* BFEFD0 80241750 8FBF0020 */ lw $ra, 0x20($sp) +/* BFEFD4 80241754 8FB3001C */ lw $s3, 0x1c($sp) +/* BFEFD8 80241758 8FB20018 */ lw $s2, 0x18($sp) +/* BFEFDC 8024175C 8FB10014 */ lw $s1, 0x14($sp) +/* BFEFE0 80241760 8FB00010 */ lw $s0, 0x10($sp) +/* BFEFE4 80241764 D7B40028 */ ldc1 $f20, 0x28($sp) +/* BFEFE8 80241768 03E00008 */ jr $ra +/* BFEFEC 8024176C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0.s deleted file mode 100644 index ee4a52b988..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BF0 -/* BFF470 80241BF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BFF474 80241BF4 AFB20028 */ sw $s2, 0x28($sp) -/* BFF478 80241BF8 0080902D */ daddu $s2, $a0, $zero -/* BFF47C 80241BFC AFBF002C */ sw $ra, 0x2c($sp) -/* BFF480 80241C00 AFB10024 */ sw $s1, 0x24($sp) -/* BFF484 80241C04 AFB00020 */ sw $s0, 0x20($sp) -/* BFF488 80241C08 8E500148 */ lw $s0, 0x148($s2) -/* BFF48C 80241C0C 0C00EABB */ jal get_npc_unsafe -/* BFF490 80241C10 86040008 */ lh $a0, 8($s0) -/* BFF494 80241C14 2404FEFF */ addiu $a0, $zero, -0x101 -/* BFF498 80241C18 0040882D */ daddu $s1, $v0, $zero -/* BFF49C 80241C1C 0000282D */ daddu $a1, $zero, $zero -/* BFF4A0 80241C20 8E03006C */ lw $v1, 0x6c($s0) -/* BFF4A4 80241C24 00A0302D */ daddu $a2, $a1, $zero -/* BFF4A8 80241C28 00641824 */ and $v1, $v1, $a0 -/* BFF4AC 80241C2C AE03006C */ sw $v1, 0x6c($s0) -/* BFF4B0 80241C30 AFA00010 */ sw $zero, 0x10($sp) -/* BFF4B4 80241C34 AFA00014 */ sw $zero, 0x14($sp) -/* BFF4B8 80241C38 AFA00018 */ sw $zero, 0x18($sp) -/* BFF4BC 80241C3C 8E240024 */ lw $a0, 0x24($s1) -/* BFF4C0 80241C40 0C0B7A25 */ jal func_802DE894 -/* BFF4C4 80241C44 00A0382D */ daddu $a3, $a1, $zero -/* BFF4C8 80241C48 8E02006C */ lw $v0, 0x6c($s0) -/* BFF4CC 80241C4C 30421000 */ andi $v0, $v0, 0x1000 -/* BFF4D0 80241C50 10400008 */ beqz $v0, .L80241C74 -/* BFF4D4 80241C54 00000000 */ nop -/* BFF4D8 80241C58 3C048000 */ lui $a0, 0x8000 -/* BFF4DC 80241C5C 0C05271B */ jal stop_sound -/* BFF4E0 80241C60 34840011 */ ori $a0, $a0, 0x11 -/* BFF4E4 80241C64 8E02006C */ lw $v0, 0x6c($s0) -/* BFF4E8 80241C68 2403EFFF */ addiu $v1, $zero, -0x1001 -/* BFF4EC 80241C6C 00431024 */ and $v0, $v0, $v1 -/* BFF4F0 80241C70 AE02006C */ sw $v0, 0x6c($s0) -.L80241C74: -/* BFF4F4 80241C74 8E0200CC */ lw $v0, 0xcc($s0) -/* BFF4F8 80241C78 8C430024 */ lw $v1, 0x24($v0) -/* BFF4FC 80241C7C 24020014 */ addiu $v0, $zero, 0x14 -/* BFF500 80241C80 A622008E */ sh $v0, 0x8e($s1) -/* BFF504 80241C84 24020011 */ addiu $v0, $zero, 0x11 -/* BFF508 80241C88 AE230028 */ sw $v1, 0x28($s1) -/* BFF50C 80241C8C AE420070 */ sw $v0, 0x70($s2) -/* BFF510 80241C90 8FBF002C */ lw $ra, 0x2c($sp) -/* BFF514 80241C94 8FB20028 */ lw $s2, 0x28($sp) -/* BFF518 80241C98 8FB10024 */ lw $s1, 0x24($sp) -/* BFF51C 80241C9C 8FB00020 */ lw $s0, 0x20($sp) -/* BFF520 80241CA0 03E00008 */ jr $ra -/* BFF524 80241CA4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s new file mode 100644 index 0000000000..ce253883ea --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241BF0_BFF470.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BF0_BFF470 +/* BFF470 80241BF0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* BFF474 80241BF4 AFB20028 */ sw $s2, 0x28($sp) +/* BFF478 80241BF8 0080902D */ daddu $s2, $a0, $zero +/* BFF47C 80241BFC AFBF002C */ sw $ra, 0x2c($sp) +/* BFF480 80241C00 AFB10024 */ sw $s1, 0x24($sp) +/* BFF484 80241C04 AFB00020 */ sw $s0, 0x20($sp) +/* BFF488 80241C08 8E500148 */ lw $s0, 0x148($s2) +/* BFF48C 80241C0C 0C00EABB */ jal get_npc_unsafe +/* BFF490 80241C10 86040008 */ lh $a0, 8($s0) +/* BFF494 80241C14 2404FEFF */ addiu $a0, $zero, -0x101 +/* BFF498 80241C18 0040882D */ daddu $s1, $v0, $zero +/* BFF49C 80241C1C 0000282D */ daddu $a1, $zero, $zero +/* BFF4A0 80241C20 8E03006C */ lw $v1, 0x6c($s0) +/* BFF4A4 80241C24 00A0302D */ daddu $a2, $a1, $zero +/* BFF4A8 80241C28 00641824 */ and $v1, $v1, $a0 +/* BFF4AC 80241C2C AE03006C */ sw $v1, 0x6c($s0) +/* BFF4B0 80241C30 AFA00010 */ sw $zero, 0x10($sp) +/* BFF4B4 80241C34 AFA00014 */ sw $zero, 0x14($sp) +/* BFF4B8 80241C38 AFA00018 */ sw $zero, 0x18($sp) +/* BFF4BC 80241C3C 8E240024 */ lw $a0, 0x24($s1) +/* BFF4C0 80241C40 0C0B7A25 */ jal func_802DE894 +/* BFF4C4 80241C44 00A0382D */ daddu $a3, $a1, $zero +/* BFF4C8 80241C48 8E02006C */ lw $v0, 0x6c($s0) +/* BFF4CC 80241C4C 30421000 */ andi $v0, $v0, 0x1000 +/* BFF4D0 80241C50 10400008 */ beqz $v0, .L80241C74 +/* BFF4D4 80241C54 00000000 */ nop +/* BFF4D8 80241C58 3C048000 */ lui $a0, 0x8000 +/* BFF4DC 80241C5C 0C05271B */ jal stop_sound +/* BFF4E0 80241C60 34840011 */ ori $a0, $a0, 0x11 +/* BFF4E4 80241C64 8E02006C */ lw $v0, 0x6c($s0) +/* BFF4E8 80241C68 2403EFFF */ addiu $v1, $zero, -0x1001 +/* BFF4EC 80241C6C 00431024 */ and $v0, $v0, $v1 +/* BFF4F0 80241C70 AE02006C */ sw $v0, 0x6c($s0) +.L80241C74: +/* BFF4F4 80241C74 8E0200CC */ lw $v0, 0xcc($s0) +/* BFF4F8 80241C78 8C430024 */ lw $v1, 0x24($v0) +/* BFF4FC 80241C7C 24020014 */ addiu $v0, $zero, 0x14 +/* BFF500 80241C80 A622008E */ sh $v0, 0x8e($s1) +/* BFF504 80241C84 24020011 */ addiu $v0, $zero, 0x11 +/* BFF508 80241C88 AE230028 */ sw $v1, 0x28($s1) +/* BFF50C 80241C8C AE420070 */ sw $v0, 0x70($s2) +/* BFF510 80241C90 8FBF002C */ lw $ra, 0x2c($sp) +/* BFF514 80241C94 8FB20028 */ lw $s2, 0x28($sp) +/* BFF518 80241C98 8FB10024 */ lw $s1, 0x24($sp) +/* BFF51C 80241C9C 8FB00020 */ lw $s0, 0x20($sp) +/* BFF520 80241CA0 03E00008 */ jr $ra +/* BFF524 80241CA4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70.s deleted file mode 100644 index 4af891766e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E70 -/* BFF6F0 80241E70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BFF6F4 80241E74 AFB00010 */ sw $s0, 0x10($sp) -/* BFF6F8 80241E78 0080802D */ daddu $s0, $a0, $zero -/* BFF6FC 80241E7C AFBF0014 */ sw $ra, 0x14($sp) -/* BFF700 80241E80 8E020148 */ lw $v0, 0x148($s0) -/* BFF704 80241E84 0C00EABB */ jal get_npc_unsafe -/* BFF708 80241E88 84440008 */ lh $a0, 8($v0) -/* BFF70C 80241E8C 0040202D */ daddu $a0, $v0, $zero -/* BFF710 80241E90 9482008E */ lhu $v0, 0x8e($a0) -/* BFF714 80241E94 24420001 */ addiu $v0, $v0, 1 -/* BFF718 80241E98 A482008E */ sh $v0, 0x8e($a0) -/* BFF71C 80241E9C 00021400 */ sll $v0, $v0, 0x10 -/* BFF720 80241EA0 00021403 */ sra $v0, $v0, 0x10 -/* BFF724 80241EA4 28420003 */ slti $v0, $v0, 3 -/* BFF728 80241EA8 1440000D */ bnez $v0, .L80241EE0 -/* BFF72C 80241EAC 24020009 */ addiu $v0, $zero, 9 -/* BFF730 80241EB0 3C038011 */ lui $v1, 0x8011 -/* BFF734 80241EB4 8063EBB3 */ lb $v1, -0x144d($v1) -/* BFF738 80241EB8 10620003 */ beq $v1, $v0, .L80241EC8 -/* BFF73C 80241EBC 24020064 */ addiu $v0, $zero, 0x64 -/* BFF740 80241EC0 080907B7 */ j .L80241EDC -/* BFF744 80241EC4 A480008E */ sh $zero, 0x8e($a0) -.L80241EC8: -/* BFF748 80241EC8 0C038069 */ jal enable_player_input -/* BFF74C 80241ECC 00000000 */ nop -/* BFF750 80241ED0 0C03BD80 */ jal func_800EF600 -/* BFF754 80241ED4 00000000 */ nop -/* BFF758 80241ED8 24020010 */ addiu $v0, $zero, 0x10 -.L80241EDC: -/* BFF75C 80241EDC AE020070 */ sw $v0, 0x70($s0) -.L80241EE0: -/* BFF760 80241EE0 8FBF0014 */ lw $ra, 0x14($sp) -/* BFF764 80241EE4 8FB00010 */ lw $s0, 0x10($sp) -/* BFF768 80241EE8 03E00008 */ jr $ra -/* BFF76C 80241EEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s new file mode 100644 index 0000000000..c486c2754b --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80241E70_BFF6F0.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E70_BFF6F0 +/* BFF6F0 80241E70 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BFF6F4 80241E74 AFB00010 */ sw $s0, 0x10($sp) +/* BFF6F8 80241E78 0080802D */ daddu $s0, $a0, $zero +/* BFF6FC 80241E7C AFBF0014 */ sw $ra, 0x14($sp) +/* BFF700 80241E80 8E020148 */ lw $v0, 0x148($s0) +/* BFF704 80241E84 0C00EABB */ jal get_npc_unsafe +/* BFF708 80241E88 84440008 */ lh $a0, 8($v0) +/* BFF70C 80241E8C 0040202D */ daddu $a0, $v0, $zero +/* BFF710 80241E90 9482008E */ lhu $v0, 0x8e($a0) +/* BFF714 80241E94 24420001 */ addiu $v0, $v0, 1 +/* BFF718 80241E98 A482008E */ sh $v0, 0x8e($a0) +/* BFF71C 80241E9C 00021400 */ sll $v0, $v0, 0x10 +/* BFF720 80241EA0 00021403 */ sra $v0, $v0, 0x10 +/* BFF724 80241EA4 28420003 */ slti $v0, $v0, 3 +/* BFF728 80241EA8 1440000D */ bnez $v0, .L80241EE0 +/* BFF72C 80241EAC 24020009 */ addiu $v0, $zero, 9 +/* BFF730 80241EB0 3C038011 */ lui $v1, 0x8011 +/* BFF734 80241EB4 8063EBB3 */ lb $v1, -0x144d($v1) +/* BFF738 80241EB8 10620003 */ beq $v1, $v0, .L80241EC8 +/* BFF73C 80241EBC 24020064 */ addiu $v0, $zero, 0x64 +/* BFF740 80241EC0 080907B7 */ j .L80241EDC +/* BFF744 80241EC4 A480008E */ sh $zero, 0x8e($a0) +.L80241EC8: +/* BFF748 80241EC8 0C038069 */ jal enable_player_input +/* BFF74C 80241ECC 00000000 */ nop +/* BFF750 80241ED0 0C03BD80 */ jal func_800EF600 +/* BFF754 80241ED4 00000000 */ nop +/* BFF758 80241ED8 24020010 */ addiu $v0, $zero, 0x10 +.L80241EDC: +/* BFF75C 80241EDC AE020070 */ sw $v0, 0x70($s0) +.L80241EE0: +/* BFF760 80241EE0 8FBF0014 */ lw $ra, 0x14($sp) +/* BFF764 80241EE4 8FB00010 */ lw $s0, 0x10($sp) +/* BFF768 80241EE8 03E00008 */ jr $ra +/* BFF76C 80241EEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s index 527eb53dde..aaded4aeed 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802422B0_BFFB30.s @@ -47,7 +47,7 @@ glabel func_802422B0_BFFB30 /* BFFBD8 80242358 02A0202D */ daddu $a0, $s5, $zero /* BFFBDC 8024235C 0240282D */ daddu $a1, $s2, $zero /* BFFBE0 80242360 0280302D */ daddu $a2, $s4, $zero -/* BFFBE4 80242364 0C0904C2 */ jal func_80241308 +/* BFFBE4 80242364 0C0904C2 */ jal func_80241308_BFEB88 /* BFFBE8 80242368 0220382D */ daddu $a3, $s1, $zero .L8024236C: /* BFFBEC 8024236C 8E830070 */ lw $v1, 0x70($s4) @@ -61,7 +61,7 @@ glabel func_802422B0_BFFB30 /* BFFC0C 8024238C 00000000 */ nop /* BFFC10 80242390 0280202D */ daddu $a0, $s4, $zero /* BFFC14 80242394 0220282D */ daddu $a1, $s1, $zero -/* BFFC18 80242398 0C090048 */ jal func_80240120 +/* BFFC18 80242398 0C090048 */ jal func_80240120_BFD9A0 /* BFFC1C 8024239C 0260302D */ daddu $a2, $s3, $zero /* BFFC20 802423A0 0000282D */ daddu $a1, $zero, $zero /* BFFC24 802423A4 00A0302D */ daddu $a2, $a1, $zero @@ -73,17 +73,17 @@ glabel func_802422B0_BFFB30 /* BFFC3C 802423BC 00A0382D */ daddu $a3, $a1, $zero /* BFFC40 802423C0 0280202D */ daddu $a0, $s4, $zero /* BFFC44 802423C4 0220282D */ daddu $a1, $s1, $zero -/* BFFC48 802423C8 0C0900B4 */ jal func_802402D0 +/* BFFC48 802423C8 0C0900B4 */ jal func_802402D0_BFDB50 /* BFFC4C 802423CC 0260302D */ daddu $a2, $s3, $zero /* BFFC50 802423D0 080908FE */ j .L802423F8 /* BFFC54 802423D4 00000000 */ nop /* BFFC58 802423D8 0280202D */ daddu $a0, $s4, $zero /* BFFC5C 802423DC 0220282D */ daddu $a1, $s1, $zero -/* BFFC60 802423E0 0C09023E */ jal func_802408F8 +/* BFFC60 802423E0 0C09023E */ jal func_802408F8_BFE178 /* BFFC64 802423E4 0260302D */ daddu $a2, $s3, $zero /* BFFC68 802423E8 0280202D */ daddu $a0, $s4, $zero /* BFFC6C 802423EC 0220282D */ daddu $a1, $s1, $zero -/* BFFC70 802423F0 0C09026E */ jal func_802409B8 +/* BFFC70 802423F0 0C09026E */ jal func_802409B8_BFE238 /* BFFC74 802423F4 0260302D */ daddu $a2, $s3, $zero .L802423F8: /* BFFC78 802423F8 8E830070 */ lw $v1, 0x70($s4) @@ -94,7 +94,7 @@ glabel func_802422B0_BFFB30 /* BFFC8C 8024240C A6A2008E */ sh $v0, 0x8e($s5) /* BFFC90 80242410 0280202D */ daddu $a0, $s4, $zero /* BFFC94 80242414 0220282D */ daddu $a1, $s1, $zero -/* BFFC98 80242418 0C090586 */ jal func_80241618 +/* BFFC98 80242418 0C090586 */ jal func_80241618_BFEE98 /* BFFC9C 8024241C 0260302D */ daddu $a2, $s3, $zero /* BFFCA0 80242420 8E830070 */ lw $v1, 0x70($s4) /* BFFCA4 80242424 2402000D */ addiu $v0, $zero, 0xd @@ -102,7 +102,7 @@ glabel func_802422B0_BFFB30 /* BFFCAC 8024242C 00000000 */ nop /* BFFCB0 80242430 0280202D */ daddu $a0, $s4, $zero /* BFFCB4 80242434 0220282D */ daddu $a1, $s1, $zero -/* BFFCB8 80242438 0C0905DC */ jal func_80241770 +/* BFFCB8 80242438 0C0905DC */ jal func_80241770_BFEFF0 /* BFFCBC 8024243C 0260302D */ daddu $a2, $s3, $zero /* BFFCC0 80242440 0809093E */ j .L802424F8 /* BFFCC4 80242444 00000000 */ nop @@ -116,39 +116,39 @@ glabel func_802422B0_BFFB30 /* BFFCE4 80242464 00000000 */ nop /* BFFCE8 80242468 0280202D */ daddu $a0, $s4, $zero /* BFFCEC 8024246C 0220282D */ daddu $a1, $s1, $zero -/* BFFCF0 80242470 0C090655 */ jal func_80241954 +/* BFFCF0 80242470 0C090655 */ jal func_80241954_BFF1D4 /* BFFCF4 80242474 0260302D */ daddu $a2, $s3, $zero /* BFFCF8 80242478 0809093E */ j .L802424F8 /* BFFCFC 8024247C 00000000 */ nop /* BFFD00 80242480 0280202D */ daddu $a0, $s4, $zero /* BFFD04 80242484 0220282D */ daddu $a1, $s1, $zero -/* BFFD08 80242488 0C0906FC */ jal func_80241BF0 +/* BFFD08 80242488 0C0906FC */ jal func_80241BF0_BFF470 /* BFFD0C 8024248C 0260302D */ daddu $a2, $s3, $zero /* BFFD10 80242490 0280202D */ daddu $a0, $s4, $zero /* BFFD14 80242494 0220282D */ daddu $a1, $s1, $zero -/* BFFD18 80242498 0C09072A */ jal func_80241CA8 +/* BFFD18 80242498 0C09072A */ jal func_80241CA8_BFF528 /* BFFD1C 8024249C 0260302D */ daddu $a2, $s3, $zero /* BFFD20 802424A0 0809093E */ j .L802424F8 /* BFFD24 802424A4 00000000 */ nop /* BFFD28 802424A8 0280202D */ daddu $a0, $s4, $zero /* BFFD2C 802424AC 0220282D */ daddu $a1, $s1, $zero -/* BFFD30 802424B0 0C09078A */ jal func_80241E28 +/* BFFD30 802424B0 0C09078A */ jal func_80241E28_BFF6A8 /* BFFD34 802424B4 0260302D */ daddu $a2, $s3, $zero /* BFFD38 802424B8 0809093E */ j .L802424F8 /* BFFD3C 802424BC 00000000 */ nop /* BFFD40 802424C0 0280202D */ daddu $a0, $s4, $zero /* BFFD44 802424C4 0220282D */ daddu $a1, $s1, $zero -/* BFFD48 802424C8 0C09079C */ jal func_80241E70 +/* BFFD48 802424C8 0C09079C */ jal func_80241E70_BFF6F0 /* BFFD4C 802424CC 0260302D */ daddu $a2, $s3, $zero /* BFFD50 802424D0 0809093E */ j .L802424F8 /* BFFD54 802424D4 00000000 */ nop /* BFFD58 802424D8 0280202D */ daddu $a0, $s4, $zero /* BFFD5C 802424DC 0220282D */ daddu $a1, $s1, $zero -/* BFFD60 802424E0 0C0907BC */ jal func_80241EF0 +/* BFFD60 802424E0 0C0907BC */ jal func_80241EF0_BFF770 /* BFFD64 802424E4 0260302D */ daddu $a2, $s3, $zero /* BFFD68 802424E8 0280202D */ daddu $a0, $s4, $zero /* BFFD6C 802424EC 0220282D */ daddu $a1, $s1, $zero -/* BFFD70 802424F0 0C0907E6 */ jal func_80241F98 +/* BFFD70 802424F0 0C0907E6 */ jal func_80241F98_BFF818 /* BFFD74 802424F4 0260302D */ daddu $a2, $s3, $zero .L802424F8: /* BFFD78 802424F8 8E820070 */ lw $v0, 0x70($s4) diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C.s deleted file mode 100644 index 596e069215..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024252C -/* BFFDAC 8024252C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BFFDB0 80242530 AFB50024 */ sw $s5, 0x24($sp) -/* BFFDB4 80242534 0080A82D */ daddu $s5, $a0, $zero -/* BFFDB8 80242538 AFBF002C */ sw $ra, 0x2c($sp) -/* BFFDBC 8024253C AFB60028 */ sw $s6, 0x28($sp) -/* BFFDC0 80242540 AFB40020 */ sw $s4, 0x20($sp) -/* BFFDC4 80242544 AFB3001C */ sw $s3, 0x1c($sp) -/* BFFDC8 80242548 AFB20018 */ sw $s2, 0x18($sp) -/* BFFDCC 8024254C AFB10014 */ sw $s1, 0x14($sp) -/* BFFDD0 80242550 AFB00010 */ sw $s0, 0x10($sp) -/* BFFDD4 80242554 F7B80040 */ sdc1 $f24, 0x40($sp) -/* BFFDD8 80242558 F7B60038 */ sdc1 $f22, 0x38($sp) -/* BFFDDC 8024255C F7B40030 */ sdc1 $f20, 0x30($sp) -/* BFFDE0 80242560 8EB30148 */ lw $s3, 0x148($s5) -/* BFFDE4 80242564 86640008 */ lh $a0, 8($s3) -/* BFFDE8 80242568 0C00EABB */ jal get_npc_unsafe -/* BFFDEC 8024256C 00A0B02D */ daddu $s6, $a1, $zero -/* BFFDF0 80242570 0040A02D */ daddu $s4, $v0, $zero -/* BFFDF4 80242574 AEA00074 */ sw $zero, 0x74($s5) -/* BFFDF8 80242578 C6980038 */ lwc1 $f24, 0x38($s4) -/* BFFDFC 8024257C C6960040 */ lwc1 $f22, 0x40($s4) -/* BFFE00 80242580 0000902D */ daddu $s2, $zero, $zero -/* BFFE04 80242584 AEA00078 */ sw $zero, 0x78($s5) -/* BFFE08 80242588 8E6300D0 */ lw $v1, 0xd0($s3) -/* BFFE0C 8024258C 8C620000 */ lw $v0, ($v1) -/* BFFE10 80242590 3C0146FF */ lui $at, 0x46ff -/* BFFE14 80242594 3421FE00 */ ori $at, $at, 0xfe00 -/* BFFE18 80242598 4481A000 */ mtc1 $at, $f20 -/* BFFE1C 8024259C 18400018 */ blez $v0, .L80242600 -/* BFFE20 802425A0 0240802D */ daddu $s0, $s2, $zero -/* BFFE24 802425A4 0240882D */ daddu $s1, $s2, $zero -.L802425A8: -/* BFFE28 802425A8 02231021 */ addu $v0, $s1, $v1 -/* BFFE2C 802425AC 4600C306 */ mov.s $f12, $f24 -/* BFFE30 802425B0 C4440004 */ lwc1 $f4, 4($v0) -/* BFFE34 802425B4 46802120 */ cvt.s.w $f4, $f4 -/* BFFE38 802425B8 44062000 */ mfc1 $a2, $f4 -/* BFFE3C 802425BC C444000C */ lwc1 $f4, 0xc($v0) -/* BFFE40 802425C0 46802120 */ cvt.s.w $f4, $f4 -/* BFFE44 802425C4 44072000 */ mfc1 $a3, $f4 -/* BFFE48 802425C8 0C00A7B5 */ jal dist2D -/* BFFE4C 802425CC 4600B386 */ mov.s $f14, $f22 -/* BFFE50 802425D0 4614003C */ c.lt.s $f0, $f20 -/* BFFE54 802425D4 00000000 */ nop -/* BFFE58 802425D8 45000003 */ bc1f .L802425E8 -/* BFFE5C 802425DC 2631000C */ addiu $s1, $s1, 0xc -/* BFFE60 802425E0 46000506 */ mov.s $f20, $f0 -/* BFFE64 802425E4 AEB20078 */ sw $s2, 0x78($s5) -.L802425E8: -/* BFFE68 802425E8 8E6300D0 */ lw $v1, 0xd0($s3) -/* BFFE6C 802425EC 26100001 */ addiu $s0, $s0, 1 -/* BFFE70 802425F0 8C620000 */ lw $v0, ($v1) -/* BFFE74 802425F4 0202102A */ slt $v0, $s0, $v0 -/* BFFE78 802425F8 1440FFEB */ bnez $v0, .L802425A8 -/* BFFE7C 802425FC 26520001 */ addiu $s2, $s2, 1 -.L80242600: -/* BFFE80 80242600 8E6200CC */ lw $v0, 0xcc($s3) -/* BFFE84 80242604 8C420004 */ lw $v0, 4($v0) -/* BFFE88 80242608 AE820028 */ sw $v0, 0x28($s4) -/* BFFE8C 8024260C 8E6200D0 */ lw $v0, 0xd0($s3) -/* BFFE90 80242610 8C42007C */ lw $v0, 0x7c($v0) -/* BFFE94 80242614 04410004 */ bgez $v0, .L80242628 -/* BFFE98 80242618 00000000 */ nop -/* BFFE9C 8024261C C6C00000 */ lwc1 $f0, ($s6) -/* BFFEA0 80242620 08090992 */ j .L80242648 -/* BFFEA4 80242624 E6800018 */ swc1 $f0, 0x18($s4) -.L80242628: -/* BFFEA8 80242628 3C018026 */ lui $at, 0x8026 -/* BFFEAC 8024262C D4223510 */ ldc1 $f2, 0x3510($at) -/* BFFEB0 80242630 44820000 */ mtc1 $v0, $f0 -/* BFFEB4 80242634 00000000 */ nop -/* BFFEB8 80242638 46800021 */ cvt.d.w $f0, $f0 -/* BFFEBC 8024263C 46220003 */ div.d $f0, $f0, $f2 -/* BFFEC0 80242640 46200020 */ cvt.s.d $f0, $f0 -/* BFFEC4 80242644 E6800018 */ swc1 $f0, 0x18($s4) -.L80242648: -/* BFFEC8 80242648 24020001 */ addiu $v0, $zero, 1 -/* BFFECC 8024264C AEA20070 */ sw $v0, 0x70($s5) -/* BFFED0 80242650 8FBF002C */ lw $ra, 0x2c($sp) -/* BFFED4 80242654 8FB60028 */ lw $s6, 0x28($sp) -/* BFFED8 80242658 8FB50024 */ lw $s5, 0x24($sp) -/* BFFEDC 8024265C 8FB40020 */ lw $s4, 0x20($sp) -/* BFFEE0 80242660 8FB3001C */ lw $s3, 0x1c($sp) -/* BFFEE4 80242664 8FB20018 */ lw $s2, 0x18($sp) -/* BFFEE8 80242668 8FB10014 */ lw $s1, 0x14($sp) -/* BFFEEC 8024266C 8FB00010 */ lw $s0, 0x10($sp) -/* BFFEF0 80242670 D7B80040 */ ldc1 $f24, 0x40($sp) -/* BFFEF4 80242674 D7B60038 */ ldc1 $f22, 0x38($sp) -/* BFFEF8 80242678 D7B40030 */ ldc1 $f20, 0x30($sp) -/* BFFEFC 8024267C 03E00008 */ jr $ra -/* BFFF00 80242680 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s new file mode 100644 index 0000000000..8407852a24 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024252C_BFFDAC.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024252C_BFFDAC +/* BFFDAC 8024252C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* BFFDB0 80242530 AFB50024 */ sw $s5, 0x24($sp) +/* BFFDB4 80242534 0080A82D */ daddu $s5, $a0, $zero +/* BFFDB8 80242538 AFBF002C */ sw $ra, 0x2c($sp) +/* BFFDBC 8024253C AFB60028 */ sw $s6, 0x28($sp) +/* BFFDC0 80242540 AFB40020 */ sw $s4, 0x20($sp) +/* BFFDC4 80242544 AFB3001C */ sw $s3, 0x1c($sp) +/* BFFDC8 80242548 AFB20018 */ sw $s2, 0x18($sp) +/* BFFDCC 8024254C AFB10014 */ sw $s1, 0x14($sp) +/* BFFDD0 80242550 AFB00010 */ sw $s0, 0x10($sp) +/* BFFDD4 80242554 F7B80040 */ sdc1 $f24, 0x40($sp) +/* BFFDD8 80242558 F7B60038 */ sdc1 $f22, 0x38($sp) +/* BFFDDC 8024255C F7B40030 */ sdc1 $f20, 0x30($sp) +/* BFFDE0 80242560 8EB30148 */ lw $s3, 0x148($s5) +/* BFFDE4 80242564 86640008 */ lh $a0, 8($s3) +/* BFFDE8 80242568 0C00EABB */ jal get_npc_unsafe +/* BFFDEC 8024256C 00A0B02D */ daddu $s6, $a1, $zero +/* BFFDF0 80242570 0040A02D */ daddu $s4, $v0, $zero +/* BFFDF4 80242574 AEA00074 */ sw $zero, 0x74($s5) +/* BFFDF8 80242578 C6980038 */ lwc1 $f24, 0x38($s4) +/* BFFDFC 8024257C C6960040 */ lwc1 $f22, 0x40($s4) +/* BFFE00 80242580 0000902D */ daddu $s2, $zero, $zero +/* BFFE04 80242584 AEA00078 */ sw $zero, 0x78($s5) +/* BFFE08 80242588 8E6300D0 */ lw $v1, 0xd0($s3) +/* BFFE0C 8024258C 8C620000 */ lw $v0, ($v1) +/* BFFE10 80242590 3C0146FF */ lui $at, 0x46ff +/* BFFE14 80242594 3421FE00 */ ori $at, $at, 0xfe00 +/* BFFE18 80242598 4481A000 */ mtc1 $at, $f20 +/* BFFE1C 8024259C 18400018 */ blez $v0, .L80242600 +/* BFFE20 802425A0 0240802D */ daddu $s0, $s2, $zero +/* BFFE24 802425A4 0240882D */ daddu $s1, $s2, $zero +.L802425A8: +/* BFFE28 802425A8 02231021 */ addu $v0, $s1, $v1 +/* BFFE2C 802425AC 4600C306 */ mov.s $f12, $f24 +/* BFFE30 802425B0 C4440004 */ lwc1 $f4, 4($v0) +/* BFFE34 802425B4 46802120 */ cvt.s.w $f4, $f4 +/* BFFE38 802425B8 44062000 */ mfc1 $a2, $f4 +/* BFFE3C 802425BC C444000C */ lwc1 $f4, 0xc($v0) +/* BFFE40 802425C0 46802120 */ cvt.s.w $f4, $f4 +/* BFFE44 802425C4 44072000 */ mfc1 $a3, $f4 +/* BFFE48 802425C8 0C00A7B5 */ jal dist2D +/* BFFE4C 802425CC 4600B386 */ mov.s $f14, $f22 +/* BFFE50 802425D0 4614003C */ c.lt.s $f0, $f20 +/* BFFE54 802425D4 00000000 */ nop +/* BFFE58 802425D8 45000003 */ bc1f .L802425E8 +/* BFFE5C 802425DC 2631000C */ addiu $s1, $s1, 0xc +/* BFFE60 802425E0 46000506 */ mov.s $f20, $f0 +/* BFFE64 802425E4 AEB20078 */ sw $s2, 0x78($s5) +.L802425E8: +/* BFFE68 802425E8 8E6300D0 */ lw $v1, 0xd0($s3) +/* BFFE6C 802425EC 26100001 */ addiu $s0, $s0, 1 +/* BFFE70 802425F0 8C620000 */ lw $v0, ($v1) +/* BFFE74 802425F4 0202102A */ slt $v0, $s0, $v0 +/* BFFE78 802425F8 1440FFEB */ bnez $v0, .L802425A8 +/* BFFE7C 802425FC 26520001 */ addiu $s2, $s2, 1 +.L80242600: +/* BFFE80 80242600 8E6200CC */ lw $v0, 0xcc($s3) +/* BFFE84 80242604 8C420004 */ lw $v0, 4($v0) +/* BFFE88 80242608 AE820028 */ sw $v0, 0x28($s4) +/* BFFE8C 8024260C 8E6200D0 */ lw $v0, 0xd0($s3) +/* BFFE90 80242610 8C42007C */ lw $v0, 0x7c($v0) +/* BFFE94 80242614 04410004 */ bgez $v0, .L80242628 +/* BFFE98 80242618 00000000 */ nop +/* BFFE9C 8024261C C6C00000 */ lwc1 $f0, ($s6) +/* BFFEA0 80242620 08090992 */ j .L80242648 +/* BFFEA4 80242624 E6800018 */ swc1 $f0, 0x18($s4) +.L80242628: +/* BFFEA8 80242628 3C018026 */ lui $at, 0x8026 +/* BFFEAC 8024262C D4223510 */ ldc1 $f2, 0x3510($at) +/* BFFEB0 80242630 44820000 */ mtc1 $v0, $f0 +/* BFFEB4 80242634 00000000 */ nop +/* BFFEB8 80242638 46800021 */ cvt.d.w $f0, $f0 +/* BFFEBC 8024263C 46220003 */ div.d $f0, $f0, $f2 +/* BFFEC0 80242640 46200020 */ cvt.s.d $f0, $f0 +/* BFFEC4 80242644 E6800018 */ swc1 $f0, 0x18($s4) +.L80242648: +/* BFFEC8 80242648 24020001 */ addiu $v0, $zero, 1 +/* BFFECC 8024264C AEA20070 */ sw $v0, 0x70($s5) +/* BFFED0 80242650 8FBF002C */ lw $ra, 0x2c($sp) +/* BFFED4 80242654 8FB60028 */ lw $s6, 0x28($sp) +/* BFFED8 80242658 8FB50024 */ lw $s5, 0x24($sp) +/* BFFEDC 8024265C 8FB40020 */ lw $s4, 0x20($sp) +/* BFFEE0 80242660 8FB3001C */ lw $s3, 0x1c($sp) +/* BFFEE4 80242664 8FB20018 */ lw $s2, 0x18($sp) +/* BFFEE8 80242668 8FB10014 */ lw $s1, 0x14($sp) +/* BFFEEC 8024266C 8FB00010 */ lw $s0, 0x10($sp) +/* BFFEF0 80242670 D7B80040 */ ldc1 $f24, 0x40($sp) +/* BFFEF4 80242674 D7B60038 */ ldc1 $f22, 0x38($sp) +/* BFFEF8 80242678 D7B40030 */ ldc1 $f20, 0x30($sp) +/* BFFEFC 8024267C 03E00008 */ jr $ra +/* BFFF00 80242680 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684.s deleted file mode 100644 index f8d3416f4c..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242684 -/* BFFF04 80242684 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BFFF08 80242688 AFB20038 */ sw $s2, 0x38($sp) -/* BFFF0C 8024268C 0080902D */ daddu $s2, $a0, $zero -/* BFFF10 80242690 AFBF0044 */ sw $ra, 0x44($sp) -/* BFFF14 80242694 AFB40040 */ sw $s4, 0x40($sp) -/* BFFF18 80242698 AFB3003C */ sw $s3, 0x3c($sp) -/* BFFF1C 8024269C AFB10034 */ sw $s1, 0x34($sp) -/* BFFF20 802426A0 AFB00030 */ sw $s0, 0x30($sp) -/* BFFF24 802426A4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* BFFF28 802426A8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BFFF2C 802426AC 8E510148 */ lw $s1, 0x148($s2) -/* BFFF30 802426B0 00A0982D */ daddu $s3, $a1, $zero -/* BFFF34 802426B4 86240008 */ lh $a0, 8($s1) -/* BFFF38 802426B8 0C00EABB */ jal get_npc_unsafe -/* BFFF3C 802426BC 00C0A02D */ daddu $s4, $a2, $zero -/* BFFF40 802426C0 8E630014 */ lw $v1, 0x14($s3) -/* BFFF44 802426C4 04600030 */ bltz $v1, .L80242788 -/* BFFF48 802426C8 0040802D */ daddu $s0, $v0, $zero -/* BFFF4C 802426CC 8E420074 */ lw $v0, 0x74($s2) -/* BFFF50 802426D0 1C40002C */ bgtz $v0, .L80242784 -/* BFFF54 802426D4 2442FFFF */ addiu $v0, $v0, -1 -/* BFFF58 802426D8 0280202D */ daddu $a0, $s4, $zero -/* BFFF5C 802426DC AE430074 */ sw $v1, 0x74($s2) -/* BFFF60 802426E0 AFA00010 */ sw $zero, 0x10($sp) -/* BFFF64 802426E4 8E66000C */ lw $a2, 0xc($s3) -/* BFFF68 802426E8 8E670010 */ lw $a3, 0x10($s3) -/* BFFF6C 802426EC 0C01242D */ jal func_800490B4 -/* BFFF70 802426F0 0220282D */ daddu $a1, $s1, $zero -/* BFFF74 802426F4 10400021 */ beqz $v0, .L8024277C -/* BFFF78 802426F8 0000202D */ daddu $a0, $zero, $zero -/* BFFF7C 802426FC 0200282D */ daddu $a1, $s0, $zero -/* BFFF80 80242700 0000302D */ daddu $a2, $zero, $zero -/* BFFF84 80242704 860300A8 */ lh $v1, 0xa8($s0) -/* BFFF88 80242708 3C013F80 */ lui $at, 0x3f80 -/* BFFF8C 8024270C 44810000 */ mtc1 $at, $f0 -/* BFFF90 80242710 3C014000 */ lui $at, 0x4000 -/* BFFF94 80242714 44811000 */ mtc1 $at, $f2 -/* BFFF98 80242718 3C01C1A0 */ lui $at, 0xc1a0 -/* BFFF9C 8024271C 44812000 */ mtc1 $at, $f4 -/* BFFFA0 80242720 2402000F */ addiu $v0, $zero, 0xf -/* BFFFA4 80242724 AFA2001C */ sw $v0, 0x1c($sp) -/* BFFFA8 80242728 44833000 */ mtc1 $v1, $f6 -/* BFFFAC 8024272C 00000000 */ nop -/* BFFFB0 80242730 468031A0 */ cvt.s.w $f6, $f6 -/* BFFFB4 80242734 44073000 */ mfc1 $a3, $f6 -/* BFFFB8 80242738 27A20028 */ addiu $v0, $sp, 0x28 -/* BFFFBC 8024273C AFA20020 */ sw $v0, 0x20($sp) -/* BFFFC0 80242740 E7A00010 */ swc1 $f0, 0x10($sp) -/* BFFFC4 80242744 E7A20014 */ swc1 $f2, 0x14($sp) -/* BFFFC8 80242748 0C01BFA4 */ jal fx_emote -/* BFFFCC 8024274C E7A40018 */ swc1 $f4, 0x18($sp) -/* BFFFD0 80242750 0200202D */ daddu $a0, $s0, $zero -/* BFFFD4 80242754 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BFFFD8 80242758 0C012530 */ jal func_800494C0 -/* BFFFDC 8024275C 3C060020 */ lui $a2, 0x20 -/* BFFFE0 80242760 8E220018 */ lw $v0, 0x18($s1) -/* BFFFE4 80242764 9442002A */ lhu $v0, 0x2a($v0) -/* BFFFE8 80242768 30420001 */ andi $v0, $v0, 1 -/* BFFFEC 8024276C 14400064 */ bnez $v0, .L80242900 -/* BFFFF0 80242770 2402000A */ addiu $v0, $zero, 0xa -/* BFFFF4 80242774 08090A40 */ j .L80242900 -/* BFFFF8 80242778 2402000C */ addiu $v0, $zero, 0xc -.L8024277C: -/* BFFFFC 8024277C 8E420074 */ lw $v0, 0x74($s2) -/* C00000 80242780 2442FFFF */ addiu $v0, $v0, -1 -.L80242784: -/* C00004 80242784 AE420074 */ sw $v0, 0x74($s2) -.L80242788: -/* C00008 80242788 8602008C */ lh $v0, 0x8c($s0) -/* C0000C 8024278C 1440005D */ bnez $v0, .L80242904 -/* C00010 80242790 00000000 */ nop -/* C00014 80242794 C6000018 */ lwc1 $f0, 0x18($s0) -/* C00018 80242798 3C014010 */ lui $at, 0x4010 -/* C0001C 8024279C 44811800 */ mtc1 $at, $f3 -/* C00020 802427A0 44801000 */ mtc1 $zero, $f2 -/* C00024 802427A4 46000021 */ cvt.d.s $f0, $f0 -/* C00028 802427A8 4622003C */ c.lt.d $f0, $f2 -/* C0002C 802427AC 00000000 */ nop -/* C00030 802427B0 45000003 */ bc1f .L802427C0 -/* C00034 802427B4 0200202D */ daddu $a0, $s0, $zero -/* C00038 802427B8 080909F1 */ j .L802427C4 -/* C0003C 802427BC 0000282D */ daddu $a1, $zero, $zero -.L802427C0: -/* C00040 802427C0 24050001 */ addiu $a1, $zero, 1 -.L802427C4: -/* C00044 802427C4 0C00F598 */ jal func_8003D660 -/* C00048 802427C8 00000000 */ nop -/* C0004C 802427CC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C00050 802427D0 8E430078 */ lw $v1, 0x78($s2) -/* C00054 802427D4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C00058 802427D8 00031040 */ sll $v0, $v1, 1 -/* C0005C 802427DC 00431021 */ addu $v0, $v0, $v1 -/* C00060 802427E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C00064 802427E4 00021080 */ sll $v0, $v0, 2 -/* C00068 802427E8 00431021 */ addu $v0, $v0, $v1 -/* C0006C 802427EC C4560004 */ lwc1 $f22, 4($v0) -/* C00070 802427F0 4680B5A0 */ cvt.s.w $f22, $f22 -/* C00074 802427F4 C454000C */ lwc1 $f20, 0xc($v0) -/* C00078 802427F8 4680A520 */ cvt.s.w $f20, $f20 -/* C0007C 802427FC 4406B000 */ mfc1 $a2, $f22 -/* C00080 80242800 4407A000 */ mfc1 $a3, $f20 -/* C00084 80242804 0C00A720 */ jal atan2 -/* C00088 80242808 00000000 */ nop -/* C0008C 8024280C 8E050018 */ lw $a1, 0x18($s0) -/* C00090 80242810 44060000 */ mfc1 $a2, $f0 -/* C00094 80242814 0200202D */ daddu $a0, $s0, $zero -/* C00098 80242818 0C00EA95 */ jal npc_move_heading -/* C0009C 8024281C AE06000C */ sw $a2, 0xc($s0) -/* C000A0 80242820 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C000A4 80242824 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C000A8 80242828 4406B000 */ mfc1 $a2, $f22 -/* C000AC 8024282C 4407A000 */ mfc1 $a3, $f20 -/* C000B0 80242830 0C00A7B5 */ jal dist2D -/* C000B4 80242834 00000000 */ nop -/* C000B8 80242838 C6020018 */ lwc1 $f2, 0x18($s0) -/* C000BC 8024283C 4602003E */ c.le.s $f0, $f2 -/* C000C0 80242840 00000000 */ nop -/* C000C4 80242844 4500002F */ bc1f .L80242904 -/* C000C8 80242848 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C000CC 8024284C 24020002 */ addiu $v0, $zero, 2 -/* C000D0 80242850 0C00A67F */ jal rand_int -/* C000D4 80242854 AE420070 */ sw $v0, 0x70($s2) -/* C000D8 80242858 3C035555 */ lui $v1, 0x5555 -/* C000DC 8024285C 34635556 */ ori $v1, $v1, 0x5556 -/* C000E0 80242860 00430018 */ mult $v0, $v1 -/* C000E4 80242864 000227C3 */ sra $a0, $v0, 0x1f -/* C000E8 80242868 00004010 */ mfhi $t0 -/* C000EC 8024286C 01042023 */ subu $a0, $t0, $a0 -/* C000F0 80242870 00041840 */ sll $v1, $a0, 1 -/* C000F4 80242874 00641821 */ addu $v1, $v1, $a0 -/* C000F8 80242878 00431023 */ subu $v0, $v0, $v1 -/* C000FC 8024287C 24430002 */ addiu $v1, $v0, 2 -/* C00100 80242880 AE430074 */ sw $v1, 0x74($s2) -/* C00104 80242884 8E62002C */ lw $v0, 0x2c($s3) -/* C00108 80242888 18400009 */ blez $v0, .L802428B0 -/* C0010C 8024288C 24020004 */ addiu $v0, $zero, 4 -/* C00110 80242890 8E620004 */ lw $v0, 4($s3) -/* C00114 80242894 18400006 */ blez $v0, .L802428B0 -/* C00118 80242898 24020004 */ addiu $v0, $zero, 4 -/* C0011C 8024289C 8E620008 */ lw $v0, 8($s3) -/* C00120 802428A0 18400003 */ blez $v0, .L802428B0 -/* C00124 802428A4 24020004 */ addiu $v0, $zero, 4 -/* C00128 802428A8 14600002 */ bnez $v1, .L802428B4 -/* C0012C 802428AC 00000000 */ nop -.L802428B0: -/* C00130 802428B0 AE420070 */ sw $v0, 0x70($s2) -.L802428B4: -/* C00134 802428B4 0C00A67F */ jal rand_int -/* C00138 802428B8 24042710 */ addiu $a0, $zero, 0x2710 -/* C0013C 802428BC 3C0351EB */ lui $v1, 0x51eb -/* C00140 802428C0 3463851F */ ori $v1, $v1, 0x851f -/* C00144 802428C4 00430018 */ mult $v0, $v1 -/* C00148 802428C8 00021FC3 */ sra $v1, $v0, 0x1f -/* C0014C 802428CC 00004010 */ mfhi $t0 -/* C00150 802428D0 00082143 */ sra $a0, $t0, 5 -/* C00154 802428D4 00832023 */ subu $a0, $a0, $v1 -/* C00158 802428D8 00041840 */ sll $v1, $a0, 1 -/* C0015C 802428DC 00641821 */ addu $v1, $v1, $a0 -/* C00160 802428E0 000318C0 */ sll $v1, $v1, 3 -/* C00164 802428E4 00641821 */ addu $v1, $v1, $a0 -/* C00168 802428E8 00031880 */ sll $v1, $v1, 2 -/* C0016C 802428EC 8E640004 */ lw $a0, 4($s3) -/* C00170 802428F0 00431023 */ subu $v0, $v0, $v1 -/* C00174 802428F4 0044102A */ slt $v0, $v0, $a0 -/* C00178 802428F8 10400002 */ beqz $v0, .L80242904 -/* C0017C 802428FC 24020004 */ addiu $v0, $zero, 4 -.L80242900: -/* C00180 80242900 AE420070 */ sw $v0, 0x70($s2) -.L80242904: -/* C00184 80242904 8FBF0044 */ lw $ra, 0x44($sp) -/* C00188 80242908 8FB40040 */ lw $s4, 0x40($sp) -/* C0018C 8024290C 8FB3003C */ lw $s3, 0x3c($sp) -/* C00190 80242910 8FB20038 */ lw $s2, 0x38($sp) -/* C00194 80242914 8FB10034 */ lw $s1, 0x34($sp) -/* C00198 80242918 8FB00030 */ lw $s0, 0x30($sp) -/* C0019C 8024291C D7B60050 */ ldc1 $f22, 0x50($sp) -/* C001A0 80242920 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C001A4 80242924 03E00008 */ jr $ra -/* C001A8 80242928 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s new file mode 100644 index 0000000000..c3b1b9ad70 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242684_BFFF04.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242684_BFFF04 +/* BFFF04 80242684 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* BFFF08 80242688 AFB20038 */ sw $s2, 0x38($sp) +/* BFFF0C 8024268C 0080902D */ daddu $s2, $a0, $zero +/* BFFF10 80242690 AFBF0044 */ sw $ra, 0x44($sp) +/* BFFF14 80242694 AFB40040 */ sw $s4, 0x40($sp) +/* BFFF18 80242698 AFB3003C */ sw $s3, 0x3c($sp) +/* BFFF1C 8024269C AFB10034 */ sw $s1, 0x34($sp) +/* BFFF20 802426A0 AFB00030 */ sw $s0, 0x30($sp) +/* BFFF24 802426A4 F7B60050 */ sdc1 $f22, 0x50($sp) +/* BFFF28 802426A8 F7B40048 */ sdc1 $f20, 0x48($sp) +/* BFFF2C 802426AC 8E510148 */ lw $s1, 0x148($s2) +/* BFFF30 802426B0 00A0982D */ daddu $s3, $a1, $zero +/* BFFF34 802426B4 86240008 */ lh $a0, 8($s1) +/* BFFF38 802426B8 0C00EABB */ jal get_npc_unsafe +/* BFFF3C 802426BC 00C0A02D */ daddu $s4, $a2, $zero +/* BFFF40 802426C0 8E630014 */ lw $v1, 0x14($s3) +/* BFFF44 802426C4 04600030 */ bltz $v1, .L80242788 +/* BFFF48 802426C8 0040802D */ daddu $s0, $v0, $zero +/* BFFF4C 802426CC 8E420074 */ lw $v0, 0x74($s2) +/* BFFF50 802426D0 1C40002C */ bgtz $v0, .L80242784 +/* BFFF54 802426D4 2442FFFF */ addiu $v0, $v0, -1 +/* BFFF58 802426D8 0280202D */ daddu $a0, $s4, $zero +/* BFFF5C 802426DC AE430074 */ sw $v1, 0x74($s2) +/* BFFF60 802426E0 AFA00010 */ sw $zero, 0x10($sp) +/* BFFF64 802426E4 8E66000C */ lw $a2, 0xc($s3) +/* BFFF68 802426E8 8E670010 */ lw $a3, 0x10($s3) +/* BFFF6C 802426EC 0C01242D */ jal func_800490B4 +/* BFFF70 802426F0 0220282D */ daddu $a1, $s1, $zero +/* BFFF74 802426F4 10400021 */ beqz $v0, .L8024277C +/* BFFF78 802426F8 0000202D */ daddu $a0, $zero, $zero +/* BFFF7C 802426FC 0200282D */ daddu $a1, $s0, $zero +/* BFFF80 80242700 0000302D */ daddu $a2, $zero, $zero +/* BFFF84 80242704 860300A8 */ lh $v1, 0xa8($s0) +/* BFFF88 80242708 3C013F80 */ lui $at, 0x3f80 +/* BFFF8C 8024270C 44810000 */ mtc1 $at, $f0 +/* BFFF90 80242710 3C014000 */ lui $at, 0x4000 +/* BFFF94 80242714 44811000 */ mtc1 $at, $f2 +/* BFFF98 80242718 3C01C1A0 */ lui $at, 0xc1a0 +/* BFFF9C 8024271C 44812000 */ mtc1 $at, $f4 +/* BFFFA0 80242720 2402000F */ addiu $v0, $zero, 0xf +/* BFFFA4 80242724 AFA2001C */ sw $v0, 0x1c($sp) +/* BFFFA8 80242728 44833000 */ mtc1 $v1, $f6 +/* BFFFAC 8024272C 00000000 */ nop +/* BFFFB0 80242730 468031A0 */ cvt.s.w $f6, $f6 +/* BFFFB4 80242734 44073000 */ mfc1 $a3, $f6 +/* BFFFB8 80242738 27A20028 */ addiu $v0, $sp, 0x28 +/* BFFFBC 8024273C AFA20020 */ sw $v0, 0x20($sp) +/* BFFFC0 80242740 E7A00010 */ swc1 $f0, 0x10($sp) +/* BFFFC4 80242744 E7A20014 */ swc1 $f2, 0x14($sp) +/* BFFFC8 80242748 0C01BFA4 */ jal fx_emote +/* BFFFCC 8024274C E7A40018 */ swc1 $f4, 0x18($sp) +/* BFFFD0 80242750 0200202D */ daddu $a0, $s0, $zero +/* BFFFD4 80242754 240502F4 */ addiu $a1, $zero, 0x2f4 +/* BFFFD8 80242758 0C012530 */ jal func_800494C0 +/* BFFFDC 8024275C 3C060020 */ lui $a2, 0x20 +/* BFFFE0 80242760 8E220018 */ lw $v0, 0x18($s1) +/* BFFFE4 80242764 9442002A */ lhu $v0, 0x2a($v0) +/* BFFFE8 80242768 30420001 */ andi $v0, $v0, 1 +/* BFFFEC 8024276C 14400064 */ bnez $v0, .L80242900 +/* BFFFF0 80242770 2402000A */ addiu $v0, $zero, 0xa +/* BFFFF4 80242774 08090A40 */ j .L80242900 +/* BFFFF8 80242778 2402000C */ addiu $v0, $zero, 0xc +.L8024277C: +/* BFFFFC 8024277C 8E420074 */ lw $v0, 0x74($s2) +/* C00000 80242780 2442FFFF */ addiu $v0, $v0, -1 +.L80242784: +/* C00004 80242784 AE420074 */ sw $v0, 0x74($s2) +.L80242788: +/* C00008 80242788 8602008C */ lh $v0, 0x8c($s0) +/* C0000C 8024278C 1440005D */ bnez $v0, .L80242904 +/* C00010 80242790 00000000 */ nop +/* C00014 80242794 C6000018 */ lwc1 $f0, 0x18($s0) +/* C00018 80242798 3C014010 */ lui $at, 0x4010 +/* C0001C 8024279C 44811800 */ mtc1 $at, $f3 +/* C00020 802427A0 44801000 */ mtc1 $zero, $f2 +/* C00024 802427A4 46000021 */ cvt.d.s $f0, $f0 +/* C00028 802427A8 4622003C */ c.lt.d $f0, $f2 +/* C0002C 802427AC 00000000 */ nop +/* C00030 802427B0 45000003 */ bc1f .L802427C0 +/* C00034 802427B4 0200202D */ daddu $a0, $s0, $zero +/* C00038 802427B8 080909F1 */ j .L802427C4 +/* C0003C 802427BC 0000282D */ daddu $a1, $zero, $zero +.L802427C0: +/* C00040 802427C0 24050001 */ addiu $a1, $zero, 1 +.L802427C4: +/* C00044 802427C4 0C00F598 */ jal func_8003D660 +/* C00048 802427C8 00000000 */ nop +/* C0004C 802427CC C60C0038 */ lwc1 $f12, 0x38($s0) +/* C00050 802427D0 8E430078 */ lw $v1, 0x78($s2) +/* C00054 802427D4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C00058 802427D8 00031040 */ sll $v0, $v1, 1 +/* C0005C 802427DC 00431021 */ addu $v0, $v0, $v1 +/* C00060 802427E0 8E2300D0 */ lw $v1, 0xd0($s1) +/* C00064 802427E4 00021080 */ sll $v0, $v0, 2 +/* C00068 802427E8 00431021 */ addu $v0, $v0, $v1 +/* C0006C 802427EC C4560004 */ lwc1 $f22, 4($v0) +/* C00070 802427F0 4680B5A0 */ cvt.s.w $f22, $f22 +/* C00074 802427F4 C454000C */ lwc1 $f20, 0xc($v0) +/* C00078 802427F8 4680A520 */ cvt.s.w $f20, $f20 +/* C0007C 802427FC 4406B000 */ mfc1 $a2, $f22 +/* C00080 80242800 4407A000 */ mfc1 $a3, $f20 +/* C00084 80242804 0C00A720 */ jal atan2 +/* C00088 80242808 00000000 */ nop +/* C0008C 8024280C 8E050018 */ lw $a1, 0x18($s0) +/* C00090 80242810 44060000 */ mfc1 $a2, $f0 +/* C00094 80242814 0200202D */ daddu $a0, $s0, $zero +/* C00098 80242818 0C00EA95 */ jal npc_move_heading +/* C0009C 8024281C AE06000C */ sw $a2, 0xc($s0) +/* C000A0 80242820 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C000A4 80242824 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C000A8 80242828 4406B000 */ mfc1 $a2, $f22 +/* C000AC 8024282C 4407A000 */ mfc1 $a3, $f20 +/* C000B0 80242830 0C00A7B5 */ jal dist2D +/* C000B4 80242834 00000000 */ nop +/* C000B8 80242838 C6020018 */ lwc1 $f2, 0x18($s0) +/* C000BC 8024283C 4602003E */ c.le.s $f0, $f2 +/* C000C0 80242840 00000000 */ nop +/* C000C4 80242844 4500002F */ bc1f .L80242904 +/* C000C8 80242848 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C000CC 8024284C 24020002 */ addiu $v0, $zero, 2 +/* C000D0 80242850 0C00A67F */ jal rand_int +/* C000D4 80242854 AE420070 */ sw $v0, 0x70($s2) +/* C000D8 80242858 3C035555 */ lui $v1, 0x5555 +/* C000DC 8024285C 34635556 */ ori $v1, $v1, 0x5556 +/* C000E0 80242860 00430018 */ mult $v0, $v1 +/* C000E4 80242864 000227C3 */ sra $a0, $v0, 0x1f +/* C000E8 80242868 00004010 */ mfhi $t0 +/* C000EC 8024286C 01042023 */ subu $a0, $t0, $a0 +/* C000F0 80242870 00041840 */ sll $v1, $a0, 1 +/* C000F4 80242874 00641821 */ addu $v1, $v1, $a0 +/* C000F8 80242878 00431023 */ subu $v0, $v0, $v1 +/* C000FC 8024287C 24430002 */ addiu $v1, $v0, 2 +/* C00100 80242880 AE430074 */ sw $v1, 0x74($s2) +/* C00104 80242884 8E62002C */ lw $v0, 0x2c($s3) +/* C00108 80242888 18400009 */ blez $v0, .L802428B0 +/* C0010C 8024288C 24020004 */ addiu $v0, $zero, 4 +/* C00110 80242890 8E620004 */ lw $v0, 4($s3) +/* C00114 80242894 18400006 */ blez $v0, .L802428B0 +/* C00118 80242898 24020004 */ addiu $v0, $zero, 4 +/* C0011C 8024289C 8E620008 */ lw $v0, 8($s3) +/* C00120 802428A0 18400003 */ blez $v0, .L802428B0 +/* C00124 802428A4 24020004 */ addiu $v0, $zero, 4 +/* C00128 802428A8 14600002 */ bnez $v1, .L802428B4 +/* C0012C 802428AC 00000000 */ nop +.L802428B0: +/* C00130 802428B0 AE420070 */ sw $v0, 0x70($s2) +.L802428B4: +/* C00134 802428B4 0C00A67F */ jal rand_int +/* C00138 802428B8 24042710 */ addiu $a0, $zero, 0x2710 +/* C0013C 802428BC 3C0351EB */ lui $v1, 0x51eb +/* C00140 802428C0 3463851F */ ori $v1, $v1, 0x851f +/* C00144 802428C4 00430018 */ mult $v0, $v1 +/* C00148 802428C8 00021FC3 */ sra $v1, $v0, 0x1f +/* C0014C 802428CC 00004010 */ mfhi $t0 +/* C00150 802428D0 00082143 */ sra $a0, $t0, 5 +/* C00154 802428D4 00832023 */ subu $a0, $a0, $v1 +/* C00158 802428D8 00041840 */ sll $v1, $a0, 1 +/* C0015C 802428DC 00641821 */ addu $v1, $v1, $a0 +/* C00160 802428E0 000318C0 */ sll $v1, $v1, 3 +/* C00164 802428E4 00641821 */ addu $v1, $v1, $a0 +/* C00168 802428E8 00031880 */ sll $v1, $v1, 2 +/* C0016C 802428EC 8E640004 */ lw $a0, 4($s3) +/* C00170 802428F0 00431023 */ subu $v0, $v0, $v1 +/* C00174 802428F4 0044102A */ slt $v0, $v0, $a0 +/* C00178 802428F8 10400002 */ beqz $v0, .L80242904 +/* C0017C 802428FC 24020004 */ addiu $v0, $zero, 4 +.L80242900: +/* C00180 80242900 AE420070 */ sw $v0, 0x70($s2) +.L80242904: +/* C00184 80242904 8FBF0044 */ lw $ra, 0x44($sp) +/* C00188 80242908 8FB40040 */ lw $s4, 0x40($sp) +/* C0018C 8024290C 8FB3003C */ lw $s3, 0x3c($sp) +/* C00190 80242910 8FB20038 */ lw $s2, 0x38($sp) +/* C00194 80242914 8FB10034 */ lw $s1, 0x34($sp) +/* C00198 80242918 8FB00030 */ lw $s0, 0x30($sp) +/* C0019C 8024291C D7B60050 */ ldc1 $f22, 0x50($sp) +/* C001A0 80242920 D7B40048 */ ldc1 $f20, 0x48($sp) +/* C001A4 80242924 03E00008 */ jr $ra +/* C001A8 80242928 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024292C.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024292C.s deleted file mode 100644 index 3707e0789e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024292C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024292C -/* C001AC 8024292C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C001B0 80242930 AFB3001C */ sw $s3, 0x1c($sp) -/* C001B4 80242934 0080982D */ daddu $s3, $a0, $zero -/* C001B8 80242938 AFBF0020 */ sw $ra, 0x20($sp) -/* C001BC 8024293C AFB20018 */ sw $s2, 0x18($sp) -/* C001C0 80242940 AFB10014 */ sw $s1, 0x14($sp) -/* C001C4 80242944 AFB00010 */ sw $s0, 0x10($sp) -/* C001C8 80242948 8E720148 */ lw $s2, 0x148($s3) -/* C001CC 8024294C 86440008 */ lh $a0, 8($s2) -/* C001D0 80242950 0C00EABB */ jal get_npc_unsafe -/* C001D4 80242954 00A0882D */ daddu $s1, $a1, $zero -/* C001D8 80242958 8E240008 */ lw $a0, 8($s1) -/* C001DC 8024295C 0040802D */ daddu $s0, $v0, $zero -/* C001E0 80242960 00041FC2 */ srl $v1, $a0, 0x1f -/* C001E4 80242964 00832021 */ addu $a0, $a0, $v1 -/* C001E8 80242968 00042043 */ sra $a0, $a0, 1 -/* C001EC 8024296C 0C00A67F */ jal rand_int -/* C001F0 80242970 24840001 */ addiu $a0, $a0, 1 -/* C001F4 80242974 8E230008 */ lw $v1, 8($s1) -/* C001F8 80242978 240400B4 */ addiu $a0, $zero, 0xb4 -/* C001FC 8024297C 00032FC2 */ srl $a1, $v1, 0x1f -/* C00200 80242980 00651821 */ addu $v1, $v1, $a1 -/* C00204 80242984 00031843 */ sra $v1, $v1, 1 -/* C00208 80242988 00621821 */ addu $v1, $v1, $v0 -/* C0020C 8024298C 0C00A67F */ jal rand_int -/* C00210 80242990 A603008E */ sh $v1, 0x8e($s0) -/* C00214 80242994 C60C000C */ lwc1 $f12, 0xc($s0) -/* C00218 80242998 44820000 */ mtc1 $v0, $f0 -/* C0021C 8024299C 00000000 */ nop -/* C00220 802429A0 46800020 */ cvt.s.w $f0, $f0 -/* C00224 802429A4 46006300 */ add.s $f12, $f12, $f0 -/* C00228 802429A8 3C0142B4 */ lui $at, 0x42b4 -/* C0022C 802429AC 44810000 */ mtc1 $at, $f0 -/* C00230 802429B0 0C00A6C9 */ jal clamp_angle -/* C00234 802429B4 46006301 */ sub.s $f12, $f12, $f0 -/* C00238 802429B8 E600000C */ swc1 $f0, 0xc($s0) -/* C0023C 802429BC 8E4200CC */ lw $v0, 0xcc($s2) -/* C00240 802429C0 8C420000 */ lw $v0, ($v0) -/* C00244 802429C4 AE020028 */ sw $v0, 0x28($s0) -/* C00248 802429C8 24020003 */ addiu $v0, $zero, 3 -/* C0024C 802429CC AE620070 */ sw $v0, 0x70($s3) -/* C00250 802429D0 8FBF0020 */ lw $ra, 0x20($sp) -/* C00254 802429D4 8FB3001C */ lw $s3, 0x1c($sp) -/* C00258 802429D8 8FB20018 */ lw $s2, 0x18($sp) -/* C0025C 802429DC 8FB10014 */ lw $s1, 0x14($sp) -/* C00260 802429E0 8FB00010 */ lw $s0, 0x10($sp) -/* C00264 802429E4 03E00008 */ jr $ra -/* C00268 802429E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024292C_C001AC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024292C_C001AC.s new file mode 100644 index 0000000000..1ac3cb17f9 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_8024292C_C001AC.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024292C_C001AC +/* C001AC 8024292C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C001B0 80242930 AFB3001C */ sw $s3, 0x1c($sp) +/* C001B4 80242934 0080982D */ daddu $s3, $a0, $zero +/* C001B8 80242938 AFBF0020 */ sw $ra, 0x20($sp) +/* C001BC 8024293C AFB20018 */ sw $s2, 0x18($sp) +/* C001C0 80242940 AFB10014 */ sw $s1, 0x14($sp) +/* C001C4 80242944 AFB00010 */ sw $s0, 0x10($sp) +/* C001C8 80242948 8E720148 */ lw $s2, 0x148($s3) +/* C001CC 8024294C 86440008 */ lh $a0, 8($s2) +/* C001D0 80242950 0C00EABB */ jal get_npc_unsafe +/* C001D4 80242954 00A0882D */ daddu $s1, $a1, $zero +/* C001D8 80242958 8E240008 */ lw $a0, 8($s1) +/* C001DC 8024295C 0040802D */ daddu $s0, $v0, $zero +/* C001E0 80242960 00041FC2 */ srl $v1, $a0, 0x1f +/* C001E4 80242964 00832021 */ addu $a0, $a0, $v1 +/* C001E8 80242968 00042043 */ sra $a0, $a0, 1 +/* C001EC 8024296C 0C00A67F */ jal rand_int +/* C001F0 80242970 24840001 */ addiu $a0, $a0, 1 +/* C001F4 80242974 8E230008 */ lw $v1, 8($s1) +/* C001F8 80242978 240400B4 */ addiu $a0, $zero, 0xb4 +/* C001FC 8024297C 00032FC2 */ srl $a1, $v1, 0x1f +/* C00200 80242980 00651821 */ addu $v1, $v1, $a1 +/* C00204 80242984 00031843 */ sra $v1, $v1, 1 +/* C00208 80242988 00621821 */ addu $v1, $v1, $v0 +/* C0020C 8024298C 0C00A67F */ jal rand_int +/* C00210 80242990 A603008E */ sh $v1, 0x8e($s0) +/* C00214 80242994 C60C000C */ lwc1 $f12, 0xc($s0) +/* C00218 80242998 44820000 */ mtc1 $v0, $f0 +/* C0021C 8024299C 00000000 */ nop +/* C00220 802429A0 46800020 */ cvt.s.w $f0, $f0 +/* C00224 802429A4 46006300 */ add.s $f12, $f12, $f0 +/* C00228 802429A8 3C0142B4 */ lui $at, 0x42b4 +/* C0022C 802429AC 44810000 */ mtc1 $at, $f0 +/* C00230 802429B0 0C00A6C9 */ jal clamp_angle +/* C00234 802429B4 46006301 */ sub.s $f12, $f12, $f0 +/* C00238 802429B8 E600000C */ swc1 $f0, 0xc($s0) +/* C0023C 802429BC 8E4200CC */ lw $v0, 0xcc($s2) +/* C00240 802429C0 8C420000 */ lw $v0, ($v0) +/* C00244 802429C4 AE020028 */ sw $v0, 0x28($s0) +/* C00248 802429C8 24020003 */ addiu $v0, $zero, 3 +/* C0024C 802429CC AE620070 */ sw $v0, 0x70($s3) +/* C00250 802429D0 8FBF0020 */ lw $ra, 0x20($sp) +/* C00254 802429D4 8FB3001C */ lw $s3, 0x1c($sp) +/* C00258 802429D8 8FB20018 */ lw $s2, 0x18($sp) +/* C0025C 802429DC 8FB10014 */ lw $s1, 0x14($sp) +/* C00260 802429E0 8FB00010 */ lw $s0, 0x10($sp) +/* C00264 802429E4 03E00008 */ jr $ra +/* C00268 802429E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC.s deleted file mode 100644 index 9710b03ea9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429EC -/* C0026C 802429EC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C00270 802429F0 AFB40040 */ sw $s4, 0x40($sp) -/* C00274 802429F4 0080A02D */ daddu $s4, $a0, $zero -/* C00278 802429F8 AFBF0044 */ sw $ra, 0x44($sp) -/* C0027C 802429FC AFB3003C */ sw $s3, 0x3c($sp) -/* C00280 80242A00 AFB20038 */ sw $s2, 0x38($sp) -/* C00284 80242A04 AFB10034 */ sw $s1, 0x34($sp) -/* C00288 80242A08 AFB00030 */ sw $s0, 0x30($sp) -/* C0028C 80242A0C 8E910148 */ lw $s1, 0x148($s4) -/* C00290 80242A10 00A0902D */ daddu $s2, $a1, $zero -/* C00294 80242A14 86240008 */ lh $a0, 8($s1) -/* C00298 80242A18 0C00EABB */ jal get_npc_unsafe -/* C0029C 80242A1C 00C0982D */ daddu $s3, $a2, $zero -/* C002A0 80242A20 8E430014 */ lw $v1, 0x14($s2) -/* C002A4 80242A24 04600031 */ bltz $v1, .L80242AEC -/* C002A8 80242A28 0040802D */ daddu $s0, $v0, $zero -/* C002AC 80242A2C 0260202D */ daddu $a0, $s3, $zero -/* C002B0 80242A30 AFA00010 */ sw $zero, 0x10($sp) -/* C002B4 80242A34 8E460024 */ lw $a2, 0x24($s2) -/* C002B8 80242A38 8E470028 */ lw $a3, 0x28($s2) -/* C002BC 80242A3C 0C01242D */ jal func_800490B4 -/* C002C0 80242A40 0220282D */ daddu $a1, $s1, $zero -/* C002C4 80242A44 10400029 */ beqz $v0, .L80242AEC -/* C002C8 80242A48 0000202D */ daddu $a0, $zero, $zero -/* C002CC 80242A4C 0200282D */ daddu $a1, $s0, $zero -/* C002D0 80242A50 0000302D */ daddu $a2, $zero, $zero -/* C002D4 80242A54 860300A8 */ lh $v1, 0xa8($s0) -/* C002D8 80242A58 3C013F80 */ lui $at, 0x3f80 -/* C002DC 80242A5C 44810000 */ mtc1 $at, $f0 -/* C002E0 80242A60 3C014000 */ lui $at, 0x4000 -/* C002E4 80242A64 44811000 */ mtc1 $at, $f2 -/* C002E8 80242A68 3C01C1A0 */ lui $at, 0xc1a0 -/* C002EC 80242A6C 44812000 */ mtc1 $at, $f4 -/* C002F0 80242A70 2402000F */ addiu $v0, $zero, 0xf -/* C002F4 80242A74 AFA2001C */ sw $v0, 0x1c($sp) -/* C002F8 80242A78 44833000 */ mtc1 $v1, $f6 -/* C002FC 80242A7C 00000000 */ nop -/* C00300 80242A80 468031A0 */ cvt.s.w $f6, $f6 -/* C00304 80242A84 44073000 */ mfc1 $a3, $f6 -/* C00308 80242A88 27A20028 */ addiu $v0, $sp, 0x28 -/* C0030C 80242A8C AFA20020 */ sw $v0, 0x20($sp) -/* C00310 80242A90 E7A00010 */ swc1 $f0, 0x10($sp) -/* C00314 80242A94 E7A20014 */ swc1 $f2, 0x14($sp) -/* C00318 80242A98 0C01BFA4 */ jal fx_emote -/* C0031C 80242A9C E7A40018 */ swc1 $f4, 0x18($sp) -/* C00320 80242AA0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C00324 80242AA4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C00328 80242AA8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C0032C 80242AAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* C00330 80242AB0 8C460028 */ lw $a2, 0x28($v0) -/* C00334 80242AB4 0C00A720 */ jal atan2 -/* C00338 80242AB8 8C470030 */ lw $a3, 0x30($v0) -/* C0033C 80242ABC 0200202D */ daddu $a0, $s0, $zero -/* C00340 80242AC0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C00344 80242AC4 3C060020 */ lui $a2, 0x20 -/* C00348 80242AC8 0C012530 */ jal func_800494C0 -/* C0034C 80242ACC E480000C */ swc1 $f0, 0xc($a0) -/* C00350 80242AD0 8E220018 */ lw $v0, 0x18($s1) -/* C00354 80242AD4 9442002A */ lhu $v0, 0x2a($v0) -/* C00358 80242AD8 30420001 */ andi $v0, $v0, 1 -/* C0035C 80242ADC 14400029 */ bnez $v0, .L80242B84 -/* C00360 80242AE0 2402000A */ addiu $v0, $zero, 0xa -/* C00364 80242AE4 08090AE1 */ j .L80242B84 -/* C00368 80242AE8 2402000C */ addiu $v0, $zero, 0xc -.L80242AEC: -/* C0036C 80242AEC 8602008C */ lh $v0, 0x8c($s0) -/* C00370 80242AF0 14400025 */ bnez $v0, .L80242B88 -/* C00374 80242AF4 00000000 */ nop -/* C00378 80242AF8 9602008E */ lhu $v0, 0x8e($s0) -/* C0037C 80242AFC 2442FFFF */ addiu $v0, $v0, -1 -/* C00380 80242B00 A602008E */ sh $v0, 0x8e($s0) -/* C00384 80242B04 00021400 */ sll $v0, $v0, 0x10 -/* C00388 80242B08 1440001F */ bnez $v0, .L80242B88 -/* C0038C 80242B0C 00000000 */ nop -/* C00390 80242B10 8E820074 */ lw $v0, 0x74($s4) -/* C00394 80242B14 2442FFFF */ addiu $v0, $v0, -1 -/* C00398 80242B18 10400019 */ beqz $v0, .L80242B80 -/* C0039C 80242B1C AE820074 */ sw $v0, 0x74($s4) -/* C003A0 80242B20 8E220018 */ lw $v0, 0x18($s1) -/* C003A4 80242B24 9442002A */ lhu $v0, 0x2a($v0) -/* C003A8 80242B28 30420010 */ andi $v0, $v0, 0x10 -/* C003AC 80242B2C 14400007 */ bnez $v0, .L80242B4C -/* C003B0 80242B30 00000000 */ nop -/* C003B4 80242B34 C600000C */ lwc1 $f0, 0xc($s0) -/* C003B8 80242B38 3C014334 */ lui $at, 0x4334 -/* C003BC 80242B3C 44816000 */ mtc1 $at, $f12 -/* C003C0 80242B40 0C00A6C9 */ jal clamp_angle -/* C003C4 80242B44 460C0300 */ add.s $f12, $f0, $f12 -/* C003C8 80242B48 E600000C */ swc1 $f0, 0xc($s0) -.L80242B4C: -/* C003CC 80242B4C 8E440008 */ lw $a0, 8($s2) -/* C003D0 80242B50 000417C2 */ srl $v0, $a0, 0x1f -/* C003D4 80242B54 00822021 */ addu $a0, $a0, $v0 -/* C003D8 80242B58 00042043 */ sra $a0, $a0, 1 -/* C003DC 80242B5C 0C00A67F */ jal rand_int -/* C003E0 80242B60 24840001 */ addiu $a0, $a0, 1 -/* C003E4 80242B64 8E430008 */ lw $v1, 8($s2) -/* C003E8 80242B68 000327C2 */ srl $a0, $v1, 0x1f -/* C003EC 80242B6C 00641821 */ addu $v1, $v1, $a0 -/* C003F0 80242B70 00031843 */ sra $v1, $v1, 1 -/* C003F4 80242B74 00621821 */ addu $v1, $v1, $v0 -/* C003F8 80242B78 08090AE2 */ j .L80242B88 -/* C003FC 80242B7C A603008E */ sh $v1, 0x8e($s0) -.L80242B80: -/* C00400 80242B80 24020004 */ addiu $v0, $zero, 4 -.L80242B84: -/* C00404 80242B84 AE820070 */ sw $v0, 0x70($s4) -.L80242B88: -/* C00408 80242B88 8FBF0044 */ lw $ra, 0x44($sp) -/* C0040C 80242B8C 8FB40040 */ lw $s4, 0x40($sp) -/* C00410 80242B90 8FB3003C */ lw $s3, 0x3c($sp) -/* C00414 80242B94 8FB20038 */ lw $s2, 0x38($sp) -/* C00418 80242B98 8FB10034 */ lw $s1, 0x34($sp) -/* C0041C 80242B9C 8FB00030 */ lw $s0, 0x30($sp) -/* C00420 80242BA0 03E00008 */ jr $ra -/* C00424 80242BA4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s new file mode 100644 index 0000000000..79d8316f3a --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802429EC_C0026C.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429EC_C0026C +/* C0026C 802429EC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C00270 802429F0 AFB40040 */ sw $s4, 0x40($sp) +/* C00274 802429F4 0080A02D */ daddu $s4, $a0, $zero +/* C00278 802429F8 AFBF0044 */ sw $ra, 0x44($sp) +/* C0027C 802429FC AFB3003C */ sw $s3, 0x3c($sp) +/* C00280 80242A00 AFB20038 */ sw $s2, 0x38($sp) +/* C00284 80242A04 AFB10034 */ sw $s1, 0x34($sp) +/* C00288 80242A08 AFB00030 */ sw $s0, 0x30($sp) +/* C0028C 80242A0C 8E910148 */ lw $s1, 0x148($s4) +/* C00290 80242A10 00A0902D */ daddu $s2, $a1, $zero +/* C00294 80242A14 86240008 */ lh $a0, 8($s1) +/* C00298 80242A18 0C00EABB */ jal get_npc_unsafe +/* C0029C 80242A1C 00C0982D */ daddu $s3, $a2, $zero +/* C002A0 80242A20 8E430014 */ lw $v1, 0x14($s2) +/* C002A4 80242A24 04600031 */ bltz $v1, .L80242AEC +/* C002A8 80242A28 0040802D */ daddu $s0, $v0, $zero +/* C002AC 80242A2C 0260202D */ daddu $a0, $s3, $zero +/* C002B0 80242A30 AFA00010 */ sw $zero, 0x10($sp) +/* C002B4 80242A34 8E460024 */ lw $a2, 0x24($s2) +/* C002B8 80242A38 8E470028 */ lw $a3, 0x28($s2) +/* C002BC 80242A3C 0C01242D */ jal func_800490B4 +/* C002C0 80242A40 0220282D */ daddu $a1, $s1, $zero +/* C002C4 80242A44 10400029 */ beqz $v0, .L80242AEC +/* C002C8 80242A48 0000202D */ daddu $a0, $zero, $zero +/* C002CC 80242A4C 0200282D */ daddu $a1, $s0, $zero +/* C002D0 80242A50 0000302D */ daddu $a2, $zero, $zero +/* C002D4 80242A54 860300A8 */ lh $v1, 0xa8($s0) +/* C002D8 80242A58 3C013F80 */ lui $at, 0x3f80 +/* C002DC 80242A5C 44810000 */ mtc1 $at, $f0 +/* C002E0 80242A60 3C014000 */ lui $at, 0x4000 +/* C002E4 80242A64 44811000 */ mtc1 $at, $f2 +/* C002E8 80242A68 3C01C1A0 */ lui $at, 0xc1a0 +/* C002EC 80242A6C 44812000 */ mtc1 $at, $f4 +/* C002F0 80242A70 2402000F */ addiu $v0, $zero, 0xf +/* C002F4 80242A74 AFA2001C */ sw $v0, 0x1c($sp) +/* C002F8 80242A78 44833000 */ mtc1 $v1, $f6 +/* C002FC 80242A7C 00000000 */ nop +/* C00300 80242A80 468031A0 */ cvt.s.w $f6, $f6 +/* C00304 80242A84 44073000 */ mfc1 $a3, $f6 +/* C00308 80242A88 27A20028 */ addiu $v0, $sp, 0x28 +/* C0030C 80242A8C AFA20020 */ sw $v0, 0x20($sp) +/* C00310 80242A90 E7A00010 */ swc1 $f0, 0x10($sp) +/* C00314 80242A94 E7A20014 */ swc1 $f2, 0x14($sp) +/* C00318 80242A98 0C01BFA4 */ jal fx_emote +/* C0031C 80242A9C E7A40018 */ swc1 $f4, 0x18($sp) +/* C00320 80242AA0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C00324 80242AA4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C00328 80242AA8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C0032C 80242AAC C60E0040 */ lwc1 $f14, 0x40($s0) +/* C00330 80242AB0 8C460028 */ lw $a2, 0x28($v0) +/* C00334 80242AB4 0C00A720 */ jal atan2 +/* C00338 80242AB8 8C470030 */ lw $a3, 0x30($v0) +/* C0033C 80242ABC 0200202D */ daddu $a0, $s0, $zero +/* C00340 80242AC0 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C00344 80242AC4 3C060020 */ lui $a2, 0x20 +/* C00348 80242AC8 0C012530 */ jal func_800494C0 +/* C0034C 80242ACC E480000C */ swc1 $f0, 0xc($a0) +/* C00350 80242AD0 8E220018 */ lw $v0, 0x18($s1) +/* C00354 80242AD4 9442002A */ lhu $v0, 0x2a($v0) +/* C00358 80242AD8 30420001 */ andi $v0, $v0, 1 +/* C0035C 80242ADC 14400029 */ bnez $v0, .L80242B84 +/* C00360 80242AE0 2402000A */ addiu $v0, $zero, 0xa +/* C00364 80242AE4 08090AE1 */ j .L80242B84 +/* C00368 80242AE8 2402000C */ addiu $v0, $zero, 0xc +.L80242AEC: +/* C0036C 80242AEC 8602008C */ lh $v0, 0x8c($s0) +/* C00370 80242AF0 14400025 */ bnez $v0, .L80242B88 +/* C00374 80242AF4 00000000 */ nop +/* C00378 80242AF8 9602008E */ lhu $v0, 0x8e($s0) +/* C0037C 80242AFC 2442FFFF */ addiu $v0, $v0, -1 +/* C00380 80242B00 A602008E */ sh $v0, 0x8e($s0) +/* C00384 80242B04 00021400 */ sll $v0, $v0, 0x10 +/* C00388 80242B08 1440001F */ bnez $v0, .L80242B88 +/* C0038C 80242B0C 00000000 */ nop +/* C00390 80242B10 8E820074 */ lw $v0, 0x74($s4) +/* C00394 80242B14 2442FFFF */ addiu $v0, $v0, -1 +/* C00398 80242B18 10400019 */ beqz $v0, .L80242B80 +/* C0039C 80242B1C AE820074 */ sw $v0, 0x74($s4) +/* C003A0 80242B20 8E220018 */ lw $v0, 0x18($s1) +/* C003A4 80242B24 9442002A */ lhu $v0, 0x2a($v0) +/* C003A8 80242B28 30420010 */ andi $v0, $v0, 0x10 +/* C003AC 80242B2C 14400007 */ bnez $v0, .L80242B4C +/* C003B0 80242B30 00000000 */ nop +/* C003B4 80242B34 C600000C */ lwc1 $f0, 0xc($s0) +/* C003B8 80242B38 3C014334 */ lui $at, 0x4334 +/* C003BC 80242B3C 44816000 */ mtc1 $at, $f12 +/* C003C0 80242B40 0C00A6C9 */ jal clamp_angle +/* C003C4 80242B44 460C0300 */ add.s $f12, $f0, $f12 +/* C003C8 80242B48 E600000C */ swc1 $f0, 0xc($s0) +.L80242B4C: +/* C003CC 80242B4C 8E440008 */ lw $a0, 8($s2) +/* C003D0 80242B50 000417C2 */ srl $v0, $a0, 0x1f +/* C003D4 80242B54 00822021 */ addu $a0, $a0, $v0 +/* C003D8 80242B58 00042043 */ sra $a0, $a0, 1 +/* C003DC 80242B5C 0C00A67F */ jal rand_int +/* C003E0 80242B60 24840001 */ addiu $a0, $a0, 1 +/* C003E4 80242B64 8E430008 */ lw $v1, 8($s2) +/* C003E8 80242B68 000327C2 */ srl $a0, $v1, 0x1f +/* C003EC 80242B6C 00641821 */ addu $v1, $v1, $a0 +/* C003F0 80242B70 00031843 */ sra $v1, $v1, 1 +/* C003F4 80242B74 00621821 */ addu $v1, $v1, $v0 +/* C003F8 80242B78 08090AE2 */ j .L80242B88 +/* C003FC 80242B7C A603008E */ sh $v1, 0x8e($s0) +.L80242B80: +/* C00400 80242B80 24020004 */ addiu $v0, $zero, 4 +.L80242B84: +/* C00404 80242B84 AE820070 */ sw $v0, 0x70($s4) +.L80242B88: +/* C00408 80242B88 8FBF0044 */ lw $ra, 0x44($sp) +/* C0040C 80242B8C 8FB40040 */ lw $s4, 0x40($sp) +/* C00410 80242B90 8FB3003C */ lw $s3, 0x3c($sp) +/* C00414 80242B94 8FB20038 */ lw $s2, 0x38($sp) +/* C00418 80242B98 8FB10034 */ lw $s1, 0x34($sp) +/* C0041C 80242B9C 8FB00030 */ lw $s0, 0x30($sp) +/* C00420 80242BA0 03E00008 */ jr $ra +/* C00424 80242BA4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0.s deleted file mode 100644 index 859aea820a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CD0 -/* C00550 80242CD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C00554 80242CD4 AFB00010 */ sw $s0, 0x10($sp) -/* C00558 80242CD8 0080802D */ daddu $s0, $a0, $zero -/* C0055C 80242CDC AFBF0014 */ sw $ra, 0x14($sp) -/* C00560 80242CE0 8E020148 */ lw $v0, 0x148($s0) -/* C00564 80242CE4 0C00EABB */ jal get_npc_unsafe -/* C00568 80242CE8 84440008 */ lh $a0, 8($v0) -/* C0056C 80242CEC 0040202D */ daddu $a0, $v0, $zero -/* C00570 80242CF0 C482003C */ lwc1 $f2, 0x3c($a0) -/* C00574 80242CF4 C480001C */ lwc1 $f0, 0x1c($a0) -/* C00578 80242CF8 46001080 */ add.s $f2, $f2, $f0 -/* C0057C 80242CFC C4840014 */ lwc1 $f4, 0x14($a0) -/* C00580 80242D00 46040001 */ sub.s $f0, $f0, $f4 -/* C00584 80242D04 C4840064 */ lwc1 $f4, 0x64($a0) -/* C00588 80242D08 4602203C */ c.lt.s $f4, $f2 -/* C0058C 80242D0C E482003C */ swc1 $f2, 0x3c($a0) -/* C00590 80242D10 45010009 */ bc1t .L80242D38 -/* C00594 80242D14 E480001C */ swc1 $f0, 0x1c($a0) -/* C00598 80242D18 8C820000 */ lw $v0, ($a0) -/* C0059C 80242D1C 2403F7FF */ addiu $v1, $zero, -0x801 -/* C005A0 80242D20 E484003C */ swc1 $f4, 0x3c($a0) -/* C005A4 80242D24 AC80001C */ sw $zero, 0x1c($a0) -/* C005A8 80242D28 00431024 */ and $v0, $v0, $v1 -/* C005AC 80242D2C AC820000 */ sw $v0, ($a0) -/* C005B0 80242D30 2402000C */ addiu $v0, $zero, 0xc -/* C005B4 80242D34 AE020070 */ sw $v0, 0x70($s0) -.L80242D38: -/* C005B8 80242D38 8FBF0014 */ lw $ra, 0x14($sp) -/* C005BC 80242D3C 8FB00010 */ lw $s0, 0x10($sp) -/* C005C0 80242D40 03E00008 */ jr $ra -/* C005C4 80242D44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0_C00550.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0_C00550.s new file mode 100644 index 0000000000..4bd7f8bb90 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242CD0_C00550.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242CD0_C00550 +/* C00550 80242CD0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C00554 80242CD4 AFB00010 */ sw $s0, 0x10($sp) +/* C00558 80242CD8 0080802D */ daddu $s0, $a0, $zero +/* C0055C 80242CDC AFBF0014 */ sw $ra, 0x14($sp) +/* C00560 80242CE0 8E020148 */ lw $v0, 0x148($s0) +/* C00564 80242CE4 0C00EABB */ jal get_npc_unsafe +/* C00568 80242CE8 84440008 */ lh $a0, 8($v0) +/* C0056C 80242CEC 0040202D */ daddu $a0, $v0, $zero +/* C00570 80242CF0 C482003C */ lwc1 $f2, 0x3c($a0) +/* C00574 80242CF4 C480001C */ lwc1 $f0, 0x1c($a0) +/* C00578 80242CF8 46001080 */ add.s $f2, $f2, $f0 +/* C0057C 80242CFC C4840014 */ lwc1 $f4, 0x14($a0) +/* C00580 80242D00 46040001 */ sub.s $f0, $f0, $f4 +/* C00584 80242D04 C4840064 */ lwc1 $f4, 0x64($a0) +/* C00588 80242D08 4602203C */ c.lt.s $f4, $f2 +/* C0058C 80242D0C E482003C */ swc1 $f2, 0x3c($a0) +/* C00590 80242D10 45010009 */ bc1t .L80242D38 +/* C00594 80242D14 E480001C */ swc1 $f0, 0x1c($a0) +/* C00598 80242D18 8C820000 */ lw $v0, ($a0) +/* C0059C 80242D1C 2403F7FF */ addiu $v1, $zero, -0x801 +/* C005A0 80242D20 E484003C */ swc1 $f4, 0x3c($a0) +/* C005A4 80242D24 AC80001C */ sw $zero, 0x1c($a0) +/* C005A8 80242D28 00431024 */ and $v0, $v0, $v1 +/* C005AC 80242D2C AC820000 */ sw $v0, ($a0) +/* C005B0 80242D30 2402000C */ addiu $v0, $zero, 0xc +/* C005B4 80242D34 AE020070 */ sw $v0, 0x70($s0) +.L80242D38: +/* C005B8 80242D38 8FBF0014 */ lw $ra, 0x14($sp) +/* C005BC 80242D3C 8FB00010 */ lw $s0, 0x10($sp) +/* C005C0 80242D40 03E00008 */ jr $ra +/* C005C4 80242D44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48.s deleted file mode 100644 index b5faf46e11..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D48 -/* C005C8 80242D48 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C005CC 80242D4C AFB3001C */ sw $s3, 0x1c($sp) -/* C005D0 80242D50 0080982D */ daddu $s3, $a0, $zero -/* C005D4 80242D54 AFBF0020 */ sw $ra, 0x20($sp) -/* C005D8 80242D58 AFB20018 */ sw $s2, 0x18($sp) -/* C005DC 80242D5C AFB10014 */ sw $s1, 0x14($sp) -/* C005E0 80242D60 AFB00010 */ sw $s0, 0x10($sp) -/* C005E4 80242D64 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C005E8 80242D68 8E710148 */ lw $s1, 0x148($s3) -/* C005EC 80242D6C 86240008 */ lh $a0, 8($s1) -/* C005F0 80242D70 0C00EABB */ jal get_npc_unsafe -/* C005F4 80242D74 00A0802D */ daddu $s0, $a1, $zero -/* C005F8 80242D78 8E040020 */ lw $a0, 0x20($s0) -/* C005FC 80242D7C 0040902D */ daddu $s2, $v0, $zero -/* C00600 80242D80 00041FC2 */ srl $v1, $a0, 0x1f -/* C00604 80242D84 00832021 */ addu $a0, $a0, $v1 -/* C00608 80242D88 00042043 */ sra $a0, $a0, 1 -/* C0060C 80242D8C 0C00A67F */ jal rand_int -/* C00610 80242D90 24840001 */ addiu $a0, $a0, 1 -/* C00614 80242D94 8E030020 */ lw $v1, 0x20($s0) -/* C00618 80242D98 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C0061C 80242D9C 000327C2 */ srl $a0, $v1, 0x1f -/* C00620 80242DA0 00641821 */ addu $v1, $v1, $a0 -/* C00624 80242DA4 00031843 */ sra $v1, $v1, 1 -/* C00628 80242DA8 00621821 */ addu $v1, $v1, $v0 -/* C0062C 80242DAC A643008E */ sh $v1, 0x8e($s2) -/* C00630 80242DB0 8E2200CC */ lw $v0, 0xcc($s1) -/* C00634 80242DB4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C00638 80242DB8 8C42000C */ lw $v0, 0xc($v0) -/* C0063C 80242DBC AE420028 */ sw $v0, 0x28($s2) -/* C00640 80242DC0 C6000018 */ lwc1 $f0, 0x18($s0) -/* C00644 80242DC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C00648 80242DC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C0064C 80242DCC E6400018 */ swc1 $f0, 0x18($s2) -/* C00650 80242DD0 8C460028 */ lw $a2, 0x28($v0) -/* C00654 80242DD4 0C00A720 */ jal atan2 -/* C00658 80242DD8 8C470030 */ lw $a3, 0x30($v0) -/* C0065C 80242DDC 46000506 */ mov.s $f20, $f0 -/* C00660 80242DE0 C64C000C */ lwc1 $f12, 0xc($s2) -/* C00664 80242DE4 0C00A70A */ jal get_clamped_angle_diff -/* C00668 80242DE8 4600A386 */ mov.s $f14, $f20 -/* C0066C 80242DEC 46000086 */ mov.s $f2, $f0 -/* C00670 80242DF0 8E02001C */ lw $v0, 0x1c($s0) -/* C00674 80242DF4 46001005 */ abs.s $f0, $f2 -/* C00678 80242DF8 44822000 */ mtc1 $v0, $f4 -/* C0067C 80242DFC 00000000 */ nop -/* C00680 80242E00 46802120 */ cvt.s.w $f4, $f4 -/* C00684 80242E04 4600203C */ c.lt.s $f4, $f0 -/* C00688 80242E08 00000000 */ nop -/* C0068C 80242E0C 4500000D */ bc1f .L80242E44 -/* C00690 80242E10 00000000 */ nop -/* C00694 80242E14 44800000 */ mtc1 $zero, $f0 -/* C00698 80242E18 C654000C */ lwc1 $f20, 0xc($s2) -/* C0069C 80242E1C 4600103C */ c.lt.s $f2, $f0 -/* C006A0 80242E20 00000000 */ nop -/* C006A4 80242E24 45000006 */ bc1f .L80242E40 -/* C006A8 80242E28 00021023 */ negu $v0, $v0 -/* C006AC 80242E2C 44820000 */ mtc1 $v0, $f0 -/* C006B0 80242E30 00000000 */ nop -/* C006B4 80242E34 46800020 */ cvt.s.w $f0, $f0 -/* C006B8 80242E38 08090B91 */ j .L80242E44 -/* C006BC 80242E3C 4600A500 */ add.s $f20, $f20, $f0 -.L80242E40: -/* C006C0 80242E40 4604A500 */ add.s $f20, $f20, $f4 -.L80242E44: -/* C006C4 80242E44 0C00A6C9 */ jal clamp_angle -/* C006C8 80242E48 4600A306 */ mov.s $f12, $f20 -/* C006CC 80242E4C 2402000D */ addiu $v0, $zero, 0xd -/* C006D0 80242E50 E640000C */ swc1 $f0, 0xc($s2) -/* C006D4 80242E54 AE620070 */ sw $v0, 0x70($s3) -/* C006D8 80242E58 8FBF0020 */ lw $ra, 0x20($sp) -/* C006DC 80242E5C 8FB3001C */ lw $s3, 0x1c($sp) -/* C006E0 80242E60 8FB20018 */ lw $s2, 0x18($sp) -/* C006E4 80242E64 8FB10014 */ lw $s1, 0x14($sp) -/* C006E8 80242E68 8FB00010 */ lw $s0, 0x10($sp) -/* C006EC 80242E6C D7B40028 */ ldc1 $f20, 0x28($sp) -/* C006F0 80242E70 03E00008 */ jr $ra -/* C006F4 80242E74 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48_C005C8.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48_C005C8.s new file mode 100644 index 0000000000..8f746d80e5 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242D48_C005C8.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D48_C005C8 +/* C005C8 80242D48 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C005CC 80242D4C AFB3001C */ sw $s3, 0x1c($sp) +/* C005D0 80242D50 0080982D */ daddu $s3, $a0, $zero +/* C005D4 80242D54 AFBF0020 */ sw $ra, 0x20($sp) +/* C005D8 80242D58 AFB20018 */ sw $s2, 0x18($sp) +/* C005DC 80242D5C AFB10014 */ sw $s1, 0x14($sp) +/* C005E0 80242D60 AFB00010 */ sw $s0, 0x10($sp) +/* C005E4 80242D64 F7B40028 */ sdc1 $f20, 0x28($sp) +/* C005E8 80242D68 8E710148 */ lw $s1, 0x148($s3) +/* C005EC 80242D6C 86240008 */ lh $a0, 8($s1) +/* C005F0 80242D70 0C00EABB */ jal get_npc_unsafe +/* C005F4 80242D74 00A0802D */ daddu $s0, $a1, $zero +/* C005F8 80242D78 8E040020 */ lw $a0, 0x20($s0) +/* C005FC 80242D7C 0040902D */ daddu $s2, $v0, $zero +/* C00600 80242D80 00041FC2 */ srl $v1, $a0, 0x1f +/* C00604 80242D84 00832021 */ addu $a0, $a0, $v1 +/* C00608 80242D88 00042043 */ sra $a0, $a0, 1 +/* C0060C 80242D8C 0C00A67F */ jal rand_int +/* C00610 80242D90 24840001 */ addiu $a0, $a0, 1 +/* C00614 80242D94 8E030020 */ lw $v1, 0x20($s0) +/* C00618 80242D98 C64C0038 */ lwc1 $f12, 0x38($s2) +/* C0061C 80242D9C 000327C2 */ srl $a0, $v1, 0x1f +/* C00620 80242DA0 00641821 */ addu $v1, $v1, $a0 +/* C00624 80242DA4 00031843 */ sra $v1, $v1, 1 +/* C00628 80242DA8 00621821 */ addu $v1, $v1, $v0 +/* C0062C 80242DAC A643008E */ sh $v1, 0x8e($s2) +/* C00630 80242DB0 8E2200CC */ lw $v0, 0xcc($s1) +/* C00634 80242DB4 C64E0040 */ lwc1 $f14, 0x40($s2) +/* C00638 80242DB8 8C42000C */ lw $v0, 0xc($v0) +/* C0063C 80242DBC AE420028 */ sw $v0, 0x28($s2) +/* C00640 80242DC0 C6000018 */ lwc1 $f0, 0x18($s0) +/* C00644 80242DC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C00648 80242DC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C0064C 80242DCC E6400018 */ swc1 $f0, 0x18($s2) +/* C00650 80242DD0 8C460028 */ lw $a2, 0x28($v0) +/* C00654 80242DD4 0C00A720 */ jal atan2 +/* C00658 80242DD8 8C470030 */ lw $a3, 0x30($v0) +/* C0065C 80242DDC 46000506 */ mov.s $f20, $f0 +/* C00660 80242DE0 C64C000C */ lwc1 $f12, 0xc($s2) +/* C00664 80242DE4 0C00A70A */ jal get_clamped_angle_diff +/* C00668 80242DE8 4600A386 */ mov.s $f14, $f20 +/* C0066C 80242DEC 46000086 */ mov.s $f2, $f0 +/* C00670 80242DF0 8E02001C */ lw $v0, 0x1c($s0) +/* C00674 80242DF4 46001005 */ abs.s $f0, $f2 +/* C00678 80242DF8 44822000 */ mtc1 $v0, $f4 +/* C0067C 80242DFC 00000000 */ nop +/* C00680 80242E00 46802120 */ cvt.s.w $f4, $f4 +/* C00684 80242E04 4600203C */ c.lt.s $f4, $f0 +/* C00688 80242E08 00000000 */ nop +/* C0068C 80242E0C 4500000D */ bc1f .L80242E44 +/* C00690 80242E10 00000000 */ nop +/* C00694 80242E14 44800000 */ mtc1 $zero, $f0 +/* C00698 80242E18 C654000C */ lwc1 $f20, 0xc($s2) +/* C0069C 80242E1C 4600103C */ c.lt.s $f2, $f0 +/* C006A0 80242E20 00000000 */ nop +/* C006A4 80242E24 45000006 */ bc1f .L80242E40 +/* C006A8 80242E28 00021023 */ negu $v0, $v0 +/* C006AC 80242E2C 44820000 */ mtc1 $v0, $f0 +/* C006B0 80242E30 00000000 */ nop +/* C006B4 80242E34 46800020 */ cvt.s.w $f0, $f0 +/* C006B8 80242E38 08090B91 */ j .L80242E44 +/* C006BC 80242E3C 4600A500 */ add.s $f20, $f20, $f0 +.L80242E40: +/* C006C0 80242E40 4604A500 */ add.s $f20, $f20, $f4 +.L80242E44: +/* C006C4 80242E44 0C00A6C9 */ jal clamp_angle +/* C006C8 80242E48 4600A306 */ mov.s $f12, $f20 +/* C006CC 80242E4C 2402000D */ addiu $v0, $zero, 0xd +/* C006D0 80242E50 E640000C */ swc1 $f0, 0xc($s2) +/* C006D4 80242E54 AE620070 */ sw $v0, 0x70($s3) +/* C006D8 80242E58 8FBF0020 */ lw $ra, 0x20($sp) +/* C006DC 80242E5C 8FB3001C */ lw $s3, 0x1c($sp) +/* C006E0 80242E60 8FB20018 */ lw $s2, 0x18($sp) +/* C006E4 80242E64 8FB10014 */ lw $s1, 0x14($sp) +/* C006E8 80242E68 8FB00010 */ lw $s0, 0x10($sp) +/* C006EC 80242E6C D7B40028 */ ldc1 $f20, 0x28($sp) +/* C006F0 80242E70 03E00008 */ jr $ra +/* C006F4 80242E74 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78.s deleted file mode 100644 index 806d0dc7c5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E78 -/* C006F8 80242E78 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C006FC 80242E7C AFB3003C */ sw $s3, 0x3c($sp) -/* C00700 80242E80 0080982D */ daddu $s3, $a0, $zero -/* C00704 80242E84 AFBF0040 */ sw $ra, 0x40($sp) -/* C00708 80242E88 AFB20038 */ sw $s2, 0x38($sp) -/* C0070C 80242E8C AFB10034 */ sw $s1, 0x34($sp) -/* C00710 80242E90 AFB00030 */ sw $s0, 0x30($sp) -/* C00714 80242E94 8E720148 */ lw $s2, 0x148($s3) -/* C00718 80242E98 00A0882D */ daddu $s1, $a1, $zero -/* C0071C 80242E9C 86440008 */ lh $a0, 8($s2) -/* C00720 80242EA0 0C00EABB */ jal get_npc_unsafe -/* C00724 80242EA4 00C0802D */ daddu $s0, $a2, $zero -/* C00728 80242EA8 0200202D */ daddu $a0, $s0, $zero -/* C0072C 80242EAC 0240282D */ daddu $a1, $s2, $zero -/* C00730 80242EB0 24030001 */ addiu $v1, $zero, 1 -/* C00734 80242EB4 AFA30010 */ sw $v1, 0x10($sp) -/* C00738 80242EB8 8E260024 */ lw $a2, 0x24($s1) -/* C0073C 80242EBC 8E270028 */ lw $a3, 0x28($s1) -/* C00740 80242EC0 0C01242D */ jal func_800490B4 -/* C00744 80242EC4 0040802D */ daddu $s0, $v0, $zero -/* C00748 80242EC8 1440001E */ bnez $v0, .L80242F44 -/* C0074C 80242ECC 0200202D */ daddu $a0, $s0, $zero -/* C00750 80242ED0 24040002 */ addiu $a0, $zero, 2 -/* C00754 80242ED4 0200282D */ daddu $a1, $s0, $zero -/* C00758 80242ED8 0000302D */ daddu $a2, $zero, $zero -/* C0075C 80242EDC 860300A8 */ lh $v1, 0xa8($s0) -/* C00760 80242EE0 3C013F80 */ lui $at, 0x3f80 -/* C00764 80242EE4 44810000 */ mtc1 $at, $f0 -/* C00768 80242EE8 3C014000 */ lui $at, 0x4000 -/* C0076C 80242EEC 44811000 */ mtc1 $at, $f2 -/* C00770 80242EF0 3C01C1A0 */ lui $at, 0xc1a0 -/* C00774 80242EF4 44812000 */ mtc1 $at, $f4 -/* C00778 80242EF8 2402000F */ addiu $v0, $zero, 0xf -/* C0077C 80242EFC AFA2001C */ sw $v0, 0x1c($sp) -/* C00780 80242F00 44833000 */ mtc1 $v1, $f6 -/* C00784 80242F04 00000000 */ nop -/* C00788 80242F08 468031A0 */ cvt.s.w $f6, $f6 -/* C0078C 80242F0C 44073000 */ mfc1 $a3, $f6 -/* C00790 80242F10 27A20028 */ addiu $v0, $sp, 0x28 -/* C00794 80242F14 AFA20020 */ sw $v0, 0x20($sp) -/* C00798 80242F18 E7A00010 */ swc1 $f0, 0x10($sp) -/* C0079C 80242F1C E7A20014 */ swc1 $f2, 0x14($sp) -/* C007A0 80242F20 0C01BFA4 */ jal fx_emote -/* C007A4 80242F24 E7A40018 */ swc1 $f4, 0x18($sp) -/* C007A8 80242F28 8E4200CC */ lw $v0, 0xcc($s2) -/* C007AC 80242F2C 8C430000 */ lw $v1, ($v0) -/* C007B0 80242F30 24020019 */ addiu $v0, $zero, 0x19 -/* C007B4 80242F34 A602008E */ sh $v0, 0x8e($s0) -/* C007B8 80242F38 2402000E */ addiu $v0, $zero, 0xe -/* C007BC 80242F3C 08090BDE */ j .L80242F78 -/* C007C0 80242F40 AE030028 */ sw $v1, 0x28($s0) -.L80242F44: -/* C007C4 80242F44 0C00F598 */ jal func_8003D660 -/* C007C8 80242F48 24050001 */ addiu $a1, $zero, 1 -/* C007CC 80242F4C 8E050018 */ lw $a1, 0x18($s0) -/* C007D0 80242F50 8E06000C */ lw $a2, 0xc($s0) -/* C007D4 80242F54 0C00EA95 */ jal npc_move_heading -/* C007D8 80242F58 0200202D */ daddu $a0, $s0, $zero -/* C007DC 80242F5C 8602008E */ lh $v0, 0x8e($s0) -/* C007E0 80242F60 9603008E */ lhu $v1, 0x8e($s0) -/* C007E4 80242F64 18400003 */ blez $v0, .L80242F74 -/* C007E8 80242F68 2462FFFF */ addiu $v0, $v1, -1 -/* C007EC 80242F6C 08090BDF */ j .L80242F7C -/* C007F0 80242F70 A602008E */ sh $v0, 0x8e($s0) -.L80242F74: -/* C007F4 80242F74 2402000C */ addiu $v0, $zero, 0xc -.L80242F78: -/* C007F8 80242F78 AE620070 */ sw $v0, 0x70($s3) -.L80242F7C: -/* C007FC 80242F7C 8FBF0040 */ lw $ra, 0x40($sp) -/* C00800 80242F80 8FB3003C */ lw $s3, 0x3c($sp) -/* C00804 80242F84 8FB20038 */ lw $s2, 0x38($sp) -/* C00808 80242F88 8FB10034 */ lw $s1, 0x34($sp) -/* C0080C 80242F8C 8FB00030 */ lw $s0, 0x30($sp) -/* C00810 80242F90 03E00008 */ jr $ra -/* C00814 80242F94 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s new file mode 100644 index 0000000000..ecae26ceab --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242E78_C006F8.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E78_C006F8 +/* C006F8 80242E78 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C006FC 80242E7C AFB3003C */ sw $s3, 0x3c($sp) +/* C00700 80242E80 0080982D */ daddu $s3, $a0, $zero +/* C00704 80242E84 AFBF0040 */ sw $ra, 0x40($sp) +/* C00708 80242E88 AFB20038 */ sw $s2, 0x38($sp) +/* C0070C 80242E8C AFB10034 */ sw $s1, 0x34($sp) +/* C00710 80242E90 AFB00030 */ sw $s0, 0x30($sp) +/* C00714 80242E94 8E720148 */ lw $s2, 0x148($s3) +/* C00718 80242E98 00A0882D */ daddu $s1, $a1, $zero +/* C0071C 80242E9C 86440008 */ lh $a0, 8($s2) +/* C00720 80242EA0 0C00EABB */ jal get_npc_unsafe +/* C00724 80242EA4 00C0802D */ daddu $s0, $a2, $zero +/* C00728 80242EA8 0200202D */ daddu $a0, $s0, $zero +/* C0072C 80242EAC 0240282D */ daddu $a1, $s2, $zero +/* C00730 80242EB0 24030001 */ addiu $v1, $zero, 1 +/* C00734 80242EB4 AFA30010 */ sw $v1, 0x10($sp) +/* C00738 80242EB8 8E260024 */ lw $a2, 0x24($s1) +/* C0073C 80242EBC 8E270028 */ lw $a3, 0x28($s1) +/* C00740 80242EC0 0C01242D */ jal func_800490B4 +/* C00744 80242EC4 0040802D */ daddu $s0, $v0, $zero +/* C00748 80242EC8 1440001E */ bnez $v0, .L80242F44 +/* C0074C 80242ECC 0200202D */ daddu $a0, $s0, $zero +/* C00750 80242ED0 24040002 */ addiu $a0, $zero, 2 +/* C00754 80242ED4 0200282D */ daddu $a1, $s0, $zero +/* C00758 80242ED8 0000302D */ daddu $a2, $zero, $zero +/* C0075C 80242EDC 860300A8 */ lh $v1, 0xa8($s0) +/* C00760 80242EE0 3C013F80 */ lui $at, 0x3f80 +/* C00764 80242EE4 44810000 */ mtc1 $at, $f0 +/* C00768 80242EE8 3C014000 */ lui $at, 0x4000 +/* C0076C 80242EEC 44811000 */ mtc1 $at, $f2 +/* C00770 80242EF0 3C01C1A0 */ lui $at, 0xc1a0 +/* C00774 80242EF4 44812000 */ mtc1 $at, $f4 +/* C00778 80242EF8 2402000F */ addiu $v0, $zero, 0xf +/* C0077C 80242EFC AFA2001C */ sw $v0, 0x1c($sp) +/* C00780 80242F00 44833000 */ mtc1 $v1, $f6 +/* C00784 80242F04 00000000 */ nop +/* C00788 80242F08 468031A0 */ cvt.s.w $f6, $f6 +/* C0078C 80242F0C 44073000 */ mfc1 $a3, $f6 +/* C00790 80242F10 27A20028 */ addiu $v0, $sp, 0x28 +/* C00794 80242F14 AFA20020 */ sw $v0, 0x20($sp) +/* C00798 80242F18 E7A00010 */ swc1 $f0, 0x10($sp) +/* C0079C 80242F1C E7A20014 */ swc1 $f2, 0x14($sp) +/* C007A0 80242F20 0C01BFA4 */ jal fx_emote +/* C007A4 80242F24 E7A40018 */ swc1 $f4, 0x18($sp) +/* C007A8 80242F28 8E4200CC */ lw $v0, 0xcc($s2) +/* C007AC 80242F2C 8C430000 */ lw $v1, ($v0) +/* C007B0 80242F30 24020019 */ addiu $v0, $zero, 0x19 +/* C007B4 80242F34 A602008E */ sh $v0, 0x8e($s0) +/* C007B8 80242F38 2402000E */ addiu $v0, $zero, 0xe +/* C007BC 80242F3C 08090BDE */ j .L80242F78 +/* C007C0 80242F40 AE030028 */ sw $v1, 0x28($s0) +.L80242F44: +/* C007C4 80242F44 0C00F598 */ jal func_8003D660 +/* C007C8 80242F48 24050001 */ addiu $a1, $zero, 1 +/* C007CC 80242F4C 8E050018 */ lw $a1, 0x18($s0) +/* C007D0 80242F50 8E06000C */ lw $a2, 0xc($s0) +/* C007D4 80242F54 0C00EA95 */ jal npc_move_heading +/* C007D8 80242F58 0200202D */ daddu $a0, $s0, $zero +/* C007DC 80242F5C 8602008E */ lh $v0, 0x8e($s0) +/* C007E0 80242F60 9603008E */ lhu $v1, 0x8e($s0) +/* C007E4 80242F64 18400003 */ blez $v0, .L80242F74 +/* C007E8 80242F68 2462FFFF */ addiu $v0, $v1, -1 +/* C007EC 80242F6C 08090BDF */ j .L80242F7C +/* C007F0 80242F70 A602008E */ sh $v0, 0x8e($s0) +.L80242F74: +/* C007F4 80242F74 2402000C */ addiu $v0, $zero, 0xc +.L80242F78: +/* C007F8 80242F78 AE620070 */ sw $v0, 0x70($s3) +.L80242F7C: +/* C007FC 80242F7C 8FBF0040 */ lw $ra, 0x40($sp) +/* C00800 80242F80 8FB3003C */ lw $s3, 0x3c($sp) +/* C00804 80242F84 8FB20038 */ lw $s2, 0x38($sp) +/* C00808 80242F88 8FB10034 */ lw $s1, 0x34($sp) +/* C0080C 80242F8C 8FB00030 */ lw $s0, 0x30($sp) +/* C00810 80242F90 03E00008 */ jr $ra +/* C00814 80242F94 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98.s deleted file mode 100644 index 9e3016dd2f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F98 -/* C00818 80242F98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C0081C 80242F9C AFB10014 */ sw $s1, 0x14($sp) -/* C00820 80242FA0 0080882D */ daddu $s1, $a0, $zero -/* C00824 80242FA4 AFBF0018 */ sw $ra, 0x18($sp) -/* C00828 80242FA8 AFB00010 */ sw $s0, 0x10($sp) -/* C0082C 80242FAC 8E300148 */ lw $s0, 0x148($s1) -/* C00830 80242FB0 0C00EABB */ jal get_npc_unsafe -/* C00834 80242FB4 86040008 */ lh $a0, 8($s0) -/* C00838 80242FB8 9443008E */ lhu $v1, 0x8e($v0) -/* C0083C 80242FBC 2463FFFF */ addiu $v1, $v1, -1 -/* C00840 80242FC0 A443008E */ sh $v1, 0x8e($v0) -/* C00844 80242FC4 00031C00 */ sll $v1, $v1, 0x10 -/* C00848 80242FC8 14600008 */ bnez $v1, .L80242FEC -/* C0084C 80242FCC 00000000 */ nop -/* C00850 80242FD0 8E0200B0 */ lw $v0, 0xb0($s0) -/* C00854 80242FD4 30420080 */ andi $v0, $v0, 0x80 -/* C00858 80242FD8 10400003 */ beqz $v0, .L80242FE8 -/* C0085C 80242FDC 2402000F */ addiu $v0, $zero, 0xf -/* C00860 80242FE0 08090BFB */ j .L80242FEC -/* C00864 80242FE4 AE220070 */ sw $v0, 0x70($s1) -.L80242FE8: -/* C00868 80242FE8 AE200070 */ sw $zero, 0x70($s1) -.L80242FEC: -/* C0086C 80242FEC 8FBF0018 */ lw $ra, 0x18($sp) -/* C00870 80242FF0 8FB10014 */ lw $s1, 0x14($sp) -/* C00874 80242FF4 8FB00010 */ lw $s0, 0x10($sp) -/* C00878 80242FF8 03E00008 */ jr $ra -/* C0087C 80242FFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s new file mode 100644 index 0000000000..0c4a55bb2c --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_80242F98_C00818.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F98_C00818 +/* C00818 80242F98 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C0081C 80242F9C AFB10014 */ sw $s1, 0x14($sp) +/* C00820 80242FA0 0080882D */ daddu $s1, $a0, $zero +/* C00824 80242FA4 AFBF0018 */ sw $ra, 0x18($sp) +/* C00828 80242FA8 AFB00010 */ sw $s0, 0x10($sp) +/* C0082C 80242FAC 8E300148 */ lw $s0, 0x148($s1) +/* C00830 80242FB0 0C00EABB */ jal get_npc_unsafe +/* C00834 80242FB4 86040008 */ lh $a0, 8($s0) +/* C00838 80242FB8 9443008E */ lhu $v1, 0x8e($v0) +/* C0083C 80242FBC 2463FFFF */ addiu $v1, $v1, -1 +/* C00840 80242FC0 A443008E */ sh $v1, 0x8e($v0) +/* C00844 80242FC4 00031C00 */ sll $v1, $v1, 0x10 +/* C00848 80242FC8 14600008 */ bnez $v1, .L80242FEC +/* C0084C 80242FCC 00000000 */ nop +/* C00850 80242FD0 8E0200B0 */ lw $v0, 0xb0($s0) +/* C00854 80242FD4 30420080 */ andi $v0, $v0, 0x80 +/* C00858 80242FD8 10400003 */ beqz $v0, .L80242FE8 +/* C0085C 80242FDC 2402000F */ addiu $v0, $zero, 0xf +/* C00860 80242FE0 08090BFB */ j .L80242FEC +/* C00864 80242FE4 AE220070 */ sw $v0, 0x70($s1) +.L80242FE8: +/* C00868 80242FE8 AE200070 */ sw $zero, 0x70($s1) +.L80242FEC: +/* C0086C 80242FEC 8FBF0018 */ lw $ra, 0x18($sp) +/* C00870 80242FF0 8FB10014 */ lw $s1, 0x14($sp) +/* C00874 80242FF4 8FB00010 */ lw $s0, 0x10($sp) +/* C00878 80242FF8 03E00008 */ jr $ra +/* C0087C 80242FFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s index 7952cce341..4c5c70ee7f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s +++ b/asm/nonmatchings/world/area_dgb/dgb_01/BFD9A0/func_802430C0_C00940.s @@ -131,59 +131,59 @@ glabel func_802430C0_C00940 /* C00B20 802432A0 00000000 */ nop /* C00B24 802432A4 0280202D */ daddu $a0, $s4, $zero /* C00B28 802432A8 0260282D */ daddu $a1, $s3, $zero -/* C00B2C 802432AC 0C09094B */ jal func_8024252C +/* C00B2C 802432AC 0C09094B */ jal func_8024252C_BFFDAC /* C00B30 802432B0 02A0302D */ daddu $a2, $s5, $zero /* C00B34 802432B4 0280202D */ daddu $a0, $s4, $zero /* C00B38 802432B8 0260282D */ daddu $a1, $s3, $zero -/* C00B3C 802432BC 0C0909A1 */ jal func_80242684 +/* C00B3C 802432BC 0C0909A1 */ jal func_80242684_BFFF04 /* C00B40 802432C0 02A0302D */ daddu $a2, $s5, $zero /* C00B44 802432C4 08090CE5 */ j .L80243394 /* C00B48 802432C8 00000000 */ nop /* C00B4C 802432CC 0280202D */ daddu $a0, $s4, $zero /* C00B50 802432D0 0260282D */ daddu $a1, $s3, $zero -/* C00B54 802432D4 0C090A4B */ jal func_8024292C +/* C00B54 802432D4 0C090A4B */ jal func_8024292C_C001AC /* C00B58 802432D8 02A0302D */ daddu $a2, $s5, $zero /* C00B5C 802432DC 0280202D */ daddu $a0, $s4, $zero /* C00B60 802432E0 0260282D */ daddu $a1, $s3, $zero -/* C00B64 802432E4 0C090A7B */ jal func_802429EC +/* C00B64 802432E4 0C090A7B */ jal func_802429EC_C0026C /* C00B68 802432E8 02A0302D */ daddu $a2, $s5, $zero /* C00B6C 802432EC 08090CE5 */ j .L80243394 /* C00B70 802432F0 00000000 */ nop /* C00B74 802432F4 0280202D */ daddu $a0, $s4, $zero /* C00B78 802432F8 0260282D */ daddu $a1, $s3, $zero -/* C00B7C 802432FC 0C090AEA */ jal func_80242BA8 +/* C00B7C 802432FC 0C090AEA */ jal func_80242BA8_C00428 /* C00B80 80243300 02A0302D */ daddu $a2, $s5, $zero /* C00B84 80243304 08090CE5 */ j .L80243394 /* C00B88 80243308 00000000 */ nop /* C00B8C 8024330C 0280202D */ daddu $a0, $s4, $zero /* C00B90 80243310 0260282D */ daddu $a1, $s3, $zero -/* C00B94 80243314 0C090B17 */ jal func_80242C5C +/* C00B94 80243314 0C090B17 */ jal func_80242C5C_C004DC /* C00B98 80243318 02A0302D */ daddu $a2, $s5, $zero /* C00B9C 8024331C 0280202D */ daddu $a0, $s4, $zero /* C00BA0 80243320 0260282D */ daddu $a1, $s3, $zero -/* C00BA4 80243324 0C090B34 */ jal func_80242CD0 +/* C00BA4 80243324 0C090B34 */ jal func_80242CD0_C00550 /* C00BA8 80243328 02A0302D */ daddu $a2, $s5, $zero /* C00BAC 8024332C 08090CE5 */ j .L80243394 /* C00BB0 80243330 00000000 */ nop /* C00BB4 80243334 0280202D */ daddu $a0, $s4, $zero /* C00BB8 80243338 0260282D */ daddu $a1, $s3, $zero -/* C00BBC 8024333C 0C090B52 */ jal func_80242D48 +/* C00BBC 8024333C 0C090B52 */ jal func_80242D48_C005C8 /* C00BC0 80243340 02A0302D */ daddu $a2, $s5, $zero /* C00BC4 80243344 0280202D */ daddu $a0, $s4, $zero /* C00BC8 80243348 0260282D */ daddu $a1, $s3, $zero -/* C00BCC 8024334C 0C090B9E */ jal func_80242E78 +/* C00BCC 8024334C 0C090B9E */ jal func_80242E78_C006F8 /* C00BD0 80243350 02A0302D */ daddu $a2, $s5, $zero /* C00BD4 80243354 08090CE5 */ j .L80243394 /* C00BD8 80243358 00000000 */ nop /* C00BDC 8024335C 0280202D */ daddu $a0, $s4, $zero /* C00BE0 80243360 0260282D */ daddu $a1, $s3, $zero -/* C00BE4 80243364 0C090BE6 */ jal func_80242F98 +/* C00BE4 80243364 0C090BE6 */ jal func_80242F98_C00818 /* C00BE8 80243368 02A0302D */ daddu $a2, $s5, $zero /* C00BEC 8024336C 08090CE5 */ j .L80243394 /* C00BF0 80243370 00000000 */ nop /* C00BF4 80243374 0280202D */ daddu $a0, $s4, $zero /* C00BF8 80243378 0260282D */ daddu $a1, $s3, $zero -/* C00BFC 8024337C 0C090C00 */ jal func_80243000 +/* C00BFC 8024337C 0C090C00 */ jal func_80243000_C00880 /* C00C00 80243380 02A0302D */ daddu $a2, $s5, $zero /* C00C04 80243384 08090CE5 */ j .L80243394 /* C00C08 80243388 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s index b3833a2dab..697dfafd87 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_8024061C_C2F1BC.s @@ -90,7 +90,7 @@ glabel func_8024061C_C2F1BC /* C2F2FC 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* C2F300 80240760 14400006 */ bnez $v0, .L8024077C /* C2F304 80240764 00000000 */ nop -/* C2F308 80240768 0C090082 */ jal func_80240208 +/* C2F308 80240768 0C090082 */ jal func_80240208_C2EDA8 /* C2F30C 8024076C 0240202D */ daddu $a0, $s2, $zero /* C2F310 80240770 10400002 */ beqz $v0, .L8024077C /* C2F314 80240774 2402001E */ addiu $v0, $zero, 0x1e @@ -151,15 +151,15 @@ glabel func_8024061C_C2F1BC /* C2F3EC 8024084C 0280302D */ daddu $a2, $s4, $zero /* C2F3F0 80240850 0809022A */ j .L802408A8 /* C2F3F4 80240854 00000000 */ nop -/* C2F3F8 80240858 0C090000 */ jal func_80240000 +/* C2F3F8 80240858 0C090000 */ jal func_80240000_C2EBA0 /* C2F3FC 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C2F400 80240860 0C09001B */ jal func_8024006C +/* C2F400 80240860 0C09001B */ jal func_8024006C_C2EC0C /* C2F404 80240864 0240202D */ daddu $a0, $s2, $zero /* C2F408 80240868 8E430070 */ lw $v1, 0x70($s2) /* C2F40C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C2F410 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C2F414 80240874 00000000 */ nop -/* C2F418 80240878 0C090037 */ jal func_802400DC +/* C2F418 80240878 0C090037 */ jal func_802400DC_C2EC7C /* C2F41C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C2F420 80240880 8E430070 */ lw $v1, 0x70($s2) /* C2F424 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958.s deleted file mode 100644 index 860930f58b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240958 -/* C2F4F8 80240958 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C2F4FC 8024095C AFB40048 */ sw $s4, 0x48($sp) -/* C2F500 80240960 0080A02D */ daddu $s4, $a0, $zero -/* C2F504 80240964 AFBF004C */ sw $ra, 0x4c($sp) -/* C2F508 80240968 AFB30044 */ sw $s3, 0x44($sp) -/* C2F50C 8024096C AFB20040 */ sw $s2, 0x40($sp) -/* C2F510 80240970 AFB1003C */ sw $s1, 0x3c($sp) -/* C2F514 80240974 AFB00038 */ sw $s0, 0x38($sp) -/* C2F518 80240978 8E930148 */ lw $s3, 0x148($s4) -/* C2F51C 8024097C 00C0802D */ daddu $s0, $a2, $zero -/* C2F520 80240980 86640008 */ lh $a0, 8($s3) -/* C2F524 80240984 0C00EABB */ jal get_npc_unsafe -/* C2F528 80240988 0000902D */ daddu $s2, $zero, $zero -/* C2F52C 8024098C 0C039D59 */ jal get_player_data -/* C2F530 80240990 0040882D */ daddu $s1, $v0, $zero -/* C2F534 80240994 0200202D */ daddu $a0, $s0, $zero -/* C2F538 80240998 0260282D */ daddu $a1, $s3, $zero -/* C2F53C 8024099C 0000382D */ daddu $a3, $zero, $zero -/* C2F540 802409A0 3C0642A0 */ lui $a2, 0x42a0 -/* C2F544 802409A4 0040802D */ daddu $s0, $v0, $zero -/* C2F548 802409A8 0C01242D */ jal func_800490B4 -/* C2F54C 802409AC AFA00010 */ sw $zero, 0x10($sp) -/* C2F550 802409B0 10400022 */ beqz $v0, .L80240A3C -/* C2F554 802409B4 00000000 */ nop -/* C2F558 802409B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C2F55C 802409BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C2F560 802409C0 804300B4 */ lb $v1, 0xb4($v0) -/* C2F564 802409C4 24020002 */ addiu $v0, $zero, 2 -/* C2F568 802409C8 10620013 */ beq $v1, $v0, .L80240A18 -/* C2F56C 802409CC 2402001A */ addiu $v0, $zero, 0x1a -/* C2F570 802409D0 10620011 */ beq $v1, $v0, .L80240A18 -/* C2F574 802409D4 24020003 */ addiu $v0, $zero, 3 -/* C2F578 802409D8 1062000F */ beq $v1, $v0, .L80240A18 -/* C2F57C 802409DC 2402000E */ addiu $v0, $zero, 0xe -/* C2F580 802409E0 1062000D */ beq $v1, $v0, .L80240A18 -/* C2F584 802409E4 24020010 */ addiu $v0, $zero, 0x10 -/* C2F588 802409E8 1062000B */ beq $v1, $v0, .L80240A18 -/* C2F58C 802409EC 2402000B */ addiu $v0, $zero, 0xb -/* C2F590 802409F0 10620009 */ beq $v1, $v0, .L80240A18 -/* C2F594 802409F4 2402000A */ addiu $v0, $zero, 0xa -/* C2F598 802409F8 10620007 */ beq $v1, $v0, .L80240A18 -/* C2F59C 802409FC 24020012 */ addiu $v0, $zero, 0x12 -/* C2F5A0 80240A00 10620005 */ beq $v1, $v0, .L80240A18 -/* C2F5A4 80240A04 24020013 */ addiu $v0, $zero, 0x13 -/* C2F5A8 80240A08 10620003 */ beq $v1, $v0, .L80240A18 -/* C2F5AC 80240A0C 24020025 */ addiu $v0, $zero, 0x25 -/* C2F5B0 80240A10 14620002 */ bne $v1, $v0, .L80240A1C -/* C2F5B4 80240A14 00000000 */ nop -.L80240A18: -/* C2F5B8 80240A18 24120001 */ addiu $s2, $zero, 1 -.L80240A1C: -/* C2F5BC 80240A1C 82030012 */ lb $v1, 0x12($s0) -/* C2F5C0 80240A20 24020002 */ addiu $v0, $zero, 2 -/* C2F5C4 80240A24 14620007 */ bne $v1, $v0, .L80240A44 -/* C2F5C8 80240A28 24020001 */ addiu $v0, $zero, 1 -/* C2F5CC 80240A2C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C2F5D0 80240A30 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C2F5D4 80240A34 50430002 */ beql $v0, $v1, .L80240A40 -/* C2F5D8 80240A38 24120001 */ addiu $s2, $zero, 1 -.L80240A3C: -/* C2F5DC 80240A3C 82030012 */ lb $v1, 0x12($s0) -.L80240A40: -/* C2F5E0 80240A40 24020001 */ addiu $v0, $zero, 1 -.L80240A44: -/* C2F5E4 80240A44 14620006 */ bne $v1, $v0, .L80240A60 -/* C2F5E8 80240A48 24020003 */ addiu $v0, $zero, 3 -/* C2F5EC 80240A4C 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C2F5F0 80240A50 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C2F5F4 80240A54 14400008 */ bnez $v0, .L80240A78 -/* C2F5F8 80240A58 27A40028 */ addiu $a0, $sp, 0x28 -/* C2F5FC 80240A5C 24020003 */ addiu $v0, $zero, 3 -.L80240A60: -/* C2F600 80240A60 1462001B */ bne $v1, $v0, .L80240AD0 -/* C2F604 80240A64 24020002 */ addiu $v0, $zero, 2 -/* C2F608 80240A68 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C2F60C 80240A6C 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C2F610 80240A70 14620017 */ bne $v1, $v0, .L80240AD0 -/* C2F614 80240A74 27A40028 */ addiu $a0, $sp, 0x28 -.L80240A78: -/* C2F618 80240A78 27A5002C */ addiu $a1, $sp, 0x2c -/* C2F61C 80240A7C 8E27000C */ lw $a3, 0xc($s1) -/* C2F620 80240A80 C6200038 */ lwc1 $f0, 0x38($s1) -/* C2F624 80240A84 C6220040 */ lwc1 $f2, 0x40($s1) -/* C2F628 80240A88 0000302D */ daddu $a2, $zero, $zero -/* C2F62C 80240A8C E7A00028 */ swc1 $f0, 0x28($sp) -/* C2F630 80240A90 0C00A7E7 */ jal add_vec2D_polar -/* C2F634 80240A94 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C2F638 80240A98 3C028011 */ lui $v0, 0x8011 -/* C2F63C 80240A9C 8C42C930 */ lw $v0, -0x36d0($v0) -/* C2F640 80240AA0 C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C2F644 80240AA4 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C2F648 80240AA8 8C460038 */ lw $a2, 0x38($v0) -/* C2F64C 80240AAC 0C00A7B5 */ jal dist2D -/* C2F650 80240AB0 8C470040 */ lw $a3, 0x40($v0) -/* C2F654 80240AB4 3C0142A0 */ lui $at, 0x42a0 -/* C2F658 80240AB8 44811000 */ mtc1 $at, $f2 -/* C2F65C 80240ABC 00000000 */ nop -/* C2F660 80240AC0 4602003E */ c.le.s $f0, $f2 -/* C2F664 80240AC4 00000000 */ nop -/* C2F668 80240AC8 45030001 */ bc1tl .L80240AD0 -/* C2F66C 80240ACC 24120001 */ addiu $s2, $zero, 1 -.L80240AD0: -/* C2F670 80240AD0 12400026 */ beqz $s2, .L80240B6C -/* C2F674 80240AD4 0220202D */ daddu $a0, $s1, $zero -/* C2F678 80240AD8 3C05B000 */ lui $a1, 0xb000 -/* C2F67C 80240ADC 34A5000E */ ori $a1, $a1, 0xe -/* C2F680 80240AE0 0C012530 */ jal func_800494C0 -/* C2F684 80240AE4 0000302D */ daddu $a2, $zero, $zero -/* C2F688 80240AE8 0000202D */ daddu $a0, $zero, $zero -/* C2F68C 80240AEC 0220282D */ daddu $a1, $s1, $zero -/* C2F690 80240AF0 0000302D */ daddu $a2, $zero, $zero -/* C2F694 80240AF4 862200A8 */ lh $v0, 0xa8($s1) -/* C2F698 80240AF8 8E6300CC */ lw $v1, 0xcc($s3) -/* C2F69C 80240AFC 3C013F80 */ lui $at, 0x3f80 -/* C2F6A0 80240B00 44810000 */ mtc1 $at, $f0 -/* C2F6A4 80240B04 3C014000 */ lui $at, 0x4000 -/* C2F6A8 80240B08 44811000 */ mtc1 $at, $f2 -/* C2F6AC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 -/* C2F6B0 80240B10 44812000 */ mtc1 $at, $f4 -/* C2F6B4 80240B14 44823000 */ mtc1 $v0, $f6 -/* C2F6B8 80240B18 00000000 */ nop -/* C2F6BC 80240B1C 468031A0 */ cvt.s.w $f6, $f6 -/* C2F6C0 80240B20 44073000 */ mfc1 $a3, $f6 -/* C2F6C4 80240B24 8C63002C */ lw $v1, 0x2c($v1) -/* C2F6C8 80240B28 2402000A */ addiu $v0, $zero, 0xa -/* C2F6CC 80240B2C A622008E */ sh $v0, 0x8e($s1) -/* C2F6D0 80240B30 2402000F */ addiu $v0, $zero, 0xf -/* C2F6D4 80240B34 AE230028 */ sw $v1, 0x28($s1) -/* C2F6D8 80240B38 AFA2001C */ sw $v0, 0x1c($sp) -/* C2F6DC 80240B3C 27A20030 */ addiu $v0, $sp, 0x30 -/* C2F6E0 80240B40 E7A00010 */ swc1 $f0, 0x10($sp) -/* C2F6E4 80240B44 E7A20014 */ swc1 $f2, 0x14($sp) -/* C2F6E8 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) -/* C2F6EC 80240B4C 0C01BFA4 */ jal fx_emote -/* C2F6F0 80240B50 AFA20020 */ sw $v0, 0x20($sp) -/* C2F6F4 80240B54 0220202D */ daddu $a0, $s1, $zero -/* C2F6F8 80240B58 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C2F6FC 80240B5C 0C012530 */ jal func_800494C0 -/* C2F700 80240B60 3C060020 */ lui $a2, 0x20 -/* C2F704 80240B64 24020002 */ addiu $v0, $zero, 2 -/* C2F708 80240B68 AE820070 */ sw $v0, 0x70($s4) -.L80240B6C: -/* C2F70C 80240B6C 9622008E */ lhu $v0, 0x8e($s1) -/* C2F710 80240B70 24420001 */ addiu $v0, $v0, 1 -/* C2F714 80240B74 A622008E */ sh $v0, 0x8e($s1) -/* C2F718 80240B78 00021400 */ sll $v0, $v0, 0x10 -/* C2F71C 80240B7C 00021C03 */ sra $v1, $v0, 0x10 -/* C2F720 80240B80 2402001B */ addiu $v0, $zero, 0x1b -/* C2F724 80240B84 14620005 */ bne $v1, $v0, .L80240B9C -/* C2F728 80240B88 24020039 */ addiu $v0, $zero, 0x39 -/* C2F72C 80240B8C 0220202D */ daddu $a0, $s1, $zero -/* C2F730 80240B90 3C05B000 */ lui $a1, 0xb000 -/* C2F734 80240B94 080902EC */ j .L80240BB0 -/* C2F738 80240B98 34A5000C */ ori $a1, $a1, 0xc -.L80240B9C: -/* C2F73C 80240B9C 14620008 */ bne $v1, $v0, .L80240BC0 -/* C2F740 80240BA0 2402003B */ addiu $v0, $zero, 0x3b -/* C2F744 80240BA4 0220202D */ daddu $a0, $s1, $zero -/* C2F748 80240BA8 3C05B000 */ lui $a1, 0xb000 -/* C2F74C 80240BAC 34A5000D */ ori $a1, $a1, 0xd -.L80240BB0: -/* C2F750 80240BB0 0C012530 */ jal func_800494C0 -/* C2F754 80240BB4 0000302D */ daddu $a2, $zero, $zero -/* C2F758 80240BB8 080902FC */ j .L80240BF0 -/* C2F75C 80240BBC 00000000 */ nop -.L80240BC0: -/* C2F760 80240BC0 14620005 */ bne $v1, $v0, .L80240BD8 -/* C2F764 80240BC4 2402003C */ addiu $v0, $zero, 0x3c -/* C2F768 80240BC8 8E6200CC */ lw $v0, 0xcc($s3) -/* C2F76C 80240BCC 8C420030 */ lw $v0, 0x30($v0) -/* C2F770 80240BD0 080902FC */ j .L80240BF0 -/* C2F774 80240BD4 AE220028 */ sw $v0, 0x28($s1) -.L80240BD8: -/* C2F778 80240BD8 14620005 */ bne $v1, $v0, .L80240BF0 -/* C2F77C 80240BDC 00000000 */ nop -/* C2F780 80240BE0 8E6200CC */ lw $v0, 0xcc($s3) -/* C2F784 80240BE4 8C420028 */ lw $v0, 0x28($v0) -/* C2F788 80240BE8 A620008E */ sh $zero, 0x8e($s1) -/* C2F78C 80240BEC AE220028 */ sw $v0, 0x28($s1) -.L80240BF0: -/* C2F790 80240BF0 8FBF004C */ lw $ra, 0x4c($sp) -/* C2F794 80240BF4 8FB40048 */ lw $s4, 0x48($sp) -/* C2F798 80240BF8 8FB30044 */ lw $s3, 0x44($sp) -/* C2F79C 80240BFC 8FB20040 */ lw $s2, 0x40($sp) -/* C2F7A0 80240C00 8FB1003C */ lw $s1, 0x3c($sp) -/* C2F7A4 80240C04 8FB00038 */ lw $s0, 0x38($sp) -/* C2F7A8 80240C08 03E00008 */ jr $ra -/* C2F7AC 80240C0C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s new file mode 100644 index 0000000000..f7922f7d5d --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80240958_C2F4F8.s @@ -0,0 +1,192 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240958_C2F4F8 +/* C2F4F8 80240958 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C2F4FC 8024095C AFB40048 */ sw $s4, 0x48($sp) +/* C2F500 80240960 0080A02D */ daddu $s4, $a0, $zero +/* C2F504 80240964 AFBF004C */ sw $ra, 0x4c($sp) +/* C2F508 80240968 AFB30044 */ sw $s3, 0x44($sp) +/* C2F50C 8024096C AFB20040 */ sw $s2, 0x40($sp) +/* C2F510 80240970 AFB1003C */ sw $s1, 0x3c($sp) +/* C2F514 80240974 AFB00038 */ sw $s0, 0x38($sp) +/* C2F518 80240978 8E930148 */ lw $s3, 0x148($s4) +/* C2F51C 8024097C 00C0802D */ daddu $s0, $a2, $zero +/* C2F520 80240980 86640008 */ lh $a0, 8($s3) +/* C2F524 80240984 0C00EABB */ jal get_npc_unsafe +/* C2F528 80240988 0000902D */ daddu $s2, $zero, $zero +/* C2F52C 8024098C 0C039D59 */ jal get_player_data +/* C2F530 80240990 0040882D */ daddu $s1, $v0, $zero +/* C2F534 80240994 0200202D */ daddu $a0, $s0, $zero +/* C2F538 80240998 0260282D */ daddu $a1, $s3, $zero +/* C2F53C 8024099C 0000382D */ daddu $a3, $zero, $zero +/* C2F540 802409A0 3C0642A0 */ lui $a2, 0x42a0 +/* C2F544 802409A4 0040802D */ daddu $s0, $v0, $zero +/* C2F548 802409A8 0C01242D */ jal func_800490B4 +/* C2F54C 802409AC AFA00010 */ sw $zero, 0x10($sp) +/* C2F550 802409B0 10400022 */ beqz $v0, .L80240A3C +/* C2F554 802409B4 00000000 */ nop +/* C2F558 802409B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C2F55C 802409BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C2F560 802409C0 804300B4 */ lb $v1, 0xb4($v0) +/* C2F564 802409C4 24020002 */ addiu $v0, $zero, 2 +/* C2F568 802409C8 10620013 */ beq $v1, $v0, .L80240A18 +/* C2F56C 802409CC 2402001A */ addiu $v0, $zero, 0x1a +/* C2F570 802409D0 10620011 */ beq $v1, $v0, .L80240A18 +/* C2F574 802409D4 24020003 */ addiu $v0, $zero, 3 +/* C2F578 802409D8 1062000F */ beq $v1, $v0, .L80240A18 +/* C2F57C 802409DC 2402000E */ addiu $v0, $zero, 0xe +/* C2F580 802409E0 1062000D */ beq $v1, $v0, .L80240A18 +/* C2F584 802409E4 24020010 */ addiu $v0, $zero, 0x10 +/* C2F588 802409E8 1062000B */ beq $v1, $v0, .L80240A18 +/* C2F58C 802409EC 2402000B */ addiu $v0, $zero, 0xb +/* C2F590 802409F0 10620009 */ beq $v1, $v0, .L80240A18 +/* C2F594 802409F4 2402000A */ addiu $v0, $zero, 0xa +/* C2F598 802409F8 10620007 */ beq $v1, $v0, .L80240A18 +/* C2F59C 802409FC 24020012 */ addiu $v0, $zero, 0x12 +/* C2F5A0 80240A00 10620005 */ beq $v1, $v0, .L80240A18 +/* C2F5A4 80240A04 24020013 */ addiu $v0, $zero, 0x13 +/* C2F5A8 80240A08 10620003 */ beq $v1, $v0, .L80240A18 +/* C2F5AC 80240A0C 24020025 */ addiu $v0, $zero, 0x25 +/* C2F5B0 80240A10 14620002 */ bne $v1, $v0, .L80240A1C +/* C2F5B4 80240A14 00000000 */ nop +.L80240A18: +/* C2F5B8 80240A18 24120001 */ addiu $s2, $zero, 1 +.L80240A1C: +/* C2F5BC 80240A1C 82030012 */ lb $v1, 0x12($s0) +/* C2F5C0 80240A20 24020002 */ addiu $v0, $zero, 2 +/* C2F5C4 80240A24 14620007 */ bne $v1, $v0, .L80240A44 +/* C2F5C8 80240A28 24020001 */ addiu $v0, $zero, 1 +/* C2F5CC 80240A2C 3C028011 */ lui $v0, %hi(D_8010EBB0) +/* C2F5D0 80240A30 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* C2F5D4 80240A34 50430002 */ beql $v0, $v1, .L80240A40 +/* C2F5D8 80240A38 24120001 */ addiu $s2, $zero, 1 +.L80240A3C: +/* C2F5DC 80240A3C 82030012 */ lb $v1, 0x12($s0) +.L80240A40: +/* C2F5E0 80240A40 24020001 */ addiu $v0, $zero, 1 +.L80240A44: +/* C2F5E4 80240A44 14620006 */ bne $v1, $v0, .L80240A60 +/* C2F5E8 80240A48 24020003 */ addiu $v0, $zero, 3 +/* C2F5EC 80240A4C 3C028011 */ lui $v0, %hi(D_8010EBB0) +/* C2F5F0 80240A50 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* C2F5F4 80240A54 14400008 */ bnez $v0, .L80240A78 +/* C2F5F8 80240A58 27A40028 */ addiu $a0, $sp, 0x28 +/* C2F5FC 80240A5C 24020003 */ addiu $v0, $zero, 3 +.L80240A60: +/* C2F600 80240A60 1462001B */ bne $v1, $v0, .L80240AD0 +/* C2F604 80240A64 24020002 */ addiu $v0, $zero, 2 +/* C2F608 80240A68 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* C2F60C 80240A6C 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) +/* C2F610 80240A70 14620017 */ bne $v1, $v0, .L80240AD0 +/* C2F614 80240A74 27A40028 */ addiu $a0, $sp, 0x28 +.L80240A78: +/* C2F618 80240A78 27A5002C */ addiu $a1, $sp, 0x2c +/* C2F61C 80240A7C 8E27000C */ lw $a3, 0xc($s1) +/* C2F620 80240A80 C6200038 */ lwc1 $f0, 0x38($s1) +/* C2F624 80240A84 C6220040 */ lwc1 $f2, 0x40($s1) +/* C2F628 80240A88 0000302D */ daddu $a2, $zero, $zero +/* C2F62C 80240A8C E7A00028 */ swc1 $f0, 0x28($sp) +/* C2F630 80240A90 0C00A7E7 */ jal add_vec2D_polar +/* C2F634 80240A94 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C2F638 80240A98 3C028011 */ lui $v0, 0x8011 +/* C2F63C 80240A9C 8C42C930 */ lw $v0, -0x36d0($v0) +/* C2F640 80240AA0 C7AC0028 */ lwc1 $f12, 0x28($sp) +/* C2F644 80240AA4 C7AE002C */ lwc1 $f14, 0x2c($sp) +/* C2F648 80240AA8 8C460038 */ lw $a2, 0x38($v0) +/* C2F64C 80240AAC 0C00A7B5 */ jal dist2D +/* C2F650 80240AB0 8C470040 */ lw $a3, 0x40($v0) +/* C2F654 80240AB4 3C0142A0 */ lui $at, 0x42a0 +/* C2F658 80240AB8 44811000 */ mtc1 $at, $f2 +/* C2F65C 80240ABC 00000000 */ nop +/* C2F660 80240AC0 4602003E */ c.le.s $f0, $f2 +/* C2F664 80240AC4 00000000 */ nop +/* C2F668 80240AC8 45030001 */ bc1tl .L80240AD0 +/* C2F66C 80240ACC 24120001 */ addiu $s2, $zero, 1 +.L80240AD0: +/* C2F670 80240AD0 12400026 */ beqz $s2, .L80240B6C +/* C2F674 80240AD4 0220202D */ daddu $a0, $s1, $zero +/* C2F678 80240AD8 3C05B000 */ lui $a1, 0xb000 +/* C2F67C 80240ADC 34A5000E */ ori $a1, $a1, 0xe +/* C2F680 80240AE0 0C012530 */ jal func_800494C0 +/* C2F684 80240AE4 0000302D */ daddu $a2, $zero, $zero +/* C2F688 80240AE8 0000202D */ daddu $a0, $zero, $zero +/* C2F68C 80240AEC 0220282D */ daddu $a1, $s1, $zero +/* C2F690 80240AF0 0000302D */ daddu $a2, $zero, $zero +/* C2F694 80240AF4 862200A8 */ lh $v0, 0xa8($s1) +/* C2F698 80240AF8 8E6300CC */ lw $v1, 0xcc($s3) +/* C2F69C 80240AFC 3C013F80 */ lui $at, 0x3f80 +/* C2F6A0 80240B00 44810000 */ mtc1 $at, $f0 +/* C2F6A4 80240B04 3C014000 */ lui $at, 0x4000 +/* C2F6A8 80240B08 44811000 */ mtc1 $at, $f2 +/* C2F6AC 80240B0C 3C01C1A0 */ lui $at, 0xc1a0 +/* C2F6B0 80240B10 44812000 */ mtc1 $at, $f4 +/* C2F6B4 80240B14 44823000 */ mtc1 $v0, $f6 +/* C2F6B8 80240B18 00000000 */ nop +/* C2F6BC 80240B1C 468031A0 */ cvt.s.w $f6, $f6 +/* C2F6C0 80240B20 44073000 */ mfc1 $a3, $f6 +/* C2F6C4 80240B24 8C63002C */ lw $v1, 0x2c($v1) +/* C2F6C8 80240B28 2402000A */ addiu $v0, $zero, 0xa +/* C2F6CC 80240B2C A622008E */ sh $v0, 0x8e($s1) +/* C2F6D0 80240B30 2402000F */ addiu $v0, $zero, 0xf +/* C2F6D4 80240B34 AE230028 */ sw $v1, 0x28($s1) +/* C2F6D8 80240B38 AFA2001C */ sw $v0, 0x1c($sp) +/* C2F6DC 80240B3C 27A20030 */ addiu $v0, $sp, 0x30 +/* C2F6E0 80240B40 E7A00010 */ swc1 $f0, 0x10($sp) +/* C2F6E4 80240B44 E7A20014 */ swc1 $f2, 0x14($sp) +/* C2F6E8 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) +/* C2F6EC 80240B4C 0C01BFA4 */ jal fx_emote +/* C2F6F0 80240B50 AFA20020 */ sw $v0, 0x20($sp) +/* C2F6F4 80240B54 0220202D */ daddu $a0, $s1, $zero +/* C2F6F8 80240B58 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C2F6FC 80240B5C 0C012530 */ jal func_800494C0 +/* C2F700 80240B60 3C060020 */ lui $a2, 0x20 +/* C2F704 80240B64 24020002 */ addiu $v0, $zero, 2 +/* C2F708 80240B68 AE820070 */ sw $v0, 0x70($s4) +.L80240B6C: +/* C2F70C 80240B6C 9622008E */ lhu $v0, 0x8e($s1) +/* C2F710 80240B70 24420001 */ addiu $v0, $v0, 1 +/* C2F714 80240B74 A622008E */ sh $v0, 0x8e($s1) +/* C2F718 80240B78 00021400 */ sll $v0, $v0, 0x10 +/* C2F71C 80240B7C 00021C03 */ sra $v1, $v0, 0x10 +/* C2F720 80240B80 2402001B */ addiu $v0, $zero, 0x1b +/* C2F724 80240B84 14620005 */ bne $v1, $v0, .L80240B9C +/* C2F728 80240B88 24020039 */ addiu $v0, $zero, 0x39 +/* C2F72C 80240B8C 0220202D */ daddu $a0, $s1, $zero +/* C2F730 80240B90 3C05B000 */ lui $a1, 0xb000 +/* C2F734 80240B94 080902EC */ j .L80240BB0 +/* C2F738 80240B98 34A5000C */ ori $a1, $a1, 0xc +.L80240B9C: +/* C2F73C 80240B9C 14620008 */ bne $v1, $v0, .L80240BC0 +/* C2F740 80240BA0 2402003B */ addiu $v0, $zero, 0x3b +/* C2F744 80240BA4 0220202D */ daddu $a0, $s1, $zero +/* C2F748 80240BA8 3C05B000 */ lui $a1, 0xb000 +/* C2F74C 80240BAC 34A5000D */ ori $a1, $a1, 0xd +.L80240BB0: +/* C2F750 80240BB0 0C012530 */ jal func_800494C0 +/* C2F754 80240BB4 0000302D */ daddu $a2, $zero, $zero +/* C2F758 80240BB8 080902FC */ j .L80240BF0 +/* C2F75C 80240BBC 00000000 */ nop +.L80240BC0: +/* C2F760 80240BC0 14620005 */ bne $v1, $v0, .L80240BD8 +/* C2F764 80240BC4 2402003C */ addiu $v0, $zero, 0x3c +/* C2F768 80240BC8 8E6200CC */ lw $v0, 0xcc($s3) +/* C2F76C 80240BCC 8C420030 */ lw $v0, 0x30($v0) +/* C2F770 80240BD0 080902FC */ j .L80240BF0 +/* C2F774 80240BD4 AE220028 */ sw $v0, 0x28($s1) +.L80240BD8: +/* C2F778 80240BD8 14620005 */ bne $v1, $v0, .L80240BF0 +/* C2F77C 80240BDC 00000000 */ nop +/* C2F780 80240BE0 8E6200CC */ lw $v0, 0xcc($s3) +/* C2F784 80240BE4 8C420028 */ lw $v0, 0x28($v0) +/* C2F788 80240BE8 A620008E */ sh $zero, 0x8e($s1) +/* C2F78C 80240BEC AE220028 */ sw $v0, 0x28($s1) +.L80240BF0: +/* C2F790 80240BF0 8FBF004C */ lw $ra, 0x4c($sp) +/* C2F794 80240BF4 8FB40048 */ lw $s4, 0x48($sp) +/* C2F798 80240BF8 8FB30044 */ lw $s3, 0x44($sp) +/* C2F79C 80240BFC 8FB20040 */ lw $s2, 0x40($sp) +/* C2F7A0 80240C00 8FB1003C */ lw $s1, 0x3c($sp) +/* C2F7A4 80240C04 8FB00038 */ lw $s0, 0x38($sp) +/* C2F7A8 80240C08 03E00008 */ jr $ra +/* C2F7AC 80240C0C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078.s deleted file mode 100644 index 09b7eff1ac..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241078 -/* C2FC18 80241078 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C2FC1C 8024107C AFB00010 */ sw $s0, 0x10($sp) -/* C2FC20 80241080 0080802D */ daddu $s0, $a0, $zero -/* C2FC24 80241084 AFBF0014 */ sw $ra, 0x14($sp) -/* C2FC28 80241088 8E020148 */ lw $v0, 0x148($s0) -/* C2FC2C 8024108C 0C00EABB */ jal get_npc_unsafe -/* C2FC30 80241090 84440008 */ lh $a0, 8($v0) -/* C2FC34 80241094 0040182D */ daddu $v1, $v0, $zero -/* C2FC38 80241098 8462008C */ lh $v0, 0x8c($v1) -/* C2FC3C 8024109C 14400009 */ bnez $v0, .L802410C4 -/* C2FC40 802410A0 00000000 */ nop -/* C2FC44 802410A4 9462008E */ lhu $v0, 0x8e($v1) -/* C2FC48 802410A8 2442FFFF */ addiu $v0, $v0, -1 -/* C2FC4C 802410AC A462008E */ sh $v0, 0x8e($v1) -/* C2FC50 802410B0 00021400 */ sll $v0, $v0, 0x10 -/* C2FC54 802410B4 1C400003 */ bgtz $v0, .L802410C4 -/* C2FC58 802410B8 00000000 */ nop -/* C2FC5C 802410BC A460008E */ sh $zero, 0x8e($v1) -/* C2FC60 802410C0 AE000070 */ sw $zero, 0x70($s0) -.L802410C4: -/* C2FC64 802410C4 8FBF0014 */ lw $ra, 0x14($sp) -/* C2FC68 802410C8 8FB00010 */ lw $s0, 0x10($sp) -/* C2FC6C 802410CC 03E00008 */ jr $ra -/* C2FC70 802410D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s new file mode 100644 index 0000000000..adac4f1fdd --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_80241078_C2FC18.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241078_C2FC18 +/* C2FC18 80241078 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C2FC1C 8024107C AFB00010 */ sw $s0, 0x10($sp) +/* C2FC20 80241080 0080802D */ daddu $s0, $a0, $zero +/* C2FC24 80241084 AFBF0014 */ sw $ra, 0x14($sp) +/* C2FC28 80241088 8E020148 */ lw $v0, 0x148($s0) +/* C2FC2C 8024108C 0C00EABB */ jal get_npc_unsafe +/* C2FC30 80241090 84440008 */ lh $a0, 8($v0) +/* C2FC34 80241094 0040182D */ daddu $v1, $v0, $zero +/* C2FC38 80241098 8462008C */ lh $v0, 0x8c($v1) +/* C2FC3C 8024109C 14400009 */ bnez $v0, .L802410C4 +/* C2FC40 802410A0 00000000 */ nop +/* C2FC44 802410A4 9462008E */ lhu $v0, 0x8e($v1) +/* C2FC48 802410A8 2442FFFF */ addiu $v0, $v0, -1 +/* C2FC4C 802410AC A462008E */ sh $v0, 0x8e($v1) +/* C2FC50 802410B0 00021400 */ sll $v0, $v0, 0x10 +/* C2FC54 802410B4 1C400003 */ bgtz $v0, .L802410C4 +/* C2FC58 802410B8 00000000 */ nop +/* C2FC5C 802410BC A460008E */ sh $zero, 0x8e($v1) +/* C2FC60 802410C0 AE000070 */ sw $zero, 0x70($s0) +.L802410C4: +/* C2FC64 802410C4 8FBF0014 */ lw $ra, 0x14($sp) +/* C2FC68 802410C8 8FB00010 */ lw $s0, 0x10($sp) +/* C2FC6C 802410CC 03E00008 */ jr $ra +/* C2FC70 802410D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s index 255735c63a..f77e0dccbb 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s +++ b/asm/nonmatchings/world/area_dgb/dgb_02/C2EBA0/func_802410D4_C2FC74.s @@ -98,7 +98,7 @@ glabel func_802410D4_C2FC74 /* C2FDD4 80241234 8E22006C */ lw $v0, 0x6c($s1) /* C2FDD8 80241238 14400006 */ bnez $v0, .L80241254 /* C2FDDC 8024123C 00000000 */ nop -/* C2FDE0 80241240 0C090082 */ jal func_80240208 +/* C2FDE0 80241240 0C090082 */ jal func_80240208_C2EDA8 /* C2FDE4 80241244 0240202D */ daddu $a0, $s2, $zero /* C2FDE8 80241248 10400002 */ beqz $v0, .L80241254 /* C2FDEC 8024124C 2402001E */ addiu $v0, $zero, 0x1e @@ -115,31 +115,31 @@ glabel func_802410D4_C2FC74 /* C2FE14 80241274 00000000 */ nop /* C2FE18 80241278 0240202D */ daddu $a0, $s2, $zero /* C2FE1C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* C2FE20 80241280 0C090234 */ jal func_802408D0 +/* C2FE20 80241280 0C090234 */ jal func_802408D0_C2F470 /* C2FE24 80241284 02A0302D */ daddu $a2, $s5, $zero /* C2FE28 80241288 080904FF */ j .L802413FC /* C2FE2C 8024128C 00000000 */ nop /* C2FE30 80241290 0240202D */ daddu $a0, $s2, $zero /* C2FE34 80241294 0260282D */ daddu $a1, $s3, $zero -/* C2FE38 80241298 0C090256 */ jal func_80240958 +/* C2FE38 80241298 0C090256 */ jal func_80240958_C2F4F8 /* C2FE3C 8024129C 02A0302D */ daddu $a2, $s5, $zero /* C2FE40 802412A0 080904FF */ j .L802413FC /* C2FE44 802412A4 00000000 */ nop /* C2FE48 802412A8 0240202D */ daddu $a0, $s2, $zero /* C2FE4C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* C2FE50 802412B0 0C090304 */ jal func_80240C10 +/* C2FE50 802412B0 0C090304 */ jal func_80240C10_C2F7B0 /* C2FE54 802412B4 02A0302D */ daddu $a2, $s5, $zero /* C2FE58 802412B8 080904FF */ j .L802413FC /* C2FE5C 802412BC 00000000 */ nop /* C2FE60 802412C0 0240202D */ daddu $a0, $s2, $zero /* C2FE64 802412C4 0260282D */ daddu $a1, $s3, $zero -/* C2FE68 802412C8 0C09031D */ jal func_80240C74 +/* C2FE68 802412C8 0C09031D */ jal func_80240C74_C2F814 /* C2FE6C 802412CC 02A0302D */ daddu $a2, $s5, $zero /* C2FE70 802412D0 080904FF */ j .L802413FC /* C2FE74 802412D4 00000000 */ nop /* C2FE78 802412D8 0240202D */ daddu $a0, $s2, $zero /* C2FE7C 802412DC 0260282D */ daddu $a1, $s3, $zero -/* C2FE80 802412E0 0C090347 */ jal func_80240D1C +/* C2FE80 802412E0 0C090347 */ jal func_80240D1C_C2F8BC /* C2FE84 802412E4 02A0302D */ daddu $a2, $s5, $zero /* C2FE88 802412E8 080904FF */ j .L802413FC /* C2FE8C 802412EC 00000000 */ nop @@ -168,19 +168,19 @@ glabel func_802410D4_C2FC74 /* C2FEE8 80241348 24020003 */ addiu $v0, $zero, 3 /* C2FEEC 8024134C 080904FF */ j .L802413FC /* C2FEF0 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C2FEF4 80241354 0C090000 */ jal func_80240000 +/* C2FEF4 80241354 0C090000 */ jal func_80240000_C2EBA0 /* C2FEF8 80241358 0240202D */ daddu $a0, $s2, $zero /* C2FEFC 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C2FF00 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C2FF04 80241364 14620025 */ bne $v1, $v0, .L802413FC /* C2FF08 80241368 00000000 */ nop -/* C2FF0C 8024136C 0C09001B */ jal func_8024006C +/* C2FF0C 8024136C 0C09001B */ jal func_8024006C_C2EC0C /* C2FF10 80241370 0240202D */ daddu $a0, $s2, $zero /* C2FF14 80241374 8E430070 */ lw $v1, 0x70($s2) /* C2FF18 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C2FF1C 8024137C 1462001F */ bne $v1, $v0, .L802413FC /* C2FF20 80241380 00000000 */ nop -/* C2FF24 80241384 0C090037 */ jal func_802400DC +/* C2FF24 80241384 0C090037 */ jal func_802400DC_C2EC7C /* C2FF28 80241388 0240202D */ daddu $a0, $s2, $zero /* C2FF2C 8024138C 080904FF */ j .L802413FC /* C2FF30 80241390 00000000 */ nop @@ -190,7 +190,7 @@ glabel func_802410D4_C2FC74 /* C2FF40 802413A0 00000000 */ nop /* C2FF44 802413A4 0240202D */ daddu $a0, $s2, $zero /* C2FF48 802413A8 0260282D */ daddu $a1, $s3, $zero -/* C2FF4C 802413AC 0C090395 */ jal func_80240E54 +/* C2FF4C 802413AC 0C090395 */ jal func_80240E54_C2F9F4 /* C2FF50 802413B0 02A0302D */ daddu $a2, $s5, $zero /* C2FF54 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C2FF58 802413B8 24020029 */ addiu $v0, $zero, 0x29 @@ -198,13 +198,13 @@ glabel func_802410D4_C2FC74 /* C2FF60 802413C0 00000000 */ nop /* C2FF64 802413C4 0240202D */ daddu $a0, $s2, $zero /* C2FF68 802413C8 0260282D */ daddu $a1, $s3, $zero -/* C2FF6C 802413CC 0C0903C0 */ jal func_80240F00 +/* C2FF6C 802413CC 0C0903C0 */ jal func_80240F00_C2FAA0 /* C2FF70 802413D0 02A0302D */ daddu $a2, $s5, $zero /* C2FF74 802413D4 080904FF */ j .L802413FC /* C2FF78 802413D8 00000000 */ nop /* C2FF7C 802413DC 0240202D */ daddu $a0, $s2, $zero /* C2FF80 802413E0 0260282D */ daddu $a1, $s3, $zero -/* C2FF84 802413E4 0C09041E */ jal func_80241078 +/* C2FF84 802413E4 0C09041E */ jal func_80241078_C2FC18 /* C2FF88 802413E8 02A0302D */ daddu $a2, $s5, $zero /* C2FF8C 802413EC 080904FF */ j .L802413FC /* C2FF90 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4.s deleted file mode 100644 index 573a3b1d9f..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401A4 -/* C31684 802401A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C31688 802401A8 AFB20018 */ sw $s2, 0x18($sp) -/* C3168C 802401AC 0080902D */ daddu $s2, $a0, $zero -/* C31690 802401B0 AFBF001C */ sw $ra, 0x1c($sp) -/* C31694 802401B4 AFB10014 */ sw $s1, 0x14($sp) -/* C31698 802401B8 AFB00010 */ sw $s0, 0x10($sp) -/* C3169C 802401BC 8E50000C */ lw $s0, 0xc($s2) -/* C316A0 802401C0 8E050000 */ lw $a1, ($s0) -/* C316A4 802401C4 0C0B1EAF */ jal get_variable -/* C316A8 802401C8 26100004 */ addiu $s0, $s0, 4 -/* C316AC 802401CC 0C04417A */ jal get_entity_by_index -/* C316B0 802401D0 0040202D */ daddu $a0, $v0, $zero -/* C316B4 802401D4 8E050000 */ lw $a1, ($s0) -/* C316B8 802401D8 26100004 */ addiu $s0, $s0, 4 -/* C316BC 802401DC 0040882D */ daddu $s1, $v0, $zero -/* C316C0 802401E0 C6200048 */ lwc1 $f0, 0x48($s1) -/* C316C4 802401E4 4600008D */ trunc.w.s $f2, $f0 -/* C316C8 802401E8 44061000 */ mfc1 $a2, $f2 -/* C316CC 802401EC 0C0B2026 */ jal set_variable -/* C316D0 802401F0 0240202D */ daddu $a0, $s2, $zero -/* C316D4 802401F4 8E050000 */ lw $a1, ($s0) -/* C316D8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* C316DC 802401FC C620004C */ lwc1 $f0, 0x4c($s1) -/* C316E0 80240200 4600008D */ trunc.w.s $f2, $f0 -/* C316E4 80240204 44061000 */ mfc1 $a2, $f2 -/* C316E8 80240208 0C0B2026 */ jal set_variable -/* C316EC 8024020C 0240202D */ daddu $a0, $s2, $zero -/* C316F0 80240210 C6200050 */ lwc1 $f0, 0x50($s1) -/* C316F4 80240214 8E050000 */ lw $a1, ($s0) -/* C316F8 80240218 4600008D */ trunc.w.s $f2, $f0 -/* C316FC 8024021C 44061000 */ mfc1 $a2, $f2 -/* C31700 80240220 0C0B2026 */ jal set_variable -/* C31704 80240224 0240202D */ daddu $a0, $s2, $zero -/* C31708 80240228 8FBF001C */ lw $ra, 0x1c($sp) -/* C3170C 8024022C 8FB20018 */ lw $s2, 0x18($sp) -/* C31710 80240230 8FB10014 */ lw $s1, 0x14($sp) -/* C31714 80240234 8FB00010 */ lw $s0, 0x10($sp) -/* C31718 80240238 24020002 */ addiu $v0, $zero, 2 -/* C3171C 8024023C 03E00008 */ jr $ra -/* C31720 80240240 27BD0020 */ addiu $sp, $sp, 0x20 -/* C31724 80240244 00000000 */ nop -/* C31728 80240248 00000000 */ nop -/* C3172C 8024024C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4_C31684.s b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4_C31684.s new file mode 100644 index 0000000000..ba37153708 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C314E0/func_802401A4_C31684.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401A4_C31684 +/* C31684 802401A4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C31688 802401A8 AFB20018 */ sw $s2, 0x18($sp) +/* C3168C 802401AC 0080902D */ daddu $s2, $a0, $zero +/* C31690 802401B0 AFBF001C */ sw $ra, 0x1c($sp) +/* C31694 802401B4 AFB10014 */ sw $s1, 0x14($sp) +/* C31698 802401B8 AFB00010 */ sw $s0, 0x10($sp) +/* C3169C 802401BC 8E50000C */ lw $s0, 0xc($s2) +/* C316A0 802401C0 8E050000 */ lw $a1, ($s0) +/* C316A4 802401C4 0C0B1EAF */ jal get_variable +/* C316A8 802401C8 26100004 */ addiu $s0, $s0, 4 +/* C316AC 802401CC 0C04417A */ jal get_entity_by_index +/* C316B0 802401D0 0040202D */ daddu $a0, $v0, $zero +/* C316B4 802401D4 8E050000 */ lw $a1, ($s0) +/* C316B8 802401D8 26100004 */ addiu $s0, $s0, 4 +/* C316BC 802401DC 0040882D */ daddu $s1, $v0, $zero +/* C316C0 802401E0 C6200048 */ lwc1 $f0, 0x48($s1) +/* C316C4 802401E4 4600008D */ trunc.w.s $f2, $f0 +/* C316C8 802401E8 44061000 */ mfc1 $a2, $f2 +/* C316CC 802401EC 0C0B2026 */ jal set_variable +/* C316D0 802401F0 0240202D */ daddu $a0, $s2, $zero +/* C316D4 802401F4 8E050000 */ lw $a1, ($s0) +/* C316D8 802401F8 26100004 */ addiu $s0, $s0, 4 +/* C316DC 802401FC C620004C */ lwc1 $f0, 0x4c($s1) +/* C316E0 80240200 4600008D */ trunc.w.s $f2, $f0 +/* C316E4 80240204 44061000 */ mfc1 $a2, $f2 +/* C316E8 80240208 0C0B2026 */ jal set_variable +/* C316EC 8024020C 0240202D */ daddu $a0, $s2, $zero +/* C316F0 80240210 C6200050 */ lwc1 $f0, 0x50($s1) +/* C316F4 80240214 8E050000 */ lw $a1, ($s0) +/* C316F8 80240218 4600008D */ trunc.w.s $f2, $f0 +/* C316FC 8024021C 44061000 */ mfc1 $a2, $f2 +/* C31700 80240220 0C0B2026 */ jal set_variable +/* C31704 80240224 0240202D */ daddu $a0, $s2, $zero +/* C31708 80240228 8FBF001C */ lw $ra, 0x1c($sp) +/* C3170C 8024022C 8FB20018 */ lw $s2, 0x18($sp) +/* C31710 80240230 8FB10014 */ lw $s1, 0x14($sp) +/* C31714 80240234 8FB00010 */ lw $s0, 0x10($sp) +/* C31718 80240238 24020002 */ addiu $v0, $zero, 2 +/* C3171C 8024023C 03E00008 */ jr $ra +/* C31720 80240240 27BD0020 */ addiu $sp, $sp, 0x20 +/* C31724 80240244 00000000 */ nop +/* C31728 80240248 00000000 */ nop +/* C3172C 8024024C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458.s deleted file mode 100644 index 8ee720c056..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240458 -/* C31938 80240458 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C3193C 8024045C AFBF0024 */ sw $ra, 0x24($sp) -/* C31940 80240460 AFB40020 */ sw $s4, 0x20($sp) -/* C31944 80240464 AFB3001C */ sw $s3, 0x1c($sp) -/* C31948 80240468 AFB20018 */ sw $s2, 0x18($sp) -/* C3194C 8024046C AFB10014 */ sw $s1, 0x14($sp) -/* C31950 80240470 AFB00010 */ sw $s0, 0x10($sp) -/* C31954 80240474 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C31958 80240478 8C900148 */ lw $s0, 0x148($a0) -/* C3195C 8024047C 86040008 */ lh $a0, 8($s0) -/* C31960 80240480 0C00EABB */ jal get_npc_unsafe -/* C31964 80240484 24110001 */ addiu $s1, $zero, 1 -/* C31968 80240488 86040008 */ lh $a0, 8($s0) -/* C3196C 8024048C 0040802D */ daddu $s0, $v0, $zero -/* C31970 80240490 3C05800B */ lui $a1, %hi(gCameras) -/* C31974 80240494 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C31978 80240498 3C03800A */ lui $v1, 0x800a -/* C3197C 8024049C 8463A634 */ lh $v1, -0x59cc($v1) -/* C31980 802404A0 00912021 */ addu $a0, $a0, $s1 -/* C31984 802404A4 00031080 */ sll $v0, $v1, 2 -/* C31988 802404A8 00431021 */ addu $v0, $v0, $v1 -/* C3198C 802404AC 00021080 */ sll $v0, $v0, 2 -/* C31990 802404B0 00431023 */ subu $v0, $v0, $v1 -/* C31994 802404B4 000218C0 */ sll $v1, $v0, 3 -/* C31998 802404B8 00431021 */ addu $v0, $v0, $v1 -/* C3199C 802404BC 000210C0 */ sll $v0, $v0, 3 -/* C319A0 802404C0 0C00FB3A */ jal get_enemy -/* C319A4 802404C4 00459021 */ addu $s2, $v0, $a1 -/* C319A8 802404C8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C319AC 802404CC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C319B0 802404D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C319B4 802404D4 8E830000 */ lw $v1, ($s4) -/* C319B8 802404D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C319BC 802404DC 8C660028 */ lw $a2, 0x28($v1) -/* C319C0 802404E0 8C670030 */ lw $a3, 0x30($v1) -/* C319C4 802404E4 0C00A7B5 */ jal dist2D -/* C319C8 802404E8 0040982D */ daddu $s3, $v0, $zero -/* C319CC 802404EC C6620074 */ lwc1 $f2, 0x74($s3) -/* C319D0 802404F0 468010A0 */ cvt.s.w $f2, $f2 -/* C319D4 802404F4 4600103C */ c.lt.s $f2, $f0 -/* C319D8 802404F8 00000000 */ nop -/* C319DC 802404FC 45030001 */ bc1tl .L80240504 -/* C319E0 80240500 0000882D */ daddu $s1, $zero, $zero -.L80240504: -/* C319E4 80240504 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C319E8 80240508 C60E000C */ lwc1 $f14, 0xc($s0) -/* C319EC 8024050C 3C014387 */ lui $at, 0x4387 -/* C319F0 80240510 4481A000 */ mtc1 $at, $f20 -/* C319F4 80240514 0C00A70A */ jal get_clamped_angle_diff -/* C319F8 80240518 00000000 */ nop -/* C319FC 8024051C 0C00A6C9 */ jal clamp_angle -/* C31A00 80240520 46000306 */ mov.s $f12, $f0 -/* C31A04 80240524 3C018024 */ lui $at, 0x8024 -/* C31A08 80240528 D42249F0 */ ldc1 $f2, 0x49f0($at) -/* C31A0C 8024052C 46000021 */ cvt.d.s $f0, $f0 -/* C31A10 80240530 4622003C */ c.lt.d $f0, $f2 -/* C31A14 80240534 00000000 */ nop -/* C31A18 80240538 45000003 */ bc1f .L80240548 -/* C31A1C 8024053C 00000000 */ nop -/* C31A20 80240540 3C0142B4 */ lui $at, 0x42b4 -/* C31A24 80240544 4481A000 */ mtc1 $at, $f20 -.L80240548: -/* C31A28 80240548 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C31A2C 8024054C 8E820000 */ lw $v0, ($s4) -/* C31A30 80240550 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C31A34 80240554 8C460028 */ lw $a2, 0x28($v0) -/* C31A38 80240558 0C00A720 */ jal atan2 -/* C31A3C 8024055C 8C470030 */ lw $a3, 0x30($v0) -/* C31A40 80240560 4600A306 */ mov.s $f12, $f20 -/* C31A44 80240564 0C00A70A */ jal get_clamped_angle_diff -/* C31A48 80240568 46000386 */ mov.s $f14, $f0 -/* C31A4C 8024056C C6620078 */ lwc1 $f2, 0x78($s3) -/* C31A50 80240570 468010A0 */ cvt.s.w $f2, $f2 -/* C31A54 80240574 46000005 */ abs.s $f0, $f0 -/* C31A58 80240578 4600103C */ c.lt.s $f2, $f0 -/* C31A5C 8024057C 00000000 */ nop -/* C31A60 80240580 45030001 */ bc1tl .L80240588 -/* C31A64 80240584 0000882D */ daddu $s1, $zero, $zero -.L80240588: -/* C31A68 80240588 8E820000 */ lw $v0, ($s4) -/* C31A6C 8024058C C600003C */ lwc1 $f0, 0x3c($s0) -/* C31A70 80240590 C442002C */ lwc1 $f2, 0x2c($v0) -/* C31A74 80240594 860200A8 */ lh $v0, 0xa8($s0) -/* C31A78 80240598 46020001 */ sub.s $f0, $f0, $f2 -/* C31A7C 8024059C 44821000 */ mtc1 $v0, $f2 -/* C31A80 802405A0 00000000 */ nop -/* C31A84 802405A4 468010A1 */ cvt.d.w $f2, $f2 -/* C31A88 802405A8 46221080 */ add.d $f2, $f2, $f2 -/* C31A8C 802405AC 46000005 */ abs.s $f0, $f0 -/* C31A90 802405B0 46000021 */ cvt.d.s $f0, $f0 -/* C31A94 802405B4 4620103E */ c.le.d $f2, $f0 -/* C31A98 802405B8 00000000 */ nop -/* C31A9C 802405BC 45030001 */ bc1tl .L802405C4 -/* C31AA0 802405C0 0000882D */ daddu $s1, $zero, $zero -.L802405C4: -/* C31AA4 802405C4 3C038011 */ lui $v1, 0x8011 -/* C31AA8 802405C8 8063EBB3 */ lb $v1, -0x144d($v1) -/* C31AAC 802405CC 24020009 */ addiu $v0, $zero, 9 -/* C31AB0 802405D0 50620001 */ beql $v1, $v0, .L802405D8 -/* C31AB4 802405D4 0000882D */ daddu $s1, $zero, $zero -.L802405D8: -/* C31AB8 802405D8 24020007 */ addiu $v0, $zero, 7 -/* C31ABC 802405DC 50620001 */ beql $v1, $v0, .L802405E4 -/* C31AC0 802405E0 0000882D */ daddu $s1, $zero, $zero -.L802405E4: -/* C31AC4 802405E4 0220102D */ daddu $v0, $s1, $zero -/* C31AC8 802405E8 8FBF0024 */ lw $ra, 0x24($sp) -/* C31ACC 802405EC 8FB40020 */ lw $s4, 0x20($sp) -/* C31AD0 802405F0 8FB3001C */ lw $s3, 0x1c($sp) -/* C31AD4 802405F4 8FB20018 */ lw $s2, 0x18($sp) -/* C31AD8 802405F8 8FB10014 */ lw $s1, 0x14($sp) -/* C31ADC 802405FC 8FB00010 */ lw $s0, 0x10($sp) -/* C31AE0 80240600 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C31AE4 80240604 03E00008 */ jr $ra -/* C31AE8 80240608 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s new file mode 100644 index 0000000000..e1efe4ddd8 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80240458_C31938.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240458_C31938 +/* C31938 80240458 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C3193C 8024045C AFBF0024 */ sw $ra, 0x24($sp) +/* C31940 80240460 AFB40020 */ sw $s4, 0x20($sp) +/* C31944 80240464 AFB3001C */ sw $s3, 0x1c($sp) +/* C31948 80240468 AFB20018 */ sw $s2, 0x18($sp) +/* C3194C 8024046C AFB10014 */ sw $s1, 0x14($sp) +/* C31950 80240470 AFB00010 */ sw $s0, 0x10($sp) +/* C31954 80240474 F7B40028 */ sdc1 $f20, 0x28($sp) +/* C31958 80240478 8C900148 */ lw $s0, 0x148($a0) +/* C3195C 8024047C 86040008 */ lh $a0, 8($s0) +/* C31960 80240480 0C00EABB */ jal get_npc_unsafe +/* C31964 80240484 24110001 */ addiu $s1, $zero, 1 +/* C31968 80240488 86040008 */ lh $a0, 8($s0) +/* C3196C 8024048C 0040802D */ daddu $s0, $v0, $zero +/* C31970 80240490 3C05800B */ lui $a1, %hi(gCameras) +/* C31974 80240494 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* C31978 80240498 3C03800A */ lui $v1, 0x800a +/* C3197C 8024049C 8463A634 */ lh $v1, -0x59cc($v1) +/* C31980 802404A0 00912021 */ addu $a0, $a0, $s1 +/* C31984 802404A4 00031080 */ sll $v0, $v1, 2 +/* C31988 802404A8 00431021 */ addu $v0, $v0, $v1 +/* C3198C 802404AC 00021080 */ sll $v0, $v0, 2 +/* C31990 802404B0 00431023 */ subu $v0, $v0, $v1 +/* C31994 802404B4 000218C0 */ sll $v1, $v0, 3 +/* C31998 802404B8 00431021 */ addu $v0, $v0, $v1 +/* C3199C 802404BC 000210C0 */ sll $v0, $v0, 3 +/* C319A0 802404C0 0C00FB3A */ jal get_enemy +/* C319A4 802404C4 00459021 */ addu $s2, $v0, $a1 +/* C319A8 802404C8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) +/* C319AC 802404CC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) +/* C319B0 802404D0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C319B4 802404D4 8E830000 */ lw $v1, ($s4) +/* C319B8 802404D8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C319BC 802404DC 8C660028 */ lw $a2, 0x28($v1) +/* C319C0 802404E0 8C670030 */ lw $a3, 0x30($v1) +/* C319C4 802404E4 0C00A7B5 */ jal dist2D +/* C319C8 802404E8 0040982D */ daddu $s3, $v0, $zero +/* C319CC 802404EC C6620074 */ lwc1 $f2, 0x74($s3) +/* C319D0 802404F0 468010A0 */ cvt.s.w $f2, $f2 +/* C319D4 802404F4 4600103C */ c.lt.s $f2, $f0 +/* C319D8 802404F8 00000000 */ nop +/* C319DC 802404FC 45030001 */ bc1tl .L80240504 +/* C319E0 80240500 0000882D */ daddu $s1, $zero, $zero +.L80240504: +/* C319E4 80240504 C64C006C */ lwc1 $f12, 0x6c($s2) +/* C319E8 80240508 C60E000C */ lwc1 $f14, 0xc($s0) +/* C319EC 8024050C 3C014387 */ lui $at, 0x4387 +/* C319F0 80240510 4481A000 */ mtc1 $at, $f20 +/* C319F4 80240514 0C00A70A */ jal get_clamped_angle_diff +/* C319F8 80240518 00000000 */ nop +/* C319FC 8024051C 0C00A6C9 */ jal clamp_angle +/* C31A00 80240520 46000306 */ mov.s $f12, $f0 +/* C31A04 80240524 3C018024 */ lui $at, 0x8024 +/* C31A08 80240528 D42249F0 */ ldc1 $f2, 0x49f0($at) +/* C31A0C 8024052C 46000021 */ cvt.d.s $f0, $f0 +/* C31A10 80240530 4622003C */ c.lt.d $f0, $f2 +/* C31A14 80240534 00000000 */ nop +/* C31A18 80240538 45000003 */ bc1f .L80240548 +/* C31A1C 8024053C 00000000 */ nop +/* C31A20 80240540 3C0142B4 */ lui $at, 0x42b4 +/* C31A24 80240544 4481A000 */ mtc1 $at, $f20 +.L80240548: +/* C31A28 80240548 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C31A2C 8024054C 8E820000 */ lw $v0, ($s4) +/* C31A30 80240550 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C31A34 80240554 8C460028 */ lw $a2, 0x28($v0) +/* C31A38 80240558 0C00A720 */ jal atan2 +/* C31A3C 8024055C 8C470030 */ lw $a3, 0x30($v0) +/* C31A40 80240560 4600A306 */ mov.s $f12, $f20 +/* C31A44 80240564 0C00A70A */ jal get_clamped_angle_diff +/* C31A48 80240568 46000386 */ mov.s $f14, $f0 +/* C31A4C 8024056C C6620078 */ lwc1 $f2, 0x78($s3) +/* C31A50 80240570 468010A0 */ cvt.s.w $f2, $f2 +/* C31A54 80240574 46000005 */ abs.s $f0, $f0 +/* C31A58 80240578 4600103C */ c.lt.s $f2, $f0 +/* C31A5C 8024057C 00000000 */ nop +/* C31A60 80240580 45030001 */ bc1tl .L80240588 +/* C31A64 80240584 0000882D */ daddu $s1, $zero, $zero +.L80240588: +/* C31A68 80240588 8E820000 */ lw $v0, ($s4) +/* C31A6C 8024058C C600003C */ lwc1 $f0, 0x3c($s0) +/* C31A70 80240590 C442002C */ lwc1 $f2, 0x2c($v0) +/* C31A74 80240594 860200A8 */ lh $v0, 0xa8($s0) +/* C31A78 80240598 46020001 */ sub.s $f0, $f0, $f2 +/* C31A7C 8024059C 44821000 */ mtc1 $v0, $f2 +/* C31A80 802405A0 00000000 */ nop +/* C31A84 802405A4 468010A1 */ cvt.d.w $f2, $f2 +/* C31A88 802405A8 46221080 */ add.d $f2, $f2, $f2 +/* C31A8C 802405AC 46000005 */ abs.s $f0, $f0 +/* C31A90 802405B0 46000021 */ cvt.d.s $f0, $f0 +/* C31A94 802405B4 4620103E */ c.le.d $f2, $f0 +/* C31A98 802405B8 00000000 */ nop +/* C31A9C 802405BC 45030001 */ bc1tl .L802405C4 +/* C31AA0 802405C0 0000882D */ daddu $s1, $zero, $zero +.L802405C4: +/* C31AA4 802405C4 3C038011 */ lui $v1, 0x8011 +/* C31AA8 802405C8 8063EBB3 */ lb $v1, -0x144d($v1) +/* C31AAC 802405CC 24020009 */ addiu $v0, $zero, 9 +/* C31AB0 802405D0 50620001 */ beql $v1, $v0, .L802405D8 +/* C31AB4 802405D4 0000882D */ daddu $s1, $zero, $zero +.L802405D8: +/* C31AB8 802405D8 24020007 */ addiu $v0, $zero, 7 +/* C31ABC 802405DC 50620001 */ beql $v1, $v0, .L802405E4 +/* C31AC0 802405E0 0000882D */ daddu $s1, $zero, $zero +.L802405E4: +/* C31AC4 802405E4 0220102D */ daddu $v0, $s1, $zero +/* C31AC8 802405E8 8FBF0024 */ lw $ra, 0x24($sp) +/* C31ACC 802405EC 8FB40020 */ lw $s4, 0x20($sp) +/* C31AD0 802405F0 8FB3001C */ lw $s3, 0x1c($sp) +/* C31AD4 802405F4 8FB20018 */ lw $s2, 0x18($sp) +/* C31AD8 802405F8 8FB10014 */ lw $s1, 0x14($sp) +/* C31ADC 802405FC 8FB00010 */ lw $s0, 0x10($sp) +/* C31AE0 80240600 D7B40028 */ ldc1 $f20, 0x28($sp) +/* C31AE4 80240604 03E00008 */ jr $ra +/* C31AE8 80240608 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s index 3274630c19..9f1cdfa6cd 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024086C_C31D4C.s @@ -90,7 +90,7 @@ glabel func_8024086C_C31D4C /* C31E8C 802409AC 8E22006C */ lw $v0, 0x6c($s1) /* C31E90 802409B0 14400006 */ bnez $v0, .L802409CC /* C31E94 802409B4 00000000 */ nop -/* C31E98 802409B8 0C090116 */ jal func_80240458 +/* C31E98 802409B8 0C090116 */ jal func_80240458_C31938 /* C31E9C 802409BC 0240202D */ daddu $a0, $s2, $zero /* C31EA0 802409C0 10400002 */ beqz $v0, .L802409CC /* C31EA4 802409C4 2402001E */ addiu $v0, $zero, 0x1e @@ -151,21 +151,21 @@ glabel func_8024086C_C31D4C /* C31F7C 80240A9C 0280302D */ daddu $a2, $s4, $zero /* C31F80 80240AA0 080902BE */ j .L80240AF8 /* C31F84 80240AA4 00000000 */ nop -/* C31F88 80240AA8 0C090094 */ jal func_80240250 +/* C31F88 80240AA8 0C090094 */ jal func_80240250_C31730 /* C31F8C 80240AAC 0240202D */ daddu $a0, $s2, $zero -/* C31F90 80240AB0 0C0900AF */ jal func_802402BC +/* C31F90 80240AB0 0C0900AF */ jal func_802402BC_C3179C /* C31F94 80240AB4 0240202D */ daddu $a0, $s2, $zero /* C31F98 80240AB8 8E430070 */ lw $v1, 0x70($s2) /* C31F9C 80240ABC 24020020 */ addiu $v0, $zero, 0x20 /* C31FA0 80240AC0 1462000D */ bne $v1, $v0, .L80240AF8 /* C31FA4 80240AC4 00000000 */ nop -/* C31FA8 80240AC8 0C0900CB */ jal func_8024032C +/* C31FA8 80240AC8 0C0900CB */ jal func_8024032C_C3180C /* C31FAC 80240ACC 0240202D */ daddu $a0, $s2, $zero /* C31FB0 80240AD0 8E430070 */ lw $v1, 0x70($s2) /* C31FB4 80240AD4 24020021 */ addiu $v0, $zero, 0x21 /* C31FB8 80240AD8 14620007 */ bne $v1, $v0, .L80240AF8 /* C31FBC 80240ADC 00000000 */ nop -/* C31FC0 80240AE0 0C090101 */ jal func_80240404 +/* C31FC0 80240AE0 0C090101 */ jal func_80240404_C318E4 /* C31FC4 80240AE4 0240202D */ daddu $a0, $s2, $zero /* C31FC8 80240AE8 080902BE */ j .L80240AF8 /* C31FCC 80240AEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250.s deleted file mode 100644 index 8300989298..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241250 -/* C32730 80241250 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C32734 80241254 AFB10014 */ sw $s1, 0x14($sp) -/* C32738 80241258 0080882D */ daddu $s1, $a0, $zero -/* C3273C 8024125C AFBF0018 */ sw $ra, 0x18($sp) -/* C32740 80241260 AFB00010 */ sw $s0, 0x10($sp) -/* C32744 80241264 8E300148 */ lw $s0, 0x148($s1) -/* C32748 80241268 0C00EABB */ jal get_npc_unsafe -/* C3274C 8024126C 86040008 */ lh $a0, 8($s0) -/* C32750 80241270 8E0300CC */ lw $v1, 0xcc($s0) -/* C32754 80241274 3C014120 */ lui $at, 0x4120 -/* C32758 80241278 44812000 */ mtc1 $at, $f4 -/* C3275C 8024127C 3C014000 */ lui $at, 0x4000 -/* C32760 80241280 44810000 */ mtc1 $at, $f0 -/* C32764 80241284 C442003C */ lwc1 $f2, 0x3c($v0) -/* C32768 80241288 8C640010 */ lw $a0, 0x10($v1) -/* C3276C 8024128C 8C430000 */ lw $v1, ($v0) -/* C32770 80241290 E444001C */ swc1 $f4, 0x1c($v0) -/* C32774 80241294 E4400014 */ swc1 $f0, 0x14($v0) -/* C32778 80241298 E4420064 */ swc1 $f2, 0x64($v0) -/* C3277C 8024129C 34630800 */ ori $v1, $v1, 0x800 -/* C32780 802412A0 AC430000 */ sw $v1, ($v0) -/* C32784 802412A4 AC440028 */ sw $a0, 0x28($v0) -/* C32788 802412A8 2402000B */ addiu $v0, $zero, 0xb -/* C3278C 802412AC AE220070 */ sw $v0, 0x70($s1) -/* C32790 802412B0 8FBF0018 */ lw $ra, 0x18($sp) -/* C32794 802412B4 8FB10014 */ lw $s1, 0x14($sp) -/* C32798 802412B8 8FB00010 */ lw $s0, 0x10($sp) -/* C3279C 802412BC 03E00008 */ jr $ra -/* C327A0 802412C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250_C32730.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250_C32730.s new file mode 100644 index 0000000000..5752f47e4c --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241250_C32730.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241250_C32730 +/* C32730 80241250 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C32734 80241254 AFB10014 */ sw $s1, 0x14($sp) +/* C32738 80241258 0080882D */ daddu $s1, $a0, $zero +/* C3273C 8024125C AFBF0018 */ sw $ra, 0x18($sp) +/* C32740 80241260 AFB00010 */ sw $s0, 0x10($sp) +/* C32744 80241264 8E300148 */ lw $s0, 0x148($s1) +/* C32748 80241268 0C00EABB */ jal get_npc_unsafe +/* C3274C 8024126C 86040008 */ lh $a0, 8($s0) +/* C32750 80241270 8E0300CC */ lw $v1, 0xcc($s0) +/* C32754 80241274 3C014120 */ lui $at, 0x4120 +/* C32758 80241278 44812000 */ mtc1 $at, $f4 +/* C3275C 8024127C 3C014000 */ lui $at, 0x4000 +/* C32760 80241280 44810000 */ mtc1 $at, $f0 +/* C32764 80241284 C442003C */ lwc1 $f2, 0x3c($v0) +/* C32768 80241288 8C640010 */ lw $a0, 0x10($v1) +/* C3276C 8024128C 8C430000 */ lw $v1, ($v0) +/* C32770 80241290 E444001C */ swc1 $f4, 0x1c($v0) +/* C32774 80241294 E4400014 */ swc1 $f0, 0x14($v0) +/* C32778 80241298 E4420064 */ swc1 $f2, 0x64($v0) +/* C3277C 8024129C 34630800 */ ori $v1, $v1, 0x800 +/* C32780 802412A0 AC430000 */ sw $v1, ($v0) +/* C32784 802412A4 AC440028 */ sw $a0, 0x28($v0) +/* C32788 802412A8 2402000B */ addiu $v0, $zero, 0xb +/* C3278C 802412AC AE220070 */ sw $v0, 0x70($s1) +/* C32790 802412B0 8FBF0018 */ lw $ra, 0x18($sp) +/* C32794 802412B4 8FB10014 */ lw $s1, 0x14($sp) +/* C32798 802412B8 8FB00010 */ lw $s0, 0x10($sp) +/* C3279C 802412BC 03E00008 */ jr $ra +/* C327A0 802412C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4.s deleted file mode 100644 index 8592297be9..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C4 -/* C327A4 802412C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C327A8 802412C8 AFB00010 */ sw $s0, 0x10($sp) -/* C327AC 802412CC 0080802D */ daddu $s0, $a0, $zero -/* C327B0 802412D0 AFBF0014 */ sw $ra, 0x14($sp) -/* C327B4 802412D4 8E020148 */ lw $v0, 0x148($s0) -/* C327B8 802412D8 0C00EABB */ jal get_npc_unsafe -/* C327BC 802412DC 84440008 */ lh $a0, 8($v0) -/* C327C0 802412E0 0040202D */ daddu $a0, $v0, $zero -/* C327C4 802412E4 C482003C */ lwc1 $f2, 0x3c($a0) -/* C327C8 802412E8 C480001C */ lwc1 $f0, 0x1c($a0) -/* C327CC 802412EC 46001080 */ add.s $f2, $f2, $f0 -/* C327D0 802412F0 C4840014 */ lwc1 $f4, 0x14($a0) -/* C327D4 802412F4 46040001 */ sub.s $f0, $f0, $f4 -/* C327D8 802412F8 C4840064 */ lwc1 $f4, 0x64($a0) -/* C327DC 802412FC 4602203C */ c.lt.s $f4, $f2 -/* C327E0 80241300 E482003C */ swc1 $f2, 0x3c($a0) -/* C327E4 80241304 45010009 */ bc1t .L8024132C -/* C327E8 80241308 E480001C */ swc1 $f0, 0x1c($a0) -/* C327EC 8024130C 8C820000 */ lw $v0, ($a0) -/* C327F0 80241310 2403F7FF */ addiu $v1, $zero, -0x801 -/* C327F4 80241314 E484003C */ swc1 $f4, 0x3c($a0) -/* C327F8 80241318 AC80001C */ sw $zero, 0x1c($a0) -/* C327FC 8024131C 00431024 */ and $v0, $v0, $v1 -/* C32800 80241320 AC820000 */ sw $v0, ($a0) -/* C32804 80241324 2402000C */ addiu $v0, $zero, 0xc -/* C32808 80241328 AE020070 */ sw $v0, 0x70($s0) -.L8024132C: -/* C3280C 8024132C 8FBF0014 */ lw $ra, 0x14($sp) -/* C32810 80241330 8FB00010 */ lw $s0, 0x10($sp) -/* C32814 80241334 03E00008 */ jr $ra -/* C32818 80241338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4_C327A4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4_C327A4.s new file mode 100644 index 0000000000..694e60925b --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802412C4_C327A4.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412C4_C327A4 +/* C327A4 802412C4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C327A8 802412C8 AFB00010 */ sw $s0, 0x10($sp) +/* C327AC 802412CC 0080802D */ daddu $s0, $a0, $zero +/* C327B0 802412D0 AFBF0014 */ sw $ra, 0x14($sp) +/* C327B4 802412D4 8E020148 */ lw $v0, 0x148($s0) +/* C327B8 802412D8 0C00EABB */ jal get_npc_unsafe +/* C327BC 802412DC 84440008 */ lh $a0, 8($v0) +/* C327C0 802412E0 0040202D */ daddu $a0, $v0, $zero +/* C327C4 802412E4 C482003C */ lwc1 $f2, 0x3c($a0) +/* C327C8 802412E8 C480001C */ lwc1 $f0, 0x1c($a0) +/* C327CC 802412EC 46001080 */ add.s $f2, $f2, $f0 +/* C327D0 802412F0 C4840014 */ lwc1 $f4, 0x14($a0) +/* C327D4 802412F4 46040001 */ sub.s $f0, $f0, $f4 +/* C327D8 802412F8 C4840064 */ lwc1 $f4, 0x64($a0) +/* C327DC 802412FC 4602203C */ c.lt.s $f4, $f2 +/* C327E0 80241300 E482003C */ swc1 $f2, 0x3c($a0) +/* C327E4 80241304 45010009 */ bc1t .L8024132C +/* C327E8 80241308 E480001C */ swc1 $f0, 0x1c($a0) +/* C327EC 8024130C 8C820000 */ lw $v0, ($a0) +/* C327F0 80241310 2403F7FF */ addiu $v1, $zero, -0x801 +/* C327F4 80241314 E484003C */ swc1 $f4, 0x3c($a0) +/* C327F8 80241318 AC80001C */ sw $zero, 0x1c($a0) +/* C327FC 8024131C 00431024 */ and $v0, $v0, $v1 +/* C32800 80241320 AC820000 */ sw $v0, ($a0) +/* C32804 80241324 2402000C */ addiu $v0, $zero, 0xc +/* C32808 80241328 AE020070 */ sw $v0, 0x70($s0) +.L8024132C: +/* C3280C 8024132C 8FBF0014 */ lw $ra, 0x14($sp) +/* C32810 80241330 8FB00010 */ lw $s0, 0x10($sp) +/* C32814 80241334 03E00008 */ jr $ra +/* C32818 80241338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C.s deleted file mode 100644 index 9f830b4981..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024133C -/* C3281C 8024133C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C32820 80241340 AFB3001C */ sw $s3, 0x1c($sp) -/* C32824 80241344 0080982D */ daddu $s3, $a0, $zero -/* C32828 80241348 AFBF0020 */ sw $ra, 0x20($sp) -/* C3282C 8024134C AFB20018 */ sw $s2, 0x18($sp) -/* C32830 80241350 AFB10014 */ sw $s1, 0x14($sp) -/* C32834 80241354 AFB00010 */ sw $s0, 0x10($sp) -/* C32838 80241358 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C3283C 8024135C 8E710148 */ lw $s1, 0x148($s3) -/* C32840 80241360 86240008 */ lh $a0, 8($s1) -/* C32844 80241364 0C00EABB */ jal get_npc_unsafe -/* C32848 80241368 00A0802D */ daddu $s0, $a1, $zero -/* C3284C 8024136C 8E040020 */ lw $a0, 0x20($s0) -/* C32850 80241370 0040902D */ daddu $s2, $v0, $zero -/* C32854 80241374 00041FC2 */ srl $v1, $a0, 0x1f -/* C32858 80241378 00832021 */ addu $a0, $a0, $v1 -/* C3285C 8024137C 00042043 */ sra $a0, $a0, 1 -/* C32860 80241380 0C00A67F */ jal rand_int -/* C32864 80241384 24840001 */ addiu $a0, $a0, 1 -/* C32868 80241388 8E030020 */ lw $v1, 0x20($s0) -/* C3286C 8024138C C64C0038 */ lwc1 $f12, 0x38($s2) -/* C32870 80241390 000327C2 */ srl $a0, $v1, 0x1f -/* C32874 80241394 00641821 */ addu $v1, $v1, $a0 -/* C32878 80241398 00031843 */ sra $v1, $v1, 1 -/* C3287C 8024139C 00621821 */ addu $v1, $v1, $v0 -/* C32880 802413A0 A643008E */ sh $v1, 0x8e($s2) -/* C32884 802413A4 8E2200CC */ lw $v0, 0xcc($s1) -/* C32888 802413A8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C3288C 802413AC 8C42000C */ lw $v0, 0xc($v0) -/* C32890 802413B0 AE420028 */ sw $v0, 0x28($s2) -/* C32894 802413B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* C32898 802413B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C3289C 802413BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C328A0 802413C0 E6400018 */ swc1 $f0, 0x18($s2) -/* C328A4 802413C4 8C460028 */ lw $a2, 0x28($v0) -/* C328A8 802413C8 0C00A720 */ jal atan2 -/* C328AC 802413CC 8C470030 */ lw $a3, 0x30($v0) -/* C328B0 802413D0 46000506 */ mov.s $f20, $f0 -/* C328B4 802413D4 C64C000C */ lwc1 $f12, 0xc($s2) -/* C328B8 802413D8 0C00A70A */ jal get_clamped_angle_diff -/* C328BC 802413DC 4600A386 */ mov.s $f14, $f20 -/* C328C0 802413E0 46000086 */ mov.s $f2, $f0 -/* C328C4 802413E4 8E02001C */ lw $v0, 0x1c($s0) -/* C328C8 802413E8 46001005 */ abs.s $f0, $f2 -/* C328CC 802413EC 44822000 */ mtc1 $v0, $f4 -/* C328D0 802413F0 00000000 */ nop -/* C328D4 802413F4 46802120 */ cvt.s.w $f4, $f4 -/* C328D8 802413F8 4600203C */ c.lt.s $f4, $f0 -/* C328DC 802413FC 00000000 */ nop -/* C328E0 80241400 4500000D */ bc1f .L80241438 -/* C328E4 80241404 00000000 */ nop -/* C328E8 80241408 44800000 */ mtc1 $zero, $f0 -/* C328EC 8024140C C654000C */ lwc1 $f20, 0xc($s2) -/* C328F0 80241410 4600103C */ c.lt.s $f2, $f0 -/* C328F4 80241414 00000000 */ nop -/* C328F8 80241418 45000006 */ bc1f .L80241434 -/* C328FC 8024141C 00021023 */ negu $v0, $v0 -/* C32900 80241420 44820000 */ mtc1 $v0, $f0 -/* C32904 80241424 00000000 */ nop -/* C32908 80241428 46800020 */ cvt.s.w $f0, $f0 -/* C3290C 8024142C 0809050E */ j .L80241438 -/* C32910 80241430 4600A500 */ add.s $f20, $f20, $f0 -.L80241434: -/* C32914 80241434 4604A500 */ add.s $f20, $f20, $f4 -.L80241438: -/* C32918 80241438 0C00A6C9 */ jal clamp_angle -/* C3291C 8024143C 4600A306 */ mov.s $f12, $f20 -/* C32920 80241440 2402000D */ addiu $v0, $zero, 0xd -/* C32924 80241444 E640000C */ swc1 $f0, 0xc($s2) -/* C32928 80241448 AE620070 */ sw $v0, 0x70($s3) -/* C3292C 8024144C 8FBF0020 */ lw $ra, 0x20($sp) -/* C32930 80241450 8FB3001C */ lw $s3, 0x1c($sp) -/* C32934 80241454 8FB20018 */ lw $s2, 0x18($sp) -/* C32938 80241458 8FB10014 */ lw $s1, 0x14($sp) -/* C3293C 8024145C 8FB00010 */ lw $s0, 0x10($sp) -/* C32940 80241460 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C32944 80241464 03E00008 */ jr $ra -/* C32948 80241468 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C_C3281C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C_C3281C.s new file mode 100644 index 0000000000..afdd2e5eba --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024133C_C3281C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024133C_C3281C +/* C3281C 8024133C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C32820 80241340 AFB3001C */ sw $s3, 0x1c($sp) +/* C32824 80241344 0080982D */ daddu $s3, $a0, $zero +/* C32828 80241348 AFBF0020 */ sw $ra, 0x20($sp) +/* C3282C 8024134C AFB20018 */ sw $s2, 0x18($sp) +/* C32830 80241350 AFB10014 */ sw $s1, 0x14($sp) +/* C32834 80241354 AFB00010 */ sw $s0, 0x10($sp) +/* C32838 80241358 F7B40028 */ sdc1 $f20, 0x28($sp) +/* C3283C 8024135C 8E710148 */ lw $s1, 0x148($s3) +/* C32840 80241360 86240008 */ lh $a0, 8($s1) +/* C32844 80241364 0C00EABB */ jal get_npc_unsafe +/* C32848 80241368 00A0802D */ daddu $s0, $a1, $zero +/* C3284C 8024136C 8E040020 */ lw $a0, 0x20($s0) +/* C32850 80241370 0040902D */ daddu $s2, $v0, $zero +/* C32854 80241374 00041FC2 */ srl $v1, $a0, 0x1f +/* C32858 80241378 00832021 */ addu $a0, $a0, $v1 +/* C3285C 8024137C 00042043 */ sra $a0, $a0, 1 +/* C32860 80241380 0C00A67F */ jal rand_int +/* C32864 80241384 24840001 */ addiu $a0, $a0, 1 +/* C32868 80241388 8E030020 */ lw $v1, 0x20($s0) +/* C3286C 8024138C C64C0038 */ lwc1 $f12, 0x38($s2) +/* C32870 80241390 000327C2 */ srl $a0, $v1, 0x1f +/* C32874 80241394 00641821 */ addu $v1, $v1, $a0 +/* C32878 80241398 00031843 */ sra $v1, $v1, 1 +/* C3287C 8024139C 00621821 */ addu $v1, $v1, $v0 +/* C32880 802413A0 A643008E */ sh $v1, 0x8e($s2) +/* C32884 802413A4 8E2200CC */ lw $v0, 0xcc($s1) +/* C32888 802413A8 C64E0040 */ lwc1 $f14, 0x40($s2) +/* C3288C 802413AC 8C42000C */ lw $v0, 0xc($v0) +/* C32890 802413B0 AE420028 */ sw $v0, 0x28($s2) +/* C32894 802413B4 C6000018 */ lwc1 $f0, 0x18($s0) +/* C32898 802413B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C3289C 802413BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C328A0 802413C0 E6400018 */ swc1 $f0, 0x18($s2) +/* C328A4 802413C4 8C460028 */ lw $a2, 0x28($v0) +/* C328A8 802413C8 0C00A720 */ jal atan2 +/* C328AC 802413CC 8C470030 */ lw $a3, 0x30($v0) +/* C328B0 802413D0 46000506 */ mov.s $f20, $f0 +/* C328B4 802413D4 C64C000C */ lwc1 $f12, 0xc($s2) +/* C328B8 802413D8 0C00A70A */ jal get_clamped_angle_diff +/* C328BC 802413DC 4600A386 */ mov.s $f14, $f20 +/* C328C0 802413E0 46000086 */ mov.s $f2, $f0 +/* C328C4 802413E4 8E02001C */ lw $v0, 0x1c($s0) +/* C328C8 802413E8 46001005 */ abs.s $f0, $f2 +/* C328CC 802413EC 44822000 */ mtc1 $v0, $f4 +/* C328D0 802413F0 00000000 */ nop +/* C328D4 802413F4 46802120 */ cvt.s.w $f4, $f4 +/* C328D8 802413F8 4600203C */ c.lt.s $f4, $f0 +/* C328DC 802413FC 00000000 */ nop +/* C328E0 80241400 4500000D */ bc1f .L80241438 +/* C328E4 80241404 00000000 */ nop +/* C328E8 80241408 44800000 */ mtc1 $zero, $f0 +/* C328EC 8024140C C654000C */ lwc1 $f20, 0xc($s2) +/* C328F0 80241410 4600103C */ c.lt.s $f2, $f0 +/* C328F4 80241414 00000000 */ nop +/* C328F8 80241418 45000006 */ bc1f .L80241434 +/* C328FC 8024141C 00021023 */ negu $v0, $v0 +/* C32900 80241420 44820000 */ mtc1 $v0, $f0 +/* C32904 80241424 00000000 */ nop +/* C32908 80241428 46800020 */ cvt.s.w $f0, $f0 +/* C3290C 8024142C 0809050E */ j .L80241438 +/* C32910 80241430 4600A500 */ add.s $f20, $f20, $f0 +.L80241434: +/* C32914 80241434 4604A500 */ add.s $f20, $f20, $f4 +.L80241438: +/* C32918 80241438 0C00A6C9 */ jal clamp_angle +/* C3291C 8024143C 4600A306 */ mov.s $f12, $f20 +/* C32920 80241440 2402000D */ addiu $v0, $zero, 0xd +/* C32924 80241444 E640000C */ swc1 $f0, 0xc($s2) +/* C32928 80241448 AE620070 */ sw $v0, 0x70($s3) +/* C3292C 8024144C 8FBF0020 */ lw $ra, 0x20($sp) +/* C32930 80241450 8FB3001C */ lw $s3, 0x1c($sp) +/* C32934 80241454 8FB20018 */ lw $s2, 0x18($sp) +/* C32938 80241458 8FB10014 */ lw $s1, 0x14($sp) +/* C3293C 8024145C 8FB00010 */ lw $s0, 0x10($sp) +/* C32940 80241460 D7B40028 */ ldc1 $f20, 0x28($sp) +/* C32944 80241464 03E00008 */ jr $ra +/* C32948 80241468 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C.s deleted file mode 100644 index f087d168f3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024158C -/* C32A6C 8024158C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C32A70 80241590 AFB10014 */ sw $s1, 0x14($sp) -/* C32A74 80241594 0080882D */ daddu $s1, $a0, $zero -/* C32A78 80241598 AFBF0018 */ sw $ra, 0x18($sp) -/* C32A7C 8024159C AFB00010 */ sw $s0, 0x10($sp) -/* C32A80 802415A0 8E300148 */ lw $s0, 0x148($s1) -/* C32A84 802415A4 0C00EABB */ jal get_npc_unsafe -/* C32A88 802415A8 86040008 */ lh $a0, 8($s0) -/* C32A8C 802415AC 9443008E */ lhu $v1, 0x8e($v0) -/* C32A90 802415B0 2463FFFF */ addiu $v1, $v1, -1 -/* C32A94 802415B4 A443008E */ sh $v1, 0x8e($v0) -/* C32A98 802415B8 00031C00 */ sll $v1, $v1, 0x10 -/* C32A9C 802415BC 14600008 */ bnez $v1, .L802415E0 -/* C32AA0 802415C0 00000000 */ nop -/* C32AA4 802415C4 8E0200B0 */ lw $v0, 0xb0($s0) -/* C32AA8 802415C8 30420080 */ andi $v0, $v0, 0x80 -/* C32AAC 802415CC 10400003 */ beqz $v0, .L802415DC -/* C32AB0 802415D0 2402000F */ addiu $v0, $zero, 0xf -/* C32AB4 802415D4 08090578 */ j .L802415E0 -/* C32AB8 802415D8 AE220070 */ sw $v0, 0x70($s1) -.L802415DC: -/* C32ABC 802415DC AE200070 */ sw $zero, 0x70($s1) -.L802415E0: -/* C32AC0 802415E0 8FBF0018 */ lw $ra, 0x18($sp) -/* C32AC4 802415E4 8FB10014 */ lw $s1, 0x14($sp) -/* C32AC8 802415E8 8FB00010 */ lw $s0, 0x10($sp) -/* C32ACC 802415EC 03E00008 */ jr $ra -/* C32AD0 802415F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s new file mode 100644 index 0000000000..81bd112502 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_8024158C_C32A6C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024158C_C32A6C +/* C32A6C 8024158C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C32A70 80241590 AFB10014 */ sw $s1, 0x14($sp) +/* C32A74 80241594 0080882D */ daddu $s1, $a0, $zero +/* C32A78 80241598 AFBF0018 */ sw $ra, 0x18($sp) +/* C32A7C 8024159C AFB00010 */ sw $s0, 0x10($sp) +/* C32A80 802415A0 8E300148 */ lw $s0, 0x148($s1) +/* C32A84 802415A4 0C00EABB */ jal get_npc_unsafe +/* C32A88 802415A8 86040008 */ lh $a0, 8($s0) +/* C32A8C 802415AC 9443008E */ lhu $v1, 0x8e($v0) +/* C32A90 802415B0 2463FFFF */ addiu $v1, $v1, -1 +/* C32A94 802415B4 A443008E */ sh $v1, 0x8e($v0) +/* C32A98 802415B8 00031C00 */ sll $v1, $v1, 0x10 +/* C32A9C 802415BC 14600008 */ bnez $v1, .L802415E0 +/* C32AA0 802415C0 00000000 */ nop +/* C32AA4 802415C4 8E0200B0 */ lw $v0, 0xb0($s0) +/* C32AA8 802415C8 30420080 */ andi $v0, $v0, 0x80 +/* C32AAC 802415CC 10400003 */ beqz $v0, .L802415DC +/* C32AB0 802415D0 2402000F */ addiu $v0, $zero, 0xf +/* C32AB4 802415D4 08090578 */ j .L802415E0 +/* C32AB8 802415D8 AE220070 */ sw $v0, 0x70($s1) +.L802415DC: +/* C32ABC 802415DC AE200070 */ sw $zero, 0x70($s1) +.L802415E0: +/* C32AC0 802415E0 8FBF0018 */ lw $ra, 0x18($sp) +/* C32AC4 802415E4 8FB10014 */ lw $s1, 0x14($sp) +/* C32AC8 802415E8 8FB00010 */ lw $s0, 0x10($sp) +/* C32ACC 802415EC 03E00008 */ jr $ra +/* C32AD0 802415F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4.s deleted file mode 100644 index 482c21d9b1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416B4 -/* C32B94 802416B4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C32B98 802416B8 AFB40058 */ sw $s4, 0x58($sp) -/* C32B9C 802416BC 0080A02D */ daddu $s4, $a0, $zero -/* C32BA0 802416C0 AFBF0060 */ sw $ra, 0x60($sp) -/* C32BA4 802416C4 AFB5005C */ sw $s5, 0x5c($sp) -/* C32BA8 802416C8 AFB30054 */ sw $s3, 0x54($sp) -/* C32BAC 802416CC AFB20050 */ sw $s2, 0x50($sp) -/* C32BB0 802416D0 AFB1004C */ sw $s1, 0x4c($sp) -/* C32BB4 802416D4 AFB00048 */ sw $s0, 0x48($sp) -/* C32BB8 802416D8 8E910148 */ lw $s1, 0x148($s4) -/* C32BBC 802416DC 86240008 */ lh $a0, 8($s1) -/* C32BC0 802416E0 0C00EABB */ jal get_npc_unsafe -/* C32BC4 802416E4 00A0802D */ daddu $s0, $a1, $zero -/* C32BC8 802416E8 8E83000C */ lw $v1, 0xc($s4) -/* C32BCC 802416EC 0280202D */ daddu $a0, $s4, $zero -/* C32BD0 802416F0 8C650000 */ lw $a1, ($v1) -/* C32BD4 802416F4 0C0B1EAF */ jal get_variable -/* C32BD8 802416F8 0040902D */ daddu $s2, $v0, $zero -/* C32BDC 802416FC AFA00018 */ sw $zero, 0x18($sp) -/* C32BE0 80241700 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32BE4 80241704 8C630094 */ lw $v1, 0x94($v1) -/* C32BE8 80241708 AFA3001C */ sw $v1, 0x1c($sp) -/* C32BEC 8024170C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32BF0 80241710 8C630080 */ lw $v1, 0x80($v1) -/* C32BF4 80241714 AFA30020 */ sw $v1, 0x20($sp) -/* C32BF8 80241718 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32BFC 8024171C 8C630088 */ lw $v1, 0x88($v1) -/* C32C00 80241720 AFA30024 */ sw $v1, 0x24($sp) -/* C32C04 80241724 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32C08 80241728 8C63008C */ lw $v1, 0x8c($v1) -/* C32C0C 8024172C 27B50018 */ addiu $s5, $sp, 0x18 -/* C32C10 80241730 AFA30028 */ sw $v1, 0x28($sp) -/* C32C14 80241734 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32C18 80241738 3C014282 */ lui $at, 0x4282 -/* C32C1C 8024173C 44810000 */ mtc1 $at, $f0 -/* C32C20 80241740 8C630090 */ lw $v1, 0x90($v1) -/* C32C24 80241744 0040982D */ daddu $s3, $v0, $zero -/* C32C28 80241748 E7A00030 */ swc1 $f0, 0x30($sp) -/* C32C2C 8024174C A7A00034 */ sh $zero, 0x34($sp) -/* C32C30 80241750 16000005 */ bnez $s0, .L80241768 -/* C32C34 80241754 AFA3002C */ sw $v1, 0x2c($sp) -/* C32C38 80241758 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32C3C 8024175C 30420004 */ andi $v0, $v0, 4 -/* C32C40 80241760 10400044 */ beqz $v0, .L80241874 -/* C32C44 80241764 00000000 */ nop -.L80241768: -/* C32C48 80241768 2404F7FF */ addiu $a0, $zero, -0x801 -/* C32C4C 8024176C AE800070 */ sw $zero, 0x70($s4) -/* C32C50 80241770 A640008E */ sh $zero, 0x8e($s2) -/* C32C54 80241774 8E2200CC */ lw $v0, 0xcc($s1) -/* C32C58 80241778 8E430000 */ lw $v1, ($s2) -/* C32C5C 8024177C 8C420000 */ lw $v0, ($v0) -/* C32C60 80241780 00641824 */ and $v1, $v1, $a0 -/* C32C64 80241784 AE430000 */ sw $v1, ($s2) -/* C32C68 80241788 AE420028 */ sw $v0, 0x28($s2) -/* C32C6C 8024178C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C32C70 80241790 8C420098 */ lw $v0, 0x98($v0) -/* C32C74 80241794 54400005 */ bnel $v0, $zero, .L802417AC -/* C32C78 80241798 2402FDFF */ addiu $v0, $zero, -0x201 -/* C32C7C 8024179C 34620200 */ ori $v0, $v1, 0x200 -/* C32C80 802417A0 2403FFF7 */ addiu $v1, $zero, -9 -/* C32C84 802417A4 080905ED */ j .L802417B4 -/* C32C88 802417A8 00431024 */ and $v0, $v0, $v1 -.L802417AC: -/* C32C8C 802417AC 00621024 */ and $v0, $v1, $v0 -/* C32C90 802417B0 34420008 */ ori $v0, $v0, 8 -.L802417B4: -/* C32C94 802417B4 AE420000 */ sw $v0, ($s2) -/* C32C98 802417B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32C9C 802417BC 30420004 */ andi $v0, $v0, 4 -/* C32CA0 802417C0 10400008 */ beqz $v0, .L802417E4 -/* C32CA4 802417C4 24020063 */ addiu $v0, $zero, 0x63 -/* C32CA8 802417C8 AE820070 */ sw $v0, 0x70($s4) -/* C32CAC 802417CC AE800074 */ sw $zero, 0x74($s4) -/* C32CB0 802417D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32CB4 802417D4 2403FFFB */ addiu $v1, $zero, -5 -/* C32CB8 802417D8 00431024 */ and $v0, $v0, $v1 -/* C32CBC 802417DC 08090604 */ j .L80241810 -/* C32CC0 802417E0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802417E4: -/* C32CC4 802417E4 8E220000 */ lw $v0, ($s1) -/* C32CC8 802417E8 3C034000 */ lui $v1, 0x4000 -/* C32CCC 802417EC 00431024 */ and $v0, $v0, $v1 -/* C32CD0 802417F0 10400007 */ beqz $v0, .L80241810 -/* C32CD4 802417F4 3C03BFFF */ lui $v1, 0xbfff -/* C32CD8 802417F8 2402000C */ addiu $v0, $zero, 0xc -/* C32CDC 802417FC AE820070 */ sw $v0, 0x70($s4) -/* C32CE0 80241800 8E220000 */ lw $v0, ($s1) -/* C32CE4 80241804 3463FFFF */ ori $v1, $v1, 0xffff -/* C32CE8 80241808 00431024 */ and $v0, $v0, $v1 -/* C32CEC 8024180C AE220000 */ sw $v0, ($s1) -.L80241810: -/* C32CF0 80241810 27A50038 */ addiu $a1, $sp, 0x38 -/* C32CF4 80241814 27A6003C */ addiu $a2, $sp, 0x3c -/* C32CF8 80241818 C6400038 */ lwc1 $f0, 0x38($s2) -/* C32CFC 8024181C 864200A8 */ lh $v0, 0xa8($s2) -/* C32D00 80241820 3C0142C8 */ lui $at, 0x42c8 -/* C32D04 80241824 44812000 */ mtc1 $at, $f4 -/* C32D08 80241828 44823000 */ mtc1 $v0, $f6 -/* C32D0C 8024182C 00000000 */ nop -/* C32D10 80241830 468031A0 */ cvt.s.w $f6, $f6 -/* C32D14 80241834 27A20044 */ addiu $v0, $sp, 0x44 -/* C32D18 80241838 E7A00038 */ swc1 $f0, 0x38($sp) -/* C32D1C 8024183C C640003C */ lwc1 $f0, 0x3c($s2) -/* C32D20 80241840 C6420040 */ lwc1 $f2, 0x40($s2) -/* C32D24 80241844 46060000 */ add.s $f0, $f0, $f6 -/* C32D28 80241848 E7A40044 */ swc1 $f4, 0x44($sp) -/* C32D2C 8024184C E7A20040 */ swc1 $f2, 0x40($sp) -/* C32D30 80241850 E7A0003C */ swc1 $f0, 0x3c($sp) -/* C32D34 80241854 AFA20010 */ sw $v0, 0x10($sp) -/* C32D38 80241858 8E440080 */ lw $a0, 0x80($s2) -/* C32D3C 8024185C 0C0372DF */ jal func_800DCB7C -/* C32D40 80241860 27A70040 */ addiu $a3, $sp, 0x40 -/* C32D44 80241864 10400003 */ beqz $v0, .L80241874 -/* C32D48 80241868 00000000 */ nop -/* C32D4C 8024186C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C32D50 80241870 E640003C */ swc1 $f0, 0x3c($s2) -.L80241874: -/* C32D54 80241874 8E830070 */ lw $v1, 0x70($s4) -/* C32D58 80241878 2C620064 */ sltiu $v0, $v1, 0x64 -/* C32D5C 8024187C 10400042 */ beqz $v0, .L80241988 -/* C32D60 80241880 00031080 */ sll $v0, $v1, 2 -/* C32D64 80241884 3C018024 */ lui $at, 0x8024 -/* C32D68 80241888 00220821 */ addu $at, $at, $v0 -/* C32D6C 8024188C 8C224B98 */ lw $v0, 0x4b98($at) -/* C32D70 80241890 00400008 */ jr $v0 -/* C32D74 80241894 00000000 */ nop -/* C32D78 80241898 0280202D */ daddu $a0, $s4, $zero -/* C32D7C 8024189C 0260282D */ daddu $a1, $s3, $zero -/* C32D80 802418A0 0C0902C8 */ jal func_80240B20 -/* C32D84 802418A4 02A0302D */ daddu $a2, $s5, $zero -/* C32D88 802418A8 0280202D */ daddu $a0, $s4, $zero -/* C32D8C 802418AC 0260282D */ daddu $a1, $s3, $zero -/* C32D90 802418B0 0C09031E */ jal func_80240C78 -/* C32D94 802418B4 02A0302D */ daddu $a2, $s5, $zero -/* C32D98 802418B8 08090662 */ j .L80241988 -/* C32D9C 802418BC 00000000 */ nop -/* C32DA0 802418C0 0280202D */ daddu $a0, $s4, $zero -/* C32DA4 802418C4 0260282D */ daddu $a1, $s3, $zero -/* C32DA8 802418C8 0C0903C8 */ jal func_80240F20 -/* C32DAC 802418CC 02A0302D */ daddu $a2, $s5, $zero -/* C32DB0 802418D0 0280202D */ daddu $a0, $s4, $zero -/* C32DB4 802418D4 0260282D */ daddu $a1, $s3, $zero -/* C32DB8 802418D8 0C0903F8 */ jal func_80240FE0 -/* C32DBC 802418DC 02A0302D */ daddu $a2, $s5, $zero -/* C32DC0 802418E0 08090662 */ j .L80241988 -/* C32DC4 802418E4 00000000 */ nop -/* C32DC8 802418E8 0280202D */ daddu $a0, $s4, $zero -/* C32DCC 802418EC 0260282D */ daddu $a1, $s3, $zero -/* C32DD0 802418F0 0C090467 */ jal func_8024119C -/* C32DD4 802418F4 02A0302D */ daddu $a2, $s5, $zero -/* C32DD8 802418F8 08090662 */ j .L80241988 -/* C32DDC 802418FC 00000000 */ nop -/* C32DE0 80241900 0280202D */ daddu $a0, $s4, $zero -/* C32DE4 80241904 0260282D */ daddu $a1, $s3, $zero -/* C32DE8 80241908 0C090494 */ jal func_80241250 -/* C32DEC 8024190C 02A0302D */ daddu $a2, $s5, $zero -/* C32DF0 80241910 0280202D */ daddu $a0, $s4, $zero -/* C32DF4 80241914 0260282D */ daddu $a1, $s3, $zero -/* C32DF8 80241918 0C0904B1 */ jal func_802412C4 -/* C32DFC 8024191C 02A0302D */ daddu $a2, $s5, $zero -/* C32E00 80241920 08090662 */ j .L80241988 -/* C32E04 80241924 00000000 */ nop -/* C32E08 80241928 0280202D */ daddu $a0, $s4, $zero -/* C32E0C 8024192C 0260282D */ daddu $a1, $s3, $zero -/* C32E10 80241930 0C0904CF */ jal func_8024133C -/* C32E14 80241934 02A0302D */ daddu $a2, $s5, $zero -/* C32E18 80241938 0280202D */ daddu $a0, $s4, $zero -/* C32E1C 8024193C 0260282D */ daddu $a1, $s3, $zero -/* C32E20 80241940 0C09051B */ jal func_8024146C -/* C32E24 80241944 02A0302D */ daddu $a2, $s5, $zero -/* C32E28 80241948 08090662 */ j .L80241988 -/* C32E2C 8024194C 00000000 */ nop -/* C32E30 80241950 0280202D */ daddu $a0, $s4, $zero -/* C32E34 80241954 0260282D */ daddu $a1, $s3, $zero -/* C32E38 80241958 0C090563 */ jal func_8024158C -/* C32E3C 8024195C 02A0302D */ daddu $a2, $s5, $zero -/* C32E40 80241960 08090662 */ j .L80241988 -/* C32E44 80241964 00000000 */ nop -/* C32E48 80241968 0280202D */ daddu $a0, $s4, $zero -/* C32E4C 8024196C 0260282D */ daddu $a1, $s3, $zero -/* C32E50 80241970 0C09057D */ jal func_802415F4 -/* C32E54 80241974 02A0302D */ daddu $a2, $s5, $zero -/* C32E58 80241978 08090662 */ j .L80241988 -/* C32E5C 8024197C 00000000 */ nop -/* C32E60 80241980 0C0129CF */ jal func_8004A73C -/* C32E64 80241984 0280202D */ daddu $a0, $s4, $zero -.L80241988: -/* C32E68 80241988 8FBF0060 */ lw $ra, 0x60($sp) -/* C32E6C 8024198C 8FB5005C */ lw $s5, 0x5c($sp) -/* C32E70 80241990 8FB40058 */ lw $s4, 0x58($sp) -/* C32E74 80241994 8FB30054 */ lw $s3, 0x54($sp) -/* C32E78 80241998 8FB20050 */ lw $s2, 0x50($sp) -/* C32E7C 8024199C 8FB1004C */ lw $s1, 0x4c($sp) -/* C32E80 802419A0 8FB00048 */ lw $s0, 0x48($sp) -/* C32E84 802419A4 0000102D */ daddu $v0, $zero, $zero -/* C32E88 802419A8 03E00008 */ jr $ra -/* C32E8C 802419AC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s new file mode 100644 index 0000000000..64c13b6966 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802416B4_C32B94.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416B4_C32B94 +/* C32B94 802416B4 27BDFF98 */ addiu $sp, $sp, -0x68 +/* C32B98 802416B8 AFB40058 */ sw $s4, 0x58($sp) +/* C32B9C 802416BC 0080A02D */ daddu $s4, $a0, $zero +/* C32BA0 802416C0 AFBF0060 */ sw $ra, 0x60($sp) +/* C32BA4 802416C4 AFB5005C */ sw $s5, 0x5c($sp) +/* C32BA8 802416C8 AFB30054 */ sw $s3, 0x54($sp) +/* C32BAC 802416CC AFB20050 */ sw $s2, 0x50($sp) +/* C32BB0 802416D0 AFB1004C */ sw $s1, 0x4c($sp) +/* C32BB4 802416D4 AFB00048 */ sw $s0, 0x48($sp) +/* C32BB8 802416D8 8E910148 */ lw $s1, 0x148($s4) +/* C32BBC 802416DC 86240008 */ lh $a0, 8($s1) +/* C32BC0 802416E0 0C00EABB */ jal get_npc_unsafe +/* C32BC4 802416E4 00A0802D */ daddu $s0, $a1, $zero +/* C32BC8 802416E8 8E83000C */ lw $v1, 0xc($s4) +/* C32BCC 802416EC 0280202D */ daddu $a0, $s4, $zero +/* C32BD0 802416F0 8C650000 */ lw $a1, ($v1) +/* C32BD4 802416F4 0C0B1EAF */ jal get_variable +/* C32BD8 802416F8 0040902D */ daddu $s2, $v0, $zero +/* C32BDC 802416FC AFA00018 */ sw $zero, 0x18($sp) +/* C32BE0 80241700 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32BE4 80241704 8C630094 */ lw $v1, 0x94($v1) +/* C32BE8 80241708 AFA3001C */ sw $v1, 0x1c($sp) +/* C32BEC 8024170C 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32BF0 80241710 8C630080 */ lw $v1, 0x80($v1) +/* C32BF4 80241714 AFA30020 */ sw $v1, 0x20($sp) +/* C32BF8 80241718 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32BFC 8024171C 8C630088 */ lw $v1, 0x88($v1) +/* C32C00 80241720 AFA30024 */ sw $v1, 0x24($sp) +/* C32C04 80241724 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32C08 80241728 8C63008C */ lw $v1, 0x8c($v1) +/* C32C0C 8024172C 27B50018 */ addiu $s5, $sp, 0x18 +/* C32C10 80241730 AFA30028 */ sw $v1, 0x28($sp) +/* C32C14 80241734 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32C18 80241738 3C014282 */ lui $at, 0x4282 +/* C32C1C 8024173C 44810000 */ mtc1 $at, $f0 +/* C32C20 80241740 8C630090 */ lw $v1, 0x90($v1) +/* C32C24 80241744 0040982D */ daddu $s3, $v0, $zero +/* C32C28 80241748 E7A00030 */ swc1 $f0, 0x30($sp) +/* C32C2C 8024174C A7A00034 */ sh $zero, 0x34($sp) +/* C32C30 80241750 16000005 */ bnez $s0, .L80241768 +/* C32C34 80241754 AFA3002C */ sw $v1, 0x2c($sp) +/* C32C38 80241758 8E2200B0 */ lw $v0, 0xb0($s1) +/* C32C3C 8024175C 30420004 */ andi $v0, $v0, 4 +/* C32C40 80241760 10400044 */ beqz $v0, .L80241874 +/* C32C44 80241764 00000000 */ nop +.L80241768: +/* C32C48 80241768 2404F7FF */ addiu $a0, $zero, -0x801 +/* C32C4C 8024176C AE800070 */ sw $zero, 0x70($s4) +/* C32C50 80241770 A640008E */ sh $zero, 0x8e($s2) +/* C32C54 80241774 8E2200CC */ lw $v0, 0xcc($s1) +/* C32C58 80241778 8E430000 */ lw $v1, ($s2) +/* C32C5C 8024177C 8C420000 */ lw $v0, ($v0) +/* C32C60 80241780 00641824 */ and $v1, $v1, $a0 +/* C32C64 80241784 AE430000 */ sw $v1, ($s2) +/* C32C68 80241788 AE420028 */ sw $v0, 0x28($s2) +/* C32C6C 8024178C 8E2200D0 */ lw $v0, 0xd0($s1) +/* C32C70 80241790 8C420098 */ lw $v0, 0x98($v0) +/* C32C74 80241794 54400005 */ bnel $v0, $zero, .L802417AC +/* C32C78 80241798 2402FDFF */ addiu $v0, $zero, -0x201 +/* C32C7C 8024179C 34620200 */ ori $v0, $v1, 0x200 +/* C32C80 802417A0 2403FFF7 */ addiu $v1, $zero, -9 +/* C32C84 802417A4 080905ED */ j .L802417B4 +/* C32C88 802417A8 00431024 */ and $v0, $v0, $v1 +.L802417AC: +/* C32C8C 802417AC 00621024 */ and $v0, $v1, $v0 +/* C32C90 802417B0 34420008 */ ori $v0, $v0, 8 +.L802417B4: +/* C32C94 802417B4 AE420000 */ sw $v0, ($s2) +/* C32C98 802417B8 8E2200B0 */ lw $v0, 0xb0($s1) +/* C32C9C 802417BC 30420004 */ andi $v0, $v0, 4 +/* C32CA0 802417C0 10400008 */ beqz $v0, .L802417E4 +/* C32CA4 802417C4 24020063 */ addiu $v0, $zero, 0x63 +/* C32CA8 802417C8 AE820070 */ sw $v0, 0x70($s4) +/* C32CAC 802417CC AE800074 */ sw $zero, 0x74($s4) +/* C32CB0 802417D0 8E2200B0 */ lw $v0, 0xb0($s1) +/* C32CB4 802417D4 2403FFFB */ addiu $v1, $zero, -5 +/* C32CB8 802417D8 00431024 */ and $v0, $v0, $v1 +/* C32CBC 802417DC 08090604 */ j .L80241810 +/* C32CC0 802417E0 AE2200B0 */ sw $v0, 0xb0($s1) +.L802417E4: +/* C32CC4 802417E4 8E220000 */ lw $v0, ($s1) +/* C32CC8 802417E8 3C034000 */ lui $v1, 0x4000 +/* C32CCC 802417EC 00431024 */ and $v0, $v0, $v1 +/* C32CD0 802417F0 10400007 */ beqz $v0, .L80241810 +/* C32CD4 802417F4 3C03BFFF */ lui $v1, 0xbfff +/* C32CD8 802417F8 2402000C */ addiu $v0, $zero, 0xc +/* C32CDC 802417FC AE820070 */ sw $v0, 0x70($s4) +/* C32CE0 80241800 8E220000 */ lw $v0, ($s1) +/* C32CE4 80241804 3463FFFF */ ori $v1, $v1, 0xffff +/* C32CE8 80241808 00431024 */ and $v0, $v0, $v1 +/* C32CEC 8024180C AE220000 */ sw $v0, ($s1) +.L80241810: +/* C32CF0 80241810 27A50038 */ addiu $a1, $sp, 0x38 +/* C32CF4 80241814 27A6003C */ addiu $a2, $sp, 0x3c +/* C32CF8 80241818 C6400038 */ lwc1 $f0, 0x38($s2) +/* C32CFC 8024181C 864200A8 */ lh $v0, 0xa8($s2) +/* C32D00 80241820 3C0142C8 */ lui $at, 0x42c8 +/* C32D04 80241824 44812000 */ mtc1 $at, $f4 +/* C32D08 80241828 44823000 */ mtc1 $v0, $f6 +/* C32D0C 8024182C 00000000 */ nop +/* C32D10 80241830 468031A0 */ cvt.s.w $f6, $f6 +/* C32D14 80241834 27A20044 */ addiu $v0, $sp, 0x44 +/* C32D18 80241838 E7A00038 */ swc1 $f0, 0x38($sp) +/* C32D1C 8024183C C640003C */ lwc1 $f0, 0x3c($s2) +/* C32D20 80241840 C6420040 */ lwc1 $f2, 0x40($s2) +/* C32D24 80241844 46060000 */ add.s $f0, $f0, $f6 +/* C32D28 80241848 E7A40044 */ swc1 $f4, 0x44($sp) +/* C32D2C 8024184C E7A20040 */ swc1 $f2, 0x40($sp) +/* C32D30 80241850 E7A0003C */ swc1 $f0, 0x3c($sp) +/* C32D34 80241854 AFA20010 */ sw $v0, 0x10($sp) +/* C32D38 80241858 8E440080 */ lw $a0, 0x80($s2) +/* C32D3C 8024185C 0C0372DF */ jal func_800DCB7C +/* C32D40 80241860 27A70040 */ addiu $a3, $sp, 0x40 +/* C32D44 80241864 10400003 */ beqz $v0, .L80241874 +/* C32D48 80241868 00000000 */ nop +/* C32D4C 8024186C C7A0003C */ lwc1 $f0, 0x3c($sp) +/* C32D50 80241870 E640003C */ swc1 $f0, 0x3c($s2) +.L80241874: +/* C32D54 80241874 8E830070 */ lw $v1, 0x70($s4) +/* C32D58 80241878 2C620064 */ sltiu $v0, $v1, 0x64 +/* C32D5C 8024187C 10400042 */ beqz $v0, .L80241988 +/* C32D60 80241880 00031080 */ sll $v0, $v1, 2 +/* C32D64 80241884 3C018024 */ lui $at, 0x8024 +/* C32D68 80241888 00220821 */ addu $at, $at, $v0 +/* C32D6C 8024188C 8C224B98 */ lw $v0, 0x4b98($at) +/* C32D70 80241890 00400008 */ jr $v0 +/* C32D74 80241894 00000000 */ nop +/* C32D78 80241898 0280202D */ daddu $a0, $s4, $zero +/* C32D7C 8024189C 0260282D */ daddu $a1, $s3, $zero +/* C32D80 802418A0 0C0902C8 */ jal func_80240B20_C32000 +/* C32D84 802418A4 02A0302D */ daddu $a2, $s5, $zero +/* C32D88 802418A8 0280202D */ daddu $a0, $s4, $zero +/* C32D8C 802418AC 0260282D */ daddu $a1, $s3, $zero +/* C32D90 802418B0 0C09031E */ jal func_80240C78_C32158 +/* C32D94 802418B4 02A0302D */ daddu $a2, $s5, $zero +/* C32D98 802418B8 08090662 */ j .L80241988 +/* C32D9C 802418BC 00000000 */ nop +/* C32DA0 802418C0 0280202D */ daddu $a0, $s4, $zero +/* C32DA4 802418C4 0260282D */ daddu $a1, $s3, $zero +/* C32DA8 802418C8 0C0903C8 */ jal func_80240F20_C32400 +/* C32DAC 802418CC 02A0302D */ daddu $a2, $s5, $zero +/* C32DB0 802418D0 0280202D */ daddu $a0, $s4, $zero +/* C32DB4 802418D4 0260282D */ daddu $a1, $s3, $zero +/* C32DB8 802418D8 0C0903F8 */ jal func_80240FE0_C324C0 +/* C32DBC 802418DC 02A0302D */ daddu $a2, $s5, $zero +/* C32DC0 802418E0 08090662 */ j .L80241988 +/* C32DC4 802418E4 00000000 */ nop +/* C32DC8 802418E8 0280202D */ daddu $a0, $s4, $zero +/* C32DCC 802418EC 0260282D */ daddu $a1, $s3, $zero +/* C32DD0 802418F0 0C090467 */ jal func_8024119C_C3267C +/* C32DD4 802418F4 02A0302D */ daddu $a2, $s5, $zero +/* C32DD8 802418F8 08090662 */ j .L80241988 +/* C32DDC 802418FC 00000000 */ nop +/* C32DE0 80241900 0280202D */ daddu $a0, $s4, $zero +/* C32DE4 80241904 0260282D */ daddu $a1, $s3, $zero +/* C32DE8 80241908 0C090494 */ jal func_80241250_C32730 +/* C32DEC 8024190C 02A0302D */ daddu $a2, $s5, $zero +/* C32DF0 80241910 0280202D */ daddu $a0, $s4, $zero +/* C32DF4 80241914 0260282D */ daddu $a1, $s3, $zero +/* C32DF8 80241918 0C0904B1 */ jal func_802412C4_C327A4 +/* C32DFC 8024191C 02A0302D */ daddu $a2, $s5, $zero +/* C32E00 80241920 08090662 */ j .L80241988 +/* C32E04 80241924 00000000 */ nop +/* C32E08 80241928 0280202D */ daddu $a0, $s4, $zero +/* C32E0C 8024192C 0260282D */ daddu $a1, $s3, $zero +/* C32E10 80241930 0C0904CF */ jal func_8024133C_C3281C +/* C32E14 80241934 02A0302D */ daddu $a2, $s5, $zero +/* C32E18 80241938 0280202D */ daddu $a0, $s4, $zero +/* C32E1C 8024193C 0260282D */ daddu $a1, $s3, $zero +/* C32E20 80241940 0C09051B */ jal func_8024146C_C3294C +/* C32E24 80241944 02A0302D */ daddu $a2, $s5, $zero +/* C32E28 80241948 08090662 */ j .L80241988 +/* C32E2C 8024194C 00000000 */ nop +/* C32E30 80241950 0280202D */ daddu $a0, $s4, $zero +/* C32E34 80241954 0260282D */ daddu $a1, $s3, $zero +/* C32E38 80241958 0C090563 */ jal func_8024158C_C32A6C +/* C32E3C 8024195C 02A0302D */ daddu $a2, $s5, $zero +/* C32E40 80241960 08090662 */ j .L80241988 +/* C32E44 80241964 00000000 */ nop +/* C32E48 80241968 0280202D */ daddu $a0, $s4, $zero +/* C32E4C 8024196C 0260282D */ daddu $a1, $s3, $zero +/* C32E50 80241970 0C09057D */ jal func_802415F4_C32AD4 +/* C32E54 80241974 02A0302D */ daddu $a2, $s5, $zero +/* C32E58 80241978 08090662 */ j .L80241988 +/* C32E5C 8024197C 00000000 */ nop +/* C32E60 80241980 0C0129CF */ jal func_8004A73C +/* C32E64 80241984 0280202D */ daddu $a0, $s4, $zero +.L80241988: +/* C32E68 80241988 8FBF0060 */ lw $ra, 0x60($sp) +/* C32E6C 8024198C 8FB5005C */ lw $s5, 0x5c($sp) +/* C32E70 80241990 8FB40058 */ lw $s4, 0x58($sp) +/* C32E74 80241994 8FB30054 */ lw $s3, 0x54($sp) +/* C32E78 80241998 8FB20050 */ lw $s2, 0x50($sp) +/* C32E7C 8024199C 8FB1004C */ lw $s1, 0x4c($sp) +/* C32E80 802419A0 8FB00048 */ lw $s0, 0x48($sp) +/* C32E84 802419A4 0000102D */ daddu $v0, $zero, $zero +/* C32E88 802419A8 03E00008 */ jr $ra +/* C32E8C 802419AC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0.s deleted file mode 100644 index bf698d951e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0.s +++ /dev/null @@ -1,190 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419B0 -/* C32E90 802419B0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C32E94 802419B4 AFB20038 */ sw $s2, 0x38($sp) -/* C32E98 802419B8 0080902D */ daddu $s2, $a0, $zero -/* C32E9C 802419BC AFBF0048 */ sw $ra, 0x48($sp) -/* C32EA0 802419C0 AFB50044 */ sw $s5, 0x44($sp) -/* C32EA4 802419C4 AFB40040 */ sw $s4, 0x40($sp) -/* C32EA8 802419C8 AFB3003C */ sw $s3, 0x3c($sp) -/* C32EAC 802419CC AFB10034 */ sw $s1, 0x34($sp) -/* C32EB0 802419D0 AFB00030 */ sw $s0, 0x30($sp) -/* C32EB4 802419D4 8E510148 */ lw $s1, 0x148($s2) -/* C32EB8 802419D8 86240008 */ lh $a0, 8($s1) -/* C32EBC 802419DC 0C00EABB */ jal get_npc_unsafe -/* C32EC0 802419E0 00A0802D */ daddu $s0, $a1, $zero -/* C32EC4 802419E4 8E43000C */ lw $v1, 0xc($s2) -/* C32EC8 802419E8 0240202D */ daddu $a0, $s2, $zero -/* C32ECC 802419EC 8C650000 */ lw $a1, ($v1) -/* C32ED0 802419F0 0C0B1EAF */ jal get_variable -/* C32ED4 802419F4 0040A82D */ daddu $s5, $v0, $zero -/* C32ED8 802419F8 AFA00010 */ sw $zero, 0x10($sp) -/* C32EDC 802419FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32EE0 80241A00 8C630094 */ lw $v1, 0x94($v1) -/* C32EE4 80241A04 AFA30014 */ sw $v1, 0x14($sp) -/* C32EE8 80241A08 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32EEC 80241A0C 8C630080 */ lw $v1, 0x80($v1) -/* C32EF0 80241A10 AFA30018 */ sw $v1, 0x18($sp) -/* C32EF4 80241A14 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32EF8 80241A18 8C630088 */ lw $v1, 0x88($v1) -/* C32EFC 80241A1C AFA3001C */ sw $v1, 0x1c($sp) -/* C32F00 80241A20 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32F04 80241A24 8C63008C */ lw $v1, 0x8c($v1) -/* C32F08 80241A28 27B40010 */ addiu $s4, $sp, 0x10 -/* C32F0C 80241A2C AFA30020 */ sw $v1, 0x20($sp) -/* C32F10 80241A30 8E2300D0 */ lw $v1, 0xd0($s1) -/* C32F14 80241A34 3C014282 */ lui $at, 0x4282 -/* C32F18 80241A38 44810000 */ mtc1 $at, $f0 -/* C32F1C 80241A3C 8C630090 */ lw $v1, 0x90($v1) -/* C32F20 80241A40 0040982D */ daddu $s3, $v0, $zero -/* C32F24 80241A44 E7A00028 */ swc1 $f0, 0x28($sp) -/* C32F28 80241A48 A7A0002C */ sh $zero, 0x2c($sp) -/* C32F2C 80241A4C 16000005 */ bnez $s0, .L80241A64 -/* C32F30 80241A50 AFA30024 */ sw $v1, 0x24($sp) -/* C32F34 80241A54 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32F38 80241A58 30420004 */ andi $v0, $v0, 4 -/* C32F3C 80241A5C 10400020 */ beqz $v0, .L80241AE0 -/* C32F40 80241A60 00000000 */ nop -.L80241A64: -/* C32F44 80241A64 2404F7FF */ addiu $a0, $zero, -0x801 -/* C32F48 80241A68 AE400070 */ sw $zero, 0x70($s2) -/* C32F4C 80241A6C A6A0008E */ sh $zero, 0x8e($s5) -/* C32F50 80241A70 8E2200CC */ lw $v0, 0xcc($s1) -/* C32F54 80241A74 8EA30000 */ lw $v1, ($s5) -/* C32F58 80241A78 8C420000 */ lw $v0, ($v0) -/* C32F5C 80241A7C 00641824 */ and $v1, $v1, $a0 -/* C32F60 80241A80 AEA30000 */ sw $v1, ($s5) -/* C32F64 80241A84 AEA20028 */ sw $v0, 0x28($s5) -/* C32F68 80241A88 8E2200D0 */ lw $v0, 0xd0($s1) -/* C32F6C 80241A8C 8C420098 */ lw $v0, 0x98($v0) -/* C32F70 80241A90 54400005 */ bnel $v0, $zero, .L80241AA8 -/* C32F74 80241A94 2402FDFF */ addiu $v0, $zero, -0x201 -/* C32F78 80241A98 34620200 */ ori $v0, $v1, 0x200 -/* C32F7C 80241A9C 2403FFF7 */ addiu $v1, $zero, -9 -/* C32F80 80241AA0 080906AC */ j .L80241AB0 -/* C32F84 80241AA4 00431024 */ and $v0, $v0, $v1 -.L80241AA8: -/* C32F88 80241AA8 00621024 */ and $v0, $v1, $v0 -/* C32F8C 80241AAC 34420008 */ ori $v0, $v0, 8 -.L80241AB0: -/* C32F90 80241AB0 AEA20000 */ sw $v0, ($s5) -/* C32F94 80241AB4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32F98 80241AB8 30420004 */ andi $v0, $v0, 4 -/* C32F9C 80241ABC 10400007 */ beqz $v0, .L80241ADC -/* C32FA0 80241AC0 24020063 */ addiu $v0, $zero, 0x63 -/* C32FA4 80241AC4 AE420070 */ sw $v0, 0x70($s2) -/* C32FA8 80241AC8 AE400074 */ sw $zero, 0x74($s2) -/* C32FAC 80241ACC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C32FB0 80241AD0 2403FFFB */ addiu $v1, $zero, -5 -/* C32FB4 80241AD4 00431024 */ and $v0, $v0, $v1 -/* C32FB8 80241AD8 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241ADC: -/* C32FBC 80241ADC AE20006C */ sw $zero, 0x6c($s1) -.L80241AE0: -/* C32FC0 80241AE0 8E420070 */ lw $v0, 0x70($s2) -/* C32FC4 80241AE4 2842001E */ slti $v0, $v0, 0x1e -/* C32FC8 80241AE8 10400009 */ beqz $v0, .L80241B10 -/* C32FCC 80241AEC 00000000 */ nop -/* C32FD0 80241AF0 8E22006C */ lw $v0, 0x6c($s1) -/* C32FD4 80241AF4 14400006 */ bnez $v0, .L80241B10 -/* C32FD8 80241AF8 00000000 */ nop -/* C32FDC 80241AFC 0C090116 */ jal func_80240458 -/* C32FE0 80241B00 0240202D */ daddu $a0, $s2, $zero -/* C32FE4 80241B04 10400002 */ beqz $v0, .L80241B10 -/* C32FE8 80241B08 2402001E */ addiu $v0, $zero, 0x1e -/* C32FEC 80241B0C AE420070 */ sw $v0, 0x70($s2) -.L80241B10: -/* C32FF0 80241B10 8E430070 */ lw $v1, 0x70($s2) -/* C32FF4 80241B14 2C620064 */ sltiu $v0, $v1, 0x64 -/* C32FF8 80241B18 1040004E */ beqz $v0, .L80241C54 -/* C32FFC 80241B1C 00031080 */ sll $v0, $v1, 2 -/* C33000 80241B20 3C018024 */ lui $at, 0x8024 -/* C33004 80241B24 00220821 */ addu $at, $at, $v0 -/* C33008 80241B28 8C224D28 */ lw $v0, 0x4d28($at) -/* C3300C 80241B2C 00400008 */ jr $v0 -/* C33010 80241B30 00000000 */ nop -/* C33014 80241B34 0240202D */ daddu $a0, $s2, $zero -/* C33018 80241B38 0260282D */ daddu $a1, $s3, $zero -/* C3301C 80241B3C 0C0902C8 */ jal func_80240B20 -/* C33020 80241B40 0280302D */ daddu $a2, $s4, $zero -/* C33024 80241B44 0240202D */ daddu $a0, $s2, $zero -/* C33028 80241B48 0260282D */ daddu $a1, $s3, $zero -/* C3302C 80241B4C 0C09031E */ jal func_80240C78 -/* C33030 80241B50 0280302D */ daddu $a2, $s4, $zero -/* C33034 80241B54 08090715 */ j .L80241C54 -/* C33038 80241B58 00000000 */ nop -/* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero -/* C33040 80241B60 0260282D */ daddu $a1, $s3, $zero -/* C33044 80241B64 0C0903C8 */ jal func_80240F20 -/* C33048 80241B68 0280302D */ daddu $a2, $s4, $zero -/* C3304C 80241B6C 0240202D */ daddu $a0, $s2, $zero -/* C33050 80241B70 0260282D */ daddu $a1, $s3, $zero -/* C33054 80241B74 0C0903F8 */ jal func_80240FE0 -/* C33058 80241B78 0280302D */ daddu $a2, $s4, $zero -/* C3305C 80241B7C 08090715 */ j .L80241C54 -/* C33060 80241B80 00000000 */ nop -/* C33064 80241B84 0240202D */ daddu $a0, $s2, $zero -/* C33068 80241B88 0260282D */ daddu $a1, $s3, $zero -/* C3306C 80241B8C 0C090467 */ jal func_8024119C -/* C33070 80241B90 0280302D */ daddu $a2, $s4, $zero -/* C33074 80241B94 08090715 */ j .L80241C54 -/* C33078 80241B98 00000000 */ nop -/* C3307C 80241B9C 0240202D */ daddu $a0, $s2, $zero -/* C33080 80241BA0 0260282D */ daddu $a1, $s3, $zero -/* C33084 80241BA4 0C090494 */ jal func_80241250 -/* C33088 80241BA8 0280302D */ daddu $a2, $s4, $zero -/* C3308C 80241BAC 0240202D */ daddu $a0, $s2, $zero -/* C33090 80241BB0 0260282D */ daddu $a1, $s3, $zero -/* C33094 80241BB4 0C0904B1 */ jal func_802412C4 -/* C33098 80241BB8 0280302D */ daddu $a2, $s4, $zero -/* C3309C 80241BBC 08090715 */ j .L80241C54 -/* C330A0 80241BC0 00000000 */ nop -/* C330A4 80241BC4 0240202D */ daddu $a0, $s2, $zero -/* C330A8 80241BC8 0260282D */ daddu $a1, $s3, $zero -/* C330AC 80241BCC 0C0904CF */ jal func_8024133C -/* C330B0 80241BD0 0280302D */ daddu $a2, $s4, $zero -/* C330B4 80241BD4 0240202D */ daddu $a0, $s2, $zero -/* C330B8 80241BD8 0260282D */ daddu $a1, $s3, $zero -/* C330BC 80241BDC 0C09051B */ jal func_8024146C -/* C330C0 80241BE0 0280302D */ daddu $a2, $s4, $zero -/* C330C4 80241BE4 08090715 */ j .L80241C54 -/* C330C8 80241BE8 00000000 */ nop -/* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero -/* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero -/* C330D4 80241BF4 0C090563 */ jal func_8024158C -/* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero -/* C330DC 80241BFC 08090715 */ j .L80241C54 -/* C330E0 80241C00 00000000 */ nop -/* C330E4 80241C04 0C090094 */ jal func_80240250 -/* C330E8 80241C08 0240202D */ daddu $a0, $s2, $zero -/* C330EC 80241C0C 0C0900AF */ jal func_802402BC -/* C330F0 80241C10 0240202D */ daddu $a0, $s2, $zero -/* C330F4 80241C14 8E430070 */ lw $v1, 0x70($s2) -/* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 -/* C330FC 80241C1C 1462000D */ bne $v1, $v0, .L80241C54 -/* C33100 80241C20 00000000 */ nop -/* C33104 80241C24 0C0900CB */ jal func_8024032C -/* C33108 80241C28 0240202D */ daddu $a0, $s2, $zero -/* C3310C 80241C2C 8E430070 */ lw $v1, 0x70($s2) -/* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 -/* C33114 80241C34 14620007 */ bne $v1, $v0, .L80241C54 -/* C33118 80241C38 00000000 */ nop -/* C3311C 80241C3C 0C090101 */ jal func_80240404 -/* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero -/* C33124 80241C44 08090715 */ j .L80241C54 -/* C33128 80241C48 00000000 */ nop -/* C3312C 80241C4C 0C0129CF */ jal func_8004A73C -/* C33130 80241C50 0240202D */ daddu $a0, $s2, $zero -.L80241C54: -/* C33134 80241C54 8FBF0048 */ lw $ra, 0x48($sp) -/* C33138 80241C58 8FB50044 */ lw $s5, 0x44($sp) -/* C3313C 80241C5C 8FB40040 */ lw $s4, 0x40($sp) -/* C33140 80241C60 8FB3003C */ lw $s3, 0x3c($sp) -/* C33144 80241C64 8FB20038 */ lw $s2, 0x38($sp) -/* C33148 80241C68 8FB10034 */ lw $s1, 0x34($sp) -/* C3314C 80241C6C 8FB00030 */ lw $s0, 0x30($sp) -/* C33150 80241C70 0000102D */ daddu $v0, $zero, $zero -/* C33154 80241C74 03E00008 */ jr $ra -/* C33158 80241C78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s new file mode 100644 index 0000000000..25d19d8de1 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802419B0_C32E90.s @@ -0,0 +1,190 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419B0_C32E90 +/* C32E90 802419B0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C32E94 802419B4 AFB20038 */ sw $s2, 0x38($sp) +/* C32E98 802419B8 0080902D */ daddu $s2, $a0, $zero +/* C32E9C 802419BC AFBF0048 */ sw $ra, 0x48($sp) +/* C32EA0 802419C0 AFB50044 */ sw $s5, 0x44($sp) +/* C32EA4 802419C4 AFB40040 */ sw $s4, 0x40($sp) +/* C32EA8 802419C8 AFB3003C */ sw $s3, 0x3c($sp) +/* C32EAC 802419CC AFB10034 */ sw $s1, 0x34($sp) +/* C32EB0 802419D0 AFB00030 */ sw $s0, 0x30($sp) +/* C32EB4 802419D4 8E510148 */ lw $s1, 0x148($s2) +/* C32EB8 802419D8 86240008 */ lh $a0, 8($s1) +/* C32EBC 802419DC 0C00EABB */ jal get_npc_unsafe +/* C32EC0 802419E0 00A0802D */ daddu $s0, $a1, $zero +/* C32EC4 802419E4 8E43000C */ lw $v1, 0xc($s2) +/* C32EC8 802419E8 0240202D */ daddu $a0, $s2, $zero +/* C32ECC 802419EC 8C650000 */ lw $a1, ($v1) +/* C32ED0 802419F0 0C0B1EAF */ jal get_variable +/* C32ED4 802419F4 0040A82D */ daddu $s5, $v0, $zero +/* C32ED8 802419F8 AFA00010 */ sw $zero, 0x10($sp) +/* C32EDC 802419FC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32EE0 80241A00 8C630094 */ lw $v1, 0x94($v1) +/* C32EE4 80241A04 AFA30014 */ sw $v1, 0x14($sp) +/* C32EE8 80241A08 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32EEC 80241A0C 8C630080 */ lw $v1, 0x80($v1) +/* C32EF0 80241A10 AFA30018 */ sw $v1, 0x18($sp) +/* C32EF4 80241A14 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32EF8 80241A18 8C630088 */ lw $v1, 0x88($v1) +/* C32EFC 80241A1C AFA3001C */ sw $v1, 0x1c($sp) +/* C32F00 80241A20 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32F04 80241A24 8C63008C */ lw $v1, 0x8c($v1) +/* C32F08 80241A28 27B40010 */ addiu $s4, $sp, 0x10 +/* C32F0C 80241A2C AFA30020 */ sw $v1, 0x20($sp) +/* C32F10 80241A30 8E2300D0 */ lw $v1, 0xd0($s1) +/* C32F14 80241A34 3C014282 */ lui $at, 0x4282 +/* C32F18 80241A38 44810000 */ mtc1 $at, $f0 +/* C32F1C 80241A3C 8C630090 */ lw $v1, 0x90($v1) +/* C32F20 80241A40 0040982D */ daddu $s3, $v0, $zero +/* C32F24 80241A44 E7A00028 */ swc1 $f0, 0x28($sp) +/* C32F28 80241A48 A7A0002C */ sh $zero, 0x2c($sp) +/* C32F2C 80241A4C 16000005 */ bnez $s0, .L80241A64 +/* C32F30 80241A50 AFA30024 */ sw $v1, 0x24($sp) +/* C32F34 80241A54 8E2200B0 */ lw $v0, 0xb0($s1) +/* C32F38 80241A58 30420004 */ andi $v0, $v0, 4 +/* C32F3C 80241A5C 10400020 */ beqz $v0, .L80241AE0 +/* C32F40 80241A60 00000000 */ nop +.L80241A64: +/* C32F44 80241A64 2404F7FF */ addiu $a0, $zero, -0x801 +/* C32F48 80241A68 AE400070 */ sw $zero, 0x70($s2) +/* C32F4C 80241A6C A6A0008E */ sh $zero, 0x8e($s5) +/* C32F50 80241A70 8E2200CC */ lw $v0, 0xcc($s1) +/* C32F54 80241A74 8EA30000 */ lw $v1, ($s5) +/* C32F58 80241A78 8C420000 */ lw $v0, ($v0) +/* C32F5C 80241A7C 00641824 */ and $v1, $v1, $a0 +/* C32F60 80241A80 AEA30000 */ sw $v1, ($s5) +/* C32F64 80241A84 AEA20028 */ sw $v0, 0x28($s5) +/* C32F68 80241A88 8E2200D0 */ lw $v0, 0xd0($s1) +/* C32F6C 80241A8C 8C420098 */ lw $v0, 0x98($v0) +/* C32F70 80241A90 54400005 */ bnel $v0, $zero, .L80241AA8 +/* C32F74 80241A94 2402FDFF */ addiu $v0, $zero, -0x201 +/* C32F78 80241A98 34620200 */ ori $v0, $v1, 0x200 +/* C32F7C 80241A9C 2403FFF7 */ addiu $v1, $zero, -9 +/* C32F80 80241AA0 080906AC */ j .L80241AB0 +/* C32F84 80241AA4 00431024 */ and $v0, $v0, $v1 +.L80241AA8: +/* C32F88 80241AA8 00621024 */ and $v0, $v1, $v0 +/* C32F8C 80241AAC 34420008 */ ori $v0, $v0, 8 +.L80241AB0: +/* C32F90 80241AB0 AEA20000 */ sw $v0, ($s5) +/* C32F94 80241AB4 8E2200B0 */ lw $v0, 0xb0($s1) +/* C32F98 80241AB8 30420004 */ andi $v0, $v0, 4 +/* C32F9C 80241ABC 10400007 */ beqz $v0, .L80241ADC +/* C32FA0 80241AC0 24020063 */ addiu $v0, $zero, 0x63 +/* C32FA4 80241AC4 AE420070 */ sw $v0, 0x70($s2) +/* C32FA8 80241AC8 AE400074 */ sw $zero, 0x74($s2) +/* C32FAC 80241ACC 8E2200B0 */ lw $v0, 0xb0($s1) +/* C32FB0 80241AD0 2403FFFB */ addiu $v1, $zero, -5 +/* C32FB4 80241AD4 00431024 */ and $v0, $v0, $v1 +/* C32FB8 80241AD8 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241ADC: +/* C32FBC 80241ADC AE20006C */ sw $zero, 0x6c($s1) +.L80241AE0: +/* C32FC0 80241AE0 8E420070 */ lw $v0, 0x70($s2) +/* C32FC4 80241AE4 2842001E */ slti $v0, $v0, 0x1e +/* C32FC8 80241AE8 10400009 */ beqz $v0, .L80241B10 +/* C32FCC 80241AEC 00000000 */ nop +/* C32FD0 80241AF0 8E22006C */ lw $v0, 0x6c($s1) +/* C32FD4 80241AF4 14400006 */ bnez $v0, .L80241B10 +/* C32FD8 80241AF8 00000000 */ nop +/* C32FDC 80241AFC 0C090116 */ jal func_80240458_C31938 +/* C32FE0 80241B00 0240202D */ daddu $a0, $s2, $zero +/* C32FE4 80241B04 10400002 */ beqz $v0, .L80241B10 +/* C32FE8 80241B08 2402001E */ addiu $v0, $zero, 0x1e +/* C32FEC 80241B0C AE420070 */ sw $v0, 0x70($s2) +.L80241B10: +/* C32FF0 80241B10 8E430070 */ lw $v1, 0x70($s2) +/* C32FF4 80241B14 2C620064 */ sltiu $v0, $v1, 0x64 +/* C32FF8 80241B18 1040004E */ beqz $v0, .L80241C54 +/* C32FFC 80241B1C 00031080 */ sll $v0, $v1, 2 +/* C33000 80241B20 3C018024 */ lui $at, 0x8024 +/* C33004 80241B24 00220821 */ addu $at, $at, $v0 +/* C33008 80241B28 8C224D28 */ lw $v0, 0x4d28($at) +/* C3300C 80241B2C 00400008 */ jr $v0 +/* C33010 80241B30 00000000 */ nop +/* C33014 80241B34 0240202D */ daddu $a0, $s2, $zero +/* C33018 80241B38 0260282D */ daddu $a1, $s3, $zero +/* C3301C 80241B3C 0C0902C8 */ jal func_80240B20_C32000 +/* C33020 80241B40 0280302D */ daddu $a2, $s4, $zero +/* C33024 80241B44 0240202D */ daddu $a0, $s2, $zero +/* C33028 80241B48 0260282D */ daddu $a1, $s3, $zero +/* C3302C 80241B4C 0C09031E */ jal func_80240C78_C32158 +/* C33030 80241B50 0280302D */ daddu $a2, $s4, $zero +/* C33034 80241B54 08090715 */ j .L80241C54 +/* C33038 80241B58 00000000 */ nop +/* C3303C 80241B5C 0240202D */ daddu $a0, $s2, $zero +/* C33040 80241B60 0260282D */ daddu $a1, $s3, $zero +/* C33044 80241B64 0C0903C8 */ jal func_80240F20_C32400 +/* C33048 80241B68 0280302D */ daddu $a2, $s4, $zero +/* C3304C 80241B6C 0240202D */ daddu $a0, $s2, $zero +/* C33050 80241B70 0260282D */ daddu $a1, $s3, $zero +/* C33054 80241B74 0C0903F8 */ jal func_80240FE0_C324C0 +/* C33058 80241B78 0280302D */ daddu $a2, $s4, $zero +/* C3305C 80241B7C 08090715 */ j .L80241C54 +/* C33060 80241B80 00000000 */ nop +/* C33064 80241B84 0240202D */ daddu $a0, $s2, $zero +/* C33068 80241B88 0260282D */ daddu $a1, $s3, $zero +/* C3306C 80241B8C 0C090467 */ jal func_8024119C_C3267C +/* C33070 80241B90 0280302D */ daddu $a2, $s4, $zero +/* C33074 80241B94 08090715 */ j .L80241C54 +/* C33078 80241B98 00000000 */ nop +/* C3307C 80241B9C 0240202D */ daddu $a0, $s2, $zero +/* C33080 80241BA0 0260282D */ daddu $a1, $s3, $zero +/* C33084 80241BA4 0C090494 */ jal func_80241250_C32730 +/* C33088 80241BA8 0280302D */ daddu $a2, $s4, $zero +/* C3308C 80241BAC 0240202D */ daddu $a0, $s2, $zero +/* C33090 80241BB0 0260282D */ daddu $a1, $s3, $zero +/* C33094 80241BB4 0C0904B1 */ jal func_802412C4_C327A4 +/* C33098 80241BB8 0280302D */ daddu $a2, $s4, $zero +/* C3309C 80241BBC 08090715 */ j .L80241C54 +/* C330A0 80241BC0 00000000 */ nop +/* C330A4 80241BC4 0240202D */ daddu $a0, $s2, $zero +/* C330A8 80241BC8 0260282D */ daddu $a1, $s3, $zero +/* C330AC 80241BCC 0C0904CF */ jal func_8024133C_C3281C +/* C330B0 80241BD0 0280302D */ daddu $a2, $s4, $zero +/* C330B4 80241BD4 0240202D */ daddu $a0, $s2, $zero +/* C330B8 80241BD8 0260282D */ daddu $a1, $s3, $zero +/* C330BC 80241BDC 0C09051B */ jal func_8024146C_C3294C +/* C330C0 80241BE0 0280302D */ daddu $a2, $s4, $zero +/* C330C4 80241BE4 08090715 */ j .L80241C54 +/* C330C8 80241BE8 00000000 */ nop +/* C330CC 80241BEC 0240202D */ daddu $a0, $s2, $zero +/* C330D0 80241BF0 0260282D */ daddu $a1, $s3, $zero +/* C330D4 80241BF4 0C090563 */ jal func_8024158C_C32A6C +/* C330D8 80241BF8 0280302D */ daddu $a2, $s4, $zero +/* C330DC 80241BFC 08090715 */ j .L80241C54 +/* C330E0 80241C00 00000000 */ nop +/* C330E4 80241C04 0C090094 */ jal func_80240250_C31730 +/* C330E8 80241C08 0240202D */ daddu $a0, $s2, $zero +/* C330EC 80241C0C 0C0900AF */ jal func_802402BC_C3179C +/* C330F0 80241C10 0240202D */ daddu $a0, $s2, $zero +/* C330F4 80241C14 8E430070 */ lw $v1, 0x70($s2) +/* C330F8 80241C18 24020020 */ addiu $v0, $zero, 0x20 +/* C330FC 80241C1C 1462000D */ bne $v1, $v0, .L80241C54 +/* C33100 80241C20 00000000 */ nop +/* C33104 80241C24 0C0900CB */ jal func_8024032C_C3180C +/* C33108 80241C28 0240202D */ daddu $a0, $s2, $zero +/* C3310C 80241C2C 8E430070 */ lw $v1, 0x70($s2) +/* C33110 80241C30 24020021 */ addiu $v0, $zero, 0x21 +/* C33114 80241C34 14620007 */ bne $v1, $v0, .L80241C54 +/* C33118 80241C38 00000000 */ nop +/* C3311C 80241C3C 0C090101 */ jal func_80240404_C318E4 +/* C33120 80241C40 0240202D */ daddu $a0, $s2, $zero +/* C33124 80241C44 08090715 */ j .L80241C54 +/* C33128 80241C48 00000000 */ nop +/* C3312C 80241C4C 0C0129CF */ jal func_8004A73C +/* C33130 80241C50 0240202D */ daddu $a0, $s2, $zero +.L80241C54: +/* C33134 80241C54 8FBF0048 */ lw $ra, 0x48($sp) +/* C33138 80241C58 8FB50044 */ lw $s5, 0x44($sp) +/* C3313C 80241C5C 8FB40040 */ lw $s4, 0x40($sp) +/* C33140 80241C60 8FB3003C */ lw $s3, 0x3c($sp) +/* C33144 80241C64 8FB20038 */ lw $s2, 0x38($sp) +/* C33148 80241C68 8FB10034 */ lw $s1, 0x34($sp) +/* C3314C 80241C6C 8FB00030 */ lw $s0, 0x30($sp) +/* C33150 80241C70 0000102D */ daddu $v0, $zero, $zero +/* C33154 80241C74 03E00008 */ jr $ra +/* C33158 80241C78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C.s deleted file mode 100644 index f69e7b3d3e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C7C -/* C3315C 80241C7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C33160 80241C80 AFB10014 */ sw $s1, 0x14($sp) -/* C33164 80241C84 0080882D */ daddu $s1, $a0, $zero -/* C33168 80241C88 AFBF0018 */ sw $ra, 0x18($sp) -/* C3316C 80241C8C AFB00010 */ sw $s0, 0x10($sp) -/* C33170 80241C90 8E300148 */ lw $s0, 0x148($s1) -/* C33174 80241C94 0C00EABB */ jal get_npc_unsafe -/* C33178 80241C98 86040008 */ lh $a0, 8($s0) -/* C3317C 80241C9C 0040202D */ daddu $a0, $v0, $zero -/* C33180 80241CA0 8482008E */ lh $v0, 0x8e($a0) -/* C33184 80241CA4 9483008E */ lhu $v1, 0x8e($a0) -/* C33188 80241CA8 18400002 */ blez $v0, .L80241CB4 -/* C3318C 80241CAC 2462FFFF */ addiu $v0, $v1, -1 -/* C33190 80241CB0 A482008E */ sh $v0, 0x8e($a0) -.L80241CB4: -/* C33194 80241CB4 8482008E */ lh $v0, 0x8e($a0) -/* C33198 80241CB8 24030001 */ addiu $v1, $zero, 1 -/* C3319C 80241CBC 14430005 */ bne $v0, $v1, .L80241CD4 -/* C331A0 80241CC0 00000000 */ nop -/* C331A4 80241CC4 8E0200CC */ lw $v0, 0xcc($s0) -/* C331A8 80241CC8 8C420030 */ lw $v0, 0x30($v0) -/* C331AC 80241CCC 0809073C */ j .L80241CF0 -/* C331B0 80241CD0 AC820028 */ sw $v0, 0x28($a0) -.L80241CD4: -/* C331B4 80241CD4 1C400006 */ bgtz $v0, .L80241CF0 -/* C331B8 80241CD8 00000000 */ nop -/* C331BC 80241CDC 8E0200CC */ lw $v0, 0xcc($s0) -/* C331C0 80241CE0 8C420028 */ lw $v0, 0x28($v0) -/* C331C4 80241CE4 A480008E */ sh $zero, 0x8e($a0) -/* C331C8 80241CE8 AC820028 */ sw $v0, 0x28($a0) -/* C331CC 80241CEC AE230070 */ sw $v1, 0x70($s1) -.L80241CF0: -/* C331D0 80241CF0 8FBF0018 */ lw $ra, 0x18($sp) -/* C331D4 80241CF4 8FB10014 */ lw $s1, 0x14($sp) -/* C331D8 80241CF8 8FB00010 */ lw $s0, 0x10($sp) -/* C331DC 80241CFC 03E00008 */ jr $ra -/* C331E0 80241D00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s new file mode 100644 index 0000000000..3d04214fc1 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241C7C_C3315C.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C7C_C3315C +/* C3315C 80241C7C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C33160 80241C80 AFB10014 */ sw $s1, 0x14($sp) +/* C33164 80241C84 0080882D */ daddu $s1, $a0, $zero +/* C33168 80241C88 AFBF0018 */ sw $ra, 0x18($sp) +/* C3316C 80241C8C AFB00010 */ sw $s0, 0x10($sp) +/* C33170 80241C90 8E300148 */ lw $s0, 0x148($s1) +/* C33174 80241C94 0C00EABB */ jal get_npc_unsafe +/* C33178 80241C98 86040008 */ lh $a0, 8($s0) +/* C3317C 80241C9C 0040202D */ daddu $a0, $v0, $zero +/* C33180 80241CA0 8482008E */ lh $v0, 0x8e($a0) +/* C33184 80241CA4 9483008E */ lhu $v1, 0x8e($a0) +/* C33188 80241CA8 18400002 */ blez $v0, .L80241CB4 +/* C3318C 80241CAC 2462FFFF */ addiu $v0, $v1, -1 +/* C33190 80241CB0 A482008E */ sh $v0, 0x8e($a0) +.L80241CB4: +/* C33194 80241CB4 8482008E */ lh $v0, 0x8e($a0) +/* C33198 80241CB8 24030001 */ addiu $v1, $zero, 1 +/* C3319C 80241CBC 14430005 */ bne $v0, $v1, .L80241CD4 +/* C331A0 80241CC0 00000000 */ nop +/* C331A4 80241CC4 8E0200CC */ lw $v0, 0xcc($s0) +/* C331A8 80241CC8 8C420030 */ lw $v0, 0x30($v0) +/* C331AC 80241CCC 0809073C */ j .L80241CF0 +/* C331B0 80241CD0 AC820028 */ sw $v0, 0x28($a0) +.L80241CD4: +/* C331B4 80241CD4 1C400006 */ bgtz $v0, .L80241CF0 +/* C331B8 80241CD8 00000000 */ nop +/* C331BC 80241CDC 8E0200CC */ lw $v0, 0xcc($s0) +/* C331C0 80241CE0 8C420028 */ lw $v0, 0x28($v0) +/* C331C4 80241CE4 A480008E */ sh $zero, 0x8e($a0) +/* C331C8 80241CE8 AC820028 */ sw $v0, 0x28($a0) +/* C331CC 80241CEC AE230070 */ sw $v1, 0x70($s1) +.L80241CF0: +/* C331D0 80241CF0 8FBF0018 */ lw $ra, 0x18($sp) +/* C331D4 80241CF4 8FB10014 */ lw $s1, 0x14($sp) +/* C331D8 80241CF8 8FB00010 */ lw $s0, 0x10($sp) +/* C331DC 80241CFC 03E00008 */ jr $ra +/* C331E0 80241D00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04.s deleted file mode 100644 index e9ab494634..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D04 -/* C331E4 80241D04 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C331E8 80241D08 AFB40048 */ sw $s4, 0x48($sp) -/* C331EC 80241D0C 0080A02D */ daddu $s4, $a0, $zero -/* C331F0 80241D10 AFBF004C */ sw $ra, 0x4c($sp) -/* C331F4 80241D14 AFB30044 */ sw $s3, 0x44($sp) -/* C331F8 80241D18 AFB20040 */ sw $s2, 0x40($sp) -/* C331FC 80241D1C AFB1003C */ sw $s1, 0x3c($sp) -/* C33200 80241D20 AFB00038 */ sw $s0, 0x38($sp) -/* C33204 80241D24 8E930148 */ lw $s3, 0x148($s4) -/* C33208 80241D28 00C0802D */ daddu $s0, $a2, $zero -/* C3320C 80241D2C 86640008 */ lh $a0, 8($s3) -/* C33210 80241D30 0C00EABB */ jal get_npc_unsafe -/* C33214 80241D34 0000902D */ daddu $s2, $zero, $zero -/* C33218 80241D38 0C039D59 */ jal get_player_data -/* C3321C 80241D3C 0040882D */ daddu $s1, $v0, $zero -/* C33220 80241D40 0200202D */ daddu $a0, $s0, $zero -/* C33224 80241D44 0260282D */ daddu $a1, $s3, $zero -/* C33228 80241D48 0000382D */ daddu $a3, $zero, $zero -/* C3322C 80241D4C 3C0642A0 */ lui $a2, 0x42a0 -/* C33230 80241D50 0040802D */ daddu $s0, $v0, $zero -/* C33234 80241D54 0C01242D */ jal func_800490B4 -/* C33238 80241D58 AFA00010 */ sw $zero, 0x10($sp) -/* C3323C 80241D5C 10400022 */ beqz $v0, .L80241DE8 -/* C33240 80241D60 00000000 */ nop -/* C33244 80241D64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C33248 80241D68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C3324C 80241D6C 804300B4 */ lb $v1, 0xb4($v0) -/* C33250 80241D70 24020002 */ addiu $v0, $zero, 2 -/* C33254 80241D74 10620013 */ beq $v1, $v0, .L80241DC4 -/* C33258 80241D78 2402001A */ addiu $v0, $zero, 0x1a -/* C3325C 80241D7C 10620011 */ beq $v1, $v0, .L80241DC4 -/* C33260 80241D80 24020003 */ addiu $v0, $zero, 3 -/* C33264 80241D84 1062000F */ beq $v1, $v0, .L80241DC4 -/* C33268 80241D88 2402000E */ addiu $v0, $zero, 0xe -/* C3326C 80241D8C 1062000D */ beq $v1, $v0, .L80241DC4 -/* C33270 80241D90 24020010 */ addiu $v0, $zero, 0x10 -/* C33274 80241D94 1062000B */ beq $v1, $v0, .L80241DC4 -/* C33278 80241D98 2402000B */ addiu $v0, $zero, 0xb -/* C3327C 80241D9C 10620009 */ beq $v1, $v0, .L80241DC4 -/* C33280 80241DA0 2402000A */ addiu $v0, $zero, 0xa -/* C33284 80241DA4 10620007 */ beq $v1, $v0, .L80241DC4 -/* C33288 80241DA8 24020012 */ addiu $v0, $zero, 0x12 -/* C3328C 80241DAC 10620005 */ beq $v1, $v0, .L80241DC4 -/* C33290 80241DB0 24020013 */ addiu $v0, $zero, 0x13 -/* C33294 80241DB4 10620003 */ beq $v1, $v0, .L80241DC4 -/* C33298 80241DB8 24020025 */ addiu $v0, $zero, 0x25 -/* C3329C 80241DBC 14620002 */ bne $v1, $v0, .L80241DC8 -/* C332A0 80241DC0 00000000 */ nop -.L80241DC4: -/* C332A4 80241DC4 24120001 */ addiu $s2, $zero, 1 -.L80241DC8: -/* C332A8 80241DC8 82030012 */ lb $v1, 0x12($s0) -/* C332AC 80241DCC 24020002 */ addiu $v0, $zero, 2 -/* C332B0 80241DD0 14620007 */ bne $v1, $v0, .L80241DF0 -/* C332B4 80241DD4 24020001 */ addiu $v0, $zero, 1 -/* C332B8 80241DD8 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C332BC 80241DDC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C332C0 80241DE0 50430002 */ beql $v0, $v1, .L80241DEC -/* C332C4 80241DE4 24120001 */ addiu $s2, $zero, 1 -.L80241DE8: -/* C332C8 80241DE8 82030012 */ lb $v1, 0x12($s0) -.L80241DEC: -/* C332CC 80241DEC 24020001 */ addiu $v0, $zero, 1 -.L80241DF0: -/* C332D0 80241DF0 14620006 */ bne $v1, $v0, .L80241E0C -/* C332D4 80241DF4 24020003 */ addiu $v0, $zero, 3 -/* C332D8 80241DF8 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C332DC 80241DFC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C332E0 80241E00 14400008 */ bnez $v0, .L80241E24 -/* C332E4 80241E04 27A40028 */ addiu $a0, $sp, 0x28 -/* C332E8 80241E08 24020003 */ addiu $v0, $zero, 3 -.L80241E0C: -/* C332EC 80241E0C 1462001B */ bne $v1, $v0, .L80241E7C -/* C332F0 80241E10 24020002 */ addiu $v0, $zero, 2 -/* C332F4 80241E14 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C332F8 80241E18 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) -/* C332FC 80241E1C 14620017 */ bne $v1, $v0, .L80241E7C -/* C33300 80241E20 27A40028 */ addiu $a0, $sp, 0x28 -.L80241E24: -/* C33304 80241E24 27A5002C */ addiu $a1, $sp, 0x2c -/* C33308 80241E28 8E27000C */ lw $a3, 0xc($s1) -/* C3330C 80241E2C C6200038 */ lwc1 $f0, 0x38($s1) -/* C33310 80241E30 C6220040 */ lwc1 $f2, 0x40($s1) -/* C33314 80241E34 0000302D */ daddu $a2, $zero, $zero -/* C33318 80241E38 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3331C 80241E3C 0C00A7E7 */ jal add_vec2D_polar -/* C33320 80241E40 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C33324 80241E44 3C028011 */ lui $v0, 0x8011 -/* C33328 80241E48 8C42C930 */ lw $v0, -0x36d0($v0) -/* C3332C 80241E4C C7AC0028 */ lwc1 $f12, 0x28($sp) -/* C33330 80241E50 C7AE002C */ lwc1 $f14, 0x2c($sp) -/* C33334 80241E54 8C460038 */ lw $a2, 0x38($v0) -/* C33338 80241E58 0C00A7B5 */ jal dist2D -/* C3333C 80241E5C 8C470040 */ lw $a3, 0x40($v0) -/* C33340 80241E60 3C0142A0 */ lui $at, 0x42a0 -/* C33344 80241E64 44811000 */ mtc1 $at, $f2 -/* C33348 80241E68 00000000 */ nop -/* C3334C 80241E6C 4602003E */ c.le.s $f0, $f2 -/* C33350 80241E70 00000000 */ nop -/* C33354 80241E74 45030001 */ bc1tl .L80241E7C -/* C33358 80241E78 24120001 */ addiu $s2, $zero, 1 -.L80241E7C: -/* C3335C 80241E7C 12400026 */ beqz $s2, .L80241F18 -/* C33360 80241E80 0220202D */ daddu $a0, $s1, $zero -/* C33364 80241E84 3C05B000 */ lui $a1, 0xb000 -/* C33368 80241E88 34A5000E */ ori $a1, $a1, 0xe -/* C3336C 80241E8C 0C012530 */ jal func_800494C0 -/* C33370 80241E90 0000302D */ daddu $a2, $zero, $zero -/* C33374 80241E94 0000202D */ daddu $a0, $zero, $zero -/* C33378 80241E98 0220282D */ daddu $a1, $s1, $zero -/* C3337C 80241E9C 0000302D */ daddu $a2, $zero, $zero -/* C33380 80241EA0 862200A8 */ lh $v0, 0xa8($s1) -/* C33384 80241EA4 8E6300CC */ lw $v1, 0xcc($s3) -/* C33388 80241EA8 3C013F80 */ lui $at, 0x3f80 -/* C3338C 80241EAC 44810000 */ mtc1 $at, $f0 -/* C33390 80241EB0 3C014000 */ lui $at, 0x4000 -/* C33394 80241EB4 44811000 */ mtc1 $at, $f2 -/* C33398 80241EB8 3C01C1A0 */ lui $at, 0xc1a0 -/* C3339C 80241EBC 44812000 */ mtc1 $at, $f4 -/* C333A0 80241EC0 44823000 */ mtc1 $v0, $f6 -/* C333A4 80241EC4 00000000 */ nop -/* C333A8 80241EC8 468031A0 */ cvt.s.w $f6, $f6 -/* C333AC 80241ECC 44073000 */ mfc1 $a3, $f6 -/* C333B0 80241ED0 8C63002C */ lw $v1, 0x2c($v1) -/* C333B4 80241ED4 2402000A */ addiu $v0, $zero, 0xa -/* C333B8 80241ED8 A622008E */ sh $v0, 0x8e($s1) -/* C333BC 80241EDC 2402000F */ addiu $v0, $zero, 0xf -/* C333C0 80241EE0 AE230028 */ sw $v1, 0x28($s1) -/* C333C4 80241EE4 AFA2001C */ sw $v0, 0x1c($sp) -/* C333C8 80241EE8 27A20030 */ addiu $v0, $sp, 0x30 -/* C333CC 80241EEC E7A00010 */ swc1 $f0, 0x10($sp) -/* C333D0 80241EF0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C333D4 80241EF4 E7A40018 */ swc1 $f4, 0x18($sp) -/* C333D8 80241EF8 0C01BFA4 */ jal fx_emote -/* C333DC 80241EFC AFA20020 */ sw $v0, 0x20($sp) -/* C333E0 80241F00 0220202D */ daddu $a0, $s1, $zero -/* C333E4 80241F04 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C333E8 80241F08 0C012530 */ jal func_800494C0 -/* C333EC 80241F0C 3C060020 */ lui $a2, 0x20 -/* C333F0 80241F10 24020002 */ addiu $v0, $zero, 2 -/* C333F4 80241F14 AE820070 */ sw $v0, 0x70($s4) -.L80241F18: -/* C333F8 80241F18 9622008E */ lhu $v0, 0x8e($s1) -/* C333FC 80241F1C 24420001 */ addiu $v0, $v0, 1 -/* C33400 80241F20 A622008E */ sh $v0, 0x8e($s1) -/* C33404 80241F24 00021400 */ sll $v0, $v0, 0x10 -/* C33408 80241F28 00021C03 */ sra $v1, $v0, 0x10 -/* C3340C 80241F2C 2402001B */ addiu $v0, $zero, 0x1b -/* C33410 80241F30 14620005 */ bne $v1, $v0, .L80241F48 -/* C33414 80241F34 24020039 */ addiu $v0, $zero, 0x39 -/* C33418 80241F38 0220202D */ daddu $a0, $s1, $zero -/* C3341C 80241F3C 3C05B000 */ lui $a1, 0xb000 -/* C33420 80241F40 080907D7 */ j .L80241F5C -/* C33424 80241F44 34A5000C */ ori $a1, $a1, 0xc -.L80241F48: -/* C33428 80241F48 14620008 */ bne $v1, $v0, .L80241F6C -/* C3342C 80241F4C 2402003B */ addiu $v0, $zero, 0x3b -/* C33430 80241F50 0220202D */ daddu $a0, $s1, $zero -/* C33434 80241F54 3C05B000 */ lui $a1, 0xb000 -/* C33438 80241F58 34A5000D */ ori $a1, $a1, 0xd -.L80241F5C: -/* C3343C 80241F5C 0C012530 */ jal func_800494C0 -/* C33440 80241F60 0000302D */ daddu $a2, $zero, $zero -/* C33444 80241F64 080907E7 */ j .L80241F9C -/* C33448 80241F68 00000000 */ nop -.L80241F6C: -/* C3344C 80241F6C 14620005 */ bne $v1, $v0, .L80241F84 -/* C33450 80241F70 2402003C */ addiu $v0, $zero, 0x3c -/* C33454 80241F74 8E6200CC */ lw $v0, 0xcc($s3) -/* C33458 80241F78 8C420030 */ lw $v0, 0x30($v0) -/* C3345C 80241F7C 080907E7 */ j .L80241F9C -/* C33460 80241F80 AE220028 */ sw $v0, 0x28($s1) -.L80241F84: -/* C33464 80241F84 14620005 */ bne $v1, $v0, .L80241F9C -/* C33468 80241F88 00000000 */ nop -/* C3346C 80241F8C 8E6200CC */ lw $v0, 0xcc($s3) -/* C33470 80241F90 8C420028 */ lw $v0, 0x28($v0) -/* C33474 80241F94 A620008E */ sh $zero, 0x8e($s1) -/* C33478 80241F98 AE220028 */ sw $v0, 0x28($s1) -.L80241F9C: -/* C3347C 80241F9C 8FBF004C */ lw $ra, 0x4c($sp) -/* C33480 80241FA0 8FB40048 */ lw $s4, 0x48($sp) -/* C33484 80241FA4 8FB30044 */ lw $s3, 0x44($sp) -/* C33488 80241FA8 8FB20040 */ lw $s2, 0x40($sp) -/* C3348C 80241FAC 8FB1003C */ lw $s1, 0x3c($sp) -/* C33490 80241FB0 8FB00038 */ lw $s0, 0x38($sp) -/* C33494 80241FB4 03E00008 */ jr $ra -/* C33498 80241FB8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s new file mode 100644 index 0000000000..7ce2df726d --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80241D04_C331E4.s @@ -0,0 +1,192 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D04_C331E4 +/* C331E4 80241D04 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C331E8 80241D08 AFB40048 */ sw $s4, 0x48($sp) +/* C331EC 80241D0C 0080A02D */ daddu $s4, $a0, $zero +/* C331F0 80241D10 AFBF004C */ sw $ra, 0x4c($sp) +/* C331F4 80241D14 AFB30044 */ sw $s3, 0x44($sp) +/* C331F8 80241D18 AFB20040 */ sw $s2, 0x40($sp) +/* C331FC 80241D1C AFB1003C */ sw $s1, 0x3c($sp) +/* C33200 80241D20 AFB00038 */ sw $s0, 0x38($sp) +/* C33204 80241D24 8E930148 */ lw $s3, 0x148($s4) +/* C33208 80241D28 00C0802D */ daddu $s0, $a2, $zero +/* C3320C 80241D2C 86640008 */ lh $a0, 8($s3) +/* C33210 80241D30 0C00EABB */ jal get_npc_unsafe +/* C33214 80241D34 0000902D */ daddu $s2, $zero, $zero +/* C33218 80241D38 0C039D59 */ jal get_player_data +/* C3321C 80241D3C 0040882D */ daddu $s1, $v0, $zero +/* C33220 80241D40 0200202D */ daddu $a0, $s0, $zero +/* C33224 80241D44 0260282D */ daddu $a1, $s3, $zero +/* C33228 80241D48 0000382D */ daddu $a3, $zero, $zero +/* C3322C 80241D4C 3C0642A0 */ lui $a2, 0x42a0 +/* C33230 80241D50 0040802D */ daddu $s0, $v0, $zero +/* C33234 80241D54 0C01242D */ jal func_800490B4 +/* C33238 80241D58 AFA00010 */ sw $zero, 0x10($sp) +/* C3323C 80241D5C 10400022 */ beqz $v0, .L80241DE8 +/* C33240 80241D60 00000000 */ nop +/* C33244 80241D64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C33248 80241D68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C3324C 80241D6C 804300B4 */ lb $v1, 0xb4($v0) +/* C33250 80241D70 24020002 */ addiu $v0, $zero, 2 +/* C33254 80241D74 10620013 */ beq $v1, $v0, .L80241DC4 +/* C33258 80241D78 2402001A */ addiu $v0, $zero, 0x1a +/* C3325C 80241D7C 10620011 */ beq $v1, $v0, .L80241DC4 +/* C33260 80241D80 24020003 */ addiu $v0, $zero, 3 +/* C33264 80241D84 1062000F */ beq $v1, $v0, .L80241DC4 +/* C33268 80241D88 2402000E */ addiu $v0, $zero, 0xe +/* C3326C 80241D8C 1062000D */ beq $v1, $v0, .L80241DC4 +/* C33270 80241D90 24020010 */ addiu $v0, $zero, 0x10 +/* C33274 80241D94 1062000B */ beq $v1, $v0, .L80241DC4 +/* C33278 80241D98 2402000B */ addiu $v0, $zero, 0xb +/* C3327C 80241D9C 10620009 */ beq $v1, $v0, .L80241DC4 +/* C33280 80241DA0 2402000A */ addiu $v0, $zero, 0xa +/* C33284 80241DA4 10620007 */ beq $v1, $v0, .L80241DC4 +/* C33288 80241DA8 24020012 */ addiu $v0, $zero, 0x12 +/* C3328C 80241DAC 10620005 */ beq $v1, $v0, .L80241DC4 +/* C33290 80241DB0 24020013 */ addiu $v0, $zero, 0x13 +/* C33294 80241DB4 10620003 */ beq $v1, $v0, .L80241DC4 +/* C33298 80241DB8 24020025 */ addiu $v0, $zero, 0x25 +/* C3329C 80241DBC 14620002 */ bne $v1, $v0, .L80241DC8 +/* C332A0 80241DC0 00000000 */ nop +.L80241DC4: +/* C332A4 80241DC4 24120001 */ addiu $s2, $zero, 1 +.L80241DC8: +/* C332A8 80241DC8 82030012 */ lb $v1, 0x12($s0) +/* C332AC 80241DCC 24020002 */ addiu $v0, $zero, 2 +/* C332B0 80241DD0 14620007 */ bne $v1, $v0, .L80241DF0 +/* C332B4 80241DD4 24020001 */ addiu $v0, $zero, 1 +/* C332B8 80241DD8 3C028011 */ lui $v0, %hi(D_8010EBB0) +/* C332BC 80241DDC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* C332C0 80241DE0 50430002 */ beql $v0, $v1, .L80241DEC +/* C332C4 80241DE4 24120001 */ addiu $s2, $zero, 1 +.L80241DE8: +/* C332C8 80241DE8 82030012 */ lb $v1, 0x12($s0) +.L80241DEC: +/* C332CC 80241DEC 24020001 */ addiu $v0, $zero, 1 +.L80241DF0: +/* C332D0 80241DF0 14620006 */ bne $v1, $v0, .L80241E0C +/* C332D4 80241DF4 24020003 */ addiu $v0, $zero, 3 +/* C332D8 80241DF8 3C028011 */ lui $v0, %hi(D_8010EBB0) +/* C332DC 80241DFC 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* C332E0 80241E00 14400008 */ bnez $v0, .L80241E24 +/* C332E4 80241E04 27A40028 */ addiu $a0, $sp, 0x28 +/* C332E8 80241E08 24020003 */ addiu $v0, $zero, 3 +.L80241E0C: +/* C332EC 80241E0C 1462001B */ bne $v1, $v0, .L80241E7C +/* C332F0 80241E10 24020002 */ addiu $v0, $zero, 2 +/* C332F4 80241E14 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* C332F8 80241E18 8063EBB0 */ lb $v1, %lo(D_8010EBB0)($v1) +/* C332FC 80241E1C 14620017 */ bne $v1, $v0, .L80241E7C +/* C33300 80241E20 27A40028 */ addiu $a0, $sp, 0x28 +.L80241E24: +/* C33304 80241E24 27A5002C */ addiu $a1, $sp, 0x2c +/* C33308 80241E28 8E27000C */ lw $a3, 0xc($s1) +/* C3330C 80241E2C C6200038 */ lwc1 $f0, 0x38($s1) +/* C33310 80241E30 C6220040 */ lwc1 $f2, 0x40($s1) +/* C33314 80241E34 0000302D */ daddu $a2, $zero, $zero +/* C33318 80241E38 E7A00028 */ swc1 $f0, 0x28($sp) +/* C3331C 80241E3C 0C00A7E7 */ jal add_vec2D_polar +/* C33320 80241E40 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C33324 80241E44 3C028011 */ lui $v0, 0x8011 +/* C33328 80241E48 8C42C930 */ lw $v0, -0x36d0($v0) +/* C3332C 80241E4C C7AC0028 */ lwc1 $f12, 0x28($sp) +/* C33330 80241E50 C7AE002C */ lwc1 $f14, 0x2c($sp) +/* C33334 80241E54 8C460038 */ lw $a2, 0x38($v0) +/* C33338 80241E58 0C00A7B5 */ jal dist2D +/* C3333C 80241E5C 8C470040 */ lw $a3, 0x40($v0) +/* C33340 80241E60 3C0142A0 */ lui $at, 0x42a0 +/* C33344 80241E64 44811000 */ mtc1 $at, $f2 +/* C33348 80241E68 00000000 */ nop +/* C3334C 80241E6C 4602003E */ c.le.s $f0, $f2 +/* C33350 80241E70 00000000 */ nop +/* C33354 80241E74 45030001 */ bc1tl .L80241E7C +/* C33358 80241E78 24120001 */ addiu $s2, $zero, 1 +.L80241E7C: +/* C3335C 80241E7C 12400026 */ beqz $s2, .L80241F18 +/* C33360 80241E80 0220202D */ daddu $a0, $s1, $zero +/* C33364 80241E84 3C05B000 */ lui $a1, 0xb000 +/* C33368 80241E88 34A5000E */ ori $a1, $a1, 0xe +/* C3336C 80241E8C 0C012530 */ jal func_800494C0 +/* C33370 80241E90 0000302D */ daddu $a2, $zero, $zero +/* C33374 80241E94 0000202D */ daddu $a0, $zero, $zero +/* C33378 80241E98 0220282D */ daddu $a1, $s1, $zero +/* C3337C 80241E9C 0000302D */ daddu $a2, $zero, $zero +/* C33380 80241EA0 862200A8 */ lh $v0, 0xa8($s1) +/* C33384 80241EA4 8E6300CC */ lw $v1, 0xcc($s3) +/* C33388 80241EA8 3C013F80 */ lui $at, 0x3f80 +/* C3338C 80241EAC 44810000 */ mtc1 $at, $f0 +/* C33390 80241EB0 3C014000 */ lui $at, 0x4000 +/* C33394 80241EB4 44811000 */ mtc1 $at, $f2 +/* C33398 80241EB8 3C01C1A0 */ lui $at, 0xc1a0 +/* C3339C 80241EBC 44812000 */ mtc1 $at, $f4 +/* C333A0 80241EC0 44823000 */ mtc1 $v0, $f6 +/* C333A4 80241EC4 00000000 */ nop +/* C333A8 80241EC8 468031A0 */ cvt.s.w $f6, $f6 +/* C333AC 80241ECC 44073000 */ mfc1 $a3, $f6 +/* C333B0 80241ED0 8C63002C */ lw $v1, 0x2c($v1) +/* C333B4 80241ED4 2402000A */ addiu $v0, $zero, 0xa +/* C333B8 80241ED8 A622008E */ sh $v0, 0x8e($s1) +/* C333BC 80241EDC 2402000F */ addiu $v0, $zero, 0xf +/* C333C0 80241EE0 AE230028 */ sw $v1, 0x28($s1) +/* C333C4 80241EE4 AFA2001C */ sw $v0, 0x1c($sp) +/* C333C8 80241EE8 27A20030 */ addiu $v0, $sp, 0x30 +/* C333CC 80241EEC E7A00010 */ swc1 $f0, 0x10($sp) +/* C333D0 80241EF0 E7A20014 */ swc1 $f2, 0x14($sp) +/* C333D4 80241EF4 E7A40018 */ swc1 $f4, 0x18($sp) +/* C333D8 80241EF8 0C01BFA4 */ jal fx_emote +/* C333DC 80241EFC AFA20020 */ sw $v0, 0x20($sp) +/* C333E0 80241F00 0220202D */ daddu $a0, $s1, $zero +/* C333E4 80241F04 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C333E8 80241F08 0C012530 */ jal func_800494C0 +/* C333EC 80241F0C 3C060020 */ lui $a2, 0x20 +/* C333F0 80241F10 24020002 */ addiu $v0, $zero, 2 +/* C333F4 80241F14 AE820070 */ sw $v0, 0x70($s4) +.L80241F18: +/* C333F8 80241F18 9622008E */ lhu $v0, 0x8e($s1) +/* C333FC 80241F1C 24420001 */ addiu $v0, $v0, 1 +/* C33400 80241F20 A622008E */ sh $v0, 0x8e($s1) +/* C33404 80241F24 00021400 */ sll $v0, $v0, 0x10 +/* C33408 80241F28 00021C03 */ sra $v1, $v0, 0x10 +/* C3340C 80241F2C 2402001B */ addiu $v0, $zero, 0x1b +/* C33410 80241F30 14620005 */ bne $v1, $v0, .L80241F48 +/* C33414 80241F34 24020039 */ addiu $v0, $zero, 0x39 +/* C33418 80241F38 0220202D */ daddu $a0, $s1, $zero +/* C3341C 80241F3C 3C05B000 */ lui $a1, 0xb000 +/* C33420 80241F40 080907D7 */ j .L80241F5C +/* C33424 80241F44 34A5000C */ ori $a1, $a1, 0xc +.L80241F48: +/* C33428 80241F48 14620008 */ bne $v1, $v0, .L80241F6C +/* C3342C 80241F4C 2402003B */ addiu $v0, $zero, 0x3b +/* C33430 80241F50 0220202D */ daddu $a0, $s1, $zero +/* C33434 80241F54 3C05B000 */ lui $a1, 0xb000 +/* C33438 80241F58 34A5000D */ ori $a1, $a1, 0xd +.L80241F5C: +/* C3343C 80241F5C 0C012530 */ jal func_800494C0 +/* C33440 80241F60 0000302D */ daddu $a2, $zero, $zero +/* C33444 80241F64 080907E7 */ j .L80241F9C +/* C33448 80241F68 00000000 */ nop +.L80241F6C: +/* C3344C 80241F6C 14620005 */ bne $v1, $v0, .L80241F84 +/* C33450 80241F70 2402003C */ addiu $v0, $zero, 0x3c +/* C33454 80241F74 8E6200CC */ lw $v0, 0xcc($s3) +/* C33458 80241F78 8C420030 */ lw $v0, 0x30($v0) +/* C3345C 80241F7C 080907E7 */ j .L80241F9C +/* C33460 80241F80 AE220028 */ sw $v0, 0x28($s1) +.L80241F84: +/* C33464 80241F84 14620005 */ bne $v1, $v0, .L80241F9C +/* C33468 80241F88 00000000 */ nop +/* C3346C 80241F8C 8E6200CC */ lw $v0, 0xcc($s3) +/* C33470 80241F90 8C420028 */ lw $v0, 0x28($v0) +/* C33474 80241F94 A620008E */ sh $zero, 0x8e($s1) +/* C33478 80241F98 AE220028 */ sw $v0, 0x28($s1) +.L80241F9C: +/* C3347C 80241F9C 8FBF004C */ lw $ra, 0x4c($sp) +/* C33480 80241FA0 8FB40048 */ lw $s4, 0x48($sp) +/* C33484 80241FA4 8FB30044 */ lw $s3, 0x44($sp) +/* C33488 80241FA8 8FB20040 */ lw $s2, 0x40($sp) +/* C3348C 80241FAC 8FB1003C */ lw $s1, 0x3c($sp) +/* C33490 80241FB0 8FB00038 */ lw $s0, 0x38($sp) +/* C33494 80241FB4 03E00008 */ jr $ra +/* C33498 80241FB8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020.s deleted file mode 100644 index 27f64e6c21..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242020 -/* C33500 80242020 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C33504 80242024 AFB10014 */ sw $s1, 0x14($sp) -/* C33508 80242028 0080882D */ daddu $s1, $a0, $zero -/* C3350C 8024202C AFBF001C */ sw $ra, 0x1c($sp) -/* C33510 80242030 AFB20018 */ sw $s2, 0x18($sp) -/* C33514 80242034 AFB00010 */ sw $s0, 0x10($sp) -/* C33518 80242038 8E320148 */ lw $s2, 0x148($s1) -/* C3351C 8024203C 0C00EABB */ jal get_npc_unsafe -/* C33520 80242040 86440008 */ lh $a0, 8($s2) -/* C33524 80242044 240400B4 */ addiu $a0, $zero, 0xb4 -/* C33528 80242048 0C00A67F */ jal rand_int -/* C3352C 8024204C 0040802D */ daddu $s0, $v0, $zero -/* C33530 80242050 C60C000C */ lwc1 $f12, 0xc($s0) -/* C33534 80242054 44820000 */ mtc1 $v0, $f0 -/* C33538 80242058 00000000 */ nop -/* C3353C 8024205C 46800020 */ cvt.s.w $f0, $f0 -/* C33540 80242060 46006300 */ add.s $f12, $f12, $f0 -/* C33544 80242064 3C0142B4 */ lui $at, 0x42b4 -/* C33548 80242068 44810000 */ mtc1 $at, $f0 -/* C3354C 8024206C 0C00A6C9 */ jal clamp_angle -/* C33550 80242070 46006301 */ sub.s $f12, $f12, $f0 -/* C33554 80242074 E600000C */ swc1 $f0, 0xc($s0) -/* C33558 80242078 8E4200CC */ lw $v0, 0xcc($s2) -/* C3355C 8024207C 8C420000 */ lw $v0, ($v0) -/* C33560 80242080 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C33564 80242084 0C00A67F */ jal rand_int -/* C33568 80242088 AE020028 */ sw $v0, 0x28($s0) -/* C3356C 8024208C 00021FC2 */ srl $v1, $v0, 0x1f -/* C33570 80242090 00431821 */ addu $v1, $v0, $v1 -/* C33574 80242094 00031843 */ sra $v1, $v1, 1 -/* C33578 80242098 00031840 */ sll $v1, $v1, 1 -/* C3357C 8024209C 00431023 */ subu $v0, $v0, $v1 -/* C33580 802420A0 24420002 */ addiu $v0, $v0, 2 -/* C33584 802420A4 AE220074 */ sw $v0, 0x74($s1) -/* C33588 802420A8 24020004 */ addiu $v0, $zero, 4 -/* C3358C 802420AC AE220070 */ sw $v0, 0x70($s1) -/* C33590 802420B0 8FBF001C */ lw $ra, 0x1c($sp) -/* C33594 802420B4 8FB20018 */ lw $s2, 0x18($sp) -/* C33598 802420B8 8FB10014 */ lw $s1, 0x14($sp) -/* C3359C 802420BC 8FB00010 */ lw $s0, 0x10($sp) -/* C335A0 802420C0 03E00008 */ jr $ra -/* C335A4 802420C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s new file mode 100644 index 0000000000..5b64453361 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242020_C33500.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242020_C33500 +/* C33500 80242020 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C33504 80242024 AFB10014 */ sw $s1, 0x14($sp) +/* C33508 80242028 0080882D */ daddu $s1, $a0, $zero +/* C3350C 8024202C AFBF001C */ sw $ra, 0x1c($sp) +/* C33510 80242030 AFB20018 */ sw $s2, 0x18($sp) +/* C33514 80242034 AFB00010 */ sw $s0, 0x10($sp) +/* C33518 80242038 8E320148 */ lw $s2, 0x148($s1) +/* C3351C 8024203C 0C00EABB */ jal get_npc_unsafe +/* C33520 80242040 86440008 */ lh $a0, 8($s2) +/* C33524 80242044 240400B4 */ addiu $a0, $zero, 0xb4 +/* C33528 80242048 0C00A67F */ jal rand_int +/* C3352C 8024204C 0040802D */ daddu $s0, $v0, $zero +/* C33530 80242050 C60C000C */ lwc1 $f12, 0xc($s0) +/* C33534 80242054 44820000 */ mtc1 $v0, $f0 +/* C33538 80242058 00000000 */ nop +/* C3353C 8024205C 46800020 */ cvt.s.w $f0, $f0 +/* C33540 80242060 46006300 */ add.s $f12, $f12, $f0 +/* C33544 80242064 3C0142B4 */ lui $at, 0x42b4 +/* C33548 80242068 44810000 */ mtc1 $at, $f0 +/* C3354C 8024206C 0C00A6C9 */ jal clamp_angle +/* C33550 80242070 46006301 */ sub.s $f12, $f12, $f0 +/* C33554 80242074 E600000C */ swc1 $f0, 0xc($s0) +/* C33558 80242078 8E4200CC */ lw $v0, 0xcc($s2) +/* C3355C 8024207C 8C420000 */ lw $v0, ($v0) +/* C33560 80242080 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C33564 80242084 0C00A67F */ jal rand_int +/* C33568 80242088 AE020028 */ sw $v0, 0x28($s0) +/* C3356C 8024208C 00021FC2 */ srl $v1, $v0, 0x1f +/* C33570 80242090 00431821 */ addu $v1, $v0, $v1 +/* C33574 80242094 00031843 */ sra $v1, $v1, 1 +/* C33578 80242098 00031840 */ sll $v1, $v1, 1 +/* C3357C 8024209C 00431023 */ subu $v0, $v0, $v1 +/* C33580 802420A0 24420002 */ addiu $v0, $v0, 2 +/* C33584 802420A4 AE220074 */ sw $v0, 0x74($s1) +/* C33588 802420A8 24020004 */ addiu $v0, $zero, 4 +/* C3358C 802420AC AE220070 */ sw $v0, 0x70($s1) +/* C33590 802420B0 8FBF001C */ lw $ra, 0x1c($sp) +/* C33594 802420B4 8FB20018 */ lw $s2, 0x18($sp) +/* C33598 802420B8 8FB10014 */ lw $s1, 0x14($sp) +/* C3359C 802420BC 8FB00010 */ lw $s0, 0x10($sp) +/* C335A0 802420C0 03E00008 */ jr $ra +/* C335A4 802420C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8.s deleted file mode 100644 index d4039b3c15..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420C8 -/* C335A8 802420C8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C335AC 802420CC AFB20020 */ sw $s2, 0x20($sp) -/* C335B0 802420D0 0080902D */ daddu $s2, $a0, $zero -/* C335B4 802420D4 AFBF0028 */ sw $ra, 0x28($sp) -/* C335B8 802420D8 AFB30024 */ sw $s3, 0x24($sp) -/* C335BC 802420DC AFB1001C */ sw $s1, 0x1c($sp) -/* C335C0 802420E0 AFB00018 */ sw $s0, 0x18($sp) -/* C335C4 802420E4 8E510148 */ lw $s1, 0x148($s2) -/* C335C8 802420E8 00A0982D */ daddu $s3, $a1, $zero -/* C335CC 802420EC 86240008 */ lh $a0, 8($s1) -/* C335D0 802420F0 0C00EABB */ jal get_npc_unsafe -/* C335D4 802420F4 00C0802D */ daddu $s0, $a2, $zero -/* C335D8 802420F8 0200202D */ daddu $a0, $s0, $zero -/* C335DC 802420FC 0040802D */ daddu $s0, $v0, $zero -/* C335E0 80242100 AFA00010 */ sw $zero, 0x10($sp) -/* C335E4 80242104 8E660024 */ lw $a2, 0x24($s3) -/* C335E8 80242108 8E670028 */ lw $a3, 0x28($s3) -/* C335EC 8024210C 0C01242D */ jal func_800490B4 -/* C335F0 80242110 0220282D */ daddu $a1, $s1, $zero -/* C335F4 80242114 1040000C */ beqz $v0, .L80242148 -/* C335F8 80242118 00000000 */ nop -/* C335FC 8024211C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C33600 80242120 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C33604 80242124 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C33608 80242128 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C3360C 8024212C 8C460028 */ lw $a2, 0x28($v0) -/* C33610 80242130 0C00A720 */ jal atan2 -/* C33614 80242134 8C470030 */ lw $a3, 0x30($v0) -/* C33618 80242138 2402000C */ addiu $v0, $zero, 0xc -/* C3361C 8024213C E600000C */ swc1 $f0, 0xc($s0) -/* C33620 80242140 08090879 */ j .L802421E4 -/* C33624 80242144 AE420070 */ sw $v0, 0x70($s2) -.L80242148: -/* C33628 80242148 9602008E */ lhu $v0, 0x8e($s0) -/* C3362C 8024214C 2442FFFF */ addiu $v0, $v0, -1 -/* C33630 80242150 A602008E */ sh $v0, 0x8e($s0) -/* C33634 80242154 00021400 */ sll $v0, $v0, 0x10 -/* C33638 80242158 1C400022 */ bgtz $v0, .L802421E4 -/* C3363C 8024215C 00000000 */ nop -/* C33640 80242160 8E420074 */ lw $v0, 0x74($s2) -/* C33644 80242164 2442FFFF */ addiu $v0, $v0, -1 -/* C33648 80242168 18400014 */ blez $v0, .L802421BC -/* C3364C 8024216C AE420074 */ sw $v0, 0x74($s2) -/* C33650 80242170 C600000C */ lwc1 $f0, 0xc($s0) -/* C33654 80242174 3C014334 */ lui $at, 0x4334 -/* C33658 80242178 44816000 */ mtc1 $at, $f12 -/* C3365C 8024217C 0C00A6C9 */ jal clamp_angle -/* C33660 80242180 460C0300 */ add.s $f12, $f0, $f12 -/* C33664 80242184 E600000C */ swc1 $f0, 0xc($s0) -/* C33668 80242188 8E640008 */ lw $a0, 8($s3) -/* C3366C 8024218C 000417C2 */ srl $v0, $a0, 0x1f -/* C33670 80242190 00822021 */ addu $a0, $a0, $v0 -/* C33674 80242194 00042043 */ sra $a0, $a0, 1 -/* C33678 80242198 0C00A67F */ jal rand_int -/* C3367C 8024219C 24840001 */ addiu $a0, $a0, 1 -/* C33680 802421A0 8E630008 */ lw $v1, 8($s3) -/* C33684 802421A4 000327C2 */ srl $a0, $v1, 0x1f -/* C33688 802421A8 00641821 */ addu $v1, $v1, $a0 -/* C3368C 802421AC 00031843 */ sra $v1, $v1, 1 -/* C33690 802421B0 00621821 */ addu $v1, $v1, $v0 -/* C33694 802421B4 08090879 */ j .L802421E4 -/* C33698 802421B8 A603008E */ sh $v1, 0x8e($s0) -.L802421BC: -/* C3369C 802421BC 8E250088 */ lw $a1, 0x88($s1) -/* C336A0 802421C0 24020028 */ addiu $v0, $zero, 0x28 -/* C336A4 802421C4 14A20003 */ bne $a1, $v0, .L802421D4 -/* C336A8 802421C8 24020032 */ addiu $v0, $zero, 0x32 -/* C336AC 802421CC 08090877 */ j .L802421DC -/* C336B0 802421D0 24020014 */ addiu $v0, $zero, 0x14 -.L802421D4: -/* C336B4 802421D4 14A20003 */ bne $a1, $v0, .L802421E4 -/* C336B8 802421D8 24020019 */ addiu $v0, $zero, 0x19 -.L802421DC: -/* C336BC 802421DC A602008E */ sh $v0, 0x8e($s0) -/* C336C0 802421E0 AE450070 */ sw $a1, 0x70($s2) -.L802421E4: -/* C336C4 802421E4 8FBF0028 */ lw $ra, 0x28($sp) -/* C336C8 802421E8 8FB30024 */ lw $s3, 0x24($sp) -/* C336CC 802421EC 8FB20020 */ lw $s2, 0x20($sp) -/* C336D0 802421F0 8FB1001C */ lw $s1, 0x1c($sp) -/* C336D4 802421F4 8FB00018 */ lw $s0, 0x18($sp) -/* C336D8 802421F8 03E00008 */ jr $ra -/* C336DC 802421FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s new file mode 100644 index 0000000000..3b1c185f73 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802420C8_C335A8.s @@ -0,0 +1,87 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420C8_C335A8 +/* C335A8 802420C8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C335AC 802420CC AFB20020 */ sw $s2, 0x20($sp) +/* C335B0 802420D0 0080902D */ daddu $s2, $a0, $zero +/* C335B4 802420D4 AFBF0028 */ sw $ra, 0x28($sp) +/* C335B8 802420D8 AFB30024 */ sw $s3, 0x24($sp) +/* C335BC 802420DC AFB1001C */ sw $s1, 0x1c($sp) +/* C335C0 802420E0 AFB00018 */ sw $s0, 0x18($sp) +/* C335C4 802420E4 8E510148 */ lw $s1, 0x148($s2) +/* C335C8 802420E8 00A0982D */ daddu $s3, $a1, $zero +/* C335CC 802420EC 86240008 */ lh $a0, 8($s1) +/* C335D0 802420F0 0C00EABB */ jal get_npc_unsafe +/* C335D4 802420F4 00C0802D */ daddu $s0, $a2, $zero +/* C335D8 802420F8 0200202D */ daddu $a0, $s0, $zero +/* C335DC 802420FC 0040802D */ daddu $s0, $v0, $zero +/* C335E0 80242100 AFA00010 */ sw $zero, 0x10($sp) +/* C335E4 80242104 8E660024 */ lw $a2, 0x24($s3) +/* C335E8 80242108 8E670028 */ lw $a3, 0x28($s3) +/* C335EC 8024210C 0C01242D */ jal func_800490B4 +/* C335F0 80242110 0220282D */ daddu $a1, $s1, $zero +/* C335F4 80242114 1040000C */ beqz $v0, .L80242148 +/* C335F8 80242118 00000000 */ nop +/* C335FC 8024211C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C33600 80242120 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C33604 80242124 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C33608 80242128 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C3360C 8024212C 8C460028 */ lw $a2, 0x28($v0) +/* C33610 80242130 0C00A720 */ jal atan2 +/* C33614 80242134 8C470030 */ lw $a3, 0x30($v0) +/* C33618 80242138 2402000C */ addiu $v0, $zero, 0xc +/* C3361C 8024213C E600000C */ swc1 $f0, 0xc($s0) +/* C33620 80242140 08090879 */ j .L802421E4 +/* C33624 80242144 AE420070 */ sw $v0, 0x70($s2) +.L80242148: +/* C33628 80242148 9602008E */ lhu $v0, 0x8e($s0) +/* C3362C 8024214C 2442FFFF */ addiu $v0, $v0, -1 +/* C33630 80242150 A602008E */ sh $v0, 0x8e($s0) +/* C33634 80242154 00021400 */ sll $v0, $v0, 0x10 +/* C33638 80242158 1C400022 */ bgtz $v0, .L802421E4 +/* C3363C 8024215C 00000000 */ nop +/* C33640 80242160 8E420074 */ lw $v0, 0x74($s2) +/* C33644 80242164 2442FFFF */ addiu $v0, $v0, -1 +/* C33648 80242168 18400014 */ blez $v0, .L802421BC +/* C3364C 8024216C AE420074 */ sw $v0, 0x74($s2) +/* C33650 80242170 C600000C */ lwc1 $f0, 0xc($s0) +/* C33654 80242174 3C014334 */ lui $at, 0x4334 +/* C33658 80242178 44816000 */ mtc1 $at, $f12 +/* C3365C 8024217C 0C00A6C9 */ jal clamp_angle +/* C33660 80242180 460C0300 */ add.s $f12, $f0, $f12 +/* C33664 80242184 E600000C */ swc1 $f0, 0xc($s0) +/* C33668 80242188 8E640008 */ lw $a0, 8($s3) +/* C3366C 8024218C 000417C2 */ srl $v0, $a0, 0x1f +/* C33670 80242190 00822021 */ addu $a0, $a0, $v0 +/* C33674 80242194 00042043 */ sra $a0, $a0, 1 +/* C33678 80242198 0C00A67F */ jal rand_int +/* C3367C 8024219C 24840001 */ addiu $a0, $a0, 1 +/* C33680 802421A0 8E630008 */ lw $v1, 8($s3) +/* C33684 802421A4 000327C2 */ srl $a0, $v1, 0x1f +/* C33688 802421A8 00641821 */ addu $v1, $v1, $a0 +/* C3368C 802421AC 00031843 */ sra $v1, $v1, 1 +/* C33690 802421B0 00621821 */ addu $v1, $v1, $v0 +/* C33694 802421B4 08090879 */ j .L802421E4 +/* C33698 802421B8 A603008E */ sh $v1, 0x8e($s0) +.L802421BC: +/* C3369C 802421BC 8E250088 */ lw $a1, 0x88($s1) +/* C336A0 802421C0 24020028 */ addiu $v0, $zero, 0x28 +/* C336A4 802421C4 14A20003 */ bne $a1, $v0, .L802421D4 +/* C336A8 802421C8 24020032 */ addiu $v0, $zero, 0x32 +/* C336AC 802421CC 08090877 */ j .L802421DC +/* C336B0 802421D0 24020014 */ addiu $v0, $zero, 0x14 +.L802421D4: +/* C336B4 802421D4 14A20003 */ bne $a1, $v0, .L802421E4 +/* C336B8 802421D8 24020019 */ addiu $v0, $zero, 0x19 +.L802421DC: +/* C336BC 802421DC A602008E */ sh $v0, 0x8e($s0) +/* C336C0 802421E0 AE450070 */ sw $a1, 0x70($s2) +.L802421E4: +/* C336C4 802421E4 8FBF0028 */ lw $ra, 0x28($sp) +/* C336C8 802421E8 8FB30024 */ lw $s3, 0x24($sp) +/* C336CC 802421EC 8FB20020 */ lw $s2, 0x20($sp) +/* C336D0 802421F0 8FB1001C */ lw $s1, 0x1c($sp) +/* C336D4 802421F4 8FB00018 */ lw $s0, 0x18($sp) +/* C336D8 802421F8 03E00008 */ jr $ra +/* C336DC 802421FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200.s deleted file mode 100644 index eef89a4bff..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242200 -/* C336E0 80242200 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C336E4 80242204 AFB20018 */ sw $s2, 0x18($sp) -/* C336E8 80242208 0080902D */ daddu $s2, $a0, $zero -/* C336EC 8024220C AFBF001C */ sw $ra, 0x1c($sp) -/* C336F0 80242210 AFB10014 */ sw $s1, 0x14($sp) -/* C336F4 80242214 AFB00010 */ sw $s0, 0x10($sp) -/* C336F8 80242218 8E500148 */ lw $s0, 0x148($s2) -/* C336FC 8024221C 86040008 */ lh $a0, 8($s0) -/* C33700 80242220 0C00EABB */ jal get_npc_unsafe -/* C33704 80242224 00A0882D */ daddu $s1, $a1, $zero -/* C33708 80242228 0040182D */ daddu $v1, $v0, $zero -/* C3370C 8024222C 9462008E */ lhu $v0, 0x8e($v1) -/* C33710 80242230 2442FFFF */ addiu $v0, $v0, -1 -/* C33714 80242234 A462008E */ sh $v0, 0x8e($v1) -/* C33718 80242238 00021400 */ sll $v0, $v0, 0x10 -/* C3371C 8024223C 1C400015 */ bgtz $v0, .L80242294 -/* C33720 80242240 00000000 */ nop -/* C33724 80242244 8E0200CC */ lw $v0, 0xcc($s0) -/* C33728 80242248 8C420004 */ lw $v0, 4($v0) -/* C3372C 8024224C AC620028 */ sw $v0, 0x28($v1) -/* C33730 80242250 8E0200D0 */ lw $v0, 0xd0($s0) -/* C33734 80242254 8C420014 */ lw $v0, 0x14($v0) -/* C33738 80242258 04410004 */ bgez $v0, .L8024226C -/* C3373C 8024225C 00000000 */ nop -/* C33740 80242260 C6200000 */ lwc1 $f0, ($s1) -/* C33744 80242264 080908A3 */ j .L8024228C -/* C33748 80242268 E4600018 */ swc1 $f0, 0x18($v1) -.L8024226C: -/* C3374C 8024226C 3C018024 */ lui $at, 0x8024 -/* C33750 80242270 D4224EB8 */ ldc1 $f2, 0x4eb8($at) -/* C33754 80242274 44820000 */ mtc1 $v0, $f0 -/* C33758 80242278 00000000 */ nop -/* C3375C 8024227C 46800021 */ cvt.d.w $f0, $f0 -/* C33760 80242280 46220003 */ div.d $f0, $f0, $f2 -/* C33764 80242284 46200020 */ cvt.s.d $f0, $f0 -/* C33768 80242288 E4600018 */ swc1 $f0, 0x18($v1) -.L8024228C: -/* C3376C 8024228C 24020029 */ addiu $v0, $zero, 0x29 -/* C33770 80242290 AE420070 */ sw $v0, 0x70($s2) -.L80242294: -/* C33774 80242294 8FBF001C */ lw $ra, 0x1c($sp) -/* C33778 80242298 8FB20018 */ lw $s2, 0x18($sp) -/* C3377C 8024229C 8FB10014 */ lw $s1, 0x14($sp) -/* C33780 802422A0 8FB00010 */ lw $s0, 0x10($sp) -/* C33784 802422A4 03E00008 */ jr $ra -/* C33788 802422A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s new file mode 100644 index 0000000000..a60c218540 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242200_C336E0.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242200_C336E0 +/* C336E0 80242200 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C336E4 80242204 AFB20018 */ sw $s2, 0x18($sp) +/* C336E8 80242208 0080902D */ daddu $s2, $a0, $zero +/* C336EC 8024220C AFBF001C */ sw $ra, 0x1c($sp) +/* C336F0 80242210 AFB10014 */ sw $s1, 0x14($sp) +/* C336F4 80242214 AFB00010 */ sw $s0, 0x10($sp) +/* C336F8 80242218 8E500148 */ lw $s0, 0x148($s2) +/* C336FC 8024221C 86040008 */ lh $a0, 8($s0) +/* C33700 80242220 0C00EABB */ jal get_npc_unsafe +/* C33704 80242224 00A0882D */ daddu $s1, $a1, $zero +/* C33708 80242228 0040182D */ daddu $v1, $v0, $zero +/* C3370C 8024222C 9462008E */ lhu $v0, 0x8e($v1) +/* C33710 80242230 2442FFFF */ addiu $v0, $v0, -1 +/* C33714 80242234 A462008E */ sh $v0, 0x8e($v1) +/* C33718 80242238 00021400 */ sll $v0, $v0, 0x10 +/* C3371C 8024223C 1C400015 */ bgtz $v0, .L80242294 +/* C33720 80242240 00000000 */ nop +/* C33724 80242244 8E0200CC */ lw $v0, 0xcc($s0) +/* C33728 80242248 8C420004 */ lw $v0, 4($v0) +/* C3372C 8024224C AC620028 */ sw $v0, 0x28($v1) +/* C33730 80242250 8E0200D0 */ lw $v0, 0xd0($s0) +/* C33734 80242254 8C420014 */ lw $v0, 0x14($v0) +/* C33738 80242258 04410004 */ bgez $v0, .L8024226C +/* C3373C 8024225C 00000000 */ nop +/* C33740 80242260 C6200000 */ lwc1 $f0, ($s1) +/* C33744 80242264 080908A3 */ j .L8024228C +/* C33748 80242268 E4600018 */ swc1 $f0, 0x18($v1) +.L8024226C: +/* C3374C 8024226C 3C018024 */ lui $at, 0x8024 +/* C33750 80242270 D4224EB8 */ ldc1 $f2, 0x4eb8($at) +/* C33754 80242274 44820000 */ mtc1 $v0, $f0 +/* C33758 80242278 00000000 */ nop +/* C3375C 8024227C 46800021 */ cvt.d.w $f0, $f0 +/* C33760 80242280 46220003 */ div.d $f0, $f0, $f2 +/* C33764 80242284 46200020 */ cvt.s.d $f0, $f0 +/* C33768 80242288 E4600018 */ swc1 $f0, 0x18($v1) +.L8024228C: +/* C3376C 8024228C 24020029 */ addiu $v0, $zero, 0x29 +/* C33770 80242290 AE420070 */ sw $v0, 0x70($s2) +.L80242294: +/* C33774 80242294 8FBF001C */ lw $ra, 0x1c($sp) +/* C33778 80242298 8FB20018 */ lw $s2, 0x18($sp) +/* C3377C 8024229C 8FB10014 */ lw $s1, 0x14($sp) +/* C33780 802422A0 8FB00010 */ lw $s0, 0x10($sp) +/* C33784 802422A4 03E00008 */ jr $ra +/* C33788 802422A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC.s deleted file mode 100644 index e7fe641d82..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422AC -/* C3378C 802422AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C33790 802422B0 AFB3002C */ sw $s3, 0x2c($sp) -/* C33794 802422B4 0080982D */ daddu $s3, $a0, $zero -/* C33798 802422B8 AFBF0030 */ sw $ra, 0x30($sp) -/* C3379C 802422BC AFB20028 */ sw $s2, 0x28($sp) -/* C337A0 802422C0 AFB10024 */ sw $s1, 0x24($sp) -/* C337A4 802422C4 AFB00020 */ sw $s0, 0x20($sp) -/* C337A8 802422C8 8E720148 */ lw $s2, 0x148($s3) -/* C337AC 802422CC 00A0882D */ daddu $s1, $a1, $zero -/* C337B0 802422D0 86440008 */ lh $a0, 8($s2) -/* C337B4 802422D4 0C00EABB */ jal get_npc_unsafe -/* C337B8 802422D8 00C0802D */ daddu $s0, $a2, $zero -/* C337BC 802422DC 0200202D */ daddu $a0, $s0, $zero -/* C337C0 802422E0 0240282D */ daddu $a1, $s2, $zero -/* C337C4 802422E4 AFA00010 */ sw $zero, 0x10($sp) -/* C337C8 802422E8 8E260024 */ lw $a2, 0x24($s1) -/* C337CC 802422EC 8E270028 */ lw $a3, 0x28($s1) -/* C337D0 802422F0 0C01242D */ jal func_800490B4 -/* C337D4 802422F4 0040802D */ daddu $s0, $v0, $zero -/* C337D8 802422F8 1040000C */ beqz $v0, .L8024232C -/* C337DC 802422FC 00000000 */ nop -/* C337E0 80242300 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C337E4 80242304 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C337E8 80242308 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C337EC 8024230C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C337F0 80242310 8C460028 */ lw $a2, 0x28($v0) -/* C337F4 80242314 0C00A720 */ jal atan2 -/* C337F8 80242318 8C470030 */ lw $a3, 0x30($v0) -/* C337FC 8024231C 2402000C */ addiu $v0, $zero, 0xc -/* C33800 80242320 E600000C */ swc1 $f0, 0xc($s0) -/* C33804 80242324 08090902 */ j .L80242408 -/* C33808 80242328 AE620070 */ sw $v0, 0x70($s3) -.L8024232C: -/* C3380C 8024232C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C33810 80242330 8E4200D0 */ lw $v0, 0xd0($s2) -/* C33814 80242334 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C33818 80242338 C4440000 */ lwc1 $f4, ($v0) -/* C3381C 8024233C 46802120 */ cvt.s.w $f4, $f4 -/* C33820 80242340 44062000 */ mfc1 $a2, $f4 -/* C33824 80242344 C4440008 */ lwc1 $f4, 8($v0) -/* C33828 80242348 46802120 */ cvt.s.w $f4, $f4 -/* C3382C 8024234C 44072000 */ mfc1 $a3, $f4 -/* C33830 80242350 0C00A7B5 */ jal dist2D -/* C33834 80242354 00000000 */ nop -/* C33838 80242358 C6020018 */ lwc1 $f2, 0x18($s0) -/* C3383C 8024235C 4602003E */ c.le.s $f0, $f2 -/* C33840 80242360 00000000 */ nop -/* C33844 80242364 4500000B */ bc1f .L80242394 -/* C33848 80242368 00000000 */ nop -/* C3384C 8024236C 8E4200CC */ lw $v0, 0xcc($s2) -/* C33850 80242370 8C430000 */ lw $v1, ($v0) -/* C33854 80242374 2402000F */ addiu $v0, $zero, 0xf -/* C33858 80242378 A602008E */ sh $v0, 0x8e($s0) -/* C3385C 8024237C 24020032 */ addiu $v0, $zero, 0x32 -/* C33860 80242380 AE030028 */ sw $v1, 0x28($s0) -/* C33864 80242384 AE420088 */ sw $v0, 0x88($s2) -/* C33868 80242388 24020003 */ addiu $v0, $zero, 3 -/* C3386C 8024238C 08090902 */ j .L80242408 -/* C33870 80242390 AE620070 */ sw $v0, 0x70($s3) -.L80242394: -/* C33874 80242394 8602008C */ lh $v0, 0x8c($s0) -/* C33878 80242398 1440001B */ bnez $v0, .L80242408 -/* C3387C 8024239C 0200202D */ daddu $a0, $s0, $zero -/* C33880 802423A0 27A60018 */ addiu $a2, $sp, 0x18 -/* C33884 802423A4 3C0540A0 */ lui $a1, 0x40a0 -/* C33888 802423A8 C600000C */ lwc1 $f0, 0xc($s0) -/* C3388C 802423AC 0000382D */ daddu $a3, $zero, $zero -/* C33890 802423B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C33894 802423B4 AFA00010 */ sw $zero, 0x10($sp) -/* C33898 802423B8 0C0129E1 */ jal func_8004A784 -/* C3389C 802423BC AFA00014 */ sw $zero, 0x14($sp) -/* C338A0 802423C0 C7A00018 */ lwc1 $f0, 0x18($sp) -/* C338A4 802423C4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C338A8 802423C8 E600000C */ swc1 $f0, 0xc($s0) -/* C338AC 802423CC 8E4200D0 */ lw $v0, 0xd0($s2) -/* C338B0 802423D0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C338B4 802423D4 C4440000 */ lwc1 $f4, ($v0) -/* C338B8 802423D8 46802120 */ cvt.s.w $f4, $f4 -/* C338BC 802423DC 44062000 */ mfc1 $a2, $f4 -/* C338C0 802423E0 C4440008 */ lwc1 $f4, 8($v0) -/* C338C4 802423E4 46802120 */ cvt.s.w $f4, $f4 -/* C338C8 802423E8 44072000 */ mfc1 $a3, $f4 -/* C338CC 802423EC 0C00A720 */ jal atan2 -/* C338D0 802423F0 00000000 */ nop -/* C338D4 802423F4 8E050018 */ lw $a1, 0x18($s0) -/* C338D8 802423F8 44060000 */ mfc1 $a2, $f0 -/* C338DC 802423FC 0200202D */ daddu $a0, $s0, $zero -/* C338E0 80242400 0C00EA95 */ jal npc_move_heading -/* C338E4 80242404 AC86000C */ sw $a2, 0xc($a0) -.L80242408: -/* C338E8 80242408 8FBF0030 */ lw $ra, 0x30($sp) -/* C338EC 8024240C 8FB3002C */ lw $s3, 0x2c($sp) -/* C338F0 80242410 8FB20028 */ lw $s2, 0x28($sp) -/* C338F4 80242414 8FB10024 */ lw $s1, 0x24($sp) -/* C338F8 80242418 8FB00020 */ lw $s0, 0x20($sp) -/* C338FC 8024241C 03E00008 */ jr $ra -/* C33900 80242420 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s new file mode 100644 index 0000000000..4d4851bbe4 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_802422AC_C3378C.s @@ -0,0 +1,101 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422AC_C3378C +/* C3378C 802422AC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* C33790 802422B0 AFB3002C */ sw $s3, 0x2c($sp) +/* C33794 802422B4 0080982D */ daddu $s3, $a0, $zero +/* C33798 802422B8 AFBF0030 */ sw $ra, 0x30($sp) +/* C3379C 802422BC AFB20028 */ sw $s2, 0x28($sp) +/* C337A0 802422C0 AFB10024 */ sw $s1, 0x24($sp) +/* C337A4 802422C4 AFB00020 */ sw $s0, 0x20($sp) +/* C337A8 802422C8 8E720148 */ lw $s2, 0x148($s3) +/* C337AC 802422CC 00A0882D */ daddu $s1, $a1, $zero +/* C337B0 802422D0 86440008 */ lh $a0, 8($s2) +/* C337B4 802422D4 0C00EABB */ jal get_npc_unsafe +/* C337B8 802422D8 00C0802D */ daddu $s0, $a2, $zero +/* C337BC 802422DC 0200202D */ daddu $a0, $s0, $zero +/* C337C0 802422E0 0240282D */ daddu $a1, $s2, $zero +/* C337C4 802422E4 AFA00010 */ sw $zero, 0x10($sp) +/* C337C8 802422E8 8E260024 */ lw $a2, 0x24($s1) +/* C337CC 802422EC 8E270028 */ lw $a3, 0x28($s1) +/* C337D0 802422F0 0C01242D */ jal func_800490B4 +/* C337D4 802422F4 0040802D */ daddu $s0, $v0, $zero +/* C337D8 802422F8 1040000C */ beqz $v0, .L8024232C +/* C337DC 802422FC 00000000 */ nop +/* C337E0 80242300 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C337E4 80242304 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C337E8 80242308 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C337EC 8024230C C60E0040 */ lwc1 $f14, 0x40($s0) +/* C337F0 80242310 8C460028 */ lw $a2, 0x28($v0) +/* C337F4 80242314 0C00A720 */ jal atan2 +/* C337F8 80242318 8C470030 */ lw $a3, 0x30($v0) +/* C337FC 8024231C 2402000C */ addiu $v0, $zero, 0xc +/* C33800 80242320 E600000C */ swc1 $f0, 0xc($s0) +/* C33804 80242324 08090902 */ j .L80242408 +/* C33808 80242328 AE620070 */ sw $v0, 0x70($s3) +.L8024232C: +/* C3380C 8024232C C60C0038 */ lwc1 $f12, 0x38($s0) +/* C33810 80242330 8E4200D0 */ lw $v0, 0xd0($s2) +/* C33814 80242334 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C33818 80242338 C4440000 */ lwc1 $f4, ($v0) +/* C3381C 8024233C 46802120 */ cvt.s.w $f4, $f4 +/* C33820 80242340 44062000 */ mfc1 $a2, $f4 +/* C33824 80242344 C4440008 */ lwc1 $f4, 8($v0) +/* C33828 80242348 46802120 */ cvt.s.w $f4, $f4 +/* C3382C 8024234C 44072000 */ mfc1 $a3, $f4 +/* C33830 80242350 0C00A7B5 */ jal dist2D +/* C33834 80242354 00000000 */ nop +/* C33838 80242358 C6020018 */ lwc1 $f2, 0x18($s0) +/* C3383C 8024235C 4602003E */ c.le.s $f0, $f2 +/* C33840 80242360 00000000 */ nop +/* C33844 80242364 4500000B */ bc1f .L80242394 +/* C33848 80242368 00000000 */ nop +/* C3384C 8024236C 8E4200CC */ lw $v0, 0xcc($s2) +/* C33850 80242370 8C430000 */ lw $v1, ($v0) +/* C33854 80242374 2402000F */ addiu $v0, $zero, 0xf +/* C33858 80242378 A602008E */ sh $v0, 0x8e($s0) +/* C3385C 8024237C 24020032 */ addiu $v0, $zero, 0x32 +/* C33860 80242380 AE030028 */ sw $v1, 0x28($s0) +/* C33864 80242384 AE420088 */ sw $v0, 0x88($s2) +/* C33868 80242388 24020003 */ addiu $v0, $zero, 3 +/* C3386C 8024238C 08090902 */ j .L80242408 +/* C33870 80242390 AE620070 */ sw $v0, 0x70($s3) +.L80242394: +/* C33874 80242394 8602008C */ lh $v0, 0x8c($s0) +/* C33878 80242398 1440001B */ bnez $v0, .L80242408 +/* C3387C 8024239C 0200202D */ daddu $a0, $s0, $zero +/* C33880 802423A0 27A60018 */ addiu $a2, $sp, 0x18 +/* C33884 802423A4 3C0540A0 */ lui $a1, 0x40a0 +/* C33888 802423A8 C600000C */ lwc1 $f0, 0xc($s0) +/* C3388C 802423AC 0000382D */ daddu $a3, $zero, $zero +/* C33890 802423B0 E7A00018 */ swc1 $f0, 0x18($sp) +/* C33894 802423B4 AFA00010 */ sw $zero, 0x10($sp) +/* C33898 802423B8 0C0129E1 */ jal func_8004A784 +/* C3389C 802423BC AFA00014 */ sw $zero, 0x14($sp) +/* C338A0 802423C0 C7A00018 */ lwc1 $f0, 0x18($sp) +/* C338A4 802423C4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C338A8 802423C8 E600000C */ swc1 $f0, 0xc($s0) +/* C338AC 802423CC 8E4200D0 */ lw $v0, 0xd0($s2) +/* C338B0 802423D0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C338B4 802423D4 C4440000 */ lwc1 $f4, ($v0) +/* C338B8 802423D8 46802120 */ cvt.s.w $f4, $f4 +/* C338BC 802423DC 44062000 */ mfc1 $a2, $f4 +/* C338C0 802423E0 C4440008 */ lwc1 $f4, 8($v0) +/* C338C4 802423E4 46802120 */ cvt.s.w $f4, $f4 +/* C338C8 802423E8 44072000 */ mfc1 $a3, $f4 +/* C338CC 802423EC 0C00A720 */ jal atan2 +/* C338D0 802423F0 00000000 */ nop +/* C338D4 802423F4 8E050018 */ lw $a1, 0x18($s0) +/* C338D8 802423F8 44060000 */ mfc1 $a2, $f0 +/* C338DC 802423FC 0200202D */ daddu $a0, $s0, $zero +/* C338E0 80242400 0C00EA95 */ jal npc_move_heading +/* C338E4 80242404 AC86000C */ sw $a2, 0xc($a0) +.L80242408: +/* C338E8 80242408 8FBF0030 */ lw $ra, 0x30($sp) +/* C338EC 8024240C 8FB3002C */ lw $s3, 0x2c($sp) +/* C338F0 80242410 8FB20028 */ lw $s2, 0x28($sp) +/* C338F4 80242414 8FB10024 */ lw $s1, 0x24($sp) +/* C338F8 80242418 8FB00020 */ lw $s0, 0x20($sp) +/* C338FC 8024241C 03E00008 */ jr $ra +/* C33900 80242420 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480.s deleted file mode 100644 index 97ce1dffdf..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242480 -/* C33960 80242480 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C33964 80242484 AFB20038 */ sw $s2, 0x38($sp) -/* C33968 80242488 0080902D */ daddu $s2, $a0, $zero -/* C3396C 8024248C AFBF0048 */ sw $ra, 0x48($sp) -/* C33970 80242490 AFB50044 */ sw $s5, 0x44($sp) -/* C33974 80242494 AFB40040 */ sw $s4, 0x40($sp) -/* C33978 80242498 AFB3003C */ sw $s3, 0x3c($sp) -/* C3397C 8024249C AFB10034 */ sw $s1, 0x34($sp) -/* C33980 802424A0 AFB00030 */ sw $s0, 0x30($sp) -/* C33984 802424A4 8E510148 */ lw $s1, 0x148($s2) -/* C33988 802424A8 86240008 */ lh $a0, 8($s1) -/* C3398C 802424AC 0C00EABB */ jal get_npc_unsafe -/* C33990 802424B0 00A0802D */ daddu $s0, $a1, $zero -/* C33994 802424B4 8E43000C */ lw $v1, 0xc($s2) -/* C33998 802424B8 0240202D */ daddu $a0, $s2, $zero -/* C3399C 802424BC 8C650000 */ lw $a1, ($v1) -/* C339A0 802424C0 0C0B1EAF */ jal get_variable -/* C339A4 802424C4 0040A02D */ daddu $s4, $v0, $zero -/* C339A8 802424C8 AFA00010 */ sw $zero, 0x10($sp) -/* C339AC 802424CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339B0 802424D0 8C630030 */ lw $v1, 0x30($v1) -/* C339B4 802424D4 AFA30014 */ sw $v1, 0x14($sp) -/* C339B8 802424D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339BC 802424DC 8C63001C */ lw $v1, 0x1c($v1) -/* C339C0 802424E0 AFA30018 */ sw $v1, 0x18($sp) -/* C339C4 802424E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339C8 802424E8 8C630024 */ lw $v1, 0x24($v1) -/* C339CC 802424EC AFA3001C */ sw $v1, 0x1c($sp) -/* C339D0 802424F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339D4 802424F4 8C630028 */ lw $v1, 0x28($v1) -/* C339D8 802424F8 27B50010 */ addiu $s5, $sp, 0x10 -/* C339DC 802424FC AFA30020 */ sw $v1, 0x20($sp) -/* C339E0 80242500 8E2300D0 */ lw $v1, 0xd0($s1) -/* C339E4 80242504 3C014220 */ lui $at, 0x4220 -/* C339E8 80242508 44810000 */ mtc1 $at, $f0 -/* C339EC 8024250C 8C63002C */ lw $v1, 0x2c($v1) -/* C339F0 80242510 0040982D */ daddu $s3, $v0, $zero -/* C339F4 80242514 E7A00028 */ swc1 $f0, 0x28($sp) -/* C339F8 80242518 A7A0002C */ sh $zero, 0x2c($sp) -/* C339FC 8024251C 16000005 */ bnez $s0, .L80242534 -/* C33A00 80242520 AFA30024 */ sw $v1, 0x24($sp) -/* C33A04 80242524 8E2200B0 */ lw $v0, 0xb0($s1) -/* C33A08 80242528 30420004 */ andi $v0, $v0, 4 -/* C33A0C 8024252C 10400027 */ beqz $v0, .L802425CC -/* C33A10 80242530 00000000 */ nop -.L80242534: -/* C33A14 80242534 2402001E */ addiu $v0, $zero, 0x1e -/* C33A18 80242538 2404F7FF */ addiu $a0, $zero, -0x801 -/* C33A1C 8024253C AE400070 */ sw $zero, 0x70($s2) -/* C33A20 80242540 A682008E */ sh $v0, 0x8e($s4) -/* C33A24 80242544 8E2300CC */ lw $v1, 0xcc($s1) -/* C33A28 80242548 8E820000 */ lw $v0, ($s4) -/* C33A2C 8024254C 8C630028 */ lw $v1, 0x28($v1) -/* C33A30 80242550 00441024 */ and $v0, $v0, $a0 -/* C33A34 80242554 AE820000 */ sw $v0, ($s4) -/* C33A38 80242558 AE830028 */ sw $v1, 0x28($s4) -/* C33A3C 8024255C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C33A40 80242560 AE20006C */ sw $zero, 0x6c($s1) -/* C33A44 80242564 8C420034 */ lw $v0, 0x34($v0) -/* C33A48 80242568 14400006 */ bnez $v0, .L80242584 -/* C33A4C 8024256C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C33A50 80242570 8E820000 */ lw $v0, ($s4) -/* C33A54 80242574 2403FFF7 */ addiu $v1, $zero, -9 -/* C33A58 80242578 34420200 */ ori $v0, $v0, 0x200 -/* C33A5C 8024257C 08090964 */ j .L80242590 -/* C33A60 80242580 00431024 */ and $v0, $v0, $v1 -.L80242584: -/* C33A64 80242584 8E820000 */ lw $v0, ($s4) -/* C33A68 80242588 00431024 */ and $v0, $v0, $v1 -/* C33A6C 8024258C 34420008 */ ori $v0, $v0, 8 -.L80242590: -/* C33A70 80242590 AE820000 */ sw $v0, ($s4) -/* C33A74 80242594 8E2200B0 */ lw $v0, 0xb0($s1) -/* C33A78 80242598 30420004 */ andi $v0, $v0, 4 -/* C33A7C 8024259C 10400007 */ beqz $v0, .L802425BC -/* C33A80 802425A0 24020063 */ addiu $v0, $zero, 0x63 -/* C33A84 802425A4 AE420070 */ sw $v0, 0x70($s2) -/* C33A88 802425A8 24020028 */ addiu $v0, $zero, 0x28 -/* C33A8C 802425AC AE420074 */ sw $v0, 0x74($s2) -/* C33A90 802425B0 8E2200CC */ lw $v0, 0xcc($s1) -/* C33A94 802425B4 8C420000 */ lw $v0, ($v0) -/* C33A98 802425B8 AE820028 */ sw $v0, 0x28($s4) -.L802425BC: -/* C33A9C 802425BC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C33AA0 802425C0 2403FFFB */ addiu $v1, $zero, -5 -/* C33AA4 802425C4 00431024 */ and $v0, $v0, $v1 -/* C33AA8 802425C8 AE2200B0 */ sw $v0, 0xb0($s1) -.L802425CC: -/* C33AAC 802425CC 8E420070 */ lw $v0, 0x70($s2) -/* C33AB0 802425D0 2442FFF6 */ addiu $v0, $v0, -0xa -/* C33AB4 802425D4 2C420014 */ sltiu $v0, $v0, 0x14 -/* C33AB8 802425D8 10400009 */ beqz $v0, .L80242600 -/* C33ABC 802425DC 00000000 */ nop -/* C33AC0 802425E0 8E22006C */ lw $v0, 0x6c($s1) -/* C33AC4 802425E4 14400006 */ bnez $v0, .L80242600 -/* C33AC8 802425E8 00000000 */ nop -/* C33ACC 802425EC 0C090116 */ jal func_80240458 -/* C33AD0 802425F0 0240202D */ daddu $a0, $s2, $zero -/* C33AD4 802425F4 10400002 */ beqz $v0, .L80242600 -/* C33AD8 802425F8 2402001E */ addiu $v0, $zero, 0x1e -/* C33ADC 802425FC AE420070 */ sw $v0, 0x70($s2) -.L80242600: -/* C33AE0 80242600 8E430070 */ lw $v1, 0x70($s2) -/* C33AE4 80242604 2C620064 */ sltiu $v0, $v1, 0x64 -/* C33AE8 80242608 10400067 */ beqz $v0, .L802427A8 -/* C33AEC 8024260C 00031080 */ sll $v0, $v1, 2 -/* C33AF0 80242610 3C018024 */ lui $at, 0x8024 -/* C33AF4 80242614 00220821 */ addu $at, $at, $v0 -/* C33AF8 80242618 8C224EC0 */ lw $v0, 0x4ec0($at) -/* C33AFC 8024261C 00400008 */ jr $v0 -/* C33B00 80242620 00000000 */ nop -/* C33B04 80242624 0240202D */ daddu $a0, $s2, $zero -/* C33B08 80242628 0260282D */ daddu $a1, $s3, $zero -/* C33B0C 8024262C 0C09071F */ jal func_80241C7C -/* C33B10 80242630 02A0302D */ daddu $a2, $s5, $zero -/* C33B14 80242634 080909EA */ j .L802427A8 -/* C33B18 80242638 00000000 */ nop -/* C33B1C 8024263C 0240202D */ daddu $a0, $s2, $zero -/* C33B20 80242640 0260282D */ daddu $a1, $s3, $zero -/* C33B24 80242644 0C090741 */ jal func_80241D04 -/* C33B28 80242648 02A0302D */ daddu $a2, $s5, $zero -/* C33B2C 8024264C 080909EA */ j .L802427A8 -/* C33B30 80242650 00000000 */ nop -/* C33B34 80242654 0240202D */ daddu $a0, $s2, $zero -/* C33B38 80242658 0260282D */ daddu $a1, $s3, $zero -/* C33B3C 8024265C 0C0907EF */ jal func_80241FBC -/* C33B40 80242660 02A0302D */ daddu $a2, $s5, $zero -/* C33B44 80242664 080909EA */ j .L802427A8 -/* C33B48 80242668 00000000 */ nop -/* C33B4C 8024266C 0240202D */ daddu $a0, $s2, $zero -/* C33B50 80242670 0260282D */ daddu $a1, $s3, $zero -/* C33B54 80242674 0C090808 */ jal func_80242020 -/* C33B58 80242678 02A0302D */ daddu $a2, $s5, $zero -/* C33B5C 8024267C 080909EA */ j .L802427A8 -/* C33B60 80242680 00000000 */ nop -/* C33B64 80242684 0240202D */ daddu $a0, $s2, $zero -/* C33B68 80242688 0260282D */ daddu $a1, $s3, $zero -/* C33B6C 8024268C 0C090832 */ jal func_802420C8 -/* C33B70 80242690 02A0302D */ daddu $a2, $s5, $zero -/* C33B74 80242694 080909EA */ j .L802427A8 -/* C33B78 80242698 00000000 */ nop -/* C33B7C 8024269C 0240202D */ daddu $a0, $s2, $zero -/* C33B80 802426A0 0260282D */ daddu $a1, $s3, $zero -/* C33B84 802426A4 0C0127DF */ jal func_80049F7C -/* C33B88 802426A8 02A0302D */ daddu $a2, $s5, $zero -/* C33B8C 802426AC 8E430070 */ lw $v1, 0x70($s2) -/* C33B90 802426B0 2402000D */ addiu $v0, $zero, 0xd -/* C33B94 802426B4 1462003C */ bne $v1, $v0, .L802427A8 -/* C33B98 802426B8 00000000 */ nop -/* C33B9C 802426BC 0240202D */ daddu $a0, $s2, $zero -/* C33BA0 802426C0 0260282D */ daddu $a1, $s3, $zero -/* C33BA4 802426C4 0C012849 */ jal func_8004A124 -/* C33BA8 802426C8 02A0302D */ daddu $a2, $s5, $zero -/* C33BAC 802426CC 080909EA */ j .L802427A8 -/* C33BB0 802426D0 00000000 */ nop -/* C33BB4 802426D4 0240202D */ daddu $a0, $s2, $zero -/* C33BB8 802426D8 0260282D */ daddu $a1, $s3, $zero -/* C33BBC 802426DC 0C0128FA */ jal func_8004A3E8 -/* C33BC0 802426E0 02A0302D */ daddu $a2, $s5, $zero -/* C33BC4 802426E4 2402000F */ addiu $v0, $zero, 0xf -/* C33BC8 802426E8 A682008E */ sh $v0, 0x8e($s4) -/* C33BCC 802426EC 24020028 */ addiu $v0, $zero, 0x28 -/* C33BD0 802426F0 AE220088 */ sw $v0, 0x88($s1) -/* C33BD4 802426F4 24020003 */ addiu $v0, $zero, 3 -/* C33BD8 802426F8 080909EA */ j .L802427A8 -/* C33BDC 802426FC AE420070 */ sw $v0, 0x70($s2) -/* C33BE0 80242700 0C090094 */ jal func_80240250 -/* C33BE4 80242704 0240202D */ daddu $a0, $s2, $zero -/* C33BE8 80242708 8E430070 */ lw $v1, 0x70($s2) -/* C33BEC 8024270C 2402001F */ addiu $v0, $zero, 0x1f -/* C33BF0 80242710 14620025 */ bne $v1, $v0, .L802427A8 -/* C33BF4 80242714 00000000 */ nop -/* C33BF8 80242718 0C0900AF */ jal func_802402BC -/* C33BFC 8024271C 0240202D */ daddu $a0, $s2, $zero -/* C33C00 80242720 8E430070 */ lw $v1, 0x70($s2) -/* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 -/* C33C08 80242728 1462001F */ bne $v1, $v0, .L802427A8 -/* C33C0C 8024272C 00000000 */ nop -/* C33C10 80242730 0C0900CB */ jal func_8024032C -/* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero -/* C33C18 80242738 080909EA */ j .L802427A8 -/* C33C1C 8024273C 00000000 */ nop -/* C33C20 80242740 0C090101 */ jal func_80240404 -/* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero -/* C33C28 80242748 080909EA */ j .L802427A8 -/* C33C2C 8024274C 00000000 */ nop -/* C33C30 80242750 0240202D */ daddu $a0, $s2, $zero -/* C33C34 80242754 0260282D */ daddu $a1, $s3, $zero -/* C33C38 80242758 0C090880 */ jal func_80242200 -/* C33C3C 8024275C 02A0302D */ daddu $a2, $s5, $zero -/* C33C40 80242760 8E430070 */ lw $v1, 0x70($s2) -/* C33C44 80242764 24020029 */ addiu $v0, $zero, 0x29 -/* C33C48 80242768 1462000F */ bne $v1, $v0, .L802427A8 -/* C33C4C 8024276C 00000000 */ nop -/* C33C50 80242770 0240202D */ daddu $a0, $s2, $zero -/* C33C54 80242774 0260282D */ daddu $a1, $s3, $zero -/* C33C58 80242778 0C0908AB */ jal func_802422AC -/* C33C5C 8024277C 02A0302D */ daddu $a2, $s5, $zero -/* C33C60 80242780 080909EA */ j .L802427A8 -/* C33C64 80242784 00000000 */ nop -/* C33C68 80242788 0240202D */ daddu $a0, $s2, $zero -/* C33C6C 8024278C 0260282D */ daddu $a1, $s3, $zero -/* C33C70 80242790 0C090909 */ jal func_80242424 -/* C33C74 80242794 02A0302D */ daddu $a2, $s5, $zero -/* C33C78 80242798 080909EA */ j .L802427A8 -/* C33C7C 8024279C 00000000 */ nop -/* C33C80 802427A0 0C0129CF */ jal func_8004A73C -/* C33C84 802427A4 0240202D */ daddu $a0, $s2, $zero -.L802427A8: -/* C33C88 802427A8 8FBF0048 */ lw $ra, 0x48($sp) -/* C33C8C 802427AC 8FB50044 */ lw $s5, 0x44($sp) -/* C33C90 802427B0 8FB40040 */ lw $s4, 0x40($sp) -/* C33C94 802427B4 8FB3003C */ lw $s3, 0x3c($sp) -/* C33C98 802427B8 8FB20038 */ lw $s2, 0x38($sp) -/* C33C9C 802427BC 8FB10034 */ lw $s1, 0x34($sp) -/* C33CA0 802427C0 8FB00030 */ lw $s0, 0x30($sp) -/* C33CA4 802427C4 0000102D */ daddu $v0, $zero, $zero -/* C33CA8 802427C8 03E00008 */ jr $ra -/* C33CAC 802427CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s new file mode 100644 index 0000000000..7272e21a5c --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_03/C31730/func_80242480_C33960.s @@ -0,0 +1,223 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242480_C33960 +/* C33960 80242480 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C33964 80242484 AFB20038 */ sw $s2, 0x38($sp) +/* C33968 80242488 0080902D */ daddu $s2, $a0, $zero +/* C3396C 8024248C AFBF0048 */ sw $ra, 0x48($sp) +/* C33970 80242490 AFB50044 */ sw $s5, 0x44($sp) +/* C33974 80242494 AFB40040 */ sw $s4, 0x40($sp) +/* C33978 80242498 AFB3003C */ sw $s3, 0x3c($sp) +/* C3397C 8024249C AFB10034 */ sw $s1, 0x34($sp) +/* C33980 802424A0 AFB00030 */ sw $s0, 0x30($sp) +/* C33984 802424A4 8E510148 */ lw $s1, 0x148($s2) +/* C33988 802424A8 86240008 */ lh $a0, 8($s1) +/* C3398C 802424AC 0C00EABB */ jal get_npc_unsafe +/* C33990 802424B0 00A0802D */ daddu $s0, $a1, $zero +/* C33994 802424B4 8E43000C */ lw $v1, 0xc($s2) +/* C33998 802424B8 0240202D */ daddu $a0, $s2, $zero +/* C3399C 802424BC 8C650000 */ lw $a1, ($v1) +/* C339A0 802424C0 0C0B1EAF */ jal get_variable +/* C339A4 802424C4 0040A02D */ daddu $s4, $v0, $zero +/* C339A8 802424C8 AFA00010 */ sw $zero, 0x10($sp) +/* C339AC 802424CC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C339B0 802424D0 8C630030 */ lw $v1, 0x30($v1) +/* C339B4 802424D4 AFA30014 */ sw $v1, 0x14($sp) +/* C339B8 802424D8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C339BC 802424DC 8C63001C */ lw $v1, 0x1c($v1) +/* C339C0 802424E0 AFA30018 */ sw $v1, 0x18($sp) +/* C339C4 802424E4 8E2300D0 */ lw $v1, 0xd0($s1) +/* C339C8 802424E8 8C630024 */ lw $v1, 0x24($v1) +/* C339CC 802424EC AFA3001C */ sw $v1, 0x1c($sp) +/* C339D0 802424F0 8E2300D0 */ lw $v1, 0xd0($s1) +/* C339D4 802424F4 8C630028 */ lw $v1, 0x28($v1) +/* C339D8 802424F8 27B50010 */ addiu $s5, $sp, 0x10 +/* C339DC 802424FC AFA30020 */ sw $v1, 0x20($sp) +/* C339E0 80242500 8E2300D0 */ lw $v1, 0xd0($s1) +/* C339E4 80242504 3C014220 */ lui $at, 0x4220 +/* C339E8 80242508 44810000 */ mtc1 $at, $f0 +/* C339EC 8024250C 8C63002C */ lw $v1, 0x2c($v1) +/* C339F0 80242510 0040982D */ daddu $s3, $v0, $zero +/* C339F4 80242514 E7A00028 */ swc1 $f0, 0x28($sp) +/* C339F8 80242518 A7A0002C */ sh $zero, 0x2c($sp) +/* C339FC 8024251C 16000005 */ bnez $s0, .L80242534 +/* C33A00 80242520 AFA30024 */ sw $v1, 0x24($sp) +/* C33A04 80242524 8E2200B0 */ lw $v0, 0xb0($s1) +/* C33A08 80242528 30420004 */ andi $v0, $v0, 4 +/* C33A0C 8024252C 10400027 */ beqz $v0, .L802425CC +/* C33A10 80242530 00000000 */ nop +.L80242534: +/* C33A14 80242534 2402001E */ addiu $v0, $zero, 0x1e +/* C33A18 80242538 2404F7FF */ addiu $a0, $zero, -0x801 +/* C33A1C 8024253C AE400070 */ sw $zero, 0x70($s2) +/* C33A20 80242540 A682008E */ sh $v0, 0x8e($s4) +/* C33A24 80242544 8E2300CC */ lw $v1, 0xcc($s1) +/* C33A28 80242548 8E820000 */ lw $v0, ($s4) +/* C33A2C 8024254C 8C630028 */ lw $v1, 0x28($v1) +/* C33A30 80242550 00441024 */ and $v0, $v0, $a0 +/* C33A34 80242554 AE820000 */ sw $v0, ($s4) +/* C33A38 80242558 AE830028 */ sw $v1, 0x28($s4) +/* C33A3C 8024255C 8E2200D0 */ lw $v0, 0xd0($s1) +/* C33A40 80242560 AE20006C */ sw $zero, 0x6c($s1) +/* C33A44 80242564 8C420034 */ lw $v0, 0x34($v0) +/* C33A48 80242568 14400006 */ bnez $v0, .L80242584 +/* C33A4C 8024256C 2403FDFF */ addiu $v1, $zero, -0x201 +/* C33A50 80242570 8E820000 */ lw $v0, ($s4) +/* C33A54 80242574 2403FFF7 */ addiu $v1, $zero, -9 +/* C33A58 80242578 34420200 */ ori $v0, $v0, 0x200 +/* C33A5C 8024257C 08090964 */ j .L80242590 +/* C33A60 80242580 00431024 */ and $v0, $v0, $v1 +.L80242584: +/* C33A64 80242584 8E820000 */ lw $v0, ($s4) +/* C33A68 80242588 00431024 */ and $v0, $v0, $v1 +/* C33A6C 8024258C 34420008 */ ori $v0, $v0, 8 +.L80242590: +/* C33A70 80242590 AE820000 */ sw $v0, ($s4) +/* C33A74 80242594 8E2200B0 */ lw $v0, 0xb0($s1) +/* C33A78 80242598 30420004 */ andi $v0, $v0, 4 +/* C33A7C 8024259C 10400007 */ beqz $v0, .L802425BC +/* C33A80 802425A0 24020063 */ addiu $v0, $zero, 0x63 +/* C33A84 802425A4 AE420070 */ sw $v0, 0x70($s2) +/* C33A88 802425A8 24020028 */ addiu $v0, $zero, 0x28 +/* C33A8C 802425AC AE420074 */ sw $v0, 0x74($s2) +/* C33A90 802425B0 8E2200CC */ lw $v0, 0xcc($s1) +/* C33A94 802425B4 8C420000 */ lw $v0, ($v0) +/* C33A98 802425B8 AE820028 */ sw $v0, 0x28($s4) +.L802425BC: +/* C33A9C 802425BC 8E2200B0 */ lw $v0, 0xb0($s1) +/* C33AA0 802425C0 2403FFFB */ addiu $v1, $zero, -5 +/* C33AA4 802425C4 00431024 */ and $v0, $v0, $v1 +/* C33AA8 802425C8 AE2200B0 */ sw $v0, 0xb0($s1) +.L802425CC: +/* C33AAC 802425CC 8E420070 */ lw $v0, 0x70($s2) +/* C33AB0 802425D0 2442FFF6 */ addiu $v0, $v0, -0xa +/* C33AB4 802425D4 2C420014 */ sltiu $v0, $v0, 0x14 +/* C33AB8 802425D8 10400009 */ beqz $v0, .L80242600 +/* C33ABC 802425DC 00000000 */ nop +/* C33AC0 802425E0 8E22006C */ lw $v0, 0x6c($s1) +/* C33AC4 802425E4 14400006 */ bnez $v0, .L80242600 +/* C33AC8 802425E8 00000000 */ nop +/* C33ACC 802425EC 0C090116 */ jal func_80240458_C31938 +/* C33AD0 802425F0 0240202D */ daddu $a0, $s2, $zero +/* C33AD4 802425F4 10400002 */ beqz $v0, .L80242600 +/* C33AD8 802425F8 2402001E */ addiu $v0, $zero, 0x1e +/* C33ADC 802425FC AE420070 */ sw $v0, 0x70($s2) +.L80242600: +/* C33AE0 80242600 8E430070 */ lw $v1, 0x70($s2) +/* C33AE4 80242604 2C620064 */ sltiu $v0, $v1, 0x64 +/* C33AE8 80242608 10400067 */ beqz $v0, .L802427A8 +/* C33AEC 8024260C 00031080 */ sll $v0, $v1, 2 +/* C33AF0 80242610 3C018024 */ lui $at, 0x8024 +/* C33AF4 80242614 00220821 */ addu $at, $at, $v0 +/* C33AF8 80242618 8C224EC0 */ lw $v0, 0x4ec0($at) +/* C33AFC 8024261C 00400008 */ jr $v0 +/* C33B00 80242620 00000000 */ nop +/* C33B04 80242624 0240202D */ daddu $a0, $s2, $zero +/* C33B08 80242628 0260282D */ daddu $a1, $s3, $zero +/* C33B0C 8024262C 0C09071F */ jal func_80241C7C_C3315C +/* C33B10 80242630 02A0302D */ daddu $a2, $s5, $zero +/* C33B14 80242634 080909EA */ j .L802427A8 +/* C33B18 80242638 00000000 */ nop +/* C33B1C 8024263C 0240202D */ daddu $a0, $s2, $zero +/* C33B20 80242640 0260282D */ daddu $a1, $s3, $zero +/* C33B24 80242644 0C090741 */ jal func_80241D04_C331E4 +/* C33B28 80242648 02A0302D */ daddu $a2, $s5, $zero +/* C33B2C 8024264C 080909EA */ j .L802427A8 +/* C33B30 80242650 00000000 */ nop +/* C33B34 80242654 0240202D */ daddu $a0, $s2, $zero +/* C33B38 80242658 0260282D */ daddu $a1, $s3, $zero +/* C33B3C 8024265C 0C0907EF */ jal func_80241FBC_C3349C +/* C33B40 80242660 02A0302D */ daddu $a2, $s5, $zero +/* C33B44 80242664 080909EA */ j .L802427A8 +/* C33B48 80242668 00000000 */ nop +/* C33B4C 8024266C 0240202D */ daddu $a0, $s2, $zero +/* C33B50 80242670 0260282D */ daddu $a1, $s3, $zero +/* C33B54 80242674 0C090808 */ jal func_80242020_C33500 +/* C33B58 80242678 02A0302D */ daddu $a2, $s5, $zero +/* C33B5C 8024267C 080909EA */ j .L802427A8 +/* C33B60 80242680 00000000 */ nop +/* C33B64 80242684 0240202D */ daddu $a0, $s2, $zero +/* C33B68 80242688 0260282D */ daddu $a1, $s3, $zero +/* C33B6C 8024268C 0C090832 */ jal func_802420C8_C335A8 +/* C33B70 80242690 02A0302D */ daddu $a2, $s5, $zero +/* C33B74 80242694 080909EA */ j .L802427A8 +/* C33B78 80242698 00000000 */ nop +/* C33B7C 8024269C 0240202D */ daddu $a0, $s2, $zero +/* C33B80 802426A0 0260282D */ daddu $a1, $s3, $zero +/* C33B84 802426A4 0C0127DF */ jal func_80049F7C +/* C33B88 802426A8 02A0302D */ daddu $a2, $s5, $zero +/* C33B8C 802426AC 8E430070 */ lw $v1, 0x70($s2) +/* C33B90 802426B0 2402000D */ addiu $v0, $zero, 0xd +/* C33B94 802426B4 1462003C */ bne $v1, $v0, .L802427A8 +/* C33B98 802426B8 00000000 */ nop +/* C33B9C 802426BC 0240202D */ daddu $a0, $s2, $zero +/* C33BA0 802426C0 0260282D */ daddu $a1, $s3, $zero +/* C33BA4 802426C4 0C012849 */ jal func_8004A124 +/* C33BA8 802426C8 02A0302D */ daddu $a2, $s5, $zero +/* C33BAC 802426CC 080909EA */ j .L802427A8 +/* C33BB0 802426D0 00000000 */ nop +/* C33BB4 802426D4 0240202D */ daddu $a0, $s2, $zero +/* C33BB8 802426D8 0260282D */ daddu $a1, $s3, $zero +/* C33BBC 802426DC 0C0128FA */ jal func_8004A3E8 +/* C33BC0 802426E0 02A0302D */ daddu $a2, $s5, $zero +/* C33BC4 802426E4 2402000F */ addiu $v0, $zero, 0xf +/* C33BC8 802426E8 A682008E */ sh $v0, 0x8e($s4) +/* C33BCC 802426EC 24020028 */ addiu $v0, $zero, 0x28 +/* C33BD0 802426F0 AE220088 */ sw $v0, 0x88($s1) +/* C33BD4 802426F4 24020003 */ addiu $v0, $zero, 3 +/* C33BD8 802426F8 080909EA */ j .L802427A8 +/* C33BDC 802426FC AE420070 */ sw $v0, 0x70($s2) +/* C33BE0 80242700 0C090094 */ jal func_80240250_C31730 +/* C33BE4 80242704 0240202D */ daddu $a0, $s2, $zero +/* C33BE8 80242708 8E430070 */ lw $v1, 0x70($s2) +/* C33BEC 8024270C 2402001F */ addiu $v0, $zero, 0x1f +/* C33BF0 80242710 14620025 */ bne $v1, $v0, .L802427A8 +/* C33BF4 80242714 00000000 */ nop +/* C33BF8 80242718 0C0900AF */ jal func_802402BC_C3179C +/* C33BFC 8024271C 0240202D */ daddu $a0, $s2, $zero +/* C33C00 80242720 8E430070 */ lw $v1, 0x70($s2) +/* C33C04 80242724 24020020 */ addiu $v0, $zero, 0x20 +/* C33C08 80242728 1462001F */ bne $v1, $v0, .L802427A8 +/* C33C0C 8024272C 00000000 */ nop +/* C33C10 80242730 0C0900CB */ jal func_8024032C_C3180C +/* C33C14 80242734 0240202D */ daddu $a0, $s2, $zero +/* C33C18 80242738 080909EA */ j .L802427A8 +/* C33C1C 8024273C 00000000 */ nop +/* C33C20 80242740 0C090101 */ jal func_80240404_C318E4 +/* C33C24 80242744 0240202D */ daddu $a0, $s2, $zero +/* C33C28 80242748 080909EA */ j .L802427A8 +/* C33C2C 8024274C 00000000 */ nop +/* C33C30 80242750 0240202D */ daddu $a0, $s2, $zero +/* C33C34 80242754 0260282D */ daddu $a1, $s3, $zero +/* C33C38 80242758 0C090880 */ jal func_80242200_C336E0 +/* C33C3C 8024275C 02A0302D */ daddu $a2, $s5, $zero +/* C33C40 80242760 8E430070 */ lw $v1, 0x70($s2) +/* C33C44 80242764 24020029 */ addiu $v0, $zero, 0x29 +/* C33C48 80242768 1462000F */ bne $v1, $v0, .L802427A8 +/* C33C4C 8024276C 00000000 */ nop +/* C33C50 80242770 0240202D */ daddu $a0, $s2, $zero +/* C33C54 80242774 0260282D */ daddu $a1, $s3, $zero +/* C33C58 80242778 0C0908AB */ jal func_802422AC_C3378C +/* C33C5C 8024277C 02A0302D */ daddu $a2, $s5, $zero +/* C33C60 80242780 080909EA */ j .L802427A8 +/* C33C64 80242784 00000000 */ nop +/* C33C68 80242788 0240202D */ daddu $a0, $s2, $zero +/* C33C6C 8024278C 0260282D */ daddu $a1, $s3, $zero +/* C33C70 80242790 0C090909 */ jal func_80242424_C33904 +/* C33C74 80242794 02A0302D */ daddu $a2, $s5, $zero +/* C33C78 80242798 080909EA */ j .L802427A8 +/* C33C7C 8024279C 00000000 */ nop +/* C33C80 802427A0 0C0129CF */ jal func_8004A73C +/* C33C84 802427A4 0240202D */ daddu $a0, $s2, $zero +.L802427A8: +/* C33C88 802427A8 8FBF0048 */ lw $ra, 0x48($sp) +/* C33C8C 802427AC 8FB50044 */ lw $s5, 0x44($sp) +/* C33C90 802427B0 8FB40040 */ lw $s4, 0x40($sp) +/* C33C94 802427B4 8FB3003C */ lw $s3, 0x3c($sp) +/* C33C98 802427B8 8FB20038 */ lw $s2, 0x38($sp) +/* C33C9C 802427BC 8FB10034 */ lw $s1, 0x34($sp) +/* C33CA0 802427C0 8FB00030 */ lw $s0, 0x30($sp) +/* C33CA4 802427C4 0000102D */ daddu $v0, $zero, $zero +/* C33CA8 802427C8 03E00008 */ jr $ra +/* C33CAC 802427CC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s index d4315cec8d..99dc044e13 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024130C_C3783C.s @@ -46,7 +46,7 @@ glabel func_8024130C_C3783C /* C378E0 802413B0 02A0202D */ daddu $a0, $s5, $zero /* C378E4 802413B4 0240282D */ daddu $a1, $s2, $zero /* C378E8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* C378EC 802413BC 0C09047A */ jal func_802411E8 +/* C378EC 802413BC 0C09047A */ jal func_802411E8_C37718 /* C378F0 802413C0 0200382D */ daddu $a3, $s0, $zero .L802413C4: /* C378F4 802413C4 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_8024130C_C3783C /* C37944 80241414 00000000 */ nop /* C37948 80241418 0280202D */ daddu $a0, $s4, $zero /* C3794C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* C37950 80241420 0C090000 */ jal func_80240000 +/* C37950 80241420 0C090000 */ jal func_80240000_C36530 /* C37954 80241424 0260302D */ daddu $a2, $s3, $zero /* C37958 80241428 0280202D */ daddu $a0, $s4, $zero /* C3795C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* C37960 80241430 0C09006C */ jal func_802401B0 +/* C37960 80241430 0C09006C */ jal func_802401B0_C366E0 /* C37964 80241434 0260302D */ daddu $a2, $s3, $zero /* C37968 80241438 08090535 */ j .L802414D4 /* C3796C 8024143C 0000102D */ daddu $v0, $zero, $zero /* C37970 80241440 0280202D */ daddu $a0, $s4, $zero /* C37974 80241444 0200282D */ daddu $a1, $s0, $zero -/* C37978 80241448 0C0901F6 */ jal func_802407D8 +/* C37978 80241448 0C0901F6 */ jal func_802407D8_C36D08 /* C3797C 8024144C 0260302D */ daddu $a2, $s3, $zero /* C37980 80241450 0280202D */ daddu $a0, $s4, $zero /* C37984 80241454 0200282D */ daddu $a1, $s0, $zero -/* C37988 80241458 0C090226 */ jal func_80240898 +/* C37988 80241458 0C090226 */ jal func_80240898_C36DC8 /* C3798C 8024145C 0260302D */ daddu $a2, $s3, $zero /* C37990 80241460 08090535 */ j .L802414D4 /* C37994 80241464 0000102D */ daddu $v0, $zero, $zero /* C37998 80241468 0280202D */ daddu $a0, $s4, $zero /* C3799C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* C379A0 80241470 0C0902F7 */ jal func_80240BDC +/* C379A0 80241470 0C0902F7 */ jal func_80240BDC_C3710C /* C379A4 80241474 0260302D */ daddu $a2, $s3, $zero /* C379A8 80241478 0280202D */ daddu $a0, $s4, $zero /* C379AC 8024147C 0200282D */ daddu $a1, $s0, $zero -/* C379B0 80241480 0C090315 */ jal func_80240C54 +/* C379B0 80241480 0C090315 */ jal func_80240C54_C37184 /* C379B4 80241484 0260302D */ daddu $a2, $s3, $zero /* C379B8 80241488 08090535 */ j .L802414D4 /* C379BC 8024148C 0000102D */ daddu $v0, $zero, $zero /* C379C0 80241490 0280202D */ daddu $a0, $s4, $zero /* C379C4 80241494 0200282D */ daddu $a1, $s0, $zero -/* C379C8 80241498 0C090330 */ jal func_80240CC0 +/* C379C8 80241498 0C090330 */ jal func_80240CC0_C371F0 /* C379CC 8024149C 0260302D */ daddu $a2, $s3, $zero /* C379D0 802414A0 08090535 */ j .L802414D4 /* C379D4 802414A4 0000102D */ daddu $v0, $zero, $zero /* C379D8 802414A8 0280202D */ daddu $a0, $s4, $zero /* C379DC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* C379E0 802414B0 0C09037D */ jal func_80240DF4 +/* C379E0 802414B0 0C09037D */ jal func_80240DF4_C37324 /* C379E4 802414B4 0260302D */ daddu $a2, $s3, $zero /* C379E8 802414B8 08090535 */ j .L802414D4 /* C379EC 802414BC 0000102D */ daddu $v0, $zero, $zero /* C379F0 802414C0 0280202D */ daddu $a0, $s4, $zero /* C379F4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* C379F8 802414C8 0C090396 */ jal func_80240E58 +/* C379F8 802414C8 0C090396 */ jal func_80240E58_C37388 /* C379FC 802414CC 0260302D */ daddu $a2, $s3, $zero .L802414D0: /* C37A00 802414D0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8.s deleted file mode 100644 index bcf98b00a7..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8.s +++ /dev/null @@ -1,177 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417F8 -/* C37D28 802417F8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C37D2C 802417FC AFB40040 */ sw $s4, 0x40($sp) -/* C37D30 80241800 0080A02D */ daddu $s4, $a0, $zero -/* C37D34 80241804 AFBF0044 */ sw $ra, 0x44($sp) -/* C37D38 80241808 AFB3003C */ sw $s3, 0x3c($sp) -/* C37D3C 8024180C AFB20038 */ sw $s2, 0x38($sp) -/* C37D40 80241810 AFB10034 */ sw $s1, 0x34($sp) -/* C37D44 80241814 AFB00030 */ sw $s0, 0x30($sp) -/* C37D48 80241818 8E930148 */ lw $s3, 0x148($s4) -/* C37D4C 8024181C 00A0802D */ daddu $s0, $a1, $zero -/* C37D50 80241820 86640008 */ lh $a0, 8($s3) -/* C37D54 80241824 0C00EABB */ jal get_npc_unsafe -/* C37D58 80241828 00C0882D */ daddu $s1, $a2, $zero -/* C37D5C 8024182C 3C048000 */ lui $a0, 0x8000 -/* C37D60 80241830 0040902D */ daddu $s2, $v0, $zero -/* C37D64 80241834 C6400040 */ lwc1 $f0, 0x40($s2) -/* C37D68 80241838 34840011 */ ori $a0, $a0, 0x11 -/* C37D6C 8024183C E7A00010 */ swc1 $f0, 0x10($sp) -/* C37D70 80241840 8E460038 */ lw $a2, 0x38($s2) -/* C37D74 80241844 8E47003C */ lw $a3, 0x3c($s2) -/* C37D78 80241848 0C05267B */ jal func_801499EC -/* C37D7C 8024184C 24050002 */ addiu $a1, $zero, 2 -/* C37D80 80241850 0220202D */ daddu $a0, $s1, $zero -/* C37D84 80241854 24020001 */ addiu $v0, $zero, 1 -/* C37D88 80241858 AFA20010 */ sw $v0, 0x10($sp) -/* C37D8C 8024185C 8E060024 */ lw $a2, 0x24($s0) -/* C37D90 80241860 8E070028 */ lw $a3, 0x28($s0) -/* C37D94 80241864 0C01242D */ jal func_800490B4 -/* C37D98 80241868 0260282D */ daddu $a1, $s3, $zero -/* C37D9C 8024186C 1440000B */ bnez $v0, .L8024189C -/* C37DA0 80241870 3C04FFDF */ lui $a0, 0xffdf -/* C37DA4 80241874 8E62006C */ lw $v0, 0x6c($s3) -/* C37DA8 80241878 2403FEFF */ addiu $v1, $zero, -0x101 -/* C37DAC 8024187C 00431024 */ and $v0, $v0, $v1 -/* C37DB0 80241880 AE62006C */ sw $v0, 0x6c($s3) -/* C37DB4 80241884 8E420000 */ lw $v0, ($s2) -/* C37DB8 80241888 3484FFFF */ ori $a0, $a0, 0xffff -/* C37DBC 8024188C AE400048 */ sw $zero, 0x48($s2) -/* C37DC0 80241890 00441024 */ and $v0, $v0, $a0 -/* C37DC4 80241894 0809069B */ j .L80241A6C -/* C37DC8 80241898 AE420000 */ sw $v0, ($s2) -.L8024189C: -/* C37DCC 8024189C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C37DD0 802418A0 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C37DD4 802418A4 C6440048 */ lwc1 $f4, 0x48($s2) -/* C37DD8 802418A8 3C0141C8 */ lui $at, 0x41c8 -/* C37DDC 802418AC 44810000 */ mtc1 $at, $f0 -/* C37DE0 802418B0 8E020000 */ lw $v0, ($s0) -/* C37DE4 802418B4 46002100 */ add.s $f4, $f4, $f0 -/* C37DE8 802418B8 C4420028 */ lwc1 $f2, 0x28($v0) -/* C37DEC 802418BC 3C014000 */ lui $at, 0x4000 -/* C37DF0 802418C0 44810000 */ mtc1 $at, $f0 -/* C37DF4 802418C4 E6420038 */ swc1 $f2, 0x38($s2) -/* C37DF8 802418C8 C4420030 */ lwc1 $f2, 0x30($v0) -/* C37DFC 802418CC 46001080 */ add.s $f2, $f2, $f0 -/* C37E00 802418D0 3C018024 */ lui $at, 0x8024 -/* C37E04 802418D4 D4264448 */ ldc1 $f6, 0x4448($at) -/* C37E08 802418D8 46002021 */ cvt.d.s $f0, $f4 -/* C37E0C 802418DC 4620303C */ c.lt.d $f6, $f0 -/* C37E10 802418E0 E6440048 */ swc1 $f4, 0x48($s2) -/* C37E14 802418E4 45000004 */ bc1f .L802418F8 -/* C37E18 802418E8 E6420040 */ swc1 $f2, 0x40($s2) -/* C37E1C 802418EC 46260001 */ sub.d $f0, $f0, $f6 -/* C37E20 802418F0 46200020 */ cvt.s.d $f0, $f0 -/* C37E24 802418F4 E6400048 */ swc1 $f0, 0x48($s2) -.L802418F8: -/* C37E28 802418F8 3C02B60B */ lui $v0, 0xb60b -/* C37E2C 802418FC C6400048 */ lwc1 $f0, 0x48($s2) -/* C37E30 80241900 344260B7 */ ori $v0, $v0, 0x60b7 -/* C37E34 80241904 4600020D */ trunc.w.s $f8, $f0 -/* C37E38 80241908 44044000 */ mfc1 $a0, $f8 -/* C37E3C 8024190C 00000000 */ nop -/* C37E40 80241910 00820018 */ mult $a0, $v0 -/* C37E44 80241914 00041FC3 */ sra $v1, $a0, 0x1f -/* C37E48 80241918 00004010 */ mfhi $t0 -/* C37E4C 8024191C 01041021 */ addu $v0, $t0, $a0 -/* C37E50 80241920 000211C3 */ sra $v0, $v0, 7 -/* C37E54 80241924 00431023 */ subu $v0, $v0, $v1 -/* C37E58 80241928 00021840 */ sll $v1, $v0, 1 -/* C37E5C 8024192C 00621821 */ addu $v1, $v1, $v0 -/* C37E60 80241930 00031100 */ sll $v0, $v1, 4 -/* C37E64 80241934 00431023 */ subu $v0, $v0, $v1 -/* C37E68 80241938 00021080 */ sll $v0, $v0, 2 -/* C37E6C 8024193C 00822023 */ subu $a0, $a0, $v0 -/* C37E70 80241940 00042400 */ sll $a0, $a0, 0x10 -/* C37E74 80241944 0C00A4F5 */ jal cosine -/* C37E78 80241948 00042403 */ sra $a0, $a0, 0x10 -/* C37E7C 8024194C 3C014260 */ lui $at, 0x4260 -/* C37E80 80241950 44811000 */ mtc1 $at, $f2 -/* C37E84 80241954 00000000 */ nop -/* C37E88 80241958 46020002 */ mul.s $f0, $f0, $f2 -/* C37E8C 8024195C 00000000 */ nop -/* C37E90 80241960 24050006 */ addiu $a1, $zero, 6 -/* C37E94 80241964 3C01437F */ lui $at, 0x437f -/* C37E98 80241968 44811000 */ mtc1 $at, $f2 -/* C37E9C 8024196C 240200FF */ addiu $v0, $zero, 0xff -/* C37EA0 80241970 46001081 */ sub.s $f2, $f2, $f0 -/* C37EA4 80241974 AFA20014 */ sw $v0, 0x14($sp) -/* C37EA8 80241978 AFA00018 */ sw $zero, 0x18($sp) -/* C37EAC 8024197C 4600120D */ trunc.w.s $f8, $f2 -/* C37EB0 80241980 44064000 */ mfc1 $a2, $f8 -/* C37EB4 80241984 00000000 */ nop -/* C37EB8 80241988 AFA60010 */ sw $a2, 0x10($sp) -/* C37EBC 8024198C 8E440024 */ lw $a0, 0x24($s2) -/* C37EC0 80241990 0C0B7A25 */ jal func_802DE894 -/* C37EC4 80241994 00C0382D */ daddu $a3, $a2, $zero -/* C37EC8 80241998 27A50020 */ addiu $a1, $sp, 0x20 -/* C37ECC 8024199C 27A60024 */ addiu $a2, $sp, 0x24 -/* C37ED0 802419A0 8E020000 */ lw $v0, ($s0) -/* C37ED4 802419A4 3C01447A */ lui $at, 0x447a -/* C37ED8 802419A8 44810000 */ mtc1 $at, $f0 -/* C37EDC 802419AC C4420028 */ lwc1 $f2, 0x28($v0) -/* C37EE0 802419B0 C444002C */ lwc1 $f4, 0x2c($v0) -/* C37EE4 802419B4 C4460030 */ lwc1 $f6, 0x30($v0) -/* C37EE8 802419B8 27A2002C */ addiu $v0, $sp, 0x2c -/* C37EEC 802419BC E7A0002C */ swc1 $f0, 0x2c($sp) -/* C37EF0 802419C0 E7A20020 */ swc1 $f2, 0x20($sp) -/* C37EF4 802419C4 E7A40024 */ swc1 $f4, 0x24($sp) -/* C37EF8 802419C8 E7A60028 */ swc1 $f6, 0x28($sp) -/* C37EFC 802419CC AFA20010 */ sw $v0, 0x10($sp) -/* C37F00 802419D0 8E440080 */ lw $a0, 0x80($s2) -/* C37F04 802419D4 0C0372DF */ jal func_800DCB7C -/* C37F08 802419D8 27A70028 */ addiu $a3, $sp, 0x28 -/* C37F0C 802419DC C644003C */ lwc1 $f4, 0x3c($s2) -/* C37F10 802419E0 C7A00024 */ lwc1 $f0, 0x24($sp) -/* C37F14 802419E4 46002001 */ sub.s $f0, $f4, $f0 -/* C37F18 802419E8 3C014038 */ lui $at, 0x4038 -/* C37F1C 802419EC 44811800 */ mtc1 $at, $f3 -/* C37F20 802419F0 44801000 */ mtc1 $zero, $f2 -/* C37F24 802419F4 46000005 */ abs.s $f0, $f0 -/* C37F28 802419F8 46000021 */ cvt.d.s $f0, $f0 -/* C37F2C 802419FC 4620103C */ c.lt.d $f2, $f0 -/* C37F30 80241A00 00000000 */ nop -/* C37F34 80241A04 45000008 */ bc1f .L80241A28 -/* C37F38 80241A08 3C03FFDF */ lui $v1, 0xffdf -/* C37F3C 80241A0C 3C018024 */ lui $at, 0x8024 -/* C37F40 80241A10 D4224450 */ ldc1 $f2, 0x4450($at) -/* C37F44 80241A14 46002021 */ cvt.d.s $f0, $f4 -/* C37F48 80241A18 46220001 */ sub.d $f0, $f0, $f2 -/* C37F4C 80241A1C 46200020 */ cvt.s.d $f0, $f0 -/* C37F50 80241A20 0809069D */ j .L80241A74 -/* C37F54 80241A24 E640003C */ swc1 $f0, 0x3c($s2) -.L80241A28: -/* C37F58 80241A28 8E420000 */ lw $v0, ($s2) -/* C37F5C 80241A2C 3463FFFF */ ori $v1, $v1, 0xffff -/* C37F60 80241A30 AE400048 */ sw $zero, 0x48($s2) -/* C37F64 80241A34 00431024 */ and $v0, $v0, $v1 -/* C37F68 80241A38 AE420000 */ sw $v0, ($s2) -/* C37F6C 80241A3C 3C038011 */ lui $v1, 0x8011 -/* C37F70 80241A40 8063EBB3 */ lb $v1, -0x144d($v1) -/* C37F74 80241A44 24020009 */ addiu $v0, $zero, 9 -/* C37F78 80241A48 10620009 */ beq $v1, $v0, .L80241A70 -/* C37F7C 80241A4C 24020010 */ addiu $v0, $zero, 0x10 -/* C37F80 80241A50 0C03805E */ jal disable_player_input -/* C37F84 80241A54 00000000 */ nop -/* C37F88 80241A58 0C03BD8A */ jal func_800EF628 -/* C37F8C 80241A5C 00000000 */ nop -/* C37F90 80241A60 24020014 */ addiu $v0, $zero, 0x14 -/* C37F94 80241A64 0809069C */ j .L80241A70 -/* C37F98 80241A68 A640008E */ sh $zero, 0x8e($s2) -.L80241A6C: -/* C37F9C 80241A6C 24020010 */ addiu $v0, $zero, 0x10 -.L80241A70: -/* C37FA0 80241A70 AE820070 */ sw $v0, 0x70($s4) -.L80241A74: -/* C37FA4 80241A74 8FBF0044 */ lw $ra, 0x44($sp) -/* C37FA8 80241A78 8FB40040 */ lw $s4, 0x40($sp) -/* C37FAC 80241A7C 8FB3003C */ lw $s3, 0x3c($sp) -/* C37FB0 80241A80 8FB20038 */ lw $s2, 0x38($sp) -/* C37FB4 80241A84 8FB10034 */ lw $s1, 0x34($sp) -/* C37FB8 80241A88 8FB00030 */ lw $s0, 0x30($sp) -/* C37FBC 80241A8C 03E00008 */ jr $ra -/* C37FC0 80241A90 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s new file mode 100644 index 0000000000..19077f0d78 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802417F8_C37D28.s @@ -0,0 +1,177 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417F8_C37D28 +/* C37D28 802417F8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C37D2C 802417FC AFB40040 */ sw $s4, 0x40($sp) +/* C37D30 80241800 0080A02D */ daddu $s4, $a0, $zero +/* C37D34 80241804 AFBF0044 */ sw $ra, 0x44($sp) +/* C37D38 80241808 AFB3003C */ sw $s3, 0x3c($sp) +/* C37D3C 8024180C AFB20038 */ sw $s2, 0x38($sp) +/* C37D40 80241810 AFB10034 */ sw $s1, 0x34($sp) +/* C37D44 80241814 AFB00030 */ sw $s0, 0x30($sp) +/* C37D48 80241818 8E930148 */ lw $s3, 0x148($s4) +/* C37D4C 8024181C 00A0802D */ daddu $s0, $a1, $zero +/* C37D50 80241820 86640008 */ lh $a0, 8($s3) +/* C37D54 80241824 0C00EABB */ jal get_npc_unsafe +/* C37D58 80241828 00C0882D */ daddu $s1, $a2, $zero +/* C37D5C 8024182C 3C048000 */ lui $a0, 0x8000 +/* C37D60 80241830 0040902D */ daddu $s2, $v0, $zero +/* C37D64 80241834 C6400040 */ lwc1 $f0, 0x40($s2) +/* C37D68 80241838 34840011 */ ori $a0, $a0, 0x11 +/* C37D6C 8024183C E7A00010 */ swc1 $f0, 0x10($sp) +/* C37D70 80241840 8E460038 */ lw $a2, 0x38($s2) +/* C37D74 80241844 8E47003C */ lw $a3, 0x3c($s2) +/* C37D78 80241848 0C05267B */ jal func_801499EC +/* C37D7C 8024184C 24050002 */ addiu $a1, $zero, 2 +/* C37D80 80241850 0220202D */ daddu $a0, $s1, $zero +/* C37D84 80241854 24020001 */ addiu $v0, $zero, 1 +/* C37D88 80241858 AFA20010 */ sw $v0, 0x10($sp) +/* C37D8C 8024185C 8E060024 */ lw $a2, 0x24($s0) +/* C37D90 80241860 8E070028 */ lw $a3, 0x28($s0) +/* C37D94 80241864 0C01242D */ jal func_800490B4 +/* C37D98 80241868 0260282D */ daddu $a1, $s3, $zero +/* C37D9C 8024186C 1440000B */ bnez $v0, .L8024189C +/* C37DA0 80241870 3C04FFDF */ lui $a0, 0xffdf +/* C37DA4 80241874 8E62006C */ lw $v0, 0x6c($s3) +/* C37DA8 80241878 2403FEFF */ addiu $v1, $zero, -0x101 +/* C37DAC 8024187C 00431024 */ and $v0, $v0, $v1 +/* C37DB0 80241880 AE62006C */ sw $v0, 0x6c($s3) +/* C37DB4 80241884 8E420000 */ lw $v0, ($s2) +/* C37DB8 80241888 3484FFFF */ ori $a0, $a0, 0xffff +/* C37DBC 8024188C AE400048 */ sw $zero, 0x48($s2) +/* C37DC0 80241890 00441024 */ and $v0, $v0, $a0 +/* C37DC4 80241894 0809069B */ j .L80241A6C +/* C37DC8 80241898 AE420000 */ sw $v0, ($s2) +.L8024189C: +/* C37DCC 8024189C 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) +/* C37DD0 802418A0 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) +/* C37DD4 802418A4 C6440048 */ lwc1 $f4, 0x48($s2) +/* C37DD8 802418A8 3C0141C8 */ lui $at, 0x41c8 +/* C37DDC 802418AC 44810000 */ mtc1 $at, $f0 +/* C37DE0 802418B0 8E020000 */ lw $v0, ($s0) +/* C37DE4 802418B4 46002100 */ add.s $f4, $f4, $f0 +/* C37DE8 802418B8 C4420028 */ lwc1 $f2, 0x28($v0) +/* C37DEC 802418BC 3C014000 */ lui $at, 0x4000 +/* C37DF0 802418C0 44810000 */ mtc1 $at, $f0 +/* C37DF4 802418C4 E6420038 */ swc1 $f2, 0x38($s2) +/* C37DF8 802418C8 C4420030 */ lwc1 $f2, 0x30($v0) +/* C37DFC 802418CC 46001080 */ add.s $f2, $f2, $f0 +/* C37E00 802418D0 3C018024 */ lui $at, 0x8024 +/* C37E04 802418D4 D4264448 */ ldc1 $f6, 0x4448($at) +/* C37E08 802418D8 46002021 */ cvt.d.s $f0, $f4 +/* C37E0C 802418DC 4620303C */ c.lt.d $f6, $f0 +/* C37E10 802418E0 E6440048 */ swc1 $f4, 0x48($s2) +/* C37E14 802418E4 45000004 */ bc1f .L802418F8 +/* C37E18 802418E8 E6420040 */ swc1 $f2, 0x40($s2) +/* C37E1C 802418EC 46260001 */ sub.d $f0, $f0, $f6 +/* C37E20 802418F0 46200020 */ cvt.s.d $f0, $f0 +/* C37E24 802418F4 E6400048 */ swc1 $f0, 0x48($s2) +.L802418F8: +/* C37E28 802418F8 3C02B60B */ lui $v0, 0xb60b +/* C37E2C 802418FC C6400048 */ lwc1 $f0, 0x48($s2) +/* C37E30 80241900 344260B7 */ ori $v0, $v0, 0x60b7 +/* C37E34 80241904 4600020D */ trunc.w.s $f8, $f0 +/* C37E38 80241908 44044000 */ mfc1 $a0, $f8 +/* C37E3C 8024190C 00000000 */ nop +/* C37E40 80241910 00820018 */ mult $a0, $v0 +/* C37E44 80241914 00041FC3 */ sra $v1, $a0, 0x1f +/* C37E48 80241918 00004010 */ mfhi $t0 +/* C37E4C 8024191C 01041021 */ addu $v0, $t0, $a0 +/* C37E50 80241920 000211C3 */ sra $v0, $v0, 7 +/* C37E54 80241924 00431023 */ subu $v0, $v0, $v1 +/* C37E58 80241928 00021840 */ sll $v1, $v0, 1 +/* C37E5C 8024192C 00621821 */ addu $v1, $v1, $v0 +/* C37E60 80241930 00031100 */ sll $v0, $v1, 4 +/* C37E64 80241934 00431023 */ subu $v0, $v0, $v1 +/* C37E68 80241938 00021080 */ sll $v0, $v0, 2 +/* C37E6C 8024193C 00822023 */ subu $a0, $a0, $v0 +/* C37E70 80241940 00042400 */ sll $a0, $a0, 0x10 +/* C37E74 80241944 0C00A4F5 */ jal cosine +/* C37E78 80241948 00042403 */ sra $a0, $a0, 0x10 +/* C37E7C 8024194C 3C014260 */ lui $at, 0x4260 +/* C37E80 80241950 44811000 */ mtc1 $at, $f2 +/* C37E84 80241954 00000000 */ nop +/* C37E88 80241958 46020002 */ mul.s $f0, $f0, $f2 +/* C37E8C 8024195C 00000000 */ nop +/* C37E90 80241960 24050006 */ addiu $a1, $zero, 6 +/* C37E94 80241964 3C01437F */ lui $at, 0x437f +/* C37E98 80241968 44811000 */ mtc1 $at, $f2 +/* C37E9C 8024196C 240200FF */ addiu $v0, $zero, 0xff +/* C37EA0 80241970 46001081 */ sub.s $f2, $f2, $f0 +/* C37EA4 80241974 AFA20014 */ sw $v0, 0x14($sp) +/* C37EA8 80241978 AFA00018 */ sw $zero, 0x18($sp) +/* C37EAC 8024197C 4600120D */ trunc.w.s $f8, $f2 +/* C37EB0 80241980 44064000 */ mfc1 $a2, $f8 +/* C37EB4 80241984 00000000 */ nop +/* C37EB8 80241988 AFA60010 */ sw $a2, 0x10($sp) +/* C37EBC 8024198C 8E440024 */ lw $a0, 0x24($s2) +/* C37EC0 80241990 0C0B7A25 */ jal func_802DE894 +/* C37EC4 80241994 00C0382D */ daddu $a3, $a2, $zero +/* C37EC8 80241998 27A50020 */ addiu $a1, $sp, 0x20 +/* C37ECC 8024199C 27A60024 */ addiu $a2, $sp, 0x24 +/* C37ED0 802419A0 8E020000 */ lw $v0, ($s0) +/* C37ED4 802419A4 3C01447A */ lui $at, 0x447a +/* C37ED8 802419A8 44810000 */ mtc1 $at, $f0 +/* C37EDC 802419AC C4420028 */ lwc1 $f2, 0x28($v0) +/* C37EE0 802419B0 C444002C */ lwc1 $f4, 0x2c($v0) +/* C37EE4 802419B4 C4460030 */ lwc1 $f6, 0x30($v0) +/* C37EE8 802419B8 27A2002C */ addiu $v0, $sp, 0x2c +/* C37EEC 802419BC E7A0002C */ swc1 $f0, 0x2c($sp) +/* C37EF0 802419C0 E7A20020 */ swc1 $f2, 0x20($sp) +/* C37EF4 802419C4 E7A40024 */ swc1 $f4, 0x24($sp) +/* C37EF8 802419C8 E7A60028 */ swc1 $f6, 0x28($sp) +/* C37EFC 802419CC AFA20010 */ sw $v0, 0x10($sp) +/* C37F00 802419D0 8E440080 */ lw $a0, 0x80($s2) +/* C37F04 802419D4 0C0372DF */ jal func_800DCB7C +/* C37F08 802419D8 27A70028 */ addiu $a3, $sp, 0x28 +/* C37F0C 802419DC C644003C */ lwc1 $f4, 0x3c($s2) +/* C37F10 802419E0 C7A00024 */ lwc1 $f0, 0x24($sp) +/* C37F14 802419E4 46002001 */ sub.s $f0, $f4, $f0 +/* C37F18 802419E8 3C014038 */ lui $at, 0x4038 +/* C37F1C 802419EC 44811800 */ mtc1 $at, $f3 +/* C37F20 802419F0 44801000 */ mtc1 $zero, $f2 +/* C37F24 802419F4 46000005 */ abs.s $f0, $f0 +/* C37F28 802419F8 46000021 */ cvt.d.s $f0, $f0 +/* C37F2C 802419FC 4620103C */ c.lt.d $f2, $f0 +/* C37F30 80241A00 00000000 */ nop +/* C37F34 80241A04 45000008 */ bc1f .L80241A28 +/* C37F38 80241A08 3C03FFDF */ lui $v1, 0xffdf +/* C37F3C 80241A0C 3C018024 */ lui $at, 0x8024 +/* C37F40 80241A10 D4224450 */ ldc1 $f2, 0x4450($at) +/* C37F44 80241A14 46002021 */ cvt.d.s $f0, $f4 +/* C37F48 80241A18 46220001 */ sub.d $f0, $f0, $f2 +/* C37F4C 80241A1C 46200020 */ cvt.s.d $f0, $f0 +/* C37F50 80241A20 0809069D */ j .L80241A74 +/* C37F54 80241A24 E640003C */ swc1 $f0, 0x3c($s2) +.L80241A28: +/* C37F58 80241A28 8E420000 */ lw $v0, ($s2) +/* C37F5C 80241A2C 3463FFFF */ ori $v1, $v1, 0xffff +/* C37F60 80241A30 AE400048 */ sw $zero, 0x48($s2) +/* C37F64 80241A34 00431024 */ and $v0, $v0, $v1 +/* C37F68 80241A38 AE420000 */ sw $v0, ($s2) +/* C37F6C 80241A3C 3C038011 */ lui $v1, 0x8011 +/* C37F70 80241A40 8063EBB3 */ lb $v1, -0x144d($v1) +/* C37F74 80241A44 24020009 */ addiu $v0, $zero, 9 +/* C37F78 80241A48 10620009 */ beq $v1, $v0, .L80241A70 +/* C37F7C 80241A4C 24020010 */ addiu $v0, $zero, 0x10 +/* C37F80 80241A50 0C03805E */ jal disable_player_input +/* C37F84 80241A54 00000000 */ nop +/* C37F88 80241A58 0C03BD8A */ jal func_800EF628 +/* C37F8C 80241A5C 00000000 */ nop +/* C37F90 80241A60 24020014 */ addiu $v0, $zero, 0x14 +/* C37F94 80241A64 0809069C */ j .L80241A70 +/* C37F98 80241A68 A640008E */ sh $zero, 0x8e($s2) +.L80241A6C: +/* C37F9C 80241A6C 24020010 */ addiu $v0, $zero, 0x10 +.L80241A70: +/* C37FA0 80241A70 AE820070 */ sw $v0, 0x70($s4) +.L80241A74: +/* C37FA4 80241A74 8FBF0044 */ lw $ra, 0x44($sp) +/* C37FA8 80241A78 8FB40040 */ lw $s4, 0x40($sp) +/* C37FAC 80241A7C 8FB3003C */ lw $s3, 0x3c($sp) +/* C37FB0 80241A80 8FB20038 */ lw $s2, 0x38($sp) +/* C37FB4 80241A84 8FB10034 */ lw $s1, 0x34($sp) +/* C37FB8 80241A88 8FB00030 */ lw $s0, 0x30($sp) +/* C37FBC 80241A8C 03E00008 */ jr $ra +/* C37FC0 80241A90 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94.s deleted file mode 100644 index ed376358f8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A94 -/* C37FC4 80241A94 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C37FC8 80241A98 AFB20028 */ sw $s2, 0x28($sp) -/* C37FCC 80241A9C 0080902D */ daddu $s2, $a0, $zero -/* C37FD0 80241AA0 AFBF002C */ sw $ra, 0x2c($sp) -/* C37FD4 80241AA4 AFB10024 */ sw $s1, 0x24($sp) -/* C37FD8 80241AA8 AFB00020 */ sw $s0, 0x20($sp) -/* C37FDC 80241AAC 8E500148 */ lw $s0, 0x148($s2) -/* C37FE0 80241AB0 0C00EABB */ jal get_npc_unsafe -/* C37FE4 80241AB4 86040008 */ lh $a0, 8($s0) -/* C37FE8 80241AB8 2404FEFF */ addiu $a0, $zero, -0x101 -/* C37FEC 80241ABC 0040882D */ daddu $s1, $v0, $zero -/* C37FF0 80241AC0 0000282D */ daddu $a1, $zero, $zero -/* C37FF4 80241AC4 8E03006C */ lw $v1, 0x6c($s0) -/* C37FF8 80241AC8 00A0302D */ daddu $a2, $a1, $zero -/* C37FFC 80241ACC 00641824 */ and $v1, $v1, $a0 -/* C38000 80241AD0 AE03006C */ sw $v1, 0x6c($s0) -/* C38004 80241AD4 AFA00010 */ sw $zero, 0x10($sp) -/* C38008 80241AD8 AFA00014 */ sw $zero, 0x14($sp) -/* C3800C 80241ADC AFA00018 */ sw $zero, 0x18($sp) -/* C38010 80241AE0 8E240024 */ lw $a0, 0x24($s1) -/* C38014 80241AE4 0C0B7A25 */ jal func_802DE894 -/* C38018 80241AE8 00A0382D */ daddu $a3, $a1, $zero -/* C3801C 80241AEC 8E02006C */ lw $v0, 0x6c($s0) -/* C38020 80241AF0 30421000 */ andi $v0, $v0, 0x1000 -/* C38024 80241AF4 10400008 */ beqz $v0, .L80241B18 -/* C38028 80241AF8 00000000 */ nop -/* C3802C 80241AFC 3C048000 */ lui $a0, 0x8000 -/* C38030 80241B00 0C05271B */ jal stop_sound -/* C38034 80241B04 34840011 */ ori $a0, $a0, 0x11 -/* C38038 80241B08 8E02006C */ lw $v0, 0x6c($s0) -/* C3803C 80241B0C 2403EFFF */ addiu $v1, $zero, -0x1001 -/* C38040 80241B10 00431024 */ and $v0, $v0, $v1 -/* C38044 80241B14 AE02006C */ sw $v0, 0x6c($s0) -.L80241B18: -/* C38048 80241B18 8E0200CC */ lw $v0, 0xcc($s0) -/* C3804C 80241B1C 8C430024 */ lw $v1, 0x24($v0) -/* C38050 80241B20 24020014 */ addiu $v0, $zero, 0x14 -/* C38054 80241B24 A622008E */ sh $v0, 0x8e($s1) -/* C38058 80241B28 24020011 */ addiu $v0, $zero, 0x11 -/* C3805C 80241B2C AE230028 */ sw $v1, 0x28($s1) -/* C38060 80241B30 AE420070 */ sw $v0, 0x70($s2) -/* C38064 80241B34 8FBF002C */ lw $ra, 0x2c($sp) -/* C38068 80241B38 8FB20028 */ lw $s2, 0x28($sp) -/* C3806C 80241B3C 8FB10024 */ lw $s1, 0x24($sp) -/* C38070 80241B40 8FB00020 */ lw $s0, 0x20($sp) -/* C38074 80241B44 03E00008 */ jr $ra -/* C38078 80241B48 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s new file mode 100644 index 0000000000..3d58b96168 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241A94_C37FC4.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A94_C37FC4 +/* C37FC4 80241A94 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C37FC8 80241A98 AFB20028 */ sw $s2, 0x28($sp) +/* C37FCC 80241A9C 0080902D */ daddu $s2, $a0, $zero +/* C37FD0 80241AA0 AFBF002C */ sw $ra, 0x2c($sp) +/* C37FD4 80241AA4 AFB10024 */ sw $s1, 0x24($sp) +/* C37FD8 80241AA8 AFB00020 */ sw $s0, 0x20($sp) +/* C37FDC 80241AAC 8E500148 */ lw $s0, 0x148($s2) +/* C37FE0 80241AB0 0C00EABB */ jal get_npc_unsafe +/* C37FE4 80241AB4 86040008 */ lh $a0, 8($s0) +/* C37FE8 80241AB8 2404FEFF */ addiu $a0, $zero, -0x101 +/* C37FEC 80241ABC 0040882D */ daddu $s1, $v0, $zero +/* C37FF0 80241AC0 0000282D */ daddu $a1, $zero, $zero +/* C37FF4 80241AC4 8E03006C */ lw $v1, 0x6c($s0) +/* C37FF8 80241AC8 00A0302D */ daddu $a2, $a1, $zero +/* C37FFC 80241ACC 00641824 */ and $v1, $v1, $a0 +/* C38000 80241AD0 AE03006C */ sw $v1, 0x6c($s0) +/* C38004 80241AD4 AFA00010 */ sw $zero, 0x10($sp) +/* C38008 80241AD8 AFA00014 */ sw $zero, 0x14($sp) +/* C3800C 80241ADC AFA00018 */ sw $zero, 0x18($sp) +/* C38010 80241AE0 8E240024 */ lw $a0, 0x24($s1) +/* C38014 80241AE4 0C0B7A25 */ jal func_802DE894 +/* C38018 80241AE8 00A0382D */ daddu $a3, $a1, $zero +/* C3801C 80241AEC 8E02006C */ lw $v0, 0x6c($s0) +/* C38020 80241AF0 30421000 */ andi $v0, $v0, 0x1000 +/* C38024 80241AF4 10400008 */ beqz $v0, .L80241B18 +/* C38028 80241AF8 00000000 */ nop +/* C3802C 80241AFC 3C048000 */ lui $a0, 0x8000 +/* C38030 80241B00 0C05271B */ jal stop_sound +/* C38034 80241B04 34840011 */ ori $a0, $a0, 0x11 +/* C38038 80241B08 8E02006C */ lw $v0, 0x6c($s0) +/* C3803C 80241B0C 2403EFFF */ addiu $v1, $zero, -0x1001 +/* C38040 80241B10 00431024 */ and $v0, $v0, $v1 +/* C38044 80241B14 AE02006C */ sw $v0, 0x6c($s0) +.L80241B18: +/* C38048 80241B18 8E0200CC */ lw $v0, 0xcc($s0) +/* C3804C 80241B1C 8C430024 */ lw $v1, 0x24($v0) +/* C38050 80241B20 24020014 */ addiu $v0, $zero, 0x14 +/* C38054 80241B24 A622008E */ sh $v0, 0x8e($s1) +/* C38058 80241B28 24020011 */ addiu $v0, $zero, 0x11 +/* C3805C 80241B2C AE230028 */ sw $v1, 0x28($s1) +/* C38060 80241B30 AE420070 */ sw $v0, 0x70($s2) +/* C38064 80241B34 8FBF002C */ lw $ra, 0x2c($sp) +/* C38068 80241B38 8FB20028 */ lw $s2, 0x28($sp) +/* C3806C 80241B3C 8FB10024 */ lw $s1, 0x24($sp) +/* C38070 80241B40 8FB00020 */ lw $s0, 0x20($sp) +/* C38074 80241B44 03E00008 */ jr $ra +/* C38078 80241B48 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C.s deleted file mode 100644 index 8bc41b2b04..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B4C -/* C3807C 80241B4C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C38080 80241B50 AFB20048 */ sw $s2, 0x48($sp) -/* C38084 80241B54 0080902D */ daddu $s2, $a0, $zero -/* C38088 80241B58 AFBF004C */ sw $ra, 0x4c($sp) -/* C3808C 80241B5C AFB10044 */ sw $s1, 0x44($sp) -/* C38090 80241B60 AFB00040 */ sw $s0, 0x40($sp) -/* C38094 80241B64 F7B40050 */ sdc1 $f20, 0x50($sp) -/* C38098 80241B68 8E500148 */ lw $s0, 0x148($s2) -/* C3809C 80241B6C 0C00EABB */ jal get_npc_unsafe -/* C380A0 80241B70 86040008 */ lh $a0, 8($s0) -/* C380A4 80241B74 27A50028 */ addiu $a1, $sp, 0x28 -/* C380A8 80241B78 0040882D */ daddu $s1, $v0, $zero -/* C380AC 80241B7C 27A6002C */ addiu $a2, $sp, 0x2c -/* C380B0 80241B80 27A70030 */ addiu $a3, $sp, 0x30 -/* C380B4 80241B84 C620003C */ lwc1 $f0, 0x3c($s1) -/* C380B8 80241B88 3C014004 */ lui $at, 0x4004 -/* C380BC 80241B8C 44811800 */ mtc1 $at, $f3 -/* C380C0 80241B90 44801000 */ mtc1 $zero, $f2 -/* C380C4 80241B94 C6260038 */ lwc1 $f6, 0x38($s1) -/* C380C8 80241B98 46000021 */ cvt.d.s $f0, $f0 -/* C380CC 80241B9C 46220000 */ add.d $f0, $f0, $f2 -/* C380D0 80241BA0 3C01447A */ lui $at, 0x447a -/* C380D4 80241BA4 44812000 */ mtc1 $at, $f4 -/* C380D8 80241BA8 C6020078 */ lwc1 $f2, 0x78($s0) -/* C380DC 80241BAC 468010A0 */ cvt.s.w $f2, $f2 -/* C380E0 80241BB0 46200020 */ cvt.s.d $f0, $f0 -/* C380E4 80241BB4 E620003C */ swc1 $f0, 0x3c($s1) -/* C380E8 80241BB8 46000206 */ mov.s $f8, $f0 -/* C380EC 80241BBC C6200040 */ lwc1 $f0, 0x40($s1) -/* C380F0 80241BC0 27A20034 */ addiu $v0, $sp, 0x34 -/* C380F4 80241BC4 E7A00030 */ swc1 $f0, 0x30($sp) -/* C380F8 80241BC8 3C014059 */ lui $at, 0x4059 -/* C380FC 80241BCC 44810800 */ mtc1 $at, $f1 -/* C38100 80241BD0 44800000 */ mtc1 $zero, $f0 -/* C38104 80241BD4 460010A1 */ cvt.d.s $f2, $f2 -/* C38108 80241BD8 E7A60028 */ swc1 $f6, 0x28($sp) -/* C3810C 80241BDC E7A40034 */ swc1 $f4, 0x34($sp) -/* C38110 80241BE0 E7A8002C */ swc1 $f8, 0x2c($sp) -/* C38114 80241BE4 AFA20010 */ sw $v0, 0x10($sp) -/* C38118 80241BE8 8E240080 */ lw $a0, 0x80($s1) -/* C3811C 80241BEC 46201083 */ div.d $f2, $f2, $f0 -/* C38120 80241BF0 0C0372DF */ jal func_800DCB7C -/* C38124 80241BF4 46201520 */ cvt.s.d $f20, $f2 -/* C38128 80241BF8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C3812C 80241BFC 46140000 */ add.s $f0, $f0, $f20 -/* C38130 80241C00 C622003C */ lwc1 $f2, 0x3c($s1) -/* C38134 80241C04 4600103C */ c.lt.s $f2, $f0 -/* C38138 80241C08 00000000 */ nop -/* C3813C 80241C0C 45010028 */ bc1t .L80241CB0 -/* C38140 80241C10 00000000 */ nop -/* C38144 80241C14 8E0200D0 */ lw $v0, 0xd0($s0) -/* C38148 80241C18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C3814C 80241C1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C38150 80241C20 C44A0000 */ lwc1 $f10, ($v0) -/* C38154 80241C24 468052A0 */ cvt.s.w $f10, $f10 -/* C38158 80241C28 44065000 */ mfc1 $a2, $f10 -/* C3815C 80241C2C C44A0008 */ lwc1 $f10, 8($v0) -/* C38160 80241C30 468052A0 */ cvt.s.w $f10, $f10 -/* C38164 80241C34 44075000 */ mfc1 $a3, $f10 -/* C38168 80241C38 0C00A720 */ jal atan2 -/* C3816C 80241C3C 2410000A */ addiu $s0, $zero, 0xa -/* C38170 80241C40 24040002 */ addiu $a0, $zero, 2 -/* C38174 80241C44 0220282D */ daddu $a1, $s1, $zero -/* C38178 80241C48 0000302D */ daddu $a2, $zero, $zero -/* C3817C 80241C4C C7A2002C */ lwc1 $f2, 0x2c($sp) -/* C38180 80241C50 862200A8 */ lh $v0, 0xa8($s1) -/* C38184 80241C54 E620000C */ swc1 $f0, 0xc($s1) -/* C38188 80241C58 3C013F80 */ lui $at, 0x3f80 -/* C3818C 80241C5C 44810000 */ mtc1 $at, $f0 -/* C38190 80241C60 3C014000 */ lui $at, 0x4000 -/* C38194 80241C64 44812000 */ mtc1 $at, $f4 -/* C38198 80241C68 3C01C1A0 */ lui $at, 0xc1a0 -/* C3819C 80241C6C 44813000 */ mtc1 $at, $f6 -/* C381A0 80241C70 44825000 */ mtc1 $v0, $f10 -/* C381A4 80241C74 00000000 */ nop -/* C381A8 80241C78 468052A0 */ cvt.s.w $f10, $f10 -/* C381AC 80241C7C 46141080 */ add.s $f2, $f2, $f20 -/* C381B0 80241C80 44075000 */ mfc1 $a3, $f10 -/* C381B4 80241C84 27A20038 */ addiu $v0, $sp, 0x38 -/* C381B8 80241C88 E622003C */ swc1 $f2, 0x3c($s1) -/* C381BC 80241C8C E7A00010 */ swc1 $f0, 0x10($sp) -/* C381C0 80241C90 E7A40014 */ swc1 $f4, 0x14($sp) -/* C381C4 80241C94 E7A60018 */ swc1 $f6, 0x18($sp) -/* C381C8 80241C98 AFB0001C */ sw $s0, 0x1c($sp) -/* C381CC 80241C9C 0C01BFA4 */ jal fx_emote -/* C381D0 80241CA0 AFA20020 */ sw $v0, 0x20($sp) -/* C381D4 80241CA4 24020012 */ addiu $v0, $zero, 0x12 -/* C381D8 80241CA8 A630008E */ sh $s0, 0x8e($s1) -/* C381DC 80241CAC AE420070 */ sw $v0, 0x70($s2) -.L80241CB0: -/* C381E0 80241CB0 8FBF004C */ lw $ra, 0x4c($sp) -/* C381E4 80241CB4 8FB20048 */ lw $s2, 0x48($sp) -/* C381E8 80241CB8 8FB10044 */ lw $s1, 0x44($sp) -/* C381EC 80241CBC 8FB00040 */ lw $s0, 0x40($sp) -/* C381F0 80241CC0 D7B40050 */ ldc1 $f20, 0x50($sp) -/* C381F4 80241CC4 03E00008 */ jr $ra -/* C381F8 80241CC8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s new file mode 100644 index 0000000000..b42710073f --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241B4C_C3807C.s @@ -0,0 +1,101 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B4C_C3807C +/* C3807C 80241B4C 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* C38080 80241B50 AFB20048 */ sw $s2, 0x48($sp) +/* C38084 80241B54 0080902D */ daddu $s2, $a0, $zero +/* C38088 80241B58 AFBF004C */ sw $ra, 0x4c($sp) +/* C3808C 80241B5C AFB10044 */ sw $s1, 0x44($sp) +/* C38090 80241B60 AFB00040 */ sw $s0, 0x40($sp) +/* C38094 80241B64 F7B40050 */ sdc1 $f20, 0x50($sp) +/* C38098 80241B68 8E500148 */ lw $s0, 0x148($s2) +/* C3809C 80241B6C 0C00EABB */ jal get_npc_unsafe +/* C380A0 80241B70 86040008 */ lh $a0, 8($s0) +/* C380A4 80241B74 27A50028 */ addiu $a1, $sp, 0x28 +/* C380A8 80241B78 0040882D */ daddu $s1, $v0, $zero +/* C380AC 80241B7C 27A6002C */ addiu $a2, $sp, 0x2c +/* C380B0 80241B80 27A70030 */ addiu $a3, $sp, 0x30 +/* C380B4 80241B84 C620003C */ lwc1 $f0, 0x3c($s1) +/* C380B8 80241B88 3C014004 */ lui $at, 0x4004 +/* C380BC 80241B8C 44811800 */ mtc1 $at, $f3 +/* C380C0 80241B90 44801000 */ mtc1 $zero, $f2 +/* C380C4 80241B94 C6260038 */ lwc1 $f6, 0x38($s1) +/* C380C8 80241B98 46000021 */ cvt.d.s $f0, $f0 +/* C380CC 80241B9C 46220000 */ add.d $f0, $f0, $f2 +/* C380D0 80241BA0 3C01447A */ lui $at, 0x447a +/* C380D4 80241BA4 44812000 */ mtc1 $at, $f4 +/* C380D8 80241BA8 C6020078 */ lwc1 $f2, 0x78($s0) +/* C380DC 80241BAC 468010A0 */ cvt.s.w $f2, $f2 +/* C380E0 80241BB0 46200020 */ cvt.s.d $f0, $f0 +/* C380E4 80241BB4 E620003C */ swc1 $f0, 0x3c($s1) +/* C380E8 80241BB8 46000206 */ mov.s $f8, $f0 +/* C380EC 80241BBC C6200040 */ lwc1 $f0, 0x40($s1) +/* C380F0 80241BC0 27A20034 */ addiu $v0, $sp, 0x34 +/* C380F4 80241BC4 E7A00030 */ swc1 $f0, 0x30($sp) +/* C380F8 80241BC8 3C014059 */ lui $at, 0x4059 +/* C380FC 80241BCC 44810800 */ mtc1 $at, $f1 +/* C38100 80241BD0 44800000 */ mtc1 $zero, $f0 +/* C38104 80241BD4 460010A1 */ cvt.d.s $f2, $f2 +/* C38108 80241BD8 E7A60028 */ swc1 $f6, 0x28($sp) +/* C3810C 80241BDC E7A40034 */ swc1 $f4, 0x34($sp) +/* C38110 80241BE0 E7A8002C */ swc1 $f8, 0x2c($sp) +/* C38114 80241BE4 AFA20010 */ sw $v0, 0x10($sp) +/* C38118 80241BE8 8E240080 */ lw $a0, 0x80($s1) +/* C3811C 80241BEC 46201083 */ div.d $f2, $f2, $f0 +/* C38120 80241BF0 0C0372DF */ jal func_800DCB7C +/* C38124 80241BF4 46201520 */ cvt.s.d $f20, $f2 +/* C38128 80241BF8 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C3812C 80241BFC 46140000 */ add.s $f0, $f0, $f20 +/* C38130 80241C00 C622003C */ lwc1 $f2, 0x3c($s1) +/* C38134 80241C04 4600103C */ c.lt.s $f2, $f0 +/* C38138 80241C08 00000000 */ nop +/* C3813C 80241C0C 45010028 */ bc1t .L80241CB0 +/* C38140 80241C10 00000000 */ nop +/* C38144 80241C14 8E0200D0 */ lw $v0, 0xd0($s0) +/* C38148 80241C18 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C3814C 80241C1C C62E0040 */ lwc1 $f14, 0x40($s1) +/* C38150 80241C20 C44A0000 */ lwc1 $f10, ($v0) +/* C38154 80241C24 468052A0 */ cvt.s.w $f10, $f10 +/* C38158 80241C28 44065000 */ mfc1 $a2, $f10 +/* C3815C 80241C2C C44A0008 */ lwc1 $f10, 8($v0) +/* C38160 80241C30 468052A0 */ cvt.s.w $f10, $f10 +/* C38164 80241C34 44075000 */ mfc1 $a3, $f10 +/* C38168 80241C38 0C00A720 */ jal atan2 +/* C3816C 80241C3C 2410000A */ addiu $s0, $zero, 0xa +/* C38170 80241C40 24040002 */ addiu $a0, $zero, 2 +/* C38174 80241C44 0220282D */ daddu $a1, $s1, $zero +/* C38178 80241C48 0000302D */ daddu $a2, $zero, $zero +/* C3817C 80241C4C C7A2002C */ lwc1 $f2, 0x2c($sp) +/* C38180 80241C50 862200A8 */ lh $v0, 0xa8($s1) +/* C38184 80241C54 E620000C */ swc1 $f0, 0xc($s1) +/* C38188 80241C58 3C013F80 */ lui $at, 0x3f80 +/* C3818C 80241C5C 44810000 */ mtc1 $at, $f0 +/* C38190 80241C60 3C014000 */ lui $at, 0x4000 +/* C38194 80241C64 44812000 */ mtc1 $at, $f4 +/* C38198 80241C68 3C01C1A0 */ lui $at, 0xc1a0 +/* C3819C 80241C6C 44813000 */ mtc1 $at, $f6 +/* C381A0 80241C70 44825000 */ mtc1 $v0, $f10 +/* C381A4 80241C74 00000000 */ nop +/* C381A8 80241C78 468052A0 */ cvt.s.w $f10, $f10 +/* C381AC 80241C7C 46141080 */ add.s $f2, $f2, $f20 +/* C381B0 80241C80 44075000 */ mfc1 $a3, $f10 +/* C381B4 80241C84 27A20038 */ addiu $v0, $sp, 0x38 +/* C381B8 80241C88 E622003C */ swc1 $f2, 0x3c($s1) +/* C381BC 80241C8C E7A00010 */ swc1 $f0, 0x10($sp) +/* C381C0 80241C90 E7A40014 */ swc1 $f4, 0x14($sp) +/* C381C4 80241C94 E7A60018 */ swc1 $f6, 0x18($sp) +/* C381C8 80241C98 AFB0001C */ sw $s0, 0x1c($sp) +/* C381CC 80241C9C 0C01BFA4 */ jal fx_emote +/* C381D0 80241CA0 AFA20020 */ sw $v0, 0x20($sp) +/* C381D4 80241CA4 24020012 */ addiu $v0, $zero, 0x12 +/* C381D8 80241CA8 A630008E */ sh $s0, 0x8e($s1) +/* C381DC 80241CAC AE420070 */ sw $v0, 0x70($s2) +.L80241CB0: +/* C381E0 80241CB0 8FBF004C */ lw $ra, 0x4c($sp) +/* C381E4 80241CB4 8FB20048 */ lw $s2, 0x48($sp) +/* C381E8 80241CB8 8FB10044 */ lw $s1, 0x44($sp) +/* C381EC 80241CBC 8FB00040 */ lw $s0, 0x40($sp) +/* C381F0 80241CC0 D7B40050 */ ldc1 $f20, 0x50($sp) +/* C381F4 80241CC4 03E00008 */ jr $ra +/* C381F8 80241CC8 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14.s deleted file mode 100644 index cabb807a15..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D14 -/* C38244 80241D14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38248 80241D18 AFB00010 */ sw $s0, 0x10($sp) -/* C3824C 80241D1C 0080802D */ daddu $s0, $a0, $zero -/* C38250 80241D20 AFBF0014 */ sw $ra, 0x14($sp) -/* C38254 80241D24 8E020148 */ lw $v0, 0x148($s0) -/* C38258 80241D28 0C00EABB */ jal get_npc_unsafe -/* C3825C 80241D2C 84440008 */ lh $a0, 8($v0) -/* C38260 80241D30 0040202D */ daddu $a0, $v0, $zero -/* C38264 80241D34 9482008E */ lhu $v0, 0x8e($a0) -/* C38268 80241D38 24420001 */ addiu $v0, $v0, 1 -/* C3826C 80241D3C A482008E */ sh $v0, 0x8e($a0) -/* C38270 80241D40 00021400 */ sll $v0, $v0, 0x10 -/* C38274 80241D44 00021403 */ sra $v0, $v0, 0x10 -/* C38278 80241D48 28420003 */ slti $v0, $v0, 3 -/* C3827C 80241D4C 1440000D */ bnez $v0, .L80241D84 -/* C38280 80241D50 24020009 */ addiu $v0, $zero, 9 -/* C38284 80241D54 3C038011 */ lui $v1, 0x8011 -/* C38288 80241D58 8063EBB3 */ lb $v1, -0x144d($v1) -/* C3828C 80241D5C 10620003 */ beq $v1, $v0, .L80241D6C -/* C38290 80241D60 24020064 */ addiu $v0, $zero, 0x64 -/* C38294 80241D64 08090760 */ j .L80241D80 -/* C38298 80241D68 A480008E */ sh $zero, 0x8e($a0) -.L80241D6C: -/* C3829C 80241D6C 0C038069 */ jal enable_player_input -/* C382A0 80241D70 00000000 */ nop -/* C382A4 80241D74 0C03BD80 */ jal func_800EF600 -/* C382A8 80241D78 00000000 */ nop -/* C382AC 80241D7C 24020010 */ addiu $v0, $zero, 0x10 -.L80241D80: -/* C382B0 80241D80 AE020070 */ sw $v0, 0x70($s0) -.L80241D84: -/* C382B4 80241D84 8FBF0014 */ lw $ra, 0x14($sp) -/* C382B8 80241D88 8FB00010 */ lw $s0, 0x10($sp) -/* C382BC 80241D8C 03E00008 */ jr $ra -/* C382C0 80241D90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s new file mode 100644 index 0000000000..81d408df42 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D14_C38244.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D14_C38244 +/* C38244 80241D14 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C38248 80241D18 AFB00010 */ sw $s0, 0x10($sp) +/* C3824C 80241D1C 0080802D */ daddu $s0, $a0, $zero +/* C38250 80241D20 AFBF0014 */ sw $ra, 0x14($sp) +/* C38254 80241D24 8E020148 */ lw $v0, 0x148($s0) +/* C38258 80241D28 0C00EABB */ jal get_npc_unsafe +/* C3825C 80241D2C 84440008 */ lh $a0, 8($v0) +/* C38260 80241D30 0040202D */ daddu $a0, $v0, $zero +/* C38264 80241D34 9482008E */ lhu $v0, 0x8e($a0) +/* C38268 80241D38 24420001 */ addiu $v0, $v0, 1 +/* C3826C 80241D3C A482008E */ sh $v0, 0x8e($a0) +/* C38270 80241D40 00021400 */ sll $v0, $v0, 0x10 +/* C38274 80241D44 00021403 */ sra $v0, $v0, 0x10 +/* C38278 80241D48 28420003 */ slti $v0, $v0, 3 +/* C3827C 80241D4C 1440000D */ bnez $v0, .L80241D84 +/* C38280 80241D50 24020009 */ addiu $v0, $zero, 9 +/* C38284 80241D54 3C038011 */ lui $v1, 0x8011 +/* C38288 80241D58 8063EBB3 */ lb $v1, -0x144d($v1) +/* C3828C 80241D5C 10620003 */ beq $v1, $v0, .L80241D6C +/* C38290 80241D60 24020064 */ addiu $v0, $zero, 0x64 +/* C38294 80241D64 08090760 */ j .L80241D80 +/* C38298 80241D68 A480008E */ sh $zero, 0x8e($a0) +.L80241D6C: +/* C3829C 80241D6C 0C038069 */ jal enable_player_input +/* C382A0 80241D70 00000000 */ nop +/* C382A4 80241D74 0C03BD80 */ jal func_800EF600 +/* C382A8 80241D78 00000000 */ nop +/* C382AC 80241D7C 24020010 */ addiu $v0, $zero, 0x10 +.L80241D80: +/* C382B0 80241D80 AE020070 */ sw $v0, 0x70($s0) +.L80241D84: +/* C382B4 80241D84 8FBF0014 */ lw $ra, 0x14($sp) +/* C382B8 80241D88 8FB00010 */ lw $s0, 0x10($sp) +/* C382BC 80241D8C 03E00008 */ jr $ra +/* C382C0 80241D90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94.s deleted file mode 100644 index df420a07f6..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D94 -/* C382C4 80241D94 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C382C8 80241D98 AFB20018 */ sw $s2, 0x18($sp) -/* C382CC 80241D9C 0080902D */ daddu $s2, $a0, $zero -/* C382D0 80241DA0 AFBF001C */ sw $ra, 0x1c($sp) -/* C382D4 80241DA4 AFB10014 */ sw $s1, 0x14($sp) -/* C382D8 80241DA8 AFB00010 */ sw $s0, 0x10($sp) -/* C382DC 80241DAC 8E500148 */ lw $s0, 0x148($s2) -/* C382E0 80241DB0 86040008 */ lh $a0, 8($s0) -/* C382E4 80241DB4 0C00EABB */ jal get_npc_unsafe -/* C382E8 80241DB8 00A0882D */ daddu $s1, $a1, $zero -/* C382EC 80241DBC 3C05FFDF */ lui $a1, 0xffdf -/* C382F0 80241DC0 8E03006C */ lw $v1, 0x6c($s0) -/* C382F4 80241DC4 2404FEFF */ addiu $a0, $zero, -0x101 -/* C382F8 80241DC8 00641824 */ and $v1, $v1, $a0 -/* C382FC 80241DCC AE03006C */ sw $v1, 0x6c($s0) -/* C38300 80241DD0 8C430000 */ lw $v1, ($v0) -/* C38304 80241DD4 34A5FFFF */ ori $a1, $a1, 0xffff -/* C38308 80241DD8 00651824 */ and $v1, $v1, $a1 -/* C3830C 80241DDC AC430000 */ sw $v1, ($v0) -/* C38310 80241DE0 C6200000 */ lwc1 $f0, ($s1) -/* C38314 80241DE4 46000021 */ cvt.d.s $f0, $f0 -/* C38318 80241DE8 46200000 */ add.d $f0, $f0, $f0 -/* C3831C 80241DEC 46200020 */ cvt.s.d $f0, $f0 -/* C38320 80241DF0 E4400018 */ swc1 $f0, 0x18($v0) -/* C38324 80241DF4 AE000074 */ sw $zero, 0x74($s0) -/* C38328 80241DF8 C440003C */ lwc1 $f0, 0x3c($v0) -/* C3832C 80241DFC 3C014059 */ lui $at, 0x4059 -/* C38330 80241E00 44811800 */ mtc1 $at, $f3 -/* C38334 80241E04 44801000 */ mtc1 $zero, $f2 -/* C38338 80241E08 46000021 */ cvt.d.s $f0, $f0 -/* C3833C 80241E0C 46220002 */ mul.d $f0, $f0, $f2 -/* C38340 80241E10 00000000 */ nop -/* C38344 80241E14 2402001E */ addiu $v0, $zero, 0x1e -/* C38348 80241E18 4620010D */ trunc.w.d $f4, $f0 -/* C3834C 80241E1C E604007C */ swc1 $f4, 0x7c($s0) -/* C38350 80241E20 AE420074 */ sw $v0, 0x74($s2) -/* C38354 80241E24 8FBF001C */ lw $ra, 0x1c($sp) -/* C38358 80241E28 8FB20018 */ lw $s2, 0x18($sp) -/* C3835C 80241E2C 8FB10014 */ lw $s1, 0x14($sp) -/* C38360 80241E30 8FB00010 */ lw $s0, 0x10($sp) -/* C38364 80241E34 03E00008 */ jr $ra -/* C38368 80241E38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s new file mode 100644 index 0000000000..ce8a6b5e84 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241D94_C382C4.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D94_C382C4 +/* C382C4 80241D94 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C382C8 80241D98 AFB20018 */ sw $s2, 0x18($sp) +/* C382CC 80241D9C 0080902D */ daddu $s2, $a0, $zero +/* C382D0 80241DA0 AFBF001C */ sw $ra, 0x1c($sp) +/* C382D4 80241DA4 AFB10014 */ sw $s1, 0x14($sp) +/* C382D8 80241DA8 AFB00010 */ sw $s0, 0x10($sp) +/* C382DC 80241DAC 8E500148 */ lw $s0, 0x148($s2) +/* C382E0 80241DB0 86040008 */ lh $a0, 8($s0) +/* C382E4 80241DB4 0C00EABB */ jal get_npc_unsafe +/* C382E8 80241DB8 00A0882D */ daddu $s1, $a1, $zero +/* C382EC 80241DBC 3C05FFDF */ lui $a1, 0xffdf +/* C382F0 80241DC0 8E03006C */ lw $v1, 0x6c($s0) +/* C382F4 80241DC4 2404FEFF */ addiu $a0, $zero, -0x101 +/* C382F8 80241DC8 00641824 */ and $v1, $v1, $a0 +/* C382FC 80241DCC AE03006C */ sw $v1, 0x6c($s0) +/* C38300 80241DD0 8C430000 */ lw $v1, ($v0) +/* C38304 80241DD4 34A5FFFF */ ori $a1, $a1, 0xffff +/* C38308 80241DD8 00651824 */ and $v1, $v1, $a1 +/* C3830C 80241DDC AC430000 */ sw $v1, ($v0) +/* C38310 80241DE0 C6200000 */ lwc1 $f0, ($s1) +/* C38314 80241DE4 46000021 */ cvt.d.s $f0, $f0 +/* C38318 80241DE8 46200000 */ add.d $f0, $f0, $f0 +/* C3831C 80241DEC 46200020 */ cvt.s.d $f0, $f0 +/* C38320 80241DF0 E4400018 */ swc1 $f0, 0x18($v0) +/* C38324 80241DF4 AE000074 */ sw $zero, 0x74($s0) +/* C38328 80241DF8 C440003C */ lwc1 $f0, 0x3c($v0) +/* C3832C 80241DFC 3C014059 */ lui $at, 0x4059 +/* C38330 80241E00 44811800 */ mtc1 $at, $f3 +/* C38334 80241E04 44801000 */ mtc1 $zero, $f2 +/* C38338 80241E08 46000021 */ cvt.d.s $f0, $f0 +/* C3833C 80241E0C 46220002 */ mul.d $f0, $f0, $f2 +/* C38340 80241E10 00000000 */ nop +/* C38344 80241E14 2402001E */ addiu $v0, $zero, 0x1e +/* C38348 80241E18 4620010D */ trunc.w.d $f4, $f0 +/* C3834C 80241E1C E604007C */ swc1 $f4, 0x7c($s0) +/* C38350 80241E20 AE420074 */ sw $v0, 0x74($s2) +/* C38354 80241E24 8FBF001C */ lw $ra, 0x1c($sp) +/* C38358 80241E28 8FB20018 */ lw $s2, 0x18($sp) +/* C3835C 80241E2C 8FB10014 */ lw $s1, 0x14($sp) +/* C38360 80241E30 8FB00010 */ lw $s0, 0x10($sp) +/* C38364 80241E34 03E00008 */ jr $ra +/* C38368 80241E38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C.s deleted file mode 100644 index 27ebf65e89..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C.s +++ /dev/null @@ -1,207 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E3C -/* C3836C 80241E3C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C38370 80241E40 AFB20048 */ sw $s2, 0x48($sp) -/* C38374 80241E44 0080902D */ daddu $s2, $a0, $zero -/* C38378 80241E48 AFBF0054 */ sw $ra, 0x54($sp) -/* C3837C 80241E4C AFB40050 */ sw $s4, 0x50($sp) -/* C38380 80241E50 AFB3004C */ sw $s3, 0x4c($sp) -/* C38384 80241E54 AFB10044 */ sw $s1, 0x44($sp) -/* C38388 80241E58 AFB00040 */ sw $s0, 0x40($sp) -/* C3838C 80241E5C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C38390 80241E60 F7B80068 */ sdc1 $f24, 0x68($sp) -/* C38394 80241E64 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C38398 80241E68 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C3839C 80241E6C 8E500148 */ lw $s0, 0x148($s2) -/* C383A0 80241E70 00A0982D */ daddu $s3, $a1, $zero -/* C383A4 80241E74 86040008 */ lh $a0, 8($s0) -/* C383A8 80241E78 0C00EABB */ jal get_npc_unsafe -/* C383AC 80241E7C 00C0A02D */ daddu $s4, $a2, $zero -/* C383B0 80241E80 0040882D */ daddu $s1, $v0, $zero -/* C383B4 80241E84 C6200038 */ lwc1 $f0, 0x38($s1) -/* C383B8 80241E88 C622003C */ lwc1 $f2, 0x3c($s1) -/* C383BC 80241E8C C6240040 */ lwc1 $f4, 0x40($s1) -/* C383C0 80241E90 3C01447A */ lui $at, 0x447a -/* C383C4 80241E94 44813000 */ mtc1 $at, $f6 -/* C383C8 80241E98 C60C0074 */ lwc1 $f12, 0x74($s0) -/* C383CC 80241E9C 46806320 */ cvt.s.w $f12, $f12 -/* C383D0 80241EA0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C383D4 80241EA4 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C383D8 80241EA8 E7A40030 */ swc1 $f4, 0x30($sp) -/* C383DC 80241EAC E7A60034 */ swc1 $f6, 0x34($sp) -/* C383E0 80241EB0 C6000078 */ lwc1 $f0, 0x78($s0) -/* C383E4 80241EB4 46800020 */ cvt.s.w $f0, $f0 -/* C383E8 80241EB8 46000021 */ cvt.d.s $f0, $f0 -/* C383EC 80241EBC C6020088 */ lwc1 $f2, 0x88($s0) -/* C383F0 80241EC0 468010A0 */ cvt.s.w $f2, $f2 -/* C383F4 80241EC4 3C014059 */ lui $at, 0x4059 -/* C383F8 80241EC8 44812800 */ mtc1 $at, $f5 -/* C383FC 80241ECC 44802000 */ mtc1 $zero, $f4 -/* C38400 80241ED0 460010A1 */ cvt.d.s $f2, $f2 -/* C38404 80241ED4 46240003 */ div.d $f0, $f0, $f4 -/* C38408 80241ED8 462006A0 */ cvt.s.d $f26, $f0 -/* C3840C 80241EDC 46241083 */ div.d $f2, $f2, $f4 -/* C38410 80241EE0 462010A0 */ cvt.s.d $f2, $f2 -/* C38414 80241EE4 C6000070 */ lwc1 $f0, 0x70($s0) -/* C38418 80241EE8 46800020 */ cvt.s.w $f0, $f0 -/* C3841C 80241EEC 46000021 */ cvt.d.s $f0, $f0 -/* C38420 80241EF0 46240003 */ div.d $f0, $f0, $f4 -/* C38424 80241EF4 462005A0 */ cvt.s.d $f22, $f0 -/* C38428 80241EF8 0C00A8BB */ jal sin_deg -/* C3842C 80241EFC 4602D600 */ add.s $f24, $f26, $f2 -/* C38430 80241F00 27A50028 */ addiu $a1, $sp, 0x28 -/* C38434 80241F04 27A6002C */ addiu $a2, $sp, 0x2c -/* C38438 80241F08 27A70030 */ addiu $a3, $sp, 0x30 -/* C3843C 80241F0C 27A20034 */ addiu $v0, $sp, 0x34 -/* C38440 80241F10 AFA20010 */ sw $v0, 0x10($sp) -/* C38444 80241F14 8E240080 */ lw $a0, 0x80($s1) -/* C38448 80241F18 0C0372DF */ jal func_800DCB7C -/* C3844C 80241F1C 46000506 */ mov.s $f20, $f0 -/* C38450 80241F20 10400007 */ beqz $v0, .L80241F40 -/* C38454 80241F24 00000000 */ nop -/* C38458 80241F28 4616A082 */ mul.s $f2, $f20, $f22 -/* C3845C 80241F2C 00000000 */ nop -/* C38460 80241F30 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C38464 80241F34 461A0000 */ add.s $f0, $f0, $f26 -/* C38468 80241F38 080907D3 */ j .L80241F4C -/* C3846C 80241F3C 46020000 */ add.s $f0, $f0, $f2 -.L80241F40: -/* C38470 80241F40 4616A002 */ mul.s $f0, $f20, $f22 -/* C38474 80241F44 00000000 */ nop -/* C38478 80241F48 4600C000 */ add.s $f0, $f24, $f0 -.L80241F4C: -/* C3847C 80241F4C E620003C */ swc1 $f0, 0x3c($s1) -/* C38480 80241F50 8E020074 */ lw $v0, 0x74($s0) -/* C38484 80241F54 2442000C */ addiu $v0, $v0, 0xc -/* C38488 80241F58 44826000 */ mtc1 $v0, $f12 -/* C3848C 80241F5C 00000000 */ nop -/* C38490 80241F60 0C00A6C9 */ jal clamp_angle -/* C38494 80241F64 46806320 */ cvt.s.w $f12, $f12 -/* C38498 80241F68 4600020D */ trunc.w.s $f8, $f0 -/* C3849C 80241F6C E6080074 */ swc1 $f8, 0x74($s0) -/* C384A0 80241F70 8E420074 */ lw $v0, 0x74($s2) -/* C384A4 80241F74 1C400037 */ bgtz $v0, .L80242054 -/* C384A8 80241F78 2442FFFF */ addiu $v0, $v0, -1 -/* C384AC 80241F7C 8E620014 */ lw $v0, 0x14($s3) -/* C384B0 80241F80 AE420074 */ sw $v0, 0x74($s2) -/* C384B4 80241F84 C662000C */ lwc1 $f2, 0xc($s3) -/* C384B8 80241F88 3C013FE0 */ lui $at, 0x3fe0 -/* C384BC 80241F8C 44812800 */ mtc1 $at, $f5 -/* C384C0 80241F90 44802000 */ mtc1 $zero, $f4 -/* C384C4 80241F94 460010A1 */ cvt.d.s $f2, $f2 -/* C384C8 80241F98 46241082 */ mul.d $f2, $f2, $f4 -/* C384CC 80241F9C 00000000 */ nop -/* C384D0 80241FA0 C6600010 */ lwc1 $f0, 0x10($s3) -/* C384D4 80241FA4 46000021 */ cvt.d.s $f0, $f0 -/* C384D8 80241FA8 46240002 */ mul.d $f0, $f0, $f4 -/* C384DC 80241FAC 00000000 */ nop -/* C384E0 80241FB0 0280202D */ daddu $a0, $s4, $zero -/* C384E4 80241FB4 462010A0 */ cvt.s.d $f2, $f2 -/* C384E8 80241FB8 46200020 */ cvt.s.d $f0, $f0 -/* C384EC 80241FBC 44061000 */ mfc1 $a2, $f2 -/* C384F0 80241FC0 44070000 */ mfc1 $a3, $f0 -/* C384F4 80241FC4 0200282D */ daddu $a1, $s0, $zero -/* C384F8 80241FC8 0C01242D */ jal func_800490B4 -/* C384FC 80241FCC AFA00010 */ sw $zero, 0x10($sp) -/* C38500 80241FD0 1040001E */ beqz $v0, .L8024204C -/* C38504 80241FD4 0000202D */ daddu $a0, $zero, $zero -/* C38508 80241FD8 0220282D */ daddu $a1, $s1, $zero -/* C3850C 80241FDC 0000302D */ daddu $a2, $zero, $zero -/* C38510 80241FE0 2410000C */ addiu $s0, $zero, 0xc -/* C38514 80241FE4 862300A8 */ lh $v1, 0xa8($s1) -/* C38518 80241FE8 3C013F80 */ lui $at, 0x3f80 -/* C3851C 80241FEC 44810000 */ mtc1 $at, $f0 -/* C38520 80241FF0 3C014000 */ lui $at, 0x4000 -/* C38524 80241FF4 44811000 */ mtc1 $at, $f2 -/* C38528 80241FF8 3C01C1A0 */ lui $at, 0xc1a0 -/* C3852C 80241FFC 44812000 */ mtc1 $at, $f4 -/* C38530 80242000 44834000 */ mtc1 $v1, $f8 -/* C38534 80242004 00000000 */ nop -/* C38538 80242008 46804220 */ cvt.s.w $f8, $f8 -/* C3853C 8024200C 44074000 */ mfc1 $a3, $f8 -/* C38540 80242010 27A20038 */ addiu $v0, $sp, 0x38 -/* C38544 80242014 AFB0001C */ sw $s0, 0x1c($sp) -/* C38548 80242018 AFA20020 */ sw $v0, 0x20($sp) -/* C3854C 8024201C E7A00010 */ swc1 $f0, 0x10($sp) -/* C38550 80242020 E7A20014 */ swc1 $f2, 0x14($sp) -/* C38554 80242024 0C01BFA4 */ jal fx_emote -/* C38558 80242028 E7A40018 */ swc1 $f4, 0x18($sp) -/* C3855C 8024202C 0220202D */ daddu $a0, $s1, $zero -/* C38560 80242030 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C38564 80242034 0C012530 */ jal func_800494C0 -/* C38568 80242038 3C060020 */ lui $a2, 0x20 -/* C3856C 8024203C C620003C */ lwc1 $f0, 0x3c($s1) -/* C38570 80242040 E6200064 */ swc1 $f0, 0x64($s1) -/* C38574 80242044 08090849 */ j .L80242124 -/* C38578 80242048 AE500070 */ sw $s0, 0x70($s2) -.L8024204C: -/* C3857C 8024204C 8E420074 */ lw $v0, 0x74($s2) -/* C38580 80242050 2442FFFF */ addiu $v0, $v0, -1 -.L80242054: -/* C38584 80242054 AE420074 */ sw $v0, 0x74($s2) -/* C38588 80242058 8622008C */ lh $v0, 0x8c($s1) -/* C3858C 8024205C 14400031 */ bnez $v0, .L80242124 -/* C38590 80242060 00000000 */ nop -/* C38594 80242064 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C38598 80242068 8E0200D0 */ lw $v0, 0xd0($s0) -/* C3859C 8024206C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C385A0 80242070 C4480000 */ lwc1 $f8, ($v0) -/* C385A4 80242074 46804220 */ cvt.s.w $f8, $f8 -/* C385A8 80242078 44064000 */ mfc1 $a2, $f8 -/* C385AC 8024207C C4480008 */ lwc1 $f8, 8($v0) -/* C385B0 80242080 46804220 */ cvt.s.w $f8, $f8 -/* C385B4 80242084 44074000 */ mfc1 $a3, $f8 -/* C385B8 80242088 0C00A720 */ jal atan2 -/* C385BC 8024208C 00000000 */ nop -/* C385C0 80242090 8E250018 */ lw $a1, 0x18($s1) -/* C385C4 80242094 44060000 */ mfc1 $a2, $f0 -/* C385C8 80242098 0220202D */ daddu $a0, $s1, $zero -/* C385CC 8024209C 0C00EA95 */ jal npc_move_heading -/* C385D0 802420A0 AE26000C */ sw $a2, 0xc($s1) -/* C385D4 802420A4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C385D8 802420A8 8E0200D0 */ lw $v0, 0xd0($s0) -/* C385DC 802420AC C62E0040 */ lwc1 $f14, 0x40($s1) -/* C385E0 802420B0 C4480000 */ lwc1 $f8, ($v0) -/* C385E4 802420B4 46804220 */ cvt.s.w $f8, $f8 -/* C385E8 802420B8 44064000 */ mfc1 $a2, $f8 -/* C385EC 802420BC C4480008 */ lwc1 $f8, 8($v0) -/* C385F0 802420C0 46804220 */ cvt.s.w $f8, $f8 -/* C385F4 802420C4 44074000 */ mfc1 $a3, $f8 -/* C385F8 802420C8 0C00A7B5 */ jal dist2D -/* C385FC 802420CC 00000000 */ nop -/* C38600 802420D0 C6220018 */ lwc1 $f2, 0x18($s1) -/* C38604 802420D4 46021080 */ add.s $f2, $f2, $f2 -/* C38608 802420D8 4602003E */ c.le.s $f0, $f2 -/* C3860C 802420DC 00000000 */ nop -/* C38610 802420E0 45000010 */ bc1f .L80242124 -/* C38614 802420E4 E7A00034 */ swc1 $f0, 0x34($sp) -/* C38618 802420E8 0C00A67F */ jal rand_int -/* C3861C 802420EC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C38620 802420F0 3C035555 */ lui $v1, 0x5555 -/* C38624 802420F4 34635556 */ ori $v1, $v1, 0x5556 -/* C38628 802420F8 00430018 */ mult $v0, $v1 -/* C3862C 802420FC 24030002 */ addiu $v1, $zero, 2 -/* C38630 80242100 000227C3 */ sra $a0, $v0, 0x1f -/* C38634 80242104 AE430070 */ sw $v1, 0x70($s2) -/* C38638 80242108 00004010 */ mfhi $t0 -/* C3863C 8024210C 01042023 */ subu $a0, $t0, $a0 -/* C38640 80242110 00041840 */ sll $v1, $a0, 1 -/* C38644 80242114 00641821 */ addu $v1, $v1, $a0 -/* C38648 80242118 00431023 */ subu $v0, $v0, $v1 -/* C3864C 8024211C 24420002 */ addiu $v0, $v0, 2 -/* C38650 80242120 AE420074 */ sw $v0, 0x74($s2) -.L80242124: -/* C38654 80242124 8FBF0054 */ lw $ra, 0x54($sp) -/* C38658 80242128 8FB40050 */ lw $s4, 0x50($sp) -/* C3865C 8024212C 8FB3004C */ lw $s3, 0x4c($sp) -/* C38660 80242130 8FB20048 */ lw $s2, 0x48($sp) -/* C38664 80242134 8FB10044 */ lw $s1, 0x44($sp) -/* C38668 80242138 8FB00040 */ lw $s0, 0x40($sp) -/* C3866C 8024213C D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C38670 80242140 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C38674 80242144 D7B60060 */ ldc1 $f22, 0x60($sp) -/* C38678 80242148 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C3867C 8024214C 03E00008 */ jr $ra -/* C38680 80242150 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s new file mode 100644 index 0000000000..108c44cec6 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80241E3C_C3836C.s @@ -0,0 +1,207 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E3C_C3836C +/* C3836C 80241E3C 27BDFF88 */ addiu $sp, $sp, -0x78 +/* C38370 80241E40 AFB20048 */ sw $s2, 0x48($sp) +/* C38374 80241E44 0080902D */ daddu $s2, $a0, $zero +/* C38378 80241E48 AFBF0054 */ sw $ra, 0x54($sp) +/* C3837C 80241E4C AFB40050 */ sw $s4, 0x50($sp) +/* C38380 80241E50 AFB3004C */ sw $s3, 0x4c($sp) +/* C38384 80241E54 AFB10044 */ sw $s1, 0x44($sp) +/* C38388 80241E58 AFB00040 */ sw $s0, 0x40($sp) +/* C3838C 80241E5C F7BA0070 */ sdc1 $f26, 0x70($sp) +/* C38390 80241E60 F7B80068 */ sdc1 $f24, 0x68($sp) +/* C38394 80241E64 F7B60060 */ sdc1 $f22, 0x60($sp) +/* C38398 80241E68 F7B40058 */ sdc1 $f20, 0x58($sp) +/* C3839C 80241E6C 8E500148 */ lw $s0, 0x148($s2) +/* C383A0 80241E70 00A0982D */ daddu $s3, $a1, $zero +/* C383A4 80241E74 86040008 */ lh $a0, 8($s0) +/* C383A8 80241E78 0C00EABB */ jal get_npc_unsafe +/* C383AC 80241E7C 00C0A02D */ daddu $s4, $a2, $zero +/* C383B0 80241E80 0040882D */ daddu $s1, $v0, $zero +/* C383B4 80241E84 C6200038 */ lwc1 $f0, 0x38($s1) +/* C383B8 80241E88 C622003C */ lwc1 $f2, 0x3c($s1) +/* C383BC 80241E8C C6240040 */ lwc1 $f4, 0x40($s1) +/* C383C0 80241E90 3C01447A */ lui $at, 0x447a +/* C383C4 80241E94 44813000 */ mtc1 $at, $f6 +/* C383C8 80241E98 C60C0074 */ lwc1 $f12, 0x74($s0) +/* C383CC 80241E9C 46806320 */ cvt.s.w $f12, $f12 +/* C383D0 80241EA0 E7A00028 */ swc1 $f0, 0x28($sp) +/* C383D4 80241EA4 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C383D8 80241EA8 E7A40030 */ swc1 $f4, 0x30($sp) +/* C383DC 80241EAC E7A60034 */ swc1 $f6, 0x34($sp) +/* C383E0 80241EB0 C6000078 */ lwc1 $f0, 0x78($s0) +/* C383E4 80241EB4 46800020 */ cvt.s.w $f0, $f0 +/* C383E8 80241EB8 46000021 */ cvt.d.s $f0, $f0 +/* C383EC 80241EBC C6020088 */ lwc1 $f2, 0x88($s0) +/* C383F0 80241EC0 468010A0 */ cvt.s.w $f2, $f2 +/* C383F4 80241EC4 3C014059 */ lui $at, 0x4059 +/* C383F8 80241EC8 44812800 */ mtc1 $at, $f5 +/* C383FC 80241ECC 44802000 */ mtc1 $zero, $f4 +/* C38400 80241ED0 460010A1 */ cvt.d.s $f2, $f2 +/* C38404 80241ED4 46240003 */ div.d $f0, $f0, $f4 +/* C38408 80241ED8 462006A0 */ cvt.s.d $f26, $f0 +/* C3840C 80241EDC 46241083 */ div.d $f2, $f2, $f4 +/* C38410 80241EE0 462010A0 */ cvt.s.d $f2, $f2 +/* C38414 80241EE4 C6000070 */ lwc1 $f0, 0x70($s0) +/* C38418 80241EE8 46800020 */ cvt.s.w $f0, $f0 +/* C3841C 80241EEC 46000021 */ cvt.d.s $f0, $f0 +/* C38420 80241EF0 46240003 */ div.d $f0, $f0, $f4 +/* C38424 80241EF4 462005A0 */ cvt.s.d $f22, $f0 +/* C38428 80241EF8 0C00A8BB */ jal sin_deg +/* C3842C 80241EFC 4602D600 */ add.s $f24, $f26, $f2 +/* C38430 80241F00 27A50028 */ addiu $a1, $sp, 0x28 +/* C38434 80241F04 27A6002C */ addiu $a2, $sp, 0x2c +/* C38438 80241F08 27A70030 */ addiu $a3, $sp, 0x30 +/* C3843C 80241F0C 27A20034 */ addiu $v0, $sp, 0x34 +/* C38440 80241F10 AFA20010 */ sw $v0, 0x10($sp) +/* C38444 80241F14 8E240080 */ lw $a0, 0x80($s1) +/* C38448 80241F18 0C0372DF */ jal func_800DCB7C +/* C3844C 80241F1C 46000506 */ mov.s $f20, $f0 +/* C38450 80241F20 10400007 */ beqz $v0, .L80241F40 +/* C38454 80241F24 00000000 */ nop +/* C38458 80241F28 4616A082 */ mul.s $f2, $f20, $f22 +/* C3845C 80241F2C 00000000 */ nop +/* C38460 80241F30 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C38464 80241F34 461A0000 */ add.s $f0, $f0, $f26 +/* C38468 80241F38 080907D3 */ j .L80241F4C +/* C3846C 80241F3C 46020000 */ add.s $f0, $f0, $f2 +.L80241F40: +/* C38470 80241F40 4616A002 */ mul.s $f0, $f20, $f22 +/* C38474 80241F44 00000000 */ nop +/* C38478 80241F48 4600C000 */ add.s $f0, $f24, $f0 +.L80241F4C: +/* C3847C 80241F4C E620003C */ swc1 $f0, 0x3c($s1) +/* C38480 80241F50 8E020074 */ lw $v0, 0x74($s0) +/* C38484 80241F54 2442000C */ addiu $v0, $v0, 0xc +/* C38488 80241F58 44826000 */ mtc1 $v0, $f12 +/* C3848C 80241F5C 00000000 */ nop +/* C38490 80241F60 0C00A6C9 */ jal clamp_angle +/* C38494 80241F64 46806320 */ cvt.s.w $f12, $f12 +/* C38498 80241F68 4600020D */ trunc.w.s $f8, $f0 +/* C3849C 80241F6C E6080074 */ swc1 $f8, 0x74($s0) +/* C384A0 80241F70 8E420074 */ lw $v0, 0x74($s2) +/* C384A4 80241F74 1C400037 */ bgtz $v0, .L80242054 +/* C384A8 80241F78 2442FFFF */ addiu $v0, $v0, -1 +/* C384AC 80241F7C 8E620014 */ lw $v0, 0x14($s3) +/* C384B0 80241F80 AE420074 */ sw $v0, 0x74($s2) +/* C384B4 80241F84 C662000C */ lwc1 $f2, 0xc($s3) +/* C384B8 80241F88 3C013FE0 */ lui $at, 0x3fe0 +/* C384BC 80241F8C 44812800 */ mtc1 $at, $f5 +/* C384C0 80241F90 44802000 */ mtc1 $zero, $f4 +/* C384C4 80241F94 460010A1 */ cvt.d.s $f2, $f2 +/* C384C8 80241F98 46241082 */ mul.d $f2, $f2, $f4 +/* C384CC 80241F9C 00000000 */ nop +/* C384D0 80241FA0 C6600010 */ lwc1 $f0, 0x10($s3) +/* C384D4 80241FA4 46000021 */ cvt.d.s $f0, $f0 +/* C384D8 80241FA8 46240002 */ mul.d $f0, $f0, $f4 +/* C384DC 80241FAC 00000000 */ nop +/* C384E0 80241FB0 0280202D */ daddu $a0, $s4, $zero +/* C384E4 80241FB4 462010A0 */ cvt.s.d $f2, $f2 +/* C384E8 80241FB8 46200020 */ cvt.s.d $f0, $f0 +/* C384EC 80241FBC 44061000 */ mfc1 $a2, $f2 +/* C384F0 80241FC0 44070000 */ mfc1 $a3, $f0 +/* C384F4 80241FC4 0200282D */ daddu $a1, $s0, $zero +/* C384F8 80241FC8 0C01242D */ jal func_800490B4 +/* C384FC 80241FCC AFA00010 */ sw $zero, 0x10($sp) +/* C38500 80241FD0 1040001E */ beqz $v0, .L8024204C +/* C38504 80241FD4 0000202D */ daddu $a0, $zero, $zero +/* C38508 80241FD8 0220282D */ daddu $a1, $s1, $zero +/* C3850C 80241FDC 0000302D */ daddu $a2, $zero, $zero +/* C38510 80241FE0 2410000C */ addiu $s0, $zero, 0xc +/* C38514 80241FE4 862300A8 */ lh $v1, 0xa8($s1) +/* C38518 80241FE8 3C013F80 */ lui $at, 0x3f80 +/* C3851C 80241FEC 44810000 */ mtc1 $at, $f0 +/* C38520 80241FF0 3C014000 */ lui $at, 0x4000 +/* C38524 80241FF4 44811000 */ mtc1 $at, $f2 +/* C38528 80241FF8 3C01C1A0 */ lui $at, 0xc1a0 +/* C3852C 80241FFC 44812000 */ mtc1 $at, $f4 +/* C38530 80242000 44834000 */ mtc1 $v1, $f8 +/* C38534 80242004 00000000 */ nop +/* C38538 80242008 46804220 */ cvt.s.w $f8, $f8 +/* C3853C 8024200C 44074000 */ mfc1 $a3, $f8 +/* C38540 80242010 27A20038 */ addiu $v0, $sp, 0x38 +/* C38544 80242014 AFB0001C */ sw $s0, 0x1c($sp) +/* C38548 80242018 AFA20020 */ sw $v0, 0x20($sp) +/* C3854C 8024201C E7A00010 */ swc1 $f0, 0x10($sp) +/* C38550 80242020 E7A20014 */ swc1 $f2, 0x14($sp) +/* C38554 80242024 0C01BFA4 */ jal fx_emote +/* C38558 80242028 E7A40018 */ swc1 $f4, 0x18($sp) +/* C3855C 8024202C 0220202D */ daddu $a0, $s1, $zero +/* C38560 80242030 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C38564 80242034 0C012530 */ jal func_800494C0 +/* C38568 80242038 3C060020 */ lui $a2, 0x20 +/* C3856C 8024203C C620003C */ lwc1 $f0, 0x3c($s1) +/* C38570 80242040 E6200064 */ swc1 $f0, 0x64($s1) +/* C38574 80242044 08090849 */ j .L80242124 +/* C38578 80242048 AE500070 */ sw $s0, 0x70($s2) +.L8024204C: +/* C3857C 8024204C 8E420074 */ lw $v0, 0x74($s2) +/* C38580 80242050 2442FFFF */ addiu $v0, $v0, -1 +.L80242054: +/* C38584 80242054 AE420074 */ sw $v0, 0x74($s2) +/* C38588 80242058 8622008C */ lh $v0, 0x8c($s1) +/* C3858C 8024205C 14400031 */ bnez $v0, .L80242124 +/* C38590 80242060 00000000 */ nop +/* C38594 80242064 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C38598 80242068 8E0200D0 */ lw $v0, 0xd0($s0) +/* C3859C 8024206C C62E0040 */ lwc1 $f14, 0x40($s1) +/* C385A0 80242070 C4480000 */ lwc1 $f8, ($v0) +/* C385A4 80242074 46804220 */ cvt.s.w $f8, $f8 +/* C385A8 80242078 44064000 */ mfc1 $a2, $f8 +/* C385AC 8024207C C4480008 */ lwc1 $f8, 8($v0) +/* C385B0 80242080 46804220 */ cvt.s.w $f8, $f8 +/* C385B4 80242084 44074000 */ mfc1 $a3, $f8 +/* C385B8 80242088 0C00A720 */ jal atan2 +/* C385BC 8024208C 00000000 */ nop +/* C385C0 80242090 8E250018 */ lw $a1, 0x18($s1) +/* C385C4 80242094 44060000 */ mfc1 $a2, $f0 +/* C385C8 80242098 0220202D */ daddu $a0, $s1, $zero +/* C385CC 8024209C 0C00EA95 */ jal npc_move_heading +/* C385D0 802420A0 AE26000C */ sw $a2, 0xc($s1) +/* C385D4 802420A4 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C385D8 802420A8 8E0200D0 */ lw $v0, 0xd0($s0) +/* C385DC 802420AC C62E0040 */ lwc1 $f14, 0x40($s1) +/* C385E0 802420B0 C4480000 */ lwc1 $f8, ($v0) +/* C385E4 802420B4 46804220 */ cvt.s.w $f8, $f8 +/* C385E8 802420B8 44064000 */ mfc1 $a2, $f8 +/* C385EC 802420BC C4480008 */ lwc1 $f8, 8($v0) +/* C385F0 802420C0 46804220 */ cvt.s.w $f8, $f8 +/* C385F4 802420C4 44074000 */ mfc1 $a3, $f8 +/* C385F8 802420C8 0C00A7B5 */ jal dist2D +/* C385FC 802420CC 00000000 */ nop +/* C38600 802420D0 C6220018 */ lwc1 $f2, 0x18($s1) +/* C38604 802420D4 46021080 */ add.s $f2, $f2, $f2 +/* C38608 802420D8 4602003E */ c.le.s $f0, $f2 +/* C3860C 802420DC 00000000 */ nop +/* C38610 802420E0 45000010 */ bc1f .L80242124 +/* C38614 802420E4 E7A00034 */ swc1 $f0, 0x34($sp) +/* C38618 802420E8 0C00A67F */ jal rand_int +/* C3861C 802420EC 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C38620 802420F0 3C035555 */ lui $v1, 0x5555 +/* C38624 802420F4 34635556 */ ori $v1, $v1, 0x5556 +/* C38628 802420F8 00430018 */ mult $v0, $v1 +/* C3862C 802420FC 24030002 */ addiu $v1, $zero, 2 +/* C38630 80242100 000227C3 */ sra $a0, $v0, 0x1f +/* C38634 80242104 AE430070 */ sw $v1, 0x70($s2) +/* C38638 80242108 00004010 */ mfhi $t0 +/* C3863C 8024210C 01042023 */ subu $a0, $t0, $a0 +/* C38640 80242110 00041840 */ sll $v1, $a0, 1 +/* C38644 80242114 00641821 */ addu $v1, $v1, $a0 +/* C38648 80242118 00431023 */ subu $v0, $v0, $v1 +/* C3864C 8024211C 24420002 */ addiu $v0, $v0, 2 +/* C38650 80242120 AE420074 */ sw $v0, 0x74($s2) +.L80242124: +/* C38654 80242124 8FBF0054 */ lw $ra, 0x54($sp) +/* C38658 80242128 8FB40050 */ lw $s4, 0x50($sp) +/* C3865C 8024212C 8FB3004C */ lw $s3, 0x4c($sp) +/* C38660 80242130 8FB20048 */ lw $s2, 0x48($sp) +/* C38664 80242134 8FB10044 */ lw $s1, 0x44($sp) +/* C38668 80242138 8FB00040 */ lw $s0, 0x40($sp) +/* C3866C 8024213C D7BA0070 */ ldc1 $f26, 0x70($sp) +/* C38670 80242140 D7B80068 */ ldc1 $f24, 0x68($sp) +/* C38674 80242144 D7B60060 */ ldc1 $f22, 0x60($sp) +/* C38678 80242148 D7B40058 */ ldc1 $f20, 0x58($sp) +/* C3867C 8024214C 03E00008 */ jr $ra +/* C38680 80242150 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154.s deleted file mode 100644 index ac1fed8d87..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154.s +++ /dev/null @@ -1,166 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242154 -/* C38684 80242154 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C38688 80242158 AFB40050 */ sw $s4, 0x50($sp) -/* C3868C 8024215C 0080A02D */ daddu $s4, $a0, $zero -/* C38690 80242160 AFBF0058 */ sw $ra, 0x58($sp) -/* C38694 80242164 AFB50054 */ sw $s5, 0x54($sp) -/* C38698 80242168 AFB3004C */ sw $s3, 0x4c($sp) -/* C3869C 8024216C AFB20048 */ sw $s2, 0x48($sp) -/* C386A0 80242170 AFB10044 */ sw $s1, 0x44($sp) -/* C386A4 80242174 AFB00040 */ sw $s0, 0x40($sp) -/* C386A8 80242178 8E920148 */ lw $s2, 0x148($s4) -/* C386AC 8024217C 86440008 */ lh $a0, 8($s2) -/* C386B0 80242180 0C00EABB */ jal get_npc_unsafe -/* C386B4 80242184 00A0802D */ daddu $s0, $a1, $zero -/* C386B8 80242188 8E83000C */ lw $v1, 0xc($s4) -/* C386BC 8024218C 0280202D */ daddu $a0, $s4, $zero -/* C386C0 80242190 8C650000 */ lw $a1, ($v1) -/* C386C4 80242194 0C0B1EAF */ jal get_variable -/* C386C8 80242198 0040A82D */ daddu $s5, $v0, $zero -/* C386CC 8024219C AFA00020 */ sw $zero, 0x20($sp) -/* C386D0 802421A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C386D4 802421A4 8C630030 */ lw $v1, 0x30($v1) -/* C386D8 802421A8 AFA30024 */ sw $v1, 0x24($sp) -/* C386DC 802421AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C386E0 802421B0 8C63001C */ lw $v1, 0x1c($v1) -/* C386E4 802421B4 AFA30028 */ sw $v1, 0x28($sp) -/* C386E8 802421B8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C386EC 802421BC 8C630024 */ lw $v1, 0x24($v1) -/* C386F0 802421C0 AFA3002C */ sw $v1, 0x2c($sp) -/* C386F4 802421C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C386F8 802421C8 8C630028 */ lw $v1, 0x28($v1) -/* C386FC 802421CC 27B30020 */ addiu $s3, $sp, 0x20 -/* C38700 802421D0 AFA30030 */ sw $v1, 0x30($sp) -/* C38704 802421D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C38708 802421D8 3C0142FA */ lui $at, 0x42fa -/* C3870C 802421DC 44810000 */ mtc1 $at, $f0 -/* C38710 802421E0 8C63002C */ lw $v1, 0x2c($v1) -/* C38714 802421E4 0040882D */ daddu $s1, $v0, $zero -/* C38718 802421E8 E7A00038 */ swc1 $f0, 0x38($sp) -/* C3871C 802421EC A7A0003C */ sh $zero, 0x3c($sp) -/* C38720 802421F0 12000007 */ beqz $s0, .L80242210 -/* C38724 802421F4 AFA30034 */ sw $v1, 0x34($sp) -/* C38728 802421F8 AE800070 */ sw $zero, 0x70($s4) -/* C3872C 802421FC 02A0202D */ daddu $a0, $s5, $zero -/* C38730 80242200 0240282D */ daddu $a1, $s2, $zero -/* C38734 80242204 0280302D */ daddu $a2, $s4, $zero -/* C38738 80242208 0C09047A */ jal func_802411E8 -/* C3873C 8024220C 0220382D */ daddu $a3, $s1, $zero -.L80242210: -/* C38740 80242210 8E830070 */ lw $v1, 0x70($s4) -/* C38744 80242214 2C620020 */ sltiu $v0, $v1, 0x20 -/* C38748 80242218 10400060 */ beqz $v0, .L8024239C -/* C3874C 8024221C 00031080 */ sll $v0, $v1, 2 -/* C38750 80242220 3C018024 */ lui $at, 0x8024 -/* C38754 80242224 00220821 */ addu $at, $at, $v0 -/* C38758 80242228 8C224458 */ lw $v0, 0x4458($at) -/* C3875C 8024222C 00400008 */ jr $v0 -/* C38760 80242230 00000000 */ nop -/* C38764 80242234 0280202D */ daddu $a0, $s4, $zero -/* C38768 80242238 0220282D */ daddu $a1, $s1, $zero -/* C3876C 8024223C 0C090000 */ jal func_80240000 -/* C38770 80242240 0260302D */ daddu $a2, $s3, $zero -/* C38774 80242244 0000282D */ daddu $a1, $zero, $zero -/* C38778 80242248 00A0302D */ daddu $a2, $a1, $zero -/* C3877C 8024224C AFA00010 */ sw $zero, 0x10($sp) -/* C38780 80242250 AFA00014 */ sw $zero, 0x14($sp) -/* C38784 80242254 AFA00018 */ sw $zero, 0x18($sp) -/* C38788 80242258 8EA40024 */ lw $a0, 0x24($s5) -/* C3878C 8024225C 0C0B7A25 */ jal func_802DE894 -/* C38790 80242260 00A0382D */ daddu $a3, $a1, $zero -/* C38794 80242264 0280202D */ daddu $a0, $s4, $zero -/* C38798 80242268 0220282D */ daddu $a1, $s1, $zero -/* C3879C 8024226C 0C09006C */ jal func_802401B0 -/* C387A0 80242270 0260302D */ daddu $a2, $s3, $zero -/* C387A4 80242274 080908A7 */ j .L8024229C -/* C387A8 80242278 00000000 */ nop -/* C387AC 8024227C 0280202D */ daddu $a0, $s4, $zero -/* C387B0 80242280 0220282D */ daddu $a1, $s1, $zero -/* C387B4 80242284 0C0901F6 */ jal func_802407D8 -/* C387B8 80242288 0260302D */ daddu $a2, $s3, $zero -/* C387BC 8024228C 0280202D */ daddu $a0, $s4, $zero -/* C387C0 80242290 0220282D */ daddu $a1, $s1, $zero -/* C387C4 80242294 0C090226 */ jal func_80240898 -/* C387C8 80242298 0260302D */ daddu $a2, $s3, $zero -.L8024229C: -/* C387CC 8024229C 8E830070 */ lw $v1, 0x70($s4) -/* C387D0 802422A0 2402000C */ addiu $v0, $zero, 0xc -/* C387D4 802422A4 1462003D */ bne $v1, $v0, .L8024239C -/* C387D8 802422A8 24020006 */ addiu $v0, $zero, 6 -/* C387DC 802422AC 080908E7 */ j .L8024239C -/* C387E0 802422B0 A6A2008E */ sh $v0, 0x8e($s5) -/* C387E4 802422B4 0280202D */ daddu $a0, $s4, $zero -/* C387E8 802422B8 0220282D */ daddu $a1, $s1, $zero -/* C387EC 802422BC 0C09053E */ jal func_802414F8 -/* C387F0 802422C0 0260302D */ daddu $a2, $s3, $zero -/* C387F4 802422C4 8E830070 */ lw $v1, 0x70($s4) -/* C387F8 802422C8 2402000D */ addiu $v0, $zero, 0xd -/* C387FC 802422CC 14620033 */ bne $v1, $v0, .L8024239C -/* C38800 802422D0 00000000 */ nop -/* C38804 802422D4 0280202D */ daddu $a0, $s4, $zero -/* C38808 802422D8 0220282D */ daddu $a1, $s1, $zero -/* C3880C 802422DC 0C090594 */ jal func_80241650 -/* C38810 802422E0 0260302D */ daddu $a2, $s3, $zero -/* C38814 802422E4 080908E7 */ j .L8024239C -/* C38818 802422E8 00000000 */ nop -/* C3881C 802422EC 0280202D */ daddu $a0, $s4, $zero -/* C38820 802422F0 0220282D */ daddu $a1, $s1, $zero -/* C38824 802422F4 0C0905D5 */ jal func_80241754 -/* C38828 802422F8 0260302D */ daddu $a2, $s3, $zero -/* C3882C 802422FC 8E830070 */ lw $v1, 0x70($s4) -/* C38830 80242300 2402000F */ addiu $v0, $zero, 0xf -/* C38834 80242304 14620025 */ bne $v1, $v0, .L8024239C -/* C38838 80242308 00000000 */ nop -/* C3883C 8024230C 0280202D */ daddu $a0, $s4, $zero -/* C38840 80242310 0220282D */ daddu $a1, $s1, $zero -/* C38844 80242314 0C0905FE */ jal func_802417F8 -/* C38848 80242318 0260302D */ daddu $a2, $s3, $zero -/* C3884C 8024231C 080908E7 */ j .L8024239C -/* C38850 80242320 00000000 */ nop -/* C38854 80242324 0280202D */ daddu $a0, $s4, $zero -/* C38858 80242328 0220282D */ daddu $a1, $s1, $zero -/* C3885C 8024232C 0C0906A5 */ jal func_80241A94 -/* C38860 80242330 0260302D */ daddu $a2, $s3, $zero -/* C38864 80242334 0280202D */ daddu $a0, $s4, $zero -/* C38868 80242338 0220282D */ daddu $a1, $s1, $zero -/* C3886C 8024233C 0C0906D3 */ jal func_80241B4C -/* C38870 80242340 0260302D */ daddu $a2, $s3, $zero -/* C38874 80242344 080908E7 */ j .L8024239C -/* C38878 80242348 00000000 */ nop -/* C3887C 8024234C 0280202D */ daddu $a0, $s4, $zero -/* C38880 80242350 0220282D */ daddu $a1, $s1, $zero -/* C38884 80242354 0C090733 */ jal func_80241CCC -/* C38888 80242358 0260302D */ daddu $a2, $s3, $zero -/* C3888C 8024235C 080908E7 */ j .L8024239C -/* C38890 80242360 00000000 */ nop -/* C38894 80242364 0280202D */ daddu $a0, $s4, $zero -/* C38898 80242368 0220282D */ daddu $a1, $s1, $zero -/* C3889C 8024236C 0C090745 */ jal func_80241D14 -/* C388A0 80242370 0260302D */ daddu $a2, $s3, $zero -/* C388A4 80242374 080908E7 */ j .L8024239C -/* C388A8 80242378 00000000 */ nop -/* C388AC 8024237C 0280202D */ daddu $a0, $s4, $zero -/* C388B0 80242380 0220282D */ daddu $a1, $s1, $zero -/* C388B4 80242384 0C090765 */ jal func_80241D94 -/* C388B8 80242388 0260302D */ daddu $a2, $s3, $zero -/* C388BC 8024238C 0280202D */ daddu $a0, $s4, $zero -/* C388C0 80242390 0220282D */ daddu $a1, $s1, $zero -/* C388C4 80242394 0C09078F */ jal func_80241E3C -/* C388C8 80242398 0260302D */ daddu $a2, $s3, $zero -.L8024239C: -/* C388CC 8024239C 8E820070 */ lw $v0, 0x70($s4) -/* C388D0 802423A0 8FBF0058 */ lw $ra, 0x58($sp) -/* C388D4 802423A4 8FB50054 */ lw $s5, 0x54($sp) -/* C388D8 802423A8 8FB40050 */ lw $s4, 0x50($sp) -/* C388DC 802423AC 8FB3004C */ lw $s3, 0x4c($sp) -/* C388E0 802423B0 8FB20048 */ lw $s2, 0x48($sp) -/* C388E4 802423B4 8FB10044 */ lw $s1, 0x44($sp) -/* C388E8 802423B8 8FB00040 */ lw $s0, 0x40($sp) -/* C388EC 802423BC 38420064 */ xori $v0, $v0, 0x64 -/* C388F0 802423C0 2C420001 */ sltiu $v0, $v0, 1 -/* C388F4 802423C4 00021040 */ sll $v0, $v0, 1 -/* C388F8 802423C8 03E00008 */ jr $ra -/* C388FC 802423CC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s new file mode 100644 index 0000000000..56f9bb2407 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242154_C38684.s @@ -0,0 +1,166 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242154_C38684 +/* C38684 80242154 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* C38688 80242158 AFB40050 */ sw $s4, 0x50($sp) +/* C3868C 8024215C 0080A02D */ daddu $s4, $a0, $zero +/* C38690 80242160 AFBF0058 */ sw $ra, 0x58($sp) +/* C38694 80242164 AFB50054 */ sw $s5, 0x54($sp) +/* C38698 80242168 AFB3004C */ sw $s3, 0x4c($sp) +/* C3869C 8024216C AFB20048 */ sw $s2, 0x48($sp) +/* C386A0 80242170 AFB10044 */ sw $s1, 0x44($sp) +/* C386A4 80242174 AFB00040 */ sw $s0, 0x40($sp) +/* C386A8 80242178 8E920148 */ lw $s2, 0x148($s4) +/* C386AC 8024217C 86440008 */ lh $a0, 8($s2) +/* C386B0 80242180 0C00EABB */ jal get_npc_unsafe +/* C386B4 80242184 00A0802D */ daddu $s0, $a1, $zero +/* C386B8 80242188 8E83000C */ lw $v1, 0xc($s4) +/* C386BC 8024218C 0280202D */ daddu $a0, $s4, $zero +/* C386C0 80242190 8C650000 */ lw $a1, ($v1) +/* C386C4 80242194 0C0B1EAF */ jal get_variable +/* C386C8 80242198 0040A82D */ daddu $s5, $v0, $zero +/* C386CC 8024219C AFA00020 */ sw $zero, 0x20($sp) +/* C386D0 802421A0 8E4300D0 */ lw $v1, 0xd0($s2) +/* C386D4 802421A4 8C630030 */ lw $v1, 0x30($v1) +/* C386D8 802421A8 AFA30024 */ sw $v1, 0x24($sp) +/* C386DC 802421AC 8E4300D0 */ lw $v1, 0xd0($s2) +/* C386E0 802421B0 8C63001C */ lw $v1, 0x1c($v1) +/* C386E4 802421B4 AFA30028 */ sw $v1, 0x28($sp) +/* C386E8 802421B8 8E4300D0 */ lw $v1, 0xd0($s2) +/* C386EC 802421BC 8C630024 */ lw $v1, 0x24($v1) +/* C386F0 802421C0 AFA3002C */ sw $v1, 0x2c($sp) +/* C386F4 802421C4 8E4300D0 */ lw $v1, 0xd0($s2) +/* C386F8 802421C8 8C630028 */ lw $v1, 0x28($v1) +/* C386FC 802421CC 27B30020 */ addiu $s3, $sp, 0x20 +/* C38700 802421D0 AFA30030 */ sw $v1, 0x30($sp) +/* C38704 802421D4 8E4300D0 */ lw $v1, 0xd0($s2) +/* C38708 802421D8 3C0142FA */ lui $at, 0x42fa +/* C3870C 802421DC 44810000 */ mtc1 $at, $f0 +/* C38710 802421E0 8C63002C */ lw $v1, 0x2c($v1) +/* C38714 802421E4 0040882D */ daddu $s1, $v0, $zero +/* C38718 802421E8 E7A00038 */ swc1 $f0, 0x38($sp) +/* C3871C 802421EC A7A0003C */ sh $zero, 0x3c($sp) +/* C38720 802421F0 12000007 */ beqz $s0, .L80242210 +/* C38724 802421F4 AFA30034 */ sw $v1, 0x34($sp) +/* C38728 802421F8 AE800070 */ sw $zero, 0x70($s4) +/* C3872C 802421FC 02A0202D */ daddu $a0, $s5, $zero +/* C38730 80242200 0240282D */ daddu $a1, $s2, $zero +/* C38734 80242204 0280302D */ daddu $a2, $s4, $zero +/* C38738 80242208 0C09047A */ jal func_802411E8_C37718 +/* C3873C 8024220C 0220382D */ daddu $a3, $s1, $zero +.L80242210: +/* C38740 80242210 8E830070 */ lw $v1, 0x70($s4) +/* C38744 80242214 2C620020 */ sltiu $v0, $v1, 0x20 +/* C38748 80242218 10400060 */ beqz $v0, .L8024239C +/* C3874C 8024221C 00031080 */ sll $v0, $v1, 2 +/* C38750 80242220 3C018024 */ lui $at, 0x8024 +/* C38754 80242224 00220821 */ addu $at, $at, $v0 +/* C38758 80242228 8C224458 */ lw $v0, 0x4458($at) +/* C3875C 8024222C 00400008 */ jr $v0 +/* C38760 80242230 00000000 */ nop +/* C38764 80242234 0280202D */ daddu $a0, $s4, $zero +/* C38768 80242238 0220282D */ daddu $a1, $s1, $zero +/* C3876C 8024223C 0C090000 */ jal func_80240000_C36530 +/* C38770 80242240 0260302D */ daddu $a2, $s3, $zero +/* C38774 80242244 0000282D */ daddu $a1, $zero, $zero +/* C38778 80242248 00A0302D */ daddu $a2, $a1, $zero +/* C3877C 8024224C AFA00010 */ sw $zero, 0x10($sp) +/* C38780 80242250 AFA00014 */ sw $zero, 0x14($sp) +/* C38784 80242254 AFA00018 */ sw $zero, 0x18($sp) +/* C38788 80242258 8EA40024 */ lw $a0, 0x24($s5) +/* C3878C 8024225C 0C0B7A25 */ jal func_802DE894 +/* C38790 80242260 00A0382D */ daddu $a3, $a1, $zero +/* C38794 80242264 0280202D */ daddu $a0, $s4, $zero +/* C38798 80242268 0220282D */ daddu $a1, $s1, $zero +/* C3879C 8024226C 0C09006C */ jal func_802401B0_C366E0 +/* C387A0 80242270 0260302D */ daddu $a2, $s3, $zero +/* C387A4 80242274 080908A7 */ j .L8024229C +/* C387A8 80242278 00000000 */ nop +/* C387AC 8024227C 0280202D */ daddu $a0, $s4, $zero +/* C387B0 80242280 0220282D */ daddu $a1, $s1, $zero +/* C387B4 80242284 0C0901F6 */ jal func_802407D8_C36D08 +/* C387B8 80242288 0260302D */ daddu $a2, $s3, $zero +/* C387BC 8024228C 0280202D */ daddu $a0, $s4, $zero +/* C387C0 80242290 0220282D */ daddu $a1, $s1, $zero +/* C387C4 80242294 0C090226 */ jal func_80240898_C36DC8 +/* C387C8 80242298 0260302D */ daddu $a2, $s3, $zero +.L8024229C: +/* C387CC 8024229C 8E830070 */ lw $v1, 0x70($s4) +/* C387D0 802422A0 2402000C */ addiu $v0, $zero, 0xc +/* C387D4 802422A4 1462003D */ bne $v1, $v0, .L8024239C +/* C387D8 802422A8 24020006 */ addiu $v0, $zero, 6 +/* C387DC 802422AC 080908E7 */ j .L8024239C +/* C387E0 802422B0 A6A2008E */ sh $v0, 0x8e($s5) +/* C387E4 802422B4 0280202D */ daddu $a0, $s4, $zero +/* C387E8 802422B8 0220282D */ daddu $a1, $s1, $zero +/* C387EC 802422BC 0C09053E */ jal func_802414F8_C37A28 +/* C387F0 802422C0 0260302D */ daddu $a2, $s3, $zero +/* C387F4 802422C4 8E830070 */ lw $v1, 0x70($s4) +/* C387F8 802422C8 2402000D */ addiu $v0, $zero, 0xd +/* C387FC 802422CC 14620033 */ bne $v1, $v0, .L8024239C +/* C38800 802422D0 00000000 */ nop +/* C38804 802422D4 0280202D */ daddu $a0, $s4, $zero +/* C38808 802422D8 0220282D */ daddu $a1, $s1, $zero +/* C3880C 802422DC 0C090594 */ jal func_80241650_C37B80 +/* C38810 802422E0 0260302D */ daddu $a2, $s3, $zero +/* C38814 802422E4 080908E7 */ j .L8024239C +/* C38818 802422E8 00000000 */ nop +/* C3881C 802422EC 0280202D */ daddu $a0, $s4, $zero +/* C38820 802422F0 0220282D */ daddu $a1, $s1, $zero +/* C38824 802422F4 0C0905D5 */ jal func_80241754_C37C84 +/* C38828 802422F8 0260302D */ daddu $a2, $s3, $zero +/* C3882C 802422FC 8E830070 */ lw $v1, 0x70($s4) +/* C38830 80242300 2402000F */ addiu $v0, $zero, 0xf +/* C38834 80242304 14620025 */ bne $v1, $v0, .L8024239C +/* C38838 80242308 00000000 */ nop +/* C3883C 8024230C 0280202D */ daddu $a0, $s4, $zero +/* C38840 80242310 0220282D */ daddu $a1, $s1, $zero +/* C38844 80242314 0C0905FE */ jal func_802417F8_C37D28 +/* C38848 80242318 0260302D */ daddu $a2, $s3, $zero +/* C3884C 8024231C 080908E7 */ j .L8024239C +/* C38850 80242320 00000000 */ nop +/* C38854 80242324 0280202D */ daddu $a0, $s4, $zero +/* C38858 80242328 0220282D */ daddu $a1, $s1, $zero +/* C3885C 8024232C 0C0906A5 */ jal func_80241A94_C37FC4 +/* C38860 80242330 0260302D */ daddu $a2, $s3, $zero +/* C38864 80242334 0280202D */ daddu $a0, $s4, $zero +/* C38868 80242338 0220282D */ daddu $a1, $s1, $zero +/* C3886C 8024233C 0C0906D3 */ jal func_80241B4C_C3807C +/* C38870 80242340 0260302D */ daddu $a2, $s3, $zero +/* C38874 80242344 080908E7 */ j .L8024239C +/* C38878 80242348 00000000 */ nop +/* C3887C 8024234C 0280202D */ daddu $a0, $s4, $zero +/* C38880 80242350 0220282D */ daddu $a1, $s1, $zero +/* C38884 80242354 0C090733 */ jal func_80241CCC_C381FC +/* C38888 80242358 0260302D */ daddu $a2, $s3, $zero +/* C3888C 8024235C 080908E7 */ j .L8024239C +/* C38890 80242360 00000000 */ nop +/* C38894 80242364 0280202D */ daddu $a0, $s4, $zero +/* C38898 80242368 0220282D */ daddu $a1, $s1, $zero +/* C3889C 8024236C 0C090745 */ jal func_80241D14_C38244 +/* C388A0 80242370 0260302D */ daddu $a2, $s3, $zero +/* C388A4 80242374 080908E7 */ j .L8024239C +/* C388A8 80242378 00000000 */ nop +/* C388AC 8024237C 0280202D */ daddu $a0, $s4, $zero +/* C388B0 80242380 0220282D */ daddu $a1, $s1, $zero +/* C388B4 80242384 0C090765 */ jal func_80241D94_C382C4 +/* C388B8 80242388 0260302D */ daddu $a2, $s3, $zero +/* C388BC 8024238C 0280202D */ daddu $a0, $s4, $zero +/* C388C0 80242390 0220282D */ daddu $a1, $s1, $zero +/* C388C4 80242394 0C09078F */ jal func_80241E3C_C3836C +/* C388C8 80242398 0260302D */ daddu $a2, $s3, $zero +.L8024239C: +/* C388CC 8024239C 8E820070 */ lw $v0, 0x70($s4) +/* C388D0 802423A0 8FBF0058 */ lw $ra, 0x58($sp) +/* C388D4 802423A4 8FB50054 */ lw $s5, 0x54($sp) +/* C388D8 802423A8 8FB40050 */ lw $s4, 0x50($sp) +/* C388DC 802423AC 8FB3004C */ lw $s3, 0x4c($sp) +/* C388E0 802423B0 8FB20048 */ lw $s2, 0x48($sp) +/* C388E4 802423B4 8FB10044 */ lw $s1, 0x44($sp) +/* C388E8 802423B8 8FB00040 */ lw $s0, 0x40($sp) +/* C388EC 802423BC 38420064 */ xori $v0, $v0, 0x64 +/* C388F0 802423C0 2C420001 */ sltiu $v0, $v0, 1 +/* C388F4 802423C4 00021040 */ sll $v0, $v0, 1 +/* C388F8 802423C8 03E00008 */ jr $ra +/* C388FC 802423CC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0.s deleted file mode 100644 index 49e5cacde5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423D0 -/* C38900 802423D0 3C03800A */ lui $v1, %hi(D_8009A650) -/* C38904 802423D4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* C38908 802423D8 8C620000 */ lw $v0, ($v1) -/* C3890C 802423DC 34420040 */ ori $v0, $v0, 0x40 -/* C38910 802423E0 AC620000 */ sw $v0, ($v1) -/* C38914 802423E4 03E00008 */ jr $ra -/* C38918 802423E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0_C38900.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0_C38900.s new file mode 100644 index 0000000000..a3b4400de2 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423D0_C38900.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423D0_C38900 +/* C38900 802423D0 3C03800A */ lui $v1, %hi(D_8009A650) +/* C38904 802423D4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) +/* C38908 802423D8 8C620000 */ lw $v0, ($v1) +/* C3890C 802423DC 34420040 */ ori $v0, $v0, 0x40 +/* C38910 802423E0 AC620000 */ sw $v0, ($v1) +/* C38914 802423E4 03E00008 */ jr $ra +/* C38918 802423E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC.s deleted file mode 100644 index f6f273ab90..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423EC -/* C3891C 802423EC 3C02800A */ lui $v0, %hi(D_8009A650) -/* C38920 802423F0 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* C38924 802423F4 8C430000 */ lw $v1, ($v0) -/* C38928 802423F8 2404FFBF */ addiu $a0, $zero, -0x41 -/* C3892C 802423FC 00641824 */ and $v1, $v1, $a0 -/* C38930 80242400 AC430000 */ sw $v1, ($v0) -/* C38934 80242404 03E00008 */ jr $ra -/* C38938 80242408 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC_C3891C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC_C3891C.s new file mode 100644 index 0000000000..82fb48f241 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802423EC_C3891C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423EC_C3891C +/* C3891C 802423EC 3C02800A */ lui $v0, %hi(D_8009A650) +/* C38920 802423F0 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* C38924 802423F4 8C430000 */ lw $v1, ($v0) +/* C38928 802423F8 2404FFBF */ addiu $a0, $zero, -0x41 +/* C3892C 802423FC 00641824 */ and $v1, $v1, $a0 +/* C38930 80242400 AC430000 */ sw $v1, ($v0) +/* C38934 80242404 03E00008 */ jr $ra +/* C38938 80242408 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s index 3ad9e58953..9c04bc7950 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s @@ -27,7 +27,7 @@ glabel func_802424F0_C38A20 /* C38A74 80242544 50400008 */ beql $v0, $zero, .L80242568 /* C38A78 80242548 26100001 */ addiu $s0, $s0, 1 /* C38A7C 8024254C 0200202D */ daddu $a0, $s0, $zero -/* C38A80 80242550 0C090929 */ jal func_802424A4 +/* C38A80 80242550 0C090929 */ jal func_802424A4_C389D4 /* C38A84 80242554 00122C03 */ sra $a1, $s2, 0x10 /* C38A88 80242558 10540003 */ beq $v0, $s4, .L80242568 /* C38A8C 8024255C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C.s deleted file mode 100644 index 0e65684aa8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024259C -/* C38ACC 8024259C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C38AD0 802425A0 AFB5002C */ sw $s5, 0x2c($sp) -/* C38AD4 802425A4 0080A82D */ daddu $s5, $a0, $zero -/* C38AD8 802425A8 AFBE0038 */ sw $fp, 0x38($sp) -/* C38ADC 802425AC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* C38AE0 802425B0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* C38AE4 802425B4 AFBF003C */ sw $ra, 0x3c($sp) -/* C38AE8 802425B8 AFB70034 */ sw $s7, 0x34($sp) -/* C38AEC 802425BC AFB60030 */ sw $s6, 0x30($sp) -/* C38AF0 802425C0 AFB40028 */ sw $s4, 0x28($sp) -/* C38AF4 802425C4 AFB30024 */ sw $s3, 0x24($sp) -/* C38AF8 802425C8 AFB20020 */ sw $s2, 0x20($sp) -/* C38AFC 802425CC AFB1001C */ sw $s1, 0x1c($sp) -/* C38B00 802425D0 10A0004F */ beqz $a1, .L80242710 -/* C38B04 802425D4 AFB00018 */ sw $s0, 0x18($sp) -/* C38B08 802425D8 0C00AB39 */ jal heap_malloc -/* C38B0C 802425DC 24040330 */ addiu $a0, $zero, 0x330 -/* C38B10 802425E0 0040982D */ daddu $s3, $v0, $zero -/* C38B14 802425E4 0000B02D */ daddu $s6, $zero, $zero -/* C38B18 802425E8 02C0902D */ daddu $s2, $s6, $zero -/* C38B1C 802425EC 3C148024 */ lui $s4, 0x8024 -/* C38B20 802425F0 26943D38 */ addiu $s4, $s4, 0x3d38 -/* C38B24 802425F4 0260882D */ daddu $s1, $s3, $zero -/* C38B28 802425F8 8EA200B4 */ lw $v0, 0xb4($s5) -/* C38B2C 802425FC 3C038024 */ lui $v1, 0x8024 -/* C38B30 80242600 24633D30 */ addiu $v1, $v1, 0x3d30 -/* C38B34 80242604 AEB30078 */ sw $s3, 0x78($s5) -/* C38B38 80242608 00021027 */ nor $v0, $zero, $v0 -/* C38B3C 8024260C 0002BFC2 */ srl $s7, $v0, 0x1f -/* C38B40 80242610 00171080 */ sll $v0, $s7, 2 -/* C38B44 80242614 00431021 */ addu $v0, $v0, $v1 -/* C38B48 80242618 AFA20010 */ sw $v0, 0x10($sp) -.L8024261C: -/* C38B4C 8024261C 86900000 */ lh $s0, ($s4) -/* C38B50 80242620 001010C0 */ sll $v0, $s0, 3 -/* C38B54 80242624 03C21021 */ addu $v0, $fp, $v0 -/* C38B58 80242628 90420014 */ lbu $v0, 0x14($v0) -/* C38B5C 8024262C 5040002E */ beql $v0, $zero, .L802426E8 -/* C38B60 80242630 26520001 */ addiu $s2, $s2, 1 -/* C38B64 80242634 00101100 */ sll $v0, $s0, 4 -/* C38B68 80242638 3C068009 */ lui $a2, 0x8009 -/* C38B6C 8024263C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* C38B70 80242640 00461021 */ addu $v0, $v0, $a2 -/* C38B74 80242644 0200202D */ daddu $a0, $s0, $zero -/* C38B78 80242648 AE300108 */ sw $s0, 0x108($s1) -/* C38B7C 8024264C 8C420000 */ lw $v0, ($v0) -/* C38B80 80242650 02E0282D */ daddu $a1, $s7, $zero -/* C38B84 80242654 0C090929 */ jal func_802424A4 -/* C38B88 80242658 AE220084 */ sw $v0, 0x84($s1) -/* C38B8C 8024265C 0040202D */ daddu $a0, $v0, $zero -/* C38B90 80242660 04800011 */ bltz $a0, .L802426A8 -/* C38B94 80242664 00101080 */ sll $v0, $s0, 2 -/* C38B98 80242668 3C06800F */ lui $a2, 0x800f -/* C38B9C 8024266C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* C38BA0 80242670 00461021 */ addu $v0, $v0, $a2 -/* C38BA4 80242674 8C430000 */ lw $v1, ($v0) -/* C38BA8 80242678 24020001 */ addiu $v0, $zero, 1 -/* C38BAC 8024267C AE22018C */ sw $v0, 0x18c($s1) -/* C38BB0 80242680 00041080 */ sll $v0, $a0, 2 -/* C38BB4 80242684 3C068024 */ lui $a2, 0x8024 -/* C38BB8 80242688 24C63D48 */ addiu $a2, $a2, 0x3d48 -/* C38BBC 8024268C AE230000 */ sw $v1, ($s1) -/* C38BC0 80242690 001218C0 */ sll $v1, $s2, 3 -/* C38BC4 80242694 00431021 */ addu $v0, $v0, $v1 -/* C38BC8 80242698 00461021 */ addu $v0, $v0, $a2 -/* C38BCC 8024269C 8C420000 */ lw $v0, ($v0) -/* C38BD0 802426A0 080909B3 */ j .L802426CC -/* C38BD4 802426A4 AE220294 */ sw $v0, 0x294($s1) -.L802426A8: -/* C38BD8 802426A8 3C06800F */ lui $a2, 0x800f -/* C38BDC 802426AC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* C38BE0 802426B0 00461021 */ addu $v0, $v0, $a2 -/* C38BE4 802426B4 8C420000 */ lw $v0, ($v0) -/* C38BE8 802426B8 AE20018C */ sw $zero, 0x18c($s1) -/* C38BEC 802426BC AE220000 */ sw $v0, ($s1) -/* C38BF0 802426C0 8FA60010 */ lw $a2, 0x10($sp) -/* C38BF4 802426C4 8CC20000 */ lw $v0, ($a2) -/* C38BF8 802426C8 AE220294 */ sw $v0, 0x294($s1) -.L802426CC: -/* C38BFC 802426CC 001010C0 */ sll $v0, $s0, 3 -/* C38C00 802426D0 03C21021 */ addu $v0, $fp, $v0 -/* C38C04 802426D4 80420015 */ lb $v0, 0x15($v0) -/* C38C08 802426D8 26D60001 */ addiu $s6, $s6, 1 -/* C38C0C 802426DC AE220210 */ sw $v0, 0x210($s1) -/* C38C10 802426E0 26310004 */ addiu $s1, $s1, 4 -/* C38C14 802426E4 26520001 */ addiu $s2, $s2, 1 -.L802426E8: -/* C38C18 802426E8 2A420008 */ slti $v0, $s2, 8 -/* C38C1C 802426EC 1440FFCB */ bnez $v0, .L8024261C -/* C38C20 802426F0 26940002 */ addiu $s4, $s4, 2 -/* C38C24 802426F4 0260202D */ daddu $a0, $s3, $zero -/* C38C28 802426F8 24020004 */ addiu $v0, $zero, 4 -/* C38C2C 802426FC AC820318 */ sw $v0, 0x318($a0) -/* C38C30 80242700 AC960324 */ sw $s6, 0x324($a0) -/* C38C34 80242704 0C03D390 */ jal func_800F4E40 -/* C38C38 80242708 AC800328 */ sw $zero, 0x328($a0) -/* C38C3C 8024270C AEA00070 */ sw $zero, 0x70($s5) -.L80242710: -/* C38C40 80242710 8EA20070 */ lw $v0, 0x70($s5) -/* C38C44 80242714 8EB30078 */ lw $s3, 0x78($s5) -/* C38C48 80242718 14400008 */ bnez $v0, .L8024273C -/* C38C4C 8024271C 24420001 */ addiu $v0, $v0, 1 -/* C38C50 80242720 8662032C */ lh $v0, 0x32c($s3) -/* C38C54 80242724 10400009 */ beqz $v0, .L8024274C -/* C38C58 80242728 AEA20074 */ sw $v0, 0x74($s5) -/* C38C5C 8024272C 0C03C4EC */ jal func_800F13B0 -/* C38C60 80242730 00000000 */ nop -/* C38C64 80242734 8EA20070 */ lw $v0, 0x70($s5) -/* C38C68 80242738 24420001 */ addiu $v0, $v0, 1 -.L8024273C: -/* C38C6C 8024273C AEA20070 */ sw $v0, 0x70($s5) -/* C38C70 80242740 2842000F */ slti $v0, $v0, 0xf -/* C38C74 80242744 10400003 */ beqz $v0, .L80242754 -/* C38C78 80242748 00000000 */ nop -.L8024274C: -/* C38C7C 8024274C 080909EF */ j .L802427BC -/* C38C80 80242750 0000102D */ daddu $v0, $zero, $zero -.L80242754: -/* C38C84 80242754 0C03C54E */ jal func_800F1538 -/* C38C88 80242758 00000000 */ nop -/* C38C8C 8024275C 8EA30074 */ lw $v1, 0x74($s5) -/* C38C90 80242760 240200FF */ addiu $v0, $zero, 0xff -/* C38C94 80242764 10620010 */ beq $v1, $v0, .L802427A8 -/* C38C98 80242768 2462FFFF */ addiu $v0, $v1, -1 -/* C38C9C 8024276C 00021080 */ sll $v0, $v0, 2 -/* C38CA0 80242770 02621021 */ addu $v0, $s3, $v0 -/* C38CA4 80242774 8C420108 */ lw $v0, 0x108($v0) -/* C38CA8 80242778 00021100 */ sll $v0, $v0, 4 -/* C38CAC 8024277C 3C038009 */ lui $v1, 0x8009 -/* C38CB0 80242780 00621821 */ addu $v1, $v1, $v0 -/* C38CB4 80242784 8C63EF20 */ lw $v1, -0x10e0($v1) -/* C38CB8 80242788 8EA20074 */ lw $v0, 0x74($s5) -/* C38CBC 8024278C 2442FFFF */ addiu $v0, $v0, -1 -/* C38CC0 80242790 00021080 */ sll $v0, $v0, 2 -/* C38CC4 80242794 02621021 */ addu $v0, $s3, $v0 -/* C38CC8 80242798 AEA30084 */ sw $v1, 0x84($s5) -/* C38CCC 8024279C 8C420108 */ lw $v0, 0x108($v0) -/* C38CD0 802427A0 080909EC */ j .L802427B0 -/* C38CD4 802427A4 AEA20088 */ sw $v0, 0x88($s5) -.L802427A8: -/* C38CD8 802427A8 2402FFFF */ addiu $v0, $zero, -1 -/* C38CDC 802427AC AEA20084 */ sw $v0, 0x84($s5) -.L802427B0: -/* C38CE0 802427B0 0C00AB4B */ jal heap_free -/* C38CE4 802427B4 8EA40078 */ lw $a0, 0x78($s5) -/* C38CE8 802427B8 24020002 */ addiu $v0, $zero, 2 -.L802427BC: -/* C38CEC 802427BC 8FBF003C */ lw $ra, 0x3c($sp) -/* C38CF0 802427C0 8FBE0038 */ lw $fp, 0x38($sp) -/* C38CF4 802427C4 8FB70034 */ lw $s7, 0x34($sp) -/* C38CF8 802427C8 8FB60030 */ lw $s6, 0x30($sp) -/* C38CFC 802427CC 8FB5002C */ lw $s5, 0x2c($sp) -/* C38D00 802427D0 8FB40028 */ lw $s4, 0x28($sp) -/* C38D04 802427D4 8FB30024 */ lw $s3, 0x24($sp) -/* C38D08 802427D8 8FB20020 */ lw $s2, 0x20($sp) -/* C38D0C 802427DC 8FB1001C */ lw $s1, 0x1c($sp) -/* C38D10 802427E0 8FB00018 */ lw $s0, 0x18($sp) -/* C38D14 802427E4 03E00008 */ jr $ra -/* C38D18 802427E8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s new file mode 100644 index 0000000000..1aa3527624 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_8024259C_C38ACC.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024259C_C38ACC +/* C38ACC 8024259C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* C38AD0 802425A0 AFB5002C */ sw $s5, 0x2c($sp) +/* C38AD4 802425A4 0080A82D */ daddu $s5, $a0, $zero +/* C38AD8 802425A8 AFBE0038 */ sw $fp, 0x38($sp) +/* C38ADC 802425AC 3C1E8011 */ lui $fp, %hi(gPlayerData) +/* C38AE0 802425B0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) +/* C38AE4 802425B4 AFBF003C */ sw $ra, 0x3c($sp) +/* C38AE8 802425B8 AFB70034 */ sw $s7, 0x34($sp) +/* C38AEC 802425BC AFB60030 */ sw $s6, 0x30($sp) +/* C38AF0 802425C0 AFB40028 */ sw $s4, 0x28($sp) +/* C38AF4 802425C4 AFB30024 */ sw $s3, 0x24($sp) +/* C38AF8 802425C8 AFB20020 */ sw $s2, 0x20($sp) +/* C38AFC 802425CC AFB1001C */ sw $s1, 0x1c($sp) +/* C38B00 802425D0 10A0004F */ beqz $a1, .L80242710 +/* C38B04 802425D4 AFB00018 */ sw $s0, 0x18($sp) +/* C38B08 802425D8 0C00AB39 */ jal heap_malloc +/* C38B0C 802425DC 24040330 */ addiu $a0, $zero, 0x330 +/* C38B10 802425E0 0040982D */ daddu $s3, $v0, $zero +/* C38B14 802425E4 0000B02D */ daddu $s6, $zero, $zero +/* C38B18 802425E8 02C0902D */ daddu $s2, $s6, $zero +/* C38B1C 802425EC 3C148024 */ lui $s4, 0x8024 +/* C38B20 802425F0 26943D38 */ addiu $s4, $s4, 0x3d38 +/* C38B24 802425F4 0260882D */ daddu $s1, $s3, $zero +/* C38B28 802425F8 8EA200B4 */ lw $v0, 0xb4($s5) +/* C38B2C 802425FC 3C038024 */ lui $v1, 0x8024 +/* C38B30 80242600 24633D30 */ addiu $v1, $v1, 0x3d30 +/* C38B34 80242604 AEB30078 */ sw $s3, 0x78($s5) +/* C38B38 80242608 00021027 */ nor $v0, $zero, $v0 +/* C38B3C 8024260C 0002BFC2 */ srl $s7, $v0, 0x1f +/* C38B40 80242610 00171080 */ sll $v0, $s7, 2 +/* C38B44 80242614 00431021 */ addu $v0, $v0, $v1 +/* C38B48 80242618 AFA20010 */ sw $v0, 0x10($sp) +.L8024261C: +/* C38B4C 8024261C 86900000 */ lh $s0, ($s4) +/* C38B50 80242620 001010C0 */ sll $v0, $s0, 3 +/* C38B54 80242624 03C21021 */ addu $v0, $fp, $v0 +/* C38B58 80242628 90420014 */ lbu $v0, 0x14($v0) +/* C38B5C 8024262C 5040002E */ beql $v0, $zero, .L802426E8 +/* C38B60 80242630 26520001 */ addiu $s2, $s2, 1 +/* C38B64 80242634 00101100 */ sll $v0, $s0, 4 +/* C38B68 80242638 3C068009 */ lui $a2, 0x8009 +/* C38B6C 8024263C 24C6EF20 */ addiu $a2, $a2, -0x10e0 +/* C38B70 80242640 00461021 */ addu $v0, $v0, $a2 +/* C38B74 80242644 0200202D */ daddu $a0, $s0, $zero +/* C38B78 80242648 AE300108 */ sw $s0, 0x108($s1) +/* C38B7C 8024264C 8C420000 */ lw $v0, ($v0) +/* C38B80 80242650 02E0282D */ daddu $a1, $s7, $zero +/* C38B84 80242654 0C090929 */ jal func_802424A4_C389D4 +/* C38B88 80242658 AE220084 */ sw $v0, 0x84($s1) +/* C38B8C 8024265C 0040202D */ daddu $a0, $v0, $zero +/* C38B90 80242660 04800011 */ bltz $a0, .L802426A8 +/* C38B94 80242664 00101080 */ sll $v0, $s0, 2 +/* C38B98 80242668 3C06800F */ lui $a2, 0x800f +/* C38B9C 8024266C 24C67F00 */ addiu $a2, $a2, 0x7f00 +/* C38BA0 80242670 00461021 */ addu $v0, $v0, $a2 +/* C38BA4 80242674 8C430000 */ lw $v1, ($v0) +/* C38BA8 80242678 24020001 */ addiu $v0, $zero, 1 +/* C38BAC 8024267C AE22018C */ sw $v0, 0x18c($s1) +/* C38BB0 80242680 00041080 */ sll $v0, $a0, 2 +/* C38BB4 80242684 3C068024 */ lui $a2, 0x8024 +/* C38BB8 80242688 24C63D48 */ addiu $a2, $a2, 0x3d48 +/* C38BBC 8024268C AE230000 */ sw $v1, ($s1) +/* C38BC0 80242690 001218C0 */ sll $v1, $s2, 3 +/* C38BC4 80242694 00431021 */ addu $v0, $v0, $v1 +/* C38BC8 80242698 00461021 */ addu $v0, $v0, $a2 +/* C38BCC 8024269C 8C420000 */ lw $v0, ($v0) +/* C38BD0 802426A0 080909B3 */ j .L802426CC +/* C38BD4 802426A4 AE220294 */ sw $v0, 0x294($s1) +.L802426A8: +/* C38BD8 802426A8 3C06800F */ lui $a2, 0x800f +/* C38BDC 802426AC 24C67F40 */ addiu $a2, $a2, 0x7f40 +/* C38BE0 802426B0 00461021 */ addu $v0, $v0, $a2 +/* C38BE4 802426B4 8C420000 */ lw $v0, ($v0) +/* C38BE8 802426B8 AE20018C */ sw $zero, 0x18c($s1) +/* C38BEC 802426BC AE220000 */ sw $v0, ($s1) +/* C38BF0 802426C0 8FA60010 */ lw $a2, 0x10($sp) +/* C38BF4 802426C4 8CC20000 */ lw $v0, ($a2) +/* C38BF8 802426C8 AE220294 */ sw $v0, 0x294($s1) +.L802426CC: +/* C38BFC 802426CC 001010C0 */ sll $v0, $s0, 3 +/* C38C00 802426D0 03C21021 */ addu $v0, $fp, $v0 +/* C38C04 802426D4 80420015 */ lb $v0, 0x15($v0) +/* C38C08 802426D8 26D60001 */ addiu $s6, $s6, 1 +/* C38C0C 802426DC AE220210 */ sw $v0, 0x210($s1) +/* C38C10 802426E0 26310004 */ addiu $s1, $s1, 4 +/* C38C14 802426E4 26520001 */ addiu $s2, $s2, 1 +.L802426E8: +/* C38C18 802426E8 2A420008 */ slti $v0, $s2, 8 +/* C38C1C 802426EC 1440FFCB */ bnez $v0, .L8024261C +/* C38C20 802426F0 26940002 */ addiu $s4, $s4, 2 +/* C38C24 802426F4 0260202D */ daddu $a0, $s3, $zero +/* C38C28 802426F8 24020004 */ addiu $v0, $zero, 4 +/* C38C2C 802426FC AC820318 */ sw $v0, 0x318($a0) +/* C38C30 80242700 AC960324 */ sw $s6, 0x324($a0) +/* C38C34 80242704 0C03D390 */ jal func_800F4E40 +/* C38C38 80242708 AC800328 */ sw $zero, 0x328($a0) +/* C38C3C 8024270C AEA00070 */ sw $zero, 0x70($s5) +.L80242710: +/* C38C40 80242710 8EA20070 */ lw $v0, 0x70($s5) +/* C38C44 80242714 8EB30078 */ lw $s3, 0x78($s5) +/* C38C48 80242718 14400008 */ bnez $v0, .L8024273C +/* C38C4C 8024271C 24420001 */ addiu $v0, $v0, 1 +/* C38C50 80242720 8662032C */ lh $v0, 0x32c($s3) +/* C38C54 80242724 10400009 */ beqz $v0, .L8024274C +/* C38C58 80242728 AEA20074 */ sw $v0, 0x74($s5) +/* C38C5C 8024272C 0C03C4EC */ jal func_800F13B0 +/* C38C60 80242730 00000000 */ nop +/* C38C64 80242734 8EA20070 */ lw $v0, 0x70($s5) +/* C38C68 80242738 24420001 */ addiu $v0, $v0, 1 +.L8024273C: +/* C38C6C 8024273C AEA20070 */ sw $v0, 0x70($s5) +/* C38C70 80242740 2842000F */ slti $v0, $v0, 0xf +/* C38C74 80242744 10400003 */ beqz $v0, .L80242754 +/* C38C78 80242748 00000000 */ nop +.L8024274C: +/* C38C7C 8024274C 080909EF */ j .L802427BC +/* C38C80 80242750 0000102D */ daddu $v0, $zero, $zero +.L80242754: +/* C38C84 80242754 0C03C54E */ jal func_800F1538 +/* C38C88 80242758 00000000 */ nop +/* C38C8C 8024275C 8EA30074 */ lw $v1, 0x74($s5) +/* C38C90 80242760 240200FF */ addiu $v0, $zero, 0xff +/* C38C94 80242764 10620010 */ beq $v1, $v0, .L802427A8 +/* C38C98 80242768 2462FFFF */ addiu $v0, $v1, -1 +/* C38C9C 8024276C 00021080 */ sll $v0, $v0, 2 +/* C38CA0 80242770 02621021 */ addu $v0, $s3, $v0 +/* C38CA4 80242774 8C420108 */ lw $v0, 0x108($v0) +/* C38CA8 80242778 00021100 */ sll $v0, $v0, 4 +/* C38CAC 8024277C 3C038009 */ lui $v1, 0x8009 +/* C38CB0 80242780 00621821 */ addu $v1, $v1, $v0 +/* C38CB4 80242784 8C63EF20 */ lw $v1, -0x10e0($v1) +/* C38CB8 80242788 8EA20074 */ lw $v0, 0x74($s5) +/* C38CBC 8024278C 2442FFFF */ addiu $v0, $v0, -1 +/* C38CC0 80242790 00021080 */ sll $v0, $v0, 2 +/* C38CC4 80242794 02621021 */ addu $v0, $s3, $v0 +/* C38CC8 80242798 AEA30084 */ sw $v1, 0x84($s5) +/* C38CCC 8024279C 8C420108 */ lw $v0, 0x108($v0) +/* C38CD0 802427A0 080909EC */ j .L802427B0 +/* C38CD4 802427A4 AEA20088 */ sw $v0, 0x88($s5) +.L802427A8: +/* C38CD8 802427A8 2402FFFF */ addiu $v0, $zero, -1 +/* C38CDC 802427AC AEA20084 */ sw $v0, 0x84($s5) +.L802427B0: +/* C38CE0 802427B0 0C00AB4B */ jal heap_free +/* C38CE4 802427B4 8EA40078 */ lw $a0, 0x78($s5) +/* C38CE8 802427B8 24020002 */ addiu $v0, $zero, 2 +.L802427BC: +/* C38CEC 802427BC 8FBF003C */ lw $ra, 0x3c($sp) +/* C38CF0 802427C0 8FBE0038 */ lw $fp, 0x38($sp) +/* C38CF4 802427C4 8FB70034 */ lw $s7, 0x34($sp) +/* C38CF8 802427C8 8FB60030 */ lw $s6, 0x30($sp) +/* C38CFC 802427CC 8FB5002C */ lw $s5, 0x2c($sp) +/* C38D00 802427D0 8FB40028 */ lw $s4, 0x28($sp) +/* C38D04 802427D4 8FB30024 */ lw $s3, 0x24($sp) +/* C38D08 802427D8 8FB20020 */ lw $s2, 0x20($sp) +/* C38D0C 802427DC 8FB1001C */ lw $s1, 0x1c($sp) +/* C38D10 802427E0 8FB00018 */ lw $s0, 0x18($sp) +/* C38D14 802427E4 03E00008 */ jr $ra +/* C38D18 802427E8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818.s deleted file mode 100644 index 47e96558a8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242818 -/* C38D48 80242818 3C028011 */ lui $v0, 0x8011 -/* C38D4C 8024281C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* C38D50 80242820 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38D54 80242824 AFBF0010 */ sw $ra, 0x10($sp) -/* C38D58 80242828 00021100 */ sll $v0, $v0, 4 -/* C38D5C 8024282C 3C048009 */ lui $a0, 0x8009 -/* C38D60 80242830 00822021 */ addu $a0, $a0, $v0 -/* C38D64 80242834 8C84EF20 */ lw $a0, -0x10e0($a0) -/* C38D68 80242838 0C0496CF */ jal set_message_string -/* C38D6C 8024283C 0000282D */ daddu $a1, $zero, $zero -/* C38D70 80242840 8FBF0010 */ lw $ra, 0x10($sp) -/* C38D74 80242844 24020002 */ addiu $v0, $zero, 2 -/* C38D78 80242848 03E00008 */ jr $ra -/* C38D7C 8024284C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s new file mode 100644 index 0000000000..431c983a4e --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242818_C38D48 +/* C38D48 80242818 3C028011 */ lui $v0, 0x8011 +/* C38D4C 8024281C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C38D50 80242820 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C38D54 80242824 AFBF0010 */ sw $ra, 0x10($sp) +/* C38D58 80242828 00021100 */ sll $v0, $v0, 4 +/* C38D5C 8024282C 3C048009 */ lui $a0, 0x8009 +/* C38D60 80242830 00822021 */ addu $a0, $a0, $v0 +/* C38D64 80242834 8C84EF20 */ lw $a0, -0x10e0($a0) +/* C38D68 80242838 0C0496CF */ jal set_message_string +/* C38D6C 8024283C 0000282D */ daddu $a1, $zero, $zero +/* C38D70 80242840 8FBF0010 */ lw $ra, 0x10($sp) +/* C38D74 80242844 24020002 */ addiu $v0, $zero, 2 +/* C38D78 80242848 03E00008 */ jr $ra +/* C38D7C 8024284C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0.s deleted file mode 100644 index 0c23106a57..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428E0 -/* C38E10 802428E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C38E14 802428E4 AFBF0010 */ sw $ra, 0x10($sp) -/* C38E18 802428E8 8C82000C */ lw $v0, 0xc($a0) -/* C38E1C 802428EC 0C0B1EAF */ jal get_variable -/* C38E20 802428F0 8C450000 */ lw $a1, ($v0) -/* C38E24 802428F4 0040202D */ daddu $a0, $v0, $zero -/* C38E28 802428F8 8C830000 */ lw $v1, ($a0) -/* C38E2C 802428FC 34630010 */ ori $v1, $v1, 0x10 -/* C38E30 80242900 AC830000 */ sw $v1, ($a0) -/* C38E34 80242904 8FBF0010 */ lw $ra, 0x10($sp) -/* C38E38 80242908 24020002 */ addiu $v0, $zero, 2 -/* C38E3C 8024290C 03E00008 */ jr $ra -/* C38E40 80242910 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0_C38E10.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0_C38E10.s new file mode 100644 index 0000000000..2e81a7d94e --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802428E0_C38E10.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428E0_C38E10 +/* C38E10 802428E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C38E14 802428E4 AFBF0010 */ sw $ra, 0x10($sp) +/* C38E18 802428E8 8C82000C */ lw $v0, 0xc($a0) +/* C38E1C 802428EC 0C0B1EAF */ jal get_variable +/* C38E20 802428F0 8C450000 */ lw $a1, ($v0) +/* C38E24 802428F4 0040202D */ daddu $a0, $v0, $zero +/* C38E28 802428F8 8C830000 */ lw $v1, ($a0) +/* C38E2C 802428FC 34630010 */ ori $v1, $v1, 0x10 +/* C38E30 80242900 AC830000 */ sw $v1, ($a0) +/* C38E34 80242904 8FBF0010 */ lw $ra, 0x10($sp) +/* C38E38 80242908 24020002 */ addiu $v0, $zero, 2 +/* C38E3C 8024290C 03E00008 */ jr $ra +/* C38E40 80242910 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914.s deleted file mode 100644 index 93b4e395d8..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242914 -/* C38E44 80242914 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C38E48 80242918 AFBF0018 */ sw $ra, 0x18($sp) -/* C38E4C 8024291C 8C82000C */ lw $v0, 0xc($a0) -/* C38E50 80242920 0C0B1EAF */ jal get_variable -/* C38E54 80242924 8C450000 */ lw $a1, ($v0) -/* C38E58 80242928 0C04417A */ jal get_entity_by_index -/* C38E5C 8024292C 0040202D */ daddu $a0, $v0, $zero -/* C38E60 80242930 3C013F80 */ lui $at, 0x3f80 -/* C38E64 80242934 44810000 */ mtc1 $at, $f0 -/* C38E68 80242938 C442004C */ lwc1 $f2, 0x4c($v0) -/* C38E6C 8024293C E7A00010 */ swc1 $f0, 0x10($sp) -/* C38E70 80242940 3C014148 */ lui $at, 0x4148 -/* C38E74 80242944 44810000 */ mtc1 $at, $f0 -/* C38E78 80242948 2403004B */ addiu $v1, $zero, 0x4b -/* C38E7C 8024294C AFA30014 */ sw $v1, 0x14($sp) -/* C38E80 80242950 46001080 */ add.s $f2, $f2, $f0 -/* C38E84 80242954 8C450048 */ lw $a1, 0x48($v0) -/* C38E88 80242958 8C470050 */ lw $a3, 0x50($v0) -/* C38E8C 8024295C 44061000 */ mfc1 $a2, $f2 -/* C38E90 80242960 0C01C2EC */ jal func_80070BB0 -/* C38E94 80242964 24040004 */ addiu $a0, $zero, 4 -/* C38E98 80242968 8FBF0018 */ lw $ra, 0x18($sp) -/* C38E9C 8024296C 24020002 */ addiu $v0, $zero, 2 -/* C38EA0 80242970 03E00008 */ jr $ra -/* C38EA4 80242974 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914_C38E44.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914_C38E44.s new file mode 100644 index 0000000000..aa314c67c0 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242914_C38E44.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242914_C38E44 +/* C38E44 80242914 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C38E48 80242918 AFBF0018 */ sw $ra, 0x18($sp) +/* C38E4C 8024291C 8C82000C */ lw $v0, 0xc($a0) +/* C38E50 80242920 0C0B1EAF */ jal get_variable +/* C38E54 80242924 8C450000 */ lw $a1, ($v0) +/* C38E58 80242928 0C04417A */ jal get_entity_by_index +/* C38E5C 8024292C 0040202D */ daddu $a0, $v0, $zero +/* C38E60 80242930 3C013F80 */ lui $at, 0x3f80 +/* C38E64 80242934 44810000 */ mtc1 $at, $f0 +/* C38E68 80242938 C442004C */ lwc1 $f2, 0x4c($v0) +/* C38E6C 8024293C E7A00010 */ swc1 $f0, 0x10($sp) +/* C38E70 80242940 3C014148 */ lui $at, 0x4148 +/* C38E74 80242944 44810000 */ mtc1 $at, $f0 +/* C38E78 80242948 2403004B */ addiu $v1, $zero, 0x4b +/* C38E7C 8024294C AFA30014 */ sw $v1, 0x14($sp) +/* C38E80 80242950 46001080 */ add.s $f2, $f2, $f0 +/* C38E84 80242954 8C450048 */ lw $a1, 0x48($v0) +/* C38E88 80242958 8C470050 */ lw $a3, 0x50($v0) +/* C38E8C 8024295C 44061000 */ mfc1 $a2, $f2 +/* C38E90 80242960 0C01C2EC */ jal func_80070BB0 +/* C38E94 80242964 24040004 */ addiu $a0, $zero, 4 +/* C38E98 80242968 8FBF0018 */ lw $ra, 0x18($sp) +/* C38E9C 8024296C 24020002 */ addiu $v0, $zero, 2 +/* C38EA0 80242970 03E00008 */ jr $ra +/* C38EA4 80242974 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978.s deleted file mode 100644 index 55879888f1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242978 -/* C38EA8 80242978 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C38EAC 8024297C AFBF0018 */ sw $ra, 0x18($sp) -/* C38EB0 80242980 0C00EAD2 */ jal get_npc_safe -/* C38EB4 80242984 2404FFFC */ addiu $a0, $zero, -4 -/* C38EB8 80242988 C444003C */ lwc1 $f4, 0x3c($v0) -/* C38EBC 8024298C 3C014148 */ lui $at, 0x4148 -/* C38EC0 80242990 44811000 */ mtc1 $at, $f2 -/* C38EC4 80242994 3C013F80 */ lui $at, 0x3f80 -/* C38EC8 80242998 44810000 */ mtc1 $at, $f0 -/* C38ECC 8024299C 2403001E */ addiu $v1, $zero, 0x1e -/* C38ED0 802429A0 AFA30014 */ sw $v1, 0x14($sp) -/* C38ED4 802429A4 46022100 */ add.s $f4, $f4, $f2 -/* C38ED8 802429A8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C38EDC 802429AC 8C450038 */ lw $a1, 0x38($v0) -/* C38EE0 802429B0 8C470040 */ lw $a3, 0x40($v0) -/* C38EE4 802429B4 44062000 */ mfc1 $a2, $f4 -/* C38EE8 802429B8 0C01C2EC */ jal func_80070BB0 -/* C38EEC 802429BC 24040009 */ addiu $a0, $zero, 9 -/* C38EF0 802429C0 8FBF0018 */ lw $ra, 0x18($sp) -/* C38EF4 802429C4 24020002 */ addiu $v0, $zero, 2 -/* C38EF8 802429C8 03E00008 */ jr $ra -/* C38EFC 802429CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978_C38EA8.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978_C38EA8.s new file mode 100644 index 0000000000..b580e63b28 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242978_C38EA8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242978_C38EA8 +/* C38EA8 80242978 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C38EAC 8024297C AFBF0018 */ sw $ra, 0x18($sp) +/* C38EB0 80242980 0C00EAD2 */ jal get_npc_safe +/* C38EB4 80242984 2404FFFC */ addiu $a0, $zero, -4 +/* C38EB8 80242988 C444003C */ lwc1 $f4, 0x3c($v0) +/* C38EBC 8024298C 3C014148 */ lui $at, 0x4148 +/* C38EC0 80242990 44811000 */ mtc1 $at, $f2 +/* C38EC4 80242994 3C013F80 */ lui $at, 0x3f80 +/* C38EC8 80242998 44810000 */ mtc1 $at, $f0 +/* C38ECC 8024299C 2403001E */ addiu $v1, $zero, 0x1e +/* C38ED0 802429A0 AFA30014 */ sw $v1, 0x14($sp) +/* C38ED4 802429A4 46022100 */ add.s $f4, $f4, $f2 +/* C38ED8 802429A8 E7A00010 */ swc1 $f0, 0x10($sp) +/* C38EDC 802429AC 8C450038 */ lw $a1, 0x38($v0) +/* C38EE0 802429B0 8C470040 */ lw $a3, 0x40($v0) +/* C38EE4 802429B4 44062000 */ mfc1 $a2, $f4 +/* C38EE8 802429B8 0C01C2EC */ jal func_80070BB0 +/* C38EEC 802429BC 24040009 */ addiu $a0, $zero, 9 +/* C38EF0 802429C0 8FBF0018 */ lw $ra, 0x18($sp) +/* C38EF4 802429C4 24020002 */ addiu $v0, $zero, 2 +/* C38EF8 802429C8 03E00008 */ jr $ra +/* C38EFC 802429CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0.s deleted file mode 100644 index dcd08b09c3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429D0 -/* C38F00 802429D0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* C38F04 802429D4 AFB60040 */ sw $s6, 0x40($sp) -/* C38F08 802429D8 0080B02D */ daddu $s6, $a0, $zero -/* C38F0C 802429DC AFB00028 */ sw $s0, 0x28($sp) -/* C38F10 802429E0 00A0802D */ daddu $s0, $a1, $zero -/* C38F14 802429E4 AFBF0044 */ sw $ra, 0x44($sp) -/* C38F18 802429E8 AFB5003C */ sw $s5, 0x3c($sp) -/* C38F1C 802429EC AFB40038 */ sw $s4, 0x38($sp) -/* C38F20 802429F0 AFB30034 */ sw $s3, 0x34($sp) -/* C38F24 802429F4 AFB20030 */ sw $s2, 0x30($sp) -/* C38F28 802429F8 AFB1002C */ sw $s1, 0x2c($sp) -/* C38F2C 802429FC F7B80058 */ sdc1 $f24, 0x58($sp) -/* C38F30 80242A00 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C38F34 80242A04 F7B40048 */ sdc1 $f20, 0x48($sp) -/* C38F38 80242A08 8ED3000C */ lw $s3, 0xc($s6) -/* C38F3C 80242A0C 0C00EAD2 */ jal get_npc_safe -/* C38F40 80242A10 2404FFFC */ addiu $a0, $zero, -4 -/* C38F44 80242A14 27A50018 */ addiu $a1, $sp, 0x18 -/* C38F48 80242A18 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C38F4C 80242A1C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C38F50 80242A20 27A6001C */ addiu $a2, $sp, 0x1c -/* C38F54 80242A24 00041880 */ sll $v1, $a0, 2 -/* C38F58 80242A28 00641821 */ addu $v1, $v1, $a0 -/* C38F5C 80242A2C 00031880 */ sll $v1, $v1, 2 -/* C38F60 80242A30 00641823 */ subu $v1, $v1, $a0 -/* C38F64 80242A34 000320C0 */ sll $a0, $v1, 3 -/* C38F68 80242A38 00641821 */ addu $v1, $v1, $a0 -/* C38F6C 80242A3C 000318C0 */ sll $v1, $v1, 3 -/* C38F70 80242A40 3C01800B */ lui $at, 0x800b -/* C38F74 80242A44 00230821 */ addu $at, $at, $v1 -/* C38F78 80242A48 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* C38F7C 80242A4C 0C00A88D */ jal sin_cos_deg -/* C38F80 80242A50 0040A82D */ daddu $s5, $v0, $zero -/* C38F84 80242A54 1200005D */ beqz $s0, .L80242BCC -/* C38F88 80242A58 00000000 */ nop -/* C38F8C 80242A5C 0C00AB0A */ jal general_heap_malloc -/* C38F90 80242A60 24040068 */ addiu $a0, $zero, 0x68 -/* C38F94 80242A64 0040902D */ daddu $s2, $v0, $zero -/* C38F98 80242A68 02C0202D */ daddu $a0, $s6, $zero -/* C38F9C 80242A6C 0000882D */ daddu $s1, $zero, $zero -/* C38FA0 80242A70 2414FFFF */ addiu $s4, $zero, -1 -/* C38FA4 80242A74 AED20060 */ sw $s2, 0x60($s6) -/* C38FA8 80242A78 8E650000 */ lw $a1, ($s3) -/* C38FAC 80242A7C 3C014148 */ lui $at, 0x4148 -/* C38FB0 80242A80 4481C000 */ mtc1 $at, $f24 -/* C38FB4 80242A84 3C013F80 */ lui $at, 0x3f80 -/* C38FB8 80242A88 4481B000 */ mtc1 $at, $f22 -/* C38FBC 80242A8C 4480A000 */ mtc1 $zero, $f20 -/* C38FC0 80242A90 0C0B1EAF */ jal get_variable -/* C38FC4 80242A94 0240802D */ daddu $s0, $s2, $zero -/* C38FC8 80242A98 0C04417A */ jal get_entity_by_index -/* C38FCC 80242A9C 0040202D */ daddu $a0, $v0, $zero -/* C38FD0 80242AA0 AE42005C */ sw $v0, 0x5c($s2) -.L80242AA4: -/* C38FD4 80242AA4 8E42005C */ lw $v0, 0x5c($s2) -/* C38FD8 80242AA8 C440004C */ lwc1 $f0, 0x4c($v0) -/* C38FDC 80242AAC 0000202D */ daddu $a0, $zero, $zero -/* C38FE0 80242AB0 E7B60010 */ swc1 $f22, 0x10($sp) -/* C38FE4 80242AB4 AFB40014 */ sw $s4, 0x14($sp) -/* C38FE8 80242AB8 46180000 */ add.s $f0, $f0, $f24 -/* C38FEC 80242ABC 8C450048 */ lw $a1, 0x48($v0) -/* C38FF0 80242AC0 8C470050 */ lw $a3, 0x50($v0) -/* C38FF4 80242AC4 44060000 */ mfc1 $a2, $f0 -/* C38FF8 80242AC8 0C01C5BC */ jal func_800716F0 -/* C38FFC 80242ACC 26310001 */ addiu $s1, $s1, 1 -/* C39000 80242AD0 AE020008 */ sw $v0, 8($s0) -/* C39004 80242AD4 E614002C */ swc1 $f20, 0x2c($s0) -/* C39008 80242AD8 E6140020 */ swc1 $f20, 0x20($s0) -/* C3900C 80242ADC E6140014 */ swc1 $f20, 0x14($s0) -/* C39010 80242AE0 E6140050 */ swc1 $f20, 0x50($s0) -/* C39014 80242AE4 E6140044 */ swc1 $f20, 0x44($s0) -/* C39018 80242AE8 E6140038 */ swc1 $f20, 0x38($s0) -/* C3901C 80242AEC 2A220003 */ slti $v0, $s1, 3 -/* C39020 80242AF0 1440FFEC */ bnez $v0, .L80242AA4 -/* C39024 80242AF4 26100004 */ addiu $s0, $s0, 4 -/* C39028 80242AF8 0000882D */ daddu $s1, $zero, $zero -/* C3902C 80242AFC 0240802D */ daddu $s0, $s2, $zero -/* C39030 80242B00 3C148024 */ lui $s4, 0x8024 -/* C39034 80242B04 26943D88 */ addiu $s4, $s4, 0x3d88 -/* C39038 80242B08 3C014248 */ lui $at, 0x4248 -/* C3903C 80242B0C 4481A000 */ mtc1 $at, $f20 -/* C39040 80242B10 24130044 */ addiu $s3, $zero, 0x44 -/* C39044 80242B14 AE400000 */ sw $zero, ($s2) -/* C39048 80242B18 AE400004 */ sw $zero, 4($s2) -/* C3904C 80242B1C AE400060 */ sw $zero, 0x60($s2) -/* C39050 80242B20 AE400064 */ sw $zero, 0x64($s2) -.L80242B24: -/* C39054 80242B24 27A40020 */ addiu $a0, $sp, 0x20 -/* C39058 80242B28 4406A000 */ mfc1 $a2, $f20 -/* C3905C 80242B2C 8E870000 */ lw $a3, ($s4) -/* C39060 80242B30 02532821 */ addu $a1, $s2, $s3 -/* C39064 80242B34 0C00A7E7 */ jal add_vec2D_polar -/* C39068 80242B38 AFA00020 */ sw $zero, 0x20($sp) -/* C3906C 80242B3C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C39070 80242B40 C7A40020 */ lwc1 $f4, 0x20($sp) -/* C39074 80242B44 46041082 */ mul.s $f2, $f2, $f4 -/* C39078 80242B48 00000000 */ nop -/* C3907C 80242B4C C7A00018 */ lwc1 $f0, 0x18($sp) -/* C39080 80242B50 46040002 */ mul.s $f0, $f0, $f4 -/* C39084 80242B54 00000000 */ nop -/* C39088 80242B58 E6020038 */ swc1 $f2, 0x38($s0) -/* C3908C 80242B5C E6000050 */ swc1 $f0, 0x50($s0) -/* C39090 80242B60 8E42005C */ lw $v0, 0x5c($s2) -/* C39094 80242B64 C6000038 */ lwc1 $f0, 0x38($s0) -/* C39098 80242B68 C4420048 */ lwc1 $f2, 0x48($v0) -/* C3909C 80242B6C 46001080 */ add.s $f2, $f2, $f0 -/* C390A0 80242B70 C6A00038 */ lwc1 $f0, 0x38($s5) -/* C390A4 80242B74 46020001 */ sub.s $f0, $f0, $f2 -/* C390A8 80242B78 E6000038 */ swc1 $f0, 0x38($s0) -/* C390AC 80242B7C 8E42005C */ lw $v0, 0x5c($s2) -/* C390B0 80242B80 C6000044 */ lwc1 $f0, 0x44($s0) -/* C390B4 80242B84 C442004C */ lwc1 $f2, 0x4c($v0) -/* C390B8 80242B88 46001080 */ add.s $f2, $f2, $f0 -/* C390BC 80242B8C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* C390C0 80242B90 46020001 */ sub.s $f0, $f0, $f2 -/* C390C4 80242B94 E6000044 */ swc1 $f0, 0x44($s0) -/* C390C8 80242B98 8E42005C */ lw $v0, 0x5c($s2) -/* C390CC 80242B9C C6000050 */ lwc1 $f0, 0x50($s0) -/* C390D0 80242BA0 C4420050 */ lwc1 $f2, 0x50($v0) -/* C390D4 80242BA4 26940004 */ addiu $s4, $s4, 4 -/* C390D8 80242BA8 46001080 */ add.s $f2, $f2, $f0 -/* C390DC 80242BAC C6A00040 */ lwc1 $f0, 0x40($s5) -/* C390E0 80242BB0 26730004 */ addiu $s3, $s3, 4 -/* C390E4 80242BB4 46020001 */ sub.s $f0, $f0, $f2 -/* C390E8 80242BB8 26310001 */ addiu $s1, $s1, 1 -/* C390EC 80242BBC 2A220003 */ slti $v0, $s1, 3 -/* C390F0 80242BC0 E6000050 */ swc1 $f0, 0x50($s0) -/* C390F4 80242BC4 1440FFD7 */ bnez $v0, .L80242B24 -/* C390F8 80242BC8 26100004 */ addiu $s0, $s0, 4 -.L80242BCC: -/* C390FC 80242BCC 8ED20060 */ lw $s2, 0x60($s6) -/* C39100 80242BD0 8E430000 */ lw $v1, ($s2) -/* C39104 80242BD4 24020001 */ addiu $v0, $zero, 1 -/* C39108 80242BD8 10620038 */ beq $v1, $v0, .L80242CBC -/* C3910C 80242BDC 28620002 */ slti $v0, $v1, 2 -/* C39110 80242BE0 50400005 */ beql $v0, $zero, .L80242BF8 -/* C39114 80242BE4 24020002 */ addiu $v0, $zero, 2 -/* C39118 80242BE8 10600007 */ beqz $v1, .L80242C08 -/* C3911C 80242BEC 24040005 */ addiu $a0, $zero, 5 -/* C39120 80242BF0 08090B68 */ j .L80242DA0 -/* C39124 80242BF4 00000000 */ nop -.L80242BF8: -/* C39128 80242BF8 10620058 */ beq $v1, $v0, .L80242D5C -/* C3912C 80242BFC 00000000 */ nop -/* C39130 80242C00 08090B68 */ j .L80242DA0 -/* C39134 80242C04 00000000 */ nop -.L80242C08: -/* C39138 80242C08 0000882D */ daddu $s1, $zero, $zero -/* C3913C 80242C0C 3C148024 */ lui $s4, 0x8024 -/* C39140 80242C10 26943D88 */ addiu $s4, $s4, 0x3d88 -/* C39144 80242C14 24130020 */ addiu $s3, $zero, 0x20 -/* C39148 80242C18 3C064248 */ lui $a2, 0x4248 -/* C3914C 80242C1C 44800000 */ mtc1 $zero, $f0 -/* C39150 80242C20 24020014 */ addiu $v0, $zero, 0x14 -/* C39154 80242C24 AFA20010 */ sw $v0, 0x10($sp) -/* C39158 80242C28 44050000 */ mfc1 $a1, $f0 -/* C3915C 80242C2C 8E470060 */ lw $a3, 0x60($s2) -/* C39160 80242C30 4485B000 */ mtc1 $a1, $f22 -/* C39164 80242C34 0C00A8ED */ jal update_lerp -/* C39168 80242C38 0240802D */ daddu $s0, $s2, $zero -/* C3916C 80242C3C 46000506 */ mov.s $f20, $f0 -.L80242C40: -/* C39170 80242C40 4406A000 */ mfc1 $a2, $f20 -/* C39174 80242C44 27A40020 */ addiu $a0, $sp, 0x20 -/* C39178 80242C48 E6160020 */ swc1 $f22, 0x20($s0) -/* C3917C 80242C4C 8E870000 */ lw $a3, ($s4) -/* C39180 80242C50 02532821 */ addu $a1, $s2, $s3 -/* C39184 80242C54 0C00A7E7 */ jal add_vec2D_polar -/* C39188 80242C58 E7B60020 */ swc1 $f22, 0x20($sp) -/* C3918C 80242C5C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C39190 80242C60 C7A00020 */ lwc1 $f0, 0x20($sp) -/* C39194 80242C64 46002102 */ mul.s $f4, $f4, $f0 -/* C39198 80242C68 00000000 */ nop -/* C3919C 80242C6C C7A20018 */ lwc1 $f2, 0x18($sp) -/* C391A0 80242C70 26940004 */ addiu $s4, $s4, 4 -/* C391A4 80242C74 46001082 */ mul.s $f2, $f2, $f0 -/* C391A8 80242C78 00000000 */ nop -/* C391AC 80242C7C 26730004 */ addiu $s3, $s3, 4 -/* C391B0 80242C80 26310001 */ addiu $s1, $s1, 1 -/* C391B4 80242C84 2A220003 */ slti $v0, $s1, 3 -/* C391B8 80242C88 E6040014 */ swc1 $f4, 0x14($s0) -/* C391BC 80242C8C E602002C */ swc1 $f2, 0x2c($s0) -/* C391C0 80242C90 1440FFEB */ bnez $v0, .L80242C40 -/* C391C4 80242C94 26100004 */ addiu $s0, $s0, 4 -/* C391C8 80242C98 8E420060 */ lw $v0, 0x60($s2) -/* C391CC 80242C9C 24420001 */ addiu $v0, $v0, 1 -/* C391D0 80242CA0 AE420060 */ sw $v0, 0x60($s2) -/* C391D4 80242CA4 28420015 */ slti $v0, $v0, 0x15 -/* C391D8 80242CA8 1440003D */ bnez $v0, .L80242DA0 -/* C391DC 80242CAC 24020001 */ addiu $v0, $zero, 1 -/* C391E0 80242CB0 AE420000 */ sw $v0, ($s2) -/* C391E4 80242CB4 08090B68 */ j .L80242DA0 -/* C391E8 80242CB8 AE400060 */ sw $zero, 0x60($s2) -.L80242CBC: -/* C391EC 80242CBC 0000882D */ daddu $s1, $zero, $zero -/* C391F0 80242CC0 3C148024 */ lui $s4, 0x8024 -/* C391F4 80242CC4 26943D88 */ addiu $s4, $s4, 0x3d88 -/* C391F8 80242CC8 24130020 */ addiu $s3, $zero, 0x20 -/* C391FC 80242CCC 0240802D */ daddu $s0, $s2, $zero -/* C39200 80242CD0 3C014248 */ lui $at, 0x4248 -/* C39204 80242CD4 4481A000 */ mtc1 $at, $f20 -/* C39208 80242CD8 4480B000 */ mtc1 $zero, $f22 -.L80242CDC: -/* C3920C 80242CDC 4406A000 */ mfc1 $a2, $f20 -/* C39210 80242CE0 27A40020 */ addiu $a0, $sp, 0x20 -/* C39214 80242CE4 E6160020 */ swc1 $f22, 0x20($s0) -/* C39218 80242CE8 8E870000 */ lw $a3, ($s4) -/* C3921C 80242CEC 02532821 */ addu $a1, $s2, $s3 -/* C39220 80242CF0 0C00A7E7 */ jal add_vec2D_polar -/* C39224 80242CF4 E7B60020 */ swc1 $f22, 0x20($sp) -/* C39228 80242CF8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* C3922C 80242CFC C7A00020 */ lwc1 $f0, 0x20($sp) -/* C39230 80242D00 46002102 */ mul.s $f4, $f4, $f0 -/* C39234 80242D04 00000000 */ nop -/* C39238 80242D08 C7A20018 */ lwc1 $f2, 0x18($sp) -/* C3923C 80242D0C 26940004 */ addiu $s4, $s4, 4 -/* C39240 80242D10 46001082 */ mul.s $f2, $f2, $f0 -/* C39244 80242D14 00000000 */ nop -/* C39248 80242D18 26730004 */ addiu $s3, $s3, 4 -/* C3924C 80242D1C 26310001 */ addiu $s1, $s1, 1 -/* C39250 80242D20 2A220003 */ slti $v0, $s1, 3 -/* C39254 80242D24 E6040014 */ swc1 $f4, 0x14($s0) -/* C39258 80242D28 E602002C */ swc1 $f2, 0x2c($s0) -/* C3925C 80242D2C 1440FFEB */ bnez $v0, .L80242CDC -/* C39260 80242D30 26100004 */ addiu $s0, $s0, 4 -/* C39264 80242D34 8E420060 */ lw $v0, 0x60($s2) -/* C39268 80242D38 24420001 */ addiu $v0, $v0, 1 -/* C3926C 80242D3C AE420060 */ sw $v0, 0x60($s2) -/* C39270 80242D40 28420010 */ slti $v0, $v0, 0x10 -/* C39274 80242D44 14400016 */ bnez $v0, .L80242DA0 -/* C39278 80242D48 2402000F */ addiu $v0, $zero, 0xf -/* C3927C 80242D4C AE420060 */ sw $v0, 0x60($s2) -/* C39280 80242D50 24020002 */ addiu $v0, $zero, 2 -/* C39284 80242D54 08090B68 */ j .L80242DA0 -/* C39288 80242D58 AE420000 */ sw $v0, ($s2) -.L80242D5C: -/* C3928C 80242D5C 8E420060 */ lw $v0, 0x60($s2) -/* C39290 80242D60 24420001 */ addiu $v0, $v0, 1 -/* C39294 80242D64 AE420060 */ sw $v0, 0x60($s2) -/* C39298 80242D68 2842001F */ slti $v0, $v0, 0x1f -/* C3929C 80242D6C 1440000C */ bnez $v0, .L80242DA0 -/* C392A0 80242D70 0000882D */ daddu $s1, $zero, $zero -/* C392A4 80242D74 0240282D */ daddu $a1, $s2, $zero -.L80242D78: -/* C392A8 80242D78 8CA20008 */ lw $v0, 8($a1) -/* C392AC 80242D7C 8C430000 */ lw $v1, ($v0) -/* C392B0 80242D80 26310001 */ addiu $s1, $s1, 1 -/* C392B4 80242D84 34630010 */ ori $v1, $v1, 0x10 -/* C392B8 80242D88 AC430000 */ sw $v1, ($v0) -/* C392BC 80242D8C 2A220003 */ slti $v0, $s1, 3 -/* C392C0 80242D90 1440FFF9 */ bnez $v0, .L80242D78 -/* C392C4 80242D94 24A50004 */ addiu $a1, $a1, 4 -/* C392C8 80242D98 08090BB5 */ j .L80242ED4 -/* C392CC 80242D9C 24020002 */ addiu $v0, $zero, 2 -.L80242DA0: -/* C392D0 80242DA0 8E430004 */ lw $v1, 4($s2) -/* C392D4 80242DA4 10600005 */ beqz $v1, .L80242DBC -/* C392D8 80242DA8 24020001 */ addiu $v0, $zero, 1 -/* C392DC 80242DAC 1062000B */ beq $v1, $v0, .L80242DDC -/* C392E0 80242DB0 0000882D */ daddu $s1, $zero, $zero -/* C392E4 80242DB4 08090BA4 */ j .L80242E90 -/* C392E8 80242DB8 0240282D */ daddu $a1, $s2, $zero -.L80242DBC: -/* C392EC 80242DBC 8E420064 */ lw $v0, 0x64($s2) -/* C392F0 80242DC0 24420001 */ addiu $v0, $v0, 1 -/* C392F4 80242DC4 AE420064 */ sw $v0, 0x64($s2) -/* C392F8 80242DC8 28420010 */ slti $v0, $v0, 0x10 -/* C392FC 80242DCC 1440002F */ bnez $v0, .L80242E8C -/* C39300 80242DD0 0000882D */ daddu $s1, $zero, $zero -/* C39304 80242DD4 08090BA0 */ j .L80242E80 -/* C39308 80242DD8 24020001 */ addiu $v0, $zero, 1 -.L80242DDC: -/* C3930C 80242DDC 4480A000 */ mtc1 $zero, $f20 -/* C39310 80242DE0 24130014 */ addiu $s3, $zero, 0x14 -/* C39314 80242DE4 0240802D */ daddu $s0, $s2, $zero -.L80242DE8: -/* C39318 80242DE8 4405A000 */ mfc1 $a1, $f20 -/* C3931C 80242DEC AFB30010 */ sw $s3, 0x10($sp) -/* C39320 80242DF0 8E060038 */ lw $a2, 0x38($s0) -/* C39324 80242DF4 8E470064 */ lw $a3, 0x64($s2) -/* C39328 80242DF8 0C00A8ED */ jal update_lerp -/* C3932C 80242DFC 24040001 */ addiu $a0, $zero, 1 -/* C39330 80242E00 C6020014 */ lwc1 $f2, 0x14($s0) -/* C39334 80242E04 46001080 */ add.s $f2, $f2, $f0 -/* C39338 80242E08 4405A000 */ mfc1 $a1, $f20 -/* C3933C 80242E0C E6020014 */ swc1 $f2, 0x14($s0) -/* C39340 80242E10 AFB30010 */ sw $s3, 0x10($sp) -/* C39344 80242E14 8E060044 */ lw $a2, 0x44($s0) -/* C39348 80242E18 8E470064 */ lw $a3, 0x64($s2) -/* C3934C 80242E1C 0C00A8ED */ jal update_lerp -/* C39350 80242E20 24040001 */ addiu $a0, $zero, 1 -/* C39354 80242E24 C6020020 */ lwc1 $f2, 0x20($s0) -/* C39358 80242E28 46001080 */ add.s $f2, $f2, $f0 -/* C3935C 80242E2C 4405A000 */ mfc1 $a1, $f20 -/* C39360 80242E30 E6020020 */ swc1 $f2, 0x20($s0) -/* C39364 80242E34 AFB30010 */ sw $s3, 0x10($sp) -/* C39368 80242E38 8E060050 */ lw $a2, 0x50($s0) -/* C3936C 80242E3C 8E470064 */ lw $a3, 0x64($s2) -/* C39370 80242E40 0C00A8ED */ jal update_lerp -/* C39374 80242E44 24040001 */ addiu $a0, $zero, 1 -/* C39378 80242E48 C602002C */ lwc1 $f2, 0x2c($s0) -/* C3937C 80242E4C 46001080 */ add.s $f2, $f2, $f0 -/* C39380 80242E50 26310001 */ addiu $s1, $s1, 1 -/* C39384 80242E54 2A220003 */ slti $v0, $s1, 3 -/* C39388 80242E58 E602002C */ swc1 $f2, 0x2c($s0) -/* C3938C 80242E5C 1440FFE2 */ bnez $v0, .L80242DE8 -/* C39390 80242E60 26100004 */ addiu $s0, $s0, 4 -/* C39394 80242E64 8E420064 */ lw $v0, 0x64($s2) -/* C39398 80242E68 24420001 */ addiu $v0, $v0, 1 -/* C3939C 80242E6C AE420064 */ sw $v0, 0x64($s2) -/* C393A0 80242E70 28420015 */ slti $v0, $v0, 0x15 -/* C393A4 80242E74 14400005 */ bnez $v0, .L80242E8C -/* C393A8 80242E78 0000882D */ daddu $s1, $zero, $zero -/* C393AC 80242E7C 24020002 */ addiu $v0, $zero, 2 -.L80242E80: -/* C393B0 80242E80 AE420004 */ sw $v0, 4($s2) -/* C393B4 80242E84 AE400064 */ sw $zero, 0x64($s2) -/* C393B8 80242E88 0000882D */ daddu $s1, $zero, $zero -.L80242E8C: -/* C393BC 80242E8C 0240282D */ daddu $a1, $s2, $zero -.L80242E90: -/* C393C0 80242E90 8CA20008 */ lw $v0, 8($a1) -/* C393C4 80242E94 C4A00014 */ lwc1 $f0, 0x14($a1) -/* C393C8 80242E98 8C42000C */ lw $v0, 0xc($v0) -/* C393CC 80242E9C E4400010 */ swc1 $f0, 0x10($v0) -/* C393D0 80242EA0 8CA20008 */ lw $v0, 8($a1) -/* C393D4 80242EA4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* C393D8 80242EA8 8C42000C */ lw $v0, 0xc($v0) -/* C393DC 80242EAC 26310001 */ addiu $s1, $s1, 1 -/* C393E0 80242EB0 E4400014 */ swc1 $f0, 0x14($v0) -/* C393E4 80242EB4 8CA20008 */ lw $v0, 8($a1) -/* C393E8 80242EB8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* C393EC 80242EBC 8C42000C */ lw $v0, 0xc($v0) -/* C393F0 80242EC0 E4400018 */ swc1 $f0, 0x18($v0) -/* C393F4 80242EC4 2A220003 */ slti $v0, $s1, 3 -/* C393F8 80242EC8 1440FFF1 */ bnez $v0, .L80242E90 -/* C393FC 80242ECC 24A50004 */ addiu $a1, $a1, 4 -/* C39400 80242ED0 0000102D */ daddu $v0, $zero, $zero -.L80242ED4: -/* C39404 80242ED4 8FBF0044 */ lw $ra, 0x44($sp) -/* C39408 80242ED8 8FB60040 */ lw $s6, 0x40($sp) -/* C3940C 80242EDC 8FB5003C */ lw $s5, 0x3c($sp) -/* C39410 80242EE0 8FB40038 */ lw $s4, 0x38($sp) -/* C39414 80242EE4 8FB30034 */ lw $s3, 0x34($sp) -/* C39418 80242EE8 8FB20030 */ lw $s2, 0x30($sp) -/* C3941C 80242EEC 8FB1002C */ lw $s1, 0x2c($sp) -/* C39420 80242EF0 8FB00028 */ lw $s0, 0x28($sp) -/* C39424 80242EF4 D7B80058 */ ldc1 $f24, 0x58($sp) -/* C39428 80242EF8 D7B60050 */ ldc1 $f22, 0x50($sp) -/* C3942C 80242EFC D7B40048 */ ldc1 $f20, 0x48($sp) -/* C39430 80242F00 03E00008 */ jr $ra -/* C39434 80242F04 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s new file mode 100644 index 0000000000..4607e52a60 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802429D0_C38F00.s @@ -0,0 +1,356 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429D0_C38F00 +/* C38F00 802429D0 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* C38F04 802429D4 AFB60040 */ sw $s6, 0x40($sp) +/* C38F08 802429D8 0080B02D */ daddu $s6, $a0, $zero +/* C38F0C 802429DC AFB00028 */ sw $s0, 0x28($sp) +/* C38F10 802429E0 00A0802D */ daddu $s0, $a1, $zero +/* C38F14 802429E4 AFBF0044 */ sw $ra, 0x44($sp) +/* C38F18 802429E8 AFB5003C */ sw $s5, 0x3c($sp) +/* C38F1C 802429EC AFB40038 */ sw $s4, 0x38($sp) +/* C38F20 802429F0 AFB30034 */ sw $s3, 0x34($sp) +/* C38F24 802429F4 AFB20030 */ sw $s2, 0x30($sp) +/* C38F28 802429F8 AFB1002C */ sw $s1, 0x2c($sp) +/* C38F2C 802429FC F7B80058 */ sdc1 $f24, 0x58($sp) +/* C38F30 80242A00 F7B60050 */ sdc1 $f22, 0x50($sp) +/* C38F34 80242A04 F7B40048 */ sdc1 $f20, 0x48($sp) +/* C38F38 80242A08 8ED3000C */ lw $s3, 0xc($s6) +/* C38F3C 80242A0C 0C00EAD2 */ jal get_npc_safe +/* C38F40 80242A10 2404FFFC */ addiu $a0, $zero, -4 +/* C38F44 80242A14 27A50018 */ addiu $a1, $sp, 0x18 +/* C38F48 80242A18 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* C38F4C 80242A1C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* C38F50 80242A20 27A6001C */ addiu $a2, $sp, 0x1c +/* C38F54 80242A24 00041880 */ sll $v1, $a0, 2 +/* C38F58 80242A28 00641821 */ addu $v1, $v1, $a0 +/* C38F5C 80242A2C 00031880 */ sll $v1, $v1, 2 +/* C38F60 80242A30 00641823 */ subu $v1, $v1, $a0 +/* C38F64 80242A34 000320C0 */ sll $a0, $v1, 3 +/* C38F68 80242A38 00641821 */ addu $v1, $v1, $a0 +/* C38F6C 80242A3C 000318C0 */ sll $v1, $v1, 3 +/* C38F70 80242A40 3C01800B */ lui $at, 0x800b +/* C38F74 80242A44 00230821 */ addu $at, $at, $v1 +/* C38F78 80242A48 C42C1DEC */ lwc1 $f12, 0x1dec($at) +/* C38F7C 80242A4C 0C00A88D */ jal sin_cos_deg +/* C38F80 80242A50 0040A82D */ daddu $s5, $v0, $zero +/* C38F84 80242A54 1200005D */ beqz $s0, .L80242BCC +/* C38F88 80242A58 00000000 */ nop +/* C38F8C 80242A5C 0C00AB0A */ jal general_heap_malloc +/* C38F90 80242A60 24040068 */ addiu $a0, $zero, 0x68 +/* C38F94 80242A64 0040902D */ daddu $s2, $v0, $zero +/* C38F98 80242A68 02C0202D */ daddu $a0, $s6, $zero +/* C38F9C 80242A6C 0000882D */ daddu $s1, $zero, $zero +/* C38FA0 80242A70 2414FFFF */ addiu $s4, $zero, -1 +/* C38FA4 80242A74 AED20060 */ sw $s2, 0x60($s6) +/* C38FA8 80242A78 8E650000 */ lw $a1, ($s3) +/* C38FAC 80242A7C 3C014148 */ lui $at, 0x4148 +/* C38FB0 80242A80 4481C000 */ mtc1 $at, $f24 +/* C38FB4 80242A84 3C013F80 */ lui $at, 0x3f80 +/* C38FB8 80242A88 4481B000 */ mtc1 $at, $f22 +/* C38FBC 80242A8C 4480A000 */ mtc1 $zero, $f20 +/* C38FC0 80242A90 0C0B1EAF */ jal get_variable +/* C38FC4 80242A94 0240802D */ daddu $s0, $s2, $zero +/* C38FC8 80242A98 0C04417A */ jal get_entity_by_index +/* C38FCC 80242A9C 0040202D */ daddu $a0, $v0, $zero +/* C38FD0 80242AA0 AE42005C */ sw $v0, 0x5c($s2) +.L80242AA4: +/* C38FD4 80242AA4 8E42005C */ lw $v0, 0x5c($s2) +/* C38FD8 80242AA8 C440004C */ lwc1 $f0, 0x4c($v0) +/* C38FDC 80242AAC 0000202D */ daddu $a0, $zero, $zero +/* C38FE0 80242AB0 E7B60010 */ swc1 $f22, 0x10($sp) +/* C38FE4 80242AB4 AFB40014 */ sw $s4, 0x14($sp) +/* C38FE8 80242AB8 46180000 */ add.s $f0, $f0, $f24 +/* C38FEC 80242ABC 8C450048 */ lw $a1, 0x48($v0) +/* C38FF0 80242AC0 8C470050 */ lw $a3, 0x50($v0) +/* C38FF4 80242AC4 44060000 */ mfc1 $a2, $f0 +/* C38FF8 80242AC8 0C01C5BC */ jal func_800716F0 +/* C38FFC 80242ACC 26310001 */ addiu $s1, $s1, 1 +/* C39000 80242AD0 AE020008 */ sw $v0, 8($s0) +/* C39004 80242AD4 E614002C */ swc1 $f20, 0x2c($s0) +/* C39008 80242AD8 E6140020 */ swc1 $f20, 0x20($s0) +/* C3900C 80242ADC E6140014 */ swc1 $f20, 0x14($s0) +/* C39010 80242AE0 E6140050 */ swc1 $f20, 0x50($s0) +/* C39014 80242AE4 E6140044 */ swc1 $f20, 0x44($s0) +/* C39018 80242AE8 E6140038 */ swc1 $f20, 0x38($s0) +/* C3901C 80242AEC 2A220003 */ slti $v0, $s1, 3 +/* C39020 80242AF0 1440FFEC */ bnez $v0, .L80242AA4 +/* C39024 80242AF4 26100004 */ addiu $s0, $s0, 4 +/* C39028 80242AF8 0000882D */ daddu $s1, $zero, $zero +/* C3902C 80242AFC 0240802D */ daddu $s0, $s2, $zero +/* C39030 80242B00 3C148024 */ lui $s4, 0x8024 +/* C39034 80242B04 26943D88 */ addiu $s4, $s4, 0x3d88 +/* C39038 80242B08 3C014248 */ lui $at, 0x4248 +/* C3903C 80242B0C 4481A000 */ mtc1 $at, $f20 +/* C39040 80242B10 24130044 */ addiu $s3, $zero, 0x44 +/* C39044 80242B14 AE400000 */ sw $zero, ($s2) +/* C39048 80242B18 AE400004 */ sw $zero, 4($s2) +/* C3904C 80242B1C AE400060 */ sw $zero, 0x60($s2) +/* C39050 80242B20 AE400064 */ sw $zero, 0x64($s2) +.L80242B24: +/* C39054 80242B24 27A40020 */ addiu $a0, $sp, 0x20 +/* C39058 80242B28 4406A000 */ mfc1 $a2, $f20 +/* C3905C 80242B2C 8E870000 */ lw $a3, ($s4) +/* C39060 80242B30 02532821 */ addu $a1, $s2, $s3 +/* C39064 80242B34 0C00A7E7 */ jal add_vec2D_polar +/* C39068 80242B38 AFA00020 */ sw $zero, 0x20($sp) +/* C3906C 80242B3C C7A2001C */ lwc1 $f2, 0x1c($sp) +/* C39070 80242B40 C7A40020 */ lwc1 $f4, 0x20($sp) +/* C39074 80242B44 46041082 */ mul.s $f2, $f2, $f4 +/* C39078 80242B48 00000000 */ nop +/* C3907C 80242B4C C7A00018 */ lwc1 $f0, 0x18($sp) +/* C39080 80242B50 46040002 */ mul.s $f0, $f0, $f4 +/* C39084 80242B54 00000000 */ nop +/* C39088 80242B58 E6020038 */ swc1 $f2, 0x38($s0) +/* C3908C 80242B5C E6000050 */ swc1 $f0, 0x50($s0) +/* C39090 80242B60 8E42005C */ lw $v0, 0x5c($s2) +/* C39094 80242B64 C6000038 */ lwc1 $f0, 0x38($s0) +/* C39098 80242B68 C4420048 */ lwc1 $f2, 0x48($v0) +/* C3909C 80242B6C 46001080 */ add.s $f2, $f2, $f0 +/* C390A0 80242B70 C6A00038 */ lwc1 $f0, 0x38($s5) +/* C390A4 80242B74 46020001 */ sub.s $f0, $f0, $f2 +/* C390A8 80242B78 E6000038 */ swc1 $f0, 0x38($s0) +/* C390AC 80242B7C 8E42005C */ lw $v0, 0x5c($s2) +/* C390B0 80242B80 C6000044 */ lwc1 $f0, 0x44($s0) +/* C390B4 80242B84 C442004C */ lwc1 $f2, 0x4c($v0) +/* C390B8 80242B88 46001080 */ add.s $f2, $f2, $f0 +/* C390BC 80242B8C C6A0003C */ lwc1 $f0, 0x3c($s5) +/* C390C0 80242B90 46020001 */ sub.s $f0, $f0, $f2 +/* C390C4 80242B94 E6000044 */ swc1 $f0, 0x44($s0) +/* C390C8 80242B98 8E42005C */ lw $v0, 0x5c($s2) +/* C390CC 80242B9C C6000050 */ lwc1 $f0, 0x50($s0) +/* C390D0 80242BA0 C4420050 */ lwc1 $f2, 0x50($v0) +/* C390D4 80242BA4 26940004 */ addiu $s4, $s4, 4 +/* C390D8 80242BA8 46001080 */ add.s $f2, $f2, $f0 +/* C390DC 80242BAC C6A00040 */ lwc1 $f0, 0x40($s5) +/* C390E0 80242BB0 26730004 */ addiu $s3, $s3, 4 +/* C390E4 80242BB4 46020001 */ sub.s $f0, $f0, $f2 +/* C390E8 80242BB8 26310001 */ addiu $s1, $s1, 1 +/* C390EC 80242BBC 2A220003 */ slti $v0, $s1, 3 +/* C390F0 80242BC0 E6000050 */ swc1 $f0, 0x50($s0) +/* C390F4 80242BC4 1440FFD7 */ bnez $v0, .L80242B24 +/* C390F8 80242BC8 26100004 */ addiu $s0, $s0, 4 +.L80242BCC: +/* C390FC 80242BCC 8ED20060 */ lw $s2, 0x60($s6) +/* C39100 80242BD0 8E430000 */ lw $v1, ($s2) +/* C39104 80242BD4 24020001 */ addiu $v0, $zero, 1 +/* C39108 80242BD8 10620038 */ beq $v1, $v0, .L80242CBC +/* C3910C 80242BDC 28620002 */ slti $v0, $v1, 2 +/* C39110 80242BE0 50400005 */ beql $v0, $zero, .L80242BF8 +/* C39114 80242BE4 24020002 */ addiu $v0, $zero, 2 +/* C39118 80242BE8 10600007 */ beqz $v1, .L80242C08 +/* C3911C 80242BEC 24040005 */ addiu $a0, $zero, 5 +/* C39120 80242BF0 08090B68 */ j .L80242DA0 +/* C39124 80242BF4 00000000 */ nop +.L80242BF8: +/* C39128 80242BF8 10620058 */ beq $v1, $v0, .L80242D5C +/* C3912C 80242BFC 00000000 */ nop +/* C39130 80242C00 08090B68 */ j .L80242DA0 +/* C39134 80242C04 00000000 */ nop +.L80242C08: +/* C39138 80242C08 0000882D */ daddu $s1, $zero, $zero +/* C3913C 80242C0C 3C148024 */ lui $s4, 0x8024 +/* C39140 80242C10 26943D88 */ addiu $s4, $s4, 0x3d88 +/* C39144 80242C14 24130020 */ addiu $s3, $zero, 0x20 +/* C39148 80242C18 3C064248 */ lui $a2, 0x4248 +/* C3914C 80242C1C 44800000 */ mtc1 $zero, $f0 +/* C39150 80242C20 24020014 */ addiu $v0, $zero, 0x14 +/* C39154 80242C24 AFA20010 */ sw $v0, 0x10($sp) +/* C39158 80242C28 44050000 */ mfc1 $a1, $f0 +/* C3915C 80242C2C 8E470060 */ lw $a3, 0x60($s2) +/* C39160 80242C30 4485B000 */ mtc1 $a1, $f22 +/* C39164 80242C34 0C00A8ED */ jal update_lerp +/* C39168 80242C38 0240802D */ daddu $s0, $s2, $zero +/* C3916C 80242C3C 46000506 */ mov.s $f20, $f0 +.L80242C40: +/* C39170 80242C40 4406A000 */ mfc1 $a2, $f20 +/* C39174 80242C44 27A40020 */ addiu $a0, $sp, 0x20 +/* C39178 80242C48 E6160020 */ swc1 $f22, 0x20($s0) +/* C3917C 80242C4C 8E870000 */ lw $a3, ($s4) +/* C39180 80242C50 02532821 */ addu $a1, $s2, $s3 +/* C39184 80242C54 0C00A7E7 */ jal add_vec2D_polar +/* C39188 80242C58 E7B60020 */ swc1 $f22, 0x20($sp) +/* C3918C 80242C5C C7A4001C */ lwc1 $f4, 0x1c($sp) +/* C39190 80242C60 C7A00020 */ lwc1 $f0, 0x20($sp) +/* C39194 80242C64 46002102 */ mul.s $f4, $f4, $f0 +/* C39198 80242C68 00000000 */ nop +/* C3919C 80242C6C C7A20018 */ lwc1 $f2, 0x18($sp) +/* C391A0 80242C70 26940004 */ addiu $s4, $s4, 4 +/* C391A4 80242C74 46001082 */ mul.s $f2, $f2, $f0 +/* C391A8 80242C78 00000000 */ nop +/* C391AC 80242C7C 26730004 */ addiu $s3, $s3, 4 +/* C391B0 80242C80 26310001 */ addiu $s1, $s1, 1 +/* C391B4 80242C84 2A220003 */ slti $v0, $s1, 3 +/* C391B8 80242C88 E6040014 */ swc1 $f4, 0x14($s0) +/* C391BC 80242C8C E602002C */ swc1 $f2, 0x2c($s0) +/* C391C0 80242C90 1440FFEB */ bnez $v0, .L80242C40 +/* C391C4 80242C94 26100004 */ addiu $s0, $s0, 4 +/* C391C8 80242C98 8E420060 */ lw $v0, 0x60($s2) +/* C391CC 80242C9C 24420001 */ addiu $v0, $v0, 1 +/* C391D0 80242CA0 AE420060 */ sw $v0, 0x60($s2) +/* C391D4 80242CA4 28420015 */ slti $v0, $v0, 0x15 +/* C391D8 80242CA8 1440003D */ bnez $v0, .L80242DA0 +/* C391DC 80242CAC 24020001 */ addiu $v0, $zero, 1 +/* C391E0 80242CB0 AE420000 */ sw $v0, ($s2) +/* C391E4 80242CB4 08090B68 */ j .L80242DA0 +/* C391E8 80242CB8 AE400060 */ sw $zero, 0x60($s2) +.L80242CBC: +/* C391EC 80242CBC 0000882D */ daddu $s1, $zero, $zero +/* C391F0 80242CC0 3C148024 */ lui $s4, 0x8024 +/* C391F4 80242CC4 26943D88 */ addiu $s4, $s4, 0x3d88 +/* C391F8 80242CC8 24130020 */ addiu $s3, $zero, 0x20 +/* C391FC 80242CCC 0240802D */ daddu $s0, $s2, $zero +/* C39200 80242CD0 3C014248 */ lui $at, 0x4248 +/* C39204 80242CD4 4481A000 */ mtc1 $at, $f20 +/* C39208 80242CD8 4480B000 */ mtc1 $zero, $f22 +.L80242CDC: +/* C3920C 80242CDC 4406A000 */ mfc1 $a2, $f20 +/* C39210 80242CE0 27A40020 */ addiu $a0, $sp, 0x20 +/* C39214 80242CE4 E6160020 */ swc1 $f22, 0x20($s0) +/* C39218 80242CE8 8E870000 */ lw $a3, ($s4) +/* C3921C 80242CEC 02532821 */ addu $a1, $s2, $s3 +/* C39220 80242CF0 0C00A7E7 */ jal add_vec2D_polar +/* C39224 80242CF4 E7B60020 */ swc1 $f22, 0x20($sp) +/* C39228 80242CF8 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* C3922C 80242CFC C7A00020 */ lwc1 $f0, 0x20($sp) +/* C39230 80242D00 46002102 */ mul.s $f4, $f4, $f0 +/* C39234 80242D04 00000000 */ nop +/* C39238 80242D08 C7A20018 */ lwc1 $f2, 0x18($sp) +/* C3923C 80242D0C 26940004 */ addiu $s4, $s4, 4 +/* C39240 80242D10 46001082 */ mul.s $f2, $f2, $f0 +/* C39244 80242D14 00000000 */ nop +/* C39248 80242D18 26730004 */ addiu $s3, $s3, 4 +/* C3924C 80242D1C 26310001 */ addiu $s1, $s1, 1 +/* C39250 80242D20 2A220003 */ slti $v0, $s1, 3 +/* C39254 80242D24 E6040014 */ swc1 $f4, 0x14($s0) +/* C39258 80242D28 E602002C */ swc1 $f2, 0x2c($s0) +/* C3925C 80242D2C 1440FFEB */ bnez $v0, .L80242CDC +/* C39260 80242D30 26100004 */ addiu $s0, $s0, 4 +/* C39264 80242D34 8E420060 */ lw $v0, 0x60($s2) +/* C39268 80242D38 24420001 */ addiu $v0, $v0, 1 +/* C3926C 80242D3C AE420060 */ sw $v0, 0x60($s2) +/* C39270 80242D40 28420010 */ slti $v0, $v0, 0x10 +/* C39274 80242D44 14400016 */ bnez $v0, .L80242DA0 +/* C39278 80242D48 2402000F */ addiu $v0, $zero, 0xf +/* C3927C 80242D4C AE420060 */ sw $v0, 0x60($s2) +/* C39280 80242D50 24020002 */ addiu $v0, $zero, 2 +/* C39284 80242D54 08090B68 */ j .L80242DA0 +/* C39288 80242D58 AE420000 */ sw $v0, ($s2) +.L80242D5C: +/* C3928C 80242D5C 8E420060 */ lw $v0, 0x60($s2) +/* C39290 80242D60 24420001 */ addiu $v0, $v0, 1 +/* C39294 80242D64 AE420060 */ sw $v0, 0x60($s2) +/* C39298 80242D68 2842001F */ slti $v0, $v0, 0x1f +/* C3929C 80242D6C 1440000C */ bnez $v0, .L80242DA0 +/* C392A0 80242D70 0000882D */ daddu $s1, $zero, $zero +/* C392A4 80242D74 0240282D */ daddu $a1, $s2, $zero +.L80242D78: +/* C392A8 80242D78 8CA20008 */ lw $v0, 8($a1) +/* C392AC 80242D7C 8C430000 */ lw $v1, ($v0) +/* C392B0 80242D80 26310001 */ addiu $s1, $s1, 1 +/* C392B4 80242D84 34630010 */ ori $v1, $v1, 0x10 +/* C392B8 80242D88 AC430000 */ sw $v1, ($v0) +/* C392BC 80242D8C 2A220003 */ slti $v0, $s1, 3 +/* C392C0 80242D90 1440FFF9 */ bnez $v0, .L80242D78 +/* C392C4 80242D94 24A50004 */ addiu $a1, $a1, 4 +/* C392C8 80242D98 08090BB5 */ j .L80242ED4 +/* C392CC 80242D9C 24020002 */ addiu $v0, $zero, 2 +.L80242DA0: +/* C392D0 80242DA0 8E430004 */ lw $v1, 4($s2) +/* C392D4 80242DA4 10600005 */ beqz $v1, .L80242DBC +/* C392D8 80242DA8 24020001 */ addiu $v0, $zero, 1 +/* C392DC 80242DAC 1062000B */ beq $v1, $v0, .L80242DDC +/* C392E0 80242DB0 0000882D */ daddu $s1, $zero, $zero +/* C392E4 80242DB4 08090BA4 */ j .L80242E90 +/* C392E8 80242DB8 0240282D */ daddu $a1, $s2, $zero +.L80242DBC: +/* C392EC 80242DBC 8E420064 */ lw $v0, 0x64($s2) +/* C392F0 80242DC0 24420001 */ addiu $v0, $v0, 1 +/* C392F4 80242DC4 AE420064 */ sw $v0, 0x64($s2) +/* C392F8 80242DC8 28420010 */ slti $v0, $v0, 0x10 +/* C392FC 80242DCC 1440002F */ bnez $v0, .L80242E8C +/* C39300 80242DD0 0000882D */ daddu $s1, $zero, $zero +/* C39304 80242DD4 08090BA0 */ j .L80242E80 +/* C39308 80242DD8 24020001 */ addiu $v0, $zero, 1 +.L80242DDC: +/* C3930C 80242DDC 4480A000 */ mtc1 $zero, $f20 +/* C39310 80242DE0 24130014 */ addiu $s3, $zero, 0x14 +/* C39314 80242DE4 0240802D */ daddu $s0, $s2, $zero +.L80242DE8: +/* C39318 80242DE8 4405A000 */ mfc1 $a1, $f20 +/* C3931C 80242DEC AFB30010 */ sw $s3, 0x10($sp) +/* C39320 80242DF0 8E060038 */ lw $a2, 0x38($s0) +/* C39324 80242DF4 8E470064 */ lw $a3, 0x64($s2) +/* C39328 80242DF8 0C00A8ED */ jal update_lerp +/* C3932C 80242DFC 24040001 */ addiu $a0, $zero, 1 +/* C39330 80242E00 C6020014 */ lwc1 $f2, 0x14($s0) +/* C39334 80242E04 46001080 */ add.s $f2, $f2, $f0 +/* C39338 80242E08 4405A000 */ mfc1 $a1, $f20 +/* C3933C 80242E0C E6020014 */ swc1 $f2, 0x14($s0) +/* C39340 80242E10 AFB30010 */ sw $s3, 0x10($sp) +/* C39344 80242E14 8E060044 */ lw $a2, 0x44($s0) +/* C39348 80242E18 8E470064 */ lw $a3, 0x64($s2) +/* C3934C 80242E1C 0C00A8ED */ jal update_lerp +/* C39350 80242E20 24040001 */ addiu $a0, $zero, 1 +/* C39354 80242E24 C6020020 */ lwc1 $f2, 0x20($s0) +/* C39358 80242E28 46001080 */ add.s $f2, $f2, $f0 +/* C3935C 80242E2C 4405A000 */ mfc1 $a1, $f20 +/* C39360 80242E30 E6020020 */ swc1 $f2, 0x20($s0) +/* C39364 80242E34 AFB30010 */ sw $s3, 0x10($sp) +/* C39368 80242E38 8E060050 */ lw $a2, 0x50($s0) +/* C3936C 80242E3C 8E470064 */ lw $a3, 0x64($s2) +/* C39370 80242E40 0C00A8ED */ jal update_lerp +/* C39374 80242E44 24040001 */ addiu $a0, $zero, 1 +/* C39378 80242E48 C602002C */ lwc1 $f2, 0x2c($s0) +/* C3937C 80242E4C 46001080 */ add.s $f2, $f2, $f0 +/* C39380 80242E50 26310001 */ addiu $s1, $s1, 1 +/* C39384 80242E54 2A220003 */ slti $v0, $s1, 3 +/* C39388 80242E58 E602002C */ swc1 $f2, 0x2c($s0) +/* C3938C 80242E5C 1440FFE2 */ bnez $v0, .L80242DE8 +/* C39390 80242E60 26100004 */ addiu $s0, $s0, 4 +/* C39394 80242E64 8E420064 */ lw $v0, 0x64($s2) +/* C39398 80242E68 24420001 */ addiu $v0, $v0, 1 +/* C3939C 80242E6C AE420064 */ sw $v0, 0x64($s2) +/* C393A0 80242E70 28420015 */ slti $v0, $v0, 0x15 +/* C393A4 80242E74 14400005 */ bnez $v0, .L80242E8C +/* C393A8 80242E78 0000882D */ daddu $s1, $zero, $zero +/* C393AC 80242E7C 24020002 */ addiu $v0, $zero, 2 +.L80242E80: +/* C393B0 80242E80 AE420004 */ sw $v0, 4($s2) +/* C393B4 80242E84 AE400064 */ sw $zero, 0x64($s2) +/* C393B8 80242E88 0000882D */ daddu $s1, $zero, $zero +.L80242E8C: +/* C393BC 80242E8C 0240282D */ daddu $a1, $s2, $zero +.L80242E90: +/* C393C0 80242E90 8CA20008 */ lw $v0, 8($a1) +/* C393C4 80242E94 C4A00014 */ lwc1 $f0, 0x14($a1) +/* C393C8 80242E98 8C42000C */ lw $v0, 0xc($v0) +/* C393CC 80242E9C E4400010 */ swc1 $f0, 0x10($v0) +/* C393D0 80242EA0 8CA20008 */ lw $v0, 8($a1) +/* C393D4 80242EA4 C4A00020 */ lwc1 $f0, 0x20($a1) +/* C393D8 80242EA8 8C42000C */ lw $v0, 0xc($v0) +/* C393DC 80242EAC 26310001 */ addiu $s1, $s1, 1 +/* C393E0 80242EB0 E4400014 */ swc1 $f0, 0x14($v0) +/* C393E4 80242EB4 8CA20008 */ lw $v0, 8($a1) +/* C393E8 80242EB8 C4A0002C */ lwc1 $f0, 0x2c($a1) +/* C393EC 80242EBC 8C42000C */ lw $v0, 0xc($v0) +/* C393F0 80242EC0 E4400018 */ swc1 $f0, 0x18($v0) +/* C393F4 80242EC4 2A220003 */ slti $v0, $s1, 3 +/* C393F8 80242EC8 1440FFF1 */ bnez $v0, .L80242E90 +/* C393FC 80242ECC 24A50004 */ addiu $a1, $a1, 4 +/* C39400 80242ED0 0000102D */ daddu $v0, $zero, $zero +.L80242ED4: +/* C39404 80242ED4 8FBF0044 */ lw $ra, 0x44($sp) +/* C39408 80242ED8 8FB60040 */ lw $s6, 0x40($sp) +/* C3940C 80242EDC 8FB5003C */ lw $s5, 0x3c($sp) +/* C39410 80242EE0 8FB40038 */ lw $s4, 0x38($sp) +/* C39414 80242EE4 8FB30034 */ lw $s3, 0x34($sp) +/* C39418 80242EE8 8FB20030 */ lw $s2, 0x30($sp) +/* C3941C 80242EEC 8FB1002C */ lw $s1, 0x2c($sp) +/* C39420 80242EF0 8FB00028 */ lw $s0, 0x28($sp) +/* C39424 80242EF4 D7B80058 */ ldc1 $f24, 0x58($sp) +/* C39428 80242EF8 D7B60050 */ ldc1 $f22, 0x50($sp) +/* C3942C 80242EFC D7B40048 */ ldc1 $f20, 0x48($sp) +/* C39430 80242F00 03E00008 */ jr $ra +/* C39434 80242F04 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048.s deleted file mode 100644 index 60298906dd..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243048 -/* C39578 80243048 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3957C 8024304C AFBF0018 */ sw $ra, 0x18($sp) -/* C39580 80243050 0C00EAD2 */ jal get_npc_safe -/* C39584 80243054 2404FFFC */ addiu $a0, $zero, -4 -/* C39588 80243058 3C0141F0 */ lui $at, 0x41f0 -/* C3958C 8024305C 44810000 */ mtc1 $at, $f0 -/* C39590 80243060 C442003C */ lwc1 $f2, 0x3c($v0) -/* C39594 80243064 46001080 */ add.s $f2, $f2, $f0 -/* C39598 80243068 E7A00010 */ swc1 $f0, 0x10($sp) -/* C3959C 8024306C 8C450038 */ lw $a1, 0x38($v0) -/* C395A0 80243070 8C470040 */ lw $a3, 0x40($v0) -/* C395A4 80243074 44061000 */ mfc1 $a2, $f2 -/* C395A8 80243078 0C01BFBC */ jal func_8006FEF0 -/* C395AC 8024307C 24040002 */ addiu $a0, $zero, 2 -/* C395B0 80243080 8FBF0018 */ lw $ra, 0x18($sp) -/* C395B4 80243084 24020002 */ addiu $v0, $zero, 2 -/* C395B8 80243088 03E00008 */ jr $ra -/* C395BC 8024308C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048_C39578.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048_C39578.s new file mode 100644 index 0000000000..e4b838bff4 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80243048_C39578.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243048_C39578 +/* C39578 80243048 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C3957C 8024304C AFBF0018 */ sw $ra, 0x18($sp) +/* C39580 80243050 0C00EAD2 */ jal get_npc_safe +/* C39584 80243054 2404FFFC */ addiu $a0, $zero, -4 +/* C39588 80243058 3C0141F0 */ lui $at, 0x41f0 +/* C3958C 8024305C 44810000 */ mtc1 $at, $f0 +/* C39590 80243060 C442003C */ lwc1 $f2, 0x3c($v0) +/* C39594 80243064 46001080 */ add.s $f2, $f2, $f0 +/* C39598 80243068 E7A00010 */ swc1 $f0, 0x10($sp) +/* C3959C 8024306C 8C450038 */ lw $a1, 0x38($v0) +/* C395A0 80243070 8C470040 */ lw $a3, 0x40($v0) +/* C395A4 80243074 44061000 */ mfc1 $a2, $f2 +/* C395A8 80243078 0C01BFBC */ jal func_8006FEF0 +/* C395AC 8024307C 24040002 */ addiu $a0, $zero, 2 +/* C395B0 80243080 8FBF0018 */ lw $ra, 0x18($sp) +/* C395B4 80243084 24020002 */ addiu $v0, $zero, 2 +/* C395B8 80243088 03E00008 */ jr $ra +/* C395BC 8024308C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8.s deleted file mode 100644 index 7fb9fcea84..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430D8 -/* C39608 802430D8 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C3960C 802430DC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* C39610 802430E0 AC800084 */ sw $zero, 0x84($a0) -/* C39614 802430E4 80620000 */ lb $v0, ($v1) -/* C39618 802430E8 10400005 */ beqz $v0, .L80243100 -/* C3961C 802430EC 24020003 */ addiu $v0, $zero, 3 -/* C39620 802430F0 80630003 */ lb $v1, 3($v1) -/* C39624 802430F4 14620002 */ bne $v1, $v0, .L80243100 -/* C39628 802430F8 24020001 */ addiu $v0, $zero, 1 -/* C3962C 802430FC AC820084 */ sw $v0, 0x84($a0) -.L80243100: -/* C39630 80243100 03E00008 */ jr $ra -/* C39634 80243104 24020002 */ addiu $v0, $zero, 2 -/* C39638 80243108 00000000 */ nop -/* C3963C 8024310C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s new file mode 100644 index 0000000000..73c3006f77 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802430D8_C39608.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802430D8_C39608 +/* C39608 802430D8 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* C3960C 802430DC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* C39610 802430E0 AC800084 */ sw $zero, 0x84($a0) +/* C39614 802430E4 80620000 */ lb $v0, ($v1) +/* C39618 802430E8 10400005 */ beqz $v0, .L80243100 +/* C3961C 802430EC 24020003 */ addiu $v0, $zero, 3 +/* C39620 802430F0 80630003 */ lb $v1, 3($v1) +/* C39624 802430F4 14620002 */ bne $v1, $v0, .L80243100 +/* C39628 802430F8 24020001 */ addiu $v0, $zero, 1 +/* C3962C 802430FC AC820084 */ sw $v0, 0x84($a0) +.L80243100: +/* C39630 80243100 03E00008 */ jr $ra +/* C39634 80243104 24020002 */ addiu $v0, $zero, 2 +/* C39638 80243108 00000000 */ nop +/* C3963C 8024310C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC.s deleted file mode 100644 index 4306e7348d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409BC -/* C3B3CC 802409BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3B3D0 802409C0 AFB10014 */ sw $s1, 0x14($sp) -/* C3B3D4 802409C4 0080882D */ daddu $s1, $a0, $zero -/* C3B3D8 802409C8 AFBF0018 */ sw $ra, 0x18($sp) -/* C3B3DC 802409CC AFB00010 */ sw $s0, 0x10($sp) -/* C3B3E0 802409D0 8E300148 */ lw $s0, 0x148($s1) -/* C3B3E4 802409D4 0C00EABB */ jal get_npc_unsafe -/* C3B3E8 802409D8 86040008 */ lh $a0, 8($s0) -/* C3B3EC 802409DC 0040182D */ daddu $v1, $v0, $zero -/* C3B3F0 802409E0 9462008E */ lhu $v0, 0x8e($v1) -/* C3B3F4 802409E4 2442FFFF */ addiu $v0, $v0, -1 -/* C3B3F8 802409E8 A462008E */ sh $v0, 0x8e($v1) -/* C3B3FC 802409EC 00021400 */ sll $v0, $v0, 0x10 -/* C3B400 802409F0 1C400006 */ bgtz $v0, .L80240A0C -/* C3B404 802409F4 24020001 */ addiu $v0, $zero, 1 -/* C3B408 802409F8 A462008E */ sh $v0, 0x8e($v1) -/* C3B40C 802409FC 24020028 */ addiu $v0, $zero, 0x28 -/* C3B410 80240A00 AE020088 */ sw $v0, 0x88($s0) -/* C3B414 80240A04 24020003 */ addiu $v0, $zero, 3 -/* C3B418 80240A08 AE220070 */ sw $v0, 0x70($s1) -.L80240A0C: -/* C3B41C 80240A0C 8FBF0018 */ lw $ra, 0x18($sp) -/* C3B420 80240A10 8FB10014 */ lw $s1, 0x14($sp) -/* C3B424 80240A14 8FB00010 */ lw $s0, 0x10($sp) -/* C3B428 80240A18 03E00008 */ jr $ra -/* C3B42C 80240A1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC_C3B3CC.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC_C3B3CC.s new file mode 100644 index 0000000000..0aa6554af9 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802409BC_C3B3CC.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409BC_C3B3CC +/* C3B3CC 802409BC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C3B3D0 802409C0 AFB10014 */ sw $s1, 0x14($sp) +/* C3B3D4 802409C4 0080882D */ daddu $s1, $a0, $zero +/* C3B3D8 802409C8 AFBF0018 */ sw $ra, 0x18($sp) +/* C3B3DC 802409CC AFB00010 */ sw $s0, 0x10($sp) +/* C3B3E0 802409D0 8E300148 */ lw $s0, 0x148($s1) +/* C3B3E4 802409D4 0C00EABB */ jal get_npc_unsafe +/* C3B3E8 802409D8 86040008 */ lh $a0, 8($s0) +/* C3B3EC 802409DC 0040182D */ daddu $v1, $v0, $zero +/* C3B3F0 802409E0 9462008E */ lhu $v0, 0x8e($v1) +/* C3B3F4 802409E4 2442FFFF */ addiu $v0, $v0, -1 +/* C3B3F8 802409E8 A462008E */ sh $v0, 0x8e($v1) +/* C3B3FC 802409EC 00021400 */ sll $v0, $v0, 0x10 +/* C3B400 802409F0 1C400006 */ bgtz $v0, .L80240A0C +/* C3B404 802409F4 24020001 */ addiu $v0, $zero, 1 +/* C3B408 802409F8 A462008E */ sh $v0, 0x8e($v1) +/* C3B40C 802409FC 24020028 */ addiu $v0, $zero, 0x28 +/* C3B410 80240A00 AE020088 */ sw $v0, 0x88($s0) +/* C3B414 80240A04 24020003 */ addiu $v0, $zero, 3 +/* C3B418 80240A08 AE220070 */ sw $v0, 0x70($s1) +.L80240A0C: +/* C3B41C 80240A0C 8FBF0018 */ lw $ra, 0x18($sp) +/* C3B420 80240A10 8FB10014 */ lw $s1, 0x14($sp) +/* C3B424 80240A14 8FB00010 */ lw $s0, 0x10($sp) +/* C3B428 80240A18 03E00008 */ jr $ra +/* C3B42C 80240A1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00.s deleted file mode 100644 index 4b1ffd0d6d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C00 -/* C3B610 80240C00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C3B614 80240C04 AFB20018 */ sw $s2, 0x18($sp) -/* C3B618 80240C08 0080902D */ daddu $s2, $a0, $zero -/* C3B61C 80240C0C AFBF001C */ sw $ra, 0x1c($sp) -/* C3B620 80240C10 AFB10014 */ sw $s1, 0x14($sp) -/* C3B624 80240C14 AFB00010 */ sw $s0, 0x10($sp) -/* C3B628 80240C18 8E500148 */ lw $s0, 0x148($s2) -/* C3B62C 80240C1C 86040008 */ lh $a0, 8($s0) -/* C3B630 80240C20 0C00EABB */ jal get_npc_unsafe -/* C3B634 80240C24 00A0882D */ daddu $s1, $a1, $zero -/* C3B638 80240C28 0040182D */ daddu $v1, $v0, $zero -/* C3B63C 80240C2C 9462008E */ lhu $v0, 0x8e($v1) -/* C3B640 80240C30 2442FFFF */ addiu $v0, $v0, -1 -/* C3B644 80240C34 A462008E */ sh $v0, 0x8e($v1) -/* C3B648 80240C38 00021400 */ sll $v0, $v0, 0x10 -/* C3B64C 80240C3C 1C400015 */ bgtz $v0, .L80240C94 -/* C3B650 80240C40 00000000 */ nop -/* C3B654 80240C44 8E0200CC */ lw $v0, 0xcc($s0) -/* C3B658 80240C48 8C420004 */ lw $v0, 4($v0) -/* C3B65C 80240C4C AC620028 */ sw $v0, 0x28($v1) -/* C3B660 80240C50 8E0200D0 */ lw $v0, 0xd0($s0) -/* C3B664 80240C54 8C420014 */ lw $v0, 0x14($v0) -/* C3B668 80240C58 04410004 */ bgez $v0, .L80240C6C -/* C3B66C 80240C5C 00000000 */ nop -/* C3B670 80240C60 C6200000 */ lwc1 $f0, ($s1) -/* C3B674 80240C64 08090323 */ j .L80240C8C -/* C3B678 80240C68 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C6C: -/* C3B67C 80240C6C 3C018024 */ lui $at, 0x8024 -/* C3B680 80240C70 D4222348 */ ldc1 $f2, 0x2348($at) -/* C3B684 80240C74 44820000 */ mtc1 $v0, $f0 -/* C3B688 80240C78 00000000 */ nop -/* C3B68C 80240C7C 46800021 */ cvt.d.w $f0, $f0 -/* C3B690 80240C80 46220003 */ div.d $f0, $f0, $f2 -/* C3B694 80240C84 46200020 */ cvt.s.d $f0, $f0 -/* C3B698 80240C88 E4600018 */ swc1 $f0, 0x18($v1) -.L80240C8C: -/* C3B69C 80240C8C 24020029 */ addiu $v0, $zero, 0x29 -/* C3B6A0 80240C90 AE420070 */ sw $v0, 0x70($s2) -.L80240C94: -/* C3B6A4 80240C94 8FBF001C */ lw $ra, 0x1c($sp) -/* C3B6A8 80240C98 8FB20018 */ lw $s2, 0x18($sp) -/* C3B6AC 80240C9C 8FB10014 */ lw $s1, 0x14($sp) -/* C3B6B0 80240CA0 8FB00010 */ lw $s0, 0x10($sp) -/* C3B6B4 80240CA4 03E00008 */ jr $ra -/* C3B6B8 80240CA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s new file mode 100644 index 0000000000..bdfed82c80 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240C00_C3B610.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C00_C3B610 +/* C3B610 80240C00 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C3B614 80240C04 AFB20018 */ sw $s2, 0x18($sp) +/* C3B618 80240C08 0080902D */ daddu $s2, $a0, $zero +/* C3B61C 80240C0C AFBF001C */ sw $ra, 0x1c($sp) +/* C3B620 80240C10 AFB10014 */ sw $s1, 0x14($sp) +/* C3B624 80240C14 AFB00010 */ sw $s0, 0x10($sp) +/* C3B628 80240C18 8E500148 */ lw $s0, 0x148($s2) +/* C3B62C 80240C1C 86040008 */ lh $a0, 8($s0) +/* C3B630 80240C20 0C00EABB */ jal get_npc_unsafe +/* C3B634 80240C24 00A0882D */ daddu $s1, $a1, $zero +/* C3B638 80240C28 0040182D */ daddu $v1, $v0, $zero +/* C3B63C 80240C2C 9462008E */ lhu $v0, 0x8e($v1) +/* C3B640 80240C30 2442FFFF */ addiu $v0, $v0, -1 +/* C3B644 80240C34 A462008E */ sh $v0, 0x8e($v1) +/* C3B648 80240C38 00021400 */ sll $v0, $v0, 0x10 +/* C3B64C 80240C3C 1C400015 */ bgtz $v0, .L80240C94 +/* C3B650 80240C40 00000000 */ nop +/* C3B654 80240C44 8E0200CC */ lw $v0, 0xcc($s0) +/* C3B658 80240C48 8C420004 */ lw $v0, 4($v0) +/* C3B65C 80240C4C AC620028 */ sw $v0, 0x28($v1) +/* C3B660 80240C50 8E0200D0 */ lw $v0, 0xd0($s0) +/* C3B664 80240C54 8C420014 */ lw $v0, 0x14($v0) +/* C3B668 80240C58 04410004 */ bgez $v0, .L80240C6C +/* C3B66C 80240C5C 00000000 */ nop +/* C3B670 80240C60 C6200000 */ lwc1 $f0, ($s1) +/* C3B674 80240C64 08090323 */ j .L80240C8C +/* C3B678 80240C68 E4600018 */ swc1 $f0, 0x18($v1) +.L80240C6C: +/* C3B67C 80240C6C 3C018024 */ lui $at, 0x8024 +/* C3B680 80240C70 D4222348 */ ldc1 $f2, 0x2348($at) +/* C3B684 80240C74 44820000 */ mtc1 $v0, $f0 +/* C3B688 80240C78 00000000 */ nop +/* C3B68C 80240C7C 46800021 */ cvt.d.w $f0, $f0 +/* C3B690 80240C80 46220003 */ div.d $f0, $f0, $f2 +/* C3B694 80240C84 46200020 */ cvt.s.d $f0, $f0 +/* C3B698 80240C88 E4600018 */ swc1 $f0, 0x18($v1) +.L80240C8C: +/* C3B69C 80240C8C 24020029 */ addiu $v0, $zero, 0x29 +/* C3B6A0 80240C90 AE420070 */ sw $v0, 0x70($s2) +.L80240C94: +/* C3B6A4 80240C94 8FBF001C */ lw $ra, 0x1c($sp) +/* C3B6A8 80240C98 8FB20018 */ lw $s2, 0x18($sp) +/* C3B6AC 80240C9C 8FB10014 */ lw $s1, 0x14($sp) +/* C3B6B0 80240CA0 8FB00010 */ lw $s0, 0x10($sp) +/* C3B6B4 80240CA4 03E00008 */ jr $ra +/* C3B6B8 80240CA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s index 7a1cde69c0..c62da08fb5 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_80240E80_C3B890.s @@ -98,7 +98,7 @@ glabel func_80240E80_C3B890 /* C3B9F0 80240FE0 8E22006C */ lw $v0, 0x6c($s1) /* C3B9F4 80240FE4 14400006 */ bnez $v0, .L80241000 /* C3B9F8 80240FE8 00000000 */ nop -/* C3B9FC 80240FEC 0C09009A */ jal func_80240268 +/* C3B9FC 80240FEC 0C09009A */ jal func_80240268_C3AC78 /* C3BA00 80240FF0 0240202D */ daddu $a0, $s2, $zero /* C3BA04 80240FF4 10400002 */ beqz $v0, .L80241000 /* C3BA08 80240FF8 2402001E */ addiu $v0, $zero, 0x1e @@ -115,31 +115,31 @@ glabel func_80240E80_C3B890 /* C3BA30 80241020 00000000 */ nop /* C3BA34 80241024 0240202D */ daddu $a0, $s2, $zero /* C3BA38 80241028 0260282D */ daddu $a1, $s3, $zero -/* C3BA3C 8024102C 0C09019F */ jal func_8024067C +/* C3BA3C 8024102C 0C09019F */ jal func_8024067C_C3B08C /* C3BA40 80241030 02A0302D */ daddu $a2, $s5, $zero /* C3BA44 80241034 0809046A */ j .L802411A8 /* C3BA48 80241038 00000000 */ nop /* C3BA4C 8024103C 0240202D */ daddu $a0, $s2, $zero /* C3BA50 80241040 0260282D */ daddu $a1, $s3, $zero -/* C3BA54 80241044 0C0901C1 */ jal func_80240704 +/* C3BA54 80241044 0C0901C1 */ jal func_80240704_C3B114 /* C3BA58 80241048 02A0302D */ daddu $a2, $s5, $zero /* C3BA5C 8024104C 0809046A */ j .L802411A8 /* C3BA60 80241050 00000000 */ nop /* C3BA64 80241054 0240202D */ daddu $a0, $s2, $zero /* C3BA68 80241058 0260282D */ daddu $a1, $s3, $zero -/* C3BA6C 8024105C 0C09026F */ jal func_802409BC +/* C3BA6C 8024105C 0C09026F */ jal func_802409BC_C3B3CC /* C3BA70 80241060 02A0302D */ daddu $a2, $s5, $zero /* C3BA74 80241064 0809046A */ j .L802411A8 /* C3BA78 80241068 00000000 */ nop /* C3BA7C 8024106C 0240202D */ daddu $a0, $s2, $zero /* C3BA80 80241070 0260282D */ daddu $a1, $s3, $zero -/* C3BA84 80241074 0C090288 */ jal func_80240A20 +/* C3BA84 80241074 0C090288 */ jal func_80240A20_C3B430 /* C3BA88 80241078 02A0302D */ daddu $a2, $s5, $zero /* C3BA8C 8024107C 0809046A */ j .L802411A8 /* C3BA90 80241080 00000000 */ nop /* C3BA94 80241084 0240202D */ daddu $a0, $s2, $zero /* C3BA98 80241088 0260282D */ daddu $a1, $s3, $zero -/* C3BA9C 8024108C 0C0902B2 */ jal func_80240AC8 +/* C3BA9C 8024108C 0C0902B2 */ jal func_80240AC8_C3B4D8 /* C3BAA0 80241090 02A0302D */ daddu $a2, $s5, $zero /* C3BAA4 80241094 0809046A */ j .L802411A8 /* C3BAA8 80241098 00000000 */ nop @@ -168,29 +168,29 @@ glabel func_80240E80_C3B890 /* C3BB04 802410F4 24020003 */ addiu $v0, $zero, 3 /* C3BB08 802410F8 0809046A */ j .L802411A8 /* C3BB0C 802410FC AE420070 */ sw $v0, 0x70($s2) -/* C3BB10 80241100 0C090018 */ jal func_80240060 +/* C3BB10 80241100 0C090018 */ jal func_80240060_C3AA70 /* C3BB14 80241104 0240202D */ daddu $a0, $s2, $zero /* C3BB18 80241108 8E430070 */ lw $v1, 0x70($s2) /* C3BB1C 8024110C 2402001F */ addiu $v0, $zero, 0x1f /* C3BB20 80241110 14620025 */ bne $v1, $v0, .L802411A8 /* C3BB24 80241114 00000000 */ nop -/* C3BB28 80241118 0C090033 */ jal func_802400CC +/* C3BB28 80241118 0C090033 */ jal func_802400CC_C3AADC /* C3BB2C 8024111C 0240202D */ daddu $a0, $s2, $zero /* C3BB30 80241120 8E430070 */ lw $v1, 0x70($s2) /* C3BB34 80241124 24020020 */ addiu $v0, $zero, 0x20 /* C3BB38 80241128 1462001F */ bne $v1, $v0, .L802411A8 /* C3BB3C 8024112C 00000000 */ nop -/* C3BB40 80241130 0C09004F */ jal func_8024013C +/* C3BB40 80241130 0C09004F */ jal func_8024013C_C3AB4C /* C3BB44 80241134 0240202D */ daddu $a0, $s2, $zero /* C3BB48 80241138 0809046A */ j .L802411A8 /* C3BB4C 8024113C 00000000 */ nop -/* C3BB50 80241140 0C090085 */ jal func_80240214 +/* C3BB50 80241140 0C090085 */ jal func_80240214_C3AC24 /* C3BB54 80241144 0240202D */ daddu $a0, $s2, $zero /* C3BB58 80241148 0809046A */ j .L802411A8 /* C3BB5C 8024114C 00000000 */ nop /* C3BB60 80241150 0240202D */ daddu $a0, $s2, $zero /* C3BB64 80241154 0260282D */ daddu $a1, $s3, $zero -/* C3BB68 80241158 0C090300 */ jal func_80240C00 +/* C3BB68 80241158 0C090300 */ jal func_80240C00_C3B610 /* C3BB6C 8024115C 02A0302D */ daddu $a2, $s5, $zero /* C3BB70 80241160 8E430070 */ lw $v1, 0x70($s2) /* C3BB74 80241164 24020029 */ addiu $v0, $zero, 0x29 @@ -198,13 +198,13 @@ glabel func_80240E80_C3B890 /* C3BB7C 8024116C 00000000 */ nop /* C3BB80 80241170 0240202D */ daddu $a0, $s2, $zero /* C3BB84 80241174 0260282D */ daddu $a1, $s3, $zero -/* C3BB88 80241178 0C09032B */ jal func_80240CAC +/* C3BB88 80241178 0C09032B */ jal func_80240CAC_C3B6BC /* C3BB8C 8024117C 02A0302D */ daddu $a2, $s5, $zero /* C3BB90 80241180 0809046A */ j .L802411A8 /* C3BB94 80241184 00000000 */ nop /* C3BB98 80241188 0240202D */ daddu $a0, $s2, $zero /* C3BB9C 8024118C 0260282D */ daddu $a1, $s3, $zero -/* C3BBA0 80241190 0C090389 */ jal func_80240E24 +/* C3BBA0 80241190 0C090389 */ jal func_80240E24_C3B834 /* C3BBA4 80241194 02A0302D */ daddu $a2, $s5, $zero /* C3BBA8 80241198 0809046A */ j .L802411A8 /* C3BBAC 8024119C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0.s deleted file mode 100644 index 1d89b4b744..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0.s +++ /dev/null @@ -1,187 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D0 -/* C3BBE0 802411D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C3BBE4 802411D4 AFB20038 */ sw $s2, 0x38($sp) -/* C3BBE8 802411D8 0080902D */ daddu $s2, $a0, $zero -/* C3BBEC 802411DC AFBF0048 */ sw $ra, 0x48($sp) -/* C3BBF0 802411E0 AFB50044 */ sw $s5, 0x44($sp) -/* C3BBF4 802411E4 AFB40040 */ sw $s4, 0x40($sp) -/* C3BBF8 802411E8 AFB3003C */ sw $s3, 0x3c($sp) -/* C3BBFC 802411EC AFB10034 */ sw $s1, 0x34($sp) -/* C3BC00 802411F0 AFB00030 */ sw $s0, 0x30($sp) -/* C3BC04 802411F4 8E510148 */ lw $s1, 0x148($s2) -/* C3BC08 802411F8 86240008 */ lh $a0, 8($s1) -/* C3BC0C 802411FC 0C00EABB */ jal get_npc_unsafe -/* C3BC10 80241200 00A0802D */ daddu $s0, $a1, $zero -/* C3BC14 80241204 8E43000C */ lw $v1, 0xc($s2) -/* C3BC18 80241208 0240202D */ daddu $a0, $s2, $zero -/* C3BC1C 8024120C 8C650000 */ lw $a1, ($v1) -/* C3BC20 80241210 0C0B1EAF */ jal get_variable -/* C3BC24 80241214 0040A82D */ daddu $s5, $v0, $zero -/* C3BC28 80241218 AFA00010 */ sw $zero, 0x10($sp) -/* C3BC2C 8024121C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC30 80241220 8C630030 */ lw $v1, 0x30($v1) -/* C3BC34 80241224 AFA30014 */ sw $v1, 0x14($sp) -/* C3BC38 80241228 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC3C 8024122C 8C63001C */ lw $v1, 0x1c($v1) -/* C3BC40 80241230 AFA30018 */ sw $v1, 0x18($sp) -/* C3BC44 80241234 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC48 80241238 8C630024 */ lw $v1, 0x24($v1) -/* C3BC4C 8024123C AFA3001C */ sw $v1, 0x1c($sp) -/* C3BC50 80241240 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC54 80241244 8C630028 */ lw $v1, 0x28($v1) -/* C3BC58 80241248 27B40010 */ addiu $s4, $sp, 0x10 -/* C3BC5C 8024124C AFA30020 */ sw $v1, 0x20($sp) -/* C3BC60 80241250 8E2300D0 */ lw $v1, 0xd0($s1) -/* C3BC64 80241254 3C014282 */ lui $at, 0x4282 -/* C3BC68 80241258 44810000 */ mtc1 $at, $f0 -/* C3BC6C 8024125C 8C63002C */ lw $v1, 0x2c($v1) -/* C3BC70 80241260 0040982D */ daddu $s3, $v0, $zero -/* C3BC74 80241264 E7A00028 */ swc1 $f0, 0x28($sp) -/* C3BC78 80241268 A7A0002C */ sh $zero, 0x2c($sp) -/* C3BC7C 8024126C 16000005 */ bnez $s0, .L80241284 -/* C3BC80 80241270 AFA30024 */ sw $v1, 0x24($sp) -/* C3BC84 80241274 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3BC88 80241278 30420004 */ andi $v0, $v0, 4 -/* C3BC8C 8024127C 10400020 */ beqz $v0, .L80241300 -/* C3BC90 80241280 00000000 */ nop -.L80241284: -/* C3BC94 80241284 2404F7FF */ addiu $a0, $zero, -0x801 -/* C3BC98 80241288 AE400070 */ sw $zero, 0x70($s2) -/* C3BC9C 8024128C A6A0008E */ sh $zero, 0x8e($s5) -/* C3BCA0 80241290 8E2200CC */ lw $v0, 0xcc($s1) -/* C3BCA4 80241294 8EA30000 */ lw $v1, ($s5) -/* C3BCA8 80241298 8C420000 */ lw $v0, ($v0) -/* C3BCAC 8024129C 00641824 */ and $v1, $v1, $a0 -/* C3BCB0 802412A0 AEA30000 */ sw $v1, ($s5) -/* C3BCB4 802412A4 AEA20028 */ sw $v0, 0x28($s5) -/* C3BCB8 802412A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* C3BCBC 802412AC 8C420034 */ lw $v0, 0x34($v0) -/* C3BCC0 802412B0 54400005 */ bnel $v0, $zero, .L802412C8 -/* C3BCC4 802412B4 2402FDFF */ addiu $v0, $zero, -0x201 -/* C3BCC8 802412B8 34620200 */ ori $v0, $v1, 0x200 -/* C3BCCC 802412BC 2403FFF7 */ addiu $v1, $zero, -9 -/* C3BCD0 802412C0 080904B4 */ j .L802412D0 -/* C3BCD4 802412C4 00431024 */ and $v0, $v0, $v1 -.L802412C8: -/* C3BCD8 802412C8 00621024 */ and $v0, $v1, $v0 -/* C3BCDC 802412CC 34420008 */ ori $v0, $v0, 8 -.L802412D0: -/* C3BCE0 802412D0 AEA20000 */ sw $v0, ($s5) -/* C3BCE4 802412D4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3BCE8 802412D8 30420004 */ andi $v0, $v0, 4 -/* C3BCEC 802412DC 10400007 */ beqz $v0, .L802412FC -/* C3BCF0 802412E0 24020063 */ addiu $v0, $zero, 0x63 -/* C3BCF4 802412E4 AE420070 */ sw $v0, 0x70($s2) -/* C3BCF8 802412E8 AE400074 */ sw $zero, 0x74($s2) -/* C3BCFC 802412EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C3BD00 802412F0 2403FFFB */ addiu $v1, $zero, -5 -/* C3BD04 802412F4 00431024 */ and $v0, $v0, $v1 -/* C3BD08 802412F8 AE2200B0 */ sw $v0, 0xb0($s1) -.L802412FC: -/* C3BD0C 802412FC AE20006C */ sw $zero, 0x6c($s1) -.L80241300: -/* C3BD10 80241300 8E420070 */ lw $v0, 0x70($s2) -/* C3BD14 80241304 2842001E */ slti $v0, $v0, 0x1e -/* C3BD18 80241308 10400009 */ beqz $v0, .L80241330 -/* C3BD1C 8024130C 00000000 */ nop -/* C3BD20 80241310 8E22006C */ lw $v0, 0x6c($s1) -/* C3BD24 80241314 14400006 */ bnez $v0, .L80241330 -/* C3BD28 80241318 00000000 */ nop -/* C3BD2C 8024131C 0C09009A */ jal func_80240268 -/* C3BD30 80241320 0240202D */ daddu $a0, $s2, $zero -/* C3BD34 80241324 10400002 */ beqz $v0, .L80241330 -/* C3BD38 80241328 2402001E */ addiu $v0, $zero, 0x1e -/* C3BD3C 8024132C AE420070 */ sw $v0, 0x70($s2) -.L80241330: -/* C3BD40 80241330 8E430070 */ lw $v1, 0x70($s2) -/* C3BD44 80241334 2C620064 */ sltiu $v0, $v1, 0x64 -/* C3BD48 80241338 10400048 */ beqz $v0, .L8024145C -/* C3BD4C 8024133C 00031080 */ sll $v0, $v1, 2 -/* C3BD50 80241340 3C018024 */ lui $at, 0x8024 -/* C3BD54 80241344 00220821 */ addu $at, $at, $v0 -/* C3BD58 80241348 8C2224E0 */ lw $v0, 0x24e0($at) -/* C3BD5C 8024134C 00400008 */ jr $v0 -/* C3BD60 80241350 00000000 */ nop -/* C3BD64 80241354 0240202D */ daddu $a0, $s2, $zero -/* C3BD68 80241358 0260282D */ daddu $a1, $s3, $zero -/* C3BD6C 8024135C 0C012568 */ jal func_800495A0 -/* C3BD70 80241360 0280302D */ daddu $a2, $s4, $zero -/* C3BD74 80241364 0240202D */ daddu $a0, $s2, $zero -/* C3BD78 80241368 0260282D */ daddu $a1, $s3, $zero -/* C3BD7C 8024136C 0C0125AE */ jal func_800496B8 -/* C3BD80 80241370 0280302D */ daddu $a2, $s4, $zero -/* C3BD84 80241374 08090517 */ j .L8024145C -/* C3BD88 80241378 00000000 */ nop -/* C3BD8C 8024137C 0240202D */ daddu $a0, $s2, $zero -/* C3BD90 80241380 0260282D */ daddu $a1, $s3, $zero -/* C3BD94 80241384 0C0126D1 */ jal func_80049B44 -/* C3BD98 80241388 0280302D */ daddu $a2, $s4, $zero -/* C3BD9C 8024138C 0240202D */ daddu $a0, $s2, $zero -/* C3BDA0 80241390 0260282D */ daddu $a1, $s3, $zero -/* C3BDA4 80241394 0C012701 */ jal func_80049C04 -/* C3BDA8 80241398 0280302D */ daddu $a2, $s4, $zero -/* C3BDAC 8024139C 08090517 */ j .L8024145C -/* C3BDB0 802413A0 00000000 */ nop -/* C3BDB4 802413A4 0240202D */ daddu $a0, $s2, $zero -/* C3BDB8 802413A8 0260282D */ daddu $a1, $s3, $zero -/* C3BDBC 802413AC 0C01278F */ jal func_80049E3C -/* C3BDC0 802413B0 0280302D */ daddu $a2, $s4, $zero -/* C3BDC4 802413B4 0240202D */ daddu $a0, $s2, $zero -/* C3BDC8 802413B8 0260282D */ daddu $a1, $s3, $zero -/* C3BDCC 802413BC 0C0127B3 */ jal func_80049ECC -/* C3BDD0 802413C0 0280302D */ daddu $a2, $s4, $zero -/* C3BDD4 802413C4 08090517 */ j .L8024145C -/* C3BDD8 802413C8 00000000 */ nop -/* C3BDDC 802413CC 0240202D */ daddu $a0, $s2, $zero -/* C3BDE0 802413D0 0260282D */ daddu $a1, $s3, $zero -/* C3BDE4 802413D4 0C0127DF */ jal func_80049F7C -/* C3BDE8 802413D8 0280302D */ daddu $a2, $s4, $zero -/* C3BDEC 802413DC 0240202D */ daddu $a0, $s2, $zero -/* C3BDF0 802413E0 0260282D */ daddu $a1, $s3, $zero -/* C3BDF4 802413E4 0C012849 */ jal func_8004A124 -/* C3BDF8 802413E8 0280302D */ daddu $a2, $s4, $zero -/* C3BDFC 802413EC 08090517 */ j .L8024145C -/* C3BE00 802413F0 00000000 */ nop -/* C3BE04 802413F4 0240202D */ daddu $a0, $s2, $zero -/* C3BE08 802413F8 0260282D */ daddu $a1, $s3, $zero -/* C3BE0C 802413FC 0C0128FA */ jal func_8004A3E8 -/* C3BE10 80241400 0280302D */ daddu $a2, $s4, $zero -/* C3BE14 80241404 08090517 */ j .L8024145C -/* C3BE18 80241408 00000000 */ nop -/* C3BE1C 8024140C 0C090018 */ jal func_80240060 -/* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero -/* C3BE24 80241414 0C090033 */ jal func_802400CC -/* C3BE28 80241418 0240202D */ daddu $a0, $s2, $zero -/* C3BE2C 8024141C 8E430070 */ lw $v1, 0x70($s2) -/* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 -/* C3BE34 80241424 1462000D */ bne $v1, $v0, .L8024145C -/* C3BE38 80241428 00000000 */ nop -/* C3BE3C 8024142C 0C09004F */ jal func_8024013C -/* C3BE40 80241430 0240202D */ daddu $a0, $s2, $zero -/* C3BE44 80241434 8E430070 */ lw $v1, 0x70($s2) -/* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 -/* C3BE4C 8024143C 14620007 */ bne $v1, $v0, .L8024145C -/* C3BE50 80241440 00000000 */ nop -/* C3BE54 80241444 0C090085 */ jal func_80240214 -/* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero -/* C3BE5C 8024144C 08090517 */ j .L8024145C -/* C3BE60 80241450 00000000 */ nop -/* C3BE64 80241454 0C0129CF */ jal func_8004A73C -/* C3BE68 80241458 0240202D */ daddu $a0, $s2, $zero -.L8024145C: -/* C3BE6C 8024145C 8FBF0048 */ lw $ra, 0x48($sp) -/* C3BE70 80241460 8FB50044 */ lw $s5, 0x44($sp) -/* C3BE74 80241464 8FB40040 */ lw $s4, 0x40($sp) -/* C3BE78 80241468 8FB3003C */ lw $s3, 0x3c($sp) -/* C3BE7C 8024146C 8FB20038 */ lw $s2, 0x38($sp) -/* C3BE80 80241470 8FB10034 */ lw $s1, 0x34($sp) -/* C3BE84 80241474 8FB00030 */ lw $s0, 0x30($sp) -/* C3BE88 80241478 0000102D */ daddu $v0, $zero, $zero -/* C3BE8C 8024147C 03E00008 */ jr $ra -/* C3BE90 80241480 27BD0050 */ addiu $sp, $sp, 0x50 -/* C3BE94 80241484 00000000 */ nop -/* C3BE98 80241488 00000000 */ nop -/* C3BE9C 8024148C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s new file mode 100644 index 0000000000..07ec16da1e --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_05/C3AA10/func_802411D0_C3BBE0.s @@ -0,0 +1,187 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411D0_C3BBE0 +/* C3BBE0 802411D0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C3BBE4 802411D4 AFB20038 */ sw $s2, 0x38($sp) +/* C3BBE8 802411D8 0080902D */ daddu $s2, $a0, $zero +/* C3BBEC 802411DC AFBF0048 */ sw $ra, 0x48($sp) +/* C3BBF0 802411E0 AFB50044 */ sw $s5, 0x44($sp) +/* C3BBF4 802411E4 AFB40040 */ sw $s4, 0x40($sp) +/* C3BBF8 802411E8 AFB3003C */ sw $s3, 0x3c($sp) +/* C3BBFC 802411EC AFB10034 */ sw $s1, 0x34($sp) +/* C3BC00 802411F0 AFB00030 */ sw $s0, 0x30($sp) +/* C3BC04 802411F4 8E510148 */ lw $s1, 0x148($s2) +/* C3BC08 802411F8 86240008 */ lh $a0, 8($s1) +/* C3BC0C 802411FC 0C00EABB */ jal get_npc_unsafe +/* C3BC10 80241200 00A0802D */ daddu $s0, $a1, $zero +/* C3BC14 80241204 8E43000C */ lw $v1, 0xc($s2) +/* C3BC18 80241208 0240202D */ daddu $a0, $s2, $zero +/* C3BC1C 8024120C 8C650000 */ lw $a1, ($v1) +/* C3BC20 80241210 0C0B1EAF */ jal get_variable +/* C3BC24 80241214 0040A82D */ daddu $s5, $v0, $zero +/* C3BC28 80241218 AFA00010 */ sw $zero, 0x10($sp) +/* C3BC2C 8024121C 8E2300D0 */ lw $v1, 0xd0($s1) +/* C3BC30 80241220 8C630030 */ lw $v1, 0x30($v1) +/* C3BC34 80241224 AFA30014 */ sw $v1, 0x14($sp) +/* C3BC38 80241228 8E2300D0 */ lw $v1, 0xd0($s1) +/* C3BC3C 8024122C 8C63001C */ lw $v1, 0x1c($v1) +/* C3BC40 80241230 AFA30018 */ sw $v1, 0x18($sp) +/* C3BC44 80241234 8E2300D0 */ lw $v1, 0xd0($s1) +/* C3BC48 80241238 8C630024 */ lw $v1, 0x24($v1) +/* C3BC4C 8024123C AFA3001C */ sw $v1, 0x1c($sp) +/* C3BC50 80241240 8E2300D0 */ lw $v1, 0xd0($s1) +/* C3BC54 80241244 8C630028 */ lw $v1, 0x28($v1) +/* C3BC58 80241248 27B40010 */ addiu $s4, $sp, 0x10 +/* C3BC5C 8024124C AFA30020 */ sw $v1, 0x20($sp) +/* C3BC60 80241250 8E2300D0 */ lw $v1, 0xd0($s1) +/* C3BC64 80241254 3C014282 */ lui $at, 0x4282 +/* C3BC68 80241258 44810000 */ mtc1 $at, $f0 +/* C3BC6C 8024125C 8C63002C */ lw $v1, 0x2c($v1) +/* C3BC70 80241260 0040982D */ daddu $s3, $v0, $zero +/* C3BC74 80241264 E7A00028 */ swc1 $f0, 0x28($sp) +/* C3BC78 80241268 A7A0002C */ sh $zero, 0x2c($sp) +/* C3BC7C 8024126C 16000005 */ bnez $s0, .L80241284 +/* C3BC80 80241270 AFA30024 */ sw $v1, 0x24($sp) +/* C3BC84 80241274 8E2200B0 */ lw $v0, 0xb0($s1) +/* C3BC88 80241278 30420004 */ andi $v0, $v0, 4 +/* C3BC8C 8024127C 10400020 */ beqz $v0, .L80241300 +/* C3BC90 80241280 00000000 */ nop +.L80241284: +/* C3BC94 80241284 2404F7FF */ addiu $a0, $zero, -0x801 +/* C3BC98 80241288 AE400070 */ sw $zero, 0x70($s2) +/* C3BC9C 8024128C A6A0008E */ sh $zero, 0x8e($s5) +/* C3BCA0 80241290 8E2200CC */ lw $v0, 0xcc($s1) +/* C3BCA4 80241294 8EA30000 */ lw $v1, ($s5) +/* C3BCA8 80241298 8C420000 */ lw $v0, ($v0) +/* C3BCAC 8024129C 00641824 */ and $v1, $v1, $a0 +/* C3BCB0 802412A0 AEA30000 */ sw $v1, ($s5) +/* C3BCB4 802412A4 AEA20028 */ sw $v0, 0x28($s5) +/* C3BCB8 802412A8 8E2200D0 */ lw $v0, 0xd0($s1) +/* C3BCBC 802412AC 8C420034 */ lw $v0, 0x34($v0) +/* C3BCC0 802412B0 54400005 */ bnel $v0, $zero, .L802412C8 +/* C3BCC4 802412B4 2402FDFF */ addiu $v0, $zero, -0x201 +/* C3BCC8 802412B8 34620200 */ ori $v0, $v1, 0x200 +/* C3BCCC 802412BC 2403FFF7 */ addiu $v1, $zero, -9 +/* C3BCD0 802412C0 080904B4 */ j .L802412D0 +/* C3BCD4 802412C4 00431024 */ and $v0, $v0, $v1 +.L802412C8: +/* C3BCD8 802412C8 00621024 */ and $v0, $v1, $v0 +/* C3BCDC 802412CC 34420008 */ ori $v0, $v0, 8 +.L802412D0: +/* C3BCE0 802412D0 AEA20000 */ sw $v0, ($s5) +/* C3BCE4 802412D4 8E2200B0 */ lw $v0, 0xb0($s1) +/* C3BCE8 802412D8 30420004 */ andi $v0, $v0, 4 +/* C3BCEC 802412DC 10400007 */ beqz $v0, .L802412FC +/* C3BCF0 802412E0 24020063 */ addiu $v0, $zero, 0x63 +/* C3BCF4 802412E4 AE420070 */ sw $v0, 0x70($s2) +/* C3BCF8 802412E8 AE400074 */ sw $zero, 0x74($s2) +/* C3BCFC 802412EC 8E2200B0 */ lw $v0, 0xb0($s1) +/* C3BD00 802412F0 2403FFFB */ addiu $v1, $zero, -5 +/* C3BD04 802412F4 00431024 */ and $v0, $v0, $v1 +/* C3BD08 802412F8 AE2200B0 */ sw $v0, 0xb0($s1) +.L802412FC: +/* C3BD0C 802412FC AE20006C */ sw $zero, 0x6c($s1) +.L80241300: +/* C3BD10 80241300 8E420070 */ lw $v0, 0x70($s2) +/* C3BD14 80241304 2842001E */ slti $v0, $v0, 0x1e +/* C3BD18 80241308 10400009 */ beqz $v0, .L80241330 +/* C3BD1C 8024130C 00000000 */ nop +/* C3BD20 80241310 8E22006C */ lw $v0, 0x6c($s1) +/* C3BD24 80241314 14400006 */ bnez $v0, .L80241330 +/* C3BD28 80241318 00000000 */ nop +/* C3BD2C 8024131C 0C09009A */ jal func_80240268_C3AC78 +/* C3BD30 80241320 0240202D */ daddu $a0, $s2, $zero +/* C3BD34 80241324 10400002 */ beqz $v0, .L80241330 +/* C3BD38 80241328 2402001E */ addiu $v0, $zero, 0x1e +/* C3BD3C 8024132C AE420070 */ sw $v0, 0x70($s2) +.L80241330: +/* C3BD40 80241330 8E430070 */ lw $v1, 0x70($s2) +/* C3BD44 80241334 2C620064 */ sltiu $v0, $v1, 0x64 +/* C3BD48 80241338 10400048 */ beqz $v0, .L8024145C +/* C3BD4C 8024133C 00031080 */ sll $v0, $v1, 2 +/* C3BD50 80241340 3C018024 */ lui $at, 0x8024 +/* C3BD54 80241344 00220821 */ addu $at, $at, $v0 +/* C3BD58 80241348 8C2224E0 */ lw $v0, 0x24e0($at) +/* C3BD5C 8024134C 00400008 */ jr $v0 +/* C3BD60 80241350 00000000 */ nop +/* C3BD64 80241354 0240202D */ daddu $a0, $s2, $zero +/* C3BD68 80241358 0260282D */ daddu $a1, $s3, $zero +/* C3BD6C 8024135C 0C012568 */ jal func_800495A0 +/* C3BD70 80241360 0280302D */ daddu $a2, $s4, $zero +/* C3BD74 80241364 0240202D */ daddu $a0, $s2, $zero +/* C3BD78 80241368 0260282D */ daddu $a1, $s3, $zero +/* C3BD7C 8024136C 0C0125AE */ jal func_800496B8 +/* C3BD80 80241370 0280302D */ daddu $a2, $s4, $zero +/* C3BD84 80241374 08090517 */ j .L8024145C +/* C3BD88 80241378 00000000 */ nop +/* C3BD8C 8024137C 0240202D */ daddu $a0, $s2, $zero +/* C3BD90 80241380 0260282D */ daddu $a1, $s3, $zero +/* C3BD94 80241384 0C0126D1 */ jal func_80049B44 +/* C3BD98 80241388 0280302D */ daddu $a2, $s4, $zero +/* C3BD9C 8024138C 0240202D */ daddu $a0, $s2, $zero +/* C3BDA0 80241390 0260282D */ daddu $a1, $s3, $zero +/* C3BDA4 80241394 0C012701 */ jal func_80049C04 +/* C3BDA8 80241398 0280302D */ daddu $a2, $s4, $zero +/* C3BDAC 8024139C 08090517 */ j .L8024145C +/* C3BDB0 802413A0 00000000 */ nop +/* C3BDB4 802413A4 0240202D */ daddu $a0, $s2, $zero +/* C3BDB8 802413A8 0260282D */ daddu $a1, $s3, $zero +/* C3BDBC 802413AC 0C01278F */ jal func_80049E3C +/* C3BDC0 802413B0 0280302D */ daddu $a2, $s4, $zero +/* C3BDC4 802413B4 0240202D */ daddu $a0, $s2, $zero +/* C3BDC8 802413B8 0260282D */ daddu $a1, $s3, $zero +/* C3BDCC 802413BC 0C0127B3 */ jal func_80049ECC +/* C3BDD0 802413C0 0280302D */ daddu $a2, $s4, $zero +/* C3BDD4 802413C4 08090517 */ j .L8024145C +/* C3BDD8 802413C8 00000000 */ nop +/* C3BDDC 802413CC 0240202D */ daddu $a0, $s2, $zero +/* C3BDE0 802413D0 0260282D */ daddu $a1, $s3, $zero +/* C3BDE4 802413D4 0C0127DF */ jal func_80049F7C +/* C3BDE8 802413D8 0280302D */ daddu $a2, $s4, $zero +/* C3BDEC 802413DC 0240202D */ daddu $a0, $s2, $zero +/* C3BDF0 802413E0 0260282D */ daddu $a1, $s3, $zero +/* C3BDF4 802413E4 0C012849 */ jal func_8004A124 +/* C3BDF8 802413E8 0280302D */ daddu $a2, $s4, $zero +/* C3BDFC 802413EC 08090517 */ j .L8024145C +/* C3BE00 802413F0 00000000 */ nop +/* C3BE04 802413F4 0240202D */ daddu $a0, $s2, $zero +/* C3BE08 802413F8 0260282D */ daddu $a1, $s3, $zero +/* C3BE0C 802413FC 0C0128FA */ jal func_8004A3E8 +/* C3BE10 80241400 0280302D */ daddu $a2, $s4, $zero +/* C3BE14 80241404 08090517 */ j .L8024145C +/* C3BE18 80241408 00000000 */ nop +/* C3BE1C 8024140C 0C090018 */ jal func_80240060_C3AA70 +/* C3BE20 80241410 0240202D */ daddu $a0, $s2, $zero +/* C3BE24 80241414 0C090033 */ jal func_802400CC_C3AADC +/* C3BE28 80241418 0240202D */ daddu $a0, $s2, $zero +/* C3BE2C 8024141C 8E430070 */ lw $v1, 0x70($s2) +/* C3BE30 80241420 24020020 */ addiu $v0, $zero, 0x20 +/* C3BE34 80241424 1462000D */ bne $v1, $v0, .L8024145C +/* C3BE38 80241428 00000000 */ nop +/* C3BE3C 8024142C 0C09004F */ jal func_8024013C_C3AB4C +/* C3BE40 80241430 0240202D */ daddu $a0, $s2, $zero +/* C3BE44 80241434 8E430070 */ lw $v1, 0x70($s2) +/* C3BE48 80241438 24020021 */ addiu $v0, $zero, 0x21 +/* C3BE4C 8024143C 14620007 */ bne $v1, $v0, .L8024145C +/* C3BE50 80241440 00000000 */ nop +/* C3BE54 80241444 0C090085 */ jal func_80240214_C3AC24 +/* C3BE58 80241448 0240202D */ daddu $a0, $s2, $zero +/* C3BE5C 8024144C 08090517 */ j .L8024145C +/* C3BE60 80241450 00000000 */ nop +/* C3BE64 80241454 0C0129CF */ jal func_8004A73C +/* C3BE68 80241458 0240202D */ daddu $a0, $s2, $zero +.L8024145C: +/* C3BE6C 8024145C 8FBF0048 */ lw $ra, 0x48($sp) +/* C3BE70 80241460 8FB50044 */ lw $s5, 0x44($sp) +/* C3BE74 80241464 8FB40040 */ lw $s4, 0x40($sp) +/* C3BE78 80241468 8FB3003C */ lw $s3, 0x3c($sp) +/* C3BE7C 8024146C 8FB20038 */ lw $s2, 0x38($sp) +/* C3BE80 80241470 8FB10034 */ lw $s1, 0x34($sp) +/* C3BE84 80241474 8FB00030 */ lw $s0, 0x30($sp) +/* C3BE88 80241478 0000102D */ daddu $v0, $zero, $zero +/* C3BE8C 8024147C 03E00008 */ jr $ra +/* C3BE90 80241480 27BD0050 */ addiu $sp, $sp, 0x50 +/* C3BE94 80241484 00000000 */ nop +/* C3BE98 80241488 00000000 */ nop +/* C3BE9C 8024148C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s index ec12ec6759..60d329d6ec 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80240E20_C3EA10.s @@ -98,7 +98,7 @@ glabel func_80240E20_C3EA10 /* C3EB70 80240F80 8E22006C */ lw $v0, 0x6c($s1) /* C3EB74 80240F84 14400006 */ bnez $v0, .L80240FA0 /* C3EB78 80240F88 00000000 */ nop -/* C3EB7C 80240F8C 0C090082 */ jal func_80240208 +/* C3EB7C 80240F8C 0C090082 */ jal func_80240208_C3DDF8 /* C3EB80 80240F90 0240202D */ daddu $a0, $s2, $zero /* C3EB84 80240F94 10400002 */ beqz $v0, .L80240FA0 /* C3EB88 80240F98 2402001E */ addiu $v0, $zero, 0x1e @@ -115,31 +115,31 @@ glabel func_80240E20_C3EA10 /* C3EBB0 80240FC0 00000000 */ nop /* C3EBB4 80240FC4 0240202D */ daddu $a0, $s2, $zero /* C3EBB8 80240FC8 0260282D */ daddu $a1, $s3, $zero -/* C3EBBC 80240FCC 0C090187 */ jal func_8024061C +/* C3EBBC 80240FCC 0C090187 */ jal func_8024061C_C3E20C /* C3EBC0 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* C3EBC4 80240FD4 08090452 */ j .L80241148 /* C3EBC8 80240FD8 00000000 */ nop /* C3EBCC 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C3EBD0 80240FE0 0260282D */ daddu $a1, $s3, $zero -/* C3EBD4 80240FE4 0C0901A9 */ jal func_802406A4 +/* C3EBD4 80240FE4 0C0901A9 */ jal func_802406A4_C3E294 /* C3EBD8 80240FE8 02A0302D */ daddu $a2, $s5, $zero /* C3EBDC 80240FEC 08090452 */ j .L80241148 /* C3EBE0 80240FF0 00000000 */ nop /* C3EBE4 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C3EBE8 80240FF8 0260282D */ daddu $a1, $s3, $zero -/* C3EBEC 80240FFC 0C090257 */ jal func_8024095C +/* C3EBEC 80240FFC 0C090257 */ jal func_8024095C_C3E54C /* C3EBF0 80241000 02A0302D */ daddu $a2, $s5, $zero /* C3EBF4 80241004 08090452 */ j .L80241148 /* C3EBF8 80241008 00000000 */ nop /* C3EBFC 8024100C 0240202D */ daddu $a0, $s2, $zero /* C3EC00 80241010 0260282D */ daddu $a1, $s3, $zero -/* C3EC04 80241014 0C090270 */ jal func_802409C0 +/* C3EC04 80241014 0C090270 */ jal func_802409C0_C3E5B0 /* C3EC08 80241018 02A0302D */ daddu $a2, $s5, $zero /* C3EC0C 8024101C 08090452 */ j .L80241148 /* C3EC10 80241020 00000000 */ nop /* C3EC14 80241024 0240202D */ daddu $a0, $s2, $zero /* C3EC18 80241028 0260282D */ daddu $a1, $s3, $zero -/* C3EC1C 8024102C 0C09029A */ jal func_80240A68 +/* C3EC1C 8024102C 0C09029A */ jal func_80240A68_C3E658 /* C3EC20 80241030 02A0302D */ daddu $a2, $s5, $zero /* C3EC24 80241034 08090452 */ j .L80241148 /* C3EC28 80241038 00000000 */ nop @@ -168,19 +168,19 @@ glabel func_80240E20_C3EA10 /* C3EC84 80241094 24020003 */ addiu $v0, $zero, 3 /* C3EC88 80241098 08090452 */ j .L80241148 /* C3EC8C 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C3EC90 802410A0 0C090000 */ jal func_80240000 +/* C3EC90 802410A0 0C090000 */ jal func_80240000_C3DBF0 /* C3EC94 802410A4 0240202D */ daddu $a0, $s2, $zero /* C3EC98 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C3EC9C 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C3ECA0 802410B0 14620025 */ bne $v1, $v0, .L80241148 /* C3ECA4 802410B4 00000000 */ nop -/* C3ECA8 802410B8 0C09001B */ jal func_8024006C +/* C3ECA8 802410B8 0C09001B */ jal func_8024006C_C3DC5C /* C3ECAC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C3ECB0 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C3ECB4 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C3ECB8 802410C8 1462001F */ bne $v1, $v0, .L80241148 /* C3ECBC 802410CC 00000000 */ nop -/* C3ECC0 802410D0 0C090037 */ jal func_802400DC +/* C3ECC0 802410D0 0C090037 */ jal func_802400DC_C3DCCC /* C3ECC4 802410D4 0240202D */ daddu $a0, $s2, $zero /* C3ECC8 802410D8 08090452 */ j .L80241148 /* C3ECCC 802410DC 00000000 */ nop @@ -190,7 +190,7 @@ glabel func_80240E20_C3EA10 /* C3ECDC 802410EC 00000000 */ nop /* C3ECE0 802410F0 0240202D */ daddu $a0, $s2, $zero /* C3ECE4 802410F4 0260282D */ daddu $a1, $s3, $zero -/* C3ECE8 802410F8 0C0902E8 */ jal func_80240BA0 +/* C3ECE8 802410F8 0C0902E8 */ jal func_80240BA0_C3E790 /* C3ECEC 802410FC 02A0302D */ daddu $a2, $s5, $zero /* C3ECF0 80241100 8E430070 */ lw $v1, 0x70($s2) /* C3ECF4 80241104 24020029 */ addiu $v0, $zero, 0x29 @@ -198,13 +198,13 @@ glabel func_80240E20_C3EA10 /* C3ECFC 8024110C 00000000 */ nop /* C3ED00 80241110 0240202D */ daddu $a0, $s2, $zero /* C3ED04 80241114 0260282D */ daddu $a1, $s3, $zero -/* C3ED08 80241118 0C090313 */ jal func_80240C4C +/* C3ED08 80241118 0C090313 */ jal func_80240C4C_C3E83C /* C3ED0C 8024111C 02A0302D */ daddu $a2, $s5, $zero /* C3ED10 80241120 08090452 */ j .L80241148 /* C3ED14 80241124 00000000 */ nop /* C3ED18 80241128 0240202D */ daddu $a0, $s2, $zero /* C3ED1C 8024112C 0260282D */ daddu $a1, $s3, $zero -/* C3ED20 80241130 0C090371 */ jal func_80240DC4 +/* C3ED20 80241130 0C090371 */ jal func_80240DC4_C3E9B4 /* C3ED24 80241134 02A0302D */ daddu $a2, $s5, $zero /* C3ED28 80241138 08090452 */ j .L80241148 /* C3ED2C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s index af1b5bd18f..7aa824b3e9 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s +++ b/asm/nonmatchings/world/area_dgb/dgb_07/C3DBF0/func_80241170_C3ED60.s @@ -90,7 +90,7 @@ glabel func_80241170_C3ED60 /* C3EEA0 802412B0 8E22006C */ lw $v0, 0x6c($s1) /* C3EEA4 802412B4 14400006 */ bnez $v0, .L802412D0 /* C3EEA8 802412B8 00000000 */ nop -/* C3EEAC 802412BC 0C090082 */ jal func_80240208 +/* C3EEAC 802412BC 0C090082 */ jal func_80240208_C3DDF8 /* C3EEB0 802412C0 0240202D */ daddu $a0, $s2, $zero /* C3EEB4 802412C4 10400002 */ beqz $v0, .L802412D0 /* C3EEB8 802412C8 2402001E */ addiu $v0, $zero, 0x1e @@ -151,15 +151,15 @@ glabel func_80241170_C3ED60 /* C3EF90 802413A0 0280302D */ daddu $a2, $s4, $zero /* C3EF94 802413A4 080904FF */ j .L802413FC /* C3EF98 802413A8 00000000 */ nop -/* C3EF9C 802413AC 0C090000 */ jal func_80240000 +/* C3EF9C 802413AC 0C090000 */ jal func_80240000_C3DBF0 /* C3EFA0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C3EFA4 802413B4 0C09001B */ jal func_8024006C +/* C3EFA4 802413B4 0C09001B */ jal func_8024006C_C3DC5C /* C3EFA8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C3EFAC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C3EFB0 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C3EFB4 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* C3EFB8 802413C8 00000000 */ nop -/* C3EFBC 802413CC 0C090037 */ jal func_802400DC +/* C3EFBC 802413CC 0C090037 */ jal func_802400DC_C3DCCC /* C3EFC0 802413D0 0240202D */ daddu $a0, $s2, $zero /* C3EFC4 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C3EFC8 802413D8 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s index f281d86177..be9b6b7099 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80240B94_C40944.s @@ -131,7 +131,7 @@ glabel func_80240B94_C40944 /* C40B24 80240D74 00000000 */ nop /* C40B28 80240D78 0280202D */ daddu $a0, $s4, $zero /* C40B2C 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* C40B30 80240D80 0C090000 */ jal func_80240000 +/* C40B30 80240D80 0C090000 */ jal func_80240000_C3FDB0 /* C40B34 80240D84 02A0302D */ daddu $a2, $s5, $zero /* C40B38 80240D88 0280202D */ daddu $a0, $s4, $zero /* C40B3C 80240D8C 0260282D */ daddu $a1, $s3, $zero @@ -141,27 +141,27 @@ glabel func_80240B94_C40944 /* C40B4C 80240D9C 00000000 */ nop /* C40B50 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C40B54 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C40B58 80240DA8 0C090100 */ jal func_80240400 +/* C40B58 80240DA8 0C090100 */ jal func_80240400_C401B0 /* C40B5C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C40B60 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C40B64 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* C40B68 80240DB8 0C090130 */ jal func_802404C0 +/* C40B68 80240DB8 0C090130 */ jal func_802404C0_C40270 /* C40B6C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* C40B70 80240DC0 0809039A */ j .L80240E68 /* C40B74 80240DC4 00000000 */ nop /* C40B78 80240DC8 0280202D */ daddu $a0, $s4, $zero /* C40B7C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* C40B80 80240DD0 0C09019F */ jal func_8024067C +/* C40B80 80240DD0 0C09019F */ jal func_8024067C_C4042C /* C40B84 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* C40B88 80240DD8 0809039A */ j .L80240E68 /* C40B8C 80240DDC 00000000 */ nop /* C40B90 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C40B94 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C40B98 80240DE8 0C0901CC */ jal func_80240730 +/* C40B98 80240DE8 0C0901CC */ jal func_80240730_C404E0 /* C40B9C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C40BA0 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C40BA4 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C40BA8 80240DF8 0C0901E9 */ jal func_802407A4 +/* C40BA8 80240DF8 0C0901E9 */ jal func_802407A4_C40554 /* C40BAC 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C40BB0 80240E00 0809039A */ j .L80240E68 /* C40BB4 80240E04 00000000 */ nop @@ -171,19 +171,19 @@ glabel func_80240B94_C40944 /* C40BC4 80240E14 02A0302D */ daddu $a2, $s5, $zero /* C40BC8 80240E18 0280202D */ daddu $a0, $s4, $zero /* C40BCC 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* C40BD0 80240E20 0C090253 */ jal func_8024094C +/* C40BD0 80240E20 0C090253 */ jal func_8024094C_C406FC /* C40BD4 80240E24 02A0302D */ daddu $a2, $s5, $zero /* C40BD8 80240E28 0809039A */ j .L80240E68 /* C40BDC 80240E2C 00000000 */ nop /* C40BE0 80240E30 0280202D */ daddu $a0, $s4, $zero /* C40BE4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C40BE8 80240E38 0C09029B */ jal func_80240A6C +/* C40BE8 80240E38 0C09029B */ jal func_80240A6C_C4081C /* C40BEC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C40BF0 80240E40 0809039A */ j .L80240E68 /* C40BF4 80240E44 00000000 */ nop /* C40BF8 80240E48 0280202D */ daddu $a0, $s4, $zero /* C40BFC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* C40C00 80240E50 0C0902B5 */ jal func_80240AD4 +/* C40C00 80240E50 0C0902B5 */ jal func_80240AD4_C40884 /* C40C04 80240E54 02A0302D */ daddu $a2, $s5, $zero /* C40C08 80240E58 0809039A */ j .L80240E68 /* C40C0C 80240E5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC.s deleted file mode 100644 index ffcc7e6e4e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414AC -/* C4125C 802414AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C41260 802414B0 AFB20038 */ sw $s2, 0x38($sp) -/* C41264 802414B4 0080902D */ daddu $s2, $a0, $zero -/* C41268 802414B8 AFBF0048 */ sw $ra, 0x48($sp) -/* C4126C 802414BC AFB50044 */ sw $s5, 0x44($sp) -/* C41270 802414C0 AFB40040 */ sw $s4, 0x40($sp) -/* C41274 802414C4 AFB3003C */ sw $s3, 0x3c($sp) -/* C41278 802414C8 AFB10034 */ sw $s1, 0x34($sp) -/* C4127C 802414CC AFB00030 */ sw $s0, 0x30($sp) -/* C41280 802414D0 8E510148 */ lw $s1, 0x148($s2) -/* C41284 802414D4 86240008 */ lh $a0, 8($s1) -/* C41288 802414D8 0C00EABB */ jal get_npc_unsafe -/* C4128C 802414DC 00A0802D */ daddu $s0, $a1, $zero -/* C41290 802414E0 8E43000C */ lw $v1, 0xc($s2) -/* C41294 802414E4 0240202D */ daddu $a0, $s2, $zero -/* C41298 802414E8 8C650000 */ lw $a1, ($v1) -/* C4129C 802414EC 0C0B1EAF */ jal get_variable -/* C412A0 802414F0 0040A82D */ daddu $s5, $v0, $zero -/* C412A4 802414F4 AFA00010 */ sw $zero, 0x10($sp) -/* C412A8 802414F8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412AC 802414FC 8C630030 */ lw $v1, 0x30($v1) -/* C412B0 80241500 AFA30014 */ sw $v1, 0x14($sp) -/* C412B4 80241504 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412B8 80241508 8C63001C */ lw $v1, 0x1c($v1) -/* C412BC 8024150C AFA30018 */ sw $v1, 0x18($sp) -/* C412C0 80241510 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412C4 80241514 8C630024 */ lw $v1, 0x24($v1) -/* C412C8 80241518 AFA3001C */ sw $v1, 0x1c($sp) -/* C412CC 8024151C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412D0 80241520 8C630028 */ lw $v1, 0x28($v1) -/* C412D4 80241524 27B40010 */ addiu $s4, $sp, 0x10 -/* C412D8 80241528 AFA30020 */ sw $v1, 0x20($sp) -/* C412DC 8024152C 8E2300D0 */ lw $v1, 0xd0($s1) -/* C412E0 80241530 3C014282 */ lui $at, 0x4282 -/* C412E4 80241534 44810000 */ mtc1 $at, $f0 -/* C412E8 80241538 8C63002C */ lw $v1, 0x2c($v1) -/* C412EC 8024153C 0040982D */ daddu $s3, $v0, $zero -/* C412F0 80241540 E7A00028 */ swc1 $f0, 0x28($sp) -/* C412F4 80241544 A7A0002C */ sh $zero, 0x2c($sp) -/* C412F8 80241548 16000005 */ bnez $s0, .L80241560 -/* C412FC 8024154C AFA30024 */ sw $v1, 0x24($sp) -/* C41300 80241550 8E2200B0 */ lw $v0, 0xb0($s1) -/* C41304 80241554 30420004 */ andi $v0, $v0, 4 -/* C41308 80241558 10400020 */ beqz $v0, .L802415DC -/* C4130C 8024155C 00000000 */ nop -.L80241560: -/* C41310 80241560 2404F7FF */ addiu $a0, $zero, -0x801 -/* C41314 80241564 AE400070 */ sw $zero, 0x70($s2) -/* C41318 80241568 A6A0008E */ sh $zero, 0x8e($s5) -/* C4131C 8024156C 8E2200CC */ lw $v0, 0xcc($s1) -/* C41320 80241570 8EA30000 */ lw $v1, ($s5) -/* C41324 80241574 8C420000 */ lw $v0, ($v0) -/* C41328 80241578 00641824 */ and $v1, $v1, $a0 -/* C4132C 8024157C AEA30000 */ sw $v1, ($s5) -/* C41330 80241580 AEA20028 */ sw $v0, 0x28($s5) -/* C41334 80241584 8E2200D0 */ lw $v0, 0xd0($s1) -/* C41338 80241588 8C420034 */ lw $v0, 0x34($v0) -/* C4133C 8024158C 54400005 */ bnel $v0, $zero, .L802415A4 -/* C41340 80241590 2402FDFF */ addiu $v0, $zero, -0x201 -/* C41344 80241594 34620200 */ ori $v0, $v1, 0x200 -/* C41348 80241598 2403FFF7 */ addiu $v1, $zero, -9 -/* C4134C 8024159C 0809056B */ j .L802415AC -/* C41350 802415A0 00431024 */ and $v0, $v0, $v1 -.L802415A4: -/* C41354 802415A4 00621024 */ and $v0, $v1, $v0 -/* C41358 802415A8 34420008 */ ori $v0, $v0, 8 -.L802415AC: -/* C4135C 802415AC AEA20000 */ sw $v0, ($s5) -/* C41360 802415B0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C41364 802415B4 30420004 */ andi $v0, $v0, 4 -/* C41368 802415B8 10400007 */ beqz $v0, .L802415D8 -/* C4136C 802415BC 24020063 */ addiu $v0, $zero, 0x63 -/* C41370 802415C0 AE420070 */ sw $v0, 0x70($s2) -/* C41374 802415C4 AE400074 */ sw $zero, 0x74($s2) -/* C41378 802415C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* C4137C 802415CC 2403FFFB */ addiu $v1, $zero, -5 -/* C41380 802415D0 00431024 */ and $v0, $v0, $v1 -/* C41384 802415D4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802415D8: -/* C41388 802415D8 AE20006C */ sw $zero, 0x6c($s1) -.L802415DC: -/* C4138C 802415DC 8E420070 */ lw $v0, 0x70($s2) -/* C41390 802415E0 2842001E */ slti $v0, $v0, 0x1e -/* C41394 802415E4 10400009 */ beqz $v0, .L8024160C -/* C41398 802415E8 00000000 */ nop -/* C4139C 802415EC 8E22006C */ lw $v0, 0x6c($s1) -/* C413A0 802415F0 14400006 */ bnez $v0, .L8024160C -/* C413A4 802415F4 00000000 */ nop -/* C413A8 802415F8 0C090426 */ jal func_80241098 -/* C413AC 802415FC 0240202D */ daddu $a0, $s2, $zero -/* C413B0 80241600 10400002 */ beqz $v0, .L8024160C -/* C413B4 80241604 2402001E */ addiu $v0, $zero, 0x1e -/* C413B8 80241608 AE420070 */ sw $v0, 0x70($s2) -.L8024160C: -/* C413BC 8024160C 8E430070 */ lw $v1, 0x70($s2) -/* C413C0 80241610 2C620064 */ sltiu $v0, $v1, 0x64 -/* C413C4 80241614 10400048 */ beqz $v0, .L80241738 -/* C413C8 80241618 00031080 */ sll $v0, $v1, 2 -/* C413CC 8024161C 3C018024 */ lui $at, 0x8024 -/* C413D0 80241620 00220821 */ addu $at, $at, $v0 -/* C413D4 80241624 8C226BA8 */ lw $v0, 0x6ba8($at) -/* C413D8 80241628 00400008 */ jr $v0 -/* C413DC 8024162C 00000000 */ nop -/* C413E0 80241630 0240202D */ daddu $a0, $s2, $zero -/* C413E4 80241634 0260282D */ daddu $a1, $s3, $zero -/* C413E8 80241638 0C012568 */ jal func_800495A0 -/* C413EC 8024163C 0280302D */ daddu $a2, $s4, $zero -/* C413F0 80241640 0240202D */ daddu $a0, $s2, $zero -/* C413F4 80241644 0260282D */ daddu $a1, $s3, $zero -/* C413F8 80241648 0C0125AE */ jal func_800496B8 -/* C413FC 8024164C 0280302D */ daddu $a2, $s4, $zero -/* C41400 80241650 080905CE */ j .L80241738 -/* C41404 80241654 00000000 */ nop -/* C41408 80241658 0240202D */ daddu $a0, $s2, $zero -/* C4140C 8024165C 0260282D */ daddu $a1, $s3, $zero -/* C41410 80241660 0C0126D1 */ jal func_80049B44 -/* C41414 80241664 0280302D */ daddu $a2, $s4, $zero -/* C41418 80241668 0240202D */ daddu $a0, $s2, $zero -/* C4141C 8024166C 0260282D */ daddu $a1, $s3, $zero -/* C41420 80241670 0C012701 */ jal func_80049C04 -/* C41424 80241674 0280302D */ daddu $a2, $s4, $zero -/* C41428 80241678 080905CE */ j .L80241738 -/* C4142C 8024167C 00000000 */ nop -/* C41430 80241680 0240202D */ daddu $a0, $s2, $zero -/* C41434 80241684 0260282D */ daddu $a1, $s3, $zero -/* C41438 80241688 0C01278F */ jal func_80049E3C -/* C4143C 8024168C 0280302D */ daddu $a2, $s4, $zero -/* C41440 80241690 0240202D */ daddu $a0, $s2, $zero -/* C41444 80241694 0260282D */ daddu $a1, $s3, $zero -/* C41448 80241698 0C0127B3 */ jal func_80049ECC -/* C4144C 8024169C 0280302D */ daddu $a2, $s4, $zero -/* C41450 802416A0 080905CE */ j .L80241738 -/* C41454 802416A4 00000000 */ nop -/* C41458 802416A8 0240202D */ daddu $a0, $s2, $zero -/* C4145C 802416AC 0260282D */ daddu $a1, $s3, $zero -/* C41460 802416B0 0C0127DF */ jal func_80049F7C -/* C41464 802416B4 0280302D */ daddu $a2, $s4, $zero -/* C41468 802416B8 0240202D */ daddu $a0, $s2, $zero -/* C4146C 802416BC 0260282D */ daddu $a1, $s3, $zero -/* C41470 802416C0 0C012849 */ jal func_8004A124 -/* C41474 802416C4 0280302D */ daddu $a2, $s4, $zero -/* C41478 802416C8 080905CE */ j .L80241738 -/* C4147C 802416CC 00000000 */ nop -/* C41480 802416D0 0240202D */ daddu $a0, $s2, $zero -/* C41484 802416D4 0260282D */ daddu $a1, $s3, $zero -/* C41488 802416D8 0C0128FA */ jal func_8004A3E8 -/* C4148C 802416DC 0280302D */ daddu $a2, $s4, $zero -/* C41490 802416E0 080905CE */ j .L80241738 -/* C41494 802416E4 00000000 */ nop -/* C41498 802416E8 0C0903A4 */ jal func_80240E90 -/* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero -/* C414A0 802416F0 0C0903BF */ jal func_80240EFC -/* C414A4 802416F4 0240202D */ daddu $a0, $s2, $zero -/* C414A8 802416F8 8E430070 */ lw $v1, 0x70($s2) -/* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 -/* C414B0 80241700 1462000D */ bne $v1, $v0, .L80241738 -/* C414B4 80241704 00000000 */ nop -/* C414B8 80241708 0C0903DB */ jal func_80240F6C -/* C414BC 8024170C 0240202D */ daddu $a0, $s2, $zero -/* C414C0 80241710 8E430070 */ lw $v1, 0x70($s2) -/* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 -/* C414C8 80241718 14620007 */ bne $v1, $v0, .L80241738 -/* C414CC 8024171C 00000000 */ nop -/* C414D0 80241720 0C090411 */ jal func_80241044 -/* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero -/* C414D8 80241728 080905CE */ j .L80241738 -/* C414DC 8024172C 00000000 */ nop -/* C414E0 80241730 0C0129CF */ jal func_8004A73C -/* C414E4 80241734 0240202D */ daddu $a0, $s2, $zero -.L80241738: -/* C414E8 80241738 8FBF0048 */ lw $ra, 0x48($sp) -/* C414EC 8024173C 8FB50044 */ lw $s5, 0x44($sp) -/* C414F0 80241740 8FB40040 */ lw $s4, 0x40($sp) -/* C414F4 80241744 8FB3003C */ lw $s3, 0x3c($sp) -/* C414F8 80241748 8FB20038 */ lw $s2, 0x38($sp) -/* C414FC 8024174C 8FB10034 */ lw $s1, 0x34($sp) -/* C41500 80241750 8FB00030 */ lw $s0, 0x30($sp) -/* C41504 80241754 0000102D */ daddu $v0, $zero, $zero -/* C41508 80241758 03E00008 */ jr $ra -/* C4150C 8024175C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s new file mode 100644 index 0000000000..3da4d63fa5 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802414AC_C4125C.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414AC_C4125C +/* C4125C 802414AC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C41260 802414B0 AFB20038 */ sw $s2, 0x38($sp) +/* C41264 802414B4 0080902D */ daddu $s2, $a0, $zero +/* C41268 802414B8 AFBF0048 */ sw $ra, 0x48($sp) +/* C4126C 802414BC AFB50044 */ sw $s5, 0x44($sp) +/* C41270 802414C0 AFB40040 */ sw $s4, 0x40($sp) +/* C41274 802414C4 AFB3003C */ sw $s3, 0x3c($sp) +/* C41278 802414C8 AFB10034 */ sw $s1, 0x34($sp) +/* C4127C 802414CC AFB00030 */ sw $s0, 0x30($sp) +/* C41280 802414D0 8E510148 */ lw $s1, 0x148($s2) +/* C41284 802414D4 86240008 */ lh $a0, 8($s1) +/* C41288 802414D8 0C00EABB */ jal get_npc_unsafe +/* C4128C 802414DC 00A0802D */ daddu $s0, $a1, $zero +/* C41290 802414E0 8E43000C */ lw $v1, 0xc($s2) +/* C41294 802414E4 0240202D */ daddu $a0, $s2, $zero +/* C41298 802414E8 8C650000 */ lw $a1, ($v1) +/* C4129C 802414EC 0C0B1EAF */ jal get_variable +/* C412A0 802414F0 0040A82D */ daddu $s5, $v0, $zero +/* C412A4 802414F4 AFA00010 */ sw $zero, 0x10($sp) +/* C412A8 802414F8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C412AC 802414FC 8C630030 */ lw $v1, 0x30($v1) +/* C412B0 80241500 AFA30014 */ sw $v1, 0x14($sp) +/* C412B4 80241504 8E2300D0 */ lw $v1, 0xd0($s1) +/* C412B8 80241508 8C63001C */ lw $v1, 0x1c($v1) +/* C412BC 8024150C AFA30018 */ sw $v1, 0x18($sp) +/* C412C0 80241510 8E2300D0 */ lw $v1, 0xd0($s1) +/* C412C4 80241514 8C630024 */ lw $v1, 0x24($v1) +/* C412C8 80241518 AFA3001C */ sw $v1, 0x1c($sp) +/* C412CC 8024151C 8E2300D0 */ lw $v1, 0xd0($s1) +/* C412D0 80241520 8C630028 */ lw $v1, 0x28($v1) +/* C412D4 80241524 27B40010 */ addiu $s4, $sp, 0x10 +/* C412D8 80241528 AFA30020 */ sw $v1, 0x20($sp) +/* C412DC 8024152C 8E2300D0 */ lw $v1, 0xd0($s1) +/* C412E0 80241530 3C014282 */ lui $at, 0x4282 +/* C412E4 80241534 44810000 */ mtc1 $at, $f0 +/* C412E8 80241538 8C63002C */ lw $v1, 0x2c($v1) +/* C412EC 8024153C 0040982D */ daddu $s3, $v0, $zero +/* C412F0 80241540 E7A00028 */ swc1 $f0, 0x28($sp) +/* C412F4 80241544 A7A0002C */ sh $zero, 0x2c($sp) +/* C412F8 80241548 16000005 */ bnez $s0, .L80241560 +/* C412FC 8024154C AFA30024 */ sw $v1, 0x24($sp) +/* C41300 80241550 8E2200B0 */ lw $v0, 0xb0($s1) +/* C41304 80241554 30420004 */ andi $v0, $v0, 4 +/* C41308 80241558 10400020 */ beqz $v0, .L802415DC +/* C4130C 8024155C 00000000 */ nop +.L80241560: +/* C41310 80241560 2404F7FF */ addiu $a0, $zero, -0x801 +/* C41314 80241564 AE400070 */ sw $zero, 0x70($s2) +/* C41318 80241568 A6A0008E */ sh $zero, 0x8e($s5) +/* C4131C 8024156C 8E2200CC */ lw $v0, 0xcc($s1) +/* C41320 80241570 8EA30000 */ lw $v1, ($s5) +/* C41324 80241574 8C420000 */ lw $v0, ($v0) +/* C41328 80241578 00641824 */ and $v1, $v1, $a0 +/* C4132C 8024157C AEA30000 */ sw $v1, ($s5) +/* C41330 80241580 AEA20028 */ sw $v0, 0x28($s5) +/* C41334 80241584 8E2200D0 */ lw $v0, 0xd0($s1) +/* C41338 80241588 8C420034 */ lw $v0, 0x34($v0) +/* C4133C 8024158C 54400005 */ bnel $v0, $zero, .L802415A4 +/* C41340 80241590 2402FDFF */ addiu $v0, $zero, -0x201 +/* C41344 80241594 34620200 */ ori $v0, $v1, 0x200 +/* C41348 80241598 2403FFF7 */ addiu $v1, $zero, -9 +/* C4134C 8024159C 0809056B */ j .L802415AC +/* C41350 802415A0 00431024 */ and $v0, $v0, $v1 +.L802415A4: +/* C41354 802415A4 00621024 */ and $v0, $v1, $v0 +/* C41358 802415A8 34420008 */ ori $v0, $v0, 8 +.L802415AC: +/* C4135C 802415AC AEA20000 */ sw $v0, ($s5) +/* C41360 802415B0 8E2200B0 */ lw $v0, 0xb0($s1) +/* C41364 802415B4 30420004 */ andi $v0, $v0, 4 +/* C41368 802415B8 10400007 */ beqz $v0, .L802415D8 +/* C4136C 802415BC 24020063 */ addiu $v0, $zero, 0x63 +/* C41370 802415C0 AE420070 */ sw $v0, 0x70($s2) +/* C41374 802415C4 AE400074 */ sw $zero, 0x74($s2) +/* C41378 802415C8 8E2200B0 */ lw $v0, 0xb0($s1) +/* C4137C 802415CC 2403FFFB */ addiu $v1, $zero, -5 +/* C41380 802415D0 00431024 */ and $v0, $v0, $v1 +/* C41384 802415D4 AE2200B0 */ sw $v0, 0xb0($s1) +.L802415D8: +/* C41388 802415D8 AE20006C */ sw $zero, 0x6c($s1) +.L802415DC: +/* C4138C 802415DC 8E420070 */ lw $v0, 0x70($s2) +/* C41390 802415E0 2842001E */ slti $v0, $v0, 0x1e +/* C41394 802415E4 10400009 */ beqz $v0, .L8024160C +/* C41398 802415E8 00000000 */ nop +/* C4139C 802415EC 8E22006C */ lw $v0, 0x6c($s1) +/* C413A0 802415F0 14400006 */ bnez $v0, .L8024160C +/* C413A4 802415F4 00000000 */ nop +/* C413A8 802415F8 0C090426 */ jal func_80241098_C40E48 +/* C413AC 802415FC 0240202D */ daddu $a0, $s2, $zero +/* C413B0 80241600 10400002 */ beqz $v0, .L8024160C +/* C413B4 80241604 2402001E */ addiu $v0, $zero, 0x1e +/* C413B8 80241608 AE420070 */ sw $v0, 0x70($s2) +.L8024160C: +/* C413BC 8024160C 8E430070 */ lw $v1, 0x70($s2) +/* C413C0 80241610 2C620064 */ sltiu $v0, $v1, 0x64 +/* C413C4 80241614 10400048 */ beqz $v0, .L80241738 +/* C413C8 80241618 00031080 */ sll $v0, $v1, 2 +/* C413CC 8024161C 3C018024 */ lui $at, 0x8024 +/* C413D0 80241620 00220821 */ addu $at, $at, $v0 +/* C413D4 80241624 8C226BA8 */ lw $v0, 0x6ba8($at) +/* C413D8 80241628 00400008 */ jr $v0 +/* C413DC 8024162C 00000000 */ nop +/* C413E0 80241630 0240202D */ daddu $a0, $s2, $zero +/* C413E4 80241634 0260282D */ daddu $a1, $s3, $zero +/* C413E8 80241638 0C012568 */ jal func_800495A0 +/* C413EC 8024163C 0280302D */ daddu $a2, $s4, $zero +/* C413F0 80241640 0240202D */ daddu $a0, $s2, $zero +/* C413F4 80241644 0260282D */ daddu $a1, $s3, $zero +/* C413F8 80241648 0C0125AE */ jal func_800496B8 +/* C413FC 8024164C 0280302D */ daddu $a2, $s4, $zero +/* C41400 80241650 080905CE */ j .L80241738 +/* C41404 80241654 00000000 */ nop +/* C41408 80241658 0240202D */ daddu $a0, $s2, $zero +/* C4140C 8024165C 0260282D */ daddu $a1, $s3, $zero +/* C41410 80241660 0C0126D1 */ jal func_80049B44 +/* C41414 80241664 0280302D */ daddu $a2, $s4, $zero +/* C41418 80241668 0240202D */ daddu $a0, $s2, $zero +/* C4141C 8024166C 0260282D */ daddu $a1, $s3, $zero +/* C41420 80241670 0C012701 */ jal func_80049C04 +/* C41424 80241674 0280302D */ daddu $a2, $s4, $zero +/* C41428 80241678 080905CE */ j .L80241738 +/* C4142C 8024167C 00000000 */ nop +/* C41430 80241680 0240202D */ daddu $a0, $s2, $zero +/* C41434 80241684 0260282D */ daddu $a1, $s3, $zero +/* C41438 80241688 0C01278F */ jal func_80049E3C +/* C4143C 8024168C 0280302D */ daddu $a2, $s4, $zero +/* C41440 80241690 0240202D */ daddu $a0, $s2, $zero +/* C41444 80241694 0260282D */ daddu $a1, $s3, $zero +/* C41448 80241698 0C0127B3 */ jal func_80049ECC +/* C4144C 8024169C 0280302D */ daddu $a2, $s4, $zero +/* C41450 802416A0 080905CE */ j .L80241738 +/* C41454 802416A4 00000000 */ nop +/* C41458 802416A8 0240202D */ daddu $a0, $s2, $zero +/* C4145C 802416AC 0260282D */ daddu $a1, $s3, $zero +/* C41460 802416B0 0C0127DF */ jal func_80049F7C +/* C41464 802416B4 0280302D */ daddu $a2, $s4, $zero +/* C41468 802416B8 0240202D */ daddu $a0, $s2, $zero +/* C4146C 802416BC 0260282D */ daddu $a1, $s3, $zero +/* C41470 802416C0 0C012849 */ jal func_8004A124 +/* C41474 802416C4 0280302D */ daddu $a2, $s4, $zero +/* C41478 802416C8 080905CE */ j .L80241738 +/* C4147C 802416CC 00000000 */ nop +/* C41480 802416D0 0240202D */ daddu $a0, $s2, $zero +/* C41484 802416D4 0260282D */ daddu $a1, $s3, $zero +/* C41488 802416D8 0C0128FA */ jal func_8004A3E8 +/* C4148C 802416DC 0280302D */ daddu $a2, $s4, $zero +/* C41490 802416E0 080905CE */ j .L80241738 +/* C41494 802416E4 00000000 */ nop +/* C41498 802416E8 0C0903A4 */ jal func_80240E90_C40C40 +/* C4149C 802416EC 0240202D */ daddu $a0, $s2, $zero +/* C414A0 802416F0 0C0903BF */ jal func_80240EFC_C40CAC +/* C414A4 802416F4 0240202D */ daddu $a0, $s2, $zero +/* C414A8 802416F8 8E430070 */ lw $v1, 0x70($s2) +/* C414AC 802416FC 24020020 */ addiu $v0, $zero, 0x20 +/* C414B0 80241700 1462000D */ bne $v1, $v0, .L80241738 +/* C414B4 80241704 00000000 */ nop +/* C414B8 80241708 0C0903DB */ jal func_80240F6C_C40D1C +/* C414BC 8024170C 0240202D */ daddu $a0, $s2, $zero +/* C414C0 80241710 8E430070 */ lw $v1, 0x70($s2) +/* C414C4 80241714 24020021 */ addiu $v0, $zero, 0x21 +/* C414C8 80241718 14620007 */ bne $v1, $v0, .L80241738 +/* C414CC 8024171C 00000000 */ nop +/* C414D0 80241720 0C090411 */ jal func_80241044_C40DF4 +/* C414D4 80241724 0240202D */ daddu $a0, $s2, $zero +/* C414D8 80241728 080905CE */ j .L80241738 +/* C414DC 8024172C 00000000 */ nop +/* C414E0 80241730 0C0129CF */ jal func_8004A73C +/* C414E4 80241734 0240202D */ daddu $a0, $s2, $zero +.L80241738: +/* C414E8 80241738 8FBF0048 */ lw $ra, 0x48($sp) +/* C414EC 8024173C 8FB50044 */ lw $s5, 0x44($sp) +/* C414F0 80241740 8FB40040 */ lw $s4, 0x40($sp) +/* C414F4 80241744 8FB3003C */ lw $s3, 0x3c($sp) +/* C414F8 80241748 8FB20038 */ lw $s2, 0x38($sp) +/* C414FC 8024174C 8FB10034 */ lw $s1, 0x34($sp) +/* C41500 80241750 8FB00030 */ lw $s0, 0x30($sp) +/* C41504 80241754 0000102D */ daddu $v0, $zero, $zero +/* C41508 80241758 03E00008 */ jr $ra +/* C4150C 8024175C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8.s deleted file mode 100644 index f30f6df13e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FF8 -/* C41DA8 80241FF8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C41DAC 80241FFC AFB3004C */ sw $s3, 0x4c($sp) -/* C41DB0 80242000 0080982D */ daddu $s3, $a0, $zero -/* C41DB4 80242004 AFBF0054 */ sw $ra, 0x54($sp) -/* C41DB8 80242008 AFB40050 */ sw $s4, 0x50($sp) -/* C41DBC 8024200C AFB20048 */ sw $s2, 0x48($sp) -/* C41DC0 80242010 AFB10044 */ sw $s1, 0x44($sp) -/* C41DC4 80242014 AFB00040 */ sw $s0, 0x40($sp) -/* C41DC8 80242018 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C41DCC 8024201C F7B80068 */ sdc1 $f24, 0x68($sp) -/* C41DD0 80242020 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C41DD4 80242024 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C41DD8 80242028 8E710148 */ lw $s1, 0x148($s3) -/* C41DDC 8024202C 00A0902D */ daddu $s2, $a1, $zero -/* C41DE0 80242030 86240008 */ lh $a0, 8($s1) -/* C41DE4 80242034 0C00EABB */ jal get_npc_unsafe -/* C41DE8 80242038 00C0A02D */ daddu $s4, $a2, $zero -/* C41DEC 8024203C 0040802D */ daddu $s0, $v0, $zero -/* C41DF0 80242040 C6200078 */ lwc1 $f0, 0x78($s1) -/* C41DF4 80242044 46800020 */ cvt.s.w $f0, $f0 -/* C41DF8 80242048 46000021 */ cvt.d.s $f0, $f0 -/* C41DFC 8024204C 3C014059 */ lui $at, 0x4059 -/* C41E00 80242050 44811800 */ mtc1 $at, $f3 -/* C41E04 80242054 44801000 */ mtc1 $zero, $f2 -/* C41E08 80242058 8602008E */ lh $v0, 0x8e($s0) -/* C41E0C 8024205C 9603008E */ lhu $v1, 0x8e($s0) -/* C41E10 80242060 46220003 */ div.d $f0, $f0, $f2 -/* C41E14 80242064 46200620 */ cvt.s.d $f24, $f0 -/* C41E18 80242068 C6200088 */ lwc1 $f0, 0x88($s1) -/* C41E1C 8024206C 46800020 */ cvt.s.w $f0, $f0 -/* C41E20 80242070 46000021 */ cvt.d.s $f0, $f0 -/* C41E24 80242074 46220003 */ div.d $f0, $f0, $f2 -/* C41E28 80242078 46200020 */ cvt.s.d $f0, $f0 -/* C41E2C 8024207C 18400003 */ blez $v0, .L8024208C -/* C41E30 80242080 4600C680 */ add.s $f26, $f24, $f0 -/* C41E34 80242084 2462FFFF */ addiu $v0, $v1, -1 -/* C41E38 80242088 A602008E */ sh $v0, 0x8e($s0) -.L8024208C: -/* C41E3C 8024208C 8E220070 */ lw $v0, 0x70($s1) -/* C41E40 80242090 18400034 */ blez $v0, .L80242164 -/* C41E44 80242094 00000000 */ nop -/* C41E48 80242098 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C41E4C 8024209C 46806320 */ cvt.s.w $f12, $f12 -/* C41E50 802420A0 44820000 */ mtc1 $v0, $f0 -/* C41E54 802420A4 00000000 */ nop -/* C41E58 802420A8 46800020 */ cvt.s.w $f0, $f0 -/* C41E5C 802420AC 46000021 */ cvt.d.s $f0, $f0 -/* C41E60 802420B0 46220003 */ div.d $f0, $f0, $f2 -/* C41E64 802420B4 0C00A8BB */ jal sin_deg -/* C41E68 802420B8 462005A0 */ cvt.s.d $f22, $f0 -/* C41E6C 802420BC 8E020000 */ lw $v0, ($s0) -/* C41E70 802420C0 30420008 */ andi $v0, $v0, 8 -/* C41E74 802420C4 10400003 */ beqz $v0, .L802420D4 -/* C41E78 802420C8 46000506 */ mov.s $f20, $f0 -/* C41E7C 802420CC 08090845 */ j .L80242114 -/* C41E80 802420D0 0000102D */ daddu $v0, $zero, $zero -.L802420D4: -/* C41E84 802420D4 27A50028 */ addiu $a1, $sp, 0x28 -/* C41E88 802420D8 27A6002C */ addiu $a2, $sp, 0x2c -/* C41E8C 802420DC C6000038 */ lwc1 $f0, 0x38($s0) -/* C41E90 802420E0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C41E94 802420E4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C41E98 802420E8 3C01447A */ lui $at, 0x447a -/* C41E9C 802420EC 44813000 */ mtc1 $at, $f6 -/* C41EA0 802420F0 27A20034 */ addiu $v0, $sp, 0x34 -/* C41EA4 802420F4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C41EA8 802420F8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C41EAC 802420FC E7A40030 */ swc1 $f4, 0x30($sp) -/* C41EB0 80242100 E7A60034 */ swc1 $f6, 0x34($sp) -/* C41EB4 80242104 AFA20010 */ sw $v0, 0x10($sp) -/* C41EB8 80242108 8E040080 */ lw $a0, 0x80($s0) -/* C41EBC 8024210C 0C0372DF */ jal func_800DCB7C -/* C41EC0 80242110 27A70030 */ addiu $a3, $sp, 0x30 -.L80242114: -/* C41EC4 80242114 10400007 */ beqz $v0, .L80242134 -/* C41EC8 80242118 00000000 */ nop -/* C41ECC 8024211C 4616A082 */ mul.s $f2, $f20, $f22 -/* C41ED0 80242120 00000000 */ nop -/* C41ED4 80242124 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C41ED8 80242128 46180000 */ add.s $f0, $f0, $f24 -/* C41EDC 8024212C 08090850 */ j .L80242140 -/* C41EE0 80242130 46020000 */ add.s $f0, $f0, $f2 -.L80242134: -/* C41EE4 80242134 4616A002 */ mul.s $f0, $f20, $f22 -/* C41EE8 80242138 00000000 */ nop -/* C41EEC 8024213C 4600D000 */ add.s $f0, $f26, $f0 -.L80242140: -/* C41EF0 80242140 E600003C */ swc1 $f0, 0x3c($s0) -/* C41EF4 80242144 8E220074 */ lw $v0, 0x74($s1) -/* C41EF8 80242148 2442000A */ addiu $v0, $v0, 0xa -/* C41EFC 8024214C 44826000 */ mtc1 $v0, $f12 -/* C41F00 80242150 00000000 */ nop -/* C41F04 80242154 0C00A6C9 */ jal clamp_angle -/* C41F08 80242158 46806320 */ cvt.s.w $f12, $f12 -/* C41F0C 8024215C 4600020D */ trunc.w.s $f8, $f0 -/* C41F10 80242160 E6280074 */ swc1 $f8, 0x74($s1) -.L80242164: -/* C41F14 80242164 8E220090 */ lw $v0, 0x90($s1) -/* C41F18 80242168 1C400040 */ bgtz $v0, .L8024226C -/* C41F1C 8024216C 2442FFFF */ addiu $v0, $v0, -1 -/* C41F20 80242170 860200A8 */ lh $v0, 0xa8($s0) -/* C41F24 80242174 C600003C */ lwc1 $f0, 0x3c($s0) -/* C41F28 80242178 44821000 */ mtc1 $v0, $f2 -/* C41F2C 8024217C 00000000 */ nop -/* C41F30 80242180 468010A0 */ cvt.s.w $f2, $f2 -/* C41F34 80242184 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C41F38 80242188 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C41F3C 8024218C 46020000 */ add.s $f0, $f0, $f2 -/* C41F40 80242190 3C014024 */ lui $at, 0x4024 -/* C41F44 80242194 44812800 */ mtc1 $at, $f5 -/* C41F48 80242198 44802000 */ mtc1 $zero, $f4 -/* C41F4C 8024219C C442002C */ lwc1 $f2, 0x2c($v0) -/* C41F50 802421A0 46000021 */ cvt.d.s $f0, $f0 -/* C41F54 802421A4 46240000 */ add.d $f0, $f0, $f4 -/* C41F58 802421A8 460010A1 */ cvt.d.s $f2, $f2 -/* C41F5C 802421AC 4620103C */ c.lt.d $f2, $f0 -/* C41F60 802421B0 00000000 */ nop -/* C41F64 802421B4 4500002E */ bc1f .L80242270 -/* C41F68 802421B8 0280202D */ daddu $a0, $s4, $zero -/* C41F6C 802421BC 24020001 */ addiu $v0, $zero, 1 -/* C41F70 802421C0 AFA20010 */ sw $v0, 0x10($sp) -/* C41F74 802421C4 8E460024 */ lw $a2, 0x24($s2) -/* C41F78 802421C8 8E470028 */ lw $a3, 0x28($s2) -/* C41F7C 802421CC 0C01242D */ jal func_800490B4 -/* C41F80 802421D0 0220282D */ daddu $a1, $s1, $zero -/* C41F84 802421D4 10400026 */ beqz $v0, .L80242270 -/* C41F88 802421D8 0000202D */ daddu $a0, $zero, $zero -/* C41F8C 802421DC 0200282D */ daddu $a1, $s0, $zero -/* C41F90 802421E0 0000302D */ daddu $a2, $zero, $zero -/* C41F94 802421E4 2412000C */ addiu $s2, $zero, 0xc -/* C41F98 802421E8 860300A8 */ lh $v1, 0xa8($s0) -/* C41F9C 802421EC 3C013F80 */ lui $at, 0x3f80 -/* C41FA0 802421F0 44810000 */ mtc1 $at, $f0 -/* C41FA4 802421F4 3C014000 */ lui $at, 0x4000 -/* C41FA8 802421F8 44811000 */ mtc1 $at, $f2 -/* C41FAC 802421FC 3C01C1A0 */ lui $at, 0xc1a0 -/* C41FB0 80242200 44812000 */ mtc1 $at, $f4 -/* C41FB4 80242204 44834000 */ mtc1 $v1, $f8 -/* C41FB8 80242208 00000000 */ nop -/* C41FBC 8024220C 46804220 */ cvt.s.w $f8, $f8 -/* C41FC0 80242210 44074000 */ mfc1 $a3, $f8 -/* C41FC4 80242214 27A20038 */ addiu $v0, $sp, 0x38 -/* C41FC8 80242218 AFB2001C */ sw $s2, 0x1c($sp) -/* C41FCC 8024221C AFA20020 */ sw $v0, 0x20($sp) -/* C41FD0 80242220 E7A00010 */ swc1 $f0, 0x10($sp) -/* C41FD4 80242224 E7A20014 */ swc1 $f2, 0x14($sp) -/* C41FD8 80242228 0C01BFA4 */ jal fx_emote -/* C41FDC 8024222C E7A40018 */ swc1 $f4, 0x18($sp) -/* C41FE0 80242230 0200202D */ daddu $a0, $s0, $zero -/* C41FE4 80242234 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C41FE8 80242238 C480003C */ lwc1 $f0, 0x3c($a0) -/* C41FEC 8024223C 3C060020 */ lui $a2, 0x20 -/* C41FF0 80242240 0C012530 */ jal func_800494C0 -/* C41FF4 80242244 E4800064 */ swc1 $f0, 0x64($a0) -/* C41FF8 80242248 8E220018 */ lw $v0, 0x18($s1) -/* C41FFC 8024224C 9442002A */ lhu $v0, 0x2a($v0) -/* C42000 80242250 30420001 */ andi $v0, $v0, 1 -/* C42004 80242254 10400003 */ beqz $v0, .L80242264 -/* C42008 80242258 2402000A */ addiu $v0, $zero, 0xa -/* C4200C 8024225C 080908C3 */ j .L8024230C -/* C42010 80242260 AE620070 */ sw $v0, 0x70($s3) -.L80242264: -/* C42014 80242264 080908C3 */ j .L8024230C -/* C42018 80242268 AE720070 */ sw $s2, 0x70($s3) -.L8024226C: -/* C4201C 8024226C AE220090 */ sw $v0, 0x90($s1) -.L80242270: -/* C42020 80242270 8602008C */ lh $v0, 0x8c($s0) -/* C42024 80242274 14400025 */ bnez $v0, .L8024230C -/* C42028 80242278 00000000 */ nop -/* C4202C 8024227C 8602008E */ lh $v0, 0x8e($s0) -/* C42030 80242280 1C400022 */ bgtz $v0, .L8024230C -/* C42034 80242284 00000000 */ nop -/* C42038 80242288 8E620074 */ lw $v0, 0x74($s3) -/* C4203C 8024228C 2442FFFF */ addiu $v0, $v0, -1 -/* C42040 80242290 1840001D */ blez $v0, .L80242308 -/* C42044 80242294 AE620074 */ sw $v0, 0x74($s3) -/* C42048 80242298 8E220018 */ lw $v0, 0x18($s1) -/* C4204C 8024229C 9442002A */ lhu $v0, 0x2a($v0) -/* C42050 802422A0 30420010 */ andi $v0, $v0, 0x10 -/* C42054 802422A4 14400007 */ bnez $v0, .L802422C4 -/* C42058 802422A8 00000000 */ nop -/* C4205C 802422AC C600000C */ lwc1 $f0, 0xc($s0) -/* C42060 802422B0 3C014334 */ lui $at, 0x4334 -/* C42064 802422B4 44816000 */ mtc1 $at, $f12 -/* C42068 802422B8 0C00A6C9 */ jal clamp_angle -/* C4206C 802422BC 460C0300 */ add.s $f12, $f0, $f12 -/* C42070 802422C0 E600000C */ swc1 $f0, 0xc($s0) -.L802422C4: -/* C42074 802422C4 0C00A67F */ jal rand_int -/* C42078 802422C8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C4207C 802422CC 3C032E8B */ lui $v1, 0x2e8b -/* C42080 802422D0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C42084 802422D4 00430018 */ mult $v0, $v1 -/* C42088 802422D8 00021FC3 */ sra $v1, $v0, 0x1f -/* C4208C 802422DC 00004010 */ mfhi $t0 -/* C42090 802422E0 00082043 */ sra $a0, $t0, 1 -/* C42094 802422E4 00832023 */ subu $a0, $a0, $v1 -/* C42098 802422E8 00041840 */ sll $v1, $a0, 1 -/* C4209C 802422EC 00641821 */ addu $v1, $v1, $a0 -/* C420A0 802422F0 00031880 */ sll $v1, $v1, 2 -/* C420A4 802422F4 00641823 */ subu $v1, $v1, $a0 -/* C420A8 802422F8 00431023 */ subu $v0, $v0, $v1 -/* C420AC 802422FC 24420005 */ addiu $v0, $v0, 5 -/* C420B0 80242300 080908C3 */ j .L8024230C -/* C420B4 80242304 A602008E */ sh $v0, 0x8e($s0) -.L80242308: -/* C420B8 80242308 AE600070 */ sw $zero, 0x70($s3) -.L8024230C: -/* C420BC 8024230C 8FBF0054 */ lw $ra, 0x54($sp) -/* C420C0 80242310 8FB40050 */ lw $s4, 0x50($sp) -/* C420C4 80242314 8FB3004C */ lw $s3, 0x4c($sp) -/* C420C8 80242318 8FB20048 */ lw $s2, 0x48($sp) -/* C420CC 8024231C 8FB10044 */ lw $s1, 0x44($sp) -/* C420D0 80242320 8FB00040 */ lw $s0, 0x40($sp) -/* C420D4 80242324 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C420D8 80242328 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C420DC 8024232C D7B60060 */ ldc1 $f22, 0x60($sp) -/* C420E0 80242330 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C420E4 80242334 03E00008 */ jr $ra -/* C420E8 80242338 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s new file mode 100644 index 0000000000..d28a459faa --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80241FF8_C41DA8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FF8_C41DA8 +/* C41DA8 80241FF8 27BDFF88 */ addiu $sp, $sp, -0x78 +/* C41DAC 80241FFC AFB3004C */ sw $s3, 0x4c($sp) +/* C41DB0 80242000 0080982D */ daddu $s3, $a0, $zero +/* C41DB4 80242004 AFBF0054 */ sw $ra, 0x54($sp) +/* C41DB8 80242008 AFB40050 */ sw $s4, 0x50($sp) +/* C41DBC 8024200C AFB20048 */ sw $s2, 0x48($sp) +/* C41DC0 80242010 AFB10044 */ sw $s1, 0x44($sp) +/* C41DC4 80242014 AFB00040 */ sw $s0, 0x40($sp) +/* C41DC8 80242018 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* C41DCC 8024201C F7B80068 */ sdc1 $f24, 0x68($sp) +/* C41DD0 80242020 F7B60060 */ sdc1 $f22, 0x60($sp) +/* C41DD4 80242024 F7B40058 */ sdc1 $f20, 0x58($sp) +/* C41DD8 80242028 8E710148 */ lw $s1, 0x148($s3) +/* C41DDC 8024202C 00A0902D */ daddu $s2, $a1, $zero +/* C41DE0 80242030 86240008 */ lh $a0, 8($s1) +/* C41DE4 80242034 0C00EABB */ jal get_npc_unsafe +/* C41DE8 80242038 00C0A02D */ daddu $s4, $a2, $zero +/* C41DEC 8024203C 0040802D */ daddu $s0, $v0, $zero +/* C41DF0 80242040 C6200078 */ lwc1 $f0, 0x78($s1) +/* C41DF4 80242044 46800020 */ cvt.s.w $f0, $f0 +/* C41DF8 80242048 46000021 */ cvt.d.s $f0, $f0 +/* C41DFC 8024204C 3C014059 */ lui $at, 0x4059 +/* C41E00 80242050 44811800 */ mtc1 $at, $f3 +/* C41E04 80242054 44801000 */ mtc1 $zero, $f2 +/* C41E08 80242058 8602008E */ lh $v0, 0x8e($s0) +/* C41E0C 8024205C 9603008E */ lhu $v1, 0x8e($s0) +/* C41E10 80242060 46220003 */ div.d $f0, $f0, $f2 +/* C41E14 80242064 46200620 */ cvt.s.d $f24, $f0 +/* C41E18 80242068 C6200088 */ lwc1 $f0, 0x88($s1) +/* C41E1C 8024206C 46800020 */ cvt.s.w $f0, $f0 +/* C41E20 80242070 46000021 */ cvt.d.s $f0, $f0 +/* C41E24 80242074 46220003 */ div.d $f0, $f0, $f2 +/* C41E28 80242078 46200020 */ cvt.s.d $f0, $f0 +/* C41E2C 8024207C 18400003 */ blez $v0, .L8024208C +/* C41E30 80242080 4600C680 */ add.s $f26, $f24, $f0 +/* C41E34 80242084 2462FFFF */ addiu $v0, $v1, -1 +/* C41E38 80242088 A602008E */ sh $v0, 0x8e($s0) +.L8024208C: +/* C41E3C 8024208C 8E220070 */ lw $v0, 0x70($s1) +/* C41E40 80242090 18400034 */ blez $v0, .L80242164 +/* C41E44 80242094 00000000 */ nop +/* C41E48 80242098 C62C0074 */ lwc1 $f12, 0x74($s1) +/* C41E4C 8024209C 46806320 */ cvt.s.w $f12, $f12 +/* C41E50 802420A0 44820000 */ mtc1 $v0, $f0 +/* C41E54 802420A4 00000000 */ nop +/* C41E58 802420A8 46800020 */ cvt.s.w $f0, $f0 +/* C41E5C 802420AC 46000021 */ cvt.d.s $f0, $f0 +/* C41E60 802420B0 46220003 */ div.d $f0, $f0, $f2 +/* C41E64 802420B4 0C00A8BB */ jal sin_deg +/* C41E68 802420B8 462005A0 */ cvt.s.d $f22, $f0 +/* C41E6C 802420BC 8E020000 */ lw $v0, ($s0) +/* C41E70 802420C0 30420008 */ andi $v0, $v0, 8 +/* C41E74 802420C4 10400003 */ beqz $v0, .L802420D4 +/* C41E78 802420C8 46000506 */ mov.s $f20, $f0 +/* C41E7C 802420CC 08090845 */ j .L80242114 +/* C41E80 802420D0 0000102D */ daddu $v0, $zero, $zero +.L802420D4: +/* C41E84 802420D4 27A50028 */ addiu $a1, $sp, 0x28 +/* C41E88 802420D8 27A6002C */ addiu $a2, $sp, 0x2c +/* C41E8C 802420DC C6000038 */ lwc1 $f0, 0x38($s0) +/* C41E90 802420E0 C602003C */ lwc1 $f2, 0x3c($s0) +/* C41E94 802420E4 C6040040 */ lwc1 $f4, 0x40($s0) +/* C41E98 802420E8 3C01447A */ lui $at, 0x447a +/* C41E9C 802420EC 44813000 */ mtc1 $at, $f6 +/* C41EA0 802420F0 27A20034 */ addiu $v0, $sp, 0x34 +/* C41EA4 802420F4 E7A00028 */ swc1 $f0, 0x28($sp) +/* C41EA8 802420F8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C41EAC 802420FC E7A40030 */ swc1 $f4, 0x30($sp) +/* C41EB0 80242100 E7A60034 */ swc1 $f6, 0x34($sp) +/* C41EB4 80242104 AFA20010 */ sw $v0, 0x10($sp) +/* C41EB8 80242108 8E040080 */ lw $a0, 0x80($s0) +/* C41EBC 8024210C 0C0372DF */ jal func_800DCB7C +/* C41EC0 80242110 27A70030 */ addiu $a3, $sp, 0x30 +.L80242114: +/* C41EC4 80242114 10400007 */ beqz $v0, .L80242134 +/* C41EC8 80242118 00000000 */ nop +/* C41ECC 8024211C 4616A082 */ mul.s $f2, $f20, $f22 +/* C41ED0 80242120 00000000 */ nop +/* C41ED4 80242124 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C41ED8 80242128 46180000 */ add.s $f0, $f0, $f24 +/* C41EDC 8024212C 08090850 */ j .L80242140 +/* C41EE0 80242130 46020000 */ add.s $f0, $f0, $f2 +.L80242134: +/* C41EE4 80242134 4616A002 */ mul.s $f0, $f20, $f22 +/* C41EE8 80242138 00000000 */ nop +/* C41EEC 8024213C 4600D000 */ add.s $f0, $f26, $f0 +.L80242140: +/* C41EF0 80242140 E600003C */ swc1 $f0, 0x3c($s0) +/* C41EF4 80242144 8E220074 */ lw $v0, 0x74($s1) +/* C41EF8 80242148 2442000A */ addiu $v0, $v0, 0xa +/* C41EFC 8024214C 44826000 */ mtc1 $v0, $f12 +/* C41F00 80242150 00000000 */ nop +/* C41F04 80242154 0C00A6C9 */ jal clamp_angle +/* C41F08 80242158 46806320 */ cvt.s.w $f12, $f12 +/* C41F0C 8024215C 4600020D */ trunc.w.s $f8, $f0 +/* C41F10 80242160 E6280074 */ swc1 $f8, 0x74($s1) +.L80242164: +/* C41F14 80242164 8E220090 */ lw $v0, 0x90($s1) +/* C41F18 80242168 1C400040 */ bgtz $v0, .L8024226C +/* C41F1C 8024216C 2442FFFF */ addiu $v0, $v0, -1 +/* C41F20 80242170 860200A8 */ lh $v0, 0xa8($s0) +/* C41F24 80242174 C600003C */ lwc1 $f0, 0x3c($s0) +/* C41F28 80242178 44821000 */ mtc1 $v0, $f2 +/* C41F2C 8024217C 00000000 */ nop +/* C41F30 80242180 468010A0 */ cvt.s.w $f2, $f2 +/* C41F34 80242184 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C41F38 80242188 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C41F3C 8024218C 46020000 */ add.s $f0, $f0, $f2 +/* C41F40 80242190 3C014024 */ lui $at, 0x4024 +/* C41F44 80242194 44812800 */ mtc1 $at, $f5 +/* C41F48 80242198 44802000 */ mtc1 $zero, $f4 +/* C41F4C 8024219C C442002C */ lwc1 $f2, 0x2c($v0) +/* C41F50 802421A0 46000021 */ cvt.d.s $f0, $f0 +/* C41F54 802421A4 46240000 */ add.d $f0, $f0, $f4 +/* C41F58 802421A8 460010A1 */ cvt.d.s $f2, $f2 +/* C41F5C 802421AC 4620103C */ c.lt.d $f2, $f0 +/* C41F60 802421B0 00000000 */ nop +/* C41F64 802421B4 4500002E */ bc1f .L80242270 +/* C41F68 802421B8 0280202D */ daddu $a0, $s4, $zero +/* C41F6C 802421BC 24020001 */ addiu $v0, $zero, 1 +/* C41F70 802421C0 AFA20010 */ sw $v0, 0x10($sp) +/* C41F74 802421C4 8E460024 */ lw $a2, 0x24($s2) +/* C41F78 802421C8 8E470028 */ lw $a3, 0x28($s2) +/* C41F7C 802421CC 0C01242D */ jal func_800490B4 +/* C41F80 802421D0 0220282D */ daddu $a1, $s1, $zero +/* C41F84 802421D4 10400026 */ beqz $v0, .L80242270 +/* C41F88 802421D8 0000202D */ daddu $a0, $zero, $zero +/* C41F8C 802421DC 0200282D */ daddu $a1, $s0, $zero +/* C41F90 802421E0 0000302D */ daddu $a2, $zero, $zero +/* C41F94 802421E4 2412000C */ addiu $s2, $zero, 0xc +/* C41F98 802421E8 860300A8 */ lh $v1, 0xa8($s0) +/* C41F9C 802421EC 3C013F80 */ lui $at, 0x3f80 +/* C41FA0 802421F0 44810000 */ mtc1 $at, $f0 +/* C41FA4 802421F4 3C014000 */ lui $at, 0x4000 +/* C41FA8 802421F8 44811000 */ mtc1 $at, $f2 +/* C41FAC 802421FC 3C01C1A0 */ lui $at, 0xc1a0 +/* C41FB0 80242200 44812000 */ mtc1 $at, $f4 +/* C41FB4 80242204 44834000 */ mtc1 $v1, $f8 +/* C41FB8 80242208 00000000 */ nop +/* C41FBC 8024220C 46804220 */ cvt.s.w $f8, $f8 +/* C41FC0 80242210 44074000 */ mfc1 $a3, $f8 +/* C41FC4 80242214 27A20038 */ addiu $v0, $sp, 0x38 +/* C41FC8 80242218 AFB2001C */ sw $s2, 0x1c($sp) +/* C41FCC 8024221C AFA20020 */ sw $v0, 0x20($sp) +/* C41FD0 80242220 E7A00010 */ swc1 $f0, 0x10($sp) +/* C41FD4 80242224 E7A20014 */ swc1 $f2, 0x14($sp) +/* C41FD8 80242228 0C01BFA4 */ jal fx_emote +/* C41FDC 8024222C E7A40018 */ swc1 $f4, 0x18($sp) +/* C41FE0 80242230 0200202D */ daddu $a0, $s0, $zero +/* C41FE4 80242234 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C41FE8 80242238 C480003C */ lwc1 $f0, 0x3c($a0) +/* C41FEC 8024223C 3C060020 */ lui $a2, 0x20 +/* C41FF0 80242240 0C012530 */ jal func_800494C0 +/* C41FF4 80242244 E4800064 */ swc1 $f0, 0x64($a0) +/* C41FF8 80242248 8E220018 */ lw $v0, 0x18($s1) +/* C41FFC 8024224C 9442002A */ lhu $v0, 0x2a($v0) +/* C42000 80242250 30420001 */ andi $v0, $v0, 1 +/* C42004 80242254 10400003 */ beqz $v0, .L80242264 +/* C42008 80242258 2402000A */ addiu $v0, $zero, 0xa +/* C4200C 8024225C 080908C3 */ j .L8024230C +/* C42010 80242260 AE620070 */ sw $v0, 0x70($s3) +.L80242264: +/* C42014 80242264 080908C3 */ j .L8024230C +/* C42018 80242268 AE720070 */ sw $s2, 0x70($s3) +.L8024226C: +/* C4201C 8024226C AE220090 */ sw $v0, 0x90($s1) +.L80242270: +/* C42020 80242270 8602008C */ lh $v0, 0x8c($s0) +/* C42024 80242274 14400025 */ bnez $v0, .L8024230C +/* C42028 80242278 00000000 */ nop +/* C4202C 8024227C 8602008E */ lh $v0, 0x8e($s0) +/* C42030 80242280 1C400022 */ bgtz $v0, .L8024230C +/* C42034 80242284 00000000 */ nop +/* C42038 80242288 8E620074 */ lw $v0, 0x74($s3) +/* C4203C 8024228C 2442FFFF */ addiu $v0, $v0, -1 +/* C42040 80242290 1840001D */ blez $v0, .L80242308 +/* C42044 80242294 AE620074 */ sw $v0, 0x74($s3) +/* C42048 80242298 8E220018 */ lw $v0, 0x18($s1) +/* C4204C 8024229C 9442002A */ lhu $v0, 0x2a($v0) +/* C42050 802422A0 30420010 */ andi $v0, $v0, 0x10 +/* C42054 802422A4 14400007 */ bnez $v0, .L802422C4 +/* C42058 802422A8 00000000 */ nop +/* C4205C 802422AC C600000C */ lwc1 $f0, 0xc($s0) +/* C42060 802422B0 3C014334 */ lui $at, 0x4334 +/* C42064 802422B4 44816000 */ mtc1 $at, $f12 +/* C42068 802422B8 0C00A6C9 */ jal clamp_angle +/* C4206C 802422BC 460C0300 */ add.s $f12, $f0, $f12 +/* C42070 802422C0 E600000C */ swc1 $f0, 0xc($s0) +.L802422C4: +/* C42074 802422C4 0C00A67F */ jal rand_int +/* C42078 802422C8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C4207C 802422CC 3C032E8B */ lui $v1, 0x2e8b +/* C42080 802422D0 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* C42084 802422D4 00430018 */ mult $v0, $v1 +/* C42088 802422D8 00021FC3 */ sra $v1, $v0, 0x1f +/* C4208C 802422DC 00004010 */ mfhi $t0 +/* C42090 802422E0 00082043 */ sra $a0, $t0, 1 +/* C42094 802422E4 00832023 */ subu $a0, $a0, $v1 +/* C42098 802422E8 00041840 */ sll $v1, $a0, 1 +/* C4209C 802422EC 00641821 */ addu $v1, $v1, $a0 +/* C420A0 802422F0 00031880 */ sll $v1, $v1, 2 +/* C420A4 802422F4 00641823 */ subu $v1, $v1, $a0 +/* C420A8 802422F8 00431023 */ subu $v0, $v0, $v1 +/* C420AC 802422FC 24420005 */ addiu $v0, $v0, 5 +/* C420B0 80242300 080908C3 */ j .L8024230C +/* C420B4 80242304 A602008E */ sh $v0, 0x8e($s0) +.L80242308: +/* C420B8 80242308 AE600070 */ sw $zero, 0x70($s3) +.L8024230C: +/* C420BC 8024230C 8FBF0054 */ lw $ra, 0x54($sp) +/* C420C0 80242310 8FB40050 */ lw $s4, 0x50($sp) +/* C420C4 80242314 8FB3004C */ lw $s3, 0x4c($sp) +/* C420C8 80242318 8FB20048 */ lw $s2, 0x48($sp) +/* C420CC 8024231C 8FB10044 */ lw $s1, 0x44($sp) +/* C420D0 80242320 8FB00040 */ lw $s0, 0x40($sp) +/* C420D4 80242324 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* C420D8 80242328 D7B80068 */ ldc1 $f24, 0x68($sp) +/* C420DC 8024232C D7B60060 */ ldc1 $f22, 0x60($sp) +/* C420E0 80242330 D7B40058 */ ldc1 $f20, 0x58($sp) +/* C420E4 80242334 03E00008 */ jr $ra +/* C420E8 80242338 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420.s deleted file mode 100644 index 898e3b2d04..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242420 -/* C421D0 80242420 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C421D4 80242424 AFB3001C */ sw $s3, 0x1c($sp) -/* C421D8 80242428 0080982D */ daddu $s3, $a0, $zero -/* C421DC 8024242C AFBF0020 */ sw $ra, 0x20($sp) -/* C421E0 80242430 AFB20018 */ sw $s2, 0x18($sp) -/* C421E4 80242434 AFB10014 */ sw $s1, 0x14($sp) -/* C421E8 80242438 AFB00010 */ sw $s0, 0x10($sp) -/* C421EC 8024243C 8E720148 */ lw $s2, 0x148($s3) -/* C421F0 80242440 86440008 */ lh $a0, 8($s2) -/* C421F4 80242444 0C00EABB */ jal get_npc_unsafe -/* C421F8 80242448 00A0802D */ daddu $s0, $a1, $zero -/* C421FC 8024244C 0040882D */ daddu $s1, $v0, $zero -/* C42200 80242450 C6420080 */ lwc1 $f2, 0x80($s2) -/* C42204 80242454 468010A0 */ cvt.s.w $f2, $f2 -/* C42208 80242458 460010A1 */ cvt.d.s $f2, $f2 -/* C4220C 8024245C C6400084 */ lwc1 $f0, 0x84($s2) -/* C42210 80242460 46800020 */ cvt.s.w $f0, $f0 -/* C42214 80242464 46000021 */ cvt.d.s $f0, $f0 -/* C42218 80242468 3C014059 */ lui $at, 0x4059 -/* C4221C 8024246C 44812800 */ mtc1 $at, $f5 -/* C42220 80242470 44802000 */ mtc1 $zero, $f4 -/* C42224 80242474 8E4200CC */ lw $v0, 0xcc($s2) -/* C42228 80242478 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C4222C 8024247C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C42230 80242480 46241083 */ div.d $f2, $f2, $f4 -/* C42234 80242484 462010A0 */ cvt.s.d $f2, $f2 -/* C42238 80242488 46240003 */ div.d $f0, $f0, $f4 -/* C4223C 8024248C 8C420020 */ lw $v0, 0x20($v0) -/* C42240 80242490 46200020 */ cvt.s.d $f0, $f0 -/* C42244 80242494 E622001C */ swc1 $f2, 0x1c($s1) -/* C42248 80242498 E6200014 */ swc1 $f0, 0x14($s1) -/* C4224C 8024249C AE220028 */ sw $v0, 0x28($s1) -/* C42250 802424A0 C6000018 */ lwc1 $f0, 0x18($s0) -/* C42254 802424A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42258 802424A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C4225C 802424AC E6200018 */ swc1 $f0, 0x18($s1) -/* C42260 802424B0 8C460028 */ lw $a2, 0x28($v0) -/* C42264 802424B4 0C00A720 */ jal atan2 -/* C42268 802424B8 8C470030 */ lw $a3, 0x30($v0) -/* C4226C 802424BC E620000C */ swc1 $f0, 0xc($s1) -/* C42270 802424C0 8E420018 */ lw $v0, 0x18($s2) -/* C42274 802424C4 AE400074 */ sw $zero, 0x74($s2) -/* C42278 802424C8 9442002A */ lhu $v0, 0x2a($v0) -/* C4227C 802424CC 30420002 */ andi $v0, $v0, 2 -/* C42280 802424D0 10400005 */ beqz $v0, .L802424E8 -/* C42284 802424D4 24020003 */ addiu $v0, $zero, 3 -/* C42288 802424D8 A622008E */ sh $v0, 0x8e($s1) -/* C4228C 802424DC 2402000D */ addiu $v0, $zero, 0xd -/* C42290 802424E0 0809094E */ j .L80242538 -/* C42294 802424E4 AE620070 */ sw $v0, 0x70($s3) -.L802424E8: -/* C42298 802424E8 24030001 */ addiu $v1, $zero, 1 -/* C4229C 802424EC 2402000E */ addiu $v0, $zero, 0xe -/* C422A0 802424F0 A623008E */ sh $v1, 0x8e($s1) -/* C422A4 802424F4 AE620070 */ sw $v0, 0x70($s3) -/* C422A8 802424F8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C422AC 802424FC 4600018D */ trunc.w.s $f6, $f0 -/* C422B0 80242500 44023000 */ mfc1 $v0, $f6 -/* C422B4 80242504 00000000 */ nop -/* C422B8 80242508 A6420010 */ sh $v0, 0x10($s2) -/* C422BC 8024250C C620003C */ lwc1 $f0, 0x3c($s1) -/* C422C0 80242510 4600018D */ trunc.w.s $f6, $f0 -/* C422C4 80242514 44023000 */ mfc1 $v0, $f6 -/* C422C8 80242518 00000000 */ nop -/* C422CC 8024251C A6420012 */ sh $v0, 0x12($s2) -/* C422D0 80242520 C6200040 */ lwc1 $f0, 0x40($s1) -/* C422D4 80242524 A2430007 */ sb $v1, 7($s2) -/* C422D8 80242528 4600018D */ trunc.w.s $f6, $f0 -/* C422DC 8024252C 44023000 */ mfc1 $v0, $f6 -/* C422E0 80242530 00000000 */ nop -/* C422E4 80242534 A6420014 */ sh $v0, 0x14($s2) -.L80242538: -/* C422E8 80242538 8FBF0020 */ lw $ra, 0x20($sp) -/* C422EC 8024253C 8FB3001C */ lw $s3, 0x1c($sp) -/* C422F0 80242540 8FB20018 */ lw $s2, 0x18($sp) -/* C422F4 80242544 8FB10014 */ lw $s1, 0x14($sp) -/* C422F8 80242548 8FB00010 */ lw $s0, 0x10($sp) -/* C422FC 8024254C 03E00008 */ jr $ra -/* C42300 80242550 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s new file mode 100644 index 0000000000..b7ca413631 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242420_C421D0.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242420_C421D0 +/* C421D0 80242420 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C421D4 80242424 AFB3001C */ sw $s3, 0x1c($sp) +/* C421D8 80242428 0080982D */ daddu $s3, $a0, $zero +/* C421DC 8024242C AFBF0020 */ sw $ra, 0x20($sp) +/* C421E0 80242430 AFB20018 */ sw $s2, 0x18($sp) +/* C421E4 80242434 AFB10014 */ sw $s1, 0x14($sp) +/* C421E8 80242438 AFB00010 */ sw $s0, 0x10($sp) +/* C421EC 8024243C 8E720148 */ lw $s2, 0x148($s3) +/* C421F0 80242440 86440008 */ lh $a0, 8($s2) +/* C421F4 80242444 0C00EABB */ jal get_npc_unsafe +/* C421F8 80242448 00A0802D */ daddu $s0, $a1, $zero +/* C421FC 8024244C 0040882D */ daddu $s1, $v0, $zero +/* C42200 80242450 C6420080 */ lwc1 $f2, 0x80($s2) +/* C42204 80242454 468010A0 */ cvt.s.w $f2, $f2 +/* C42208 80242458 460010A1 */ cvt.d.s $f2, $f2 +/* C4220C 8024245C C6400084 */ lwc1 $f0, 0x84($s2) +/* C42210 80242460 46800020 */ cvt.s.w $f0, $f0 +/* C42214 80242464 46000021 */ cvt.d.s $f0, $f0 +/* C42218 80242468 3C014059 */ lui $at, 0x4059 +/* C4221C 8024246C 44812800 */ mtc1 $at, $f5 +/* C42220 80242470 44802000 */ mtc1 $zero, $f4 +/* C42224 80242474 8E4200CC */ lw $v0, 0xcc($s2) +/* C42228 80242478 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C4222C 8024247C C62E0040 */ lwc1 $f14, 0x40($s1) +/* C42230 80242480 46241083 */ div.d $f2, $f2, $f4 +/* C42234 80242484 462010A0 */ cvt.s.d $f2, $f2 +/* C42238 80242488 46240003 */ div.d $f0, $f0, $f4 +/* C4223C 8024248C 8C420020 */ lw $v0, 0x20($v0) +/* C42240 80242490 46200020 */ cvt.s.d $f0, $f0 +/* C42244 80242494 E622001C */ swc1 $f2, 0x1c($s1) +/* C42248 80242498 E6200014 */ swc1 $f0, 0x14($s1) +/* C4224C 8024249C AE220028 */ sw $v0, 0x28($s1) +/* C42250 802424A0 C6000018 */ lwc1 $f0, 0x18($s0) +/* C42254 802424A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C42258 802424A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C4225C 802424AC E6200018 */ swc1 $f0, 0x18($s1) +/* C42260 802424B0 8C460028 */ lw $a2, 0x28($v0) +/* C42264 802424B4 0C00A720 */ jal atan2 +/* C42268 802424B8 8C470030 */ lw $a3, 0x30($v0) +/* C4226C 802424BC E620000C */ swc1 $f0, 0xc($s1) +/* C42270 802424C0 8E420018 */ lw $v0, 0x18($s2) +/* C42274 802424C4 AE400074 */ sw $zero, 0x74($s2) +/* C42278 802424C8 9442002A */ lhu $v0, 0x2a($v0) +/* C4227C 802424CC 30420002 */ andi $v0, $v0, 2 +/* C42280 802424D0 10400005 */ beqz $v0, .L802424E8 +/* C42284 802424D4 24020003 */ addiu $v0, $zero, 3 +/* C42288 802424D8 A622008E */ sh $v0, 0x8e($s1) +/* C4228C 802424DC 2402000D */ addiu $v0, $zero, 0xd +/* C42290 802424E0 0809094E */ j .L80242538 +/* C42294 802424E4 AE620070 */ sw $v0, 0x70($s3) +.L802424E8: +/* C42298 802424E8 24030001 */ addiu $v1, $zero, 1 +/* C4229C 802424EC 2402000E */ addiu $v0, $zero, 0xe +/* C422A0 802424F0 A623008E */ sh $v1, 0x8e($s1) +/* C422A4 802424F4 AE620070 */ sw $v0, 0x70($s3) +/* C422A8 802424F8 C6200038 */ lwc1 $f0, 0x38($s1) +/* C422AC 802424FC 4600018D */ trunc.w.s $f6, $f0 +/* C422B0 80242500 44023000 */ mfc1 $v0, $f6 +/* C422B4 80242504 00000000 */ nop +/* C422B8 80242508 A6420010 */ sh $v0, 0x10($s2) +/* C422BC 8024250C C620003C */ lwc1 $f0, 0x3c($s1) +/* C422C0 80242510 4600018D */ trunc.w.s $f6, $f0 +/* C422C4 80242514 44023000 */ mfc1 $v0, $f6 +/* C422C8 80242518 00000000 */ nop +/* C422CC 8024251C A6420012 */ sh $v0, 0x12($s2) +/* C422D0 80242520 C6200040 */ lwc1 $f0, 0x40($s1) +/* C422D4 80242524 A2430007 */ sb $v1, 7($s2) +/* C422D8 80242528 4600018D */ trunc.w.s $f6, $f0 +/* C422DC 8024252C 44023000 */ mfc1 $v0, $f6 +/* C422E0 80242530 00000000 */ nop +/* C422E4 80242534 A6420014 */ sh $v0, 0x14($s2) +.L80242538: +/* C422E8 80242538 8FBF0020 */ lw $ra, 0x20($sp) +/* C422EC 8024253C 8FB3001C */ lw $s3, 0x1c($sp) +/* C422F0 80242540 8FB20018 */ lw $s2, 0x18($sp) +/* C422F4 80242544 8FB10014 */ lw $s1, 0x14($sp) +/* C422F8 80242548 8FB00010 */ lw $s0, 0x10($sp) +/* C422FC 8024254C 03E00008 */ jr $ra +/* C42300 80242550 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554.s deleted file mode 100644 index 7aecea436a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242554 -/* C42304 80242554 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C42308 80242558 AFB00010 */ sw $s0, 0x10($sp) -/* C4230C 8024255C 0080802D */ daddu $s0, $a0, $zero -/* C42310 80242560 AFBF0014 */ sw $ra, 0x14($sp) -/* C42314 80242564 8E020148 */ lw $v0, 0x148($s0) -/* C42318 80242568 0C00EABB */ jal get_npc_unsafe -/* C4231C 8024256C 84440008 */ lh $a0, 8($v0) -/* C42320 80242570 0040202D */ daddu $a0, $v0, $zero -/* C42324 80242574 8482008E */ lh $v0, 0x8e($a0) -/* C42328 80242578 9483008E */ lhu $v1, 0x8e($a0) -/* C4232C 8024257C 18400005 */ blez $v0, .L80242594 -/* C42330 80242580 2462FFFF */ addiu $v0, $v1, -1 -/* C42334 80242584 A482008E */ sh $v0, 0x8e($a0) -/* C42338 80242588 00021400 */ sll $v0, $v0, 0x10 -/* C4233C 8024258C 1C400006 */ bgtz $v0, .L802425A8 -/* C42340 80242590 00000000 */ nop -.L80242594: -/* C42344 80242594 8482008C */ lh $v0, 0x8c($a0) -/* C42348 80242598 14400003 */ bnez $v0, .L802425A8 -/* C4234C 8024259C 2402000E */ addiu $v0, $zero, 0xe -/* C42350 802425A0 A480008E */ sh $zero, 0x8e($a0) -/* C42354 802425A4 AE020070 */ sw $v0, 0x70($s0) -.L802425A8: -/* C42358 802425A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C4235C 802425AC 8FB00010 */ lw $s0, 0x10($sp) -/* C42360 802425B0 03E00008 */ jr $ra -/* C42364 802425B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s new file mode 100644 index 0000000000..e40a0322b7 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242554_C42304.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242554_C42304 +/* C42304 80242554 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C42308 80242558 AFB00010 */ sw $s0, 0x10($sp) +/* C4230C 8024255C 0080802D */ daddu $s0, $a0, $zero +/* C42310 80242560 AFBF0014 */ sw $ra, 0x14($sp) +/* C42314 80242564 8E020148 */ lw $v0, 0x148($s0) +/* C42318 80242568 0C00EABB */ jal get_npc_unsafe +/* C4231C 8024256C 84440008 */ lh $a0, 8($v0) +/* C42320 80242570 0040202D */ daddu $a0, $v0, $zero +/* C42324 80242574 8482008E */ lh $v0, 0x8e($a0) +/* C42328 80242578 9483008E */ lhu $v1, 0x8e($a0) +/* C4232C 8024257C 18400005 */ blez $v0, .L80242594 +/* C42330 80242580 2462FFFF */ addiu $v0, $v1, -1 +/* C42334 80242584 A482008E */ sh $v0, 0x8e($a0) +/* C42338 80242588 00021400 */ sll $v0, $v0, 0x10 +/* C4233C 8024258C 1C400006 */ bgtz $v0, .L802425A8 +/* C42340 80242590 00000000 */ nop +.L80242594: +/* C42344 80242594 8482008C */ lh $v0, 0x8c($a0) +/* C42348 80242598 14400003 */ bnez $v0, .L802425A8 +/* C4234C 8024259C 2402000E */ addiu $v0, $zero, 0xe +/* C42350 802425A0 A480008E */ sh $zero, 0x8e($a0) +/* C42354 802425A4 AE020070 */ sw $v0, 0x70($s0) +.L802425A8: +/* C42358 802425A8 8FBF0014 */ lw $ra, 0x14($sp) +/* C4235C 802425AC 8FB00010 */ lw $s0, 0x10($sp) +/* C42360 802425B0 03E00008 */ jr $ra +/* C42364 802425B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8.s deleted file mode 100644 index 3b7624470d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425B8 -/* C42368 802425B8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C4236C 802425BC AFB20030 */ sw $s2, 0x30($sp) -/* C42370 802425C0 0080902D */ daddu $s2, $a0, $zero -/* C42374 802425C4 AFBF0038 */ sw $ra, 0x38($sp) -/* C42378 802425C8 AFB30034 */ sw $s3, 0x34($sp) -/* C4237C 802425CC AFB1002C */ sw $s1, 0x2c($sp) -/* C42380 802425D0 AFB00028 */ sw $s0, 0x28($sp) -/* C42384 802425D4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C42388 802425D8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C4238C 802425DC 8E510148 */ lw $s1, 0x148($s2) -/* C42390 802425E0 86240008 */ lh $a0, 8($s1) -/* C42394 802425E4 0C00EABB */ jal get_npc_unsafe -/* C42398 802425E8 00A0982D */ daddu $s3, $a1, $zero -/* C4239C 802425EC 0040802D */ daddu $s0, $v0, $zero -/* C423A0 802425F0 0200202D */ daddu $a0, $s0, $zero -/* C423A4 802425F4 C6220088 */ lwc1 $f2, 0x88($s1) -/* C423A8 802425F8 468010A0 */ cvt.s.w $f2, $f2 -/* C423AC 802425FC 460010A1 */ cvt.d.s $f2, $f2 -/* C423B0 80242600 C604001C */ lwc1 $f4, 0x1c($s0) -/* C423B4 80242604 C6000014 */ lwc1 $f0, 0x14($s0) -/* C423B8 80242608 8E050018 */ lw $a1, 0x18($s0) -/* C423BC 8024260C 46002100 */ add.s $f4, $f4, $f0 -/* C423C0 80242610 8E06000C */ lw $a2, 0xc($s0) -/* C423C4 80242614 C6200078 */ lwc1 $f0, 0x78($s1) -/* C423C8 80242618 46800020 */ cvt.s.w $f0, $f0 -/* C423CC 8024261C E604001C */ swc1 $f4, 0x1c($s0) -/* C423D0 80242620 3C014059 */ lui $at, 0x4059 -/* C423D4 80242624 44812800 */ mtc1 $at, $f5 -/* C423D8 80242628 44802000 */ mtc1 $zero, $f4 -/* C423DC 8024262C 46000021 */ cvt.d.s $f0, $f0 -/* C423E0 80242630 46240003 */ div.d $f0, $f0, $f4 -/* C423E4 80242634 46200520 */ cvt.s.d $f20, $f0 -/* C423E8 80242638 46241083 */ div.d $f2, $f2, $f4 -/* C423EC 8024263C 0C00EA95 */ jal npc_move_heading -/* C423F0 80242640 462015A0 */ cvt.s.d $f22, $f2 -/* C423F4 80242644 C604001C */ lwc1 $f4, 0x1c($s0) -/* C423F8 80242648 44801000 */ mtc1 $zero, $f2 -/* C423FC 8024264C 44801800 */ mtc1 $zero, $f3 -/* C42400 80242650 46002021 */ cvt.d.s $f0, $f4 -/* C42404 80242654 4620103E */ c.le.d $f2, $f0 -/* C42408 80242658 00000000 */ nop -/* C4240C 8024265C 45000030 */ bc1f .L80242720 -/* C42410 80242660 00000000 */ nop -/* C42414 80242664 C600003C */ lwc1 $f0, 0x3c($s0) -/* C42418 80242668 46040000 */ add.s $f0, $f0, $f4 -/* C4241C 8024266C E600003C */ swc1 $f0, 0x3c($s0) -/* C42420 80242670 8E2200CC */ lw $v0, 0xcc($s1) -/* C42424 80242674 8C420024 */ lw $v0, 0x24($v0) -/* C42428 80242678 AE020028 */ sw $v0, 0x28($s0) -/* C4242C 8024267C A2200007 */ sb $zero, 7($s1) -/* C42430 80242680 8E020000 */ lw $v0, ($s0) -/* C42434 80242684 30420008 */ andi $v0, $v0, 8 -/* C42438 80242688 14400011 */ bnez $v0, .L802426D0 -/* C4243C 8024268C 0000102D */ daddu $v0, $zero, $zero -/* C42440 80242690 27A50018 */ addiu $a1, $sp, 0x18 -/* C42444 80242694 27A6001C */ addiu $a2, $sp, 0x1c -/* C42448 80242698 C6000038 */ lwc1 $f0, 0x38($s0) -/* C4244C 8024269C C602003C */ lwc1 $f2, 0x3c($s0) -/* C42450 802426A0 C6040040 */ lwc1 $f4, 0x40($s0) -/* C42454 802426A4 3C01447A */ lui $at, 0x447a -/* C42458 802426A8 44813000 */ mtc1 $at, $f6 -/* C4245C 802426AC 27A20024 */ addiu $v0, $sp, 0x24 -/* C42460 802426B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C42464 802426B4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C42468 802426B8 E7A40020 */ swc1 $f4, 0x20($sp) -/* C4246C 802426BC E7A60024 */ swc1 $f6, 0x24($sp) -/* C42470 802426C0 AFA20010 */ sw $v0, 0x10($sp) -/* C42474 802426C4 8E040080 */ lw $a0, 0x80($s0) -/* C42478 802426C8 0C0372DF */ jal func_800DCB7C -/* C4247C 802426CC 27A70020 */ addiu $a3, $sp, 0x20 -.L802426D0: -/* C42480 802426D0 1040000B */ beqz $v0, .L80242700 -/* C42484 802426D4 00000000 */ nop -/* C42488 802426D8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C4248C 802426DC 46140080 */ add.s $f2, $f0, $f20 -/* C42490 802426E0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C42494 802426E4 4600103E */ c.le.s $f2, $f0 -/* C42498 802426E8 00000000 */ nop -/* C4249C 802426EC 4500008D */ bc1f .L80242924 -/* C424A0 802426F0 00000000 */ nop -/* C424A4 802426F4 E602003C */ swc1 $f2, 0x3c($s0) -/* C424A8 802426F8 08090A49 */ j .L80242924 -/* C424AC 802426FC AE400070 */ sw $zero, 0x70($s2) -.L80242700: -/* C424B0 80242700 C602003C */ lwc1 $f2, 0x3c($s0) -/* C424B4 80242704 C6000064 */ lwc1 $f0, 0x64($s0) -/* C424B8 80242708 4602003E */ c.le.s $f0, $f2 -/* C424BC 8024270C 00000000 */ nop -/* C424C0 80242710 45030084 */ bc1tl .L80242924 -/* C424C4 80242714 AE400070 */ sw $zero, 0x70($s2) -/* C424C8 80242718 08090A49 */ j .L80242924 -/* C424CC 8024271C 00000000 */ nop -.L80242720: -/* C424D0 80242720 4622003C */ c.lt.d $f0, $f2 -/* C424D4 80242724 00000000 */ nop -/* C424D8 80242728 4500007E */ bc1f .L80242924 -/* C424DC 8024272C 00000000 */ nop -/* C424E0 80242730 9602008E */ lhu $v0, 0x8e($s0) -/* C424E4 80242734 24420001 */ addiu $v0, $v0, 1 -/* C424E8 80242738 A602008E */ sh $v0, 0x8e($s0) -/* C424EC 8024273C 00021400 */ sll $v0, $v0, 0x10 -/* C424F0 80242740 8E630020 */ lw $v1, 0x20($s3) -/* C424F4 80242744 00021403 */ sra $v0, $v0, 0x10 -/* C424F8 80242748 0043102A */ slt $v0, $v0, $v1 -/* C424FC 8024274C 14400026 */ bnez $v0, .L802427E8 -/* C42500 80242750 00000000 */ nop -/* C42504 80242754 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C42508 80242758 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4250C 8024275C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42510 80242760 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C42514 80242764 A600008E */ sh $zero, 0x8e($s0) -/* C42518 80242768 8C460028 */ lw $a2, 0x28($v0) -/* C4251C 8024276C 0C00A720 */ jal atan2 -/* C42520 80242770 8C470030 */ lw $a3, 0x30($v0) -/* C42524 80242774 46000506 */ mov.s $f20, $f0 -/* C42528 80242778 C60C000C */ lwc1 $f12, 0xc($s0) -/* C4252C 8024277C 0C00A70A */ jal get_clamped_angle_diff -/* C42530 80242780 4600A386 */ mov.s $f14, $f20 -/* C42534 80242784 46000086 */ mov.s $f2, $f0 -/* C42538 80242788 8E62001C */ lw $v0, 0x1c($s3) -/* C4253C 8024278C 46001005 */ abs.s $f0, $f2 -/* C42540 80242790 44822000 */ mtc1 $v0, $f4 -/* C42544 80242794 00000000 */ nop -/* C42548 80242798 46802120 */ cvt.s.w $f4, $f4 -/* C4254C 8024279C 4600203C */ c.lt.s $f4, $f0 -/* C42550 802427A0 00000000 */ nop -/* C42554 802427A4 4500000D */ bc1f .L802427DC -/* C42558 802427A8 00000000 */ nop -/* C4255C 802427AC 44800000 */ mtc1 $zero, $f0 -/* C42560 802427B0 C614000C */ lwc1 $f20, 0xc($s0) -/* C42564 802427B4 4600103C */ c.lt.s $f2, $f0 -/* C42568 802427B8 00000000 */ nop -/* C4256C 802427BC 45000006 */ bc1f .L802427D8 -/* C42570 802427C0 00021023 */ negu $v0, $v0 -/* C42574 802427C4 44820000 */ mtc1 $v0, $f0 -/* C42578 802427C8 00000000 */ nop -/* C4257C 802427CC 46800020 */ cvt.s.w $f0, $f0 -/* C42580 802427D0 080909F7 */ j .L802427DC -/* C42584 802427D4 4600A500 */ add.s $f20, $f20, $f0 -.L802427D8: -/* C42588 802427D8 4604A500 */ add.s $f20, $f20, $f4 -.L802427DC: -/* C4258C 802427DC 0C00A6C9 */ jal clamp_angle -/* C42590 802427E0 4600A306 */ mov.s $f12, $f20 -/* C42594 802427E4 E600000C */ swc1 $f0, 0xc($s0) -.L802427E8: -/* C42598 802427E8 8E020000 */ lw $v0, ($s0) -/* C4259C 802427EC 30420008 */ andi $v0, $v0, 8 -/* C425A0 802427F0 1040000A */ beqz $v0, .L8024281C -/* C425A4 802427F4 27A50018 */ addiu $a1, $sp, 0x18 -/* C425A8 802427F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C425AC 802427FC C600001C */ lwc1 $f0, 0x1c($s0) -/* C425B0 80242800 46001080 */ add.s $f2, $f2, $f0 -/* C425B4 80242804 4616103C */ c.lt.s $f2, $f22 -/* C425B8 80242808 00000000 */ nop -/* C425BC 8024280C 45020045 */ bc1fl .L80242924 -/* C425C0 80242810 E602003C */ swc1 $f2, 0x3c($s0) -/* C425C4 80242814 08090A48 */ j .L80242920 -/* C425C8 80242818 E616003C */ swc1 $f22, 0x3c($s0) -.L8024281C: -/* C425CC 8024281C C6000038 */ lwc1 $f0, 0x38($s0) -/* C425D0 80242820 27A6001C */ addiu $a2, $sp, 0x1c -/* C425D4 80242824 E7A00018 */ swc1 $f0, 0x18($sp) -/* C425D8 80242828 860200A8 */ lh $v0, 0xa8($s0) -/* C425DC 8024282C C600001C */ lwc1 $f0, 0x1c($s0) -/* C425E0 80242830 C604003C */ lwc1 $f4, 0x3c($s0) -/* C425E4 80242834 44821000 */ mtc1 $v0, $f2 -/* C425E8 80242838 00000000 */ nop -/* C425EC 8024283C 468010A0 */ cvt.s.w $f2, $f2 -/* C425F0 80242840 46000005 */ abs.s $f0, $f0 -/* C425F4 80242844 46020000 */ add.s $f0, $f0, $f2 -/* C425F8 80242848 C6060040 */ lwc1 $f6, 0x40($s0) -/* C425FC 8024284C 27A20024 */ addiu $v0, $sp, 0x24 -/* C42600 80242850 46022100 */ add.s $f4, $f4, $f2 -/* C42604 80242854 3C014024 */ lui $at, 0x4024 -/* C42608 80242858 44811800 */ mtc1 $at, $f3 -/* C4260C 8024285C 44801000 */ mtc1 $zero, $f2 -/* C42610 80242860 46000021 */ cvt.d.s $f0, $f0 -/* C42614 80242864 46220000 */ add.d $f0, $f0, $f2 -/* C42618 80242868 E7A60020 */ swc1 $f6, 0x20($sp) -/* C4261C 8024286C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C42620 80242870 46200020 */ cvt.s.d $f0, $f0 -/* C42624 80242874 E7A00024 */ swc1 $f0, 0x24($sp) -/* C42628 80242878 AFA20010 */ sw $v0, 0x10($sp) -/* C4262C 8024287C 8E040080 */ lw $a0, 0x80($s0) -/* C42630 80242880 0C0372DF */ jal func_800DCB7C -/* C42634 80242884 27A70020 */ addiu $a3, $sp, 0x20 -/* C42638 80242888 10400015 */ beqz $v0, .L802428E0 -/* C4263C 8024288C 00000000 */ nop -/* C42640 80242890 860200A8 */ lh $v0, 0xa8($s0) -/* C42644 80242894 C604001C */ lwc1 $f4, 0x1c($s0) -/* C42648 80242898 44820000 */ mtc1 $v0, $f0 -/* C4264C 8024289C 00000000 */ nop -/* C42650 802428A0 46800020 */ cvt.s.w $f0, $f0 -/* C42654 802428A4 46002085 */ abs.s $f2, $f4 -/* C42658 802428A8 46020000 */ add.s $f0, $f0, $f2 -/* C4265C 802428AC C7A20024 */ lwc1 $f2, 0x24($sp) -/* C42660 802428B0 4600103E */ c.le.s $f2, $f0 -/* C42664 802428B4 00000000 */ nop -/* C42668 802428B8 45000005 */ bc1f .L802428D0 -/* C4266C 802428BC 00000000 */ nop -/* C42670 802428C0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C42674 802428C4 AE00001C */ sw $zero, 0x1c($s0) -/* C42678 802428C8 08090A49 */ j .L80242924 -/* C4267C 802428CC E600003C */ swc1 $f0, 0x3c($s0) -.L802428D0: -/* C42680 802428D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C42684 802428D4 46040000 */ add.s $f0, $f0, $f4 -/* C42688 802428D8 08090A49 */ j .L80242924 -/* C4268C 802428DC E600003C */ swc1 $f0, 0x3c($s0) -.L802428E0: -/* C42690 802428E0 C606003C */ lwc1 $f6, 0x3c($s0) -/* C42694 802428E4 860200A8 */ lh $v0, 0xa8($s0) -/* C42698 802428E8 46163081 */ sub.s $f2, $f6, $f22 -/* C4269C 802428EC 44820000 */ mtc1 $v0, $f0 -/* C426A0 802428F0 00000000 */ nop -/* C426A4 802428F4 46800020 */ cvt.s.w $f0, $f0 -/* C426A8 802428F8 46001080 */ add.s $f2, $f2, $f0 -/* C426AC 802428FC C604001C */ lwc1 $f4, 0x1c($s0) -/* C426B0 80242900 46002005 */ abs.s $f0, $f4 -/* C426B4 80242904 4602003C */ c.lt.s $f0, $f2 -/* C426B8 80242908 00000000 */ nop -/* C426BC 8024290C 45020005 */ bc1fl .L80242924 -/* C426C0 80242910 AE00001C */ sw $zero, 0x1c($s0) -/* C426C4 80242914 46043000 */ add.s $f0, $f6, $f4 -/* C426C8 80242918 08090A49 */ j .L80242924 -/* C426CC 8024291C E600003C */ swc1 $f0, 0x3c($s0) -.L80242920: -/* C426D0 80242920 AE00001C */ sw $zero, 0x1c($s0) -.L80242924: -/* C426D4 80242924 8FBF0038 */ lw $ra, 0x38($sp) -/* C426D8 80242928 8FB30034 */ lw $s3, 0x34($sp) -/* C426DC 8024292C 8FB20030 */ lw $s2, 0x30($sp) -/* C426E0 80242930 8FB1002C */ lw $s1, 0x2c($sp) -/* C426E4 80242934 8FB00028 */ lw $s0, 0x28($sp) -/* C426E8 80242938 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C426EC 8024293C D7B40040 */ ldc1 $f20, 0x40($sp) -/* C426F0 80242940 03E00008 */ jr $ra -/* C426F4 80242944 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s new file mode 100644 index 0000000000..a6a0bed56b --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802425B8_C42368.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425B8_C42368 +/* C42368 802425B8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C4236C 802425BC AFB20030 */ sw $s2, 0x30($sp) +/* C42370 802425C0 0080902D */ daddu $s2, $a0, $zero +/* C42374 802425C4 AFBF0038 */ sw $ra, 0x38($sp) +/* C42378 802425C8 AFB30034 */ sw $s3, 0x34($sp) +/* C4237C 802425CC AFB1002C */ sw $s1, 0x2c($sp) +/* C42380 802425D0 AFB00028 */ sw $s0, 0x28($sp) +/* C42384 802425D4 F7B60048 */ sdc1 $f22, 0x48($sp) +/* C42388 802425D8 F7B40040 */ sdc1 $f20, 0x40($sp) +/* C4238C 802425DC 8E510148 */ lw $s1, 0x148($s2) +/* C42390 802425E0 86240008 */ lh $a0, 8($s1) +/* C42394 802425E4 0C00EABB */ jal get_npc_unsafe +/* C42398 802425E8 00A0982D */ daddu $s3, $a1, $zero +/* C4239C 802425EC 0040802D */ daddu $s0, $v0, $zero +/* C423A0 802425F0 0200202D */ daddu $a0, $s0, $zero +/* C423A4 802425F4 C6220088 */ lwc1 $f2, 0x88($s1) +/* C423A8 802425F8 468010A0 */ cvt.s.w $f2, $f2 +/* C423AC 802425FC 460010A1 */ cvt.d.s $f2, $f2 +/* C423B0 80242600 C604001C */ lwc1 $f4, 0x1c($s0) +/* C423B4 80242604 C6000014 */ lwc1 $f0, 0x14($s0) +/* C423B8 80242608 8E050018 */ lw $a1, 0x18($s0) +/* C423BC 8024260C 46002100 */ add.s $f4, $f4, $f0 +/* C423C0 80242610 8E06000C */ lw $a2, 0xc($s0) +/* C423C4 80242614 C6200078 */ lwc1 $f0, 0x78($s1) +/* C423C8 80242618 46800020 */ cvt.s.w $f0, $f0 +/* C423CC 8024261C E604001C */ swc1 $f4, 0x1c($s0) +/* C423D0 80242620 3C014059 */ lui $at, 0x4059 +/* C423D4 80242624 44812800 */ mtc1 $at, $f5 +/* C423D8 80242628 44802000 */ mtc1 $zero, $f4 +/* C423DC 8024262C 46000021 */ cvt.d.s $f0, $f0 +/* C423E0 80242630 46240003 */ div.d $f0, $f0, $f4 +/* C423E4 80242634 46200520 */ cvt.s.d $f20, $f0 +/* C423E8 80242638 46241083 */ div.d $f2, $f2, $f4 +/* C423EC 8024263C 0C00EA95 */ jal npc_move_heading +/* C423F0 80242640 462015A0 */ cvt.s.d $f22, $f2 +/* C423F4 80242644 C604001C */ lwc1 $f4, 0x1c($s0) +/* C423F8 80242648 44801000 */ mtc1 $zero, $f2 +/* C423FC 8024264C 44801800 */ mtc1 $zero, $f3 +/* C42400 80242650 46002021 */ cvt.d.s $f0, $f4 +/* C42404 80242654 4620103E */ c.le.d $f2, $f0 +/* C42408 80242658 00000000 */ nop +/* C4240C 8024265C 45000030 */ bc1f .L80242720 +/* C42410 80242660 00000000 */ nop +/* C42414 80242664 C600003C */ lwc1 $f0, 0x3c($s0) +/* C42418 80242668 46040000 */ add.s $f0, $f0, $f4 +/* C4241C 8024266C E600003C */ swc1 $f0, 0x3c($s0) +/* C42420 80242670 8E2200CC */ lw $v0, 0xcc($s1) +/* C42424 80242674 8C420024 */ lw $v0, 0x24($v0) +/* C42428 80242678 AE020028 */ sw $v0, 0x28($s0) +/* C4242C 8024267C A2200007 */ sb $zero, 7($s1) +/* C42430 80242680 8E020000 */ lw $v0, ($s0) +/* C42434 80242684 30420008 */ andi $v0, $v0, 8 +/* C42438 80242688 14400011 */ bnez $v0, .L802426D0 +/* C4243C 8024268C 0000102D */ daddu $v0, $zero, $zero +/* C42440 80242690 27A50018 */ addiu $a1, $sp, 0x18 +/* C42444 80242694 27A6001C */ addiu $a2, $sp, 0x1c +/* C42448 80242698 C6000038 */ lwc1 $f0, 0x38($s0) +/* C4244C 8024269C C602003C */ lwc1 $f2, 0x3c($s0) +/* C42450 802426A0 C6040040 */ lwc1 $f4, 0x40($s0) +/* C42454 802426A4 3C01447A */ lui $at, 0x447a +/* C42458 802426A8 44813000 */ mtc1 $at, $f6 +/* C4245C 802426AC 27A20024 */ addiu $v0, $sp, 0x24 +/* C42460 802426B0 E7A00018 */ swc1 $f0, 0x18($sp) +/* C42464 802426B4 E7A2001C */ swc1 $f2, 0x1c($sp) +/* C42468 802426B8 E7A40020 */ swc1 $f4, 0x20($sp) +/* C4246C 802426BC E7A60024 */ swc1 $f6, 0x24($sp) +/* C42470 802426C0 AFA20010 */ sw $v0, 0x10($sp) +/* C42474 802426C4 8E040080 */ lw $a0, 0x80($s0) +/* C42478 802426C8 0C0372DF */ jal func_800DCB7C +/* C4247C 802426CC 27A70020 */ addiu $a3, $sp, 0x20 +.L802426D0: +/* C42480 802426D0 1040000B */ beqz $v0, .L80242700 +/* C42484 802426D4 00000000 */ nop +/* C42488 802426D8 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* C4248C 802426DC 46140080 */ add.s $f2, $f0, $f20 +/* C42490 802426E0 C600003C */ lwc1 $f0, 0x3c($s0) +/* C42494 802426E4 4600103E */ c.le.s $f2, $f0 +/* C42498 802426E8 00000000 */ nop +/* C4249C 802426EC 4500008D */ bc1f .L80242924 +/* C424A0 802426F0 00000000 */ nop +/* C424A4 802426F4 E602003C */ swc1 $f2, 0x3c($s0) +/* C424A8 802426F8 08090A49 */ j .L80242924 +/* C424AC 802426FC AE400070 */ sw $zero, 0x70($s2) +.L80242700: +/* C424B0 80242700 C602003C */ lwc1 $f2, 0x3c($s0) +/* C424B4 80242704 C6000064 */ lwc1 $f0, 0x64($s0) +/* C424B8 80242708 4602003E */ c.le.s $f0, $f2 +/* C424BC 8024270C 00000000 */ nop +/* C424C0 80242710 45030084 */ bc1tl .L80242924 +/* C424C4 80242714 AE400070 */ sw $zero, 0x70($s2) +/* C424C8 80242718 08090A49 */ j .L80242924 +/* C424CC 8024271C 00000000 */ nop +.L80242720: +/* C424D0 80242720 4622003C */ c.lt.d $f0, $f2 +/* C424D4 80242724 00000000 */ nop +/* C424D8 80242728 4500007E */ bc1f .L80242924 +/* C424DC 8024272C 00000000 */ nop +/* C424E0 80242730 9602008E */ lhu $v0, 0x8e($s0) +/* C424E4 80242734 24420001 */ addiu $v0, $v0, 1 +/* C424E8 80242738 A602008E */ sh $v0, 0x8e($s0) +/* C424EC 8024273C 00021400 */ sll $v0, $v0, 0x10 +/* C424F0 80242740 8E630020 */ lw $v1, 0x20($s3) +/* C424F4 80242744 00021403 */ sra $v0, $v0, 0x10 +/* C424F8 80242748 0043102A */ slt $v0, $v0, $v1 +/* C424FC 8024274C 14400026 */ bnez $v0, .L802427E8 +/* C42500 80242750 00000000 */ nop +/* C42504 80242754 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C42508 80242758 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C4250C 8024275C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C42510 80242760 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C42514 80242764 A600008E */ sh $zero, 0x8e($s0) +/* C42518 80242768 8C460028 */ lw $a2, 0x28($v0) +/* C4251C 8024276C 0C00A720 */ jal atan2 +/* C42520 80242770 8C470030 */ lw $a3, 0x30($v0) +/* C42524 80242774 46000506 */ mov.s $f20, $f0 +/* C42528 80242778 C60C000C */ lwc1 $f12, 0xc($s0) +/* C4252C 8024277C 0C00A70A */ jal get_clamped_angle_diff +/* C42530 80242780 4600A386 */ mov.s $f14, $f20 +/* C42534 80242784 46000086 */ mov.s $f2, $f0 +/* C42538 80242788 8E62001C */ lw $v0, 0x1c($s3) +/* C4253C 8024278C 46001005 */ abs.s $f0, $f2 +/* C42540 80242790 44822000 */ mtc1 $v0, $f4 +/* C42544 80242794 00000000 */ nop +/* C42548 80242798 46802120 */ cvt.s.w $f4, $f4 +/* C4254C 8024279C 4600203C */ c.lt.s $f4, $f0 +/* C42550 802427A0 00000000 */ nop +/* C42554 802427A4 4500000D */ bc1f .L802427DC +/* C42558 802427A8 00000000 */ nop +/* C4255C 802427AC 44800000 */ mtc1 $zero, $f0 +/* C42560 802427B0 C614000C */ lwc1 $f20, 0xc($s0) +/* C42564 802427B4 4600103C */ c.lt.s $f2, $f0 +/* C42568 802427B8 00000000 */ nop +/* C4256C 802427BC 45000006 */ bc1f .L802427D8 +/* C42570 802427C0 00021023 */ negu $v0, $v0 +/* C42574 802427C4 44820000 */ mtc1 $v0, $f0 +/* C42578 802427C8 00000000 */ nop +/* C4257C 802427CC 46800020 */ cvt.s.w $f0, $f0 +/* C42580 802427D0 080909F7 */ j .L802427DC +/* C42584 802427D4 4600A500 */ add.s $f20, $f20, $f0 +.L802427D8: +/* C42588 802427D8 4604A500 */ add.s $f20, $f20, $f4 +.L802427DC: +/* C4258C 802427DC 0C00A6C9 */ jal clamp_angle +/* C42590 802427E0 4600A306 */ mov.s $f12, $f20 +/* C42594 802427E4 E600000C */ swc1 $f0, 0xc($s0) +.L802427E8: +/* C42598 802427E8 8E020000 */ lw $v0, ($s0) +/* C4259C 802427EC 30420008 */ andi $v0, $v0, 8 +/* C425A0 802427F0 1040000A */ beqz $v0, .L8024281C +/* C425A4 802427F4 27A50018 */ addiu $a1, $sp, 0x18 +/* C425A8 802427F8 C602003C */ lwc1 $f2, 0x3c($s0) +/* C425AC 802427FC C600001C */ lwc1 $f0, 0x1c($s0) +/* C425B0 80242800 46001080 */ add.s $f2, $f2, $f0 +/* C425B4 80242804 4616103C */ c.lt.s $f2, $f22 +/* C425B8 80242808 00000000 */ nop +/* C425BC 8024280C 45020045 */ bc1fl .L80242924 +/* C425C0 80242810 E602003C */ swc1 $f2, 0x3c($s0) +/* C425C4 80242814 08090A48 */ j .L80242920 +/* C425C8 80242818 E616003C */ swc1 $f22, 0x3c($s0) +.L8024281C: +/* C425CC 8024281C C6000038 */ lwc1 $f0, 0x38($s0) +/* C425D0 80242820 27A6001C */ addiu $a2, $sp, 0x1c +/* C425D4 80242824 E7A00018 */ swc1 $f0, 0x18($sp) +/* C425D8 80242828 860200A8 */ lh $v0, 0xa8($s0) +/* C425DC 8024282C C600001C */ lwc1 $f0, 0x1c($s0) +/* C425E0 80242830 C604003C */ lwc1 $f4, 0x3c($s0) +/* C425E4 80242834 44821000 */ mtc1 $v0, $f2 +/* C425E8 80242838 00000000 */ nop +/* C425EC 8024283C 468010A0 */ cvt.s.w $f2, $f2 +/* C425F0 80242840 46000005 */ abs.s $f0, $f0 +/* C425F4 80242844 46020000 */ add.s $f0, $f0, $f2 +/* C425F8 80242848 C6060040 */ lwc1 $f6, 0x40($s0) +/* C425FC 8024284C 27A20024 */ addiu $v0, $sp, 0x24 +/* C42600 80242850 46022100 */ add.s $f4, $f4, $f2 +/* C42604 80242854 3C014024 */ lui $at, 0x4024 +/* C42608 80242858 44811800 */ mtc1 $at, $f3 +/* C4260C 8024285C 44801000 */ mtc1 $zero, $f2 +/* C42610 80242860 46000021 */ cvt.d.s $f0, $f0 +/* C42614 80242864 46220000 */ add.d $f0, $f0, $f2 +/* C42618 80242868 E7A60020 */ swc1 $f6, 0x20($sp) +/* C4261C 8024286C E7A4001C */ swc1 $f4, 0x1c($sp) +/* C42620 80242870 46200020 */ cvt.s.d $f0, $f0 +/* C42624 80242874 E7A00024 */ swc1 $f0, 0x24($sp) +/* C42628 80242878 AFA20010 */ sw $v0, 0x10($sp) +/* C4262C 8024287C 8E040080 */ lw $a0, 0x80($s0) +/* C42630 80242880 0C0372DF */ jal func_800DCB7C +/* C42634 80242884 27A70020 */ addiu $a3, $sp, 0x20 +/* C42638 80242888 10400015 */ beqz $v0, .L802428E0 +/* C4263C 8024288C 00000000 */ nop +/* C42640 80242890 860200A8 */ lh $v0, 0xa8($s0) +/* C42644 80242894 C604001C */ lwc1 $f4, 0x1c($s0) +/* C42648 80242898 44820000 */ mtc1 $v0, $f0 +/* C4264C 8024289C 00000000 */ nop +/* C42650 802428A0 46800020 */ cvt.s.w $f0, $f0 +/* C42654 802428A4 46002085 */ abs.s $f2, $f4 +/* C42658 802428A8 46020000 */ add.s $f0, $f0, $f2 +/* C4265C 802428AC C7A20024 */ lwc1 $f2, 0x24($sp) +/* C42660 802428B0 4600103E */ c.le.s $f2, $f0 +/* C42664 802428B4 00000000 */ nop +/* C42668 802428B8 45000005 */ bc1f .L802428D0 +/* C4266C 802428BC 00000000 */ nop +/* C42670 802428C0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* C42674 802428C4 AE00001C */ sw $zero, 0x1c($s0) +/* C42678 802428C8 08090A49 */ j .L80242924 +/* C4267C 802428CC E600003C */ swc1 $f0, 0x3c($s0) +.L802428D0: +/* C42680 802428D0 C600003C */ lwc1 $f0, 0x3c($s0) +/* C42684 802428D4 46040000 */ add.s $f0, $f0, $f4 +/* C42688 802428D8 08090A49 */ j .L80242924 +/* C4268C 802428DC E600003C */ swc1 $f0, 0x3c($s0) +.L802428E0: +/* C42690 802428E0 C606003C */ lwc1 $f6, 0x3c($s0) +/* C42694 802428E4 860200A8 */ lh $v0, 0xa8($s0) +/* C42698 802428E8 46163081 */ sub.s $f2, $f6, $f22 +/* C4269C 802428EC 44820000 */ mtc1 $v0, $f0 +/* C426A0 802428F0 00000000 */ nop +/* C426A4 802428F4 46800020 */ cvt.s.w $f0, $f0 +/* C426A8 802428F8 46001080 */ add.s $f2, $f2, $f0 +/* C426AC 802428FC C604001C */ lwc1 $f4, 0x1c($s0) +/* C426B0 80242900 46002005 */ abs.s $f0, $f4 +/* C426B4 80242904 4602003C */ c.lt.s $f0, $f2 +/* C426B8 80242908 00000000 */ nop +/* C426BC 8024290C 45020005 */ bc1fl .L80242924 +/* C426C0 80242910 AE00001C */ sw $zero, 0x1c($s0) +/* C426C4 80242914 46043000 */ add.s $f0, $f6, $f4 +/* C426C8 80242918 08090A49 */ j .L80242924 +/* C426CC 8024291C E600003C */ swc1 $f0, 0x3c($s0) +.L80242920: +/* C426D0 80242920 AE00001C */ sw $zero, 0x1c($s0) +.L80242924: +/* C426D4 80242924 8FBF0038 */ lw $ra, 0x38($sp) +/* C426D8 80242928 8FB30034 */ lw $s3, 0x34($sp) +/* C426DC 8024292C 8FB20030 */ lw $s2, 0x30($sp) +/* C426E0 80242930 8FB1002C */ lw $s1, 0x2c($sp) +/* C426E4 80242934 8FB00028 */ lw $s0, 0x28($sp) +/* C426E8 80242938 D7B60048 */ ldc1 $f22, 0x48($sp) +/* C426EC 8024293C D7B40040 */ ldc1 $f20, 0x40($sp) +/* C426F0 80242940 03E00008 */ jr $ra +/* C426F4 80242944 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948.s deleted file mode 100644 index e279179135..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242948 -/* C426F8 80242948 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C426FC 8024294C AFB00028 */ sw $s0, 0x28($sp) -/* C42700 80242950 00A0802D */ daddu $s0, $a1, $zero -/* C42704 80242954 AFB1002C */ sw $s1, 0x2c($sp) -/* C42708 80242958 00C0882D */ daddu $s1, $a2, $zero -/* C4270C 8024295C AFBF0034 */ sw $ra, 0x34($sp) -/* C42710 80242960 AFB20030 */ sw $s2, 0x30($sp) -/* C42714 80242964 AE200070 */ sw $zero, 0x70($s1) -/* C42718 80242968 8C830000 */ lw $v1, ($a0) -/* C4271C 8024296C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C42720 80242970 A480008E */ sh $zero, 0x8e($a0) -/* C42724 80242974 00621824 */ and $v1, $v1, $v0 -/* C42728 80242978 34650800 */ ori $a1, $v1, 0x800 -/* C4272C 8024297C AC850000 */ sw $a1, ($a0) -/* C42730 80242980 8E0200D0 */ lw $v0, 0xd0($s0) -/* C42734 80242984 8C420034 */ lw $v0, 0x34($v0) -/* C42738 80242988 10400003 */ beqz $v0, .L80242998 -/* C4273C 8024298C 00E0902D */ daddu $s2, $a3, $zero -/* C42740 80242990 08090A68 */ j .L802429A0 -/* C42744 80242994 34620808 */ ori $v0, $v1, 0x808 -.L80242998: -/* C42748 80242998 2402FFF7 */ addiu $v0, $zero, -9 -/* C4274C 8024299C 00A21024 */ and $v0, $a1, $v0 -.L802429A0: -/* C42750 802429A0 AC820000 */ sw $v0, ($a0) -/* C42754 802429A4 27A20024 */ addiu $v0, $sp, 0x24 -/* C42758 802429A8 27A50018 */ addiu $a1, $sp, 0x18 -/* C4275C 802429AC C4800038 */ lwc1 $f0, 0x38($a0) -/* C42760 802429B0 C482003C */ lwc1 $f2, 0x3c($a0) -/* C42764 802429B4 C4840040 */ lwc1 $f4, 0x40($a0) -/* C42768 802429B8 3C01447A */ lui $at, 0x447a -/* C4276C 802429BC 44813000 */ mtc1 $at, $f6 -/* C42770 802429C0 27A6001C */ addiu $a2, $sp, 0x1c -/* C42774 802429C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C42778 802429C8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C4277C 802429CC E7A40020 */ swc1 $f4, 0x20($sp) -/* C42780 802429D0 E7A60024 */ swc1 $f6, 0x24($sp) -/* C42784 802429D4 AFA20010 */ sw $v0, 0x10($sp) -/* C42788 802429D8 8C840080 */ lw $a0, 0x80($a0) -/* C4278C 802429DC 0C0372DF */ jal func_800DCB7C -/* C42790 802429E0 27A70020 */ addiu $a3, $sp, 0x20 -/* C42794 802429E4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C42798 802429E8 3C014059 */ lui $at, 0x4059 -/* C4279C 802429EC 44812800 */ mtc1 $at, $f5 -/* C427A0 802429F0 44802000 */ mtc1 $zero, $f4 -/* C427A4 802429F4 460010A1 */ cvt.d.s $f2, $f2 -/* C427A8 802429F8 46241082 */ mul.d $f2, $f2, $f4 -/* C427AC 802429FC 00000000 */ nop -/* C427B0 80242A00 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C427B4 80242A04 46000021 */ cvt.d.s $f0, $f0 -/* C427B8 80242A08 46240002 */ mul.d $f0, $f0, $f4 -/* C427BC 80242A0C 00000000 */ nop -/* C427C0 80242A10 3C013FE0 */ lui $at, 0x3fe0 -/* C427C4 80242A14 44812800 */ mtc1 $at, $f5 -/* C427C8 80242A18 44802000 */ mtc1 $zero, $f4 -/* C427CC 80242A1C 00000000 */ nop -/* C427D0 80242A20 46241080 */ add.d $f2, $f2, $f4 -/* C427D4 80242A24 AE000074 */ sw $zero, 0x74($s0) -/* C427D8 80242A28 46240000 */ add.d $f0, $f0, $f4 -/* C427DC 80242A2C AE000090 */ sw $zero, 0x90($s0) -/* C427E0 80242A30 4620120D */ trunc.w.d $f8, $f2 -/* C427E4 80242A34 E6080078 */ swc1 $f8, 0x78($s0) -/* C427E8 80242A38 4620020D */ trunc.w.d $f8, $f0 -/* C427EC 80242A3C E6080088 */ swc1 $f8, 0x88($s0) -/* C427F0 80242A40 8E420014 */ lw $v0, 0x14($s2) -/* C427F4 80242A44 AE220074 */ sw $v0, 0x74($s1) -/* C427F8 80242A48 8E0200B0 */ lw $v0, 0xb0($s0) -/* C427FC 80242A4C 34420010 */ ori $v0, $v0, 0x10 -/* C42800 80242A50 AE0200B0 */ sw $v0, 0xb0($s0) -/* C42804 80242A54 8FBF0034 */ lw $ra, 0x34($sp) -/* C42808 80242A58 8FB20030 */ lw $s2, 0x30($sp) -/* C4280C 80242A5C 8FB1002C */ lw $s1, 0x2c($sp) -/* C42810 80242A60 8FB00028 */ lw $s0, 0x28($sp) -/* C42814 80242A64 03E00008 */ jr $ra -/* C42818 80242A68 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s new file mode 100644 index 0000000000..3bb4ce226f --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242948_C426F8.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242948_C426F8 +/* C426F8 80242948 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* C426FC 8024294C AFB00028 */ sw $s0, 0x28($sp) +/* C42700 80242950 00A0802D */ daddu $s0, $a1, $zero +/* C42704 80242954 AFB1002C */ sw $s1, 0x2c($sp) +/* C42708 80242958 00C0882D */ daddu $s1, $a2, $zero +/* C4270C 8024295C AFBF0034 */ sw $ra, 0x34($sp) +/* C42710 80242960 AFB20030 */ sw $s2, 0x30($sp) +/* C42714 80242964 AE200070 */ sw $zero, 0x70($s1) +/* C42718 80242968 8C830000 */ lw $v1, ($a0) +/* C4271C 8024296C 2402FDFF */ addiu $v0, $zero, -0x201 +/* C42720 80242970 A480008E */ sh $zero, 0x8e($a0) +/* C42724 80242974 00621824 */ and $v1, $v1, $v0 +/* C42728 80242978 34650800 */ ori $a1, $v1, 0x800 +/* C4272C 8024297C AC850000 */ sw $a1, ($a0) +/* C42730 80242980 8E0200D0 */ lw $v0, 0xd0($s0) +/* C42734 80242984 8C420034 */ lw $v0, 0x34($v0) +/* C42738 80242988 10400003 */ beqz $v0, .L80242998 +/* C4273C 8024298C 00E0902D */ daddu $s2, $a3, $zero +/* C42740 80242990 08090A68 */ j .L802429A0 +/* C42744 80242994 34620808 */ ori $v0, $v1, 0x808 +.L80242998: +/* C42748 80242998 2402FFF7 */ addiu $v0, $zero, -9 +/* C4274C 8024299C 00A21024 */ and $v0, $a1, $v0 +.L802429A0: +/* C42750 802429A0 AC820000 */ sw $v0, ($a0) +/* C42754 802429A4 27A20024 */ addiu $v0, $sp, 0x24 +/* C42758 802429A8 27A50018 */ addiu $a1, $sp, 0x18 +/* C4275C 802429AC C4800038 */ lwc1 $f0, 0x38($a0) +/* C42760 802429B0 C482003C */ lwc1 $f2, 0x3c($a0) +/* C42764 802429B4 C4840040 */ lwc1 $f4, 0x40($a0) +/* C42768 802429B8 3C01447A */ lui $at, 0x447a +/* C4276C 802429BC 44813000 */ mtc1 $at, $f6 +/* C42770 802429C0 27A6001C */ addiu $a2, $sp, 0x1c +/* C42774 802429C4 E7A00018 */ swc1 $f0, 0x18($sp) +/* C42778 802429C8 E7A2001C */ swc1 $f2, 0x1c($sp) +/* C4277C 802429CC E7A40020 */ swc1 $f4, 0x20($sp) +/* C42780 802429D0 E7A60024 */ swc1 $f6, 0x24($sp) +/* C42784 802429D4 AFA20010 */ sw $v0, 0x10($sp) +/* C42788 802429D8 8C840080 */ lw $a0, 0x80($a0) +/* C4278C 802429DC 0C0372DF */ jal func_800DCB7C +/* C42790 802429E0 27A70020 */ addiu $a3, $sp, 0x20 +/* C42794 802429E4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* C42798 802429E8 3C014059 */ lui $at, 0x4059 +/* C4279C 802429EC 44812800 */ mtc1 $at, $f5 +/* C427A0 802429F0 44802000 */ mtc1 $zero, $f4 +/* C427A4 802429F4 460010A1 */ cvt.d.s $f2, $f2 +/* C427A8 802429F8 46241082 */ mul.d $f2, $f2, $f4 +/* C427AC 802429FC 00000000 */ nop +/* C427B0 80242A00 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* C427B4 80242A04 46000021 */ cvt.d.s $f0, $f0 +/* C427B8 80242A08 46240002 */ mul.d $f0, $f0, $f4 +/* C427BC 80242A0C 00000000 */ nop +/* C427C0 80242A10 3C013FE0 */ lui $at, 0x3fe0 +/* C427C4 80242A14 44812800 */ mtc1 $at, $f5 +/* C427C8 80242A18 44802000 */ mtc1 $zero, $f4 +/* C427CC 80242A1C 00000000 */ nop +/* C427D0 80242A20 46241080 */ add.d $f2, $f2, $f4 +/* C427D4 80242A24 AE000074 */ sw $zero, 0x74($s0) +/* C427D8 80242A28 46240000 */ add.d $f0, $f0, $f4 +/* C427DC 80242A2C AE000090 */ sw $zero, 0x90($s0) +/* C427E0 80242A30 4620120D */ trunc.w.d $f8, $f2 +/* C427E4 80242A34 E6080078 */ swc1 $f8, 0x78($s0) +/* C427E8 80242A38 4620020D */ trunc.w.d $f8, $f0 +/* C427EC 80242A3C E6080088 */ swc1 $f8, 0x88($s0) +/* C427F0 80242A40 8E420014 */ lw $v0, 0x14($s2) +/* C427F4 80242A44 AE220074 */ sw $v0, 0x74($s1) +/* C427F8 80242A48 8E0200B0 */ lw $v0, 0xb0($s0) +/* C427FC 80242A4C 34420010 */ ori $v0, $v0, 0x10 +/* C42800 80242A50 AE0200B0 */ sw $v0, 0xb0($s0) +/* C42804 80242A54 8FBF0034 */ lw $ra, 0x34($sp) +/* C42808 80242A58 8FB20030 */ lw $s2, 0x30($sp) +/* C4280C 80242A5C 8FB1002C */ lw $s1, 0x2c($sp) +/* C42810 80242A60 8FB00028 */ lw $s0, 0x28($sp) +/* C42814 80242A64 03E00008 */ jr $ra +/* C42818 80242A68 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s index e0fd41130d..567f46d189 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242A6C_C4281C.s @@ -46,7 +46,7 @@ glabel func_80242A6C_C4281C /* C428C0 80242B10 02A0202D */ daddu $a0, $s5, $zero /* C428C4 80242B14 0240282D */ daddu $a1, $s2, $zero /* C428C8 80242B18 0280302D */ daddu $a2, $s4, $zero -/* C428CC 80242B1C 0C090A52 */ jal func_80242948 +/* C428CC 80242B1C 0C090A52 */ jal func_80242948_C426F8 /* C428D0 80242B20 0200382D */ daddu $a3, $s0, $zero .L80242B24: /* C428D4 80242B24 2402FFFE */ addiu $v0, $zero, -2 @@ -73,27 +73,27 @@ glabel func_80242A6C_C4281C /* C42924 80242B74 00000000 */ nop /* C42928 80242B78 0280202D */ daddu $a0, $s4, $zero /* C4292C 80242B7C 0200282D */ daddu $a1, $s0, $zero -/* C42930 80242B80 0C0905D8 */ jal func_80241760 +/* C42930 80242B80 0C0905D8 */ jal func_80241760_C41510 /* C42934 80242B84 0260302D */ daddu $a2, $s3, $zero /* C42938 80242B88 0280202D */ daddu $a0, $s4, $zero /* C4293C 80242B8C 0200282D */ daddu $a1, $s0, $zero -/* C42940 80242B90 0C090644 */ jal func_80241910 +/* C42940 80242B90 0C090644 */ jal func_80241910_C416C0 /* C42944 80242B94 0260302D */ daddu $a2, $s3, $zero /* C42948 80242B98 08090B0D */ j .L80242C34 /* C4294C 80242B9C 0000102D */ daddu $v0, $zero, $zero /* C42950 80242BA0 0280202D */ daddu $a0, $s4, $zero /* C42954 80242BA4 0200282D */ daddu $a1, $s0, $zero -/* C42958 80242BA8 0C0907CE */ jal func_80241F38 +/* C42958 80242BA8 0C0907CE */ jal func_80241F38_C41CE8 /* C4295C 80242BAC 0260302D */ daddu $a2, $s3, $zero /* C42960 80242BB0 0280202D */ daddu $a0, $s4, $zero /* C42964 80242BB4 0200282D */ daddu $a1, $s0, $zero -/* C42968 80242BB8 0C0907FE */ jal func_80241FF8 +/* C42968 80242BB8 0C0907FE */ jal func_80241FF8_C41DA8 /* C4296C 80242BBC 0260302D */ daddu $a2, $s3, $zero /* C42970 80242BC0 08090B0D */ j .L80242C34 /* C42974 80242BC4 0000102D */ daddu $v0, $zero, $zero /* C42978 80242BC8 0280202D */ daddu $a0, $s4, $zero /* C4297C 80242BCC 0200282D */ daddu $a1, $s0, $zero -/* C42980 80242BD0 0C0908CF */ jal func_8024233C +/* C42980 80242BD0 0C0908CF */ jal func_8024233C_C420EC /* C42984 80242BD4 0260302D */ daddu $a2, $s3, $zero /* C42988 80242BD8 0280202D */ daddu $a0, $s4, $zero /* C4298C 80242BDC 0200282D */ daddu $a1, $s0, $zero @@ -103,19 +103,19 @@ glabel func_80242A6C_C4281C /* C4299C 80242BEC 0000102D */ daddu $v0, $zero, $zero /* C429A0 80242BF0 0280202D */ daddu $a0, $s4, $zero /* C429A4 80242BF4 0200282D */ daddu $a1, $s0, $zero -/* C429A8 80242BF8 0C090908 */ jal func_80242420 +/* C429A8 80242BF8 0C090908 */ jal func_80242420_C421D0 /* C429AC 80242BFC 0260302D */ daddu $a2, $s3, $zero /* C429B0 80242C00 08090B0D */ j .L80242C34 /* C429B4 80242C04 0000102D */ daddu $v0, $zero, $zero /* C429B8 80242C08 0280202D */ daddu $a0, $s4, $zero /* C429BC 80242C0C 0200282D */ daddu $a1, $s0, $zero -/* C429C0 80242C10 0C090955 */ jal func_80242554 +/* C429C0 80242C10 0C090955 */ jal func_80242554_C42304 /* C429C4 80242C14 0260302D */ daddu $a2, $s3, $zero /* C429C8 80242C18 08090B0D */ j .L80242C34 /* C429CC 80242C1C 0000102D */ daddu $v0, $zero, $zero /* C429D0 80242C20 0280202D */ daddu $a0, $s4, $zero /* C429D4 80242C24 0200282D */ daddu $a1, $s0, $zero -/* C429D8 80242C28 0C09096E */ jal func_802425B8 +/* C429D8 80242C28 0C09096E */ jal func_802425B8_C42368 /* C429DC 80242C2C 0260302D */ daddu $a2, $s3, $zero .L80242C30: /* C429E0 80242C30 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58.s deleted file mode 100644 index 2e0d02090b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C58 -/* C42A08 80242C58 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C42A0C 80242C5C AFB3001C */ sw $s3, 0x1c($sp) -/* C42A10 80242C60 0080982D */ daddu $s3, $a0, $zero -/* C42A14 80242C64 AFBF0020 */ sw $ra, 0x20($sp) -/* C42A18 80242C68 AFB20018 */ sw $s2, 0x18($sp) -/* C42A1C 80242C6C AFB10014 */ sw $s1, 0x14($sp) -/* C42A20 80242C70 AFB00010 */ sw $s0, 0x10($sp) -/* C42A24 80242C74 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C42A28 80242C78 8E720148 */ lw $s2, 0x148($s3) -/* C42A2C 80242C7C 86440008 */ lh $a0, 8($s2) -/* C42A30 80242C80 0C00EABB */ jal get_npc_unsafe -/* C42A34 80242C84 00A0882D */ daddu $s1, $a1, $zero -/* C42A38 80242C88 0040802D */ daddu $s0, $v0, $zero -/* C42A3C 80242C8C 9602008E */ lhu $v0, 0x8e($s0) -/* C42A40 80242C90 2442FFFF */ addiu $v0, $v0, -1 -/* C42A44 80242C94 A602008E */ sh $v0, 0x8e($s0) -/* C42A48 80242C98 00021400 */ sll $v0, $v0, 0x10 -/* C42A4C 80242C9C 1C40003C */ bgtz $v0, .L80242D90 -/* C42A50 80242CA0 3C03FFDF */ lui $v1, 0xffdf -/* C42A54 80242CA4 8E020000 */ lw $v0, ($s0) -/* C42A58 80242CA8 3463FFFF */ ori $v1, $v1, 0xffff -/* C42A5C 80242CAC 00431024 */ and $v0, $v0, $v1 -/* C42A60 80242CB0 AE020000 */ sw $v0, ($s0) -/* C42A64 80242CB4 8E240020 */ lw $a0, 0x20($s1) -/* C42A68 80242CB8 000417C2 */ srl $v0, $a0, 0x1f -/* C42A6C 80242CBC 00822021 */ addu $a0, $a0, $v0 -/* C42A70 80242CC0 00042043 */ sra $a0, $a0, 1 -/* C42A74 80242CC4 0C00A67F */ jal rand_int -/* C42A78 80242CC8 24840001 */ addiu $a0, $a0, 1 -/* C42A7C 80242CCC 8E230020 */ lw $v1, 0x20($s1) -/* C42A80 80242CD0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C42A84 80242CD4 000327C2 */ srl $a0, $v1, 0x1f -/* C42A88 80242CD8 00641821 */ addu $v1, $v1, $a0 -/* C42A8C 80242CDC 00031843 */ sra $v1, $v1, 1 -/* C42A90 80242CE0 00621821 */ addu $v1, $v1, $v0 -/* C42A94 80242CE4 A603008E */ sh $v1, 0x8e($s0) -/* C42A98 80242CE8 8E4200CC */ lw $v0, 0xcc($s2) -/* C42A9C 80242CEC C60E0040 */ lwc1 $f14, 0x40($s0) -/* C42AA0 80242CF0 8C420020 */ lw $v0, 0x20($v0) -/* C42AA4 80242CF4 AE020028 */ sw $v0, 0x28($s0) -/* C42AA8 80242CF8 C6200018 */ lwc1 $f0, 0x18($s1) -/* C42AAC 80242CFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42AB0 80242D00 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C42AB4 80242D04 E6000018 */ swc1 $f0, 0x18($s0) -/* C42AB8 80242D08 8C460028 */ lw $a2, 0x28($v0) -/* C42ABC 80242D0C 0C00A720 */ jal atan2 -/* C42AC0 80242D10 8C470030 */ lw $a3, 0x30($v0) -/* C42AC4 80242D14 46000506 */ mov.s $f20, $f0 -/* C42AC8 80242D18 C60C000C */ lwc1 $f12, 0xc($s0) -/* C42ACC 80242D1C 0C00A70A */ jal get_clamped_angle_diff -/* C42AD0 80242D20 4600A386 */ mov.s $f14, $f20 -/* C42AD4 80242D24 46000086 */ mov.s $f2, $f0 -/* C42AD8 80242D28 8E22001C */ lw $v0, 0x1c($s1) -/* C42ADC 80242D2C 46001005 */ abs.s $f0, $f2 -/* C42AE0 80242D30 44822000 */ mtc1 $v0, $f4 -/* C42AE4 80242D34 00000000 */ nop -/* C42AE8 80242D38 46802120 */ cvt.s.w $f4, $f4 -/* C42AEC 80242D3C 4600203C */ c.lt.s $f4, $f0 -/* C42AF0 80242D40 00000000 */ nop -/* C42AF4 80242D44 4500000D */ bc1f .L80242D7C -/* C42AF8 80242D48 00000000 */ nop -/* C42AFC 80242D4C 44800000 */ mtc1 $zero, $f0 -/* C42B00 80242D50 C614000C */ lwc1 $f20, 0xc($s0) -/* C42B04 80242D54 4600103C */ c.lt.s $f2, $f0 -/* C42B08 80242D58 00000000 */ nop -/* C42B0C 80242D5C 45000006 */ bc1f .L80242D78 -/* C42B10 80242D60 00021023 */ negu $v0, $v0 -/* C42B14 80242D64 44820000 */ mtc1 $v0, $f0 -/* C42B18 80242D68 00000000 */ nop -/* C42B1C 80242D6C 46800020 */ cvt.s.w $f0, $f0 -/* C42B20 80242D70 08090B5F */ j .L80242D7C -/* C42B24 80242D74 4600A500 */ add.s $f20, $f20, $f0 -.L80242D78: -/* C42B28 80242D78 4604A500 */ add.s $f20, $f20, $f4 -.L80242D7C: -/* C42B2C 80242D7C 0C00A6C9 */ jal clamp_angle -/* C42B30 80242D80 4600A306 */ mov.s $f12, $f20 -/* C42B34 80242D84 2402000D */ addiu $v0, $zero, 0xd -/* C42B38 80242D88 E600000C */ swc1 $f0, 0xc($s0) -/* C42B3C 80242D8C AE620070 */ sw $v0, 0x70($s3) -.L80242D90: -/* C42B40 80242D90 8FBF0020 */ lw $ra, 0x20($sp) -/* C42B44 80242D94 8FB3001C */ lw $s3, 0x1c($sp) -/* C42B48 80242D98 8FB20018 */ lw $s2, 0x18($sp) -/* C42B4C 80242D9C 8FB10014 */ lw $s1, 0x14($sp) -/* C42B50 80242DA0 8FB00010 */ lw $s0, 0x10($sp) -/* C42B54 80242DA4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C42B58 80242DA8 03E00008 */ jr $ra -/* C42B5C 80242DAC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s new file mode 100644 index 0000000000..b05e61b4cb --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242C58_C42A08.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C58_C42A08 +/* C42A08 80242C58 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C42A0C 80242C5C AFB3001C */ sw $s3, 0x1c($sp) +/* C42A10 80242C60 0080982D */ daddu $s3, $a0, $zero +/* C42A14 80242C64 AFBF0020 */ sw $ra, 0x20($sp) +/* C42A18 80242C68 AFB20018 */ sw $s2, 0x18($sp) +/* C42A1C 80242C6C AFB10014 */ sw $s1, 0x14($sp) +/* C42A20 80242C70 AFB00010 */ sw $s0, 0x10($sp) +/* C42A24 80242C74 F7B40028 */ sdc1 $f20, 0x28($sp) +/* C42A28 80242C78 8E720148 */ lw $s2, 0x148($s3) +/* C42A2C 80242C7C 86440008 */ lh $a0, 8($s2) +/* C42A30 80242C80 0C00EABB */ jal get_npc_unsafe +/* C42A34 80242C84 00A0882D */ daddu $s1, $a1, $zero +/* C42A38 80242C88 0040802D */ daddu $s0, $v0, $zero +/* C42A3C 80242C8C 9602008E */ lhu $v0, 0x8e($s0) +/* C42A40 80242C90 2442FFFF */ addiu $v0, $v0, -1 +/* C42A44 80242C94 A602008E */ sh $v0, 0x8e($s0) +/* C42A48 80242C98 00021400 */ sll $v0, $v0, 0x10 +/* C42A4C 80242C9C 1C40003C */ bgtz $v0, .L80242D90 +/* C42A50 80242CA0 3C03FFDF */ lui $v1, 0xffdf +/* C42A54 80242CA4 8E020000 */ lw $v0, ($s0) +/* C42A58 80242CA8 3463FFFF */ ori $v1, $v1, 0xffff +/* C42A5C 80242CAC 00431024 */ and $v0, $v0, $v1 +/* C42A60 80242CB0 AE020000 */ sw $v0, ($s0) +/* C42A64 80242CB4 8E240020 */ lw $a0, 0x20($s1) +/* C42A68 80242CB8 000417C2 */ srl $v0, $a0, 0x1f +/* C42A6C 80242CBC 00822021 */ addu $a0, $a0, $v0 +/* C42A70 80242CC0 00042043 */ sra $a0, $a0, 1 +/* C42A74 80242CC4 0C00A67F */ jal rand_int +/* C42A78 80242CC8 24840001 */ addiu $a0, $a0, 1 +/* C42A7C 80242CCC 8E230020 */ lw $v1, 0x20($s1) +/* C42A80 80242CD0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C42A84 80242CD4 000327C2 */ srl $a0, $v1, 0x1f +/* C42A88 80242CD8 00641821 */ addu $v1, $v1, $a0 +/* C42A8C 80242CDC 00031843 */ sra $v1, $v1, 1 +/* C42A90 80242CE0 00621821 */ addu $v1, $v1, $v0 +/* C42A94 80242CE4 A603008E */ sh $v1, 0x8e($s0) +/* C42A98 80242CE8 8E4200CC */ lw $v0, 0xcc($s2) +/* C42A9C 80242CEC C60E0040 */ lwc1 $f14, 0x40($s0) +/* C42AA0 80242CF0 8C420020 */ lw $v0, 0x20($v0) +/* C42AA4 80242CF4 AE020028 */ sw $v0, 0x28($s0) +/* C42AA8 80242CF8 C6200018 */ lwc1 $f0, 0x18($s1) +/* C42AAC 80242CFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C42AB0 80242D00 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C42AB4 80242D04 E6000018 */ swc1 $f0, 0x18($s0) +/* C42AB8 80242D08 8C460028 */ lw $a2, 0x28($v0) +/* C42ABC 80242D0C 0C00A720 */ jal atan2 +/* C42AC0 80242D10 8C470030 */ lw $a3, 0x30($v0) +/* C42AC4 80242D14 46000506 */ mov.s $f20, $f0 +/* C42AC8 80242D18 C60C000C */ lwc1 $f12, 0xc($s0) +/* C42ACC 80242D1C 0C00A70A */ jal get_clamped_angle_diff +/* C42AD0 80242D20 4600A386 */ mov.s $f14, $f20 +/* C42AD4 80242D24 46000086 */ mov.s $f2, $f0 +/* C42AD8 80242D28 8E22001C */ lw $v0, 0x1c($s1) +/* C42ADC 80242D2C 46001005 */ abs.s $f0, $f2 +/* C42AE0 80242D30 44822000 */ mtc1 $v0, $f4 +/* C42AE4 80242D34 00000000 */ nop +/* C42AE8 80242D38 46802120 */ cvt.s.w $f4, $f4 +/* C42AEC 80242D3C 4600203C */ c.lt.s $f4, $f0 +/* C42AF0 80242D40 00000000 */ nop +/* C42AF4 80242D44 4500000D */ bc1f .L80242D7C +/* C42AF8 80242D48 00000000 */ nop +/* C42AFC 80242D4C 44800000 */ mtc1 $zero, $f0 +/* C42B00 80242D50 C614000C */ lwc1 $f20, 0xc($s0) +/* C42B04 80242D54 4600103C */ c.lt.s $f2, $f0 +/* C42B08 80242D58 00000000 */ nop +/* C42B0C 80242D5C 45000006 */ bc1f .L80242D78 +/* C42B10 80242D60 00021023 */ negu $v0, $v0 +/* C42B14 80242D64 44820000 */ mtc1 $v0, $f0 +/* C42B18 80242D68 00000000 */ nop +/* C42B1C 80242D6C 46800020 */ cvt.s.w $f0, $f0 +/* C42B20 80242D70 08090B5F */ j .L80242D7C +/* C42B24 80242D74 4600A500 */ add.s $f20, $f20, $f0 +.L80242D78: +/* C42B28 80242D78 4604A500 */ add.s $f20, $f20, $f4 +.L80242D7C: +/* C42B2C 80242D7C 0C00A6C9 */ jal clamp_angle +/* C42B30 80242D80 4600A306 */ mov.s $f12, $f20 +/* C42B34 80242D84 2402000D */ addiu $v0, $zero, 0xd +/* C42B38 80242D88 E600000C */ swc1 $f0, 0xc($s0) +/* C42B3C 80242D8C AE620070 */ sw $v0, 0x70($s3) +.L80242D90: +/* C42B40 80242D90 8FBF0020 */ lw $ra, 0x20($sp) +/* C42B44 80242D94 8FB3001C */ lw $s3, 0x1c($sp) +/* C42B48 80242D98 8FB20018 */ lw $s2, 0x18($sp) +/* C42B4C 80242D9C 8FB10014 */ lw $s1, 0x14($sp) +/* C42B50 80242DA0 8FB00010 */ lw $s0, 0x10($sp) +/* C42B54 80242DA4 D7B40028 */ ldc1 $f20, 0x28($sp) +/* C42B58 80242DA8 03E00008 */ jr $ra +/* C42B5C 80242DAC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0.s deleted file mode 100644 index 24890b48cb..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DB0 -/* C42B60 80242DB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C42B64 80242DB4 AFB30024 */ sw $s3, 0x24($sp) -/* C42B68 80242DB8 0080982D */ daddu $s3, $a0, $zero -/* C42B6C 80242DBC AFBF0028 */ sw $ra, 0x28($sp) -/* C42B70 80242DC0 AFB20020 */ sw $s2, 0x20($sp) -/* C42B74 80242DC4 AFB1001C */ sw $s1, 0x1c($sp) -/* C42B78 80242DC8 AFB00018 */ sw $s0, 0x18($sp) -/* C42B7C 80242DCC 8E700148 */ lw $s0, 0x148($s3) -/* C42B80 80242DD0 00A0902D */ daddu $s2, $a1, $zero -/* C42B84 80242DD4 86040008 */ lh $a0, 8($s0) -/* C42B88 80242DD8 0C00EABB */ jal get_npc_unsafe -/* C42B8C 80242DDC 00C0882D */ daddu $s1, $a2, $zero -/* C42B90 80242DE0 0220202D */ daddu $a0, $s1, $zero -/* C42B94 80242DE4 0200282D */ daddu $a1, $s0, $zero -/* C42B98 80242DE8 24030001 */ addiu $v1, $zero, 1 -/* C42B9C 80242DEC AFA30010 */ sw $v1, 0x10($sp) -/* C42BA0 80242DF0 8E460024 */ lw $a2, 0x24($s2) -/* C42BA4 80242DF4 8E470028 */ lw $a3, 0x28($s2) -/* C42BA8 80242DF8 0C01242D */ jal func_800490B4 -/* C42BAC 80242DFC 0040802D */ daddu $s0, $v0, $zero -/* C42BB0 80242E00 10400024 */ beqz $v0, .L80242E94 -/* C42BB4 80242E04 24020010 */ addiu $v0, $zero, 0x10 -/* C42BB8 80242E08 8E050018 */ lw $a1, 0x18($s0) -/* C42BBC 80242E0C 8E06000C */ lw $a2, 0xc($s0) -/* C42BC0 80242E10 0C00EA95 */ jal npc_move_heading -/* C42BC4 80242E14 0200202D */ daddu $a0, $s0, $zero -/* C42BC8 80242E18 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C42BCC 80242E1C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C42BD0 80242E20 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C42BD4 80242E24 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C42BD8 80242E28 8C460028 */ lw $a2, 0x28($v0) -/* C42BDC 80242E2C 0C00A7B5 */ jal dist2D -/* C42BE0 80242E30 8C470030 */ lw $a3, 0x30($v0) -/* C42BE4 80242E34 C6020018 */ lwc1 $f2, 0x18($s0) -/* C42BE8 80242E38 3C014004 */ lui $at, 0x4004 -/* C42BEC 80242E3C 44812800 */ mtc1 $at, $f5 -/* C42BF0 80242E40 44802000 */ mtc1 $zero, $f4 -/* C42BF4 80242E44 460010A1 */ cvt.d.s $f2, $f2 -/* C42BF8 80242E48 46241082 */ mul.d $f2, $f2, $f4 -/* C42BFC 80242E4C 00000000 */ nop -/* C42C00 80242E50 46000021 */ cvt.d.s $f0, $f0 -/* C42C04 80242E54 4622003E */ c.le.d $f0, $f2 -/* C42C08 80242E58 00000000 */ nop -/* C42C0C 80242E5C 45000003 */ bc1f .L80242E6C -/* C42C10 80242E60 2402000E */ addiu $v0, $zero, 0xe -/* C42C14 80242E64 08090BA5 */ j .L80242E94 -/* C42C18 80242E68 A600008E */ sh $zero, 0x8e($s0) -.L80242E6C: -/* C42C1C 80242E6C 9602008E */ lhu $v0, 0x8e($s0) -/* C42C20 80242E70 2442FFFF */ addiu $v0, $v0, -1 -/* C42C24 80242E74 A602008E */ sh $v0, 0x8e($s0) -/* C42C28 80242E78 00021400 */ sll $v0, $v0, 0x10 -/* C42C2C 80242E7C 1C400006 */ bgtz $v0, .L80242E98 -/* C42C30 80242E80 3C030020 */ lui $v1, 0x20 -/* C42C34 80242E84 8E020000 */ lw $v0, ($s0) -/* C42C38 80242E88 00431025 */ or $v0, $v0, $v1 -/* C42C3C 80242E8C AE020000 */ sw $v0, ($s0) -/* C42C40 80242E90 2402000C */ addiu $v0, $zero, 0xc -.L80242E94: -/* C42C44 80242E94 AE620070 */ sw $v0, 0x70($s3) -.L80242E98: -/* C42C48 80242E98 8FBF0028 */ lw $ra, 0x28($sp) -/* C42C4C 80242E9C 8FB30024 */ lw $s3, 0x24($sp) -/* C42C50 80242EA0 8FB20020 */ lw $s2, 0x20($sp) -/* C42C54 80242EA4 8FB1001C */ lw $s1, 0x1c($sp) -/* C42C58 80242EA8 8FB00018 */ lw $s0, 0x18($sp) -/* C42C5C 80242EAC 03E00008 */ jr $ra -/* C42C60 80242EB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s new file mode 100644 index 0000000000..073b33f17a --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242DB0_C42B60.s @@ -0,0 +1,72 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242DB0_C42B60 +/* C42B60 80242DB0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C42B64 80242DB4 AFB30024 */ sw $s3, 0x24($sp) +/* C42B68 80242DB8 0080982D */ daddu $s3, $a0, $zero +/* C42B6C 80242DBC AFBF0028 */ sw $ra, 0x28($sp) +/* C42B70 80242DC0 AFB20020 */ sw $s2, 0x20($sp) +/* C42B74 80242DC4 AFB1001C */ sw $s1, 0x1c($sp) +/* C42B78 80242DC8 AFB00018 */ sw $s0, 0x18($sp) +/* C42B7C 80242DCC 8E700148 */ lw $s0, 0x148($s3) +/* C42B80 80242DD0 00A0902D */ daddu $s2, $a1, $zero +/* C42B84 80242DD4 86040008 */ lh $a0, 8($s0) +/* C42B88 80242DD8 0C00EABB */ jal get_npc_unsafe +/* C42B8C 80242DDC 00C0882D */ daddu $s1, $a2, $zero +/* C42B90 80242DE0 0220202D */ daddu $a0, $s1, $zero +/* C42B94 80242DE4 0200282D */ daddu $a1, $s0, $zero +/* C42B98 80242DE8 24030001 */ addiu $v1, $zero, 1 +/* C42B9C 80242DEC AFA30010 */ sw $v1, 0x10($sp) +/* C42BA0 80242DF0 8E460024 */ lw $a2, 0x24($s2) +/* C42BA4 80242DF4 8E470028 */ lw $a3, 0x28($s2) +/* C42BA8 80242DF8 0C01242D */ jal func_800490B4 +/* C42BAC 80242DFC 0040802D */ daddu $s0, $v0, $zero +/* C42BB0 80242E00 10400024 */ beqz $v0, .L80242E94 +/* C42BB4 80242E04 24020010 */ addiu $v0, $zero, 0x10 +/* C42BB8 80242E08 8E050018 */ lw $a1, 0x18($s0) +/* C42BBC 80242E0C 8E06000C */ lw $a2, 0xc($s0) +/* C42BC0 80242E10 0C00EA95 */ jal npc_move_heading +/* C42BC4 80242E14 0200202D */ daddu $a0, $s0, $zero +/* C42BC8 80242E18 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C42BCC 80242E1C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C42BD0 80242E20 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C42BD4 80242E24 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C42BD8 80242E28 8C460028 */ lw $a2, 0x28($v0) +/* C42BDC 80242E2C 0C00A7B5 */ jal dist2D +/* C42BE0 80242E30 8C470030 */ lw $a3, 0x30($v0) +/* C42BE4 80242E34 C6020018 */ lwc1 $f2, 0x18($s0) +/* C42BE8 80242E38 3C014004 */ lui $at, 0x4004 +/* C42BEC 80242E3C 44812800 */ mtc1 $at, $f5 +/* C42BF0 80242E40 44802000 */ mtc1 $zero, $f4 +/* C42BF4 80242E44 460010A1 */ cvt.d.s $f2, $f2 +/* C42BF8 80242E48 46241082 */ mul.d $f2, $f2, $f4 +/* C42BFC 80242E4C 00000000 */ nop +/* C42C00 80242E50 46000021 */ cvt.d.s $f0, $f0 +/* C42C04 80242E54 4622003E */ c.le.d $f0, $f2 +/* C42C08 80242E58 00000000 */ nop +/* C42C0C 80242E5C 45000003 */ bc1f .L80242E6C +/* C42C10 80242E60 2402000E */ addiu $v0, $zero, 0xe +/* C42C14 80242E64 08090BA5 */ j .L80242E94 +/* C42C18 80242E68 A600008E */ sh $zero, 0x8e($s0) +.L80242E6C: +/* C42C1C 80242E6C 9602008E */ lhu $v0, 0x8e($s0) +/* C42C20 80242E70 2442FFFF */ addiu $v0, $v0, -1 +/* C42C24 80242E74 A602008E */ sh $v0, 0x8e($s0) +/* C42C28 80242E78 00021400 */ sll $v0, $v0, 0x10 +/* C42C2C 80242E7C 1C400006 */ bgtz $v0, .L80242E98 +/* C42C30 80242E80 3C030020 */ lui $v1, 0x20 +/* C42C34 80242E84 8E020000 */ lw $v0, ($s0) +/* C42C38 80242E88 00431025 */ or $v0, $v0, $v1 +/* C42C3C 80242E8C AE020000 */ sw $v0, ($s0) +/* C42C40 80242E90 2402000C */ addiu $v0, $zero, 0xc +.L80242E94: +/* C42C44 80242E94 AE620070 */ sw $v0, 0x70($s3) +.L80242E98: +/* C42C48 80242E98 8FBF0028 */ lw $ra, 0x28($sp) +/* C42C4C 80242E9C 8FB30024 */ lw $s3, 0x24($sp) +/* C42C50 80242EA0 8FB20020 */ lw $s2, 0x20($sp) +/* C42C54 80242EA4 8FB1001C */ lw $s1, 0x1c($sp) +/* C42C58 80242EA8 8FB00018 */ lw $s0, 0x18($sp) +/* C42C5C 80242EAC 03E00008 */ jr $ra +/* C42C60 80242EB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4.s deleted file mode 100644 index cab9e70be5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EB4 -/* C42C64 80242EB4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C42C68 80242EB8 AFB30024 */ sw $s3, 0x24($sp) -/* C42C6C 80242EBC 0080982D */ daddu $s3, $a0, $zero -/* C42C70 80242EC0 AFBF0028 */ sw $ra, 0x28($sp) -/* C42C74 80242EC4 AFB20020 */ sw $s2, 0x20($sp) -/* C42C78 80242EC8 AFB1001C */ sw $s1, 0x1c($sp) -/* C42C7C 80242ECC AFB00018 */ sw $s0, 0x18($sp) -/* C42C80 80242ED0 8E720148 */ lw $s2, 0x148($s3) -/* C42C84 80242ED4 86440008 */ lh $a0, 8($s2) -/* C42C88 80242ED8 0C00EABB */ jal get_npc_unsafe -/* C42C8C 80242EDC 24100007 */ addiu $s0, $zero, 7 -/* C42C90 80242EE0 0040882D */ daddu $s1, $v0, $zero -.L80242EE4: -/* C42C94 80242EE4 822200A4 */ lb $v0, 0xa4($s1) -/* C42C98 80242EE8 52020007 */ beql $s0, $v0, .L80242F08 -/* C42C9C 80242EEC 26100001 */ addiu $s0, $s0, 1 -/* C42CA0 80242EF0 0C00FB3A */ jal get_enemy -/* C42CA4 80242EF4 0200202D */ daddu $a0, $s0, $zero -/* C42CA8 80242EF8 8C42006C */ lw $v0, 0x6c($v0) -/* C42CAC 80242EFC 30420100 */ andi $v0, $v0, 0x100 -/* C42CB0 80242F00 1440001D */ bnez $v0, .L80242F78 -/* C42CB4 80242F04 26100001 */ addiu $s0, $s0, 1 -.L80242F08: -/* C42CB8 80242F08 2A020009 */ slti $v0, $s0, 9 -/* C42CBC 80242F0C 1440FFF5 */ bnez $v0, .L80242EE4 -/* C42CC0 80242F10 00000000 */ nop -/* C42CC4 80242F14 8E42006C */ lw $v0, 0x6c($s2) -/* C42CC8 80242F18 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C42CCC 80242F1C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C42CD0 80242F20 34420100 */ ori $v0, $v0, 0x100 -/* C42CD4 80242F24 AE42006C */ sw $v0, 0x6c($s2) -/* C42CD8 80242F28 C4600028 */ lwc1 $f0, 0x28($v1) -/* C42CDC 80242F2C E6200038 */ swc1 $f0, 0x38($s1) -/* C42CE0 80242F30 C4600030 */ lwc1 $f0, 0x30($v1) -/* C42CE4 80242F34 E6200040 */ swc1 $f0, 0x40($s1) -/* C42CE8 80242F38 8E43006C */ lw $v1, 0x6c($s2) -/* C42CEC 80242F3C 30621000 */ andi $v0, $v1, 0x1000 -/* C42CF0 80242F40 14400003 */ bnez $v0, .L80242F50 -/* C42CF4 80242F44 3C048000 */ lui $a0, 0x8000 -/* C42CF8 80242F48 34621000 */ ori $v0, $v1, 0x1000 -/* C42CFC 80242F4C AE42006C */ sw $v0, 0x6c($s2) -.L80242F50: -/* C42D00 80242F50 C6200040 */ lwc1 $f0, 0x40($s1) -/* C42D04 80242F54 34840011 */ ori $a0, $a0, 0x11 -/* C42D08 80242F58 E7A00010 */ swc1 $f0, 0x10($sp) -/* C42D0C 80242F5C 8E260038 */ lw $a2, 0x38($s1) -/* C42D10 80242F60 8E27003C */ lw $a3, 0x3c($s1) -/* C42D14 80242F64 0C052757 */ jal play_sound_at_position -/* C42D18 80242F68 24050002 */ addiu $a1, $zero, 2 -/* C42D1C 80242F6C 2402000F */ addiu $v0, $zero, 0xf -/* C42D20 80242F70 A620008E */ sh $zero, 0x8e($s1) -/* C42D24 80242F74 AE620070 */ sw $v0, 0x70($s3) -.L80242F78: -/* C42D28 80242F78 8FBF0028 */ lw $ra, 0x28($sp) -/* C42D2C 80242F7C 8FB30024 */ lw $s3, 0x24($sp) -/* C42D30 80242F80 8FB20020 */ lw $s2, 0x20($sp) -/* C42D34 80242F84 8FB1001C */ lw $s1, 0x1c($sp) -/* C42D38 80242F88 8FB00018 */ lw $s0, 0x18($sp) -/* C42D3C 80242F8C 03E00008 */ jr $ra -/* C42D40 80242F90 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s new file mode 100644 index 0000000000..80cd7ee603 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80242EB4_C42C64.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242EB4_C42C64 +/* C42C64 80242EB4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C42C68 80242EB8 AFB30024 */ sw $s3, 0x24($sp) +/* C42C6C 80242EBC 0080982D */ daddu $s3, $a0, $zero +/* C42C70 80242EC0 AFBF0028 */ sw $ra, 0x28($sp) +/* C42C74 80242EC4 AFB20020 */ sw $s2, 0x20($sp) +/* C42C78 80242EC8 AFB1001C */ sw $s1, 0x1c($sp) +/* C42C7C 80242ECC AFB00018 */ sw $s0, 0x18($sp) +/* C42C80 80242ED0 8E720148 */ lw $s2, 0x148($s3) +/* C42C84 80242ED4 86440008 */ lh $a0, 8($s2) +/* C42C88 80242ED8 0C00EABB */ jal get_npc_unsafe +/* C42C8C 80242EDC 24100007 */ addiu $s0, $zero, 7 +/* C42C90 80242EE0 0040882D */ daddu $s1, $v0, $zero +.L80242EE4: +/* C42C94 80242EE4 822200A4 */ lb $v0, 0xa4($s1) +/* C42C98 80242EE8 52020007 */ beql $s0, $v0, .L80242F08 +/* C42C9C 80242EEC 26100001 */ addiu $s0, $s0, 1 +/* C42CA0 80242EF0 0C00FB3A */ jal get_enemy +/* C42CA4 80242EF4 0200202D */ daddu $a0, $s0, $zero +/* C42CA8 80242EF8 8C42006C */ lw $v0, 0x6c($v0) +/* C42CAC 80242EFC 30420100 */ andi $v0, $v0, 0x100 +/* C42CB0 80242F00 1440001D */ bnez $v0, .L80242F78 +/* C42CB4 80242F04 26100001 */ addiu $s0, $s0, 1 +.L80242F08: +/* C42CB8 80242F08 2A020009 */ slti $v0, $s0, 9 +/* C42CBC 80242F0C 1440FFF5 */ bnez $v0, .L80242EE4 +/* C42CC0 80242F10 00000000 */ nop +/* C42CC4 80242F14 8E42006C */ lw $v0, 0x6c($s2) +/* C42CC8 80242F18 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) +/* C42CCC 80242F1C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) +/* C42CD0 80242F20 34420100 */ ori $v0, $v0, 0x100 +/* C42CD4 80242F24 AE42006C */ sw $v0, 0x6c($s2) +/* C42CD8 80242F28 C4600028 */ lwc1 $f0, 0x28($v1) +/* C42CDC 80242F2C E6200038 */ swc1 $f0, 0x38($s1) +/* C42CE0 80242F30 C4600030 */ lwc1 $f0, 0x30($v1) +/* C42CE4 80242F34 E6200040 */ swc1 $f0, 0x40($s1) +/* C42CE8 80242F38 8E43006C */ lw $v1, 0x6c($s2) +/* C42CEC 80242F3C 30621000 */ andi $v0, $v1, 0x1000 +/* C42CF0 80242F40 14400003 */ bnez $v0, .L80242F50 +/* C42CF4 80242F44 3C048000 */ lui $a0, 0x8000 +/* C42CF8 80242F48 34621000 */ ori $v0, $v1, 0x1000 +/* C42CFC 80242F4C AE42006C */ sw $v0, 0x6c($s2) +.L80242F50: +/* C42D00 80242F50 C6200040 */ lwc1 $f0, 0x40($s1) +/* C42D04 80242F54 34840011 */ ori $a0, $a0, 0x11 +/* C42D08 80242F58 E7A00010 */ swc1 $f0, 0x10($sp) +/* C42D0C 80242F5C 8E260038 */ lw $a2, 0x38($s1) +/* C42D10 80242F60 8E27003C */ lw $a3, 0x3c($s1) +/* C42D14 80242F64 0C052757 */ jal play_sound_at_position +/* C42D18 80242F68 24050002 */ addiu $a1, $zero, 2 +/* C42D1C 80242F6C 2402000F */ addiu $v0, $zero, 0xf +/* C42D20 80242F70 A620008E */ sh $zero, 0x8e($s1) +/* C42D24 80242F74 AE620070 */ sw $v0, 0x70($s3) +.L80242F78: +/* C42D28 80242F78 8FBF0028 */ lw $ra, 0x28($sp) +/* C42D2C 80242F7C 8FB30024 */ lw $s3, 0x24($sp) +/* C42D30 80242F80 8FB20020 */ lw $s2, 0x20($sp) +/* C42D34 80242F84 8FB1001C */ lw $s1, 0x1c($sp) +/* C42D38 80242F88 8FB00018 */ lw $s0, 0x18($sp) +/* C42D3C 80242F8C 03E00008 */ jr $ra +/* C42D40 80242F90 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0.s deleted file mode 100644 index 24771f8507..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434B0 -/* C43260 802434B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C43264 802434B4 AFB00010 */ sw $s0, 0x10($sp) -/* C43268 802434B8 0080802D */ daddu $s0, $a0, $zero -/* C4326C 802434BC AFBF0014 */ sw $ra, 0x14($sp) -/* C43270 802434C0 8E020148 */ lw $v0, 0x148($s0) -/* C43274 802434C4 0C00EABB */ jal get_npc_unsafe -/* C43278 802434C8 84440008 */ lh $a0, 8($v0) -/* C4327C 802434CC 0040202D */ daddu $a0, $v0, $zero -/* C43280 802434D0 9482008E */ lhu $v0, 0x8e($a0) -/* C43284 802434D4 24420001 */ addiu $v0, $v0, 1 -/* C43288 802434D8 A482008E */ sh $v0, 0x8e($a0) -/* C4328C 802434DC 00021400 */ sll $v0, $v0, 0x10 -/* C43290 802434E0 00021403 */ sra $v0, $v0, 0x10 -/* C43294 802434E4 28420003 */ slti $v0, $v0, 3 -/* C43298 802434E8 1440000D */ bnez $v0, .L80243520 -/* C4329C 802434EC 24020009 */ addiu $v0, $zero, 9 -/* C432A0 802434F0 3C038011 */ lui $v1, 0x8011 -/* C432A4 802434F4 8063EBB3 */ lb $v1, -0x144d($v1) -/* C432A8 802434F8 10620003 */ beq $v1, $v0, .L80243508 -/* C432AC 802434FC 24020064 */ addiu $v0, $zero, 0x64 -/* C432B0 80243500 08090D47 */ j .L8024351C -/* C432B4 80243504 A480008E */ sh $zero, 0x8e($a0) -.L80243508: -/* C432B8 80243508 0C038069 */ jal enable_player_input -/* C432BC 8024350C 00000000 */ nop -/* C432C0 80243510 0C03BD80 */ jal func_800EF600 -/* C432C4 80243514 00000000 */ nop -/* C432C8 80243518 24020010 */ addiu $v0, $zero, 0x10 -.L8024351C: -/* C432CC 8024351C AE020070 */ sw $v0, 0x70($s0) -.L80243520: -/* C432D0 80243520 8FBF0014 */ lw $ra, 0x14($sp) -/* C432D4 80243524 8FB00010 */ lw $s0, 0x10($sp) -/* C432D8 80243528 03E00008 */ jr $ra -/* C432DC 8024352C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s new file mode 100644 index 0000000000..11ff105eac --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802434B0_C43260.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802434B0_C43260 +/* C43260 802434B0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C43264 802434B4 AFB00010 */ sw $s0, 0x10($sp) +/* C43268 802434B8 0080802D */ daddu $s0, $a0, $zero +/* C4326C 802434BC AFBF0014 */ sw $ra, 0x14($sp) +/* C43270 802434C0 8E020148 */ lw $v0, 0x148($s0) +/* C43274 802434C4 0C00EABB */ jal get_npc_unsafe +/* C43278 802434C8 84440008 */ lh $a0, 8($v0) +/* C4327C 802434CC 0040202D */ daddu $a0, $v0, $zero +/* C43280 802434D0 9482008E */ lhu $v0, 0x8e($a0) +/* C43284 802434D4 24420001 */ addiu $v0, $v0, 1 +/* C43288 802434D8 A482008E */ sh $v0, 0x8e($a0) +/* C4328C 802434DC 00021400 */ sll $v0, $v0, 0x10 +/* C43290 802434E0 00021403 */ sra $v0, $v0, 0x10 +/* C43294 802434E4 28420003 */ slti $v0, $v0, 3 +/* C43298 802434E8 1440000D */ bnez $v0, .L80243520 +/* C4329C 802434EC 24020009 */ addiu $v0, $zero, 9 +/* C432A0 802434F0 3C038011 */ lui $v1, 0x8011 +/* C432A4 802434F4 8063EBB3 */ lb $v1, -0x144d($v1) +/* C432A8 802434F8 10620003 */ beq $v1, $v0, .L80243508 +/* C432AC 802434FC 24020064 */ addiu $v0, $zero, 0x64 +/* C432B0 80243500 08090D47 */ j .L8024351C +/* C432B4 80243504 A480008E */ sh $zero, 0x8e($a0) +.L80243508: +/* C432B8 80243508 0C038069 */ jal enable_player_input +/* C432BC 8024350C 00000000 */ nop +/* C432C0 80243510 0C03BD80 */ jal func_800EF600 +/* C432C4 80243514 00000000 */ nop +/* C432C8 80243518 24020010 */ addiu $v0, $zero, 0x10 +.L8024351C: +/* C432CC 8024351C AE020070 */ sw $v0, 0x70($s0) +.L80243520: +/* C432D0 80243520 8FBF0014 */ lw $ra, 0x14($sp) +/* C432D4 80243524 8FB00010 */ lw $s0, 0x10($sp) +/* C432D8 80243528 03E00008 */ jr $ra +/* C432DC 8024352C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530.s deleted file mode 100644 index 9ca8fda081..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243530 -/* C432E0 80243530 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C432E4 80243534 AFB20018 */ sw $s2, 0x18($sp) -/* C432E8 80243538 0080902D */ daddu $s2, $a0, $zero -/* C432EC 8024353C AFBF001C */ sw $ra, 0x1c($sp) -/* C432F0 80243540 AFB10014 */ sw $s1, 0x14($sp) -/* C432F4 80243544 AFB00010 */ sw $s0, 0x10($sp) -/* C432F8 80243548 8E500148 */ lw $s0, 0x148($s2) -/* C432FC 8024354C 86040008 */ lh $a0, 8($s0) -/* C43300 80243550 0C00EABB */ jal get_npc_unsafe -/* C43304 80243554 00A0882D */ daddu $s1, $a1, $zero -/* C43308 80243558 3C05FFDF */ lui $a1, 0xffdf -/* C4330C 8024355C 8E03006C */ lw $v1, 0x6c($s0) -/* C43310 80243560 2404FEFF */ addiu $a0, $zero, -0x101 -/* C43314 80243564 00641824 */ and $v1, $v1, $a0 -/* C43318 80243568 AE03006C */ sw $v1, 0x6c($s0) -/* C4331C 8024356C 8C430000 */ lw $v1, ($v0) -/* C43320 80243570 34A5FFFF */ ori $a1, $a1, 0xffff -/* C43324 80243574 00651824 */ and $v1, $v1, $a1 -/* C43328 80243578 AC430000 */ sw $v1, ($v0) -/* C4332C 8024357C C6200000 */ lwc1 $f0, ($s1) -/* C43330 80243580 46000021 */ cvt.d.s $f0, $f0 -/* C43334 80243584 46200000 */ add.d $f0, $f0, $f0 -/* C43338 80243588 46200020 */ cvt.s.d $f0, $f0 -/* C4333C 8024358C E4400018 */ swc1 $f0, 0x18($v0) -/* C43340 80243590 AE000074 */ sw $zero, 0x74($s0) -/* C43344 80243594 C440003C */ lwc1 $f0, 0x3c($v0) -/* C43348 80243598 3C014059 */ lui $at, 0x4059 -/* C4334C 8024359C 44811800 */ mtc1 $at, $f3 -/* C43350 802435A0 44801000 */ mtc1 $zero, $f2 -/* C43354 802435A4 46000021 */ cvt.d.s $f0, $f0 -/* C43358 802435A8 46220002 */ mul.d $f0, $f0, $f2 -/* C4335C 802435AC 00000000 */ nop -/* C43360 802435B0 2402001E */ addiu $v0, $zero, 0x1e -/* C43364 802435B4 4620010D */ trunc.w.d $f4, $f0 -/* C43368 802435B8 E604007C */ swc1 $f4, 0x7c($s0) -/* C4336C 802435BC AE420074 */ sw $v0, 0x74($s2) -/* C43370 802435C0 8FBF001C */ lw $ra, 0x1c($sp) -/* C43374 802435C4 8FB20018 */ lw $s2, 0x18($sp) -/* C43378 802435C8 8FB10014 */ lw $s1, 0x14($sp) -/* C4337C 802435CC 8FB00010 */ lw $s0, 0x10($sp) -/* C43380 802435D0 03E00008 */ jr $ra -/* C43384 802435D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s new file mode 100644 index 0000000000..2ed32133b9 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243530_C432E0.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243530_C432E0 +/* C432E0 80243530 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C432E4 80243534 AFB20018 */ sw $s2, 0x18($sp) +/* C432E8 80243538 0080902D */ daddu $s2, $a0, $zero +/* C432EC 8024353C AFBF001C */ sw $ra, 0x1c($sp) +/* C432F0 80243540 AFB10014 */ sw $s1, 0x14($sp) +/* C432F4 80243544 AFB00010 */ sw $s0, 0x10($sp) +/* C432F8 80243548 8E500148 */ lw $s0, 0x148($s2) +/* C432FC 8024354C 86040008 */ lh $a0, 8($s0) +/* C43300 80243550 0C00EABB */ jal get_npc_unsafe +/* C43304 80243554 00A0882D */ daddu $s1, $a1, $zero +/* C43308 80243558 3C05FFDF */ lui $a1, 0xffdf +/* C4330C 8024355C 8E03006C */ lw $v1, 0x6c($s0) +/* C43310 80243560 2404FEFF */ addiu $a0, $zero, -0x101 +/* C43314 80243564 00641824 */ and $v1, $v1, $a0 +/* C43318 80243568 AE03006C */ sw $v1, 0x6c($s0) +/* C4331C 8024356C 8C430000 */ lw $v1, ($v0) +/* C43320 80243570 34A5FFFF */ ori $a1, $a1, 0xffff +/* C43324 80243574 00651824 */ and $v1, $v1, $a1 +/* C43328 80243578 AC430000 */ sw $v1, ($v0) +/* C4332C 8024357C C6200000 */ lwc1 $f0, ($s1) +/* C43330 80243580 46000021 */ cvt.d.s $f0, $f0 +/* C43334 80243584 46200000 */ add.d $f0, $f0, $f0 +/* C43338 80243588 46200020 */ cvt.s.d $f0, $f0 +/* C4333C 8024358C E4400018 */ swc1 $f0, 0x18($v0) +/* C43340 80243590 AE000074 */ sw $zero, 0x74($s0) +/* C43344 80243594 C440003C */ lwc1 $f0, 0x3c($v0) +/* C43348 80243598 3C014059 */ lui $at, 0x4059 +/* C4334C 8024359C 44811800 */ mtc1 $at, $f3 +/* C43350 802435A0 44801000 */ mtc1 $zero, $f2 +/* C43354 802435A4 46000021 */ cvt.d.s $f0, $f0 +/* C43358 802435A8 46220002 */ mul.d $f0, $f0, $f2 +/* C4335C 802435AC 00000000 */ nop +/* C43360 802435B0 2402001E */ addiu $v0, $zero, 0x1e +/* C43364 802435B4 4620010D */ trunc.w.d $f4, $f0 +/* C43368 802435B8 E604007C */ swc1 $f4, 0x7c($s0) +/* C4336C 802435BC AE420074 */ sw $v0, 0x74($s2) +/* C43370 802435C0 8FBF001C */ lw $ra, 0x1c($sp) +/* C43374 802435C4 8FB20018 */ lw $s2, 0x18($sp) +/* C43378 802435C8 8FB10014 */ lw $s1, 0x14($sp) +/* C4337C 802435CC 8FB00010 */ lw $s0, 0x10($sp) +/* C43380 802435D0 03E00008 */ jr $ra +/* C43384 802435D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8.s deleted file mode 100644 index 79b4006c61..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8.s +++ /dev/null @@ -1,207 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435D8 -/* C43388 802435D8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C4338C 802435DC AFB20048 */ sw $s2, 0x48($sp) -/* C43390 802435E0 0080902D */ daddu $s2, $a0, $zero -/* C43394 802435E4 AFBF0054 */ sw $ra, 0x54($sp) -/* C43398 802435E8 AFB40050 */ sw $s4, 0x50($sp) -/* C4339C 802435EC AFB3004C */ sw $s3, 0x4c($sp) -/* C433A0 802435F0 AFB10044 */ sw $s1, 0x44($sp) -/* C433A4 802435F4 AFB00040 */ sw $s0, 0x40($sp) -/* C433A8 802435F8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C433AC 802435FC F7B80068 */ sdc1 $f24, 0x68($sp) -/* C433B0 80243600 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C433B4 80243604 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C433B8 80243608 8E500148 */ lw $s0, 0x148($s2) -/* C433BC 8024360C 00A0982D */ daddu $s3, $a1, $zero -/* C433C0 80243610 86040008 */ lh $a0, 8($s0) -/* C433C4 80243614 0C00EABB */ jal get_npc_unsafe -/* C433C8 80243618 00C0A02D */ daddu $s4, $a2, $zero -/* C433CC 8024361C 0040882D */ daddu $s1, $v0, $zero -/* C433D0 80243620 C6200038 */ lwc1 $f0, 0x38($s1) -/* C433D4 80243624 C622003C */ lwc1 $f2, 0x3c($s1) -/* C433D8 80243628 C6240040 */ lwc1 $f4, 0x40($s1) -/* C433DC 8024362C 3C01447A */ lui $at, 0x447a -/* C433E0 80243630 44813000 */ mtc1 $at, $f6 -/* C433E4 80243634 C60C0074 */ lwc1 $f12, 0x74($s0) -/* C433E8 80243638 46806320 */ cvt.s.w $f12, $f12 -/* C433EC 8024363C E7A00028 */ swc1 $f0, 0x28($sp) -/* C433F0 80243640 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C433F4 80243644 E7A40030 */ swc1 $f4, 0x30($sp) -/* C433F8 80243648 E7A60034 */ swc1 $f6, 0x34($sp) -/* C433FC 8024364C C6000078 */ lwc1 $f0, 0x78($s0) -/* C43400 80243650 46800020 */ cvt.s.w $f0, $f0 -/* C43404 80243654 46000021 */ cvt.d.s $f0, $f0 -/* C43408 80243658 C6020088 */ lwc1 $f2, 0x88($s0) -/* C4340C 8024365C 468010A0 */ cvt.s.w $f2, $f2 -/* C43410 80243660 3C014059 */ lui $at, 0x4059 -/* C43414 80243664 44812800 */ mtc1 $at, $f5 -/* C43418 80243668 44802000 */ mtc1 $zero, $f4 -/* C4341C 8024366C 460010A1 */ cvt.d.s $f2, $f2 -/* C43420 80243670 46240003 */ div.d $f0, $f0, $f4 -/* C43424 80243674 462006A0 */ cvt.s.d $f26, $f0 -/* C43428 80243678 46241083 */ div.d $f2, $f2, $f4 -/* C4342C 8024367C 462010A0 */ cvt.s.d $f2, $f2 -/* C43430 80243680 C6000070 */ lwc1 $f0, 0x70($s0) -/* C43434 80243684 46800020 */ cvt.s.w $f0, $f0 -/* C43438 80243688 46000021 */ cvt.d.s $f0, $f0 -/* C4343C 8024368C 46240003 */ div.d $f0, $f0, $f4 -/* C43440 80243690 462005A0 */ cvt.s.d $f22, $f0 -/* C43444 80243694 0C00A8BB */ jal sin_deg -/* C43448 80243698 4602D600 */ add.s $f24, $f26, $f2 -/* C4344C 8024369C 27A50028 */ addiu $a1, $sp, 0x28 -/* C43450 802436A0 27A6002C */ addiu $a2, $sp, 0x2c -/* C43454 802436A4 27A70030 */ addiu $a3, $sp, 0x30 -/* C43458 802436A8 27A20034 */ addiu $v0, $sp, 0x34 -/* C4345C 802436AC AFA20010 */ sw $v0, 0x10($sp) -/* C43460 802436B0 8E240080 */ lw $a0, 0x80($s1) -/* C43464 802436B4 0C0372DF */ jal func_800DCB7C -/* C43468 802436B8 46000506 */ mov.s $f20, $f0 -/* C4346C 802436BC 10400007 */ beqz $v0, .L802436DC -/* C43470 802436C0 00000000 */ nop -/* C43474 802436C4 4616A082 */ mul.s $f2, $f20, $f22 -/* C43478 802436C8 00000000 */ nop -/* C4347C 802436CC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C43480 802436D0 461A0000 */ add.s $f0, $f0, $f26 -/* C43484 802436D4 08090DBA */ j .L802436E8 -/* C43488 802436D8 46020000 */ add.s $f0, $f0, $f2 -.L802436DC: -/* C4348C 802436DC 4616A002 */ mul.s $f0, $f20, $f22 -/* C43490 802436E0 00000000 */ nop -/* C43494 802436E4 4600C000 */ add.s $f0, $f24, $f0 -.L802436E8: -/* C43498 802436E8 E620003C */ swc1 $f0, 0x3c($s1) -/* C4349C 802436EC 8E020074 */ lw $v0, 0x74($s0) -/* C434A0 802436F0 2442000C */ addiu $v0, $v0, 0xc -/* C434A4 802436F4 44826000 */ mtc1 $v0, $f12 -/* C434A8 802436F8 00000000 */ nop -/* C434AC 802436FC 0C00A6C9 */ jal clamp_angle -/* C434B0 80243700 46806320 */ cvt.s.w $f12, $f12 -/* C434B4 80243704 4600020D */ trunc.w.s $f8, $f0 -/* C434B8 80243708 E6080074 */ swc1 $f8, 0x74($s0) -/* C434BC 8024370C 8E420074 */ lw $v0, 0x74($s2) -/* C434C0 80243710 1C400037 */ bgtz $v0, .L802437F0 -/* C434C4 80243714 2442FFFF */ addiu $v0, $v0, -1 -/* C434C8 80243718 8E620014 */ lw $v0, 0x14($s3) -/* C434CC 8024371C AE420074 */ sw $v0, 0x74($s2) -/* C434D0 80243720 C662000C */ lwc1 $f2, 0xc($s3) -/* C434D4 80243724 3C013FE0 */ lui $at, 0x3fe0 -/* C434D8 80243728 44812800 */ mtc1 $at, $f5 -/* C434DC 8024372C 44802000 */ mtc1 $zero, $f4 -/* C434E0 80243730 460010A1 */ cvt.d.s $f2, $f2 -/* C434E4 80243734 46241082 */ mul.d $f2, $f2, $f4 -/* C434E8 80243738 00000000 */ nop -/* C434EC 8024373C C6600010 */ lwc1 $f0, 0x10($s3) -/* C434F0 80243740 46000021 */ cvt.d.s $f0, $f0 -/* C434F4 80243744 46240002 */ mul.d $f0, $f0, $f4 -/* C434F8 80243748 00000000 */ nop -/* C434FC 8024374C 0280202D */ daddu $a0, $s4, $zero -/* C43500 80243750 462010A0 */ cvt.s.d $f2, $f2 -/* C43504 80243754 46200020 */ cvt.s.d $f0, $f0 -/* C43508 80243758 44061000 */ mfc1 $a2, $f2 -/* C4350C 8024375C 44070000 */ mfc1 $a3, $f0 -/* C43510 80243760 0200282D */ daddu $a1, $s0, $zero -/* C43514 80243764 0C01242D */ jal func_800490B4 -/* C43518 80243768 AFA00010 */ sw $zero, 0x10($sp) -/* C4351C 8024376C 1040001E */ beqz $v0, .L802437E8 -/* C43520 80243770 0000202D */ daddu $a0, $zero, $zero -/* C43524 80243774 0220282D */ daddu $a1, $s1, $zero -/* C43528 80243778 0000302D */ daddu $a2, $zero, $zero -/* C4352C 8024377C 2410000C */ addiu $s0, $zero, 0xc -/* C43530 80243780 862300A8 */ lh $v1, 0xa8($s1) -/* C43534 80243784 3C013F80 */ lui $at, 0x3f80 -/* C43538 80243788 44810000 */ mtc1 $at, $f0 -/* C4353C 8024378C 3C014000 */ lui $at, 0x4000 -/* C43540 80243790 44811000 */ mtc1 $at, $f2 -/* C43544 80243794 3C01C1A0 */ lui $at, 0xc1a0 -/* C43548 80243798 44812000 */ mtc1 $at, $f4 -/* C4354C 8024379C 44834000 */ mtc1 $v1, $f8 -/* C43550 802437A0 00000000 */ nop -/* C43554 802437A4 46804220 */ cvt.s.w $f8, $f8 -/* C43558 802437A8 44074000 */ mfc1 $a3, $f8 -/* C4355C 802437AC 27A20038 */ addiu $v0, $sp, 0x38 -/* C43560 802437B0 AFB0001C */ sw $s0, 0x1c($sp) -/* C43564 802437B4 AFA20020 */ sw $v0, 0x20($sp) -/* C43568 802437B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4356C 802437BC E7A20014 */ swc1 $f2, 0x14($sp) -/* C43570 802437C0 0C01BFA4 */ jal fx_emote -/* C43574 802437C4 E7A40018 */ swc1 $f4, 0x18($sp) -/* C43578 802437C8 0220202D */ daddu $a0, $s1, $zero -/* C4357C 802437CC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C43580 802437D0 0C012530 */ jal func_800494C0 -/* C43584 802437D4 3C060020 */ lui $a2, 0x20 -/* C43588 802437D8 C620003C */ lwc1 $f0, 0x3c($s1) -/* C4358C 802437DC E6200064 */ swc1 $f0, 0x64($s1) -/* C43590 802437E0 08090E30 */ j .L802438C0 -/* C43594 802437E4 AE500070 */ sw $s0, 0x70($s2) -.L802437E8: -/* C43598 802437E8 8E420074 */ lw $v0, 0x74($s2) -/* C4359C 802437EC 2442FFFF */ addiu $v0, $v0, -1 -.L802437F0: -/* C435A0 802437F0 AE420074 */ sw $v0, 0x74($s2) -/* C435A4 802437F4 8622008C */ lh $v0, 0x8c($s1) -/* C435A8 802437F8 14400031 */ bnez $v0, .L802438C0 -/* C435AC 802437FC 00000000 */ nop -/* C435B0 80243800 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C435B4 80243804 8E0200D0 */ lw $v0, 0xd0($s0) -/* C435B8 80243808 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C435BC 8024380C C4480000 */ lwc1 $f8, ($v0) -/* C435C0 80243810 46804220 */ cvt.s.w $f8, $f8 -/* C435C4 80243814 44064000 */ mfc1 $a2, $f8 -/* C435C8 80243818 C4480008 */ lwc1 $f8, 8($v0) -/* C435CC 8024381C 46804220 */ cvt.s.w $f8, $f8 -/* C435D0 80243820 44074000 */ mfc1 $a3, $f8 -/* C435D4 80243824 0C00A720 */ jal atan2 -/* C435D8 80243828 00000000 */ nop -/* C435DC 8024382C 8E250018 */ lw $a1, 0x18($s1) -/* C435E0 80243830 44060000 */ mfc1 $a2, $f0 -/* C435E4 80243834 0220202D */ daddu $a0, $s1, $zero -/* C435E8 80243838 0C00EA95 */ jal npc_move_heading -/* C435EC 8024383C AE26000C */ sw $a2, 0xc($s1) -/* C435F0 80243840 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C435F4 80243844 8E0200D0 */ lw $v0, 0xd0($s0) -/* C435F8 80243848 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C435FC 8024384C C4480000 */ lwc1 $f8, ($v0) -/* C43600 80243850 46804220 */ cvt.s.w $f8, $f8 -/* C43604 80243854 44064000 */ mfc1 $a2, $f8 -/* C43608 80243858 C4480008 */ lwc1 $f8, 8($v0) -/* C4360C 8024385C 46804220 */ cvt.s.w $f8, $f8 -/* C43610 80243860 44074000 */ mfc1 $a3, $f8 -/* C43614 80243864 0C00A7B5 */ jal dist2D -/* C43618 80243868 00000000 */ nop -/* C4361C 8024386C C6220018 */ lwc1 $f2, 0x18($s1) -/* C43620 80243870 46021080 */ add.s $f2, $f2, $f2 -/* C43624 80243874 4602003E */ c.le.s $f0, $f2 -/* C43628 80243878 00000000 */ nop -/* C4362C 8024387C 45000010 */ bc1f .L802438C0 -/* C43630 80243880 E7A00034 */ swc1 $f0, 0x34($sp) -/* C43634 80243884 0C00A67F */ jal rand_int -/* C43638 80243888 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C4363C 8024388C 3C035555 */ lui $v1, 0x5555 -/* C43640 80243890 34635556 */ ori $v1, $v1, 0x5556 -/* C43644 80243894 00430018 */ mult $v0, $v1 -/* C43648 80243898 24030002 */ addiu $v1, $zero, 2 -/* C4364C 8024389C 000227C3 */ sra $a0, $v0, 0x1f -/* C43650 802438A0 AE430070 */ sw $v1, 0x70($s2) -/* C43654 802438A4 00004010 */ mfhi $t0 -/* C43658 802438A8 01042023 */ subu $a0, $t0, $a0 -/* C4365C 802438AC 00041840 */ sll $v1, $a0, 1 -/* C43660 802438B0 00641821 */ addu $v1, $v1, $a0 -/* C43664 802438B4 00431023 */ subu $v0, $v0, $v1 -/* C43668 802438B8 24420002 */ addiu $v0, $v0, 2 -/* C4366C 802438BC AE420074 */ sw $v0, 0x74($s2) -.L802438C0: -/* C43670 802438C0 8FBF0054 */ lw $ra, 0x54($sp) -/* C43674 802438C4 8FB40050 */ lw $s4, 0x50($sp) -/* C43678 802438C8 8FB3004C */ lw $s3, 0x4c($sp) -/* C4367C 802438CC 8FB20048 */ lw $s2, 0x48($sp) -/* C43680 802438D0 8FB10044 */ lw $s1, 0x44($sp) -/* C43684 802438D4 8FB00040 */ lw $s0, 0x40($sp) -/* C43688 802438D8 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C4368C 802438DC D7B80068 */ ldc1 $f24, 0x68($sp) -/* C43690 802438E0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* C43694 802438E4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C43698 802438E8 03E00008 */ jr $ra -/* C4369C 802438EC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s new file mode 100644 index 0000000000..830b93941c --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802435D8_C43388.s @@ -0,0 +1,207 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435D8_C43388 +/* C43388 802435D8 27BDFF88 */ addiu $sp, $sp, -0x78 +/* C4338C 802435DC AFB20048 */ sw $s2, 0x48($sp) +/* C43390 802435E0 0080902D */ daddu $s2, $a0, $zero +/* C43394 802435E4 AFBF0054 */ sw $ra, 0x54($sp) +/* C43398 802435E8 AFB40050 */ sw $s4, 0x50($sp) +/* C4339C 802435EC AFB3004C */ sw $s3, 0x4c($sp) +/* C433A0 802435F0 AFB10044 */ sw $s1, 0x44($sp) +/* C433A4 802435F4 AFB00040 */ sw $s0, 0x40($sp) +/* C433A8 802435F8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* C433AC 802435FC F7B80068 */ sdc1 $f24, 0x68($sp) +/* C433B0 80243600 F7B60060 */ sdc1 $f22, 0x60($sp) +/* C433B4 80243604 F7B40058 */ sdc1 $f20, 0x58($sp) +/* C433B8 80243608 8E500148 */ lw $s0, 0x148($s2) +/* C433BC 8024360C 00A0982D */ daddu $s3, $a1, $zero +/* C433C0 80243610 86040008 */ lh $a0, 8($s0) +/* C433C4 80243614 0C00EABB */ jal get_npc_unsafe +/* C433C8 80243618 00C0A02D */ daddu $s4, $a2, $zero +/* C433CC 8024361C 0040882D */ daddu $s1, $v0, $zero +/* C433D0 80243620 C6200038 */ lwc1 $f0, 0x38($s1) +/* C433D4 80243624 C622003C */ lwc1 $f2, 0x3c($s1) +/* C433D8 80243628 C6240040 */ lwc1 $f4, 0x40($s1) +/* C433DC 8024362C 3C01447A */ lui $at, 0x447a +/* C433E0 80243630 44813000 */ mtc1 $at, $f6 +/* C433E4 80243634 C60C0074 */ lwc1 $f12, 0x74($s0) +/* C433E8 80243638 46806320 */ cvt.s.w $f12, $f12 +/* C433EC 8024363C E7A00028 */ swc1 $f0, 0x28($sp) +/* C433F0 80243640 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C433F4 80243644 E7A40030 */ swc1 $f4, 0x30($sp) +/* C433F8 80243648 E7A60034 */ swc1 $f6, 0x34($sp) +/* C433FC 8024364C C6000078 */ lwc1 $f0, 0x78($s0) +/* C43400 80243650 46800020 */ cvt.s.w $f0, $f0 +/* C43404 80243654 46000021 */ cvt.d.s $f0, $f0 +/* C43408 80243658 C6020088 */ lwc1 $f2, 0x88($s0) +/* C4340C 8024365C 468010A0 */ cvt.s.w $f2, $f2 +/* C43410 80243660 3C014059 */ lui $at, 0x4059 +/* C43414 80243664 44812800 */ mtc1 $at, $f5 +/* C43418 80243668 44802000 */ mtc1 $zero, $f4 +/* C4341C 8024366C 460010A1 */ cvt.d.s $f2, $f2 +/* C43420 80243670 46240003 */ div.d $f0, $f0, $f4 +/* C43424 80243674 462006A0 */ cvt.s.d $f26, $f0 +/* C43428 80243678 46241083 */ div.d $f2, $f2, $f4 +/* C4342C 8024367C 462010A0 */ cvt.s.d $f2, $f2 +/* C43430 80243680 C6000070 */ lwc1 $f0, 0x70($s0) +/* C43434 80243684 46800020 */ cvt.s.w $f0, $f0 +/* C43438 80243688 46000021 */ cvt.d.s $f0, $f0 +/* C4343C 8024368C 46240003 */ div.d $f0, $f0, $f4 +/* C43440 80243690 462005A0 */ cvt.s.d $f22, $f0 +/* C43444 80243694 0C00A8BB */ jal sin_deg +/* C43448 80243698 4602D600 */ add.s $f24, $f26, $f2 +/* C4344C 8024369C 27A50028 */ addiu $a1, $sp, 0x28 +/* C43450 802436A0 27A6002C */ addiu $a2, $sp, 0x2c +/* C43454 802436A4 27A70030 */ addiu $a3, $sp, 0x30 +/* C43458 802436A8 27A20034 */ addiu $v0, $sp, 0x34 +/* C4345C 802436AC AFA20010 */ sw $v0, 0x10($sp) +/* C43460 802436B0 8E240080 */ lw $a0, 0x80($s1) +/* C43464 802436B4 0C0372DF */ jal func_800DCB7C +/* C43468 802436B8 46000506 */ mov.s $f20, $f0 +/* C4346C 802436BC 10400007 */ beqz $v0, .L802436DC +/* C43470 802436C0 00000000 */ nop +/* C43474 802436C4 4616A082 */ mul.s $f2, $f20, $f22 +/* C43478 802436C8 00000000 */ nop +/* C4347C 802436CC C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C43480 802436D0 461A0000 */ add.s $f0, $f0, $f26 +/* C43484 802436D4 08090DBA */ j .L802436E8 +/* C43488 802436D8 46020000 */ add.s $f0, $f0, $f2 +.L802436DC: +/* C4348C 802436DC 4616A002 */ mul.s $f0, $f20, $f22 +/* C43490 802436E0 00000000 */ nop +/* C43494 802436E4 4600C000 */ add.s $f0, $f24, $f0 +.L802436E8: +/* C43498 802436E8 E620003C */ swc1 $f0, 0x3c($s1) +/* C4349C 802436EC 8E020074 */ lw $v0, 0x74($s0) +/* C434A0 802436F0 2442000C */ addiu $v0, $v0, 0xc +/* C434A4 802436F4 44826000 */ mtc1 $v0, $f12 +/* C434A8 802436F8 00000000 */ nop +/* C434AC 802436FC 0C00A6C9 */ jal clamp_angle +/* C434B0 80243700 46806320 */ cvt.s.w $f12, $f12 +/* C434B4 80243704 4600020D */ trunc.w.s $f8, $f0 +/* C434B8 80243708 E6080074 */ swc1 $f8, 0x74($s0) +/* C434BC 8024370C 8E420074 */ lw $v0, 0x74($s2) +/* C434C0 80243710 1C400037 */ bgtz $v0, .L802437F0 +/* C434C4 80243714 2442FFFF */ addiu $v0, $v0, -1 +/* C434C8 80243718 8E620014 */ lw $v0, 0x14($s3) +/* C434CC 8024371C AE420074 */ sw $v0, 0x74($s2) +/* C434D0 80243720 C662000C */ lwc1 $f2, 0xc($s3) +/* C434D4 80243724 3C013FE0 */ lui $at, 0x3fe0 +/* C434D8 80243728 44812800 */ mtc1 $at, $f5 +/* C434DC 8024372C 44802000 */ mtc1 $zero, $f4 +/* C434E0 80243730 460010A1 */ cvt.d.s $f2, $f2 +/* C434E4 80243734 46241082 */ mul.d $f2, $f2, $f4 +/* C434E8 80243738 00000000 */ nop +/* C434EC 8024373C C6600010 */ lwc1 $f0, 0x10($s3) +/* C434F0 80243740 46000021 */ cvt.d.s $f0, $f0 +/* C434F4 80243744 46240002 */ mul.d $f0, $f0, $f4 +/* C434F8 80243748 00000000 */ nop +/* C434FC 8024374C 0280202D */ daddu $a0, $s4, $zero +/* C43500 80243750 462010A0 */ cvt.s.d $f2, $f2 +/* C43504 80243754 46200020 */ cvt.s.d $f0, $f0 +/* C43508 80243758 44061000 */ mfc1 $a2, $f2 +/* C4350C 8024375C 44070000 */ mfc1 $a3, $f0 +/* C43510 80243760 0200282D */ daddu $a1, $s0, $zero +/* C43514 80243764 0C01242D */ jal func_800490B4 +/* C43518 80243768 AFA00010 */ sw $zero, 0x10($sp) +/* C4351C 8024376C 1040001E */ beqz $v0, .L802437E8 +/* C43520 80243770 0000202D */ daddu $a0, $zero, $zero +/* C43524 80243774 0220282D */ daddu $a1, $s1, $zero +/* C43528 80243778 0000302D */ daddu $a2, $zero, $zero +/* C4352C 8024377C 2410000C */ addiu $s0, $zero, 0xc +/* C43530 80243780 862300A8 */ lh $v1, 0xa8($s1) +/* C43534 80243784 3C013F80 */ lui $at, 0x3f80 +/* C43538 80243788 44810000 */ mtc1 $at, $f0 +/* C4353C 8024378C 3C014000 */ lui $at, 0x4000 +/* C43540 80243790 44811000 */ mtc1 $at, $f2 +/* C43544 80243794 3C01C1A0 */ lui $at, 0xc1a0 +/* C43548 80243798 44812000 */ mtc1 $at, $f4 +/* C4354C 8024379C 44834000 */ mtc1 $v1, $f8 +/* C43550 802437A0 00000000 */ nop +/* C43554 802437A4 46804220 */ cvt.s.w $f8, $f8 +/* C43558 802437A8 44074000 */ mfc1 $a3, $f8 +/* C4355C 802437AC 27A20038 */ addiu $v0, $sp, 0x38 +/* C43560 802437B0 AFB0001C */ sw $s0, 0x1c($sp) +/* C43564 802437B4 AFA20020 */ sw $v0, 0x20($sp) +/* C43568 802437B8 E7A00010 */ swc1 $f0, 0x10($sp) +/* C4356C 802437BC E7A20014 */ swc1 $f2, 0x14($sp) +/* C43570 802437C0 0C01BFA4 */ jal fx_emote +/* C43574 802437C4 E7A40018 */ swc1 $f4, 0x18($sp) +/* C43578 802437C8 0220202D */ daddu $a0, $s1, $zero +/* C4357C 802437CC 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C43580 802437D0 0C012530 */ jal func_800494C0 +/* C43584 802437D4 3C060020 */ lui $a2, 0x20 +/* C43588 802437D8 C620003C */ lwc1 $f0, 0x3c($s1) +/* C4358C 802437DC E6200064 */ swc1 $f0, 0x64($s1) +/* C43590 802437E0 08090E30 */ j .L802438C0 +/* C43594 802437E4 AE500070 */ sw $s0, 0x70($s2) +.L802437E8: +/* C43598 802437E8 8E420074 */ lw $v0, 0x74($s2) +/* C4359C 802437EC 2442FFFF */ addiu $v0, $v0, -1 +.L802437F0: +/* C435A0 802437F0 AE420074 */ sw $v0, 0x74($s2) +/* C435A4 802437F4 8622008C */ lh $v0, 0x8c($s1) +/* C435A8 802437F8 14400031 */ bnez $v0, .L802438C0 +/* C435AC 802437FC 00000000 */ nop +/* C435B0 80243800 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C435B4 80243804 8E0200D0 */ lw $v0, 0xd0($s0) +/* C435B8 80243808 C62E0040 */ lwc1 $f14, 0x40($s1) +/* C435BC 8024380C C4480000 */ lwc1 $f8, ($v0) +/* C435C0 80243810 46804220 */ cvt.s.w $f8, $f8 +/* C435C4 80243814 44064000 */ mfc1 $a2, $f8 +/* C435C8 80243818 C4480008 */ lwc1 $f8, 8($v0) +/* C435CC 8024381C 46804220 */ cvt.s.w $f8, $f8 +/* C435D0 80243820 44074000 */ mfc1 $a3, $f8 +/* C435D4 80243824 0C00A720 */ jal atan2 +/* C435D8 80243828 00000000 */ nop +/* C435DC 8024382C 8E250018 */ lw $a1, 0x18($s1) +/* C435E0 80243830 44060000 */ mfc1 $a2, $f0 +/* C435E4 80243834 0220202D */ daddu $a0, $s1, $zero +/* C435E8 80243838 0C00EA95 */ jal npc_move_heading +/* C435EC 8024383C AE26000C */ sw $a2, 0xc($s1) +/* C435F0 80243840 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C435F4 80243844 8E0200D0 */ lw $v0, 0xd0($s0) +/* C435F8 80243848 C62E0040 */ lwc1 $f14, 0x40($s1) +/* C435FC 8024384C C4480000 */ lwc1 $f8, ($v0) +/* C43600 80243850 46804220 */ cvt.s.w $f8, $f8 +/* C43604 80243854 44064000 */ mfc1 $a2, $f8 +/* C43608 80243858 C4480008 */ lwc1 $f8, 8($v0) +/* C4360C 8024385C 46804220 */ cvt.s.w $f8, $f8 +/* C43610 80243860 44074000 */ mfc1 $a3, $f8 +/* C43614 80243864 0C00A7B5 */ jal dist2D +/* C43618 80243868 00000000 */ nop +/* C4361C 8024386C C6220018 */ lwc1 $f2, 0x18($s1) +/* C43620 80243870 46021080 */ add.s $f2, $f2, $f2 +/* C43624 80243874 4602003E */ c.le.s $f0, $f2 +/* C43628 80243878 00000000 */ nop +/* C4362C 8024387C 45000010 */ bc1f .L802438C0 +/* C43630 80243880 E7A00034 */ swc1 $f0, 0x34($sp) +/* C43634 80243884 0C00A67F */ jal rand_int +/* C43638 80243888 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C4363C 8024388C 3C035555 */ lui $v1, 0x5555 +/* C43640 80243890 34635556 */ ori $v1, $v1, 0x5556 +/* C43644 80243894 00430018 */ mult $v0, $v1 +/* C43648 80243898 24030002 */ addiu $v1, $zero, 2 +/* C4364C 8024389C 000227C3 */ sra $a0, $v0, 0x1f +/* C43650 802438A0 AE430070 */ sw $v1, 0x70($s2) +/* C43654 802438A4 00004010 */ mfhi $t0 +/* C43658 802438A8 01042023 */ subu $a0, $t0, $a0 +/* C4365C 802438AC 00041840 */ sll $v1, $a0, 1 +/* C43660 802438B0 00641821 */ addu $v1, $v1, $a0 +/* C43664 802438B4 00431023 */ subu $v0, $v0, $v1 +/* C43668 802438B8 24420002 */ addiu $v0, $v0, 2 +/* C4366C 802438BC AE420074 */ sw $v0, 0x74($s2) +.L802438C0: +/* C43670 802438C0 8FBF0054 */ lw $ra, 0x54($sp) +/* C43674 802438C4 8FB40050 */ lw $s4, 0x50($sp) +/* C43678 802438C8 8FB3004C */ lw $s3, 0x4c($sp) +/* C4367C 802438CC 8FB20048 */ lw $s2, 0x48($sp) +/* C43680 802438D0 8FB10044 */ lw $s1, 0x44($sp) +/* C43684 802438D4 8FB00040 */ lw $s0, 0x40($sp) +/* C43688 802438D8 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* C4368C 802438DC D7B80068 */ ldc1 $f24, 0x68($sp) +/* C43690 802438E0 D7B60060 */ ldc1 $f22, 0x60($sp) +/* C43694 802438E4 D7B40058 */ ldc1 $f20, 0x58($sp) +/* C43698 802438E8 03E00008 */ jr $ra +/* C4369C 802438EC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s index d60bc3e5bc..f7c58ed253 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_802438F0_C436A0.s @@ -47,7 +47,7 @@ glabel func_802438F0_C436A0 /* C43748 80243998 02A0202D */ daddu $a0, $s5, $zero /* C4374C 8024399C 0240282D */ daddu $a1, $s2, $zero /* C43750 802439A0 0280302D */ daddu $a2, $s4, $zero -/* C43754 802439A4 0C090A52 */ jal func_80242948 +/* C43754 802439A4 0C090A52 */ jal func_80242948_C426F8 /* C43758 802439A8 0220382D */ daddu $a3, $s1, $zero .L802439AC: /* C4375C 802439AC 8E830070 */ lw $v1, 0x70($s4) @@ -61,7 +61,7 @@ glabel func_802438F0_C436A0 /* C4377C 802439CC 00000000 */ nop /* C43780 802439D0 0280202D */ daddu $a0, $s4, $zero /* C43784 802439D4 0220282D */ daddu $a1, $s1, $zero -/* C43788 802439D8 0C0905D8 */ jal func_80241760 +/* C43788 802439D8 0C0905D8 */ jal func_80241760_C41510 /* C4378C 802439DC 0260302D */ daddu $a2, $s3, $zero /* C43790 802439E0 0000282D */ daddu $a1, $zero, $zero /* C43794 802439E4 00A0302D */ daddu $a2, $a1, $zero @@ -73,17 +73,17 @@ glabel func_802438F0_C436A0 /* C437AC 802439FC 00A0382D */ daddu $a3, $a1, $zero /* C437B0 80243A00 0280202D */ daddu $a0, $s4, $zero /* C437B4 80243A04 0220282D */ daddu $a1, $s1, $zero -/* C437B8 80243A08 0C090644 */ jal func_80241910 +/* C437B8 80243A08 0C090644 */ jal func_80241910_C416C0 /* C437BC 80243A0C 0260302D */ daddu $a2, $s3, $zero /* C437C0 80243A10 08090E8E */ j .L80243A38 /* C437C4 80243A14 00000000 */ nop /* C437C8 80243A18 0280202D */ daddu $a0, $s4, $zero /* C437CC 80243A1C 0220282D */ daddu $a1, $s1, $zero -/* C437D0 80243A20 0C0907CE */ jal func_80241F38 +/* C437D0 80243A20 0C0907CE */ jal func_80241F38_C41CE8 /* C437D4 80243A24 0260302D */ daddu $a2, $s3, $zero /* C437D8 80243A28 0280202D */ daddu $a0, $s4, $zero /* C437DC 80243A2C 0220282D */ daddu $a1, $s1, $zero -/* C437E0 80243A30 0C0907FE */ jal func_80241FF8 +/* C437E0 80243A30 0C0907FE */ jal func_80241FF8_C41DA8 /* C437E4 80243A34 0260302D */ daddu $a2, $s3, $zero .L80243A38: /* C437E8 80243A38 8E830070 */ lw $v1, 0x70($s4) @@ -94,7 +94,7 @@ glabel func_802438F0_C436A0 /* C437FC 80243A4C A6A2008E */ sh $v0, 0x8e($s5) /* C43800 80243A50 0280202D */ daddu $a0, $s4, $zero /* C43804 80243A54 0220282D */ daddu $a1, $s1, $zero -/* C43808 80243A58 0C090B16 */ jal func_80242C58 +/* C43808 80243A58 0C090B16 */ jal func_80242C58_C42A08 /* C4380C 80243A5C 0260302D */ daddu $a2, $s3, $zero /* C43810 80243A60 8E830070 */ lw $v1, 0x70($s4) /* C43814 80243A64 2402000D */ addiu $v0, $zero, 0xd @@ -102,13 +102,13 @@ glabel func_802438F0_C436A0 /* C4381C 80243A6C 00000000 */ nop /* C43820 80243A70 0280202D */ daddu $a0, $s4, $zero /* C43824 80243A74 0220282D */ daddu $a1, $s1, $zero -/* C43828 80243A78 0C090B6C */ jal func_80242DB0 +/* C43828 80243A78 0C090B6C */ jal func_80242DB0_C42B60 /* C4382C 80243A7C 0260302D */ daddu $a2, $s3, $zero /* C43830 80243A80 08090ECE */ j .L80243B38 /* C43834 80243A84 00000000 */ nop /* C43838 80243A88 0280202D */ daddu $a0, $s4, $zero /* C4383C 80243A8C 0220282D */ daddu $a1, $s1, $zero -/* C43840 80243A90 0C090BAD */ jal func_80242EB4 +/* C43840 80243A90 0C090BAD */ jal func_80242EB4_C42C64 /* C43844 80243A94 0260302D */ daddu $a2, $s3, $zero /* C43848 80243A98 8E830070 */ lw $v1, 0x70($s4) /* C4384C 80243A9C 2402000F */ addiu $v0, $zero, 0xf @@ -116,39 +116,39 @@ glabel func_802438F0_C436A0 /* C43854 80243AA4 00000000 */ nop /* C43858 80243AA8 0280202D */ daddu $a0, $s4, $zero /* C4385C 80243AAC 0220282D */ daddu $a1, $s1, $zero -/* C43860 80243AB0 0C090BE5 */ jal func_80242F94 +/* C43860 80243AB0 0C090BE5 */ jal func_80242F94_C42D44 /* C43864 80243AB4 0260302D */ daddu $a2, $s3, $zero /* C43868 80243AB8 08090ECE */ j .L80243B38 /* C4386C 80243ABC 00000000 */ nop /* C43870 80243AC0 0280202D */ daddu $a0, $s4, $zero /* C43874 80243AC4 0220282D */ daddu $a1, $s1, $zero -/* C43878 80243AC8 0C090C8C */ jal func_80243230 +/* C43878 80243AC8 0C090C8C */ jal func_80243230_C42FE0 /* C4387C 80243ACC 0260302D */ daddu $a2, $s3, $zero /* C43880 80243AD0 0280202D */ daddu $a0, $s4, $zero /* C43884 80243AD4 0220282D */ daddu $a1, $s1, $zero -/* C43888 80243AD8 0C090CBA */ jal func_802432E8 +/* C43888 80243AD8 0C090CBA */ jal func_802432E8_C43098 /* C4388C 80243ADC 0260302D */ daddu $a2, $s3, $zero /* C43890 80243AE0 08090ECE */ j .L80243B38 /* C43894 80243AE4 00000000 */ nop /* C43898 80243AE8 0280202D */ daddu $a0, $s4, $zero /* C4389C 80243AEC 0220282D */ daddu $a1, $s1, $zero -/* C438A0 80243AF0 0C090D1A */ jal func_80243468 +/* C438A0 80243AF0 0C090D1A */ jal func_80243468_C43218 /* C438A4 80243AF4 0260302D */ daddu $a2, $s3, $zero /* C438A8 80243AF8 08090ECE */ j .L80243B38 /* C438AC 80243AFC 00000000 */ nop /* C438B0 80243B00 0280202D */ daddu $a0, $s4, $zero /* C438B4 80243B04 0220282D */ daddu $a1, $s1, $zero -/* C438B8 80243B08 0C090D2C */ jal func_802434B0 +/* C438B8 80243B08 0C090D2C */ jal func_802434B0_C43260 /* C438BC 80243B0C 0260302D */ daddu $a2, $s3, $zero /* C438C0 80243B10 08090ECE */ j .L80243B38 /* C438C4 80243B14 00000000 */ nop /* C438C8 80243B18 0280202D */ daddu $a0, $s4, $zero /* C438CC 80243B1C 0220282D */ daddu $a1, $s1, $zero -/* C438D0 80243B20 0C090D4C */ jal func_80243530 +/* C438D0 80243B20 0C090D4C */ jal func_80243530_C432E0 /* C438D4 80243B24 0260302D */ daddu $a2, $s3, $zero /* C438D8 80243B28 0280202D */ daddu $a0, $s4, $zero /* C438DC 80243B2C 0220282D */ daddu $a1, $s1, $zero -/* C438E0 80243B30 0C090D76 */ jal func_802435D8 +/* C438E0 80243B30 0C090D76 */ jal func_802435D8_C43388 /* C438E4 80243B34 0260302D */ daddu $a2, $s3, $zero .L80243B38: /* C438E8 80243B38 8E820070 */ lw $v0, 0x70($s4) diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B6C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B6C.s deleted file mode 100644 index 04f80d29b5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B6C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243B6C -/* C4391C 80243B6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C43920 80243B70 AFBF0010 */ sw $ra, 0x10($sp) -/* C43924 80243B74 0C03A6D5 */ jal increment_status_menu_disabled -/* C43928 80243B78 00000000 */ nop -/* C4392C 80243B7C 3C05437F */ lui $a1, 0x437f -/* C43930 80243B80 0C04DF69 */ jal func_80137DA4 -/* C43934 80243B84 0000202D */ daddu $a0, $zero, $zero -/* C43938 80243B88 8FBF0010 */ lw $ra, 0x10($sp) -/* C4393C 80243B8C 24020002 */ addiu $v0, $zero, 2 -/* C43940 80243B90 03E00008 */ jr $ra -/* C43944 80243B94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B6C_C4391C.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B6C_C4391C.s new file mode 100644 index 0000000000..eb87c275e9 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B6C_C4391C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243B6C_C4391C +/* C4391C 80243B6C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C43920 80243B70 AFBF0010 */ sw $ra, 0x10($sp) +/* C43924 80243B74 0C03A6D5 */ jal increment_status_menu_disabled +/* C43928 80243B78 00000000 */ nop +/* C4392C 80243B7C 3C05437F */ lui $a1, 0x437f +/* C43930 80243B80 0C04DF69 */ jal func_80137DA4 +/* C43934 80243B84 0000202D */ daddu $a0, $zero, $zero +/* C43938 80243B88 8FBF0010 */ lw $ra, 0x10($sp) +/* C4393C 80243B8C 24020002 */ addiu $v0, $zero, 2 +/* C43940 80243B90 03E00008 */ jr $ra +/* C43944 80243B94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98.s deleted file mode 100644 index 4b533d384d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243B98 -/* C43948 80243B98 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C4394C 80243B9C AFBF0010 */ sw $ra, 0x10($sp) -/* C43950 80243BA0 0C00FB5A */ jal get_enemy_safe -/* C43954 80243BA4 24040009 */ addiu $a0, $zero, 9 -/* C43958 80243BA8 10400016 */ beqz $v0, .L80243C04 -/* C4395C 80243BAC 24020002 */ addiu $v0, $zero, 2 -/* C43960 80243BB0 0C00FB3A */ jal get_enemy -/* C43964 80243BB4 24040009 */ addiu $a0, $zero, 9 -/* C43968 80243BB8 8C4400D0 */ lw $a0, 0xd0($v0) -/* C4396C 80243BBC 24030002 */ addiu $v1, $zero, 2 -/* C43970 80243BC0 AC830000 */ sw $v1, ($a0) -/* C43974 80243BC4 8C4400D0 */ lw $a0, 0xd0($v0) -/* C43978 80243BC8 2403FE3E */ addiu $v1, $zero, -0x1c2 -/* C4397C 80243BCC AC830004 */ sw $v1, 4($a0) -/* C43980 80243BD0 8C4300D0 */ lw $v1, 0xd0($v0) -/* C43984 80243BD4 AC600008 */ sw $zero, 8($v1) -/* C43988 80243BD8 8C4300D0 */ lw $v1, 0xd0($v0) -/* C4398C 80243BDC 240500AF */ addiu $a1, $zero, 0xaf -/* C43990 80243BE0 AC65000C */ sw $a1, 0xc($v1) -/* C43994 80243BE4 8C4400D0 */ lw $a0, 0xd0($v0) -/* C43998 80243BE8 2403012C */ addiu $v1, $zero, 0x12c -/* C4399C 80243BEC AC830010 */ sw $v1, 0x10($a0) -/* C439A0 80243BF0 8C4300D0 */ lw $v1, 0xd0($v0) -/* C439A4 80243BF4 AC600014 */ sw $zero, 0x14($v1) -/* C439A8 80243BF8 8C4300D0 */ lw $v1, 0xd0($v0) -/* C439AC 80243BFC 24020002 */ addiu $v0, $zero, 2 -/* C439B0 80243C00 AC650018 */ sw $a1, 0x18($v1) -.L80243C04: -/* C439B4 80243C04 8FBF0010 */ lw $ra, 0x10($sp) -/* C439B8 80243C08 03E00008 */ jr $ra -/* C439BC 80243C0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98_C43948.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98_C43948.s new file mode 100644 index 0000000000..e25239efcf --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243B98_C43948.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243B98_C43948 +/* C43948 80243B98 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C4394C 80243B9C AFBF0010 */ sw $ra, 0x10($sp) +/* C43950 80243BA0 0C00FB5A */ jal get_enemy_safe +/* C43954 80243BA4 24040009 */ addiu $a0, $zero, 9 +/* C43958 80243BA8 10400016 */ beqz $v0, .L80243C04 +/* C4395C 80243BAC 24020002 */ addiu $v0, $zero, 2 +/* C43960 80243BB0 0C00FB3A */ jal get_enemy +/* C43964 80243BB4 24040009 */ addiu $a0, $zero, 9 +/* C43968 80243BB8 8C4400D0 */ lw $a0, 0xd0($v0) +/* C4396C 80243BBC 24030002 */ addiu $v1, $zero, 2 +/* C43970 80243BC0 AC830000 */ sw $v1, ($a0) +/* C43974 80243BC4 8C4400D0 */ lw $a0, 0xd0($v0) +/* C43978 80243BC8 2403FE3E */ addiu $v1, $zero, -0x1c2 +/* C4397C 80243BCC AC830004 */ sw $v1, 4($a0) +/* C43980 80243BD0 8C4300D0 */ lw $v1, 0xd0($v0) +/* C43984 80243BD4 AC600008 */ sw $zero, 8($v1) +/* C43988 80243BD8 8C4300D0 */ lw $v1, 0xd0($v0) +/* C4398C 80243BDC 240500AF */ addiu $a1, $zero, 0xaf +/* C43990 80243BE0 AC65000C */ sw $a1, 0xc($v1) +/* C43994 80243BE4 8C4400D0 */ lw $a0, 0xd0($v0) +/* C43998 80243BE8 2403012C */ addiu $v1, $zero, 0x12c +/* C4399C 80243BEC AC830010 */ sw $v1, 0x10($a0) +/* C439A0 80243BF0 8C4300D0 */ lw $v1, 0xd0($v0) +/* C439A4 80243BF4 AC600014 */ sw $zero, 0x14($v1) +/* C439A8 80243BF8 8C4300D0 */ lw $v1, 0xd0($v0) +/* C439AC 80243BFC 24020002 */ addiu $v0, $zero, 2 +/* C439B0 80243C00 AC650018 */ sw $a1, 0x18($v1) +.L80243C04: +/* C439B4 80243C04 8FBF0010 */ lw $ra, 0x10($sp) +/* C439B8 80243C08 03E00008 */ jr $ra +/* C439BC 80243C0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10.s deleted file mode 100644 index 6d8d397f91..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243C10 -/* C439C0 80243C10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C439C4 80243C14 AFBF0010 */ sw $ra, 0x10($sp) -/* C439C8 80243C18 0C00FB5A */ jal get_enemy_safe -/* C439CC 80243C1C 24040009 */ addiu $a0, $zero, 9 -/* C439D0 80243C20 10400008 */ beqz $v0, .L80243C44 -/* C439D4 80243C24 24020002 */ addiu $v0, $zero, 2 -/* C439D8 80243C28 0C00FB3A */ jal get_enemy -/* C439DC 80243C2C 24040009 */ addiu $a0, $zero, 9 -/* C439E0 80243C30 0040202D */ daddu $a0, $v0, $zero -/* C439E4 80243C34 8C8300B0 */ lw $v1, 0xb0($a0) -/* C439E8 80243C38 24020002 */ addiu $v0, $zero, 2 -/* C439EC 80243C3C 34630080 */ ori $v1, $v1, 0x80 -/* C439F0 80243C40 AC8300B0 */ sw $v1, 0xb0($a0) -.L80243C44: -/* C439F4 80243C44 8FBF0010 */ lw $ra, 0x10($sp) -/* C439F8 80243C48 03E00008 */ jr $ra -/* C439FC 80243C4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10_C439C0.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10_C439C0.s new file mode 100644 index 0000000000..f53166abfe --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C10_C439C0.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243C10_C439C0 +/* C439C0 80243C10 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C439C4 80243C14 AFBF0010 */ sw $ra, 0x10($sp) +/* C439C8 80243C18 0C00FB5A */ jal get_enemy_safe +/* C439CC 80243C1C 24040009 */ addiu $a0, $zero, 9 +/* C439D0 80243C20 10400008 */ beqz $v0, .L80243C44 +/* C439D4 80243C24 24020002 */ addiu $v0, $zero, 2 +/* C439D8 80243C28 0C00FB3A */ jal get_enemy +/* C439DC 80243C2C 24040009 */ addiu $a0, $zero, 9 +/* C439E0 80243C30 0040202D */ daddu $a0, $v0, $zero +/* C439E4 80243C34 8C8300B0 */ lw $v1, 0xb0($a0) +/* C439E8 80243C38 24020002 */ addiu $v0, $zero, 2 +/* C439EC 80243C3C 34630080 */ ori $v1, $v1, 0x80 +/* C439F0 80243C40 AC8300B0 */ sw $v1, 0xb0($a0) +.L80243C44: +/* C439F4 80243C44 8FBF0010 */ lw $ra, 0x10($sp) +/* C439F8 80243C48 03E00008 */ jr $ra +/* C439FC 80243C4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50.s deleted file mode 100644 index 7781e9af0a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243C50 -/* C43A00 80243C50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C43A04 80243C54 AFBF0010 */ sw $ra, 0x10($sp) -/* C43A08 80243C58 8C820148 */ lw $v0, 0x148($a0) -/* C43A0C 80243C5C 0C00EABB */ jal get_npc_unsafe -/* C43A10 80243C60 84440008 */ lh $a0, 8($v0) -/* C43A14 80243C64 0040202D */ daddu $a0, $v0, $zero -/* C43A18 80243C68 2405032F */ addiu $a1, $zero, 0x32f -/* C43A1C 80243C6C 0C012530 */ jal func_800494C0 -/* C43A20 80243C70 0000302D */ daddu $a2, $zero, $zero -/* C43A24 80243C74 8FBF0010 */ lw $ra, 0x10($sp) -/* C43A28 80243C78 24020002 */ addiu $v0, $zero, 2 -/* C43A2C 80243C7C 03E00008 */ jr $ra -/* C43A30 80243C80 27BD0018 */ addiu $sp, $sp, 0x18 -/* C43A34 80243C84 00000000 */ nop -/* C43A38 80243C88 00000000 */ nop -/* C43A3C 80243C8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s new file mode 100644 index 0000000000..a084f2e1d5 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_08/C3FDB0/func_80243C50_C43A00.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243C50_C43A00 +/* C43A00 80243C50 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C43A04 80243C54 AFBF0010 */ sw $ra, 0x10($sp) +/* C43A08 80243C58 8C820148 */ lw $v0, 0x148($a0) +/* C43A0C 80243C5C 0C00EABB */ jal get_npc_unsafe +/* C43A10 80243C60 84440008 */ lh $a0, 8($v0) +/* C43A14 80243C64 0040202D */ daddu $a0, $v0, $zero +/* C43A18 80243C68 2405032F */ addiu $a1, $zero, 0x32f +/* C43A1C 80243C6C 0C012530 */ jal func_800494C0 +/* C43A20 80243C70 0000302D */ daddu $a2, $zero, $zero +/* C43A24 80243C74 8FBF0010 */ lw $ra, 0x10($sp) +/* C43A28 80243C78 24020002 */ addiu $v0, $zero, 2 +/* C43A2C 80243C7C 03E00008 */ jr $ra +/* C43A30 80243C80 27BD0018 */ addiu $sp, $sp, 0x18 +/* C43A34 80243C84 00000000 */ nop +/* C43A38 80243C88 00000000 */ nop +/* C43A3C 80243C8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s index ab427fe4a4..7536f8c48f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024061C_C471FC.s @@ -90,7 +90,7 @@ glabel func_8024061C_C471FC /* C4733C 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* C47340 80240760 14400006 */ bnez $v0, .L8024077C /* C47344 80240764 00000000 */ nop -/* C47348 80240768 0C090082 */ jal func_80240208 +/* C47348 80240768 0C090082 */ jal func_80240208_C46DE8 /* C4734C 8024076C 0240202D */ daddu $a0, $s2, $zero /* C47350 80240770 10400002 */ beqz $v0, .L8024077C /* C47354 80240774 2402001E */ addiu $v0, $zero, 0x1e @@ -151,15 +151,15 @@ glabel func_8024061C_C471FC /* C4742C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C47430 80240850 0809022A */ j .L802408A8 /* C47434 80240854 00000000 */ nop -/* C47438 80240858 0C090000 */ jal func_80240000 +/* C47438 80240858 0C090000 */ jal func_80240000_C46BE0 /* C4743C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C47440 80240860 0C09001B */ jal func_8024006C +/* C47440 80240860 0C09001B */ jal func_8024006C_C46C4C /* C47444 80240864 0240202D */ daddu $a0, $s2, $zero /* C47448 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4744C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C47450 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C47454 80240874 00000000 */ nop -/* C47458 80240878 0C090037 */ jal func_802400DC +/* C47458 80240878 0C090037 */ jal func_802400DC_C46CBC /* C4745C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C47460 80240880 8E430070 */ lw $v1, 0x70($s2) /* C47464 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s index d5319c9e41..23fb572850 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802410D4_C47CB4.s @@ -98,7 +98,7 @@ glabel func_802410D4_C47CB4 /* C47E14 80241234 8E22006C */ lw $v0, 0x6c($s1) /* C47E18 80241238 14400006 */ bnez $v0, .L80241254 /* C47E1C 8024123C 00000000 */ nop -/* C47E20 80241240 0C090082 */ jal func_80240208 +/* C47E20 80241240 0C090082 */ jal func_80240208_C46DE8 /* C47E24 80241244 0240202D */ daddu $a0, $s2, $zero /* C47E28 80241248 10400002 */ beqz $v0, .L80241254 /* C47E2C 8024124C 2402001E */ addiu $v0, $zero, 0x1e @@ -115,31 +115,31 @@ glabel func_802410D4_C47CB4 /* C47E54 80241274 00000000 */ nop /* C47E58 80241278 0240202D */ daddu $a0, $s2, $zero /* C47E5C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* C47E60 80241280 0C090234 */ jal func_802408D0 +/* C47E60 80241280 0C090234 */ jal func_802408D0_C474B0 /* C47E64 80241284 02A0302D */ daddu $a2, $s5, $zero /* C47E68 80241288 080904FF */ j .L802413FC /* C47E6C 8024128C 00000000 */ nop /* C47E70 80241290 0240202D */ daddu $a0, $s2, $zero /* C47E74 80241294 0260282D */ daddu $a1, $s3, $zero -/* C47E78 80241298 0C090256 */ jal func_80240958 +/* C47E78 80241298 0C090256 */ jal func_80240958_C47538 /* C47E7C 8024129C 02A0302D */ daddu $a2, $s5, $zero /* C47E80 802412A0 080904FF */ j .L802413FC /* C47E84 802412A4 00000000 */ nop /* C47E88 802412A8 0240202D */ daddu $a0, $s2, $zero /* C47E8C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* C47E90 802412B0 0C090304 */ jal func_80240C10 +/* C47E90 802412B0 0C090304 */ jal func_80240C10_C477F0 /* C47E94 802412B4 02A0302D */ daddu $a2, $s5, $zero /* C47E98 802412B8 080904FF */ j .L802413FC /* C47E9C 802412BC 00000000 */ nop /* C47EA0 802412C0 0240202D */ daddu $a0, $s2, $zero /* C47EA4 802412C4 0260282D */ daddu $a1, $s3, $zero -/* C47EA8 802412C8 0C09031D */ jal func_80240C74 +/* C47EA8 802412C8 0C09031D */ jal func_80240C74_C47854 /* C47EAC 802412CC 02A0302D */ daddu $a2, $s5, $zero /* C47EB0 802412D0 080904FF */ j .L802413FC /* C47EB4 802412D4 00000000 */ nop /* C47EB8 802412D8 0240202D */ daddu $a0, $s2, $zero /* C47EBC 802412DC 0260282D */ daddu $a1, $s3, $zero -/* C47EC0 802412E0 0C090347 */ jal func_80240D1C +/* C47EC0 802412E0 0C090347 */ jal func_80240D1C_C478FC /* C47EC4 802412E4 02A0302D */ daddu $a2, $s5, $zero /* C47EC8 802412E8 080904FF */ j .L802413FC /* C47ECC 802412EC 00000000 */ nop @@ -168,19 +168,19 @@ glabel func_802410D4_C47CB4 /* C47F28 80241348 24020003 */ addiu $v0, $zero, 3 /* C47F2C 8024134C 080904FF */ j .L802413FC /* C47F30 80241350 AE420070 */ sw $v0, 0x70($s2) -/* C47F34 80241354 0C090000 */ jal func_80240000 +/* C47F34 80241354 0C090000 */ jal func_80240000_C46BE0 /* C47F38 80241358 0240202D */ daddu $a0, $s2, $zero /* C47F3C 8024135C 8E430070 */ lw $v1, 0x70($s2) /* C47F40 80241360 2402001F */ addiu $v0, $zero, 0x1f /* C47F44 80241364 14620025 */ bne $v1, $v0, .L802413FC /* C47F48 80241368 00000000 */ nop -/* C47F4C 8024136C 0C09001B */ jal func_8024006C +/* C47F4C 8024136C 0C09001B */ jal func_8024006C_C46C4C /* C47F50 80241370 0240202D */ daddu $a0, $s2, $zero /* C47F54 80241374 8E430070 */ lw $v1, 0x70($s2) /* C47F58 80241378 24020020 */ addiu $v0, $zero, 0x20 /* C47F5C 8024137C 1462001F */ bne $v1, $v0, .L802413FC /* C47F60 80241380 00000000 */ nop -/* C47F64 80241384 0C090037 */ jal func_802400DC +/* C47F64 80241384 0C090037 */ jal func_802400DC_C46CBC /* C47F68 80241388 0240202D */ daddu $a0, $s2, $zero /* C47F6C 8024138C 080904FF */ j .L802413FC /* C47F70 80241390 00000000 */ nop @@ -190,7 +190,7 @@ glabel func_802410D4_C47CB4 /* C47F80 802413A0 00000000 */ nop /* C47F84 802413A4 0240202D */ daddu $a0, $s2, $zero /* C47F88 802413A8 0260282D */ daddu $a1, $s3, $zero -/* C47F8C 802413AC 0C090395 */ jal func_80240E54 +/* C47F8C 802413AC 0C090395 */ jal func_80240E54_C47A34 /* C47F90 802413B0 02A0302D */ daddu $a2, $s5, $zero /* C47F94 802413B4 8E430070 */ lw $v1, 0x70($s2) /* C47F98 802413B8 24020029 */ addiu $v0, $zero, 0x29 @@ -198,13 +198,13 @@ glabel func_802410D4_C47CB4 /* C47FA0 802413C0 00000000 */ nop /* C47FA4 802413C4 0240202D */ daddu $a0, $s2, $zero /* C47FA8 802413C8 0260282D */ daddu $a1, $s3, $zero -/* C47FAC 802413CC 0C0903C0 */ jal func_80240F00 +/* C47FAC 802413CC 0C0903C0 */ jal func_80240F00_C47AE0 /* C47FB0 802413D0 02A0302D */ daddu $a2, $s5, $zero /* C47FB4 802413D4 080904FF */ j .L802413FC /* C47FB8 802413D8 00000000 */ nop /* C47FBC 802413DC 0240202D */ daddu $a0, $s2, $zero /* C47FC0 802413E0 0260282D */ daddu $a1, $s3, $zero -/* C47FC4 802413E4 0C09041E */ jal func_80241078 +/* C47FC4 802413E4 0C09041E */ jal func_80241078_C47C58 /* C47FC8 802413E8 02A0302D */ daddu $a2, $s5, $zero /* C47FCC 802413EC 080904FF */ j .L802413FC /* C47FD0 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4.s deleted file mode 100644 index dd5553e0fd..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415D4 -/* C481B4 802415D4 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C481B8 802415D8 AFB3004C */ sw $s3, 0x4c($sp) -/* C481BC 802415DC 0080982D */ daddu $s3, $a0, $zero -/* C481C0 802415E0 AFBF0058 */ sw $ra, 0x58($sp) -/* C481C4 802415E4 AFB50054 */ sw $s5, 0x54($sp) -/* C481C8 802415E8 AFB40050 */ sw $s4, 0x50($sp) -/* C481CC 802415EC AFB20048 */ sw $s2, 0x48($sp) -/* C481D0 802415F0 AFB10044 */ sw $s1, 0x44($sp) -/* C481D4 802415F4 AFB00040 */ sw $s0, 0x40($sp) -/* C481D8 802415F8 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C481DC 802415FC F7B80070 */ sdc1 $f24, 0x70($sp) -/* C481E0 80241600 F7B60068 */ sdc1 $f22, 0x68($sp) -/* C481E4 80241604 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C481E8 80241608 8E710148 */ lw $s1, 0x148($s3) -/* C481EC 8024160C 00A0902D */ daddu $s2, $a1, $zero -/* C481F0 80241610 86240008 */ lh $a0, 8($s1) -/* C481F4 80241614 0C00EABB */ jal get_npc_unsafe -/* C481F8 80241618 00C0A82D */ daddu $s5, $a2, $zero -/* C481FC 8024161C 0040802D */ daddu $s0, $v0, $zero -/* C48200 80241620 0000A02D */ daddu $s4, $zero, $zero -/* C48204 80241624 C624007C */ lwc1 $f4, 0x7c($s1) -/* C48208 80241628 46802120 */ cvt.s.w $f4, $f4 -/* C4820C 8024162C C6220088 */ lwc1 $f2, 0x88($s1) -/* C48210 80241630 468010A0 */ cvt.s.w $f2, $f2 -/* C48214 80241634 460010A1 */ cvt.d.s $f2, $f2 -/* C48218 80241638 46002121 */ cvt.d.s $f4, $f4 -/* C4821C 8024163C C600003C */ lwc1 $f0, 0x3c($s0) -/* C48220 80241640 3C014059 */ lui $at, 0x4059 -/* C48224 80241644 44813800 */ mtc1 $at, $f7 -/* C48228 80241648 44803000 */ mtc1 $zero, $f6 -/* C4822C 8024164C 46000021 */ cvt.d.s $f0, $f0 -/* C48230 80241650 46260002 */ mul.d $f0, $f0, $f6 -/* C48234 80241654 00000000 */ nop -/* C48238 80241658 24020001 */ addiu $v0, $zero, 1 -/* C4823C 8024165C 8E24006C */ lw $a0, 0x6c($s1) -/* C48240 80241660 46261083 */ div.d $f2, $f2, $f6 -/* C48244 80241664 462010A0 */ cvt.s.d $f2, $f2 -/* C48248 80241668 46262103 */ div.d $f4, $f4, $f6 -/* C4824C 8024166C 46202520 */ cvt.s.d $f20, $f4 -/* C48250 80241670 30830011 */ andi $v1, $a0, 0x11 -/* C48254 80241674 4620020D */ trunc.w.d $f8, $f0 -/* C48258 80241678 E628007C */ swc1 $f8, 0x7c($s1) -/* C4825C 8024167C C6200078 */ lwc1 $f0, 0x78($s1) -/* C48260 80241680 46800020 */ cvt.s.w $f0, $f0 -/* C48264 80241684 46000021 */ cvt.d.s $f0, $f0 -/* C48268 80241688 46260003 */ div.d $f0, $f0, $f6 -/* C4826C 8024168C 462006A0 */ cvt.s.d $f26, $f0 -/* C48270 80241690 C6200070 */ lwc1 $f0, 0x70($s1) -/* C48274 80241694 46800020 */ cvt.s.w $f0, $f0 -/* C48278 80241698 46000021 */ cvt.d.s $f0, $f0 -/* C4827C 8024169C 46260003 */ div.d $f0, $f0, $f6 -/* C48280 802416A0 462005A0 */ cvt.s.d $f22, $f0 -/* C48284 802416A4 14620025 */ bne $v1, $v0, .L8024173C -/* C48288 802416A8 4602D600 */ add.s $f24, $f26, $f2 -/* C4828C 802416AC 8E020000 */ lw $v0, ($s0) -/* C48290 802416B0 30420008 */ andi $v0, $v0, 8 -/* C48294 802416B4 10400009 */ beqz $v0, .L802416DC -/* C48298 802416B8 27A50028 */ addiu $a1, $sp, 0x28 -/* C4829C 802416BC C600003C */ lwc1 $f0, 0x3c($s0) -/* C482A0 802416C0 4600C001 */ sub.s $f0, $f24, $f0 -/* C482A4 802416C4 4600B03C */ c.lt.s $f22, $f0 -/* C482A8 802416C8 00000000 */ nop -/* C482AC 802416CC 4500001B */ bc1f .L8024173C -/* C482B0 802416D0 34820010 */ ori $v0, $a0, 0x10 -/* C482B4 802416D4 080905CF */ j .L8024173C -/* C482B8 802416D8 AE22006C */ sw $v0, 0x6c($s1) -.L802416DC: -/* C482BC 802416DC 27A6002C */ addiu $a2, $sp, 0x2c -/* C482C0 802416E0 C6000038 */ lwc1 $f0, 0x38($s0) -/* C482C4 802416E4 C602003C */ lwc1 $f2, 0x3c($s0) -/* C482C8 802416E8 C6040040 */ lwc1 $f4, 0x40($s0) -/* C482CC 802416EC 3C01447A */ lui $at, 0x447a -/* C482D0 802416F0 44813000 */ mtc1 $at, $f6 -/* C482D4 802416F4 27A20034 */ addiu $v0, $sp, 0x34 -/* C482D8 802416F8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C482DC 802416FC E7A2002C */ swc1 $f2, 0x2c($sp) -/* C482E0 80241700 E7A40030 */ swc1 $f4, 0x30($sp) -/* C482E4 80241704 E7A60034 */ swc1 $f6, 0x34($sp) -/* C482E8 80241708 AFA20010 */ sw $v0, 0x10($sp) -/* C482EC 8024170C 8E040080 */ lw $a0, 0x80($s0) -/* C482F0 80241710 0C0372DF */ jal func_800DCB7C -/* C482F4 80241714 27A70030 */ addiu $a3, $sp, 0x30 -/* C482F8 80241718 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C482FC 8024171C 4600D001 */ sub.s $f0, $f26, $f0 -/* C48300 80241720 4600B03C */ c.lt.s $f22, $f0 -/* C48304 80241724 00000000 */ nop -/* C48308 80241728 45000004 */ bc1f .L8024173C -/* C4830C 8024172C 00000000 */ nop -/* C48310 80241730 8E22006C */ lw $v0, 0x6c($s1) -/* C48314 80241734 34420010 */ ori $v0, $v0, 0x10 -/* C48318 80241738 AE22006C */ sw $v0, 0x6c($s1) -.L8024173C: -/* C4831C 8024173C 8E22006C */ lw $v0, 0x6c($s1) -/* C48320 80241740 24030011 */ addiu $v1, $zero, 0x11 -/* C48324 80241744 30420011 */ andi $v0, $v0, 0x11 -/* C48328 80241748 14430039 */ bne $v0, $v1, .L80241830 -/* C4832C 8024174C 00000000 */ nop -/* C48330 80241750 8E020000 */ lw $v0, ($s0) -/* C48334 80241754 30420008 */ andi $v0, $v0, 8 -/* C48338 80241758 1040000A */ beqz $v0, .L80241784 -/* C4833C 8024175C 4600C106 */ mov.s $f4, $f24 -/* C48340 80241760 4614C081 */ sub.s $f2, $f24, $f20 -/* C48344 80241764 3C018024 */ lui $at, 0x8024 -/* C48348 80241768 D42056C8 */ ldc1 $f0, 0x56c8($at) -/* C4834C 8024176C 460010A1 */ cvt.d.s $f2, $f2 -/* C48350 80241770 46201082 */ mul.d $f2, $f2, $f0 -/* C48354 80241774 00000000 */ nop -/* C48358 80241778 4600A021 */ cvt.d.s $f0, $f20 -/* C4835C 8024177C 080905FA */ j .L802417E8 -/* C48360 80241780 46220000 */ add.d $f0, $f0, $f2 -.L80241784: -/* C48364 80241784 27A50028 */ addiu $a1, $sp, 0x28 -/* C48368 80241788 27A6002C */ addiu $a2, $sp, 0x2c -/* C4836C 8024178C C6000038 */ lwc1 $f0, 0x38($s0) -/* C48370 80241790 C6020040 */ lwc1 $f2, 0x40($s0) -/* C48374 80241794 3C01447A */ lui $at, 0x447a -/* C48378 80241798 44812000 */ mtc1 $at, $f4 -/* C4837C 8024179C 27A20034 */ addiu $v0, $sp, 0x34 -/* C48380 802417A0 E7B4002C */ swc1 $f20, 0x2c($sp) -/* C48384 802417A4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C48388 802417A8 E7A20030 */ swc1 $f2, 0x30($sp) -/* C4838C 802417AC E7A40034 */ swc1 $f4, 0x34($sp) -/* C48390 802417B0 AFA20010 */ sw $v0, 0x10($sp) -/* C48394 802417B4 8E040080 */ lw $a0, 0x80($s0) -/* C48398 802417B8 0C0372DF */ jal func_800DCB7C -/* C4839C 802417BC 27A70030 */ addiu $a3, $sp, 0x30 -/* C483A0 802417C0 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C483A4 802417C4 461A2100 */ add.s $f4, $f4, $f26 -/* C483A8 802417C8 46142081 */ sub.s $f2, $f4, $f20 -/* C483AC 802417CC 3C018024 */ lui $at, 0x8024 -/* C483B0 802417D0 D42056D0 */ ldc1 $f0, 0x56d0($at) -/* C483B4 802417D4 460010A1 */ cvt.d.s $f2, $f2 -/* C483B8 802417D8 46201082 */ mul.d $f2, $f2, $f0 -/* C483BC 802417DC 00000000 */ nop -/* C483C0 802417E0 4600A021 */ cvt.d.s $f0, $f20 -/* C483C4 802417E4 46220000 */ add.d $f0, $f0, $f2 -.L802417E8: -/* C483C8 802417E8 46200020 */ cvt.s.d $f0, $f0 -/* C483CC 802417EC E600003C */ swc1 $f0, 0x3c($s0) -/* C483D0 802417F0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C483D4 802417F4 46002001 */ sub.s $f0, $f4, $f0 -/* C483D8 802417F8 3C013FF0 */ lui $at, 0x3ff0 -/* C483DC 802417FC 44811800 */ mtc1 $at, $f3 -/* C483E0 80241800 44801000 */ mtc1 $zero, $f2 -/* C483E4 80241804 46000005 */ abs.s $f0, $f0 -/* C483E8 80241808 46000021 */ cvt.d.s $f0, $f0 -/* C483EC 8024180C 4622003C */ c.lt.d $f0, $f2 -/* C483F0 80241810 00000000 */ nop -/* C483F4 80241814 45000036 */ bc1f .L802418F0 -/* C483F8 80241818 2403FFEF */ addiu $v1, $zero, -0x11 -/* C483FC 8024181C E604003C */ swc1 $f4, 0x3c($s0) -/* C48400 80241820 8E22006C */ lw $v0, 0x6c($s1) -/* C48404 80241824 00431024 */ and $v0, $v0, $v1 -/* C48408 80241828 0809063C */ j .L802418F0 -/* C4840C 8024182C AE22006C */ sw $v0, 0x6c($s1) -.L80241830: -/* C48410 80241830 8E220070 */ lw $v0, 0x70($s1) -/* C48414 80241834 1840002E */ blez $v0, .L802418F0 -/* C48418 80241838 00000000 */ nop -/* C4841C 8024183C C62C0074 */ lwc1 $f12, 0x74($s1) -/* C48420 80241840 0C00A8BB */ jal sin_deg -/* C48424 80241844 46806320 */ cvt.s.w $f12, $f12 -/* C48428 80241848 8E020000 */ lw $v0, ($s0) -/* C4842C 8024184C 30420008 */ andi $v0, $v0, 8 -/* C48430 80241850 10400003 */ beqz $v0, .L80241860 -/* C48434 80241854 46000506 */ mov.s $f20, $f0 -/* C48438 80241858 08090628 */ j .L802418A0 -/* C4843C 8024185C 0000102D */ daddu $v0, $zero, $zero -.L80241860: -/* C48440 80241860 27A50028 */ addiu $a1, $sp, 0x28 -/* C48444 80241864 27A6002C */ addiu $a2, $sp, 0x2c -/* C48448 80241868 C6000038 */ lwc1 $f0, 0x38($s0) -/* C4844C 8024186C C602003C */ lwc1 $f2, 0x3c($s0) -/* C48450 80241870 C6040040 */ lwc1 $f4, 0x40($s0) -/* C48454 80241874 3C01447A */ lui $at, 0x447a -/* C48458 80241878 44813000 */ mtc1 $at, $f6 -/* C4845C 8024187C 27A20034 */ addiu $v0, $sp, 0x34 -/* C48460 80241880 E7A00028 */ swc1 $f0, 0x28($sp) -/* C48464 80241884 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C48468 80241888 E7A40030 */ swc1 $f4, 0x30($sp) -/* C4846C 8024188C E7A60034 */ swc1 $f6, 0x34($sp) -/* C48470 80241890 AFA20010 */ sw $v0, 0x10($sp) -/* C48474 80241894 8E040080 */ lw $a0, 0x80($s0) -/* C48478 80241898 0C0372DF */ jal func_800DCB7C -/* C4847C 8024189C 27A70030 */ addiu $a3, $sp, 0x30 -.L802418A0: -/* C48480 802418A0 10400007 */ beqz $v0, .L802418C0 -/* C48484 802418A4 00000000 */ nop -/* C48488 802418A8 4616A082 */ mul.s $f2, $f20, $f22 -/* C4848C 802418AC 00000000 */ nop -/* C48490 802418B0 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C48494 802418B4 461A0000 */ add.s $f0, $f0, $f26 -/* C48498 802418B8 08090633 */ j .L802418CC -/* C4849C 802418BC 46020000 */ add.s $f0, $f0, $f2 -.L802418C0: -/* C484A0 802418C0 4616A002 */ mul.s $f0, $f20, $f22 -/* C484A4 802418C4 00000000 */ nop -/* C484A8 802418C8 4600C000 */ add.s $f0, $f24, $f0 -.L802418CC: -/* C484AC 802418CC E600003C */ swc1 $f0, 0x3c($s0) -/* C484B0 802418D0 8E220074 */ lw $v0, 0x74($s1) -/* C484B4 802418D4 2442000A */ addiu $v0, $v0, 0xa -/* C484B8 802418D8 44826000 */ mtc1 $v0, $f12 -/* C484BC 802418DC 00000000 */ nop -/* C484C0 802418E0 0C00A6C9 */ jal clamp_angle -/* C484C4 802418E4 46806320 */ cvt.s.w $f12, $f12 -/* C484C8 802418E8 4600020D */ trunc.w.s $f8, $f0 -/* C484CC 802418EC E6280074 */ swc1 $f8, 0x74($s1) -.L802418F0: -/* C484D0 802418F0 8E220090 */ lw $v0, 0x90($s1) -/* C484D4 802418F4 1C40004A */ bgtz $v0, .L80241A20 -/* C484D8 802418F8 2442FFFF */ addiu $v0, $v0, -1 -/* C484DC 802418FC 8E430014 */ lw $v1, 0x14($s2) -/* C484E0 80241900 04600048 */ bltz $v1, .L80241A24 -/* C484E4 80241904 00000000 */ nop -/* C484E8 80241908 8E620074 */ lw $v0, 0x74($s3) -/* C484EC 8024190C 1C400042 */ bgtz $v0, .L80241A18 -/* C484F0 80241910 2442FFFF */ addiu $v0, $v0, -1 -/* C484F4 80241914 AE630074 */ sw $v1, 0x74($s3) -/* C484F8 80241918 860200A8 */ lh $v0, 0xa8($s0) -/* C484FC 8024191C C602003C */ lwc1 $f2, 0x3c($s0) -/* C48500 80241920 44820000 */ mtc1 $v0, $f0 -/* C48504 80241924 00000000 */ nop -/* C48508 80241928 46800020 */ cvt.s.w $f0, $f0 -/* C4850C 8024192C 46001080 */ add.s $f2, $f2, $f0 -/* C48510 80241930 3C014024 */ lui $at, 0x4024 -/* C48514 80241934 44810800 */ mtc1 $at, $f1 -/* C48518 80241938 44800000 */ mtc1 $zero, $f0 -/* C4851C 8024193C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C48520 80241940 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C48524 80241944 460010A1 */ cvt.d.s $f2, $f2 -/* C48528 80241948 46201080 */ add.d $f2, $f2, $f0 -/* C4852C 8024194C C440002C */ lwc1 $f0, 0x2c($v0) -/* C48530 80241950 46000021 */ cvt.d.s $f0, $f0 -/* C48534 80241954 4622003C */ c.lt.d $f0, $f2 -/* C48538 80241958 00000000 */ nop -/* C4853C 8024195C 4500002C */ bc1f .L80241A10 -/* C48540 80241960 02A0202D */ daddu $a0, $s5, $zero -/* C48544 80241964 AFA00010 */ sw $zero, 0x10($sp) -/* C48548 80241968 8E46000C */ lw $a2, 0xc($s2) -/* C4854C 8024196C 8E470010 */ lw $a3, 0x10($s2) -/* C48550 80241970 0C01242D */ jal func_800490B4 -/* C48554 80241974 0220282D */ daddu $a1, $s1, $zero -/* C48558 80241978 10400025 */ beqz $v0, .L80241A10 -/* C4855C 8024197C 0000202D */ daddu $a0, $zero, $zero -/* C48560 80241980 0200282D */ daddu $a1, $s0, $zero -/* C48564 80241984 0000302D */ daddu $a2, $zero, $zero -/* C48568 80241988 2412000C */ addiu $s2, $zero, 0xc -/* C4856C 8024198C 860300A8 */ lh $v1, 0xa8($s0) -/* C48570 80241990 3C013F80 */ lui $at, 0x3f80 -/* C48574 80241994 44810000 */ mtc1 $at, $f0 -/* C48578 80241998 3C014000 */ lui $at, 0x4000 -/* C4857C 8024199C 44811000 */ mtc1 $at, $f2 -/* C48580 802419A0 3C01C1A0 */ lui $at, 0xc1a0 -/* C48584 802419A4 44812000 */ mtc1 $at, $f4 -/* C48588 802419A8 44834000 */ mtc1 $v1, $f8 -/* C4858C 802419AC 00000000 */ nop -/* C48590 802419B0 46804220 */ cvt.s.w $f8, $f8 -/* C48594 802419B4 44074000 */ mfc1 $a3, $f8 -/* C48598 802419B8 27A20038 */ addiu $v0, $sp, 0x38 -/* C4859C 802419BC AFB2001C */ sw $s2, 0x1c($sp) -/* C485A0 802419C0 AFA20020 */ sw $v0, 0x20($sp) -/* C485A4 802419C4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C485A8 802419C8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C485AC 802419CC 0C01BFA4 */ jal fx_emote -/* C485B0 802419D0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C485B4 802419D4 0200202D */ daddu $a0, $s0, $zero -/* C485B8 802419D8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C485BC 802419DC C480003C */ lwc1 $f0, 0x3c($a0) -/* C485C0 802419E0 3C060020 */ lui $a2, 0x20 -/* C485C4 802419E4 0C012530 */ jal func_800494C0 -/* C485C8 802419E8 E4800064 */ swc1 $f0, 0x64($a0) -/* C485CC 802419EC 8E220018 */ lw $v0, 0x18($s1) -/* C485D0 802419F0 9442002A */ lhu $v0, 0x2a($v0) -/* C485D4 802419F4 30420001 */ andi $v0, $v0, 1 -/* C485D8 802419F8 10400003 */ beqz $v0, .L80241A08 -/* C485DC 802419FC 2402000A */ addiu $v0, $zero, 0xa -/* C485E0 80241A00 080906F2 */ j .L80241BC8 -/* C485E4 80241A04 AE620070 */ sw $v0, 0x70($s3) -.L80241A08: -/* C485E8 80241A08 080906F2 */ j .L80241BC8 -/* C485EC 80241A0C AE720070 */ sw $s2, 0x70($s3) -.L80241A10: -/* C485F0 80241A10 8E620074 */ lw $v0, 0x74($s3) -/* C485F4 80241A14 2442FFFF */ addiu $v0, $v0, -1 -.L80241A18: -/* C485F8 80241A18 08090689 */ j .L80241A24 -/* C485FC 80241A1C AE620074 */ sw $v0, 0x74($s3) -.L80241A20: -/* C48600 80241A20 AE220090 */ sw $v0, 0x90($s1) -.L80241A24: -/* C48604 80241A24 8E2300D0 */ lw $v1, 0xd0($s1) -/* C48608 80241A28 C6000040 */ lwc1 $f0, 0x40($s0) -/* C4860C 80241A2C C4620000 */ lwc1 $f2, ($v1) -/* C48610 80241A30 468010A0 */ cvt.s.w $f2, $f2 -/* C48614 80241A34 C4640008 */ lwc1 $f4, 8($v1) -/* C48618 80241A38 46802120 */ cvt.s.w $f4, $f4 -/* C4861C 80241A3C E7A00010 */ swc1 $f0, 0x10($sp) -/* C48620 80241A40 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48624 80241A44 44051000 */ mfc1 $a1, $f2 -/* C48628 80241A48 C440000C */ lwc1 $f0, 0xc($v0) -/* C4862C 80241A4C 46800020 */ cvt.s.w $f0, $f0 -/* C48630 80241A50 E7A00014 */ swc1 $f0, 0x14($sp) -/* C48634 80241A54 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48638 80241A58 44062000 */ mfc1 $a2, $f4 -/* C4863C 80241A5C C4400010 */ lwc1 $f0, 0x10($v0) -/* C48640 80241A60 46800020 */ cvt.s.w $f0, $f0 -/* C48644 80241A64 E7A00018 */ swc1 $f0, 0x18($sp) -/* C48648 80241A68 8C640018 */ lw $a0, 0x18($v1) -/* C4864C 80241A6C 0C0123F5 */ jal is_point_within_region -/* C48650 80241A70 8E070038 */ lw $a3, 0x38($s0) -/* C48654 80241A74 1040001A */ beqz $v0, .L80241AE0 -/* C48658 80241A78 00000000 */ nop -/* C4865C 80241A7C 8E060038 */ lw $a2, 0x38($s0) -/* C48660 80241A80 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48664 80241A84 8E070040 */ lw $a3, 0x40($s0) -/* C48668 80241A88 C44C0000 */ lwc1 $f12, ($v0) -/* C4866C 80241A8C 46806320 */ cvt.s.w $f12, $f12 -/* C48670 80241A90 C44E0008 */ lwc1 $f14, 8($v0) -/* C48674 80241A94 0C00A7B5 */ jal dist2D -/* C48678 80241A98 468073A0 */ cvt.s.w $f14, $f14 -/* C4867C 80241A9C C6020018 */ lwc1 $f2, 0x18($s0) -/* C48680 80241AA0 4600103C */ c.lt.s $f2, $f0 -/* C48684 80241AA4 00000000 */ nop -/* C48688 80241AA8 4500000D */ bc1f .L80241AE0 -/* C4868C 80241AAC E7A00034 */ swc1 $f0, 0x34($sp) -/* C48690 80241AB0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C48694 80241AB4 8E2200D0 */ lw $v0, 0xd0($s1) -/* C48698 80241AB8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C4869C 80241ABC C4480000 */ lwc1 $f8, ($v0) -/* C486A0 80241AC0 46804220 */ cvt.s.w $f8, $f8 -/* C486A4 80241AC4 44064000 */ mfc1 $a2, $f8 -/* C486A8 80241AC8 C4480008 */ lwc1 $f8, 8($v0) -/* C486AC 80241ACC 46804220 */ cvt.s.w $f8, $f8 -/* C486B0 80241AD0 44074000 */ mfc1 $a3, $f8 -/* C486B4 80241AD4 0C00A720 */ jal atan2 -/* C486B8 80241AD8 24140001 */ addiu $s4, $zero, 1 -/* C486BC 80241ADC E600000C */ swc1 $f0, 0xc($s0) -.L80241AE0: -/* C486C0 80241AE0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C486C4 80241AE4 8C43000C */ lw $v1, 0xc($v0) -/* C486C8 80241AE8 8C420010 */ lw $v0, 0x10($v0) -/* C486CC 80241AEC 00621825 */ or $v1, $v1, $v0 -/* C486D0 80241AF0 00741825 */ or $v1, $v1, $s4 -/* C486D4 80241AF4 10600008 */ beqz $v1, .L80241B18 -/* C486D8 80241AF8 00000000 */ nop -/* C486DC 80241AFC 8602008C */ lh $v0, 0x8c($s0) -/* C486E0 80241B00 14400031 */ bnez $v0, .L80241BC8 -/* C486E4 80241B04 00000000 */ nop -/* C486E8 80241B08 8E050018 */ lw $a1, 0x18($s0) -/* C486EC 80241B0C 8E06000C */ lw $a2, 0xc($s0) -/* C486F0 80241B10 0C00EA95 */ jal npc_move_heading -/* C486F4 80241B14 0200202D */ daddu $a0, $s0, $zero -.L80241B18: -/* C486F8 80241B18 C600003C */ lwc1 $f0, 0x3c($s0) -/* C486FC 80241B1C 3C014059 */ lui $at, 0x4059 -/* C48700 80241B20 44811800 */ mtc1 $at, $f3 -/* C48704 80241B24 44801000 */ mtc1 $zero, $f2 -/* C48708 80241B28 46000021 */ cvt.d.s $f0, $f0 -/* C4870C 80241B2C 46220002 */ mul.d $f0, $f0, $f2 -/* C48710 80241B30 00000000 */ nop -/* C48714 80241B34 4620020D */ trunc.w.d $f8, $f0 -/* C48718 80241B38 E628007C */ swc1 $f8, 0x7c($s1) -/* C4871C 80241B3C 8E420004 */ lw $v0, 4($s2) -/* C48720 80241B40 18400021 */ blez $v0, .L80241BC8 -/* C48724 80241B44 00000000 */ nop -/* C48728 80241B48 8602008E */ lh $v0, 0x8e($s0) -/* C4872C 80241B4C 9603008E */ lhu $v1, 0x8e($s0) -/* C48730 80241B50 18400005 */ blez $v0, .L80241B68 -/* C48734 80241B54 2462FFFF */ addiu $v0, $v1, -1 -/* C48738 80241B58 A602008E */ sh $v0, 0x8e($s0) -/* C4873C 80241B5C 00021400 */ sll $v0, $v0, 0x10 -/* C48740 80241B60 1C400019 */ bgtz $v0, .L80241BC8 -/* C48744 80241B64 00000000 */ nop -.L80241B68: -/* C48748 80241B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C4874C 80241B6C 24020002 */ addiu $v0, $zero, 2 -/* C48750 80241B70 0C00A67F */ jal rand_int -/* C48754 80241B74 AE620070 */ sw $v0, 0x70($s3) -/* C48758 80241B78 3C035555 */ lui $v1, 0x5555 -/* C4875C 80241B7C 34635556 */ ori $v1, $v1, 0x5556 -/* C48760 80241B80 00430018 */ mult $v0, $v1 -/* C48764 80241B84 000227C3 */ sra $a0, $v0, 0x1f -/* C48768 80241B88 00004010 */ mfhi $t0 -/* C4876C 80241B8C 01042023 */ subu $a0, $t0, $a0 -/* C48770 80241B90 00041840 */ sll $v1, $a0, 1 -/* C48774 80241B94 00641821 */ addu $v1, $v1, $a0 -/* C48778 80241B98 00431023 */ subu $v0, $v0, $v1 -/* C4877C 80241B9C 24430002 */ addiu $v1, $v0, 2 -/* C48780 80241BA0 AE630074 */ sw $v1, 0x74($s3) -/* C48784 80241BA4 8E42002C */ lw $v0, 0x2c($s2) -/* C48788 80241BA8 58400007 */ blezl $v0, .L80241BC8 -/* C4878C 80241BAC AE600070 */ sw $zero, 0x70($s3) -/* C48790 80241BB0 8E420008 */ lw $v0, 8($s2) -/* C48794 80241BB4 18400003 */ blez $v0, .L80241BC4 -/* C48798 80241BB8 28620003 */ slti $v0, $v1, 3 -/* C4879C 80241BBC 10400002 */ beqz $v0, .L80241BC8 -/* C487A0 80241BC0 00000000 */ nop -.L80241BC4: -/* C487A4 80241BC4 AE600070 */ sw $zero, 0x70($s3) -.L80241BC8: -/* C487A8 80241BC8 8FBF0058 */ lw $ra, 0x58($sp) -/* C487AC 80241BCC 8FB50054 */ lw $s5, 0x54($sp) -/* C487B0 80241BD0 8FB40050 */ lw $s4, 0x50($sp) -/* C487B4 80241BD4 8FB3004C */ lw $s3, 0x4c($sp) -/* C487B8 80241BD8 8FB20048 */ lw $s2, 0x48($sp) -/* C487BC 80241BDC 8FB10044 */ lw $s1, 0x44($sp) -/* C487C0 80241BE0 8FB00040 */ lw $s0, 0x40($sp) -/* C487C4 80241BE4 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C487C8 80241BE8 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C487CC 80241BEC D7B60068 */ ldc1 $f22, 0x68($sp) -/* C487D0 80241BF0 D7B40060 */ ldc1 $f20, 0x60($sp) -/* C487D4 80241BF4 03E00008 */ jr $ra -/* C487D8 80241BF8 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s new file mode 100644 index 0000000000..75b9f1f0d1 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802415D4_C481B4.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415D4_C481B4 +/* C481B4 802415D4 27BDFF80 */ addiu $sp, $sp, -0x80 +/* C481B8 802415D8 AFB3004C */ sw $s3, 0x4c($sp) +/* C481BC 802415DC 0080982D */ daddu $s3, $a0, $zero +/* C481C0 802415E0 AFBF0058 */ sw $ra, 0x58($sp) +/* C481C4 802415E4 AFB50054 */ sw $s5, 0x54($sp) +/* C481C8 802415E8 AFB40050 */ sw $s4, 0x50($sp) +/* C481CC 802415EC AFB20048 */ sw $s2, 0x48($sp) +/* C481D0 802415F0 AFB10044 */ sw $s1, 0x44($sp) +/* C481D4 802415F4 AFB00040 */ sw $s0, 0x40($sp) +/* C481D8 802415F8 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* C481DC 802415FC F7B80070 */ sdc1 $f24, 0x70($sp) +/* C481E0 80241600 F7B60068 */ sdc1 $f22, 0x68($sp) +/* C481E4 80241604 F7B40060 */ sdc1 $f20, 0x60($sp) +/* C481E8 80241608 8E710148 */ lw $s1, 0x148($s3) +/* C481EC 8024160C 00A0902D */ daddu $s2, $a1, $zero +/* C481F0 80241610 86240008 */ lh $a0, 8($s1) +/* C481F4 80241614 0C00EABB */ jal get_npc_unsafe +/* C481F8 80241618 00C0A82D */ daddu $s5, $a2, $zero +/* C481FC 8024161C 0040802D */ daddu $s0, $v0, $zero +/* C48200 80241620 0000A02D */ daddu $s4, $zero, $zero +/* C48204 80241624 C624007C */ lwc1 $f4, 0x7c($s1) +/* C48208 80241628 46802120 */ cvt.s.w $f4, $f4 +/* C4820C 8024162C C6220088 */ lwc1 $f2, 0x88($s1) +/* C48210 80241630 468010A0 */ cvt.s.w $f2, $f2 +/* C48214 80241634 460010A1 */ cvt.d.s $f2, $f2 +/* C48218 80241638 46002121 */ cvt.d.s $f4, $f4 +/* C4821C 8024163C C600003C */ lwc1 $f0, 0x3c($s0) +/* C48220 80241640 3C014059 */ lui $at, 0x4059 +/* C48224 80241644 44813800 */ mtc1 $at, $f7 +/* C48228 80241648 44803000 */ mtc1 $zero, $f6 +/* C4822C 8024164C 46000021 */ cvt.d.s $f0, $f0 +/* C48230 80241650 46260002 */ mul.d $f0, $f0, $f6 +/* C48234 80241654 00000000 */ nop +/* C48238 80241658 24020001 */ addiu $v0, $zero, 1 +/* C4823C 8024165C 8E24006C */ lw $a0, 0x6c($s1) +/* C48240 80241660 46261083 */ div.d $f2, $f2, $f6 +/* C48244 80241664 462010A0 */ cvt.s.d $f2, $f2 +/* C48248 80241668 46262103 */ div.d $f4, $f4, $f6 +/* C4824C 8024166C 46202520 */ cvt.s.d $f20, $f4 +/* C48250 80241670 30830011 */ andi $v1, $a0, 0x11 +/* C48254 80241674 4620020D */ trunc.w.d $f8, $f0 +/* C48258 80241678 E628007C */ swc1 $f8, 0x7c($s1) +/* C4825C 8024167C C6200078 */ lwc1 $f0, 0x78($s1) +/* C48260 80241680 46800020 */ cvt.s.w $f0, $f0 +/* C48264 80241684 46000021 */ cvt.d.s $f0, $f0 +/* C48268 80241688 46260003 */ div.d $f0, $f0, $f6 +/* C4826C 8024168C 462006A0 */ cvt.s.d $f26, $f0 +/* C48270 80241690 C6200070 */ lwc1 $f0, 0x70($s1) +/* C48274 80241694 46800020 */ cvt.s.w $f0, $f0 +/* C48278 80241698 46000021 */ cvt.d.s $f0, $f0 +/* C4827C 8024169C 46260003 */ div.d $f0, $f0, $f6 +/* C48280 802416A0 462005A0 */ cvt.s.d $f22, $f0 +/* C48284 802416A4 14620025 */ bne $v1, $v0, .L8024173C +/* C48288 802416A8 4602D600 */ add.s $f24, $f26, $f2 +/* C4828C 802416AC 8E020000 */ lw $v0, ($s0) +/* C48290 802416B0 30420008 */ andi $v0, $v0, 8 +/* C48294 802416B4 10400009 */ beqz $v0, .L802416DC +/* C48298 802416B8 27A50028 */ addiu $a1, $sp, 0x28 +/* C4829C 802416BC C600003C */ lwc1 $f0, 0x3c($s0) +/* C482A0 802416C0 4600C001 */ sub.s $f0, $f24, $f0 +/* C482A4 802416C4 4600B03C */ c.lt.s $f22, $f0 +/* C482A8 802416C8 00000000 */ nop +/* C482AC 802416CC 4500001B */ bc1f .L8024173C +/* C482B0 802416D0 34820010 */ ori $v0, $a0, 0x10 +/* C482B4 802416D4 080905CF */ j .L8024173C +/* C482B8 802416D8 AE22006C */ sw $v0, 0x6c($s1) +.L802416DC: +/* C482BC 802416DC 27A6002C */ addiu $a2, $sp, 0x2c +/* C482C0 802416E0 C6000038 */ lwc1 $f0, 0x38($s0) +/* C482C4 802416E4 C602003C */ lwc1 $f2, 0x3c($s0) +/* C482C8 802416E8 C6040040 */ lwc1 $f4, 0x40($s0) +/* C482CC 802416EC 3C01447A */ lui $at, 0x447a +/* C482D0 802416F0 44813000 */ mtc1 $at, $f6 +/* C482D4 802416F4 27A20034 */ addiu $v0, $sp, 0x34 +/* C482D8 802416F8 E7A00028 */ swc1 $f0, 0x28($sp) +/* C482DC 802416FC E7A2002C */ swc1 $f2, 0x2c($sp) +/* C482E0 80241700 E7A40030 */ swc1 $f4, 0x30($sp) +/* C482E4 80241704 E7A60034 */ swc1 $f6, 0x34($sp) +/* C482E8 80241708 AFA20010 */ sw $v0, 0x10($sp) +/* C482EC 8024170C 8E040080 */ lw $a0, 0x80($s0) +/* C482F0 80241710 0C0372DF */ jal func_800DCB7C +/* C482F4 80241714 27A70030 */ addiu $a3, $sp, 0x30 +/* C482F8 80241718 C7A00034 */ lwc1 $f0, 0x34($sp) +/* C482FC 8024171C 4600D001 */ sub.s $f0, $f26, $f0 +/* C48300 80241720 4600B03C */ c.lt.s $f22, $f0 +/* C48304 80241724 00000000 */ nop +/* C48308 80241728 45000004 */ bc1f .L8024173C +/* C4830C 8024172C 00000000 */ nop +/* C48310 80241730 8E22006C */ lw $v0, 0x6c($s1) +/* C48314 80241734 34420010 */ ori $v0, $v0, 0x10 +/* C48318 80241738 AE22006C */ sw $v0, 0x6c($s1) +.L8024173C: +/* C4831C 8024173C 8E22006C */ lw $v0, 0x6c($s1) +/* C48320 80241740 24030011 */ addiu $v1, $zero, 0x11 +/* C48324 80241744 30420011 */ andi $v0, $v0, 0x11 +/* C48328 80241748 14430039 */ bne $v0, $v1, .L80241830 +/* C4832C 8024174C 00000000 */ nop +/* C48330 80241750 8E020000 */ lw $v0, ($s0) +/* C48334 80241754 30420008 */ andi $v0, $v0, 8 +/* C48338 80241758 1040000A */ beqz $v0, .L80241784 +/* C4833C 8024175C 4600C106 */ mov.s $f4, $f24 +/* C48340 80241760 4614C081 */ sub.s $f2, $f24, $f20 +/* C48344 80241764 3C018024 */ lui $at, 0x8024 +/* C48348 80241768 D42056C8 */ ldc1 $f0, 0x56c8($at) +/* C4834C 8024176C 460010A1 */ cvt.d.s $f2, $f2 +/* C48350 80241770 46201082 */ mul.d $f2, $f2, $f0 +/* C48354 80241774 00000000 */ nop +/* C48358 80241778 4600A021 */ cvt.d.s $f0, $f20 +/* C4835C 8024177C 080905FA */ j .L802417E8 +/* C48360 80241780 46220000 */ add.d $f0, $f0, $f2 +.L80241784: +/* C48364 80241784 27A50028 */ addiu $a1, $sp, 0x28 +/* C48368 80241788 27A6002C */ addiu $a2, $sp, 0x2c +/* C4836C 8024178C C6000038 */ lwc1 $f0, 0x38($s0) +/* C48370 80241790 C6020040 */ lwc1 $f2, 0x40($s0) +/* C48374 80241794 3C01447A */ lui $at, 0x447a +/* C48378 80241798 44812000 */ mtc1 $at, $f4 +/* C4837C 8024179C 27A20034 */ addiu $v0, $sp, 0x34 +/* C48380 802417A0 E7B4002C */ swc1 $f20, 0x2c($sp) +/* C48384 802417A4 E7A00028 */ swc1 $f0, 0x28($sp) +/* C48388 802417A8 E7A20030 */ swc1 $f2, 0x30($sp) +/* C4838C 802417AC E7A40034 */ swc1 $f4, 0x34($sp) +/* C48390 802417B0 AFA20010 */ sw $v0, 0x10($sp) +/* C48394 802417B4 8E040080 */ lw $a0, 0x80($s0) +/* C48398 802417B8 0C0372DF */ jal func_800DCB7C +/* C4839C 802417BC 27A70030 */ addiu $a3, $sp, 0x30 +/* C483A0 802417C0 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* C483A4 802417C4 461A2100 */ add.s $f4, $f4, $f26 +/* C483A8 802417C8 46142081 */ sub.s $f2, $f4, $f20 +/* C483AC 802417CC 3C018024 */ lui $at, 0x8024 +/* C483B0 802417D0 D42056D0 */ ldc1 $f0, 0x56d0($at) +/* C483B4 802417D4 460010A1 */ cvt.d.s $f2, $f2 +/* C483B8 802417D8 46201082 */ mul.d $f2, $f2, $f0 +/* C483BC 802417DC 00000000 */ nop +/* C483C0 802417E0 4600A021 */ cvt.d.s $f0, $f20 +/* C483C4 802417E4 46220000 */ add.d $f0, $f0, $f2 +.L802417E8: +/* C483C8 802417E8 46200020 */ cvt.s.d $f0, $f0 +/* C483CC 802417EC E600003C */ swc1 $f0, 0x3c($s0) +/* C483D0 802417F0 C600003C */ lwc1 $f0, 0x3c($s0) +/* C483D4 802417F4 46002001 */ sub.s $f0, $f4, $f0 +/* C483D8 802417F8 3C013FF0 */ lui $at, 0x3ff0 +/* C483DC 802417FC 44811800 */ mtc1 $at, $f3 +/* C483E0 80241800 44801000 */ mtc1 $zero, $f2 +/* C483E4 80241804 46000005 */ abs.s $f0, $f0 +/* C483E8 80241808 46000021 */ cvt.d.s $f0, $f0 +/* C483EC 8024180C 4622003C */ c.lt.d $f0, $f2 +/* C483F0 80241810 00000000 */ nop +/* C483F4 80241814 45000036 */ bc1f .L802418F0 +/* C483F8 80241818 2403FFEF */ addiu $v1, $zero, -0x11 +/* C483FC 8024181C E604003C */ swc1 $f4, 0x3c($s0) +/* C48400 80241820 8E22006C */ lw $v0, 0x6c($s1) +/* C48404 80241824 00431024 */ and $v0, $v0, $v1 +/* C48408 80241828 0809063C */ j .L802418F0 +/* C4840C 8024182C AE22006C */ sw $v0, 0x6c($s1) +.L80241830: +/* C48410 80241830 8E220070 */ lw $v0, 0x70($s1) +/* C48414 80241834 1840002E */ blez $v0, .L802418F0 +/* C48418 80241838 00000000 */ nop +/* C4841C 8024183C C62C0074 */ lwc1 $f12, 0x74($s1) +/* C48420 80241840 0C00A8BB */ jal sin_deg +/* C48424 80241844 46806320 */ cvt.s.w $f12, $f12 +/* C48428 80241848 8E020000 */ lw $v0, ($s0) +/* C4842C 8024184C 30420008 */ andi $v0, $v0, 8 +/* C48430 80241850 10400003 */ beqz $v0, .L80241860 +/* C48434 80241854 46000506 */ mov.s $f20, $f0 +/* C48438 80241858 08090628 */ j .L802418A0 +/* C4843C 8024185C 0000102D */ daddu $v0, $zero, $zero +.L80241860: +/* C48440 80241860 27A50028 */ addiu $a1, $sp, 0x28 +/* C48444 80241864 27A6002C */ addiu $a2, $sp, 0x2c +/* C48448 80241868 C6000038 */ lwc1 $f0, 0x38($s0) +/* C4844C 8024186C C602003C */ lwc1 $f2, 0x3c($s0) +/* C48450 80241870 C6040040 */ lwc1 $f4, 0x40($s0) +/* C48454 80241874 3C01447A */ lui $at, 0x447a +/* C48458 80241878 44813000 */ mtc1 $at, $f6 +/* C4845C 8024187C 27A20034 */ addiu $v0, $sp, 0x34 +/* C48460 80241880 E7A00028 */ swc1 $f0, 0x28($sp) +/* C48464 80241884 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C48468 80241888 E7A40030 */ swc1 $f4, 0x30($sp) +/* C4846C 8024188C E7A60034 */ swc1 $f6, 0x34($sp) +/* C48470 80241890 AFA20010 */ sw $v0, 0x10($sp) +/* C48474 80241894 8E040080 */ lw $a0, 0x80($s0) +/* C48478 80241898 0C0372DF */ jal func_800DCB7C +/* C4847C 8024189C 27A70030 */ addiu $a3, $sp, 0x30 +.L802418A0: +/* C48480 802418A0 10400007 */ beqz $v0, .L802418C0 +/* C48484 802418A4 00000000 */ nop +/* C48488 802418A8 4616A082 */ mul.s $f2, $f20, $f22 +/* C4848C 802418AC 00000000 */ nop +/* C48490 802418B0 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C48494 802418B4 461A0000 */ add.s $f0, $f0, $f26 +/* C48498 802418B8 08090633 */ j .L802418CC +/* C4849C 802418BC 46020000 */ add.s $f0, $f0, $f2 +.L802418C0: +/* C484A0 802418C0 4616A002 */ mul.s $f0, $f20, $f22 +/* C484A4 802418C4 00000000 */ nop +/* C484A8 802418C8 4600C000 */ add.s $f0, $f24, $f0 +.L802418CC: +/* C484AC 802418CC E600003C */ swc1 $f0, 0x3c($s0) +/* C484B0 802418D0 8E220074 */ lw $v0, 0x74($s1) +/* C484B4 802418D4 2442000A */ addiu $v0, $v0, 0xa +/* C484B8 802418D8 44826000 */ mtc1 $v0, $f12 +/* C484BC 802418DC 00000000 */ nop +/* C484C0 802418E0 0C00A6C9 */ jal clamp_angle +/* C484C4 802418E4 46806320 */ cvt.s.w $f12, $f12 +/* C484C8 802418E8 4600020D */ trunc.w.s $f8, $f0 +/* C484CC 802418EC E6280074 */ swc1 $f8, 0x74($s1) +.L802418F0: +/* C484D0 802418F0 8E220090 */ lw $v0, 0x90($s1) +/* C484D4 802418F4 1C40004A */ bgtz $v0, .L80241A20 +/* C484D8 802418F8 2442FFFF */ addiu $v0, $v0, -1 +/* C484DC 802418FC 8E430014 */ lw $v1, 0x14($s2) +/* C484E0 80241900 04600048 */ bltz $v1, .L80241A24 +/* C484E4 80241904 00000000 */ nop +/* C484E8 80241908 8E620074 */ lw $v0, 0x74($s3) +/* C484EC 8024190C 1C400042 */ bgtz $v0, .L80241A18 +/* C484F0 80241910 2442FFFF */ addiu $v0, $v0, -1 +/* C484F4 80241914 AE630074 */ sw $v1, 0x74($s3) +/* C484F8 80241918 860200A8 */ lh $v0, 0xa8($s0) +/* C484FC 8024191C C602003C */ lwc1 $f2, 0x3c($s0) +/* C48500 80241920 44820000 */ mtc1 $v0, $f0 +/* C48504 80241924 00000000 */ nop +/* C48508 80241928 46800020 */ cvt.s.w $f0, $f0 +/* C4850C 8024192C 46001080 */ add.s $f2, $f2, $f0 +/* C48510 80241930 3C014024 */ lui $at, 0x4024 +/* C48514 80241934 44810800 */ mtc1 $at, $f1 +/* C48518 80241938 44800000 */ mtc1 $zero, $f0 +/* C4851C 8024193C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C48520 80241940 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C48524 80241944 460010A1 */ cvt.d.s $f2, $f2 +/* C48528 80241948 46201080 */ add.d $f2, $f2, $f0 +/* C4852C 8024194C C440002C */ lwc1 $f0, 0x2c($v0) +/* C48530 80241950 46000021 */ cvt.d.s $f0, $f0 +/* C48534 80241954 4622003C */ c.lt.d $f0, $f2 +/* C48538 80241958 00000000 */ nop +/* C4853C 8024195C 4500002C */ bc1f .L80241A10 +/* C48540 80241960 02A0202D */ daddu $a0, $s5, $zero +/* C48544 80241964 AFA00010 */ sw $zero, 0x10($sp) +/* C48548 80241968 8E46000C */ lw $a2, 0xc($s2) +/* C4854C 8024196C 8E470010 */ lw $a3, 0x10($s2) +/* C48550 80241970 0C01242D */ jal func_800490B4 +/* C48554 80241974 0220282D */ daddu $a1, $s1, $zero +/* C48558 80241978 10400025 */ beqz $v0, .L80241A10 +/* C4855C 8024197C 0000202D */ daddu $a0, $zero, $zero +/* C48560 80241980 0200282D */ daddu $a1, $s0, $zero +/* C48564 80241984 0000302D */ daddu $a2, $zero, $zero +/* C48568 80241988 2412000C */ addiu $s2, $zero, 0xc +/* C4856C 8024198C 860300A8 */ lh $v1, 0xa8($s0) +/* C48570 80241990 3C013F80 */ lui $at, 0x3f80 +/* C48574 80241994 44810000 */ mtc1 $at, $f0 +/* C48578 80241998 3C014000 */ lui $at, 0x4000 +/* C4857C 8024199C 44811000 */ mtc1 $at, $f2 +/* C48580 802419A0 3C01C1A0 */ lui $at, 0xc1a0 +/* C48584 802419A4 44812000 */ mtc1 $at, $f4 +/* C48588 802419A8 44834000 */ mtc1 $v1, $f8 +/* C4858C 802419AC 00000000 */ nop +/* C48590 802419B0 46804220 */ cvt.s.w $f8, $f8 +/* C48594 802419B4 44074000 */ mfc1 $a3, $f8 +/* C48598 802419B8 27A20038 */ addiu $v0, $sp, 0x38 +/* C4859C 802419BC AFB2001C */ sw $s2, 0x1c($sp) +/* C485A0 802419C0 AFA20020 */ sw $v0, 0x20($sp) +/* C485A4 802419C4 E7A00010 */ swc1 $f0, 0x10($sp) +/* C485A8 802419C8 E7A20014 */ swc1 $f2, 0x14($sp) +/* C485AC 802419CC 0C01BFA4 */ jal fx_emote +/* C485B0 802419D0 E7A40018 */ swc1 $f4, 0x18($sp) +/* C485B4 802419D4 0200202D */ daddu $a0, $s0, $zero +/* C485B8 802419D8 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C485BC 802419DC C480003C */ lwc1 $f0, 0x3c($a0) +/* C485C0 802419E0 3C060020 */ lui $a2, 0x20 +/* C485C4 802419E4 0C012530 */ jal func_800494C0 +/* C485C8 802419E8 E4800064 */ swc1 $f0, 0x64($a0) +/* C485CC 802419EC 8E220018 */ lw $v0, 0x18($s1) +/* C485D0 802419F0 9442002A */ lhu $v0, 0x2a($v0) +/* C485D4 802419F4 30420001 */ andi $v0, $v0, 1 +/* C485D8 802419F8 10400003 */ beqz $v0, .L80241A08 +/* C485DC 802419FC 2402000A */ addiu $v0, $zero, 0xa +/* C485E0 80241A00 080906F2 */ j .L80241BC8 +/* C485E4 80241A04 AE620070 */ sw $v0, 0x70($s3) +.L80241A08: +/* C485E8 80241A08 080906F2 */ j .L80241BC8 +/* C485EC 80241A0C AE720070 */ sw $s2, 0x70($s3) +.L80241A10: +/* C485F0 80241A10 8E620074 */ lw $v0, 0x74($s3) +/* C485F4 80241A14 2442FFFF */ addiu $v0, $v0, -1 +.L80241A18: +/* C485F8 80241A18 08090689 */ j .L80241A24 +/* C485FC 80241A1C AE620074 */ sw $v0, 0x74($s3) +.L80241A20: +/* C48600 80241A20 AE220090 */ sw $v0, 0x90($s1) +.L80241A24: +/* C48604 80241A24 8E2300D0 */ lw $v1, 0xd0($s1) +/* C48608 80241A28 C6000040 */ lwc1 $f0, 0x40($s0) +/* C4860C 80241A2C C4620000 */ lwc1 $f2, ($v1) +/* C48610 80241A30 468010A0 */ cvt.s.w $f2, $f2 +/* C48614 80241A34 C4640008 */ lwc1 $f4, 8($v1) +/* C48618 80241A38 46802120 */ cvt.s.w $f4, $f4 +/* C4861C 80241A3C E7A00010 */ swc1 $f0, 0x10($sp) +/* C48620 80241A40 8E2200D0 */ lw $v0, 0xd0($s1) +/* C48624 80241A44 44051000 */ mfc1 $a1, $f2 +/* C48628 80241A48 C440000C */ lwc1 $f0, 0xc($v0) +/* C4862C 80241A4C 46800020 */ cvt.s.w $f0, $f0 +/* C48630 80241A50 E7A00014 */ swc1 $f0, 0x14($sp) +/* C48634 80241A54 8E2200D0 */ lw $v0, 0xd0($s1) +/* C48638 80241A58 44062000 */ mfc1 $a2, $f4 +/* C4863C 80241A5C C4400010 */ lwc1 $f0, 0x10($v0) +/* C48640 80241A60 46800020 */ cvt.s.w $f0, $f0 +/* C48644 80241A64 E7A00018 */ swc1 $f0, 0x18($sp) +/* C48648 80241A68 8C640018 */ lw $a0, 0x18($v1) +/* C4864C 80241A6C 0C0123F5 */ jal is_point_within_region +/* C48650 80241A70 8E070038 */ lw $a3, 0x38($s0) +/* C48654 80241A74 1040001A */ beqz $v0, .L80241AE0 +/* C48658 80241A78 00000000 */ nop +/* C4865C 80241A7C 8E060038 */ lw $a2, 0x38($s0) +/* C48660 80241A80 8E2200D0 */ lw $v0, 0xd0($s1) +/* C48664 80241A84 8E070040 */ lw $a3, 0x40($s0) +/* C48668 80241A88 C44C0000 */ lwc1 $f12, ($v0) +/* C4866C 80241A8C 46806320 */ cvt.s.w $f12, $f12 +/* C48670 80241A90 C44E0008 */ lwc1 $f14, 8($v0) +/* C48674 80241A94 0C00A7B5 */ jal dist2D +/* C48678 80241A98 468073A0 */ cvt.s.w $f14, $f14 +/* C4867C 80241A9C C6020018 */ lwc1 $f2, 0x18($s0) +/* C48680 80241AA0 4600103C */ c.lt.s $f2, $f0 +/* C48684 80241AA4 00000000 */ nop +/* C48688 80241AA8 4500000D */ bc1f .L80241AE0 +/* C4868C 80241AAC E7A00034 */ swc1 $f0, 0x34($sp) +/* C48690 80241AB0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C48694 80241AB4 8E2200D0 */ lw $v0, 0xd0($s1) +/* C48698 80241AB8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C4869C 80241ABC C4480000 */ lwc1 $f8, ($v0) +/* C486A0 80241AC0 46804220 */ cvt.s.w $f8, $f8 +/* C486A4 80241AC4 44064000 */ mfc1 $a2, $f8 +/* C486A8 80241AC8 C4480008 */ lwc1 $f8, 8($v0) +/* C486AC 80241ACC 46804220 */ cvt.s.w $f8, $f8 +/* C486B0 80241AD0 44074000 */ mfc1 $a3, $f8 +/* C486B4 80241AD4 0C00A720 */ jal atan2 +/* C486B8 80241AD8 24140001 */ addiu $s4, $zero, 1 +/* C486BC 80241ADC E600000C */ swc1 $f0, 0xc($s0) +.L80241AE0: +/* C486C0 80241AE0 8E2200D0 */ lw $v0, 0xd0($s1) +/* C486C4 80241AE4 8C43000C */ lw $v1, 0xc($v0) +/* C486C8 80241AE8 8C420010 */ lw $v0, 0x10($v0) +/* C486CC 80241AEC 00621825 */ or $v1, $v1, $v0 +/* C486D0 80241AF0 00741825 */ or $v1, $v1, $s4 +/* C486D4 80241AF4 10600008 */ beqz $v1, .L80241B18 +/* C486D8 80241AF8 00000000 */ nop +/* C486DC 80241AFC 8602008C */ lh $v0, 0x8c($s0) +/* C486E0 80241B00 14400031 */ bnez $v0, .L80241BC8 +/* C486E4 80241B04 00000000 */ nop +/* C486E8 80241B08 8E050018 */ lw $a1, 0x18($s0) +/* C486EC 80241B0C 8E06000C */ lw $a2, 0xc($s0) +/* C486F0 80241B10 0C00EA95 */ jal npc_move_heading +/* C486F4 80241B14 0200202D */ daddu $a0, $s0, $zero +.L80241B18: +/* C486F8 80241B18 C600003C */ lwc1 $f0, 0x3c($s0) +/* C486FC 80241B1C 3C014059 */ lui $at, 0x4059 +/* C48700 80241B20 44811800 */ mtc1 $at, $f3 +/* C48704 80241B24 44801000 */ mtc1 $zero, $f2 +/* C48708 80241B28 46000021 */ cvt.d.s $f0, $f0 +/* C4870C 80241B2C 46220002 */ mul.d $f0, $f0, $f2 +/* C48710 80241B30 00000000 */ nop +/* C48714 80241B34 4620020D */ trunc.w.d $f8, $f0 +/* C48718 80241B38 E628007C */ swc1 $f8, 0x7c($s1) +/* C4871C 80241B3C 8E420004 */ lw $v0, 4($s2) +/* C48720 80241B40 18400021 */ blez $v0, .L80241BC8 +/* C48724 80241B44 00000000 */ nop +/* C48728 80241B48 8602008E */ lh $v0, 0x8e($s0) +/* C4872C 80241B4C 9603008E */ lhu $v1, 0x8e($s0) +/* C48730 80241B50 18400005 */ blez $v0, .L80241B68 +/* C48734 80241B54 2462FFFF */ addiu $v0, $v1, -1 +/* C48738 80241B58 A602008E */ sh $v0, 0x8e($s0) +/* C4873C 80241B5C 00021400 */ sll $v0, $v0, 0x10 +/* C48740 80241B60 1C400019 */ bgtz $v0, .L80241BC8 +/* C48744 80241B64 00000000 */ nop +.L80241B68: +/* C48748 80241B68 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C4874C 80241B6C 24020002 */ addiu $v0, $zero, 2 +/* C48750 80241B70 0C00A67F */ jal rand_int +/* C48754 80241B74 AE620070 */ sw $v0, 0x70($s3) +/* C48758 80241B78 3C035555 */ lui $v1, 0x5555 +/* C4875C 80241B7C 34635556 */ ori $v1, $v1, 0x5556 +/* C48760 80241B80 00430018 */ mult $v0, $v1 +/* C48764 80241B84 000227C3 */ sra $a0, $v0, 0x1f +/* C48768 80241B88 00004010 */ mfhi $t0 +/* C4876C 80241B8C 01042023 */ subu $a0, $t0, $a0 +/* C48770 80241B90 00041840 */ sll $v1, $a0, 1 +/* C48774 80241B94 00641821 */ addu $v1, $v1, $a0 +/* C48778 80241B98 00431023 */ subu $v0, $v0, $v1 +/* C4877C 80241B9C 24430002 */ addiu $v1, $v0, 2 +/* C48780 80241BA0 AE630074 */ sw $v1, 0x74($s3) +/* C48784 80241BA4 8E42002C */ lw $v0, 0x2c($s2) +/* C48788 80241BA8 58400007 */ blezl $v0, .L80241BC8 +/* C4878C 80241BAC AE600070 */ sw $zero, 0x70($s3) +/* C48790 80241BB0 8E420008 */ lw $v0, 8($s2) +/* C48794 80241BB4 18400003 */ blez $v0, .L80241BC4 +/* C48798 80241BB8 28620003 */ slti $v0, $v1, 3 +/* C4879C 80241BBC 10400002 */ beqz $v0, .L80241BC8 +/* C487A0 80241BC0 00000000 */ nop +.L80241BC4: +/* C487A4 80241BC4 AE600070 */ sw $zero, 0x70($s3) +.L80241BC8: +/* C487A8 80241BC8 8FBF0058 */ lw $ra, 0x58($sp) +/* C487AC 80241BCC 8FB50054 */ lw $s5, 0x54($sp) +/* C487B0 80241BD0 8FB40050 */ lw $s4, 0x50($sp) +/* C487B4 80241BD4 8FB3004C */ lw $s3, 0x4c($sp) +/* C487B8 80241BD8 8FB20048 */ lw $s2, 0x48($sp) +/* C487BC 80241BDC 8FB10044 */ lw $s1, 0x44($sp) +/* C487C0 80241BE0 8FB00040 */ lw $s0, 0x40($sp) +/* C487C4 80241BE4 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* C487C8 80241BE8 D7B80070 */ ldc1 $f24, 0x70($sp) +/* C487CC 80241BEC D7B60068 */ ldc1 $f22, 0x68($sp) +/* C487D0 80241BF0 D7B40060 */ ldc1 $f20, 0x60($sp) +/* C487D4 80241BF4 03E00008 */ jr $ra +/* C487D8 80241BF8 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC.s deleted file mode 100644 index 3f373c30d5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BFC -/* C487DC 80241BFC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C487E0 80241C00 AFB3001C */ sw $s3, 0x1c($sp) -/* C487E4 80241C04 0080982D */ daddu $s3, $a0, $zero -/* C487E8 80241C08 AFBF0020 */ sw $ra, 0x20($sp) -/* C487EC 80241C0C AFB20018 */ sw $s2, 0x18($sp) -/* C487F0 80241C10 AFB10014 */ sw $s1, 0x14($sp) -/* C487F4 80241C14 AFB00010 */ sw $s0, 0x10($sp) -/* C487F8 80241C18 8E720148 */ lw $s2, 0x148($s3) -/* C487FC 80241C1C 86440008 */ lh $a0, 8($s2) -/* C48800 80241C20 0C00EABB */ jal get_npc_unsafe -/* C48804 80241C24 00A0882D */ daddu $s1, $a1, $zero -/* C48808 80241C28 8E240008 */ lw $a0, 8($s1) -/* C4880C 80241C2C 0040802D */ daddu $s0, $v0, $zero -/* C48810 80241C30 00041FC2 */ srl $v1, $a0, 0x1f -/* C48814 80241C34 00832021 */ addu $a0, $a0, $v1 -/* C48818 80241C38 00042043 */ sra $a0, $a0, 1 -/* C4881C 80241C3C 0C00A67F */ jal rand_int -/* C48820 80241C40 24840001 */ addiu $a0, $a0, 1 -/* C48824 80241C44 8E230008 */ lw $v1, 8($s1) -/* C48828 80241C48 240400B4 */ addiu $a0, $zero, 0xb4 -/* C4882C 80241C4C 00032FC2 */ srl $a1, $v1, 0x1f -/* C48830 80241C50 00651821 */ addu $v1, $v1, $a1 -/* C48834 80241C54 00031843 */ sra $v1, $v1, 1 -/* C48838 80241C58 00621821 */ addu $v1, $v1, $v0 -/* C4883C 80241C5C 0C00A67F */ jal rand_int -/* C48840 80241C60 A603008E */ sh $v1, 0x8e($s0) -/* C48844 80241C64 C60C000C */ lwc1 $f12, 0xc($s0) -/* C48848 80241C68 44820000 */ mtc1 $v0, $f0 -/* C4884C 80241C6C 00000000 */ nop -/* C48850 80241C70 46800020 */ cvt.s.w $f0, $f0 -/* C48854 80241C74 46006300 */ add.s $f12, $f12, $f0 -/* C48858 80241C78 3C0142B4 */ lui $at, 0x42b4 -/* C4885C 80241C7C 44810000 */ mtc1 $at, $f0 -/* C48860 80241C80 0C00A6C9 */ jal clamp_angle -/* C48864 80241C84 46006301 */ sub.s $f12, $f12, $f0 -/* C48868 80241C88 E600000C */ swc1 $f0, 0xc($s0) -/* C4886C 80241C8C 8E4200CC */ lw $v0, 0xcc($s2) -/* C48870 80241C90 8C420000 */ lw $v0, ($v0) -/* C48874 80241C94 AE020028 */ sw $v0, 0x28($s0) -/* C48878 80241C98 24020003 */ addiu $v0, $zero, 3 -/* C4887C 80241C9C AE620070 */ sw $v0, 0x70($s3) -/* C48880 80241CA0 8FBF0020 */ lw $ra, 0x20($sp) -/* C48884 80241CA4 8FB3001C */ lw $s3, 0x1c($sp) -/* C48888 80241CA8 8FB20018 */ lw $s2, 0x18($sp) -/* C4888C 80241CAC 8FB10014 */ lw $s1, 0x14($sp) -/* C48890 80241CB0 8FB00010 */ lw $s0, 0x10($sp) -/* C48894 80241CB4 03E00008 */ jr $ra -/* C48898 80241CB8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s new file mode 100644 index 0000000000..1bd30c1d62 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80241BFC_C487DC.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BFC_C487DC +/* C487DC 80241BFC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C487E0 80241C00 AFB3001C */ sw $s3, 0x1c($sp) +/* C487E4 80241C04 0080982D */ daddu $s3, $a0, $zero +/* C487E8 80241C08 AFBF0020 */ sw $ra, 0x20($sp) +/* C487EC 80241C0C AFB20018 */ sw $s2, 0x18($sp) +/* C487F0 80241C10 AFB10014 */ sw $s1, 0x14($sp) +/* C487F4 80241C14 AFB00010 */ sw $s0, 0x10($sp) +/* C487F8 80241C18 8E720148 */ lw $s2, 0x148($s3) +/* C487FC 80241C1C 86440008 */ lh $a0, 8($s2) +/* C48800 80241C20 0C00EABB */ jal get_npc_unsafe +/* C48804 80241C24 00A0882D */ daddu $s1, $a1, $zero +/* C48808 80241C28 8E240008 */ lw $a0, 8($s1) +/* C4880C 80241C2C 0040802D */ daddu $s0, $v0, $zero +/* C48810 80241C30 00041FC2 */ srl $v1, $a0, 0x1f +/* C48814 80241C34 00832021 */ addu $a0, $a0, $v1 +/* C48818 80241C38 00042043 */ sra $a0, $a0, 1 +/* C4881C 80241C3C 0C00A67F */ jal rand_int +/* C48820 80241C40 24840001 */ addiu $a0, $a0, 1 +/* C48824 80241C44 8E230008 */ lw $v1, 8($s1) +/* C48828 80241C48 240400B4 */ addiu $a0, $zero, 0xb4 +/* C4882C 80241C4C 00032FC2 */ srl $a1, $v1, 0x1f +/* C48830 80241C50 00651821 */ addu $v1, $v1, $a1 +/* C48834 80241C54 00031843 */ sra $v1, $v1, 1 +/* C48838 80241C58 00621821 */ addu $v1, $v1, $v0 +/* C4883C 80241C5C 0C00A67F */ jal rand_int +/* C48840 80241C60 A603008E */ sh $v1, 0x8e($s0) +/* C48844 80241C64 C60C000C */ lwc1 $f12, 0xc($s0) +/* C48848 80241C68 44820000 */ mtc1 $v0, $f0 +/* C4884C 80241C6C 00000000 */ nop +/* C48850 80241C70 46800020 */ cvt.s.w $f0, $f0 +/* C48854 80241C74 46006300 */ add.s $f12, $f12, $f0 +/* C48858 80241C78 3C0142B4 */ lui $at, 0x42b4 +/* C4885C 80241C7C 44810000 */ mtc1 $at, $f0 +/* C48860 80241C80 0C00A6C9 */ jal clamp_angle +/* C48864 80241C84 46006301 */ sub.s $f12, $f12, $f0 +/* C48868 80241C88 E600000C */ swc1 $f0, 0xc($s0) +/* C4886C 80241C8C 8E4200CC */ lw $v0, 0xcc($s2) +/* C48870 80241C90 8C420000 */ lw $v0, ($v0) +/* C48874 80241C94 AE020028 */ sw $v0, 0x28($s0) +/* C48878 80241C98 24020003 */ addiu $v0, $zero, 3 +/* C4887C 80241C9C AE620070 */ sw $v0, 0x70($s3) +/* C48880 80241CA0 8FBF0020 */ lw $ra, 0x20($sp) +/* C48884 80241CA4 8FB3001C */ lw $s3, 0x1c($sp) +/* C48888 80241CA8 8FB20018 */ lw $s2, 0x18($sp) +/* C4888C 80241CAC 8FB10014 */ lw $s1, 0x14($sp) +/* C48890 80241CB0 8FB00010 */ lw $s0, 0x10($sp) +/* C48894 80241CB4 03E00008 */ jr $ra +/* C48898 80241CB8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000.s deleted file mode 100644 index 17fc063dde..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242000 -/* C48BE0 80242000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C48BE4 80242004 AFB20018 */ sw $s2, 0x18($sp) -/* C48BE8 80242008 0080902D */ daddu $s2, $a0, $zero -/* C48BEC 8024200C AFBF001C */ sw $ra, 0x1c($sp) -/* C48BF0 80242010 AFB10014 */ sw $s1, 0x14($sp) -/* C48BF4 80242014 AFB00010 */ sw $s0, 0x10($sp) -/* C48BF8 80242018 8E510148 */ lw $s1, 0x148($s2) -/* C48BFC 8024201C 0C00EABB */ jal get_npc_unsafe -/* C48C00 80242020 86240008 */ lh $a0, 8($s1) -/* C48C04 80242024 0040802D */ daddu $s0, $v0, $zero -/* C48C08 80242028 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C48C0C 8024202C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C48C10 80242030 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C48C14 80242034 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C48C18 80242038 A600008E */ sh $zero, 0x8e($s0) -/* C48C1C 8024203C 8C460028 */ lw $a2, 0x28($v0) -/* C48C20 80242040 0C00A720 */ jal atan2 -/* C48C24 80242044 8C470030 */ lw $a3, 0x30($v0) -/* C48C28 80242048 E600000C */ swc1 $f0, 0xc($s0) -/* C48C2C 8024204C 8E2200CC */ lw $v0, 0xcc($s1) -/* C48C30 80242050 8C420020 */ lw $v0, 0x20($v0) -/* C48C34 80242054 AE020028 */ sw $v0, 0x28($s0) -/* C48C38 80242058 2402000B */ addiu $v0, $zero, 0xb -/* C48C3C 8024205C AE420070 */ sw $v0, 0x70($s2) -/* C48C40 80242060 8FBF001C */ lw $ra, 0x1c($sp) -/* C48C44 80242064 8FB20018 */ lw $s2, 0x18($sp) -/* C48C48 80242068 8FB10014 */ lw $s1, 0x14($sp) -/* C48C4C 8024206C 8FB00010 */ lw $s0, 0x10($sp) -/* C48C50 80242070 03E00008 */ jr $ra -/* C48C54 80242074 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000_C48BE0.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000_C48BE0.s new file mode 100644 index 0000000000..63c813b6ff --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242000_C48BE0.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242000_C48BE0 +/* C48BE0 80242000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C48BE4 80242004 AFB20018 */ sw $s2, 0x18($sp) +/* C48BE8 80242008 0080902D */ daddu $s2, $a0, $zero +/* C48BEC 8024200C AFBF001C */ sw $ra, 0x1c($sp) +/* C48BF0 80242010 AFB10014 */ sw $s1, 0x14($sp) +/* C48BF4 80242014 AFB00010 */ sw $s0, 0x10($sp) +/* C48BF8 80242018 8E510148 */ lw $s1, 0x148($s2) +/* C48BFC 8024201C 0C00EABB */ jal get_npc_unsafe +/* C48C00 80242020 86240008 */ lh $a0, 8($s1) +/* C48C04 80242024 0040802D */ daddu $s0, $v0, $zero +/* C48C08 80242028 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C48C0C 8024202C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C48C10 80242030 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C48C14 80242034 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C48C18 80242038 A600008E */ sh $zero, 0x8e($s0) +/* C48C1C 8024203C 8C460028 */ lw $a2, 0x28($v0) +/* C48C20 80242040 0C00A720 */ jal atan2 +/* C48C24 80242044 8C470030 */ lw $a3, 0x30($v0) +/* C48C28 80242048 E600000C */ swc1 $f0, 0xc($s0) +/* C48C2C 8024204C 8E2200CC */ lw $v0, 0xcc($s1) +/* C48C30 80242050 8C420020 */ lw $v0, 0x20($v0) +/* C48C34 80242054 AE020028 */ sw $v0, 0x28($s0) +/* C48C38 80242058 2402000B */ addiu $v0, $zero, 0xb +/* C48C3C 8024205C AE420070 */ sw $v0, 0x70($s2) +/* C48C40 80242060 8FBF001C */ lw $ra, 0x1c($sp) +/* C48C44 80242064 8FB20018 */ lw $s2, 0x18($sp) +/* C48C48 80242068 8FB10014 */ lw $s1, 0x14($sp) +/* C48C4C 8024206C 8FB00010 */ lw $s0, 0x10($sp) +/* C48C50 80242070 03E00008 */ jr $ra +/* C48C54 80242074 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4.s deleted file mode 100644 index 0e062d085d..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420E4 -/* C48CC4 802420E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C48CC8 802420E8 AFB3001C */ sw $s3, 0x1c($sp) -/* C48CCC 802420EC 0080982D */ daddu $s3, $a0, $zero -/* C48CD0 802420F0 AFBF0020 */ sw $ra, 0x20($sp) -/* C48CD4 802420F4 AFB20018 */ sw $s2, 0x18($sp) -/* C48CD8 802420F8 AFB10014 */ sw $s1, 0x14($sp) -/* C48CDC 802420FC AFB00010 */ sw $s0, 0x10($sp) -/* C48CE0 80242100 8E720148 */ lw $s2, 0x148($s3) -/* C48CE4 80242104 86440008 */ lh $a0, 8($s2) -/* C48CE8 80242108 0C00EABB */ jal get_npc_unsafe -/* C48CEC 8024210C 00A0802D */ daddu $s0, $a1, $zero -/* C48CF0 80242110 0040882D */ daddu $s1, $v0, $zero -/* C48CF4 80242114 C6420080 */ lwc1 $f2, 0x80($s2) -/* C48CF8 80242118 468010A0 */ cvt.s.w $f2, $f2 -/* C48CFC 8024211C 460010A1 */ cvt.d.s $f2, $f2 -/* C48D00 80242120 C6400084 */ lwc1 $f0, 0x84($s2) -/* C48D04 80242124 46800020 */ cvt.s.w $f0, $f0 -/* C48D08 80242128 46000021 */ cvt.d.s $f0, $f0 -/* C48D0C 8024212C 3C014059 */ lui $at, 0x4059 -/* C48D10 80242130 44812800 */ mtc1 $at, $f5 -/* C48D14 80242134 44802000 */ mtc1 $zero, $f4 -/* C48D18 80242138 8E4200CC */ lw $v0, 0xcc($s2) -/* C48D1C 8024213C C62C0038 */ lwc1 $f12, 0x38($s1) -/* C48D20 80242140 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C48D24 80242144 46241083 */ div.d $f2, $f2, $f4 -/* C48D28 80242148 462010A0 */ cvt.s.d $f2, $f2 -/* C48D2C 8024214C 46240003 */ div.d $f0, $f0, $f4 -/* C48D30 80242150 8C420020 */ lw $v0, 0x20($v0) -/* C48D34 80242154 46200020 */ cvt.s.d $f0, $f0 -/* C48D38 80242158 E622001C */ swc1 $f2, 0x1c($s1) -/* C48D3C 8024215C E6200014 */ swc1 $f0, 0x14($s1) -/* C48D40 80242160 AE220028 */ sw $v0, 0x28($s1) -/* C48D44 80242164 C6000018 */ lwc1 $f0, 0x18($s0) -/* C48D48 80242168 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C48D4C 8024216C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C48D50 80242170 E6200018 */ swc1 $f0, 0x18($s1) -/* C48D54 80242174 8C460028 */ lw $a2, 0x28($v0) -/* C48D58 80242178 0C00A720 */ jal atan2 -/* C48D5C 8024217C 8C470030 */ lw $a3, 0x30($v0) -/* C48D60 80242180 E620000C */ swc1 $f0, 0xc($s1) -/* C48D64 80242184 8E420018 */ lw $v0, 0x18($s2) -/* C48D68 80242188 AE400074 */ sw $zero, 0x74($s2) -/* C48D6C 8024218C 9442002A */ lhu $v0, 0x2a($v0) -/* C48D70 80242190 30420002 */ andi $v0, $v0, 2 -/* C48D74 80242194 10400005 */ beqz $v0, .L802421AC -/* C48D78 80242198 24020003 */ addiu $v0, $zero, 3 -/* C48D7C 8024219C A622008E */ sh $v0, 0x8e($s1) -/* C48D80 802421A0 2402000D */ addiu $v0, $zero, 0xd -/* C48D84 802421A4 0809087F */ j .L802421FC -/* C48D88 802421A8 AE620070 */ sw $v0, 0x70($s3) -.L802421AC: -/* C48D8C 802421AC 24030001 */ addiu $v1, $zero, 1 -/* C48D90 802421B0 2402000E */ addiu $v0, $zero, 0xe -/* C48D94 802421B4 A623008E */ sh $v1, 0x8e($s1) -/* C48D98 802421B8 AE620070 */ sw $v0, 0x70($s3) -/* C48D9C 802421BC C6200038 */ lwc1 $f0, 0x38($s1) -/* C48DA0 802421C0 4600018D */ trunc.w.s $f6, $f0 -/* C48DA4 802421C4 44023000 */ mfc1 $v0, $f6 -/* C48DA8 802421C8 00000000 */ nop -/* C48DAC 802421CC A6420010 */ sh $v0, 0x10($s2) -/* C48DB0 802421D0 C620003C */ lwc1 $f0, 0x3c($s1) -/* C48DB4 802421D4 4600018D */ trunc.w.s $f6, $f0 -/* C48DB8 802421D8 44023000 */ mfc1 $v0, $f6 -/* C48DBC 802421DC 00000000 */ nop -/* C48DC0 802421E0 A6420012 */ sh $v0, 0x12($s2) -/* C48DC4 802421E4 C6200040 */ lwc1 $f0, 0x40($s1) -/* C48DC8 802421E8 A2430007 */ sb $v1, 7($s2) -/* C48DCC 802421EC 4600018D */ trunc.w.s $f6, $f0 -/* C48DD0 802421F0 44023000 */ mfc1 $v0, $f6 -/* C48DD4 802421F4 00000000 */ nop -/* C48DD8 802421F8 A6420014 */ sh $v0, 0x14($s2) -.L802421FC: -/* C48DDC 802421FC 8FBF0020 */ lw $ra, 0x20($sp) -/* C48DE0 80242200 8FB3001C */ lw $s3, 0x1c($sp) -/* C48DE4 80242204 8FB20018 */ lw $s2, 0x18($sp) -/* C48DE8 80242208 8FB10014 */ lw $s1, 0x14($sp) -/* C48DEC 8024220C 8FB00010 */ lw $s0, 0x10($sp) -/* C48DF0 80242210 03E00008 */ jr $ra -/* C48DF4 80242214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s new file mode 100644 index 0000000000..d59e4fc60e --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802420E4_C48CC4.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420E4_C48CC4 +/* C48CC4 802420E4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C48CC8 802420E8 AFB3001C */ sw $s3, 0x1c($sp) +/* C48CCC 802420EC 0080982D */ daddu $s3, $a0, $zero +/* C48CD0 802420F0 AFBF0020 */ sw $ra, 0x20($sp) +/* C48CD4 802420F4 AFB20018 */ sw $s2, 0x18($sp) +/* C48CD8 802420F8 AFB10014 */ sw $s1, 0x14($sp) +/* C48CDC 802420FC AFB00010 */ sw $s0, 0x10($sp) +/* C48CE0 80242100 8E720148 */ lw $s2, 0x148($s3) +/* C48CE4 80242104 86440008 */ lh $a0, 8($s2) +/* C48CE8 80242108 0C00EABB */ jal get_npc_unsafe +/* C48CEC 8024210C 00A0802D */ daddu $s0, $a1, $zero +/* C48CF0 80242110 0040882D */ daddu $s1, $v0, $zero +/* C48CF4 80242114 C6420080 */ lwc1 $f2, 0x80($s2) +/* C48CF8 80242118 468010A0 */ cvt.s.w $f2, $f2 +/* C48CFC 8024211C 460010A1 */ cvt.d.s $f2, $f2 +/* C48D00 80242120 C6400084 */ lwc1 $f0, 0x84($s2) +/* C48D04 80242124 46800020 */ cvt.s.w $f0, $f0 +/* C48D08 80242128 46000021 */ cvt.d.s $f0, $f0 +/* C48D0C 8024212C 3C014059 */ lui $at, 0x4059 +/* C48D10 80242130 44812800 */ mtc1 $at, $f5 +/* C48D14 80242134 44802000 */ mtc1 $zero, $f4 +/* C48D18 80242138 8E4200CC */ lw $v0, 0xcc($s2) +/* C48D1C 8024213C C62C0038 */ lwc1 $f12, 0x38($s1) +/* C48D20 80242140 C62E0040 */ lwc1 $f14, 0x40($s1) +/* C48D24 80242144 46241083 */ div.d $f2, $f2, $f4 +/* C48D28 80242148 462010A0 */ cvt.s.d $f2, $f2 +/* C48D2C 8024214C 46240003 */ div.d $f0, $f0, $f4 +/* C48D30 80242150 8C420020 */ lw $v0, 0x20($v0) +/* C48D34 80242154 46200020 */ cvt.s.d $f0, $f0 +/* C48D38 80242158 E622001C */ swc1 $f2, 0x1c($s1) +/* C48D3C 8024215C E6200014 */ swc1 $f0, 0x14($s1) +/* C48D40 80242160 AE220028 */ sw $v0, 0x28($s1) +/* C48D44 80242164 C6000018 */ lwc1 $f0, 0x18($s0) +/* C48D48 80242168 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C48D4C 8024216C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C48D50 80242170 E6200018 */ swc1 $f0, 0x18($s1) +/* C48D54 80242174 8C460028 */ lw $a2, 0x28($v0) +/* C48D58 80242178 0C00A720 */ jal atan2 +/* C48D5C 8024217C 8C470030 */ lw $a3, 0x30($v0) +/* C48D60 80242180 E620000C */ swc1 $f0, 0xc($s1) +/* C48D64 80242184 8E420018 */ lw $v0, 0x18($s2) +/* C48D68 80242188 AE400074 */ sw $zero, 0x74($s2) +/* C48D6C 8024218C 9442002A */ lhu $v0, 0x2a($v0) +/* C48D70 80242190 30420002 */ andi $v0, $v0, 2 +/* C48D74 80242194 10400005 */ beqz $v0, .L802421AC +/* C48D78 80242198 24020003 */ addiu $v0, $zero, 3 +/* C48D7C 8024219C A622008E */ sh $v0, 0x8e($s1) +/* C48D80 802421A0 2402000D */ addiu $v0, $zero, 0xd +/* C48D84 802421A4 0809087F */ j .L802421FC +/* C48D88 802421A8 AE620070 */ sw $v0, 0x70($s3) +.L802421AC: +/* C48D8C 802421AC 24030001 */ addiu $v1, $zero, 1 +/* C48D90 802421B0 2402000E */ addiu $v0, $zero, 0xe +/* C48D94 802421B4 A623008E */ sh $v1, 0x8e($s1) +/* C48D98 802421B8 AE620070 */ sw $v0, 0x70($s3) +/* C48D9C 802421BC C6200038 */ lwc1 $f0, 0x38($s1) +/* C48DA0 802421C0 4600018D */ trunc.w.s $f6, $f0 +/* C48DA4 802421C4 44023000 */ mfc1 $v0, $f6 +/* C48DA8 802421C8 00000000 */ nop +/* C48DAC 802421CC A6420010 */ sh $v0, 0x10($s2) +/* C48DB0 802421D0 C620003C */ lwc1 $f0, 0x3c($s1) +/* C48DB4 802421D4 4600018D */ trunc.w.s $f6, $f0 +/* C48DB8 802421D8 44023000 */ mfc1 $v0, $f6 +/* C48DBC 802421DC 00000000 */ nop +/* C48DC0 802421E0 A6420012 */ sh $v0, 0x12($s2) +/* C48DC4 802421E4 C6200040 */ lwc1 $f0, 0x40($s1) +/* C48DC8 802421E8 A2430007 */ sb $v1, 7($s2) +/* C48DCC 802421EC 4600018D */ trunc.w.s $f6, $f0 +/* C48DD0 802421F0 44023000 */ mfc1 $v0, $f6 +/* C48DD4 802421F4 00000000 */ nop +/* C48DD8 802421F8 A6420014 */ sh $v0, 0x14($s2) +.L802421FC: +/* C48DDC 802421FC 8FBF0020 */ lw $ra, 0x20($sp) +/* C48DE0 80242200 8FB3001C */ lw $s3, 0x1c($sp) +/* C48DE4 80242204 8FB20018 */ lw $s2, 0x18($sp) +/* C48DE8 80242208 8FB10014 */ lw $s1, 0x14($sp) +/* C48DEC 8024220C 8FB00010 */ lw $s0, 0x10($sp) +/* C48DF0 80242210 03E00008 */ jr $ra +/* C48DF4 80242214 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218.s deleted file mode 100644 index c96d0d35d3..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242218 -/* C48DF8 80242218 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C48DFC 8024221C AFB00010 */ sw $s0, 0x10($sp) -/* C48E00 80242220 0080802D */ daddu $s0, $a0, $zero -/* C48E04 80242224 AFBF0014 */ sw $ra, 0x14($sp) -/* C48E08 80242228 8E020148 */ lw $v0, 0x148($s0) -/* C48E0C 8024222C 0C00EABB */ jal get_npc_unsafe -/* C48E10 80242230 84440008 */ lh $a0, 8($v0) -/* C48E14 80242234 0040202D */ daddu $a0, $v0, $zero -/* C48E18 80242238 8482008E */ lh $v0, 0x8e($a0) -/* C48E1C 8024223C 9483008E */ lhu $v1, 0x8e($a0) -/* C48E20 80242240 18400005 */ blez $v0, .L80242258 -/* C48E24 80242244 2462FFFF */ addiu $v0, $v1, -1 -/* C48E28 80242248 A482008E */ sh $v0, 0x8e($a0) -/* C48E2C 8024224C 00021400 */ sll $v0, $v0, 0x10 -/* C48E30 80242250 1C400006 */ bgtz $v0, .L8024226C -/* C48E34 80242254 00000000 */ nop -.L80242258: -/* C48E38 80242258 8482008C */ lh $v0, 0x8c($a0) -/* C48E3C 8024225C 14400003 */ bnez $v0, .L8024226C -/* C48E40 80242260 2402000E */ addiu $v0, $zero, 0xe -/* C48E44 80242264 A480008E */ sh $zero, 0x8e($a0) -/* C48E48 80242268 AE020070 */ sw $v0, 0x70($s0) -.L8024226C: -/* C48E4C 8024226C 8FBF0014 */ lw $ra, 0x14($sp) -/* C48E50 80242270 8FB00010 */ lw $s0, 0x10($sp) -/* C48E54 80242274 03E00008 */ jr $ra -/* C48E58 80242278 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s new file mode 100644 index 0000000000..d60561be83 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242218_C48DF8.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242218_C48DF8 +/* C48DF8 80242218 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C48DFC 8024221C AFB00010 */ sw $s0, 0x10($sp) +/* C48E00 80242220 0080802D */ daddu $s0, $a0, $zero +/* C48E04 80242224 AFBF0014 */ sw $ra, 0x14($sp) +/* C48E08 80242228 8E020148 */ lw $v0, 0x148($s0) +/* C48E0C 8024222C 0C00EABB */ jal get_npc_unsafe +/* C48E10 80242230 84440008 */ lh $a0, 8($v0) +/* C48E14 80242234 0040202D */ daddu $a0, $v0, $zero +/* C48E18 80242238 8482008E */ lh $v0, 0x8e($a0) +/* C48E1C 8024223C 9483008E */ lhu $v1, 0x8e($a0) +/* C48E20 80242240 18400005 */ blez $v0, .L80242258 +/* C48E24 80242244 2462FFFF */ addiu $v0, $v1, -1 +/* C48E28 80242248 A482008E */ sh $v0, 0x8e($a0) +/* C48E2C 8024224C 00021400 */ sll $v0, $v0, 0x10 +/* C48E30 80242250 1C400006 */ bgtz $v0, .L8024226C +/* C48E34 80242254 00000000 */ nop +.L80242258: +/* C48E38 80242258 8482008C */ lh $v0, 0x8c($a0) +/* C48E3C 8024225C 14400003 */ bnez $v0, .L8024226C +/* C48E40 80242260 2402000E */ addiu $v0, $zero, 0xe +/* C48E44 80242264 A480008E */ sh $zero, 0x8e($a0) +/* C48E48 80242268 AE020070 */ sw $v0, 0x70($s0) +.L8024226C: +/* C48E4C 8024226C 8FBF0014 */ lw $ra, 0x14($sp) +/* C48E50 80242270 8FB00010 */ lw $s0, 0x10($sp) +/* C48E54 80242274 03E00008 */ jr $ra +/* C48E58 80242278 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C.s deleted file mode 100644 index 184e4ec99b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024227C -/* C48E5C 8024227C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C48E60 80242280 AFB20030 */ sw $s2, 0x30($sp) -/* C48E64 80242284 0080902D */ daddu $s2, $a0, $zero -/* C48E68 80242288 AFBF0038 */ sw $ra, 0x38($sp) -/* C48E6C 8024228C AFB30034 */ sw $s3, 0x34($sp) -/* C48E70 80242290 AFB1002C */ sw $s1, 0x2c($sp) -/* C48E74 80242294 AFB00028 */ sw $s0, 0x28($sp) -/* C48E78 80242298 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C48E7C 8024229C F7B40040 */ sdc1 $f20, 0x40($sp) -/* C48E80 802422A0 8E510148 */ lw $s1, 0x148($s2) -/* C48E84 802422A4 86240008 */ lh $a0, 8($s1) -/* C48E88 802422A8 0C00EABB */ jal get_npc_unsafe -/* C48E8C 802422AC 00A0982D */ daddu $s3, $a1, $zero -/* C48E90 802422B0 0040802D */ daddu $s0, $v0, $zero -/* C48E94 802422B4 0200202D */ daddu $a0, $s0, $zero -/* C48E98 802422B8 C6220088 */ lwc1 $f2, 0x88($s1) -/* C48E9C 802422BC 468010A0 */ cvt.s.w $f2, $f2 -/* C48EA0 802422C0 460010A1 */ cvt.d.s $f2, $f2 -/* C48EA4 802422C4 C604001C */ lwc1 $f4, 0x1c($s0) -/* C48EA8 802422C8 C6000014 */ lwc1 $f0, 0x14($s0) -/* C48EAC 802422CC 8E050018 */ lw $a1, 0x18($s0) -/* C48EB0 802422D0 46002100 */ add.s $f4, $f4, $f0 -/* C48EB4 802422D4 8E06000C */ lw $a2, 0xc($s0) -/* C48EB8 802422D8 C6200078 */ lwc1 $f0, 0x78($s1) -/* C48EBC 802422DC 46800020 */ cvt.s.w $f0, $f0 -/* C48EC0 802422E0 E604001C */ swc1 $f4, 0x1c($s0) -/* C48EC4 802422E4 3C014059 */ lui $at, 0x4059 -/* C48EC8 802422E8 44812800 */ mtc1 $at, $f5 -/* C48ECC 802422EC 44802000 */ mtc1 $zero, $f4 -/* C48ED0 802422F0 46000021 */ cvt.d.s $f0, $f0 -/* C48ED4 802422F4 46240003 */ div.d $f0, $f0, $f4 -/* C48ED8 802422F8 46200520 */ cvt.s.d $f20, $f0 -/* C48EDC 802422FC 46241083 */ div.d $f2, $f2, $f4 -/* C48EE0 80242300 0C00EA95 */ jal npc_move_heading -/* C48EE4 80242304 462015A0 */ cvt.s.d $f22, $f2 -/* C48EE8 80242308 C604001C */ lwc1 $f4, 0x1c($s0) -/* C48EEC 8024230C 44801000 */ mtc1 $zero, $f2 -/* C48EF0 80242310 44801800 */ mtc1 $zero, $f3 -/* C48EF4 80242314 46002021 */ cvt.d.s $f0, $f4 -/* C48EF8 80242318 4620103E */ c.le.d $f2, $f0 -/* C48EFC 8024231C 00000000 */ nop -/* C48F00 80242320 45000030 */ bc1f .L802423E4 -/* C48F04 80242324 00000000 */ nop -/* C48F08 80242328 C600003C */ lwc1 $f0, 0x3c($s0) -/* C48F0C 8024232C 46040000 */ add.s $f0, $f0, $f4 -/* C48F10 80242330 E600003C */ swc1 $f0, 0x3c($s0) -/* C48F14 80242334 8E2200CC */ lw $v0, 0xcc($s1) -/* C48F18 80242338 8C420024 */ lw $v0, 0x24($v0) -/* C48F1C 8024233C AE020028 */ sw $v0, 0x28($s0) -/* C48F20 80242340 A2200007 */ sb $zero, 7($s1) -/* C48F24 80242344 8E020000 */ lw $v0, ($s0) -/* C48F28 80242348 30420008 */ andi $v0, $v0, 8 -/* C48F2C 8024234C 14400011 */ bnez $v0, .L80242394 -/* C48F30 80242350 0000102D */ daddu $v0, $zero, $zero -/* C48F34 80242354 27A50018 */ addiu $a1, $sp, 0x18 -/* C48F38 80242358 27A6001C */ addiu $a2, $sp, 0x1c -/* C48F3C 8024235C C6000038 */ lwc1 $f0, 0x38($s0) -/* C48F40 80242360 C602003C */ lwc1 $f2, 0x3c($s0) -/* C48F44 80242364 C6040040 */ lwc1 $f4, 0x40($s0) -/* C48F48 80242368 3C01447A */ lui $at, 0x447a -/* C48F4C 8024236C 44813000 */ mtc1 $at, $f6 -/* C48F50 80242370 27A20024 */ addiu $v0, $sp, 0x24 -/* C48F54 80242374 E7A00018 */ swc1 $f0, 0x18($sp) -/* C48F58 80242378 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C48F5C 8024237C E7A40020 */ swc1 $f4, 0x20($sp) -/* C48F60 80242380 E7A60024 */ swc1 $f6, 0x24($sp) -/* C48F64 80242384 AFA20010 */ sw $v0, 0x10($sp) -/* C48F68 80242388 8E040080 */ lw $a0, 0x80($s0) -/* C48F6C 8024238C 0C0372DF */ jal func_800DCB7C -/* C48F70 80242390 27A70020 */ addiu $a3, $sp, 0x20 -.L80242394: -/* C48F74 80242394 1040000B */ beqz $v0, .L802423C4 -/* C48F78 80242398 00000000 */ nop -/* C48F7C 8024239C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C48F80 802423A0 46140080 */ add.s $f2, $f0, $f20 -/* C48F84 802423A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C48F88 802423A8 4600103E */ c.le.s $f2, $f0 -/* C48F8C 802423AC 00000000 */ nop -/* C48F90 802423B0 4500008D */ bc1f .L802425E8 -/* C48F94 802423B4 00000000 */ nop -/* C48F98 802423B8 E602003C */ swc1 $f2, 0x3c($s0) -/* C48F9C 802423BC 0809097A */ j .L802425E8 -/* C48FA0 802423C0 AE400070 */ sw $zero, 0x70($s2) -.L802423C4: -/* C48FA4 802423C4 C602003C */ lwc1 $f2, 0x3c($s0) -/* C48FA8 802423C8 C6000064 */ lwc1 $f0, 0x64($s0) -/* C48FAC 802423CC 4602003E */ c.le.s $f0, $f2 -/* C48FB0 802423D0 00000000 */ nop -/* C48FB4 802423D4 45030084 */ bc1tl .L802425E8 -/* C48FB8 802423D8 AE400070 */ sw $zero, 0x70($s2) -/* C48FBC 802423DC 0809097A */ j .L802425E8 -/* C48FC0 802423E0 00000000 */ nop -.L802423E4: -/* C48FC4 802423E4 4622003C */ c.lt.d $f0, $f2 -/* C48FC8 802423E8 00000000 */ nop -/* C48FCC 802423EC 4500007E */ bc1f .L802425E8 -/* C48FD0 802423F0 00000000 */ nop -/* C48FD4 802423F4 9602008E */ lhu $v0, 0x8e($s0) -/* C48FD8 802423F8 24420001 */ addiu $v0, $v0, 1 -/* C48FDC 802423FC A602008E */ sh $v0, 0x8e($s0) -/* C48FE0 80242400 00021400 */ sll $v0, $v0, 0x10 -/* C48FE4 80242404 8E630020 */ lw $v1, 0x20($s3) -/* C48FE8 80242408 00021403 */ sra $v0, $v0, 0x10 -/* C48FEC 8024240C 0043102A */ slt $v0, $v0, $v1 -/* C48FF0 80242410 14400026 */ bnez $v0, .L802424AC -/* C48FF4 80242414 00000000 */ nop -/* C48FF8 80242418 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C48FFC 8024241C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C49000 80242420 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C49004 80242424 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C49008 80242428 A600008E */ sh $zero, 0x8e($s0) -/* C4900C 8024242C 8C460028 */ lw $a2, 0x28($v0) -/* C49010 80242430 0C00A720 */ jal atan2 -/* C49014 80242434 8C470030 */ lw $a3, 0x30($v0) -/* C49018 80242438 46000506 */ mov.s $f20, $f0 -/* C4901C 8024243C C60C000C */ lwc1 $f12, 0xc($s0) -/* C49020 80242440 0C00A70A */ jal get_clamped_angle_diff -/* C49024 80242444 4600A386 */ mov.s $f14, $f20 -/* C49028 80242448 46000086 */ mov.s $f2, $f0 -/* C4902C 8024244C 8E62001C */ lw $v0, 0x1c($s3) -/* C49030 80242450 46001005 */ abs.s $f0, $f2 -/* C49034 80242454 44822000 */ mtc1 $v0, $f4 -/* C49038 80242458 00000000 */ nop -/* C4903C 8024245C 46802120 */ cvt.s.w $f4, $f4 -/* C49040 80242460 4600203C */ c.lt.s $f4, $f0 -/* C49044 80242464 00000000 */ nop -/* C49048 80242468 4500000D */ bc1f .L802424A0 -/* C4904C 8024246C 00000000 */ nop -/* C49050 80242470 44800000 */ mtc1 $zero, $f0 -/* C49054 80242474 C614000C */ lwc1 $f20, 0xc($s0) -/* C49058 80242478 4600103C */ c.lt.s $f2, $f0 -/* C4905C 8024247C 00000000 */ nop -/* C49060 80242480 45000006 */ bc1f .L8024249C -/* C49064 80242484 00021023 */ negu $v0, $v0 -/* C49068 80242488 44820000 */ mtc1 $v0, $f0 -/* C4906C 8024248C 00000000 */ nop -/* C49070 80242490 46800020 */ cvt.s.w $f0, $f0 -/* C49074 80242494 08090928 */ j .L802424A0 -/* C49078 80242498 4600A500 */ add.s $f20, $f20, $f0 -.L8024249C: -/* C4907C 8024249C 4604A500 */ add.s $f20, $f20, $f4 -.L802424A0: -/* C49080 802424A0 0C00A6C9 */ jal clamp_angle -/* C49084 802424A4 4600A306 */ mov.s $f12, $f20 -/* C49088 802424A8 E600000C */ swc1 $f0, 0xc($s0) -.L802424AC: -/* C4908C 802424AC 8E020000 */ lw $v0, ($s0) -/* C49090 802424B0 30420008 */ andi $v0, $v0, 8 -/* C49094 802424B4 1040000A */ beqz $v0, .L802424E0 -/* C49098 802424B8 27A50018 */ addiu $a1, $sp, 0x18 -/* C4909C 802424BC C602003C */ lwc1 $f2, 0x3c($s0) -/* C490A0 802424C0 C600001C */ lwc1 $f0, 0x1c($s0) -/* C490A4 802424C4 46001080 */ add.s $f2, $f2, $f0 -/* C490A8 802424C8 4616103C */ c.lt.s $f2, $f22 -/* C490AC 802424CC 00000000 */ nop -/* C490B0 802424D0 45020045 */ bc1fl .L802425E8 -/* C490B4 802424D4 E602003C */ swc1 $f2, 0x3c($s0) -/* C490B8 802424D8 08090979 */ j .L802425E4 -/* C490BC 802424DC E616003C */ swc1 $f22, 0x3c($s0) -.L802424E0: -/* C490C0 802424E0 C6000038 */ lwc1 $f0, 0x38($s0) -/* C490C4 802424E4 27A6001C */ addiu $a2, $sp, 0x1c -/* C490C8 802424E8 E7A00018 */ swc1 $f0, 0x18($sp) -/* C490CC 802424EC 860200A8 */ lh $v0, 0xa8($s0) -/* C490D0 802424F0 C600001C */ lwc1 $f0, 0x1c($s0) -/* C490D4 802424F4 C604003C */ lwc1 $f4, 0x3c($s0) -/* C490D8 802424F8 44821000 */ mtc1 $v0, $f2 -/* C490DC 802424FC 00000000 */ nop -/* C490E0 80242500 468010A0 */ cvt.s.w $f2, $f2 -/* C490E4 80242504 46000005 */ abs.s $f0, $f0 -/* C490E8 80242508 46020000 */ add.s $f0, $f0, $f2 -/* C490EC 8024250C C6060040 */ lwc1 $f6, 0x40($s0) -/* C490F0 80242510 27A20024 */ addiu $v0, $sp, 0x24 -/* C490F4 80242514 46022100 */ add.s $f4, $f4, $f2 -/* C490F8 80242518 3C014024 */ lui $at, 0x4024 -/* C490FC 8024251C 44811800 */ mtc1 $at, $f3 -/* C49100 80242520 44801000 */ mtc1 $zero, $f2 -/* C49104 80242524 46000021 */ cvt.d.s $f0, $f0 -/* C49108 80242528 46220000 */ add.d $f0, $f0, $f2 -/* C4910C 8024252C E7A60020 */ swc1 $f6, 0x20($sp) -/* C49110 80242530 E7A4001C */ swc1 $f4, 0x1c($sp) -/* C49114 80242534 46200020 */ cvt.s.d $f0, $f0 -/* C49118 80242538 E7A00024 */ swc1 $f0, 0x24($sp) -/* C4911C 8024253C AFA20010 */ sw $v0, 0x10($sp) -/* C49120 80242540 8E040080 */ lw $a0, 0x80($s0) -/* C49124 80242544 0C0372DF */ jal func_800DCB7C -/* C49128 80242548 27A70020 */ addiu $a3, $sp, 0x20 -/* C4912C 8024254C 10400015 */ beqz $v0, .L802425A4 -/* C49130 80242550 00000000 */ nop -/* C49134 80242554 860200A8 */ lh $v0, 0xa8($s0) -/* C49138 80242558 C604001C */ lwc1 $f4, 0x1c($s0) -/* C4913C 8024255C 44820000 */ mtc1 $v0, $f0 -/* C49140 80242560 00000000 */ nop -/* C49144 80242564 46800020 */ cvt.s.w $f0, $f0 -/* C49148 80242568 46002085 */ abs.s $f2, $f4 -/* C4914C 8024256C 46020000 */ add.s $f0, $f0, $f2 -/* C49150 80242570 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C49154 80242574 4600103E */ c.le.s $f2, $f0 -/* C49158 80242578 00000000 */ nop -/* C4915C 8024257C 45000005 */ bc1f .L80242594 -/* C49160 80242580 00000000 */ nop -/* C49164 80242584 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C49168 80242588 AE00001C */ sw $zero, 0x1c($s0) -/* C4916C 8024258C 0809097A */ j .L802425E8 -/* C49170 80242590 E600003C */ swc1 $f0, 0x3c($s0) -.L80242594: -/* C49174 80242594 C600003C */ lwc1 $f0, 0x3c($s0) -/* C49178 80242598 46040000 */ add.s $f0, $f0, $f4 -/* C4917C 8024259C 0809097A */ j .L802425E8 -/* C49180 802425A0 E600003C */ swc1 $f0, 0x3c($s0) -.L802425A4: -/* C49184 802425A4 C606003C */ lwc1 $f6, 0x3c($s0) -/* C49188 802425A8 860200A8 */ lh $v0, 0xa8($s0) -/* C4918C 802425AC 46163081 */ sub.s $f2, $f6, $f22 -/* C49190 802425B0 44820000 */ mtc1 $v0, $f0 -/* C49194 802425B4 00000000 */ nop -/* C49198 802425B8 46800020 */ cvt.s.w $f0, $f0 -/* C4919C 802425BC 46001080 */ add.s $f2, $f2, $f0 -/* C491A0 802425C0 C604001C */ lwc1 $f4, 0x1c($s0) -/* C491A4 802425C4 46002005 */ abs.s $f0, $f4 -/* C491A8 802425C8 4602003C */ c.lt.s $f0, $f2 -/* C491AC 802425CC 00000000 */ nop -/* C491B0 802425D0 45020005 */ bc1fl .L802425E8 -/* C491B4 802425D4 AE00001C */ sw $zero, 0x1c($s0) -/* C491B8 802425D8 46043000 */ add.s $f0, $f6, $f4 -/* C491BC 802425DC 0809097A */ j .L802425E8 -/* C491C0 802425E0 E600003C */ swc1 $f0, 0x3c($s0) -.L802425E4: -/* C491C4 802425E4 AE00001C */ sw $zero, 0x1c($s0) -.L802425E8: -/* C491C8 802425E8 8FBF0038 */ lw $ra, 0x38($sp) -/* C491CC 802425EC 8FB30034 */ lw $s3, 0x34($sp) -/* C491D0 802425F0 8FB20030 */ lw $s2, 0x30($sp) -/* C491D4 802425F4 8FB1002C */ lw $s1, 0x2c($sp) -/* C491D8 802425F8 8FB00028 */ lw $s0, 0x28($sp) -/* C491DC 802425FC D7B60048 */ ldc1 $f22, 0x48($sp) -/* C491E0 80242600 D7B40040 */ ldc1 $f20, 0x40($sp) -/* C491E4 80242604 03E00008 */ jr $ra -/* C491E8 80242608 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s new file mode 100644 index 0000000000..c372fabd92 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024227C_C48E5C.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024227C_C48E5C +/* C48E5C 8024227C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C48E60 80242280 AFB20030 */ sw $s2, 0x30($sp) +/* C48E64 80242284 0080902D */ daddu $s2, $a0, $zero +/* C48E68 80242288 AFBF0038 */ sw $ra, 0x38($sp) +/* C48E6C 8024228C AFB30034 */ sw $s3, 0x34($sp) +/* C48E70 80242290 AFB1002C */ sw $s1, 0x2c($sp) +/* C48E74 80242294 AFB00028 */ sw $s0, 0x28($sp) +/* C48E78 80242298 F7B60048 */ sdc1 $f22, 0x48($sp) +/* C48E7C 8024229C F7B40040 */ sdc1 $f20, 0x40($sp) +/* C48E80 802422A0 8E510148 */ lw $s1, 0x148($s2) +/* C48E84 802422A4 86240008 */ lh $a0, 8($s1) +/* C48E88 802422A8 0C00EABB */ jal get_npc_unsafe +/* C48E8C 802422AC 00A0982D */ daddu $s3, $a1, $zero +/* C48E90 802422B0 0040802D */ daddu $s0, $v0, $zero +/* C48E94 802422B4 0200202D */ daddu $a0, $s0, $zero +/* C48E98 802422B8 C6220088 */ lwc1 $f2, 0x88($s1) +/* C48E9C 802422BC 468010A0 */ cvt.s.w $f2, $f2 +/* C48EA0 802422C0 460010A1 */ cvt.d.s $f2, $f2 +/* C48EA4 802422C4 C604001C */ lwc1 $f4, 0x1c($s0) +/* C48EA8 802422C8 C6000014 */ lwc1 $f0, 0x14($s0) +/* C48EAC 802422CC 8E050018 */ lw $a1, 0x18($s0) +/* C48EB0 802422D0 46002100 */ add.s $f4, $f4, $f0 +/* C48EB4 802422D4 8E06000C */ lw $a2, 0xc($s0) +/* C48EB8 802422D8 C6200078 */ lwc1 $f0, 0x78($s1) +/* C48EBC 802422DC 46800020 */ cvt.s.w $f0, $f0 +/* C48EC0 802422E0 E604001C */ swc1 $f4, 0x1c($s0) +/* C48EC4 802422E4 3C014059 */ lui $at, 0x4059 +/* C48EC8 802422E8 44812800 */ mtc1 $at, $f5 +/* C48ECC 802422EC 44802000 */ mtc1 $zero, $f4 +/* C48ED0 802422F0 46000021 */ cvt.d.s $f0, $f0 +/* C48ED4 802422F4 46240003 */ div.d $f0, $f0, $f4 +/* C48ED8 802422F8 46200520 */ cvt.s.d $f20, $f0 +/* C48EDC 802422FC 46241083 */ div.d $f2, $f2, $f4 +/* C48EE0 80242300 0C00EA95 */ jal npc_move_heading +/* C48EE4 80242304 462015A0 */ cvt.s.d $f22, $f2 +/* C48EE8 80242308 C604001C */ lwc1 $f4, 0x1c($s0) +/* C48EEC 8024230C 44801000 */ mtc1 $zero, $f2 +/* C48EF0 80242310 44801800 */ mtc1 $zero, $f3 +/* C48EF4 80242314 46002021 */ cvt.d.s $f0, $f4 +/* C48EF8 80242318 4620103E */ c.le.d $f2, $f0 +/* C48EFC 8024231C 00000000 */ nop +/* C48F00 80242320 45000030 */ bc1f .L802423E4 +/* C48F04 80242324 00000000 */ nop +/* C48F08 80242328 C600003C */ lwc1 $f0, 0x3c($s0) +/* C48F0C 8024232C 46040000 */ add.s $f0, $f0, $f4 +/* C48F10 80242330 E600003C */ swc1 $f0, 0x3c($s0) +/* C48F14 80242334 8E2200CC */ lw $v0, 0xcc($s1) +/* C48F18 80242338 8C420024 */ lw $v0, 0x24($v0) +/* C48F1C 8024233C AE020028 */ sw $v0, 0x28($s0) +/* C48F20 80242340 A2200007 */ sb $zero, 7($s1) +/* C48F24 80242344 8E020000 */ lw $v0, ($s0) +/* C48F28 80242348 30420008 */ andi $v0, $v0, 8 +/* C48F2C 8024234C 14400011 */ bnez $v0, .L80242394 +/* C48F30 80242350 0000102D */ daddu $v0, $zero, $zero +/* C48F34 80242354 27A50018 */ addiu $a1, $sp, 0x18 +/* C48F38 80242358 27A6001C */ addiu $a2, $sp, 0x1c +/* C48F3C 8024235C C6000038 */ lwc1 $f0, 0x38($s0) +/* C48F40 80242360 C602003C */ lwc1 $f2, 0x3c($s0) +/* C48F44 80242364 C6040040 */ lwc1 $f4, 0x40($s0) +/* C48F48 80242368 3C01447A */ lui $at, 0x447a +/* C48F4C 8024236C 44813000 */ mtc1 $at, $f6 +/* C48F50 80242370 27A20024 */ addiu $v0, $sp, 0x24 +/* C48F54 80242374 E7A00018 */ swc1 $f0, 0x18($sp) +/* C48F58 80242378 E7A2001C */ swc1 $f2, 0x1c($sp) +/* C48F5C 8024237C E7A40020 */ swc1 $f4, 0x20($sp) +/* C48F60 80242380 E7A60024 */ swc1 $f6, 0x24($sp) +/* C48F64 80242384 AFA20010 */ sw $v0, 0x10($sp) +/* C48F68 80242388 8E040080 */ lw $a0, 0x80($s0) +/* C48F6C 8024238C 0C0372DF */ jal func_800DCB7C +/* C48F70 80242390 27A70020 */ addiu $a3, $sp, 0x20 +.L80242394: +/* C48F74 80242394 1040000B */ beqz $v0, .L802423C4 +/* C48F78 80242398 00000000 */ nop +/* C48F7C 8024239C C7A0001C */ lwc1 $f0, 0x1c($sp) +/* C48F80 802423A0 46140080 */ add.s $f2, $f0, $f20 +/* C48F84 802423A4 C600003C */ lwc1 $f0, 0x3c($s0) +/* C48F88 802423A8 4600103E */ c.le.s $f2, $f0 +/* C48F8C 802423AC 00000000 */ nop +/* C48F90 802423B0 4500008D */ bc1f .L802425E8 +/* C48F94 802423B4 00000000 */ nop +/* C48F98 802423B8 E602003C */ swc1 $f2, 0x3c($s0) +/* C48F9C 802423BC 0809097A */ j .L802425E8 +/* C48FA0 802423C0 AE400070 */ sw $zero, 0x70($s2) +.L802423C4: +/* C48FA4 802423C4 C602003C */ lwc1 $f2, 0x3c($s0) +/* C48FA8 802423C8 C6000064 */ lwc1 $f0, 0x64($s0) +/* C48FAC 802423CC 4602003E */ c.le.s $f0, $f2 +/* C48FB0 802423D0 00000000 */ nop +/* C48FB4 802423D4 45030084 */ bc1tl .L802425E8 +/* C48FB8 802423D8 AE400070 */ sw $zero, 0x70($s2) +/* C48FBC 802423DC 0809097A */ j .L802425E8 +/* C48FC0 802423E0 00000000 */ nop +.L802423E4: +/* C48FC4 802423E4 4622003C */ c.lt.d $f0, $f2 +/* C48FC8 802423E8 00000000 */ nop +/* C48FCC 802423EC 4500007E */ bc1f .L802425E8 +/* C48FD0 802423F0 00000000 */ nop +/* C48FD4 802423F4 9602008E */ lhu $v0, 0x8e($s0) +/* C48FD8 802423F8 24420001 */ addiu $v0, $v0, 1 +/* C48FDC 802423FC A602008E */ sh $v0, 0x8e($s0) +/* C48FE0 80242400 00021400 */ sll $v0, $v0, 0x10 +/* C48FE4 80242404 8E630020 */ lw $v1, 0x20($s3) +/* C48FE8 80242408 00021403 */ sra $v0, $v0, 0x10 +/* C48FEC 8024240C 0043102A */ slt $v0, $v0, $v1 +/* C48FF0 80242410 14400026 */ bnez $v0, .L802424AC +/* C48FF4 80242414 00000000 */ nop +/* C48FF8 80242418 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C48FFC 8024241C C60E0040 */ lwc1 $f14, 0x40($s0) +/* C49000 80242420 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C49004 80242424 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C49008 80242428 A600008E */ sh $zero, 0x8e($s0) +/* C4900C 8024242C 8C460028 */ lw $a2, 0x28($v0) +/* C49010 80242430 0C00A720 */ jal atan2 +/* C49014 80242434 8C470030 */ lw $a3, 0x30($v0) +/* C49018 80242438 46000506 */ mov.s $f20, $f0 +/* C4901C 8024243C C60C000C */ lwc1 $f12, 0xc($s0) +/* C49020 80242440 0C00A70A */ jal get_clamped_angle_diff +/* C49024 80242444 4600A386 */ mov.s $f14, $f20 +/* C49028 80242448 46000086 */ mov.s $f2, $f0 +/* C4902C 8024244C 8E62001C */ lw $v0, 0x1c($s3) +/* C49030 80242450 46001005 */ abs.s $f0, $f2 +/* C49034 80242454 44822000 */ mtc1 $v0, $f4 +/* C49038 80242458 00000000 */ nop +/* C4903C 8024245C 46802120 */ cvt.s.w $f4, $f4 +/* C49040 80242460 4600203C */ c.lt.s $f4, $f0 +/* C49044 80242464 00000000 */ nop +/* C49048 80242468 4500000D */ bc1f .L802424A0 +/* C4904C 8024246C 00000000 */ nop +/* C49050 80242470 44800000 */ mtc1 $zero, $f0 +/* C49054 80242474 C614000C */ lwc1 $f20, 0xc($s0) +/* C49058 80242478 4600103C */ c.lt.s $f2, $f0 +/* C4905C 8024247C 00000000 */ nop +/* C49060 80242480 45000006 */ bc1f .L8024249C +/* C49064 80242484 00021023 */ negu $v0, $v0 +/* C49068 80242488 44820000 */ mtc1 $v0, $f0 +/* C4906C 8024248C 00000000 */ nop +/* C49070 80242490 46800020 */ cvt.s.w $f0, $f0 +/* C49074 80242494 08090928 */ j .L802424A0 +/* C49078 80242498 4600A500 */ add.s $f20, $f20, $f0 +.L8024249C: +/* C4907C 8024249C 4604A500 */ add.s $f20, $f20, $f4 +.L802424A0: +/* C49080 802424A0 0C00A6C9 */ jal clamp_angle +/* C49084 802424A4 4600A306 */ mov.s $f12, $f20 +/* C49088 802424A8 E600000C */ swc1 $f0, 0xc($s0) +.L802424AC: +/* C4908C 802424AC 8E020000 */ lw $v0, ($s0) +/* C49090 802424B0 30420008 */ andi $v0, $v0, 8 +/* C49094 802424B4 1040000A */ beqz $v0, .L802424E0 +/* C49098 802424B8 27A50018 */ addiu $a1, $sp, 0x18 +/* C4909C 802424BC C602003C */ lwc1 $f2, 0x3c($s0) +/* C490A0 802424C0 C600001C */ lwc1 $f0, 0x1c($s0) +/* C490A4 802424C4 46001080 */ add.s $f2, $f2, $f0 +/* C490A8 802424C8 4616103C */ c.lt.s $f2, $f22 +/* C490AC 802424CC 00000000 */ nop +/* C490B0 802424D0 45020045 */ bc1fl .L802425E8 +/* C490B4 802424D4 E602003C */ swc1 $f2, 0x3c($s0) +/* C490B8 802424D8 08090979 */ j .L802425E4 +/* C490BC 802424DC E616003C */ swc1 $f22, 0x3c($s0) +.L802424E0: +/* C490C0 802424E0 C6000038 */ lwc1 $f0, 0x38($s0) +/* C490C4 802424E4 27A6001C */ addiu $a2, $sp, 0x1c +/* C490C8 802424E8 E7A00018 */ swc1 $f0, 0x18($sp) +/* C490CC 802424EC 860200A8 */ lh $v0, 0xa8($s0) +/* C490D0 802424F0 C600001C */ lwc1 $f0, 0x1c($s0) +/* C490D4 802424F4 C604003C */ lwc1 $f4, 0x3c($s0) +/* C490D8 802424F8 44821000 */ mtc1 $v0, $f2 +/* C490DC 802424FC 00000000 */ nop +/* C490E0 80242500 468010A0 */ cvt.s.w $f2, $f2 +/* C490E4 80242504 46000005 */ abs.s $f0, $f0 +/* C490E8 80242508 46020000 */ add.s $f0, $f0, $f2 +/* C490EC 8024250C C6060040 */ lwc1 $f6, 0x40($s0) +/* C490F0 80242510 27A20024 */ addiu $v0, $sp, 0x24 +/* C490F4 80242514 46022100 */ add.s $f4, $f4, $f2 +/* C490F8 80242518 3C014024 */ lui $at, 0x4024 +/* C490FC 8024251C 44811800 */ mtc1 $at, $f3 +/* C49100 80242520 44801000 */ mtc1 $zero, $f2 +/* C49104 80242524 46000021 */ cvt.d.s $f0, $f0 +/* C49108 80242528 46220000 */ add.d $f0, $f0, $f2 +/* C4910C 8024252C E7A60020 */ swc1 $f6, 0x20($sp) +/* C49110 80242530 E7A4001C */ swc1 $f4, 0x1c($sp) +/* C49114 80242534 46200020 */ cvt.s.d $f0, $f0 +/* C49118 80242538 E7A00024 */ swc1 $f0, 0x24($sp) +/* C4911C 8024253C AFA20010 */ sw $v0, 0x10($sp) +/* C49120 80242540 8E040080 */ lw $a0, 0x80($s0) +/* C49124 80242544 0C0372DF */ jal func_800DCB7C +/* C49128 80242548 27A70020 */ addiu $a3, $sp, 0x20 +/* C4912C 8024254C 10400015 */ beqz $v0, .L802425A4 +/* C49130 80242550 00000000 */ nop +/* C49134 80242554 860200A8 */ lh $v0, 0xa8($s0) +/* C49138 80242558 C604001C */ lwc1 $f4, 0x1c($s0) +/* C4913C 8024255C 44820000 */ mtc1 $v0, $f0 +/* C49140 80242560 00000000 */ nop +/* C49144 80242564 46800020 */ cvt.s.w $f0, $f0 +/* C49148 80242568 46002085 */ abs.s $f2, $f4 +/* C4914C 8024256C 46020000 */ add.s $f0, $f0, $f2 +/* C49150 80242570 C7A20024 */ lwc1 $f2, 0x24($sp) +/* C49154 80242574 4600103E */ c.le.s $f2, $f0 +/* C49158 80242578 00000000 */ nop +/* C4915C 8024257C 45000005 */ bc1f .L80242594 +/* C49160 80242580 00000000 */ nop +/* C49164 80242584 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* C49168 80242588 AE00001C */ sw $zero, 0x1c($s0) +/* C4916C 8024258C 0809097A */ j .L802425E8 +/* C49170 80242590 E600003C */ swc1 $f0, 0x3c($s0) +.L80242594: +/* C49174 80242594 C600003C */ lwc1 $f0, 0x3c($s0) +/* C49178 80242598 46040000 */ add.s $f0, $f0, $f4 +/* C4917C 8024259C 0809097A */ j .L802425E8 +/* C49180 802425A0 E600003C */ swc1 $f0, 0x3c($s0) +.L802425A4: +/* C49184 802425A4 C606003C */ lwc1 $f6, 0x3c($s0) +/* C49188 802425A8 860200A8 */ lh $v0, 0xa8($s0) +/* C4918C 802425AC 46163081 */ sub.s $f2, $f6, $f22 +/* C49190 802425B0 44820000 */ mtc1 $v0, $f0 +/* C49194 802425B4 00000000 */ nop +/* C49198 802425B8 46800020 */ cvt.s.w $f0, $f0 +/* C4919C 802425BC 46001080 */ add.s $f2, $f2, $f0 +/* C491A0 802425C0 C604001C */ lwc1 $f4, 0x1c($s0) +/* C491A4 802425C4 46002005 */ abs.s $f0, $f4 +/* C491A8 802425C8 4602003C */ c.lt.s $f0, $f2 +/* C491AC 802425CC 00000000 */ nop +/* C491B0 802425D0 45020005 */ bc1fl .L802425E8 +/* C491B4 802425D4 AE00001C */ sw $zero, 0x1c($s0) +/* C491B8 802425D8 46043000 */ add.s $f0, $f6, $f4 +/* C491BC 802425DC 0809097A */ j .L802425E8 +/* C491C0 802425E0 E600003C */ swc1 $f0, 0x3c($s0) +.L802425E4: +/* C491C4 802425E4 AE00001C */ sw $zero, 0x1c($s0) +.L802425E8: +/* C491C8 802425E8 8FBF0038 */ lw $ra, 0x38($sp) +/* C491CC 802425EC 8FB30034 */ lw $s3, 0x34($sp) +/* C491D0 802425F0 8FB20030 */ lw $s2, 0x30($sp) +/* C491D4 802425F4 8FB1002C */ lw $s1, 0x2c($sp) +/* C491D8 802425F8 8FB00028 */ lw $s0, 0x28($sp) +/* C491DC 802425FC D7B60048 */ ldc1 $f22, 0x48($sp) +/* C491E0 80242600 D7B40040 */ ldc1 $f20, 0x40($sp) +/* C491E4 80242604 03E00008 */ jr $ra +/* C491E8 80242608 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s index 3220dcda05..45a1eca563 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242730_C49310.s @@ -46,7 +46,7 @@ glabel func_80242730_C49310 /* C493B4 802427D4 02A0202D */ daddu $a0, $s5, $zero /* C493B8 802427D8 0240282D */ daddu $a1, $s2, $zero /* C493BC 802427DC 0280302D */ daddu $a2, $s4, $zero -/* C493C0 802427E0 0C090983 */ jal func_8024260C +/* C493C0 802427E0 0C090983 */ jal func_8024260C_C491EC /* C493C4 802427E4 0200382D */ daddu $a3, $s0, $zero .L802427E8: /* C493C8 802427E8 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_80242730_C49310 /* C49418 80242838 00000000 */ nop /* C4941C 8024283C 0280202D */ daddu $a0, $s4, $zero /* C49420 80242840 0200282D */ daddu $a1, $s0, $zero -/* C49424 80242844 0C090509 */ jal func_80241424 +/* C49424 80242844 0C090509 */ jal func_80241424_C48004 /* C49428 80242848 0260302D */ daddu $a2, $s3, $zero /* C4942C 8024284C 0280202D */ daddu $a0, $s4, $zero /* C49430 80242850 0200282D */ daddu $a1, $s0, $zero -/* C49434 80242854 0C090575 */ jal func_802415D4 +/* C49434 80242854 0C090575 */ jal func_802415D4_C481B4 /* C49438 80242858 0260302D */ daddu $a2, $s3, $zero /* C4943C 8024285C 08090A3E */ j .L802428F8 /* C49440 80242860 0000102D */ daddu $v0, $zero, $zero /* C49444 80242864 0280202D */ daddu $a0, $s4, $zero /* C49448 80242868 0200282D */ daddu $a1, $s0, $zero -/* C4944C 8024286C 0C0906FF */ jal func_80241BFC +/* C4944C 8024286C 0C0906FF */ jal func_80241BFC_C487DC /* C49450 80242870 0260302D */ daddu $a2, $s3, $zero /* C49454 80242874 0280202D */ daddu $a0, $s4, $zero /* C49458 80242878 0200282D */ daddu $a1, $s0, $zero -/* C4945C 8024287C 0C09072F */ jal func_80241CBC +/* C4945C 8024287C 0C09072F */ jal func_80241CBC_C4889C /* C49460 80242880 0260302D */ daddu $a2, $s3, $zero /* C49464 80242884 08090A3E */ j .L802428F8 /* C49468 80242888 0000102D */ daddu $v0, $zero, $zero /* C4946C 8024288C 0280202D */ daddu $a0, $s4, $zero /* C49470 80242890 0200282D */ daddu $a1, $s0, $zero -/* C49474 80242894 0C090800 */ jal func_80242000 +/* C49474 80242894 0C090800 */ jal func_80242000_C48BE0 /* C49478 80242898 0260302D */ daddu $a2, $s3, $zero /* C4947C 8024289C 0280202D */ daddu $a0, $s4, $zero /* C49480 802428A0 0200282D */ daddu $a1, $s0, $zero -/* C49484 802428A4 0C09081E */ jal func_80242078 +/* C49484 802428A4 0C09081E */ jal func_80242078_C48C58 /* C49488 802428A8 0260302D */ daddu $a2, $s3, $zero /* C4948C 802428AC 08090A3E */ j .L802428F8 /* C49490 802428B0 0000102D */ daddu $v0, $zero, $zero /* C49494 802428B4 0280202D */ daddu $a0, $s4, $zero /* C49498 802428B8 0200282D */ daddu $a1, $s0, $zero -/* C4949C 802428BC 0C090839 */ jal func_802420E4 +/* C4949C 802428BC 0C090839 */ jal func_802420E4_C48CC4 /* C494A0 802428C0 0260302D */ daddu $a2, $s3, $zero /* C494A4 802428C4 08090A3E */ j .L802428F8 /* C494A8 802428C8 0000102D */ daddu $v0, $zero, $zero /* C494AC 802428CC 0280202D */ daddu $a0, $s4, $zero /* C494B0 802428D0 0200282D */ daddu $a1, $s0, $zero -/* C494B4 802428D4 0C090886 */ jal func_80242218 +/* C494B4 802428D4 0C090886 */ jal func_80242218_C48DF8 /* C494B8 802428D8 0260302D */ daddu $a2, $s3, $zero /* C494BC 802428DC 08090A3E */ j .L802428F8 /* C494C0 802428E0 0000102D */ daddu $v0, $zero, $zero /* C494C4 802428E4 0280202D */ daddu $a0, $s4, $zero /* C494C8 802428E8 0200282D */ daddu $a1, $s0, $zero -/* C494CC 802428EC 0C09089F */ jal func_8024227C +/* C494CC 802428EC 0C09089F */ jal func_8024227C_C48E5C /* C494D0 802428F0 0260302D */ daddu $a2, $s3, $zero .L802428F4: /* C494D4 802428F4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C.s deleted file mode 100644 index 0913288d09..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024291C -/* C494FC 8024291C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C49500 80242920 AFB3001C */ sw $s3, 0x1c($sp) -/* C49504 80242924 0080982D */ daddu $s3, $a0, $zero -/* C49508 80242928 AFBF0020 */ sw $ra, 0x20($sp) -/* C4950C 8024292C AFB20018 */ sw $s2, 0x18($sp) -/* C49510 80242930 AFB10014 */ sw $s1, 0x14($sp) -/* C49514 80242934 AFB00010 */ sw $s0, 0x10($sp) -/* C49518 80242938 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C4951C 8024293C 8E720148 */ lw $s2, 0x148($s3) -/* C49520 80242940 86440008 */ lh $a0, 8($s2) -/* C49524 80242944 0C00EABB */ jal get_npc_unsafe -/* C49528 80242948 00A0882D */ daddu $s1, $a1, $zero -/* C4952C 8024294C 0040802D */ daddu $s0, $v0, $zero -/* C49530 80242950 9602008E */ lhu $v0, 0x8e($s0) -/* C49534 80242954 2442FFFF */ addiu $v0, $v0, -1 -/* C49538 80242958 A602008E */ sh $v0, 0x8e($s0) -/* C4953C 8024295C 00021400 */ sll $v0, $v0, 0x10 -/* C49540 80242960 1C40003C */ bgtz $v0, .L80242A54 -/* C49544 80242964 3C03FFDF */ lui $v1, 0xffdf -/* C49548 80242968 8E020000 */ lw $v0, ($s0) -/* C4954C 8024296C 3463FFFF */ ori $v1, $v1, 0xffff -/* C49550 80242970 00431024 */ and $v0, $v0, $v1 -/* C49554 80242974 AE020000 */ sw $v0, ($s0) -/* C49558 80242978 8E240020 */ lw $a0, 0x20($s1) -/* C4955C 8024297C 000417C2 */ srl $v0, $a0, 0x1f -/* C49560 80242980 00822021 */ addu $a0, $a0, $v0 -/* C49564 80242984 00042043 */ sra $a0, $a0, 1 -/* C49568 80242988 0C00A67F */ jal rand_int -/* C4956C 8024298C 24840001 */ addiu $a0, $a0, 1 -/* C49570 80242990 8E230020 */ lw $v1, 0x20($s1) -/* C49574 80242994 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C49578 80242998 000327C2 */ srl $a0, $v1, 0x1f -/* C4957C 8024299C 00641821 */ addu $v1, $v1, $a0 -/* C49580 802429A0 00031843 */ sra $v1, $v1, 1 -/* C49584 802429A4 00621821 */ addu $v1, $v1, $v0 -/* C49588 802429A8 A603008E */ sh $v1, 0x8e($s0) -/* C4958C 802429AC 8E4200CC */ lw $v0, 0xcc($s2) -/* C49590 802429B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C49594 802429B4 8C420020 */ lw $v0, 0x20($v0) -/* C49598 802429B8 AE020028 */ sw $v0, 0x28($s0) -/* C4959C 802429BC C6200018 */ lwc1 $f0, 0x18($s1) -/* C495A0 802429C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C495A4 802429C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C495A8 802429C8 E6000018 */ swc1 $f0, 0x18($s0) -/* C495AC 802429CC 8C460028 */ lw $a2, 0x28($v0) -/* C495B0 802429D0 0C00A720 */ jal atan2 -/* C495B4 802429D4 8C470030 */ lw $a3, 0x30($v0) -/* C495B8 802429D8 46000506 */ mov.s $f20, $f0 -/* C495BC 802429DC C60C000C */ lwc1 $f12, 0xc($s0) -/* C495C0 802429E0 0C00A70A */ jal get_clamped_angle_diff -/* C495C4 802429E4 4600A386 */ mov.s $f14, $f20 -/* C495C8 802429E8 46000086 */ mov.s $f2, $f0 -/* C495CC 802429EC 8E22001C */ lw $v0, 0x1c($s1) -/* C495D0 802429F0 46001005 */ abs.s $f0, $f2 -/* C495D4 802429F4 44822000 */ mtc1 $v0, $f4 -/* C495D8 802429F8 00000000 */ nop -/* C495DC 802429FC 46802120 */ cvt.s.w $f4, $f4 -/* C495E0 80242A00 4600203C */ c.lt.s $f4, $f0 -/* C495E4 80242A04 00000000 */ nop -/* C495E8 80242A08 4500000D */ bc1f .L80242A40 -/* C495EC 80242A0C 00000000 */ nop -/* C495F0 80242A10 44800000 */ mtc1 $zero, $f0 -/* C495F4 80242A14 C614000C */ lwc1 $f20, 0xc($s0) -/* C495F8 80242A18 4600103C */ c.lt.s $f2, $f0 -/* C495FC 80242A1C 00000000 */ nop -/* C49600 80242A20 45000006 */ bc1f .L80242A3C -/* C49604 80242A24 00021023 */ negu $v0, $v0 -/* C49608 80242A28 44820000 */ mtc1 $v0, $f0 -/* C4960C 80242A2C 00000000 */ nop -/* C49610 80242A30 46800020 */ cvt.s.w $f0, $f0 -/* C49614 80242A34 08090A90 */ j .L80242A40 -/* C49618 80242A38 4600A500 */ add.s $f20, $f20, $f0 -.L80242A3C: -/* C4961C 80242A3C 4604A500 */ add.s $f20, $f20, $f4 -.L80242A40: -/* C49620 80242A40 0C00A6C9 */ jal clamp_angle -/* C49624 80242A44 4600A306 */ mov.s $f12, $f20 -/* C49628 80242A48 2402000D */ addiu $v0, $zero, 0xd -/* C4962C 80242A4C E600000C */ swc1 $f0, 0xc($s0) -/* C49630 80242A50 AE620070 */ sw $v0, 0x70($s3) -.L80242A54: -/* C49634 80242A54 8FBF0020 */ lw $ra, 0x20($sp) -/* C49638 80242A58 8FB3001C */ lw $s3, 0x1c($sp) -/* C4963C 80242A5C 8FB20018 */ lw $s2, 0x18($sp) -/* C49640 80242A60 8FB10014 */ lw $s1, 0x14($sp) -/* C49644 80242A64 8FB00010 */ lw $s0, 0x10($sp) -/* C49648 80242A68 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C4964C 80242A6C 03E00008 */ jr $ra -/* C49650 80242A70 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s new file mode 100644 index 0000000000..f810c77aaf --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_8024291C_C494FC.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024291C_C494FC +/* C494FC 8024291C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C49500 80242920 AFB3001C */ sw $s3, 0x1c($sp) +/* C49504 80242924 0080982D */ daddu $s3, $a0, $zero +/* C49508 80242928 AFBF0020 */ sw $ra, 0x20($sp) +/* C4950C 8024292C AFB20018 */ sw $s2, 0x18($sp) +/* C49510 80242930 AFB10014 */ sw $s1, 0x14($sp) +/* C49514 80242934 AFB00010 */ sw $s0, 0x10($sp) +/* C49518 80242938 F7B40028 */ sdc1 $f20, 0x28($sp) +/* C4951C 8024293C 8E720148 */ lw $s2, 0x148($s3) +/* C49520 80242940 86440008 */ lh $a0, 8($s2) +/* C49524 80242944 0C00EABB */ jal get_npc_unsafe +/* C49528 80242948 00A0882D */ daddu $s1, $a1, $zero +/* C4952C 8024294C 0040802D */ daddu $s0, $v0, $zero +/* C49530 80242950 9602008E */ lhu $v0, 0x8e($s0) +/* C49534 80242954 2442FFFF */ addiu $v0, $v0, -1 +/* C49538 80242958 A602008E */ sh $v0, 0x8e($s0) +/* C4953C 8024295C 00021400 */ sll $v0, $v0, 0x10 +/* C49540 80242960 1C40003C */ bgtz $v0, .L80242A54 +/* C49544 80242964 3C03FFDF */ lui $v1, 0xffdf +/* C49548 80242968 8E020000 */ lw $v0, ($s0) +/* C4954C 8024296C 3463FFFF */ ori $v1, $v1, 0xffff +/* C49550 80242970 00431024 */ and $v0, $v0, $v1 +/* C49554 80242974 AE020000 */ sw $v0, ($s0) +/* C49558 80242978 8E240020 */ lw $a0, 0x20($s1) +/* C4955C 8024297C 000417C2 */ srl $v0, $a0, 0x1f +/* C49560 80242980 00822021 */ addu $a0, $a0, $v0 +/* C49564 80242984 00042043 */ sra $a0, $a0, 1 +/* C49568 80242988 0C00A67F */ jal rand_int +/* C4956C 8024298C 24840001 */ addiu $a0, $a0, 1 +/* C49570 80242990 8E230020 */ lw $v1, 0x20($s1) +/* C49574 80242994 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C49578 80242998 000327C2 */ srl $a0, $v1, 0x1f +/* C4957C 8024299C 00641821 */ addu $v1, $v1, $a0 +/* C49580 802429A0 00031843 */ sra $v1, $v1, 1 +/* C49584 802429A4 00621821 */ addu $v1, $v1, $v0 +/* C49588 802429A8 A603008E */ sh $v1, 0x8e($s0) +/* C4958C 802429AC 8E4200CC */ lw $v0, 0xcc($s2) +/* C49590 802429B0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C49594 802429B4 8C420020 */ lw $v0, 0x20($v0) +/* C49598 802429B8 AE020028 */ sw $v0, 0x28($s0) +/* C4959C 802429BC C6200018 */ lwc1 $f0, 0x18($s1) +/* C495A0 802429C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C495A4 802429C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C495A8 802429C8 E6000018 */ swc1 $f0, 0x18($s0) +/* C495AC 802429CC 8C460028 */ lw $a2, 0x28($v0) +/* C495B0 802429D0 0C00A720 */ jal atan2 +/* C495B4 802429D4 8C470030 */ lw $a3, 0x30($v0) +/* C495B8 802429D8 46000506 */ mov.s $f20, $f0 +/* C495BC 802429DC C60C000C */ lwc1 $f12, 0xc($s0) +/* C495C0 802429E0 0C00A70A */ jal get_clamped_angle_diff +/* C495C4 802429E4 4600A386 */ mov.s $f14, $f20 +/* C495C8 802429E8 46000086 */ mov.s $f2, $f0 +/* C495CC 802429EC 8E22001C */ lw $v0, 0x1c($s1) +/* C495D0 802429F0 46001005 */ abs.s $f0, $f2 +/* C495D4 802429F4 44822000 */ mtc1 $v0, $f4 +/* C495D8 802429F8 00000000 */ nop +/* C495DC 802429FC 46802120 */ cvt.s.w $f4, $f4 +/* C495E0 80242A00 4600203C */ c.lt.s $f4, $f0 +/* C495E4 80242A04 00000000 */ nop +/* C495E8 80242A08 4500000D */ bc1f .L80242A40 +/* C495EC 80242A0C 00000000 */ nop +/* C495F0 80242A10 44800000 */ mtc1 $zero, $f0 +/* C495F4 80242A14 C614000C */ lwc1 $f20, 0xc($s0) +/* C495F8 80242A18 4600103C */ c.lt.s $f2, $f0 +/* C495FC 80242A1C 00000000 */ nop +/* C49600 80242A20 45000006 */ bc1f .L80242A3C +/* C49604 80242A24 00021023 */ negu $v0, $v0 +/* C49608 80242A28 44820000 */ mtc1 $v0, $f0 +/* C4960C 80242A2C 00000000 */ nop +/* C49610 80242A30 46800020 */ cvt.s.w $f0, $f0 +/* C49614 80242A34 08090A90 */ j .L80242A40 +/* C49618 80242A38 4600A500 */ add.s $f20, $f20, $f0 +.L80242A3C: +/* C4961C 80242A3C 4604A500 */ add.s $f20, $f20, $f4 +.L80242A40: +/* C49620 80242A40 0C00A6C9 */ jal clamp_angle +/* C49624 80242A44 4600A306 */ mov.s $f12, $f20 +/* C49628 80242A48 2402000D */ addiu $v0, $zero, 0xd +/* C4962C 80242A4C E600000C */ swc1 $f0, 0xc($s0) +/* C49630 80242A50 AE620070 */ sw $v0, 0x70($s3) +.L80242A54: +/* C49634 80242A54 8FBF0020 */ lw $ra, 0x20($sp) +/* C49638 80242A58 8FB3001C */ lw $s3, 0x1c($sp) +/* C4963C 80242A5C 8FB20018 */ lw $s2, 0x18($sp) +/* C49640 80242A60 8FB10014 */ lw $s1, 0x14($sp) +/* C49644 80242A64 8FB00010 */ lw $s0, 0x10($sp) +/* C49648 80242A68 D7B40028 */ ldc1 $f20, 0x28($sp) +/* C4964C 80242A6C 03E00008 */ jr $ra +/* C49650 80242A70 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74.s deleted file mode 100644 index c37dd9179a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A74 -/* C49654 80242A74 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C49658 80242A78 AFB30024 */ sw $s3, 0x24($sp) -/* C4965C 80242A7C 0080982D */ daddu $s3, $a0, $zero -/* C49660 80242A80 AFBF0028 */ sw $ra, 0x28($sp) -/* C49664 80242A84 AFB20020 */ sw $s2, 0x20($sp) -/* C49668 80242A88 AFB1001C */ sw $s1, 0x1c($sp) -/* C4966C 80242A8C AFB00018 */ sw $s0, 0x18($sp) -/* C49670 80242A90 8E700148 */ lw $s0, 0x148($s3) -/* C49674 80242A94 00A0902D */ daddu $s2, $a1, $zero -/* C49678 80242A98 86040008 */ lh $a0, 8($s0) -/* C4967C 80242A9C 0C00EABB */ jal get_npc_unsafe -/* C49680 80242AA0 00C0882D */ daddu $s1, $a2, $zero -/* C49684 80242AA4 0220202D */ daddu $a0, $s1, $zero -/* C49688 80242AA8 0200282D */ daddu $a1, $s0, $zero -/* C4968C 80242AAC 24030001 */ addiu $v1, $zero, 1 -/* C49690 80242AB0 AFA30010 */ sw $v1, 0x10($sp) -/* C49694 80242AB4 8E460024 */ lw $a2, 0x24($s2) -/* C49698 80242AB8 8E470028 */ lw $a3, 0x28($s2) -/* C4969C 80242ABC 0C01242D */ jal func_800490B4 -/* C496A0 80242AC0 0040802D */ daddu $s0, $v0, $zero -/* C496A4 80242AC4 10400024 */ beqz $v0, .L80242B58 -/* C496A8 80242AC8 24020010 */ addiu $v0, $zero, 0x10 -/* C496AC 80242ACC 8E050018 */ lw $a1, 0x18($s0) -/* C496B0 80242AD0 8E06000C */ lw $a2, 0xc($s0) -/* C496B4 80242AD4 0C00EA95 */ jal npc_move_heading -/* C496B8 80242AD8 0200202D */ daddu $a0, $s0, $zero -/* C496BC 80242ADC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C496C0 80242AE0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C496C4 80242AE4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C496C8 80242AE8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C496CC 80242AEC 8C460028 */ lw $a2, 0x28($v0) -/* C496D0 80242AF0 0C00A7B5 */ jal dist2D -/* C496D4 80242AF4 8C470030 */ lw $a3, 0x30($v0) -/* C496D8 80242AF8 C6020018 */ lwc1 $f2, 0x18($s0) -/* C496DC 80242AFC 3C014004 */ lui $at, 0x4004 -/* C496E0 80242B00 44812800 */ mtc1 $at, $f5 -/* C496E4 80242B04 44802000 */ mtc1 $zero, $f4 -/* C496E8 80242B08 460010A1 */ cvt.d.s $f2, $f2 -/* C496EC 80242B0C 46241082 */ mul.d $f2, $f2, $f4 -/* C496F0 80242B10 00000000 */ nop -/* C496F4 80242B14 46000021 */ cvt.d.s $f0, $f0 -/* C496F8 80242B18 4622003E */ c.le.d $f0, $f2 -/* C496FC 80242B1C 00000000 */ nop -/* C49700 80242B20 45000003 */ bc1f .L80242B30 -/* C49704 80242B24 2402000E */ addiu $v0, $zero, 0xe -/* C49708 80242B28 08090AD6 */ j .L80242B58 -/* C4970C 80242B2C A600008E */ sh $zero, 0x8e($s0) -.L80242B30: -/* C49710 80242B30 9602008E */ lhu $v0, 0x8e($s0) -/* C49714 80242B34 2442FFFF */ addiu $v0, $v0, -1 -/* C49718 80242B38 A602008E */ sh $v0, 0x8e($s0) -/* C4971C 80242B3C 00021400 */ sll $v0, $v0, 0x10 -/* C49720 80242B40 1C400006 */ bgtz $v0, .L80242B5C -/* C49724 80242B44 3C030020 */ lui $v1, 0x20 -/* C49728 80242B48 8E020000 */ lw $v0, ($s0) -/* C4972C 80242B4C 00431025 */ or $v0, $v0, $v1 -/* C49730 80242B50 AE020000 */ sw $v0, ($s0) -/* C49734 80242B54 2402000C */ addiu $v0, $zero, 0xc -.L80242B58: -/* C49738 80242B58 AE620070 */ sw $v0, 0x70($s3) -.L80242B5C: -/* C4973C 80242B5C 8FBF0028 */ lw $ra, 0x28($sp) -/* C49740 80242B60 8FB30024 */ lw $s3, 0x24($sp) -/* C49744 80242B64 8FB20020 */ lw $s2, 0x20($sp) -/* C49748 80242B68 8FB1001C */ lw $s1, 0x1c($sp) -/* C4974C 80242B6C 8FB00018 */ lw $s0, 0x18($sp) -/* C49750 80242B70 03E00008 */ jr $ra -/* C49754 80242B74 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s new file mode 100644 index 0000000000..fd391c6f9f --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242A74_C49654.s @@ -0,0 +1,72 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A74_C49654 +/* C49654 80242A74 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C49658 80242A78 AFB30024 */ sw $s3, 0x24($sp) +/* C4965C 80242A7C 0080982D */ daddu $s3, $a0, $zero +/* C49660 80242A80 AFBF0028 */ sw $ra, 0x28($sp) +/* C49664 80242A84 AFB20020 */ sw $s2, 0x20($sp) +/* C49668 80242A88 AFB1001C */ sw $s1, 0x1c($sp) +/* C4966C 80242A8C AFB00018 */ sw $s0, 0x18($sp) +/* C49670 80242A90 8E700148 */ lw $s0, 0x148($s3) +/* C49674 80242A94 00A0902D */ daddu $s2, $a1, $zero +/* C49678 80242A98 86040008 */ lh $a0, 8($s0) +/* C4967C 80242A9C 0C00EABB */ jal get_npc_unsafe +/* C49680 80242AA0 00C0882D */ daddu $s1, $a2, $zero +/* C49684 80242AA4 0220202D */ daddu $a0, $s1, $zero +/* C49688 80242AA8 0200282D */ daddu $a1, $s0, $zero +/* C4968C 80242AAC 24030001 */ addiu $v1, $zero, 1 +/* C49690 80242AB0 AFA30010 */ sw $v1, 0x10($sp) +/* C49694 80242AB4 8E460024 */ lw $a2, 0x24($s2) +/* C49698 80242AB8 8E470028 */ lw $a3, 0x28($s2) +/* C4969C 80242ABC 0C01242D */ jal func_800490B4 +/* C496A0 80242AC0 0040802D */ daddu $s0, $v0, $zero +/* C496A4 80242AC4 10400024 */ beqz $v0, .L80242B58 +/* C496A8 80242AC8 24020010 */ addiu $v0, $zero, 0x10 +/* C496AC 80242ACC 8E050018 */ lw $a1, 0x18($s0) +/* C496B0 80242AD0 8E06000C */ lw $a2, 0xc($s0) +/* C496B4 80242AD4 0C00EA95 */ jal npc_move_heading +/* C496B8 80242AD8 0200202D */ daddu $a0, $s0, $zero +/* C496BC 80242ADC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C496C0 80242AE0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C496C4 80242AE4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C496C8 80242AE8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C496CC 80242AEC 8C460028 */ lw $a2, 0x28($v0) +/* C496D0 80242AF0 0C00A7B5 */ jal dist2D +/* C496D4 80242AF4 8C470030 */ lw $a3, 0x30($v0) +/* C496D8 80242AF8 C6020018 */ lwc1 $f2, 0x18($s0) +/* C496DC 80242AFC 3C014004 */ lui $at, 0x4004 +/* C496E0 80242B00 44812800 */ mtc1 $at, $f5 +/* C496E4 80242B04 44802000 */ mtc1 $zero, $f4 +/* C496E8 80242B08 460010A1 */ cvt.d.s $f2, $f2 +/* C496EC 80242B0C 46241082 */ mul.d $f2, $f2, $f4 +/* C496F0 80242B10 00000000 */ nop +/* C496F4 80242B14 46000021 */ cvt.d.s $f0, $f0 +/* C496F8 80242B18 4622003E */ c.le.d $f0, $f2 +/* C496FC 80242B1C 00000000 */ nop +/* C49700 80242B20 45000003 */ bc1f .L80242B30 +/* C49704 80242B24 2402000E */ addiu $v0, $zero, 0xe +/* C49708 80242B28 08090AD6 */ j .L80242B58 +/* C4970C 80242B2C A600008E */ sh $zero, 0x8e($s0) +.L80242B30: +/* C49710 80242B30 9602008E */ lhu $v0, 0x8e($s0) +/* C49714 80242B34 2442FFFF */ addiu $v0, $v0, -1 +/* C49718 80242B38 A602008E */ sh $v0, 0x8e($s0) +/* C4971C 80242B3C 00021400 */ sll $v0, $v0, 0x10 +/* C49720 80242B40 1C400006 */ bgtz $v0, .L80242B5C +/* C49724 80242B44 3C030020 */ lui $v1, 0x20 +/* C49728 80242B48 8E020000 */ lw $v0, ($s0) +/* C4972C 80242B4C 00431025 */ or $v0, $v0, $v1 +/* C49730 80242B50 AE020000 */ sw $v0, ($s0) +/* C49734 80242B54 2402000C */ addiu $v0, $zero, 0xc +.L80242B58: +/* C49738 80242B58 AE620070 */ sw $v0, 0x70($s3) +.L80242B5C: +/* C4973C 80242B5C 8FBF0028 */ lw $ra, 0x28($sp) +/* C49740 80242B60 8FB30024 */ lw $s3, 0x24($sp) +/* C49744 80242B64 8FB20020 */ lw $s2, 0x20($sp) +/* C49748 80242B68 8FB1001C */ lw $s1, 0x1c($sp) +/* C4974C 80242B6C 8FB00018 */ lw $s0, 0x18($sp) +/* C49750 80242B70 03E00008 */ jr $ra +/* C49754 80242B74 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78.s deleted file mode 100644 index 6b62ba8fb1..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B78 -/* C49758 80242B78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C4975C 80242B7C AFB20020 */ sw $s2, 0x20($sp) -/* C49760 80242B80 0080902D */ daddu $s2, $a0, $zero -/* C49764 80242B84 AFBF0024 */ sw $ra, 0x24($sp) -/* C49768 80242B88 AFB1001C */ sw $s1, 0x1c($sp) -/* C4976C 80242B8C AFB00018 */ sw $s0, 0x18($sp) -/* C49770 80242B90 8E500148 */ lw $s0, 0x148($s2) -/* C49774 80242B94 0C00EABB */ jal get_npc_unsafe -/* C49778 80242B98 86040008 */ lh $a0, 8($s0) -/* C4977C 80242B9C 0040882D */ daddu $s1, $v0, $zero -/* C49780 80242BA0 8E02006C */ lw $v0, 0x6c($s0) -/* C49784 80242BA4 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C49788 80242BA8 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C4978C 80242BAC 34420100 */ ori $v0, $v0, 0x100 -/* C49790 80242BB0 AE02006C */ sw $v0, 0x6c($s0) -/* C49794 80242BB4 C4600028 */ lwc1 $f0, 0x28($v1) -/* C49798 80242BB8 E6200038 */ swc1 $f0, 0x38($s1) -/* C4979C 80242BBC C4600030 */ lwc1 $f0, 0x30($v1) -/* C497A0 80242BC0 E6200040 */ swc1 $f0, 0x40($s1) -/* C497A4 80242BC4 8E03006C */ lw $v1, 0x6c($s0) -/* C497A8 80242BC8 30621000 */ andi $v0, $v1, 0x1000 -/* C497AC 80242BCC 14400003 */ bnez $v0, .L80242BDC -/* C497B0 80242BD0 3C048000 */ lui $a0, 0x8000 -/* C497B4 80242BD4 34621000 */ ori $v0, $v1, 0x1000 -/* C497B8 80242BD8 AE02006C */ sw $v0, 0x6c($s0) -.L80242BDC: -/* C497BC 80242BDC C6200040 */ lwc1 $f0, 0x40($s1) -/* C497C0 80242BE0 34840011 */ ori $a0, $a0, 0x11 -/* C497C4 80242BE4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C497C8 80242BE8 8E260038 */ lw $a2, 0x38($s1) -/* C497CC 80242BEC 8E27003C */ lw $a3, 0x3c($s1) -/* C497D0 80242BF0 0C052757 */ jal play_sound_at_position -/* C497D4 80242BF4 24050002 */ addiu $a1, $zero, 2 -/* C497D8 80242BF8 2402000F */ addiu $v0, $zero, 0xf -/* C497DC 80242BFC A620008E */ sh $zero, 0x8e($s1) -/* C497E0 80242C00 AE420070 */ sw $v0, 0x70($s2) -/* C497E4 80242C04 8FBF0024 */ lw $ra, 0x24($sp) -/* C497E8 80242C08 8FB20020 */ lw $s2, 0x20($sp) -/* C497EC 80242C0C 8FB1001C */ lw $s1, 0x1c($sp) -/* C497F0 80242C10 8FB00018 */ lw $s0, 0x18($sp) -/* C497F4 80242C14 03E00008 */ jr $ra -/* C497F8 80242C18 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s new file mode 100644 index 0000000000..acc57d1130 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242B78_C49758.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B78_C49758 +/* C49758 80242B78 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C4975C 80242B7C AFB20020 */ sw $s2, 0x20($sp) +/* C49760 80242B80 0080902D */ daddu $s2, $a0, $zero +/* C49764 80242B84 AFBF0024 */ sw $ra, 0x24($sp) +/* C49768 80242B88 AFB1001C */ sw $s1, 0x1c($sp) +/* C4976C 80242B8C AFB00018 */ sw $s0, 0x18($sp) +/* C49770 80242B90 8E500148 */ lw $s0, 0x148($s2) +/* C49774 80242B94 0C00EABB */ jal get_npc_unsafe +/* C49778 80242B98 86040008 */ lh $a0, 8($s0) +/* C4977C 80242B9C 0040882D */ daddu $s1, $v0, $zero +/* C49780 80242BA0 8E02006C */ lw $v0, 0x6c($s0) +/* C49784 80242BA4 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) +/* C49788 80242BA8 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) +/* C4978C 80242BAC 34420100 */ ori $v0, $v0, 0x100 +/* C49790 80242BB0 AE02006C */ sw $v0, 0x6c($s0) +/* C49794 80242BB4 C4600028 */ lwc1 $f0, 0x28($v1) +/* C49798 80242BB8 E6200038 */ swc1 $f0, 0x38($s1) +/* C4979C 80242BBC C4600030 */ lwc1 $f0, 0x30($v1) +/* C497A0 80242BC0 E6200040 */ swc1 $f0, 0x40($s1) +/* C497A4 80242BC4 8E03006C */ lw $v1, 0x6c($s0) +/* C497A8 80242BC8 30621000 */ andi $v0, $v1, 0x1000 +/* C497AC 80242BCC 14400003 */ bnez $v0, .L80242BDC +/* C497B0 80242BD0 3C048000 */ lui $a0, 0x8000 +/* C497B4 80242BD4 34621000 */ ori $v0, $v1, 0x1000 +/* C497B8 80242BD8 AE02006C */ sw $v0, 0x6c($s0) +.L80242BDC: +/* C497BC 80242BDC C6200040 */ lwc1 $f0, 0x40($s1) +/* C497C0 80242BE0 34840011 */ ori $a0, $a0, 0x11 +/* C497C4 80242BE4 E7A00010 */ swc1 $f0, 0x10($sp) +/* C497C8 80242BE8 8E260038 */ lw $a2, 0x38($s1) +/* C497CC 80242BEC 8E27003C */ lw $a3, 0x3c($s1) +/* C497D0 80242BF0 0C052757 */ jal play_sound_at_position +/* C497D4 80242BF4 24050002 */ addiu $a1, $zero, 2 +/* C497D8 80242BF8 2402000F */ addiu $v0, $zero, 0xf +/* C497DC 80242BFC A620008E */ sh $zero, 0x8e($s1) +/* C497E0 80242C00 AE420070 */ sw $v0, 0x70($s2) +/* C497E4 80242C04 8FBF0024 */ lw $ra, 0x24($sp) +/* C497E8 80242C08 8FB20020 */ lw $s2, 0x20($sp) +/* C497EC 80242C0C 8FB1001C */ lw $s1, 0x1c($sp) +/* C497F0 80242C10 8FB00018 */ lw $s0, 0x18($sp) +/* C497F4 80242C14 03E00008 */ jr $ra +/* C497F8 80242C18 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C.s deleted file mode 100644 index 09a992f91b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C.s +++ /dev/null @@ -1,177 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C1C -/* C497FC 80242C1C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C49800 80242C20 AFB40040 */ sw $s4, 0x40($sp) -/* C49804 80242C24 0080A02D */ daddu $s4, $a0, $zero -/* C49808 80242C28 AFBF0044 */ sw $ra, 0x44($sp) -/* C4980C 80242C2C AFB3003C */ sw $s3, 0x3c($sp) -/* C49810 80242C30 AFB20038 */ sw $s2, 0x38($sp) -/* C49814 80242C34 AFB10034 */ sw $s1, 0x34($sp) -/* C49818 80242C38 AFB00030 */ sw $s0, 0x30($sp) -/* C4981C 80242C3C 8E930148 */ lw $s3, 0x148($s4) -/* C49820 80242C40 00A0802D */ daddu $s0, $a1, $zero -/* C49824 80242C44 86640008 */ lh $a0, 8($s3) -/* C49828 80242C48 0C00EABB */ jal get_npc_unsafe -/* C4982C 80242C4C 00C0882D */ daddu $s1, $a2, $zero -/* C49830 80242C50 3C048000 */ lui $a0, 0x8000 -/* C49834 80242C54 0040902D */ daddu $s2, $v0, $zero -/* C49838 80242C58 C6400040 */ lwc1 $f0, 0x40($s2) -/* C4983C 80242C5C 34840011 */ ori $a0, $a0, 0x11 -/* C49840 80242C60 E7A00010 */ swc1 $f0, 0x10($sp) -/* C49844 80242C64 8E460038 */ lw $a2, 0x38($s2) -/* C49848 80242C68 8E47003C */ lw $a3, 0x3c($s2) -/* C4984C 80242C6C 0C05267B */ jal func_801499EC -/* C49850 80242C70 24050002 */ addiu $a1, $zero, 2 -/* C49854 80242C74 0220202D */ daddu $a0, $s1, $zero -/* C49858 80242C78 24020001 */ addiu $v0, $zero, 1 -/* C4985C 80242C7C AFA20010 */ sw $v0, 0x10($sp) -/* C49860 80242C80 8E060024 */ lw $a2, 0x24($s0) -/* C49864 80242C84 8E070028 */ lw $a3, 0x28($s0) -/* C49868 80242C88 0C01242D */ jal func_800490B4 -/* C4986C 80242C8C 0260282D */ daddu $a1, $s3, $zero -/* C49870 80242C90 1440000B */ bnez $v0, .L80242CC0 -/* C49874 80242C94 3C04FFDF */ lui $a0, 0xffdf -/* C49878 80242C98 8E62006C */ lw $v0, 0x6c($s3) -/* C4987C 80242C9C 2403FEFF */ addiu $v1, $zero, -0x101 -/* C49880 80242CA0 00431024 */ and $v0, $v0, $v1 -/* C49884 80242CA4 AE62006C */ sw $v0, 0x6c($s3) -/* C49888 80242CA8 8E420000 */ lw $v0, ($s2) -/* C4988C 80242CAC 3484FFFF */ ori $a0, $a0, 0xffff -/* C49890 80242CB0 AE400048 */ sw $zero, 0x48($s2) -/* C49894 80242CB4 00441024 */ and $v0, $v0, $a0 -/* C49898 80242CB8 08090BA4 */ j .L80242E90 -/* C4989C 80242CBC AE420000 */ sw $v0, ($s2) -.L80242CC0: -/* C498A0 80242CC0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C498A4 80242CC4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C498A8 80242CC8 C6440048 */ lwc1 $f4, 0x48($s2) -/* C498AC 80242CCC 3C0141C8 */ lui $at, 0x41c8 -/* C498B0 80242CD0 44810000 */ mtc1 $at, $f0 -/* C498B4 80242CD4 8E020000 */ lw $v0, ($s0) -/* C498B8 80242CD8 46002100 */ add.s $f4, $f4, $f0 -/* C498BC 80242CDC C4420028 */ lwc1 $f2, 0x28($v0) -/* C498C0 80242CE0 3C014000 */ lui $at, 0x4000 -/* C498C4 80242CE4 44810000 */ mtc1 $at, $f0 -/* C498C8 80242CE8 E6420038 */ swc1 $f2, 0x38($s2) -/* C498CC 80242CEC C4420030 */ lwc1 $f2, 0x30($v0) -/* C498D0 80242CF0 46001080 */ add.s $f2, $f2, $f0 -/* C498D4 80242CF4 3C018024 */ lui $at, 0x8024 -/* C498D8 80242CF8 D4265718 */ ldc1 $f6, 0x5718($at) -/* C498DC 80242CFC 46002021 */ cvt.d.s $f0, $f4 -/* C498E0 80242D00 4620303C */ c.lt.d $f6, $f0 -/* C498E4 80242D04 E6440048 */ swc1 $f4, 0x48($s2) -/* C498E8 80242D08 45000004 */ bc1f .L80242D1C -/* C498EC 80242D0C E6420040 */ swc1 $f2, 0x40($s2) -/* C498F0 80242D10 46260001 */ sub.d $f0, $f0, $f6 -/* C498F4 80242D14 46200020 */ cvt.s.d $f0, $f0 -/* C498F8 80242D18 E6400048 */ swc1 $f0, 0x48($s2) -.L80242D1C: -/* C498FC 80242D1C 3C02B60B */ lui $v0, 0xb60b -/* C49900 80242D20 C6400048 */ lwc1 $f0, 0x48($s2) -/* C49904 80242D24 344260B7 */ ori $v0, $v0, 0x60b7 -/* C49908 80242D28 4600020D */ trunc.w.s $f8, $f0 -/* C4990C 80242D2C 44044000 */ mfc1 $a0, $f8 -/* C49910 80242D30 00000000 */ nop -/* C49914 80242D34 00820018 */ mult $a0, $v0 -/* C49918 80242D38 00041FC3 */ sra $v1, $a0, 0x1f -/* C4991C 80242D3C 00004010 */ mfhi $t0 -/* C49920 80242D40 01041021 */ addu $v0, $t0, $a0 -/* C49924 80242D44 000211C3 */ sra $v0, $v0, 7 -/* C49928 80242D48 00431023 */ subu $v0, $v0, $v1 -/* C4992C 80242D4C 00021840 */ sll $v1, $v0, 1 -/* C49930 80242D50 00621821 */ addu $v1, $v1, $v0 -/* C49934 80242D54 00031100 */ sll $v0, $v1, 4 -/* C49938 80242D58 00431023 */ subu $v0, $v0, $v1 -/* C4993C 80242D5C 00021080 */ sll $v0, $v0, 2 -/* C49940 80242D60 00822023 */ subu $a0, $a0, $v0 -/* C49944 80242D64 00042400 */ sll $a0, $a0, 0x10 -/* C49948 80242D68 0C00A4F5 */ jal cosine -/* C4994C 80242D6C 00042403 */ sra $a0, $a0, 0x10 -/* C49950 80242D70 3C014260 */ lui $at, 0x4260 -/* C49954 80242D74 44811000 */ mtc1 $at, $f2 -/* C49958 80242D78 00000000 */ nop -/* C4995C 80242D7C 46020002 */ mul.s $f0, $f0, $f2 -/* C49960 80242D80 00000000 */ nop -/* C49964 80242D84 24050006 */ addiu $a1, $zero, 6 -/* C49968 80242D88 3C01437F */ lui $at, 0x437f -/* C4996C 80242D8C 44811000 */ mtc1 $at, $f2 -/* C49970 80242D90 240200FF */ addiu $v0, $zero, 0xff -/* C49974 80242D94 46001081 */ sub.s $f2, $f2, $f0 -/* C49978 80242D98 AFA20014 */ sw $v0, 0x14($sp) -/* C4997C 80242D9C AFA00018 */ sw $zero, 0x18($sp) -/* C49980 80242DA0 4600120D */ trunc.w.s $f8, $f2 -/* C49984 80242DA4 44064000 */ mfc1 $a2, $f8 -/* C49988 80242DA8 00000000 */ nop -/* C4998C 80242DAC AFA60010 */ sw $a2, 0x10($sp) -/* C49990 80242DB0 8E440024 */ lw $a0, 0x24($s2) -/* C49994 80242DB4 0C0B7A25 */ jal func_802DE894 -/* C49998 80242DB8 00C0382D */ daddu $a3, $a2, $zero -/* C4999C 80242DBC 27A50020 */ addiu $a1, $sp, 0x20 -/* C499A0 80242DC0 27A60024 */ addiu $a2, $sp, 0x24 -/* C499A4 80242DC4 8E020000 */ lw $v0, ($s0) -/* C499A8 80242DC8 3C01447A */ lui $at, 0x447a -/* C499AC 80242DCC 44810000 */ mtc1 $at, $f0 -/* C499B0 80242DD0 C4420028 */ lwc1 $f2, 0x28($v0) -/* C499B4 80242DD4 C444002C */ lwc1 $f4, 0x2c($v0) -/* C499B8 80242DD8 C4460030 */ lwc1 $f6, 0x30($v0) -/* C499BC 80242DDC 27A2002C */ addiu $v0, $sp, 0x2c -/* C499C0 80242DE0 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C499C4 80242DE4 E7A20020 */ swc1 $f2, 0x20($sp) -/* C499C8 80242DE8 E7A40024 */ swc1 $f4, 0x24($sp) -/* C499CC 80242DEC E7A60028 */ swc1 $f6, 0x28($sp) -/* C499D0 80242DF0 AFA20010 */ sw $v0, 0x10($sp) -/* C499D4 80242DF4 8E440080 */ lw $a0, 0x80($s2) -/* C499D8 80242DF8 0C0372DF */ jal func_800DCB7C -/* C499DC 80242DFC 27A70028 */ addiu $a3, $sp, 0x28 -/* C499E0 80242E00 C644003C */ lwc1 $f4, 0x3c($s2) -/* C499E4 80242E04 C7A00024 */ lwc1 $f0, 0x24($sp) -/* C499E8 80242E08 46002001 */ sub.s $f0, $f4, $f0 -/* C499EC 80242E0C 3C014038 */ lui $at, 0x4038 -/* C499F0 80242E10 44811800 */ mtc1 $at, $f3 -/* C499F4 80242E14 44801000 */ mtc1 $zero, $f2 -/* C499F8 80242E18 46000005 */ abs.s $f0, $f0 -/* C499FC 80242E1C 46000021 */ cvt.d.s $f0, $f0 -/* C49A00 80242E20 4620103C */ c.lt.d $f2, $f0 -/* C49A04 80242E24 00000000 */ nop -/* C49A08 80242E28 45000008 */ bc1f .L80242E4C -/* C49A0C 80242E2C 3C03FFDF */ lui $v1, 0xffdf -/* C49A10 80242E30 3C018024 */ lui $at, 0x8024 -/* C49A14 80242E34 D4225720 */ ldc1 $f2, 0x5720($at) -/* C49A18 80242E38 46002021 */ cvt.d.s $f0, $f4 -/* C49A1C 80242E3C 46220001 */ sub.d $f0, $f0, $f2 -/* C49A20 80242E40 46200020 */ cvt.s.d $f0, $f0 -/* C49A24 80242E44 08090BA6 */ j .L80242E98 -/* C49A28 80242E48 E640003C */ swc1 $f0, 0x3c($s2) -.L80242E4C: -/* C49A2C 80242E4C 8E420000 */ lw $v0, ($s2) -/* C49A30 80242E50 3463FFFF */ ori $v1, $v1, 0xffff -/* C49A34 80242E54 AE400048 */ sw $zero, 0x48($s2) -/* C49A38 80242E58 00431024 */ and $v0, $v0, $v1 -/* C49A3C 80242E5C AE420000 */ sw $v0, ($s2) -/* C49A40 80242E60 3C038011 */ lui $v1, 0x8011 -/* C49A44 80242E64 8063EBB3 */ lb $v1, -0x144d($v1) -/* C49A48 80242E68 24020009 */ addiu $v0, $zero, 9 -/* C49A4C 80242E6C 10620009 */ beq $v1, $v0, .L80242E94 -/* C49A50 80242E70 24020010 */ addiu $v0, $zero, 0x10 -/* C49A54 80242E74 0C03805E */ jal disable_player_input -/* C49A58 80242E78 00000000 */ nop -/* C49A5C 80242E7C 0C03BD8A */ jal func_800EF628 -/* C49A60 80242E80 00000000 */ nop -/* C49A64 80242E84 24020014 */ addiu $v0, $zero, 0x14 -/* C49A68 80242E88 08090BA5 */ j .L80242E94 -/* C49A6C 80242E8C A640008E */ sh $zero, 0x8e($s2) -.L80242E90: -/* C49A70 80242E90 24020010 */ addiu $v0, $zero, 0x10 -.L80242E94: -/* C49A74 80242E94 AE820070 */ sw $v0, 0x70($s4) -.L80242E98: -/* C49A78 80242E98 8FBF0044 */ lw $ra, 0x44($sp) -/* C49A7C 80242E9C 8FB40040 */ lw $s4, 0x40($sp) -/* C49A80 80242EA0 8FB3003C */ lw $s3, 0x3c($sp) -/* C49A84 80242EA4 8FB20038 */ lw $s2, 0x38($sp) -/* C49A88 80242EA8 8FB10034 */ lw $s1, 0x34($sp) -/* C49A8C 80242EAC 8FB00030 */ lw $s0, 0x30($sp) -/* C49A90 80242EB0 03E00008 */ jr $ra -/* C49A94 80242EB4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s new file mode 100644 index 0000000000..4e9b8a1ae8 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242C1C_C497FC.s @@ -0,0 +1,177 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C1C_C497FC +/* C497FC 80242C1C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C49800 80242C20 AFB40040 */ sw $s4, 0x40($sp) +/* C49804 80242C24 0080A02D */ daddu $s4, $a0, $zero +/* C49808 80242C28 AFBF0044 */ sw $ra, 0x44($sp) +/* C4980C 80242C2C AFB3003C */ sw $s3, 0x3c($sp) +/* C49810 80242C30 AFB20038 */ sw $s2, 0x38($sp) +/* C49814 80242C34 AFB10034 */ sw $s1, 0x34($sp) +/* C49818 80242C38 AFB00030 */ sw $s0, 0x30($sp) +/* C4981C 80242C3C 8E930148 */ lw $s3, 0x148($s4) +/* C49820 80242C40 00A0802D */ daddu $s0, $a1, $zero +/* C49824 80242C44 86640008 */ lh $a0, 8($s3) +/* C49828 80242C48 0C00EABB */ jal get_npc_unsafe +/* C4982C 80242C4C 00C0882D */ daddu $s1, $a2, $zero +/* C49830 80242C50 3C048000 */ lui $a0, 0x8000 +/* C49834 80242C54 0040902D */ daddu $s2, $v0, $zero +/* C49838 80242C58 C6400040 */ lwc1 $f0, 0x40($s2) +/* C4983C 80242C5C 34840011 */ ori $a0, $a0, 0x11 +/* C49840 80242C60 E7A00010 */ swc1 $f0, 0x10($sp) +/* C49844 80242C64 8E460038 */ lw $a2, 0x38($s2) +/* C49848 80242C68 8E47003C */ lw $a3, 0x3c($s2) +/* C4984C 80242C6C 0C05267B */ jal func_801499EC +/* C49850 80242C70 24050002 */ addiu $a1, $zero, 2 +/* C49854 80242C74 0220202D */ daddu $a0, $s1, $zero +/* C49858 80242C78 24020001 */ addiu $v0, $zero, 1 +/* C4985C 80242C7C AFA20010 */ sw $v0, 0x10($sp) +/* C49860 80242C80 8E060024 */ lw $a2, 0x24($s0) +/* C49864 80242C84 8E070028 */ lw $a3, 0x28($s0) +/* C49868 80242C88 0C01242D */ jal func_800490B4 +/* C4986C 80242C8C 0260282D */ daddu $a1, $s3, $zero +/* C49870 80242C90 1440000B */ bnez $v0, .L80242CC0 +/* C49874 80242C94 3C04FFDF */ lui $a0, 0xffdf +/* C49878 80242C98 8E62006C */ lw $v0, 0x6c($s3) +/* C4987C 80242C9C 2403FEFF */ addiu $v1, $zero, -0x101 +/* C49880 80242CA0 00431024 */ and $v0, $v0, $v1 +/* C49884 80242CA4 AE62006C */ sw $v0, 0x6c($s3) +/* C49888 80242CA8 8E420000 */ lw $v0, ($s2) +/* C4988C 80242CAC 3484FFFF */ ori $a0, $a0, 0xffff +/* C49890 80242CB0 AE400048 */ sw $zero, 0x48($s2) +/* C49894 80242CB4 00441024 */ and $v0, $v0, $a0 +/* C49898 80242CB8 08090BA4 */ j .L80242E90 +/* C4989C 80242CBC AE420000 */ sw $v0, ($s2) +.L80242CC0: +/* C498A0 80242CC0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) +/* C498A4 80242CC4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) +/* C498A8 80242CC8 C6440048 */ lwc1 $f4, 0x48($s2) +/* C498AC 80242CCC 3C0141C8 */ lui $at, 0x41c8 +/* C498B0 80242CD0 44810000 */ mtc1 $at, $f0 +/* C498B4 80242CD4 8E020000 */ lw $v0, ($s0) +/* C498B8 80242CD8 46002100 */ add.s $f4, $f4, $f0 +/* C498BC 80242CDC C4420028 */ lwc1 $f2, 0x28($v0) +/* C498C0 80242CE0 3C014000 */ lui $at, 0x4000 +/* C498C4 80242CE4 44810000 */ mtc1 $at, $f0 +/* C498C8 80242CE8 E6420038 */ swc1 $f2, 0x38($s2) +/* C498CC 80242CEC C4420030 */ lwc1 $f2, 0x30($v0) +/* C498D0 80242CF0 46001080 */ add.s $f2, $f2, $f0 +/* C498D4 80242CF4 3C018024 */ lui $at, 0x8024 +/* C498D8 80242CF8 D4265718 */ ldc1 $f6, 0x5718($at) +/* C498DC 80242CFC 46002021 */ cvt.d.s $f0, $f4 +/* C498E0 80242D00 4620303C */ c.lt.d $f6, $f0 +/* C498E4 80242D04 E6440048 */ swc1 $f4, 0x48($s2) +/* C498E8 80242D08 45000004 */ bc1f .L80242D1C +/* C498EC 80242D0C E6420040 */ swc1 $f2, 0x40($s2) +/* C498F0 80242D10 46260001 */ sub.d $f0, $f0, $f6 +/* C498F4 80242D14 46200020 */ cvt.s.d $f0, $f0 +/* C498F8 80242D18 E6400048 */ swc1 $f0, 0x48($s2) +.L80242D1C: +/* C498FC 80242D1C 3C02B60B */ lui $v0, 0xb60b +/* C49900 80242D20 C6400048 */ lwc1 $f0, 0x48($s2) +/* C49904 80242D24 344260B7 */ ori $v0, $v0, 0x60b7 +/* C49908 80242D28 4600020D */ trunc.w.s $f8, $f0 +/* C4990C 80242D2C 44044000 */ mfc1 $a0, $f8 +/* C49910 80242D30 00000000 */ nop +/* C49914 80242D34 00820018 */ mult $a0, $v0 +/* C49918 80242D38 00041FC3 */ sra $v1, $a0, 0x1f +/* C4991C 80242D3C 00004010 */ mfhi $t0 +/* C49920 80242D40 01041021 */ addu $v0, $t0, $a0 +/* C49924 80242D44 000211C3 */ sra $v0, $v0, 7 +/* C49928 80242D48 00431023 */ subu $v0, $v0, $v1 +/* C4992C 80242D4C 00021840 */ sll $v1, $v0, 1 +/* C49930 80242D50 00621821 */ addu $v1, $v1, $v0 +/* C49934 80242D54 00031100 */ sll $v0, $v1, 4 +/* C49938 80242D58 00431023 */ subu $v0, $v0, $v1 +/* C4993C 80242D5C 00021080 */ sll $v0, $v0, 2 +/* C49940 80242D60 00822023 */ subu $a0, $a0, $v0 +/* C49944 80242D64 00042400 */ sll $a0, $a0, 0x10 +/* C49948 80242D68 0C00A4F5 */ jal cosine +/* C4994C 80242D6C 00042403 */ sra $a0, $a0, 0x10 +/* C49950 80242D70 3C014260 */ lui $at, 0x4260 +/* C49954 80242D74 44811000 */ mtc1 $at, $f2 +/* C49958 80242D78 00000000 */ nop +/* C4995C 80242D7C 46020002 */ mul.s $f0, $f0, $f2 +/* C49960 80242D80 00000000 */ nop +/* C49964 80242D84 24050006 */ addiu $a1, $zero, 6 +/* C49968 80242D88 3C01437F */ lui $at, 0x437f +/* C4996C 80242D8C 44811000 */ mtc1 $at, $f2 +/* C49970 80242D90 240200FF */ addiu $v0, $zero, 0xff +/* C49974 80242D94 46001081 */ sub.s $f2, $f2, $f0 +/* C49978 80242D98 AFA20014 */ sw $v0, 0x14($sp) +/* C4997C 80242D9C AFA00018 */ sw $zero, 0x18($sp) +/* C49980 80242DA0 4600120D */ trunc.w.s $f8, $f2 +/* C49984 80242DA4 44064000 */ mfc1 $a2, $f8 +/* C49988 80242DA8 00000000 */ nop +/* C4998C 80242DAC AFA60010 */ sw $a2, 0x10($sp) +/* C49990 80242DB0 8E440024 */ lw $a0, 0x24($s2) +/* C49994 80242DB4 0C0B7A25 */ jal func_802DE894 +/* C49998 80242DB8 00C0382D */ daddu $a3, $a2, $zero +/* C4999C 80242DBC 27A50020 */ addiu $a1, $sp, 0x20 +/* C499A0 80242DC0 27A60024 */ addiu $a2, $sp, 0x24 +/* C499A4 80242DC4 8E020000 */ lw $v0, ($s0) +/* C499A8 80242DC8 3C01447A */ lui $at, 0x447a +/* C499AC 80242DCC 44810000 */ mtc1 $at, $f0 +/* C499B0 80242DD0 C4420028 */ lwc1 $f2, 0x28($v0) +/* C499B4 80242DD4 C444002C */ lwc1 $f4, 0x2c($v0) +/* C499B8 80242DD8 C4460030 */ lwc1 $f6, 0x30($v0) +/* C499BC 80242DDC 27A2002C */ addiu $v0, $sp, 0x2c +/* C499C0 80242DE0 E7A0002C */ swc1 $f0, 0x2c($sp) +/* C499C4 80242DE4 E7A20020 */ swc1 $f2, 0x20($sp) +/* C499C8 80242DE8 E7A40024 */ swc1 $f4, 0x24($sp) +/* C499CC 80242DEC E7A60028 */ swc1 $f6, 0x28($sp) +/* C499D0 80242DF0 AFA20010 */ sw $v0, 0x10($sp) +/* C499D4 80242DF4 8E440080 */ lw $a0, 0x80($s2) +/* C499D8 80242DF8 0C0372DF */ jal func_800DCB7C +/* C499DC 80242DFC 27A70028 */ addiu $a3, $sp, 0x28 +/* C499E0 80242E00 C644003C */ lwc1 $f4, 0x3c($s2) +/* C499E4 80242E04 C7A00024 */ lwc1 $f0, 0x24($sp) +/* C499E8 80242E08 46002001 */ sub.s $f0, $f4, $f0 +/* C499EC 80242E0C 3C014038 */ lui $at, 0x4038 +/* C499F0 80242E10 44811800 */ mtc1 $at, $f3 +/* C499F4 80242E14 44801000 */ mtc1 $zero, $f2 +/* C499F8 80242E18 46000005 */ abs.s $f0, $f0 +/* C499FC 80242E1C 46000021 */ cvt.d.s $f0, $f0 +/* C49A00 80242E20 4620103C */ c.lt.d $f2, $f0 +/* C49A04 80242E24 00000000 */ nop +/* C49A08 80242E28 45000008 */ bc1f .L80242E4C +/* C49A0C 80242E2C 3C03FFDF */ lui $v1, 0xffdf +/* C49A10 80242E30 3C018024 */ lui $at, 0x8024 +/* C49A14 80242E34 D4225720 */ ldc1 $f2, 0x5720($at) +/* C49A18 80242E38 46002021 */ cvt.d.s $f0, $f4 +/* C49A1C 80242E3C 46220001 */ sub.d $f0, $f0, $f2 +/* C49A20 80242E40 46200020 */ cvt.s.d $f0, $f0 +/* C49A24 80242E44 08090BA6 */ j .L80242E98 +/* C49A28 80242E48 E640003C */ swc1 $f0, 0x3c($s2) +.L80242E4C: +/* C49A2C 80242E4C 8E420000 */ lw $v0, ($s2) +/* C49A30 80242E50 3463FFFF */ ori $v1, $v1, 0xffff +/* C49A34 80242E54 AE400048 */ sw $zero, 0x48($s2) +/* C49A38 80242E58 00431024 */ and $v0, $v0, $v1 +/* C49A3C 80242E5C AE420000 */ sw $v0, ($s2) +/* C49A40 80242E60 3C038011 */ lui $v1, 0x8011 +/* C49A44 80242E64 8063EBB3 */ lb $v1, -0x144d($v1) +/* C49A48 80242E68 24020009 */ addiu $v0, $zero, 9 +/* C49A4C 80242E6C 10620009 */ beq $v1, $v0, .L80242E94 +/* C49A50 80242E70 24020010 */ addiu $v0, $zero, 0x10 +/* C49A54 80242E74 0C03805E */ jal disable_player_input +/* C49A58 80242E78 00000000 */ nop +/* C49A5C 80242E7C 0C03BD8A */ jal func_800EF628 +/* C49A60 80242E80 00000000 */ nop +/* C49A64 80242E84 24020014 */ addiu $v0, $zero, 0x14 +/* C49A68 80242E88 08090BA5 */ j .L80242E94 +/* C49A6C 80242E8C A640008E */ sh $zero, 0x8e($s2) +.L80242E90: +/* C49A70 80242E90 24020010 */ addiu $v0, $zero, 0x10 +.L80242E94: +/* C49A74 80242E94 AE820070 */ sw $v0, 0x70($s4) +.L80242E98: +/* C49A78 80242E98 8FBF0044 */ lw $ra, 0x44($sp) +/* C49A7C 80242E9C 8FB40040 */ lw $s4, 0x40($sp) +/* C49A80 80242EA0 8FB3003C */ lw $s3, 0x3c($sp) +/* C49A84 80242EA4 8FB20038 */ lw $s2, 0x38($sp) +/* C49A88 80242EA8 8FB10034 */ lw $s1, 0x34($sp) +/* C49A8C 80242EAC 8FB00030 */ lw $s0, 0x30($sp) +/* C49A90 80242EB0 03E00008 */ jr $ra +/* C49A94 80242EB4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8.s deleted file mode 100644 index a742fb41d5..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EB8 -/* C49A98 80242EB8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C49A9C 80242EBC AFB20028 */ sw $s2, 0x28($sp) -/* C49AA0 80242EC0 0080902D */ daddu $s2, $a0, $zero -/* C49AA4 80242EC4 AFBF002C */ sw $ra, 0x2c($sp) -/* C49AA8 80242EC8 AFB10024 */ sw $s1, 0x24($sp) -/* C49AAC 80242ECC AFB00020 */ sw $s0, 0x20($sp) -/* C49AB0 80242ED0 8E500148 */ lw $s0, 0x148($s2) -/* C49AB4 80242ED4 0C00EABB */ jal get_npc_unsafe -/* C49AB8 80242ED8 86040008 */ lh $a0, 8($s0) -/* C49ABC 80242EDC 2404FEFF */ addiu $a0, $zero, -0x101 -/* C49AC0 80242EE0 0040882D */ daddu $s1, $v0, $zero -/* C49AC4 80242EE4 0000282D */ daddu $a1, $zero, $zero -/* C49AC8 80242EE8 8E03006C */ lw $v1, 0x6c($s0) -/* C49ACC 80242EEC 00A0302D */ daddu $a2, $a1, $zero -/* C49AD0 80242EF0 00641824 */ and $v1, $v1, $a0 -/* C49AD4 80242EF4 AE03006C */ sw $v1, 0x6c($s0) -/* C49AD8 80242EF8 AFA00010 */ sw $zero, 0x10($sp) -/* C49ADC 80242EFC AFA00014 */ sw $zero, 0x14($sp) -/* C49AE0 80242F00 AFA00018 */ sw $zero, 0x18($sp) -/* C49AE4 80242F04 8E240024 */ lw $a0, 0x24($s1) -/* C49AE8 80242F08 0C0B7A25 */ jal func_802DE894 -/* C49AEC 80242F0C 00A0382D */ daddu $a3, $a1, $zero -/* C49AF0 80242F10 8E02006C */ lw $v0, 0x6c($s0) -/* C49AF4 80242F14 30421000 */ andi $v0, $v0, 0x1000 -/* C49AF8 80242F18 10400008 */ beqz $v0, .L80242F3C -/* C49AFC 80242F1C 00000000 */ nop -/* C49B00 80242F20 3C048000 */ lui $a0, 0x8000 -/* C49B04 80242F24 0C05271B */ jal stop_sound -/* C49B08 80242F28 34840011 */ ori $a0, $a0, 0x11 -/* C49B0C 80242F2C 8E02006C */ lw $v0, 0x6c($s0) -/* C49B10 80242F30 2403EFFF */ addiu $v1, $zero, -0x1001 -/* C49B14 80242F34 00431024 */ and $v0, $v0, $v1 -/* C49B18 80242F38 AE02006C */ sw $v0, 0x6c($s0) -.L80242F3C: -/* C49B1C 80242F3C 8E0200CC */ lw $v0, 0xcc($s0) -/* C49B20 80242F40 8C430024 */ lw $v1, 0x24($v0) -/* C49B24 80242F44 24020014 */ addiu $v0, $zero, 0x14 -/* C49B28 80242F48 A622008E */ sh $v0, 0x8e($s1) -/* C49B2C 80242F4C 24020011 */ addiu $v0, $zero, 0x11 -/* C49B30 80242F50 AE230028 */ sw $v1, 0x28($s1) -/* C49B34 80242F54 AE420070 */ sw $v0, 0x70($s2) -/* C49B38 80242F58 8FBF002C */ lw $ra, 0x2c($sp) -/* C49B3C 80242F5C 8FB20028 */ lw $s2, 0x28($sp) -/* C49B40 80242F60 8FB10024 */ lw $s1, 0x24($sp) -/* C49B44 80242F64 8FB00020 */ lw $s0, 0x20($sp) -/* C49B48 80242F68 03E00008 */ jr $ra -/* C49B4C 80242F6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s new file mode 100644 index 0000000000..3ed3ec7648 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242EB8_C49A98.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242EB8_C49A98 +/* C49A98 80242EB8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C49A9C 80242EBC AFB20028 */ sw $s2, 0x28($sp) +/* C49AA0 80242EC0 0080902D */ daddu $s2, $a0, $zero +/* C49AA4 80242EC4 AFBF002C */ sw $ra, 0x2c($sp) +/* C49AA8 80242EC8 AFB10024 */ sw $s1, 0x24($sp) +/* C49AAC 80242ECC AFB00020 */ sw $s0, 0x20($sp) +/* C49AB0 80242ED0 8E500148 */ lw $s0, 0x148($s2) +/* C49AB4 80242ED4 0C00EABB */ jal get_npc_unsafe +/* C49AB8 80242ED8 86040008 */ lh $a0, 8($s0) +/* C49ABC 80242EDC 2404FEFF */ addiu $a0, $zero, -0x101 +/* C49AC0 80242EE0 0040882D */ daddu $s1, $v0, $zero +/* C49AC4 80242EE4 0000282D */ daddu $a1, $zero, $zero +/* C49AC8 80242EE8 8E03006C */ lw $v1, 0x6c($s0) +/* C49ACC 80242EEC 00A0302D */ daddu $a2, $a1, $zero +/* C49AD0 80242EF0 00641824 */ and $v1, $v1, $a0 +/* C49AD4 80242EF4 AE03006C */ sw $v1, 0x6c($s0) +/* C49AD8 80242EF8 AFA00010 */ sw $zero, 0x10($sp) +/* C49ADC 80242EFC AFA00014 */ sw $zero, 0x14($sp) +/* C49AE0 80242F00 AFA00018 */ sw $zero, 0x18($sp) +/* C49AE4 80242F04 8E240024 */ lw $a0, 0x24($s1) +/* C49AE8 80242F08 0C0B7A25 */ jal func_802DE894 +/* C49AEC 80242F0C 00A0382D */ daddu $a3, $a1, $zero +/* C49AF0 80242F10 8E02006C */ lw $v0, 0x6c($s0) +/* C49AF4 80242F14 30421000 */ andi $v0, $v0, 0x1000 +/* C49AF8 80242F18 10400008 */ beqz $v0, .L80242F3C +/* C49AFC 80242F1C 00000000 */ nop +/* C49B00 80242F20 3C048000 */ lui $a0, 0x8000 +/* C49B04 80242F24 0C05271B */ jal stop_sound +/* C49B08 80242F28 34840011 */ ori $a0, $a0, 0x11 +/* C49B0C 80242F2C 8E02006C */ lw $v0, 0x6c($s0) +/* C49B10 80242F30 2403EFFF */ addiu $v1, $zero, -0x1001 +/* C49B14 80242F34 00431024 */ and $v0, $v0, $v1 +/* C49B18 80242F38 AE02006C */ sw $v0, 0x6c($s0) +.L80242F3C: +/* C49B1C 80242F3C 8E0200CC */ lw $v0, 0xcc($s0) +/* C49B20 80242F40 8C430024 */ lw $v1, 0x24($v0) +/* C49B24 80242F44 24020014 */ addiu $v0, $zero, 0x14 +/* C49B28 80242F48 A622008E */ sh $v0, 0x8e($s1) +/* C49B2C 80242F4C 24020011 */ addiu $v0, $zero, 0x11 +/* C49B30 80242F50 AE230028 */ sw $v1, 0x28($s1) +/* C49B34 80242F54 AE420070 */ sw $v0, 0x70($s2) +/* C49B38 80242F58 8FBF002C */ lw $ra, 0x2c($sp) +/* C49B3C 80242F5C 8FB20028 */ lw $s2, 0x28($sp) +/* C49B40 80242F60 8FB10024 */ lw $s1, 0x24($sp) +/* C49B44 80242F64 8FB00020 */ lw $s0, 0x20($sp) +/* C49B48 80242F68 03E00008 */ jr $ra +/* C49B4C 80242F6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70.s deleted file mode 100644 index 7d9921c784..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F70 -/* C49B50 80242F70 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C49B54 80242F74 AFB20048 */ sw $s2, 0x48($sp) -/* C49B58 80242F78 0080902D */ daddu $s2, $a0, $zero -/* C49B5C 80242F7C AFBF004C */ sw $ra, 0x4c($sp) -/* C49B60 80242F80 AFB10044 */ sw $s1, 0x44($sp) -/* C49B64 80242F84 AFB00040 */ sw $s0, 0x40($sp) -/* C49B68 80242F88 F7B40050 */ sdc1 $f20, 0x50($sp) -/* C49B6C 80242F8C 8E500148 */ lw $s0, 0x148($s2) -/* C49B70 80242F90 0C00EABB */ jal get_npc_unsafe -/* C49B74 80242F94 86040008 */ lh $a0, 8($s0) -/* C49B78 80242F98 27A50028 */ addiu $a1, $sp, 0x28 -/* C49B7C 80242F9C 0040882D */ daddu $s1, $v0, $zero -/* C49B80 80242FA0 27A6002C */ addiu $a2, $sp, 0x2c -/* C49B84 80242FA4 27A70030 */ addiu $a3, $sp, 0x30 -/* C49B88 80242FA8 C620003C */ lwc1 $f0, 0x3c($s1) -/* C49B8C 80242FAC 3C014004 */ lui $at, 0x4004 -/* C49B90 80242FB0 44811800 */ mtc1 $at, $f3 -/* C49B94 80242FB4 44801000 */ mtc1 $zero, $f2 -/* C49B98 80242FB8 C6260038 */ lwc1 $f6, 0x38($s1) -/* C49B9C 80242FBC 46000021 */ cvt.d.s $f0, $f0 -/* C49BA0 80242FC0 46220000 */ add.d $f0, $f0, $f2 -/* C49BA4 80242FC4 3C01447A */ lui $at, 0x447a -/* C49BA8 80242FC8 44812000 */ mtc1 $at, $f4 -/* C49BAC 80242FCC C6020078 */ lwc1 $f2, 0x78($s0) -/* C49BB0 80242FD0 468010A0 */ cvt.s.w $f2, $f2 -/* C49BB4 80242FD4 46200020 */ cvt.s.d $f0, $f0 -/* C49BB8 80242FD8 E620003C */ swc1 $f0, 0x3c($s1) -/* C49BBC 80242FDC 46000206 */ mov.s $f8, $f0 -/* C49BC0 80242FE0 C6200040 */ lwc1 $f0, 0x40($s1) -/* C49BC4 80242FE4 27A20034 */ addiu $v0, $sp, 0x34 -/* C49BC8 80242FE8 E7A00030 */ swc1 $f0, 0x30($sp) -/* C49BCC 80242FEC 3C014059 */ lui $at, 0x4059 -/* C49BD0 80242FF0 44810800 */ mtc1 $at, $f1 -/* C49BD4 80242FF4 44800000 */ mtc1 $zero, $f0 -/* C49BD8 80242FF8 460010A1 */ cvt.d.s $f2, $f2 -/* C49BDC 80242FFC E7A60028 */ swc1 $f6, 0x28($sp) -/* C49BE0 80243000 E7A40034 */ swc1 $f4, 0x34($sp) -/* C49BE4 80243004 E7A8002C */ swc1 $f8, 0x2c($sp) -/* C49BE8 80243008 AFA20010 */ sw $v0, 0x10($sp) -/* C49BEC 8024300C 8E240080 */ lw $a0, 0x80($s1) -/* C49BF0 80243010 46201083 */ div.d $f2, $f2, $f0 -/* C49BF4 80243014 0C0372DF */ jal func_800DCB7C -/* C49BF8 80243018 46201520 */ cvt.s.d $f20, $f2 -/* C49BFC 8024301C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C49C00 80243020 46140000 */ add.s $f0, $f0, $f20 -/* C49C04 80243024 C622003C */ lwc1 $f2, 0x3c($s1) -/* C49C08 80243028 4600103C */ c.lt.s $f2, $f0 -/* C49C0C 8024302C 00000000 */ nop -/* C49C10 80243030 45010028 */ bc1t .L802430D4 -/* C49C14 80243034 00000000 */ nop -/* C49C18 80243038 8E0200D0 */ lw $v0, 0xd0($s0) -/* C49C1C 8024303C C62C0038 */ lwc1 $f12, 0x38($s1) -/* C49C20 80243040 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C49C24 80243044 C44A0000 */ lwc1 $f10, ($v0) -/* C49C28 80243048 468052A0 */ cvt.s.w $f10, $f10 -/* C49C2C 8024304C 44065000 */ mfc1 $a2, $f10 -/* C49C30 80243050 C44A0008 */ lwc1 $f10, 8($v0) -/* C49C34 80243054 468052A0 */ cvt.s.w $f10, $f10 -/* C49C38 80243058 44075000 */ mfc1 $a3, $f10 -/* C49C3C 8024305C 0C00A720 */ jal atan2 -/* C49C40 80243060 2410000A */ addiu $s0, $zero, 0xa -/* C49C44 80243064 24040002 */ addiu $a0, $zero, 2 -/* C49C48 80243068 0220282D */ daddu $a1, $s1, $zero -/* C49C4C 8024306C 0000302D */ daddu $a2, $zero, $zero -/* C49C50 80243070 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* C49C54 80243074 862200A8 */ lh $v0, 0xa8($s1) -/* C49C58 80243078 E620000C */ swc1 $f0, 0xc($s1) -/* C49C5C 8024307C 3C013F80 */ lui $at, 0x3f80 -/* C49C60 80243080 44810000 */ mtc1 $at, $f0 -/* C49C64 80243084 3C014000 */ lui $at, 0x4000 -/* C49C68 80243088 44812000 */ mtc1 $at, $f4 -/* C49C6C 8024308C 3C01C1A0 */ lui $at, 0xc1a0 -/* C49C70 80243090 44813000 */ mtc1 $at, $f6 -/* C49C74 80243094 44825000 */ mtc1 $v0, $f10 -/* C49C78 80243098 00000000 */ nop -/* C49C7C 8024309C 468052A0 */ cvt.s.w $f10, $f10 -/* C49C80 802430A0 46141080 */ add.s $f2, $f2, $f20 -/* C49C84 802430A4 44075000 */ mfc1 $a3, $f10 -/* C49C88 802430A8 27A20038 */ addiu $v0, $sp, 0x38 -/* C49C8C 802430AC E622003C */ swc1 $f2, 0x3c($s1) -/* C49C90 802430B0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C49C94 802430B4 E7A40014 */ swc1 $f4, 0x14($sp) -/* C49C98 802430B8 E7A60018 */ swc1 $f6, 0x18($sp) -/* C49C9C 802430BC AFB0001C */ sw $s0, 0x1c($sp) -/* C49CA0 802430C0 0C01BFA4 */ jal fx_emote -/* C49CA4 802430C4 AFA20020 */ sw $v0, 0x20($sp) -/* C49CA8 802430C8 24020012 */ addiu $v0, $zero, 0x12 -/* C49CAC 802430CC A630008E */ sh $s0, 0x8e($s1) -/* C49CB0 802430D0 AE420070 */ sw $v0, 0x70($s2) -.L802430D4: -/* C49CB4 802430D4 8FBF004C */ lw $ra, 0x4c($sp) -/* C49CB8 802430D8 8FB20048 */ lw $s2, 0x48($sp) -/* C49CBC 802430DC 8FB10044 */ lw $s1, 0x44($sp) -/* C49CC0 802430E0 8FB00040 */ lw $s0, 0x40($sp) -/* C49CC4 802430E4 D7B40050 */ ldc1 $f20, 0x50($sp) -/* C49CC8 802430E8 03E00008 */ jr $ra -/* C49CCC 802430EC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s new file mode 100644 index 0000000000..393a8122b2 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80242F70_C49B50.s @@ -0,0 +1,101 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F70_C49B50 +/* C49B50 80242F70 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* C49B54 80242F74 AFB20048 */ sw $s2, 0x48($sp) +/* C49B58 80242F78 0080902D */ daddu $s2, $a0, $zero +/* C49B5C 80242F7C AFBF004C */ sw $ra, 0x4c($sp) +/* C49B60 80242F80 AFB10044 */ sw $s1, 0x44($sp) +/* C49B64 80242F84 AFB00040 */ sw $s0, 0x40($sp) +/* C49B68 80242F88 F7B40050 */ sdc1 $f20, 0x50($sp) +/* C49B6C 80242F8C 8E500148 */ lw $s0, 0x148($s2) +/* C49B70 80242F90 0C00EABB */ jal get_npc_unsafe +/* C49B74 80242F94 86040008 */ lh $a0, 8($s0) +/* C49B78 80242F98 27A50028 */ addiu $a1, $sp, 0x28 +/* C49B7C 80242F9C 0040882D */ daddu $s1, $v0, $zero +/* C49B80 80242FA0 27A6002C */ addiu $a2, $sp, 0x2c +/* C49B84 80242FA4 27A70030 */ addiu $a3, $sp, 0x30 +/* C49B88 80242FA8 C620003C */ lwc1 $f0, 0x3c($s1) +/* C49B8C 80242FAC 3C014004 */ lui $at, 0x4004 +/* C49B90 80242FB0 44811800 */ mtc1 $at, $f3 +/* C49B94 80242FB4 44801000 */ mtc1 $zero, $f2 +/* C49B98 80242FB8 C6260038 */ lwc1 $f6, 0x38($s1) +/* C49B9C 80242FBC 46000021 */ cvt.d.s $f0, $f0 +/* C49BA0 80242FC0 46220000 */ add.d $f0, $f0, $f2 +/* C49BA4 80242FC4 3C01447A */ lui $at, 0x447a +/* C49BA8 80242FC8 44812000 */ mtc1 $at, $f4 +/* C49BAC 80242FCC C6020078 */ lwc1 $f2, 0x78($s0) +/* C49BB0 80242FD0 468010A0 */ cvt.s.w $f2, $f2 +/* C49BB4 80242FD4 46200020 */ cvt.s.d $f0, $f0 +/* C49BB8 80242FD8 E620003C */ swc1 $f0, 0x3c($s1) +/* C49BBC 80242FDC 46000206 */ mov.s $f8, $f0 +/* C49BC0 80242FE0 C6200040 */ lwc1 $f0, 0x40($s1) +/* C49BC4 80242FE4 27A20034 */ addiu $v0, $sp, 0x34 +/* C49BC8 80242FE8 E7A00030 */ swc1 $f0, 0x30($sp) +/* C49BCC 80242FEC 3C014059 */ lui $at, 0x4059 +/* C49BD0 80242FF0 44810800 */ mtc1 $at, $f1 +/* C49BD4 80242FF4 44800000 */ mtc1 $zero, $f0 +/* C49BD8 80242FF8 460010A1 */ cvt.d.s $f2, $f2 +/* C49BDC 80242FFC E7A60028 */ swc1 $f6, 0x28($sp) +/* C49BE0 80243000 E7A40034 */ swc1 $f4, 0x34($sp) +/* C49BE4 80243004 E7A8002C */ swc1 $f8, 0x2c($sp) +/* C49BE8 80243008 AFA20010 */ sw $v0, 0x10($sp) +/* C49BEC 8024300C 8E240080 */ lw $a0, 0x80($s1) +/* C49BF0 80243010 46201083 */ div.d $f2, $f2, $f0 +/* C49BF4 80243014 0C0372DF */ jal func_800DCB7C +/* C49BF8 80243018 46201520 */ cvt.s.d $f20, $f2 +/* C49BFC 8024301C C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C49C00 80243020 46140000 */ add.s $f0, $f0, $f20 +/* C49C04 80243024 C622003C */ lwc1 $f2, 0x3c($s1) +/* C49C08 80243028 4600103C */ c.lt.s $f2, $f0 +/* C49C0C 8024302C 00000000 */ nop +/* C49C10 80243030 45010028 */ bc1t .L802430D4 +/* C49C14 80243034 00000000 */ nop +/* C49C18 80243038 8E0200D0 */ lw $v0, 0xd0($s0) +/* C49C1C 8024303C C62C0038 */ lwc1 $f12, 0x38($s1) +/* C49C20 80243040 C62E0040 */ lwc1 $f14, 0x40($s1) +/* C49C24 80243044 C44A0000 */ lwc1 $f10, ($v0) +/* C49C28 80243048 468052A0 */ cvt.s.w $f10, $f10 +/* C49C2C 8024304C 44065000 */ mfc1 $a2, $f10 +/* C49C30 80243050 C44A0008 */ lwc1 $f10, 8($v0) +/* C49C34 80243054 468052A0 */ cvt.s.w $f10, $f10 +/* C49C38 80243058 44075000 */ mfc1 $a3, $f10 +/* C49C3C 8024305C 0C00A720 */ jal atan2 +/* C49C40 80243060 2410000A */ addiu $s0, $zero, 0xa +/* C49C44 80243064 24040002 */ addiu $a0, $zero, 2 +/* C49C48 80243068 0220282D */ daddu $a1, $s1, $zero +/* C49C4C 8024306C 0000302D */ daddu $a2, $zero, $zero +/* C49C50 80243070 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* C49C54 80243074 862200A8 */ lh $v0, 0xa8($s1) +/* C49C58 80243078 E620000C */ swc1 $f0, 0xc($s1) +/* C49C5C 8024307C 3C013F80 */ lui $at, 0x3f80 +/* C49C60 80243080 44810000 */ mtc1 $at, $f0 +/* C49C64 80243084 3C014000 */ lui $at, 0x4000 +/* C49C68 80243088 44812000 */ mtc1 $at, $f4 +/* C49C6C 8024308C 3C01C1A0 */ lui $at, 0xc1a0 +/* C49C70 80243090 44813000 */ mtc1 $at, $f6 +/* C49C74 80243094 44825000 */ mtc1 $v0, $f10 +/* C49C78 80243098 00000000 */ nop +/* C49C7C 8024309C 468052A0 */ cvt.s.w $f10, $f10 +/* C49C80 802430A0 46141080 */ add.s $f2, $f2, $f20 +/* C49C84 802430A4 44075000 */ mfc1 $a3, $f10 +/* C49C88 802430A8 27A20038 */ addiu $v0, $sp, 0x38 +/* C49C8C 802430AC E622003C */ swc1 $f2, 0x3c($s1) +/* C49C90 802430B0 E7A00010 */ swc1 $f0, 0x10($sp) +/* C49C94 802430B4 E7A40014 */ swc1 $f4, 0x14($sp) +/* C49C98 802430B8 E7A60018 */ swc1 $f6, 0x18($sp) +/* C49C9C 802430BC AFB0001C */ sw $s0, 0x1c($sp) +/* C49CA0 802430C0 0C01BFA4 */ jal fx_emote +/* C49CA4 802430C4 AFA20020 */ sw $v0, 0x20($sp) +/* C49CA8 802430C8 24020012 */ addiu $v0, $zero, 0x12 +/* C49CAC 802430CC A630008E */ sh $s0, 0x8e($s1) +/* C49CB0 802430D0 AE420070 */ sw $v0, 0x70($s2) +.L802430D4: +/* C49CB4 802430D4 8FBF004C */ lw $ra, 0x4c($sp) +/* C49CB8 802430D8 8FB20048 */ lw $s2, 0x48($sp) +/* C49CBC 802430DC 8FB10044 */ lw $s1, 0x44($sp) +/* C49CC0 802430E0 8FB00040 */ lw $s0, 0x40($sp) +/* C49CC4 802430E4 D7B40050 */ ldc1 $f20, 0x50($sp) +/* C49CC8 802430E8 03E00008 */ jr $ra +/* C49CCC 802430EC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138.s deleted file mode 100644 index 9840bbe3af..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243138 -/* C49D18 80243138 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C49D1C 8024313C AFB00010 */ sw $s0, 0x10($sp) -/* C49D20 80243140 0080802D */ daddu $s0, $a0, $zero -/* C49D24 80243144 AFBF0014 */ sw $ra, 0x14($sp) -/* C49D28 80243148 8E020148 */ lw $v0, 0x148($s0) -/* C49D2C 8024314C 0C00EABB */ jal get_npc_unsafe -/* C49D30 80243150 84440008 */ lh $a0, 8($v0) -/* C49D34 80243154 0040202D */ daddu $a0, $v0, $zero -/* C49D38 80243158 9482008E */ lhu $v0, 0x8e($a0) -/* C49D3C 8024315C 24420001 */ addiu $v0, $v0, 1 -/* C49D40 80243160 A482008E */ sh $v0, 0x8e($a0) -/* C49D44 80243164 00021400 */ sll $v0, $v0, 0x10 -/* C49D48 80243168 00021403 */ sra $v0, $v0, 0x10 -/* C49D4C 8024316C 28420003 */ slti $v0, $v0, 3 -/* C49D50 80243170 1440000D */ bnez $v0, .L802431A8 -/* C49D54 80243174 24020009 */ addiu $v0, $zero, 9 -/* C49D58 80243178 3C038011 */ lui $v1, 0x8011 -/* C49D5C 8024317C 8063EBB3 */ lb $v1, -0x144d($v1) -/* C49D60 80243180 10620003 */ beq $v1, $v0, .L80243190 -/* C49D64 80243184 24020064 */ addiu $v0, $zero, 0x64 -/* C49D68 80243188 08090C69 */ j .L802431A4 -/* C49D6C 8024318C A480008E */ sh $zero, 0x8e($a0) -.L80243190: -/* C49D70 80243190 0C038069 */ jal enable_player_input -/* C49D74 80243194 00000000 */ nop -/* C49D78 80243198 0C03BD80 */ jal func_800EF600 -/* C49D7C 8024319C 00000000 */ nop -/* C49D80 802431A0 24020010 */ addiu $v0, $zero, 0x10 -.L802431A4: -/* C49D84 802431A4 AE020070 */ sw $v0, 0x70($s0) -.L802431A8: -/* C49D88 802431A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C49D8C 802431AC 8FB00010 */ lw $s0, 0x10($sp) -/* C49D90 802431B0 03E00008 */ jr $ra -/* C49D94 802431B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s new file mode 100644 index 0000000000..03f8318529 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243138_C49D18.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243138_C49D18 +/* C49D18 80243138 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C49D1C 8024313C AFB00010 */ sw $s0, 0x10($sp) +/* C49D20 80243140 0080802D */ daddu $s0, $a0, $zero +/* C49D24 80243144 AFBF0014 */ sw $ra, 0x14($sp) +/* C49D28 80243148 8E020148 */ lw $v0, 0x148($s0) +/* C49D2C 8024314C 0C00EABB */ jal get_npc_unsafe +/* C49D30 80243150 84440008 */ lh $a0, 8($v0) +/* C49D34 80243154 0040202D */ daddu $a0, $v0, $zero +/* C49D38 80243158 9482008E */ lhu $v0, 0x8e($a0) +/* C49D3C 8024315C 24420001 */ addiu $v0, $v0, 1 +/* C49D40 80243160 A482008E */ sh $v0, 0x8e($a0) +/* C49D44 80243164 00021400 */ sll $v0, $v0, 0x10 +/* C49D48 80243168 00021403 */ sra $v0, $v0, 0x10 +/* C49D4C 8024316C 28420003 */ slti $v0, $v0, 3 +/* C49D50 80243170 1440000D */ bnez $v0, .L802431A8 +/* C49D54 80243174 24020009 */ addiu $v0, $zero, 9 +/* C49D58 80243178 3C038011 */ lui $v1, 0x8011 +/* C49D5C 8024317C 8063EBB3 */ lb $v1, -0x144d($v1) +/* C49D60 80243180 10620003 */ beq $v1, $v0, .L80243190 +/* C49D64 80243184 24020064 */ addiu $v0, $zero, 0x64 +/* C49D68 80243188 08090C69 */ j .L802431A4 +/* C49D6C 8024318C A480008E */ sh $zero, 0x8e($a0) +.L80243190: +/* C49D70 80243190 0C038069 */ jal enable_player_input +/* C49D74 80243194 00000000 */ nop +/* C49D78 80243198 0C03BD80 */ jal func_800EF600 +/* C49D7C 8024319C 00000000 */ nop +/* C49D80 802431A0 24020010 */ addiu $v0, $zero, 0x10 +.L802431A4: +/* C49D84 802431A4 AE020070 */ sw $v0, 0x70($s0) +.L802431A8: +/* C49D88 802431A8 8FBF0014 */ lw $ra, 0x14($sp) +/* C49D8C 802431AC 8FB00010 */ lw $s0, 0x10($sp) +/* C49D90 802431B0 03E00008 */ jr $ra +/* C49D94 802431B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8.s deleted file mode 100644 index 08127ff01b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431B8 -/* C49D98 802431B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C49D9C 802431BC AFB20018 */ sw $s2, 0x18($sp) -/* C49DA0 802431C0 0080902D */ daddu $s2, $a0, $zero -/* C49DA4 802431C4 AFBF001C */ sw $ra, 0x1c($sp) -/* C49DA8 802431C8 AFB10014 */ sw $s1, 0x14($sp) -/* C49DAC 802431CC AFB00010 */ sw $s0, 0x10($sp) -/* C49DB0 802431D0 8E500148 */ lw $s0, 0x148($s2) -/* C49DB4 802431D4 86040008 */ lh $a0, 8($s0) -/* C49DB8 802431D8 0C00EABB */ jal get_npc_unsafe -/* C49DBC 802431DC 00A0882D */ daddu $s1, $a1, $zero -/* C49DC0 802431E0 3C05FFDF */ lui $a1, 0xffdf -/* C49DC4 802431E4 8E03006C */ lw $v1, 0x6c($s0) -/* C49DC8 802431E8 2404FEFF */ addiu $a0, $zero, -0x101 -/* C49DCC 802431EC 00641824 */ and $v1, $v1, $a0 -/* C49DD0 802431F0 AE03006C */ sw $v1, 0x6c($s0) -/* C49DD4 802431F4 8C430000 */ lw $v1, ($v0) -/* C49DD8 802431F8 34A5FFFF */ ori $a1, $a1, 0xffff -/* C49DDC 802431FC 00651824 */ and $v1, $v1, $a1 -/* C49DE0 80243200 AC430000 */ sw $v1, ($v0) -/* C49DE4 80243204 C6200000 */ lwc1 $f0, ($s1) -/* C49DE8 80243208 46000021 */ cvt.d.s $f0, $f0 -/* C49DEC 8024320C 46200000 */ add.d $f0, $f0, $f0 -/* C49DF0 80243210 46200020 */ cvt.s.d $f0, $f0 -/* C49DF4 80243214 E4400018 */ swc1 $f0, 0x18($v0) -/* C49DF8 80243218 AE000074 */ sw $zero, 0x74($s0) -/* C49DFC 8024321C C440003C */ lwc1 $f0, 0x3c($v0) -/* C49E00 80243220 3C014059 */ lui $at, 0x4059 -/* C49E04 80243224 44811800 */ mtc1 $at, $f3 -/* C49E08 80243228 44801000 */ mtc1 $zero, $f2 -/* C49E0C 8024322C 46000021 */ cvt.d.s $f0, $f0 -/* C49E10 80243230 46220002 */ mul.d $f0, $f0, $f2 -/* C49E14 80243234 00000000 */ nop -/* C49E18 80243238 2402001E */ addiu $v0, $zero, 0x1e -/* C49E1C 8024323C 4620010D */ trunc.w.d $f4, $f0 -/* C49E20 80243240 E604007C */ swc1 $f4, 0x7c($s0) -/* C49E24 80243244 AE420074 */ sw $v0, 0x74($s2) -/* C49E28 80243248 8FBF001C */ lw $ra, 0x1c($sp) -/* C49E2C 8024324C 8FB20018 */ lw $s2, 0x18($sp) -/* C49E30 80243250 8FB10014 */ lw $s1, 0x14($sp) -/* C49E34 80243254 8FB00010 */ lw $s0, 0x10($sp) -/* C49E38 80243258 03E00008 */ jr $ra -/* C49E3C 8024325C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s new file mode 100644 index 0000000000..d1bddfa119 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_802431B8_C49D98.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802431B8_C49D98 +/* C49D98 802431B8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C49D9C 802431BC AFB20018 */ sw $s2, 0x18($sp) +/* C49DA0 802431C0 0080902D */ daddu $s2, $a0, $zero +/* C49DA4 802431C4 AFBF001C */ sw $ra, 0x1c($sp) +/* C49DA8 802431C8 AFB10014 */ sw $s1, 0x14($sp) +/* C49DAC 802431CC AFB00010 */ sw $s0, 0x10($sp) +/* C49DB0 802431D0 8E500148 */ lw $s0, 0x148($s2) +/* C49DB4 802431D4 86040008 */ lh $a0, 8($s0) +/* C49DB8 802431D8 0C00EABB */ jal get_npc_unsafe +/* C49DBC 802431DC 00A0882D */ daddu $s1, $a1, $zero +/* C49DC0 802431E0 3C05FFDF */ lui $a1, 0xffdf +/* C49DC4 802431E4 8E03006C */ lw $v1, 0x6c($s0) +/* C49DC8 802431E8 2404FEFF */ addiu $a0, $zero, -0x101 +/* C49DCC 802431EC 00641824 */ and $v1, $v1, $a0 +/* C49DD0 802431F0 AE03006C */ sw $v1, 0x6c($s0) +/* C49DD4 802431F4 8C430000 */ lw $v1, ($v0) +/* C49DD8 802431F8 34A5FFFF */ ori $a1, $a1, 0xffff +/* C49DDC 802431FC 00651824 */ and $v1, $v1, $a1 +/* C49DE0 80243200 AC430000 */ sw $v1, ($v0) +/* C49DE4 80243204 C6200000 */ lwc1 $f0, ($s1) +/* C49DE8 80243208 46000021 */ cvt.d.s $f0, $f0 +/* C49DEC 8024320C 46200000 */ add.d $f0, $f0, $f0 +/* C49DF0 80243210 46200020 */ cvt.s.d $f0, $f0 +/* C49DF4 80243214 E4400018 */ swc1 $f0, 0x18($v0) +/* C49DF8 80243218 AE000074 */ sw $zero, 0x74($s0) +/* C49DFC 8024321C C440003C */ lwc1 $f0, 0x3c($v0) +/* C49E00 80243220 3C014059 */ lui $at, 0x4059 +/* C49E04 80243224 44811800 */ mtc1 $at, $f3 +/* C49E08 80243228 44801000 */ mtc1 $zero, $f2 +/* C49E0C 8024322C 46000021 */ cvt.d.s $f0, $f0 +/* C49E10 80243230 46220002 */ mul.d $f0, $f0, $f2 +/* C49E14 80243234 00000000 */ nop +/* C49E18 80243238 2402001E */ addiu $v0, $zero, 0x1e +/* C49E1C 8024323C 4620010D */ trunc.w.d $f4, $f0 +/* C49E20 80243240 E604007C */ swc1 $f4, 0x7c($s0) +/* C49E24 80243244 AE420074 */ sw $v0, 0x74($s2) +/* C49E28 80243248 8FBF001C */ lw $ra, 0x1c($sp) +/* C49E2C 8024324C 8FB20018 */ lw $s2, 0x18($sp) +/* C49E30 80243250 8FB10014 */ lw $s1, 0x14($sp) +/* C49E34 80243254 8FB00010 */ lw $s0, 0x10($sp) +/* C49E38 80243258 03E00008 */ jr $ra +/* C49E3C 8024325C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260.s deleted file mode 100644 index 8ffaaa5b4e..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260.s +++ /dev/null @@ -1,207 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243260 -/* C49E40 80243260 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C49E44 80243264 AFB20048 */ sw $s2, 0x48($sp) -/* C49E48 80243268 0080902D */ daddu $s2, $a0, $zero -/* C49E4C 8024326C AFBF0054 */ sw $ra, 0x54($sp) -/* C49E50 80243270 AFB40050 */ sw $s4, 0x50($sp) -/* C49E54 80243274 AFB3004C */ sw $s3, 0x4c($sp) -/* C49E58 80243278 AFB10044 */ sw $s1, 0x44($sp) -/* C49E5C 8024327C AFB00040 */ sw $s0, 0x40($sp) -/* C49E60 80243280 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C49E64 80243284 F7B80068 */ sdc1 $f24, 0x68($sp) -/* C49E68 80243288 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C49E6C 8024328C F7B40058 */ sdc1 $f20, 0x58($sp) -/* C49E70 80243290 8E500148 */ lw $s0, 0x148($s2) -/* C49E74 80243294 00A0982D */ daddu $s3, $a1, $zero -/* C49E78 80243298 86040008 */ lh $a0, 8($s0) -/* C49E7C 8024329C 0C00EABB */ jal get_npc_unsafe -/* C49E80 802432A0 00C0A02D */ daddu $s4, $a2, $zero -/* C49E84 802432A4 0040882D */ daddu $s1, $v0, $zero -/* C49E88 802432A8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C49E8C 802432AC C622003C */ lwc1 $f2, 0x3c($s1) -/* C49E90 802432B0 C6240040 */ lwc1 $f4, 0x40($s1) -/* C49E94 802432B4 3C01447A */ lui $at, 0x447a -/* C49E98 802432B8 44813000 */ mtc1 $at, $f6 -/* C49E9C 802432BC C60C0074 */ lwc1 $f12, 0x74($s0) -/* C49EA0 802432C0 46806320 */ cvt.s.w $f12, $f12 -/* C49EA4 802432C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C49EA8 802432C8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C49EAC 802432CC E7A40030 */ swc1 $f4, 0x30($sp) -/* C49EB0 802432D0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C49EB4 802432D4 C6000078 */ lwc1 $f0, 0x78($s0) -/* C49EB8 802432D8 46800020 */ cvt.s.w $f0, $f0 -/* C49EBC 802432DC 46000021 */ cvt.d.s $f0, $f0 -/* C49EC0 802432E0 C6020088 */ lwc1 $f2, 0x88($s0) -/* C49EC4 802432E4 468010A0 */ cvt.s.w $f2, $f2 -/* C49EC8 802432E8 3C014059 */ lui $at, 0x4059 -/* C49ECC 802432EC 44812800 */ mtc1 $at, $f5 -/* C49ED0 802432F0 44802000 */ mtc1 $zero, $f4 -/* C49ED4 802432F4 460010A1 */ cvt.d.s $f2, $f2 -/* C49ED8 802432F8 46240003 */ div.d $f0, $f0, $f4 -/* C49EDC 802432FC 462006A0 */ cvt.s.d $f26, $f0 -/* C49EE0 80243300 46241083 */ div.d $f2, $f2, $f4 -/* C49EE4 80243304 462010A0 */ cvt.s.d $f2, $f2 -/* C49EE8 80243308 C6000070 */ lwc1 $f0, 0x70($s0) -/* C49EEC 8024330C 46800020 */ cvt.s.w $f0, $f0 -/* C49EF0 80243310 46000021 */ cvt.d.s $f0, $f0 -/* C49EF4 80243314 46240003 */ div.d $f0, $f0, $f4 -/* C49EF8 80243318 462005A0 */ cvt.s.d $f22, $f0 -/* C49EFC 8024331C 0C00A8BB */ jal sin_deg -/* C49F00 80243320 4602D600 */ add.s $f24, $f26, $f2 -/* C49F04 80243324 27A50028 */ addiu $a1, $sp, 0x28 -/* C49F08 80243328 27A6002C */ addiu $a2, $sp, 0x2c -/* C49F0C 8024332C 27A70030 */ addiu $a3, $sp, 0x30 -/* C49F10 80243330 27A20034 */ addiu $v0, $sp, 0x34 -/* C49F14 80243334 AFA20010 */ sw $v0, 0x10($sp) -/* C49F18 80243338 8E240080 */ lw $a0, 0x80($s1) -/* C49F1C 8024333C 0C0372DF */ jal func_800DCB7C -/* C49F20 80243340 46000506 */ mov.s $f20, $f0 -/* C49F24 80243344 10400007 */ beqz $v0, .L80243364 -/* C49F28 80243348 00000000 */ nop -/* C49F2C 8024334C 4616A082 */ mul.s $f2, $f20, $f22 -/* C49F30 80243350 00000000 */ nop -/* C49F34 80243354 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C49F38 80243358 461A0000 */ add.s $f0, $f0, $f26 -/* C49F3C 8024335C 08090CDC */ j .L80243370 -/* C49F40 80243360 46020000 */ add.s $f0, $f0, $f2 -.L80243364: -/* C49F44 80243364 4616A002 */ mul.s $f0, $f20, $f22 -/* C49F48 80243368 00000000 */ nop -/* C49F4C 8024336C 4600C000 */ add.s $f0, $f24, $f0 -.L80243370: -/* C49F50 80243370 E620003C */ swc1 $f0, 0x3c($s1) -/* C49F54 80243374 8E020074 */ lw $v0, 0x74($s0) -/* C49F58 80243378 2442000C */ addiu $v0, $v0, 0xc -/* C49F5C 8024337C 44826000 */ mtc1 $v0, $f12 -/* C49F60 80243380 00000000 */ nop -/* C49F64 80243384 0C00A6C9 */ jal clamp_angle -/* C49F68 80243388 46806320 */ cvt.s.w $f12, $f12 -/* C49F6C 8024338C 4600020D */ trunc.w.s $f8, $f0 -/* C49F70 80243390 E6080074 */ swc1 $f8, 0x74($s0) -/* C49F74 80243394 8E420074 */ lw $v0, 0x74($s2) -/* C49F78 80243398 1C400037 */ bgtz $v0, .L80243478 -/* C49F7C 8024339C 2442FFFF */ addiu $v0, $v0, -1 -/* C49F80 802433A0 8E620014 */ lw $v0, 0x14($s3) -/* C49F84 802433A4 AE420074 */ sw $v0, 0x74($s2) -/* C49F88 802433A8 C662000C */ lwc1 $f2, 0xc($s3) -/* C49F8C 802433AC 3C013FE0 */ lui $at, 0x3fe0 -/* C49F90 802433B0 44812800 */ mtc1 $at, $f5 -/* C49F94 802433B4 44802000 */ mtc1 $zero, $f4 -/* C49F98 802433B8 460010A1 */ cvt.d.s $f2, $f2 -/* C49F9C 802433BC 46241082 */ mul.d $f2, $f2, $f4 -/* C49FA0 802433C0 00000000 */ nop -/* C49FA4 802433C4 C6600010 */ lwc1 $f0, 0x10($s3) -/* C49FA8 802433C8 46000021 */ cvt.d.s $f0, $f0 -/* C49FAC 802433CC 46240002 */ mul.d $f0, $f0, $f4 -/* C49FB0 802433D0 00000000 */ nop -/* C49FB4 802433D4 0280202D */ daddu $a0, $s4, $zero -/* C49FB8 802433D8 462010A0 */ cvt.s.d $f2, $f2 -/* C49FBC 802433DC 46200020 */ cvt.s.d $f0, $f0 -/* C49FC0 802433E0 44061000 */ mfc1 $a2, $f2 -/* C49FC4 802433E4 44070000 */ mfc1 $a3, $f0 -/* C49FC8 802433E8 0200282D */ daddu $a1, $s0, $zero -/* C49FCC 802433EC 0C01242D */ jal func_800490B4 -/* C49FD0 802433F0 AFA00010 */ sw $zero, 0x10($sp) -/* C49FD4 802433F4 1040001E */ beqz $v0, .L80243470 -/* C49FD8 802433F8 0000202D */ daddu $a0, $zero, $zero -/* C49FDC 802433FC 0220282D */ daddu $a1, $s1, $zero -/* C49FE0 80243400 0000302D */ daddu $a2, $zero, $zero -/* C49FE4 80243404 2410000C */ addiu $s0, $zero, 0xc -/* C49FE8 80243408 862300A8 */ lh $v1, 0xa8($s1) -/* C49FEC 8024340C 3C013F80 */ lui $at, 0x3f80 -/* C49FF0 80243410 44810000 */ mtc1 $at, $f0 -/* C49FF4 80243414 3C014000 */ lui $at, 0x4000 -/* C49FF8 80243418 44811000 */ mtc1 $at, $f2 -/* C49FFC 8024341C 3C01C1A0 */ lui $at, 0xc1a0 -/* C4A000 80243420 44812000 */ mtc1 $at, $f4 -/* C4A004 80243424 44834000 */ mtc1 $v1, $f8 -/* C4A008 80243428 00000000 */ nop -/* C4A00C 8024342C 46804220 */ cvt.s.w $f8, $f8 -/* C4A010 80243430 44074000 */ mfc1 $a3, $f8 -/* C4A014 80243434 27A20038 */ addiu $v0, $sp, 0x38 -/* C4A018 80243438 AFB0001C */ sw $s0, 0x1c($sp) -/* C4A01C 8024343C AFA20020 */ sw $v0, 0x20($sp) -/* C4A020 80243440 E7A00010 */ swc1 $f0, 0x10($sp) -/* C4A024 80243444 E7A20014 */ swc1 $f2, 0x14($sp) -/* C4A028 80243448 0C01BFA4 */ jal fx_emote -/* C4A02C 8024344C E7A40018 */ swc1 $f4, 0x18($sp) -/* C4A030 80243450 0220202D */ daddu $a0, $s1, $zero -/* C4A034 80243454 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C4A038 80243458 0C012530 */ jal func_800494C0 -/* C4A03C 8024345C 3C060020 */ lui $a2, 0x20 -/* C4A040 80243460 C620003C */ lwc1 $f0, 0x3c($s1) -/* C4A044 80243464 E6200064 */ swc1 $f0, 0x64($s1) -/* C4A048 80243468 08090D52 */ j .L80243548 -/* C4A04C 8024346C AE500070 */ sw $s0, 0x70($s2) -.L80243470: -/* C4A050 80243470 8E420074 */ lw $v0, 0x74($s2) -/* C4A054 80243474 2442FFFF */ addiu $v0, $v0, -1 -.L80243478: -/* C4A058 80243478 AE420074 */ sw $v0, 0x74($s2) -/* C4A05C 8024347C 8622008C */ lh $v0, 0x8c($s1) -/* C4A060 80243480 14400031 */ bnez $v0, .L80243548 -/* C4A064 80243484 00000000 */ nop -/* C4A068 80243488 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C4A06C 8024348C 8E0200D0 */ lw $v0, 0xd0($s0) -/* C4A070 80243490 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C4A074 80243494 C4480000 */ lwc1 $f8, ($v0) -/* C4A078 80243498 46804220 */ cvt.s.w $f8, $f8 -/* C4A07C 8024349C 44064000 */ mfc1 $a2, $f8 -/* C4A080 802434A0 C4480008 */ lwc1 $f8, 8($v0) -/* C4A084 802434A4 46804220 */ cvt.s.w $f8, $f8 -/* C4A088 802434A8 44074000 */ mfc1 $a3, $f8 -/* C4A08C 802434AC 0C00A720 */ jal atan2 -/* C4A090 802434B0 00000000 */ nop -/* C4A094 802434B4 8E250018 */ lw $a1, 0x18($s1) -/* C4A098 802434B8 44060000 */ mfc1 $a2, $f0 -/* C4A09C 802434BC 0220202D */ daddu $a0, $s1, $zero -/* C4A0A0 802434C0 0C00EA95 */ jal npc_move_heading -/* C4A0A4 802434C4 AE26000C */ sw $a2, 0xc($s1) -/* C4A0A8 802434C8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C4A0AC 802434CC 8E0200D0 */ lw $v0, 0xd0($s0) -/* C4A0B0 802434D0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C4A0B4 802434D4 C4480000 */ lwc1 $f8, ($v0) -/* C4A0B8 802434D8 46804220 */ cvt.s.w $f8, $f8 -/* C4A0BC 802434DC 44064000 */ mfc1 $a2, $f8 -/* C4A0C0 802434E0 C4480008 */ lwc1 $f8, 8($v0) -/* C4A0C4 802434E4 46804220 */ cvt.s.w $f8, $f8 -/* C4A0C8 802434E8 44074000 */ mfc1 $a3, $f8 -/* C4A0CC 802434EC 0C00A7B5 */ jal dist2D -/* C4A0D0 802434F0 00000000 */ nop -/* C4A0D4 802434F4 C6220018 */ lwc1 $f2, 0x18($s1) -/* C4A0D8 802434F8 46021080 */ add.s $f2, $f2, $f2 -/* C4A0DC 802434FC 4602003E */ c.le.s $f0, $f2 -/* C4A0E0 80243500 00000000 */ nop -/* C4A0E4 80243504 45000010 */ bc1f .L80243548 -/* C4A0E8 80243508 E7A00034 */ swc1 $f0, 0x34($sp) -/* C4A0EC 8024350C 0C00A67F */ jal rand_int -/* C4A0F0 80243510 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C4A0F4 80243514 3C035555 */ lui $v1, 0x5555 -/* C4A0F8 80243518 34635556 */ ori $v1, $v1, 0x5556 -/* C4A0FC 8024351C 00430018 */ mult $v0, $v1 -/* C4A100 80243520 24030002 */ addiu $v1, $zero, 2 -/* C4A104 80243524 000227C3 */ sra $a0, $v0, 0x1f -/* C4A108 80243528 AE430070 */ sw $v1, 0x70($s2) -/* C4A10C 8024352C 00004010 */ mfhi $t0 -/* C4A110 80243530 01042023 */ subu $a0, $t0, $a0 -/* C4A114 80243534 00041840 */ sll $v1, $a0, 1 -/* C4A118 80243538 00641821 */ addu $v1, $v1, $a0 -/* C4A11C 8024353C 00431023 */ subu $v0, $v0, $v1 -/* C4A120 80243540 24420002 */ addiu $v0, $v0, 2 -/* C4A124 80243544 AE420074 */ sw $v0, 0x74($s2) -.L80243548: -/* C4A128 80243548 8FBF0054 */ lw $ra, 0x54($sp) -/* C4A12C 8024354C 8FB40050 */ lw $s4, 0x50($sp) -/* C4A130 80243550 8FB3004C */ lw $s3, 0x4c($sp) -/* C4A134 80243554 8FB20048 */ lw $s2, 0x48($sp) -/* C4A138 80243558 8FB10044 */ lw $s1, 0x44($sp) -/* C4A13C 8024355C 8FB00040 */ lw $s0, 0x40($sp) -/* C4A140 80243560 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C4A144 80243564 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C4A148 80243568 D7B60060 */ ldc1 $f22, 0x60($sp) -/* C4A14C 8024356C D7B40058 */ ldc1 $f20, 0x58($sp) -/* C4A150 80243570 03E00008 */ jr $ra -/* C4A154 80243574 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s new file mode 100644 index 0000000000..24f21d1e67 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243260_C49E40.s @@ -0,0 +1,207 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243260_C49E40 +/* C49E40 80243260 27BDFF88 */ addiu $sp, $sp, -0x78 +/* C49E44 80243264 AFB20048 */ sw $s2, 0x48($sp) +/* C49E48 80243268 0080902D */ daddu $s2, $a0, $zero +/* C49E4C 8024326C AFBF0054 */ sw $ra, 0x54($sp) +/* C49E50 80243270 AFB40050 */ sw $s4, 0x50($sp) +/* C49E54 80243274 AFB3004C */ sw $s3, 0x4c($sp) +/* C49E58 80243278 AFB10044 */ sw $s1, 0x44($sp) +/* C49E5C 8024327C AFB00040 */ sw $s0, 0x40($sp) +/* C49E60 80243280 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* C49E64 80243284 F7B80068 */ sdc1 $f24, 0x68($sp) +/* C49E68 80243288 F7B60060 */ sdc1 $f22, 0x60($sp) +/* C49E6C 8024328C F7B40058 */ sdc1 $f20, 0x58($sp) +/* C49E70 80243290 8E500148 */ lw $s0, 0x148($s2) +/* C49E74 80243294 00A0982D */ daddu $s3, $a1, $zero +/* C49E78 80243298 86040008 */ lh $a0, 8($s0) +/* C49E7C 8024329C 0C00EABB */ jal get_npc_unsafe +/* C49E80 802432A0 00C0A02D */ daddu $s4, $a2, $zero +/* C49E84 802432A4 0040882D */ daddu $s1, $v0, $zero +/* C49E88 802432A8 C6200038 */ lwc1 $f0, 0x38($s1) +/* C49E8C 802432AC C622003C */ lwc1 $f2, 0x3c($s1) +/* C49E90 802432B0 C6240040 */ lwc1 $f4, 0x40($s1) +/* C49E94 802432B4 3C01447A */ lui $at, 0x447a +/* C49E98 802432B8 44813000 */ mtc1 $at, $f6 +/* C49E9C 802432BC C60C0074 */ lwc1 $f12, 0x74($s0) +/* C49EA0 802432C0 46806320 */ cvt.s.w $f12, $f12 +/* C49EA4 802432C4 E7A00028 */ swc1 $f0, 0x28($sp) +/* C49EA8 802432C8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C49EAC 802432CC E7A40030 */ swc1 $f4, 0x30($sp) +/* C49EB0 802432D0 E7A60034 */ swc1 $f6, 0x34($sp) +/* C49EB4 802432D4 C6000078 */ lwc1 $f0, 0x78($s0) +/* C49EB8 802432D8 46800020 */ cvt.s.w $f0, $f0 +/* C49EBC 802432DC 46000021 */ cvt.d.s $f0, $f0 +/* C49EC0 802432E0 C6020088 */ lwc1 $f2, 0x88($s0) +/* C49EC4 802432E4 468010A0 */ cvt.s.w $f2, $f2 +/* C49EC8 802432E8 3C014059 */ lui $at, 0x4059 +/* C49ECC 802432EC 44812800 */ mtc1 $at, $f5 +/* C49ED0 802432F0 44802000 */ mtc1 $zero, $f4 +/* C49ED4 802432F4 460010A1 */ cvt.d.s $f2, $f2 +/* C49ED8 802432F8 46240003 */ div.d $f0, $f0, $f4 +/* C49EDC 802432FC 462006A0 */ cvt.s.d $f26, $f0 +/* C49EE0 80243300 46241083 */ div.d $f2, $f2, $f4 +/* C49EE4 80243304 462010A0 */ cvt.s.d $f2, $f2 +/* C49EE8 80243308 C6000070 */ lwc1 $f0, 0x70($s0) +/* C49EEC 8024330C 46800020 */ cvt.s.w $f0, $f0 +/* C49EF0 80243310 46000021 */ cvt.d.s $f0, $f0 +/* C49EF4 80243314 46240003 */ div.d $f0, $f0, $f4 +/* C49EF8 80243318 462005A0 */ cvt.s.d $f22, $f0 +/* C49EFC 8024331C 0C00A8BB */ jal sin_deg +/* C49F00 80243320 4602D600 */ add.s $f24, $f26, $f2 +/* C49F04 80243324 27A50028 */ addiu $a1, $sp, 0x28 +/* C49F08 80243328 27A6002C */ addiu $a2, $sp, 0x2c +/* C49F0C 8024332C 27A70030 */ addiu $a3, $sp, 0x30 +/* C49F10 80243330 27A20034 */ addiu $v0, $sp, 0x34 +/* C49F14 80243334 AFA20010 */ sw $v0, 0x10($sp) +/* C49F18 80243338 8E240080 */ lw $a0, 0x80($s1) +/* C49F1C 8024333C 0C0372DF */ jal func_800DCB7C +/* C49F20 80243340 46000506 */ mov.s $f20, $f0 +/* C49F24 80243344 10400007 */ beqz $v0, .L80243364 +/* C49F28 80243348 00000000 */ nop +/* C49F2C 8024334C 4616A082 */ mul.s $f2, $f20, $f22 +/* C49F30 80243350 00000000 */ nop +/* C49F34 80243354 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C49F38 80243358 461A0000 */ add.s $f0, $f0, $f26 +/* C49F3C 8024335C 08090CDC */ j .L80243370 +/* C49F40 80243360 46020000 */ add.s $f0, $f0, $f2 +.L80243364: +/* C49F44 80243364 4616A002 */ mul.s $f0, $f20, $f22 +/* C49F48 80243368 00000000 */ nop +/* C49F4C 8024336C 4600C000 */ add.s $f0, $f24, $f0 +.L80243370: +/* C49F50 80243370 E620003C */ swc1 $f0, 0x3c($s1) +/* C49F54 80243374 8E020074 */ lw $v0, 0x74($s0) +/* C49F58 80243378 2442000C */ addiu $v0, $v0, 0xc +/* C49F5C 8024337C 44826000 */ mtc1 $v0, $f12 +/* C49F60 80243380 00000000 */ nop +/* C49F64 80243384 0C00A6C9 */ jal clamp_angle +/* C49F68 80243388 46806320 */ cvt.s.w $f12, $f12 +/* C49F6C 8024338C 4600020D */ trunc.w.s $f8, $f0 +/* C49F70 80243390 E6080074 */ swc1 $f8, 0x74($s0) +/* C49F74 80243394 8E420074 */ lw $v0, 0x74($s2) +/* C49F78 80243398 1C400037 */ bgtz $v0, .L80243478 +/* C49F7C 8024339C 2442FFFF */ addiu $v0, $v0, -1 +/* C49F80 802433A0 8E620014 */ lw $v0, 0x14($s3) +/* C49F84 802433A4 AE420074 */ sw $v0, 0x74($s2) +/* C49F88 802433A8 C662000C */ lwc1 $f2, 0xc($s3) +/* C49F8C 802433AC 3C013FE0 */ lui $at, 0x3fe0 +/* C49F90 802433B0 44812800 */ mtc1 $at, $f5 +/* C49F94 802433B4 44802000 */ mtc1 $zero, $f4 +/* C49F98 802433B8 460010A1 */ cvt.d.s $f2, $f2 +/* C49F9C 802433BC 46241082 */ mul.d $f2, $f2, $f4 +/* C49FA0 802433C0 00000000 */ nop +/* C49FA4 802433C4 C6600010 */ lwc1 $f0, 0x10($s3) +/* C49FA8 802433C8 46000021 */ cvt.d.s $f0, $f0 +/* C49FAC 802433CC 46240002 */ mul.d $f0, $f0, $f4 +/* C49FB0 802433D0 00000000 */ nop +/* C49FB4 802433D4 0280202D */ daddu $a0, $s4, $zero +/* C49FB8 802433D8 462010A0 */ cvt.s.d $f2, $f2 +/* C49FBC 802433DC 46200020 */ cvt.s.d $f0, $f0 +/* C49FC0 802433E0 44061000 */ mfc1 $a2, $f2 +/* C49FC4 802433E4 44070000 */ mfc1 $a3, $f0 +/* C49FC8 802433E8 0200282D */ daddu $a1, $s0, $zero +/* C49FCC 802433EC 0C01242D */ jal func_800490B4 +/* C49FD0 802433F0 AFA00010 */ sw $zero, 0x10($sp) +/* C49FD4 802433F4 1040001E */ beqz $v0, .L80243470 +/* C49FD8 802433F8 0000202D */ daddu $a0, $zero, $zero +/* C49FDC 802433FC 0220282D */ daddu $a1, $s1, $zero +/* C49FE0 80243400 0000302D */ daddu $a2, $zero, $zero +/* C49FE4 80243404 2410000C */ addiu $s0, $zero, 0xc +/* C49FE8 80243408 862300A8 */ lh $v1, 0xa8($s1) +/* C49FEC 8024340C 3C013F80 */ lui $at, 0x3f80 +/* C49FF0 80243410 44810000 */ mtc1 $at, $f0 +/* C49FF4 80243414 3C014000 */ lui $at, 0x4000 +/* C49FF8 80243418 44811000 */ mtc1 $at, $f2 +/* C49FFC 8024341C 3C01C1A0 */ lui $at, 0xc1a0 +/* C4A000 80243420 44812000 */ mtc1 $at, $f4 +/* C4A004 80243424 44834000 */ mtc1 $v1, $f8 +/* C4A008 80243428 00000000 */ nop +/* C4A00C 8024342C 46804220 */ cvt.s.w $f8, $f8 +/* C4A010 80243430 44074000 */ mfc1 $a3, $f8 +/* C4A014 80243434 27A20038 */ addiu $v0, $sp, 0x38 +/* C4A018 80243438 AFB0001C */ sw $s0, 0x1c($sp) +/* C4A01C 8024343C AFA20020 */ sw $v0, 0x20($sp) +/* C4A020 80243440 E7A00010 */ swc1 $f0, 0x10($sp) +/* C4A024 80243444 E7A20014 */ swc1 $f2, 0x14($sp) +/* C4A028 80243448 0C01BFA4 */ jal fx_emote +/* C4A02C 8024344C E7A40018 */ swc1 $f4, 0x18($sp) +/* C4A030 80243450 0220202D */ daddu $a0, $s1, $zero +/* C4A034 80243454 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C4A038 80243458 0C012530 */ jal func_800494C0 +/* C4A03C 8024345C 3C060020 */ lui $a2, 0x20 +/* C4A040 80243460 C620003C */ lwc1 $f0, 0x3c($s1) +/* C4A044 80243464 E6200064 */ swc1 $f0, 0x64($s1) +/* C4A048 80243468 08090D52 */ j .L80243548 +/* C4A04C 8024346C AE500070 */ sw $s0, 0x70($s2) +.L80243470: +/* C4A050 80243470 8E420074 */ lw $v0, 0x74($s2) +/* C4A054 80243474 2442FFFF */ addiu $v0, $v0, -1 +.L80243478: +/* C4A058 80243478 AE420074 */ sw $v0, 0x74($s2) +/* C4A05C 8024347C 8622008C */ lh $v0, 0x8c($s1) +/* C4A060 80243480 14400031 */ bnez $v0, .L80243548 +/* C4A064 80243484 00000000 */ nop +/* C4A068 80243488 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C4A06C 8024348C 8E0200D0 */ lw $v0, 0xd0($s0) +/* C4A070 80243490 C62E0040 */ lwc1 $f14, 0x40($s1) +/* C4A074 80243494 C4480000 */ lwc1 $f8, ($v0) +/* C4A078 80243498 46804220 */ cvt.s.w $f8, $f8 +/* C4A07C 8024349C 44064000 */ mfc1 $a2, $f8 +/* C4A080 802434A0 C4480008 */ lwc1 $f8, 8($v0) +/* C4A084 802434A4 46804220 */ cvt.s.w $f8, $f8 +/* C4A088 802434A8 44074000 */ mfc1 $a3, $f8 +/* C4A08C 802434AC 0C00A720 */ jal atan2 +/* C4A090 802434B0 00000000 */ nop +/* C4A094 802434B4 8E250018 */ lw $a1, 0x18($s1) +/* C4A098 802434B8 44060000 */ mfc1 $a2, $f0 +/* C4A09C 802434BC 0220202D */ daddu $a0, $s1, $zero +/* C4A0A0 802434C0 0C00EA95 */ jal npc_move_heading +/* C4A0A4 802434C4 AE26000C */ sw $a2, 0xc($s1) +/* C4A0A8 802434C8 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C4A0AC 802434CC 8E0200D0 */ lw $v0, 0xd0($s0) +/* C4A0B0 802434D0 C62E0040 */ lwc1 $f14, 0x40($s1) +/* C4A0B4 802434D4 C4480000 */ lwc1 $f8, ($v0) +/* C4A0B8 802434D8 46804220 */ cvt.s.w $f8, $f8 +/* C4A0BC 802434DC 44064000 */ mfc1 $a2, $f8 +/* C4A0C0 802434E0 C4480008 */ lwc1 $f8, 8($v0) +/* C4A0C4 802434E4 46804220 */ cvt.s.w $f8, $f8 +/* C4A0C8 802434E8 44074000 */ mfc1 $a3, $f8 +/* C4A0CC 802434EC 0C00A7B5 */ jal dist2D +/* C4A0D0 802434F0 00000000 */ nop +/* C4A0D4 802434F4 C6220018 */ lwc1 $f2, 0x18($s1) +/* C4A0D8 802434F8 46021080 */ add.s $f2, $f2, $f2 +/* C4A0DC 802434FC 4602003E */ c.le.s $f0, $f2 +/* C4A0E0 80243500 00000000 */ nop +/* C4A0E4 80243504 45000010 */ bc1f .L80243548 +/* C4A0E8 80243508 E7A00034 */ swc1 $f0, 0x34($sp) +/* C4A0EC 8024350C 0C00A67F */ jal rand_int +/* C4A0F0 80243510 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C4A0F4 80243514 3C035555 */ lui $v1, 0x5555 +/* C4A0F8 80243518 34635556 */ ori $v1, $v1, 0x5556 +/* C4A0FC 8024351C 00430018 */ mult $v0, $v1 +/* C4A100 80243520 24030002 */ addiu $v1, $zero, 2 +/* C4A104 80243524 000227C3 */ sra $a0, $v0, 0x1f +/* C4A108 80243528 AE430070 */ sw $v1, 0x70($s2) +/* C4A10C 8024352C 00004010 */ mfhi $t0 +/* C4A110 80243530 01042023 */ subu $a0, $t0, $a0 +/* C4A114 80243534 00041840 */ sll $v1, $a0, 1 +/* C4A118 80243538 00641821 */ addu $v1, $v1, $a0 +/* C4A11C 8024353C 00431023 */ subu $v0, $v0, $v1 +/* C4A120 80243540 24420002 */ addiu $v0, $v0, 2 +/* C4A124 80243544 AE420074 */ sw $v0, 0x74($s2) +.L80243548: +/* C4A128 80243548 8FBF0054 */ lw $ra, 0x54($sp) +/* C4A12C 8024354C 8FB40050 */ lw $s4, 0x50($sp) +/* C4A130 80243550 8FB3004C */ lw $s3, 0x4c($sp) +/* C4A134 80243554 8FB20048 */ lw $s2, 0x48($sp) +/* C4A138 80243558 8FB10044 */ lw $s1, 0x44($sp) +/* C4A13C 8024355C 8FB00040 */ lw $s0, 0x40($sp) +/* C4A140 80243560 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* C4A144 80243564 D7B80068 */ ldc1 $f24, 0x68($sp) +/* C4A148 80243568 D7B60060 */ ldc1 $f22, 0x60($sp) +/* C4A14C 8024356C D7B40058 */ ldc1 $f20, 0x58($sp) +/* C4A150 80243570 03E00008 */ jr $ra +/* C4A154 80243574 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s index c5b83826d3..ac44871b1e 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s +++ b/asm/nonmatchings/world/area_dgb/dgb_09/C46BE0/func_80243578_C4A158.s @@ -47,7 +47,7 @@ glabel func_80243578_C4A158 /* C4A200 80243620 02A0202D */ daddu $a0, $s5, $zero /* C4A204 80243624 0240282D */ daddu $a1, $s2, $zero /* C4A208 80243628 0280302D */ daddu $a2, $s4, $zero -/* C4A20C 8024362C 0C090983 */ jal func_8024260C +/* C4A20C 8024362C 0C090983 */ jal func_8024260C_C491EC /* C4A210 80243630 0220382D */ daddu $a3, $s1, $zero .L80243634: /* C4A214 80243634 8E830070 */ lw $v1, 0x70($s4) @@ -61,7 +61,7 @@ glabel func_80243578_C4A158 /* C4A234 80243654 00000000 */ nop /* C4A238 80243658 0280202D */ daddu $a0, $s4, $zero /* C4A23C 8024365C 0220282D */ daddu $a1, $s1, $zero -/* C4A240 80243660 0C090509 */ jal func_80241424 +/* C4A240 80243660 0C090509 */ jal func_80241424_C48004 /* C4A244 80243664 0260302D */ daddu $a2, $s3, $zero /* C4A248 80243668 0000282D */ daddu $a1, $zero, $zero /* C4A24C 8024366C 00A0302D */ daddu $a2, $a1, $zero @@ -73,17 +73,17 @@ glabel func_80243578_C4A158 /* C4A264 80243684 00A0382D */ daddu $a3, $a1, $zero /* C4A268 80243688 0280202D */ daddu $a0, $s4, $zero /* C4A26C 8024368C 0220282D */ daddu $a1, $s1, $zero -/* C4A270 80243690 0C090575 */ jal func_802415D4 +/* C4A270 80243690 0C090575 */ jal func_802415D4_C481B4 /* C4A274 80243694 0260302D */ daddu $a2, $s3, $zero /* C4A278 80243698 08090DB0 */ j .L802436C0 /* C4A27C 8024369C 00000000 */ nop /* C4A280 802436A0 0280202D */ daddu $a0, $s4, $zero /* C4A284 802436A4 0220282D */ daddu $a1, $s1, $zero -/* C4A288 802436A8 0C0906FF */ jal func_80241BFC +/* C4A288 802436A8 0C0906FF */ jal func_80241BFC_C487DC /* C4A28C 802436AC 0260302D */ daddu $a2, $s3, $zero /* C4A290 802436B0 0280202D */ daddu $a0, $s4, $zero /* C4A294 802436B4 0220282D */ daddu $a1, $s1, $zero -/* C4A298 802436B8 0C09072F */ jal func_80241CBC +/* C4A298 802436B8 0C09072F */ jal func_80241CBC_C4889C /* C4A29C 802436BC 0260302D */ daddu $a2, $s3, $zero .L802436C0: /* C4A2A0 802436C0 8E830070 */ lw $v1, 0x70($s4) @@ -94,7 +94,7 @@ glabel func_80243578_C4A158 /* C4A2B4 802436D4 A6A2008E */ sh $v0, 0x8e($s5) /* C4A2B8 802436D8 0280202D */ daddu $a0, $s4, $zero /* C4A2BC 802436DC 0220282D */ daddu $a1, $s1, $zero -/* C4A2C0 802436E0 0C090A47 */ jal func_8024291C +/* C4A2C0 802436E0 0C090A47 */ jal func_8024291C_C494FC /* C4A2C4 802436E4 0260302D */ daddu $a2, $s3, $zero /* C4A2C8 802436E8 8E830070 */ lw $v1, 0x70($s4) /* C4A2CC 802436EC 2402000D */ addiu $v0, $zero, 0xd @@ -102,13 +102,13 @@ glabel func_80243578_C4A158 /* C4A2D4 802436F4 00000000 */ nop /* C4A2D8 802436F8 0280202D */ daddu $a0, $s4, $zero /* C4A2DC 802436FC 0220282D */ daddu $a1, $s1, $zero -/* C4A2E0 80243700 0C090A9D */ jal func_80242A74 +/* C4A2E0 80243700 0C090A9D */ jal func_80242A74_C49654 /* C4A2E4 80243704 0260302D */ daddu $a2, $s3, $zero /* C4A2E8 80243708 08090DF0 */ j .L802437C0 /* C4A2EC 8024370C 00000000 */ nop /* C4A2F0 80243710 0280202D */ daddu $a0, $s4, $zero /* C4A2F4 80243714 0220282D */ daddu $a1, $s1, $zero -/* C4A2F8 80243718 0C090ADE */ jal func_80242B78 +/* C4A2F8 80243718 0C090ADE */ jal func_80242B78_C49758 /* C4A2FC 8024371C 0260302D */ daddu $a2, $s3, $zero /* C4A300 80243720 8E830070 */ lw $v1, 0x70($s4) /* C4A304 80243724 2402000F */ addiu $v0, $zero, 0xf @@ -116,17 +116,17 @@ glabel func_80243578_C4A158 /* C4A30C 8024372C 00000000 */ nop /* C4A310 80243730 0280202D */ daddu $a0, $s4, $zero /* C4A314 80243734 0220282D */ daddu $a1, $s1, $zero -/* C4A318 80243738 0C090B07 */ jal func_80242C1C +/* C4A318 80243738 0C090B07 */ jal func_80242C1C_C497FC /* C4A31C 8024373C 0260302D */ daddu $a2, $s3, $zero /* C4A320 80243740 08090DF0 */ j .L802437C0 /* C4A324 80243744 00000000 */ nop /* C4A328 80243748 0280202D */ daddu $a0, $s4, $zero /* C4A32C 8024374C 0220282D */ daddu $a1, $s1, $zero -/* C4A330 80243750 0C090BAE */ jal func_80242EB8 +/* C4A330 80243750 0C090BAE */ jal func_80242EB8_C49A98 /* C4A334 80243754 0260302D */ daddu $a2, $s3, $zero /* C4A338 80243758 0280202D */ daddu $a0, $s4, $zero /* C4A33C 8024375C 0220282D */ daddu $a1, $s1, $zero -/* C4A340 80243760 0C090BDC */ jal func_80242F70 +/* C4A340 80243760 0C090BDC */ jal func_80242F70_C49B50 /* C4A344 80243764 0260302D */ daddu $a2, $s3, $zero /* C4A348 80243768 08090DF0 */ j .L802437C0 /* C4A34C 8024376C 00000000 */ nop @@ -138,17 +138,17 @@ glabel func_80243578_C4A158 /* C4A364 80243784 00000000 */ nop /* C4A368 80243788 0280202D */ daddu $a0, $s4, $zero /* C4A36C 8024378C 0220282D */ daddu $a1, $s1, $zero -/* C4A370 80243790 0C090C4E */ jal func_80243138 +/* C4A370 80243790 0C090C4E */ jal func_80243138_C49D18 /* C4A374 80243794 0260302D */ daddu $a2, $s3, $zero /* C4A378 80243798 08090DF0 */ j .L802437C0 /* C4A37C 8024379C 00000000 */ nop /* C4A380 802437A0 0280202D */ daddu $a0, $s4, $zero /* C4A384 802437A4 0220282D */ daddu $a1, $s1, $zero -/* C4A388 802437A8 0C090C6E */ jal func_802431B8 +/* C4A388 802437A8 0C090C6E */ jal func_802431B8_C49D98 /* C4A38C 802437AC 0260302D */ daddu $a2, $s3, $zero /* C4A390 802437B0 0280202D */ daddu $a0, $s4, $zero /* C4A394 802437B4 0220282D */ daddu $a1, $s1, $zero -/* C4A398 802437B8 0C090C98 */ jal func_80243260 +/* C4A398 802437B8 0C090C98 */ jal func_80243260_C49E40 /* C4A39C 802437BC 0260302D */ daddu $a2, $s3, $zero .L802437C0: /* C4A3A0 802437C0 8E820070 */ lw $v0, 0x70($s4) diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s index 2d20ab7a74..7bed712921 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_8024061C_C4FB2C.s @@ -90,7 +90,7 @@ glabel func_8024061C_C4FB2C /* C4FC6C 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* C4FC70 80240760 14400006 */ bnez $v0, .L8024077C /* C4FC74 80240764 00000000 */ nop -/* C4FC78 80240768 0C090082 */ jal func_80240208 +/* C4FC78 80240768 0C090082 */ jal func_80240208_C4F718 /* C4FC7C 8024076C 0240202D */ daddu $a0, $s2, $zero /* C4FC80 80240770 10400002 */ beqz $v0, .L8024077C /* C4FC84 80240774 2402001E */ addiu $v0, $zero, 0x1e @@ -151,15 +151,15 @@ glabel func_8024061C_C4FB2C /* C4FD5C 8024084C 0280302D */ daddu $a2, $s4, $zero /* C4FD60 80240850 0809022A */ j .L802408A8 /* C4FD64 80240854 00000000 */ nop -/* C4FD68 80240858 0C090000 */ jal func_80240000 +/* C4FD68 80240858 0C090000 */ jal func_80240000_C4F510 /* C4FD6C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* C4FD70 80240860 0C09001B */ jal func_8024006C +/* C4FD70 80240860 0C09001B */ jal func_8024006C_C4F57C /* C4FD74 80240864 0240202D */ daddu $a0, $s2, $zero /* C4FD78 80240868 8E430070 */ lw $v1, 0x70($s2) /* C4FD7C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* C4FD80 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* C4FD84 80240874 00000000 */ nop -/* C4FD88 80240878 0C090037 */ jal func_802400DC +/* C4FD88 80240878 0C090037 */ jal func_802400DC_C4F5EC /* C4FD8C 8024087C 0240202D */ daddu $a0, $s2, $zero /* C4FD90 80240880 8E430070 */ lw $v1, 0x70($s2) /* C4FD94 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0.s deleted file mode 100644 index f753aca4a4..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD0 -/* C501E0 80240CD0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C501E4 80240CD4 AFB3001C */ sw $s3, 0x1c($sp) -/* C501E8 80240CD8 0080982D */ daddu $s3, $a0, $zero -/* C501EC 80240CDC AFBF0020 */ sw $ra, 0x20($sp) -/* C501F0 80240CE0 AFB20018 */ sw $s2, 0x18($sp) -/* C501F4 80240CE4 AFB10014 */ sw $s1, 0x14($sp) -/* C501F8 80240CE8 AFB00010 */ sw $s0, 0x10($sp) -/* C501FC 80240CEC 8E720148 */ lw $s2, 0x148($s3) -/* C50200 80240CF0 86440008 */ lh $a0, 8($s2) -/* C50204 80240CF4 0C00EABB */ jal get_npc_unsafe -/* C50208 80240CF8 00A0882D */ daddu $s1, $a1, $zero -/* C5020C 80240CFC 8E240008 */ lw $a0, 8($s1) -/* C50210 80240D00 0040802D */ daddu $s0, $v0, $zero -/* C50214 80240D04 00041FC2 */ srl $v1, $a0, 0x1f -/* C50218 80240D08 00832021 */ addu $a0, $a0, $v1 -/* C5021C 80240D0C 00042043 */ sra $a0, $a0, 1 -/* C50220 80240D10 0C00A67F */ jal rand_int -/* C50224 80240D14 24840001 */ addiu $a0, $a0, 1 -/* C50228 80240D18 8E230008 */ lw $v1, 8($s1) -/* C5022C 80240D1C 240400B4 */ addiu $a0, $zero, 0xb4 -/* C50230 80240D20 00032FC2 */ srl $a1, $v1, 0x1f -/* C50234 80240D24 00651821 */ addu $v1, $v1, $a1 -/* C50238 80240D28 00031843 */ sra $v1, $v1, 1 -/* C5023C 80240D2C 00621821 */ addu $v1, $v1, $v0 -/* C50240 80240D30 0C00A67F */ jal rand_int -/* C50244 80240D34 A603008E */ sh $v1, 0x8e($s0) -/* C50248 80240D38 C60C000C */ lwc1 $f12, 0xc($s0) -/* C5024C 80240D3C 44820000 */ mtc1 $v0, $f0 -/* C50250 80240D40 00000000 */ nop -/* C50254 80240D44 46800020 */ cvt.s.w $f0, $f0 -/* C50258 80240D48 46006300 */ add.s $f12, $f12, $f0 -/* C5025C 80240D4C 3C0142B4 */ lui $at, 0x42b4 -/* C50260 80240D50 44810000 */ mtc1 $at, $f0 -/* C50264 80240D54 0C00A6C9 */ jal clamp_angle -/* C50268 80240D58 46006301 */ sub.s $f12, $f12, $f0 -/* C5026C 80240D5C E600000C */ swc1 $f0, 0xc($s0) -/* C50270 80240D60 8E4200CC */ lw $v0, 0xcc($s2) -/* C50274 80240D64 8C420000 */ lw $v0, ($v0) -/* C50278 80240D68 AE020028 */ sw $v0, 0x28($s0) -/* C5027C 80240D6C 24020003 */ addiu $v0, $zero, 3 -/* C50280 80240D70 AE620070 */ sw $v0, 0x70($s3) -/* C50284 80240D74 8FBF0020 */ lw $ra, 0x20($sp) -/* C50288 80240D78 8FB3001C */ lw $s3, 0x1c($sp) -/* C5028C 80240D7C 8FB20018 */ lw $s2, 0x18($sp) -/* C50290 80240D80 8FB10014 */ lw $s1, 0x14($sp) -/* C50294 80240D84 8FB00010 */ lw $s0, 0x10($sp) -/* C50298 80240D88 03E00008 */ jr $ra -/* C5029C 80240D8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s new file mode 100644 index 0000000000..b7bdeae605 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240CD0_C501E0.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CD0_C501E0 +/* C501E0 80240CD0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C501E4 80240CD4 AFB3001C */ sw $s3, 0x1c($sp) +/* C501E8 80240CD8 0080982D */ daddu $s3, $a0, $zero +/* C501EC 80240CDC AFBF0020 */ sw $ra, 0x20($sp) +/* C501F0 80240CE0 AFB20018 */ sw $s2, 0x18($sp) +/* C501F4 80240CE4 AFB10014 */ sw $s1, 0x14($sp) +/* C501F8 80240CE8 AFB00010 */ sw $s0, 0x10($sp) +/* C501FC 80240CEC 8E720148 */ lw $s2, 0x148($s3) +/* C50200 80240CF0 86440008 */ lh $a0, 8($s2) +/* C50204 80240CF4 0C00EABB */ jal get_npc_unsafe +/* C50208 80240CF8 00A0882D */ daddu $s1, $a1, $zero +/* C5020C 80240CFC 8E240008 */ lw $a0, 8($s1) +/* C50210 80240D00 0040802D */ daddu $s0, $v0, $zero +/* C50214 80240D04 00041FC2 */ srl $v1, $a0, 0x1f +/* C50218 80240D08 00832021 */ addu $a0, $a0, $v1 +/* C5021C 80240D0C 00042043 */ sra $a0, $a0, 1 +/* C50220 80240D10 0C00A67F */ jal rand_int +/* C50224 80240D14 24840001 */ addiu $a0, $a0, 1 +/* C50228 80240D18 8E230008 */ lw $v1, 8($s1) +/* C5022C 80240D1C 240400B4 */ addiu $a0, $zero, 0xb4 +/* C50230 80240D20 00032FC2 */ srl $a1, $v1, 0x1f +/* C50234 80240D24 00651821 */ addu $v1, $v1, $a1 +/* C50238 80240D28 00031843 */ sra $v1, $v1, 1 +/* C5023C 80240D2C 00621821 */ addu $v1, $v1, $v0 +/* C50240 80240D30 0C00A67F */ jal rand_int +/* C50244 80240D34 A603008E */ sh $v1, 0x8e($s0) +/* C50248 80240D38 C60C000C */ lwc1 $f12, 0xc($s0) +/* C5024C 80240D3C 44820000 */ mtc1 $v0, $f0 +/* C50250 80240D40 00000000 */ nop +/* C50254 80240D44 46800020 */ cvt.s.w $f0, $f0 +/* C50258 80240D48 46006300 */ add.s $f12, $f12, $f0 +/* C5025C 80240D4C 3C0142B4 */ lui $at, 0x42b4 +/* C50260 80240D50 44810000 */ mtc1 $at, $f0 +/* C50264 80240D54 0C00A6C9 */ jal clamp_angle +/* C50268 80240D58 46006301 */ sub.s $f12, $f12, $f0 +/* C5026C 80240D5C E600000C */ swc1 $f0, 0xc($s0) +/* C50270 80240D60 8E4200CC */ lw $v0, 0xcc($s2) +/* C50274 80240D64 8C420000 */ lw $v0, ($v0) +/* C50278 80240D68 AE020028 */ sw $v0, 0x28($s0) +/* C5027C 80240D6C 24020003 */ addiu $v0, $zero, 3 +/* C50280 80240D70 AE620070 */ sw $v0, 0x70($s3) +/* C50284 80240D74 8FBF0020 */ lw $ra, 0x20($sp) +/* C50288 80240D78 8FB3001C */ lw $s3, 0x1c($sp) +/* C5028C 80240D7C 8FB20018 */ lw $s2, 0x18($sp) +/* C50290 80240D80 8FB10014 */ lw $s1, 0x14($sp) +/* C50294 80240D84 8FB00010 */ lw $s0, 0x10($sp) +/* C50298 80240D88 03E00008 */ jr $ra +/* C5029C 80240D8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C.s deleted file mode 100644 index 52a62b4c7b..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F4C -/* C5045C 80240F4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C50460 80240F50 AFB10014 */ sw $s1, 0x14($sp) -/* C50464 80240F54 0080882D */ daddu $s1, $a0, $zero -/* C50468 80240F58 AFBF001C */ sw $ra, 0x1c($sp) -/* C5046C 80240F5C AFB20018 */ sw $s2, 0x18($sp) -/* C50470 80240F60 AFB00010 */ sw $s0, 0x10($sp) -/* C50474 80240F64 8E300148 */ lw $s0, 0x148($s1) -/* C50478 80240F68 86040008 */ lh $a0, 8($s0) -/* C5047C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* C50480 80240F70 00A0902D */ daddu $s2, $a1, $zero -/* C50484 80240F74 8E230078 */ lw $v1, 0x78($s1) -/* C50488 80240F78 24630001 */ addiu $v1, $v1, 1 -/* C5048C 80240F7C AE230078 */ sw $v1, 0x78($s1) -/* C50490 80240F80 8E0400D0 */ lw $a0, 0xd0($s0) -/* C50494 80240F84 8C840000 */ lw $a0, ($a0) -/* C50498 80240F88 0064182A */ slt $v1, $v1, $a0 -/* C5049C 80240F8C 14600002 */ bnez $v1, .L80240F98 -/* C504A0 80240F90 0040282D */ daddu $a1, $v0, $zero -/* C504A4 80240F94 AE200078 */ sw $zero, 0x78($s1) -.L80240F98: -/* C504A8 80240F98 8E0200CC */ lw $v0, 0xcc($s0) -/* C504AC 80240F9C 8C420004 */ lw $v0, 4($v0) -/* C504B0 80240FA0 ACA20028 */ sw $v0, 0x28($a1) -/* C504B4 80240FA4 8E0200D0 */ lw $v0, 0xd0($s0) -/* C504B8 80240FA8 8C42007C */ lw $v0, 0x7c($v0) -/* C504BC 80240FAC 04410004 */ bgez $v0, .L80240FC0 -/* C504C0 80240FB0 00000000 */ nop -/* C504C4 80240FB4 C6400000 */ lwc1 $f0, ($s2) -/* C504C8 80240FB8 080903F8 */ j .L80240FE0 -/* C504CC 80240FBC E4A00018 */ swc1 $f0, 0x18($a1) -.L80240FC0: -/* C504D0 80240FC0 3C018024 */ lui $at, 0x8024 -/* C504D4 80240FC4 D4222E90 */ ldc1 $f2, 0x2e90($at) -/* C504D8 80240FC8 44820000 */ mtc1 $v0, $f0 -/* C504DC 80240FCC 00000000 */ nop -/* C504E0 80240FD0 46800021 */ cvt.d.w $f0, $f0 -/* C504E4 80240FD4 46220003 */ div.d $f0, $f0, $f2 -/* C504E8 80240FD8 46200020 */ cvt.s.d $f0, $f0 -/* C504EC 80240FDC E4A00018 */ swc1 $f0, 0x18($a1) -.L80240FE0: -/* C504F0 80240FE0 24020001 */ addiu $v0, $zero, 1 -/* C504F4 80240FE4 AE220070 */ sw $v0, 0x70($s1) -/* C504F8 80240FE8 8FBF001C */ lw $ra, 0x1c($sp) -/* C504FC 80240FEC 8FB20018 */ lw $s2, 0x18($sp) -/* C50500 80240FF0 8FB10014 */ lw $s1, 0x14($sp) -/* C50504 80240FF4 8FB00010 */ lw $s0, 0x10($sp) -/* C50508 80240FF8 03E00008 */ jr $ra -/* C5050C 80240FFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s new file mode 100644 index 0000000000..2ea3cc8a20 --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80240F4C_C5045C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F4C_C5045C +/* C5045C 80240F4C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C50460 80240F50 AFB10014 */ sw $s1, 0x14($sp) +/* C50464 80240F54 0080882D */ daddu $s1, $a0, $zero +/* C50468 80240F58 AFBF001C */ sw $ra, 0x1c($sp) +/* C5046C 80240F5C AFB20018 */ sw $s2, 0x18($sp) +/* C50470 80240F60 AFB00010 */ sw $s0, 0x10($sp) +/* C50474 80240F64 8E300148 */ lw $s0, 0x148($s1) +/* C50478 80240F68 86040008 */ lh $a0, 8($s0) +/* C5047C 80240F6C 0C00EABB */ jal get_npc_unsafe +/* C50480 80240F70 00A0902D */ daddu $s2, $a1, $zero +/* C50484 80240F74 8E230078 */ lw $v1, 0x78($s1) +/* C50488 80240F78 24630001 */ addiu $v1, $v1, 1 +/* C5048C 80240F7C AE230078 */ sw $v1, 0x78($s1) +/* C50490 80240F80 8E0400D0 */ lw $a0, 0xd0($s0) +/* C50494 80240F84 8C840000 */ lw $a0, ($a0) +/* C50498 80240F88 0064182A */ slt $v1, $v1, $a0 +/* C5049C 80240F8C 14600002 */ bnez $v1, .L80240F98 +/* C504A0 80240F90 0040282D */ daddu $a1, $v0, $zero +/* C504A4 80240F94 AE200078 */ sw $zero, 0x78($s1) +.L80240F98: +/* C504A8 80240F98 8E0200CC */ lw $v0, 0xcc($s0) +/* C504AC 80240F9C 8C420004 */ lw $v0, 4($v0) +/* C504B0 80240FA0 ACA20028 */ sw $v0, 0x28($a1) +/* C504B4 80240FA4 8E0200D0 */ lw $v0, 0xd0($s0) +/* C504B8 80240FA8 8C42007C */ lw $v0, 0x7c($v0) +/* C504BC 80240FAC 04410004 */ bgez $v0, .L80240FC0 +/* C504C0 80240FB0 00000000 */ nop +/* C504C4 80240FB4 C6400000 */ lwc1 $f0, ($s2) +/* C504C8 80240FB8 080903F8 */ j .L80240FE0 +/* C504CC 80240FBC E4A00018 */ swc1 $f0, 0x18($a1) +.L80240FC0: +/* C504D0 80240FC0 3C018024 */ lui $at, 0x8024 +/* C504D4 80240FC4 D4222E90 */ ldc1 $f2, 0x2e90($at) +/* C504D8 80240FC8 44820000 */ mtc1 $v0, $f0 +/* C504DC 80240FCC 00000000 */ nop +/* C504E0 80240FD0 46800021 */ cvt.d.w $f0, $f0 +/* C504E4 80240FD4 46220003 */ div.d $f0, $f0, $f2 +/* C504E8 80240FD8 46200020 */ cvt.s.d $f0, $f0 +/* C504EC 80240FDC E4A00018 */ swc1 $f0, 0x18($a1) +.L80240FE0: +/* C504F0 80240FE0 24020001 */ addiu $v0, $zero, 1 +/* C504F4 80240FE4 AE220070 */ sw $v0, 0x70($s1) +/* C504F8 80240FE8 8FBF001C */ lw $ra, 0x1c($sp) +/* C504FC 80240FEC 8FB20018 */ lw $s2, 0x18($sp) +/* C50500 80240FF0 8FB10014 */ lw $s1, 0x14($sp) +/* C50504 80240FF4 8FB00010 */ lw $s0, 0x10($sp) +/* C50508 80240FF8 03E00008 */ jr $ra +/* C5050C 80240FFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000.s deleted file mode 100644 index a8e2c97161..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241000 -/* C50510 80241000 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C50514 80241004 AFB10014 */ sw $s1, 0x14($sp) -/* C50518 80241008 0080882D */ daddu $s1, $a0, $zero -/* C5051C 8024100C AFBF0018 */ sw $ra, 0x18($sp) -/* C50520 80241010 AFB00010 */ sw $s0, 0x10($sp) -/* C50524 80241014 8E300148 */ lw $s0, 0x148($s1) -/* C50528 80241018 0C00EABB */ jal get_npc_unsafe -/* C5052C 8024101C 86040008 */ lh $a0, 8($s0) -/* C50530 80241020 8E0300CC */ lw $v1, 0xcc($s0) -/* C50534 80241024 3C014120 */ lui $at, 0x4120 -/* C50538 80241028 44812000 */ mtc1 $at, $f4 -/* C5053C 8024102C 3C014000 */ lui $at, 0x4000 -/* C50540 80241030 44810000 */ mtc1 $at, $f0 -/* C50544 80241034 C442003C */ lwc1 $f2, 0x3c($v0) -/* C50548 80241038 8C640010 */ lw $a0, 0x10($v1) -/* C5054C 8024103C 8C430000 */ lw $v1, ($v0) -/* C50550 80241040 E444001C */ swc1 $f4, 0x1c($v0) -/* C50554 80241044 E4400014 */ swc1 $f0, 0x14($v0) -/* C50558 80241048 E4420064 */ swc1 $f2, 0x64($v0) -/* C5055C 8024104C 34630800 */ ori $v1, $v1, 0x800 -/* C50560 80241050 AC430000 */ sw $v1, ($v0) -/* C50564 80241054 AC440028 */ sw $a0, 0x28($v0) -/* C50568 80241058 2402000B */ addiu $v0, $zero, 0xb -/* C5056C 8024105C AE220070 */ sw $v0, 0x70($s1) -/* C50570 80241060 8FBF0018 */ lw $ra, 0x18($sp) -/* C50574 80241064 8FB10014 */ lw $s1, 0x14($sp) -/* C50578 80241068 8FB00010 */ lw $s0, 0x10($sp) -/* C5057C 8024106C 03E00008 */ jr $ra -/* C50580 80241070 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000_C50510.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000_C50510.s new file mode 100644 index 0000000000..7adfdf213e --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241000_C50510.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241000_C50510 +/* C50510 80241000 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C50514 80241004 AFB10014 */ sw $s1, 0x14($sp) +/* C50518 80241008 0080882D */ daddu $s1, $a0, $zero +/* C5051C 8024100C AFBF0018 */ sw $ra, 0x18($sp) +/* C50520 80241010 AFB00010 */ sw $s0, 0x10($sp) +/* C50524 80241014 8E300148 */ lw $s0, 0x148($s1) +/* C50528 80241018 0C00EABB */ jal get_npc_unsafe +/* C5052C 8024101C 86040008 */ lh $a0, 8($s0) +/* C50530 80241020 8E0300CC */ lw $v1, 0xcc($s0) +/* C50534 80241024 3C014120 */ lui $at, 0x4120 +/* C50538 80241028 44812000 */ mtc1 $at, $f4 +/* C5053C 8024102C 3C014000 */ lui $at, 0x4000 +/* C50540 80241030 44810000 */ mtc1 $at, $f0 +/* C50544 80241034 C442003C */ lwc1 $f2, 0x3c($v0) +/* C50548 80241038 8C640010 */ lw $a0, 0x10($v1) +/* C5054C 8024103C 8C430000 */ lw $v1, ($v0) +/* C50550 80241040 E444001C */ swc1 $f4, 0x1c($v0) +/* C50554 80241044 E4400014 */ swc1 $f0, 0x14($v0) +/* C50558 80241048 E4420064 */ swc1 $f2, 0x64($v0) +/* C5055C 8024104C 34630800 */ ori $v1, $v1, 0x800 +/* C50560 80241050 AC430000 */ sw $v1, ($v0) +/* C50564 80241054 AC440028 */ sw $a0, 0x28($v0) +/* C50568 80241058 2402000B */ addiu $v0, $zero, 0xb +/* C5056C 8024105C AE220070 */ sw $v0, 0x70($s1) +/* C50570 80241060 8FBF0018 */ lw $ra, 0x18($sp) +/* C50574 80241064 8FB10014 */ lw $s1, 0x14($sp) +/* C50578 80241068 8FB00010 */ lw $s0, 0x10($sp) +/* C5057C 8024106C 03E00008 */ jr $ra +/* C50580 80241070 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074.s deleted file mode 100644 index 7a0b450bc7..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241074 -/* C50584 80241074 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C50588 80241078 AFB00010 */ sw $s0, 0x10($sp) -/* C5058C 8024107C 0080802D */ daddu $s0, $a0, $zero -/* C50590 80241080 AFBF0014 */ sw $ra, 0x14($sp) -/* C50594 80241084 8E020148 */ lw $v0, 0x148($s0) -/* C50598 80241088 0C00EABB */ jal get_npc_unsafe -/* C5059C 8024108C 84440008 */ lh $a0, 8($v0) -/* C505A0 80241090 0040202D */ daddu $a0, $v0, $zero -/* C505A4 80241094 C482003C */ lwc1 $f2, 0x3c($a0) -/* C505A8 80241098 C480001C */ lwc1 $f0, 0x1c($a0) -/* C505AC 8024109C 46001080 */ add.s $f2, $f2, $f0 -/* C505B0 802410A0 C4840014 */ lwc1 $f4, 0x14($a0) -/* C505B4 802410A4 46040001 */ sub.s $f0, $f0, $f4 -/* C505B8 802410A8 C4840064 */ lwc1 $f4, 0x64($a0) -/* C505BC 802410AC 4602203C */ c.lt.s $f4, $f2 -/* C505C0 802410B0 E482003C */ swc1 $f2, 0x3c($a0) -/* C505C4 802410B4 45010009 */ bc1t .L802410DC -/* C505C8 802410B8 E480001C */ swc1 $f0, 0x1c($a0) -/* C505CC 802410BC 8C820000 */ lw $v0, ($a0) -/* C505D0 802410C0 2403F7FF */ addiu $v1, $zero, -0x801 -/* C505D4 802410C4 E484003C */ swc1 $f4, 0x3c($a0) -/* C505D8 802410C8 AC80001C */ sw $zero, 0x1c($a0) -/* C505DC 802410CC 00431024 */ and $v0, $v0, $v1 -/* C505E0 802410D0 AC820000 */ sw $v0, ($a0) -/* C505E4 802410D4 2402000C */ addiu $v0, $zero, 0xc -/* C505E8 802410D8 AE020070 */ sw $v0, 0x70($s0) -.L802410DC: -/* C505EC 802410DC 8FBF0014 */ lw $ra, 0x14($sp) -/* C505F0 802410E0 8FB00010 */ lw $s0, 0x10($sp) -/* C505F4 802410E4 03E00008 */ jr $ra -/* C505F8 802410E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074_C50584.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074_C50584.s new file mode 100644 index 0000000000..fc241ca5fd --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241074_C50584.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241074_C50584 +/* C50584 80241074 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C50588 80241078 AFB00010 */ sw $s0, 0x10($sp) +/* C5058C 8024107C 0080802D */ daddu $s0, $a0, $zero +/* C50590 80241080 AFBF0014 */ sw $ra, 0x14($sp) +/* C50594 80241084 8E020148 */ lw $v0, 0x148($s0) +/* C50598 80241088 0C00EABB */ jal get_npc_unsafe +/* C5059C 8024108C 84440008 */ lh $a0, 8($v0) +/* C505A0 80241090 0040202D */ daddu $a0, $v0, $zero +/* C505A4 80241094 C482003C */ lwc1 $f2, 0x3c($a0) +/* C505A8 80241098 C480001C */ lwc1 $f0, 0x1c($a0) +/* C505AC 8024109C 46001080 */ add.s $f2, $f2, $f0 +/* C505B0 802410A0 C4840014 */ lwc1 $f4, 0x14($a0) +/* C505B4 802410A4 46040001 */ sub.s $f0, $f0, $f4 +/* C505B8 802410A8 C4840064 */ lwc1 $f4, 0x64($a0) +/* C505BC 802410AC 4602203C */ c.lt.s $f4, $f2 +/* C505C0 802410B0 E482003C */ swc1 $f2, 0x3c($a0) +/* C505C4 802410B4 45010009 */ bc1t .L802410DC +/* C505C8 802410B8 E480001C */ swc1 $f0, 0x1c($a0) +/* C505CC 802410BC 8C820000 */ lw $v0, ($a0) +/* C505D0 802410C0 2403F7FF */ addiu $v1, $zero, -0x801 +/* C505D4 802410C4 E484003C */ swc1 $f4, 0x3c($a0) +/* C505D8 802410C8 AC80001C */ sw $zero, 0x1c($a0) +/* C505DC 802410CC 00431024 */ and $v0, $v0, $v1 +/* C505E0 802410D0 AC820000 */ sw $v0, ($a0) +/* C505E4 802410D4 2402000C */ addiu $v0, $zero, 0xc +/* C505E8 802410D8 AE020070 */ sw $v0, 0x70($s0) +.L802410DC: +/* C505EC 802410DC 8FBF0014 */ lw $ra, 0x14($sp) +/* C505F0 802410E0 8FB00010 */ lw $s0, 0x10($sp) +/* C505F4 802410E4 03E00008 */ jr $ra +/* C505F8 802410E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC.s deleted file mode 100644 index 4792bace39..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410EC -/* C505FC 802410EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C50600 802410F0 AFB3001C */ sw $s3, 0x1c($sp) -/* C50604 802410F4 0080982D */ daddu $s3, $a0, $zero -/* C50608 802410F8 AFBF0020 */ sw $ra, 0x20($sp) -/* C5060C 802410FC AFB20018 */ sw $s2, 0x18($sp) -/* C50610 80241100 AFB10014 */ sw $s1, 0x14($sp) -/* C50614 80241104 AFB00010 */ sw $s0, 0x10($sp) -/* C50618 80241108 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C5061C 8024110C 8E710148 */ lw $s1, 0x148($s3) -/* C50620 80241110 86240008 */ lh $a0, 8($s1) -/* C50624 80241114 0C00EABB */ jal get_npc_unsafe -/* C50628 80241118 00A0802D */ daddu $s0, $a1, $zero -/* C5062C 8024111C 8E040020 */ lw $a0, 0x20($s0) -/* C50630 80241120 0040902D */ daddu $s2, $v0, $zero -/* C50634 80241124 00041FC2 */ srl $v1, $a0, 0x1f -/* C50638 80241128 00832021 */ addu $a0, $a0, $v1 -/* C5063C 8024112C 00042043 */ sra $a0, $a0, 1 -/* C50640 80241130 0C00A67F */ jal rand_int -/* C50644 80241134 24840001 */ addiu $a0, $a0, 1 -/* C50648 80241138 8E030020 */ lw $v1, 0x20($s0) -/* C5064C 8024113C C64C0038 */ lwc1 $f12, 0x38($s2) -/* C50650 80241140 000327C2 */ srl $a0, $v1, 0x1f -/* C50654 80241144 00641821 */ addu $v1, $v1, $a0 -/* C50658 80241148 00031843 */ sra $v1, $v1, 1 -/* C5065C 8024114C 00621821 */ addu $v1, $v1, $v0 -/* C50660 80241150 A643008E */ sh $v1, 0x8e($s2) -/* C50664 80241154 8E2200CC */ lw $v0, 0xcc($s1) -/* C50668 80241158 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C5066C 8024115C 8C42000C */ lw $v0, 0xc($v0) -/* C50670 80241160 AE420028 */ sw $v0, 0x28($s2) -/* C50674 80241164 C6000018 */ lwc1 $f0, 0x18($s0) -/* C50678 80241168 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5067C 8024116C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C50680 80241170 E6400018 */ swc1 $f0, 0x18($s2) -/* C50684 80241174 8C460028 */ lw $a2, 0x28($v0) -/* C50688 80241178 0C00A720 */ jal atan2 -/* C5068C 8024117C 8C470030 */ lw $a3, 0x30($v0) -/* C50690 80241180 46000506 */ mov.s $f20, $f0 -/* C50694 80241184 C64C000C */ lwc1 $f12, 0xc($s2) -/* C50698 80241188 0C00A70A */ jal get_clamped_angle_diff -/* C5069C 8024118C 4600A386 */ mov.s $f14, $f20 -/* C506A0 80241190 46000086 */ mov.s $f2, $f0 -/* C506A4 80241194 8E02001C */ lw $v0, 0x1c($s0) -/* C506A8 80241198 46001005 */ abs.s $f0, $f2 -/* C506AC 8024119C 44822000 */ mtc1 $v0, $f4 -/* C506B0 802411A0 00000000 */ nop -/* C506B4 802411A4 46802120 */ cvt.s.w $f4, $f4 -/* C506B8 802411A8 4600203C */ c.lt.s $f4, $f0 -/* C506BC 802411AC 00000000 */ nop -/* C506C0 802411B0 4500000D */ bc1f .L802411E8 -/* C506C4 802411B4 00000000 */ nop -/* C506C8 802411B8 44800000 */ mtc1 $zero, $f0 -/* C506CC 802411BC C654000C */ lwc1 $f20, 0xc($s2) -/* C506D0 802411C0 4600103C */ c.lt.s $f2, $f0 -/* C506D4 802411C4 00000000 */ nop -/* C506D8 802411C8 45000006 */ bc1f .L802411E4 -/* C506DC 802411CC 00021023 */ negu $v0, $v0 -/* C506E0 802411D0 44820000 */ mtc1 $v0, $f0 -/* C506E4 802411D4 00000000 */ nop -/* C506E8 802411D8 46800020 */ cvt.s.w $f0, $f0 -/* C506EC 802411DC 0809047A */ j .L802411E8 -/* C506F0 802411E0 4600A500 */ add.s $f20, $f20, $f0 -.L802411E4: -/* C506F4 802411E4 4604A500 */ add.s $f20, $f20, $f4 -.L802411E8: -/* C506F8 802411E8 0C00A6C9 */ jal clamp_angle -/* C506FC 802411EC 4600A306 */ mov.s $f12, $f20 -/* C50700 802411F0 2402000D */ addiu $v0, $zero, 0xd -/* C50704 802411F4 E640000C */ swc1 $f0, 0xc($s2) -/* C50708 802411F8 AE620070 */ sw $v0, 0x70($s3) -/* C5070C 802411FC 8FBF0020 */ lw $ra, 0x20($sp) -/* C50710 80241200 8FB3001C */ lw $s3, 0x1c($sp) -/* C50714 80241204 8FB20018 */ lw $s2, 0x18($sp) -/* C50718 80241208 8FB10014 */ lw $s1, 0x14($sp) -/* C5071C 8024120C 8FB00010 */ lw $s0, 0x10($sp) -/* C50720 80241210 D7B40028 */ ldc1 $f20, 0x28($sp) -/* C50724 80241214 03E00008 */ jr $ra -/* C50728 80241218 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC_C505FC.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC_C505FC.s new file mode 100644 index 0000000000..c229ffd46c --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802410EC_C505FC.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410EC_C505FC +/* C505FC 802410EC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C50600 802410F0 AFB3001C */ sw $s3, 0x1c($sp) +/* C50604 802410F4 0080982D */ daddu $s3, $a0, $zero +/* C50608 802410F8 AFBF0020 */ sw $ra, 0x20($sp) +/* C5060C 802410FC AFB20018 */ sw $s2, 0x18($sp) +/* C50610 80241100 AFB10014 */ sw $s1, 0x14($sp) +/* C50614 80241104 AFB00010 */ sw $s0, 0x10($sp) +/* C50618 80241108 F7B40028 */ sdc1 $f20, 0x28($sp) +/* C5061C 8024110C 8E710148 */ lw $s1, 0x148($s3) +/* C50620 80241110 86240008 */ lh $a0, 8($s1) +/* C50624 80241114 0C00EABB */ jal get_npc_unsafe +/* C50628 80241118 00A0802D */ daddu $s0, $a1, $zero +/* C5062C 8024111C 8E040020 */ lw $a0, 0x20($s0) +/* C50630 80241120 0040902D */ daddu $s2, $v0, $zero +/* C50634 80241124 00041FC2 */ srl $v1, $a0, 0x1f +/* C50638 80241128 00832021 */ addu $a0, $a0, $v1 +/* C5063C 8024112C 00042043 */ sra $a0, $a0, 1 +/* C50640 80241130 0C00A67F */ jal rand_int +/* C50644 80241134 24840001 */ addiu $a0, $a0, 1 +/* C50648 80241138 8E030020 */ lw $v1, 0x20($s0) +/* C5064C 8024113C C64C0038 */ lwc1 $f12, 0x38($s2) +/* C50650 80241140 000327C2 */ srl $a0, $v1, 0x1f +/* C50654 80241144 00641821 */ addu $v1, $v1, $a0 +/* C50658 80241148 00031843 */ sra $v1, $v1, 1 +/* C5065C 8024114C 00621821 */ addu $v1, $v1, $v0 +/* C50660 80241150 A643008E */ sh $v1, 0x8e($s2) +/* C50664 80241154 8E2200CC */ lw $v0, 0xcc($s1) +/* C50668 80241158 C64E0040 */ lwc1 $f14, 0x40($s2) +/* C5066C 8024115C 8C42000C */ lw $v0, 0xc($v0) +/* C50670 80241160 AE420028 */ sw $v0, 0x28($s2) +/* C50674 80241164 C6000018 */ lwc1 $f0, 0x18($s0) +/* C50678 80241168 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C5067C 8024116C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C50680 80241170 E6400018 */ swc1 $f0, 0x18($s2) +/* C50684 80241174 8C460028 */ lw $a2, 0x28($v0) +/* C50688 80241178 0C00A720 */ jal atan2 +/* C5068C 8024117C 8C470030 */ lw $a3, 0x30($v0) +/* C50690 80241180 46000506 */ mov.s $f20, $f0 +/* C50694 80241184 C64C000C */ lwc1 $f12, 0xc($s2) +/* C50698 80241188 0C00A70A */ jal get_clamped_angle_diff +/* C5069C 8024118C 4600A386 */ mov.s $f14, $f20 +/* C506A0 80241190 46000086 */ mov.s $f2, $f0 +/* C506A4 80241194 8E02001C */ lw $v0, 0x1c($s0) +/* C506A8 80241198 46001005 */ abs.s $f0, $f2 +/* C506AC 8024119C 44822000 */ mtc1 $v0, $f4 +/* C506B0 802411A0 00000000 */ nop +/* C506B4 802411A4 46802120 */ cvt.s.w $f4, $f4 +/* C506B8 802411A8 4600203C */ c.lt.s $f4, $f0 +/* C506BC 802411AC 00000000 */ nop +/* C506C0 802411B0 4500000D */ bc1f .L802411E8 +/* C506C4 802411B4 00000000 */ nop +/* C506C8 802411B8 44800000 */ mtc1 $zero, $f0 +/* C506CC 802411BC C654000C */ lwc1 $f20, 0xc($s2) +/* C506D0 802411C0 4600103C */ c.lt.s $f2, $f0 +/* C506D4 802411C4 00000000 */ nop +/* C506D8 802411C8 45000006 */ bc1f .L802411E4 +/* C506DC 802411CC 00021023 */ negu $v0, $v0 +/* C506E0 802411D0 44820000 */ mtc1 $v0, $f0 +/* C506E4 802411D4 00000000 */ nop +/* C506E8 802411D8 46800020 */ cvt.s.w $f0, $f0 +/* C506EC 802411DC 0809047A */ j .L802411E8 +/* C506F0 802411E0 4600A500 */ add.s $f20, $f20, $f0 +.L802411E4: +/* C506F4 802411E4 4604A500 */ add.s $f20, $f20, $f4 +.L802411E8: +/* C506F8 802411E8 0C00A6C9 */ jal clamp_angle +/* C506FC 802411EC 4600A306 */ mov.s $f12, $f20 +/* C50700 802411F0 2402000D */ addiu $v0, $zero, 0xd +/* C50704 802411F4 E640000C */ swc1 $f0, 0xc($s2) +/* C50708 802411F8 AE620070 */ sw $v0, 0x70($s3) +/* C5070C 802411FC 8FBF0020 */ lw $ra, 0x20($sp) +/* C50710 80241200 8FB3001C */ lw $s3, 0x1c($sp) +/* C50714 80241204 8FB20018 */ lw $s2, 0x18($sp) +/* C50718 80241208 8FB10014 */ lw $s1, 0x14($sp) +/* C5071C 8024120C 8FB00010 */ lw $s0, 0x10($sp) +/* C50720 80241210 D7B40028 */ ldc1 $f20, 0x28($sp) +/* C50724 80241214 03E00008 */ jr $ra +/* C50728 80241218 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4.s deleted file mode 100644 index b3139b2085..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A4 -/* C508B4 802413A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C508B8 802413A8 AFB10014 */ sw $s1, 0x14($sp) -/* C508BC 802413AC 0080882D */ daddu $s1, $a0, $zero -/* C508C0 802413B0 AFBF001C */ sw $ra, 0x1c($sp) -/* C508C4 802413B4 AFB20018 */ sw $s2, 0x18($sp) -/* C508C8 802413B8 AFB00010 */ sw $s0, 0x10($sp) -/* C508CC 802413BC 8E300148 */ lw $s0, 0x148($s1) -/* C508D0 802413C0 86040008 */ lh $a0, 8($s0) -/* C508D4 802413C4 0C00EABB */ jal get_npc_unsafe -/* C508D8 802413C8 00A0902D */ daddu $s2, $a1, $zero -/* C508DC 802413CC 8E0300D0 */ lw $v1, 0xd0($s0) -/* C508E0 802413D0 8E240078 */ lw $a0, 0x78($s1) -/* C508E4 802413D4 8C630000 */ lw $v1, ($v1) -/* C508E8 802413D8 0083182A */ slt $v1, $a0, $v1 -/* C508EC 802413DC 10600013 */ beqz $v1, .L8024142C -/* C508F0 802413E0 0040302D */ daddu $a2, $v0, $zero -/* C508F4 802413E4 00041040 */ sll $v0, $a0, 1 -/* C508F8 802413E8 00441021 */ addu $v0, $v0, $a0 -/* C508FC 802413EC 00022880 */ sll $a1, $v0, 2 -.L802413F0: -/* C50900 802413F0 8E0300D0 */ lw $v1, 0xd0($s0) -/* C50904 802413F4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* C50908 802413F8 00A31021 */ addu $v0, $a1, $v1 -/* C5090C 802413FC C4400008 */ lwc1 $f0, 8($v0) -/* C50910 80241400 46800020 */ cvt.s.w $f0, $f0 -/* C50914 80241404 4602003E */ c.le.s $f0, $f2 -/* C50918 80241408 00000000 */ nop -/* C5091C 8024140C 45020003 */ bc1fl .L8024141C -/* C50920 80241410 24840001 */ addiu $a0, $a0, 1 -/* C50924 80241414 0809050B */ j .L8024142C -/* C50928 80241418 AE240078 */ sw $a0, 0x78($s1) -.L8024141C: -/* C5092C 8024141C 8C620000 */ lw $v0, ($v1) -/* C50930 80241420 0082102A */ slt $v0, $a0, $v0 -/* C50934 80241424 1440FFF2 */ bnez $v0, .L802413F0 -/* C50938 80241428 24A5000C */ addiu $a1, $a1, 0xc -.L8024142C: -/* C5093C 8024142C C6400000 */ lwc1 $f0, ($s2) -/* C50940 80241430 E4C00018 */ swc1 $f0, 0x18($a2) -/* C50944 80241434 8E0200CC */ lw $v0, 0xcc($s0) -/* C50948 80241438 8C420004 */ lw $v0, 4($v0) -/* C5094C 8024143C ACC20028 */ sw $v0, 0x28($a2) -/* C50950 80241440 24020001 */ addiu $v0, $zero, 1 -/* C50954 80241444 AE200074 */ sw $zero, 0x74($s1) -/* C50958 80241448 AE220070 */ sw $v0, 0x70($s1) -/* C5095C 8024144C 8FBF001C */ lw $ra, 0x1c($sp) -/* C50960 80241450 8FB20018 */ lw $s2, 0x18($sp) -/* C50964 80241454 8FB10014 */ lw $s1, 0x14($sp) -/* C50968 80241458 8FB00010 */ lw $s0, 0x10($sp) -/* C5096C 8024145C 03E00008 */ jr $ra -/* C50970 80241460 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s new file mode 100644 index 0000000000..0a815dc43f --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_802413A4_C508B4.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413A4_C508B4 +/* C508B4 802413A4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C508B8 802413A8 AFB10014 */ sw $s1, 0x14($sp) +/* C508BC 802413AC 0080882D */ daddu $s1, $a0, $zero +/* C508C0 802413B0 AFBF001C */ sw $ra, 0x1c($sp) +/* C508C4 802413B4 AFB20018 */ sw $s2, 0x18($sp) +/* C508C8 802413B8 AFB00010 */ sw $s0, 0x10($sp) +/* C508CC 802413BC 8E300148 */ lw $s0, 0x148($s1) +/* C508D0 802413C0 86040008 */ lh $a0, 8($s0) +/* C508D4 802413C4 0C00EABB */ jal get_npc_unsafe +/* C508D8 802413C8 00A0902D */ daddu $s2, $a1, $zero +/* C508DC 802413CC 8E0300D0 */ lw $v1, 0xd0($s0) +/* C508E0 802413D0 8E240078 */ lw $a0, 0x78($s1) +/* C508E4 802413D4 8C630000 */ lw $v1, ($v1) +/* C508E8 802413D8 0083182A */ slt $v1, $a0, $v1 +/* C508EC 802413DC 10600013 */ beqz $v1, .L8024142C +/* C508F0 802413E0 0040302D */ daddu $a2, $v0, $zero +/* C508F4 802413E4 00041040 */ sll $v0, $a0, 1 +/* C508F8 802413E8 00441021 */ addu $v0, $v0, $a0 +/* C508FC 802413EC 00022880 */ sll $a1, $v0, 2 +.L802413F0: +/* C50900 802413F0 8E0300D0 */ lw $v1, 0xd0($s0) +/* C50904 802413F4 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* C50908 802413F8 00A31021 */ addu $v0, $a1, $v1 +/* C5090C 802413FC C4400008 */ lwc1 $f0, 8($v0) +/* C50910 80241400 46800020 */ cvt.s.w $f0, $f0 +/* C50914 80241404 4602003E */ c.le.s $f0, $f2 +/* C50918 80241408 00000000 */ nop +/* C5091C 8024140C 45020003 */ bc1fl .L8024141C +/* C50920 80241410 24840001 */ addiu $a0, $a0, 1 +/* C50924 80241414 0809050B */ j .L8024142C +/* C50928 80241418 AE240078 */ sw $a0, 0x78($s1) +.L8024141C: +/* C5092C 8024141C 8C620000 */ lw $v0, ($v1) +/* C50930 80241420 0082102A */ slt $v0, $a0, $v0 +/* C50934 80241424 1440FFF2 */ bnez $v0, .L802413F0 +/* C50938 80241428 24A5000C */ addiu $a1, $a1, 0xc +.L8024142C: +/* C5093C 8024142C C6400000 */ lwc1 $f0, ($s2) +/* C50940 80241430 E4C00018 */ swc1 $f0, 0x18($a2) +/* C50944 80241434 8E0200CC */ lw $v0, 0xcc($s0) +/* C50948 80241438 8C420004 */ lw $v0, 4($v0) +/* C5094C 8024143C ACC20028 */ sw $v0, 0x28($a2) +/* C50950 80241440 24020001 */ addiu $v0, $zero, 1 +/* C50954 80241444 AE200074 */ sw $zero, 0x74($s1) +/* C50958 80241448 AE220070 */ sw $v0, 0x70($s1) +/* C5095C 8024144C 8FBF001C */ lw $ra, 0x1c($sp) +/* C50960 80241450 8FB20018 */ lw $s2, 0x18($sp) +/* C50964 80241454 8FB10014 */ lw $s1, 0x14($sp) +/* C50968 80241458 8FB00010 */ lw $s0, 0x10($sp) +/* C5096C 8024145C 03E00008 */ jr $ra +/* C50970 80241460 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464.s deleted file mode 100644 index c888f9484a..0000000000 --- a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241464 -/* C50974 80241464 27BDFF98 */ addiu $sp, $sp, -0x68 -/* C50978 80241468 AFB40058 */ sw $s4, 0x58($sp) -/* C5097C 8024146C 0080A02D */ daddu $s4, $a0, $zero -/* C50980 80241470 AFBF0060 */ sw $ra, 0x60($sp) -/* C50984 80241474 AFB5005C */ sw $s5, 0x5c($sp) -/* C50988 80241478 AFB30054 */ sw $s3, 0x54($sp) -/* C5098C 8024147C AFB20050 */ sw $s2, 0x50($sp) -/* C50990 80241480 AFB1004C */ sw $s1, 0x4c($sp) -/* C50994 80241484 AFB00048 */ sw $s0, 0x48($sp) -/* C50998 80241488 8E910148 */ lw $s1, 0x148($s4) -/* C5099C 8024148C 86240008 */ lh $a0, 8($s1) -/* C509A0 80241490 0C00EABB */ jal get_npc_unsafe -/* C509A4 80241494 00A0802D */ daddu $s0, $a1, $zero -/* C509A8 80241498 8E83000C */ lw $v1, 0xc($s4) -/* C509AC 8024149C 0280202D */ daddu $a0, $s4, $zero -/* C509B0 802414A0 8C650000 */ lw $a1, ($v1) -/* C509B4 802414A4 0C0B1EAF */ jal get_variable -/* C509B8 802414A8 0040902D */ daddu $s2, $v0, $zero -/* C509BC 802414AC AFA00018 */ sw $zero, 0x18($sp) -/* C509C0 802414B0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509C4 802414B4 8C630094 */ lw $v1, 0x94($v1) -/* C509C8 802414B8 AFA3001C */ sw $v1, 0x1c($sp) -/* C509CC 802414BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509D0 802414C0 8C630080 */ lw $v1, 0x80($v1) -/* C509D4 802414C4 AFA30020 */ sw $v1, 0x20($sp) -/* C509D8 802414C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509DC 802414CC 8C630088 */ lw $v1, 0x88($v1) -/* C509E0 802414D0 AFA30024 */ sw $v1, 0x24($sp) -/* C509E4 802414D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509E8 802414D8 8C63008C */ lw $v1, 0x8c($v1) -/* C509EC 802414DC 27B50018 */ addiu $s5, $sp, 0x18 -/* C509F0 802414E0 AFA30028 */ sw $v1, 0x28($sp) -/* C509F4 802414E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C509F8 802414E8 3C014282 */ lui $at, 0x4282 -/* C509FC 802414EC 44810000 */ mtc1 $at, $f0 -/* C50A00 802414F0 8C630090 */ lw $v1, 0x90($v1) -/* C50A04 802414F4 0040982D */ daddu $s3, $v0, $zero -/* C50A08 802414F8 E7A00030 */ swc1 $f0, 0x30($sp) -/* C50A0C 802414FC A7A00034 */ sh $zero, 0x34($sp) -/* C50A10 80241500 16000005 */ bnez $s0, .L80241518 -/* C50A14 80241504 AFA3002C */ sw $v1, 0x2c($sp) -/* C50A18 80241508 8E2200B0 */ lw $v0, 0xb0($s1) -/* C50A1C 8024150C 30420004 */ andi $v0, $v0, 4 -/* C50A20 80241510 10400044 */ beqz $v0, .L80241624 -/* C50A24 80241514 00000000 */ nop -.L80241518: -/* C50A28 80241518 2404F7FF */ addiu $a0, $zero, -0x801 -/* C50A2C 8024151C AE800070 */ sw $zero, 0x70($s4) -/* C50A30 80241520 A640008E */ sh $zero, 0x8e($s2) -/* C50A34 80241524 8E2200CC */ lw $v0, 0xcc($s1) -/* C50A38 80241528 8E430000 */ lw $v1, ($s2) -/* C50A3C 8024152C 8C420000 */ lw $v0, ($v0) -/* C50A40 80241530 00641824 */ and $v1, $v1, $a0 -/* C50A44 80241534 AE430000 */ sw $v1, ($s2) -/* C50A48 80241538 AE420028 */ sw $v0, 0x28($s2) -/* C50A4C 8024153C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C50A50 80241540 8C420098 */ lw $v0, 0x98($v0) -/* C50A54 80241544 54400005 */ bnel $v0, $zero, .L8024155C -/* C50A58 80241548 2402FDFF */ addiu $v0, $zero, -0x201 -/* C50A5C 8024154C 34620200 */ ori $v0, $v1, 0x200 -/* C50A60 80241550 2403FFF7 */ addiu $v1, $zero, -9 -/* C50A64 80241554 08090559 */ j .L80241564 -/* C50A68 80241558 00431024 */ and $v0, $v0, $v1 -.L8024155C: -/* C50A6C 8024155C 00621024 */ and $v0, $v1, $v0 -/* C50A70 80241560 34420008 */ ori $v0, $v0, 8 -.L80241564: -/* C50A74 80241564 AE420000 */ sw $v0, ($s2) -/* C50A78 80241568 8E2200B0 */ lw $v0, 0xb0($s1) -/* C50A7C 8024156C 30420004 */ andi $v0, $v0, 4 -/* C50A80 80241570 10400008 */ beqz $v0, .L80241594 -/* C50A84 80241574 24020063 */ addiu $v0, $zero, 0x63 -/* C50A88 80241578 AE820070 */ sw $v0, 0x70($s4) -/* C50A8C 8024157C AE800074 */ sw $zero, 0x74($s4) -/* C50A90 80241580 8E2200B0 */ lw $v0, 0xb0($s1) -/* C50A94 80241584 2403FFFB */ addiu $v1, $zero, -5 -/* C50A98 80241588 00431024 */ and $v0, $v0, $v1 -/* C50A9C 8024158C 08090570 */ j .L802415C0 -/* C50AA0 80241590 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241594: -/* C50AA4 80241594 8E220000 */ lw $v0, ($s1) -/* C50AA8 80241598 3C034000 */ lui $v1, 0x4000 -/* C50AAC 8024159C 00431024 */ and $v0, $v0, $v1 -/* C50AB0 802415A0 10400007 */ beqz $v0, .L802415C0 -/* C50AB4 802415A4 3C03BFFF */ lui $v1, 0xbfff -/* C50AB8 802415A8 2402000C */ addiu $v0, $zero, 0xc -/* C50ABC 802415AC AE820070 */ sw $v0, 0x70($s4) -/* C50AC0 802415B0 8E220000 */ lw $v0, ($s1) -/* C50AC4 802415B4 3463FFFF */ ori $v1, $v1, 0xffff -/* C50AC8 802415B8 00431024 */ and $v0, $v0, $v1 -/* C50ACC 802415BC AE220000 */ sw $v0, ($s1) -.L802415C0: -/* C50AD0 802415C0 27A50038 */ addiu $a1, $sp, 0x38 -/* C50AD4 802415C4 27A6003C */ addiu $a2, $sp, 0x3c -/* C50AD8 802415C8 C6400038 */ lwc1 $f0, 0x38($s2) -/* C50ADC 802415CC 864200A8 */ lh $v0, 0xa8($s2) -/* C50AE0 802415D0 3C0142C8 */ lui $at, 0x42c8 -/* C50AE4 802415D4 44812000 */ mtc1 $at, $f4 -/* C50AE8 802415D8 44823000 */ mtc1 $v0, $f6 -/* C50AEC 802415DC 00000000 */ nop -/* C50AF0 802415E0 468031A0 */ cvt.s.w $f6, $f6 -/* C50AF4 802415E4 27A20044 */ addiu $v0, $sp, 0x44 -/* C50AF8 802415E8 E7A00038 */ swc1 $f0, 0x38($sp) -/* C50AFC 802415EC C640003C */ lwc1 $f0, 0x3c($s2) -/* C50B00 802415F0 C6420040 */ lwc1 $f2, 0x40($s2) -/* C50B04 802415F4 46060000 */ add.s $f0, $f0, $f6 -/* C50B08 802415F8 E7A40044 */ swc1 $f4, 0x44($sp) -/* C50B0C 802415FC E7A20040 */ swc1 $f2, 0x40($sp) -/* C50B10 80241600 E7A0003C */ swc1 $f0, 0x3c($sp) -/* C50B14 80241604 AFA20010 */ sw $v0, 0x10($sp) -/* C50B18 80241608 8E440080 */ lw $a0, 0x80($s2) -/* C50B1C 8024160C 0C0372DF */ jal func_800DCB7C -/* C50B20 80241610 27A70040 */ addiu $a3, $sp, 0x40 -/* C50B24 80241614 10400003 */ beqz $v0, .L80241624 -/* C50B28 80241618 00000000 */ nop -/* C50B2C 8024161C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* C50B30 80241620 E640003C */ swc1 $f0, 0x3c($s2) -.L80241624: -/* C50B34 80241624 8E830070 */ lw $v1, 0x70($s4) -/* C50B38 80241628 2C620064 */ sltiu $v0, $v1, 0x64 -/* C50B3C 8024162C 10400042 */ beqz $v0, .L80241738 -/* C50B40 80241630 00031080 */ sll $v0, $v1, 2 -/* C50B44 80241634 3C018024 */ lui $at, 0x8024 -/* C50B48 80241638 00220821 */ addu $at, $at, $v0 -/* C50B4C 8024163C 8C222E98 */ lw $v0, 0x2e98($at) -/* C50B50 80241640 00400008 */ jr $v0 -/* C50B54 80241644 00000000 */ nop -/* C50B58 80241648 0280202D */ daddu $a0, $s4, $zero -/* C50B5C 8024164C 0260282D */ daddu $a1, $s3, $zero -/* C50B60 80241650 0C090234 */ jal func_802408D0 -/* C50B64 80241654 02A0302D */ daddu $a2, $s5, $zero -/* C50B68 80241658 0280202D */ daddu $a0, $s4, $zero -/* C50B6C 8024165C 0260282D */ daddu $a1, $s3, $zero -/* C50B70 80241660 0C09028A */ jal func_80240A28 -/* C50B74 80241664 02A0302D */ daddu $a2, $s5, $zero -/* C50B78 80241668 080905CE */ j .L80241738 -/* C50B7C 8024166C 00000000 */ nop -/* C50B80 80241670 0280202D */ daddu $a0, $s4, $zero -/* C50B84 80241674 0260282D */ daddu $a1, $s3, $zero -/* C50B88 80241678 0C090334 */ jal func_80240CD0 -/* C50B8C 8024167C 02A0302D */ daddu $a2, $s5, $zero -/* C50B90 80241680 0280202D */ daddu $a0, $s4, $zero -/* C50B94 80241684 0260282D */ daddu $a1, $s3, $zero -/* C50B98 80241688 0C090364 */ jal func_80240D90 -/* C50B9C 8024168C 02A0302D */ daddu $a2, $s5, $zero -/* C50BA0 80241690 080905CE */ j .L80241738 -/* C50BA4 80241694 00000000 */ nop -/* C50BA8 80241698 0280202D */ daddu $a0, $s4, $zero -/* C50BAC 8024169C 0260282D */ daddu $a1, $s3, $zero -/* C50BB0 802416A0 0C0903D3 */ jal func_80240F4C -/* C50BB4 802416A4 02A0302D */ daddu $a2, $s5, $zero -/* C50BB8 802416A8 080905CE */ j .L80241738 -/* C50BBC 802416AC 00000000 */ nop -/* C50BC0 802416B0 0280202D */ daddu $a0, $s4, $zero -/* C50BC4 802416B4 0260282D */ daddu $a1, $s3, $zero -/* C50BC8 802416B8 0C090400 */ jal func_80241000 -/* C50BCC 802416BC 02A0302D */ daddu $a2, $s5, $zero -/* C50BD0 802416C0 0280202D */ daddu $a0, $s4, $zero -/* C50BD4 802416C4 0260282D */ daddu $a1, $s3, $zero -/* C50BD8 802416C8 0C09041D */ jal func_80241074 -/* C50BDC 802416CC 02A0302D */ daddu $a2, $s5, $zero -/* C50BE0 802416D0 080905CE */ j .L80241738 -/* C50BE4 802416D4 00000000 */ nop -/* C50BE8 802416D8 0280202D */ daddu $a0, $s4, $zero -/* C50BEC 802416DC 0260282D */ daddu $a1, $s3, $zero -/* C50BF0 802416E0 0C09043B */ jal func_802410EC -/* C50BF4 802416E4 02A0302D */ daddu $a2, $s5, $zero -/* C50BF8 802416E8 0280202D */ daddu $a0, $s4, $zero -/* C50BFC 802416EC 0260282D */ daddu $a1, $s3, $zero -/* C50C00 802416F0 0C090487 */ jal func_8024121C -/* C50C04 802416F4 02A0302D */ daddu $a2, $s5, $zero -/* C50C08 802416F8 080905CE */ j .L80241738 -/* C50C0C 802416FC 00000000 */ nop -/* C50C10 80241700 0280202D */ daddu $a0, $s4, $zero -/* C50C14 80241704 0260282D */ daddu $a1, $s3, $zero -/* C50C18 80241708 0C0904CF */ jal func_8024133C -/* C50C1C 8024170C 02A0302D */ daddu $a2, $s5, $zero -/* C50C20 80241710 080905CE */ j .L80241738 -/* C50C24 80241714 00000000 */ nop -/* C50C28 80241718 0280202D */ daddu $a0, $s4, $zero -/* C50C2C 8024171C 0260282D */ daddu $a1, $s3, $zero -/* C50C30 80241720 0C0904E9 */ jal func_802413A4 -/* C50C34 80241724 02A0302D */ daddu $a2, $s5, $zero -/* C50C38 80241728 080905CE */ j .L80241738 -/* C50C3C 8024172C 00000000 */ nop -/* C50C40 80241730 0C0129CF */ jal func_8004A73C -/* C50C44 80241734 0280202D */ daddu $a0, $s4, $zero -.L80241738: -/* C50C48 80241738 8FBF0060 */ lw $ra, 0x60($sp) -/* C50C4C 8024173C 8FB5005C */ lw $s5, 0x5c($sp) -/* C50C50 80241740 8FB40058 */ lw $s4, 0x58($sp) -/* C50C54 80241744 8FB30054 */ lw $s3, 0x54($sp) -/* C50C58 80241748 8FB20050 */ lw $s2, 0x50($sp) -/* C50C5C 8024174C 8FB1004C */ lw $s1, 0x4c($sp) -/* C50C60 80241750 8FB00048 */ lw $s0, 0x48($sp) -/* C50C64 80241754 0000102D */ daddu $v0, $zero, $zero -/* C50C68 80241758 03E00008 */ jr $ra -/* C50C6C 8024175C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s new file mode 100644 index 0000000000..c7b6f690be --- /dev/null +++ b/asm/nonmatchings/world/area_dgb/dgb_15/C4F510/func_80241464_C50974.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241464_C50974 +/* C50974 80241464 27BDFF98 */ addiu $sp, $sp, -0x68 +/* C50978 80241468 AFB40058 */ sw $s4, 0x58($sp) +/* C5097C 8024146C 0080A02D */ daddu $s4, $a0, $zero +/* C50980 80241470 AFBF0060 */ sw $ra, 0x60($sp) +/* C50984 80241474 AFB5005C */ sw $s5, 0x5c($sp) +/* C50988 80241478 AFB30054 */ sw $s3, 0x54($sp) +/* C5098C 8024147C AFB20050 */ sw $s2, 0x50($sp) +/* C50990 80241480 AFB1004C */ sw $s1, 0x4c($sp) +/* C50994 80241484 AFB00048 */ sw $s0, 0x48($sp) +/* C50998 80241488 8E910148 */ lw $s1, 0x148($s4) +/* C5099C 8024148C 86240008 */ lh $a0, 8($s1) +/* C509A0 80241490 0C00EABB */ jal get_npc_unsafe +/* C509A4 80241494 00A0802D */ daddu $s0, $a1, $zero +/* C509A8 80241498 8E83000C */ lw $v1, 0xc($s4) +/* C509AC 8024149C 0280202D */ daddu $a0, $s4, $zero +/* C509B0 802414A0 8C650000 */ lw $a1, ($v1) +/* C509B4 802414A4 0C0B1EAF */ jal get_variable +/* C509B8 802414A8 0040902D */ daddu $s2, $v0, $zero +/* C509BC 802414AC AFA00018 */ sw $zero, 0x18($sp) +/* C509C0 802414B0 8E2300D0 */ lw $v1, 0xd0($s1) +/* C509C4 802414B4 8C630094 */ lw $v1, 0x94($v1) +/* C509C8 802414B8 AFA3001C */ sw $v1, 0x1c($sp) +/* C509CC 802414BC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C509D0 802414C0 8C630080 */ lw $v1, 0x80($v1) +/* C509D4 802414C4 AFA30020 */ sw $v1, 0x20($sp) +/* C509D8 802414C8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C509DC 802414CC 8C630088 */ lw $v1, 0x88($v1) +/* C509E0 802414D0 AFA30024 */ sw $v1, 0x24($sp) +/* C509E4 802414D4 8E2300D0 */ lw $v1, 0xd0($s1) +/* C509E8 802414D8 8C63008C */ lw $v1, 0x8c($v1) +/* C509EC 802414DC 27B50018 */ addiu $s5, $sp, 0x18 +/* C509F0 802414E0 AFA30028 */ sw $v1, 0x28($sp) +/* C509F4 802414E4 8E2300D0 */ lw $v1, 0xd0($s1) +/* C509F8 802414E8 3C014282 */ lui $at, 0x4282 +/* C509FC 802414EC 44810000 */ mtc1 $at, $f0 +/* C50A00 802414F0 8C630090 */ lw $v1, 0x90($v1) +/* C50A04 802414F4 0040982D */ daddu $s3, $v0, $zero +/* C50A08 802414F8 E7A00030 */ swc1 $f0, 0x30($sp) +/* C50A0C 802414FC A7A00034 */ sh $zero, 0x34($sp) +/* C50A10 80241500 16000005 */ bnez $s0, .L80241518 +/* C50A14 80241504 AFA3002C */ sw $v1, 0x2c($sp) +/* C50A18 80241508 8E2200B0 */ lw $v0, 0xb0($s1) +/* C50A1C 8024150C 30420004 */ andi $v0, $v0, 4 +/* C50A20 80241510 10400044 */ beqz $v0, .L80241624 +/* C50A24 80241514 00000000 */ nop +.L80241518: +/* C50A28 80241518 2404F7FF */ addiu $a0, $zero, -0x801 +/* C50A2C 8024151C AE800070 */ sw $zero, 0x70($s4) +/* C50A30 80241520 A640008E */ sh $zero, 0x8e($s2) +/* C50A34 80241524 8E2200CC */ lw $v0, 0xcc($s1) +/* C50A38 80241528 8E430000 */ lw $v1, ($s2) +/* C50A3C 8024152C 8C420000 */ lw $v0, ($v0) +/* C50A40 80241530 00641824 */ and $v1, $v1, $a0 +/* C50A44 80241534 AE430000 */ sw $v1, ($s2) +/* C50A48 80241538 AE420028 */ sw $v0, 0x28($s2) +/* C50A4C 8024153C 8E2200D0 */ lw $v0, 0xd0($s1) +/* C50A50 80241540 8C420098 */ lw $v0, 0x98($v0) +/* C50A54 80241544 54400005 */ bnel $v0, $zero, .L8024155C +/* C50A58 80241548 2402FDFF */ addiu $v0, $zero, -0x201 +/* C50A5C 8024154C 34620200 */ ori $v0, $v1, 0x200 +/* C50A60 80241550 2403FFF7 */ addiu $v1, $zero, -9 +/* C50A64 80241554 08090559 */ j .L80241564 +/* C50A68 80241558 00431024 */ and $v0, $v0, $v1 +.L8024155C: +/* C50A6C 8024155C 00621024 */ and $v0, $v1, $v0 +/* C50A70 80241560 34420008 */ ori $v0, $v0, 8 +.L80241564: +/* C50A74 80241564 AE420000 */ sw $v0, ($s2) +/* C50A78 80241568 8E2200B0 */ lw $v0, 0xb0($s1) +/* C50A7C 8024156C 30420004 */ andi $v0, $v0, 4 +/* C50A80 80241570 10400008 */ beqz $v0, .L80241594 +/* C50A84 80241574 24020063 */ addiu $v0, $zero, 0x63 +/* C50A88 80241578 AE820070 */ sw $v0, 0x70($s4) +/* C50A8C 8024157C AE800074 */ sw $zero, 0x74($s4) +/* C50A90 80241580 8E2200B0 */ lw $v0, 0xb0($s1) +/* C50A94 80241584 2403FFFB */ addiu $v1, $zero, -5 +/* C50A98 80241588 00431024 */ and $v0, $v0, $v1 +/* C50A9C 8024158C 08090570 */ j .L802415C0 +/* C50AA0 80241590 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241594: +/* C50AA4 80241594 8E220000 */ lw $v0, ($s1) +/* C50AA8 80241598 3C034000 */ lui $v1, 0x4000 +/* C50AAC 8024159C 00431024 */ and $v0, $v0, $v1 +/* C50AB0 802415A0 10400007 */ beqz $v0, .L802415C0 +/* C50AB4 802415A4 3C03BFFF */ lui $v1, 0xbfff +/* C50AB8 802415A8 2402000C */ addiu $v0, $zero, 0xc +/* C50ABC 802415AC AE820070 */ sw $v0, 0x70($s4) +/* C50AC0 802415B0 8E220000 */ lw $v0, ($s1) +/* C50AC4 802415B4 3463FFFF */ ori $v1, $v1, 0xffff +/* C50AC8 802415B8 00431024 */ and $v0, $v0, $v1 +/* C50ACC 802415BC AE220000 */ sw $v0, ($s1) +.L802415C0: +/* C50AD0 802415C0 27A50038 */ addiu $a1, $sp, 0x38 +/* C50AD4 802415C4 27A6003C */ addiu $a2, $sp, 0x3c +/* C50AD8 802415C8 C6400038 */ lwc1 $f0, 0x38($s2) +/* C50ADC 802415CC 864200A8 */ lh $v0, 0xa8($s2) +/* C50AE0 802415D0 3C0142C8 */ lui $at, 0x42c8 +/* C50AE4 802415D4 44812000 */ mtc1 $at, $f4 +/* C50AE8 802415D8 44823000 */ mtc1 $v0, $f6 +/* C50AEC 802415DC 00000000 */ nop +/* C50AF0 802415E0 468031A0 */ cvt.s.w $f6, $f6 +/* C50AF4 802415E4 27A20044 */ addiu $v0, $sp, 0x44 +/* C50AF8 802415E8 E7A00038 */ swc1 $f0, 0x38($sp) +/* C50AFC 802415EC C640003C */ lwc1 $f0, 0x3c($s2) +/* C50B00 802415F0 C6420040 */ lwc1 $f2, 0x40($s2) +/* C50B04 802415F4 46060000 */ add.s $f0, $f0, $f6 +/* C50B08 802415F8 E7A40044 */ swc1 $f4, 0x44($sp) +/* C50B0C 802415FC E7A20040 */ swc1 $f2, 0x40($sp) +/* C50B10 80241600 E7A0003C */ swc1 $f0, 0x3c($sp) +/* C50B14 80241604 AFA20010 */ sw $v0, 0x10($sp) +/* C50B18 80241608 8E440080 */ lw $a0, 0x80($s2) +/* C50B1C 8024160C 0C0372DF */ jal func_800DCB7C +/* C50B20 80241610 27A70040 */ addiu $a3, $sp, 0x40 +/* C50B24 80241614 10400003 */ beqz $v0, .L80241624 +/* C50B28 80241618 00000000 */ nop +/* C50B2C 8024161C C7A0003C */ lwc1 $f0, 0x3c($sp) +/* C50B30 80241620 E640003C */ swc1 $f0, 0x3c($s2) +.L80241624: +/* C50B34 80241624 8E830070 */ lw $v1, 0x70($s4) +/* C50B38 80241628 2C620064 */ sltiu $v0, $v1, 0x64 +/* C50B3C 8024162C 10400042 */ beqz $v0, .L80241738 +/* C50B40 80241630 00031080 */ sll $v0, $v1, 2 +/* C50B44 80241634 3C018024 */ lui $at, 0x8024 +/* C50B48 80241638 00220821 */ addu $at, $at, $v0 +/* C50B4C 8024163C 8C222E98 */ lw $v0, 0x2e98($at) +/* C50B50 80241640 00400008 */ jr $v0 +/* C50B54 80241644 00000000 */ nop +/* C50B58 80241648 0280202D */ daddu $a0, $s4, $zero +/* C50B5C 8024164C 0260282D */ daddu $a1, $s3, $zero +/* C50B60 80241650 0C090234 */ jal func_802408D0_C4FDE0 +/* C50B64 80241654 02A0302D */ daddu $a2, $s5, $zero +/* C50B68 80241658 0280202D */ daddu $a0, $s4, $zero +/* C50B6C 8024165C 0260282D */ daddu $a1, $s3, $zero +/* C50B70 80241660 0C09028A */ jal func_80240A28_C4FF38 +/* C50B74 80241664 02A0302D */ daddu $a2, $s5, $zero +/* C50B78 80241668 080905CE */ j .L80241738 +/* C50B7C 8024166C 00000000 */ nop +/* C50B80 80241670 0280202D */ daddu $a0, $s4, $zero +/* C50B84 80241674 0260282D */ daddu $a1, $s3, $zero +/* C50B88 80241678 0C090334 */ jal func_80240CD0_C501E0 +/* C50B8C 8024167C 02A0302D */ daddu $a2, $s5, $zero +/* C50B90 80241680 0280202D */ daddu $a0, $s4, $zero +/* C50B94 80241684 0260282D */ daddu $a1, $s3, $zero +/* C50B98 80241688 0C090364 */ jal func_80240D90_C502A0 +/* C50B9C 8024168C 02A0302D */ daddu $a2, $s5, $zero +/* C50BA0 80241690 080905CE */ j .L80241738 +/* C50BA4 80241694 00000000 */ nop +/* C50BA8 80241698 0280202D */ daddu $a0, $s4, $zero +/* C50BAC 8024169C 0260282D */ daddu $a1, $s3, $zero +/* C50BB0 802416A0 0C0903D3 */ jal func_80240F4C_C5045C +/* C50BB4 802416A4 02A0302D */ daddu $a2, $s5, $zero +/* C50BB8 802416A8 080905CE */ j .L80241738 +/* C50BBC 802416AC 00000000 */ nop +/* C50BC0 802416B0 0280202D */ daddu $a0, $s4, $zero +/* C50BC4 802416B4 0260282D */ daddu $a1, $s3, $zero +/* C50BC8 802416B8 0C090400 */ jal func_80241000_C50510 +/* C50BCC 802416BC 02A0302D */ daddu $a2, $s5, $zero +/* C50BD0 802416C0 0280202D */ daddu $a0, $s4, $zero +/* C50BD4 802416C4 0260282D */ daddu $a1, $s3, $zero +/* C50BD8 802416C8 0C09041D */ jal func_80241074_C50584 +/* C50BDC 802416CC 02A0302D */ daddu $a2, $s5, $zero +/* C50BE0 802416D0 080905CE */ j .L80241738 +/* C50BE4 802416D4 00000000 */ nop +/* C50BE8 802416D8 0280202D */ daddu $a0, $s4, $zero +/* C50BEC 802416DC 0260282D */ daddu $a1, $s3, $zero +/* C50BF0 802416E0 0C09043B */ jal func_802410EC_C505FC +/* C50BF4 802416E4 02A0302D */ daddu $a2, $s5, $zero +/* C50BF8 802416E8 0280202D */ daddu $a0, $s4, $zero +/* C50BFC 802416EC 0260282D */ daddu $a1, $s3, $zero +/* C50C00 802416F0 0C090487 */ jal func_8024121C_C5072C +/* C50C04 802416F4 02A0302D */ daddu $a2, $s5, $zero +/* C50C08 802416F8 080905CE */ j .L80241738 +/* C50C0C 802416FC 00000000 */ nop +/* C50C10 80241700 0280202D */ daddu $a0, $s4, $zero +/* C50C14 80241704 0260282D */ daddu $a1, $s3, $zero +/* C50C18 80241708 0C0904CF */ jal func_8024133C_C5084C +/* C50C1C 8024170C 02A0302D */ daddu $a2, $s5, $zero +/* C50C20 80241710 080905CE */ j .L80241738 +/* C50C24 80241714 00000000 */ nop +/* C50C28 80241718 0280202D */ daddu $a0, $s4, $zero +/* C50C2C 8024171C 0260282D */ daddu $a1, $s3, $zero +/* C50C30 80241720 0C0904E9 */ jal func_802413A4_C508B4 +/* C50C34 80241724 02A0302D */ daddu $a2, $s5, $zero +/* C50C38 80241728 080905CE */ j .L80241738 +/* C50C3C 8024172C 00000000 */ nop +/* C50C40 80241730 0C0129CF */ jal func_8004A73C +/* C50C44 80241734 0280202D */ daddu $a0, $s4, $zero +.L80241738: +/* C50C48 80241738 8FBF0060 */ lw $ra, 0x60($sp) +/* C50C4C 8024173C 8FB5005C */ lw $s5, 0x5c($sp) +/* C50C50 80241740 8FB40058 */ lw $s4, 0x58($sp) +/* C50C54 80241744 8FB30054 */ lw $s3, 0x54($sp) +/* C50C58 80241748 8FB20050 */ lw $s2, 0x50($sp) +/* C50C5C 8024174C 8FB1004C */ lw $s1, 0x4c($sp) +/* C50C60 80241750 8FB00048 */ lw $s0, 0x48($sp) +/* C50C64 80241754 0000102D */ daddu $v0, $zero, $zero +/* C50C68 80241758 03E00008 */ jr $ra +/* C50C6C 8024175C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s index f93f0e1f82..aa30c8fc83 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80240E20_C53360.s @@ -98,7 +98,7 @@ glabel func_80240E20_C53360 /* C534C0 80240F80 8E22006C */ lw $v0, 0x6c($s1) /* C534C4 80240F84 14400006 */ bnez $v0, .L80240FA0 /* C534C8 80240F88 00000000 */ nop -/* C534CC 80240F8C 0C090082 */ jal func_80240208 +/* C534CC 80240F8C 0C090082 */ jal func_80240208_C52748 /* C534D0 80240F90 0240202D */ daddu $a0, $s2, $zero /* C534D4 80240F94 10400002 */ beqz $v0, .L80240FA0 /* C534D8 80240F98 2402001E */ addiu $v0, $zero, 0x1e @@ -115,31 +115,31 @@ glabel func_80240E20_C53360 /* C53500 80240FC0 00000000 */ nop /* C53504 80240FC4 0240202D */ daddu $a0, $s2, $zero /* C53508 80240FC8 0260282D */ daddu $a1, $s3, $zero -/* C5350C 80240FCC 0C090187 */ jal func_8024061C +/* C5350C 80240FCC 0C090187 */ jal func_8024061C_C52B5C /* C53510 80240FD0 02A0302D */ daddu $a2, $s5, $zero /* C53514 80240FD4 08090452 */ j .L80241148 /* C53518 80240FD8 00000000 */ nop /* C5351C 80240FDC 0240202D */ daddu $a0, $s2, $zero /* C53520 80240FE0 0260282D */ daddu $a1, $s3, $zero -/* C53524 80240FE4 0C0901A9 */ jal func_802406A4 +/* C53524 80240FE4 0C0901A9 */ jal func_802406A4_C52BE4 /* C53528 80240FE8 02A0302D */ daddu $a2, $s5, $zero /* C5352C 80240FEC 08090452 */ j .L80241148 /* C53530 80240FF0 00000000 */ nop /* C53534 80240FF4 0240202D */ daddu $a0, $s2, $zero /* C53538 80240FF8 0260282D */ daddu $a1, $s3, $zero -/* C5353C 80240FFC 0C090257 */ jal func_8024095C +/* C5353C 80240FFC 0C090257 */ jal func_8024095C_C52E9C /* C53540 80241000 02A0302D */ daddu $a2, $s5, $zero /* C53544 80241004 08090452 */ j .L80241148 /* C53548 80241008 00000000 */ nop /* C5354C 8024100C 0240202D */ daddu $a0, $s2, $zero /* C53550 80241010 0260282D */ daddu $a1, $s3, $zero -/* C53554 80241014 0C090270 */ jal func_802409C0 +/* C53554 80241014 0C090270 */ jal func_802409C0_C52F00 /* C53558 80241018 02A0302D */ daddu $a2, $s5, $zero /* C5355C 8024101C 08090452 */ j .L80241148 /* C53560 80241020 00000000 */ nop /* C53564 80241024 0240202D */ daddu $a0, $s2, $zero /* C53568 80241028 0260282D */ daddu $a1, $s3, $zero -/* C5356C 8024102C 0C09029A */ jal func_80240A68 +/* C5356C 8024102C 0C09029A */ jal func_80240A68_C52FA8 /* C53570 80241030 02A0302D */ daddu $a2, $s5, $zero /* C53574 80241034 08090452 */ j .L80241148 /* C53578 80241038 00000000 */ nop @@ -168,19 +168,19 @@ glabel func_80240E20_C53360 /* C535D4 80241094 24020003 */ addiu $v0, $zero, 3 /* C535D8 80241098 08090452 */ j .L80241148 /* C535DC 8024109C AE420070 */ sw $v0, 0x70($s2) -/* C535E0 802410A0 0C090000 */ jal func_80240000 +/* C535E0 802410A0 0C090000 */ jal func_80240000_C52540 /* C535E4 802410A4 0240202D */ daddu $a0, $s2, $zero /* C535E8 802410A8 8E430070 */ lw $v1, 0x70($s2) /* C535EC 802410AC 2402001F */ addiu $v0, $zero, 0x1f /* C535F0 802410B0 14620025 */ bne $v1, $v0, .L80241148 /* C535F4 802410B4 00000000 */ nop -/* C535F8 802410B8 0C09001B */ jal func_8024006C +/* C535F8 802410B8 0C09001B */ jal func_8024006C_C525AC /* C535FC 802410BC 0240202D */ daddu $a0, $s2, $zero /* C53600 802410C0 8E430070 */ lw $v1, 0x70($s2) /* C53604 802410C4 24020020 */ addiu $v0, $zero, 0x20 /* C53608 802410C8 1462001F */ bne $v1, $v0, .L80241148 /* C5360C 802410CC 00000000 */ nop -/* C53610 802410D0 0C090037 */ jal func_802400DC +/* C53610 802410D0 0C090037 */ jal func_802400DC_C5261C /* C53614 802410D4 0240202D */ daddu $a0, $s2, $zero /* C53618 802410D8 08090452 */ j .L80241148 /* C5361C 802410DC 00000000 */ nop @@ -190,7 +190,7 @@ glabel func_80240E20_C53360 /* C5362C 802410EC 00000000 */ nop /* C53630 802410F0 0240202D */ daddu $a0, $s2, $zero /* C53634 802410F4 0260282D */ daddu $a1, $s3, $zero -/* C53638 802410F8 0C0902E8 */ jal func_80240BA0 +/* C53638 802410F8 0C0902E8 */ jal func_80240BA0_C530E0 /* C5363C 802410FC 02A0302D */ daddu $a2, $s5, $zero /* C53640 80241100 8E430070 */ lw $v1, 0x70($s2) /* C53644 80241104 24020029 */ addiu $v0, $zero, 0x29 @@ -198,13 +198,13 @@ glabel func_80240E20_C53360 /* C5364C 8024110C 00000000 */ nop /* C53650 80241110 0240202D */ daddu $a0, $s2, $zero /* C53654 80241114 0260282D */ daddu $a1, $s3, $zero -/* C53658 80241118 0C090313 */ jal func_80240C4C +/* C53658 80241118 0C090313 */ jal func_80240C4C_C5318C /* C5365C 8024111C 02A0302D */ daddu $a2, $s5, $zero /* C53660 80241120 08090452 */ j .L80241148 /* C53664 80241124 00000000 */ nop /* C53668 80241128 0240202D */ daddu $a0, $s2, $zero /* C5366C 8024112C 0260282D */ daddu $a1, $s3, $zero -/* C53670 80241130 0C090371 */ jal func_80240DC4 +/* C53670 80241130 0C090371 */ jal func_80240DC4_C53304 /* C53674 80241134 02A0302D */ daddu $a2, $s5, $zero /* C53678 80241138 08090452 */ j .L80241148 /* C5367C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s index 3f17a85492..84cf07b92c 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s +++ b/asm/nonmatchings/world/area_dgb/dgb_16/C52540/func_80241170_C536B0.s @@ -90,7 +90,7 @@ glabel func_80241170_C536B0 /* C537F0 802412B0 8E22006C */ lw $v0, 0x6c($s1) /* C537F4 802412B4 14400006 */ bnez $v0, .L802412D0 /* C537F8 802412B8 00000000 */ nop -/* C537FC 802412BC 0C090082 */ jal func_80240208 +/* C537FC 802412BC 0C090082 */ jal func_80240208_C52748 /* C53800 802412C0 0240202D */ daddu $a0, $s2, $zero /* C53804 802412C4 10400002 */ beqz $v0, .L802412D0 /* C53808 802412C8 2402001E */ addiu $v0, $zero, 0x1e @@ -151,15 +151,15 @@ glabel func_80241170_C536B0 /* C538E0 802413A0 0280302D */ daddu $a2, $s4, $zero /* C538E4 802413A4 080904FF */ j .L802413FC /* C538E8 802413A8 00000000 */ nop -/* C538EC 802413AC 0C090000 */ jal func_80240000 +/* C538EC 802413AC 0C090000 */ jal func_80240000_C52540 /* C538F0 802413B0 0240202D */ daddu $a0, $s2, $zero -/* C538F4 802413B4 0C09001B */ jal func_8024006C +/* C538F4 802413B4 0C09001B */ jal func_8024006C_C525AC /* C538F8 802413B8 0240202D */ daddu $a0, $s2, $zero /* C538FC 802413BC 8E430070 */ lw $v1, 0x70($s2) /* C53900 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* C53904 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* C53908 802413C8 00000000 */ nop -/* C5390C 802413CC 0C090037 */ jal func_802400DC +/* C5390C 802413CC 0C090037 */ jal func_802400DC_C5261C /* C53910 802413D0 0240202D */ daddu $a0, $s2, $zero /* C53914 802413D4 8E430070 */ lw $v1, 0x70($s2) /* C53918 802413D8 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s index a7364d65a0..87234dd084 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s +++ b/asm/nonmatchings/world/area_dgb/dgb_18/C55F40/func_80240B94_C56AD4.s @@ -131,7 +131,7 @@ glabel func_80240B94_C56AD4 /* C56CB4 80240D74 00000000 */ nop /* C56CB8 80240D78 0280202D */ daddu $a0, $s4, $zero /* C56CBC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* C56CC0 80240D80 0C090000 */ jal func_80240000 +/* C56CC0 80240D80 0C090000 */ jal func_80240000_C55F40 /* C56CC4 80240D84 02A0302D */ daddu $a2, $s5, $zero /* C56CC8 80240D88 0280202D */ daddu $a0, $s4, $zero /* C56CCC 80240D8C 0260282D */ daddu $a1, $s3, $zero @@ -141,27 +141,27 @@ glabel func_80240B94_C56AD4 /* C56CDC 80240D9C 00000000 */ nop /* C56CE0 80240DA0 0280202D */ daddu $a0, $s4, $zero /* C56CE4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* C56CE8 80240DA8 0C090100 */ jal func_80240400 +/* C56CE8 80240DA8 0C090100 */ jal func_80240400_C56340 /* C56CEC 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* C56CF0 80240DB0 0280202D */ daddu $a0, $s4, $zero /* C56CF4 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* C56CF8 80240DB8 0C090130 */ jal func_802404C0 +/* C56CF8 80240DB8 0C090130 */ jal func_802404C0_C56400 /* C56CFC 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* C56D00 80240DC0 0809039A */ j .L80240E68 /* C56D04 80240DC4 00000000 */ nop /* C56D08 80240DC8 0280202D */ daddu $a0, $s4, $zero /* C56D0C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* C56D10 80240DD0 0C09019F */ jal func_8024067C +/* C56D10 80240DD0 0C09019F */ jal func_8024067C_C565BC /* C56D14 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* C56D18 80240DD8 0809039A */ j .L80240E68 /* C56D1C 80240DDC 00000000 */ nop /* C56D20 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C56D24 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C56D28 80240DE8 0C0901CC */ jal func_80240730 +/* C56D28 80240DE8 0C0901CC */ jal func_80240730_C56670 /* C56D2C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C56D30 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C56D34 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C56D38 80240DF8 0C0901E9 */ jal func_802407A4 +/* C56D38 80240DF8 0C0901E9 */ jal func_802407A4_C566E4 /* C56D3C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C56D40 80240E00 0809039A */ j .L80240E68 /* C56D44 80240E04 00000000 */ nop @@ -171,19 +171,19 @@ glabel func_80240B94_C56AD4 /* C56D54 80240E14 02A0302D */ daddu $a2, $s5, $zero /* C56D58 80240E18 0280202D */ daddu $a0, $s4, $zero /* C56D5C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* C56D60 80240E20 0C090253 */ jal func_8024094C +/* C56D60 80240E20 0C090253 */ jal func_8024094C_C5688C /* C56D64 80240E24 02A0302D */ daddu $a2, $s5, $zero /* C56D68 80240E28 0809039A */ j .L80240E68 /* C56D6C 80240E2C 00000000 */ nop /* C56D70 80240E30 0280202D */ daddu $a0, $s4, $zero /* C56D74 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C56D78 80240E38 0C09029B */ jal func_80240A6C +/* C56D78 80240E38 0C09029B */ jal func_80240A6C_C569AC /* C56D7C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C56D80 80240E40 0809039A */ j .L80240E68 /* C56D84 80240E44 00000000 */ nop /* C56D88 80240E48 0280202D */ daddu $a0, $s4, $zero /* C56D8C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* C56D90 80240E50 0C0902B5 */ jal func_80240AD4 +/* C56D90 80240E50 0C0902B5 */ jal func_80240AD4_C56A14 /* C56D94 80240E54 02A0302D */ daddu $a2, $s5, $zero /* C56D98 80240E58 0809039A */ j .L80240E68 /* C56D9C 80240E5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0.s deleted file mode 100644 index 5a5fccbbe2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E0 -/* 95B7E0 802405E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95B7E4 802405E4 AFB50024 */ sw $s5, 0x24($sp) -/* 95B7E8 802405E8 0080A82D */ daddu $s5, $a0, $zero -/* 95B7EC 802405EC AFBF002C */ sw $ra, 0x2c($sp) -/* 95B7F0 802405F0 AFB60028 */ sw $s6, 0x28($sp) -/* 95B7F4 802405F4 AFB40020 */ sw $s4, 0x20($sp) -/* 95B7F8 802405F8 AFB3001C */ sw $s3, 0x1c($sp) -/* 95B7FC 802405FC AFB20018 */ sw $s2, 0x18($sp) -/* 95B800 80240600 AFB10014 */ sw $s1, 0x14($sp) -/* 95B804 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* 95B808 80240608 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 95B80C 8024060C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 95B810 80240610 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 95B814 80240614 8EB30148 */ lw $s3, 0x148($s5) -/* 95B818 80240618 86640008 */ lh $a0, 8($s3) -/* 95B81C 8024061C 0C00EABB */ jal get_npc_unsafe -/* 95B820 80240620 00A0B02D */ daddu $s6, $a1, $zero -/* 95B824 80240624 0040A02D */ daddu $s4, $v0, $zero -/* 95B828 80240628 AEA00074 */ sw $zero, 0x74($s5) -/* 95B82C 8024062C C6980038 */ lwc1 $f24, 0x38($s4) -/* 95B830 80240630 C6960040 */ lwc1 $f22, 0x40($s4) -/* 95B834 80240634 0000902D */ daddu $s2, $zero, $zero -/* 95B838 80240638 AEA00078 */ sw $zero, 0x78($s5) -/* 95B83C 8024063C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 95B840 80240640 8C620000 */ lw $v0, ($v1) -/* 95B844 80240644 3C0146FF */ lui $at, 0x46ff -/* 95B848 80240648 3421FE00 */ ori $at, $at, 0xfe00 -/* 95B84C 8024064C 4481A000 */ mtc1 $at, $f20 -/* 95B850 80240650 18400018 */ blez $v0, .L802406B4 -/* 95B854 80240654 0240802D */ daddu $s0, $s2, $zero -/* 95B858 80240658 0240882D */ daddu $s1, $s2, $zero -.L8024065C: -/* 95B85C 8024065C 02231021 */ addu $v0, $s1, $v1 -/* 95B860 80240660 4600C306 */ mov.s $f12, $f24 -/* 95B864 80240664 C4440004 */ lwc1 $f4, 4($v0) -/* 95B868 80240668 46802120 */ cvt.s.w $f4, $f4 -/* 95B86C 8024066C 44062000 */ mfc1 $a2, $f4 -/* 95B870 80240670 C444000C */ lwc1 $f4, 0xc($v0) -/* 95B874 80240674 46802120 */ cvt.s.w $f4, $f4 -/* 95B878 80240678 44072000 */ mfc1 $a3, $f4 -/* 95B87C 8024067C 0C00A7B5 */ jal dist2D -/* 95B880 80240680 4600B386 */ mov.s $f14, $f22 -/* 95B884 80240684 4614003C */ c.lt.s $f0, $f20 -/* 95B888 80240688 00000000 */ nop -/* 95B88C 8024068C 45000003 */ bc1f .L8024069C -/* 95B890 80240690 2631000C */ addiu $s1, $s1, 0xc -/* 95B894 80240694 46000506 */ mov.s $f20, $f0 -/* 95B898 80240698 AEB20078 */ sw $s2, 0x78($s5) -.L8024069C: -/* 95B89C 8024069C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 95B8A0 802406A0 26100001 */ addiu $s0, $s0, 1 -/* 95B8A4 802406A4 8C620000 */ lw $v0, ($v1) -/* 95B8A8 802406A8 0202102A */ slt $v0, $s0, $v0 -/* 95B8AC 802406AC 1440FFEB */ bnez $v0, .L8024065C -/* 95B8B0 802406B0 26520001 */ addiu $s2, $s2, 1 -.L802406B4: -/* 95B8B4 802406B4 8E6200CC */ lw $v0, 0xcc($s3) -/* 95B8B8 802406B8 8C420004 */ lw $v0, 4($v0) -/* 95B8BC 802406BC AE820028 */ sw $v0, 0x28($s4) -/* 95B8C0 802406C0 8E6200D0 */ lw $v0, 0xd0($s3) -/* 95B8C4 802406C4 8C42007C */ lw $v0, 0x7c($v0) -/* 95B8C8 802406C8 04410004 */ bgez $v0, .L802406DC -/* 95B8CC 802406CC 00000000 */ nop -/* 95B8D0 802406D0 C6C00000 */ lwc1 $f0, ($s6) -/* 95B8D4 802406D4 080901BF */ j .L802406FC -/* 95B8D8 802406D8 E6800018 */ swc1 $f0, 0x18($s4) -.L802406DC: -/* 95B8DC 802406DC 3C018025 */ lui $at, 0x8025 -/* 95B8E0 802406E0 D422DDE0 */ ldc1 $f2, -0x2220($at) -/* 95B8E4 802406E4 44820000 */ mtc1 $v0, $f0 -/* 95B8E8 802406E8 00000000 */ nop -/* 95B8EC 802406EC 46800021 */ cvt.d.w $f0, $f0 -/* 95B8F0 802406F0 46220003 */ div.d $f0, $f0, $f2 -/* 95B8F4 802406F4 46200020 */ cvt.s.d $f0, $f0 -/* 95B8F8 802406F8 E6800018 */ swc1 $f0, 0x18($s4) -.L802406FC: -/* 95B8FC 802406FC 24020001 */ addiu $v0, $zero, 1 -/* 95B900 80240700 AEA20070 */ sw $v0, 0x70($s5) -/* 95B904 80240704 8FBF002C */ lw $ra, 0x2c($sp) -/* 95B908 80240708 8FB60028 */ lw $s6, 0x28($sp) -/* 95B90C 8024070C 8FB50024 */ lw $s5, 0x24($sp) -/* 95B910 80240710 8FB40020 */ lw $s4, 0x20($sp) -/* 95B914 80240714 8FB3001C */ lw $s3, 0x1c($sp) -/* 95B918 80240718 8FB20018 */ lw $s2, 0x18($sp) -/* 95B91C 8024071C 8FB10014 */ lw $s1, 0x14($sp) -/* 95B920 80240720 8FB00010 */ lw $s0, 0x10($sp) -/* 95B924 80240724 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 95B928 80240728 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 95B92C 8024072C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 95B930 80240730 03E00008 */ jr $ra -/* 95B934 80240734 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s new file mode 100644 index 0000000000..e300042e5f --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802405E0_95B7E0.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405E0_95B7E0 +/* 95B7E0 802405E0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 95B7E4 802405E4 AFB50024 */ sw $s5, 0x24($sp) +/* 95B7E8 802405E8 0080A82D */ daddu $s5, $a0, $zero +/* 95B7EC 802405EC AFBF002C */ sw $ra, 0x2c($sp) +/* 95B7F0 802405F0 AFB60028 */ sw $s6, 0x28($sp) +/* 95B7F4 802405F4 AFB40020 */ sw $s4, 0x20($sp) +/* 95B7F8 802405F8 AFB3001C */ sw $s3, 0x1c($sp) +/* 95B7FC 802405FC AFB20018 */ sw $s2, 0x18($sp) +/* 95B800 80240600 AFB10014 */ sw $s1, 0x14($sp) +/* 95B804 80240604 AFB00010 */ sw $s0, 0x10($sp) +/* 95B808 80240608 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 95B80C 8024060C F7B60038 */ sdc1 $f22, 0x38($sp) +/* 95B810 80240610 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 95B814 80240614 8EB30148 */ lw $s3, 0x148($s5) +/* 95B818 80240618 86640008 */ lh $a0, 8($s3) +/* 95B81C 8024061C 0C00EABB */ jal get_npc_unsafe +/* 95B820 80240620 00A0B02D */ daddu $s6, $a1, $zero +/* 95B824 80240624 0040A02D */ daddu $s4, $v0, $zero +/* 95B828 80240628 AEA00074 */ sw $zero, 0x74($s5) +/* 95B82C 8024062C C6980038 */ lwc1 $f24, 0x38($s4) +/* 95B830 80240630 C6960040 */ lwc1 $f22, 0x40($s4) +/* 95B834 80240634 0000902D */ daddu $s2, $zero, $zero +/* 95B838 80240638 AEA00078 */ sw $zero, 0x78($s5) +/* 95B83C 8024063C 8E6300D0 */ lw $v1, 0xd0($s3) +/* 95B840 80240640 8C620000 */ lw $v0, ($v1) +/* 95B844 80240644 3C0146FF */ lui $at, 0x46ff +/* 95B848 80240648 3421FE00 */ ori $at, $at, 0xfe00 +/* 95B84C 8024064C 4481A000 */ mtc1 $at, $f20 +/* 95B850 80240650 18400018 */ blez $v0, .L802406B4 +/* 95B854 80240654 0240802D */ daddu $s0, $s2, $zero +/* 95B858 80240658 0240882D */ daddu $s1, $s2, $zero +.L8024065C: +/* 95B85C 8024065C 02231021 */ addu $v0, $s1, $v1 +/* 95B860 80240660 4600C306 */ mov.s $f12, $f24 +/* 95B864 80240664 C4440004 */ lwc1 $f4, 4($v0) +/* 95B868 80240668 46802120 */ cvt.s.w $f4, $f4 +/* 95B86C 8024066C 44062000 */ mfc1 $a2, $f4 +/* 95B870 80240670 C444000C */ lwc1 $f4, 0xc($v0) +/* 95B874 80240674 46802120 */ cvt.s.w $f4, $f4 +/* 95B878 80240678 44072000 */ mfc1 $a3, $f4 +/* 95B87C 8024067C 0C00A7B5 */ jal dist2D +/* 95B880 80240680 4600B386 */ mov.s $f14, $f22 +/* 95B884 80240684 4614003C */ c.lt.s $f0, $f20 +/* 95B888 80240688 00000000 */ nop +/* 95B88C 8024068C 45000003 */ bc1f .L8024069C +/* 95B890 80240690 2631000C */ addiu $s1, $s1, 0xc +/* 95B894 80240694 46000506 */ mov.s $f20, $f0 +/* 95B898 80240698 AEB20078 */ sw $s2, 0x78($s5) +.L8024069C: +/* 95B89C 8024069C 8E6300D0 */ lw $v1, 0xd0($s3) +/* 95B8A0 802406A0 26100001 */ addiu $s0, $s0, 1 +/* 95B8A4 802406A4 8C620000 */ lw $v0, ($v1) +/* 95B8A8 802406A8 0202102A */ slt $v0, $s0, $v0 +/* 95B8AC 802406AC 1440FFEB */ bnez $v0, .L8024065C +/* 95B8B0 802406B0 26520001 */ addiu $s2, $s2, 1 +.L802406B4: +/* 95B8B4 802406B4 8E6200CC */ lw $v0, 0xcc($s3) +/* 95B8B8 802406B8 8C420004 */ lw $v0, 4($v0) +/* 95B8BC 802406BC AE820028 */ sw $v0, 0x28($s4) +/* 95B8C0 802406C0 8E6200D0 */ lw $v0, 0xd0($s3) +/* 95B8C4 802406C4 8C42007C */ lw $v0, 0x7c($v0) +/* 95B8C8 802406C8 04410004 */ bgez $v0, .L802406DC +/* 95B8CC 802406CC 00000000 */ nop +/* 95B8D0 802406D0 C6C00000 */ lwc1 $f0, ($s6) +/* 95B8D4 802406D4 080901BF */ j .L802406FC +/* 95B8D8 802406D8 E6800018 */ swc1 $f0, 0x18($s4) +.L802406DC: +/* 95B8DC 802406DC 3C018025 */ lui $at, 0x8025 +/* 95B8E0 802406E0 D422DDE0 */ ldc1 $f2, -0x2220($at) +/* 95B8E4 802406E4 44820000 */ mtc1 $v0, $f0 +/* 95B8E8 802406E8 00000000 */ nop +/* 95B8EC 802406EC 46800021 */ cvt.d.w $f0, $f0 +/* 95B8F0 802406F0 46220003 */ div.d $f0, $f0, $f2 +/* 95B8F4 802406F4 46200020 */ cvt.s.d $f0, $f0 +/* 95B8F8 802406F8 E6800018 */ swc1 $f0, 0x18($s4) +.L802406FC: +/* 95B8FC 802406FC 24020001 */ addiu $v0, $zero, 1 +/* 95B900 80240700 AEA20070 */ sw $v0, 0x70($s5) +/* 95B904 80240704 8FBF002C */ lw $ra, 0x2c($sp) +/* 95B908 80240708 8FB60028 */ lw $s6, 0x28($sp) +/* 95B90C 8024070C 8FB50024 */ lw $s5, 0x24($sp) +/* 95B910 80240710 8FB40020 */ lw $s4, 0x20($sp) +/* 95B914 80240714 8FB3001C */ lw $s3, 0x1c($sp) +/* 95B918 80240718 8FB20018 */ lw $s2, 0x18($sp) +/* 95B91C 8024071C 8FB10014 */ lw $s1, 0x14($sp) +/* 95B920 80240720 8FB00010 */ lw $s0, 0x10($sp) +/* 95B924 80240724 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 95B928 80240728 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 95B92C 8024072C D7B40030 */ ldc1 $f20, 0x30($sp) +/* 95B930 80240730 03E00008 */ jr $ra +/* 95B934 80240734 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0.s deleted file mode 100644 index 776822714c..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AA0 -/* 95BCA0 80240AA0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95BCA4 80240AA4 AFB40040 */ sw $s4, 0x40($sp) -/* 95BCA8 80240AA8 0080A02D */ daddu $s4, $a0, $zero -/* 95BCAC 80240AAC AFBF0044 */ sw $ra, 0x44($sp) -/* 95BCB0 80240AB0 AFB3003C */ sw $s3, 0x3c($sp) -/* 95BCB4 80240AB4 AFB20038 */ sw $s2, 0x38($sp) -/* 95BCB8 80240AB8 AFB10034 */ sw $s1, 0x34($sp) -/* 95BCBC 80240ABC AFB00030 */ sw $s0, 0x30($sp) -/* 95BCC0 80240AC0 8E910148 */ lw $s1, 0x148($s4) -/* 95BCC4 80240AC4 00A0902D */ daddu $s2, $a1, $zero -/* 95BCC8 80240AC8 86240008 */ lh $a0, 8($s1) -/* 95BCCC 80240ACC 0C00EABB */ jal get_npc_unsafe -/* 95BCD0 80240AD0 00C0982D */ daddu $s3, $a2, $zero -/* 95BCD4 80240AD4 8E430014 */ lw $v1, 0x14($s2) -/* 95BCD8 80240AD8 04600031 */ bltz $v1, .L80240BA0 -/* 95BCDC 80240ADC 0040802D */ daddu $s0, $v0, $zero -/* 95BCE0 80240AE0 0260202D */ daddu $a0, $s3, $zero -/* 95BCE4 80240AE4 AFA00010 */ sw $zero, 0x10($sp) -/* 95BCE8 80240AE8 8E460024 */ lw $a2, 0x24($s2) -/* 95BCEC 80240AEC 8E470028 */ lw $a3, 0x28($s2) -/* 95BCF0 80240AF0 0C01242D */ jal func_800490B4 -/* 95BCF4 80240AF4 0220282D */ daddu $a1, $s1, $zero -/* 95BCF8 80240AF8 10400029 */ beqz $v0, .L80240BA0 -/* 95BCFC 80240AFC 0000202D */ daddu $a0, $zero, $zero -/* 95BD00 80240B00 0200282D */ daddu $a1, $s0, $zero -/* 95BD04 80240B04 0000302D */ daddu $a2, $zero, $zero -/* 95BD08 80240B08 860300A8 */ lh $v1, 0xa8($s0) -/* 95BD0C 80240B0C 3C013F80 */ lui $at, 0x3f80 -/* 95BD10 80240B10 44810000 */ mtc1 $at, $f0 -/* 95BD14 80240B14 3C014000 */ lui $at, 0x4000 -/* 95BD18 80240B18 44811000 */ mtc1 $at, $f2 -/* 95BD1C 80240B1C 3C01C1A0 */ lui $at, 0xc1a0 -/* 95BD20 80240B20 44812000 */ mtc1 $at, $f4 -/* 95BD24 80240B24 2402000F */ addiu $v0, $zero, 0xf -/* 95BD28 80240B28 AFA2001C */ sw $v0, 0x1c($sp) -/* 95BD2C 80240B2C 44833000 */ mtc1 $v1, $f6 -/* 95BD30 80240B30 00000000 */ nop -/* 95BD34 80240B34 468031A0 */ cvt.s.w $f6, $f6 -/* 95BD38 80240B38 44073000 */ mfc1 $a3, $f6 -/* 95BD3C 80240B3C 27A20028 */ addiu $v0, $sp, 0x28 -/* 95BD40 80240B40 AFA20020 */ sw $v0, 0x20($sp) -/* 95BD44 80240B44 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95BD48 80240B48 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95BD4C 80240B4C 0C01BFA4 */ jal fx_emote -/* 95BD50 80240B50 E7A40018 */ swc1 $f4, 0x18($sp) -/* 95BD54 80240B54 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 95BD58 80240B58 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 95BD5C 80240B5C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 95BD60 80240B60 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 95BD64 80240B64 8C460028 */ lw $a2, 0x28($v0) -/* 95BD68 80240B68 0C00A720 */ jal atan2 -/* 95BD6C 80240B6C 8C470030 */ lw $a3, 0x30($v0) -/* 95BD70 80240B70 0200202D */ daddu $a0, $s0, $zero -/* 95BD74 80240B74 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 95BD78 80240B78 3C060020 */ lui $a2, 0x20 -/* 95BD7C 80240B7C 0C012530 */ jal func_800494C0 -/* 95BD80 80240B80 E480000C */ swc1 $f0, 0xc($a0) -/* 95BD84 80240B84 8E220018 */ lw $v0, 0x18($s1) -/* 95BD88 80240B88 9442002A */ lhu $v0, 0x2a($v0) -/* 95BD8C 80240B8C 30420001 */ andi $v0, $v0, 1 -/* 95BD90 80240B90 14400029 */ bnez $v0, .L80240C38 -/* 95BD94 80240B94 2402000A */ addiu $v0, $zero, 0xa -/* 95BD98 80240B98 0809030E */ j .L80240C38 -/* 95BD9C 80240B9C 2402000C */ addiu $v0, $zero, 0xc -.L80240BA0: -/* 95BDA0 80240BA0 8602008C */ lh $v0, 0x8c($s0) -/* 95BDA4 80240BA4 14400025 */ bnez $v0, .L80240C3C -/* 95BDA8 80240BA8 00000000 */ nop -/* 95BDAC 80240BAC 9602008E */ lhu $v0, 0x8e($s0) -/* 95BDB0 80240BB0 2442FFFF */ addiu $v0, $v0, -1 -/* 95BDB4 80240BB4 A602008E */ sh $v0, 0x8e($s0) -/* 95BDB8 80240BB8 00021400 */ sll $v0, $v0, 0x10 -/* 95BDBC 80240BBC 1440001F */ bnez $v0, .L80240C3C -/* 95BDC0 80240BC0 00000000 */ nop -/* 95BDC4 80240BC4 8E820074 */ lw $v0, 0x74($s4) -/* 95BDC8 80240BC8 2442FFFF */ addiu $v0, $v0, -1 -/* 95BDCC 80240BCC 10400019 */ beqz $v0, .L80240C34 -/* 95BDD0 80240BD0 AE820074 */ sw $v0, 0x74($s4) -/* 95BDD4 80240BD4 8E220018 */ lw $v0, 0x18($s1) -/* 95BDD8 80240BD8 9442002A */ lhu $v0, 0x2a($v0) -/* 95BDDC 80240BDC 30420010 */ andi $v0, $v0, 0x10 -/* 95BDE0 80240BE0 14400007 */ bnez $v0, .L80240C00 -/* 95BDE4 80240BE4 00000000 */ nop -/* 95BDE8 80240BE8 C600000C */ lwc1 $f0, 0xc($s0) -/* 95BDEC 80240BEC 3C014334 */ lui $at, 0x4334 -/* 95BDF0 80240BF0 44816000 */ mtc1 $at, $f12 -/* 95BDF4 80240BF4 0C00A6C9 */ jal clamp_angle -/* 95BDF8 80240BF8 460C0300 */ add.s $f12, $f0, $f12 -/* 95BDFC 80240BFC E600000C */ swc1 $f0, 0xc($s0) -.L80240C00: -/* 95BE00 80240C00 8E440008 */ lw $a0, 8($s2) -/* 95BE04 80240C04 000417C2 */ srl $v0, $a0, 0x1f -/* 95BE08 80240C08 00822021 */ addu $a0, $a0, $v0 -/* 95BE0C 80240C0C 00042043 */ sra $a0, $a0, 1 -/* 95BE10 80240C10 0C00A67F */ jal rand_int -/* 95BE14 80240C14 24840001 */ addiu $a0, $a0, 1 -/* 95BE18 80240C18 8E430008 */ lw $v1, 8($s2) -/* 95BE1C 80240C1C 000327C2 */ srl $a0, $v1, 0x1f -/* 95BE20 80240C20 00641821 */ addu $v1, $v1, $a0 -/* 95BE24 80240C24 00031843 */ sra $v1, $v1, 1 -/* 95BE28 80240C28 00621821 */ addu $v1, $v1, $v0 -/* 95BE2C 80240C2C 0809030F */ j .L80240C3C -/* 95BE30 80240C30 A603008E */ sh $v1, 0x8e($s0) -.L80240C34: -/* 95BE34 80240C34 24020004 */ addiu $v0, $zero, 4 -.L80240C38: -/* 95BE38 80240C38 AE820070 */ sw $v0, 0x70($s4) -.L80240C3C: -/* 95BE3C 80240C3C 8FBF0044 */ lw $ra, 0x44($sp) -/* 95BE40 80240C40 8FB40040 */ lw $s4, 0x40($sp) -/* 95BE44 80240C44 8FB3003C */ lw $s3, 0x3c($sp) -/* 95BE48 80240C48 8FB20038 */ lw $s2, 0x38($sp) -/* 95BE4C 80240C4C 8FB10034 */ lw $s1, 0x34($sp) -/* 95BE50 80240C50 8FB00030 */ lw $s0, 0x30($sp) -/* 95BE54 80240C54 03E00008 */ jr $ra -/* 95BE58 80240C58 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s new file mode 100644 index 0000000000..7e72cece0a --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240AA0_95BCA0.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AA0_95BCA0 +/* 95BCA0 80240AA0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 95BCA4 80240AA4 AFB40040 */ sw $s4, 0x40($sp) +/* 95BCA8 80240AA8 0080A02D */ daddu $s4, $a0, $zero +/* 95BCAC 80240AAC AFBF0044 */ sw $ra, 0x44($sp) +/* 95BCB0 80240AB0 AFB3003C */ sw $s3, 0x3c($sp) +/* 95BCB4 80240AB4 AFB20038 */ sw $s2, 0x38($sp) +/* 95BCB8 80240AB8 AFB10034 */ sw $s1, 0x34($sp) +/* 95BCBC 80240ABC AFB00030 */ sw $s0, 0x30($sp) +/* 95BCC0 80240AC0 8E910148 */ lw $s1, 0x148($s4) +/* 95BCC4 80240AC4 00A0902D */ daddu $s2, $a1, $zero +/* 95BCC8 80240AC8 86240008 */ lh $a0, 8($s1) +/* 95BCCC 80240ACC 0C00EABB */ jal get_npc_unsafe +/* 95BCD0 80240AD0 00C0982D */ daddu $s3, $a2, $zero +/* 95BCD4 80240AD4 8E430014 */ lw $v1, 0x14($s2) +/* 95BCD8 80240AD8 04600031 */ bltz $v1, .L80240BA0 +/* 95BCDC 80240ADC 0040802D */ daddu $s0, $v0, $zero +/* 95BCE0 80240AE0 0260202D */ daddu $a0, $s3, $zero +/* 95BCE4 80240AE4 AFA00010 */ sw $zero, 0x10($sp) +/* 95BCE8 80240AE8 8E460024 */ lw $a2, 0x24($s2) +/* 95BCEC 80240AEC 8E470028 */ lw $a3, 0x28($s2) +/* 95BCF0 80240AF0 0C01242D */ jal func_800490B4 +/* 95BCF4 80240AF4 0220282D */ daddu $a1, $s1, $zero +/* 95BCF8 80240AF8 10400029 */ beqz $v0, .L80240BA0 +/* 95BCFC 80240AFC 0000202D */ daddu $a0, $zero, $zero +/* 95BD00 80240B00 0200282D */ daddu $a1, $s0, $zero +/* 95BD04 80240B04 0000302D */ daddu $a2, $zero, $zero +/* 95BD08 80240B08 860300A8 */ lh $v1, 0xa8($s0) +/* 95BD0C 80240B0C 3C013F80 */ lui $at, 0x3f80 +/* 95BD10 80240B10 44810000 */ mtc1 $at, $f0 +/* 95BD14 80240B14 3C014000 */ lui $at, 0x4000 +/* 95BD18 80240B18 44811000 */ mtc1 $at, $f2 +/* 95BD1C 80240B1C 3C01C1A0 */ lui $at, 0xc1a0 +/* 95BD20 80240B20 44812000 */ mtc1 $at, $f4 +/* 95BD24 80240B24 2402000F */ addiu $v0, $zero, 0xf +/* 95BD28 80240B28 AFA2001C */ sw $v0, 0x1c($sp) +/* 95BD2C 80240B2C 44833000 */ mtc1 $v1, $f6 +/* 95BD30 80240B30 00000000 */ nop +/* 95BD34 80240B34 468031A0 */ cvt.s.w $f6, $f6 +/* 95BD38 80240B38 44073000 */ mfc1 $a3, $f6 +/* 95BD3C 80240B3C 27A20028 */ addiu $v0, $sp, 0x28 +/* 95BD40 80240B40 AFA20020 */ sw $v0, 0x20($sp) +/* 95BD44 80240B44 E7A00010 */ swc1 $f0, 0x10($sp) +/* 95BD48 80240B48 E7A20014 */ swc1 $f2, 0x14($sp) +/* 95BD4C 80240B4C 0C01BFA4 */ jal fx_emote +/* 95BD50 80240B50 E7A40018 */ swc1 $f4, 0x18($sp) +/* 95BD54 80240B54 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 95BD58 80240B58 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 95BD5C 80240B5C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 95BD60 80240B60 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 95BD64 80240B64 8C460028 */ lw $a2, 0x28($v0) +/* 95BD68 80240B68 0C00A720 */ jal atan2 +/* 95BD6C 80240B6C 8C470030 */ lw $a3, 0x30($v0) +/* 95BD70 80240B70 0200202D */ daddu $a0, $s0, $zero +/* 95BD74 80240B74 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 95BD78 80240B78 3C060020 */ lui $a2, 0x20 +/* 95BD7C 80240B7C 0C012530 */ jal func_800494C0 +/* 95BD80 80240B80 E480000C */ swc1 $f0, 0xc($a0) +/* 95BD84 80240B84 8E220018 */ lw $v0, 0x18($s1) +/* 95BD88 80240B88 9442002A */ lhu $v0, 0x2a($v0) +/* 95BD8C 80240B8C 30420001 */ andi $v0, $v0, 1 +/* 95BD90 80240B90 14400029 */ bnez $v0, .L80240C38 +/* 95BD94 80240B94 2402000A */ addiu $v0, $zero, 0xa +/* 95BD98 80240B98 0809030E */ j .L80240C38 +/* 95BD9C 80240B9C 2402000C */ addiu $v0, $zero, 0xc +.L80240BA0: +/* 95BDA0 80240BA0 8602008C */ lh $v0, 0x8c($s0) +/* 95BDA4 80240BA4 14400025 */ bnez $v0, .L80240C3C +/* 95BDA8 80240BA8 00000000 */ nop +/* 95BDAC 80240BAC 9602008E */ lhu $v0, 0x8e($s0) +/* 95BDB0 80240BB0 2442FFFF */ addiu $v0, $v0, -1 +/* 95BDB4 80240BB4 A602008E */ sh $v0, 0x8e($s0) +/* 95BDB8 80240BB8 00021400 */ sll $v0, $v0, 0x10 +/* 95BDBC 80240BBC 1440001F */ bnez $v0, .L80240C3C +/* 95BDC0 80240BC0 00000000 */ nop +/* 95BDC4 80240BC4 8E820074 */ lw $v0, 0x74($s4) +/* 95BDC8 80240BC8 2442FFFF */ addiu $v0, $v0, -1 +/* 95BDCC 80240BCC 10400019 */ beqz $v0, .L80240C34 +/* 95BDD0 80240BD0 AE820074 */ sw $v0, 0x74($s4) +/* 95BDD4 80240BD4 8E220018 */ lw $v0, 0x18($s1) +/* 95BDD8 80240BD8 9442002A */ lhu $v0, 0x2a($v0) +/* 95BDDC 80240BDC 30420010 */ andi $v0, $v0, 0x10 +/* 95BDE0 80240BE0 14400007 */ bnez $v0, .L80240C00 +/* 95BDE4 80240BE4 00000000 */ nop +/* 95BDE8 80240BE8 C600000C */ lwc1 $f0, 0xc($s0) +/* 95BDEC 80240BEC 3C014334 */ lui $at, 0x4334 +/* 95BDF0 80240BF0 44816000 */ mtc1 $at, $f12 +/* 95BDF4 80240BF4 0C00A6C9 */ jal clamp_angle +/* 95BDF8 80240BF8 460C0300 */ add.s $f12, $f0, $f12 +/* 95BDFC 80240BFC E600000C */ swc1 $f0, 0xc($s0) +.L80240C00: +/* 95BE00 80240C00 8E440008 */ lw $a0, 8($s2) +/* 95BE04 80240C04 000417C2 */ srl $v0, $a0, 0x1f +/* 95BE08 80240C08 00822021 */ addu $a0, $a0, $v0 +/* 95BE0C 80240C0C 00042043 */ sra $a0, $a0, 1 +/* 95BE10 80240C10 0C00A67F */ jal rand_int +/* 95BE14 80240C14 24840001 */ addiu $a0, $a0, 1 +/* 95BE18 80240C18 8E430008 */ lw $v1, 8($s2) +/* 95BE1C 80240C1C 000327C2 */ srl $a0, $v1, 0x1f +/* 95BE20 80240C20 00641821 */ addu $v1, $v1, $a0 +/* 95BE24 80240C24 00031843 */ sra $v1, $v1, 1 +/* 95BE28 80240C28 00621821 */ addu $v1, $v1, $v0 +/* 95BE2C 80240C2C 0809030F */ j .L80240C3C +/* 95BE30 80240C30 A603008E */ sh $v1, 0x8e($s0) +.L80240C34: +/* 95BE34 80240C34 24020004 */ addiu $v0, $zero, 4 +.L80240C38: +/* 95BE38 80240C38 AE820070 */ sw $v0, 0x70($s4) +.L80240C3C: +/* 95BE3C 80240C3C 8FBF0044 */ lw $ra, 0x44($sp) +/* 95BE40 80240C40 8FB40040 */ lw $s4, 0x40($sp) +/* 95BE44 80240C44 8FB3003C */ lw $s3, 0x3c($sp) +/* 95BE48 80240C48 8FB20038 */ lw $s2, 0x38($sp) +/* 95BE4C 80240C4C 8FB10034 */ lw $s1, 0x34($sp) +/* 95BE50 80240C50 8FB00030 */ lw $s0, 0x30($sp) +/* 95BE54 80240C54 03E00008 */ jr $ra +/* 95BE58 80240C58 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C.s deleted file mode 100644 index 69746bd536..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C5C -/* 95BE5C 80240C5C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95BE60 80240C60 AFB10014 */ sw $s1, 0x14($sp) -/* 95BE64 80240C64 0080882D */ daddu $s1, $a0, $zero -/* 95BE68 80240C68 AFBF001C */ sw $ra, 0x1c($sp) -/* 95BE6C 80240C6C AFB20018 */ sw $s2, 0x18($sp) -/* 95BE70 80240C70 AFB00010 */ sw $s0, 0x10($sp) -/* 95BE74 80240C74 8E300148 */ lw $s0, 0x148($s1) -/* 95BE78 80240C78 86040008 */ lh $a0, 8($s0) -/* 95BE7C 80240C7C 0C00EABB */ jal get_npc_unsafe -/* 95BE80 80240C80 00A0902D */ daddu $s2, $a1, $zero -/* 95BE84 80240C84 8E230078 */ lw $v1, 0x78($s1) -/* 95BE88 80240C88 24630001 */ addiu $v1, $v1, 1 -/* 95BE8C 80240C8C AE230078 */ sw $v1, 0x78($s1) -/* 95BE90 80240C90 8E0400D0 */ lw $a0, 0xd0($s0) -/* 95BE94 80240C94 8C840000 */ lw $a0, ($a0) -/* 95BE98 80240C98 0064182A */ slt $v1, $v1, $a0 -/* 95BE9C 80240C9C 14600002 */ bnez $v1, .L80240CA8 -/* 95BEA0 80240CA0 0040282D */ daddu $a1, $v0, $zero -/* 95BEA4 80240CA4 AE200078 */ sw $zero, 0x78($s1) -.L80240CA8: -/* 95BEA8 80240CA8 8E0200CC */ lw $v0, 0xcc($s0) -/* 95BEAC 80240CAC 8C420004 */ lw $v0, 4($v0) -/* 95BEB0 80240CB0 ACA20028 */ sw $v0, 0x28($a1) -/* 95BEB4 80240CB4 8E0200D0 */ lw $v0, 0xd0($s0) -/* 95BEB8 80240CB8 8C42007C */ lw $v0, 0x7c($v0) -/* 95BEBC 80240CBC 04410004 */ bgez $v0, .L80240CD0 -/* 95BEC0 80240CC0 00000000 */ nop -/* 95BEC4 80240CC4 C6400000 */ lwc1 $f0, ($s2) -/* 95BEC8 80240CC8 0809033C */ j .L80240CF0 -/* 95BECC 80240CCC E4A00018 */ swc1 $f0, 0x18($a1) -.L80240CD0: -/* 95BED0 80240CD0 3C018025 */ lui $at, 0x8025 -/* 95BED4 80240CD4 D422DDE8 */ ldc1 $f2, -0x2218($at) -/* 95BED8 80240CD8 44820000 */ mtc1 $v0, $f0 -/* 95BEDC 80240CDC 00000000 */ nop -/* 95BEE0 80240CE0 46800021 */ cvt.d.w $f0, $f0 -/* 95BEE4 80240CE4 46220003 */ div.d $f0, $f0, $f2 -/* 95BEE8 80240CE8 46200020 */ cvt.s.d $f0, $f0 -/* 95BEEC 80240CEC E4A00018 */ swc1 $f0, 0x18($a1) -.L80240CF0: -/* 95BEF0 80240CF0 24020001 */ addiu $v0, $zero, 1 -/* 95BEF4 80240CF4 AE220070 */ sw $v0, 0x70($s1) -/* 95BEF8 80240CF8 8FBF001C */ lw $ra, 0x1c($sp) -/* 95BEFC 80240CFC 8FB20018 */ lw $s2, 0x18($sp) -/* 95BF00 80240D00 8FB10014 */ lw $s1, 0x14($sp) -/* 95BF04 80240D04 8FB00010 */ lw $s0, 0x10($sp) -/* 95BF08 80240D08 03E00008 */ jr $ra -/* 95BF0C 80240D0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s new file mode 100644 index 0000000000..b6191327f7 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240C5C_95BE5C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C5C_95BE5C +/* 95BE5C 80240C5C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95BE60 80240C60 AFB10014 */ sw $s1, 0x14($sp) +/* 95BE64 80240C64 0080882D */ daddu $s1, $a0, $zero +/* 95BE68 80240C68 AFBF001C */ sw $ra, 0x1c($sp) +/* 95BE6C 80240C6C AFB20018 */ sw $s2, 0x18($sp) +/* 95BE70 80240C70 AFB00010 */ sw $s0, 0x10($sp) +/* 95BE74 80240C74 8E300148 */ lw $s0, 0x148($s1) +/* 95BE78 80240C78 86040008 */ lh $a0, 8($s0) +/* 95BE7C 80240C7C 0C00EABB */ jal get_npc_unsafe +/* 95BE80 80240C80 00A0902D */ daddu $s2, $a1, $zero +/* 95BE84 80240C84 8E230078 */ lw $v1, 0x78($s1) +/* 95BE88 80240C88 24630001 */ addiu $v1, $v1, 1 +/* 95BE8C 80240C8C AE230078 */ sw $v1, 0x78($s1) +/* 95BE90 80240C90 8E0400D0 */ lw $a0, 0xd0($s0) +/* 95BE94 80240C94 8C840000 */ lw $a0, ($a0) +/* 95BE98 80240C98 0064182A */ slt $v1, $v1, $a0 +/* 95BE9C 80240C9C 14600002 */ bnez $v1, .L80240CA8 +/* 95BEA0 80240CA0 0040282D */ daddu $a1, $v0, $zero +/* 95BEA4 80240CA4 AE200078 */ sw $zero, 0x78($s1) +.L80240CA8: +/* 95BEA8 80240CA8 8E0200CC */ lw $v0, 0xcc($s0) +/* 95BEAC 80240CAC 8C420004 */ lw $v0, 4($v0) +/* 95BEB0 80240CB0 ACA20028 */ sw $v0, 0x28($a1) +/* 95BEB4 80240CB4 8E0200D0 */ lw $v0, 0xd0($s0) +/* 95BEB8 80240CB8 8C42007C */ lw $v0, 0x7c($v0) +/* 95BEBC 80240CBC 04410004 */ bgez $v0, .L80240CD0 +/* 95BEC0 80240CC0 00000000 */ nop +/* 95BEC4 80240CC4 C6400000 */ lwc1 $f0, ($s2) +/* 95BEC8 80240CC8 0809033C */ j .L80240CF0 +/* 95BECC 80240CCC E4A00018 */ swc1 $f0, 0x18($a1) +.L80240CD0: +/* 95BED0 80240CD0 3C018025 */ lui $at, 0x8025 +/* 95BED4 80240CD4 D422DDE8 */ ldc1 $f2, -0x2218($at) +/* 95BED8 80240CD8 44820000 */ mtc1 $v0, $f0 +/* 95BEDC 80240CDC 00000000 */ nop +/* 95BEE0 80240CE0 46800021 */ cvt.d.w $f0, $f0 +/* 95BEE4 80240CE4 46220003 */ div.d $f0, $f0, $f2 +/* 95BEE8 80240CE8 46200020 */ cvt.s.d $f0, $f0 +/* 95BEEC 80240CEC E4A00018 */ swc1 $f0, 0x18($a1) +.L80240CF0: +/* 95BEF0 80240CF0 24020001 */ addiu $v0, $zero, 1 +/* 95BEF4 80240CF4 AE220070 */ sw $v0, 0x70($s1) +/* 95BEF8 80240CF8 8FBF001C */ lw $ra, 0x1c($sp) +/* 95BEFC 80240CFC 8FB20018 */ lw $s2, 0x18($sp) +/* 95BF00 80240D00 8FB10014 */ lw $s1, 0x14($sp) +/* 95BF04 80240D04 8FB00010 */ lw $s0, 0x10($sp) +/* 95BF08 80240D08 03E00008 */ jr $ra +/* 95BF0C 80240D0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84.s deleted file mode 100644 index 0f4fc6d0b9..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D84 -/* 95BF84 80240D84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95BF88 80240D88 AFB00010 */ sw $s0, 0x10($sp) -/* 95BF8C 80240D8C 0080802D */ daddu $s0, $a0, $zero -/* 95BF90 80240D90 AFBF0014 */ sw $ra, 0x14($sp) -/* 95BF94 80240D94 8E020148 */ lw $v0, 0x148($s0) -/* 95BF98 80240D98 0C00EABB */ jal get_npc_unsafe -/* 95BF9C 80240D9C 84440008 */ lh $a0, 8($v0) -/* 95BFA0 80240DA0 0040202D */ daddu $a0, $v0, $zero -/* 95BFA4 80240DA4 C482003C */ lwc1 $f2, 0x3c($a0) -/* 95BFA8 80240DA8 C480001C */ lwc1 $f0, 0x1c($a0) -/* 95BFAC 80240DAC 46001080 */ add.s $f2, $f2, $f0 -/* 95BFB0 80240DB0 C4840014 */ lwc1 $f4, 0x14($a0) -/* 95BFB4 80240DB4 46040001 */ sub.s $f0, $f0, $f4 -/* 95BFB8 80240DB8 C4840064 */ lwc1 $f4, 0x64($a0) -/* 95BFBC 80240DBC 4602203C */ c.lt.s $f4, $f2 -/* 95BFC0 80240DC0 E482003C */ swc1 $f2, 0x3c($a0) -/* 95BFC4 80240DC4 45010009 */ bc1t .L80240DEC -/* 95BFC8 80240DC8 E480001C */ swc1 $f0, 0x1c($a0) -/* 95BFCC 80240DCC 8C820000 */ lw $v0, ($a0) -/* 95BFD0 80240DD0 2403F7FF */ addiu $v1, $zero, -0x801 -/* 95BFD4 80240DD4 E484003C */ swc1 $f4, 0x3c($a0) -/* 95BFD8 80240DD8 AC80001C */ sw $zero, 0x1c($a0) -/* 95BFDC 80240DDC 00431024 */ and $v0, $v0, $v1 -/* 95BFE0 80240DE0 AC820000 */ sw $v0, ($a0) -/* 95BFE4 80240DE4 2402000C */ addiu $v0, $zero, 0xc -/* 95BFE8 80240DE8 AE020070 */ sw $v0, 0x70($s0) -.L80240DEC: -/* 95BFEC 80240DEC 8FBF0014 */ lw $ra, 0x14($sp) -/* 95BFF0 80240DF0 8FB00010 */ lw $s0, 0x10($sp) -/* 95BFF4 80240DF4 03E00008 */ jr $ra -/* 95BFF8 80240DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84_95BF84.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84_95BF84.s new file mode 100644 index 0000000000..efcd26be8f --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240D84_95BF84.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D84_95BF84 +/* 95BF84 80240D84 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95BF88 80240D88 AFB00010 */ sw $s0, 0x10($sp) +/* 95BF8C 80240D8C 0080802D */ daddu $s0, $a0, $zero +/* 95BF90 80240D90 AFBF0014 */ sw $ra, 0x14($sp) +/* 95BF94 80240D94 8E020148 */ lw $v0, 0x148($s0) +/* 95BF98 80240D98 0C00EABB */ jal get_npc_unsafe +/* 95BF9C 80240D9C 84440008 */ lh $a0, 8($v0) +/* 95BFA0 80240DA0 0040202D */ daddu $a0, $v0, $zero +/* 95BFA4 80240DA4 C482003C */ lwc1 $f2, 0x3c($a0) +/* 95BFA8 80240DA8 C480001C */ lwc1 $f0, 0x1c($a0) +/* 95BFAC 80240DAC 46001080 */ add.s $f2, $f2, $f0 +/* 95BFB0 80240DB0 C4840014 */ lwc1 $f4, 0x14($a0) +/* 95BFB4 80240DB4 46040001 */ sub.s $f0, $f0, $f4 +/* 95BFB8 80240DB8 C4840064 */ lwc1 $f4, 0x64($a0) +/* 95BFBC 80240DBC 4602203C */ c.lt.s $f4, $f2 +/* 95BFC0 80240DC0 E482003C */ swc1 $f2, 0x3c($a0) +/* 95BFC4 80240DC4 45010009 */ bc1t .L80240DEC +/* 95BFC8 80240DC8 E480001C */ swc1 $f0, 0x1c($a0) +/* 95BFCC 80240DCC 8C820000 */ lw $v0, ($a0) +/* 95BFD0 80240DD0 2403F7FF */ addiu $v1, $zero, -0x801 +/* 95BFD4 80240DD4 E484003C */ swc1 $f4, 0x3c($a0) +/* 95BFD8 80240DD8 AC80001C */ sw $zero, 0x1c($a0) +/* 95BFDC 80240DDC 00431024 */ and $v0, $v0, $v1 +/* 95BFE0 80240DE0 AC820000 */ sw $v0, ($a0) +/* 95BFE4 80240DE4 2402000C */ addiu $v0, $zero, 0xc +/* 95BFE8 80240DE8 AE020070 */ sw $v0, 0x70($s0) +.L80240DEC: +/* 95BFEC 80240DEC 8FBF0014 */ lw $ra, 0x14($sp) +/* 95BFF0 80240DF0 8FB00010 */ lw $s0, 0x10($sp) +/* 95BFF4 80240DF4 03E00008 */ jr $ra +/* 95BFF8 80240DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC.s deleted file mode 100644 index f735c03550..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DFC -/* 95BFFC 80240DFC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 95C000 80240E00 AFB3001C */ sw $s3, 0x1c($sp) -/* 95C004 80240E04 0080982D */ daddu $s3, $a0, $zero -/* 95C008 80240E08 AFBF0020 */ sw $ra, 0x20($sp) -/* 95C00C 80240E0C AFB20018 */ sw $s2, 0x18($sp) -/* 95C010 80240E10 AFB10014 */ sw $s1, 0x14($sp) -/* 95C014 80240E14 AFB00010 */ sw $s0, 0x10($sp) -/* 95C018 80240E18 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 95C01C 80240E1C 8E710148 */ lw $s1, 0x148($s3) -/* 95C020 80240E20 86240008 */ lh $a0, 8($s1) -/* 95C024 80240E24 0C00EABB */ jal get_npc_unsafe -/* 95C028 80240E28 00A0802D */ daddu $s0, $a1, $zero -/* 95C02C 80240E2C 8E040020 */ lw $a0, 0x20($s0) -/* 95C030 80240E30 0040902D */ daddu $s2, $v0, $zero -/* 95C034 80240E34 00041FC2 */ srl $v1, $a0, 0x1f -/* 95C038 80240E38 00832021 */ addu $a0, $a0, $v1 -/* 95C03C 80240E3C 00042043 */ sra $a0, $a0, 1 -/* 95C040 80240E40 0C00A67F */ jal rand_int -/* 95C044 80240E44 24840001 */ addiu $a0, $a0, 1 -/* 95C048 80240E48 8E030020 */ lw $v1, 0x20($s0) -/* 95C04C 80240E4C C64C0038 */ lwc1 $f12, 0x38($s2) -/* 95C050 80240E50 000327C2 */ srl $a0, $v1, 0x1f -/* 95C054 80240E54 00641821 */ addu $v1, $v1, $a0 -/* 95C058 80240E58 00031843 */ sra $v1, $v1, 1 -/* 95C05C 80240E5C 00621821 */ addu $v1, $v1, $v0 -/* 95C060 80240E60 A643008E */ sh $v1, 0x8e($s2) -/* 95C064 80240E64 8E2200CC */ lw $v0, 0xcc($s1) -/* 95C068 80240E68 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 95C06C 80240E6C 8C42000C */ lw $v0, 0xc($v0) -/* 95C070 80240E70 AE420028 */ sw $v0, 0x28($s2) -/* 95C074 80240E74 C6000018 */ lwc1 $f0, 0x18($s0) -/* 95C078 80240E78 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 95C07C 80240E7C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 95C080 80240E80 E6400018 */ swc1 $f0, 0x18($s2) -/* 95C084 80240E84 8C460028 */ lw $a2, 0x28($v0) -/* 95C088 80240E88 0C00A720 */ jal atan2 -/* 95C08C 80240E8C 8C470030 */ lw $a3, 0x30($v0) -/* 95C090 80240E90 46000506 */ mov.s $f20, $f0 -/* 95C094 80240E94 C64C000C */ lwc1 $f12, 0xc($s2) -/* 95C098 80240E98 0C00A70A */ jal get_clamped_angle_diff -/* 95C09C 80240E9C 4600A386 */ mov.s $f14, $f20 -/* 95C0A0 80240EA0 46000086 */ mov.s $f2, $f0 -/* 95C0A4 80240EA4 8E02001C */ lw $v0, 0x1c($s0) -/* 95C0A8 80240EA8 46001005 */ abs.s $f0, $f2 -/* 95C0AC 80240EAC 44822000 */ mtc1 $v0, $f4 -/* 95C0B0 80240EB0 00000000 */ nop -/* 95C0B4 80240EB4 46802120 */ cvt.s.w $f4, $f4 -/* 95C0B8 80240EB8 4600203C */ c.lt.s $f4, $f0 -/* 95C0BC 80240EBC 00000000 */ nop -/* 95C0C0 80240EC0 4500000D */ bc1f .L80240EF8 -/* 95C0C4 80240EC4 00000000 */ nop -/* 95C0C8 80240EC8 44800000 */ mtc1 $zero, $f0 -/* 95C0CC 80240ECC C654000C */ lwc1 $f20, 0xc($s2) -/* 95C0D0 80240ED0 4600103C */ c.lt.s $f2, $f0 -/* 95C0D4 80240ED4 00000000 */ nop -/* 95C0D8 80240ED8 45000006 */ bc1f .L80240EF4 -/* 95C0DC 80240EDC 00021023 */ negu $v0, $v0 -/* 95C0E0 80240EE0 44820000 */ mtc1 $v0, $f0 -/* 95C0E4 80240EE4 00000000 */ nop -/* 95C0E8 80240EE8 46800020 */ cvt.s.w $f0, $f0 -/* 95C0EC 80240EEC 080903BE */ j .L80240EF8 -/* 95C0F0 80240EF0 4600A500 */ add.s $f20, $f20, $f0 -.L80240EF4: -/* 95C0F4 80240EF4 4604A500 */ add.s $f20, $f20, $f4 -.L80240EF8: -/* 95C0F8 80240EF8 0C00A6C9 */ jal clamp_angle -/* 95C0FC 80240EFC 4600A306 */ mov.s $f12, $f20 -/* 95C100 80240F00 2402000D */ addiu $v0, $zero, 0xd -/* 95C104 80240F04 E640000C */ swc1 $f0, 0xc($s2) -/* 95C108 80240F08 AE620070 */ sw $v0, 0x70($s3) -/* 95C10C 80240F0C 8FBF0020 */ lw $ra, 0x20($sp) -/* 95C110 80240F10 8FB3001C */ lw $s3, 0x1c($sp) -/* 95C114 80240F14 8FB20018 */ lw $s2, 0x18($sp) -/* 95C118 80240F18 8FB10014 */ lw $s1, 0x14($sp) -/* 95C11C 80240F1C 8FB00010 */ lw $s0, 0x10($sp) -/* 95C120 80240F20 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 95C124 80240F24 03E00008 */ jr $ra -/* 95C128 80240F28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC_95BFFC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC_95BFFC.s new file mode 100644 index 0000000000..2e049467a1 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240DFC_95BFFC.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DFC_95BFFC +/* 95BFFC 80240DFC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 95C000 80240E00 AFB3001C */ sw $s3, 0x1c($sp) +/* 95C004 80240E04 0080982D */ daddu $s3, $a0, $zero +/* 95C008 80240E08 AFBF0020 */ sw $ra, 0x20($sp) +/* 95C00C 80240E0C AFB20018 */ sw $s2, 0x18($sp) +/* 95C010 80240E10 AFB10014 */ sw $s1, 0x14($sp) +/* 95C014 80240E14 AFB00010 */ sw $s0, 0x10($sp) +/* 95C018 80240E18 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 95C01C 80240E1C 8E710148 */ lw $s1, 0x148($s3) +/* 95C020 80240E20 86240008 */ lh $a0, 8($s1) +/* 95C024 80240E24 0C00EABB */ jal get_npc_unsafe +/* 95C028 80240E28 00A0802D */ daddu $s0, $a1, $zero +/* 95C02C 80240E2C 8E040020 */ lw $a0, 0x20($s0) +/* 95C030 80240E30 0040902D */ daddu $s2, $v0, $zero +/* 95C034 80240E34 00041FC2 */ srl $v1, $a0, 0x1f +/* 95C038 80240E38 00832021 */ addu $a0, $a0, $v1 +/* 95C03C 80240E3C 00042043 */ sra $a0, $a0, 1 +/* 95C040 80240E40 0C00A67F */ jal rand_int +/* 95C044 80240E44 24840001 */ addiu $a0, $a0, 1 +/* 95C048 80240E48 8E030020 */ lw $v1, 0x20($s0) +/* 95C04C 80240E4C C64C0038 */ lwc1 $f12, 0x38($s2) +/* 95C050 80240E50 000327C2 */ srl $a0, $v1, 0x1f +/* 95C054 80240E54 00641821 */ addu $v1, $v1, $a0 +/* 95C058 80240E58 00031843 */ sra $v1, $v1, 1 +/* 95C05C 80240E5C 00621821 */ addu $v1, $v1, $v0 +/* 95C060 80240E60 A643008E */ sh $v1, 0x8e($s2) +/* 95C064 80240E64 8E2200CC */ lw $v0, 0xcc($s1) +/* 95C068 80240E68 C64E0040 */ lwc1 $f14, 0x40($s2) +/* 95C06C 80240E6C 8C42000C */ lw $v0, 0xc($v0) +/* 95C070 80240E70 AE420028 */ sw $v0, 0x28($s2) +/* 95C074 80240E74 C6000018 */ lwc1 $f0, 0x18($s0) +/* 95C078 80240E78 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 95C07C 80240E7C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 95C080 80240E80 E6400018 */ swc1 $f0, 0x18($s2) +/* 95C084 80240E84 8C460028 */ lw $a2, 0x28($v0) +/* 95C088 80240E88 0C00A720 */ jal atan2 +/* 95C08C 80240E8C 8C470030 */ lw $a3, 0x30($v0) +/* 95C090 80240E90 46000506 */ mov.s $f20, $f0 +/* 95C094 80240E94 C64C000C */ lwc1 $f12, 0xc($s2) +/* 95C098 80240E98 0C00A70A */ jal get_clamped_angle_diff +/* 95C09C 80240E9C 4600A386 */ mov.s $f14, $f20 +/* 95C0A0 80240EA0 46000086 */ mov.s $f2, $f0 +/* 95C0A4 80240EA4 8E02001C */ lw $v0, 0x1c($s0) +/* 95C0A8 80240EA8 46001005 */ abs.s $f0, $f2 +/* 95C0AC 80240EAC 44822000 */ mtc1 $v0, $f4 +/* 95C0B0 80240EB0 00000000 */ nop +/* 95C0B4 80240EB4 46802120 */ cvt.s.w $f4, $f4 +/* 95C0B8 80240EB8 4600203C */ c.lt.s $f4, $f0 +/* 95C0BC 80240EBC 00000000 */ nop +/* 95C0C0 80240EC0 4500000D */ bc1f .L80240EF8 +/* 95C0C4 80240EC4 00000000 */ nop +/* 95C0C8 80240EC8 44800000 */ mtc1 $zero, $f0 +/* 95C0CC 80240ECC C654000C */ lwc1 $f20, 0xc($s2) +/* 95C0D0 80240ED0 4600103C */ c.lt.s $f2, $f0 +/* 95C0D4 80240ED4 00000000 */ nop +/* 95C0D8 80240ED8 45000006 */ bc1f .L80240EF4 +/* 95C0DC 80240EDC 00021023 */ negu $v0, $v0 +/* 95C0E0 80240EE0 44820000 */ mtc1 $v0, $f0 +/* 95C0E4 80240EE4 00000000 */ nop +/* 95C0E8 80240EE8 46800020 */ cvt.s.w $f0, $f0 +/* 95C0EC 80240EEC 080903BE */ j .L80240EF8 +/* 95C0F0 80240EF0 4600A500 */ add.s $f20, $f20, $f0 +.L80240EF4: +/* 95C0F4 80240EF4 4604A500 */ add.s $f20, $f20, $f4 +.L80240EF8: +/* 95C0F8 80240EF8 0C00A6C9 */ jal clamp_angle +/* 95C0FC 80240EFC 4600A306 */ mov.s $f12, $f20 +/* 95C100 80240F00 2402000D */ addiu $v0, $zero, 0xd +/* 95C104 80240F04 E640000C */ swc1 $f0, 0xc($s2) +/* 95C108 80240F08 AE620070 */ sw $v0, 0x70($s3) +/* 95C10C 80240F0C 8FBF0020 */ lw $ra, 0x20($sp) +/* 95C110 80240F10 8FB3001C */ lw $s3, 0x1c($sp) +/* 95C114 80240F14 8FB20018 */ lw $s2, 0x18($sp) +/* 95C118 80240F18 8FB10014 */ lw $s1, 0x14($sp) +/* 95C11C 80240F1C 8FB00010 */ lw $s0, 0x10($sp) +/* 95C120 80240F20 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 95C124 80240F24 03E00008 */ jr $ra +/* 95C128 80240F28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C.s deleted file mode 100644 index 174aa72cd5..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F2C -/* 95C12C 80240F2C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95C130 80240F30 AFB3003C */ sw $s3, 0x3c($sp) -/* 95C134 80240F34 0080982D */ daddu $s3, $a0, $zero -/* 95C138 80240F38 AFBF0040 */ sw $ra, 0x40($sp) -/* 95C13C 80240F3C AFB20038 */ sw $s2, 0x38($sp) -/* 95C140 80240F40 AFB10034 */ sw $s1, 0x34($sp) -/* 95C144 80240F44 AFB00030 */ sw $s0, 0x30($sp) -/* 95C148 80240F48 8E720148 */ lw $s2, 0x148($s3) -/* 95C14C 80240F4C 00A0882D */ daddu $s1, $a1, $zero -/* 95C150 80240F50 86440008 */ lh $a0, 8($s2) -/* 95C154 80240F54 0C00EABB */ jal get_npc_unsafe -/* 95C158 80240F58 00C0802D */ daddu $s0, $a2, $zero -/* 95C15C 80240F5C 0200202D */ daddu $a0, $s0, $zero -/* 95C160 80240F60 0240282D */ daddu $a1, $s2, $zero -/* 95C164 80240F64 24030001 */ addiu $v1, $zero, 1 -/* 95C168 80240F68 AFA30010 */ sw $v1, 0x10($sp) -/* 95C16C 80240F6C 8E260024 */ lw $a2, 0x24($s1) -/* 95C170 80240F70 8E270028 */ lw $a3, 0x28($s1) -/* 95C174 80240F74 0C01242D */ jal func_800490B4 -/* 95C178 80240F78 0040802D */ daddu $s0, $v0, $zero -/* 95C17C 80240F7C 1440001E */ bnez $v0, .L80240FF8 -/* 95C180 80240F80 0200202D */ daddu $a0, $s0, $zero -/* 95C184 80240F84 24040002 */ addiu $a0, $zero, 2 -/* 95C188 80240F88 0200282D */ daddu $a1, $s0, $zero -/* 95C18C 80240F8C 0000302D */ daddu $a2, $zero, $zero -/* 95C190 80240F90 860300A8 */ lh $v1, 0xa8($s0) -/* 95C194 80240F94 3C013F80 */ lui $at, 0x3f80 -/* 95C198 80240F98 44810000 */ mtc1 $at, $f0 -/* 95C19C 80240F9C 3C014000 */ lui $at, 0x4000 -/* 95C1A0 80240FA0 44811000 */ mtc1 $at, $f2 -/* 95C1A4 80240FA4 3C01C1A0 */ lui $at, 0xc1a0 -/* 95C1A8 80240FA8 44812000 */ mtc1 $at, $f4 -/* 95C1AC 80240FAC 2402000F */ addiu $v0, $zero, 0xf -/* 95C1B0 80240FB0 AFA2001C */ sw $v0, 0x1c($sp) -/* 95C1B4 80240FB4 44833000 */ mtc1 $v1, $f6 -/* 95C1B8 80240FB8 00000000 */ nop -/* 95C1BC 80240FBC 468031A0 */ cvt.s.w $f6, $f6 -/* 95C1C0 80240FC0 44073000 */ mfc1 $a3, $f6 -/* 95C1C4 80240FC4 27A20028 */ addiu $v0, $sp, 0x28 -/* 95C1C8 80240FC8 AFA20020 */ sw $v0, 0x20($sp) -/* 95C1CC 80240FCC E7A00010 */ swc1 $f0, 0x10($sp) -/* 95C1D0 80240FD0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95C1D4 80240FD4 0C01BFA4 */ jal fx_emote -/* 95C1D8 80240FD8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 95C1DC 80240FDC 8E4200CC */ lw $v0, 0xcc($s2) -/* 95C1E0 80240FE0 8C430000 */ lw $v1, ($v0) -/* 95C1E4 80240FE4 24020019 */ addiu $v0, $zero, 0x19 -/* 95C1E8 80240FE8 A602008E */ sh $v0, 0x8e($s0) -/* 95C1EC 80240FEC 2402000E */ addiu $v0, $zero, 0xe -/* 95C1F0 80240FF0 0809040B */ j .L8024102C -/* 95C1F4 80240FF4 AE030028 */ sw $v1, 0x28($s0) -.L80240FF8: -/* 95C1F8 80240FF8 0C00F598 */ jal func_8003D660 -/* 95C1FC 80240FFC 24050001 */ addiu $a1, $zero, 1 -/* 95C200 80241000 8E050018 */ lw $a1, 0x18($s0) -/* 95C204 80241004 8E06000C */ lw $a2, 0xc($s0) -/* 95C208 80241008 0C00EA95 */ jal npc_move_heading -/* 95C20C 8024100C 0200202D */ daddu $a0, $s0, $zero -/* 95C210 80241010 8602008E */ lh $v0, 0x8e($s0) -/* 95C214 80241014 9603008E */ lhu $v1, 0x8e($s0) -/* 95C218 80241018 18400003 */ blez $v0, .L80241028 -/* 95C21C 8024101C 2462FFFF */ addiu $v0, $v1, -1 -/* 95C220 80241020 0809040C */ j .L80241030 -/* 95C224 80241024 A602008E */ sh $v0, 0x8e($s0) -.L80241028: -/* 95C228 80241028 2402000C */ addiu $v0, $zero, 0xc -.L8024102C: -/* 95C22C 8024102C AE620070 */ sw $v0, 0x70($s3) -.L80241030: -/* 95C230 80241030 8FBF0040 */ lw $ra, 0x40($sp) -/* 95C234 80241034 8FB3003C */ lw $s3, 0x3c($sp) -/* 95C238 80241038 8FB20038 */ lw $s2, 0x38($sp) -/* 95C23C 8024103C 8FB10034 */ lw $s1, 0x34($sp) -/* 95C240 80241040 8FB00030 */ lw $s0, 0x30($sp) -/* 95C244 80241044 03E00008 */ jr $ra -/* 95C248 80241048 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s new file mode 100644 index 0000000000..251f84a206 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80240F2C_95C12C.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F2C_95C12C +/* 95C12C 80240F2C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 95C130 80240F30 AFB3003C */ sw $s3, 0x3c($sp) +/* 95C134 80240F34 0080982D */ daddu $s3, $a0, $zero +/* 95C138 80240F38 AFBF0040 */ sw $ra, 0x40($sp) +/* 95C13C 80240F3C AFB20038 */ sw $s2, 0x38($sp) +/* 95C140 80240F40 AFB10034 */ sw $s1, 0x34($sp) +/* 95C144 80240F44 AFB00030 */ sw $s0, 0x30($sp) +/* 95C148 80240F48 8E720148 */ lw $s2, 0x148($s3) +/* 95C14C 80240F4C 00A0882D */ daddu $s1, $a1, $zero +/* 95C150 80240F50 86440008 */ lh $a0, 8($s2) +/* 95C154 80240F54 0C00EABB */ jal get_npc_unsafe +/* 95C158 80240F58 00C0802D */ daddu $s0, $a2, $zero +/* 95C15C 80240F5C 0200202D */ daddu $a0, $s0, $zero +/* 95C160 80240F60 0240282D */ daddu $a1, $s2, $zero +/* 95C164 80240F64 24030001 */ addiu $v1, $zero, 1 +/* 95C168 80240F68 AFA30010 */ sw $v1, 0x10($sp) +/* 95C16C 80240F6C 8E260024 */ lw $a2, 0x24($s1) +/* 95C170 80240F70 8E270028 */ lw $a3, 0x28($s1) +/* 95C174 80240F74 0C01242D */ jal func_800490B4 +/* 95C178 80240F78 0040802D */ daddu $s0, $v0, $zero +/* 95C17C 80240F7C 1440001E */ bnez $v0, .L80240FF8 +/* 95C180 80240F80 0200202D */ daddu $a0, $s0, $zero +/* 95C184 80240F84 24040002 */ addiu $a0, $zero, 2 +/* 95C188 80240F88 0200282D */ daddu $a1, $s0, $zero +/* 95C18C 80240F8C 0000302D */ daddu $a2, $zero, $zero +/* 95C190 80240F90 860300A8 */ lh $v1, 0xa8($s0) +/* 95C194 80240F94 3C013F80 */ lui $at, 0x3f80 +/* 95C198 80240F98 44810000 */ mtc1 $at, $f0 +/* 95C19C 80240F9C 3C014000 */ lui $at, 0x4000 +/* 95C1A0 80240FA0 44811000 */ mtc1 $at, $f2 +/* 95C1A4 80240FA4 3C01C1A0 */ lui $at, 0xc1a0 +/* 95C1A8 80240FA8 44812000 */ mtc1 $at, $f4 +/* 95C1AC 80240FAC 2402000F */ addiu $v0, $zero, 0xf +/* 95C1B0 80240FB0 AFA2001C */ sw $v0, 0x1c($sp) +/* 95C1B4 80240FB4 44833000 */ mtc1 $v1, $f6 +/* 95C1B8 80240FB8 00000000 */ nop +/* 95C1BC 80240FBC 468031A0 */ cvt.s.w $f6, $f6 +/* 95C1C0 80240FC0 44073000 */ mfc1 $a3, $f6 +/* 95C1C4 80240FC4 27A20028 */ addiu $v0, $sp, 0x28 +/* 95C1C8 80240FC8 AFA20020 */ sw $v0, 0x20($sp) +/* 95C1CC 80240FCC E7A00010 */ swc1 $f0, 0x10($sp) +/* 95C1D0 80240FD0 E7A20014 */ swc1 $f2, 0x14($sp) +/* 95C1D4 80240FD4 0C01BFA4 */ jal fx_emote +/* 95C1D8 80240FD8 E7A40018 */ swc1 $f4, 0x18($sp) +/* 95C1DC 80240FDC 8E4200CC */ lw $v0, 0xcc($s2) +/* 95C1E0 80240FE0 8C430000 */ lw $v1, ($v0) +/* 95C1E4 80240FE4 24020019 */ addiu $v0, $zero, 0x19 +/* 95C1E8 80240FE8 A602008E */ sh $v0, 0x8e($s0) +/* 95C1EC 80240FEC 2402000E */ addiu $v0, $zero, 0xe +/* 95C1F0 80240FF0 0809040B */ j .L8024102C +/* 95C1F4 80240FF4 AE030028 */ sw $v1, 0x28($s0) +.L80240FF8: +/* 95C1F8 80240FF8 0C00F598 */ jal func_8003D660 +/* 95C1FC 80240FFC 24050001 */ addiu $a1, $zero, 1 +/* 95C200 80241000 8E050018 */ lw $a1, 0x18($s0) +/* 95C204 80241004 8E06000C */ lw $a2, 0xc($s0) +/* 95C208 80241008 0C00EA95 */ jal npc_move_heading +/* 95C20C 8024100C 0200202D */ daddu $a0, $s0, $zero +/* 95C210 80241010 8602008E */ lh $v0, 0x8e($s0) +/* 95C214 80241014 9603008E */ lhu $v1, 0x8e($s0) +/* 95C218 80241018 18400003 */ blez $v0, .L80241028 +/* 95C21C 8024101C 2462FFFF */ addiu $v0, $v1, -1 +/* 95C220 80241020 0809040C */ j .L80241030 +/* 95C224 80241024 A602008E */ sh $v0, 0x8e($s0) +.L80241028: +/* 95C228 80241028 2402000C */ addiu $v0, $zero, 0xc +.L8024102C: +/* 95C22C 8024102C AE620070 */ sw $v0, 0x70($s3) +.L80241030: +/* 95C230 80241030 8FBF0040 */ lw $ra, 0x40($sp) +/* 95C234 80241034 8FB3003C */ lw $s3, 0x3c($sp) +/* 95C238 80241038 8FB20038 */ lw $s2, 0x38($sp) +/* 95C23C 8024103C 8FB10034 */ lw $s1, 0x34($sp) +/* 95C240 80241040 8FB00030 */ lw $s0, 0x30($sp) +/* 95C244 80241044 03E00008 */ jr $ra +/* 95C248 80241048 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C.s deleted file mode 100644 index afa1d4c403..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024104C -/* 95C24C 8024104C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95C250 80241050 AFB10014 */ sw $s1, 0x14($sp) -/* 95C254 80241054 0080882D */ daddu $s1, $a0, $zero -/* 95C258 80241058 AFBF0018 */ sw $ra, 0x18($sp) -/* 95C25C 8024105C AFB00010 */ sw $s0, 0x10($sp) -/* 95C260 80241060 8E300148 */ lw $s0, 0x148($s1) -/* 95C264 80241064 0C00EABB */ jal get_npc_unsafe -/* 95C268 80241068 86040008 */ lh $a0, 8($s0) -/* 95C26C 8024106C 9443008E */ lhu $v1, 0x8e($v0) -/* 95C270 80241070 2463FFFF */ addiu $v1, $v1, -1 -/* 95C274 80241074 A443008E */ sh $v1, 0x8e($v0) -/* 95C278 80241078 00031C00 */ sll $v1, $v1, 0x10 -/* 95C27C 8024107C 14600008 */ bnez $v1, .L802410A0 -/* 95C280 80241080 00000000 */ nop -/* 95C284 80241084 8E0200B0 */ lw $v0, 0xb0($s0) -/* 95C288 80241088 30420080 */ andi $v0, $v0, 0x80 -/* 95C28C 8024108C 10400003 */ beqz $v0, .L8024109C -/* 95C290 80241090 2402000F */ addiu $v0, $zero, 0xf -/* 95C294 80241094 08090428 */ j .L802410A0 -/* 95C298 80241098 AE220070 */ sw $v0, 0x70($s1) -.L8024109C: -/* 95C29C 8024109C AE200070 */ sw $zero, 0x70($s1) -.L802410A0: -/* 95C2A0 802410A0 8FBF0018 */ lw $ra, 0x18($sp) -/* 95C2A4 802410A4 8FB10014 */ lw $s1, 0x14($sp) -/* 95C2A8 802410A8 8FB00010 */ lw $s0, 0x10($sp) -/* 95C2AC 802410AC 03E00008 */ jr $ra -/* 95C2B0 802410B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s new file mode 100644 index 0000000000..c325388baf --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024104C_95C24C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024104C_95C24C +/* 95C24C 8024104C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95C250 80241050 AFB10014 */ sw $s1, 0x14($sp) +/* 95C254 80241054 0080882D */ daddu $s1, $a0, $zero +/* 95C258 80241058 AFBF0018 */ sw $ra, 0x18($sp) +/* 95C25C 8024105C AFB00010 */ sw $s0, 0x10($sp) +/* 95C260 80241060 8E300148 */ lw $s0, 0x148($s1) +/* 95C264 80241064 0C00EABB */ jal get_npc_unsafe +/* 95C268 80241068 86040008 */ lh $a0, 8($s0) +/* 95C26C 8024106C 9443008E */ lhu $v1, 0x8e($v0) +/* 95C270 80241070 2463FFFF */ addiu $v1, $v1, -1 +/* 95C274 80241074 A443008E */ sh $v1, 0x8e($v0) +/* 95C278 80241078 00031C00 */ sll $v1, $v1, 0x10 +/* 95C27C 8024107C 14600008 */ bnez $v1, .L802410A0 +/* 95C280 80241080 00000000 */ nop +/* 95C284 80241084 8E0200B0 */ lw $v0, 0xb0($s0) +/* 95C288 80241088 30420080 */ andi $v0, $v0, 0x80 +/* 95C28C 8024108C 10400003 */ beqz $v0, .L8024109C +/* 95C290 80241090 2402000F */ addiu $v0, $zero, 0xf +/* 95C294 80241094 08090428 */ j .L802410A0 +/* 95C298 80241098 AE220070 */ sw $v0, 0x70($s1) +.L8024109C: +/* 95C29C 8024109C AE200070 */ sw $zero, 0x70($s1) +.L802410A0: +/* 95C2A0 802410A0 8FBF0018 */ lw $ra, 0x18($sp) +/* 95C2A4 802410A4 8FB10014 */ lw $s1, 0x14($sp) +/* 95C2A8 802410A8 8FB00010 */ lw $s0, 0x10($sp) +/* 95C2AC 802410AC 03E00008 */ jr $ra +/* 95C2B0 802410B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4.s deleted file mode 100644 index 0d15c3d867..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B4 -/* 95C2B4 802410B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95C2B8 802410B8 AFB10014 */ sw $s1, 0x14($sp) -/* 95C2BC 802410BC 0080882D */ daddu $s1, $a0, $zero -/* 95C2C0 802410C0 AFBF001C */ sw $ra, 0x1c($sp) -/* 95C2C4 802410C4 AFB20018 */ sw $s2, 0x18($sp) -/* 95C2C8 802410C8 AFB00010 */ sw $s0, 0x10($sp) -/* 95C2CC 802410CC 8E300148 */ lw $s0, 0x148($s1) -/* 95C2D0 802410D0 86040008 */ lh $a0, 8($s0) -/* 95C2D4 802410D4 0C00EABB */ jal get_npc_unsafe -/* 95C2D8 802410D8 00A0902D */ daddu $s2, $a1, $zero -/* 95C2DC 802410DC 8E0300D0 */ lw $v1, 0xd0($s0) -/* 95C2E0 802410E0 8E240078 */ lw $a0, 0x78($s1) -/* 95C2E4 802410E4 8C630000 */ lw $v1, ($v1) -/* 95C2E8 802410E8 0083182A */ slt $v1, $a0, $v1 -/* 95C2EC 802410EC 10600013 */ beqz $v1, .L8024113C -/* 95C2F0 802410F0 0040302D */ daddu $a2, $v0, $zero -/* 95C2F4 802410F4 00041040 */ sll $v0, $a0, 1 -/* 95C2F8 802410F8 00441021 */ addu $v0, $v0, $a0 -/* 95C2FC 802410FC 00022880 */ sll $a1, $v0, 2 -.L80241100: -/* 95C300 80241100 8E0300D0 */ lw $v1, 0xd0($s0) -/* 95C304 80241104 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 95C308 80241108 00A31021 */ addu $v0, $a1, $v1 -/* 95C30C 8024110C C4400008 */ lwc1 $f0, 8($v0) -/* 95C310 80241110 46800020 */ cvt.s.w $f0, $f0 -/* 95C314 80241114 4602003E */ c.le.s $f0, $f2 -/* 95C318 80241118 00000000 */ nop -/* 95C31C 8024111C 45020003 */ bc1fl .L8024112C -/* 95C320 80241120 24840001 */ addiu $a0, $a0, 1 -/* 95C324 80241124 0809044F */ j .L8024113C -/* 95C328 80241128 AE240078 */ sw $a0, 0x78($s1) -.L8024112C: -/* 95C32C 8024112C 8C620000 */ lw $v0, ($v1) -/* 95C330 80241130 0082102A */ slt $v0, $a0, $v0 -/* 95C334 80241134 1440FFF2 */ bnez $v0, .L80241100 -/* 95C338 80241138 24A5000C */ addiu $a1, $a1, 0xc -.L8024113C: -/* 95C33C 8024113C C6400000 */ lwc1 $f0, ($s2) -/* 95C340 80241140 E4C00018 */ swc1 $f0, 0x18($a2) -/* 95C344 80241144 8E0200CC */ lw $v0, 0xcc($s0) -/* 95C348 80241148 8C420004 */ lw $v0, 4($v0) -/* 95C34C 8024114C ACC20028 */ sw $v0, 0x28($a2) -/* 95C350 80241150 24020001 */ addiu $v0, $zero, 1 -/* 95C354 80241154 AE200074 */ sw $zero, 0x74($s1) -/* 95C358 80241158 AE220070 */ sw $v0, 0x70($s1) -/* 95C35C 8024115C 8FBF001C */ lw $ra, 0x1c($sp) -/* 95C360 80241160 8FB20018 */ lw $s2, 0x18($sp) -/* 95C364 80241164 8FB10014 */ lw $s1, 0x14($sp) -/* 95C368 80241168 8FB00010 */ lw $s0, 0x10($sp) -/* 95C36C 8024116C 03E00008 */ jr $ra -/* 95C370 80241170 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s new file mode 100644 index 0000000000..cb8d57ad40 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802410B4_95C2B4.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410B4_95C2B4 +/* 95C2B4 802410B4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95C2B8 802410B8 AFB10014 */ sw $s1, 0x14($sp) +/* 95C2BC 802410BC 0080882D */ daddu $s1, $a0, $zero +/* 95C2C0 802410C0 AFBF001C */ sw $ra, 0x1c($sp) +/* 95C2C4 802410C4 AFB20018 */ sw $s2, 0x18($sp) +/* 95C2C8 802410C8 AFB00010 */ sw $s0, 0x10($sp) +/* 95C2CC 802410CC 8E300148 */ lw $s0, 0x148($s1) +/* 95C2D0 802410D0 86040008 */ lh $a0, 8($s0) +/* 95C2D4 802410D4 0C00EABB */ jal get_npc_unsafe +/* 95C2D8 802410D8 00A0902D */ daddu $s2, $a1, $zero +/* 95C2DC 802410DC 8E0300D0 */ lw $v1, 0xd0($s0) +/* 95C2E0 802410E0 8E240078 */ lw $a0, 0x78($s1) +/* 95C2E4 802410E4 8C630000 */ lw $v1, ($v1) +/* 95C2E8 802410E8 0083182A */ slt $v1, $a0, $v1 +/* 95C2EC 802410EC 10600013 */ beqz $v1, .L8024113C +/* 95C2F0 802410F0 0040302D */ daddu $a2, $v0, $zero +/* 95C2F4 802410F4 00041040 */ sll $v0, $a0, 1 +/* 95C2F8 802410F8 00441021 */ addu $v0, $v0, $a0 +/* 95C2FC 802410FC 00022880 */ sll $a1, $v0, 2 +.L80241100: +/* 95C300 80241100 8E0300D0 */ lw $v1, 0xd0($s0) +/* 95C304 80241104 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* 95C308 80241108 00A31021 */ addu $v0, $a1, $v1 +/* 95C30C 8024110C C4400008 */ lwc1 $f0, 8($v0) +/* 95C310 80241110 46800020 */ cvt.s.w $f0, $f0 +/* 95C314 80241114 4602003E */ c.le.s $f0, $f2 +/* 95C318 80241118 00000000 */ nop +/* 95C31C 8024111C 45020003 */ bc1fl .L8024112C +/* 95C320 80241120 24840001 */ addiu $a0, $a0, 1 +/* 95C324 80241124 0809044F */ j .L8024113C +/* 95C328 80241128 AE240078 */ sw $a0, 0x78($s1) +.L8024112C: +/* 95C32C 8024112C 8C620000 */ lw $v0, ($v1) +/* 95C330 80241130 0082102A */ slt $v0, $a0, $v0 +/* 95C334 80241134 1440FFF2 */ bnez $v0, .L80241100 +/* 95C338 80241138 24A5000C */ addiu $a1, $a1, 0xc +.L8024113C: +/* 95C33C 8024113C C6400000 */ lwc1 $f0, ($s2) +/* 95C340 80241140 E4C00018 */ swc1 $f0, 0x18($a2) +/* 95C344 80241144 8E0200CC */ lw $v0, 0xcc($s0) +/* 95C348 80241148 8C420004 */ lw $v0, 4($v0) +/* 95C34C 8024114C ACC20028 */ sw $v0, 0x28($a2) +/* 95C350 80241150 24020001 */ addiu $v0, $zero, 1 +/* 95C354 80241154 AE200074 */ sw $zero, 0x74($s1) +/* 95C358 80241158 AE220070 */ sw $v0, 0x70($s1) +/* 95C35C 8024115C 8FBF001C */ lw $ra, 0x1c($sp) +/* 95C360 80241160 8FB20018 */ lw $s2, 0x18($sp) +/* 95C364 80241164 8FB10014 */ lw $s1, 0x14($sp) +/* 95C368 80241168 8FB00010 */ lw $s0, 0x10($sp) +/* 95C36C 8024116C 03E00008 */ jr $ra +/* 95C370 80241170 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s index e0af860996..9d0e0cccec 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241174_95C374.s @@ -131,59 +131,59 @@ glabel func_80241174_95C374 /* 95C554 80241354 00000000 */ nop /* 95C558 80241358 0280202D */ daddu $a0, $s4, $zero /* 95C55C 8024135C 0260282D */ daddu $a1, $s3, $zero -/* 95C560 80241360 0C090178 */ jal func_802405E0 +/* 95C560 80241360 0C090178 */ jal func_802405E0_95B7E0 /* 95C564 80241364 02A0302D */ daddu $a2, $s5, $zero /* 95C568 80241368 0280202D */ daddu $a0, $s4, $zero /* 95C56C 8024136C 0260282D */ daddu $a1, $s3, $zero -/* 95C570 80241370 0C0901CE */ jal func_80240738 +/* 95C570 80241370 0C0901CE */ jal func_80240738_95B938 /* 95C574 80241374 02A0302D */ daddu $a2, $s5, $zero /* 95C578 80241378 08090512 */ j .L80241448 /* 95C57C 8024137C 00000000 */ nop /* 95C580 80241380 0280202D */ daddu $a0, $s4, $zero /* 95C584 80241384 0260282D */ daddu $a1, $s3, $zero -/* 95C588 80241388 0C090278 */ jal func_802409E0 +/* 95C588 80241388 0C090278 */ jal func_802409E0_95BBE0 /* 95C58C 8024138C 02A0302D */ daddu $a2, $s5, $zero /* 95C590 80241390 0280202D */ daddu $a0, $s4, $zero /* 95C594 80241394 0260282D */ daddu $a1, $s3, $zero -/* 95C598 80241398 0C0902A8 */ jal func_80240AA0 +/* 95C598 80241398 0C0902A8 */ jal func_80240AA0_95BCA0 /* 95C59C 8024139C 02A0302D */ daddu $a2, $s5, $zero /* 95C5A0 802413A0 08090512 */ j .L80241448 /* 95C5A4 802413A4 00000000 */ nop /* 95C5A8 802413A8 0280202D */ daddu $a0, $s4, $zero /* 95C5AC 802413AC 0260282D */ daddu $a1, $s3, $zero -/* 95C5B0 802413B0 0C090317 */ jal func_80240C5C +/* 95C5B0 802413B0 0C090317 */ jal func_80240C5C_95BE5C /* 95C5B4 802413B4 02A0302D */ daddu $a2, $s5, $zero /* 95C5B8 802413B8 08090512 */ j .L80241448 /* 95C5BC 802413BC 00000000 */ nop /* 95C5C0 802413C0 0280202D */ daddu $a0, $s4, $zero /* 95C5C4 802413C4 0260282D */ daddu $a1, $s3, $zero -/* 95C5C8 802413C8 0C090344 */ jal func_80240D10 +/* 95C5C8 802413C8 0C090344 */ jal func_80240D10_95BF10 /* 95C5CC 802413CC 02A0302D */ daddu $a2, $s5, $zero /* 95C5D0 802413D0 0280202D */ daddu $a0, $s4, $zero /* 95C5D4 802413D4 0260282D */ daddu $a1, $s3, $zero -/* 95C5D8 802413D8 0C090361 */ jal func_80240D84 +/* 95C5D8 802413D8 0C090361 */ jal func_80240D84_95BF84 /* 95C5DC 802413DC 02A0302D */ daddu $a2, $s5, $zero /* 95C5E0 802413E0 08090512 */ j .L80241448 /* 95C5E4 802413E4 00000000 */ nop /* 95C5E8 802413E8 0280202D */ daddu $a0, $s4, $zero /* 95C5EC 802413EC 0260282D */ daddu $a1, $s3, $zero -/* 95C5F0 802413F0 0C09037F */ jal func_80240DFC +/* 95C5F0 802413F0 0C09037F */ jal func_80240DFC_95BFFC /* 95C5F4 802413F4 02A0302D */ daddu $a2, $s5, $zero /* 95C5F8 802413F8 0280202D */ daddu $a0, $s4, $zero /* 95C5FC 802413FC 0260282D */ daddu $a1, $s3, $zero -/* 95C600 80241400 0C0903CB */ jal func_80240F2C +/* 95C600 80241400 0C0903CB */ jal func_80240F2C_95C12C /* 95C604 80241404 02A0302D */ daddu $a2, $s5, $zero /* 95C608 80241408 08090512 */ j .L80241448 /* 95C60C 8024140C 00000000 */ nop /* 95C610 80241410 0280202D */ daddu $a0, $s4, $zero /* 95C614 80241414 0260282D */ daddu $a1, $s3, $zero -/* 95C618 80241418 0C090413 */ jal func_8024104C +/* 95C618 80241418 0C090413 */ jal func_8024104C_95C24C /* 95C61C 8024141C 02A0302D */ daddu $a2, $s5, $zero /* 95C620 80241420 08090512 */ j .L80241448 /* 95C624 80241424 00000000 */ nop /* 95C628 80241428 0280202D */ daddu $a0, $s4, $zero /* 95C62C 8024142C 0260282D */ daddu $a1, $s3, $zero -/* 95C630 80241430 0C09042D */ jal func_802410B4 +/* 95C630 80241430 0C09042D */ jal func_802410B4_95C2B4 /* 95C634 80241434 02A0302D */ daddu $a2, $s5, $zero /* 95C638 80241438 08090512 */ j .L80241448 /* 95C63C 8024143C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470.s deleted file mode 100644 index 7bd7a91644..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241470 -/* 95C670 80241470 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95C674 80241474 AFB00010 */ sw $s0, 0x10($sp) -/* 95C678 80241478 3C108024 */ lui $s0, 0x8024 -/* 95C67C 8024147C 261051B8 */ addiu $s0, $s0, 0x51b8 -/* 95C680 80241480 AFBF0018 */ sw $ra, 0x18($sp) -/* 95C684 80241484 AFB10014 */ sw $s1, 0x14($sp) -/* 95C688 80241488 8E020000 */ lw $v0, ($s0) -/* 95C68C 8024148C 14400010 */ bnez $v0, .L802414D0 -/* 95C690 80241490 0080882D */ daddu $s1, $a0, $zero -/* 95C694 80241494 0C00AB39 */ jal heap_malloc -/* 95C698 80241498 24040040 */ addiu $a0, $zero, 0x40 -/* 95C69C 8024149C AE020000 */ sw $v0, ($s0) -/* 95C6A0 802414A0 0000182D */ daddu $v1, $zero, $zero -/* 95C6A4 802414A4 0040282D */ daddu $a1, $v0, $zero -/* 95C6A8 802414A8 0220202D */ daddu $a0, $s1, $zero -.L802414AC: -/* 95C6AC 802414AC 8C820084 */ lw $v0, 0x84($a0) -/* 95C6B0 802414B0 24840004 */ addiu $a0, $a0, 4 -/* 95C6B4 802414B4 24630001 */ addiu $v1, $v1, 1 -/* 95C6B8 802414B8 ACA20000 */ sw $v0, ($a1) -/* 95C6BC 802414BC 28620010 */ slti $v0, $v1, 0x10 -/* 95C6C0 802414C0 1440FFFA */ bnez $v0, .L802414AC -/* 95C6C4 802414C4 24A50004 */ addiu $a1, $a1, 4 -/* 95C6C8 802414C8 08090543 */ j .L8024150C -/* 95C6CC 802414CC 00000000 */ nop -.L802414D0: -/* 95C6D0 802414D0 0000182D */ daddu $v1, $zero, $zero -/* 95C6D4 802414D4 0040282D */ daddu $a1, $v0, $zero -/* 95C6D8 802414D8 0220202D */ daddu $a0, $s1, $zero -.L802414DC: -/* 95C6DC 802414DC 8CA20000 */ lw $v0, ($a1) -/* 95C6E0 802414E0 24A50004 */ addiu $a1, $a1, 4 -/* 95C6E4 802414E4 24630001 */ addiu $v1, $v1, 1 -/* 95C6E8 802414E8 AC820084 */ sw $v0, 0x84($a0) -/* 95C6EC 802414EC 28620010 */ slti $v0, $v1, 0x10 -/* 95C6F0 802414F0 1440FFFA */ bnez $v0, .L802414DC -/* 95C6F4 802414F4 24840004 */ addiu $a0, $a0, 4 -/* 95C6F8 802414F8 3C108024 */ lui $s0, 0x8024 -/* 95C6FC 802414FC 261051B8 */ addiu $s0, $s0, 0x51b8 -/* 95C700 80241500 0C00AB4B */ jal heap_free -/* 95C704 80241504 8E040000 */ lw $a0, ($s0) -/* 95C708 80241508 AE000000 */ sw $zero, ($s0) -.L8024150C: -/* 95C70C 8024150C 8FBF0018 */ lw $ra, 0x18($sp) -/* 95C710 80241510 8FB10014 */ lw $s1, 0x14($sp) -/* 95C714 80241514 8FB00010 */ lw $s0, 0x10($sp) -/* 95C718 80241518 24020002 */ addiu $v0, $zero, 2 -/* 95C71C 8024151C 03E00008 */ jr $ra -/* 95C720 80241520 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s new file mode 100644 index 0000000000..caf01cdc72 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241470_95C670.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241470_95C670 +/* 95C670 80241470 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95C674 80241474 AFB00010 */ sw $s0, 0x10($sp) +/* 95C678 80241478 3C108024 */ lui $s0, 0x8024 +/* 95C67C 8024147C 261051B8 */ addiu $s0, $s0, 0x51b8 +/* 95C680 80241480 AFBF0018 */ sw $ra, 0x18($sp) +/* 95C684 80241484 AFB10014 */ sw $s1, 0x14($sp) +/* 95C688 80241488 8E020000 */ lw $v0, ($s0) +/* 95C68C 8024148C 14400010 */ bnez $v0, .L802414D0 +/* 95C690 80241490 0080882D */ daddu $s1, $a0, $zero +/* 95C694 80241494 0C00AB39 */ jal heap_malloc +/* 95C698 80241498 24040040 */ addiu $a0, $zero, 0x40 +/* 95C69C 8024149C AE020000 */ sw $v0, ($s0) +/* 95C6A0 802414A0 0000182D */ daddu $v1, $zero, $zero +/* 95C6A4 802414A4 0040282D */ daddu $a1, $v0, $zero +/* 95C6A8 802414A8 0220202D */ daddu $a0, $s1, $zero +.L802414AC: +/* 95C6AC 802414AC 8C820084 */ lw $v0, 0x84($a0) +/* 95C6B0 802414B0 24840004 */ addiu $a0, $a0, 4 +/* 95C6B4 802414B4 24630001 */ addiu $v1, $v1, 1 +/* 95C6B8 802414B8 ACA20000 */ sw $v0, ($a1) +/* 95C6BC 802414BC 28620010 */ slti $v0, $v1, 0x10 +/* 95C6C0 802414C0 1440FFFA */ bnez $v0, .L802414AC +/* 95C6C4 802414C4 24A50004 */ addiu $a1, $a1, 4 +/* 95C6C8 802414C8 08090543 */ j .L8024150C +/* 95C6CC 802414CC 00000000 */ nop +.L802414D0: +/* 95C6D0 802414D0 0000182D */ daddu $v1, $zero, $zero +/* 95C6D4 802414D4 0040282D */ daddu $a1, $v0, $zero +/* 95C6D8 802414D8 0220202D */ daddu $a0, $s1, $zero +.L802414DC: +/* 95C6DC 802414DC 8CA20000 */ lw $v0, ($a1) +/* 95C6E0 802414E0 24A50004 */ addiu $a1, $a1, 4 +/* 95C6E4 802414E4 24630001 */ addiu $v1, $v1, 1 +/* 95C6E8 802414E8 AC820084 */ sw $v0, 0x84($a0) +/* 95C6EC 802414EC 28620010 */ slti $v0, $v1, 0x10 +/* 95C6F0 802414F0 1440FFFA */ bnez $v0, .L802414DC +/* 95C6F4 802414F4 24840004 */ addiu $a0, $a0, 4 +/* 95C6F8 802414F8 3C108024 */ lui $s0, 0x8024 +/* 95C6FC 802414FC 261051B8 */ addiu $s0, $s0, 0x51b8 +/* 95C700 80241500 0C00AB4B */ jal heap_free +/* 95C704 80241504 8E040000 */ lw $a0, ($s0) +/* 95C708 80241508 AE000000 */ sw $zero, ($s0) +.L8024150C: +/* 95C70C 8024150C 8FBF0018 */ lw $ra, 0x18($sp) +/* 95C710 80241510 8FB10014 */ lw $s1, 0x14($sp) +/* 95C714 80241514 8FB00010 */ lw $s0, 0x10($sp) +/* 95C718 80241518 24020002 */ addiu $v0, $zero, 2 +/* 95C71C 8024151C 03E00008 */ jr $ra +/* 95C720 80241520 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588.s deleted file mode 100644 index db46a0fdec..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241588 -/* 95C788 80241588 24020001 */ addiu $v0, $zero, 1 -/* 95C78C 8024158C 3C018015 */ lui $at, %hi(D_80151310) -/* 95C790 80241590 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 95C794 80241594 03E00008 */ jr $ra -/* 95C798 80241598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s new file mode 100644 index 0000000000..b1c7c9d842 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241588_95C788 +/* 95C788 80241588 24020001 */ addiu $v0, $zero, 1 +/* 95C78C 8024158C 3C018015 */ lui $at, %hi(D_80151310) +/* 95C790 80241590 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* 95C794 80241594 03E00008 */ jr $ra +/* 95C798 80241598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC.s deleted file mode 100644 index 95b5bcba5d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415AC -/* 95C7AC 802415AC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95C7B0 802415B0 AFB10024 */ sw $s1, 0x24($sp) -/* 95C7B4 802415B4 0080882D */ daddu $s1, $a0, $zero -/* 95C7B8 802415B8 3C05F840 */ lui $a1, 0xf840 -/* 95C7BC 802415BC AFBF0044 */ sw $ra, 0x44($sp) -/* 95C7C0 802415C0 AFBE0040 */ sw $fp, 0x40($sp) -/* 95C7C4 802415C4 AFB7003C */ sw $s7, 0x3c($sp) -/* 95C7C8 802415C8 AFB60038 */ sw $s6, 0x38($sp) -/* 95C7CC 802415CC AFB50034 */ sw $s5, 0x34($sp) -/* 95C7D0 802415D0 AFB40030 */ sw $s4, 0x30($sp) -/* 95C7D4 802415D4 AFB3002C */ sw $s3, 0x2c($sp) -/* 95C7D8 802415D8 AFB20028 */ sw $s2, 0x28($sp) -/* 95C7DC 802415DC AFB00020 */ sw $s0, 0x20($sp) -/* 95C7E0 802415E0 8E3E0148 */ lw $fp, 0x148($s1) -/* 95C7E4 802415E4 0C0B1EAF */ jal get_variable -/* 95C7E8 802415E8 34A56268 */ ori $a1, $a1, 0x6268 -/* 95C7EC 802415EC 0040802D */ daddu $s0, $v0, $zero -/* 95C7F0 802415F0 0220202D */ daddu $a0, $s1, $zero -/* 95C7F4 802415F4 3C05F840 */ lui $a1, 0xf840 -/* 95C7F8 802415F8 0C0B1EAF */ jal get_variable -/* 95C7FC 802415FC 34A56269 */ ori $a1, $a1, 0x6269 -/* 95C800 80241600 0040B82D */ daddu $s7, $v0, $zero -/* 95C804 80241604 0220202D */ daddu $a0, $s1, $zero -/* 95C808 80241608 3C05F5DE */ lui $a1, 0xf5de -/* 95C80C 8024160C 0C0B1EAF */ jal get_variable -/* 95C810 80241610 34A502DE */ ori $a1, $a1, 0x2de -/* 95C814 80241614 0040B02D */ daddu $s6, $v0, $zero -/* 95C818 80241618 0220202D */ daddu $a0, $s1, $zero -/* 95C81C 8024161C 3C05F5DE */ lui $a1, 0xf5de -/* 95C820 80241620 0C0B1EAF */ jal get_variable -/* 95C824 80241624 34A502DF */ ori $a1, $a1, 0x2df -/* 95C828 80241628 0040A82D */ daddu $s5, $v0, $zero -/* 95C82C 8024162C 93D3006D */ lbu $s3, 0x6d($fp) -/* 95C830 80241630 32C2FFFF */ andi $v0, $s6, 0xffff -/* 95C834 80241634 A7B30010 */ sh $s3, 0x10($sp) -/* 95C838 80241638 93D2006E */ lbu $s2, 0x6e($fp) -/* 95C83C 8024163C 93C7006F */ lbu $a3, 0x6f($fp) -/* 95C840 80241640 3274FFFF */ andi $s4, $s3, 0xffff -/* 95C844 80241644 12820003 */ beq $s4, $v0, .L80241654 -/* 95C848 80241648 A7A7001E */ sh $a3, 0x1e($sp) -/* 95C84C 8024164C 0000B82D */ daddu $s7, $zero, $zero -/* 95C850 80241650 02E0802D */ daddu $s0, $s7, $zero -.L80241654: -/* 95C854 80241654 3202FFFF */ andi $v0, $s0, 0xffff -/* 95C858 80241658 14400016 */ bnez $v0, .L802416B4 -/* 95C85C 8024165C 0220202D */ daddu $a0, $s1, $zero -/* 95C860 80241660 0C00A67F */ jal rand_int -/* 95C864 80241664 24040064 */ addiu $a0, $zero, 0x64 -/* 95C868 80241668 2842001E */ slti $v0, $v0, 0x1e -/* 95C86C 8024166C 10400011 */ beqz $v0, .L802416B4 -/* 95C870 80241670 0220202D */ daddu $a0, $s1, $zero -/* 95C874 80241674 0C00A67F */ jal rand_int -/* 95C878 80241678 2644FFFF */ addiu $a0, $s2, -1 -/* 95C87C 8024167C 0040A82D */ daddu $s5, $v0, $zero -/* 95C880 80241680 0260B02D */ daddu $s6, $s3, $zero -/* 95C884 80241684 0220202D */ daddu $a0, $s1, $zero -/* 95C888 80241688 3C05F5DE */ lui $a1, 0xf5de -/* 95C88C 8024168C 34A502DE */ ori $a1, $a1, 0x2de -/* 95C890 80241690 0C0B2026 */ jal set_variable -/* 95C894 80241694 0280302D */ daddu $a2, $s4, $zero -/* 95C898 80241698 0220202D */ daddu $a0, $s1, $zero -/* 95C89C 8024169C 3C05F5DE */ lui $a1, 0xf5de -/* 95C8A0 802416A0 34A502DF */ ori $a1, $a1, 0x2df -/* 95C8A4 802416A4 0C0B2026 */ jal set_variable -/* 95C8A8 802416A8 32A6FFFF */ andi $a2, $s5, 0xffff -/* 95C8AC 802416AC 24100001 */ addiu $s0, $zero, 1 -/* 95C8B0 802416B0 0220202D */ daddu $a0, $s1, $zero -.L802416B4: -/* 95C8B4 802416B4 3C05F840 */ lui $a1, 0xf840 -/* 95C8B8 802416B8 34A56268 */ ori $a1, $a1, 0x6268 -/* 95C8BC 802416BC 0C0B2026 */ jal set_variable -/* 95C8C0 802416C0 3206FFFF */ andi $a2, $s0, 0xffff -/* 95C8C4 802416C4 0220202D */ daddu $a0, $s1, $zero -/* 95C8C8 802416C8 3C05F840 */ lui $a1, 0xf840 -/* 95C8CC 802416CC 34A56269 */ ori $a1, $a1, 0x6269 -/* 95C8D0 802416D0 0C0B2026 */ jal set_variable -/* 95C8D4 802416D4 32E6FFFF */ andi $a2, $s7, 0xffff -/* 95C8D8 802416D8 0000202D */ daddu $a0, $zero, $zero -/* 95C8DC 802416DC 3C05F5DE */ lui $a1, 0xf5de -/* 95C8E0 802416E0 0C0B1EAF */ jal get_variable -/* 95C8E4 802416E4 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 95C8E8 802416E8 0000202D */ daddu $a0, $zero, $zero -/* 95C8EC 802416EC 3C05F5DE */ lui $a1, 0xf5de -/* 95C8F0 802416F0 34A50180 */ ori $a1, $a1, 0x180 -/* 95C8F4 802416F4 0C0B1EAF */ jal get_variable -/* 95C8F8 802416F8 0040802D */ daddu $s0, $v0, $zero -/* 95C8FC 802416FC 0040282D */ daddu $a1, $v0, $zero -/* 95C900 80241700 0000182D */ daddu $v1, $zero, $zero -/* 95C904 80241704 3C068024 */ lui $a2, 0x8024 -/* 95C908 80241708 24C6525C */ addiu $a2, $a2, 0x525c -/* 95C90C 8024170C 00C0202D */ daddu $a0, $a2, $zero -.L80241710: -/* 95C910 80241710 8C820000 */ lw $v0, ($a0) -/* 95C914 80241714 00A2102A */ slt $v0, $a1, $v0 -/* 95C918 80241718 14400006 */ bnez $v0, .L80241734 -/* 95C91C 8024171C 000310C0 */ sll $v0, $v1, 3 -/* 95C920 80241720 24630001 */ addiu $v1, $v1, 1 -/* 95C924 80241724 28620008 */ slti $v0, $v1, 8 -/* 95C928 80241728 1440FFF9 */ bnez $v0, .L80241710 -/* 95C92C 8024172C 24840008 */ addiu $a0, $a0, 8 -/* 95C930 80241730 000310C0 */ sll $v0, $v1, 3 -.L80241734: -/* 95C934 80241734 00461021 */ addu $v0, $v0, $a2 -/* 95C938 80241738 8C420004 */ lw $v0, 4($v0) -/* 95C93C 8024173C 97A30010 */ lhu $v1, 0x10($sp) -/* 95C940 80241740 0202202A */ slt $a0, $s0, $v0 -/* 95C944 80241744 32C2FFFF */ andi $v0, $s6, 0xffff -/* 95C948 80241748 14620008 */ bne $v1, $v0, .L8024176C -/* 95C94C 8024174C 32A2FFFF */ andi $v0, $s5, 0xffff -/* 95C950 80241750 97A7001E */ lhu $a3, 0x1e($sp) -/* 95C954 80241754 14E20005 */ bne $a3, $v0, .L8024176C -/* 95C958 80241758 32E2FFFF */ andi $v0, $s7, 0xffff -/* 95C95C 8024175C 14400003 */ bnez $v0, .L8024176C -/* 95C960 80241760 00000000 */ nop -/* 95C964 80241764 14800008 */ bnez $a0, .L80241788 -/* 95C968 80241768 24020001 */ addiu $v0, $zero, 1 -.L8024176C: -/* 95C96C 8024176C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 95C970 80241770 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 95C974 80241774 80420075 */ lb $v0, 0x75($v0) -/* 95C978 80241778 10400005 */ beqz $v0, .L80241790 -/* 95C97C 8024177C 00000000 */ nop -/* 95C980 80241780 10800003 */ beqz $a0, .L80241790 -/* 95C984 80241784 24020001 */ addiu $v0, $zero, 1 -.L80241788: -/* 95C988 80241788 080905E7 */ j .L8024179C -/* 95C98C 8024178C AE220084 */ sw $v0, 0x84($s1) -.L80241790: -/* 95C990 80241790 0C00F9EB */ jal kill_enemy -/* 95C994 80241794 03C0202D */ daddu $a0, $fp, $zero -/* 95C998 80241798 AE200084 */ sw $zero, 0x84($s1) -.L8024179C: -/* 95C99C 8024179C 8FBF0044 */ lw $ra, 0x44($sp) -/* 95C9A0 802417A0 8FBE0040 */ lw $fp, 0x40($sp) -/* 95C9A4 802417A4 8FB7003C */ lw $s7, 0x3c($sp) -/* 95C9A8 802417A8 8FB60038 */ lw $s6, 0x38($sp) -/* 95C9AC 802417AC 8FB50034 */ lw $s5, 0x34($sp) -/* 95C9B0 802417B0 8FB40030 */ lw $s4, 0x30($sp) -/* 95C9B4 802417B4 8FB3002C */ lw $s3, 0x2c($sp) -/* 95C9B8 802417B8 8FB20028 */ lw $s2, 0x28($sp) -/* 95C9BC 802417BC 8FB10024 */ lw $s1, 0x24($sp) -/* 95C9C0 802417C0 8FB00020 */ lw $s0, 0x20($sp) -/* 95C9C4 802417C4 24020002 */ addiu $v0, $zero, 2 -/* 95C9C8 802417C8 03E00008 */ jr $ra -/* 95C9CC 802417CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s new file mode 100644 index 0000000000..da125d8494 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802415AC_95C7AC.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415AC_95C7AC +/* 95C7AC 802415AC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 95C7B0 802415B0 AFB10024 */ sw $s1, 0x24($sp) +/* 95C7B4 802415B4 0080882D */ daddu $s1, $a0, $zero +/* 95C7B8 802415B8 3C05F840 */ lui $a1, 0xf840 +/* 95C7BC 802415BC AFBF0044 */ sw $ra, 0x44($sp) +/* 95C7C0 802415C0 AFBE0040 */ sw $fp, 0x40($sp) +/* 95C7C4 802415C4 AFB7003C */ sw $s7, 0x3c($sp) +/* 95C7C8 802415C8 AFB60038 */ sw $s6, 0x38($sp) +/* 95C7CC 802415CC AFB50034 */ sw $s5, 0x34($sp) +/* 95C7D0 802415D0 AFB40030 */ sw $s4, 0x30($sp) +/* 95C7D4 802415D4 AFB3002C */ sw $s3, 0x2c($sp) +/* 95C7D8 802415D8 AFB20028 */ sw $s2, 0x28($sp) +/* 95C7DC 802415DC AFB00020 */ sw $s0, 0x20($sp) +/* 95C7E0 802415E0 8E3E0148 */ lw $fp, 0x148($s1) +/* 95C7E4 802415E4 0C0B1EAF */ jal get_variable +/* 95C7E8 802415E8 34A56268 */ ori $a1, $a1, 0x6268 +/* 95C7EC 802415EC 0040802D */ daddu $s0, $v0, $zero +/* 95C7F0 802415F0 0220202D */ daddu $a0, $s1, $zero +/* 95C7F4 802415F4 3C05F840 */ lui $a1, 0xf840 +/* 95C7F8 802415F8 0C0B1EAF */ jal get_variable +/* 95C7FC 802415FC 34A56269 */ ori $a1, $a1, 0x6269 +/* 95C800 80241600 0040B82D */ daddu $s7, $v0, $zero +/* 95C804 80241604 0220202D */ daddu $a0, $s1, $zero +/* 95C808 80241608 3C05F5DE */ lui $a1, 0xf5de +/* 95C80C 8024160C 0C0B1EAF */ jal get_variable +/* 95C810 80241610 34A502DE */ ori $a1, $a1, 0x2de +/* 95C814 80241614 0040B02D */ daddu $s6, $v0, $zero +/* 95C818 80241618 0220202D */ daddu $a0, $s1, $zero +/* 95C81C 8024161C 3C05F5DE */ lui $a1, 0xf5de +/* 95C820 80241620 0C0B1EAF */ jal get_variable +/* 95C824 80241624 34A502DF */ ori $a1, $a1, 0x2df +/* 95C828 80241628 0040A82D */ daddu $s5, $v0, $zero +/* 95C82C 8024162C 93D3006D */ lbu $s3, 0x6d($fp) +/* 95C830 80241630 32C2FFFF */ andi $v0, $s6, 0xffff +/* 95C834 80241634 A7B30010 */ sh $s3, 0x10($sp) +/* 95C838 80241638 93D2006E */ lbu $s2, 0x6e($fp) +/* 95C83C 8024163C 93C7006F */ lbu $a3, 0x6f($fp) +/* 95C840 80241640 3274FFFF */ andi $s4, $s3, 0xffff +/* 95C844 80241644 12820003 */ beq $s4, $v0, .L80241654 +/* 95C848 80241648 A7A7001E */ sh $a3, 0x1e($sp) +/* 95C84C 8024164C 0000B82D */ daddu $s7, $zero, $zero +/* 95C850 80241650 02E0802D */ daddu $s0, $s7, $zero +.L80241654: +/* 95C854 80241654 3202FFFF */ andi $v0, $s0, 0xffff +/* 95C858 80241658 14400016 */ bnez $v0, .L802416B4 +/* 95C85C 8024165C 0220202D */ daddu $a0, $s1, $zero +/* 95C860 80241660 0C00A67F */ jal rand_int +/* 95C864 80241664 24040064 */ addiu $a0, $zero, 0x64 +/* 95C868 80241668 2842001E */ slti $v0, $v0, 0x1e +/* 95C86C 8024166C 10400011 */ beqz $v0, .L802416B4 +/* 95C870 80241670 0220202D */ daddu $a0, $s1, $zero +/* 95C874 80241674 0C00A67F */ jal rand_int +/* 95C878 80241678 2644FFFF */ addiu $a0, $s2, -1 +/* 95C87C 8024167C 0040A82D */ daddu $s5, $v0, $zero +/* 95C880 80241680 0260B02D */ daddu $s6, $s3, $zero +/* 95C884 80241684 0220202D */ daddu $a0, $s1, $zero +/* 95C888 80241688 3C05F5DE */ lui $a1, 0xf5de +/* 95C88C 8024168C 34A502DE */ ori $a1, $a1, 0x2de +/* 95C890 80241690 0C0B2026 */ jal set_variable +/* 95C894 80241694 0280302D */ daddu $a2, $s4, $zero +/* 95C898 80241698 0220202D */ daddu $a0, $s1, $zero +/* 95C89C 8024169C 3C05F5DE */ lui $a1, 0xf5de +/* 95C8A0 802416A0 34A502DF */ ori $a1, $a1, 0x2df +/* 95C8A4 802416A4 0C0B2026 */ jal set_variable +/* 95C8A8 802416A8 32A6FFFF */ andi $a2, $s5, 0xffff +/* 95C8AC 802416AC 24100001 */ addiu $s0, $zero, 1 +/* 95C8B0 802416B0 0220202D */ daddu $a0, $s1, $zero +.L802416B4: +/* 95C8B4 802416B4 3C05F840 */ lui $a1, 0xf840 +/* 95C8B8 802416B8 34A56268 */ ori $a1, $a1, 0x6268 +/* 95C8BC 802416BC 0C0B2026 */ jal set_variable +/* 95C8C0 802416C0 3206FFFF */ andi $a2, $s0, 0xffff +/* 95C8C4 802416C4 0220202D */ daddu $a0, $s1, $zero +/* 95C8C8 802416C8 3C05F840 */ lui $a1, 0xf840 +/* 95C8CC 802416CC 34A56269 */ ori $a1, $a1, 0x6269 +/* 95C8D0 802416D0 0C0B2026 */ jal set_variable +/* 95C8D4 802416D4 32E6FFFF */ andi $a2, $s7, 0xffff +/* 95C8D8 802416D8 0000202D */ daddu $a0, $zero, $zero +/* 95C8DC 802416DC 3C05F5DE */ lui $a1, 0xf5de +/* 95C8E0 802416E0 0C0B1EAF */ jal get_variable +/* 95C8E4 802416E4 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 95C8E8 802416E8 0000202D */ daddu $a0, $zero, $zero +/* 95C8EC 802416EC 3C05F5DE */ lui $a1, 0xf5de +/* 95C8F0 802416F0 34A50180 */ ori $a1, $a1, 0x180 +/* 95C8F4 802416F4 0C0B1EAF */ jal get_variable +/* 95C8F8 802416F8 0040802D */ daddu $s0, $v0, $zero +/* 95C8FC 802416FC 0040282D */ daddu $a1, $v0, $zero +/* 95C900 80241700 0000182D */ daddu $v1, $zero, $zero +/* 95C904 80241704 3C068024 */ lui $a2, 0x8024 +/* 95C908 80241708 24C6525C */ addiu $a2, $a2, 0x525c +/* 95C90C 8024170C 00C0202D */ daddu $a0, $a2, $zero +.L80241710: +/* 95C910 80241710 8C820000 */ lw $v0, ($a0) +/* 95C914 80241714 00A2102A */ slt $v0, $a1, $v0 +/* 95C918 80241718 14400006 */ bnez $v0, .L80241734 +/* 95C91C 8024171C 000310C0 */ sll $v0, $v1, 3 +/* 95C920 80241720 24630001 */ addiu $v1, $v1, 1 +/* 95C924 80241724 28620008 */ slti $v0, $v1, 8 +/* 95C928 80241728 1440FFF9 */ bnez $v0, .L80241710 +/* 95C92C 8024172C 24840008 */ addiu $a0, $a0, 8 +/* 95C930 80241730 000310C0 */ sll $v0, $v1, 3 +.L80241734: +/* 95C934 80241734 00461021 */ addu $v0, $v0, $a2 +/* 95C938 80241738 8C420004 */ lw $v0, 4($v0) +/* 95C93C 8024173C 97A30010 */ lhu $v1, 0x10($sp) +/* 95C940 80241740 0202202A */ slt $a0, $s0, $v0 +/* 95C944 80241744 32C2FFFF */ andi $v0, $s6, 0xffff +/* 95C948 80241748 14620008 */ bne $v1, $v0, .L8024176C +/* 95C94C 8024174C 32A2FFFF */ andi $v0, $s5, 0xffff +/* 95C950 80241750 97A7001E */ lhu $a3, 0x1e($sp) +/* 95C954 80241754 14E20005 */ bne $a3, $v0, .L8024176C +/* 95C958 80241758 32E2FFFF */ andi $v0, $s7, 0xffff +/* 95C95C 8024175C 14400003 */ bnez $v0, .L8024176C +/* 95C960 80241760 00000000 */ nop +/* 95C964 80241764 14800008 */ bnez $a0, .L80241788 +/* 95C968 80241768 24020001 */ addiu $v0, $zero, 1 +.L8024176C: +/* 95C96C 8024176C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 95C970 80241770 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 95C974 80241774 80420075 */ lb $v0, 0x75($v0) +/* 95C978 80241778 10400005 */ beqz $v0, .L80241790 +/* 95C97C 8024177C 00000000 */ nop +/* 95C980 80241780 10800003 */ beqz $a0, .L80241790 +/* 95C984 80241784 24020001 */ addiu $v0, $zero, 1 +.L80241788: +/* 95C988 80241788 080905E7 */ j .L8024179C +/* 95C98C 8024178C AE220084 */ sw $v0, 0x84($s1) +.L80241790: +/* 95C990 80241790 0C00F9EB */ jal kill_enemy +/* 95C994 80241794 03C0202D */ daddu $a0, $fp, $zero +/* 95C998 80241798 AE200084 */ sw $zero, 0x84($s1) +.L8024179C: +/* 95C99C 8024179C 8FBF0044 */ lw $ra, 0x44($sp) +/* 95C9A0 802417A0 8FBE0040 */ lw $fp, 0x40($sp) +/* 95C9A4 802417A4 8FB7003C */ lw $s7, 0x3c($sp) +/* 95C9A8 802417A8 8FB60038 */ lw $s6, 0x38($sp) +/* 95C9AC 802417AC 8FB50034 */ lw $s5, 0x34($sp) +/* 95C9B0 802417B0 8FB40030 */ lw $s4, 0x30($sp) +/* 95C9B4 802417B4 8FB3002C */ lw $s3, 0x2c($sp) +/* 95C9B8 802417B8 8FB20028 */ lw $s2, 0x28($sp) +/* 95C9BC 802417BC 8FB10024 */ lw $s1, 0x24($sp) +/* 95C9C0 802417C0 8FB00020 */ lw $s0, 0x20($sp) +/* 95C9C4 802417C4 24020002 */ addiu $v0, $zero, 2 +/* 95C9C8 802417C8 03E00008 */ jr $ra +/* 95C9CC 802417CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0.s deleted file mode 100644 index 17d6c537da..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417D0 -/* 95C9D0 802417D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95C9D4 802417D4 AFBF0014 */ sw $ra, 0x14($sp) -/* 95C9D8 802417D8 AFB00010 */ sw $s0, 0x10($sp) -/* 95C9DC 802417DC 0C00EABB */ jal get_npc_unsafe -/* 95C9E0 802417E0 8C84014C */ lw $a0, 0x14c($a0) -/* 95C9E4 802417E4 24040008 */ addiu $a0, $zero, 8 -/* 95C9E8 802417E8 0040802D */ daddu $s0, $v0, $zero -/* 95C9EC 802417EC 3C028024 */ lui $v0, 0x8024 -/* 95C9F0 802417F0 2442183C */ addiu $v0, $v0, 0x183c -/* 95C9F4 802417F4 0C00AB39 */ jal heap_malloc -/* 95C9F8 802417F8 AE020008 */ sw $v0, 8($s0) -/* 95C9FC 802417FC 0040182D */ daddu $v1, $v0, $zero -/* 95CA00 80241800 AE030020 */ sw $v1, 0x20($s0) -/* 95CA04 80241804 AC600000 */ sw $zero, ($v1) -/* 95CA08 80241808 8FBF0014 */ lw $ra, 0x14($sp) -/* 95CA0C 8024180C 8FB00010 */ lw $s0, 0x10($sp) -/* 95CA10 80241810 24020001 */ addiu $v0, $zero, 1 -/* 95CA14 80241814 03E00008 */ jr $ra -/* 95CA18 80241818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s new file mode 100644 index 0000000000..03d320caf8 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802417D0_95C9D0.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417D0_95C9D0 +/* 95C9D0 802417D0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95C9D4 802417D4 AFBF0014 */ sw $ra, 0x14($sp) +/* 95C9D8 802417D8 AFB00010 */ sw $s0, 0x10($sp) +/* 95C9DC 802417DC 0C00EABB */ jal get_npc_unsafe +/* 95C9E0 802417E0 8C84014C */ lw $a0, 0x14c($a0) +/* 95C9E4 802417E4 24040008 */ addiu $a0, $zero, 8 +/* 95C9E8 802417E8 0040802D */ daddu $s0, $v0, $zero +/* 95C9EC 802417EC 3C028024 */ lui $v0, 0x8024 +/* 95C9F0 802417F0 2442183C */ addiu $v0, $v0, 0x183c +/* 95C9F4 802417F4 0C00AB39 */ jal heap_malloc +/* 95C9F8 802417F8 AE020008 */ sw $v0, 8($s0) +/* 95C9FC 802417FC 0040182D */ daddu $v1, $v0, $zero +/* 95CA00 80241800 AE030020 */ sw $v1, 0x20($s0) +/* 95CA04 80241804 AC600000 */ sw $zero, ($v1) +/* 95CA08 80241808 8FBF0014 */ lw $ra, 0x14($sp) +/* 95CA0C 8024180C 8FB00010 */ lw $s0, 0x10($sp) +/* 95CA10 80241810 24020001 */ addiu $v0, $zero, 1 +/* 95CA14 80241814 03E00008 */ jr $ra +/* 95CA18 80241818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C.s deleted file mode 100644 index 826f4d2d12..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024181C -/* 95CA1C 8024181C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95CA20 80241820 AFBF0010 */ sw $ra, 0x10($sp) -/* 95CA24 80241824 0C00EABB */ jal get_npc_unsafe -/* 95CA28 80241828 8C84014C */ lw $a0, 0x14c($a0) -/* 95CA2C 8024182C 8FBF0010 */ lw $ra, 0x10($sp) -/* 95CA30 80241830 0000102D */ daddu $v0, $zero, $zero -/* 95CA34 80241834 03E00008 */ jr $ra -/* 95CA38 80241838 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s new file mode 100644 index 0000000000..3e7e7a1a70 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024181C_95CA1C +/* 95CA1C 8024181C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95CA20 80241820 AFBF0010 */ sw $ra, 0x10($sp) +/* 95CA24 80241824 0C00EABB */ jal get_npc_unsafe +/* 95CA28 80241828 8C84014C */ lw $a0, 0x14c($a0) +/* 95CA2C 8024182C 8FBF0010 */ lw $ra, 0x10($sp) +/* 95CA30 80241830 0000102D */ daddu $v0, $zero, $zero +/* 95CA34 80241834 03E00008 */ jr $ra +/* 95CA38 80241838 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C.s deleted file mode 100644 index 582e0fa191..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024183C -/* 95CA3C 8024183C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95CA40 80241840 3C03800A */ lui $v1, 0x800a -/* 95CA44 80241844 8463A634 */ lh $v1, -0x59cc($v1) -/* 95CA48 80241848 3C05800B */ lui $a1, %hi(gCameras) -/* 95CA4C 8024184C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 95CA50 80241850 AFBF0010 */ sw $ra, 0x10($sp) -/* 95CA54 80241854 00031080 */ sll $v0, $v1, 2 -/* 95CA58 80241858 00431021 */ addu $v0, $v0, $v1 -/* 95CA5C 8024185C 00021080 */ sll $v0, $v0, 2 -/* 95CA60 80241860 00431023 */ subu $v0, $v0, $v1 -/* 95CA64 80241864 000218C0 */ sll $v1, $v0, 3 -/* 95CA68 80241868 00431021 */ addu $v0, $v0, $v1 -/* 95CA6C 8024186C 8C830020 */ lw $v1, 0x20($a0) -/* 95CA70 80241870 000210C0 */ sll $v0, $v0, 3 -/* 95CA74 80241874 8C630000 */ lw $v1, ($v1) -/* 95CA78 80241878 30630001 */ andi $v1, $v1, 1 -/* 95CA7C 8024187C 10600004 */ beqz $v1, .L80241890 -/* 95CA80 80241880 00451021 */ addu $v0, $v0, $a1 -/* 95CA84 80241884 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 95CA88 80241888 0C00A6C9 */ jal clamp_angle -/* 95CA8C 8024188C 46006307 */ neg.s $f12, $f12 -.L80241890: -/* 95CA90 80241890 8FBF0010 */ lw $ra, 0x10($sp) -/* 95CA94 80241894 03E00008 */ jr $ra -/* 95CA98 80241898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s new file mode 100644 index 0000000000..2cc9a874bc --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024183C_95CA3C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024183C_95CA3C +/* 95CA3C 8024183C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95CA40 80241840 3C03800A */ lui $v1, 0x800a +/* 95CA44 80241844 8463A634 */ lh $v1, -0x59cc($v1) +/* 95CA48 80241848 3C05800B */ lui $a1, %hi(gCameras) +/* 95CA4C 8024184C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 95CA50 80241850 AFBF0010 */ sw $ra, 0x10($sp) +/* 95CA54 80241854 00031080 */ sll $v0, $v1, 2 +/* 95CA58 80241858 00431021 */ addu $v0, $v0, $v1 +/* 95CA5C 8024185C 00021080 */ sll $v0, $v0, 2 +/* 95CA60 80241860 00431023 */ subu $v0, $v0, $v1 +/* 95CA64 80241864 000218C0 */ sll $v1, $v0, 3 +/* 95CA68 80241868 00431021 */ addu $v0, $v0, $v1 +/* 95CA6C 8024186C 8C830020 */ lw $v1, 0x20($a0) +/* 95CA70 80241870 000210C0 */ sll $v0, $v0, 3 +/* 95CA74 80241874 8C630000 */ lw $v1, ($v1) +/* 95CA78 80241878 30630001 */ andi $v1, $v1, 1 +/* 95CA7C 8024187C 10600004 */ beqz $v1, .L80241890 +/* 95CA80 80241880 00451021 */ addu $v0, $v0, $a1 +/* 95CA84 80241884 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 95CA88 80241888 0C00A6C9 */ jal clamp_angle +/* 95CA8C 8024188C 46006307 */ neg.s $f12, $f12 +.L80241890: +/* 95CA90 80241890 8FBF0010 */ lw $ra, 0x10($sp) +/* 95CA94 80241894 03E00008 */ jr $ra +/* 95CA98 80241898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8.s deleted file mode 100644 index 5ca8c19840..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419E8 -/* 95CBE8 802419E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95CBEC 802419EC AFB00010 */ sw $s0, 0x10($sp) -/* 95CBF0 802419F0 0080802D */ daddu $s0, $a0, $zero -/* 95CBF4 802419F4 AFBF0020 */ sw $ra, 0x20($sp) -/* 95CBF8 802419F8 AFB3001C */ sw $s3, 0x1c($sp) -/* 95CBFC 802419FC AFB20018 */ sw $s2, 0x18($sp) -/* 95CC00 80241A00 10A00009 */ beqz $a1, .L80241A28 -/* 95CC04 80241A04 AFB10014 */ sw $s1, 0x14($sp) -/* 95CC08 80241A08 0000202D */ daddu $a0, $zero, $zero -/* 95CC0C 80241A0C 0080282D */ daddu $a1, $a0, $zero -/* 95CC10 80241A10 0080302D */ daddu $a2, $a0, $zero -/* 95CC14 80241A14 0C046F97 */ jal set_background_color_blend -/* 95CC18 80241A18 240700FF */ addiu $a3, $zero, 0xff -/* 95CC1C 80241A1C 240200FF */ addiu $v0, $zero, 0xff -/* 95CC20 80241A20 AE020070 */ sw $v0, 0x70($s0) -/* 95CC24 80241A24 AE000074 */ sw $zero, 0x74($s0) -.L80241A28: -/* 95CC28 80241A28 8E020070 */ lw $v0, 0x70($s0) -/* 95CC2C 80241A2C 2442FFF8 */ addiu $v0, $v0, -8 -/* 95CC30 80241A30 04410002 */ bgez $v0, .L80241A3C -/* 95CC34 80241A34 AE020070 */ sw $v0, 0x70($s0) -/* 95CC38 80241A38 AE000070 */ sw $zero, 0x70($s0) -.L80241A3C: -/* 95CC3C 80241A3C 0000202D */ daddu $a0, $zero, $zero -/* 95CC40 80241A40 0080282D */ daddu $a1, $a0, $zero -/* 95CC44 80241A44 92070073 */ lbu $a3, 0x73($s0) -/* 95CC48 80241A48 0C046F97 */ jal set_background_color_blend -/* 95CC4C 80241A4C 0080302D */ daddu $a2, $a0, $zero -/* 95CC50 80241A50 8E020070 */ lw $v0, 0x70($s0) -/* 95CC54 80241A54 14400006 */ bnez $v0, .L80241A70 -/* 95CC58 80241A58 00000000 */ nop -/* 95CC5C 80241A5C 8E020074 */ lw $v0, 0x74($s0) -/* 95CC60 80241A60 14400003 */ bnez $v0, .L80241A70 -/* 95CC64 80241A64 24020001 */ addiu $v0, $zero, 1 -/* 95CC68 80241A68 080906CF */ j .L80241B3C -/* 95CC6C 80241A6C AE020074 */ sw $v0, 0x74($s0) -.L80241A70: -/* 95CC70 80241A70 8E030074 */ lw $v1, 0x74($s0) -/* 95CC74 80241A74 24020001 */ addiu $v0, $zero, 1 -/* 95CC78 80241A78 14620031 */ bne $v1, $v0, .L80241B40 -/* 95CC7C 80241A7C 0000102D */ daddu $v0, $zero, $zero -/* 95CC80 80241A80 0C04760B */ jal func_8011D82C -/* 95CC84 80241A84 0000202D */ daddu $a0, $zero, $zero -/* 95CC88 80241A88 0000802D */ daddu $s0, $zero, $zero -/* 95CC8C 80241A8C 2413FFFC */ addiu $s3, $zero, -4 -/* 95CC90 80241A90 2412000A */ addiu $s2, $zero, 0xa -/* 95CC94 80241A94 3C11FF7F */ lui $s1, 0xff7f -/* 95CC98 80241A98 3C028015 */ lui $v0, 0x8015 -/* 95CC9C 80241A9C 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 95CCA0 80241AA0 3631FFFF */ ori $s1, $s1, 0xffff -/* 95CCA4 80241AA4 A0400000 */ sb $zero, ($v0) -.L80241AA8: -/* 95CCA8 80241AA8 0C00E2B7 */ jal get_npc_by_index -/* 95CCAC 80241AAC 0200202D */ daddu $a0, $s0, $zero -/* 95CCB0 80241AB0 0040202D */ daddu $a0, $v0, $zero -/* 95CCB4 80241AB4 5080000B */ beql $a0, $zero, .L80241AE4 -/* 95CCB8 80241AB8 26100001 */ addiu $s0, $s0, 1 -/* 95CCBC 80241ABC 8C820000 */ lw $v0, ($a0) -/* 95CCC0 80241AC0 50400008 */ beql $v0, $zero, .L80241AE4 -/* 95CCC4 80241AC4 26100001 */ addiu $s0, $s0, 1 -/* 95CCC8 80241AC8 808300A4 */ lb $v1, 0xa4($a0) -/* 95CCCC 80241ACC 10730005 */ beq $v1, $s3, .L80241AE4 -/* 95CCD0 80241AD0 26100001 */ addiu $s0, $s0, 1 -/* 95CCD4 80241AD4 10720003 */ beq $v1, $s2, .L80241AE4 -/* 95CCD8 80241AD8 00000000 */ nop -/* 95CCDC 80241ADC 00511024 */ and $v0, $v0, $s1 -/* 95CCE0 80241AE0 AC820000 */ sw $v0, ($a0) -.L80241AE4: -/* 95CCE4 80241AE4 2A020040 */ slti $v0, $s0, 0x40 -/* 95CCE8 80241AE8 1440FFEF */ bnez $v0, .L80241AA8 -/* 95CCEC 80241AEC 00000000 */ nop -/* 95CCF0 80241AF0 0000802D */ daddu $s0, $zero, $zero -/* 95CCF4 80241AF4 3C11F7FF */ lui $s1, 0xf7ff -/* 95CCF8 80241AF8 3631FFFF */ ori $s1, $s1, 0xffff -.L80241AFC: -/* 95CCFC 80241AFC 0C04C3D6 */ jal get_item_entity -/* 95CD00 80241B00 0200202D */ daddu $a0, $s0, $zero -/* 95CD04 80241B04 0040182D */ daddu $v1, $v0, $zero -/* 95CD08 80241B08 10600007 */ beqz $v1, .L80241B28 -/* 95CD0C 80241B0C 26100001 */ addiu $s0, $s0, 1 -/* 95CD10 80241B10 8C640000 */ lw $a0, ($v1) -/* 95CD14 80241B14 30820010 */ andi $v0, $a0, 0x10 -/* 95CD18 80241B18 10400003 */ beqz $v0, .L80241B28 -/* 95CD1C 80241B1C 00000000 */ nop -/* 95CD20 80241B20 00911024 */ and $v0, $a0, $s1 -/* 95CD24 80241B24 AC620000 */ sw $v0, ($v1) -.L80241B28: -/* 95CD28 80241B28 2A020100 */ slti $v0, $s0, 0x100 -/* 95CD2C 80241B2C 1440FFF3 */ bnez $v0, .L80241AFC -/* 95CD30 80241B30 24020002 */ addiu $v0, $zero, 2 -/* 95CD34 80241B34 080906D0 */ j .L80241B40 -/* 95CD38 80241B38 00000000 */ nop -.L80241B3C: -/* 95CD3C 80241B3C 0000102D */ daddu $v0, $zero, $zero -.L80241B40: -/* 95CD40 80241B40 8FBF0020 */ lw $ra, 0x20($sp) -/* 95CD44 80241B44 8FB3001C */ lw $s3, 0x1c($sp) -/* 95CD48 80241B48 8FB20018 */ lw $s2, 0x18($sp) -/* 95CD4C 80241B4C 8FB10014 */ lw $s1, 0x14($sp) -/* 95CD50 80241B50 8FB00010 */ lw $s0, 0x10($sp) -/* 95CD54 80241B54 03E00008 */ jr $ra -/* 95CD58 80241B58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s new file mode 100644 index 0000000000..b7cded7b4c --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802419E8_95CBE8.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419E8_95CBE8 +/* 95CBE8 802419E8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 95CBEC 802419EC AFB00010 */ sw $s0, 0x10($sp) +/* 95CBF0 802419F0 0080802D */ daddu $s0, $a0, $zero +/* 95CBF4 802419F4 AFBF0020 */ sw $ra, 0x20($sp) +/* 95CBF8 802419F8 AFB3001C */ sw $s3, 0x1c($sp) +/* 95CBFC 802419FC AFB20018 */ sw $s2, 0x18($sp) +/* 95CC00 80241A00 10A00009 */ beqz $a1, .L80241A28 +/* 95CC04 80241A04 AFB10014 */ sw $s1, 0x14($sp) +/* 95CC08 80241A08 0000202D */ daddu $a0, $zero, $zero +/* 95CC0C 80241A0C 0080282D */ daddu $a1, $a0, $zero +/* 95CC10 80241A10 0080302D */ daddu $a2, $a0, $zero +/* 95CC14 80241A14 0C046F97 */ jal set_background_color_blend +/* 95CC18 80241A18 240700FF */ addiu $a3, $zero, 0xff +/* 95CC1C 80241A1C 240200FF */ addiu $v0, $zero, 0xff +/* 95CC20 80241A20 AE020070 */ sw $v0, 0x70($s0) +/* 95CC24 80241A24 AE000074 */ sw $zero, 0x74($s0) +.L80241A28: +/* 95CC28 80241A28 8E020070 */ lw $v0, 0x70($s0) +/* 95CC2C 80241A2C 2442FFF8 */ addiu $v0, $v0, -8 +/* 95CC30 80241A30 04410002 */ bgez $v0, .L80241A3C +/* 95CC34 80241A34 AE020070 */ sw $v0, 0x70($s0) +/* 95CC38 80241A38 AE000070 */ sw $zero, 0x70($s0) +.L80241A3C: +/* 95CC3C 80241A3C 0000202D */ daddu $a0, $zero, $zero +/* 95CC40 80241A40 0080282D */ daddu $a1, $a0, $zero +/* 95CC44 80241A44 92070073 */ lbu $a3, 0x73($s0) +/* 95CC48 80241A48 0C046F97 */ jal set_background_color_blend +/* 95CC4C 80241A4C 0080302D */ daddu $a2, $a0, $zero +/* 95CC50 80241A50 8E020070 */ lw $v0, 0x70($s0) +/* 95CC54 80241A54 14400006 */ bnez $v0, .L80241A70 +/* 95CC58 80241A58 00000000 */ nop +/* 95CC5C 80241A5C 8E020074 */ lw $v0, 0x74($s0) +/* 95CC60 80241A60 14400003 */ bnez $v0, .L80241A70 +/* 95CC64 80241A64 24020001 */ addiu $v0, $zero, 1 +/* 95CC68 80241A68 080906CF */ j .L80241B3C +/* 95CC6C 80241A6C AE020074 */ sw $v0, 0x74($s0) +.L80241A70: +/* 95CC70 80241A70 8E030074 */ lw $v1, 0x74($s0) +/* 95CC74 80241A74 24020001 */ addiu $v0, $zero, 1 +/* 95CC78 80241A78 14620031 */ bne $v1, $v0, .L80241B40 +/* 95CC7C 80241A7C 0000102D */ daddu $v0, $zero, $zero +/* 95CC80 80241A80 0C04760B */ jal func_8011D82C +/* 95CC84 80241A84 0000202D */ daddu $a0, $zero, $zero +/* 95CC88 80241A88 0000802D */ daddu $s0, $zero, $zero +/* 95CC8C 80241A8C 2413FFFC */ addiu $s3, $zero, -4 +/* 95CC90 80241A90 2412000A */ addiu $s2, $zero, 0xa +/* 95CC94 80241A94 3C11FF7F */ lui $s1, 0xff7f +/* 95CC98 80241A98 3C028015 */ lui $v0, 0x8015 +/* 95CC9C 80241A9C 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 95CCA0 80241AA0 3631FFFF */ ori $s1, $s1, 0xffff +/* 95CCA4 80241AA4 A0400000 */ sb $zero, ($v0) +.L80241AA8: +/* 95CCA8 80241AA8 0C00E2B7 */ jal get_npc_by_index +/* 95CCAC 80241AAC 0200202D */ daddu $a0, $s0, $zero +/* 95CCB0 80241AB0 0040202D */ daddu $a0, $v0, $zero +/* 95CCB4 80241AB4 5080000B */ beql $a0, $zero, .L80241AE4 +/* 95CCB8 80241AB8 26100001 */ addiu $s0, $s0, 1 +/* 95CCBC 80241ABC 8C820000 */ lw $v0, ($a0) +/* 95CCC0 80241AC0 50400008 */ beql $v0, $zero, .L80241AE4 +/* 95CCC4 80241AC4 26100001 */ addiu $s0, $s0, 1 +/* 95CCC8 80241AC8 808300A4 */ lb $v1, 0xa4($a0) +/* 95CCCC 80241ACC 10730005 */ beq $v1, $s3, .L80241AE4 +/* 95CCD0 80241AD0 26100001 */ addiu $s0, $s0, 1 +/* 95CCD4 80241AD4 10720003 */ beq $v1, $s2, .L80241AE4 +/* 95CCD8 80241AD8 00000000 */ nop +/* 95CCDC 80241ADC 00511024 */ and $v0, $v0, $s1 +/* 95CCE0 80241AE0 AC820000 */ sw $v0, ($a0) +.L80241AE4: +/* 95CCE4 80241AE4 2A020040 */ slti $v0, $s0, 0x40 +/* 95CCE8 80241AE8 1440FFEF */ bnez $v0, .L80241AA8 +/* 95CCEC 80241AEC 00000000 */ nop +/* 95CCF0 80241AF0 0000802D */ daddu $s0, $zero, $zero +/* 95CCF4 80241AF4 3C11F7FF */ lui $s1, 0xf7ff +/* 95CCF8 80241AF8 3631FFFF */ ori $s1, $s1, 0xffff +.L80241AFC: +/* 95CCFC 80241AFC 0C04C3D6 */ jal get_item_entity +/* 95CD00 80241B00 0200202D */ daddu $a0, $s0, $zero +/* 95CD04 80241B04 0040182D */ daddu $v1, $v0, $zero +/* 95CD08 80241B08 10600007 */ beqz $v1, .L80241B28 +/* 95CD0C 80241B0C 26100001 */ addiu $s0, $s0, 1 +/* 95CD10 80241B10 8C640000 */ lw $a0, ($v1) +/* 95CD14 80241B14 30820010 */ andi $v0, $a0, 0x10 +/* 95CD18 80241B18 10400003 */ beqz $v0, .L80241B28 +/* 95CD1C 80241B1C 00000000 */ nop +/* 95CD20 80241B20 00911024 */ and $v0, $a0, $s1 +/* 95CD24 80241B24 AC620000 */ sw $v0, ($v1) +.L80241B28: +/* 95CD28 80241B28 2A020100 */ slti $v0, $s0, 0x100 +/* 95CD2C 80241B2C 1440FFF3 */ bnez $v0, .L80241AFC +/* 95CD30 80241B30 24020002 */ addiu $v0, $zero, 2 +/* 95CD34 80241B34 080906D0 */ j .L80241B40 +/* 95CD38 80241B38 00000000 */ nop +.L80241B3C: +/* 95CD3C 80241B3C 0000102D */ daddu $v0, $zero, $zero +.L80241B40: +/* 95CD40 80241B40 8FBF0020 */ lw $ra, 0x20($sp) +/* 95CD44 80241B44 8FB3001C */ lw $s3, 0x1c($sp) +/* 95CD48 80241B48 8FB20018 */ lw $s2, 0x18($sp) +/* 95CD4C 80241B4C 8FB10014 */ lw $s1, 0x14($sp) +/* 95CD50 80241B50 8FB00010 */ lw $s0, 0x10($sp) +/* 95CD54 80241B54 03E00008 */ jr $ra +/* 95CD58 80241B58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C.s deleted file mode 100644 index 6135e204b2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B5C -/* 95CD5C 80241B5C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95CD60 80241B60 AFB00010 */ sw $s0, 0x10($sp) -/* 95CD64 80241B64 3C108011 */ lui $s0, %hi(gPlayerData) -/* 95CD68 80241B68 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 95CD6C 80241B6C AFBF0018 */ sw $ra, 0x18($sp) -/* 95CD70 80241B70 AFB10014 */ sw $s1, 0x14($sp) -/* 95CD74 80241B74 960302C0 */ lhu $v1, 0x2c0($s0) -/* 95CD78 80241B78 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 95CD7C 80241B7C 10400003 */ beqz $v0, .L80241B8C -/* 95CD80 80241B80 0080882D */ daddu $s1, $a0, $zero -/* 95CD84 80241B84 24620001 */ addiu $v0, $v1, 1 -/* 95CD88 80241B88 A60202C0 */ sh $v0, 0x2c0($s0) -.L80241B8C: -/* 95CD8C 80241B8C 3C05F5DE */ lui $a1, 0xf5de -/* 95CD90 80241B90 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 95CD94 80241B94 0C0B1EAF */ jal get_variable -/* 95CD98 80241B98 0000202D */ daddu $a0, $zero, $zero -/* 95CD9C 80241B9C 3C038024 */ lui $v1, 0x8024 -/* 95CDA0 80241BA0 00621821 */ addu $v1, $v1, $v0 -/* 95CDA4 80241BA4 9063521C */ lbu $v1, 0x521c($v1) -/* 95CDA8 80241BA8 8E220084 */ lw $v0, 0x84($s1) -/* 95CDAC 80241BAC 54430006 */ bnel $v0, $v1, .L80241BC8 -/* 95CDB0 80241BB0 AE200084 */ sw $zero, 0x84($s1) -/* 95CDB4 80241BB4 24020001 */ addiu $v0, $zero, 1 -/* 95CDB8 80241BB8 AE220084 */ sw $v0, 0x84($s1) -/* 95CDBC 80241BBC 960202C2 */ lhu $v0, 0x2c2($s0) -/* 95CDC0 80241BC0 24420001 */ addiu $v0, $v0, 1 -/* 95CDC4 80241BC4 A60202C2 */ sh $v0, 0x2c2($s0) -.L80241BC8: -/* 95CDC8 80241BC8 8FBF0018 */ lw $ra, 0x18($sp) -/* 95CDCC 80241BCC 8FB10014 */ lw $s1, 0x14($sp) -/* 95CDD0 80241BD0 8FB00010 */ lw $s0, 0x10($sp) -/* 95CDD4 80241BD4 24020002 */ addiu $v0, $zero, 2 -/* 95CDD8 80241BD8 03E00008 */ jr $ra -/* 95CDDC 80241BDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s new file mode 100644 index 0000000000..6f8f15738f --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241B5C_95CD5C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B5C_95CD5C +/* 95CD5C 80241B5C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95CD60 80241B60 AFB00010 */ sw $s0, 0x10($sp) +/* 95CD64 80241B64 3C108011 */ lui $s0, %hi(gPlayerData) +/* 95CD68 80241B68 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 95CD6C 80241B6C AFBF0018 */ sw $ra, 0x18($sp) +/* 95CD70 80241B70 AFB10014 */ sw $s1, 0x14($sp) +/* 95CD74 80241B74 960302C0 */ lhu $v1, 0x2c0($s0) +/* 95CD78 80241B78 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 95CD7C 80241B7C 10400003 */ beqz $v0, .L80241B8C +/* 95CD80 80241B80 0080882D */ daddu $s1, $a0, $zero +/* 95CD84 80241B84 24620001 */ addiu $v0, $v1, 1 +/* 95CD88 80241B88 A60202C0 */ sh $v0, 0x2c0($s0) +.L80241B8C: +/* 95CD8C 80241B8C 3C05F5DE */ lui $a1, 0xf5de +/* 95CD90 80241B90 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 95CD94 80241B94 0C0B1EAF */ jal get_variable +/* 95CD98 80241B98 0000202D */ daddu $a0, $zero, $zero +/* 95CD9C 80241B9C 3C038024 */ lui $v1, 0x8024 +/* 95CDA0 80241BA0 00621821 */ addu $v1, $v1, $v0 +/* 95CDA4 80241BA4 9063521C */ lbu $v1, 0x521c($v1) +/* 95CDA8 80241BA8 8E220084 */ lw $v0, 0x84($s1) +/* 95CDAC 80241BAC 54430006 */ bnel $v0, $v1, .L80241BC8 +/* 95CDB0 80241BB0 AE200084 */ sw $zero, 0x84($s1) +/* 95CDB4 80241BB4 24020001 */ addiu $v0, $zero, 1 +/* 95CDB8 80241BB8 AE220084 */ sw $v0, 0x84($s1) +/* 95CDBC 80241BBC 960202C2 */ lhu $v0, 0x2c2($s0) +/* 95CDC0 80241BC0 24420001 */ addiu $v0, $v0, 1 +/* 95CDC4 80241BC4 A60202C2 */ sh $v0, 0x2c2($s0) +.L80241BC8: +/* 95CDC8 80241BC8 8FBF0018 */ lw $ra, 0x18($sp) +/* 95CDCC 80241BCC 8FB10014 */ lw $s1, 0x14($sp) +/* 95CDD0 80241BD0 8FB00010 */ lw $s0, 0x10($sp) +/* 95CDD4 80241BD4 24020002 */ addiu $v0, $zero, 2 +/* 95CDD8 80241BD8 03E00008 */ jr $ra +/* 95CDDC 80241BDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0.s deleted file mode 100644 index 71b406b501..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BE0 -/* 95CDE0 80241BE0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 95CDE4 80241BE4 AFB1001C */ sw $s1, 0x1c($sp) -/* 95CDE8 80241BE8 AFBF0020 */ sw $ra, 0x20($sp) -/* 95CDEC 80241BEC AFB00018 */ sw $s0, 0x18($sp) -/* 95CDF0 80241BF0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 95CDF4 80241BF4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 95CDF8 80241BF8 10A00060 */ beqz $a1, .L80241D7C -/* 95CDFC 80241BFC 0080882D */ daddu $s1, $a0, $zero -/* 95CE00 80241C00 3C05F4AC */ lui $a1, 0xf4ac -/* 95CE04 80241C04 0C0B1EAF */ jal get_variable -/* 95CE08 80241C08 34A5D481 */ ori $a1, $a1, 0xd481 -/* 95CE0C 80241C0C 0220202D */ daddu $a0, $s1, $zero -/* 95CE10 80241C10 3C05F4AC */ lui $a1, 0xf4ac -/* 95CE14 80241C14 4482B000 */ mtc1 $v0, $f22 -/* 95CE18 80241C18 00000000 */ nop -/* 95CE1C 80241C1C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95CE20 80241C20 0C0B1EAF */ jal get_variable -/* 95CE24 80241C24 34A5D482 */ ori $a1, $a1, 0xd482 -/* 95CE28 80241C28 0220202D */ daddu $a0, $s1, $zero -/* 95CE2C 80241C2C 3C05F4AC */ lui $a1, 0xf4ac -/* 95CE30 80241C30 4482A000 */ mtc1 $v0, $f20 -/* 95CE34 80241C34 00000000 */ nop -/* 95CE38 80241C38 4680A520 */ cvt.s.w $f20, $f20 -/* 95CE3C 80241C3C 0C0B1EAF */ jal get_variable -/* 95CE40 80241C40 34A5D483 */ ori $a1, $a1, 0xd483 -/* 95CE44 80241C44 44821000 */ mtc1 $v0, $f2 -/* 95CE48 80241C48 00000000 */ nop -/* 95CE4C 80241C4C 468010A0 */ cvt.s.w $f2, $f2 -/* 95CE50 80241C50 4405B000 */ mfc1 $a1, $f22 -/* 95CE54 80241C54 4406A000 */ mfc1 $a2, $f20 -/* 95CE58 80241C58 44071000 */ mfc1 $a3, $f2 -/* 95CE5C 80241C5C 0C01C574 */ jal func_800715D0 -/* 95CE60 80241C60 0000202D */ daddu $a0, $zero, $zero -/* 95CE64 80241C64 0220202D */ daddu $a0, $s1, $zero -/* 95CE68 80241C68 3C05F4AC */ lui $a1, 0xf4ac -/* 95CE6C 80241C6C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 95CE70 80241C70 3C108025 */ lui $s0, 0x8025 -/* 95CE74 80241C74 2610DFE0 */ addiu $s0, $s0, -0x2020 -/* 95CE78 80241C78 0C0B1EAF */ jal get_variable -/* 95CE7C 80241C7C AE020000 */ sw $v0, ($s0) -/* 95CE80 80241C80 0220202D */ daddu $a0, $s1, $zero -/* 95CE84 80241C84 3C05F4AC */ lui $a1, 0xf4ac -/* 95CE88 80241C88 4482B000 */ mtc1 $v0, $f22 -/* 95CE8C 80241C8C 00000000 */ nop -/* 95CE90 80241C90 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95CE94 80241C94 0C0B1EAF */ jal get_variable -/* 95CE98 80241C98 34A5D482 */ ori $a1, $a1, 0xd482 -/* 95CE9C 80241C9C 0220202D */ daddu $a0, $s1, $zero -/* 95CEA0 80241CA0 3C05F4AC */ lui $a1, 0xf4ac -/* 95CEA4 80241CA4 4482A000 */ mtc1 $v0, $f20 -/* 95CEA8 80241CA8 00000000 */ nop -/* 95CEAC 80241CAC 4680A520 */ cvt.s.w $f20, $f20 -/* 95CEB0 80241CB0 0C0B1EAF */ jal get_variable -/* 95CEB4 80241CB4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 95CEB8 80241CB8 44821000 */ mtc1 $v0, $f2 -/* 95CEBC 80241CBC 00000000 */ nop -/* 95CEC0 80241CC0 468010A0 */ cvt.s.w $f2, $f2 -/* 95CEC4 80241CC4 4405B000 */ mfc1 $a1, $f22 -/* 95CEC8 80241CC8 4406A000 */ mfc1 $a2, $f20 -/* 95CECC 80241CCC 44071000 */ mfc1 $a3, $f2 -/* 95CED0 80241CD0 0C01C604 */ jal func_80071810 -/* 95CED4 80241CD4 0000202D */ daddu $a0, $zero, $zero -/* 95CED8 80241CD8 0220202D */ daddu $a0, $s1, $zero -/* 95CEDC 80241CDC 3C05F4AC */ lui $a1, 0xf4ac -/* 95CEE0 80241CE0 3C018025 */ lui $at, 0x8025 -/* 95CEE4 80241CE4 AC22DFE4 */ sw $v0, -0x201c($at) -/* 95CEE8 80241CE8 0C0B1EAF */ jal get_variable -/* 95CEEC 80241CEC 34A5D481 */ ori $a1, $a1, 0xd481 -/* 95CEF0 80241CF0 0220202D */ daddu $a0, $s1, $zero -/* 95CEF4 80241CF4 3C05F4AC */ lui $a1, 0xf4ac -/* 95CEF8 80241CF8 4482B000 */ mtc1 $v0, $f22 -/* 95CEFC 80241CFC 00000000 */ nop -/* 95CF00 80241D00 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95CF04 80241D04 0C0B1EAF */ jal get_variable -/* 95CF08 80241D08 34A5D482 */ ori $a1, $a1, 0xd482 -/* 95CF0C 80241D0C 0220202D */ daddu $a0, $s1, $zero -/* 95CF10 80241D10 3C05F4AC */ lui $a1, 0xf4ac -/* 95CF14 80241D14 4482A000 */ mtc1 $v0, $f20 -/* 95CF18 80241D18 00000000 */ nop -/* 95CF1C 80241D1C 4680A520 */ cvt.s.w $f20, $f20 -/* 95CF20 80241D20 0C0B1EAF */ jal get_variable -/* 95CF24 80241D24 34A5D483 */ ori $a1, $a1, 0xd483 -/* 95CF28 80241D28 44821000 */ mtc1 $v0, $f2 -/* 95CF2C 80241D2C 00000000 */ nop -/* 95CF30 80241D30 468010A0 */ cvt.s.w $f2, $f2 -/* 95CF34 80241D34 4405B000 */ mfc1 $a1, $f22 -/* 95CF38 80241D38 4406A000 */ mfc1 $a2, $f20 -/* 95CF3C 80241D3C 3C013F80 */ lui $at, 0x3f80 -/* 95CF40 80241D40 44810000 */ mtc1 $at, $f0 -/* 95CF44 80241D44 44071000 */ mfc1 $a3, $f2 -/* 95CF48 80241D48 0000202D */ daddu $a0, $zero, $zero -/* 95CF4C 80241D4C AFA00014 */ sw $zero, 0x14($sp) -/* 95CF50 80241D50 0C01CA24 */ jal func_80072890 -/* 95CF54 80241D54 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95CF58 80241D58 8E030000 */ lw $v1, ($s0) -/* 95CF5C 80241D5C 8C64000C */ lw $a0, 0xc($v1) -/* 95CF60 80241D60 3C018025 */ lui $at, 0x8025 -/* 95CF64 80241D64 AC22DFE8 */ sw $v0, -0x2018($at) -/* 95CF68 80241D68 AC800018 */ sw $zero, 0x18($a0) -/* 95CF6C 80241D6C AC800020 */ sw $zero, 0x20($a0) -/* 95CF70 80241D70 AC800024 */ sw $zero, 0x24($a0) -/* 95CF74 80241D74 AC800028 */ sw $zero, 0x28($a0) -/* 95CF78 80241D78 AC80001C */ sw $zero, 0x1c($a0) -.L80241D7C: -/* 95CF7C 80241D7C 3C028025 */ lui $v0, 0x8025 -/* 95CF80 80241D80 8C42DFE0 */ lw $v0, -0x2020($v0) -/* 95CF84 80241D84 8C44000C */ lw $a0, 0xc($v0) -/* 95CF88 80241D88 8C820020 */ lw $v0, 0x20($a0) -/* 95CF8C 80241D8C 8C830028 */ lw $v1, 0x28($a0) -/* 95CF90 80241D90 2442000A */ addiu $v0, $v0, 0xa -/* 95CF94 80241D94 AC820020 */ sw $v0, 0x20($a0) -/* 95CF98 80241D98 8C820024 */ lw $v0, 0x24($a0) -/* 95CF9C 80241D9C 2463000A */ addiu $v1, $v1, 0xa -/* 95CFA0 80241DA0 AC830028 */ sw $v1, 0x28($a0) -/* 95CFA4 80241DA4 8C830018 */ lw $v1, 0x18($a0) -/* 95CFA8 80241DA8 2442000A */ addiu $v0, $v0, 0xa -/* 95CFAC 80241DAC AC820024 */ sw $v0, 0x24($a0) -/* 95CFB0 80241DB0 8C82001C */ lw $v0, 0x1c($a0) -/* 95CFB4 80241DB4 2463000A */ addiu $v1, $v1, 0xa -/* 95CFB8 80241DB8 AC830018 */ sw $v1, 0x18($a0) -/* 95CFBC 80241DBC 286300FF */ slti $v1, $v1, 0xff -/* 95CFC0 80241DC0 2442000A */ addiu $v0, $v0, 0xa -/* 95CFC4 80241DC4 AC82001C */ sw $v0, 0x1c($a0) -/* 95CFC8 80241DC8 14600004 */ bnez $v1, .L80241DDC -/* 95CFCC 80241DCC 0000102D */ daddu $v0, $zero, $zero -/* 95CFD0 80241DD0 240200FF */ addiu $v0, $zero, 0xff -/* 95CFD4 80241DD4 AC820018 */ sw $v0, 0x18($a0) -/* 95CFD8 80241DD8 24020002 */ addiu $v0, $zero, 2 -.L80241DDC: -/* 95CFDC 80241DDC 8FBF0020 */ lw $ra, 0x20($sp) -/* 95CFE0 80241DE0 8FB1001C */ lw $s1, 0x1c($sp) -/* 95CFE4 80241DE4 8FB00018 */ lw $s0, 0x18($sp) -/* 95CFE8 80241DE8 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 95CFEC 80241DEC D7B40028 */ ldc1 $f20, 0x28($sp) -/* 95CFF0 80241DF0 03E00008 */ jr $ra -/* 95CFF4 80241DF4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s new file mode 100644 index 0000000000..04941505fc --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241BE0_95CDE0.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BE0_95CDE0 +/* 95CDE0 80241BE0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 95CDE4 80241BE4 AFB1001C */ sw $s1, 0x1c($sp) +/* 95CDE8 80241BE8 AFBF0020 */ sw $ra, 0x20($sp) +/* 95CDEC 80241BEC AFB00018 */ sw $s0, 0x18($sp) +/* 95CDF0 80241BF0 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 95CDF4 80241BF4 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 95CDF8 80241BF8 10A00060 */ beqz $a1, .L80241D7C +/* 95CDFC 80241BFC 0080882D */ daddu $s1, $a0, $zero +/* 95CE00 80241C00 3C05F4AC */ lui $a1, 0xf4ac +/* 95CE04 80241C04 0C0B1EAF */ jal get_variable +/* 95CE08 80241C08 34A5D481 */ ori $a1, $a1, 0xd481 +/* 95CE0C 80241C0C 0220202D */ daddu $a0, $s1, $zero +/* 95CE10 80241C10 3C05F4AC */ lui $a1, 0xf4ac +/* 95CE14 80241C14 4482B000 */ mtc1 $v0, $f22 +/* 95CE18 80241C18 00000000 */ nop +/* 95CE1C 80241C1C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 95CE20 80241C20 0C0B1EAF */ jal get_variable +/* 95CE24 80241C24 34A5D482 */ ori $a1, $a1, 0xd482 +/* 95CE28 80241C28 0220202D */ daddu $a0, $s1, $zero +/* 95CE2C 80241C2C 3C05F4AC */ lui $a1, 0xf4ac +/* 95CE30 80241C30 4482A000 */ mtc1 $v0, $f20 +/* 95CE34 80241C34 00000000 */ nop +/* 95CE38 80241C38 4680A520 */ cvt.s.w $f20, $f20 +/* 95CE3C 80241C3C 0C0B1EAF */ jal get_variable +/* 95CE40 80241C40 34A5D483 */ ori $a1, $a1, 0xd483 +/* 95CE44 80241C44 44821000 */ mtc1 $v0, $f2 +/* 95CE48 80241C48 00000000 */ nop +/* 95CE4C 80241C4C 468010A0 */ cvt.s.w $f2, $f2 +/* 95CE50 80241C50 4405B000 */ mfc1 $a1, $f22 +/* 95CE54 80241C54 4406A000 */ mfc1 $a2, $f20 +/* 95CE58 80241C58 44071000 */ mfc1 $a3, $f2 +/* 95CE5C 80241C5C 0C01C574 */ jal func_800715D0 +/* 95CE60 80241C60 0000202D */ daddu $a0, $zero, $zero +/* 95CE64 80241C64 0220202D */ daddu $a0, $s1, $zero +/* 95CE68 80241C68 3C05F4AC */ lui $a1, 0xf4ac +/* 95CE6C 80241C6C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 95CE70 80241C70 3C108025 */ lui $s0, 0x8025 +/* 95CE74 80241C74 2610DFE0 */ addiu $s0, $s0, -0x2020 +/* 95CE78 80241C78 0C0B1EAF */ jal get_variable +/* 95CE7C 80241C7C AE020000 */ sw $v0, ($s0) +/* 95CE80 80241C80 0220202D */ daddu $a0, $s1, $zero +/* 95CE84 80241C84 3C05F4AC */ lui $a1, 0xf4ac +/* 95CE88 80241C88 4482B000 */ mtc1 $v0, $f22 +/* 95CE8C 80241C8C 00000000 */ nop +/* 95CE90 80241C90 4680B5A0 */ cvt.s.w $f22, $f22 +/* 95CE94 80241C94 0C0B1EAF */ jal get_variable +/* 95CE98 80241C98 34A5D482 */ ori $a1, $a1, 0xd482 +/* 95CE9C 80241C9C 0220202D */ daddu $a0, $s1, $zero +/* 95CEA0 80241CA0 3C05F4AC */ lui $a1, 0xf4ac +/* 95CEA4 80241CA4 4482A000 */ mtc1 $v0, $f20 +/* 95CEA8 80241CA8 00000000 */ nop +/* 95CEAC 80241CAC 4680A520 */ cvt.s.w $f20, $f20 +/* 95CEB0 80241CB0 0C0B1EAF */ jal get_variable +/* 95CEB4 80241CB4 34A5D483 */ ori $a1, $a1, 0xd483 +/* 95CEB8 80241CB8 44821000 */ mtc1 $v0, $f2 +/* 95CEBC 80241CBC 00000000 */ nop +/* 95CEC0 80241CC0 468010A0 */ cvt.s.w $f2, $f2 +/* 95CEC4 80241CC4 4405B000 */ mfc1 $a1, $f22 +/* 95CEC8 80241CC8 4406A000 */ mfc1 $a2, $f20 +/* 95CECC 80241CCC 44071000 */ mfc1 $a3, $f2 +/* 95CED0 80241CD0 0C01C604 */ jal func_80071810 +/* 95CED4 80241CD4 0000202D */ daddu $a0, $zero, $zero +/* 95CED8 80241CD8 0220202D */ daddu $a0, $s1, $zero +/* 95CEDC 80241CDC 3C05F4AC */ lui $a1, 0xf4ac +/* 95CEE0 80241CE0 3C018025 */ lui $at, 0x8025 +/* 95CEE4 80241CE4 AC22DFE4 */ sw $v0, -0x201c($at) +/* 95CEE8 80241CE8 0C0B1EAF */ jal get_variable +/* 95CEEC 80241CEC 34A5D481 */ ori $a1, $a1, 0xd481 +/* 95CEF0 80241CF0 0220202D */ daddu $a0, $s1, $zero +/* 95CEF4 80241CF4 3C05F4AC */ lui $a1, 0xf4ac +/* 95CEF8 80241CF8 4482B000 */ mtc1 $v0, $f22 +/* 95CEFC 80241CFC 00000000 */ nop +/* 95CF00 80241D00 4680B5A0 */ cvt.s.w $f22, $f22 +/* 95CF04 80241D04 0C0B1EAF */ jal get_variable +/* 95CF08 80241D08 34A5D482 */ ori $a1, $a1, 0xd482 +/* 95CF0C 80241D0C 0220202D */ daddu $a0, $s1, $zero +/* 95CF10 80241D10 3C05F4AC */ lui $a1, 0xf4ac +/* 95CF14 80241D14 4482A000 */ mtc1 $v0, $f20 +/* 95CF18 80241D18 00000000 */ nop +/* 95CF1C 80241D1C 4680A520 */ cvt.s.w $f20, $f20 +/* 95CF20 80241D20 0C0B1EAF */ jal get_variable +/* 95CF24 80241D24 34A5D483 */ ori $a1, $a1, 0xd483 +/* 95CF28 80241D28 44821000 */ mtc1 $v0, $f2 +/* 95CF2C 80241D2C 00000000 */ nop +/* 95CF30 80241D30 468010A0 */ cvt.s.w $f2, $f2 +/* 95CF34 80241D34 4405B000 */ mfc1 $a1, $f22 +/* 95CF38 80241D38 4406A000 */ mfc1 $a2, $f20 +/* 95CF3C 80241D3C 3C013F80 */ lui $at, 0x3f80 +/* 95CF40 80241D40 44810000 */ mtc1 $at, $f0 +/* 95CF44 80241D44 44071000 */ mfc1 $a3, $f2 +/* 95CF48 80241D48 0000202D */ daddu $a0, $zero, $zero +/* 95CF4C 80241D4C AFA00014 */ sw $zero, 0x14($sp) +/* 95CF50 80241D50 0C01CA24 */ jal func_80072890 +/* 95CF54 80241D54 E7A00010 */ swc1 $f0, 0x10($sp) +/* 95CF58 80241D58 8E030000 */ lw $v1, ($s0) +/* 95CF5C 80241D5C 8C64000C */ lw $a0, 0xc($v1) +/* 95CF60 80241D60 3C018025 */ lui $at, 0x8025 +/* 95CF64 80241D64 AC22DFE8 */ sw $v0, -0x2018($at) +/* 95CF68 80241D68 AC800018 */ sw $zero, 0x18($a0) +/* 95CF6C 80241D6C AC800020 */ sw $zero, 0x20($a0) +/* 95CF70 80241D70 AC800024 */ sw $zero, 0x24($a0) +/* 95CF74 80241D74 AC800028 */ sw $zero, 0x28($a0) +/* 95CF78 80241D78 AC80001C */ sw $zero, 0x1c($a0) +.L80241D7C: +/* 95CF7C 80241D7C 3C028025 */ lui $v0, 0x8025 +/* 95CF80 80241D80 8C42DFE0 */ lw $v0, -0x2020($v0) +/* 95CF84 80241D84 8C44000C */ lw $a0, 0xc($v0) +/* 95CF88 80241D88 8C820020 */ lw $v0, 0x20($a0) +/* 95CF8C 80241D8C 8C830028 */ lw $v1, 0x28($a0) +/* 95CF90 80241D90 2442000A */ addiu $v0, $v0, 0xa +/* 95CF94 80241D94 AC820020 */ sw $v0, 0x20($a0) +/* 95CF98 80241D98 8C820024 */ lw $v0, 0x24($a0) +/* 95CF9C 80241D9C 2463000A */ addiu $v1, $v1, 0xa +/* 95CFA0 80241DA0 AC830028 */ sw $v1, 0x28($a0) +/* 95CFA4 80241DA4 8C830018 */ lw $v1, 0x18($a0) +/* 95CFA8 80241DA8 2442000A */ addiu $v0, $v0, 0xa +/* 95CFAC 80241DAC AC820024 */ sw $v0, 0x24($a0) +/* 95CFB0 80241DB0 8C82001C */ lw $v0, 0x1c($a0) +/* 95CFB4 80241DB4 2463000A */ addiu $v1, $v1, 0xa +/* 95CFB8 80241DB8 AC830018 */ sw $v1, 0x18($a0) +/* 95CFBC 80241DBC 286300FF */ slti $v1, $v1, 0xff +/* 95CFC0 80241DC0 2442000A */ addiu $v0, $v0, 0xa +/* 95CFC4 80241DC4 AC82001C */ sw $v0, 0x1c($a0) +/* 95CFC8 80241DC8 14600004 */ bnez $v1, .L80241DDC +/* 95CFCC 80241DCC 0000102D */ daddu $v0, $zero, $zero +/* 95CFD0 80241DD0 240200FF */ addiu $v0, $zero, 0xff +/* 95CFD4 80241DD4 AC820018 */ sw $v0, 0x18($a0) +/* 95CFD8 80241DD8 24020002 */ addiu $v0, $zero, 2 +.L80241DDC: +/* 95CFDC 80241DDC 8FBF0020 */ lw $ra, 0x20($sp) +/* 95CFE0 80241DE0 8FB1001C */ lw $s1, 0x1c($sp) +/* 95CFE4 80241DE4 8FB00018 */ lw $s0, 0x18($sp) +/* 95CFE8 80241DE8 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 95CFEC 80241DEC D7B40028 */ ldc1 $f20, 0x28($sp) +/* 95CFF0 80241DF0 03E00008 */ jr $ra +/* 95CFF4 80241DF4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8.s deleted file mode 100644 index 42c1319e7f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DF8 -/* 95CFF8 80241DF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95CFFC 80241DFC 10A0000B */ beqz $a1, .L80241E2C -/* 95D000 80241E00 AFBF0010 */ sw $ra, 0x10($sp) -/* 95D004 80241E04 3C038025 */ lui $v1, 0x8025 -/* 95D008 80241E08 8C63DFE4 */ lw $v1, -0x201c($v1) -/* 95D00C 80241E0C 8C620000 */ lw $v0, ($v1) -/* 95D010 80241E10 3C048025 */ lui $a0, 0x8025 -/* 95D014 80241E14 8C84DFE8 */ lw $a0, -0x2018($a0) -/* 95D018 80241E18 34420010 */ ori $v0, $v0, 0x10 -/* 95D01C 80241E1C AC620000 */ sw $v0, ($v1) -/* 95D020 80241E20 8C820000 */ lw $v0, ($a0) -/* 95D024 80241E24 34420010 */ ori $v0, $v0, 0x10 -/* 95D028 80241E28 AC820000 */ sw $v0, ($a0) -.L80241E2C: -/* 95D02C 80241E2C 3C048025 */ lui $a0, 0x8025 -/* 95D030 80241E30 8C84DFE0 */ lw $a0, -0x2020($a0) -/* 95D034 80241E34 8C85000C */ lw $a1, 0xc($a0) -/* 95D038 80241E38 8CA20018 */ lw $v0, 0x18($a1) -/* 95D03C 80241E3C 8CA30020 */ lw $v1, 0x20($a1) -/* 95D040 80241E40 2442FFF6 */ addiu $v0, $v0, -0xa -/* 95D044 80241E44 ACA20018 */ sw $v0, 0x18($a1) -/* 95D048 80241E48 8CA20024 */ lw $v0, 0x24($a1) -/* 95D04C 80241E4C 2463FFF6 */ addiu $v1, $v1, -0xa -/* 95D050 80241E50 ACA30020 */ sw $v1, 0x20($a1) -/* 95D054 80241E54 8CA30028 */ lw $v1, 0x28($a1) -/* 95D058 80241E58 2442FFF6 */ addiu $v0, $v0, -0xa -/* 95D05C 80241E5C ACA20024 */ sw $v0, 0x24($a1) -/* 95D060 80241E60 8CA2001C */ lw $v0, 0x1c($a1) -/* 95D064 80241E64 2463FFF6 */ addiu $v1, $v1, -0xa -/* 95D068 80241E68 ACA30028 */ sw $v1, 0x28($a1) -/* 95D06C 80241E6C 8CA30018 */ lw $v1, 0x18($a1) -/* 95D070 80241E70 2442FFF6 */ addiu $v0, $v0, -0xa -/* 95D074 80241E74 18600003 */ blez $v1, .L80241E84 -/* 95D078 80241E78 ACA2001C */ sw $v0, 0x1c($a1) -/* 95D07C 80241E7C 080907A8 */ j .L80241EA0 -/* 95D080 80241E80 0000102D */ daddu $v0, $zero, $zero -.L80241E84: -/* 95D084 80241E84 0C016914 */ jal remove_effect -/* 95D088 80241E88 ACA00018 */ sw $zero, 0x18($a1) -/* 95D08C 80241E8C 3C048025 */ lui $a0, 0x8025 -/* 95D090 80241E90 8C84DFC0 */ lw $a0, -0x2040($a0) -/* 95D094 80241E94 0C048D70 */ jal func_801235C0 -/* 95D098 80241E98 00000000 */ nop -/* 95D09C 80241E9C 24020002 */ addiu $v0, $zero, 2 -.L80241EA0: -/* 95D0A0 80241EA0 8FBF0010 */ lw $ra, 0x10($sp) -/* 95D0A4 80241EA4 03E00008 */ jr $ra -/* 95D0A8 80241EA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s new file mode 100644 index 0000000000..e590df735a --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241DF8_95CFF8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DF8_95CFF8 +/* 95CFF8 80241DF8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95CFFC 80241DFC 10A0000B */ beqz $a1, .L80241E2C +/* 95D000 80241E00 AFBF0010 */ sw $ra, 0x10($sp) +/* 95D004 80241E04 3C038025 */ lui $v1, 0x8025 +/* 95D008 80241E08 8C63DFE4 */ lw $v1, -0x201c($v1) +/* 95D00C 80241E0C 8C620000 */ lw $v0, ($v1) +/* 95D010 80241E10 3C048025 */ lui $a0, 0x8025 +/* 95D014 80241E14 8C84DFE8 */ lw $a0, -0x2018($a0) +/* 95D018 80241E18 34420010 */ ori $v0, $v0, 0x10 +/* 95D01C 80241E1C AC620000 */ sw $v0, ($v1) +/* 95D020 80241E20 8C820000 */ lw $v0, ($a0) +/* 95D024 80241E24 34420010 */ ori $v0, $v0, 0x10 +/* 95D028 80241E28 AC820000 */ sw $v0, ($a0) +.L80241E2C: +/* 95D02C 80241E2C 3C048025 */ lui $a0, 0x8025 +/* 95D030 80241E30 8C84DFE0 */ lw $a0, -0x2020($a0) +/* 95D034 80241E34 8C85000C */ lw $a1, 0xc($a0) +/* 95D038 80241E38 8CA20018 */ lw $v0, 0x18($a1) +/* 95D03C 80241E3C 8CA30020 */ lw $v1, 0x20($a1) +/* 95D040 80241E40 2442FFF6 */ addiu $v0, $v0, -0xa +/* 95D044 80241E44 ACA20018 */ sw $v0, 0x18($a1) +/* 95D048 80241E48 8CA20024 */ lw $v0, 0x24($a1) +/* 95D04C 80241E4C 2463FFF6 */ addiu $v1, $v1, -0xa +/* 95D050 80241E50 ACA30020 */ sw $v1, 0x20($a1) +/* 95D054 80241E54 8CA30028 */ lw $v1, 0x28($a1) +/* 95D058 80241E58 2442FFF6 */ addiu $v0, $v0, -0xa +/* 95D05C 80241E5C ACA20024 */ sw $v0, 0x24($a1) +/* 95D060 80241E60 8CA2001C */ lw $v0, 0x1c($a1) +/* 95D064 80241E64 2463FFF6 */ addiu $v1, $v1, -0xa +/* 95D068 80241E68 ACA30028 */ sw $v1, 0x28($a1) +/* 95D06C 80241E6C 8CA30018 */ lw $v1, 0x18($a1) +/* 95D070 80241E70 2442FFF6 */ addiu $v0, $v0, -0xa +/* 95D074 80241E74 18600003 */ blez $v1, .L80241E84 +/* 95D078 80241E78 ACA2001C */ sw $v0, 0x1c($a1) +/* 95D07C 80241E7C 080907A8 */ j .L80241EA0 +/* 95D080 80241E80 0000102D */ daddu $v0, $zero, $zero +.L80241E84: +/* 95D084 80241E84 0C016914 */ jal remove_effect +/* 95D088 80241E88 ACA00018 */ sw $zero, 0x18($a1) +/* 95D08C 80241E8C 3C048025 */ lui $a0, 0x8025 +/* 95D090 80241E90 8C84DFC0 */ lw $a0, -0x2040($a0) +/* 95D094 80241E94 0C048D70 */ jal func_801235C0 +/* 95D098 80241E98 00000000 */ nop +/* 95D09C 80241E9C 24020002 */ addiu $v0, $zero, 2 +.L80241EA0: +/* 95D0A0 80241EA0 8FBF0010 */ lw $ra, 0x10($sp) +/* 95D0A4 80241EA4 03E00008 */ jr $ra +/* 95D0A8 80241EA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0.s deleted file mode 100644 index 9c2cc424c3..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EE0 -/* 95D0E0 80241EE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D0E4 80241EE4 AFBF0010 */ sw $ra, 0x10($sp) -/* 95D0E8 80241EE8 8C82000C */ lw $v0, 0xc($a0) -/* 95D0EC 80241EEC 0C0B1EAF */ jal get_variable -/* 95D0F0 80241EF0 8C450000 */ lw $a1, ($v0) -/* 95D0F4 80241EF4 0040202D */ daddu $a0, $v0, $zero -/* 95D0F8 80241EF8 3C028025 */ lui $v0, 0x8025 -/* 95D0FC 80241EFC 8C42DFE0 */ lw $v0, -0x2020($v0) -/* 95D100 80241F00 24030001 */ addiu $v1, $zero, 1 -/* 95D104 80241F04 8C45000C */ lw $a1, 0xc($v0) -/* 95D108 80241F08 1083000D */ beq $a0, $v1, .L80241F40 -/* 95D10C 80241F0C 28820002 */ slti $v0, $a0, 2 -/* 95D110 80241F10 10400005 */ beqz $v0, .L80241F28 -/* 95D114 80241F14 24020002 */ addiu $v0, $zero, 2 -/* 95D118 80241F18 10800007 */ beqz $a0, .L80241F38 -/* 95D11C 80241F1C 240200C0 */ addiu $v0, $zero, 0xc0 -/* 95D120 80241F20 080907D4 */ j .L80241F50 -/* 95D124 80241F24 ACA00038 */ sw $zero, 0x38($a1) -.L80241F28: -/* 95D128 80241F28 10820008 */ beq $a0, $v0, .L80241F4C -/* 95D12C 80241F2C 24020040 */ addiu $v0, $zero, 0x40 -/* 95D130 80241F30 080907D4 */ j .L80241F50 -/* 95D134 80241F34 ACA00038 */ sw $zero, 0x38($a1) -.L80241F38: -/* 95D138 80241F38 080907D4 */ j .L80241F50 -/* 95D13C 80241F3C ACA20038 */ sw $v0, 0x38($a1) -.L80241F40: -/* 95D140 80241F40 24020080 */ addiu $v0, $zero, 0x80 -/* 95D144 80241F44 080907D4 */ j .L80241F50 -/* 95D148 80241F48 ACA20038 */ sw $v0, 0x38($a1) -.L80241F4C: -/* 95D14C 80241F4C ACA20038 */ sw $v0, 0x38($a1) -.L80241F50: -/* 95D150 80241F50 8FBF0010 */ lw $ra, 0x10($sp) -/* 95D154 80241F54 24020002 */ addiu $v0, $zero, 2 -/* 95D158 80241F58 03E00008 */ jr $ra -/* 95D15C 80241F5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s new file mode 100644 index 0000000000..27cdc7298d --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241EE0_95D0E0.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241EE0_95D0E0 +/* 95D0E0 80241EE0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95D0E4 80241EE4 AFBF0010 */ sw $ra, 0x10($sp) +/* 95D0E8 80241EE8 8C82000C */ lw $v0, 0xc($a0) +/* 95D0EC 80241EEC 0C0B1EAF */ jal get_variable +/* 95D0F0 80241EF0 8C450000 */ lw $a1, ($v0) +/* 95D0F4 80241EF4 0040202D */ daddu $a0, $v0, $zero +/* 95D0F8 80241EF8 3C028025 */ lui $v0, 0x8025 +/* 95D0FC 80241EFC 8C42DFE0 */ lw $v0, -0x2020($v0) +/* 95D100 80241F00 24030001 */ addiu $v1, $zero, 1 +/* 95D104 80241F04 8C45000C */ lw $a1, 0xc($v0) +/* 95D108 80241F08 1083000D */ beq $a0, $v1, .L80241F40 +/* 95D10C 80241F0C 28820002 */ slti $v0, $a0, 2 +/* 95D110 80241F10 10400005 */ beqz $v0, .L80241F28 +/* 95D114 80241F14 24020002 */ addiu $v0, $zero, 2 +/* 95D118 80241F18 10800007 */ beqz $a0, .L80241F38 +/* 95D11C 80241F1C 240200C0 */ addiu $v0, $zero, 0xc0 +/* 95D120 80241F20 080907D4 */ j .L80241F50 +/* 95D124 80241F24 ACA00038 */ sw $zero, 0x38($a1) +.L80241F28: +/* 95D128 80241F28 10820008 */ beq $a0, $v0, .L80241F4C +/* 95D12C 80241F2C 24020040 */ addiu $v0, $zero, 0x40 +/* 95D130 80241F30 080907D4 */ j .L80241F50 +/* 95D134 80241F34 ACA00038 */ sw $zero, 0x38($a1) +.L80241F38: +/* 95D138 80241F38 080907D4 */ j .L80241F50 +/* 95D13C 80241F3C ACA20038 */ sw $v0, 0x38($a1) +.L80241F40: +/* 95D140 80241F40 24020080 */ addiu $v0, $zero, 0x80 +/* 95D144 80241F44 080907D4 */ j .L80241F50 +/* 95D148 80241F48 ACA20038 */ sw $v0, 0x38($a1) +.L80241F4C: +/* 95D14C 80241F4C ACA20038 */ sw $v0, 0x38($a1) +.L80241F50: +/* 95D150 80241F50 8FBF0010 */ lw $ra, 0x10($sp) +/* 95D154 80241F54 24020002 */ addiu $v0, $zero, 2 +/* 95D158 80241F58 03E00008 */ jr $ra +/* 95D15C 80241F5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60.s deleted file mode 100644 index 88196ff69d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F60 -/* 95D160 80241F60 3C028025 */ lui $v0, 0x8025 -/* 95D164 80241F64 8C42DFE8 */ lw $v0, -0x2018($v0) -/* 95D168 80241F68 8C42000C */ lw $v0, 0xc($v0) -/* 95D16C 80241F6C AC40001C */ sw $zero, 0x1c($v0) -/* 95D170 80241F70 03E00008 */ jr $ra -/* 95D174 80241F74 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s new file mode 100644 index 0000000000..efbae1ba43 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F60_95D160.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F60_95D160 +/* 95D160 80241F60 3C028025 */ lui $v0, 0x8025 +/* 95D164 80241F64 8C42DFE8 */ lw $v0, -0x2018($v0) +/* 95D168 80241F68 8C42000C */ lw $v0, 0xc($v0) +/* 95D16C 80241F6C AC40001C */ sw $zero, 0x1c($v0) +/* 95D170 80241F70 03E00008 */ jr $ra +/* 95D174 80241F74 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78.s deleted file mode 100644 index 5f945816df..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F78 -/* 95D178 80241F78 3C028025 */ lui $v0, 0x8025 -/* 95D17C 80241F7C 8C42DFE8 */ lw $v0, -0x2018($v0) -/* 95D180 80241F80 8C43000C */ lw $v1, 0xc($v0) -/* 95D184 80241F84 24020001 */ addiu $v0, $zero, 1 -/* 95D188 80241F88 AC62001C */ sw $v0, 0x1c($v1) -/* 95D18C 80241F8C 03E00008 */ jr $ra -/* 95D190 80241F90 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s new file mode 100644 index 0000000000..110bc2f96d --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F78_95D178.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F78_95D178 +/* 95D178 80241F78 3C028025 */ lui $v0, 0x8025 +/* 95D17C 80241F7C 8C42DFE8 */ lw $v0, -0x2018($v0) +/* 95D180 80241F80 8C43000C */ lw $v1, 0xc($v0) +/* 95D184 80241F84 24020001 */ addiu $v0, $zero, 1 +/* 95D188 80241F88 AC62001C */ sw $v0, 0x1c($v1) +/* 95D18C 80241F8C 03E00008 */ jr $ra +/* 95D190 80241F90 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94.s deleted file mode 100644 index a0f22a8922..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F94 -/* 95D194 80241F94 3C028025 */ lui $v0, 0x8025 -/* 95D198 80241F98 8C42DFE8 */ lw $v0, -0x2018($v0) -/* 95D19C 80241F9C 8C43000C */ lw $v1, 0xc($v0) -/* 95D1A0 80241FA0 24020002 */ addiu $v0, $zero, 2 -/* 95D1A4 80241FA4 03E00008 */ jr $ra -/* 95D1A8 80241FA8 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s new file mode 100644 index 0000000000..bb8cb62be9 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241F94_95D194.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F94_95D194 +/* 95D194 80241F94 3C028025 */ lui $v0, 0x8025 +/* 95D198 80241F98 8C42DFE8 */ lw $v0, -0x2018($v0) +/* 95D19C 80241F9C 8C43000C */ lw $v1, 0xc($v0) +/* 95D1A0 80241FA0 24020002 */ addiu $v0, $zero, 2 +/* 95D1A4 80241FA4 03E00008 */ jr $ra +/* 95D1A8 80241FA8 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC.s deleted file mode 100644 index a0d7c49945..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FAC -/* 95D1AC 80241FAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D1B0 80241FB0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 95D1B4 80241FB4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 95D1B8 80241FB8 3C05FE36 */ lui $a1, 0xfe36 -/* 95D1BC 80241FBC AFBF0010 */ sw $ra, 0x10($sp) -/* 95D1C0 80241FC0 80460075 */ lb $a2, 0x75($v0) -/* 95D1C4 80241FC4 0C0B2026 */ jal set_variable -/* 95D1C8 80241FC8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95D1CC 80241FCC 8FBF0010 */ lw $ra, 0x10($sp) -/* 95D1D0 80241FD0 24020002 */ addiu $v0, $zero, 2 -/* 95D1D4 80241FD4 03E00008 */ jr $ra -/* 95D1D8 80241FD8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s new file mode 100644 index 0000000000..2c1668a23a --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FAC_95D1AC +/* 95D1AC 80241FAC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95D1B0 80241FB0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 95D1B4 80241FB4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 95D1B8 80241FB8 3C05FE36 */ lui $a1, 0xfe36 +/* 95D1BC 80241FBC AFBF0010 */ sw $ra, 0x10($sp) +/* 95D1C0 80241FC0 80460075 */ lb $a2, 0x75($v0) +/* 95D1C4 80241FC4 0C0B2026 */ jal set_variable +/* 95D1C8 80241FC8 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 95D1CC 80241FCC 8FBF0010 */ lw $ra, 0x10($sp) +/* 95D1D0 80241FD0 24020002 */ addiu $v0, $zero, 2 +/* 95D1D4 80241FD4 03E00008 */ jr $ra +/* 95D1D8 80241FD8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC.s deleted file mode 100644 index 9a9cb96acb..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FDC -/* 95D1DC 80241FDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95D1E0 80241FE0 AFB10014 */ sw $s1, 0x14($sp) -/* 95D1E4 80241FE4 0080882D */ daddu $s1, $a0, $zero -/* 95D1E8 80241FE8 AFBF0018 */ sw $ra, 0x18($sp) -/* 95D1EC 80241FEC AFB00010 */ sw $s0, 0x10($sp) -/* 95D1F0 80241FF0 8E30000C */ lw $s0, 0xc($s1) -/* 95D1F4 80241FF4 8E050000 */ lw $a1, ($s0) -/* 95D1F8 80241FF8 0C0B1EAF */ jal get_variable -/* 95D1FC 80241FFC 26100004 */ addiu $s0, $s0, 4 -/* 95D200 80242000 0220202D */ daddu $a0, $s1, $zero -/* 95D204 80242004 8E050000 */ lw $a1, ($s0) -/* 95D208 80242008 0C0B210B */ jal get_float_variable -/* 95D20C 8024200C 0040802D */ daddu $s0, $v0, $zero -/* 95D210 80242010 24020002 */ addiu $v0, $zero, 2 -/* 95D214 80242014 00501804 */ sllv $v1, $s0, $v0 -/* 95D218 80242018 00701821 */ addu $v1, $v1, $s0 -/* 95D21C 8024201C 00431804 */ sllv $v1, $v1, $v0 -/* 95D220 80242020 00701823 */ subu $v1, $v1, $s0 -/* 95D224 80242024 000320C0 */ sll $a0, $v1, 3 -/* 95D228 80242028 00641821 */ addu $v1, $v1, $a0 -/* 95D22C 8024202C 000318C0 */ sll $v1, $v1, 3 -/* 95D230 80242030 3C01800B */ lui $at, 0x800b -/* 95D234 80242034 00230821 */ addu $at, $at, $v1 -/* 95D238 80242038 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 95D23C 8024203C 8FBF0018 */ lw $ra, 0x18($sp) -/* 95D240 80242040 8FB10014 */ lw $s1, 0x14($sp) -/* 95D244 80242044 8FB00010 */ lw $s0, 0x10($sp) -/* 95D248 80242048 03E00008 */ jr $ra -/* 95D24C 8024204C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s new file mode 100644 index 0000000000..09c67d9c69 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FDC_95D1DC +/* 95D1DC 80241FDC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95D1E0 80241FE0 AFB10014 */ sw $s1, 0x14($sp) +/* 95D1E4 80241FE4 0080882D */ daddu $s1, $a0, $zero +/* 95D1E8 80241FE8 AFBF0018 */ sw $ra, 0x18($sp) +/* 95D1EC 80241FEC AFB00010 */ sw $s0, 0x10($sp) +/* 95D1F0 80241FF0 8E30000C */ lw $s0, 0xc($s1) +/* 95D1F4 80241FF4 8E050000 */ lw $a1, ($s0) +/* 95D1F8 80241FF8 0C0B1EAF */ jal get_variable +/* 95D1FC 80241FFC 26100004 */ addiu $s0, $s0, 4 +/* 95D200 80242000 0220202D */ daddu $a0, $s1, $zero +/* 95D204 80242004 8E050000 */ lw $a1, ($s0) +/* 95D208 80242008 0C0B210B */ jal get_float_variable +/* 95D20C 8024200C 0040802D */ daddu $s0, $v0, $zero +/* 95D210 80242010 24020002 */ addiu $v0, $zero, 2 +/* 95D214 80242014 00501804 */ sllv $v1, $s0, $v0 +/* 95D218 80242018 00701821 */ addu $v1, $v1, $s0 +/* 95D21C 8024201C 00431804 */ sllv $v1, $v1, $v0 +/* 95D220 80242020 00701823 */ subu $v1, $v1, $s0 +/* 95D224 80242024 000320C0 */ sll $a0, $v1, 3 +/* 95D228 80242028 00641821 */ addu $v1, $v1, $a0 +/* 95D22C 8024202C 000318C0 */ sll $v1, $v1, 3 +/* 95D230 80242030 3C01800B */ lui $at, 0x800b +/* 95D234 80242034 00230821 */ addu $at, $at, $v1 +/* 95D238 80242038 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 95D23C 8024203C 8FBF0018 */ lw $ra, 0x18($sp) +/* 95D240 80242040 8FB10014 */ lw $s1, 0x14($sp) +/* 95D244 80242044 8FB00010 */ lw $s0, 0x10($sp) +/* 95D248 80242048 03E00008 */ jr $ra +/* 95D24C 8024204C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050.s deleted file mode 100644 index cb3347fb46..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242050 -/* 95D250 80242050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95D254 80242054 AFB10014 */ sw $s1, 0x14($sp) -/* 95D258 80242058 0080882D */ daddu $s1, $a0, $zero -/* 95D25C 8024205C AFBF0018 */ sw $ra, 0x18($sp) -/* 95D260 80242060 AFB00010 */ sw $s0, 0x10($sp) -/* 95D264 80242064 8E30000C */ lw $s0, 0xc($s1) -/* 95D268 80242068 8E050000 */ lw $a1, ($s0) -/* 95D26C 8024206C 0C0B1EAF */ jal get_variable -/* 95D270 80242070 26100004 */ addiu $s0, $s0, 4 -/* 95D274 80242074 00021880 */ sll $v1, $v0, 2 -/* 95D278 80242078 00621821 */ addu $v1, $v1, $v0 -/* 95D27C 8024207C 00031880 */ sll $v1, $v1, 2 -/* 95D280 80242080 00621823 */ subu $v1, $v1, $v0 -/* 95D284 80242084 000310C0 */ sll $v0, $v1, 3 -/* 95D288 80242088 00621821 */ addu $v1, $v1, $v0 -/* 95D28C 8024208C 000318C0 */ sll $v1, $v1, 3 -/* 95D290 80242090 3C01800B */ lui $at, 0x800b -/* 95D294 80242094 00230821 */ addu $at, $at, $v1 -/* 95D298 80242098 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 95D29C 8024209C 3C014480 */ lui $at, 0x4480 -/* 95D2A0 802420A0 44810000 */ mtc1 $at, $f0 -/* 95D2A4 802420A4 00000000 */ nop -/* 95D2A8 802420A8 46001082 */ mul.s $f2, $f2, $f0 -/* 95D2AC 802420AC 00000000 */ nop -/* 95D2B0 802420B0 3C01CD5B */ lui $at, 0xcd5b -/* 95D2B4 802420B4 34215858 */ ori $at, $at, 0x5858 -/* 95D2B8 802420B8 44810000 */ mtc1 $at, $f0 -/* 95D2BC 802420BC 00000000 */ nop -/* 95D2C0 802420C0 46001080 */ add.s $f2, $f2, $f0 -/* 95D2C4 802420C4 8E050000 */ lw $a1, ($s0) -/* 95D2C8 802420C8 4600110D */ trunc.w.s $f4, $f2 -/* 95D2CC 802420CC 44062000 */ mfc1 $a2, $f4 -/* 95D2D0 802420D0 0C0B2026 */ jal set_variable -/* 95D2D4 802420D4 0220202D */ daddu $a0, $s1, $zero -/* 95D2D8 802420D8 8FBF0018 */ lw $ra, 0x18($sp) -/* 95D2DC 802420DC 8FB10014 */ lw $s1, 0x14($sp) -/* 95D2E0 802420E0 8FB00010 */ lw $s0, 0x10($sp) -/* 95D2E4 802420E4 24020002 */ addiu $v0, $zero, 2 -/* 95D2E8 802420E8 03E00008 */ jr $ra -/* 95D2EC 802420EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s new file mode 100644 index 0000000000..173827e43f --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242050_95D250 +/* 95D250 80242050 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95D254 80242054 AFB10014 */ sw $s1, 0x14($sp) +/* 95D258 80242058 0080882D */ daddu $s1, $a0, $zero +/* 95D25C 8024205C AFBF0018 */ sw $ra, 0x18($sp) +/* 95D260 80242060 AFB00010 */ sw $s0, 0x10($sp) +/* 95D264 80242064 8E30000C */ lw $s0, 0xc($s1) +/* 95D268 80242068 8E050000 */ lw $a1, ($s0) +/* 95D26C 8024206C 0C0B1EAF */ jal get_variable +/* 95D270 80242070 26100004 */ addiu $s0, $s0, 4 +/* 95D274 80242074 00021880 */ sll $v1, $v0, 2 +/* 95D278 80242078 00621821 */ addu $v1, $v1, $v0 +/* 95D27C 8024207C 00031880 */ sll $v1, $v1, 2 +/* 95D280 80242080 00621823 */ subu $v1, $v1, $v0 +/* 95D284 80242084 000310C0 */ sll $v0, $v1, 3 +/* 95D288 80242088 00621821 */ addu $v1, $v1, $v0 +/* 95D28C 8024208C 000318C0 */ sll $v1, $v1, 3 +/* 95D290 80242090 3C01800B */ lui $at, 0x800b +/* 95D294 80242094 00230821 */ addu $at, $at, $v1 +/* 95D298 80242098 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 95D29C 8024209C 3C014480 */ lui $at, 0x4480 +/* 95D2A0 802420A0 44810000 */ mtc1 $at, $f0 +/* 95D2A4 802420A4 00000000 */ nop +/* 95D2A8 802420A8 46001082 */ mul.s $f2, $f2, $f0 +/* 95D2AC 802420AC 00000000 */ nop +/* 95D2B0 802420B0 3C01CD5B */ lui $at, 0xcd5b +/* 95D2B4 802420B4 34215858 */ ori $at, $at, 0x5858 +/* 95D2B8 802420B8 44810000 */ mtc1 $at, $f0 +/* 95D2BC 802420BC 00000000 */ nop +/* 95D2C0 802420C0 46001080 */ add.s $f2, $f2, $f0 +/* 95D2C4 802420C4 8E050000 */ lw $a1, ($s0) +/* 95D2C8 802420C8 4600110D */ trunc.w.s $f4, $f2 +/* 95D2CC 802420CC 44062000 */ mfc1 $a2, $f4 +/* 95D2D0 802420D0 0C0B2026 */ jal set_variable +/* 95D2D4 802420D4 0220202D */ daddu $a0, $s1, $zero +/* 95D2D8 802420D8 8FBF0018 */ lw $ra, 0x18($sp) +/* 95D2DC 802420DC 8FB10014 */ lw $s1, 0x14($sp) +/* 95D2E0 802420E0 8FB00010 */ lw $s0, 0x10($sp) +/* 95D2E4 802420E4 24020002 */ addiu $v0, $zero, 2 +/* 95D2E8 802420E8 03E00008 */ jr $ra +/* 95D2EC 802420EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0.s deleted file mode 100644 index c0987b9bd1..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420F0 -/* 95D2F0 802420F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95D2F4 802420F4 AFB20018 */ sw $s2, 0x18($sp) -/* 95D2F8 802420F8 0080902D */ daddu $s2, $a0, $zero -/* 95D2FC 802420FC AFBF0030 */ sw $ra, 0x30($sp) -/* 95D300 80242100 AFB7002C */ sw $s7, 0x2c($sp) -/* 95D304 80242104 AFB60028 */ sw $s6, 0x28($sp) -/* 95D308 80242108 AFB50024 */ sw $s5, 0x24($sp) -/* 95D30C 8024210C AFB40020 */ sw $s4, 0x20($sp) -/* 95D310 80242110 AFB3001C */ sw $s3, 0x1c($sp) -/* 95D314 80242114 AFB10014 */ sw $s1, 0x14($sp) -/* 95D318 80242118 AFB00010 */ sw $s0, 0x10($sp) -/* 95D31C 8024211C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 95D320 80242120 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 95D324 80242124 8E50000C */ lw $s0, 0xc($s2) -/* 95D328 80242128 8E050000 */ lw $a1, ($s0) -/* 95D32C 8024212C 0C0B1EAF */ jal get_variable -/* 95D330 80242130 26100004 */ addiu $s0, $s0, 4 -/* 95D334 80242134 8E050000 */ lw $a1, ($s0) -/* 95D338 80242138 26100004 */ addiu $s0, $s0, 4 -/* 95D33C 8024213C 0240202D */ daddu $a0, $s2, $zero -/* 95D340 80242140 0C0B1EAF */ jal get_variable -/* 95D344 80242144 0040B82D */ daddu $s7, $v0, $zero -/* 95D348 80242148 8E050000 */ lw $a1, ($s0) -/* 95D34C 8024214C 26100004 */ addiu $s0, $s0, 4 -/* 95D350 80242150 0240202D */ daddu $a0, $s2, $zero -/* 95D354 80242154 0C0B1EAF */ jal get_variable -/* 95D358 80242158 0040B02D */ daddu $s6, $v0, $zero -/* 95D35C 8024215C 0240202D */ daddu $a0, $s2, $zero -/* 95D360 80242160 3C05F4AC */ lui $a1, 0xf4ac -/* 95D364 80242164 34A5D481 */ ori $a1, $a1, 0xd481 -/* 95D368 80242168 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 95D36C 8024216C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 95D370 80242170 8E140000 */ lw $s4, ($s0) -/* 95D374 80242174 00061880 */ sll $v1, $a2, 2 -/* 95D378 80242178 00661821 */ addu $v1, $v1, $a2 -/* 95D37C 8024217C 00031880 */ sll $v1, $v1, 2 -/* 95D380 80242180 00661823 */ subu $v1, $v1, $a2 -/* 95D384 80242184 000330C0 */ sll $a2, $v1, 3 -/* 95D388 80242188 00661821 */ addu $v1, $v1, $a2 -/* 95D38C 8024218C 000318C0 */ sll $v1, $v1, 3 -/* 95D390 80242190 3C01800B */ lui $at, 0x800b -/* 95D394 80242194 00230821 */ addu $at, $at, $v1 -/* 95D398 80242198 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 95D39C 8024219C 8E150004 */ lw $s5, 4($s0) -/* 95D3A0 802421A0 4600010D */ trunc.w.s $f4, $f0 -/* 95D3A4 802421A4 44112000 */ mfc1 $s1, $f4 -/* 95D3A8 802421A8 0C0B1EAF */ jal get_variable -/* 95D3AC 802421AC 0040982D */ daddu $s3, $v0, $zero -/* 95D3B0 802421B0 4491B000 */ mtc1 $s1, $f22 -/* 95D3B4 802421B4 00000000 */ nop -/* 95D3B8 802421B8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95D3BC 802421BC 4600B306 */ mov.s $f12, $f22 -/* 95D3C0 802421C0 0C00A8D4 */ jal cos_deg -/* 95D3C4 802421C4 0040802D */ daddu $s0, $v0, $zero -/* 95D3C8 802421C8 4493A000 */ mtc1 $s3, $f20 -/* 95D3CC 802421CC 00000000 */ nop -/* 95D3D0 802421D0 4680A520 */ cvt.s.w $f20, $f20 -/* 95D3D4 802421D4 4600A002 */ mul.s $f0, $f20, $f0 -/* 95D3D8 802421D8 00000000 */ nop -/* 95D3DC 802421DC 0240202D */ daddu $a0, $s2, $zero -/* 95D3E0 802421E0 44901000 */ mtc1 $s0, $f2 -/* 95D3E4 802421E4 00000000 */ nop -/* 95D3E8 802421E8 468010A0 */ cvt.s.w $f2, $f2 -/* 95D3EC 802421EC 46001081 */ sub.s $f2, $f2, $f0 -/* 95D3F0 802421F0 3C05F4AC */ lui $a1, 0xf4ac -/* 95D3F4 802421F4 4600110D */ trunc.w.s $f4, $f2 -/* 95D3F8 802421F8 44102000 */ mfc1 $s0, $f4 -/* 95D3FC 802421FC 0C0B1EAF */ jal get_variable -/* 95D400 80242200 34A5D483 */ ori $a1, $a1, 0xd483 -/* 95D404 80242204 4600B306 */ mov.s $f12, $f22 -/* 95D408 80242208 0C00A8BB */ jal sin_deg -/* 95D40C 8024220C 0040882D */ daddu $s1, $v0, $zero -/* 95D410 80242210 4600A502 */ mul.s $f20, $f20, $f0 -/* 95D414 80242214 00000000 */ nop -/* 95D418 80242218 0240202D */ daddu $a0, $s2, $zero -/* 95D41C 8024221C 44910000 */ mtc1 $s1, $f0 -/* 95D420 80242220 00000000 */ nop -/* 95D424 80242224 46800020 */ cvt.s.w $f0, $f0 -/* 95D428 80242228 46140001 */ sub.s $f0, $f0, $f20 -/* 95D42C 8024222C 0280282D */ daddu $a1, $s4, $zero -/* 95D430 80242230 02173023 */ subu $a2, $s0, $s7 -/* 95D434 80242234 4600010D */ trunc.w.s $f4, $f0 -/* 95D438 80242238 44102000 */ mfc1 $s0, $f4 -/* 95D43C 8024223C 0C0B2026 */ jal set_variable -/* 95D440 80242240 02168023 */ subu $s0, $s0, $s6 -/* 95D444 80242244 0240202D */ daddu $a0, $s2, $zero -/* 95D448 80242248 02A0282D */ daddu $a1, $s5, $zero -/* 95D44C 8024224C 0C0B2026 */ jal set_variable -/* 95D450 80242250 0200302D */ daddu $a2, $s0, $zero -/* 95D454 80242254 8FBF0030 */ lw $ra, 0x30($sp) -/* 95D458 80242258 8FB7002C */ lw $s7, 0x2c($sp) -/* 95D45C 8024225C 8FB60028 */ lw $s6, 0x28($sp) -/* 95D460 80242260 8FB50024 */ lw $s5, 0x24($sp) -/* 95D464 80242264 8FB40020 */ lw $s4, 0x20($sp) -/* 95D468 80242268 8FB3001C */ lw $s3, 0x1c($sp) -/* 95D46C 8024226C 8FB20018 */ lw $s2, 0x18($sp) -/* 95D470 80242270 8FB10014 */ lw $s1, 0x14($sp) -/* 95D474 80242274 8FB00010 */ lw $s0, 0x10($sp) -/* 95D478 80242278 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 95D47C 8024227C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 95D480 80242280 24020002 */ addiu $v0, $zero, 2 -/* 95D484 80242284 03E00008 */ jr $ra -/* 95D488 80242288 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s new file mode 100644 index 0000000000..5537574bea --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420F0_95D2F0 +/* 95D2F0 802420F0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 95D2F4 802420F4 AFB20018 */ sw $s2, 0x18($sp) +/* 95D2F8 802420F8 0080902D */ daddu $s2, $a0, $zero +/* 95D2FC 802420FC AFBF0030 */ sw $ra, 0x30($sp) +/* 95D300 80242100 AFB7002C */ sw $s7, 0x2c($sp) +/* 95D304 80242104 AFB60028 */ sw $s6, 0x28($sp) +/* 95D308 80242108 AFB50024 */ sw $s5, 0x24($sp) +/* 95D30C 8024210C AFB40020 */ sw $s4, 0x20($sp) +/* 95D310 80242110 AFB3001C */ sw $s3, 0x1c($sp) +/* 95D314 80242114 AFB10014 */ sw $s1, 0x14($sp) +/* 95D318 80242118 AFB00010 */ sw $s0, 0x10($sp) +/* 95D31C 8024211C F7B60040 */ sdc1 $f22, 0x40($sp) +/* 95D320 80242120 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 95D324 80242124 8E50000C */ lw $s0, 0xc($s2) +/* 95D328 80242128 8E050000 */ lw $a1, ($s0) +/* 95D32C 8024212C 0C0B1EAF */ jal get_variable +/* 95D330 80242130 26100004 */ addiu $s0, $s0, 4 +/* 95D334 80242134 8E050000 */ lw $a1, ($s0) +/* 95D338 80242138 26100004 */ addiu $s0, $s0, 4 +/* 95D33C 8024213C 0240202D */ daddu $a0, $s2, $zero +/* 95D340 80242140 0C0B1EAF */ jal get_variable +/* 95D344 80242144 0040B82D */ daddu $s7, $v0, $zero +/* 95D348 80242148 8E050000 */ lw $a1, ($s0) +/* 95D34C 8024214C 26100004 */ addiu $s0, $s0, 4 +/* 95D350 80242150 0240202D */ daddu $a0, $s2, $zero +/* 95D354 80242154 0C0B1EAF */ jal get_variable +/* 95D358 80242158 0040B02D */ daddu $s6, $v0, $zero +/* 95D35C 8024215C 0240202D */ daddu $a0, $s2, $zero +/* 95D360 80242160 3C05F4AC */ lui $a1, 0xf4ac +/* 95D364 80242164 34A5D481 */ ori $a1, $a1, 0xd481 +/* 95D368 80242168 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* 95D36C 8024216C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* 95D370 80242170 8E140000 */ lw $s4, ($s0) +/* 95D374 80242174 00061880 */ sll $v1, $a2, 2 +/* 95D378 80242178 00661821 */ addu $v1, $v1, $a2 +/* 95D37C 8024217C 00031880 */ sll $v1, $v1, 2 +/* 95D380 80242180 00661823 */ subu $v1, $v1, $a2 +/* 95D384 80242184 000330C0 */ sll $a2, $v1, 3 +/* 95D388 80242188 00661821 */ addu $v1, $v1, $a2 +/* 95D38C 8024218C 000318C0 */ sll $v1, $v1, 3 +/* 95D390 80242190 3C01800B */ lui $at, 0x800b +/* 95D394 80242194 00230821 */ addu $at, $at, $v1 +/* 95D398 80242198 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 95D39C 8024219C 8E150004 */ lw $s5, 4($s0) +/* 95D3A0 802421A0 4600010D */ trunc.w.s $f4, $f0 +/* 95D3A4 802421A4 44112000 */ mfc1 $s1, $f4 +/* 95D3A8 802421A8 0C0B1EAF */ jal get_variable +/* 95D3AC 802421AC 0040982D */ daddu $s3, $v0, $zero +/* 95D3B0 802421B0 4491B000 */ mtc1 $s1, $f22 +/* 95D3B4 802421B4 00000000 */ nop +/* 95D3B8 802421B8 4680B5A0 */ cvt.s.w $f22, $f22 +/* 95D3BC 802421BC 4600B306 */ mov.s $f12, $f22 +/* 95D3C0 802421C0 0C00A8D4 */ jal cos_deg +/* 95D3C4 802421C4 0040802D */ daddu $s0, $v0, $zero +/* 95D3C8 802421C8 4493A000 */ mtc1 $s3, $f20 +/* 95D3CC 802421CC 00000000 */ nop +/* 95D3D0 802421D0 4680A520 */ cvt.s.w $f20, $f20 +/* 95D3D4 802421D4 4600A002 */ mul.s $f0, $f20, $f0 +/* 95D3D8 802421D8 00000000 */ nop +/* 95D3DC 802421DC 0240202D */ daddu $a0, $s2, $zero +/* 95D3E0 802421E0 44901000 */ mtc1 $s0, $f2 +/* 95D3E4 802421E4 00000000 */ nop +/* 95D3E8 802421E8 468010A0 */ cvt.s.w $f2, $f2 +/* 95D3EC 802421EC 46001081 */ sub.s $f2, $f2, $f0 +/* 95D3F0 802421F0 3C05F4AC */ lui $a1, 0xf4ac +/* 95D3F4 802421F4 4600110D */ trunc.w.s $f4, $f2 +/* 95D3F8 802421F8 44102000 */ mfc1 $s0, $f4 +/* 95D3FC 802421FC 0C0B1EAF */ jal get_variable +/* 95D400 80242200 34A5D483 */ ori $a1, $a1, 0xd483 +/* 95D404 80242204 4600B306 */ mov.s $f12, $f22 +/* 95D408 80242208 0C00A8BB */ jal sin_deg +/* 95D40C 8024220C 0040882D */ daddu $s1, $v0, $zero +/* 95D410 80242210 4600A502 */ mul.s $f20, $f20, $f0 +/* 95D414 80242214 00000000 */ nop +/* 95D418 80242218 0240202D */ daddu $a0, $s2, $zero +/* 95D41C 8024221C 44910000 */ mtc1 $s1, $f0 +/* 95D420 80242220 00000000 */ nop +/* 95D424 80242224 46800020 */ cvt.s.w $f0, $f0 +/* 95D428 80242228 46140001 */ sub.s $f0, $f0, $f20 +/* 95D42C 8024222C 0280282D */ daddu $a1, $s4, $zero +/* 95D430 80242230 02173023 */ subu $a2, $s0, $s7 +/* 95D434 80242234 4600010D */ trunc.w.s $f4, $f0 +/* 95D438 80242238 44102000 */ mfc1 $s0, $f4 +/* 95D43C 8024223C 0C0B2026 */ jal set_variable +/* 95D440 80242240 02168023 */ subu $s0, $s0, $s6 +/* 95D444 80242244 0240202D */ daddu $a0, $s2, $zero +/* 95D448 80242248 02A0282D */ daddu $a1, $s5, $zero +/* 95D44C 8024224C 0C0B2026 */ jal set_variable +/* 95D450 80242250 0200302D */ daddu $a2, $s0, $zero +/* 95D454 80242254 8FBF0030 */ lw $ra, 0x30($sp) +/* 95D458 80242258 8FB7002C */ lw $s7, 0x2c($sp) +/* 95D45C 8024225C 8FB60028 */ lw $s6, 0x28($sp) +/* 95D460 80242260 8FB50024 */ lw $s5, 0x24($sp) +/* 95D464 80242264 8FB40020 */ lw $s4, 0x20($sp) +/* 95D468 80242268 8FB3001C */ lw $s3, 0x1c($sp) +/* 95D46C 8024226C 8FB20018 */ lw $s2, 0x18($sp) +/* 95D470 80242270 8FB10014 */ lw $s1, 0x14($sp) +/* 95D474 80242274 8FB00010 */ lw $s0, 0x10($sp) +/* 95D478 80242278 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 95D47C 8024227C D7B40038 */ ldc1 $f20, 0x38($sp) +/* 95D480 80242280 24020002 */ addiu $v0, $zero, 2 +/* 95D484 80242284 03E00008 */ jr $ra +/* 95D488 80242288 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0.s deleted file mode 100644 index f09584a601..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F0 -/* 95D4F0 802422F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95D4F4 802422F4 AFB10014 */ sw $s1, 0x14($sp) -/* 95D4F8 802422F8 0080882D */ daddu $s1, $a0, $zero -/* 95D4FC 802422FC AFB00010 */ sw $s0, 0x10($sp) -/* 95D500 80242300 00A0802D */ daddu $s0, $a1, $zero -/* 95D504 80242304 AFBF0018 */ sw $ra, 0x18($sp) -/* 95D508 80242308 0C00EABB */ jal get_npc_unsafe -/* 95D50C 8024230C 2404FFFC */ addiu $a0, $zero, -4 -/* 95D510 80242310 12000003 */ beqz $s0, .L80242320 -/* 95D514 80242314 0040182D */ daddu $v1, $v0, $zero -/* 95D518 80242318 2402003C */ addiu $v0, $zero, 0x3c -/* 95D51C 8024231C AE220070 */ sw $v0, 0x70($s1) -.L80242320: -/* 95D520 80242320 C462000C */ lwc1 $f2, 0xc($v1) -/* 95D524 80242324 3C0141F0 */ lui $at, 0x41f0 -/* 95D528 80242328 44810000 */ mtc1 $at, $f0 -/* 95D52C 8024232C 00000000 */ nop -/* 95D530 80242330 46001000 */ add.s $f0, $f2, $f0 -/* 95D534 80242334 3C0143B4 */ lui $at, 0x43b4 -/* 95D538 80242338 44811000 */ mtc1 $at, $f2 -/* 95D53C 8024233C 00000000 */ nop -/* 95D540 80242340 4600103E */ c.le.s $f2, $f0 -/* 95D544 80242344 00000000 */ nop -/* 95D548 80242348 45000003 */ bc1f .L80242358 -/* 95D54C 8024234C E460000C */ swc1 $f0, 0xc($v1) -/* 95D550 80242350 46020001 */ sub.s $f0, $f0, $f2 -/* 95D554 80242354 E460000C */ swc1 $f0, 0xc($v1) -.L80242358: -/* 95D558 80242358 8E230070 */ lw $v1, 0x70($s1) -/* 95D55C 8024235C 2463FFFF */ addiu $v1, $v1, -1 -/* 95D560 80242360 000317C3 */ sra $v0, $v1, 0x1f -/* 95D564 80242364 AE230070 */ sw $v1, 0x70($s1) -/* 95D568 80242368 8FBF0018 */ lw $ra, 0x18($sp) -/* 95D56C 8024236C 8FB10014 */ lw $s1, 0x14($sp) -/* 95D570 80242370 8FB00010 */ lw $s0, 0x10($sp) -/* 95D574 80242374 30420002 */ andi $v0, $v0, 2 -/* 95D578 80242378 03E00008 */ jr $ra -/* 95D57C 8024237C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s new file mode 100644 index 0000000000..d8dccf460e --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422F0_95D4F0 +/* 95D4F0 802422F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95D4F4 802422F4 AFB10014 */ sw $s1, 0x14($sp) +/* 95D4F8 802422F8 0080882D */ daddu $s1, $a0, $zero +/* 95D4FC 802422FC AFB00010 */ sw $s0, 0x10($sp) +/* 95D500 80242300 00A0802D */ daddu $s0, $a1, $zero +/* 95D504 80242304 AFBF0018 */ sw $ra, 0x18($sp) +/* 95D508 80242308 0C00EABB */ jal get_npc_unsafe +/* 95D50C 8024230C 2404FFFC */ addiu $a0, $zero, -4 +/* 95D510 80242310 12000003 */ beqz $s0, .L80242320 +/* 95D514 80242314 0040182D */ daddu $v1, $v0, $zero +/* 95D518 80242318 2402003C */ addiu $v0, $zero, 0x3c +/* 95D51C 8024231C AE220070 */ sw $v0, 0x70($s1) +.L80242320: +/* 95D520 80242320 C462000C */ lwc1 $f2, 0xc($v1) +/* 95D524 80242324 3C0141F0 */ lui $at, 0x41f0 +/* 95D528 80242328 44810000 */ mtc1 $at, $f0 +/* 95D52C 8024232C 00000000 */ nop +/* 95D530 80242330 46001000 */ add.s $f0, $f2, $f0 +/* 95D534 80242334 3C0143B4 */ lui $at, 0x43b4 +/* 95D538 80242338 44811000 */ mtc1 $at, $f2 +/* 95D53C 8024233C 00000000 */ nop +/* 95D540 80242340 4600103E */ c.le.s $f2, $f0 +/* 95D544 80242344 00000000 */ nop +/* 95D548 80242348 45000003 */ bc1f .L80242358 +/* 95D54C 8024234C E460000C */ swc1 $f0, 0xc($v1) +/* 95D550 80242350 46020001 */ sub.s $f0, $f0, $f2 +/* 95D554 80242354 E460000C */ swc1 $f0, 0xc($v1) +.L80242358: +/* 95D558 80242358 8E230070 */ lw $v1, 0x70($s1) +/* 95D55C 8024235C 2463FFFF */ addiu $v1, $v1, -1 +/* 95D560 80242360 000317C3 */ sra $v0, $v1, 0x1f +/* 95D564 80242364 AE230070 */ sw $v1, 0x70($s1) +/* 95D568 80242368 8FBF0018 */ lw $ra, 0x18($sp) +/* 95D56C 8024236C 8FB10014 */ lw $s1, 0x14($sp) +/* 95D570 80242370 8FB00010 */ lw $s0, 0x10($sp) +/* 95D574 80242374 30420002 */ andi $v0, $v0, 2 +/* 95D578 80242378 03E00008 */ jr $ra +/* 95D57C 8024237C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380.s deleted file mode 100644 index ce5589273c..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242380 -/* 95D580 80242380 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95D584 80242384 AFB10014 */ sw $s1, 0x14($sp) -/* 95D588 80242388 0080882D */ daddu $s1, $a0, $zero -/* 95D58C 8024238C AFB00010 */ sw $s0, 0x10($sp) -/* 95D590 80242390 00A0802D */ daddu $s0, $a1, $zero -/* 95D594 80242394 AFBF001C */ sw $ra, 0x1c($sp) -/* 95D598 80242398 AFB20018 */ sw $s2, 0x18($sp) -/* 95D59C 8024239C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95D5A0 802423A0 0C00EABB */ jal get_npc_unsafe -/* 95D5A4 802423A4 2404FFFC */ addiu $a0, $zero, -4 -/* 95D5A8 802423A8 12000017 */ beqz $s0, .L80242408 -/* 95D5AC 802423AC 0040902D */ daddu $s2, $v0, $zero -/* 95D5B0 802423B0 0220202D */ daddu $a0, $s1, $zero -/* 95D5B4 802423B4 3C05FE36 */ lui $a1, 0xfe36 -/* 95D5B8 802423B8 0C0B210B */ jal get_float_variable -/* 95D5BC 802423BC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95D5C0 802423C0 0220202D */ daddu $a0, $s1, $zero -/* 95D5C4 802423C4 3C05FE36 */ lui $a1, 0xfe36 -/* 95D5C8 802423C8 3C014270 */ lui $at, 0x4270 -/* 95D5CC 802423CC 4481A000 */ mtc1 $at, $f20 -/* 95D5D0 802423D0 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 95D5D4 802423D4 46140003 */ div.s $f0, $f0, $f20 -/* 95D5D8 802423D8 0C0B210B */ jal get_float_variable -/* 95D5DC 802423DC E6200074 */ swc1 $f0, 0x74($s1) -/* 95D5E0 802423E0 0220202D */ daddu $a0, $s1, $zero -/* 95D5E4 802423E4 3C05FE36 */ lui $a1, 0xfe36 -/* 95D5E8 802423E8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95D5EC 802423EC 46140003 */ div.s $f0, $f0, $f20 -/* 95D5F0 802423F0 0C0B210B */ jal get_float_variable -/* 95D5F4 802423F4 E6200078 */ swc1 $f0, 0x78($s1) -/* 95D5F8 802423F8 46140003 */ div.s $f0, $f0, $f20 -/* 95D5FC 802423FC 2402003C */ addiu $v0, $zero, 0x3c -/* 95D600 80242400 E620007C */ swc1 $f0, 0x7c($s1) -/* 95D604 80242404 AE220070 */ sw $v0, 0x70($s1) -.L80242408: -/* 95D608 80242408 C6400038 */ lwc1 $f0, 0x38($s2) -/* 95D60C 8024240C C6220074 */ lwc1 $f2, 0x74($s1) -/* 95D610 80242410 46020000 */ add.s $f0, $f0, $f2 -/* 95D614 80242414 E6400038 */ swc1 $f0, 0x38($s2) -/* 95D618 80242418 C640003C */ lwc1 $f0, 0x3c($s2) -/* 95D61C 8024241C C6220078 */ lwc1 $f2, 0x78($s1) -/* 95D620 80242420 46020000 */ add.s $f0, $f0, $f2 -/* 95D624 80242424 E640003C */ swc1 $f0, 0x3c($s2) -/* 95D628 80242428 C6400040 */ lwc1 $f0, 0x40($s2) -/* 95D62C 8024242C C622007C */ lwc1 $f2, 0x7c($s1) -/* 95D630 80242430 46020000 */ add.s $f0, $f0, $f2 -/* 95D634 80242434 E6400040 */ swc1 $f0, 0x40($s2) -/* 95D638 80242438 8E230070 */ lw $v1, 0x70($s1) -/* 95D63C 8024243C 2463FFFF */ addiu $v1, $v1, -1 -/* 95D640 80242440 2C620001 */ sltiu $v0, $v1, 1 -/* 95D644 80242444 AE230070 */ sw $v1, 0x70($s1) -/* 95D648 80242448 8FBF001C */ lw $ra, 0x1c($sp) -/* 95D64C 8024244C 8FB20018 */ lw $s2, 0x18($sp) -/* 95D650 80242450 8FB10014 */ lw $s1, 0x14($sp) -/* 95D654 80242454 8FB00010 */ lw $s0, 0x10($sp) -/* 95D658 80242458 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 95D65C 8024245C 00021040 */ sll $v0, $v0, 1 -/* 95D660 80242460 03E00008 */ jr $ra -/* 95D664 80242464 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s new file mode 100644 index 0000000000..89d307f487 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242380_95D580 +/* 95D580 80242380 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 95D584 80242384 AFB10014 */ sw $s1, 0x14($sp) +/* 95D588 80242388 0080882D */ daddu $s1, $a0, $zero +/* 95D58C 8024238C AFB00010 */ sw $s0, 0x10($sp) +/* 95D590 80242390 00A0802D */ daddu $s0, $a1, $zero +/* 95D594 80242394 AFBF001C */ sw $ra, 0x1c($sp) +/* 95D598 80242398 AFB20018 */ sw $s2, 0x18($sp) +/* 95D59C 8024239C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 95D5A0 802423A0 0C00EABB */ jal get_npc_unsafe +/* 95D5A4 802423A4 2404FFFC */ addiu $a0, $zero, -4 +/* 95D5A8 802423A8 12000017 */ beqz $s0, .L80242408 +/* 95D5AC 802423AC 0040902D */ daddu $s2, $v0, $zero +/* 95D5B0 802423B0 0220202D */ daddu $a0, $s1, $zero +/* 95D5B4 802423B4 3C05FE36 */ lui $a1, 0xfe36 +/* 95D5B8 802423B8 0C0B210B */ jal get_float_variable +/* 95D5BC 802423BC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 95D5C0 802423C0 0220202D */ daddu $a0, $s1, $zero +/* 95D5C4 802423C4 3C05FE36 */ lui $a1, 0xfe36 +/* 95D5C8 802423C8 3C014270 */ lui $at, 0x4270 +/* 95D5CC 802423CC 4481A000 */ mtc1 $at, $f20 +/* 95D5D0 802423D0 34A53C85 */ ori $a1, $a1, 0x3c85 +/* 95D5D4 802423D4 46140003 */ div.s $f0, $f0, $f20 +/* 95D5D8 802423D8 0C0B210B */ jal get_float_variable +/* 95D5DC 802423DC E6200074 */ swc1 $f0, 0x74($s1) +/* 95D5E0 802423E0 0220202D */ daddu $a0, $s1, $zero +/* 95D5E4 802423E4 3C05FE36 */ lui $a1, 0xfe36 +/* 95D5E8 802423E8 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 95D5EC 802423EC 46140003 */ div.s $f0, $f0, $f20 +/* 95D5F0 802423F0 0C0B210B */ jal get_float_variable +/* 95D5F4 802423F4 E6200078 */ swc1 $f0, 0x78($s1) +/* 95D5F8 802423F8 46140003 */ div.s $f0, $f0, $f20 +/* 95D5FC 802423FC 2402003C */ addiu $v0, $zero, 0x3c +/* 95D600 80242400 E620007C */ swc1 $f0, 0x7c($s1) +/* 95D604 80242404 AE220070 */ sw $v0, 0x70($s1) +.L80242408: +/* 95D608 80242408 C6400038 */ lwc1 $f0, 0x38($s2) +/* 95D60C 8024240C C6220074 */ lwc1 $f2, 0x74($s1) +/* 95D610 80242410 46020000 */ add.s $f0, $f0, $f2 +/* 95D614 80242414 E6400038 */ swc1 $f0, 0x38($s2) +/* 95D618 80242418 C640003C */ lwc1 $f0, 0x3c($s2) +/* 95D61C 8024241C C6220078 */ lwc1 $f2, 0x78($s1) +/* 95D620 80242420 46020000 */ add.s $f0, $f0, $f2 +/* 95D624 80242424 E640003C */ swc1 $f0, 0x3c($s2) +/* 95D628 80242428 C6400040 */ lwc1 $f0, 0x40($s2) +/* 95D62C 8024242C C622007C */ lwc1 $f2, 0x7c($s1) +/* 95D630 80242430 46020000 */ add.s $f0, $f0, $f2 +/* 95D634 80242434 E6400040 */ swc1 $f0, 0x40($s2) +/* 95D638 80242438 8E230070 */ lw $v1, 0x70($s1) +/* 95D63C 8024243C 2463FFFF */ addiu $v1, $v1, -1 +/* 95D640 80242440 2C620001 */ sltiu $v0, $v1, 1 +/* 95D644 80242444 AE230070 */ sw $v1, 0x70($s1) +/* 95D648 80242448 8FBF001C */ lw $ra, 0x1c($sp) +/* 95D64C 8024244C 8FB20018 */ lw $s2, 0x18($sp) +/* 95D650 80242450 8FB10014 */ lw $s1, 0x14($sp) +/* 95D654 80242454 8FB00010 */ lw $s0, 0x10($sp) +/* 95D658 80242458 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 95D65C 8024245C 00021040 */ sll $v0, $v0, 1 +/* 95D660 80242460 03E00008 */ jr $ra +/* 95D664 80242464 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468.s deleted file mode 100644 index 94aaf517fc..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242468 -/* 95D668 80242468 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D66C 8024246C 3C058025 */ lui $a1, 0x8025 -/* 95D670 80242470 8CA5DFD8 */ lw $a1, -0x2028($a1) -/* 95D674 80242474 AFBF0010 */ sw $ra, 0x10($sp) -/* 95D678 80242478 0C0B1EAF */ jal get_variable -/* 95D67C 8024247C 0000202D */ daddu $a0, $zero, $zero -/* 95D680 80242480 0040182D */ daddu $v1, $v0, $zero -/* 95D684 80242484 24020001 */ addiu $v0, $zero, 1 -/* 95D688 80242488 14620006 */ bne $v1, $v0, .L802424A4 -/* 95D68C 8024248C 24020002 */ addiu $v0, $zero, 2 -/* 95D690 80242490 44800000 */ mtc1 $zero, $f0 -/* 95D694 80242494 00000000 */ nop -/* 95D698 80242498 44050000 */ mfc1 $a1, $f0 -/* 95D69C 8024249C 0809092F */ j .L802424BC -/* 95D6A0 802424A0 0000202D */ daddu $a0, $zero, $zero -.L802424A4: -/* 95D6A4 802424A4 14620008 */ bne $v1, $v0, .L802424C8 -/* 95D6A8 802424A8 24040001 */ addiu $a0, $zero, 1 -/* 95D6AC 802424AC 44800000 */ mtc1 $zero, $f0 -/* 95D6B0 802424B0 00000000 */ nop -/* 95D6B4 802424B4 44050000 */ mfc1 $a1, $f0 -/* 95D6B8 802424B8 00000000 */ nop -.L802424BC: -/* 95D6BC 802424BC 00A0302D */ daddu $a2, $a1, $zero -/* 95D6C0 802424C0 0C01C5A4 */ jal func_80071690 -/* 95D6C4 802424C4 00A0382D */ daddu $a3, $a1, $zero -.L802424C8: -/* 95D6C8 802424C8 8FBF0010 */ lw $ra, 0x10($sp) -/* 95D6CC 802424CC 03E00008 */ jr $ra -/* 95D6D0 802424D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s new file mode 100644 index 0000000000..cd54d603de --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242468_95D668.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242468_95D668 +/* 95D668 80242468 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95D66C 8024246C 3C058025 */ lui $a1, 0x8025 +/* 95D670 80242470 8CA5DFD8 */ lw $a1, -0x2028($a1) +/* 95D674 80242474 AFBF0010 */ sw $ra, 0x10($sp) +/* 95D678 80242478 0C0B1EAF */ jal get_variable +/* 95D67C 8024247C 0000202D */ daddu $a0, $zero, $zero +/* 95D680 80242480 0040182D */ daddu $v1, $v0, $zero +/* 95D684 80242484 24020001 */ addiu $v0, $zero, 1 +/* 95D688 80242488 14620006 */ bne $v1, $v0, .L802424A4 +/* 95D68C 8024248C 24020002 */ addiu $v0, $zero, 2 +/* 95D690 80242490 44800000 */ mtc1 $zero, $f0 +/* 95D694 80242494 00000000 */ nop +/* 95D698 80242498 44050000 */ mfc1 $a1, $f0 +/* 95D69C 8024249C 0809092F */ j .L802424BC +/* 95D6A0 802424A0 0000202D */ daddu $a0, $zero, $zero +.L802424A4: +/* 95D6A4 802424A4 14620008 */ bne $v1, $v0, .L802424C8 +/* 95D6A8 802424A8 24040001 */ addiu $a0, $zero, 1 +/* 95D6AC 802424AC 44800000 */ mtc1 $zero, $f0 +/* 95D6B0 802424B0 00000000 */ nop +/* 95D6B4 802424B4 44050000 */ mfc1 $a1, $f0 +/* 95D6B8 802424B8 00000000 */ nop +.L802424BC: +/* 95D6BC 802424BC 00A0302D */ daddu $a2, $a1, $zero +/* 95D6C0 802424C0 0C01C5A4 */ jal func_80071690 +/* 95D6C4 802424C4 00A0382D */ daddu $a3, $a1, $zero +.L802424C8: +/* 95D6C8 802424C8 8FBF0010 */ lw $ra, 0x10($sp) +/* 95D6CC 802424CC 03E00008 */ jr $ra +/* 95D6D0 802424D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4.s deleted file mode 100644 index d2f25a1c69..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424D4 -/* 95D6D4 802424D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D6D8 802424D8 3C058024 */ lui $a1, 0x8024 -/* 95D6DC 802424DC 24A52468 */ addiu $a1, $a1, 0x2468 -/* 95D6E0 802424E0 AFBF0010 */ sw $ra, 0x10($sp) -/* 95D6E4 802424E4 0C048C8F */ jal bind_dynamic_entity_7 -/* 95D6E8 802424E8 0000202D */ daddu $a0, $zero, $zero -/* 95D6EC 802424EC 8FBF0010 */ lw $ra, 0x10($sp) -/* 95D6F0 802424F0 3C018025 */ lui $at, 0x8025 -/* 95D6F4 802424F4 AC22DFC0 */ sw $v0, -0x2040($at) -/* 95D6F8 802424F8 24020002 */ addiu $v0, $zero, 2 -/* 95D6FC 802424FC 03E00008 */ jr $ra -/* 95D700 80242500 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s new file mode 100644 index 0000000000..cd214bac8c --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802424D4_95D6D4.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424D4_95D6D4 +/* 95D6D4 802424D4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95D6D8 802424D8 3C058024 */ lui $a1, 0x8024 +/* 95D6DC 802424DC 24A52468 */ addiu $a1, $a1, 0x2468 +/* 95D6E0 802424E0 AFBF0010 */ sw $ra, 0x10($sp) +/* 95D6E4 802424E4 0C048C8F */ jal bind_dynamic_entity_7 +/* 95D6E8 802424E8 0000202D */ daddu $a0, $zero, $zero +/* 95D6EC 802424EC 8FBF0010 */ lw $ra, 0x10($sp) +/* 95D6F0 802424F0 3C018025 */ lui $at, 0x8025 +/* 95D6F4 802424F4 AC22DFC0 */ sw $v0, -0x2040($at) +/* 95D6F8 802424F8 24020002 */ addiu $v0, $zero, 2 +/* 95D6FC 802424FC 03E00008 */ jr $ra +/* 95D700 80242500 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730.s deleted file mode 100644 index 8c889bf1d0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242730 -/* 95D930 80242730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D934 80242734 AFBF0010 */ sw $ra, 0x10($sp) -/* 95D938 80242738 10A00003 */ beqz $a1, .L80242748 -/* 95D93C 8024273C 8C86000C */ lw $a2, 0xc($a0) -/* 95D940 80242740 3C018024 */ lui $at, 0x8024 -/* 95D944 80242744 AC2077E0 */ sw $zero, 0x77e0($at) -.L80242748: -/* 95D948 80242748 3C038024 */ lui $v1, 0x8024 -/* 95D94C 8024274C 246377E0 */ addiu $v1, $v1, 0x77e0 -/* 95D950 80242750 8C620000 */ lw $v0, ($v1) -/* 95D954 80242754 54400003 */ bnel $v0, $zero, .L80242764 -/* 95D958 80242758 AC600000 */ sw $zero, ($v1) -/* 95D95C 8024275C 080909DE */ j .L80242778 -/* 95D960 80242760 0000102D */ daddu $v0, $zero, $zero -.L80242764: -/* 95D964 80242764 8CC50000 */ lw $a1, ($a2) -/* 95D968 80242768 3C068024 */ lui $a2, 0x8024 -/* 95D96C 8024276C 0C0B2026 */ jal set_variable -/* 95D970 80242770 8CC677E4 */ lw $a2, 0x77e4($a2) -/* 95D974 80242774 24020002 */ addiu $v0, $zero, 2 -.L80242778: -/* 95D978 80242778 8FBF0010 */ lw $ra, 0x10($sp) -/* 95D97C 8024277C 03E00008 */ jr $ra -/* 95D980 80242780 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s new file mode 100644 index 0000000000..1909ef008d --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242730_95D930.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242730_95D930 +/* 95D930 80242730 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95D934 80242734 AFBF0010 */ sw $ra, 0x10($sp) +/* 95D938 80242738 10A00003 */ beqz $a1, .L80242748 +/* 95D93C 8024273C 8C86000C */ lw $a2, 0xc($a0) +/* 95D940 80242740 3C018024 */ lui $at, 0x8024 +/* 95D944 80242744 AC2077E0 */ sw $zero, 0x77e0($at) +.L80242748: +/* 95D948 80242748 3C038024 */ lui $v1, 0x8024 +/* 95D94C 8024274C 246377E0 */ addiu $v1, $v1, 0x77e0 +/* 95D950 80242750 8C620000 */ lw $v0, ($v1) +/* 95D954 80242754 54400003 */ bnel $v0, $zero, .L80242764 +/* 95D958 80242758 AC600000 */ sw $zero, ($v1) +/* 95D95C 8024275C 080909DE */ j .L80242778 +/* 95D960 80242760 0000102D */ daddu $v0, $zero, $zero +.L80242764: +/* 95D964 80242764 8CC50000 */ lw $a1, ($a2) +/* 95D968 80242768 3C068024 */ lui $a2, 0x8024 +/* 95D96C 8024276C 0C0B2026 */ jal set_variable +/* 95D970 80242770 8CC677E4 */ lw $a2, 0x77e4($a2) +/* 95D974 80242774 24020002 */ addiu $v0, $zero, 2 +.L80242778: +/* 95D978 80242778 8FBF0010 */ lw $ra, 0x10($sp) +/* 95D97C 8024277C 03E00008 */ jr $ra +/* 95D980 80242780 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784.s deleted file mode 100644 index f0070cb960..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242784 -/* 95D984 80242784 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D988 80242788 AFBF0010 */ sw $ra, 0x10($sp) -/* 95D98C 8024278C 8C82000C */ lw $v0, 0xc($a0) -/* 95D990 80242790 0C0B1EAF */ jal get_variable -/* 95D994 80242794 8C450000 */ lw $a1, ($v0) -/* 95D998 80242798 3C018024 */ lui $at, 0x8024 -/* 95D99C 8024279C AC2277E4 */ sw $v0, 0x77e4($at) -/* 95D9A0 802427A0 24020002 */ addiu $v0, $zero, 2 -/* 95D9A4 802427A4 8FBF0010 */ lw $ra, 0x10($sp) -/* 95D9A8 802427A8 24030001 */ addiu $v1, $zero, 1 -/* 95D9AC 802427AC 3C018024 */ lui $at, 0x8024 -/* 95D9B0 802427B0 AC2377E0 */ sw $v1, 0x77e0($at) -/* 95D9B4 802427B4 03E00008 */ jr $ra -/* 95D9B8 802427B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s new file mode 100644 index 0000000000..14194ee283 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242784_95D984.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242784_95D984 +/* 95D984 80242784 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95D988 80242788 AFBF0010 */ sw $ra, 0x10($sp) +/* 95D98C 8024278C 8C82000C */ lw $v0, 0xc($a0) +/* 95D990 80242790 0C0B1EAF */ jal get_variable +/* 95D994 80242794 8C450000 */ lw $a1, ($v0) +/* 95D998 80242798 3C018024 */ lui $at, 0x8024 +/* 95D99C 8024279C AC2277E4 */ sw $v0, 0x77e4($at) +/* 95D9A0 802427A0 24020002 */ addiu $v0, $zero, 2 +/* 95D9A4 802427A4 8FBF0010 */ lw $ra, 0x10($sp) +/* 95D9A8 802427A8 24030001 */ addiu $v1, $zero, 1 +/* 95D9AC 802427AC 3C018024 */ lui $at, 0x8024 +/* 95D9B0 802427B0 AC2377E0 */ sw $v1, 0x77e0($at) +/* 95D9B4 802427B4 03E00008 */ jr $ra +/* 95D9B8 802427B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC.s deleted file mode 100644 index 341f5017c1..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427BC -/* 95D9BC 802427BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D9C0 802427C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 95D9C4 802427C4 8C82000C */ lw $v0, 0xc($a0) -/* 95D9C8 802427C8 0C0B1EAF */ jal get_variable -/* 95D9CC 802427CC 8C450000 */ lw $a1, ($v0) -/* 95D9D0 802427D0 0040182D */ daddu $v1, $v0, $zero -/* 95D9D4 802427D4 10600012 */ beqz $v1, .L80242820 -/* 95D9D8 802427D8 0000202D */ daddu $a0, $zero, $zero -/* 95D9DC 802427DC 8C620000 */ lw $v0, ($v1) -/* 95D9E0 802427E0 5040000A */ beql $v0, $zero, .L8024280C -/* 95D9E4 802427E4 00041080 */ sll $v0, $a0, 2 -/* 95D9E8 802427E8 3C058025 */ lui $a1, 0x8025 -/* 95D9EC 802427EC 24A5DFF0 */ addiu $a1, $a1, -0x2010 -.L802427F0: -/* 95D9F0 802427F0 24630004 */ addiu $v1, $v1, 4 -/* 95D9F4 802427F4 24840001 */ addiu $a0, $a0, 1 -/* 95D9F8 802427F8 ACA20000 */ sw $v0, ($a1) -/* 95D9FC 802427FC 8C620000 */ lw $v0, ($v1) -/* 95DA00 80242800 1440FFFB */ bnez $v0, .L802427F0 -/* 95DA04 80242804 24A50004 */ addiu $a1, $a1, 4 -/* 95DA08 80242808 00041080 */ sll $v0, $a0, 2 -.L8024280C: -/* 95DA0C 8024280C 3C018025 */ lui $at, 0x8025 -/* 95DA10 80242810 00220821 */ addu $at, $at, $v0 -/* 95DA14 80242814 AC20DFF0 */ sw $zero, -0x2010($at) -/* 95DA18 80242818 08090A12 */ j .L80242848 -/* 95DA1C 8024281C 00000000 */ nop -.L80242820: -/* 95DA20 80242820 3C038025 */ lui $v1, 0x8025 -/* 95DA24 80242824 2463DFF0 */ addiu $v1, $v1, -0x2010 -/* 95DA28 80242828 0060282D */ daddu $a1, $v1, $zero -.L8024282C: -/* 95DA2C 8024282C 24820010 */ addiu $v0, $a0, 0x10 -/* 95DA30 80242830 AC620000 */ sw $v0, ($v1) -/* 95DA34 80242834 24630004 */ addiu $v1, $v1, 4 -/* 95DA38 80242838 24840001 */ addiu $a0, $a0, 1 -/* 95DA3C 8024283C 28820070 */ slti $v0, $a0, 0x70 -/* 95DA40 80242840 1440FFFA */ bnez $v0, .L8024282C -/* 95DA44 80242844 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242848: -/* 95DA48 80242848 8FBF0010 */ lw $ra, 0x10($sp) -/* 95DA4C 8024284C 24020002 */ addiu $v0, $zero, 2 -/* 95DA50 80242850 03E00008 */ jr $ra -/* 95DA54 80242854 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s new file mode 100644 index 0000000000..6513000dd9 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802427BC_95D9BC.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427BC_95D9BC +/* 95D9BC 802427BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95D9C0 802427C0 AFBF0010 */ sw $ra, 0x10($sp) +/* 95D9C4 802427C4 8C82000C */ lw $v0, 0xc($a0) +/* 95D9C8 802427C8 0C0B1EAF */ jal get_variable +/* 95D9CC 802427CC 8C450000 */ lw $a1, ($v0) +/* 95D9D0 802427D0 0040182D */ daddu $v1, $v0, $zero +/* 95D9D4 802427D4 10600012 */ beqz $v1, .L80242820 +/* 95D9D8 802427D8 0000202D */ daddu $a0, $zero, $zero +/* 95D9DC 802427DC 8C620000 */ lw $v0, ($v1) +/* 95D9E0 802427E0 5040000A */ beql $v0, $zero, .L8024280C +/* 95D9E4 802427E4 00041080 */ sll $v0, $a0, 2 +/* 95D9E8 802427E8 3C058025 */ lui $a1, 0x8025 +/* 95D9EC 802427EC 24A5DFF0 */ addiu $a1, $a1, -0x2010 +.L802427F0: +/* 95D9F0 802427F0 24630004 */ addiu $v1, $v1, 4 +/* 95D9F4 802427F4 24840001 */ addiu $a0, $a0, 1 +/* 95D9F8 802427F8 ACA20000 */ sw $v0, ($a1) +/* 95D9FC 802427FC 8C620000 */ lw $v0, ($v1) +/* 95DA00 80242800 1440FFFB */ bnez $v0, .L802427F0 +/* 95DA04 80242804 24A50004 */ addiu $a1, $a1, 4 +/* 95DA08 80242808 00041080 */ sll $v0, $a0, 2 +.L8024280C: +/* 95DA0C 8024280C 3C018025 */ lui $at, 0x8025 +/* 95DA10 80242810 00220821 */ addu $at, $at, $v0 +/* 95DA14 80242814 AC20DFF0 */ sw $zero, -0x2010($at) +/* 95DA18 80242818 08090A12 */ j .L80242848 +/* 95DA1C 8024281C 00000000 */ nop +.L80242820: +/* 95DA20 80242820 3C038025 */ lui $v1, 0x8025 +/* 95DA24 80242824 2463DFF0 */ addiu $v1, $v1, -0x2010 +/* 95DA28 80242828 0060282D */ daddu $a1, $v1, $zero +.L8024282C: +/* 95DA2C 8024282C 24820010 */ addiu $v0, $a0, 0x10 +/* 95DA30 80242830 AC620000 */ sw $v0, ($v1) +/* 95DA34 80242834 24630004 */ addiu $v1, $v1, 4 +/* 95DA38 80242838 24840001 */ addiu $a0, $a0, 1 +/* 95DA3C 8024283C 28820070 */ slti $v0, $a0, 0x70 +/* 95DA40 80242840 1440FFFA */ bnez $v0, .L8024282C +/* 95DA44 80242844 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80242848: +/* 95DA48 80242848 8FBF0010 */ lw $ra, 0x10($sp) +/* 95DA4C 8024284C 24020002 */ addiu $v0, $zero, 2 +/* 95DA50 80242850 03E00008 */ jr $ra +/* 95DA54 80242854 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858.s deleted file mode 100644 index 4f706ccd05..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858.s +++ /dev/null @@ -1,350 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242858 -/* 95DA58 80242858 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 95DA5C 8024285C AFB20018 */ sw $s2, 0x18($sp) -/* 95DA60 80242860 0080902D */ daddu $s2, $a0, $zero -/* 95DA64 80242864 AFBF0020 */ sw $ra, 0x20($sp) -/* 95DA68 80242868 AFB3001C */ sw $s3, 0x1c($sp) -/* 95DA6C 8024286C AFB10014 */ sw $s1, 0x14($sp) -/* 95DA70 80242870 AFB00010 */ sw $s0, 0x10($sp) -/* 95DA74 80242874 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 95DA78 80242878 8E42000C */ lw $v0, 0xc($s2) -/* 95DA7C 8024287C 00A0802D */ daddu $s0, $a1, $zero -/* 95DA80 80242880 0C0B1EAF */ jal get_variable -/* 95DA84 80242884 8C450000 */ lw $a1, ($v0) -/* 95DA88 80242888 3C138011 */ lui $s3, %hi(gPlayerStatus) -/* 95DA8C 8024288C 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) -/* 95DA90 80242890 1200001A */ beqz $s0, .L802428FC -/* 95DA94 80242894 0040882D */ daddu $s1, $v0, $zero -/* 95DA98 80242898 0C00AB39 */ jal heap_malloc -/* 95DA9C 8024289C 2404003C */ addiu $a0, $zero, 0x3c -/* 95DAA0 802428A0 AE420074 */ sw $v0, 0x74($s2) -/* 95DAA4 802428A4 8E230000 */ lw $v1, ($s1) -/* 95DAA8 802428A8 0040802D */ daddu $s0, $v0, $zero -/* 95DAAC 802428AC AE030000 */ sw $v1, ($s0) -/* 95DAB0 802428B0 8E220004 */ lw $v0, 4($s1) -/* 95DAB4 802428B4 AE020004 */ sw $v0, 4($s0) -/* 95DAB8 802428B8 8E220008 */ lw $v0, 8($s1) -/* 95DABC 802428BC AE020008 */ sw $v0, 8($s0) -/* 95DAC0 802428C0 8E22000C */ lw $v0, 0xc($s1) -/* 95DAC4 802428C4 AE02000C */ sw $v0, 0xc($s0) -/* 95DAC8 802428C8 8E220010 */ lw $v0, 0x10($s1) -/* 95DACC 802428CC AE020010 */ sw $v0, 0x10($s0) -/* 95DAD0 802428D0 8E220014 */ lw $v0, 0x14($s1) -/* 95DAD4 802428D4 AE000018 */ sw $zero, 0x18($s0) -/* 95DAD8 802428D8 AE00001C */ sw $zero, 0x1c($s0) -/* 95DADC 802428DC AE000020 */ sw $zero, 0x20($s0) -/* 95DAE0 802428E0 AE000024 */ sw $zero, 0x24($s0) -/* 95DAE4 802428E4 AE000028 */ sw $zero, 0x28($s0) -/* 95DAE8 802428E8 AE00002C */ sw $zero, 0x2c($s0) -/* 95DAEC 802428EC AE000030 */ sw $zero, 0x30($s0) -/* 95DAF0 802428F0 AE000034 */ sw $zero, 0x34($s0) -/* 95DAF4 802428F4 AE000038 */ sw $zero, 0x38($s0) -/* 95DAF8 802428F8 AE020014 */ sw $v0, 0x14($s0) -.L802428FC: -/* 95DAFC 802428FC 8E500074 */ lw $s0, 0x74($s2) -/* 95DB00 80242900 8E030020 */ lw $v1, 0x20($s0) -/* 95DB04 80242904 2C620005 */ sltiu $v0, $v1, 5 -/* 95DB08 80242908 10400116 */ beqz $v0, .L80242D64 -/* 95DB0C 8024290C 00031080 */ sll $v0, $v1, 2 -/* 95DB10 80242910 3C018025 */ lui $at, 0x8025 -/* 95DB14 80242914 00220821 */ addu $at, $at, $v0 -/* 95DB18 80242918 8C22DF80 */ lw $v0, -0x2080($at) -/* 95DB1C 8024291C 00400008 */ jr $v0 -/* 95DB20 80242920 00000000 */ nop -/* 95DB24 80242924 C60C0000 */ lwc1 $f12, ($s0) -/* 95DB28 80242928 46806320 */ cvt.s.w $f12, $f12 -/* 95DB2C 8024292C C60E0008 */ lwc1 $f14, 8($s0) -/* 95DB30 80242930 0C038022 */ jal func_800E0088 -/* 95DB34 80242934 468073A0 */ cvt.s.w $f14, $f14 -/* 95DB38 80242938 8E02000C */ lw $v0, 0xc($s0) -/* 95DB3C 8024293C 4600010D */ trunc.w.s $f4, $f0 -/* 95DB40 80242940 44032000 */ mfc1 $v1, $f4 -/* 95DB44 80242944 00000000 */ nop -/* 95DB48 80242948 0062102A */ slt $v0, $v1, $v0 -/* 95DB4C 8024294C 10400105 */ beqz $v0, .L80242D64 -/* 95DB50 80242950 00000000 */ nop -/* 95DB54 80242954 C6600028 */ lwc1 $f0, 0x28($s3) -/* 95DB58 80242958 8E020020 */ lw $v0, 0x20($s0) -/* 95DB5C 8024295C E6000024 */ swc1 $f0, 0x24($s0) -/* 95DB60 80242960 C6600030 */ lwc1 $f0, 0x30($s3) -/* 95DB64 80242964 24420001 */ addiu $v0, $v0, 1 -/* 95DB68 80242968 AE020020 */ sw $v0, 0x20($s0) -/* 95DB6C 8024296C 08090B59 */ j .L80242D64 -/* 95DB70 80242970 E6000028 */ swc1 $f0, 0x28($s0) -/* 95DB74 80242974 C60C0000 */ lwc1 $f12, ($s0) -/* 95DB78 80242978 46806320 */ cvt.s.w $f12, $f12 -/* 95DB7C 8024297C C60E0008 */ lwc1 $f14, 8($s0) -/* 95DB80 80242980 0C038022 */ jal func_800E0088 -/* 95DB84 80242984 468073A0 */ cvt.s.w $f14, $f14 -/* 95DB88 80242988 8E02000C */ lw $v0, 0xc($s0) -/* 95DB8C 8024298C 4600010D */ trunc.w.s $f4, $f0 -/* 95DB90 80242990 44032000 */ mfc1 $v1, $f4 -/* 95DB94 80242994 00000000 */ nop -/* 95DB98 80242998 0062102A */ slt $v0, $v1, $v0 -/* 95DB9C 8024299C 504000F1 */ beql $v0, $zero, .L80242D64 -/* 95DBA0 802429A0 AE000020 */ sw $zero, 0x20($s0) -/* 95DBA4 802429A4 C60C0000 */ lwc1 $f12, ($s0) -/* 95DBA8 802429A8 46806320 */ cvt.s.w $f12, $f12 -/* 95DBAC 802429AC 8E060024 */ lw $a2, 0x24($s0) -/* 95DBB0 802429B0 8E070028 */ lw $a3, 0x28($s0) -/* 95DBB4 802429B4 C60E0008 */ lwc1 $f14, 8($s0) -/* 95DBB8 802429B8 0C00A720 */ jal atan2 -/* 95DBBC 802429BC 468073A0 */ cvt.s.w $f14, $f14 -/* 95DBC0 802429C0 4600010D */ trunc.w.s $f4, $f0 -/* 95DBC4 802429C4 44112000 */ mfc1 $s1, $f4 -/* 95DBC8 802429C8 C60C0000 */ lwc1 $f12, ($s0) -/* 95DBCC 802429CC 46806320 */ cvt.s.w $f12, $f12 -/* 95DBD0 802429D0 8E660028 */ lw $a2, 0x28($s3) -/* 95DBD4 802429D4 8E670030 */ lw $a3, 0x30($s3) -/* 95DBD8 802429D8 C60E0008 */ lwc1 $f14, 8($s0) -/* 95DBDC 802429DC 0C00A720 */ jal atan2 -/* 95DBE0 802429E0 468073A0 */ cvt.s.w $f14, $f14 -/* 95DBE4 802429E4 4600010D */ trunc.w.s $f4, $f0 -/* 95DBE8 802429E8 44022000 */ mfc1 $v0, $f4 -/* 95DBEC 802429EC 44916000 */ mtc1 $s1, $f12 -/* 95DBF0 802429F0 00000000 */ nop -/* 95DBF4 802429F4 46806320 */ cvt.s.w $f12, $f12 -/* 95DBF8 802429F8 44827000 */ mtc1 $v0, $f14 -/* 95DBFC 802429FC 00000000 */ nop -/* 95DC00 80242A00 0C00A70A */ jal get_clamped_angle_diff -/* 95DC04 80242A04 468073A0 */ cvt.s.w $f14, $f14 -/* 95DC08 80242A08 4600010D */ trunc.w.s $f4, $f0 -/* 95DC0C 80242A0C 44022000 */ mfc1 $v0, $f4 -/* 95DC10 80242A10 00000000 */ nop -/* 95DC14 80242A14 44826000 */ mtc1 $v0, $f12 -/* 95DC18 80242A18 00000000 */ nop -/* 95DC1C 80242A1C 0C00A69F */ jal signF -/* 95DC20 80242A20 46806320 */ cvt.s.w $f12, $f12 -/* 95DC24 80242A24 8E020020 */ lw $v0, 0x20($s0) -/* 95DC28 80242A28 08090B52 */ j .L80242D48 -/* 95DC2C 80242A2C E6000034 */ swc1 $f0, 0x34($s0) -/* 95DC30 80242A30 C60C0000 */ lwc1 $f12, ($s0) -/* 95DC34 80242A34 46806320 */ cvt.s.w $f12, $f12 -/* 95DC38 80242A38 C60E0008 */ lwc1 $f14, 8($s0) -/* 95DC3C 80242A3C 0C038022 */ jal func_800E0088 -/* 95DC40 80242A40 468073A0 */ cvt.s.w $f14, $f14 -/* 95DC44 80242A44 8E02000C */ lw $v0, 0xc($s0) -/* 95DC48 80242A48 4600010D */ trunc.w.s $f4, $f0 -/* 95DC4C 80242A4C 44032000 */ mfc1 $v1, $f4 -/* 95DC50 80242A50 00000000 */ nop -/* 95DC54 80242A54 0062102A */ slt $v0, $v1, $v0 -/* 95DC58 80242A58 504000C2 */ beql $v0, $zero, .L80242D64 -/* 95DC5C 80242A5C AE000020 */ sw $zero, 0x20($s0) -/* 95DC60 80242A60 C60C0000 */ lwc1 $f12, ($s0) -/* 95DC64 80242A64 46806320 */ cvt.s.w $f12, $f12 -/* 95DC68 80242A68 8E06002C */ lw $a2, 0x2c($s0) -/* 95DC6C 80242A6C 8E070030 */ lw $a3, 0x30($s0) -/* 95DC70 80242A70 C60E0008 */ lwc1 $f14, 8($s0) -/* 95DC74 80242A74 0C00A720 */ jal atan2 -/* 95DC78 80242A78 468073A0 */ cvt.s.w $f14, $f14 -/* 95DC7C 80242A7C 4600010D */ trunc.w.s $f4, $f0 -/* 95DC80 80242A80 44112000 */ mfc1 $s1, $f4 -/* 95DC84 80242A84 C60C0000 */ lwc1 $f12, ($s0) -/* 95DC88 80242A88 46806320 */ cvt.s.w $f12, $f12 -/* 95DC8C 80242A8C 8E660028 */ lw $a2, 0x28($s3) -/* 95DC90 80242A90 8E670030 */ lw $a3, 0x30($s3) -/* 95DC94 80242A94 C60E0008 */ lwc1 $f14, 8($s0) -/* 95DC98 80242A98 0C00A720 */ jal atan2 -/* 95DC9C 80242A9C 468073A0 */ cvt.s.w $f14, $f14 -/* 95DCA0 80242AA0 4600010D */ trunc.w.s $f4, $f0 -/* 95DCA4 80242AA4 44022000 */ mfc1 $v0, $f4 -/* 95DCA8 80242AA8 44916000 */ mtc1 $s1, $f12 -/* 95DCAC 80242AAC 00000000 */ nop -/* 95DCB0 80242AB0 46806320 */ cvt.s.w $f12, $f12 -/* 95DCB4 80242AB4 44827000 */ mtc1 $v0, $f14 -/* 95DCB8 80242AB8 00000000 */ nop -/* 95DCBC 80242ABC 0C00A70A */ jal get_clamped_angle_diff -/* 95DCC0 80242AC0 468073A0 */ cvt.s.w $f14, $f14 -/* 95DCC4 80242AC4 4600010D */ trunc.w.s $f4, $f0 -/* 95DCC8 80242AC8 44022000 */ mfc1 $v0, $f4 -/* 95DCCC 80242ACC 00000000 */ nop -/* 95DCD0 80242AD0 44826000 */ mtc1 $v0, $f12 -/* 95DCD4 80242AD4 00000000 */ nop -/* 95DCD8 80242AD8 0C00A69F */ jal signF -/* 95DCDC 80242ADC 46806320 */ cvt.s.w $f12, $f12 -/* 95DCE0 80242AE0 C6020034 */ lwc1 $f2, 0x34($s0) -/* 95DCE4 80242AE4 46001032 */ c.eq.s $f2, $f0 -/* 95DCE8 80242AE8 00000000 */ nop -/* 95DCEC 80242AEC 4502009D */ bc1fl .L80242D64 -/* 95DCF0 80242AF0 AE000020 */ sw $zero, 0x20($s0) -/* 95DCF4 80242AF4 C60C0000 */ lwc1 $f12, ($s0) -/* 95DCF8 80242AF8 46806320 */ cvt.s.w $f12, $f12 -/* 95DCFC 80242AFC 8E060024 */ lw $a2, 0x24($s0) -/* 95DD00 80242B00 8E070028 */ lw $a3, 0x28($s0) -/* 95DD04 80242B04 C60E0008 */ lwc1 $f14, 8($s0) -/* 95DD08 80242B08 0C00A720 */ jal atan2 -/* 95DD0C 80242B0C 468073A0 */ cvt.s.w $f14, $f14 -/* 95DD10 80242B10 4600010D */ trunc.w.s $f4, $f0 -/* 95DD14 80242B14 44112000 */ mfc1 $s1, $f4 -/* 95DD18 80242B18 C60C0000 */ lwc1 $f12, ($s0) -/* 95DD1C 80242B1C 46806320 */ cvt.s.w $f12, $f12 -/* 95DD20 80242B20 8E660028 */ lw $a2, 0x28($s3) -/* 95DD24 80242B24 8E670030 */ lw $a3, 0x30($s3) -/* 95DD28 80242B28 C60E0008 */ lwc1 $f14, 8($s0) -/* 95DD2C 80242B2C 0C00A720 */ jal atan2 -/* 95DD30 80242B30 468073A0 */ cvt.s.w $f14, $f14 -/* 95DD34 80242B34 4600010D */ trunc.w.s $f4, $f0 -/* 95DD38 80242B38 44022000 */ mfc1 $v0, $f4 -/* 95DD3C 80242B3C 44916000 */ mtc1 $s1, $f12 -/* 95DD40 80242B40 00000000 */ nop -/* 95DD44 80242B44 46806320 */ cvt.s.w $f12, $f12 -/* 95DD48 80242B48 44827000 */ mtc1 $v0, $f14 -/* 95DD4C 80242B4C 00000000 */ nop -/* 95DD50 80242B50 0C00A70A */ jal get_clamped_angle_diff -/* 95DD54 80242B54 468073A0 */ cvt.s.w $f14, $f14 -/* 95DD58 80242B58 4600010D */ trunc.w.s $f4, $f0 -/* 95DD5C 80242B5C 44022000 */ mfc1 $v0, $f4 -/* 95DD60 80242B60 00000000 */ nop -/* 95DD64 80242B64 44820000 */ mtc1 $v0, $f0 -/* 95DD68 80242B68 00000000 */ nop -/* 95DD6C 80242B6C 46800020 */ cvt.s.w $f0, $f0 -/* 95DD70 80242B70 3C0142B4 */ lui $at, 0x42b4 -/* 95DD74 80242B74 44811000 */ mtc1 $at, $f2 -/* 95DD78 80242B78 46000505 */ abs.s $f20, $f0 -/* 95DD7C 80242B7C 4614103C */ c.lt.s $f2, $f20 -/* 95DD80 80242B80 00000000 */ nop -/* 95DD84 80242B84 45000077 */ bc1f .L80242D64 -/* 95DD88 80242B88 00000000 */ nop -/* 95DD8C 80242B8C 8E020014 */ lw $v0, 0x14($s0) -/* 95DD90 80242B90 10400003 */ beqz $v0, .L80242BA0 -/* 95DD94 80242B94 0200202D */ daddu $a0, $s0, $zero -/* 95DD98 80242B98 0040F809 */ jalr $v0 -/* 95DD9C 80242B9C 0000282D */ daddu $a1, $zero, $zero -.L80242BA0: -/* 95DDA0 80242BA0 C6000018 */ lwc1 $f0, 0x18($s0) -/* 95DDA4 80242BA4 46800020 */ cvt.s.w $f0, $f0 -/* 95DDA8 80242BA8 8E020020 */ lw $v0, 0x20($s0) -/* 95DDAC 80242BAC 46140000 */ add.s $f0, $f0, $f20 -/* 95DDB0 80242BB0 24420001 */ addiu $v0, $v0, 1 -/* 95DDB4 80242BB4 AE020020 */ sw $v0, 0x20($s0) -/* 95DDB8 80242BB8 4600010D */ trunc.w.s $f4, $f0 -/* 95DDBC 80242BBC 08090B59 */ j .L80242D64 -/* 95DDC0 80242BC0 E6040018 */ swc1 $f4, 0x18($s0) -/* 95DDC4 80242BC4 C60C0000 */ lwc1 $f12, ($s0) -/* 95DDC8 80242BC8 46806320 */ cvt.s.w $f12, $f12 -/* 95DDCC 80242BCC C60E0008 */ lwc1 $f14, 8($s0) -/* 95DDD0 80242BD0 0C038022 */ jal func_800E0088 -/* 95DDD4 80242BD4 468073A0 */ cvt.s.w $f14, $f14 -/* 95DDD8 80242BD8 8E020010 */ lw $v0, 0x10($s0) -/* 95DDDC 80242BDC 4600010D */ trunc.w.s $f4, $f0 -/* 95DDE0 80242BE0 44032000 */ mfc1 $v1, $f4 -/* 95DDE4 80242BE4 00000000 */ nop -/* 95DDE8 80242BE8 0062102A */ slt $v0, $v1, $v0 -/* 95DDEC 80242BEC 10400050 */ beqz $v0, .L80242D30 -/* 95DDF0 80242BF0 00000000 */ nop -/* 95DDF4 80242BF4 C60C0000 */ lwc1 $f12, ($s0) -/* 95DDF8 80242BF8 46806320 */ cvt.s.w $f12, $f12 -/* 95DDFC 80242BFC 8E06002C */ lw $a2, 0x2c($s0) -/* 95DE00 80242C00 8E070030 */ lw $a3, 0x30($s0) -/* 95DE04 80242C04 C60E0008 */ lwc1 $f14, 8($s0) -/* 95DE08 80242C08 0C00A720 */ jal atan2 -/* 95DE0C 80242C0C 468073A0 */ cvt.s.w $f14, $f14 -/* 95DE10 80242C10 4600010D */ trunc.w.s $f4, $f0 -/* 95DE14 80242C14 44112000 */ mfc1 $s1, $f4 -/* 95DE18 80242C18 C60C0000 */ lwc1 $f12, ($s0) -/* 95DE1C 80242C1C 46806320 */ cvt.s.w $f12, $f12 -/* 95DE20 80242C20 8E660028 */ lw $a2, 0x28($s3) -/* 95DE24 80242C24 8E670030 */ lw $a3, 0x30($s3) -/* 95DE28 80242C28 C60E0008 */ lwc1 $f14, 8($s0) -/* 95DE2C 80242C2C 0C00A720 */ jal atan2 -/* 95DE30 80242C30 468073A0 */ cvt.s.w $f14, $f14 -/* 95DE34 80242C34 4600010D */ trunc.w.s $f4, $f0 -/* 95DE38 80242C38 44022000 */ mfc1 $v0, $f4 -/* 95DE3C 80242C3C 44916000 */ mtc1 $s1, $f12 -/* 95DE40 80242C40 00000000 */ nop -/* 95DE44 80242C44 46806320 */ cvt.s.w $f12, $f12 -/* 95DE48 80242C48 44827000 */ mtc1 $v0, $f14 -/* 95DE4C 80242C4C 00000000 */ nop -/* 95DE50 80242C50 0C00A70A */ jal get_clamped_angle_diff -/* 95DE54 80242C54 468073A0 */ cvt.s.w $f14, $f14 -/* 95DE58 80242C58 4600010D */ trunc.w.s $f4, $f0 -/* 95DE5C 80242C5C 44022000 */ mfc1 $v0, $f4 -/* 95DE60 80242C60 00000000 */ nop -/* 95DE64 80242C64 4482A000 */ mtc1 $v0, $f20 -/* 95DE68 80242C68 00000000 */ nop -/* 95DE6C 80242C6C 4680A520 */ cvt.s.w $f20, $f20 -/* 95DE70 80242C70 0C00A69F */ jal signF -/* 95DE74 80242C74 4600A306 */ mov.s $f12, $f20 -/* 95DE78 80242C78 C6020034 */ lwc1 $f2, 0x34($s0) -/* 95DE7C 80242C7C 46001032 */ c.eq.s $f2, $f0 -/* 95DE80 80242C80 00000000 */ nop -/* 95DE84 80242C84 4503000A */ bc1tl .L80242CB0 -/* 95DE88 80242C88 4600A005 */ abs.s $f0, $f20 -/* 95DE8C 80242C8C 8E020014 */ lw $v0, 0x14($s0) -/* 95DE90 80242C90 10400003 */ beqz $v0, .L80242CA0 -/* 95DE94 80242C94 0200202D */ daddu $a0, $s0, $zero -/* 95DE98 80242C98 0040F809 */ jalr $v0 -/* 95DE9C 80242C9C 24050003 */ addiu $a1, $zero, 3 -.L80242CA0: -/* 95DEA0 80242CA0 8E020020 */ lw $v0, 0x20($s0) -/* 95DEA4 80242CA4 24420001 */ addiu $v0, $v0, 1 -/* 95DEA8 80242CA8 08090B45 */ j .L80242D14 -/* 95DEAC 80242CAC AE020020 */ sw $v0, 0x20($s0) -.L80242CB0: -/* 95DEB0 80242CB0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 95DEB4 80242CB4 468010A0 */ cvt.s.w $f2, $f2 -/* 95DEB8 80242CB8 46001080 */ add.s $f2, $f2, $f0 -/* 95DEBC 80242CBC 3C02B60B */ lui $v0, 0xb60b -/* 95DEC0 80242CC0 344260B7 */ ori $v0, $v0, 0x60b7 -/* 95DEC4 80242CC4 4600110D */ trunc.w.s $f4, $f2 -/* 95DEC8 80242CC8 44032000 */ mfc1 $v1, $f4 -/* 95DECC 80242CCC 00000000 */ nop -/* 95DED0 80242CD0 00620018 */ mult $v1, $v0 -/* 95DED4 80242CD4 8E040038 */ lw $a0, 0x38($s0) -/* 95DED8 80242CD8 AE030018 */ sw $v1, 0x18($s0) -/* 95DEDC 80242CDC 00004010 */ mfhi $t0 -/* 95DEE0 80242CE0 01031021 */ addu $v0, $t0, $v1 -/* 95DEE4 80242CE4 00021203 */ sra $v0, $v0, 8 -/* 95DEE8 80242CE8 00031FC3 */ sra $v1, $v1, 0x1f -/* 95DEEC 80242CEC 00431023 */ subu $v0, $v0, $v1 -/* 95DEF0 80242CF0 10440008 */ beq $v0, $a0, .L80242D14 -/* 95DEF4 80242CF4 AE02001C */ sw $v0, 0x1c($s0) -/* 95DEF8 80242CF8 8E020014 */ lw $v0, 0x14($s0) -/* 95DEFC 80242CFC 10400003 */ beqz $v0, .L80242D0C -/* 95DF00 80242D00 0200202D */ daddu $a0, $s0, $zero -/* 95DF04 80242D04 0040F809 */ jalr $v0 -/* 95DF08 80242D08 24050001 */ addiu $a1, $zero, 1 -.L80242D0C: -/* 95DF0C 80242D0C 8E02001C */ lw $v0, 0x1c($s0) -/* 95DF10 80242D10 AE020038 */ sw $v0, 0x38($s0) -.L80242D14: -/* 95DF14 80242D14 8E020014 */ lw $v0, 0x14($s0) -/* 95DF18 80242D18 10400012 */ beqz $v0, .L80242D64 -/* 95DF1C 80242D1C 0200202D */ daddu $a0, $s0, $zero -/* 95DF20 80242D20 0040F809 */ jalr $v0 -/* 95DF24 80242D24 24050002 */ addiu $a1, $zero, 2 -/* 95DF28 80242D28 08090B59 */ j .L80242D64 -/* 95DF2C 80242D2C 00000000 */ nop -.L80242D30: -/* 95DF30 80242D30 8E020014 */ lw $v0, 0x14($s0) -/* 95DF34 80242D34 10400003 */ beqz $v0, .L80242D44 -/* 95DF38 80242D38 0200202D */ daddu $a0, $s0, $zero -/* 95DF3C 80242D3C 0040F809 */ jalr $v0 -/* 95DF40 80242D40 24050004 */ addiu $a1, $zero, 4 -.L80242D44: -/* 95DF44 80242D44 8E020020 */ lw $v0, 0x20($s0) -.L80242D48: -/* 95DF48 80242D48 24420001 */ addiu $v0, $v0, 1 -/* 95DF4C 80242D4C 08090B59 */ j .L80242D64 -/* 95DF50 80242D50 AE020020 */ sw $v0, 0x20($s0) -/* 95DF54 80242D54 AE000018 */ sw $zero, 0x18($s0) -/* 95DF58 80242D58 AE00001C */ sw $zero, 0x1c($s0) -/* 95DF5C 80242D5C AE000038 */ sw $zero, 0x38($s0) -/* 95DF60 80242D60 AE000020 */ sw $zero, 0x20($s0) -.L80242D64: -/* 95DF64 80242D64 C6600028 */ lwc1 $f0, 0x28($s3) -/* 95DF68 80242D68 E600002C */ swc1 $f0, 0x2c($s0) -/* 95DF6C 80242D6C C6600030 */ lwc1 $f0, 0x30($s3) -/* 95DF70 80242D70 E6000030 */ swc1 $f0, 0x30($s0) -/* 95DF74 80242D74 8FBF0020 */ lw $ra, 0x20($sp) -/* 95DF78 80242D78 8FB3001C */ lw $s3, 0x1c($sp) -/* 95DF7C 80242D7C 8FB20018 */ lw $s2, 0x18($sp) -/* 95DF80 80242D80 8FB10014 */ lw $s1, 0x14($sp) -/* 95DF84 80242D84 8FB00010 */ lw $s0, 0x10($sp) -/* 95DF88 80242D88 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 95DF8C 80242D8C 0000102D */ daddu $v0, $zero, $zero -/* 95DF90 80242D90 03E00008 */ jr $ra -/* 95DF94 80242D94 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s new file mode 100644 index 0000000000..df16c387d1 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242858_95DA58.s @@ -0,0 +1,350 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242858_95DA58 +/* 95DA58 80242858 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 95DA5C 8024285C AFB20018 */ sw $s2, 0x18($sp) +/* 95DA60 80242860 0080902D */ daddu $s2, $a0, $zero +/* 95DA64 80242864 AFBF0020 */ sw $ra, 0x20($sp) +/* 95DA68 80242868 AFB3001C */ sw $s3, 0x1c($sp) +/* 95DA6C 8024286C AFB10014 */ sw $s1, 0x14($sp) +/* 95DA70 80242870 AFB00010 */ sw $s0, 0x10($sp) +/* 95DA74 80242874 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 95DA78 80242878 8E42000C */ lw $v0, 0xc($s2) +/* 95DA7C 8024287C 00A0802D */ daddu $s0, $a1, $zero +/* 95DA80 80242880 0C0B1EAF */ jal get_variable +/* 95DA84 80242884 8C450000 */ lw $a1, ($v0) +/* 95DA88 80242888 3C138011 */ lui $s3, %hi(gPlayerStatus) +/* 95DA8C 8024288C 2673EFC8 */ addiu $s3, $s3, %lo(gPlayerStatus) +/* 95DA90 80242890 1200001A */ beqz $s0, .L802428FC +/* 95DA94 80242894 0040882D */ daddu $s1, $v0, $zero +/* 95DA98 80242898 0C00AB39 */ jal heap_malloc +/* 95DA9C 8024289C 2404003C */ addiu $a0, $zero, 0x3c +/* 95DAA0 802428A0 AE420074 */ sw $v0, 0x74($s2) +/* 95DAA4 802428A4 8E230000 */ lw $v1, ($s1) +/* 95DAA8 802428A8 0040802D */ daddu $s0, $v0, $zero +/* 95DAAC 802428AC AE030000 */ sw $v1, ($s0) +/* 95DAB0 802428B0 8E220004 */ lw $v0, 4($s1) +/* 95DAB4 802428B4 AE020004 */ sw $v0, 4($s0) +/* 95DAB8 802428B8 8E220008 */ lw $v0, 8($s1) +/* 95DABC 802428BC AE020008 */ sw $v0, 8($s0) +/* 95DAC0 802428C0 8E22000C */ lw $v0, 0xc($s1) +/* 95DAC4 802428C4 AE02000C */ sw $v0, 0xc($s0) +/* 95DAC8 802428C8 8E220010 */ lw $v0, 0x10($s1) +/* 95DACC 802428CC AE020010 */ sw $v0, 0x10($s0) +/* 95DAD0 802428D0 8E220014 */ lw $v0, 0x14($s1) +/* 95DAD4 802428D4 AE000018 */ sw $zero, 0x18($s0) +/* 95DAD8 802428D8 AE00001C */ sw $zero, 0x1c($s0) +/* 95DADC 802428DC AE000020 */ sw $zero, 0x20($s0) +/* 95DAE0 802428E0 AE000024 */ sw $zero, 0x24($s0) +/* 95DAE4 802428E4 AE000028 */ sw $zero, 0x28($s0) +/* 95DAE8 802428E8 AE00002C */ sw $zero, 0x2c($s0) +/* 95DAEC 802428EC AE000030 */ sw $zero, 0x30($s0) +/* 95DAF0 802428F0 AE000034 */ sw $zero, 0x34($s0) +/* 95DAF4 802428F4 AE000038 */ sw $zero, 0x38($s0) +/* 95DAF8 802428F8 AE020014 */ sw $v0, 0x14($s0) +.L802428FC: +/* 95DAFC 802428FC 8E500074 */ lw $s0, 0x74($s2) +/* 95DB00 80242900 8E030020 */ lw $v1, 0x20($s0) +/* 95DB04 80242904 2C620005 */ sltiu $v0, $v1, 5 +/* 95DB08 80242908 10400116 */ beqz $v0, .L80242D64 +/* 95DB0C 8024290C 00031080 */ sll $v0, $v1, 2 +/* 95DB10 80242910 3C018025 */ lui $at, 0x8025 +/* 95DB14 80242914 00220821 */ addu $at, $at, $v0 +/* 95DB18 80242918 8C22DF80 */ lw $v0, -0x2080($at) +/* 95DB1C 8024291C 00400008 */ jr $v0 +/* 95DB20 80242920 00000000 */ nop +/* 95DB24 80242924 C60C0000 */ lwc1 $f12, ($s0) +/* 95DB28 80242928 46806320 */ cvt.s.w $f12, $f12 +/* 95DB2C 8024292C C60E0008 */ lwc1 $f14, 8($s0) +/* 95DB30 80242930 0C038022 */ jal func_800E0088 +/* 95DB34 80242934 468073A0 */ cvt.s.w $f14, $f14 +/* 95DB38 80242938 8E02000C */ lw $v0, 0xc($s0) +/* 95DB3C 8024293C 4600010D */ trunc.w.s $f4, $f0 +/* 95DB40 80242940 44032000 */ mfc1 $v1, $f4 +/* 95DB44 80242944 00000000 */ nop +/* 95DB48 80242948 0062102A */ slt $v0, $v1, $v0 +/* 95DB4C 8024294C 10400105 */ beqz $v0, .L80242D64 +/* 95DB50 80242950 00000000 */ nop +/* 95DB54 80242954 C6600028 */ lwc1 $f0, 0x28($s3) +/* 95DB58 80242958 8E020020 */ lw $v0, 0x20($s0) +/* 95DB5C 8024295C E6000024 */ swc1 $f0, 0x24($s0) +/* 95DB60 80242960 C6600030 */ lwc1 $f0, 0x30($s3) +/* 95DB64 80242964 24420001 */ addiu $v0, $v0, 1 +/* 95DB68 80242968 AE020020 */ sw $v0, 0x20($s0) +/* 95DB6C 8024296C 08090B59 */ j .L80242D64 +/* 95DB70 80242970 E6000028 */ swc1 $f0, 0x28($s0) +/* 95DB74 80242974 C60C0000 */ lwc1 $f12, ($s0) +/* 95DB78 80242978 46806320 */ cvt.s.w $f12, $f12 +/* 95DB7C 8024297C C60E0008 */ lwc1 $f14, 8($s0) +/* 95DB80 80242980 0C038022 */ jal func_800E0088 +/* 95DB84 80242984 468073A0 */ cvt.s.w $f14, $f14 +/* 95DB88 80242988 8E02000C */ lw $v0, 0xc($s0) +/* 95DB8C 8024298C 4600010D */ trunc.w.s $f4, $f0 +/* 95DB90 80242990 44032000 */ mfc1 $v1, $f4 +/* 95DB94 80242994 00000000 */ nop +/* 95DB98 80242998 0062102A */ slt $v0, $v1, $v0 +/* 95DB9C 8024299C 504000F1 */ beql $v0, $zero, .L80242D64 +/* 95DBA0 802429A0 AE000020 */ sw $zero, 0x20($s0) +/* 95DBA4 802429A4 C60C0000 */ lwc1 $f12, ($s0) +/* 95DBA8 802429A8 46806320 */ cvt.s.w $f12, $f12 +/* 95DBAC 802429AC 8E060024 */ lw $a2, 0x24($s0) +/* 95DBB0 802429B0 8E070028 */ lw $a3, 0x28($s0) +/* 95DBB4 802429B4 C60E0008 */ lwc1 $f14, 8($s0) +/* 95DBB8 802429B8 0C00A720 */ jal atan2 +/* 95DBBC 802429BC 468073A0 */ cvt.s.w $f14, $f14 +/* 95DBC0 802429C0 4600010D */ trunc.w.s $f4, $f0 +/* 95DBC4 802429C4 44112000 */ mfc1 $s1, $f4 +/* 95DBC8 802429C8 C60C0000 */ lwc1 $f12, ($s0) +/* 95DBCC 802429CC 46806320 */ cvt.s.w $f12, $f12 +/* 95DBD0 802429D0 8E660028 */ lw $a2, 0x28($s3) +/* 95DBD4 802429D4 8E670030 */ lw $a3, 0x30($s3) +/* 95DBD8 802429D8 C60E0008 */ lwc1 $f14, 8($s0) +/* 95DBDC 802429DC 0C00A720 */ jal atan2 +/* 95DBE0 802429E0 468073A0 */ cvt.s.w $f14, $f14 +/* 95DBE4 802429E4 4600010D */ trunc.w.s $f4, $f0 +/* 95DBE8 802429E8 44022000 */ mfc1 $v0, $f4 +/* 95DBEC 802429EC 44916000 */ mtc1 $s1, $f12 +/* 95DBF0 802429F0 00000000 */ nop +/* 95DBF4 802429F4 46806320 */ cvt.s.w $f12, $f12 +/* 95DBF8 802429F8 44827000 */ mtc1 $v0, $f14 +/* 95DBFC 802429FC 00000000 */ nop +/* 95DC00 80242A00 0C00A70A */ jal get_clamped_angle_diff +/* 95DC04 80242A04 468073A0 */ cvt.s.w $f14, $f14 +/* 95DC08 80242A08 4600010D */ trunc.w.s $f4, $f0 +/* 95DC0C 80242A0C 44022000 */ mfc1 $v0, $f4 +/* 95DC10 80242A10 00000000 */ nop +/* 95DC14 80242A14 44826000 */ mtc1 $v0, $f12 +/* 95DC18 80242A18 00000000 */ nop +/* 95DC1C 80242A1C 0C00A69F */ jal signF +/* 95DC20 80242A20 46806320 */ cvt.s.w $f12, $f12 +/* 95DC24 80242A24 8E020020 */ lw $v0, 0x20($s0) +/* 95DC28 80242A28 08090B52 */ j .L80242D48 +/* 95DC2C 80242A2C E6000034 */ swc1 $f0, 0x34($s0) +/* 95DC30 80242A30 C60C0000 */ lwc1 $f12, ($s0) +/* 95DC34 80242A34 46806320 */ cvt.s.w $f12, $f12 +/* 95DC38 80242A38 C60E0008 */ lwc1 $f14, 8($s0) +/* 95DC3C 80242A3C 0C038022 */ jal func_800E0088 +/* 95DC40 80242A40 468073A0 */ cvt.s.w $f14, $f14 +/* 95DC44 80242A44 8E02000C */ lw $v0, 0xc($s0) +/* 95DC48 80242A48 4600010D */ trunc.w.s $f4, $f0 +/* 95DC4C 80242A4C 44032000 */ mfc1 $v1, $f4 +/* 95DC50 80242A50 00000000 */ nop +/* 95DC54 80242A54 0062102A */ slt $v0, $v1, $v0 +/* 95DC58 80242A58 504000C2 */ beql $v0, $zero, .L80242D64 +/* 95DC5C 80242A5C AE000020 */ sw $zero, 0x20($s0) +/* 95DC60 80242A60 C60C0000 */ lwc1 $f12, ($s0) +/* 95DC64 80242A64 46806320 */ cvt.s.w $f12, $f12 +/* 95DC68 80242A68 8E06002C */ lw $a2, 0x2c($s0) +/* 95DC6C 80242A6C 8E070030 */ lw $a3, 0x30($s0) +/* 95DC70 80242A70 C60E0008 */ lwc1 $f14, 8($s0) +/* 95DC74 80242A74 0C00A720 */ jal atan2 +/* 95DC78 80242A78 468073A0 */ cvt.s.w $f14, $f14 +/* 95DC7C 80242A7C 4600010D */ trunc.w.s $f4, $f0 +/* 95DC80 80242A80 44112000 */ mfc1 $s1, $f4 +/* 95DC84 80242A84 C60C0000 */ lwc1 $f12, ($s0) +/* 95DC88 80242A88 46806320 */ cvt.s.w $f12, $f12 +/* 95DC8C 80242A8C 8E660028 */ lw $a2, 0x28($s3) +/* 95DC90 80242A90 8E670030 */ lw $a3, 0x30($s3) +/* 95DC94 80242A94 C60E0008 */ lwc1 $f14, 8($s0) +/* 95DC98 80242A98 0C00A720 */ jal atan2 +/* 95DC9C 80242A9C 468073A0 */ cvt.s.w $f14, $f14 +/* 95DCA0 80242AA0 4600010D */ trunc.w.s $f4, $f0 +/* 95DCA4 80242AA4 44022000 */ mfc1 $v0, $f4 +/* 95DCA8 80242AA8 44916000 */ mtc1 $s1, $f12 +/* 95DCAC 80242AAC 00000000 */ nop +/* 95DCB0 80242AB0 46806320 */ cvt.s.w $f12, $f12 +/* 95DCB4 80242AB4 44827000 */ mtc1 $v0, $f14 +/* 95DCB8 80242AB8 00000000 */ nop +/* 95DCBC 80242ABC 0C00A70A */ jal get_clamped_angle_diff +/* 95DCC0 80242AC0 468073A0 */ cvt.s.w $f14, $f14 +/* 95DCC4 80242AC4 4600010D */ trunc.w.s $f4, $f0 +/* 95DCC8 80242AC8 44022000 */ mfc1 $v0, $f4 +/* 95DCCC 80242ACC 00000000 */ nop +/* 95DCD0 80242AD0 44826000 */ mtc1 $v0, $f12 +/* 95DCD4 80242AD4 00000000 */ nop +/* 95DCD8 80242AD8 0C00A69F */ jal signF +/* 95DCDC 80242ADC 46806320 */ cvt.s.w $f12, $f12 +/* 95DCE0 80242AE0 C6020034 */ lwc1 $f2, 0x34($s0) +/* 95DCE4 80242AE4 46001032 */ c.eq.s $f2, $f0 +/* 95DCE8 80242AE8 00000000 */ nop +/* 95DCEC 80242AEC 4502009D */ bc1fl .L80242D64 +/* 95DCF0 80242AF0 AE000020 */ sw $zero, 0x20($s0) +/* 95DCF4 80242AF4 C60C0000 */ lwc1 $f12, ($s0) +/* 95DCF8 80242AF8 46806320 */ cvt.s.w $f12, $f12 +/* 95DCFC 80242AFC 8E060024 */ lw $a2, 0x24($s0) +/* 95DD00 80242B00 8E070028 */ lw $a3, 0x28($s0) +/* 95DD04 80242B04 C60E0008 */ lwc1 $f14, 8($s0) +/* 95DD08 80242B08 0C00A720 */ jal atan2 +/* 95DD0C 80242B0C 468073A0 */ cvt.s.w $f14, $f14 +/* 95DD10 80242B10 4600010D */ trunc.w.s $f4, $f0 +/* 95DD14 80242B14 44112000 */ mfc1 $s1, $f4 +/* 95DD18 80242B18 C60C0000 */ lwc1 $f12, ($s0) +/* 95DD1C 80242B1C 46806320 */ cvt.s.w $f12, $f12 +/* 95DD20 80242B20 8E660028 */ lw $a2, 0x28($s3) +/* 95DD24 80242B24 8E670030 */ lw $a3, 0x30($s3) +/* 95DD28 80242B28 C60E0008 */ lwc1 $f14, 8($s0) +/* 95DD2C 80242B2C 0C00A720 */ jal atan2 +/* 95DD30 80242B30 468073A0 */ cvt.s.w $f14, $f14 +/* 95DD34 80242B34 4600010D */ trunc.w.s $f4, $f0 +/* 95DD38 80242B38 44022000 */ mfc1 $v0, $f4 +/* 95DD3C 80242B3C 44916000 */ mtc1 $s1, $f12 +/* 95DD40 80242B40 00000000 */ nop +/* 95DD44 80242B44 46806320 */ cvt.s.w $f12, $f12 +/* 95DD48 80242B48 44827000 */ mtc1 $v0, $f14 +/* 95DD4C 80242B4C 00000000 */ nop +/* 95DD50 80242B50 0C00A70A */ jal get_clamped_angle_diff +/* 95DD54 80242B54 468073A0 */ cvt.s.w $f14, $f14 +/* 95DD58 80242B58 4600010D */ trunc.w.s $f4, $f0 +/* 95DD5C 80242B5C 44022000 */ mfc1 $v0, $f4 +/* 95DD60 80242B60 00000000 */ nop +/* 95DD64 80242B64 44820000 */ mtc1 $v0, $f0 +/* 95DD68 80242B68 00000000 */ nop +/* 95DD6C 80242B6C 46800020 */ cvt.s.w $f0, $f0 +/* 95DD70 80242B70 3C0142B4 */ lui $at, 0x42b4 +/* 95DD74 80242B74 44811000 */ mtc1 $at, $f2 +/* 95DD78 80242B78 46000505 */ abs.s $f20, $f0 +/* 95DD7C 80242B7C 4614103C */ c.lt.s $f2, $f20 +/* 95DD80 80242B80 00000000 */ nop +/* 95DD84 80242B84 45000077 */ bc1f .L80242D64 +/* 95DD88 80242B88 00000000 */ nop +/* 95DD8C 80242B8C 8E020014 */ lw $v0, 0x14($s0) +/* 95DD90 80242B90 10400003 */ beqz $v0, .L80242BA0 +/* 95DD94 80242B94 0200202D */ daddu $a0, $s0, $zero +/* 95DD98 80242B98 0040F809 */ jalr $v0 +/* 95DD9C 80242B9C 0000282D */ daddu $a1, $zero, $zero +.L80242BA0: +/* 95DDA0 80242BA0 C6000018 */ lwc1 $f0, 0x18($s0) +/* 95DDA4 80242BA4 46800020 */ cvt.s.w $f0, $f0 +/* 95DDA8 80242BA8 8E020020 */ lw $v0, 0x20($s0) +/* 95DDAC 80242BAC 46140000 */ add.s $f0, $f0, $f20 +/* 95DDB0 80242BB0 24420001 */ addiu $v0, $v0, 1 +/* 95DDB4 80242BB4 AE020020 */ sw $v0, 0x20($s0) +/* 95DDB8 80242BB8 4600010D */ trunc.w.s $f4, $f0 +/* 95DDBC 80242BBC 08090B59 */ j .L80242D64 +/* 95DDC0 80242BC0 E6040018 */ swc1 $f4, 0x18($s0) +/* 95DDC4 80242BC4 C60C0000 */ lwc1 $f12, ($s0) +/* 95DDC8 80242BC8 46806320 */ cvt.s.w $f12, $f12 +/* 95DDCC 80242BCC C60E0008 */ lwc1 $f14, 8($s0) +/* 95DDD0 80242BD0 0C038022 */ jal func_800E0088 +/* 95DDD4 80242BD4 468073A0 */ cvt.s.w $f14, $f14 +/* 95DDD8 80242BD8 8E020010 */ lw $v0, 0x10($s0) +/* 95DDDC 80242BDC 4600010D */ trunc.w.s $f4, $f0 +/* 95DDE0 80242BE0 44032000 */ mfc1 $v1, $f4 +/* 95DDE4 80242BE4 00000000 */ nop +/* 95DDE8 80242BE8 0062102A */ slt $v0, $v1, $v0 +/* 95DDEC 80242BEC 10400050 */ beqz $v0, .L80242D30 +/* 95DDF0 80242BF0 00000000 */ nop +/* 95DDF4 80242BF4 C60C0000 */ lwc1 $f12, ($s0) +/* 95DDF8 80242BF8 46806320 */ cvt.s.w $f12, $f12 +/* 95DDFC 80242BFC 8E06002C */ lw $a2, 0x2c($s0) +/* 95DE00 80242C00 8E070030 */ lw $a3, 0x30($s0) +/* 95DE04 80242C04 C60E0008 */ lwc1 $f14, 8($s0) +/* 95DE08 80242C08 0C00A720 */ jal atan2 +/* 95DE0C 80242C0C 468073A0 */ cvt.s.w $f14, $f14 +/* 95DE10 80242C10 4600010D */ trunc.w.s $f4, $f0 +/* 95DE14 80242C14 44112000 */ mfc1 $s1, $f4 +/* 95DE18 80242C18 C60C0000 */ lwc1 $f12, ($s0) +/* 95DE1C 80242C1C 46806320 */ cvt.s.w $f12, $f12 +/* 95DE20 80242C20 8E660028 */ lw $a2, 0x28($s3) +/* 95DE24 80242C24 8E670030 */ lw $a3, 0x30($s3) +/* 95DE28 80242C28 C60E0008 */ lwc1 $f14, 8($s0) +/* 95DE2C 80242C2C 0C00A720 */ jal atan2 +/* 95DE30 80242C30 468073A0 */ cvt.s.w $f14, $f14 +/* 95DE34 80242C34 4600010D */ trunc.w.s $f4, $f0 +/* 95DE38 80242C38 44022000 */ mfc1 $v0, $f4 +/* 95DE3C 80242C3C 44916000 */ mtc1 $s1, $f12 +/* 95DE40 80242C40 00000000 */ nop +/* 95DE44 80242C44 46806320 */ cvt.s.w $f12, $f12 +/* 95DE48 80242C48 44827000 */ mtc1 $v0, $f14 +/* 95DE4C 80242C4C 00000000 */ nop +/* 95DE50 80242C50 0C00A70A */ jal get_clamped_angle_diff +/* 95DE54 80242C54 468073A0 */ cvt.s.w $f14, $f14 +/* 95DE58 80242C58 4600010D */ trunc.w.s $f4, $f0 +/* 95DE5C 80242C5C 44022000 */ mfc1 $v0, $f4 +/* 95DE60 80242C60 00000000 */ nop +/* 95DE64 80242C64 4482A000 */ mtc1 $v0, $f20 +/* 95DE68 80242C68 00000000 */ nop +/* 95DE6C 80242C6C 4680A520 */ cvt.s.w $f20, $f20 +/* 95DE70 80242C70 0C00A69F */ jal signF +/* 95DE74 80242C74 4600A306 */ mov.s $f12, $f20 +/* 95DE78 80242C78 C6020034 */ lwc1 $f2, 0x34($s0) +/* 95DE7C 80242C7C 46001032 */ c.eq.s $f2, $f0 +/* 95DE80 80242C80 00000000 */ nop +/* 95DE84 80242C84 4503000A */ bc1tl .L80242CB0 +/* 95DE88 80242C88 4600A005 */ abs.s $f0, $f20 +/* 95DE8C 80242C8C 8E020014 */ lw $v0, 0x14($s0) +/* 95DE90 80242C90 10400003 */ beqz $v0, .L80242CA0 +/* 95DE94 80242C94 0200202D */ daddu $a0, $s0, $zero +/* 95DE98 80242C98 0040F809 */ jalr $v0 +/* 95DE9C 80242C9C 24050003 */ addiu $a1, $zero, 3 +.L80242CA0: +/* 95DEA0 80242CA0 8E020020 */ lw $v0, 0x20($s0) +/* 95DEA4 80242CA4 24420001 */ addiu $v0, $v0, 1 +/* 95DEA8 80242CA8 08090B45 */ j .L80242D14 +/* 95DEAC 80242CAC AE020020 */ sw $v0, 0x20($s0) +.L80242CB0: +/* 95DEB0 80242CB0 C6020018 */ lwc1 $f2, 0x18($s0) +/* 95DEB4 80242CB4 468010A0 */ cvt.s.w $f2, $f2 +/* 95DEB8 80242CB8 46001080 */ add.s $f2, $f2, $f0 +/* 95DEBC 80242CBC 3C02B60B */ lui $v0, 0xb60b +/* 95DEC0 80242CC0 344260B7 */ ori $v0, $v0, 0x60b7 +/* 95DEC4 80242CC4 4600110D */ trunc.w.s $f4, $f2 +/* 95DEC8 80242CC8 44032000 */ mfc1 $v1, $f4 +/* 95DECC 80242CCC 00000000 */ nop +/* 95DED0 80242CD0 00620018 */ mult $v1, $v0 +/* 95DED4 80242CD4 8E040038 */ lw $a0, 0x38($s0) +/* 95DED8 80242CD8 AE030018 */ sw $v1, 0x18($s0) +/* 95DEDC 80242CDC 00004010 */ mfhi $t0 +/* 95DEE0 80242CE0 01031021 */ addu $v0, $t0, $v1 +/* 95DEE4 80242CE4 00021203 */ sra $v0, $v0, 8 +/* 95DEE8 80242CE8 00031FC3 */ sra $v1, $v1, 0x1f +/* 95DEEC 80242CEC 00431023 */ subu $v0, $v0, $v1 +/* 95DEF0 80242CF0 10440008 */ beq $v0, $a0, .L80242D14 +/* 95DEF4 80242CF4 AE02001C */ sw $v0, 0x1c($s0) +/* 95DEF8 80242CF8 8E020014 */ lw $v0, 0x14($s0) +/* 95DEFC 80242CFC 10400003 */ beqz $v0, .L80242D0C +/* 95DF00 80242D00 0200202D */ daddu $a0, $s0, $zero +/* 95DF04 80242D04 0040F809 */ jalr $v0 +/* 95DF08 80242D08 24050001 */ addiu $a1, $zero, 1 +.L80242D0C: +/* 95DF0C 80242D0C 8E02001C */ lw $v0, 0x1c($s0) +/* 95DF10 80242D10 AE020038 */ sw $v0, 0x38($s0) +.L80242D14: +/* 95DF14 80242D14 8E020014 */ lw $v0, 0x14($s0) +/* 95DF18 80242D18 10400012 */ beqz $v0, .L80242D64 +/* 95DF1C 80242D1C 0200202D */ daddu $a0, $s0, $zero +/* 95DF20 80242D20 0040F809 */ jalr $v0 +/* 95DF24 80242D24 24050002 */ addiu $a1, $zero, 2 +/* 95DF28 80242D28 08090B59 */ j .L80242D64 +/* 95DF2C 80242D2C 00000000 */ nop +.L80242D30: +/* 95DF30 80242D30 8E020014 */ lw $v0, 0x14($s0) +/* 95DF34 80242D34 10400003 */ beqz $v0, .L80242D44 +/* 95DF38 80242D38 0200202D */ daddu $a0, $s0, $zero +/* 95DF3C 80242D3C 0040F809 */ jalr $v0 +/* 95DF40 80242D40 24050004 */ addiu $a1, $zero, 4 +.L80242D44: +/* 95DF44 80242D44 8E020020 */ lw $v0, 0x20($s0) +.L80242D48: +/* 95DF48 80242D48 24420001 */ addiu $v0, $v0, 1 +/* 95DF4C 80242D4C 08090B59 */ j .L80242D64 +/* 95DF50 80242D50 AE020020 */ sw $v0, 0x20($s0) +/* 95DF54 80242D54 AE000018 */ sw $zero, 0x18($s0) +/* 95DF58 80242D58 AE00001C */ sw $zero, 0x1c($s0) +/* 95DF5C 80242D5C AE000038 */ sw $zero, 0x38($s0) +/* 95DF60 80242D60 AE000020 */ sw $zero, 0x20($s0) +.L80242D64: +/* 95DF64 80242D64 C6600028 */ lwc1 $f0, 0x28($s3) +/* 95DF68 80242D68 E600002C */ swc1 $f0, 0x2c($s0) +/* 95DF6C 80242D6C C6600030 */ lwc1 $f0, 0x30($s3) +/* 95DF70 80242D70 E6000030 */ swc1 $f0, 0x30($s0) +/* 95DF74 80242D74 8FBF0020 */ lw $ra, 0x20($sp) +/* 95DF78 80242D78 8FB3001C */ lw $s3, 0x1c($sp) +/* 95DF7C 80242D7C 8FB20018 */ lw $s2, 0x18($sp) +/* 95DF80 80242D80 8FB10014 */ lw $s1, 0x14($sp) +/* 95DF84 80242D84 8FB00010 */ lw $s0, 0x10($sp) +/* 95DF88 80242D88 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 95DF8C 80242D8C 0000102D */ daddu $v0, $zero, $zero +/* 95DF90 80242D90 03E00008 */ jr $ra +/* 95DF94 80242D94 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242D98.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242D98.s deleted file mode 100644 index 64291ec283..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242D98.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D98 -/* 95DF98 80242D98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95DF9C 80242D9C AFB10014 */ sw $s1, 0x14($sp) -/* 95DFA0 80242DA0 0080882D */ daddu $s1, $a0, $zero -/* 95DFA4 80242DA4 AFBF0018 */ sw $ra, 0x18($sp) -/* 95DFA8 80242DA8 AFB00010 */ sw $s0, 0x10($sp) -/* 95DFAC 80242DAC 8E30000C */ lw $s0, 0xc($s1) -/* 95DFB0 80242DB0 8E050000 */ lw $a1, ($s0) -/* 95DFB4 80242DB4 0C0B1EAF */ jal get_variable -/* 95DFB8 80242DB8 26100004 */ addiu $s0, $s0, 4 -/* 95DFBC 80242DBC AE22008C */ sw $v0, 0x8c($s1) -/* 95DFC0 80242DC0 8E050000 */ lw $a1, ($s0) -/* 95DFC4 80242DC4 26100004 */ addiu $s0, $s0, 4 -/* 95DFC8 80242DC8 0C0B1EAF */ jal get_variable -/* 95DFCC 80242DCC 0220202D */ daddu $a0, $s1, $zero -/* 95DFD0 80242DD0 AE220090 */ sw $v0, 0x90($s1) -/* 95DFD4 80242DD4 8E050000 */ lw $a1, ($s0) -/* 95DFD8 80242DD8 26100004 */ addiu $s0, $s0, 4 -/* 95DFDC 80242DDC 0C0B1EAF */ jal get_variable -/* 95DFE0 80242DE0 0220202D */ daddu $a0, $s1, $zero -/* 95DFE4 80242DE4 AE220094 */ sw $v0, 0x94($s1) -/* 95DFE8 80242DE8 8E050000 */ lw $a1, ($s0) -/* 95DFEC 80242DEC 26100004 */ addiu $s0, $s0, 4 -/* 95DFF0 80242DF0 0C0B1EAF */ jal get_variable -/* 95DFF4 80242DF4 0220202D */ daddu $a0, $s1, $zero -/* 95DFF8 80242DF8 AE220098 */ sw $v0, 0x98($s1) -/* 95DFFC 80242DFC 8E050000 */ lw $a1, ($s0) -/* 95E000 80242E00 26100004 */ addiu $s0, $s0, 4 -/* 95E004 80242E04 0C0B1EAF */ jal get_variable -/* 95E008 80242E08 0220202D */ daddu $a0, $s1, $zero -/* 95E00C 80242E0C AE22009C */ sw $v0, 0x9c($s1) -/* 95E010 80242E10 8E050000 */ lw $a1, ($s0) -/* 95E014 80242E14 26100004 */ addiu $s0, $s0, 4 -/* 95E018 80242E18 0C0B1EAF */ jal get_variable -/* 95E01C 80242E1C 0220202D */ daddu $a0, $s1, $zero -/* 95E020 80242E20 AE2200A0 */ sw $v0, 0xa0($s1) -/* 95E024 80242E24 8E050000 */ lw $a1, ($s0) -/* 95E028 80242E28 26100004 */ addiu $s0, $s0, 4 -/* 95E02C 80242E2C 0C0B1EAF */ jal get_variable -/* 95E030 80242E30 0220202D */ daddu $a0, $s1, $zero -/* 95E034 80242E34 AE2200A4 */ sw $v0, 0xa4($s1) -/* 95E038 80242E38 8E050000 */ lw $a1, ($s0) -/* 95E03C 80242E3C 26100004 */ addiu $s0, $s0, 4 -/* 95E040 80242E40 0C0B1EAF */ jal get_variable -/* 95E044 80242E44 0220202D */ daddu $a0, $s1, $zero -/* 95E048 80242E48 AE2200A8 */ sw $v0, 0xa8($s1) -/* 95E04C 80242E4C 8E050000 */ lw $a1, ($s0) -/* 95E050 80242E50 26100004 */ addiu $s0, $s0, 4 -/* 95E054 80242E54 0C0B1EAF */ jal get_variable -/* 95E058 80242E58 0220202D */ daddu $a0, $s1, $zero -/* 95E05C 80242E5C AE2200AC */ sw $v0, 0xac($s1) -/* 95E060 80242E60 8E050000 */ lw $a1, ($s0) -/* 95E064 80242E64 0C0B1EAF */ jal get_variable -/* 95E068 80242E68 0220202D */ daddu $a0, $s1, $zero -/* 95E06C 80242E6C AE2200B0 */ sw $v0, 0xb0($s1) -/* 95E070 80242E70 8FBF0018 */ lw $ra, 0x18($sp) -/* 95E074 80242E74 8FB10014 */ lw $s1, 0x14($sp) -/* 95E078 80242E78 8FB00010 */ lw $s0, 0x10($sp) -/* 95E07C 80242E7C 24020002 */ addiu $v0, $zero, 2 -/* 95E080 80242E80 03E00008 */ jr $ra -/* 95E084 80242E84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242D98_95DF98.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242D98_95DF98.s new file mode 100644 index 0000000000..961e5f519c --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242D98_95DF98.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D98_95DF98 +/* 95DF98 80242D98 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95DF9C 80242D9C AFB10014 */ sw $s1, 0x14($sp) +/* 95DFA0 80242DA0 0080882D */ daddu $s1, $a0, $zero +/* 95DFA4 80242DA4 AFBF0018 */ sw $ra, 0x18($sp) +/* 95DFA8 80242DA8 AFB00010 */ sw $s0, 0x10($sp) +/* 95DFAC 80242DAC 8E30000C */ lw $s0, 0xc($s1) +/* 95DFB0 80242DB0 8E050000 */ lw $a1, ($s0) +/* 95DFB4 80242DB4 0C0B1EAF */ jal get_variable +/* 95DFB8 80242DB8 26100004 */ addiu $s0, $s0, 4 +/* 95DFBC 80242DBC AE22008C */ sw $v0, 0x8c($s1) +/* 95DFC0 80242DC0 8E050000 */ lw $a1, ($s0) +/* 95DFC4 80242DC4 26100004 */ addiu $s0, $s0, 4 +/* 95DFC8 80242DC8 0C0B1EAF */ jal get_variable +/* 95DFCC 80242DCC 0220202D */ daddu $a0, $s1, $zero +/* 95DFD0 80242DD0 AE220090 */ sw $v0, 0x90($s1) +/* 95DFD4 80242DD4 8E050000 */ lw $a1, ($s0) +/* 95DFD8 80242DD8 26100004 */ addiu $s0, $s0, 4 +/* 95DFDC 80242DDC 0C0B1EAF */ jal get_variable +/* 95DFE0 80242DE0 0220202D */ daddu $a0, $s1, $zero +/* 95DFE4 80242DE4 AE220094 */ sw $v0, 0x94($s1) +/* 95DFE8 80242DE8 8E050000 */ lw $a1, ($s0) +/* 95DFEC 80242DEC 26100004 */ addiu $s0, $s0, 4 +/* 95DFF0 80242DF0 0C0B1EAF */ jal get_variable +/* 95DFF4 80242DF4 0220202D */ daddu $a0, $s1, $zero +/* 95DFF8 80242DF8 AE220098 */ sw $v0, 0x98($s1) +/* 95DFFC 80242DFC 8E050000 */ lw $a1, ($s0) +/* 95E000 80242E00 26100004 */ addiu $s0, $s0, 4 +/* 95E004 80242E04 0C0B1EAF */ jal get_variable +/* 95E008 80242E08 0220202D */ daddu $a0, $s1, $zero +/* 95E00C 80242E0C AE22009C */ sw $v0, 0x9c($s1) +/* 95E010 80242E10 8E050000 */ lw $a1, ($s0) +/* 95E014 80242E14 26100004 */ addiu $s0, $s0, 4 +/* 95E018 80242E18 0C0B1EAF */ jal get_variable +/* 95E01C 80242E1C 0220202D */ daddu $a0, $s1, $zero +/* 95E020 80242E20 AE2200A0 */ sw $v0, 0xa0($s1) +/* 95E024 80242E24 8E050000 */ lw $a1, ($s0) +/* 95E028 80242E28 26100004 */ addiu $s0, $s0, 4 +/* 95E02C 80242E2C 0C0B1EAF */ jal get_variable +/* 95E030 80242E30 0220202D */ daddu $a0, $s1, $zero +/* 95E034 80242E34 AE2200A4 */ sw $v0, 0xa4($s1) +/* 95E038 80242E38 8E050000 */ lw $a1, ($s0) +/* 95E03C 80242E3C 26100004 */ addiu $s0, $s0, 4 +/* 95E040 80242E40 0C0B1EAF */ jal get_variable +/* 95E044 80242E44 0220202D */ daddu $a0, $s1, $zero +/* 95E048 80242E48 AE2200A8 */ sw $v0, 0xa8($s1) +/* 95E04C 80242E4C 8E050000 */ lw $a1, ($s0) +/* 95E050 80242E50 26100004 */ addiu $s0, $s0, 4 +/* 95E054 80242E54 0C0B1EAF */ jal get_variable +/* 95E058 80242E58 0220202D */ daddu $a0, $s1, $zero +/* 95E05C 80242E5C AE2200AC */ sw $v0, 0xac($s1) +/* 95E060 80242E60 8E050000 */ lw $a1, ($s0) +/* 95E064 80242E64 0C0B1EAF */ jal get_variable +/* 95E068 80242E68 0220202D */ daddu $a0, $s1, $zero +/* 95E06C 80242E6C AE2200B0 */ sw $v0, 0xb0($s1) +/* 95E070 80242E70 8FBF0018 */ lw $ra, 0x18($sp) +/* 95E074 80242E74 8FB10014 */ lw $s1, 0x14($sp) +/* 95E078 80242E78 8FB00010 */ lw $s0, 0x10($sp) +/* 95E07C 80242E7C 24020002 */ addiu $v0, $zero, 2 +/* 95E080 80242E80 03E00008 */ jr $ra +/* 95E084 80242E84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88.s deleted file mode 100644 index 45a0d227f1..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E88 -/* 95E088 80242E88 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95E08C 80242E8C AFB1001C */ sw $s1, 0x1c($sp) -/* 95E090 80242E90 0080882D */ daddu $s1, $a0, $zero -/* 95E094 80242E94 AFBF0034 */ sw $ra, 0x34($sp) -/* 95E098 80242E98 AFB60030 */ sw $s6, 0x30($sp) -/* 95E09C 80242E9C AFB5002C */ sw $s5, 0x2c($sp) -/* 95E0A0 80242EA0 AFB40028 */ sw $s4, 0x28($sp) -/* 95E0A4 80242EA4 AFB30024 */ sw $s3, 0x24($sp) -/* 95E0A8 80242EA8 AFB20020 */ sw $s2, 0x20($sp) -/* 95E0AC 80242EAC AFB00018 */ sw $s0, 0x18($sp) -/* 95E0B0 80242EB0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 95E0B4 80242EB4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 95E0B8 80242EB8 8E30000C */ lw $s0, 0xc($s1) -/* 95E0BC 80242EBC 8E160000 */ lw $s6, ($s0) -/* 95E0C0 80242EC0 26100004 */ addiu $s0, $s0, 4 -/* 95E0C4 80242EC4 0C0B1EAF */ jal get_variable -/* 95E0C8 80242EC8 02C0282D */ daddu $a1, $s6, $zero -/* 95E0CC 80242ECC 44820000 */ mtc1 $v0, $f0 -/* 95E0D0 80242ED0 00000000 */ nop -/* 95E0D4 80242ED4 46800020 */ cvt.s.w $f0, $f0 -/* 95E0D8 80242ED8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95E0DC 80242EDC 8E140000 */ lw $s4, ($s0) -/* 95E0E0 80242EE0 26100004 */ addiu $s0, $s0, 4 -/* 95E0E4 80242EE4 0220202D */ daddu $a0, $s1, $zero -/* 95E0E8 80242EE8 0C0B1EAF */ jal get_variable -/* 95E0EC 80242EEC 0280282D */ daddu $a1, $s4, $zero -/* 95E0F0 80242EF0 0220202D */ daddu $a0, $s1, $zero -/* 95E0F4 80242EF4 8E150000 */ lw $s5, ($s0) -/* 95E0F8 80242EF8 4482B000 */ mtc1 $v0, $f22 -/* 95E0FC 80242EFC 00000000 */ nop -/* 95E100 80242F00 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95E104 80242F04 0C0B1EAF */ jal get_variable -/* 95E108 80242F08 02A0282D */ daddu $a1, $s5, $zero -/* 95E10C 80242F0C 2404FFFC */ addiu $a0, $zero, -4 -/* 95E110 80242F10 44820000 */ mtc1 $v0, $f0 -/* 95E114 80242F14 00000000 */ nop -/* 95E118 80242F18 46800020 */ cvt.s.w $f0, $f0 -/* 95E11C 80242F1C 0C00EABB */ jal get_npc_unsafe -/* 95E120 80242F20 E7A00014 */ swc1 $f0, 0x14($sp) -/* 95E124 80242F24 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 95E128 80242F28 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 95E12C 80242F2C 3C014334 */ lui $at, 0x4334 -/* 95E130 80242F30 44816000 */ mtc1 $at, $f12 -/* 95E134 80242F34 00041880 */ sll $v1, $a0, 2 -/* 95E138 80242F38 00641821 */ addu $v1, $v1, $a0 -/* 95E13C 80242F3C 00031880 */ sll $v1, $v1, 2 -/* 95E140 80242F40 00641823 */ subu $v1, $v1, $a0 -/* 95E144 80242F44 000320C0 */ sll $a0, $v1, 3 -/* 95E148 80242F48 00641821 */ addu $v1, $v1, $a0 -/* 95E14C 80242F4C 000318C0 */ sll $v1, $v1, 3 -/* 95E150 80242F50 3C01800B */ lui $at, 0x800b -/* 95E154 80242F54 00230821 */ addu $at, $at, $v1 -/* 95E158 80242F58 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 95E15C 80242F5C 460C0300 */ add.s $f12, $f0, $f12 -/* 95E160 80242F60 0C00A6C9 */ jal clamp_angle -/* 95E164 80242F64 0040982D */ daddu $s3, $v0, $zero -/* 95E168 80242F68 27B00010 */ addiu $s0, $sp, 0x10 -/* 95E16C 80242F6C 0200202D */ daddu $a0, $s0, $zero -/* 95E170 80242F70 27B20014 */ addiu $s2, $sp, 0x14 -/* 95E174 80242F74 0240282D */ daddu $a1, $s2, $zero -/* 95E178 80242F78 3C064170 */ lui $a2, 0x4170 -/* 95E17C 80242F7C 8E67000C */ lw $a3, 0xc($s3) -/* 95E180 80242F80 0C00A7E7 */ jal add_vec2D_polar -/* 95E184 80242F84 46000506 */ mov.s $f20, $f0 -/* 95E188 80242F88 0200202D */ daddu $a0, $s0, $zero -/* 95E18C 80242F8C 3C064120 */ lui $a2, 0x4120 -/* 95E190 80242F90 4407A000 */ mfc1 $a3, $f20 -/* 95E194 80242F94 0C00A7E7 */ jal add_vec2D_polar -/* 95E198 80242F98 0240282D */ daddu $a1, $s2, $zero -/* 95E19C 80242F9C 0220202D */ daddu $a0, $s1, $zero -/* 95E1A0 80242FA0 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 95E1A4 80242FA4 4600008D */ trunc.w.s $f2, $f0 -/* 95E1A8 80242FA8 44061000 */ mfc1 $a2, $f2 -/* 95E1AC 80242FAC 0C0B2026 */ jal set_variable -/* 95E1B0 80242FB0 02C0282D */ daddu $a1, $s6, $zero -/* 95E1B4 80242FB4 0220202D */ daddu $a0, $s1, $zero -/* 95E1B8 80242FB8 4600B08D */ trunc.w.s $f2, $f22 -/* 95E1BC 80242FBC 44061000 */ mfc1 $a2, $f2 -/* 95E1C0 80242FC0 0C0B2026 */ jal set_variable -/* 95E1C4 80242FC4 0280282D */ daddu $a1, $s4, $zero -/* 95E1C8 80242FC8 0220202D */ daddu $a0, $s1, $zero -/* 95E1CC 80242FCC C7A00014 */ lwc1 $f0, 0x14($sp) -/* 95E1D0 80242FD0 4600008D */ trunc.w.s $f2, $f0 -/* 95E1D4 80242FD4 44061000 */ mfc1 $a2, $f2 -/* 95E1D8 80242FD8 0C0B2026 */ jal set_variable -/* 95E1DC 80242FDC 02A0282D */ daddu $a1, $s5, $zero -/* 95E1E0 80242FE0 8FBF0034 */ lw $ra, 0x34($sp) -/* 95E1E4 80242FE4 8FB60030 */ lw $s6, 0x30($sp) -/* 95E1E8 80242FE8 8FB5002C */ lw $s5, 0x2c($sp) -/* 95E1EC 80242FEC 8FB40028 */ lw $s4, 0x28($sp) -/* 95E1F0 80242FF0 8FB30024 */ lw $s3, 0x24($sp) -/* 95E1F4 80242FF4 8FB20020 */ lw $s2, 0x20($sp) -/* 95E1F8 80242FF8 8FB1001C */ lw $s1, 0x1c($sp) -/* 95E1FC 80242FFC 8FB00018 */ lw $s0, 0x18($sp) -/* 95E200 80243000 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 95E204 80243004 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 95E208 80243008 24020002 */ addiu $v0, $zero, 2 -/* 95E20C 8024300C 03E00008 */ jr $ra -/* 95E210 80243010 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88_95E088.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88_95E088.s new file mode 100644 index 0000000000..ef354b58ee --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242E88_95E088.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E88_95E088 +/* 95E088 80242E88 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 95E08C 80242E8C AFB1001C */ sw $s1, 0x1c($sp) +/* 95E090 80242E90 0080882D */ daddu $s1, $a0, $zero +/* 95E094 80242E94 AFBF0034 */ sw $ra, 0x34($sp) +/* 95E098 80242E98 AFB60030 */ sw $s6, 0x30($sp) +/* 95E09C 80242E9C AFB5002C */ sw $s5, 0x2c($sp) +/* 95E0A0 80242EA0 AFB40028 */ sw $s4, 0x28($sp) +/* 95E0A4 80242EA4 AFB30024 */ sw $s3, 0x24($sp) +/* 95E0A8 80242EA8 AFB20020 */ sw $s2, 0x20($sp) +/* 95E0AC 80242EAC AFB00018 */ sw $s0, 0x18($sp) +/* 95E0B0 80242EB0 F7B60040 */ sdc1 $f22, 0x40($sp) +/* 95E0B4 80242EB4 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 95E0B8 80242EB8 8E30000C */ lw $s0, 0xc($s1) +/* 95E0BC 80242EBC 8E160000 */ lw $s6, ($s0) +/* 95E0C0 80242EC0 26100004 */ addiu $s0, $s0, 4 +/* 95E0C4 80242EC4 0C0B1EAF */ jal get_variable +/* 95E0C8 80242EC8 02C0282D */ daddu $a1, $s6, $zero +/* 95E0CC 80242ECC 44820000 */ mtc1 $v0, $f0 +/* 95E0D0 80242ED0 00000000 */ nop +/* 95E0D4 80242ED4 46800020 */ cvt.s.w $f0, $f0 +/* 95E0D8 80242ED8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 95E0DC 80242EDC 8E140000 */ lw $s4, ($s0) +/* 95E0E0 80242EE0 26100004 */ addiu $s0, $s0, 4 +/* 95E0E4 80242EE4 0220202D */ daddu $a0, $s1, $zero +/* 95E0E8 80242EE8 0C0B1EAF */ jal get_variable +/* 95E0EC 80242EEC 0280282D */ daddu $a1, $s4, $zero +/* 95E0F0 80242EF0 0220202D */ daddu $a0, $s1, $zero +/* 95E0F4 80242EF4 8E150000 */ lw $s5, ($s0) +/* 95E0F8 80242EF8 4482B000 */ mtc1 $v0, $f22 +/* 95E0FC 80242EFC 00000000 */ nop +/* 95E100 80242F00 4680B5A0 */ cvt.s.w $f22, $f22 +/* 95E104 80242F04 0C0B1EAF */ jal get_variable +/* 95E108 80242F08 02A0282D */ daddu $a1, $s5, $zero +/* 95E10C 80242F0C 2404FFFC */ addiu $a0, $zero, -4 +/* 95E110 80242F10 44820000 */ mtc1 $v0, $f0 +/* 95E114 80242F14 00000000 */ nop +/* 95E118 80242F18 46800020 */ cvt.s.w $f0, $f0 +/* 95E11C 80242F1C 0C00EABB */ jal get_npc_unsafe +/* 95E120 80242F20 E7A00014 */ swc1 $f0, 0x14($sp) +/* 95E124 80242F24 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 95E128 80242F28 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 95E12C 80242F2C 3C014334 */ lui $at, 0x4334 +/* 95E130 80242F30 44816000 */ mtc1 $at, $f12 +/* 95E134 80242F34 00041880 */ sll $v1, $a0, 2 +/* 95E138 80242F38 00641821 */ addu $v1, $v1, $a0 +/* 95E13C 80242F3C 00031880 */ sll $v1, $v1, 2 +/* 95E140 80242F40 00641823 */ subu $v1, $v1, $a0 +/* 95E144 80242F44 000320C0 */ sll $a0, $v1, 3 +/* 95E148 80242F48 00641821 */ addu $v1, $v1, $a0 +/* 95E14C 80242F4C 000318C0 */ sll $v1, $v1, 3 +/* 95E150 80242F50 3C01800B */ lui $at, 0x800b +/* 95E154 80242F54 00230821 */ addu $at, $at, $v1 +/* 95E158 80242F58 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 95E15C 80242F5C 460C0300 */ add.s $f12, $f0, $f12 +/* 95E160 80242F60 0C00A6C9 */ jal clamp_angle +/* 95E164 80242F64 0040982D */ daddu $s3, $v0, $zero +/* 95E168 80242F68 27B00010 */ addiu $s0, $sp, 0x10 +/* 95E16C 80242F6C 0200202D */ daddu $a0, $s0, $zero +/* 95E170 80242F70 27B20014 */ addiu $s2, $sp, 0x14 +/* 95E174 80242F74 0240282D */ daddu $a1, $s2, $zero +/* 95E178 80242F78 3C064170 */ lui $a2, 0x4170 +/* 95E17C 80242F7C 8E67000C */ lw $a3, 0xc($s3) +/* 95E180 80242F80 0C00A7E7 */ jal add_vec2D_polar +/* 95E184 80242F84 46000506 */ mov.s $f20, $f0 +/* 95E188 80242F88 0200202D */ daddu $a0, $s0, $zero +/* 95E18C 80242F8C 3C064120 */ lui $a2, 0x4120 +/* 95E190 80242F90 4407A000 */ mfc1 $a3, $f20 +/* 95E194 80242F94 0C00A7E7 */ jal add_vec2D_polar +/* 95E198 80242F98 0240282D */ daddu $a1, $s2, $zero +/* 95E19C 80242F9C 0220202D */ daddu $a0, $s1, $zero +/* 95E1A0 80242FA0 C7A00010 */ lwc1 $f0, 0x10($sp) +/* 95E1A4 80242FA4 4600008D */ trunc.w.s $f2, $f0 +/* 95E1A8 80242FA8 44061000 */ mfc1 $a2, $f2 +/* 95E1AC 80242FAC 0C0B2026 */ jal set_variable +/* 95E1B0 80242FB0 02C0282D */ daddu $a1, $s6, $zero +/* 95E1B4 80242FB4 0220202D */ daddu $a0, $s1, $zero +/* 95E1B8 80242FB8 4600B08D */ trunc.w.s $f2, $f22 +/* 95E1BC 80242FBC 44061000 */ mfc1 $a2, $f2 +/* 95E1C0 80242FC0 0C0B2026 */ jal set_variable +/* 95E1C4 80242FC4 0280282D */ daddu $a1, $s4, $zero +/* 95E1C8 80242FC8 0220202D */ daddu $a0, $s1, $zero +/* 95E1CC 80242FCC C7A00014 */ lwc1 $f0, 0x14($sp) +/* 95E1D0 80242FD0 4600008D */ trunc.w.s $f2, $f0 +/* 95E1D4 80242FD4 44061000 */ mfc1 $a2, $f2 +/* 95E1D8 80242FD8 0C0B2026 */ jal set_variable +/* 95E1DC 80242FDC 02A0282D */ daddu $a1, $s5, $zero +/* 95E1E0 80242FE0 8FBF0034 */ lw $ra, 0x34($sp) +/* 95E1E4 80242FE4 8FB60030 */ lw $s6, 0x30($sp) +/* 95E1E8 80242FE8 8FB5002C */ lw $s5, 0x2c($sp) +/* 95E1EC 80242FEC 8FB40028 */ lw $s4, 0x28($sp) +/* 95E1F0 80242FF0 8FB30024 */ lw $s3, 0x24($sp) +/* 95E1F4 80242FF4 8FB20020 */ lw $s2, 0x20($sp) +/* 95E1F8 80242FF8 8FB1001C */ lw $s1, 0x1c($sp) +/* 95E1FC 80242FFC 8FB00018 */ lw $s0, 0x18($sp) +/* 95E200 80243000 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 95E204 80243004 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 95E208 80243008 24020002 */ addiu $v0, $zero, 2 +/* 95E20C 8024300C 03E00008 */ jr $ra +/* 95E210 80243010 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014.s deleted file mode 100644 index 780f6f224b..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243014 -/* 95E214 80243014 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95E218 80243018 AFB00010 */ sw $s0, 0x10($sp) -/* 95E21C 8024301C 0080802D */ daddu $s0, $a0, $zero -/* 95E220 80243020 AFBF0014 */ sw $ra, 0x14($sp) -/* 95E224 80243024 0C00EABB */ jal get_npc_unsafe -/* 95E228 80243028 8E04008C */ lw $a0, 0x8c($s0) -/* 95E22C 8024302C 0040282D */ daddu $a1, $v0, $zero -/* 95E230 80243030 8E040094 */ lw $a0, 0x94($s0) -/* 95E234 80243034 8CA30028 */ lw $v1, 0x28($a1) -/* 95E238 80243038 ACA40028 */ sw $a0, 0x28($a1) -/* 95E23C 8024303C 8FBF0014 */ lw $ra, 0x14($sp) -/* 95E240 80243040 8FB00010 */ lw $s0, 0x10($sp) -/* 95E244 80243044 24020002 */ addiu $v0, $zero, 2 -/* 95E248 80243048 3C018025 */ lui $at, 0x8025 -/* 95E24C 8024304C AC23E1B4 */ sw $v1, -0x1e4c($at) -/* 95E250 80243050 03E00008 */ jr $ra -/* 95E254 80243054 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s new file mode 100644 index 0000000000..1d30825e33 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243014_95E214.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243014_95E214 +/* 95E214 80243014 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95E218 80243018 AFB00010 */ sw $s0, 0x10($sp) +/* 95E21C 8024301C 0080802D */ daddu $s0, $a0, $zero +/* 95E220 80243020 AFBF0014 */ sw $ra, 0x14($sp) +/* 95E224 80243024 0C00EABB */ jal get_npc_unsafe +/* 95E228 80243028 8E04008C */ lw $a0, 0x8c($s0) +/* 95E22C 8024302C 0040282D */ daddu $a1, $v0, $zero +/* 95E230 80243030 8E040094 */ lw $a0, 0x94($s0) +/* 95E234 80243034 8CA30028 */ lw $v1, 0x28($a1) +/* 95E238 80243038 ACA40028 */ sw $a0, 0x28($a1) +/* 95E23C 8024303C 8FBF0014 */ lw $ra, 0x14($sp) +/* 95E240 80243040 8FB00010 */ lw $s0, 0x10($sp) +/* 95E244 80243044 24020002 */ addiu $v0, $zero, 2 +/* 95E248 80243048 3C018025 */ lui $at, 0x8025 +/* 95E24C 8024304C AC23E1B4 */ sw $v1, -0x1e4c($at) +/* 95E250 80243050 03E00008 */ jr $ra +/* 95E254 80243054 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058.s deleted file mode 100644 index 628d74e433..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243058 -/* 95E258 80243058 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95E25C 8024305C AFBF0010 */ sw $ra, 0x10($sp) -/* 95E260 80243060 0C00EABB */ jal get_npc_unsafe -/* 95E264 80243064 8C84008C */ lw $a0, 0x8c($a0) -/* 95E268 80243068 3C038025 */ lui $v1, 0x8025 -/* 95E26C 8024306C 8C63E1B4 */ lw $v1, -0x1e4c($v1) -/* 95E270 80243070 AC430028 */ sw $v1, 0x28($v0) -/* 95E274 80243074 8FBF0010 */ lw $ra, 0x10($sp) -/* 95E278 80243078 24020002 */ addiu $v0, $zero, 2 -/* 95E27C 8024307C 03E00008 */ jr $ra -/* 95E280 80243080 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s new file mode 100644 index 0000000000..57fb6840b6 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243058_95E258.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243058_95E258 +/* 95E258 80243058 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95E25C 8024305C AFBF0010 */ sw $ra, 0x10($sp) +/* 95E260 80243060 0C00EABB */ jal get_npc_unsafe +/* 95E264 80243064 8C84008C */ lw $a0, 0x8c($a0) +/* 95E268 80243068 3C038025 */ lui $v1, 0x8025 +/* 95E26C 8024306C 8C63E1B4 */ lw $v1, -0x1e4c($v1) +/* 95E270 80243070 AC430028 */ sw $v1, 0x28($v0) +/* 95E274 80243074 8FBF0010 */ lw $ra, 0x10($sp) +/* 95E278 80243078 24020002 */ addiu $v0, $zero, 2 +/* 95E27C 8024307C 03E00008 */ jr $ra +/* 95E280 80243080 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243084.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243084.s deleted file mode 100644 index 646210007a..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243084.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243084 -/* 95E284 80243084 3C038011 */ lui $v1, %hi(gPlayerData) -/* 95E288 80243088 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 95E28C 8024308C 8C6202BC */ lw $v0, 0x2bc($v1) -/* 95E290 80243090 AC620328 */ sw $v0, 0x328($v1) -/* 95E294 80243094 03E00008 */ jr $ra -/* 95E298 80243098 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243084_95E284.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243084_95E284.s new file mode 100644 index 0000000000..516bae8fa7 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243084_95E284.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243084_95E284 +/* 95E284 80243084 3C038011 */ lui $v1, %hi(gPlayerData) +/* 95E288 80243088 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 95E28C 8024308C 8C6202BC */ lw $v0, 0x2bc($v1) +/* 95E290 80243090 AC620328 */ sw $v0, 0x328($v1) +/* 95E294 80243094 03E00008 */ jr $ra +/* 95E298 80243098 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024309C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024309C.s deleted file mode 100644 index affacd5c34..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024309C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024309C -/* 95E29C 8024309C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95E2A0 802430A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 95E2A4 802430A4 8C82000C */ lw $v0, 0xc($a0) -/* 95E2A8 802430A8 3C068016 */ lui $a2, 0x8016 -/* 95E2AC 802430AC 84C6A552 */ lh $a2, -0x5aae($a2) -/* 95E2B0 802430B0 0C0B2026 */ jal set_variable -/* 95E2B4 802430B4 8C450000 */ lw $a1, ($v0) -/* 95E2B8 802430B8 8FBF0010 */ lw $ra, 0x10($sp) -/* 95E2BC 802430BC 24020002 */ addiu $v0, $zero, 2 -/* 95E2C0 802430C0 03E00008 */ jr $ra -/* 95E2C4 802430C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024309C_95E29C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024309C_95E29C.s new file mode 100644 index 0000000000..be117d4f7c --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024309C_95E29C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024309C_95E29C +/* 95E29C 8024309C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95E2A0 802430A0 AFBF0010 */ sw $ra, 0x10($sp) +/* 95E2A4 802430A4 8C82000C */ lw $v0, 0xc($a0) +/* 95E2A8 802430A8 3C068016 */ lui $a2, 0x8016 +/* 95E2AC 802430AC 84C6A552 */ lh $a2, -0x5aae($a2) +/* 95E2B0 802430B0 0C0B2026 */ jal set_variable +/* 95E2B4 802430B4 8C450000 */ lw $a1, ($v0) +/* 95E2B8 802430B8 8FBF0010 */ lw $ra, 0x10($sp) +/* 95E2BC 802430BC 24020002 */ addiu $v0, $zero, 2 +/* 95E2C0 802430C0 03E00008 */ jr $ra +/* 95E2C4 802430C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8.s deleted file mode 100644 index 10876cf3f5..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430C8 -/* 95E2C8 802430C8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 95E2CC 802430CC AFB10014 */ sw $s1, 0x14($sp) -/* 95E2D0 802430D0 AFB00010 */ sw $s0, 0x10($sp) -/* 95E2D4 802430D4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 95E2D8 802430D8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 95E2DC 802430DC 2CA20005 */ sltiu $v0, $a1, 5 -/* 95E2E0 802430E0 AFBF0018 */ sw $ra, 0x18($sp) -/* 95E2E4 802430E4 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 95E2E8 802430E8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95E2EC 802430EC 1040002A */ beqz $v0, .L80243198 -/* 95E2F0 802430F0 0080882D */ daddu $s1, $a0, $zero -/* 95E2F4 802430F4 00051080 */ sll $v0, $a1, 2 -/* 95E2F8 802430F8 3C018025 */ lui $at, 0x8025 -/* 95E2FC 802430FC 00220821 */ addu $at, $at, $v0 -/* 95E300 80243100 8C22DF98 */ lw $v0, -0x2068($at) -/* 95E304 80243104 00400008 */ jr $v0 -/* 95E308 80243108 00000000 */ nop -/* 95E30C 8024310C 8E22001C */ lw $v0, 0x1c($s1) -/* 95E310 80243110 28420006 */ slti $v0, $v0, 6 -/* 95E314 80243114 14400020 */ bnez $v0, .L80243198 -/* 95E318 80243118 00000000 */ nop -/* 95E31C 8024311C 3C064318 */ lui $a2, 0x4318 -/* 95E320 80243120 3C07C274 */ lui $a3, 0xc274 -/* 95E324 80243124 3C0142FA */ lui $at, 0x42fa -/* 95E328 80243128 4481A000 */ mtc1 $at, $f20 -/* 95E32C 8024312C 3C01C228 */ lui $at, 0xc228 -/* 95E330 80243130 4481B000 */ mtc1 $at, $f22 -/* 95E334 80243134 4600A306 */ mov.s $f12, $f20 -/* 95E338 80243138 0C00A720 */ jal atan2 -/* 95E33C 8024313C 4600B386 */ mov.s $f14, $f22 -/* 95E340 80243140 4600A306 */ mov.s $f12, $f20 -/* 95E344 80243144 4600B386 */ mov.s $f14, $f22 -/* 95E348 80243148 8E060028 */ lw $a2, 0x28($s0) -/* 95E34C 8024314C 8E070030 */ lw $a3, 0x30($s0) -/* 95E350 80243150 0C00A720 */ jal atan2 -/* 95E354 80243154 46000506 */ mov.s $f20, $f0 -/* 95E358 80243158 4600A306 */ mov.s $f12, $f20 -/* 95E35C 8024315C 0C00A70A */ jal get_clamped_angle_diff -/* 95E360 80243160 46000386 */ mov.s $f14, $f0 -/* 95E364 80243164 3C0141F0 */ lui $at, 0x41f0 -/* 95E368 80243168 44811000 */ mtc1 $at, $f2 -/* 95E36C 8024316C 46000005 */ abs.s $f0, $f0 -/* 95E370 80243170 4602003C */ c.lt.s $f0, $f2 -/* 95E374 80243174 00000000 */ nop -/* 95E378 80243178 45000007 */ bc1f .L80243198 -/* 95E37C 8024317C 0000302D */ daddu $a2, $zero, $zero -/* 95E380 80243180 3C048025 */ lui $a0, 0x8025 -/* 95E384 80243184 24848504 */ addiu $a0, $a0, -0x7afc -/* 95E388 80243188 0C0B0CF8 */ jal start_script -/* 95E38C 8024318C 24050001 */ addiu $a1, $zero, 1 -/* 95E390 80243190 24020004 */ addiu $v0, $zero, 4 -/* 95E394 80243194 AE220020 */ sw $v0, 0x20($s1) -.L80243198: -/* 95E398 80243198 8FBF0018 */ lw $ra, 0x18($sp) -/* 95E39C 8024319C 8FB10014 */ lw $s1, 0x14($sp) -/* 95E3A0 802431A0 8FB00010 */ lw $s0, 0x10($sp) -/* 95E3A4 802431A4 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 95E3A8 802431A8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 95E3AC 802431AC 03E00008 */ jr $ra -/* 95E3B0 802431B0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s new file mode 100644 index 0000000000..701cd35922 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802430C8_95E2C8.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802430C8_95E2C8 +/* 95E2C8 802430C8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 95E2CC 802430CC AFB10014 */ sw $s1, 0x14($sp) +/* 95E2D0 802430D0 AFB00010 */ sw $s0, 0x10($sp) +/* 95E2D4 802430D4 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* 95E2D8 802430D8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* 95E2DC 802430DC 2CA20005 */ sltiu $v0, $a1, 5 +/* 95E2E0 802430E0 AFBF0018 */ sw $ra, 0x18($sp) +/* 95E2E4 802430E4 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 95E2E8 802430E8 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 95E2EC 802430EC 1040002A */ beqz $v0, .L80243198 +/* 95E2F0 802430F0 0080882D */ daddu $s1, $a0, $zero +/* 95E2F4 802430F4 00051080 */ sll $v0, $a1, 2 +/* 95E2F8 802430F8 3C018025 */ lui $at, 0x8025 +/* 95E2FC 802430FC 00220821 */ addu $at, $at, $v0 +/* 95E300 80243100 8C22DF98 */ lw $v0, -0x2068($at) +/* 95E304 80243104 00400008 */ jr $v0 +/* 95E308 80243108 00000000 */ nop +/* 95E30C 8024310C 8E22001C */ lw $v0, 0x1c($s1) +/* 95E310 80243110 28420006 */ slti $v0, $v0, 6 +/* 95E314 80243114 14400020 */ bnez $v0, .L80243198 +/* 95E318 80243118 00000000 */ nop +/* 95E31C 8024311C 3C064318 */ lui $a2, 0x4318 +/* 95E320 80243120 3C07C274 */ lui $a3, 0xc274 +/* 95E324 80243124 3C0142FA */ lui $at, 0x42fa +/* 95E328 80243128 4481A000 */ mtc1 $at, $f20 +/* 95E32C 8024312C 3C01C228 */ lui $at, 0xc228 +/* 95E330 80243130 4481B000 */ mtc1 $at, $f22 +/* 95E334 80243134 4600A306 */ mov.s $f12, $f20 +/* 95E338 80243138 0C00A720 */ jal atan2 +/* 95E33C 8024313C 4600B386 */ mov.s $f14, $f22 +/* 95E340 80243140 4600A306 */ mov.s $f12, $f20 +/* 95E344 80243144 4600B386 */ mov.s $f14, $f22 +/* 95E348 80243148 8E060028 */ lw $a2, 0x28($s0) +/* 95E34C 8024314C 8E070030 */ lw $a3, 0x30($s0) +/* 95E350 80243150 0C00A720 */ jal atan2 +/* 95E354 80243154 46000506 */ mov.s $f20, $f0 +/* 95E358 80243158 4600A306 */ mov.s $f12, $f20 +/* 95E35C 8024315C 0C00A70A */ jal get_clamped_angle_diff +/* 95E360 80243160 46000386 */ mov.s $f14, $f0 +/* 95E364 80243164 3C0141F0 */ lui $at, 0x41f0 +/* 95E368 80243168 44811000 */ mtc1 $at, $f2 +/* 95E36C 8024316C 46000005 */ abs.s $f0, $f0 +/* 95E370 80243170 4602003C */ c.lt.s $f0, $f2 +/* 95E374 80243174 00000000 */ nop +/* 95E378 80243178 45000007 */ bc1f .L80243198 +/* 95E37C 8024317C 0000302D */ daddu $a2, $zero, $zero +/* 95E380 80243180 3C048025 */ lui $a0, 0x8025 +/* 95E384 80243184 24848504 */ addiu $a0, $a0, -0x7afc +/* 95E388 80243188 0C0B0CF8 */ jal start_script +/* 95E38C 8024318C 24050001 */ addiu $a1, $zero, 1 +/* 95E390 80243190 24020004 */ addiu $v0, $zero, 4 +/* 95E394 80243194 AE220020 */ sw $v0, 0x20($s1) +.L80243198: +/* 95E398 80243198 8FBF0018 */ lw $ra, 0x18($sp) +/* 95E39C 8024319C 8FB10014 */ lw $s1, 0x14($sp) +/* 95E3A0 802431A0 8FB00010 */ lw $s0, 0x10($sp) +/* 95E3A4 802431A4 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 95E3A8 802431A8 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 95E3AC 802431AC 03E00008 */ jr $ra +/* 95E3B0 802431B0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC.s deleted file mode 100644 index 99e299a450..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431FC -/* 95E3FC 802431FC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 95E400 80243200 AFB10014 */ sw $s1, 0x14($sp) -/* 95E404 80243204 0080882D */ daddu $s1, $a0, $zero -/* 95E408 80243208 AFBF0018 */ sw $ra, 0x18($sp) -/* 95E40C 8024320C AFB00010 */ sw $s0, 0x10($sp) -/* 95E410 80243210 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 95E414 80243214 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 95E418 80243218 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95E41C 8024321C 0C00EAD2 */ jal get_npc_safe -/* 95E420 80243220 8E24014C */ lw $a0, 0x14c($s1) -/* 95E424 80243224 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 95E428 80243228 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 95E42C 8024322C 0040802D */ daddu $s0, $v0, $zero -/* 95E430 80243230 3C014337 */ lui $at, 0x4337 -/* 95E434 80243234 4481A000 */ mtc1 $at, $f20 -/* 95E438 80243238 3C01C296 */ lui $at, 0xc296 -/* 95E43C 8024323C 4481B000 */ mtc1 $at, $f22 -/* 95E440 80243240 8C660028 */ lw $a2, 0x28($v1) -/* 95E444 80243244 8C670030 */ lw $a3, 0x30($v1) -/* 95E448 80243248 4600A306 */ mov.s $f12, $f20 -/* 95E44C 8024324C 0C00A720 */ jal atan2 -/* 95E450 80243250 4600B386 */ mov.s $f14, $f22 -/* 95E454 80243254 46000606 */ mov.s $f24, $f0 -/* 95E458 80243258 4600A306 */ mov.s $f12, $f20 -/* 95E45C 8024325C 8E060038 */ lw $a2, 0x38($s0) -/* 95E460 80243260 8E070040 */ lw $a3, 0x40($s0) -/* 95E464 80243264 0C00A720 */ jal atan2 -/* 95E468 80243268 4600B386 */ mov.s $f14, $f22 -/* 95E46C 8024326C 46000586 */ mov.s $f22, $f0 -/* 95E470 80243270 4600B306 */ mov.s $f12, $f22 -/* 95E474 80243274 0C00A70A */ jal get_clamped_angle_diff -/* 95E478 80243278 4600C386 */ mov.s $f14, $f24 -/* 95E47C 8024327C 46000606 */ mov.s $f24, $f0 -/* 95E480 80243280 0C00A67F */ jal rand_int -/* 95E484 80243284 2404000A */ addiu $a0, $zero, 0xa -/* 95E488 80243288 44800000 */ mtc1 $zero, $f0 -/* 95E48C 8024328C 00000000 */ nop -/* 95E490 80243290 4600C03C */ c.lt.s $f24, $f0 -/* 95E494 80243294 00000000 */ nop -/* 95E498 80243298 45000006 */ bc1f .L802432B4 -/* 95E49C 8024329C 2450001E */ addiu $s0, $v0, 0x1e -/* 95E4A0 802432A0 44900000 */ mtc1 $s0, $f0 -/* 95E4A4 802432A4 00000000 */ nop -/* 95E4A8 802432A8 46800020 */ cvt.s.w $f0, $f0 -/* 95E4AC 802432AC 08090CB1 */ j .L802432C4 -/* 95E4B0 802432B0 4600B580 */ add.s $f22, $f22, $f0 -.L802432B4: -/* 95E4B4 802432B4 44900000 */ mtc1 $s0, $f0 -/* 95E4B8 802432B8 00000000 */ nop -/* 95E4BC 802432BC 46800020 */ cvt.s.w $f0, $f0 -/* 95E4C0 802432C0 4600B581 */ sub.s $f22, $f22, $f0 -.L802432C4: -/* 95E4C4 802432C4 0C00A67F */ jal rand_int -/* 95E4C8 802432C8 24040014 */ addiu $a0, $zero, 0x14 -/* 95E4CC 802432CC 2450001E */ addiu $s0, $v0, 0x1e -/* 95E4D0 802432D0 0C00A8BB */ jal sin_deg -/* 95E4D4 802432D4 4600B306 */ mov.s $f12, $f22 -/* 95E4D8 802432D8 4490A000 */ mtc1 $s0, $f20 -/* 95E4DC 802432DC 00000000 */ nop -/* 95E4E0 802432E0 4680A520 */ cvt.s.w $f20, $f20 -/* 95E4E4 802432E4 46140002 */ mul.s $f0, $f0, $f20 -/* 95E4E8 802432E8 00000000 */ nop -/* 95E4EC 802432EC 3C014337 */ lui $at, 0x4337 -/* 95E4F0 802432F0 44811000 */ mtc1 $at, $f2 -/* 95E4F4 802432F4 00000000 */ nop -/* 95E4F8 802432F8 46020000 */ add.s $f0, $f0, $f2 -/* 95E4FC 802432FC 4600010D */ trunc.w.s $f4, $f0 -/* 95E500 80243300 E6240084 */ swc1 $f4, 0x84($s1) -/* 95E504 80243304 0C00A8D4 */ jal cos_deg -/* 95E508 80243308 4600B306 */ mov.s $f12, $f22 -/* 95E50C 8024330C 46140002 */ mul.s $f0, $f0, $f20 -/* 95E510 80243310 00000000 */ nop -/* 95E514 80243314 3C01C296 */ lui $at, 0xc296 -/* 95E518 80243318 44811000 */ mtc1 $at, $f2 -/* 95E51C 8024331C 00000000 */ nop -/* 95E520 80243320 46001081 */ sub.s $f2, $f2, $f0 -/* 95E524 80243324 4600110D */ trunc.w.s $f4, $f2 -/* 95E528 80243328 E6240088 */ swc1 $f4, 0x88($s1) -/* 95E52C 8024332C 8FBF0018 */ lw $ra, 0x18($sp) -/* 95E530 80243330 8FB10014 */ lw $s1, 0x14($sp) -/* 95E534 80243334 8FB00010 */ lw $s0, 0x10($sp) -/* 95E538 80243338 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 95E53C 8024333C D7B60028 */ ldc1 $f22, 0x28($sp) -/* 95E540 80243340 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 95E544 80243344 24020002 */ addiu $v0, $zero, 2 -/* 95E548 80243348 03E00008 */ jr $ra -/* 95E54C 8024334C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s new file mode 100644 index 0000000000..f2e4e9a280 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802431FC_95E3FC.s @@ -0,0 +1,91 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802431FC_95E3FC +/* 95E3FC 802431FC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 95E400 80243200 AFB10014 */ sw $s1, 0x14($sp) +/* 95E404 80243204 0080882D */ daddu $s1, $a0, $zero +/* 95E408 80243208 AFBF0018 */ sw $ra, 0x18($sp) +/* 95E40C 8024320C AFB00010 */ sw $s0, 0x10($sp) +/* 95E410 80243210 F7B80030 */ sdc1 $f24, 0x30($sp) +/* 95E414 80243214 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 95E418 80243218 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 95E41C 8024321C 0C00EAD2 */ jal get_npc_safe +/* 95E420 80243220 8E24014C */ lw $a0, 0x14c($s1) +/* 95E424 80243224 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 95E428 80243228 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 95E42C 8024322C 0040802D */ daddu $s0, $v0, $zero +/* 95E430 80243230 3C014337 */ lui $at, 0x4337 +/* 95E434 80243234 4481A000 */ mtc1 $at, $f20 +/* 95E438 80243238 3C01C296 */ lui $at, 0xc296 +/* 95E43C 8024323C 4481B000 */ mtc1 $at, $f22 +/* 95E440 80243240 8C660028 */ lw $a2, 0x28($v1) +/* 95E444 80243244 8C670030 */ lw $a3, 0x30($v1) +/* 95E448 80243248 4600A306 */ mov.s $f12, $f20 +/* 95E44C 8024324C 0C00A720 */ jal atan2 +/* 95E450 80243250 4600B386 */ mov.s $f14, $f22 +/* 95E454 80243254 46000606 */ mov.s $f24, $f0 +/* 95E458 80243258 4600A306 */ mov.s $f12, $f20 +/* 95E45C 8024325C 8E060038 */ lw $a2, 0x38($s0) +/* 95E460 80243260 8E070040 */ lw $a3, 0x40($s0) +/* 95E464 80243264 0C00A720 */ jal atan2 +/* 95E468 80243268 4600B386 */ mov.s $f14, $f22 +/* 95E46C 8024326C 46000586 */ mov.s $f22, $f0 +/* 95E470 80243270 4600B306 */ mov.s $f12, $f22 +/* 95E474 80243274 0C00A70A */ jal get_clamped_angle_diff +/* 95E478 80243278 4600C386 */ mov.s $f14, $f24 +/* 95E47C 8024327C 46000606 */ mov.s $f24, $f0 +/* 95E480 80243280 0C00A67F */ jal rand_int +/* 95E484 80243284 2404000A */ addiu $a0, $zero, 0xa +/* 95E488 80243288 44800000 */ mtc1 $zero, $f0 +/* 95E48C 8024328C 00000000 */ nop +/* 95E490 80243290 4600C03C */ c.lt.s $f24, $f0 +/* 95E494 80243294 00000000 */ nop +/* 95E498 80243298 45000006 */ bc1f .L802432B4 +/* 95E49C 8024329C 2450001E */ addiu $s0, $v0, 0x1e +/* 95E4A0 802432A0 44900000 */ mtc1 $s0, $f0 +/* 95E4A4 802432A4 00000000 */ nop +/* 95E4A8 802432A8 46800020 */ cvt.s.w $f0, $f0 +/* 95E4AC 802432AC 08090CB1 */ j .L802432C4 +/* 95E4B0 802432B0 4600B580 */ add.s $f22, $f22, $f0 +.L802432B4: +/* 95E4B4 802432B4 44900000 */ mtc1 $s0, $f0 +/* 95E4B8 802432B8 00000000 */ nop +/* 95E4BC 802432BC 46800020 */ cvt.s.w $f0, $f0 +/* 95E4C0 802432C0 4600B581 */ sub.s $f22, $f22, $f0 +.L802432C4: +/* 95E4C4 802432C4 0C00A67F */ jal rand_int +/* 95E4C8 802432C8 24040014 */ addiu $a0, $zero, 0x14 +/* 95E4CC 802432CC 2450001E */ addiu $s0, $v0, 0x1e +/* 95E4D0 802432D0 0C00A8BB */ jal sin_deg +/* 95E4D4 802432D4 4600B306 */ mov.s $f12, $f22 +/* 95E4D8 802432D8 4490A000 */ mtc1 $s0, $f20 +/* 95E4DC 802432DC 00000000 */ nop +/* 95E4E0 802432E0 4680A520 */ cvt.s.w $f20, $f20 +/* 95E4E4 802432E4 46140002 */ mul.s $f0, $f0, $f20 +/* 95E4E8 802432E8 00000000 */ nop +/* 95E4EC 802432EC 3C014337 */ lui $at, 0x4337 +/* 95E4F0 802432F0 44811000 */ mtc1 $at, $f2 +/* 95E4F4 802432F4 00000000 */ nop +/* 95E4F8 802432F8 46020000 */ add.s $f0, $f0, $f2 +/* 95E4FC 802432FC 4600010D */ trunc.w.s $f4, $f0 +/* 95E500 80243300 E6240084 */ swc1 $f4, 0x84($s1) +/* 95E504 80243304 0C00A8D4 */ jal cos_deg +/* 95E508 80243308 4600B306 */ mov.s $f12, $f22 +/* 95E50C 8024330C 46140002 */ mul.s $f0, $f0, $f20 +/* 95E510 80243310 00000000 */ nop +/* 95E514 80243314 3C01C296 */ lui $at, 0xc296 +/* 95E518 80243318 44811000 */ mtc1 $at, $f2 +/* 95E51C 8024331C 00000000 */ nop +/* 95E520 80243320 46001081 */ sub.s $f2, $f2, $f0 +/* 95E524 80243324 4600110D */ trunc.w.s $f4, $f2 +/* 95E528 80243328 E6240088 */ swc1 $f4, 0x88($s1) +/* 95E52C 8024332C 8FBF0018 */ lw $ra, 0x18($sp) +/* 95E530 80243330 8FB10014 */ lw $s1, 0x14($sp) +/* 95E534 80243334 8FB00010 */ lw $s0, 0x10($sp) +/* 95E538 80243338 D7B80030 */ ldc1 $f24, 0x30($sp) +/* 95E53C 8024333C D7B60028 */ ldc1 $f22, 0x28($sp) +/* 95E540 80243340 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 95E544 80243344 24020002 */ addiu $v0, $zero, 2 +/* 95E548 80243348 03E00008 */ jr $ra +/* 95E54C 8024334C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350.s deleted file mode 100644 index 6efdd28820..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350.s +++ /dev/null @@ -1,74 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243350 -/* 95E550 80243350 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 95E554 80243354 AFB10014 */ sw $s1, 0x14($sp) -/* 95E558 80243358 0080882D */ daddu $s1, $a0, $zero -/* 95E55C 8024335C AFBF0018 */ sw $ra, 0x18($sp) -/* 95E560 80243360 AFB00010 */ sw $s0, 0x10($sp) -/* 95E564 80243364 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 95E568 80243368 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 95E56C 8024336C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95E570 80243370 8E30000C */ lw $s0, 0xc($s1) -/* 95E574 80243374 8E050000 */ lw $a1, ($s0) -/* 95E578 80243378 0C0B1EAF */ jal get_variable -/* 95E57C 8024337C 26100004 */ addiu $s0, $s0, 4 -/* 95E580 80243380 8E050000 */ lw $a1, ($s0) -/* 95E584 80243384 26100004 */ addiu $s0, $s0, 4 -/* 95E588 80243388 4482C000 */ mtc1 $v0, $f24 -/* 95E58C 8024338C 00000000 */ nop -/* 95E590 80243390 4680C620 */ cvt.s.w $f24, $f24 -/* 95E594 80243394 0C0B1EAF */ jal get_variable -/* 95E598 80243398 0220202D */ daddu $a0, $s1, $zero -/* 95E59C 8024339C 8E050000 */ lw $a1, ($s0) -/* 95E5A0 802433A0 26100004 */ addiu $s0, $s0, 4 -/* 95E5A4 802433A4 4482B000 */ mtc1 $v0, $f22 -/* 95E5A8 802433A8 00000000 */ nop -/* 95E5AC 802433AC 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95E5B0 802433B0 0C0B1EAF */ jal get_variable -/* 95E5B4 802433B4 0220202D */ daddu $a0, $s1, $zero -/* 95E5B8 802433B8 8E050000 */ lw $a1, ($s0) -/* 95E5BC 802433BC 4482A000 */ mtc1 $v0, $f20 -/* 95E5C0 802433C0 00000000 */ nop -/* 95E5C4 802433C4 4680A520 */ cvt.s.w $f20, $f20 -/* 95E5C8 802433C8 0C0B1EAF */ jal get_variable -/* 95E5CC 802433CC 0220202D */ daddu $a0, $s1, $zero -/* 95E5D0 802433D0 44820000 */ mtc1 $v0, $f0 -/* 95E5D4 802433D4 00000000 */ nop -/* 95E5D8 802433D8 46800020 */ cvt.s.w $f0, $f0 -/* 95E5DC 802433DC 46160001 */ sub.s $f0, $f0, $f22 -/* 95E5E0 802433E0 4618A501 */ sub.s $f20, $f20, $f24 -/* 95E5E4 802433E4 46140003 */ div.s $f0, $f0, $f20 -/* 95E5E8 802433E8 46180602 */ mul.s $f24, $f0, $f24 -/* 95E5EC 802433EC 00000000 */ nop -/* 95E5F0 802433F0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 95E5F4 802433F4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 95E5F8 802433F8 C4420028 */ lwc1 $f2, 0x28($v0) -/* 95E5FC 802433FC 46020002 */ mul.s $f0, $f0, $f2 -/* 95E600 80243400 00000000 */ nop -/* 95E604 80243404 4618B581 */ sub.s $f22, $f22, $f24 -/* 95E608 80243408 46160000 */ add.s $f0, $f0, $f22 -/* 95E60C 8024340C C4420030 */ lwc1 $f2, 0x30($v0) -/* 95E610 80243410 4600103C */ c.lt.s $f2, $f0 -/* 95E614 80243414 00000000 */ nop -/* 95E618 80243418 45030005 */ bc1tl .L80243430 -/* 95E61C 8024341C AE200084 */ sw $zero, 0x84($s1) -/* 95E620 80243420 24020001 */ addiu $v0, $zero, 1 -/* 95E624 80243424 AE220084 */ sw $v0, 0x84($s1) -/* 95E628 80243428 08090D0D */ j .L80243434 -/* 95E62C 8024342C 0000102D */ daddu $v0, $zero, $zero -.L80243430: -/* 95E630 80243430 24020002 */ addiu $v0, $zero, 2 -.L80243434: -/* 95E634 80243434 8FBF0018 */ lw $ra, 0x18($sp) -/* 95E638 80243438 8FB10014 */ lw $s1, 0x14($sp) -/* 95E63C 8024343C 8FB00010 */ lw $s0, 0x10($sp) -/* 95E640 80243440 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 95E644 80243444 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 95E648 80243448 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 95E64C 8024344C 03E00008 */ jr $ra -/* 95E650 80243450 27BD0038 */ addiu $sp, $sp, 0x38 -/* 95E654 80243454 00000000 */ nop -/* 95E658 80243458 00000000 */ nop -/* 95E65C 8024345C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s new file mode 100644 index 0000000000..711dfcde01 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80243350_95E550.s @@ -0,0 +1,74 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243350_95E550 +/* 95E550 80243350 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 95E554 80243354 AFB10014 */ sw $s1, 0x14($sp) +/* 95E558 80243358 0080882D */ daddu $s1, $a0, $zero +/* 95E55C 8024335C AFBF0018 */ sw $ra, 0x18($sp) +/* 95E560 80243360 AFB00010 */ sw $s0, 0x10($sp) +/* 95E564 80243364 F7B80030 */ sdc1 $f24, 0x30($sp) +/* 95E568 80243368 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 95E56C 8024336C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 95E570 80243370 8E30000C */ lw $s0, 0xc($s1) +/* 95E574 80243374 8E050000 */ lw $a1, ($s0) +/* 95E578 80243378 0C0B1EAF */ jal get_variable +/* 95E57C 8024337C 26100004 */ addiu $s0, $s0, 4 +/* 95E580 80243380 8E050000 */ lw $a1, ($s0) +/* 95E584 80243384 26100004 */ addiu $s0, $s0, 4 +/* 95E588 80243388 4482C000 */ mtc1 $v0, $f24 +/* 95E58C 8024338C 00000000 */ nop +/* 95E590 80243390 4680C620 */ cvt.s.w $f24, $f24 +/* 95E594 80243394 0C0B1EAF */ jal get_variable +/* 95E598 80243398 0220202D */ daddu $a0, $s1, $zero +/* 95E59C 8024339C 8E050000 */ lw $a1, ($s0) +/* 95E5A0 802433A0 26100004 */ addiu $s0, $s0, 4 +/* 95E5A4 802433A4 4482B000 */ mtc1 $v0, $f22 +/* 95E5A8 802433A8 00000000 */ nop +/* 95E5AC 802433AC 4680B5A0 */ cvt.s.w $f22, $f22 +/* 95E5B0 802433B0 0C0B1EAF */ jal get_variable +/* 95E5B4 802433B4 0220202D */ daddu $a0, $s1, $zero +/* 95E5B8 802433B8 8E050000 */ lw $a1, ($s0) +/* 95E5BC 802433BC 4482A000 */ mtc1 $v0, $f20 +/* 95E5C0 802433C0 00000000 */ nop +/* 95E5C4 802433C4 4680A520 */ cvt.s.w $f20, $f20 +/* 95E5C8 802433C8 0C0B1EAF */ jal get_variable +/* 95E5CC 802433CC 0220202D */ daddu $a0, $s1, $zero +/* 95E5D0 802433D0 44820000 */ mtc1 $v0, $f0 +/* 95E5D4 802433D4 00000000 */ nop +/* 95E5D8 802433D8 46800020 */ cvt.s.w $f0, $f0 +/* 95E5DC 802433DC 46160001 */ sub.s $f0, $f0, $f22 +/* 95E5E0 802433E0 4618A501 */ sub.s $f20, $f20, $f24 +/* 95E5E4 802433E4 46140003 */ div.s $f0, $f0, $f20 +/* 95E5E8 802433E8 46180602 */ mul.s $f24, $f0, $f24 +/* 95E5EC 802433EC 00000000 */ nop +/* 95E5F0 802433F0 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 95E5F4 802433F4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 95E5F8 802433F8 C4420028 */ lwc1 $f2, 0x28($v0) +/* 95E5FC 802433FC 46020002 */ mul.s $f0, $f0, $f2 +/* 95E600 80243400 00000000 */ nop +/* 95E604 80243404 4618B581 */ sub.s $f22, $f22, $f24 +/* 95E608 80243408 46160000 */ add.s $f0, $f0, $f22 +/* 95E60C 8024340C C4420030 */ lwc1 $f2, 0x30($v0) +/* 95E610 80243410 4600103C */ c.lt.s $f2, $f0 +/* 95E614 80243414 00000000 */ nop +/* 95E618 80243418 45030005 */ bc1tl .L80243430 +/* 95E61C 8024341C AE200084 */ sw $zero, 0x84($s1) +/* 95E620 80243420 24020001 */ addiu $v0, $zero, 1 +/* 95E624 80243424 AE220084 */ sw $v0, 0x84($s1) +/* 95E628 80243428 08090D0D */ j .L80243434 +/* 95E62C 8024342C 0000102D */ daddu $v0, $zero, $zero +.L80243430: +/* 95E630 80243430 24020002 */ addiu $v0, $zero, 2 +.L80243434: +/* 95E634 80243434 8FBF0018 */ lw $ra, 0x18($sp) +/* 95E638 80243438 8FB10014 */ lw $s1, 0x14($sp) +/* 95E63C 8024343C 8FB00010 */ lw $s0, 0x10($sp) +/* 95E640 80243440 D7B80030 */ ldc1 $f24, 0x30($sp) +/* 95E644 80243444 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 95E648 80243448 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 95E64C 8024344C 03E00008 */ jr $ra +/* 95E650 80243450 27BD0038 */ addiu $sp, $sp, 0x38 +/* 95E654 80243454 00000000 */ nop +/* 95E658 80243458 00000000 */ nop +/* 95E65C 8024345C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460.s b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460.s deleted file mode 100644 index 3384e3752d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243460 -/* 95E660 80243460 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95E664 80243464 AFB00010 */ sw $s0, 0x10($sp) -/* 95E668 80243468 3C108025 */ lui $s0, 0x8025 -/* 95E66C 8024346C 2610B5B0 */ addiu $s0, $s0, -0x4a50 -/* 95E670 80243470 AFBF0018 */ sw $ra, 0x18($sp) -/* 95E674 80243474 AFB10014 */ sw $s1, 0x14($sp) -/* 95E678 80243478 8E020000 */ lw $v0, ($s0) -/* 95E67C 8024347C 14400010 */ bnez $v0, .L802434C0 -/* 95E680 80243480 0080882D */ daddu $s1, $a0, $zero -/* 95E684 80243484 0C00AB39 */ jal heap_malloc -/* 95E688 80243488 24040040 */ addiu $a0, $zero, 0x40 -/* 95E68C 8024348C AE020000 */ sw $v0, ($s0) -/* 95E690 80243490 0000182D */ daddu $v1, $zero, $zero -/* 95E694 80243494 0040282D */ daddu $a1, $v0, $zero -/* 95E698 80243498 0220202D */ daddu $a0, $s1, $zero -.L8024349C: -/* 95E69C 8024349C 8C820084 */ lw $v0, 0x84($a0) -/* 95E6A0 802434A0 24840004 */ addiu $a0, $a0, 4 -/* 95E6A4 802434A4 24630001 */ addiu $v1, $v1, 1 -/* 95E6A8 802434A8 ACA20000 */ sw $v0, ($a1) -/* 95E6AC 802434AC 28620010 */ slti $v0, $v1, 0x10 -/* 95E6B0 802434B0 1440FFFA */ bnez $v0, .L8024349C -/* 95E6B4 802434B4 24A50004 */ addiu $a1, $a1, 4 -/* 95E6B8 802434B8 08090D3F */ j .L802434FC -/* 95E6BC 802434BC 00000000 */ nop -.L802434C0: -/* 95E6C0 802434C0 0000182D */ daddu $v1, $zero, $zero -/* 95E6C4 802434C4 0040282D */ daddu $a1, $v0, $zero -/* 95E6C8 802434C8 0220202D */ daddu $a0, $s1, $zero -.L802434CC: -/* 95E6CC 802434CC 8CA20000 */ lw $v0, ($a1) -/* 95E6D0 802434D0 24A50004 */ addiu $a1, $a1, 4 -/* 95E6D4 802434D4 24630001 */ addiu $v1, $v1, 1 -/* 95E6D8 802434D8 AC820084 */ sw $v0, 0x84($a0) -/* 95E6DC 802434DC 28620010 */ slti $v0, $v1, 0x10 -/* 95E6E0 802434E0 1440FFFA */ bnez $v0, .L802434CC -/* 95E6E4 802434E4 24840004 */ addiu $a0, $a0, 4 -/* 95E6E8 802434E8 3C108025 */ lui $s0, 0x8025 -/* 95E6EC 802434EC 2610B5B0 */ addiu $s0, $s0, -0x4a50 -/* 95E6F0 802434F0 0C00AB4B */ jal heap_free -/* 95E6F4 802434F4 8E040000 */ lw $a0, ($s0) -/* 95E6F8 802434F8 AE000000 */ sw $zero, ($s0) -.L802434FC: -/* 95E6FC 802434FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 95E700 80243500 8FB10014 */ lw $s1, 0x14($sp) -/* 95E704 80243504 8FB00010 */ lw $s0, 0x10($sp) -/* 95E708 80243508 24020002 */ addiu $v0, $zero, 2 -/* 95E70C 8024350C 03E00008 */ jr $ra -/* 95E710 80243510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s new file mode 100644 index 0000000000..042693f2b1 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243460_95E660.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243460_95E660 +/* 95E660 80243460 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95E664 80243464 AFB00010 */ sw $s0, 0x10($sp) +/* 95E668 80243468 3C108025 */ lui $s0, 0x8025 +/* 95E66C 8024346C 2610B5B0 */ addiu $s0, $s0, -0x4a50 +/* 95E670 80243470 AFBF0018 */ sw $ra, 0x18($sp) +/* 95E674 80243474 AFB10014 */ sw $s1, 0x14($sp) +/* 95E678 80243478 8E020000 */ lw $v0, ($s0) +/* 95E67C 8024347C 14400010 */ bnez $v0, .L802434C0 +/* 95E680 80243480 0080882D */ daddu $s1, $a0, $zero +/* 95E684 80243484 0C00AB39 */ jal heap_malloc +/* 95E688 80243488 24040040 */ addiu $a0, $zero, 0x40 +/* 95E68C 8024348C AE020000 */ sw $v0, ($s0) +/* 95E690 80243490 0000182D */ daddu $v1, $zero, $zero +/* 95E694 80243494 0040282D */ daddu $a1, $v0, $zero +/* 95E698 80243498 0220202D */ daddu $a0, $s1, $zero +.L8024349C: +/* 95E69C 8024349C 8C820084 */ lw $v0, 0x84($a0) +/* 95E6A0 802434A0 24840004 */ addiu $a0, $a0, 4 +/* 95E6A4 802434A4 24630001 */ addiu $v1, $v1, 1 +/* 95E6A8 802434A8 ACA20000 */ sw $v0, ($a1) +/* 95E6AC 802434AC 28620010 */ slti $v0, $v1, 0x10 +/* 95E6B0 802434B0 1440FFFA */ bnez $v0, .L8024349C +/* 95E6B4 802434B4 24A50004 */ addiu $a1, $a1, 4 +/* 95E6B8 802434B8 08090D3F */ j .L802434FC +/* 95E6BC 802434BC 00000000 */ nop +.L802434C0: +/* 95E6C0 802434C0 0000182D */ daddu $v1, $zero, $zero +/* 95E6C4 802434C4 0040282D */ daddu $a1, $v0, $zero +/* 95E6C8 802434C8 0220202D */ daddu $a0, $s1, $zero +.L802434CC: +/* 95E6CC 802434CC 8CA20000 */ lw $v0, ($a1) +/* 95E6D0 802434D0 24A50004 */ addiu $a1, $a1, 4 +/* 95E6D4 802434D4 24630001 */ addiu $v1, $v1, 1 +/* 95E6D8 802434D8 AC820084 */ sw $v0, 0x84($a0) +/* 95E6DC 802434DC 28620010 */ slti $v0, $v1, 0x10 +/* 95E6E0 802434E0 1440FFFA */ bnez $v0, .L802434CC +/* 95E6E4 802434E4 24840004 */ addiu $a0, $a0, 4 +/* 95E6E8 802434E8 3C108025 */ lui $s0, 0x8025 +/* 95E6EC 802434EC 2610B5B0 */ addiu $s0, $s0, -0x4a50 +/* 95E6F0 802434F0 0C00AB4B */ jal heap_free +/* 95E6F4 802434F4 8E040000 */ lw $a0, ($s0) +/* 95E6F8 802434F8 AE000000 */ sw $zero, ($s0) +.L802434FC: +/* 95E6FC 802434FC 8FBF0018 */ lw $ra, 0x18($sp) +/* 95E700 80243500 8FB10014 */ lw $s1, 0x14($sp) +/* 95E704 80243504 8FB00010 */ lw $s0, 0x10($sp) +/* 95E708 80243508 24020002 */ addiu $v0, $zero, 2 +/* 95E70C 8024350C 03E00008 */ jr $ra +/* 95E710 80243510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578.s b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578.s deleted file mode 100644 index 5cca7ae89d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243578 -/* 95E778 80243578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95E77C 8024357C AFBF0010 */ sw $ra, 0x10($sp) -/* 95E780 80243580 0C03A5B2 */ jal func_800E96C8 -/* 95E784 80243584 00000000 */ nop -/* 95E788 80243588 8FBF0010 */ lw $ra, 0x10($sp) -/* 95E78C 8024358C 24020002 */ addiu $v0, $zero, 2 -/* 95E790 80243590 03E00008 */ jr $ra -/* 95E794 80243594 27BD0018 */ addiu $sp, $sp, 0x18 -/* 95E798 80243598 00000000 */ nop -/* 95E79C 8024359C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s new file mode 100644 index 0000000000..c825af588f --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95E660/func_80243578_95E778.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243578_95E778 +/* 95E778 80243578 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95E77C 8024357C AFBF0010 */ sw $ra, 0x10($sp) +/* 95E780 80243580 0C03A5B2 */ jal func_800E96C8 +/* 95E784 80243584 00000000 */ nop +/* 95E788 80243588 8FBF0010 */ lw $ra, 0x10($sp) +/* 95E78C 8024358C 24020002 */ addiu $v0, $zero, 2 +/* 95E790 80243590 03E00008 */ jr $ra +/* 95E794 80243594 27BD0018 */ addiu $sp, $sp, 0x18 +/* 95E798 80243598 00000000 */ nop +/* 95E79C 8024359C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0.s deleted file mode 100644 index 3884a31e84..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435A0 -/* 95E7A0 802435A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 95E7A4 802435A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 95E7A8 802435A8 8C430004 */ lw $v1, 4($v0) -/* 95E7AC 802435AC 3C040010 */ lui $a0, 0x10 -/* 95E7B0 802435B0 00641825 */ or $v1, $v1, $a0 -/* 95E7B4 802435B4 AC430004 */ sw $v1, 4($v0) -/* 95E7B8 802435B8 03E00008 */ jr $ra -/* 95E7BC 802435BC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0_95E7A0.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0_95E7A0.s new file mode 100644 index 0000000000..37029fe2cc --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435A0_95E7A0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435A0_95E7A0 +/* 95E7A0 802435A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 95E7A4 802435A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 95E7A8 802435A8 8C430004 */ lw $v1, 4($v0) +/* 95E7AC 802435AC 3C040010 */ lui $a0, 0x10 +/* 95E7B0 802435B0 00641825 */ or $v1, $v1, $a0 +/* 95E7B4 802435B4 AC430004 */ sw $v1, 4($v0) +/* 95E7B8 802435B8 03E00008 */ jr $ra +/* 95E7BC 802435BC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4.s deleted file mode 100644 index c8eb3952b8..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435D4 -/* 95E7D4 802435D4 3C038016 */ lui $v1, 0x8016 -/* 95E7D8 802435D8 8463A552 */ lh $v1, -0x5aae($v1) -/* 95E7DC 802435DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95E7E0 802435E0 AFB00010 */ sw $s0, 0x10($sp) -/* 95E7E4 802435E4 0080802D */ daddu $s0, $a0, $zero -/* 95E7E8 802435E8 AFBF0014 */ sw $ra, 0x14($sp) -/* 95E7EC 802435EC 8E0200B0 */ lw $v0, 0xb0($s0) -/* 95E7F0 802435F0 10620003 */ beq $v1, $v0, .L80243600 -/* 95E7F4 802435F4 24020002 */ addiu $v0, $zero, 2 -/* 95E7F8 802435F8 08090DA0 */ j .L80243680 -/* 95E7FC 802435FC AE000084 */ sw $zero, 0x84($s0) -.L80243600: -/* 95E800 80243600 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 95E804 80243604 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 95E808 80243608 80620040 */ lb $v0, 0x40($v1) -/* 95E80C 8024360C 80670044 */ lb $a3, 0x44($v1) -/* 95E810 80243610 04420001 */ bltzl $v0, .L80243618 -/* 95E814 80243614 00021023 */ negu $v0, $v0 -.L80243618: -/* 95E818 80243618 14400003 */ bnez $v0, .L80243628 -/* 95E81C 8024361C 00000000 */ nop -/* 95E820 80243620 50E00017 */ beql $a3, $zero, .L80243680 -/* 95E824 80243624 0000102D */ daddu $v0, $zero, $zero -.L80243628: -/* 95E828 80243628 44822000 */ mtc1 $v0, $f4 -/* 95E82C 8024362C 00000000 */ nop -/* 95E830 80243630 46802120 */ cvt.s.w $f4, $f4 -/* 95E834 80243634 44062000 */ mfc1 $a2, $f4 -/* 95E838 80243638 44872000 */ mtc1 $a3, $f4 -/* 95E83C 8024363C 00000000 */ nop -/* 95E840 80243640 46802120 */ cvt.s.w $f4, $f4 -/* 95E844 80243644 44806000 */ mtc1 $zero, $f12 -/* 95E848 80243648 44072000 */ mfc1 $a3, $f4 -/* 95E84C 8024364C 0C00A720 */ jal atan2 -/* 95E850 80243650 46006386 */ mov.s $f14, $f12 -/* 95E854 80243654 3C014270 */ lui $at, 0x4270 -/* 95E858 80243658 44811000 */ mtc1 $at, $f2 -/* 95E85C 8024365C 00000000 */ nop -/* 95E860 80243660 4602003C */ c.lt.s $f0, $f2 -/* 95E864 80243664 00000000 */ nop -/* 95E868 80243668 45000004 */ bc1f .L8024367C -/* 95E86C 8024366C 24020001 */ addiu $v0, $zero, 1 -/* 95E870 80243670 AE020084 */ sw $v0, 0x84($s0) -/* 95E874 80243674 08090DA0 */ j .L80243680 -/* 95E878 80243678 24020002 */ addiu $v0, $zero, 2 -.L8024367C: -/* 95E87C 8024367C 0000102D */ daddu $v0, $zero, $zero -.L80243680: -/* 95E880 80243680 8FBF0014 */ lw $ra, 0x14($sp) -/* 95E884 80243684 8FB00010 */ lw $s0, 0x10($sp) -/* 95E888 80243688 03E00008 */ jr $ra -/* 95E88C 8024368C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s new file mode 100644 index 0000000000..db8cb770c5 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802435D4_95E7D4.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435D4_95E7D4 +/* 95E7D4 802435D4 3C038016 */ lui $v1, 0x8016 +/* 95E7D8 802435D8 8463A552 */ lh $v1, -0x5aae($v1) +/* 95E7DC 802435DC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95E7E0 802435E0 AFB00010 */ sw $s0, 0x10($sp) +/* 95E7E4 802435E4 0080802D */ daddu $s0, $a0, $zero +/* 95E7E8 802435E8 AFBF0014 */ sw $ra, 0x14($sp) +/* 95E7EC 802435EC 8E0200B0 */ lw $v0, 0xb0($s0) +/* 95E7F0 802435F0 10620003 */ beq $v1, $v0, .L80243600 +/* 95E7F4 802435F4 24020002 */ addiu $v0, $zero, 2 +/* 95E7F8 802435F8 08090DA0 */ j .L80243680 +/* 95E7FC 802435FC AE000084 */ sw $zero, 0x84($s0) +.L80243600: +/* 95E800 80243600 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 95E804 80243604 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 95E808 80243608 80620040 */ lb $v0, 0x40($v1) +/* 95E80C 8024360C 80670044 */ lb $a3, 0x44($v1) +/* 95E810 80243610 04420001 */ bltzl $v0, .L80243618 +/* 95E814 80243614 00021023 */ negu $v0, $v0 +.L80243618: +/* 95E818 80243618 14400003 */ bnez $v0, .L80243628 +/* 95E81C 8024361C 00000000 */ nop +/* 95E820 80243620 50E00017 */ beql $a3, $zero, .L80243680 +/* 95E824 80243624 0000102D */ daddu $v0, $zero, $zero +.L80243628: +/* 95E828 80243628 44822000 */ mtc1 $v0, $f4 +/* 95E82C 8024362C 00000000 */ nop +/* 95E830 80243630 46802120 */ cvt.s.w $f4, $f4 +/* 95E834 80243634 44062000 */ mfc1 $a2, $f4 +/* 95E838 80243638 44872000 */ mtc1 $a3, $f4 +/* 95E83C 8024363C 00000000 */ nop +/* 95E840 80243640 46802120 */ cvt.s.w $f4, $f4 +/* 95E844 80243644 44806000 */ mtc1 $zero, $f12 +/* 95E848 80243648 44072000 */ mfc1 $a3, $f4 +/* 95E84C 8024364C 0C00A720 */ jal atan2 +/* 95E850 80243650 46006386 */ mov.s $f14, $f12 +/* 95E854 80243654 3C014270 */ lui $at, 0x4270 +/* 95E858 80243658 44811000 */ mtc1 $at, $f2 +/* 95E85C 8024365C 00000000 */ nop +/* 95E860 80243660 4602003C */ c.lt.s $f0, $f2 +/* 95E864 80243664 00000000 */ nop +/* 95E868 80243668 45000004 */ bc1f .L8024367C +/* 95E86C 8024366C 24020001 */ addiu $v0, $zero, 1 +/* 95E870 80243670 AE020084 */ sw $v0, 0x84($s0) +/* 95E874 80243674 08090DA0 */ j .L80243680 +/* 95E878 80243678 24020002 */ addiu $v0, $zero, 2 +.L8024367C: +/* 95E87C 8024367C 0000102D */ daddu $v0, $zero, $zero +.L80243680: +/* 95E880 80243680 8FBF0014 */ lw $ra, 0x14($sp) +/* 95E884 80243684 8FB00010 */ lw $s0, 0x10($sp) +/* 95E888 80243688 03E00008 */ jr $ra +/* 95E88C 8024368C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690.s deleted file mode 100644 index 3d9a1fd9d2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243690 -/* 95E890 80243690 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95E894 80243694 AFB10014 */ sw $s1, 0x14($sp) -/* 95E898 80243698 0080882D */ daddu $s1, $a0, $zero -/* 95E89C 8024369C AFBF001C */ sw $ra, 0x1c($sp) -/* 95E8A0 802436A0 AFB20018 */ sw $s2, 0x18($sp) -/* 95E8A4 802436A4 0C016AFA */ jal get_current_map_header -/* 95E8A8 802436A8 AFB00010 */ sw $s0, 0x10($sp) -/* 95E8AC 802436AC 0220202D */ daddu $a0, $s1, $zero -/* 95E8B0 802436B0 3C05FE36 */ lui $a1, 0xfe36 -/* 95E8B4 802436B4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95E8B8 802436B8 0C0B1EAF */ jal get_variable -/* 95E8BC 802436BC 0040902D */ daddu $s2, $v0, $zero -/* 95E8C0 802436C0 0220202D */ daddu $a0, $s1, $zero -/* 95E8C4 802436C4 3C05FE36 */ lui $a1, 0xfe36 -/* 95E8C8 802436C8 8E430014 */ lw $v1, 0x14($s2) -/* 95E8CC 802436CC 00028100 */ sll $s0, $v0, 4 -/* 95E8D0 802436D0 02031821 */ addu $v1, $s0, $v1 -/* 95E8D4 802436D4 C4600000 */ lwc1 $f0, ($v1) -/* 95E8D8 802436D8 4600008D */ trunc.w.s $f2, $f0 -/* 95E8DC 802436DC 44061000 */ mfc1 $a2, $f2 -/* 95E8E0 802436E0 0C0B2026 */ jal set_variable -/* 95E8E4 802436E4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95E8E8 802436E8 0220202D */ daddu $a0, $s1, $zero -/* 95E8EC 802436EC 8E420014 */ lw $v0, 0x14($s2) -/* 95E8F0 802436F0 3C05FE36 */ lui $a1, 0xfe36 -/* 95E8F4 802436F4 02021021 */ addu $v0, $s0, $v0 -/* 95E8F8 802436F8 C4400004 */ lwc1 $f0, 4($v0) -/* 95E8FC 802436FC 4600008D */ trunc.w.s $f2, $f0 -/* 95E900 80243700 44061000 */ mfc1 $a2, $f2 -/* 95E904 80243704 0C0B2026 */ jal set_variable -/* 95E908 80243708 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95E90C 8024370C 0220202D */ daddu $a0, $s1, $zero -/* 95E910 80243710 8E420014 */ lw $v0, 0x14($s2) -/* 95E914 80243714 3C05FE36 */ lui $a1, 0xfe36 -/* 95E918 80243718 02021021 */ addu $v0, $s0, $v0 -/* 95E91C 8024371C C4400008 */ lwc1 $f0, 8($v0) -/* 95E920 80243720 4600008D */ trunc.w.s $f2, $f0 -/* 95E924 80243724 44061000 */ mfc1 $a2, $f2 -/* 95E928 80243728 0C0B2026 */ jal set_variable -/* 95E92C 8024372C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 95E930 80243730 0220202D */ daddu $a0, $s1, $zero -/* 95E934 80243734 8E420014 */ lw $v0, 0x14($s2) -/* 95E938 80243738 3C05FE36 */ lui $a1, 0xfe36 -/* 95E93C 8024373C 02028021 */ addu $s0, $s0, $v0 -/* 95E940 80243740 C600000C */ lwc1 $f0, 0xc($s0) -/* 95E944 80243744 4600008D */ trunc.w.s $f2, $f0 -/* 95E948 80243748 44061000 */ mfc1 $a2, $f2 -/* 95E94C 8024374C 0C0B2026 */ jal set_variable -/* 95E950 80243750 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 95E954 80243754 8FBF001C */ lw $ra, 0x1c($sp) -/* 95E958 80243758 8FB20018 */ lw $s2, 0x18($sp) -/* 95E95C 8024375C 8FB10014 */ lw $s1, 0x14($sp) -/* 95E960 80243760 8FB00010 */ lw $s0, 0x10($sp) -/* 95E964 80243764 24020002 */ addiu $v0, $zero, 2 -/* 95E968 80243768 03E00008 */ jr $ra -/* 95E96C 8024376C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s new file mode 100644 index 0000000000..82b3ea1e7b --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243690_95E890.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243690_95E890 +/* 95E890 80243690 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 95E894 80243694 AFB10014 */ sw $s1, 0x14($sp) +/* 95E898 80243698 0080882D */ daddu $s1, $a0, $zero +/* 95E89C 8024369C AFBF001C */ sw $ra, 0x1c($sp) +/* 95E8A0 802436A0 AFB20018 */ sw $s2, 0x18($sp) +/* 95E8A4 802436A4 0C016AFA */ jal get_current_map_header +/* 95E8A8 802436A8 AFB00010 */ sw $s0, 0x10($sp) +/* 95E8AC 802436AC 0220202D */ daddu $a0, $s1, $zero +/* 95E8B0 802436B0 3C05FE36 */ lui $a1, 0xfe36 +/* 95E8B4 802436B4 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 95E8B8 802436B8 0C0B1EAF */ jal get_variable +/* 95E8BC 802436BC 0040902D */ daddu $s2, $v0, $zero +/* 95E8C0 802436C0 0220202D */ daddu $a0, $s1, $zero +/* 95E8C4 802436C4 3C05FE36 */ lui $a1, 0xfe36 +/* 95E8C8 802436C8 8E430014 */ lw $v1, 0x14($s2) +/* 95E8CC 802436CC 00028100 */ sll $s0, $v0, 4 +/* 95E8D0 802436D0 02031821 */ addu $v1, $s0, $v1 +/* 95E8D4 802436D4 C4600000 */ lwc1 $f0, ($v1) +/* 95E8D8 802436D8 4600008D */ trunc.w.s $f2, $f0 +/* 95E8DC 802436DC 44061000 */ mfc1 $a2, $f2 +/* 95E8E0 802436E0 0C0B2026 */ jal set_variable +/* 95E8E4 802436E4 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 95E8E8 802436E8 0220202D */ daddu $a0, $s1, $zero +/* 95E8EC 802436EC 8E420014 */ lw $v0, 0x14($s2) +/* 95E8F0 802436F0 3C05FE36 */ lui $a1, 0xfe36 +/* 95E8F4 802436F4 02021021 */ addu $v0, $s0, $v0 +/* 95E8F8 802436F8 C4400004 */ lwc1 $f0, 4($v0) +/* 95E8FC 802436FC 4600008D */ trunc.w.s $f2, $f0 +/* 95E900 80243700 44061000 */ mfc1 $a2, $f2 +/* 95E904 80243704 0C0B2026 */ jal set_variable +/* 95E908 80243708 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 95E90C 8024370C 0220202D */ daddu $a0, $s1, $zero +/* 95E910 80243710 8E420014 */ lw $v0, 0x14($s2) +/* 95E914 80243714 3C05FE36 */ lui $a1, 0xfe36 +/* 95E918 80243718 02021021 */ addu $v0, $s0, $v0 +/* 95E91C 8024371C C4400008 */ lwc1 $f0, 8($v0) +/* 95E920 80243720 4600008D */ trunc.w.s $f2, $f0 +/* 95E924 80243724 44061000 */ mfc1 $a2, $f2 +/* 95E928 80243728 0C0B2026 */ jal set_variable +/* 95E92C 8024372C 34A53C83 */ ori $a1, $a1, 0x3c83 +/* 95E930 80243730 0220202D */ daddu $a0, $s1, $zero +/* 95E934 80243734 8E420014 */ lw $v0, 0x14($s2) +/* 95E938 80243738 3C05FE36 */ lui $a1, 0xfe36 +/* 95E93C 8024373C 02028021 */ addu $s0, $s0, $v0 +/* 95E940 80243740 C600000C */ lwc1 $f0, 0xc($s0) +/* 95E944 80243744 4600008D */ trunc.w.s $f2, $f0 +/* 95E948 80243748 44061000 */ mfc1 $a2, $f2 +/* 95E94C 8024374C 0C0B2026 */ jal set_variable +/* 95E950 80243750 34A53C84 */ ori $a1, $a1, 0x3c84 +/* 95E954 80243754 8FBF001C */ lw $ra, 0x1c($sp) +/* 95E958 80243758 8FB20018 */ lw $s2, 0x18($sp) +/* 95E95C 8024375C 8FB10014 */ lw $s1, 0x14($sp) +/* 95E960 80243760 8FB00010 */ lw $s0, 0x10($sp) +/* 95E964 80243764 24020002 */ addiu $v0, $zero, 2 +/* 95E968 80243768 03E00008 */ jr $ra +/* 95E96C 8024376C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770.s deleted file mode 100644 index d2735706fa..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243770 -/* 95E970 80243770 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 95E974 80243774 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 95E978 80243778 3C014334 */ lui $at, 0x4334 -/* 95E97C 8024377C 44816000 */ mtc1 $at, $f12 -/* 95E980 80243780 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95E984 80243784 AFBF0014 */ sw $ra, 0x14($sp) -/* 95E988 80243788 AFB00010 */ sw $s0, 0x10($sp) -/* 95E98C 8024378C 00031080 */ sll $v0, $v1, 2 -/* 95E990 80243790 00431021 */ addu $v0, $v0, $v1 -/* 95E994 80243794 00021080 */ sll $v0, $v0, 2 -/* 95E998 80243798 00431023 */ subu $v0, $v0, $v1 -/* 95E99C 8024379C 000218C0 */ sll $v1, $v0, 3 -/* 95E9A0 802437A0 00431021 */ addu $v0, $v0, $v1 -/* 95E9A4 802437A4 000210C0 */ sll $v0, $v0, 3 -/* 95E9A8 802437A8 3C01800B */ lui $at, 0x800b -/* 95E9AC 802437AC 00220821 */ addu $at, $at, $v0 -/* 95E9B0 802437B0 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 95E9B4 802437B4 460C0300 */ add.s $f12, $f0, $f12 -/* 95E9B8 802437B8 0C00A6C9 */ jal clamp_angle -/* 95E9BC 802437BC 0080802D */ daddu $s0, $a0, $zero -/* 95E9C0 802437C0 4600008D */ trunc.w.s $f2, $f0 -/* 95E9C4 802437C4 E6020084 */ swc1 $f2, 0x84($s0) -/* 95E9C8 802437C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 95E9CC 802437CC 8FB00010 */ lw $s0, 0x10($sp) -/* 95E9D0 802437D0 24020002 */ addiu $v0, $zero, 2 -/* 95E9D4 802437D4 03E00008 */ jr $ra -/* 95E9D8 802437D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770_95E970.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770_95E970.s new file mode 100644 index 0000000000..443e0c5f25 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243770_95E970.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243770_95E970 +/* 95E970 80243770 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 95E974 80243774 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 95E978 80243778 3C014334 */ lui $at, 0x4334 +/* 95E97C 8024377C 44816000 */ mtc1 $at, $f12 +/* 95E980 80243780 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 95E984 80243784 AFBF0014 */ sw $ra, 0x14($sp) +/* 95E988 80243788 AFB00010 */ sw $s0, 0x10($sp) +/* 95E98C 8024378C 00031080 */ sll $v0, $v1, 2 +/* 95E990 80243790 00431021 */ addu $v0, $v0, $v1 +/* 95E994 80243794 00021080 */ sll $v0, $v0, 2 +/* 95E998 80243798 00431023 */ subu $v0, $v0, $v1 +/* 95E99C 8024379C 000218C0 */ sll $v1, $v0, 3 +/* 95E9A0 802437A0 00431021 */ addu $v0, $v0, $v1 +/* 95E9A4 802437A4 000210C0 */ sll $v0, $v0, 3 +/* 95E9A8 802437A8 3C01800B */ lui $at, 0x800b +/* 95E9AC 802437AC 00220821 */ addu $at, $at, $v0 +/* 95E9B0 802437B0 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 95E9B4 802437B4 460C0300 */ add.s $f12, $f0, $f12 +/* 95E9B8 802437B8 0C00A6C9 */ jal clamp_angle +/* 95E9BC 802437BC 0080802D */ daddu $s0, $a0, $zero +/* 95E9C0 802437C0 4600008D */ trunc.w.s $f2, $f0 +/* 95E9C4 802437C4 E6020084 */ swc1 $f2, 0x84($s0) +/* 95E9C8 802437C8 8FBF0014 */ lw $ra, 0x14($sp) +/* 95E9CC 802437CC 8FB00010 */ lw $s0, 0x10($sp) +/* 95E9D0 802437D0 24020002 */ addiu $v0, $zero, 2 +/* 95E9D4 802437D4 03E00008 */ jr $ra +/* 95E9D8 802437D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802437DC.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802437DC.s deleted file mode 100644 index 55e11d76dd..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802437DC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437DC -/* 95E9DC 802437DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95E9E0 802437E0 AFB00018 */ sw $s0, 0x18($sp) -/* 95E9E4 802437E4 0080802D */ daddu $s0, $a0, $zero -/* 95E9E8 802437E8 AFBF001C */ sw $ra, 0x1c($sp) -/* 95E9EC 802437EC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95E9F0 802437F0 8E02000C */ lw $v0, 0xc($s0) -/* 95E9F4 802437F4 0C0B210B */ jal get_float_variable -/* 95E9F8 802437F8 8C450000 */ lw $a1, ($v0) -/* 95E9FC 802437FC 27A40010 */ addiu $a0, $sp, 0x10 -/* 95EA00 80243800 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 95EA04 80243804 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 95EA08 80243808 44060000 */ mfc1 $a2, $f0 -/* 95EA0C 8024380C C4400028 */ lwc1 $f0, 0x28($v0) -/* 95EA10 80243810 C4420030 */ lwc1 $f2, 0x30($v0) -/* 95EA14 80243814 E7A00010 */ swc1 $f0, 0x10($sp) -/* 95EA18 80243818 E7A20014 */ swc1 $f2, 0x14($sp) -/* 95EA1C 8024381C 8C470080 */ lw $a3, 0x80($v0) -/* 95EA20 80243820 C454002C */ lwc1 $f20, 0x2c($v0) -/* 95EA24 80243824 0C00A7E7 */ jal add_vec2D_polar -/* 95EA28 80243828 27A50014 */ addiu $a1, $sp, 0x14 -/* 95EA2C 8024382C 0200202D */ daddu $a0, $s0, $zero -/* 95EA30 80243830 3C05FE36 */ lui $a1, 0xfe36 -/* 95EA34 80243834 8FA60010 */ lw $a2, 0x10($sp) -/* 95EA38 80243838 0C0B2190 */ jal set_float_variable -/* 95EA3C 8024383C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95EA40 80243840 0200202D */ daddu $a0, $s0, $zero -/* 95EA44 80243844 3C05FE36 */ lui $a1, 0xfe36 -/* 95EA48 80243848 4406A000 */ mfc1 $a2, $f20 -/* 95EA4C 8024384C 0C0B2190 */ jal set_float_variable -/* 95EA50 80243850 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95EA54 80243854 0200202D */ daddu $a0, $s0, $zero -/* 95EA58 80243858 3C05FE36 */ lui $a1, 0xfe36 -/* 95EA5C 8024385C 8FA60014 */ lw $a2, 0x14($sp) -/* 95EA60 80243860 0C0B2190 */ jal set_float_variable -/* 95EA64 80243864 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 95EA68 80243868 8FBF001C */ lw $ra, 0x1c($sp) -/* 95EA6C 8024386C 8FB00018 */ lw $s0, 0x18($sp) -/* 95EA70 80243870 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 95EA74 80243874 24020002 */ addiu $v0, $zero, 2 -/* 95EA78 80243878 03E00008 */ jr $ra -/* 95EA7C 8024387C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802437DC_95E9DC.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802437DC_95E9DC.s new file mode 100644 index 0000000000..d69e1fbb07 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802437DC_95E9DC.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802437DC_95E9DC +/* 95E9DC 802437DC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 95E9E0 802437E0 AFB00018 */ sw $s0, 0x18($sp) +/* 95E9E4 802437E4 0080802D */ daddu $s0, $a0, $zero +/* 95E9E8 802437E8 AFBF001C */ sw $ra, 0x1c($sp) +/* 95E9EC 802437EC F7B40020 */ sdc1 $f20, 0x20($sp) +/* 95E9F0 802437F0 8E02000C */ lw $v0, 0xc($s0) +/* 95E9F4 802437F4 0C0B210B */ jal get_float_variable +/* 95E9F8 802437F8 8C450000 */ lw $a1, ($v0) +/* 95E9FC 802437FC 27A40010 */ addiu $a0, $sp, 0x10 +/* 95EA00 80243800 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 95EA04 80243804 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 95EA08 80243808 44060000 */ mfc1 $a2, $f0 +/* 95EA0C 8024380C C4400028 */ lwc1 $f0, 0x28($v0) +/* 95EA10 80243810 C4420030 */ lwc1 $f2, 0x30($v0) +/* 95EA14 80243814 E7A00010 */ swc1 $f0, 0x10($sp) +/* 95EA18 80243818 E7A20014 */ swc1 $f2, 0x14($sp) +/* 95EA1C 8024381C 8C470080 */ lw $a3, 0x80($v0) +/* 95EA20 80243820 C454002C */ lwc1 $f20, 0x2c($v0) +/* 95EA24 80243824 0C00A7E7 */ jal add_vec2D_polar +/* 95EA28 80243828 27A50014 */ addiu $a1, $sp, 0x14 +/* 95EA2C 8024382C 0200202D */ daddu $a0, $s0, $zero +/* 95EA30 80243830 3C05FE36 */ lui $a1, 0xfe36 +/* 95EA34 80243834 8FA60010 */ lw $a2, 0x10($sp) +/* 95EA38 80243838 0C0B2190 */ jal set_float_variable +/* 95EA3C 8024383C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 95EA40 80243840 0200202D */ daddu $a0, $s0, $zero +/* 95EA44 80243844 3C05FE36 */ lui $a1, 0xfe36 +/* 95EA48 80243848 4406A000 */ mfc1 $a2, $f20 +/* 95EA4C 8024384C 0C0B2190 */ jal set_float_variable +/* 95EA50 80243850 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 95EA54 80243854 0200202D */ daddu $a0, $s0, $zero +/* 95EA58 80243858 3C05FE36 */ lui $a1, 0xfe36 +/* 95EA5C 8024385C 8FA60014 */ lw $a2, 0x14($sp) +/* 95EA60 80243860 0C0B2190 */ jal set_float_variable +/* 95EA64 80243864 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 95EA68 80243868 8FBF001C */ lw $ra, 0x1c($sp) +/* 95EA6C 8024386C 8FB00018 */ lw $s0, 0x18($sp) +/* 95EA70 80243870 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 95EA74 80243874 24020002 */ addiu $v0, $zero, 2 +/* 95EA78 80243878 03E00008 */ jr $ra +/* 95EA7C 8024387C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243880.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243880.s deleted file mode 100644 index 987fb62d2d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243880.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243880 -/* 95EA80 80243880 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 95EA84 80243884 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 95EA88 80243888 4485A000 */ mtc1 $a1, $f20 -/* 95EA8C 8024388C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 95EA90 80243890 4486B000 */ mtc1 $a2, $f22 -/* 95EA94 80243894 AFB00010 */ sw $s0, 0x10($sp) -/* 95EA98 80243898 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 95EA9C 8024389C 4487C000 */ mtc1 $a3, $f24 -/* 95EAA0 802438A0 AFBF0014 */ sw $ra, 0x14($sp) -/* 95EAA4 802438A4 0C019D28 */ jal guMtxIdentF -/* 95EAA8 802438A8 0080802D */ daddu $s0, $a0, $zero -/* 95EAAC 802438AC 4616A582 */ mul.s $f22, $f20, $f22 -/* 95EAB0 802438B0 00000000 */ nop -/* 95EAB4 802438B4 4618A502 */ mul.s $f20, $f20, $f24 -/* 95EAB8 802438B8 00000000 */ nop -/* 95EABC 802438BC 3C013F80 */ lui $at, 0x3f80 -/* 95EAC0 802438C0 44810000 */ mtc1 $at, $f0 -/* 95EAC4 802438C4 00000000 */ nop -/* 95EAC8 802438C8 E6000014 */ swc1 $f0, 0x14($s0) -/* 95EACC 802438CC E6160010 */ swc1 $f22, 0x10($s0) -/* 95EAD0 802438D0 E6140018 */ swc1 $f20, 0x18($s0) -/* 95EAD4 802438D4 8FBF0014 */ lw $ra, 0x14($sp) -/* 95EAD8 802438D8 8FB00010 */ lw $s0, 0x10($sp) -/* 95EADC 802438DC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 95EAE0 802438E0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 95EAE4 802438E4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 95EAE8 802438E8 03E00008 */ jr $ra -/* 95EAEC 802438EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243880_95EA80.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243880_95EA80.s new file mode 100644 index 0000000000..2186990714 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_80243880_95EA80.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243880_95EA80 +/* 95EA80 80243880 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 95EA84 80243884 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 95EA88 80243888 4485A000 */ mtc1 $a1, $f20 +/* 95EA8C 8024388C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 95EA90 80243890 4486B000 */ mtc1 $a2, $f22 +/* 95EA94 80243894 AFB00010 */ sw $s0, 0x10($sp) +/* 95EA98 80243898 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 95EA9C 8024389C 4487C000 */ mtc1 $a3, $f24 +/* 95EAA0 802438A0 AFBF0014 */ sw $ra, 0x14($sp) +/* 95EAA4 802438A4 0C019D28 */ jal guMtxIdentF +/* 95EAA8 802438A8 0080802D */ daddu $s0, $a0, $zero +/* 95EAAC 802438AC 4616A582 */ mul.s $f22, $f20, $f22 +/* 95EAB0 802438B0 00000000 */ nop +/* 95EAB4 802438B4 4618A502 */ mul.s $f20, $f20, $f24 +/* 95EAB8 802438B8 00000000 */ nop +/* 95EABC 802438BC 3C013F80 */ lui $at, 0x3f80 +/* 95EAC0 802438C0 44810000 */ mtc1 $at, $f0 +/* 95EAC4 802438C4 00000000 */ nop +/* 95EAC8 802438C8 E6000014 */ swc1 $f0, 0x14($s0) +/* 95EACC 802438CC E6160010 */ swc1 $f22, 0x10($s0) +/* 95EAD0 802438D0 E6140018 */ swc1 $f20, 0x18($s0) +/* 95EAD4 802438D4 8FBF0014 */ lw $ra, 0x14($sp) +/* 95EAD8 802438D8 8FB00010 */ lw $s0, 0x10($sp) +/* 95EADC 802438DC D7B80028 */ ldc1 $f24, 0x28($sp) +/* 95EAE0 802438E0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 95EAE4 802438E4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 95EAE8 802438E8 03E00008 */ jr $ra +/* 95EAEC 802438EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802438F0_95EAF0.s b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802438F0_95EAF0.s index 4f77e4fe6e..51e39d0708 100644 --- a/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802438F0_95EAF0.s +++ b/asm/nonmatchings/world/area_dro/dro_01/95E7A0/func_802438F0_95EAF0.s @@ -55,7 +55,7 @@ glabel func_802438F0_95EAF0 /* 95EBB8 802439B8 4405E000 */ mfc1 $a1, $f28 /* 95EBBC 802439BC 4406D000 */ mfc1 $a2, $f26 /* 95EBC0 802439C0 4407C000 */ mfc1 $a3, $f24 -/* 95EBC4 802439C4 0C090E20 */ jal func_80243880 +/* 95EBC4 802439C4 0C090E20 */ jal func_80243880_95EA80 /* 95EBC8 802439C8 27A40010 */ addiu $a0, $sp, 0x10 /* 95EBCC 802439CC 27A40010 */ addiu $a0, $sp, 0x10 /* 95EBD0 802439D0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802438F0_95EAF0 /* 95EC40 80243A40 4405E000 */ mfc1 $a1, $f28 /* 95EC44 80243A44 4406D000 */ mfc1 $a2, $f26 /* 95EC48 80243A48 4407C000 */ mfc1 $a3, $f24 -/* 95EC4C 80243A4C 0C090E20 */ jal func_80243880 +/* 95EC4C 80243A4C 0C090E20 */ jal func_80243880_95EA80 /* 95EC50 80243A50 27A40010 */ addiu $a0, $sp, 0x10 /* 95EC54 80243A54 27A40010 */ addiu $a0, $sp, 0x10 /* 95EC58 80243A58 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C.s deleted file mode 100644 index 2a58cf2fe1..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024043C -/* 9695FC 8024043C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 969600 80240440 AFB10024 */ sw $s1, 0x24($sp) -/* 969604 80240444 0080882D */ daddu $s1, $a0, $zero -/* 969608 80240448 3C05F840 */ lui $a1, 0xf840 -/* 96960C 8024044C AFBF0044 */ sw $ra, 0x44($sp) -/* 969610 80240450 AFBE0040 */ sw $fp, 0x40($sp) -/* 969614 80240454 AFB7003C */ sw $s7, 0x3c($sp) -/* 969618 80240458 AFB60038 */ sw $s6, 0x38($sp) -/* 96961C 8024045C AFB50034 */ sw $s5, 0x34($sp) -/* 969620 80240460 AFB40030 */ sw $s4, 0x30($sp) -/* 969624 80240464 AFB3002C */ sw $s3, 0x2c($sp) -/* 969628 80240468 AFB20028 */ sw $s2, 0x28($sp) -/* 96962C 8024046C AFB00020 */ sw $s0, 0x20($sp) -/* 969630 80240470 8E3E0148 */ lw $fp, 0x148($s1) -/* 969634 80240474 0C0B1EAF */ jal get_variable -/* 969638 80240478 34A56268 */ ori $a1, $a1, 0x6268 -/* 96963C 8024047C 0040802D */ daddu $s0, $v0, $zero -/* 969640 80240480 0220202D */ daddu $a0, $s1, $zero -/* 969644 80240484 3C05F840 */ lui $a1, 0xf840 -/* 969648 80240488 0C0B1EAF */ jal get_variable -/* 96964C 8024048C 34A56269 */ ori $a1, $a1, 0x6269 -/* 969650 80240490 0040B82D */ daddu $s7, $v0, $zero -/* 969654 80240494 0220202D */ daddu $a0, $s1, $zero -/* 969658 80240498 3C05F5DE */ lui $a1, 0xf5de -/* 96965C 8024049C 0C0B1EAF */ jal get_variable -/* 969660 802404A0 34A502DE */ ori $a1, $a1, 0x2de -/* 969664 802404A4 0040B02D */ daddu $s6, $v0, $zero -/* 969668 802404A8 0220202D */ daddu $a0, $s1, $zero -/* 96966C 802404AC 3C05F5DE */ lui $a1, 0xf5de -/* 969670 802404B0 0C0B1EAF */ jal get_variable -/* 969674 802404B4 34A502DF */ ori $a1, $a1, 0x2df -/* 969678 802404B8 0040A82D */ daddu $s5, $v0, $zero -/* 96967C 802404BC 93D3006D */ lbu $s3, 0x6d($fp) -/* 969680 802404C0 32C2FFFF */ andi $v0, $s6, 0xffff -/* 969684 802404C4 A7B30010 */ sh $s3, 0x10($sp) -/* 969688 802404C8 93D2006E */ lbu $s2, 0x6e($fp) -/* 96968C 802404CC 93C7006F */ lbu $a3, 0x6f($fp) -/* 969690 802404D0 3274FFFF */ andi $s4, $s3, 0xffff -/* 969694 802404D4 12820003 */ beq $s4, $v0, .L802404E4 -/* 969698 802404D8 A7A7001E */ sh $a3, 0x1e($sp) -/* 96969C 802404DC 0000B82D */ daddu $s7, $zero, $zero -/* 9696A0 802404E0 02E0802D */ daddu $s0, $s7, $zero -.L802404E4: -/* 9696A4 802404E4 3202FFFF */ andi $v0, $s0, 0xffff -/* 9696A8 802404E8 14400016 */ bnez $v0, .L80240544 -/* 9696AC 802404EC 0220202D */ daddu $a0, $s1, $zero -/* 9696B0 802404F0 0C00A67F */ jal rand_int -/* 9696B4 802404F4 24040064 */ addiu $a0, $zero, 0x64 -/* 9696B8 802404F8 2842001E */ slti $v0, $v0, 0x1e -/* 9696BC 802404FC 10400011 */ beqz $v0, .L80240544 -/* 9696C0 80240500 0220202D */ daddu $a0, $s1, $zero -/* 9696C4 80240504 0C00A67F */ jal rand_int -/* 9696C8 80240508 2644FFFF */ addiu $a0, $s2, -1 -/* 9696CC 8024050C 0040A82D */ daddu $s5, $v0, $zero -/* 9696D0 80240510 0260B02D */ daddu $s6, $s3, $zero -/* 9696D4 80240514 0220202D */ daddu $a0, $s1, $zero -/* 9696D8 80240518 3C05F5DE */ lui $a1, 0xf5de -/* 9696DC 8024051C 34A502DE */ ori $a1, $a1, 0x2de -/* 9696E0 80240520 0C0B2026 */ jal set_variable -/* 9696E4 80240524 0280302D */ daddu $a2, $s4, $zero -/* 9696E8 80240528 0220202D */ daddu $a0, $s1, $zero -/* 9696EC 8024052C 3C05F5DE */ lui $a1, 0xf5de -/* 9696F0 80240530 34A502DF */ ori $a1, $a1, 0x2df -/* 9696F4 80240534 0C0B2026 */ jal set_variable -/* 9696F8 80240538 32A6FFFF */ andi $a2, $s5, 0xffff -/* 9696FC 8024053C 24100001 */ addiu $s0, $zero, 1 -/* 969700 80240540 0220202D */ daddu $a0, $s1, $zero -.L80240544: -/* 969704 80240544 3C05F840 */ lui $a1, 0xf840 -/* 969708 80240548 34A56268 */ ori $a1, $a1, 0x6268 -/* 96970C 8024054C 0C0B2026 */ jal set_variable -/* 969710 80240550 3206FFFF */ andi $a2, $s0, 0xffff -/* 969714 80240554 0220202D */ daddu $a0, $s1, $zero -/* 969718 80240558 3C05F840 */ lui $a1, 0xf840 -/* 96971C 8024055C 34A56269 */ ori $a1, $a1, 0x6269 -/* 969720 80240560 0C0B2026 */ jal set_variable -/* 969724 80240564 32E6FFFF */ andi $a2, $s7, 0xffff -/* 969728 80240568 0000202D */ daddu $a0, $zero, $zero -/* 96972C 8024056C 3C05F5DE */ lui $a1, 0xf5de -/* 969730 80240570 0C0B1EAF */ jal get_variable -/* 969734 80240574 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 969738 80240578 0000202D */ daddu $a0, $zero, $zero -/* 96973C 8024057C 3C05F5DE */ lui $a1, 0xf5de -/* 969740 80240580 34A50180 */ ori $a1, $a1, 0x180 -/* 969744 80240584 0C0B1EAF */ jal get_variable -/* 969748 80240588 0040802D */ daddu $s0, $v0, $zero -/* 96974C 8024058C 0040282D */ daddu $a1, $v0, $zero -/* 969750 80240590 0000182D */ daddu $v1, $zero, $zero -/* 969754 80240594 3C068024 */ lui $a2, 0x8024 -/* 969758 80240598 24C64E84 */ addiu $a2, $a2, 0x4e84 -/* 96975C 8024059C 00C0202D */ daddu $a0, $a2, $zero -.L802405A0: -/* 969760 802405A0 8C820000 */ lw $v0, ($a0) -/* 969764 802405A4 00A2102A */ slt $v0, $a1, $v0 -/* 969768 802405A8 14400006 */ bnez $v0, .L802405C4 -/* 96976C 802405AC 000310C0 */ sll $v0, $v1, 3 -/* 969770 802405B0 24630001 */ addiu $v1, $v1, 1 -/* 969774 802405B4 28620008 */ slti $v0, $v1, 8 -/* 969778 802405B8 1440FFF9 */ bnez $v0, .L802405A0 -/* 96977C 802405BC 24840008 */ addiu $a0, $a0, 8 -/* 969780 802405C0 000310C0 */ sll $v0, $v1, 3 -.L802405C4: -/* 969784 802405C4 00461021 */ addu $v0, $v0, $a2 -/* 969788 802405C8 8C420004 */ lw $v0, 4($v0) -/* 96978C 802405CC 97A30010 */ lhu $v1, 0x10($sp) -/* 969790 802405D0 0202202A */ slt $a0, $s0, $v0 -/* 969794 802405D4 32C2FFFF */ andi $v0, $s6, 0xffff -/* 969798 802405D8 14620008 */ bne $v1, $v0, .L802405FC -/* 96979C 802405DC 32A2FFFF */ andi $v0, $s5, 0xffff -/* 9697A0 802405E0 97A7001E */ lhu $a3, 0x1e($sp) -/* 9697A4 802405E4 14E20005 */ bne $a3, $v0, .L802405FC -/* 9697A8 802405E8 32E2FFFF */ andi $v0, $s7, 0xffff -/* 9697AC 802405EC 14400003 */ bnez $v0, .L802405FC -/* 9697B0 802405F0 00000000 */ nop -/* 9697B4 802405F4 14800008 */ bnez $a0, .L80240618 -/* 9697B8 802405F8 24020001 */ addiu $v0, $zero, 1 -.L802405FC: -/* 9697BC 802405FC 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9697C0 80240600 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9697C4 80240604 80420075 */ lb $v0, 0x75($v0) -/* 9697C8 80240608 10400005 */ beqz $v0, .L80240620 -/* 9697CC 8024060C 00000000 */ nop -/* 9697D0 80240610 10800003 */ beqz $a0, .L80240620 -/* 9697D4 80240614 24020001 */ addiu $v0, $zero, 1 -.L80240618: -/* 9697D8 80240618 0809018B */ j .L8024062C -/* 9697DC 8024061C AE220084 */ sw $v0, 0x84($s1) -.L80240620: -/* 9697E0 80240620 0C00F9EB */ jal kill_enemy -/* 9697E4 80240624 03C0202D */ daddu $a0, $fp, $zero -/* 9697E8 80240628 AE200084 */ sw $zero, 0x84($s1) -.L8024062C: -/* 9697EC 8024062C 8FBF0044 */ lw $ra, 0x44($sp) -/* 9697F0 80240630 8FBE0040 */ lw $fp, 0x40($sp) -/* 9697F4 80240634 8FB7003C */ lw $s7, 0x3c($sp) -/* 9697F8 80240638 8FB60038 */ lw $s6, 0x38($sp) -/* 9697FC 8024063C 8FB50034 */ lw $s5, 0x34($sp) -/* 969800 80240640 8FB40030 */ lw $s4, 0x30($sp) -/* 969804 80240644 8FB3002C */ lw $s3, 0x2c($sp) -/* 969808 80240648 8FB20028 */ lw $s2, 0x28($sp) -/* 96980C 8024064C 8FB10024 */ lw $s1, 0x24($sp) -/* 969810 80240650 8FB00020 */ lw $s0, 0x20($sp) -/* 969814 80240654 24020002 */ addiu $v0, $zero, 2 -/* 969818 80240658 03E00008 */ jr $ra -/* 96981C 8024065C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s new file mode 100644 index 0000000000..54a407138c --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024043C_9695FC.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024043C_9695FC +/* 9695FC 8024043C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 969600 80240440 AFB10024 */ sw $s1, 0x24($sp) +/* 969604 80240444 0080882D */ daddu $s1, $a0, $zero +/* 969608 80240448 3C05F840 */ lui $a1, 0xf840 +/* 96960C 8024044C AFBF0044 */ sw $ra, 0x44($sp) +/* 969610 80240450 AFBE0040 */ sw $fp, 0x40($sp) +/* 969614 80240454 AFB7003C */ sw $s7, 0x3c($sp) +/* 969618 80240458 AFB60038 */ sw $s6, 0x38($sp) +/* 96961C 8024045C AFB50034 */ sw $s5, 0x34($sp) +/* 969620 80240460 AFB40030 */ sw $s4, 0x30($sp) +/* 969624 80240464 AFB3002C */ sw $s3, 0x2c($sp) +/* 969628 80240468 AFB20028 */ sw $s2, 0x28($sp) +/* 96962C 8024046C AFB00020 */ sw $s0, 0x20($sp) +/* 969630 80240470 8E3E0148 */ lw $fp, 0x148($s1) +/* 969634 80240474 0C0B1EAF */ jal get_variable +/* 969638 80240478 34A56268 */ ori $a1, $a1, 0x6268 +/* 96963C 8024047C 0040802D */ daddu $s0, $v0, $zero +/* 969640 80240480 0220202D */ daddu $a0, $s1, $zero +/* 969644 80240484 3C05F840 */ lui $a1, 0xf840 +/* 969648 80240488 0C0B1EAF */ jal get_variable +/* 96964C 8024048C 34A56269 */ ori $a1, $a1, 0x6269 +/* 969650 80240490 0040B82D */ daddu $s7, $v0, $zero +/* 969654 80240494 0220202D */ daddu $a0, $s1, $zero +/* 969658 80240498 3C05F5DE */ lui $a1, 0xf5de +/* 96965C 8024049C 0C0B1EAF */ jal get_variable +/* 969660 802404A0 34A502DE */ ori $a1, $a1, 0x2de +/* 969664 802404A4 0040B02D */ daddu $s6, $v0, $zero +/* 969668 802404A8 0220202D */ daddu $a0, $s1, $zero +/* 96966C 802404AC 3C05F5DE */ lui $a1, 0xf5de +/* 969670 802404B0 0C0B1EAF */ jal get_variable +/* 969674 802404B4 34A502DF */ ori $a1, $a1, 0x2df +/* 969678 802404B8 0040A82D */ daddu $s5, $v0, $zero +/* 96967C 802404BC 93D3006D */ lbu $s3, 0x6d($fp) +/* 969680 802404C0 32C2FFFF */ andi $v0, $s6, 0xffff +/* 969684 802404C4 A7B30010 */ sh $s3, 0x10($sp) +/* 969688 802404C8 93D2006E */ lbu $s2, 0x6e($fp) +/* 96968C 802404CC 93C7006F */ lbu $a3, 0x6f($fp) +/* 969690 802404D0 3274FFFF */ andi $s4, $s3, 0xffff +/* 969694 802404D4 12820003 */ beq $s4, $v0, .L802404E4 +/* 969698 802404D8 A7A7001E */ sh $a3, 0x1e($sp) +/* 96969C 802404DC 0000B82D */ daddu $s7, $zero, $zero +/* 9696A0 802404E0 02E0802D */ daddu $s0, $s7, $zero +.L802404E4: +/* 9696A4 802404E4 3202FFFF */ andi $v0, $s0, 0xffff +/* 9696A8 802404E8 14400016 */ bnez $v0, .L80240544 +/* 9696AC 802404EC 0220202D */ daddu $a0, $s1, $zero +/* 9696B0 802404F0 0C00A67F */ jal rand_int +/* 9696B4 802404F4 24040064 */ addiu $a0, $zero, 0x64 +/* 9696B8 802404F8 2842001E */ slti $v0, $v0, 0x1e +/* 9696BC 802404FC 10400011 */ beqz $v0, .L80240544 +/* 9696C0 80240500 0220202D */ daddu $a0, $s1, $zero +/* 9696C4 80240504 0C00A67F */ jal rand_int +/* 9696C8 80240508 2644FFFF */ addiu $a0, $s2, -1 +/* 9696CC 8024050C 0040A82D */ daddu $s5, $v0, $zero +/* 9696D0 80240510 0260B02D */ daddu $s6, $s3, $zero +/* 9696D4 80240514 0220202D */ daddu $a0, $s1, $zero +/* 9696D8 80240518 3C05F5DE */ lui $a1, 0xf5de +/* 9696DC 8024051C 34A502DE */ ori $a1, $a1, 0x2de +/* 9696E0 80240520 0C0B2026 */ jal set_variable +/* 9696E4 80240524 0280302D */ daddu $a2, $s4, $zero +/* 9696E8 80240528 0220202D */ daddu $a0, $s1, $zero +/* 9696EC 8024052C 3C05F5DE */ lui $a1, 0xf5de +/* 9696F0 80240530 34A502DF */ ori $a1, $a1, 0x2df +/* 9696F4 80240534 0C0B2026 */ jal set_variable +/* 9696F8 80240538 32A6FFFF */ andi $a2, $s5, 0xffff +/* 9696FC 8024053C 24100001 */ addiu $s0, $zero, 1 +/* 969700 80240540 0220202D */ daddu $a0, $s1, $zero +.L80240544: +/* 969704 80240544 3C05F840 */ lui $a1, 0xf840 +/* 969708 80240548 34A56268 */ ori $a1, $a1, 0x6268 +/* 96970C 8024054C 0C0B2026 */ jal set_variable +/* 969710 80240550 3206FFFF */ andi $a2, $s0, 0xffff +/* 969714 80240554 0220202D */ daddu $a0, $s1, $zero +/* 969718 80240558 3C05F840 */ lui $a1, 0xf840 +/* 96971C 8024055C 34A56269 */ ori $a1, $a1, 0x6269 +/* 969720 80240560 0C0B2026 */ jal set_variable +/* 969724 80240564 32E6FFFF */ andi $a2, $s7, 0xffff +/* 969728 80240568 0000202D */ daddu $a0, $zero, $zero +/* 96972C 8024056C 3C05F5DE */ lui $a1, 0xf5de +/* 969730 80240570 0C0B1EAF */ jal get_variable +/* 969734 80240574 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 969738 80240578 0000202D */ daddu $a0, $zero, $zero +/* 96973C 8024057C 3C05F5DE */ lui $a1, 0xf5de +/* 969740 80240580 34A50180 */ ori $a1, $a1, 0x180 +/* 969744 80240584 0C0B1EAF */ jal get_variable +/* 969748 80240588 0040802D */ daddu $s0, $v0, $zero +/* 96974C 8024058C 0040282D */ daddu $a1, $v0, $zero +/* 969750 80240590 0000182D */ daddu $v1, $zero, $zero +/* 969754 80240594 3C068024 */ lui $a2, 0x8024 +/* 969758 80240598 24C64E84 */ addiu $a2, $a2, 0x4e84 +/* 96975C 8024059C 00C0202D */ daddu $a0, $a2, $zero +.L802405A0: +/* 969760 802405A0 8C820000 */ lw $v0, ($a0) +/* 969764 802405A4 00A2102A */ slt $v0, $a1, $v0 +/* 969768 802405A8 14400006 */ bnez $v0, .L802405C4 +/* 96976C 802405AC 000310C0 */ sll $v0, $v1, 3 +/* 969770 802405B0 24630001 */ addiu $v1, $v1, 1 +/* 969774 802405B4 28620008 */ slti $v0, $v1, 8 +/* 969778 802405B8 1440FFF9 */ bnez $v0, .L802405A0 +/* 96977C 802405BC 24840008 */ addiu $a0, $a0, 8 +/* 969780 802405C0 000310C0 */ sll $v0, $v1, 3 +.L802405C4: +/* 969784 802405C4 00461021 */ addu $v0, $v0, $a2 +/* 969788 802405C8 8C420004 */ lw $v0, 4($v0) +/* 96978C 802405CC 97A30010 */ lhu $v1, 0x10($sp) +/* 969790 802405D0 0202202A */ slt $a0, $s0, $v0 +/* 969794 802405D4 32C2FFFF */ andi $v0, $s6, 0xffff +/* 969798 802405D8 14620008 */ bne $v1, $v0, .L802405FC +/* 96979C 802405DC 32A2FFFF */ andi $v0, $s5, 0xffff +/* 9697A0 802405E0 97A7001E */ lhu $a3, 0x1e($sp) +/* 9697A4 802405E4 14E20005 */ bne $a3, $v0, .L802405FC +/* 9697A8 802405E8 32E2FFFF */ andi $v0, $s7, 0xffff +/* 9697AC 802405EC 14400003 */ bnez $v0, .L802405FC +/* 9697B0 802405F0 00000000 */ nop +/* 9697B4 802405F4 14800008 */ bnez $a0, .L80240618 +/* 9697B8 802405F8 24020001 */ addiu $v0, $zero, 1 +.L802405FC: +/* 9697BC 802405FC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 9697C0 80240600 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 9697C4 80240604 80420075 */ lb $v0, 0x75($v0) +/* 9697C8 80240608 10400005 */ beqz $v0, .L80240620 +/* 9697CC 8024060C 00000000 */ nop +/* 9697D0 80240610 10800003 */ beqz $a0, .L80240620 +/* 9697D4 80240614 24020001 */ addiu $v0, $zero, 1 +.L80240618: +/* 9697D8 80240618 0809018B */ j .L8024062C +/* 9697DC 8024061C AE220084 */ sw $v0, 0x84($s1) +.L80240620: +/* 9697E0 80240620 0C00F9EB */ jal kill_enemy +/* 9697E4 80240624 03C0202D */ daddu $a0, $fp, $zero +/* 9697E8 80240628 AE200084 */ sw $zero, 0x84($s1) +.L8024062C: +/* 9697EC 8024062C 8FBF0044 */ lw $ra, 0x44($sp) +/* 9697F0 80240630 8FBE0040 */ lw $fp, 0x40($sp) +/* 9697F4 80240634 8FB7003C */ lw $s7, 0x3c($sp) +/* 9697F8 80240638 8FB60038 */ lw $s6, 0x38($sp) +/* 9697FC 8024063C 8FB50034 */ lw $s5, 0x34($sp) +/* 969800 80240640 8FB40030 */ lw $s4, 0x30($sp) +/* 969804 80240644 8FB3002C */ lw $s3, 0x2c($sp) +/* 969808 80240648 8FB20028 */ lw $s2, 0x28($sp) +/* 96980C 8024064C 8FB10024 */ lw $s1, 0x24($sp) +/* 969810 80240650 8FB00020 */ lw $s0, 0x20($sp) +/* 969814 80240654 24020002 */ addiu $v0, $zero, 2 +/* 969818 80240658 03E00008 */ jr $ra +/* 96981C 8024065C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660.s deleted file mode 100644 index c68ac92076..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240660 -/* 969820 80240660 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 969824 80240664 AFBF0014 */ sw $ra, 0x14($sp) -/* 969828 80240668 AFB00010 */ sw $s0, 0x10($sp) -/* 96982C 8024066C 0C00EABB */ jal get_npc_unsafe -/* 969830 80240670 8C84014C */ lw $a0, 0x14c($a0) -/* 969834 80240674 24040008 */ addiu $a0, $zero, 8 -/* 969838 80240678 0040802D */ daddu $s0, $v0, $zero -/* 96983C 8024067C 3C028024 */ lui $v0, 0x8024 -/* 969840 80240680 244206CC */ addiu $v0, $v0, 0x6cc -/* 969844 80240684 0C00AB39 */ jal heap_malloc -/* 969848 80240688 AE020008 */ sw $v0, 8($s0) -/* 96984C 8024068C 0040182D */ daddu $v1, $v0, $zero -/* 969850 80240690 AE030020 */ sw $v1, 0x20($s0) -/* 969854 80240694 AC600000 */ sw $zero, ($v1) -/* 969858 80240698 8FBF0014 */ lw $ra, 0x14($sp) -/* 96985C 8024069C 8FB00010 */ lw $s0, 0x10($sp) -/* 969860 802406A0 24020001 */ addiu $v0, $zero, 1 -/* 969864 802406A4 03E00008 */ jr $ra -/* 969868 802406A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s new file mode 100644 index 0000000000..e4724502ee --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240660_969820.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240660_969820 +/* 969820 80240660 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 969824 80240664 AFBF0014 */ sw $ra, 0x14($sp) +/* 969828 80240668 AFB00010 */ sw $s0, 0x10($sp) +/* 96982C 8024066C 0C00EABB */ jal get_npc_unsafe +/* 969830 80240670 8C84014C */ lw $a0, 0x14c($a0) +/* 969834 80240674 24040008 */ addiu $a0, $zero, 8 +/* 969838 80240678 0040802D */ daddu $s0, $v0, $zero +/* 96983C 8024067C 3C028024 */ lui $v0, 0x8024 +/* 969840 80240680 244206CC */ addiu $v0, $v0, 0x6cc +/* 969844 80240684 0C00AB39 */ jal heap_malloc +/* 969848 80240688 AE020008 */ sw $v0, 8($s0) +/* 96984C 8024068C 0040182D */ daddu $v1, $v0, $zero +/* 969850 80240690 AE030020 */ sw $v1, 0x20($s0) +/* 969854 80240694 AC600000 */ sw $zero, ($v1) +/* 969858 80240698 8FBF0014 */ lw $ra, 0x14($sp) +/* 96985C 8024069C 8FB00010 */ lw $s0, 0x10($sp) +/* 969860 802406A0 24020001 */ addiu $v0, $zero, 1 +/* 969864 802406A4 03E00008 */ jr $ra +/* 969868 802406A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC.s deleted file mode 100644 index 22f7f58cac..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406CC -/* 96988C 802406CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 969890 802406D0 3C03800A */ lui $v1, 0x800a -/* 969894 802406D4 8463A634 */ lh $v1, -0x59cc($v1) -/* 969898 802406D8 3C05800B */ lui $a1, %hi(gCameras) -/* 96989C 802406DC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 9698A0 802406E0 AFBF0010 */ sw $ra, 0x10($sp) -/* 9698A4 802406E4 00031080 */ sll $v0, $v1, 2 -/* 9698A8 802406E8 00431021 */ addu $v0, $v0, $v1 -/* 9698AC 802406EC 00021080 */ sll $v0, $v0, 2 -/* 9698B0 802406F0 00431023 */ subu $v0, $v0, $v1 -/* 9698B4 802406F4 000218C0 */ sll $v1, $v0, 3 -/* 9698B8 802406F8 00431021 */ addu $v0, $v0, $v1 -/* 9698BC 802406FC 8C830020 */ lw $v1, 0x20($a0) -/* 9698C0 80240700 000210C0 */ sll $v0, $v0, 3 -/* 9698C4 80240704 8C630000 */ lw $v1, ($v1) -/* 9698C8 80240708 30630001 */ andi $v1, $v1, 1 -/* 9698CC 8024070C 10600004 */ beqz $v1, .L80240720 -/* 9698D0 80240710 00451021 */ addu $v0, $v0, $a1 -/* 9698D4 80240714 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 9698D8 80240718 0C00A6C9 */ jal clamp_angle -/* 9698DC 8024071C 46006307 */ neg.s $f12, $f12 -.L80240720: -/* 9698E0 80240720 8FBF0010 */ lw $ra, 0x10($sp) -/* 9698E4 80240724 03E00008 */ jr $ra -/* 9698E8 80240728 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s new file mode 100644 index 0000000000..6d5fc8e0e5 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406CC_96988C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406CC_96988C +/* 96988C 802406CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 969890 802406D0 3C03800A */ lui $v1, 0x800a +/* 969894 802406D4 8463A634 */ lh $v1, -0x59cc($v1) +/* 969898 802406D8 3C05800B */ lui $a1, %hi(gCameras) +/* 96989C 802406DC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 9698A0 802406E0 AFBF0010 */ sw $ra, 0x10($sp) +/* 9698A4 802406E4 00031080 */ sll $v0, $v1, 2 +/* 9698A8 802406E8 00431021 */ addu $v0, $v0, $v1 +/* 9698AC 802406EC 00021080 */ sll $v0, $v0, 2 +/* 9698B0 802406F0 00431023 */ subu $v0, $v0, $v1 +/* 9698B4 802406F4 000218C0 */ sll $v1, $v0, 3 +/* 9698B8 802406F8 00431021 */ addu $v0, $v0, $v1 +/* 9698BC 802406FC 8C830020 */ lw $v1, 0x20($a0) +/* 9698C0 80240700 000210C0 */ sll $v0, $v0, 3 +/* 9698C4 80240704 8C630000 */ lw $v1, ($v1) +/* 9698C8 80240708 30630001 */ andi $v1, $v1, 1 +/* 9698CC 8024070C 10600004 */ beqz $v1, .L80240720 +/* 9698D0 80240710 00451021 */ addu $v0, $v0, $a1 +/* 9698D4 80240714 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 9698D8 80240718 0C00A6C9 */ jal clamp_angle +/* 9698DC 8024071C 46006307 */ neg.s $f12, $f12 +.L80240720: +/* 9698E0 80240720 8FBF0010 */ lw $ra, 0x10($sp) +/* 9698E4 80240724 03E00008 */ jr $ra +/* 9698E8 80240728 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C.s deleted file mode 100644 index 7c7c476925..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024072C -/* 9698EC 8024072C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9698F0 80240730 AFB10014 */ sw $s1, 0x14($sp) -/* 9698F4 80240734 0080882D */ daddu $s1, $a0, $zero -/* 9698F8 80240738 AFBF0024 */ sw $ra, 0x24($sp) -/* 9698FC 8024073C AFB40020 */ sw $s4, 0x20($sp) -/* 969900 80240740 AFB3001C */ sw $s3, 0x1c($sp) -/* 969904 80240744 AFB20018 */ sw $s2, 0x18($sp) -/* 969908 80240748 10A00033 */ beqz $a1, .L80240818 -/* 96990C 8024074C AFB00010 */ sw $s0, 0x10($sp) -/* 969910 80240750 0C04760B */ jal func_8011D82C -/* 969914 80240754 24040001 */ addiu $a0, $zero, 1 -/* 969918 80240758 0000202D */ daddu $a0, $zero, $zero -/* 96991C 8024075C 0080282D */ daddu $a1, $a0, $zero -/* 969920 80240760 0080302D */ daddu $a2, $a0, $zero -/* 969924 80240764 0080382D */ daddu $a3, $a0, $zero -/* 969928 80240768 0080802D */ daddu $s0, $a0, $zero -/* 96992C 8024076C 2414FFFC */ addiu $s4, $zero, -4 -/* 969930 80240770 2413000A */ addiu $s3, $zero, 0xa -/* 969934 80240774 3C120080 */ lui $s2, 0x80 -/* 969938 80240778 3C038015 */ lui $v1, 0x8015 -/* 96993C 8024077C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 969940 80240780 24020001 */ addiu $v0, $zero, 1 -/* 969944 80240784 0C046F97 */ jal set_background_color_blend -/* 969948 80240788 A0620000 */ sb $v0, ($v1) -.L8024078C: -/* 96994C 8024078C 0C00E2B7 */ jal get_npc_by_index -/* 969950 80240790 0200202D */ daddu $a0, $s0, $zero -/* 969954 80240794 0040202D */ daddu $a0, $v0, $zero -/* 969958 80240798 5080000B */ beql $a0, $zero, .L802407C8 -/* 96995C 8024079C 26100001 */ addiu $s0, $s0, 1 -/* 969960 802407A0 8C820000 */ lw $v0, ($a0) -/* 969964 802407A4 50400008 */ beql $v0, $zero, .L802407C8 -/* 969968 802407A8 26100001 */ addiu $s0, $s0, 1 -/* 96996C 802407AC 808300A4 */ lb $v1, 0xa4($a0) -/* 969970 802407B0 10740005 */ beq $v1, $s4, .L802407C8 -/* 969974 802407B4 26100001 */ addiu $s0, $s0, 1 -/* 969978 802407B8 10730003 */ beq $v1, $s3, .L802407C8 -/* 96997C 802407BC 00000000 */ nop -/* 969980 802407C0 00521025 */ or $v0, $v0, $s2 -/* 969984 802407C4 AC820000 */ sw $v0, ($a0) -.L802407C8: -/* 969988 802407C8 2A020040 */ slti $v0, $s0, 0x40 -/* 96998C 802407CC 1440FFEF */ bnez $v0, .L8024078C -/* 969990 802407D0 00000000 */ nop -/* 969994 802407D4 0000802D */ daddu $s0, $zero, $zero -/* 969998 802407D8 3C120800 */ lui $s2, 0x800 -.L802407DC: -/* 96999C 802407DC 0C04C3D6 */ jal get_item_entity -/* 9699A0 802407E0 0200202D */ daddu $a0, $s0, $zero -/* 9699A4 802407E4 0040182D */ daddu $v1, $v0, $zero -/* 9699A8 802407E8 10600007 */ beqz $v1, .L80240808 -/* 9699AC 802407EC 26100001 */ addiu $s0, $s0, 1 -/* 9699B0 802407F0 8C640000 */ lw $a0, ($v1) -/* 9699B4 802407F4 30820010 */ andi $v0, $a0, 0x10 -/* 9699B8 802407F8 10400003 */ beqz $v0, .L80240808 -/* 9699BC 802407FC 00000000 */ nop -/* 9699C0 80240800 00921025 */ or $v0, $a0, $s2 -/* 9699C4 80240804 AC620000 */ sw $v0, ($v1) -.L80240808: -/* 9699C8 80240808 2A020100 */ slti $v0, $s0, 0x100 -/* 9699CC 8024080C 1440FFF3 */ bnez $v0, .L802407DC -/* 9699D0 80240810 00000000 */ nop -/* 9699D4 80240814 AE200070 */ sw $zero, 0x70($s1) -.L80240818: -/* 9699D8 80240818 8E220070 */ lw $v0, 0x70($s1) -/* 9699DC 8024081C 24420008 */ addiu $v0, $v0, 8 -/* 9699E0 80240820 AE220070 */ sw $v0, 0x70($s1) -/* 9699E4 80240824 28420100 */ slti $v0, $v0, 0x100 -/* 9699E8 80240828 14400003 */ bnez $v0, .L80240838 -/* 9699EC 8024082C 0000202D */ daddu $a0, $zero, $zero -/* 9699F0 80240830 240200FF */ addiu $v0, $zero, 0xff -/* 9699F4 80240834 AE220070 */ sw $v0, 0x70($s1) -.L80240838: -/* 9699F8 80240838 0080282D */ daddu $a1, $a0, $zero -/* 9699FC 8024083C 92270073 */ lbu $a3, 0x73($s1) -/* 969A00 80240840 0C046F97 */ jal set_background_color_blend -/* 969A04 80240844 0080302D */ daddu $a2, $a0, $zero -/* 969A08 80240848 8E220070 */ lw $v0, 0x70($s1) -/* 969A0C 8024084C 8FBF0024 */ lw $ra, 0x24($sp) -/* 969A10 80240850 8FB40020 */ lw $s4, 0x20($sp) -/* 969A14 80240854 8FB3001C */ lw $s3, 0x1c($sp) -/* 969A18 80240858 8FB20018 */ lw $s2, 0x18($sp) -/* 969A1C 8024085C 8FB10014 */ lw $s1, 0x14($sp) -/* 969A20 80240860 8FB00010 */ lw $s0, 0x10($sp) -/* 969A24 80240864 384200FF */ xori $v0, $v0, 0xff -/* 969A28 80240868 2C420001 */ sltiu $v0, $v0, 1 -/* 969A2C 8024086C 00021040 */ sll $v0, $v0, 1 -/* 969A30 80240870 03E00008 */ jr $ra -/* 969A34 80240874 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s new file mode 100644 index 0000000000..85264e64d5 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024072C_9698EC.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024072C_9698EC +/* 9698EC 8024072C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9698F0 80240730 AFB10014 */ sw $s1, 0x14($sp) +/* 9698F4 80240734 0080882D */ daddu $s1, $a0, $zero +/* 9698F8 80240738 AFBF0024 */ sw $ra, 0x24($sp) +/* 9698FC 8024073C AFB40020 */ sw $s4, 0x20($sp) +/* 969900 80240740 AFB3001C */ sw $s3, 0x1c($sp) +/* 969904 80240744 AFB20018 */ sw $s2, 0x18($sp) +/* 969908 80240748 10A00033 */ beqz $a1, .L80240818 +/* 96990C 8024074C AFB00010 */ sw $s0, 0x10($sp) +/* 969910 80240750 0C04760B */ jal func_8011D82C +/* 969914 80240754 24040001 */ addiu $a0, $zero, 1 +/* 969918 80240758 0000202D */ daddu $a0, $zero, $zero +/* 96991C 8024075C 0080282D */ daddu $a1, $a0, $zero +/* 969920 80240760 0080302D */ daddu $a2, $a0, $zero +/* 969924 80240764 0080382D */ daddu $a3, $a0, $zero +/* 969928 80240768 0080802D */ daddu $s0, $a0, $zero +/* 96992C 8024076C 2414FFFC */ addiu $s4, $zero, -4 +/* 969930 80240770 2413000A */ addiu $s3, $zero, 0xa +/* 969934 80240774 3C120080 */ lui $s2, 0x80 +/* 969938 80240778 3C038015 */ lui $v1, 0x8015 +/* 96993C 8024077C 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 969940 80240780 24020001 */ addiu $v0, $zero, 1 +/* 969944 80240784 0C046F97 */ jal set_background_color_blend +/* 969948 80240788 A0620000 */ sb $v0, ($v1) +.L8024078C: +/* 96994C 8024078C 0C00E2B7 */ jal get_npc_by_index +/* 969950 80240790 0200202D */ daddu $a0, $s0, $zero +/* 969954 80240794 0040202D */ daddu $a0, $v0, $zero +/* 969958 80240798 5080000B */ beql $a0, $zero, .L802407C8 +/* 96995C 8024079C 26100001 */ addiu $s0, $s0, 1 +/* 969960 802407A0 8C820000 */ lw $v0, ($a0) +/* 969964 802407A4 50400008 */ beql $v0, $zero, .L802407C8 +/* 969968 802407A8 26100001 */ addiu $s0, $s0, 1 +/* 96996C 802407AC 808300A4 */ lb $v1, 0xa4($a0) +/* 969970 802407B0 10740005 */ beq $v1, $s4, .L802407C8 +/* 969974 802407B4 26100001 */ addiu $s0, $s0, 1 +/* 969978 802407B8 10730003 */ beq $v1, $s3, .L802407C8 +/* 96997C 802407BC 00000000 */ nop +/* 969980 802407C0 00521025 */ or $v0, $v0, $s2 +/* 969984 802407C4 AC820000 */ sw $v0, ($a0) +.L802407C8: +/* 969988 802407C8 2A020040 */ slti $v0, $s0, 0x40 +/* 96998C 802407CC 1440FFEF */ bnez $v0, .L8024078C +/* 969990 802407D0 00000000 */ nop +/* 969994 802407D4 0000802D */ daddu $s0, $zero, $zero +/* 969998 802407D8 3C120800 */ lui $s2, 0x800 +.L802407DC: +/* 96999C 802407DC 0C04C3D6 */ jal get_item_entity +/* 9699A0 802407E0 0200202D */ daddu $a0, $s0, $zero +/* 9699A4 802407E4 0040182D */ daddu $v1, $v0, $zero +/* 9699A8 802407E8 10600007 */ beqz $v1, .L80240808 +/* 9699AC 802407EC 26100001 */ addiu $s0, $s0, 1 +/* 9699B0 802407F0 8C640000 */ lw $a0, ($v1) +/* 9699B4 802407F4 30820010 */ andi $v0, $a0, 0x10 +/* 9699B8 802407F8 10400003 */ beqz $v0, .L80240808 +/* 9699BC 802407FC 00000000 */ nop +/* 9699C0 80240800 00921025 */ or $v0, $a0, $s2 +/* 9699C4 80240804 AC620000 */ sw $v0, ($v1) +.L80240808: +/* 9699C8 80240808 2A020100 */ slti $v0, $s0, 0x100 +/* 9699CC 8024080C 1440FFF3 */ bnez $v0, .L802407DC +/* 9699D0 80240810 00000000 */ nop +/* 9699D4 80240814 AE200070 */ sw $zero, 0x70($s1) +.L80240818: +/* 9699D8 80240818 8E220070 */ lw $v0, 0x70($s1) +/* 9699DC 8024081C 24420008 */ addiu $v0, $v0, 8 +/* 9699E0 80240820 AE220070 */ sw $v0, 0x70($s1) +/* 9699E4 80240824 28420100 */ slti $v0, $v0, 0x100 +/* 9699E8 80240828 14400003 */ bnez $v0, .L80240838 +/* 9699EC 8024082C 0000202D */ daddu $a0, $zero, $zero +/* 9699F0 80240830 240200FF */ addiu $v0, $zero, 0xff +/* 9699F4 80240834 AE220070 */ sw $v0, 0x70($s1) +.L80240838: +/* 9699F8 80240838 0080282D */ daddu $a1, $a0, $zero +/* 9699FC 8024083C 92270073 */ lbu $a3, 0x73($s1) +/* 969A00 80240840 0C046F97 */ jal set_background_color_blend +/* 969A04 80240844 0080302D */ daddu $a2, $a0, $zero +/* 969A08 80240848 8E220070 */ lw $v0, 0x70($s1) +/* 969A0C 8024084C 8FBF0024 */ lw $ra, 0x24($sp) +/* 969A10 80240850 8FB40020 */ lw $s4, 0x20($sp) +/* 969A14 80240854 8FB3001C */ lw $s3, 0x1c($sp) +/* 969A18 80240858 8FB20018 */ lw $s2, 0x18($sp) +/* 969A1C 8024085C 8FB10014 */ lw $s1, 0x14($sp) +/* 969A20 80240860 8FB00010 */ lw $s0, 0x10($sp) +/* 969A24 80240864 384200FF */ xori $v0, $v0, 0xff +/* 969A28 80240868 2C420001 */ sltiu $v0, $v0, 1 +/* 969A2C 8024086C 00021040 */ sll $v0, $v0, 1 +/* 969A30 80240870 03E00008 */ jr $ra +/* 969A34 80240874 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878.s deleted file mode 100644 index 8f4de26cf7..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240878 -/* 969A38 80240878 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 969A3C 8024087C AFB00010 */ sw $s0, 0x10($sp) -/* 969A40 80240880 0080802D */ daddu $s0, $a0, $zero -/* 969A44 80240884 AFBF0020 */ sw $ra, 0x20($sp) -/* 969A48 80240888 AFB3001C */ sw $s3, 0x1c($sp) -/* 969A4C 8024088C AFB20018 */ sw $s2, 0x18($sp) -/* 969A50 80240890 10A00009 */ beqz $a1, .L802408B8 -/* 969A54 80240894 AFB10014 */ sw $s1, 0x14($sp) -/* 969A58 80240898 0000202D */ daddu $a0, $zero, $zero -/* 969A5C 8024089C 0080282D */ daddu $a1, $a0, $zero -/* 969A60 802408A0 0080302D */ daddu $a2, $a0, $zero -/* 969A64 802408A4 0C046F97 */ jal set_background_color_blend -/* 969A68 802408A8 240700FF */ addiu $a3, $zero, 0xff -/* 969A6C 802408AC 240200FF */ addiu $v0, $zero, 0xff -/* 969A70 802408B0 AE020070 */ sw $v0, 0x70($s0) -/* 969A74 802408B4 AE000074 */ sw $zero, 0x74($s0) -.L802408B8: -/* 969A78 802408B8 8E020070 */ lw $v0, 0x70($s0) -/* 969A7C 802408BC 2442FFF8 */ addiu $v0, $v0, -8 -/* 969A80 802408C0 04410002 */ bgez $v0, .L802408CC -/* 969A84 802408C4 AE020070 */ sw $v0, 0x70($s0) -/* 969A88 802408C8 AE000070 */ sw $zero, 0x70($s0) -.L802408CC: -/* 969A8C 802408CC 0000202D */ daddu $a0, $zero, $zero -/* 969A90 802408D0 0080282D */ daddu $a1, $a0, $zero -/* 969A94 802408D4 92070073 */ lbu $a3, 0x73($s0) -/* 969A98 802408D8 0C046F97 */ jal set_background_color_blend -/* 969A9C 802408DC 0080302D */ daddu $a2, $a0, $zero -/* 969AA0 802408E0 8E020070 */ lw $v0, 0x70($s0) -/* 969AA4 802408E4 14400006 */ bnez $v0, .L80240900 -/* 969AA8 802408E8 00000000 */ nop -/* 969AAC 802408EC 8E020074 */ lw $v0, 0x74($s0) -/* 969AB0 802408F0 14400003 */ bnez $v0, .L80240900 -/* 969AB4 802408F4 24020001 */ addiu $v0, $zero, 1 -/* 969AB8 802408F8 08090273 */ j .L802409CC -/* 969ABC 802408FC AE020074 */ sw $v0, 0x74($s0) -.L80240900: -/* 969AC0 80240900 8E030074 */ lw $v1, 0x74($s0) -/* 969AC4 80240904 24020001 */ addiu $v0, $zero, 1 -/* 969AC8 80240908 14620031 */ bne $v1, $v0, .L802409D0 -/* 969ACC 8024090C 0000102D */ daddu $v0, $zero, $zero -/* 969AD0 80240910 0C04760B */ jal func_8011D82C -/* 969AD4 80240914 0000202D */ daddu $a0, $zero, $zero -/* 969AD8 80240918 0000802D */ daddu $s0, $zero, $zero -/* 969ADC 8024091C 2413FFFC */ addiu $s3, $zero, -4 -/* 969AE0 80240920 2412000A */ addiu $s2, $zero, 0xa -/* 969AE4 80240924 3C11FF7F */ lui $s1, 0xff7f -/* 969AE8 80240928 3C028015 */ lui $v0, 0x8015 -/* 969AEC 8024092C 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 969AF0 80240930 3631FFFF */ ori $s1, $s1, 0xffff -/* 969AF4 80240934 A0400000 */ sb $zero, ($v0) -.L80240938: -/* 969AF8 80240938 0C00E2B7 */ jal get_npc_by_index -/* 969AFC 8024093C 0200202D */ daddu $a0, $s0, $zero -/* 969B00 80240940 0040202D */ daddu $a0, $v0, $zero -/* 969B04 80240944 5080000B */ beql $a0, $zero, .L80240974 -/* 969B08 80240948 26100001 */ addiu $s0, $s0, 1 -/* 969B0C 8024094C 8C820000 */ lw $v0, ($a0) -/* 969B10 80240950 50400008 */ beql $v0, $zero, .L80240974 -/* 969B14 80240954 26100001 */ addiu $s0, $s0, 1 -/* 969B18 80240958 808300A4 */ lb $v1, 0xa4($a0) -/* 969B1C 8024095C 10730005 */ beq $v1, $s3, .L80240974 -/* 969B20 80240960 26100001 */ addiu $s0, $s0, 1 -/* 969B24 80240964 10720003 */ beq $v1, $s2, .L80240974 -/* 969B28 80240968 00000000 */ nop -/* 969B2C 8024096C 00511024 */ and $v0, $v0, $s1 -/* 969B30 80240970 AC820000 */ sw $v0, ($a0) -.L80240974: -/* 969B34 80240974 2A020040 */ slti $v0, $s0, 0x40 -/* 969B38 80240978 1440FFEF */ bnez $v0, .L80240938 -/* 969B3C 8024097C 00000000 */ nop -/* 969B40 80240980 0000802D */ daddu $s0, $zero, $zero -/* 969B44 80240984 3C11F7FF */ lui $s1, 0xf7ff -/* 969B48 80240988 3631FFFF */ ori $s1, $s1, 0xffff -.L8024098C: -/* 969B4C 8024098C 0C04C3D6 */ jal get_item_entity -/* 969B50 80240990 0200202D */ daddu $a0, $s0, $zero -/* 969B54 80240994 0040182D */ daddu $v1, $v0, $zero -/* 969B58 80240998 10600007 */ beqz $v1, .L802409B8 -/* 969B5C 8024099C 26100001 */ addiu $s0, $s0, 1 -/* 969B60 802409A0 8C640000 */ lw $a0, ($v1) -/* 969B64 802409A4 30820010 */ andi $v0, $a0, 0x10 -/* 969B68 802409A8 10400003 */ beqz $v0, .L802409B8 -/* 969B6C 802409AC 00000000 */ nop -/* 969B70 802409B0 00911024 */ and $v0, $a0, $s1 -/* 969B74 802409B4 AC620000 */ sw $v0, ($v1) -.L802409B8: -/* 969B78 802409B8 2A020100 */ slti $v0, $s0, 0x100 -/* 969B7C 802409BC 1440FFF3 */ bnez $v0, .L8024098C -/* 969B80 802409C0 24020002 */ addiu $v0, $zero, 2 -/* 969B84 802409C4 08090274 */ j .L802409D0 -/* 969B88 802409C8 00000000 */ nop -.L802409CC: -/* 969B8C 802409CC 0000102D */ daddu $v0, $zero, $zero -.L802409D0: -/* 969B90 802409D0 8FBF0020 */ lw $ra, 0x20($sp) -/* 969B94 802409D4 8FB3001C */ lw $s3, 0x1c($sp) -/* 969B98 802409D8 8FB20018 */ lw $s2, 0x18($sp) -/* 969B9C 802409DC 8FB10014 */ lw $s1, 0x14($sp) -/* 969BA0 802409E0 8FB00010 */ lw $s0, 0x10($sp) -/* 969BA4 802409E4 03E00008 */ jr $ra -/* 969BA8 802409E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s new file mode 100644 index 0000000000..22bcb8a1eb --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240878_969A38.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240878_969A38 +/* 969A38 80240878 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 969A3C 8024087C AFB00010 */ sw $s0, 0x10($sp) +/* 969A40 80240880 0080802D */ daddu $s0, $a0, $zero +/* 969A44 80240884 AFBF0020 */ sw $ra, 0x20($sp) +/* 969A48 80240888 AFB3001C */ sw $s3, 0x1c($sp) +/* 969A4C 8024088C AFB20018 */ sw $s2, 0x18($sp) +/* 969A50 80240890 10A00009 */ beqz $a1, .L802408B8 +/* 969A54 80240894 AFB10014 */ sw $s1, 0x14($sp) +/* 969A58 80240898 0000202D */ daddu $a0, $zero, $zero +/* 969A5C 8024089C 0080282D */ daddu $a1, $a0, $zero +/* 969A60 802408A0 0080302D */ daddu $a2, $a0, $zero +/* 969A64 802408A4 0C046F97 */ jal set_background_color_blend +/* 969A68 802408A8 240700FF */ addiu $a3, $zero, 0xff +/* 969A6C 802408AC 240200FF */ addiu $v0, $zero, 0xff +/* 969A70 802408B0 AE020070 */ sw $v0, 0x70($s0) +/* 969A74 802408B4 AE000074 */ sw $zero, 0x74($s0) +.L802408B8: +/* 969A78 802408B8 8E020070 */ lw $v0, 0x70($s0) +/* 969A7C 802408BC 2442FFF8 */ addiu $v0, $v0, -8 +/* 969A80 802408C0 04410002 */ bgez $v0, .L802408CC +/* 969A84 802408C4 AE020070 */ sw $v0, 0x70($s0) +/* 969A88 802408C8 AE000070 */ sw $zero, 0x70($s0) +.L802408CC: +/* 969A8C 802408CC 0000202D */ daddu $a0, $zero, $zero +/* 969A90 802408D0 0080282D */ daddu $a1, $a0, $zero +/* 969A94 802408D4 92070073 */ lbu $a3, 0x73($s0) +/* 969A98 802408D8 0C046F97 */ jal set_background_color_blend +/* 969A9C 802408DC 0080302D */ daddu $a2, $a0, $zero +/* 969AA0 802408E0 8E020070 */ lw $v0, 0x70($s0) +/* 969AA4 802408E4 14400006 */ bnez $v0, .L80240900 +/* 969AA8 802408E8 00000000 */ nop +/* 969AAC 802408EC 8E020074 */ lw $v0, 0x74($s0) +/* 969AB0 802408F0 14400003 */ bnez $v0, .L80240900 +/* 969AB4 802408F4 24020001 */ addiu $v0, $zero, 1 +/* 969AB8 802408F8 08090273 */ j .L802409CC +/* 969ABC 802408FC AE020074 */ sw $v0, 0x74($s0) +.L80240900: +/* 969AC0 80240900 8E030074 */ lw $v1, 0x74($s0) +/* 969AC4 80240904 24020001 */ addiu $v0, $zero, 1 +/* 969AC8 80240908 14620031 */ bne $v1, $v0, .L802409D0 +/* 969ACC 8024090C 0000102D */ daddu $v0, $zero, $zero +/* 969AD0 80240910 0C04760B */ jal func_8011D82C +/* 969AD4 80240914 0000202D */ daddu $a0, $zero, $zero +/* 969AD8 80240918 0000802D */ daddu $s0, $zero, $zero +/* 969ADC 8024091C 2413FFFC */ addiu $s3, $zero, -4 +/* 969AE0 80240920 2412000A */ addiu $s2, $zero, 0xa +/* 969AE4 80240924 3C11FF7F */ lui $s1, 0xff7f +/* 969AE8 80240928 3C028015 */ lui $v0, 0x8015 +/* 969AEC 8024092C 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 969AF0 80240930 3631FFFF */ ori $s1, $s1, 0xffff +/* 969AF4 80240934 A0400000 */ sb $zero, ($v0) +.L80240938: +/* 969AF8 80240938 0C00E2B7 */ jal get_npc_by_index +/* 969AFC 8024093C 0200202D */ daddu $a0, $s0, $zero +/* 969B00 80240940 0040202D */ daddu $a0, $v0, $zero +/* 969B04 80240944 5080000B */ beql $a0, $zero, .L80240974 +/* 969B08 80240948 26100001 */ addiu $s0, $s0, 1 +/* 969B0C 8024094C 8C820000 */ lw $v0, ($a0) +/* 969B10 80240950 50400008 */ beql $v0, $zero, .L80240974 +/* 969B14 80240954 26100001 */ addiu $s0, $s0, 1 +/* 969B18 80240958 808300A4 */ lb $v1, 0xa4($a0) +/* 969B1C 8024095C 10730005 */ beq $v1, $s3, .L80240974 +/* 969B20 80240960 26100001 */ addiu $s0, $s0, 1 +/* 969B24 80240964 10720003 */ beq $v1, $s2, .L80240974 +/* 969B28 80240968 00000000 */ nop +/* 969B2C 8024096C 00511024 */ and $v0, $v0, $s1 +/* 969B30 80240970 AC820000 */ sw $v0, ($a0) +.L80240974: +/* 969B34 80240974 2A020040 */ slti $v0, $s0, 0x40 +/* 969B38 80240978 1440FFEF */ bnez $v0, .L80240938 +/* 969B3C 8024097C 00000000 */ nop +/* 969B40 80240980 0000802D */ daddu $s0, $zero, $zero +/* 969B44 80240984 3C11F7FF */ lui $s1, 0xf7ff +/* 969B48 80240988 3631FFFF */ ori $s1, $s1, 0xffff +.L8024098C: +/* 969B4C 8024098C 0C04C3D6 */ jal get_item_entity +/* 969B50 80240990 0200202D */ daddu $a0, $s0, $zero +/* 969B54 80240994 0040182D */ daddu $v1, $v0, $zero +/* 969B58 80240998 10600007 */ beqz $v1, .L802409B8 +/* 969B5C 8024099C 26100001 */ addiu $s0, $s0, 1 +/* 969B60 802409A0 8C640000 */ lw $a0, ($v1) +/* 969B64 802409A4 30820010 */ andi $v0, $a0, 0x10 +/* 969B68 802409A8 10400003 */ beqz $v0, .L802409B8 +/* 969B6C 802409AC 00000000 */ nop +/* 969B70 802409B0 00911024 */ and $v0, $a0, $s1 +/* 969B74 802409B4 AC620000 */ sw $v0, ($v1) +.L802409B8: +/* 969B78 802409B8 2A020100 */ slti $v0, $s0, 0x100 +/* 969B7C 802409BC 1440FFF3 */ bnez $v0, .L8024098C +/* 969B80 802409C0 24020002 */ addiu $v0, $zero, 2 +/* 969B84 802409C4 08090274 */ j .L802409D0 +/* 969B88 802409C8 00000000 */ nop +.L802409CC: +/* 969B8C 802409CC 0000102D */ daddu $v0, $zero, $zero +.L802409D0: +/* 969B90 802409D0 8FBF0020 */ lw $ra, 0x20($sp) +/* 969B94 802409D4 8FB3001C */ lw $s3, 0x1c($sp) +/* 969B98 802409D8 8FB20018 */ lw $s2, 0x18($sp) +/* 969B9C 802409DC 8FB10014 */ lw $s1, 0x14($sp) +/* 969BA0 802409E0 8FB00010 */ lw $s0, 0x10($sp) +/* 969BA4 802409E4 03E00008 */ jr $ra +/* 969BA8 802409E8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC.s deleted file mode 100644 index 627c388065..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409EC -/* 969BAC 802409EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 969BB0 802409F0 AFB00010 */ sw $s0, 0x10($sp) -/* 969BB4 802409F4 3C108011 */ lui $s0, %hi(gPlayerData) -/* 969BB8 802409F8 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 969BBC 802409FC AFBF0018 */ sw $ra, 0x18($sp) -/* 969BC0 80240A00 AFB10014 */ sw $s1, 0x14($sp) -/* 969BC4 80240A04 960302C0 */ lhu $v1, 0x2c0($s0) -/* 969BC8 80240A08 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 969BCC 80240A0C 10400003 */ beqz $v0, .L80240A1C -/* 969BD0 80240A10 0080882D */ daddu $s1, $a0, $zero -/* 969BD4 80240A14 24620001 */ addiu $v0, $v1, 1 -/* 969BD8 80240A18 A60202C0 */ sh $v0, 0x2c0($s0) -.L80240A1C: -/* 969BDC 80240A1C 3C05F5DE */ lui $a1, 0xf5de -/* 969BE0 80240A20 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 969BE4 80240A24 0C0B1EAF */ jal get_variable -/* 969BE8 80240A28 0000202D */ daddu $a0, $zero, $zero -/* 969BEC 80240A2C 3C038024 */ lui $v1, 0x8024 -/* 969BF0 80240A30 00621821 */ addu $v1, $v1, $v0 -/* 969BF4 80240A34 90634E44 */ lbu $v1, 0x4e44($v1) -/* 969BF8 80240A38 8E220084 */ lw $v0, 0x84($s1) -/* 969BFC 80240A3C 54430006 */ bnel $v0, $v1, .L80240A58 -/* 969C00 80240A40 AE200084 */ sw $zero, 0x84($s1) -/* 969C04 80240A44 24020001 */ addiu $v0, $zero, 1 -/* 969C08 80240A48 AE220084 */ sw $v0, 0x84($s1) -/* 969C0C 80240A4C 960202C2 */ lhu $v0, 0x2c2($s0) -/* 969C10 80240A50 24420001 */ addiu $v0, $v0, 1 -/* 969C14 80240A54 A60202C2 */ sh $v0, 0x2c2($s0) -.L80240A58: -/* 969C18 80240A58 8FBF0018 */ lw $ra, 0x18($sp) -/* 969C1C 80240A5C 8FB10014 */ lw $s1, 0x14($sp) -/* 969C20 80240A60 8FB00010 */ lw $s0, 0x10($sp) -/* 969C24 80240A64 24020002 */ addiu $v0, $zero, 2 -/* 969C28 80240A68 03E00008 */ jr $ra -/* 969C2C 80240A6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s new file mode 100644 index 0000000000..731d32967d --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802409EC_969BAC.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409EC_969BAC +/* 969BAC 802409EC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 969BB0 802409F0 AFB00010 */ sw $s0, 0x10($sp) +/* 969BB4 802409F4 3C108011 */ lui $s0, %hi(gPlayerData) +/* 969BB8 802409F8 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 969BBC 802409FC AFBF0018 */ sw $ra, 0x18($sp) +/* 969BC0 80240A00 AFB10014 */ sw $s1, 0x14($sp) +/* 969BC4 80240A04 960302C0 */ lhu $v1, 0x2c0($s0) +/* 969BC8 80240A08 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 969BCC 80240A0C 10400003 */ beqz $v0, .L80240A1C +/* 969BD0 80240A10 0080882D */ daddu $s1, $a0, $zero +/* 969BD4 80240A14 24620001 */ addiu $v0, $v1, 1 +/* 969BD8 80240A18 A60202C0 */ sh $v0, 0x2c0($s0) +.L80240A1C: +/* 969BDC 80240A1C 3C05F5DE */ lui $a1, 0xf5de +/* 969BE0 80240A20 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 969BE4 80240A24 0C0B1EAF */ jal get_variable +/* 969BE8 80240A28 0000202D */ daddu $a0, $zero, $zero +/* 969BEC 80240A2C 3C038024 */ lui $v1, 0x8024 +/* 969BF0 80240A30 00621821 */ addu $v1, $v1, $v0 +/* 969BF4 80240A34 90634E44 */ lbu $v1, 0x4e44($v1) +/* 969BF8 80240A38 8E220084 */ lw $v0, 0x84($s1) +/* 969BFC 80240A3C 54430006 */ bnel $v0, $v1, .L80240A58 +/* 969C00 80240A40 AE200084 */ sw $zero, 0x84($s1) +/* 969C04 80240A44 24020001 */ addiu $v0, $zero, 1 +/* 969C08 80240A48 AE220084 */ sw $v0, 0x84($s1) +/* 969C0C 80240A4C 960202C2 */ lhu $v0, 0x2c2($s0) +/* 969C10 80240A50 24420001 */ addiu $v0, $v0, 1 +/* 969C14 80240A54 A60202C2 */ sh $v0, 0x2c2($s0) +.L80240A58: +/* 969C18 80240A58 8FBF0018 */ lw $ra, 0x18($sp) +/* 969C1C 80240A5C 8FB10014 */ lw $s1, 0x14($sp) +/* 969C20 80240A60 8FB00010 */ lw $s0, 0x10($sp) +/* 969C24 80240A64 24020002 */ addiu $v0, $zero, 2 +/* 969C28 80240A68 03E00008 */ jr $ra +/* 969C2C 80240A6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88.s deleted file mode 100644 index 7f1fb1f60c..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C88 -/* 969E48 80240C88 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 969E4C 80240C8C 10A0000B */ beqz $a1, .L80240CBC -/* 969E50 80240C90 AFBF0010 */ sw $ra, 0x10($sp) -/* 969E54 80240C94 3C038025 */ lui $v1, 0x8025 -/* 969E58 80240C98 8C63EFC4 */ lw $v1, -0x103c($v1) -/* 969E5C 80240C9C 8C620000 */ lw $v0, ($v1) -/* 969E60 80240CA0 3C048025 */ lui $a0, 0x8025 -/* 969E64 80240CA4 8C84EFC8 */ lw $a0, -0x1038($a0) -/* 969E68 80240CA8 34420010 */ ori $v0, $v0, 0x10 -/* 969E6C 80240CAC AC620000 */ sw $v0, ($v1) -/* 969E70 80240CB0 8C820000 */ lw $v0, ($a0) -/* 969E74 80240CB4 34420010 */ ori $v0, $v0, 0x10 -/* 969E78 80240CB8 AC820000 */ sw $v0, ($a0) -.L80240CBC: -/* 969E7C 80240CBC 3C048025 */ lui $a0, 0x8025 -/* 969E80 80240CC0 8C84EFC0 */ lw $a0, -0x1040($a0) -/* 969E84 80240CC4 8C85000C */ lw $a1, 0xc($a0) -/* 969E88 80240CC8 8CA20018 */ lw $v0, 0x18($a1) -/* 969E8C 80240CCC 8CA30020 */ lw $v1, 0x20($a1) -/* 969E90 80240CD0 2442FFF6 */ addiu $v0, $v0, -0xa -/* 969E94 80240CD4 ACA20018 */ sw $v0, 0x18($a1) -/* 969E98 80240CD8 8CA20024 */ lw $v0, 0x24($a1) -/* 969E9C 80240CDC 2463FFF6 */ addiu $v1, $v1, -0xa -/* 969EA0 80240CE0 ACA30020 */ sw $v1, 0x20($a1) -/* 969EA4 80240CE4 8CA30028 */ lw $v1, 0x28($a1) -/* 969EA8 80240CE8 2442FFF6 */ addiu $v0, $v0, -0xa -/* 969EAC 80240CEC ACA20024 */ sw $v0, 0x24($a1) -/* 969EB0 80240CF0 8CA2001C */ lw $v0, 0x1c($a1) -/* 969EB4 80240CF4 2463FFF6 */ addiu $v1, $v1, -0xa -/* 969EB8 80240CF8 ACA30028 */ sw $v1, 0x28($a1) -/* 969EBC 80240CFC 8CA30018 */ lw $v1, 0x18($a1) -/* 969EC0 80240D00 2442FFF6 */ addiu $v0, $v0, -0xa -/* 969EC4 80240D04 18600003 */ blez $v1, .L80240D14 -/* 969EC8 80240D08 ACA2001C */ sw $v0, 0x1c($a1) -/* 969ECC 80240D0C 0809034C */ j .L80240D30 -/* 969ED0 80240D10 0000102D */ daddu $v0, $zero, $zero -.L80240D14: -/* 969ED4 80240D14 0C016914 */ jal remove_effect -/* 969ED8 80240D18 ACA00018 */ sw $zero, 0x18($a1) -/* 969EDC 80240D1C 3C048025 */ lui $a0, 0x8025 -/* 969EE0 80240D20 8C84EFA0 */ lw $a0, -0x1060($a0) -/* 969EE4 80240D24 0C048D70 */ jal func_801235C0 -/* 969EE8 80240D28 00000000 */ nop -/* 969EEC 80240D2C 24020002 */ addiu $v0, $zero, 2 -.L80240D30: -/* 969EF0 80240D30 8FBF0010 */ lw $ra, 0x10($sp) -/* 969EF4 80240D34 03E00008 */ jr $ra -/* 969EF8 80240D38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s new file mode 100644 index 0000000000..b04b4d2e2b --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240C88_969E48.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C88_969E48 +/* 969E48 80240C88 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 969E4C 80240C8C 10A0000B */ beqz $a1, .L80240CBC +/* 969E50 80240C90 AFBF0010 */ sw $ra, 0x10($sp) +/* 969E54 80240C94 3C038025 */ lui $v1, 0x8025 +/* 969E58 80240C98 8C63EFC4 */ lw $v1, -0x103c($v1) +/* 969E5C 80240C9C 8C620000 */ lw $v0, ($v1) +/* 969E60 80240CA0 3C048025 */ lui $a0, 0x8025 +/* 969E64 80240CA4 8C84EFC8 */ lw $a0, -0x1038($a0) +/* 969E68 80240CA8 34420010 */ ori $v0, $v0, 0x10 +/* 969E6C 80240CAC AC620000 */ sw $v0, ($v1) +/* 969E70 80240CB0 8C820000 */ lw $v0, ($a0) +/* 969E74 80240CB4 34420010 */ ori $v0, $v0, 0x10 +/* 969E78 80240CB8 AC820000 */ sw $v0, ($a0) +.L80240CBC: +/* 969E7C 80240CBC 3C048025 */ lui $a0, 0x8025 +/* 969E80 80240CC0 8C84EFC0 */ lw $a0, -0x1040($a0) +/* 969E84 80240CC4 8C85000C */ lw $a1, 0xc($a0) +/* 969E88 80240CC8 8CA20018 */ lw $v0, 0x18($a1) +/* 969E8C 80240CCC 8CA30020 */ lw $v1, 0x20($a1) +/* 969E90 80240CD0 2442FFF6 */ addiu $v0, $v0, -0xa +/* 969E94 80240CD4 ACA20018 */ sw $v0, 0x18($a1) +/* 969E98 80240CD8 8CA20024 */ lw $v0, 0x24($a1) +/* 969E9C 80240CDC 2463FFF6 */ addiu $v1, $v1, -0xa +/* 969EA0 80240CE0 ACA30020 */ sw $v1, 0x20($a1) +/* 969EA4 80240CE4 8CA30028 */ lw $v1, 0x28($a1) +/* 969EA8 80240CE8 2442FFF6 */ addiu $v0, $v0, -0xa +/* 969EAC 80240CEC ACA20024 */ sw $v0, 0x24($a1) +/* 969EB0 80240CF0 8CA2001C */ lw $v0, 0x1c($a1) +/* 969EB4 80240CF4 2463FFF6 */ addiu $v1, $v1, -0xa +/* 969EB8 80240CF8 ACA30028 */ sw $v1, 0x28($a1) +/* 969EBC 80240CFC 8CA30018 */ lw $v1, 0x18($a1) +/* 969EC0 80240D00 2442FFF6 */ addiu $v0, $v0, -0xa +/* 969EC4 80240D04 18600003 */ blez $v1, .L80240D14 +/* 969EC8 80240D08 ACA2001C */ sw $v0, 0x1c($a1) +/* 969ECC 80240D0C 0809034C */ j .L80240D30 +/* 969ED0 80240D10 0000102D */ daddu $v0, $zero, $zero +.L80240D14: +/* 969ED4 80240D14 0C016914 */ jal remove_effect +/* 969ED8 80240D18 ACA00018 */ sw $zero, 0x18($a1) +/* 969EDC 80240D1C 3C048025 */ lui $a0, 0x8025 +/* 969EE0 80240D20 8C84EFA0 */ lw $a0, -0x1060($a0) +/* 969EE4 80240D24 0C048D70 */ jal func_801235C0 +/* 969EE8 80240D28 00000000 */ nop +/* 969EEC 80240D2C 24020002 */ addiu $v0, $zero, 2 +.L80240D30: +/* 969EF0 80240D30 8FBF0010 */ lw $ra, 0x10($sp) +/* 969EF4 80240D34 03E00008 */ jr $ra +/* 969EF8 80240D38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08.s deleted file mode 100644 index a9dd98bfc2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E08 -/* 969FC8 80240E08 3C028025 */ lui $v0, 0x8025 -/* 969FCC 80240E0C 8C42EFC8 */ lw $v0, -0x1038($v0) -/* 969FD0 80240E10 8C43000C */ lw $v1, 0xc($v0) -/* 969FD4 80240E14 24020001 */ addiu $v0, $zero, 1 -/* 969FD8 80240E18 AC62001C */ sw $v0, 0x1c($v1) -/* 969FDC 80240E1C 03E00008 */ jr $ra -/* 969FE0 80240E20 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s new file mode 100644 index 0000000000..5509157204 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E08_969FC8.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E08_969FC8 +/* 969FC8 80240E08 3C028025 */ lui $v0, 0x8025 +/* 969FCC 80240E0C 8C42EFC8 */ lw $v0, -0x1038($v0) +/* 969FD0 80240E10 8C43000C */ lw $v1, 0xc($v0) +/* 969FD4 80240E14 24020001 */ addiu $v0, $zero, 1 +/* 969FD8 80240E18 AC62001C */ sw $v0, 0x1c($v1) +/* 969FDC 80240E1C 03E00008 */ jr $ra +/* 969FE0 80240E20 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24.s deleted file mode 100644 index 7b5bf9a5d0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E24 -/* 969FE4 80240E24 3C028025 */ lui $v0, 0x8025 -/* 969FE8 80240E28 8C42EFC8 */ lw $v0, -0x1038($v0) -/* 969FEC 80240E2C 8C43000C */ lw $v1, 0xc($v0) -/* 969FF0 80240E30 24020002 */ addiu $v0, $zero, 2 -/* 969FF4 80240E34 03E00008 */ jr $ra -/* 969FF8 80240E38 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s new file mode 100644 index 0000000000..712b5a181b --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E24_969FE4.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E24_969FE4 +/* 969FE4 80240E24 3C028025 */ lui $v0, 0x8025 +/* 969FE8 80240E28 8C42EFC8 */ lw $v0, -0x1038($v0) +/* 969FEC 80240E2C 8C43000C */ lw $v1, 0xc($v0) +/* 969FF0 80240E30 24020002 */ addiu $v0, $zero, 2 +/* 969FF4 80240E34 03E00008 */ jr $ra +/* 969FF8 80240E38 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C.s deleted file mode 100644 index 1e2bffde2c..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E3C -/* 969FFC 80240E3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96A000 80240E40 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 96A004 80240E44 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 96A008 80240E48 3C05FE36 */ lui $a1, 0xfe36 -/* 96A00C 80240E4C AFBF0010 */ sw $ra, 0x10($sp) -/* 96A010 80240E50 80460075 */ lb $a2, 0x75($v0) -/* 96A014 80240E54 0C0B2026 */ jal set_variable -/* 96A018 80240E58 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 96A01C 80240E5C 8FBF0010 */ lw $ra, 0x10($sp) -/* 96A020 80240E60 24020002 */ addiu $v0, $zero, 2 -/* 96A024 80240E64 03E00008 */ jr $ra -/* 96A028 80240E68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s new file mode 100644 index 0000000000..14fe34bfc1 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E3C_969FFC +/* 969FFC 80240E3C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96A000 80240E40 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 96A004 80240E44 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 96A008 80240E48 3C05FE36 */ lui $a1, 0xfe36 +/* 96A00C 80240E4C AFBF0010 */ sw $ra, 0x10($sp) +/* 96A010 80240E50 80460075 */ lb $a2, 0x75($v0) +/* 96A014 80240E54 0C0B2026 */ jal set_variable +/* 96A018 80240E58 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 96A01C 80240E5C 8FBF0010 */ lw $ra, 0x10($sp) +/* 96A020 80240E60 24020002 */ addiu $v0, $zero, 2 +/* 96A024 80240E64 03E00008 */ jr $ra +/* 96A028 80240E68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C.s deleted file mode 100644 index 612b3d8bb0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E6C -/* 96A02C 80240E6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96A030 80240E70 AFB10014 */ sw $s1, 0x14($sp) -/* 96A034 80240E74 0080882D */ daddu $s1, $a0, $zero -/* 96A038 80240E78 AFBF0018 */ sw $ra, 0x18($sp) -/* 96A03C 80240E7C AFB00010 */ sw $s0, 0x10($sp) -/* 96A040 80240E80 8E30000C */ lw $s0, 0xc($s1) -/* 96A044 80240E84 8E050000 */ lw $a1, ($s0) -/* 96A048 80240E88 0C0B1EAF */ jal get_variable -/* 96A04C 80240E8C 26100004 */ addiu $s0, $s0, 4 -/* 96A050 80240E90 0220202D */ daddu $a0, $s1, $zero -/* 96A054 80240E94 8E050000 */ lw $a1, ($s0) -/* 96A058 80240E98 0C0B210B */ jal get_float_variable -/* 96A05C 80240E9C 0040802D */ daddu $s0, $v0, $zero -/* 96A060 80240EA0 24020002 */ addiu $v0, $zero, 2 -/* 96A064 80240EA4 00501804 */ sllv $v1, $s0, $v0 -/* 96A068 80240EA8 00701821 */ addu $v1, $v1, $s0 -/* 96A06C 80240EAC 00431804 */ sllv $v1, $v1, $v0 -/* 96A070 80240EB0 00701823 */ subu $v1, $v1, $s0 -/* 96A074 80240EB4 000320C0 */ sll $a0, $v1, 3 -/* 96A078 80240EB8 00641821 */ addu $v1, $v1, $a0 -/* 96A07C 80240EBC 000318C0 */ sll $v1, $v1, 3 -/* 96A080 80240EC0 3C01800B */ lui $at, 0x800b -/* 96A084 80240EC4 00230821 */ addu $at, $at, $v1 -/* 96A088 80240EC8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 96A08C 80240ECC 8FBF0018 */ lw $ra, 0x18($sp) -/* 96A090 80240ED0 8FB10014 */ lw $s1, 0x14($sp) -/* 96A094 80240ED4 8FB00010 */ lw $s0, 0x10($sp) -/* 96A098 80240ED8 03E00008 */ jr $ra -/* 96A09C 80240EDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s new file mode 100644 index 0000000000..00eb172992 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E6C_96A02C +/* 96A02C 80240E6C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 96A030 80240E70 AFB10014 */ sw $s1, 0x14($sp) +/* 96A034 80240E74 0080882D */ daddu $s1, $a0, $zero +/* 96A038 80240E78 AFBF0018 */ sw $ra, 0x18($sp) +/* 96A03C 80240E7C AFB00010 */ sw $s0, 0x10($sp) +/* 96A040 80240E80 8E30000C */ lw $s0, 0xc($s1) +/* 96A044 80240E84 8E050000 */ lw $a1, ($s0) +/* 96A048 80240E88 0C0B1EAF */ jal get_variable +/* 96A04C 80240E8C 26100004 */ addiu $s0, $s0, 4 +/* 96A050 80240E90 0220202D */ daddu $a0, $s1, $zero +/* 96A054 80240E94 8E050000 */ lw $a1, ($s0) +/* 96A058 80240E98 0C0B210B */ jal get_float_variable +/* 96A05C 80240E9C 0040802D */ daddu $s0, $v0, $zero +/* 96A060 80240EA0 24020002 */ addiu $v0, $zero, 2 +/* 96A064 80240EA4 00501804 */ sllv $v1, $s0, $v0 +/* 96A068 80240EA8 00701821 */ addu $v1, $v1, $s0 +/* 96A06C 80240EAC 00431804 */ sllv $v1, $v1, $v0 +/* 96A070 80240EB0 00701823 */ subu $v1, $v1, $s0 +/* 96A074 80240EB4 000320C0 */ sll $a0, $v1, 3 +/* 96A078 80240EB8 00641821 */ addu $v1, $v1, $a0 +/* 96A07C 80240EBC 000318C0 */ sll $v1, $v1, 3 +/* 96A080 80240EC0 3C01800B */ lui $at, 0x800b +/* 96A084 80240EC4 00230821 */ addu $at, $at, $v1 +/* 96A088 80240EC8 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 96A08C 80240ECC 8FBF0018 */ lw $ra, 0x18($sp) +/* 96A090 80240ED0 8FB10014 */ lw $s1, 0x14($sp) +/* 96A094 80240ED4 8FB00010 */ lw $s0, 0x10($sp) +/* 96A098 80240ED8 03E00008 */ jr $ra +/* 96A09C 80240EDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0.s deleted file mode 100644 index 8dd8eccb44..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE0 -/* 96A0A0 80240EE0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96A0A4 80240EE4 AFB10014 */ sw $s1, 0x14($sp) -/* 96A0A8 80240EE8 0080882D */ daddu $s1, $a0, $zero -/* 96A0AC 80240EEC AFBF0018 */ sw $ra, 0x18($sp) -/* 96A0B0 80240EF0 AFB00010 */ sw $s0, 0x10($sp) -/* 96A0B4 80240EF4 8E30000C */ lw $s0, 0xc($s1) -/* 96A0B8 80240EF8 8E050000 */ lw $a1, ($s0) -/* 96A0BC 80240EFC 0C0B1EAF */ jal get_variable -/* 96A0C0 80240F00 26100004 */ addiu $s0, $s0, 4 -/* 96A0C4 80240F04 00021880 */ sll $v1, $v0, 2 -/* 96A0C8 80240F08 00621821 */ addu $v1, $v1, $v0 -/* 96A0CC 80240F0C 00031880 */ sll $v1, $v1, 2 -/* 96A0D0 80240F10 00621823 */ subu $v1, $v1, $v0 -/* 96A0D4 80240F14 000310C0 */ sll $v0, $v1, 3 -/* 96A0D8 80240F18 00621821 */ addu $v1, $v1, $v0 -/* 96A0DC 80240F1C 000318C0 */ sll $v1, $v1, 3 -/* 96A0E0 80240F20 3C01800B */ lui $at, 0x800b -/* 96A0E4 80240F24 00230821 */ addu $at, $at, $v1 -/* 96A0E8 80240F28 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 96A0EC 80240F2C 3C014480 */ lui $at, 0x4480 -/* 96A0F0 80240F30 44810000 */ mtc1 $at, $f0 -/* 96A0F4 80240F34 00000000 */ nop -/* 96A0F8 80240F38 46001082 */ mul.s $f2, $f2, $f0 -/* 96A0FC 80240F3C 00000000 */ nop -/* 96A100 80240F40 3C01CD5B */ lui $at, 0xcd5b -/* 96A104 80240F44 34215858 */ ori $at, $at, 0x5858 -/* 96A108 80240F48 44810000 */ mtc1 $at, $f0 -/* 96A10C 80240F4C 00000000 */ nop -/* 96A110 80240F50 46001080 */ add.s $f2, $f2, $f0 -/* 96A114 80240F54 8E050000 */ lw $a1, ($s0) -/* 96A118 80240F58 4600110D */ trunc.w.s $f4, $f2 -/* 96A11C 80240F5C 44062000 */ mfc1 $a2, $f4 -/* 96A120 80240F60 0C0B2026 */ jal set_variable -/* 96A124 80240F64 0220202D */ daddu $a0, $s1, $zero -/* 96A128 80240F68 8FBF0018 */ lw $ra, 0x18($sp) -/* 96A12C 80240F6C 8FB10014 */ lw $s1, 0x14($sp) -/* 96A130 80240F70 8FB00010 */ lw $s0, 0x10($sp) -/* 96A134 80240F74 24020002 */ addiu $v0, $zero, 2 -/* 96A138 80240F78 03E00008 */ jr $ra -/* 96A13C 80240F7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s new file mode 100644 index 0000000000..59a220d8ac --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EE0_96A0A0 +/* 96A0A0 80240EE0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 96A0A4 80240EE4 AFB10014 */ sw $s1, 0x14($sp) +/* 96A0A8 80240EE8 0080882D */ daddu $s1, $a0, $zero +/* 96A0AC 80240EEC AFBF0018 */ sw $ra, 0x18($sp) +/* 96A0B0 80240EF0 AFB00010 */ sw $s0, 0x10($sp) +/* 96A0B4 80240EF4 8E30000C */ lw $s0, 0xc($s1) +/* 96A0B8 80240EF8 8E050000 */ lw $a1, ($s0) +/* 96A0BC 80240EFC 0C0B1EAF */ jal get_variable +/* 96A0C0 80240F00 26100004 */ addiu $s0, $s0, 4 +/* 96A0C4 80240F04 00021880 */ sll $v1, $v0, 2 +/* 96A0C8 80240F08 00621821 */ addu $v1, $v1, $v0 +/* 96A0CC 80240F0C 00031880 */ sll $v1, $v1, 2 +/* 96A0D0 80240F10 00621823 */ subu $v1, $v1, $v0 +/* 96A0D4 80240F14 000310C0 */ sll $v0, $v1, 3 +/* 96A0D8 80240F18 00621821 */ addu $v1, $v1, $v0 +/* 96A0DC 80240F1C 000318C0 */ sll $v1, $v1, 3 +/* 96A0E0 80240F20 3C01800B */ lui $at, 0x800b +/* 96A0E4 80240F24 00230821 */ addu $at, $at, $v1 +/* 96A0E8 80240F28 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 96A0EC 80240F2C 3C014480 */ lui $at, 0x4480 +/* 96A0F0 80240F30 44810000 */ mtc1 $at, $f0 +/* 96A0F4 80240F34 00000000 */ nop +/* 96A0F8 80240F38 46001082 */ mul.s $f2, $f2, $f0 +/* 96A0FC 80240F3C 00000000 */ nop +/* 96A100 80240F40 3C01CD5B */ lui $at, 0xcd5b +/* 96A104 80240F44 34215858 */ ori $at, $at, 0x5858 +/* 96A108 80240F48 44810000 */ mtc1 $at, $f0 +/* 96A10C 80240F4C 00000000 */ nop +/* 96A110 80240F50 46001080 */ add.s $f2, $f2, $f0 +/* 96A114 80240F54 8E050000 */ lw $a1, ($s0) +/* 96A118 80240F58 4600110D */ trunc.w.s $f4, $f2 +/* 96A11C 80240F5C 44062000 */ mfc1 $a2, $f4 +/* 96A120 80240F60 0C0B2026 */ jal set_variable +/* 96A124 80240F64 0220202D */ daddu $a0, $s1, $zero +/* 96A128 80240F68 8FBF0018 */ lw $ra, 0x18($sp) +/* 96A12C 80240F6C 8FB10014 */ lw $s1, 0x14($sp) +/* 96A130 80240F70 8FB00010 */ lw $s0, 0x10($sp) +/* 96A134 80240F74 24020002 */ addiu $v0, $zero, 2 +/* 96A138 80240F78 03E00008 */ jr $ra +/* 96A13C 80240F7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80.s deleted file mode 100644 index 10a553fea7..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F80 -/* 96A140 80240F80 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 96A144 80240F84 AFB20018 */ sw $s2, 0x18($sp) -/* 96A148 80240F88 0080902D */ daddu $s2, $a0, $zero -/* 96A14C 80240F8C AFBF0030 */ sw $ra, 0x30($sp) -/* 96A150 80240F90 AFB7002C */ sw $s7, 0x2c($sp) -/* 96A154 80240F94 AFB60028 */ sw $s6, 0x28($sp) -/* 96A158 80240F98 AFB50024 */ sw $s5, 0x24($sp) -/* 96A15C 80240F9C AFB40020 */ sw $s4, 0x20($sp) -/* 96A160 80240FA0 AFB3001C */ sw $s3, 0x1c($sp) -/* 96A164 80240FA4 AFB10014 */ sw $s1, 0x14($sp) -/* 96A168 80240FA8 AFB00010 */ sw $s0, 0x10($sp) -/* 96A16C 80240FAC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 96A170 80240FB0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 96A174 80240FB4 8E50000C */ lw $s0, 0xc($s2) -/* 96A178 80240FB8 8E050000 */ lw $a1, ($s0) -/* 96A17C 80240FBC 0C0B1EAF */ jal get_variable -/* 96A180 80240FC0 26100004 */ addiu $s0, $s0, 4 -/* 96A184 80240FC4 8E050000 */ lw $a1, ($s0) -/* 96A188 80240FC8 26100004 */ addiu $s0, $s0, 4 -/* 96A18C 80240FCC 0240202D */ daddu $a0, $s2, $zero -/* 96A190 80240FD0 0C0B1EAF */ jal get_variable -/* 96A194 80240FD4 0040B82D */ daddu $s7, $v0, $zero -/* 96A198 80240FD8 8E050000 */ lw $a1, ($s0) -/* 96A19C 80240FDC 26100004 */ addiu $s0, $s0, 4 -/* 96A1A0 80240FE0 0240202D */ daddu $a0, $s2, $zero -/* 96A1A4 80240FE4 0C0B1EAF */ jal get_variable -/* 96A1A8 80240FE8 0040B02D */ daddu $s6, $v0, $zero -/* 96A1AC 80240FEC 0240202D */ daddu $a0, $s2, $zero -/* 96A1B0 80240FF0 3C05F4AC */ lui $a1, 0xf4ac -/* 96A1B4 80240FF4 34A5D481 */ ori $a1, $a1, 0xd481 -/* 96A1B8 80240FF8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 96A1BC 80240FFC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 96A1C0 80241000 8E140000 */ lw $s4, ($s0) -/* 96A1C4 80241004 00061880 */ sll $v1, $a2, 2 -/* 96A1C8 80241008 00661821 */ addu $v1, $v1, $a2 -/* 96A1CC 8024100C 00031880 */ sll $v1, $v1, 2 -/* 96A1D0 80241010 00661823 */ subu $v1, $v1, $a2 -/* 96A1D4 80241014 000330C0 */ sll $a2, $v1, 3 -/* 96A1D8 80241018 00661821 */ addu $v1, $v1, $a2 -/* 96A1DC 8024101C 000318C0 */ sll $v1, $v1, 3 -/* 96A1E0 80241020 3C01800B */ lui $at, 0x800b -/* 96A1E4 80241024 00230821 */ addu $at, $at, $v1 -/* 96A1E8 80241028 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 96A1EC 8024102C 8E150004 */ lw $s5, 4($s0) -/* 96A1F0 80241030 4600010D */ trunc.w.s $f4, $f0 -/* 96A1F4 80241034 44112000 */ mfc1 $s1, $f4 -/* 96A1F8 80241038 0C0B1EAF */ jal get_variable -/* 96A1FC 8024103C 0040982D */ daddu $s3, $v0, $zero -/* 96A200 80241040 4491B000 */ mtc1 $s1, $f22 -/* 96A204 80241044 00000000 */ nop -/* 96A208 80241048 4680B5A0 */ cvt.s.w $f22, $f22 -/* 96A20C 8024104C 4600B306 */ mov.s $f12, $f22 -/* 96A210 80241050 0C00A8D4 */ jal cos_deg -/* 96A214 80241054 0040802D */ daddu $s0, $v0, $zero -/* 96A218 80241058 4493A000 */ mtc1 $s3, $f20 -/* 96A21C 8024105C 00000000 */ nop -/* 96A220 80241060 4680A520 */ cvt.s.w $f20, $f20 -/* 96A224 80241064 4600A002 */ mul.s $f0, $f20, $f0 -/* 96A228 80241068 00000000 */ nop -/* 96A22C 8024106C 0240202D */ daddu $a0, $s2, $zero -/* 96A230 80241070 44901000 */ mtc1 $s0, $f2 -/* 96A234 80241074 00000000 */ nop -/* 96A238 80241078 468010A0 */ cvt.s.w $f2, $f2 -/* 96A23C 8024107C 46001081 */ sub.s $f2, $f2, $f0 -/* 96A240 80241080 3C05F4AC */ lui $a1, 0xf4ac -/* 96A244 80241084 4600110D */ trunc.w.s $f4, $f2 -/* 96A248 80241088 44102000 */ mfc1 $s0, $f4 -/* 96A24C 8024108C 0C0B1EAF */ jal get_variable -/* 96A250 80241090 34A5D483 */ ori $a1, $a1, 0xd483 -/* 96A254 80241094 4600B306 */ mov.s $f12, $f22 -/* 96A258 80241098 0C00A8BB */ jal sin_deg -/* 96A25C 8024109C 0040882D */ daddu $s1, $v0, $zero -/* 96A260 802410A0 4600A502 */ mul.s $f20, $f20, $f0 -/* 96A264 802410A4 00000000 */ nop -/* 96A268 802410A8 0240202D */ daddu $a0, $s2, $zero -/* 96A26C 802410AC 44910000 */ mtc1 $s1, $f0 -/* 96A270 802410B0 00000000 */ nop -/* 96A274 802410B4 46800020 */ cvt.s.w $f0, $f0 -/* 96A278 802410B8 46140001 */ sub.s $f0, $f0, $f20 -/* 96A27C 802410BC 0280282D */ daddu $a1, $s4, $zero -/* 96A280 802410C0 02173023 */ subu $a2, $s0, $s7 -/* 96A284 802410C4 4600010D */ trunc.w.s $f4, $f0 -/* 96A288 802410C8 44102000 */ mfc1 $s0, $f4 -/* 96A28C 802410CC 0C0B2026 */ jal set_variable -/* 96A290 802410D0 02168023 */ subu $s0, $s0, $s6 -/* 96A294 802410D4 0240202D */ daddu $a0, $s2, $zero -/* 96A298 802410D8 02A0282D */ daddu $a1, $s5, $zero -/* 96A29C 802410DC 0C0B2026 */ jal set_variable -/* 96A2A0 802410E0 0200302D */ daddu $a2, $s0, $zero -/* 96A2A4 802410E4 8FBF0030 */ lw $ra, 0x30($sp) -/* 96A2A8 802410E8 8FB7002C */ lw $s7, 0x2c($sp) -/* 96A2AC 802410EC 8FB60028 */ lw $s6, 0x28($sp) -/* 96A2B0 802410F0 8FB50024 */ lw $s5, 0x24($sp) -/* 96A2B4 802410F4 8FB40020 */ lw $s4, 0x20($sp) -/* 96A2B8 802410F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 96A2BC 802410FC 8FB20018 */ lw $s2, 0x18($sp) -/* 96A2C0 80241100 8FB10014 */ lw $s1, 0x14($sp) -/* 96A2C4 80241104 8FB00010 */ lw $s0, 0x10($sp) -/* 96A2C8 80241108 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 96A2CC 8024110C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 96A2D0 80241110 24020002 */ addiu $v0, $zero, 2 -/* 96A2D4 80241114 03E00008 */ jr $ra -/* 96A2D8 80241118 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s new file mode 100644 index 0000000000..ad96c5c26f --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F80_96A140 +/* 96A140 80240F80 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 96A144 80240F84 AFB20018 */ sw $s2, 0x18($sp) +/* 96A148 80240F88 0080902D */ daddu $s2, $a0, $zero +/* 96A14C 80240F8C AFBF0030 */ sw $ra, 0x30($sp) +/* 96A150 80240F90 AFB7002C */ sw $s7, 0x2c($sp) +/* 96A154 80240F94 AFB60028 */ sw $s6, 0x28($sp) +/* 96A158 80240F98 AFB50024 */ sw $s5, 0x24($sp) +/* 96A15C 80240F9C AFB40020 */ sw $s4, 0x20($sp) +/* 96A160 80240FA0 AFB3001C */ sw $s3, 0x1c($sp) +/* 96A164 80240FA4 AFB10014 */ sw $s1, 0x14($sp) +/* 96A168 80240FA8 AFB00010 */ sw $s0, 0x10($sp) +/* 96A16C 80240FAC F7B60040 */ sdc1 $f22, 0x40($sp) +/* 96A170 80240FB0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 96A174 80240FB4 8E50000C */ lw $s0, 0xc($s2) +/* 96A178 80240FB8 8E050000 */ lw $a1, ($s0) +/* 96A17C 80240FBC 0C0B1EAF */ jal get_variable +/* 96A180 80240FC0 26100004 */ addiu $s0, $s0, 4 +/* 96A184 80240FC4 8E050000 */ lw $a1, ($s0) +/* 96A188 80240FC8 26100004 */ addiu $s0, $s0, 4 +/* 96A18C 80240FCC 0240202D */ daddu $a0, $s2, $zero +/* 96A190 80240FD0 0C0B1EAF */ jal get_variable +/* 96A194 80240FD4 0040B82D */ daddu $s7, $v0, $zero +/* 96A198 80240FD8 8E050000 */ lw $a1, ($s0) +/* 96A19C 80240FDC 26100004 */ addiu $s0, $s0, 4 +/* 96A1A0 80240FE0 0240202D */ daddu $a0, $s2, $zero +/* 96A1A4 80240FE4 0C0B1EAF */ jal get_variable +/* 96A1A8 80240FE8 0040B02D */ daddu $s6, $v0, $zero +/* 96A1AC 80240FEC 0240202D */ daddu $a0, $s2, $zero +/* 96A1B0 80240FF0 3C05F4AC */ lui $a1, 0xf4ac +/* 96A1B4 80240FF4 34A5D481 */ ori $a1, $a1, 0xd481 +/* 96A1B8 80240FF8 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* 96A1BC 80240FFC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* 96A1C0 80241000 8E140000 */ lw $s4, ($s0) +/* 96A1C4 80241004 00061880 */ sll $v1, $a2, 2 +/* 96A1C8 80241008 00661821 */ addu $v1, $v1, $a2 +/* 96A1CC 8024100C 00031880 */ sll $v1, $v1, 2 +/* 96A1D0 80241010 00661823 */ subu $v1, $v1, $a2 +/* 96A1D4 80241014 000330C0 */ sll $a2, $v1, 3 +/* 96A1D8 80241018 00661821 */ addu $v1, $v1, $a2 +/* 96A1DC 8024101C 000318C0 */ sll $v1, $v1, 3 +/* 96A1E0 80241020 3C01800B */ lui $at, 0x800b +/* 96A1E4 80241024 00230821 */ addu $at, $at, $v1 +/* 96A1E8 80241028 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 96A1EC 8024102C 8E150004 */ lw $s5, 4($s0) +/* 96A1F0 80241030 4600010D */ trunc.w.s $f4, $f0 +/* 96A1F4 80241034 44112000 */ mfc1 $s1, $f4 +/* 96A1F8 80241038 0C0B1EAF */ jal get_variable +/* 96A1FC 8024103C 0040982D */ daddu $s3, $v0, $zero +/* 96A200 80241040 4491B000 */ mtc1 $s1, $f22 +/* 96A204 80241044 00000000 */ nop +/* 96A208 80241048 4680B5A0 */ cvt.s.w $f22, $f22 +/* 96A20C 8024104C 4600B306 */ mov.s $f12, $f22 +/* 96A210 80241050 0C00A8D4 */ jal cos_deg +/* 96A214 80241054 0040802D */ daddu $s0, $v0, $zero +/* 96A218 80241058 4493A000 */ mtc1 $s3, $f20 +/* 96A21C 8024105C 00000000 */ nop +/* 96A220 80241060 4680A520 */ cvt.s.w $f20, $f20 +/* 96A224 80241064 4600A002 */ mul.s $f0, $f20, $f0 +/* 96A228 80241068 00000000 */ nop +/* 96A22C 8024106C 0240202D */ daddu $a0, $s2, $zero +/* 96A230 80241070 44901000 */ mtc1 $s0, $f2 +/* 96A234 80241074 00000000 */ nop +/* 96A238 80241078 468010A0 */ cvt.s.w $f2, $f2 +/* 96A23C 8024107C 46001081 */ sub.s $f2, $f2, $f0 +/* 96A240 80241080 3C05F4AC */ lui $a1, 0xf4ac +/* 96A244 80241084 4600110D */ trunc.w.s $f4, $f2 +/* 96A248 80241088 44102000 */ mfc1 $s0, $f4 +/* 96A24C 8024108C 0C0B1EAF */ jal get_variable +/* 96A250 80241090 34A5D483 */ ori $a1, $a1, 0xd483 +/* 96A254 80241094 4600B306 */ mov.s $f12, $f22 +/* 96A258 80241098 0C00A8BB */ jal sin_deg +/* 96A25C 8024109C 0040882D */ daddu $s1, $v0, $zero +/* 96A260 802410A0 4600A502 */ mul.s $f20, $f20, $f0 +/* 96A264 802410A4 00000000 */ nop +/* 96A268 802410A8 0240202D */ daddu $a0, $s2, $zero +/* 96A26C 802410AC 44910000 */ mtc1 $s1, $f0 +/* 96A270 802410B0 00000000 */ nop +/* 96A274 802410B4 46800020 */ cvt.s.w $f0, $f0 +/* 96A278 802410B8 46140001 */ sub.s $f0, $f0, $f20 +/* 96A27C 802410BC 0280282D */ daddu $a1, $s4, $zero +/* 96A280 802410C0 02173023 */ subu $a2, $s0, $s7 +/* 96A284 802410C4 4600010D */ trunc.w.s $f4, $f0 +/* 96A288 802410C8 44102000 */ mfc1 $s0, $f4 +/* 96A28C 802410CC 0C0B2026 */ jal set_variable +/* 96A290 802410D0 02168023 */ subu $s0, $s0, $s6 +/* 96A294 802410D4 0240202D */ daddu $a0, $s2, $zero +/* 96A298 802410D8 02A0282D */ daddu $a1, $s5, $zero +/* 96A29C 802410DC 0C0B2026 */ jal set_variable +/* 96A2A0 802410E0 0200302D */ daddu $a2, $s0, $zero +/* 96A2A4 802410E4 8FBF0030 */ lw $ra, 0x30($sp) +/* 96A2A8 802410E8 8FB7002C */ lw $s7, 0x2c($sp) +/* 96A2AC 802410EC 8FB60028 */ lw $s6, 0x28($sp) +/* 96A2B0 802410F0 8FB50024 */ lw $s5, 0x24($sp) +/* 96A2B4 802410F4 8FB40020 */ lw $s4, 0x20($sp) +/* 96A2B8 802410F8 8FB3001C */ lw $s3, 0x1c($sp) +/* 96A2BC 802410FC 8FB20018 */ lw $s2, 0x18($sp) +/* 96A2C0 80241100 8FB10014 */ lw $s1, 0x14($sp) +/* 96A2C4 80241104 8FB00010 */ lw $s0, 0x10($sp) +/* 96A2C8 80241108 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 96A2CC 8024110C D7B40038 */ ldc1 $f20, 0x38($sp) +/* 96A2D0 80241110 24020002 */ addiu $v0, $zero, 2 +/* 96A2D4 80241114 03E00008 */ jr $ra +/* 96A2D8 80241118 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C.s deleted file mode 100644 index 8700c07c08..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024111C -/* 96A2DC 8024111C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 96A2E0 80241120 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 96A2E4 80241124 10A00002 */ beqz $a1, .L80241130 -/* 96A2E8 80241128 2402003C */ addiu $v0, $zero, 0x3c -/* 96A2EC 8024112C AC820070 */ sw $v0, 0x70($a0) -.L80241130: -/* 96A2F0 80241130 C4620080 */ lwc1 $f2, 0x80($v1) -/* 96A2F4 80241134 3C0141F0 */ lui $at, 0x41f0 -/* 96A2F8 80241138 44810000 */ mtc1 $at, $f0 -/* 96A2FC 8024113C 00000000 */ nop -/* 96A300 80241140 46001000 */ add.s $f0, $f2, $f0 -/* 96A304 80241144 3C0143B4 */ lui $at, 0x43b4 -/* 96A308 80241148 44811000 */ mtc1 $at, $f2 -/* 96A30C 8024114C 00000000 */ nop -/* 96A310 80241150 4600103E */ c.le.s $f2, $f0 -/* 96A314 80241154 00000000 */ nop -/* 96A318 80241158 45000003 */ bc1f .L80241168 -/* 96A31C 8024115C E4600080 */ swc1 $f0, 0x80($v1) -/* 96A320 80241160 46020001 */ sub.s $f0, $f0, $f2 -/* 96A324 80241164 E4600080 */ swc1 $f0, 0x80($v1) -.L80241168: -/* 96A328 80241168 8C820070 */ lw $v0, 0x70($a0) -/* 96A32C 8024116C 2442FFFF */ addiu $v0, $v0, -1 -/* 96A330 80241170 AC820070 */ sw $v0, 0x70($a0) -/* 96A334 80241174 000217C3 */ sra $v0, $v0, 0x1f -/* 96A338 80241178 03E00008 */ jr $ra -/* 96A33C 8024117C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s new file mode 100644 index 0000000000..5e2e262fae --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024111C_96A2DC +/* 96A2DC 8024111C 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 96A2E0 80241120 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 96A2E4 80241124 10A00002 */ beqz $a1, .L80241130 +/* 96A2E8 80241128 2402003C */ addiu $v0, $zero, 0x3c +/* 96A2EC 8024112C AC820070 */ sw $v0, 0x70($a0) +.L80241130: +/* 96A2F0 80241130 C4620080 */ lwc1 $f2, 0x80($v1) +/* 96A2F4 80241134 3C0141F0 */ lui $at, 0x41f0 +/* 96A2F8 80241138 44810000 */ mtc1 $at, $f0 +/* 96A2FC 8024113C 00000000 */ nop +/* 96A300 80241140 46001000 */ add.s $f0, $f2, $f0 +/* 96A304 80241144 3C0143B4 */ lui $at, 0x43b4 +/* 96A308 80241148 44811000 */ mtc1 $at, $f2 +/* 96A30C 8024114C 00000000 */ nop +/* 96A310 80241150 4600103E */ c.le.s $f2, $f0 +/* 96A314 80241154 00000000 */ nop +/* 96A318 80241158 45000003 */ bc1f .L80241168 +/* 96A31C 8024115C E4600080 */ swc1 $f0, 0x80($v1) +/* 96A320 80241160 46020001 */ sub.s $f0, $f0, $f2 +/* 96A324 80241164 E4600080 */ swc1 $f0, 0x80($v1) +.L80241168: +/* 96A328 80241168 8C820070 */ lw $v0, 0x70($a0) +/* 96A32C 8024116C 2442FFFF */ addiu $v0, $v0, -1 +/* 96A330 80241170 AC820070 */ sw $v0, 0x70($a0) +/* 96A334 80241174 000217C3 */ sra $v0, $v0, 0x1f +/* 96A338 80241178 03E00008 */ jr $ra +/* 96A33C 8024117C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180.s deleted file mode 100644 index 35fa024f12..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241180 -/* 96A340 80241180 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96A344 80241184 AFB10014 */ sw $s1, 0x14($sp) -/* 96A348 80241188 0080882D */ daddu $s1, $a0, $zero -/* 96A34C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* 96A350 80241190 00A0802D */ daddu $s0, $a1, $zero -/* 96A354 80241194 AFBF0018 */ sw $ra, 0x18($sp) -/* 96A358 80241198 0C00EABB */ jal get_npc_unsafe -/* 96A35C 8024119C 2404FFFC */ addiu $a0, $zero, -4 -/* 96A360 802411A0 12000003 */ beqz $s0, .L802411B0 -/* 96A364 802411A4 0040182D */ daddu $v1, $v0, $zero -/* 96A368 802411A8 2402003C */ addiu $v0, $zero, 0x3c -/* 96A36C 802411AC AE220070 */ sw $v0, 0x70($s1) -.L802411B0: -/* 96A370 802411B0 C462000C */ lwc1 $f2, 0xc($v1) -/* 96A374 802411B4 3C0141F0 */ lui $at, 0x41f0 -/* 96A378 802411B8 44810000 */ mtc1 $at, $f0 -/* 96A37C 802411BC 00000000 */ nop -/* 96A380 802411C0 46001000 */ add.s $f0, $f2, $f0 -/* 96A384 802411C4 3C0143B4 */ lui $at, 0x43b4 -/* 96A388 802411C8 44811000 */ mtc1 $at, $f2 -/* 96A38C 802411CC 00000000 */ nop -/* 96A390 802411D0 4600103E */ c.le.s $f2, $f0 -/* 96A394 802411D4 00000000 */ nop -/* 96A398 802411D8 45000003 */ bc1f .L802411E8 -/* 96A39C 802411DC E460000C */ swc1 $f0, 0xc($v1) -/* 96A3A0 802411E0 46020001 */ sub.s $f0, $f0, $f2 -/* 96A3A4 802411E4 E460000C */ swc1 $f0, 0xc($v1) -.L802411E8: -/* 96A3A8 802411E8 8E230070 */ lw $v1, 0x70($s1) -/* 96A3AC 802411EC 2463FFFF */ addiu $v1, $v1, -1 -/* 96A3B0 802411F0 000317C3 */ sra $v0, $v1, 0x1f -/* 96A3B4 802411F4 AE230070 */ sw $v1, 0x70($s1) -/* 96A3B8 802411F8 8FBF0018 */ lw $ra, 0x18($sp) -/* 96A3BC 802411FC 8FB10014 */ lw $s1, 0x14($sp) -/* 96A3C0 80241200 8FB00010 */ lw $s0, 0x10($sp) -/* 96A3C4 80241204 30420002 */ andi $v0, $v0, 2 -/* 96A3C8 80241208 03E00008 */ jr $ra -/* 96A3CC 8024120C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s new file mode 100644 index 0000000000..52ec3dd2d2 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241180_96A340 +/* 96A340 80241180 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 96A344 80241184 AFB10014 */ sw $s1, 0x14($sp) +/* 96A348 80241188 0080882D */ daddu $s1, $a0, $zero +/* 96A34C 8024118C AFB00010 */ sw $s0, 0x10($sp) +/* 96A350 80241190 00A0802D */ daddu $s0, $a1, $zero +/* 96A354 80241194 AFBF0018 */ sw $ra, 0x18($sp) +/* 96A358 80241198 0C00EABB */ jal get_npc_unsafe +/* 96A35C 8024119C 2404FFFC */ addiu $a0, $zero, -4 +/* 96A360 802411A0 12000003 */ beqz $s0, .L802411B0 +/* 96A364 802411A4 0040182D */ daddu $v1, $v0, $zero +/* 96A368 802411A8 2402003C */ addiu $v0, $zero, 0x3c +/* 96A36C 802411AC AE220070 */ sw $v0, 0x70($s1) +.L802411B0: +/* 96A370 802411B0 C462000C */ lwc1 $f2, 0xc($v1) +/* 96A374 802411B4 3C0141F0 */ lui $at, 0x41f0 +/* 96A378 802411B8 44810000 */ mtc1 $at, $f0 +/* 96A37C 802411BC 00000000 */ nop +/* 96A380 802411C0 46001000 */ add.s $f0, $f2, $f0 +/* 96A384 802411C4 3C0143B4 */ lui $at, 0x43b4 +/* 96A388 802411C8 44811000 */ mtc1 $at, $f2 +/* 96A38C 802411CC 00000000 */ nop +/* 96A390 802411D0 4600103E */ c.le.s $f2, $f0 +/* 96A394 802411D4 00000000 */ nop +/* 96A398 802411D8 45000003 */ bc1f .L802411E8 +/* 96A39C 802411DC E460000C */ swc1 $f0, 0xc($v1) +/* 96A3A0 802411E0 46020001 */ sub.s $f0, $f0, $f2 +/* 96A3A4 802411E4 E460000C */ swc1 $f0, 0xc($v1) +.L802411E8: +/* 96A3A8 802411E8 8E230070 */ lw $v1, 0x70($s1) +/* 96A3AC 802411EC 2463FFFF */ addiu $v1, $v1, -1 +/* 96A3B0 802411F0 000317C3 */ sra $v0, $v1, 0x1f +/* 96A3B4 802411F4 AE230070 */ sw $v1, 0x70($s1) +/* 96A3B8 802411F8 8FBF0018 */ lw $ra, 0x18($sp) +/* 96A3BC 802411FC 8FB10014 */ lw $s1, 0x14($sp) +/* 96A3C0 80241200 8FB00010 */ lw $s0, 0x10($sp) +/* 96A3C4 80241204 30420002 */ andi $v0, $v0, 2 +/* 96A3C8 80241208 03E00008 */ jr $ra +/* 96A3CC 8024120C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394.s deleted file mode 100644 index ac78570edf..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394.s +++ /dev/null @@ -1,90 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241394 -/* 96A554 80241394 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96A558 80241398 AFB20018 */ sw $s2, 0x18($sp) -/* 96A55C 8024139C 0080902D */ daddu $s2, $a0, $zero -/* 96A560 802413A0 AFBF001C */ sw $ra, 0x1c($sp) -/* 96A564 802413A4 AFB10014 */ sw $s1, 0x14($sp) -/* 96A568 802413A8 AFB00010 */ sw $s0, 0x10($sp) -/* 96A56C 802413AC 8E50000C */ lw $s0, 0xc($s2) -/* 96A570 802413B0 8E050000 */ lw $a1, ($s0) -/* 96A574 802413B4 0C0B1EAF */ jal get_variable -/* 96A578 802413B8 26100004 */ addiu $s0, $s0, 4 -/* 96A57C 802413BC 3C118011 */ lui $s1, %hi(gPlayerData) -/* 96A580 802413C0 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* 96A584 802413C4 3C058024 */ lui $a1, 0x8024 -/* 96A588 802413C8 00A22821 */ addu $a1, $a1, $v0 -/* 96A58C 802413CC 90A575E0 */ lbu $a1, 0x75e0($a1) -/* 96A590 802413D0 8623000C */ lh $v1, 0xc($s1) -/* 96A594 802413D4 8E100000 */ lw $s0, ($s0) -/* 96A598 802413D8 3C068024 */ lui $a2, 0x8024 -/* 96A59C 802413DC 00C23021 */ addu $a2, $a2, $v0 -/* 96A5A0 802413E0 90C675DC */ lbu $a2, 0x75dc($a2) -/* 96A5A4 802413E4 9624000C */ lhu $a0, 0xc($s1) -/* 96A5A8 802413E8 0065182A */ slt $v1, $v1, $a1 -/* 96A5AC 802413EC 10600005 */ beqz $v1, .L80241404 -/* 96A5B0 802413F0 30A200FF */ andi $v0, $a1, 0xff -/* 96A5B4 802413F4 0240202D */ daddu $a0, $s2, $zero -/* 96A5B8 802413F8 0200282D */ daddu $a1, $s0, $zero -/* 96A5BC 802413FC 08090527 */ j .L8024149C -/* 96A5C0 80241400 24060001 */ addiu $a2, $zero, 1 -.L80241404: -/* 96A5C4 80241404 00821023 */ subu $v0, $a0, $v0 -/* 96A5C8 80241408 A622000C */ sh $v0, 0xc($s1) -/* 96A5CC 8024140C 8222028A */ lb $v0, 0x28a($s1) -/* 96A5D0 80241410 30C300FF */ andi $v1, $a2, 0xff -/* 96A5D4 80241414 0043102A */ slt $v0, $v0, $v1 -/* 96A5D8 80241418 54400001 */ bnel $v0, $zero, .L80241420 -/* 96A5DC 8024141C A226028A */ sb $a2, 0x28a($s1) -.L80241420: -/* 96A5E0 80241420 0C00A67F */ jal rand_int -/* 96A5E4 80241424 24040002 */ addiu $a0, $zero, 2 -/* 96A5E8 80241428 24420001 */ addiu $v0, $v0, 1 -/* 96A5EC 8024142C A622028C */ sh $v0, 0x28c($s1) -/* 96A5F0 80241430 0C00A67F */ jal rand_int -/* 96A5F4 80241434 24040003 */ addiu $a0, $zero, 3 -/* 96A5F8 80241438 0040182D */ daddu $v1, $v0, $zero -/* 96A5FC 8024143C 24040001 */ addiu $a0, $zero, 1 -/* 96A600 80241440 1064000D */ beq $v1, $a0, .L80241478 -/* 96A604 80241444 28620002 */ slti $v0, $v1, 2 -/* 96A608 80241448 10400005 */ beqz $v0, .L80241460 -/* 96A60C 8024144C 24020002 */ addiu $v0, $zero, 2 -/* 96A610 80241450 5060000F */ beql $v1, $zero, .L80241490 -/* 96A614 80241454 A2240289 */ sb $a0, 0x289($s1) -/* 96A618 80241458 08090525 */ j .L80241494 -/* 96A61C 8024145C 0240202D */ daddu $a0, $s2, $zero -.L80241460: -/* 96A620 80241460 10620007 */ beq $v1, $v0, .L80241480 -/* 96A624 80241464 24020003 */ addiu $v0, $zero, 3 -/* 96A628 80241468 10620007 */ beq $v1, $v0, .L80241488 -/* 96A62C 8024146C 0240202D */ daddu $a0, $s2, $zero -/* 96A630 80241470 08090526 */ j .L80241498 -/* 96A634 80241474 0200282D */ daddu $a1, $s0, $zero -.L80241478: -/* 96A638 80241478 08090523 */ j .L8024148C -/* 96A63C 8024147C 24020002 */ addiu $v0, $zero, 2 -.L80241480: -/* 96A640 80241480 08090523 */ j .L8024148C -/* 96A644 80241484 24020003 */ addiu $v0, $zero, 3 -.L80241488: -/* 96A648 80241488 24020004 */ addiu $v0, $zero, 4 -.L8024148C: -/* 96A64C 8024148C A2220289 */ sb $v0, 0x289($s1) -.L80241490: -/* 96A650 80241490 0240202D */ daddu $a0, $s2, $zero -.L80241494: -/* 96A654 80241494 0200282D */ daddu $a1, $s0, $zero -.L80241498: -/* 96A658 80241498 0000302D */ daddu $a2, $zero, $zero -.L8024149C: -/* 96A65C 8024149C 0C0B2026 */ jal set_variable -/* 96A660 802414A0 00000000 */ nop -/* 96A664 802414A4 8FBF001C */ lw $ra, 0x1c($sp) -/* 96A668 802414A8 8FB20018 */ lw $s2, 0x18($sp) -/* 96A66C 802414AC 8FB10014 */ lw $s1, 0x14($sp) -/* 96A670 802414B0 8FB00010 */ lw $s0, 0x10($sp) -/* 96A674 802414B4 24020002 */ addiu $v0, $zero, 2 -/* 96A678 802414B8 03E00008 */ jr $ra -/* 96A67C 802414BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s new file mode 100644 index 0000000000..cb809c3109 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241394_96A554.s @@ -0,0 +1,90 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241394_96A554 +/* 96A554 80241394 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 96A558 80241398 AFB20018 */ sw $s2, 0x18($sp) +/* 96A55C 8024139C 0080902D */ daddu $s2, $a0, $zero +/* 96A560 802413A0 AFBF001C */ sw $ra, 0x1c($sp) +/* 96A564 802413A4 AFB10014 */ sw $s1, 0x14($sp) +/* 96A568 802413A8 AFB00010 */ sw $s0, 0x10($sp) +/* 96A56C 802413AC 8E50000C */ lw $s0, 0xc($s2) +/* 96A570 802413B0 8E050000 */ lw $a1, ($s0) +/* 96A574 802413B4 0C0B1EAF */ jal get_variable +/* 96A578 802413B8 26100004 */ addiu $s0, $s0, 4 +/* 96A57C 802413BC 3C118011 */ lui $s1, %hi(gPlayerData) +/* 96A580 802413C0 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) +/* 96A584 802413C4 3C058024 */ lui $a1, 0x8024 +/* 96A588 802413C8 00A22821 */ addu $a1, $a1, $v0 +/* 96A58C 802413CC 90A575E0 */ lbu $a1, 0x75e0($a1) +/* 96A590 802413D0 8623000C */ lh $v1, 0xc($s1) +/* 96A594 802413D4 8E100000 */ lw $s0, ($s0) +/* 96A598 802413D8 3C068024 */ lui $a2, 0x8024 +/* 96A59C 802413DC 00C23021 */ addu $a2, $a2, $v0 +/* 96A5A0 802413E0 90C675DC */ lbu $a2, 0x75dc($a2) +/* 96A5A4 802413E4 9624000C */ lhu $a0, 0xc($s1) +/* 96A5A8 802413E8 0065182A */ slt $v1, $v1, $a1 +/* 96A5AC 802413EC 10600005 */ beqz $v1, .L80241404 +/* 96A5B0 802413F0 30A200FF */ andi $v0, $a1, 0xff +/* 96A5B4 802413F4 0240202D */ daddu $a0, $s2, $zero +/* 96A5B8 802413F8 0200282D */ daddu $a1, $s0, $zero +/* 96A5BC 802413FC 08090527 */ j .L8024149C +/* 96A5C0 80241400 24060001 */ addiu $a2, $zero, 1 +.L80241404: +/* 96A5C4 80241404 00821023 */ subu $v0, $a0, $v0 +/* 96A5C8 80241408 A622000C */ sh $v0, 0xc($s1) +/* 96A5CC 8024140C 8222028A */ lb $v0, 0x28a($s1) +/* 96A5D0 80241410 30C300FF */ andi $v1, $a2, 0xff +/* 96A5D4 80241414 0043102A */ slt $v0, $v0, $v1 +/* 96A5D8 80241418 54400001 */ bnel $v0, $zero, .L80241420 +/* 96A5DC 8024141C A226028A */ sb $a2, 0x28a($s1) +.L80241420: +/* 96A5E0 80241420 0C00A67F */ jal rand_int +/* 96A5E4 80241424 24040002 */ addiu $a0, $zero, 2 +/* 96A5E8 80241428 24420001 */ addiu $v0, $v0, 1 +/* 96A5EC 8024142C A622028C */ sh $v0, 0x28c($s1) +/* 96A5F0 80241430 0C00A67F */ jal rand_int +/* 96A5F4 80241434 24040003 */ addiu $a0, $zero, 3 +/* 96A5F8 80241438 0040182D */ daddu $v1, $v0, $zero +/* 96A5FC 8024143C 24040001 */ addiu $a0, $zero, 1 +/* 96A600 80241440 1064000D */ beq $v1, $a0, .L80241478 +/* 96A604 80241444 28620002 */ slti $v0, $v1, 2 +/* 96A608 80241448 10400005 */ beqz $v0, .L80241460 +/* 96A60C 8024144C 24020002 */ addiu $v0, $zero, 2 +/* 96A610 80241450 5060000F */ beql $v1, $zero, .L80241490 +/* 96A614 80241454 A2240289 */ sb $a0, 0x289($s1) +/* 96A618 80241458 08090525 */ j .L80241494 +/* 96A61C 8024145C 0240202D */ daddu $a0, $s2, $zero +.L80241460: +/* 96A620 80241460 10620007 */ beq $v1, $v0, .L80241480 +/* 96A624 80241464 24020003 */ addiu $v0, $zero, 3 +/* 96A628 80241468 10620007 */ beq $v1, $v0, .L80241488 +/* 96A62C 8024146C 0240202D */ daddu $a0, $s2, $zero +/* 96A630 80241470 08090526 */ j .L80241498 +/* 96A634 80241474 0200282D */ daddu $a1, $s0, $zero +.L80241478: +/* 96A638 80241478 08090523 */ j .L8024148C +/* 96A63C 8024147C 24020002 */ addiu $v0, $zero, 2 +.L80241480: +/* 96A640 80241480 08090523 */ j .L8024148C +/* 96A644 80241484 24020003 */ addiu $v0, $zero, 3 +.L80241488: +/* 96A648 80241488 24020004 */ addiu $v0, $zero, 4 +.L8024148C: +/* 96A64C 8024148C A2220289 */ sb $v0, 0x289($s1) +.L80241490: +/* 96A650 80241490 0240202D */ daddu $a0, $s2, $zero +.L80241494: +/* 96A654 80241494 0200282D */ daddu $a1, $s0, $zero +.L80241498: +/* 96A658 80241498 0000302D */ daddu $a2, $zero, $zero +.L8024149C: +/* 96A65C 8024149C 0C0B2026 */ jal set_variable +/* 96A660 802414A0 00000000 */ nop +/* 96A664 802414A4 8FBF001C */ lw $ra, 0x1c($sp) +/* 96A668 802414A8 8FB20018 */ lw $s2, 0x18($sp) +/* 96A66C 802414AC 8FB10014 */ lw $s1, 0x14($sp) +/* 96A670 802414B0 8FB00010 */ lw $s0, 0x10($sp) +/* 96A674 802414B4 24020002 */ addiu $v0, $zero, 2 +/* 96A678 802414B8 03E00008 */ jr $ra +/* 96A67C 802414BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0.s deleted file mode 100644 index a330bda55f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0.s +++ /dev/null @@ -1,75 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414C0 -/* 96A680 802414C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 96A684 802414C4 AFB10014 */ sw $s1, 0x14($sp) -/* 96A688 802414C8 0080882D */ daddu $s1, $a0, $zero -/* 96A68C 802414CC AFBF0024 */ sw $ra, 0x24($sp) -/* 96A690 802414D0 AFB40020 */ sw $s4, 0x20($sp) -/* 96A694 802414D4 AFB3001C */ sw $s3, 0x1c($sp) -/* 96A698 802414D8 AFB20018 */ sw $s2, 0x18($sp) -/* 96A69C 802414DC 10A00023 */ beqz $a1, .L8024156C -/* 96A6A0 802414E0 AFB00010 */ sw $s0, 0x10($sp) -/* 96A6A4 802414E4 0C04760B */ jal func_8011D82C -/* 96A6A8 802414E8 24040001 */ addiu $a0, $zero, 1 -/* 96A6AC 802414EC 0000202D */ daddu $a0, $zero, $zero -/* 96A6B0 802414F0 0080282D */ daddu $a1, $a0, $zero -/* 96A6B4 802414F4 0080302D */ daddu $a2, $a0, $zero -/* 96A6B8 802414F8 0080382D */ daddu $a3, $a0, $zero -/* 96A6BC 802414FC 0080802D */ daddu $s0, $a0, $zero -/* 96A6C0 80241500 2414FFFC */ addiu $s4, $zero, -4 -/* 96A6C4 80241504 24130004 */ addiu $s3, $zero, 4 -/* 96A6C8 80241508 3C120080 */ lui $s2, 0x80 -/* 96A6CC 8024150C 3C038015 */ lui $v1, 0x8015 -/* 96A6D0 80241510 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 96A6D4 80241514 24020001 */ addiu $v0, $zero, 1 -/* 96A6D8 80241518 0C046F97 */ jal set_background_color_blend -/* 96A6DC 8024151C A0620000 */ sb $v0, ($v1) -.L80241520: -/* 96A6E0 80241520 0C00E2B7 */ jal get_npc_by_index -/* 96A6E4 80241524 0200202D */ daddu $a0, $s0, $zero -/* 96A6E8 80241528 0040202D */ daddu $a0, $v0, $zero -/* 96A6EC 8024152C 5080000B */ beql $a0, $zero, .L8024155C -/* 96A6F0 80241530 26100001 */ addiu $s0, $s0, 1 -/* 96A6F4 80241534 8C820000 */ lw $v0, ($a0) -/* 96A6F8 80241538 50400008 */ beql $v0, $zero, .L8024155C -/* 96A6FC 8024153C 26100001 */ addiu $s0, $s0, 1 -/* 96A700 80241540 808300A4 */ lb $v1, 0xa4($a0) -/* 96A704 80241544 10740005 */ beq $v1, $s4, .L8024155C -/* 96A708 80241548 26100001 */ addiu $s0, $s0, 1 -/* 96A70C 8024154C 10730003 */ beq $v1, $s3, .L8024155C -/* 96A710 80241550 00000000 */ nop -/* 96A714 80241554 00521025 */ or $v0, $v0, $s2 -/* 96A718 80241558 AC820000 */ sw $v0, ($a0) -.L8024155C: -/* 96A71C 8024155C 2A020040 */ slti $v0, $s0, 0x40 -/* 96A720 80241560 1440FFEF */ bnez $v0, .L80241520 -/* 96A724 80241564 00000000 */ nop -/* 96A728 80241568 AE200070 */ sw $zero, 0x70($s1) -.L8024156C: -/* 96A72C 8024156C 8E220070 */ lw $v0, 0x70($s1) -/* 96A730 80241570 24420008 */ addiu $v0, $v0, 8 -/* 96A734 80241574 AE220070 */ sw $v0, 0x70($s1) -/* 96A738 80241578 28420100 */ slti $v0, $v0, 0x100 -/* 96A73C 8024157C 14400003 */ bnez $v0, .L8024158C -/* 96A740 80241580 0000202D */ daddu $a0, $zero, $zero -/* 96A744 80241584 240200FF */ addiu $v0, $zero, 0xff -/* 96A748 80241588 AE220070 */ sw $v0, 0x70($s1) -.L8024158C: -/* 96A74C 8024158C 0080282D */ daddu $a1, $a0, $zero -/* 96A750 80241590 92270073 */ lbu $a3, 0x73($s1) -/* 96A754 80241594 0C046F97 */ jal set_background_color_blend -/* 96A758 80241598 0080302D */ daddu $a2, $a0, $zero -/* 96A75C 8024159C 8E220070 */ lw $v0, 0x70($s1) -/* 96A760 802415A0 8FBF0024 */ lw $ra, 0x24($sp) -/* 96A764 802415A4 8FB40020 */ lw $s4, 0x20($sp) -/* 96A768 802415A8 8FB3001C */ lw $s3, 0x1c($sp) -/* 96A76C 802415AC 8FB20018 */ lw $s2, 0x18($sp) -/* 96A770 802415B0 8FB10014 */ lw $s1, 0x14($sp) -/* 96A774 802415B4 8FB00010 */ lw $s0, 0x10($sp) -/* 96A778 802415B8 384200FF */ xori $v0, $v0, 0xff -/* 96A77C 802415BC 2C420001 */ sltiu $v0, $v0, 1 -/* 96A780 802415C0 00021040 */ sll $v0, $v0, 1 -/* 96A784 802415C4 03E00008 */ jr $ra -/* 96A788 802415C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s new file mode 100644 index 0000000000..00b3bdca5c --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802414C0_96A680.s @@ -0,0 +1,75 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414C0_96A680 +/* 96A680 802414C0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 96A684 802414C4 AFB10014 */ sw $s1, 0x14($sp) +/* 96A688 802414C8 0080882D */ daddu $s1, $a0, $zero +/* 96A68C 802414CC AFBF0024 */ sw $ra, 0x24($sp) +/* 96A690 802414D0 AFB40020 */ sw $s4, 0x20($sp) +/* 96A694 802414D4 AFB3001C */ sw $s3, 0x1c($sp) +/* 96A698 802414D8 AFB20018 */ sw $s2, 0x18($sp) +/* 96A69C 802414DC 10A00023 */ beqz $a1, .L8024156C +/* 96A6A0 802414E0 AFB00010 */ sw $s0, 0x10($sp) +/* 96A6A4 802414E4 0C04760B */ jal func_8011D82C +/* 96A6A8 802414E8 24040001 */ addiu $a0, $zero, 1 +/* 96A6AC 802414EC 0000202D */ daddu $a0, $zero, $zero +/* 96A6B0 802414F0 0080282D */ daddu $a1, $a0, $zero +/* 96A6B4 802414F4 0080302D */ daddu $a2, $a0, $zero +/* 96A6B8 802414F8 0080382D */ daddu $a3, $a0, $zero +/* 96A6BC 802414FC 0080802D */ daddu $s0, $a0, $zero +/* 96A6C0 80241500 2414FFFC */ addiu $s4, $zero, -4 +/* 96A6C4 80241504 24130004 */ addiu $s3, $zero, 4 +/* 96A6C8 80241508 3C120080 */ lui $s2, 0x80 +/* 96A6CC 8024150C 3C038015 */ lui $v1, 0x8015 +/* 96A6D0 80241510 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 96A6D4 80241514 24020001 */ addiu $v0, $zero, 1 +/* 96A6D8 80241518 0C046F97 */ jal set_background_color_blend +/* 96A6DC 8024151C A0620000 */ sb $v0, ($v1) +.L80241520: +/* 96A6E0 80241520 0C00E2B7 */ jal get_npc_by_index +/* 96A6E4 80241524 0200202D */ daddu $a0, $s0, $zero +/* 96A6E8 80241528 0040202D */ daddu $a0, $v0, $zero +/* 96A6EC 8024152C 5080000B */ beql $a0, $zero, .L8024155C +/* 96A6F0 80241530 26100001 */ addiu $s0, $s0, 1 +/* 96A6F4 80241534 8C820000 */ lw $v0, ($a0) +/* 96A6F8 80241538 50400008 */ beql $v0, $zero, .L8024155C +/* 96A6FC 8024153C 26100001 */ addiu $s0, $s0, 1 +/* 96A700 80241540 808300A4 */ lb $v1, 0xa4($a0) +/* 96A704 80241544 10740005 */ beq $v1, $s4, .L8024155C +/* 96A708 80241548 26100001 */ addiu $s0, $s0, 1 +/* 96A70C 8024154C 10730003 */ beq $v1, $s3, .L8024155C +/* 96A710 80241550 00000000 */ nop +/* 96A714 80241554 00521025 */ or $v0, $v0, $s2 +/* 96A718 80241558 AC820000 */ sw $v0, ($a0) +.L8024155C: +/* 96A71C 8024155C 2A020040 */ slti $v0, $s0, 0x40 +/* 96A720 80241560 1440FFEF */ bnez $v0, .L80241520 +/* 96A724 80241564 00000000 */ nop +/* 96A728 80241568 AE200070 */ sw $zero, 0x70($s1) +.L8024156C: +/* 96A72C 8024156C 8E220070 */ lw $v0, 0x70($s1) +/* 96A730 80241570 24420008 */ addiu $v0, $v0, 8 +/* 96A734 80241574 AE220070 */ sw $v0, 0x70($s1) +/* 96A738 80241578 28420100 */ slti $v0, $v0, 0x100 +/* 96A73C 8024157C 14400003 */ bnez $v0, .L8024158C +/* 96A740 80241580 0000202D */ daddu $a0, $zero, $zero +/* 96A744 80241584 240200FF */ addiu $v0, $zero, 0xff +/* 96A748 80241588 AE220070 */ sw $v0, 0x70($s1) +.L8024158C: +/* 96A74C 8024158C 0080282D */ daddu $a1, $a0, $zero +/* 96A750 80241590 92270073 */ lbu $a3, 0x73($s1) +/* 96A754 80241594 0C046F97 */ jal set_background_color_blend +/* 96A758 80241598 0080302D */ daddu $a2, $a0, $zero +/* 96A75C 8024159C 8E220070 */ lw $v0, 0x70($s1) +/* 96A760 802415A0 8FBF0024 */ lw $ra, 0x24($sp) +/* 96A764 802415A4 8FB40020 */ lw $s4, 0x20($sp) +/* 96A768 802415A8 8FB3001C */ lw $s3, 0x1c($sp) +/* 96A76C 802415AC 8FB20018 */ lw $s2, 0x18($sp) +/* 96A770 802415B0 8FB10014 */ lw $s1, 0x14($sp) +/* 96A774 802415B4 8FB00010 */ lw $s0, 0x10($sp) +/* 96A778 802415B8 384200FF */ xori $v0, $v0, 0xff +/* 96A77C 802415BC 2C420001 */ sltiu $v0, $v0, 1 +/* 96A780 802415C0 00021040 */ sll $v0, $v0, 1 +/* 96A784 802415C4 03E00008 */ jr $ra +/* 96A788 802415C8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC.s deleted file mode 100644 index 142de62c37..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415CC -/* 96A78C 802415CC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 96A790 802415D0 AFB00010 */ sw $s0, 0x10($sp) -/* 96A794 802415D4 0080802D */ daddu $s0, $a0, $zero -/* 96A798 802415D8 AFBF0020 */ sw $ra, 0x20($sp) -/* 96A79C 802415DC AFB3001C */ sw $s3, 0x1c($sp) -/* 96A7A0 802415E0 AFB20018 */ sw $s2, 0x18($sp) -/* 96A7A4 802415E4 10A00009 */ beqz $a1, .L8024160C -/* 96A7A8 802415E8 AFB10014 */ sw $s1, 0x14($sp) -/* 96A7AC 802415EC 0000202D */ daddu $a0, $zero, $zero -/* 96A7B0 802415F0 0080282D */ daddu $a1, $a0, $zero -/* 96A7B4 802415F4 0080302D */ daddu $a2, $a0, $zero -/* 96A7B8 802415F8 0C046F97 */ jal set_background_color_blend -/* 96A7BC 802415FC 240700FF */ addiu $a3, $zero, 0xff -/* 96A7C0 80241600 240200FF */ addiu $v0, $zero, 0xff -/* 96A7C4 80241604 AE020070 */ sw $v0, 0x70($s0) -/* 96A7C8 80241608 AE000074 */ sw $zero, 0x74($s0) -.L8024160C: -/* 96A7CC 8024160C 8E020070 */ lw $v0, 0x70($s0) -/* 96A7D0 80241610 2442FFF8 */ addiu $v0, $v0, -8 -/* 96A7D4 80241614 04410002 */ bgez $v0, .L80241620 -/* 96A7D8 80241618 AE020070 */ sw $v0, 0x70($s0) -/* 96A7DC 8024161C AE000070 */ sw $zero, 0x70($s0) -.L80241620: -/* 96A7E0 80241620 0000202D */ daddu $a0, $zero, $zero -/* 96A7E4 80241624 0080282D */ daddu $a1, $a0, $zero -/* 96A7E8 80241628 92070073 */ lbu $a3, 0x73($s0) -/* 96A7EC 8024162C 0C046F97 */ jal set_background_color_blend -/* 96A7F0 80241630 0080302D */ daddu $a2, $a0, $zero -/* 96A7F4 80241634 8E020070 */ lw $v0, 0x70($s0) -/* 96A7F8 80241638 14400006 */ bnez $v0, .L80241654 -/* 96A7FC 8024163C 00000000 */ nop -/* 96A800 80241640 8E020074 */ lw $v0, 0x74($s0) -/* 96A804 80241644 14400003 */ bnez $v0, .L80241654 -/* 96A808 80241648 24020001 */ addiu $v0, $zero, 1 -/* 96A80C 8024164C 080905B7 */ j .L802416DC -/* 96A810 80241650 AE020074 */ sw $v0, 0x74($s0) -.L80241654: -/* 96A814 80241654 8E030074 */ lw $v1, 0x74($s0) -/* 96A818 80241658 24020001 */ addiu $v0, $zero, 1 -/* 96A81C 8024165C 14620020 */ bne $v1, $v0, .L802416E0 -/* 96A820 80241660 0000102D */ daddu $v0, $zero, $zero -/* 96A824 80241664 0C04760B */ jal func_8011D82C -/* 96A828 80241668 0000202D */ daddu $a0, $zero, $zero -/* 96A82C 8024166C 0000802D */ daddu $s0, $zero, $zero -/* 96A830 80241670 2413FFFC */ addiu $s3, $zero, -4 -/* 96A834 80241674 24120004 */ addiu $s2, $zero, 4 -/* 96A838 80241678 3C11FF7F */ lui $s1, 0xff7f -/* 96A83C 8024167C 3C028015 */ lui $v0, 0x8015 -/* 96A840 80241680 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 96A844 80241684 3631FFFF */ ori $s1, $s1, 0xffff -/* 96A848 80241688 A0400000 */ sb $zero, ($v0) -.L8024168C: -/* 96A84C 8024168C 0C00E2B7 */ jal get_npc_by_index -/* 96A850 80241690 0200202D */ daddu $a0, $s0, $zero -/* 96A854 80241694 0040202D */ daddu $a0, $v0, $zero -/* 96A858 80241698 5080000B */ beql $a0, $zero, .L802416C8 -/* 96A85C 8024169C 26100001 */ addiu $s0, $s0, 1 -/* 96A860 802416A0 8C820000 */ lw $v0, ($a0) -/* 96A864 802416A4 50400008 */ beql $v0, $zero, .L802416C8 -/* 96A868 802416A8 26100001 */ addiu $s0, $s0, 1 -/* 96A86C 802416AC 808300A4 */ lb $v1, 0xa4($a0) -/* 96A870 802416B0 10730005 */ beq $v1, $s3, .L802416C8 -/* 96A874 802416B4 26100001 */ addiu $s0, $s0, 1 -/* 96A878 802416B8 10720003 */ beq $v1, $s2, .L802416C8 -/* 96A87C 802416BC 00000000 */ nop -/* 96A880 802416C0 00511024 */ and $v0, $v0, $s1 -/* 96A884 802416C4 AC820000 */ sw $v0, ($a0) -.L802416C8: -/* 96A888 802416C8 2A020040 */ slti $v0, $s0, 0x40 -/* 96A88C 802416CC 1440FFEF */ bnez $v0, .L8024168C -/* 96A890 802416D0 24020002 */ addiu $v0, $zero, 2 -/* 96A894 802416D4 080905B8 */ j .L802416E0 -/* 96A898 802416D8 00000000 */ nop -.L802416DC: -/* 96A89C 802416DC 0000102D */ daddu $v0, $zero, $zero -.L802416E0: -/* 96A8A0 802416E0 8FBF0020 */ lw $ra, 0x20($sp) -/* 96A8A4 802416E4 8FB3001C */ lw $s3, 0x1c($sp) -/* 96A8A8 802416E8 8FB20018 */ lw $s2, 0x18($sp) -/* 96A8AC 802416EC 8FB10014 */ lw $s1, 0x14($sp) -/* 96A8B0 802416F0 8FB00010 */ lw $s0, 0x10($sp) -/* 96A8B4 802416F4 03E00008 */ jr $ra -/* 96A8B8 802416F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s new file mode 100644 index 0000000000..e8c226edf2 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802415CC_96A78C.s @@ -0,0 +1,87 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415CC_96A78C +/* 96A78C 802415CC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 96A790 802415D0 AFB00010 */ sw $s0, 0x10($sp) +/* 96A794 802415D4 0080802D */ daddu $s0, $a0, $zero +/* 96A798 802415D8 AFBF0020 */ sw $ra, 0x20($sp) +/* 96A79C 802415DC AFB3001C */ sw $s3, 0x1c($sp) +/* 96A7A0 802415E0 AFB20018 */ sw $s2, 0x18($sp) +/* 96A7A4 802415E4 10A00009 */ beqz $a1, .L8024160C +/* 96A7A8 802415E8 AFB10014 */ sw $s1, 0x14($sp) +/* 96A7AC 802415EC 0000202D */ daddu $a0, $zero, $zero +/* 96A7B0 802415F0 0080282D */ daddu $a1, $a0, $zero +/* 96A7B4 802415F4 0080302D */ daddu $a2, $a0, $zero +/* 96A7B8 802415F8 0C046F97 */ jal set_background_color_blend +/* 96A7BC 802415FC 240700FF */ addiu $a3, $zero, 0xff +/* 96A7C0 80241600 240200FF */ addiu $v0, $zero, 0xff +/* 96A7C4 80241604 AE020070 */ sw $v0, 0x70($s0) +/* 96A7C8 80241608 AE000074 */ sw $zero, 0x74($s0) +.L8024160C: +/* 96A7CC 8024160C 8E020070 */ lw $v0, 0x70($s0) +/* 96A7D0 80241610 2442FFF8 */ addiu $v0, $v0, -8 +/* 96A7D4 80241614 04410002 */ bgez $v0, .L80241620 +/* 96A7D8 80241618 AE020070 */ sw $v0, 0x70($s0) +/* 96A7DC 8024161C AE000070 */ sw $zero, 0x70($s0) +.L80241620: +/* 96A7E0 80241620 0000202D */ daddu $a0, $zero, $zero +/* 96A7E4 80241624 0080282D */ daddu $a1, $a0, $zero +/* 96A7E8 80241628 92070073 */ lbu $a3, 0x73($s0) +/* 96A7EC 8024162C 0C046F97 */ jal set_background_color_blend +/* 96A7F0 80241630 0080302D */ daddu $a2, $a0, $zero +/* 96A7F4 80241634 8E020070 */ lw $v0, 0x70($s0) +/* 96A7F8 80241638 14400006 */ bnez $v0, .L80241654 +/* 96A7FC 8024163C 00000000 */ nop +/* 96A800 80241640 8E020074 */ lw $v0, 0x74($s0) +/* 96A804 80241644 14400003 */ bnez $v0, .L80241654 +/* 96A808 80241648 24020001 */ addiu $v0, $zero, 1 +/* 96A80C 8024164C 080905B7 */ j .L802416DC +/* 96A810 80241650 AE020074 */ sw $v0, 0x74($s0) +.L80241654: +/* 96A814 80241654 8E030074 */ lw $v1, 0x74($s0) +/* 96A818 80241658 24020001 */ addiu $v0, $zero, 1 +/* 96A81C 8024165C 14620020 */ bne $v1, $v0, .L802416E0 +/* 96A820 80241660 0000102D */ daddu $v0, $zero, $zero +/* 96A824 80241664 0C04760B */ jal func_8011D82C +/* 96A828 80241668 0000202D */ daddu $a0, $zero, $zero +/* 96A82C 8024166C 0000802D */ daddu $s0, $zero, $zero +/* 96A830 80241670 2413FFFC */ addiu $s3, $zero, -4 +/* 96A834 80241674 24120004 */ addiu $s2, $zero, 4 +/* 96A838 80241678 3C11FF7F */ lui $s1, 0xff7f +/* 96A83C 8024167C 3C028015 */ lui $v0, 0x8015 +/* 96A840 80241680 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 96A844 80241684 3631FFFF */ ori $s1, $s1, 0xffff +/* 96A848 80241688 A0400000 */ sb $zero, ($v0) +.L8024168C: +/* 96A84C 8024168C 0C00E2B7 */ jal get_npc_by_index +/* 96A850 80241690 0200202D */ daddu $a0, $s0, $zero +/* 96A854 80241694 0040202D */ daddu $a0, $v0, $zero +/* 96A858 80241698 5080000B */ beql $a0, $zero, .L802416C8 +/* 96A85C 8024169C 26100001 */ addiu $s0, $s0, 1 +/* 96A860 802416A0 8C820000 */ lw $v0, ($a0) +/* 96A864 802416A4 50400008 */ beql $v0, $zero, .L802416C8 +/* 96A868 802416A8 26100001 */ addiu $s0, $s0, 1 +/* 96A86C 802416AC 808300A4 */ lb $v1, 0xa4($a0) +/* 96A870 802416B0 10730005 */ beq $v1, $s3, .L802416C8 +/* 96A874 802416B4 26100001 */ addiu $s0, $s0, 1 +/* 96A878 802416B8 10720003 */ beq $v1, $s2, .L802416C8 +/* 96A87C 802416BC 00000000 */ nop +/* 96A880 802416C0 00511024 */ and $v0, $v0, $s1 +/* 96A884 802416C4 AC820000 */ sw $v0, ($a0) +.L802416C8: +/* 96A888 802416C8 2A020040 */ slti $v0, $s0, 0x40 +/* 96A88C 802416CC 1440FFEF */ bnez $v0, .L8024168C +/* 96A890 802416D0 24020002 */ addiu $v0, $zero, 2 +/* 96A894 802416D4 080905B8 */ j .L802416E0 +/* 96A898 802416D8 00000000 */ nop +.L802416DC: +/* 96A89C 802416DC 0000102D */ daddu $v0, $zero, $zero +.L802416E0: +/* 96A8A0 802416E0 8FBF0020 */ lw $ra, 0x20($sp) +/* 96A8A4 802416E4 8FB3001C */ lw $s3, 0x1c($sp) +/* 96A8A8 802416E8 8FB20018 */ lw $s2, 0x18($sp) +/* 96A8AC 802416EC 8FB10014 */ lw $s1, 0x14($sp) +/* 96A8B0 802416F0 8FB00010 */ lw $s0, 0x10($sp) +/* 96A8B4 802416F4 03E00008 */ jr $ra +/* 96A8B8 802416F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C.s deleted file mode 100644 index c1072ffb37..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C.s +++ /dev/null @@ -1,592 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024190C -/* 96AACC 8024190C 27BDFF00 */ addiu $sp, $sp, -0x100 -/* 96AAD0 80241910 AFBF00EC */ sw $ra, 0xec($sp) -/* 96AAD4 80241914 AFBE00E8 */ sw $fp, 0xe8($sp) -/* 96AAD8 80241918 AFB700E4 */ sw $s7, 0xe4($sp) -/* 96AADC 8024191C AFB600E0 */ sw $s6, 0xe0($sp) -/* 96AAE0 80241920 AFB500DC */ sw $s5, 0xdc($sp) -/* 96AAE4 80241924 AFB400D8 */ sw $s4, 0xd8($sp) -/* 96AAE8 80241928 AFB300D4 */ sw $s3, 0xd4($sp) -/* 96AAEC 8024192C AFB200D0 */ sw $s2, 0xd0($sp) -/* 96AAF0 80241930 AFB100CC */ sw $s1, 0xcc($sp) -/* 96AAF4 80241934 AFB000C8 */ sw $s0, 0xc8($sp) -/* 96AAF8 80241938 F7B600F8 */ sdc1 $f22, 0xf8($sp) -/* 96AAFC 8024193C F7B400F0 */ sdc1 $f20, 0xf0($sp) -/* 96AB00 80241940 AFA40100 */ sw $a0, 0x100($sp) -/* 96AB04 80241944 AFA50104 */ sw $a1, 0x104($sp) -/* 96AB08 80241948 8C820000 */ lw $v0, ($a0) -/* 96AB0C 8024194C 10400184 */ beqz $v0, .L80241F60 -/* 96AB10 80241950 3C02DE00 */ lui $v0, 0xde00 -/* 96AB14 80241954 3C1E800A */ lui $fp, 0x800a -/* 96AB18 80241958 27DEA66C */ addiu $fp, $fp, -0x5994 -/* 96AB1C 8024195C 8FC80000 */ lw $t0, ($fp) -/* 96AB20 80241960 0100182D */ daddu $v1, $t0, $zero -/* 96AB24 80241964 25080008 */ addiu $t0, $t0, 8 -/* 96AB28 80241968 AFC80000 */ sw $t0, ($fp) -/* 96AB2C 8024196C AC620000 */ sw $v0, ($v1) -/* 96AB30 80241970 3C028024 */ lui $v0, 0x8024 -/* 96AB34 80241974 244278C8 */ addiu $v0, $v0, 0x78c8 -/* 96AB38 80241978 AC620004 */ sw $v0, 4($v1) -/* 96AB3C 8024197C 8FAD0100 */ lw $t5, 0x100($sp) -/* 96AB40 80241980 8DA30000 */ lw $v1, ($t5) -/* 96AB44 80241984 24020001 */ addiu $v0, $zero, 1 -/* 96AB48 80241988 10620006 */ beq $v1, $v0, .L802419A4 -/* 96AB4C 8024198C 24020004 */ addiu $v0, $zero, 4 -/* 96AB50 80241990 10620004 */ beq $v1, $v0, .L802419A4 -/* 96AB54 80241994 24020005 */ addiu $v0, $zero, 5 -/* 96AB58 80241998 14620126 */ bne $v1, $v0, .L80241E34 -/* 96AB5C 8024199C 24020002 */ addiu $v0, $zero, 2 -/* 96AB60 802419A0 8FAD0100 */ lw $t5, 0x100($sp) -.L802419A4: -/* 96AB64 802419A4 27B00058 */ addiu $s0, $sp, 0x58 -/* 96AB68 802419A8 8DA50004 */ lw $a1, 4($t5) -/* 96AB6C 802419AC 8DA60008 */ lw $a2, 8($t5) -/* 96AB70 802419B0 8DA7000C */ lw $a3, 0xc($t5) -/* 96AB74 802419B4 0C019E40 */ jal guTranslateF -/* 96AB78 802419B8 0200202D */ daddu $a0, $s0, $zero -/* 96AB7C 802419BC 0200202D */ daddu $a0, $s0, $zero -/* 96AB80 802419C0 8FA50104 */ lw $a1, 0x104($sp) -/* 96AB84 802419C4 4480A000 */ mtc1 $zero, $f20 -/* 96AB88 802419C8 0C019D80 */ jal guMtxCatF -/* 96AB8C 802419CC 27A60018 */ addiu $a2, $sp, 0x18 -/* 96AB90 802419D0 8FAD0100 */ lw $t5, 0x100($sp) -/* 96AB94 802419D4 3C013F80 */ lui $at, 0x3f80 -/* 96AB98 802419D8 4481B000 */ mtc1 $at, $f22 -/* 96AB9C 802419DC 4406A000 */ mfc1 $a2, $f20 -/* 96ABA0 802419E0 3C120001 */ lui $s2, 1 -/* 96ABA4 802419E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 96ABA8 802419E8 8DA50010 */ lw $a1, 0x10($t5) -/* 96ABAC 802419EC 4407B000 */ mfc1 $a3, $f22 -/* 96ABB0 802419F0 0C019EC8 */ jal guRotateF -/* 96ABB4 802419F4 0200202D */ daddu $a0, $s0, $zero -/* 96ABB8 802419F8 0200202D */ daddu $a0, $s0, $zero -/* 96ABBC 802419FC 27A50018 */ addiu $a1, $sp, 0x18 -/* 96ABC0 80241A00 0C019D80 */ jal guMtxCatF -/* 96ABC4 80241A04 00A0302D */ daddu $a2, $a1, $zero -/* 96ABC8 80241A08 8FAD0100 */ lw $t5, 0x100($sp) -/* 96ABCC 80241A0C 4406B000 */ mfc1 $a2, $f22 -/* 96ABD0 80241A10 4407A000 */ mfc1 $a3, $f20 -/* 96ABD4 80241A14 36521630 */ ori $s2, $s2, 0x1630 -/* 96ABD8 80241A18 E7B40010 */ swc1 $f20, 0x10($sp) -/* 96ABDC 80241A1C 8DA50014 */ lw $a1, 0x14($t5) -/* 96ABE0 80241A20 0C019EC8 */ jal guRotateF -/* 96ABE4 80241A24 0200202D */ daddu $a0, $s0, $zero -/* 96ABE8 80241A28 0200202D */ daddu $a0, $s0, $zero -/* 96ABEC 80241A2C 27A50018 */ addiu $a1, $sp, 0x18 -/* 96ABF0 80241A30 0C019D80 */ jal guMtxCatF -/* 96ABF4 80241A34 00A0302D */ daddu $a2, $a1, $zero -/* 96ABF8 80241A38 27A40018 */ addiu $a0, $sp, 0x18 -/* 96ABFC 80241A3C 3C108007 */ lui $s0, 0x8007 -/* 96AC00 80241A40 261041F0 */ addiu $s0, $s0, 0x41f0 -/* 96AC04 80241A44 3C11800A */ lui $s1, 0x800a -/* 96AC08 80241A48 2631A674 */ addiu $s1, $s1, -0x598c -/* 96AC0C 80241A4C 96050000 */ lhu $a1, ($s0) -/* 96AC10 80241A50 8E220000 */ lw $v0, ($s1) -/* 96AC14 80241A54 00052980 */ sll $a1, $a1, 6 -/* 96AC18 80241A58 00B22821 */ addu $a1, $a1, $s2 -/* 96AC1C 80241A5C 0C019D40 */ jal guMtxF2L -/* 96AC20 80241A60 00452821 */ addu $a1, $v0, $a1 -/* 96AC24 80241A64 3C03DA38 */ lui $v1, 0xda38 -/* 96AC28 80241A68 3C06800A */ lui $a2, 0x800a -/* 96AC2C 80241A6C 24C6A66C */ addiu $a2, $a2, -0x5994 -/* 96AC30 80241A70 34630002 */ ori $v1, $v1, 2 -/* 96AC34 80241A74 8CC50000 */ lw $a1, ($a2) -/* 96AC38 80241A78 96020000 */ lhu $v0, ($s0) -/* 96AC3C 80241A7C 00A0202D */ daddu $a0, $a1, $zero -/* 96AC40 80241A80 24A50008 */ addiu $a1, $a1, 8 -/* 96AC44 80241A84 ACC50000 */ sw $a1, ($a2) -/* 96AC48 80241A88 AC830000 */ sw $v1, ($a0) -/* 96AC4C 80241A8C 24430001 */ addiu $v1, $v0, 1 -/* 96AC50 80241A90 3042FFFF */ andi $v0, $v0, 0xffff -/* 96AC54 80241A94 00021180 */ sll $v0, $v0, 6 -/* 96AC58 80241A98 A6030000 */ sh $v1, ($s0) -/* 96AC5C 80241A9C 8E230000 */ lw $v1, ($s1) -/* 96AC60 80241AA0 00521021 */ addu $v0, $v0, $s2 -/* 96AC64 80241AA4 00621821 */ addu $v1, $v1, $v0 -/* 96AC68 80241AA8 3C028000 */ lui $v0, 0x8000 -/* 96AC6C 80241AAC 00621821 */ addu $v1, $v1, $v0 -/* 96AC70 80241AB0 AC830004 */ sw $v1, 4($a0) -/* 96AC74 80241AB4 8FAD0100 */ lw $t5, 0x100($sp) -/* 96AC78 80241AB8 8DA30000 */ lw $v1, ($t5) -/* 96AC7C 80241ABC 24020001 */ addiu $v0, $zero, 1 -/* 96AC80 80241AC0 10620003 */ beq $v1, $v0, .L80241AD0 -/* 96AC84 80241AC4 24020004 */ addiu $v0, $zero, 4 -/* 96AC88 80241AC8 1462000B */ bne $v1, $v0, .L80241AF8 -/* 96AC8C 80241ACC 24020001 */ addiu $v0, $zero, 1 -.L80241AD0: -/* 96AC90 80241AD0 24A20008 */ addiu $v0, $a1, 8 -/* 96AC94 80241AD4 ACC20000 */ sw $v0, ($a2) -/* 96AC98 80241AD8 3C02DE00 */ lui $v0, 0xde00 -/* 96AC9C 80241ADC ACA20000 */ sw $v0, ($a1) -/* 96ACA0 80241AE0 3C028024 */ lui $v0, 0x8024 -/* 96ACA4 80241AE4 244279B8 */ addiu $v0, $v0, 0x79b8 -/* 96ACA8 80241AE8 ACA20004 */ sw $v0, 4($a1) -/* 96ACAC 80241AEC 8FAD0100 */ lw $t5, 0x100($sp) -/* 96ACB0 80241AF0 8DA30000 */ lw $v1, ($t5) -/* 96ACB4 80241AF4 24020001 */ addiu $v0, $zero, 1 -.L80241AF8: -/* 96ACB8 80241AF8 10620003 */ beq $v1, $v0, .L80241B08 -/* 96ACBC 80241AFC 24020005 */ addiu $v0, $zero, 5 -/* 96ACC0 80241B00 146200C0 */ bne $v1, $v0, .L80241E04 -/* 96ACC4 80241B04 3C06D838 */ lui $a2, 0xd838 -.L80241B08: -/* 96ACC8 80241B08 27A400B0 */ addiu $a0, $sp, 0xb0 -/* 96ACCC 80241B0C 8FAD0100 */ lw $t5, 0x100($sp) -/* 96ACD0 80241B10 3C130001 */ lui $s3, 1 -/* 96ACD4 80241B14 8DA50018 */ lw $a1, 0x18($t5) -/* 96ACD8 80241B18 8DA6001C */ lw $a2, 0x1c($t5) -/* 96ACDC 80241B1C 0C0B7811 */ jal func_802DE044 -/* 96ACE0 80241B20 36731630 */ ori $s3, $s3, 0x1630 -/* 96ACE4 80241B24 3C02E300 */ lui $v0, 0xe300 -/* 96ACE8 80241B28 34421001 */ ori $v0, $v0, 0x1001 -/* 96ACEC 80241B2C 3C08F500 */ lui $t0, 0xf500 -/* 96ACF0 80241B30 35080100 */ ori $t0, $t0, 0x100 -/* 96ACF4 80241B34 3C090703 */ lui $t1, 0x703 -/* 96ACF8 80241B38 3529C000 */ ori $t1, $t1, 0xc000 -/* 96ACFC 80241B3C 3C0B070A */ lui $t3, 0x70a -/* 96AD00 80241B40 356B0280 */ ori $t3, $t3, 0x280 -/* 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, 0x800a -/* 96AD14 80241B54 2610A66C */ addiu $s0, $s0, -0x5994 -/* 96AD18 80241B58 3C0A0700 */ lui $t2, 0x700 -/* 96AD1C 80241B5C 8E050000 */ lw $a1, ($s0) -/* 96AD20 80241B60 44800000 */ mtc1 $zero, $f0 -/* 96AD24 80241B64 00A0182D */ daddu $v1, $a1, $zero -/* 96AD28 80241B68 44060000 */ mfc1 $a2, $f0 -/* 96AD2C 80241B6C 24A50008 */ addiu $a1, $a1, 8 -/* 96AD30 80241B70 AE050000 */ sw $a1, ($s0) -/* 96AD34 80241B74 AC620000 */ sw $v0, ($v1) -/* 96AD38 80241B78 34028000 */ ori $v0, $zero, 0x8000 -/* 96AD3C 80241B7C AC620004 */ sw $v0, 4($v1) -/* 96AD40 80241B80 24A20008 */ addiu $v0, $a1, 8 -/* 96AD44 80241B84 AE020000 */ sw $v0, ($s0) -/* 96AD48 80241B88 3C02FD10 */ lui $v0, 0xfd10 -/* 96AD4C 80241B8C ACA20000 */ sw $v0, ($a1) -/* 96AD50 80241B90 24A20010 */ addiu $v0, $a1, 0x10 -/* 96AD54 80241B94 AE020000 */ sw $v0, ($s0) -/* 96AD58 80241B98 8FA300B4 */ lw $v1, 0xb4($sp) -/* 96AD5C 80241B9C 3C02E800 */ lui $v0, 0xe800 -/* 96AD60 80241BA0 ACA20008 */ sw $v0, 8($a1) -/* 96AD64 80241BA4 24A20018 */ addiu $v0, $a1, 0x18 -/* 96AD68 80241BA8 ACA0000C */ sw $zero, 0xc($a1) -/* 96AD6C 80241BAC AE020000 */ sw $v0, ($s0) -/* 96AD70 80241BB0 24A20020 */ addiu $v0, $a1, 0x20 -/* 96AD74 80241BB4 ACA80010 */ sw $t0, 0x10($a1) -/* 96AD78 80241BB8 3C08E600 */ lui $t0, 0xe600 -/* 96AD7C 80241BBC ACAA0014 */ sw $t2, 0x14($a1) -/* 96AD80 80241BC0 AE020000 */ sw $v0, ($s0) -/* 96AD84 80241BC4 24A20028 */ addiu $v0, $a1, 0x28 -/* 96AD88 80241BC8 ACA80018 */ sw $t0, 0x18($a1) -/* 96AD8C 80241BCC ACA0001C */ sw $zero, 0x1c($a1) -/* 96AD90 80241BD0 AE020000 */ sw $v0, ($s0) -/* 96AD94 80241BD4 3C02F000 */ lui $v0, 0xf000 -/* 96AD98 80241BD8 ACA20020 */ sw $v0, 0x20($a1) -/* 96AD9C 80241BDC 24A20030 */ addiu $v0, $a1, 0x30 -/* 96ADA0 80241BE0 ACA90024 */ sw $t1, 0x24($a1) -/* 96ADA4 80241BE4 3C09E700 */ lui $t1, 0xe700 -/* 96ADA8 80241BE8 AE020000 */ sw $v0, ($s0) -/* 96ADAC 80241BEC ACA90028 */ sw $t1, 0x28($a1) -/* 96ADB0 80241BF0 ACA0002C */ sw $zero, 0x2c($a1) -/* 96ADB4 80241BF4 ACA30004 */ sw $v1, 4($a1) -/* 96ADB8 80241BF8 8FA200B8 */ lw $v0, 0xb8($sp) -/* 96ADBC 80241BFC 24A30038 */ addiu $v1, $a1, 0x38 -/* 96ADC0 80241C00 AE030000 */ sw $v1, ($s0) -/* 96ADC4 80241C04 3C03FD48 */ lui $v1, 0xfd48 -/* 96ADC8 80241C08 00021043 */ sra $v0, $v0, 1 -/* 96ADCC 80241C0C 2442FFFF */ addiu $v0, $v0, -1 -/* 96ADD0 80241C10 30420FFF */ andi $v0, $v0, 0xfff -/* 96ADD4 80241C14 00431025 */ or $v0, $v0, $v1 -/* 96ADD8 80241C18 ACA20030 */ sw $v0, 0x30($a1) -/* 96ADDC 80241C1C 8FA300B0 */ lw $v1, 0xb0($sp) -/* 96ADE0 80241C20 24A20040 */ addiu $v0, $a1, 0x40 -/* 96ADE4 80241C24 AE020000 */ sw $v0, ($s0) -/* 96ADE8 80241C28 ACA30034 */ sw $v1, 0x34($a1) -/* 96ADEC 80241C2C 8FA200B8 */ lw $v0, 0xb8($sp) -/* 96ADF0 80241C30 24A30048 */ addiu $v1, $a1, 0x48 -/* 96ADF4 80241C34 AE030000 */ sw $v1, ($s0) -/* 96ADF8 80241C38 3C03F548 */ lui $v1, 0xf548 -/* 96ADFC 80241C3C ACAB003C */ sw $t3, 0x3c($a1) -/* 96AE00 80241C40 00021043 */ sra $v0, $v0, 1 -/* 96AE04 80241C44 24420007 */ addiu $v0, $v0, 7 -/* 96AE08 80241C48 000210C3 */ sra $v0, $v0, 3 -/* 96AE0C 80241C4C 304201FF */ andi $v0, $v0, 0x1ff -/* 96AE10 80241C50 00021240 */ sll $v0, $v0, 9 -/* 96AE14 80241C54 00431025 */ or $v0, $v0, $v1 -/* 96AE18 80241C58 ACA20038 */ sw $v0, 0x38($a1) -/* 96AE1C 80241C5C 3C02F400 */ lui $v0, 0xf400 -/* 96AE20 80241C60 ACA80040 */ sw $t0, 0x40($a1) -/* 96AE24 80241C64 ACA00044 */ sw $zero, 0x44($a1) -/* 96AE28 80241C68 ACA20048 */ sw $v0, 0x48($a1) -/* 96AE2C 80241C6C 8FA200B8 */ lw $v0, 0xb8($sp) -/* 96AE30 80241C70 8FA300BC */ lw $v1, 0xbc($sp) -/* 96AE34 80241C74 24A80050 */ addiu $t0, $a1, 0x50 -/* 96AE38 80241C78 AE080000 */ sw $t0, ($s0) -/* 96AE3C 80241C7C ACA90050 */ sw $t1, 0x50($a1) -/* 96AE40 80241C80 ACA00054 */ sw $zero, 0x54($a1) -/* 96AE44 80241C84 2442FFFF */ addiu $v0, $v0, -1 -/* 96AE48 80241C88 00021040 */ sll $v0, $v0, 1 -/* 96AE4C 80241C8C 30420FFF */ andi $v0, $v0, 0xfff -/* 96AE50 80241C90 00021300 */ sll $v0, $v0, 0xc -/* 96AE54 80241C94 2463FFFF */ addiu $v1, $v1, -1 -/* 96AE58 80241C98 00031880 */ sll $v1, $v1, 2 -/* 96AE5C 80241C9C 30630FFF */ andi $v1, $v1, 0xfff -/* 96AE60 80241CA0 006A1825 */ or $v1, $v1, $t2 -/* 96AE64 80241CA4 00431025 */ or $v0, $v0, $v1 -/* 96AE68 80241CA8 ACA2004C */ sw $v0, 0x4c($a1) -/* 96AE6C 80241CAC 8FA200B8 */ lw $v0, 0xb8($sp) -/* 96AE70 80241CB0 24A30058 */ addiu $v1, $a1, 0x58 -/* 96AE74 80241CB4 AE030000 */ sw $v1, ($s0) -/* 96AE78 80241CB8 3C03F200 */ lui $v1, 0xf200 -/* 96AE7C 80241CBC ACA30060 */ sw $v1, 0x60($a1) -/* 96AE80 80241CC0 3C03F540 */ lui $v1, 0xf540 -/* 96AE84 80241CC4 ACAC005C */ sw $t4, 0x5c($a1) -/* 96AE88 80241CC8 00021043 */ sra $v0, $v0, 1 -/* 96AE8C 80241CCC 24420007 */ addiu $v0, $v0, 7 -/* 96AE90 80241CD0 000210C3 */ sra $v0, $v0, 3 -/* 96AE94 80241CD4 304201FF */ andi $v0, $v0, 0x1ff -/* 96AE98 80241CD8 00021240 */ sll $v0, $v0, 9 -/* 96AE9C 80241CDC 00431025 */ or $v0, $v0, $v1 -/* 96AEA0 80241CE0 ACA20058 */ sw $v0, 0x58($a1) -/* 96AEA4 80241CE4 8FA300B8 */ lw $v1, 0xb8($sp) -/* 96AEA8 80241CE8 24A20060 */ addiu $v0, $a1, 0x60 -/* 96AEAC 80241CEC AE020000 */ sw $v0, ($s0) -/* 96AEB0 80241CF0 8FA200BC */ lw $v0, 0xbc($sp) -/* 96AEB4 80241CF4 2463FFFF */ addiu $v1, $v1, -1 -/* 96AEB8 80241CF8 00031880 */ sll $v1, $v1, 2 -/* 96AEBC 80241CFC 30630FFF */ andi $v1, $v1, 0xfff -/* 96AEC0 80241D00 00031B00 */ sll $v1, $v1, 0xc -/* 96AEC4 80241D04 2442FFFF */ addiu $v0, $v0, -1 -/* 96AEC8 80241D08 00021080 */ sll $v0, $v0, 2 -/* 96AECC 80241D0C 30420FFF */ andi $v0, $v0, 0xfff -/* 96AED0 80241D10 00621825 */ or $v1, $v1, $v0 -/* 96AED4 80241D14 ACA30064 */ sw $v1, 0x64($a1) -/* 96AED8 80241D18 8FA200B8 */ lw $v0, 0xb8($sp) -/* 96AEDC 80241D1C 24A50068 */ addiu $a1, $a1, 0x68 -/* 96AEE0 80241D20 AE050000 */ sw $a1, ($s0) -/* 96AEE4 80241D24 8FAD0100 */ lw $t5, 0x100($sp) -/* 96AEE8 80241D28 00021FC2 */ srl $v1, $v0, 0x1f -/* 96AEEC 80241D2C 00431021 */ addu $v0, $v0, $v1 -/* 96AEF0 80241D30 00021043 */ sra $v0, $v0, 1 -/* 96AEF4 80241D34 8DA30020 */ lw $v1, 0x20($t5) -/* 96AEF8 80241D38 2442FFE2 */ addiu $v0, $v0, -0x1e -/* 96AEFC 80241D3C 00621823 */ subu $v1, $v1, $v0 -/* 96AF00 80241D40 44831000 */ mtc1 $v1, $f2 -/* 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, 0x8007 -/* 96AF20 80241D60 263141F0 */ addiu $s1, $s1, 0x41f0 -/* 96AF24 80241D64 3C12800A */ lui $s2, 0x800a -/* 96AF28 80241D68 2652A674 */ addiu $s2, $s2, -0x598c -/* 96AF2C 80241D6C 96250000 */ lhu $a1, ($s1) -/* 96AF30 80241D70 8E420000 */ lw $v0, ($s2) -/* 96AF34 80241D74 00052980 */ sll $a1, $a1, 6 -/* 96AF38 80241D78 00B32821 */ addu $a1, $a1, $s3 -/* 96AF3C 80241D7C 0C019D40 */ jal guMtxF2L -/* 96AF40 80241D80 00452821 */ addu $a1, $v0, $a1 -/* 96AF44 80241D84 3C06D838 */ lui $a2, 0xd838 -/* 96AF48 80241D88 8E040000 */ lw $a0, ($s0) -/* 96AF4C 80241D8C 34C60002 */ ori $a2, $a2, 2 -/* 96AF50 80241D90 0080282D */ daddu $a1, $a0, $zero -/* 96AF54 80241D94 24840008 */ addiu $a0, $a0, 8 -/* 96AF58 80241D98 AE040000 */ sw $a0, ($s0) -/* 96AF5C 80241D9C 96220000 */ lhu $v0, ($s1) -/* 96AF60 80241DA0 3C03DA38 */ lui $v1, 0xda38 -/* 96AF64 80241DA4 ACA30000 */ sw $v1, ($a1) -/* 96AF68 80241DA8 24430001 */ addiu $v1, $v0, 1 -/* 96AF6C 80241DAC 3042FFFF */ andi $v0, $v0, 0xffff -/* 96AF70 80241DB0 00021180 */ sll $v0, $v0, 6 -/* 96AF74 80241DB4 A6230000 */ sh $v1, ($s1) -/* 96AF78 80241DB8 8E430000 */ lw $v1, ($s2) -/* 96AF7C 80241DBC 00531021 */ addu $v0, $v0, $s3 -/* 96AF80 80241DC0 00621821 */ addu $v1, $v1, $v0 -/* 96AF84 80241DC4 3C028000 */ lui $v0, 0x8000 -/* 96AF88 80241DC8 00621821 */ addu $v1, $v1, $v0 -/* 96AF8C 80241DCC 24820008 */ addiu $v0, $a0, 8 -/* 96AF90 80241DD0 ACA30004 */ sw $v1, 4($a1) -/* 96AF94 80241DD4 AE020000 */ sw $v0, ($s0) -/* 96AF98 80241DD8 3C02DE00 */ lui $v0, 0xde00 -/* 96AF9C 80241DDC AC820000 */ sw $v0, ($a0) -/* 96AFA0 80241DE0 3C028024 */ lui $v0, 0x8024 -/* 96AFA4 80241DE4 24427A38 */ addiu $v0, $v0, 0x7a38 -/* 96AFA8 80241DE8 AC820004 */ sw $v0, 4($a0) -/* 96AFAC 80241DEC 24820010 */ addiu $v0, $a0, 0x10 -/* 96AFB0 80241DF0 AE020000 */ sw $v0, ($s0) -/* 96AFB4 80241DF4 24020040 */ addiu $v0, $zero, 0x40 -/* 96AFB8 80241DF8 AC860008 */ sw $a2, 8($a0) -/* 96AFBC 80241DFC AC82000C */ sw $v0, 0xc($a0) -/* 96AFC0 80241E00 3C06D838 */ lui $a2, 0xd838 -.L80241E04: -/* 96AFC4 80241E04 34C60002 */ ori $a2, $a2, 2 -/* 96AFC8 80241E08 3C04800A */ lui $a0, 0x800a -/* 96AFCC 80241E0C 2484A66C */ addiu $a0, $a0, -0x5994 -/* 96AFD0 80241E10 8C830000 */ lw $v1, ($a0) -/* 96AFD4 80241E14 24020001 */ addiu $v0, $zero, 1 -/* 96AFD8 80241E18 0060282D */ daddu $a1, $v1, $zero -/* 96AFDC 80241E1C 24630008 */ addiu $v1, $v1, 8 -/* 96AFE0 80241E20 AC830000 */ sw $v1, ($a0) -/* 96AFE4 80241E24 24030040 */ addiu $v1, $zero, 0x40 -/* 96AFE8 80241E28 ACA60000 */ sw $a2, ($a1) -/* 96AFEC 80241E2C 08090877 */ j .L802421DC -/* 96AFF0 80241E30 ACA30004 */ sw $v1, 4($a1) -.L80241E34: -/* 96AFF4 80241E34 14620048 */ bne $v1, $v0, .L80241F58 -/* 96AFF8 80241E38 24020003 */ addiu $v0, $zero, 3 -/* 96AFFC 80241E3C 3C03F240 */ lui $v1, 0xf240 -/* 96B000 80241E40 34630400 */ ori $v1, $v1, 0x400 -/* 96B004 80241E44 3C020047 */ lui $v0, 0x47 -/* 96B008 80241E48 3442C47C */ ori $v0, $v0, 0xc47c -/* 96B00C 80241E4C 27B00058 */ addiu $s0, $sp, 0x58 -/* 96B010 80241E50 0200202D */ daddu $a0, $s0, $zero -/* 96B014 80241E54 3C120001 */ lui $s2, 1 -/* 96B018 80241E58 36521630 */ ori $s2, $s2, 0x1630 -/* 96B01C 80241E5C AD020004 */ sw $v0, 4($t0) -/* 96B020 80241E60 3C028025 */ lui $v0, 0x8025 -/* 96B024 80241E64 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96B028 80241E68 AD030000 */ sw $v1, ($t0) -/* 96B02C 80241E6C 8C450004 */ lw $a1, 4($v0) -/* 96B030 80241E70 8C460008 */ lw $a2, 8($v0) -/* 96B034 80241E74 8C47000C */ lw $a3, 0xc($v0) -/* 96B038 80241E78 25020008 */ addiu $v0, $t0, 8 -/* 96B03C 80241E7C 0C019E40 */ jal guTranslateF -/* 96B040 80241E80 AFC20000 */ sw $v0, ($fp) -/* 96B044 80241E84 0200202D */ daddu $a0, $s0, $zero -/* 96B048 80241E88 8FA50104 */ lw $a1, 0x104($sp) -/* 96B04C 80241E8C 0C019D80 */ jal guMtxCatF -/* 96B050 80241E90 27A60018 */ addiu $a2, $sp, 0x18 -/* 96B054 80241E94 27A40018 */ addiu $a0, $sp, 0x18 -/* 96B058 80241E98 3C108007 */ lui $s0, 0x8007 -/* 96B05C 80241E9C 261041F0 */ addiu $s0, $s0, 0x41f0 -/* 96B060 80241EA0 3C11800A */ lui $s1, 0x800a -/* 96B064 80241EA4 2631A674 */ addiu $s1, $s1, -0x598c -/* 96B068 80241EA8 96050000 */ lhu $a1, ($s0) -/* 96B06C 80241EAC 8E220000 */ lw $v0, ($s1) -/* 96B070 80241EB0 00052980 */ sll $a1, $a1, 6 -/* 96B074 80241EB4 00B22821 */ addu $a1, $a1, $s2 -/* 96B078 80241EB8 0C019D40 */ jal guMtxF2L -/* 96B07C 80241EBC 00452821 */ addu $a1, $v0, $a1 -/* 96B080 80241EC0 3C07DA38 */ lui $a3, 0xda38 -/* 96B084 80241EC4 34E70002 */ ori $a3, $a3, 2 -/* 96B088 80241EC8 3C05F4AC */ lui $a1, 0xf4ac -/* 96B08C 80241ECC 34A5D480 */ ori $a1, $a1, 0xd480 -/* 96B090 80241ED0 8FC30000 */ lw $v1, ($fp) -/* 96B094 80241ED4 3C048025 */ lui $a0, 0x8025 -/* 96B098 80241ED8 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96B09C 80241EDC 96020000 */ lhu $v0, ($s0) -/* 96B0A0 80241EE0 0060302D */ daddu $a2, $v1, $zero -/* 96B0A4 80241EE4 24630008 */ addiu $v1, $v1, 8 -/* 96B0A8 80241EE8 AFC30000 */ sw $v1, ($fp) -/* 96B0AC 80241EEC 24430001 */ addiu $v1, $v0, 1 -/* 96B0B0 80241EF0 3042FFFF */ andi $v0, $v0, 0xffff -/* 96B0B4 80241EF4 00021180 */ sll $v0, $v0, 6 -/* 96B0B8 80241EF8 ACC70000 */ sw $a3, ($a2) -/* 96B0BC 80241EFC A6030000 */ sh $v1, ($s0) -/* 96B0C0 80241F00 8E230000 */ lw $v1, ($s1) -/* 96B0C4 80241F04 00521021 */ addu $v0, $v0, $s2 -/* 96B0C8 80241F08 00621821 */ addu $v1, $v1, $v0 -/* 96B0CC 80241F0C 3C028000 */ lui $v0, 0x8000 -/* 96B0D0 80241F10 00621821 */ addu $v1, $v1, $v0 -/* 96B0D4 80241F14 0C0B1EAF */ jal get_variable -/* 96B0D8 80241F18 ACC30004 */ sw $v1, 4($a2) -/* 96B0DC 80241F1C 0040202D */ daddu $a0, $v0, $zero -/* 96B0E0 80241F20 27A50098 */ addiu $a1, $sp, 0x98 -/* 96B0E4 80241F24 24060030 */ addiu $a2, $zero, 0x30 -/* 96B0E8 80241F28 0C04EBDC */ jal func_8013AF70 -/* 96B0EC 80241F2C 27A70018 */ addiu $a3, $sp, 0x18 -/* 96B0F0 80241F30 3C05D838 */ lui $a1, 0xd838 -/* 96B0F4 80241F34 8FC30000 */ lw $v1, ($fp) -/* 96B0F8 80241F38 34A50002 */ ori $a1, $a1, 2 -/* 96B0FC 80241F3C 0060202D */ daddu $a0, $v1, $zero -/* 96B100 80241F40 24630008 */ addiu $v1, $v1, 8 -/* 96B104 80241F44 AFC30000 */ sw $v1, ($fp) -/* 96B108 80241F48 24030040 */ addiu $v1, $zero, 0x40 -/* 96B10C 80241F4C AC850000 */ sw $a1, ($a0) -/* 96B110 80241F50 08090877 */ j .L802421DC -/* 96B114 80241F54 AC830004 */ sw $v1, 4($a0) -.L80241F58: -/* 96B118 80241F58 10620003 */ beq $v1, $v0, .L80241F68 -/* 96B11C 80241F5C 3C03F240 */ lui $v1, 0xf240 -.L80241F60: -/* 96B120 80241F60 08090877 */ j .L802421DC -/* 96B124 80241F64 24020001 */ addiu $v0, $zero, 1 -.L80241F68: -/* 96B128 80241F68 34630400 */ ori $v1, $v1, 0x400 -/* 96B12C 80241F6C 3C020047 */ lui $v0, 0x47 -/* 96B130 80241F70 3442C47C */ ori $v0, $v0, 0xc47c -/* 96B134 80241F74 27B30058 */ addiu $s3, $sp, 0x58 -/* 96B138 80241F78 0260202D */ daddu $a0, $s3, $zero -/* 96B13C 80241F7C 3C140001 */ lui $s4, 1 -/* 96B140 80241F80 36941630 */ ori $s4, $s4, 0x1630 -/* 96B144 80241F84 3C17DA38 */ lui $s7, 0xda38 -/* 96B148 80241F88 36F70002 */ ori $s7, $s7, 2 -/* 96B14C 80241F8C 3C0DD838 */ lui $t5, 0xd838 -/* 96B150 80241F90 35AD0002 */ ori $t5, $t5, 2 -/* 96B154 80241F94 3C108025 */ lui $s0, 0x8025 -/* 96B158 80241F98 2610F010 */ addiu $s0, $s0, -0xff0 -/* 96B15C 80241F9C AFAD00C0 */ sw $t5, 0xc0($sp) -/* 96B160 80241FA0 AD030000 */ sw $v1, ($t0) -/* 96B164 80241FA4 AD020004 */ sw $v0, 4($t0) -/* 96B168 80241FA8 8E050004 */ lw $a1, 4($s0) -/* 96B16C 80241FAC 8E060008 */ lw $a2, 8($s0) -/* 96B170 80241FB0 8E07000C */ lw $a3, 0xc($s0) -/* 96B174 80241FB4 25020008 */ addiu $v0, $t0, 8 -/* 96B178 80241FB8 0C019E40 */ jal guTranslateF -/* 96B17C 80241FBC AFC20000 */ sw $v0, ($fp) -/* 96B180 80241FC0 0260202D */ daddu $a0, $s3, $zero -/* 96B184 80241FC4 8FA50104 */ lw $a1, 0x104($sp) -/* 96B188 80241FC8 0C019D80 */ jal guMtxCatF -/* 96B18C 80241FCC 27A60018 */ addiu $a2, $sp, 0x18 -/* 96B190 80241FD0 27A40018 */ addiu $a0, $sp, 0x18 -/* 96B194 80241FD4 3C118007 */ lui $s1, 0x8007 -/* 96B198 80241FD8 263141F0 */ addiu $s1, $s1, 0x41f0 -/* 96B19C 80241FDC 3C12800A */ lui $s2, 0x800a -/* 96B1A0 80241FE0 2652A674 */ addiu $s2, $s2, -0x598c -/* 96B1A4 80241FE4 96250000 */ lhu $a1, ($s1) -/* 96B1A8 80241FE8 8E420000 */ lw $v0, ($s2) -/* 96B1AC 80241FEC 00052980 */ sll $a1, $a1, 6 -/* 96B1B0 80241FF0 00B42821 */ addu $a1, $a1, $s4 -/* 96B1B4 80241FF4 0C019D40 */ jal guMtxF2L -/* 96B1B8 80241FF8 00452821 */ addu $a1, $v0, $a1 -/* 96B1BC 80241FFC 3C05F4AC */ lui $a1, 0xf4ac -/* 96B1C0 80242000 34A5D481 */ ori $a1, $a1, 0xd481 -/* 96B1C4 80242004 3C158025 */ lui $s5, 0x8025 -/* 96B1C8 80242008 26B5EFCC */ addiu $s5, $s5, -0x1034 -/* 96B1CC 8024200C 3C0D8000 */ lui $t5, 0x8000 -/* 96B1D0 80242010 8FC30000 */ lw $v1, ($fp) -/* 96B1D4 80242014 8EA40000 */ lw $a0, ($s5) -/* 96B1D8 80242018 96220000 */ lhu $v0, ($s1) -/* 96B1DC 8024201C 0060302D */ daddu $a2, $v1, $zero -/* 96B1E0 80242020 24630008 */ addiu $v1, $v1, 8 -/* 96B1E4 80242024 AFC30000 */ sw $v1, ($fp) -/* 96B1E8 80242028 24430001 */ addiu $v1, $v0, 1 -/* 96B1EC 8024202C 3042FFFF */ andi $v0, $v0, 0xffff -/* 96B1F0 80242030 00021180 */ sll $v0, $v0, 6 -/* 96B1F4 80242034 ACD70000 */ sw $s7, ($a2) -/* 96B1F8 80242038 A6230000 */ sh $v1, ($s1) -/* 96B1FC 8024203C 8E430000 */ lw $v1, ($s2) -/* 96B200 80242040 00541021 */ addu $v0, $v0, $s4 -/* 96B204 80242044 00621821 */ addu $v1, $v1, $v0 -/* 96B208 80242048 006D1821 */ addu $v1, $v1, $t5 -/* 96B20C 8024204C 0C0B1EAF */ jal get_variable -/* 96B210 80242050 ACC30004 */ sw $v1, 4($a2) -/* 96B214 80242054 0040202D */ daddu $a0, $v0, $zero -/* 96B218 80242058 27B60098 */ addiu $s6, $sp, 0x98 -/* 96B21C 8024205C 02C0282D */ daddu $a1, $s6, $zero -/* 96B220 80242060 24060030 */ addiu $a2, $zero, 0x30 -/* 96B224 80242064 0C04EBDC */ jal func_8013AF70 -/* 96B228 80242068 27A70018 */ addiu $a3, $sp, 0x18 -/* 96B22C 8024206C 3C05F4AC */ lui $a1, 0xf4ac -/* 96B230 80242070 8EA40000 */ lw $a0, ($s5) -/* 96B234 80242074 0C0B1EAF */ jal get_variable -/* 96B238 80242078 34A5D482 */ ori $a1, $a1, 0xd482 -/* 96B23C 8024207C 0040202D */ daddu $a0, $v0, $zero -/* 96B240 80242080 02C0282D */ daddu $a1, $s6, $zero -/* 96B244 80242084 24060030 */ addiu $a2, $zero, 0x30 -/* 96B248 80242088 0C04EBDC */ jal func_8013AF70 -/* 96B24C 8024208C 27A70018 */ addiu $a3, $sp, 0x18 -/* 96B250 80242090 0260202D */ daddu $a0, $s3, $zero -/* 96B254 80242094 8FC20000 */ lw $v0, ($fp) -/* 96B258 80242098 8FAD00C0 */ lw $t5, 0xc0($sp) -/* 96B25C 8024209C 0040182D */ daddu $v1, $v0, $zero -/* 96B260 802420A0 AC6D0000 */ sw $t5, ($v1) -/* 96B264 802420A4 240D0040 */ addiu $t5, $zero, 0x40 -/* 96B268 802420A8 AC6D0004 */ sw $t5, 4($v1) -/* 96B26C 802420AC 8E050004 */ lw $a1, 4($s0) -/* 96B270 802420B0 8E060008 */ lw $a2, 8($s0) -/* 96B274 802420B4 8E07000C */ lw $a3, 0xc($s0) -/* 96B278 802420B8 24420008 */ addiu $v0, $v0, 8 -/* 96B27C 802420BC 0C019E40 */ jal guTranslateF -/* 96B280 802420C0 AFC20000 */ sw $v0, ($fp) -/* 96B284 802420C4 0260202D */ daddu $a0, $s3, $zero -/* 96B288 802420C8 8FA50104 */ lw $a1, 0x104($sp) -/* 96B28C 802420CC 0C019D80 */ jal guMtxCatF -/* 96B290 802420D0 27A60018 */ addiu $a2, $sp, 0x18 -/* 96B294 802420D4 27A40018 */ addiu $a0, $sp, 0x18 -/* 96B298 802420D8 96250000 */ lhu $a1, ($s1) -/* 96B29C 802420DC 8E420000 */ lw $v0, ($s2) -/* 96B2A0 802420E0 00052980 */ sll $a1, $a1, 6 -/* 96B2A4 802420E4 00B42821 */ addu $a1, $a1, $s4 -/* 96B2A8 802420E8 0C019D40 */ jal guMtxF2L -/* 96B2AC 802420EC 00452821 */ addu $a1, $v0, $a1 -/* 96B2B0 802420F0 27A400B0 */ addiu $a0, $sp, 0xb0 -/* 96B2B4 802420F4 3C0D8000 */ lui $t5, 0x8000 -/* 96B2B8 802420F8 8FC70000 */ lw $a3, ($fp) -/* 96B2BC 802420FC 96280000 */ lhu $t0, ($s1) -/* 96B2C0 80242100 00E0282D */ daddu $a1, $a3, $zero -/* 96B2C4 80242104 3102FFFF */ andi $v0, $t0, 0xffff -/* 96B2C8 80242108 00021180 */ sll $v0, $v0, 6 -/* 96B2CC 8024210C ACB70000 */ sw $s7, ($a1) -/* 96B2D0 80242110 8E430000 */ lw $v1, ($s2) -/* 96B2D4 80242114 00541021 */ addu $v0, $v0, $s4 -/* 96B2D8 80242118 00621821 */ addu $v1, $v1, $v0 -/* 96B2DC 8024211C 006D1821 */ addu $v1, $v1, $t5 -/* 96B2E0 80242120 ACA30004 */ sw $v1, 4($a1) -/* 96B2E4 80242124 8FAD0100 */ lw $t5, 0x100($sp) -/* 96B2E8 80242128 24E70008 */ addiu $a3, $a3, 8 -/* 96B2EC 8024212C 8DA50018 */ lw $a1, 0x18($t5) -/* 96B2F0 80242130 8DA6001C */ lw $a2, 0x1c($t5) -/* 96B2F4 80242134 25080001 */ addiu $t0, $t0, 1 -/* 96B2F8 80242138 AFC70000 */ sw $a3, ($fp) -/* 96B2FC 8024213C 0C0B7811 */ jal func_802DE044 -/* 96B300 80242140 A6280000 */ sh $t0, ($s1) -/* 96B304 80242144 3C05F4AC */ lui $a1, 0xf4ac -/* 96B308 80242148 34A5D483 */ ori $a1, $a1, 0xd483 -/* 96B30C 8024214C 8EA40000 */ lw $a0, ($s5) -/* 96B310 80242150 8FA600B0 */ lw $a2, 0xb0($sp) -/* 96B314 80242154 8FA700B4 */ lw $a3, 0xb4($sp) -/* 96B318 80242158 97A800BA */ lhu $t0, 0xba($sp) -/* 96B31C 8024215C 97A900BE */ lhu $t1, 0xbe($sp) -/* 96B320 80242160 8FA300B8 */ lw $v1, 0xb8($sp) -/* 96B324 80242164 240200FF */ addiu $v0, $zero, 0xff -/* 96B328 80242168 A3A200A8 */ sb $v0, 0xa8($sp) -/* 96B32C 8024216C 000317C2 */ srl $v0, $v1, 0x1f -/* 96B330 80242170 00621821 */ addu $v1, $v1, $v0 -/* 96B334 80242174 00031843 */ sra $v1, $v1, 1 -/* 96B338 80242178 8FA200BC */ lw $v0, 0xbc($sp) -/* 96B33C 8024217C 00031823 */ negu $v1, $v1 -/* 96B340 80242180 AFA60098 */ sw $a2, 0x98($sp) -/* 96B344 80242184 AFA7009C */ sw $a3, 0x9c($sp) -/* 96B348 80242188 A7A800A0 */ sh $t0, 0xa0($sp) -/* 96B34C 8024218C A7A900A2 */ sh $t1, 0xa2($sp) -/* 96B350 80242190 A7A300A4 */ sh $v1, 0xa4($sp) -/* 96B354 80242194 00021FC2 */ srl $v1, $v0, 0x1f -/* 96B358 80242198 00431021 */ addu $v0, $v0, $v1 -/* 96B35C 8024219C 00021043 */ sra $v0, $v0, 1 -/* 96B360 802421A0 0C0B1EAF */ jal get_variable -/* 96B364 802421A4 A7A200A6 */ sh $v0, 0xa6($sp) -/* 96B368 802421A8 0040202D */ daddu $a0, $v0, $zero -/* 96B36C 802421AC 02C0282D */ daddu $a1, $s6, $zero -/* 96B370 802421B0 24060010 */ addiu $a2, $zero, 0x10 -/* 96B374 802421B4 0C04EBDC */ jal func_8013AF70 -/* 96B378 802421B8 27A70018 */ addiu $a3, $sp, 0x18 -/* 96B37C 802421BC 8FC30000 */ lw $v1, ($fp) -/* 96B380 802421C0 0060202D */ daddu $a0, $v1, $zero -/* 96B384 802421C4 24630008 */ addiu $v1, $v1, 8 -/* 96B388 802421C8 AFC30000 */ sw $v1, ($fp) -/* 96B38C 802421CC 8FAD00C0 */ lw $t5, 0xc0($sp) -/* 96B390 802421D0 AC8D0000 */ sw $t5, ($a0) -/* 96B394 802421D4 240D0040 */ addiu $t5, $zero, 0x40 -/* 96B398 802421D8 AC8D0004 */ sw $t5, 4($a0) -.L802421DC: -/* 96B39C 802421DC 8FBF00EC */ lw $ra, 0xec($sp) -/* 96B3A0 802421E0 8FBE00E8 */ lw $fp, 0xe8($sp) -/* 96B3A4 802421E4 8FB700E4 */ lw $s7, 0xe4($sp) -/* 96B3A8 802421E8 8FB600E0 */ lw $s6, 0xe0($sp) -/* 96B3AC 802421EC 8FB500DC */ lw $s5, 0xdc($sp) -/* 96B3B0 802421F0 8FB400D8 */ lw $s4, 0xd8($sp) -/* 96B3B4 802421F4 8FB300D4 */ lw $s3, 0xd4($sp) -/* 96B3B8 802421F8 8FB200D0 */ lw $s2, 0xd0($sp) -/* 96B3BC 802421FC 8FB100CC */ lw $s1, 0xcc($sp) -/* 96B3C0 80242200 8FB000C8 */ lw $s0, 0xc8($sp) -/* 96B3C4 80242204 D7B600F8 */ ldc1 $f22, 0xf8($sp) -/* 96B3C8 80242208 D7B400F0 */ ldc1 $f20, 0xf0($sp) -/* 96B3CC 8024220C 03E00008 */ jr $ra -/* 96B3D0 80242210 27BD0100 */ addiu $sp, $sp, 0x100 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 new file mode 100644 index 0000000000..73a197ef4c --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024190C_96AACC.s @@ -0,0 +1,592 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024190C_96AACC +/* 96AACC 8024190C 27BDFF00 */ addiu $sp, $sp, -0x100 +/* 96AAD0 80241910 AFBF00EC */ sw $ra, 0xec($sp) +/* 96AAD4 80241914 AFBE00E8 */ sw $fp, 0xe8($sp) +/* 96AAD8 80241918 AFB700E4 */ sw $s7, 0xe4($sp) +/* 96AADC 8024191C AFB600E0 */ sw $s6, 0xe0($sp) +/* 96AAE0 80241920 AFB500DC */ sw $s5, 0xdc($sp) +/* 96AAE4 80241924 AFB400D8 */ sw $s4, 0xd8($sp) +/* 96AAE8 80241928 AFB300D4 */ sw $s3, 0xd4($sp) +/* 96AAEC 8024192C AFB200D0 */ sw $s2, 0xd0($sp) +/* 96AAF0 80241930 AFB100CC */ sw $s1, 0xcc($sp) +/* 96AAF4 80241934 AFB000C8 */ sw $s0, 0xc8($sp) +/* 96AAF8 80241938 F7B600F8 */ sdc1 $f22, 0xf8($sp) +/* 96AAFC 8024193C F7B400F0 */ sdc1 $f20, 0xf0($sp) +/* 96AB00 80241940 AFA40100 */ sw $a0, 0x100($sp) +/* 96AB04 80241944 AFA50104 */ sw $a1, 0x104($sp) +/* 96AB08 80241948 8C820000 */ lw $v0, ($a0) +/* 96AB0C 8024194C 10400184 */ beqz $v0, .L80241F60 +/* 96AB10 80241950 3C02DE00 */ lui $v0, 0xde00 +/* 96AB14 80241954 3C1E800A */ lui $fp, 0x800a +/* 96AB18 80241958 27DEA66C */ addiu $fp, $fp, -0x5994 +/* 96AB1C 8024195C 8FC80000 */ lw $t0, ($fp) +/* 96AB20 80241960 0100182D */ daddu $v1, $t0, $zero +/* 96AB24 80241964 25080008 */ addiu $t0, $t0, 8 +/* 96AB28 80241968 AFC80000 */ sw $t0, ($fp) +/* 96AB2C 8024196C AC620000 */ sw $v0, ($v1) +/* 96AB30 80241970 3C028024 */ lui $v0, 0x8024 +/* 96AB34 80241974 244278C8 */ addiu $v0, $v0, 0x78c8 +/* 96AB38 80241978 AC620004 */ sw $v0, 4($v1) +/* 96AB3C 8024197C 8FAD0100 */ lw $t5, 0x100($sp) +/* 96AB40 80241980 8DA30000 */ lw $v1, ($t5) +/* 96AB44 80241984 24020001 */ addiu $v0, $zero, 1 +/* 96AB48 80241988 10620006 */ beq $v1, $v0, .L802419A4 +/* 96AB4C 8024198C 24020004 */ addiu $v0, $zero, 4 +/* 96AB50 80241990 10620004 */ beq $v1, $v0, .L802419A4 +/* 96AB54 80241994 24020005 */ addiu $v0, $zero, 5 +/* 96AB58 80241998 14620126 */ bne $v1, $v0, .L80241E34 +/* 96AB5C 8024199C 24020002 */ addiu $v0, $zero, 2 +/* 96AB60 802419A0 8FAD0100 */ lw $t5, 0x100($sp) +.L802419A4: +/* 96AB64 802419A4 27B00058 */ addiu $s0, $sp, 0x58 +/* 96AB68 802419A8 8DA50004 */ lw $a1, 4($t5) +/* 96AB6C 802419AC 8DA60008 */ lw $a2, 8($t5) +/* 96AB70 802419B0 8DA7000C */ lw $a3, 0xc($t5) +/* 96AB74 802419B4 0C019E40 */ jal guTranslateF +/* 96AB78 802419B8 0200202D */ daddu $a0, $s0, $zero +/* 96AB7C 802419BC 0200202D */ daddu $a0, $s0, $zero +/* 96AB80 802419C0 8FA50104 */ lw $a1, 0x104($sp) +/* 96AB84 802419C4 4480A000 */ mtc1 $zero, $f20 +/* 96AB88 802419C8 0C019D80 */ jal guMtxCatF +/* 96AB8C 802419CC 27A60018 */ addiu $a2, $sp, 0x18 +/* 96AB90 802419D0 8FAD0100 */ lw $t5, 0x100($sp) +/* 96AB94 802419D4 3C013F80 */ lui $at, 0x3f80 +/* 96AB98 802419D8 4481B000 */ mtc1 $at, $f22 +/* 96AB9C 802419DC 4406A000 */ mfc1 $a2, $f20 +/* 96ABA0 802419E0 3C120001 */ lui $s2, 1 +/* 96ABA4 802419E4 E7B40010 */ swc1 $f20, 0x10($sp) +/* 96ABA8 802419E8 8DA50010 */ lw $a1, 0x10($t5) +/* 96ABAC 802419EC 4407B000 */ mfc1 $a3, $f22 +/* 96ABB0 802419F0 0C019EC8 */ jal guRotateF +/* 96ABB4 802419F4 0200202D */ daddu $a0, $s0, $zero +/* 96ABB8 802419F8 0200202D */ daddu $a0, $s0, $zero +/* 96ABBC 802419FC 27A50018 */ addiu $a1, $sp, 0x18 +/* 96ABC0 80241A00 0C019D80 */ jal guMtxCatF +/* 96ABC4 80241A04 00A0302D */ daddu $a2, $a1, $zero +/* 96ABC8 80241A08 8FAD0100 */ lw $t5, 0x100($sp) +/* 96ABCC 80241A0C 4406B000 */ mfc1 $a2, $f22 +/* 96ABD0 80241A10 4407A000 */ mfc1 $a3, $f20 +/* 96ABD4 80241A14 36521630 */ ori $s2, $s2, 0x1630 +/* 96ABD8 80241A18 E7B40010 */ swc1 $f20, 0x10($sp) +/* 96ABDC 80241A1C 8DA50014 */ lw $a1, 0x14($t5) +/* 96ABE0 80241A20 0C019EC8 */ jal guRotateF +/* 96ABE4 80241A24 0200202D */ daddu $a0, $s0, $zero +/* 96ABE8 80241A28 0200202D */ daddu $a0, $s0, $zero +/* 96ABEC 80241A2C 27A50018 */ addiu $a1, $sp, 0x18 +/* 96ABF0 80241A30 0C019D80 */ jal guMtxCatF +/* 96ABF4 80241A34 00A0302D */ daddu $a2, $a1, $zero +/* 96ABF8 80241A38 27A40018 */ addiu $a0, $sp, 0x18 +/* 96ABFC 80241A3C 3C108007 */ lui $s0, 0x8007 +/* 96AC00 80241A40 261041F0 */ addiu $s0, $s0, 0x41f0 +/* 96AC04 80241A44 3C11800A */ lui $s1, 0x800a +/* 96AC08 80241A48 2631A674 */ addiu $s1, $s1, -0x598c +/* 96AC0C 80241A4C 96050000 */ lhu $a1, ($s0) +/* 96AC10 80241A50 8E220000 */ lw $v0, ($s1) +/* 96AC14 80241A54 00052980 */ sll $a1, $a1, 6 +/* 96AC18 80241A58 00B22821 */ addu $a1, $a1, $s2 +/* 96AC1C 80241A5C 0C019D40 */ jal guMtxF2L +/* 96AC20 80241A60 00452821 */ addu $a1, $v0, $a1 +/* 96AC24 80241A64 3C03DA38 */ lui $v1, 0xda38 +/* 96AC28 80241A68 3C06800A */ lui $a2, 0x800a +/* 96AC2C 80241A6C 24C6A66C */ addiu $a2, $a2, -0x5994 +/* 96AC30 80241A70 34630002 */ ori $v1, $v1, 2 +/* 96AC34 80241A74 8CC50000 */ lw $a1, ($a2) +/* 96AC38 80241A78 96020000 */ lhu $v0, ($s0) +/* 96AC3C 80241A7C 00A0202D */ daddu $a0, $a1, $zero +/* 96AC40 80241A80 24A50008 */ addiu $a1, $a1, 8 +/* 96AC44 80241A84 ACC50000 */ sw $a1, ($a2) +/* 96AC48 80241A88 AC830000 */ sw $v1, ($a0) +/* 96AC4C 80241A8C 24430001 */ addiu $v1, $v0, 1 +/* 96AC50 80241A90 3042FFFF */ andi $v0, $v0, 0xffff +/* 96AC54 80241A94 00021180 */ sll $v0, $v0, 6 +/* 96AC58 80241A98 A6030000 */ sh $v1, ($s0) +/* 96AC5C 80241A9C 8E230000 */ lw $v1, ($s1) +/* 96AC60 80241AA0 00521021 */ addu $v0, $v0, $s2 +/* 96AC64 80241AA4 00621821 */ addu $v1, $v1, $v0 +/* 96AC68 80241AA8 3C028000 */ lui $v0, 0x8000 +/* 96AC6C 80241AAC 00621821 */ addu $v1, $v1, $v0 +/* 96AC70 80241AB0 AC830004 */ sw $v1, 4($a0) +/* 96AC74 80241AB4 8FAD0100 */ lw $t5, 0x100($sp) +/* 96AC78 80241AB8 8DA30000 */ lw $v1, ($t5) +/* 96AC7C 80241ABC 24020001 */ addiu $v0, $zero, 1 +/* 96AC80 80241AC0 10620003 */ beq $v1, $v0, .L80241AD0 +/* 96AC84 80241AC4 24020004 */ addiu $v0, $zero, 4 +/* 96AC88 80241AC8 1462000B */ bne $v1, $v0, .L80241AF8 +/* 96AC8C 80241ACC 24020001 */ addiu $v0, $zero, 1 +.L80241AD0: +/* 96AC90 80241AD0 24A20008 */ addiu $v0, $a1, 8 +/* 96AC94 80241AD4 ACC20000 */ sw $v0, ($a2) +/* 96AC98 80241AD8 3C02DE00 */ lui $v0, 0xde00 +/* 96AC9C 80241ADC ACA20000 */ sw $v0, ($a1) +/* 96ACA0 80241AE0 3C028024 */ lui $v0, 0x8024 +/* 96ACA4 80241AE4 244279B8 */ addiu $v0, $v0, 0x79b8 +/* 96ACA8 80241AE8 ACA20004 */ sw $v0, 4($a1) +/* 96ACAC 80241AEC 8FAD0100 */ lw $t5, 0x100($sp) +/* 96ACB0 80241AF0 8DA30000 */ lw $v1, ($t5) +/* 96ACB4 80241AF4 24020001 */ addiu $v0, $zero, 1 +.L80241AF8: +/* 96ACB8 80241AF8 10620003 */ beq $v1, $v0, .L80241B08 +/* 96ACBC 80241AFC 24020005 */ addiu $v0, $zero, 5 +/* 96ACC0 80241B00 146200C0 */ bne $v1, $v0, .L80241E04 +/* 96ACC4 80241B04 3C06D838 */ lui $a2, 0xd838 +.L80241B08: +/* 96ACC8 80241B08 27A400B0 */ addiu $a0, $sp, 0xb0 +/* 96ACCC 80241B0C 8FAD0100 */ lw $t5, 0x100($sp) +/* 96ACD0 80241B10 3C130001 */ lui $s3, 1 +/* 96ACD4 80241B14 8DA50018 */ lw $a1, 0x18($t5) +/* 96ACD8 80241B18 8DA6001C */ lw $a2, 0x1c($t5) +/* 96ACDC 80241B1C 0C0B7811 */ jal func_802DE044 +/* 96ACE0 80241B20 36731630 */ ori $s3, $s3, 0x1630 +/* 96ACE4 80241B24 3C02E300 */ lui $v0, 0xe300 +/* 96ACE8 80241B28 34421001 */ ori $v0, $v0, 0x1001 +/* 96ACEC 80241B2C 3C08F500 */ lui $t0, 0xf500 +/* 96ACF0 80241B30 35080100 */ ori $t0, $t0, 0x100 +/* 96ACF4 80241B34 3C090703 */ lui $t1, 0x703 +/* 96ACF8 80241B38 3529C000 */ ori $t1, $t1, 0xc000 +/* 96ACFC 80241B3C 3C0B070A */ lui $t3, 0x70a +/* 96AD00 80241B40 356B0280 */ ori $t3, $t3, 0x280 +/* 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, 0x800a +/* 96AD14 80241B54 2610A66C */ addiu $s0, $s0, -0x5994 +/* 96AD18 80241B58 3C0A0700 */ lui $t2, 0x700 +/* 96AD1C 80241B5C 8E050000 */ lw $a1, ($s0) +/* 96AD20 80241B60 44800000 */ mtc1 $zero, $f0 +/* 96AD24 80241B64 00A0182D */ daddu $v1, $a1, $zero +/* 96AD28 80241B68 44060000 */ mfc1 $a2, $f0 +/* 96AD2C 80241B6C 24A50008 */ addiu $a1, $a1, 8 +/* 96AD30 80241B70 AE050000 */ sw $a1, ($s0) +/* 96AD34 80241B74 AC620000 */ sw $v0, ($v1) +/* 96AD38 80241B78 34028000 */ ori $v0, $zero, 0x8000 +/* 96AD3C 80241B7C AC620004 */ sw $v0, 4($v1) +/* 96AD40 80241B80 24A20008 */ addiu $v0, $a1, 8 +/* 96AD44 80241B84 AE020000 */ sw $v0, ($s0) +/* 96AD48 80241B88 3C02FD10 */ lui $v0, 0xfd10 +/* 96AD4C 80241B8C ACA20000 */ sw $v0, ($a1) +/* 96AD50 80241B90 24A20010 */ addiu $v0, $a1, 0x10 +/* 96AD54 80241B94 AE020000 */ sw $v0, ($s0) +/* 96AD58 80241B98 8FA300B4 */ lw $v1, 0xb4($sp) +/* 96AD5C 80241B9C 3C02E800 */ lui $v0, 0xe800 +/* 96AD60 80241BA0 ACA20008 */ sw $v0, 8($a1) +/* 96AD64 80241BA4 24A20018 */ addiu $v0, $a1, 0x18 +/* 96AD68 80241BA8 ACA0000C */ sw $zero, 0xc($a1) +/* 96AD6C 80241BAC AE020000 */ sw $v0, ($s0) +/* 96AD70 80241BB0 24A20020 */ addiu $v0, $a1, 0x20 +/* 96AD74 80241BB4 ACA80010 */ sw $t0, 0x10($a1) +/* 96AD78 80241BB8 3C08E600 */ lui $t0, 0xe600 +/* 96AD7C 80241BBC ACAA0014 */ sw $t2, 0x14($a1) +/* 96AD80 80241BC0 AE020000 */ sw $v0, ($s0) +/* 96AD84 80241BC4 24A20028 */ addiu $v0, $a1, 0x28 +/* 96AD88 80241BC8 ACA80018 */ sw $t0, 0x18($a1) +/* 96AD8C 80241BCC ACA0001C */ sw $zero, 0x1c($a1) +/* 96AD90 80241BD0 AE020000 */ sw $v0, ($s0) +/* 96AD94 80241BD4 3C02F000 */ lui $v0, 0xf000 +/* 96AD98 80241BD8 ACA20020 */ sw $v0, 0x20($a1) +/* 96AD9C 80241BDC 24A20030 */ addiu $v0, $a1, 0x30 +/* 96ADA0 80241BE0 ACA90024 */ sw $t1, 0x24($a1) +/* 96ADA4 80241BE4 3C09E700 */ lui $t1, 0xe700 +/* 96ADA8 80241BE8 AE020000 */ sw $v0, ($s0) +/* 96ADAC 80241BEC ACA90028 */ sw $t1, 0x28($a1) +/* 96ADB0 80241BF0 ACA0002C */ sw $zero, 0x2c($a1) +/* 96ADB4 80241BF4 ACA30004 */ sw $v1, 4($a1) +/* 96ADB8 80241BF8 8FA200B8 */ lw $v0, 0xb8($sp) +/* 96ADBC 80241BFC 24A30038 */ addiu $v1, $a1, 0x38 +/* 96ADC0 80241C00 AE030000 */ sw $v1, ($s0) +/* 96ADC4 80241C04 3C03FD48 */ lui $v1, 0xfd48 +/* 96ADC8 80241C08 00021043 */ sra $v0, $v0, 1 +/* 96ADCC 80241C0C 2442FFFF */ addiu $v0, $v0, -1 +/* 96ADD0 80241C10 30420FFF */ andi $v0, $v0, 0xfff +/* 96ADD4 80241C14 00431025 */ or $v0, $v0, $v1 +/* 96ADD8 80241C18 ACA20030 */ sw $v0, 0x30($a1) +/* 96ADDC 80241C1C 8FA300B0 */ lw $v1, 0xb0($sp) +/* 96ADE0 80241C20 24A20040 */ addiu $v0, $a1, 0x40 +/* 96ADE4 80241C24 AE020000 */ sw $v0, ($s0) +/* 96ADE8 80241C28 ACA30034 */ sw $v1, 0x34($a1) +/* 96ADEC 80241C2C 8FA200B8 */ lw $v0, 0xb8($sp) +/* 96ADF0 80241C30 24A30048 */ addiu $v1, $a1, 0x48 +/* 96ADF4 80241C34 AE030000 */ sw $v1, ($s0) +/* 96ADF8 80241C38 3C03F548 */ lui $v1, 0xf548 +/* 96ADFC 80241C3C ACAB003C */ sw $t3, 0x3c($a1) +/* 96AE00 80241C40 00021043 */ sra $v0, $v0, 1 +/* 96AE04 80241C44 24420007 */ addiu $v0, $v0, 7 +/* 96AE08 80241C48 000210C3 */ sra $v0, $v0, 3 +/* 96AE0C 80241C4C 304201FF */ andi $v0, $v0, 0x1ff +/* 96AE10 80241C50 00021240 */ sll $v0, $v0, 9 +/* 96AE14 80241C54 00431025 */ or $v0, $v0, $v1 +/* 96AE18 80241C58 ACA20038 */ sw $v0, 0x38($a1) +/* 96AE1C 80241C5C 3C02F400 */ lui $v0, 0xf400 +/* 96AE20 80241C60 ACA80040 */ sw $t0, 0x40($a1) +/* 96AE24 80241C64 ACA00044 */ sw $zero, 0x44($a1) +/* 96AE28 80241C68 ACA20048 */ sw $v0, 0x48($a1) +/* 96AE2C 80241C6C 8FA200B8 */ lw $v0, 0xb8($sp) +/* 96AE30 80241C70 8FA300BC */ lw $v1, 0xbc($sp) +/* 96AE34 80241C74 24A80050 */ addiu $t0, $a1, 0x50 +/* 96AE38 80241C78 AE080000 */ sw $t0, ($s0) +/* 96AE3C 80241C7C ACA90050 */ sw $t1, 0x50($a1) +/* 96AE40 80241C80 ACA00054 */ sw $zero, 0x54($a1) +/* 96AE44 80241C84 2442FFFF */ addiu $v0, $v0, -1 +/* 96AE48 80241C88 00021040 */ sll $v0, $v0, 1 +/* 96AE4C 80241C8C 30420FFF */ andi $v0, $v0, 0xfff +/* 96AE50 80241C90 00021300 */ sll $v0, $v0, 0xc +/* 96AE54 80241C94 2463FFFF */ addiu $v1, $v1, -1 +/* 96AE58 80241C98 00031880 */ sll $v1, $v1, 2 +/* 96AE5C 80241C9C 30630FFF */ andi $v1, $v1, 0xfff +/* 96AE60 80241CA0 006A1825 */ or $v1, $v1, $t2 +/* 96AE64 80241CA4 00431025 */ or $v0, $v0, $v1 +/* 96AE68 80241CA8 ACA2004C */ sw $v0, 0x4c($a1) +/* 96AE6C 80241CAC 8FA200B8 */ lw $v0, 0xb8($sp) +/* 96AE70 80241CB0 24A30058 */ addiu $v1, $a1, 0x58 +/* 96AE74 80241CB4 AE030000 */ sw $v1, ($s0) +/* 96AE78 80241CB8 3C03F200 */ lui $v1, 0xf200 +/* 96AE7C 80241CBC ACA30060 */ sw $v1, 0x60($a1) +/* 96AE80 80241CC0 3C03F540 */ lui $v1, 0xf540 +/* 96AE84 80241CC4 ACAC005C */ sw $t4, 0x5c($a1) +/* 96AE88 80241CC8 00021043 */ sra $v0, $v0, 1 +/* 96AE8C 80241CCC 24420007 */ addiu $v0, $v0, 7 +/* 96AE90 80241CD0 000210C3 */ sra $v0, $v0, 3 +/* 96AE94 80241CD4 304201FF */ andi $v0, $v0, 0x1ff +/* 96AE98 80241CD8 00021240 */ sll $v0, $v0, 9 +/* 96AE9C 80241CDC 00431025 */ or $v0, $v0, $v1 +/* 96AEA0 80241CE0 ACA20058 */ sw $v0, 0x58($a1) +/* 96AEA4 80241CE4 8FA300B8 */ lw $v1, 0xb8($sp) +/* 96AEA8 80241CE8 24A20060 */ addiu $v0, $a1, 0x60 +/* 96AEAC 80241CEC AE020000 */ sw $v0, ($s0) +/* 96AEB0 80241CF0 8FA200BC */ lw $v0, 0xbc($sp) +/* 96AEB4 80241CF4 2463FFFF */ addiu $v1, $v1, -1 +/* 96AEB8 80241CF8 00031880 */ sll $v1, $v1, 2 +/* 96AEBC 80241CFC 30630FFF */ andi $v1, $v1, 0xfff +/* 96AEC0 80241D00 00031B00 */ sll $v1, $v1, 0xc +/* 96AEC4 80241D04 2442FFFF */ addiu $v0, $v0, -1 +/* 96AEC8 80241D08 00021080 */ sll $v0, $v0, 2 +/* 96AECC 80241D0C 30420FFF */ andi $v0, $v0, 0xfff +/* 96AED0 80241D10 00621825 */ or $v1, $v1, $v0 +/* 96AED4 80241D14 ACA30064 */ sw $v1, 0x64($a1) +/* 96AED8 80241D18 8FA200B8 */ lw $v0, 0xb8($sp) +/* 96AEDC 80241D1C 24A50068 */ addiu $a1, $a1, 0x68 +/* 96AEE0 80241D20 AE050000 */ sw $a1, ($s0) +/* 96AEE4 80241D24 8FAD0100 */ lw $t5, 0x100($sp) +/* 96AEE8 80241D28 00021FC2 */ srl $v1, $v0, 0x1f +/* 96AEEC 80241D2C 00431021 */ addu $v0, $v0, $v1 +/* 96AEF0 80241D30 00021043 */ sra $v0, $v0, 1 +/* 96AEF4 80241D34 8DA30020 */ lw $v1, 0x20($t5) +/* 96AEF8 80241D38 2442FFE2 */ addiu $v0, $v0, -0x1e +/* 96AEFC 80241D3C 00621823 */ subu $v1, $v1, $v0 +/* 96AF00 80241D40 44831000 */ mtc1 $v1, $f2 +/* 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, 0x8007 +/* 96AF20 80241D60 263141F0 */ addiu $s1, $s1, 0x41f0 +/* 96AF24 80241D64 3C12800A */ lui $s2, 0x800a +/* 96AF28 80241D68 2652A674 */ addiu $s2, $s2, -0x598c +/* 96AF2C 80241D6C 96250000 */ lhu $a1, ($s1) +/* 96AF30 80241D70 8E420000 */ lw $v0, ($s2) +/* 96AF34 80241D74 00052980 */ sll $a1, $a1, 6 +/* 96AF38 80241D78 00B32821 */ addu $a1, $a1, $s3 +/* 96AF3C 80241D7C 0C019D40 */ jal guMtxF2L +/* 96AF40 80241D80 00452821 */ addu $a1, $v0, $a1 +/* 96AF44 80241D84 3C06D838 */ lui $a2, 0xd838 +/* 96AF48 80241D88 8E040000 */ lw $a0, ($s0) +/* 96AF4C 80241D8C 34C60002 */ ori $a2, $a2, 2 +/* 96AF50 80241D90 0080282D */ daddu $a1, $a0, $zero +/* 96AF54 80241D94 24840008 */ addiu $a0, $a0, 8 +/* 96AF58 80241D98 AE040000 */ sw $a0, ($s0) +/* 96AF5C 80241D9C 96220000 */ lhu $v0, ($s1) +/* 96AF60 80241DA0 3C03DA38 */ lui $v1, 0xda38 +/* 96AF64 80241DA4 ACA30000 */ sw $v1, ($a1) +/* 96AF68 80241DA8 24430001 */ addiu $v1, $v0, 1 +/* 96AF6C 80241DAC 3042FFFF */ andi $v0, $v0, 0xffff +/* 96AF70 80241DB0 00021180 */ sll $v0, $v0, 6 +/* 96AF74 80241DB4 A6230000 */ sh $v1, ($s1) +/* 96AF78 80241DB8 8E430000 */ lw $v1, ($s2) +/* 96AF7C 80241DBC 00531021 */ addu $v0, $v0, $s3 +/* 96AF80 80241DC0 00621821 */ addu $v1, $v1, $v0 +/* 96AF84 80241DC4 3C028000 */ lui $v0, 0x8000 +/* 96AF88 80241DC8 00621821 */ addu $v1, $v1, $v0 +/* 96AF8C 80241DCC 24820008 */ addiu $v0, $a0, 8 +/* 96AF90 80241DD0 ACA30004 */ sw $v1, 4($a1) +/* 96AF94 80241DD4 AE020000 */ sw $v0, ($s0) +/* 96AF98 80241DD8 3C02DE00 */ lui $v0, 0xde00 +/* 96AF9C 80241DDC AC820000 */ sw $v0, ($a0) +/* 96AFA0 80241DE0 3C028024 */ lui $v0, 0x8024 +/* 96AFA4 80241DE4 24427A38 */ addiu $v0, $v0, 0x7a38 +/* 96AFA8 80241DE8 AC820004 */ sw $v0, 4($a0) +/* 96AFAC 80241DEC 24820010 */ addiu $v0, $a0, 0x10 +/* 96AFB0 80241DF0 AE020000 */ sw $v0, ($s0) +/* 96AFB4 80241DF4 24020040 */ addiu $v0, $zero, 0x40 +/* 96AFB8 80241DF8 AC860008 */ sw $a2, 8($a0) +/* 96AFBC 80241DFC AC82000C */ sw $v0, 0xc($a0) +/* 96AFC0 80241E00 3C06D838 */ lui $a2, 0xd838 +.L80241E04: +/* 96AFC4 80241E04 34C60002 */ ori $a2, $a2, 2 +/* 96AFC8 80241E08 3C04800A */ lui $a0, 0x800a +/* 96AFCC 80241E0C 2484A66C */ addiu $a0, $a0, -0x5994 +/* 96AFD0 80241E10 8C830000 */ lw $v1, ($a0) +/* 96AFD4 80241E14 24020001 */ addiu $v0, $zero, 1 +/* 96AFD8 80241E18 0060282D */ daddu $a1, $v1, $zero +/* 96AFDC 80241E1C 24630008 */ addiu $v1, $v1, 8 +/* 96AFE0 80241E20 AC830000 */ sw $v1, ($a0) +/* 96AFE4 80241E24 24030040 */ addiu $v1, $zero, 0x40 +/* 96AFE8 80241E28 ACA60000 */ sw $a2, ($a1) +/* 96AFEC 80241E2C 08090877 */ j .L802421DC +/* 96AFF0 80241E30 ACA30004 */ sw $v1, 4($a1) +.L80241E34: +/* 96AFF4 80241E34 14620048 */ bne $v1, $v0, .L80241F58 +/* 96AFF8 80241E38 24020003 */ addiu $v0, $zero, 3 +/* 96AFFC 80241E3C 3C03F240 */ lui $v1, 0xf240 +/* 96B000 80241E40 34630400 */ ori $v1, $v1, 0x400 +/* 96B004 80241E44 3C020047 */ lui $v0, 0x47 +/* 96B008 80241E48 3442C47C */ ori $v0, $v0, 0xc47c +/* 96B00C 80241E4C 27B00058 */ addiu $s0, $sp, 0x58 +/* 96B010 80241E50 0200202D */ daddu $a0, $s0, $zero +/* 96B014 80241E54 3C120001 */ lui $s2, 1 +/* 96B018 80241E58 36521630 */ ori $s2, $s2, 0x1630 +/* 96B01C 80241E5C AD020004 */ sw $v0, 4($t0) +/* 96B020 80241E60 3C028025 */ lui $v0, 0x8025 +/* 96B024 80241E64 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96B028 80241E68 AD030000 */ sw $v1, ($t0) +/* 96B02C 80241E6C 8C450004 */ lw $a1, 4($v0) +/* 96B030 80241E70 8C460008 */ lw $a2, 8($v0) +/* 96B034 80241E74 8C47000C */ lw $a3, 0xc($v0) +/* 96B038 80241E78 25020008 */ addiu $v0, $t0, 8 +/* 96B03C 80241E7C 0C019E40 */ jal guTranslateF +/* 96B040 80241E80 AFC20000 */ sw $v0, ($fp) +/* 96B044 80241E84 0200202D */ daddu $a0, $s0, $zero +/* 96B048 80241E88 8FA50104 */ lw $a1, 0x104($sp) +/* 96B04C 80241E8C 0C019D80 */ jal guMtxCatF +/* 96B050 80241E90 27A60018 */ addiu $a2, $sp, 0x18 +/* 96B054 80241E94 27A40018 */ addiu $a0, $sp, 0x18 +/* 96B058 80241E98 3C108007 */ lui $s0, 0x8007 +/* 96B05C 80241E9C 261041F0 */ addiu $s0, $s0, 0x41f0 +/* 96B060 80241EA0 3C11800A */ lui $s1, 0x800a +/* 96B064 80241EA4 2631A674 */ addiu $s1, $s1, -0x598c +/* 96B068 80241EA8 96050000 */ lhu $a1, ($s0) +/* 96B06C 80241EAC 8E220000 */ lw $v0, ($s1) +/* 96B070 80241EB0 00052980 */ sll $a1, $a1, 6 +/* 96B074 80241EB4 00B22821 */ addu $a1, $a1, $s2 +/* 96B078 80241EB8 0C019D40 */ jal guMtxF2L +/* 96B07C 80241EBC 00452821 */ addu $a1, $v0, $a1 +/* 96B080 80241EC0 3C07DA38 */ lui $a3, 0xda38 +/* 96B084 80241EC4 34E70002 */ ori $a3, $a3, 2 +/* 96B088 80241EC8 3C05F4AC */ lui $a1, 0xf4ac +/* 96B08C 80241ECC 34A5D480 */ ori $a1, $a1, 0xd480 +/* 96B090 80241ED0 8FC30000 */ lw $v1, ($fp) +/* 96B094 80241ED4 3C048025 */ lui $a0, 0x8025 +/* 96B098 80241ED8 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96B09C 80241EDC 96020000 */ lhu $v0, ($s0) +/* 96B0A0 80241EE0 0060302D */ daddu $a2, $v1, $zero +/* 96B0A4 80241EE4 24630008 */ addiu $v1, $v1, 8 +/* 96B0A8 80241EE8 AFC30000 */ sw $v1, ($fp) +/* 96B0AC 80241EEC 24430001 */ addiu $v1, $v0, 1 +/* 96B0B0 80241EF0 3042FFFF */ andi $v0, $v0, 0xffff +/* 96B0B4 80241EF4 00021180 */ sll $v0, $v0, 6 +/* 96B0B8 80241EF8 ACC70000 */ sw $a3, ($a2) +/* 96B0BC 80241EFC A6030000 */ sh $v1, ($s0) +/* 96B0C0 80241F00 8E230000 */ lw $v1, ($s1) +/* 96B0C4 80241F04 00521021 */ addu $v0, $v0, $s2 +/* 96B0C8 80241F08 00621821 */ addu $v1, $v1, $v0 +/* 96B0CC 80241F0C 3C028000 */ lui $v0, 0x8000 +/* 96B0D0 80241F10 00621821 */ addu $v1, $v1, $v0 +/* 96B0D4 80241F14 0C0B1EAF */ jal get_variable +/* 96B0D8 80241F18 ACC30004 */ sw $v1, 4($a2) +/* 96B0DC 80241F1C 0040202D */ daddu $a0, $v0, $zero +/* 96B0E0 80241F20 27A50098 */ addiu $a1, $sp, 0x98 +/* 96B0E4 80241F24 24060030 */ addiu $a2, $zero, 0x30 +/* 96B0E8 80241F28 0C04EBDC */ jal func_8013AF70 +/* 96B0EC 80241F2C 27A70018 */ addiu $a3, $sp, 0x18 +/* 96B0F0 80241F30 3C05D838 */ lui $a1, 0xd838 +/* 96B0F4 80241F34 8FC30000 */ lw $v1, ($fp) +/* 96B0F8 80241F38 34A50002 */ ori $a1, $a1, 2 +/* 96B0FC 80241F3C 0060202D */ daddu $a0, $v1, $zero +/* 96B100 80241F40 24630008 */ addiu $v1, $v1, 8 +/* 96B104 80241F44 AFC30000 */ sw $v1, ($fp) +/* 96B108 80241F48 24030040 */ addiu $v1, $zero, 0x40 +/* 96B10C 80241F4C AC850000 */ sw $a1, ($a0) +/* 96B110 80241F50 08090877 */ j .L802421DC +/* 96B114 80241F54 AC830004 */ sw $v1, 4($a0) +.L80241F58: +/* 96B118 80241F58 10620003 */ beq $v1, $v0, .L80241F68 +/* 96B11C 80241F5C 3C03F240 */ lui $v1, 0xf240 +.L80241F60: +/* 96B120 80241F60 08090877 */ j .L802421DC +/* 96B124 80241F64 24020001 */ addiu $v0, $zero, 1 +.L80241F68: +/* 96B128 80241F68 34630400 */ ori $v1, $v1, 0x400 +/* 96B12C 80241F6C 3C020047 */ lui $v0, 0x47 +/* 96B130 80241F70 3442C47C */ ori $v0, $v0, 0xc47c +/* 96B134 80241F74 27B30058 */ addiu $s3, $sp, 0x58 +/* 96B138 80241F78 0260202D */ daddu $a0, $s3, $zero +/* 96B13C 80241F7C 3C140001 */ lui $s4, 1 +/* 96B140 80241F80 36941630 */ ori $s4, $s4, 0x1630 +/* 96B144 80241F84 3C17DA38 */ lui $s7, 0xda38 +/* 96B148 80241F88 36F70002 */ ori $s7, $s7, 2 +/* 96B14C 80241F8C 3C0DD838 */ lui $t5, 0xd838 +/* 96B150 80241F90 35AD0002 */ ori $t5, $t5, 2 +/* 96B154 80241F94 3C108025 */ lui $s0, 0x8025 +/* 96B158 80241F98 2610F010 */ addiu $s0, $s0, -0xff0 +/* 96B15C 80241F9C AFAD00C0 */ sw $t5, 0xc0($sp) +/* 96B160 80241FA0 AD030000 */ sw $v1, ($t0) +/* 96B164 80241FA4 AD020004 */ sw $v0, 4($t0) +/* 96B168 80241FA8 8E050004 */ lw $a1, 4($s0) +/* 96B16C 80241FAC 8E060008 */ lw $a2, 8($s0) +/* 96B170 80241FB0 8E07000C */ lw $a3, 0xc($s0) +/* 96B174 80241FB4 25020008 */ addiu $v0, $t0, 8 +/* 96B178 80241FB8 0C019E40 */ jal guTranslateF +/* 96B17C 80241FBC AFC20000 */ sw $v0, ($fp) +/* 96B180 80241FC0 0260202D */ daddu $a0, $s3, $zero +/* 96B184 80241FC4 8FA50104 */ lw $a1, 0x104($sp) +/* 96B188 80241FC8 0C019D80 */ jal guMtxCatF +/* 96B18C 80241FCC 27A60018 */ addiu $a2, $sp, 0x18 +/* 96B190 80241FD0 27A40018 */ addiu $a0, $sp, 0x18 +/* 96B194 80241FD4 3C118007 */ lui $s1, 0x8007 +/* 96B198 80241FD8 263141F0 */ addiu $s1, $s1, 0x41f0 +/* 96B19C 80241FDC 3C12800A */ lui $s2, 0x800a +/* 96B1A0 80241FE0 2652A674 */ addiu $s2, $s2, -0x598c +/* 96B1A4 80241FE4 96250000 */ lhu $a1, ($s1) +/* 96B1A8 80241FE8 8E420000 */ lw $v0, ($s2) +/* 96B1AC 80241FEC 00052980 */ sll $a1, $a1, 6 +/* 96B1B0 80241FF0 00B42821 */ addu $a1, $a1, $s4 +/* 96B1B4 80241FF4 0C019D40 */ jal guMtxF2L +/* 96B1B8 80241FF8 00452821 */ addu $a1, $v0, $a1 +/* 96B1BC 80241FFC 3C05F4AC */ lui $a1, 0xf4ac +/* 96B1C0 80242000 34A5D481 */ ori $a1, $a1, 0xd481 +/* 96B1C4 80242004 3C158025 */ lui $s5, 0x8025 +/* 96B1C8 80242008 26B5EFCC */ addiu $s5, $s5, -0x1034 +/* 96B1CC 8024200C 3C0D8000 */ lui $t5, 0x8000 +/* 96B1D0 80242010 8FC30000 */ lw $v1, ($fp) +/* 96B1D4 80242014 8EA40000 */ lw $a0, ($s5) +/* 96B1D8 80242018 96220000 */ lhu $v0, ($s1) +/* 96B1DC 8024201C 0060302D */ daddu $a2, $v1, $zero +/* 96B1E0 80242020 24630008 */ addiu $v1, $v1, 8 +/* 96B1E4 80242024 AFC30000 */ sw $v1, ($fp) +/* 96B1E8 80242028 24430001 */ addiu $v1, $v0, 1 +/* 96B1EC 8024202C 3042FFFF */ andi $v0, $v0, 0xffff +/* 96B1F0 80242030 00021180 */ sll $v0, $v0, 6 +/* 96B1F4 80242034 ACD70000 */ sw $s7, ($a2) +/* 96B1F8 80242038 A6230000 */ sh $v1, ($s1) +/* 96B1FC 8024203C 8E430000 */ lw $v1, ($s2) +/* 96B200 80242040 00541021 */ addu $v0, $v0, $s4 +/* 96B204 80242044 00621821 */ addu $v1, $v1, $v0 +/* 96B208 80242048 006D1821 */ addu $v1, $v1, $t5 +/* 96B20C 8024204C 0C0B1EAF */ jal get_variable +/* 96B210 80242050 ACC30004 */ sw $v1, 4($a2) +/* 96B214 80242054 0040202D */ daddu $a0, $v0, $zero +/* 96B218 80242058 27B60098 */ addiu $s6, $sp, 0x98 +/* 96B21C 8024205C 02C0282D */ daddu $a1, $s6, $zero +/* 96B220 80242060 24060030 */ addiu $a2, $zero, 0x30 +/* 96B224 80242064 0C04EBDC */ jal func_8013AF70 +/* 96B228 80242068 27A70018 */ addiu $a3, $sp, 0x18 +/* 96B22C 8024206C 3C05F4AC */ lui $a1, 0xf4ac +/* 96B230 80242070 8EA40000 */ lw $a0, ($s5) +/* 96B234 80242074 0C0B1EAF */ jal get_variable +/* 96B238 80242078 34A5D482 */ ori $a1, $a1, 0xd482 +/* 96B23C 8024207C 0040202D */ daddu $a0, $v0, $zero +/* 96B240 80242080 02C0282D */ daddu $a1, $s6, $zero +/* 96B244 80242084 24060030 */ addiu $a2, $zero, 0x30 +/* 96B248 80242088 0C04EBDC */ jal func_8013AF70 +/* 96B24C 8024208C 27A70018 */ addiu $a3, $sp, 0x18 +/* 96B250 80242090 0260202D */ daddu $a0, $s3, $zero +/* 96B254 80242094 8FC20000 */ lw $v0, ($fp) +/* 96B258 80242098 8FAD00C0 */ lw $t5, 0xc0($sp) +/* 96B25C 8024209C 0040182D */ daddu $v1, $v0, $zero +/* 96B260 802420A0 AC6D0000 */ sw $t5, ($v1) +/* 96B264 802420A4 240D0040 */ addiu $t5, $zero, 0x40 +/* 96B268 802420A8 AC6D0004 */ sw $t5, 4($v1) +/* 96B26C 802420AC 8E050004 */ lw $a1, 4($s0) +/* 96B270 802420B0 8E060008 */ lw $a2, 8($s0) +/* 96B274 802420B4 8E07000C */ lw $a3, 0xc($s0) +/* 96B278 802420B8 24420008 */ addiu $v0, $v0, 8 +/* 96B27C 802420BC 0C019E40 */ jal guTranslateF +/* 96B280 802420C0 AFC20000 */ sw $v0, ($fp) +/* 96B284 802420C4 0260202D */ daddu $a0, $s3, $zero +/* 96B288 802420C8 8FA50104 */ lw $a1, 0x104($sp) +/* 96B28C 802420CC 0C019D80 */ jal guMtxCatF +/* 96B290 802420D0 27A60018 */ addiu $a2, $sp, 0x18 +/* 96B294 802420D4 27A40018 */ addiu $a0, $sp, 0x18 +/* 96B298 802420D8 96250000 */ lhu $a1, ($s1) +/* 96B29C 802420DC 8E420000 */ lw $v0, ($s2) +/* 96B2A0 802420E0 00052980 */ sll $a1, $a1, 6 +/* 96B2A4 802420E4 00B42821 */ addu $a1, $a1, $s4 +/* 96B2A8 802420E8 0C019D40 */ jal guMtxF2L +/* 96B2AC 802420EC 00452821 */ addu $a1, $v0, $a1 +/* 96B2B0 802420F0 27A400B0 */ addiu $a0, $sp, 0xb0 +/* 96B2B4 802420F4 3C0D8000 */ lui $t5, 0x8000 +/* 96B2B8 802420F8 8FC70000 */ lw $a3, ($fp) +/* 96B2BC 802420FC 96280000 */ lhu $t0, ($s1) +/* 96B2C0 80242100 00E0282D */ daddu $a1, $a3, $zero +/* 96B2C4 80242104 3102FFFF */ andi $v0, $t0, 0xffff +/* 96B2C8 80242108 00021180 */ sll $v0, $v0, 6 +/* 96B2CC 8024210C ACB70000 */ sw $s7, ($a1) +/* 96B2D0 80242110 8E430000 */ lw $v1, ($s2) +/* 96B2D4 80242114 00541021 */ addu $v0, $v0, $s4 +/* 96B2D8 80242118 00621821 */ addu $v1, $v1, $v0 +/* 96B2DC 8024211C 006D1821 */ addu $v1, $v1, $t5 +/* 96B2E0 80242120 ACA30004 */ sw $v1, 4($a1) +/* 96B2E4 80242124 8FAD0100 */ lw $t5, 0x100($sp) +/* 96B2E8 80242128 24E70008 */ addiu $a3, $a3, 8 +/* 96B2EC 8024212C 8DA50018 */ lw $a1, 0x18($t5) +/* 96B2F0 80242130 8DA6001C */ lw $a2, 0x1c($t5) +/* 96B2F4 80242134 25080001 */ addiu $t0, $t0, 1 +/* 96B2F8 80242138 AFC70000 */ sw $a3, ($fp) +/* 96B2FC 8024213C 0C0B7811 */ jal func_802DE044 +/* 96B300 80242140 A6280000 */ sh $t0, ($s1) +/* 96B304 80242144 3C05F4AC */ lui $a1, 0xf4ac +/* 96B308 80242148 34A5D483 */ ori $a1, $a1, 0xd483 +/* 96B30C 8024214C 8EA40000 */ lw $a0, ($s5) +/* 96B310 80242150 8FA600B0 */ lw $a2, 0xb0($sp) +/* 96B314 80242154 8FA700B4 */ lw $a3, 0xb4($sp) +/* 96B318 80242158 97A800BA */ lhu $t0, 0xba($sp) +/* 96B31C 8024215C 97A900BE */ lhu $t1, 0xbe($sp) +/* 96B320 80242160 8FA300B8 */ lw $v1, 0xb8($sp) +/* 96B324 80242164 240200FF */ addiu $v0, $zero, 0xff +/* 96B328 80242168 A3A200A8 */ sb $v0, 0xa8($sp) +/* 96B32C 8024216C 000317C2 */ srl $v0, $v1, 0x1f +/* 96B330 80242170 00621821 */ addu $v1, $v1, $v0 +/* 96B334 80242174 00031843 */ sra $v1, $v1, 1 +/* 96B338 80242178 8FA200BC */ lw $v0, 0xbc($sp) +/* 96B33C 8024217C 00031823 */ negu $v1, $v1 +/* 96B340 80242180 AFA60098 */ sw $a2, 0x98($sp) +/* 96B344 80242184 AFA7009C */ sw $a3, 0x9c($sp) +/* 96B348 80242188 A7A800A0 */ sh $t0, 0xa0($sp) +/* 96B34C 8024218C A7A900A2 */ sh $t1, 0xa2($sp) +/* 96B350 80242190 A7A300A4 */ sh $v1, 0xa4($sp) +/* 96B354 80242194 00021FC2 */ srl $v1, $v0, 0x1f +/* 96B358 80242198 00431021 */ addu $v0, $v0, $v1 +/* 96B35C 8024219C 00021043 */ sra $v0, $v0, 1 +/* 96B360 802421A0 0C0B1EAF */ jal get_variable +/* 96B364 802421A4 A7A200A6 */ sh $v0, 0xa6($sp) +/* 96B368 802421A8 0040202D */ daddu $a0, $v0, $zero +/* 96B36C 802421AC 02C0282D */ daddu $a1, $s6, $zero +/* 96B370 802421B0 24060010 */ addiu $a2, $zero, 0x10 +/* 96B374 802421B4 0C04EBDC */ jal func_8013AF70 +/* 96B378 802421B8 27A70018 */ addiu $a3, $sp, 0x18 +/* 96B37C 802421BC 8FC30000 */ lw $v1, ($fp) +/* 96B380 802421C0 0060202D */ daddu $a0, $v1, $zero +/* 96B384 802421C4 24630008 */ addiu $v1, $v1, 8 +/* 96B388 802421C8 AFC30000 */ sw $v1, ($fp) +/* 96B38C 802421CC 8FAD00C0 */ lw $t5, 0xc0($sp) +/* 96B390 802421D0 AC8D0000 */ sw $t5, ($a0) +/* 96B394 802421D4 240D0040 */ addiu $t5, $zero, 0x40 +/* 96B398 802421D8 AC8D0004 */ sw $t5, 4($a0) +.L802421DC: +/* 96B39C 802421DC 8FBF00EC */ lw $ra, 0xec($sp) +/* 96B3A0 802421E0 8FBE00E8 */ lw $fp, 0xe8($sp) +/* 96B3A4 802421E4 8FB700E4 */ lw $s7, 0xe4($sp) +/* 96B3A8 802421E8 8FB600E0 */ lw $s6, 0xe0($sp) +/* 96B3AC 802421EC 8FB500DC */ lw $s5, 0xdc($sp) +/* 96B3B0 802421F0 8FB400D8 */ lw $s4, 0xd8($sp) +/* 96B3B4 802421F4 8FB300D4 */ lw $s3, 0xd4($sp) +/* 96B3B8 802421F8 8FB200D0 */ lw $s2, 0xd0($sp) +/* 96B3BC 802421FC 8FB100CC */ lw $s1, 0xcc($sp) +/* 96B3C0 80242200 8FB000C8 */ lw $s0, 0xc8($sp) +/* 96B3C4 80242204 D7B600F8 */ ldc1 $f22, 0xf8($sp) +/* 96B3C8 80242208 D7B400F0 */ ldc1 $f20, 0xf0($sp) +/* 96B3CC 8024220C 03E00008 */ jr $ra +/* 96B3D0 80242210 27BD0100 */ addiu $sp, $sp, 0x100 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214.s deleted file mode 100644 index 9995d0296d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214.s +++ /dev/null @@ -1,130 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242214 -/* 96B3D4 80242214 27BDFEE8 */ addiu $sp, $sp, -0x118 -/* 96B3D8 80242218 AFB100E4 */ sw $s1, 0xe4($sp) -/* 96B3DC 8024221C 0080882D */ daddu $s1, $a0, $zero -/* 96B3E0 80242220 AFB300EC */ sw $s3, 0xec($sp) -/* 96B3E4 80242224 00A0982D */ daddu $s3, $a1, $zero -/* 96B3E8 80242228 AFB500F4 */ sw $s5, 0xf4($sp) -/* 96B3EC 8024222C 00C0A82D */ daddu $s5, $a2, $zero -/* 96B3F0 80242230 AFB600F8 */ sw $s6, 0xf8($sp) -/* 96B3F4 80242234 00E0B02D */ daddu $s6, $a3, $zero -/* 96B3F8 80242238 3C05F4AC */ lui $a1, 0xf4ac -/* 96B3FC 8024223C AFB000E0 */ sw $s0, 0xe0($sp) -/* 96B400 80242240 3C108025 */ lui $s0, 0x8025 -/* 96B404 80242244 2610EFCC */ addiu $s0, $s0, -0x1034 -/* 96B408 80242248 AFBF00FC */ sw $ra, 0xfc($sp) -/* 96B40C 8024224C AFB400F0 */ sw $s4, 0xf0($sp) -/* 96B410 80242250 AFB200E8 */ sw $s2, 0xe8($sp) -/* 96B414 80242254 F7B80110 */ sdc1 $f24, 0x110($sp) -/* 96B418 80242258 F7B60108 */ sdc1 $f22, 0x108($sp) -/* 96B41C 8024225C F7B40100 */ sdc1 $f20, 0x100($sp) -/* 96B420 80242260 8E040000 */ lw $a0, ($s0) -/* 96B424 80242264 8FB40128 */ lw $s4, 0x128($sp) -/* 96B428 80242268 0C0B1EAF */ jal get_variable -/* 96B42C 8024226C 34A5D484 */ ori $a1, $a1, 0xd484 -/* 96B430 80242270 3C05F4AC */ lui $a1, 0xf4ac -/* 96B434 80242274 8E040000 */ lw $a0, ($s0) -/* 96B438 80242278 4482C000 */ mtc1 $v0, $f24 -/* 96B43C 8024227C 00000000 */ nop -/* 96B440 80242280 4680C620 */ cvt.s.w $f24, $f24 -/* 96B444 80242284 0C0B1EAF */ jal get_variable -/* 96B448 80242288 34A5D485 */ ori $a1, $a1, 0xd485 -/* 96B44C 8024228C 3C05F4AC */ lui $a1, 0xf4ac -/* 96B450 80242290 4482A000 */ mtc1 $v0, $f20 -/* 96B454 80242294 00000000 */ nop -/* 96B458 80242298 4680A520 */ cvt.s.w $f20, $f20 -/* 96B45C 8024229C 8E040000 */ lw $a0, ($s0) -/* 96B460 802422A0 4480B000 */ mtc1 $zero, $f22 -/* 96B464 802422A4 0C0B1EAF */ jal get_variable -/* 96B468 802422A8 34A5D486 */ ori $a1, $a1, 0xd486 -/* 96B46C 802422AC 27B200A0 */ addiu $s2, $sp, 0xa0 -/* 96B470 802422B0 4405B000 */ mfc1 $a1, $f22 -/* 96B474 802422B4 4407B000 */ mfc1 $a3, $f22 -/* 96B478 802422B8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 96B47C 802422BC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 96B480 802422C0 3C013F36 */ lui $at, 0x3f36 -/* 96B484 802422C4 3421DB6E */ ori $at, $at, 0xdb6e -/* 96B488 802422C8 44810000 */ mtc1 $at, $f0 -/* 96B48C 802422CC 00041880 */ sll $v1, $a0, 2 -/* 96B490 802422D0 00641821 */ addu $v1, $v1, $a0 -/* 96B494 802422D4 00031880 */ sll $v1, $v1, 2 -/* 96B498 802422D8 00641823 */ subu $v1, $v1, $a0 -/* 96B49C 802422DC 000320C0 */ sll $a0, $v1, 3 -/* 96B4A0 802422E0 00641821 */ addu $v1, $v1, $a0 -/* 96B4A4 802422E4 000318C0 */ sll $v1, $v1, 3 -/* 96B4A8 802422E8 3C01800B */ lui $at, 0x800b -/* 96B4AC 802422EC 00230821 */ addu $at, $at, $v1 -/* 96B4B0 802422F0 C4221DEC */ lwc1 $f2, 0x1dec($at) -/* 96B4B4 802422F4 0240202D */ daddu $a0, $s2, $zero -/* 96B4B8 802422F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 96B4BC 802422FC 46001087 */ neg.s $f2, $f2 -/* 96B4C0 80242300 44061000 */ mfc1 $a2, $f2 -/* 96B4C4 80242304 44820000 */ mtc1 $v0, $f0 -/* 96B4C8 80242308 00000000 */ nop -/* 96B4CC 8024230C 46800020 */ cvt.s.w $f0, $f0 -/* 96B4D0 80242310 E7B80014 */ swc1 $f24, 0x14($sp) -/* 96B4D4 80242314 E7B40018 */ swc1 $f20, 0x18($sp) -/* 96B4D8 80242318 0C018FC4 */ jal guPositionF -/* 96B4DC 8024231C E7A0001C */ swc1 $f0, 0x1c($sp) -/* 96B4E0 80242320 3C028025 */ lui $v0, 0x8025 -/* 96B4E4 80242324 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96B4E8 80242328 001180C0 */ sll $s0, $s1, 3 -/* 96B4EC 8024232C 02118021 */ addu $s0, $s0, $s1 -/* 96B4F0 80242330 00108080 */ sll $s0, $s0, 2 -/* 96B4F4 80242334 02028021 */ addu $s0, $s0, $v0 -/* 96B4F8 80242338 27B10060 */ addiu $s1, $sp, 0x60 -/* 96B4FC 8024233C 8E050004 */ lw $a1, 4($s0) -/* 96B500 80242340 8E060008 */ lw $a2, 8($s0) -/* 96B504 80242344 8E07000C */ lw $a3, 0xc($s0) -/* 96B508 80242348 0C019E40 */ jal guTranslateF -/* 96B50C 8024234C 0220202D */ daddu $a0, $s1, $zero -/* 96B510 80242350 0220202D */ daddu $a0, $s1, $zero -/* 96B514 80242354 0240282D */ daddu $a1, $s2, $zero -/* 96B518 80242358 0C019D80 */ jal guMtxCatF -/* 96B51C 8024235C 27A60020 */ addiu $a2, $sp, 0x20 -/* 96B520 80242360 E7B60010 */ swc1 $f22, 0x10($sp) -/* 96B524 80242364 8E050010 */ lw $a1, 0x10($s0) -/* 96B528 80242368 3C013F80 */ lui $at, 0x3f80 -/* 96B52C 8024236C 4481A000 */ mtc1 $at, $f20 -/* 96B530 80242370 4406B000 */ mfc1 $a2, $f22 -/* 96B534 80242374 4407A000 */ mfc1 $a3, $f20 -/* 96B538 80242378 0C019EC8 */ jal guRotateF -/* 96B53C 8024237C 0220202D */ daddu $a0, $s1, $zero -/* 96B540 80242380 0220202D */ daddu $a0, $s1, $zero -/* 96B544 80242384 27A50020 */ addiu $a1, $sp, 0x20 -/* 96B548 80242388 0C019D80 */ jal guMtxCatF -/* 96B54C 8024238C 00A0302D */ daddu $a2, $a1, $zero -/* 96B550 80242390 0220202D */ daddu $a0, $s1, $zero -/* 96B554 80242394 4405B000 */ mfc1 $a1, $f22 -/* 96B558 80242398 4407A000 */ mfc1 $a3, $f20 -/* 96B55C 8024239C 0C019E40 */ jal guTranslateF -/* 96B560 802423A0 00A0302D */ daddu $a2, $a1, $zero -/* 96B564 802423A4 0220202D */ daddu $a0, $s1, $zero -/* 96B568 802423A8 27A50020 */ addiu $a1, $sp, 0x20 -/* 96B56C 802423AC 0C019D80 */ jal guMtxCatF -/* 96B570 802423B0 00A0302D */ daddu $a2, $a1, $zero -/* 96B574 802423B4 C7A00050 */ lwc1 $f0, 0x50($sp) -/* 96B578 802423B8 E6600000 */ swc1 $f0, ($s3) -/* 96B57C 802423BC C7A00054 */ lwc1 $f0, 0x54($sp) -/* 96B580 802423C0 E6A00000 */ swc1 $f0, ($s5) -/* 96B584 802423C4 C7A00058 */ lwc1 $f0, 0x58($sp) -/* 96B588 802423C8 E6C00000 */ swc1 $f0, ($s6) -/* 96B58C 802423CC 0C00A6C9 */ jal clamp_angle -/* 96B590 802423D0 C60C0010 */ lwc1 $f12, 0x10($s0) -/* 96B594 802423D4 E6800000 */ swc1 $f0, ($s4) -/* 96B598 802423D8 8FBF00FC */ lw $ra, 0xfc($sp) -/* 96B59C 802423DC 8FB600F8 */ lw $s6, 0xf8($sp) -/* 96B5A0 802423E0 8FB500F4 */ lw $s5, 0xf4($sp) -/* 96B5A4 802423E4 8FB400F0 */ lw $s4, 0xf0($sp) -/* 96B5A8 802423E8 8FB300EC */ lw $s3, 0xec($sp) -/* 96B5AC 802423EC 8FB200E8 */ lw $s2, 0xe8($sp) -/* 96B5B0 802423F0 8FB100E4 */ lw $s1, 0xe4($sp) -/* 96B5B4 802423F4 8FB000E0 */ lw $s0, 0xe0($sp) -/* 96B5B8 802423F8 D7B80110 */ ldc1 $f24, 0x110($sp) -/* 96B5BC 802423FC D7B60108 */ ldc1 $f22, 0x108($sp) -/* 96B5C0 80242400 D7B40100 */ ldc1 $f20, 0x100($sp) -/* 96B5C4 80242404 03E00008 */ jr $ra -/* 96B5C8 80242408 27BD0118 */ addiu $sp, $sp, 0x118 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s new file mode 100644 index 0000000000..3aa8092222 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242214_96B3D4.s @@ -0,0 +1,130 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242214_96B3D4 +/* 96B3D4 80242214 27BDFEE8 */ addiu $sp, $sp, -0x118 +/* 96B3D8 80242218 AFB100E4 */ sw $s1, 0xe4($sp) +/* 96B3DC 8024221C 0080882D */ daddu $s1, $a0, $zero +/* 96B3E0 80242220 AFB300EC */ sw $s3, 0xec($sp) +/* 96B3E4 80242224 00A0982D */ daddu $s3, $a1, $zero +/* 96B3E8 80242228 AFB500F4 */ sw $s5, 0xf4($sp) +/* 96B3EC 8024222C 00C0A82D */ daddu $s5, $a2, $zero +/* 96B3F0 80242230 AFB600F8 */ sw $s6, 0xf8($sp) +/* 96B3F4 80242234 00E0B02D */ daddu $s6, $a3, $zero +/* 96B3F8 80242238 3C05F4AC */ lui $a1, 0xf4ac +/* 96B3FC 8024223C AFB000E0 */ sw $s0, 0xe0($sp) +/* 96B400 80242240 3C108025 */ lui $s0, 0x8025 +/* 96B404 80242244 2610EFCC */ addiu $s0, $s0, -0x1034 +/* 96B408 80242248 AFBF00FC */ sw $ra, 0xfc($sp) +/* 96B40C 8024224C AFB400F0 */ sw $s4, 0xf0($sp) +/* 96B410 80242250 AFB200E8 */ sw $s2, 0xe8($sp) +/* 96B414 80242254 F7B80110 */ sdc1 $f24, 0x110($sp) +/* 96B418 80242258 F7B60108 */ sdc1 $f22, 0x108($sp) +/* 96B41C 8024225C F7B40100 */ sdc1 $f20, 0x100($sp) +/* 96B420 80242260 8E040000 */ lw $a0, ($s0) +/* 96B424 80242264 8FB40128 */ lw $s4, 0x128($sp) +/* 96B428 80242268 0C0B1EAF */ jal get_variable +/* 96B42C 8024226C 34A5D484 */ ori $a1, $a1, 0xd484 +/* 96B430 80242270 3C05F4AC */ lui $a1, 0xf4ac +/* 96B434 80242274 8E040000 */ lw $a0, ($s0) +/* 96B438 80242278 4482C000 */ mtc1 $v0, $f24 +/* 96B43C 8024227C 00000000 */ nop +/* 96B440 80242280 4680C620 */ cvt.s.w $f24, $f24 +/* 96B444 80242284 0C0B1EAF */ jal get_variable +/* 96B448 80242288 34A5D485 */ ori $a1, $a1, 0xd485 +/* 96B44C 8024228C 3C05F4AC */ lui $a1, 0xf4ac +/* 96B450 80242290 4482A000 */ mtc1 $v0, $f20 +/* 96B454 80242294 00000000 */ nop +/* 96B458 80242298 4680A520 */ cvt.s.w $f20, $f20 +/* 96B45C 8024229C 8E040000 */ lw $a0, ($s0) +/* 96B460 802422A0 4480B000 */ mtc1 $zero, $f22 +/* 96B464 802422A4 0C0B1EAF */ jal get_variable +/* 96B468 802422A8 34A5D486 */ ori $a1, $a1, 0xd486 +/* 96B46C 802422AC 27B200A0 */ addiu $s2, $sp, 0xa0 +/* 96B470 802422B0 4405B000 */ mfc1 $a1, $f22 +/* 96B474 802422B4 4407B000 */ mfc1 $a3, $f22 +/* 96B478 802422B8 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 96B47C 802422BC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 96B480 802422C0 3C013F36 */ lui $at, 0x3f36 +/* 96B484 802422C4 3421DB6E */ ori $at, $at, 0xdb6e +/* 96B488 802422C8 44810000 */ mtc1 $at, $f0 +/* 96B48C 802422CC 00041880 */ sll $v1, $a0, 2 +/* 96B490 802422D0 00641821 */ addu $v1, $v1, $a0 +/* 96B494 802422D4 00031880 */ sll $v1, $v1, 2 +/* 96B498 802422D8 00641823 */ subu $v1, $v1, $a0 +/* 96B49C 802422DC 000320C0 */ sll $a0, $v1, 3 +/* 96B4A0 802422E0 00641821 */ addu $v1, $v1, $a0 +/* 96B4A4 802422E4 000318C0 */ sll $v1, $v1, 3 +/* 96B4A8 802422E8 3C01800B */ lui $at, 0x800b +/* 96B4AC 802422EC 00230821 */ addu $at, $at, $v1 +/* 96B4B0 802422F0 C4221DEC */ lwc1 $f2, 0x1dec($at) +/* 96B4B4 802422F4 0240202D */ daddu $a0, $s2, $zero +/* 96B4B8 802422F8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 96B4BC 802422FC 46001087 */ neg.s $f2, $f2 +/* 96B4C0 80242300 44061000 */ mfc1 $a2, $f2 +/* 96B4C4 80242304 44820000 */ mtc1 $v0, $f0 +/* 96B4C8 80242308 00000000 */ nop +/* 96B4CC 8024230C 46800020 */ cvt.s.w $f0, $f0 +/* 96B4D0 80242310 E7B80014 */ swc1 $f24, 0x14($sp) +/* 96B4D4 80242314 E7B40018 */ swc1 $f20, 0x18($sp) +/* 96B4D8 80242318 0C018FC4 */ jal guPositionF +/* 96B4DC 8024231C E7A0001C */ swc1 $f0, 0x1c($sp) +/* 96B4E0 80242320 3C028025 */ lui $v0, 0x8025 +/* 96B4E4 80242324 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96B4E8 80242328 001180C0 */ sll $s0, $s1, 3 +/* 96B4EC 8024232C 02118021 */ addu $s0, $s0, $s1 +/* 96B4F0 80242330 00108080 */ sll $s0, $s0, 2 +/* 96B4F4 80242334 02028021 */ addu $s0, $s0, $v0 +/* 96B4F8 80242338 27B10060 */ addiu $s1, $sp, 0x60 +/* 96B4FC 8024233C 8E050004 */ lw $a1, 4($s0) +/* 96B500 80242340 8E060008 */ lw $a2, 8($s0) +/* 96B504 80242344 8E07000C */ lw $a3, 0xc($s0) +/* 96B508 80242348 0C019E40 */ jal guTranslateF +/* 96B50C 8024234C 0220202D */ daddu $a0, $s1, $zero +/* 96B510 80242350 0220202D */ daddu $a0, $s1, $zero +/* 96B514 80242354 0240282D */ daddu $a1, $s2, $zero +/* 96B518 80242358 0C019D80 */ jal guMtxCatF +/* 96B51C 8024235C 27A60020 */ addiu $a2, $sp, 0x20 +/* 96B520 80242360 E7B60010 */ swc1 $f22, 0x10($sp) +/* 96B524 80242364 8E050010 */ lw $a1, 0x10($s0) +/* 96B528 80242368 3C013F80 */ lui $at, 0x3f80 +/* 96B52C 8024236C 4481A000 */ mtc1 $at, $f20 +/* 96B530 80242370 4406B000 */ mfc1 $a2, $f22 +/* 96B534 80242374 4407A000 */ mfc1 $a3, $f20 +/* 96B538 80242378 0C019EC8 */ jal guRotateF +/* 96B53C 8024237C 0220202D */ daddu $a0, $s1, $zero +/* 96B540 80242380 0220202D */ daddu $a0, $s1, $zero +/* 96B544 80242384 27A50020 */ addiu $a1, $sp, 0x20 +/* 96B548 80242388 0C019D80 */ jal guMtxCatF +/* 96B54C 8024238C 00A0302D */ daddu $a2, $a1, $zero +/* 96B550 80242390 0220202D */ daddu $a0, $s1, $zero +/* 96B554 80242394 4405B000 */ mfc1 $a1, $f22 +/* 96B558 80242398 4407A000 */ mfc1 $a3, $f20 +/* 96B55C 8024239C 0C019E40 */ jal guTranslateF +/* 96B560 802423A0 00A0302D */ daddu $a2, $a1, $zero +/* 96B564 802423A4 0220202D */ daddu $a0, $s1, $zero +/* 96B568 802423A8 27A50020 */ addiu $a1, $sp, 0x20 +/* 96B56C 802423AC 0C019D80 */ jal guMtxCatF +/* 96B570 802423B0 00A0302D */ daddu $a2, $a1, $zero +/* 96B574 802423B4 C7A00050 */ lwc1 $f0, 0x50($sp) +/* 96B578 802423B8 E6600000 */ swc1 $f0, ($s3) +/* 96B57C 802423BC C7A00054 */ lwc1 $f0, 0x54($sp) +/* 96B580 802423C0 E6A00000 */ swc1 $f0, ($s5) +/* 96B584 802423C4 C7A00058 */ lwc1 $f0, 0x58($sp) +/* 96B588 802423C8 E6C00000 */ swc1 $f0, ($s6) +/* 96B58C 802423CC 0C00A6C9 */ jal clamp_angle +/* 96B590 802423D0 C60C0010 */ lwc1 $f12, 0x10($s0) +/* 96B594 802423D4 E6800000 */ swc1 $f0, ($s4) +/* 96B598 802423D8 8FBF00FC */ lw $ra, 0xfc($sp) +/* 96B59C 802423DC 8FB600F8 */ lw $s6, 0xf8($sp) +/* 96B5A0 802423E0 8FB500F4 */ lw $s5, 0xf4($sp) +/* 96B5A4 802423E4 8FB400F0 */ lw $s4, 0xf0($sp) +/* 96B5A8 802423E8 8FB300EC */ lw $s3, 0xec($sp) +/* 96B5AC 802423EC 8FB200E8 */ lw $s2, 0xe8($sp) +/* 96B5B0 802423F0 8FB100E4 */ lw $s1, 0xe4($sp) +/* 96B5B4 802423F4 8FB000E0 */ lw $s0, 0xe0($sp) +/* 96B5B8 802423F8 D7B80110 */ ldc1 $f24, 0x110($sp) +/* 96B5BC 802423FC D7B60108 */ ldc1 $f22, 0x108($sp) +/* 96B5C0 80242400 D7B40100 */ ldc1 $f20, 0x100($sp) +/* 96B5C4 80242404 03E00008 */ jr $ra +/* 96B5C8 80242408 27BD0118 */ addiu $sp, $sp, 0x118 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C.s deleted file mode 100644 index 490fd5a10f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C.s +++ /dev/null @@ -1,699 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024240C -/* 96B5CC 8024240C 27BDFF70 */ addiu $sp, $sp, -0x90 -/* 96B5D0 80242410 3C05F4AC */ lui $a1, 0xf4ac -/* 96B5D4 80242414 3C048025 */ lui $a0, 0x8025 -/* 96B5D8 80242418 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96B5DC 8024241C AFBF0080 */ sw $ra, 0x80($sp) -/* 96B5E0 80242420 AFB1007C */ sw $s1, 0x7c($sp) -/* 96B5E4 80242424 AFB00078 */ sw $s0, 0x78($sp) -/* 96B5E8 80242428 F7B40088 */ sdc1 $f20, 0x88($sp) -/* 96B5EC 8024242C 0C0B1EAF */ jal get_variable -/* 96B5F0 80242430 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B5F4 80242434 0040182D */ daddu $v1, $v0, $zero -/* 96B5F8 80242438 2C62000E */ sltiu $v0, $v1, 0xe -/* 96B5FC 8024243C 10400295 */ beqz $v0, .L80242E94 -/* 96B600 80242440 00031080 */ sll $v0, $v1, 2 -/* 96B604 80242444 3C018025 */ lui $at, 0x8025 -/* 96B608 80242448 00220821 */ addu $at, $at, $v0 -/* 96B60C 8024244C 8C22EF20 */ lw $v0, -0x10e0($at) -/* 96B610 80242450 00400008 */ jr $v0 -/* 96B614 80242454 00000000 */ nop -/* 96B618 80242458 3C05F4AC */ lui $a1, 0xf4ac -/* 96B61C 8024245C 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B620 80242460 3C048025 */ lui $a0, 0x8025 -/* 96B624 80242464 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96B628 80242468 3C018025 */ lui $at, 0x8025 -/* 96B62C 8024246C AC20EF88 */ sw $zero, -0x1078($at) -/* 96B630 80242470 0C0B2026 */ jal set_variable -/* 96B634 80242474 24060001 */ addiu $a2, $zero, 1 -/* 96B638 80242478 3C028025 */ lui $v0, 0x8025 -/* 96B63C 8024247C 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96B640 80242480 24040001 */ addiu $a0, $zero, 1 -/* 96B644 80242484 3C01C348 */ lui $at, 0xc348 -/* 96B648 80242488 44811000 */ mtc1 $at, $f2 -/* 96B64C 8024248C 3C014348 */ lui $at, 0x4348 -/* 96B650 80242490 44810000 */ mtc1 $at, $f0 -/* 96B654 80242494 3C013F80 */ lui $at, 0x3f80 -/* 96B658 80242498 44812000 */ mtc1 $at, $f4 -/* 96B65C 8024249C 3C014000 */ lui $at, 0x4000 -/* 96B660 802424A0 44813000 */ mtc1 $at, $f6 -/* 96B664 802424A4 2403000C */ addiu $v1, $zero, 0xc -/* 96B668 802424A8 AC43001C */ sw $v1, 0x1c($v0) -/* 96B66C 802424AC 24030002 */ addiu $v1, $zero, 2 -/* 96B670 802424B0 AC430020 */ sw $v1, 0x20($v0) -/* 96B674 802424B4 24030030 */ addiu $v1, $zero, 0x30 -/* 96B678 802424B8 AC430040 */ sw $v1, 0x40($v0) -/* 96B67C 802424BC 24030008 */ addiu $v1, $zero, 8 -/* 96B680 802424C0 AC430060 */ sw $v1, 0x60($v0) -/* 96B684 802424C4 24030005 */ addiu $v1, $zero, 5 -/* 96B688 802424C8 AC430064 */ sw $v1, 0x64($v0) -/* 96B68C 802424CC 24030004 */ addiu $v1, $zero, 4 -/* 96B690 802424D0 AC440000 */ sw $a0, ($v0) -/* 96B694 802424D4 AC400008 */ sw $zero, 8($v0) -/* 96B698 802424D8 AC40000C */ sw $zero, 0xc($v0) -/* 96B69C 802424DC AC400014 */ sw $zero, 0x14($v0) -/* 96B6A0 802424E0 AC400010 */ sw $zero, 0x10($v0) -/* 96B6A4 802424E4 AC440018 */ sw $a0, 0x18($v0) -/* 96B6A8 802424E8 AC440024 */ sw $a0, 0x24($v0) -/* 96B6AC 802424EC AC40002C */ sw $zero, 0x2c($v0) -/* 96B6B0 802424F0 AC400038 */ sw $zero, 0x38($v0) -/* 96B6B4 802424F4 AC400034 */ sw $zero, 0x34($v0) -/* 96B6B8 802424F8 AC44003C */ sw $a0, 0x3c($v0) -/* 96B6BC 802424FC AC400044 */ sw $zero, 0x44($v0) -/* 96B6C0 80242500 AC440048 */ sw $a0, 0x48($v0) -/* 96B6C4 80242504 AC40004C */ sw $zero, 0x4c($v0) -/* 96B6C8 80242508 AC40005C */ sw $zero, 0x5c($v0) -/* 96B6CC 8024250C AC400058 */ sw $zero, 0x58($v0) -/* 96B6D0 80242510 AC430068 */ sw $v1, 0x68($v0) -/* 96B6D4 80242514 E4420004 */ swc1 $f2, 4($v0) -/* 96B6D8 80242518 E4400028 */ swc1 $f0, 0x28($v0) -/* 96B6DC 8024251C E4440030 */ swc1 $f4, 0x30($v0) -/* 96B6E0 80242520 E4400050 */ swc1 $f0, 0x50($v0) -/* 96B6E4 80242524 08090BA5 */ j .L80242E94 -/* 96B6E8 80242528 E4460054 */ swc1 $f6, 0x54($v0) -/* 96B6EC 8024252C 3C028025 */ lui $v0, 0x8025 -/* 96B6F0 80242530 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96B6F4 80242534 3C108025 */ lui $s0, 0x8025 -/* 96B6F8 80242538 2610EF88 */ addiu $s0, $s0, -0x1078 -/* 96B6FC 8024253C C4440004 */ lwc1 $f4, 4($v0) -/* 96B700 80242540 3C014120 */ lui $at, 0x4120 -/* 96B704 80242544 44810000 */ mtc1 $at, $f0 -/* 96B708 80242548 C4420028 */ lwc1 $f2, 0x28($v0) -/* 96B70C 8024254C 46002100 */ add.s $f4, $f4, $f0 -/* 96B710 80242550 3C01C120 */ lui $at, 0xc120 -/* 96B714 80242554 44813000 */ mtc1 $at, $f6 -/* 96B718 80242558 8E030000 */ lw $v1, ($s0) -/* 96B71C 8024255C 46061080 */ add.s $f2, $f2, $f6 -/* 96B720 80242560 C4400050 */ lwc1 $f0, 0x50($v0) -/* 96B724 80242564 24630001 */ addiu $v1, $v1, 1 -/* 96B728 80242568 AE030000 */ sw $v1, ($s0) -/* 96B72C 8024256C 46060000 */ add.s $f0, $f0, $f6 -/* 96B730 80242570 E4440004 */ swc1 $f4, 4($v0) -/* 96B734 80242574 E4420028 */ swc1 $f2, 0x28($v0) -/* 96B738 80242578 E4400050 */ swc1 $f0, 0x50($v0) -/* 96B73C 8024257C 24020012 */ addiu $v0, $zero, 0x12 -/* 96B740 80242580 14620006 */ bne $v1, $v0, .L8024259C -/* 96B744 80242584 00000000 */ nop -/* 96B748 80242588 3C01C47A */ lui $at, 0xc47a -/* 96B74C 8024258C 44810000 */ mtc1 $at, $f0 -/* 96B750 80242590 00000000 */ nop -/* 96B754 80242594 3C018011 */ lui $at, 0x8011 -/* 96B758 80242598 E420EFF4 */ swc1 $f0, -0x100c($at) -.L8024259C: -/* 96B75C 8024259C 8E030000 */ lw $v1, ($s0) -/* 96B760 802425A0 24020014 */ addiu $v0, $zero, 0x14 -/* 96B764 802425A4 1462023B */ bne $v1, $v0, .L80242E94 -/* 96B768 802425A8 00000000 */ nop -/* 96B76C 802425AC 3C05F4AC */ lui $a1, 0xf4ac -/* 96B770 802425B0 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B774 802425B4 3C048025 */ lui $a0, 0x8025 -/* 96B778 802425B8 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96B77C 802425BC 0C0B2026 */ jal set_variable -/* 96B780 802425C0 24060002 */ addiu $a2, $zero, 2 -/* 96B784 802425C4 08090BA5 */ j .L80242E94 -/* 96B788 802425C8 AE000000 */ sw $zero, ($s0) -/* 96B78C 802425CC 3C028025 */ lui $v0, 0x8025 -/* 96B790 802425D0 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96B794 802425D4 24030002 */ addiu $v1, $zero, 2 -/* 96B798 802425D8 AC430000 */ sw $v1, ($v0) -/* 96B79C 802425DC AC400024 */ sw $zero, 0x24($v0) -/* 96B7A0 802425E0 AC400048 */ sw $zero, 0x48($v0) -/* 96B7A4 802425E4 AC400004 */ sw $zero, 4($v0) -/* 96B7A8 802425E8 AC400008 */ sw $zero, 8($v0) -/* 96B7AC 802425EC 08090BA5 */ j .L80242E94 -/* 96B7B0 802425F0 AC40000C */ sw $zero, 0xc($v0) -/* 96B7B4 802425F4 3C038025 */ lui $v1, 0x8025 -/* 96B7B8 802425F8 2463F010 */ addiu $v1, $v1, -0xff0 -/* 96B7BC 802425FC 24020001 */ addiu $v0, $zero, 1 -/* 96B7C0 80242600 C4620004 */ lwc1 $f2, 4($v1) -/* 96B7C4 80242604 3C014120 */ lui $at, 0x4120 -/* 96B7C8 80242608 44812000 */ mtc1 $at, $f4 -/* 96B7CC 8024260C 3C078025 */ lui $a3, 0x8025 -/* 96B7D0 80242610 24E7EF88 */ addiu $a3, $a3, -0x1078 -/* 96B7D4 80242614 AC620000 */ sw $v0, ($v1) -/* 96B7D8 80242618 AC620024 */ sw $v0, 0x24($v1) -/* 96B7DC 8024261C AC620048 */ sw $v0, 0x48($v1) -/* 96B7E0 80242620 8CE40000 */ lw $a0, ($a3) -/* 96B7E4 80242624 C4600028 */ lwc1 $f0, 0x28($v1) -/* 96B7E8 80242628 46041081 */ sub.s $f2, $f2, $f4 -/* 96B7EC 8024262C 00822021 */ addu $a0, $a0, $v0 -/* 96B7F0 80242630 2402000A */ addiu $v0, $zero, 0xa -/* 96B7F4 80242634 46040000 */ add.s $f0, $f0, $f4 -/* 96B7F8 80242638 ACE40000 */ sw $a0, ($a3) -/* 96B7FC 8024263C E4620004 */ swc1 $f2, 4($v1) -/* 96B800 80242640 14820214 */ bne $a0, $v0, .L80242E94 -/* 96B804 80242644 E4600028 */ swc1 $f0, 0x28($v1) -/* 96B808 80242648 3C05F4AC */ lui $a1, 0xf4ac -/* 96B80C 8024264C 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B810 80242650 3C048025 */ lui $a0, 0x8025 -/* 96B814 80242654 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96B818 80242658 08090A91 */ j .L80242A44 -/* 96B81C 8024265C 24060004 */ addiu $a2, $zero, 4 -/* 96B820 80242660 3C078025 */ lui $a3, 0x8025 -/* 96B824 80242664 24E7EF88 */ addiu $a3, $a3, -0x1078 -/* 96B828 80242668 3C01C2C8 */ lui $at, 0xc2c8 -/* 96B82C 8024266C 44810000 */ mtc1 $at, $f0 -/* 96B830 80242670 3C0142C8 */ lui $at, 0x42c8 -/* 96B834 80242674 44811000 */ mtc1 $at, $f2 -/* 96B838 80242678 3C013F80 */ lui $at, 0x3f80 -/* 96B83C 8024267C 44812000 */ mtc1 $at, $f4 -/* 96B840 80242680 3C014000 */ lui $at, 0x4000 -/* 96B844 80242684 44813000 */ mtc1 $at, $f6 -/* 96B848 80242688 8CE30000 */ lw $v1, ($a3) -/* 96B84C 8024268C 3C028025 */ lui $v0, 0x8025 -/* 96B850 80242690 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96B854 80242694 AC400008 */ sw $zero, 8($v0) -/* 96B858 80242698 AC40000C */ sw $zero, 0xc($v0) -/* 96B85C 8024269C AC40002C */ sw $zero, 0x2c($v0) -/* 96B860 802426A0 AC40004C */ sw $zero, 0x4c($v0) -/* 96B864 802426A4 AC400050 */ sw $zero, 0x50($v0) -/* 96B868 802426A8 24630001 */ addiu $v1, $v1, 1 -/* 96B86C 802426AC E4400004 */ swc1 $f0, 4($v0) -/* 96B870 802426B0 E4420028 */ swc1 $f2, 0x28($v0) -/* 96B874 802426B4 E4440030 */ swc1 $f4, 0x30($v0) -/* 96B878 802426B8 E4460054 */ swc1 $f6, 0x54($v0) -/* 96B87C 802426BC 24020014 */ addiu $v0, $zero, 0x14 -/* 96B880 802426C0 146201F4 */ bne $v1, $v0, .L80242E94 -/* 96B884 802426C4 ACE30000 */ sw $v1, ($a3) -/* 96B888 802426C8 3C05F4AC */ lui $a1, 0xf4ac -/* 96B88C 802426CC 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B890 802426D0 3C048025 */ lui $a0, 0x8025 -/* 96B894 802426D4 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96B898 802426D8 24060005 */ addiu $a2, $zero, 5 -/* 96B89C 802426DC 0C0B2026 */ jal set_variable -/* 96B8A0 802426E0 ACE00000 */ sw $zero, ($a3) -/* 96B8A4 802426E4 24040203 */ addiu $a0, $zero, 0x203 -/* 96B8A8 802426E8 0000282D */ daddu $a1, $zero, $zero -/* 96B8AC 802426EC 08090A26 */ j .L80242898 -/* 96B8B0 802426F0 24060018 */ addiu $a2, $zero, 0x18 -/* 96B8B4 802426F4 3C028025 */ lui $v0, 0x8025 -/* 96B8B8 802426F8 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96B8BC 802426FC C4400010 */ lwc1 $f0, 0x10($v0) -/* 96B8C0 80242700 3C014190 */ lui $at, 0x4190 -/* 96B8C4 80242704 44811000 */ mtc1 $at, $f2 -/* 96B8C8 80242708 3C108025 */ lui $s0, 0x8025 -/* 96B8CC 8024270C 2610EF88 */ addiu $s0, $s0, -0x1078 -/* 96B8D0 80242710 AC400034 */ sw $zero, 0x34($v0) -/* 96B8D4 80242714 AC400058 */ sw $zero, 0x58($v0) -/* 96B8D8 80242718 8E030000 */ lw $v1, ($s0) -/* 96B8DC 8024271C 46020000 */ add.s $f0, $f0, $f2 -/* 96B8E0 80242720 24630001 */ addiu $v1, $v1, 1 -/* 96B8E4 80242724 AE030000 */ sw $v1, ($s0) -/* 96B8E8 80242728 E4400010 */ swc1 $f0, 0x10($v0) -/* 96B8EC 8024272C 24020008 */ addiu $v0, $zero, 8 -/* 96B8F0 80242730 14620016 */ bne $v1, $v0, .L8024278C -/* 96B8F4 80242734 0000202D */ daddu $a0, $zero, $zero -/* 96B8F8 80242738 27A50018 */ addiu $a1, $sp, 0x18 -/* 96B8FC 8024273C 27A6001C */ addiu $a2, $sp, 0x1c -/* 96B900 80242740 27A70020 */ addiu $a3, $sp, 0x20 -/* 96B904 80242744 27A20024 */ addiu $v0, $sp, 0x24 -/* 96B908 80242748 0C090885 */ jal func_80242214 -/* 96B90C 8024274C AFA20010 */ sw $v0, 0x10($sp) -/* 96B910 80242750 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 96B914 80242754 3C0141A0 */ lui $at, 0x41a0 -/* 96B918 80242758 44810000 */ mtc1 $at, $f0 -/* 96B91C 8024275C 00000000 */ nop -/* 96B920 80242760 46001080 */ add.s $f2, $f2, $f0 -/* 96B924 80242764 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 96B928 80242768 44050000 */ mfc1 $a1, $f0 -/* 96B92C 8024276C 44061000 */ mfc1 $a2, $f2 -/* 96B930 80242770 C7A20020 */ lwc1 $f2, 0x20($sp) -/* 96B934 80242774 3C0141F0 */ lui $at, 0x41f0 -/* 96B938 80242778 44810000 */ mtc1 $at, $f0 -/* 96B93C 8024277C 44071000 */ mfc1 $a3, $f2 -/* 96B940 80242780 0000202D */ daddu $a0, $zero, $zero -/* 96B944 80242784 0C01BFBC */ jal func_8006FEF0 -/* 96B948 80242788 E7A00010 */ swc1 $f0, 0x10($sp) -.L8024278C: -/* 96B94C 8024278C 8E030000 */ lw $v1, ($s0) -/* 96B950 80242790 2402000A */ addiu $v0, $zero, 0xa -/* 96B954 80242794 146201BF */ bne $v1, $v0, .L80242E94 -/* 96B958 80242798 24060006 */ addiu $a2, $zero, 6 -/* 96B95C 8024279C 3C05F4AC */ lui $a1, 0xf4ac -/* 96B960 802427A0 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96B964 802427A4 3C048025 */ lui $a0, 0x8025 -/* 96B968 802427A8 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96B96C 802427AC 0C0B2026 */ jal set_variable -/* 96B970 802427B0 AE000000 */ sw $zero, ($s0) -/* 96B974 802427B4 24040203 */ addiu $a0, $zero, 0x203 -/* 96B978 802427B8 0000282D */ daddu $a1, $zero, $zero -/* 96B97C 802427BC 08090A26 */ j .L80242898 -/* 96B980 802427C0 24060040 */ addiu $a2, $zero, 0x40 -/* 96B984 802427C4 3C028025 */ lui $v0, 0x8025 -/* 96B988 802427C8 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96B98C 802427CC C4420010 */ lwc1 $f2, 0x10($v0) -/* 96B990 802427D0 3C014190 */ lui $at, 0x4190 -/* 96B994 802427D4 44812000 */ mtc1 $at, $f4 -/* 96B998 802427D8 3C108025 */ lui $s0, 0x8025 -/* 96B99C 802427DC 2610EF88 */ addiu $s0, $s0, -0x1078 -/* 96B9A0 802427E0 AC400034 */ sw $zero, 0x34($v0) -/* 96B9A4 802427E4 8E030000 */ lw $v1, ($s0) -/* 96B9A8 802427E8 46041080 */ add.s $f2, $f2, $f4 -/* 96B9AC 802427EC C4400058 */ lwc1 $f0, 0x58($v0) -/* 96B9B0 802427F0 24630001 */ addiu $v1, $v1, 1 -/* 96B9B4 802427F4 46040000 */ add.s $f0, $f0, $f4 -/* 96B9B8 802427F8 AE030000 */ sw $v1, ($s0) -/* 96B9BC 802427FC E4420010 */ swc1 $f2, 0x10($v0) -/* 96B9C0 80242800 E4400058 */ swc1 $f0, 0x58($v0) -/* 96B9C4 80242804 24020008 */ addiu $v0, $zero, 8 -/* 96B9C8 80242808 14620016 */ bne $v1, $v0, .L80242864 -/* 96B9CC 8024280C 24040002 */ addiu $a0, $zero, 2 -/* 96B9D0 80242810 27A50028 */ addiu $a1, $sp, 0x28 -/* 96B9D4 80242814 27A6002C */ addiu $a2, $sp, 0x2c -/* 96B9D8 80242818 27A70030 */ addiu $a3, $sp, 0x30 -/* 96B9DC 8024281C 27A20034 */ addiu $v0, $sp, 0x34 -/* 96B9E0 80242820 0C090885 */ jal func_80242214 -/* 96B9E4 80242824 AFA20010 */ sw $v0, 0x10($sp) -/* 96B9E8 80242828 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 96B9EC 8024282C 3C0141A0 */ lui $at, 0x41a0 -/* 96B9F0 80242830 44810000 */ mtc1 $at, $f0 -/* 96B9F4 80242834 00000000 */ nop -/* 96B9F8 80242838 46001080 */ add.s $f2, $f2, $f0 -/* 96B9FC 8024283C C7A00028 */ lwc1 $f0, 0x28($sp) -/* 96BA00 80242840 44050000 */ mfc1 $a1, $f0 -/* 96BA04 80242844 44061000 */ mfc1 $a2, $f2 -/* 96BA08 80242848 C7A20030 */ lwc1 $f2, 0x30($sp) -/* 96BA0C 8024284C 3C0141F0 */ lui $at, 0x41f0 -/* 96BA10 80242850 44810000 */ mtc1 $at, $f0 -/* 96BA14 80242854 44071000 */ mfc1 $a3, $f2 -/* 96BA18 80242858 0000202D */ daddu $a0, $zero, $zero -/* 96BA1C 8024285C 0C01BFBC */ jal func_8006FEF0 -/* 96BA20 80242860 E7A00010 */ swc1 $f0, 0x10($sp) -.L80242864: -/* 96BA24 80242864 8E030000 */ lw $v1, ($s0) -/* 96BA28 80242868 2402000A */ addiu $v0, $zero, 0xa -/* 96BA2C 8024286C 14620189 */ bne $v1, $v0, .L80242E94 -/* 96BA30 80242870 24060007 */ addiu $a2, $zero, 7 -/* 96BA34 80242874 3C05F4AC */ lui $a1, 0xf4ac -/* 96BA38 80242878 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BA3C 8024287C 3C048025 */ lui $a0, 0x8025 -/* 96BA40 80242880 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96BA44 80242884 0C0B2026 */ jal set_variable -/* 96BA48 80242888 AE000000 */ sw $zero, ($s0) -/* 96BA4C 8024288C 24040203 */ addiu $a0, $zero, 0x203 -/* 96BA50 80242890 0000282D */ daddu $a1, $zero, $zero -/* 96BA54 80242894 24060068 */ addiu $a2, $zero, 0x68 -.L80242898: -/* 96BA58 80242898 0C0526AE */ jal _play_sound -/* 96BA5C 8024289C 00A0382D */ daddu $a3, $a1, $zero -/* 96BA60 802428A0 08090BA5 */ j .L80242E94 -/* 96BA64 802428A4 00000000 */ nop -/* 96BA68 802428A8 3C028025 */ lui $v0, 0x8025 -/* 96BA6C 802428AC 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96BA70 802428B0 C4420034 */ lwc1 $f2, 0x34($v0) -/* 96BA74 802428B4 3C014190 */ lui $at, 0x4190 -/* 96BA78 802428B8 44812000 */ mtc1 $at, $f4 -/* 96BA7C 802428BC 3C108025 */ lui $s0, 0x8025 -/* 96BA80 802428C0 2610EF88 */ addiu $s0, $s0, -0x1078 -/* 96BA84 802428C4 AC400010 */ sw $zero, 0x10($v0) -/* 96BA88 802428C8 8E030000 */ lw $v1, ($s0) -/* 96BA8C 802428CC 46041080 */ add.s $f2, $f2, $f4 -/* 96BA90 802428D0 C4400058 */ lwc1 $f0, 0x58($v0) -/* 96BA94 802428D4 24630001 */ addiu $v1, $v1, 1 -/* 96BA98 802428D8 46040000 */ add.s $f0, $f0, $f4 -/* 96BA9C 802428DC AE030000 */ sw $v1, ($s0) -/* 96BAA0 802428E0 E4420034 */ swc1 $f2, 0x34($v0) -/* 96BAA4 802428E4 E4400058 */ swc1 $f0, 0x58($v0) -/* 96BAA8 802428E8 24020008 */ addiu $v0, $zero, 8 -/* 96BAAC 802428EC 14620016 */ bne $v1, $v0, .L80242948 -/* 96BAB0 802428F0 24040001 */ addiu $a0, $zero, 1 -/* 96BAB4 802428F4 27A50038 */ addiu $a1, $sp, 0x38 -/* 96BAB8 802428F8 27A6003C */ addiu $a2, $sp, 0x3c -/* 96BABC 802428FC 27A70040 */ addiu $a3, $sp, 0x40 -/* 96BAC0 80242900 27A20044 */ addiu $v0, $sp, 0x44 -/* 96BAC4 80242904 0C090885 */ jal func_80242214 -/* 96BAC8 80242908 AFA20010 */ sw $v0, 0x10($sp) -/* 96BACC 8024290C C7A2003C */ lwc1 $f2, 0x3c($sp) -/* 96BAD0 80242910 3C0141A0 */ lui $at, 0x41a0 -/* 96BAD4 80242914 44810000 */ mtc1 $at, $f0 -/* 96BAD8 80242918 00000000 */ nop -/* 96BADC 8024291C 46001080 */ add.s $f2, $f2, $f0 -/* 96BAE0 80242920 C7A00038 */ lwc1 $f0, 0x38($sp) -/* 96BAE4 80242924 44050000 */ mfc1 $a1, $f0 -/* 96BAE8 80242928 44061000 */ mfc1 $a2, $f2 -/* 96BAEC 8024292C C7A20040 */ lwc1 $f2, 0x40($sp) -/* 96BAF0 80242930 3C0141F0 */ lui $at, 0x41f0 -/* 96BAF4 80242934 44810000 */ mtc1 $at, $f0 -/* 96BAF8 80242938 44071000 */ mfc1 $a3, $f2 -/* 96BAFC 8024293C 0000202D */ daddu $a0, $zero, $zero -/* 96BB00 80242940 0C01BFBC */ jal func_8006FEF0 -/* 96BB04 80242944 E7A00010 */ swc1 $f0, 0x10($sp) -.L80242948: -/* 96BB08 80242948 8E030000 */ lw $v1, ($s0) -/* 96BB0C 8024294C 2402000A */ addiu $v0, $zero, 0xa -/* 96BB10 80242950 14620150 */ bne $v1, $v0, .L80242E94 -/* 96BB14 80242954 24060008 */ addiu $a2, $zero, 8 -/* 96BB18 80242958 3C05F4AC */ lui $a1, 0xf4ac -/* 96BB1C 8024295C 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BB20 80242960 3C048025 */ lui $a0, 0x8025 -/* 96BB24 80242964 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96BB28 80242968 0C0B2026 */ jal set_variable -/* 96BB2C 8024296C AE000000 */ sw $zero, ($s0) -/* 96BB30 80242970 08090BA5 */ j .L80242E94 -/* 96BB34 80242974 00000000 */ nop -/* 96BB38 80242978 3C028025 */ lui $v0, 0x8025 -/* 96BB3C 8024297C 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96BB40 80242980 C4400034 */ lwc1 $f0, 0x34($v0) -/* 96BB44 80242984 3C014190 */ lui $at, 0x4190 -/* 96BB48 80242988 44811000 */ mtc1 $at, $f2 -/* 96BB4C 8024298C 3C078025 */ lui $a3, 0x8025 -/* 96BB50 80242990 24E7EF88 */ addiu $a3, $a3, -0x1078 -/* 96BB54 80242994 AC400010 */ sw $zero, 0x10($v0) -/* 96BB58 80242998 AC400058 */ sw $zero, 0x58($v0) -/* 96BB5C 8024299C 8CE30000 */ lw $v1, ($a3) -/* 96BB60 802429A0 46020000 */ add.s $f0, $f0, $f2 -/* 96BB64 802429A4 24630001 */ addiu $v1, $v1, 1 -/* 96BB68 802429A8 ACE30000 */ sw $v1, ($a3) -/* 96BB6C 802429AC E4400034 */ swc1 $f0, 0x34($v0) -/* 96BB70 802429B0 2402000A */ addiu $v0, $zero, 0xa -/* 96BB74 802429B4 14620137 */ bne $v1, $v0, .L80242E94 -/* 96BB78 802429B8 24060009 */ addiu $a2, $zero, 9 -/* 96BB7C 802429BC 3C05F4AC */ lui $a1, 0xf4ac -/* 96BB80 802429C0 3C048025 */ lui $a0, 0x8025 -/* 96BB84 802429C4 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96BB88 802429C8 08090A91 */ j .L80242A44 -/* 96BB8C 802429CC 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BB90 802429D0 3C028025 */ lui $v0, 0x8025 -/* 96BB94 802429D4 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96BB98 802429D8 C4420004 */ lwc1 $f2, 4($v0) -/* 96BB9C 802429DC 3C014120 */ lui $at, 0x4120 -/* 96BBA0 802429E0 44812000 */ mtc1 $at, $f4 -/* 96BBA4 802429E4 3C078025 */ lui $a3, 0x8025 -/* 96BBA8 802429E8 24E7EF88 */ addiu $a3, $a3, -0x1078 -/* 96BBAC 802429EC AC400008 */ sw $zero, 8($v0) -/* 96BBB0 802429F0 AC400010 */ sw $zero, 0x10($v0) -/* 96BBB4 802429F4 AC40002C */ sw $zero, 0x2c($v0) -/* 96BBB8 802429F8 AC400034 */ sw $zero, 0x34($v0) -/* 96BBBC 802429FC AC40004C */ sw $zero, 0x4c($v0) -/* 96BBC0 80242A00 AC400050 */ sw $zero, 0x50($v0) -/* 96BBC4 80242A04 AC400058 */ sw $zero, 0x58($v0) -/* 96BBC8 80242A08 8CE30000 */ lw $v1, ($a3) -/* 96BBCC 80242A0C 46041080 */ add.s $f2, $f2, $f4 -/* 96BBD0 80242A10 C4400028 */ lwc1 $f0, 0x28($v0) -/* 96BBD4 80242A14 24630001 */ addiu $v1, $v1, 1 -/* 96BBD8 80242A18 46040001 */ sub.s $f0, $f0, $f4 -/* 96BBDC 80242A1C ACE30000 */ sw $v1, ($a3) -/* 96BBE0 80242A20 E4420004 */ swc1 $f2, 4($v0) -/* 96BBE4 80242A24 E4400028 */ swc1 $f0, 0x28($v0) -/* 96BBE8 80242A28 2402000A */ addiu $v0, $zero, 0xa -/* 96BBEC 80242A2C 14620119 */ bne $v1, $v0, .L80242E94 -/* 96BBF0 80242A30 0040302D */ daddu $a2, $v0, $zero -/* 96BBF4 80242A34 3C05F4AC */ lui $a1, 0xf4ac -/* 96BBF8 80242A38 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BBFC 80242A3C 3C048025 */ lui $a0, 0x8025 -/* 96BC00 80242A40 8C84EFCC */ lw $a0, -0x1034($a0) -.L80242A44: -/* 96BC04 80242A44 0C0B2026 */ jal set_variable -/* 96BC08 80242A48 ACE00000 */ sw $zero, ($a3) -/* 96BC0C 80242A4C 08090BA5 */ j .L80242E94 -/* 96BC10 80242A50 00000000 */ nop -/* 96BC14 80242A54 3C038025 */ lui $v1, 0x8025 -/* 96BC18 80242A58 2463F010 */ addiu $v1, $v1, -0xff0 -/* 96BC1C 80242A5C 24020003 */ addiu $v0, $zero, 3 -/* 96BC20 80242A60 AC620000 */ sw $v0, ($v1) -/* 96BC24 80242A64 24020008 */ addiu $v0, $zero, 8 -/* 96BC28 80242A68 AC620018 */ sw $v0, 0x18($v1) -/* 96BC2C 80242A6C 24020011 */ addiu $v0, $zero, 0x11 -/* 96BC30 80242A70 AC600024 */ sw $zero, 0x24($v1) -/* 96BC34 80242A74 AC600048 */ sw $zero, 0x48($v1) -/* 96BC38 80242A78 08090BA5 */ j .L80242E94 -/* 96BC3C 80242A7C AC62001C */ sw $v0, 0x1c($v1) -/* 96BC40 80242A80 3C05F4AC */ lui $a1, 0xf4ac -/* 96BC44 80242A84 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BC48 80242A88 2406000C */ addiu $a2, $zero, 0xc -/* 96BC4C 80242A8C 3C118025 */ lui $s1, 0x8025 -/* 96BC50 80242A90 2631EF90 */ addiu $s1, $s1, -0x1070 -/* 96BC54 80242A94 0220802D */ daddu $s0, $s1, $zero -/* 96BC58 80242A98 3C028025 */ lui $v0, 0x8025 -/* 96BC5C 80242A9C 2442F010 */ addiu $v0, $v0, -0xff0 -/* 96BC60 80242AA0 3C048025 */ lui $a0, 0x8025 -/* 96BC64 80242AA4 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96BC68 80242AA8 3C018025 */ lui $at, 0x8025 -/* 96BC6C 80242AAC D434EF58 */ ldc1 $f20, -0x10a8($at) -/* 96BC70 80242AB0 3C014288 */ lui $at, 0x4288 -/* 96BC74 80242AB4 44810000 */ mtc1 $at, $f0 -/* 96BC78 80242AB8 3C014334 */ lui $at, 0x4334 -/* 96BC7C 80242ABC 44811000 */ mtc1 $at, $f2 -/* 96BC80 80242AC0 24030004 */ addiu $v1, $zero, 4 -/* 96BC84 80242AC4 AC430000 */ sw $v1, ($v0) -/* 96BC88 80242AC8 24030005 */ addiu $v1, $zero, 5 -/* 96BC8C 80242ACC AC430024 */ sw $v1, 0x24($v0) -/* 96BC90 80242AD0 24030008 */ addiu $v1, $zero, 8 -/* 96BC94 80242AD4 AC43003C */ sw $v1, 0x3c($v0) -/* 96BC98 80242AD8 2403000A */ addiu $v1, $zero, 0xa -/* 96BC9C 80242ADC AC400004 */ sw $zero, 4($v0) -/* 96BCA0 80242AE0 AC40000C */ sw $zero, 0xc($v0) -/* 96BCA4 80242AE4 AC400028 */ sw $zero, 0x28($v0) -/* 96BCA8 80242AE8 AC400030 */ sw $zero, 0x30($v0) -/* 96BCAC 80242AEC AC430040 */ sw $v1, 0x40($v0) -/* 96BCB0 80242AF0 AC400044 */ sw $zero, 0x44($v0) -/* 96BCB4 80242AF4 3C018025 */ lui $at, 0x8025 -/* 96BCB8 80242AF8 AC20EF88 */ sw $zero, -0x1078($at) -/* 96BCBC 80242AFC E4400008 */ swc1 $f0, 8($v0) -/* 96BCC0 80242B00 E4420010 */ swc1 $f2, 0x10($v0) -/* 96BCC4 80242B04 E440002C */ swc1 $f0, 0x2c($v0) -/* 96BCC8 80242B08 0C0B2026 */ jal set_variable -/* 96BCCC 80242B0C E4420034 */ swc1 $f2, 0x34($v0) -/* 96BCD0 80242B10 24040001 */ addiu $a0, $zero, 1 -/* 96BCD4 80242B14 27A50048 */ addiu $a1, $sp, 0x48 -/* 96BCD8 80242B18 27A6004C */ addiu $a2, $sp, 0x4c -/* 96BCDC 80242B1C 3C013F80 */ lui $at, 0x3f80 -/* 96BCE0 80242B20 44810000 */ mtc1 $at, $f0 -/* 96BCE4 80242B24 27A20054 */ addiu $v0, $sp, 0x54 -/* 96BCE8 80242B28 3C018025 */ lui $at, 0x8025 -/* 96BCEC 80242B2C AC20EF80 */ sw $zero, -0x1080($at) -/* 96BCF0 80242B30 AFA20010 */ sw $v0, 0x10($sp) -/* 96BCF4 80242B34 3C018025 */ lui $at, 0x8025 -/* 96BCF8 80242B38 E420EF84 */ swc1 $f0, -0x107c($at) -/* 96BCFC 80242B3C 0C090885 */ jal func_80242214 -/* 96BD00 80242B40 27A70050 */ addiu $a3, $sp, 0x50 -.L80242B44: -/* 96BD04 80242B44 C7A2004C */ lwc1 $f2, 0x4c($sp) -/* 96BD08 80242B48 3C0141A0 */ lui $at, 0x41a0 -/* 96BD0C 80242B4C 44810000 */ mtc1 $at, $f0 -/* 96BD10 80242B50 00000000 */ nop -/* 96BD14 80242B54 46001080 */ add.s $f2, $f2, $f0 -/* 96BD18 80242B58 C7A00048 */ lwc1 $f0, 0x48($sp) -/* 96BD1C 80242B5C 24040002 */ addiu $a0, $zero, 2 -/* 96BD20 80242B60 44050000 */ mfc1 $a1, $f0 -/* 96BD24 80242B64 44061000 */ mfc1 $a2, $f2 -/* 96BD28 80242B68 C7A20050 */ lwc1 $f2, 0x50($sp) -/* 96BD2C 80242B6C 3C014100 */ lui $at, 0x4100 -/* 96BD30 80242B70 44810000 */ mtc1 $at, $f0 -/* 96BD34 80242B74 44071000 */ mfc1 $a3, $f2 -/* 96BD38 80242B78 2402FFFF */ addiu $v0, $zero, -1 -/* 96BD3C 80242B7C AFA20014 */ sw $v0, 0x14($sp) -/* 96BD40 80242B80 0C01C82C */ jal func_800720B0 -/* 96BD44 80242B84 E7A00010 */ swc1 $f0, 0x10($sp) -/* 96BD48 80242B88 AE020000 */ sw $v0, ($s0) -/* 96BD4C 80242B8C 8C43000C */ lw $v1, 0xc($v0) -/* 96BD50 80242B90 240200D7 */ addiu $v0, $zero, 0xd7 -/* 96BD54 80242B94 AC620028 */ sw $v0, 0x28($v1) -/* 96BD58 80242B98 8E020000 */ lw $v0, ($s0) -/* 96BD5C 80242B9C 8C43000C */ lw $v1, 0xc($v0) -/* 96BD60 80242BA0 24020037 */ addiu $v0, $zero, 0x37 -/* 96BD64 80242BA4 AC62002C */ sw $v0, 0x2c($v1) -/* 96BD68 80242BA8 8E020000 */ lw $v0, ($s0) -/* 96BD6C 80242BAC 8C43000C */ lw $v1, 0xc($v0) -/* 96BD70 80242BB0 240200FF */ addiu $v0, $zero, 0xff -/* 96BD74 80242BB4 AC620030 */ sw $v0, 0x30($v1) -/* 96BD78 80242BB8 8E020000 */ lw $v0, ($s0) -/* 96BD7C 80242BBC 8C420008 */ lw $v0, 8($v0) -/* 96BD80 80242BC0 24040001 */ addiu $a0, $zero, 1 -/* 96BD84 80242BC4 0082102A */ slt $v0, $a0, $v0 -/* 96BD88 80242BC8 50400012 */ beql $v0, $zero, .L80242C14 -/* 96BD8C 80242BCC 26100004 */ addiu $s0, $s0, 4 -/* 96BD90 80242BD0 24030048 */ addiu $v1, $zero, 0x48 -.L80242BD4: -/* 96BD94 80242BD4 8E020000 */ lw $v0, ($s0) -/* 96BD98 80242BD8 8C42000C */ lw $v0, 0xc($v0) -/* 96BD9C 80242BDC 00621021 */ addu $v0, $v1, $v0 -/* 96BDA0 80242BE0 C4400038 */ lwc1 $f0, 0x38($v0) -/* 96BDA4 80242BE4 46000021 */ cvt.d.s $f0, $f0 -/* 96BDA8 80242BE8 46340002 */ mul.d $f0, $f0, $f20 -/* 96BDAC 80242BEC 00000000 */ nop -/* 96BDB0 80242BF0 46200020 */ cvt.s.d $f0, $f0 -/* 96BDB4 80242BF4 E4400038 */ swc1 $f0, 0x38($v0) -/* 96BDB8 80242BF8 8E020000 */ lw $v0, ($s0) -/* 96BDBC 80242BFC 24840001 */ addiu $a0, $a0, 1 -/* 96BDC0 80242C00 8C420008 */ lw $v0, 8($v0) -/* 96BDC4 80242C04 0082102A */ slt $v0, $a0, $v0 -/* 96BDC8 80242C08 1440FFF2 */ bnez $v0, .L80242BD4 -/* 96BDCC 80242C0C 24630048 */ addiu $v1, $v1, 0x48 -/* 96BDD0 80242C10 26100004 */ addiu $s0, $s0, 4 -.L80242C14: -/* 96BDD4 80242C14 26220010 */ addiu $v0, $s1, 0x10 -/* 96BDD8 80242C18 0202102A */ slt $v0, $s0, $v0 -/* 96BDDC 80242C1C 1040009D */ beqz $v0, .L80242E94 -/* 96BDE0 80242C20 00000000 */ nop -/* 96BDE4 80242C24 08090AD1 */ j .L80242B44 -/* 96BDE8 80242C28 00000000 */ nop -/* 96BDEC 80242C2C 24040001 */ addiu $a0, $zero, 1 -/* 96BDF0 80242C30 27A50058 */ addiu $a1, $sp, 0x58 -/* 96BDF4 80242C34 27A6005C */ addiu $a2, $sp, 0x5c -/* 96BDF8 80242C38 27A70060 */ addiu $a3, $sp, 0x60 -/* 96BDFC 80242C3C 27A20064 */ addiu $v0, $sp, 0x64 -/* 96BE00 80242C40 0C090885 */ jal func_80242214 -/* 96BE04 80242C44 AFA20010 */ sw $v0, 0x10($sp) -/* 96BE08 80242C48 3C028025 */ lui $v0, 0x8025 -/* 96BE0C 80242C4C 2442EF90 */ addiu $v0, $v0, -0x1070 -/* 96BE10 80242C50 0040282D */ daddu $a1, $v0, $zero -/* 96BE14 80242C54 24A70010 */ addiu $a3, $a1, 0x10 -/* 96BE18 80242C58 C7AA0058 */ lwc1 $f10, 0x58($sp) -/* 96BE1C 80242C5C C7A80060 */ lwc1 $f8, 0x60($sp) -/* 96BE20 80242C60 3C018025 */ lui $at, 0x8025 -/* 96BE24 80242C64 D424EF60 */ ldc1 $f4, -0x10a0($at) -/* 96BE28 80242C68 3C013DCC */ lui $at, 0x3dcc -/* 96BE2C 80242C6C 3421CCCD */ ori $at, $at, 0xcccd -/* 96BE30 80242C70 44816000 */ mtc1 $at, $f12 -/* 96BE34 80242C74 C7A2005C */ lwc1 $f2, 0x5c($sp) -/* 96BE38 80242C78 3C0141A0 */ lui $at, 0x41a0 -/* 96BE3C 80242C7C 44810000 */ mtc1 $at, $f0 -/* 96BE40 80242C80 3C018025 */ lui $at, 0x8025 -/* 96BE44 80242C84 D426EF68 */ ldc1 $f6, -0x1098($at) -/* 96BE48 80242C88 46001080 */ add.s $f2, $f2, $f0 -.L80242C8C: -/* 96BE4C 80242C8C 8CA20000 */ lw $v0, ($a1) -/* 96BE50 80242C90 8C42000C */ lw $v0, 0xc($v0) -/* 96BE54 80242C94 E44A0004 */ swc1 $f10, 4($v0) -/* 96BE58 80242C98 8CA20000 */ lw $v0, ($a1) -/* 96BE5C 80242C9C 8C42000C */ lw $v0, 0xc($v0) -/* 96BE60 80242CA0 E4420008 */ swc1 $f2, 8($v0) -/* 96BE64 80242CA4 8CA20000 */ lw $v0, ($a1) -/* 96BE68 80242CA8 8C42000C */ lw $v0, 0xc($v0) -/* 96BE6C 80242CAC E448000C */ swc1 $f8, 0xc($v0) -/* 96BE70 80242CB0 8CA20000 */ lw $v0, ($a1) -/* 96BE74 80242CB4 8C42000C */ lw $v0, 0xc($v0) -/* 96BE78 80242CB8 C4400034 */ lwc1 $f0, 0x34($v0) -/* 96BE7C 80242CBC 46000021 */ cvt.d.s $f0, $f0 -/* 96BE80 80242CC0 46240001 */ sub.d $f0, $f0, $f4 -/* 96BE84 80242CC4 46200020 */ cvt.s.d $f0, $f0 -/* 96BE88 80242CC8 E4400034 */ swc1 $f0, 0x34($v0) -/* 96BE8C 80242CCC 8CA20000 */ lw $v0, ($a1) -/* 96BE90 80242CD0 8C42000C */ lw $v0, 0xc($v0) -/* 96BE94 80242CD4 C4400034 */ lwc1 $f0, 0x34($v0) -/* 96BE98 80242CD8 46000021 */ cvt.d.s $f0, $f0 -/* 96BE9C 80242CDC 4624003C */ c.lt.d $f0, $f4 -/* 96BEA0 80242CE0 00000000 */ nop -/* 96BEA4 80242CE4 45030001 */ bc1tl .L80242CEC -/* 96BEA8 80242CE8 E44C0034 */ swc1 $f12, 0x34($v0) -.L80242CEC: -/* 96BEAC 80242CEC 8CA20000 */ lw $v0, ($a1) -/* 96BEB0 80242CF0 8C420008 */ lw $v0, 8($v0) -/* 96BEB4 80242CF4 24040001 */ addiu $a0, $zero, 1 -/* 96BEB8 80242CF8 0082102A */ slt $v0, $a0, $v0 -/* 96BEBC 80242CFC 50400012 */ beql $v0, $zero, .L80242D48 -/* 96BEC0 80242D00 24A50004 */ addiu $a1, $a1, 4 -/* 96BEC4 80242D04 00A0302D */ daddu $a2, $a1, $zero -/* 96BEC8 80242D08 24030048 */ addiu $v1, $zero, 0x48 -.L80242D0C: -/* 96BECC 80242D0C 8CC20000 */ lw $v0, ($a2) -/* 96BED0 80242D10 8C42000C */ lw $v0, 0xc($v0) -/* 96BED4 80242D14 00621021 */ addu $v0, $v1, $v0 -/* 96BED8 80242D18 C4400038 */ lwc1 $f0, 0x38($v0) -/* 96BEDC 80242D1C 46000021 */ cvt.d.s $f0, $f0 -/* 96BEE0 80242D20 46260000 */ add.d $f0, $f0, $f6 -/* 96BEE4 80242D24 46200020 */ cvt.s.d $f0, $f0 -/* 96BEE8 80242D28 E4400038 */ swc1 $f0, 0x38($v0) -/* 96BEEC 80242D2C 8CC20000 */ lw $v0, ($a2) -/* 96BEF0 80242D30 24840001 */ addiu $a0, $a0, 1 -/* 96BEF4 80242D34 8C420008 */ lw $v0, 8($v0) -/* 96BEF8 80242D38 0082102A */ slt $v0, $a0, $v0 -/* 96BEFC 80242D3C 1440FFF3 */ bnez $v0, .L80242D0C -/* 96BF00 80242D40 24630048 */ addiu $v1, $v1, 0x48 -/* 96BF04 80242D44 24A50004 */ addiu $a1, $a1, 4 -.L80242D48: -/* 96BF08 80242D48 00A7102A */ slt $v0, $a1, $a3 -/* 96BF0C 80242D4C 1440FFCF */ bnez $v0, .L80242C8C -/* 96BF10 80242D50 00000000 */ nop -/* 96BF14 80242D54 3C108025 */ lui $s0, 0x8025 -/* 96BF18 80242D58 2610F010 */ addiu $s0, $s0, -0xff0 -/* 96BF1C 80242D5C 3C048025 */ lui $a0, 0x8025 -/* 96BF20 80242D60 2484EF80 */ addiu $a0, $a0, -0x1080 -/* 96BF24 80242D64 3C038025 */ lui $v1, 0x8025 -/* 96BF28 80242D68 2463EF84 */ addiu $v1, $v1, -0x107c -/* 96BF2C 80242D6C 3C078025 */ lui $a3, 0x8025 -/* 96BF30 80242D70 24E7EF88 */ addiu $a3, $a3, -0x1078 -/* 96BF34 80242D74 C6060008 */ lwc1 $f6, 8($s0) -/* 96BF38 80242D78 C4820000 */ lwc1 $f2, ($a0) -/* 96BF3C 80242D7C C604002C */ lwc1 $f4, 0x2c($s0) -/* 96BF40 80242D80 C4600000 */ lwc1 $f0, ($v1) -/* 96BF44 80242D84 46023180 */ add.s $f6, $f6, $f2 -/* 96BF48 80242D88 8CE20000 */ lw $v0, ($a3) -/* 96BF4C 80242D8C 3C01C0A0 */ lui $at, 0xc0a0 -/* 96BF50 80242D90 44814000 */ mtc1 $at, $f8 -/* 96BF54 80242D94 46002100 */ add.s $f4, $f4, $f0 -/* 96BF58 80242D98 24420001 */ addiu $v0, $v0, 1 -/* 96BF5C 80242D9C ACE20000 */ sw $v0, ($a3) -/* 96BF60 80242DA0 4608203C */ c.lt.s $f4, $f8 -/* 96BF64 80242DA4 E604002C */ swc1 $f4, 0x2c($s0) -/* 96BF68 80242DA8 3C018025 */ lui $at, 0x8025 -/* 96BF6C 80242DAC D424EF70 */ ldc1 $f4, -0x1090($at) -/* 96BF70 80242DB0 460010A1 */ cvt.d.s $f2, $f2 -/* 96BF74 80242DB4 46241080 */ add.d $f2, $f2, $f4 -/* 96BF78 80242DB8 3C018025 */ lui $at, 0x8025 -/* 96BF7C 80242DBC D424EF78 */ ldc1 $f4, -0x1088($at) -/* 96BF80 80242DC0 46000021 */ cvt.d.s $f0, $f0 -/* 96BF84 80242DC4 E6060008 */ swc1 $f6, 8($s0) -/* 96BF88 80242DC8 46240001 */ sub.d $f0, $f0, $f4 -/* 96BF8C 80242DCC 462010A0 */ cvt.s.d $f2, $f2 -/* 96BF90 80242DD0 E4820000 */ swc1 $f2, ($a0) -/* 96BF94 80242DD4 46200020 */ cvt.s.d $f0, $f0 -/* 96BF98 80242DD8 4500002E */ bc1f .L80242E94 -/* 96BF9C 80242DDC E4600000 */ swc1 $f0, ($v1) -/* 96BFA0 80242DE0 3C05F4AC */ lui $a1, 0xf4ac -/* 96BFA4 80242DE4 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96BFA8 80242DE8 3C048025 */ lui $a0, 0x8025 -/* 96BFAC 80242DEC 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96BFB0 80242DF0 2406000D */ addiu $a2, $zero, 0xd -/* 96BFB4 80242DF4 E608002C */ swc1 $f8, 0x2c($s0) -/* 96BFB8 80242DF8 0C0B2026 */ jal set_variable -/* 96BFBC 80242DFC ACE00000 */ sw $zero, ($a3) -/* 96BFC0 80242E00 24040001 */ addiu $a0, $zero, 1 -/* 96BFC4 80242E04 27A50068 */ addiu $a1, $sp, 0x68 -/* 96BFC8 80242E08 27A6006C */ addiu $a2, $sp, 0x6c -/* 96BFCC 80242E0C 27A70070 */ addiu $a3, $sp, 0x70 -/* 96BFD0 80242E10 27A20074 */ addiu $v0, $sp, 0x74 -/* 96BFD4 80242E14 AE000000 */ sw $zero, ($s0) -/* 96BFD8 80242E18 AE000024 */ sw $zero, 0x24($s0) -/* 96BFDC 80242E1C 0C090885 */ jal func_80242214 -/* 96BFE0 80242E20 AFA20010 */ sw $v0, 0x10($sp) -/* 96BFE4 80242E24 C7A2006C */ lwc1 $f2, 0x6c($sp) -/* 96BFE8 80242E28 3C0141A0 */ lui $at, 0x41a0 -/* 96BFEC 80242E2C 44810000 */ mtc1 $at, $f0 -/* 96BFF0 80242E30 00000000 */ nop -/* 96BFF4 80242E34 46001080 */ add.s $f2, $f2, $f0 -/* 96BFF8 80242E38 C7A00068 */ lwc1 $f0, 0x68($sp) -/* 96BFFC 80242E3C 44050000 */ mfc1 $a1, $f0 -/* 96C000 80242E40 44061000 */ mfc1 $a2, $f2 -/* 96C004 80242E44 C7A20070 */ lwc1 $f2, 0x70($sp) -/* 96C008 80242E48 3C0141F0 */ lui $at, 0x41f0 -/* 96C00C 80242E4C 44810000 */ mtc1 $at, $f0 -/* 96C010 80242E50 44071000 */ mfc1 $a3, $f2 -/* 96C014 80242E54 0000202D */ daddu $a0, $zero, $zero -/* 96C018 80242E58 0C01BFBC */ jal func_8006FEF0 -/* 96C01C 80242E5C E7A00010 */ swc1 $f0, 0x10($sp) -/* 96C020 80242E60 0C05272D */ jal play_sound -/* 96C024 80242E64 24040206 */ addiu $a0, $zero, 0x206 -/* 96C028 80242E68 0000282D */ daddu $a1, $zero, $zero -/* 96C02C 80242E6C 3C048025 */ lui $a0, 0x8025 -/* 96C030 80242E70 2484EF90 */ addiu $a0, $a0, -0x1070 -.L80242E74: -/* 96C034 80242E74 8C820000 */ lw $v0, ($a0) -/* 96C038 80242E78 8C430000 */ lw $v1, ($v0) -/* 96C03C 80242E7C 24A50001 */ addiu $a1, $a1, 1 -/* 96C040 80242E80 34630010 */ ori $v1, $v1, 0x10 -/* 96C044 80242E84 AC430000 */ sw $v1, ($v0) -/* 96C048 80242E88 28A20004 */ slti $v0, $a1, 4 -/* 96C04C 80242E8C 1440FFF9 */ bnez $v0, .L80242E74 -/* 96C050 80242E90 24840004 */ addiu $a0, $a0, 4 -.L80242E94: -/* 96C054 80242E94 8FBF0080 */ lw $ra, 0x80($sp) -/* 96C058 80242E98 8FB1007C */ lw $s1, 0x7c($sp) -/* 96C05C 80242E9C 8FB00078 */ lw $s0, 0x78($sp) -/* 96C060 80242EA0 D7B40088 */ ldc1 $f20, 0x88($sp) -/* 96C064 80242EA4 03E00008 */ jr $ra -/* 96C068 80242EA8 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s new file mode 100644 index 0000000000..7edca873aa --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024240C_96B5CC.s @@ -0,0 +1,699 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024240C_96B5CC +/* 96B5CC 8024240C 27BDFF70 */ addiu $sp, $sp, -0x90 +/* 96B5D0 80242410 3C05F4AC */ lui $a1, 0xf4ac +/* 96B5D4 80242414 3C048025 */ lui $a0, 0x8025 +/* 96B5D8 80242418 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96B5DC 8024241C AFBF0080 */ sw $ra, 0x80($sp) +/* 96B5E0 80242420 AFB1007C */ sw $s1, 0x7c($sp) +/* 96B5E4 80242424 AFB00078 */ sw $s0, 0x78($sp) +/* 96B5E8 80242428 F7B40088 */ sdc1 $f20, 0x88($sp) +/* 96B5EC 8024242C 0C0B1EAF */ jal get_variable +/* 96B5F0 80242430 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96B5F4 80242434 0040182D */ daddu $v1, $v0, $zero +/* 96B5F8 80242438 2C62000E */ sltiu $v0, $v1, 0xe +/* 96B5FC 8024243C 10400295 */ beqz $v0, .L80242E94 +/* 96B600 80242440 00031080 */ sll $v0, $v1, 2 +/* 96B604 80242444 3C018025 */ lui $at, 0x8025 +/* 96B608 80242448 00220821 */ addu $at, $at, $v0 +/* 96B60C 8024244C 8C22EF20 */ lw $v0, -0x10e0($at) +/* 96B610 80242450 00400008 */ jr $v0 +/* 96B614 80242454 00000000 */ nop +/* 96B618 80242458 3C05F4AC */ lui $a1, 0xf4ac +/* 96B61C 8024245C 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96B620 80242460 3C048025 */ lui $a0, 0x8025 +/* 96B624 80242464 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96B628 80242468 3C018025 */ lui $at, 0x8025 +/* 96B62C 8024246C AC20EF88 */ sw $zero, -0x1078($at) +/* 96B630 80242470 0C0B2026 */ jal set_variable +/* 96B634 80242474 24060001 */ addiu $a2, $zero, 1 +/* 96B638 80242478 3C028025 */ lui $v0, 0x8025 +/* 96B63C 8024247C 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96B640 80242480 24040001 */ addiu $a0, $zero, 1 +/* 96B644 80242484 3C01C348 */ lui $at, 0xc348 +/* 96B648 80242488 44811000 */ mtc1 $at, $f2 +/* 96B64C 8024248C 3C014348 */ lui $at, 0x4348 +/* 96B650 80242490 44810000 */ mtc1 $at, $f0 +/* 96B654 80242494 3C013F80 */ lui $at, 0x3f80 +/* 96B658 80242498 44812000 */ mtc1 $at, $f4 +/* 96B65C 8024249C 3C014000 */ lui $at, 0x4000 +/* 96B660 802424A0 44813000 */ mtc1 $at, $f6 +/* 96B664 802424A4 2403000C */ addiu $v1, $zero, 0xc +/* 96B668 802424A8 AC43001C */ sw $v1, 0x1c($v0) +/* 96B66C 802424AC 24030002 */ addiu $v1, $zero, 2 +/* 96B670 802424B0 AC430020 */ sw $v1, 0x20($v0) +/* 96B674 802424B4 24030030 */ addiu $v1, $zero, 0x30 +/* 96B678 802424B8 AC430040 */ sw $v1, 0x40($v0) +/* 96B67C 802424BC 24030008 */ addiu $v1, $zero, 8 +/* 96B680 802424C0 AC430060 */ sw $v1, 0x60($v0) +/* 96B684 802424C4 24030005 */ addiu $v1, $zero, 5 +/* 96B688 802424C8 AC430064 */ sw $v1, 0x64($v0) +/* 96B68C 802424CC 24030004 */ addiu $v1, $zero, 4 +/* 96B690 802424D0 AC440000 */ sw $a0, ($v0) +/* 96B694 802424D4 AC400008 */ sw $zero, 8($v0) +/* 96B698 802424D8 AC40000C */ sw $zero, 0xc($v0) +/* 96B69C 802424DC AC400014 */ sw $zero, 0x14($v0) +/* 96B6A0 802424E0 AC400010 */ sw $zero, 0x10($v0) +/* 96B6A4 802424E4 AC440018 */ sw $a0, 0x18($v0) +/* 96B6A8 802424E8 AC440024 */ sw $a0, 0x24($v0) +/* 96B6AC 802424EC AC40002C */ sw $zero, 0x2c($v0) +/* 96B6B0 802424F0 AC400038 */ sw $zero, 0x38($v0) +/* 96B6B4 802424F4 AC400034 */ sw $zero, 0x34($v0) +/* 96B6B8 802424F8 AC44003C */ sw $a0, 0x3c($v0) +/* 96B6BC 802424FC AC400044 */ sw $zero, 0x44($v0) +/* 96B6C0 80242500 AC440048 */ sw $a0, 0x48($v0) +/* 96B6C4 80242504 AC40004C */ sw $zero, 0x4c($v0) +/* 96B6C8 80242508 AC40005C */ sw $zero, 0x5c($v0) +/* 96B6CC 8024250C AC400058 */ sw $zero, 0x58($v0) +/* 96B6D0 80242510 AC430068 */ sw $v1, 0x68($v0) +/* 96B6D4 80242514 E4420004 */ swc1 $f2, 4($v0) +/* 96B6D8 80242518 E4400028 */ swc1 $f0, 0x28($v0) +/* 96B6DC 8024251C E4440030 */ swc1 $f4, 0x30($v0) +/* 96B6E0 80242520 E4400050 */ swc1 $f0, 0x50($v0) +/* 96B6E4 80242524 08090BA5 */ j .L80242E94 +/* 96B6E8 80242528 E4460054 */ swc1 $f6, 0x54($v0) +/* 96B6EC 8024252C 3C028025 */ lui $v0, 0x8025 +/* 96B6F0 80242530 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96B6F4 80242534 3C108025 */ lui $s0, 0x8025 +/* 96B6F8 80242538 2610EF88 */ addiu $s0, $s0, -0x1078 +/* 96B6FC 8024253C C4440004 */ lwc1 $f4, 4($v0) +/* 96B700 80242540 3C014120 */ lui $at, 0x4120 +/* 96B704 80242544 44810000 */ mtc1 $at, $f0 +/* 96B708 80242548 C4420028 */ lwc1 $f2, 0x28($v0) +/* 96B70C 8024254C 46002100 */ add.s $f4, $f4, $f0 +/* 96B710 80242550 3C01C120 */ lui $at, 0xc120 +/* 96B714 80242554 44813000 */ mtc1 $at, $f6 +/* 96B718 80242558 8E030000 */ lw $v1, ($s0) +/* 96B71C 8024255C 46061080 */ add.s $f2, $f2, $f6 +/* 96B720 80242560 C4400050 */ lwc1 $f0, 0x50($v0) +/* 96B724 80242564 24630001 */ addiu $v1, $v1, 1 +/* 96B728 80242568 AE030000 */ sw $v1, ($s0) +/* 96B72C 8024256C 46060000 */ add.s $f0, $f0, $f6 +/* 96B730 80242570 E4440004 */ swc1 $f4, 4($v0) +/* 96B734 80242574 E4420028 */ swc1 $f2, 0x28($v0) +/* 96B738 80242578 E4400050 */ swc1 $f0, 0x50($v0) +/* 96B73C 8024257C 24020012 */ addiu $v0, $zero, 0x12 +/* 96B740 80242580 14620006 */ bne $v1, $v0, .L8024259C +/* 96B744 80242584 00000000 */ nop +/* 96B748 80242588 3C01C47A */ lui $at, 0xc47a +/* 96B74C 8024258C 44810000 */ mtc1 $at, $f0 +/* 96B750 80242590 00000000 */ nop +/* 96B754 80242594 3C018011 */ lui $at, 0x8011 +/* 96B758 80242598 E420EFF4 */ swc1 $f0, -0x100c($at) +.L8024259C: +/* 96B75C 8024259C 8E030000 */ lw $v1, ($s0) +/* 96B760 802425A0 24020014 */ addiu $v0, $zero, 0x14 +/* 96B764 802425A4 1462023B */ bne $v1, $v0, .L80242E94 +/* 96B768 802425A8 00000000 */ nop +/* 96B76C 802425AC 3C05F4AC */ lui $a1, 0xf4ac +/* 96B770 802425B0 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96B774 802425B4 3C048025 */ lui $a0, 0x8025 +/* 96B778 802425B8 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96B77C 802425BC 0C0B2026 */ jal set_variable +/* 96B780 802425C0 24060002 */ addiu $a2, $zero, 2 +/* 96B784 802425C4 08090BA5 */ j .L80242E94 +/* 96B788 802425C8 AE000000 */ sw $zero, ($s0) +/* 96B78C 802425CC 3C028025 */ lui $v0, 0x8025 +/* 96B790 802425D0 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96B794 802425D4 24030002 */ addiu $v1, $zero, 2 +/* 96B798 802425D8 AC430000 */ sw $v1, ($v0) +/* 96B79C 802425DC AC400024 */ sw $zero, 0x24($v0) +/* 96B7A0 802425E0 AC400048 */ sw $zero, 0x48($v0) +/* 96B7A4 802425E4 AC400004 */ sw $zero, 4($v0) +/* 96B7A8 802425E8 AC400008 */ sw $zero, 8($v0) +/* 96B7AC 802425EC 08090BA5 */ j .L80242E94 +/* 96B7B0 802425F0 AC40000C */ sw $zero, 0xc($v0) +/* 96B7B4 802425F4 3C038025 */ lui $v1, 0x8025 +/* 96B7B8 802425F8 2463F010 */ addiu $v1, $v1, -0xff0 +/* 96B7BC 802425FC 24020001 */ addiu $v0, $zero, 1 +/* 96B7C0 80242600 C4620004 */ lwc1 $f2, 4($v1) +/* 96B7C4 80242604 3C014120 */ lui $at, 0x4120 +/* 96B7C8 80242608 44812000 */ mtc1 $at, $f4 +/* 96B7CC 8024260C 3C078025 */ lui $a3, 0x8025 +/* 96B7D0 80242610 24E7EF88 */ addiu $a3, $a3, -0x1078 +/* 96B7D4 80242614 AC620000 */ sw $v0, ($v1) +/* 96B7D8 80242618 AC620024 */ sw $v0, 0x24($v1) +/* 96B7DC 8024261C AC620048 */ sw $v0, 0x48($v1) +/* 96B7E0 80242620 8CE40000 */ lw $a0, ($a3) +/* 96B7E4 80242624 C4600028 */ lwc1 $f0, 0x28($v1) +/* 96B7E8 80242628 46041081 */ sub.s $f2, $f2, $f4 +/* 96B7EC 8024262C 00822021 */ addu $a0, $a0, $v0 +/* 96B7F0 80242630 2402000A */ addiu $v0, $zero, 0xa +/* 96B7F4 80242634 46040000 */ add.s $f0, $f0, $f4 +/* 96B7F8 80242638 ACE40000 */ sw $a0, ($a3) +/* 96B7FC 8024263C E4620004 */ swc1 $f2, 4($v1) +/* 96B800 80242640 14820214 */ bne $a0, $v0, .L80242E94 +/* 96B804 80242644 E4600028 */ swc1 $f0, 0x28($v1) +/* 96B808 80242648 3C05F4AC */ lui $a1, 0xf4ac +/* 96B80C 8024264C 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96B810 80242650 3C048025 */ lui $a0, 0x8025 +/* 96B814 80242654 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96B818 80242658 08090A91 */ j .L80242A44 +/* 96B81C 8024265C 24060004 */ addiu $a2, $zero, 4 +/* 96B820 80242660 3C078025 */ lui $a3, 0x8025 +/* 96B824 80242664 24E7EF88 */ addiu $a3, $a3, -0x1078 +/* 96B828 80242668 3C01C2C8 */ lui $at, 0xc2c8 +/* 96B82C 8024266C 44810000 */ mtc1 $at, $f0 +/* 96B830 80242670 3C0142C8 */ lui $at, 0x42c8 +/* 96B834 80242674 44811000 */ mtc1 $at, $f2 +/* 96B838 80242678 3C013F80 */ lui $at, 0x3f80 +/* 96B83C 8024267C 44812000 */ mtc1 $at, $f4 +/* 96B840 80242680 3C014000 */ lui $at, 0x4000 +/* 96B844 80242684 44813000 */ mtc1 $at, $f6 +/* 96B848 80242688 8CE30000 */ lw $v1, ($a3) +/* 96B84C 8024268C 3C028025 */ lui $v0, 0x8025 +/* 96B850 80242690 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96B854 80242694 AC400008 */ sw $zero, 8($v0) +/* 96B858 80242698 AC40000C */ sw $zero, 0xc($v0) +/* 96B85C 8024269C AC40002C */ sw $zero, 0x2c($v0) +/* 96B860 802426A0 AC40004C */ sw $zero, 0x4c($v0) +/* 96B864 802426A4 AC400050 */ sw $zero, 0x50($v0) +/* 96B868 802426A8 24630001 */ addiu $v1, $v1, 1 +/* 96B86C 802426AC E4400004 */ swc1 $f0, 4($v0) +/* 96B870 802426B0 E4420028 */ swc1 $f2, 0x28($v0) +/* 96B874 802426B4 E4440030 */ swc1 $f4, 0x30($v0) +/* 96B878 802426B8 E4460054 */ swc1 $f6, 0x54($v0) +/* 96B87C 802426BC 24020014 */ addiu $v0, $zero, 0x14 +/* 96B880 802426C0 146201F4 */ bne $v1, $v0, .L80242E94 +/* 96B884 802426C4 ACE30000 */ sw $v1, ($a3) +/* 96B888 802426C8 3C05F4AC */ lui $a1, 0xf4ac +/* 96B88C 802426CC 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96B890 802426D0 3C048025 */ lui $a0, 0x8025 +/* 96B894 802426D4 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96B898 802426D8 24060005 */ addiu $a2, $zero, 5 +/* 96B89C 802426DC 0C0B2026 */ jal set_variable +/* 96B8A0 802426E0 ACE00000 */ sw $zero, ($a3) +/* 96B8A4 802426E4 24040203 */ addiu $a0, $zero, 0x203 +/* 96B8A8 802426E8 0000282D */ daddu $a1, $zero, $zero +/* 96B8AC 802426EC 08090A26 */ j .L80242898 +/* 96B8B0 802426F0 24060018 */ addiu $a2, $zero, 0x18 +/* 96B8B4 802426F4 3C028025 */ lui $v0, 0x8025 +/* 96B8B8 802426F8 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96B8BC 802426FC C4400010 */ lwc1 $f0, 0x10($v0) +/* 96B8C0 80242700 3C014190 */ lui $at, 0x4190 +/* 96B8C4 80242704 44811000 */ mtc1 $at, $f2 +/* 96B8C8 80242708 3C108025 */ lui $s0, 0x8025 +/* 96B8CC 8024270C 2610EF88 */ addiu $s0, $s0, -0x1078 +/* 96B8D0 80242710 AC400034 */ sw $zero, 0x34($v0) +/* 96B8D4 80242714 AC400058 */ sw $zero, 0x58($v0) +/* 96B8D8 80242718 8E030000 */ lw $v1, ($s0) +/* 96B8DC 8024271C 46020000 */ add.s $f0, $f0, $f2 +/* 96B8E0 80242720 24630001 */ addiu $v1, $v1, 1 +/* 96B8E4 80242724 AE030000 */ sw $v1, ($s0) +/* 96B8E8 80242728 E4400010 */ swc1 $f0, 0x10($v0) +/* 96B8EC 8024272C 24020008 */ addiu $v0, $zero, 8 +/* 96B8F0 80242730 14620016 */ bne $v1, $v0, .L8024278C +/* 96B8F4 80242734 0000202D */ daddu $a0, $zero, $zero +/* 96B8F8 80242738 27A50018 */ addiu $a1, $sp, 0x18 +/* 96B8FC 8024273C 27A6001C */ addiu $a2, $sp, 0x1c +/* 96B900 80242740 27A70020 */ addiu $a3, $sp, 0x20 +/* 96B904 80242744 27A20024 */ addiu $v0, $sp, 0x24 +/* 96B908 80242748 0C090885 */ jal func_80242214_96B3D4 +/* 96B90C 8024274C AFA20010 */ sw $v0, 0x10($sp) +/* 96B910 80242750 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* 96B914 80242754 3C0141A0 */ lui $at, 0x41a0 +/* 96B918 80242758 44810000 */ mtc1 $at, $f0 +/* 96B91C 8024275C 00000000 */ nop +/* 96B920 80242760 46001080 */ add.s $f2, $f2, $f0 +/* 96B924 80242764 C7A00018 */ lwc1 $f0, 0x18($sp) +/* 96B928 80242768 44050000 */ mfc1 $a1, $f0 +/* 96B92C 8024276C 44061000 */ mfc1 $a2, $f2 +/* 96B930 80242770 C7A20020 */ lwc1 $f2, 0x20($sp) +/* 96B934 80242774 3C0141F0 */ lui $at, 0x41f0 +/* 96B938 80242778 44810000 */ mtc1 $at, $f0 +/* 96B93C 8024277C 44071000 */ mfc1 $a3, $f2 +/* 96B940 80242780 0000202D */ daddu $a0, $zero, $zero +/* 96B944 80242784 0C01BFBC */ jal func_8006FEF0 +/* 96B948 80242788 E7A00010 */ swc1 $f0, 0x10($sp) +.L8024278C: +/* 96B94C 8024278C 8E030000 */ lw $v1, ($s0) +/* 96B950 80242790 2402000A */ addiu $v0, $zero, 0xa +/* 96B954 80242794 146201BF */ bne $v1, $v0, .L80242E94 +/* 96B958 80242798 24060006 */ addiu $a2, $zero, 6 +/* 96B95C 8024279C 3C05F4AC */ lui $a1, 0xf4ac +/* 96B960 802427A0 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96B964 802427A4 3C048025 */ lui $a0, 0x8025 +/* 96B968 802427A8 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96B96C 802427AC 0C0B2026 */ jal set_variable +/* 96B970 802427B0 AE000000 */ sw $zero, ($s0) +/* 96B974 802427B4 24040203 */ addiu $a0, $zero, 0x203 +/* 96B978 802427B8 0000282D */ daddu $a1, $zero, $zero +/* 96B97C 802427BC 08090A26 */ j .L80242898 +/* 96B980 802427C0 24060040 */ addiu $a2, $zero, 0x40 +/* 96B984 802427C4 3C028025 */ lui $v0, 0x8025 +/* 96B988 802427C8 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96B98C 802427CC C4420010 */ lwc1 $f2, 0x10($v0) +/* 96B990 802427D0 3C014190 */ lui $at, 0x4190 +/* 96B994 802427D4 44812000 */ mtc1 $at, $f4 +/* 96B998 802427D8 3C108025 */ lui $s0, 0x8025 +/* 96B99C 802427DC 2610EF88 */ addiu $s0, $s0, -0x1078 +/* 96B9A0 802427E0 AC400034 */ sw $zero, 0x34($v0) +/* 96B9A4 802427E4 8E030000 */ lw $v1, ($s0) +/* 96B9A8 802427E8 46041080 */ add.s $f2, $f2, $f4 +/* 96B9AC 802427EC C4400058 */ lwc1 $f0, 0x58($v0) +/* 96B9B0 802427F0 24630001 */ addiu $v1, $v1, 1 +/* 96B9B4 802427F4 46040000 */ add.s $f0, $f0, $f4 +/* 96B9B8 802427F8 AE030000 */ sw $v1, ($s0) +/* 96B9BC 802427FC E4420010 */ swc1 $f2, 0x10($v0) +/* 96B9C0 80242800 E4400058 */ swc1 $f0, 0x58($v0) +/* 96B9C4 80242804 24020008 */ addiu $v0, $zero, 8 +/* 96B9C8 80242808 14620016 */ bne $v1, $v0, .L80242864 +/* 96B9CC 8024280C 24040002 */ addiu $a0, $zero, 2 +/* 96B9D0 80242810 27A50028 */ addiu $a1, $sp, 0x28 +/* 96B9D4 80242814 27A6002C */ addiu $a2, $sp, 0x2c +/* 96B9D8 80242818 27A70030 */ addiu $a3, $sp, 0x30 +/* 96B9DC 8024281C 27A20034 */ addiu $v0, $sp, 0x34 +/* 96B9E0 80242820 0C090885 */ jal func_80242214_96B3D4 +/* 96B9E4 80242824 AFA20010 */ sw $v0, 0x10($sp) +/* 96B9E8 80242828 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* 96B9EC 8024282C 3C0141A0 */ lui $at, 0x41a0 +/* 96B9F0 80242830 44810000 */ mtc1 $at, $f0 +/* 96B9F4 80242834 00000000 */ nop +/* 96B9F8 80242838 46001080 */ add.s $f2, $f2, $f0 +/* 96B9FC 8024283C C7A00028 */ lwc1 $f0, 0x28($sp) +/* 96BA00 80242840 44050000 */ mfc1 $a1, $f0 +/* 96BA04 80242844 44061000 */ mfc1 $a2, $f2 +/* 96BA08 80242848 C7A20030 */ lwc1 $f2, 0x30($sp) +/* 96BA0C 8024284C 3C0141F0 */ lui $at, 0x41f0 +/* 96BA10 80242850 44810000 */ mtc1 $at, $f0 +/* 96BA14 80242854 44071000 */ mfc1 $a3, $f2 +/* 96BA18 80242858 0000202D */ daddu $a0, $zero, $zero +/* 96BA1C 8024285C 0C01BFBC */ jal func_8006FEF0 +/* 96BA20 80242860 E7A00010 */ swc1 $f0, 0x10($sp) +.L80242864: +/* 96BA24 80242864 8E030000 */ lw $v1, ($s0) +/* 96BA28 80242868 2402000A */ addiu $v0, $zero, 0xa +/* 96BA2C 8024286C 14620189 */ bne $v1, $v0, .L80242E94 +/* 96BA30 80242870 24060007 */ addiu $a2, $zero, 7 +/* 96BA34 80242874 3C05F4AC */ lui $a1, 0xf4ac +/* 96BA38 80242878 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96BA3C 8024287C 3C048025 */ lui $a0, 0x8025 +/* 96BA40 80242880 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96BA44 80242884 0C0B2026 */ jal set_variable +/* 96BA48 80242888 AE000000 */ sw $zero, ($s0) +/* 96BA4C 8024288C 24040203 */ addiu $a0, $zero, 0x203 +/* 96BA50 80242890 0000282D */ daddu $a1, $zero, $zero +/* 96BA54 80242894 24060068 */ addiu $a2, $zero, 0x68 +.L80242898: +/* 96BA58 80242898 0C0526AE */ jal _play_sound +/* 96BA5C 8024289C 00A0382D */ daddu $a3, $a1, $zero +/* 96BA60 802428A0 08090BA5 */ j .L80242E94 +/* 96BA64 802428A4 00000000 */ nop +/* 96BA68 802428A8 3C028025 */ lui $v0, 0x8025 +/* 96BA6C 802428AC 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96BA70 802428B0 C4420034 */ lwc1 $f2, 0x34($v0) +/* 96BA74 802428B4 3C014190 */ lui $at, 0x4190 +/* 96BA78 802428B8 44812000 */ mtc1 $at, $f4 +/* 96BA7C 802428BC 3C108025 */ lui $s0, 0x8025 +/* 96BA80 802428C0 2610EF88 */ addiu $s0, $s0, -0x1078 +/* 96BA84 802428C4 AC400010 */ sw $zero, 0x10($v0) +/* 96BA88 802428C8 8E030000 */ lw $v1, ($s0) +/* 96BA8C 802428CC 46041080 */ add.s $f2, $f2, $f4 +/* 96BA90 802428D0 C4400058 */ lwc1 $f0, 0x58($v0) +/* 96BA94 802428D4 24630001 */ addiu $v1, $v1, 1 +/* 96BA98 802428D8 46040000 */ add.s $f0, $f0, $f4 +/* 96BA9C 802428DC AE030000 */ sw $v1, ($s0) +/* 96BAA0 802428E0 E4420034 */ swc1 $f2, 0x34($v0) +/* 96BAA4 802428E4 E4400058 */ swc1 $f0, 0x58($v0) +/* 96BAA8 802428E8 24020008 */ addiu $v0, $zero, 8 +/* 96BAAC 802428EC 14620016 */ bne $v1, $v0, .L80242948 +/* 96BAB0 802428F0 24040001 */ addiu $a0, $zero, 1 +/* 96BAB4 802428F4 27A50038 */ addiu $a1, $sp, 0x38 +/* 96BAB8 802428F8 27A6003C */ addiu $a2, $sp, 0x3c +/* 96BABC 802428FC 27A70040 */ addiu $a3, $sp, 0x40 +/* 96BAC0 80242900 27A20044 */ addiu $v0, $sp, 0x44 +/* 96BAC4 80242904 0C090885 */ jal func_80242214_96B3D4 +/* 96BAC8 80242908 AFA20010 */ sw $v0, 0x10($sp) +/* 96BACC 8024290C C7A2003C */ lwc1 $f2, 0x3c($sp) +/* 96BAD0 80242910 3C0141A0 */ lui $at, 0x41a0 +/* 96BAD4 80242914 44810000 */ mtc1 $at, $f0 +/* 96BAD8 80242918 00000000 */ nop +/* 96BADC 8024291C 46001080 */ add.s $f2, $f2, $f0 +/* 96BAE0 80242920 C7A00038 */ lwc1 $f0, 0x38($sp) +/* 96BAE4 80242924 44050000 */ mfc1 $a1, $f0 +/* 96BAE8 80242928 44061000 */ mfc1 $a2, $f2 +/* 96BAEC 8024292C C7A20040 */ lwc1 $f2, 0x40($sp) +/* 96BAF0 80242930 3C0141F0 */ lui $at, 0x41f0 +/* 96BAF4 80242934 44810000 */ mtc1 $at, $f0 +/* 96BAF8 80242938 44071000 */ mfc1 $a3, $f2 +/* 96BAFC 8024293C 0000202D */ daddu $a0, $zero, $zero +/* 96BB00 80242940 0C01BFBC */ jal func_8006FEF0 +/* 96BB04 80242944 E7A00010 */ swc1 $f0, 0x10($sp) +.L80242948: +/* 96BB08 80242948 8E030000 */ lw $v1, ($s0) +/* 96BB0C 8024294C 2402000A */ addiu $v0, $zero, 0xa +/* 96BB10 80242950 14620150 */ bne $v1, $v0, .L80242E94 +/* 96BB14 80242954 24060008 */ addiu $a2, $zero, 8 +/* 96BB18 80242958 3C05F4AC */ lui $a1, 0xf4ac +/* 96BB1C 8024295C 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96BB20 80242960 3C048025 */ lui $a0, 0x8025 +/* 96BB24 80242964 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96BB28 80242968 0C0B2026 */ jal set_variable +/* 96BB2C 8024296C AE000000 */ sw $zero, ($s0) +/* 96BB30 80242970 08090BA5 */ j .L80242E94 +/* 96BB34 80242974 00000000 */ nop +/* 96BB38 80242978 3C028025 */ lui $v0, 0x8025 +/* 96BB3C 8024297C 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96BB40 80242980 C4400034 */ lwc1 $f0, 0x34($v0) +/* 96BB44 80242984 3C014190 */ lui $at, 0x4190 +/* 96BB48 80242988 44811000 */ mtc1 $at, $f2 +/* 96BB4C 8024298C 3C078025 */ lui $a3, 0x8025 +/* 96BB50 80242990 24E7EF88 */ addiu $a3, $a3, -0x1078 +/* 96BB54 80242994 AC400010 */ sw $zero, 0x10($v0) +/* 96BB58 80242998 AC400058 */ sw $zero, 0x58($v0) +/* 96BB5C 8024299C 8CE30000 */ lw $v1, ($a3) +/* 96BB60 802429A0 46020000 */ add.s $f0, $f0, $f2 +/* 96BB64 802429A4 24630001 */ addiu $v1, $v1, 1 +/* 96BB68 802429A8 ACE30000 */ sw $v1, ($a3) +/* 96BB6C 802429AC E4400034 */ swc1 $f0, 0x34($v0) +/* 96BB70 802429B0 2402000A */ addiu $v0, $zero, 0xa +/* 96BB74 802429B4 14620137 */ bne $v1, $v0, .L80242E94 +/* 96BB78 802429B8 24060009 */ addiu $a2, $zero, 9 +/* 96BB7C 802429BC 3C05F4AC */ lui $a1, 0xf4ac +/* 96BB80 802429C0 3C048025 */ lui $a0, 0x8025 +/* 96BB84 802429C4 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96BB88 802429C8 08090A91 */ j .L80242A44 +/* 96BB8C 802429CC 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96BB90 802429D0 3C028025 */ lui $v0, 0x8025 +/* 96BB94 802429D4 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96BB98 802429D8 C4420004 */ lwc1 $f2, 4($v0) +/* 96BB9C 802429DC 3C014120 */ lui $at, 0x4120 +/* 96BBA0 802429E0 44812000 */ mtc1 $at, $f4 +/* 96BBA4 802429E4 3C078025 */ lui $a3, 0x8025 +/* 96BBA8 802429E8 24E7EF88 */ addiu $a3, $a3, -0x1078 +/* 96BBAC 802429EC AC400008 */ sw $zero, 8($v0) +/* 96BBB0 802429F0 AC400010 */ sw $zero, 0x10($v0) +/* 96BBB4 802429F4 AC40002C */ sw $zero, 0x2c($v0) +/* 96BBB8 802429F8 AC400034 */ sw $zero, 0x34($v0) +/* 96BBBC 802429FC AC40004C */ sw $zero, 0x4c($v0) +/* 96BBC0 80242A00 AC400050 */ sw $zero, 0x50($v0) +/* 96BBC4 80242A04 AC400058 */ sw $zero, 0x58($v0) +/* 96BBC8 80242A08 8CE30000 */ lw $v1, ($a3) +/* 96BBCC 80242A0C 46041080 */ add.s $f2, $f2, $f4 +/* 96BBD0 80242A10 C4400028 */ lwc1 $f0, 0x28($v0) +/* 96BBD4 80242A14 24630001 */ addiu $v1, $v1, 1 +/* 96BBD8 80242A18 46040001 */ sub.s $f0, $f0, $f4 +/* 96BBDC 80242A1C ACE30000 */ sw $v1, ($a3) +/* 96BBE0 80242A20 E4420004 */ swc1 $f2, 4($v0) +/* 96BBE4 80242A24 E4400028 */ swc1 $f0, 0x28($v0) +/* 96BBE8 80242A28 2402000A */ addiu $v0, $zero, 0xa +/* 96BBEC 80242A2C 14620119 */ bne $v1, $v0, .L80242E94 +/* 96BBF0 80242A30 0040302D */ daddu $a2, $v0, $zero +/* 96BBF4 80242A34 3C05F4AC */ lui $a1, 0xf4ac +/* 96BBF8 80242A38 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96BBFC 80242A3C 3C048025 */ lui $a0, 0x8025 +/* 96BC00 80242A40 8C84EFCC */ lw $a0, -0x1034($a0) +.L80242A44: +/* 96BC04 80242A44 0C0B2026 */ jal set_variable +/* 96BC08 80242A48 ACE00000 */ sw $zero, ($a3) +/* 96BC0C 80242A4C 08090BA5 */ j .L80242E94 +/* 96BC10 80242A50 00000000 */ nop +/* 96BC14 80242A54 3C038025 */ lui $v1, 0x8025 +/* 96BC18 80242A58 2463F010 */ addiu $v1, $v1, -0xff0 +/* 96BC1C 80242A5C 24020003 */ addiu $v0, $zero, 3 +/* 96BC20 80242A60 AC620000 */ sw $v0, ($v1) +/* 96BC24 80242A64 24020008 */ addiu $v0, $zero, 8 +/* 96BC28 80242A68 AC620018 */ sw $v0, 0x18($v1) +/* 96BC2C 80242A6C 24020011 */ addiu $v0, $zero, 0x11 +/* 96BC30 80242A70 AC600024 */ sw $zero, 0x24($v1) +/* 96BC34 80242A74 AC600048 */ sw $zero, 0x48($v1) +/* 96BC38 80242A78 08090BA5 */ j .L80242E94 +/* 96BC3C 80242A7C AC62001C */ sw $v0, 0x1c($v1) +/* 96BC40 80242A80 3C05F4AC */ lui $a1, 0xf4ac +/* 96BC44 80242A84 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96BC48 80242A88 2406000C */ addiu $a2, $zero, 0xc +/* 96BC4C 80242A8C 3C118025 */ lui $s1, 0x8025 +/* 96BC50 80242A90 2631EF90 */ addiu $s1, $s1, -0x1070 +/* 96BC54 80242A94 0220802D */ daddu $s0, $s1, $zero +/* 96BC58 80242A98 3C028025 */ lui $v0, 0x8025 +/* 96BC5C 80242A9C 2442F010 */ addiu $v0, $v0, -0xff0 +/* 96BC60 80242AA0 3C048025 */ lui $a0, 0x8025 +/* 96BC64 80242AA4 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96BC68 80242AA8 3C018025 */ lui $at, 0x8025 +/* 96BC6C 80242AAC D434EF58 */ ldc1 $f20, -0x10a8($at) +/* 96BC70 80242AB0 3C014288 */ lui $at, 0x4288 +/* 96BC74 80242AB4 44810000 */ mtc1 $at, $f0 +/* 96BC78 80242AB8 3C014334 */ lui $at, 0x4334 +/* 96BC7C 80242ABC 44811000 */ mtc1 $at, $f2 +/* 96BC80 80242AC0 24030004 */ addiu $v1, $zero, 4 +/* 96BC84 80242AC4 AC430000 */ sw $v1, ($v0) +/* 96BC88 80242AC8 24030005 */ addiu $v1, $zero, 5 +/* 96BC8C 80242ACC AC430024 */ sw $v1, 0x24($v0) +/* 96BC90 80242AD0 24030008 */ addiu $v1, $zero, 8 +/* 96BC94 80242AD4 AC43003C */ sw $v1, 0x3c($v0) +/* 96BC98 80242AD8 2403000A */ addiu $v1, $zero, 0xa +/* 96BC9C 80242ADC AC400004 */ sw $zero, 4($v0) +/* 96BCA0 80242AE0 AC40000C */ sw $zero, 0xc($v0) +/* 96BCA4 80242AE4 AC400028 */ sw $zero, 0x28($v0) +/* 96BCA8 80242AE8 AC400030 */ sw $zero, 0x30($v0) +/* 96BCAC 80242AEC AC430040 */ sw $v1, 0x40($v0) +/* 96BCB0 80242AF0 AC400044 */ sw $zero, 0x44($v0) +/* 96BCB4 80242AF4 3C018025 */ lui $at, 0x8025 +/* 96BCB8 80242AF8 AC20EF88 */ sw $zero, -0x1078($at) +/* 96BCBC 80242AFC E4400008 */ swc1 $f0, 8($v0) +/* 96BCC0 80242B00 E4420010 */ swc1 $f2, 0x10($v0) +/* 96BCC4 80242B04 E440002C */ swc1 $f0, 0x2c($v0) +/* 96BCC8 80242B08 0C0B2026 */ jal set_variable +/* 96BCCC 80242B0C E4420034 */ swc1 $f2, 0x34($v0) +/* 96BCD0 80242B10 24040001 */ addiu $a0, $zero, 1 +/* 96BCD4 80242B14 27A50048 */ addiu $a1, $sp, 0x48 +/* 96BCD8 80242B18 27A6004C */ addiu $a2, $sp, 0x4c +/* 96BCDC 80242B1C 3C013F80 */ lui $at, 0x3f80 +/* 96BCE0 80242B20 44810000 */ mtc1 $at, $f0 +/* 96BCE4 80242B24 27A20054 */ addiu $v0, $sp, 0x54 +/* 96BCE8 80242B28 3C018025 */ lui $at, 0x8025 +/* 96BCEC 80242B2C AC20EF80 */ sw $zero, -0x1080($at) +/* 96BCF0 80242B30 AFA20010 */ sw $v0, 0x10($sp) +/* 96BCF4 80242B34 3C018025 */ lui $at, 0x8025 +/* 96BCF8 80242B38 E420EF84 */ swc1 $f0, -0x107c($at) +/* 96BCFC 80242B3C 0C090885 */ jal func_80242214_96B3D4 +/* 96BD00 80242B40 27A70050 */ addiu $a3, $sp, 0x50 +.L80242B44: +/* 96BD04 80242B44 C7A2004C */ lwc1 $f2, 0x4c($sp) +/* 96BD08 80242B48 3C0141A0 */ lui $at, 0x41a0 +/* 96BD0C 80242B4C 44810000 */ mtc1 $at, $f0 +/* 96BD10 80242B50 00000000 */ nop +/* 96BD14 80242B54 46001080 */ add.s $f2, $f2, $f0 +/* 96BD18 80242B58 C7A00048 */ lwc1 $f0, 0x48($sp) +/* 96BD1C 80242B5C 24040002 */ addiu $a0, $zero, 2 +/* 96BD20 80242B60 44050000 */ mfc1 $a1, $f0 +/* 96BD24 80242B64 44061000 */ mfc1 $a2, $f2 +/* 96BD28 80242B68 C7A20050 */ lwc1 $f2, 0x50($sp) +/* 96BD2C 80242B6C 3C014100 */ lui $at, 0x4100 +/* 96BD30 80242B70 44810000 */ mtc1 $at, $f0 +/* 96BD34 80242B74 44071000 */ mfc1 $a3, $f2 +/* 96BD38 80242B78 2402FFFF */ addiu $v0, $zero, -1 +/* 96BD3C 80242B7C AFA20014 */ sw $v0, 0x14($sp) +/* 96BD40 80242B80 0C01C82C */ jal func_800720B0 +/* 96BD44 80242B84 E7A00010 */ swc1 $f0, 0x10($sp) +/* 96BD48 80242B88 AE020000 */ sw $v0, ($s0) +/* 96BD4C 80242B8C 8C43000C */ lw $v1, 0xc($v0) +/* 96BD50 80242B90 240200D7 */ addiu $v0, $zero, 0xd7 +/* 96BD54 80242B94 AC620028 */ sw $v0, 0x28($v1) +/* 96BD58 80242B98 8E020000 */ lw $v0, ($s0) +/* 96BD5C 80242B9C 8C43000C */ lw $v1, 0xc($v0) +/* 96BD60 80242BA0 24020037 */ addiu $v0, $zero, 0x37 +/* 96BD64 80242BA4 AC62002C */ sw $v0, 0x2c($v1) +/* 96BD68 80242BA8 8E020000 */ lw $v0, ($s0) +/* 96BD6C 80242BAC 8C43000C */ lw $v1, 0xc($v0) +/* 96BD70 80242BB0 240200FF */ addiu $v0, $zero, 0xff +/* 96BD74 80242BB4 AC620030 */ sw $v0, 0x30($v1) +/* 96BD78 80242BB8 8E020000 */ lw $v0, ($s0) +/* 96BD7C 80242BBC 8C420008 */ lw $v0, 8($v0) +/* 96BD80 80242BC0 24040001 */ addiu $a0, $zero, 1 +/* 96BD84 80242BC4 0082102A */ slt $v0, $a0, $v0 +/* 96BD88 80242BC8 50400012 */ beql $v0, $zero, .L80242C14 +/* 96BD8C 80242BCC 26100004 */ addiu $s0, $s0, 4 +/* 96BD90 80242BD0 24030048 */ addiu $v1, $zero, 0x48 +.L80242BD4: +/* 96BD94 80242BD4 8E020000 */ lw $v0, ($s0) +/* 96BD98 80242BD8 8C42000C */ lw $v0, 0xc($v0) +/* 96BD9C 80242BDC 00621021 */ addu $v0, $v1, $v0 +/* 96BDA0 80242BE0 C4400038 */ lwc1 $f0, 0x38($v0) +/* 96BDA4 80242BE4 46000021 */ cvt.d.s $f0, $f0 +/* 96BDA8 80242BE8 46340002 */ mul.d $f0, $f0, $f20 +/* 96BDAC 80242BEC 00000000 */ nop +/* 96BDB0 80242BF0 46200020 */ cvt.s.d $f0, $f0 +/* 96BDB4 80242BF4 E4400038 */ swc1 $f0, 0x38($v0) +/* 96BDB8 80242BF8 8E020000 */ lw $v0, ($s0) +/* 96BDBC 80242BFC 24840001 */ addiu $a0, $a0, 1 +/* 96BDC0 80242C00 8C420008 */ lw $v0, 8($v0) +/* 96BDC4 80242C04 0082102A */ slt $v0, $a0, $v0 +/* 96BDC8 80242C08 1440FFF2 */ bnez $v0, .L80242BD4 +/* 96BDCC 80242C0C 24630048 */ addiu $v1, $v1, 0x48 +/* 96BDD0 80242C10 26100004 */ addiu $s0, $s0, 4 +.L80242C14: +/* 96BDD4 80242C14 26220010 */ addiu $v0, $s1, 0x10 +/* 96BDD8 80242C18 0202102A */ slt $v0, $s0, $v0 +/* 96BDDC 80242C1C 1040009D */ beqz $v0, .L80242E94 +/* 96BDE0 80242C20 00000000 */ nop +/* 96BDE4 80242C24 08090AD1 */ j .L80242B44 +/* 96BDE8 80242C28 00000000 */ nop +/* 96BDEC 80242C2C 24040001 */ addiu $a0, $zero, 1 +/* 96BDF0 80242C30 27A50058 */ addiu $a1, $sp, 0x58 +/* 96BDF4 80242C34 27A6005C */ addiu $a2, $sp, 0x5c +/* 96BDF8 80242C38 27A70060 */ addiu $a3, $sp, 0x60 +/* 96BDFC 80242C3C 27A20064 */ addiu $v0, $sp, 0x64 +/* 96BE00 80242C40 0C090885 */ jal func_80242214_96B3D4 +/* 96BE04 80242C44 AFA20010 */ sw $v0, 0x10($sp) +/* 96BE08 80242C48 3C028025 */ lui $v0, 0x8025 +/* 96BE0C 80242C4C 2442EF90 */ addiu $v0, $v0, -0x1070 +/* 96BE10 80242C50 0040282D */ daddu $a1, $v0, $zero +/* 96BE14 80242C54 24A70010 */ addiu $a3, $a1, 0x10 +/* 96BE18 80242C58 C7AA0058 */ lwc1 $f10, 0x58($sp) +/* 96BE1C 80242C5C C7A80060 */ lwc1 $f8, 0x60($sp) +/* 96BE20 80242C60 3C018025 */ lui $at, 0x8025 +/* 96BE24 80242C64 D424EF60 */ ldc1 $f4, -0x10a0($at) +/* 96BE28 80242C68 3C013DCC */ lui $at, 0x3dcc +/* 96BE2C 80242C6C 3421CCCD */ ori $at, $at, 0xcccd +/* 96BE30 80242C70 44816000 */ mtc1 $at, $f12 +/* 96BE34 80242C74 C7A2005C */ lwc1 $f2, 0x5c($sp) +/* 96BE38 80242C78 3C0141A0 */ lui $at, 0x41a0 +/* 96BE3C 80242C7C 44810000 */ mtc1 $at, $f0 +/* 96BE40 80242C80 3C018025 */ lui $at, 0x8025 +/* 96BE44 80242C84 D426EF68 */ ldc1 $f6, -0x1098($at) +/* 96BE48 80242C88 46001080 */ add.s $f2, $f2, $f0 +.L80242C8C: +/* 96BE4C 80242C8C 8CA20000 */ lw $v0, ($a1) +/* 96BE50 80242C90 8C42000C */ lw $v0, 0xc($v0) +/* 96BE54 80242C94 E44A0004 */ swc1 $f10, 4($v0) +/* 96BE58 80242C98 8CA20000 */ lw $v0, ($a1) +/* 96BE5C 80242C9C 8C42000C */ lw $v0, 0xc($v0) +/* 96BE60 80242CA0 E4420008 */ swc1 $f2, 8($v0) +/* 96BE64 80242CA4 8CA20000 */ lw $v0, ($a1) +/* 96BE68 80242CA8 8C42000C */ lw $v0, 0xc($v0) +/* 96BE6C 80242CAC E448000C */ swc1 $f8, 0xc($v0) +/* 96BE70 80242CB0 8CA20000 */ lw $v0, ($a1) +/* 96BE74 80242CB4 8C42000C */ lw $v0, 0xc($v0) +/* 96BE78 80242CB8 C4400034 */ lwc1 $f0, 0x34($v0) +/* 96BE7C 80242CBC 46000021 */ cvt.d.s $f0, $f0 +/* 96BE80 80242CC0 46240001 */ sub.d $f0, $f0, $f4 +/* 96BE84 80242CC4 46200020 */ cvt.s.d $f0, $f0 +/* 96BE88 80242CC8 E4400034 */ swc1 $f0, 0x34($v0) +/* 96BE8C 80242CCC 8CA20000 */ lw $v0, ($a1) +/* 96BE90 80242CD0 8C42000C */ lw $v0, 0xc($v0) +/* 96BE94 80242CD4 C4400034 */ lwc1 $f0, 0x34($v0) +/* 96BE98 80242CD8 46000021 */ cvt.d.s $f0, $f0 +/* 96BE9C 80242CDC 4624003C */ c.lt.d $f0, $f4 +/* 96BEA0 80242CE0 00000000 */ nop +/* 96BEA4 80242CE4 45030001 */ bc1tl .L80242CEC +/* 96BEA8 80242CE8 E44C0034 */ swc1 $f12, 0x34($v0) +.L80242CEC: +/* 96BEAC 80242CEC 8CA20000 */ lw $v0, ($a1) +/* 96BEB0 80242CF0 8C420008 */ lw $v0, 8($v0) +/* 96BEB4 80242CF4 24040001 */ addiu $a0, $zero, 1 +/* 96BEB8 80242CF8 0082102A */ slt $v0, $a0, $v0 +/* 96BEBC 80242CFC 50400012 */ beql $v0, $zero, .L80242D48 +/* 96BEC0 80242D00 24A50004 */ addiu $a1, $a1, 4 +/* 96BEC4 80242D04 00A0302D */ daddu $a2, $a1, $zero +/* 96BEC8 80242D08 24030048 */ addiu $v1, $zero, 0x48 +.L80242D0C: +/* 96BECC 80242D0C 8CC20000 */ lw $v0, ($a2) +/* 96BED0 80242D10 8C42000C */ lw $v0, 0xc($v0) +/* 96BED4 80242D14 00621021 */ addu $v0, $v1, $v0 +/* 96BED8 80242D18 C4400038 */ lwc1 $f0, 0x38($v0) +/* 96BEDC 80242D1C 46000021 */ cvt.d.s $f0, $f0 +/* 96BEE0 80242D20 46260000 */ add.d $f0, $f0, $f6 +/* 96BEE4 80242D24 46200020 */ cvt.s.d $f0, $f0 +/* 96BEE8 80242D28 E4400038 */ swc1 $f0, 0x38($v0) +/* 96BEEC 80242D2C 8CC20000 */ lw $v0, ($a2) +/* 96BEF0 80242D30 24840001 */ addiu $a0, $a0, 1 +/* 96BEF4 80242D34 8C420008 */ lw $v0, 8($v0) +/* 96BEF8 80242D38 0082102A */ slt $v0, $a0, $v0 +/* 96BEFC 80242D3C 1440FFF3 */ bnez $v0, .L80242D0C +/* 96BF00 80242D40 24630048 */ addiu $v1, $v1, 0x48 +/* 96BF04 80242D44 24A50004 */ addiu $a1, $a1, 4 +.L80242D48: +/* 96BF08 80242D48 00A7102A */ slt $v0, $a1, $a3 +/* 96BF0C 80242D4C 1440FFCF */ bnez $v0, .L80242C8C +/* 96BF10 80242D50 00000000 */ nop +/* 96BF14 80242D54 3C108025 */ lui $s0, 0x8025 +/* 96BF18 80242D58 2610F010 */ addiu $s0, $s0, -0xff0 +/* 96BF1C 80242D5C 3C048025 */ lui $a0, 0x8025 +/* 96BF20 80242D60 2484EF80 */ addiu $a0, $a0, -0x1080 +/* 96BF24 80242D64 3C038025 */ lui $v1, 0x8025 +/* 96BF28 80242D68 2463EF84 */ addiu $v1, $v1, -0x107c +/* 96BF2C 80242D6C 3C078025 */ lui $a3, 0x8025 +/* 96BF30 80242D70 24E7EF88 */ addiu $a3, $a3, -0x1078 +/* 96BF34 80242D74 C6060008 */ lwc1 $f6, 8($s0) +/* 96BF38 80242D78 C4820000 */ lwc1 $f2, ($a0) +/* 96BF3C 80242D7C C604002C */ lwc1 $f4, 0x2c($s0) +/* 96BF40 80242D80 C4600000 */ lwc1 $f0, ($v1) +/* 96BF44 80242D84 46023180 */ add.s $f6, $f6, $f2 +/* 96BF48 80242D88 8CE20000 */ lw $v0, ($a3) +/* 96BF4C 80242D8C 3C01C0A0 */ lui $at, 0xc0a0 +/* 96BF50 80242D90 44814000 */ mtc1 $at, $f8 +/* 96BF54 80242D94 46002100 */ add.s $f4, $f4, $f0 +/* 96BF58 80242D98 24420001 */ addiu $v0, $v0, 1 +/* 96BF5C 80242D9C ACE20000 */ sw $v0, ($a3) +/* 96BF60 80242DA0 4608203C */ c.lt.s $f4, $f8 +/* 96BF64 80242DA4 E604002C */ swc1 $f4, 0x2c($s0) +/* 96BF68 80242DA8 3C018025 */ lui $at, 0x8025 +/* 96BF6C 80242DAC D424EF70 */ ldc1 $f4, -0x1090($at) +/* 96BF70 80242DB0 460010A1 */ cvt.d.s $f2, $f2 +/* 96BF74 80242DB4 46241080 */ add.d $f2, $f2, $f4 +/* 96BF78 80242DB8 3C018025 */ lui $at, 0x8025 +/* 96BF7C 80242DBC D424EF78 */ ldc1 $f4, -0x1088($at) +/* 96BF80 80242DC0 46000021 */ cvt.d.s $f0, $f0 +/* 96BF84 80242DC4 E6060008 */ swc1 $f6, 8($s0) +/* 96BF88 80242DC8 46240001 */ sub.d $f0, $f0, $f4 +/* 96BF8C 80242DCC 462010A0 */ cvt.s.d $f2, $f2 +/* 96BF90 80242DD0 E4820000 */ swc1 $f2, ($a0) +/* 96BF94 80242DD4 46200020 */ cvt.s.d $f0, $f0 +/* 96BF98 80242DD8 4500002E */ bc1f .L80242E94 +/* 96BF9C 80242DDC E4600000 */ swc1 $f0, ($v1) +/* 96BFA0 80242DE0 3C05F4AC */ lui $a1, 0xf4ac +/* 96BFA4 80242DE4 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96BFA8 80242DE8 3C048025 */ lui $a0, 0x8025 +/* 96BFAC 80242DEC 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96BFB0 80242DF0 2406000D */ addiu $a2, $zero, 0xd +/* 96BFB4 80242DF4 E608002C */ swc1 $f8, 0x2c($s0) +/* 96BFB8 80242DF8 0C0B2026 */ jal set_variable +/* 96BFBC 80242DFC ACE00000 */ sw $zero, ($a3) +/* 96BFC0 80242E00 24040001 */ addiu $a0, $zero, 1 +/* 96BFC4 80242E04 27A50068 */ addiu $a1, $sp, 0x68 +/* 96BFC8 80242E08 27A6006C */ addiu $a2, $sp, 0x6c +/* 96BFCC 80242E0C 27A70070 */ addiu $a3, $sp, 0x70 +/* 96BFD0 80242E10 27A20074 */ addiu $v0, $sp, 0x74 +/* 96BFD4 80242E14 AE000000 */ sw $zero, ($s0) +/* 96BFD8 80242E18 AE000024 */ sw $zero, 0x24($s0) +/* 96BFDC 80242E1C 0C090885 */ jal func_80242214_96B3D4 +/* 96BFE0 80242E20 AFA20010 */ sw $v0, 0x10($sp) +/* 96BFE4 80242E24 C7A2006C */ lwc1 $f2, 0x6c($sp) +/* 96BFE8 80242E28 3C0141A0 */ lui $at, 0x41a0 +/* 96BFEC 80242E2C 44810000 */ mtc1 $at, $f0 +/* 96BFF0 80242E30 00000000 */ nop +/* 96BFF4 80242E34 46001080 */ add.s $f2, $f2, $f0 +/* 96BFF8 80242E38 C7A00068 */ lwc1 $f0, 0x68($sp) +/* 96BFFC 80242E3C 44050000 */ mfc1 $a1, $f0 +/* 96C000 80242E40 44061000 */ mfc1 $a2, $f2 +/* 96C004 80242E44 C7A20070 */ lwc1 $f2, 0x70($sp) +/* 96C008 80242E48 3C0141F0 */ lui $at, 0x41f0 +/* 96C00C 80242E4C 44810000 */ mtc1 $at, $f0 +/* 96C010 80242E50 44071000 */ mfc1 $a3, $f2 +/* 96C014 80242E54 0000202D */ daddu $a0, $zero, $zero +/* 96C018 80242E58 0C01BFBC */ jal func_8006FEF0 +/* 96C01C 80242E5C E7A00010 */ swc1 $f0, 0x10($sp) +/* 96C020 80242E60 0C05272D */ jal play_sound +/* 96C024 80242E64 24040206 */ addiu $a0, $zero, 0x206 +/* 96C028 80242E68 0000282D */ daddu $a1, $zero, $zero +/* 96C02C 80242E6C 3C048025 */ lui $a0, 0x8025 +/* 96C030 80242E70 2484EF90 */ addiu $a0, $a0, -0x1070 +.L80242E74: +/* 96C034 80242E74 8C820000 */ lw $v0, ($a0) +/* 96C038 80242E78 8C430000 */ lw $v1, ($v0) +/* 96C03C 80242E7C 24A50001 */ addiu $a1, $a1, 1 +/* 96C040 80242E80 34630010 */ ori $v1, $v1, 0x10 +/* 96C044 80242E84 AC430000 */ sw $v1, ($v0) +/* 96C048 80242E88 28A20004 */ slti $v0, $a1, 4 +/* 96C04C 80242E8C 1440FFF9 */ bnez $v0, .L80242E74 +/* 96C050 80242E90 24840004 */ addiu $a0, $a0, 4 +.L80242E94: +/* 96C054 80242E94 8FBF0080 */ lw $ra, 0x80($sp) +/* 96C058 80242E98 8FB1007C */ lw $s1, 0x7c($sp) +/* 96C05C 80242E9C 8FB00078 */ lw $s0, 0x78($sp) +/* 96C060 80242EA0 D7B40088 */ ldc1 $f20, 0x88($sp) +/* 96C064 80242EA4 03E00008 */ jr $ra +/* 96C068 80242EA8 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC.s deleted file mode 100644 index a0e05df7b3..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EAC -/* 96C06C 80242EAC 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 96C070 80242EB0 3C05F4AC */ lui $a1, 0xf4ac -/* 96C074 80242EB4 AFB20068 */ sw $s2, 0x68($sp) -/* 96C078 80242EB8 3C128025 */ lui $s2, 0x8025 -/* 96C07C 80242EBC 2652EFCC */ addiu $s2, $s2, -0x1034 -/* 96C080 80242EC0 AFBF006C */ sw $ra, 0x6c($sp) -/* 96C084 80242EC4 AFB10064 */ sw $s1, 0x64($sp) -/* 96C088 80242EC8 AFB00060 */ sw $s0, 0x60($sp) -/* 96C08C 80242ECC F7B60078 */ sdc1 $f22, 0x78($sp) -/* 96C090 80242ED0 F7B40070 */ sdc1 $f20, 0x70($sp) -/* 96C094 80242ED4 8E440000 */ lw $a0, ($s2) -/* 96C098 80242ED8 0C0B1EAF */ jal get_variable -/* 96C09C 80242EDC 34A5D484 */ ori $a1, $a1, 0xd484 -/* 96C0A0 80242EE0 3C05F4AC */ lui $a1, 0xf4ac -/* 96C0A4 80242EE4 8E440000 */ lw $a0, ($s2) -/* 96C0A8 80242EE8 4482B000 */ mtc1 $v0, $f22 -/* 96C0AC 80242EEC 00000000 */ nop -/* 96C0B0 80242EF0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 96C0B4 80242EF4 0C0B1EAF */ jal get_variable -/* 96C0B8 80242EF8 34A5D485 */ ori $a1, $a1, 0xd485 -/* 96C0BC 80242EFC 3C05F4AC */ lui $a1, 0xf4ac -/* 96C0C0 80242F00 8E440000 */ lw $a0, ($s2) -/* 96C0C4 80242F04 4482A000 */ mtc1 $v0, $f20 -/* 96C0C8 80242F08 00000000 */ nop -/* 96C0CC 80242F0C 4680A520 */ cvt.s.w $f20, $f20 -/* 96C0D0 80242F10 0C0B1EAF */ jal get_variable -/* 96C0D4 80242F14 34A5D486 */ ori $a1, $a1, 0xd486 -/* 96C0D8 80242F18 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 96C0DC 80242F1C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 96C0E0 80242F20 44800000 */ mtc1 $zero, $f0 -/* 96C0E4 80242F24 00041880 */ sll $v1, $a0, 2 -/* 96C0E8 80242F28 00641821 */ addu $v1, $v1, $a0 -/* 96C0EC 80242F2C 00031880 */ sll $v1, $v1, 2 -/* 96C0F0 80242F30 00641823 */ subu $v1, $v1, $a0 -/* 96C0F4 80242F34 000320C0 */ sll $a0, $v1, 3 -/* 96C0F8 80242F38 00641821 */ addu $v1, $v1, $a0 -/* 96C0FC 80242F3C 000318C0 */ sll $v1, $v1, 3 -/* 96C100 80242F40 44050000 */ mfc1 $a1, $f0 -/* 96C104 80242F44 3C01800B */ lui $at, 0x800b -/* 96C108 80242F48 00230821 */ addu $at, $at, $v1 -/* 96C10C 80242F4C C4221DEC */ lwc1 $f2, 0x1dec($at) -/* 96C110 80242F50 3C013F36 */ lui $at, 0x3f36 -/* 96C114 80242F54 3421DB6E */ ori $at, $at, 0xdb6e -/* 96C118 80242F58 44810000 */ mtc1 $at, $f0 -/* 96C11C 80242F5C 27A40020 */ addiu $a0, $sp, 0x20 -/* 96C120 80242F60 E7B60014 */ swc1 $f22, 0x14($sp) -/* 96C124 80242F64 E7B40018 */ swc1 $f20, 0x18($sp) -/* 96C128 80242F68 E7A00010 */ swc1 $f0, 0x10($sp) -/* 96C12C 80242F6C 44820000 */ mtc1 $v0, $f0 -/* 96C130 80242F70 00000000 */ nop -/* 96C134 80242F74 46800020 */ cvt.s.w $f0, $f0 -/* 96C138 80242F78 46001087 */ neg.s $f2, $f2 -/* 96C13C 80242F7C 44061000 */ mfc1 $a2, $f2 -/* 96C140 80242F80 00A0382D */ daddu $a3, $a1, $zero -/* 96C144 80242F84 0C018FC4 */ jal guPositionF -/* 96C148 80242F88 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 96C14C 80242F8C 3C108025 */ lui $s0, 0x8025 -/* 96C150 80242F90 2610F010 */ addiu $s0, $s0, -0xff0 -/* 96C154 80242F94 0200202D */ daddu $a0, $s0, $zero -/* 96C158 80242F98 0C090643 */ jal func_8024190C -/* 96C15C 80242F9C 27A50020 */ addiu $a1, $sp, 0x20 -/* 96C160 80242FA0 26040024 */ addiu $a0, $s0, 0x24 -/* 96C164 80242FA4 27A50020 */ addiu $a1, $sp, 0x20 -/* 96C168 80242FA8 0C090643 */ jal func_8024190C -/* 96C16C 80242FAC 0040882D */ daddu $s1, $v0, $zero -/* 96C170 80242FB0 26040048 */ addiu $a0, $s0, 0x48 -/* 96C174 80242FB4 0C090643 */ jal func_8024190C -/* 96C178 80242FB8 27A50020 */ addiu $a1, $sp, 0x20 -/* 96C17C 80242FBC 8E030000 */ lw $v1, ($s0) -/* 96C180 80242FC0 24020002 */ addiu $v0, $zero, 2 -/* 96C184 80242FC4 14620008 */ bne $v1, $v0, .L80242FE8 -/* 96C188 80242FC8 2622FFFF */ addiu $v0, $s1, -1 -/* 96C18C 80242FCC 2C420002 */ sltiu $v0, $v0, 2 -/* 96C190 80242FD0 10400005 */ beqz $v0, .L80242FE8 -/* 96C194 80242FD4 3C05F4AC */ lui $a1, 0xf4ac -/* 96C198 80242FD8 8E440000 */ lw $a0, ($s2) -/* 96C19C 80242FDC 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96C1A0 80242FE0 0C0B2026 */ jal set_variable -/* 96C1A4 80242FE4 24060003 */ addiu $a2, $zero, 3 -.L80242FE8: -/* 96C1A8 80242FE8 3C038025 */ lui $v1, 0x8025 -/* 96C1AC 80242FEC 8C63F010 */ lw $v1, -0xff0($v1) -/* 96C1B0 80242FF0 24020003 */ addiu $v0, $zero, 3 -/* 96C1B4 80242FF4 14620009 */ bne $v1, $v0, .L8024301C -/* 96C1B8 80242FF8 2622FFFF */ addiu $v0, $s1, -1 -/* 96C1BC 80242FFC 2C420002 */ sltiu $v0, $v0, 2 -/* 96C1C0 80243000 10400006 */ beqz $v0, .L8024301C -/* 96C1C4 80243004 3C05F4AC */ lui $a1, 0xf4ac -/* 96C1C8 80243008 3C048025 */ lui $a0, 0x8025 -/* 96C1CC 8024300C 8C84EFCC */ lw $a0, -0x1034($a0) -/* 96C1D0 80243010 34A5D489 */ ori $a1, $a1, 0xd489 -/* 96C1D4 80243014 0C0B2026 */ jal set_variable -/* 96C1D8 80243018 2406000B */ addiu $a2, $zero, 0xb -.L8024301C: -/* 96C1DC 8024301C 8FBF006C */ lw $ra, 0x6c($sp) -/* 96C1E0 80243020 8FB20068 */ lw $s2, 0x68($sp) -/* 96C1E4 80243024 8FB10064 */ lw $s1, 0x64($sp) -/* 96C1E8 80243028 8FB00060 */ lw $s0, 0x60($sp) -/* 96C1EC 8024302C D7B60078 */ ldc1 $f22, 0x78($sp) -/* 96C1F0 80243030 D7B40070 */ ldc1 $f20, 0x70($sp) -/* 96C1F4 80243034 03E00008 */ jr $ra -/* 96C1F8 80243038 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s new file mode 100644 index 0000000000..0873d7090b --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80242EAC_96C06C.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242EAC_96C06C +/* 96C06C 80242EAC 27BDFF80 */ addiu $sp, $sp, -0x80 +/* 96C070 80242EB0 3C05F4AC */ lui $a1, 0xf4ac +/* 96C074 80242EB4 AFB20068 */ sw $s2, 0x68($sp) +/* 96C078 80242EB8 3C128025 */ lui $s2, 0x8025 +/* 96C07C 80242EBC 2652EFCC */ addiu $s2, $s2, -0x1034 +/* 96C080 80242EC0 AFBF006C */ sw $ra, 0x6c($sp) +/* 96C084 80242EC4 AFB10064 */ sw $s1, 0x64($sp) +/* 96C088 80242EC8 AFB00060 */ sw $s0, 0x60($sp) +/* 96C08C 80242ECC F7B60078 */ sdc1 $f22, 0x78($sp) +/* 96C090 80242ED0 F7B40070 */ sdc1 $f20, 0x70($sp) +/* 96C094 80242ED4 8E440000 */ lw $a0, ($s2) +/* 96C098 80242ED8 0C0B1EAF */ jal get_variable +/* 96C09C 80242EDC 34A5D484 */ ori $a1, $a1, 0xd484 +/* 96C0A0 80242EE0 3C05F4AC */ lui $a1, 0xf4ac +/* 96C0A4 80242EE4 8E440000 */ lw $a0, ($s2) +/* 96C0A8 80242EE8 4482B000 */ mtc1 $v0, $f22 +/* 96C0AC 80242EEC 00000000 */ nop +/* 96C0B0 80242EF0 4680B5A0 */ cvt.s.w $f22, $f22 +/* 96C0B4 80242EF4 0C0B1EAF */ jal get_variable +/* 96C0B8 80242EF8 34A5D485 */ ori $a1, $a1, 0xd485 +/* 96C0BC 80242EFC 3C05F4AC */ lui $a1, 0xf4ac +/* 96C0C0 80242F00 8E440000 */ lw $a0, ($s2) +/* 96C0C4 80242F04 4482A000 */ mtc1 $v0, $f20 +/* 96C0C8 80242F08 00000000 */ nop +/* 96C0CC 80242F0C 4680A520 */ cvt.s.w $f20, $f20 +/* 96C0D0 80242F10 0C0B1EAF */ jal get_variable +/* 96C0D4 80242F14 34A5D486 */ ori $a1, $a1, 0xd486 +/* 96C0D8 80242F18 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 96C0DC 80242F1C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 96C0E0 80242F20 44800000 */ mtc1 $zero, $f0 +/* 96C0E4 80242F24 00041880 */ sll $v1, $a0, 2 +/* 96C0E8 80242F28 00641821 */ addu $v1, $v1, $a0 +/* 96C0EC 80242F2C 00031880 */ sll $v1, $v1, 2 +/* 96C0F0 80242F30 00641823 */ subu $v1, $v1, $a0 +/* 96C0F4 80242F34 000320C0 */ sll $a0, $v1, 3 +/* 96C0F8 80242F38 00641821 */ addu $v1, $v1, $a0 +/* 96C0FC 80242F3C 000318C0 */ sll $v1, $v1, 3 +/* 96C100 80242F40 44050000 */ mfc1 $a1, $f0 +/* 96C104 80242F44 3C01800B */ lui $at, 0x800b +/* 96C108 80242F48 00230821 */ addu $at, $at, $v1 +/* 96C10C 80242F4C C4221DEC */ lwc1 $f2, 0x1dec($at) +/* 96C110 80242F50 3C013F36 */ lui $at, 0x3f36 +/* 96C114 80242F54 3421DB6E */ ori $at, $at, 0xdb6e +/* 96C118 80242F58 44810000 */ mtc1 $at, $f0 +/* 96C11C 80242F5C 27A40020 */ addiu $a0, $sp, 0x20 +/* 96C120 80242F60 E7B60014 */ swc1 $f22, 0x14($sp) +/* 96C124 80242F64 E7B40018 */ swc1 $f20, 0x18($sp) +/* 96C128 80242F68 E7A00010 */ swc1 $f0, 0x10($sp) +/* 96C12C 80242F6C 44820000 */ mtc1 $v0, $f0 +/* 96C130 80242F70 00000000 */ nop +/* 96C134 80242F74 46800020 */ cvt.s.w $f0, $f0 +/* 96C138 80242F78 46001087 */ neg.s $f2, $f2 +/* 96C13C 80242F7C 44061000 */ mfc1 $a2, $f2 +/* 96C140 80242F80 00A0382D */ daddu $a3, $a1, $zero +/* 96C144 80242F84 0C018FC4 */ jal guPositionF +/* 96C148 80242F88 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 96C14C 80242F8C 3C108025 */ lui $s0, 0x8025 +/* 96C150 80242F90 2610F010 */ addiu $s0, $s0, -0xff0 +/* 96C154 80242F94 0200202D */ daddu $a0, $s0, $zero +/* 96C158 80242F98 0C090643 */ jal func_8024190C_96AACC +/* 96C15C 80242F9C 27A50020 */ addiu $a1, $sp, 0x20 +/* 96C160 80242FA0 26040024 */ addiu $a0, $s0, 0x24 +/* 96C164 80242FA4 27A50020 */ addiu $a1, $sp, 0x20 +/* 96C168 80242FA8 0C090643 */ jal func_8024190C_96AACC +/* 96C16C 80242FAC 0040882D */ daddu $s1, $v0, $zero +/* 96C170 80242FB0 26040048 */ addiu $a0, $s0, 0x48 +/* 96C174 80242FB4 0C090643 */ jal func_8024190C_96AACC +/* 96C178 80242FB8 27A50020 */ addiu $a1, $sp, 0x20 +/* 96C17C 80242FBC 8E030000 */ lw $v1, ($s0) +/* 96C180 80242FC0 24020002 */ addiu $v0, $zero, 2 +/* 96C184 80242FC4 14620008 */ bne $v1, $v0, .L80242FE8 +/* 96C188 80242FC8 2622FFFF */ addiu $v0, $s1, -1 +/* 96C18C 80242FCC 2C420002 */ sltiu $v0, $v0, 2 +/* 96C190 80242FD0 10400005 */ beqz $v0, .L80242FE8 +/* 96C194 80242FD4 3C05F4AC */ lui $a1, 0xf4ac +/* 96C198 80242FD8 8E440000 */ lw $a0, ($s2) +/* 96C19C 80242FDC 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96C1A0 80242FE0 0C0B2026 */ jal set_variable +/* 96C1A4 80242FE4 24060003 */ addiu $a2, $zero, 3 +.L80242FE8: +/* 96C1A8 80242FE8 3C038025 */ lui $v1, 0x8025 +/* 96C1AC 80242FEC 8C63F010 */ lw $v1, -0xff0($v1) +/* 96C1B0 80242FF0 24020003 */ addiu $v0, $zero, 3 +/* 96C1B4 80242FF4 14620009 */ bne $v1, $v0, .L8024301C +/* 96C1B8 80242FF8 2622FFFF */ addiu $v0, $s1, -1 +/* 96C1BC 80242FFC 2C420002 */ sltiu $v0, $v0, 2 +/* 96C1C0 80243000 10400006 */ beqz $v0, .L8024301C +/* 96C1C4 80243004 3C05F4AC */ lui $a1, 0xf4ac +/* 96C1C8 80243008 3C048025 */ lui $a0, 0x8025 +/* 96C1CC 8024300C 8C84EFCC */ lw $a0, -0x1034($a0) +/* 96C1D0 80243010 34A5D489 */ ori $a1, $a1, 0xd489 +/* 96C1D4 80243014 0C0B2026 */ jal set_variable +/* 96C1D8 80243018 2406000B */ addiu $a2, $zero, 0xb +.L8024301C: +/* 96C1DC 8024301C 8FBF006C */ lw $ra, 0x6c($sp) +/* 96C1E0 80243020 8FB20068 */ lw $s2, 0x68($sp) +/* 96C1E4 80243024 8FB10064 */ lw $s1, 0x64($sp) +/* 96C1E8 80243028 8FB00060 */ lw $s0, 0x60($sp) +/* 96C1EC 8024302C D7B60078 */ ldc1 $f22, 0x78($sp) +/* 96C1F0 80243030 D7B40070 */ ldc1 $f20, 0x70($sp) +/* 96C1F4 80243034 03E00008 */ jr $ra +/* 96C1F8 80243038 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C.s deleted file mode 100644 index 3c1cc4fbe0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024303C -/* 96C1FC 8024303C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C200 80243040 2404202A */ addiu $a0, $zero, 0x202a -/* 96C204 80243044 0000282D */ daddu $a1, $zero, $zero -/* 96C208 80243048 24060018 */ addiu $a2, $zero, 0x18 -/* 96C20C 8024304C AFBF0010 */ sw $ra, 0x10($sp) -/* 96C210 80243050 0C0526AE */ jal _play_sound -/* 96C214 80243054 00A0382D */ daddu $a3, $a1, $zero -/* 96C218 80243058 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C21C 8024305C 24020002 */ addiu $v0, $zero, 2 -/* 96C220 80243060 03E00008 */ jr $ra -/* 96C224 80243064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s new file mode 100644 index 0000000000..5a6be9fa69 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024303C_96C1FC.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024303C_96C1FC +/* 96C1FC 8024303C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C200 80243040 2404202A */ addiu $a0, $zero, 0x202a +/* 96C204 80243044 0000282D */ daddu $a1, $zero, $zero +/* 96C208 80243048 24060018 */ addiu $a2, $zero, 0x18 +/* 96C20C 8024304C AFBF0010 */ sw $ra, 0x10($sp) +/* 96C210 80243050 0C0526AE */ jal _play_sound +/* 96C214 80243054 00A0382D */ daddu $a3, $a1, $zero +/* 96C218 80243058 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C21C 8024305C 24020002 */ addiu $v0, $zero, 2 +/* 96C220 80243060 03E00008 */ jr $ra +/* 96C224 80243064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068.s deleted file mode 100644 index d39b83f017..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243068 -/* 96C228 80243068 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C22C 8024306C 2404202B */ addiu $a0, $zero, 0x202b -/* 96C230 80243070 0000282D */ daddu $a1, $zero, $zero -/* 96C234 80243074 24060068 */ addiu $a2, $zero, 0x68 -/* 96C238 80243078 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C23C 8024307C 0C0526AE */ jal _play_sound -/* 96C240 80243080 00A0382D */ daddu $a3, $a1, $zero -/* 96C244 80243084 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C248 80243088 24020002 */ addiu $v0, $zero, 2 -/* 96C24C 8024308C 03E00008 */ jr $ra -/* 96C250 80243090 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s new file mode 100644 index 0000000000..78b5428668 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243068_96C228.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243068_96C228 +/* 96C228 80243068 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C22C 8024306C 2404202B */ addiu $a0, $zero, 0x202b +/* 96C230 80243070 0000282D */ daddu $a1, $zero, $zero +/* 96C234 80243074 24060068 */ addiu $a2, $zero, 0x68 +/* 96C238 80243078 AFBF0010 */ sw $ra, 0x10($sp) +/* 96C23C 8024307C 0C0526AE */ jal _play_sound +/* 96C240 80243080 00A0382D */ daddu $a3, $a1, $zero +/* 96C244 80243084 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C248 80243088 24020002 */ addiu $v0, $zero, 2 +/* 96C24C 8024308C 03E00008 */ jr $ra +/* 96C250 80243090 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0.s deleted file mode 100644 index cfe82f412d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802432C0 -/* 96C480 802432C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C484 802432C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C488 802432C8 10A00003 */ beqz $a1, .L802432D8 -/* 96C48C 802432CC 8C86000C */ lw $a2, 0xc($a0) -/* 96C490 802432D0 3C018025 */ lui $at, 0x8025 -/* 96C494 802432D4 AC208780 */ sw $zero, -0x7880($at) -.L802432D8: -/* 96C498 802432D8 3C038025 */ lui $v1, 0x8025 -/* 96C49C 802432DC 24638780 */ addiu $v1, $v1, -0x7880 -/* 96C4A0 802432E0 8C620000 */ lw $v0, ($v1) -/* 96C4A4 802432E4 54400003 */ bnel $v0, $zero, .L802432F4 -/* 96C4A8 802432E8 AC600000 */ sw $zero, ($v1) -/* 96C4AC 802432EC 08090CC2 */ j .L80243308 -/* 96C4B0 802432F0 0000102D */ daddu $v0, $zero, $zero -.L802432F4: -/* 96C4B4 802432F4 8CC50000 */ lw $a1, ($a2) -/* 96C4B8 802432F8 3C068025 */ lui $a2, 0x8025 -/* 96C4BC 802432FC 0C0B2026 */ jal set_variable -/* 96C4C0 80243300 8CC68784 */ lw $a2, -0x787c($a2) -/* 96C4C4 80243304 24020002 */ addiu $v0, $zero, 2 -.L80243308: -/* 96C4C8 80243308 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C4CC 8024330C 03E00008 */ jr $ra -/* 96C4D0 80243310 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s new file mode 100644 index 0000000000..765b209198 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802432C0_96C480.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802432C0_96C480 +/* 96C480 802432C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C484 802432C4 AFBF0010 */ sw $ra, 0x10($sp) +/* 96C488 802432C8 10A00003 */ beqz $a1, .L802432D8 +/* 96C48C 802432CC 8C86000C */ lw $a2, 0xc($a0) +/* 96C490 802432D0 3C018025 */ lui $at, 0x8025 +/* 96C494 802432D4 AC208780 */ sw $zero, -0x7880($at) +.L802432D8: +/* 96C498 802432D8 3C038025 */ lui $v1, 0x8025 +/* 96C49C 802432DC 24638780 */ addiu $v1, $v1, -0x7880 +/* 96C4A0 802432E0 8C620000 */ lw $v0, ($v1) +/* 96C4A4 802432E4 54400003 */ bnel $v0, $zero, .L802432F4 +/* 96C4A8 802432E8 AC600000 */ sw $zero, ($v1) +/* 96C4AC 802432EC 08090CC2 */ j .L80243308 +/* 96C4B0 802432F0 0000102D */ daddu $v0, $zero, $zero +.L802432F4: +/* 96C4B4 802432F4 8CC50000 */ lw $a1, ($a2) +/* 96C4B8 802432F8 3C068025 */ lui $a2, 0x8025 +/* 96C4BC 802432FC 0C0B2026 */ jal set_variable +/* 96C4C0 80243300 8CC68784 */ lw $a2, -0x787c($a2) +/* 96C4C4 80243304 24020002 */ addiu $v0, $zero, 2 +.L80243308: +/* 96C4C8 80243308 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C4CC 8024330C 03E00008 */ jr $ra +/* 96C4D0 80243310 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314.s deleted file mode 100644 index 2b691060dc..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243314 -/* 96C4D4 80243314 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C4D8 80243318 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C4DC 8024331C 8C82000C */ lw $v0, 0xc($a0) -/* 96C4E0 80243320 0C0B1EAF */ jal get_variable -/* 96C4E4 80243324 8C450000 */ lw $a1, ($v0) -/* 96C4E8 80243328 3C018025 */ lui $at, 0x8025 -/* 96C4EC 8024332C AC228784 */ sw $v0, -0x787c($at) -/* 96C4F0 80243330 24020002 */ addiu $v0, $zero, 2 -/* 96C4F4 80243334 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C4F8 80243338 24030001 */ addiu $v1, $zero, 1 -/* 96C4FC 8024333C 3C018025 */ lui $at, 0x8025 -/* 96C500 80243340 AC238780 */ sw $v1, -0x7880($at) -/* 96C504 80243344 03E00008 */ jr $ra -/* 96C508 80243348 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s new file mode 100644 index 0000000000..877dbacdd7 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243314_96C4D4.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243314_96C4D4 +/* 96C4D4 80243314 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C4D8 80243318 AFBF0010 */ sw $ra, 0x10($sp) +/* 96C4DC 8024331C 8C82000C */ lw $v0, 0xc($a0) +/* 96C4E0 80243320 0C0B1EAF */ jal get_variable +/* 96C4E4 80243324 8C450000 */ lw $a1, ($v0) +/* 96C4E8 80243328 3C018025 */ lui $at, 0x8025 +/* 96C4EC 8024332C AC228784 */ sw $v0, -0x787c($at) +/* 96C4F0 80243330 24020002 */ addiu $v0, $zero, 2 +/* 96C4F4 80243334 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C4F8 80243338 24030001 */ addiu $v1, $zero, 1 +/* 96C4FC 8024333C 3C018025 */ lui $at, 0x8025 +/* 96C500 80243340 AC238780 */ sw $v1, -0x7880($at) +/* 96C504 80243344 03E00008 */ jr $ra +/* 96C508 80243348 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C.s deleted file mode 100644 index 40d489dd06..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024334C -/* 96C50C 8024334C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C510 80243350 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C514 80243354 8C82000C */ lw $v0, 0xc($a0) -/* 96C518 80243358 0C0B1EAF */ jal get_variable -/* 96C51C 8024335C 8C450000 */ lw $a1, ($v0) -/* 96C520 80243360 0040182D */ daddu $v1, $v0, $zero -/* 96C524 80243364 10600012 */ beqz $v1, .L802433B0 -/* 96C528 80243368 0000202D */ daddu $a0, $zero, $zero -/* 96C52C 8024336C 8C620000 */ lw $v0, ($v1) -/* 96C530 80243370 5040000A */ beql $v0, $zero, .L8024339C -/* 96C534 80243374 00041080 */ sll $v0, $a0, 2 -/* 96C538 80243378 3C058025 */ lui $a1, 0x8025 -/* 96C53C 8024337C 24A5F080 */ addiu $a1, $a1, -0xf80 -.L80243380: -/* 96C540 80243380 24630004 */ addiu $v1, $v1, 4 -/* 96C544 80243384 24840001 */ addiu $a0, $a0, 1 -/* 96C548 80243388 ACA20000 */ sw $v0, ($a1) -/* 96C54C 8024338C 8C620000 */ lw $v0, ($v1) -/* 96C550 80243390 1440FFFB */ bnez $v0, .L80243380 -/* 96C554 80243394 24A50004 */ addiu $a1, $a1, 4 -/* 96C558 80243398 00041080 */ sll $v0, $a0, 2 -.L8024339C: -/* 96C55C 8024339C 3C018025 */ lui $at, 0x8025 -/* 96C560 802433A0 00220821 */ addu $at, $at, $v0 -/* 96C564 802433A4 AC20F080 */ sw $zero, -0xf80($at) -/* 96C568 802433A8 08090CF6 */ j .L802433D8 -/* 96C56C 802433AC 00000000 */ nop -.L802433B0: -/* 96C570 802433B0 3C038025 */ lui $v1, 0x8025 -/* 96C574 802433B4 2463F080 */ addiu $v1, $v1, -0xf80 -/* 96C578 802433B8 0060282D */ daddu $a1, $v1, $zero -.L802433BC: -/* 96C57C 802433BC 24820010 */ addiu $v0, $a0, 0x10 -/* 96C580 802433C0 AC620000 */ sw $v0, ($v1) -/* 96C584 802433C4 24630004 */ addiu $v1, $v1, 4 -/* 96C588 802433C8 24840001 */ addiu $a0, $a0, 1 -/* 96C58C 802433CC 28820070 */ slti $v0, $a0, 0x70 -/* 96C590 802433D0 1440FFFA */ bnez $v0, .L802433BC -/* 96C594 802433D4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802433D8: -/* 96C598 802433D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C59C 802433DC 24020002 */ addiu $v0, $zero, 2 -/* 96C5A0 802433E0 03E00008 */ jr $ra -/* 96C5A4 802433E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s new file mode 100644 index 0000000000..4e2ff9dd71 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024334C_96C50C.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024334C_96C50C +/* 96C50C 8024334C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C510 80243350 AFBF0010 */ sw $ra, 0x10($sp) +/* 96C514 80243354 8C82000C */ lw $v0, 0xc($a0) +/* 96C518 80243358 0C0B1EAF */ jal get_variable +/* 96C51C 8024335C 8C450000 */ lw $a1, ($v0) +/* 96C520 80243360 0040182D */ daddu $v1, $v0, $zero +/* 96C524 80243364 10600012 */ beqz $v1, .L802433B0 +/* 96C528 80243368 0000202D */ daddu $a0, $zero, $zero +/* 96C52C 8024336C 8C620000 */ lw $v0, ($v1) +/* 96C530 80243370 5040000A */ beql $v0, $zero, .L8024339C +/* 96C534 80243374 00041080 */ sll $v0, $a0, 2 +/* 96C538 80243378 3C058025 */ lui $a1, 0x8025 +/* 96C53C 8024337C 24A5F080 */ addiu $a1, $a1, -0xf80 +.L80243380: +/* 96C540 80243380 24630004 */ addiu $v1, $v1, 4 +/* 96C544 80243384 24840001 */ addiu $a0, $a0, 1 +/* 96C548 80243388 ACA20000 */ sw $v0, ($a1) +/* 96C54C 8024338C 8C620000 */ lw $v0, ($v1) +/* 96C550 80243390 1440FFFB */ bnez $v0, .L80243380 +/* 96C554 80243394 24A50004 */ addiu $a1, $a1, 4 +/* 96C558 80243398 00041080 */ sll $v0, $a0, 2 +.L8024339C: +/* 96C55C 8024339C 3C018025 */ lui $at, 0x8025 +/* 96C560 802433A0 00220821 */ addu $at, $at, $v0 +/* 96C564 802433A4 AC20F080 */ sw $zero, -0xf80($at) +/* 96C568 802433A8 08090CF6 */ j .L802433D8 +/* 96C56C 802433AC 00000000 */ nop +.L802433B0: +/* 96C570 802433B0 3C038025 */ lui $v1, 0x8025 +/* 96C574 802433B4 2463F080 */ addiu $v1, $v1, -0xf80 +/* 96C578 802433B8 0060282D */ daddu $a1, $v1, $zero +.L802433BC: +/* 96C57C 802433BC 24820010 */ addiu $v0, $a0, 0x10 +/* 96C580 802433C0 AC620000 */ sw $v0, ($v1) +/* 96C584 802433C4 24630004 */ addiu $v1, $v1, 4 +/* 96C588 802433C8 24840001 */ addiu $a0, $a0, 1 +/* 96C58C 802433CC 28820070 */ slti $v0, $a0, 0x70 +/* 96C590 802433D0 1440FFFA */ bnez $v0, .L802433BC +/* 96C594 802433D4 ACA001C0 */ sw $zero, 0x1c0($a1) +.L802433D8: +/* 96C598 802433D8 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C59C 802433DC 24020002 */ addiu $v0, $zero, 2 +/* 96C5A0 802433E0 03E00008 */ jr $ra +/* 96C5A4 802433E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8.s deleted file mode 100644 index a5ae655e1c..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433E8 -/* 96C5A8 802433E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C5AC 802433EC AFBF0010 */ sw $ra, 0x10($sp) -/* 96C5B0 802433F0 8C82000C */ lw $v0, 0xc($a0) -/* 96C5B4 802433F4 0C0B1EAF */ jal get_variable -/* 96C5B8 802433F8 8C450000 */ lw $a1, ($v0) -/* 96C5BC 802433FC 0040182D */ daddu $v1, $v0, $zero -/* 96C5C0 80243400 10600012 */ beqz $v1, .L8024344C -/* 96C5C4 80243404 0000202D */ daddu $a0, $zero, $zero -/* 96C5C8 80243408 8C620000 */ lw $v0, ($v1) -/* 96C5CC 8024340C 5040000A */ beql $v0, $zero, .L80243438 -/* 96C5D0 80243410 00041080 */ sll $v0, $a0, 2 -/* 96C5D4 80243414 3C058025 */ lui $a1, 0x8025 -/* 96C5D8 80243418 24A5F248 */ addiu $a1, $a1, -0xdb8 -.L8024341C: -/* 96C5DC 8024341C 24630004 */ addiu $v1, $v1, 4 -/* 96C5E0 80243420 24840001 */ addiu $a0, $a0, 1 -/* 96C5E4 80243424 ACA20000 */ sw $v0, ($a1) -/* 96C5E8 80243428 8C620000 */ lw $v0, ($v1) -/* 96C5EC 8024342C 1440FFFB */ bnez $v0, .L8024341C -/* 96C5F0 80243430 24A50004 */ addiu $a1, $a1, 4 -/* 96C5F4 80243434 00041080 */ sll $v0, $a0, 2 -.L80243438: -/* 96C5F8 80243438 3C018025 */ lui $at, 0x8025 -/* 96C5FC 8024343C 00220821 */ addu $at, $at, $v0 -/* 96C600 80243440 AC20F248 */ sw $zero, -0xdb8($at) -/* 96C604 80243444 08090D1D */ j .L80243474 -/* 96C608 80243448 00000000 */ nop -.L8024344C: -/* 96C60C 8024344C 3C038025 */ lui $v1, 0x8025 -/* 96C610 80243450 2463F248 */ addiu $v1, $v1, -0xdb8 -/* 96C614 80243454 0060282D */ daddu $a1, $v1, $zero -.L80243458: -/* 96C618 80243458 24820080 */ addiu $v0, $a0, 0x80 -/* 96C61C 8024345C AC620000 */ sw $v0, ($v1) -/* 96C620 80243460 24630004 */ addiu $v1, $v1, 4 -/* 96C624 80243464 24840001 */ addiu $a0, $a0, 1 -/* 96C628 80243468 2882005B */ slti $v0, $a0, 0x5b -/* 96C62C 8024346C 1440FFFA */ bnez $v0, .L80243458 -/* 96C630 80243470 ACA0016C */ sw $zero, 0x16c($a1) -.L80243474: -/* 96C634 80243474 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C638 80243478 24020002 */ addiu $v0, $zero, 2 -/* 96C63C 8024347C 03E00008 */ jr $ra -/* 96C640 80243480 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s new file mode 100644 index 0000000000..08889f3393 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802433E8_96C5A8.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802433E8_96C5A8 +/* 96C5A8 802433E8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C5AC 802433EC AFBF0010 */ sw $ra, 0x10($sp) +/* 96C5B0 802433F0 8C82000C */ lw $v0, 0xc($a0) +/* 96C5B4 802433F4 0C0B1EAF */ jal get_variable +/* 96C5B8 802433F8 8C450000 */ lw $a1, ($v0) +/* 96C5BC 802433FC 0040182D */ daddu $v1, $v0, $zero +/* 96C5C0 80243400 10600012 */ beqz $v1, .L8024344C +/* 96C5C4 80243404 0000202D */ daddu $a0, $zero, $zero +/* 96C5C8 80243408 8C620000 */ lw $v0, ($v1) +/* 96C5CC 8024340C 5040000A */ beql $v0, $zero, .L80243438 +/* 96C5D0 80243410 00041080 */ sll $v0, $a0, 2 +/* 96C5D4 80243414 3C058025 */ lui $a1, 0x8025 +/* 96C5D8 80243418 24A5F248 */ addiu $a1, $a1, -0xdb8 +.L8024341C: +/* 96C5DC 8024341C 24630004 */ addiu $v1, $v1, 4 +/* 96C5E0 80243420 24840001 */ addiu $a0, $a0, 1 +/* 96C5E4 80243424 ACA20000 */ sw $v0, ($a1) +/* 96C5E8 80243428 8C620000 */ lw $v0, ($v1) +/* 96C5EC 8024342C 1440FFFB */ bnez $v0, .L8024341C +/* 96C5F0 80243430 24A50004 */ addiu $a1, $a1, 4 +/* 96C5F4 80243434 00041080 */ sll $v0, $a0, 2 +.L80243438: +/* 96C5F8 80243438 3C018025 */ lui $at, 0x8025 +/* 96C5FC 8024343C 00220821 */ addu $at, $at, $v0 +/* 96C600 80243440 AC20F248 */ sw $zero, -0xdb8($at) +/* 96C604 80243444 08090D1D */ j .L80243474 +/* 96C608 80243448 00000000 */ nop +.L8024344C: +/* 96C60C 8024344C 3C038025 */ lui $v1, 0x8025 +/* 96C610 80243450 2463F248 */ addiu $v1, $v1, -0xdb8 +/* 96C614 80243454 0060282D */ daddu $a1, $v1, $zero +.L80243458: +/* 96C618 80243458 24820080 */ addiu $v0, $a0, 0x80 +/* 96C61C 8024345C AC620000 */ sw $v0, ($v1) +/* 96C620 80243460 24630004 */ addiu $v1, $v1, 4 +/* 96C624 80243464 24840001 */ addiu $a0, $a0, 1 +/* 96C628 80243468 2882005B */ slti $v0, $a0, 0x5b +/* 96C62C 8024346C 1440FFFA */ bnez $v0, .L80243458 +/* 96C630 80243470 ACA0016C */ sw $zero, 0x16c($a1) +.L80243474: +/* 96C634 80243474 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C638 80243478 24020002 */ addiu $v0, $zero, 2 +/* 96C63C 8024347C 03E00008 */ jr $ra +/* 96C640 80243480 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484.s deleted file mode 100644 index c23d74d092..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243484 -/* 96C644 80243484 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C648 80243488 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C64C 8024348C 0C03A625 */ jal func_800E9894 -/* 96C650 80243490 00000000 */ nop -/* 96C654 80243494 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C658 80243498 24020002 */ addiu $v0, $zero, 2 -/* 96C65C 8024349C 03E00008 */ jr $ra -/* 96C660 802434A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s new file mode 100644 index 0000000000..80d6c097f8 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243484_96C644 +/* 96C644 80243484 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C648 80243488 AFBF0010 */ sw $ra, 0x10($sp) +/* 96C64C 8024348C 0C03A625 */ jal func_800E9894 +/* 96C650 80243490 00000000 */ nop +/* 96C654 80243494 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C658 80243498 24020002 */ addiu $v0, $zero, 2 +/* 96C65C 8024349C 03E00008 */ jr $ra +/* 96C660 802434A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4.s deleted file mode 100644 index 755a536f16..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434A4 -/* 96C664 802434A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C668 802434A8 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C66C 802434AC 0C03A631 */ jal func_800E98C4 -/* 96C670 802434B0 00000000 */ nop -/* 96C674 802434B4 0C03A6DB */ jal sync_status_menu -/* 96C678 802434B8 00000000 */ nop -/* 96C67C 802434BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C680 802434C0 24020002 */ addiu $v0, $zero, 2 -/* 96C684 802434C4 03E00008 */ jr $ra -/* 96C688 802434C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s new file mode 100644 index 0000000000..8c4bc6cba2 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802434A4_96C664 +/* 96C664 802434A4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C668 802434A8 AFBF0010 */ sw $ra, 0x10($sp) +/* 96C66C 802434AC 0C03A631 */ jal func_800E98C4 +/* 96C670 802434B0 00000000 */ nop +/* 96C674 802434B4 0C03A6DB */ jal sync_status_menu +/* 96C678 802434B8 00000000 */ nop +/* 96C67C 802434BC 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C680 802434C0 24020002 */ addiu $v0, $zero, 2 +/* 96C684 802434C4 03E00008 */ jr $ra +/* 96C688 802434C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC.s deleted file mode 100644 index b877a09d68..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434CC -/* 96C68C 802434CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96C690 802434D0 AFB10014 */ sw $s1, 0x14($sp) -/* 96C694 802434D4 0080882D */ daddu $s1, $a0, $zero -/* 96C698 802434D8 AFBF0018 */ sw $ra, 0x18($sp) -/* 96C69C 802434DC AFB00010 */ sw $s0, 0x10($sp) -/* 96C6A0 802434E0 8E30000C */ lw $s0, 0xc($s1) -/* 96C6A4 802434E4 8E050000 */ lw $a1, ($s0) -/* 96C6A8 802434E8 0C0B1EAF */ jal get_variable -/* 96C6AC 802434EC 26100004 */ addiu $s0, $s0, 4 -/* 96C6B0 802434F0 0220202D */ daddu $a0, $s1, $zero -/* 96C6B4 802434F4 8E050000 */ lw $a1, ($s0) -/* 96C6B8 802434F8 0C0B1EAF */ jal get_variable -/* 96C6BC 802434FC 0040882D */ daddu $s1, $v0, $zero -/* 96C6C0 80243500 0000202D */ daddu $a0, $zero, $zero -/* 96C6C4 80243504 0080282D */ daddu $a1, $a0, $zero -/* 96C6C8 80243508 0040802D */ daddu $s0, $v0, $zero -/* 96C6CC 8024350C 240600BE */ addiu $a2, $zero, 0xbe -/* 96C6D0 80243510 0C04DF93 */ jal func_80137E4C -/* 96C6D4 80243514 24070091 */ addiu $a3, $zero, 0x91 -/* 96C6D8 80243518 44900000 */ mtc1 $s0, $f0 -/* 96C6DC 8024351C 00000000 */ nop -/* 96C6E0 80243520 46800020 */ cvt.s.w $f0, $f0 -/* 96C6E4 80243524 44050000 */ mfc1 $a1, $f0 -/* 96C6E8 80243528 0C04DF62 */ jal func_80137D88 -/* 96C6EC 8024352C 322400FF */ andi $a0, $s1, 0xff -/* 96C6F0 80243530 8FBF0018 */ lw $ra, 0x18($sp) -/* 96C6F4 80243534 8FB10014 */ lw $s1, 0x14($sp) -/* 96C6F8 80243538 8FB00010 */ lw $s0, 0x10($sp) -/* 96C6FC 8024353C 24020002 */ addiu $v0, $zero, 2 -/* 96C700 80243540 03E00008 */ jr $ra -/* 96C704 80243544 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s new file mode 100644 index 0000000000..fc267ce697 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434CC_96C68C.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802434CC_96C68C +/* 96C68C 802434CC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 96C690 802434D0 AFB10014 */ sw $s1, 0x14($sp) +/* 96C694 802434D4 0080882D */ daddu $s1, $a0, $zero +/* 96C698 802434D8 AFBF0018 */ sw $ra, 0x18($sp) +/* 96C69C 802434DC AFB00010 */ sw $s0, 0x10($sp) +/* 96C6A0 802434E0 8E30000C */ lw $s0, 0xc($s1) +/* 96C6A4 802434E4 8E050000 */ lw $a1, ($s0) +/* 96C6A8 802434E8 0C0B1EAF */ jal get_variable +/* 96C6AC 802434EC 26100004 */ addiu $s0, $s0, 4 +/* 96C6B0 802434F0 0220202D */ daddu $a0, $s1, $zero +/* 96C6B4 802434F4 8E050000 */ lw $a1, ($s0) +/* 96C6B8 802434F8 0C0B1EAF */ jal get_variable +/* 96C6BC 802434FC 0040882D */ daddu $s1, $v0, $zero +/* 96C6C0 80243500 0000202D */ daddu $a0, $zero, $zero +/* 96C6C4 80243504 0080282D */ daddu $a1, $a0, $zero +/* 96C6C8 80243508 0040802D */ daddu $s0, $v0, $zero +/* 96C6CC 8024350C 240600BE */ addiu $a2, $zero, 0xbe +/* 96C6D0 80243510 0C04DF93 */ jal func_80137E4C +/* 96C6D4 80243514 24070091 */ addiu $a3, $zero, 0x91 +/* 96C6D8 80243518 44900000 */ mtc1 $s0, $f0 +/* 96C6DC 8024351C 00000000 */ nop +/* 96C6E0 80243520 46800020 */ cvt.s.w $f0, $f0 +/* 96C6E4 80243524 44050000 */ mfc1 $a1, $f0 +/* 96C6E8 80243528 0C04DF62 */ jal func_80137D88 +/* 96C6EC 8024352C 322400FF */ andi $a0, $s1, 0xff +/* 96C6F0 80243530 8FBF0018 */ lw $ra, 0x18($sp) +/* 96C6F4 80243534 8FB10014 */ lw $s1, 0x14($sp) +/* 96C6F8 80243538 8FB00010 */ lw $s0, 0x10($sp) +/* 96C6FC 8024353C 24020002 */ addiu $v0, $zero, 2 +/* 96C700 80243540 03E00008 */ jr $ra +/* 96C704 80243544 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548.s deleted file mode 100644 index ed5c08f50b..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243548 -/* 96C708 80243548 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96C70C 8024354C AFB10014 */ sw $s1, 0x14($sp) -/* 96C710 80243550 0080882D */ daddu $s1, $a0, $zero -/* 96C714 80243554 AFBF0018 */ sw $ra, 0x18($sp) -/* 96C718 80243558 AFB00010 */ sw $s0, 0x10($sp) -/* 96C71C 8024355C 8E30000C */ lw $s0, 0xc($s1) -/* 96C720 80243560 8E050000 */ lw $a1, ($s0) -/* 96C724 80243564 0C0B1EAF */ jal get_variable -/* 96C728 80243568 26100004 */ addiu $s0, $s0, 4 -/* 96C72C 8024356C 0220202D */ daddu $a0, $s1, $zero -/* 96C730 80243570 8E050000 */ lw $a1, ($s0) -/* 96C734 80243574 0C0B1EAF */ jal get_variable -/* 96C738 80243578 0040802D */ daddu $s0, $v0, $zero -/* 96C73C 8024357C 44820000 */ mtc1 $v0, $f0 -/* 96C740 80243580 00000000 */ nop -/* 96C744 80243584 46800020 */ cvt.s.w $f0, $f0 -/* 96C748 80243588 24020002 */ addiu $v0, $zero, 2 -/* 96C74C 8024358C 00501804 */ sllv $v1, $s0, $v0 -/* 96C750 80243590 00701821 */ addu $v1, $v1, $s0 -/* 96C754 80243594 00431804 */ sllv $v1, $v1, $v0 -/* 96C758 80243598 00701823 */ subu $v1, $v1, $s0 -/* 96C75C 8024359C 000320C0 */ sll $a0, $v1, 3 -/* 96C760 802435A0 00641821 */ addu $v1, $v1, $a0 -/* 96C764 802435A4 000318C0 */ sll $v1, $v1, 3 -/* 96C768 802435A8 3C01800B */ lui $at, 0x800b -/* 96C76C 802435AC 00230821 */ addu $at, $at, $v1 -/* 96C770 802435B0 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 96C774 802435B4 8FBF0018 */ lw $ra, 0x18($sp) -/* 96C778 802435B8 8FB10014 */ lw $s1, 0x14($sp) -/* 96C77C 802435BC 8FB00010 */ lw $s0, 0x10($sp) -/* 96C780 802435C0 03E00008 */ jr $ra -/* 96C784 802435C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s new file mode 100644 index 0000000000..38e0f02397 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243548_96C708.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243548_96C708 +/* 96C708 80243548 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 96C70C 8024354C AFB10014 */ sw $s1, 0x14($sp) +/* 96C710 80243550 0080882D */ daddu $s1, $a0, $zero +/* 96C714 80243554 AFBF0018 */ sw $ra, 0x18($sp) +/* 96C718 80243558 AFB00010 */ sw $s0, 0x10($sp) +/* 96C71C 8024355C 8E30000C */ lw $s0, 0xc($s1) +/* 96C720 80243560 8E050000 */ lw $a1, ($s0) +/* 96C724 80243564 0C0B1EAF */ jal get_variable +/* 96C728 80243568 26100004 */ addiu $s0, $s0, 4 +/* 96C72C 8024356C 0220202D */ daddu $a0, $s1, $zero +/* 96C730 80243570 8E050000 */ lw $a1, ($s0) +/* 96C734 80243574 0C0B1EAF */ jal get_variable +/* 96C738 80243578 0040802D */ daddu $s0, $v0, $zero +/* 96C73C 8024357C 44820000 */ mtc1 $v0, $f0 +/* 96C740 80243580 00000000 */ nop +/* 96C744 80243584 46800020 */ cvt.s.w $f0, $f0 +/* 96C748 80243588 24020002 */ addiu $v0, $zero, 2 +/* 96C74C 8024358C 00501804 */ sllv $v1, $s0, $v0 +/* 96C750 80243590 00701821 */ addu $v1, $v1, $s0 +/* 96C754 80243594 00431804 */ sllv $v1, $v1, $v0 +/* 96C758 80243598 00701823 */ subu $v1, $v1, $s0 +/* 96C75C 8024359C 000320C0 */ sll $a0, $v1, 3 +/* 96C760 802435A0 00641821 */ addu $v1, $v1, $a0 +/* 96C764 802435A4 000318C0 */ sll $v1, $v1, 3 +/* 96C768 802435A8 3C01800B */ lui $at, 0x800b +/* 96C76C 802435AC 00230821 */ addu $at, $at, $v1 +/* 96C770 802435B0 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 96C774 802435B4 8FBF0018 */ lw $ra, 0x18($sp) +/* 96C778 802435B8 8FB10014 */ lw $s1, 0x14($sp) +/* 96C77C 802435BC 8FB00010 */ lw $s0, 0x10($sp) +/* 96C780 802435C0 03E00008 */ jr $ra +/* 96C784 802435C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8.s deleted file mode 100644 index ffaa4caa20..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435C8 -/* 96C788 802435C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C78C 802435CC AFBF0010 */ sw $ra, 0x10($sp) -/* 96C790 802435D0 8C82000C */ lw $v0, 0xc($a0) -/* 96C794 802435D4 0C0B1EAF */ jal get_variable -/* 96C798 802435D8 8C450000 */ lw $a1, ($v0) -/* 96C79C 802435DC 0C0B1059 */ jal does_script_exist -/* 96C7A0 802435E0 0040202D */ daddu $a0, $v0, $zero -/* 96C7A4 802435E4 2C420001 */ sltiu $v0, $v0, 1 -/* 96C7A8 802435E8 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C7AC 802435EC 00021040 */ sll $v0, $v0, 1 -/* 96C7B0 802435F0 03E00008 */ jr $ra -/* 96C7B4 802435F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s new file mode 100644 index 0000000000..ea148d4bf8 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435C8_96C788 +/* 96C788 802435C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C78C 802435CC AFBF0010 */ sw $ra, 0x10($sp) +/* 96C790 802435D0 8C82000C */ lw $v0, 0xc($a0) +/* 96C794 802435D4 0C0B1EAF */ jal get_variable +/* 96C798 802435D8 8C450000 */ lw $a1, ($v0) +/* 96C79C 802435DC 0C0B1059 */ jal does_script_exist +/* 96C7A0 802435E0 0040202D */ daddu $a0, $v0, $zero +/* 96C7A4 802435E4 2C420001 */ sltiu $v0, $v0, 1 +/* 96C7A8 802435E8 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C7AC 802435EC 00021040 */ sll $v0, $v0, 1 +/* 96C7B0 802435F0 03E00008 */ jr $ra +/* 96C7B4 802435F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8.s deleted file mode 100644 index 6c14df93f2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435F8 -/* 96C7B8 802435F8 3C028011 */ lui $v0, 0x8011 -/* 96C7BC 802435FC 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 96C7C0 80243600 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C7C4 80243604 10400003 */ beqz $v0, .L80243614 -/* 96C7C8 80243608 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C7CC 8024360C 0C03AE06 */ jal partner_suspend_ability_script -/* 96C7D0 80243610 00000000 */ nop -.L80243614: -/* 96C7D4 80243614 24020002 */ addiu $v0, $zero, 2 -/* 96C7D8 80243618 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C7DC 8024361C 03E00008 */ jr $ra -/* 96C7E0 80243620 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s new file mode 100644 index 0000000000..cf62591195 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435F8_96C7B8 +/* 96C7B8 802435F8 3C028011 */ lui $v0, 0x8011 +/* 96C7BC 802435FC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 96C7C0 80243600 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C7C4 80243604 10400003 */ beqz $v0, .L80243614 +/* 96C7C8 80243608 AFBF0010 */ sw $ra, 0x10($sp) +/* 96C7CC 8024360C 0C03AE06 */ jal partner_suspend_ability_script +/* 96C7D0 80243610 00000000 */ nop +.L80243614: +/* 96C7D4 80243614 24020002 */ addiu $v0, $zero, 2 +/* 96C7D8 80243618 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C7DC 8024361C 03E00008 */ jr $ra +/* 96C7E0 80243620 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624.s deleted file mode 100644 index c299a1d1fd..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243624 -/* 96C7E4 80243624 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C7E8 80243628 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C7EC 8024362C 0C03AE18 */ jal partner_resume_ability_script -/* 96C7F0 80243630 00000000 */ nop -/* 96C7F4 80243634 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C7F8 80243638 24020002 */ addiu $v0, $zero, 2 -/* 96C7FC 8024363C 03E00008 */ jr $ra -/* 96C800 80243640 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s new file mode 100644 index 0000000000..c19416d262 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243624_96C7E4 +/* 96C7E4 80243624 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C7E8 80243628 AFBF0010 */ sw $ra, 0x10($sp) +/* 96C7EC 8024362C 0C03AE18 */ jal partner_resume_ability_script +/* 96C7F0 80243630 00000000 */ nop +/* 96C7F4 80243634 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C7F8 80243638 24020002 */ addiu $v0, $zero, 2 +/* 96C7FC 8024363C 03E00008 */ jr $ra +/* 96C800 80243640 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644.s deleted file mode 100644 index bc4909dd4e..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243644 -/* 96C804 80243644 3C058011 */ lui $a1, %hi(gPlayerData) -/* 96C808 80243648 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 96C80C 8024364C AC800088 */ sw $zero, 0x88($a0) -/* 96C810 80243650 80A30003 */ lb $v1, 3($a1) -/* 96C814 80243654 80A20002 */ lb $v0, 2($a1) -/* 96C818 80243658 1462000B */ bne $v1, $v0, .L80243688 -/* 96C81C 8024365C 00A0302D */ daddu $a2, $a1, $zero -/* 96C820 80243660 80A30006 */ lb $v1, 6($a1) -/* 96C824 80243664 80A20005 */ lb $v0, 5($a1) -/* 96C828 80243668 14620007 */ bne $v1, $v0, .L80243688 -/* 96C82C 8024366C 00000000 */ nop -/* 96C830 80243670 80C2028E */ lb $v0, 0x28e($a2) -/* 96C834 80243674 84C30290 */ lh $v1, 0x290($a2) -/* 96C838 80243678 00021200 */ sll $v0, $v0, 8 -/* 96C83C 8024367C 14620004 */ bne $v1, $v0, .L80243690 -/* 96C840 80243680 24020001 */ addiu $v0, $zero, 1 -/* 96C844 80243684 AC820088 */ sw $v0, 0x88($a0) -.L80243688: -/* 96C848 80243688 03E00008 */ jr $ra -/* 96C84C 8024368C 24020002 */ addiu $v0, $zero, 2 -.L80243690: -/* 96C850 80243690 03E00008 */ jr $ra -/* 96C854 80243694 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s new file mode 100644 index 0000000000..dd97296550 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243644_96C804.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243644_96C804 +/* 96C804 80243644 3C058011 */ lui $a1, %hi(gPlayerData) +/* 96C808 80243648 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* 96C80C 8024364C AC800088 */ sw $zero, 0x88($a0) +/* 96C810 80243650 80A30003 */ lb $v1, 3($a1) +/* 96C814 80243654 80A20002 */ lb $v0, 2($a1) +/* 96C818 80243658 1462000B */ bne $v1, $v0, .L80243688 +/* 96C81C 8024365C 00A0302D */ daddu $a2, $a1, $zero +/* 96C820 80243660 80A30006 */ lb $v1, 6($a1) +/* 96C824 80243664 80A20005 */ lb $v0, 5($a1) +/* 96C828 80243668 14620007 */ bne $v1, $v0, .L80243688 +/* 96C82C 8024366C 00000000 */ nop +/* 96C830 80243670 80C2028E */ lb $v0, 0x28e($a2) +/* 96C834 80243674 84C30290 */ lh $v1, 0x290($a2) +/* 96C838 80243678 00021200 */ sll $v0, $v0, 8 +/* 96C83C 8024367C 14620004 */ bne $v1, $v0, .L80243690 +/* 96C840 80243680 24020001 */ addiu $v0, $zero, 1 +/* 96C844 80243684 AC820088 */ sw $v0, 0x88($a0) +.L80243688: +/* 96C848 80243688 03E00008 */ jr $ra +/* 96C84C 8024368C 24020002 */ addiu $v0, $zero, 2 +.L80243690: +/* 96C850 80243690 03E00008 */ jr $ra +/* 96C854 80243694 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698.s deleted file mode 100644 index 7eeac25a24..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243698 -/* 96C858 80243698 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96C85C 8024369C AFB10014 */ sw $s1, 0x14($sp) -/* 96C860 802436A0 0080882D */ daddu $s1, $a0, $zero -/* 96C864 802436A4 AFBF001C */ sw $ra, 0x1c($sp) -/* 96C868 802436A8 AFB20018 */ sw $s2, 0x18($sp) -/* 96C86C 802436AC AFB00010 */ sw $s0, 0x10($sp) -/* 96C870 802436B0 8E30000C */ lw $s0, 0xc($s1) -/* 96C874 802436B4 8E050000 */ lw $a1, ($s0) -/* 96C878 802436B8 0C0B1EAF */ jal get_variable -/* 96C87C 802436BC 26100004 */ addiu $s0, $s0, 4 -/* 96C880 802436C0 8E050000 */ lw $a1, ($s0) -/* 96C884 802436C4 26100004 */ addiu $s0, $s0, 4 -/* 96C888 802436C8 0220202D */ daddu $a0, $s1, $zero -/* 96C88C 802436CC 0C0B1EAF */ jal get_variable -/* 96C890 802436D0 0040902D */ daddu $s2, $v0, $zero -/* 96C894 802436D4 0220202D */ daddu $a0, $s1, $zero -/* 96C898 802436D8 8E050000 */ lw $a1, ($s0) -/* 96C89C 802436DC 0C0B1EAF */ jal get_variable -/* 96C8A0 802436E0 0040802D */ daddu $s0, $v0, $zero -/* 96C8A4 802436E4 0000202D */ daddu $a0, $zero, $zero -/* 96C8A8 802436E8 324500FF */ andi $a1, $s2, 0xff -/* 96C8AC 802436EC 320600FF */ andi $a2, $s0, 0xff -/* 96C8B0 802436F0 0C04DF84 */ jal func_80137E10 -/* 96C8B4 802436F4 304700FF */ andi $a3, $v0, 0xff -/* 96C8B8 802436F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 96C8BC 802436FC 8FB20018 */ lw $s2, 0x18($sp) -/* 96C8C0 80243700 8FB10014 */ lw $s1, 0x14($sp) -/* 96C8C4 80243704 8FB00010 */ lw $s0, 0x10($sp) -/* 96C8C8 80243708 24020002 */ addiu $v0, $zero, 2 -/* 96C8CC 8024370C 03E00008 */ jr $ra -/* 96C8D0 80243710 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s new file mode 100644 index 0000000000..adaee1c2f5 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243698_96C858.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243698_96C858 +/* 96C858 80243698 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 96C85C 8024369C AFB10014 */ sw $s1, 0x14($sp) +/* 96C860 802436A0 0080882D */ daddu $s1, $a0, $zero +/* 96C864 802436A4 AFBF001C */ sw $ra, 0x1c($sp) +/* 96C868 802436A8 AFB20018 */ sw $s2, 0x18($sp) +/* 96C86C 802436AC AFB00010 */ sw $s0, 0x10($sp) +/* 96C870 802436B0 8E30000C */ lw $s0, 0xc($s1) +/* 96C874 802436B4 8E050000 */ lw $a1, ($s0) +/* 96C878 802436B8 0C0B1EAF */ jal get_variable +/* 96C87C 802436BC 26100004 */ addiu $s0, $s0, 4 +/* 96C880 802436C0 8E050000 */ lw $a1, ($s0) +/* 96C884 802436C4 26100004 */ addiu $s0, $s0, 4 +/* 96C888 802436C8 0220202D */ daddu $a0, $s1, $zero +/* 96C88C 802436CC 0C0B1EAF */ jal get_variable +/* 96C890 802436D0 0040902D */ daddu $s2, $v0, $zero +/* 96C894 802436D4 0220202D */ daddu $a0, $s1, $zero +/* 96C898 802436D8 8E050000 */ lw $a1, ($s0) +/* 96C89C 802436DC 0C0B1EAF */ jal get_variable +/* 96C8A0 802436E0 0040802D */ daddu $s0, $v0, $zero +/* 96C8A4 802436E4 0000202D */ daddu $a0, $zero, $zero +/* 96C8A8 802436E8 324500FF */ andi $a1, $s2, 0xff +/* 96C8AC 802436EC 320600FF */ andi $a2, $s0, 0xff +/* 96C8B0 802436F0 0C04DF84 */ jal func_80137E10 +/* 96C8B4 802436F4 304700FF */ andi $a3, $v0, 0xff +/* 96C8B8 802436F8 8FBF001C */ lw $ra, 0x1c($sp) +/* 96C8BC 802436FC 8FB20018 */ lw $s2, 0x18($sp) +/* 96C8C0 80243700 8FB10014 */ lw $s1, 0x14($sp) +/* 96C8C4 80243704 8FB00010 */ lw $s0, 0x10($sp) +/* 96C8C8 80243708 24020002 */ addiu $v0, $zero, 2 +/* 96C8CC 8024370C 03E00008 */ jr $ra +/* 96C8D0 80243710 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714.s deleted file mode 100644 index d669cca14d..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243714 -/* 96C8D4 80243714 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C8D8 80243718 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C8DC 8024371C 8C82000C */ lw $v0, 0xc($a0) -/* 96C8E0 80243720 3C068011 */ lui $a2, 0x8011 -/* 96C8E4 80243724 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 96C8E8 80243728 0C0B2026 */ jal set_variable -/* 96C8EC 8024372C 8C450000 */ lw $a1, ($v0) -/* 96C8F0 80243730 0C03AC5A */ jal func_800EB168 -/* 96C8F4 80243734 0000202D */ daddu $a0, $zero, $zero -/* 96C8F8 80243738 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C8FC 8024373C 24020002 */ addiu $v0, $zero, 2 -/* 96C900 80243740 03E00008 */ jr $ra -/* 96C904 80243744 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s new file mode 100644 index 0000000000..1176828dd0 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243714_96C8D4 +/* 96C8D4 80243714 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C8D8 80243718 AFBF0010 */ sw $ra, 0x10($sp) +/* 96C8DC 8024371C 8C82000C */ lw $v0, 0xc($a0) +/* 96C8E0 80243720 3C068011 */ lui $a2, 0x8011 +/* 96C8E4 80243724 80C6F2A2 */ lb $a2, -0xd5e($a2) +/* 96C8E8 80243728 0C0B2026 */ jal set_variable +/* 96C8EC 8024372C 8C450000 */ lw $a1, ($v0) +/* 96C8F0 80243730 0C03AC5A */ jal func_800EB168 +/* 96C8F4 80243734 0000202D */ daddu $a0, $zero, $zero +/* 96C8F8 80243738 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C8FC 8024373C 24020002 */ addiu $v0, $zero, 2 +/* 96C900 80243740 03E00008 */ jr $ra +/* 96C904 80243744 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748.s deleted file mode 100644 index ebb8d41da3..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243748 -/* 96C908 80243748 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C90C 8024374C AFBF0010 */ sw $ra, 0x10($sp) -/* 96C910 80243750 8C82000C */ lw $v0, 0xc($a0) -/* 96C914 80243754 0C0B1EAF */ jal get_variable -/* 96C918 80243758 8C450000 */ lw $a1, ($v0) -/* 96C91C 8024375C 00021600 */ sll $v0, $v0, 0x18 -/* 96C920 80243760 0C03AC5A */ jal func_800EB168 -/* 96C924 80243764 00022603 */ sra $a0, $v0, 0x18 -/* 96C928 80243768 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C92C 8024376C 24020002 */ addiu $v0, $zero, 2 -/* 96C930 80243770 03E00008 */ jr $ra -/* 96C934 80243774 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s new file mode 100644 index 0000000000..f39a0a6e35 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243748_96C908 +/* 96C908 80243748 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96C90C 8024374C AFBF0010 */ sw $ra, 0x10($sp) +/* 96C910 80243750 8C82000C */ lw $v0, 0xc($a0) +/* 96C914 80243754 0C0B1EAF */ jal get_variable +/* 96C918 80243758 8C450000 */ lw $a1, ($v0) +/* 96C91C 8024375C 00021600 */ sll $v0, $v0, 0x18 +/* 96C920 80243760 0C03AC5A */ jal func_800EB168 +/* 96C924 80243764 00022603 */ sra $a0, $v0, 0x18 +/* 96C928 80243768 8FBF0010 */ lw $ra, 0x10($sp) +/* 96C92C 8024376C 24020002 */ addiu $v0, $zero, 2 +/* 96C930 80243770 03E00008 */ jr $ra +/* 96C934 80243774 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243778.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243778.s deleted file mode 100644 index 3986884fcc..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243778.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243778 -/* 96C938 80243778 03E00008 */ jr $ra -/* 96C93C 8024377C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243778_96C938.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243778_96C938.s new file mode 100644 index 0000000000..dda3b213d2 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243778_96C938.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243778_96C938 +/* 96C938 80243778 03E00008 */ jr $ra +/* 96C93C 8024377C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243780.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243780.s deleted file mode 100644 index 5d91fe9239..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243780.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243780 -/* 96C940 80243780 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96C944 80243784 AFB10014 */ sw $s1, 0x14($sp) -/* 96C948 80243788 0080882D */ daddu $s1, $a0, $zero -/* 96C94C 8024378C AFBF0018 */ sw $ra, 0x18($sp) -/* 96C950 80243790 AFB00010 */ sw $s0, 0x10($sp) -/* 96C954 80243794 8E30000C */ lw $s0, 0xc($s1) -/* 96C958 80243798 8E050000 */ lw $a1, ($s0) -/* 96C95C 8024379C 0C0B1EAF */ jal get_variable -/* 96C960 802437A0 26100004 */ addiu $s0, $s0, 4 -/* 96C964 802437A4 AE22008C */ sw $v0, 0x8c($s1) -/* 96C968 802437A8 8E050000 */ lw $a1, ($s0) -/* 96C96C 802437AC 26100004 */ addiu $s0, $s0, 4 -/* 96C970 802437B0 0C0B1EAF */ jal get_variable -/* 96C974 802437B4 0220202D */ daddu $a0, $s1, $zero -/* 96C978 802437B8 AE220090 */ sw $v0, 0x90($s1) -/* 96C97C 802437BC 8E050000 */ lw $a1, ($s0) -/* 96C980 802437C0 26100004 */ addiu $s0, $s0, 4 -/* 96C984 802437C4 0C0B1EAF */ jal get_variable -/* 96C988 802437C8 0220202D */ daddu $a0, $s1, $zero -/* 96C98C 802437CC AE220094 */ sw $v0, 0x94($s1) -/* 96C990 802437D0 8E050000 */ lw $a1, ($s0) -/* 96C994 802437D4 26100004 */ addiu $s0, $s0, 4 -/* 96C998 802437D8 0C0B1EAF */ jal get_variable -/* 96C99C 802437DC 0220202D */ daddu $a0, $s1, $zero -/* 96C9A0 802437E0 AE220098 */ sw $v0, 0x98($s1) -/* 96C9A4 802437E4 8E050000 */ lw $a1, ($s0) -/* 96C9A8 802437E8 26100004 */ addiu $s0, $s0, 4 -/* 96C9AC 802437EC 0C0B1EAF */ jal get_variable -/* 96C9B0 802437F0 0220202D */ daddu $a0, $s1, $zero -/* 96C9B4 802437F4 AE22009C */ sw $v0, 0x9c($s1) -/* 96C9B8 802437F8 8E050000 */ lw $a1, ($s0) -/* 96C9BC 802437FC 26100004 */ addiu $s0, $s0, 4 -/* 96C9C0 80243800 0C0B1EAF */ jal get_variable -/* 96C9C4 80243804 0220202D */ daddu $a0, $s1, $zero -/* 96C9C8 80243808 AE2200A0 */ sw $v0, 0xa0($s1) -/* 96C9CC 8024380C 8E050000 */ lw $a1, ($s0) -/* 96C9D0 80243810 26100004 */ addiu $s0, $s0, 4 -/* 96C9D4 80243814 0C0B1EAF */ jal get_variable -/* 96C9D8 80243818 0220202D */ daddu $a0, $s1, $zero -/* 96C9DC 8024381C AE2200A4 */ sw $v0, 0xa4($s1) -/* 96C9E0 80243820 8E050000 */ lw $a1, ($s0) -/* 96C9E4 80243824 26100004 */ addiu $s0, $s0, 4 -/* 96C9E8 80243828 0C0B1EAF */ jal get_variable -/* 96C9EC 8024382C 0220202D */ daddu $a0, $s1, $zero -/* 96C9F0 80243830 AE2200A8 */ sw $v0, 0xa8($s1) -/* 96C9F4 80243834 8E050000 */ lw $a1, ($s0) -/* 96C9F8 80243838 26100004 */ addiu $s0, $s0, 4 -/* 96C9FC 8024383C 0C0B1EAF */ jal get_variable -/* 96CA00 80243840 0220202D */ daddu $a0, $s1, $zero -/* 96CA04 80243844 AE2200AC */ sw $v0, 0xac($s1) -/* 96CA08 80243848 8E050000 */ lw $a1, ($s0) -/* 96CA0C 8024384C 0C0B1EAF */ jal get_variable -/* 96CA10 80243850 0220202D */ daddu $a0, $s1, $zero -/* 96CA14 80243854 AE2200B0 */ sw $v0, 0xb0($s1) -/* 96CA18 80243858 8FBF0018 */ lw $ra, 0x18($sp) -/* 96CA1C 8024385C 8FB10014 */ lw $s1, 0x14($sp) -/* 96CA20 80243860 8FB00010 */ lw $s0, 0x10($sp) -/* 96CA24 80243864 24020002 */ addiu $v0, $zero, 2 -/* 96CA28 80243868 03E00008 */ jr $ra -/* 96CA2C 8024386C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243780_96C940.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243780_96C940.s new file mode 100644 index 0000000000..43d174e59b --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243780_96C940.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243780_96C940 +/* 96C940 80243780 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 96C944 80243784 AFB10014 */ sw $s1, 0x14($sp) +/* 96C948 80243788 0080882D */ daddu $s1, $a0, $zero +/* 96C94C 8024378C AFBF0018 */ sw $ra, 0x18($sp) +/* 96C950 80243790 AFB00010 */ sw $s0, 0x10($sp) +/* 96C954 80243794 8E30000C */ lw $s0, 0xc($s1) +/* 96C958 80243798 8E050000 */ lw $a1, ($s0) +/* 96C95C 8024379C 0C0B1EAF */ jal get_variable +/* 96C960 802437A0 26100004 */ addiu $s0, $s0, 4 +/* 96C964 802437A4 AE22008C */ sw $v0, 0x8c($s1) +/* 96C968 802437A8 8E050000 */ lw $a1, ($s0) +/* 96C96C 802437AC 26100004 */ addiu $s0, $s0, 4 +/* 96C970 802437B0 0C0B1EAF */ jal get_variable +/* 96C974 802437B4 0220202D */ daddu $a0, $s1, $zero +/* 96C978 802437B8 AE220090 */ sw $v0, 0x90($s1) +/* 96C97C 802437BC 8E050000 */ lw $a1, ($s0) +/* 96C980 802437C0 26100004 */ addiu $s0, $s0, 4 +/* 96C984 802437C4 0C0B1EAF */ jal get_variable +/* 96C988 802437C8 0220202D */ daddu $a0, $s1, $zero +/* 96C98C 802437CC AE220094 */ sw $v0, 0x94($s1) +/* 96C990 802437D0 8E050000 */ lw $a1, ($s0) +/* 96C994 802437D4 26100004 */ addiu $s0, $s0, 4 +/* 96C998 802437D8 0C0B1EAF */ jal get_variable +/* 96C99C 802437DC 0220202D */ daddu $a0, $s1, $zero +/* 96C9A0 802437E0 AE220098 */ sw $v0, 0x98($s1) +/* 96C9A4 802437E4 8E050000 */ lw $a1, ($s0) +/* 96C9A8 802437E8 26100004 */ addiu $s0, $s0, 4 +/* 96C9AC 802437EC 0C0B1EAF */ jal get_variable +/* 96C9B0 802437F0 0220202D */ daddu $a0, $s1, $zero +/* 96C9B4 802437F4 AE22009C */ sw $v0, 0x9c($s1) +/* 96C9B8 802437F8 8E050000 */ lw $a1, ($s0) +/* 96C9BC 802437FC 26100004 */ addiu $s0, $s0, 4 +/* 96C9C0 80243800 0C0B1EAF */ jal get_variable +/* 96C9C4 80243804 0220202D */ daddu $a0, $s1, $zero +/* 96C9C8 80243808 AE2200A0 */ sw $v0, 0xa0($s1) +/* 96C9CC 8024380C 8E050000 */ lw $a1, ($s0) +/* 96C9D0 80243810 26100004 */ addiu $s0, $s0, 4 +/* 96C9D4 80243814 0C0B1EAF */ jal get_variable +/* 96C9D8 80243818 0220202D */ daddu $a0, $s1, $zero +/* 96C9DC 8024381C AE2200A4 */ sw $v0, 0xa4($s1) +/* 96C9E0 80243820 8E050000 */ lw $a1, ($s0) +/* 96C9E4 80243824 26100004 */ addiu $s0, $s0, 4 +/* 96C9E8 80243828 0C0B1EAF */ jal get_variable +/* 96C9EC 8024382C 0220202D */ daddu $a0, $s1, $zero +/* 96C9F0 80243830 AE2200A8 */ sw $v0, 0xa8($s1) +/* 96C9F4 80243834 8E050000 */ lw $a1, ($s0) +/* 96C9F8 80243838 26100004 */ addiu $s0, $s0, 4 +/* 96C9FC 8024383C 0C0B1EAF */ jal get_variable +/* 96CA00 80243840 0220202D */ daddu $a0, $s1, $zero +/* 96CA04 80243844 AE2200AC */ sw $v0, 0xac($s1) +/* 96CA08 80243848 8E050000 */ lw $a1, ($s0) +/* 96CA0C 8024384C 0C0B1EAF */ jal get_variable +/* 96CA10 80243850 0220202D */ daddu $a0, $s1, $zero +/* 96CA14 80243854 AE2200B0 */ sw $v0, 0xb0($s1) +/* 96CA18 80243858 8FBF0018 */ lw $ra, 0x18($sp) +/* 96CA1C 8024385C 8FB10014 */ lw $s1, 0x14($sp) +/* 96CA20 80243860 8FB00010 */ lw $s0, 0x10($sp) +/* 96CA24 80243864 24020002 */ addiu $v0, $zero, 2 +/* 96CA28 80243868 03E00008 */ jr $ra +/* 96CA2C 8024386C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC.s deleted file mode 100644 index 4425cb94f2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802439FC -/* 96CBBC 802439FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96CBC0 80243A00 AFB00010 */ sw $s0, 0x10($sp) -/* 96CBC4 80243A04 0080802D */ daddu $s0, $a0, $zero -/* 96CBC8 80243A08 AFBF0014 */ sw $ra, 0x14($sp) -/* 96CBCC 80243A0C 0C00EABB */ jal get_npc_unsafe -/* 96CBD0 80243A10 8E04008C */ lw $a0, 0x8c($s0) -/* 96CBD4 80243A14 0040282D */ daddu $a1, $v0, $zero -/* 96CBD8 80243A18 8E040094 */ lw $a0, 0x94($s0) -/* 96CBDC 80243A1C 8CA30028 */ lw $v1, 0x28($a1) -/* 96CBE0 80243A20 ACA40028 */ sw $a0, 0x28($a1) -/* 96CBE4 80243A24 8FBF0014 */ lw $ra, 0x14($sp) -/* 96CBE8 80243A28 8FB00010 */ lw $s0, 0x10($sp) -/* 96CBEC 80243A2C 24020002 */ addiu $v0, $zero, 2 -/* 96CBF0 80243A30 3C018025 */ lui $at, 0x8025 -/* 96CBF4 80243A34 AC23F3B8 */ sw $v1, -0xc48($at) -/* 96CBF8 80243A38 03E00008 */ jr $ra -/* 96CBFC 80243A3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s new file mode 100644 index 0000000000..c721829e4e --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802439FC_96CBBC.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802439FC_96CBBC +/* 96CBBC 802439FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96CBC0 80243A00 AFB00010 */ sw $s0, 0x10($sp) +/* 96CBC4 80243A04 0080802D */ daddu $s0, $a0, $zero +/* 96CBC8 80243A08 AFBF0014 */ sw $ra, 0x14($sp) +/* 96CBCC 80243A0C 0C00EABB */ jal get_npc_unsafe +/* 96CBD0 80243A10 8E04008C */ lw $a0, 0x8c($s0) +/* 96CBD4 80243A14 0040282D */ daddu $a1, $v0, $zero +/* 96CBD8 80243A18 8E040094 */ lw $a0, 0x94($s0) +/* 96CBDC 80243A1C 8CA30028 */ lw $v1, 0x28($a1) +/* 96CBE0 80243A20 ACA40028 */ sw $a0, 0x28($a1) +/* 96CBE4 80243A24 8FBF0014 */ lw $ra, 0x14($sp) +/* 96CBE8 80243A28 8FB00010 */ lw $s0, 0x10($sp) +/* 96CBEC 80243A2C 24020002 */ addiu $v0, $zero, 2 +/* 96CBF0 80243A30 3C018025 */ lui $at, 0x8025 +/* 96CBF4 80243A34 AC23F3B8 */ sw $v1, -0xc48($at) +/* 96CBF8 80243A38 03E00008 */ jr $ra +/* 96CBFC 80243A3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40.s deleted file mode 100644 index 3662956416..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243A40 -/* 96CC00 80243A40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96CC04 80243A44 AFBF0010 */ sw $ra, 0x10($sp) -/* 96CC08 80243A48 0C00EABB */ jal get_npc_unsafe -/* 96CC0C 80243A4C 8C84008C */ lw $a0, 0x8c($a0) -/* 96CC10 80243A50 3C038025 */ lui $v1, 0x8025 -/* 96CC14 80243A54 8C63F3B8 */ lw $v1, -0xc48($v1) -/* 96CC18 80243A58 AC430028 */ sw $v1, 0x28($v0) -/* 96CC1C 80243A5C 8FBF0010 */ lw $ra, 0x10($sp) -/* 96CC20 80243A60 24020002 */ addiu $v0, $zero, 2 -/* 96CC24 80243A64 03E00008 */ jr $ra -/* 96CC28 80243A68 27BD0018 */ addiu $sp, $sp, 0x18 -/* 96CC2C 80243A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s new file mode 100644 index 0000000000..10964d2e87 --- /dev/null +++ b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243A40_96CC00.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243A40_96CC00 +/* 96CC00 80243A40 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 96CC04 80243A44 AFBF0010 */ sw $ra, 0x10($sp) +/* 96CC08 80243A48 0C00EABB */ jal get_npc_unsafe +/* 96CC0C 80243A4C 8C84008C */ lw $a0, 0x8c($a0) +/* 96CC10 80243A50 3C038025 */ lui $v1, 0x8025 +/* 96CC14 80243A54 8C63F3B8 */ lw $v1, -0xc48($v1) +/* 96CC18 80243A58 AC430028 */ sw $v1, 0x28($v0) +/* 96CC1C 80243A5C 8FBF0010 */ lw $ra, 0x10($sp) +/* 96CC20 80243A60 24020002 */ addiu $v0, $zero, 2 +/* 96CC24 80243A64 03E00008 */ jr $ra +/* 96CC28 80243A68 27BD0018 */ addiu $sp, $sp, 0x18 +/* 96CC2C 80243A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0.s deleted file mode 100644 index a1932dac76..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB0 -/* DF78B0 80240EB0 27BDFF90 */ addiu $sp, $sp, -0x70 -/* DF78B4 80240EB4 AFB00048 */ sw $s0, 0x48($sp) -/* DF78B8 80240EB8 00A0802D */ daddu $s0, $a1, $zero -/* DF78BC 80240EBC AFBF0050 */ sw $ra, 0x50($sp) -/* DF78C0 80240EC0 AFB1004C */ sw $s1, 0x4c($sp) -/* DF78C4 80240EC4 F7B80068 */ sdc1 $f24, 0x68($sp) -/* DF78C8 80240EC8 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DF78CC 80240ECC F7B40058 */ sdc1 $f20, 0x58($sp) -/* DF78D0 80240ED0 8C82001C */ lw $v0, 0x1c($a0) -/* DF78D4 80240ED4 0000202D */ daddu $a0, $zero, $zero -/* DF78D8 80240ED8 0000282D */ daddu $a1, $zero, $zero -/* DF78DC 80240EDC C6140010 */ lwc1 $f20, 0x10($s0) -/* DF78E0 80240EE0 4680A520 */ cvt.s.w $f20, $f20 -/* DF78E4 80240EE4 3C06437F */ lui $a2, 0x437f -/* DF78E8 80240EE8 C6160014 */ lwc1 $f22, 0x14($s0) -/* DF78EC 80240EEC 4680B5A0 */ cvt.s.w $f22, $f22 -/* DF78F0 80240EF0 AFA20010 */ sw $v0, 0x10($sp) -/* DF78F4 80240EF4 8E070018 */ lw $a3, 0x18($s0) -/* DF78F8 80240EF8 0C00A8ED */ jal update_lerp -/* DF78FC 80240EFC 27B10038 */ addiu $s1, $sp, 0x38 -/* DF7900 80240F00 AFB10010 */ sw $s1, 0x10($sp) -/* DF7904 80240F04 8E040004 */ lw $a0, 4($s0) -/* DF7908 80240F08 8E050008 */ lw $a1, 8($s0) -/* DF790C 80240F0C 8E060000 */ lw $a2, ($s0) -/* DF7910 80240F10 8E07000C */ lw $a3, 0xc($s0) -/* DF7914 80240F14 0C04BA38 */ jal func_8012E8E0 -/* DF7918 80240F18 46000606 */ mov.s $f24, $f0 -/* DF791C 80240F1C 4600A08D */ trunc.w.s $f2, $f20 -/* DF7920 80240F20 44021000 */ mfc1 $v0, $f2 -/* DF7924 80240F24 93A50040 */ lbu $a1, 0x40($sp) -/* DF7928 80240F28 93A60041 */ lbu $a2, 0x41($sp) -/* DF792C 80240F2C 00021400 */ sll $v0, $v0, 0x10 -/* DF7930 80240F30 AFA00010 */ sw $zero, 0x10($sp) -/* DF7934 80240F34 8FA3003C */ lw $v1, 0x3c($sp) -/* DF7938 80240F38 00021403 */ sra $v0, $v0, 0x10 -/* DF793C 80240F3C AFA20018 */ sw $v0, 0x18($sp) -/* DF7940 80240F40 4600B08D */ trunc.w.s $f2, $f22 -/* DF7944 80240F44 44021000 */ mfc1 $v0, $f2 -/* DF7948 80240F48 00000000 */ nop -/* DF794C 80240F4C 00021400 */ sll $v0, $v0, 0x10 -/* DF7950 80240F50 3C014F00 */ lui $at, 0x4f00 -/* DF7954 80240F54 44810000 */ mtc1 $at, $f0 -/* DF7958 80240F58 00021403 */ sra $v0, $v0, 0x10 -/* DF795C 80240F5C AFA2001C */ sw $v0, 0x1c($sp) -/* DF7960 80240F60 2402000A */ addiu $v0, $zero, 0xa -/* DF7964 80240F64 AFA20020 */ sw $v0, 0x20($sp) -/* DF7968 80240F68 24020014 */ addiu $v0, $zero, 0x14 -/* DF796C 80240F6C AFA20024 */ sw $v0, 0x24($sp) -/* DF7970 80240F70 2402012C */ addiu $v0, $zero, 0x12c -/* DF7974 80240F74 AFA20028 */ sw $v0, 0x28($sp) -/* DF7978 80240F78 240200C8 */ addiu $v0, $zero, 0xc8 -/* DF797C 80240F7C AFA2002C */ sw $v0, 0x2c($sp) -/* DF7980 80240F80 4618003E */ c.le.s $f0, $f24 -/* DF7984 80240F84 00000000 */ nop -/* DF7988 80240F88 45010005 */ bc1t .L80240FA0 -/* DF798C 80240F8C AFA30014 */ sw $v1, 0x14($sp) -/* DF7990 80240F90 4600C08D */ trunc.w.s $f2, $f24 -/* DF7994 80240F94 44031000 */ mfc1 $v1, $f2 -/* DF7998 80240F98 080903EF */ j .L80240FBC -/* DF799C 80240F9C 306200FF */ andi $v0, $v1, 0xff -.L80240FA0: -/* DF79A0 80240FA0 4600C001 */ sub.s $f0, $f24, $f0 -/* DF79A4 80240FA4 3C028000 */ lui $v0, 0x8000 -/* DF79A8 80240FA8 4600008D */ trunc.w.s $f2, $f0 -/* DF79AC 80240FAC 44031000 */ mfc1 $v1, $f2 -/* DF79B0 80240FB0 00000000 */ nop -/* DF79B4 80240FB4 00621825 */ or $v1, $v1, $v0 -/* DF79B8 80240FB8 306200FF */ andi $v0, $v1, 0xff -.L80240FBC: -/* DF79BC 80240FBC AFA20030 */ sw $v0, 0x30($sp) -/* DF79C0 80240FC0 8E240000 */ lw $a0, ($s1) -/* DF79C4 80240FC4 0C04BA68 */ jal func_8012E9A0 -/* DF79C8 80240FC8 24070002 */ addiu $a3, $zero, 2 -/* DF79CC 80240FCC 8FBF0050 */ lw $ra, 0x50($sp) -/* DF79D0 80240FD0 8FB1004C */ lw $s1, 0x4c($sp) -/* DF79D4 80240FD4 8FB00048 */ lw $s0, 0x48($sp) -/* DF79D8 80240FD8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* DF79DC 80240FDC D7B60060 */ ldc1 $f22, 0x60($sp) -/* DF79E0 80240FE0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DF79E4 80240FE4 03E00008 */ jr $ra -/* DF79E8 80240FE8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0_DF78B0.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0_DF78B0.s new file mode 100644 index 0000000000..a1e1353da8 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80240EB0_DF78B0.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EB0_DF78B0 +/* DF78B0 80240EB0 27BDFF90 */ addiu $sp, $sp, -0x70 +/* DF78B4 80240EB4 AFB00048 */ sw $s0, 0x48($sp) +/* DF78B8 80240EB8 00A0802D */ daddu $s0, $a1, $zero +/* DF78BC 80240EBC AFBF0050 */ sw $ra, 0x50($sp) +/* DF78C0 80240EC0 AFB1004C */ sw $s1, 0x4c($sp) +/* DF78C4 80240EC4 F7B80068 */ sdc1 $f24, 0x68($sp) +/* DF78C8 80240EC8 F7B60060 */ sdc1 $f22, 0x60($sp) +/* DF78CC 80240ECC F7B40058 */ sdc1 $f20, 0x58($sp) +/* DF78D0 80240ED0 8C82001C */ lw $v0, 0x1c($a0) +/* DF78D4 80240ED4 0000202D */ daddu $a0, $zero, $zero +/* DF78D8 80240ED8 0000282D */ daddu $a1, $zero, $zero +/* DF78DC 80240EDC C6140010 */ lwc1 $f20, 0x10($s0) +/* DF78E0 80240EE0 4680A520 */ cvt.s.w $f20, $f20 +/* DF78E4 80240EE4 3C06437F */ lui $a2, 0x437f +/* DF78E8 80240EE8 C6160014 */ lwc1 $f22, 0x14($s0) +/* DF78EC 80240EEC 4680B5A0 */ cvt.s.w $f22, $f22 +/* DF78F0 80240EF0 AFA20010 */ sw $v0, 0x10($sp) +/* DF78F4 80240EF4 8E070018 */ lw $a3, 0x18($s0) +/* DF78F8 80240EF8 0C00A8ED */ jal update_lerp +/* DF78FC 80240EFC 27B10038 */ addiu $s1, $sp, 0x38 +/* DF7900 80240F00 AFB10010 */ sw $s1, 0x10($sp) +/* DF7904 80240F04 8E040004 */ lw $a0, 4($s0) +/* DF7908 80240F08 8E050008 */ lw $a1, 8($s0) +/* DF790C 80240F0C 8E060000 */ lw $a2, ($s0) +/* DF7910 80240F10 8E07000C */ lw $a3, 0xc($s0) +/* DF7914 80240F14 0C04BA38 */ jal func_8012E8E0 +/* DF7918 80240F18 46000606 */ mov.s $f24, $f0 +/* DF791C 80240F1C 4600A08D */ trunc.w.s $f2, $f20 +/* DF7920 80240F20 44021000 */ mfc1 $v0, $f2 +/* DF7924 80240F24 93A50040 */ lbu $a1, 0x40($sp) +/* DF7928 80240F28 93A60041 */ lbu $a2, 0x41($sp) +/* DF792C 80240F2C 00021400 */ sll $v0, $v0, 0x10 +/* DF7930 80240F30 AFA00010 */ sw $zero, 0x10($sp) +/* DF7934 80240F34 8FA3003C */ lw $v1, 0x3c($sp) +/* DF7938 80240F38 00021403 */ sra $v0, $v0, 0x10 +/* DF793C 80240F3C AFA20018 */ sw $v0, 0x18($sp) +/* DF7940 80240F40 4600B08D */ trunc.w.s $f2, $f22 +/* DF7944 80240F44 44021000 */ mfc1 $v0, $f2 +/* DF7948 80240F48 00000000 */ nop +/* DF794C 80240F4C 00021400 */ sll $v0, $v0, 0x10 +/* DF7950 80240F50 3C014F00 */ lui $at, 0x4f00 +/* DF7954 80240F54 44810000 */ mtc1 $at, $f0 +/* DF7958 80240F58 00021403 */ sra $v0, $v0, 0x10 +/* DF795C 80240F5C AFA2001C */ sw $v0, 0x1c($sp) +/* DF7960 80240F60 2402000A */ addiu $v0, $zero, 0xa +/* DF7964 80240F64 AFA20020 */ sw $v0, 0x20($sp) +/* DF7968 80240F68 24020014 */ addiu $v0, $zero, 0x14 +/* DF796C 80240F6C AFA20024 */ sw $v0, 0x24($sp) +/* DF7970 80240F70 2402012C */ addiu $v0, $zero, 0x12c +/* DF7974 80240F74 AFA20028 */ sw $v0, 0x28($sp) +/* DF7978 80240F78 240200C8 */ addiu $v0, $zero, 0xc8 +/* DF797C 80240F7C AFA2002C */ sw $v0, 0x2c($sp) +/* DF7980 80240F80 4618003E */ c.le.s $f0, $f24 +/* DF7984 80240F84 00000000 */ nop +/* DF7988 80240F88 45010005 */ bc1t .L80240FA0 +/* DF798C 80240F8C AFA30014 */ sw $v1, 0x14($sp) +/* DF7990 80240F90 4600C08D */ trunc.w.s $f2, $f24 +/* DF7994 80240F94 44031000 */ mfc1 $v1, $f2 +/* DF7998 80240F98 080903EF */ j .L80240FBC +/* DF799C 80240F9C 306200FF */ andi $v0, $v1, 0xff +.L80240FA0: +/* DF79A0 80240FA0 4600C001 */ sub.s $f0, $f24, $f0 +/* DF79A4 80240FA4 3C028000 */ lui $v0, 0x8000 +/* DF79A8 80240FA8 4600008D */ trunc.w.s $f2, $f0 +/* DF79AC 80240FAC 44031000 */ mfc1 $v1, $f2 +/* DF79B0 80240FB0 00000000 */ nop +/* DF79B4 80240FB4 00621825 */ or $v1, $v1, $v0 +/* DF79B8 80240FB8 306200FF */ andi $v0, $v1, 0xff +.L80240FBC: +/* DF79BC 80240FBC AFA20030 */ sw $v0, 0x30($sp) +/* DF79C0 80240FC0 8E240000 */ lw $a0, ($s1) +/* DF79C4 80240FC4 0C04BA68 */ jal func_8012E9A0 +/* DF79C8 80240FC8 24070002 */ addiu $a3, $zero, 2 +/* DF79CC 80240FCC 8FBF0050 */ lw $ra, 0x50($sp) +/* DF79D0 80240FD0 8FB1004C */ lw $s1, 0x4c($sp) +/* DF79D4 80240FD4 8FB00048 */ lw $s0, 0x48($sp) +/* DF79D8 80240FD8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* DF79DC 80240FDC D7B60060 */ ldc1 $f22, 0x60($sp) +/* DF79E0 80240FE0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* DF79E4 80240FE4 03E00008 */ jr $ra +/* DF79E8 80240FE8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC.s deleted file mode 100644 index 9192b98d70..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411CC -/* DF7BCC 802411CC 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* DF7BD0 802411D0 00A0102D */ daddu $v0, $a1, $zero -/* DF7BD4 802411D4 27A30038 */ addiu $v1, $sp, 0x38 -/* DF7BD8 802411D8 AFBF0048 */ sw $ra, 0x48($sp) -/* DF7BDC 802411DC F7B60058 */ sdc1 $f22, 0x58($sp) -/* DF7BE0 802411E0 F7B40050 */ sdc1 $f20, 0x50($sp) -/* DF7BE4 802411E4 C4540010 */ lwc1 $f20, 0x10($v0) -/* DF7BE8 802411E8 4680A520 */ cvt.s.w $f20, $f20 -/* DF7BEC 802411EC C4560014 */ lwc1 $f22, 0x14($v0) -/* DF7BF0 802411F0 4680B5A0 */ cvt.s.w $f22, $f22 -/* DF7BF4 802411F4 AFA30010 */ sw $v1, 0x10($sp) -/* DF7BF8 802411F8 8C440004 */ lw $a0, 4($v0) -/* DF7BFC 802411FC 8C450008 */ lw $a1, 8($v0) -/* DF7C00 80241200 8C460000 */ lw $a2, ($v0) -/* DF7C04 80241204 0C04BA38 */ jal func_8012E8E0 -/* DF7C08 80241208 8C47000C */ lw $a3, 0xc($v0) -/* DF7C0C 8024120C 4600A00D */ trunc.w.s $f0, $f20 -/* DF7C10 80241210 44020000 */ mfc1 $v0, $f0 -/* DF7C14 80241214 93A50040 */ lbu $a1, 0x40($sp) -/* DF7C18 80241218 93A60041 */ lbu $a2, 0x41($sp) -/* DF7C1C 8024121C 00021400 */ sll $v0, $v0, 0x10 -/* DF7C20 80241220 AFA00010 */ sw $zero, 0x10($sp) -/* DF7C24 80241224 8FA3003C */ lw $v1, 0x3c($sp) -/* DF7C28 80241228 00021403 */ sra $v0, $v0, 0x10 -/* DF7C2C 8024122C AFA20018 */ sw $v0, 0x18($sp) -/* DF7C30 80241230 4600B00D */ trunc.w.s $f0, $f22 -/* DF7C34 80241234 44020000 */ mfc1 $v0, $f0 -/* DF7C38 80241238 00000000 */ nop -/* DF7C3C 8024123C 00021400 */ sll $v0, $v0, 0x10 -/* DF7C40 80241240 00021403 */ sra $v0, $v0, 0x10 -/* DF7C44 80241244 AFA2001C */ sw $v0, 0x1c($sp) -/* DF7C48 80241248 2402000A */ addiu $v0, $zero, 0xa -/* DF7C4C 8024124C AFA20020 */ sw $v0, 0x20($sp) -/* DF7C50 80241250 24020014 */ addiu $v0, $zero, 0x14 -/* DF7C54 80241254 AFA20024 */ sw $v0, 0x24($sp) -/* DF7C58 80241258 2402012C */ addiu $v0, $zero, 0x12c -/* DF7C5C 8024125C AFA20028 */ sw $v0, 0x28($sp) -/* DF7C60 80241260 240200C8 */ addiu $v0, $zero, 0xc8 -/* DF7C64 80241264 AFA2002C */ sw $v0, 0x2c($sp) -/* DF7C68 80241268 240200FF */ addiu $v0, $zero, 0xff -/* DF7C6C 8024126C AFA20030 */ sw $v0, 0x30($sp) -/* DF7C70 80241270 AFA30014 */ sw $v1, 0x14($sp) -/* DF7C74 80241274 8FA40038 */ lw $a0, 0x38($sp) -/* DF7C78 80241278 0C04BA68 */ jal func_8012E9A0 -/* DF7C7C 8024127C 24070002 */ addiu $a3, $zero, 2 -/* DF7C80 80241280 8FBF0048 */ lw $ra, 0x48($sp) -/* DF7C84 80241284 D7B60058 */ ldc1 $f22, 0x58($sp) -/* DF7C88 80241288 D7B40050 */ ldc1 $f20, 0x50($sp) -/* DF7C8C 8024128C 03E00008 */ jr $ra -/* DF7C90 80241290 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC_DF7BCC.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC_DF7BCC.s new file mode 100644 index 0000000000..a2ff3a58d1 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802411CC_DF7BCC.s @@ -0,0 +1,54 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411CC_DF7BCC +/* DF7BCC 802411CC 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* DF7BD0 802411D0 00A0102D */ daddu $v0, $a1, $zero +/* DF7BD4 802411D4 27A30038 */ addiu $v1, $sp, 0x38 +/* DF7BD8 802411D8 AFBF0048 */ sw $ra, 0x48($sp) +/* DF7BDC 802411DC F7B60058 */ sdc1 $f22, 0x58($sp) +/* DF7BE0 802411E0 F7B40050 */ sdc1 $f20, 0x50($sp) +/* DF7BE4 802411E4 C4540010 */ lwc1 $f20, 0x10($v0) +/* DF7BE8 802411E8 4680A520 */ cvt.s.w $f20, $f20 +/* DF7BEC 802411EC C4560014 */ lwc1 $f22, 0x14($v0) +/* DF7BF0 802411F0 4680B5A0 */ cvt.s.w $f22, $f22 +/* DF7BF4 802411F4 AFA30010 */ sw $v1, 0x10($sp) +/* DF7BF8 802411F8 8C440004 */ lw $a0, 4($v0) +/* DF7BFC 802411FC 8C450008 */ lw $a1, 8($v0) +/* DF7C00 80241200 8C460000 */ lw $a2, ($v0) +/* DF7C04 80241204 0C04BA38 */ jal func_8012E8E0 +/* DF7C08 80241208 8C47000C */ lw $a3, 0xc($v0) +/* DF7C0C 8024120C 4600A00D */ trunc.w.s $f0, $f20 +/* DF7C10 80241210 44020000 */ mfc1 $v0, $f0 +/* DF7C14 80241214 93A50040 */ lbu $a1, 0x40($sp) +/* DF7C18 80241218 93A60041 */ lbu $a2, 0x41($sp) +/* DF7C1C 8024121C 00021400 */ sll $v0, $v0, 0x10 +/* DF7C20 80241220 AFA00010 */ sw $zero, 0x10($sp) +/* DF7C24 80241224 8FA3003C */ lw $v1, 0x3c($sp) +/* DF7C28 80241228 00021403 */ sra $v0, $v0, 0x10 +/* DF7C2C 8024122C AFA20018 */ sw $v0, 0x18($sp) +/* DF7C30 80241230 4600B00D */ trunc.w.s $f0, $f22 +/* DF7C34 80241234 44020000 */ mfc1 $v0, $f0 +/* DF7C38 80241238 00000000 */ nop +/* DF7C3C 8024123C 00021400 */ sll $v0, $v0, 0x10 +/* DF7C40 80241240 00021403 */ sra $v0, $v0, 0x10 +/* DF7C44 80241244 AFA2001C */ sw $v0, 0x1c($sp) +/* DF7C48 80241248 2402000A */ addiu $v0, $zero, 0xa +/* DF7C4C 8024124C AFA20020 */ sw $v0, 0x20($sp) +/* DF7C50 80241250 24020014 */ addiu $v0, $zero, 0x14 +/* DF7C54 80241254 AFA20024 */ sw $v0, 0x24($sp) +/* DF7C58 80241258 2402012C */ addiu $v0, $zero, 0x12c +/* DF7C5C 8024125C AFA20028 */ sw $v0, 0x28($sp) +/* DF7C60 80241260 240200C8 */ addiu $v0, $zero, 0xc8 +/* DF7C64 80241264 AFA2002C */ sw $v0, 0x2c($sp) +/* DF7C68 80241268 240200FF */ addiu $v0, $zero, 0xff +/* DF7C6C 8024126C AFA20030 */ sw $v0, 0x30($sp) +/* DF7C70 80241270 AFA30014 */ sw $v1, 0x14($sp) +/* DF7C74 80241274 8FA40038 */ lw $a0, 0x38($sp) +/* DF7C78 80241278 0C04BA68 */ jal func_8012E9A0 +/* DF7C7C 8024127C 24070002 */ addiu $a3, $zero, 2 +/* DF7C80 80241280 8FBF0048 */ lw $ra, 0x48($sp) +/* DF7C84 80241284 D7B60058 */ ldc1 $f22, 0x58($sp) +/* DF7C88 80241288 D7B40050 */ ldc1 $f20, 0x50($sp) +/* DF7C8C 8024128C 03E00008 */ jr $ra +/* DF7C90 80241290 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294.s deleted file mode 100644 index 2d4a8420ef..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241294 -/* DF7C94 80241294 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* DF7C98 80241298 AFB00088 */ sw $s0, 0x88($sp) -/* DF7C9C 8024129C 00A0802D */ daddu $s0, $a1, $zero -/* DF7CA0 802412A0 AFBF00A0 */ sw $ra, 0xa0($sp) -/* DF7CA4 802412A4 AFB5009C */ sw $s5, 0x9c($sp) -/* DF7CA8 802412A8 AFB40098 */ sw $s4, 0x98($sp) -/* DF7CAC 802412AC AFB30094 */ sw $s3, 0x94($sp) -/* DF7CB0 802412B0 AFB20090 */ sw $s2, 0x90($sp) -/* DF7CB4 802412B4 AFB1008C */ sw $s1, 0x8c($sp) -/* DF7CB8 802412B8 F7BA00C0 */ sdc1 $f26, 0xc0($sp) -/* DF7CBC 802412BC F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* DF7CC0 802412C0 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* DF7CC4 802412C4 F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* DF7CC8 802412C8 C6140010 */ lwc1 $f20, 0x10($s0) -/* DF7CCC 802412CC 4680A520 */ cvt.s.w $f20, $f20 -/* DF7CD0 802412D0 4480C000 */ mtc1 $zero, $f24 -/* DF7CD4 802412D4 3C05437F */ lui $a1, 0x437f -/* DF7CD8 802412D8 8C820050 */ lw $v0, 0x50($a0) -/* DF7CDC 802412DC 4406C000 */ mfc1 $a2, $f24 -/* DF7CE0 802412E0 C61A0014 */ lwc1 $f26, 0x14($s0) -/* DF7CE4 802412E4 4680D6A0 */ cvt.s.w $f26, $f26 -/* DF7CE8 802412E8 AFA20010 */ sw $v0, 0x10($sp) -/* DF7CEC 802412EC 8E070018 */ lw $a3, 0x18($s0) -/* DF7CF0 802412F0 0C00A8ED */ jal update_lerp -/* DF7CF4 802412F4 2404000B */ addiu $a0, $zero, 0xb -/* DF7CF8 802412F8 4600008D */ trunc.w.s $f2, $f0 -/* DF7CFC 802412FC E7A20014 */ swc1 $f2, 0x14($sp) -/* DF7D00 80241300 0000202D */ daddu $a0, $zero, $zero -/* DF7D04 80241304 24050007 */ addiu $a1, $zero, 7 -/* DF7D08 80241308 240600FF */ addiu $a2, $zero, 0xff -/* DF7D0C 8024130C 00C0382D */ daddu $a3, $a2, $zero -/* DF7D10 80241310 00C0A82D */ daddu $s5, $a2, $zero -/* DF7D14 80241314 AFB50010 */ sw $s5, 0x10($sp) -/* DF7D18 80241318 0C04EAA7 */ jal func_8013AA9C -/* DF7D1C 8024131C AFA00018 */ sw $zero, 0x18($sp) -/* DF7D20 80241320 27A20038 */ addiu $v0, $sp, 0x38 -/* DF7D24 80241324 AFA20010 */ sw $v0, 0x10($sp) -/* DF7D28 80241328 8E040004 */ lw $a0, 4($s0) -/* DF7D2C 8024132C 8E050008 */ lw $a1, 8($s0) -/* DF7D30 80241330 8E060000 */ lw $a2, ($s0) -/* DF7D34 80241334 8E07000C */ lw $a3, 0xc($s0) -/* DF7D38 80241338 0C04BA38 */ jal func_8012E8E0 -/* DF7D3C 8024133C 3C140001 */ lui $s4, 1 -/* DF7D40 80241340 93A20042 */ lbu $v0, 0x42($sp) -/* DF7D44 80241344 3C013FE0 */ lui $at, 0x3fe0 -/* DF7D48 80241348 4481B800 */ mtc1 $at, $f23 -/* DF7D4C 8024134C 4480B000 */ mtc1 $zero, $f22 -/* DF7D50 80241350 44820000 */ mtc1 $v0, $f0 -/* DF7D54 80241354 00000000 */ nop -/* DF7D58 80241358 46800021 */ cvt.d.w $f0, $f0 -/* DF7D5C 8024135C 46360002 */ mul.d $f0, $f0, $f22 -/* 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 -/* DF7D70 80241370 4600D687 */ neg.s $f26, $f26 -/* DF7D74 80241374 4620A500 */ add.d $f20, $f20, $f0 -/* DF7D78 80241378 4406D000 */ mfc1 $a2, $f26 -/* DF7D7C 8024137C 4407C000 */ mfc1 $a3, $f24 -/* DF7D80 80241380 4620A520 */ cvt.s.d $f20, $f20 -/* DF7D84 80241384 4405A000 */ mfc1 $a1, $f20 -/* DF7D88 80241388 0C019E40 */ jal guTranslateF -/* DF7D8C 8024138C 0200202D */ daddu $a0, $s0, $zero -/* DF7D90 80241390 0200202D */ daddu $a0, $s0, $zero -/* DF7D94 80241394 3C128007 */ lui $s2, 0x8007 -/* DF7D98 80241398 265241F0 */ addiu $s2, $s2, 0x41f0 -/* DF7D9C 8024139C 3C13800A */ lui $s3, 0x800a -/* DF7DA0 802413A0 2673A674 */ addiu $s3, $s3, -0x598c -/* DF7DA4 802413A4 96450000 */ lhu $a1, ($s2) -/* DF7DA8 802413A8 8E620000 */ lw $v0, ($s3) -/* DF7DAC 802413AC 00052980 */ sll $a1, $a1, 6 -/* DF7DB0 802413B0 00B42821 */ addu $a1, $a1, $s4 -/* DF7DB4 802413B4 0C019D40 */ jal guMtxF2L -/* DF7DB8 802413B8 00452821 */ addu $a1, $v0, $a1 -/* DF7DBC 802413BC 3C03DA38 */ lui $v1, 0xda38 -/* DF7DC0 802413C0 34630002 */ ori $v1, $v1, 2 -/* DF7DC4 802413C4 0000202D */ daddu $a0, $zero, $zero -/* 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, 0x800a -/* DF7DD8 802413D8 2631A66C */ addiu $s1, $s1, -0x5994 -/* DF7DDC 802413DC 0200382D */ daddu $a3, $s0, $zero -/* DF7DE0 802413E0 8E220000 */ lw $v0, ($s1) -/* DF7DE4 802413E4 96480000 */ lhu $t0, ($s2) -/* DF7DE8 802413E8 0040482D */ daddu $t1, $v0, $zero -/* DF7DEC 802413EC 24420008 */ addiu $v0, $v0, 8 -/* DF7DF0 802413F0 AE220000 */ sw $v0, ($s1) -/* DF7DF4 802413F4 3102FFFF */ andi $v0, $t0, 0xffff -/* DF7DF8 802413F8 00021180 */ sll $v0, $v0, 6 -/* DF7DFC 802413FC 00541021 */ addu $v0, $v0, $s4 -/* DF7E00 80241400 AD230000 */ sw $v1, ($t1) -/* DF7E04 80241404 8E630000 */ lw $v1, ($s3) -/* DF7E08 80241408 25080001 */ addiu $t0, $t0, 1 -/* DF7E0C 8024140C 00621821 */ addu $v1, $v1, $v0 -/* DF7E10 80241410 3C028000 */ lui $v0, 0x8000 -/* DF7E14 80241414 00621821 */ addu $v1, $v1, $v0 -/* DF7E18 80241418 AD230004 */ sw $v1, 4($t1) -/* DF7E1C 8024141C 93A20042 */ lbu $v0, 0x42($sp) -/* DF7E20 80241420 8FA3003C */ lw $v1, 0x3c($sp) -/* DF7E24 80241424 93A90040 */ lbu $t1, 0x40($sp) -/* DF7E28 80241428 93AA0041 */ lbu $t2, 0x41($sp) -/* DF7E2C 8024142C 44820000 */ mtc1 $v0, $f0 -/* 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 -/* DF7E44 80241444 A6480000 */ sh $t0, ($s2) -/* DF7E48 80241448 A7A0002E */ sh $zero, 0x2e($sp) -/* DF7E4C 8024144C A3B50030 */ sb $s5, 0x30($sp) -/* DF7E50 80241450 AFA30024 */ sw $v1, 0x24($sp) -/* DF7E54 80241454 A7A90028 */ sh $t1, 0x28($sp) -/* DF7E58 80241458 A7AA002A */ sh $t2, 0x2a($sp) -/* DF7E5C 8024145C AFA20020 */ sw $v0, 0x20($sp) -/* DF7E60 80241460 46200007 */ neg.d $f0, $f0 -/* DF7E64 80241464 4620008D */ trunc.w.d $f2, $f0 -/* DF7E68 80241468 44021000 */ mfc1 $v0, $f2 -/* DF7E6C 8024146C 0C04EBDC */ jal func_8013AF70 -/* DF7E70 80241470 A7A2002C */ sh $v0, 0x2c($sp) -/* DF7E74 80241474 3C04D838 */ lui $a0, 0xd838 -/* DF7E78 80241478 8E220000 */ lw $v0, ($s1) -/* DF7E7C 8024147C 34840002 */ ori $a0, $a0, 2 -/* DF7E80 80241480 0040182D */ daddu $v1, $v0, $zero -/* DF7E84 80241484 24420008 */ addiu $v0, $v0, 8 -/* DF7E88 80241488 AE220000 */ sw $v0, ($s1) -/* DF7E8C 8024148C 24020040 */ addiu $v0, $zero, 0x40 -/* DF7E90 80241490 AC640000 */ sw $a0, ($v1) -/* DF7E94 80241494 AC620004 */ sw $v0, 4($v1) -/* DF7E98 80241498 8FBF00A0 */ lw $ra, 0xa0($sp) -/* DF7E9C 8024149C 8FB5009C */ lw $s5, 0x9c($sp) -/* DF7EA0 802414A0 8FB40098 */ lw $s4, 0x98($sp) -/* DF7EA4 802414A4 8FB30094 */ lw $s3, 0x94($sp) -/* DF7EA8 802414A8 8FB20090 */ lw $s2, 0x90($sp) -/* DF7EAC 802414AC 8FB1008C */ lw $s1, 0x8c($sp) -/* DF7EB0 802414B0 8FB00088 */ lw $s0, 0x88($sp) -/* DF7EB4 802414B4 D7BA00C0 */ ldc1 $f26, 0xc0($sp) -/* DF7EB8 802414B8 D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* DF7EBC 802414BC D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* DF7EC0 802414C0 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* DF7EC4 802414C4 03E00008 */ jr $ra -/* DF7EC8 802414C8 27BD00C8 */ addiu $sp, $sp, 0xc8 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 new file mode 100644 index 0000000000..ba990571c8 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241294_DF7C94.s @@ -0,0 +1,146 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241294_DF7C94 +/* DF7C94 80241294 27BDFF38 */ addiu $sp, $sp, -0xc8 +/* DF7C98 80241298 AFB00088 */ sw $s0, 0x88($sp) +/* DF7C9C 8024129C 00A0802D */ daddu $s0, $a1, $zero +/* DF7CA0 802412A0 AFBF00A0 */ sw $ra, 0xa0($sp) +/* DF7CA4 802412A4 AFB5009C */ sw $s5, 0x9c($sp) +/* DF7CA8 802412A8 AFB40098 */ sw $s4, 0x98($sp) +/* DF7CAC 802412AC AFB30094 */ sw $s3, 0x94($sp) +/* DF7CB0 802412B0 AFB20090 */ sw $s2, 0x90($sp) +/* DF7CB4 802412B4 AFB1008C */ sw $s1, 0x8c($sp) +/* DF7CB8 802412B8 F7BA00C0 */ sdc1 $f26, 0xc0($sp) +/* DF7CBC 802412BC F7B800B8 */ sdc1 $f24, 0xb8($sp) +/* DF7CC0 802412C0 F7B600B0 */ sdc1 $f22, 0xb0($sp) +/* DF7CC4 802412C4 F7B400A8 */ sdc1 $f20, 0xa8($sp) +/* DF7CC8 802412C8 C6140010 */ lwc1 $f20, 0x10($s0) +/* DF7CCC 802412CC 4680A520 */ cvt.s.w $f20, $f20 +/* DF7CD0 802412D0 4480C000 */ mtc1 $zero, $f24 +/* DF7CD4 802412D4 3C05437F */ lui $a1, 0x437f +/* DF7CD8 802412D8 8C820050 */ lw $v0, 0x50($a0) +/* DF7CDC 802412DC 4406C000 */ mfc1 $a2, $f24 +/* DF7CE0 802412E0 C61A0014 */ lwc1 $f26, 0x14($s0) +/* DF7CE4 802412E4 4680D6A0 */ cvt.s.w $f26, $f26 +/* DF7CE8 802412E8 AFA20010 */ sw $v0, 0x10($sp) +/* DF7CEC 802412EC 8E070018 */ lw $a3, 0x18($s0) +/* DF7CF0 802412F0 0C00A8ED */ jal update_lerp +/* DF7CF4 802412F4 2404000B */ addiu $a0, $zero, 0xb +/* DF7CF8 802412F8 4600008D */ trunc.w.s $f2, $f0 +/* DF7CFC 802412FC E7A20014 */ swc1 $f2, 0x14($sp) +/* DF7D00 80241300 0000202D */ daddu $a0, $zero, $zero +/* DF7D04 80241304 24050007 */ addiu $a1, $zero, 7 +/* DF7D08 80241308 240600FF */ addiu $a2, $zero, 0xff +/* DF7D0C 8024130C 00C0382D */ daddu $a3, $a2, $zero +/* DF7D10 80241310 00C0A82D */ daddu $s5, $a2, $zero +/* DF7D14 80241314 AFB50010 */ sw $s5, 0x10($sp) +/* DF7D18 80241318 0C04EAA7 */ jal func_8013AA9C +/* DF7D1C 8024131C AFA00018 */ sw $zero, 0x18($sp) +/* DF7D20 80241320 27A20038 */ addiu $v0, $sp, 0x38 +/* DF7D24 80241324 AFA20010 */ sw $v0, 0x10($sp) +/* DF7D28 80241328 8E040004 */ lw $a0, 4($s0) +/* DF7D2C 8024132C 8E050008 */ lw $a1, 8($s0) +/* DF7D30 80241330 8E060000 */ lw $a2, ($s0) +/* DF7D34 80241334 8E07000C */ lw $a3, 0xc($s0) +/* DF7D38 80241338 0C04BA38 */ jal func_8012E8E0 +/* DF7D3C 8024133C 3C140001 */ lui $s4, 1 +/* DF7D40 80241340 93A20042 */ lbu $v0, 0x42($sp) +/* DF7D44 80241344 3C013FE0 */ lui $at, 0x3fe0 +/* DF7D48 80241348 4481B800 */ mtc1 $at, $f23 +/* DF7D4C 8024134C 4480B000 */ mtc1 $zero, $f22 +/* DF7D50 80241350 44820000 */ mtc1 $v0, $f0 +/* DF7D54 80241354 00000000 */ nop +/* DF7D58 80241358 46800021 */ cvt.d.w $f0, $f0 +/* DF7D5C 8024135C 46360002 */ mul.d $f0, $f0, $f22 +/* 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 +/* DF7D70 80241370 4600D687 */ neg.s $f26, $f26 +/* DF7D74 80241374 4620A500 */ add.d $f20, $f20, $f0 +/* DF7D78 80241378 4406D000 */ mfc1 $a2, $f26 +/* DF7D7C 8024137C 4407C000 */ mfc1 $a3, $f24 +/* DF7D80 80241380 4620A520 */ cvt.s.d $f20, $f20 +/* DF7D84 80241384 4405A000 */ mfc1 $a1, $f20 +/* DF7D88 80241388 0C019E40 */ jal guTranslateF +/* DF7D8C 8024138C 0200202D */ daddu $a0, $s0, $zero +/* DF7D90 80241390 0200202D */ daddu $a0, $s0, $zero +/* DF7D94 80241394 3C128007 */ lui $s2, 0x8007 +/* DF7D98 80241398 265241F0 */ addiu $s2, $s2, 0x41f0 +/* DF7D9C 8024139C 3C13800A */ lui $s3, 0x800a +/* DF7DA0 802413A0 2673A674 */ addiu $s3, $s3, -0x598c +/* DF7DA4 802413A4 96450000 */ lhu $a1, ($s2) +/* DF7DA8 802413A8 8E620000 */ lw $v0, ($s3) +/* DF7DAC 802413AC 00052980 */ sll $a1, $a1, 6 +/* DF7DB0 802413B0 00B42821 */ addu $a1, $a1, $s4 +/* DF7DB4 802413B4 0C019D40 */ jal guMtxF2L +/* DF7DB8 802413B8 00452821 */ addu $a1, $v0, $a1 +/* DF7DBC 802413BC 3C03DA38 */ lui $v1, 0xda38 +/* DF7DC0 802413C0 34630002 */ ori $v1, $v1, 2 +/* DF7DC4 802413C4 0000202D */ daddu $a0, $zero, $zero +/* 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, 0x800a +/* DF7DD8 802413D8 2631A66C */ addiu $s1, $s1, -0x5994 +/* DF7DDC 802413DC 0200382D */ daddu $a3, $s0, $zero +/* DF7DE0 802413E0 8E220000 */ lw $v0, ($s1) +/* DF7DE4 802413E4 96480000 */ lhu $t0, ($s2) +/* DF7DE8 802413E8 0040482D */ daddu $t1, $v0, $zero +/* DF7DEC 802413EC 24420008 */ addiu $v0, $v0, 8 +/* DF7DF0 802413F0 AE220000 */ sw $v0, ($s1) +/* DF7DF4 802413F4 3102FFFF */ andi $v0, $t0, 0xffff +/* DF7DF8 802413F8 00021180 */ sll $v0, $v0, 6 +/* DF7DFC 802413FC 00541021 */ addu $v0, $v0, $s4 +/* DF7E00 80241400 AD230000 */ sw $v1, ($t1) +/* DF7E04 80241404 8E630000 */ lw $v1, ($s3) +/* DF7E08 80241408 25080001 */ addiu $t0, $t0, 1 +/* DF7E0C 8024140C 00621821 */ addu $v1, $v1, $v0 +/* DF7E10 80241410 3C028000 */ lui $v0, 0x8000 +/* DF7E14 80241414 00621821 */ addu $v1, $v1, $v0 +/* DF7E18 80241418 AD230004 */ sw $v1, 4($t1) +/* DF7E1C 8024141C 93A20042 */ lbu $v0, 0x42($sp) +/* DF7E20 80241420 8FA3003C */ lw $v1, 0x3c($sp) +/* DF7E24 80241424 93A90040 */ lbu $t1, 0x40($sp) +/* DF7E28 80241428 93AA0041 */ lbu $t2, 0x41($sp) +/* DF7E2C 8024142C 44820000 */ mtc1 $v0, $f0 +/* 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 +/* DF7E44 80241444 A6480000 */ sh $t0, ($s2) +/* DF7E48 80241448 A7A0002E */ sh $zero, 0x2e($sp) +/* DF7E4C 8024144C A3B50030 */ sb $s5, 0x30($sp) +/* DF7E50 80241450 AFA30024 */ sw $v1, 0x24($sp) +/* DF7E54 80241454 A7A90028 */ sh $t1, 0x28($sp) +/* DF7E58 80241458 A7AA002A */ sh $t2, 0x2a($sp) +/* DF7E5C 8024145C AFA20020 */ sw $v0, 0x20($sp) +/* DF7E60 80241460 46200007 */ neg.d $f0, $f0 +/* DF7E64 80241464 4620008D */ trunc.w.d $f2, $f0 +/* DF7E68 80241468 44021000 */ mfc1 $v0, $f2 +/* DF7E6C 8024146C 0C04EBDC */ jal func_8013AF70 +/* DF7E70 80241470 A7A2002C */ sh $v0, 0x2c($sp) +/* DF7E74 80241474 3C04D838 */ lui $a0, 0xd838 +/* DF7E78 80241478 8E220000 */ lw $v0, ($s1) +/* DF7E7C 8024147C 34840002 */ ori $a0, $a0, 2 +/* DF7E80 80241480 0040182D */ daddu $v1, $v0, $zero +/* DF7E84 80241484 24420008 */ addiu $v0, $v0, 8 +/* DF7E88 80241488 AE220000 */ sw $v0, ($s1) +/* DF7E8C 8024148C 24020040 */ addiu $v0, $zero, 0x40 +/* DF7E90 80241490 AC640000 */ sw $a0, ($v1) +/* DF7E94 80241494 AC620004 */ sw $v0, 4($v1) +/* DF7E98 80241498 8FBF00A0 */ lw $ra, 0xa0($sp) +/* DF7E9C 8024149C 8FB5009C */ lw $s5, 0x9c($sp) +/* DF7EA0 802414A0 8FB40098 */ lw $s4, 0x98($sp) +/* DF7EA4 802414A4 8FB30094 */ lw $s3, 0x94($sp) +/* DF7EA8 802414A8 8FB20090 */ lw $s2, 0x90($sp) +/* DF7EAC 802414AC 8FB1008C */ lw $s1, 0x8c($sp) +/* DF7EB0 802414B0 8FB00088 */ lw $s0, 0x88($sp) +/* DF7EB4 802414B4 D7BA00C0 */ ldc1 $f26, 0xc0($sp) +/* DF7EB8 802414B8 D7B800B8 */ ldc1 $f24, 0xb8($sp) +/* DF7EBC 802414BC D7B600B0 */ ldc1 $f22, 0xb0($sp) +/* DF7EC0 802414C0 D7B400A8 */ ldc1 $f20, 0xa8($sp) +/* DF7EC4 802414C4 03E00008 */ jr $ra +/* DF7EC8 802414C8 27BD00C8 */ addiu $sp, $sp, 0xc8 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC.s deleted file mode 100644 index 309e0dd946..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC.s +++ /dev/null @@ -1,171 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414CC -/* DF7ECC 802414CC 27BDFEE8 */ addiu $sp, $sp, -0x118 -/* DF7ED0 802414D0 AFB100CC */ sw $s1, 0xcc($sp) -/* DF7ED4 802414D4 0080882D */ daddu $s1, $a0, $zero -/* DF7ED8 802414D8 AFB000C8 */ sw $s0, 0xc8($sp) -/* DF7EDC 802414DC 00A0802D */ daddu $s0, $a1, $zero -/* DF7EE0 802414E0 AFBF00E0 */ sw $ra, 0xe0($sp) -/* DF7EE4 802414E4 AFB500DC */ sw $s5, 0xdc($sp) -/* DF7EE8 802414E8 AFB400D8 */ sw $s4, 0xd8($sp) -/* DF7EEC 802414EC AFB300D4 */ sw $s3, 0xd4($sp) -/* DF7EF0 802414F0 AFB200D0 */ sw $s2, 0xd0($sp) -/* DF7EF4 802414F4 F7BE0110 */ sdc1 $f30, 0x110($sp) -/* DF7EF8 802414F8 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* DF7EFC 802414FC F7BA0100 */ sdc1 $f26, 0x100($sp) -/* DF7F00 80241500 F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* DF7F04 80241504 F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* DF7F08 80241508 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* DF7F0C 8024150C C6140010 */ lwc1 $f20, 0x10($s0) -/* DF7F10 80241510 4680A520 */ cvt.s.w $f20, $f20 -/* DF7F14 80241514 4480E000 */ mtc1 $zero, $f28 -/* DF7F18 80241518 3C05437F */ lui $a1, 0x437f -/* DF7F1C 8024151C 8E220050 */ lw $v0, 0x50($s1) -/* DF7F20 80241520 4406E000 */ mfc1 $a2, $f28 -/* DF7F24 80241524 C61E0014 */ lwc1 $f30, 0x14($s0) -/* DF7F28 80241528 4680F7A0 */ cvt.s.w $f30, $f30 -/* DF7F2C 8024152C AFA20010 */ sw $v0, 0x10($sp) -/* DF7F30 80241530 8E070018 */ lw $a3, 0x18($s0) -/* DF7F34 80241534 0C00A8ED */ jal update_lerp -/* DF7F38 80241538 2404000B */ addiu $a0, $zero, 0xb -/* DF7F3C 8024153C 4600008D */ trunc.w.s $f2, $f0 -/* DF7F40 80241540 E7A20014 */ swc1 $f2, 0x14($sp) -/* DF7F44 80241544 0000202D */ daddu $a0, $zero, $zero -/* DF7F48 80241548 24050007 */ addiu $a1, $zero, 7 -/* DF7F4C 8024154C 240600FF */ addiu $a2, $zero, 0xff -/* DF7F50 80241550 00C0382D */ daddu $a3, $a2, $zero -/* DF7F54 80241554 00C0A82D */ daddu $s5, $a2, $zero -/* DF7F58 80241558 AFB50010 */ sw $s5, 0x10($sp) -/* DF7F5C 8024155C 0C04EAA7 */ jal func_8013AA9C -/* DF7F60 80241560 AFA00018 */ sw $zero, 0x18($sp) -/* DF7F64 80241564 3C013F80 */ lui $at, 0x3f80 -/* DF7F68 80241568 4481D000 */ mtc1 $at, $f26 -/* DF7F6C 8024156C 8E220050 */ lw $v0, 0x50($s1) -/* DF7F70 80241570 3C063E4C */ lui $a2, 0x3e4c -/* DF7F74 80241574 34C6CCCD */ ori $a2, $a2, 0xcccd -/* DF7F78 80241578 4405D000 */ mfc1 $a1, $f26 -/* DF7F7C 8024157C AFA20010 */ sw $v0, 0x10($sp) -/* DF7F80 80241580 8E070018 */ lw $a3, 0x18($s0) -/* DF7F84 80241584 0C00A8ED */ jal update_lerp -/* DF7F88 80241588 0000202D */ daddu $a0, $zero, $zero -/* DF7F8C 8024158C 27A20038 */ addiu $v0, $sp, 0x38 -/* DF7F90 80241590 AFA20010 */ sw $v0, 0x10($sp) -/* DF7F94 80241594 8E040004 */ lw $a0, 4($s0) -/* DF7F98 80241598 8E050008 */ lw $a1, 8($s0) -/* DF7F9C 8024159C 8E060000 */ lw $a2, ($s0) -/* DF7FA0 802415A0 8E07000C */ lw $a3, 0xc($s0) -/* DF7FA4 802415A4 0C04BA38 */ jal func_8012E8E0 -/* DF7FA8 802415A8 46000586 */ mov.s $f22, $f0 -/* DF7FAC 802415AC 93A20042 */ lbu $v0, 0x42($sp) -/* DF7FB0 802415B0 3C013FE0 */ lui $at, 0x3fe0 -/* DF7FB4 802415B4 4481C800 */ mtc1 $at, $f25 -/* DF7FB8 802415B8 4480C000 */ mtc1 $zero, $f24 -/* DF7FBC 802415BC 44820000 */ mtc1 $v0, $f0 -/* DF7FC0 802415C0 00000000 */ nop -/* DF7FC4 802415C4 46800021 */ cvt.d.w $f0, $f0 -/* DF7FC8 802415C8 46380002 */ mul.d $f0, $f0, $f24 -/* 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 -/* DF7FDC 802415DC 27B10048 */ addiu $s1, $sp, 0x48 -/* DF7FE0 802415E0 4600F787 */ neg.s $f30, $f30 -/* DF7FE4 802415E4 4620A500 */ add.d $f20, $f20, $f0 -/* DF7FE8 802415E8 4406F000 */ mfc1 $a2, $f30 -/* DF7FEC 802415EC 4407E000 */ mfc1 $a3, $f28 -/* DF7FF0 802415F0 4620A520 */ cvt.s.d $f20, $f20 -/* DF7FF4 802415F4 4405A000 */ mfc1 $a1, $f20 -/* DF7FF8 802415F8 0C019E40 */ jal guTranslateF -/* DF7FFC 802415FC 0220202D */ daddu $a0, $s1, $zero -/* DF8000 80241600 27B00088 */ addiu $s0, $sp, 0x88 -/* DF8004 80241604 0200202D */ daddu $a0, $s0, $zero -/* DF8008 80241608 4405B000 */ mfc1 $a1, $f22 -/* DF800C 8024160C 4407D000 */ mfc1 $a3, $f26 -/* DF8010 80241610 0C019DF0 */ jal guScaleF -/* DF8014 80241614 00A0302D */ daddu $a2, $a1, $zero -/* DF8018 80241618 0200202D */ daddu $a0, $s0, $zero -/* DF801C 8024161C 0220282D */ daddu $a1, $s1, $zero -/* DF8020 80241620 0C019D80 */ jal guMtxCatF -/* DF8024 80241624 0220302D */ daddu $a2, $s1, $zero -/* DF8028 80241628 0220202D */ daddu $a0, $s1, $zero -/* DF802C 8024162C 3C128007 */ lui $s2, 0x8007 -/* DF8030 80241630 265241F0 */ addiu $s2, $s2, 0x41f0 -/* DF8034 80241634 3C13800A */ lui $s3, 0x800a -/* DF8038 80241638 2673A674 */ addiu $s3, $s3, -0x598c -/* DF803C 8024163C 96450000 */ lhu $a1, ($s2) -/* DF8040 80241640 8E620000 */ lw $v0, ($s3) -/* DF8044 80241644 00052980 */ sll $a1, $a1, 6 -/* DF8048 80241648 00B42821 */ addu $a1, $a1, $s4 -/* DF804C 8024164C 0C019D40 */ jal guMtxF2L -/* DF8050 80241650 00452821 */ addu $a1, $v0, $a1 -/* DF8054 80241654 3C03DA38 */ lui $v1, 0xda38 -/* DF8058 80241658 34630002 */ ori $v1, $v1, 2 -/* 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, 0x800a -/* DF806C 8024166C 2610A66C */ addiu $s0, $s0, -0x5994 -/* DF8070 80241670 0220382D */ daddu $a3, $s1, $zero -/* DF8074 80241674 8E020000 */ lw $v0, ($s0) -/* DF8078 80241678 96480000 */ lhu $t0, ($s2) -/* DF807C 8024167C 0040482D */ daddu $t1, $v0, $zero -/* DF8080 80241680 24420008 */ addiu $v0, $v0, 8 -/* DF8084 80241684 AE020000 */ sw $v0, ($s0) -/* DF8088 80241688 3102FFFF */ andi $v0, $t0, 0xffff -/* DF808C 8024168C 00021180 */ sll $v0, $v0, 6 -/* DF8090 80241690 00541021 */ addu $v0, $v0, $s4 -/* DF8094 80241694 AD230000 */ sw $v1, ($t1) -/* DF8098 80241698 8E630000 */ lw $v1, ($s3) -/* DF809C 8024169C 25080001 */ addiu $t0, $t0, 1 -/* DF80A0 802416A0 00621821 */ addu $v1, $v1, $v0 -/* DF80A4 802416A4 3C028000 */ lui $v0, 0x8000 -/* DF80A8 802416A8 00621821 */ addu $v1, $v1, $v0 -/* DF80AC 802416AC AD230004 */ sw $v1, 4($t1) -/* DF80B0 802416B0 93A20042 */ lbu $v0, 0x42($sp) -/* DF80B4 802416B4 8FA3003C */ lw $v1, 0x3c($sp) -/* DF80B8 802416B8 93A90040 */ lbu $t1, 0x40($sp) -/* DF80BC 802416BC 93AA0041 */ lbu $t2, 0x41($sp) -/* DF80C0 802416C0 44820000 */ mtc1 $v0, $f0 -/* 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 -/* DF80D8 802416D8 A6480000 */ sh $t0, ($s2) -/* DF80DC 802416DC A7A0002E */ sh $zero, 0x2e($sp) -/* DF80E0 802416E0 A3B50030 */ sb $s5, 0x30($sp) -/* DF80E4 802416E4 AFA30024 */ sw $v1, 0x24($sp) -/* DF80E8 802416E8 A7A90028 */ sh $t1, 0x28($sp) -/* DF80EC 802416EC A7AA002A */ sh $t2, 0x2a($sp) -/* DF80F0 802416F0 AFA20020 */ sw $v0, 0x20($sp) -/* DF80F4 802416F4 46200007 */ neg.d $f0, $f0 -/* DF80F8 802416F8 4620008D */ trunc.w.d $f2, $f0 -/* DF80FC 802416FC 44021000 */ mfc1 $v0, $f2 -/* DF8100 80241700 0C04EBDC */ jal func_8013AF70 -/* DF8104 80241704 A7A2002C */ sh $v0, 0x2c($sp) -/* DF8108 80241708 3C04D838 */ lui $a0, 0xd838 -/* DF810C 8024170C 8E020000 */ lw $v0, ($s0) -/* DF8110 80241710 34840002 */ ori $a0, $a0, 2 -/* DF8114 80241714 0040182D */ daddu $v1, $v0, $zero -/* DF8118 80241718 24420008 */ addiu $v0, $v0, 8 -/* DF811C 8024171C AE020000 */ sw $v0, ($s0) -/* DF8120 80241720 24020040 */ addiu $v0, $zero, 0x40 -/* DF8124 80241724 AC640000 */ sw $a0, ($v1) -/* DF8128 80241728 AC620004 */ sw $v0, 4($v1) -/* DF812C 8024172C 8FBF00E0 */ lw $ra, 0xe0($sp) -/* DF8130 80241730 8FB500DC */ lw $s5, 0xdc($sp) -/* DF8134 80241734 8FB400D8 */ lw $s4, 0xd8($sp) -/* DF8138 80241738 8FB300D4 */ lw $s3, 0xd4($sp) -/* DF813C 8024173C 8FB200D0 */ lw $s2, 0xd0($sp) -/* DF8140 80241740 8FB100CC */ lw $s1, 0xcc($sp) -/* DF8144 80241744 8FB000C8 */ lw $s0, 0xc8($sp) -/* DF8148 80241748 D7BE0110 */ ldc1 $f30, 0x110($sp) -/* DF814C 8024174C D7BC0108 */ ldc1 $f28, 0x108($sp) -/* DF8150 80241750 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* DF8154 80241754 D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* DF8158 80241758 D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* DF815C 8024175C D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* DF8160 80241760 03E00008 */ jr $ra -/* DF8164 80241764 27BD0118 */ addiu $sp, $sp, 0x118 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 new file mode 100644 index 0000000000..2f9abbc7fe --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802414CC_DF7ECC.s @@ -0,0 +1,171 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414CC_DF7ECC +/* DF7ECC 802414CC 27BDFEE8 */ addiu $sp, $sp, -0x118 +/* DF7ED0 802414D0 AFB100CC */ sw $s1, 0xcc($sp) +/* DF7ED4 802414D4 0080882D */ daddu $s1, $a0, $zero +/* DF7ED8 802414D8 AFB000C8 */ sw $s0, 0xc8($sp) +/* DF7EDC 802414DC 00A0802D */ daddu $s0, $a1, $zero +/* DF7EE0 802414E0 AFBF00E0 */ sw $ra, 0xe0($sp) +/* DF7EE4 802414E4 AFB500DC */ sw $s5, 0xdc($sp) +/* DF7EE8 802414E8 AFB400D8 */ sw $s4, 0xd8($sp) +/* DF7EEC 802414EC AFB300D4 */ sw $s3, 0xd4($sp) +/* DF7EF0 802414F0 AFB200D0 */ sw $s2, 0xd0($sp) +/* DF7EF4 802414F4 F7BE0110 */ sdc1 $f30, 0x110($sp) +/* DF7EF8 802414F8 F7BC0108 */ sdc1 $f28, 0x108($sp) +/* DF7EFC 802414FC F7BA0100 */ sdc1 $f26, 0x100($sp) +/* DF7F00 80241500 F7B800F8 */ sdc1 $f24, 0xf8($sp) +/* DF7F04 80241504 F7B600F0 */ sdc1 $f22, 0xf0($sp) +/* DF7F08 80241508 F7B400E8 */ sdc1 $f20, 0xe8($sp) +/* DF7F0C 8024150C C6140010 */ lwc1 $f20, 0x10($s0) +/* DF7F10 80241510 4680A520 */ cvt.s.w $f20, $f20 +/* DF7F14 80241514 4480E000 */ mtc1 $zero, $f28 +/* DF7F18 80241518 3C05437F */ lui $a1, 0x437f +/* DF7F1C 8024151C 8E220050 */ lw $v0, 0x50($s1) +/* DF7F20 80241520 4406E000 */ mfc1 $a2, $f28 +/* DF7F24 80241524 C61E0014 */ lwc1 $f30, 0x14($s0) +/* DF7F28 80241528 4680F7A0 */ cvt.s.w $f30, $f30 +/* DF7F2C 8024152C AFA20010 */ sw $v0, 0x10($sp) +/* DF7F30 80241530 8E070018 */ lw $a3, 0x18($s0) +/* DF7F34 80241534 0C00A8ED */ jal update_lerp +/* DF7F38 80241538 2404000B */ addiu $a0, $zero, 0xb +/* DF7F3C 8024153C 4600008D */ trunc.w.s $f2, $f0 +/* DF7F40 80241540 E7A20014 */ swc1 $f2, 0x14($sp) +/* DF7F44 80241544 0000202D */ daddu $a0, $zero, $zero +/* DF7F48 80241548 24050007 */ addiu $a1, $zero, 7 +/* DF7F4C 8024154C 240600FF */ addiu $a2, $zero, 0xff +/* DF7F50 80241550 00C0382D */ daddu $a3, $a2, $zero +/* DF7F54 80241554 00C0A82D */ daddu $s5, $a2, $zero +/* DF7F58 80241558 AFB50010 */ sw $s5, 0x10($sp) +/* DF7F5C 8024155C 0C04EAA7 */ jal func_8013AA9C +/* DF7F60 80241560 AFA00018 */ sw $zero, 0x18($sp) +/* DF7F64 80241564 3C013F80 */ lui $at, 0x3f80 +/* DF7F68 80241568 4481D000 */ mtc1 $at, $f26 +/* DF7F6C 8024156C 8E220050 */ lw $v0, 0x50($s1) +/* DF7F70 80241570 3C063E4C */ lui $a2, 0x3e4c +/* DF7F74 80241574 34C6CCCD */ ori $a2, $a2, 0xcccd +/* DF7F78 80241578 4405D000 */ mfc1 $a1, $f26 +/* DF7F7C 8024157C AFA20010 */ sw $v0, 0x10($sp) +/* DF7F80 80241580 8E070018 */ lw $a3, 0x18($s0) +/* DF7F84 80241584 0C00A8ED */ jal update_lerp +/* DF7F88 80241588 0000202D */ daddu $a0, $zero, $zero +/* DF7F8C 8024158C 27A20038 */ addiu $v0, $sp, 0x38 +/* DF7F90 80241590 AFA20010 */ sw $v0, 0x10($sp) +/* DF7F94 80241594 8E040004 */ lw $a0, 4($s0) +/* DF7F98 80241598 8E050008 */ lw $a1, 8($s0) +/* DF7F9C 8024159C 8E060000 */ lw $a2, ($s0) +/* DF7FA0 802415A0 8E07000C */ lw $a3, 0xc($s0) +/* DF7FA4 802415A4 0C04BA38 */ jal func_8012E8E0 +/* DF7FA8 802415A8 46000586 */ mov.s $f22, $f0 +/* DF7FAC 802415AC 93A20042 */ lbu $v0, 0x42($sp) +/* DF7FB0 802415B0 3C013FE0 */ lui $at, 0x3fe0 +/* DF7FB4 802415B4 4481C800 */ mtc1 $at, $f25 +/* DF7FB8 802415B8 4480C000 */ mtc1 $zero, $f24 +/* DF7FBC 802415BC 44820000 */ mtc1 $v0, $f0 +/* DF7FC0 802415C0 00000000 */ nop +/* DF7FC4 802415C4 46800021 */ cvt.d.w $f0, $f0 +/* DF7FC8 802415C8 46380002 */ mul.d $f0, $f0, $f24 +/* 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 +/* DF7FDC 802415DC 27B10048 */ addiu $s1, $sp, 0x48 +/* DF7FE0 802415E0 4600F787 */ neg.s $f30, $f30 +/* DF7FE4 802415E4 4620A500 */ add.d $f20, $f20, $f0 +/* DF7FE8 802415E8 4406F000 */ mfc1 $a2, $f30 +/* DF7FEC 802415EC 4407E000 */ mfc1 $a3, $f28 +/* DF7FF0 802415F0 4620A520 */ cvt.s.d $f20, $f20 +/* DF7FF4 802415F4 4405A000 */ mfc1 $a1, $f20 +/* DF7FF8 802415F8 0C019E40 */ jal guTranslateF +/* DF7FFC 802415FC 0220202D */ daddu $a0, $s1, $zero +/* DF8000 80241600 27B00088 */ addiu $s0, $sp, 0x88 +/* DF8004 80241604 0200202D */ daddu $a0, $s0, $zero +/* DF8008 80241608 4405B000 */ mfc1 $a1, $f22 +/* DF800C 8024160C 4407D000 */ mfc1 $a3, $f26 +/* DF8010 80241610 0C019DF0 */ jal guScaleF +/* DF8014 80241614 00A0302D */ daddu $a2, $a1, $zero +/* DF8018 80241618 0200202D */ daddu $a0, $s0, $zero +/* DF801C 8024161C 0220282D */ daddu $a1, $s1, $zero +/* DF8020 80241620 0C019D80 */ jal guMtxCatF +/* DF8024 80241624 0220302D */ daddu $a2, $s1, $zero +/* DF8028 80241628 0220202D */ daddu $a0, $s1, $zero +/* DF802C 8024162C 3C128007 */ lui $s2, 0x8007 +/* DF8030 80241630 265241F0 */ addiu $s2, $s2, 0x41f0 +/* DF8034 80241634 3C13800A */ lui $s3, 0x800a +/* DF8038 80241638 2673A674 */ addiu $s3, $s3, -0x598c +/* DF803C 8024163C 96450000 */ lhu $a1, ($s2) +/* DF8040 80241640 8E620000 */ lw $v0, ($s3) +/* DF8044 80241644 00052980 */ sll $a1, $a1, 6 +/* DF8048 80241648 00B42821 */ addu $a1, $a1, $s4 +/* DF804C 8024164C 0C019D40 */ jal guMtxF2L +/* DF8050 80241650 00452821 */ addu $a1, $v0, $a1 +/* DF8054 80241654 3C03DA38 */ lui $v1, 0xda38 +/* DF8058 80241658 34630002 */ ori $v1, $v1, 2 +/* 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, 0x800a +/* DF806C 8024166C 2610A66C */ addiu $s0, $s0, -0x5994 +/* DF8070 80241670 0220382D */ daddu $a3, $s1, $zero +/* DF8074 80241674 8E020000 */ lw $v0, ($s0) +/* DF8078 80241678 96480000 */ lhu $t0, ($s2) +/* DF807C 8024167C 0040482D */ daddu $t1, $v0, $zero +/* DF8080 80241680 24420008 */ addiu $v0, $v0, 8 +/* DF8084 80241684 AE020000 */ sw $v0, ($s0) +/* DF8088 80241688 3102FFFF */ andi $v0, $t0, 0xffff +/* DF808C 8024168C 00021180 */ sll $v0, $v0, 6 +/* DF8090 80241690 00541021 */ addu $v0, $v0, $s4 +/* DF8094 80241694 AD230000 */ sw $v1, ($t1) +/* DF8098 80241698 8E630000 */ lw $v1, ($s3) +/* DF809C 8024169C 25080001 */ addiu $t0, $t0, 1 +/* DF80A0 802416A0 00621821 */ addu $v1, $v1, $v0 +/* DF80A4 802416A4 3C028000 */ lui $v0, 0x8000 +/* DF80A8 802416A8 00621821 */ addu $v1, $v1, $v0 +/* DF80AC 802416AC AD230004 */ sw $v1, 4($t1) +/* DF80B0 802416B0 93A20042 */ lbu $v0, 0x42($sp) +/* DF80B4 802416B4 8FA3003C */ lw $v1, 0x3c($sp) +/* DF80B8 802416B8 93A90040 */ lbu $t1, 0x40($sp) +/* DF80BC 802416BC 93AA0041 */ lbu $t2, 0x41($sp) +/* DF80C0 802416C0 44820000 */ mtc1 $v0, $f0 +/* 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 +/* DF80D8 802416D8 A6480000 */ sh $t0, ($s2) +/* DF80DC 802416DC A7A0002E */ sh $zero, 0x2e($sp) +/* DF80E0 802416E0 A3B50030 */ sb $s5, 0x30($sp) +/* DF80E4 802416E4 AFA30024 */ sw $v1, 0x24($sp) +/* DF80E8 802416E8 A7A90028 */ sh $t1, 0x28($sp) +/* DF80EC 802416EC A7AA002A */ sh $t2, 0x2a($sp) +/* DF80F0 802416F0 AFA20020 */ sw $v0, 0x20($sp) +/* DF80F4 802416F4 46200007 */ neg.d $f0, $f0 +/* DF80F8 802416F8 4620008D */ trunc.w.d $f2, $f0 +/* DF80FC 802416FC 44021000 */ mfc1 $v0, $f2 +/* DF8100 80241700 0C04EBDC */ jal func_8013AF70 +/* DF8104 80241704 A7A2002C */ sh $v0, 0x2c($sp) +/* DF8108 80241708 3C04D838 */ lui $a0, 0xd838 +/* DF810C 8024170C 8E020000 */ lw $v0, ($s0) +/* DF8110 80241710 34840002 */ ori $a0, $a0, 2 +/* DF8114 80241714 0040182D */ daddu $v1, $v0, $zero +/* DF8118 80241718 24420008 */ addiu $v0, $v0, 8 +/* DF811C 8024171C AE020000 */ sw $v0, ($s0) +/* DF8120 80241720 24020040 */ addiu $v0, $zero, 0x40 +/* DF8124 80241724 AC640000 */ sw $a0, ($v1) +/* DF8128 80241728 AC620004 */ sw $v0, 4($v1) +/* DF812C 8024172C 8FBF00E0 */ lw $ra, 0xe0($sp) +/* DF8130 80241730 8FB500DC */ lw $s5, 0xdc($sp) +/* DF8134 80241734 8FB400D8 */ lw $s4, 0xd8($sp) +/* DF8138 80241738 8FB300D4 */ lw $s3, 0xd4($sp) +/* DF813C 8024173C 8FB200D0 */ lw $s2, 0xd0($sp) +/* DF8140 80241740 8FB100CC */ lw $s1, 0xcc($sp) +/* DF8144 80241744 8FB000C8 */ lw $s0, 0xc8($sp) +/* DF8148 80241748 D7BE0110 */ ldc1 $f30, 0x110($sp) +/* DF814C 8024174C D7BC0108 */ ldc1 $f28, 0x108($sp) +/* DF8150 80241750 D7BA0100 */ ldc1 $f26, 0x100($sp) +/* DF8154 80241754 D7B800F8 */ ldc1 $f24, 0xf8($sp) +/* DF8158 80241758 D7B600F0 */ ldc1 $f22, 0xf0($sp) +/* DF815C 8024175C D7B400E8 */ ldc1 $f20, 0xe8($sp) +/* DF8160 80241760 03E00008 */ jr $ra +/* DF8164 80241764 27BD0118 */ addiu $sp, $sp, 0x118 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8.s deleted file mode 100644 index dd10096294..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419F8 -/* DF83F8 802419F8 27BDFF90 */ addiu $sp, $sp, -0x70 -/* DF83FC 802419FC AFB00048 */ sw $s0, 0x48($sp) -/* DF8400 80241A00 00A0802D */ daddu $s0, $a1, $zero -/* DF8404 80241A04 AFBF0050 */ sw $ra, 0x50($sp) -/* DF8408 80241A08 AFB1004C */ sw $s1, 0x4c($sp) -/* DF840C 80241A0C F7B80068 */ sdc1 $f24, 0x68($sp) -/* DF8410 80241A10 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DF8414 80241A14 F7B40058 */ sdc1 $f20, 0x58($sp) -/* DF8418 80241A18 8C820050 */ lw $v0, 0x50($a0) -/* DF841C 80241A1C 2404000B */ addiu $a0, $zero, 0xb -/* DF8420 80241A20 0000302D */ daddu $a2, $zero, $zero -/* DF8424 80241A24 C6140010 */ lwc1 $f20, 0x10($s0) -/* DF8428 80241A28 4680A520 */ cvt.s.w $f20, $f20 -/* DF842C 80241A2C 3C05437F */ lui $a1, 0x437f -/* DF8430 80241A30 C6160014 */ lwc1 $f22, 0x14($s0) -/* DF8434 80241A34 4680B5A0 */ cvt.s.w $f22, $f22 -/* DF8438 80241A38 AFA20010 */ sw $v0, 0x10($sp) -/* DF843C 80241A3C 8E070018 */ lw $a3, 0x18($s0) -/* DF8440 80241A40 0C00A8ED */ jal update_lerp -/* DF8444 80241A44 27B10038 */ addiu $s1, $sp, 0x38 -/* DF8448 80241A48 AFB10010 */ sw $s1, 0x10($sp) -/* DF844C 80241A4C 8E040004 */ lw $a0, 4($s0) -/* DF8450 80241A50 8E050008 */ lw $a1, 8($s0) -/* DF8454 80241A54 8E060000 */ lw $a2, ($s0) -/* DF8458 80241A58 8E07000C */ lw $a3, 0xc($s0) -/* DF845C 80241A5C 0C04BA38 */ jal func_8012E8E0 -/* DF8460 80241A60 46000606 */ mov.s $f24, $f0 -/* DF8464 80241A64 4600A08D */ trunc.w.s $f2, $f20 -/* DF8468 80241A68 44021000 */ mfc1 $v0, $f2 -/* DF846C 80241A6C 93A50040 */ lbu $a1, 0x40($sp) -/* DF8470 80241A70 93A60041 */ lbu $a2, 0x41($sp) -/* DF8474 80241A74 00021400 */ sll $v0, $v0, 0x10 -/* DF8478 80241A78 AFA00010 */ sw $zero, 0x10($sp) -/* DF847C 80241A7C 8FA3003C */ lw $v1, 0x3c($sp) -/* DF8480 80241A80 00021403 */ sra $v0, $v0, 0x10 -/* DF8484 80241A84 AFA20018 */ sw $v0, 0x18($sp) -/* DF8488 80241A88 4600B08D */ trunc.w.s $f2, $f22 -/* DF848C 80241A8C 44021000 */ mfc1 $v0, $f2 -/* DF8490 80241A90 00000000 */ nop -/* DF8494 80241A94 00021400 */ sll $v0, $v0, 0x10 -/* DF8498 80241A98 3C014F00 */ lui $at, 0x4f00 -/* DF849C 80241A9C 44810000 */ mtc1 $at, $f0 -/* DF84A0 80241AA0 00021403 */ sra $v0, $v0, 0x10 -/* DF84A4 80241AA4 AFA2001C */ sw $v0, 0x1c($sp) -/* DF84A8 80241AA8 2402000A */ addiu $v0, $zero, 0xa -/* DF84AC 80241AAC AFA20020 */ sw $v0, 0x20($sp) -/* DF84B0 80241AB0 24020014 */ addiu $v0, $zero, 0x14 -/* DF84B4 80241AB4 AFA20024 */ sw $v0, 0x24($sp) -/* DF84B8 80241AB8 2402012C */ addiu $v0, $zero, 0x12c -/* DF84BC 80241ABC AFA20028 */ sw $v0, 0x28($sp) -/* DF84C0 80241AC0 240200C8 */ addiu $v0, $zero, 0xc8 -/* DF84C4 80241AC4 AFA2002C */ sw $v0, 0x2c($sp) -/* DF84C8 80241AC8 4618003E */ c.le.s $f0, $f24 -/* DF84CC 80241ACC 00000000 */ nop -/* DF84D0 80241AD0 45010005 */ bc1t .L80241AE8 -/* DF84D4 80241AD4 AFA30014 */ sw $v1, 0x14($sp) -/* DF84D8 80241AD8 4600C08D */ trunc.w.s $f2, $f24 -/* DF84DC 80241ADC 44031000 */ mfc1 $v1, $f2 -/* DF84E0 80241AE0 080906C1 */ j .L80241B04 -/* DF84E4 80241AE4 306200FF */ andi $v0, $v1, 0xff -.L80241AE8: -/* DF84E8 80241AE8 4600C001 */ sub.s $f0, $f24, $f0 -/* DF84EC 80241AEC 3C028000 */ lui $v0, 0x8000 -/* DF84F0 80241AF0 4600008D */ trunc.w.s $f2, $f0 -/* DF84F4 80241AF4 44031000 */ mfc1 $v1, $f2 -/* DF84F8 80241AF8 00000000 */ nop -/* DF84FC 80241AFC 00621825 */ or $v1, $v1, $v0 -/* DF8500 80241B00 306200FF */ andi $v0, $v1, 0xff -.L80241B04: -/* DF8504 80241B04 AFA20030 */ sw $v0, 0x30($sp) -/* DF8508 80241B08 8E240000 */ lw $a0, ($s1) -/* DF850C 80241B0C 0C04BA68 */ jal func_8012E9A0 -/* DF8510 80241B10 24070002 */ addiu $a3, $zero, 2 -/* DF8514 80241B14 8FBF0050 */ lw $ra, 0x50($sp) -/* DF8518 80241B18 8FB1004C */ lw $s1, 0x4c($sp) -/* DF851C 80241B1C 8FB00048 */ lw $s0, 0x48($sp) -/* DF8520 80241B20 D7B80068 */ ldc1 $f24, 0x68($sp) -/* DF8524 80241B24 D7B60060 */ ldc1 $f22, 0x60($sp) -/* DF8528 80241B28 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DF852C 80241B2C 03E00008 */ jr $ra -/* DF8530 80241B30 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8_DF83F8.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8_DF83F8.s new file mode 100644 index 0000000000..687c723182 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802419F8_DF83F8.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419F8_DF83F8 +/* DF83F8 802419F8 27BDFF90 */ addiu $sp, $sp, -0x70 +/* DF83FC 802419FC AFB00048 */ sw $s0, 0x48($sp) +/* DF8400 80241A00 00A0802D */ daddu $s0, $a1, $zero +/* DF8404 80241A04 AFBF0050 */ sw $ra, 0x50($sp) +/* DF8408 80241A08 AFB1004C */ sw $s1, 0x4c($sp) +/* DF840C 80241A0C F7B80068 */ sdc1 $f24, 0x68($sp) +/* DF8410 80241A10 F7B60060 */ sdc1 $f22, 0x60($sp) +/* DF8414 80241A14 F7B40058 */ sdc1 $f20, 0x58($sp) +/* DF8418 80241A18 8C820050 */ lw $v0, 0x50($a0) +/* DF841C 80241A1C 2404000B */ addiu $a0, $zero, 0xb +/* DF8420 80241A20 0000302D */ daddu $a2, $zero, $zero +/* DF8424 80241A24 C6140010 */ lwc1 $f20, 0x10($s0) +/* DF8428 80241A28 4680A520 */ cvt.s.w $f20, $f20 +/* DF842C 80241A2C 3C05437F */ lui $a1, 0x437f +/* DF8430 80241A30 C6160014 */ lwc1 $f22, 0x14($s0) +/* DF8434 80241A34 4680B5A0 */ cvt.s.w $f22, $f22 +/* DF8438 80241A38 AFA20010 */ sw $v0, 0x10($sp) +/* DF843C 80241A3C 8E070018 */ lw $a3, 0x18($s0) +/* DF8440 80241A40 0C00A8ED */ jal update_lerp +/* DF8444 80241A44 27B10038 */ addiu $s1, $sp, 0x38 +/* DF8448 80241A48 AFB10010 */ sw $s1, 0x10($sp) +/* DF844C 80241A4C 8E040004 */ lw $a0, 4($s0) +/* DF8450 80241A50 8E050008 */ lw $a1, 8($s0) +/* DF8454 80241A54 8E060000 */ lw $a2, ($s0) +/* DF8458 80241A58 8E07000C */ lw $a3, 0xc($s0) +/* DF845C 80241A5C 0C04BA38 */ jal func_8012E8E0 +/* DF8460 80241A60 46000606 */ mov.s $f24, $f0 +/* DF8464 80241A64 4600A08D */ trunc.w.s $f2, $f20 +/* DF8468 80241A68 44021000 */ mfc1 $v0, $f2 +/* DF846C 80241A6C 93A50040 */ lbu $a1, 0x40($sp) +/* DF8470 80241A70 93A60041 */ lbu $a2, 0x41($sp) +/* DF8474 80241A74 00021400 */ sll $v0, $v0, 0x10 +/* DF8478 80241A78 AFA00010 */ sw $zero, 0x10($sp) +/* DF847C 80241A7C 8FA3003C */ lw $v1, 0x3c($sp) +/* DF8480 80241A80 00021403 */ sra $v0, $v0, 0x10 +/* DF8484 80241A84 AFA20018 */ sw $v0, 0x18($sp) +/* DF8488 80241A88 4600B08D */ trunc.w.s $f2, $f22 +/* DF848C 80241A8C 44021000 */ mfc1 $v0, $f2 +/* DF8490 80241A90 00000000 */ nop +/* DF8494 80241A94 00021400 */ sll $v0, $v0, 0x10 +/* DF8498 80241A98 3C014F00 */ lui $at, 0x4f00 +/* DF849C 80241A9C 44810000 */ mtc1 $at, $f0 +/* DF84A0 80241AA0 00021403 */ sra $v0, $v0, 0x10 +/* DF84A4 80241AA4 AFA2001C */ sw $v0, 0x1c($sp) +/* DF84A8 80241AA8 2402000A */ addiu $v0, $zero, 0xa +/* DF84AC 80241AAC AFA20020 */ sw $v0, 0x20($sp) +/* DF84B0 80241AB0 24020014 */ addiu $v0, $zero, 0x14 +/* DF84B4 80241AB4 AFA20024 */ sw $v0, 0x24($sp) +/* DF84B8 80241AB8 2402012C */ addiu $v0, $zero, 0x12c +/* DF84BC 80241ABC AFA20028 */ sw $v0, 0x28($sp) +/* DF84C0 80241AC0 240200C8 */ addiu $v0, $zero, 0xc8 +/* DF84C4 80241AC4 AFA2002C */ sw $v0, 0x2c($sp) +/* DF84C8 80241AC8 4618003E */ c.le.s $f0, $f24 +/* DF84CC 80241ACC 00000000 */ nop +/* DF84D0 80241AD0 45010005 */ bc1t .L80241AE8 +/* DF84D4 80241AD4 AFA30014 */ sw $v1, 0x14($sp) +/* DF84D8 80241AD8 4600C08D */ trunc.w.s $f2, $f24 +/* DF84DC 80241ADC 44031000 */ mfc1 $v1, $f2 +/* DF84E0 80241AE0 080906C1 */ j .L80241B04 +/* DF84E4 80241AE4 306200FF */ andi $v0, $v1, 0xff +.L80241AE8: +/* DF84E8 80241AE8 4600C001 */ sub.s $f0, $f24, $f0 +/* DF84EC 80241AEC 3C028000 */ lui $v0, 0x8000 +/* DF84F0 80241AF0 4600008D */ trunc.w.s $f2, $f0 +/* DF84F4 80241AF4 44031000 */ mfc1 $v1, $f2 +/* DF84F8 80241AF8 00000000 */ nop +/* DF84FC 80241AFC 00621825 */ or $v1, $v1, $v0 +/* DF8500 80241B00 306200FF */ andi $v0, $v1, 0xff +.L80241B04: +/* DF8504 80241B04 AFA20030 */ sw $v0, 0x30($sp) +/* DF8508 80241B08 8E240000 */ lw $a0, ($s1) +/* DF850C 80241B0C 0C04BA68 */ jal func_8012E9A0 +/* DF8510 80241B10 24070002 */ addiu $a3, $zero, 2 +/* DF8514 80241B14 8FBF0050 */ lw $ra, 0x50($sp) +/* DF8518 80241B18 8FB1004C */ lw $s1, 0x4c($sp) +/* DF851C 80241B1C 8FB00048 */ lw $s0, 0x48($sp) +/* DF8520 80241B20 D7B80068 */ ldc1 $f24, 0x68($sp) +/* DF8524 80241B24 D7B60060 */ ldc1 $f22, 0x60($sp) +/* DF8528 80241B28 D7B40058 */ ldc1 $f20, 0x58($sp) +/* DF852C 80241B2C 03E00008 */ jr $ra +/* DF8530 80241B30 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34.s deleted file mode 100644 index 998341325e..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34.s +++ /dev/null @@ -1,470 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B34 -/* DF8534 80241B34 27BDFF80 */ addiu $sp, $sp, -0x80 -/* DF8538 80241B38 AFB30064 */ sw $s3, 0x64($sp) -/* DF853C 80241B3C 0080982D */ daddu $s3, $a0, $zero -/* DF8540 80241B40 AFBE0078 */ sw $fp, 0x78($sp) -/* DF8544 80241B44 0000F02D */ daddu $fp, $zero, $zero -/* DF8548 80241B48 AFBF007C */ sw $ra, 0x7c($sp) -/* DF854C 80241B4C AFB70074 */ sw $s7, 0x74($sp) -/* DF8550 80241B50 AFB60070 */ sw $s6, 0x70($sp) -/* DF8554 80241B54 AFB5006C */ sw $s5, 0x6c($sp) -/* DF8558 80241B58 AFB40068 */ sw $s4, 0x68($sp) -/* DF855C 80241B5C AFB20060 */ sw $s2, 0x60($sp) -/* DF8560 80241B60 AFB1005C */ sw $s1, 0x5c($sp) -/* DF8564 80241B64 AFB00058 */ sw $s0, 0x58($sp) -/* DF8568 80241B68 96630070 */ lhu $v1, 0x70($s3) -/* DF856C 80241B6C 30620002 */ andi $v0, $v1, 2 -/* DF8570 80241B70 10400005 */ beqz $v0, .L80241B88 -/* DF8574 80241B74 27B00020 */ addiu $s0, $sp, 0x20 -/* DF8578 80241B78 3062FFFD */ andi $v0, $v1, 0xfffd -/* DF857C 80241B7C A6620070 */ sh $v0, 0x70($s3) -/* DF8580 80241B80 AE600008 */ sw $zero, 8($s3) -/* DF8584 80241B84 AE60000C */ sw $zero, 0xc($s3) -.L80241B88: -/* DF8588 80241B88 27A50040 */ addiu $a1, $sp, 0x40 -/* DF858C 80241B8C 27A60044 */ addiu $a2, $sp, 0x44 -/* DF8590 80241B90 27A70048 */ addiu $a3, $sp, 0x48 -/* DF8594 80241B94 0000882D */ daddu $s1, $zero, $zero -/* DF8598 80241B98 AFA00010 */ sw $zero, 0x10($sp) -/* DF859C 80241B9C AFA00014 */ sw $zero, 0x14($sp) -/* DF85A0 80241BA0 AFA00018 */ sw $zero, 0x18($sp) -/* DF85A4 80241BA4 AFA0001C */ sw $zero, 0x1c($sp) -/* DF85A8 80241BA8 8E640000 */ lw $a0, ($s3) -/* DF85AC 80241BAC 0C0497DA */ jal get_string_properties -/* DF85B0 80241BB0 24170008 */ addiu $s7, $zero, 8 -/* DF85B4 80241BB4 24020001 */ addiu $v0, $zero, 1 -/* DF85B8 80241BB8 AFA00024 */ sw $zero, 0x24($sp) -/* DF85BC 80241BBC AFA00028 */ sw $zero, 0x28($sp) -/* DF85C0 80241BC0 AFA20044 */ sw $v0, 0x44($sp) -.L80241BC4: -/* DF85C4 80241BC4 8E620000 */ lw $v0, ($s3) -/* DF85C8 80241BC8 00511821 */ addu $v1, $v0, $s1 -/* DF85CC 80241BCC 26310001 */ addiu $s1, $s1, 1 -/* DF85D0 80241BD0 00511021 */ addu $v0, $v0, $s1 -/* DF85D4 80241BD4 90740000 */ lbu $s4, ($v1) -/* DF85D8 80241BD8 90550000 */ lbu $s5, ($v0) -/* DF85DC 80241BDC 2684FF10 */ addiu $a0, $s4, -0xf0 -/* DF85E0 80241BE0 2C830010 */ sltiu $v1, $a0, 0x10 -/* DF85E4 80241BE4 10600017 */ beqz $v1, .L80241C44 -/* DF85E8 80241BE8 0000B02D */ daddu $s6, $zero, $zero -/* DF85EC 80241BEC 00041080 */ sll $v0, $a0, 2 -/* DF85F0 80241BF0 3C098025 */ lui $t1, 0x8025 -/* DF85F4 80241BF4 2529E8C0 */ addiu $t1, $t1, -0x1740 -/* DF85F8 80241BF8 00491021 */ addu $v0, $v0, $t1 -/* DF85FC 80241BFC 8C420000 */ lw $v0, ($v0) -/* DF8600 80241C00 00400008 */ jr $v0 -/* DF8604 80241C04 00000000 */ nop -/* DF8608 80241C08 2682FF0D */ addiu $v0, $s4, -0xf3 -/* DF860C 80241C0C 08090743 */ j .L80241D0C -/* DF8610 80241C10 AE020008 */ sw $v0, 8($s0) -/* DF8614 80241C14 08090743 */ j .L80241D0C -/* DF8618 80241C18 24160001 */ addiu $s6, $zero, 1 -/* DF861C 80241C1C 8E630000 */ lw $v1, ($s3) -/* DF8620 80241C20 00711021 */ addu $v0, $v1, $s1 -/* DF8624 80241C24 90420000 */ lbu $v0, ($v0) -/* DF8628 80241C28 14400038 */ bnez $v0, .L80241D0C -/* DF862C 80241C2C 26310001 */ addiu $s1, $s1, 1 -/* DF8630 80241C30 00711021 */ addu $v0, $v1, $s1 -/* DF8634 80241C34 90420000 */ lbu $v0, ($v0) -/* DF8638 80241C38 26310001 */ addiu $s1, $s1, 1 -/* DF863C 80241C3C 08090743 */ j .L80241D0C -/* DF8640 80241C40 AE020004 */ sw $v0, 4($s0) -.L80241C44: -/* DF8644 80241C44 24020001 */ addiu $v0, $zero, 1 -/* DF8648 80241C48 329200FF */ andi $s2, $s4, 0xff -/* DF864C 80241C4C AFA00010 */ sw $zero, 0x10($sp) -/* DF8650 80241C50 AFA20014 */ sw $v0, 0x14($sp) -/* DF8654 80241C54 8E050004 */ lw $a1, 4($s0) -/* DF8658 80241C58 8E060008 */ lw $a2, 8($s0) -/* DF865C 80241C5C 3C073F80 */ lui $a3, 0x3f80 -/* DF8660 80241C60 0C049721 */ jal func_80125C84 -/* DF8664 80241C64 0240202D */ daddu $a0, $s2, $zero -/* DF8668 80241C68 8FA30044 */ lw $v1, 0x44($sp) -/* DF866C 80241C6C 8E040004 */ lw $a0, 4($s0) -/* DF8670 80241C70 2463FFFF */ addiu $v1, $v1, -1 -/* DF8674 80241C74 00621821 */ addu $v1, $v1, $v0 -/* DF8678 80241C78 2482FFFD */ addiu $v0, $a0, -3 -/* DF867C 80241C7C 2C420002 */ sltiu $v0, $v0, 2 -/* DF8680 80241C80 10400022 */ beqz $v0, .L80241D0C -/* DF8684 80241C84 AFA30044 */ sw $v1, 0x44($sp) -/* DF8688 80241C88 3C058024 */ lui $a1, 0x8024 -/* DF868C 80241C8C 24A52CD8 */ addiu $a1, $a1, 0x2cd8 -/* DF8690 80241C90 24090004 */ addiu $t1, $zero, 4 -/* DF8694 80241C94 14890003 */ bne $a0, $t1, .L80241CA4 -/* DF8698 80241C98 00000000 */ nop -/* DF869C 80241C9C 3C058024 */ lui $a1, 0x8024 -/* DF86A0 80241CA0 24A52C70 */ addiu $a1, $a1, 0x2c70 -.L80241CA4: -/* DF86A4 80241CA4 14890007 */ bne $a0, $t1, .L80241CC4 -/* DF86A8 80241CA8 0000302D */ daddu $a2, $zero, $zero -/* DF86AC 80241CAC 12570004 */ beq $s2, $s7, .L80241CC0 -/* DF86B0 80241CB0 24620001 */ addiu $v0, $v1, 1 -/* DF86B4 80241CB4 16B70004 */ bne $s5, $s7, .L80241CC8 -/* DF86B8 80241CB8 328800FF */ andi $t0, $s4, 0xff -/* DF86BC 80241CBC 24620001 */ addiu $v0, $v1, 1 -.L80241CC0: -/* DF86C0 80241CC0 AFA20044 */ sw $v0, 0x44($sp) -.L80241CC4: -/* DF86C4 80241CC4 328800FF */ andi $t0, $s4, 0xff -.L80241CC8: -/* DF86C8 80241CC8 32A7FFFF */ andi $a3, $s5, 0xffff -/* DF86CC 80241CCC 00061080 */ sll $v0, $a2, 2 -/* DF86D0 80241CD0 00452021 */ addu $a0, $v0, $a1 -.L80241CD4: -/* DF86D4 80241CD4 90820000 */ lbu $v0, ($a0) -/* DF86D8 80241CD8 55020009 */ bnel $t0, $v0, .L80241D00 -/* DF86DC 80241CDC 24840004 */ addiu $a0, $a0, 4 -/* DF86E0 80241CE0 90820001 */ lbu $v0, 1($a0) -/* DF86E4 80241CE4 54E20006 */ bnel $a3, $v0, .L80241D00 -/* DF86E8 80241CE8 24840004 */ addiu $a0, $a0, 4 -/* DF86EC 80241CEC 84830002 */ lh $v1, 2($a0) -/* DF86F0 80241CF0 8FA20044 */ lw $v0, 0x44($sp) -/* DF86F4 80241CF4 00431021 */ addu $v0, $v0, $v1 -/* DF86F8 80241CF8 AFA20044 */ sw $v0, 0x44($sp) -/* DF86FC 80241CFC 24840004 */ addiu $a0, $a0, 4 -.L80241D00: -/* DF8700 80241D00 84820002 */ lh $v0, 2($a0) -/* DF8704 80241D04 1440FFF3 */ bnez $v0, .L80241CD4 -/* DF8708 80241D08 00000000 */ nop -.L80241D0C: -/* DF870C 80241D0C 32C2FFFF */ andi $v0, $s6, 0xffff -/* DF8710 80241D10 1040FFAC */ beqz $v0, .L80241BC4 -/* DF8714 80241D14 00000000 */ nop -/* DF8718 80241D18 96620070 */ lhu $v0, 0x70($s3) -/* DF871C 80241D1C 8FA30044 */ lw $v1, 0x44($sp) -/* DF8720 80241D20 30420001 */ andi $v0, $v0, 1 -/* DF8724 80241D24 10400015 */ beqz $v0, .L80241D7C -/* DF8728 80241D28 AE630014 */ sw $v1, 0x14($s3) -/* DF872C 80241D2C 44831000 */ mtc1 $v1, $f2 -/* DF8730 80241D30 00000000 */ nop -/* DF8734 80241D34 468010A0 */ cvt.s.w $f2, $f2 -/* DF8738 80241D38 3C013FE0 */ lui $at, 0x3fe0 -/* DF873C 80241D3C 44810800 */ mtc1 $at, $f1 -/* DF8740 80241D40 44800000 */ mtc1 $zero, $f0 -/* DF8744 80241D44 460010A1 */ cvt.d.s $f2, $f2 -/* DF8748 80241D48 46201082 */ mul.d $f2, $f2, $f0 -/* DF874C 80241D4C 00000000 */ nop -/* DF8750 80241D50 44800000 */ mtc1 $zero, $f0 -/* DF8754 80241D54 44800800 */ mtc1 $zero, $f1 -/* DF8758 80241D58 00000000 */ nop -/* DF875C 80241D5C 46201080 */ add.d $f2, $f2, $f0 -/* DF8760 80241D60 C6600068 */ lwc1 $f0, 0x68($s3) -/* DF8764 80241D64 46800021 */ cvt.d.w $f0, $f0 -/* DF8768 80241D68 46220001 */ sub.d $f0, $f0, $f2 -/* DF876C 80241D6C 4620010D */ trunc.w.d $f4, $f0 -/* DF8770 80241D70 44152000 */ mfc1 $s5, $f4 -/* DF8774 80241D74 08090761 */ j .L80241D84 -/* DF8778 80241D78 0000B82D */ daddu $s7, $zero, $zero -.L80241D7C: -/* DF877C 80241D7C 8E750068 */ lw $s5, 0x68($s3) -/* DF8780 80241D80 0000B82D */ daddu $s7, $zero, $zero -.L80241D84: -/* DF8784 80241D84 AE000004 */ sw $zero, 4($s0) -/* DF8788 80241D88 AE000008 */ sw $zero, 8($s0) -/* DF878C 80241D8C 8E620010 */ lw $v0, 0x10($s3) -/* DF8790 80241D90 02E0882D */ daddu $s1, $s7, $zero -/* DF8794 80241D94 AE02000C */ sw $v0, 0xc($s0) -.L80241D98: -/* DF8798 80241D98 8E620000 */ lw $v0, ($s3) -/* DF879C 80241D9C A7A00050 */ sh $zero, 0x50($sp) -/* DF87A0 80241DA0 00511821 */ addu $v1, $v0, $s1 -/* DF87A4 80241DA4 26310001 */ addiu $s1, $s1, 1 -/* DF87A8 80241DA8 00511021 */ addu $v0, $v0, $s1 -/* DF87AC 80241DAC 90740000 */ lbu $s4, ($v1) -/* DF87B0 80241DB0 90560000 */ lbu $s6, ($v0) -/* DF87B4 80241DB4 2684FF10 */ addiu $a0, $s4, -0xf0 -/* DF87B8 80241DB8 2C830010 */ sltiu $v1, $a0, 0x10 -/* DF87BC 80241DBC 10600016 */ beqz $v1, .L80241E18 -/* DF87C0 80241DC0 00041080 */ sll $v0, $a0, 2 -/* DF87C4 80241DC4 3C018025 */ lui $at, 0x8025 -/* DF87C8 80241DC8 00220821 */ addu $at, $at, $v0 -/* DF87CC 80241DCC 8C22E900 */ lw $v0, -0x1700($at) -/* DF87D0 80241DD0 00400008 */ jr $v0 -/* DF87D4 80241DD4 00000000 */ nop -/* DF87D8 80241DD8 2682FF0D */ addiu $v0, $s4, -0xf3 -/* DF87DC 80241DDC 0809083B */ j .L802420EC -/* DF87E0 80241DE0 AE020008 */ sw $v0, 8($s0) -/* DF87E4 80241DE4 24090001 */ addiu $t1, $zero, 1 -/* DF87E8 80241DE8 0809083B */ j .L802420EC -/* DF87EC 80241DEC A7A90050 */ sh $t1, 0x50($sp) -/* DF87F0 80241DF0 8E630000 */ lw $v1, ($s3) -/* DF87F4 80241DF4 00711021 */ addu $v0, $v1, $s1 -/* DF87F8 80241DF8 90420000 */ lbu $v0, ($v0) -/* DF87FC 80241DFC 144000BB */ bnez $v0, .L802420EC -/* DF8800 80241E00 26310001 */ addiu $s1, $s1, 1 -/* DF8804 80241E04 00711021 */ addu $v0, $v1, $s1 -/* DF8808 80241E08 90420000 */ lbu $v0, ($v0) -/* DF880C 80241E0C 26310001 */ addiu $s1, $s1, 1 -/* DF8810 80241E10 0809083B */ j .L802420EC -/* DF8814 80241E14 AE020004 */ sw $v0, 4($s0) -.L80241E18: -/* DF8818 80241E18 328300FF */ andi $v1, $s4, 0xff -/* DF881C 80241E1C 2C6200F0 */ sltiu $v0, $v1, 0xf0 -/* DF8820 80241E20 10400083 */ beqz $v0, .L80242030 -/* DF8824 80241E24 24090001 */ addiu $t1, $zero, 1 -/* DF8828 80241E28 AE030000 */ sw $v1, ($s0) -/* DF882C 80241E2C AE150010 */ sw $s5, 0x10($s0) -/* DF8830 80241E30 8E62006C */ lw $v0, 0x6c($s3) -/* DF8834 80241E34 AE020014 */ sw $v0, 0x14($s0) -/* DF8838 80241E38 8E63000C */ lw $v1, 0xc($s3) -/* DF883C 80241E3C 1069003F */ beq $v1, $t1, .L80241F3C -/* DF8840 80241E40 28620002 */ slti $v0, $v1, 2 -/* DF8844 80241E44 50400005 */ beql $v0, $zero, .L80241E5C -/* DF8848 80241E48 24090002 */ addiu $t1, $zero, 2 -/* DF884C 80241E4C 10600007 */ beqz $v1, .L80241E6C -/* DF8850 80241E50 00000000 */ nop -/* DF8854 80241E54 0809080D */ j .L80242034 -/* DF8858 80241E58 26F70001 */ addiu $s7, $s7, 1 -.L80241E5C: -/* DF885C 80241E5C 10690043 */ beq $v1, $t1, .L80241F6C -/* DF8860 80241E60 00000000 */ nop -/* DF8864 80241E64 0809080C */ j .L80242030 -/* DF8868 80241E68 26F70001 */ addiu $s7, $s7, 1 -.L80241E6C: -/* DF886C 80241E6C 8E620020 */ lw $v0, 0x20($s3) -/* DF8870 80241E70 00570018 */ mult $v0, $s7 -/* DF8874 80241E74 8E620008 */ lw $v0, 8($s3) -/* DF8878 80241E78 00004812 */ mflo $t1 -/* DF887C 80241E7C 00491023 */ subu $v0, $v0, $t1 -/* DF8880 80241E80 0440006A */ bltz $v0, .L8024202C -/* DF8884 80241E84 AE020018 */ sw $v0, 0x18($s0) -/* DF8888 80241E88 8E63001C */ lw $v1, 0x1c($s3) -/* DF888C 80241E8C 0062102A */ slt $v0, $v1, $v0 -/* DF8890 80241E90 54400001 */ bnel $v0, $zero, .L80241E98 -/* DF8894 80241E94 AE030018 */ sw $v1, 0x18($s0) -.L80241E98: -/* DF8898 80241E98 240900FD */ addiu $t1, $zero, 0xfd -/* DF889C 80241E9C 16C90005 */ bne $s6, $t1, .L80241EB4 -/* DF88A0 80241EA0 00000000 */ nop -/* DF88A4 80241EA4 8E030018 */ lw $v1, 0x18($s0) -/* DF88A8 80241EA8 8E62001C */ lw $v0, 0x1c($s3) -/* DF88AC 80241EAC 50620001 */ beql $v1, $v0, .L80241EB4 -/* DF88B0 80241EB0 241E0001 */ addiu $fp, $zero, 1 -.L80241EB4: -/* DF88B4 80241EB4 8E630018 */ lw $v1, 0x18($s3) -/* DF88B8 80241EB8 2C620006 */ sltiu $v0, $v1, 6 -/* DF88BC 80241EBC 1040005B */ beqz $v0, .L8024202C -/* DF88C0 80241EC0 00031080 */ sll $v0, $v1, 2 -/* DF88C4 80241EC4 3C018025 */ lui $at, 0x8025 -/* DF88C8 80241EC8 00220821 */ addu $at, $at, $v0 -/* DF88CC 80241ECC 8C22E940 */ lw $v0, -0x16c0($at) -/* DF88D0 80241ED0 00400008 */ jr $v0 -/* DF88D4 80241ED4 00000000 */ nop -/* DF88D8 80241ED8 0260202D */ daddu $a0, $s3, $zero -/* DF88DC 80241EDC 0C09009C */ jal func_80240270 -/* DF88E0 80241EE0 0200282D */ daddu $a1, $s0, $zero -/* DF88E4 80241EE4 0809080C */ j .L80242030 -/* DF88E8 80241EE8 26F70001 */ addiu $s7, $s7, 1 -/* DF88EC 80241EEC 0260202D */ daddu $a0, $s3, $zero -/* DF88F0 80241EF0 0C090150 */ jal func_80240540 -/* DF88F4 80241EF4 0200282D */ daddu $a1, $s0, $zero -/* DF88F8 80241EF8 0809080C */ j .L80242030 -/* DF88FC 80241EFC 26F70001 */ addiu $s7, $s7, 1 -/* DF8900 80241F00 0260202D */ daddu $a0, $s3, $zero -/* DF8904 80241F04 0C090207 */ jal func_8024081C_DF721C -/* DF8908 80241F08 0200282D */ daddu $a1, $s0, $zero -/* DF890C 80241F0C 0809080C */ j .L80242030 -/* DF8910 80241F10 26F70001 */ addiu $s7, $s7, 1 -/* DF8914 80241F14 0260202D */ daddu $a0, $s3, $zero -/* DF8918 80241F18 0C0902BA */ jal func_80240AE8 -/* DF891C 80241F1C 0200282D */ daddu $a1, $s0, $zero -/* DF8920 80241F20 0809080C */ j .L80242030 -/* DF8924 80241F24 26F70001 */ addiu $s7, $s7, 1 -/* DF8928 80241F28 0260202D */ daddu $a0, $s3, $zero -/* DF892C 80241F2C 0C0903AC */ jal func_80240EB0 -/* DF8930 80241F30 0200282D */ daddu $a1, $s0, $zero -/* DF8934 80241F34 0809080C */ j .L80242030 -/* DF8938 80241F38 26F70001 */ addiu $s7, $s7, 1 -.L80241F3C: -/* DF893C 80241F3C 240900FD */ addiu $t1, $zero, 0xfd -/* DF8940 80241F40 16C90006 */ bne $s6, $t1, .L80241F5C -/* DF8944 80241F44 0260202D */ daddu $a0, $s3, $zero -/* DF8948 80241F48 8E630008 */ lw $v1, 8($s3) -/* DF894C 80241F4C 8E620038 */ lw $v0, 0x38($s3) -/* DF8950 80241F50 50620002 */ beql $v1, $v0, .L80241F5C -/* DF8954 80241F54 241E0001 */ addiu $fp, $zero, 1 -/* DF8958 80241F58 0260202D */ daddu $a0, $s3, $zero -.L80241F5C: -/* DF895C 80241F5C 0C090473 */ jal func_802411CC -/* DF8960 80241F60 0200282D */ daddu $a1, $s0, $zero -/* DF8964 80241F64 0809080C */ j .L80242030 -/* DF8968 80241F68 26F70001 */ addiu $s7, $s7, 1 -.L80241F6C: -/* DF896C 80241F6C 8E620054 */ lw $v0, 0x54($s3) -/* DF8970 80241F70 00570018 */ mult $v0, $s7 -/* DF8974 80241F74 8E620008 */ lw $v0, 8($s3) -/* DF8978 80241F78 00004812 */ mflo $t1 -/* DF897C 80241F7C 00491023 */ subu $v0, $v0, $t1 -/* DF8980 80241F80 04410002 */ bgez $v0, .L80241F8C -/* DF8984 80241F84 AE020018 */ sw $v0, 0x18($s0) -/* DF8988 80241F88 AE000018 */ sw $zero, 0x18($s0) -.L80241F8C: -/* DF898C 80241F8C 8E020018 */ lw $v0, 0x18($s0) -/* DF8990 80241F90 8E630050 */ lw $v1, 0x50($s3) -/* DF8994 80241F94 0062102A */ slt $v0, $v1, $v0 -/* DF8998 80241F98 54400001 */ bnel $v0, $zero, .L80241FA0 -/* DF899C 80241F9C AE030018 */ sw $v1, 0x18($s0) -.L80241FA0: -/* DF89A0 80241FA0 240900FD */ addiu $t1, $zero, 0xfd -/* DF89A4 80241FA4 16C90005 */ bne $s6, $t1, .L80241FBC -/* DF89A8 80241FA8 00000000 */ nop -/* DF89AC 80241FAC 8E030018 */ lw $v1, 0x18($s0) -/* DF89B0 80241FB0 8E620050 */ lw $v0, 0x50($s3) -/* DF89B4 80241FB4 50620001 */ beql $v1, $v0, .L80241FBC -/* DF89B8 80241FB8 241E0001 */ addiu $fp, $zero, 1 -.L80241FBC: -/* DF89BC 80241FBC 8E63004C */ lw $v1, 0x4c($s3) -/* DF89C0 80241FC0 24090001 */ addiu $t1, $zero, 1 -/* DF89C4 80241FC4 1069000D */ beq $v1, $t1, .L80241FFC -/* DF89C8 80241FC8 28620002 */ slti $v0, $v1, 2 -/* DF89CC 80241FCC 50400005 */ beql $v0, $zero, .L80241FE4 -/* DF89D0 80241FD0 24090002 */ addiu $t1, $zero, 2 -/* DF89D4 80241FD4 10600013 */ beqz $v1, .L80242024 -/* DF89D8 80241FD8 0260202D */ daddu $a0, $s3, $zero -/* DF89DC 80241FDC 0809080D */ j .L80242034 -/* DF89E0 80241FE0 26F70001 */ addiu $s7, $s7, 1 -.L80241FE4: -/* DF89E4 80241FE4 1069000A */ beq $v1, $t1, .L80242010 -/* DF89E8 80241FE8 24020003 */ addiu $v0, $zero, 3 -/* DF89EC 80241FEC 1062000D */ beq $v1, $v0, .L80242024 -/* DF89F0 80241FF0 0260202D */ daddu $a0, $s3, $zero -/* DF89F4 80241FF4 0809080C */ j .L80242030 -/* DF89F8 80241FF8 26F70001 */ addiu $s7, $s7, 1 -.L80241FFC: -/* DF89FC 80241FFC 0260202D */ daddu $a0, $s3, $zero -/* DF8A00 80242000 0C090533 */ jal func_802414CC -/* DF8A04 80242004 0200282D */ daddu $a1, $s0, $zero -/* DF8A08 80242008 0809080C */ j .L80242030 -/* DF8A0C 8024200C 26F70001 */ addiu $s7, $s7, 1 -.L80242010: -/* DF8A10 80242010 0260202D */ daddu $a0, $s3, $zero -/* DF8A14 80242014 0C0905DA */ jal func_80241768 -/* DF8A18 80242018 0200282D */ daddu $a1, $s0, $zero -/* DF8A1C 8024201C 0809080C */ j .L80242030 -/* DF8A20 80242020 26F70001 */ addiu $s7, $s7, 1 -.L80242024: -/* DF8A24 80242024 0C09067E */ jal func_802419F8 -/* DF8A28 80242028 0200282D */ daddu $a1, $s0, $zero -.L8024202C: -/* DF8A2C 8024202C 26F70001 */ addiu $s7, $s7, 1 -.L80242030: -/* DF8A30 80242030 24090001 */ addiu $t1, $zero, 1 -.L80242034: -/* DF8A34 80242034 329200FF */ andi $s2, $s4, 0xff -/* DF8A38 80242038 AFA00010 */ sw $zero, 0x10($sp) -/* DF8A3C 8024203C AFA90014 */ sw $t1, 0x14($sp) -/* DF8A40 80242040 8E050004 */ lw $a1, 4($s0) -/* DF8A44 80242044 8E060008 */ lw $a2, 8($s0) -/* DF8A48 80242048 3C073F80 */ lui $a3, 0x3f80 -/* DF8A4C 8024204C 0C049721 */ jal func_80125C84 -/* DF8A50 80242050 0240202D */ daddu $a0, $s2, $zero -/* DF8A54 80242054 26A3FFFF */ addiu $v1, $s5, -1 -/* DF8A58 80242058 8E040004 */ lw $a0, 4($s0) -/* DF8A5C 8024205C 0062A821 */ addu $s5, $v1, $v0 -/* DF8A60 80242060 2482FFFD */ addiu $v0, $a0, -3 -/* DF8A64 80242064 2C420002 */ sltiu $v0, $v0, 2 -/* DF8A68 80242068 10400020 */ beqz $v0, .L802420EC -/* DF8A6C 8024206C 00000000 */ nop -/* DF8A70 80242070 3C058024 */ lui $a1, 0x8024 -/* DF8A74 80242074 24A52CD8 */ addiu $a1, $a1, 0x2cd8 -/* DF8A78 80242078 24090004 */ addiu $t1, $zero, 4 -/* DF8A7C 8024207C 14890003 */ bne $a0, $t1, .L8024208C -/* DF8A80 80242080 00000000 */ nop -/* DF8A84 80242084 3C058024 */ lui $a1, 0x8024 -/* DF8A88 80242088 24A52C70 */ addiu $a1, $a1, 0x2c70 -.L8024208C: -/* DF8A8C 8024208C 14890007 */ bne $a0, $t1, .L802420AC -/* DF8A90 80242090 0000302D */ daddu $a2, $zero, $zero -/* DF8A94 80242094 24020008 */ addiu $v0, $zero, 8 -/* DF8A98 80242098 52420004 */ beql $s2, $v0, .L802420AC -/* DF8A9C 8024209C 26B50001 */ addiu $s5, $s5, 1 -/* DF8AA0 802420A0 16C20003 */ bne $s6, $v0, .L802420B0 -/* DF8AA4 802420A4 328300FF */ andi $v1, $s4, 0xff -/* DF8AA8 802420A8 26B50001 */ addiu $s5, $s5, 1 -.L802420AC: -/* DF8AAC 802420AC 328300FF */ andi $v1, $s4, 0xff -.L802420B0: -/* DF8AB0 802420B0 32C7FFFF */ andi $a3, $s6, 0xffff -/* DF8AB4 802420B4 00061080 */ sll $v0, $a2, 2 -/* DF8AB8 802420B8 00452021 */ addu $a0, $v0, $a1 -.L802420BC: -/* DF8ABC 802420BC 90820000 */ lbu $v0, ($a0) -/* DF8AC0 802420C0 54620007 */ bnel $v1, $v0, .L802420E0 -/* DF8AC4 802420C4 24840004 */ addiu $a0, $a0, 4 -/* DF8AC8 802420C8 90820001 */ lbu $v0, 1($a0) -/* DF8ACC 802420CC 54E20004 */ bnel $a3, $v0, .L802420E0 -/* DF8AD0 802420D0 24840004 */ addiu $a0, $a0, 4 -/* DF8AD4 802420D4 84820002 */ lh $v0, 2($a0) -/* DF8AD8 802420D8 02A2A821 */ addu $s5, $s5, $v0 -/* DF8ADC 802420DC 24840004 */ addiu $a0, $a0, 4 -.L802420E0: -/* DF8AE0 802420E0 84820002 */ lh $v0, 2($a0) -/* DF8AE4 802420E4 1440FFF5 */ bnez $v0, .L802420BC -/* DF8AE8 802420E8 00000000 */ nop -.L802420EC: -/* DF8AEC 802420EC 97A20050 */ lhu $v0, 0x50($sp) -/* DF8AF0 802420F0 1040FF29 */ beqz $v0, .L80241D98 -/* DF8AF4 802420F4 00000000 */ nop -/* DF8AF8 802420F8 8E62000C */ lw $v0, 0xc($s3) -/* DF8AFC 802420FC 14400015 */ bnez $v0, .L80242154 -/* DF8B00 80242100 00000000 */ nop -/* DF8B04 80242104 13C00013 */ beqz $fp, .L80242154 -/* DF8B08 80242108 0000282D */ daddu $a1, $zero, $zero -/* DF8B0C 8024210C 00A0302D */ daddu $a2, $a1, $zero -/* DF8B10 80242110 AFA0004C */ sw $zero, 0x4c($sp) -/* DF8B14 80242114 AFA00010 */ sw $zero, 0x10($sp) -/* DF8B18 80242118 AFA00014 */ sw $zero, 0x14($sp) -/* DF8B1C 8024211C AFA00018 */ sw $zero, 0x18($sp) -/* DF8B20 80242120 AFA0001C */ sw $zero, 0x1c($sp) -/* DF8B24 80242124 8E640000 */ lw $a0, ($s3) -/* DF8B28 80242128 0C0497DA */ jal get_string_properties -/* DF8B2C 8024212C 27A7004C */ addiu $a3, $sp, 0x4c -/* DF8B30 80242130 8E64000C */ lw $a0, 0xc($s3) -/* DF8B34 80242134 8E630038 */ lw $v1, 0x38($s3) -/* DF8B38 80242138 AE600008 */ sw $zero, 8($s3) -/* DF8B3C 8024213C 24820001 */ addiu $v0, $a0, 1 -/* DF8B40 80242140 1C600016 */ bgtz $v1, .L8024219C -/* DF8B44 80242144 AE62000C */ sw $v0, 0xc($s3) -/* DF8B48 80242148 24820002 */ addiu $v0, $a0, 2 -/* DF8B4C 8024214C 08090867 */ j .L8024219C -/* DF8B50 80242150 AE62000C */ sw $v0, 0xc($s3) -.L80242154: -/* DF8B54 80242154 8E63000C */ lw $v1, 0xc($s3) -/* DF8B58 80242158 24020001 */ addiu $v0, $zero, 1 -/* DF8B5C 8024215C 14620008 */ bne $v1, $v0, .L80242180 -/* DF8B60 80242160 24020002 */ addiu $v0, $zero, 2 -/* DF8B64 80242164 13C00005 */ beqz $fp, .L8024217C -/* DF8B68 80242168 0060102D */ daddu $v0, $v1, $zero -/* DF8B6C 8024216C 24420001 */ addiu $v0, $v0, 1 -/* DF8B70 80242170 AE600008 */ sw $zero, 8($s3) -/* DF8B74 80242174 08090867 */ j .L8024219C -/* DF8B78 80242178 AE62000C */ sw $v0, 0xc($s3) -.L8024217C: -/* DF8B7C 8024217C 24020002 */ addiu $v0, $zero, 2 -.L80242180: -/* DF8B80 80242180 14620006 */ bne $v1, $v0, .L8024219C -/* DF8B84 80242184 00000000 */ nop -/* DF8B88 80242188 13C00004 */ beqz $fp, .L8024219C -/* DF8B8C 8024218C 00000000 */ nop -/* DF8B90 80242190 96620070 */ lhu $v0, 0x70($s3) -/* DF8B94 80242194 3042FFFE */ andi $v0, $v0, 0xfffe -/* DF8B98 80242198 A6620070 */ sh $v0, 0x70($s3) -.L8024219C: -/* DF8B9C 8024219C 8E620008 */ lw $v0, 8($s3) -/* DF8BA0 802421A0 24420001 */ addiu $v0, $v0, 1 -/* DF8BA4 802421A4 AE620008 */ sw $v0, 8($s3) -/* DF8BA8 802421A8 8FBF007C */ lw $ra, 0x7c($sp) -/* DF8BAC 802421AC 8FBE0078 */ lw $fp, 0x78($sp) -/* DF8BB0 802421B0 8FB70074 */ lw $s7, 0x74($sp) -/* DF8BB4 802421B4 8FB60070 */ lw $s6, 0x70($sp) -/* DF8BB8 802421B8 8FB5006C */ lw $s5, 0x6c($sp) -/* DF8BBC 802421BC 8FB40068 */ lw $s4, 0x68($sp) -/* DF8BC0 802421C0 8FB30064 */ lw $s3, 0x64($sp) -/* DF8BC4 802421C4 8FB20060 */ lw $s2, 0x60($sp) -/* DF8BC8 802421C8 8FB1005C */ lw $s1, 0x5c($sp) -/* DF8BCC 802421CC 8FB00058 */ lw $s0, 0x58($sp) -/* DF8BD0 802421D0 03E00008 */ jr $ra -/* DF8BD4 802421D4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s new file mode 100644 index 0000000000..e7858f0073 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80241B34_DF8534.s @@ -0,0 +1,470 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B34_DF8534 +/* DF8534 80241B34 27BDFF80 */ addiu $sp, $sp, -0x80 +/* DF8538 80241B38 AFB30064 */ sw $s3, 0x64($sp) +/* DF853C 80241B3C 0080982D */ daddu $s3, $a0, $zero +/* DF8540 80241B40 AFBE0078 */ sw $fp, 0x78($sp) +/* DF8544 80241B44 0000F02D */ daddu $fp, $zero, $zero +/* DF8548 80241B48 AFBF007C */ sw $ra, 0x7c($sp) +/* DF854C 80241B4C AFB70074 */ sw $s7, 0x74($sp) +/* DF8550 80241B50 AFB60070 */ sw $s6, 0x70($sp) +/* DF8554 80241B54 AFB5006C */ sw $s5, 0x6c($sp) +/* DF8558 80241B58 AFB40068 */ sw $s4, 0x68($sp) +/* DF855C 80241B5C AFB20060 */ sw $s2, 0x60($sp) +/* DF8560 80241B60 AFB1005C */ sw $s1, 0x5c($sp) +/* DF8564 80241B64 AFB00058 */ sw $s0, 0x58($sp) +/* DF8568 80241B68 96630070 */ lhu $v1, 0x70($s3) +/* DF856C 80241B6C 30620002 */ andi $v0, $v1, 2 +/* DF8570 80241B70 10400005 */ beqz $v0, .L80241B88 +/* DF8574 80241B74 27B00020 */ addiu $s0, $sp, 0x20 +/* DF8578 80241B78 3062FFFD */ andi $v0, $v1, 0xfffd +/* DF857C 80241B7C A6620070 */ sh $v0, 0x70($s3) +/* DF8580 80241B80 AE600008 */ sw $zero, 8($s3) +/* DF8584 80241B84 AE60000C */ sw $zero, 0xc($s3) +.L80241B88: +/* DF8588 80241B88 27A50040 */ addiu $a1, $sp, 0x40 +/* DF858C 80241B8C 27A60044 */ addiu $a2, $sp, 0x44 +/* DF8590 80241B90 27A70048 */ addiu $a3, $sp, 0x48 +/* DF8594 80241B94 0000882D */ daddu $s1, $zero, $zero +/* DF8598 80241B98 AFA00010 */ sw $zero, 0x10($sp) +/* DF859C 80241B9C AFA00014 */ sw $zero, 0x14($sp) +/* DF85A0 80241BA0 AFA00018 */ sw $zero, 0x18($sp) +/* DF85A4 80241BA4 AFA0001C */ sw $zero, 0x1c($sp) +/* DF85A8 80241BA8 8E640000 */ lw $a0, ($s3) +/* DF85AC 80241BAC 0C0497DA */ jal get_string_properties +/* DF85B0 80241BB0 24170008 */ addiu $s7, $zero, 8 +/* DF85B4 80241BB4 24020001 */ addiu $v0, $zero, 1 +/* DF85B8 80241BB8 AFA00024 */ sw $zero, 0x24($sp) +/* DF85BC 80241BBC AFA00028 */ sw $zero, 0x28($sp) +/* DF85C0 80241BC0 AFA20044 */ sw $v0, 0x44($sp) +.L80241BC4: +/* DF85C4 80241BC4 8E620000 */ lw $v0, ($s3) +/* DF85C8 80241BC8 00511821 */ addu $v1, $v0, $s1 +/* DF85CC 80241BCC 26310001 */ addiu $s1, $s1, 1 +/* DF85D0 80241BD0 00511021 */ addu $v0, $v0, $s1 +/* DF85D4 80241BD4 90740000 */ lbu $s4, ($v1) +/* DF85D8 80241BD8 90550000 */ lbu $s5, ($v0) +/* DF85DC 80241BDC 2684FF10 */ addiu $a0, $s4, -0xf0 +/* DF85E0 80241BE0 2C830010 */ sltiu $v1, $a0, 0x10 +/* DF85E4 80241BE4 10600017 */ beqz $v1, .L80241C44 +/* DF85E8 80241BE8 0000B02D */ daddu $s6, $zero, $zero +/* DF85EC 80241BEC 00041080 */ sll $v0, $a0, 2 +/* DF85F0 80241BF0 3C098025 */ lui $t1, 0x8025 +/* DF85F4 80241BF4 2529E8C0 */ addiu $t1, $t1, -0x1740 +/* DF85F8 80241BF8 00491021 */ addu $v0, $v0, $t1 +/* DF85FC 80241BFC 8C420000 */ lw $v0, ($v0) +/* DF8600 80241C00 00400008 */ jr $v0 +/* DF8604 80241C04 00000000 */ nop +/* DF8608 80241C08 2682FF0D */ addiu $v0, $s4, -0xf3 +/* DF860C 80241C0C 08090743 */ j .L80241D0C +/* DF8610 80241C10 AE020008 */ sw $v0, 8($s0) +/* DF8614 80241C14 08090743 */ j .L80241D0C +/* DF8618 80241C18 24160001 */ addiu $s6, $zero, 1 +/* DF861C 80241C1C 8E630000 */ lw $v1, ($s3) +/* DF8620 80241C20 00711021 */ addu $v0, $v1, $s1 +/* DF8624 80241C24 90420000 */ lbu $v0, ($v0) +/* DF8628 80241C28 14400038 */ bnez $v0, .L80241D0C +/* DF862C 80241C2C 26310001 */ addiu $s1, $s1, 1 +/* DF8630 80241C30 00711021 */ addu $v0, $v1, $s1 +/* DF8634 80241C34 90420000 */ lbu $v0, ($v0) +/* DF8638 80241C38 26310001 */ addiu $s1, $s1, 1 +/* DF863C 80241C3C 08090743 */ j .L80241D0C +/* DF8640 80241C40 AE020004 */ sw $v0, 4($s0) +.L80241C44: +/* DF8644 80241C44 24020001 */ addiu $v0, $zero, 1 +/* DF8648 80241C48 329200FF */ andi $s2, $s4, 0xff +/* DF864C 80241C4C AFA00010 */ sw $zero, 0x10($sp) +/* DF8650 80241C50 AFA20014 */ sw $v0, 0x14($sp) +/* DF8654 80241C54 8E050004 */ lw $a1, 4($s0) +/* DF8658 80241C58 8E060008 */ lw $a2, 8($s0) +/* DF865C 80241C5C 3C073F80 */ lui $a3, 0x3f80 +/* DF8660 80241C60 0C049721 */ jal func_80125C84 +/* DF8664 80241C64 0240202D */ daddu $a0, $s2, $zero +/* DF8668 80241C68 8FA30044 */ lw $v1, 0x44($sp) +/* DF866C 80241C6C 8E040004 */ lw $a0, 4($s0) +/* DF8670 80241C70 2463FFFF */ addiu $v1, $v1, -1 +/* DF8674 80241C74 00621821 */ addu $v1, $v1, $v0 +/* DF8678 80241C78 2482FFFD */ addiu $v0, $a0, -3 +/* DF867C 80241C7C 2C420002 */ sltiu $v0, $v0, 2 +/* DF8680 80241C80 10400022 */ beqz $v0, .L80241D0C +/* DF8684 80241C84 AFA30044 */ sw $v1, 0x44($sp) +/* DF8688 80241C88 3C058024 */ lui $a1, 0x8024 +/* DF868C 80241C8C 24A52CD8 */ addiu $a1, $a1, 0x2cd8 +/* DF8690 80241C90 24090004 */ addiu $t1, $zero, 4 +/* DF8694 80241C94 14890003 */ bne $a0, $t1, .L80241CA4 +/* DF8698 80241C98 00000000 */ nop +/* DF869C 80241C9C 3C058024 */ lui $a1, 0x8024 +/* DF86A0 80241CA0 24A52C70 */ addiu $a1, $a1, 0x2c70 +.L80241CA4: +/* DF86A4 80241CA4 14890007 */ bne $a0, $t1, .L80241CC4 +/* DF86A8 80241CA8 0000302D */ daddu $a2, $zero, $zero +/* DF86AC 80241CAC 12570004 */ beq $s2, $s7, .L80241CC0 +/* DF86B0 80241CB0 24620001 */ addiu $v0, $v1, 1 +/* DF86B4 80241CB4 16B70004 */ bne $s5, $s7, .L80241CC8 +/* DF86B8 80241CB8 328800FF */ andi $t0, $s4, 0xff +/* DF86BC 80241CBC 24620001 */ addiu $v0, $v1, 1 +.L80241CC0: +/* DF86C0 80241CC0 AFA20044 */ sw $v0, 0x44($sp) +.L80241CC4: +/* DF86C4 80241CC4 328800FF */ andi $t0, $s4, 0xff +.L80241CC8: +/* DF86C8 80241CC8 32A7FFFF */ andi $a3, $s5, 0xffff +/* DF86CC 80241CCC 00061080 */ sll $v0, $a2, 2 +/* DF86D0 80241CD0 00452021 */ addu $a0, $v0, $a1 +.L80241CD4: +/* DF86D4 80241CD4 90820000 */ lbu $v0, ($a0) +/* DF86D8 80241CD8 55020009 */ bnel $t0, $v0, .L80241D00 +/* DF86DC 80241CDC 24840004 */ addiu $a0, $a0, 4 +/* DF86E0 80241CE0 90820001 */ lbu $v0, 1($a0) +/* DF86E4 80241CE4 54E20006 */ bnel $a3, $v0, .L80241D00 +/* DF86E8 80241CE8 24840004 */ addiu $a0, $a0, 4 +/* DF86EC 80241CEC 84830002 */ lh $v1, 2($a0) +/* DF86F0 80241CF0 8FA20044 */ lw $v0, 0x44($sp) +/* DF86F4 80241CF4 00431021 */ addu $v0, $v0, $v1 +/* DF86F8 80241CF8 AFA20044 */ sw $v0, 0x44($sp) +/* DF86FC 80241CFC 24840004 */ addiu $a0, $a0, 4 +.L80241D00: +/* DF8700 80241D00 84820002 */ lh $v0, 2($a0) +/* DF8704 80241D04 1440FFF3 */ bnez $v0, .L80241CD4 +/* DF8708 80241D08 00000000 */ nop +.L80241D0C: +/* DF870C 80241D0C 32C2FFFF */ andi $v0, $s6, 0xffff +/* DF8710 80241D10 1040FFAC */ beqz $v0, .L80241BC4 +/* DF8714 80241D14 00000000 */ nop +/* DF8718 80241D18 96620070 */ lhu $v0, 0x70($s3) +/* DF871C 80241D1C 8FA30044 */ lw $v1, 0x44($sp) +/* DF8720 80241D20 30420001 */ andi $v0, $v0, 1 +/* DF8724 80241D24 10400015 */ beqz $v0, .L80241D7C +/* DF8728 80241D28 AE630014 */ sw $v1, 0x14($s3) +/* DF872C 80241D2C 44831000 */ mtc1 $v1, $f2 +/* DF8730 80241D30 00000000 */ nop +/* DF8734 80241D34 468010A0 */ cvt.s.w $f2, $f2 +/* DF8738 80241D38 3C013FE0 */ lui $at, 0x3fe0 +/* DF873C 80241D3C 44810800 */ mtc1 $at, $f1 +/* DF8740 80241D40 44800000 */ mtc1 $zero, $f0 +/* DF8744 80241D44 460010A1 */ cvt.d.s $f2, $f2 +/* DF8748 80241D48 46201082 */ mul.d $f2, $f2, $f0 +/* DF874C 80241D4C 00000000 */ nop +/* DF8750 80241D50 44800000 */ mtc1 $zero, $f0 +/* DF8754 80241D54 44800800 */ mtc1 $zero, $f1 +/* DF8758 80241D58 00000000 */ nop +/* DF875C 80241D5C 46201080 */ add.d $f2, $f2, $f0 +/* DF8760 80241D60 C6600068 */ lwc1 $f0, 0x68($s3) +/* DF8764 80241D64 46800021 */ cvt.d.w $f0, $f0 +/* DF8768 80241D68 46220001 */ sub.d $f0, $f0, $f2 +/* DF876C 80241D6C 4620010D */ trunc.w.d $f4, $f0 +/* DF8770 80241D70 44152000 */ mfc1 $s5, $f4 +/* DF8774 80241D74 08090761 */ j .L80241D84 +/* DF8778 80241D78 0000B82D */ daddu $s7, $zero, $zero +.L80241D7C: +/* DF877C 80241D7C 8E750068 */ lw $s5, 0x68($s3) +/* DF8780 80241D80 0000B82D */ daddu $s7, $zero, $zero +.L80241D84: +/* DF8784 80241D84 AE000004 */ sw $zero, 4($s0) +/* DF8788 80241D88 AE000008 */ sw $zero, 8($s0) +/* DF878C 80241D8C 8E620010 */ lw $v0, 0x10($s3) +/* DF8790 80241D90 02E0882D */ daddu $s1, $s7, $zero +/* DF8794 80241D94 AE02000C */ sw $v0, 0xc($s0) +.L80241D98: +/* DF8798 80241D98 8E620000 */ lw $v0, ($s3) +/* DF879C 80241D9C A7A00050 */ sh $zero, 0x50($sp) +/* DF87A0 80241DA0 00511821 */ addu $v1, $v0, $s1 +/* DF87A4 80241DA4 26310001 */ addiu $s1, $s1, 1 +/* DF87A8 80241DA8 00511021 */ addu $v0, $v0, $s1 +/* DF87AC 80241DAC 90740000 */ lbu $s4, ($v1) +/* DF87B0 80241DB0 90560000 */ lbu $s6, ($v0) +/* DF87B4 80241DB4 2684FF10 */ addiu $a0, $s4, -0xf0 +/* DF87B8 80241DB8 2C830010 */ sltiu $v1, $a0, 0x10 +/* DF87BC 80241DBC 10600016 */ beqz $v1, .L80241E18 +/* DF87C0 80241DC0 00041080 */ sll $v0, $a0, 2 +/* DF87C4 80241DC4 3C018025 */ lui $at, 0x8025 +/* DF87C8 80241DC8 00220821 */ addu $at, $at, $v0 +/* DF87CC 80241DCC 8C22E900 */ lw $v0, -0x1700($at) +/* DF87D0 80241DD0 00400008 */ jr $v0 +/* DF87D4 80241DD4 00000000 */ nop +/* DF87D8 80241DD8 2682FF0D */ addiu $v0, $s4, -0xf3 +/* DF87DC 80241DDC 0809083B */ j .L802420EC +/* DF87E0 80241DE0 AE020008 */ sw $v0, 8($s0) +/* DF87E4 80241DE4 24090001 */ addiu $t1, $zero, 1 +/* DF87E8 80241DE8 0809083B */ j .L802420EC +/* DF87EC 80241DEC A7A90050 */ sh $t1, 0x50($sp) +/* DF87F0 80241DF0 8E630000 */ lw $v1, ($s3) +/* DF87F4 80241DF4 00711021 */ addu $v0, $v1, $s1 +/* DF87F8 80241DF8 90420000 */ lbu $v0, ($v0) +/* DF87FC 80241DFC 144000BB */ bnez $v0, .L802420EC +/* DF8800 80241E00 26310001 */ addiu $s1, $s1, 1 +/* DF8804 80241E04 00711021 */ addu $v0, $v1, $s1 +/* DF8808 80241E08 90420000 */ lbu $v0, ($v0) +/* DF880C 80241E0C 26310001 */ addiu $s1, $s1, 1 +/* DF8810 80241E10 0809083B */ j .L802420EC +/* DF8814 80241E14 AE020004 */ sw $v0, 4($s0) +.L80241E18: +/* DF8818 80241E18 328300FF */ andi $v1, $s4, 0xff +/* DF881C 80241E1C 2C6200F0 */ sltiu $v0, $v1, 0xf0 +/* DF8820 80241E20 10400083 */ beqz $v0, .L80242030 +/* DF8824 80241E24 24090001 */ addiu $t1, $zero, 1 +/* DF8828 80241E28 AE030000 */ sw $v1, ($s0) +/* DF882C 80241E2C AE150010 */ sw $s5, 0x10($s0) +/* DF8830 80241E30 8E62006C */ lw $v0, 0x6c($s3) +/* DF8834 80241E34 AE020014 */ sw $v0, 0x14($s0) +/* DF8838 80241E38 8E63000C */ lw $v1, 0xc($s3) +/* DF883C 80241E3C 1069003F */ beq $v1, $t1, .L80241F3C +/* DF8840 80241E40 28620002 */ slti $v0, $v1, 2 +/* DF8844 80241E44 50400005 */ beql $v0, $zero, .L80241E5C +/* DF8848 80241E48 24090002 */ addiu $t1, $zero, 2 +/* DF884C 80241E4C 10600007 */ beqz $v1, .L80241E6C +/* DF8850 80241E50 00000000 */ nop +/* DF8854 80241E54 0809080D */ j .L80242034 +/* DF8858 80241E58 26F70001 */ addiu $s7, $s7, 1 +.L80241E5C: +/* DF885C 80241E5C 10690043 */ beq $v1, $t1, .L80241F6C +/* DF8860 80241E60 00000000 */ nop +/* DF8864 80241E64 0809080C */ j .L80242030 +/* DF8868 80241E68 26F70001 */ addiu $s7, $s7, 1 +.L80241E6C: +/* DF886C 80241E6C 8E620020 */ lw $v0, 0x20($s3) +/* DF8870 80241E70 00570018 */ mult $v0, $s7 +/* DF8874 80241E74 8E620008 */ lw $v0, 8($s3) +/* DF8878 80241E78 00004812 */ mflo $t1 +/* DF887C 80241E7C 00491023 */ subu $v0, $v0, $t1 +/* DF8880 80241E80 0440006A */ bltz $v0, .L8024202C +/* DF8884 80241E84 AE020018 */ sw $v0, 0x18($s0) +/* DF8888 80241E88 8E63001C */ lw $v1, 0x1c($s3) +/* DF888C 80241E8C 0062102A */ slt $v0, $v1, $v0 +/* DF8890 80241E90 54400001 */ bnel $v0, $zero, .L80241E98 +/* DF8894 80241E94 AE030018 */ sw $v1, 0x18($s0) +.L80241E98: +/* DF8898 80241E98 240900FD */ addiu $t1, $zero, 0xfd +/* DF889C 80241E9C 16C90005 */ bne $s6, $t1, .L80241EB4 +/* DF88A0 80241EA0 00000000 */ nop +/* DF88A4 80241EA4 8E030018 */ lw $v1, 0x18($s0) +/* DF88A8 80241EA8 8E62001C */ lw $v0, 0x1c($s3) +/* DF88AC 80241EAC 50620001 */ beql $v1, $v0, .L80241EB4 +/* DF88B0 80241EB0 241E0001 */ addiu $fp, $zero, 1 +.L80241EB4: +/* DF88B4 80241EB4 8E630018 */ lw $v1, 0x18($s3) +/* DF88B8 80241EB8 2C620006 */ sltiu $v0, $v1, 6 +/* DF88BC 80241EBC 1040005B */ beqz $v0, .L8024202C +/* DF88C0 80241EC0 00031080 */ sll $v0, $v1, 2 +/* DF88C4 80241EC4 3C018025 */ lui $at, 0x8025 +/* DF88C8 80241EC8 00220821 */ addu $at, $at, $v0 +/* DF88CC 80241ECC 8C22E940 */ lw $v0, -0x16c0($at) +/* DF88D0 80241ED0 00400008 */ jr $v0 +/* DF88D4 80241ED4 00000000 */ nop +/* DF88D8 80241ED8 0260202D */ daddu $a0, $s3, $zero +/* DF88DC 80241EDC 0C09009C */ jal func_80240270_DF6C70 +/* DF88E0 80241EE0 0200282D */ daddu $a1, $s0, $zero +/* DF88E4 80241EE4 0809080C */ j .L80242030 +/* DF88E8 80241EE8 26F70001 */ addiu $s7, $s7, 1 +/* DF88EC 80241EEC 0260202D */ daddu $a0, $s3, $zero +/* DF88F0 80241EF0 0C090150 */ jal func_80240540_DF6F40 +/* DF88F4 80241EF4 0200282D */ daddu $a1, $s0, $zero +/* DF88F8 80241EF8 0809080C */ j .L80242030 +/* DF88FC 80241EFC 26F70001 */ addiu $s7, $s7, 1 +/* DF8900 80241F00 0260202D */ daddu $a0, $s3, $zero +/* DF8904 80241F04 0C090207 */ jal func_8024081C_DF721C +/* DF8908 80241F08 0200282D */ daddu $a1, $s0, $zero +/* DF890C 80241F0C 0809080C */ j .L80242030 +/* DF8910 80241F10 26F70001 */ addiu $s7, $s7, 1 +/* DF8914 80241F14 0260202D */ daddu $a0, $s3, $zero +/* DF8918 80241F18 0C0902BA */ jal func_80240AE8_DF74E8 +/* DF891C 80241F1C 0200282D */ daddu $a1, $s0, $zero +/* DF8920 80241F20 0809080C */ j .L80242030 +/* DF8924 80241F24 26F70001 */ addiu $s7, $s7, 1 +/* DF8928 80241F28 0260202D */ daddu $a0, $s3, $zero +/* DF892C 80241F2C 0C0903AC */ jal func_80240EB0_DF78B0 +/* DF8930 80241F30 0200282D */ daddu $a1, $s0, $zero +/* DF8934 80241F34 0809080C */ j .L80242030 +/* DF8938 80241F38 26F70001 */ addiu $s7, $s7, 1 +.L80241F3C: +/* DF893C 80241F3C 240900FD */ addiu $t1, $zero, 0xfd +/* DF8940 80241F40 16C90006 */ bne $s6, $t1, .L80241F5C +/* DF8944 80241F44 0260202D */ daddu $a0, $s3, $zero +/* DF8948 80241F48 8E630008 */ lw $v1, 8($s3) +/* DF894C 80241F4C 8E620038 */ lw $v0, 0x38($s3) +/* DF8950 80241F50 50620002 */ beql $v1, $v0, .L80241F5C +/* DF8954 80241F54 241E0001 */ addiu $fp, $zero, 1 +/* DF8958 80241F58 0260202D */ daddu $a0, $s3, $zero +.L80241F5C: +/* DF895C 80241F5C 0C090473 */ jal func_802411CC_DF7BCC +/* DF8960 80241F60 0200282D */ daddu $a1, $s0, $zero +/* DF8964 80241F64 0809080C */ j .L80242030 +/* DF8968 80241F68 26F70001 */ addiu $s7, $s7, 1 +.L80241F6C: +/* DF896C 80241F6C 8E620054 */ lw $v0, 0x54($s3) +/* DF8970 80241F70 00570018 */ mult $v0, $s7 +/* DF8974 80241F74 8E620008 */ lw $v0, 8($s3) +/* DF8978 80241F78 00004812 */ mflo $t1 +/* DF897C 80241F7C 00491023 */ subu $v0, $v0, $t1 +/* DF8980 80241F80 04410002 */ bgez $v0, .L80241F8C +/* DF8984 80241F84 AE020018 */ sw $v0, 0x18($s0) +/* DF8988 80241F88 AE000018 */ sw $zero, 0x18($s0) +.L80241F8C: +/* DF898C 80241F8C 8E020018 */ lw $v0, 0x18($s0) +/* DF8990 80241F90 8E630050 */ lw $v1, 0x50($s3) +/* DF8994 80241F94 0062102A */ slt $v0, $v1, $v0 +/* DF8998 80241F98 54400001 */ bnel $v0, $zero, .L80241FA0 +/* DF899C 80241F9C AE030018 */ sw $v1, 0x18($s0) +.L80241FA0: +/* DF89A0 80241FA0 240900FD */ addiu $t1, $zero, 0xfd +/* DF89A4 80241FA4 16C90005 */ bne $s6, $t1, .L80241FBC +/* DF89A8 80241FA8 00000000 */ nop +/* DF89AC 80241FAC 8E030018 */ lw $v1, 0x18($s0) +/* DF89B0 80241FB0 8E620050 */ lw $v0, 0x50($s3) +/* DF89B4 80241FB4 50620001 */ beql $v1, $v0, .L80241FBC +/* DF89B8 80241FB8 241E0001 */ addiu $fp, $zero, 1 +.L80241FBC: +/* DF89BC 80241FBC 8E63004C */ lw $v1, 0x4c($s3) +/* DF89C0 80241FC0 24090001 */ addiu $t1, $zero, 1 +/* DF89C4 80241FC4 1069000D */ beq $v1, $t1, .L80241FFC +/* DF89C8 80241FC8 28620002 */ slti $v0, $v1, 2 +/* DF89CC 80241FCC 50400005 */ beql $v0, $zero, .L80241FE4 +/* DF89D0 80241FD0 24090002 */ addiu $t1, $zero, 2 +/* DF89D4 80241FD4 10600013 */ beqz $v1, .L80242024 +/* DF89D8 80241FD8 0260202D */ daddu $a0, $s3, $zero +/* DF89DC 80241FDC 0809080D */ j .L80242034 +/* DF89E0 80241FE0 26F70001 */ addiu $s7, $s7, 1 +.L80241FE4: +/* DF89E4 80241FE4 1069000A */ beq $v1, $t1, .L80242010 +/* DF89E8 80241FE8 24020003 */ addiu $v0, $zero, 3 +/* DF89EC 80241FEC 1062000D */ beq $v1, $v0, .L80242024 +/* DF89F0 80241FF0 0260202D */ daddu $a0, $s3, $zero +/* DF89F4 80241FF4 0809080C */ j .L80242030 +/* DF89F8 80241FF8 26F70001 */ addiu $s7, $s7, 1 +.L80241FFC: +/* DF89FC 80241FFC 0260202D */ daddu $a0, $s3, $zero +/* DF8A00 80242000 0C090533 */ jal func_802414CC_DF7ECC +/* DF8A04 80242004 0200282D */ daddu $a1, $s0, $zero +/* DF8A08 80242008 0809080C */ j .L80242030 +/* DF8A0C 8024200C 26F70001 */ addiu $s7, $s7, 1 +.L80242010: +/* DF8A10 80242010 0260202D */ daddu $a0, $s3, $zero +/* DF8A14 80242014 0C0905DA */ jal func_80241768_DF8168 +/* DF8A18 80242018 0200282D */ daddu $a1, $s0, $zero +/* DF8A1C 8024201C 0809080C */ j .L80242030 +/* DF8A20 80242020 26F70001 */ addiu $s7, $s7, 1 +.L80242024: +/* DF8A24 80242024 0C09067E */ jal func_802419F8_DF83F8 +/* DF8A28 80242028 0200282D */ daddu $a1, $s0, $zero +.L8024202C: +/* DF8A2C 8024202C 26F70001 */ addiu $s7, $s7, 1 +.L80242030: +/* DF8A30 80242030 24090001 */ addiu $t1, $zero, 1 +.L80242034: +/* DF8A34 80242034 329200FF */ andi $s2, $s4, 0xff +/* DF8A38 80242038 AFA00010 */ sw $zero, 0x10($sp) +/* DF8A3C 8024203C AFA90014 */ sw $t1, 0x14($sp) +/* DF8A40 80242040 8E050004 */ lw $a1, 4($s0) +/* DF8A44 80242044 8E060008 */ lw $a2, 8($s0) +/* DF8A48 80242048 3C073F80 */ lui $a3, 0x3f80 +/* DF8A4C 8024204C 0C049721 */ jal func_80125C84 +/* DF8A50 80242050 0240202D */ daddu $a0, $s2, $zero +/* DF8A54 80242054 26A3FFFF */ addiu $v1, $s5, -1 +/* DF8A58 80242058 8E040004 */ lw $a0, 4($s0) +/* DF8A5C 8024205C 0062A821 */ addu $s5, $v1, $v0 +/* DF8A60 80242060 2482FFFD */ addiu $v0, $a0, -3 +/* DF8A64 80242064 2C420002 */ sltiu $v0, $v0, 2 +/* DF8A68 80242068 10400020 */ beqz $v0, .L802420EC +/* DF8A6C 8024206C 00000000 */ nop +/* DF8A70 80242070 3C058024 */ lui $a1, 0x8024 +/* DF8A74 80242074 24A52CD8 */ addiu $a1, $a1, 0x2cd8 +/* DF8A78 80242078 24090004 */ addiu $t1, $zero, 4 +/* DF8A7C 8024207C 14890003 */ bne $a0, $t1, .L8024208C +/* DF8A80 80242080 00000000 */ nop +/* DF8A84 80242084 3C058024 */ lui $a1, 0x8024 +/* DF8A88 80242088 24A52C70 */ addiu $a1, $a1, 0x2c70 +.L8024208C: +/* DF8A8C 8024208C 14890007 */ bne $a0, $t1, .L802420AC +/* DF8A90 80242090 0000302D */ daddu $a2, $zero, $zero +/* DF8A94 80242094 24020008 */ addiu $v0, $zero, 8 +/* DF8A98 80242098 52420004 */ beql $s2, $v0, .L802420AC +/* DF8A9C 8024209C 26B50001 */ addiu $s5, $s5, 1 +/* DF8AA0 802420A0 16C20003 */ bne $s6, $v0, .L802420B0 +/* DF8AA4 802420A4 328300FF */ andi $v1, $s4, 0xff +/* DF8AA8 802420A8 26B50001 */ addiu $s5, $s5, 1 +.L802420AC: +/* DF8AAC 802420AC 328300FF */ andi $v1, $s4, 0xff +.L802420B0: +/* DF8AB0 802420B0 32C7FFFF */ andi $a3, $s6, 0xffff +/* DF8AB4 802420B4 00061080 */ sll $v0, $a2, 2 +/* DF8AB8 802420B8 00452021 */ addu $a0, $v0, $a1 +.L802420BC: +/* DF8ABC 802420BC 90820000 */ lbu $v0, ($a0) +/* DF8AC0 802420C0 54620007 */ bnel $v1, $v0, .L802420E0 +/* DF8AC4 802420C4 24840004 */ addiu $a0, $a0, 4 +/* DF8AC8 802420C8 90820001 */ lbu $v0, 1($a0) +/* DF8ACC 802420CC 54E20004 */ bnel $a3, $v0, .L802420E0 +/* DF8AD0 802420D0 24840004 */ addiu $a0, $a0, 4 +/* DF8AD4 802420D4 84820002 */ lh $v0, 2($a0) +/* DF8AD8 802420D8 02A2A821 */ addu $s5, $s5, $v0 +/* DF8ADC 802420DC 24840004 */ addiu $a0, $a0, 4 +.L802420E0: +/* DF8AE0 802420E0 84820002 */ lh $v0, 2($a0) +/* DF8AE4 802420E4 1440FFF5 */ bnez $v0, .L802420BC +/* DF8AE8 802420E8 00000000 */ nop +.L802420EC: +/* DF8AEC 802420EC 97A20050 */ lhu $v0, 0x50($sp) +/* DF8AF0 802420F0 1040FF29 */ beqz $v0, .L80241D98 +/* DF8AF4 802420F4 00000000 */ nop +/* DF8AF8 802420F8 8E62000C */ lw $v0, 0xc($s3) +/* DF8AFC 802420FC 14400015 */ bnez $v0, .L80242154 +/* DF8B00 80242100 00000000 */ nop +/* DF8B04 80242104 13C00013 */ beqz $fp, .L80242154 +/* DF8B08 80242108 0000282D */ daddu $a1, $zero, $zero +/* DF8B0C 8024210C 00A0302D */ daddu $a2, $a1, $zero +/* DF8B10 80242110 AFA0004C */ sw $zero, 0x4c($sp) +/* DF8B14 80242114 AFA00010 */ sw $zero, 0x10($sp) +/* DF8B18 80242118 AFA00014 */ sw $zero, 0x14($sp) +/* DF8B1C 8024211C AFA00018 */ sw $zero, 0x18($sp) +/* DF8B20 80242120 AFA0001C */ sw $zero, 0x1c($sp) +/* DF8B24 80242124 8E640000 */ lw $a0, ($s3) +/* DF8B28 80242128 0C0497DA */ jal get_string_properties +/* DF8B2C 8024212C 27A7004C */ addiu $a3, $sp, 0x4c +/* DF8B30 80242130 8E64000C */ lw $a0, 0xc($s3) +/* DF8B34 80242134 8E630038 */ lw $v1, 0x38($s3) +/* DF8B38 80242138 AE600008 */ sw $zero, 8($s3) +/* DF8B3C 8024213C 24820001 */ addiu $v0, $a0, 1 +/* DF8B40 80242140 1C600016 */ bgtz $v1, .L8024219C +/* DF8B44 80242144 AE62000C */ sw $v0, 0xc($s3) +/* DF8B48 80242148 24820002 */ addiu $v0, $a0, 2 +/* DF8B4C 8024214C 08090867 */ j .L8024219C +/* DF8B50 80242150 AE62000C */ sw $v0, 0xc($s3) +.L80242154: +/* DF8B54 80242154 8E63000C */ lw $v1, 0xc($s3) +/* DF8B58 80242158 24020001 */ addiu $v0, $zero, 1 +/* DF8B5C 8024215C 14620008 */ bne $v1, $v0, .L80242180 +/* DF8B60 80242160 24020002 */ addiu $v0, $zero, 2 +/* DF8B64 80242164 13C00005 */ beqz $fp, .L8024217C +/* DF8B68 80242168 0060102D */ daddu $v0, $v1, $zero +/* DF8B6C 8024216C 24420001 */ addiu $v0, $v0, 1 +/* DF8B70 80242170 AE600008 */ sw $zero, 8($s3) +/* DF8B74 80242174 08090867 */ j .L8024219C +/* DF8B78 80242178 AE62000C */ sw $v0, 0xc($s3) +.L8024217C: +/* DF8B7C 8024217C 24020002 */ addiu $v0, $zero, 2 +.L80242180: +/* DF8B80 80242180 14620006 */ bne $v1, $v0, .L8024219C +/* DF8B84 80242184 00000000 */ nop +/* DF8B88 80242188 13C00004 */ beqz $fp, .L8024219C +/* DF8B8C 8024218C 00000000 */ nop +/* DF8B90 80242190 96620070 */ lhu $v0, 0x70($s3) +/* DF8B94 80242194 3042FFFE */ andi $v0, $v0, 0xfffe +/* DF8B98 80242198 A6620070 */ sh $v0, 0x70($s3) +.L8024219C: +/* DF8B9C 8024219C 8E620008 */ lw $v0, 8($s3) +/* DF8BA0 802421A0 24420001 */ addiu $v0, $v0, 1 +/* DF8BA4 802421A4 AE620008 */ sw $v0, 8($s3) +/* DF8BA8 802421A8 8FBF007C */ lw $ra, 0x7c($sp) +/* DF8BAC 802421AC 8FBE0078 */ lw $fp, 0x78($sp) +/* DF8BB0 802421B0 8FB70074 */ lw $s7, 0x74($sp) +/* DF8BB4 802421B4 8FB60070 */ lw $s6, 0x70($sp) +/* DF8BB8 802421B8 8FB5006C */ lw $s5, 0x6c($sp) +/* DF8BBC 802421BC 8FB40068 */ lw $s4, 0x68($sp) +/* DF8BC0 802421C0 8FB30064 */ lw $s3, 0x64($sp) +/* DF8BC4 802421C4 8FB20060 */ lw $s2, 0x60($sp) +/* DF8BC8 802421C8 8FB1005C */ lw $s1, 0x5c($sp) +/* DF8BCC 802421CC 8FB00058 */ lw $s0, 0x58($sp) +/* DF8BD0 802421D0 03E00008 */ jr $ra +/* DF8BD4 802421D4 27BD0080 */ addiu $sp, $sp, 0x80 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 58c7534f3b..e96592f1a1 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 @@ -83,7 +83,7 @@ glabel func_802421D8_DF8BD8 /* DF8D0C 8024230C 30420001 */ andi $v0, $v0, 1 /* DF8D10 80242310 50400004 */ beql $v0, $zero, .L80242324 /* DF8D14 80242314 26730074 */ addiu $s3, $s3, 0x74 -/* DF8D18 80242318 0C0906CD */ jal func_80241B34 +/* DF8D18 80242318 0C0906CD */ jal func_80241B34_DF8534 /* DF8D1C 8024231C 02B32021 */ addu $a0, $s5, $s3 /* DF8D20 80242320 26730074 */ addiu $s3, $s3, 0x74 .L80242324: diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500.s deleted file mode 100644 index 215aa90107..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242500 -/* DF8F00 80242500 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF8F04 80242504 AFB00010 */ sw $s0, 0x10($sp) -/* DF8F08 80242508 3C108025 */ lui $s0, 0x8025 -/* DF8F0C 8024250C 2610E960 */ addiu $s0, $s0, -0x16a0 -/* DF8F10 80242510 3C058024 */ lui $a1, 0x8024 -/* DF8F14 80242514 24A521D8 */ addiu $a1, $a1, 0x21d8 -/* DF8F18 80242518 AFBF0014 */ sw $ra, 0x14($sp) -/* DF8F1C 8024251C 3C018025 */ lui $at, 0x8025 -/* DF8F20 80242520 AC30F7E4 */ sw $s0, -0x81c($at) -/* DF8F24 80242524 0C048C8F */ jal bind_dynamic_entity_7 -/* DF8F28 80242528 0000202D */ daddu $a0, $zero, $zero -/* DF8F2C 8024252C 2404001F */ addiu $a0, $zero, 0x1f -/* DF8F30 80242530 26030E0C */ addiu $v1, $s0, 0xe0c -/* DF8F34 80242534 AE020000 */ sw $v0, ($s0) -.L80242538: -/* DF8F38 80242538 A4600074 */ sh $zero, 0x74($v1) -/* DF8F3C 8024253C 2484FFFF */ addiu $a0, $a0, -1 -/* DF8F40 80242540 0481FFFD */ bgez $a0, .L80242538 -/* DF8F44 80242544 2463FF8C */ addiu $v1, $v1, -0x74 -/* DF8F48 80242548 8FBF0014 */ lw $ra, 0x14($sp) -/* DF8F4C 8024254C 8FB00010 */ lw $s0, 0x10($sp) -/* DF8F50 80242550 03E00008 */ jr $ra -/* DF8F54 80242554 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s new file mode 100644 index 0000000000..4537b12e5d --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242500_DF8F00.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242500_DF8F00 +/* DF8F00 80242500 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DF8F04 80242504 AFB00010 */ sw $s0, 0x10($sp) +/* DF8F08 80242508 3C108025 */ lui $s0, 0x8025 +/* DF8F0C 8024250C 2610E960 */ addiu $s0, $s0, -0x16a0 +/* DF8F10 80242510 3C058024 */ lui $a1, 0x8024 +/* DF8F14 80242514 24A521D8 */ addiu $a1, $a1, 0x21d8 +/* DF8F18 80242518 AFBF0014 */ sw $ra, 0x14($sp) +/* DF8F1C 8024251C 3C018025 */ lui $at, 0x8025 +/* DF8F20 80242520 AC30F7E4 */ sw $s0, -0x81c($at) +/* DF8F24 80242524 0C048C8F */ jal bind_dynamic_entity_7 +/* DF8F28 80242528 0000202D */ daddu $a0, $zero, $zero +/* DF8F2C 8024252C 2404001F */ addiu $a0, $zero, 0x1f +/* DF8F30 80242530 26030E0C */ addiu $v1, $s0, 0xe0c +/* DF8F34 80242534 AE020000 */ sw $v0, ($s0) +.L80242538: +/* DF8F38 80242538 A4600074 */ sh $zero, 0x74($v1) +/* DF8F3C 8024253C 2484FFFF */ addiu $a0, $a0, -1 +/* DF8F40 80242540 0481FFFD */ bgez $a0, .L80242538 +/* DF8F44 80242544 2463FF8C */ addiu $v1, $v1, -0x74 +/* DF8F48 80242548 8FBF0014 */ lw $ra, 0x14($sp) +/* DF8F4C 8024254C 8FB00010 */ lw $s0, 0x10($sp) +/* DF8F50 80242550 03E00008 */ jr $ra +/* DF8F54 80242554 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242558_DF8F58.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242558_DF8F58.s index a2b0e716df..b05d0d2e71 100644 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242558_DF8F58.s +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242558_DF8F58.s @@ -4,7 +4,7 @@ glabel func_80242558_DF8F58 /* DF8F58 80242558 27BDFFE8 */ addiu $sp, $sp, -0x18 /* DF8F5C 8024255C AFBF0010 */ sw $ra, 0x10($sp) -/* DF8F60 80242560 0C090940 */ jal func_80242500 +/* DF8F60 80242560 0C090940 */ jal func_80242500_DF8F00 /* DF8F64 80242564 00000000 */ nop /* DF8F68 80242568 0C048DCD */ jal load_font /* DF8F6C 8024256C 24040001 */ addiu $a0, $zero, 1 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580.s deleted file mode 100644 index 146cecba4d..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242580 -/* DF8F80 80242580 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DF8F84 80242584 AFB10014 */ sw $s1, 0x14($sp) -/* DF8F88 80242588 0080882D */ daddu $s1, $a0, $zero -/* DF8F8C 8024258C AFBF001C */ sw $ra, 0x1c($sp) -/* DF8F90 80242590 AFB20018 */ sw $s2, 0x18($sp) -/* DF8F94 80242594 AFB00010 */ sw $s0, 0x10($sp) -/* DF8F98 80242598 8E22000C */ lw $v0, 0xc($s1) -/* DF8F9C 8024259C 00A0802D */ daddu $s0, $a1, $zero -/* DF8FA0 802425A0 0C0B1EAF */ jal get_variable -/* DF8FA4 802425A4 8C450000 */ lw $a1, ($v0) -/* DF8FA8 802425A8 12000005 */ beqz $s0, .L802425C0 -/* DF8FAC 802425AC 0040902D */ daddu $s2, $v0, $zero -/* DF8FB0 802425B0 2402FFFF */ addiu $v0, $zero, -1 -/* DF8FB4 802425B4 AE200084 */ sw $zero, 0x84($s1) -/* DF8FB8 802425B8 AE220088 */ sw $v0, 0x88($s1) -/* DF8FBC 802425BC AE20008C */ sw $zero, 0x8c($s1) -.L802425C0: -/* DF8FC0 802425C0 8E230084 */ lw $v1, 0x84($s1) -/* DF8FC4 802425C4 10600005 */ beqz $v1, .L802425DC -/* DF8FC8 802425C8 24020001 */ addiu $v0, $zero, 1 -/* DF8FCC 802425CC 10620020 */ beq $v1, $v0, .L80242650 -/* DF8FD0 802425D0 0000102D */ daddu $v0, $zero, $zero -/* DF8FD4 802425D4 0809099A */ j .L80242668 -/* DF8FD8 802425D8 00000000 */ nop -.L802425DC: -/* DF8FDC 802425DC 2410FFFF */ addiu $s0, $zero, -1 -.L802425E0: -/* DF8FE0 802425E0 8E22008C */ lw $v0, 0x8c($s1) -/* DF8FE4 802425E4 000218C0 */ sll $v1, $v0, 3 -/* DF8FE8 802425E8 00621823 */ subu $v1, $v1, $v0 -/* DF8FEC 802425EC 000318C0 */ sll $v1, $v1, 3 -/* DF8FF0 802425F0 00722021 */ addu $a0, $v1, $s2 -/* DF8FF4 802425F4 8C820000 */ lw $v0, ($a0) -/* DF8FF8 802425F8 10400003 */ beqz $v0, .L80242608 -/* DF8FFC 802425FC 00000000 */ nop -/* DF9000 80242600 0C0908D6 */ jal func_80242358 -/* DF9004 80242604 00000000 */ nop -.L80242608: -/* DF9008 80242608 8E23008C */ lw $v1, 0x8c($s1) -/* DF900C 8024260C 000310C0 */ sll $v0, $v1, 3 -/* DF9010 80242610 00431023 */ subu $v0, $v0, $v1 -/* DF9014 80242614 000210C0 */ sll $v0, $v0, 3 -/* DF9018 80242618 00521021 */ addu $v0, $v0, $s2 -/* DF901C 8024261C 8C420030 */ lw $v0, 0x30($v0) -/* DF9020 80242620 AE220088 */ sw $v0, 0x88($s1) -/* DF9024 80242624 0060102D */ daddu $v0, $v1, $zero -/* DF9028 80242628 8E230088 */ lw $v1, 0x88($s1) -/* DF902C 8024262C 24420001 */ addiu $v0, $v0, 1 -/* DF9030 80242630 1C600005 */ bgtz $v1, .L80242648 -/* DF9034 80242634 AE22008C */ sw $v0, 0x8c($s1) -/* DF9038 80242638 1470FFE9 */ bne $v1, $s0, .L802425E0 -/* DF903C 8024263C 24020002 */ addiu $v0, $zero, 2 -/* DF9040 80242640 0809099A */ j .L80242668 -/* DF9044 80242644 00000000 */ nop -.L80242648: -/* DF9048 80242648 24020001 */ addiu $v0, $zero, 1 -/* DF904C 8024264C AE220084 */ sw $v0, 0x84($s1) -.L80242650: -/* DF9050 80242650 8E220088 */ lw $v0, 0x88($s1) -/* DF9054 80242654 2442FFFF */ addiu $v0, $v0, -1 -/* DF9058 80242658 1C400002 */ bgtz $v0, .L80242664 -/* DF905C 8024265C AE220088 */ sw $v0, 0x88($s1) -/* DF9060 80242660 AE200084 */ sw $zero, 0x84($s1) -.L80242664: -/* DF9064 80242664 0000102D */ daddu $v0, $zero, $zero -.L80242668: -/* DF9068 80242668 8FBF001C */ lw $ra, 0x1c($sp) -/* DF906C 8024266C 8FB20018 */ lw $s2, 0x18($sp) -/* DF9070 80242670 8FB10014 */ lw $s1, 0x14($sp) -/* DF9074 80242674 8FB00010 */ lw $s0, 0x10($sp) -/* DF9078 80242678 03E00008 */ jr $ra -/* DF907C 8024267C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580_DF8F80.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580_DF8F80.s new file mode 100644 index 0000000000..aa91a20c11 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242580_DF8F80.s @@ -0,0 +1,76 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242580_DF8F80 +/* DF8F80 80242580 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DF8F84 80242584 AFB10014 */ sw $s1, 0x14($sp) +/* DF8F88 80242588 0080882D */ daddu $s1, $a0, $zero +/* DF8F8C 8024258C AFBF001C */ sw $ra, 0x1c($sp) +/* DF8F90 80242590 AFB20018 */ sw $s2, 0x18($sp) +/* DF8F94 80242594 AFB00010 */ sw $s0, 0x10($sp) +/* DF8F98 80242598 8E22000C */ lw $v0, 0xc($s1) +/* DF8F9C 8024259C 00A0802D */ daddu $s0, $a1, $zero +/* DF8FA0 802425A0 0C0B1EAF */ jal get_variable +/* DF8FA4 802425A4 8C450000 */ lw $a1, ($v0) +/* DF8FA8 802425A8 12000005 */ beqz $s0, .L802425C0 +/* DF8FAC 802425AC 0040902D */ daddu $s2, $v0, $zero +/* DF8FB0 802425B0 2402FFFF */ addiu $v0, $zero, -1 +/* DF8FB4 802425B4 AE200084 */ sw $zero, 0x84($s1) +/* DF8FB8 802425B8 AE220088 */ sw $v0, 0x88($s1) +/* DF8FBC 802425BC AE20008C */ sw $zero, 0x8c($s1) +.L802425C0: +/* DF8FC0 802425C0 8E230084 */ lw $v1, 0x84($s1) +/* DF8FC4 802425C4 10600005 */ beqz $v1, .L802425DC +/* DF8FC8 802425C8 24020001 */ addiu $v0, $zero, 1 +/* DF8FCC 802425CC 10620020 */ beq $v1, $v0, .L80242650 +/* DF8FD0 802425D0 0000102D */ daddu $v0, $zero, $zero +/* DF8FD4 802425D4 0809099A */ j .L80242668 +/* DF8FD8 802425D8 00000000 */ nop +.L802425DC: +/* DF8FDC 802425DC 2410FFFF */ addiu $s0, $zero, -1 +.L802425E0: +/* DF8FE0 802425E0 8E22008C */ lw $v0, 0x8c($s1) +/* DF8FE4 802425E4 000218C0 */ sll $v1, $v0, 3 +/* DF8FE8 802425E8 00621823 */ subu $v1, $v1, $v0 +/* DF8FEC 802425EC 000318C0 */ sll $v1, $v1, 3 +/* DF8FF0 802425F0 00722021 */ addu $a0, $v1, $s2 +/* DF8FF4 802425F4 8C820000 */ lw $v0, ($a0) +/* DF8FF8 802425F8 10400003 */ beqz $v0, .L80242608 +/* DF8FFC 802425FC 00000000 */ nop +/* DF9000 80242600 0C0908D6 */ jal func_80242358_DF8D58 +/* DF9004 80242604 00000000 */ nop +.L80242608: +/* DF9008 80242608 8E23008C */ lw $v1, 0x8c($s1) +/* DF900C 8024260C 000310C0 */ sll $v0, $v1, 3 +/* DF9010 80242610 00431023 */ subu $v0, $v0, $v1 +/* DF9014 80242614 000210C0 */ sll $v0, $v0, 3 +/* DF9018 80242618 00521021 */ addu $v0, $v0, $s2 +/* DF901C 8024261C 8C420030 */ lw $v0, 0x30($v0) +/* DF9020 80242620 AE220088 */ sw $v0, 0x88($s1) +/* DF9024 80242624 0060102D */ daddu $v0, $v1, $zero +/* DF9028 80242628 8E230088 */ lw $v1, 0x88($s1) +/* DF902C 8024262C 24420001 */ addiu $v0, $v0, 1 +/* DF9030 80242630 1C600005 */ bgtz $v1, .L80242648 +/* DF9034 80242634 AE22008C */ sw $v0, 0x8c($s1) +/* DF9038 80242638 1470FFE9 */ bne $v1, $s0, .L802425E0 +/* DF903C 8024263C 24020002 */ addiu $v0, $zero, 2 +/* DF9040 80242640 0809099A */ j .L80242668 +/* DF9044 80242644 00000000 */ nop +.L80242648: +/* DF9048 80242648 24020001 */ addiu $v0, $zero, 1 +/* DF904C 8024264C AE220084 */ sw $v0, 0x84($s1) +.L80242650: +/* DF9050 80242650 8E220088 */ lw $v0, 0x88($s1) +/* DF9054 80242654 2442FFFF */ addiu $v0, $v0, -1 +/* DF9058 80242658 1C400002 */ bgtz $v0, .L80242664 +/* DF905C 8024265C AE220088 */ sw $v0, 0x88($s1) +/* DF9060 80242660 AE200084 */ sw $zero, 0x84($s1) +.L80242664: +/* DF9064 80242664 0000102D */ daddu $v0, $zero, $zero +.L80242668: +/* DF9068 80242668 8FBF001C */ lw $ra, 0x1c($sp) +/* DF906C 8024266C 8FB20018 */ lw $s2, 0x18($sp) +/* DF9070 80242670 8FB10014 */ lw $s1, 0x14($sp) +/* DF9074 80242674 8FB00010 */ lw $s0, 0x10($sp) +/* DF9078 80242678 03E00008 */ jr $ra +/* DF907C 8024267C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427D8.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427D8.s deleted file mode 100644 index 687d790e17..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427D8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427D8 -/* DF91D8 802427D8 3C04800B */ lui $a0, %hi(gCameras) -/* DF91DC 802427DC 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* DF91E0 802427E0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* DF91E4 802427E4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* DF91E8 802427E8 3C013F2A */ lui $at, 0x3f2a -/* DF91EC 802427EC 3421AAAB */ ori $at, $at, 0xaaab -/* DF91F0 802427F0 44810000 */ mtc1 $at, $f0 -/* DF91F4 802427F4 00031080 */ sll $v0, $v1, 2 -/* DF91F8 802427F8 00431021 */ addu $v0, $v0, $v1 -/* DF91FC 802427FC 00021080 */ sll $v0, $v0, 2 -/* DF9200 80242800 00431023 */ subu $v0, $v0, $v1 -/* DF9204 80242804 000218C0 */ sll $v1, $v0, 3 -/* DF9208 80242808 00431021 */ addu $v0, $v0, $v1 -/* DF920C 8024280C 000210C0 */ sll $v0, $v0, 3 -/* DF9210 80242810 00441021 */ addu $v0, $v0, $a0 -/* DF9214 80242814 C44204B0 */ lwc1 $f2, 0x4b0($v0) -/* DF9218 80242818 46001080 */ add.s $f2, $f2, $f0 -/* DF921C 8024281C 24030001 */ addiu $v1, $zero, 1 -/* DF9220 80242820 A4430506 */ sh $v1, 0x506($v0) -/* DF9224 80242824 E44204B0 */ swc1 $f2, 0x4b0($v0) -/* DF9228 80242828 03E00008 */ jr $ra -/* DF922C 8024282C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427D8_DF91D8.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427D8_DF91D8.s new file mode 100644 index 0000000000..8cfd744547 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_802427D8_DF91D8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427D8_DF91D8 +/* DF91D8 802427D8 3C04800B */ lui $a0, %hi(gCameras) +/* DF91DC 802427DC 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* DF91E0 802427E0 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* DF91E4 802427E4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* DF91E8 802427E8 3C013F2A */ lui $at, 0x3f2a +/* DF91EC 802427EC 3421AAAB */ ori $at, $at, 0xaaab +/* DF91F0 802427F0 44810000 */ mtc1 $at, $f0 +/* DF91F4 802427F4 00031080 */ sll $v0, $v1, 2 +/* DF91F8 802427F8 00431021 */ addu $v0, $v0, $v1 +/* DF91FC 802427FC 00021080 */ sll $v0, $v0, 2 +/* DF9200 80242800 00431023 */ subu $v0, $v0, $v1 +/* DF9204 80242804 000218C0 */ sll $v1, $v0, 3 +/* DF9208 80242808 00431021 */ addu $v0, $v0, $v1 +/* DF920C 8024280C 000210C0 */ sll $v0, $v0, 3 +/* DF9210 80242810 00441021 */ addu $v0, $v0, $a0 +/* DF9214 80242814 C44204B0 */ lwc1 $f2, 0x4b0($v0) +/* DF9218 80242818 46001080 */ add.s $f2, $f2, $f0 +/* DF921C 8024281C 24030001 */ addiu $v1, $zero, 1 +/* DF9220 80242820 A4430506 */ sh $v1, 0x506($v0) +/* DF9224 80242824 E44204B0 */ swc1 $f2, 0x4b0($v0) +/* DF9228 80242828 03E00008 */ jr $ra +/* DF922C 8024282C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830.s deleted file mode 100644 index 244b5f8c2e..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242830 -/* DF9230 80242830 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DF9234 80242834 AFB10014 */ sw $s1, 0x14($sp) -/* DF9238 80242838 0080882D */ daddu $s1, $a0, $zero -/* DF923C 8024283C AFBF0018 */ sw $ra, 0x18($sp) -/* DF9240 80242840 AFB00010 */ sw $s0, 0x10($sp) -/* DF9244 80242844 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DF9248 80242848 8E30000C */ lw $s0, 0xc($s1) -/* DF924C 8024284C 8E050000 */ lw $a1, ($s0) -/* DF9250 80242850 0C0B1EAF */ jal get_variable -/* DF9254 80242854 26100004 */ addiu $s0, $s0, 4 -/* DF9258 80242858 0220202D */ daddu $a0, $s1, $zero -/* DF925C 8024285C 8E050000 */ lw $a1, ($s0) -/* DF9260 80242860 0C0B210B */ jal get_float_variable -/* DF9264 80242864 0040802D */ daddu $s0, $v0, $zero -/* DF9268 80242868 0220202D */ daddu $a0, $s1, $zero -/* DF926C 8024286C 0200282D */ daddu $a1, $s0, $zero -/* DF9270 80242870 0C0B36B0 */ jal resolve_npc -/* DF9274 80242874 46000506 */ mov.s $f20, $f0 -/* DF9278 80242878 E454007C */ swc1 $f20, 0x7c($v0) -/* DF927C 8024287C 8FBF0018 */ lw $ra, 0x18($sp) -/* DF9280 80242880 8FB10014 */ lw $s1, 0x14($sp) -/* DF9284 80242884 8FB00010 */ lw $s0, 0x10($sp) -/* DF9288 80242888 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DF928C 8024288C 24020002 */ addiu $v0, $zero, 2 -/* DF9290 80242890 03E00008 */ jr $ra -/* DF9294 80242894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830_DF9230.s b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830_DF9230.s new file mode 100644 index 0000000000..fbd4ff339b --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242830_DF9230.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242830_DF9230 +/* DF9230 80242830 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* DF9234 80242834 AFB10014 */ sw $s1, 0x14($sp) +/* DF9238 80242838 0080882D */ daddu $s1, $a0, $zero +/* DF923C 8024283C AFBF0018 */ sw $ra, 0x18($sp) +/* DF9240 80242840 AFB00010 */ sw $s0, 0x10($sp) +/* DF9244 80242844 F7B40020 */ sdc1 $f20, 0x20($sp) +/* DF9248 80242848 8E30000C */ lw $s0, 0xc($s1) +/* DF924C 8024284C 8E050000 */ lw $a1, ($s0) +/* DF9250 80242850 0C0B1EAF */ jal get_variable +/* DF9254 80242854 26100004 */ addiu $s0, $s0, 4 +/* DF9258 80242858 0220202D */ daddu $a0, $s1, $zero +/* DF925C 8024285C 8E050000 */ lw $a1, ($s0) +/* DF9260 80242860 0C0B210B */ jal get_float_variable +/* DF9264 80242864 0040802D */ daddu $s0, $v0, $zero +/* DF9268 80242868 0220202D */ daddu $a0, $s1, $zero +/* DF926C 8024286C 0200282D */ daddu $a1, $s0, $zero +/* DF9270 80242870 0C0B36B0 */ jal resolve_npc +/* DF9274 80242874 46000506 */ mov.s $f20, $f0 +/* DF9278 80242878 E454007C */ swc1 $f20, 0x7c($v0) +/* DF927C 8024287C 8FBF0018 */ lw $ra, 0x18($sp) +/* DF9280 80242880 8FB10014 */ lw $s1, 0x14($sp) +/* DF9284 80242884 8FB00010 */ lw $s0, 0x10($sp) +/* DF9288 80242888 D7B40020 */ ldc1 $f20, 0x20($sp) +/* DF928C 8024288C 24020002 */ addiu $v0, $zero, 2 +/* DF9290 80242890 03E00008 */ jr $ra +/* DF9294 80242894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242900.s b/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242900.s deleted file mode 100644 index d90e54af50..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242900.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242900 -/* DF9300 80242900 27BDFF90 */ addiu $sp, $sp, -0x70 -/* DF9304 80242904 AFB10034 */ sw $s1, 0x34($sp) -/* DF9308 80242908 0080882D */ daddu $s1, $a0, $zero -/* DF930C 8024290C AFBF003C */ sw $ra, 0x3c($sp) -/* DF9310 80242910 AFB20038 */ sw $s2, 0x38($sp) -/* DF9314 80242914 AFB00030 */ sw $s0, 0x30($sp) -/* DF9318 80242918 F7BE0068 */ sdc1 $f30, 0x68($sp) -/* DF931C 8024291C F7BC0060 */ sdc1 $f28, 0x60($sp) -/* DF9320 80242920 F7BA0058 */ sdc1 $f26, 0x58($sp) -/* DF9324 80242924 F7B80050 */ sdc1 $f24, 0x50($sp) -/* DF9328 80242928 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DF932C 8024292C F7B40040 */ sdc1 $f20, 0x40($sp) -/* DF9330 80242930 8E30000C */ lw $s0, 0xc($s1) -/* DF9334 80242934 8E050000 */ lw $a1, ($s0) -/* DF9338 80242938 0C0B1EAF */ jal get_variable -/* DF933C 8024293C 26100004 */ addiu $s0, $s0, 4 -/* DF9340 80242940 8E050000 */ lw $a1, ($s0) -/* DF9344 80242944 26100004 */ addiu $s0, $s0, 4 -/* DF9348 80242948 0220202D */ daddu $a0, $s1, $zero -/* DF934C 8024294C 0C0B210B */ jal get_float_variable -/* DF9350 80242950 0040902D */ daddu $s2, $v0, $zero -/* DF9354 80242954 8E050000 */ lw $a1, ($s0) -/* DF9358 80242958 26100004 */ addiu $s0, $s0, 4 -/* DF935C 8024295C 0220202D */ daddu $a0, $s1, $zero -/* DF9360 80242960 0C0B210B */ jal get_float_variable -/* DF9364 80242964 46000706 */ mov.s $f28, $f0 -/* DF9368 80242968 8E050000 */ lw $a1, ($s0) -/* DF936C 8024296C 26100004 */ addiu $s0, $s0, 4 -/* DF9370 80242970 0220202D */ daddu $a0, $s1, $zero -/* DF9374 80242974 0C0B210B */ jal get_float_variable -/* DF9378 80242978 46000786 */ mov.s $f30, $f0 -/* DF937C 8024297C 8E050000 */ lw $a1, ($s0) -/* DF9380 80242980 26100004 */ addiu $s0, $s0, 4 -/* DF9384 80242984 0220202D */ daddu $a0, $s1, $zero -/* DF9388 80242988 0C0B210B */ jal get_float_variable -/* DF938C 8024298C 46000686 */ mov.s $f26, $f0 -/* DF9390 80242990 8E050000 */ lw $a1, ($s0) -/* DF9394 80242994 26100004 */ addiu $s0, $s0, 4 -/* DF9398 80242998 0220202D */ daddu $a0, $s1, $zero -/* DF939C 8024299C 0C0B210B */ jal get_float_variable -/* DF93A0 802429A0 46000606 */ mov.s $f24, $f0 -/* DF93A4 802429A4 8E050000 */ lw $a1, ($s0) -/* DF93A8 802429A8 26100004 */ addiu $s0, $s0, 4 -/* DF93AC 802429AC 0220202D */ daddu $a0, $s1, $zero -/* DF93B0 802429B0 0C0B210B */ jal get_float_variable -/* DF93B4 802429B4 46000586 */ mov.s $f22, $f0 -/* DF93B8 802429B8 0220202D */ daddu $a0, $s1, $zero -/* DF93BC 802429BC 8E050000 */ lw $a1, ($s0) -/* DF93C0 802429C0 0C0B1EAF */ jal get_variable -/* DF93C4 802429C4 46000506 */ mov.s $f20, $f0 -/* DF93C8 802429C8 4405E000 */ mfc1 $a1, $f28 -/* DF93CC 802429CC 4406F000 */ mfc1 $a2, $f30 -/* DF93D0 802429D0 4407D000 */ mfc1 $a3, $f26 -/* DF93D4 802429D4 0240202D */ daddu $a0, $s2, $zero -/* DF93D8 802429D8 AFA2001C */ sw $v0, 0x1c($sp) -/* DF93DC 802429DC 27A20028 */ addiu $v0, $sp, 0x28 -/* DF93E0 802429E0 E7B80010 */ swc1 $f24, 0x10($sp) -/* DF93E4 802429E4 E7B60014 */ swc1 $f22, 0x14($sp) -/* DF93E8 802429E8 E7B40018 */ swc1 $f20, 0x18($sp) -/* DF93EC 802429EC 0C01C3DC */ jal func_80070F70 -/* DF93F0 802429F0 AFA20020 */ sw $v0, 0x20($sp) -/* DF93F4 802429F4 8FA30028 */ lw $v1, 0x28($sp) -/* DF93F8 802429F8 AE230084 */ sw $v1, 0x84($s1) -/* DF93FC 802429FC 8FBF003C */ lw $ra, 0x3c($sp) -/* DF9400 80242A00 8FB20038 */ lw $s2, 0x38($sp) -/* DF9404 80242A04 8FB10034 */ lw $s1, 0x34($sp) -/* DF9408 80242A08 8FB00030 */ lw $s0, 0x30($sp) -/* DF940C 80242A0C D7BE0068 */ ldc1 $f30, 0x68($sp) -/* DF9410 80242A10 D7BC0060 */ ldc1 $f28, 0x60($sp) -/* DF9414 80242A14 D7BA0058 */ ldc1 $f26, 0x58($sp) -/* DF9418 80242A18 D7B80050 */ ldc1 $f24, 0x50($sp) -/* DF941C 80242A1C D7B60048 */ ldc1 $f22, 0x48($sp) -/* DF9420 80242A20 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DF9424 80242A24 24020002 */ addiu $v0, $zero, 2 -/* DF9428 80242A28 03E00008 */ jr $ra -/* DF942C 80242A2C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242900_DF9300.s b/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242900_DF9300.s new file mode 100644 index 0000000000..369d47fe08 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF9300/func_80242900_DF9300.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242900_DF9300 +/* DF9300 80242900 27BDFF90 */ addiu $sp, $sp, -0x70 +/* DF9304 80242904 AFB10034 */ sw $s1, 0x34($sp) +/* DF9308 80242908 0080882D */ daddu $s1, $a0, $zero +/* DF930C 8024290C AFBF003C */ sw $ra, 0x3c($sp) +/* DF9310 80242910 AFB20038 */ sw $s2, 0x38($sp) +/* DF9314 80242914 AFB00030 */ sw $s0, 0x30($sp) +/* DF9318 80242918 F7BE0068 */ sdc1 $f30, 0x68($sp) +/* DF931C 8024291C F7BC0060 */ sdc1 $f28, 0x60($sp) +/* DF9320 80242920 F7BA0058 */ sdc1 $f26, 0x58($sp) +/* DF9324 80242924 F7B80050 */ sdc1 $f24, 0x50($sp) +/* DF9328 80242928 F7B60048 */ sdc1 $f22, 0x48($sp) +/* DF932C 8024292C F7B40040 */ sdc1 $f20, 0x40($sp) +/* DF9330 80242930 8E30000C */ lw $s0, 0xc($s1) +/* DF9334 80242934 8E050000 */ lw $a1, ($s0) +/* DF9338 80242938 0C0B1EAF */ jal get_variable +/* DF933C 8024293C 26100004 */ addiu $s0, $s0, 4 +/* DF9340 80242940 8E050000 */ lw $a1, ($s0) +/* DF9344 80242944 26100004 */ addiu $s0, $s0, 4 +/* DF9348 80242948 0220202D */ daddu $a0, $s1, $zero +/* DF934C 8024294C 0C0B210B */ jal get_float_variable +/* DF9350 80242950 0040902D */ daddu $s2, $v0, $zero +/* DF9354 80242954 8E050000 */ lw $a1, ($s0) +/* DF9358 80242958 26100004 */ addiu $s0, $s0, 4 +/* DF935C 8024295C 0220202D */ daddu $a0, $s1, $zero +/* DF9360 80242960 0C0B210B */ jal get_float_variable +/* DF9364 80242964 46000706 */ mov.s $f28, $f0 +/* DF9368 80242968 8E050000 */ lw $a1, ($s0) +/* DF936C 8024296C 26100004 */ addiu $s0, $s0, 4 +/* DF9370 80242970 0220202D */ daddu $a0, $s1, $zero +/* DF9374 80242974 0C0B210B */ jal get_float_variable +/* DF9378 80242978 46000786 */ mov.s $f30, $f0 +/* DF937C 8024297C 8E050000 */ lw $a1, ($s0) +/* DF9380 80242980 26100004 */ addiu $s0, $s0, 4 +/* DF9384 80242984 0220202D */ daddu $a0, $s1, $zero +/* DF9388 80242988 0C0B210B */ jal get_float_variable +/* DF938C 8024298C 46000686 */ mov.s $f26, $f0 +/* DF9390 80242990 8E050000 */ lw $a1, ($s0) +/* DF9394 80242994 26100004 */ addiu $s0, $s0, 4 +/* DF9398 80242998 0220202D */ daddu $a0, $s1, $zero +/* DF939C 8024299C 0C0B210B */ jal get_float_variable +/* DF93A0 802429A0 46000606 */ mov.s $f24, $f0 +/* DF93A4 802429A4 8E050000 */ lw $a1, ($s0) +/* DF93A8 802429A8 26100004 */ addiu $s0, $s0, 4 +/* DF93AC 802429AC 0220202D */ daddu $a0, $s1, $zero +/* DF93B0 802429B0 0C0B210B */ jal get_float_variable +/* DF93B4 802429B4 46000586 */ mov.s $f22, $f0 +/* DF93B8 802429B8 0220202D */ daddu $a0, $s1, $zero +/* DF93BC 802429BC 8E050000 */ lw $a1, ($s0) +/* DF93C0 802429C0 0C0B1EAF */ jal get_variable +/* DF93C4 802429C4 46000506 */ mov.s $f20, $f0 +/* DF93C8 802429C8 4405E000 */ mfc1 $a1, $f28 +/* DF93CC 802429CC 4406F000 */ mfc1 $a2, $f30 +/* DF93D0 802429D0 4407D000 */ mfc1 $a3, $f26 +/* DF93D4 802429D4 0240202D */ daddu $a0, $s2, $zero +/* DF93D8 802429D8 AFA2001C */ sw $v0, 0x1c($sp) +/* DF93DC 802429DC 27A20028 */ addiu $v0, $sp, 0x28 +/* DF93E0 802429E0 E7B80010 */ swc1 $f24, 0x10($sp) +/* DF93E4 802429E4 E7B60014 */ swc1 $f22, 0x14($sp) +/* DF93E8 802429E8 E7B40018 */ swc1 $f20, 0x18($sp) +/* DF93EC 802429EC 0C01C3DC */ jal func_80070F70 +/* DF93F0 802429F0 AFA20020 */ sw $v0, 0x20($sp) +/* DF93F4 802429F4 8FA30028 */ lw $v1, 0x28($sp) +/* DF93F8 802429F8 AE230084 */ sw $v1, 0x84($s1) +/* DF93FC 802429FC 8FBF003C */ lw $ra, 0x3c($sp) +/* DF9400 80242A00 8FB20038 */ lw $s2, 0x38($sp) +/* DF9404 80242A04 8FB10034 */ lw $s1, 0x34($sp) +/* DF9408 80242A08 8FB00030 */ lw $s0, 0x30($sp) +/* DF940C 80242A0C D7BE0068 */ ldc1 $f30, 0x68($sp) +/* DF9410 80242A10 D7BC0060 */ ldc1 $f28, 0x60($sp) +/* DF9414 80242A14 D7BA0058 */ ldc1 $f26, 0x58($sp) +/* DF9418 80242A18 D7B80050 */ ldc1 $f24, 0x50($sp) +/* DF941C 80242A1C D7B60048 */ ldc1 $f22, 0x48($sp) +/* DF9420 80242A20 D7B40040 */ ldc1 $f20, 0x40($sp) +/* DF9424 80242A24 24020002 */ addiu $v0, $zero, 2 +/* DF9428 80242A28 03E00008 */ jr $ra +/* DF942C 80242A2C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10.s b/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10.s deleted file mode 100644 index 8563d04564..0000000000 --- a/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B10 -/* DF9510 80242B10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF9514 80242B14 AFBF0010 */ sw $ra, 0x10($sp) -/* DF9518 80242B18 8C82000C */ lw $v0, 0xc($a0) -/* DF951C 80242B1C 0C0B1EAF */ jal get_variable -/* DF9520 80242B20 8C450000 */ lw $a1, ($v0) -/* DF9524 80242B24 8FBF0010 */ lw $ra, 0x10($sp) -/* DF9528 80242B28 3C018025 */ lui $at, 0x8025 -/* DF952C 80242B2C AC229D60 */ sw $v0, -0x62a0($at) -/* DF9530 80242B30 24020002 */ addiu $v0, $zero, 2 -/* DF9534 80242B34 03E00008 */ jr $ra -/* DF9538 80242B38 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF953C 80242B3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s b/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s new file mode 100644 index 0000000000..d5e687f5be --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_00/DF9510/func_80242B10_DF9510.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B10_DF9510 +/* DF9510 80242B10 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DF9514 80242B14 AFBF0010 */ sw $ra, 0x10($sp) +/* DF9518 80242B18 8C82000C */ lw $v0, 0xc($a0) +/* DF951C 80242B1C 0C0B1EAF */ jal get_variable +/* DF9520 80242B20 8C450000 */ lw $a1, ($v0) +/* DF9524 80242B24 8FBF0010 */ lw $ra, 0x10($sp) +/* DF9528 80242B28 3C018025 */ lui $at, 0x8025 +/* DF952C 80242B2C AC229D60 */ sw $v0, -0x62a0($at) +/* DF9530 80242B30 24020002 */ addiu $v0, $zero, 2 +/* DF9534 80242B34 03E00008 */ jr $ra +/* DF9538 80242B38 27BD0018 */ addiu $sp, $sp, 0x18 +/* DF953C 80242B3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC.s deleted file mode 100644 index 03df81e54f..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC.s +++ /dev/null @@ -1,124 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FFC -/* E0635C 80240FFC 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* E06360 80241000 AFB00088 */ sw $s0, 0x88($sp) -/* E06364 80241004 00A0802D */ daddu $s0, $a1, $zero -/* E06368 80241008 0000202D */ daddu $a0, $zero, $zero -/* E0636C 8024100C 0080282D */ daddu $a1, $a0, $zero -/* E06370 80241010 0080302D */ daddu $a2, $a0, $zero -/* E06374 80241014 0080382D */ daddu $a3, $a0, $zero -/* E06378 80241018 AFBF00A0 */ sw $ra, 0xa0($sp) -/* E0637C 8024101C AFB5009C */ sw $s5, 0x9c($sp) -/* E06380 80241020 AFB40098 */ sw $s4, 0x98($sp) -/* E06384 80241024 AFB30094 */ sw $s3, 0x94($sp) -/* E06388 80241028 AFB20090 */ sw $s2, 0x90($sp) -/* E0638C 8024102C AFB1008C */ sw $s1, 0x8c($sp) -/* E06390 80241030 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* E06394 80241034 F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* E06398 80241038 C6140010 */ lwc1 $f20, 0x10($s0) -/* E0639C 8024103C 4680A520 */ cvt.s.w $f20, $f20 -/* E063A0 80241040 C6160014 */ lwc1 $f22, 0x14($s0) -/* E063A4 80241044 4680B5A0 */ cvt.s.w $f22, $f22 -/* E063A8 80241048 AFA00010 */ sw $zero, 0x10($sp) -/* E063AC 8024104C AFA00014 */ sw $zero, 0x14($sp) -/* E063B0 80241050 0C04EAA7 */ jal func_8013AA9C -/* E063B4 80241054 AFA00018 */ sw $zero, 0x18($sp) -/* E063B8 80241058 27B40048 */ addiu $s4, $sp, 0x48 -/* E063BC 8024105C 0280202D */ daddu $a0, $s4, $zero -/* E063C0 80241060 0000382D */ daddu $a3, $zero, $zero -/* E063C4 80241064 3C150001 */ lui $s5, 1 -/* E063C8 80241068 4600B587 */ neg.s $f22, $f22 -/* E063CC 8024106C 4405A000 */ mfc1 $a1, $f20 -/* E063D0 80241070 4406B000 */ mfc1 $a2, $f22 -/* E063D4 80241074 0C019E40 */ jal guTranslateF -/* E063D8 80241078 36B51630 */ ori $s5, $s5, 0x1630 -/* E063DC 8024107C 0280202D */ daddu $a0, $s4, $zero -/* E063E0 80241080 3C118007 */ lui $s1, 0x8007 -/* E063E4 80241084 263141F0 */ addiu $s1, $s1, 0x41f0 -/* E063E8 80241088 3C12800A */ lui $s2, 0x800a -/* E063EC 8024108C 2652A674 */ addiu $s2, $s2, -0x598c -/* E063F0 80241090 96250000 */ lhu $a1, ($s1) -/* E063F4 80241094 8E420000 */ lw $v0, ($s2) -/* E063F8 80241098 00052980 */ sll $a1, $a1, 6 -/* E063FC 8024109C 00B52821 */ addu $a1, $a1, $s5 -/* E06400 802410A0 0C019D40 */ jal guMtxF2L -/* 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, 0x800a -/* E06414 802410B4 2673A66C */ addiu $s3, $s3, -0x5994 -/* E06418 802410B8 8E680000 */ lw $t0, ($s3) -/* E0641C 802410BC 96290000 */ lhu $t1, ($s1) -/* E06420 802410C0 0100202D */ daddu $a0, $t0, $zero -/* E06424 802410C4 AC820000 */ sw $v0, ($a0) -/* E06428 802410C8 3122FFFF */ andi $v0, $t1, 0xffff -/* E0642C 802410CC 00021180 */ sll $v0, $v0, 6 -/* E06430 802410D0 00551021 */ addu $v0, $v0, $s5 -/* E06434 802410D4 8E430000 */ lw $v1, ($s2) -/* E06438 802410D8 25080008 */ addiu $t0, $t0, 8 -/* E0643C 802410DC 00621821 */ addu $v1, $v1, $v0 -/* E06440 802410E0 3C028000 */ lui $v0, 0x8000 -/* E06444 802410E4 00621821 */ addu $v1, $v1, $v0 -/* E06448 802410E8 27A20038 */ addiu $v0, $sp, 0x38 -/* E0644C 802410EC AC830004 */ sw $v1, 4($a0) -/* E06450 802410F0 AFA20010 */ sw $v0, 0x10($sp) -/* E06454 802410F4 8E040004 */ lw $a0, 4($s0) -/* E06458 802410F8 8E050008 */ lw $a1, 8($s0) -/* E0645C 802410FC 8E060000 */ lw $a2, ($s0) -/* E06460 80241100 8E07000C */ lw $a3, 0xc($s0) -/* E06464 80241104 25290001 */ addiu $t1, $t1, 1 -/* E06468 80241108 AE680000 */ sw $t0, ($s3) -/* E0646C 8024110C 0C04BA38 */ jal func_8012E8E0 -/* E06470 80241110 A6290000 */ sh $t1, ($s1) -/* E06474 80241114 0000202D */ daddu $a0, $zero, $zero -/* E06478 80241118 27A50020 */ addiu $a1, $sp, 0x20 -/* E0647C 8024111C 3C060005 */ lui $a2, 5 -/* E06480 80241120 34C60040 */ ori $a2, $a2, 0x40 -/* E06484 80241124 0280382D */ daddu $a3, $s4, $zero -/* E06488 80241128 93A20042 */ lbu $v0, 0x42($sp) -/* E0648C 8024112C 3C013FE0 */ lui $at, 0x3fe0 -/* E06490 80241130 44810800 */ mtc1 $at, $f1 -/* E06494 80241134 44800000 */ mtc1 $zero, $f0 -/* E06498 80241138 8FA30038 */ lw $v1, 0x38($sp) -/* E0649C 8024113C 8FA8003C */ lw $t0, 0x3c($sp) -/* E064A0 80241140 93A90040 */ lbu $t1, 0x40($sp) -/* E064A4 80241144 93AA0041 */ lbu $t2, 0x41($sp) -/* E064A8 80241148 44821000 */ mtc1 $v0, $f2 -/* E064AC 8024114C 00000000 */ nop -/* E064B0 80241150 468010A1 */ cvt.d.w $f2, $f2 -/* E064B4 80241154 46201082 */ mul.d $f2, $f2, $f0 -/* 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) -/* E064C8 80241168 AFA30020 */ sw $v1, 0x20($sp) -/* E064CC 8024116C AFA80024 */ sw $t0, 0x24($sp) -/* E064D0 80241170 A7A90028 */ sh $t1, 0x28($sp) -/* E064D4 80241174 A7AA002A */ sh $t2, 0x2a($sp) -/* E064D8 80241178 46201087 */ neg.d $f2, $f2 -/* E064DC 8024117C 4620110D */ trunc.w.d $f4, $f2 -/* E064E0 80241180 44022000 */ mfc1 $v0, $f4 -/* E064E4 80241184 0C04EBDC */ jal func_8013AF70 -/* E064E8 80241188 A7A2002C */ sh $v0, 0x2c($sp) -/* E064EC 8024118C 3C04D838 */ lui $a0, 0xd838 -/* E064F0 80241190 8E620000 */ lw $v0, ($s3) -/* E064F4 80241194 34840002 */ ori $a0, $a0, 2 -/* E064F8 80241198 0040182D */ daddu $v1, $v0, $zero -/* E064FC 8024119C 24420008 */ addiu $v0, $v0, 8 -/* E06500 802411A0 AE620000 */ sw $v0, ($s3) -/* E06504 802411A4 24020040 */ addiu $v0, $zero, 0x40 -/* E06508 802411A8 AC640000 */ sw $a0, ($v1) -/* E0650C 802411AC AC620004 */ sw $v0, 4($v1) -/* E06510 802411B0 8FBF00A0 */ lw $ra, 0xa0($sp) -/* E06514 802411B4 8FB5009C */ lw $s5, 0x9c($sp) -/* E06518 802411B8 8FB40098 */ lw $s4, 0x98($sp) -/* E0651C 802411BC 8FB30094 */ lw $s3, 0x94($sp) -/* E06520 802411C0 8FB20090 */ lw $s2, 0x90($sp) -/* E06524 802411C4 8FB1008C */ lw $s1, 0x8c($sp) -/* E06528 802411C8 8FB00088 */ lw $s0, 0x88($sp) -/* E0652C 802411CC D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* E06530 802411D0 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* E06534 802411D4 03E00008 */ jr $ra -/* E06538 802411D8 27BD00B8 */ addiu $sp, $sp, 0xb8 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 new file mode 100644 index 0000000000..8675ead701 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80240FFC_E0635C.s @@ -0,0 +1,124 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FFC_E0635C +/* E0635C 80240FFC 27BDFF48 */ addiu $sp, $sp, -0xb8 +/* E06360 80241000 AFB00088 */ sw $s0, 0x88($sp) +/* E06364 80241004 00A0802D */ daddu $s0, $a1, $zero +/* E06368 80241008 0000202D */ daddu $a0, $zero, $zero +/* E0636C 8024100C 0080282D */ daddu $a1, $a0, $zero +/* E06370 80241010 0080302D */ daddu $a2, $a0, $zero +/* E06374 80241014 0080382D */ daddu $a3, $a0, $zero +/* E06378 80241018 AFBF00A0 */ sw $ra, 0xa0($sp) +/* E0637C 8024101C AFB5009C */ sw $s5, 0x9c($sp) +/* E06380 80241020 AFB40098 */ sw $s4, 0x98($sp) +/* E06384 80241024 AFB30094 */ sw $s3, 0x94($sp) +/* E06388 80241028 AFB20090 */ sw $s2, 0x90($sp) +/* E0638C 8024102C AFB1008C */ sw $s1, 0x8c($sp) +/* E06390 80241030 F7B600B0 */ sdc1 $f22, 0xb0($sp) +/* E06394 80241034 F7B400A8 */ sdc1 $f20, 0xa8($sp) +/* E06398 80241038 C6140010 */ lwc1 $f20, 0x10($s0) +/* E0639C 8024103C 4680A520 */ cvt.s.w $f20, $f20 +/* E063A0 80241040 C6160014 */ lwc1 $f22, 0x14($s0) +/* E063A4 80241044 4680B5A0 */ cvt.s.w $f22, $f22 +/* E063A8 80241048 AFA00010 */ sw $zero, 0x10($sp) +/* E063AC 8024104C AFA00014 */ sw $zero, 0x14($sp) +/* E063B0 80241050 0C04EAA7 */ jal func_8013AA9C +/* E063B4 80241054 AFA00018 */ sw $zero, 0x18($sp) +/* E063B8 80241058 27B40048 */ addiu $s4, $sp, 0x48 +/* E063BC 8024105C 0280202D */ daddu $a0, $s4, $zero +/* E063C0 80241060 0000382D */ daddu $a3, $zero, $zero +/* E063C4 80241064 3C150001 */ lui $s5, 1 +/* E063C8 80241068 4600B587 */ neg.s $f22, $f22 +/* E063CC 8024106C 4405A000 */ mfc1 $a1, $f20 +/* E063D0 80241070 4406B000 */ mfc1 $a2, $f22 +/* E063D4 80241074 0C019E40 */ jal guTranslateF +/* E063D8 80241078 36B51630 */ ori $s5, $s5, 0x1630 +/* E063DC 8024107C 0280202D */ daddu $a0, $s4, $zero +/* E063E0 80241080 3C118007 */ lui $s1, 0x8007 +/* E063E4 80241084 263141F0 */ addiu $s1, $s1, 0x41f0 +/* E063E8 80241088 3C12800A */ lui $s2, 0x800a +/* E063EC 8024108C 2652A674 */ addiu $s2, $s2, -0x598c +/* E063F0 80241090 96250000 */ lhu $a1, ($s1) +/* E063F4 80241094 8E420000 */ lw $v0, ($s2) +/* E063F8 80241098 00052980 */ sll $a1, $a1, 6 +/* E063FC 8024109C 00B52821 */ addu $a1, $a1, $s5 +/* E06400 802410A0 0C019D40 */ jal guMtxF2L +/* 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, 0x800a +/* E06414 802410B4 2673A66C */ addiu $s3, $s3, -0x5994 +/* E06418 802410B8 8E680000 */ lw $t0, ($s3) +/* E0641C 802410BC 96290000 */ lhu $t1, ($s1) +/* E06420 802410C0 0100202D */ daddu $a0, $t0, $zero +/* E06424 802410C4 AC820000 */ sw $v0, ($a0) +/* E06428 802410C8 3122FFFF */ andi $v0, $t1, 0xffff +/* E0642C 802410CC 00021180 */ sll $v0, $v0, 6 +/* E06430 802410D0 00551021 */ addu $v0, $v0, $s5 +/* E06434 802410D4 8E430000 */ lw $v1, ($s2) +/* E06438 802410D8 25080008 */ addiu $t0, $t0, 8 +/* E0643C 802410DC 00621821 */ addu $v1, $v1, $v0 +/* E06440 802410E0 3C028000 */ lui $v0, 0x8000 +/* E06444 802410E4 00621821 */ addu $v1, $v1, $v0 +/* E06448 802410E8 27A20038 */ addiu $v0, $sp, 0x38 +/* E0644C 802410EC AC830004 */ sw $v1, 4($a0) +/* E06450 802410F0 AFA20010 */ sw $v0, 0x10($sp) +/* E06454 802410F4 8E040004 */ lw $a0, 4($s0) +/* E06458 802410F8 8E050008 */ lw $a1, 8($s0) +/* E0645C 802410FC 8E060000 */ lw $a2, ($s0) +/* E06460 80241100 8E07000C */ lw $a3, 0xc($s0) +/* E06464 80241104 25290001 */ addiu $t1, $t1, 1 +/* E06468 80241108 AE680000 */ sw $t0, ($s3) +/* E0646C 8024110C 0C04BA38 */ jal func_8012E8E0 +/* E06470 80241110 A6290000 */ sh $t1, ($s1) +/* E06474 80241114 0000202D */ daddu $a0, $zero, $zero +/* E06478 80241118 27A50020 */ addiu $a1, $sp, 0x20 +/* E0647C 8024111C 3C060005 */ lui $a2, 5 +/* E06480 80241120 34C60040 */ ori $a2, $a2, 0x40 +/* E06484 80241124 0280382D */ daddu $a3, $s4, $zero +/* E06488 80241128 93A20042 */ lbu $v0, 0x42($sp) +/* E0648C 8024112C 3C013FE0 */ lui $at, 0x3fe0 +/* E06490 80241130 44810800 */ mtc1 $at, $f1 +/* E06494 80241134 44800000 */ mtc1 $zero, $f0 +/* E06498 80241138 8FA30038 */ lw $v1, 0x38($sp) +/* E0649C 8024113C 8FA8003C */ lw $t0, 0x3c($sp) +/* E064A0 80241140 93A90040 */ lbu $t1, 0x40($sp) +/* E064A4 80241144 93AA0041 */ lbu $t2, 0x41($sp) +/* E064A8 80241148 44821000 */ mtc1 $v0, $f2 +/* E064AC 8024114C 00000000 */ nop +/* E064B0 80241150 468010A1 */ cvt.d.w $f2, $f2 +/* E064B4 80241154 46201082 */ mul.d $f2, $f2, $f0 +/* 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) +/* E064C8 80241168 AFA30020 */ sw $v1, 0x20($sp) +/* E064CC 8024116C AFA80024 */ sw $t0, 0x24($sp) +/* E064D0 80241170 A7A90028 */ sh $t1, 0x28($sp) +/* E064D4 80241174 A7AA002A */ sh $t2, 0x2a($sp) +/* E064D8 80241178 46201087 */ neg.d $f2, $f2 +/* E064DC 8024117C 4620110D */ trunc.w.d $f4, $f2 +/* E064E0 80241180 44022000 */ mfc1 $v0, $f4 +/* E064E4 80241184 0C04EBDC */ jal func_8013AF70 +/* E064E8 80241188 A7A2002C */ sh $v0, 0x2c($sp) +/* E064EC 8024118C 3C04D838 */ lui $a0, 0xd838 +/* E064F0 80241190 8E620000 */ lw $v0, ($s3) +/* E064F4 80241194 34840002 */ ori $a0, $a0, 2 +/* E064F8 80241198 0040182D */ daddu $v1, $v0, $zero +/* E064FC 8024119C 24420008 */ addiu $v0, $v0, 8 +/* E06500 802411A0 AE620000 */ sw $v0, ($s3) +/* E06504 802411A4 24020040 */ addiu $v0, $zero, 0x40 +/* E06508 802411A8 AC640000 */ sw $a0, ($v1) +/* E0650C 802411AC AC620004 */ sw $v0, 4($v1) +/* E06510 802411B0 8FBF00A0 */ lw $ra, 0xa0($sp) +/* E06514 802411B4 8FB5009C */ lw $s5, 0x9c($sp) +/* E06518 802411B8 8FB40098 */ lw $s4, 0x98($sp) +/* E0651C 802411BC 8FB30094 */ lw $s3, 0x94($sp) +/* E06520 802411C0 8FB20090 */ lw $s2, 0x90($sp) +/* E06524 802411C4 8FB1008C */ lw $s1, 0x8c($sp) +/* E06528 802411C8 8FB00088 */ lw $s0, 0x88($sp) +/* E0652C 802411CC D7B600B0 */ ldc1 $f22, 0xb0($sp) +/* E06530 802411D0 D7B400A8 */ ldc1 $f20, 0xa8($sp) +/* E06534 802411D4 03E00008 */ jr $ra +/* E06538 802411D8 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC.s deleted file mode 100644 index d03626d82d..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411DC -/* E0653C 802411DC 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* E06540 802411E0 00A0102D */ daddu $v0, $a1, $zero -/* E06544 802411E4 27A30038 */ addiu $v1, $sp, 0x38 -/* E06548 802411E8 AFBF0048 */ sw $ra, 0x48($sp) -/* E0654C 802411EC F7B60058 */ sdc1 $f22, 0x58($sp) -/* E06550 802411F0 F7B40050 */ sdc1 $f20, 0x50($sp) -/* E06554 802411F4 C4540010 */ lwc1 $f20, 0x10($v0) -/* E06558 802411F8 4680A520 */ cvt.s.w $f20, $f20 -/* E0655C 802411FC C4560014 */ lwc1 $f22, 0x14($v0) -/* E06560 80241200 4680B5A0 */ cvt.s.w $f22, $f22 -/* E06564 80241204 AFA30010 */ sw $v1, 0x10($sp) -/* E06568 80241208 8C440004 */ lw $a0, 4($v0) -/* E0656C 8024120C 8C450008 */ lw $a1, 8($v0) -/* E06570 80241210 8C460000 */ lw $a2, ($v0) -/* E06574 80241214 0C04BA38 */ jal func_8012E8E0 -/* E06578 80241218 8C47000C */ lw $a3, 0xc($v0) -/* E0657C 8024121C 4600A00D */ trunc.w.s $f0, $f20 -/* E06580 80241220 44020000 */ mfc1 $v0, $f0 -/* E06584 80241224 93A50040 */ lbu $a1, 0x40($sp) -/* E06588 80241228 93A60041 */ lbu $a2, 0x41($sp) -/* E0658C 8024122C 00021400 */ sll $v0, $v0, 0x10 -/* E06590 80241230 AFA00010 */ sw $zero, 0x10($sp) -/* E06594 80241234 8FA3003C */ lw $v1, 0x3c($sp) -/* E06598 80241238 00021403 */ sra $v0, $v0, 0x10 -/* E0659C 8024123C AFA20018 */ sw $v0, 0x18($sp) -/* E065A0 80241240 4600B00D */ trunc.w.s $f0, $f22 -/* E065A4 80241244 44020000 */ mfc1 $v0, $f0 -/* E065A8 80241248 00000000 */ nop -/* E065AC 8024124C 00021400 */ sll $v0, $v0, 0x10 -/* E065B0 80241250 00021403 */ sra $v0, $v0, 0x10 -/* E065B4 80241254 AFA2001C */ sw $v0, 0x1c($sp) -/* E065B8 80241258 2402000A */ addiu $v0, $zero, 0xa -/* E065BC 8024125C AFA20020 */ sw $v0, 0x20($sp) -/* E065C0 80241260 24020014 */ addiu $v0, $zero, 0x14 -/* E065C4 80241264 AFA20024 */ sw $v0, 0x24($sp) -/* E065C8 80241268 2402012C */ addiu $v0, $zero, 0x12c -/* E065CC 8024126C AFA20028 */ sw $v0, 0x28($sp) -/* E065D0 80241270 240200C8 */ addiu $v0, $zero, 0xc8 -/* E065D4 80241274 AFA2002C */ sw $v0, 0x2c($sp) -/* E065D8 80241278 240200FF */ addiu $v0, $zero, 0xff -/* E065DC 8024127C AFA20030 */ sw $v0, 0x30($sp) -/* E065E0 80241280 AFA30014 */ sw $v1, 0x14($sp) -/* E065E4 80241284 8FA40038 */ lw $a0, 0x38($sp) -/* E065E8 80241288 0C04BA68 */ jal func_8012E9A0 -/* E065EC 8024128C 24070002 */ addiu $a3, $zero, 2 -/* E065F0 80241290 8FBF0048 */ lw $ra, 0x48($sp) -/* E065F4 80241294 D7B60058 */ ldc1 $f22, 0x58($sp) -/* E065F8 80241298 D7B40050 */ ldc1 $f20, 0x50($sp) -/* E065FC 8024129C 03E00008 */ jr $ra -/* E06600 802412A0 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC_E0653C.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC_E0653C.s new file mode 100644 index 0000000000..e7c3283e16 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802411DC_E0653C.s @@ -0,0 +1,54 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411DC_E0653C +/* E0653C 802411DC 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* E06540 802411E0 00A0102D */ daddu $v0, $a1, $zero +/* E06544 802411E4 27A30038 */ addiu $v1, $sp, 0x38 +/* E06548 802411E8 AFBF0048 */ sw $ra, 0x48($sp) +/* E0654C 802411EC F7B60058 */ sdc1 $f22, 0x58($sp) +/* E06550 802411F0 F7B40050 */ sdc1 $f20, 0x50($sp) +/* E06554 802411F4 C4540010 */ lwc1 $f20, 0x10($v0) +/* E06558 802411F8 4680A520 */ cvt.s.w $f20, $f20 +/* E0655C 802411FC C4560014 */ lwc1 $f22, 0x14($v0) +/* E06560 80241200 4680B5A0 */ cvt.s.w $f22, $f22 +/* E06564 80241204 AFA30010 */ sw $v1, 0x10($sp) +/* E06568 80241208 8C440004 */ lw $a0, 4($v0) +/* E0656C 8024120C 8C450008 */ lw $a1, 8($v0) +/* E06570 80241210 8C460000 */ lw $a2, ($v0) +/* E06574 80241214 0C04BA38 */ jal func_8012E8E0 +/* E06578 80241218 8C47000C */ lw $a3, 0xc($v0) +/* E0657C 8024121C 4600A00D */ trunc.w.s $f0, $f20 +/* E06580 80241220 44020000 */ mfc1 $v0, $f0 +/* E06584 80241224 93A50040 */ lbu $a1, 0x40($sp) +/* E06588 80241228 93A60041 */ lbu $a2, 0x41($sp) +/* E0658C 8024122C 00021400 */ sll $v0, $v0, 0x10 +/* E06590 80241230 AFA00010 */ sw $zero, 0x10($sp) +/* E06594 80241234 8FA3003C */ lw $v1, 0x3c($sp) +/* E06598 80241238 00021403 */ sra $v0, $v0, 0x10 +/* E0659C 8024123C AFA20018 */ sw $v0, 0x18($sp) +/* E065A0 80241240 4600B00D */ trunc.w.s $f0, $f22 +/* E065A4 80241244 44020000 */ mfc1 $v0, $f0 +/* E065A8 80241248 00000000 */ nop +/* E065AC 8024124C 00021400 */ sll $v0, $v0, 0x10 +/* E065B0 80241250 00021403 */ sra $v0, $v0, 0x10 +/* E065B4 80241254 AFA2001C */ sw $v0, 0x1c($sp) +/* E065B8 80241258 2402000A */ addiu $v0, $zero, 0xa +/* E065BC 8024125C AFA20020 */ sw $v0, 0x20($sp) +/* E065C0 80241260 24020014 */ addiu $v0, $zero, 0x14 +/* E065C4 80241264 AFA20024 */ sw $v0, 0x24($sp) +/* E065C8 80241268 2402012C */ addiu $v0, $zero, 0x12c +/* E065CC 8024126C AFA20028 */ sw $v0, 0x28($sp) +/* E065D0 80241270 240200C8 */ addiu $v0, $zero, 0xc8 +/* E065D4 80241274 AFA2002C */ sw $v0, 0x2c($sp) +/* E065D8 80241278 240200FF */ addiu $v0, $zero, 0xff +/* E065DC 8024127C AFA20030 */ sw $v0, 0x30($sp) +/* E065E0 80241280 AFA30014 */ sw $v1, 0x14($sp) +/* E065E4 80241284 8FA40038 */ lw $a0, 0x38($sp) +/* E065E8 80241288 0C04BA68 */ jal func_8012E9A0 +/* E065EC 8024128C 24070002 */ addiu $a3, $zero, 2 +/* E065F0 80241290 8FBF0048 */ lw $ra, 0x48($sp) +/* E065F4 80241294 D7B60058 */ ldc1 $f22, 0x58($sp) +/* E065F8 80241298 D7B40050 */ ldc1 $f20, 0x50($sp) +/* E065FC 8024129C 03E00008 */ jr $ra +/* E06600 802412A0 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4.s deleted file mode 100644 index 3cf2f0211a..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412A4 -/* E06604 802412A4 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* E06608 802412A8 AFB00088 */ sw $s0, 0x88($sp) -/* E0660C 802412AC 00A0802D */ daddu $s0, $a1, $zero -/* E06610 802412B0 AFBF00A0 */ sw $ra, 0xa0($sp) -/* E06614 802412B4 AFB5009C */ sw $s5, 0x9c($sp) -/* E06618 802412B8 AFB40098 */ sw $s4, 0x98($sp) -/* E0661C 802412BC AFB30094 */ sw $s3, 0x94($sp) -/* E06620 802412C0 AFB20090 */ sw $s2, 0x90($sp) -/* E06624 802412C4 AFB1008C */ sw $s1, 0x8c($sp) -/* E06628 802412C8 F7BA00C0 */ sdc1 $f26, 0xc0($sp) -/* E0662C 802412CC F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* E06630 802412D0 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* E06634 802412D4 F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* E06638 802412D8 C6140010 */ lwc1 $f20, 0x10($s0) -/* E0663C 802412DC 4680A520 */ cvt.s.w $f20, $f20 -/* E06640 802412E0 4480C000 */ mtc1 $zero, $f24 -/* E06644 802412E4 3C05437F */ lui $a1, 0x437f -/* E06648 802412E8 8C820050 */ lw $v0, 0x50($a0) -/* E0664C 802412EC 4406C000 */ mfc1 $a2, $f24 -/* E06650 802412F0 C61A0014 */ lwc1 $f26, 0x14($s0) -/* E06654 802412F4 4680D6A0 */ cvt.s.w $f26, $f26 -/* E06658 802412F8 AFA20010 */ sw $v0, 0x10($sp) -/* E0665C 802412FC 8E070018 */ lw $a3, 0x18($s0) -/* E06660 80241300 0C00A8ED */ jal update_lerp -/* E06664 80241304 2404000B */ addiu $a0, $zero, 0xb -/* E06668 80241308 4600008D */ trunc.w.s $f2, $f0 -/* E0666C 8024130C E7A20014 */ swc1 $f2, 0x14($sp) -/* E06670 80241310 0000202D */ daddu $a0, $zero, $zero -/* E06674 80241314 24050007 */ addiu $a1, $zero, 7 -/* E06678 80241318 240600FF */ addiu $a2, $zero, 0xff -/* E0667C 8024131C 00C0382D */ daddu $a3, $a2, $zero -/* E06680 80241320 00C0A82D */ daddu $s5, $a2, $zero -/* E06684 80241324 AFB50010 */ sw $s5, 0x10($sp) -/* E06688 80241328 0C04EAA7 */ jal func_8013AA9C -/* E0668C 8024132C AFA00018 */ sw $zero, 0x18($sp) -/* E06690 80241330 27A20038 */ addiu $v0, $sp, 0x38 -/* E06694 80241334 AFA20010 */ sw $v0, 0x10($sp) -/* E06698 80241338 8E040004 */ lw $a0, 4($s0) -/* E0669C 8024133C 8E050008 */ lw $a1, 8($s0) -/* E066A0 80241340 8E060000 */ lw $a2, ($s0) -/* E066A4 80241344 8E07000C */ lw $a3, 0xc($s0) -/* E066A8 80241348 0C04BA38 */ jal func_8012E8E0 -/* E066AC 8024134C 3C140001 */ lui $s4, 1 -/* E066B0 80241350 93A20042 */ lbu $v0, 0x42($sp) -/* E066B4 80241354 3C013FE0 */ lui $at, 0x3fe0 -/* E066B8 80241358 4481B800 */ mtc1 $at, $f23 -/* E066BC 8024135C 4480B000 */ mtc1 $zero, $f22 -/* E066C0 80241360 44820000 */ mtc1 $v0, $f0 -/* E066C4 80241364 00000000 */ nop -/* E066C8 80241368 46800021 */ cvt.d.w $f0, $f0 -/* E066CC 8024136C 46360002 */ mul.d $f0, $f0, $f22 -/* 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 -/* E066E0 80241380 4600D687 */ neg.s $f26, $f26 -/* E066E4 80241384 4620A500 */ add.d $f20, $f20, $f0 -/* E066E8 80241388 4406D000 */ mfc1 $a2, $f26 -/* E066EC 8024138C 4407C000 */ mfc1 $a3, $f24 -/* E066F0 80241390 4620A520 */ cvt.s.d $f20, $f20 -/* E066F4 80241394 4405A000 */ mfc1 $a1, $f20 -/* E066F8 80241398 0C019E40 */ jal guTranslateF -/* E066FC 8024139C 0200202D */ daddu $a0, $s0, $zero -/* E06700 802413A0 0200202D */ daddu $a0, $s0, $zero -/* E06704 802413A4 3C128007 */ lui $s2, 0x8007 -/* E06708 802413A8 265241F0 */ addiu $s2, $s2, 0x41f0 -/* E0670C 802413AC 3C13800A */ lui $s3, 0x800a -/* E06710 802413B0 2673A674 */ addiu $s3, $s3, -0x598c -/* E06714 802413B4 96450000 */ lhu $a1, ($s2) -/* E06718 802413B8 8E620000 */ lw $v0, ($s3) -/* E0671C 802413BC 00052980 */ sll $a1, $a1, 6 -/* E06720 802413C0 00B42821 */ addu $a1, $a1, $s4 -/* E06724 802413C4 0C019D40 */ jal guMtxF2L -/* E06728 802413C8 00452821 */ addu $a1, $v0, $a1 -/* E0672C 802413CC 3C03DA38 */ lui $v1, 0xda38 -/* E06730 802413D0 34630002 */ ori $v1, $v1, 2 -/* E06734 802413D4 0000202D */ daddu $a0, $zero, $zero -/* 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, 0x800a -/* E06748 802413E8 2631A66C */ addiu $s1, $s1, -0x5994 -/* E0674C 802413EC 0200382D */ daddu $a3, $s0, $zero -/* E06750 802413F0 8E220000 */ lw $v0, ($s1) -/* E06754 802413F4 96480000 */ lhu $t0, ($s2) -/* E06758 802413F8 0040482D */ daddu $t1, $v0, $zero -/* E0675C 802413FC 24420008 */ addiu $v0, $v0, 8 -/* E06760 80241400 AE220000 */ sw $v0, ($s1) -/* E06764 80241404 3102FFFF */ andi $v0, $t0, 0xffff -/* E06768 80241408 00021180 */ sll $v0, $v0, 6 -/* E0676C 8024140C 00541021 */ addu $v0, $v0, $s4 -/* E06770 80241410 AD230000 */ sw $v1, ($t1) -/* E06774 80241414 8E630000 */ lw $v1, ($s3) -/* E06778 80241418 25080001 */ addiu $t0, $t0, 1 -/* E0677C 8024141C 00621821 */ addu $v1, $v1, $v0 -/* E06780 80241420 3C028000 */ lui $v0, 0x8000 -/* E06784 80241424 00621821 */ addu $v1, $v1, $v0 -/* E06788 80241428 AD230004 */ sw $v1, 4($t1) -/* E0678C 8024142C 93A20042 */ lbu $v0, 0x42($sp) -/* E06790 80241430 8FA3003C */ lw $v1, 0x3c($sp) -/* E06794 80241434 93A90040 */ lbu $t1, 0x40($sp) -/* E06798 80241438 93AA0041 */ lbu $t2, 0x41($sp) -/* E0679C 8024143C 44820000 */ mtc1 $v0, $f0 -/* 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 -/* E067B4 80241454 A6480000 */ sh $t0, ($s2) -/* E067B8 80241458 A7A0002E */ sh $zero, 0x2e($sp) -/* E067BC 8024145C A3B50030 */ sb $s5, 0x30($sp) -/* E067C0 80241460 AFA30024 */ sw $v1, 0x24($sp) -/* E067C4 80241464 A7A90028 */ sh $t1, 0x28($sp) -/* E067C8 80241468 A7AA002A */ sh $t2, 0x2a($sp) -/* E067CC 8024146C AFA20020 */ sw $v0, 0x20($sp) -/* E067D0 80241470 46200007 */ neg.d $f0, $f0 -/* E067D4 80241474 4620008D */ trunc.w.d $f2, $f0 -/* E067D8 80241478 44021000 */ mfc1 $v0, $f2 -/* E067DC 8024147C 0C04EBDC */ jal func_8013AF70 -/* E067E0 80241480 A7A2002C */ sh $v0, 0x2c($sp) -/* E067E4 80241484 3C04D838 */ lui $a0, 0xd838 -/* E067E8 80241488 8E220000 */ lw $v0, ($s1) -/* E067EC 8024148C 34840002 */ ori $a0, $a0, 2 -/* E067F0 80241490 0040182D */ daddu $v1, $v0, $zero -/* E067F4 80241494 24420008 */ addiu $v0, $v0, 8 -/* E067F8 80241498 AE220000 */ sw $v0, ($s1) -/* E067FC 8024149C 24020040 */ addiu $v0, $zero, 0x40 -/* E06800 802414A0 AC640000 */ sw $a0, ($v1) -/* E06804 802414A4 AC620004 */ sw $v0, 4($v1) -/* E06808 802414A8 8FBF00A0 */ lw $ra, 0xa0($sp) -/* E0680C 802414AC 8FB5009C */ lw $s5, 0x9c($sp) -/* E06810 802414B0 8FB40098 */ lw $s4, 0x98($sp) -/* E06814 802414B4 8FB30094 */ lw $s3, 0x94($sp) -/* E06818 802414B8 8FB20090 */ lw $s2, 0x90($sp) -/* E0681C 802414BC 8FB1008C */ lw $s1, 0x8c($sp) -/* E06820 802414C0 8FB00088 */ lw $s0, 0x88($sp) -/* E06824 802414C4 D7BA00C0 */ ldc1 $f26, 0xc0($sp) -/* E06828 802414C8 D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* E0682C 802414CC D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* E06830 802414D0 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* E06834 802414D4 03E00008 */ jr $ra -/* E06838 802414D8 27BD00C8 */ addiu $sp, $sp, 0xc8 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 new file mode 100644 index 0000000000..cd6916402d --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802412A4_E06604.s @@ -0,0 +1,146 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412A4_E06604 +/* E06604 802412A4 27BDFF38 */ addiu $sp, $sp, -0xc8 +/* E06608 802412A8 AFB00088 */ sw $s0, 0x88($sp) +/* E0660C 802412AC 00A0802D */ daddu $s0, $a1, $zero +/* E06610 802412B0 AFBF00A0 */ sw $ra, 0xa0($sp) +/* E06614 802412B4 AFB5009C */ sw $s5, 0x9c($sp) +/* E06618 802412B8 AFB40098 */ sw $s4, 0x98($sp) +/* E0661C 802412BC AFB30094 */ sw $s3, 0x94($sp) +/* E06620 802412C0 AFB20090 */ sw $s2, 0x90($sp) +/* E06624 802412C4 AFB1008C */ sw $s1, 0x8c($sp) +/* E06628 802412C8 F7BA00C0 */ sdc1 $f26, 0xc0($sp) +/* E0662C 802412CC F7B800B8 */ sdc1 $f24, 0xb8($sp) +/* E06630 802412D0 F7B600B0 */ sdc1 $f22, 0xb0($sp) +/* E06634 802412D4 F7B400A8 */ sdc1 $f20, 0xa8($sp) +/* E06638 802412D8 C6140010 */ lwc1 $f20, 0x10($s0) +/* E0663C 802412DC 4680A520 */ cvt.s.w $f20, $f20 +/* E06640 802412E0 4480C000 */ mtc1 $zero, $f24 +/* E06644 802412E4 3C05437F */ lui $a1, 0x437f +/* E06648 802412E8 8C820050 */ lw $v0, 0x50($a0) +/* E0664C 802412EC 4406C000 */ mfc1 $a2, $f24 +/* E06650 802412F0 C61A0014 */ lwc1 $f26, 0x14($s0) +/* E06654 802412F4 4680D6A0 */ cvt.s.w $f26, $f26 +/* E06658 802412F8 AFA20010 */ sw $v0, 0x10($sp) +/* E0665C 802412FC 8E070018 */ lw $a3, 0x18($s0) +/* E06660 80241300 0C00A8ED */ jal update_lerp +/* E06664 80241304 2404000B */ addiu $a0, $zero, 0xb +/* E06668 80241308 4600008D */ trunc.w.s $f2, $f0 +/* E0666C 8024130C E7A20014 */ swc1 $f2, 0x14($sp) +/* E06670 80241310 0000202D */ daddu $a0, $zero, $zero +/* E06674 80241314 24050007 */ addiu $a1, $zero, 7 +/* E06678 80241318 240600FF */ addiu $a2, $zero, 0xff +/* E0667C 8024131C 00C0382D */ daddu $a3, $a2, $zero +/* E06680 80241320 00C0A82D */ daddu $s5, $a2, $zero +/* E06684 80241324 AFB50010 */ sw $s5, 0x10($sp) +/* E06688 80241328 0C04EAA7 */ jal func_8013AA9C +/* E0668C 8024132C AFA00018 */ sw $zero, 0x18($sp) +/* E06690 80241330 27A20038 */ addiu $v0, $sp, 0x38 +/* E06694 80241334 AFA20010 */ sw $v0, 0x10($sp) +/* E06698 80241338 8E040004 */ lw $a0, 4($s0) +/* E0669C 8024133C 8E050008 */ lw $a1, 8($s0) +/* E066A0 80241340 8E060000 */ lw $a2, ($s0) +/* E066A4 80241344 8E07000C */ lw $a3, 0xc($s0) +/* E066A8 80241348 0C04BA38 */ jal func_8012E8E0 +/* E066AC 8024134C 3C140001 */ lui $s4, 1 +/* E066B0 80241350 93A20042 */ lbu $v0, 0x42($sp) +/* E066B4 80241354 3C013FE0 */ lui $at, 0x3fe0 +/* E066B8 80241358 4481B800 */ mtc1 $at, $f23 +/* E066BC 8024135C 4480B000 */ mtc1 $zero, $f22 +/* E066C0 80241360 44820000 */ mtc1 $v0, $f0 +/* E066C4 80241364 00000000 */ nop +/* E066C8 80241368 46800021 */ cvt.d.w $f0, $f0 +/* E066CC 8024136C 46360002 */ mul.d $f0, $f0, $f22 +/* 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 +/* E066E0 80241380 4600D687 */ neg.s $f26, $f26 +/* E066E4 80241384 4620A500 */ add.d $f20, $f20, $f0 +/* E066E8 80241388 4406D000 */ mfc1 $a2, $f26 +/* E066EC 8024138C 4407C000 */ mfc1 $a3, $f24 +/* E066F0 80241390 4620A520 */ cvt.s.d $f20, $f20 +/* E066F4 80241394 4405A000 */ mfc1 $a1, $f20 +/* E066F8 80241398 0C019E40 */ jal guTranslateF +/* E066FC 8024139C 0200202D */ daddu $a0, $s0, $zero +/* E06700 802413A0 0200202D */ daddu $a0, $s0, $zero +/* E06704 802413A4 3C128007 */ lui $s2, 0x8007 +/* E06708 802413A8 265241F0 */ addiu $s2, $s2, 0x41f0 +/* E0670C 802413AC 3C13800A */ lui $s3, 0x800a +/* E06710 802413B0 2673A674 */ addiu $s3, $s3, -0x598c +/* E06714 802413B4 96450000 */ lhu $a1, ($s2) +/* E06718 802413B8 8E620000 */ lw $v0, ($s3) +/* E0671C 802413BC 00052980 */ sll $a1, $a1, 6 +/* E06720 802413C0 00B42821 */ addu $a1, $a1, $s4 +/* E06724 802413C4 0C019D40 */ jal guMtxF2L +/* E06728 802413C8 00452821 */ addu $a1, $v0, $a1 +/* E0672C 802413CC 3C03DA38 */ lui $v1, 0xda38 +/* E06730 802413D0 34630002 */ ori $v1, $v1, 2 +/* E06734 802413D4 0000202D */ daddu $a0, $zero, $zero +/* 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, 0x800a +/* E06748 802413E8 2631A66C */ addiu $s1, $s1, -0x5994 +/* E0674C 802413EC 0200382D */ daddu $a3, $s0, $zero +/* E06750 802413F0 8E220000 */ lw $v0, ($s1) +/* E06754 802413F4 96480000 */ lhu $t0, ($s2) +/* E06758 802413F8 0040482D */ daddu $t1, $v0, $zero +/* E0675C 802413FC 24420008 */ addiu $v0, $v0, 8 +/* E06760 80241400 AE220000 */ sw $v0, ($s1) +/* E06764 80241404 3102FFFF */ andi $v0, $t0, 0xffff +/* E06768 80241408 00021180 */ sll $v0, $v0, 6 +/* E0676C 8024140C 00541021 */ addu $v0, $v0, $s4 +/* E06770 80241410 AD230000 */ sw $v1, ($t1) +/* E06774 80241414 8E630000 */ lw $v1, ($s3) +/* E06778 80241418 25080001 */ addiu $t0, $t0, 1 +/* E0677C 8024141C 00621821 */ addu $v1, $v1, $v0 +/* E06780 80241420 3C028000 */ lui $v0, 0x8000 +/* E06784 80241424 00621821 */ addu $v1, $v1, $v0 +/* E06788 80241428 AD230004 */ sw $v1, 4($t1) +/* E0678C 8024142C 93A20042 */ lbu $v0, 0x42($sp) +/* E06790 80241430 8FA3003C */ lw $v1, 0x3c($sp) +/* E06794 80241434 93A90040 */ lbu $t1, 0x40($sp) +/* E06798 80241438 93AA0041 */ lbu $t2, 0x41($sp) +/* E0679C 8024143C 44820000 */ mtc1 $v0, $f0 +/* 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 +/* E067B4 80241454 A6480000 */ sh $t0, ($s2) +/* E067B8 80241458 A7A0002E */ sh $zero, 0x2e($sp) +/* E067BC 8024145C A3B50030 */ sb $s5, 0x30($sp) +/* E067C0 80241460 AFA30024 */ sw $v1, 0x24($sp) +/* E067C4 80241464 A7A90028 */ sh $t1, 0x28($sp) +/* E067C8 80241468 A7AA002A */ sh $t2, 0x2a($sp) +/* E067CC 8024146C AFA20020 */ sw $v0, 0x20($sp) +/* E067D0 80241470 46200007 */ neg.d $f0, $f0 +/* E067D4 80241474 4620008D */ trunc.w.d $f2, $f0 +/* E067D8 80241478 44021000 */ mfc1 $v0, $f2 +/* E067DC 8024147C 0C04EBDC */ jal func_8013AF70 +/* E067E0 80241480 A7A2002C */ sh $v0, 0x2c($sp) +/* E067E4 80241484 3C04D838 */ lui $a0, 0xd838 +/* E067E8 80241488 8E220000 */ lw $v0, ($s1) +/* E067EC 8024148C 34840002 */ ori $a0, $a0, 2 +/* E067F0 80241490 0040182D */ daddu $v1, $v0, $zero +/* E067F4 80241494 24420008 */ addiu $v0, $v0, 8 +/* E067F8 80241498 AE220000 */ sw $v0, ($s1) +/* E067FC 8024149C 24020040 */ addiu $v0, $zero, 0x40 +/* E06800 802414A0 AC640000 */ sw $a0, ($v1) +/* E06804 802414A4 AC620004 */ sw $v0, 4($v1) +/* E06808 802414A8 8FBF00A0 */ lw $ra, 0xa0($sp) +/* E0680C 802414AC 8FB5009C */ lw $s5, 0x9c($sp) +/* E06810 802414B0 8FB40098 */ lw $s4, 0x98($sp) +/* E06814 802414B4 8FB30094 */ lw $s3, 0x94($sp) +/* E06818 802414B8 8FB20090 */ lw $s2, 0x90($sp) +/* E0681C 802414BC 8FB1008C */ lw $s1, 0x8c($sp) +/* E06820 802414C0 8FB00088 */ lw $s0, 0x88($sp) +/* E06824 802414C4 D7BA00C0 */ ldc1 $f26, 0xc0($sp) +/* E06828 802414C8 D7B800B8 */ ldc1 $f24, 0xb8($sp) +/* E0682C 802414CC D7B600B0 */ ldc1 $f22, 0xb0($sp) +/* E06830 802414D0 D7B400A8 */ ldc1 $f20, 0xa8($sp) +/* E06834 802414D4 03E00008 */ jr $ra +/* E06838 802414D8 27BD00C8 */ addiu $sp, $sp, 0xc8 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC.s deleted file mode 100644 index 9f6dd99667..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC.s +++ /dev/null @@ -1,171 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414DC -/* E0683C 802414DC 27BDFEE8 */ addiu $sp, $sp, -0x118 -/* E06840 802414E0 AFB100CC */ sw $s1, 0xcc($sp) -/* E06844 802414E4 0080882D */ daddu $s1, $a0, $zero -/* E06848 802414E8 AFB000C8 */ sw $s0, 0xc8($sp) -/* E0684C 802414EC 00A0802D */ daddu $s0, $a1, $zero -/* E06850 802414F0 AFBF00E0 */ sw $ra, 0xe0($sp) -/* E06854 802414F4 AFB500DC */ sw $s5, 0xdc($sp) -/* E06858 802414F8 AFB400D8 */ sw $s4, 0xd8($sp) -/* E0685C 802414FC AFB300D4 */ sw $s3, 0xd4($sp) -/* E06860 80241500 AFB200D0 */ sw $s2, 0xd0($sp) -/* E06864 80241504 F7BE0110 */ sdc1 $f30, 0x110($sp) -/* E06868 80241508 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* E0686C 8024150C F7BA0100 */ sdc1 $f26, 0x100($sp) -/* E06870 80241510 F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* E06874 80241514 F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* E06878 80241518 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* E0687C 8024151C C6140010 */ lwc1 $f20, 0x10($s0) -/* E06880 80241520 4680A520 */ cvt.s.w $f20, $f20 -/* E06884 80241524 4480E000 */ mtc1 $zero, $f28 -/* E06888 80241528 3C05437F */ lui $a1, 0x437f -/* E0688C 8024152C 8E220050 */ lw $v0, 0x50($s1) -/* E06890 80241530 4406E000 */ mfc1 $a2, $f28 -/* E06894 80241534 C61E0014 */ lwc1 $f30, 0x14($s0) -/* E06898 80241538 4680F7A0 */ cvt.s.w $f30, $f30 -/* E0689C 8024153C AFA20010 */ sw $v0, 0x10($sp) -/* E068A0 80241540 8E070018 */ lw $a3, 0x18($s0) -/* E068A4 80241544 0C00A8ED */ jal update_lerp -/* E068A8 80241548 2404000B */ addiu $a0, $zero, 0xb -/* E068AC 8024154C 4600008D */ trunc.w.s $f2, $f0 -/* E068B0 80241550 E7A20014 */ swc1 $f2, 0x14($sp) -/* E068B4 80241554 0000202D */ daddu $a0, $zero, $zero -/* E068B8 80241558 24050007 */ addiu $a1, $zero, 7 -/* E068BC 8024155C 240600FF */ addiu $a2, $zero, 0xff -/* E068C0 80241560 00C0382D */ daddu $a3, $a2, $zero -/* E068C4 80241564 00C0A82D */ daddu $s5, $a2, $zero -/* E068C8 80241568 AFB50010 */ sw $s5, 0x10($sp) -/* E068CC 8024156C 0C04EAA7 */ jal func_8013AA9C -/* E068D0 80241570 AFA00018 */ sw $zero, 0x18($sp) -/* E068D4 80241574 3C013F80 */ lui $at, 0x3f80 -/* E068D8 80241578 4481D000 */ mtc1 $at, $f26 -/* E068DC 8024157C 8E220050 */ lw $v0, 0x50($s1) -/* E068E0 80241580 3C063E4C */ lui $a2, 0x3e4c -/* E068E4 80241584 34C6CCCD */ ori $a2, $a2, 0xcccd -/* E068E8 80241588 4405D000 */ mfc1 $a1, $f26 -/* E068EC 8024158C AFA20010 */ sw $v0, 0x10($sp) -/* E068F0 80241590 8E070018 */ lw $a3, 0x18($s0) -/* E068F4 80241594 0C00A8ED */ jal update_lerp -/* E068F8 80241598 0000202D */ daddu $a0, $zero, $zero -/* E068FC 8024159C 27A20038 */ addiu $v0, $sp, 0x38 -/* E06900 802415A0 AFA20010 */ sw $v0, 0x10($sp) -/* E06904 802415A4 8E040004 */ lw $a0, 4($s0) -/* E06908 802415A8 8E050008 */ lw $a1, 8($s0) -/* E0690C 802415AC 8E060000 */ lw $a2, ($s0) -/* E06910 802415B0 8E07000C */ lw $a3, 0xc($s0) -/* E06914 802415B4 0C04BA38 */ jal func_8012E8E0 -/* E06918 802415B8 46000586 */ mov.s $f22, $f0 -/* E0691C 802415BC 93A20042 */ lbu $v0, 0x42($sp) -/* E06920 802415C0 3C013FE0 */ lui $at, 0x3fe0 -/* E06924 802415C4 4481C800 */ mtc1 $at, $f25 -/* E06928 802415C8 4480C000 */ mtc1 $zero, $f24 -/* E0692C 802415CC 44820000 */ mtc1 $v0, $f0 -/* E06930 802415D0 00000000 */ nop -/* E06934 802415D4 46800021 */ cvt.d.w $f0, $f0 -/* E06938 802415D8 46380002 */ mul.d $f0, $f0, $f24 -/* 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 -/* E0694C 802415EC 27B10048 */ addiu $s1, $sp, 0x48 -/* E06950 802415F0 4600F787 */ neg.s $f30, $f30 -/* E06954 802415F4 4620A500 */ add.d $f20, $f20, $f0 -/* E06958 802415F8 4406F000 */ mfc1 $a2, $f30 -/* E0695C 802415FC 4407E000 */ mfc1 $a3, $f28 -/* E06960 80241600 4620A520 */ cvt.s.d $f20, $f20 -/* E06964 80241604 4405A000 */ mfc1 $a1, $f20 -/* E06968 80241608 0C019E40 */ jal guTranslateF -/* E0696C 8024160C 0220202D */ daddu $a0, $s1, $zero -/* E06970 80241610 27B00088 */ addiu $s0, $sp, 0x88 -/* E06974 80241614 0200202D */ daddu $a0, $s0, $zero -/* E06978 80241618 4405B000 */ mfc1 $a1, $f22 -/* E0697C 8024161C 4407D000 */ mfc1 $a3, $f26 -/* E06980 80241620 0C019DF0 */ jal guScaleF -/* E06984 80241624 00A0302D */ daddu $a2, $a1, $zero -/* E06988 80241628 0200202D */ daddu $a0, $s0, $zero -/* E0698C 8024162C 0220282D */ daddu $a1, $s1, $zero -/* E06990 80241630 0C019D80 */ jal guMtxCatF -/* E06994 80241634 0220302D */ daddu $a2, $s1, $zero -/* E06998 80241638 0220202D */ daddu $a0, $s1, $zero -/* E0699C 8024163C 3C128007 */ lui $s2, 0x8007 -/* E069A0 80241640 265241F0 */ addiu $s2, $s2, 0x41f0 -/* E069A4 80241644 3C13800A */ lui $s3, 0x800a -/* E069A8 80241648 2673A674 */ addiu $s3, $s3, -0x598c -/* E069AC 8024164C 96450000 */ lhu $a1, ($s2) -/* E069B0 80241650 8E620000 */ lw $v0, ($s3) -/* E069B4 80241654 00052980 */ sll $a1, $a1, 6 -/* E069B8 80241658 00B42821 */ addu $a1, $a1, $s4 -/* E069BC 8024165C 0C019D40 */ jal guMtxF2L -/* E069C0 80241660 00452821 */ addu $a1, $v0, $a1 -/* E069C4 80241664 3C03DA38 */ lui $v1, 0xda38 -/* E069C8 80241668 34630002 */ ori $v1, $v1, 2 -/* 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, 0x800a -/* E069DC 8024167C 2610A66C */ addiu $s0, $s0, -0x5994 -/* E069E0 80241680 0220382D */ daddu $a3, $s1, $zero -/* E069E4 80241684 8E020000 */ lw $v0, ($s0) -/* E069E8 80241688 96480000 */ lhu $t0, ($s2) -/* E069EC 8024168C 0040482D */ daddu $t1, $v0, $zero -/* E069F0 80241690 24420008 */ addiu $v0, $v0, 8 -/* E069F4 80241694 AE020000 */ sw $v0, ($s0) -/* E069F8 80241698 3102FFFF */ andi $v0, $t0, 0xffff -/* E069FC 8024169C 00021180 */ sll $v0, $v0, 6 -/* E06A00 802416A0 00541021 */ addu $v0, $v0, $s4 -/* E06A04 802416A4 AD230000 */ sw $v1, ($t1) -/* E06A08 802416A8 8E630000 */ lw $v1, ($s3) -/* E06A0C 802416AC 25080001 */ addiu $t0, $t0, 1 -/* E06A10 802416B0 00621821 */ addu $v1, $v1, $v0 -/* E06A14 802416B4 3C028000 */ lui $v0, 0x8000 -/* E06A18 802416B8 00621821 */ addu $v1, $v1, $v0 -/* E06A1C 802416BC AD230004 */ sw $v1, 4($t1) -/* E06A20 802416C0 93A20042 */ lbu $v0, 0x42($sp) -/* E06A24 802416C4 8FA3003C */ lw $v1, 0x3c($sp) -/* E06A28 802416C8 93A90040 */ lbu $t1, 0x40($sp) -/* E06A2C 802416CC 93AA0041 */ lbu $t2, 0x41($sp) -/* E06A30 802416D0 44820000 */ mtc1 $v0, $f0 -/* 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 -/* E06A48 802416E8 A6480000 */ sh $t0, ($s2) -/* E06A4C 802416EC A7A0002E */ sh $zero, 0x2e($sp) -/* E06A50 802416F0 A3B50030 */ sb $s5, 0x30($sp) -/* E06A54 802416F4 AFA30024 */ sw $v1, 0x24($sp) -/* E06A58 802416F8 A7A90028 */ sh $t1, 0x28($sp) -/* E06A5C 802416FC A7AA002A */ sh $t2, 0x2a($sp) -/* E06A60 80241700 AFA20020 */ sw $v0, 0x20($sp) -/* E06A64 80241704 46200007 */ neg.d $f0, $f0 -/* E06A68 80241708 4620008D */ trunc.w.d $f2, $f0 -/* E06A6C 8024170C 44021000 */ mfc1 $v0, $f2 -/* E06A70 80241710 0C04EBDC */ jal func_8013AF70 -/* E06A74 80241714 A7A2002C */ sh $v0, 0x2c($sp) -/* E06A78 80241718 3C04D838 */ lui $a0, 0xd838 -/* E06A7C 8024171C 8E020000 */ lw $v0, ($s0) -/* E06A80 80241720 34840002 */ ori $a0, $a0, 2 -/* E06A84 80241724 0040182D */ daddu $v1, $v0, $zero -/* E06A88 80241728 24420008 */ addiu $v0, $v0, 8 -/* E06A8C 8024172C AE020000 */ sw $v0, ($s0) -/* E06A90 80241730 24020040 */ addiu $v0, $zero, 0x40 -/* E06A94 80241734 AC640000 */ sw $a0, ($v1) -/* E06A98 80241738 AC620004 */ sw $v0, 4($v1) -/* E06A9C 8024173C 8FBF00E0 */ lw $ra, 0xe0($sp) -/* E06AA0 80241740 8FB500DC */ lw $s5, 0xdc($sp) -/* E06AA4 80241744 8FB400D8 */ lw $s4, 0xd8($sp) -/* E06AA8 80241748 8FB300D4 */ lw $s3, 0xd4($sp) -/* E06AAC 8024174C 8FB200D0 */ lw $s2, 0xd0($sp) -/* E06AB0 80241750 8FB100CC */ lw $s1, 0xcc($sp) -/* E06AB4 80241754 8FB000C8 */ lw $s0, 0xc8($sp) -/* E06AB8 80241758 D7BE0110 */ ldc1 $f30, 0x110($sp) -/* E06ABC 8024175C D7BC0108 */ ldc1 $f28, 0x108($sp) -/* E06AC0 80241760 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* E06AC4 80241764 D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* E06AC8 80241768 D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* E06ACC 8024176C D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* E06AD0 80241770 03E00008 */ jr $ra -/* E06AD4 80241774 27BD0118 */ addiu $sp, $sp, 0x118 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 new file mode 100644 index 0000000000..a97bc69905 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802414DC_E0683C.s @@ -0,0 +1,171 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414DC_E0683C +/* E0683C 802414DC 27BDFEE8 */ addiu $sp, $sp, -0x118 +/* E06840 802414E0 AFB100CC */ sw $s1, 0xcc($sp) +/* E06844 802414E4 0080882D */ daddu $s1, $a0, $zero +/* E06848 802414E8 AFB000C8 */ sw $s0, 0xc8($sp) +/* E0684C 802414EC 00A0802D */ daddu $s0, $a1, $zero +/* E06850 802414F0 AFBF00E0 */ sw $ra, 0xe0($sp) +/* E06854 802414F4 AFB500DC */ sw $s5, 0xdc($sp) +/* E06858 802414F8 AFB400D8 */ sw $s4, 0xd8($sp) +/* E0685C 802414FC AFB300D4 */ sw $s3, 0xd4($sp) +/* E06860 80241500 AFB200D0 */ sw $s2, 0xd0($sp) +/* E06864 80241504 F7BE0110 */ sdc1 $f30, 0x110($sp) +/* E06868 80241508 F7BC0108 */ sdc1 $f28, 0x108($sp) +/* E0686C 8024150C F7BA0100 */ sdc1 $f26, 0x100($sp) +/* E06870 80241510 F7B800F8 */ sdc1 $f24, 0xf8($sp) +/* E06874 80241514 F7B600F0 */ sdc1 $f22, 0xf0($sp) +/* E06878 80241518 F7B400E8 */ sdc1 $f20, 0xe8($sp) +/* E0687C 8024151C C6140010 */ lwc1 $f20, 0x10($s0) +/* E06880 80241520 4680A520 */ cvt.s.w $f20, $f20 +/* E06884 80241524 4480E000 */ mtc1 $zero, $f28 +/* E06888 80241528 3C05437F */ lui $a1, 0x437f +/* E0688C 8024152C 8E220050 */ lw $v0, 0x50($s1) +/* E06890 80241530 4406E000 */ mfc1 $a2, $f28 +/* E06894 80241534 C61E0014 */ lwc1 $f30, 0x14($s0) +/* E06898 80241538 4680F7A0 */ cvt.s.w $f30, $f30 +/* E0689C 8024153C AFA20010 */ sw $v0, 0x10($sp) +/* E068A0 80241540 8E070018 */ lw $a3, 0x18($s0) +/* E068A4 80241544 0C00A8ED */ jal update_lerp +/* E068A8 80241548 2404000B */ addiu $a0, $zero, 0xb +/* E068AC 8024154C 4600008D */ trunc.w.s $f2, $f0 +/* E068B0 80241550 E7A20014 */ swc1 $f2, 0x14($sp) +/* E068B4 80241554 0000202D */ daddu $a0, $zero, $zero +/* E068B8 80241558 24050007 */ addiu $a1, $zero, 7 +/* E068BC 8024155C 240600FF */ addiu $a2, $zero, 0xff +/* E068C0 80241560 00C0382D */ daddu $a3, $a2, $zero +/* E068C4 80241564 00C0A82D */ daddu $s5, $a2, $zero +/* E068C8 80241568 AFB50010 */ sw $s5, 0x10($sp) +/* E068CC 8024156C 0C04EAA7 */ jal func_8013AA9C +/* E068D0 80241570 AFA00018 */ sw $zero, 0x18($sp) +/* E068D4 80241574 3C013F80 */ lui $at, 0x3f80 +/* E068D8 80241578 4481D000 */ mtc1 $at, $f26 +/* E068DC 8024157C 8E220050 */ lw $v0, 0x50($s1) +/* E068E0 80241580 3C063E4C */ lui $a2, 0x3e4c +/* E068E4 80241584 34C6CCCD */ ori $a2, $a2, 0xcccd +/* E068E8 80241588 4405D000 */ mfc1 $a1, $f26 +/* E068EC 8024158C AFA20010 */ sw $v0, 0x10($sp) +/* E068F0 80241590 8E070018 */ lw $a3, 0x18($s0) +/* E068F4 80241594 0C00A8ED */ jal update_lerp +/* E068F8 80241598 0000202D */ daddu $a0, $zero, $zero +/* E068FC 8024159C 27A20038 */ addiu $v0, $sp, 0x38 +/* E06900 802415A0 AFA20010 */ sw $v0, 0x10($sp) +/* E06904 802415A4 8E040004 */ lw $a0, 4($s0) +/* E06908 802415A8 8E050008 */ lw $a1, 8($s0) +/* E0690C 802415AC 8E060000 */ lw $a2, ($s0) +/* E06910 802415B0 8E07000C */ lw $a3, 0xc($s0) +/* E06914 802415B4 0C04BA38 */ jal func_8012E8E0 +/* E06918 802415B8 46000586 */ mov.s $f22, $f0 +/* E0691C 802415BC 93A20042 */ lbu $v0, 0x42($sp) +/* E06920 802415C0 3C013FE0 */ lui $at, 0x3fe0 +/* E06924 802415C4 4481C800 */ mtc1 $at, $f25 +/* E06928 802415C8 4480C000 */ mtc1 $zero, $f24 +/* E0692C 802415CC 44820000 */ mtc1 $v0, $f0 +/* E06930 802415D0 00000000 */ nop +/* E06934 802415D4 46800021 */ cvt.d.w $f0, $f0 +/* E06938 802415D8 46380002 */ mul.d $f0, $f0, $f24 +/* 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 +/* E0694C 802415EC 27B10048 */ addiu $s1, $sp, 0x48 +/* E06950 802415F0 4600F787 */ neg.s $f30, $f30 +/* E06954 802415F4 4620A500 */ add.d $f20, $f20, $f0 +/* E06958 802415F8 4406F000 */ mfc1 $a2, $f30 +/* E0695C 802415FC 4407E000 */ mfc1 $a3, $f28 +/* E06960 80241600 4620A520 */ cvt.s.d $f20, $f20 +/* E06964 80241604 4405A000 */ mfc1 $a1, $f20 +/* E06968 80241608 0C019E40 */ jal guTranslateF +/* E0696C 8024160C 0220202D */ daddu $a0, $s1, $zero +/* E06970 80241610 27B00088 */ addiu $s0, $sp, 0x88 +/* E06974 80241614 0200202D */ daddu $a0, $s0, $zero +/* E06978 80241618 4405B000 */ mfc1 $a1, $f22 +/* E0697C 8024161C 4407D000 */ mfc1 $a3, $f26 +/* E06980 80241620 0C019DF0 */ jal guScaleF +/* E06984 80241624 00A0302D */ daddu $a2, $a1, $zero +/* E06988 80241628 0200202D */ daddu $a0, $s0, $zero +/* E0698C 8024162C 0220282D */ daddu $a1, $s1, $zero +/* E06990 80241630 0C019D80 */ jal guMtxCatF +/* E06994 80241634 0220302D */ daddu $a2, $s1, $zero +/* E06998 80241638 0220202D */ daddu $a0, $s1, $zero +/* E0699C 8024163C 3C128007 */ lui $s2, 0x8007 +/* E069A0 80241640 265241F0 */ addiu $s2, $s2, 0x41f0 +/* E069A4 80241644 3C13800A */ lui $s3, 0x800a +/* E069A8 80241648 2673A674 */ addiu $s3, $s3, -0x598c +/* E069AC 8024164C 96450000 */ lhu $a1, ($s2) +/* E069B0 80241650 8E620000 */ lw $v0, ($s3) +/* E069B4 80241654 00052980 */ sll $a1, $a1, 6 +/* E069B8 80241658 00B42821 */ addu $a1, $a1, $s4 +/* E069BC 8024165C 0C019D40 */ jal guMtxF2L +/* E069C0 80241660 00452821 */ addu $a1, $v0, $a1 +/* E069C4 80241664 3C03DA38 */ lui $v1, 0xda38 +/* E069C8 80241668 34630002 */ ori $v1, $v1, 2 +/* 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, 0x800a +/* E069DC 8024167C 2610A66C */ addiu $s0, $s0, -0x5994 +/* E069E0 80241680 0220382D */ daddu $a3, $s1, $zero +/* E069E4 80241684 8E020000 */ lw $v0, ($s0) +/* E069E8 80241688 96480000 */ lhu $t0, ($s2) +/* E069EC 8024168C 0040482D */ daddu $t1, $v0, $zero +/* E069F0 80241690 24420008 */ addiu $v0, $v0, 8 +/* E069F4 80241694 AE020000 */ sw $v0, ($s0) +/* E069F8 80241698 3102FFFF */ andi $v0, $t0, 0xffff +/* E069FC 8024169C 00021180 */ sll $v0, $v0, 6 +/* E06A00 802416A0 00541021 */ addu $v0, $v0, $s4 +/* E06A04 802416A4 AD230000 */ sw $v1, ($t1) +/* E06A08 802416A8 8E630000 */ lw $v1, ($s3) +/* E06A0C 802416AC 25080001 */ addiu $t0, $t0, 1 +/* E06A10 802416B0 00621821 */ addu $v1, $v1, $v0 +/* E06A14 802416B4 3C028000 */ lui $v0, 0x8000 +/* E06A18 802416B8 00621821 */ addu $v1, $v1, $v0 +/* E06A1C 802416BC AD230004 */ sw $v1, 4($t1) +/* E06A20 802416C0 93A20042 */ lbu $v0, 0x42($sp) +/* E06A24 802416C4 8FA3003C */ lw $v1, 0x3c($sp) +/* E06A28 802416C8 93A90040 */ lbu $t1, 0x40($sp) +/* E06A2C 802416CC 93AA0041 */ lbu $t2, 0x41($sp) +/* E06A30 802416D0 44820000 */ mtc1 $v0, $f0 +/* 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 +/* E06A48 802416E8 A6480000 */ sh $t0, ($s2) +/* E06A4C 802416EC A7A0002E */ sh $zero, 0x2e($sp) +/* E06A50 802416F0 A3B50030 */ sb $s5, 0x30($sp) +/* E06A54 802416F4 AFA30024 */ sw $v1, 0x24($sp) +/* E06A58 802416F8 A7A90028 */ sh $t1, 0x28($sp) +/* E06A5C 802416FC A7AA002A */ sh $t2, 0x2a($sp) +/* E06A60 80241700 AFA20020 */ sw $v0, 0x20($sp) +/* E06A64 80241704 46200007 */ neg.d $f0, $f0 +/* E06A68 80241708 4620008D */ trunc.w.d $f2, $f0 +/* E06A6C 8024170C 44021000 */ mfc1 $v0, $f2 +/* E06A70 80241710 0C04EBDC */ jal func_8013AF70 +/* E06A74 80241714 A7A2002C */ sh $v0, 0x2c($sp) +/* E06A78 80241718 3C04D838 */ lui $a0, 0xd838 +/* E06A7C 8024171C 8E020000 */ lw $v0, ($s0) +/* E06A80 80241720 34840002 */ ori $a0, $a0, 2 +/* E06A84 80241724 0040182D */ daddu $v1, $v0, $zero +/* E06A88 80241728 24420008 */ addiu $v0, $v0, 8 +/* E06A8C 8024172C AE020000 */ sw $v0, ($s0) +/* E06A90 80241730 24020040 */ addiu $v0, $zero, 0x40 +/* E06A94 80241734 AC640000 */ sw $a0, ($v1) +/* E06A98 80241738 AC620004 */ sw $v0, 4($v1) +/* E06A9C 8024173C 8FBF00E0 */ lw $ra, 0xe0($sp) +/* E06AA0 80241740 8FB500DC */ lw $s5, 0xdc($sp) +/* E06AA4 80241744 8FB400D8 */ lw $s4, 0xd8($sp) +/* E06AA8 80241748 8FB300D4 */ lw $s3, 0xd4($sp) +/* E06AAC 8024174C 8FB200D0 */ lw $s2, 0xd0($sp) +/* E06AB0 80241750 8FB100CC */ lw $s1, 0xcc($sp) +/* E06AB4 80241754 8FB000C8 */ lw $s0, 0xc8($sp) +/* E06AB8 80241758 D7BE0110 */ ldc1 $f30, 0x110($sp) +/* E06ABC 8024175C D7BC0108 */ ldc1 $f28, 0x108($sp) +/* E06AC0 80241760 D7BA0100 */ ldc1 $f26, 0x100($sp) +/* E06AC4 80241764 D7B800F8 */ ldc1 $f24, 0xf8($sp) +/* E06AC8 80241768 D7B600F0 */ ldc1 $f22, 0xf0($sp) +/* E06ACC 8024176C D7B400E8 */ ldc1 $f20, 0xe8($sp) +/* E06AD0 80241770 03E00008 */ jr $ra +/* E06AD4 80241774 27BD0118 */ addiu $sp, $sp, 0x118 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778.s deleted file mode 100644 index 9c5db554bf..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241778 -/* E06AD8 80241778 27BDFEF0 */ addiu $sp, $sp, -0x110 -/* E06ADC 8024177C AFB100CC */ sw $s1, 0xcc($sp) -/* E06AE0 80241780 0080882D */ daddu $s1, $a0, $zero -/* E06AE4 80241784 AFB000C8 */ sw $s0, 0xc8($sp) -/* E06AE8 80241788 00A0802D */ daddu $s0, $a1, $zero -/* E06AEC 8024178C AFBF00E0 */ sw $ra, 0xe0($sp) -/* E06AF0 80241790 AFB500DC */ sw $s5, 0xdc($sp) -/* E06AF4 80241794 AFB400D8 */ sw $s4, 0xd8($sp) -/* E06AF8 80241798 AFB300D4 */ sw $s3, 0xd4($sp) -/* E06AFC 8024179C AFB200D0 */ sw $s2, 0xd0($sp) -/* E06B00 802417A0 F7BC0108 */ sdc1 $f28, 0x108($sp) -/* E06B04 802417A4 F7BA0100 */ sdc1 $f26, 0x100($sp) -/* E06B08 802417A8 F7B800F8 */ sdc1 $f24, 0xf8($sp) -/* E06B0C 802417AC F7B600F0 */ sdc1 $f22, 0xf0($sp) -/* E06B10 802417B0 F7B400E8 */ sdc1 $f20, 0xe8($sp) -/* E06B14 802417B4 C6140010 */ lwc1 $f20, 0x10($s0) -/* E06B18 802417B8 4680A520 */ cvt.s.w $f20, $f20 -/* E06B1C 802417BC 4480B000 */ mtc1 $zero, $f22 -/* E06B20 802417C0 3C05437F */ lui $a1, 0x437f -/* E06B24 802417C4 8E220050 */ lw $v0, 0x50($s1) -/* E06B28 802417C8 4406B000 */ mfc1 $a2, $f22 -/* E06B2C 802417CC C61C0014 */ lwc1 $f28, 0x14($s0) -/* E06B30 802417D0 4680E720 */ cvt.s.w $f28, $f28 -/* E06B34 802417D4 AFA20010 */ sw $v0, 0x10($sp) -/* E06B38 802417D8 8E070018 */ lw $a3, 0x18($s0) -/* E06B3C 802417DC 0C00A8ED */ jal update_lerp -/* E06B40 802417E0 2404000B */ addiu $a0, $zero, 0xb -/* E06B44 802417E4 4600008D */ trunc.w.s $f2, $f0 -/* E06B48 802417E8 E7A20014 */ swc1 $f2, 0x14($sp) -/* E06B4C 802417EC 0000202D */ daddu $a0, $zero, $zero -/* E06B50 802417F0 24050007 */ addiu $a1, $zero, 7 -/* E06B54 802417F4 240600FF */ addiu $a2, $zero, 0xff -/* E06B58 802417F8 00C0382D */ daddu $a3, $a2, $zero -/* E06B5C 802417FC 00C0A82D */ daddu $s5, $a2, $zero -/* E06B60 80241800 AFB50010 */ sw $s5, 0x10($sp) -/* E06B64 80241804 0C04EAA7 */ jal func_8013AA9C -/* E06B68 80241808 AFA00018 */ sw $zero, 0x18($sp) -/* E06B6C 8024180C 8E220050 */ lw $v0, 0x50($s1) -/* E06B70 80241810 4405B000 */ mfc1 $a1, $f22 -/* E06B74 80241814 3C064270 */ lui $a2, 0x4270 -/* E06B78 80241818 AFA20010 */ sw $v0, 0x10($sp) -/* E06B7C 8024181C 8E070018 */ lw $a3, 0x18($s0) -/* E06B80 80241820 0C00A8ED */ jal update_lerp -/* E06B84 80241824 0000202D */ daddu $a0, $zero, $zero -/* E06B88 80241828 27A20038 */ addiu $v0, $sp, 0x38 -/* E06B8C 8024182C AFA20010 */ sw $v0, 0x10($sp) -/* E06B90 80241830 8E040004 */ lw $a0, 4($s0) -/* E06B94 80241834 8E050008 */ lw $a1, 8($s0) -/* E06B98 80241838 8E060000 */ lw $a2, ($s0) -/* E06B9C 8024183C 8E07000C */ lw $a3, 0xc($s0) -/* E06BA0 80241840 0C04BA38 */ jal func_8012E8E0 -/* E06BA4 80241844 46000606 */ mov.s $f24, $f0 -/* E06BA8 80241848 93A20042 */ lbu $v0, 0x42($sp) -/* E06BAC 8024184C 3C013FE0 */ lui $at, 0x3fe0 -/* E06BB0 80241850 4481D800 */ mtc1 $at, $f27 -/* E06BB4 80241854 4480D000 */ mtc1 $zero, $f26 -/* E06BB8 80241858 44820000 */ mtc1 $v0, $f0 -/* E06BBC 8024185C 00000000 */ nop -/* E06BC0 80241860 46800021 */ cvt.d.w $f0, $f0 -/* E06BC4 80241864 463A0002 */ mul.d $f0, $f0, $f26 -/* 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 -/* E06BD8 80241878 27B10048 */ addiu $s1, $sp, 0x48 -/* E06BDC 8024187C 4600E707 */ neg.s $f28, $f28 -/* E06BE0 80241880 4620A500 */ add.d $f20, $f20, $f0 -/* E06BE4 80241884 4406E000 */ mfc1 $a2, $f28 -/* E06BE8 80241888 4407B000 */ mfc1 $a3, $f22 -/* E06BEC 8024188C 4620A520 */ cvt.s.d $f20, $f20 -/* E06BF0 80241890 4405A000 */ mfc1 $a1, $f20 -/* E06BF4 80241894 0C019E40 */ jal guTranslateF -/* E06BF8 80241898 0220202D */ daddu $a0, $s1, $zero -/* E06BFC 8024189C 27B00088 */ addiu $s0, $sp, 0x88 -/* E06C00 802418A0 4405C000 */ mfc1 $a1, $f24 -/* E06C04 802418A4 4406B000 */ mfc1 $a2, $f22 -/* E06C08 802418A8 3C073F80 */ lui $a3, 0x3f80 -/* E06C0C 802418AC 0200202D */ daddu $a0, $s0, $zero -/* E06C10 802418B0 0C019EC8 */ jal guRotateF -/* E06C14 802418B4 AFA60010 */ sw $a2, 0x10($sp) -/* E06C18 802418B8 0200202D */ daddu $a0, $s0, $zero -/* E06C1C 802418BC 0220282D */ daddu $a1, $s1, $zero -/* E06C20 802418C0 0C019D80 */ jal guMtxCatF -/* E06C24 802418C4 0220302D */ daddu $a2, $s1, $zero -/* E06C28 802418C8 0220202D */ daddu $a0, $s1, $zero -/* E06C2C 802418CC 3C128007 */ lui $s2, 0x8007 -/* E06C30 802418D0 265241F0 */ addiu $s2, $s2, 0x41f0 -/* E06C34 802418D4 3C13800A */ lui $s3, 0x800a -/* E06C38 802418D8 2673A674 */ addiu $s3, $s3, -0x598c -/* E06C3C 802418DC 96450000 */ lhu $a1, ($s2) -/* E06C40 802418E0 8E620000 */ lw $v0, ($s3) -/* E06C44 802418E4 00052980 */ sll $a1, $a1, 6 -/* E06C48 802418E8 00B42821 */ addu $a1, $a1, $s4 -/* E06C4C 802418EC 0C019D40 */ jal guMtxF2L -/* E06C50 802418F0 00452821 */ addu $a1, $v0, $a1 -/* E06C54 802418F4 3C03DA38 */ lui $v1, 0xda38 -/* E06C58 802418F8 34630002 */ ori $v1, $v1, 2 -/* E06C5C 802418FC 0000202D */ daddu $a0, $zero, $zero -/* 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, 0x800a -/* E06C70 80241910 2610A66C */ addiu $s0, $s0, -0x5994 -/* E06C74 80241914 0220382D */ daddu $a3, $s1, $zero -/* E06C78 80241918 8E020000 */ lw $v0, ($s0) -/* E06C7C 8024191C 96480000 */ lhu $t0, ($s2) -/* E06C80 80241920 0040482D */ daddu $t1, $v0, $zero -/* E06C84 80241924 24420008 */ addiu $v0, $v0, 8 -/* E06C88 80241928 AE020000 */ sw $v0, ($s0) -/* E06C8C 8024192C 3102FFFF */ andi $v0, $t0, 0xffff -/* E06C90 80241930 00021180 */ sll $v0, $v0, 6 -/* E06C94 80241934 00541021 */ addu $v0, $v0, $s4 -/* E06C98 80241938 AD230000 */ sw $v1, ($t1) -/* E06C9C 8024193C 8E630000 */ lw $v1, ($s3) -/* E06CA0 80241940 25080001 */ addiu $t0, $t0, 1 -/* E06CA4 80241944 00621821 */ addu $v1, $v1, $v0 -/* E06CA8 80241948 3C028000 */ lui $v0, 0x8000 -/* E06CAC 8024194C 00621821 */ addu $v1, $v1, $v0 -/* E06CB0 80241950 AD230004 */ sw $v1, 4($t1) -/* E06CB4 80241954 93A20042 */ lbu $v0, 0x42($sp) -/* E06CB8 80241958 8FA3003C */ lw $v1, 0x3c($sp) -/* E06CBC 8024195C 93A90040 */ lbu $t1, 0x40($sp) -/* E06CC0 80241960 93AA0041 */ lbu $t2, 0x41($sp) -/* E06CC4 80241964 44820000 */ mtc1 $v0, $f0 -/* 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 -/* E06CDC 8024197C A6480000 */ sh $t0, ($s2) -/* E06CE0 80241980 A7A0002E */ sh $zero, 0x2e($sp) -/* E06CE4 80241984 A3B50030 */ sb $s5, 0x30($sp) -/* E06CE8 80241988 AFA30024 */ sw $v1, 0x24($sp) -/* E06CEC 8024198C A7A90028 */ sh $t1, 0x28($sp) -/* E06CF0 80241990 A7AA002A */ sh $t2, 0x2a($sp) -/* E06CF4 80241994 AFA20020 */ sw $v0, 0x20($sp) -/* E06CF8 80241998 46200007 */ neg.d $f0, $f0 -/* E06CFC 8024199C 4620008D */ trunc.w.d $f2, $f0 -/* E06D00 802419A0 44021000 */ mfc1 $v0, $f2 -/* E06D04 802419A4 0C04EBDC */ jal func_8013AF70 -/* E06D08 802419A8 A7A2002C */ sh $v0, 0x2c($sp) -/* E06D0C 802419AC 3C04D838 */ lui $a0, 0xd838 -/* E06D10 802419B0 8E020000 */ lw $v0, ($s0) -/* E06D14 802419B4 34840002 */ ori $a0, $a0, 2 -/* E06D18 802419B8 0040182D */ daddu $v1, $v0, $zero -/* E06D1C 802419BC 24420008 */ addiu $v0, $v0, 8 -/* E06D20 802419C0 AE020000 */ sw $v0, ($s0) -/* E06D24 802419C4 24020040 */ addiu $v0, $zero, 0x40 -/* E06D28 802419C8 AC640000 */ sw $a0, ($v1) -/* E06D2C 802419CC AC620004 */ sw $v0, 4($v1) -/* E06D30 802419D0 8FBF00E0 */ lw $ra, 0xe0($sp) -/* E06D34 802419D4 8FB500DC */ lw $s5, 0xdc($sp) -/* E06D38 802419D8 8FB400D8 */ lw $s4, 0xd8($sp) -/* E06D3C 802419DC 8FB300D4 */ lw $s3, 0xd4($sp) -/* E06D40 802419E0 8FB200D0 */ lw $s2, 0xd0($sp) -/* E06D44 802419E4 8FB100CC */ lw $s1, 0xcc($sp) -/* E06D48 802419E8 8FB000C8 */ lw $s0, 0xc8($sp) -/* E06D4C 802419EC D7BC0108 */ ldc1 $f28, 0x108($sp) -/* E06D50 802419F0 D7BA0100 */ ldc1 $f26, 0x100($sp) -/* E06D54 802419F4 D7B800F8 */ ldc1 $f24, 0xf8($sp) -/* E06D58 802419F8 D7B600F0 */ ldc1 $f22, 0xf0($sp) -/* E06D5C 802419FC D7B400E8 */ ldc1 $f20, 0xe8($sp) -/* E06D60 80241A00 03E00008 */ jr $ra -/* E06D64 80241A04 27BD0110 */ addiu $sp, $sp, 0x110 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 new file mode 100644 index 0000000000..29d93cf420 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241778_E06AD8.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241778_E06AD8 +/* E06AD8 80241778 27BDFEF0 */ addiu $sp, $sp, -0x110 +/* E06ADC 8024177C AFB100CC */ sw $s1, 0xcc($sp) +/* E06AE0 80241780 0080882D */ daddu $s1, $a0, $zero +/* E06AE4 80241784 AFB000C8 */ sw $s0, 0xc8($sp) +/* E06AE8 80241788 00A0802D */ daddu $s0, $a1, $zero +/* E06AEC 8024178C AFBF00E0 */ sw $ra, 0xe0($sp) +/* E06AF0 80241790 AFB500DC */ sw $s5, 0xdc($sp) +/* E06AF4 80241794 AFB400D8 */ sw $s4, 0xd8($sp) +/* E06AF8 80241798 AFB300D4 */ sw $s3, 0xd4($sp) +/* E06AFC 8024179C AFB200D0 */ sw $s2, 0xd0($sp) +/* E06B00 802417A0 F7BC0108 */ sdc1 $f28, 0x108($sp) +/* E06B04 802417A4 F7BA0100 */ sdc1 $f26, 0x100($sp) +/* E06B08 802417A8 F7B800F8 */ sdc1 $f24, 0xf8($sp) +/* E06B0C 802417AC F7B600F0 */ sdc1 $f22, 0xf0($sp) +/* E06B10 802417B0 F7B400E8 */ sdc1 $f20, 0xe8($sp) +/* E06B14 802417B4 C6140010 */ lwc1 $f20, 0x10($s0) +/* E06B18 802417B8 4680A520 */ cvt.s.w $f20, $f20 +/* E06B1C 802417BC 4480B000 */ mtc1 $zero, $f22 +/* E06B20 802417C0 3C05437F */ lui $a1, 0x437f +/* E06B24 802417C4 8E220050 */ lw $v0, 0x50($s1) +/* E06B28 802417C8 4406B000 */ mfc1 $a2, $f22 +/* E06B2C 802417CC C61C0014 */ lwc1 $f28, 0x14($s0) +/* E06B30 802417D0 4680E720 */ cvt.s.w $f28, $f28 +/* E06B34 802417D4 AFA20010 */ sw $v0, 0x10($sp) +/* E06B38 802417D8 8E070018 */ lw $a3, 0x18($s0) +/* E06B3C 802417DC 0C00A8ED */ jal update_lerp +/* E06B40 802417E0 2404000B */ addiu $a0, $zero, 0xb +/* E06B44 802417E4 4600008D */ trunc.w.s $f2, $f0 +/* E06B48 802417E8 E7A20014 */ swc1 $f2, 0x14($sp) +/* E06B4C 802417EC 0000202D */ daddu $a0, $zero, $zero +/* E06B50 802417F0 24050007 */ addiu $a1, $zero, 7 +/* E06B54 802417F4 240600FF */ addiu $a2, $zero, 0xff +/* E06B58 802417F8 00C0382D */ daddu $a3, $a2, $zero +/* E06B5C 802417FC 00C0A82D */ daddu $s5, $a2, $zero +/* E06B60 80241800 AFB50010 */ sw $s5, 0x10($sp) +/* E06B64 80241804 0C04EAA7 */ jal func_8013AA9C +/* E06B68 80241808 AFA00018 */ sw $zero, 0x18($sp) +/* E06B6C 8024180C 8E220050 */ lw $v0, 0x50($s1) +/* E06B70 80241810 4405B000 */ mfc1 $a1, $f22 +/* E06B74 80241814 3C064270 */ lui $a2, 0x4270 +/* E06B78 80241818 AFA20010 */ sw $v0, 0x10($sp) +/* E06B7C 8024181C 8E070018 */ lw $a3, 0x18($s0) +/* E06B80 80241820 0C00A8ED */ jal update_lerp +/* E06B84 80241824 0000202D */ daddu $a0, $zero, $zero +/* E06B88 80241828 27A20038 */ addiu $v0, $sp, 0x38 +/* E06B8C 8024182C AFA20010 */ sw $v0, 0x10($sp) +/* E06B90 80241830 8E040004 */ lw $a0, 4($s0) +/* E06B94 80241834 8E050008 */ lw $a1, 8($s0) +/* E06B98 80241838 8E060000 */ lw $a2, ($s0) +/* E06B9C 8024183C 8E07000C */ lw $a3, 0xc($s0) +/* E06BA0 80241840 0C04BA38 */ jal func_8012E8E0 +/* E06BA4 80241844 46000606 */ mov.s $f24, $f0 +/* E06BA8 80241848 93A20042 */ lbu $v0, 0x42($sp) +/* E06BAC 8024184C 3C013FE0 */ lui $at, 0x3fe0 +/* E06BB0 80241850 4481D800 */ mtc1 $at, $f27 +/* E06BB4 80241854 4480D000 */ mtc1 $zero, $f26 +/* E06BB8 80241858 44820000 */ mtc1 $v0, $f0 +/* E06BBC 8024185C 00000000 */ nop +/* E06BC0 80241860 46800021 */ cvt.d.w $f0, $f0 +/* E06BC4 80241864 463A0002 */ mul.d $f0, $f0, $f26 +/* 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 +/* E06BD8 80241878 27B10048 */ addiu $s1, $sp, 0x48 +/* E06BDC 8024187C 4600E707 */ neg.s $f28, $f28 +/* E06BE0 80241880 4620A500 */ add.d $f20, $f20, $f0 +/* E06BE4 80241884 4406E000 */ mfc1 $a2, $f28 +/* E06BE8 80241888 4407B000 */ mfc1 $a3, $f22 +/* E06BEC 8024188C 4620A520 */ cvt.s.d $f20, $f20 +/* E06BF0 80241890 4405A000 */ mfc1 $a1, $f20 +/* E06BF4 80241894 0C019E40 */ jal guTranslateF +/* E06BF8 80241898 0220202D */ daddu $a0, $s1, $zero +/* E06BFC 8024189C 27B00088 */ addiu $s0, $sp, 0x88 +/* E06C00 802418A0 4405C000 */ mfc1 $a1, $f24 +/* E06C04 802418A4 4406B000 */ mfc1 $a2, $f22 +/* E06C08 802418A8 3C073F80 */ lui $a3, 0x3f80 +/* E06C0C 802418AC 0200202D */ daddu $a0, $s0, $zero +/* E06C10 802418B0 0C019EC8 */ jal guRotateF +/* E06C14 802418B4 AFA60010 */ sw $a2, 0x10($sp) +/* E06C18 802418B8 0200202D */ daddu $a0, $s0, $zero +/* E06C1C 802418BC 0220282D */ daddu $a1, $s1, $zero +/* E06C20 802418C0 0C019D80 */ jal guMtxCatF +/* E06C24 802418C4 0220302D */ daddu $a2, $s1, $zero +/* E06C28 802418C8 0220202D */ daddu $a0, $s1, $zero +/* E06C2C 802418CC 3C128007 */ lui $s2, 0x8007 +/* E06C30 802418D0 265241F0 */ addiu $s2, $s2, 0x41f0 +/* E06C34 802418D4 3C13800A */ lui $s3, 0x800a +/* E06C38 802418D8 2673A674 */ addiu $s3, $s3, -0x598c +/* E06C3C 802418DC 96450000 */ lhu $a1, ($s2) +/* E06C40 802418E0 8E620000 */ lw $v0, ($s3) +/* E06C44 802418E4 00052980 */ sll $a1, $a1, 6 +/* E06C48 802418E8 00B42821 */ addu $a1, $a1, $s4 +/* E06C4C 802418EC 0C019D40 */ jal guMtxF2L +/* E06C50 802418F0 00452821 */ addu $a1, $v0, $a1 +/* E06C54 802418F4 3C03DA38 */ lui $v1, 0xda38 +/* E06C58 802418F8 34630002 */ ori $v1, $v1, 2 +/* E06C5C 802418FC 0000202D */ daddu $a0, $zero, $zero +/* 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, 0x800a +/* E06C70 80241910 2610A66C */ addiu $s0, $s0, -0x5994 +/* E06C74 80241914 0220382D */ daddu $a3, $s1, $zero +/* E06C78 80241918 8E020000 */ lw $v0, ($s0) +/* E06C7C 8024191C 96480000 */ lhu $t0, ($s2) +/* E06C80 80241920 0040482D */ daddu $t1, $v0, $zero +/* E06C84 80241924 24420008 */ addiu $v0, $v0, 8 +/* E06C88 80241928 AE020000 */ sw $v0, ($s0) +/* E06C8C 8024192C 3102FFFF */ andi $v0, $t0, 0xffff +/* E06C90 80241930 00021180 */ sll $v0, $v0, 6 +/* E06C94 80241934 00541021 */ addu $v0, $v0, $s4 +/* E06C98 80241938 AD230000 */ sw $v1, ($t1) +/* E06C9C 8024193C 8E630000 */ lw $v1, ($s3) +/* E06CA0 80241940 25080001 */ addiu $t0, $t0, 1 +/* E06CA4 80241944 00621821 */ addu $v1, $v1, $v0 +/* E06CA8 80241948 3C028000 */ lui $v0, 0x8000 +/* E06CAC 8024194C 00621821 */ addu $v1, $v1, $v0 +/* E06CB0 80241950 AD230004 */ sw $v1, 4($t1) +/* E06CB4 80241954 93A20042 */ lbu $v0, 0x42($sp) +/* E06CB8 80241958 8FA3003C */ lw $v1, 0x3c($sp) +/* E06CBC 8024195C 93A90040 */ lbu $t1, 0x40($sp) +/* E06CC0 80241960 93AA0041 */ lbu $t2, 0x41($sp) +/* E06CC4 80241964 44820000 */ mtc1 $v0, $f0 +/* 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 +/* E06CDC 8024197C A6480000 */ sh $t0, ($s2) +/* E06CE0 80241980 A7A0002E */ sh $zero, 0x2e($sp) +/* E06CE4 80241984 A3B50030 */ sb $s5, 0x30($sp) +/* E06CE8 80241988 AFA30024 */ sw $v1, 0x24($sp) +/* E06CEC 8024198C A7A90028 */ sh $t1, 0x28($sp) +/* E06CF0 80241990 A7AA002A */ sh $t2, 0x2a($sp) +/* E06CF4 80241994 AFA20020 */ sw $v0, 0x20($sp) +/* E06CF8 80241998 46200007 */ neg.d $f0, $f0 +/* E06CFC 8024199C 4620008D */ trunc.w.d $f2, $f0 +/* E06D00 802419A0 44021000 */ mfc1 $v0, $f2 +/* E06D04 802419A4 0C04EBDC */ jal func_8013AF70 +/* E06D08 802419A8 A7A2002C */ sh $v0, 0x2c($sp) +/* E06D0C 802419AC 3C04D838 */ lui $a0, 0xd838 +/* E06D10 802419B0 8E020000 */ lw $v0, ($s0) +/* E06D14 802419B4 34840002 */ ori $a0, $a0, 2 +/* E06D18 802419B8 0040182D */ daddu $v1, $v0, $zero +/* E06D1C 802419BC 24420008 */ addiu $v0, $v0, 8 +/* E06D20 802419C0 AE020000 */ sw $v0, ($s0) +/* E06D24 802419C4 24020040 */ addiu $v0, $zero, 0x40 +/* E06D28 802419C8 AC640000 */ sw $a0, ($v1) +/* E06D2C 802419CC AC620004 */ sw $v0, 4($v1) +/* E06D30 802419D0 8FBF00E0 */ lw $ra, 0xe0($sp) +/* E06D34 802419D4 8FB500DC */ lw $s5, 0xdc($sp) +/* E06D38 802419D8 8FB400D8 */ lw $s4, 0xd8($sp) +/* E06D3C 802419DC 8FB300D4 */ lw $s3, 0xd4($sp) +/* E06D40 802419E0 8FB200D0 */ lw $s2, 0xd0($sp) +/* E06D44 802419E4 8FB100CC */ lw $s1, 0xcc($sp) +/* E06D48 802419E8 8FB000C8 */ lw $s0, 0xc8($sp) +/* E06D4C 802419EC D7BC0108 */ ldc1 $f28, 0x108($sp) +/* E06D50 802419F0 D7BA0100 */ ldc1 $f26, 0x100($sp) +/* E06D54 802419F4 D7B800F8 */ ldc1 $f24, 0xf8($sp) +/* E06D58 802419F8 D7B600F0 */ ldc1 $f22, 0xf0($sp) +/* E06D5C 802419FC D7B400E8 */ ldc1 $f20, 0xe8($sp) +/* E06D60 80241A00 03E00008 */ jr $ra +/* E06D64 80241A04 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44.s deleted file mode 100644 index 2f2198d4bb..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44.s +++ /dev/null @@ -1,470 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B44 -/* E06EA4 80241B44 27BDFF80 */ addiu $sp, $sp, -0x80 -/* E06EA8 80241B48 AFB30064 */ sw $s3, 0x64($sp) -/* E06EAC 80241B4C 0080982D */ daddu $s3, $a0, $zero -/* E06EB0 80241B50 AFBE0078 */ sw $fp, 0x78($sp) -/* E06EB4 80241B54 0000F02D */ daddu $fp, $zero, $zero -/* E06EB8 80241B58 AFBF007C */ sw $ra, 0x7c($sp) -/* E06EBC 80241B5C AFB70074 */ sw $s7, 0x74($sp) -/* E06EC0 80241B60 AFB60070 */ sw $s6, 0x70($sp) -/* E06EC4 80241B64 AFB5006C */ sw $s5, 0x6c($sp) -/* E06EC8 80241B68 AFB40068 */ sw $s4, 0x68($sp) -/* E06ECC 80241B6C AFB20060 */ sw $s2, 0x60($sp) -/* E06ED0 80241B70 AFB1005C */ sw $s1, 0x5c($sp) -/* E06ED4 80241B74 AFB00058 */ sw $s0, 0x58($sp) -/* E06ED8 80241B78 96630070 */ lhu $v1, 0x70($s3) -/* E06EDC 80241B7C 30620002 */ andi $v0, $v1, 2 -/* E06EE0 80241B80 10400005 */ beqz $v0, .L80241B98 -/* E06EE4 80241B84 27B00020 */ addiu $s0, $sp, 0x20 -/* E06EE8 80241B88 3062FFFD */ andi $v0, $v1, 0xfffd -/* E06EEC 80241B8C A6620070 */ sh $v0, 0x70($s3) -/* E06EF0 80241B90 AE600008 */ sw $zero, 8($s3) -/* E06EF4 80241B94 AE60000C */ sw $zero, 0xc($s3) -.L80241B98: -/* E06EF8 80241B98 27A50040 */ addiu $a1, $sp, 0x40 -/* E06EFC 80241B9C 27A60044 */ addiu $a2, $sp, 0x44 -/* E06F00 80241BA0 27A70048 */ addiu $a3, $sp, 0x48 -/* E06F04 80241BA4 0000882D */ daddu $s1, $zero, $zero -/* E06F08 80241BA8 AFA00010 */ sw $zero, 0x10($sp) -/* E06F0C 80241BAC AFA00014 */ sw $zero, 0x14($sp) -/* E06F10 80241BB0 AFA00018 */ sw $zero, 0x18($sp) -/* E06F14 80241BB4 AFA0001C */ sw $zero, 0x1c($sp) -/* E06F18 80241BB8 8E640000 */ lw $a0, ($s3) -/* E06F1C 80241BBC 0C0497DA */ jal get_string_properties -/* E06F20 80241BC0 24170008 */ addiu $s7, $zero, 8 -/* E06F24 80241BC4 24020001 */ addiu $v0, $zero, 1 -/* E06F28 80241BC8 AFA00024 */ sw $zero, 0x24($sp) -/* E06F2C 80241BCC AFA00028 */ sw $zero, 0x28($sp) -/* E06F30 80241BD0 AFA20044 */ sw $v0, 0x44($sp) -.L80241BD4: -/* E06F34 80241BD4 8E620000 */ lw $v0, ($s3) -/* E06F38 80241BD8 00511821 */ addu $v1, $v0, $s1 -/* E06F3C 80241BDC 26310001 */ addiu $s1, $s1, 1 -/* E06F40 80241BE0 00511021 */ addu $v0, $v0, $s1 -/* E06F44 80241BE4 90740000 */ lbu $s4, ($v1) -/* E06F48 80241BE8 90550000 */ lbu $s5, ($v0) -/* E06F4C 80241BEC 2684FF10 */ addiu $a0, $s4, -0xf0 -/* E06F50 80241BF0 2C830010 */ sltiu $v1, $a0, 0x10 -/* E06F54 80241BF4 10600017 */ beqz $v1, .L80241C54 -/* E06F58 80241BF8 0000B02D */ daddu $s6, $zero, $zero -/* E06F5C 80241BFC 00041080 */ sll $v0, $a0, 2 -/* E06F60 80241C00 3C098025 */ lui $t1, 0x8025 -/* E06F64 80241C04 252993A0 */ addiu $t1, $t1, -0x6c60 -/* E06F68 80241C08 00491021 */ addu $v0, $v0, $t1 -/* E06F6C 80241C0C 8C420000 */ lw $v0, ($v0) -/* E06F70 80241C10 00400008 */ jr $v0 -/* E06F74 80241C14 00000000 */ nop -/* E06F78 80241C18 2682FF0D */ addiu $v0, $s4, -0xf3 -/* E06F7C 80241C1C 08090747 */ j .L80241D1C -/* E06F80 80241C20 AE020008 */ sw $v0, 8($s0) -/* E06F84 80241C24 08090747 */ j .L80241D1C -/* E06F88 80241C28 24160001 */ addiu $s6, $zero, 1 -/* E06F8C 80241C2C 8E630000 */ lw $v1, ($s3) -/* E06F90 80241C30 00711021 */ addu $v0, $v1, $s1 -/* E06F94 80241C34 90420000 */ lbu $v0, ($v0) -/* E06F98 80241C38 14400038 */ bnez $v0, .L80241D1C -/* E06F9C 80241C3C 26310001 */ addiu $s1, $s1, 1 -/* E06FA0 80241C40 00711021 */ addu $v0, $v1, $s1 -/* E06FA4 80241C44 90420000 */ lbu $v0, ($v0) -/* E06FA8 80241C48 26310001 */ addiu $s1, $s1, 1 -/* E06FAC 80241C4C 08090747 */ j .L80241D1C -/* E06FB0 80241C50 AE020004 */ sw $v0, 4($s0) -.L80241C54: -/* E06FB4 80241C54 24020001 */ addiu $v0, $zero, 1 -/* E06FB8 80241C58 329200FF */ andi $s2, $s4, 0xff -/* E06FBC 80241C5C AFA00010 */ sw $zero, 0x10($sp) -/* E06FC0 80241C60 AFA20014 */ sw $v0, 0x14($sp) -/* E06FC4 80241C64 8E050004 */ lw $a1, 4($s0) -/* E06FC8 80241C68 8E060008 */ lw $a2, 8($s0) -/* E06FCC 80241C6C 3C073F80 */ lui $a3, 0x3f80 -/* E06FD0 80241C70 0C049721 */ jal func_80125C84 -/* E06FD4 80241C74 0240202D */ daddu $a0, $s2, $zero -/* E06FD8 80241C78 8FA30044 */ lw $v1, 0x44($sp) -/* E06FDC 80241C7C 8E040004 */ lw $a0, 4($s0) -/* E06FE0 80241C80 2463FFFF */ addiu $v1, $v1, -1 -/* E06FE4 80241C84 00621821 */ addu $v1, $v1, $v0 -/* E06FE8 80241C88 2482FFFD */ addiu $v0, $a0, -3 -/* E06FEC 80241C8C 2C420002 */ sltiu $v0, $v0, 2 -/* E06FF0 80241C90 10400022 */ beqz $v0, .L80241D1C -/* E06FF4 80241C94 AFA30044 */ sw $v1, 0x44($sp) -/* E06FF8 80241C98 3C058024 */ lui $a1, 0x8024 -/* E06FFC 80241C9C 24A53178 */ addiu $a1, $a1, 0x3178 -/* E07000 80241CA0 24090004 */ addiu $t1, $zero, 4 -/* E07004 80241CA4 14890003 */ bne $a0, $t1, .L80241CB4 -/* E07008 80241CA8 00000000 */ nop -/* E0700C 80241CAC 3C058024 */ lui $a1, 0x8024 -/* E07010 80241CB0 24A53110 */ addiu $a1, $a1, 0x3110 -.L80241CB4: -/* E07014 80241CB4 14890007 */ bne $a0, $t1, .L80241CD4 -/* E07018 80241CB8 0000302D */ daddu $a2, $zero, $zero -/* E0701C 80241CBC 12570004 */ beq $s2, $s7, .L80241CD0 -/* E07020 80241CC0 24620001 */ addiu $v0, $v1, 1 -/* E07024 80241CC4 16B70004 */ bne $s5, $s7, .L80241CD8 -/* E07028 80241CC8 328800FF */ andi $t0, $s4, 0xff -/* E0702C 80241CCC 24620001 */ addiu $v0, $v1, 1 -.L80241CD0: -/* E07030 80241CD0 AFA20044 */ sw $v0, 0x44($sp) -.L80241CD4: -/* E07034 80241CD4 328800FF */ andi $t0, $s4, 0xff -.L80241CD8: -/* E07038 80241CD8 32A7FFFF */ andi $a3, $s5, 0xffff -/* E0703C 80241CDC 00061080 */ sll $v0, $a2, 2 -/* E07040 80241CE0 00452021 */ addu $a0, $v0, $a1 -.L80241CE4: -/* E07044 80241CE4 90820000 */ lbu $v0, ($a0) -/* E07048 80241CE8 55020009 */ bnel $t0, $v0, .L80241D10 -/* E0704C 80241CEC 24840004 */ addiu $a0, $a0, 4 -/* E07050 80241CF0 90820001 */ lbu $v0, 1($a0) -/* E07054 80241CF4 54E20006 */ bnel $a3, $v0, .L80241D10 -/* E07058 80241CF8 24840004 */ addiu $a0, $a0, 4 -/* E0705C 80241CFC 84830002 */ lh $v1, 2($a0) -/* E07060 80241D00 8FA20044 */ lw $v0, 0x44($sp) -/* E07064 80241D04 00431021 */ addu $v0, $v0, $v1 -/* E07068 80241D08 AFA20044 */ sw $v0, 0x44($sp) -/* E0706C 80241D0C 24840004 */ addiu $a0, $a0, 4 -.L80241D10: -/* E07070 80241D10 84820002 */ lh $v0, 2($a0) -/* E07074 80241D14 1440FFF3 */ bnez $v0, .L80241CE4 -/* E07078 80241D18 00000000 */ nop -.L80241D1C: -/* E0707C 80241D1C 32C2FFFF */ andi $v0, $s6, 0xffff -/* E07080 80241D20 1040FFAC */ beqz $v0, .L80241BD4 -/* E07084 80241D24 00000000 */ nop -/* E07088 80241D28 96620070 */ lhu $v0, 0x70($s3) -/* E0708C 80241D2C 8FA30044 */ lw $v1, 0x44($sp) -/* E07090 80241D30 30420001 */ andi $v0, $v0, 1 -/* E07094 80241D34 10400015 */ beqz $v0, .L80241D8C -/* E07098 80241D38 AE630014 */ sw $v1, 0x14($s3) -/* E0709C 80241D3C 44831000 */ mtc1 $v1, $f2 -/* E070A0 80241D40 00000000 */ nop -/* E070A4 80241D44 468010A0 */ cvt.s.w $f2, $f2 -/* E070A8 80241D48 3C013FE0 */ lui $at, 0x3fe0 -/* E070AC 80241D4C 44810800 */ mtc1 $at, $f1 -/* E070B0 80241D50 44800000 */ mtc1 $zero, $f0 -/* E070B4 80241D54 460010A1 */ cvt.d.s $f2, $f2 -/* E070B8 80241D58 46201082 */ mul.d $f2, $f2, $f0 -/* E070BC 80241D5C 00000000 */ nop -/* E070C0 80241D60 44800000 */ mtc1 $zero, $f0 -/* E070C4 80241D64 44800800 */ mtc1 $zero, $f1 -/* E070C8 80241D68 00000000 */ nop -/* E070CC 80241D6C 46201080 */ add.d $f2, $f2, $f0 -/* E070D0 80241D70 C6600068 */ lwc1 $f0, 0x68($s3) -/* E070D4 80241D74 46800021 */ cvt.d.w $f0, $f0 -/* E070D8 80241D78 46220001 */ sub.d $f0, $f0, $f2 -/* E070DC 80241D7C 4620010D */ trunc.w.d $f4, $f0 -/* E070E0 80241D80 44152000 */ mfc1 $s5, $f4 -/* E070E4 80241D84 08090765 */ j .L80241D94 -/* E070E8 80241D88 0000B82D */ daddu $s7, $zero, $zero -.L80241D8C: -/* E070EC 80241D8C 8E750068 */ lw $s5, 0x68($s3) -/* E070F0 80241D90 0000B82D */ daddu $s7, $zero, $zero -.L80241D94: -/* E070F4 80241D94 AE000004 */ sw $zero, 4($s0) -/* E070F8 80241D98 AE000008 */ sw $zero, 8($s0) -/* E070FC 80241D9C 8E620010 */ lw $v0, 0x10($s3) -/* E07100 80241DA0 02E0882D */ daddu $s1, $s7, $zero -/* E07104 80241DA4 AE02000C */ sw $v0, 0xc($s0) -.L80241DA8: -/* E07108 80241DA8 8E620000 */ lw $v0, ($s3) -/* E0710C 80241DAC A7A00050 */ sh $zero, 0x50($sp) -/* E07110 80241DB0 00511821 */ addu $v1, $v0, $s1 -/* E07114 80241DB4 26310001 */ addiu $s1, $s1, 1 -/* E07118 80241DB8 00511021 */ addu $v0, $v0, $s1 -/* E0711C 80241DBC 90740000 */ lbu $s4, ($v1) -/* E07120 80241DC0 90560000 */ lbu $s6, ($v0) -/* E07124 80241DC4 2684FF10 */ addiu $a0, $s4, -0xf0 -/* E07128 80241DC8 2C830010 */ sltiu $v1, $a0, 0x10 -/* E0712C 80241DCC 10600016 */ beqz $v1, .L80241E28 -/* E07130 80241DD0 00041080 */ sll $v0, $a0, 2 -/* E07134 80241DD4 3C018025 */ lui $at, 0x8025 -/* E07138 80241DD8 00220821 */ addu $at, $at, $v0 -/* E0713C 80241DDC 8C2293E0 */ lw $v0, -0x6c20($at) -/* E07140 80241DE0 00400008 */ jr $v0 -/* E07144 80241DE4 00000000 */ nop -/* E07148 80241DE8 2682FF0D */ addiu $v0, $s4, -0xf3 -/* E0714C 80241DEC 0809083F */ j .L802420FC -/* E07150 80241DF0 AE020008 */ sw $v0, 8($s0) -/* E07154 80241DF4 24090001 */ addiu $t1, $zero, 1 -/* E07158 80241DF8 0809083F */ j .L802420FC -/* E0715C 80241DFC A7A90050 */ sh $t1, 0x50($sp) -/* E07160 80241E00 8E630000 */ lw $v1, ($s3) -/* E07164 80241E04 00711021 */ addu $v0, $v1, $s1 -/* E07168 80241E08 90420000 */ lbu $v0, ($v0) -/* E0716C 80241E0C 144000BB */ bnez $v0, .L802420FC -/* E07170 80241E10 26310001 */ addiu $s1, $s1, 1 -/* E07174 80241E14 00711021 */ addu $v0, $v1, $s1 -/* E07178 80241E18 90420000 */ lbu $v0, ($v0) -/* E0717C 80241E1C 26310001 */ addiu $s1, $s1, 1 -/* E07180 80241E20 0809083F */ j .L802420FC -/* E07184 80241E24 AE020004 */ sw $v0, 4($s0) -.L80241E28: -/* E07188 80241E28 328300FF */ andi $v1, $s4, 0xff -/* E0718C 80241E2C 2C6200F0 */ sltiu $v0, $v1, 0xf0 -/* E07190 80241E30 10400083 */ beqz $v0, .L80242040 -/* E07194 80241E34 24090001 */ addiu $t1, $zero, 1 -/* E07198 80241E38 AE030000 */ sw $v1, ($s0) -/* E0719C 80241E3C AE150010 */ sw $s5, 0x10($s0) -/* E071A0 80241E40 8E62006C */ lw $v0, 0x6c($s3) -/* E071A4 80241E44 AE020014 */ sw $v0, 0x14($s0) -/* E071A8 80241E48 8E63000C */ lw $v1, 0xc($s3) -/* E071AC 80241E4C 1069003F */ beq $v1, $t1, .L80241F4C -/* E071B0 80241E50 28620002 */ slti $v0, $v1, 2 -/* E071B4 80241E54 50400005 */ beql $v0, $zero, .L80241E6C -/* E071B8 80241E58 24090002 */ addiu $t1, $zero, 2 -/* E071BC 80241E5C 10600007 */ beqz $v1, .L80241E7C -/* E071C0 80241E60 00000000 */ nop -/* E071C4 80241E64 08090811 */ j .L80242044 -/* E071C8 80241E68 26F70001 */ addiu $s7, $s7, 1 -.L80241E6C: -/* E071CC 80241E6C 10690043 */ beq $v1, $t1, .L80241F7C -/* E071D0 80241E70 00000000 */ nop -/* E071D4 80241E74 08090810 */ j .L80242040 -/* E071D8 80241E78 26F70001 */ addiu $s7, $s7, 1 -.L80241E7C: -/* E071DC 80241E7C 8E620020 */ lw $v0, 0x20($s3) -/* E071E0 80241E80 00570018 */ mult $v0, $s7 -/* E071E4 80241E84 8E620008 */ lw $v0, 8($s3) -/* E071E8 80241E88 00004812 */ mflo $t1 -/* E071EC 80241E8C 00491023 */ subu $v0, $v0, $t1 -/* E071F0 80241E90 0440006A */ bltz $v0, .L8024203C -/* E071F4 80241E94 AE020018 */ sw $v0, 0x18($s0) -/* E071F8 80241E98 8E63001C */ lw $v1, 0x1c($s3) -/* E071FC 80241E9C 0062102A */ slt $v0, $v1, $v0 -/* E07200 80241EA0 54400001 */ bnel $v0, $zero, .L80241EA8 -/* E07204 80241EA4 AE030018 */ sw $v1, 0x18($s0) -.L80241EA8: -/* E07208 80241EA8 240900FD */ addiu $t1, $zero, 0xfd -/* E0720C 80241EAC 16C90005 */ bne $s6, $t1, .L80241EC4 -/* E07210 80241EB0 00000000 */ nop -/* E07214 80241EB4 8E030018 */ lw $v1, 0x18($s0) -/* E07218 80241EB8 8E62001C */ lw $v0, 0x1c($s3) -/* E0721C 80241EBC 50620001 */ beql $v1, $v0, .L80241EC4 -/* E07220 80241EC0 241E0001 */ addiu $fp, $zero, 1 -.L80241EC4: -/* E07224 80241EC4 8E630018 */ lw $v1, 0x18($s3) -/* E07228 80241EC8 2C620006 */ sltiu $v0, $v1, 6 -/* E0722C 80241ECC 1040005B */ beqz $v0, .L8024203C -/* E07230 80241ED0 00031080 */ sll $v0, $v1, 2 -/* E07234 80241ED4 3C018025 */ lui $at, 0x8025 -/* E07238 80241ED8 00220821 */ addu $at, $at, $v0 -/* E0723C 80241EDC 8C229420 */ lw $v0, -0x6be0($at) -/* E07240 80241EE0 00400008 */ jr $v0 -/* E07244 80241EE4 00000000 */ nop -/* E07248 80241EE8 0260202D */ daddu $a0, $s3, $zero -/* E0724C 80241EEC 0C0900A0 */ jal func_80240280 -/* E07250 80241EF0 0200282D */ daddu $a1, $s0, $zero -/* E07254 80241EF4 08090810 */ j .L80242040 -/* E07258 80241EF8 26F70001 */ addiu $s7, $s7, 1 -/* E0725C 80241EFC 0260202D */ daddu $a0, $s3, $zero -/* E07260 80241F00 0C090154 */ jal func_80240550 -/* E07264 80241F04 0200282D */ daddu $a1, $s0, $zero -/* E07268 80241F08 08090810 */ j .L80242040 -/* E0726C 80241F0C 26F70001 */ addiu $s7, $s7, 1 -/* E07270 80241F10 0260202D */ daddu $a0, $s3, $zero -/* E07274 80241F14 0C09020B */ jal func_8024082C -/* E07278 80241F18 0200282D */ daddu $a1, $s0, $zero -/* E0727C 80241F1C 08090810 */ j .L80242040 -/* E07280 80241F20 26F70001 */ addiu $s7, $s7, 1 -/* E07284 80241F24 0260202D */ daddu $a0, $s3, $zero -/* E07288 80241F28 0C0902BE */ jal func_80240AF8_E05E58 -/* E0728C 80241F2C 0200282D */ daddu $a1, $s0, $zero -/* E07290 80241F30 08090810 */ j .L80242040 -/* E07294 80241F34 26F70001 */ addiu $s7, $s7, 1 -/* E07298 80241F38 0260202D */ daddu $a0, $s3, $zero -/* E0729C 80241F3C 0C0903B0 */ jal func_80240EC0 -/* E072A0 80241F40 0200282D */ daddu $a1, $s0, $zero -/* E072A4 80241F44 08090810 */ j .L80242040 -/* E072A8 80241F48 26F70001 */ addiu $s7, $s7, 1 -.L80241F4C: -/* E072AC 80241F4C 240900FD */ addiu $t1, $zero, 0xfd -/* E072B0 80241F50 16C90006 */ bne $s6, $t1, .L80241F6C -/* E072B4 80241F54 0260202D */ daddu $a0, $s3, $zero -/* E072B8 80241F58 8E630008 */ lw $v1, 8($s3) -/* E072BC 80241F5C 8E620038 */ lw $v0, 0x38($s3) -/* E072C0 80241F60 50620002 */ beql $v1, $v0, .L80241F6C -/* E072C4 80241F64 241E0001 */ addiu $fp, $zero, 1 -/* E072C8 80241F68 0260202D */ daddu $a0, $s3, $zero -.L80241F6C: -/* E072CC 80241F6C 0C090477 */ jal func_802411DC -/* E072D0 80241F70 0200282D */ daddu $a1, $s0, $zero -/* E072D4 80241F74 08090810 */ j .L80242040 -/* E072D8 80241F78 26F70001 */ addiu $s7, $s7, 1 -.L80241F7C: -/* E072DC 80241F7C 8E620054 */ lw $v0, 0x54($s3) -/* E072E0 80241F80 00570018 */ mult $v0, $s7 -/* E072E4 80241F84 8E620008 */ lw $v0, 8($s3) -/* E072E8 80241F88 00004812 */ mflo $t1 -/* E072EC 80241F8C 00491023 */ subu $v0, $v0, $t1 -/* E072F0 80241F90 04410002 */ bgez $v0, .L80241F9C -/* E072F4 80241F94 AE020018 */ sw $v0, 0x18($s0) -/* E072F8 80241F98 AE000018 */ sw $zero, 0x18($s0) -.L80241F9C: -/* E072FC 80241F9C 8E020018 */ lw $v0, 0x18($s0) -/* E07300 80241FA0 8E630050 */ lw $v1, 0x50($s3) -/* E07304 80241FA4 0062102A */ slt $v0, $v1, $v0 -/* E07308 80241FA8 54400001 */ bnel $v0, $zero, .L80241FB0 -/* E0730C 80241FAC AE030018 */ sw $v1, 0x18($s0) -.L80241FB0: -/* E07310 80241FB0 240900FD */ addiu $t1, $zero, 0xfd -/* E07314 80241FB4 16C90005 */ bne $s6, $t1, .L80241FCC -/* E07318 80241FB8 00000000 */ nop -/* E0731C 80241FBC 8E030018 */ lw $v1, 0x18($s0) -/* E07320 80241FC0 8E620050 */ lw $v0, 0x50($s3) -/* E07324 80241FC4 50620001 */ beql $v1, $v0, .L80241FCC -/* E07328 80241FC8 241E0001 */ addiu $fp, $zero, 1 -.L80241FCC: -/* E0732C 80241FCC 8E63004C */ lw $v1, 0x4c($s3) -/* E07330 80241FD0 24090001 */ addiu $t1, $zero, 1 -/* E07334 80241FD4 1069000D */ beq $v1, $t1, .L8024200C -/* E07338 80241FD8 28620002 */ slti $v0, $v1, 2 -/* E0733C 80241FDC 50400005 */ beql $v0, $zero, .L80241FF4 -/* E07340 80241FE0 24090002 */ addiu $t1, $zero, 2 -/* E07344 80241FE4 10600013 */ beqz $v1, .L80242034 -/* E07348 80241FE8 0260202D */ daddu $a0, $s3, $zero -/* E0734C 80241FEC 08090811 */ j .L80242044 -/* E07350 80241FF0 26F70001 */ addiu $s7, $s7, 1 -.L80241FF4: -/* E07354 80241FF4 1069000A */ beq $v1, $t1, .L80242020 -/* E07358 80241FF8 24020003 */ addiu $v0, $zero, 3 -/* E0735C 80241FFC 1062000D */ beq $v1, $v0, .L80242034 -/* E07360 80242000 0260202D */ daddu $a0, $s3, $zero -/* E07364 80242004 08090810 */ j .L80242040 -/* E07368 80242008 26F70001 */ addiu $s7, $s7, 1 -.L8024200C: -/* E0736C 8024200C 0260202D */ daddu $a0, $s3, $zero -/* E07370 80242010 0C090537 */ jal func_802414DC -/* E07374 80242014 0200282D */ daddu $a1, $s0, $zero -/* E07378 80242018 08090810 */ j .L80242040 -/* E0737C 8024201C 26F70001 */ addiu $s7, $s7, 1 -.L80242020: -/* E07380 80242020 0260202D */ daddu $a0, $s3, $zero -/* E07384 80242024 0C0905DE */ jal func_80241778 -/* E07388 80242028 0200282D */ daddu $a1, $s0, $zero -/* E0738C 8024202C 08090810 */ j .L80242040 -/* E07390 80242030 26F70001 */ addiu $s7, $s7, 1 -.L80242034: -/* E07394 80242034 0C090682 */ jal func_80241A08 -/* E07398 80242038 0200282D */ daddu $a1, $s0, $zero -.L8024203C: -/* E0739C 8024203C 26F70001 */ addiu $s7, $s7, 1 -.L80242040: -/* E073A0 80242040 24090001 */ addiu $t1, $zero, 1 -.L80242044: -/* E073A4 80242044 329200FF */ andi $s2, $s4, 0xff -/* E073A8 80242048 AFA00010 */ sw $zero, 0x10($sp) -/* E073AC 8024204C AFA90014 */ sw $t1, 0x14($sp) -/* E073B0 80242050 8E050004 */ lw $a1, 4($s0) -/* E073B4 80242054 8E060008 */ lw $a2, 8($s0) -/* E073B8 80242058 3C073F80 */ lui $a3, 0x3f80 -/* E073BC 8024205C 0C049721 */ jal func_80125C84 -/* E073C0 80242060 0240202D */ daddu $a0, $s2, $zero -/* E073C4 80242064 26A3FFFF */ addiu $v1, $s5, -1 -/* E073C8 80242068 8E040004 */ lw $a0, 4($s0) -/* E073CC 8024206C 0062A821 */ addu $s5, $v1, $v0 -/* E073D0 80242070 2482FFFD */ addiu $v0, $a0, -3 -/* E073D4 80242074 2C420002 */ sltiu $v0, $v0, 2 -/* E073D8 80242078 10400020 */ beqz $v0, .L802420FC -/* E073DC 8024207C 00000000 */ nop -/* E073E0 80242080 3C058024 */ lui $a1, 0x8024 -/* E073E4 80242084 24A53178 */ addiu $a1, $a1, 0x3178 -/* E073E8 80242088 24090004 */ addiu $t1, $zero, 4 -/* E073EC 8024208C 14890003 */ bne $a0, $t1, .L8024209C -/* E073F0 80242090 00000000 */ nop -/* E073F4 80242094 3C058024 */ lui $a1, 0x8024 -/* E073F8 80242098 24A53110 */ addiu $a1, $a1, 0x3110 -.L8024209C: -/* E073FC 8024209C 14890007 */ bne $a0, $t1, .L802420BC -/* E07400 802420A0 0000302D */ daddu $a2, $zero, $zero -/* E07404 802420A4 24020008 */ addiu $v0, $zero, 8 -/* E07408 802420A8 52420004 */ beql $s2, $v0, .L802420BC -/* E0740C 802420AC 26B50001 */ addiu $s5, $s5, 1 -/* E07410 802420B0 16C20003 */ bne $s6, $v0, .L802420C0 -/* E07414 802420B4 328300FF */ andi $v1, $s4, 0xff -/* E07418 802420B8 26B50001 */ addiu $s5, $s5, 1 -.L802420BC: -/* E0741C 802420BC 328300FF */ andi $v1, $s4, 0xff -.L802420C0: -/* E07420 802420C0 32C7FFFF */ andi $a3, $s6, 0xffff -/* E07424 802420C4 00061080 */ sll $v0, $a2, 2 -/* E07428 802420C8 00452021 */ addu $a0, $v0, $a1 -.L802420CC: -/* E0742C 802420CC 90820000 */ lbu $v0, ($a0) -/* E07430 802420D0 54620007 */ bnel $v1, $v0, .L802420F0 -/* E07434 802420D4 24840004 */ addiu $a0, $a0, 4 -/* E07438 802420D8 90820001 */ lbu $v0, 1($a0) -/* E0743C 802420DC 54E20004 */ bnel $a3, $v0, .L802420F0 -/* E07440 802420E0 24840004 */ addiu $a0, $a0, 4 -/* E07444 802420E4 84820002 */ lh $v0, 2($a0) -/* E07448 802420E8 02A2A821 */ addu $s5, $s5, $v0 -/* E0744C 802420EC 24840004 */ addiu $a0, $a0, 4 -.L802420F0: -/* E07450 802420F0 84820002 */ lh $v0, 2($a0) -/* E07454 802420F4 1440FFF5 */ bnez $v0, .L802420CC -/* E07458 802420F8 00000000 */ nop -.L802420FC: -/* E0745C 802420FC 97A20050 */ lhu $v0, 0x50($sp) -/* E07460 80242100 1040FF29 */ beqz $v0, .L80241DA8 -/* E07464 80242104 00000000 */ nop -/* E07468 80242108 8E62000C */ lw $v0, 0xc($s3) -/* E0746C 8024210C 14400015 */ bnez $v0, .L80242164 -/* E07470 80242110 00000000 */ nop -/* E07474 80242114 13C00013 */ beqz $fp, .L80242164 -/* E07478 80242118 0000282D */ daddu $a1, $zero, $zero -/* E0747C 8024211C 00A0302D */ daddu $a2, $a1, $zero -/* E07480 80242120 AFA0004C */ sw $zero, 0x4c($sp) -/* E07484 80242124 AFA00010 */ sw $zero, 0x10($sp) -/* E07488 80242128 AFA00014 */ sw $zero, 0x14($sp) -/* E0748C 8024212C AFA00018 */ sw $zero, 0x18($sp) -/* E07490 80242130 AFA0001C */ sw $zero, 0x1c($sp) -/* E07494 80242134 8E640000 */ lw $a0, ($s3) -/* E07498 80242138 0C0497DA */ jal get_string_properties -/* E0749C 8024213C 27A7004C */ addiu $a3, $sp, 0x4c -/* E074A0 80242140 8E64000C */ lw $a0, 0xc($s3) -/* E074A4 80242144 8E630038 */ lw $v1, 0x38($s3) -/* E074A8 80242148 AE600008 */ sw $zero, 8($s3) -/* E074AC 8024214C 24820001 */ addiu $v0, $a0, 1 -/* E074B0 80242150 1C600016 */ bgtz $v1, .L802421AC -/* E074B4 80242154 AE62000C */ sw $v0, 0xc($s3) -/* E074B8 80242158 24820002 */ addiu $v0, $a0, 2 -/* E074BC 8024215C 0809086B */ j .L802421AC -/* E074C0 80242160 AE62000C */ sw $v0, 0xc($s3) -.L80242164: -/* E074C4 80242164 8E63000C */ lw $v1, 0xc($s3) -/* E074C8 80242168 24020001 */ addiu $v0, $zero, 1 -/* E074CC 8024216C 14620008 */ bne $v1, $v0, .L80242190 -/* E074D0 80242170 24020002 */ addiu $v0, $zero, 2 -/* E074D4 80242174 13C00005 */ beqz $fp, .L8024218C -/* E074D8 80242178 0060102D */ daddu $v0, $v1, $zero -/* E074DC 8024217C 24420001 */ addiu $v0, $v0, 1 -/* E074E0 80242180 AE600008 */ sw $zero, 8($s3) -/* E074E4 80242184 0809086B */ j .L802421AC -/* E074E8 80242188 AE62000C */ sw $v0, 0xc($s3) -.L8024218C: -/* E074EC 8024218C 24020002 */ addiu $v0, $zero, 2 -.L80242190: -/* E074F0 80242190 14620006 */ bne $v1, $v0, .L802421AC -/* E074F4 80242194 00000000 */ nop -/* E074F8 80242198 13C00004 */ beqz $fp, .L802421AC -/* E074FC 8024219C 00000000 */ nop -/* E07500 802421A0 96620070 */ lhu $v0, 0x70($s3) -/* E07504 802421A4 3042FFFE */ andi $v0, $v0, 0xfffe -/* E07508 802421A8 A6620070 */ sh $v0, 0x70($s3) -.L802421AC: -/* E0750C 802421AC 8E620008 */ lw $v0, 8($s3) -/* E07510 802421B0 24420001 */ addiu $v0, $v0, 1 -/* E07514 802421B4 AE620008 */ sw $v0, 8($s3) -/* E07518 802421B8 8FBF007C */ lw $ra, 0x7c($sp) -/* E0751C 802421BC 8FBE0078 */ lw $fp, 0x78($sp) -/* E07520 802421C0 8FB70074 */ lw $s7, 0x74($sp) -/* E07524 802421C4 8FB60070 */ lw $s6, 0x70($sp) -/* E07528 802421C8 8FB5006C */ lw $s5, 0x6c($sp) -/* E0752C 802421CC 8FB40068 */ lw $s4, 0x68($sp) -/* E07530 802421D0 8FB30064 */ lw $s3, 0x64($sp) -/* E07534 802421D4 8FB20060 */ lw $s2, 0x60($sp) -/* E07538 802421D8 8FB1005C */ lw $s1, 0x5c($sp) -/* E0753C 802421DC 8FB00058 */ lw $s0, 0x58($sp) -/* E07540 802421E0 03E00008 */ jr $ra -/* E07544 802421E4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s new file mode 100644 index 0000000000..3c408bdd13 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80241B44_E06EA4.s @@ -0,0 +1,470 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B44_E06EA4 +/* E06EA4 80241B44 27BDFF80 */ addiu $sp, $sp, -0x80 +/* E06EA8 80241B48 AFB30064 */ sw $s3, 0x64($sp) +/* E06EAC 80241B4C 0080982D */ daddu $s3, $a0, $zero +/* E06EB0 80241B50 AFBE0078 */ sw $fp, 0x78($sp) +/* E06EB4 80241B54 0000F02D */ daddu $fp, $zero, $zero +/* E06EB8 80241B58 AFBF007C */ sw $ra, 0x7c($sp) +/* E06EBC 80241B5C AFB70074 */ sw $s7, 0x74($sp) +/* E06EC0 80241B60 AFB60070 */ sw $s6, 0x70($sp) +/* E06EC4 80241B64 AFB5006C */ sw $s5, 0x6c($sp) +/* E06EC8 80241B68 AFB40068 */ sw $s4, 0x68($sp) +/* E06ECC 80241B6C AFB20060 */ sw $s2, 0x60($sp) +/* E06ED0 80241B70 AFB1005C */ sw $s1, 0x5c($sp) +/* E06ED4 80241B74 AFB00058 */ sw $s0, 0x58($sp) +/* E06ED8 80241B78 96630070 */ lhu $v1, 0x70($s3) +/* E06EDC 80241B7C 30620002 */ andi $v0, $v1, 2 +/* E06EE0 80241B80 10400005 */ beqz $v0, .L80241B98 +/* E06EE4 80241B84 27B00020 */ addiu $s0, $sp, 0x20 +/* E06EE8 80241B88 3062FFFD */ andi $v0, $v1, 0xfffd +/* E06EEC 80241B8C A6620070 */ sh $v0, 0x70($s3) +/* E06EF0 80241B90 AE600008 */ sw $zero, 8($s3) +/* E06EF4 80241B94 AE60000C */ sw $zero, 0xc($s3) +.L80241B98: +/* E06EF8 80241B98 27A50040 */ addiu $a1, $sp, 0x40 +/* E06EFC 80241B9C 27A60044 */ addiu $a2, $sp, 0x44 +/* E06F00 80241BA0 27A70048 */ addiu $a3, $sp, 0x48 +/* E06F04 80241BA4 0000882D */ daddu $s1, $zero, $zero +/* E06F08 80241BA8 AFA00010 */ sw $zero, 0x10($sp) +/* E06F0C 80241BAC AFA00014 */ sw $zero, 0x14($sp) +/* E06F10 80241BB0 AFA00018 */ sw $zero, 0x18($sp) +/* E06F14 80241BB4 AFA0001C */ sw $zero, 0x1c($sp) +/* E06F18 80241BB8 8E640000 */ lw $a0, ($s3) +/* E06F1C 80241BBC 0C0497DA */ jal get_string_properties +/* E06F20 80241BC0 24170008 */ addiu $s7, $zero, 8 +/* E06F24 80241BC4 24020001 */ addiu $v0, $zero, 1 +/* E06F28 80241BC8 AFA00024 */ sw $zero, 0x24($sp) +/* E06F2C 80241BCC AFA00028 */ sw $zero, 0x28($sp) +/* E06F30 80241BD0 AFA20044 */ sw $v0, 0x44($sp) +.L80241BD4: +/* E06F34 80241BD4 8E620000 */ lw $v0, ($s3) +/* E06F38 80241BD8 00511821 */ addu $v1, $v0, $s1 +/* E06F3C 80241BDC 26310001 */ addiu $s1, $s1, 1 +/* E06F40 80241BE0 00511021 */ addu $v0, $v0, $s1 +/* E06F44 80241BE4 90740000 */ lbu $s4, ($v1) +/* E06F48 80241BE8 90550000 */ lbu $s5, ($v0) +/* E06F4C 80241BEC 2684FF10 */ addiu $a0, $s4, -0xf0 +/* E06F50 80241BF0 2C830010 */ sltiu $v1, $a0, 0x10 +/* E06F54 80241BF4 10600017 */ beqz $v1, .L80241C54 +/* E06F58 80241BF8 0000B02D */ daddu $s6, $zero, $zero +/* E06F5C 80241BFC 00041080 */ sll $v0, $a0, 2 +/* E06F60 80241C00 3C098025 */ lui $t1, 0x8025 +/* E06F64 80241C04 252993A0 */ addiu $t1, $t1, -0x6c60 +/* E06F68 80241C08 00491021 */ addu $v0, $v0, $t1 +/* E06F6C 80241C0C 8C420000 */ lw $v0, ($v0) +/* E06F70 80241C10 00400008 */ jr $v0 +/* E06F74 80241C14 00000000 */ nop +/* E06F78 80241C18 2682FF0D */ addiu $v0, $s4, -0xf3 +/* E06F7C 80241C1C 08090747 */ j .L80241D1C +/* E06F80 80241C20 AE020008 */ sw $v0, 8($s0) +/* E06F84 80241C24 08090747 */ j .L80241D1C +/* E06F88 80241C28 24160001 */ addiu $s6, $zero, 1 +/* E06F8C 80241C2C 8E630000 */ lw $v1, ($s3) +/* E06F90 80241C30 00711021 */ addu $v0, $v1, $s1 +/* E06F94 80241C34 90420000 */ lbu $v0, ($v0) +/* E06F98 80241C38 14400038 */ bnez $v0, .L80241D1C +/* E06F9C 80241C3C 26310001 */ addiu $s1, $s1, 1 +/* E06FA0 80241C40 00711021 */ addu $v0, $v1, $s1 +/* E06FA4 80241C44 90420000 */ lbu $v0, ($v0) +/* E06FA8 80241C48 26310001 */ addiu $s1, $s1, 1 +/* E06FAC 80241C4C 08090747 */ j .L80241D1C +/* E06FB0 80241C50 AE020004 */ sw $v0, 4($s0) +.L80241C54: +/* E06FB4 80241C54 24020001 */ addiu $v0, $zero, 1 +/* E06FB8 80241C58 329200FF */ andi $s2, $s4, 0xff +/* E06FBC 80241C5C AFA00010 */ sw $zero, 0x10($sp) +/* E06FC0 80241C60 AFA20014 */ sw $v0, 0x14($sp) +/* E06FC4 80241C64 8E050004 */ lw $a1, 4($s0) +/* E06FC8 80241C68 8E060008 */ lw $a2, 8($s0) +/* E06FCC 80241C6C 3C073F80 */ lui $a3, 0x3f80 +/* E06FD0 80241C70 0C049721 */ jal func_80125C84 +/* E06FD4 80241C74 0240202D */ daddu $a0, $s2, $zero +/* E06FD8 80241C78 8FA30044 */ lw $v1, 0x44($sp) +/* E06FDC 80241C7C 8E040004 */ lw $a0, 4($s0) +/* E06FE0 80241C80 2463FFFF */ addiu $v1, $v1, -1 +/* E06FE4 80241C84 00621821 */ addu $v1, $v1, $v0 +/* E06FE8 80241C88 2482FFFD */ addiu $v0, $a0, -3 +/* E06FEC 80241C8C 2C420002 */ sltiu $v0, $v0, 2 +/* E06FF0 80241C90 10400022 */ beqz $v0, .L80241D1C +/* E06FF4 80241C94 AFA30044 */ sw $v1, 0x44($sp) +/* E06FF8 80241C98 3C058024 */ lui $a1, 0x8024 +/* E06FFC 80241C9C 24A53178 */ addiu $a1, $a1, 0x3178 +/* E07000 80241CA0 24090004 */ addiu $t1, $zero, 4 +/* E07004 80241CA4 14890003 */ bne $a0, $t1, .L80241CB4 +/* E07008 80241CA8 00000000 */ nop +/* E0700C 80241CAC 3C058024 */ lui $a1, 0x8024 +/* E07010 80241CB0 24A53110 */ addiu $a1, $a1, 0x3110 +.L80241CB4: +/* E07014 80241CB4 14890007 */ bne $a0, $t1, .L80241CD4 +/* E07018 80241CB8 0000302D */ daddu $a2, $zero, $zero +/* E0701C 80241CBC 12570004 */ beq $s2, $s7, .L80241CD0 +/* E07020 80241CC0 24620001 */ addiu $v0, $v1, 1 +/* E07024 80241CC4 16B70004 */ bne $s5, $s7, .L80241CD8 +/* E07028 80241CC8 328800FF */ andi $t0, $s4, 0xff +/* E0702C 80241CCC 24620001 */ addiu $v0, $v1, 1 +.L80241CD0: +/* E07030 80241CD0 AFA20044 */ sw $v0, 0x44($sp) +.L80241CD4: +/* E07034 80241CD4 328800FF */ andi $t0, $s4, 0xff +.L80241CD8: +/* E07038 80241CD8 32A7FFFF */ andi $a3, $s5, 0xffff +/* E0703C 80241CDC 00061080 */ sll $v0, $a2, 2 +/* E07040 80241CE0 00452021 */ addu $a0, $v0, $a1 +.L80241CE4: +/* E07044 80241CE4 90820000 */ lbu $v0, ($a0) +/* E07048 80241CE8 55020009 */ bnel $t0, $v0, .L80241D10 +/* E0704C 80241CEC 24840004 */ addiu $a0, $a0, 4 +/* E07050 80241CF0 90820001 */ lbu $v0, 1($a0) +/* E07054 80241CF4 54E20006 */ bnel $a3, $v0, .L80241D10 +/* E07058 80241CF8 24840004 */ addiu $a0, $a0, 4 +/* E0705C 80241CFC 84830002 */ lh $v1, 2($a0) +/* E07060 80241D00 8FA20044 */ lw $v0, 0x44($sp) +/* E07064 80241D04 00431021 */ addu $v0, $v0, $v1 +/* E07068 80241D08 AFA20044 */ sw $v0, 0x44($sp) +/* E0706C 80241D0C 24840004 */ addiu $a0, $a0, 4 +.L80241D10: +/* E07070 80241D10 84820002 */ lh $v0, 2($a0) +/* E07074 80241D14 1440FFF3 */ bnez $v0, .L80241CE4 +/* E07078 80241D18 00000000 */ nop +.L80241D1C: +/* E0707C 80241D1C 32C2FFFF */ andi $v0, $s6, 0xffff +/* E07080 80241D20 1040FFAC */ beqz $v0, .L80241BD4 +/* E07084 80241D24 00000000 */ nop +/* E07088 80241D28 96620070 */ lhu $v0, 0x70($s3) +/* E0708C 80241D2C 8FA30044 */ lw $v1, 0x44($sp) +/* E07090 80241D30 30420001 */ andi $v0, $v0, 1 +/* E07094 80241D34 10400015 */ beqz $v0, .L80241D8C +/* E07098 80241D38 AE630014 */ sw $v1, 0x14($s3) +/* E0709C 80241D3C 44831000 */ mtc1 $v1, $f2 +/* E070A0 80241D40 00000000 */ nop +/* E070A4 80241D44 468010A0 */ cvt.s.w $f2, $f2 +/* E070A8 80241D48 3C013FE0 */ lui $at, 0x3fe0 +/* E070AC 80241D4C 44810800 */ mtc1 $at, $f1 +/* E070B0 80241D50 44800000 */ mtc1 $zero, $f0 +/* E070B4 80241D54 460010A1 */ cvt.d.s $f2, $f2 +/* E070B8 80241D58 46201082 */ mul.d $f2, $f2, $f0 +/* E070BC 80241D5C 00000000 */ nop +/* E070C0 80241D60 44800000 */ mtc1 $zero, $f0 +/* E070C4 80241D64 44800800 */ mtc1 $zero, $f1 +/* E070C8 80241D68 00000000 */ nop +/* E070CC 80241D6C 46201080 */ add.d $f2, $f2, $f0 +/* E070D0 80241D70 C6600068 */ lwc1 $f0, 0x68($s3) +/* E070D4 80241D74 46800021 */ cvt.d.w $f0, $f0 +/* E070D8 80241D78 46220001 */ sub.d $f0, $f0, $f2 +/* E070DC 80241D7C 4620010D */ trunc.w.d $f4, $f0 +/* E070E0 80241D80 44152000 */ mfc1 $s5, $f4 +/* E070E4 80241D84 08090765 */ j .L80241D94 +/* E070E8 80241D88 0000B82D */ daddu $s7, $zero, $zero +.L80241D8C: +/* E070EC 80241D8C 8E750068 */ lw $s5, 0x68($s3) +/* E070F0 80241D90 0000B82D */ daddu $s7, $zero, $zero +.L80241D94: +/* E070F4 80241D94 AE000004 */ sw $zero, 4($s0) +/* E070F8 80241D98 AE000008 */ sw $zero, 8($s0) +/* E070FC 80241D9C 8E620010 */ lw $v0, 0x10($s3) +/* E07100 80241DA0 02E0882D */ daddu $s1, $s7, $zero +/* E07104 80241DA4 AE02000C */ sw $v0, 0xc($s0) +.L80241DA8: +/* E07108 80241DA8 8E620000 */ lw $v0, ($s3) +/* E0710C 80241DAC A7A00050 */ sh $zero, 0x50($sp) +/* E07110 80241DB0 00511821 */ addu $v1, $v0, $s1 +/* E07114 80241DB4 26310001 */ addiu $s1, $s1, 1 +/* E07118 80241DB8 00511021 */ addu $v0, $v0, $s1 +/* E0711C 80241DBC 90740000 */ lbu $s4, ($v1) +/* E07120 80241DC0 90560000 */ lbu $s6, ($v0) +/* E07124 80241DC4 2684FF10 */ addiu $a0, $s4, -0xf0 +/* E07128 80241DC8 2C830010 */ sltiu $v1, $a0, 0x10 +/* E0712C 80241DCC 10600016 */ beqz $v1, .L80241E28 +/* E07130 80241DD0 00041080 */ sll $v0, $a0, 2 +/* E07134 80241DD4 3C018025 */ lui $at, 0x8025 +/* E07138 80241DD8 00220821 */ addu $at, $at, $v0 +/* E0713C 80241DDC 8C2293E0 */ lw $v0, -0x6c20($at) +/* E07140 80241DE0 00400008 */ jr $v0 +/* E07144 80241DE4 00000000 */ nop +/* E07148 80241DE8 2682FF0D */ addiu $v0, $s4, -0xf3 +/* E0714C 80241DEC 0809083F */ j .L802420FC +/* E07150 80241DF0 AE020008 */ sw $v0, 8($s0) +/* E07154 80241DF4 24090001 */ addiu $t1, $zero, 1 +/* E07158 80241DF8 0809083F */ j .L802420FC +/* E0715C 80241DFC A7A90050 */ sh $t1, 0x50($sp) +/* E07160 80241E00 8E630000 */ lw $v1, ($s3) +/* E07164 80241E04 00711021 */ addu $v0, $v1, $s1 +/* E07168 80241E08 90420000 */ lbu $v0, ($v0) +/* E0716C 80241E0C 144000BB */ bnez $v0, .L802420FC +/* E07170 80241E10 26310001 */ addiu $s1, $s1, 1 +/* E07174 80241E14 00711021 */ addu $v0, $v1, $s1 +/* E07178 80241E18 90420000 */ lbu $v0, ($v0) +/* E0717C 80241E1C 26310001 */ addiu $s1, $s1, 1 +/* E07180 80241E20 0809083F */ j .L802420FC +/* E07184 80241E24 AE020004 */ sw $v0, 4($s0) +.L80241E28: +/* E07188 80241E28 328300FF */ andi $v1, $s4, 0xff +/* E0718C 80241E2C 2C6200F0 */ sltiu $v0, $v1, 0xf0 +/* E07190 80241E30 10400083 */ beqz $v0, .L80242040 +/* E07194 80241E34 24090001 */ addiu $t1, $zero, 1 +/* E07198 80241E38 AE030000 */ sw $v1, ($s0) +/* E0719C 80241E3C AE150010 */ sw $s5, 0x10($s0) +/* E071A0 80241E40 8E62006C */ lw $v0, 0x6c($s3) +/* E071A4 80241E44 AE020014 */ sw $v0, 0x14($s0) +/* E071A8 80241E48 8E63000C */ lw $v1, 0xc($s3) +/* E071AC 80241E4C 1069003F */ beq $v1, $t1, .L80241F4C +/* E071B0 80241E50 28620002 */ slti $v0, $v1, 2 +/* E071B4 80241E54 50400005 */ beql $v0, $zero, .L80241E6C +/* E071B8 80241E58 24090002 */ addiu $t1, $zero, 2 +/* E071BC 80241E5C 10600007 */ beqz $v1, .L80241E7C +/* E071C0 80241E60 00000000 */ nop +/* E071C4 80241E64 08090811 */ j .L80242044 +/* E071C8 80241E68 26F70001 */ addiu $s7, $s7, 1 +.L80241E6C: +/* E071CC 80241E6C 10690043 */ beq $v1, $t1, .L80241F7C +/* E071D0 80241E70 00000000 */ nop +/* E071D4 80241E74 08090810 */ j .L80242040 +/* E071D8 80241E78 26F70001 */ addiu $s7, $s7, 1 +.L80241E7C: +/* E071DC 80241E7C 8E620020 */ lw $v0, 0x20($s3) +/* E071E0 80241E80 00570018 */ mult $v0, $s7 +/* E071E4 80241E84 8E620008 */ lw $v0, 8($s3) +/* E071E8 80241E88 00004812 */ mflo $t1 +/* E071EC 80241E8C 00491023 */ subu $v0, $v0, $t1 +/* E071F0 80241E90 0440006A */ bltz $v0, .L8024203C +/* E071F4 80241E94 AE020018 */ sw $v0, 0x18($s0) +/* E071F8 80241E98 8E63001C */ lw $v1, 0x1c($s3) +/* E071FC 80241E9C 0062102A */ slt $v0, $v1, $v0 +/* E07200 80241EA0 54400001 */ bnel $v0, $zero, .L80241EA8 +/* E07204 80241EA4 AE030018 */ sw $v1, 0x18($s0) +.L80241EA8: +/* E07208 80241EA8 240900FD */ addiu $t1, $zero, 0xfd +/* E0720C 80241EAC 16C90005 */ bne $s6, $t1, .L80241EC4 +/* E07210 80241EB0 00000000 */ nop +/* E07214 80241EB4 8E030018 */ lw $v1, 0x18($s0) +/* E07218 80241EB8 8E62001C */ lw $v0, 0x1c($s3) +/* E0721C 80241EBC 50620001 */ beql $v1, $v0, .L80241EC4 +/* E07220 80241EC0 241E0001 */ addiu $fp, $zero, 1 +.L80241EC4: +/* E07224 80241EC4 8E630018 */ lw $v1, 0x18($s3) +/* E07228 80241EC8 2C620006 */ sltiu $v0, $v1, 6 +/* E0722C 80241ECC 1040005B */ beqz $v0, .L8024203C +/* E07230 80241ED0 00031080 */ sll $v0, $v1, 2 +/* E07234 80241ED4 3C018025 */ lui $at, 0x8025 +/* E07238 80241ED8 00220821 */ addu $at, $at, $v0 +/* E0723C 80241EDC 8C229420 */ lw $v0, -0x6be0($at) +/* E07240 80241EE0 00400008 */ jr $v0 +/* E07244 80241EE4 00000000 */ nop +/* E07248 80241EE8 0260202D */ daddu $a0, $s3, $zero +/* E0724C 80241EEC 0C0900A0 */ jal func_80240280_E055E0 +/* E07250 80241EF0 0200282D */ daddu $a1, $s0, $zero +/* E07254 80241EF4 08090810 */ j .L80242040 +/* E07258 80241EF8 26F70001 */ addiu $s7, $s7, 1 +/* E0725C 80241EFC 0260202D */ daddu $a0, $s3, $zero +/* E07260 80241F00 0C090154 */ jal func_80240550_E058B0 +/* E07264 80241F04 0200282D */ daddu $a1, $s0, $zero +/* E07268 80241F08 08090810 */ j .L80242040 +/* E0726C 80241F0C 26F70001 */ addiu $s7, $s7, 1 +/* E07270 80241F10 0260202D */ daddu $a0, $s3, $zero +/* E07274 80241F14 0C09020B */ jal func_8024082C_E05B8C +/* E07278 80241F18 0200282D */ daddu $a1, $s0, $zero +/* E0727C 80241F1C 08090810 */ j .L80242040 +/* E07280 80241F20 26F70001 */ addiu $s7, $s7, 1 +/* E07284 80241F24 0260202D */ daddu $a0, $s3, $zero +/* E07288 80241F28 0C0902BE */ jal func_80240AF8_E05E58 +/* E0728C 80241F2C 0200282D */ daddu $a1, $s0, $zero +/* E07290 80241F30 08090810 */ j .L80242040 +/* E07294 80241F34 26F70001 */ addiu $s7, $s7, 1 +/* E07298 80241F38 0260202D */ daddu $a0, $s3, $zero +/* E0729C 80241F3C 0C0903B0 */ jal func_80240EC0_E06220 +/* E072A0 80241F40 0200282D */ daddu $a1, $s0, $zero +/* E072A4 80241F44 08090810 */ j .L80242040 +/* E072A8 80241F48 26F70001 */ addiu $s7, $s7, 1 +.L80241F4C: +/* E072AC 80241F4C 240900FD */ addiu $t1, $zero, 0xfd +/* E072B0 80241F50 16C90006 */ bne $s6, $t1, .L80241F6C +/* E072B4 80241F54 0260202D */ daddu $a0, $s3, $zero +/* E072B8 80241F58 8E630008 */ lw $v1, 8($s3) +/* E072BC 80241F5C 8E620038 */ lw $v0, 0x38($s3) +/* E072C0 80241F60 50620002 */ beql $v1, $v0, .L80241F6C +/* E072C4 80241F64 241E0001 */ addiu $fp, $zero, 1 +/* E072C8 80241F68 0260202D */ daddu $a0, $s3, $zero +.L80241F6C: +/* E072CC 80241F6C 0C090477 */ jal func_802411DC_E0653C +/* E072D0 80241F70 0200282D */ daddu $a1, $s0, $zero +/* E072D4 80241F74 08090810 */ j .L80242040 +/* E072D8 80241F78 26F70001 */ addiu $s7, $s7, 1 +.L80241F7C: +/* E072DC 80241F7C 8E620054 */ lw $v0, 0x54($s3) +/* E072E0 80241F80 00570018 */ mult $v0, $s7 +/* E072E4 80241F84 8E620008 */ lw $v0, 8($s3) +/* E072E8 80241F88 00004812 */ mflo $t1 +/* E072EC 80241F8C 00491023 */ subu $v0, $v0, $t1 +/* E072F0 80241F90 04410002 */ bgez $v0, .L80241F9C +/* E072F4 80241F94 AE020018 */ sw $v0, 0x18($s0) +/* E072F8 80241F98 AE000018 */ sw $zero, 0x18($s0) +.L80241F9C: +/* E072FC 80241F9C 8E020018 */ lw $v0, 0x18($s0) +/* E07300 80241FA0 8E630050 */ lw $v1, 0x50($s3) +/* E07304 80241FA4 0062102A */ slt $v0, $v1, $v0 +/* E07308 80241FA8 54400001 */ bnel $v0, $zero, .L80241FB0 +/* E0730C 80241FAC AE030018 */ sw $v1, 0x18($s0) +.L80241FB0: +/* E07310 80241FB0 240900FD */ addiu $t1, $zero, 0xfd +/* E07314 80241FB4 16C90005 */ bne $s6, $t1, .L80241FCC +/* E07318 80241FB8 00000000 */ nop +/* E0731C 80241FBC 8E030018 */ lw $v1, 0x18($s0) +/* E07320 80241FC0 8E620050 */ lw $v0, 0x50($s3) +/* E07324 80241FC4 50620001 */ beql $v1, $v0, .L80241FCC +/* E07328 80241FC8 241E0001 */ addiu $fp, $zero, 1 +.L80241FCC: +/* E0732C 80241FCC 8E63004C */ lw $v1, 0x4c($s3) +/* E07330 80241FD0 24090001 */ addiu $t1, $zero, 1 +/* E07334 80241FD4 1069000D */ beq $v1, $t1, .L8024200C +/* E07338 80241FD8 28620002 */ slti $v0, $v1, 2 +/* E0733C 80241FDC 50400005 */ beql $v0, $zero, .L80241FF4 +/* E07340 80241FE0 24090002 */ addiu $t1, $zero, 2 +/* E07344 80241FE4 10600013 */ beqz $v1, .L80242034 +/* E07348 80241FE8 0260202D */ daddu $a0, $s3, $zero +/* E0734C 80241FEC 08090811 */ j .L80242044 +/* E07350 80241FF0 26F70001 */ addiu $s7, $s7, 1 +.L80241FF4: +/* E07354 80241FF4 1069000A */ beq $v1, $t1, .L80242020 +/* E07358 80241FF8 24020003 */ addiu $v0, $zero, 3 +/* E0735C 80241FFC 1062000D */ beq $v1, $v0, .L80242034 +/* E07360 80242000 0260202D */ daddu $a0, $s3, $zero +/* E07364 80242004 08090810 */ j .L80242040 +/* E07368 80242008 26F70001 */ addiu $s7, $s7, 1 +.L8024200C: +/* E0736C 8024200C 0260202D */ daddu $a0, $s3, $zero +/* E07370 80242010 0C090537 */ jal func_802414DC_E0683C +/* E07374 80242014 0200282D */ daddu $a1, $s0, $zero +/* E07378 80242018 08090810 */ j .L80242040 +/* E0737C 8024201C 26F70001 */ addiu $s7, $s7, 1 +.L80242020: +/* E07380 80242020 0260202D */ daddu $a0, $s3, $zero +/* E07384 80242024 0C0905DE */ jal func_80241778_E06AD8 +/* E07388 80242028 0200282D */ daddu $a1, $s0, $zero +/* E0738C 8024202C 08090810 */ j .L80242040 +/* E07390 80242030 26F70001 */ addiu $s7, $s7, 1 +.L80242034: +/* E07394 80242034 0C090682 */ jal func_80241A08_E06D68 +/* E07398 80242038 0200282D */ daddu $a1, $s0, $zero +.L8024203C: +/* E0739C 8024203C 26F70001 */ addiu $s7, $s7, 1 +.L80242040: +/* E073A0 80242040 24090001 */ addiu $t1, $zero, 1 +.L80242044: +/* E073A4 80242044 329200FF */ andi $s2, $s4, 0xff +/* E073A8 80242048 AFA00010 */ sw $zero, 0x10($sp) +/* E073AC 8024204C AFA90014 */ sw $t1, 0x14($sp) +/* E073B0 80242050 8E050004 */ lw $a1, 4($s0) +/* E073B4 80242054 8E060008 */ lw $a2, 8($s0) +/* E073B8 80242058 3C073F80 */ lui $a3, 0x3f80 +/* E073BC 8024205C 0C049721 */ jal func_80125C84 +/* E073C0 80242060 0240202D */ daddu $a0, $s2, $zero +/* E073C4 80242064 26A3FFFF */ addiu $v1, $s5, -1 +/* E073C8 80242068 8E040004 */ lw $a0, 4($s0) +/* E073CC 8024206C 0062A821 */ addu $s5, $v1, $v0 +/* E073D0 80242070 2482FFFD */ addiu $v0, $a0, -3 +/* E073D4 80242074 2C420002 */ sltiu $v0, $v0, 2 +/* E073D8 80242078 10400020 */ beqz $v0, .L802420FC +/* E073DC 8024207C 00000000 */ nop +/* E073E0 80242080 3C058024 */ lui $a1, 0x8024 +/* E073E4 80242084 24A53178 */ addiu $a1, $a1, 0x3178 +/* E073E8 80242088 24090004 */ addiu $t1, $zero, 4 +/* E073EC 8024208C 14890003 */ bne $a0, $t1, .L8024209C +/* E073F0 80242090 00000000 */ nop +/* E073F4 80242094 3C058024 */ lui $a1, 0x8024 +/* E073F8 80242098 24A53110 */ addiu $a1, $a1, 0x3110 +.L8024209C: +/* E073FC 8024209C 14890007 */ bne $a0, $t1, .L802420BC +/* E07400 802420A0 0000302D */ daddu $a2, $zero, $zero +/* E07404 802420A4 24020008 */ addiu $v0, $zero, 8 +/* E07408 802420A8 52420004 */ beql $s2, $v0, .L802420BC +/* E0740C 802420AC 26B50001 */ addiu $s5, $s5, 1 +/* E07410 802420B0 16C20003 */ bne $s6, $v0, .L802420C0 +/* E07414 802420B4 328300FF */ andi $v1, $s4, 0xff +/* E07418 802420B8 26B50001 */ addiu $s5, $s5, 1 +.L802420BC: +/* E0741C 802420BC 328300FF */ andi $v1, $s4, 0xff +.L802420C0: +/* E07420 802420C0 32C7FFFF */ andi $a3, $s6, 0xffff +/* E07424 802420C4 00061080 */ sll $v0, $a2, 2 +/* E07428 802420C8 00452021 */ addu $a0, $v0, $a1 +.L802420CC: +/* E0742C 802420CC 90820000 */ lbu $v0, ($a0) +/* E07430 802420D0 54620007 */ bnel $v1, $v0, .L802420F0 +/* E07434 802420D4 24840004 */ addiu $a0, $a0, 4 +/* E07438 802420D8 90820001 */ lbu $v0, 1($a0) +/* E0743C 802420DC 54E20004 */ bnel $a3, $v0, .L802420F0 +/* E07440 802420E0 24840004 */ addiu $a0, $a0, 4 +/* E07444 802420E4 84820002 */ lh $v0, 2($a0) +/* E07448 802420E8 02A2A821 */ addu $s5, $s5, $v0 +/* E0744C 802420EC 24840004 */ addiu $a0, $a0, 4 +.L802420F0: +/* E07450 802420F0 84820002 */ lh $v0, 2($a0) +/* E07454 802420F4 1440FFF5 */ bnez $v0, .L802420CC +/* E07458 802420F8 00000000 */ nop +.L802420FC: +/* E0745C 802420FC 97A20050 */ lhu $v0, 0x50($sp) +/* E07460 80242100 1040FF29 */ beqz $v0, .L80241DA8 +/* E07464 80242104 00000000 */ nop +/* E07468 80242108 8E62000C */ lw $v0, 0xc($s3) +/* E0746C 8024210C 14400015 */ bnez $v0, .L80242164 +/* E07470 80242110 00000000 */ nop +/* E07474 80242114 13C00013 */ beqz $fp, .L80242164 +/* E07478 80242118 0000282D */ daddu $a1, $zero, $zero +/* E0747C 8024211C 00A0302D */ daddu $a2, $a1, $zero +/* E07480 80242120 AFA0004C */ sw $zero, 0x4c($sp) +/* E07484 80242124 AFA00010 */ sw $zero, 0x10($sp) +/* E07488 80242128 AFA00014 */ sw $zero, 0x14($sp) +/* E0748C 8024212C AFA00018 */ sw $zero, 0x18($sp) +/* E07490 80242130 AFA0001C */ sw $zero, 0x1c($sp) +/* E07494 80242134 8E640000 */ lw $a0, ($s3) +/* E07498 80242138 0C0497DA */ jal get_string_properties +/* E0749C 8024213C 27A7004C */ addiu $a3, $sp, 0x4c +/* E074A0 80242140 8E64000C */ lw $a0, 0xc($s3) +/* E074A4 80242144 8E630038 */ lw $v1, 0x38($s3) +/* E074A8 80242148 AE600008 */ sw $zero, 8($s3) +/* E074AC 8024214C 24820001 */ addiu $v0, $a0, 1 +/* E074B0 80242150 1C600016 */ bgtz $v1, .L802421AC +/* E074B4 80242154 AE62000C */ sw $v0, 0xc($s3) +/* E074B8 80242158 24820002 */ addiu $v0, $a0, 2 +/* E074BC 8024215C 0809086B */ j .L802421AC +/* E074C0 80242160 AE62000C */ sw $v0, 0xc($s3) +.L80242164: +/* E074C4 80242164 8E63000C */ lw $v1, 0xc($s3) +/* E074C8 80242168 24020001 */ addiu $v0, $zero, 1 +/* E074CC 8024216C 14620008 */ bne $v1, $v0, .L80242190 +/* E074D0 80242170 24020002 */ addiu $v0, $zero, 2 +/* E074D4 80242174 13C00005 */ beqz $fp, .L8024218C +/* E074D8 80242178 0060102D */ daddu $v0, $v1, $zero +/* E074DC 8024217C 24420001 */ addiu $v0, $v0, 1 +/* E074E0 80242180 AE600008 */ sw $zero, 8($s3) +/* E074E4 80242184 0809086B */ j .L802421AC +/* E074E8 80242188 AE62000C */ sw $v0, 0xc($s3) +.L8024218C: +/* E074EC 8024218C 24020002 */ addiu $v0, $zero, 2 +.L80242190: +/* E074F0 80242190 14620006 */ bne $v1, $v0, .L802421AC +/* E074F4 80242194 00000000 */ nop +/* E074F8 80242198 13C00004 */ beqz $fp, .L802421AC +/* E074FC 8024219C 00000000 */ nop +/* E07500 802421A0 96620070 */ lhu $v0, 0x70($s3) +/* E07504 802421A4 3042FFFE */ andi $v0, $v0, 0xfffe +/* E07508 802421A8 A6620070 */ sh $v0, 0x70($s3) +.L802421AC: +/* E0750C 802421AC 8E620008 */ lw $v0, 8($s3) +/* E07510 802421B0 24420001 */ addiu $v0, $v0, 1 +/* E07514 802421B4 AE620008 */ sw $v0, 8($s3) +/* E07518 802421B8 8FBF007C */ lw $ra, 0x7c($sp) +/* E0751C 802421BC 8FBE0078 */ lw $fp, 0x78($sp) +/* E07520 802421C0 8FB70074 */ lw $s7, 0x74($sp) +/* E07524 802421C4 8FB60070 */ lw $s6, 0x70($sp) +/* E07528 802421C8 8FB5006C */ lw $s5, 0x6c($sp) +/* E0752C 802421CC 8FB40068 */ lw $s4, 0x68($sp) +/* E07530 802421D0 8FB30064 */ lw $s3, 0x64($sp) +/* E07534 802421D4 8FB20060 */ lw $s2, 0x60($sp) +/* E07538 802421D8 8FB1005C */ lw $s1, 0x5c($sp) +/* E0753C 802421DC 8FB00058 */ lw $s0, 0x58($sp) +/* E07540 802421E0 03E00008 */ jr $ra +/* E07544 802421E4 27BD0080 */ addiu $sp, $sp, 0x80 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 97f78cca0e..a88678f6af 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 @@ -83,7 +83,7 @@ glabel func_802421E8_E07548 /* E0767C 8024231C 30420001 */ andi $v0, $v0, 1 /* E07680 80242320 50400004 */ beql $v0, $zero, .L80242334 /* E07684 80242324 26730074 */ addiu $s3, $s3, 0x74 -/* E07688 80242328 0C0906D1 */ jal func_80241B44 +/* E07688 80242328 0C0906D1 */ jal func_80241B44_E06EA4 /* E0768C 8024232C 02B32021 */ addu $a0, $s5, $s3 /* E07690 80242330 26730074 */ addiu $s3, $s3, 0x74 .L80242334: diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510.s deleted file mode 100644 index 4df1f51b1b..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242510 -/* E07870 80242510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E07874 80242514 AFB00010 */ sw $s0, 0x10($sp) -/* E07878 80242518 3C108025 */ lui $s0, 0x8025 -/* E0787C 8024251C 26109440 */ addiu $s0, $s0, -0x6bc0 -/* E07880 80242520 3C058024 */ lui $a1, 0x8024 -/* E07884 80242524 24A521E8 */ addiu $a1, $a1, 0x21e8 -/* E07888 80242528 AFBF0014 */ sw $ra, 0x14($sp) -/* E0788C 8024252C 3C018025 */ lui $at, 0x8025 -/* E07890 80242530 AC30A2C4 */ sw $s0, -0x5d3c($at) -/* E07894 80242534 0C048C8F */ jal bind_dynamic_entity_7 -/* E07898 80242538 0000202D */ daddu $a0, $zero, $zero -/* E0789C 8024253C 2404001F */ addiu $a0, $zero, 0x1f -/* E078A0 80242540 26030E0C */ addiu $v1, $s0, 0xe0c -/* E078A4 80242544 AE020000 */ sw $v0, ($s0) -.L80242548: -/* E078A8 80242548 A4600074 */ sh $zero, 0x74($v1) -/* E078AC 8024254C 2484FFFF */ addiu $a0, $a0, -1 -/* E078B0 80242550 0481FFFD */ bgez $a0, .L80242548 -/* E078B4 80242554 2463FF8C */ addiu $v1, $v1, -0x74 -/* E078B8 80242558 8FBF0014 */ lw $ra, 0x14($sp) -/* E078BC 8024255C 8FB00010 */ lw $s0, 0x10($sp) -/* E078C0 80242560 03E00008 */ jr $ra -/* E078C4 80242564 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s new file mode 100644 index 0000000000..8bc602f70d --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242510_E07870.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242510_E07870 +/* E07870 80242510 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07874 80242514 AFB00010 */ sw $s0, 0x10($sp) +/* E07878 80242518 3C108025 */ lui $s0, 0x8025 +/* E0787C 8024251C 26109440 */ addiu $s0, $s0, -0x6bc0 +/* E07880 80242520 3C058024 */ lui $a1, 0x8024 +/* E07884 80242524 24A521E8 */ addiu $a1, $a1, 0x21e8 +/* E07888 80242528 AFBF0014 */ sw $ra, 0x14($sp) +/* E0788C 8024252C 3C018025 */ lui $at, 0x8025 +/* E07890 80242530 AC30A2C4 */ sw $s0, -0x5d3c($at) +/* E07894 80242534 0C048C8F */ jal bind_dynamic_entity_7 +/* E07898 80242538 0000202D */ daddu $a0, $zero, $zero +/* E0789C 8024253C 2404001F */ addiu $a0, $zero, 0x1f +/* E078A0 80242540 26030E0C */ addiu $v1, $s0, 0xe0c +/* E078A4 80242544 AE020000 */ sw $v0, ($s0) +.L80242548: +/* E078A8 80242548 A4600074 */ sh $zero, 0x74($v1) +/* E078AC 8024254C 2484FFFF */ addiu $a0, $a0, -1 +/* E078B0 80242550 0481FFFD */ bgez $a0, .L80242548 +/* E078B4 80242554 2463FF8C */ addiu $v1, $v1, -0x74 +/* E078B8 80242558 8FBF0014 */ lw $ra, 0x14($sp) +/* E078BC 8024255C 8FB00010 */ lw $s0, 0x10($sp) +/* E078C0 80242560 03E00008 */ jr $ra +/* E078C4 80242564 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568.s deleted file mode 100644 index a9a5c7eb67..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242568 -/* E078C8 80242568 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E078CC 8024256C AFBF0010 */ sw $ra, 0x10($sp) -/* E078D0 80242570 0C090944 */ jal func_80242510 -/* E078D4 80242574 00000000 */ nop -/* E078D8 80242578 0C048DCD */ jal load_font -/* E078DC 8024257C 24040001 */ addiu $a0, $zero, 1 -/* E078E0 80242580 8FBF0010 */ lw $ra, 0x10($sp) -/* E078E4 80242584 24020002 */ addiu $v0, $zero, 2 -/* E078E8 80242588 03E00008 */ jr $ra -/* E078EC 8024258C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568_E078C8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568_E078C8.s new file mode 100644 index 0000000000..b64e727ddb --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242568_E078C8.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242568_E078C8 +/* E078C8 80242568 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E078CC 8024256C AFBF0010 */ sw $ra, 0x10($sp) +/* E078D0 80242570 0C090944 */ jal func_80242510_E07870 +/* E078D4 80242574 00000000 */ nop +/* E078D8 80242578 0C048DCD */ jal load_font +/* E078DC 8024257C 24040001 */ addiu $a0, $zero, 1 +/* E078E0 80242580 8FBF0010 */ lw $ra, 0x10($sp) +/* E078E4 80242584 24020002 */ addiu $v0, $zero, 2 +/* E078E8 80242588 03E00008 */ jr $ra +/* E078EC 8024258C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242590_E078F0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242590_E078F0.s index 98f1d27bdc..1c408adf2f 100644 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242590_E078F0.s +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242590_E078F0.s @@ -37,7 +37,7 @@ glabel func_80242590_E078F0 /* E07964 80242604 8C820000 */ lw $v0, ($a0) /* E07968 80242608 10400003 */ beqz $v0, .L80242618 /* E0796C 8024260C 00000000 */ nop -/* E07970 80242610 0C0908DA */ jal func_80242368 +/* E07970 80242610 0C0908DA */ jal func_80242368_E076C8 /* E07974 80242614 00000000 */ nop .L80242618: /* E07978 80242618 8E23008C */ lw $v1, 0x8c($s1) diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690.s deleted file mode 100644 index aee2cdc8ce..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242690 -/* E079F0 80242690 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E079F4 80242694 AFBF0028 */ sw $ra, 0x28($sp) -/* E079F8 80242698 AFB10024 */ sw $s1, 0x24($sp) -/* E079FC 8024269C AFB00020 */ sw $s0, 0x20($sp) -/* E07A00 802426A0 8C82000C */ lw $v0, 0xc($a0) -/* E07A04 802426A4 0C0B1EAF */ jal get_variable -/* E07A08 802426A8 8C450000 */ lw $a1, ($v0) -/* E07A0C 802426AC 24030100 */ addiu $v1, $zero, 0x100 -/* E07A10 802426B0 0040882D */ daddu $s1, $v0, $zero -/* E07A14 802426B4 3C028024 */ lui $v0, 0x8024 -/* E07A18 802426B8 244241F0 */ addiu $v0, $v0, 0x41f0 -/* E07A1C 802426BC 00118040 */ sll $s0, $s1, 1 -/* E07A20 802426C0 02118021 */ addu $s0, $s0, $s1 -/* E07A24 802426C4 001080C0 */ sll $s0, $s0, 3 -/* E07A28 802426C8 02028021 */ addu $s0, $s0, $v0 -/* E07A2C 802426CC AFA30010 */ sw $v1, 0x10($sp) -/* E07A30 802426D0 8E020000 */ lw $v0, ($s0) -/* E07A34 802426D4 AFA00018 */ sw $zero, 0x18($sp) -/* E07A38 802426D8 AFA0001C */ sw $zero, 0x1c($sp) -/* E07A3C 802426DC AFA20014 */ sw $v0, 0x14($sp) -/* E07A40 802426E0 8E050004 */ lw $a1, 4($s0) -/* E07A44 802426E4 24020001 */ addiu $v0, $zero, 1 -/* E07A48 802426E8 3C01802E */ lui $at, 0x802e -/* E07A4C 802426EC AC22F524 */ sw $v0, -0xadc($at) -/* E07A50 802426F0 0C00E219 */ jal create_standard_npc -/* E07A54 802426F4 27A40010 */ addiu $a0, $sp, 0x10 -/* E07A58 802426F8 0C00E2B7 */ jal get_npc_by_index -/* E07A5C 802426FC 0040202D */ daddu $a0, $v0, $zero -/* E07A60 80242700 3C04FBFF */ lui $a0, 0xfbff -/* E07A64 80242704 8C430000 */ lw $v1, ($v0) -/* E07A68 80242708 3484FFFF */ ori $a0, $a0, 0xffff -/* E07A6C 8024270C A05100A4 */ sb $s1, 0xa4($v0) -/* E07A70 80242710 00641824 */ and $v1, $v1, $a0 -/* E07A74 80242714 AC430000 */ sw $v1, ($v0) -/* E07A78 80242718 C6000008 */ lwc1 $f0, 8($s0) -/* E07A7C 8024271C E4400038 */ swc1 $f0, 0x38($v0) -/* E07A80 80242720 C600000C */ lwc1 $f0, 0xc($s0) -/* E07A84 80242724 E440003C */ swc1 $f0, 0x3c($v0) -/* E07A88 80242728 C6000010 */ lwc1 $f0, 0x10($s0) -/* E07A8C 8024272C E4400040 */ swc1 $f0, 0x40($v0) -/* E07A90 80242730 8E050014 */ lw $a1, 0x14($s0) -/* E07A94 80242734 0C00ECD0 */ jal set_npc_yaw -/* E07A98 80242738 0040202D */ daddu $a0, $v0, $zero -/* E07A9C 8024273C 8FBF0028 */ lw $ra, 0x28($sp) -/* E07AA0 80242740 8FB10024 */ lw $s1, 0x24($sp) -/* E07AA4 80242744 8FB00020 */ lw $s0, 0x20($sp) -/* E07AA8 80242748 24020002 */ addiu $v0, $zero, 2 -/* E07AAC 8024274C 03E00008 */ jr $ra -/* E07AB0 80242750 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s new file mode 100644 index 0000000000..438a754d6b --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242690_E079F0 +/* E079F0 80242690 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E079F4 80242694 AFBF0028 */ sw $ra, 0x28($sp) +/* E079F8 80242698 AFB10024 */ sw $s1, 0x24($sp) +/* E079FC 8024269C AFB00020 */ sw $s0, 0x20($sp) +/* E07A00 802426A0 8C82000C */ lw $v0, 0xc($a0) +/* E07A04 802426A4 0C0B1EAF */ jal get_variable +/* E07A08 802426A8 8C450000 */ lw $a1, ($v0) +/* E07A0C 802426AC 24030100 */ addiu $v1, $zero, 0x100 +/* E07A10 802426B0 0040882D */ daddu $s1, $v0, $zero +/* E07A14 802426B4 3C028024 */ lui $v0, 0x8024 +/* E07A18 802426B8 244241F0 */ addiu $v0, $v0, 0x41f0 +/* E07A1C 802426BC 00118040 */ sll $s0, $s1, 1 +/* E07A20 802426C0 02118021 */ addu $s0, $s0, $s1 +/* E07A24 802426C4 001080C0 */ sll $s0, $s0, 3 +/* E07A28 802426C8 02028021 */ addu $s0, $s0, $v0 +/* E07A2C 802426CC AFA30010 */ sw $v1, 0x10($sp) +/* E07A30 802426D0 8E020000 */ lw $v0, ($s0) +/* E07A34 802426D4 AFA00018 */ sw $zero, 0x18($sp) +/* E07A38 802426D8 AFA0001C */ sw $zero, 0x1c($sp) +/* E07A3C 802426DC AFA20014 */ sw $v0, 0x14($sp) +/* E07A40 802426E0 8E050004 */ lw $a1, 4($s0) +/* E07A44 802426E4 24020001 */ addiu $v0, $zero, 1 +/* E07A48 802426E8 3C01802E */ lui $at, 0x802e +/* E07A4C 802426EC AC22F524 */ sw $v0, -0xadc($at) +/* E07A50 802426F0 0C00E219 */ jal create_standard_npc +/* E07A54 802426F4 27A40010 */ addiu $a0, $sp, 0x10 +/* E07A58 802426F8 0C00E2B7 */ jal get_npc_by_index +/* E07A5C 802426FC 0040202D */ daddu $a0, $v0, $zero +/* E07A60 80242700 3C04FBFF */ lui $a0, 0xfbff +/* E07A64 80242704 8C430000 */ lw $v1, ($v0) +/* E07A68 80242708 3484FFFF */ ori $a0, $a0, 0xffff +/* E07A6C 8024270C A05100A4 */ sb $s1, 0xa4($v0) +/* E07A70 80242710 00641824 */ and $v1, $v1, $a0 +/* E07A74 80242714 AC430000 */ sw $v1, ($v0) +/* E07A78 80242718 C6000008 */ lwc1 $f0, 8($s0) +/* E07A7C 8024271C E4400038 */ swc1 $f0, 0x38($v0) +/* E07A80 80242720 C600000C */ lwc1 $f0, 0xc($s0) +/* E07A84 80242724 E440003C */ swc1 $f0, 0x3c($v0) +/* E07A88 80242728 C6000010 */ lwc1 $f0, 0x10($s0) +/* E07A8C 8024272C E4400040 */ swc1 $f0, 0x40($v0) +/* E07A90 80242730 8E050014 */ lw $a1, 0x14($s0) +/* E07A94 80242734 0C00ECD0 */ jal set_npc_yaw +/* E07A98 80242738 0040202D */ daddu $a0, $v0, $zero +/* E07A9C 8024273C 8FBF0028 */ lw $ra, 0x28($sp) +/* E07AA0 80242740 8FB10024 */ lw $s1, 0x24($sp) +/* E07AA4 80242744 8FB00020 */ lw $s0, 0x20($sp) +/* E07AA8 80242748 24020002 */ addiu $v0, $zero, 2 +/* E07AAC 8024274C 03E00008 */ jr $ra +/* E07AB0 80242750 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4.s deleted file mode 100644 index 81442d2c46..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427B4 -/* E07B14 802427B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E07B18 802427B8 AFBF0010 */ sw $ra, 0x10($sp) -/* E07B1C 802427BC 8C82000C */ lw $v0, 0xc($a0) -/* E07B20 802427C0 0C0B1EAF */ jal get_variable -/* E07B24 802427C4 8C450000 */ lw $a1, ($v0) -/* E07B28 802427C8 3C048035 */ lui $a0, 0x8035 -/* E07B2C 802427CC 2484F800 */ addiu $a0, $a0, -0x800 -/* E07B30 802427D0 0C00A487 */ jal _heap_free -/* E07B34 802427D4 0040282D */ daddu $a1, $v0, $zero -/* E07B38 802427D8 8FBF0010 */ lw $ra, 0x10($sp) -/* E07B3C 802427DC 24020002 */ addiu $v0, $zero, 2 -/* E07B40 802427E0 03E00008 */ jr $ra -/* E07B44 802427E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4_E07B14.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4_E07B14.s new file mode 100644 index 0000000000..8789b2cce8 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802427B4_E07B14.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427B4_E07B14 +/* E07B14 802427B4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07B18 802427B8 AFBF0010 */ sw $ra, 0x10($sp) +/* E07B1C 802427BC 8C82000C */ lw $v0, 0xc($a0) +/* E07B20 802427C0 0C0B1EAF */ jal get_variable +/* E07B24 802427C4 8C450000 */ lw $a1, ($v0) +/* E07B28 802427C8 3C048035 */ lui $a0, 0x8035 +/* E07B2C 802427CC 2484F800 */ addiu $a0, $a0, -0x800 +/* E07B30 802427D0 0C00A487 */ jal _heap_free +/* E07B34 802427D4 0040282D */ daddu $a1, $v0, $zero +/* E07B38 802427D8 8FBF0010 */ lw $ra, 0x10($sp) +/* E07B3C 802427DC 24020002 */ addiu $v0, $zero, 2 +/* E07B40 802427E0 03E00008 */ jr $ra +/* E07B44 802427E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802427E8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802427E8.s deleted file mode 100644 index a2af07edca..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802427E8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427E8 -/* E07B48 802427E8 3C04800B */ lui $a0, %hi(gCameras) -/* E07B4C 802427EC 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* E07B50 802427F0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* E07B54 802427F4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* E07B58 802427F8 3C013F2A */ lui $at, 0x3f2a -/* E07B5C 802427FC 3421AAAB */ ori $at, $at, 0xaaab -/* E07B60 80242800 44810000 */ mtc1 $at, $f0 -/* E07B64 80242804 00031080 */ sll $v0, $v1, 2 -/* E07B68 80242808 00431021 */ addu $v0, $v0, $v1 -/* E07B6C 8024280C 00021080 */ sll $v0, $v0, 2 -/* E07B70 80242810 00431023 */ subu $v0, $v0, $v1 -/* E07B74 80242814 000218C0 */ sll $v1, $v0, 3 -/* E07B78 80242818 00431021 */ addu $v0, $v0, $v1 -/* E07B7C 8024281C 000210C0 */ sll $v0, $v0, 3 -/* E07B80 80242820 00441021 */ addu $v0, $v0, $a0 -/* E07B84 80242824 C44204B0 */ lwc1 $f2, 0x4b0($v0) -/* E07B88 80242828 46001080 */ add.s $f2, $f2, $f0 -/* E07B8C 8024282C 24030001 */ addiu $v1, $zero, 1 -/* E07B90 80242830 A4430506 */ sh $v1, 0x506($v0) -/* E07B94 80242834 E44204B0 */ swc1 $f2, 0x4b0($v0) -/* E07B98 80242838 03E00008 */ jr $ra -/* E07B9C 8024283C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802427E8_E07B48.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802427E8_E07B48.s new file mode 100644 index 0000000000..d0f8c2321e --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802427E8_E07B48.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427E8_E07B48 +/* E07B48 802427E8 3C04800B */ lui $a0, %hi(gCameras) +/* E07B4C 802427EC 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* E07B50 802427F0 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* E07B54 802427F4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* E07B58 802427F8 3C013F2A */ lui $at, 0x3f2a +/* E07B5C 802427FC 3421AAAB */ ori $at, $at, 0xaaab +/* E07B60 80242800 44810000 */ mtc1 $at, $f0 +/* E07B64 80242804 00031080 */ sll $v0, $v1, 2 +/* E07B68 80242808 00431021 */ addu $v0, $v0, $v1 +/* E07B6C 8024280C 00021080 */ sll $v0, $v0, 2 +/* E07B70 80242810 00431023 */ subu $v0, $v0, $v1 +/* E07B74 80242814 000218C0 */ sll $v1, $v0, 3 +/* E07B78 80242818 00431021 */ addu $v0, $v0, $v1 +/* E07B7C 8024281C 000210C0 */ sll $v0, $v0, 3 +/* E07B80 80242820 00441021 */ addu $v0, $v0, $a0 +/* E07B84 80242824 C44204B0 */ lwc1 $f2, 0x4b0($v0) +/* E07B88 80242828 46001080 */ add.s $f2, $f2, $f0 +/* E07B8C 8024282C 24030001 */ addiu $v1, $zero, 1 +/* E07B90 80242830 A4430506 */ sh $v1, 0x506($v0) +/* E07B94 80242834 E44204B0 */ swc1 $f2, 0x4b0($v0) +/* E07B98 80242838 03E00008 */ jr $ra +/* E07B9C 8024283C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242840.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242840.s deleted file mode 100644 index 777bf9c06b..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242840.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242840 -/* E07BA0 80242840 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E07BA4 80242844 AFB00010 */ sw $s0, 0x10($sp) -/* E07BA8 80242848 0080802D */ daddu $s0, $a0, $zero -/* E07BAC 8024284C AFBF0014 */ sw $ra, 0x14($sp) -/* E07BB0 80242850 10A00006 */ beqz $a1, .L8024286C -/* E07BB4 80242854 8E02000C */ lw $v0, 0xc($s0) -/* E07BB8 80242858 0C0B1EAF */ jal get_variable -/* E07BBC 8024285C 8C450000 */ lw $a1, ($v0) -/* E07BC0 80242860 0C00EABB */ jal get_npc_unsafe -/* E07BC4 80242864 0040202D */ daddu $a0, $v0, $zero -/* E07BC8 80242868 AE020074 */ sw $v0, 0x74($s0) -.L8024286C: -/* E07BCC 8024286C 8E030074 */ lw $v1, 0x74($s0) -/* E07BD0 80242870 3C013F2A */ lui $at, 0x3f2a -/* E07BD4 80242874 3421AAAB */ ori $at, $at, 0xaaab -/* E07BD8 80242878 44811000 */ mtc1 $at, $f2 -/* E07BDC 8024287C C4600038 */ lwc1 $f0, 0x38($v1) -/* E07BE0 80242880 46020000 */ add.s $f0, $f0, $f2 -/* E07BE4 80242884 E4600038 */ swc1 $f0, 0x38($v1) -/* E07BE8 80242888 8FBF0014 */ lw $ra, 0x14($sp) -/* E07BEC 8024288C 8FB00010 */ lw $s0, 0x10($sp) -/* E07BF0 80242890 0000102D */ daddu $v0, $zero, $zero -/* E07BF4 80242894 03E00008 */ jr $ra -/* E07BF8 80242898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242840_E07BA0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242840_E07BA0.s new file mode 100644 index 0000000000..eac8dc79ee --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242840_E07BA0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242840_E07BA0 +/* E07BA0 80242840 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07BA4 80242844 AFB00010 */ sw $s0, 0x10($sp) +/* E07BA8 80242848 0080802D */ daddu $s0, $a0, $zero +/* E07BAC 8024284C AFBF0014 */ sw $ra, 0x14($sp) +/* E07BB0 80242850 10A00006 */ beqz $a1, .L8024286C +/* E07BB4 80242854 8E02000C */ lw $v0, 0xc($s0) +/* E07BB8 80242858 0C0B1EAF */ jal get_variable +/* E07BBC 8024285C 8C450000 */ lw $a1, ($v0) +/* E07BC0 80242860 0C00EABB */ jal get_npc_unsafe +/* E07BC4 80242864 0040202D */ daddu $a0, $v0, $zero +/* E07BC8 80242868 AE020074 */ sw $v0, 0x74($s0) +.L8024286C: +/* E07BCC 8024286C 8E030074 */ lw $v1, 0x74($s0) +/* E07BD0 80242870 3C013F2A */ lui $at, 0x3f2a +/* E07BD4 80242874 3421AAAB */ ori $at, $at, 0xaaab +/* E07BD8 80242878 44811000 */ mtc1 $at, $f2 +/* E07BDC 8024287C C4600038 */ lwc1 $f0, 0x38($v1) +/* E07BE0 80242880 46020000 */ add.s $f0, $f0, $f2 +/* E07BE4 80242884 E4600038 */ swc1 $f0, 0x38($v1) +/* E07BE8 80242888 8FBF0014 */ lw $ra, 0x14($sp) +/* E07BEC 8024288C 8FB00010 */ lw $s0, 0x10($sp) +/* E07BF0 80242890 0000102D */ daddu $v0, $zero, $zero +/* E07BF4 80242894 03E00008 */ jr $ra +/* E07BF8 80242898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C.s deleted file mode 100644 index 13edac695c..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024289C -/* E07BFC 8024289C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* E07C00 802428A0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* E07C04 802428A4 8C420010 */ lw $v0, 0x10($v0) -/* E07C08 802428A8 30429000 */ andi $v0, $v0, 0x9000 -/* E07C0C 802428AC 0002102B */ sltu $v0, $zero, $v0 -/* E07C10 802428B0 03E00008 */ jr $ra -/* E07C14 802428B4 00021040 */ sll $v0, $v0, 1 -/* E07C18 802428B8 00000000 */ nop -/* E07C1C 802428BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C_E07BFC.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C_E07BFC.s new file mode 100644 index 0000000000..0a785f91a5 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_8024289C_E07BFC.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024289C_E07BFC +/* E07BFC 8024289C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* E07C00 802428A0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* E07C04 802428A4 8C420010 */ lw $v0, 0x10($v0) +/* E07C08 802428A8 30429000 */ andi $v0, $v0, 0x9000 +/* E07C0C 802428AC 0002102B */ sltu $v0, $zero, $v0 +/* E07C10 802428B0 03E00008 */ jr $ra +/* E07C14 802428B4 00021040 */ sll $v0, $v0, 1 +/* E07C18 802428B8 00000000 */ nop +/* E07C1C 802428BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0.s deleted file mode 100644 index 35e467928e..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428C0 -/* E07C20 802428C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E07C24 802428C4 2404005B */ addiu $a0, $zero, 0x5b -/* E07C28 802428C8 2405FFFF */ addiu $a1, $zero, -1 -/* E07C2C 802428CC 24060001 */ addiu $a2, $zero, 1 -/* E07C30 802428D0 AFBF0010 */ sw $ra, 0x10($sp) -/* E07C34 802428D4 0C046E54 */ jal func_8011B950 -/* E07C38 802428D8 0000382D */ daddu $a3, $zero, $zero -/* E07C3C 802428DC 0000202D */ daddu $a0, $zero, $zero -/* E07C40 802428E0 0080282D */ daddu $a1, $a0, $zero -/* E07C44 802428E4 0080302D */ daddu $a2, $a0, $zero -/* E07C48 802428E8 0C046F97 */ jal set_background_color_blend -/* E07C4C 802428EC 240700FF */ addiu $a3, $zero, 0xff -/* E07C50 802428F0 8FBF0010 */ lw $ra, 0x10($sp) -/* E07C54 802428F4 24020002 */ addiu $v0, $zero, 2 -/* E07C58 802428F8 03E00008 */ jr $ra -/* E07C5C 802428FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s new file mode 100644 index 0000000000..954b3db869 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_802428C0_E07C20.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428C0_E07C20 +/* E07C20 802428C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07C24 802428C4 2404005B */ addiu $a0, $zero, 0x5b +/* E07C28 802428C8 2405FFFF */ addiu $a1, $zero, -1 +/* E07C2C 802428CC 24060001 */ addiu $a2, $zero, 1 +/* E07C30 802428D0 AFBF0010 */ sw $ra, 0x10($sp) +/* E07C34 802428D4 0C046E54 */ jal func_8011B950 +/* E07C38 802428D8 0000382D */ daddu $a3, $zero, $zero +/* E07C3C 802428DC 0000202D */ daddu $a0, $zero, $zero +/* E07C40 802428E0 0080282D */ daddu $a1, $a0, $zero +/* E07C44 802428E4 0080302D */ daddu $a2, $a0, $zero +/* E07C48 802428E8 0C046F97 */ jal set_background_color_blend +/* E07C4C 802428EC 240700FF */ addiu $a3, $zero, 0xff +/* E07C50 802428F0 8FBF0010 */ lw $ra, 0x10($sp) +/* E07C54 802428F4 24020002 */ addiu $v0, $zero, 2 +/* E07C58 802428F8 03E00008 */ jr $ra +/* E07C5C 802428FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68.s deleted file mode 100644 index ee1a878a5c..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B68 -/* E07EC8 80242B68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E07ECC 80242B6C AFB10014 */ sw $s1, 0x14($sp) -/* E07ED0 80242B70 0080882D */ daddu $s1, $a0, $zero -/* E07ED4 80242B74 AFBF0018 */ sw $ra, 0x18($sp) -/* E07ED8 80242B78 AFB00010 */ sw $s0, 0x10($sp) -/* E07EDC 80242B7C 8E22000C */ lw $v0, 0xc($s1) -/* E07EE0 80242B80 00A0802D */ daddu $s0, $a1, $zero -/* E07EE4 80242B84 0C0B1EAF */ jal get_variable -/* E07EE8 80242B88 8C450000 */ lw $a1, ($v0) -/* E07EEC 80242B8C 1200000C */ beqz $s0, .L80242BC0 -/* E07EF0 80242B90 0220202D */ daddu $a0, $s1, $zero -/* E07EF4 80242B94 0C0B36B0 */ jal resolve_npc -/* E07EF8 80242B98 0040282D */ daddu $a1, $v0, $zero -/* E07EFC 80242B9C AE220074 */ sw $v0, 0x74($s1) -/* E07F00 80242BA0 C4420038 */ lwc1 $f2, 0x38($v0) -/* E07F04 80242BA4 3C014334 */ lui $at, 0x4334 -/* E07F08 80242BA8 44810000 */ mtc1 $at, $f0 -/* E07F0C 80242BAC 24020048 */ addiu $v0, $zero, 0x48 -/* E07F10 80242BB0 AE220070 */ sw $v0, 0x70($s1) -/* E07F14 80242BB4 4600110D */ trunc.w.s $f4, $f2 -/* E07F18 80242BB8 E6240078 */ swc1 $f4, 0x78($s1) -/* E07F1C 80242BBC E620007C */ swc1 $f0, 0x7c($s1) -.L80242BC0: -/* E07F20 80242BC0 C620007C */ lwc1 $f0, 0x7c($s1) -/* E07F24 80242BC4 3C0140A0 */ lui $at, 0x40a0 -/* E07F28 80242BC8 44816000 */ mtc1 $at, $f12 -/* E07F2C 80242BCC 8E300074 */ lw $s0, 0x74($s1) -/* E07F30 80242BD0 0C00A6C9 */ jal clamp_angle -/* E07F34 80242BD4 460C0300 */ add.s $f12, $f0, $f12 -/* E07F38 80242BD8 46000306 */ mov.s $f12, $f0 -/* E07F3C 80242BDC 0C00A8D4 */ jal cos_deg -/* E07F40 80242BE0 E62C007C */ swc1 $f12, 0x7c($s1) -/* E07F44 80242BE4 3C0140C0 */ lui $at, 0x40c0 -/* E07F48 80242BE8 44811000 */ mtc1 $at, $f2 -/* E07F4C 80242BEC 00000000 */ nop -/* E07F50 80242BF0 46020002 */ mul.s $f0, $f0, $f2 -/* E07F54 80242BF4 00000000 */ nop -/* E07F58 80242BF8 C6020038 */ lwc1 $f2, 0x38($s0) -/* E07F5C 80242BFC 46001080 */ add.s $f2, $f2, $f0 -/* E07F60 80242C00 E6020038 */ swc1 $f2, 0x38($s0) -/* E07F64 80242C04 0C00A8BB */ jal sin_deg -/* E07F68 80242C08 C62C007C */ lwc1 $f12, 0x7c($s1) -/* E07F6C 80242C0C 3C014020 */ lui $at, 0x4020 -/* E07F70 80242C10 44811000 */ mtc1 $at, $f2 -/* E07F74 80242C14 00000000 */ nop -/* E07F78 80242C18 46020002 */ mul.s $f0, $f0, $f2 -/* E07F7C 80242C1C 00000000 */ nop -/* E07F80 80242C20 C6020040 */ lwc1 $f2, 0x40($s0) -/* E07F84 80242C24 46001080 */ add.s $f2, $f2, $f0 -/* E07F88 80242C28 3C014334 */ lui $at, 0x4334 -/* E07F8C 80242C2C 44816000 */ mtc1 $at, $f12 -/* E07F90 80242C30 E6020040 */ swc1 $f2, 0x40($s0) -/* E07F94 80242C34 C620007C */ lwc1 $f0, 0x7c($s1) -/* E07F98 80242C38 0C00A6C9 */ jal clamp_angle -/* E07F9C 80242C3C 46006301 */ sub.s $f12, $f12, $f0 -/* E07FA0 80242C40 E6000034 */ swc1 $f0, 0x34($s0) -/* E07FA4 80242C44 8E230070 */ lw $v1, 0x70($s1) -/* E07FA8 80242C48 2463FFFF */ addiu $v1, $v1, -1 -/* E07FAC 80242C4C AE230070 */ sw $v1, 0x70($s1) -/* E07FB0 80242C50 8FBF0018 */ lw $ra, 0x18($sp) -/* E07FB4 80242C54 8FB10014 */ lw $s1, 0x14($sp) -/* E07FB8 80242C58 8FB00010 */ lw $s0, 0x10($sp) -/* E07FBC 80242C5C 2C620001 */ sltiu $v0, $v1, 1 -/* E07FC0 80242C60 03E00008 */ jr $ra -/* E07FC4 80242C64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s new file mode 100644 index 0000000000..b6d654c039 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242B68_E07EC8.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B68_E07EC8 +/* E07EC8 80242B68 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E07ECC 80242B6C AFB10014 */ sw $s1, 0x14($sp) +/* E07ED0 80242B70 0080882D */ daddu $s1, $a0, $zero +/* E07ED4 80242B74 AFBF0018 */ sw $ra, 0x18($sp) +/* E07ED8 80242B78 AFB00010 */ sw $s0, 0x10($sp) +/* E07EDC 80242B7C 8E22000C */ lw $v0, 0xc($s1) +/* E07EE0 80242B80 00A0802D */ daddu $s0, $a1, $zero +/* E07EE4 80242B84 0C0B1EAF */ jal get_variable +/* E07EE8 80242B88 8C450000 */ lw $a1, ($v0) +/* E07EEC 80242B8C 1200000C */ beqz $s0, .L80242BC0 +/* E07EF0 80242B90 0220202D */ daddu $a0, $s1, $zero +/* E07EF4 80242B94 0C0B36B0 */ jal resolve_npc +/* E07EF8 80242B98 0040282D */ daddu $a1, $v0, $zero +/* E07EFC 80242B9C AE220074 */ sw $v0, 0x74($s1) +/* E07F00 80242BA0 C4420038 */ lwc1 $f2, 0x38($v0) +/* E07F04 80242BA4 3C014334 */ lui $at, 0x4334 +/* E07F08 80242BA8 44810000 */ mtc1 $at, $f0 +/* E07F0C 80242BAC 24020048 */ addiu $v0, $zero, 0x48 +/* E07F10 80242BB0 AE220070 */ sw $v0, 0x70($s1) +/* E07F14 80242BB4 4600110D */ trunc.w.s $f4, $f2 +/* E07F18 80242BB8 E6240078 */ swc1 $f4, 0x78($s1) +/* E07F1C 80242BBC E620007C */ swc1 $f0, 0x7c($s1) +.L80242BC0: +/* E07F20 80242BC0 C620007C */ lwc1 $f0, 0x7c($s1) +/* E07F24 80242BC4 3C0140A0 */ lui $at, 0x40a0 +/* E07F28 80242BC8 44816000 */ mtc1 $at, $f12 +/* E07F2C 80242BCC 8E300074 */ lw $s0, 0x74($s1) +/* E07F30 80242BD0 0C00A6C9 */ jal clamp_angle +/* E07F34 80242BD4 460C0300 */ add.s $f12, $f0, $f12 +/* E07F38 80242BD8 46000306 */ mov.s $f12, $f0 +/* E07F3C 80242BDC 0C00A8D4 */ jal cos_deg +/* E07F40 80242BE0 E62C007C */ swc1 $f12, 0x7c($s1) +/* E07F44 80242BE4 3C0140C0 */ lui $at, 0x40c0 +/* E07F48 80242BE8 44811000 */ mtc1 $at, $f2 +/* E07F4C 80242BEC 00000000 */ nop +/* E07F50 80242BF0 46020002 */ mul.s $f0, $f0, $f2 +/* E07F54 80242BF4 00000000 */ nop +/* E07F58 80242BF8 C6020038 */ lwc1 $f2, 0x38($s0) +/* E07F5C 80242BFC 46001080 */ add.s $f2, $f2, $f0 +/* E07F60 80242C00 E6020038 */ swc1 $f2, 0x38($s0) +/* E07F64 80242C04 0C00A8BB */ jal sin_deg +/* E07F68 80242C08 C62C007C */ lwc1 $f12, 0x7c($s1) +/* E07F6C 80242C0C 3C014020 */ lui $at, 0x4020 +/* E07F70 80242C10 44811000 */ mtc1 $at, $f2 +/* E07F74 80242C14 00000000 */ nop +/* E07F78 80242C18 46020002 */ mul.s $f0, $f0, $f2 +/* E07F7C 80242C1C 00000000 */ nop +/* E07F80 80242C20 C6020040 */ lwc1 $f2, 0x40($s0) +/* E07F84 80242C24 46001080 */ add.s $f2, $f2, $f0 +/* E07F88 80242C28 3C014334 */ lui $at, 0x4334 +/* E07F8C 80242C2C 44816000 */ mtc1 $at, $f12 +/* E07F90 80242C30 E6020040 */ swc1 $f2, 0x40($s0) +/* E07F94 80242C34 C620007C */ lwc1 $f0, 0x7c($s1) +/* E07F98 80242C38 0C00A6C9 */ jal clamp_angle +/* E07F9C 80242C3C 46006301 */ sub.s $f12, $f12, $f0 +/* E07FA0 80242C40 E6000034 */ swc1 $f0, 0x34($s0) +/* E07FA4 80242C44 8E230070 */ lw $v1, 0x70($s1) +/* E07FA8 80242C48 2463FFFF */ addiu $v1, $v1, -1 +/* E07FAC 80242C4C AE230070 */ sw $v1, 0x70($s1) +/* E07FB0 80242C50 8FBF0018 */ lw $ra, 0x18($sp) +/* E07FB4 80242C54 8FB10014 */ lw $s1, 0x14($sp) +/* E07FB8 80242C58 8FB00010 */ lw $s0, 0x10($sp) +/* E07FBC 80242C5C 2C620001 */ sltiu $v0, $v1, 1 +/* E07FC0 80242C60 03E00008 */ jr $ra +/* E07FC4 80242C64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68.s deleted file mode 100644 index 537768cfe4..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C68 -/* E07FC8 80242C68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E07FCC 80242C6C AFBF0010 */ sw $ra, 0x10($sp) -/* E07FD0 80242C70 8C82000C */ lw $v0, 0xc($a0) -/* E07FD4 80242C74 0C0B1EAF */ jal get_variable -/* E07FD8 80242C78 8C450000 */ lw $a1, ($v0) -/* E07FDC 80242C7C 8FBF0010 */ lw $ra, 0x10($sp) -/* E07FE0 80242C80 3C018024 */ lui $at, 0x8024 -/* E07FE4 80242C84 AC225D34 */ sw $v0, 0x5d34($at) -/* E07FE8 80242C88 24020002 */ addiu $v0, $zero, 2 -/* E07FEC 80242C8C 03E00008 */ jr $ra -/* E07FF0 80242C90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s new file mode 100644 index 0000000000..cc8a7a58d1 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C68_E07FC8.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C68_E07FC8 +/* E07FC8 80242C68 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07FCC 80242C6C AFBF0010 */ sw $ra, 0x10($sp) +/* E07FD0 80242C70 8C82000C */ lw $v0, 0xc($a0) +/* E07FD4 80242C74 0C0B1EAF */ jal get_variable +/* E07FD8 80242C78 8C450000 */ lw $a1, ($v0) +/* E07FDC 80242C7C 8FBF0010 */ lw $ra, 0x10($sp) +/* E07FE0 80242C80 3C018024 */ lui $at, 0x8024 +/* E07FE4 80242C84 AC225D34 */ sw $v0, 0x5d34($at) +/* E07FE8 80242C88 24020002 */ addiu $v0, $zero, 2 +/* E07FEC 80242C8C 03E00008 */ jr $ra +/* E07FF0 80242C90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94.s deleted file mode 100644 index 17bbe48363..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C94 -/* E07FF4 80242C94 3C06FC12 */ lui $a2, 0xfc12 -/* E07FF8 80242C98 34C64624 */ ori $a2, $a2, 0x4624 -/* E07FFC 80242C9C 3C05FF8F */ lui $a1, 0xff8f -/* E08000 80242CA0 3C04800A */ lui $a0, 0x800a -/* E08004 80242CA4 2484A66C */ addiu $a0, $a0, -0x5994 -/* E08008 80242CA8 8C820000 */ lw $v0, ($a0) -/* E0800C 80242CAC 34A5FFFF */ ori $a1, $a1, 0xffff -/* E08010 80242CB0 0040182D */ daddu $v1, $v0, $zero -/* E08014 80242CB4 24420008 */ addiu $v0, $v0, 8 -/* E08018 80242CB8 AC820000 */ sw $v0, ($a0) -/* E0801C 80242CBC AC660000 */ sw $a2, ($v1) -/* E08020 80242CC0 AC650004 */ sw $a1, 4($v1) -/* E08024 80242CC4 24430008 */ addiu $v1, $v0, 8 -/* E08028 80242CC8 AC830000 */ sw $v1, ($a0) -/* E0802C 80242CCC 3C048024 */ lui $a0, 0x8024 -/* E08030 80242CD0 90845D37 */ lbu $a0, 0x5d37($a0) -/* E08034 80242CD4 3C03FA00 */ lui $v1, 0xfa00 -/* 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 diff --git a/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s new file mode 100644 index 0000000000..b21718ceab --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E05390/func_80242C94_E07FF4.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +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, 0x800a +/* E08004 80242CA4 2484A66C */ addiu $a0, $a0, -0x5994 +/* E08008 80242CA8 8C820000 */ lw $v0, ($a0) +/* E0800C 80242CAC 34A5FFFF */ ori $a1, $a1, 0xffff +/* E08010 80242CB0 0040182D */ daddu $v1, $v0, $zero +/* E08014 80242CB4 24420008 */ addiu $v0, $v0, 8 +/* E08018 80242CB8 AC820000 */ sw $v0, ($a0) +/* E0801C 80242CBC AC660000 */ sw $a2, ($v1) +/* E08020 80242CC0 AC650004 */ sw $a1, 4($v1) +/* E08024 80242CC4 24430008 */ addiu $v1, $v0, 8 +/* E08028 80242CC8 AC830000 */ sw $v1, ($a0) +/* E0802C 80242CCC 3C048024 */ lui $a0, 0x8024 +/* E08030 80242CD0 90845D37 */ lbu $a0, 0x5d37($a0) +/* E08034 80242CD4 3C03FA00 */ lui $v1, 0xfa00 +/* 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 diff --git a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0.s b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0.s deleted file mode 100644 index 5d899c52f8..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CF0 -/* E08050 80242CF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E08054 80242CF4 AFB10014 */ sw $s1, 0x14($sp) -/* E08058 80242CF8 0080882D */ daddu $s1, $a0, $zero -/* E0805C 80242CFC AFBF001C */ sw $ra, 0x1c($sp) -/* E08060 80242D00 AFB20018 */ sw $s2, 0x18($sp) -/* E08064 80242D04 AFB00010 */ sw $s0, 0x10($sp) -/* E08068 80242D08 8E30000C */ lw $s0, 0xc($s1) -/* E0806C 80242D0C 8E050000 */ lw $a1, ($s0) -/* E08070 80242D10 0C0B1EAF */ jal get_variable -/* E08074 80242D14 26100004 */ addiu $s0, $s0, 4 -/* E08078 80242D18 8E050000 */ lw $a1, ($s0) -/* E0807C 80242D1C 26100004 */ addiu $s0, $s0, 4 -/* E08080 80242D20 0220202D */ daddu $a0, $s1, $zero -/* E08084 80242D24 0C0B1EAF */ jal get_variable -/* E08088 80242D28 0040902D */ daddu $s2, $v0, $zero -/* E0808C 80242D2C 0220202D */ daddu $a0, $s1, $zero -/* E08090 80242D30 8E050000 */ lw $a1, ($s0) -/* E08094 80242D34 0C0B1EAF */ jal get_variable -/* E08098 80242D38 0040802D */ daddu $s0, $v0, $zero -/* E0809C 80242D3C 0040882D */ daddu $s1, $v0, $zero -/* E080A0 80242D40 2402FFFF */ addiu $v0, $zero, -1 -/* E080A4 80242D44 16020005 */ bne $s0, $v0, .L80242D5C -/* E080A8 80242D48 24020001 */ addiu $v0, $zero, 1 -/* E080AC 80242D4C 0C04760B */ jal func_8011D82C -/* E080B0 80242D50 0220202D */ daddu $a0, $s1, $zero -/* E080B4 80242D54 08090B7F */ j .L80242DFC -/* E080B8 80242D58 24020002 */ addiu $v0, $zero, 2 -.L80242D5C: -/* E080BC 80242D5C 12420018 */ beq $s2, $v0, .L80242DC0 -/* E080C0 80242D60 2A420002 */ slti $v0, $s2, 2 -/* E080C4 80242D64 10400005 */ beqz $v0, .L80242D7C -/* E080C8 80242D68 24020002 */ addiu $v0, $zero, 2 -/* E080CC 80242D6C 12400007 */ beqz $s2, .L80242D8C -/* E080D0 80242D70 3412FFFF */ ori $s2, $zero, 0xffff -/* E080D4 80242D74 08090B7F */ j .L80242DFC -/* E080D8 80242D78 00000000 */ nop -.L80242D7C: -/* E080DC 80242D7C 1242001B */ beq $s2, $v0, .L80242DEC -/* E080E0 80242D80 24020002 */ addiu $v0, $zero, 2 -/* E080E4 80242D84 08090B7F */ j .L80242DFC -/* E080E8 80242D88 00000000 */ nop -.L80242D8C: -/* E080EC 80242D8C 8E040000 */ lw $a0, ($s0) -/* E080F0 80242D90 1092001A */ beq $a0, $s2, .L80242DFC -/* E080F4 80242D94 24020002 */ addiu $v0, $zero, 2 -/* E080F8 80242D98 0C046C04 */ jal get_model_list_index_from_tree_index -/* E080FC 80242D9C 26100004 */ addiu $s0, $s0, 4 -/* E08100 80242DA0 0C046B4C */ jal get_model_from_list_index -/* E08104 80242DA4 0040202D */ daddu $a0, $v0, $zero -/* E08108 80242DA8 0040202D */ daddu $a0, $v0, $zero -/* E0810C 80242DAC 2405FFFF */ addiu $a1, $zero, -1 -/* E08110 80242DB0 0C046F1F */ jal func_8011BC7C -/* E08114 80242DB4 0220302D */ daddu $a2, $s1, $zero -/* E08118 80242DB8 08090B63 */ j .L80242D8C -/* E0811C 80242DBC 00000000 */ nop -.L80242DC0: -/* E08120 80242DC0 3412FFFF */ ori $s2, $zero, 0xffff -.L80242DC4: -/* E08124 80242DC4 8E020000 */ lw $v0, ($s0) -/* E08128 80242DC8 1052000B */ beq $v0, $s2, .L80242DF8 -/* E0812C 80242DCC 2405FFFF */ addiu $a1, $zero, -1 -/* E08130 80242DD0 96040002 */ lhu $a0, 2($s0) -/* E08134 80242DD4 0220302D */ daddu $a2, $s1, $zero -/* E08138 80242DD8 26100004 */ addiu $s0, $s0, 4 -/* E0813C 80242DDC 0C046E54 */ jal func_8011B950 -/* E08140 80242DE0 0000382D */ daddu $a3, $zero, $zero -/* E08144 80242DE4 08090B71 */ j .L80242DC4 -/* E08148 80242DE8 00000000 */ nop -.L80242DEC: -/* E0814C 80242DEC 3C028015 */ lui $v0, 0x8015 -/* E08150 80242DF0 8C4212F0 */ lw $v0, 0x12f0($v0) -/* E08154 80242DF4 A0510000 */ sb $s1, ($v0) -.L80242DF8: -/* E08158 80242DF8 24020002 */ addiu $v0, $zero, 2 -.L80242DFC: -/* E0815C 80242DFC 8FBF001C */ lw $ra, 0x1c($sp) -/* E08160 80242E00 8FB20018 */ lw $s2, 0x18($sp) -/* E08164 80242E04 8FB10014 */ lw $s1, 0x14($sp) -/* E08168 80242E08 8FB00010 */ lw $s0, 0x10($sp) -/* E0816C 80242E0C 03E00008 */ jr $ra -/* E08170 80242E10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s new file mode 100644 index 0000000000..5540e10cf3 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242CF0_E08050.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242CF0_E08050 +/* E08050 80242CF0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E08054 80242CF4 AFB10014 */ sw $s1, 0x14($sp) +/* E08058 80242CF8 0080882D */ daddu $s1, $a0, $zero +/* E0805C 80242CFC AFBF001C */ sw $ra, 0x1c($sp) +/* E08060 80242D00 AFB20018 */ sw $s2, 0x18($sp) +/* E08064 80242D04 AFB00010 */ sw $s0, 0x10($sp) +/* E08068 80242D08 8E30000C */ lw $s0, 0xc($s1) +/* E0806C 80242D0C 8E050000 */ lw $a1, ($s0) +/* E08070 80242D10 0C0B1EAF */ jal get_variable +/* E08074 80242D14 26100004 */ addiu $s0, $s0, 4 +/* E08078 80242D18 8E050000 */ lw $a1, ($s0) +/* E0807C 80242D1C 26100004 */ addiu $s0, $s0, 4 +/* E08080 80242D20 0220202D */ daddu $a0, $s1, $zero +/* E08084 80242D24 0C0B1EAF */ jal get_variable +/* E08088 80242D28 0040902D */ daddu $s2, $v0, $zero +/* E0808C 80242D2C 0220202D */ daddu $a0, $s1, $zero +/* E08090 80242D30 8E050000 */ lw $a1, ($s0) +/* E08094 80242D34 0C0B1EAF */ jal get_variable +/* E08098 80242D38 0040802D */ daddu $s0, $v0, $zero +/* E0809C 80242D3C 0040882D */ daddu $s1, $v0, $zero +/* E080A0 80242D40 2402FFFF */ addiu $v0, $zero, -1 +/* E080A4 80242D44 16020005 */ bne $s0, $v0, .L80242D5C +/* E080A8 80242D48 24020001 */ addiu $v0, $zero, 1 +/* E080AC 80242D4C 0C04760B */ jal func_8011D82C +/* E080B0 80242D50 0220202D */ daddu $a0, $s1, $zero +/* E080B4 80242D54 08090B7F */ j .L80242DFC +/* E080B8 80242D58 24020002 */ addiu $v0, $zero, 2 +.L80242D5C: +/* E080BC 80242D5C 12420018 */ beq $s2, $v0, .L80242DC0 +/* E080C0 80242D60 2A420002 */ slti $v0, $s2, 2 +/* E080C4 80242D64 10400005 */ beqz $v0, .L80242D7C +/* E080C8 80242D68 24020002 */ addiu $v0, $zero, 2 +/* E080CC 80242D6C 12400007 */ beqz $s2, .L80242D8C +/* E080D0 80242D70 3412FFFF */ ori $s2, $zero, 0xffff +/* E080D4 80242D74 08090B7F */ j .L80242DFC +/* E080D8 80242D78 00000000 */ nop +.L80242D7C: +/* E080DC 80242D7C 1242001B */ beq $s2, $v0, .L80242DEC +/* E080E0 80242D80 24020002 */ addiu $v0, $zero, 2 +/* E080E4 80242D84 08090B7F */ j .L80242DFC +/* E080E8 80242D88 00000000 */ nop +.L80242D8C: +/* E080EC 80242D8C 8E040000 */ lw $a0, ($s0) +/* E080F0 80242D90 1092001A */ beq $a0, $s2, .L80242DFC +/* E080F4 80242D94 24020002 */ addiu $v0, $zero, 2 +/* E080F8 80242D98 0C046C04 */ jal get_model_list_index_from_tree_index +/* E080FC 80242D9C 26100004 */ addiu $s0, $s0, 4 +/* E08100 80242DA0 0C046B4C */ jal get_model_from_list_index +/* E08104 80242DA4 0040202D */ daddu $a0, $v0, $zero +/* E08108 80242DA8 0040202D */ daddu $a0, $v0, $zero +/* E0810C 80242DAC 2405FFFF */ addiu $a1, $zero, -1 +/* E08110 80242DB0 0C046F1F */ jal func_8011BC7C +/* E08114 80242DB4 0220302D */ daddu $a2, $s1, $zero +/* E08118 80242DB8 08090B63 */ j .L80242D8C +/* E0811C 80242DBC 00000000 */ nop +.L80242DC0: +/* E08120 80242DC0 3412FFFF */ ori $s2, $zero, 0xffff +.L80242DC4: +/* E08124 80242DC4 8E020000 */ lw $v0, ($s0) +/* E08128 80242DC8 1052000B */ beq $v0, $s2, .L80242DF8 +/* E0812C 80242DCC 2405FFFF */ addiu $a1, $zero, -1 +/* E08130 80242DD0 96040002 */ lhu $a0, 2($s0) +/* E08134 80242DD4 0220302D */ daddu $a2, $s1, $zero +/* E08138 80242DD8 26100004 */ addiu $s0, $s0, 4 +/* E0813C 80242DDC 0C046E54 */ jal func_8011B950 +/* E08140 80242DE0 0000382D */ daddu $a3, $zero, $zero +/* E08144 80242DE4 08090B71 */ j .L80242DC4 +/* E08148 80242DE8 00000000 */ nop +.L80242DEC: +/* E0814C 80242DEC 3C028015 */ lui $v0, 0x8015 +/* E08150 80242DF0 8C4212F0 */ lw $v0, 0x12f0($v0) +/* E08154 80242DF4 A0510000 */ sb $s1, ($v0) +.L80242DF8: +/* E08158 80242DF8 24020002 */ addiu $v0, $zero, 2 +.L80242DFC: +/* E0815C 80242DFC 8FBF001C */ lw $ra, 0x1c($sp) +/* E08160 80242E00 8FB20018 */ lw $s2, 0x18($sp) +/* E08164 80242E04 8FB10014 */ lw $s1, 0x14($sp) +/* E08168 80242E08 8FB00010 */ lw $s0, 0x10($sp) +/* E0816C 80242E0C 03E00008 */ jr $ra +/* E08170 80242E10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14.s b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14.s deleted file mode 100644 index 8e52f1f91c..0000000000 --- a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E14 -/* E08174 80242E14 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* E08178 80242E18 AFB10034 */ sw $s1, 0x34($sp) -/* E0817C 80242E1C 0080882D */ daddu $s1, $a0, $zero -/* E08180 80242E20 AFBF0054 */ sw $ra, 0x54($sp) -/* E08184 80242E24 AFBE0050 */ sw $fp, 0x50($sp) -/* E08188 80242E28 AFB7004C */ sw $s7, 0x4c($sp) -/* E0818C 80242E2C AFB60048 */ sw $s6, 0x48($sp) -/* E08190 80242E30 AFB50044 */ sw $s5, 0x44($sp) -/* E08194 80242E34 AFB40040 */ sw $s4, 0x40($sp) -/* E08198 80242E38 AFB3003C */ sw $s3, 0x3c($sp) -/* E0819C 80242E3C AFB20038 */ sw $s2, 0x38($sp) -/* E081A0 80242E40 AFB00030 */ sw $s0, 0x30($sp) -/* E081A4 80242E44 8E30000C */ lw $s0, 0xc($s1) -/* E081A8 80242E48 8E050000 */ lw $a1, ($s0) -/* E081AC 80242E4C 0C0B1EAF */ jal get_variable -/* E081B0 80242E50 26100004 */ addiu $s0, $s0, 4 -/* E081B4 80242E54 8E050000 */ lw $a1, ($s0) -/* E081B8 80242E58 26100004 */ addiu $s0, $s0, 4 -/* E081BC 80242E5C 0220202D */ daddu $a0, $s1, $zero -/* E081C0 80242E60 0C0B1EAF */ jal get_variable -/* E081C4 80242E64 0040982D */ daddu $s3, $v0, $zero -/* E081C8 80242E68 8E050000 */ lw $a1, ($s0) -/* E081CC 80242E6C 26100004 */ addiu $s0, $s0, 4 -/* E081D0 80242E70 0220202D */ daddu $a0, $s1, $zero -/* E081D4 80242E74 0C0B1EAF */ jal get_variable -/* E081D8 80242E78 0040B02D */ daddu $s6, $v0, $zero -/* E081DC 80242E7C 8E050000 */ lw $a1, ($s0) -/* E081E0 80242E80 26100004 */ addiu $s0, $s0, 4 -/* E081E4 80242E84 0220202D */ daddu $a0, $s1, $zero -/* E081E8 80242E88 0C0B1EAF */ jal get_variable -/* E081EC 80242E8C 0040A82D */ daddu $s5, $v0, $zero -/* E081F0 80242E90 8E050000 */ lw $a1, ($s0) -/* E081F4 80242E94 26100004 */ addiu $s0, $s0, 4 -/* E081F8 80242E98 0220202D */ daddu $a0, $s1, $zero -/* E081FC 80242E9C 0C0B1EAF */ jal get_variable -/* E08200 80242EA0 0040A02D */ daddu $s4, $v0, $zero -/* E08204 80242EA4 8E050000 */ lw $a1, ($s0) -/* E08208 80242EA8 26100004 */ addiu $s0, $s0, 4 -/* E0820C 80242EAC 0220202D */ daddu $a0, $s1, $zero -/* E08210 80242EB0 0C0B1EAF */ jal get_variable -/* E08214 80242EB4 0040902D */ daddu $s2, $v0, $zero -/* E08218 80242EB8 8E050000 */ lw $a1, ($s0) -/* E0821C 80242EBC 26100004 */ addiu $s0, $s0, 4 -/* E08220 80242EC0 0220202D */ daddu $a0, $s1, $zero -/* E08224 80242EC4 0C0B1EAF */ jal get_variable -/* E08228 80242EC8 AFA20028 */ sw $v0, 0x28($sp) -/* E0822C 80242ECC 8E050000 */ lw $a1, ($s0) -/* E08230 80242ED0 26100004 */ addiu $s0, $s0, 4 -/* E08234 80242ED4 0220202D */ daddu $a0, $s1, $zero -/* E08238 80242ED8 0C0B1EAF */ jal get_variable -/* E0823C 80242EDC 0040F02D */ daddu $fp, $v0, $zero -/* E08240 80242EE0 8E050000 */ lw $a1, ($s0) -/* E08244 80242EE4 26100004 */ addiu $s0, $s0, 4 -/* E08248 80242EE8 0220202D */ daddu $a0, $s1, $zero -/* E0824C 80242EEC 0C0B1EAF */ jal get_variable -/* E08250 80242EF0 0040B82D */ daddu $s7, $v0, $zero -/* E08254 80242EF4 0220202D */ daddu $a0, $s1, $zero -/* E08258 80242EF8 8E050000 */ lw $a1, ($s0) -/* E0825C 80242EFC 0C0B1EAF */ jal get_variable -/* E08260 80242F00 0040802D */ daddu $s0, $v0, $zero -/* E08264 80242F04 0040182D */ daddu $v1, $v0, $zero -/* E08268 80242F08 24020002 */ addiu $v0, $zero, 2 -/* E0826C 80242F0C 12620012 */ beq $s3, $v0, .L80242F58 -/* E08270 80242F10 2A620003 */ slti $v0, $s3, 3 -/* E08274 80242F14 10400005 */ beqz $v0, .L80242F2C -/* E08278 80242F18 24020001 */ addiu $v0, $zero, 1 -/* E0827C 80242F1C 12620008 */ beq $s3, $v0, .L80242F40 -/* E08280 80242F20 32C400FF */ andi $a0, $s6, 0xff -/* E08284 80242F24 08090BED */ j .L80242FB4 -/* E08288 80242F28 00000000 */ nop -.L80242F2C: -/* E0828C 80242F2C 24020003 */ addiu $v0, $zero, 3 -/* E08290 80242F30 12620018 */ beq $s3, $v0, .L80242F94 -/* E08294 80242F34 32C400FF */ andi $a0, $s6, 0xff -/* E08298 80242F38 08090BED */ j .L80242FB4 -/* E0829C 80242F3C 00000000 */ nop -.L80242F40: -/* E082A0 80242F40 32A500FF */ andi $a1, $s5, 0xff -/* E082A4 80242F44 328600FF */ andi $a2, $s4, 0xff -/* E082A8 80242F48 0C046F97 */ jal set_background_color_blend -/* E082AC 80242F4C 324700FF */ andi $a3, $s2, 0xff -/* E082B0 80242F50 08090BED */ j .L80242FB4 -/* E082B4 80242F54 00000000 */ nop -.L80242F58: -/* E082B8 80242F58 32C400FF */ andi $a0, $s6, 0xff -/* E082BC 80242F5C 32A500FF */ andi $a1, $s5, 0xff -/* E082C0 80242F60 328600FF */ andi $a2, $s4, 0xff -/* E082C4 80242F64 324700FF */ andi $a3, $s2, 0xff -/* E082C8 80242F68 93A2002B */ lbu $v0, 0x2b($sp) -/* E082CC 80242F6C AFB0001C */ sw $s0, 0x1c($sp) -/* E082D0 80242F70 AFA30020 */ sw $v1, 0x20($sp) -/* E082D4 80242F74 AFA20010 */ sw $v0, 0x10($sp) -/* E082D8 80242F78 33C200FF */ andi $v0, $fp, 0xff -/* E082DC 80242F7C AFA20014 */ sw $v0, 0x14($sp) -/* E082E0 80242F80 32E200FF */ andi $v0, $s7, 0xff -/* E082E4 80242F84 0C046FAD */ jal func_8011BEB4 -/* E082E8 80242F88 AFA20018 */ sw $v0, 0x18($sp) -/* E082EC 80242F8C 08090BED */ j .L80242FB4 -/* E082F0 80242F90 00000000 */ nop -.L80242F94: -/* E082F4 80242F94 32A500FF */ andi $a1, $s5, 0xff -/* E082F8 80242F98 328600FF */ andi $a2, $s4, 0xff -/* E082FC 80242F9C 324700FF */ andi $a3, $s2, 0xff -/* E08300 80242FA0 93A2002B */ lbu $v0, 0x2b($sp) -/* E08304 80242FA4 AFA20010 */ sw $v0, 0x10($sp) -/* E08308 80242FA8 33C200FF */ andi $v0, $fp, 0xff -/* E0830C 80242FAC 0C046FE6 */ jal func_8011BF98 -/* E08310 80242FB0 AFA20014 */ sw $v0, 0x14($sp) -.L80242FB4: -/* E08314 80242FB4 8FBF0054 */ lw $ra, 0x54($sp) -/* E08318 80242FB8 8FBE0050 */ lw $fp, 0x50($sp) -/* E0831C 80242FBC 8FB7004C */ lw $s7, 0x4c($sp) -/* E08320 80242FC0 8FB60048 */ lw $s6, 0x48($sp) -/* E08324 80242FC4 8FB50044 */ lw $s5, 0x44($sp) -/* E08328 80242FC8 8FB40040 */ lw $s4, 0x40($sp) -/* E0832C 80242FCC 8FB3003C */ lw $s3, 0x3c($sp) -/* E08330 80242FD0 8FB20038 */ lw $s2, 0x38($sp) -/* E08334 80242FD4 8FB10034 */ lw $s1, 0x34($sp) -/* E08338 80242FD8 8FB00030 */ lw $s0, 0x30($sp) -/* E0833C 80242FDC 24020002 */ addiu $v0, $zero, 2 -/* E08340 80242FE0 03E00008 */ jr $ra -/* E08344 80242FE4 27BD0058 */ addiu $sp, $sp, 0x58 -/* E08348 80242FE8 00000000 */ nop -/* E0834C 80242FEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s new file mode 100644 index 0000000000..307d828f17 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E08050/func_80242E14_E08174.s @@ -0,0 +1,128 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E14_E08174 +/* E08174 80242E14 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* E08178 80242E18 AFB10034 */ sw $s1, 0x34($sp) +/* E0817C 80242E1C 0080882D */ daddu $s1, $a0, $zero +/* E08180 80242E20 AFBF0054 */ sw $ra, 0x54($sp) +/* E08184 80242E24 AFBE0050 */ sw $fp, 0x50($sp) +/* E08188 80242E28 AFB7004C */ sw $s7, 0x4c($sp) +/* E0818C 80242E2C AFB60048 */ sw $s6, 0x48($sp) +/* E08190 80242E30 AFB50044 */ sw $s5, 0x44($sp) +/* E08194 80242E34 AFB40040 */ sw $s4, 0x40($sp) +/* E08198 80242E38 AFB3003C */ sw $s3, 0x3c($sp) +/* E0819C 80242E3C AFB20038 */ sw $s2, 0x38($sp) +/* E081A0 80242E40 AFB00030 */ sw $s0, 0x30($sp) +/* E081A4 80242E44 8E30000C */ lw $s0, 0xc($s1) +/* E081A8 80242E48 8E050000 */ lw $a1, ($s0) +/* E081AC 80242E4C 0C0B1EAF */ jal get_variable +/* E081B0 80242E50 26100004 */ addiu $s0, $s0, 4 +/* E081B4 80242E54 8E050000 */ lw $a1, ($s0) +/* E081B8 80242E58 26100004 */ addiu $s0, $s0, 4 +/* E081BC 80242E5C 0220202D */ daddu $a0, $s1, $zero +/* E081C0 80242E60 0C0B1EAF */ jal get_variable +/* E081C4 80242E64 0040982D */ daddu $s3, $v0, $zero +/* E081C8 80242E68 8E050000 */ lw $a1, ($s0) +/* E081CC 80242E6C 26100004 */ addiu $s0, $s0, 4 +/* E081D0 80242E70 0220202D */ daddu $a0, $s1, $zero +/* E081D4 80242E74 0C0B1EAF */ jal get_variable +/* E081D8 80242E78 0040B02D */ daddu $s6, $v0, $zero +/* E081DC 80242E7C 8E050000 */ lw $a1, ($s0) +/* E081E0 80242E80 26100004 */ addiu $s0, $s0, 4 +/* E081E4 80242E84 0220202D */ daddu $a0, $s1, $zero +/* E081E8 80242E88 0C0B1EAF */ jal get_variable +/* E081EC 80242E8C 0040A82D */ daddu $s5, $v0, $zero +/* E081F0 80242E90 8E050000 */ lw $a1, ($s0) +/* E081F4 80242E94 26100004 */ addiu $s0, $s0, 4 +/* E081F8 80242E98 0220202D */ daddu $a0, $s1, $zero +/* E081FC 80242E9C 0C0B1EAF */ jal get_variable +/* E08200 80242EA0 0040A02D */ daddu $s4, $v0, $zero +/* E08204 80242EA4 8E050000 */ lw $a1, ($s0) +/* E08208 80242EA8 26100004 */ addiu $s0, $s0, 4 +/* E0820C 80242EAC 0220202D */ daddu $a0, $s1, $zero +/* E08210 80242EB0 0C0B1EAF */ jal get_variable +/* E08214 80242EB4 0040902D */ daddu $s2, $v0, $zero +/* E08218 80242EB8 8E050000 */ lw $a1, ($s0) +/* E0821C 80242EBC 26100004 */ addiu $s0, $s0, 4 +/* E08220 80242EC0 0220202D */ daddu $a0, $s1, $zero +/* E08224 80242EC4 0C0B1EAF */ jal get_variable +/* E08228 80242EC8 AFA20028 */ sw $v0, 0x28($sp) +/* E0822C 80242ECC 8E050000 */ lw $a1, ($s0) +/* E08230 80242ED0 26100004 */ addiu $s0, $s0, 4 +/* E08234 80242ED4 0220202D */ daddu $a0, $s1, $zero +/* E08238 80242ED8 0C0B1EAF */ jal get_variable +/* E0823C 80242EDC 0040F02D */ daddu $fp, $v0, $zero +/* E08240 80242EE0 8E050000 */ lw $a1, ($s0) +/* E08244 80242EE4 26100004 */ addiu $s0, $s0, 4 +/* E08248 80242EE8 0220202D */ daddu $a0, $s1, $zero +/* E0824C 80242EEC 0C0B1EAF */ jal get_variable +/* E08250 80242EF0 0040B82D */ daddu $s7, $v0, $zero +/* E08254 80242EF4 0220202D */ daddu $a0, $s1, $zero +/* E08258 80242EF8 8E050000 */ lw $a1, ($s0) +/* E0825C 80242EFC 0C0B1EAF */ jal get_variable +/* E08260 80242F00 0040802D */ daddu $s0, $v0, $zero +/* E08264 80242F04 0040182D */ daddu $v1, $v0, $zero +/* E08268 80242F08 24020002 */ addiu $v0, $zero, 2 +/* E0826C 80242F0C 12620012 */ beq $s3, $v0, .L80242F58 +/* E08270 80242F10 2A620003 */ slti $v0, $s3, 3 +/* E08274 80242F14 10400005 */ beqz $v0, .L80242F2C +/* E08278 80242F18 24020001 */ addiu $v0, $zero, 1 +/* E0827C 80242F1C 12620008 */ beq $s3, $v0, .L80242F40 +/* E08280 80242F20 32C400FF */ andi $a0, $s6, 0xff +/* E08284 80242F24 08090BED */ j .L80242FB4 +/* E08288 80242F28 00000000 */ nop +.L80242F2C: +/* E0828C 80242F2C 24020003 */ addiu $v0, $zero, 3 +/* E08290 80242F30 12620018 */ beq $s3, $v0, .L80242F94 +/* E08294 80242F34 32C400FF */ andi $a0, $s6, 0xff +/* E08298 80242F38 08090BED */ j .L80242FB4 +/* E0829C 80242F3C 00000000 */ nop +.L80242F40: +/* E082A0 80242F40 32A500FF */ andi $a1, $s5, 0xff +/* E082A4 80242F44 328600FF */ andi $a2, $s4, 0xff +/* E082A8 80242F48 0C046F97 */ jal set_background_color_blend +/* E082AC 80242F4C 324700FF */ andi $a3, $s2, 0xff +/* E082B0 80242F50 08090BED */ j .L80242FB4 +/* E082B4 80242F54 00000000 */ nop +.L80242F58: +/* E082B8 80242F58 32C400FF */ andi $a0, $s6, 0xff +/* E082BC 80242F5C 32A500FF */ andi $a1, $s5, 0xff +/* E082C0 80242F60 328600FF */ andi $a2, $s4, 0xff +/* E082C4 80242F64 324700FF */ andi $a3, $s2, 0xff +/* E082C8 80242F68 93A2002B */ lbu $v0, 0x2b($sp) +/* E082CC 80242F6C AFB0001C */ sw $s0, 0x1c($sp) +/* E082D0 80242F70 AFA30020 */ sw $v1, 0x20($sp) +/* E082D4 80242F74 AFA20010 */ sw $v0, 0x10($sp) +/* E082D8 80242F78 33C200FF */ andi $v0, $fp, 0xff +/* E082DC 80242F7C AFA20014 */ sw $v0, 0x14($sp) +/* E082E0 80242F80 32E200FF */ andi $v0, $s7, 0xff +/* E082E4 80242F84 0C046FAD */ jal func_8011BEB4 +/* E082E8 80242F88 AFA20018 */ sw $v0, 0x18($sp) +/* E082EC 80242F8C 08090BED */ j .L80242FB4 +/* E082F0 80242F90 00000000 */ nop +.L80242F94: +/* E082F4 80242F94 32A500FF */ andi $a1, $s5, 0xff +/* E082F8 80242F98 328600FF */ andi $a2, $s4, 0xff +/* E082FC 80242F9C 324700FF */ andi $a3, $s2, 0xff +/* E08300 80242FA0 93A2002B */ lbu $v0, 0x2b($sp) +/* E08304 80242FA4 AFA20010 */ sw $v0, 0x10($sp) +/* E08308 80242FA8 33C200FF */ andi $v0, $fp, 0xff +/* E0830C 80242FAC 0C046FE6 */ jal func_8011BF98 +/* E08310 80242FB0 AFA20014 */ sw $v0, 0x14($sp) +.L80242FB4: +/* E08314 80242FB4 8FBF0054 */ lw $ra, 0x54($sp) +/* E08318 80242FB8 8FBE0050 */ lw $fp, 0x50($sp) +/* E0831C 80242FBC 8FB7004C */ lw $s7, 0x4c($sp) +/* E08320 80242FC0 8FB60048 */ lw $s6, 0x48($sp) +/* E08324 80242FC4 8FB50044 */ lw $s5, 0x44($sp) +/* E08328 80242FC8 8FB40040 */ lw $s4, 0x40($sp) +/* E0832C 80242FCC 8FB3003C */ lw $s3, 0x3c($sp) +/* E08330 80242FD0 8FB20038 */ lw $s2, 0x38($sp) +/* E08334 80242FD4 8FB10034 */ lw $s1, 0x34($sp) +/* E08338 80242FD8 8FB00030 */ lw $s0, 0x30($sp) +/* E0833C 80242FDC 24020002 */ addiu $v0, $zero, 2 +/* E08340 80242FE0 03E00008 */ jr $ra +/* E08344 80242FE4 27BD0058 */ addiu $sp, $sp, 0x58 +/* E08348 80242FE8 00000000 */ nop +/* E0834C 80242FEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4.s deleted file mode 100644 index 59dff83887..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407E4 -/* C9E704 802407E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9E708 802407E8 AFB00010 */ sw $s0, 0x10($sp) -/* C9E70C 802407EC 0080802D */ daddu $s0, $a0, $zero -/* C9E710 802407F0 AFBF0014 */ sw $ra, 0x14($sp) -/* C9E714 802407F4 8E020148 */ lw $v0, 0x148($s0) -/* C9E718 802407F8 0C00EABB */ jal get_npc_unsafe -/* C9E71C 802407FC 84440008 */ lh $a0, 8($v0) -/* C9E720 80240800 0040202D */ daddu $a0, $v0, $zero -/* C9E724 80240804 C482003C */ lwc1 $f2, 0x3c($a0) -/* C9E728 80240808 C480001C */ lwc1 $f0, 0x1c($a0) -/* C9E72C 8024080C 46001080 */ add.s $f2, $f2, $f0 -/* C9E730 80240810 C4840014 */ lwc1 $f4, 0x14($a0) -/* C9E734 80240814 46040001 */ sub.s $f0, $f0, $f4 -/* C9E738 80240818 C4840064 */ lwc1 $f4, 0x64($a0) -/* C9E73C 8024081C 4602203C */ c.lt.s $f4, $f2 -/* C9E740 80240820 E482003C */ swc1 $f2, 0x3c($a0) -/* C9E744 80240824 45010009 */ bc1t .L8024084C -/* C9E748 80240828 E480001C */ swc1 $f0, 0x1c($a0) -/* C9E74C 8024082C 8C820000 */ lw $v0, ($a0) -/* C9E750 80240830 2403F7FF */ addiu $v1, $zero, -0x801 -/* C9E754 80240834 E484003C */ swc1 $f4, 0x3c($a0) -/* C9E758 80240838 AC80001C */ sw $zero, 0x1c($a0) -/* C9E75C 8024083C 00431024 */ and $v0, $v0, $v1 -/* C9E760 80240840 AC820000 */ sw $v0, ($a0) -/* C9E764 80240844 2402000C */ addiu $v0, $zero, 0xc -/* C9E768 80240848 AE020070 */ sw $v0, 0x70($s0) -.L8024084C: -/* C9E76C 8024084C 8FBF0014 */ lw $ra, 0x14($sp) -/* C9E770 80240850 8FB00010 */ lw $s0, 0x10($sp) -/* C9E774 80240854 03E00008 */ jr $ra -/* C9E778 80240858 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4_C9E704.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4_C9E704.s new file mode 100644 index 0000000000..ffec1146d5 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_802407E4_C9E704.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407E4_C9E704 +/* C9E704 802407E4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C9E708 802407E8 AFB00010 */ sw $s0, 0x10($sp) +/* C9E70C 802407EC 0080802D */ daddu $s0, $a0, $zero +/* C9E710 802407F0 AFBF0014 */ sw $ra, 0x14($sp) +/* C9E714 802407F4 8E020148 */ lw $v0, 0x148($s0) +/* C9E718 802407F8 0C00EABB */ jal get_npc_unsafe +/* C9E71C 802407FC 84440008 */ lh $a0, 8($v0) +/* C9E720 80240800 0040202D */ daddu $a0, $v0, $zero +/* C9E724 80240804 C482003C */ lwc1 $f2, 0x3c($a0) +/* C9E728 80240808 C480001C */ lwc1 $f0, 0x1c($a0) +/* C9E72C 8024080C 46001080 */ add.s $f2, $f2, $f0 +/* C9E730 80240810 C4840014 */ lwc1 $f4, 0x14($a0) +/* C9E734 80240814 46040001 */ sub.s $f0, $f0, $f4 +/* C9E738 80240818 C4840064 */ lwc1 $f4, 0x64($a0) +/* C9E73C 8024081C 4602203C */ c.lt.s $f4, $f2 +/* C9E740 80240820 E482003C */ swc1 $f2, 0x3c($a0) +/* C9E744 80240824 45010009 */ bc1t .L8024084C +/* C9E748 80240828 E480001C */ swc1 $f0, 0x1c($a0) +/* C9E74C 8024082C 8C820000 */ lw $v0, ($a0) +/* C9E750 80240830 2403F7FF */ addiu $v1, $zero, -0x801 +/* C9E754 80240834 E484003C */ swc1 $f4, 0x3c($a0) +/* C9E758 80240838 AC80001C */ sw $zero, 0x1c($a0) +/* C9E75C 8024083C 00431024 */ and $v0, $v0, $v1 +/* C9E760 80240840 AC820000 */ sw $v0, ($a0) +/* C9E764 80240844 2402000C */ addiu $v0, $zero, 0xc +/* C9E768 80240848 AE020070 */ sw $v0, 0x70($s0) +.L8024084C: +/* C9E76C 8024084C 8FBF0014 */ lw $ra, 0x14($sp) +/* C9E770 80240850 8FB00010 */ lw $s0, 0x10($sp) +/* C9E774 80240854 03E00008 */ jr $ra +/* C9E778 80240858 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C.s deleted file mode 100644 index 7891dbe466..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024098C -/* C9E8AC 8024098C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C9E8B0 80240990 AFB3003C */ sw $s3, 0x3c($sp) -/* C9E8B4 80240994 0080982D */ daddu $s3, $a0, $zero -/* C9E8B8 80240998 AFBF0040 */ sw $ra, 0x40($sp) -/* C9E8BC 8024099C AFB20038 */ sw $s2, 0x38($sp) -/* C9E8C0 802409A0 AFB10034 */ sw $s1, 0x34($sp) -/* C9E8C4 802409A4 AFB00030 */ sw $s0, 0x30($sp) -/* C9E8C8 802409A8 8E720148 */ lw $s2, 0x148($s3) -/* C9E8CC 802409AC 00A0882D */ daddu $s1, $a1, $zero -/* C9E8D0 802409B0 86440008 */ lh $a0, 8($s2) -/* C9E8D4 802409B4 0C00EABB */ jal get_npc_unsafe -/* C9E8D8 802409B8 00C0802D */ daddu $s0, $a2, $zero -/* C9E8DC 802409BC 0200202D */ daddu $a0, $s0, $zero -/* C9E8E0 802409C0 0240282D */ daddu $a1, $s2, $zero -/* C9E8E4 802409C4 24030001 */ addiu $v1, $zero, 1 -/* C9E8E8 802409C8 AFA30010 */ sw $v1, 0x10($sp) -/* C9E8EC 802409CC 8E260024 */ lw $a2, 0x24($s1) -/* C9E8F0 802409D0 8E270028 */ lw $a3, 0x28($s1) -/* C9E8F4 802409D4 0C01242D */ jal func_800490B4 -/* C9E8F8 802409D8 0040802D */ daddu $s0, $v0, $zero -/* C9E8FC 802409DC 1440001E */ bnez $v0, .L80240A58 -/* C9E900 802409E0 0200202D */ daddu $a0, $s0, $zero -/* C9E904 802409E4 24040002 */ addiu $a0, $zero, 2 -/* C9E908 802409E8 0200282D */ daddu $a1, $s0, $zero -/* C9E90C 802409EC 0000302D */ daddu $a2, $zero, $zero -/* C9E910 802409F0 860300A8 */ lh $v1, 0xa8($s0) -/* C9E914 802409F4 3C013F80 */ lui $at, 0x3f80 -/* C9E918 802409F8 44810000 */ mtc1 $at, $f0 -/* C9E91C 802409FC 3C014000 */ lui $at, 0x4000 -/* C9E920 80240A00 44811000 */ mtc1 $at, $f2 -/* C9E924 80240A04 3C01C1A0 */ lui $at, 0xc1a0 -/* C9E928 80240A08 44812000 */ mtc1 $at, $f4 -/* C9E92C 80240A0C 2402000F */ addiu $v0, $zero, 0xf -/* C9E930 80240A10 AFA2001C */ sw $v0, 0x1c($sp) -/* C9E934 80240A14 44833000 */ mtc1 $v1, $f6 -/* C9E938 80240A18 00000000 */ nop -/* C9E93C 80240A1C 468031A0 */ cvt.s.w $f6, $f6 -/* C9E940 80240A20 44073000 */ mfc1 $a3, $f6 -/* C9E944 80240A24 27A20028 */ addiu $v0, $sp, 0x28 -/* C9E948 80240A28 AFA20020 */ sw $v0, 0x20($sp) -/* C9E94C 80240A2C E7A00010 */ swc1 $f0, 0x10($sp) -/* C9E950 80240A30 E7A20014 */ swc1 $f2, 0x14($sp) -/* C9E954 80240A34 0C01BFA4 */ jal fx_emote -/* C9E958 80240A38 E7A40018 */ swc1 $f4, 0x18($sp) -/* C9E95C 80240A3C 8E4200CC */ lw $v0, 0xcc($s2) -/* C9E960 80240A40 8C430000 */ lw $v1, ($v0) -/* C9E964 80240A44 24020019 */ addiu $v0, $zero, 0x19 -/* C9E968 80240A48 A602008E */ sh $v0, 0x8e($s0) -/* C9E96C 80240A4C 2402000E */ addiu $v0, $zero, 0xe -/* C9E970 80240A50 080902A3 */ j .L80240A8C -/* C9E974 80240A54 AE030028 */ sw $v1, 0x28($s0) -.L80240A58: -/* C9E978 80240A58 0C00F598 */ jal func_8003D660 -/* C9E97C 80240A5C 24050001 */ addiu $a1, $zero, 1 -/* C9E980 80240A60 8E050018 */ lw $a1, 0x18($s0) -/* C9E984 80240A64 8E06000C */ lw $a2, 0xc($s0) -/* C9E988 80240A68 0C00EA95 */ jal npc_move_heading -/* C9E98C 80240A6C 0200202D */ daddu $a0, $s0, $zero -/* C9E990 80240A70 8602008E */ lh $v0, 0x8e($s0) -/* C9E994 80240A74 9603008E */ lhu $v1, 0x8e($s0) -/* C9E998 80240A78 18400003 */ blez $v0, .L80240A88 -/* C9E99C 80240A7C 2462FFFF */ addiu $v0, $v1, -1 -/* C9E9A0 80240A80 080902A4 */ j .L80240A90 -/* C9E9A4 80240A84 A602008E */ sh $v0, 0x8e($s0) -.L80240A88: -/* C9E9A8 80240A88 2402000C */ addiu $v0, $zero, 0xc -.L80240A8C: -/* C9E9AC 80240A8C AE620070 */ sw $v0, 0x70($s3) -.L80240A90: -/* C9E9B0 80240A90 8FBF0040 */ lw $ra, 0x40($sp) -/* C9E9B4 80240A94 8FB3003C */ lw $s3, 0x3c($sp) -/* C9E9B8 80240A98 8FB20038 */ lw $s2, 0x38($sp) -/* C9E9BC 80240A9C 8FB10034 */ lw $s1, 0x34($sp) -/* C9E9C0 80240AA0 8FB00030 */ lw $s0, 0x30($sp) -/* C9E9C4 80240AA4 03E00008 */ jr $ra -/* C9E9C8 80240AA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s new file mode 100644 index 0000000000..9a6d3f8b16 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_8024098C_C9E8AC.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024098C_C9E8AC +/* C9E8AC 8024098C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C9E8B0 80240990 AFB3003C */ sw $s3, 0x3c($sp) +/* C9E8B4 80240994 0080982D */ daddu $s3, $a0, $zero +/* C9E8B8 80240998 AFBF0040 */ sw $ra, 0x40($sp) +/* C9E8BC 8024099C AFB20038 */ sw $s2, 0x38($sp) +/* C9E8C0 802409A0 AFB10034 */ sw $s1, 0x34($sp) +/* C9E8C4 802409A4 AFB00030 */ sw $s0, 0x30($sp) +/* C9E8C8 802409A8 8E720148 */ lw $s2, 0x148($s3) +/* C9E8CC 802409AC 00A0882D */ daddu $s1, $a1, $zero +/* C9E8D0 802409B0 86440008 */ lh $a0, 8($s2) +/* C9E8D4 802409B4 0C00EABB */ jal get_npc_unsafe +/* C9E8D8 802409B8 00C0802D */ daddu $s0, $a2, $zero +/* C9E8DC 802409BC 0200202D */ daddu $a0, $s0, $zero +/* C9E8E0 802409C0 0240282D */ daddu $a1, $s2, $zero +/* C9E8E4 802409C4 24030001 */ addiu $v1, $zero, 1 +/* C9E8E8 802409C8 AFA30010 */ sw $v1, 0x10($sp) +/* C9E8EC 802409CC 8E260024 */ lw $a2, 0x24($s1) +/* C9E8F0 802409D0 8E270028 */ lw $a3, 0x28($s1) +/* C9E8F4 802409D4 0C01242D */ jal func_800490B4 +/* C9E8F8 802409D8 0040802D */ daddu $s0, $v0, $zero +/* C9E8FC 802409DC 1440001E */ bnez $v0, .L80240A58 +/* C9E900 802409E0 0200202D */ daddu $a0, $s0, $zero +/* C9E904 802409E4 24040002 */ addiu $a0, $zero, 2 +/* C9E908 802409E8 0200282D */ daddu $a1, $s0, $zero +/* C9E90C 802409EC 0000302D */ daddu $a2, $zero, $zero +/* C9E910 802409F0 860300A8 */ lh $v1, 0xa8($s0) +/* C9E914 802409F4 3C013F80 */ lui $at, 0x3f80 +/* C9E918 802409F8 44810000 */ mtc1 $at, $f0 +/* C9E91C 802409FC 3C014000 */ lui $at, 0x4000 +/* C9E920 80240A00 44811000 */ mtc1 $at, $f2 +/* C9E924 80240A04 3C01C1A0 */ lui $at, 0xc1a0 +/* C9E928 80240A08 44812000 */ mtc1 $at, $f4 +/* C9E92C 80240A0C 2402000F */ addiu $v0, $zero, 0xf +/* C9E930 80240A10 AFA2001C */ sw $v0, 0x1c($sp) +/* C9E934 80240A14 44833000 */ mtc1 $v1, $f6 +/* C9E938 80240A18 00000000 */ nop +/* C9E93C 80240A1C 468031A0 */ cvt.s.w $f6, $f6 +/* C9E940 80240A20 44073000 */ mfc1 $a3, $f6 +/* C9E944 80240A24 27A20028 */ addiu $v0, $sp, 0x28 +/* C9E948 80240A28 AFA20020 */ sw $v0, 0x20($sp) +/* C9E94C 80240A2C E7A00010 */ swc1 $f0, 0x10($sp) +/* C9E950 80240A30 E7A20014 */ swc1 $f2, 0x14($sp) +/* C9E954 80240A34 0C01BFA4 */ jal fx_emote +/* C9E958 80240A38 E7A40018 */ swc1 $f4, 0x18($sp) +/* C9E95C 80240A3C 8E4200CC */ lw $v0, 0xcc($s2) +/* C9E960 80240A40 8C430000 */ lw $v1, ($v0) +/* C9E964 80240A44 24020019 */ addiu $v0, $zero, 0x19 +/* C9E968 80240A48 A602008E */ sh $v0, 0x8e($s0) +/* C9E96C 80240A4C 2402000E */ addiu $v0, $zero, 0xe +/* C9E970 80240A50 080902A3 */ j .L80240A8C +/* C9E974 80240A54 AE030028 */ sw $v1, 0x28($s0) +.L80240A58: +/* C9E978 80240A58 0C00F598 */ jal func_8003D660 +/* C9E97C 80240A5C 24050001 */ addiu $a1, $zero, 1 +/* C9E980 80240A60 8E050018 */ lw $a1, 0x18($s0) +/* C9E984 80240A64 8E06000C */ lw $a2, 0xc($s0) +/* C9E988 80240A68 0C00EA95 */ jal npc_move_heading +/* C9E98C 80240A6C 0200202D */ daddu $a0, $s0, $zero +/* C9E990 80240A70 8602008E */ lh $v0, 0x8e($s0) +/* C9E994 80240A74 9603008E */ lhu $v1, 0x8e($s0) +/* C9E998 80240A78 18400003 */ blez $v0, .L80240A88 +/* C9E99C 80240A7C 2462FFFF */ addiu $v0, $v1, -1 +/* C9E9A0 80240A80 080902A4 */ j .L80240A90 +/* C9E9A4 80240A84 A602008E */ sh $v0, 0x8e($s0) +.L80240A88: +/* C9E9A8 80240A88 2402000C */ addiu $v0, $zero, 0xc +.L80240A8C: +/* C9E9AC 80240A8C AE620070 */ sw $v0, 0x70($s3) +.L80240A90: +/* C9E9B0 80240A90 8FBF0040 */ lw $ra, 0x40($sp) +/* C9E9B4 80240A94 8FB3003C */ lw $s3, 0x3c($sp) +/* C9E9B8 80240A98 8FB20038 */ lw $s2, 0x38($sp) +/* C9E9BC 80240A9C 8FB10034 */ lw $s1, 0x34($sp) +/* C9E9C0 80240AA0 8FB00030 */ lw $s0, 0x30($sp) +/* C9E9C4 80240AA4 03E00008 */ jr $ra +/* C9E9C8 80240AA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s index 58372ec2cb..9faf6b0d2d 100644 --- a/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s +++ b/asm/nonmatchings/world/area_flo/flo_00/C9DF60/func_80240BD4_C9EAF4.s @@ -131,59 +131,59 @@ glabel func_80240BD4_C9EAF4 /* C9ECD4 80240DB4 00000000 */ nop /* C9ECD8 80240DB8 0280202D */ daddu $a0, $s4, $zero /* C9ECDC 80240DBC 0260282D */ daddu $a1, $s3, $zero -/* C9ECE0 80240DC0 0C090010 */ jal func_80240040 +/* C9ECE0 80240DC0 0C090010 */ jal func_80240040_C9DF60 /* C9ECE4 80240DC4 02A0302D */ daddu $a2, $s5, $zero /* C9ECE8 80240DC8 0280202D */ daddu $a0, $s4, $zero /* C9ECEC 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* C9ECF0 80240DD0 0C090066 */ jal func_80240198 +/* C9ECF0 80240DD0 0C090066 */ jal func_80240198_C9E0B8 /* C9ECF4 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* C9ECF8 80240DD8 080903AA */ j .L80240EA8 /* C9ECFC 80240DDC 00000000 */ nop /* C9ED00 80240DE0 0280202D */ daddu $a0, $s4, $zero /* C9ED04 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* C9ED08 80240DE8 0C090110 */ jal func_80240440 +/* C9ED08 80240DE8 0C090110 */ jal func_80240440_C9E360 /* C9ED0C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* C9ED10 80240DF0 0280202D */ daddu $a0, $s4, $zero /* C9ED14 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* C9ED18 80240DF8 0C090140 */ jal func_80240500 +/* C9ED18 80240DF8 0C090140 */ jal func_80240500_C9E420 /* C9ED1C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* C9ED20 80240E00 080903AA */ j .L80240EA8 /* C9ED24 80240E04 00000000 */ nop /* C9ED28 80240E08 0280202D */ daddu $a0, $s4, $zero /* C9ED2C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* C9ED30 80240E10 0C0901AF */ jal func_802406BC +/* C9ED30 80240E10 0C0901AF */ jal func_802406BC_C9E5DC /* C9ED34 80240E14 02A0302D */ daddu $a2, $s5, $zero /* C9ED38 80240E18 080903AA */ j .L80240EA8 /* C9ED3C 80240E1C 00000000 */ nop /* C9ED40 80240E20 0280202D */ daddu $a0, $s4, $zero /* C9ED44 80240E24 0260282D */ daddu $a1, $s3, $zero -/* C9ED48 80240E28 0C0901DC */ jal func_80240770 +/* C9ED48 80240E28 0C0901DC */ jal func_80240770_C9E690 /* C9ED4C 80240E2C 02A0302D */ daddu $a2, $s5, $zero /* C9ED50 80240E30 0280202D */ daddu $a0, $s4, $zero /* C9ED54 80240E34 0260282D */ daddu $a1, $s3, $zero -/* C9ED58 80240E38 0C0901F9 */ jal func_802407E4 +/* C9ED58 80240E38 0C0901F9 */ jal func_802407E4_C9E704 /* C9ED5C 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* C9ED60 80240E40 080903AA */ j .L80240EA8 /* C9ED64 80240E44 00000000 */ nop /* C9ED68 80240E48 0280202D */ daddu $a0, $s4, $zero /* C9ED6C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* C9ED70 80240E50 0C090217 */ jal func_8024085C +/* C9ED70 80240E50 0C090217 */ jal func_8024085C_C9E77C /* C9ED74 80240E54 02A0302D */ daddu $a2, $s5, $zero /* C9ED78 80240E58 0280202D */ daddu $a0, $s4, $zero /* C9ED7C 80240E5C 0260282D */ daddu $a1, $s3, $zero -/* C9ED80 80240E60 0C090263 */ jal func_8024098C +/* C9ED80 80240E60 0C090263 */ jal func_8024098C_C9E8AC /* C9ED84 80240E64 02A0302D */ daddu $a2, $s5, $zero /* C9ED88 80240E68 080903AA */ j .L80240EA8 /* C9ED8C 80240E6C 00000000 */ nop /* C9ED90 80240E70 0280202D */ daddu $a0, $s4, $zero /* C9ED94 80240E74 0260282D */ daddu $a1, $s3, $zero -/* C9ED98 80240E78 0C0902AB */ jal func_80240AAC +/* C9ED98 80240E78 0C0902AB */ jal func_80240AAC_C9E9CC /* C9ED9C 80240E7C 02A0302D */ daddu $a2, $s5, $zero /* C9EDA0 80240E80 080903AA */ j .L80240EA8 /* C9EDA4 80240E84 00000000 */ nop /* C9EDA8 80240E88 0280202D */ daddu $a0, $s4, $zero /* C9EDAC 80240E8C 0260282D */ daddu $a1, $s3, $zero -/* C9EDB0 80240E90 0C0902C5 */ jal func_80240B14 +/* C9EDB0 80240E90 0C0902C5 */ jal func_80240B14_C9EA34 /* C9EDB4 80240E94 02A0302D */ daddu $a2, $s5, $zero /* C9EDB8 80240E98 080903AA */ j .L80240EA8 /* C9EDBC 80240E9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC.s b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC.s deleted file mode 100644 index 8cb7d6e9f6..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413BC -/* C9F2DC 802413BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C9F2E0 802413C0 AFBF0010 */ sw $ra, 0x10($sp) -/* C9F2E4 802413C4 0C03A6CC */ jal decrement_status_menu_disabled -/* C9F2E8 802413C8 00000000 */ nop -/* C9F2EC 802413CC 8FBF0010 */ lw $ra, 0x10($sp) -/* C9F2F0 802413D0 24020002 */ addiu $v0, $zero, 2 -/* C9F2F4 802413D4 03E00008 */ jr $ra -/* C9F2F8 802413D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* C9F2FC 802413DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s new file mode 100644 index 0000000000..e6a5dd21a0 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_00/C9EE30/func_802413BC_C9F2DC.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413BC_C9F2DC +/* C9F2DC 802413BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C9F2E0 802413C0 AFBF0010 */ sw $ra, 0x10($sp) +/* C9F2E4 802413C4 0C03A6CC */ jal decrement_status_menu_disabled +/* C9F2E8 802413C8 00000000 */ nop +/* C9F2EC 802413CC 8FBF0010 */ lw $ra, 0x10($sp) +/* C9F2F0 802413D0 24020002 */ addiu $v0, $zero, 2 +/* C9F2F4 802413D4 03E00008 */ jr $ra +/* C9F2F8 802413D8 27BD0018 */ addiu $sp, $sp, 0x18 +/* C9F2FC 802413DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240460_CA7700.s b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240460_CA7700.s index 713bad0ac5..7c20b6575a 100644 --- a/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240460_CA7700.s +++ b/asm/nonmatchings/world/area_flo/flo_03/CA72E0/func_80240460_CA7700.s @@ -55,7 +55,7 @@ glabel func_80240460_CA7700 /* CA77C8 80240528 4405E000 */ mfc1 $a1, $f28 /* CA77CC 8024052C 4406D000 */ mfc1 $a2, $f26 /* CA77D0 80240530 4407C000 */ mfc1 $a3, $f24 -/* CA77D4 80240534 0C0900FC */ jal func_802403F0 +/* CA77D4 80240534 0C0900FC */ jal func_802403F0_CA7690 /* CA77D8 80240538 27A40010 */ addiu $a0, $sp, 0x10 /* CA77DC 8024053C 27A40010 */ addiu $a0, $sp, 0x10 /* CA77E0 80240540 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240460_CA7700 /* CA7850 802405B0 4405E000 */ mfc1 $a1, $f28 /* CA7854 802405B4 4406D000 */ mfc1 $a2, $f26 /* CA7858 802405B8 4407C000 */ mfc1 $a3, $f24 -/* CA785C 802405BC 0C0900FC */ jal func_802403F0 +/* CA785C 802405BC 0C0900FC */ jal func_802403F0_CA7690 /* CA7860 802405C0 27A40010 */ addiu $a0, $sp, 0x10 /* CA7864 802405C4 27A40010 */ addiu $a0, $sp, 0x10 /* CA7868 802405C8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_80240450.s b/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_80240450.s deleted file mode 100644 index 70a0c34034..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_80240450.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240450 -/* CAC640 80240450 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CAC644 80240454 AFB10054 */ sw $s1, 0x54($sp) -/* CAC648 80240458 0080882D */ daddu $s1, $a0, $zero -/* CAC64C 8024045C AFBF005C */ sw $ra, 0x5c($sp) -/* CAC650 80240460 AFB20058 */ sw $s2, 0x58($sp) -/* CAC654 80240464 AFB00050 */ sw $s0, 0x50($sp) -/* CAC658 80240468 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* CAC65C 8024046C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CAC660 80240470 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CAC664 80240474 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CAC668 80240478 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CAC66C 8024047C 8E30000C */ lw $s0, 0xc($s1) -/* CAC670 80240480 8E050000 */ lw $a1, ($s0) -/* CAC674 80240484 0C0B1EAF */ jal get_variable -/* CAC678 80240488 26100004 */ addiu $s0, $s0, 4 -/* CAC67C 8024048C 0C046C04 */ jal get_model_list_index_from_tree_index -/* CAC680 80240490 0040202D */ daddu $a0, $v0, $zero -/* CAC684 80240494 8E050000 */ lw $a1, ($s0) -/* CAC688 80240498 26100004 */ addiu $s0, $s0, 4 -/* CAC68C 8024049C 0220202D */ daddu $a0, $s1, $zero -/* CAC690 802404A0 0C0B210B */ jal get_float_variable -/* CAC694 802404A4 0040902D */ daddu $s2, $v0, $zero -/* CAC698 802404A8 8E050000 */ lw $a1, ($s0) -/* CAC69C 802404AC 26100004 */ addiu $s0, $s0, 4 -/* CAC6A0 802404B0 0220202D */ daddu $a0, $s1, $zero -/* CAC6A4 802404B4 0C0B210B */ jal get_float_variable -/* CAC6A8 802404B8 46000706 */ mov.s $f28, $f0 -/* CAC6AC 802404BC 8E050000 */ lw $a1, ($s0) -/* CAC6B0 802404C0 26100004 */ addiu $s0, $s0, 4 -/* CAC6B4 802404C4 0220202D */ daddu $a0, $s1, $zero -/* CAC6B8 802404C8 0C0B210B */ jal get_float_variable -/* CAC6BC 802404CC 46000686 */ mov.s $f26, $f0 -/* CAC6C0 802404D0 0220202D */ daddu $a0, $s1, $zero -/* CAC6C4 802404D4 8E050000 */ lw $a1, ($s0) -/* CAC6C8 802404D8 0C0B210B */ jal get_float_variable -/* CAC6CC 802404DC 46000586 */ mov.s $f22, $f0 -/* CAC6D0 802404E0 0240202D */ daddu $a0, $s2, $zero -/* CAC6D4 802404E4 0C046B4C */ jal get_model_from_list_index -/* CAC6D8 802404E8 46000606 */ mov.s $f24, $f0 -/* CAC6DC 802404EC 0040882D */ daddu $s1, $v0, $zero -/* CAC6E0 802404F0 96220000 */ lhu $v0, ($s1) -/* CAC6E4 802404F4 30420400 */ andi $v0, $v0, 0x400 -/* CAC6E8 802404F8 1440001E */ bnez $v0, .L80240574 -/* CAC6EC 802404FC 26300058 */ addiu $s0, $s1, 0x58 -/* CAC6F0 80240500 4480A000 */ mtc1 $zero, $f20 -/* CAC6F4 80240504 4406B000 */ mfc1 $a2, $f22 -/* CAC6F8 80240508 4405A000 */ mfc1 $a1, $f20 -/* CAC6FC 8024050C 4407A000 */ mfc1 $a3, $f20 -/* CAC700 80240510 0C019E40 */ jal guTranslateF -/* CAC704 80240514 0200202D */ daddu $a0, $s0, $zero -/* CAC708 80240518 4405E000 */ mfc1 $a1, $f28 -/* CAC70C 8024051C 4406D000 */ mfc1 $a2, $f26 -/* CAC710 80240520 4407C000 */ mfc1 $a3, $f24 -/* CAC714 80240524 0C0900F8 */ jal func_802403E0 -/* CAC718 80240528 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC71C 8024052C 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC720 80240530 0200282D */ daddu $a1, $s0, $zero -/* CAC724 80240534 0C019D80 */ jal guMtxCatF -/* CAC728 80240538 0200302D */ daddu $a2, $s0, $zero -/* CAC72C 8024053C 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC730 80240540 4600B587 */ neg.s $f22, $f22 -/* CAC734 80240544 4405A000 */ mfc1 $a1, $f20 -/* CAC738 80240548 4406B000 */ mfc1 $a2, $f22 -/* CAC73C 8024054C 0C019E40 */ jal guTranslateF -/* CAC740 80240550 00A0382D */ daddu $a3, $a1, $zero -/* CAC744 80240554 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC748 80240558 0200282D */ daddu $a1, $s0, $zero -/* CAC74C 8024055C 0C019D80 */ jal guMtxCatF -/* CAC750 80240560 00A0302D */ daddu $a2, $a1, $zero -/* CAC754 80240564 96220000 */ lhu $v0, ($s1) -/* CAC758 80240568 34421400 */ ori $v0, $v0, 0x1400 -/* CAC75C 8024056C 0809017B */ j .L802405EC -/* CAC760 80240570 A6220000 */ sh $v0, ($s1) -.L80240574: -/* CAC764 80240574 4480A000 */ mtc1 $zero, $f20 -/* CAC768 80240578 4406B000 */ mfc1 $a2, $f22 -/* CAC76C 8024057C 4405A000 */ mfc1 $a1, $f20 -/* CAC770 80240580 4407A000 */ mfc1 $a3, $f20 -/* CAC774 80240584 0C019E40 */ jal guTranslateF -/* CAC778 80240588 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC77C 8024058C 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC780 80240590 26300058 */ addiu $s0, $s1, 0x58 -/* CAC784 80240594 0200282D */ daddu $a1, $s0, $zero -/* CAC788 80240598 0C019D80 */ jal guMtxCatF -/* CAC78C 8024059C 0200302D */ daddu $a2, $s0, $zero -/* CAC790 802405A0 4405E000 */ mfc1 $a1, $f28 -/* CAC794 802405A4 4406D000 */ mfc1 $a2, $f26 -/* CAC798 802405A8 4407C000 */ mfc1 $a3, $f24 -/* CAC79C 802405AC 0C0900F8 */ jal func_802403E0 -/* CAC7A0 802405B0 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC7A4 802405B4 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC7A8 802405B8 0200282D */ daddu $a1, $s0, $zero -/* CAC7AC 802405BC 0C019D80 */ jal guMtxCatF -/* CAC7B0 802405C0 0200302D */ daddu $a2, $s0, $zero -/* CAC7B4 802405C4 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC7B8 802405C8 4600B587 */ neg.s $f22, $f22 -/* CAC7BC 802405CC 4405A000 */ mfc1 $a1, $f20 -/* CAC7C0 802405D0 4406B000 */ mfc1 $a2, $f22 -/* CAC7C4 802405D4 0C019E40 */ jal guTranslateF -/* CAC7C8 802405D8 00A0382D */ daddu $a3, $a1, $zero -/* CAC7CC 802405DC 27A40010 */ addiu $a0, $sp, 0x10 -/* CAC7D0 802405E0 0200282D */ daddu $a1, $s0, $zero -/* CAC7D4 802405E4 0C019D80 */ jal guMtxCatF -/* CAC7D8 802405E8 00A0302D */ daddu $a2, $a1, $zero -.L802405EC: -/* CAC7DC 802405EC 8FBF005C */ lw $ra, 0x5c($sp) -/* CAC7E0 802405F0 8FB20058 */ lw $s2, 0x58($sp) -/* CAC7E4 802405F4 8FB10054 */ lw $s1, 0x54($sp) -/* CAC7E8 802405F8 8FB00050 */ lw $s0, 0x50($sp) -/* CAC7EC 802405FC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* CAC7F0 80240600 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CAC7F4 80240604 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CAC7F8 80240608 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CAC7FC 8024060C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CAC800 80240610 24020002 */ addiu $v0, $zero, 2 -/* CAC804 80240614 03E00008 */ jr $ra -/* CAC808 80240618 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_80240450_CAC640.s b/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_80240450_CAC640.s new file mode 100644 index 0000000000..29d69b7012 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_07/CAC5D0/func_80240450_CAC640.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240450_CAC640 +/* CAC640 80240450 27BDFF78 */ addiu $sp, $sp, -0x88 +/* CAC644 80240454 AFB10054 */ sw $s1, 0x54($sp) +/* CAC648 80240458 0080882D */ daddu $s1, $a0, $zero +/* CAC64C 8024045C AFBF005C */ sw $ra, 0x5c($sp) +/* CAC650 80240460 AFB20058 */ sw $s2, 0x58($sp) +/* CAC654 80240464 AFB00050 */ sw $s0, 0x50($sp) +/* CAC658 80240468 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* CAC65C 8024046C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* CAC660 80240470 F7B80070 */ sdc1 $f24, 0x70($sp) +/* CAC664 80240474 F7B60068 */ sdc1 $f22, 0x68($sp) +/* CAC668 80240478 F7B40060 */ sdc1 $f20, 0x60($sp) +/* CAC66C 8024047C 8E30000C */ lw $s0, 0xc($s1) +/* CAC670 80240480 8E050000 */ lw $a1, ($s0) +/* CAC674 80240484 0C0B1EAF */ jal get_variable +/* CAC678 80240488 26100004 */ addiu $s0, $s0, 4 +/* CAC67C 8024048C 0C046C04 */ jal get_model_list_index_from_tree_index +/* CAC680 80240490 0040202D */ daddu $a0, $v0, $zero +/* CAC684 80240494 8E050000 */ lw $a1, ($s0) +/* CAC688 80240498 26100004 */ addiu $s0, $s0, 4 +/* CAC68C 8024049C 0220202D */ daddu $a0, $s1, $zero +/* CAC690 802404A0 0C0B210B */ jal get_float_variable +/* CAC694 802404A4 0040902D */ daddu $s2, $v0, $zero +/* CAC698 802404A8 8E050000 */ lw $a1, ($s0) +/* CAC69C 802404AC 26100004 */ addiu $s0, $s0, 4 +/* CAC6A0 802404B0 0220202D */ daddu $a0, $s1, $zero +/* CAC6A4 802404B4 0C0B210B */ jal get_float_variable +/* CAC6A8 802404B8 46000706 */ mov.s $f28, $f0 +/* CAC6AC 802404BC 8E050000 */ lw $a1, ($s0) +/* CAC6B0 802404C0 26100004 */ addiu $s0, $s0, 4 +/* CAC6B4 802404C4 0220202D */ daddu $a0, $s1, $zero +/* CAC6B8 802404C8 0C0B210B */ jal get_float_variable +/* CAC6BC 802404CC 46000686 */ mov.s $f26, $f0 +/* CAC6C0 802404D0 0220202D */ daddu $a0, $s1, $zero +/* CAC6C4 802404D4 8E050000 */ lw $a1, ($s0) +/* CAC6C8 802404D8 0C0B210B */ jal get_float_variable +/* CAC6CC 802404DC 46000586 */ mov.s $f22, $f0 +/* CAC6D0 802404E0 0240202D */ daddu $a0, $s2, $zero +/* CAC6D4 802404E4 0C046B4C */ jal get_model_from_list_index +/* CAC6D8 802404E8 46000606 */ mov.s $f24, $f0 +/* CAC6DC 802404EC 0040882D */ daddu $s1, $v0, $zero +/* CAC6E0 802404F0 96220000 */ lhu $v0, ($s1) +/* CAC6E4 802404F4 30420400 */ andi $v0, $v0, 0x400 +/* CAC6E8 802404F8 1440001E */ bnez $v0, .L80240574 +/* CAC6EC 802404FC 26300058 */ addiu $s0, $s1, 0x58 +/* CAC6F0 80240500 4480A000 */ mtc1 $zero, $f20 +/* CAC6F4 80240504 4406B000 */ mfc1 $a2, $f22 +/* CAC6F8 80240508 4405A000 */ mfc1 $a1, $f20 +/* CAC6FC 8024050C 4407A000 */ mfc1 $a3, $f20 +/* CAC700 80240510 0C019E40 */ jal guTranslateF +/* CAC704 80240514 0200202D */ daddu $a0, $s0, $zero +/* CAC708 80240518 4405E000 */ mfc1 $a1, $f28 +/* CAC70C 8024051C 4406D000 */ mfc1 $a2, $f26 +/* CAC710 80240520 4407C000 */ mfc1 $a3, $f24 +/* CAC714 80240524 0C0900F8 */ jal func_802403E0_CAC5D0 +/* CAC718 80240528 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC71C 8024052C 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC720 80240530 0200282D */ daddu $a1, $s0, $zero +/* CAC724 80240534 0C019D80 */ jal guMtxCatF +/* CAC728 80240538 0200302D */ daddu $a2, $s0, $zero +/* CAC72C 8024053C 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC730 80240540 4600B587 */ neg.s $f22, $f22 +/* CAC734 80240544 4405A000 */ mfc1 $a1, $f20 +/* CAC738 80240548 4406B000 */ mfc1 $a2, $f22 +/* CAC73C 8024054C 0C019E40 */ jal guTranslateF +/* CAC740 80240550 00A0382D */ daddu $a3, $a1, $zero +/* CAC744 80240554 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC748 80240558 0200282D */ daddu $a1, $s0, $zero +/* CAC74C 8024055C 0C019D80 */ jal guMtxCatF +/* CAC750 80240560 00A0302D */ daddu $a2, $a1, $zero +/* CAC754 80240564 96220000 */ lhu $v0, ($s1) +/* CAC758 80240568 34421400 */ ori $v0, $v0, 0x1400 +/* CAC75C 8024056C 0809017B */ j .L802405EC +/* CAC760 80240570 A6220000 */ sh $v0, ($s1) +.L80240574: +/* CAC764 80240574 4480A000 */ mtc1 $zero, $f20 +/* CAC768 80240578 4406B000 */ mfc1 $a2, $f22 +/* CAC76C 8024057C 4405A000 */ mfc1 $a1, $f20 +/* CAC770 80240580 4407A000 */ mfc1 $a3, $f20 +/* CAC774 80240584 0C019E40 */ jal guTranslateF +/* CAC778 80240588 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC77C 8024058C 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC780 80240590 26300058 */ addiu $s0, $s1, 0x58 +/* CAC784 80240594 0200282D */ daddu $a1, $s0, $zero +/* CAC788 80240598 0C019D80 */ jal guMtxCatF +/* CAC78C 8024059C 0200302D */ daddu $a2, $s0, $zero +/* CAC790 802405A0 4405E000 */ mfc1 $a1, $f28 +/* CAC794 802405A4 4406D000 */ mfc1 $a2, $f26 +/* CAC798 802405A8 4407C000 */ mfc1 $a3, $f24 +/* CAC79C 802405AC 0C0900F8 */ jal func_802403E0_CAC5D0 +/* CAC7A0 802405B0 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC7A4 802405B4 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC7A8 802405B8 0200282D */ daddu $a1, $s0, $zero +/* CAC7AC 802405BC 0C019D80 */ jal guMtxCatF +/* CAC7B0 802405C0 0200302D */ daddu $a2, $s0, $zero +/* CAC7B4 802405C4 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC7B8 802405C8 4600B587 */ neg.s $f22, $f22 +/* CAC7BC 802405CC 4405A000 */ mfc1 $a1, $f20 +/* CAC7C0 802405D0 4406B000 */ mfc1 $a2, $f22 +/* CAC7C4 802405D4 0C019E40 */ jal guTranslateF +/* CAC7C8 802405D8 00A0382D */ daddu $a3, $a1, $zero +/* CAC7CC 802405DC 27A40010 */ addiu $a0, $sp, 0x10 +/* CAC7D0 802405E0 0200282D */ daddu $a1, $s0, $zero +/* CAC7D4 802405E4 0C019D80 */ jal guMtxCatF +/* CAC7D8 802405E8 00A0302D */ daddu $a2, $a1, $zero +.L802405EC: +/* CAC7DC 802405EC 8FBF005C */ lw $ra, 0x5c($sp) +/* CAC7E0 802405F0 8FB20058 */ lw $s2, 0x58($sp) +/* CAC7E4 802405F4 8FB10054 */ lw $s1, 0x54($sp) +/* CAC7E8 802405F8 8FB00050 */ lw $s0, 0x50($sp) +/* CAC7EC 802405FC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* CAC7F0 80240600 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* CAC7F4 80240604 D7B80070 */ ldc1 $f24, 0x70($sp) +/* CAC7F8 80240608 D7B60068 */ ldc1 $f22, 0x68($sp) +/* CAC7FC 8024060C D7B40060 */ ldc1 $f20, 0x60($sp) +/* CAC800 80240610 24020002 */ addiu $v0, $zero, 2 +/* CAC804 80240614 03E00008 */ jr $ra +/* CAC808 80240618 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s index e9cd068a89..d258a5b4c0 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s @@ -27,7 +27,7 @@ glabel func_80240120_CAEE60 /* CAEEB4 80240174 50400008 */ beql $v0, $zero, .L80240198 /* CAEEB8 80240178 26100001 */ addiu $s0, $s0, 1 /* CAEEBC 8024017C 0200202D */ daddu $a0, $s0, $zero -/* CAEEC0 80240180 0C090035 */ jal func_802400D4 +/* CAEEC0 80240180 0C090035 */ jal func_802400D4_CAEE14 /* CAEEC4 80240184 00122C03 */ sra $a1, $s2, 0x10 /* CAEEC8 80240188 10540003 */ beq $v0, $s4, .L80240198 /* CAEECC 8024018C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s index b66625b4cb..33bf54de18 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_802401CC_CAEF0C.s @@ -49,7 +49,7 @@ glabel func_802401CC_CAEF0C /* CAEFB8 80240278 AE300108 */ sw $s0, 0x108($s1) /* CAEFBC 8024027C 8C420000 */ lw $v0, ($v0) /* CAEFC0 80240280 02E0282D */ daddu $a1, $s7, $zero -/* CAEFC4 80240284 0C090035 */ jal func_802400D4 +/* CAEFC4 80240284 0C090035 */ jal func_802400D4_CAEE14 /* CAEFC8 80240288 AE220084 */ sw $v0, 0x84($s1) /* CAEFCC 8024028C 0040202D */ daddu $a0, $v0, $zero /* CAEFD0 80240290 04800011 */ bltz $a0, .L802402D8 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s index 4623b9a4f6..33328bd759 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_8024150C_CB024C.s @@ -122,17 +122,17 @@ glabel func_8024150C_CB024C /* CB0410 802416D0 00000000 */ nop /* CB0414 802416D4 0280202D */ daddu $a0, $s4, $zero /* CB0418 802416D8 0240282D */ daddu $a1, $s2, $zero -/* CB041C 802416DC 0C090360 */ jal func_80240D80 +/* CB041C 802416DC 0C090360 */ jal func_80240D80_CAFAC0 /* CB0420 802416E0 0260302D */ daddu $a2, $s3, $zero /* CB0424 802416E4 0280202D */ daddu $a0, $s4, $zero /* CB0428 802416E8 0240282D */ daddu $a1, $s2, $zero -/* CB042C 802416EC 0C0904D9 */ jal func_80241364 +/* CB042C 802416EC 0C0904D9 */ jal func_80241364_CB00A4 /* CB0430 802416F0 0260302D */ daddu $a2, $s3, $zero /* CB0434 802416F4 080905C7 */ j .L8024171C /* CB0438 802416F8 00000000 */ nop /* CB043C 802416FC 0280202D */ daddu $a0, $s4, $zero /* CB0440 80241700 0240282D */ daddu $a1, $s2, $zero -/* CB0444 80241704 0C090532 */ jal func_802414C8 +/* CB0444 80241704 0C090532 */ jal func_802414C8_CB0208 /* CB0448 80241708 0260302D */ daddu $a2, $s3, $zero /* CB044C 8024170C 080905C7 */ j .L8024171C /* CB0450 80241710 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC.s deleted file mode 100644 index c41aa1b0cb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419FC -/* CB073C 802419FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB0740 80241A00 AFBF0010 */ sw $ra, 0x10($sp) -/* CB0744 80241A04 8C82000C */ lw $v0, 0xc($a0) -/* CB0748 80241A08 0C0B1EAF */ jal get_variable -/* CB074C 80241A0C 8C450000 */ lw $a1, ($v0) -/* CB0750 80241A10 0040182D */ daddu $v1, $v0, $zero -/* CB0754 80241A14 10600012 */ beqz $v1, .L80241A60 -/* CB0758 80241A18 0000202D */ daddu $a0, $zero, $zero -/* CB075C 80241A1C 8C620000 */ lw $v0, ($v1) -/* CB0760 80241A20 5040000A */ beql $v0, $zero, .L80241A4C -/* CB0764 80241A24 00041080 */ sll $v0, $a0, 2 -/* CB0768 80241A28 3C058024 */ lui $a1, 0x8024 -/* CB076C 80241A2C 24A562C0 */ addiu $a1, $a1, 0x62c0 -.L80241A30: -/* CB0770 80241A30 24630004 */ addiu $v1, $v1, 4 -/* CB0774 80241A34 24840001 */ addiu $a0, $a0, 1 -/* CB0778 80241A38 ACA20000 */ sw $v0, ($a1) -/* CB077C 80241A3C 8C620000 */ lw $v0, ($v1) -/* CB0780 80241A40 1440FFFB */ bnez $v0, .L80241A30 -/* CB0784 80241A44 24A50004 */ addiu $a1, $a1, 4 -/* CB0788 80241A48 00041080 */ sll $v0, $a0, 2 -.L80241A4C: -/* CB078C 80241A4C 3C018024 */ lui $at, 0x8024 -/* CB0790 80241A50 00220821 */ addu $at, $at, $v0 -/* CB0794 80241A54 AC2062C0 */ sw $zero, 0x62c0($at) -/* CB0798 80241A58 080906A2 */ j .L80241A88 -/* CB079C 80241A5C 00000000 */ nop -.L80241A60: -/* CB07A0 80241A60 3C038024 */ lui $v1, 0x8024 -/* CB07A4 80241A64 246362C0 */ addiu $v1, $v1, 0x62c0 -/* CB07A8 80241A68 0060282D */ daddu $a1, $v1, $zero -.L80241A6C: -/* CB07AC 80241A6C 24820080 */ addiu $v0, $a0, 0x80 -/* CB07B0 80241A70 AC620000 */ sw $v0, ($v1) -/* CB07B4 80241A74 24630004 */ addiu $v1, $v1, 4 -/* CB07B8 80241A78 24840001 */ addiu $a0, $a0, 1 -/* CB07BC 80241A7C 2882005B */ slti $v0, $a0, 0x5b -/* CB07C0 80241A80 1440FFFA */ bnez $v0, .L80241A6C -/* CB07C4 80241A84 ACA0016C */ sw $zero, 0x16c($a1) -.L80241A88: -/* CB07C8 80241A88 8FBF0010 */ lw $ra, 0x10($sp) -/* CB07CC 80241A8C 24020002 */ addiu $v0, $zero, 2 -/* CB07D0 80241A90 03E00008 */ jr $ra -/* CB07D4 80241A94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s new file mode 100644 index 0000000000..e4154284e0 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_802419FC_CB073C.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419FC_CB073C +/* CB073C 802419FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CB0740 80241A00 AFBF0010 */ sw $ra, 0x10($sp) +/* CB0744 80241A04 8C82000C */ lw $v0, 0xc($a0) +/* CB0748 80241A08 0C0B1EAF */ jal get_variable +/* CB074C 80241A0C 8C450000 */ lw $a1, ($v0) +/* CB0750 80241A10 0040182D */ daddu $v1, $v0, $zero +/* CB0754 80241A14 10600012 */ beqz $v1, .L80241A60 +/* CB0758 80241A18 0000202D */ daddu $a0, $zero, $zero +/* CB075C 80241A1C 8C620000 */ lw $v0, ($v1) +/* CB0760 80241A20 5040000A */ beql $v0, $zero, .L80241A4C +/* CB0764 80241A24 00041080 */ sll $v0, $a0, 2 +/* CB0768 80241A28 3C058024 */ lui $a1, 0x8024 +/* CB076C 80241A2C 24A562C0 */ addiu $a1, $a1, 0x62c0 +.L80241A30: +/* CB0770 80241A30 24630004 */ addiu $v1, $v1, 4 +/* CB0774 80241A34 24840001 */ addiu $a0, $a0, 1 +/* CB0778 80241A38 ACA20000 */ sw $v0, ($a1) +/* CB077C 80241A3C 8C620000 */ lw $v0, ($v1) +/* CB0780 80241A40 1440FFFB */ bnez $v0, .L80241A30 +/* CB0784 80241A44 24A50004 */ addiu $a1, $a1, 4 +/* CB0788 80241A48 00041080 */ sll $v0, $a0, 2 +.L80241A4C: +/* CB078C 80241A4C 3C018024 */ lui $at, 0x8024 +/* CB0790 80241A50 00220821 */ addu $at, $at, $v0 +/* CB0794 80241A54 AC2062C0 */ sw $zero, 0x62c0($at) +/* CB0798 80241A58 080906A2 */ j .L80241A88 +/* CB079C 80241A5C 00000000 */ nop +.L80241A60: +/* CB07A0 80241A60 3C038024 */ lui $v1, 0x8024 +/* CB07A4 80241A64 246362C0 */ addiu $v1, $v1, 0x62c0 +/* CB07A8 80241A68 0060282D */ daddu $a1, $v1, $zero +.L80241A6C: +/* CB07AC 80241A6C 24820080 */ addiu $v0, $a0, 0x80 +/* CB07B0 80241A70 AC620000 */ sw $v0, ($v1) +/* CB07B4 80241A74 24630004 */ addiu $v1, $v1, 4 +/* CB07B8 80241A78 24840001 */ addiu $a0, $a0, 1 +/* CB07BC 80241A7C 2882005B */ slti $v0, $a0, 0x5b +/* CB07C0 80241A80 1440FFFA */ bnez $v0, .L80241A6C +/* CB07C4 80241A84 ACA0016C */ sw $zero, 0x16c($a1) +.L80241A88: +/* CB07C8 80241A88 8FBF0010 */ lw $ra, 0x10($sp) +/* CB07CC 80241A8C 24020002 */ addiu $v0, $zero, 2 +/* CB07D0 80241A90 03E00008 */ jr $ra +/* CB07D4 80241A94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98.s deleted file mode 100644 index 8d6b237be4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A98 -/* CB07D8 80241A98 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CB07DC 80241A9C AFB10014 */ sw $s1, 0x14($sp) -/* CB07E0 80241AA0 0080882D */ daddu $s1, $a0, $zero -/* CB07E4 80241AA4 AFBF0020 */ sw $ra, 0x20($sp) -/* CB07E8 80241AA8 AFB3001C */ sw $s3, 0x1c($sp) -/* CB07EC 80241AAC AFB20018 */ sw $s2, 0x18($sp) -/* CB07F0 80241AB0 AFB00010 */ sw $s0, 0x10($sp) -/* CB07F4 80241AB4 8E30000C */ lw $s0, 0xc($s1) -/* CB07F8 80241AB8 8E050000 */ lw $a1, ($s0) -/* CB07FC 80241ABC 0C0B1EAF */ jal get_variable -/* CB0800 80241AC0 26100004 */ addiu $s0, $s0, 4 -/* CB0804 80241AC4 8E050000 */ lw $a1, ($s0) -/* CB0808 80241AC8 26100004 */ addiu $s0, $s0, 4 -/* CB080C 80241ACC 0220202D */ daddu $a0, $s1, $zero -/* CB0810 80241AD0 0C0B1EAF */ jal get_variable -/* CB0814 80241AD4 0040982D */ daddu $s3, $v0, $zero -/* CB0818 80241AD8 8E050000 */ lw $a1, ($s0) -/* CB081C 80241ADC 26100004 */ addiu $s0, $s0, 4 -/* CB0820 80241AE0 0220202D */ daddu $a0, $s1, $zero -/* CB0824 80241AE4 0C0B1EAF */ jal get_variable -/* CB0828 80241AE8 0040902D */ daddu $s2, $v0, $zero -/* CB082C 80241AEC 0220202D */ daddu $a0, $s1, $zero -/* CB0830 80241AF0 8E050000 */ lw $a1, ($s0) -/* CB0834 80241AF4 0C0B1EAF */ jal get_variable -/* CB0838 80241AF8 0040882D */ daddu $s1, $v0, $zero -/* CB083C 80241AFC 0260202D */ daddu $a0, $s3, $zero -/* CB0840 80241B00 0C04C3D6 */ jal get_item_entity -/* CB0844 80241B04 0040802D */ daddu $s0, $v0, $zero -/* CB0848 80241B08 0040182D */ daddu $v1, $v0, $zero -/* CB084C 80241B0C 44920000 */ mtc1 $s2, $f0 -/* CB0850 80241B10 00000000 */ nop -/* CB0854 80241B14 46800020 */ cvt.s.w $f0, $f0 -/* CB0858 80241B18 E4600008 */ swc1 $f0, 8($v1) -/* CB085C 80241B1C 44910000 */ mtc1 $s1, $f0 -/* CB0860 80241B20 00000000 */ nop -/* CB0864 80241B24 46800020 */ cvt.s.w $f0, $f0 -/* CB0868 80241B28 E460000C */ swc1 $f0, 0xc($v1) -/* CB086C 80241B2C 44900000 */ mtc1 $s0, $f0 -/* CB0870 80241B30 00000000 */ nop -/* CB0874 80241B34 46800020 */ cvt.s.w $f0, $f0 -/* CB0878 80241B38 E4600010 */ swc1 $f0, 0x10($v1) -/* CB087C 80241B3C 8FBF0020 */ lw $ra, 0x20($sp) -/* CB0880 80241B40 8FB3001C */ lw $s3, 0x1c($sp) -/* CB0884 80241B44 8FB20018 */ lw $s2, 0x18($sp) -/* CB0888 80241B48 8FB10014 */ lw $s1, 0x14($sp) -/* CB088C 80241B4C 8FB00010 */ lw $s0, 0x10($sp) -/* CB0890 80241B50 24020002 */ addiu $v0, $zero, 2 -/* CB0894 80241B54 03E00008 */ jr $ra -/* CB0898 80241B58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s new file mode 100644 index 0000000000..0b0ce63e54 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241A98_CB07D8.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A98_CB07D8 +/* CB07D8 80241A98 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* CB07DC 80241A9C AFB10014 */ sw $s1, 0x14($sp) +/* CB07E0 80241AA0 0080882D */ daddu $s1, $a0, $zero +/* CB07E4 80241AA4 AFBF0020 */ sw $ra, 0x20($sp) +/* CB07E8 80241AA8 AFB3001C */ sw $s3, 0x1c($sp) +/* CB07EC 80241AAC AFB20018 */ sw $s2, 0x18($sp) +/* CB07F0 80241AB0 AFB00010 */ sw $s0, 0x10($sp) +/* CB07F4 80241AB4 8E30000C */ lw $s0, 0xc($s1) +/* CB07F8 80241AB8 8E050000 */ lw $a1, ($s0) +/* CB07FC 80241ABC 0C0B1EAF */ jal get_variable +/* CB0800 80241AC0 26100004 */ addiu $s0, $s0, 4 +/* CB0804 80241AC4 8E050000 */ lw $a1, ($s0) +/* CB0808 80241AC8 26100004 */ addiu $s0, $s0, 4 +/* CB080C 80241ACC 0220202D */ daddu $a0, $s1, $zero +/* CB0810 80241AD0 0C0B1EAF */ jal get_variable +/* CB0814 80241AD4 0040982D */ daddu $s3, $v0, $zero +/* CB0818 80241AD8 8E050000 */ lw $a1, ($s0) +/* CB081C 80241ADC 26100004 */ addiu $s0, $s0, 4 +/* CB0820 80241AE0 0220202D */ daddu $a0, $s1, $zero +/* CB0824 80241AE4 0C0B1EAF */ jal get_variable +/* CB0828 80241AE8 0040902D */ daddu $s2, $v0, $zero +/* CB082C 80241AEC 0220202D */ daddu $a0, $s1, $zero +/* CB0830 80241AF0 8E050000 */ lw $a1, ($s0) +/* CB0834 80241AF4 0C0B1EAF */ jal get_variable +/* CB0838 80241AF8 0040882D */ daddu $s1, $v0, $zero +/* CB083C 80241AFC 0260202D */ daddu $a0, $s3, $zero +/* CB0840 80241B00 0C04C3D6 */ jal get_item_entity +/* CB0844 80241B04 0040802D */ daddu $s0, $v0, $zero +/* CB0848 80241B08 0040182D */ daddu $v1, $v0, $zero +/* CB084C 80241B0C 44920000 */ mtc1 $s2, $f0 +/* CB0850 80241B10 00000000 */ nop +/* CB0854 80241B14 46800020 */ cvt.s.w $f0, $f0 +/* CB0858 80241B18 E4600008 */ swc1 $f0, 8($v1) +/* CB085C 80241B1C 44910000 */ mtc1 $s1, $f0 +/* CB0860 80241B20 00000000 */ nop +/* CB0864 80241B24 46800020 */ cvt.s.w $f0, $f0 +/* CB0868 80241B28 E460000C */ swc1 $f0, 0xc($v1) +/* CB086C 80241B2C 44900000 */ mtc1 $s0, $f0 +/* CB0870 80241B30 00000000 */ nop +/* CB0874 80241B34 46800020 */ cvt.s.w $f0, $f0 +/* CB0878 80241B38 E4600010 */ swc1 $f0, 0x10($v1) +/* CB087C 80241B3C 8FBF0020 */ lw $ra, 0x20($sp) +/* CB0880 80241B40 8FB3001C */ lw $s3, 0x1c($sp) +/* CB0884 80241B44 8FB20018 */ lw $s2, 0x18($sp) +/* CB0888 80241B48 8FB10014 */ lw $s1, 0x14($sp) +/* CB088C 80241B4C 8FB00010 */ lw $s0, 0x10($sp) +/* CB0890 80241B50 24020002 */ addiu $v0, $zero, 2 +/* CB0894 80241B54 03E00008 */ jr $ra +/* CB0898 80241B58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C00.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C00.s deleted file mode 100644 index d90be2300a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C00.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C00 -/* CB0940 80241C00 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CB0944 80241C04 F7B40018 */ sdc1 $f20, 0x18($sp) -/* CB0948 80241C08 4485A000 */ mtc1 $a1, $f20 -/* CB094C 80241C0C F7B60020 */ sdc1 $f22, 0x20($sp) -/* CB0950 80241C10 4486B000 */ mtc1 $a2, $f22 -/* CB0954 80241C14 AFB00010 */ sw $s0, 0x10($sp) -/* CB0958 80241C18 F7B80028 */ sdc1 $f24, 0x28($sp) -/* CB095C 80241C1C 4487C000 */ mtc1 $a3, $f24 -/* CB0960 80241C20 AFBF0014 */ sw $ra, 0x14($sp) -/* CB0964 80241C24 0C019D28 */ jal guMtxIdentF -/* CB0968 80241C28 0080802D */ daddu $s0, $a0, $zero -/* CB096C 80241C2C 4616A582 */ mul.s $f22, $f20, $f22 -/* CB0970 80241C30 00000000 */ nop -/* CB0974 80241C34 4618A502 */ mul.s $f20, $f20, $f24 -/* CB0978 80241C38 00000000 */ nop -/* CB097C 80241C3C 3C013F80 */ lui $at, 0x3f80 -/* CB0980 80241C40 44810000 */ mtc1 $at, $f0 -/* CB0984 80241C44 00000000 */ nop -/* CB0988 80241C48 E6000014 */ swc1 $f0, 0x14($s0) -/* CB098C 80241C4C E6160010 */ swc1 $f22, 0x10($s0) -/* CB0990 80241C50 E6140018 */ swc1 $f20, 0x18($s0) -/* CB0994 80241C54 8FBF0014 */ lw $ra, 0x14($sp) -/* CB0998 80241C58 8FB00010 */ lw $s0, 0x10($sp) -/* CB099C 80241C5C D7B80028 */ ldc1 $f24, 0x28($sp) -/* CB09A0 80241C60 D7B60020 */ ldc1 $f22, 0x20($sp) -/* CB09A4 80241C64 D7B40018 */ ldc1 $f20, 0x18($sp) -/* CB09A8 80241C68 03E00008 */ jr $ra -/* CB09AC 80241C6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C00_CB0940.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C00_CB0940.s new file mode 100644 index 0000000000..81b45b54ff --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C00_CB0940.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C00_CB0940 +/* CB0940 80241C00 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* CB0944 80241C04 F7B40018 */ sdc1 $f20, 0x18($sp) +/* CB0948 80241C08 4485A000 */ mtc1 $a1, $f20 +/* CB094C 80241C0C F7B60020 */ sdc1 $f22, 0x20($sp) +/* CB0950 80241C10 4486B000 */ mtc1 $a2, $f22 +/* CB0954 80241C14 AFB00010 */ sw $s0, 0x10($sp) +/* CB0958 80241C18 F7B80028 */ sdc1 $f24, 0x28($sp) +/* CB095C 80241C1C 4487C000 */ mtc1 $a3, $f24 +/* CB0960 80241C20 AFBF0014 */ sw $ra, 0x14($sp) +/* CB0964 80241C24 0C019D28 */ jal guMtxIdentF +/* CB0968 80241C28 0080802D */ daddu $s0, $a0, $zero +/* CB096C 80241C2C 4616A582 */ mul.s $f22, $f20, $f22 +/* CB0970 80241C30 00000000 */ nop +/* CB0974 80241C34 4618A502 */ mul.s $f20, $f20, $f24 +/* CB0978 80241C38 00000000 */ nop +/* CB097C 80241C3C 3C013F80 */ lui $at, 0x3f80 +/* CB0980 80241C40 44810000 */ mtc1 $at, $f0 +/* CB0984 80241C44 00000000 */ nop +/* CB0988 80241C48 E6000014 */ swc1 $f0, 0x14($s0) +/* CB098C 80241C4C E6160010 */ swc1 $f22, 0x10($s0) +/* CB0990 80241C50 E6140018 */ swc1 $f20, 0x18($s0) +/* CB0994 80241C54 8FBF0014 */ lw $ra, 0x14($sp) +/* CB0998 80241C58 8FB00010 */ lw $s0, 0x10($sp) +/* CB099C 80241C5C D7B80028 */ ldc1 $f24, 0x28($sp) +/* CB09A0 80241C60 D7B60020 */ ldc1 $f22, 0x20($sp) +/* CB09A4 80241C64 D7B40018 */ ldc1 $f20, 0x18($sp) +/* CB09A8 80241C68 03E00008 */ jr $ra +/* CB09AC 80241C6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C70_CB09B0.s b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C70_CB09B0.s index 71204abb20..ae14eb47c0 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C70_CB09B0.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAFAC0/func_80241C70_CB09B0.s @@ -55,7 +55,7 @@ glabel func_80241C70_CB09B0 /* CB0A78 80241D38 4405E000 */ mfc1 $a1, $f28 /* CB0A7C 80241D3C 4406D000 */ mfc1 $a2, $f26 /* CB0A80 80241D40 4407C000 */ mfc1 $a3, $f24 -/* CB0A84 80241D44 0C090700 */ jal func_80241C00 +/* CB0A84 80241D44 0C090700 */ jal func_80241C00_CB0940 /* CB0A88 80241D48 27A40010 */ addiu $a0, $sp, 0x10 /* CB0A8C 80241D4C 27A40010 */ addiu $a0, $sp, 0x10 /* CB0A90 80241D50 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80241C70_CB09B0 /* CB0B00 80241DC0 4405E000 */ mfc1 $a1, $f28 /* CB0B04 80241DC4 4406D000 */ mfc1 $a2, $f26 /* CB0B08 80241DC8 4407C000 */ mfc1 $a3, $f24 -/* CB0B0C 80241DCC 0C090700 */ jal func_80241C00 +/* CB0B0C 80241DCC 0C090700 */ jal func_80241C00_CB0940 /* CB0B10 80241DD0 27A40010 */ addiu $a0, $sp, 0x10 /* CB0B14 80241DD4 27A40010 */ addiu $a0, $sp, 0x10 /* CB0B18 80241DD8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB50E0/func_80240150_CB5150.s b/asm/nonmatchings/world/area_flo/flo_09/CB50E0/func_80240150_CB5150.s index 5e4230f10a..0a56f1aefa 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB50E0/func_80240150_CB5150.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB50E0/func_80240150_CB5150.s @@ -55,7 +55,7 @@ glabel func_80240150_CB5150 /* CB5218 80240218 4405E000 */ mfc1 $a1, $f28 /* CB521C 8024021C 4406D000 */ mfc1 $a2, $f26 /* CB5220 80240220 4407C000 */ mfc1 $a3, $f24 -/* CB5224 80240224 0C090038 */ jal func_802400E0 +/* CB5224 80240224 0C090038 */ jal func_802400E0_CB50E0 /* CB5228 80240228 27A40010 */ addiu $a0, $sp, 0x10 /* CB522C 8024022C 27A40010 */ addiu $a0, $sp, 0x10 /* CB5230 80240230 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240150_CB5150 /* CB52A0 802402A0 4405E000 */ mfc1 $a1, $f28 /* CB52A4 802402A4 4406D000 */ mfc1 $a2, $f26 /* CB52A8 802402A8 4407C000 */ mfc1 $a3, $f24 -/* CB52AC 802402AC 0C090038 */ jal func_802400E0 +/* CB52AC 802402AC 0C090038 */ jal func_802400E0_CB50E0 /* CB52B0 802402B0 27A40010 */ addiu $a0, $sp, 0x10 /* CB52B4 802402B4 27A40010 */ addiu $a0, $sp, 0x10 /* CB52B8 802402B8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74.s deleted file mode 100644 index 449f962571..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F74 -/* CB5F74 80240F74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CB5F78 80240F78 AFB00010 */ sw $s0, 0x10($sp) -/* CB5F7C 80240F7C 0080802D */ daddu $s0, $a0, $zero -/* CB5F80 80240F80 AFBF0014 */ sw $ra, 0x14($sp) -/* CB5F84 80240F84 8E020148 */ lw $v0, 0x148($s0) -/* CB5F88 80240F88 0C00EABB */ jal get_npc_unsafe -/* CB5F8C 80240F8C 84440008 */ lh $a0, 8($v0) -/* CB5F90 80240F90 9443008E */ lhu $v1, 0x8e($v0) -/* CB5F94 80240F94 C440003C */ lwc1 $f0, 0x3c($v0) -/* CB5F98 80240F98 24640001 */ addiu $a0, $v1, 1 -/* CB5F9C 80240F9C 00031C00 */ sll $v1, $v1, 0x10 -/* CB5FA0 80240FA0 00031B83 */ sra $v1, $v1, 0xe -/* CB5FA4 80240FA4 A444008E */ sh $a0, 0x8e($v0) -/* CB5FA8 80240FA8 3C018024 */ lui $at, 0x8024 -/* CB5FAC 80240FAC 00230821 */ addu $at, $at, $v1 -/* CB5FB0 80240FB0 C422362C */ lwc1 $f2, 0x362c($at) -/* CB5FB4 80240FB4 8443008E */ lh $v1, 0x8e($v0) -/* CB5FB8 80240FB8 46020000 */ add.s $f0, $f0, $f2 -/* CB5FBC 80240FBC 28630005 */ slti $v1, $v1, 5 -/* CB5FC0 80240FC0 14600003 */ bnez $v1, .L80240FD0 -/* CB5FC4 80240FC4 E440003C */ swc1 $f0, 0x3c($v0) -/* CB5FC8 80240FC8 2402000C */ addiu $v0, $zero, 0xc -/* CB5FCC 80240FCC AE020070 */ sw $v0, 0x70($s0) -.L80240FD0: -/* CB5FD0 80240FD0 8FBF0014 */ lw $ra, 0x14($sp) -/* CB5FD4 80240FD4 8FB00010 */ lw $s0, 0x10($sp) -/* CB5FD8 80240FD8 03E00008 */ jr $ra -/* CB5FDC 80240FDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s new file mode 100644 index 0000000000..031db17cdb --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80240F74_CB5F74.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F74_CB5F74 +/* CB5F74 80240F74 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CB5F78 80240F78 AFB00010 */ sw $s0, 0x10($sp) +/* CB5F7C 80240F7C 0080802D */ daddu $s0, $a0, $zero +/* CB5F80 80240F80 AFBF0014 */ sw $ra, 0x14($sp) +/* CB5F84 80240F84 8E020148 */ lw $v0, 0x148($s0) +/* CB5F88 80240F88 0C00EABB */ jal get_npc_unsafe +/* CB5F8C 80240F8C 84440008 */ lh $a0, 8($v0) +/* CB5F90 80240F90 9443008E */ lhu $v1, 0x8e($v0) +/* CB5F94 80240F94 C440003C */ lwc1 $f0, 0x3c($v0) +/* CB5F98 80240F98 24640001 */ addiu $a0, $v1, 1 +/* CB5F9C 80240F9C 00031C00 */ sll $v1, $v1, 0x10 +/* CB5FA0 80240FA0 00031B83 */ sra $v1, $v1, 0xe +/* CB5FA4 80240FA4 A444008E */ sh $a0, 0x8e($v0) +/* CB5FA8 80240FA8 3C018024 */ lui $at, 0x8024 +/* CB5FAC 80240FAC 00230821 */ addu $at, $at, $v1 +/* CB5FB0 80240FB0 C422362C */ lwc1 $f2, 0x362c($at) +/* CB5FB4 80240FB4 8443008E */ lh $v1, 0x8e($v0) +/* CB5FB8 80240FB8 46020000 */ add.s $f0, $f0, $f2 +/* CB5FBC 80240FBC 28630005 */ slti $v1, $v1, 5 +/* CB5FC0 80240FC0 14600003 */ bnez $v1, .L80240FD0 +/* CB5FC4 80240FC4 E440003C */ swc1 $f0, 0x3c($v0) +/* CB5FC8 80240FC8 2402000C */ addiu $v0, $zero, 0xc +/* CB5FCC 80240FCC AE020070 */ sw $v0, 0x70($s0) +.L80240FD0: +/* CB5FD0 80240FD0 8FBF0014 */ lw $ra, 0x14($sp) +/* CB5FD4 80240FD4 8FB00010 */ lw $s0, 0x10($sp) +/* CB5FD8 80240FD8 03E00008 */ jr $ra +/* CB5FDC 80240FDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178.s deleted file mode 100644 index 85e98e5cdf..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241178 -/* CB6178 80241178 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CB617C 8024117C AFB20030 */ sw $s2, 0x30($sp) -/* CB6180 80241180 0080902D */ daddu $s2, $a0, $zero -/* CB6184 80241184 AFBF0038 */ sw $ra, 0x38($sp) -/* CB6188 80241188 AFB30034 */ sw $s3, 0x34($sp) -/* CB618C 8024118C AFB1002C */ sw $s1, 0x2c($sp) -/* CB6190 80241190 AFB00028 */ sw $s0, 0x28($sp) -/* CB6194 80241194 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CB6198 80241198 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CB619C 8024119C 8E510148 */ lw $s1, 0x148($s2) -/* CB61A0 802411A0 86240008 */ lh $a0, 8($s1) -/* CB61A4 802411A4 0C00EABB */ jal get_npc_unsafe -/* CB61A8 802411A8 00A0982D */ daddu $s3, $a1, $zero -/* CB61AC 802411AC 0040802D */ daddu $s0, $v0, $zero -/* CB61B0 802411B0 0200202D */ daddu $a0, $s0, $zero -/* CB61B4 802411B4 C6220088 */ lwc1 $f2, 0x88($s1) -/* CB61B8 802411B8 468010A0 */ cvt.s.w $f2, $f2 -/* CB61BC 802411BC 460010A1 */ cvt.d.s $f2, $f2 -/* CB61C0 802411C0 C604001C */ lwc1 $f4, 0x1c($s0) -/* CB61C4 802411C4 C6000014 */ lwc1 $f0, 0x14($s0) -/* CB61C8 802411C8 8E050018 */ lw $a1, 0x18($s0) -/* CB61CC 802411CC 46002100 */ add.s $f4, $f4, $f0 -/* CB61D0 802411D0 8E06000C */ lw $a2, 0xc($s0) -/* CB61D4 802411D4 C6200078 */ lwc1 $f0, 0x78($s1) -/* CB61D8 802411D8 46800020 */ cvt.s.w $f0, $f0 -/* CB61DC 802411DC E604001C */ swc1 $f4, 0x1c($s0) -/* CB61E0 802411E0 3C014059 */ lui $at, 0x4059 -/* CB61E4 802411E4 44812800 */ mtc1 $at, $f5 -/* CB61E8 802411E8 44802000 */ mtc1 $zero, $f4 -/* CB61EC 802411EC 46000021 */ cvt.d.s $f0, $f0 -/* CB61F0 802411F0 46240003 */ div.d $f0, $f0, $f4 -/* CB61F4 802411F4 46200520 */ cvt.s.d $f20, $f0 -/* CB61F8 802411F8 46241083 */ div.d $f2, $f2, $f4 -/* CB61FC 802411FC 0C00EA95 */ jal npc_move_heading -/* CB6200 80241200 462015A0 */ cvt.s.d $f22, $f2 -/* CB6204 80241204 C604001C */ lwc1 $f4, 0x1c($s0) -/* CB6208 80241208 44801000 */ mtc1 $zero, $f2 -/* CB620C 8024120C 44801800 */ mtc1 $zero, $f3 -/* CB6210 80241210 46002021 */ cvt.d.s $f0, $f4 -/* CB6214 80241214 4620103E */ c.le.d $f2, $f0 -/* CB6218 80241218 00000000 */ nop -/* CB621C 8024121C 45000030 */ bc1f .L802412E0 -/* CB6220 80241220 00000000 */ nop -/* CB6224 80241224 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB6228 80241228 46040000 */ add.s $f0, $f0, $f4 -/* CB622C 8024122C E600003C */ swc1 $f0, 0x3c($s0) -/* CB6230 80241230 8E2200CC */ lw $v0, 0xcc($s1) -/* CB6234 80241234 8C420024 */ lw $v0, 0x24($v0) -/* CB6238 80241238 AE020028 */ sw $v0, 0x28($s0) -/* CB623C 8024123C A2200007 */ sb $zero, 7($s1) -/* CB6240 80241240 8E020000 */ lw $v0, ($s0) -/* CB6244 80241244 30420008 */ andi $v0, $v0, 8 -/* CB6248 80241248 14400011 */ bnez $v0, .L80241290 -/* CB624C 8024124C 0000102D */ daddu $v0, $zero, $zero -/* CB6250 80241250 27A50018 */ addiu $a1, $sp, 0x18 -/* CB6254 80241254 27A6001C */ addiu $a2, $sp, 0x1c -/* CB6258 80241258 C6000038 */ lwc1 $f0, 0x38($s0) -/* CB625C 8024125C C602003C */ lwc1 $f2, 0x3c($s0) -/* CB6260 80241260 C6040040 */ lwc1 $f4, 0x40($s0) -/* CB6264 80241264 3C01447A */ lui $at, 0x447a -/* CB6268 80241268 44813000 */ mtc1 $at, $f6 -/* CB626C 8024126C 27A20024 */ addiu $v0, $sp, 0x24 -/* CB6270 80241270 E7A00018 */ swc1 $f0, 0x18($sp) -/* CB6274 80241274 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CB6278 80241278 E7A40020 */ swc1 $f4, 0x20($sp) -/* CB627C 8024127C E7A60024 */ swc1 $f6, 0x24($sp) -/* CB6280 80241280 AFA20010 */ sw $v0, 0x10($sp) -/* CB6284 80241284 8E040080 */ lw $a0, 0x80($s0) -/* CB6288 80241288 0C0372DF */ jal func_800DCB7C -/* CB628C 8024128C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241290: -/* CB6290 80241290 1040000B */ beqz $v0, .L802412C0 -/* CB6294 80241294 00000000 */ nop -/* CB6298 80241298 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CB629C 8024129C 46140080 */ add.s $f2, $f0, $f20 -/* CB62A0 802412A0 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB62A4 802412A4 4600103E */ c.le.s $f2, $f0 -/* CB62A8 802412A8 00000000 */ nop -/* CB62AC 802412AC 4500008D */ bc1f .L802414E4 -/* CB62B0 802412B0 00000000 */ nop -/* CB62B4 802412B4 E602003C */ swc1 $f2, 0x3c($s0) -/* CB62B8 802412B8 08090539 */ j .L802414E4 -/* CB62BC 802412BC AE400070 */ sw $zero, 0x70($s2) -.L802412C0: -/* CB62C0 802412C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB62C4 802412C4 C6000064 */ lwc1 $f0, 0x64($s0) -/* CB62C8 802412C8 4602003E */ c.le.s $f0, $f2 -/* CB62CC 802412CC 00000000 */ nop -/* CB62D0 802412D0 45030084 */ bc1tl .L802414E4 -/* CB62D4 802412D4 AE400070 */ sw $zero, 0x70($s2) -/* CB62D8 802412D8 08090539 */ j .L802414E4 -/* CB62DC 802412DC 00000000 */ nop -.L802412E0: -/* CB62E0 802412E0 4622003C */ c.lt.d $f0, $f2 -/* CB62E4 802412E4 00000000 */ nop -/* CB62E8 802412E8 4500007E */ bc1f .L802414E4 -/* CB62EC 802412EC 00000000 */ nop -/* CB62F0 802412F0 9602008E */ lhu $v0, 0x8e($s0) -/* CB62F4 802412F4 24420001 */ addiu $v0, $v0, 1 -/* CB62F8 802412F8 A602008E */ sh $v0, 0x8e($s0) -/* CB62FC 802412FC 00021400 */ sll $v0, $v0, 0x10 -/* CB6300 80241300 8E630020 */ lw $v1, 0x20($s3) -/* CB6304 80241304 00021403 */ sra $v0, $v0, 0x10 -/* CB6308 80241308 0043102A */ slt $v0, $v0, $v1 -/* CB630C 8024130C 14400026 */ bnez $v0, .L802413A8 -/* CB6310 80241310 00000000 */ nop -/* CB6314 80241314 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CB6318 80241318 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CB631C 8024131C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CB6320 80241320 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CB6324 80241324 A600008E */ sh $zero, 0x8e($s0) -/* CB6328 80241328 8C460028 */ lw $a2, 0x28($v0) -/* CB632C 8024132C 0C00A720 */ jal atan2 -/* CB6330 80241330 8C470030 */ lw $a3, 0x30($v0) -/* CB6334 80241334 46000506 */ mov.s $f20, $f0 -/* CB6338 80241338 C60C000C */ lwc1 $f12, 0xc($s0) -/* CB633C 8024133C 0C00A70A */ jal get_clamped_angle_diff -/* CB6340 80241340 4600A386 */ mov.s $f14, $f20 -/* CB6344 80241344 46000086 */ mov.s $f2, $f0 -/* CB6348 80241348 8E62001C */ lw $v0, 0x1c($s3) -/* CB634C 8024134C 46001005 */ abs.s $f0, $f2 -/* CB6350 80241350 44822000 */ mtc1 $v0, $f4 -/* CB6354 80241354 00000000 */ nop -/* CB6358 80241358 46802120 */ cvt.s.w $f4, $f4 -/* CB635C 8024135C 4600203C */ c.lt.s $f4, $f0 -/* CB6360 80241360 00000000 */ nop -/* CB6364 80241364 4500000D */ bc1f .L8024139C -/* CB6368 80241368 00000000 */ nop -/* CB636C 8024136C 44800000 */ mtc1 $zero, $f0 -/* CB6370 80241370 C614000C */ lwc1 $f20, 0xc($s0) -/* CB6374 80241374 4600103C */ c.lt.s $f2, $f0 -/* CB6378 80241378 00000000 */ nop -/* CB637C 8024137C 45000006 */ bc1f .L80241398 -/* CB6380 80241380 00021023 */ negu $v0, $v0 -/* CB6384 80241384 44820000 */ mtc1 $v0, $f0 -/* CB6388 80241388 00000000 */ nop -/* CB638C 8024138C 46800020 */ cvt.s.w $f0, $f0 -/* CB6390 80241390 080904E7 */ j .L8024139C -/* CB6394 80241394 4600A500 */ add.s $f20, $f20, $f0 -.L80241398: -/* CB6398 80241398 4604A500 */ add.s $f20, $f20, $f4 -.L8024139C: -/* CB639C 8024139C 0C00A6C9 */ jal clamp_angle -/* CB63A0 802413A0 4600A306 */ mov.s $f12, $f20 -/* CB63A4 802413A4 E600000C */ swc1 $f0, 0xc($s0) -.L802413A8: -/* CB63A8 802413A8 8E020000 */ lw $v0, ($s0) -/* CB63AC 802413AC 30420008 */ andi $v0, $v0, 8 -/* CB63B0 802413B0 1040000A */ beqz $v0, .L802413DC -/* CB63B4 802413B4 27A50018 */ addiu $a1, $sp, 0x18 -/* CB63B8 802413B8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CB63BC 802413BC C600001C */ lwc1 $f0, 0x1c($s0) -/* CB63C0 802413C0 46001080 */ add.s $f2, $f2, $f0 -/* CB63C4 802413C4 4616103C */ c.lt.s $f2, $f22 -/* CB63C8 802413C8 00000000 */ nop -/* CB63CC 802413CC 45020045 */ bc1fl .L802414E4 -/* CB63D0 802413D0 E602003C */ swc1 $f2, 0x3c($s0) -/* CB63D4 802413D4 08090538 */ j .L802414E0 -/* CB63D8 802413D8 E616003C */ swc1 $f22, 0x3c($s0) -.L802413DC: -/* CB63DC 802413DC C6000038 */ lwc1 $f0, 0x38($s0) -/* CB63E0 802413E0 27A6001C */ addiu $a2, $sp, 0x1c -/* CB63E4 802413E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CB63E8 802413E8 860200A8 */ lh $v0, 0xa8($s0) -/* CB63EC 802413EC C600001C */ lwc1 $f0, 0x1c($s0) -/* CB63F0 802413F0 C604003C */ lwc1 $f4, 0x3c($s0) -/* CB63F4 802413F4 44821000 */ mtc1 $v0, $f2 -/* CB63F8 802413F8 00000000 */ nop -/* CB63FC 802413FC 468010A0 */ cvt.s.w $f2, $f2 -/* CB6400 80241400 46000005 */ abs.s $f0, $f0 -/* CB6404 80241404 46020000 */ add.s $f0, $f0, $f2 -/* CB6408 80241408 C6060040 */ lwc1 $f6, 0x40($s0) -/* CB640C 8024140C 27A20024 */ addiu $v0, $sp, 0x24 -/* CB6410 80241410 46022100 */ add.s $f4, $f4, $f2 -/* CB6414 80241414 3C014024 */ lui $at, 0x4024 -/* CB6418 80241418 44811800 */ mtc1 $at, $f3 -/* CB641C 8024141C 44801000 */ mtc1 $zero, $f2 -/* CB6420 80241420 46000021 */ cvt.d.s $f0, $f0 -/* CB6424 80241424 46220000 */ add.d $f0, $f0, $f2 -/* CB6428 80241428 E7A60020 */ swc1 $f6, 0x20($sp) -/* CB642C 8024142C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CB6430 80241430 46200020 */ cvt.s.d $f0, $f0 -/* CB6434 80241434 E7A00024 */ swc1 $f0, 0x24($sp) -/* CB6438 80241438 AFA20010 */ sw $v0, 0x10($sp) -/* CB643C 8024143C 8E040080 */ lw $a0, 0x80($s0) -/* CB6440 80241440 0C0372DF */ jal func_800DCB7C -/* CB6444 80241444 27A70020 */ addiu $a3, $sp, 0x20 -/* CB6448 80241448 10400015 */ beqz $v0, .L802414A0 -/* CB644C 8024144C 00000000 */ nop -/* CB6450 80241450 860200A8 */ lh $v0, 0xa8($s0) -/* CB6454 80241454 C604001C */ lwc1 $f4, 0x1c($s0) -/* CB6458 80241458 44820000 */ mtc1 $v0, $f0 -/* CB645C 8024145C 00000000 */ nop -/* CB6460 80241460 46800020 */ cvt.s.w $f0, $f0 -/* CB6464 80241464 46002085 */ abs.s $f2, $f4 -/* CB6468 80241468 46020000 */ add.s $f0, $f0, $f2 -/* CB646C 8024146C C7A20024 */ lwc1 $f2, 0x24($sp) -/* CB6470 80241470 4600103E */ c.le.s $f2, $f0 -/* CB6474 80241474 00000000 */ nop -/* CB6478 80241478 45000005 */ bc1f .L80241490 -/* CB647C 8024147C 00000000 */ nop -/* CB6480 80241480 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CB6484 80241484 AE00001C */ sw $zero, 0x1c($s0) -/* CB6488 80241488 08090539 */ j .L802414E4 -/* CB648C 8024148C E600003C */ swc1 $f0, 0x3c($s0) -.L80241490: -/* CB6490 80241490 C600003C */ lwc1 $f0, 0x3c($s0) -/* CB6494 80241494 46040000 */ add.s $f0, $f0, $f4 -/* CB6498 80241498 08090539 */ j .L802414E4 -/* CB649C 8024149C E600003C */ swc1 $f0, 0x3c($s0) -.L802414A0: -/* CB64A0 802414A0 C606003C */ lwc1 $f6, 0x3c($s0) -/* CB64A4 802414A4 860200A8 */ lh $v0, 0xa8($s0) -/* CB64A8 802414A8 46163081 */ sub.s $f2, $f6, $f22 -/* CB64AC 802414AC 44820000 */ mtc1 $v0, $f0 -/* CB64B0 802414B0 00000000 */ nop -/* CB64B4 802414B4 46800020 */ cvt.s.w $f0, $f0 -/* CB64B8 802414B8 46001080 */ add.s $f2, $f2, $f0 -/* CB64BC 802414BC C604001C */ lwc1 $f4, 0x1c($s0) -/* CB64C0 802414C0 46002005 */ abs.s $f0, $f4 -/* CB64C4 802414C4 4602003C */ c.lt.s $f0, $f2 -/* CB64C8 802414C8 00000000 */ nop -/* CB64CC 802414CC 45020005 */ bc1fl .L802414E4 -/* CB64D0 802414D0 AE00001C */ sw $zero, 0x1c($s0) -/* CB64D4 802414D4 46043000 */ add.s $f0, $f6, $f4 -/* CB64D8 802414D8 08090539 */ j .L802414E4 -/* CB64DC 802414DC E600003C */ swc1 $f0, 0x3c($s0) -.L802414E0: -/* CB64E0 802414E0 AE00001C */ sw $zero, 0x1c($s0) -.L802414E4: -/* CB64E4 802414E4 8FBF0038 */ lw $ra, 0x38($sp) -/* CB64E8 802414E8 8FB30034 */ lw $s3, 0x34($sp) -/* CB64EC 802414EC 8FB20030 */ lw $s2, 0x30($sp) -/* CB64F0 802414F0 8FB1002C */ lw $s1, 0x2c($sp) -/* CB64F4 802414F4 8FB00028 */ lw $s0, 0x28($sp) -/* CB64F8 802414F8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CB64FC 802414FC D7B40040 */ ldc1 $f20, 0x40($sp) -/* CB6500 80241500 03E00008 */ jr $ra -/* CB6504 80241504 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s new file mode 100644 index 0000000000..118a915c47 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241178_CB6178.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241178_CB6178 +/* CB6178 80241178 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* CB617C 8024117C AFB20030 */ sw $s2, 0x30($sp) +/* CB6180 80241180 0080902D */ daddu $s2, $a0, $zero +/* CB6184 80241184 AFBF0038 */ sw $ra, 0x38($sp) +/* CB6188 80241188 AFB30034 */ sw $s3, 0x34($sp) +/* CB618C 8024118C AFB1002C */ sw $s1, 0x2c($sp) +/* CB6190 80241190 AFB00028 */ sw $s0, 0x28($sp) +/* CB6194 80241194 F7B60048 */ sdc1 $f22, 0x48($sp) +/* CB6198 80241198 F7B40040 */ sdc1 $f20, 0x40($sp) +/* CB619C 8024119C 8E510148 */ lw $s1, 0x148($s2) +/* CB61A0 802411A0 86240008 */ lh $a0, 8($s1) +/* CB61A4 802411A4 0C00EABB */ jal get_npc_unsafe +/* CB61A8 802411A8 00A0982D */ daddu $s3, $a1, $zero +/* CB61AC 802411AC 0040802D */ daddu $s0, $v0, $zero +/* CB61B0 802411B0 0200202D */ daddu $a0, $s0, $zero +/* CB61B4 802411B4 C6220088 */ lwc1 $f2, 0x88($s1) +/* CB61B8 802411B8 468010A0 */ cvt.s.w $f2, $f2 +/* CB61BC 802411BC 460010A1 */ cvt.d.s $f2, $f2 +/* CB61C0 802411C0 C604001C */ lwc1 $f4, 0x1c($s0) +/* CB61C4 802411C4 C6000014 */ lwc1 $f0, 0x14($s0) +/* CB61C8 802411C8 8E050018 */ lw $a1, 0x18($s0) +/* CB61CC 802411CC 46002100 */ add.s $f4, $f4, $f0 +/* CB61D0 802411D0 8E06000C */ lw $a2, 0xc($s0) +/* CB61D4 802411D4 C6200078 */ lwc1 $f0, 0x78($s1) +/* CB61D8 802411D8 46800020 */ cvt.s.w $f0, $f0 +/* CB61DC 802411DC E604001C */ swc1 $f4, 0x1c($s0) +/* CB61E0 802411E0 3C014059 */ lui $at, 0x4059 +/* CB61E4 802411E4 44812800 */ mtc1 $at, $f5 +/* CB61E8 802411E8 44802000 */ mtc1 $zero, $f4 +/* CB61EC 802411EC 46000021 */ cvt.d.s $f0, $f0 +/* CB61F0 802411F0 46240003 */ div.d $f0, $f0, $f4 +/* CB61F4 802411F4 46200520 */ cvt.s.d $f20, $f0 +/* CB61F8 802411F8 46241083 */ div.d $f2, $f2, $f4 +/* CB61FC 802411FC 0C00EA95 */ jal npc_move_heading +/* CB6200 80241200 462015A0 */ cvt.s.d $f22, $f2 +/* CB6204 80241204 C604001C */ lwc1 $f4, 0x1c($s0) +/* CB6208 80241208 44801000 */ mtc1 $zero, $f2 +/* CB620C 8024120C 44801800 */ mtc1 $zero, $f3 +/* CB6210 80241210 46002021 */ cvt.d.s $f0, $f4 +/* CB6214 80241214 4620103E */ c.le.d $f2, $f0 +/* CB6218 80241218 00000000 */ nop +/* CB621C 8024121C 45000030 */ bc1f .L802412E0 +/* CB6220 80241220 00000000 */ nop +/* CB6224 80241224 C600003C */ lwc1 $f0, 0x3c($s0) +/* CB6228 80241228 46040000 */ add.s $f0, $f0, $f4 +/* CB622C 8024122C E600003C */ swc1 $f0, 0x3c($s0) +/* CB6230 80241230 8E2200CC */ lw $v0, 0xcc($s1) +/* CB6234 80241234 8C420024 */ lw $v0, 0x24($v0) +/* CB6238 80241238 AE020028 */ sw $v0, 0x28($s0) +/* CB623C 8024123C A2200007 */ sb $zero, 7($s1) +/* CB6240 80241240 8E020000 */ lw $v0, ($s0) +/* CB6244 80241244 30420008 */ andi $v0, $v0, 8 +/* CB6248 80241248 14400011 */ bnez $v0, .L80241290 +/* CB624C 8024124C 0000102D */ daddu $v0, $zero, $zero +/* CB6250 80241250 27A50018 */ addiu $a1, $sp, 0x18 +/* CB6254 80241254 27A6001C */ addiu $a2, $sp, 0x1c +/* CB6258 80241258 C6000038 */ lwc1 $f0, 0x38($s0) +/* CB625C 8024125C C602003C */ lwc1 $f2, 0x3c($s0) +/* CB6260 80241260 C6040040 */ lwc1 $f4, 0x40($s0) +/* CB6264 80241264 3C01447A */ lui $at, 0x447a +/* CB6268 80241268 44813000 */ mtc1 $at, $f6 +/* CB626C 8024126C 27A20024 */ addiu $v0, $sp, 0x24 +/* CB6270 80241270 E7A00018 */ swc1 $f0, 0x18($sp) +/* CB6274 80241274 E7A2001C */ swc1 $f2, 0x1c($sp) +/* CB6278 80241278 E7A40020 */ swc1 $f4, 0x20($sp) +/* CB627C 8024127C E7A60024 */ swc1 $f6, 0x24($sp) +/* CB6280 80241280 AFA20010 */ sw $v0, 0x10($sp) +/* CB6284 80241284 8E040080 */ lw $a0, 0x80($s0) +/* CB6288 80241288 0C0372DF */ jal func_800DCB7C +/* CB628C 8024128C 27A70020 */ addiu $a3, $sp, 0x20 +.L80241290: +/* CB6290 80241290 1040000B */ beqz $v0, .L802412C0 +/* CB6294 80241294 00000000 */ nop +/* CB6298 80241298 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* CB629C 8024129C 46140080 */ add.s $f2, $f0, $f20 +/* CB62A0 802412A0 C600003C */ lwc1 $f0, 0x3c($s0) +/* CB62A4 802412A4 4600103E */ c.le.s $f2, $f0 +/* CB62A8 802412A8 00000000 */ nop +/* CB62AC 802412AC 4500008D */ bc1f .L802414E4 +/* CB62B0 802412B0 00000000 */ nop +/* CB62B4 802412B4 E602003C */ swc1 $f2, 0x3c($s0) +/* CB62B8 802412B8 08090539 */ j .L802414E4 +/* CB62BC 802412BC AE400070 */ sw $zero, 0x70($s2) +.L802412C0: +/* CB62C0 802412C0 C602003C */ lwc1 $f2, 0x3c($s0) +/* CB62C4 802412C4 C6000064 */ lwc1 $f0, 0x64($s0) +/* CB62C8 802412C8 4602003E */ c.le.s $f0, $f2 +/* CB62CC 802412CC 00000000 */ nop +/* CB62D0 802412D0 45030084 */ bc1tl .L802414E4 +/* CB62D4 802412D4 AE400070 */ sw $zero, 0x70($s2) +/* CB62D8 802412D8 08090539 */ j .L802414E4 +/* CB62DC 802412DC 00000000 */ nop +.L802412E0: +/* CB62E0 802412E0 4622003C */ c.lt.d $f0, $f2 +/* CB62E4 802412E4 00000000 */ nop +/* CB62E8 802412E8 4500007E */ bc1f .L802414E4 +/* CB62EC 802412EC 00000000 */ nop +/* CB62F0 802412F0 9602008E */ lhu $v0, 0x8e($s0) +/* CB62F4 802412F4 24420001 */ addiu $v0, $v0, 1 +/* CB62F8 802412F8 A602008E */ sh $v0, 0x8e($s0) +/* CB62FC 802412FC 00021400 */ sll $v0, $v0, 0x10 +/* CB6300 80241300 8E630020 */ lw $v1, 0x20($s3) +/* CB6304 80241304 00021403 */ sra $v0, $v0, 0x10 +/* CB6308 80241308 0043102A */ slt $v0, $v0, $v1 +/* CB630C 8024130C 14400026 */ bnez $v0, .L802413A8 +/* CB6310 80241310 00000000 */ nop +/* CB6314 80241314 C60C0038 */ lwc1 $f12, 0x38($s0) +/* CB6318 80241318 C60E0040 */ lwc1 $f14, 0x40($s0) +/* CB631C 8024131C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CB6320 80241320 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CB6324 80241324 A600008E */ sh $zero, 0x8e($s0) +/* CB6328 80241328 8C460028 */ lw $a2, 0x28($v0) +/* CB632C 8024132C 0C00A720 */ jal atan2 +/* CB6330 80241330 8C470030 */ lw $a3, 0x30($v0) +/* CB6334 80241334 46000506 */ mov.s $f20, $f0 +/* CB6338 80241338 C60C000C */ lwc1 $f12, 0xc($s0) +/* CB633C 8024133C 0C00A70A */ jal get_clamped_angle_diff +/* CB6340 80241340 4600A386 */ mov.s $f14, $f20 +/* CB6344 80241344 46000086 */ mov.s $f2, $f0 +/* CB6348 80241348 8E62001C */ lw $v0, 0x1c($s3) +/* CB634C 8024134C 46001005 */ abs.s $f0, $f2 +/* CB6350 80241350 44822000 */ mtc1 $v0, $f4 +/* CB6354 80241354 00000000 */ nop +/* CB6358 80241358 46802120 */ cvt.s.w $f4, $f4 +/* CB635C 8024135C 4600203C */ c.lt.s $f4, $f0 +/* CB6360 80241360 00000000 */ nop +/* CB6364 80241364 4500000D */ bc1f .L8024139C +/* CB6368 80241368 00000000 */ nop +/* CB636C 8024136C 44800000 */ mtc1 $zero, $f0 +/* CB6370 80241370 C614000C */ lwc1 $f20, 0xc($s0) +/* CB6374 80241374 4600103C */ c.lt.s $f2, $f0 +/* CB6378 80241378 00000000 */ nop +/* CB637C 8024137C 45000006 */ bc1f .L80241398 +/* CB6380 80241380 00021023 */ negu $v0, $v0 +/* CB6384 80241384 44820000 */ mtc1 $v0, $f0 +/* CB6388 80241388 00000000 */ nop +/* CB638C 8024138C 46800020 */ cvt.s.w $f0, $f0 +/* CB6390 80241390 080904E7 */ j .L8024139C +/* CB6394 80241394 4600A500 */ add.s $f20, $f20, $f0 +.L80241398: +/* CB6398 80241398 4604A500 */ add.s $f20, $f20, $f4 +.L8024139C: +/* CB639C 8024139C 0C00A6C9 */ jal clamp_angle +/* CB63A0 802413A0 4600A306 */ mov.s $f12, $f20 +/* CB63A4 802413A4 E600000C */ swc1 $f0, 0xc($s0) +.L802413A8: +/* CB63A8 802413A8 8E020000 */ lw $v0, ($s0) +/* CB63AC 802413AC 30420008 */ andi $v0, $v0, 8 +/* CB63B0 802413B0 1040000A */ beqz $v0, .L802413DC +/* CB63B4 802413B4 27A50018 */ addiu $a1, $sp, 0x18 +/* CB63B8 802413B8 C602003C */ lwc1 $f2, 0x3c($s0) +/* CB63BC 802413BC C600001C */ lwc1 $f0, 0x1c($s0) +/* CB63C0 802413C0 46001080 */ add.s $f2, $f2, $f0 +/* CB63C4 802413C4 4616103C */ c.lt.s $f2, $f22 +/* CB63C8 802413C8 00000000 */ nop +/* CB63CC 802413CC 45020045 */ bc1fl .L802414E4 +/* CB63D0 802413D0 E602003C */ swc1 $f2, 0x3c($s0) +/* CB63D4 802413D4 08090538 */ j .L802414E0 +/* CB63D8 802413D8 E616003C */ swc1 $f22, 0x3c($s0) +.L802413DC: +/* CB63DC 802413DC C6000038 */ lwc1 $f0, 0x38($s0) +/* CB63E0 802413E0 27A6001C */ addiu $a2, $sp, 0x1c +/* CB63E4 802413E4 E7A00018 */ swc1 $f0, 0x18($sp) +/* CB63E8 802413E8 860200A8 */ lh $v0, 0xa8($s0) +/* CB63EC 802413EC C600001C */ lwc1 $f0, 0x1c($s0) +/* CB63F0 802413F0 C604003C */ lwc1 $f4, 0x3c($s0) +/* CB63F4 802413F4 44821000 */ mtc1 $v0, $f2 +/* CB63F8 802413F8 00000000 */ nop +/* CB63FC 802413FC 468010A0 */ cvt.s.w $f2, $f2 +/* CB6400 80241400 46000005 */ abs.s $f0, $f0 +/* CB6404 80241404 46020000 */ add.s $f0, $f0, $f2 +/* CB6408 80241408 C6060040 */ lwc1 $f6, 0x40($s0) +/* CB640C 8024140C 27A20024 */ addiu $v0, $sp, 0x24 +/* CB6410 80241410 46022100 */ add.s $f4, $f4, $f2 +/* CB6414 80241414 3C014024 */ lui $at, 0x4024 +/* CB6418 80241418 44811800 */ mtc1 $at, $f3 +/* CB641C 8024141C 44801000 */ mtc1 $zero, $f2 +/* CB6420 80241420 46000021 */ cvt.d.s $f0, $f0 +/* CB6424 80241424 46220000 */ add.d $f0, $f0, $f2 +/* CB6428 80241428 E7A60020 */ swc1 $f6, 0x20($sp) +/* CB642C 8024142C E7A4001C */ swc1 $f4, 0x1c($sp) +/* CB6430 80241430 46200020 */ cvt.s.d $f0, $f0 +/* CB6434 80241434 E7A00024 */ swc1 $f0, 0x24($sp) +/* CB6438 80241438 AFA20010 */ sw $v0, 0x10($sp) +/* CB643C 8024143C 8E040080 */ lw $a0, 0x80($s0) +/* CB6440 80241440 0C0372DF */ jal func_800DCB7C +/* CB6444 80241444 27A70020 */ addiu $a3, $sp, 0x20 +/* CB6448 80241448 10400015 */ beqz $v0, .L802414A0 +/* CB644C 8024144C 00000000 */ nop +/* CB6450 80241450 860200A8 */ lh $v0, 0xa8($s0) +/* CB6454 80241454 C604001C */ lwc1 $f4, 0x1c($s0) +/* CB6458 80241458 44820000 */ mtc1 $v0, $f0 +/* CB645C 8024145C 00000000 */ nop +/* CB6460 80241460 46800020 */ cvt.s.w $f0, $f0 +/* CB6464 80241464 46002085 */ abs.s $f2, $f4 +/* CB6468 80241468 46020000 */ add.s $f0, $f0, $f2 +/* CB646C 8024146C C7A20024 */ lwc1 $f2, 0x24($sp) +/* CB6470 80241470 4600103E */ c.le.s $f2, $f0 +/* CB6474 80241474 00000000 */ nop +/* CB6478 80241478 45000005 */ bc1f .L80241490 +/* CB647C 8024147C 00000000 */ nop +/* CB6480 80241480 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* CB6484 80241484 AE00001C */ sw $zero, 0x1c($s0) +/* CB6488 80241488 08090539 */ j .L802414E4 +/* CB648C 8024148C E600003C */ swc1 $f0, 0x3c($s0) +.L80241490: +/* CB6490 80241490 C600003C */ lwc1 $f0, 0x3c($s0) +/* CB6494 80241494 46040000 */ add.s $f0, $f0, $f4 +/* CB6498 80241498 08090539 */ j .L802414E4 +/* CB649C 8024149C E600003C */ swc1 $f0, 0x3c($s0) +.L802414A0: +/* CB64A0 802414A0 C606003C */ lwc1 $f6, 0x3c($s0) +/* CB64A4 802414A4 860200A8 */ lh $v0, 0xa8($s0) +/* CB64A8 802414A8 46163081 */ sub.s $f2, $f6, $f22 +/* CB64AC 802414AC 44820000 */ mtc1 $v0, $f0 +/* CB64B0 802414B0 00000000 */ nop +/* CB64B4 802414B4 46800020 */ cvt.s.w $f0, $f0 +/* CB64B8 802414B8 46001080 */ add.s $f2, $f2, $f0 +/* CB64BC 802414BC C604001C */ lwc1 $f4, 0x1c($s0) +/* CB64C0 802414C0 46002005 */ abs.s $f0, $f4 +/* CB64C4 802414C4 4602003C */ c.lt.s $f0, $f2 +/* CB64C8 802414C8 00000000 */ nop +/* CB64CC 802414CC 45020005 */ bc1fl .L802414E4 +/* CB64D0 802414D0 AE00001C */ sw $zero, 0x1c($s0) +/* CB64D4 802414D4 46043000 */ add.s $f0, $f6, $f4 +/* CB64D8 802414D8 08090539 */ j .L802414E4 +/* CB64DC 802414DC E600003C */ swc1 $f0, 0x3c($s0) +.L802414E0: +/* CB64E0 802414E0 AE00001C */ sw $zero, 0x1c($s0) +.L802414E4: +/* CB64E4 802414E4 8FBF0038 */ lw $ra, 0x38($sp) +/* CB64E8 802414E8 8FB30034 */ lw $s3, 0x34($sp) +/* CB64EC 802414EC 8FB20030 */ lw $s2, 0x30($sp) +/* CB64F0 802414F0 8FB1002C */ lw $s1, 0x2c($sp) +/* CB64F4 802414F4 8FB00028 */ lw $s0, 0x28($sp) +/* CB64F8 802414F8 D7B60048 */ ldc1 $f22, 0x48($sp) +/* CB64FC 802414FC D7B40040 */ ldc1 $f20, 0x40($sp) +/* CB6500 80241500 03E00008 */ jr $ra +/* CB6504 80241504 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508.s deleted file mode 100644 index 824581b2a2..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241508 -/* CB6508 80241508 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CB650C 8024150C AFB00028 */ sw $s0, 0x28($sp) -/* CB6510 80241510 00A0802D */ daddu $s0, $a1, $zero -/* CB6514 80241514 AFB1002C */ sw $s1, 0x2c($sp) -/* CB6518 80241518 00C0882D */ daddu $s1, $a2, $zero -/* CB651C 8024151C AFBF0034 */ sw $ra, 0x34($sp) -/* CB6520 80241520 AFB20030 */ sw $s2, 0x30($sp) -/* CB6524 80241524 AE200070 */ sw $zero, 0x70($s1) -/* CB6528 80241528 8C830000 */ lw $v1, ($a0) -/* CB652C 8024152C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CB6530 80241530 A480008E */ sh $zero, 0x8e($a0) -/* CB6534 80241534 00621824 */ and $v1, $v1, $v0 -/* CB6538 80241538 34650800 */ ori $a1, $v1, 0x800 -/* CB653C 8024153C AC850000 */ sw $a1, ($a0) -/* CB6540 80241540 8E0200D0 */ lw $v0, 0xd0($s0) -/* CB6544 80241544 8C420034 */ lw $v0, 0x34($v0) -/* CB6548 80241548 10400003 */ beqz $v0, .L80241558 -/* CB654C 8024154C 00E0902D */ daddu $s2, $a3, $zero -/* CB6550 80241550 08090558 */ j .L80241560 -/* CB6554 80241554 34620808 */ ori $v0, $v1, 0x808 -.L80241558: -/* CB6558 80241558 2402FFF7 */ addiu $v0, $zero, -9 -/* CB655C 8024155C 00A21024 */ and $v0, $a1, $v0 -.L80241560: -/* CB6560 80241560 AC820000 */ sw $v0, ($a0) -/* CB6564 80241564 27A20024 */ addiu $v0, $sp, 0x24 -/* CB6568 80241568 27A50018 */ addiu $a1, $sp, 0x18 -/* CB656C 8024156C C4800038 */ lwc1 $f0, 0x38($a0) -/* CB6570 80241570 C482003C */ lwc1 $f2, 0x3c($a0) -/* CB6574 80241574 C4840040 */ lwc1 $f4, 0x40($a0) -/* CB6578 80241578 3C01447A */ lui $at, 0x447a -/* CB657C 8024157C 44813000 */ mtc1 $at, $f6 -/* CB6580 80241580 27A6001C */ addiu $a2, $sp, 0x1c -/* CB6584 80241584 E7A00018 */ swc1 $f0, 0x18($sp) -/* CB6588 80241588 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CB658C 8024158C E7A40020 */ swc1 $f4, 0x20($sp) -/* CB6590 80241590 E7A60024 */ swc1 $f6, 0x24($sp) -/* CB6594 80241594 AFA20010 */ sw $v0, 0x10($sp) -/* CB6598 80241598 8C840080 */ lw $a0, 0x80($a0) -/* CB659C 8024159C 0C0372DF */ jal func_800DCB7C -/* CB65A0 802415A0 27A70020 */ addiu $a3, $sp, 0x20 -/* CB65A4 802415A4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CB65A8 802415A8 3C014059 */ lui $at, 0x4059 -/* CB65AC 802415AC 44812800 */ mtc1 $at, $f5 -/* CB65B0 802415B0 44802000 */ mtc1 $zero, $f4 -/* CB65B4 802415B4 460010A1 */ cvt.d.s $f2, $f2 -/* CB65B8 802415B8 46241082 */ mul.d $f2, $f2, $f4 -/* CB65BC 802415BC 00000000 */ nop -/* CB65C0 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CB65C4 802415C4 46000021 */ cvt.d.s $f0, $f0 -/* CB65C8 802415C8 46240002 */ mul.d $f0, $f0, $f4 -/* CB65CC 802415CC 00000000 */ nop -/* CB65D0 802415D0 3C013FE0 */ lui $at, 0x3fe0 -/* CB65D4 802415D4 44812800 */ mtc1 $at, $f5 -/* CB65D8 802415D8 44802000 */ mtc1 $zero, $f4 -/* CB65DC 802415DC 00000000 */ nop -/* CB65E0 802415E0 46241080 */ add.d $f2, $f2, $f4 -/* CB65E4 802415E4 AE000074 */ sw $zero, 0x74($s0) -/* CB65E8 802415E8 46240000 */ add.d $f0, $f0, $f4 -/* CB65EC 802415EC AE000090 */ sw $zero, 0x90($s0) -/* CB65F0 802415F0 4620120D */ trunc.w.d $f8, $f2 -/* CB65F4 802415F4 E6080078 */ swc1 $f8, 0x78($s0) -/* CB65F8 802415F8 4620020D */ trunc.w.d $f8, $f0 -/* CB65FC 802415FC E6080088 */ swc1 $f8, 0x88($s0) -/* CB6600 80241600 8E420014 */ lw $v0, 0x14($s2) -/* CB6604 80241604 AE220074 */ sw $v0, 0x74($s1) -/* CB6608 80241608 8E0200B0 */ lw $v0, 0xb0($s0) -/* CB660C 8024160C 34420010 */ ori $v0, $v0, 0x10 -/* CB6610 80241610 AE0200B0 */ sw $v0, 0xb0($s0) -/* CB6614 80241614 8FBF0034 */ lw $ra, 0x34($sp) -/* CB6618 80241618 8FB20030 */ lw $s2, 0x30($sp) -/* CB661C 8024161C 8FB1002C */ lw $s1, 0x2c($sp) -/* CB6620 80241620 8FB00028 */ lw $s0, 0x28($sp) -/* CB6624 80241624 03E00008 */ jr $ra -/* CB6628 80241628 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s new file mode 100644 index 0000000000..a2c8690257 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_80241508_CB6508.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241508_CB6508 +/* CB6508 80241508 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* CB650C 8024150C AFB00028 */ sw $s0, 0x28($sp) +/* CB6510 80241510 00A0802D */ daddu $s0, $a1, $zero +/* CB6514 80241514 AFB1002C */ sw $s1, 0x2c($sp) +/* CB6518 80241518 00C0882D */ daddu $s1, $a2, $zero +/* CB651C 8024151C AFBF0034 */ sw $ra, 0x34($sp) +/* CB6520 80241520 AFB20030 */ sw $s2, 0x30($sp) +/* CB6524 80241524 AE200070 */ sw $zero, 0x70($s1) +/* CB6528 80241528 8C830000 */ lw $v1, ($a0) +/* CB652C 8024152C 2402FDFF */ addiu $v0, $zero, -0x201 +/* CB6530 80241530 A480008E */ sh $zero, 0x8e($a0) +/* CB6534 80241534 00621824 */ and $v1, $v1, $v0 +/* CB6538 80241538 34650800 */ ori $a1, $v1, 0x800 +/* CB653C 8024153C AC850000 */ sw $a1, ($a0) +/* CB6540 80241540 8E0200D0 */ lw $v0, 0xd0($s0) +/* CB6544 80241544 8C420034 */ lw $v0, 0x34($v0) +/* CB6548 80241548 10400003 */ beqz $v0, .L80241558 +/* CB654C 8024154C 00E0902D */ daddu $s2, $a3, $zero +/* CB6550 80241550 08090558 */ j .L80241560 +/* CB6554 80241554 34620808 */ ori $v0, $v1, 0x808 +.L80241558: +/* CB6558 80241558 2402FFF7 */ addiu $v0, $zero, -9 +/* CB655C 8024155C 00A21024 */ and $v0, $a1, $v0 +.L80241560: +/* CB6560 80241560 AC820000 */ sw $v0, ($a0) +/* CB6564 80241564 27A20024 */ addiu $v0, $sp, 0x24 +/* CB6568 80241568 27A50018 */ addiu $a1, $sp, 0x18 +/* CB656C 8024156C C4800038 */ lwc1 $f0, 0x38($a0) +/* CB6570 80241570 C482003C */ lwc1 $f2, 0x3c($a0) +/* CB6574 80241574 C4840040 */ lwc1 $f4, 0x40($a0) +/* CB6578 80241578 3C01447A */ lui $at, 0x447a +/* CB657C 8024157C 44813000 */ mtc1 $at, $f6 +/* CB6580 80241580 27A6001C */ addiu $a2, $sp, 0x1c +/* CB6584 80241584 E7A00018 */ swc1 $f0, 0x18($sp) +/* CB6588 80241588 E7A2001C */ swc1 $f2, 0x1c($sp) +/* CB658C 8024158C E7A40020 */ swc1 $f4, 0x20($sp) +/* CB6590 80241590 E7A60024 */ swc1 $f6, 0x24($sp) +/* CB6594 80241594 AFA20010 */ sw $v0, 0x10($sp) +/* CB6598 80241598 8C840080 */ lw $a0, 0x80($a0) +/* CB659C 8024159C 0C0372DF */ jal func_800DCB7C +/* CB65A0 802415A0 27A70020 */ addiu $a3, $sp, 0x20 +/* CB65A4 802415A4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* CB65A8 802415A8 3C014059 */ lui $at, 0x4059 +/* CB65AC 802415AC 44812800 */ mtc1 $at, $f5 +/* CB65B0 802415B0 44802000 */ mtc1 $zero, $f4 +/* CB65B4 802415B4 460010A1 */ cvt.d.s $f2, $f2 +/* CB65B8 802415B8 46241082 */ mul.d $f2, $f2, $f4 +/* CB65BC 802415BC 00000000 */ nop +/* CB65C0 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* CB65C4 802415C4 46000021 */ cvt.d.s $f0, $f0 +/* CB65C8 802415C8 46240002 */ mul.d $f0, $f0, $f4 +/* CB65CC 802415CC 00000000 */ nop +/* CB65D0 802415D0 3C013FE0 */ lui $at, 0x3fe0 +/* CB65D4 802415D4 44812800 */ mtc1 $at, $f5 +/* CB65D8 802415D8 44802000 */ mtc1 $zero, $f4 +/* CB65DC 802415DC 00000000 */ nop +/* CB65E0 802415E0 46241080 */ add.d $f2, $f2, $f4 +/* CB65E4 802415E4 AE000074 */ sw $zero, 0x74($s0) +/* CB65E8 802415E8 46240000 */ add.d $f0, $f0, $f4 +/* CB65EC 802415EC AE000090 */ sw $zero, 0x90($s0) +/* CB65F0 802415F0 4620120D */ trunc.w.d $f8, $f2 +/* CB65F4 802415F4 E6080078 */ swc1 $f8, 0x78($s0) +/* CB65F8 802415F8 4620020D */ trunc.w.d $f8, $f0 +/* CB65FC 802415FC E6080088 */ swc1 $f8, 0x88($s0) +/* CB6600 80241600 8E420014 */ lw $v0, 0x14($s2) +/* CB6604 80241604 AE220074 */ sw $v0, 0x74($s1) +/* CB6608 80241608 8E0200B0 */ lw $v0, 0xb0($s0) +/* CB660C 8024160C 34420010 */ ori $v0, $v0, 0x10 +/* CB6610 80241610 AE0200B0 */ sw $v0, 0xb0($s0) +/* CB6614 80241614 8FBF0034 */ lw $ra, 0x34($sp) +/* CB6618 80241618 8FB20030 */ lw $s2, 0x30($sp) +/* CB661C 8024161C 8FB1002C */ lw $s1, 0x2c($sp) +/* CB6620 80241620 8FB00028 */ lw $s0, 0x28($sp) +/* CB6624 80241624 03E00008 */ jr $ra +/* CB6628 80241628 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s index 40dfea12a9..4ca8eeb9e2 100644 --- a/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s +++ b/asm/nonmatchings/world/area_flo/flo_09/CB5320/func_8024162C_CB662C.s @@ -46,7 +46,7 @@ glabel func_8024162C_CB662C /* CB66D0 802416D0 02A0202D */ daddu $a0, $s5, $zero /* CB66D4 802416D4 0240282D */ daddu $a1, $s2, $zero /* CB66D8 802416D8 0280302D */ daddu $a2, $s4, $zero -/* CB66DC 802416DC 0C090542 */ jal func_80241508 +/* CB66DC 802416DC 0C090542 */ jal func_80241508_CB6508 /* CB66E0 802416E0 0200382D */ daddu $a3, $s0, $zero .L802416E4: /* CB66E4 802416E4 2402FFFE */ addiu $v0, $zero, -2 @@ -73,11 +73,11 @@ glabel func_8024162C_CB662C /* CB6734 80241734 00000000 */ nop /* CB6738 80241738 0280202D */ daddu $a0, $s4, $zero /* CB673C 8024173C 0200282D */ daddu $a1, $s0, $zero -/* CB6740 80241740 0C0900C8 */ jal func_80240320 +/* CB6740 80241740 0C0900C8 */ jal func_80240320_CB5320 /* CB6744 80241744 0260302D */ daddu $a2, $s3, $zero /* CB6748 80241748 0280202D */ daddu $a0, $s4, $zero /* CB674C 8024174C 0200282D */ daddu $a1, $s0, $zero -/* CB6750 80241750 0C090134 */ jal func_802404D0 +/* CB6750 80241750 0C090134 */ jal func_802404D0_CB54D0 /* CB6754 80241754 0260302D */ daddu $a2, $s3, $zero /* CB6758 80241758 080905FD */ j .L802417F4 /* CB675C 8024175C 0000102D */ daddu $v0, $zero, $zero @@ -87,35 +87,35 @@ glabel func_8024162C_CB662C /* CB676C 8024176C 0260302D */ daddu $a2, $s3, $zero /* CB6770 80241770 0280202D */ daddu $a0, $s4, $zero /* CB6774 80241774 0200282D */ daddu $a1, $s0, $zero -/* CB6778 80241778 0C0902EE */ jal func_80240BB8 +/* CB6778 80241778 0C0902EE */ jal func_80240BB8_CB5BB8 /* CB677C 8024177C 0260302D */ daddu $a2, $s3, $zero /* CB6780 80241780 080905FD */ j .L802417F4 /* CB6784 80241784 0000102D */ daddu $v0, $zero, $zero /* CB6788 80241788 0280202D */ daddu $a0, $s4, $zero /* CB678C 8024178C 0200282D */ daddu $a1, $s0, $zero -/* CB6790 80241790 0C0903BF */ jal func_80240EFC +/* CB6790 80241790 0C0903BF */ jal func_80240EFC_CB5EFC /* CB6794 80241794 0260302D */ daddu $a2, $s3, $zero /* CB6798 80241798 0280202D */ daddu $a0, $s4, $zero /* CB679C 8024179C 0200282D */ daddu $a1, $s0, $zero -/* CB67A0 802417A0 0C0903DD */ jal func_80240F74 +/* CB67A0 802417A0 0C0903DD */ jal func_80240F74_CB5F74 /* CB67A4 802417A4 0260302D */ daddu $a2, $s3, $zero /* CB67A8 802417A8 080905FD */ j .L802417F4 /* CB67AC 802417AC 0000102D */ daddu $v0, $zero, $zero /* CB67B0 802417B0 0280202D */ daddu $a0, $s4, $zero /* CB67B4 802417B4 0200282D */ daddu $a1, $s0, $zero -/* CB67B8 802417B8 0C0903F8 */ jal func_80240FE0 +/* CB67B8 802417B8 0C0903F8 */ jal func_80240FE0_CB5FE0 /* CB67BC 802417BC 0260302D */ daddu $a2, $s3, $zero /* CB67C0 802417C0 080905FD */ j .L802417F4 /* CB67C4 802417C4 0000102D */ daddu $v0, $zero, $zero /* CB67C8 802417C8 0280202D */ daddu $a0, $s4, $zero /* CB67CC 802417CC 0200282D */ daddu $a1, $s0, $zero -/* CB67D0 802417D0 0C090445 */ jal func_80241114 +/* CB67D0 802417D0 0C090445 */ jal func_80241114_CB6114 /* CB67D4 802417D4 0260302D */ daddu $a2, $s3, $zero /* CB67D8 802417D8 080905FD */ j .L802417F4 /* CB67DC 802417DC 0000102D */ daddu $v0, $zero, $zero /* CB67E0 802417E0 0280202D */ daddu $a0, $s4, $zero /* CB67E4 802417E4 0200282D */ daddu $a1, $s0, $zero -/* CB67E8 802417E8 0C09045E */ jal func_80241178 +/* CB67E8 802417E8 0C09045E */ jal func_80241178_CB6178 /* CB67EC 802417EC 0260302D */ daddu $a2, $s3, $zero .L802417F0: /* CB67F0 802417F0 0000102D */ daddu $v0, $zero, $zero 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 bab18472cd..c961ded9c8 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 @@ -466,7 +466,7 @@ glabel func_80240A98_CB9C98 /* CBA388 80241188 AC730044 */ sw $s3, 0x44($v1) /* CBA38C 8024118C AE420000 */ sw $v0, ($s2) /* CBA390 80241190 AC710048 */ sw $s1, 0x48($v1) -/* CBA394 80241194 0C09012C */ jal func_802404B0 +/* CBA394 80241194 0C09012C */ jal func_802404B0_CB96B0 /* CBA398 80241198 AC60004C */ sw $zero, 0x4c($v1) /* CBA39C 8024119C 8E420000 */ lw $v0, ($s2) /* CBA3A0 802411A0 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_80241230.s b/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_80241230.s deleted file mode 100644 index 37a5a0bb00..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_80241230.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241230 -/* CBA430 80241230 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CBA434 80241234 F7B40018 */ sdc1 $f20, 0x18($sp) -/* CBA438 80241238 4485A000 */ mtc1 $a1, $f20 -/* CBA43C 8024123C F7B60020 */ sdc1 $f22, 0x20($sp) -/* CBA440 80241240 4486B000 */ mtc1 $a2, $f22 -/* CBA444 80241244 AFB00010 */ sw $s0, 0x10($sp) -/* CBA448 80241248 F7B80028 */ sdc1 $f24, 0x28($sp) -/* CBA44C 8024124C 4487C000 */ mtc1 $a3, $f24 -/* CBA450 80241250 AFBF0014 */ sw $ra, 0x14($sp) -/* CBA454 80241254 0C019D28 */ jal guMtxIdentF -/* CBA458 80241258 0080802D */ daddu $s0, $a0, $zero -/* CBA45C 8024125C 4616A582 */ mul.s $f22, $f20, $f22 -/* CBA460 80241260 00000000 */ nop -/* CBA464 80241264 4618A502 */ mul.s $f20, $f20, $f24 -/* CBA468 80241268 00000000 */ nop -/* CBA46C 8024126C 3C013F80 */ lui $at, 0x3f80 -/* CBA470 80241270 44810000 */ mtc1 $at, $f0 -/* CBA474 80241274 00000000 */ nop -/* CBA478 80241278 E6000014 */ swc1 $f0, 0x14($s0) -/* CBA47C 8024127C E6160010 */ swc1 $f22, 0x10($s0) -/* CBA480 80241280 E6140018 */ swc1 $f20, 0x18($s0) -/* CBA484 80241284 8FBF0014 */ lw $ra, 0x14($sp) -/* CBA488 80241288 8FB00010 */ lw $s0, 0x10($sp) -/* CBA48C 8024128C D7B80028 */ ldc1 $f24, 0x28($sp) -/* CBA490 80241290 D7B60020 */ ldc1 $f22, 0x20($sp) -/* CBA494 80241294 D7B40018 */ ldc1 $f20, 0x18($sp) -/* CBA498 80241298 03E00008 */ jr $ra -/* CBA49C 8024129C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_80241230_CBA430.s b/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_80241230_CBA430.s new file mode 100644 index 0000000000..f05105ab91 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_80241230_CBA430.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241230_CBA430 +/* CBA430 80241230 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* CBA434 80241234 F7B40018 */ sdc1 $f20, 0x18($sp) +/* CBA438 80241238 4485A000 */ mtc1 $a1, $f20 +/* CBA43C 8024123C F7B60020 */ sdc1 $f22, 0x20($sp) +/* CBA440 80241240 4486B000 */ mtc1 $a2, $f22 +/* CBA444 80241244 AFB00010 */ sw $s0, 0x10($sp) +/* CBA448 80241248 F7B80028 */ sdc1 $f24, 0x28($sp) +/* CBA44C 8024124C 4487C000 */ mtc1 $a3, $f24 +/* CBA450 80241250 AFBF0014 */ sw $ra, 0x14($sp) +/* CBA454 80241254 0C019D28 */ jal guMtxIdentF +/* CBA458 80241258 0080802D */ daddu $s0, $a0, $zero +/* CBA45C 8024125C 4616A582 */ mul.s $f22, $f20, $f22 +/* CBA460 80241260 00000000 */ nop +/* CBA464 80241264 4618A502 */ mul.s $f20, $f20, $f24 +/* CBA468 80241268 00000000 */ nop +/* CBA46C 8024126C 3C013F80 */ lui $at, 0x3f80 +/* CBA470 80241270 44810000 */ mtc1 $at, $f0 +/* CBA474 80241274 00000000 */ nop +/* CBA478 80241278 E6000014 */ swc1 $f0, 0x14($s0) +/* CBA47C 8024127C E6160010 */ swc1 $f22, 0x10($s0) +/* CBA480 80241280 E6140018 */ swc1 $f20, 0x18($s0) +/* CBA484 80241284 8FBF0014 */ lw $ra, 0x14($sp) +/* CBA488 80241288 8FB00010 */ lw $s0, 0x10($sp) +/* CBA48C 8024128C D7B80028 */ ldc1 $f24, 0x28($sp) +/* CBA490 80241290 D7B60020 */ ldc1 $f22, 0x20($sp) +/* CBA494 80241294 D7B40018 */ ldc1 $f20, 0x18($sp) +/* CBA498 80241298 03E00008 */ jr $ra +/* CBA49C 8024129C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_802412A0_CBA4A0.s b/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_802412A0_CBA4A0.s index 6b8ffdce6c..360278daaa 100644 --- a/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_802412A0_CBA4A0.s +++ b/asm/nonmatchings/world/area_flo/flo_10/CBA430/func_802412A0_CBA4A0.s @@ -55,7 +55,7 @@ glabel func_802412A0_CBA4A0 /* CBA568 80241368 4405E000 */ mfc1 $a1, $f28 /* CBA56C 8024136C 4406D000 */ mfc1 $a2, $f26 /* CBA570 80241370 4407C000 */ mfc1 $a3, $f24 -/* CBA574 80241374 0C09048C */ jal func_80241230 +/* CBA574 80241374 0C09048C */ jal func_80241230_CBA430 /* CBA578 80241378 27A40010 */ addiu $a0, $sp, 0x10 /* CBA57C 8024137C 27A40010 */ addiu $a0, $sp, 0x10 /* CBA580 80241380 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802412A0_CBA4A0 /* CBA5F0 802413F0 4405E000 */ mfc1 $a1, $f28 /* CBA5F4 802413F4 4406D000 */ mfc1 $a2, $f26 /* CBA5F8 802413F8 4407C000 */ mfc1 $a3, $f24 -/* CBA5FC 802413FC 0C09048C */ jal func_80241230 +/* CBA5FC 802413FC 0C09048C */ jal func_80241230_CBA430 /* CBA600 80241400 27A40010 */ addiu $a0, $sp, 0x10 /* CBA604 80241404 27A40010 */ addiu $a0, $sp, 0x10 /* CBA608 80241408 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802400B0_CC0EE0.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802400B0_CC0EE0.s index d8575c2d29..037280d103 100644 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802400B0_CC0EE0.s +++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_802400B0_CC0EE0.s @@ -55,7 +55,7 @@ glabel func_802400B0_CC0EE0 /* CC0FA8 80240178 4405E000 */ mfc1 $a1, $f28 /* CC0FAC 8024017C 4406D000 */ mfc1 $a2, $f26 /* CC0FB0 80240180 4407C000 */ mfc1 $a3, $f24 -/* CC0FB4 80240184 0C090010 */ jal func_80240040 +/* CC0FB4 80240184 0C090010 */ jal func_80240040_CC0E70 /* CC0FB8 80240188 27A40010 */ addiu $a0, $sp, 0x10 /* CC0FBC 8024018C 27A40010 */ addiu $a0, $sp, 0x10 /* CC0FC0 80240190 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802400B0_CC0EE0 /* CC1030 80240200 4405E000 */ mfc1 $a1, $f28 /* CC1034 80240204 4406D000 */ mfc1 $a2, $f26 /* CC1038 80240208 4407C000 */ mfc1 $a3, $f24 -/* CC103C 8024020C 0C090010 */ jal func_80240040 +/* CC103C 8024020C 0C090010 */ jal func_80240040_CC0E70 /* CC1040 80240210 27A40010 */ addiu $a0, $sp, 0x10 /* CC1044 80240214 27A40010 */ addiu $a0, $sp, 0x10 /* CC1048 80240218 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614.s deleted file mode 100644 index 3ac89067a5..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240614 -/* CC1444 80240614 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CC1448 80240618 AFBF0010 */ sw $ra, 0x10($sp) -/* CC144C 8024061C 8C82000C */ lw $v0, 0xc($a0) -/* CC1450 80240620 0C0B1EAF */ jal get_variable -/* CC1454 80240624 8C450000 */ lw $a1, ($v0) -/* CC1458 80240628 3C018024 */ lui $at, 0x8024 -/* CC145C 8024062C AC221854 */ sw $v0, 0x1854($at) -/* CC1460 80240630 24020002 */ addiu $v0, $zero, 2 -/* CC1464 80240634 8FBF0010 */ lw $ra, 0x10($sp) -/* CC1468 80240638 24030001 */ addiu $v1, $zero, 1 -/* CC146C 8024063C 3C018024 */ lui $at, 0x8024 -/* CC1470 80240640 AC231850 */ sw $v1, 0x1850($at) -/* CC1474 80240644 03E00008 */ jr $ra -/* CC1478 80240648 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s new file mode 100644 index 0000000000..77c93834eb --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_12/CC0E70/func_80240614_CC1444.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240614_CC1444 +/* CC1444 80240614 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CC1448 80240618 AFBF0010 */ sw $ra, 0x10($sp) +/* CC144C 8024061C 8C82000C */ lw $v0, 0xc($a0) +/* CC1450 80240620 0C0B1EAF */ jal get_variable +/* CC1454 80240624 8C450000 */ lw $a1, ($v0) +/* CC1458 80240628 3C018024 */ lui $at, 0x8024 +/* CC145C 8024062C AC221854 */ sw $v0, 0x1854($at) +/* CC1460 80240630 24020002 */ addiu $v0, $zero, 2 +/* CC1464 80240634 8FBF0010 */ lw $ra, 0x10($sp) +/* CC1468 80240638 24030001 */ addiu $v1, $zero, 1 +/* CC146C 8024063C 3C018024 */ lui $at, 0x8024 +/* CC1470 80240640 AC231850 */ sw $v1, 0x1850($at) +/* CC1474 80240644 03E00008 */ jr $ra +/* CC1478 80240648 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374.s deleted file mode 100644 index 09908e684c..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240374 -/* CC3B84 80240374 27BDFF80 */ addiu $sp, $sp, -0x80 -/* CC3B88 80240378 AFB3004C */ sw $s3, 0x4c($sp) -/* CC3B8C 8024037C 0080982D */ daddu $s3, $a0, $zero -/* CC3B90 80240380 AFBF0058 */ sw $ra, 0x58($sp) -/* CC3B94 80240384 AFB50054 */ sw $s5, 0x54($sp) -/* CC3B98 80240388 AFB40050 */ sw $s4, 0x50($sp) -/* CC3B9C 8024038C AFB20048 */ sw $s2, 0x48($sp) -/* CC3BA0 80240390 AFB10044 */ sw $s1, 0x44($sp) -/* CC3BA4 80240394 AFB00040 */ sw $s0, 0x40($sp) -/* CC3BA8 80240398 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CC3BAC 8024039C F7B80070 */ sdc1 $f24, 0x70($sp) -/* CC3BB0 802403A0 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CC3BB4 802403A4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CC3BB8 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* CC3BBC 802403AC 00A0902D */ daddu $s2, $a1, $zero -/* CC3BC0 802403B0 86240008 */ lh $a0, 8($s1) -/* CC3BC4 802403B4 0C00EABB */ jal get_npc_unsafe -/* CC3BC8 802403B8 00C0A82D */ daddu $s5, $a2, $zero -/* CC3BCC 802403BC 0040802D */ daddu $s0, $v0, $zero -/* CC3BD0 802403C0 0000A02D */ daddu $s4, $zero, $zero -/* CC3BD4 802403C4 C624007C */ lwc1 $f4, 0x7c($s1) -/* CC3BD8 802403C8 46802120 */ cvt.s.w $f4, $f4 -/* CC3BDC 802403CC C6220088 */ lwc1 $f2, 0x88($s1) -/* CC3BE0 802403D0 468010A0 */ cvt.s.w $f2, $f2 -/* CC3BE4 802403D4 460010A1 */ cvt.d.s $f2, $f2 -/* CC3BE8 802403D8 46002121 */ cvt.d.s $f4, $f4 -/* CC3BEC 802403DC C600003C */ lwc1 $f0, 0x3c($s0) -/* CC3BF0 802403E0 3C014059 */ lui $at, 0x4059 -/* CC3BF4 802403E4 44813800 */ mtc1 $at, $f7 -/* CC3BF8 802403E8 44803000 */ mtc1 $zero, $f6 -/* CC3BFC 802403EC 46000021 */ cvt.d.s $f0, $f0 -/* CC3C00 802403F0 46260002 */ mul.d $f0, $f0, $f6 -/* CC3C04 802403F4 00000000 */ nop -/* CC3C08 802403F8 24020001 */ addiu $v0, $zero, 1 -/* CC3C0C 802403FC 8E24006C */ lw $a0, 0x6c($s1) -/* CC3C10 80240400 46261083 */ div.d $f2, $f2, $f6 -/* CC3C14 80240404 462010A0 */ cvt.s.d $f2, $f2 -/* CC3C18 80240408 46262103 */ div.d $f4, $f4, $f6 -/* CC3C1C 8024040C 46202520 */ cvt.s.d $f20, $f4 -/* CC3C20 80240410 30830011 */ andi $v1, $a0, 0x11 -/* CC3C24 80240414 4620020D */ trunc.w.d $f8, $f0 -/* CC3C28 80240418 E628007C */ swc1 $f8, 0x7c($s1) -/* CC3C2C 8024041C C6200078 */ lwc1 $f0, 0x78($s1) -/* CC3C30 80240420 46800020 */ cvt.s.w $f0, $f0 -/* CC3C34 80240424 46000021 */ cvt.d.s $f0, $f0 -/* CC3C38 80240428 46260003 */ div.d $f0, $f0, $f6 -/* CC3C3C 8024042C 462006A0 */ cvt.s.d $f26, $f0 -/* CC3C40 80240430 C6200070 */ lwc1 $f0, 0x70($s1) -/* CC3C44 80240434 46800020 */ cvt.s.w $f0, $f0 -/* CC3C48 80240438 46000021 */ cvt.d.s $f0, $f0 -/* CC3C4C 8024043C 46260003 */ div.d $f0, $f0, $f6 -/* CC3C50 80240440 462005A0 */ cvt.s.d $f22, $f0 -/* CC3C54 80240444 14620025 */ bne $v1, $v0, .L802404DC -/* CC3C58 80240448 4602D600 */ add.s $f24, $f26, $f2 -/* CC3C5C 8024044C 8E020000 */ lw $v0, ($s0) -/* CC3C60 80240450 30420008 */ andi $v0, $v0, 8 -/* CC3C64 80240454 10400009 */ beqz $v0, .L8024047C -/* CC3C68 80240458 27A50028 */ addiu $a1, $sp, 0x28 -/* CC3C6C 8024045C C600003C */ lwc1 $f0, 0x3c($s0) -/* CC3C70 80240460 4600C001 */ sub.s $f0, $f24, $f0 -/* CC3C74 80240464 4600B03C */ c.lt.s $f22, $f0 -/* CC3C78 80240468 00000000 */ nop -/* CC3C7C 8024046C 4500001B */ bc1f .L802404DC -/* CC3C80 80240470 34820010 */ ori $v0, $a0, 0x10 -/* CC3C84 80240474 08090137 */ j .L802404DC -/* CC3C88 80240478 AE22006C */ sw $v0, 0x6c($s1) -.L8024047C: -/* CC3C8C 8024047C 27A6002C */ addiu $a2, $sp, 0x2c -/* CC3C90 80240480 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC3C94 80240484 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC3C98 80240488 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC3C9C 8024048C 3C01447A */ lui $at, 0x447a -/* CC3CA0 80240490 44813000 */ mtc1 $at, $f6 -/* CC3CA4 80240494 27A20034 */ addiu $v0, $sp, 0x34 -/* CC3CA8 80240498 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC3CAC 8024049C E7A2002C */ swc1 $f2, 0x2c($sp) -/* CC3CB0 802404A0 E7A40030 */ swc1 $f4, 0x30($sp) -/* CC3CB4 802404A4 E7A60034 */ swc1 $f6, 0x34($sp) -/* CC3CB8 802404A8 AFA20010 */ sw $v0, 0x10($sp) -/* CC3CBC 802404AC 8E040080 */ lw $a0, 0x80($s0) -/* CC3CC0 802404B0 0C0372DF */ jal func_800DCB7C -/* CC3CC4 802404B4 27A70030 */ addiu $a3, $sp, 0x30 -/* CC3CC8 802404B8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* CC3CCC 802404BC 4600D001 */ sub.s $f0, $f26, $f0 -/* CC3CD0 802404C0 4600B03C */ c.lt.s $f22, $f0 -/* CC3CD4 802404C4 00000000 */ nop -/* CC3CD8 802404C8 45000004 */ bc1f .L802404DC -/* CC3CDC 802404CC 00000000 */ nop -/* CC3CE0 802404D0 8E22006C */ lw $v0, 0x6c($s1) -/* CC3CE4 802404D4 34420010 */ ori $v0, $v0, 0x10 -/* CC3CE8 802404D8 AE22006C */ sw $v0, 0x6c($s1) -.L802404DC: -/* CC3CEC 802404DC 8E22006C */ lw $v0, 0x6c($s1) -/* CC3CF0 802404E0 24030011 */ addiu $v1, $zero, 0x11 -/* CC3CF4 802404E4 30420011 */ andi $v0, $v0, 0x11 -/* CC3CF8 802404E8 14430039 */ bne $v0, $v1, .L802405D0 -/* CC3CFC 802404EC 00000000 */ nop -/* CC3D00 802404F0 8E020000 */ lw $v0, ($s0) -/* CC3D04 802404F4 30420008 */ andi $v0, $v0, 8 -/* CC3D08 802404F8 1040000A */ beqz $v0, .L80240524 -/* CC3D0C 802404FC 4600C106 */ mov.s $f4, $f24 -/* CC3D10 80240500 4614C081 */ sub.s $f2, $f24, $f20 -/* CC3D14 80240504 3C018024 */ lui $at, 0x8024 -/* CC3D18 80240508 D4207A38 */ ldc1 $f0, 0x7a38($at) -/* CC3D1C 8024050C 460010A1 */ cvt.d.s $f2, $f2 -/* CC3D20 80240510 46201082 */ mul.d $f2, $f2, $f0 -/* CC3D24 80240514 00000000 */ nop -/* CC3D28 80240518 4600A021 */ cvt.d.s $f0, $f20 -/* CC3D2C 8024051C 08090162 */ j .L80240588 -/* CC3D30 80240520 46220000 */ add.d $f0, $f0, $f2 -.L80240524: -/* CC3D34 80240524 27A50028 */ addiu $a1, $sp, 0x28 -/* CC3D38 80240528 27A6002C */ addiu $a2, $sp, 0x2c -/* CC3D3C 8024052C C6000038 */ lwc1 $f0, 0x38($s0) -/* CC3D40 80240530 C6020040 */ lwc1 $f2, 0x40($s0) -/* CC3D44 80240534 3C01447A */ lui $at, 0x447a -/* CC3D48 80240538 44812000 */ mtc1 $at, $f4 -/* CC3D4C 8024053C 27A20034 */ addiu $v0, $sp, 0x34 -/* CC3D50 80240540 E7B4002C */ swc1 $f20, 0x2c($sp) -/* CC3D54 80240544 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC3D58 80240548 E7A20030 */ swc1 $f2, 0x30($sp) -/* CC3D5C 8024054C E7A40034 */ swc1 $f4, 0x34($sp) -/* CC3D60 80240550 AFA20010 */ sw $v0, 0x10($sp) -/* CC3D64 80240554 8E040080 */ lw $a0, 0x80($s0) -/* CC3D68 80240558 0C0372DF */ jal func_800DCB7C -/* CC3D6C 8024055C 27A70030 */ addiu $a3, $sp, 0x30 -/* CC3D70 80240560 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* CC3D74 80240564 461A2100 */ add.s $f4, $f4, $f26 -/* CC3D78 80240568 46142081 */ sub.s $f2, $f4, $f20 -/* CC3D7C 8024056C 3C018024 */ lui $at, 0x8024 -/* CC3D80 80240570 D4207A40 */ ldc1 $f0, 0x7a40($at) -/* CC3D84 80240574 460010A1 */ cvt.d.s $f2, $f2 -/* CC3D88 80240578 46201082 */ mul.d $f2, $f2, $f0 -/* CC3D8C 8024057C 00000000 */ nop -/* CC3D90 80240580 4600A021 */ cvt.d.s $f0, $f20 -/* CC3D94 80240584 46220000 */ add.d $f0, $f0, $f2 -.L80240588: -/* CC3D98 80240588 46200020 */ cvt.s.d $f0, $f0 -/* CC3D9C 8024058C E600003C */ swc1 $f0, 0x3c($s0) -/* CC3DA0 80240590 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC3DA4 80240594 46002001 */ sub.s $f0, $f4, $f0 -/* CC3DA8 80240598 3C013FF0 */ lui $at, 0x3ff0 -/* CC3DAC 8024059C 44811800 */ mtc1 $at, $f3 -/* CC3DB0 802405A0 44801000 */ mtc1 $zero, $f2 -/* CC3DB4 802405A4 46000005 */ abs.s $f0, $f0 -/* CC3DB8 802405A8 46000021 */ cvt.d.s $f0, $f0 -/* CC3DBC 802405AC 4622003C */ c.lt.d $f0, $f2 -/* CC3DC0 802405B0 00000000 */ nop -/* CC3DC4 802405B4 45000036 */ bc1f .L80240690 -/* CC3DC8 802405B8 2403FFEF */ addiu $v1, $zero, -0x11 -/* CC3DCC 802405BC E604003C */ swc1 $f4, 0x3c($s0) -/* CC3DD0 802405C0 8E22006C */ lw $v0, 0x6c($s1) -/* CC3DD4 802405C4 00431024 */ and $v0, $v0, $v1 -/* CC3DD8 802405C8 080901A4 */ j .L80240690 -/* CC3DDC 802405CC AE22006C */ sw $v0, 0x6c($s1) -.L802405D0: -/* CC3DE0 802405D0 8E220070 */ lw $v0, 0x70($s1) -/* CC3DE4 802405D4 1840002E */ blez $v0, .L80240690 -/* CC3DE8 802405D8 00000000 */ nop -/* CC3DEC 802405DC C62C0074 */ lwc1 $f12, 0x74($s1) -/* CC3DF0 802405E0 0C00A8BB */ jal sin_deg -/* CC3DF4 802405E4 46806320 */ cvt.s.w $f12, $f12 -/* CC3DF8 802405E8 8E020000 */ lw $v0, ($s0) -/* CC3DFC 802405EC 30420008 */ andi $v0, $v0, 8 -/* CC3E00 802405F0 10400003 */ beqz $v0, .L80240600 -/* CC3E04 802405F4 46000506 */ mov.s $f20, $f0 -/* CC3E08 802405F8 08090190 */ j .L80240640 -/* CC3E0C 802405FC 0000102D */ daddu $v0, $zero, $zero -.L80240600: -/* CC3E10 80240600 27A50028 */ addiu $a1, $sp, 0x28 -/* CC3E14 80240604 27A6002C */ addiu $a2, $sp, 0x2c -/* CC3E18 80240608 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC3E1C 8024060C C602003C */ lwc1 $f2, 0x3c($s0) -/* CC3E20 80240610 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC3E24 80240614 3C01447A */ lui $at, 0x447a -/* CC3E28 80240618 44813000 */ mtc1 $at, $f6 -/* CC3E2C 8024061C 27A20034 */ addiu $v0, $sp, 0x34 -/* CC3E30 80240620 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC3E34 80240624 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CC3E38 80240628 E7A40030 */ swc1 $f4, 0x30($sp) -/* CC3E3C 8024062C E7A60034 */ swc1 $f6, 0x34($sp) -/* CC3E40 80240630 AFA20010 */ sw $v0, 0x10($sp) -/* CC3E44 80240634 8E040080 */ lw $a0, 0x80($s0) -/* CC3E48 80240638 0C0372DF */ jal func_800DCB7C -/* CC3E4C 8024063C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240640: -/* CC3E50 80240640 10400007 */ beqz $v0, .L80240660 -/* CC3E54 80240644 00000000 */ nop -/* CC3E58 80240648 4616A082 */ mul.s $f2, $f20, $f22 -/* CC3E5C 8024064C 00000000 */ nop -/* CC3E60 80240650 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CC3E64 80240654 461A0000 */ add.s $f0, $f0, $f26 -/* CC3E68 80240658 0809019B */ j .L8024066C -/* CC3E6C 8024065C 46020000 */ add.s $f0, $f0, $f2 -.L80240660: -/* CC3E70 80240660 4616A002 */ mul.s $f0, $f20, $f22 -/* CC3E74 80240664 00000000 */ nop -/* CC3E78 80240668 4600C000 */ add.s $f0, $f24, $f0 -.L8024066C: -/* CC3E7C 8024066C E600003C */ swc1 $f0, 0x3c($s0) -/* CC3E80 80240670 8E220074 */ lw $v0, 0x74($s1) -/* CC3E84 80240674 2442000A */ addiu $v0, $v0, 0xa -/* CC3E88 80240678 44826000 */ mtc1 $v0, $f12 -/* CC3E8C 8024067C 00000000 */ nop -/* CC3E90 80240680 0C00A6C9 */ jal clamp_angle -/* CC3E94 80240684 46806320 */ cvt.s.w $f12, $f12 -/* CC3E98 80240688 4600020D */ trunc.w.s $f8, $f0 -/* CC3E9C 8024068C E6280074 */ swc1 $f8, 0x74($s1) -.L80240690: -/* CC3EA0 80240690 8E220090 */ lw $v0, 0x90($s1) -/* CC3EA4 80240694 1C40004A */ bgtz $v0, .L802407C0 -/* CC3EA8 80240698 2442FFFF */ addiu $v0, $v0, -1 -/* CC3EAC 8024069C 8E430014 */ lw $v1, 0x14($s2) -/* CC3EB0 802406A0 04600048 */ bltz $v1, .L802407C4 -/* CC3EB4 802406A4 00000000 */ nop -/* CC3EB8 802406A8 8E620074 */ lw $v0, 0x74($s3) -/* CC3EBC 802406AC 1C400042 */ bgtz $v0, .L802407B8 -/* CC3EC0 802406B0 2442FFFF */ addiu $v0, $v0, -1 -/* CC3EC4 802406B4 AE630074 */ sw $v1, 0x74($s3) -/* CC3EC8 802406B8 860200A8 */ lh $v0, 0xa8($s0) -/* CC3ECC 802406BC C602003C */ lwc1 $f2, 0x3c($s0) -/* CC3ED0 802406C0 44820000 */ mtc1 $v0, $f0 -/* CC3ED4 802406C4 00000000 */ nop -/* CC3ED8 802406C8 46800020 */ cvt.s.w $f0, $f0 -/* CC3EDC 802406CC 46001080 */ add.s $f2, $f2, $f0 -/* CC3EE0 802406D0 3C014024 */ lui $at, 0x4024 -/* CC3EE4 802406D4 44810800 */ mtc1 $at, $f1 -/* CC3EE8 802406D8 44800000 */ mtc1 $zero, $f0 -/* CC3EEC 802406DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC3EF0 802406E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC3EF4 802406E4 460010A1 */ cvt.d.s $f2, $f2 -/* CC3EF8 802406E8 46201080 */ add.d $f2, $f2, $f0 -/* CC3EFC 802406EC C440002C */ lwc1 $f0, 0x2c($v0) -/* CC3F00 802406F0 46000021 */ cvt.d.s $f0, $f0 -/* CC3F04 802406F4 4622003C */ c.lt.d $f0, $f2 -/* CC3F08 802406F8 00000000 */ nop -/* CC3F0C 802406FC 4500002C */ bc1f .L802407B0 -/* CC3F10 80240700 02A0202D */ daddu $a0, $s5, $zero -/* CC3F14 80240704 AFA00010 */ sw $zero, 0x10($sp) -/* CC3F18 80240708 8E46000C */ lw $a2, 0xc($s2) -/* CC3F1C 8024070C 8E470010 */ lw $a3, 0x10($s2) -/* CC3F20 80240710 0C01242D */ jal func_800490B4 -/* CC3F24 80240714 0220282D */ daddu $a1, $s1, $zero -/* CC3F28 80240718 10400025 */ beqz $v0, .L802407B0 -/* CC3F2C 8024071C 0000202D */ daddu $a0, $zero, $zero -/* CC3F30 80240720 0200282D */ daddu $a1, $s0, $zero -/* CC3F34 80240724 0000302D */ daddu $a2, $zero, $zero -/* CC3F38 80240728 2412000C */ addiu $s2, $zero, 0xc -/* CC3F3C 8024072C 860300A8 */ lh $v1, 0xa8($s0) -/* CC3F40 80240730 3C013F80 */ lui $at, 0x3f80 -/* CC3F44 80240734 44810000 */ mtc1 $at, $f0 -/* CC3F48 80240738 3C014000 */ lui $at, 0x4000 -/* CC3F4C 8024073C 44811000 */ mtc1 $at, $f2 -/* CC3F50 80240740 3C01C1A0 */ lui $at, 0xc1a0 -/* CC3F54 80240744 44812000 */ mtc1 $at, $f4 -/* CC3F58 80240748 44834000 */ mtc1 $v1, $f8 -/* CC3F5C 8024074C 00000000 */ nop -/* CC3F60 80240750 46804220 */ cvt.s.w $f8, $f8 -/* CC3F64 80240754 44074000 */ mfc1 $a3, $f8 -/* CC3F68 80240758 27A20038 */ addiu $v0, $sp, 0x38 -/* CC3F6C 8024075C AFB2001C */ sw $s2, 0x1c($sp) -/* CC3F70 80240760 AFA20020 */ sw $v0, 0x20($sp) -/* CC3F74 80240764 E7A00010 */ swc1 $f0, 0x10($sp) -/* CC3F78 80240768 E7A20014 */ swc1 $f2, 0x14($sp) -/* CC3F7C 8024076C 0C01BFA4 */ jal fx_emote -/* CC3F80 80240770 E7A40018 */ swc1 $f4, 0x18($sp) -/* CC3F84 80240774 0200202D */ daddu $a0, $s0, $zero -/* CC3F88 80240778 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CC3F8C 8024077C C480003C */ lwc1 $f0, 0x3c($a0) -/* CC3F90 80240780 3C060020 */ lui $a2, 0x20 -/* CC3F94 80240784 0C012530 */ jal func_800494C0 -/* CC3F98 80240788 E4800064 */ swc1 $f0, 0x64($a0) -/* CC3F9C 8024078C 8E220018 */ lw $v0, 0x18($s1) -/* CC3FA0 80240790 9442002A */ lhu $v0, 0x2a($v0) -/* CC3FA4 80240794 30420001 */ andi $v0, $v0, 1 -/* CC3FA8 80240798 10400003 */ beqz $v0, .L802407A8 -/* CC3FAC 8024079C 2402000A */ addiu $v0, $zero, 0xa -/* CC3FB0 802407A0 0809025A */ j .L80240968 -/* CC3FB4 802407A4 AE620070 */ sw $v0, 0x70($s3) -.L802407A8: -/* CC3FB8 802407A8 0809025A */ j .L80240968 -/* CC3FBC 802407AC AE720070 */ sw $s2, 0x70($s3) -.L802407B0: -/* CC3FC0 802407B0 8E620074 */ lw $v0, 0x74($s3) -/* CC3FC4 802407B4 2442FFFF */ addiu $v0, $v0, -1 -.L802407B8: -/* CC3FC8 802407B8 080901F1 */ j .L802407C4 -/* CC3FCC 802407BC AE620074 */ sw $v0, 0x74($s3) -.L802407C0: -/* CC3FD0 802407C0 AE220090 */ sw $v0, 0x90($s1) -.L802407C4: -/* CC3FD4 802407C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* CC3FD8 802407C8 C6000040 */ lwc1 $f0, 0x40($s0) -/* CC3FDC 802407CC C4620000 */ lwc1 $f2, ($v1) -/* CC3FE0 802407D0 468010A0 */ cvt.s.w $f2, $f2 -/* CC3FE4 802407D4 C4640008 */ lwc1 $f4, 8($v1) -/* CC3FE8 802407D8 46802120 */ cvt.s.w $f4, $f4 -/* CC3FEC 802407DC E7A00010 */ swc1 $f0, 0x10($sp) -/* CC3FF0 802407E0 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC3FF4 802407E4 44051000 */ mfc1 $a1, $f2 -/* CC3FF8 802407E8 C440000C */ lwc1 $f0, 0xc($v0) -/* CC3FFC 802407EC 46800020 */ cvt.s.w $f0, $f0 -/* CC4000 802407F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* CC4004 802407F4 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC4008 802407F8 44062000 */ mfc1 $a2, $f4 -/* CC400C 802407FC C4400010 */ lwc1 $f0, 0x10($v0) -/* CC4010 80240800 46800020 */ cvt.s.w $f0, $f0 -/* CC4014 80240804 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC4018 80240808 8C640018 */ lw $a0, 0x18($v1) -/* CC401C 8024080C 0C0123F5 */ jal is_point_within_region -/* CC4020 80240810 8E070038 */ lw $a3, 0x38($s0) -/* CC4024 80240814 1040001A */ beqz $v0, .L80240880 -/* CC4028 80240818 00000000 */ nop -/* CC402C 8024081C 8E060038 */ lw $a2, 0x38($s0) -/* CC4030 80240820 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC4034 80240824 8E070040 */ lw $a3, 0x40($s0) -/* CC4038 80240828 C44C0000 */ lwc1 $f12, ($v0) -/* CC403C 8024082C 46806320 */ cvt.s.w $f12, $f12 -/* CC4040 80240830 C44E0008 */ lwc1 $f14, 8($v0) -/* CC4044 80240834 0C00A7B5 */ jal dist2D -/* CC4048 80240838 468073A0 */ cvt.s.w $f14, $f14 -/* CC404C 8024083C C6020018 */ lwc1 $f2, 0x18($s0) -/* CC4050 80240840 4600103C */ c.lt.s $f2, $f0 -/* CC4054 80240844 00000000 */ nop -/* CC4058 80240848 4500000D */ bc1f .L80240880 -/* CC405C 8024084C E7A00034 */ swc1 $f0, 0x34($sp) -/* CC4060 80240850 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC4064 80240854 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC4068 80240858 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC406C 8024085C C4480000 */ lwc1 $f8, ($v0) -/* CC4070 80240860 46804220 */ cvt.s.w $f8, $f8 -/* CC4074 80240864 44064000 */ mfc1 $a2, $f8 -/* CC4078 80240868 C4480008 */ lwc1 $f8, 8($v0) -/* CC407C 8024086C 46804220 */ cvt.s.w $f8, $f8 -/* CC4080 80240870 44074000 */ mfc1 $a3, $f8 -/* CC4084 80240874 0C00A720 */ jal atan2 -/* CC4088 80240878 24140001 */ addiu $s4, $zero, 1 -/* CC408C 8024087C E600000C */ swc1 $f0, 0xc($s0) -.L80240880: -/* CC4090 80240880 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC4094 80240884 8C43000C */ lw $v1, 0xc($v0) -/* CC4098 80240888 8C420010 */ lw $v0, 0x10($v0) -/* CC409C 8024088C 00621825 */ or $v1, $v1, $v0 -/* CC40A0 80240890 00741825 */ or $v1, $v1, $s4 -/* CC40A4 80240894 10600008 */ beqz $v1, .L802408B8 -/* CC40A8 80240898 00000000 */ nop -/* CC40AC 8024089C 8602008C */ lh $v0, 0x8c($s0) -/* CC40B0 802408A0 14400031 */ bnez $v0, .L80240968 -/* CC40B4 802408A4 00000000 */ nop -/* CC40B8 802408A8 8E050018 */ lw $a1, 0x18($s0) -/* CC40BC 802408AC 8E06000C */ lw $a2, 0xc($s0) -/* CC40C0 802408B0 0C00EA95 */ jal npc_move_heading -/* CC40C4 802408B4 0200202D */ daddu $a0, $s0, $zero -.L802408B8: -/* CC40C8 802408B8 C600003C */ lwc1 $f0, 0x3c($s0) -/* CC40CC 802408BC 3C014059 */ lui $at, 0x4059 -/* CC40D0 802408C0 44811800 */ mtc1 $at, $f3 -/* CC40D4 802408C4 44801000 */ mtc1 $zero, $f2 -/* CC40D8 802408C8 46000021 */ cvt.d.s $f0, $f0 -/* CC40DC 802408CC 46220002 */ mul.d $f0, $f0, $f2 -/* CC40E0 802408D0 00000000 */ nop -/* CC40E4 802408D4 4620020D */ trunc.w.d $f8, $f0 -/* CC40E8 802408D8 E628007C */ swc1 $f8, 0x7c($s1) -/* CC40EC 802408DC 8E420004 */ lw $v0, 4($s2) -/* CC40F0 802408E0 18400021 */ blez $v0, .L80240968 -/* CC40F4 802408E4 00000000 */ nop -/* CC40F8 802408E8 8602008E */ lh $v0, 0x8e($s0) -/* CC40FC 802408EC 9603008E */ lhu $v1, 0x8e($s0) -/* CC4100 802408F0 18400005 */ blez $v0, .L80240908 -/* CC4104 802408F4 2462FFFF */ addiu $v0, $v1, -1 -/* CC4108 802408F8 A602008E */ sh $v0, 0x8e($s0) -/* CC410C 802408FC 00021400 */ sll $v0, $v0, 0x10 -/* CC4110 80240900 1C400019 */ bgtz $v0, .L80240968 -/* CC4114 80240904 00000000 */ nop -.L80240908: -/* CC4118 80240908 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CC411C 8024090C 24020002 */ addiu $v0, $zero, 2 -/* CC4120 80240910 0C00A67F */ jal rand_int -/* CC4124 80240914 AE620070 */ sw $v0, 0x70($s3) -/* CC4128 80240918 3C035555 */ lui $v1, 0x5555 -/* CC412C 8024091C 34635556 */ ori $v1, $v1, 0x5556 -/* CC4130 80240920 00430018 */ mult $v0, $v1 -/* CC4134 80240924 000227C3 */ sra $a0, $v0, 0x1f -/* CC4138 80240928 00004010 */ mfhi $t0 -/* CC413C 8024092C 01042023 */ subu $a0, $t0, $a0 -/* CC4140 80240930 00041840 */ sll $v1, $a0, 1 -/* CC4144 80240934 00641821 */ addu $v1, $v1, $a0 -/* CC4148 80240938 00431023 */ subu $v0, $v0, $v1 -/* CC414C 8024093C 24430002 */ addiu $v1, $v0, 2 -/* CC4150 80240940 AE630074 */ sw $v1, 0x74($s3) -/* CC4154 80240944 8E42002C */ lw $v0, 0x2c($s2) -/* CC4158 80240948 58400007 */ blezl $v0, .L80240968 -/* CC415C 8024094C AE600070 */ sw $zero, 0x70($s3) -/* CC4160 80240950 8E420008 */ lw $v0, 8($s2) -/* CC4164 80240954 18400003 */ blez $v0, .L80240964 -/* CC4168 80240958 28620003 */ slti $v0, $v1, 3 -/* CC416C 8024095C 10400002 */ beqz $v0, .L80240968 -/* CC4170 80240960 00000000 */ nop -.L80240964: -/* CC4174 80240964 AE600070 */ sw $zero, 0x70($s3) -.L80240968: -/* CC4178 80240968 8FBF0058 */ lw $ra, 0x58($sp) -/* CC417C 8024096C 8FB50054 */ lw $s5, 0x54($sp) -/* CC4180 80240970 8FB40050 */ lw $s4, 0x50($sp) -/* CC4184 80240974 8FB3004C */ lw $s3, 0x4c($sp) -/* CC4188 80240978 8FB20048 */ lw $s2, 0x48($sp) -/* CC418C 8024097C 8FB10044 */ lw $s1, 0x44($sp) -/* CC4190 80240980 8FB00040 */ lw $s0, 0x40($sp) -/* CC4194 80240984 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CC4198 80240988 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CC419C 8024098C D7B60068 */ ldc1 $f22, 0x68($sp) -/* CC41A0 80240990 D7B40060 */ ldc1 $f20, 0x60($sp) -/* CC41A4 80240994 03E00008 */ jr $ra -/* CC41A8 80240998 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s new file mode 100644 index 0000000000..dd9457b7db --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80240374_CC3B84.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240374_CC3B84 +/* CC3B84 80240374 27BDFF80 */ addiu $sp, $sp, -0x80 +/* CC3B88 80240378 AFB3004C */ sw $s3, 0x4c($sp) +/* CC3B8C 8024037C 0080982D */ daddu $s3, $a0, $zero +/* CC3B90 80240380 AFBF0058 */ sw $ra, 0x58($sp) +/* CC3B94 80240384 AFB50054 */ sw $s5, 0x54($sp) +/* CC3B98 80240388 AFB40050 */ sw $s4, 0x50($sp) +/* CC3B9C 8024038C AFB20048 */ sw $s2, 0x48($sp) +/* CC3BA0 80240390 AFB10044 */ sw $s1, 0x44($sp) +/* CC3BA4 80240394 AFB00040 */ sw $s0, 0x40($sp) +/* CC3BA8 80240398 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* CC3BAC 8024039C F7B80070 */ sdc1 $f24, 0x70($sp) +/* CC3BB0 802403A0 F7B60068 */ sdc1 $f22, 0x68($sp) +/* CC3BB4 802403A4 F7B40060 */ sdc1 $f20, 0x60($sp) +/* CC3BB8 802403A8 8E710148 */ lw $s1, 0x148($s3) +/* CC3BBC 802403AC 00A0902D */ daddu $s2, $a1, $zero +/* CC3BC0 802403B0 86240008 */ lh $a0, 8($s1) +/* CC3BC4 802403B4 0C00EABB */ jal get_npc_unsafe +/* CC3BC8 802403B8 00C0A82D */ daddu $s5, $a2, $zero +/* CC3BCC 802403BC 0040802D */ daddu $s0, $v0, $zero +/* CC3BD0 802403C0 0000A02D */ daddu $s4, $zero, $zero +/* CC3BD4 802403C4 C624007C */ lwc1 $f4, 0x7c($s1) +/* CC3BD8 802403C8 46802120 */ cvt.s.w $f4, $f4 +/* CC3BDC 802403CC C6220088 */ lwc1 $f2, 0x88($s1) +/* CC3BE0 802403D0 468010A0 */ cvt.s.w $f2, $f2 +/* CC3BE4 802403D4 460010A1 */ cvt.d.s $f2, $f2 +/* CC3BE8 802403D8 46002121 */ cvt.d.s $f4, $f4 +/* CC3BEC 802403DC C600003C */ lwc1 $f0, 0x3c($s0) +/* CC3BF0 802403E0 3C014059 */ lui $at, 0x4059 +/* CC3BF4 802403E4 44813800 */ mtc1 $at, $f7 +/* CC3BF8 802403E8 44803000 */ mtc1 $zero, $f6 +/* CC3BFC 802403EC 46000021 */ cvt.d.s $f0, $f0 +/* CC3C00 802403F0 46260002 */ mul.d $f0, $f0, $f6 +/* CC3C04 802403F4 00000000 */ nop +/* CC3C08 802403F8 24020001 */ addiu $v0, $zero, 1 +/* CC3C0C 802403FC 8E24006C */ lw $a0, 0x6c($s1) +/* CC3C10 80240400 46261083 */ div.d $f2, $f2, $f6 +/* CC3C14 80240404 462010A0 */ cvt.s.d $f2, $f2 +/* CC3C18 80240408 46262103 */ div.d $f4, $f4, $f6 +/* CC3C1C 8024040C 46202520 */ cvt.s.d $f20, $f4 +/* CC3C20 80240410 30830011 */ andi $v1, $a0, 0x11 +/* CC3C24 80240414 4620020D */ trunc.w.d $f8, $f0 +/* CC3C28 80240418 E628007C */ swc1 $f8, 0x7c($s1) +/* CC3C2C 8024041C C6200078 */ lwc1 $f0, 0x78($s1) +/* CC3C30 80240420 46800020 */ cvt.s.w $f0, $f0 +/* CC3C34 80240424 46000021 */ cvt.d.s $f0, $f0 +/* CC3C38 80240428 46260003 */ div.d $f0, $f0, $f6 +/* CC3C3C 8024042C 462006A0 */ cvt.s.d $f26, $f0 +/* CC3C40 80240430 C6200070 */ lwc1 $f0, 0x70($s1) +/* CC3C44 80240434 46800020 */ cvt.s.w $f0, $f0 +/* CC3C48 80240438 46000021 */ cvt.d.s $f0, $f0 +/* CC3C4C 8024043C 46260003 */ div.d $f0, $f0, $f6 +/* CC3C50 80240440 462005A0 */ cvt.s.d $f22, $f0 +/* CC3C54 80240444 14620025 */ bne $v1, $v0, .L802404DC +/* CC3C58 80240448 4602D600 */ add.s $f24, $f26, $f2 +/* CC3C5C 8024044C 8E020000 */ lw $v0, ($s0) +/* CC3C60 80240450 30420008 */ andi $v0, $v0, 8 +/* CC3C64 80240454 10400009 */ beqz $v0, .L8024047C +/* CC3C68 80240458 27A50028 */ addiu $a1, $sp, 0x28 +/* CC3C6C 8024045C C600003C */ lwc1 $f0, 0x3c($s0) +/* CC3C70 80240460 4600C001 */ sub.s $f0, $f24, $f0 +/* CC3C74 80240464 4600B03C */ c.lt.s $f22, $f0 +/* CC3C78 80240468 00000000 */ nop +/* CC3C7C 8024046C 4500001B */ bc1f .L802404DC +/* CC3C80 80240470 34820010 */ ori $v0, $a0, 0x10 +/* CC3C84 80240474 08090137 */ j .L802404DC +/* CC3C88 80240478 AE22006C */ sw $v0, 0x6c($s1) +.L8024047C: +/* CC3C8C 8024047C 27A6002C */ addiu $a2, $sp, 0x2c +/* CC3C90 80240480 C6000038 */ lwc1 $f0, 0x38($s0) +/* CC3C94 80240484 C602003C */ lwc1 $f2, 0x3c($s0) +/* CC3C98 80240488 C6040040 */ lwc1 $f4, 0x40($s0) +/* CC3C9C 8024048C 3C01447A */ lui $at, 0x447a +/* CC3CA0 80240490 44813000 */ mtc1 $at, $f6 +/* CC3CA4 80240494 27A20034 */ addiu $v0, $sp, 0x34 +/* CC3CA8 80240498 E7A00028 */ swc1 $f0, 0x28($sp) +/* CC3CAC 8024049C E7A2002C */ swc1 $f2, 0x2c($sp) +/* CC3CB0 802404A0 E7A40030 */ swc1 $f4, 0x30($sp) +/* CC3CB4 802404A4 E7A60034 */ swc1 $f6, 0x34($sp) +/* CC3CB8 802404A8 AFA20010 */ sw $v0, 0x10($sp) +/* CC3CBC 802404AC 8E040080 */ lw $a0, 0x80($s0) +/* CC3CC0 802404B0 0C0372DF */ jal func_800DCB7C +/* CC3CC4 802404B4 27A70030 */ addiu $a3, $sp, 0x30 +/* CC3CC8 802404B8 C7A00034 */ lwc1 $f0, 0x34($sp) +/* CC3CCC 802404BC 4600D001 */ sub.s $f0, $f26, $f0 +/* CC3CD0 802404C0 4600B03C */ c.lt.s $f22, $f0 +/* CC3CD4 802404C4 00000000 */ nop +/* CC3CD8 802404C8 45000004 */ bc1f .L802404DC +/* CC3CDC 802404CC 00000000 */ nop +/* CC3CE0 802404D0 8E22006C */ lw $v0, 0x6c($s1) +/* CC3CE4 802404D4 34420010 */ ori $v0, $v0, 0x10 +/* CC3CE8 802404D8 AE22006C */ sw $v0, 0x6c($s1) +.L802404DC: +/* CC3CEC 802404DC 8E22006C */ lw $v0, 0x6c($s1) +/* CC3CF0 802404E0 24030011 */ addiu $v1, $zero, 0x11 +/* CC3CF4 802404E4 30420011 */ andi $v0, $v0, 0x11 +/* CC3CF8 802404E8 14430039 */ bne $v0, $v1, .L802405D0 +/* CC3CFC 802404EC 00000000 */ nop +/* CC3D00 802404F0 8E020000 */ lw $v0, ($s0) +/* CC3D04 802404F4 30420008 */ andi $v0, $v0, 8 +/* CC3D08 802404F8 1040000A */ beqz $v0, .L80240524 +/* CC3D0C 802404FC 4600C106 */ mov.s $f4, $f24 +/* CC3D10 80240500 4614C081 */ sub.s $f2, $f24, $f20 +/* CC3D14 80240504 3C018024 */ lui $at, 0x8024 +/* CC3D18 80240508 D4207A38 */ ldc1 $f0, 0x7a38($at) +/* CC3D1C 8024050C 460010A1 */ cvt.d.s $f2, $f2 +/* CC3D20 80240510 46201082 */ mul.d $f2, $f2, $f0 +/* CC3D24 80240514 00000000 */ nop +/* CC3D28 80240518 4600A021 */ cvt.d.s $f0, $f20 +/* CC3D2C 8024051C 08090162 */ j .L80240588 +/* CC3D30 80240520 46220000 */ add.d $f0, $f0, $f2 +.L80240524: +/* CC3D34 80240524 27A50028 */ addiu $a1, $sp, 0x28 +/* CC3D38 80240528 27A6002C */ addiu $a2, $sp, 0x2c +/* CC3D3C 8024052C C6000038 */ lwc1 $f0, 0x38($s0) +/* CC3D40 80240530 C6020040 */ lwc1 $f2, 0x40($s0) +/* CC3D44 80240534 3C01447A */ lui $at, 0x447a +/* CC3D48 80240538 44812000 */ mtc1 $at, $f4 +/* CC3D4C 8024053C 27A20034 */ addiu $v0, $sp, 0x34 +/* CC3D50 80240540 E7B4002C */ swc1 $f20, 0x2c($sp) +/* CC3D54 80240544 E7A00028 */ swc1 $f0, 0x28($sp) +/* CC3D58 80240548 E7A20030 */ swc1 $f2, 0x30($sp) +/* CC3D5C 8024054C E7A40034 */ swc1 $f4, 0x34($sp) +/* CC3D60 80240550 AFA20010 */ sw $v0, 0x10($sp) +/* CC3D64 80240554 8E040080 */ lw $a0, 0x80($s0) +/* CC3D68 80240558 0C0372DF */ jal func_800DCB7C +/* CC3D6C 8024055C 27A70030 */ addiu $a3, $sp, 0x30 +/* CC3D70 80240560 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* CC3D74 80240564 461A2100 */ add.s $f4, $f4, $f26 +/* CC3D78 80240568 46142081 */ sub.s $f2, $f4, $f20 +/* CC3D7C 8024056C 3C018024 */ lui $at, 0x8024 +/* CC3D80 80240570 D4207A40 */ ldc1 $f0, 0x7a40($at) +/* CC3D84 80240574 460010A1 */ cvt.d.s $f2, $f2 +/* CC3D88 80240578 46201082 */ mul.d $f2, $f2, $f0 +/* CC3D8C 8024057C 00000000 */ nop +/* CC3D90 80240580 4600A021 */ cvt.d.s $f0, $f20 +/* CC3D94 80240584 46220000 */ add.d $f0, $f0, $f2 +.L80240588: +/* CC3D98 80240588 46200020 */ cvt.s.d $f0, $f0 +/* CC3D9C 8024058C E600003C */ swc1 $f0, 0x3c($s0) +/* CC3DA0 80240590 C600003C */ lwc1 $f0, 0x3c($s0) +/* CC3DA4 80240594 46002001 */ sub.s $f0, $f4, $f0 +/* CC3DA8 80240598 3C013FF0 */ lui $at, 0x3ff0 +/* CC3DAC 8024059C 44811800 */ mtc1 $at, $f3 +/* CC3DB0 802405A0 44801000 */ mtc1 $zero, $f2 +/* CC3DB4 802405A4 46000005 */ abs.s $f0, $f0 +/* CC3DB8 802405A8 46000021 */ cvt.d.s $f0, $f0 +/* CC3DBC 802405AC 4622003C */ c.lt.d $f0, $f2 +/* CC3DC0 802405B0 00000000 */ nop +/* CC3DC4 802405B4 45000036 */ bc1f .L80240690 +/* CC3DC8 802405B8 2403FFEF */ addiu $v1, $zero, -0x11 +/* CC3DCC 802405BC E604003C */ swc1 $f4, 0x3c($s0) +/* CC3DD0 802405C0 8E22006C */ lw $v0, 0x6c($s1) +/* CC3DD4 802405C4 00431024 */ and $v0, $v0, $v1 +/* CC3DD8 802405C8 080901A4 */ j .L80240690 +/* CC3DDC 802405CC AE22006C */ sw $v0, 0x6c($s1) +.L802405D0: +/* CC3DE0 802405D0 8E220070 */ lw $v0, 0x70($s1) +/* CC3DE4 802405D4 1840002E */ blez $v0, .L80240690 +/* CC3DE8 802405D8 00000000 */ nop +/* CC3DEC 802405DC C62C0074 */ lwc1 $f12, 0x74($s1) +/* CC3DF0 802405E0 0C00A8BB */ jal sin_deg +/* CC3DF4 802405E4 46806320 */ cvt.s.w $f12, $f12 +/* CC3DF8 802405E8 8E020000 */ lw $v0, ($s0) +/* CC3DFC 802405EC 30420008 */ andi $v0, $v0, 8 +/* CC3E00 802405F0 10400003 */ beqz $v0, .L80240600 +/* CC3E04 802405F4 46000506 */ mov.s $f20, $f0 +/* CC3E08 802405F8 08090190 */ j .L80240640 +/* CC3E0C 802405FC 0000102D */ daddu $v0, $zero, $zero +.L80240600: +/* CC3E10 80240600 27A50028 */ addiu $a1, $sp, 0x28 +/* CC3E14 80240604 27A6002C */ addiu $a2, $sp, 0x2c +/* CC3E18 80240608 C6000038 */ lwc1 $f0, 0x38($s0) +/* CC3E1C 8024060C C602003C */ lwc1 $f2, 0x3c($s0) +/* CC3E20 80240610 C6040040 */ lwc1 $f4, 0x40($s0) +/* CC3E24 80240614 3C01447A */ lui $at, 0x447a +/* CC3E28 80240618 44813000 */ mtc1 $at, $f6 +/* CC3E2C 8024061C 27A20034 */ addiu $v0, $sp, 0x34 +/* CC3E30 80240620 E7A00028 */ swc1 $f0, 0x28($sp) +/* CC3E34 80240624 E7A2002C */ swc1 $f2, 0x2c($sp) +/* CC3E38 80240628 E7A40030 */ swc1 $f4, 0x30($sp) +/* CC3E3C 8024062C E7A60034 */ swc1 $f6, 0x34($sp) +/* CC3E40 80240630 AFA20010 */ sw $v0, 0x10($sp) +/* CC3E44 80240634 8E040080 */ lw $a0, 0x80($s0) +/* CC3E48 80240638 0C0372DF */ jal func_800DCB7C +/* CC3E4C 8024063C 27A70030 */ addiu $a3, $sp, 0x30 +.L80240640: +/* CC3E50 80240640 10400007 */ beqz $v0, .L80240660 +/* CC3E54 80240644 00000000 */ nop +/* CC3E58 80240648 4616A082 */ mul.s $f2, $f20, $f22 +/* CC3E5C 8024064C 00000000 */ nop +/* CC3E60 80240650 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* CC3E64 80240654 461A0000 */ add.s $f0, $f0, $f26 +/* CC3E68 80240658 0809019B */ j .L8024066C +/* CC3E6C 8024065C 46020000 */ add.s $f0, $f0, $f2 +.L80240660: +/* CC3E70 80240660 4616A002 */ mul.s $f0, $f20, $f22 +/* CC3E74 80240664 00000000 */ nop +/* CC3E78 80240668 4600C000 */ add.s $f0, $f24, $f0 +.L8024066C: +/* CC3E7C 8024066C E600003C */ swc1 $f0, 0x3c($s0) +/* CC3E80 80240670 8E220074 */ lw $v0, 0x74($s1) +/* CC3E84 80240674 2442000A */ addiu $v0, $v0, 0xa +/* CC3E88 80240678 44826000 */ mtc1 $v0, $f12 +/* CC3E8C 8024067C 00000000 */ nop +/* CC3E90 80240680 0C00A6C9 */ jal clamp_angle +/* CC3E94 80240684 46806320 */ cvt.s.w $f12, $f12 +/* CC3E98 80240688 4600020D */ trunc.w.s $f8, $f0 +/* CC3E9C 8024068C E6280074 */ swc1 $f8, 0x74($s1) +.L80240690: +/* CC3EA0 80240690 8E220090 */ lw $v0, 0x90($s1) +/* CC3EA4 80240694 1C40004A */ bgtz $v0, .L802407C0 +/* CC3EA8 80240698 2442FFFF */ addiu $v0, $v0, -1 +/* CC3EAC 8024069C 8E430014 */ lw $v1, 0x14($s2) +/* CC3EB0 802406A0 04600048 */ bltz $v1, .L802407C4 +/* CC3EB4 802406A4 00000000 */ nop +/* CC3EB8 802406A8 8E620074 */ lw $v0, 0x74($s3) +/* CC3EBC 802406AC 1C400042 */ bgtz $v0, .L802407B8 +/* CC3EC0 802406B0 2442FFFF */ addiu $v0, $v0, -1 +/* CC3EC4 802406B4 AE630074 */ sw $v1, 0x74($s3) +/* CC3EC8 802406B8 860200A8 */ lh $v0, 0xa8($s0) +/* CC3ECC 802406BC C602003C */ lwc1 $f2, 0x3c($s0) +/* CC3ED0 802406C0 44820000 */ mtc1 $v0, $f0 +/* CC3ED4 802406C4 00000000 */ nop +/* CC3ED8 802406C8 46800020 */ cvt.s.w $f0, $f0 +/* CC3EDC 802406CC 46001080 */ add.s $f2, $f2, $f0 +/* CC3EE0 802406D0 3C014024 */ lui $at, 0x4024 +/* CC3EE4 802406D4 44810800 */ mtc1 $at, $f1 +/* CC3EE8 802406D8 44800000 */ mtc1 $zero, $f0 +/* CC3EEC 802406DC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CC3EF0 802406E0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CC3EF4 802406E4 460010A1 */ cvt.d.s $f2, $f2 +/* CC3EF8 802406E8 46201080 */ add.d $f2, $f2, $f0 +/* CC3EFC 802406EC C440002C */ lwc1 $f0, 0x2c($v0) +/* CC3F00 802406F0 46000021 */ cvt.d.s $f0, $f0 +/* CC3F04 802406F4 4622003C */ c.lt.d $f0, $f2 +/* CC3F08 802406F8 00000000 */ nop +/* CC3F0C 802406FC 4500002C */ bc1f .L802407B0 +/* CC3F10 80240700 02A0202D */ daddu $a0, $s5, $zero +/* CC3F14 80240704 AFA00010 */ sw $zero, 0x10($sp) +/* CC3F18 80240708 8E46000C */ lw $a2, 0xc($s2) +/* CC3F1C 8024070C 8E470010 */ lw $a3, 0x10($s2) +/* CC3F20 80240710 0C01242D */ jal func_800490B4 +/* CC3F24 80240714 0220282D */ daddu $a1, $s1, $zero +/* CC3F28 80240718 10400025 */ beqz $v0, .L802407B0 +/* CC3F2C 8024071C 0000202D */ daddu $a0, $zero, $zero +/* CC3F30 80240720 0200282D */ daddu $a1, $s0, $zero +/* CC3F34 80240724 0000302D */ daddu $a2, $zero, $zero +/* CC3F38 80240728 2412000C */ addiu $s2, $zero, 0xc +/* CC3F3C 8024072C 860300A8 */ lh $v1, 0xa8($s0) +/* CC3F40 80240730 3C013F80 */ lui $at, 0x3f80 +/* CC3F44 80240734 44810000 */ mtc1 $at, $f0 +/* CC3F48 80240738 3C014000 */ lui $at, 0x4000 +/* CC3F4C 8024073C 44811000 */ mtc1 $at, $f2 +/* CC3F50 80240740 3C01C1A0 */ lui $at, 0xc1a0 +/* CC3F54 80240744 44812000 */ mtc1 $at, $f4 +/* CC3F58 80240748 44834000 */ mtc1 $v1, $f8 +/* CC3F5C 8024074C 00000000 */ nop +/* CC3F60 80240750 46804220 */ cvt.s.w $f8, $f8 +/* CC3F64 80240754 44074000 */ mfc1 $a3, $f8 +/* CC3F68 80240758 27A20038 */ addiu $v0, $sp, 0x38 +/* CC3F6C 8024075C AFB2001C */ sw $s2, 0x1c($sp) +/* CC3F70 80240760 AFA20020 */ sw $v0, 0x20($sp) +/* CC3F74 80240764 E7A00010 */ swc1 $f0, 0x10($sp) +/* CC3F78 80240768 E7A20014 */ swc1 $f2, 0x14($sp) +/* CC3F7C 8024076C 0C01BFA4 */ jal fx_emote +/* CC3F80 80240770 E7A40018 */ swc1 $f4, 0x18($sp) +/* CC3F84 80240774 0200202D */ daddu $a0, $s0, $zero +/* CC3F88 80240778 240502F4 */ addiu $a1, $zero, 0x2f4 +/* CC3F8C 8024077C C480003C */ lwc1 $f0, 0x3c($a0) +/* CC3F90 80240780 3C060020 */ lui $a2, 0x20 +/* CC3F94 80240784 0C012530 */ jal func_800494C0 +/* CC3F98 80240788 E4800064 */ swc1 $f0, 0x64($a0) +/* CC3F9C 8024078C 8E220018 */ lw $v0, 0x18($s1) +/* CC3FA0 80240790 9442002A */ lhu $v0, 0x2a($v0) +/* CC3FA4 80240794 30420001 */ andi $v0, $v0, 1 +/* CC3FA8 80240798 10400003 */ beqz $v0, .L802407A8 +/* CC3FAC 8024079C 2402000A */ addiu $v0, $zero, 0xa +/* CC3FB0 802407A0 0809025A */ j .L80240968 +/* CC3FB4 802407A4 AE620070 */ sw $v0, 0x70($s3) +.L802407A8: +/* CC3FB8 802407A8 0809025A */ j .L80240968 +/* CC3FBC 802407AC AE720070 */ sw $s2, 0x70($s3) +.L802407B0: +/* CC3FC0 802407B0 8E620074 */ lw $v0, 0x74($s3) +/* CC3FC4 802407B4 2442FFFF */ addiu $v0, $v0, -1 +.L802407B8: +/* CC3FC8 802407B8 080901F1 */ j .L802407C4 +/* CC3FCC 802407BC AE620074 */ sw $v0, 0x74($s3) +.L802407C0: +/* CC3FD0 802407C0 AE220090 */ sw $v0, 0x90($s1) +.L802407C4: +/* CC3FD4 802407C4 8E2300D0 */ lw $v1, 0xd0($s1) +/* CC3FD8 802407C8 C6000040 */ lwc1 $f0, 0x40($s0) +/* CC3FDC 802407CC C4620000 */ lwc1 $f2, ($v1) +/* CC3FE0 802407D0 468010A0 */ cvt.s.w $f2, $f2 +/* CC3FE4 802407D4 C4640008 */ lwc1 $f4, 8($v1) +/* CC3FE8 802407D8 46802120 */ cvt.s.w $f4, $f4 +/* CC3FEC 802407DC E7A00010 */ swc1 $f0, 0x10($sp) +/* CC3FF0 802407E0 8E2200D0 */ lw $v0, 0xd0($s1) +/* CC3FF4 802407E4 44051000 */ mfc1 $a1, $f2 +/* CC3FF8 802407E8 C440000C */ lwc1 $f0, 0xc($v0) +/* CC3FFC 802407EC 46800020 */ cvt.s.w $f0, $f0 +/* CC4000 802407F0 E7A00014 */ swc1 $f0, 0x14($sp) +/* CC4004 802407F4 8E2200D0 */ lw $v0, 0xd0($s1) +/* CC4008 802407F8 44062000 */ mfc1 $a2, $f4 +/* CC400C 802407FC C4400010 */ lwc1 $f0, 0x10($v0) +/* CC4010 80240800 46800020 */ cvt.s.w $f0, $f0 +/* CC4014 80240804 E7A00018 */ swc1 $f0, 0x18($sp) +/* CC4018 80240808 8C640018 */ lw $a0, 0x18($v1) +/* CC401C 8024080C 0C0123F5 */ jal is_point_within_region +/* CC4020 80240810 8E070038 */ lw $a3, 0x38($s0) +/* CC4024 80240814 1040001A */ beqz $v0, .L80240880 +/* CC4028 80240818 00000000 */ nop +/* CC402C 8024081C 8E060038 */ lw $a2, 0x38($s0) +/* CC4030 80240820 8E2200D0 */ lw $v0, 0xd0($s1) +/* CC4034 80240824 8E070040 */ lw $a3, 0x40($s0) +/* CC4038 80240828 C44C0000 */ lwc1 $f12, ($v0) +/* CC403C 8024082C 46806320 */ cvt.s.w $f12, $f12 +/* CC4040 80240830 C44E0008 */ lwc1 $f14, 8($v0) +/* CC4044 80240834 0C00A7B5 */ jal dist2D +/* CC4048 80240838 468073A0 */ cvt.s.w $f14, $f14 +/* CC404C 8024083C C6020018 */ lwc1 $f2, 0x18($s0) +/* CC4050 80240840 4600103C */ c.lt.s $f2, $f0 +/* CC4054 80240844 00000000 */ nop +/* CC4058 80240848 4500000D */ bc1f .L80240880 +/* CC405C 8024084C E7A00034 */ swc1 $f0, 0x34($sp) +/* CC4060 80240850 C60C0038 */ lwc1 $f12, 0x38($s0) +/* CC4064 80240854 8E2200D0 */ lw $v0, 0xd0($s1) +/* CC4068 80240858 C60E0040 */ lwc1 $f14, 0x40($s0) +/* CC406C 8024085C C4480000 */ lwc1 $f8, ($v0) +/* CC4070 80240860 46804220 */ cvt.s.w $f8, $f8 +/* CC4074 80240864 44064000 */ mfc1 $a2, $f8 +/* CC4078 80240868 C4480008 */ lwc1 $f8, 8($v0) +/* CC407C 8024086C 46804220 */ cvt.s.w $f8, $f8 +/* CC4080 80240870 44074000 */ mfc1 $a3, $f8 +/* CC4084 80240874 0C00A720 */ jal atan2 +/* CC4088 80240878 24140001 */ addiu $s4, $zero, 1 +/* CC408C 8024087C E600000C */ swc1 $f0, 0xc($s0) +.L80240880: +/* CC4090 80240880 8E2200D0 */ lw $v0, 0xd0($s1) +/* CC4094 80240884 8C43000C */ lw $v1, 0xc($v0) +/* CC4098 80240888 8C420010 */ lw $v0, 0x10($v0) +/* CC409C 8024088C 00621825 */ or $v1, $v1, $v0 +/* CC40A0 80240890 00741825 */ or $v1, $v1, $s4 +/* CC40A4 80240894 10600008 */ beqz $v1, .L802408B8 +/* CC40A8 80240898 00000000 */ nop +/* CC40AC 8024089C 8602008C */ lh $v0, 0x8c($s0) +/* CC40B0 802408A0 14400031 */ bnez $v0, .L80240968 +/* CC40B4 802408A4 00000000 */ nop +/* CC40B8 802408A8 8E050018 */ lw $a1, 0x18($s0) +/* CC40BC 802408AC 8E06000C */ lw $a2, 0xc($s0) +/* CC40C0 802408B0 0C00EA95 */ jal npc_move_heading +/* CC40C4 802408B4 0200202D */ daddu $a0, $s0, $zero +.L802408B8: +/* CC40C8 802408B8 C600003C */ lwc1 $f0, 0x3c($s0) +/* CC40CC 802408BC 3C014059 */ lui $at, 0x4059 +/* CC40D0 802408C0 44811800 */ mtc1 $at, $f3 +/* CC40D4 802408C4 44801000 */ mtc1 $zero, $f2 +/* CC40D8 802408C8 46000021 */ cvt.d.s $f0, $f0 +/* CC40DC 802408CC 46220002 */ mul.d $f0, $f0, $f2 +/* CC40E0 802408D0 00000000 */ nop +/* CC40E4 802408D4 4620020D */ trunc.w.d $f8, $f0 +/* CC40E8 802408D8 E628007C */ swc1 $f8, 0x7c($s1) +/* CC40EC 802408DC 8E420004 */ lw $v0, 4($s2) +/* CC40F0 802408E0 18400021 */ blez $v0, .L80240968 +/* CC40F4 802408E4 00000000 */ nop +/* CC40F8 802408E8 8602008E */ lh $v0, 0x8e($s0) +/* CC40FC 802408EC 9603008E */ lhu $v1, 0x8e($s0) +/* CC4100 802408F0 18400005 */ blez $v0, .L80240908 +/* CC4104 802408F4 2462FFFF */ addiu $v0, $v1, -1 +/* CC4108 802408F8 A602008E */ sh $v0, 0x8e($s0) +/* CC410C 802408FC 00021400 */ sll $v0, $v0, 0x10 +/* CC4110 80240900 1C400019 */ bgtz $v0, .L80240968 +/* CC4114 80240904 00000000 */ nop +.L80240908: +/* CC4118 80240908 240403E8 */ addiu $a0, $zero, 0x3e8 +/* CC411C 8024090C 24020002 */ addiu $v0, $zero, 2 +/* CC4120 80240910 0C00A67F */ jal rand_int +/* CC4124 80240914 AE620070 */ sw $v0, 0x70($s3) +/* CC4128 80240918 3C035555 */ lui $v1, 0x5555 +/* CC412C 8024091C 34635556 */ ori $v1, $v1, 0x5556 +/* CC4130 80240920 00430018 */ mult $v0, $v1 +/* CC4134 80240924 000227C3 */ sra $a0, $v0, 0x1f +/* CC4138 80240928 00004010 */ mfhi $t0 +/* CC413C 8024092C 01042023 */ subu $a0, $t0, $a0 +/* CC4140 80240930 00041840 */ sll $v1, $a0, 1 +/* CC4144 80240934 00641821 */ addu $v1, $v1, $a0 +/* CC4148 80240938 00431023 */ subu $v0, $v0, $v1 +/* CC414C 8024093C 24430002 */ addiu $v1, $v0, 2 +/* CC4150 80240940 AE630074 */ sw $v1, 0x74($s3) +/* CC4154 80240944 8E42002C */ lw $v0, 0x2c($s2) +/* CC4158 80240948 58400007 */ blezl $v0, .L80240968 +/* CC415C 8024094C AE600070 */ sw $zero, 0x70($s3) +/* CC4160 80240950 8E420008 */ lw $v0, 8($s2) +/* CC4164 80240954 18400003 */ blez $v0, .L80240964 +/* CC4168 80240958 28620003 */ slti $v0, $v1, 3 +/* CC416C 8024095C 10400002 */ beqz $v0, .L80240968 +/* CC4170 80240960 00000000 */ nop +.L80240964: +/* CC4174 80240964 AE600070 */ sw $zero, 0x70($s3) +.L80240968: +/* CC4178 80240968 8FBF0058 */ lw $ra, 0x58($sp) +/* CC417C 8024096C 8FB50054 */ lw $s5, 0x54($sp) +/* CC4180 80240970 8FB40050 */ lw $s4, 0x50($sp) +/* CC4184 80240974 8FB3004C */ lw $s3, 0x4c($sp) +/* CC4188 80240978 8FB20048 */ lw $s2, 0x48($sp) +/* CC418C 8024097C 8FB10044 */ lw $s1, 0x44($sp) +/* CC4190 80240980 8FB00040 */ lw $s0, 0x40($sp) +/* CC4194 80240984 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* CC4198 80240988 D7B80070 */ ldc1 $f24, 0x70($sp) +/* CC419C 8024098C D7B60068 */ ldc1 $f22, 0x68($sp) +/* CC41A0 80240990 D7B40060 */ ldc1 $f20, 0x60($sp) +/* CC41A4 80240994 03E00008 */ jr $ra +/* CC41A8 80240998 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C.s deleted file mode 100644 index dcaa57979e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024099C -/* CC41AC 8024099C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CC41B0 802409A0 AFB3001C */ sw $s3, 0x1c($sp) -/* CC41B4 802409A4 0080982D */ daddu $s3, $a0, $zero -/* CC41B8 802409A8 AFBF0020 */ sw $ra, 0x20($sp) -/* CC41BC 802409AC AFB20018 */ sw $s2, 0x18($sp) -/* CC41C0 802409B0 AFB10014 */ sw $s1, 0x14($sp) -/* CC41C4 802409B4 AFB00010 */ sw $s0, 0x10($sp) -/* CC41C8 802409B8 8E720148 */ lw $s2, 0x148($s3) -/* CC41CC 802409BC 86440008 */ lh $a0, 8($s2) -/* CC41D0 802409C0 0C00EABB */ jal get_npc_unsafe -/* CC41D4 802409C4 00A0882D */ daddu $s1, $a1, $zero -/* CC41D8 802409C8 8E240008 */ lw $a0, 8($s1) -/* CC41DC 802409CC 0040802D */ daddu $s0, $v0, $zero -/* CC41E0 802409D0 00041FC2 */ srl $v1, $a0, 0x1f -/* CC41E4 802409D4 00832021 */ addu $a0, $a0, $v1 -/* CC41E8 802409D8 00042043 */ sra $a0, $a0, 1 -/* CC41EC 802409DC 0C00A67F */ jal rand_int -/* CC41F0 802409E0 24840001 */ addiu $a0, $a0, 1 -/* CC41F4 802409E4 8E230008 */ lw $v1, 8($s1) -/* CC41F8 802409E8 240400B4 */ addiu $a0, $zero, 0xb4 -/* CC41FC 802409EC 00032FC2 */ srl $a1, $v1, 0x1f -/* CC4200 802409F0 00651821 */ addu $v1, $v1, $a1 -/* CC4204 802409F4 00031843 */ sra $v1, $v1, 1 -/* CC4208 802409F8 00621821 */ addu $v1, $v1, $v0 -/* CC420C 802409FC 0C00A67F */ jal rand_int -/* CC4210 80240A00 A603008E */ sh $v1, 0x8e($s0) -/* CC4214 80240A04 C60C000C */ lwc1 $f12, 0xc($s0) -/* CC4218 80240A08 44820000 */ mtc1 $v0, $f0 -/* CC421C 80240A0C 00000000 */ nop -/* CC4220 80240A10 46800020 */ cvt.s.w $f0, $f0 -/* CC4224 80240A14 46006300 */ add.s $f12, $f12, $f0 -/* CC4228 80240A18 3C0142B4 */ lui $at, 0x42b4 -/* CC422C 80240A1C 44810000 */ mtc1 $at, $f0 -/* CC4230 80240A20 0C00A6C9 */ jal clamp_angle -/* CC4234 80240A24 46006301 */ sub.s $f12, $f12, $f0 -/* CC4238 80240A28 E600000C */ swc1 $f0, 0xc($s0) -/* CC423C 80240A2C 8E4200CC */ lw $v0, 0xcc($s2) -/* CC4240 80240A30 8C420000 */ lw $v0, ($v0) -/* CC4244 80240A34 AE020028 */ sw $v0, 0x28($s0) -/* CC4248 80240A38 24020003 */ addiu $v0, $zero, 3 -/* CC424C 80240A3C AE620070 */ sw $v0, 0x70($s3) -/* CC4250 80240A40 8FBF0020 */ lw $ra, 0x20($sp) -/* CC4254 80240A44 8FB3001C */ lw $s3, 0x1c($sp) -/* CC4258 80240A48 8FB20018 */ lw $s2, 0x18($sp) -/* CC425C 80240A4C 8FB10014 */ lw $s1, 0x14($sp) -/* CC4260 80240A50 8FB00010 */ lw $s0, 0x10($sp) -/* CC4264 80240A54 03E00008 */ jr $ra -/* CC4268 80240A58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s new file mode 100644 index 0000000000..c47bfff171 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024099C_CC41AC.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024099C_CC41AC +/* CC41AC 8024099C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* CC41B0 802409A0 AFB3001C */ sw $s3, 0x1c($sp) +/* CC41B4 802409A4 0080982D */ daddu $s3, $a0, $zero +/* CC41B8 802409A8 AFBF0020 */ sw $ra, 0x20($sp) +/* CC41BC 802409AC AFB20018 */ sw $s2, 0x18($sp) +/* CC41C0 802409B0 AFB10014 */ sw $s1, 0x14($sp) +/* CC41C4 802409B4 AFB00010 */ sw $s0, 0x10($sp) +/* CC41C8 802409B8 8E720148 */ lw $s2, 0x148($s3) +/* CC41CC 802409BC 86440008 */ lh $a0, 8($s2) +/* CC41D0 802409C0 0C00EABB */ jal get_npc_unsafe +/* CC41D4 802409C4 00A0882D */ daddu $s1, $a1, $zero +/* CC41D8 802409C8 8E240008 */ lw $a0, 8($s1) +/* CC41DC 802409CC 0040802D */ daddu $s0, $v0, $zero +/* CC41E0 802409D0 00041FC2 */ srl $v1, $a0, 0x1f +/* CC41E4 802409D4 00832021 */ addu $a0, $a0, $v1 +/* CC41E8 802409D8 00042043 */ sra $a0, $a0, 1 +/* CC41EC 802409DC 0C00A67F */ jal rand_int +/* CC41F0 802409E0 24840001 */ addiu $a0, $a0, 1 +/* CC41F4 802409E4 8E230008 */ lw $v1, 8($s1) +/* CC41F8 802409E8 240400B4 */ addiu $a0, $zero, 0xb4 +/* CC41FC 802409EC 00032FC2 */ srl $a1, $v1, 0x1f +/* CC4200 802409F0 00651821 */ addu $v1, $v1, $a1 +/* CC4204 802409F4 00031843 */ sra $v1, $v1, 1 +/* CC4208 802409F8 00621821 */ addu $v1, $v1, $v0 +/* CC420C 802409FC 0C00A67F */ jal rand_int +/* CC4210 80240A00 A603008E */ sh $v1, 0x8e($s0) +/* CC4214 80240A04 C60C000C */ lwc1 $f12, 0xc($s0) +/* CC4218 80240A08 44820000 */ mtc1 $v0, $f0 +/* CC421C 80240A0C 00000000 */ nop +/* CC4220 80240A10 46800020 */ cvt.s.w $f0, $f0 +/* CC4224 80240A14 46006300 */ add.s $f12, $f12, $f0 +/* CC4228 80240A18 3C0142B4 */ lui $at, 0x42b4 +/* CC422C 80240A1C 44810000 */ mtc1 $at, $f0 +/* CC4230 80240A20 0C00A6C9 */ jal clamp_angle +/* CC4234 80240A24 46006301 */ sub.s $f12, $f12, $f0 +/* CC4238 80240A28 E600000C */ swc1 $f0, 0xc($s0) +/* CC423C 80240A2C 8E4200CC */ lw $v0, 0xcc($s2) +/* CC4240 80240A30 8C420000 */ lw $v0, ($v0) +/* CC4244 80240A34 AE020028 */ sw $v0, 0x28($s0) +/* CC4248 80240A38 24020003 */ addiu $v0, $zero, 3 +/* CC424C 80240A3C AE620070 */ sw $v0, 0x70($s3) +/* CC4250 80240A40 8FBF0020 */ lw $ra, 0x20($sp) +/* CC4254 80240A44 8FB3001C */ lw $s3, 0x1c($sp) +/* CC4258 80240A48 8FB20018 */ lw $s2, 0x18($sp) +/* CC425C 80240A4C 8FB10014 */ lw $s1, 0x14($sp) +/* CC4260 80240A50 8FB00010 */ lw $s0, 0x10($sp) +/* CC4264 80240A54 03E00008 */ jr $ra +/* CC4268 80240A58 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s index 550fffcbee..943bf90760 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802414D0_CC4CE0.s @@ -46,7 +46,7 @@ glabel func_802414D0_CC4CE0 /* CC4D84 80241574 02A0202D */ daddu $a0, $s5, $zero /* CC4D88 80241578 0240282D */ daddu $a1, $s2, $zero /* CC4D8C 8024157C 0280302D */ daddu $a2, $s4, $zero -/* CC4D90 80241580 0C0904EB */ jal func_802413AC +/* CC4D90 80241580 0C0904EB */ jal func_802413AC_CC4BBC /* CC4D94 80241584 0200382D */ daddu $a3, $s0, $zero .L80241588: /* CC4D98 80241588 2402FFFE */ addiu $v0, $zero, -2 @@ -73,31 +73,31 @@ glabel func_802414D0_CC4CE0 /* CC4DE8 802415D8 00000000 */ nop /* CC4DEC 802415DC 0280202D */ daddu $a0, $s4, $zero /* CC4DF0 802415E0 0200282D */ daddu $a1, $s0, $zero -/* CC4DF4 802415E4 0C090071 */ jal func_802401C4 +/* CC4DF4 802415E4 0C090071 */ jal func_802401C4_CC39D4 /* CC4DF8 802415E8 0260302D */ daddu $a2, $s3, $zero /* CC4DFC 802415EC 0280202D */ daddu $a0, $s4, $zero /* CC4E00 802415F0 0200282D */ daddu $a1, $s0, $zero -/* CC4E04 802415F4 0C0900DD */ jal func_80240374 +/* CC4E04 802415F4 0C0900DD */ jal func_80240374_CC3B84 /* CC4E08 802415F8 0260302D */ daddu $a2, $s3, $zero /* CC4E0C 802415FC 080905A6 */ j .L80241698 /* CC4E10 80241600 0000102D */ daddu $v0, $zero, $zero /* CC4E14 80241604 0280202D */ daddu $a0, $s4, $zero /* CC4E18 80241608 0200282D */ daddu $a1, $s0, $zero -/* CC4E1C 8024160C 0C090267 */ jal func_8024099C +/* CC4E1C 8024160C 0C090267 */ jal func_8024099C_CC41AC /* CC4E20 80241610 0260302D */ daddu $a2, $s3, $zero /* CC4E24 80241614 0280202D */ daddu $a0, $s4, $zero /* CC4E28 80241618 0200282D */ daddu $a1, $s0, $zero -/* CC4E2C 8024161C 0C090297 */ jal func_80240A5C +/* CC4E2C 8024161C 0C090297 */ jal func_80240A5C_CC426C /* CC4E30 80241620 0260302D */ daddu $a2, $s3, $zero /* CC4E34 80241624 080905A6 */ j .L80241698 /* CC4E38 80241628 0000102D */ daddu $v0, $zero, $zero /* CC4E3C 8024162C 0280202D */ daddu $a0, $s4, $zero /* CC4E40 80241630 0200282D */ daddu $a1, $s0, $zero -/* CC4E44 80241634 0C090368 */ jal func_80240DA0 +/* CC4E44 80241634 0C090368 */ jal func_80240DA0_CC45B0 /* CC4E48 80241638 0260302D */ daddu $a2, $s3, $zero /* CC4E4C 8024163C 0280202D */ daddu $a0, $s4, $zero /* CC4E50 80241640 0200282D */ daddu $a1, $s0, $zero -/* CC4E54 80241644 0C090386 */ jal func_80240E18 +/* CC4E54 80241644 0C090386 */ jal func_80240E18_CC4628 /* CC4E58 80241648 0260302D */ daddu $a2, $s3, $zero /* CC4E5C 8024164C 080905A6 */ j .L80241698 /* CC4E60 80241650 0000102D */ daddu $v0, $zero, $zero @@ -109,13 +109,13 @@ glabel func_802414D0_CC4CE0 /* CC4E78 80241668 0000102D */ daddu $v0, $zero, $zero /* CC4E7C 8024166C 0280202D */ daddu $a0, $s4, $zero /* CC4E80 80241670 0200282D */ daddu $a1, $s0, $zero -/* CC4E84 80241674 0C0903EE */ jal func_80240FB8 +/* CC4E84 80241674 0C0903EE */ jal func_80240FB8_CC47C8 /* CC4E88 80241678 0260302D */ daddu $a2, $s3, $zero /* CC4E8C 8024167C 080905A6 */ j .L80241698 /* CC4E90 80241680 0000102D */ daddu $v0, $zero, $zero /* CC4E94 80241684 0280202D */ daddu $a0, $s4, $zero /* CC4E98 80241688 0200282D */ daddu $a1, $s0, $zero -/* CC4E9C 8024168C 0C090407 */ jal func_8024101C +/* CC4E9C 8024168C 0C090407 */ jal func_8024101C_CC482C /* CC4EA0 80241690 0260302D */ daddu $a2, $s3, $zero .L80241694: /* CC4EA4 80241694 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704.s deleted file mode 100644 index 5d11c2317f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704.s +++ /dev/null @@ -1,295 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241704 -/* CC4F14 80241704 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CC4F18 80241708 AFB20048 */ sw $s2, 0x48($sp) -/* CC4F1C 8024170C 0080902D */ daddu $s2, $a0, $zero -/* CC4F20 80241710 AFBF0064 */ sw $ra, 0x64($sp) -/* CC4F24 80241714 AFBE0060 */ sw $fp, 0x60($sp) -/* CC4F28 80241718 AFB7005C */ sw $s7, 0x5c($sp) -/* CC4F2C 8024171C AFB60058 */ sw $s6, 0x58($sp) -/* CC4F30 80241720 AFB50054 */ sw $s5, 0x54($sp) -/* CC4F34 80241724 AFB40050 */ sw $s4, 0x50($sp) -/* CC4F38 80241728 AFB3004C */ sw $s3, 0x4c($sp) -/* CC4F3C 8024172C AFB10044 */ sw $s1, 0x44($sp) -/* CC4F40 80241730 AFB00040 */ sw $s0, 0x40($sp) -/* CC4F44 80241734 F7BA0080 */ sdc1 $f26, 0x80($sp) -/* CC4F48 80241738 F7B80078 */ sdc1 $f24, 0x78($sp) -/* CC4F4C 8024173C F7B60070 */ sdc1 $f22, 0x70($sp) -/* CC4F50 80241740 F7B40068 */ sdc1 $f20, 0x68($sp) -/* CC4F54 80241744 8E510148 */ lw $s1, 0x148($s2) -/* CC4F58 80241748 00A0B82D */ daddu $s7, $a1, $zero -/* CC4F5C 8024174C 86240008 */ lh $a0, 8($s1) -/* CC4F60 80241750 0C00EABB */ jal get_npc_unsafe -/* CC4F64 80241754 00C0F02D */ daddu $fp, $a2, $zero -/* CC4F68 80241758 C620007C */ lwc1 $f0, 0x7c($s1) -/* CC4F6C 8024175C 46800020 */ cvt.s.w $f0, $f0 -/* CC4F70 80241760 46000021 */ cvt.d.s $f0, $f0 -/* CC4F74 80241764 0040802D */ daddu $s0, $v0, $zero -/* CC4F78 80241768 3C014059 */ lui $at, 0x4059 -/* CC4F7C 8024176C 44813800 */ mtc1 $at, $f7 -/* CC4F80 80241770 44803000 */ mtc1 $zero, $f6 -/* CC4F84 80241774 8602008E */ lh $v0, 0x8e($s0) -/* CC4F88 80241778 9603008E */ lhu $v1, 0x8e($s0) -/* CC4F8C 8024177C 46260003 */ div.d $f0, $f0, $f6 -/* CC4F90 80241780 462005A0 */ cvt.s.d $f22, $f0 -/* CC4F94 80241784 C6200078 */ lwc1 $f0, 0x78($s1) -/* CC4F98 80241788 46800020 */ cvt.s.w $f0, $f0 -/* CC4F9C 8024178C 46000021 */ cvt.d.s $f0, $f0 -/* CC4FA0 80241790 46260003 */ div.d $f0, $f0, $f6 -/* CC4FA4 80241794 18400003 */ blez $v0, .L802417A4 -/* CC4FA8 80241798 46200620 */ cvt.s.d $f24, $f0 -/* CC4FAC 8024179C 2462FFFF */ addiu $v0, $v1, -1 -/* CC4FB0 802417A0 A602008E */ sh $v0, 0x8e($s0) -.L802417A4: -/* CC4FB4 802417A4 27B40028 */ addiu $s4, $sp, 0x28 -/* CC4FB8 802417A8 0280282D */ daddu $a1, $s4, $zero -/* CC4FBC 802417AC 27B5002C */ addiu $s5, $sp, 0x2c -/* CC4FC0 802417B0 02A0302D */ daddu $a2, $s5, $zero -/* CC4FC4 802417B4 27B60030 */ addiu $s6, $sp, 0x30 -/* CC4FC8 802417B8 02C0382D */ daddu $a3, $s6, $zero -/* CC4FCC 802417BC C6000038 */ lwc1 $f0, 0x38($s0) -/* CC4FD0 802417C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC4FD4 802417C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC4FD8 802417C8 3C01447A */ lui $at, 0x447a -/* CC4FDC 802417CC 4481D000 */ mtc1 $at, $f26 -/* CC4FE0 802417D0 27B30034 */ addiu $s3, $sp, 0x34 -/* CC4FE4 802417D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC4FE8 802417D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CC4FEC 802417DC E7A40030 */ swc1 $f4, 0x30($sp) -/* CC4FF0 802417E0 E7BA0034 */ swc1 $f26, 0x34($sp) -/* CC4FF4 802417E4 C6340070 */ lwc1 $f20, 0x70($s1) -/* CC4FF8 802417E8 4680A520 */ cvt.s.w $f20, $f20 -/* CC4FFC 802417EC 4600A521 */ cvt.d.s $f20, $f20 -/* CC5000 802417F0 4626A503 */ div.d $f20, $f20, $f6 -/* CC5004 802417F4 AFB30010 */ sw $s3, 0x10($sp) -/* CC5008 802417F8 8E040080 */ lw $a0, 0x80($s0) -/* CC500C 802417FC 0C0372DF */ jal func_800DCB7C -/* CC5010 80241800 4620A520 */ cvt.s.d $f20, $f20 -/* CC5014 80241804 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CC5018 80241808 0C00A8BB */ jal sin_deg -/* CC501C 8024180C 46806320 */ cvt.s.w $f12, $f12 -/* CC5020 80241810 46140002 */ mul.s $f0, $f0, $f20 -/* CC5024 80241814 00000000 */ nop -/* CC5028 80241818 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* CC502C 8024181C 46181080 */ add.s $f2, $f2, $f24 -/* CC5030 80241820 46001080 */ add.s $f2, $f2, $f0 -/* CC5034 80241824 E602003C */ swc1 $f2, 0x3c($s0) -/* CC5038 80241828 8E220074 */ lw $v0, 0x74($s1) -/* CC503C 8024182C 2442000C */ addiu $v0, $v0, 0xc -/* CC5040 80241830 44826000 */ mtc1 $v0, $f12 -/* CC5044 80241834 00000000 */ nop -/* CC5048 80241838 0C00A6C9 */ jal clamp_angle -/* CC504C 8024183C 46806320 */ cvt.s.w $f12, $f12 -/* CC5050 80241840 4600020D */ trunc.w.s $f8, $f0 -/* CC5054 80241844 E6280074 */ swc1 $f8, 0x74($s1) -/* CC5058 80241848 8EE30014 */ lw $v1, 0x14($s7) -/* CC505C 8024184C 0460003C */ bltz $v1, .L80241940 -/* CC5060 80241850 00000000 */ nop -/* CC5064 80241854 8E420074 */ lw $v0, 0x74($s2) -/* CC5068 80241858 1C400038 */ bgtz $v0, .L8024193C -/* CC506C 8024185C 2442FFFF */ addiu $v0, $v0, -1 -/* CC5070 80241860 03C0202D */ daddu $a0, $fp, $zero -/* CC5074 80241864 AE430074 */ sw $v1, 0x74($s2) -/* CC5078 80241868 AFA00010 */ sw $zero, 0x10($sp) -/* CC507C 8024186C 8EE6000C */ lw $a2, 0xc($s7) -/* CC5080 80241870 8EE70010 */ lw $a3, 0x10($s7) -/* CC5084 80241874 0C01242D */ jal func_800490B4 -/* CC5088 80241878 0220282D */ daddu $a1, $s1, $zero -/* CC508C 8024187C 1040002D */ beqz $v0, .L80241934 -/* CC5090 80241880 0000202D */ daddu $a0, $zero, $zero -/* CC5094 80241884 0200282D */ daddu $a1, $s0, $zero -/* CC5098 80241888 0000302D */ daddu $a2, $zero, $zero -/* CC509C 8024188C 860300A8 */ lh $v1, 0xa8($s0) -/* CC50A0 80241890 3C013F80 */ lui $at, 0x3f80 -/* CC50A4 80241894 44810000 */ mtc1 $at, $f0 -/* CC50A8 80241898 3C014000 */ lui $at, 0x4000 -/* CC50AC 8024189C 44811000 */ mtc1 $at, $f2 -/* CC50B0 802418A0 3C01C1A0 */ lui $at, 0xc1a0 -/* CC50B4 802418A4 44812000 */ mtc1 $at, $f4 -/* CC50B8 802418A8 2402000F */ addiu $v0, $zero, 0xf -/* CC50BC 802418AC AFA2001C */ sw $v0, 0x1c($sp) -/* CC50C0 802418B0 44834000 */ mtc1 $v1, $f8 -/* CC50C4 802418B4 00000000 */ nop -/* CC50C8 802418B8 46804220 */ cvt.s.w $f8, $f8 -/* CC50CC 802418BC 44074000 */ mfc1 $a3, $f8 -/* CC50D0 802418C0 27A20038 */ addiu $v0, $sp, 0x38 -/* CC50D4 802418C4 AFA20020 */ sw $v0, 0x20($sp) -/* CC50D8 802418C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CC50DC 802418CC E7A20014 */ swc1 $f2, 0x14($sp) -/* CC50E0 802418D0 0C01BFA4 */ jal fx_emote -/* CC50E4 802418D4 E7A40018 */ swc1 $f4, 0x18($sp) -/* CC50E8 802418D8 0200202D */ daddu $a0, $s0, $zero -/* CC50EC 802418DC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CC50F0 802418E0 0C012530 */ jal func_800494C0 -/* CC50F4 802418E4 3C060020 */ lui $a2, 0x20 -/* CC50F8 802418E8 0280282D */ daddu $a1, $s4, $zero -/* CC50FC 802418EC C6000038 */ lwc1 $f0, 0x38($s0) -/* CC5100 802418F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC5104 802418F4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC5108 802418F8 02A0302D */ daddu $a2, $s5, $zero -/* CC510C 802418FC E7BA0034 */ swc1 $f26, 0x34($sp) -/* CC5110 80241900 E7A00028 */ swc1 $f0, 0x28($sp) -/* CC5114 80241904 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CC5118 80241908 E7A40030 */ swc1 $f4, 0x30($sp) -/* CC511C 8024190C AFB30010 */ sw $s3, 0x10($sp) -/* CC5120 80241910 8E040080 */ lw $a0, 0x80($s0) -/* CC5124 80241914 0C0372DF */ jal func_800DCB7C -/* CC5128 80241918 02C0382D */ daddu $a3, $s6, $zero -/* CC512C 8024191C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CC5130 80241920 46180000 */ add.s $f0, $f0, $f24 -/* CC5134 80241924 2402000C */ addiu $v0, $zero, 0xc -/* CC5138 80241928 E6000064 */ swc1 $f0, 0x64($s0) -/* CC513C 8024192C 080906CA */ j .L80241B28 -/* CC5140 80241930 AE420070 */ sw $v0, 0x70($s2) -.L80241934: -/* CC5144 80241934 8E420074 */ lw $v0, 0x74($s2) -/* CC5148 80241938 2442FFFF */ addiu $v0, $v0, -1 -.L8024193C: -/* CC514C 8024193C AE420074 */ sw $v0, 0x74($s2) -.L80241940: -/* CC5150 80241940 8E2300D0 */ lw $v1, 0xd0($s1) -/* CC5154 80241944 C6000040 */ lwc1 $f0, 0x40($s0) -/* CC5158 80241948 C4620000 */ lwc1 $f2, ($v1) -/* CC515C 8024194C 468010A0 */ cvt.s.w $f2, $f2 -/* CC5160 80241950 C4640008 */ lwc1 $f4, 8($v1) -/* CC5164 80241954 46802120 */ cvt.s.w $f4, $f4 -/* CC5168 80241958 E7A00010 */ swc1 $f0, 0x10($sp) -/* CC516C 8024195C 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC5170 80241960 44051000 */ mfc1 $a1, $f2 -/* CC5174 80241964 C440000C */ lwc1 $f0, 0xc($v0) -/* CC5178 80241968 46800020 */ cvt.s.w $f0, $f0 -/* CC517C 8024196C E7A00014 */ swc1 $f0, 0x14($sp) -/* CC5180 80241970 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC5184 80241974 44062000 */ mfc1 $a2, $f4 -/* CC5188 80241978 C4400010 */ lwc1 $f0, 0x10($v0) -/* CC518C 8024197C 46800020 */ cvt.s.w $f0, $f0 -/* CC5190 80241980 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC5194 80241984 8C640018 */ lw $a0, 0x18($v1) -/* CC5198 80241988 0C0123F5 */ jal is_point_within_region -/* CC519C 8024198C 8E070038 */ lw $a3, 0x38($s0) -/* CC51A0 80241990 1040000D */ beqz $v0, .L802419C8 -/* CC51A4 80241994 00000000 */ nop -/* CC51A8 80241998 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC51AC 8024199C C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC51B0 802419A0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC51B4 802419A4 C4480000 */ lwc1 $f8, ($v0) -/* CC51B8 802419A8 46804220 */ cvt.s.w $f8, $f8 -/* CC51BC 802419AC 44064000 */ mfc1 $a2, $f8 -/* CC51C0 802419B0 C4480008 */ lwc1 $f8, 8($v0) -/* CC51C4 802419B4 46804220 */ cvt.s.w $f8, $f8 -/* CC51C8 802419B8 44074000 */ mfc1 $a3, $f8 -/* CC51CC 802419BC 0C00A720 */ jal atan2 -/* CC51D0 802419C0 00000000 */ nop -/* CC51D4 802419C4 E600000C */ swc1 $f0, 0xc($s0) -.L802419C8: -/* CC51D8 802419C8 8602008C */ lh $v0, 0x8c($s0) -/* CC51DC 802419CC 14400056 */ bnez $v0, .L80241B28 -/* CC51E0 802419D0 00000000 */ nop -/* CC51E4 802419D4 8602008E */ lh $v0, 0x8e($s0) -/* CC51E8 802419D8 1840003D */ blez $v0, .L80241AD0 -/* CC51EC 802419DC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CC51F0 802419E0 8E050018 */ lw $a1, 0x18($s0) -/* CC51F4 802419E4 8E06000C */ lw $a2, 0xc($s0) -/* CC51F8 802419E8 0C00EA95 */ jal npc_move_heading -/* CC51FC 802419EC 0200202D */ daddu $a0, $s0, $zero -/* CC5200 802419F0 8E22006C */ lw $v0, 0x6c($s1) -/* CC5204 802419F4 30420001 */ andi $v0, $v0, 1 -/* CC5208 802419F8 10400032 */ beqz $v0, .L80241AC4 -/* CC520C 802419FC 27A50028 */ addiu $a1, $sp, 0x28 -/* CC5210 80241A00 27A6002C */ addiu $a2, $sp, 0x2c -/* CC5214 80241A04 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC5218 80241A08 C6020040 */ lwc1 $f2, 0x40($s0) -/* CC521C 80241A0C 3C01447A */ lui $at, 0x447a -/* CC5220 80241A10 44812000 */ mtc1 $at, $f4 -/* CC5224 80241A14 27A20034 */ addiu $v0, $sp, 0x34 -/* CC5228 80241A18 E7B6002C */ swc1 $f22, 0x2c($sp) -/* CC522C 80241A1C E7A00028 */ swc1 $f0, 0x28($sp) -/* CC5230 80241A20 E7A20030 */ swc1 $f2, 0x30($sp) -/* CC5234 80241A24 E7A40034 */ swc1 $f4, 0x34($sp) -/* CC5238 80241A28 AFA20010 */ sw $v0, 0x10($sp) -/* CC523C 80241A2C 8E040080 */ lw $a0, 0x80($s0) -/* CC5240 80241A30 0C0372DF */ jal func_800DCB7C -/* CC5244 80241A34 27A70030 */ addiu $a3, $sp, 0x30 -/* CC5248 80241A38 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CC524C 80241A3C 46180100 */ add.s $f4, $f0, $f24 -/* CC5250 80241A40 3C014000 */ lui $at, 0x4000 -/* CC5254 80241A44 44813800 */ mtc1 $at, $f7 -/* CC5258 80241A48 44803000 */ mtc1 $zero, $f6 -/* CC525C 80241A4C 46162001 */ sub.s $f0, $f4, $f22 -/* CC5260 80241A50 E7A4002C */ swc1 $f4, 0x2c($sp) -/* CC5264 80241A54 460000A1 */ cvt.d.s $f2, $f0 -/* CC5268 80241A58 4622303C */ c.lt.d $f6, $f2 -/* CC526C 80241A5C 00000000 */ nop -/* CC5270 80241A60 45000005 */ bc1f .L80241A78 -/* CC5274 80241A64 E7A00034 */ swc1 $f0, 0x34($sp) -/* CC5278 80241A68 4600B021 */ cvt.d.s $f0, $f22 -/* CC527C 80241A6C 46260000 */ add.d $f0, $f0, $f6 -/* CC5280 80241A70 080906A9 */ j .L80241AA4 -/* CC5284 80241A74 462005A0 */ cvt.s.d $f22, $f0 -.L80241A78: -/* CC5288 80241A78 3C01C000 */ lui $at, 0xc000 -/* CC528C 80241A7C 44810800 */ mtc1 $at, $f1 -/* CC5290 80241A80 44800000 */ mtc1 $zero, $f0 -/* CC5294 80241A84 00000000 */ nop -/* CC5298 80241A88 4620103C */ c.lt.d $f2, $f0 -/* CC529C 80241A8C 00000000 */ nop -/* CC52A0 80241A90 45020004 */ bc1fl .L80241AA4 -/* CC52A4 80241A94 46002586 */ mov.s $f22, $f4 -/* CC52A8 80241A98 4600B021 */ cvt.d.s $f0, $f22 -/* CC52AC 80241A9C 46260001 */ sub.d $f0, $f0, $f6 -/* CC52B0 80241AA0 462005A0 */ cvt.s.d $f22, $f0 -.L80241AA4: -/* CC52B4 80241AA4 3C014059 */ lui $at, 0x4059 -/* CC52B8 80241AA8 44811800 */ mtc1 $at, $f3 -/* CC52BC 80241AAC 44801000 */ mtc1 $zero, $f2 -/* CC52C0 80241AB0 4600B021 */ cvt.d.s $f0, $f22 -/* CC52C4 80241AB4 46220002 */ mul.d $f0, $f0, $f2 -/* CC52C8 80241AB8 00000000 */ nop -/* CC52CC 80241ABC 4620020D */ trunc.w.d $f8, $f0 -/* CC52D0 80241AC0 E628007C */ swc1 $f8, 0x7c($s1) -.L80241AC4: -/* CC52D4 80241AC4 8602008E */ lh $v0, 0x8e($s0) -/* CC52D8 80241AC8 1C400017 */ bgtz $v0, .L80241B28 -/* CC52DC 80241ACC 240403E8 */ addiu $a0, $zero, 0x3e8 -.L80241AD0: -/* CC52E0 80241AD0 24020002 */ addiu $v0, $zero, 2 -/* CC52E4 80241AD4 0C00A67F */ jal rand_int -/* CC52E8 80241AD8 AE420070 */ sw $v0, 0x70($s2) -/* CC52EC 80241ADC 3C035555 */ lui $v1, 0x5555 -/* CC52F0 80241AE0 34635556 */ ori $v1, $v1, 0x5556 -/* CC52F4 80241AE4 00430018 */ mult $v0, $v1 -/* CC52F8 80241AE8 000227C3 */ sra $a0, $v0, 0x1f -/* CC52FC 80241AEC 00004010 */ mfhi $t0 -/* CC5300 80241AF0 01042023 */ subu $a0, $t0, $a0 -/* CC5304 80241AF4 00041840 */ sll $v1, $a0, 1 -/* CC5308 80241AF8 00641821 */ addu $v1, $v1, $a0 -/* CC530C 80241AFC 00431023 */ subu $v0, $v0, $v1 -/* CC5310 80241B00 24430002 */ addiu $v1, $v0, 2 -/* CC5314 80241B04 AE430074 */ sw $v1, 0x74($s2) -/* CC5318 80241B08 8EE2002C */ lw $v0, 0x2c($s7) -/* CC531C 80241B0C 58400006 */ blezl $v0, .L80241B28 -/* CC5320 80241B10 AE400070 */ sw $zero, 0x70($s2) -/* CC5324 80241B14 8EE20004 */ lw $v0, 4($s7) -/* CC5328 80241B18 58400003 */ blezl $v0, .L80241B28 -/* CC532C 80241B1C AE400070 */ sw $zero, 0x70($s2) -/* CC5330 80241B20 50600001 */ beql $v1, $zero, .L80241B28 -/* CC5334 80241B24 AE400070 */ sw $zero, 0x70($s2) -.L80241B28: -/* CC5338 80241B28 8FBF0064 */ lw $ra, 0x64($sp) -/* CC533C 80241B2C 8FBE0060 */ lw $fp, 0x60($sp) -/* CC5340 80241B30 8FB7005C */ lw $s7, 0x5c($sp) -/* CC5344 80241B34 8FB60058 */ lw $s6, 0x58($sp) -/* CC5348 80241B38 8FB50054 */ lw $s5, 0x54($sp) -/* CC534C 80241B3C 8FB40050 */ lw $s4, 0x50($sp) -/* CC5350 80241B40 8FB3004C */ lw $s3, 0x4c($sp) -/* CC5354 80241B44 8FB20048 */ lw $s2, 0x48($sp) -/* CC5358 80241B48 8FB10044 */ lw $s1, 0x44($sp) -/* CC535C 80241B4C 8FB00040 */ lw $s0, 0x40($sp) -/* CC5360 80241B50 D7BA0080 */ ldc1 $f26, 0x80($sp) -/* CC5364 80241B54 D7B80078 */ ldc1 $f24, 0x78($sp) -/* CC5368 80241B58 D7B60070 */ ldc1 $f22, 0x70($sp) -/* CC536C 80241B5C D7B40068 */ ldc1 $f20, 0x68($sp) -/* CC5370 80241B60 03E00008 */ jr $ra -/* CC5374 80241B64 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s new file mode 100644 index 0000000000..5ebe475ef6 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241704_CC4F14.s @@ -0,0 +1,295 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241704_CC4F14 +/* CC4F14 80241704 27BDFF78 */ addiu $sp, $sp, -0x88 +/* CC4F18 80241708 AFB20048 */ sw $s2, 0x48($sp) +/* CC4F1C 8024170C 0080902D */ daddu $s2, $a0, $zero +/* CC4F20 80241710 AFBF0064 */ sw $ra, 0x64($sp) +/* CC4F24 80241714 AFBE0060 */ sw $fp, 0x60($sp) +/* CC4F28 80241718 AFB7005C */ sw $s7, 0x5c($sp) +/* CC4F2C 8024171C AFB60058 */ sw $s6, 0x58($sp) +/* CC4F30 80241720 AFB50054 */ sw $s5, 0x54($sp) +/* CC4F34 80241724 AFB40050 */ sw $s4, 0x50($sp) +/* CC4F38 80241728 AFB3004C */ sw $s3, 0x4c($sp) +/* CC4F3C 8024172C AFB10044 */ sw $s1, 0x44($sp) +/* CC4F40 80241730 AFB00040 */ sw $s0, 0x40($sp) +/* CC4F44 80241734 F7BA0080 */ sdc1 $f26, 0x80($sp) +/* CC4F48 80241738 F7B80078 */ sdc1 $f24, 0x78($sp) +/* CC4F4C 8024173C F7B60070 */ sdc1 $f22, 0x70($sp) +/* CC4F50 80241740 F7B40068 */ sdc1 $f20, 0x68($sp) +/* CC4F54 80241744 8E510148 */ lw $s1, 0x148($s2) +/* CC4F58 80241748 00A0B82D */ daddu $s7, $a1, $zero +/* CC4F5C 8024174C 86240008 */ lh $a0, 8($s1) +/* CC4F60 80241750 0C00EABB */ jal get_npc_unsafe +/* CC4F64 80241754 00C0F02D */ daddu $fp, $a2, $zero +/* CC4F68 80241758 C620007C */ lwc1 $f0, 0x7c($s1) +/* CC4F6C 8024175C 46800020 */ cvt.s.w $f0, $f0 +/* CC4F70 80241760 46000021 */ cvt.d.s $f0, $f0 +/* CC4F74 80241764 0040802D */ daddu $s0, $v0, $zero +/* CC4F78 80241768 3C014059 */ lui $at, 0x4059 +/* CC4F7C 8024176C 44813800 */ mtc1 $at, $f7 +/* CC4F80 80241770 44803000 */ mtc1 $zero, $f6 +/* CC4F84 80241774 8602008E */ lh $v0, 0x8e($s0) +/* CC4F88 80241778 9603008E */ lhu $v1, 0x8e($s0) +/* CC4F8C 8024177C 46260003 */ div.d $f0, $f0, $f6 +/* CC4F90 80241780 462005A0 */ cvt.s.d $f22, $f0 +/* CC4F94 80241784 C6200078 */ lwc1 $f0, 0x78($s1) +/* CC4F98 80241788 46800020 */ cvt.s.w $f0, $f0 +/* CC4F9C 8024178C 46000021 */ cvt.d.s $f0, $f0 +/* CC4FA0 80241790 46260003 */ div.d $f0, $f0, $f6 +/* CC4FA4 80241794 18400003 */ blez $v0, .L802417A4 +/* CC4FA8 80241798 46200620 */ cvt.s.d $f24, $f0 +/* CC4FAC 8024179C 2462FFFF */ addiu $v0, $v1, -1 +/* CC4FB0 802417A0 A602008E */ sh $v0, 0x8e($s0) +.L802417A4: +/* CC4FB4 802417A4 27B40028 */ addiu $s4, $sp, 0x28 +/* CC4FB8 802417A8 0280282D */ daddu $a1, $s4, $zero +/* CC4FBC 802417AC 27B5002C */ addiu $s5, $sp, 0x2c +/* CC4FC0 802417B0 02A0302D */ daddu $a2, $s5, $zero +/* CC4FC4 802417B4 27B60030 */ addiu $s6, $sp, 0x30 +/* CC4FC8 802417B8 02C0382D */ daddu $a3, $s6, $zero +/* CC4FCC 802417BC C6000038 */ lwc1 $f0, 0x38($s0) +/* CC4FD0 802417C0 C602003C */ lwc1 $f2, 0x3c($s0) +/* CC4FD4 802417C4 C6040040 */ lwc1 $f4, 0x40($s0) +/* CC4FD8 802417C8 3C01447A */ lui $at, 0x447a +/* CC4FDC 802417CC 4481D000 */ mtc1 $at, $f26 +/* CC4FE0 802417D0 27B30034 */ addiu $s3, $sp, 0x34 +/* CC4FE4 802417D4 E7A00028 */ swc1 $f0, 0x28($sp) +/* CC4FE8 802417D8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* CC4FEC 802417DC E7A40030 */ swc1 $f4, 0x30($sp) +/* CC4FF0 802417E0 E7BA0034 */ swc1 $f26, 0x34($sp) +/* CC4FF4 802417E4 C6340070 */ lwc1 $f20, 0x70($s1) +/* CC4FF8 802417E8 4680A520 */ cvt.s.w $f20, $f20 +/* CC4FFC 802417EC 4600A521 */ cvt.d.s $f20, $f20 +/* CC5000 802417F0 4626A503 */ div.d $f20, $f20, $f6 +/* CC5004 802417F4 AFB30010 */ sw $s3, 0x10($sp) +/* CC5008 802417F8 8E040080 */ lw $a0, 0x80($s0) +/* CC500C 802417FC 0C0372DF */ jal func_800DCB7C +/* CC5010 80241800 4620A520 */ cvt.s.d $f20, $f20 +/* CC5014 80241804 C62C0074 */ lwc1 $f12, 0x74($s1) +/* CC5018 80241808 0C00A8BB */ jal sin_deg +/* CC501C 8024180C 46806320 */ cvt.s.w $f12, $f12 +/* CC5020 80241810 46140002 */ mul.s $f0, $f0, $f20 +/* CC5024 80241814 00000000 */ nop +/* CC5028 80241818 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* CC502C 8024181C 46181080 */ add.s $f2, $f2, $f24 +/* CC5030 80241820 46001080 */ add.s $f2, $f2, $f0 +/* CC5034 80241824 E602003C */ swc1 $f2, 0x3c($s0) +/* CC5038 80241828 8E220074 */ lw $v0, 0x74($s1) +/* CC503C 8024182C 2442000C */ addiu $v0, $v0, 0xc +/* CC5040 80241830 44826000 */ mtc1 $v0, $f12 +/* CC5044 80241834 00000000 */ nop +/* CC5048 80241838 0C00A6C9 */ jal clamp_angle +/* CC504C 8024183C 46806320 */ cvt.s.w $f12, $f12 +/* CC5050 80241840 4600020D */ trunc.w.s $f8, $f0 +/* CC5054 80241844 E6280074 */ swc1 $f8, 0x74($s1) +/* CC5058 80241848 8EE30014 */ lw $v1, 0x14($s7) +/* CC505C 8024184C 0460003C */ bltz $v1, .L80241940 +/* CC5060 80241850 00000000 */ nop +/* CC5064 80241854 8E420074 */ lw $v0, 0x74($s2) +/* CC5068 80241858 1C400038 */ bgtz $v0, .L8024193C +/* CC506C 8024185C 2442FFFF */ addiu $v0, $v0, -1 +/* CC5070 80241860 03C0202D */ daddu $a0, $fp, $zero +/* CC5074 80241864 AE430074 */ sw $v1, 0x74($s2) +/* CC5078 80241868 AFA00010 */ sw $zero, 0x10($sp) +/* CC507C 8024186C 8EE6000C */ lw $a2, 0xc($s7) +/* CC5080 80241870 8EE70010 */ lw $a3, 0x10($s7) +/* CC5084 80241874 0C01242D */ jal func_800490B4 +/* CC5088 80241878 0220282D */ daddu $a1, $s1, $zero +/* CC508C 8024187C 1040002D */ beqz $v0, .L80241934 +/* CC5090 80241880 0000202D */ daddu $a0, $zero, $zero +/* CC5094 80241884 0200282D */ daddu $a1, $s0, $zero +/* CC5098 80241888 0000302D */ daddu $a2, $zero, $zero +/* CC509C 8024188C 860300A8 */ lh $v1, 0xa8($s0) +/* CC50A0 80241890 3C013F80 */ lui $at, 0x3f80 +/* CC50A4 80241894 44810000 */ mtc1 $at, $f0 +/* CC50A8 80241898 3C014000 */ lui $at, 0x4000 +/* CC50AC 8024189C 44811000 */ mtc1 $at, $f2 +/* CC50B0 802418A0 3C01C1A0 */ lui $at, 0xc1a0 +/* CC50B4 802418A4 44812000 */ mtc1 $at, $f4 +/* CC50B8 802418A8 2402000F */ addiu $v0, $zero, 0xf +/* CC50BC 802418AC AFA2001C */ sw $v0, 0x1c($sp) +/* CC50C0 802418B0 44834000 */ mtc1 $v1, $f8 +/* CC50C4 802418B4 00000000 */ nop +/* CC50C8 802418B8 46804220 */ cvt.s.w $f8, $f8 +/* CC50CC 802418BC 44074000 */ mfc1 $a3, $f8 +/* CC50D0 802418C0 27A20038 */ addiu $v0, $sp, 0x38 +/* CC50D4 802418C4 AFA20020 */ sw $v0, 0x20($sp) +/* CC50D8 802418C8 E7A00010 */ swc1 $f0, 0x10($sp) +/* CC50DC 802418CC E7A20014 */ swc1 $f2, 0x14($sp) +/* CC50E0 802418D0 0C01BFA4 */ jal fx_emote +/* CC50E4 802418D4 E7A40018 */ swc1 $f4, 0x18($sp) +/* CC50E8 802418D8 0200202D */ daddu $a0, $s0, $zero +/* CC50EC 802418DC 240502F4 */ addiu $a1, $zero, 0x2f4 +/* CC50F0 802418E0 0C012530 */ jal func_800494C0 +/* CC50F4 802418E4 3C060020 */ lui $a2, 0x20 +/* CC50F8 802418E8 0280282D */ daddu $a1, $s4, $zero +/* CC50FC 802418EC C6000038 */ lwc1 $f0, 0x38($s0) +/* CC5100 802418F0 C602003C */ lwc1 $f2, 0x3c($s0) +/* CC5104 802418F4 C6040040 */ lwc1 $f4, 0x40($s0) +/* CC5108 802418F8 02A0302D */ daddu $a2, $s5, $zero +/* CC510C 802418FC E7BA0034 */ swc1 $f26, 0x34($sp) +/* CC5110 80241900 E7A00028 */ swc1 $f0, 0x28($sp) +/* CC5114 80241904 E7A2002C */ swc1 $f2, 0x2c($sp) +/* CC5118 80241908 E7A40030 */ swc1 $f4, 0x30($sp) +/* CC511C 8024190C AFB30010 */ sw $s3, 0x10($sp) +/* CC5120 80241910 8E040080 */ lw $a0, 0x80($s0) +/* CC5124 80241914 0C0372DF */ jal func_800DCB7C +/* CC5128 80241918 02C0382D */ daddu $a3, $s6, $zero +/* CC512C 8024191C C7A0002C */ lwc1 $f0, 0x2c($sp) +/* CC5130 80241920 46180000 */ add.s $f0, $f0, $f24 +/* CC5134 80241924 2402000C */ addiu $v0, $zero, 0xc +/* CC5138 80241928 E6000064 */ swc1 $f0, 0x64($s0) +/* CC513C 8024192C 080906CA */ j .L80241B28 +/* CC5140 80241930 AE420070 */ sw $v0, 0x70($s2) +.L80241934: +/* CC5144 80241934 8E420074 */ lw $v0, 0x74($s2) +/* CC5148 80241938 2442FFFF */ addiu $v0, $v0, -1 +.L8024193C: +/* CC514C 8024193C AE420074 */ sw $v0, 0x74($s2) +.L80241940: +/* CC5150 80241940 8E2300D0 */ lw $v1, 0xd0($s1) +/* CC5154 80241944 C6000040 */ lwc1 $f0, 0x40($s0) +/* CC5158 80241948 C4620000 */ lwc1 $f2, ($v1) +/* CC515C 8024194C 468010A0 */ cvt.s.w $f2, $f2 +/* CC5160 80241950 C4640008 */ lwc1 $f4, 8($v1) +/* CC5164 80241954 46802120 */ cvt.s.w $f4, $f4 +/* CC5168 80241958 E7A00010 */ swc1 $f0, 0x10($sp) +/* CC516C 8024195C 8E2200D0 */ lw $v0, 0xd0($s1) +/* CC5170 80241960 44051000 */ mfc1 $a1, $f2 +/* CC5174 80241964 C440000C */ lwc1 $f0, 0xc($v0) +/* CC5178 80241968 46800020 */ cvt.s.w $f0, $f0 +/* CC517C 8024196C E7A00014 */ swc1 $f0, 0x14($sp) +/* CC5180 80241970 8E2200D0 */ lw $v0, 0xd0($s1) +/* CC5184 80241974 44062000 */ mfc1 $a2, $f4 +/* CC5188 80241978 C4400010 */ lwc1 $f0, 0x10($v0) +/* CC518C 8024197C 46800020 */ cvt.s.w $f0, $f0 +/* CC5190 80241980 E7A00018 */ swc1 $f0, 0x18($sp) +/* CC5194 80241984 8C640018 */ lw $a0, 0x18($v1) +/* CC5198 80241988 0C0123F5 */ jal is_point_within_region +/* CC519C 8024198C 8E070038 */ lw $a3, 0x38($s0) +/* CC51A0 80241990 1040000D */ beqz $v0, .L802419C8 +/* CC51A4 80241994 00000000 */ nop +/* CC51A8 80241998 8E2200D0 */ lw $v0, 0xd0($s1) +/* CC51AC 8024199C C60C0038 */ lwc1 $f12, 0x38($s0) +/* CC51B0 802419A0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* CC51B4 802419A4 C4480000 */ lwc1 $f8, ($v0) +/* CC51B8 802419A8 46804220 */ cvt.s.w $f8, $f8 +/* CC51BC 802419AC 44064000 */ mfc1 $a2, $f8 +/* CC51C0 802419B0 C4480008 */ lwc1 $f8, 8($v0) +/* CC51C4 802419B4 46804220 */ cvt.s.w $f8, $f8 +/* CC51C8 802419B8 44074000 */ mfc1 $a3, $f8 +/* CC51CC 802419BC 0C00A720 */ jal atan2 +/* CC51D0 802419C0 00000000 */ nop +/* CC51D4 802419C4 E600000C */ swc1 $f0, 0xc($s0) +.L802419C8: +/* CC51D8 802419C8 8602008C */ lh $v0, 0x8c($s0) +/* CC51DC 802419CC 14400056 */ bnez $v0, .L80241B28 +/* CC51E0 802419D0 00000000 */ nop +/* CC51E4 802419D4 8602008E */ lh $v0, 0x8e($s0) +/* CC51E8 802419D8 1840003D */ blez $v0, .L80241AD0 +/* CC51EC 802419DC 240403E8 */ addiu $a0, $zero, 0x3e8 +/* CC51F0 802419E0 8E050018 */ lw $a1, 0x18($s0) +/* CC51F4 802419E4 8E06000C */ lw $a2, 0xc($s0) +/* CC51F8 802419E8 0C00EA95 */ jal npc_move_heading +/* CC51FC 802419EC 0200202D */ daddu $a0, $s0, $zero +/* CC5200 802419F0 8E22006C */ lw $v0, 0x6c($s1) +/* CC5204 802419F4 30420001 */ andi $v0, $v0, 1 +/* CC5208 802419F8 10400032 */ beqz $v0, .L80241AC4 +/* CC520C 802419FC 27A50028 */ addiu $a1, $sp, 0x28 +/* CC5210 80241A00 27A6002C */ addiu $a2, $sp, 0x2c +/* CC5214 80241A04 C6000038 */ lwc1 $f0, 0x38($s0) +/* CC5218 80241A08 C6020040 */ lwc1 $f2, 0x40($s0) +/* CC521C 80241A0C 3C01447A */ lui $at, 0x447a +/* CC5220 80241A10 44812000 */ mtc1 $at, $f4 +/* CC5224 80241A14 27A20034 */ addiu $v0, $sp, 0x34 +/* CC5228 80241A18 E7B6002C */ swc1 $f22, 0x2c($sp) +/* CC522C 80241A1C E7A00028 */ swc1 $f0, 0x28($sp) +/* CC5230 80241A20 E7A20030 */ swc1 $f2, 0x30($sp) +/* CC5234 80241A24 E7A40034 */ swc1 $f4, 0x34($sp) +/* CC5238 80241A28 AFA20010 */ sw $v0, 0x10($sp) +/* CC523C 80241A2C 8E040080 */ lw $a0, 0x80($s0) +/* CC5240 80241A30 0C0372DF */ jal func_800DCB7C +/* CC5244 80241A34 27A70030 */ addiu $a3, $sp, 0x30 +/* CC5248 80241A38 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* CC524C 80241A3C 46180100 */ add.s $f4, $f0, $f24 +/* CC5250 80241A40 3C014000 */ lui $at, 0x4000 +/* CC5254 80241A44 44813800 */ mtc1 $at, $f7 +/* CC5258 80241A48 44803000 */ mtc1 $zero, $f6 +/* CC525C 80241A4C 46162001 */ sub.s $f0, $f4, $f22 +/* CC5260 80241A50 E7A4002C */ swc1 $f4, 0x2c($sp) +/* CC5264 80241A54 460000A1 */ cvt.d.s $f2, $f0 +/* CC5268 80241A58 4622303C */ c.lt.d $f6, $f2 +/* CC526C 80241A5C 00000000 */ nop +/* CC5270 80241A60 45000005 */ bc1f .L80241A78 +/* CC5274 80241A64 E7A00034 */ swc1 $f0, 0x34($sp) +/* CC5278 80241A68 4600B021 */ cvt.d.s $f0, $f22 +/* CC527C 80241A6C 46260000 */ add.d $f0, $f0, $f6 +/* CC5280 80241A70 080906A9 */ j .L80241AA4 +/* CC5284 80241A74 462005A0 */ cvt.s.d $f22, $f0 +.L80241A78: +/* CC5288 80241A78 3C01C000 */ lui $at, 0xc000 +/* CC528C 80241A7C 44810800 */ mtc1 $at, $f1 +/* CC5290 80241A80 44800000 */ mtc1 $zero, $f0 +/* CC5294 80241A84 00000000 */ nop +/* CC5298 80241A88 4620103C */ c.lt.d $f2, $f0 +/* CC529C 80241A8C 00000000 */ nop +/* CC52A0 80241A90 45020004 */ bc1fl .L80241AA4 +/* CC52A4 80241A94 46002586 */ mov.s $f22, $f4 +/* CC52A8 80241A98 4600B021 */ cvt.d.s $f0, $f22 +/* CC52AC 80241A9C 46260001 */ sub.d $f0, $f0, $f6 +/* CC52B0 80241AA0 462005A0 */ cvt.s.d $f22, $f0 +.L80241AA4: +/* CC52B4 80241AA4 3C014059 */ lui $at, 0x4059 +/* CC52B8 80241AA8 44811800 */ mtc1 $at, $f3 +/* CC52BC 80241AAC 44801000 */ mtc1 $zero, $f2 +/* CC52C0 80241AB0 4600B021 */ cvt.d.s $f0, $f22 +/* CC52C4 80241AB4 46220002 */ mul.d $f0, $f0, $f2 +/* CC52C8 80241AB8 00000000 */ nop +/* CC52CC 80241ABC 4620020D */ trunc.w.d $f8, $f0 +/* CC52D0 80241AC0 E628007C */ swc1 $f8, 0x7c($s1) +.L80241AC4: +/* CC52D4 80241AC4 8602008E */ lh $v0, 0x8e($s0) +/* CC52D8 80241AC8 1C400017 */ bgtz $v0, .L80241B28 +/* CC52DC 80241ACC 240403E8 */ addiu $a0, $zero, 0x3e8 +.L80241AD0: +/* CC52E0 80241AD0 24020002 */ addiu $v0, $zero, 2 +/* CC52E4 80241AD4 0C00A67F */ jal rand_int +/* CC52E8 80241AD8 AE420070 */ sw $v0, 0x70($s2) +/* CC52EC 80241ADC 3C035555 */ lui $v1, 0x5555 +/* CC52F0 80241AE0 34635556 */ ori $v1, $v1, 0x5556 +/* CC52F4 80241AE4 00430018 */ mult $v0, $v1 +/* CC52F8 80241AE8 000227C3 */ sra $a0, $v0, 0x1f +/* CC52FC 80241AEC 00004010 */ mfhi $t0 +/* CC5300 80241AF0 01042023 */ subu $a0, $t0, $a0 +/* CC5304 80241AF4 00041840 */ sll $v1, $a0, 1 +/* CC5308 80241AF8 00641821 */ addu $v1, $v1, $a0 +/* CC530C 80241AFC 00431023 */ subu $v0, $v0, $v1 +/* CC5310 80241B00 24430002 */ addiu $v1, $v0, 2 +/* CC5314 80241B04 AE430074 */ sw $v1, 0x74($s2) +/* CC5318 80241B08 8EE2002C */ lw $v0, 0x2c($s7) +/* CC531C 80241B0C 58400006 */ blezl $v0, .L80241B28 +/* CC5320 80241B10 AE400070 */ sw $zero, 0x70($s2) +/* CC5324 80241B14 8EE20004 */ lw $v0, 4($s7) +/* CC5328 80241B18 58400003 */ blezl $v0, .L80241B28 +/* CC532C 80241B1C AE400070 */ sw $zero, 0x70($s2) +/* CC5330 80241B20 50600001 */ beql $v1, $zero, .L80241B28 +/* CC5334 80241B24 AE400070 */ sw $zero, 0x70($s2) +.L80241B28: +/* CC5338 80241B28 8FBF0064 */ lw $ra, 0x64($sp) +/* CC533C 80241B2C 8FBE0060 */ lw $fp, 0x60($sp) +/* CC5340 80241B30 8FB7005C */ lw $s7, 0x5c($sp) +/* CC5344 80241B34 8FB60058 */ lw $s6, 0x58($sp) +/* CC5348 80241B38 8FB50054 */ lw $s5, 0x54($sp) +/* CC534C 80241B3C 8FB40050 */ lw $s4, 0x50($sp) +/* CC5350 80241B40 8FB3004C */ lw $s3, 0x4c($sp) +/* CC5354 80241B44 8FB20048 */ lw $s2, 0x48($sp) +/* CC5358 80241B48 8FB10044 */ lw $s1, 0x44($sp) +/* CC535C 80241B4C 8FB00040 */ lw $s0, 0x40($sp) +/* CC5360 80241B50 D7BA0080 */ ldc1 $f26, 0x80($sp) +/* CC5364 80241B54 D7B80078 */ ldc1 $f24, 0x78($sp) +/* CC5368 80241B58 D7B60070 */ ldc1 $f22, 0x70($sp) +/* CC536C 80241B5C D7B40068 */ ldc1 $f20, 0x68($sp) +/* CC5370 80241B60 03E00008 */ jr $ra +/* CC5374 80241B64 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8.s deleted file mode 100644 index 42dbebcb34..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8.s +++ /dev/null @@ -1,341 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DB8 -/* CC55C8 80241DB8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* CC55CC 80241DBC AFB40050 */ sw $s4, 0x50($sp) -/* CC55D0 80241DC0 0080A02D */ daddu $s4, $a0, $zero -/* CC55D4 80241DC4 AFBF005C */ sw $ra, 0x5c($sp) -/* CC55D8 80241DC8 AFB60058 */ sw $s6, 0x58($sp) -/* CC55DC 80241DCC AFB50054 */ sw $s5, 0x54($sp) -/* CC55E0 80241DD0 AFB3004C */ sw $s3, 0x4c($sp) -/* CC55E4 80241DD4 AFB20048 */ sw $s2, 0x48($sp) -/* CC55E8 80241DD8 AFB10044 */ sw $s1, 0x44($sp) -/* CC55EC 80241DDC AFB00040 */ sw $s0, 0x40($sp) -/* CC55F0 80241DE0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CC55F4 80241DE4 8E930148 */ lw $s3, 0x148($s4) -/* CC55F8 80241DE8 86640008 */ lh $a0, 8($s3) -/* CC55FC 80241DEC 8E90000C */ lw $s0, 0xc($s4) -/* CC5600 80241DF0 0C00EABB */ jal get_npc_unsafe -/* CC5604 80241DF4 00A0882D */ daddu $s1, $a1, $zero -/* CC5608 80241DF8 0280202D */ daddu $a0, $s4, $zero -/* CC560C 80241DFC 8E050000 */ lw $a1, ($s0) -/* CC5610 80241E00 0C0B1EAF */ jal get_variable -/* CC5614 80241E04 0040902D */ daddu $s2, $v0, $zero -/* CC5618 80241E08 AFA00020 */ sw $zero, 0x20($sp) -/* CC561C 80241E0C 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC5620 80241E10 8C630030 */ lw $v1, 0x30($v1) -/* CC5624 80241E14 AFA30024 */ sw $v1, 0x24($sp) -/* CC5628 80241E18 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC562C 80241E1C 8C63001C */ lw $v1, 0x1c($v1) -/* CC5630 80241E20 AFA30028 */ sw $v1, 0x28($sp) -/* CC5634 80241E24 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC5638 80241E28 8C630024 */ lw $v1, 0x24($v1) -/* CC563C 80241E2C AFA3002C */ sw $v1, 0x2c($sp) -/* CC5640 80241E30 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC5644 80241E34 8C630028 */ lw $v1, 0x28($v1) -/* CC5648 80241E38 27B50020 */ addiu $s5, $sp, 0x20 -/* CC564C 80241E3C AFA30030 */ sw $v1, 0x30($sp) -/* CC5650 80241E40 8E6300D0 */ lw $v1, 0xd0($s3) -/* CC5654 80241E44 3C0142F0 */ lui $at, 0x42f0 -/* CC5658 80241E48 44810000 */ mtc1 $at, $f0 -/* CC565C 80241E4C 8C63002C */ lw $v1, 0x2c($v1) -/* CC5660 80241E50 0040B02D */ daddu $s6, $v0, $zero -/* CC5664 80241E54 E7A00038 */ swc1 $f0, 0x38($sp) -/* CC5668 80241E58 A7A0003C */ sh $zero, 0x3c($sp) -/* CC566C 80241E5C 12200007 */ beqz $s1, .L80241E7C -/* CC5670 80241E60 AFA30034 */ sw $v1, 0x34($sp) -/* CC5674 80241E64 0240202D */ daddu $a0, $s2, $zero -/* CC5678 80241E68 0260282D */ daddu $a1, $s3, $zero -/* CC567C 80241E6C 0280302D */ daddu $a2, $s4, $zero -/* CC5680 80241E70 0C0904EB */ jal func_802413AC -/* CC5684 80241E74 02C0382D */ daddu $a3, $s6, $zero -/* CC5688 80241E78 AE800070 */ sw $zero, 0x70($s4) -.L80241E7C: -/* CC568C 80241E7C 2402FFFD */ addiu $v0, $zero, -3 -/* CC5690 80241E80 A24200AB */ sb $v0, 0xab($s2) -/* CC5694 80241E84 8E6300B0 */ lw $v1, 0xb0($s3) -/* CC5698 80241E88 30620004 */ andi $v0, $v1, 4 -/* CC569C 80241E8C 10400007 */ beqz $v0, .L80241EAC -/* CC56A0 80241E90 00000000 */ nop -/* CC56A4 80241E94 826200B4 */ lb $v0, 0xb4($s3) -/* CC56A8 80241E98 144000F4 */ bnez $v0, .L8024226C -/* CC56AC 80241E9C 0000102D */ daddu $v0, $zero, $zero -/* CC56B0 80241EA0 2402FFFB */ addiu $v0, $zero, -5 -/* CC56B4 80241EA4 00621024 */ and $v0, $v1, $v0 -/* CC56B8 80241EA8 AE6200B0 */ sw $v0, 0xb0($s3) -.L80241EAC: -/* CC56BC 80241EAC 8E830070 */ lw $v1, 0x70($s4) -/* CC56C0 80241EB0 24020001 */ addiu $v0, $zero, 1 -/* CC56C4 80241EB4 10620011 */ beq $v1, $v0, .L80241EFC -/* CC56C8 80241EB8 28620002 */ slti $v0, $v1, 2 -/* CC56CC 80241EBC 10400005 */ beqz $v0, .L80241ED4 -/* CC56D0 80241EC0 24020002 */ addiu $v0, $zero, 2 -/* CC56D4 80241EC4 10600009 */ beqz $v1, .L80241EEC -/* CC56D8 80241EC8 2402000C */ addiu $v0, $zero, 0xc -/* CC56DC 80241ECC 080907CF */ j .L80241F3C -/* CC56E0 80241ED0 00000000 */ nop -.L80241ED4: -/* CC56E4 80241ED4 1062000F */ beq $v1, $v0, .L80241F14 -/* CC56E8 80241ED8 24020003 */ addiu $v0, $zero, 3 -/* CC56EC 80241EDC 10620012 */ beq $v1, $v0, .L80241F28 -/* CC56F0 80241EE0 0280202D */ daddu $a0, $s4, $zero -/* CC56F4 80241EE4 080907CD */ j .L80241F34 -/* CC56F8 80241EE8 00000000 */ nop -.L80241EEC: -/* CC56FC 80241EEC 0280202D */ daddu $a0, $s4, $zero -/* CC5700 80241EF0 02C0282D */ daddu $a1, $s6, $zero -/* CC5704 80241EF4 0C090071 */ jal func_802401C4 -/* CC5708 80241EF8 02A0302D */ daddu $a2, $s5, $zero -.L80241EFC: -/* CC570C 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* CC5710 80241F00 02C0282D */ daddu $a1, $s6, $zero -/* CC5714 80241F04 0C0905C1 */ jal func_80241704 -/* CC5718 80241F08 02A0302D */ daddu $a2, $s5, $zero -/* CC571C 80241F0C 080907CD */ j .L80241F34 -/* CC5720 80241F10 00000000 */ nop -.L80241F14: -/* CC5724 80241F14 0280202D */ daddu $a0, $s4, $zero -/* CC5728 80241F18 02C0282D */ daddu $a1, $s6, $zero -/* CC572C 80241F1C 0C090267 */ jal func_8024099C -/* CC5730 80241F20 02A0302D */ daddu $a2, $s5, $zero -/* CC5734 80241F24 0280202D */ daddu $a0, $s4, $zero -.L80241F28: -/* CC5738 80241F28 02C0282D */ daddu $a1, $s6, $zero -/* CC573C 80241F2C 0C0906DA */ jal func_80241B68 -/* CC5740 80241F30 02A0302D */ daddu $a2, $s5, $zero -.L80241F34: -/* CC5744 80241F34 8E830070 */ lw $v1, 0x70($s4) -/* CC5748 80241F38 2402000C */ addiu $v0, $zero, 0xc -.L80241F3C: -/* CC574C 80241F3C 1462001A */ bne $v1, $v0, .L80241FA8 -/* CC5750 80241F40 00000000 */ nop -/* CC5754 80241F44 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CC5758 80241F48 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC575C 80241F4C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC5760 80241F50 C64E0040 */ lwc1 $f14, 0x40($s2) -/* CC5764 80241F54 8C460028 */ lw $a2, 0x28($v0) -/* CC5768 80241F58 0C00A720 */ jal atan2 -/* CC576C 80241F5C 8C470030 */ lw $a3, 0x30($v0) -/* CC5770 80241F60 0C0905AF */ jal func_802416BC -/* CC5774 80241F64 E640000C */ swc1 $f0, 0xc($s2) -/* CC5778 80241F68 0440000F */ bltz $v0, .L80241FA8 -/* CC577C 80241F6C AE62007C */ sw $v0, 0x7c($s3) -/* CC5780 80241F70 0C00FB3A */ jal get_enemy -/* CC5784 80241F74 0040202D */ daddu $a0, $v0, $zero -/* CC5788 80241F78 3C030049 */ lui $v1, 0x49 -/* CC578C 80241F7C 0040202D */ daddu $a0, $v0, $zero -/* CC5790 80241F80 24020001 */ addiu $v0, $zero, 1 -/* CC5794 80241F84 AC820094 */ sw $v0, 0x94($a0) -/* CC5798 80241F88 86620008 */ lh $v0, 8($s3) -/* CC579C 80241F8C 34630014 */ ori $v1, $v1, 0x14 -/* CC57A0 80241F90 AC820098 */ sw $v0, 0x98($a0) -/* CC57A4 80241F94 2402000F */ addiu $v0, $zero, 0xf -/* CC57A8 80241F98 A642008E */ sh $v0, 0x8e($s2) -/* CC57AC 80241F9C 2402001E */ addiu $v0, $zero, 0x1e -/* CC57B0 80241FA0 AE430028 */ sw $v1, 0x28($s2) -/* CC57B4 80241FA4 AE820070 */ sw $v0, 0x70($s4) -.L80241FA8: -/* CC57B8 80241FA8 8E830070 */ lw $v1, 0x70($s4) -/* CC57BC 80241FAC 2402000D */ addiu $v0, $zero, 0xd -/* CC57C0 80241FB0 10620010 */ beq $v1, $v0, .L80241FF4 -/* CC57C4 80241FB4 2862000E */ slti $v0, $v1, 0xe -/* CC57C8 80241FB8 10400005 */ beqz $v0, .L80241FD0 -/* CC57CC 80241FBC 2402000C */ addiu $v0, $zero, 0xc -/* CC57D0 80241FC0 10620008 */ beq $v1, $v0, .L80241FE4 -/* CC57D4 80241FC4 2410001F */ addiu $s0, $zero, 0x1f -/* CC57D8 80241FC8 08090808 */ j .L80242020 -/* CC57DC 80241FCC 00000000 */ nop -.L80241FD0: -/* CC57E0 80241FD0 2402000E */ addiu $v0, $zero, 0xe -/* CC57E4 80241FD4 1062000D */ beq $v1, $v0, .L8024200C -/* CC57E8 80241FD8 0280202D */ daddu $a0, $s4, $zero -/* CC57EC 80241FDC 08090806 */ j .L80242018 -/* CC57F0 80241FE0 00000000 */ nop -.L80241FE4: -/* CC57F4 80241FE4 0280202D */ daddu $a0, $s4, $zero -/* CC57F8 80241FE8 02C0282D */ daddu $a1, $s6, $zero -/* CC57FC 80241FEC 0C0903A1 */ jal func_80240E84_CC4694 -/* CC5800 80241FF0 02A0302D */ daddu $a2, $s5, $zero -.L80241FF4: -/* CC5804 80241FF4 0280202D */ daddu $a0, $s4, $zero -/* CC5808 80241FF8 02C0282D */ daddu $a1, $s6, $zero -/* CC580C 80241FFC 0C0903EE */ jal func_80240FB8 -/* CC5810 80242000 02A0302D */ daddu $a2, $s5, $zero -/* CC5814 80242004 08090806 */ j .L80242018 -/* CC5818 80242008 00000000 */ nop -.L8024200C: -/* CC581C 8024200C 02C0282D */ daddu $a1, $s6, $zero -/* CC5820 80242010 0C090407 */ jal func_8024101C -/* CC5824 80242014 02A0302D */ daddu $a2, $s5, $zero -.L80242018: -/* CC5828 80242018 8E830070 */ lw $v1, 0x70($s4) -/* CC582C 8024201C 2410001F */ addiu $s0, $zero, 0x1f -.L80242020: -/* CC5830 80242020 1070001B */ beq $v1, $s0, .L80242090 -/* CC5834 80242024 28620020 */ slti $v0, $v1, 0x20 -/* CC5838 80242028 10400005 */ beqz $v0, .L80242040 -/* CC583C 8024202C 2402001E */ addiu $v0, $zero, 0x1e -/* CC5840 80242030 1062000A */ beq $v1, $v0, .L8024205C -/* CC5844 80242034 00000000 */ nop -/* CC5848 80242038 08090843 */ j .L8024210C -/* CC584C 8024203C 00000000 */ nop -.L80242040: -/* CC5850 80242040 24020020 */ addiu $v0, $zero, 0x20 -/* CC5854 80242044 10620022 */ beq $v1, $v0, .L802420D0 -/* CC5858 80242048 24020021 */ addiu $v0, $zero, 0x21 -/* CC585C 8024204C 10620029 */ beq $v1, $v0, .L802420F4 -/* CC5860 80242050 00000000 */ nop -/* CC5864 80242054 08090843 */ j .L8024210C -/* CC5868 80242058 00000000 */ nop -.L8024205C: -/* CC586C 8024205C 9642008E */ lhu $v0, 0x8e($s2) -/* CC5870 80242060 2442FFFF */ addiu $v0, $v0, -1 -/* CC5874 80242064 A642008E */ sh $v0, 0x8e($s2) -/* CC5878 80242068 00021400 */ sll $v0, $v0, 0x10 -/* CC587C 8024206C 1C400027 */ bgtz $v0, .L8024210C -/* CC5880 80242070 00000000 */ nop -/* CC5884 80242074 0C00FB3A */ jal get_enemy -/* CC5888 80242078 8E64007C */ lw $a0, 0x7c($s3) -/* CC588C 8024207C 24030002 */ addiu $v1, $zero, 2 -/* CC5890 80242080 AC430094 */ sw $v1, 0x94($v0) -/* CC5894 80242084 24020005 */ addiu $v0, $zero, 5 -/* CC5898 80242088 A642008E */ sh $v0, 0x8e($s2) -/* CC589C 8024208C AE900070 */ sw $s0, 0x70($s4) -.L80242090: -/* CC58A0 80242090 9642008E */ lhu $v0, 0x8e($s2) -/* CC58A4 80242094 2442FFFF */ addiu $v0, $v0, -1 -/* CC58A8 80242098 A642008E */ sh $v0, 0x8e($s2) -/* CC58AC 8024209C 00021400 */ sll $v0, $v0, 0x10 -/* CC58B0 802420A0 1C40001A */ bgtz $v0, .L8024210C -/* CC58B4 802420A4 3C020049 */ lui $v0, 0x49 -/* CC58B8 802420A8 34420015 */ ori $v0, $v0, 0x15 -/* CC58BC 802420AC AE420028 */ sw $v0, 0x28($s2) -/* CC58C0 802420B0 0C00FB3A */ jal get_enemy -/* CC58C4 802420B4 8E64007C */ lw $a0, 0x7c($s3) -/* CC58C8 802420B8 24030003 */ addiu $v1, $zero, 3 -/* CC58CC 802420BC AC430094 */ sw $v1, 0x94($v0) -/* CC58D0 802420C0 2402000A */ addiu $v0, $zero, 0xa -/* CC58D4 802420C4 A642008E */ sh $v0, 0x8e($s2) -/* CC58D8 802420C8 24020020 */ addiu $v0, $zero, 0x20 -/* CC58DC 802420CC AE820070 */ sw $v0, 0x70($s4) -.L802420D0: -/* CC58E0 802420D0 9642008E */ lhu $v0, 0x8e($s2) -/* CC58E4 802420D4 2442FFFF */ addiu $v0, $v0, -1 -/* CC58E8 802420D8 A642008E */ sh $v0, 0x8e($s2) -/* CC58EC 802420DC 00021400 */ sll $v0, $v0, 0x10 -/* CC58F0 802420E0 1C40000A */ bgtz $v0, .L8024210C -/* CC58F4 802420E4 24020003 */ addiu $v0, $zero, 3 -/* CC58F8 802420E8 A642008E */ sh $v0, 0x8e($s2) -/* CC58FC 802420EC 24020021 */ addiu $v0, $zero, 0x21 -/* CC5900 802420F0 AE820070 */ sw $v0, 0x70($s4) -.L802420F4: -/* CC5904 802420F4 9642008E */ lhu $v0, 0x8e($s2) -/* CC5908 802420F8 2442FFFF */ addiu $v0, $v0, -1 -/* CC590C 802420FC A642008E */ sh $v0, 0x8e($s2) -/* CC5910 80242100 00021400 */ sll $v0, $v0, 0x10 -/* CC5914 80242104 58400001 */ blezl $v0, .L8024210C -/* CC5918 80242108 AE800070 */ sw $zero, 0x70($s4) -.L8024210C: -/* CC591C 8024210C 8E820070 */ lw $v0, 0x70($s4) -/* CC5920 80242110 2442FFE2 */ addiu $v0, $v0, -0x1e -/* CC5924 80242114 2C420002 */ sltiu $v0, $v0, 2 -/* CC5928 80242118 10400054 */ beqz $v0, .L8024226C -/* CC592C 8024211C 0000102D */ daddu $v0, $zero, $zero -/* CC5930 80242120 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* CC5934 80242124 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* CC5938 80242128 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CC593C 8024212C 8E020000 */ lw $v0, ($s0) -/* CC5940 80242130 C64E0040 */ lwc1 $f14, 0x40($s2) -/* CC5944 80242134 8C460028 */ lw $a2, 0x28($v0) -/* CC5948 80242138 0C00A720 */ jal atan2 -/* CC594C 8024213C 8C470030 */ lw $a3, 0x30($v0) -/* CC5950 80242140 8E460038 */ lw $a2, 0x38($s2) -/* CC5954 80242144 8E470040 */ lw $a3, 0x40($s2) -/* CC5958 80242148 8E020000 */ lw $v0, ($s0) -/* CC595C 8024214C E640000C */ swc1 $f0, 0xc($s2) -/* CC5960 80242150 C44C0028 */ lwc1 $f12, 0x28($v0) -/* CC5964 80242154 0C00A7B5 */ jal dist2D -/* CC5968 80242158 C44E0030 */ lwc1 $f14, 0x30($v0) -/* CC596C 8024215C C6A20008 */ lwc1 $f2, 8($s5) -/* CC5970 80242160 468010A0 */ cvt.s.w $f2, $f2 -/* CC5974 80242164 44051000 */ mfc1 $a1, $f2 -/* CC5978 80242168 C6A2000C */ lwc1 $f2, 0xc($s5) -/* CC597C 8024216C 468010A0 */ cvt.s.w $f2, $f2 -/* CC5980 80242170 44061000 */ mfc1 $a2, $f2 -/* CC5984 80242174 C6420040 */ lwc1 $f2, 0x40($s2) -/* CC5988 80242178 E7A20010 */ swc1 $f2, 0x10($sp) -/* CC598C 8024217C C6A20010 */ lwc1 $f2, 0x10($s5) -/* CC5990 80242180 468010A0 */ cvt.s.w $f2, $f2 -/* CC5994 80242184 E7A20014 */ swc1 $f2, 0x14($sp) -/* CC5998 80242188 C6A20014 */ lwc1 $f2, 0x14($s5) -/* CC599C 8024218C 468010A0 */ cvt.s.w $f2, $f2 -/* CC59A0 80242190 E7A20018 */ swc1 $f2, 0x18($sp) -/* CC59A4 80242194 8EA40004 */ lw $a0, 4($s5) -/* CC59A8 80242198 8E470038 */ lw $a3, 0x38($s2) -/* CC59AC 8024219C 0C0123F5 */ jal is_point_within_region -/* CC59B0 802421A0 46000506 */ mov.s $f20, $f0 -/* CC59B4 802421A4 14400031 */ bnez $v0, .L8024226C -/* CC59B8 802421A8 0000102D */ daddu $v0, $zero, $zero -/* CC59BC 802421AC 3C01403E */ lui $at, 0x403e -/* CC59C0 802421B0 44810800 */ mtc1 $at, $f1 -/* CC59C4 802421B4 44800000 */ mtc1 $zero, $f0 -/* CC59C8 802421B8 4600A0A1 */ cvt.d.s $f2, $f20 -/* CC59CC 802421BC 4622003C */ c.lt.d $f0, $f2 -/* CC59D0 802421C0 00000000 */ nop -/* CC59D4 802421C4 45000029 */ bc1f .L8024226C -/* CC59D8 802421C8 00000000 */ nop -/* CC59DC 802421CC 8642008C */ lh $v0, 0x8c($s2) -/* CC59E0 802421D0 54400026 */ bnel $v0, $zero, .L8024226C -/* CC59E4 802421D4 0000102D */ daddu $v0, $zero, $zero -/* CC59E8 802421D8 3C014034 */ lui $at, 0x4034 -/* CC59EC 802421DC 44810800 */ mtc1 $at, $f1 -/* CC59F0 802421E0 44800000 */ mtc1 $zero, $f0 -/* CC59F4 802421E4 00000000 */ nop -/* CC59F8 802421E8 46201001 */ sub.d $f0, $f2, $f0 -/* CC59FC 802421EC 44801000 */ mtc1 $zero, $f2 -/* CC5A00 802421F0 44801800 */ mtc1 $zero, $f3 -/* CC5A04 802421F4 46200120 */ cvt.s.d $f4, $f0 -/* CC5A08 802421F8 46002021 */ cvt.d.s $f0, $f4 -/* CC5A0C 802421FC 4622003C */ c.lt.d $f0, $f2 -/* CC5A10 80242200 00000000 */ nop -/* CC5A14 80242204 45000002 */ bc1f .L80242210 -/* CC5A18 80242208 00000000 */ nop -/* CC5A1C 8024220C 44802000 */ mtc1 $zero, $f4 -.L80242210: -/* CC5A20 80242210 3C014069 */ lui $at, 0x4069 -/* CC5A24 80242214 44811800 */ mtc1 $at, $f3 -/* CC5A28 80242218 44801000 */ mtc1 $zero, $f2 -/* CC5A2C 8024221C 46002021 */ cvt.d.s $f0, $f4 -/* CC5A30 80242220 4620103C */ c.lt.d $f2, $f0 -/* CC5A34 80242224 00000000 */ nop -/* CC5A38 80242228 45000003 */ bc1f .L80242238 -/* CC5A3C 8024222C 240200C8 */ addiu $v0, $zero, 0xc8 -/* CC5A40 80242230 3C014348 */ lui $at, 0x4348 -/* CC5A44 80242234 44812000 */ mtc1 $at, $f4 -.L80242238: -/* CC5A48 80242238 AFA20010 */ sw $v0, 0x10($sp) -/* CC5A4C 8024223C 8EC50000 */ lw $a1, ($s6) -/* CC5A50 80242240 8EC60018 */ lw $a2, 0x18($s6) -/* CC5A54 80242244 4600218D */ trunc.w.s $f6, $f4 -/* CC5A58 80242248 44073000 */ mfc1 $a3, $f6 -/* CC5A5C 8024224C 0C00A8ED */ jal update_lerp -/* CC5A60 80242250 0000202D */ daddu $a0, $zero, $zero -/* CC5A64 80242254 44050000 */ mfc1 $a1, $f0 -/* CC5A68 80242258 8E46000C */ lw $a2, 0xc($s2) -/* CC5A6C 8024225C 0240202D */ daddu $a0, $s2, $zero -/* CC5A70 80242260 0C00EA95 */ jal npc_move_heading -/* CC5A74 80242264 AC850018 */ sw $a1, 0x18($a0) -/* CC5A78 80242268 0000102D */ daddu $v0, $zero, $zero -.L8024226C: -/* CC5A7C 8024226C 8FBF005C */ lw $ra, 0x5c($sp) -/* CC5A80 80242270 8FB60058 */ lw $s6, 0x58($sp) -/* CC5A84 80242274 8FB50054 */ lw $s5, 0x54($sp) -/* CC5A88 80242278 8FB40050 */ lw $s4, 0x50($sp) -/* CC5A8C 8024227C 8FB3004C */ lw $s3, 0x4c($sp) -/* CC5A90 80242280 8FB20048 */ lw $s2, 0x48($sp) -/* CC5A94 80242284 8FB10044 */ lw $s1, 0x44($sp) -/* CC5A98 80242288 8FB00040 */ lw $s0, 0x40($sp) -/* CC5A9C 8024228C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CC5AA0 80242290 03E00008 */ jr $ra -/* CC5AA4 80242294 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s new file mode 100644 index 0000000000..5f9d6b7b3b --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80241DB8_CC55C8.s @@ -0,0 +1,341 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DB8_CC55C8 +/* CC55C8 80241DB8 27BDFF98 */ addiu $sp, $sp, -0x68 +/* CC55CC 80241DBC AFB40050 */ sw $s4, 0x50($sp) +/* CC55D0 80241DC0 0080A02D */ daddu $s4, $a0, $zero +/* CC55D4 80241DC4 AFBF005C */ sw $ra, 0x5c($sp) +/* CC55D8 80241DC8 AFB60058 */ sw $s6, 0x58($sp) +/* CC55DC 80241DCC AFB50054 */ sw $s5, 0x54($sp) +/* CC55E0 80241DD0 AFB3004C */ sw $s3, 0x4c($sp) +/* CC55E4 80241DD4 AFB20048 */ sw $s2, 0x48($sp) +/* CC55E8 80241DD8 AFB10044 */ sw $s1, 0x44($sp) +/* CC55EC 80241DDC AFB00040 */ sw $s0, 0x40($sp) +/* CC55F0 80241DE0 F7B40060 */ sdc1 $f20, 0x60($sp) +/* CC55F4 80241DE4 8E930148 */ lw $s3, 0x148($s4) +/* CC55F8 80241DE8 86640008 */ lh $a0, 8($s3) +/* CC55FC 80241DEC 8E90000C */ lw $s0, 0xc($s4) +/* CC5600 80241DF0 0C00EABB */ jal get_npc_unsafe +/* CC5604 80241DF4 00A0882D */ daddu $s1, $a1, $zero +/* CC5608 80241DF8 0280202D */ daddu $a0, $s4, $zero +/* CC560C 80241DFC 8E050000 */ lw $a1, ($s0) +/* CC5610 80241E00 0C0B1EAF */ jal get_variable +/* CC5614 80241E04 0040902D */ daddu $s2, $v0, $zero +/* CC5618 80241E08 AFA00020 */ sw $zero, 0x20($sp) +/* CC561C 80241E0C 8E6300D0 */ lw $v1, 0xd0($s3) +/* CC5620 80241E10 8C630030 */ lw $v1, 0x30($v1) +/* CC5624 80241E14 AFA30024 */ sw $v1, 0x24($sp) +/* CC5628 80241E18 8E6300D0 */ lw $v1, 0xd0($s3) +/* CC562C 80241E1C 8C63001C */ lw $v1, 0x1c($v1) +/* CC5630 80241E20 AFA30028 */ sw $v1, 0x28($sp) +/* CC5634 80241E24 8E6300D0 */ lw $v1, 0xd0($s3) +/* CC5638 80241E28 8C630024 */ lw $v1, 0x24($v1) +/* CC563C 80241E2C AFA3002C */ sw $v1, 0x2c($sp) +/* CC5640 80241E30 8E6300D0 */ lw $v1, 0xd0($s3) +/* CC5644 80241E34 8C630028 */ lw $v1, 0x28($v1) +/* CC5648 80241E38 27B50020 */ addiu $s5, $sp, 0x20 +/* CC564C 80241E3C AFA30030 */ sw $v1, 0x30($sp) +/* CC5650 80241E40 8E6300D0 */ lw $v1, 0xd0($s3) +/* CC5654 80241E44 3C0142F0 */ lui $at, 0x42f0 +/* CC5658 80241E48 44810000 */ mtc1 $at, $f0 +/* CC565C 80241E4C 8C63002C */ lw $v1, 0x2c($v1) +/* CC5660 80241E50 0040B02D */ daddu $s6, $v0, $zero +/* CC5664 80241E54 E7A00038 */ swc1 $f0, 0x38($sp) +/* CC5668 80241E58 A7A0003C */ sh $zero, 0x3c($sp) +/* CC566C 80241E5C 12200007 */ beqz $s1, .L80241E7C +/* CC5670 80241E60 AFA30034 */ sw $v1, 0x34($sp) +/* CC5674 80241E64 0240202D */ daddu $a0, $s2, $zero +/* CC5678 80241E68 0260282D */ daddu $a1, $s3, $zero +/* CC567C 80241E6C 0280302D */ daddu $a2, $s4, $zero +/* CC5680 80241E70 0C0904EB */ jal func_802413AC_CC4BBC +/* CC5684 80241E74 02C0382D */ daddu $a3, $s6, $zero +/* CC5688 80241E78 AE800070 */ sw $zero, 0x70($s4) +.L80241E7C: +/* CC568C 80241E7C 2402FFFD */ addiu $v0, $zero, -3 +/* CC5690 80241E80 A24200AB */ sb $v0, 0xab($s2) +/* CC5694 80241E84 8E6300B0 */ lw $v1, 0xb0($s3) +/* CC5698 80241E88 30620004 */ andi $v0, $v1, 4 +/* CC569C 80241E8C 10400007 */ beqz $v0, .L80241EAC +/* CC56A0 80241E90 00000000 */ nop +/* CC56A4 80241E94 826200B4 */ lb $v0, 0xb4($s3) +/* CC56A8 80241E98 144000F4 */ bnez $v0, .L8024226C +/* CC56AC 80241E9C 0000102D */ daddu $v0, $zero, $zero +/* CC56B0 80241EA0 2402FFFB */ addiu $v0, $zero, -5 +/* CC56B4 80241EA4 00621024 */ and $v0, $v1, $v0 +/* CC56B8 80241EA8 AE6200B0 */ sw $v0, 0xb0($s3) +.L80241EAC: +/* CC56BC 80241EAC 8E830070 */ lw $v1, 0x70($s4) +/* CC56C0 80241EB0 24020001 */ addiu $v0, $zero, 1 +/* CC56C4 80241EB4 10620011 */ beq $v1, $v0, .L80241EFC +/* CC56C8 80241EB8 28620002 */ slti $v0, $v1, 2 +/* CC56CC 80241EBC 10400005 */ beqz $v0, .L80241ED4 +/* CC56D0 80241EC0 24020002 */ addiu $v0, $zero, 2 +/* CC56D4 80241EC4 10600009 */ beqz $v1, .L80241EEC +/* CC56D8 80241EC8 2402000C */ addiu $v0, $zero, 0xc +/* CC56DC 80241ECC 080907CF */ j .L80241F3C +/* CC56E0 80241ED0 00000000 */ nop +.L80241ED4: +/* CC56E4 80241ED4 1062000F */ beq $v1, $v0, .L80241F14 +/* CC56E8 80241ED8 24020003 */ addiu $v0, $zero, 3 +/* CC56EC 80241EDC 10620012 */ beq $v1, $v0, .L80241F28 +/* CC56F0 80241EE0 0280202D */ daddu $a0, $s4, $zero +/* CC56F4 80241EE4 080907CD */ j .L80241F34 +/* CC56F8 80241EE8 00000000 */ nop +.L80241EEC: +/* CC56FC 80241EEC 0280202D */ daddu $a0, $s4, $zero +/* CC5700 80241EF0 02C0282D */ daddu $a1, $s6, $zero +/* CC5704 80241EF4 0C090071 */ jal func_802401C4_CC39D4 +/* CC5708 80241EF8 02A0302D */ daddu $a2, $s5, $zero +.L80241EFC: +/* CC570C 80241EFC 0280202D */ daddu $a0, $s4, $zero +/* CC5710 80241F00 02C0282D */ daddu $a1, $s6, $zero +/* CC5714 80241F04 0C0905C1 */ jal func_80241704_CC4F14 +/* CC5718 80241F08 02A0302D */ daddu $a2, $s5, $zero +/* CC571C 80241F0C 080907CD */ j .L80241F34 +/* CC5720 80241F10 00000000 */ nop +.L80241F14: +/* CC5724 80241F14 0280202D */ daddu $a0, $s4, $zero +/* CC5728 80241F18 02C0282D */ daddu $a1, $s6, $zero +/* CC572C 80241F1C 0C090267 */ jal func_8024099C_CC41AC +/* CC5730 80241F20 02A0302D */ daddu $a2, $s5, $zero +/* CC5734 80241F24 0280202D */ daddu $a0, $s4, $zero +.L80241F28: +/* CC5738 80241F28 02C0282D */ daddu $a1, $s6, $zero +/* CC573C 80241F2C 0C0906DA */ jal func_80241B68_CC5378 +/* CC5740 80241F30 02A0302D */ daddu $a2, $s5, $zero +.L80241F34: +/* CC5744 80241F34 8E830070 */ lw $v1, 0x70($s4) +/* CC5748 80241F38 2402000C */ addiu $v0, $zero, 0xc +.L80241F3C: +/* CC574C 80241F3C 1462001A */ bne $v1, $v0, .L80241FA8 +/* CC5750 80241F40 00000000 */ nop +/* CC5754 80241F44 C64C0038 */ lwc1 $f12, 0x38($s2) +/* CC5758 80241F48 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CC575C 80241F4C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CC5760 80241F50 C64E0040 */ lwc1 $f14, 0x40($s2) +/* CC5764 80241F54 8C460028 */ lw $a2, 0x28($v0) +/* CC5768 80241F58 0C00A720 */ jal atan2 +/* CC576C 80241F5C 8C470030 */ lw $a3, 0x30($v0) +/* CC5770 80241F60 0C0905AF */ jal func_802416BC_CC4ECC +/* CC5774 80241F64 E640000C */ swc1 $f0, 0xc($s2) +/* CC5778 80241F68 0440000F */ bltz $v0, .L80241FA8 +/* CC577C 80241F6C AE62007C */ sw $v0, 0x7c($s3) +/* CC5780 80241F70 0C00FB3A */ jal get_enemy +/* CC5784 80241F74 0040202D */ daddu $a0, $v0, $zero +/* CC5788 80241F78 3C030049 */ lui $v1, 0x49 +/* CC578C 80241F7C 0040202D */ daddu $a0, $v0, $zero +/* CC5790 80241F80 24020001 */ addiu $v0, $zero, 1 +/* CC5794 80241F84 AC820094 */ sw $v0, 0x94($a0) +/* CC5798 80241F88 86620008 */ lh $v0, 8($s3) +/* CC579C 80241F8C 34630014 */ ori $v1, $v1, 0x14 +/* CC57A0 80241F90 AC820098 */ sw $v0, 0x98($a0) +/* CC57A4 80241F94 2402000F */ addiu $v0, $zero, 0xf +/* CC57A8 80241F98 A642008E */ sh $v0, 0x8e($s2) +/* CC57AC 80241F9C 2402001E */ addiu $v0, $zero, 0x1e +/* CC57B0 80241FA0 AE430028 */ sw $v1, 0x28($s2) +/* CC57B4 80241FA4 AE820070 */ sw $v0, 0x70($s4) +.L80241FA8: +/* CC57B8 80241FA8 8E830070 */ lw $v1, 0x70($s4) +/* CC57BC 80241FAC 2402000D */ addiu $v0, $zero, 0xd +/* CC57C0 80241FB0 10620010 */ beq $v1, $v0, .L80241FF4 +/* CC57C4 80241FB4 2862000E */ slti $v0, $v1, 0xe +/* CC57C8 80241FB8 10400005 */ beqz $v0, .L80241FD0 +/* CC57CC 80241FBC 2402000C */ addiu $v0, $zero, 0xc +/* CC57D0 80241FC0 10620008 */ beq $v1, $v0, .L80241FE4 +/* CC57D4 80241FC4 2410001F */ addiu $s0, $zero, 0x1f +/* CC57D8 80241FC8 08090808 */ j .L80242020 +/* CC57DC 80241FCC 00000000 */ nop +.L80241FD0: +/* CC57E0 80241FD0 2402000E */ addiu $v0, $zero, 0xe +/* CC57E4 80241FD4 1062000D */ beq $v1, $v0, .L8024200C +/* CC57E8 80241FD8 0280202D */ daddu $a0, $s4, $zero +/* CC57EC 80241FDC 08090806 */ j .L80242018 +/* CC57F0 80241FE0 00000000 */ nop +.L80241FE4: +/* CC57F4 80241FE4 0280202D */ daddu $a0, $s4, $zero +/* CC57F8 80241FE8 02C0282D */ daddu $a1, $s6, $zero +/* CC57FC 80241FEC 0C0903A1 */ jal func_80240E84_CC4694 +/* CC5800 80241FF0 02A0302D */ daddu $a2, $s5, $zero +.L80241FF4: +/* CC5804 80241FF4 0280202D */ daddu $a0, $s4, $zero +/* CC5808 80241FF8 02C0282D */ daddu $a1, $s6, $zero +/* CC580C 80241FFC 0C0903EE */ jal func_80240FB8_CC47C8 +/* CC5810 80242000 02A0302D */ daddu $a2, $s5, $zero +/* CC5814 80242004 08090806 */ j .L80242018 +/* CC5818 80242008 00000000 */ nop +.L8024200C: +/* CC581C 8024200C 02C0282D */ daddu $a1, $s6, $zero +/* CC5820 80242010 0C090407 */ jal func_8024101C_CC482C +/* CC5824 80242014 02A0302D */ daddu $a2, $s5, $zero +.L80242018: +/* CC5828 80242018 8E830070 */ lw $v1, 0x70($s4) +/* CC582C 8024201C 2410001F */ addiu $s0, $zero, 0x1f +.L80242020: +/* CC5830 80242020 1070001B */ beq $v1, $s0, .L80242090 +/* CC5834 80242024 28620020 */ slti $v0, $v1, 0x20 +/* CC5838 80242028 10400005 */ beqz $v0, .L80242040 +/* CC583C 8024202C 2402001E */ addiu $v0, $zero, 0x1e +/* CC5840 80242030 1062000A */ beq $v1, $v0, .L8024205C +/* CC5844 80242034 00000000 */ nop +/* CC5848 80242038 08090843 */ j .L8024210C +/* CC584C 8024203C 00000000 */ nop +.L80242040: +/* CC5850 80242040 24020020 */ addiu $v0, $zero, 0x20 +/* CC5854 80242044 10620022 */ beq $v1, $v0, .L802420D0 +/* CC5858 80242048 24020021 */ addiu $v0, $zero, 0x21 +/* CC585C 8024204C 10620029 */ beq $v1, $v0, .L802420F4 +/* CC5860 80242050 00000000 */ nop +/* CC5864 80242054 08090843 */ j .L8024210C +/* CC5868 80242058 00000000 */ nop +.L8024205C: +/* CC586C 8024205C 9642008E */ lhu $v0, 0x8e($s2) +/* CC5870 80242060 2442FFFF */ addiu $v0, $v0, -1 +/* CC5874 80242064 A642008E */ sh $v0, 0x8e($s2) +/* CC5878 80242068 00021400 */ sll $v0, $v0, 0x10 +/* CC587C 8024206C 1C400027 */ bgtz $v0, .L8024210C +/* CC5880 80242070 00000000 */ nop +/* CC5884 80242074 0C00FB3A */ jal get_enemy +/* CC5888 80242078 8E64007C */ lw $a0, 0x7c($s3) +/* CC588C 8024207C 24030002 */ addiu $v1, $zero, 2 +/* CC5890 80242080 AC430094 */ sw $v1, 0x94($v0) +/* CC5894 80242084 24020005 */ addiu $v0, $zero, 5 +/* CC5898 80242088 A642008E */ sh $v0, 0x8e($s2) +/* CC589C 8024208C AE900070 */ sw $s0, 0x70($s4) +.L80242090: +/* CC58A0 80242090 9642008E */ lhu $v0, 0x8e($s2) +/* CC58A4 80242094 2442FFFF */ addiu $v0, $v0, -1 +/* CC58A8 80242098 A642008E */ sh $v0, 0x8e($s2) +/* CC58AC 8024209C 00021400 */ sll $v0, $v0, 0x10 +/* CC58B0 802420A0 1C40001A */ bgtz $v0, .L8024210C +/* CC58B4 802420A4 3C020049 */ lui $v0, 0x49 +/* CC58B8 802420A8 34420015 */ ori $v0, $v0, 0x15 +/* CC58BC 802420AC AE420028 */ sw $v0, 0x28($s2) +/* CC58C0 802420B0 0C00FB3A */ jal get_enemy +/* CC58C4 802420B4 8E64007C */ lw $a0, 0x7c($s3) +/* CC58C8 802420B8 24030003 */ addiu $v1, $zero, 3 +/* CC58CC 802420BC AC430094 */ sw $v1, 0x94($v0) +/* CC58D0 802420C0 2402000A */ addiu $v0, $zero, 0xa +/* CC58D4 802420C4 A642008E */ sh $v0, 0x8e($s2) +/* CC58D8 802420C8 24020020 */ addiu $v0, $zero, 0x20 +/* CC58DC 802420CC AE820070 */ sw $v0, 0x70($s4) +.L802420D0: +/* CC58E0 802420D0 9642008E */ lhu $v0, 0x8e($s2) +/* CC58E4 802420D4 2442FFFF */ addiu $v0, $v0, -1 +/* CC58E8 802420D8 A642008E */ sh $v0, 0x8e($s2) +/* CC58EC 802420DC 00021400 */ sll $v0, $v0, 0x10 +/* CC58F0 802420E0 1C40000A */ bgtz $v0, .L8024210C +/* CC58F4 802420E4 24020003 */ addiu $v0, $zero, 3 +/* CC58F8 802420E8 A642008E */ sh $v0, 0x8e($s2) +/* CC58FC 802420EC 24020021 */ addiu $v0, $zero, 0x21 +/* CC5900 802420F0 AE820070 */ sw $v0, 0x70($s4) +.L802420F4: +/* CC5904 802420F4 9642008E */ lhu $v0, 0x8e($s2) +/* CC5908 802420F8 2442FFFF */ addiu $v0, $v0, -1 +/* CC590C 802420FC A642008E */ sh $v0, 0x8e($s2) +/* CC5910 80242100 00021400 */ sll $v0, $v0, 0x10 +/* CC5914 80242104 58400001 */ blezl $v0, .L8024210C +/* CC5918 80242108 AE800070 */ sw $zero, 0x70($s4) +.L8024210C: +/* CC591C 8024210C 8E820070 */ lw $v0, 0x70($s4) +/* CC5920 80242110 2442FFE2 */ addiu $v0, $v0, -0x1e +/* CC5924 80242114 2C420002 */ sltiu $v0, $v0, 2 +/* CC5928 80242118 10400054 */ beqz $v0, .L8024226C +/* CC592C 8024211C 0000102D */ daddu $v0, $zero, $zero +/* CC5930 80242120 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) +/* CC5934 80242124 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) +/* CC5938 80242128 C64C0038 */ lwc1 $f12, 0x38($s2) +/* CC593C 8024212C 8E020000 */ lw $v0, ($s0) +/* CC5940 80242130 C64E0040 */ lwc1 $f14, 0x40($s2) +/* CC5944 80242134 8C460028 */ lw $a2, 0x28($v0) +/* CC5948 80242138 0C00A720 */ jal atan2 +/* CC594C 8024213C 8C470030 */ lw $a3, 0x30($v0) +/* CC5950 80242140 8E460038 */ lw $a2, 0x38($s2) +/* CC5954 80242144 8E470040 */ lw $a3, 0x40($s2) +/* CC5958 80242148 8E020000 */ lw $v0, ($s0) +/* CC595C 8024214C E640000C */ swc1 $f0, 0xc($s2) +/* CC5960 80242150 C44C0028 */ lwc1 $f12, 0x28($v0) +/* CC5964 80242154 0C00A7B5 */ jal dist2D +/* CC5968 80242158 C44E0030 */ lwc1 $f14, 0x30($v0) +/* CC596C 8024215C C6A20008 */ lwc1 $f2, 8($s5) +/* CC5970 80242160 468010A0 */ cvt.s.w $f2, $f2 +/* CC5974 80242164 44051000 */ mfc1 $a1, $f2 +/* CC5978 80242168 C6A2000C */ lwc1 $f2, 0xc($s5) +/* CC597C 8024216C 468010A0 */ cvt.s.w $f2, $f2 +/* CC5980 80242170 44061000 */ mfc1 $a2, $f2 +/* CC5984 80242174 C6420040 */ lwc1 $f2, 0x40($s2) +/* CC5988 80242178 E7A20010 */ swc1 $f2, 0x10($sp) +/* CC598C 8024217C C6A20010 */ lwc1 $f2, 0x10($s5) +/* CC5990 80242180 468010A0 */ cvt.s.w $f2, $f2 +/* CC5994 80242184 E7A20014 */ swc1 $f2, 0x14($sp) +/* CC5998 80242188 C6A20014 */ lwc1 $f2, 0x14($s5) +/* CC599C 8024218C 468010A0 */ cvt.s.w $f2, $f2 +/* CC59A0 80242190 E7A20018 */ swc1 $f2, 0x18($sp) +/* CC59A4 80242194 8EA40004 */ lw $a0, 4($s5) +/* CC59A8 80242198 8E470038 */ lw $a3, 0x38($s2) +/* CC59AC 8024219C 0C0123F5 */ jal is_point_within_region +/* CC59B0 802421A0 46000506 */ mov.s $f20, $f0 +/* CC59B4 802421A4 14400031 */ bnez $v0, .L8024226C +/* CC59B8 802421A8 0000102D */ daddu $v0, $zero, $zero +/* CC59BC 802421AC 3C01403E */ lui $at, 0x403e +/* CC59C0 802421B0 44810800 */ mtc1 $at, $f1 +/* CC59C4 802421B4 44800000 */ mtc1 $zero, $f0 +/* CC59C8 802421B8 4600A0A1 */ cvt.d.s $f2, $f20 +/* CC59CC 802421BC 4622003C */ c.lt.d $f0, $f2 +/* CC59D0 802421C0 00000000 */ nop +/* CC59D4 802421C4 45000029 */ bc1f .L8024226C +/* CC59D8 802421C8 00000000 */ nop +/* CC59DC 802421CC 8642008C */ lh $v0, 0x8c($s2) +/* CC59E0 802421D0 54400026 */ bnel $v0, $zero, .L8024226C +/* CC59E4 802421D4 0000102D */ daddu $v0, $zero, $zero +/* CC59E8 802421D8 3C014034 */ lui $at, 0x4034 +/* CC59EC 802421DC 44810800 */ mtc1 $at, $f1 +/* CC59F0 802421E0 44800000 */ mtc1 $zero, $f0 +/* CC59F4 802421E4 00000000 */ nop +/* CC59F8 802421E8 46201001 */ sub.d $f0, $f2, $f0 +/* CC59FC 802421EC 44801000 */ mtc1 $zero, $f2 +/* CC5A00 802421F0 44801800 */ mtc1 $zero, $f3 +/* CC5A04 802421F4 46200120 */ cvt.s.d $f4, $f0 +/* CC5A08 802421F8 46002021 */ cvt.d.s $f0, $f4 +/* CC5A0C 802421FC 4622003C */ c.lt.d $f0, $f2 +/* CC5A10 80242200 00000000 */ nop +/* CC5A14 80242204 45000002 */ bc1f .L80242210 +/* CC5A18 80242208 00000000 */ nop +/* CC5A1C 8024220C 44802000 */ mtc1 $zero, $f4 +.L80242210: +/* CC5A20 80242210 3C014069 */ lui $at, 0x4069 +/* CC5A24 80242214 44811800 */ mtc1 $at, $f3 +/* CC5A28 80242218 44801000 */ mtc1 $zero, $f2 +/* CC5A2C 8024221C 46002021 */ cvt.d.s $f0, $f4 +/* CC5A30 80242220 4620103C */ c.lt.d $f2, $f0 +/* CC5A34 80242224 00000000 */ nop +/* CC5A38 80242228 45000003 */ bc1f .L80242238 +/* CC5A3C 8024222C 240200C8 */ addiu $v0, $zero, 0xc8 +/* CC5A40 80242230 3C014348 */ lui $at, 0x4348 +/* CC5A44 80242234 44812000 */ mtc1 $at, $f4 +.L80242238: +/* CC5A48 80242238 AFA20010 */ sw $v0, 0x10($sp) +/* CC5A4C 8024223C 8EC50000 */ lw $a1, ($s6) +/* CC5A50 80242240 8EC60018 */ lw $a2, 0x18($s6) +/* CC5A54 80242244 4600218D */ trunc.w.s $f6, $f4 +/* CC5A58 80242248 44073000 */ mfc1 $a3, $f6 +/* CC5A5C 8024224C 0C00A8ED */ jal update_lerp +/* CC5A60 80242250 0000202D */ daddu $a0, $zero, $zero +/* CC5A64 80242254 44050000 */ mfc1 $a1, $f0 +/* CC5A68 80242258 8E46000C */ lw $a2, 0xc($s2) +/* CC5A6C 8024225C 0240202D */ daddu $a0, $s2, $zero +/* CC5A70 80242260 0C00EA95 */ jal npc_move_heading +/* CC5A74 80242264 AC850018 */ sw $a1, 0x18($a0) +/* CC5A78 80242268 0000102D */ daddu $v0, $zero, $zero +.L8024226C: +/* CC5A7C 8024226C 8FBF005C */ lw $ra, 0x5c($sp) +/* CC5A80 80242270 8FB60058 */ lw $s6, 0x58($sp) +/* CC5A84 80242274 8FB50054 */ lw $s5, 0x54($sp) +/* CC5A88 80242278 8FB40050 */ lw $s4, 0x50($sp) +/* CC5A8C 8024227C 8FB3004C */ lw $s3, 0x4c($sp) +/* CC5A90 80242280 8FB20048 */ lw $s2, 0x48($sp) +/* CC5A94 80242284 8FB10044 */ lw $s1, 0x44($sp) +/* CC5A98 80242288 8FB00040 */ lw $s0, 0x40($sp) +/* CC5A9C 8024228C D7B40060 */ ldc1 $f20, 0x60($sp) +/* CC5AA0 80242290 03E00008 */ jr $ra +/* CC5AA4 80242294 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314.s deleted file mode 100644 index 0e0f94095a..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242314 -/* CC5B24 80242314 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CC5B28 80242318 AFB3001C */ sw $s3, 0x1c($sp) -/* CC5B2C 8024231C 0080982D */ daddu $s3, $a0, $zero -/* CC5B30 80242320 AFBF0020 */ sw $ra, 0x20($sp) -/* CC5B34 80242324 AFB20018 */ sw $s2, 0x18($sp) -/* CC5B38 80242328 AFB10014 */ sw $s1, 0x14($sp) -/* CC5B3C 8024232C AFB00010 */ sw $s0, 0x10($sp) -/* CC5B40 80242330 8E710148 */ lw $s1, 0x148($s3) -/* CC5B44 80242334 86240008 */ lh $a0, 8($s1) -/* CC5B48 80242338 0C00EABB */ jal get_npc_unsafe -/* CC5B4C 8024233C 00A0902D */ daddu $s2, $a1, $zero -/* CC5B50 80242340 0040802D */ daddu $s0, $v0, $zero -/* CC5B54 80242344 8602008E */ lh $v0, 0x8e($s0) -/* CC5B58 80242348 9603008E */ lhu $v1, 0x8e($s0) -/* CC5B5C 8024234C 18400005 */ blez $v0, .L80242364 -/* CC5B60 80242350 2462FFFF */ addiu $v0, $v1, -1 -/* CC5B64 80242354 A602008E */ sh $v0, 0x8e($s0) -/* CC5B68 80242358 00021400 */ sll $v0, $v0, 0x10 -/* CC5B6C 8024235C 1C400033 */ bgtz $v0, .L8024242C -/* CC5B70 80242360 00000000 */ nop -.L80242364: -/* CC5B74 80242364 8602008C */ lh $v0, 0x8c($s0) -/* CC5B78 80242368 14400030 */ bnez $v0, .L8024242C -/* CC5B7C 8024236C 00000000 */ nop -/* CC5B80 80242370 8E2200CC */ lw $v0, 0xcc($s1) -/* CC5B84 80242374 8C420024 */ lw $v0, 0x24($v0) -/* CC5B88 80242378 AE020028 */ sw $v0, 0x28($s0) -/* CC5B8C 8024237C C6400018 */ lwc1 $f0, 0x18($s2) -/* CC5B90 80242380 E6000018 */ swc1 $f0, 0x18($s0) -/* CC5B94 80242384 8E230088 */ lw $v1, 0x88($s1) -/* CC5B98 80242388 24020005 */ addiu $v0, $zero, 5 -/* CC5B9C 8024238C 10620005 */ beq $v1, $v0, .L802423A4 -/* CC5BA0 80242390 00000000 */ nop -/* CC5BA4 80242394 10600003 */ beqz $v1, .L802423A4 -/* CC5BA8 80242398 24020001 */ addiu $v0, $zero, 1 -/* CC5BAC 8024239C 14620006 */ bne $v1, $v0, .L802423B8 -/* CC5BB0 802423A0 00000000 */ nop -.L802423A4: -/* CC5BB4 802423A4 8E220084 */ lw $v0, 0x84($s1) -/* CC5BB8 802423A8 00021FC2 */ srl $v1, $v0, 0x1f -/* CC5BBC 802423AC 00431021 */ addu $v0, $v0, $v1 -/* CC5BC0 802423B0 00021043 */ sra $v0, $v0, 1 -/* CC5BC4 802423B4 A60200A8 */ sh $v0, 0xa8($s0) -.L802423B8: -/* CC5BC8 802423B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CC5BCC 802423BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CC5BD0 802423C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CC5BD4 802423C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CC5BD8 802423C8 8C460028 */ lw $a2, 0x28($v0) -/* CC5BDC 802423CC 0C00A7B5 */ jal dist2D -/* CC5BE0 802423D0 8C470030 */ lw $a3, 0x30($v0) -/* CC5BE4 802423D4 C6020018 */ lwc1 $f2, 0x18($s0) -/* CC5BE8 802423D8 46020003 */ div.s $f0, $f0, $f2 -/* CC5BEC 802423DC 3C018024 */ lui $at, 0x8024 -/* CC5BF0 802423E0 D4227A88 */ ldc1 $f2, 0x7a88($at) -/* CC5BF4 802423E4 46000021 */ cvt.d.s $f0, $f0 -/* CC5BF8 802423E8 46220000 */ add.d $f0, $f0, $f2 -/* CC5BFC 802423EC 4620010D */ trunc.w.d $f4, $f0 -/* CC5C00 802423F0 44022000 */ mfc1 $v0, $f4 -/* CC5C04 802423F4 00000000 */ nop -/* CC5C08 802423F8 A602008E */ sh $v0, 0x8e($s0) -/* CC5C0C 802423FC 00021400 */ sll $v0, $v0, 0x10 -/* CC5C10 80242400 8E230078 */ lw $v1, 0x78($s1) -/* CC5C14 80242404 00021403 */ sra $v0, $v0, 0x10 -/* CC5C18 80242408 0043102A */ slt $v0, $v0, $v1 -/* CC5C1C 8024240C 10400003 */ beqz $v0, .L8024241C -/* CC5C20 80242410 00000000 */ nop -/* CC5C24 80242414 9622007A */ lhu $v0, 0x7a($s1) -/* CC5C28 80242418 A602008E */ sh $v0, 0x8e($s0) -.L8024241C: -/* CC5C2C 8024241C 8602008E */ lh $v0, 0x8e($s0) -/* CC5C30 80242420 AE22007C */ sw $v0, 0x7c($s1) -/* CC5C34 80242424 2402000E */ addiu $v0, $zero, 0xe -/* CC5C38 80242428 AE620070 */ sw $v0, 0x70($s3) -.L8024242C: -/* CC5C3C 8024242C 8FBF0020 */ lw $ra, 0x20($sp) -/* CC5C40 80242430 8FB3001C */ lw $s3, 0x1c($sp) -/* CC5C44 80242434 8FB20018 */ lw $s2, 0x18($sp) -/* CC5C48 80242438 8FB10014 */ lw $s1, 0x14($sp) -/* CC5C4C 8024243C 8FB00010 */ lw $s0, 0x10($sp) -/* CC5C50 80242440 03E00008 */ jr $ra -/* CC5C54 80242444 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s new file mode 100644 index 0000000000..6debec3dca --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242314_CC5B24.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242314_CC5B24 +/* CC5B24 80242314 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* CC5B28 80242318 AFB3001C */ sw $s3, 0x1c($sp) +/* CC5B2C 8024231C 0080982D */ daddu $s3, $a0, $zero +/* CC5B30 80242320 AFBF0020 */ sw $ra, 0x20($sp) +/* CC5B34 80242324 AFB20018 */ sw $s2, 0x18($sp) +/* CC5B38 80242328 AFB10014 */ sw $s1, 0x14($sp) +/* CC5B3C 8024232C AFB00010 */ sw $s0, 0x10($sp) +/* CC5B40 80242330 8E710148 */ lw $s1, 0x148($s3) +/* CC5B44 80242334 86240008 */ lh $a0, 8($s1) +/* CC5B48 80242338 0C00EABB */ jal get_npc_unsafe +/* CC5B4C 8024233C 00A0902D */ daddu $s2, $a1, $zero +/* CC5B50 80242340 0040802D */ daddu $s0, $v0, $zero +/* CC5B54 80242344 8602008E */ lh $v0, 0x8e($s0) +/* CC5B58 80242348 9603008E */ lhu $v1, 0x8e($s0) +/* CC5B5C 8024234C 18400005 */ blez $v0, .L80242364 +/* CC5B60 80242350 2462FFFF */ addiu $v0, $v1, -1 +/* CC5B64 80242354 A602008E */ sh $v0, 0x8e($s0) +/* CC5B68 80242358 00021400 */ sll $v0, $v0, 0x10 +/* CC5B6C 8024235C 1C400033 */ bgtz $v0, .L8024242C +/* CC5B70 80242360 00000000 */ nop +.L80242364: +/* CC5B74 80242364 8602008C */ lh $v0, 0x8c($s0) +/* CC5B78 80242368 14400030 */ bnez $v0, .L8024242C +/* CC5B7C 8024236C 00000000 */ nop +/* CC5B80 80242370 8E2200CC */ lw $v0, 0xcc($s1) +/* CC5B84 80242374 8C420024 */ lw $v0, 0x24($v0) +/* CC5B88 80242378 AE020028 */ sw $v0, 0x28($s0) +/* CC5B8C 8024237C C6400018 */ lwc1 $f0, 0x18($s2) +/* CC5B90 80242380 E6000018 */ swc1 $f0, 0x18($s0) +/* CC5B94 80242384 8E230088 */ lw $v1, 0x88($s1) +/* CC5B98 80242388 24020005 */ addiu $v0, $zero, 5 +/* CC5B9C 8024238C 10620005 */ beq $v1, $v0, .L802423A4 +/* CC5BA0 80242390 00000000 */ nop +/* CC5BA4 80242394 10600003 */ beqz $v1, .L802423A4 +/* CC5BA8 80242398 24020001 */ addiu $v0, $zero, 1 +/* CC5BAC 8024239C 14620006 */ bne $v1, $v0, .L802423B8 +/* CC5BB0 802423A0 00000000 */ nop +.L802423A4: +/* CC5BB4 802423A4 8E220084 */ lw $v0, 0x84($s1) +/* CC5BB8 802423A8 00021FC2 */ srl $v1, $v0, 0x1f +/* CC5BBC 802423AC 00431021 */ addu $v0, $v0, $v1 +/* CC5BC0 802423B0 00021043 */ sra $v0, $v0, 1 +/* CC5BC4 802423B4 A60200A8 */ sh $v0, 0xa8($s0) +.L802423B8: +/* CC5BC8 802423B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CC5BCC 802423BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CC5BD0 802423C0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* CC5BD4 802423C4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* CC5BD8 802423C8 8C460028 */ lw $a2, 0x28($v0) +/* CC5BDC 802423CC 0C00A7B5 */ jal dist2D +/* CC5BE0 802423D0 8C470030 */ lw $a3, 0x30($v0) +/* CC5BE4 802423D4 C6020018 */ lwc1 $f2, 0x18($s0) +/* CC5BE8 802423D8 46020003 */ div.s $f0, $f0, $f2 +/* CC5BEC 802423DC 3C018024 */ lui $at, 0x8024 +/* CC5BF0 802423E0 D4227A88 */ ldc1 $f2, 0x7a88($at) +/* CC5BF4 802423E4 46000021 */ cvt.d.s $f0, $f0 +/* CC5BF8 802423E8 46220000 */ add.d $f0, $f0, $f2 +/* CC5BFC 802423EC 4620010D */ trunc.w.d $f4, $f0 +/* CC5C00 802423F0 44022000 */ mfc1 $v0, $f4 +/* CC5C04 802423F4 00000000 */ nop +/* CC5C08 802423F8 A602008E */ sh $v0, 0x8e($s0) +/* CC5C0C 802423FC 00021400 */ sll $v0, $v0, 0x10 +/* CC5C10 80242400 8E230078 */ lw $v1, 0x78($s1) +/* CC5C14 80242404 00021403 */ sra $v0, $v0, 0x10 +/* CC5C18 80242408 0043102A */ slt $v0, $v0, $v1 +/* CC5C1C 8024240C 10400003 */ beqz $v0, .L8024241C +/* CC5C20 80242410 00000000 */ nop +/* CC5C24 80242414 9622007A */ lhu $v0, 0x7a($s1) +/* CC5C28 80242418 A602008E */ sh $v0, 0x8e($s0) +.L8024241C: +/* CC5C2C 8024241C 8602008E */ lh $v0, 0x8e($s0) +/* CC5C30 80242420 AE22007C */ sw $v0, 0x7c($s1) +/* CC5C34 80242424 2402000E */ addiu $v0, $zero, 0xe +/* CC5C38 80242428 AE620070 */ sw $v0, 0x70($s3) +.L8024242C: +/* CC5C3C 8024242C 8FBF0020 */ lw $ra, 0x20($sp) +/* CC5C40 80242430 8FB3001C */ lw $s3, 0x1c($sp) +/* CC5C44 80242434 8FB20018 */ lw $s2, 0x18($sp) +/* CC5C48 80242438 8FB10014 */ lw $s1, 0x14($sp) +/* CC5C4C 8024243C 8FB00010 */ lw $s0, 0x10($sp) +/* CC5C50 80242440 03E00008 */ jr $ra +/* CC5C54 80242444 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242448.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242448.s deleted file mode 100644 index b4b1208c79..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242448.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242448 -/* CC5C58 80242448 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CC5C5C 8024244C AFB3003C */ sw $s3, 0x3c($sp) -/* CC5C60 80242450 0080982D */ daddu $s3, $a0, $zero -/* CC5C64 80242454 AFBF0040 */ sw $ra, 0x40($sp) -/* CC5C68 80242458 AFB20038 */ sw $s2, 0x38($sp) -/* CC5C6C 8024245C AFB10034 */ sw $s1, 0x34($sp) -/* CC5C70 80242460 AFB00030 */ sw $s0, 0x30($sp) -/* CC5C74 80242464 8E710148 */ lw $s1, 0x148($s3) -/* CC5C78 80242468 0C00EABB */ jal get_npc_unsafe -/* CC5C7C 8024246C 86240008 */ lh $a0, 8($s1) -/* CC5C80 80242470 0040802D */ daddu $s0, $v0, $zero -/* CC5C84 80242474 8E22007C */ lw $v0, 0x7c($s1) -/* CC5C88 80242478 8603008E */ lh $v1, 0x8e($s0) -/* CC5C8C 8024247C 2442FFFF */ addiu $v0, $v0, -1 -/* CC5C90 80242480 14620012 */ bne $v1, $v0, .L802424CC -/* CC5C94 80242484 00000000 */ nop -/* CC5C98 80242488 C6000038 */ lwc1 $f0, 0x38($s0) -/* CC5C9C 8024248C 4600020D */ trunc.w.s $f8, $f0 -/* CC5CA0 80242490 44024000 */ mfc1 $v0, $f8 -/* CC5CA4 80242494 00000000 */ nop -/* CC5CA8 80242498 A6220010 */ sh $v0, 0x10($s1) -/* CC5CAC 8024249C C600003C */ lwc1 $f0, 0x3c($s0) -/* CC5CB0 802424A0 4600020D */ trunc.w.s $f8, $f0 -/* CC5CB4 802424A4 44024000 */ mfc1 $v0, $f8 -/* CC5CB8 802424A8 00000000 */ nop -/* CC5CBC 802424AC A6220012 */ sh $v0, 0x12($s1) -/* CC5CC0 802424B0 C6000040 */ lwc1 $f0, 0x40($s0) -/* CC5CC4 802424B4 24020001 */ addiu $v0, $zero, 1 -/* CC5CC8 802424B8 A2220007 */ sb $v0, 7($s1) -/* CC5CCC 802424BC 4600020D */ trunc.w.s $f8, $f0 -/* CC5CD0 802424C0 44024000 */ mfc1 $v0, $f8 -/* CC5CD4 802424C4 00000000 */ nop -/* CC5CD8 802424C8 A6220014 */ sh $v0, 0x14($s1) -.L802424CC: -/* CC5CDC 802424CC C6000038 */ lwc1 $f0, 0x38($s0) -/* CC5CE0 802424D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CC5CE4 802424D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CC5CE8 802424D8 C6060018 */ lwc1 $f6, 0x18($s0) -/* CC5CEC 802424DC E7A00020 */ swc1 $f0, 0x20($sp) -/* CC5CF0 802424E0 E7A20024 */ swc1 $f2, 0x24($sp) -/* CC5CF4 802424E4 E7A40028 */ swc1 $f4, 0x28($sp) -/* CC5CF8 802424E8 E7A60010 */ swc1 $f6, 0x10($sp) -/* CC5CFC 802424EC C600000C */ lwc1 $f0, 0xc($s0) -/* CC5D00 802424F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* CC5D04 802424F4 860200A8 */ lh $v0, 0xa8($s0) -/* CC5D08 802424F8 27A50020 */ addiu $a1, $sp, 0x20 -/* CC5D0C 802424FC 44820000 */ mtc1 $v0, $f0 -/* CC5D10 80242500 00000000 */ nop -/* CC5D14 80242504 46800020 */ cvt.s.w $f0, $f0 -/* CC5D18 80242508 E7A00018 */ swc1 $f0, 0x18($sp) -/* CC5D1C 8024250C 860200A6 */ lh $v0, 0xa6($s0) -/* CC5D20 80242510 27A60024 */ addiu $a2, $sp, 0x24 -/* CC5D24 80242514 44820000 */ mtc1 $v0, $f0 -/* CC5D28 80242518 00000000 */ nop -/* CC5D2C 8024251C 46800020 */ cvt.s.w $f0, $f0 -/* CC5D30 80242520 E7A0001C */ swc1 $f0, 0x1c($sp) -/* CC5D34 80242524 8E040080 */ lw $a0, 0x80($s0) -/* CC5D38 80242528 0C037711 */ jal func_800DDC44 -/* CC5D3C 8024252C 27A70028 */ addiu $a3, $sp, 0x28 -/* CC5D40 80242530 0040902D */ daddu $s2, $v0, $zero -/* CC5D44 80242534 16400005 */ bnez $s2, .L8024254C -/* CC5D48 80242538 00000000 */ nop -/* CC5D4C 8024253C 8E050018 */ lw $a1, 0x18($s0) -/* CC5D50 80242540 8E06000C */ lw $a2, 0xc($s0) -/* CC5D54 80242544 0C00EA95 */ jal npc_move_heading -/* CC5D58 80242548 0200202D */ daddu $a0, $s0, $zero -.L8024254C: -/* CC5D5C 8024254C 8602008E */ lh $v0, 0x8e($s0) -/* CC5D60 80242550 9603008E */ lhu $v1, 0x8e($s0) -/* CC5D64 80242554 18400007 */ blez $v0, .L80242574 -/* CC5D68 80242558 2462FFFF */ addiu $v0, $v1, -1 -/* CC5D6C 8024255C A602008E */ sh $v0, 0x8e($s0) -/* CC5D70 80242560 00021400 */ sll $v0, $v0, 0x10 -/* CC5D74 80242564 18400003 */ blez $v0, .L80242574 -/* CC5D78 80242568 00000000 */ nop -/* CC5D7C 8024256C 12400008 */ beqz $s2, .L80242590 -/* CC5D80 80242570 00000000 */ nop -.L80242574: -/* CC5D84 80242574 8E2200CC */ lw $v0, 0xcc($s1) -/* CC5D88 80242578 A2200007 */ sb $zero, 7($s1) -/* CC5D8C 8024257C 8C420028 */ lw $v0, 0x28($v0) -/* CC5D90 80242580 A600008E */ sh $zero, 0x8e($s0) -/* CC5D94 80242584 AE020028 */ sw $v0, 0x28($s0) -/* CC5D98 80242588 2402000F */ addiu $v0, $zero, 0xf -/* CC5D9C 8024258C AE620070 */ sw $v0, 0x70($s3) -.L80242590: -/* CC5DA0 80242590 8FBF0040 */ lw $ra, 0x40($sp) -/* CC5DA4 80242594 8FB3003C */ lw $s3, 0x3c($sp) -/* CC5DA8 80242598 8FB20038 */ lw $s2, 0x38($sp) -/* CC5DAC 8024259C 8FB10034 */ lw $s1, 0x34($sp) -/* CC5DB0 802425A0 8FB00030 */ lw $s0, 0x30($sp) -/* CC5DB4 802425A4 03E00008 */ jr $ra -/* CC5DB8 802425A8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242448_CC5C58.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242448_CC5C58.s new file mode 100644 index 0000000000..7e520194e7 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242448_CC5C58.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242448_CC5C58 +/* CC5C58 80242448 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* CC5C5C 8024244C AFB3003C */ sw $s3, 0x3c($sp) +/* CC5C60 80242450 0080982D */ daddu $s3, $a0, $zero +/* CC5C64 80242454 AFBF0040 */ sw $ra, 0x40($sp) +/* CC5C68 80242458 AFB20038 */ sw $s2, 0x38($sp) +/* CC5C6C 8024245C AFB10034 */ sw $s1, 0x34($sp) +/* CC5C70 80242460 AFB00030 */ sw $s0, 0x30($sp) +/* CC5C74 80242464 8E710148 */ lw $s1, 0x148($s3) +/* CC5C78 80242468 0C00EABB */ jal get_npc_unsafe +/* CC5C7C 8024246C 86240008 */ lh $a0, 8($s1) +/* CC5C80 80242470 0040802D */ daddu $s0, $v0, $zero +/* CC5C84 80242474 8E22007C */ lw $v0, 0x7c($s1) +/* CC5C88 80242478 8603008E */ lh $v1, 0x8e($s0) +/* CC5C8C 8024247C 2442FFFF */ addiu $v0, $v0, -1 +/* CC5C90 80242480 14620012 */ bne $v1, $v0, .L802424CC +/* CC5C94 80242484 00000000 */ nop +/* CC5C98 80242488 C6000038 */ lwc1 $f0, 0x38($s0) +/* CC5C9C 8024248C 4600020D */ trunc.w.s $f8, $f0 +/* CC5CA0 80242490 44024000 */ mfc1 $v0, $f8 +/* CC5CA4 80242494 00000000 */ nop +/* CC5CA8 80242498 A6220010 */ sh $v0, 0x10($s1) +/* CC5CAC 8024249C C600003C */ lwc1 $f0, 0x3c($s0) +/* CC5CB0 802424A0 4600020D */ trunc.w.s $f8, $f0 +/* CC5CB4 802424A4 44024000 */ mfc1 $v0, $f8 +/* CC5CB8 802424A8 00000000 */ nop +/* CC5CBC 802424AC A6220012 */ sh $v0, 0x12($s1) +/* CC5CC0 802424B0 C6000040 */ lwc1 $f0, 0x40($s0) +/* CC5CC4 802424B4 24020001 */ addiu $v0, $zero, 1 +/* CC5CC8 802424B8 A2220007 */ sb $v0, 7($s1) +/* CC5CCC 802424BC 4600020D */ trunc.w.s $f8, $f0 +/* CC5CD0 802424C0 44024000 */ mfc1 $v0, $f8 +/* CC5CD4 802424C4 00000000 */ nop +/* CC5CD8 802424C8 A6220014 */ sh $v0, 0x14($s1) +.L802424CC: +/* CC5CDC 802424CC C6000038 */ lwc1 $f0, 0x38($s0) +/* CC5CE0 802424D0 C602003C */ lwc1 $f2, 0x3c($s0) +/* CC5CE4 802424D4 C6040040 */ lwc1 $f4, 0x40($s0) +/* CC5CE8 802424D8 C6060018 */ lwc1 $f6, 0x18($s0) +/* CC5CEC 802424DC E7A00020 */ swc1 $f0, 0x20($sp) +/* CC5CF0 802424E0 E7A20024 */ swc1 $f2, 0x24($sp) +/* CC5CF4 802424E4 E7A40028 */ swc1 $f4, 0x28($sp) +/* CC5CF8 802424E8 E7A60010 */ swc1 $f6, 0x10($sp) +/* CC5CFC 802424EC C600000C */ lwc1 $f0, 0xc($s0) +/* CC5D00 802424F0 E7A00014 */ swc1 $f0, 0x14($sp) +/* CC5D04 802424F4 860200A8 */ lh $v0, 0xa8($s0) +/* CC5D08 802424F8 27A50020 */ addiu $a1, $sp, 0x20 +/* CC5D0C 802424FC 44820000 */ mtc1 $v0, $f0 +/* CC5D10 80242500 00000000 */ nop +/* CC5D14 80242504 46800020 */ cvt.s.w $f0, $f0 +/* CC5D18 80242508 E7A00018 */ swc1 $f0, 0x18($sp) +/* CC5D1C 8024250C 860200A6 */ lh $v0, 0xa6($s0) +/* CC5D20 80242510 27A60024 */ addiu $a2, $sp, 0x24 +/* CC5D24 80242514 44820000 */ mtc1 $v0, $f0 +/* CC5D28 80242518 00000000 */ nop +/* CC5D2C 8024251C 46800020 */ cvt.s.w $f0, $f0 +/* CC5D30 80242520 E7A0001C */ swc1 $f0, 0x1c($sp) +/* CC5D34 80242524 8E040080 */ lw $a0, 0x80($s0) +/* CC5D38 80242528 0C037711 */ jal func_800DDC44 +/* CC5D3C 8024252C 27A70028 */ addiu $a3, $sp, 0x28 +/* CC5D40 80242530 0040902D */ daddu $s2, $v0, $zero +/* CC5D44 80242534 16400005 */ bnez $s2, .L8024254C +/* CC5D48 80242538 00000000 */ nop +/* CC5D4C 8024253C 8E050018 */ lw $a1, 0x18($s0) +/* CC5D50 80242540 8E06000C */ lw $a2, 0xc($s0) +/* CC5D54 80242544 0C00EA95 */ jal npc_move_heading +/* CC5D58 80242548 0200202D */ daddu $a0, $s0, $zero +.L8024254C: +/* CC5D5C 8024254C 8602008E */ lh $v0, 0x8e($s0) +/* CC5D60 80242550 9603008E */ lhu $v1, 0x8e($s0) +/* CC5D64 80242554 18400007 */ blez $v0, .L80242574 +/* CC5D68 80242558 2462FFFF */ addiu $v0, $v1, -1 +/* CC5D6C 8024255C A602008E */ sh $v0, 0x8e($s0) +/* CC5D70 80242560 00021400 */ sll $v0, $v0, 0x10 +/* CC5D74 80242564 18400003 */ blez $v0, .L80242574 +/* CC5D78 80242568 00000000 */ nop +/* CC5D7C 8024256C 12400008 */ beqz $s2, .L80242590 +/* CC5D80 80242570 00000000 */ nop +.L80242574: +/* CC5D84 80242574 8E2200CC */ lw $v0, 0xcc($s1) +/* CC5D88 80242578 A2200007 */ sb $zero, 7($s1) +/* CC5D8C 8024257C 8C420028 */ lw $v0, 0x28($v0) +/* CC5D90 80242580 A600008E */ sh $zero, 0x8e($s0) +/* CC5D94 80242584 AE020028 */ sw $v0, 0x28($s0) +/* CC5D98 80242588 2402000F */ addiu $v0, $zero, 0xf +/* CC5D9C 8024258C AE620070 */ sw $v0, 0x70($s3) +.L80242590: +/* CC5DA0 80242590 8FBF0040 */ lw $ra, 0x40($sp) +/* CC5DA4 80242594 8FB3003C */ lw $s3, 0x3c($sp) +/* CC5DA8 80242598 8FB20038 */ lw $s2, 0x38($sp) +/* CC5DAC 8024259C 8FB10034 */ lw $s1, 0x34($sp) +/* CC5DB0 802425A0 8FB00030 */ lw $s0, 0x30($sp) +/* CC5DB4 802425A4 03E00008 */ jr $ra +/* CC5DB8 802425A8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802425AC.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802425AC.s deleted file mode 100644 index 2cb3c6189d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802425AC.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425AC -/* CC5DBC 802425AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CC5DC0 802425B0 AFB10014 */ sw $s1, 0x14($sp) -/* CC5DC4 802425B4 0080882D */ daddu $s1, $a0, $zero -/* CC5DC8 802425B8 AFBF0018 */ sw $ra, 0x18($sp) -/* CC5DCC 802425BC AFB00010 */ sw $s0, 0x10($sp) -/* CC5DD0 802425C0 8E300148 */ lw $s0, 0x148($s1) -/* CC5DD4 802425C4 0C00EABB */ jal get_npc_unsafe -/* CC5DD8 802425C8 86040008 */ lh $a0, 8($s0) -/* CC5DDC 802425CC 0040202D */ daddu $a0, $v0, $zero -/* CC5DE0 802425D0 9482008E */ lhu $v0, 0x8e($a0) -/* CC5DE4 802425D4 24030003 */ addiu $v1, $zero, 3 -/* CC5DE8 802425D8 24420001 */ addiu $v0, $v0, 1 -/* CC5DEC 802425DC A482008E */ sh $v0, 0x8e($a0) -/* CC5DF0 802425E0 00021400 */ sll $v0, $v0, 0x10 -/* CC5DF4 802425E4 00021403 */ sra $v0, $v0, 0x10 -/* CC5DF8 802425E8 14430003 */ bne $v0, $v1, .L802425F8 -/* CC5DFC 802425EC 00000000 */ nop -/* CC5E00 802425F0 96020086 */ lhu $v0, 0x86($s0) -/* CC5E04 802425F4 A48200A8 */ sh $v0, 0xa8($a0) -.L802425F8: -/* CC5E08 802425F8 8482008E */ lh $v0, 0x8e($a0) -/* CC5E0C 802425FC 8E030080 */ lw $v1, 0x80($s0) -/* CC5E10 80242600 0043102A */ slt $v0, $v0, $v1 -/* CC5E14 80242604 14400004 */ bnez $v0, .L80242618 -/* CC5E18 80242608 00000000 */ nop -/* CC5E1C 8024260C 96020086 */ lhu $v0, 0x86($s0) -/* CC5E20 80242610 A48200A8 */ sh $v0, 0xa8($a0) -/* CC5E24 80242614 AE200070 */ sw $zero, 0x70($s1) -.L80242618: -/* CC5E28 80242618 8FBF0018 */ lw $ra, 0x18($sp) -/* CC5E2C 8024261C 8FB10014 */ lw $s1, 0x14($sp) -/* CC5E30 80242620 8FB00010 */ lw $s0, 0x10($sp) -/* CC5E34 80242624 03E00008 */ jr $ra -/* CC5E38 80242628 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802425AC_CC5DBC.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802425AC_CC5DBC.s new file mode 100644 index 0000000000..f5fa2a0b61 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802425AC_CC5DBC.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425AC_CC5DBC +/* CC5DBC 802425AC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* CC5DC0 802425B0 AFB10014 */ sw $s1, 0x14($sp) +/* CC5DC4 802425B4 0080882D */ daddu $s1, $a0, $zero +/* CC5DC8 802425B8 AFBF0018 */ sw $ra, 0x18($sp) +/* CC5DCC 802425BC AFB00010 */ sw $s0, 0x10($sp) +/* CC5DD0 802425C0 8E300148 */ lw $s0, 0x148($s1) +/* CC5DD4 802425C4 0C00EABB */ jal get_npc_unsafe +/* CC5DD8 802425C8 86040008 */ lh $a0, 8($s0) +/* CC5DDC 802425CC 0040202D */ daddu $a0, $v0, $zero +/* CC5DE0 802425D0 9482008E */ lhu $v0, 0x8e($a0) +/* CC5DE4 802425D4 24030003 */ addiu $v1, $zero, 3 +/* CC5DE8 802425D8 24420001 */ addiu $v0, $v0, 1 +/* CC5DEC 802425DC A482008E */ sh $v0, 0x8e($a0) +/* CC5DF0 802425E0 00021400 */ sll $v0, $v0, 0x10 +/* CC5DF4 802425E4 00021403 */ sra $v0, $v0, 0x10 +/* CC5DF8 802425E8 14430003 */ bne $v0, $v1, .L802425F8 +/* CC5DFC 802425EC 00000000 */ nop +/* CC5E00 802425F0 96020086 */ lhu $v0, 0x86($s0) +/* CC5E04 802425F4 A48200A8 */ sh $v0, 0xa8($a0) +.L802425F8: +/* CC5E08 802425F8 8482008E */ lh $v0, 0x8e($a0) +/* CC5E0C 802425FC 8E030080 */ lw $v1, 0x80($s0) +/* CC5E10 80242600 0043102A */ slt $v0, $v0, $v1 +/* CC5E14 80242604 14400004 */ bnez $v0, .L80242618 +/* CC5E18 80242608 00000000 */ nop +/* CC5E1C 8024260C 96020086 */ lhu $v0, 0x86($s0) +/* CC5E20 80242610 A48200A8 */ sh $v0, 0xa8($a0) +/* CC5E24 80242614 AE200070 */ sw $zero, 0x70($s1) +.L80242618: +/* CC5E28 80242618 8FBF0018 */ lw $ra, 0x18($sp) +/* CC5E2C 8024261C 8FB10014 */ lw $s1, 0x14($sp) +/* CC5E30 80242620 8FB00010 */ lw $s0, 0x10($sp) +/* CC5E34 80242624 03E00008 */ jr $ra +/* CC5E38 80242628 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C.s deleted file mode 100644 index 78eea4ea3e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024262C -/* CC5E3C 8024262C 27BDFF90 */ addiu $sp, $sp, -0x70 -/* CC5E40 80242630 AFB3005C */ sw $s3, 0x5c($sp) -/* CC5E44 80242634 0080982D */ daddu $s3, $a0, $zero -/* CC5E48 80242638 AFBF0068 */ sw $ra, 0x68($sp) -/* CC5E4C 8024263C AFB50064 */ sw $s5, 0x64($sp) -/* CC5E50 80242640 AFB40060 */ sw $s4, 0x60($sp) -/* CC5E54 80242644 AFB20058 */ sw $s2, 0x58($sp) -/* CC5E58 80242648 AFB10054 */ sw $s1, 0x54($sp) -/* CC5E5C 8024264C AFB00050 */ sw $s0, 0x50($sp) -/* CC5E60 80242650 8E710148 */ lw $s1, 0x148($s3) -/* CC5E64 80242654 86240008 */ lh $a0, 8($s1) -/* CC5E68 80242658 0C00EABB */ jal get_npc_unsafe -/* CC5E6C 8024265C 00A0802D */ daddu $s0, $a1, $zero -/* CC5E70 80242660 8E63000C */ lw $v1, 0xc($s3) -/* CC5E74 80242664 0260202D */ daddu $a0, $s3, $zero -/* CC5E78 80242668 8C650000 */ lw $a1, ($v1) -/* CC5E7C 8024266C 0C0B1EAF */ jal get_variable -/* CC5E80 80242670 0040902D */ daddu $s2, $v0, $zero -/* CC5E84 80242674 AFA00028 */ sw $zero, 0x28($sp) -/* CC5E88 80242678 8E2300D0 */ lw $v1, 0xd0($s1) -/* CC5E8C 8024267C 8C630030 */ lw $v1, 0x30($v1) -/* CC5E90 80242680 AFA3002C */ sw $v1, 0x2c($sp) -/* CC5E94 80242684 8E2300D0 */ lw $v1, 0xd0($s1) -/* CC5E98 80242688 8C63001C */ lw $v1, 0x1c($v1) -/* CC5E9C 8024268C AFA30030 */ sw $v1, 0x30($sp) -/* CC5EA0 80242690 8E2300D0 */ lw $v1, 0xd0($s1) -/* CC5EA4 80242694 8C630024 */ lw $v1, 0x24($v1) -/* CC5EA8 80242698 AFA30034 */ sw $v1, 0x34($sp) -/* CC5EAC 8024269C 8E2300D0 */ lw $v1, 0xd0($s1) -/* CC5EB0 802426A0 8C630028 */ lw $v1, 0x28($v1) -/* CC5EB4 802426A4 27B50028 */ addiu $s5, $sp, 0x28 -/* CC5EB8 802426A8 AFA30038 */ sw $v1, 0x38($sp) -/* CC5EBC 802426AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* CC5EC0 802426B0 3C0142C8 */ lui $at, 0x42c8 -/* CC5EC4 802426B4 44810000 */ mtc1 $at, $f0 -/* CC5EC8 802426B8 8C63002C */ lw $v1, 0x2c($v1) -/* CC5ECC 802426BC 0040A02D */ daddu $s4, $v0, $zero -/* CC5ED0 802426C0 E7A00040 */ swc1 $f0, 0x40($sp) -/* CC5ED4 802426C4 A7A00044 */ sh $zero, 0x44($sp) -/* CC5ED8 802426C8 12000009 */ beqz $s0, .L802426F0 -/* CC5EDC 802426CC AFA3003C */ sw $v1, 0x3c($sp) -/* CC5EE0 802426D0 864300A8 */ lh $v1, 0xa8($s2) -/* CC5EE4 802426D4 8E2200B0 */ lw $v0, 0xb0($s1) -/* CC5EE8 802426D8 AE20008C */ sw $zero, 0x8c($s1) -/* CC5EEC 802426DC A22000B5 */ sb $zero, 0xb5($s1) -/* CC5EF0 802426E0 34420008 */ ori $v0, $v0, 8 -/* CC5EF4 802426E4 AE230084 */ sw $v1, 0x84($s1) -/* CC5EF8 802426E8 080909C0 */ j .L80242700 -/* CC5EFC 802426EC AE2200B0 */ sw $v0, 0xb0($s1) -.L802426F0: -/* CC5F00 802426F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* CC5F04 802426F4 30420004 */ andi $v0, $v0, 4 -/* CC5F08 802426F8 10400047 */ beqz $v0, .L80242818 -/* CC5F0C 802426FC 00000000 */ nop -.L80242700: -/* CC5F10 80242700 AE600070 */ sw $zero, 0x70($s3) -/* CC5F14 80242704 A640008E */ sh $zero, 0x8e($s2) -/* CC5F18 80242708 8E2300CC */ lw $v1, 0xcc($s1) -/* CC5F1C 8024270C 2404F7FF */ addiu $a0, $zero, -0x801 -/* CC5F20 80242710 A2200007 */ sb $zero, 7($s1) -/* CC5F24 80242714 8E420000 */ lw $v0, ($s2) -/* CC5F28 80242718 8C630000 */ lw $v1, ($v1) -/* CC5F2C 8024271C 00441024 */ and $v0, $v0, $a0 -/* CC5F30 80242720 AE420000 */ sw $v0, ($s2) -/* CC5F34 80242724 AE430028 */ sw $v1, 0x28($s2) -/* CC5F38 80242728 96220086 */ lhu $v0, 0x86($s1) -/* CC5F3C 8024272C A64200A8 */ sh $v0, 0xa8($s2) -/* CC5F40 80242730 8E2200D0 */ lw $v0, 0xd0($s1) -/* CC5F44 80242734 AE200090 */ sw $zero, 0x90($s1) -/* CC5F48 80242738 8C420034 */ lw $v0, 0x34($v0) -/* CC5F4C 8024273C 14400006 */ bnez $v0, .L80242758 -/* CC5F50 80242740 2403FDFF */ addiu $v1, $zero, -0x201 -/* CC5F54 80242744 8E420000 */ lw $v0, ($s2) -/* CC5F58 80242748 2403FFF7 */ addiu $v1, $zero, -9 -/* CC5F5C 8024274C 34420200 */ ori $v0, $v0, 0x200 -/* CC5F60 80242750 080909D9 */ j .L80242764 -/* CC5F64 80242754 00431024 */ and $v0, $v0, $v1 -.L80242758: -/* CC5F68 80242758 8E420000 */ lw $v0, ($s2) -/* CC5F6C 8024275C 00431024 */ and $v0, $v0, $v1 -/* CC5F70 80242760 34420008 */ ori $v0, $v0, 8 -.L80242764: -/* CC5F74 80242764 AE420000 */ sw $v0, ($s2) -/* CC5F78 80242768 8E2200B0 */ lw $v0, 0xb0($s1) -/* CC5F7C 8024276C 30420004 */ andi $v0, $v0, 4 -/* CC5F80 80242770 1040001E */ beqz $v0, .L802427EC -/* CC5F84 80242774 24040002 */ addiu $a0, $zero, 2 -/* CC5F88 80242778 0240282D */ daddu $a1, $s2, $zero -/* CC5F8C 8024277C 0000302D */ daddu $a2, $zero, $zero -/* CC5F90 80242780 24020063 */ addiu $v0, $zero, 0x63 -/* CC5F94 80242784 AE620070 */ sw $v0, 0x70($s3) -/* CC5F98 80242788 AE600074 */ sw $zero, 0x74($s3) -/* CC5F9C 8024278C 864300A8 */ lh $v1, 0xa8($s2) -/* CC5FA0 80242790 3C013F80 */ lui $at, 0x3f80 -/* CC5FA4 80242794 44810000 */ mtc1 $at, $f0 -/* CC5FA8 80242798 3C014000 */ lui $at, 0x4000 -/* CC5FAC 8024279C 44811000 */ mtc1 $at, $f2 -/* CC5FB0 802427A0 3C01C1A0 */ lui $at, 0xc1a0 -/* CC5FB4 802427A4 44812000 */ mtc1 $at, $f4 -/* CC5FB8 802427A8 24020028 */ addiu $v0, $zero, 0x28 -/* CC5FBC 802427AC AFA2001C */ sw $v0, 0x1c($sp) -/* CC5FC0 802427B0 44833000 */ mtc1 $v1, $f6 -/* CC5FC4 802427B4 00000000 */ nop -/* CC5FC8 802427B8 468031A0 */ cvt.s.w $f6, $f6 -/* CC5FCC 802427BC 44073000 */ mfc1 $a3, $f6 -/* CC5FD0 802427C0 27A20048 */ addiu $v0, $sp, 0x48 -/* CC5FD4 802427C4 AFA20020 */ sw $v0, 0x20($sp) -/* CC5FD8 802427C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* CC5FDC 802427CC E7A20014 */ swc1 $f2, 0x14($sp) -/* CC5FE0 802427D0 0C01BFA4 */ jal fx_emote -/* CC5FE4 802427D4 E7A40018 */ swc1 $f4, 0x18($sp) -/* CC5FE8 802427D8 8E2200B0 */ lw $v0, 0xb0($s1) -/* CC5FEC 802427DC 2403FFFB */ addiu $v1, $zero, -5 -/* CC5FF0 802427E0 00431024 */ and $v0, $v0, $v1 -/* CC5FF4 802427E4 08090A06 */ j .L80242818 -/* CC5FF8 802427E8 AE2200B0 */ sw $v0, 0xb0($s1) -.L802427EC: -/* CC5FFC 802427EC 8E220000 */ lw $v0, ($s1) -/* CC6000 802427F0 3C034000 */ lui $v1, 0x4000 -/* CC6004 802427F4 00431024 */ and $v0, $v0, $v1 -/* CC6008 802427F8 10400007 */ beqz $v0, .L80242818 -/* CC600C 802427FC 3C03BFFF */ lui $v1, 0xbfff -/* CC6010 80242800 2402000C */ addiu $v0, $zero, 0xc -/* CC6014 80242804 AE620070 */ sw $v0, 0x70($s3) -/* CC6018 80242808 8E220000 */ lw $v0, ($s1) -/* CC601C 8024280C 3463FFFF */ ori $v1, $v1, 0xffff -/* CC6020 80242810 00431024 */ and $v0, $v0, $v1 -/* CC6024 80242814 AE220000 */ sw $v0, ($s1) -.L80242818: -/* CC6028 80242818 8E220090 */ lw $v0, 0x90($s1) -/* CC602C 8024281C 1840000C */ blez $v0, .L80242850 -/* CC6030 80242820 2442FFFF */ addiu $v0, $v0, -1 -/* CC6034 80242824 14400087 */ bnez $v0, .L80242A44 -/* CC6038 80242828 AE220090 */ sw $v0, 0x90($s1) -/* CC603C 8024282C 3C03FFAA */ lui $v1, 0xffaa -/* CC6040 80242830 8E420028 */ lw $v0, 0x28($s2) -/* CC6044 80242834 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* CC6048 80242838 00431021 */ addu $v0, $v0, $v1 -/* CC604C 8024283C 2C420002 */ sltiu $v0, $v0, 2 -/* CC6050 80242840 10400003 */ beqz $v0, .L80242850 -/* CC6054 80242844 3C020055 */ lui $v0, 0x55 -/* CC6058 80242848 3442000C */ ori $v0, $v0, 0xc -/* CC605C 8024284C AE420028 */ sw $v0, 0x28($s2) -.L80242850: -/* CC6060 80242850 8E630070 */ lw $v1, 0x70($s3) -/* CC6064 80242854 2402000C */ addiu $v0, $zero, 0xc -/* CC6068 80242858 10620048 */ beq $v1, $v0, .L8024297C -/* CC606C 8024285C 2862000D */ slti $v0, $v1, 0xd -/* CC6070 80242860 1040000F */ beqz $v0, .L802428A0 -/* CC6074 80242864 24100001 */ addiu $s0, $zero, 1 -/* CC6078 80242868 1070001E */ beq $v1, $s0, .L802428E4 -/* CC607C 8024286C 28620002 */ slti $v0, $v1, 2 -/* CC6080 80242870 10400005 */ beqz $v0, .L80242888 -/* CC6084 80242874 24020002 */ addiu $v0, $zero, 2 -/* CC6088 80242878 10600015 */ beqz $v1, .L802428D0 -/* CC608C 8024287C 0260202D */ daddu $a0, $s3, $zero -/* CC6090 80242880 08090A76 */ j .L802429D8 -/* CC6094 80242884 00000000 */ nop -.L80242888: -/* CC6098 80242888 1062001C */ beq $v1, $v0, .L802428FC -/* CC609C 8024288C 24020003 */ addiu $v0, $zero, 3 -/* CC60A0 80242890 10620035 */ beq $v1, $v0, .L80242968 -/* CC60A4 80242894 0260202D */ daddu $a0, $s3, $zero -/* CC60A8 80242898 08090A76 */ j .L802429D8 -/* CC60AC 8024289C 00000000 */ nop -.L802428A0: -/* CC60B0 802428A0 2402000E */ addiu $v0, $zero, 0xe -/* CC60B4 802428A4 1062003F */ beq $v1, $v0, .L802429A4 -/* CC60B8 802428A8 0062102A */ slt $v0, $v1, $v0 -/* CC60BC 802428AC 14400038 */ bnez $v0, .L80242990 -/* CC60C0 802428B0 0260202D */ daddu $a0, $s3, $zero -/* CC60C4 802428B4 2402000F */ addiu $v0, $zero, 0xf -/* CC60C8 802428B8 10620040 */ beq $v1, $v0, .L802429BC -/* CC60CC 802428BC 24020063 */ addiu $v0, $zero, 0x63 -/* CC60D0 802428C0 10620043 */ beq $v1, $v0, .L802429D0 -/* CC60D4 802428C4 00000000 */ nop -/* CC60D8 802428C8 08090A76 */ j .L802429D8 -/* CC60DC 802428CC 00000000 */ nop -.L802428D0: -/* CC60E0 802428D0 0280282D */ daddu $a1, $s4, $zero -/* CC60E4 802428D4 0C012568 */ jal func_800495A0 -/* CC60E8 802428D8 02A0302D */ daddu $a2, $s5, $zero -/* CC60EC 802428DC 96220086 */ lhu $v0, 0x86($s1) -/* CC60F0 802428E0 A64200A8 */ sh $v0, 0xa8($s2) -.L802428E4: -/* CC60F4 802428E4 0260202D */ daddu $a0, $s3, $zero -/* CC60F8 802428E8 0280282D */ daddu $a1, $s4, $zero -/* CC60FC 802428EC 0C0125AE */ jal func_800496B8 -/* CC6100 802428F0 02A0302D */ daddu $a2, $s5, $zero -/* CC6104 802428F4 08090A76 */ j .L802429D8 -/* CC6108 802428F8 00000000 */ nop -.L802428FC: -/* CC610C 802428FC 0260202D */ daddu $a0, $s3, $zero -/* CC6110 80242900 0280282D */ daddu $a1, $s4, $zero -/* CC6114 80242904 0C0126D1 */ jal func_80049B44 -/* CC6118 80242908 02A0302D */ daddu $a2, $s5, $zero -/* CC611C 8024290C 8E230088 */ lw $v1, 0x88($s1) -/* CC6120 80242910 24020006 */ addiu $v0, $zero, 6 -/* CC6124 80242914 14620014 */ bne $v1, $v0, .L80242968 -/* CC6128 80242918 0260202D */ daddu $a0, $s3, $zero -/* CC612C 8024291C 0C00A67F */ jal rand_int -/* CC6130 80242920 24040064 */ addiu $a0, $zero, 0x64 -/* CC6134 80242924 28420021 */ slti $v0, $v0, 0x21 -/* CC6138 80242928 5040000F */ beql $v0, $zero, .L80242968 -/* CC613C 8024292C 0260202D */ daddu $a0, $s3, $zero -/* CC6140 80242930 8E22008C */ lw $v0, 0x8c($s1) -/* CC6144 80242934 10400005 */ beqz $v0, .L8024294C -/* CC6148 80242938 3C020055 */ lui $v0, 0x55 -/* CC614C 8024293C 3442002F */ ori $v0, $v0, 0x2f -/* CC6150 80242940 AE20008C */ sw $zero, 0x8c($s1) -/* CC6154 80242944 08090A56 */ j .L80242958 -/* CC6158 80242948 A22000B5 */ sb $zero, 0xb5($s1) -.L8024294C: -/* CC615C 8024294C 3442002E */ ori $v0, $v0, 0x2e -/* CC6160 80242950 AE30008C */ sw $s0, 0x8c($s1) -/* CC6164 80242954 A23000B5 */ sb $s0, 0xb5($s1) -.L80242958: -/* CC6168 80242958 AE420028 */ sw $v0, 0x28($s2) -/* CC616C 8024295C 24020007 */ addiu $v0, $zero, 7 -/* CC6170 80242960 08090A91 */ j .L80242A44 -/* CC6174 80242964 AE220090 */ sw $v0, 0x90($s1) -.L80242968: -/* CC6178 80242968 0280282D */ daddu $a1, $s4, $zero -/* CC617C 8024296C 0C012701 */ jal func_80049C04 -/* CC6180 80242970 02A0302D */ daddu $a2, $s5, $zero -/* CC6184 80242974 08090A76 */ j .L802429D8 -/* CC6188 80242978 00000000 */ nop -.L8024297C: -/* CC618C 8024297C 0260202D */ daddu $a0, $s3, $zero -/* CC6190 80242980 0280282D */ daddu $a1, $s4, $zero -/* CC6194 80242984 0C0908A6 */ jal func_80242298 -/* CC6198 80242988 02A0302D */ daddu $a2, $s5, $zero -/* CC619C 8024298C 0260202D */ daddu $a0, $s3, $zero -.L80242990: -/* CC61A0 80242990 0280282D */ daddu $a1, $s4, $zero -/* CC61A4 80242994 0C0908C5 */ jal func_80242314 -/* CC61A8 80242998 02A0302D */ daddu $a2, $s5, $zero -/* CC61AC 8024299C 08090A76 */ j .L802429D8 -/* CC61B0 802429A0 00000000 */ nop -.L802429A4: -/* CC61B4 802429A4 0260202D */ daddu $a0, $s3, $zero -/* CC61B8 802429A8 0280282D */ daddu $a1, $s4, $zero -/* CC61BC 802429AC 0C090912 */ jal func_80242448 -/* CC61C0 802429B0 02A0302D */ daddu $a2, $s5, $zero -/* CC61C4 802429B4 08090A76 */ j .L802429D8 -/* CC61C8 802429B8 00000000 */ nop -.L802429BC: -/* CC61CC 802429BC 0280282D */ daddu $a1, $s4, $zero -/* CC61D0 802429C0 0C09096B */ jal func_802425AC -/* CC61D4 802429C4 02A0302D */ daddu $a2, $s5, $zero -/* CC61D8 802429C8 08090A76 */ j .L802429D8 -/* CC61DC 802429CC 00000000 */ nop -.L802429D0: -/* CC61E0 802429D0 0C0129CF */ jal func_8004A73C -/* CC61E4 802429D4 0260202D */ daddu $a0, $s3, $zero -.L802429D8: -/* CC61E8 802429D8 8E230088 */ lw $v1, 0x88($s1) -/* CC61EC 802429DC 24020006 */ addiu $v0, $zero, 6 -/* CC61F0 802429E0 14620019 */ bne $v1, $v0, .L80242A48 -/* CC61F4 802429E4 0000102D */ daddu $v0, $zero, $zero -/* CC61F8 802429E8 8E22008C */ lw $v0, 0x8c($s1) -/* CC61FC 802429EC 10400003 */ beqz $v0, .L802429FC -/* CC6200 802429F0 24020001 */ addiu $v0, $zero, 1 -/* CC6204 802429F4 08090A80 */ j .L80242A00 -/* CC6208 802429F8 A22200B5 */ sb $v0, 0xb5($s1) -.L802429FC: -/* CC620C 802429FC A22000B5 */ sb $zero, 0xb5($s1) -.L80242A00: -/* CC6210 80242A00 8E22008C */ lw $v0, 0x8c($s1) -/* CC6214 80242A04 1040000F */ beqz $v0, .L80242A44 -/* CC6218 80242A08 3C03FFAA */ lui $v1, 0xffaa -/* CC621C 80242A0C 8E420028 */ lw $v0, 0x28($s2) -/* CC6220 80242A10 3463FFFC */ ori $v1, $v1, 0xfffc -/* CC6224 80242A14 00431821 */ addu $v1, $v0, $v1 -/* CC6228 80242A18 2C620015 */ sltiu $v0, $v1, 0x15 -/* CC622C 80242A1C 10400009 */ beqz $v0, .L80242A44 -/* CC6230 80242A20 00031080 */ sll $v0, $v1, 2 -/* CC6234 80242A24 3C018024 */ lui $at, 0x8024 -/* CC6238 80242A28 00220821 */ addu $at, $at, $v0 -/* CC623C 80242A2C 8C227A90 */ lw $v0, 0x7a90($at) -/* CC6240 80242A30 00400008 */ jr $v0 -/* CC6244 80242A34 00000000 */ nop -/* CC6248 80242A38 8E420028 */ lw $v0, 0x28($s2) -/* CC624C 80242A3C 24420001 */ addiu $v0, $v0, 1 -/* CC6250 80242A40 AE420028 */ sw $v0, 0x28($s2) -.L80242A44: -/* CC6254 80242A44 0000102D */ daddu $v0, $zero, $zero -.L80242A48: -/* CC6258 80242A48 8FBF0068 */ lw $ra, 0x68($sp) -/* CC625C 80242A4C 8FB50064 */ lw $s5, 0x64($sp) -/* CC6260 80242A50 8FB40060 */ lw $s4, 0x60($sp) -/* CC6264 80242A54 8FB3005C */ lw $s3, 0x5c($sp) -/* CC6268 80242A58 8FB20058 */ lw $s2, 0x58($sp) -/* CC626C 80242A5C 8FB10054 */ lw $s1, 0x54($sp) -/* CC6270 80242A60 8FB00050 */ lw $s0, 0x50($sp) -/* CC6274 80242A64 03E00008 */ jr $ra -/* CC6278 80242A68 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s new file mode 100644 index 0000000000..9ac77804ce --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_8024262C_CC5E3C.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024262C_CC5E3C +/* CC5E3C 8024262C 27BDFF90 */ addiu $sp, $sp, -0x70 +/* CC5E40 80242630 AFB3005C */ sw $s3, 0x5c($sp) +/* CC5E44 80242634 0080982D */ daddu $s3, $a0, $zero +/* CC5E48 80242638 AFBF0068 */ sw $ra, 0x68($sp) +/* CC5E4C 8024263C AFB50064 */ sw $s5, 0x64($sp) +/* CC5E50 80242640 AFB40060 */ sw $s4, 0x60($sp) +/* CC5E54 80242644 AFB20058 */ sw $s2, 0x58($sp) +/* CC5E58 80242648 AFB10054 */ sw $s1, 0x54($sp) +/* CC5E5C 8024264C AFB00050 */ sw $s0, 0x50($sp) +/* CC5E60 80242650 8E710148 */ lw $s1, 0x148($s3) +/* CC5E64 80242654 86240008 */ lh $a0, 8($s1) +/* CC5E68 80242658 0C00EABB */ jal get_npc_unsafe +/* CC5E6C 8024265C 00A0802D */ daddu $s0, $a1, $zero +/* CC5E70 80242660 8E63000C */ lw $v1, 0xc($s3) +/* CC5E74 80242664 0260202D */ daddu $a0, $s3, $zero +/* CC5E78 80242668 8C650000 */ lw $a1, ($v1) +/* CC5E7C 8024266C 0C0B1EAF */ jal get_variable +/* CC5E80 80242670 0040902D */ daddu $s2, $v0, $zero +/* CC5E84 80242674 AFA00028 */ sw $zero, 0x28($sp) +/* CC5E88 80242678 8E2300D0 */ lw $v1, 0xd0($s1) +/* CC5E8C 8024267C 8C630030 */ lw $v1, 0x30($v1) +/* CC5E90 80242680 AFA3002C */ sw $v1, 0x2c($sp) +/* CC5E94 80242684 8E2300D0 */ lw $v1, 0xd0($s1) +/* CC5E98 80242688 8C63001C */ lw $v1, 0x1c($v1) +/* CC5E9C 8024268C AFA30030 */ sw $v1, 0x30($sp) +/* CC5EA0 80242690 8E2300D0 */ lw $v1, 0xd0($s1) +/* CC5EA4 80242694 8C630024 */ lw $v1, 0x24($v1) +/* CC5EA8 80242698 AFA30034 */ sw $v1, 0x34($sp) +/* CC5EAC 8024269C 8E2300D0 */ lw $v1, 0xd0($s1) +/* CC5EB0 802426A0 8C630028 */ lw $v1, 0x28($v1) +/* CC5EB4 802426A4 27B50028 */ addiu $s5, $sp, 0x28 +/* CC5EB8 802426A8 AFA30038 */ sw $v1, 0x38($sp) +/* CC5EBC 802426AC 8E2300D0 */ lw $v1, 0xd0($s1) +/* CC5EC0 802426B0 3C0142C8 */ lui $at, 0x42c8 +/* CC5EC4 802426B4 44810000 */ mtc1 $at, $f0 +/* CC5EC8 802426B8 8C63002C */ lw $v1, 0x2c($v1) +/* CC5ECC 802426BC 0040A02D */ daddu $s4, $v0, $zero +/* CC5ED0 802426C0 E7A00040 */ swc1 $f0, 0x40($sp) +/* CC5ED4 802426C4 A7A00044 */ sh $zero, 0x44($sp) +/* CC5ED8 802426C8 12000009 */ beqz $s0, .L802426F0 +/* CC5EDC 802426CC AFA3003C */ sw $v1, 0x3c($sp) +/* CC5EE0 802426D0 864300A8 */ lh $v1, 0xa8($s2) +/* CC5EE4 802426D4 8E2200B0 */ lw $v0, 0xb0($s1) +/* CC5EE8 802426D8 AE20008C */ sw $zero, 0x8c($s1) +/* CC5EEC 802426DC A22000B5 */ sb $zero, 0xb5($s1) +/* CC5EF0 802426E0 34420008 */ ori $v0, $v0, 8 +/* CC5EF4 802426E4 AE230084 */ sw $v1, 0x84($s1) +/* CC5EF8 802426E8 080909C0 */ j .L80242700 +/* CC5EFC 802426EC AE2200B0 */ sw $v0, 0xb0($s1) +.L802426F0: +/* CC5F00 802426F0 8E2200B0 */ lw $v0, 0xb0($s1) +/* CC5F04 802426F4 30420004 */ andi $v0, $v0, 4 +/* CC5F08 802426F8 10400047 */ beqz $v0, .L80242818 +/* CC5F0C 802426FC 00000000 */ nop +.L80242700: +/* CC5F10 80242700 AE600070 */ sw $zero, 0x70($s3) +/* CC5F14 80242704 A640008E */ sh $zero, 0x8e($s2) +/* CC5F18 80242708 8E2300CC */ lw $v1, 0xcc($s1) +/* CC5F1C 8024270C 2404F7FF */ addiu $a0, $zero, -0x801 +/* CC5F20 80242710 A2200007 */ sb $zero, 7($s1) +/* CC5F24 80242714 8E420000 */ lw $v0, ($s2) +/* CC5F28 80242718 8C630000 */ lw $v1, ($v1) +/* CC5F2C 8024271C 00441024 */ and $v0, $v0, $a0 +/* CC5F30 80242720 AE420000 */ sw $v0, ($s2) +/* CC5F34 80242724 AE430028 */ sw $v1, 0x28($s2) +/* CC5F38 80242728 96220086 */ lhu $v0, 0x86($s1) +/* CC5F3C 8024272C A64200A8 */ sh $v0, 0xa8($s2) +/* CC5F40 80242730 8E2200D0 */ lw $v0, 0xd0($s1) +/* CC5F44 80242734 AE200090 */ sw $zero, 0x90($s1) +/* CC5F48 80242738 8C420034 */ lw $v0, 0x34($v0) +/* CC5F4C 8024273C 14400006 */ bnez $v0, .L80242758 +/* CC5F50 80242740 2403FDFF */ addiu $v1, $zero, -0x201 +/* CC5F54 80242744 8E420000 */ lw $v0, ($s2) +/* CC5F58 80242748 2403FFF7 */ addiu $v1, $zero, -9 +/* CC5F5C 8024274C 34420200 */ ori $v0, $v0, 0x200 +/* CC5F60 80242750 080909D9 */ j .L80242764 +/* CC5F64 80242754 00431024 */ and $v0, $v0, $v1 +.L80242758: +/* CC5F68 80242758 8E420000 */ lw $v0, ($s2) +/* CC5F6C 8024275C 00431024 */ and $v0, $v0, $v1 +/* CC5F70 80242760 34420008 */ ori $v0, $v0, 8 +.L80242764: +/* CC5F74 80242764 AE420000 */ sw $v0, ($s2) +/* CC5F78 80242768 8E2200B0 */ lw $v0, 0xb0($s1) +/* CC5F7C 8024276C 30420004 */ andi $v0, $v0, 4 +/* CC5F80 80242770 1040001E */ beqz $v0, .L802427EC +/* CC5F84 80242774 24040002 */ addiu $a0, $zero, 2 +/* CC5F88 80242778 0240282D */ daddu $a1, $s2, $zero +/* CC5F8C 8024277C 0000302D */ daddu $a2, $zero, $zero +/* CC5F90 80242780 24020063 */ addiu $v0, $zero, 0x63 +/* CC5F94 80242784 AE620070 */ sw $v0, 0x70($s3) +/* CC5F98 80242788 AE600074 */ sw $zero, 0x74($s3) +/* CC5F9C 8024278C 864300A8 */ lh $v1, 0xa8($s2) +/* CC5FA0 80242790 3C013F80 */ lui $at, 0x3f80 +/* CC5FA4 80242794 44810000 */ mtc1 $at, $f0 +/* CC5FA8 80242798 3C014000 */ lui $at, 0x4000 +/* CC5FAC 8024279C 44811000 */ mtc1 $at, $f2 +/* CC5FB0 802427A0 3C01C1A0 */ lui $at, 0xc1a0 +/* CC5FB4 802427A4 44812000 */ mtc1 $at, $f4 +/* CC5FB8 802427A8 24020028 */ addiu $v0, $zero, 0x28 +/* CC5FBC 802427AC AFA2001C */ sw $v0, 0x1c($sp) +/* CC5FC0 802427B0 44833000 */ mtc1 $v1, $f6 +/* CC5FC4 802427B4 00000000 */ nop +/* CC5FC8 802427B8 468031A0 */ cvt.s.w $f6, $f6 +/* CC5FCC 802427BC 44073000 */ mfc1 $a3, $f6 +/* CC5FD0 802427C0 27A20048 */ addiu $v0, $sp, 0x48 +/* CC5FD4 802427C4 AFA20020 */ sw $v0, 0x20($sp) +/* CC5FD8 802427C8 E7A00010 */ swc1 $f0, 0x10($sp) +/* CC5FDC 802427CC E7A20014 */ swc1 $f2, 0x14($sp) +/* CC5FE0 802427D0 0C01BFA4 */ jal fx_emote +/* CC5FE4 802427D4 E7A40018 */ swc1 $f4, 0x18($sp) +/* CC5FE8 802427D8 8E2200B0 */ lw $v0, 0xb0($s1) +/* CC5FEC 802427DC 2403FFFB */ addiu $v1, $zero, -5 +/* CC5FF0 802427E0 00431024 */ and $v0, $v0, $v1 +/* CC5FF4 802427E4 08090A06 */ j .L80242818 +/* CC5FF8 802427E8 AE2200B0 */ sw $v0, 0xb0($s1) +.L802427EC: +/* CC5FFC 802427EC 8E220000 */ lw $v0, ($s1) +/* CC6000 802427F0 3C034000 */ lui $v1, 0x4000 +/* CC6004 802427F4 00431024 */ and $v0, $v0, $v1 +/* CC6008 802427F8 10400007 */ beqz $v0, .L80242818 +/* CC600C 802427FC 3C03BFFF */ lui $v1, 0xbfff +/* CC6010 80242800 2402000C */ addiu $v0, $zero, 0xc +/* CC6014 80242804 AE620070 */ sw $v0, 0x70($s3) +/* CC6018 80242808 8E220000 */ lw $v0, ($s1) +/* CC601C 8024280C 3463FFFF */ ori $v1, $v1, 0xffff +/* CC6020 80242810 00431024 */ and $v0, $v0, $v1 +/* CC6024 80242814 AE220000 */ sw $v0, ($s1) +.L80242818: +/* CC6028 80242818 8E220090 */ lw $v0, 0x90($s1) +/* CC602C 8024281C 1840000C */ blez $v0, .L80242850 +/* CC6030 80242820 2442FFFF */ addiu $v0, $v0, -1 +/* CC6034 80242824 14400087 */ bnez $v0, .L80242A44 +/* CC6038 80242828 AE220090 */ sw $v0, 0x90($s1) +/* CC603C 8024282C 3C03FFAA */ lui $v1, 0xffaa +/* CC6040 80242830 8E420028 */ lw $v0, 0x28($s2) +/* CC6044 80242834 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* CC6048 80242838 00431021 */ addu $v0, $v0, $v1 +/* CC604C 8024283C 2C420002 */ sltiu $v0, $v0, 2 +/* CC6050 80242840 10400003 */ beqz $v0, .L80242850 +/* CC6054 80242844 3C020055 */ lui $v0, 0x55 +/* CC6058 80242848 3442000C */ ori $v0, $v0, 0xc +/* CC605C 8024284C AE420028 */ sw $v0, 0x28($s2) +.L80242850: +/* CC6060 80242850 8E630070 */ lw $v1, 0x70($s3) +/* CC6064 80242854 2402000C */ addiu $v0, $zero, 0xc +/* CC6068 80242858 10620048 */ beq $v1, $v0, .L8024297C +/* CC606C 8024285C 2862000D */ slti $v0, $v1, 0xd +/* CC6070 80242860 1040000F */ beqz $v0, .L802428A0 +/* CC6074 80242864 24100001 */ addiu $s0, $zero, 1 +/* CC6078 80242868 1070001E */ beq $v1, $s0, .L802428E4 +/* CC607C 8024286C 28620002 */ slti $v0, $v1, 2 +/* CC6080 80242870 10400005 */ beqz $v0, .L80242888 +/* CC6084 80242874 24020002 */ addiu $v0, $zero, 2 +/* CC6088 80242878 10600015 */ beqz $v1, .L802428D0 +/* CC608C 8024287C 0260202D */ daddu $a0, $s3, $zero +/* CC6090 80242880 08090A76 */ j .L802429D8 +/* CC6094 80242884 00000000 */ nop +.L80242888: +/* CC6098 80242888 1062001C */ beq $v1, $v0, .L802428FC +/* CC609C 8024288C 24020003 */ addiu $v0, $zero, 3 +/* CC60A0 80242890 10620035 */ beq $v1, $v0, .L80242968 +/* CC60A4 80242894 0260202D */ daddu $a0, $s3, $zero +/* CC60A8 80242898 08090A76 */ j .L802429D8 +/* CC60AC 8024289C 00000000 */ nop +.L802428A0: +/* CC60B0 802428A0 2402000E */ addiu $v0, $zero, 0xe +/* CC60B4 802428A4 1062003F */ beq $v1, $v0, .L802429A4 +/* CC60B8 802428A8 0062102A */ slt $v0, $v1, $v0 +/* CC60BC 802428AC 14400038 */ bnez $v0, .L80242990 +/* CC60C0 802428B0 0260202D */ daddu $a0, $s3, $zero +/* CC60C4 802428B4 2402000F */ addiu $v0, $zero, 0xf +/* CC60C8 802428B8 10620040 */ beq $v1, $v0, .L802429BC +/* CC60CC 802428BC 24020063 */ addiu $v0, $zero, 0x63 +/* CC60D0 802428C0 10620043 */ beq $v1, $v0, .L802429D0 +/* CC60D4 802428C4 00000000 */ nop +/* CC60D8 802428C8 08090A76 */ j .L802429D8 +/* CC60DC 802428CC 00000000 */ nop +.L802428D0: +/* CC60E0 802428D0 0280282D */ daddu $a1, $s4, $zero +/* CC60E4 802428D4 0C012568 */ jal func_800495A0 +/* CC60E8 802428D8 02A0302D */ daddu $a2, $s5, $zero +/* CC60EC 802428DC 96220086 */ lhu $v0, 0x86($s1) +/* CC60F0 802428E0 A64200A8 */ sh $v0, 0xa8($s2) +.L802428E4: +/* CC60F4 802428E4 0260202D */ daddu $a0, $s3, $zero +/* CC60F8 802428E8 0280282D */ daddu $a1, $s4, $zero +/* CC60FC 802428EC 0C0125AE */ jal func_800496B8 +/* CC6100 802428F0 02A0302D */ daddu $a2, $s5, $zero +/* CC6104 802428F4 08090A76 */ j .L802429D8 +/* CC6108 802428F8 00000000 */ nop +.L802428FC: +/* CC610C 802428FC 0260202D */ daddu $a0, $s3, $zero +/* CC6110 80242900 0280282D */ daddu $a1, $s4, $zero +/* CC6114 80242904 0C0126D1 */ jal func_80049B44 +/* CC6118 80242908 02A0302D */ daddu $a2, $s5, $zero +/* CC611C 8024290C 8E230088 */ lw $v1, 0x88($s1) +/* CC6120 80242910 24020006 */ addiu $v0, $zero, 6 +/* CC6124 80242914 14620014 */ bne $v1, $v0, .L80242968 +/* CC6128 80242918 0260202D */ daddu $a0, $s3, $zero +/* CC612C 8024291C 0C00A67F */ jal rand_int +/* CC6130 80242920 24040064 */ addiu $a0, $zero, 0x64 +/* CC6134 80242924 28420021 */ slti $v0, $v0, 0x21 +/* CC6138 80242928 5040000F */ beql $v0, $zero, .L80242968 +/* CC613C 8024292C 0260202D */ daddu $a0, $s3, $zero +/* CC6140 80242930 8E22008C */ lw $v0, 0x8c($s1) +/* CC6144 80242934 10400005 */ beqz $v0, .L8024294C +/* CC6148 80242938 3C020055 */ lui $v0, 0x55 +/* CC614C 8024293C 3442002F */ ori $v0, $v0, 0x2f +/* CC6150 80242940 AE20008C */ sw $zero, 0x8c($s1) +/* CC6154 80242944 08090A56 */ j .L80242958 +/* CC6158 80242948 A22000B5 */ sb $zero, 0xb5($s1) +.L8024294C: +/* CC615C 8024294C 3442002E */ ori $v0, $v0, 0x2e +/* CC6160 80242950 AE30008C */ sw $s0, 0x8c($s1) +/* CC6164 80242954 A23000B5 */ sb $s0, 0xb5($s1) +.L80242958: +/* CC6168 80242958 AE420028 */ sw $v0, 0x28($s2) +/* CC616C 8024295C 24020007 */ addiu $v0, $zero, 7 +/* CC6170 80242960 08090A91 */ j .L80242A44 +/* CC6174 80242964 AE220090 */ sw $v0, 0x90($s1) +.L80242968: +/* CC6178 80242968 0280282D */ daddu $a1, $s4, $zero +/* CC617C 8024296C 0C012701 */ jal func_80049C04 +/* CC6180 80242970 02A0302D */ daddu $a2, $s5, $zero +/* CC6184 80242974 08090A76 */ j .L802429D8 +/* CC6188 80242978 00000000 */ nop +.L8024297C: +/* CC618C 8024297C 0260202D */ daddu $a0, $s3, $zero +/* CC6190 80242980 0280282D */ daddu $a1, $s4, $zero +/* CC6194 80242984 0C0908A6 */ jal func_80242298_CC5AA8 +/* CC6198 80242988 02A0302D */ daddu $a2, $s5, $zero +/* CC619C 8024298C 0260202D */ daddu $a0, $s3, $zero +.L80242990: +/* CC61A0 80242990 0280282D */ daddu $a1, $s4, $zero +/* CC61A4 80242994 0C0908C5 */ jal func_80242314_CC5B24 +/* CC61A8 80242998 02A0302D */ daddu $a2, $s5, $zero +/* CC61AC 8024299C 08090A76 */ j .L802429D8 +/* CC61B0 802429A0 00000000 */ nop +.L802429A4: +/* CC61B4 802429A4 0260202D */ daddu $a0, $s3, $zero +/* CC61B8 802429A8 0280282D */ daddu $a1, $s4, $zero +/* CC61BC 802429AC 0C090912 */ jal func_80242448_CC5C58 +/* CC61C0 802429B0 02A0302D */ daddu $a2, $s5, $zero +/* CC61C4 802429B4 08090A76 */ j .L802429D8 +/* CC61C8 802429B8 00000000 */ nop +.L802429BC: +/* CC61CC 802429BC 0280282D */ daddu $a1, $s4, $zero +/* CC61D0 802429C0 0C09096B */ jal func_802425AC_CC5DBC +/* CC61D4 802429C4 02A0302D */ daddu $a2, $s5, $zero +/* CC61D8 802429C8 08090A76 */ j .L802429D8 +/* CC61DC 802429CC 00000000 */ nop +.L802429D0: +/* CC61E0 802429D0 0C0129CF */ jal func_8004A73C +/* CC61E4 802429D4 0260202D */ daddu $a0, $s3, $zero +.L802429D8: +/* CC61E8 802429D8 8E230088 */ lw $v1, 0x88($s1) +/* CC61EC 802429DC 24020006 */ addiu $v0, $zero, 6 +/* CC61F0 802429E0 14620019 */ bne $v1, $v0, .L80242A48 +/* CC61F4 802429E4 0000102D */ daddu $v0, $zero, $zero +/* CC61F8 802429E8 8E22008C */ lw $v0, 0x8c($s1) +/* CC61FC 802429EC 10400003 */ beqz $v0, .L802429FC +/* CC6200 802429F0 24020001 */ addiu $v0, $zero, 1 +/* CC6204 802429F4 08090A80 */ j .L80242A00 +/* CC6208 802429F8 A22200B5 */ sb $v0, 0xb5($s1) +.L802429FC: +/* CC620C 802429FC A22000B5 */ sb $zero, 0xb5($s1) +.L80242A00: +/* CC6210 80242A00 8E22008C */ lw $v0, 0x8c($s1) +/* CC6214 80242A04 1040000F */ beqz $v0, .L80242A44 +/* CC6218 80242A08 3C03FFAA */ lui $v1, 0xffaa +/* CC621C 80242A0C 8E420028 */ lw $v0, 0x28($s2) +/* CC6220 80242A10 3463FFFC */ ori $v1, $v1, 0xfffc +/* CC6224 80242A14 00431821 */ addu $v1, $v0, $v1 +/* CC6228 80242A18 2C620015 */ sltiu $v0, $v1, 0x15 +/* CC622C 80242A1C 10400009 */ beqz $v0, .L80242A44 +/* CC6230 80242A20 00031080 */ sll $v0, $v1, 2 +/* CC6234 80242A24 3C018024 */ lui $at, 0x8024 +/* CC6238 80242A28 00220821 */ addu $at, $at, $v0 +/* CC623C 80242A2C 8C227A90 */ lw $v0, 0x7a90($at) +/* CC6240 80242A30 00400008 */ jr $v0 +/* CC6244 80242A34 00000000 */ nop +/* CC6248 80242A38 8E420028 */ lw $v0, 0x28($s2) +/* CC624C 80242A3C 24420001 */ addiu $v0, $v0, 1 +/* CC6250 80242A40 AE420028 */ sw $v0, 0x28($s2) +.L80242A44: +/* CC6254 80242A44 0000102D */ daddu $v0, $zero, $zero +.L80242A48: +/* CC6258 80242A48 8FBF0068 */ lw $ra, 0x68($sp) +/* CC625C 80242A4C 8FB50064 */ lw $s5, 0x64($sp) +/* CC6260 80242A50 8FB40060 */ lw $s4, 0x60($sp) +/* CC6264 80242A54 8FB3005C */ lw $s3, 0x5c($sp) +/* CC6268 80242A58 8FB20058 */ lw $s2, 0x58($sp) +/* CC626C 80242A5C 8FB10054 */ lw $s1, 0x54($sp) +/* CC6270 80242A60 8FB00050 */ lw $s0, 0x50($sp) +/* CC6274 80242A64 03E00008 */ jr $ra +/* CC6278 80242A68 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s index 40edf5314a..0be490956f 100644 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80242A6C_CC627C.s @@ -268,12 +268,12 @@ glabel func_80242A6C_CC627C /* CC6650 80242E40 00000000 */ nop .L80242E44: /* CC6654 80242E44 0260282D */ daddu $a1, $s3, $zero -/* CC6658 80242E48 0C0908A6 */ jal func_80242298 +/* CC6658 80242E48 0C0908A6 */ jal func_80242298_CC5AA8 /* CC665C 80242E4C 0280302D */ daddu $a2, $s4, $zero .L80242E50: /* CC6660 80242E50 02A0202D */ daddu $a0, $s5, $zero /* CC6664 80242E54 0260282D */ daddu $a1, $s3, $zero -/* CC6668 80242E58 0C0908C5 */ jal func_80242314 +/* CC6668 80242E58 0C0908C5 */ jal func_80242314_CC5B24 /* CC666C 80242E5C 0280302D */ daddu $a2, $s4, $zero /* CC6670 80242E60 96420086 */ lhu $v0, 0x86($s2) /* CC6674 80242E64 08090CCE */ j .L80243338 @@ -281,14 +281,14 @@ glabel func_80242A6C_CC627C .L80242E6C: /* CC667C 80242E6C 02A0202D */ daddu $a0, $s5, $zero /* CC6680 80242E70 0260282D */ daddu $a1, $s3, $zero -/* CC6684 80242E74 0C090912 */ jal func_80242448 +/* CC6684 80242E74 0C090912 */ jal func_80242448_CC5C58 /* CC6688 80242E78 0280302D */ daddu $a2, $s4, $zero /* CC668C 80242E7C 08090CCE */ j .L80243338 /* CC6690 80242E80 00000000 */ nop .L80242E84: /* CC6694 80242E84 02A0202D */ daddu $a0, $s5, $zero /* CC6698 80242E88 0260282D */ daddu $a1, $s3, $zero -/* CC669C 80242E8C 0C09096B */ jal func_802425AC +/* CC669C 80242E8C 0C09096B */ jal func_802425AC_CC5DBC /* CC66A0 80242E90 0280302D */ daddu $a2, $s4, $zero /* CC66A4 80242E94 08090CCE */ j .L80243338 /* CC66A8 80242E98 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80243368.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80243368.s deleted file mode 100644 index ba61c062e4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80243368.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243368 -/* CC6B78 80243368 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CC6B7C 8024336C AFB00010 */ sw $s0, 0x10($sp) -/* CC6B80 80243370 0080802D */ daddu $s0, $a0, $zero -/* CC6B84 80243374 AFBF0014 */ sw $ra, 0x14($sp) -/* CC6B88 80243378 C60C0084 */ lwc1 $f12, 0x84($s0) -/* CC6B8C 8024337C 46806320 */ cvt.s.w $f12, $f12 -/* CC6B90 80243380 C6020090 */ lwc1 $f2, 0x90($s0) -/* CC6B94 80243384 468010A0 */ cvt.s.w $f2, $f2 -/* CC6B98 80243388 44061000 */ mfc1 $a2, $f2 -/* CC6B9C 8024338C C6020098 */ lwc1 $f2, 0x98($s0) -/* CC6BA0 80243390 468010A0 */ cvt.s.w $f2, $f2 -/* CC6BA4 80243394 44071000 */ mfc1 $a3, $f2 -/* CC6BA8 80243398 C60E008C */ lwc1 $f14, 0x8c($s0) -/* CC6BAC 8024339C 0C00A720 */ jal atan2 -/* CC6BB0 802433A0 468073A0 */ cvt.s.w $f14, $f14 -/* CC6BB4 802433A4 4600008D */ trunc.w.s $f2, $f0 -/* CC6BB8 802433A8 E60200AC */ swc1 $f2, 0xac($s0) -/* CC6BBC 802433AC 8FBF0014 */ lw $ra, 0x14($sp) -/* CC6BC0 802433B0 8FB00010 */ lw $s0, 0x10($sp) -/* CC6BC4 802433B4 24020002 */ addiu $v0, $zero, 2 -/* CC6BC8 802433B8 03E00008 */ jr $ra -/* CC6BCC 802433BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80243368_CC6B78.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80243368_CC6B78.s new file mode 100644 index 0000000000..6a4ad7c180 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_80243368_CC6B78.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243368_CC6B78 +/* CC6B78 80243368 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CC6B7C 8024336C AFB00010 */ sw $s0, 0x10($sp) +/* CC6B80 80243370 0080802D */ daddu $s0, $a0, $zero +/* CC6B84 80243374 AFBF0014 */ sw $ra, 0x14($sp) +/* CC6B88 80243378 C60C0084 */ lwc1 $f12, 0x84($s0) +/* CC6B8C 8024337C 46806320 */ cvt.s.w $f12, $f12 +/* CC6B90 80243380 C6020090 */ lwc1 $f2, 0x90($s0) +/* CC6B94 80243384 468010A0 */ cvt.s.w $f2, $f2 +/* CC6B98 80243388 44061000 */ mfc1 $a2, $f2 +/* CC6B9C 8024338C C6020098 */ lwc1 $f2, 0x98($s0) +/* CC6BA0 80243390 468010A0 */ cvt.s.w $f2, $f2 +/* CC6BA4 80243394 44071000 */ mfc1 $a3, $f2 +/* CC6BA8 80243398 C60E008C */ lwc1 $f14, 0x8c($s0) +/* CC6BAC 8024339C 0C00A720 */ jal atan2 +/* CC6BB0 802433A0 468073A0 */ cvt.s.w $f14, $f14 +/* CC6BB4 802433A4 4600008D */ trunc.w.s $f2, $f0 +/* CC6BB8 802433A8 E60200AC */ swc1 $f2, 0xac($s0) +/* CC6BBC 802433AC 8FBF0014 */ lw $ra, 0x14($sp) +/* CC6BC0 802433B0 8FB00010 */ lw $s0, 0x10($sp) +/* CC6BC4 802433B4 24020002 */ addiu $v0, $zero, 2 +/* CC6BC8 802433B8 03E00008 */ jr $ra +/* CC6BCC 802433BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0.s deleted file mode 100644 index d23748185b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0.s +++ /dev/null @@ -1,75 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433C0 -/* CC6BD0 802433C0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CC6BD4 802433C4 AFB3002C */ sw $s3, 0x2c($sp) -/* CC6BD8 802433C8 0080982D */ daddu $s3, $a0, $zero -/* CC6BDC 802433CC AFB00020 */ sw $s0, 0x20($sp) -/* CC6BE0 802433D0 00A0802D */ daddu $s0, $a1, $zero -/* CC6BE4 802433D4 24040001 */ addiu $a0, $zero, 1 -/* CC6BE8 802433D8 AFBF0030 */ sw $ra, 0x30($sp) -/* CC6BEC 802433DC AFB20028 */ sw $s2, 0x28($sp) -/* CC6BF0 802433E0 0C00EABB */ jal get_npc_unsafe -/* CC6BF4 802433E4 AFB10024 */ sw $s1, 0x24($sp) -/* CC6BF8 802433E8 8E63000C */ lw $v1, 0xc($s3) -/* CC6BFC 802433EC 0260202D */ daddu $a0, $s3, $zero -/* CC6C00 802433F0 8C650000 */ lw $a1, ($v1) -/* CC6C04 802433F4 0C0B1EAF */ jal get_variable -/* CC6C08 802433F8 0040902D */ daddu $s2, $v0, $zero -/* CC6C0C 802433FC 12000002 */ beqz $s0, .L80243408 -/* CC6C10 80243400 AE620074 */ sw $v0, 0x74($s3) -/* CC6C14 80243404 AE600070 */ sw $zero, 0x70($s3) -.L80243408: -/* CC6C18 80243408 3C026666 */ lui $v0, 0x6666 -/* CC6C1C 8024340C 8E640070 */ lw $a0, 0x70($s3) -/* CC6C20 80243410 34426667 */ ori $v0, $v0, 0x6667 -/* CC6C24 80243414 00820018 */ mult $a0, $v0 -/* CC6C28 80243418 000417C3 */ sra $v0, $a0, 0x1f -/* CC6C2C 8024341C 00004010 */ mfhi $t0 -/* CC6C30 80243420 00081843 */ sra $v1, $t0, 1 -/* CC6C34 80243424 00621823 */ subu $v1, $v1, $v0 -/* CC6C38 80243428 00031080 */ sll $v0, $v1, 2 -/* CC6C3C 8024342C 00431021 */ addu $v0, $v0, $v1 -/* CC6C40 80243430 1482001B */ bne $a0, $v0, .L802434A0 -/* CC6C44 80243434 3C020020 */ lui $v0, 0x20 -/* CC6C48 80243438 34420002 */ ori $v0, $v0, 2 -/* CC6C4C 8024343C 27B1001A */ addiu $s1, $sp, 0x1a -/* CC6C50 80243440 27B00018 */ addiu $s0, $sp, 0x18 -/* CC6C54 80243444 AFB10010 */ sw $s1, 0x10($sp) -/* CC6C58 80243448 AFA20014 */ sw $v0, 0x14($sp) -/* CC6C5C 8024344C 8E460040 */ lw $a2, 0x40($s2) -/* CC6C60 80243450 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CC6C64 80243454 C64E003C */ lwc1 $f14, 0x3c($s2) -/* CC6C68 80243458 0C052781 */ jal func_80149E04 -/* CC6C6C 8024345C 0200382D */ daddu $a3, $s0, $zero -/* CC6C70 80243460 3C0543FA */ lui $a1, 0x43fa -/* CC6C74 80243464 8E620074 */ lw $v0, 0x74($s3) -/* CC6C78 80243468 0000202D */ daddu $a0, $zero, $zero -/* CC6C7C 8024346C AFA20010 */ sw $v0, 0x10($sp) -/* CC6C80 80243470 8E670070 */ lw $a3, 0x70($s3) -/* CC6C84 80243474 0C00A8ED */ jal update_lerp -/* CC6C88 80243478 0000302D */ daddu $a2, $zero, $zero -/* CC6C8C 8024347C 24040295 */ addiu $a0, $zero, 0x295 -/* CC6C90 80243480 4600008D */ trunc.w.s $f2, $f0 -/* CC6C94 80243484 44071000 */ mfc1 $a3, $f2 -/* CC6C98 80243488 00000000 */ nop -/* CC6C9C 8024348C 00073C00 */ sll $a3, $a3, 0x10 -/* CC6CA0 80243490 92050001 */ lbu $a1, 1($s0) -/* CC6CA4 80243494 92260001 */ lbu $a2, 1($s1) -/* CC6CA8 80243498 0C0526AE */ jal _play_sound -/* CC6CAC 8024349C 00073C03 */ sra $a3, $a3, 0x10 -.L802434A0: -/* CC6CB0 802434A0 8E630070 */ lw $v1, 0x70($s3) -/* CC6CB4 802434A4 8E620074 */ lw $v0, 0x74($s3) -/* CC6CB8 802434A8 24630001 */ addiu $v1, $v1, 1 -/* CC6CBC 802434AC 0043102A */ slt $v0, $v0, $v1 -/* CC6CC0 802434B0 AE630070 */ sw $v1, 0x70($s3) -/* CC6CC4 802434B4 8FBF0030 */ lw $ra, 0x30($sp) -/* CC6CC8 802434B8 8FB3002C */ lw $s3, 0x2c($sp) -/* CC6CCC 802434BC 8FB20028 */ lw $s2, 0x28($sp) -/* CC6CD0 802434C0 8FB10024 */ lw $s1, 0x24($sp) -/* CC6CD4 802434C4 8FB00020 */ lw $s0, 0x20($sp) -/* CC6CD8 802434C8 00021040 */ sll $v0, $v0, 1 -/* CC6CDC 802434CC 03E00008 */ jr $ra -/* CC6CE0 802434D0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s new file mode 100644 index 0000000000..6cc0fb6131 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802433C0_CC6BD0.s @@ -0,0 +1,75 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802433C0_CC6BD0 +/* CC6BD0 802433C0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* CC6BD4 802433C4 AFB3002C */ sw $s3, 0x2c($sp) +/* CC6BD8 802433C8 0080982D */ daddu $s3, $a0, $zero +/* CC6BDC 802433CC AFB00020 */ sw $s0, 0x20($sp) +/* CC6BE0 802433D0 00A0802D */ daddu $s0, $a1, $zero +/* CC6BE4 802433D4 24040001 */ addiu $a0, $zero, 1 +/* CC6BE8 802433D8 AFBF0030 */ sw $ra, 0x30($sp) +/* CC6BEC 802433DC AFB20028 */ sw $s2, 0x28($sp) +/* CC6BF0 802433E0 0C00EABB */ jal get_npc_unsafe +/* CC6BF4 802433E4 AFB10024 */ sw $s1, 0x24($sp) +/* CC6BF8 802433E8 8E63000C */ lw $v1, 0xc($s3) +/* CC6BFC 802433EC 0260202D */ daddu $a0, $s3, $zero +/* CC6C00 802433F0 8C650000 */ lw $a1, ($v1) +/* CC6C04 802433F4 0C0B1EAF */ jal get_variable +/* CC6C08 802433F8 0040902D */ daddu $s2, $v0, $zero +/* CC6C0C 802433FC 12000002 */ beqz $s0, .L80243408 +/* CC6C10 80243400 AE620074 */ sw $v0, 0x74($s3) +/* CC6C14 80243404 AE600070 */ sw $zero, 0x70($s3) +.L80243408: +/* CC6C18 80243408 3C026666 */ lui $v0, 0x6666 +/* CC6C1C 8024340C 8E640070 */ lw $a0, 0x70($s3) +/* CC6C20 80243410 34426667 */ ori $v0, $v0, 0x6667 +/* CC6C24 80243414 00820018 */ mult $a0, $v0 +/* CC6C28 80243418 000417C3 */ sra $v0, $a0, 0x1f +/* CC6C2C 8024341C 00004010 */ mfhi $t0 +/* CC6C30 80243420 00081843 */ sra $v1, $t0, 1 +/* CC6C34 80243424 00621823 */ subu $v1, $v1, $v0 +/* CC6C38 80243428 00031080 */ sll $v0, $v1, 2 +/* CC6C3C 8024342C 00431021 */ addu $v0, $v0, $v1 +/* CC6C40 80243430 1482001B */ bne $a0, $v0, .L802434A0 +/* CC6C44 80243434 3C020020 */ lui $v0, 0x20 +/* CC6C48 80243438 34420002 */ ori $v0, $v0, 2 +/* CC6C4C 8024343C 27B1001A */ addiu $s1, $sp, 0x1a +/* CC6C50 80243440 27B00018 */ addiu $s0, $sp, 0x18 +/* CC6C54 80243444 AFB10010 */ sw $s1, 0x10($sp) +/* CC6C58 80243448 AFA20014 */ sw $v0, 0x14($sp) +/* CC6C5C 8024344C 8E460040 */ lw $a2, 0x40($s2) +/* CC6C60 80243450 C64C0038 */ lwc1 $f12, 0x38($s2) +/* CC6C64 80243454 C64E003C */ lwc1 $f14, 0x3c($s2) +/* CC6C68 80243458 0C052781 */ jal func_80149E04 +/* CC6C6C 8024345C 0200382D */ daddu $a3, $s0, $zero +/* CC6C70 80243460 3C0543FA */ lui $a1, 0x43fa +/* CC6C74 80243464 8E620074 */ lw $v0, 0x74($s3) +/* CC6C78 80243468 0000202D */ daddu $a0, $zero, $zero +/* CC6C7C 8024346C AFA20010 */ sw $v0, 0x10($sp) +/* CC6C80 80243470 8E670070 */ lw $a3, 0x70($s3) +/* CC6C84 80243474 0C00A8ED */ jal update_lerp +/* CC6C88 80243478 0000302D */ daddu $a2, $zero, $zero +/* CC6C8C 8024347C 24040295 */ addiu $a0, $zero, 0x295 +/* CC6C90 80243480 4600008D */ trunc.w.s $f2, $f0 +/* CC6C94 80243484 44071000 */ mfc1 $a3, $f2 +/* CC6C98 80243488 00000000 */ nop +/* CC6C9C 8024348C 00073C00 */ sll $a3, $a3, 0x10 +/* CC6CA0 80243490 92050001 */ lbu $a1, 1($s0) +/* CC6CA4 80243494 92260001 */ lbu $a2, 1($s1) +/* CC6CA8 80243498 0C0526AE */ jal _play_sound +/* CC6CAC 8024349C 00073C03 */ sra $a3, $a3, 0x10 +.L802434A0: +/* CC6CB0 802434A0 8E630070 */ lw $v1, 0x70($s3) +/* CC6CB4 802434A4 8E620074 */ lw $v0, 0x74($s3) +/* CC6CB8 802434A8 24630001 */ addiu $v1, $v1, 1 +/* CC6CBC 802434AC 0043102A */ slt $v0, $v0, $v1 +/* CC6CC0 802434B0 AE630070 */ sw $v1, 0x70($s3) +/* CC6CC4 802434B4 8FBF0030 */ lw $ra, 0x30($sp) +/* CC6CC8 802434B8 8FB3002C */ lw $s3, 0x2c($sp) +/* CC6CCC 802434BC 8FB20028 */ lw $s2, 0x28($sp) +/* CC6CD0 802434C0 8FB10024 */ lw $s1, 0x24($sp) +/* CC6CD4 802434C4 8FB00020 */ lw $s0, 0x20($sp) +/* CC6CD8 802434C8 00021040 */ sll $v0, $v0, 1 +/* CC6CDC 802434CC 03E00008 */ jr $ra +/* CC6CE0 802434D0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4.s deleted file mode 100644 index 09306de311..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434D4 -/* CC6CE4 802434D4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CC6CE8 802434D8 AFB20028 */ sw $s2, 0x28($sp) -/* CC6CEC 802434DC 0080902D */ daddu $s2, $a0, $zero -/* CC6CF0 802434E0 AFB00020 */ sw $s0, 0x20($sp) -/* CC6CF4 802434E4 00A0802D */ daddu $s0, $a1, $zero -/* CC6CF8 802434E8 0000202D */ daddu $a0, $zero, $zero -/* CC6CFC 802434EC AFBF002C */ sw $ra, 0x2c($sp) -/* CC6D00 802434F0 0C00EABB */ jal get_npc_unsafe -/* CC6D04 802434F4 AFB10024 */ sw $s1, 0x24($sp) -/* CC6D08 802434F8 12000002 */ beqz $s0, .L80243504 -/* CC6D0C 802434FC 0040282D */ daddu $a1, $v0, $zero -/* CC6D10 80243500 AE400070 */ sw $zero, 0x70($s2) -.L80243504: -/* CC6D14 80243504 3C026666 */ lui $v0, 0x6666 -/* CC6D18 80243508 8E440070 */ lw $a0, 0x70($s2) -/* CC6D1C 8024350C 34426667 */ ori $v0, $v0, 0x6667 -/* CC6D20 80243510 00820018 */ mult $a0, $v0 -/* CC6D24 80243514 000417C3 */ sra $v0, $a0, 0x1f -/* CC6D28 80243518 00004010 */ mfhi $t0 -/* CC6D2C 8024351C 00081843 */ sra $v1, $t0, 1 -/* CC6D30 80243520 00621823 */ subu $v1, $v1, $v0 -/* CC6D34 80243524 00031080 */ sll $v0, $v1, 2 -/* CC6D38 80243528 00431021 */ addu $v0, $v0, $v1 -/* CC6D3C 8024352C 1482001B */ bne $a0, $v0, .L8024359C -/* CC6D40 80243530 3C020020 */ lui $v0, 0x20 -/* CC6D44 80243534 34420002 */ ori $v0, $v0, 2 -/* CC6D48 80243538 27B1001A */ addiu $s1, $sp, 0x1a -/* CC6D4C 8024353C 27B00018 */ addiu $s0, $sp, 0x18 -/* CC6D50 80243540 AFB10010 */ sw $s1, 0x10($sp) -/* CC6D54 80243544 AFA20014 */ sw $v0, 0x14($sp) -/* CC6D58 80243548 8CA60040 */ lw $a2, 0x40($a1) -/* CC6D5C 8024354C C4AC0038 */ lwc1 $f12, 0x38($a1) -/* CC6D60 80243550 C4AE003C */ lwc1 $f14, 0x3c($a1) -/* CC6D64 80243554 0C052781 */ jal func_80149E04 -/* CC6D68 80243558 0200382D */ daddu $a3, $s0, $zero -/* CC6D6C 8024355C 0000202D */ daddu $a0, $zero, $zero -/* CC6D70 80243560 3C0543FA */ lui $a1, 0x43fa -/* CC6D74 80243564 24020050 */ addiu $v0, $zero, 0x50 -/* CC6D78 80243568 AFA20010 */ sw $v0, 0x10($sp) -/* CC6D7C 8024356C 8E470070 */ lw $a3, 0x70($s2) -/* CC6D80 80243570 0C00A8ED */ jal update_lerp -/* CC6D84 80243574 0000302D */ daddu $a2, $zero, $zero -/* CC6D88 80243578 24040295 */ addiu $a0, $zero, 0x295 -/* CC6D8C 8024357C 4600008D */ trunc.w.s $f2, $f0 -/* CC6D90 80243580 44071000 */ mfc1 $a3, $f2 -/* CC6D94 80243584 00000000 */ nop -/* CC6D98 80243588 00073C00 */ sll $a3, $a3, 0x10 -/* CC6D9C 8024358C 92050001 */ lbu $a1, 1($s0) -/* CC6DA0 80243590 92260001 */ lbu $a2, 1($s1) -/* CC6DA4 80243594 0C0526AE */ jal _play_sound -/* CC6DA8 80243598 00073C03 */ sra $a3, $a3, 0x10 -.L8024359C: -/* CC6DAC 8024359C 8E430070 */ lw $v1, 0x70($s2) -/* CC6DB0 802435A0 24630001 */ addiu $v1, $v1, 1 -/* CC6DB4 802435A4 28620051 */ slti $v0, $v1, 0x51 -/* CC6DB8 802435A8 38420001 */ xori $v0, $v0, 1 -/* CC6DBC 802435AC AE430070 */ sw $v1, 0x70($s2) -/* CC6DC0 802435B0 8FBF002C */ lw $ra, 0x2c($sp) -/* CC6DC4 802435B4 8FB20028 */ lw $s2, 0x28($sp) -/* CC6DC8 802435B8 8FB10024 */ lw $s1, 0x24($sp) -/* CC6DCC 802435BC 8FB00020 */ lw $s0, 0x20($sp) -/* CC6DD0 802435C0 00021040 */ sll $v0, $v0, 1 -/* CC6DD4 802435C4 03E00008 */ jr $ra -/* CC6DD8 802435C8 27BD0030 */ addiu $sp, $sp, 0x30 -/* CC6DDC 802435CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s new file mode 100644 index 0000000000..1fcc213552 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC3850/func_802434D4_CC6CE4.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802434D4_CC6CE4 +/* CC6CE4 802434D4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* CC6CE8 802434D8 AFB20028 */ sw $s2, 0x28($sp) +/* CC6CEC 802434DC 0080902D */ daddu $s2, $a0, $zero +/* CC6CF0 802434E0 AFB00020 */ sw $s0, 0x20($sp) +/* CC6CF4 802434E4 00A0802D */ daddu $s0, $a1, $zero +/* CC6CF8 802434E8 0000202D */ daddu $a0, $zero, $zero +/* CC6CFC 802434EC AFBF002C */ sw $ra, 0x2c($sp) +/* CC6D00 802434F0 0C00EABB */ jal get_npc_unsafe +/* CC6D04 802434F4 AFB10024 */ sw $s1, 0x24($sp) +/* CC6D08 802434F8 12000002 */ beqz $s0, .L80243504 +/* CC6D0C 802434FC 0040282D */ daddu $a1, $v0, $zero +/* CC6D10 80243500 AE400070 */ sw $zero, 0x70($s2) +.L80243504: +/* CC6D14 80243504 3C026666 */ lui $v0, 0x6666 +/* CC6D18 80243508 8E440070 */ lw $a0, 0x70($s2) +/* CC6D1C 8024350C 34426667 */ ori $v0, $v0, 0x6667 +/* CC6D20 80243510 00820018 */ mult $a0, $v0 +/* CC6D24 80243514 000417C3 */ sra $v0, $a0, 0x1f +/* CC6D28 80243518 00004010 */ mfhi $t0 +/* CC6D2C 8024351C 00081843 */ sra $v1, $t0, 1 +/* CC6D30 80243520 00621823 */ subu $v1, $v1, $v0 +/* CC6D34 80243524 00031080 */ sll $v0, $v1, 2 +/* CC6D38 80243528 00431021 */ addu $v0, $v0, $v1 +/* CC6D3C 8024352C 1482001B */ bne $a0, $v0, .L8024359C +/* CC6D40 80243530 3C020020 */ lui $v0, 0x20 +/* CC6D44 80243534 34420002 */ ori $v0, $v0, 2 +/* CC6D48 80243538 27B1001A */ addiu $s1, $sp, 0x1a +/* CC6D4C 8024353C 27B00018 */ addiu $s0, $sp, 0x18 +/* CC6D50 80243540 AFB10010 */ sw $s1, 0x10($sp) +/* CC6D54 80243544 AFA20014 */ sw $v0, 0x14($sp) +/* CC6D58 80243548 8CA60040 */ lw $a2, 0x40($a1) +/* CC6D5C 8024354C C4AC0038 */ lwc1 $f12, 0x38($a1) +/* CC6D60 80243550 C4AE003C */ lwc1 $f14, 0x3c($a1) +/* CC6D64 80243554 0C052781 */ jal func_80149E04 +/* CC6D68 80243558 0200382D */ daddu $a3, $s0, $zero +/* CC6D6C 8024355C 0000202D */ daddu $a0, $zero, $zero +/* CC6D70 80243560 3C0543FA */ lui $a1, 0x43fa +/* CC6D74 80243564 24020050 */ addiu $v0, $zero, 0x50 +/* CC6D78 80243568 AFA20010 */ sw $v0, 0x10($sp) +/* CC6D7C 8024356C 8E470070 */ lw $a3, 0x70($s2) +/* CC6D80 80243570 0C00A8ED */ jal update_lerp +/* CC6D84 80243574 0000302D */ daddu $a2, $zero, $zero +/* CC6D88 80243578 24040295 */ addiu $a0, $zero, 0x295 +/* CC6D8C 8024357C 4600008D */ trunc.w.s $f2, $f0 +/* CC6D90 80243580 44071000 */ mfc1 $a3, $f2 +/* CC6D94 80243584 00000000 */ nop +/* CC6D98 80243588 00073C00 */ sll $a3, $a3, 0x10 +/* CC6D9C 8024358C 92050001 */ lbu $a1, 1($s0) +/* CC6DA0 80243590 92260001 */ lbu $a2, 1($s1) +/* CC6DA4 80243594 0C0526AE */ jal _play_sound +/* CC6DA8 80243598 00073C03 */ sra $a3, $a3, 0x10 +.L8024359C: +/* CC6DAC 8024359C 8E430070 */ lw $v1, 0x70($s2) +/* CC6DB0 802435A0 24630001 */ addiu $v1, $v1, 1 +/* CC6DB4 802435A4 28620051 */ slti $v0, $v1, 0x51 +/* CC6DB8 802435A8 38420001 */ xori $v0, $v0, 1 +/* CC6DBC 802435AC AE430070 */ sw $v1, 0x70($s2) +/* CC6DC0 802435B0 8FBF002C */ lw $ra, 0x2c($sp) +/* CC6DC4 802435B4 8FB20028 */ lw $s2, 0x28($sp) +/* CC6DC8 802435B8 8FB10024 */ lw $s1, 0x24($sp) +/* CC6DCC 802435BC 8FB00020 */ lw $s0, 0x20($sp) +/* CC6DD0 802435C0 00021040 */ sll $v0, $v0, 1 +/* CC6DD4 802435C4 03E00008 */ jr $ra +/* CC6DD8 802435C8 27BD0030 */ addiu $sp, $sp, 0x30 +/* CC6DDC 802435CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0.s b/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0.s deleted file mode 100644 index 02653b5eee..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435D0 -/* CC6DE0 802435D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CC6DE4 802435D4 3C048024 */ lui $a0, 0x8024 -/* CC6DE8 802435D8 24847AF0 */ addiu $a0, $a0, 0x7af0 -/* CC6DEC 802435DC 27A50010 */ addiu $a1, $sp, 0x10 -/* CC6DF0 802435E0 AFBF0020 */ sw $ra, 0x20($sp) -/* CC6DF4 802435E4 AFB1001C */ sw $s1, 0x1c($sp) -/* CC6DF8 802435E8 0C016B3A */ jal load_asset_by_name -/* CC6DFC 802435EC AFB00018 */ sw $s0, 0x18($sp) -/* CC6E00 802435F0 0040802D */ daddu $s0, $v0, $zero -/* CC6E04 802435F4 0200202D */ daddu $a0, $s0, $zero -/* CC6E08 802435F8 3C118024 */ lui $s1, 0x8024 -/* CC6E0C 802435FC 26317B00 */ addiu $s1, $s1, 0x7b00 -/* CC6E10 80243600 0C01BB7C */ jal decode_yay0 -/* CC6E14 80243604 0220282D */ daddu $a1, $s1, $zero -/* CC6E18 80243608 0C00AB1E */ jal general_heap_free -/* CC6E1C 8024360C 0200202D */ daddu $a0, $s0, $zero -/* CC6E20 80243610 3C048025 */ lui $a0, 0x8025 -/* CC6E24 80243614 2484BA90 */ addiu $a0, $a0, -0x4570 -/* CC6E28 80243618 3C028024 */ lui $v0, 0x8024 -/* CC6E2C 8024361C 24427D00 */ addiu $v0, $v0, 0x7d00 -/* CC6E30 80243620 AC820000 */ sw $v0, ($a0) -/* CC6E34 80243624 24020096 */ addiu $v0, $zero, 0x96 -/* CC6E38 80243628 A4820008 */ sh $v0, 8($a0) -/* CC6E3C 8024362C 24020069 */ addiu $v0, $zero, 0x69 -/* CC6E40 80243630 A482000A */ sh $v0, 0xa($a0) -/* CC6E44 80243634 24020002 */ addiu $v0, $zero, 2 -/* CC6E48 80243638 AC82000C */ sw $v0, 0xc($a0) -/* CC6E4C 8024363C 24020001 */ addiu $v0, $zero, 1 -/* CC6E50 80243640 AC910004 */ sw $s1, 4($a0) -/* CC6E54 80243644 0C0496CB */ jal set_message_images -/* CC6E58 80243648 AC820010 */ sw $v0, 0x10($a0) -/* CC6E5C 8024364C 8FBF0020 */ lw $ra, 0x20($sp) -/* CC6E60 80243650 8FB1001C */ lw $s1, 0x1c($sp) -/* CC6E64 80243654 8FB00018 */ lw $s0, 0x18($sp) -/* CC6E68 80243658 24020002 */ addiu $v0, $zero, 2 -/* CC6E6C 8024365C 03E00008 */ jr $ra -/* CC6E70 80243660 27BD0028 */ addiu $sp, $sp, 0x28 -/* CC6E74 80243664 00000000 */ nop -/* CC6E78 80243668 00000000 */ nop -/* CC6E7C 8024366C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s b/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s new file mode 100644 index 0000000000..578794f90a --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_13/CC6DE0/func_802435D0_CC6DE0.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435D0_CC6DE0 +/* CC6DE0 802435D0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* CC6DE4 802435D4 3C048024 */ lui $a0, 0x8024 +/* CC6DE8 802435D8 24847AF0 */ addiu $a0, $a0, 0x7af0 +/* CC6DEC 802435DC 27A50010 */ addiu $a1, $sp, 0x10 +/* CC6DF0 802435E0 AFBF0020 */ sw $ra, 0x20($sp) +/* CC6DF4 802435E4 AFB1001C */ sw $s1, 0x1c($sp) +/* CC6DF8 802435E8 0C016B3A */ jal load_asset_by_name +/* CC6DFC 802435EC AFB00018 */ sw $s0, 0x18($sp) +/* CC6E00 802435F0 0040802D */ daddu $s0, $v0, $zero +/* CC6E04 802435F4 0200202D */ daddu $a0, $s0, $zero +/* CC6E08 802435F8 3C118024 */ lui $s1, 0x8024 +/* CC6E0C 802435FC 26317B00 */ addiu $s1, $s1, 0x7b00 +/* CC6E10 80243600 0C01BB7C */ jal decode_yay0 +/* CC6E14 80243604 0220282D */ daddu $a1, $s1, $zero +/* CC6E18 80243608 0C00AB1E */ jal general_heap_free +/* CC6E1C 8024360C 0200202D */ daddu $a0, $s0, $zero +/* CC6E20 80243610 3C048025 */ lui $a0, 0x8025 +/* CC6E24 80243614 2484BA90 */ addiu $a0, $a0, -0x4570 +/* CC6E28 80243618 3C028024 */ lui $v0, 0x8024 +/* CC6E2C 8024361C 24427D00 */ addiu $v0, $v0, 0x7d00 +/* CC6E30 80243620 AC820000 */ sw $v0, ($a0) +/* CC6E34 80243624 24020096 */ addiu $v0, $zero, 0x96 +/* CC6E38 80243628 A4820008 */ sh $v0, 8($a0) +/* CC6E3C 8024362C 24020069 */ addiu $v0, $zero, 0x69 +/* CC6E40 80243630 A482000A */ sh $v0, 0xa($a0) +/* CC6E44 80243634 24020002 */ addiu $v0, $zero, 2 +/* CC6E48 80243638 AC82000C */ sw $v0, 0xc($a0) +/* CC6E4C 8024363C 24020001 */ addiu $v0, $zero, 1 +/* CC6E50 80243640 AC910004 */ sw $s1, 4($a0) +/* CC6E54 80243644 0C0496CB */ jal set_message_images +/* CC6E58 80243648 AC820010 */ sw $v0, 0x10($a0) +/* CC6E5C 8024364C 8FBF0020 */ lw $ra, 0x20($sp) +/* CC6E60 80243650 8FB1001C */ lw $s1, 0x1c($sp) +/* CC6E64 80243654 8FB00018 */ lw $s0, 0x18($sp) +/* CC6E68 80243658 24020002 */ addiu $v0, $zero, 2 +/* CC6E6C 8024365C 03E00008 */ jr $ra +/* CC6E70 80243660 27BD0028 */ addiu $sp, $sp, 0x28 +/* CC6E74 80243664 00000000 */ nop +/* CC6E78 80243668 00000000 */ nop +/* CC6E7C 8024366C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8.s deleted file mode 100644 index 612704d398..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A8 -/* CCC6B8 802413A8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CCC6BC 802413AC AFB3004C */ sw $s3, 0x4c($sp) -/* CCC6C0 802413B0 0080982D */ daddu $s3, $a0, $zero -/* CCC6C4 802413B4 AFBF0054 */ sw $ra, 0x54($sp) -/* CCC6C8 802413B8 AFB40050 */ sw $s4, 0x50($sp) -/* CCC6CC 802413BC AFB20048 */ sw $s2, 0x48($sp) -/* CCC6D0 802413C0 AFB10044 */ sw $s1, 0x44($sp) -/* CCC6D4 802413C4 AFB00040 */ sw $s0, 0x40($sp) -/* CCC6D8 802413C8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CCC6DC 802413CC F7B80068 */ sdc1 $f24, 0x68($sp) -/* CCC6E0 802413D0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CCC6E4 802413D4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CCC6E8 802413D8 8E710148 */ lw $s1, 0x148($s3) -/* CCC6EC 802413DC 00A0902D */ daddu $s2, $a1, $zero -/* CCC6F0 802413E0 86240008 */ lh $a0, 8($s1) -/* CCC6F4 802413E4 0C00EABB */ jal get_npc_unsafe -/* CCC6F8 802413E8 00C0A02D */ daddu $s4, $a2, $zero -/* CCC6FC 802413EC 0040802D */ daddu $s0, $v0, $zero -/* CCC700 802413F0 C6200078 */ lwc1 $f0, 0x78($s1) -/* CCC704 802413F4 46800020 */ cvt.s.w $f0, $f0 -/* CCC708 802413F8 46000021 */ cvt.d.s $f0, $f0 -/* CCC70C 802413FC 3C014059 */ lui $at, 0x4059 -/* CCC710 80241400 44811800 */ mtc1 $at, $f3 -/* CCC714 80241404 44801000 */ mtc1 $zero, $f2 -/* CCC718 80241408 8602008E */ lh $v0, 0x8e($s0) -/* CCC71C 8024140C 9603008E */ lhu $v1, 0x8e($s0) -/* CCC720 80241410 46220003 */ div.d $f0, $f0, $f2 -/* CCC724 80241414 46200620 */ cvt.s.d $f24, $f0 -/* CCC728 80241418 C6200088 */ lwc1 $f0, 0x88($s1) -/* CCC72C 8024141C 46800020 */ cvt.s.w $f0, $f0 -/* CCC730 80241420 46000021 */ cvt.d.s $f0, $f0 -/* CCC734 80241424 46220003 */ div.d $f0, $f0, $f2 -/* CCC738 80241428 46200020 */ cvt.s.d $f0, $f0 -/* CCC73C 8024142C 18400003 */ blez $v0, .L8024143C -/* CCC740 80241430 4600C680 */ add.s $f26, $f24, $f0 -/* CCC744 80241434 2462FFFF */ addiu $v0, $v1, -1 -/* CCC748 80241438 A602008E */ sh $v0, 0x8e($s0) -.L8024143C: -/* CCC74C 8024143C 8E220070 */ lw $v0, 0x70($s1) -/* CCC750 80241440 18400034 */ blez $v0, .L80241514 -/* CCC754 80241444 00000000 */ nop -/* CCC758 80241448 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CCC75C 8024144C 46806320 */ cvt.s.w $f12, $f12 -/* CCC760 80241450 44820000 */ mtc1 $v0, $f0 -/* CCC764 80241454 00000000 */ nop -/* CCC768 80241458 46800020 */ cvt.s.w $f0, $f0 -/* CCC76C 8024145C 46000021 */ cvt.d.s $f0, $f0 -/* CCC770 80241460 46220003 */ div.d $f0, $f0, $f2 -/* CCC774 80241464 0C00A8BB */ jal sin_deg -/* CCC778 80241468 462005A0 */ cvt.s.d $f22, $f0 -/* CCC77C 8024146C 8E020000 */ lw $v0, ($s0) -/* CCC780 80241470 30420008 */ andi $v0, $v0, 8 -/* CCC784 80241474 10400003 */ beqz $v0, .L80241484 -/* CCC788 80241478 46000506 */ mov.s $f20, $f0 -/* CCC78C 8024147C 08090531 */ j .L802414C4 -/* CCC790 80241480 0000102D */ daddu $v0, $zero, $zero -.L80241484: -/* CCC794 80241484 27A50028 */ addiu $a1, $sp, 0x28 -/* CCC798 80241488 27A6002C */ addiu $a2, $sp, 0x2c -/* CCC79C 8024148C C6000038 */ lwc1 $f0, 0x38($s0) -/* CCC7A0 80241490 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCC7A4 80241494 C6040040 */ lwc1 $f4, 0x40($s0) -/* CCC7A8 80241498 3C01447A */ lui $at, 0x447a -/* CCC7AC 8024149C 44813000 */ mtc1 $at, $f6 -/* CCC7B0 802414A0 27A20034 */ addiu $v0, $sp, 0x34 -/* CCC7B4 802414A4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CCC7B8 802414A8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CCC7BC 802414AC E7A40030 */ swc1 $f4, 0x30($sp) -/* CCC7C0 802414B0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CCC7C4 802414B4 AFA20010 */ sw $v0, 0x10($sp) -/* CCC7C8 802414B8 8E040080 */ lw $a0, 0x80($s0) -/* CCC7CC 802414BC 0C0372DF */ jal func_800DCB7C -/* CCC7D0 802414C0 27A70030 */ addiu $a3, $sp, 0x30 -.L802414C4: -/* CCC7D4 802414C4 10400007 */ beqz $v0, .L802414E4 -/* CCC7D8 802414C8 00000000 */ nop -/* CCC7DC 802414CC 4616A082 */ mul.s $f2, $f20, $f22 -/* CCC7E0 802414D0 00000000 */ nop -/* CCC7E4 802414D4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CCC7E8 802414D8 46180000 */ add.s $f0, $f0, $f24 -/* CCC7EC 802414DC 0809053C */ j .L802414F0 -/* CCC7F0 802414E0 46020000 */ add.s $f0, $f0, $f2 -.L802414E4: -/* CCC7F4 802414E4 4616A002 */ mul.s $f0, $f20, $f22 -/* CCC7F8 802414E8 00000000 */ nop -/* CCC7FC 802414EC 4600D000 */ add.s $f0, $f26, $f0 -.L802414F0: -/* CCC800 802414F0 E600003C */ swc1 $f0, 0x3c($s0) -/* CCC804 802414F4 8E220074 */ lw $v0, 0x74($s1) -/* CCC808 802414F8 2442000A */ addiu $v0, $v0, 0xa -/* CCC80C 802414FC 44826000 */ mtc1 $v0, $f12 -/* CCC810 80241500 00000000 */ nop -/* CCC814 80241504 0C00A6C9 */ jal clamp_angle -/* CCC818 80241508 46806320 */ cvt.s.w $f12, $f12 -/* CCC81C 8024150C 4600020D */ trunc.w.s $f8, $f0 -/* CCC820 80241510 E6280074 */ swc1 $f8, 0x74($s1) -.L80241514: -/* CCC824 80241514 8E220090 */ lw $v0, 0x90($s1) -/* CCC828 80241518 1C400040 */ bgtz $v0, .L8024161C -/* CCC82C 8024151C 2442FFFF */ addiu $v0, $v0, -1 -/* CCC830 80241520 860200A8 */ lh $v0, 0xa8($s0) -/* CCC834 80241524 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCC838 80241528 44821000 */ mtc1 $v0, $f2 -/* CCC83C 8024152C 00000000 */ nop -/* CCC840 80241530 468010A0 */ cvt.s.w $f2, $f2 -/* CCC844 80241534 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCC848 80241538 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCC84C 8024153C 46020000 */ add.s $f0, $f0, $f2 -/* CCC850 80241540 3C014024 */ lui $at, 0x4024 -/* CCC854 80241544 44812800 */ mtc1 $at, $f5 -/* CCC858 80241548 44802000 */ mtc1 $zero, $f4 -/* CCC85C 8024154C C442002C */ lwc1 $f2, 0x2c($v0) -/* CCC860 80241550 46000021 */ cvt.d.s $f0, $f0 -/* CCC864 80241554 46240000 */ add.d $f0, $f0, $f4 -/* CCC868 80241558 460010A1 */ cvt.d.s $f2, $f2 -/* CCC86C 8024155C 4620103C */ c.lt.d $f2, $f0 -/* CCC870 80241560 00000000 */ nop -/* CCC874 80241564 4500002E */ bc1f .L80241620 -/* CCC878 80241568 0280202D */ daddu $a0, $s4, $zero -/* CCC87C 8024156C 24020001 */ addiu $v0, $zero, 1 -/* CCC880 80241570 AFA20010 */ sw $v0, 0x10($sp) -/* CCC884 80241574 8E460024 */ lw $a2, 0x24($s2) -/* CCC888 80241578 8E470028 */ lw $a3, 0x28($s2) -/* CCC88C 8024157C 0C01242D */ jal func_800490B4 -/* CCC890 80241580 0220282D */ daddu $a1, $s1, $zero -/* CCC894 80241584 10400026 */ beqz $v0, .L80241620 -/* CCC898 80241588 0000202D */ daddu $a0, $zero, $zero -/* CCC89C 8024158C 0200282D */ daddu $a1, $s0, $zero -/* CCC8A0 80241590 0000302D */ daddu $a2, $zero, $zero -/* CCC8A4 80241594 2412000C */ addiu $s2, $zero, 0xc -/* CCC8A8 80241598 860300A8 */ lh $v1, 0xa8($s0) -/* CCC8AC 8024159C 3C013F80 */ lui $at, 0x3f80 -/* CCC8B0 802415A0 44810000 */ mtc1 $at, $f0 -/* CCC8B4 802415A4 3C014000 */ lui $at, 0x4000 -/* CCC8B8 802415A8 44811000 */ mtc1 $at, $f2 -/* CCC8BC 802415AC 3C01C1A0 */ lui $at, 0xc1a0 -/* CCC8C0 802415B0 44812000 */ mtc1 $at, $f4 -/* CCC8C4 802415B4 44834000 */ mtc1 $v1, $f8 -/* CCC8C8 802415B8 00000000 */ nop -/* CCC8CC 802415BC 46804220 */ cvt.s.w $f8, $f8 -/* CCC8D0 802415C0 44074000 */ mfc1 $a3, $f8 -/* CCC8D4 802415C4 27A20038 */ addiu $v0, $sp, 0x38 -/* CCC8D8 802415C8 AFB2001C */ sw $s2, 0x1c($sp) -/* CCC8DC 802415CC AFA20020 */ sw $v0, 0x20($sp) -/* CCC8E0 802415D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* CCC8E4 802415D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* CCC8E8 802415D8 0C01BFA4 */ jal fx_emote -/* CCC8EC 802415DC E7A40018 */ swc1 $f4, 0x18($sp) -/* CCC8F0 802415E0 0200202D */ daddu $a0, $s0, $zero -/* CCC8F4 802415E4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CCC8F8 802415E8 C480003C */ lwc1 $f0, 0x3c($a0) -/* CCC8FC 802415EC 3C060020 */ lui $a2, 0x20 -/* CCC900 802415F0 0C012530 */ jal func_800494C0 -/* CCC904 802415F4 E4800064 */ swc1 $f0, 0x64($a0) -/* CCC908 802415F8 8E220018 */ lw $v0, 0x18($s1) -/* CCC90C 802415FC 9442002A */ lhu $v0, 0x2a($v0) -/* CCC910 80241600 30420001 */ andi $v0, $v0, 1 -/* CCC914 80241604 10400003 */ beqz $v0, .L80241614 -/* CCC918 80241608 2402000A */ addiu $v0, $zero, 0xa -/* CCC91C 8024160C 080905AF */ j .L802416BC -/* CCC920 80241610 AE620070 */ sw $v0, 0x70($s3) -.L80241614: -/* CCC924 80241614 080905AF */ j .L802416BC -/* CCC928 80241618 AE720070 */ sw $s2, 0x70($s3) -.L8024161C: -/* CCC92C 8024161C AE220090 */ sw $v0, 0x90($s1) -.L80241620: -/* CCC930 80241620 8602008C */ lh $v0, 0x8c($s0) -/* CCC934 80241624 14400025 */ bnez $v0, .L802416BC -/* CCC938 80241628 00000000 */ nop -/* CCC93C 8024162C 8602008E */ lh $v0, 0x8e($s0) -/* CCC940 80241630 1C400022 */ bgtz $v0, .L802416BC -/* CCC944 80241634 00000000 */ nop -/* CCC948 80241638 8E620074 */ lw $v0, 0x74($s3) -/* CCC94C 8024163C 2442FFFF */ addiu $v0, $v0, -1 -/* CCC950 80241640 1840001D */ blez $v0, .L802416B8 -/* CCC954 80241644 AE620074 */ sw $v0, 0x74($s3) -/* CCC958 80241648 8E220018 */ lw $v0, 0x18($s1) -/* CCC95C 8024164C 9442002A */ lhu $v0, 0x2a($v0) -/* CCC960 80241650 30420010 */ andi $v0, $v0, 0x10 -/* CCC964 80241654 14400007 */ bnez $v0, .L80241674 -/* CCC968 80241658 00000000 */ nop -/* CCC96C 8024165C C600000C */ lwc1 $f0, 0xc($s0) -/* CCC970 80241660 3C014334 */ lui $at, 0x4334 -/* CCC974 80241664 44816000 */ mtc1 $at, $f12 -/* CCC978 80241668 0C00A6C9 */ jal clamp_angle -/* CCC97C 8024166C 460C0300 */ add.s $f12, $f0, $f12 -/* CCC980 80241670 E600000C */ swc1 $f0, 0xc($s0) -.L80241674: -/* CCC984 80241674 0C00A67F */ jal rand_int -/* CCC988 80241678 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CCC98C 8024167C 3C032E8B */ lui $v1, 0x2e8b -/* CCC990 80241680 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CCC994 80241684 00430018 */ mult $v0, $v1 -/* CCC998 80241688 00021FC3 */ sra $v1, $v0, 0x1f -/* CCC99C 8024168C 00004010 */ mfhi $t0 -/* CCC9A0 80241690 00082043 */ sra $a0, $t0, 1 -/* CCC9A4 80241694 00832023 */ subu $a0, $a0, $v1 -/* CCC9A8 80241698 00041840 */ sll $v1, $a0, 1 -/* CCC9AC 8024169C 00641821 */ addu $v1, $v1, $a0 -/* CCC9B0 802416A0 00031880 */ sll $v1, $v1, 2 -/* CCC9B4 802416A4 00641823 */ subu $v1, $v1, $a0 -/* CCC9B8 802416A8 00431023 */ subu $v0, $v0, $v1 -/* CCC9BC 802416AC 24420005 */ addiu $v0, $v0, 5 -/* CCC9C0 802416B0 080905AF */ j .L802416BC -/* CCC9C4 802416B4 A602008E */ sh $v0, 0x8e($s0) -.L802416B8: -/* CCC9C8 802416B8 AE600070 */ sw $zero, 0x70($s3) -.L802416BC: -/* CCC9CC 802416BC 8FBF0054 */ lw $ra, 0x54($sp) -/* CCC9D0 802416C0 8FB40050 */ lw $s4, 0x50($sp) -/* CCC9D4 802416C4 8FB3004C */ lw $s3, 0x4c($sp) -/* CCC9D8 802416C8 8FB20048 */ lw $s2, 0x48($sp) -/* CCC9DC 802416CC 8FB10044 */ lw $s1, 0x44($sp) -/* CCC9E0 802416D0 8FB00040 */ lw $s0, 0x40($sp) -/* CCC9E4 802416D4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CCC9E8 802416D8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CCC9EC 802416DC D7B60060 */ ldc1 $f22, 0x60($sp) -/* CCC9F0 802416E0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CCC9F4 802416E4 03E00008 */ jr $ra -/* CCC9F8 802416E8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s new file mode 100644 index 0000000000..9b030e2efc --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_802413A8_CCC6B8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413A8_CCC6B8 +/* CCC6B8 802413A8 27BDFF88 */ addiu $sp, $sp, -0x78 +/* CCC6BC 802413AC AFB3004C */ sw $s3, 0x4c($sp) +/* CCC6C0 802413B0 0080982D */ daddu $s3, $a0, $zero +/* CCC6C4 802413B4 AFBF0054 */ sw $ra, 0x54($sp) +/* CCC6C8 802413B8 AFB40050 */ sw $s4, 0x50($sp) +/* CCC6CC 802413BC AFB20048 */ sw $s2, 0x48($sp) +/* CCC6D0 802413C0 AFB10044 */ sw $s1, 0x44($sp) +/* CCC6D4 802413C4 AFB00040 */ sw $s0, 0x40($sp) +/* CCC6D8 802413C8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* CCC6DC 802413CC F7B80068 */ sdc1 $f24, 0x68($sp) +/* CCC6E0 802413D0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* CCC6E4 802413D4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* CCC6E8 802413D8 8E710148 */ lw $s1, 0x148($s3) +/* CCC6EC 802413DC 00A0902D */ daddu $s2, $a1, $zero +/* CCC6F0 802413E0 86240008 */ lh $a0, 8($s1) +/* CCC6F4 802413E4 0C00EABB */ jal get_npc_unsafe +/* CCC6F8 802413E8 00C0A02D */ daddu $s4, $a2, $zero +/* CCC6FC 802413EC 0040802D */ daddu $s0, $v0, $zero +/* CCC700 802413F0 C6200078 */ lwc1 $f0, 0x78($s1) +/* CCC704 802413F4 46800020 */ cvt.s.w $f0, $f0 +/* CCC708 802413F8 46000021 */ cvt.d.s $f0, $f0 +/* CCC70C 802413FC 3C014059 */ lui $at, 0x4059 +/* CCC710 80241400 44811800 */ mtc1 $at, $f3 +/* CCC714 80241404 44801000 */ mtc1 $zero, $f2 +/* CCC718 80241408 8602008E */ lh $v0, 0x8e($s0) +/* CCC71C 8024140C 9603008E */ lhu $v1, 0x8e($s0) +/* CCC720 80241410 46220003 */ div.d $f0, $f0, $f2 +/* CCC724 80241414 46200620 */ cvt.s.d $f24, $f0 +/* CCC728 80241418 C6200088 */ lwc1 $f0, 0x88($s1) +/* CCC72C 8024141C 46800020 */ cvt.s.w $f0, $f0 +/* CCC730 80241420 46000021 */ cvt.d.s $f0, $f0 +/* CCC734 80241424 46220003 */ div.d $f0, $f0, $f2 +/* CCC738 80241428 46200020 */ cvt.s.d $f0, $f0 +/* CCC73C 8024142C 18400003 */ blez $v0, .L8024143C +/* CCC740 80241430 4600C680 */ add.s $f26, $f24, $f0 +/* CCC744 80241434 2462FFFF */ addiu $v0, $v1, -1 +/* CCC748 80241438 A602008E */ sh $v0, 0x8e($s0) +.L8024143C: +/* CCC74C 8024143C 8E220070 */ lw $v0, 0x70($s1) +/* CCC750 80241440 18400034 */ blez $v0, .L80241514 +/* CCC754 80241444 00000000 */ nop +/* CCC758 80241448 C62C0074 */ lwc1 $f12, 0x74($s1) +/* CCC75C 8024144C 46806320 */ cvt.s.w $f12, $f12 +/* CCC760 80241450 44820000 */ mtc1 $v0, $f0 +/* CCC764 80241454 00000000 */ nop +/* CCC768 80241458 46800020 */ cvt.s.w $f0, $f0 +/* CCC76C 8024145C 46000021 */ cvt.d.s $f0, $f0 +/* CCC770 80241460 46220003 */ div.d $f0, $f0, $f2 +/* CCC774 80241464 0C00A8BB */ jal sin_deg +/* CCC778 80241468 462005A0 */ cvt.s.d $f22, $f0 +/* CCC77C 8024146C 8E020000 */ lw $v0, ($s0) +/* CCC780 80241470 30420008 */ andi $v0, $v0, 8 +/* CCC784 80241474 10400003 */ beqz $v0, .L80241484 +/* CCC788 80241478 46000506 */ mov.s $f20, $f0 +/* CCC78C 8024147C 08090531 */ j .L802414C4 +/* CCC790 80241480 0000102D */ daddu $v0, $zero, $zero +.L80241484: +/* CCC794 80241484 27A50028 */ addiu $a1, $sp, 0x28 +/* CCC798 80241488 27A6002C */ addiu $a2, $sp, 0x2c +/* CCC79C 8024148C C6000038 */ lwc1 $f0, 0x38($s0) +/* CCC7A0 80241490 C602003C */ lwc1 $f2, 0x3c($s0) +/* CCC7A4 80241494 C6040040 */ lwc1 $f4, 0x40($s0) +/* CCC7A8 80241498 3C01447A */ lui $at, 0x447a +/* CCC7AC 8024149C 44813000 */ mtc1 $at, $f6 +/* CCC7B0 802414A0 27A20034 */ addiu $v0, $sp, 0x34 +/* CCC7B4 802414A4 E7A00028 */ swc1 $f0, 0x28($sp) +/* CCC7B8 802414A8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* CCC7BC 802414AC E7A40030 */ swc1 $f4, 0x30($sp) +/* CCC7C0 802414B0 E7A60034 */ swc1 $f6, 0x34($sp) +/* CCC7C4 802414B4 AFA20010 */ sw $v0, 0x10($sp) +/* CCC7C8 802414B8 8E040080 */ lw $a0, 0x80($s0) +/* CCC7CC 802414BC 0C0372DF */ jal func_800DCB7C +/* CCC7D0 802414C0 27A70030 */ addiu $a3, $sp, 0x30 +.L802414C4: +/* CCC7D4 802414C4 10400007 */ beqz $v0, .L802414E4 +/* CCC7D8 802414C8 00000000 */ nop +/* CCC7DC 802414CC 4616A082 */ mul.s $f2, $f20, $f22 +/* CCC7E0 802414D0 00000000 */ nop +/* CCC7E4 802414D4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* CCC7E8 802414D8 46180000 */ add.s $f0, $f0, $f24 +/* CCC7EC 802414DC 0809053C */ j .L802414F0 +/* CCC7F0 802414E0 46020000 */ add.s $f0, $f0, $f2 +.L802414E4: +/* CCC7F4 802414E4 4616A002 */ mul.s $f0, $f20, $f22 +/* CCC7F8 802414E8 00000000 */ nop +/* CCC7FC 802414EC 4600D000 */ add.s $f0, $f26, $f0 +.L802414F0: +/* CCC800 802414F0 E600003C */ swc1 $f0, 0x3c($s0) +/* CCC804 802414F4 8E220074 */ lw $v0, 0x74($s1) +/* CCC808 802414F8 2442000A */ addiu $v0, $v0, 0xa +/* CCC80C 802414FC 44826000 */ mtc1 $v0, $f12 +/* CCC810 80241500 00000000 */ nop +/* CCC814 80241504 0C00A6C9 */ jal clamp_angle +/* CCC818 80241508 46806320 */ cvt.s.w $f12, $f12 +/* CCC81C 8024150C 4600020D */ trunc.w.s $f8, $f0 +/* CCC820 80241510 E6280074 */ swc1 $f8, 0x74($s1) +.L80241514: +/* CCC824 80241514 8E220090 */ lw $v0, 0x90($s1) +/* CCC828 80241518 1C400040 */ bgtz $v0, .L8024161C +/* CCC82C 8024151C 2442FFFF */ addiu $v0, $v0, -1 +/* CCC830 80241520 860200A8 */ lh $v0, 0xa8($s0) +/* CCC834 80241524 C600003C */ lwc1 $f0, 0x3c($s0) +/* CCC838 80241528 44821000 */ mtc1 $v0, $f2 +/* CCC83C 8024152C 00000000 */ nop +/* CCC840 80241530 468010A0 */ cvt.s.w $f2, $f2 +/* CCC844 80241534 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CCC848 80241538 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CCC84C 8024153C 46020000 */ add.s $f0, $f0, $f2 +/* CCC850 80241540 3C014024 */ lui $at, 0x4024 +/* CCC854 80241544 44812800 */ mtc1 $at, $f5 +/* CCC858 80241548 44802000 */ mtc1 $zero, $f4 +/* CCC85C 8024154C C442002C */ lwc1 $f2, 0x2c($v0) +/* CCC860 80241550 46000021 */ cvt.d.s $f0, $f0 +/* CCC864 80241554 46240000 */ add.d $f0, $f0, $f4 +/* CCC868 80241558 460010A1 */ cvt.d.s $f2, $f2 +/* CCC86C 8024155C 4620103C */ c.lt.d $f2, $f0 +/* CCC870 80241560 00000000 */ nop +/* CCC874 80241564 4500002E */ bc1f .L80241620 +/* CCC878 80241568 0280202D */ daddu $a0, $s4, $zero +/* CCC87C 8024156C 24020001 */ addiu $v0, $zero, 1 +/* CCC880 80241570 AFA20010 */ sw $v0, 0x10($sp) +/* CCC884 80241574 8E460024 */ lw $a2, 0x24($s2) +/* CCC888 80241578 8E470028 */ lw $a3, 0x28($s2) +/* CCC88C 8024157C 0C01242D */ jal func_800490B4 +/* CCC890 80241580 0220282D */ daddu $a1, $s1, $zero +/* CCC894 80241584 10400026 */ beqz $v0, .L80241620 +/* CCC898 80241588 0000202D */ daddu $a0, $zero, $zero +/* CCC89C 8024158C 0200282D */ daddu $a1, $s0, $zero +/* CCC8A0 80241590 0000302D */ daddu $a2, $zero, $zero +/* CCC8A4 80241594 2412000C */ addiu $s2, $zero, 0xc +/* CCC8A8 80241598 860300A8 */ lh $v1, 0xa8($s0) +/* CCC8AC 8024159C 3C013F80 */ lui $at, 0x3f80 +/* CCC8B0 802415A0 44810000 */ mtc1 $at, $f0 +/* CCC8B4 802415A4 3C014000 */ lui $at, 0x4000 +/* CCC8B8 802415A8 44811000 */ mtc1 $at, $f2 +/* CCC8BC 802415AC 3C01C1A0 */ lui $at, 0xc1a0 +/* CCC8C0 802415B0 44812000 */ mtc1 $at, $f4 +/* CCC8C4 802415B4 44834000 */ mtc1 $v1, $f8 +/* CCC8C8 802415B8 00000000 */ nop +/* CCC8CC 802415BC 46804220 */ cvt.s.w $f8, $f8 +/* CCC8D0 802415C0 44074000 */ mfc1 $a3, $f8 +/* CCC8D4 802415C4 27A20038 */ addiu $v0, $sp, 0x38 +/* CCC8D8 802415C8 AFB2001C */ sw $s2, 0x1c($sp) +/* CCC8DC 802415CC AFA20020 */ sw $v0, 0x20($sp) +/* CCC8E0 802415D0 E7A00010 */ swc1 $f0, 0x10($sp) +/* CCC8E4 802415D4 E7A20014 */ swc1 $f2, 0x14($sp) +/* CCC8E8 802415D8 0C01BFA4 */ jal fx_emote +/* CCC8EC 802415DC E7A40018 */ swc1 $f4, 0x18($sp) +/* CCC8F0 802415E0 0200202D */ daddu $a0, $s0, $zero +/* CCC8F4 802415E4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* CCC8F8 802415E8 C480003C */ lwc1 $f0, 0x3c($a0) +/* CCC8FC 802415EC 3C060020 */ lui $a2, 0x20 +/* CCC900 802415F0 0C012530 */ jal func_800494C0 +/* CCC904 802415F4 E4800064 */ swc1 $f0, 0x64($a0) +/* CCC908 802415F8 8E220018 */ lw $v0, 0x18($s1) +/* CCC90C 802415FC 9442002A */ lhu $v0, 0x2a($v0) +/* CCC910 80241600 30420001 */ andi $v0, $v0, 1 +/* CCC914 80241604 10400003 */ beqz $v0, .L80241614 +/* CCC918 80241608 2402000A */ addiu $v0, $zero, 0xa +/* CCC91C 8024160C 080905AF */ j .L802416BC +/* CCC920 80241610 AE620070 */ sw $v0, 0x70($s3) +.L80241614: +/* CCC924 80241614 080905AF */ j .L802416BC +/* CCC928 80241618 AE720070 */ sw $s2, 0x70($s3) +.L8024161C: +/* CCC92C 8024161C AE220090 */ sw $v0, 0x90($s1) +.L80241620: +/* CCC930 80241620 8602008C */ lh $v0, 0x8c($s0) +/* CCC934 80241624 14400025 */ bnez $v0, .L802416BC +/* CCC938 80241628 00000000 */ nop +/* CCC93C 8024162C 8602008E */ lh $v0, 0x8e($s0) +/* CCC940 80241630 1C400022 */ bgtz $v0, .L802416BC +/* CCC944 80241634 00000000 */ nop +/* CCC948 80241638 8E620074 */ lw $v0, 0x74($s3) +/* CCC94C 8024163C 2442FFFF */ addiu $v0, $v0, -1 +/* CCC950 80241640 1840001D */ blez $v0, .L802416B8 +/* CCC954 80241644 AE620074 */ sw $v0, 0x74($s3) +/* CCC958 80241648 8E220018 */ lw $v0, 0x18($s1) +/* CCC95C 8024164C 9442002A */ lhu $v0, 0x2a($v0) +/* CCC960 80241650 30420010 */ andi $v0, $v0, 0x10 +/* CCC964 80241654 14400007 */ bnez $v0, .L80241674 +/* CCC968 80241658 00000000 */ nop +/* CCC96C 8024165C C600000C */ lwc1 $f0, 0xc($s0) +/* CCC970 80241660 3C014334 */ lui $at, 0x4334 +/* CCC974 80241664 44816000 */ mtc1 $at, $f12 +/* CCC978 80241668 0C00A6C9 */ jal clamp_angle +/* CCC97C 8024166C 460C0300 */ add.s $f12, $f0, $f12 +/* CCC980 80241670 E600000C */ swc1 $f0, 0xc($s0) +.L80241674: +/* CCC984 80241674 0C00A67F */ jal rand_int +/* CCC988 80241678 240403E8 */ addiu $a0, $zero, 0x3e8 +/* CCC98C 8024167C 3C032E8B */ lui $v1, 0x2e8b +/* CCC990 80241680 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* CCC994 80241684 00430018 */ mult $v0, $v1 +/* CCC998 80241688 00021FC3 */ sra $v1, $v0, 0x1f +/* CCC99C 8024168C 00004010 */ mfhi $t0 +/* CCC9A0 80241690 00082043 */ sra $a0, $t0, 1 +/* CCC9A4 80241694 00832023 */ subu $a0, $a0, $v1 +/* CCC9A8 80241698 00041840 */ sll $v1, $a0, 1 +/* CCC9AC 8024169C 00641821 */ addu $v1, $v1, $a0 +/* CCC9B0 802416A0 00031880 */ sll $v1, $v1, 2 +/* CCC9B4 802416A4 00641823 */ subu $v1, $v1, $a0 +/* CCC9B8 802416A8 00431023 */ subu $v0, $v0, $v1 +/* CCC9BC 802416AC 24420005 */ addiu $v0, $v0, 5 +/* CCC9C0 802416B0 080905AF */ j .L802416BC +/* CCC9C4 802416B4 A602008E */ sh $v0, 0x8e($s0) +.L802416B8: +/* CCC9C8 802416B8 AE600070 */ sw $zero, 0x70($s3) +.L802416BC: +/* CCC9CC 802416BC 8FBF0054 */ lw $ra, 0x54($sp) +/* CCC9D0 802416C0 8FB40050 */ lw $s4, 0x50($sp) +/* CCC9D4 802416C4 8FB3004C */ lw $s3, 0x4c($sp) +/* CCC9D8 802416C8 8FB20048 */ lw $s2, 0x48($sp) +/* CCC9DC 802416CC 8FB10044 */ lw $s1, 0x44($sp) +/* CCC9E0 802416D0 8FB00040 */ lw $s0, 0x40($sp) +/* CCC9E4 802416D4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* CCC9E8 802416D8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* CCC9EC 802416DC D7B60060 */ ldc1 $f22, 0x60($sp) +/* CCC9F0 802416E0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* CCC9F4 802416E4 03E00008 */ jr $ra +/* CCC9F8 802416E8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764.s deleted file mode 100644 index 1d478bbf3e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241764 -/* CCCA74 80241764 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCCA78 80241768 AFB00010 */ sw $s0, 0x10($sp) -/* CCCA7C 8024176C 0080802D */ daddu $s0, $a0, $zero -/* CCCA80 80241770 AFBF0014 */ sw $ra, 0x14($sp) -/* CCCA84 80241774 8E020148 */ lw $v0, 0x148($s0) -/* CCCA88 80241778 0C00EABB */ jal get_npc_unsafe -/* CCCA8C 8024177C 84440008 */ lh $a0, 8($v0) -/* CCCA90 80241780 9443008E */ lhu $v1, 0x8e($v0) -/* CCCA94 80241784 C440003C */ lwc1 $f0, 0x3c($v0) -/* CCCA98 80241788 24640001 */ addiu $a0, $v1, 1 -/* CCCA9C 8024178C 00031C00 */ sll $v1, $v1, 0x10 -/* CCCAA0 80241790 00031B83 */ sra $v1, $v1, 0xe -/* CCCAA4 80241794 A444008E */ sh $a0, 0x8e($v0) -/* CCCAA8 80241798 3C018024 */ lui $at, 0x8024 -/* CCCAAC 8024179C 00230821 */ addu $at, $at, $v1 -/* CCCAB0 802417A0 C42244C0 */ lwc1 $f2, 0x44c0($at) -/* CCCAB4 802417A4 8443008E */ lh $v1, 0x8e($v0) -/* CCCAB8 802417A8 46020000 */ add.s $f0, $f0, $f2 -/* CCCABC 802417AC 28630005 */ slti $v1, $v1, 5 -/* CCCAC0 802417B0 14600003 */ bnez $v1, .L802417C0 -/* CCCAC4 802417B4 E440003C */ swc1 $f0, 0x3c($v0) -/* CCCAC8 802417B8 2402000C */ addiu $v0, $zero, 0xc -/* CCCACC 802417BC AE020070 */ sw $v0, 0x70($s0) -.L802417C0: -/* CCCAD0 802417C0 8FBF0014 */ lw $ra, 0x14($sp) -/* CCCAD4 802417C4 8FB00010 */ lw $s0, 0x10($sp) -/* CCCAD8 802417C8 03E00008 */ jr $ra -/* CCCADC 802417CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s new file mode 100644 index 0000000000..cebc459569 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241764_CCCA74.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241764_CCCA74 +/* CCCA74 80241764 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CCCA78 80241768 AFB00010 */ sw $s0, 0x10($sp) +/* CCCA7C 8024176C 0080802D */ daddu $s0, $a0, $zero +/* CCCA80 80241770 AFBF0014 */ sw $ra, 0x14($sp) +/* CCCA84 80241774 8E020148 */ lw $v0, 0x148($s0) +/* CCCA88 80241778 0C00EABB */ jal get_npc_unsafe +/* CCCA8C 8024177C 84440008 */ lh $a0, 8($v0) +/* CCCA90 80241780 9443008E */ lhu $v1, 0x8e($v0) +/* CCCA94 80241784 C440003C */ lwc1 $f0, 0x3c($v0) +/* CCCA98 80241788 24640001 */ addiu $a0, $v1, 1 +/* CCCA9C 8024178C 00031C00 */ sll $v1, $v1, 0x10 +/* CCCAA0 80241790 00031B83 */ sra $v1, $v1, 0xe +/* CCCAA4 80241794 A444008E */ sh $a0, 0x8e($v0) +/* CCCAA8 80241798 3C018024 */ lui $at, 0x8024 +/* CCCAAC 8024179C 00230821 */ addu $at, $at, $v1 +/* CCCAB0 802417A0 C42244C0 */ lwc1 $f2, 0x44c0($at) +/* CCCAB4 802417A4 8443008E */ lh $v1, 0x8e($v0) +/* CCCAB8 802417A8 46020000 */ add.s $f0, $f0, $f2 +/* CCCABC 802417AC 28630005 */ slti $v1, $v1, 5 +/* CCCAC0 802417B0 14600003 */ bnez $v1, .L802417C0 +/* CCCAC4 802417B4 E440003C */ swc1 $f0, 0x3c($v0) +/* CCCAC8 802417B8 2402000C */ addiu $v0, $zero, 0xc +/* CCCACC 802417BC AE020070 */ sw $v0, 0x70($s0) +.L802417C0: +/* CCCAD0 802417C0 8FBF0014 */ lw $ra, 0x14($sp) +/* CCCAD4 802417C4 8FB00010 */ lw $s0, 0x10($sp) +/* CCCAD8 802417C8 03E00008 */ jr $ra +/* CCCADC 802417CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968.s deleted file mode 100644 index 38fdc97fc9..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241968 -/* CCCC78 80241968 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CCCC7C 8024196C AFB20030 */ sw $s2, 0x30($sp) -/* CCCC80 80241970 0080902D */ daddu $s2, $a0, $zero -/* CCCC84 80241974 AFBF0038 */ sw $ra, 0x38($sp) -/* CCCC88 80241978 AFB30034 */ sw $s3, 0x34($sp) -/* CCCC8C 8024197C AFB1002C */ sw $s1, 0x2c($sp) -/* CCCC90 80241980 AFB00028 */ sw $s0, 0x28($sp) -/* CCCC94 80241984 F7B60048 */ sdc1 $f22, 0x48($sp) -/* CCCC98 80241988 F7B40040 */ sdc1 $f20, 0x40($sp) -/* CCCC9C 8024198C 8E510148 */ lw $s1, 0x148($s2) -/* CCCCA0 80241990 86240008 */ lh $a0, 8($s1) -/* CCCCA4 80241994 0C00EABB */ jal get_npc_unsafe -/* CCCCA8 80241998 00A0982D */ daddu $s3, $a1, $zero -/* CCCCAC 8024199C 0040802D */ daddu $s0, $v0, $zero -/* CCCCB0 802419A0 0200202D */ daddu $a0, $s0, $zero -/* CCCCB4 802419A4 C6220088 */ lwc1 $f2, 0x88($s1) -/* CCCCB8 802419A8 468010A0 */ cvt.s.w $f2, $f2 -/* CCCCBC 802419AC 460010A1 */ cvt.d.s $f2, $f2 -/* CCCCC0 802419B0 C604001C */ lwc1 $f4, 0x1c($s0) -/* CCCCC4 802419B4 C6000014 */ lwc1 $f0, 0x14($s0) -/* CCCCC8 802419B8 8E050018 */ lw $a1, 0x18($s0) -/* CCCCCC 802419BC 46002100 */ add.s $f4, $f4, $f0 -/* CCCCD0 802419C0 8E06000C */ lw $a2, 0xc($s0) -/* CCCCD4 802419C4 C6200078 */ lwc1 $f0, 0x78($s1) -/* CCCCD8 802419C8 46800020 */ cvt.s.w $f0, $f0 -/* CCCCDC 802419CC E604001C */ swc1 $f4, 0x1c($s0) -/* CCCCE0 802419D0 3C014059 */ lui $at, 0x4059 -/* CCCCE4 802419D4 44812800 */ mtc1 $at, $f5 -/* CCCCE8 802419D8 44802000 */ mtc1 $zero, $f4 -/* CCCCEC 802419DC 46000021 */ cvt.d.s $f0, $f0 -/* CCCCF0 802419E0 46240003 */ div.d $f0, $f0, $f4 -/* CCCCF4 802419E4 46200520 */ cvt.s.d $f20, $f0 -/* CCCCF8 802419E8 46241083 */ div.d $f2, $f2, $f4 -/* CCCCFC 802419EC 0C00EA95 */ jal npc_move_heading -/* CCCD00 802419F0 462015A0 */ cvt.s.d $f22, $f2 -/* CCCD04 802419F4 C604001C */ lwc1 $f4, 0x1c($s0) -/* CCCD08 802419F8 44801000 */ mtc1 $zero, $f2 -/* CCCD0C 802419FC 44801800 */ mtc1 $zero, $f3 -/* CCCD10 80241A00 46002021 */ cvt.d.s $f0, $f4 -/* CCCD14 80241A04 4620103E */ c.le.d $f2, $f0 -/* CCCD18 80241A08 00000000 */ nop -/* CCCD1C 80241A0C 45000030 */ bc1f .L80241AD0 -/* CCCD20 80241A10 00000000 */ nop -/* CCCD24 80241A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCCD28 80241A18 46040000 */ add.s $f0, $f0, $f4 -/* CCCD2C 80241A1C E600003C */ swc1 $f0, 0x3c($s0) -/* CCCD30 80241A20 8E2200CC */ lw $v0, 0xcc($s1) -/* CCCD34 80241A24 8C420024 */ lw $v0, 0x24($v0) -/* CCCD38 80241A28 AE020028 */ sw $v0, 0x28($s0) -/* CCCD3C 80241A2C A2200007 */ sb $zero, 7($s1) -/* CCCD40 80241A30 8E020000 */ lw $v0, ($s0) -/* CCCD44 80241A34 30420008 */ andi $v0, $v0, 8 -/* CCCD48 80241A38 14400011 */ bnez $v0, .L80241A80 -/* CCCD4C 80241A3C 0000102D */ daddu $v0, $zero, $zero -/* CCCD50 80241A40 27A50018 */ addiu $a1, $sp, 0x18 -/* CCCD54 80241A44 27A6001C */ addiu $a2, $sp, 0x1c -/* CCCD58 80241A48 C6000038 */ lwc1 $f0, 0x38($s0) -/* CCCD5C 80241A4C C602003C */ lwc1 $f2, 0x3c($s0) -/* CCCD60 80241A50 C6040040 */ lwc1 $f4, 0x40($s0) -/* CCCD64 80241A54 3C01447A */ lui $at, 0x447a -/* CCCD68 80241A58 44813000 */ mtc1 $at, $f6 -/* CCCD6C 80241A5C 27A20024 */ addiu $v0, $sp, 0x24 -/* CCCD70 80241A60 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCCD74 80241A64 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CCCD78 80241A68 E7A40020 */ swc1 $f4, 0x20($sp) -/* CCCD7C 80241A6C E7A60024 */ swc1 $f6, 0x24($sp) -/* CCCD80 80241A70 AFA20010 */ sw $v0, 0x10($sp) -/* CCCD84 80241A74 8E040080 */ lw $a0, 0x80($s0) -/* CCCD88 80241A78 0C0372DF */ jal func_800DCB7C -/* CCCD8C 80241A7C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241A80: -/* CCCD90 80241A80 1040000B */ beqz $v0, .L80241AB0 -/* CCCD94 80241A84 00000000 */ nop -/* CCCD98 80241A88 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CCCD9C 80241A8C 46140080 */ add.s $f2, $f0, $f20 -/* CCCDA0 80241A90 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCCDA4 80241A94 4600103E */ c.le.s $f2, $f0 -/* CCCDA8 80241A98 00000000 */ nop -/* CCCDAC 80241A9C 4500008D */ bc1f .L80241CD4 -/* CCCDB0 80241AA0 00000000 */ nop -/* CCCDB4 80241AA4 E602003C */ swc1 $f2, 0x3c($s0) -/* CCCDB8 80241AA8 08090735 */ j .L80241CD4 -/* CCCDBC 80241AAC AE400070 */ sw $zero, 0x70($s2) -.L80241AB0: -/* CCCDC0 80241AB0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCCDC4 80241AB4 C6000064 */ lwc1 $f0, 0x64($s0) -/* CCCDC8 80241AB8 4602003E */ c.le.s $f0, $f2 -/* CCCDCC 80241ABC 00000000 */ nop -/* CCCDD0 80241AC0 45030084 */ bc1tl .L80241CD4 -/* CCCDD4 80241AC4 AE400070 */ sw $zero, 0x70($s2) -/* CCCDD8 80241AC8 08090735 */ j .L80241CD4 -/* CCCDDC 80241ACC 00000000 */ nop -.L80241AD0: -/* CCCDE0 80241AD0 4622003C */ c.lt.d $f0, $f2 -/* CCCDE4 80241AD4 00000000 */ nop -/* CCCDE8 80241AD8 4500007E */ bc1f .L80241CD4 -/* CCCDEC 80241ADC 00000000 */ nop -/* CCCDF0 80241AE0 9602008E */ lhu $v0, 0x8e($s0) -/* CCCDF4 80241AE4 24420001 */ addiu $v0, $v0, 1 -/* CCCDF8 80241AE8 A602008E */ sh $v0, 0x8e($s0) -/* CCCDFC 80241AEC 00021400 */ sll $v0, $v0, 0x10 -/* CCCE00 80241AF0 8E630020 */ lw $v1, 0x20($s3) -/* CCCE04 80241AF4 00021403 */ sra $v0, $v0, 0x10 -/* CCCE08 80241AF8 0043102A */ slt $v0, $v0, $v1 -/* CCCE0C 80241AFC 14400026 */ bnez $v0, .L80241B98 -/* CCCE10 80241B00 00000000 */ nop -/* CCCE14 80241B04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* CCCE18 80241B08 C60E0040 */ lwc1 $f14, 0x40($s0) -/* CCCE1C 80241B0C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CCCE20 80241B10 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CCCE24 80241B14 A600008E */ sh $zero, 0x8e($s0) -/* CCCE28 80241B18 8C460028 */ lw $a2, 0x28($v0) -/* CCCE2C 80241B1C 0C00A720 */ jal atan2 -/* CCCE30 80241B20 8C470030 */ lw $a3, 0x30($v0) -/* CCCE34 80241B24 46000506 */ mov.s $f20, $f0 -/* CCCE38 80241B28 C60C000C */ lwc1 $f12, 0xc($s0) -/* CCCE3C 80241B2C 0C00A70A */ jal get_clamped_angle_diff -/* CCCE40 80241B30 4600A386 */ mov.s $f14, $f20 -/* CCCE44 80241B34 46000086 */ mov.s $f2, $f0 -/* CCCE48 80241B38 8E62001C */ lw $v0, 0x1c($s3) -/* CCCE4C 80241B3C 46001005 */ abs.s $f0, $f2 -/* CCCE50 80241B40 44822000 */ mtc1 $v0, $f4 -/* CCCE54 80241B44 00000000 */ nop -/* CCCE58 80241B48 46802120 */ cvt.s.w $f4, $f4 -/* CCCE5C 80241B4C 4600203C */ c.lt.s $f4, $f0 -/* CCCE60 80241B50 00000000 */ nop -/* CCCE64 80241B54 4500000D */ bc1f .L80241B8C -/* CCCE68 80241B58 00000000 */ nop -/* CCCE6C 80241B5C 44800000 */ mtc1 $zero, $f0 -/* CCCE70 80241B60 C614000C */ lwc1 $f20, 0xc($s0) -/* CCCE74 80241B64 4600103C */ c.lt.s $f2, $f0 -/* CCCE78 80241B68 00000000 */ nop -/* CCCE7C 80241B6C 45000006 */ bc1f .L80241B88 -/* CCCE80 80241B70 00021023 */ negu $v0, $v0 -/* CCCE84 80241B74 44820000 */ mtc1 $v0, $f0 -/* CCCE88 80241B78 00000000 */ nop -/* CCCE8C 80241B7C 46800020 */ cvt.s.w $f0, $f0 -/* CCCE90 80241B80 080906E3 */ j .L80241B8C -/* CCCE94 80241B84 4600A500 */ add.s $f20, $f20, $f0 -.L80241B88: -/* CCCE98 80241B88 4604A500 */ add.s $f20, $f20, $f4 -.L80241B8C: -/* CCCE9C 80241B8C 0C00A6C9 */ jal clamp_angle -/* CCCEA0 80241B90 4600A306 */ mov.s $f12, $f20 -/* CCCEA4 80241B94 E600000C */ swc1 $f0, 0xc($s0) -.L80241B98: -/* CCCEA8 80241B98 8E020000 */ lw $v0, ($s0) -/* CCCEAC 80241B9C 30420008 */ andi $v0, $v0, 8 -/* CCCEB0 80241BA0 1040000A */ beqz $v0, .L80241BCC -/* CCCEB4 80241BA4 27A50018 */ addiu $a1, $sp, 0x18 -/* CCCEB8 80241BA8 C602003C */ lwc1 $f2, 0x3c($s0) -/* CCCEBC 80241BAC C600001C */ lwc1 $f0, 0x1c($s0) -/* CCCEC0 80241BB0 46001080 */ add.s $f2, $f2, $f0 -/* CCCEC4 80241BB4 4616103C */ c.lt.s $f2, $f22 -/* CCCEC8 80241BB8 00000000 */ nop -/* CCCECC 80241BBC 45020045 */ bc1fl .L80241CD4 -/* CCCED0 80241BC0 E602003C */ swc1 $f2, 0x3c($s0) -/* CCCED4 80241BC4 08090734 */ j .L80241CD0 -/* CCCED8 80241BC8 E616003C */ swc1 $f22, 0x3c($s0) -.L80241BCC: -/* CCCEDC 80241BCC C6000038 */ lwc1 $f0, 0x38($s0) -/* CCCEE0 80241BD0 27A6001C */ addiu $a2, $sp, 0x1c -/* CCCEE4 80241BD4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCCEE8 80241BD8 860200A8 */ lh $v0, 0xa8($s0) -/* CCCEEC 80241BDC C600001C */ lwc1 $f0, 0x1c($s0) -/* CCCEF0 80241BE0 C604003C */ lwc1 $f4, 0x3c($s0) -/* CCCEF4 80241BE4 44821000 */ mtc1 $v0, $f2 -/* CCCEF8 80241BE8 00000000 */ nop -/* CCCEFC 80241BEC 468010A0 */ cvt.s.w $f2, $f2 -/* CCCF00 80241BF0 46000005 */ abs.s $f0, $f0 -/* CCCF04 80241BF4 46020000 */ add.s $f0, $f0, $f2 -/* CCCF08 80241BF8 C6060040 */ lwc1 $f6, 0x40($s0) -/* CCCF0C 80241BFC 27A20024 */ addiu $v0, $sp, 0x24 -/* CCCF10 80241C00 46022100 */ add.s $f4, $f4, $f2 -/* CCCF14 80241C04 3C014024 */ lui $at, 0x4024 -/* CCCF18 80241C08 44811800 */ mtc1 $at, $f3 -/* CCCF1C 80241C0C 44801000 */ mtc1 $zero, $f2 -/* CCCF20 80241C10 46000021 */ cvt.d.s $f0, $f0 -/* CCCF24 80241C14 46220000 */ add.d $f0, $f0, $f2 -/* CCCF28 80241C18 E7A60020 */ swc1 $f6, 0x20($sp) -/* CCCF2C 80241C1C E7A4001C */ swc1 $f4, 0x1c($sp) -/* CCCF30 80241C20 46200020 */ cvt.s.d $f0, $f0 -/* CCCF34 80241C24 E7A00024 */ swc1 $f0, 0x24($sp) -/* CCCF38 80241C28 AFA20010 */ sw $v0, 0x10($sp) -/* CCCF3C 80241C2C 8E040080 */ lw $a0, 0x80($s0) -/* CCCF40 80241C30 0C0372DF */ jal func_800DCB7C -/* CCCF44 80241C34 27A70020 */ addiu $a3, $sp, 0x20 -/* CCCF48 80241C38 10400015 */ beqz $v0, .L80241C90 -/* CCCF4C 80241C3C 00000000 */ nop -/* CCCF50 80241C40 860200A8 */ lh $v0, 0xa8($s0) -/* CCCF54 80241C44 C604001C */ lwc1 $f4, 0x1c($s0) -/* CCCF58 80241C48 44820000 */ mtc1 $v0, $f0 -/* CCCF5C 80241C4C 00000000 */ nop -/* CCCF60 80241C50 46800020 */ cvt.s.w $f0, $f0 -/* CCCF64 80241C54 46002085 */ abs.s $f2, $f4 -/* CCCF68 80241C58 46020000 */ add.s $f0, $f0, $f2 -/* CCCF6C 80241C5C C7A20024 */ lwc1 $f2, 0x24($sp) -/* CCCF70 80241C60 4600103E */ c.le.s $f2, $f0 -/* CCCF74 80241C64 00000000 */ nop -/* CCCF78 80241C68 45000005 */ bc1f .L80241C80 -/* CCCF7C 80241C6C 00000000 */ nop -/* CCCF80 80241C70 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CCCF84 80241C74 AE00001C */ sw $zero, 0x1c($s0) -/* CCCF88 80241C78 08090735 */ j .L80241CD4 -/* CCCF8C 80241C7C E600003C */ swc1 $f0, 0x3c($s0) -.L80241C80: -/* CCCF90 80241C80 C600003C */ lwc1 $f0, 0x3c($s0) -/* CCCF94 80241C84 46040000 */ add.s $f0, $f0, $f4 -/* CCCF98 80241C88 08090735 */ j .L80241CD4 -/* CCCF9C 80241C8C E600003C */ swc1 $f0, 0x3c($s0) -.L80241C90: -/* CCCFA0 80241C90 C606003C */ lwc1 $f6, 0x3c($s0) -/* CCCFA4 80241C94 860200A8 */ lh $v0, 0xa8($s0) -/* CCCFA8 80241C98 46163081 */ sub.s $f2, $f6, $f22 -/* CCCFAC 80241C9C 44820000 */ mtc1 $v0, $f0 -/* CCCFB0 80241CA0 00000000 */ nop -/* CCCFB4 80241CA4 46800020 */ cvt.s.w $f0, $f0 -/* CCCFB8 80241CA8 46001080 */ add.s $f2, $f2, $f0 -/* CCCFBC 80241CAC C604001C */ lwc1 $f4, 0x1c($s0) -/* CCCFC0 80241CB0 46002005 */ abs.s $f0, $f4 -/* CCCFC4 80241CB4 4602003C */ c.lt.s $f0, $f2 -/* CCCFC8 80241CB8 00000000 */ nop -/* CCCFCC 80241CBC 45020005 */ bc1fl .L80241CD4 -/* CCCFD0 80241CC0 AE00001C */ sw $zero, 0x1c($s0) -/* CCCFD4 80241CC4 46043000 */ add.s $f0, $f6, $f4 -/* CCCFD8 80241CC8 08090735 */ j .L80241CD4 -/* CCCFDC 80241CCC E600003C */ swc1 $f0, 0x3c($s0) -.L80241CD0: -/* CCCFE0 80241CD0 AE00001C */ sw $zero, 0x1c($s0) -.L80241CD4: -/* CCCFE4 80241CD4 8FBF0038 */ lw $ra, 0x38($sp) -/* CCCFE8 80241CD8 8FB30034 */ lw $s3, 0x34($sp) -/* CCCFEC 80241CDC 8FB20030 */ lw $s2, 0x30($sp) -/* CCCFF0 80241CE0 8FB1002C */ lw $s1, 0x2c($sp) -/* CCCFF4 80241CE4 8FB00028 */ lw $s0, 0x28($sp) -/* CCCFF8 80241CE8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* CCCFFC 80241CEC D7B40040 */ ldc1 $f20, 0x40($sp) -/* CCD000 80241CF0 03E00008 */ jr $ra -/* CCD004 80241CF4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s new file mode 100644 index 0000000000..0b01c66e1a --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241968_CCCC78.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241968_CCCC78 +/* CCCC78 80241968 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* CCCC7C 8024196C AFB20030 */ sw $s2, 0x30($sp) +/* CCCC80 80241970 0080902D */ daddu $s2, $a0, $zero +/* CCCC84 80241974 AFBF0038 */ sw $ra, 0x38($sp) +/* CCCC88 80241978 AFB30034 */ sw $s3, 0x34($sp) +/* CCCC8C 8024197C AFB1002C */ sw $s1, 0x2c($sp) +/* CCCC90 80241980 AFB00028 */ sw $s0, 0x28($sp) +/* CCCC94 80241984 F7B60048 */ sdc1 $f22, 0x48($sp) +/* CCCC98 80241988 F7B40040 */ sdc1 $f20, 0x40($sp) +/* CCCC9C 8024198C 8E510148 */ lw $s1, 0x148($s2) +/* CCCCA0 80241990 86240008 */ lh $a0, 8($s1) +/* CCCCA4 80241994 0C00EABB */ jal get_npc_unsafe +/* CCCCA8 80241998 00A0982D */ daddu $s3, $a1, $zero +/* CCCCAC 8024199C 0040802D */ daddu $s0, $v0, $zero +/* CCCCB0 802419A0 0200202D */ daddu $a0, $s0, $zero +/* CCCCB4 802419A4 C6220088 */ lwc1 $f2, 0x88($s1) +/* CCCCB8 802419A8 468010A0 */ cvt.s.w $f2, $f2 +/* CCCCBC 802419AC 460010A1 */ cvt.d.s $f2, $f2 +/* CCCCC0 802419B0 C604001C */ lwc1 $f4, 0x1c($s0) +/* CCCCC4 802419B4 C6000014 */ lwc1 $f0, 0x14($s0) +/* CCCCC8 802419B8 8E050018 */ lw $a1, 0x18($s0) +/* CCCCCC 802419BC 46002100 */ add.s $f4, $f4, $f0 +/* CCCCD0 802419C0 8E06000C */ lw $a2, 0xc($s0) +/* CCCCD4 802419C4 C6200078 */ lwc1 $f0, 0x78($s1) +/* CCCCD8 802419C8 46800020 */ cvt.s.w $f0, $f0 +/* CCCCDC 802419CC E604001C */ swc1 $f4, 0x1c($s0) +/* CCCCE0 802419D0 3C014059 */ lui $at, 0x4059 +/* CCCCE4 802419D4 44812800 */ mtc1 $at, $f5 +/* CCCCE8 802419D8 44802000 */ mtc1 $zero, $f4 +/* CCCCEC 802419DC 46000021 */ cvt.d.s $f0, $f0 +/* CCCCF0 802419E0 46240003 */ div.d $f0, $f0, $f4 +/* CCCCF4 802419E4 46200520 */ cvt.s.d $f20, $f0 +/* CCCCF8 802419E8 46241083 */ div.d $f2, $f2, $f4 +/* CCCCFC 802419EC 0C00EA95 */ jal npc_move_heading +/* CCCD00 802419F0 462015A0 */ cvt.s.d $f22, $f2 +/* CCCD04 802419F4 C604001C */ lwc1 $f4, 0x1c($s0) +/* CCCD08 802419F8 44801000 */ mtc1 $zero, $f2 +/* CCCD0C 802419FC 44801800 */ mtc1 $zero, $f3 +/* CCCD10 80241A00 46002021 */ cvt.d.s $f0, $f4 +/* CCCD14 80241A04 4620103E */ c.le.d $f2, $f0 +/* CCCD18 80241A08 00000000 */ nop +/* CCCD1C 80241A0C 45000030 */ bc1f .L80241AD0 +/* CCCD20 80241A10 00000000 */ nop +/* CCCD24 80241A14 C600003C */ lwc1 $f0, 0x3c($s0) +/* CCCD28 80241A18 46040000 */ add.s $f0, $f0, $f4 +/* CCCD2C 80241A1C E600003C */ swc1 $f0, 0x3c($s0) +/* CCCD30 80241A20 8E2200CC */ lw $v0, 0xcc($s1) +/* CCCD34 80241A24 8C420024 */ lw $v0, 0x24($v0) +/* CCCD38 80241A28 AE020028 */ sw $v0, 0x28($s0) +/* CCCD3C 80241A2C A2200007 */ sb $zero, 7($s1) +/* CCCD40 80241A30 8E020000 */ lw $v0, ($s0) +/* CCCD44 80241A34 30420008 */ andi $v0, $v0, 8 +/* CCCD48 80241A38 14400011 */ bnez $v0, .L80241A80 +/* CCCD4C 80241A3C 0000102D */ daddu $v0, $zero, $zero +/* CCCD50 80241A40 27A50018 */ addiu $a1, $sp, 0x18 +/* CCCD54 80241A44 27A6001C */ addiu $a2, $sp, 0x1c +/* CCCD58 80241A48 C6000038 */ lwc1 $f0, 0x38($s0) +/* CCCD5C 80241A4C C602003C */ lwc1 $f2, 0x3c($s0) +/* CCCD60 80241A50 C6040040 */ lwc1 $f4, 0x40($s0) +/* CCCD64 80241A54 3C01447A */ lui $at, 0x447a +/* CCCD68 80241A58 44813000 */ mtc1 $at, $f6 +/* CCCD6C 80241A5C 27A20024 */ addiu $v0, $sp, 0x24 +/* CCCD70 80241A60 E7A00018 */ swc1 $f0, 0x18($sp) +/* CCCD74 80241A64 E7A2001C */ swc1 $f2, 0x1c($sp) +/* CCCD78 80241A68 E7A40020 */ swc1 $f4, 0x20($sp) +/* CCCD7C 80241A6C E7A60024 */ swc1 $f6, 0x24($sp) +/* CCCD80 80241A70 AFA20010 */ sw $v0, 0x10($sp) +/* CCCD84 80241A74 8E040080 */ lw $a0, 0x80($s0) +/* CCCD88 80241A78 0C0372DF */ jal func_800DCB7C +/* CCCD8C 80241A7C 27A70020 */ addiu $a3, $sp, 0x20 +.L80241A80: +/* CCCD90 80241A80 1040000B */ beqz $v0, .L80241AB0 +/* CCCD94 80241A84 00000000 */ nop +/* CCCD98 80241A88 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* CCCD9C 80241A8C 46140080 */ add.s $f2, $f0, $f20 +/* CCCDA0 80241A90 C600003C */ lwc1 $f0, 0x3c($s0) +/* CCCDA4 80241A94 4600103E */ c.le.s $f2, $f0 +/* CCCDA8 80241A98 00000000 */ nop +/* CCCDAC 80241A9C 4500008D */ bc1f .L80241CD4 +/* CCCDB0 80241AA0 00000000 */ nop +/* CCCDB4 80241AA4 E602003C */ swc1 $f2, 0x3c($s0) +/* CCCDB8 80241AA8 08090735 */ j .L80241CD4 +/* CCCDBC 80241AAC AE400070 */ sw $zero, 0x70($s2) +.L80241AB0: +/* CCCDC0 80241AB0 C602003C */ lwc1 $f2, 0x3c($s0) +/* CCCDC4 80241AB4 C6000064 */ lwc1 $f0, 0x64($s0) +/* CCCDC8 80241AB8 4602003E */ c.le.s $f0, $f2 +/* CCCDCC 80241ABC 00000000 */ nop +/* CCCDD0 80241AC0 45030084 */ bc1tl .L80241CD4 +/* CCCDD4 80241AC4 AE400070 */ sw $zero, 0x70($s2) +/* CCCDD8 80241AC8 08090735 */ j .L80241CD4 +/* CCCDDC 80241ACC 00000000 */ nop +.L80241AD0: +/* CCCDE0 80241AD0 4622003C */ c.lt.d $f0, $f2 +/* CCCDE4 80241AD4 00000000 */ nop +/* CCCDE8 80241AD8 4500007E */ bc1f .L80241CD4 +/* CCCDEC 80241ADC 00000000 */ nop +/* CCCDF0 80241AE0 9602008E */ lhu $v0, 0x8e($s0) +/* CCCDF4 80241AE4 24420001 */ addiu $v0, $v0, 1 +/* CCCDF8 80241AE8 A602008E */ sh $v0, 0x8e($s0) +/* CCCDFC 80241AEC 00021400 */ sll $v0, $v0, 0x10 +/* CCCE00 80241AF0 8E630020 */ lw $v1, 0x20($s3) +/* CCCE04 80241AF4 00021403 */ sra $v0, $v0, 0x10 +/* CCCE08 80241AF8 0043102A */ slt $v0, $v0, $v1 +/* CCCE0C 80241AFC 14400026 */ bnez $v0, .L80241B98 +/* CCCE10 80241B00 00000000 */ nop +/* CCCE14 80241B04 C60C0038 */ lwc1 $f12, 0x38($s0) +/* CCCE18 80241B08 C60E0040 */ lwc1 $f14, 0x40($s0) +/* CCCE1C 80241B0C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CCCE20 80241B10 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CCCE24 80241B14 A600008E */ sh $zero, 0x8e($s0) +/* CCCE28 80241B18 8C460028 */ lw $a2, 0x28($v0) +/* CCCE2C 80241B1C 0C00A720 */ jal atan2 +/* CCCE30 80241B20 8C470030 */ lw $a3, 0x30($v0) +/* CCCE34 80241B24 46000506 */ mov.s $f20, $f0 +/* CCCE38 80241B28 C60C000C */ lwc1 $f12, 0xc($s0) +/* CCCE3C 80241B2C 0C00A70A */ jal get_clamped_angle_diff +/* CCCE40 80241B30 4600A386 */ mov.s $f14, $f20 +/* CCCE44 80241B34 46000086 */ mov.s $f2, $f0 +/* CCCE48 80241B38 8E62001C */ lw $v0, 0x1c($s3) +/* CCCE4C 80241B3C 46001005 */ abs.s $f0, $f2 +/* CCCE50 80241B40 44822000 */ mtc1 $v0, $f4 +/* CCCE54 80241B44 00000000 */ nop +/* CCCE58 80241B48 46802120 */ cvt.s.w $f4, $f4 +/* CCCE5C 80241B4C 4600203C */ c.lt.s $f4, $f0 +/* CCCE60 80241B50 00000000 */ nop +/* CCCE64 80241B54 4500000D */ bc1f .L80241B8C +/* CCCE68 80241B58 00000000 */ nop +/* CCCE6C 80241B5C 44800000 */ mtc1 $zero, $f0 +/* CCCE70 80241B60 C614000C */ lwc1 $f20, 0xc($s0) +/* CCCE74 80241B64 4600103C */ c.lt.s $f2, $f0 +/* CCCE78 80241B68 00000000 */ nop +/* CCCE7C 80241B6C 45000006 */ bc1f .L80241B88 +/* CCCE80 80241B70 00021023 */ negu $v0, $v0 +/* CCCE84 80241B74 44820000 */ mtc1 $v0, $f0 +/* CCCE88 80241B78 00000000 */ nop +/* CCCE8C 80241B7C 46800020 */ cvt.s.w $f0, $f0 +/* CCCE90 80241B80 080906E3 */ j .L80241B8C +/* CCCE94 80241B84 4600A500 */ add.s $f20, $f20, $f0 +.L80241B88: +/* CCCE98 80241B88 4604A500 */ add.s $f20, $f20, $f4 +.L80241B8C: +/* CCCE9C 80241B8C 0C00A6C9 */ jal clamp_angle +/* CCCEA0 80241B90 4600A306 */ mov.s $f12, $f20 +/* CCCEA4 80241B94 E600000C */ swc1 $f0, 0xc($s0) +.L80241B98: +/* CCCEA8 80241B98 8E020000 */ lw $v0, ($s0) +/* CCCEAC 80241B9C 30420008 */ andi $v0, $v0, 8 +/* CCCEB0 80241BA0 1040000A */ beqz $v0, .L80241BCC +/* CCCEB4 80241BA4 27A50018 */ addiu $a1, $sp, 0x18 +/* CCCEB8 80241BA8 C602003C */ lwc1 $f2, 0x3c($s0) +/* CCCEBC 80241BAC C600001C */ lwc1 $f0, 0x1c($s0) +/* CCCEC0 80241BB0 46001080 */ add.s $f2, $f2, $f0 +/* CCCEC4 80241BB4 4616103C */ c.lt.s $f2, $f22 +/* CCCEC8 80241BB8 00000000 */ nop +/* CCCECC 80241BBC 45020045 */ bc1fl .L80241CD4 +/* CCCED0 80241BC0 E602003C */ swc1 $f2, 0x3c($s0) +/* CCCED4 80241BC4 08090734 */ j .L80241CD0 +/* CCCED8 80241BC8 E616003C */ swc1 $f22, 0x3c($s0) +.L80241BCC: +/* CCCEDC 80241BCC C6000038 */ lwc1 $f0, 0x38($s0) +/* CCCEE0 80241BD0 27A6001C */ addiu $a2, $sp, 0x1c +/* CCCEE4 80241BD4 E7A00018 */ swc1 $f0, 0x18($sp) +/* CCCEE8 80241BD8 860200A8 */ lh $v0, 0xa8($s0) +/* CCCEEC 80241BDC C600001C */ lwc1 $f0, 0x1c($s0) +/* CCCEF0 80241BE0 C604003C */ lwc1 $f4, 0x3c($s0) +/* CCCEF4 80241BE4 44821000 */ mtc1 $v0, $f2 +/* CCCEF8 80241BE8 00000000 */ nop +/* CCCEFC 80241BEC 468010A0 */ cvt.s.w $f2, $f2 +/* CCCF00 80241BF0 46000005 */ abs.s $f0, $f0 +/* CCCF04 80241BF4 46020000 */ add.s $f0, $f0, $f2 +/* CCCF08 80241BF8 C6060040 */ lwc1 $f6, 0x40($s0) +/* CCCF0C 80241BFC 27A20024 */ addiu $v0, $sp, 0x24 +/* CCCF10 80241C00 46022100 */ add.s $f4, $f4, $f2 +/* CCCF14 80241C04 3C014024 */ lui $at, 0x4024 +/* CCCF18 80241C08 44811800 */ mtc1 $at, $f3 +/* CCCF1C 80241C0C 44801000 */ mtc1 $zero, $f2 +/* CCCF20 80241C10 46000021 */ cvt.d.s $f0, $f0 +/* CCCF24 80241C14 46220000 */ add.d $f0, $f0, $f2 +/* CCCF28 80241C18 E7A60020 */ swc1 $f6, 0x20($sp) +/* CCCF2C 80241C1C E7A4001C */ swc1 $f4, 0x1c($sp) +/* CCCF30 80241C20 46200020 */ cvt.s.d $f0, $f0 +/* CCCF34 80241C24 E7A00024 */ swc1 $f0, 0x24($sp) +/* CCCF38 80241C28 AFA20010 */ sw $v0, 0x10($sp) +/* CCCF3C 80241C2C 8E040080 */ lw $a0, 0x80($s0) +/* CCCF40 80241C30 0C0372DF */ jal func_800DCB7C +/* CCCF44 80241C34 27A70020 */ addiu $a3, $sp, 0x20 +/* CCCF48 80241C38 10400015 */ beqz $v0, .L80241C90 +/* CCCF4C 80241C3C 00000000 */ nop +/* CCCF50 80241C40 860200A8 */ lh $v0, 0xa8($s0) +/* CCCF54 80241C44 C604001C */ lwc1 $f4, 0x1c($s0) +/* CCCF58 80241C48 44820000 */ mtc1 $v0, $f0 +/* CCCF5C 80241C4C 00000000 */ nop +/* CCCF60 80241C50 46800020 */ cvt.s.w $f0, $f0 +/* CCCF64 80241C54 46002085 */ abs.s $f2, $f4 +/* CCCF68 80241C58 46020000 */ add.s $f0, $f0, $f2 +/* CCCF6C 80241C5C C7A20024 */ lwc1 $f2, 0x24($sp) +/* CCCF70 80241C60 4600103E */ c.le.s $f2, $f0 +/* CCCF74 80241C64 00000000 */ nop +/* CCCF78 80241C68 45000005 */ bc1f .L80241C80 +/* CCCF7C 80241C6C 00000000 */ nop +/* CCCF80 80241C70 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* CCCF84 80241C74 AE00001C */ sw $zero, 0x1c($s0) +/* CCCF88 80241C78 08090735 */ j .L80241CD4 +/* CCCF8C 80241C7C E600003C */ swc1 $f0, 0x3c($s0) +.L80241C80: +/* CCCF90 80241C80 C600003C */ lwc1 $f0, 0x3c($s0) +/* CCCF94 80241C84 46040000 */ add.s $f0, $f0, $f4 +/* CCCF98 80241C88 08090735 */ j .L80241CD4 +/* CCCF9C 80241C8C E600003C */ swc1 $f0, 0x3c($s0) +.L80241C90: +/* CCCFA0 80241C90 C606003C */ lwc1 $f6, 0x3c($s0) +/* CCCFA4 80241C94 860200A8 */ lh $v0, 0xa8($s0) +/* CCCFA8 80241C98 46163081 */ sub.s $f2, $f6, $f22 +/* CCCFAC 80241C9C 44820000 */ mtc1 $v0, $f0 +/* CCCFB0 80241CA0 00000000 */ nop +/* CCCFB4 80241CA4 46800020 */ cvt.s.w $f0, $f0 +/* CCCFB8 80241CA8 46001080 */ add.s $f2, $f2, $f0 +/* CCCFBC 80241CAC C604001C */ lwc1 $f4, 0x1c($s0) +/* CCCFC0 80241CB0 46002005 */ abs.s $f0, $f4 +/* CCCFC4 80241CB4 4602003C */ c.lt.s $f0, $f2 +/* CCCFC8 80241CB8 00000000 */ nop +/* CCCFCC 80241CBC 45020005 */ bc1fl .L80241CD4 +/* CCCFD0 80241CC0 AE00001C */ sw $zero, 0x1c($s0) +/* CCCFD4 80241CC4 46043000 */ add.s $f0, $f6, $f4 +/* CCCFD8 80241CC8 08090735 */ j .L80241CD4 +/* CCCFDC 80241CCC E600003C */ swc1 $f0, 0x3c($s0) +.L80241CD0: +/* CCCFE0 80241CD0 AE00001C */ sw $zero, 0x1c($s0) +.L80241CD4: +/* CCCFE4 80241CD4 8FBF0038 */ lw $ra, 0x38($sp) +/* CCCFE8 80241CD8 8FB30034 */ lw $s3, 0x34($sp) +/* CCCFEC 80241CDC 8FB20030 */ lw $s2, 0x30($sp) +/* CCCFF0 80241CE0 8FB1002C */ lw $s1, 0x2c($sp) +/* CCCFF4 80241CE4 8FB00028 */ lw $s0, 0x28($sp) +/* CCCFF8 80241CE8 D7B60048 */ ldc1 $f22, 0x48($sp) +/* CCCFFC 80241CEC D7B40040 */ ldc1 $f20, 0x40($sp) +/* CCD000 80241CF0 03E00008 */ jr $ra +/* CCD004 80241CF4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8.s deleted file mode 100644 index 9a03f92f1e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CF8 -/* CCD008 80241CF8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CCD00C 80241CFC AFB00028 */ sw $s0, 0x28($sp) -/* CCD010 80241D00 00A0802D */ daddu $s0, $a1, $zero -/* CCD014 80241D04 AFB1002C */ sw $s1, 0x2c($sp) -/* CCD018 80241D08 00C0882D */ daddu $s1, $a2, $zero -/* CCD01C 80241D0C AFBF0034 */ sw $ra, 0x34($sp) -/* CCD020 80241D10 AFB20030 */ sw $s2, 0x30($sp) -/* CCD024 80241D14 AE200070 */ sw $zero, 0x70($s1) -/* CCD028 80241D18 8C830000 */ lw $v1, ($a0) -/* CCD02C 80241D1C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CCD030 80241D20 A480008E */ sh $zero, 0x8e($a0) -/* CCD034 80241D24 00621824 */ and $v1, $v1, $v0 -/* CCD038 80241D28 34650800 */ ori $a1, $v1, 0x800 -/* CCD03C 80241D2C AC850000 */ sw $a1, ($a0) -/* CCD040 80241D30 8E0200D0 */ lw $v0, 0xd0($s0) -/* CCD044 80241D34 8C420034 */ lw $v0, 0x34($v0) -/* CCD048 80241D38 10400003 */ beqz $v0, .L80241D48 -/* CCD04C 80241D3C 00E0902D */ daddu $s2, $a3, $zero -/* CCD050 80241D40 08090754 */ j .L80241D50 -/* CCD054 80241D44 34620808 */ ori $v0, $v1, 0x808 -.L80241D48: -/* CCD058 80241D48 2402FFF7 */ addiu $v0, $zero, -9 -/* CCD05C 80241D4C 00A21024 */ and $v0, $a1, $v0 -.L80241D50: -/* CCD060 80241D50 AC820000 */ sw $v0, ($a0) -/* CCD064 80241D54 27A20024 */ addiu $v0, $sp, 0x24 -/* CCD068 80241D58 27A50018 */ addiu $a1, $sp, 0x18 -/* CCD06C 80241D5C C4800038 */ lwc1 $f0, 0x38($a0) -/* CCD070 80241D60 C482003C */ lwc1 $f2, 0x3c($a0) -/* CCD074 80241D64 C4840040 */ lwc1 $f4, 0x40($a0) -/* CCD078 80241D68 3C01447A */ lui $at, 0x447a -/* CCD07C 80241D6C 44813000 */ mtc1 $at, $f6 -/* CCD080 80241D70 27A6001C */ addiu $a2, $sp, 0x1c -/* CCD084 80241D74 E7A00018 */ swc1 $f0, 0x18($sp) -/* CCD088 80241D78 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CCD08C 80241D7C E7A40020 */ swc1 $f4, 0x20($sp) -/* CCD090 80241D80 E7A60024 */ swc1 $f6, 0x24($sp) -/* CCD094 80241D84 AFA20010 */ sw $v0, 0x10($sp) -/* CCD098 80241D88 8C840080 */ lw $a0, 0x80($a0) -/* CCD09C 80241D8C 0C0372DF */ jal func_800DCB7C -/* CCD0A0 80241D90 27A70020 */ addiu $a3, $sp, 0x20 -/* CCD0A4 80241D94 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CCD0A8 80241D98 3C014059 */ lui $at, 0x4059 -/* CCD0AC 80241D9C 44812800 */ mtc1 $at, $f5 -/* CCD0B0 80241DA0 44802000 */ mtc1 $zero, $f4 -/* CCD0B4 80241DA4 460010A1 */ cvt.d.s $f2, $f2 -/* CCD0B8 80241DA8 46241082 */ mul.d $f2, $f2, $f4 -/* CCD0BC 80241DAC 00000000 */ nop -/* CCD0C0 80241DB0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CCD0C4 80241DB4 46000021 */ cvt.d.s $f0, $f0 -/* CCD0C8 80241DB8 46240002 */ mul.d $f0, $f0, $f4 -/* CCD0CC 80241DBC 00000000 */ nop -/* CCD0D0 80241DC0 3C013FE0 */ lui $at, 0x3fe0 -/* CCD0D4 80241DC4 44812800 */ mtc1 $at, $f5 -/* CCD0D8 80241DC8 44802000 */ mtc1 $zero, $f4 -/* CCD0DC 80241DCC 00000000 */ nop -/* CCD0E0 80241DD0 46241080 */ add.d $f2, $f2, $f4 -/* CCD0E4 80241DD4 AE000074 */ sw $zero, 0x74($s0) -/* CCD0E8 80241DD8 46240000 */ add.d $f0, $f0, $f4 -/* CCD0EC 80241DDC AE000090 */ sw $zero, 0x90($s0) -/* CCD0F0 80241DE0 4620120D */ trunc.w.d $f8, $f2 -/* CCD0F4 80241DE4 E6080078 */ swc1 $f8, 0x78($s0) -/* CCD0F8 80241DE8 4620020D */ trunc.w.d $f8, $f0 -/* CCD0FC 80241DEC E6080088 */ swc1 $f8, 0x88($s0) -/* CCD100 80241DF0 8E420014 */ lw $v0, 0x14($s2) -/* CCD104 80241DF4 AE220074 */ sw $v0, 0x74($s1) -/* CCD108 80241DF8 8E0200B0 */ lw $v0, 0xb0($s0) -/* CCD10C 80241DFC 34420010 */ ori $v0, $v0, 0x10 -/* CCD110 80241E00 AE0200B0 */ sw $v0, 0xb0($s0) -/* CCD114 80241E04 8FBF0034 */ lw $ra, 0x34($sp) -/* CCD118 80241E08 8FB20030 */ lw $s2, 0x30($sp) -/* CCD11C 80241E0C 8FB1002C */ lw $s1, 0x2c($sp) -/* CCD120 80241E10 8FB00028 */ lw $s0, 0x28($sp) -/* CCD124 80241E14 03E00008 */ jr $ra -/* CCD128 80241E18 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s new file mode 100644 index 0000000000..efe55f6c01 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241CF8_CCD008.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CF8_CCD008 +/* CCD008 80241CF8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* CCD00C 80241CFC AFB00028 */ sw $s0, 0x28($sp) +/* CCD010 80241D00 00A0802D */ daddu $s0, $a1, $zero +/* CCD014 80241D04 AFB1002C */ sw $s1, 0x2c($sp) +/* CCD018 80241D08 00C0882D */ daddu $s1, $a2, $zero +/* CCD01C 80241D0C AFBF0034 */ sw $ra, 0x34($sp) +/* CCD020 80241D10 AFB20030 */ sw $s2, 0x30($sp) +/* CCD024 80241D14 AE200070 */ sw $zero, 0x70($s1) +/* CCD028 80241D18 8C830000 */ lw $v1, ($a0) +/* CCD02C 80241D1C 2402FDFF */ addiu $v0, $zero, -0x201 +/* CCD030 80241D20 A480008E */ sh $zero, 0x8e($a0) +/* CCD034 80241D24 00621824 */ and $v1, $v1, $v0 +/* CCD038 80241D28 34650800 */ ori $a1, $v1, 0x800 +/* CCD03C 80241D2C AC850000 */ sw $a1, ($a0) +/* CCD040 80241D30 8E0200D0 */ lw $v0, 0xd0($s0) +/* CCD044 80241D34 8C420034 */ lw $v0, 0x34($v0) +/* CCD048 80241D38 10400003 */ beqz $v0, .L80241D48 +/* CCD04C 80241D3C 00E0902D */ daddu $s2, $a3, $zero +/* CCD050 80241D40 08090754 */ j .L80241D50 +/* CCD054 80241D44 34620808 */ ori $v0, $v1, 0x808 +.L80241D48: +/* CCD058 80241D48 2402FFF7 */ addiu $v0, $zero, -9 +/* CCD05C 80241D4C 00A21024 */ and $v0, $a1, $v0 +.L80241D50: +/* CCD060 80241D50 AC820000 */ sw $v0, ($a0) +/* CCD064 80241D54 27A20024 */ addiu $v0, $sp, 0x24 +/* CCD068 80241D58 27A50018 */ addiu $a1, $sp, 0x18 +/* CCD06C 80241D5C C4800038 */ lwc1 $f0, 0x38($a0) +/* CCD070 80241D60 C482003C */ lwc1 $f2, 0x3c($a0) +/* CCD074 80241D64 C4840040 */ lwc1 $f4, 0x40($a0) +/* CCD078 80241D68 3C01447A */ lui $at, 0x447a +/* CCD07C 80241D6C 44813000 */ mtc1 $at, $f6 +/* CCD080 80241D70 27A6001C */ addiu $a2, $sp, 0x1c +/* CCD084 80241D74 E7A00018 */ swc1 $f0, 0x18($sp) +/* CCD088 80241D78 E7A2001C */ swc1 $f2, 0x1c($sp) +/* CCD08C 80241D7C E7A40020 */ swc1 $f4, 0x20($sp) +/* CCD090 80241D80 E7A60024 */ swc1 $f6, 0x24($sp) +/* CCD094 80241D84 AFA20010 */ sw $v0, 0x10($sp) +/* CCD098 80241D88 8C840080 */ lw $a0, 0x80($a0) +/* CCD09C 80241D8C 0C0372DF */ jal func_800DCB7C +/* CCD0A0 80241D90 27A70020 */ addiu $a3, $sp, 0x20 +/* CCD0A4 80241D94 C7A20024 */ lwc1 $f2, 0x24($sp) +/* CCD0A8 80241D98 3C014059 */ lui $at, 0x4059 +/* CCD0AC 80241D9C 44812800 */ mtc1 $at, $f5 +/* CCD0B0 80241DA0 44802000 */ mtc1 $zero, $f4 +/* CCD0B4 80241DA4 460010A1 */ cvt.d.s $f2, $f2 +/* CCD0B8 80241DA8 46241082 */ mul.d $f2, $f2, $f4 +/* CCD0BC 80241DAC 00000000 */ nop +/* CCD0C0 80241DB0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* CCD0C4 80241DB4 46000021 */ cvt.d.s $f0, $f0 +/* CCD0C8 80241DB8 46240002 */ mul.d $f0, $f0, $f4 +/* CCD0CC 80241DBC 00000000 */ nop +/* CCD0D0 80241DC0 3C013FE0 */ lui $at, 0x3fe0 +/* CCD0D4 80241DC4 44812800 */ mtc1 $at, $f5 +/* CCD0D8 80241DC8 44802000 */ mtc1 $zero, $f4 +/* CCD0DC 80241DCC 00000000 */ nop +/* CCD0E0 80241DD0 46241080 */ add.d $f2, $f2, $f4 +/* CCD0E4 80241DD4 AE000074 */ sw $zero, 0x74($s0) +/* CCD0E8 80241DD8 46240000 */ add.d $f0, $f0, $f4 +/* CCD0EC 80241DDC AE000090 */ sw $zero, 0x90($s0) +/* CCD0F0 80241DE0 4620120D */ trunc.w.d $f8, $f2 +/* CCD0F4 80241DE4 E6080078 */ swc1 $f8, 0x78($s0) +/* CCD0F8 80241DE8 4620020D */ trunc.w.d $f8, $f0 +/* CCD0FC 80241DEC E6080088 */ swc1 $f8, 0x88($s0) +/* CCD100 80241DF0 8E420014 */ lw $v0, 0x14($s2) +/* CCD104 80241DF4 AE220074 */ sw $v0, 0x74($s1) +/* CCD108 80241DF8 8E0200B0 */ lw $v0, 0xb0($s0) +/* CCD10C 80241DFC 34420010 */ ori $v0, $v0, 0x10 +/* CCD110 80241E00 AE0200B0 */ sw $v0, 0xb0($s0) +/* CCD114 80241E04 8FBF0034 */ lw $ra, 0x34($sp) +/* CCD118 80241E08 8FB20030 */ lw $s2, 0x30($sp) +/* CCD11C 80241E0C 8FB1002C */ lw $s1, 0x2c($sp) +/* CCD120 80241E10 8FB00028 */ lw $s0, 0x28($sp) +/* CCD124 80241E14 03E00008 */ jr $ra +/* CCD128 80241E18 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C.s deleted file mode 100644 index d8455529f8..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E1C -/* CCD12C 80241E1C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CCD130 80241E20 AFB40040 */ sw $s4, 0x40($sp) -/* CCD134 80241E24 0080A02D */ daddu $s4, $a0, $zero -/* CCD138 80241E28 AFBF0048 */ sw $ra, 0x48($sp) -/* CCD13C 80241E2C AFB50044 */ sw $s5, 0x44($sp) -/* CCD140 80241E30 AFB3003C */ sw $s3, 0x3c($sp) -/* CCD144 80241E34 AFB20038 */ sw $s2, 0x38($sp) -/* CCD148 80241E38 AFB10034 */ sw $s1, 0x34($sp) -/* CCD14C 80241E3C AFB00030 */ sw $s0, 0x30($sp) -/* CCD150 80241E40 8E920148 */ lw $s2, 0x148($s4) -/* CCD154 80241E44 86440008 */ lh $a0, 8($s2) -/* CCD158 80241E48 8E90000C */ lw $s0, 0xc($s4) -/* CCD15C 80241E4C 0C00EABB */ jal get_npc_unsafe -/* CCD160 80241E50 00A0882D */ daddu $s1, $a1, $zero -/* CCD164 80241E54 0280202D */ daddu $a0, $s4, $zero -/* CCD168 80241E58 8E050000 */ lw $a1, ($s0) -/* CCD16C 80241E5C 0C0B1EAF */ jal get_variable -/* CCD170 80241E60 0040A82D */ daddu $s5, $v0, $zero -/* CCD174 80241E64 AFA00010 */ sw $zero, 0x10($sp) -/* CCD178 80241E68 8E4300D0 */ lw $v1, 0xd0($s2) -/* CCD17C 80241E6C 8C630030 */ lw $v1, 0x30($v1) -/* CCD180 80241E70 AFA30014 */ sw $v1, 0x14($sp) -/* CCD184 80241E74 8E4300D0 */ lw $v1, 0xd0($s2) -/* CCD188 80241E78 8C63001C */ lw $v1, 0x1c($v1) -/* CCD18C 80241E7C AFA30018 */ sw $v1, 0x18($sp) -/* CCD190 80241E80 8E4300D0 */ lw $v1, 0xd0($s2) -/* CCD194 80241E84 8C630024 */ lw $v1, 0x24($v1) -/* CCD198 80241E88 AFA3001C */ sw $v1, 0x1c($sp) -/* CCD19C 80241E8C 8E4300D0 */ lw $v1, 0xd0($s2) -/* CCD1A0 80241E90 8C630028 */ lw $v1, 0x28($v1) -/* CCD1A4 80241E94 27B30010 */ addiu $s3, $sp, 0x10 -/* CCD1A8 80241E98 AFA30020 */ sw $v1, 0x20($sp) -/* CCD1AC 80241E9C 8E4300D0 */ lw $v1, 0xd0($s2) -/* CCD1B0 80241EA0 3C0142F0 */ lui $at, 0x42f0 -/* CCD1B4 80241EA4 44810000 */ mtc1 $at, $f0 -/* CCD1B8 80241EA8 8C63002C */ lw $v1, 0x2c($v1) -/* CCD1BC 80241EAC 0040802D */ daddu $s0, $v0, $zero -/* CCD1C0 80241EB0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CCD1C4 80241EB4 A7A0002C */ sh $zero, 0x2c($sp) -/* CCD1C8 80241EB8 12200006 */ beqz $s1, .L80241ED4 -/* CCD1CC 80241EBC AFA30024 */ sw $v1, 0x24($sp) -/* CCD1D0 80241EC0 02A0202D */ daddu $a0, $s5, $zero -/* CCD1D4 80241EC4 0240282D */ daddu $a1, $s2, $zero -/* CCD1D8 80241EC8 0280302D */ daddu $a2, $s4, $zero -/* CCD1DC 80241ECC 0C09073E */ jal func_80241CF8 -/* CCD1E0 80241ED0 0200382D */ daddu $a3, $s0, $zero -.L80241ED4: -/* CCD1E4 80241ED4 2402FFFE */ addiu $v0, $zero, -2 -/* CCD1E8 80241ED8 A2A200AB */ sb $v0, 0xab($s5) -/* CCD1EC 80241EDC 8E4300B0 */ lw $v1, 0xb0($s2) -/* CCD1F0 80241EE0 30620004 */ andi $v0, $v1, 4 -/* CCD1F4 80241EE4 10400007 */ beqz $v0, .L80241F04 -/* CCD1F8 80241EE8 00000000 */ nop -/* CCD1FC 80241EEC 824200B4 */ lb $v0, 0xb4($s2) -/* CCD200 80241EF0 1440003C */ bnez $v0, .L80241FE4 -/* CCD204 80241EF4 0000102D */ daddu $v0, $zero, $zero -/* CCD208 80241EF8 2402FFFB */ addiu $v0, $zero, -5 -/* CCD20C 80241EFC 00621024 */ and $v0, $v1, $v0 -/* CCD210 80241F00 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241F04: -/* CCD214 80241F04 8E830070 */ lw $v1, 0x70($s4) -/* CCD218 80241F08 2C62000F */ sltiu $v0, $v1, 0xf -/* CCD21C 80241F0C 10400034 */ beqz $v0, .L80241FE0 -/* CCD220 80241F10 00031080 */ sll $v0, $v1, 2 -/* CCD224 80241F14 3C018024 */ lui $at, 0x8024 -/* CCD228 80241F18 00220821 */ addu $at, $at, $v0 -/* CCD22C 80241F1C 8C225368 */ lw $v0, 0x5368($at) -/* CCD230 80241F20 00400008 */ jr $v0 -/* CCD234 80241F24 00000000 */ nop -/* CCD238 80241F28 0280202D */ daddu $a0, $s4, $zero -/* CCD23C 80241F2C 0200282D */ daddu $a1, $s0, $zero -/* CCD240 80241F30 0C0902C4 */ jal func_80240B10 -/* CCD244 80241F34 0260302D */ daddu $a2, $s3, $zero -/* CCD248 80241F38 0280202D */ daddu $a0, $s4, $zero -/* CCD24C 80241F3C 0200282D */ daddu $a1, $s0, $zero -/* CCD250 80241F40 0C090330 */ jal func_80240CC0 -/* CCD254 80241F44 0260302D */ daddu $a2, $s3, $zero -/* CCD258 80241F48 080907F9 */ j .L80241FE4 -/* CCD25C 80241F4C 0000102D */ daddu $v0, $zero, $zero -/* CCD260 80241F50 0280202D */ daddu $a0, $s4, $zero -/* CCD264 80241F54 0200282D */ daddu $a1, $s0, $zero -/* CCD268 80241F58 0C0904BA */ jal func_802412E8 -/* CCD26C 80241F5C 0260302D */ daddu $a2, $s3, $zero -/* CCD270 80241F60 0280202D */ daddu $a0, $s4, $zero -/* CCD274 80241F64 0200282D */ daddu $a1, $s0, $zero -/* CCD278 80241F68 0C0904EA */ jal func_802413A8 -/* CCD27C 80241F6C 0260302D */ daddu $a2, $s3, $zero -/* CCD280 80241F70 080907F9 */ j .L80241FE4 -/* CCD284 80241F74 0000102D */ daddu $v0, $zero, $zero -/* CCD288 80241F78 0280202D */ daddu $a0, $s4, $zero -/* CCD28C 80241F7C 0200282D */ daddu $a1, $s0, $zero -/* CCD290 80241F80 0C0905BB */ jal func_802416EC -/* CCD294 80241F84 0260302D */ daddu $a2, $s3, $zero -/* CCD298 80241F88 0280202D */ daddu $a0, $s4, $zero -/* CCD29C 80241F8C 0200282D */ daddu $a1, $s0, $zero -/* CCD2A0 80241F90 0C0905D9 */ jal func_80241764 -/* CCD2A4 80241F94 0260302D */ daddu $a2, $s3, $zero -/* CCD2A8 80241F98 080907F9 */ j .L80241FE4 -/* CCD2AC 80241F9C 0000102D */ daddu $v0, $zero, $zero -/* CCD2B0 80241FA0 0280202D */ daddu $a0, $s4, $zero -/* CCD2B4 80241FA4 0200282D */ daddu $a1, $s0, $zero -/* CCD2B8 80241FA8 0C0905F4 */ jal func_802417D0 -/* CCD2BC 80241FAC 0260302D */ daddu $a2, $s3, $zero -/* CCD2C0 80241FB0 080907F9 */ j .L80241FE4 -/* CCD2C4 80241FB4 0000102D */ daddu $v0, $zero, $zero -/* CCD2C8 80241FB8 0280202D */ daddu $a0, $s4, $zero -/* CCD2CC 80241FBC 0200282D */ daddu $a1, $s0, $zero -/* CCD2D0 80241FC0 0C090641 */ jal func_80241904 -/* CCD2D4 80241FC4 0260302D */ daddu $a2, $s3, $zero -/* CCD2D8 80241FC8 080907F9 */ j .L80241FE4 -/* CCD2DC 80241FCC 0000102D */ daddu $v0, $zero, $zero -/* CCD2E0 80241FD0 0280202D */ daddu $a0, $s4, $zero -/* CCD2E4 80241FD4 0200282D */ daddu $a1, $s0, $zero -/* CCD2E8 80241FD8 0C09065A */ jal func_80241968 -/* CCD2EC 80241FDC 0260302D */ daddu $a2, $s3, $zero -.L80241FE0: -/* CCD2F0 80241FE0 0000102D */ daddu $v0, $zero, $zero -.L80241FE4: -/* CCD2F4 80241FE4 8FBF0048 */ lw $ra, 0x48($sp) -/* CCD2F8 80241FE8 8FB50044 */ lw $s5, 0x44($sp) -/* CCD2FC 80241FEC 8FB40040 */ lw $s4, 0x40($sp) -/* CCD300 80241FF0 8FB3003C */ lw $s3, 0x3c($sp) -/* CCD304 80241FF4 8FB20038 */ lw $s2, 0x38($sp) -/* CCD308 80241FF8 8FB10034 */ lw $s1, 0x34($sp) -/* CCD30C 80241FFC 8FB00030 */ lw $s0, 0x30($sp) -/* CCD310 80242000 03E00008 */ jr $ra -/* CCD314 80242004 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s new file mode 100644 index 0000000000..1148e46641 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80241E1C_CCD12C.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E1C_CCD12C +/* CCD12C 80241E1C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* CCD130 80241E20 AFB40040 */ sw $s4, 0x40($sp) +/* CCD134 80241E24 0080A02D */ daddu $s4, $a0, $zero +/* CCD138 80241E28 AFBF0048 */ sw $ra, 0x48($sp) +/* CCD13C 80241E2C AFB50044 */ sw $s5, 0x44($sp) +/* CCD140 80241E30 AFB3003C */ sw $s3, 0x3c($sp) +/* CCD144 80241E34 AFB20038 */ sw $s2, 0x38($sp) +/* CCD148 80241E38 AFB10034 */ sw $s1, 0x34($sp) +/* CCD14C 80241E3C AFB00030 */ sw $s0, 0x30($sp) +/* CCD150 80241E40 8E920148 */ lw $s2, 0x148($s4) +/* CCD154 80241E44 86440008 */ lh $a0, 8($s2) +/* CCD158 80241E48 8E90000C */ lw $s0, 0xc($s4) +/* CCD15C 80241E4C 0C00EABB */ jal get_npc_unsafe +/* CCD160 80241E50 00A0882D */ daddu $s1, $a1, $zero +/* CCD164 80241E54 0280202D */ daddu $a0, $s4, $zero +/* CCD168 80241E58 8E050000 */ lw $a1, ($s0) +/* CCD16C 80241E5C 0C0B1EAF */ jal get_variable +/* CCD170 80241E60 0040A82D */ daddu $s5, $v0, $zero +/* CCD174 80241E64 AFA00010 */ sw $zero, 0x10($sp) +/* CCD178 80241E68 8E4300D0 */ lw $v1, 0xd0($s2) +/* CCD17C 80241E6C 8C630030 */ lw $v1, 0x30($v1) +/* CCD180 80241E70 AFA30014 */ sw $v1, 0x14($sp) +/* CCD184 80241E74 8E4300D0 */ lw $v1, 0xd0($s2) +/* CCD188 80241E78 8C63001C */ lw $v1, 0x1c($v1) +/* CCD18C 80241E7C AFA30018 */ sw $v1, 0x18($sp) +/* CCD190 80241E80 8E4300D0 */ lw $v1, 0xd0($s2) +/* CCD194 80241E84 8C630024 */ lw $v1, 0x24($v1) +/* CCD198 80241E88 AFA3001C */ sw $v1, 0x1c($sp) +/* CCD19C 80241E8C 8E4300D0 */ lw $v1, 0xd0($s2) +/* CCD1A0 80241E90 8C630028 */ lw $v1, 0x28($v1) +/* CCD1A4 80241E94 27B30010 */ addiu $s3, $sp, 0x10 +/* CCD1A8 80241E98 AFA30020 */ sw $v1, 0x20($sp) +/* CCD1AC 80241E9C 8E4300D0 */ lw $v1, 0xd0($s2) +/* CCD1B0 80241EA0 3C0142F0 */ lui $at, 0x42f0 +/* CCD1B4 80241EA4 44810000 */ mtc1 $at, $f0 +/* CCD1B8 80241EA8 8C63002C */ lw $v1, 0x2c($v1) +/* CCD1BC 80241EAC 0040802D */ daddu $s0, $v0, $zero +/* CCD1C0 80241EB0 E7A00028 */ swc1 $f0, 0x28($sp) +/* CCD1C4 80241EB4 A7A0002C */ sh $zero, 0x2c($sp) +/* CCD1C8 80241EB8 12200006 */ beqz $s1, .L80241ED4 +/* CCD1CC 80241EBC AFA30024 */ sw $v1, 0x24($sp) +/* CCD1D0 80241EC0 02A0202D */ daddu $a0, $s5, $zero +/* CCD1D4 80241EC4 0240282D */ daddu $a1, $s2, $zero +/* CCD1D8 80241EC8 0280302D */ daddu $a2, $s4, $zero +/* CCD1DC 80241ECC 0C09073E */ jal func_80241CF8_CCD008 +/* CCD1E0 80241ED0 0200382D */ daddu $a3, $s0, $zero +.L80241ED4: +/* CCD1E4 80241ED4 2402FFFE */ addiu $v0, $zero, -2 +/* CCD1E8 80241ED8 A2A200AB */ sb $v0, 0xab($s5) +/* CCD1EC 80241EDC 8E4300B0 */ lw $v1, 0xb0($s2) +/* CCD1F0 80241EE0 30620004 */ andi $v0, $v1, 4 +/* CCD1F4 80241EE4 10400007 */ beqz $v0, .L80241F04 +/* CCD1F8 80241EE8 00000000 */ nop +/* CCD1FC 80241EEC 824200B4 */ lb $v0, 0xb4($s2) +/* CCD200 80241EF0 1440003C */ bnez $v0, .L80241FE4 +/* CCD204 80241EF4 0000102D */ daddu $v0, $zero, $zero +/* CCD208 80241EF8 2402FFFB */ addiu $v0, $zero, -5 +/* CCD20C 80241EFC 00621024 */ and $v0, $v1, $v0 +/* CCD210 80241F00 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241F04: +/* CCD214 80241F04 8E830070 */ lw $v1, 0x70($s4) +/* CCD218 80241F08 2C62000F */ sltiu $v0, $v1, 0xf +/* CCD21C 80241F0C 10400034 */ beqz $v0, .L80241FE0 +/* CCD220 80241F10 00031080 */ sll $v0, $v1, 2 +/* CCD224 80241F14 3C018024 */ lui $at, 0x8024 +/* CCD228 80241F18 00220821 */ addu $at, $at, $v0 +/* CCD22C 80241F1C 8C225368 */ lw $v0, 0x5368($at) +/* CCD230 80241F20 00400008 */ jr $v0 +/* CCD234 80241F24 00000000 */ nop +/* CCD238 80241F28 0280202D */ daddu $a0, $s4, $zero +/* CCD23C 80241F2C 0200282D */ daddu $a1, $s0, $zero +/* CCD240 80241F30 0C0902C4 */ jal func_80240B10_CCBE20 +/* CCD244 80241F34 0260302D */ daddu $a2, $s3, $zero +/* CCD248 80241F38 0280202D */ daddu $a0, $s4, $zero +/* CCD24C 80241F3C 0200282D */ daddu $a1, $s0, $zero +/* CCD250 80241F40 0C090330 */ jal func_80240CC0_CCBFD0 +/* CCD254 80241F44 0260302D */ daddu $a2, $s3, $zero +/* CCD258 80241F48 080907F9 */ j .L80241FE4 +/* CCD25C 80241F4C 0000102D */ daddu $v0, $zero, $zero +/* CCD260 80241F50 0280202D */ daddu $a0, $s4, $zero +/* CCD264 80241F54 0200282D */ daddu $a1, $s0, $zero +/* CCD268 80241F58 0C0904BA */ jal func_802412E8_CCC5F8 +/* CCD26C 80241F5C 0260302D */ daddu $a2, $s3, $zero +/* CCD270 80241F60 0280202D */ daddu $a0, $s4, $zero +/* CCD274 80241F64 0200282D */ daddu $a1, $s0, $zero +/* CCD278 80241F68 0C0904EA */ jal func_802413A8_CCC6B8 +/* CCD27C 80241F6C 0260302D */ daddu $a2, $s3, $zero +/* CCD280 80241F70 080907F9 */ j .L80241FE4 +/* CCD284 80241F74 0000102D */ daddu $v0, $zero, $zero +/* CCD288 80241F78 0280202D */ daddu $a0, $s4, $zero +/* CCD28C 80241F7C 0200282D */ daddu $a1, $s0, $zero +/* CCD290 80241F80 0C0905BB */ jal func_802416EC_CCC9FC +/* CCD294 80241F84 0260302D */ daddu $a2, $s3, $zero +/* CCD298 80241F88 0280202D */ daddu $a0, $s4, $zero +/* CCD29C 80241F8C 0200282D */ daddu $a1, $s0, $zero +/* CCD2A0 80241F90 0C0905D9 */ jal func_80241764_CCCA74 +/* CCD2A4 80241F94 0260302D */ daddu $a2, $s3, $zero +/* CCD2A8 80241F98 080907F9 */ j .L80241FE4 +/* CCD2AC 80241F9C 0000102D */ daddu $v0, $zero, $zero +/* CCD2B0 80241FA0 0280202D */ daddu $a0, $s4, $zero +/* CCD2B4 80241FA4 0200282D */ daddu $a1, $s0, $zero +/* CCD2B8 80241FA8 0C0905F4 */ jal func_802417D0_CCCAE0 +/* CCD2BC 80241FAC 0260302D */ daddu $a2, $s3, $zero +/* CCD2C0 80241FB0 080907F9 */ j .L80241FE4 +/* CCD2C4 80241FB4 0000102D */ daddu $v0, $zero, $zero +/* CCD2C8 80241FB8 0280202D */ daddu $a0, $s4, $zero +/* CCD2CC 80241FBC 0200282D */ daddu $a1, $s0, $zero +/* CCD2D0 80241FC0 0C090641 */ jal func_80241904_CCCC14 +/* CCD2D4 80241FC4 0260302D */ daddu $a2, $s3, $zero +/* CCD2D8 80241FC8 080907F9 */ j .L80241FE4 +/* CCD2DC 80241FCC 0000102D */ daddu $v0, $zero, $zero +/* CCD2E0 80241FD0 0280202D */ daddu $a0, $s4, $zero +/* CCD2E4 80241FD4 0200282D */ daddu $a1, $s0, $zero +/* CCD2E8 80241FD8 0C09065A */ jal func_80241968_CCCC78 +/* CCD2EC 80241FDC 0260302D */ daddu $a2, $s3, $zero +.L80241FE0: +/* CCD2F0 80241FE0 0000102D */ daddu $v0, $zero, $zero +.L80241FE4: +/* CCD2F4 80241FE4 8FBF0048 */ lw $ra, 0x48($sp) +/* CCD2F8 80241FE8 8FB50044 */ lw $s5, 0x44($sp) +/* CCD2FC 80241FEC 8FB40040 */ lw $s4, 0x40($sp) +/* CCD300 80241FF0 8FB3003C */ lw $s3, 0x3c($sp) +/* CCD304 80241FF4 8FB20038 */ lw $s2, 0x38($sp) +/* CCD308 80241FF8 8FB10034 */ lw $s1, 0x34($sp) +/* CCD30C 80241FFC 8FB00030 */ lw $s0, 0x30($sp) +/* CCD310 80242000 03E00008 */ jr $ra +/* CCD314 80242004 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234.s deleted file mode 100644 index d07c448e73..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242234 -/* CCD544 80242234 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCD548 80242238 AFBF0010 */ sw $ra, 0x10($sp) -/* CCD54C 8024223C 10A00003 */ beqz $a1, .L8024224C -/* CCD550 80242240 8C86000C */ lw $a2, 0xc($a0) -/* CCD554 80242244 3C018024 */ lui $at, 0x8024 -/* CCD558 80242248 AC2045FC */ sw $zero, 0x45fc($at) -.L8024224C: -/* CCD55C 8024224C 3C038024 */ lui $v1, 0x8024 -/* CCD560 80242250 246345FC */ addiu $v1, $v1, 0x45fc -/* CCD564 80242254 8C620000 */ lw $v0, ($v1) -/* CCD568 80242258 54400003 */ bnel $v0, $zero, .L80242268 -/* CCD56C 8024225C AC600000 */ sw $zero, ($v1) -/* CCD570 80242260 0809089F */ j .L8024227C -/* CCD574 80242264 0000102D */ daddu $v0, $zero, $zero -.L80242268: -/* CCD578 80242268 8CC50000 */ lw $a1, ($a2) -/* CCD57C 8024226C 3C068024 */ lui $a2, 0x8024 -/* CCD580 80242270 0C0B2026 */ jal set_variable -/* CCD584 80242274 8CC64600 */ lw $a2, 0x4600($a2) -/* CCD588 80242278 24020002 */ addiu $v0, $zero, 2 -.L8024227C: -/* CCD58C 8024227C 8FBF0010 */ lw $ra, 0x10($sp) -/* CCD590 80242280 03E00008 */ jr $ra -/* CCD594 80242284 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s new file mode 100644 index 0000000000..7cc2d395b7 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_14/CCBE20/func_80242234_CCD544.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242234_CCD544 +/* CCD544 80242234 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CCD548 80242238 AFBF0010 */ sw $ra, 0x10($sp) +/* CCD54C 8024223C 10A00003 */ beqz $a1, .L8024224C +/* CCD550 80242240 8C86000C */ lw $a2, 0xc($a0) +/* CCD554 80242244 3C018024 */ lui $at, 0x8024 +/* CCD558 80242248 AC2045FC */ sw $zero, 0x45fc($at) +.L8024224C: +/* CCD55C 8024224C 3C038024 */ lui $v1, 0x8024 +/* CCD560 80242250 246345FC */ addiu $v1, $v1, 0x45fc +/* CCD564 80242254 8C620000 */ lw $v0, ($v1) +/* CCD568 80242258 54400003 */ bnel $v0, $zero, .L80242268 +/* CCD56C 8024225C AC600000 */ sw $zero, ($v1) +/* CCD570 80242260 0809089F */ j .L8024227C +/* CCD574 80242264 0000102D */ daddu $v0, $zero, $zero +.L80242268: +/* CCD578 80242268 8CC50000 */ lw $a1, ($a2) +/* CCD57C 8024226C 3C068024 */ lui $a2, 0x8024 +/* CCD580 80242270 0C0B2026 */ jal set_variable +/* CCD584 80242274 8CC64600 */ lw $a2, 0x4600($a2) +/* CCD588 80242278 24020002 */ addiu $v0, $zero, 2 +.L8024227C: +/* CCD58C 8024227C 8FBF0010 */ lw $ra, 0x10($sp) +/* CCD590 80242280 03E00008 */ jr $ra +/* CCD594 80242284 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360.s b/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360.s deleted file mode 100644 index ace351e57f..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242360 -/* CCD670 80242360 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCD674 80242364 AFBF0010 */ sw $ra, 0x10($sp) -/* CCD678 80242368 8C82000C */ lw $v0, 0xc($a0) -/* CCD67C 8024236C 3C068016 */ lui $a2, 0x8016 -/* CCD680 80242370 84C6A556 */ lh $a2, -0x5aaa($a2) -/* CCD684 80242374 0C0B2026 */ jal set_variable -/* CCD688 80242378 8C450000 */ lw $a1, ($v0) -/* CCD68C 8024237C 8FBF0010 */ lw $ra, 0x10($sp) -/* CCD690 80242380 24020002 */ addiu $v0, $zero, 2 -/* CCD694 80242384 03E00008 */ jr $ra -/* CCD698 80242388 27BD0018 */ addiu $sp, $sp, 0x18 -/* CCD69C 8024238C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s b/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s new file mode 100644 index 0000000000..2408ef7dff --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_14/CCD670/func_80242360_CCD670.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242360_CCD670 +/* CCD670 80242360 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CCD674 80242364 AFBF0010 */ sw $ra, 0x10($sp) +/* CCD678 80242368 8C82000C */ lw $v0, 0xc($a0) +/* CCD67C 8024236C 3C068016 */ lui $a2, 0x8016 +/* CCD680 80242370 84C6A556 */ lh $a2, -0x5aaa($a2) +/* CCD684 80242374 0C0B2026 */ jal set_variable +/* CCD688 80242378 8C450000 */ lw $a1, ($v0) +/* CCD68C 8024237C 8FBF0010 */ lw $ra, 0x10($sp) +/* CCD690 80242380 24020002 */ addiu $v0, $zero, 2 +/* CCD694 80242384 03E00008 */ jr $ra +/* CCD698 80242388 27BD0018 */ addiu $sp, $sp, 0x18 +/* CCD69C 8024238C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802404FC.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802404FC.s deleted file mode 100644 index 2c8d0b9c30..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802404FC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404FC -/* CD232C 802404FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD2330 80240500 AFBF0010 */ sw $ra, 0x10($sp) -/* CD2334 80240504 8C82000C */ lw $v0, 0xc($a0) -/* CD2338 80240508 0C0B1EAF */ jal get_variable -/* CD233C 8024050C 8C450000 */ lw $a1, ($v0) -/* CD2340 80240510 0C03AC5A */ jal func_800EB168 -/* CD2344 80240514 0040202D */ daddu $a0, $v0, $zero -/* CD2348 80240518 8FBF0010 */ lw $ra, 0x10($sp) -/* CD234C 8024051C 24020002 */ addiu $v0, $zero, 2 -/* CD2350 80240520 03E00008 */ jr $ra -/* CD2354 80240524 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802404FC_CD232C.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802404FC_CD232C.s new file mode 100644 index 0000000000..d04438ad41 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_802404FC_CD232C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404FC_CD232C +/* CD232C 802404FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CD2330 80240500 AFBF0010 */ sw $ra, 0x10($sp) +/* CD2334 80240504 8C82000C */ lw $v0, 0xc($a0) +/* CD2338 80240508 0C0B1EAF */ jal get_variable +/* CD233C 8024050C 8C450000 */ lw $a1, ($v0) +/* CD2340 80240510 0C03AC5A */ jal func_800EB168 +/* CD2344 80240514 0040202D */ daddu $a0, $v0, $zero +/* CD2348 80240518 8FBF0010 */ lw $ra, 0x10($sp) +/* CD234C 8024051C 24020002 */ addiu $v0, $zero, 2 +/* CD2350 80240520 03E00008 */ jr $ra +/* CD2354 80240524 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560.s deleted file mode 100644 index 66e7121562..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240560 -/* CD2390 80240560 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD2394 80240564 AFB1001C */ sw $s1, 0x1c($sp) -/* CD2398 80240568 0080882D */ daddu $s1, $a0, $zero -/* CD239C 8024056C AFBF0020 */ sw $ra, 0x20($sp) -/* CD23A0 80240570 AFB00018 */ sw $s0, 0x18($sp) -/* CD23A4 80240574 8E30000C */ lw $s0, 0xc($s1) -/* CD23A8 80240578 8E050000 */ lw $a1, ($s0) -/* CD23AC 8024057C 0C0B1EAF */ jal get_variable -/* CD23B0 80240580 26100004 */ addiu $s0, $s0, 4 -/* CD23B4 80240584 0C04417A */ jal get_entity_by_index -/* CD23B8 80240588 0040202D */ daddu $a0, $v0, $zero -/* CD23BC 8024058C 8E100000 */ lw $s0, ($s0) -/* CD23C0 80240590 C444004C */ lwc1 $f4, 0x4c($v0) -/* CD23C4 80240594 3C014148 */ lui $at, 0x4148 -/* CD23C8 80240598 44810000 */ mtc1 $at, $f0 -/* CD23CC 8024059C 3C013F33 */ lui $at, 0x3f33 -/* CD23D0 802405A0 34213333 */ ori $at, $at, 0x3333 -/* CD23D4 802405A4 44811000 */ mtc1 $at, $f2 -/* CD23D8 802405A8 AFA00014 */ sw $zero, 0x14($sp) -/* CD23DC 802405AC 46002100 */ add.s $f4, $f4, $f0 -/* CD23E0 802405B0 E7A20010 */ swc1 $f2, 0x10($sp) -/* CD23E4 802405B4 8C450048 */ lw $a1, 0x48($v0) -/* CD23E8 802405B8 8C470050 */ lw $a3, 0x50($v0) -/* CD23EC 802405BC 44062000 */ mfc1 $a2, $f4 -/* CD23F0 802405C0 0C01C5D4 */ jal func_80071750 -/* CD23F4 802405C4 0000202D */ daddu $a0, $zero, $zero -/* CD23F8 802405C8 0220202D */ daddu $a0, $s1, $zero -/* CD23FC 802405CC 0200282D */ daddu $a1, $s0, $zero -/* CD2400 802405D0 0C0B2026 */ jal set_variable -/* CD2404 802405D4 0040302D */ daddu $a2, $v0, $zero -/* CD2408 802405D8 8FBF0020 */ lw $ra, 0x20($sp) -/* CD240C 802405DC 8FB1001C */ lw $s1, 0x1c($sp) -/* CD2410 802405E0 8FB00018 */ lw $s0, 0x18($sp) -/* CD2414 802405E4 24020002 */ addiu $v0, $zero, 2 -/* CD2418 802405E8 03E00008 */ jr $ra -/* CD241C 802405EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560_CD2390.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560_CD2390.s new file mode 100644 index 0000000000..4a6807b7a9 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240560_CD2390.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240560_CD2390 +/* CD2390 80240560 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* CD2394 80240564 AFB1001C */ sw $s1, 0x1c($sp) +/* CD2398 80240568 0080882D */ daddu $s1, $a0, $zero +/* CD239C 8024056C AFBF0020 */ sw $ra, 0x20($sp) +/* CD23A0 80240570 AFB00018 */ sw $s0, 0x18($sp) +/* CD23A4 80240574 8E30000C */ lw $s0, 0xc($s1) +/* CD23A8 80240578 8E050000 */ lw $a1, ($s0) +/* CD23AC 8024057C 0C0B1EAF */ jal get_variable +/* CD23B0 80240580 26100004 */ addiu $s0, $s0, 4 +/* CD23B4 80240584 0C04417A */ jal get_entity_by_index +/* CD23B8 80240588 0040202D */ daddu $a0, $v0, $zero +/* CD23BC 8024058C 8E100000 */ lw $s0, ($s0) +/* CD23C0 80240590 C444004C */ lwc1 $f4, 0x4c($v0) +/* CD23C4 80240594 3C014148 */ lui $at, 0x4148 +/* CD23C8 80240598 44810000 */ mtc1 $at, $f0 +/* CD23CC 8024059C 3C013F33 */ lui $at, 0x3f33 +/* CD23D0 802405A0 34213333 */ ori $at, $at, 0x3333 +/* CD23D4 802405A4 44811000 */ mtc1 $at, $f2 +/* CD23D8 802405A8 AFA00014 */ sw $zero, 0x14($sp) +/* CD23DC 802405AC 46002100 */ add.s $f4, $f4, $f0 +/* CD23E0 802405B0 E7A20010 */ swc1 $f2, 0x10($sp) +/* CD23E4 802405B4 8C450048 */ lw $a1, 0x48($v0) +/* CD23E8 802405B8 8C470050 */ lw $a3, 0x50($v0) +/* CD23EC 802405BC 44062000 */ mfc1 $a2, $f4 +/* CD23F0 802405C0 0C01C5D4 */ jal func_80071750 +/* CD23F4 802405C4 0000202D */ daddu $a0, $zero, $zero +/* CD23F8 802405C8 0220202D */ daddu $a0, $s1, $zero +/* CD23FC 802405CC 0200282D */ daddu $a1, $s0, $zero +/* CD2400 802405D0 0C0B2026 */ jal set_variable +/* CD2404 802405D4 0040302D */ daddu $a2, $v0, $zero +/* CD2408 802405D8 8FBF0020 */ lw $ra, 0x20($sp) +/* CD240C 802405DC 8FB1001C */ lw $s1, 0x1c($sp) +/* CD2410 802405E0 8FB00018 */ lw $s0, 0x18($sp) +/* CD2414 802405E4 24020002 */ addiu $v0, $zero, 2 +/* CD2418 802405E8 03E00008 */ jr $ra +/* CD241C 802405EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58.s deleted file mode 100644 index 60444465c1..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D58 -/* CD2B88 80240D58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD2B8C 80240D5C AFBF0018 */ sw $ra, 0x18($sp) -/* CD2B90 80240D60 0C00EAD2 */ jal get_npc_safe -/* CD2B94 80240D64 2404FFFC */ addiu $a0, $zero, -4 -/* CD2B98 80240D68 3C0141F0 */ lui $at, 0x41f0 -/* CD2B9C 80240D6C 44810000 */ mtc1 $at, $f0 -/* CD2BA0 80240D70 C442003C */ lwc1 $f2, 0x3c($v0) -/* CD2BA4 80240D74 46001080 */ add.s $f2, $f2, $f0 -/* CD2BA8 80240D78 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD2BAC 80240D7C 8C450038 */ lw $a1, 0x38($v0) -/* CD2BB0 80240D80 8C470040 */ lw $a3, 0x40($v0) -/* CD2BB4 80240D84 44061000 */ mfc1 $a2, $f2 -/* CD2BB8 80240D88 0C01BFBC */ jal func_8006FEF0 -/* CD2BBC 80240D8C 24040002 */ addiu $a0, $zero, 2 -/* CD2BC0 80240D90 8FBF0018 */ lw $ra, 0x18($sp) -/* CD2BC4 80240D94 24020002 */ addiu $v0, $zero, 2 -/* CD2BC8 80240D98 03E00008 */ jr $ra -/* CD2BCC 80240D9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58_CD2B88.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58_CD2B88.s new file mode 100644 index 0000000000..08d017b506 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240D58_CD2B88.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D58_CD2B88 +/* CD2B88 80240D58 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* CD2B8C 80240D5C AFBF0018 */ sw $ra, 0x18($sp) +/* CD2B90 80240D60 0C00EAD2 */ jal get_npc_safe +/* CD2B94 80240D64 2404FFFC */ addiu $a0, $zero, -4 +/* CD2B98 80240D68 3C0141F0 */ lui $at, 0x41f0 +/* CD2B9C 80240D6C 44810000 */ mtc1 $at, $f0 +/* CD2BA0 80240D70 C442003C */ lwc1 $f2, 0x3c($v0) +/* CD2BA4 80240D74 46001080 */ add.s $f2, $f2, $f0 +/* CD2BA8 80240D78 E7A00010 */ swc1 $f0, 0x10($sp) +/* CD2BAC 80240D7C 8C450038 */ lw $a1, 0x38($v0) +/* CD2BB0 80240D80 8C470040 */ lw $a3, 0x40($v0) +/* CD2BB4 80240D84 44061000 */ mfc1 $a2, $f2 +/* CD2BB8 80240D88 0C01BFBC */ jal func_8006FEF0 +/* CD2BBC 80240D8C 24040002 */ addiu $a0, $zero, 2 +/* CD2BC0 80240D90 8FBF0018 */ lw $ra, 0x18($sp) +/* CD2BC4 80240D94 24020002 */ addiu $v0, $zero, 2 +/* CD2BC8 80240D98 03E00008 */ jr $ra +/* CD2BCC 80240D9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038.s deleted file mode 100644 index a57630d511..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242038 -/* CD3E68 80242038 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CD3E6C 8024203C AFB00028 */ sw $s0, 0x28($sp) -/* CD3E70 80242040 00A0802D */ daddu $s0, $a1, $zero -/* CD3E74 80242044 AFB1002C */ sw $s1, 0x2c($sp) -/* CD3E78 80242048 00C0882D */ daddu $s1, $a2, $zero -/* CD3E7C 8024204C AFBF0034 */ sw $ra, 0x34($sp) -/* CD3E80 80242050 AFB20030 */ sw $s2, 0x30($sp) -/* CD3E84 80242054 AE200070 */ sw $zero, 0x70($s1) -/* CD3E88 80242058 8C830000 */ lw $v1, ($a0) -/* CD3E8C 8024205C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CD3E90 80242060 A480008E */ sh $zero, 0x8e($a0) -/* CD3E94 80242064 00621824 */ and $v1, $v1, $v0 -/* CD3E98 80242068 34650800 */ ori $a1, $v1, 0x800 -/* CD3E9C 8024206C AC850000 */ sw $a1, ($a0) -/* CD3EA0 80242070 8E0200D0 */ lw $v0, 0xd0($s0) -/* CD3EA4 80242074 8C420034 */ lw $v0, 0x34($v0) -/* CD3EA8 80242078 10400003 */ beqz $v0, .L80242088 -/* CD3EAC 8024207C 00E0902D */ daddu $s2, $a3, $zero -/* CD3EB0 80242080 08090824 */ j .L80242090 -/* CD3EB4 80242084 34620808 */ ori $v0, $v1, 0x808 -.L80242088: -/* CD3EB8 80242088 2402FFF7 */ addiu $v0, $zero, -9 -/* CD3EBC 8024208C 00A21024 */ and $v0, $a1, $v0 -.L80242090: -/* CD3EC0 80242090 AC820000 */ sw $v0, ($a0) -/* CD3EC4 80242094 27A20024 */ addiu $v0, $sp, 0x24 -/* CD3EC8 80242098 27A50018 */ addiu $a1, $sp, 0x18 -/* CD3ECC 8024209C C4800038 */ lwc1 $f0, 0x38($a0) -/* CD3ED0 802420A0 C482003C */ lwc1 $f2, 0x3c($a0) -/* CD3ED4 802420A4 C4840040 */ lwc1 $f4, 0x40($a0) -/* CD3ED8 802420A8 3C01447A */ lui $at, 0x447a -/* CD3EDC 802420AC 44813000 */ mtc1 $at, $f6 -/* CD3EE0 802420B0 27A6001C */ addiu $a2, $sp, 0x1c -/* CD3EE4 802420B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD3EE8 802420B8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CD3EEC 802420BC E7A40020 */ swc1 $f4, 0x20($sp) -/* CD3EF0 802420C0 E7A60024 */ swc1 $f6, 0x24($sp) -/* CD3EF4 802420C4 AFA20010 */ sw $v0, 0x10($sp) -/* CD3EF8 802420C8 8C840080 */ lw $a0, 0x80($a0) -/* CD3EFC 802420CC 0C0372DF */ jal func_800DCB7C -/* CD3F00 802420D0 27A70020 */ addiu $a3, $sp, 0x20 -/* CD3F04 802420D4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CD3F08 802420D8 3C014059 */ lui $at, 0x4059 -/* CD3F0C 802420DC 44812800 */ mtc1 $at, $f5 -/* CD3F10 802420E0 44802000 */ mtc1 $zero, $f4 -/* CD3F14 802420E4 460010A1 */ cvt.d.s $f2, $f2 -/* CD3F18 802420E8 46241082 */ mul.d $f2, $f2, $f4 -/* CD3F1C 802420EC 00000000 */ nop -/* CD3F20 802420F0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD3F24 802420F4 46000021 */ cvt.d.s $f0, $f0 -/* CD3F28 802420F8 46240002 */ mul.d $f0, $f0, $f4 -/* CD3F2C 802420FC 00000000 */ nop -/* CD3F30 80242100 3C013FE0 */ lui $at, 0x3fe0 -/* CD3F34 80242104 44812800 */ mtc1 $at, $f5 -/* CD3F38 80242108 44802000 */ mtc1 $zero, $f4 -/* CD3F3C 8024210C 00000000 */ nop -/* CD3F40 80242110 46241080 */ add.d $f2, $f2, $f4 -/* CD3F44 80242114 AE000074 */ sw $zero, 0x74($s0) -/* CD3F48 80242118 46240000 */ add.d $f0, $f0, $f4 -/* CD3F4C 8024211C AE000090 */ sw $zero, 0x90($s0) -/* CD3F50 80242120 4620120D */ trunc.w.d $f8, $f2 -/* CD3F54 80242124 E6080078 */ swc1 $f8, 0x78($s0) -/* CD3F58 80242128 4620020D */ trunc.w.d $f8, $f0 -/* CD3F5C 8024212C E6080088 */ swc1 $f8, 0x88($s0) -/* CD3F60 80242130 8E420014 */ lw $v0, 0x14($s2) -/* CD3F64 80242134 AE220074 */ sw $v0, 0x74($s1) -/* CD3F68 80242138 8E0200B0 */ lw $v0, 0xb0($s0) -/* CD3F6C 8024213C 34420010 */ ori $v0, $v0, 0x10 -/* CD3F70 80242140 AE0200B0 */ sw $v0, 0xb0($s0) -/* CD3F74 80242144 8FBF0034 */ lw $ra, 0x34($sp) -/* CD3F78 80242148 8FB20030 */ lw $s2, 0x30($sp) -/* CD3F7C 8024214C 8FB1002C */ lw $s1, 0x2c($sp) -/* CD3F80 80242150 8FB00028 */ lw $s0, 0x28($sp) -/* CD3F84 80242154 03E00008 */ jr $ra -/* CD3F88 80242158 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s new file mode 100644 index 0000000000..bcde9a5b4c --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242038_CD3E68.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242038_CD3E68 +/* CD3E68 80242038 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* CD3E6C 8024203C AFB00028 */ sw $s0, 0x28($sp) +/* CD3E70 80242040 00A0802D */ daddu $s0, $a1, $zero +/* CD3E74 80242044 AFB1002C */ sw $s1, 0x2c($sp) +/* CD3E78 80242048 00C0882D */ daddu $s1, $a2, $zero +/* CD3E7C 8024204C AFBF0034 */ sw $ra, 0x34($sp) +/* CD3E80 80242050 AFB20030 */ sw $s2, 0x30($sp) +/* CD3E84 80242054 AE200070 */ sw $zero, 0x70($s1) +/* CD3E88 80242058 8C830000 */ lw $v1, ($a0) +/* CD3E8C 8024205C 2402FDFF */ addiu $v0, $zero, -0x201 +/* CD3E90 80242060 A480008E */ sh $zero, 0x8e($a0) +/* CD3E94 80242064 00621824 */ and $v1, $v1, $v0 +/* CD3E98 80242068 34650800 */ ori $a1, $v1, 0x800 +/* CD3E9C 8024206C AC850000 */ sw $a1, ($a0) +/* CD3EA0 80242070 8E0200D0 */ lw $v0, 0xd0($s0) +/* CD3EA4 80242074 8C420034 */ lw $v0, 0x34($v0) +/* CD3EA8 80242078 10400003 */ beqz $v0, .L80242088 +/* CD3EAC 8024207C 00E0902D */ daddu $s2, $a3, $zero +/* CD3EB0 80242080 08090824 */ j .L80242090 +/* CD3EB4 80242084 34620808 */ ori $v0, $v1, 0x808 +.L80242088: +/* CD3EB8 80242088 2402FFF7 */ addiu $v0, $zero, -9 +/* CD3EBC 8024208C 00A21024 */ and $v0, $a1, $v0 +.L80242090: +/* CD3EC0 80242090 AC820000 */ sw $v0, ($a0) +/* CD3EC4 80242094 27A20024 */ addiu $v0, $sp, 0x24 +/* CD3EC8 80242098 27A50018 */ addiu $a1, $sp, 0x18 +/* CD3ECC 8024209C C4800038 */ lwc1 $f0, 0x38($a0) +/* CD3ED0 802420A0 C482003C */ lwc1 $f2, 0x3c($a0) +/* CD3ED4 802420A4 C4840040 */ lwc1 $f4, 0x40($a0) +/* CD3ED8 802420A8 3C01447A */ lui $at, 0x447a +/* CD3EDC 802420AC 44813000 */ mtc1 $at, $f6 +/* CD3EE0 802420B0 27A6001C */ addiu $a2, $sp, 0x1c +/* CD3EE4 802420B4 E7A00018 */ swc1 $f0, 0x18($sp) +/* CD3EE8 802420B8 E7A2001C */ swc1 $f2, 0x1c($sp) +/* CD3EEC 802420BC E7A40020 */ swc1 $f4, 0x20($sp) +/* CD3EF0 802420C0 E7A60024 */ swc1 $f6, 0x24($sp) +/* CD3EF4 802420C4 AFA20010 */ sw $v0, 0x10($sp) +/* CD3EF8 802420C8 8C840080 */ lw $a0, 0x80($a0) +/* CD3EFC 802420CC 0C0372DF */ jal func_800DCB7C +/* CD3F00 802420D0 27A70020 */ addiu $a3, $sp, 0x20 +/* CD3F04 802420D4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* CD3F08 802420D8 3C014059 */ lui $at, 0x4059 +/* CD3F0C 802420DC 44812800 */ mtc1 $at, $f5 +/* CD3F10 802420E0 44802000 */ mtc1 $zero, $f4 +/* CD3F14 802420E4 460010A1 */ cvt.d.s $f2, $f2 +/* CD3F18 802420E8 46241082 */ mul.d $f2, $f2, $f4 +/* CD3F1C 802420EC 00000000 */ nop +/* CD3F20 802420F0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* CD3F24 802420F4 46000021 */ cvt.d.s $f0, $f0 +/* CD3F28 802420F8 46240002 */ mul.d $f0, $f0, $f4 +/* CD3F2C 802420FC 00000000 */ nop +/* CD3F30 80242100 3C013FE0 */ lui $at, 0x3fe0 +/* CD3F34 80242104 44812800 */ mtc1 $at, $f5 +/* CD3F38 80242108 44802000 */ mtc1 $zero, $f4 +/* CD3F3C 8024210C 00000000 */ nop +/* CD3F40 80242110 46241080 */ add.d $f2, $f2, $f4 +/* CD3F44 80242114 AE000074 */ sw $zero, 0x74($s0) +/* CD3F48 80242118 46240000 */ add.d $f0, $f0, $f4 +/* CD3F4C 8024211C AE000090 */ sw $zero, 0x90($s0) +/* CD3F50 80242120 4620120D */ trunc.w.d $f8, $f2 +/* CD3F54 80242124 E6080078 */ swc1 $f8, 0x78($s0) +/* CD3F58 80242128 4620020D */ trunc.w.d $f8, $f0 +/* CD3F5C 8024212C E6080088 */ swc1 $f8, 0x88($s0) +/* CD3F60 80242130 8E420014 */ lw $v0, 0x14($s2) +/* CD3F64 80242134 AE220074 */ sw $v0, 0x74($s1) +/* CD3F68 80242138 8E0200B0 */ lw $v0, 0xb0($s0) +/* CD3F6C 8024213C 34420010 */ ori $v0, $v0, 0x10 +/* CD3F70 80242140 AE0200B0 */ sw $v0, 0xb0($s0) +/* CD3F74 80242144 8FBF0034 */ lw $ra, 0x34($sp) +/* CD3F78 80242148 8FB20030 */ lw $s2, 0x30($sp) +/* CD3F7C 8024214C 8FB1002C */ lw $s1, 0x2c($sp) +/* CD3F80 80242150 8FB00028 */ lw $s0, 0x28($sp) +/* CD3F84 80242154 03E00008 */ jr $ra +/* CD3F88 80242158 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C.s deleted file mode 100644 index e80c9f775e..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024215C -/* CD3F8C 8024215C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CD3F90 80242160 AFB40040 */ sw $s4, 0x40($sp) -/* CD3F94 80242164 0080A02D */ daddu $s4, $a0, $zero -/* CD3F98 80242168 AFBF0048 */ sw $ra, 0x48($sp) -/* CD3F9C 8024216C AFB50044 */ sw $s5, 0x44($sp) -/* CD3FA0 80242170 AFB3003C */ sw $s3, 0x3c($sp) -/* CD3FA4 80242174 AFB20038 */ sw $s2, 0x38($sp) -/* CD3FA8 80242178 AFB10034 */ sw $s1, 0x34($sp) -/* CD3FAC 8024217C AFB00030 */ sw $s0, 0x30($sp) -/* CD3FB0 80242180 8E920148 */ lw $s2, 0x148($s4) -/* CD3FB4 80242184 86440008 */ lh $a0, 8($s2) -/* CD3FB8 80242188 8E90000C */ lw $s0, 0xc($s4) -/* CD3FBC 8024218C 0C00EABB */ jal get_npc_unsafe -/* CD3FC0 80242190 00A0882D */ daddu $s1, $a1, $zero -/* CD3FC4 80242194 0280202D */ daddu $a0, $s4, $zero -/* CD3FC8 80242198 8E050000 */ lw $a1, ($s0) -/* CD3FCC 8024219C 0C0B1EAF */ jal get_variable -/* CD3FD0 802421A0 0040A82D */ daddu $s5, $v0, $zero -/* CD3FD4 802421A4 AFA00010 */ sw $zero, 0x10($sp) -/* CD3FD8 802421A8 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD3FDC 802421AC 8C630030 */ lw $v1, 0x30($v1) -/* CD3FE0 802421B0 AFA30014 */ sw $v1, 0x14($sp) -/* CD3FE4 802421B4 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD3FE8 802421B8 8C63001C */ lw $v1, 0x1c($v1) -/* CD3FEC 802421BC AFA30018 */ sw $v1, 0x18($sp) -/* CD3FF0 802421C0 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD3FF4 802421C4 8C630024 */ lw $v1, 0x24($v1) -/* CD3FF8 802421C8 AFA3001C */ sw $v1, 0x1c($sp) -/* CD3FFC 802421CC 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD4000 802421D0 8C630028 */ lw $v1, 0x28($v1) -/* CD4004 802421D4 27B30010 */ addiu $s3, $sp, 0x10 -/* CD4008 802421D8 AFA30020 */ sw $v1, 0x20($sp) -/* CD400C 802421DC 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD4010 802421E0 3C0142F0 */ lui $at, 0x42f0 -/* CD4014 802421E4 44810000 */ mtc1 $at, $f0 -/* CD4018 802421E8 8C63002C */ lw $v1, 0x2c($v1) -/* CD401C 802421EC 0040802D */ daddu $s0, $v0, $zero -/* CD4020 802421F0 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD4024 802421F4 A7A0002C */ sh $zero, 0x2c($sp) -/* CD4028 802421F8 12200006 */ beqz $s1, .L80242214 -/* CD402C 802421FC AFA30024 */ sw $v1, 0x24($sp) -/* CD4030 80242200 02A0202D */ daddu $a0, $s5, $zero -/* CD4034 80242204 0240282D */ daddu $a1, $s2, $zero -/* CD4038 80242208 0280302D */ daddu $a2, $s4, $zero -/* CD403C 8024220C 0C09080E */ jal func_80242038 -/* CD4040 80242210 0200382D */ daddu $a3, $s0, $zero -.L80242214: -/* CD4044 80242214 2402FFFE */ addiu $v0, $zero, -2 -/* CD4048 80242218 A2A200AB */ sb $v0, 0xab($s5) -/* CD404C 8024221C 8E4300B0 */ lw $v1, 0xb0($s2) -/* CD4050 80242220 30620004 */ andi $v0, $v1, 4 -/* CD4054 80242224 10400007 */ beqz $v0, .L80242244 -/* CD4058 80242228 00000000 */ nop -/* CD405C 8024222C 824200B4 */ lb $v0, 0xb4($s2) -/* CD4060 80242230 1440003C */ bnez $v0, .L80242324 -/* CD4064 80242234 0000102D */ daddu $v0, $zero, $zero -/* CD4068 80242238 2402FFFB */ addiu $v0, $zero, -5 -/* CD406C 8024223C 00621024 */ and $v0, $v1, $v0 -/* CD4070 80242240 AE4200B0 */ sw $v0, 0xb0($s2) -.L80242244: -/* CD4074 80242244 8E830070 */ lw $v1, 0x70($s4) -/* CD4078 80242248 2C62000F */ sltiu $v0, $v1, 0xf -/* CD407C 8024224C 10400034 */ beqz $v0, .L80242320 -/* CD4080 80242250 00031080 */ sll $v0, $v1, 2 -/* CD4084 80242254 3C018024 */ lui $at, 0x8024 -/* CD4088 80242258 00220821 */ addu $at, $at, $v0 -/* CD408C 8024225C 8C225408 */ lw $v0, 0x5408($at) -/* CD4090 80242260 00400008 */ jr $v0 -/* CD4094 80242264 00000000 */ nop -/* CD4098 80242268 0280202D */ daddu $a0, $s4, $zero -/* CD409C 8024226C 0200282D */ daddu $a1, $s0, $zero -/* CD40A0 80242270 0C090394 */ jal func_80240E50 -/* CD40A4 80242274 0260302D */ daddu $a2, $s3, $zero -/* CD40A8 80242278 0280202D */ daddu $a0, $s4, $zero -/* CD40AC 8024227C 0200282D */ daddu $a1, $s0, $zero -/* CD40B0 80242280 0C090400 */ jal func_80241000 -/* CD40B4 80242284 0260302D */ daddu $a2, $s3, $zero -/* CD40B8 80242288 080908C9 */ j .L80242324 -/* CD40BC 8024228C 0000102D */ daddu $v0, $zero, $zero -/* CD40C0 80242290 0280202D */ daddu $a0, $s4, $zero -/* CD40C4 80242294 0200282D */ daddu $a1, $s0, $zero -/* CD40C8 80242298 0C09058A */ jal func_80241628 -/* CD40CC 8024229C 0260302D */ daddu $a2, $s3, $zero -/* CD40D0 802422A0 0280202D */ daddu $a0, $s4, $zero -/* CD40D4 802422A4 0200282D */ daddu $a1, $s0, $zero -/* CD40D8 802422A8 0C0905BA */ jal func_802416E8 -/* CD40DC 802422AC 0260302D */ daddu $a2, $s3, $zero -/* CD40E0 802422B0 080908C9 */ j .L80242324 -/* CD40E4 802422B4 0000102D */ daddu $v0, $zero, $zero -/* CD40E8 802422B8 0280202D */ daddu $a0, $s4, $zero -/* CD40EC 802422BC 0200282D */ daddu $a1, $s0, $zero -/* CD40F0 802422C0 0C09068B */ jal func_80241A2C -/* CD40F4 802422C4 0260302D */ daddu $a2, $s3, $zero -/* CD40F8 802422C8 0280202D */ daddu $a0, $s4, $zero -/* CD40FC 802422CC 0200282D */ daddu $a1, $s0, $zero -/* CD4100 802422D0 0C0906A9 */ jal func_80241AA4 -/* CD4104 802422D4 0260302D */ daddu $a2, $s3, $zero -/* CD4108 802422D8 080908C9 */ j .L80242324 -/* CD410C 802422DC 0000102D */ daddu $v0, $zero, $zero -/* CD4110 802422E0 0280202D */ daddu $a0, $s4, $zero -/* CD4114 802422E4 0200282D */ daddu $a1, $s0, $zero -/* CD4118 802422E8 0C0906C4 */ jal func_80241B10 -/* CD411C 802422EC 0260302D */ daddu $a2, $s3, $zero -/* CD4120 802422F0 080908C9 */ j .L80242324 -/* CD4124 802422F4 0000102D */ daddu $v0, $zero, $zero -/* CD4128 802422F8 0280202D */ daddu $a0, $s4, $zero -/* CD412C 802422FC 0200282D */ daddu $a1, $s0, $zero -/* CD4130 80242300 0C090711 */ jal func_80241C44 -/* CD4134 80242304 0260302D */ daddu $a2, $s3, $zero -/* CD4138 80242308 080908C9 */ j .L80242324 -/* CD413C 8024230C 0000102D */ daddu $v0, $zero, $zero -/* CD4140 80242310 0280202D */ daddu $a0, $s4, $zero -/* CD4144 80242314 0200282D */ daddu $a1, $s0, $zero -/* CD4148 80242318 0C09072A */ jal func_80241CA8 -/* CD414C 8024231C 0260302D */ daddu $a2, $s3, $zero -.L80242320: -/* CD4150 80242320 0000102D */ daddu $v0, $zero, $zero -.L80242324: -/* CD4154 80242324 8FBF0048 */ lw $ra, 0x48($sp) -/* CD4158 80242328 8FB50044 */ lw $s5, 0x44($sp) -/* CD415C 8024232C 8FB40040 */ lw $s4, 0x40($sp) -/* CD4160 80242330 8FB3003C */ lw $s3, 0x3c($sp) -/* CD4164 80242334 8FB20038 */ lw $s2, 0x38($sp) -/* CD4168 80242338 8FB10034 */ lw $s1, 0x34($sp) -/* CD416C 8024233C 8FB00030 */ lw $s0, 0x30($sp) -/* CD4170 80242340 03E00008 */ jr $ra -/* CD4174 80242344 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s new file mode 100644 index 0000000000..806cbe4ae6 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_8024215C_CD3F8C.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024215C_CD3F8C +/* CD3F8C 8024215C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* CD3F90 80242160 AFB40040 */ sw $s4, 0x40($sp) +/* CD3F94 80242164 0080A02D */ daddu $s4, $a0, $zero +/* CD3F98 80242168 AFBF0048 */ sw $ra, 0x48($sp) +/* CD3F9C 8024216C AFB50044 */ sw $s5, 0x44($sp) +/* CD3FA0 80242170 AFB3003C */ sw $s3, 0x3c($sp) +/* CD3FA4 80242174 AFB20038 */ sw $s2, 0x38($sp) +/* CD3FA8 80242178 AFB10034 */ sw $s1, 0x34($sp) +/* CD3FAC 8024217C AFB00030 */ sw $s0, 0x30($sp) +/* CD3FB0 80242180 8E920148 */ lw $s2, 0x148($s4) +/* CD3FB4 80242184 86440008 */ lh $a0, 8($s2) +/* CD3FB8 80242188 8E90000C */ lw $s0, 0xc($s4) +/* CD3FBC 8024218C 0C00EABB */ jal get_npc_unsafe +/* CD3FC0 80242190 00A0882D */ daddu $s1, $a1, $zero +/* CD3FC4 80242194 0280202D */ daddu $a0, $s4, $zero +/* CD3FC8 80242198 8E050000 */ lw $a1, ($s0) +/* CD3FCC 8024219C 0C0B1EAF */ jal get_variable +/* CD3FD0 802421A0 0040A82D */ daddu $s5, $v0, $zero +/* CD3FD4 802421A4 AFA00010 */ sw $zero, 0x10($sp) +/* CD3FD8 802421A8 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD3FDC 802421AC 8C630030 */ lw $v1, 0x30($v1) +/* CD3FE0 802421B0 AFA30014 */ sw $v1, 0x14($sp) +/* CD3FE4 802421B4 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD3FE8 802421B8 8C63001C */ lw $v1, 0x1c($v1) +/* CD3FEC 802421BC AFA30018 */ sw $v1, 0x18($sp) +/* CD3FF0 802421C0 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD3FF4 802421C4 8C630024 */ lw $v1, 0x24($v1) +/* CD3FF8 802421C8 AFA3001C */ sw $v1, 0x1c($sp) +/* CD3FFC 802421CC 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD4000 802421D0 8C630028 */ lw $v1, 0x28($v1) +/* CD4004 802421D4 27B30010 */ addiu $s3, $sp, 0x10 +/* CD4008 802421D8 AFA30020 */ sw $v1, 0x20($sp) +/* CD400C 802421DC 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD4010 802421E0 3C0142F0 */ lui $at, 0x42f0 +/* CD4014 802421E4 44810000 */ mtc1 $at, $f0 +/* CD4018 802421E8 8C63002C */ lw $v1, 0x2c($v1) +/* CD401C 802421EC 0040802D */ daddu $s0, $v0, $zero +/* CD4020 802421F0 E7A00028 */ swc1 $f0, 0x28($sp) +/* CD4024 802421F4 A7A0002C */ sh $zero, 0x2c($sp) +/* CD4028 802421F8 12200006 */ beqz $s1, .L80242214 +/* CD402C 802421FC AFA30024 */ sw $v1, 0x24($sp) +/* CD4030 80242200 02A0202D */ daddu $a0, $s5, $zero +/* CD4034 80242204 0240282D */ daddu $a1, $s2, $zero +/* CD4038 80242208 0280302D */ daddu $a2, $s4, $zero +/* CD403C 8024220C 0C09080E */ jal func_80242038_CD3E68 +/* CD4040 80242210 0200382D */ daddu $a3, $s0, $zero +.L80242214: +/* CD4044 80242214 2402FFFE */ addiu $v0, $zero, -2 +/* CD4048 80242218 A2A200AB */ sb $v0, 0xab($s5) +/* CD404C 8024221C 8E4300B0 */ lw $v1, 0xb0($s2) +/* CD4050 80242220 30620004 */ andi $v0, $v1, 4 +/* CD4054 80242224 10400007 */ beqz $v0, .L80242244 +/* CD4058 80242228 00000000 */ nop +/* CD405C 8024222C 824200B4 */ lb $v0, 0xb4($s2) +/* CD4060 80242230 1440003C */ bnez $v0, .L80242324 +/* CD4064 80242234 0000102D */ daddu $v0, $zero, $zero +/* CD4068 80242238 2402FFFB */ addiu $v0, $zero, -5 +/* CD406C 8024223C 00621024 */ and $v0, $v1, $v0 +/* CD4070 80242240 AE4200B0 */ sw $v0, 0xb0($s2) +.L80242244: +/* CD4074 80242244 8E830070 */ lw $v1, 0x70($s4) +/* CD4078 80242248 2C62000F */ sltiu $v0, $v1, 0xf +/* CD407C 8024224C 10400034 */ beqz $v0, .L80242320 +/* CD4080 80242250 00031080 */ sll $v0, $v1, 2 +/* CD4084 80242254 3C018024 */ lui $at, 0x8024 +/* CD4088 80242258 00220821 */ addu $at, $at, $v0 +/* CD408C 8024225C 8C225408 */ lw $v0, 0x5408($at) +/* CD4090 80242260 00400008 */ jr $v0 +/* CD4094 80242264 00000000 */ nop +/* CD4098 80242268 0280202D */ daddu $a0, $s4, $zero +/* CD409C 8024226C 0200282D */ daddu $a1, $s0, $zero +/* CD40A0 80242270 0C090394 */ jal func_80240E50_CD2C80 +/* CD40A4 80242274 0260302D */ daddu $a2, $s3, $zero +/* CD40A8 80242278 0280202D */ daddu $a0, $s4, $zero +/* CD40AC 8024227C 0200282D */ daddu $a1, $s0, $zero +/* CD40B0 80242280 0C090400 */ jal func_80241000_CD2E30 +/* CD40B4 80242284 0260302D */ daddu $a2, $s3, $zero +/* CD40B8 80242288 080908C9 */ j .L80242324 +/* CD40BC 8024228C 0000102D */ daddu $v0, $zero, $zero +/* CD40C0 80242290 0280202D */ daddu $a0, $s4, $zero +/* CD40C4 80242294 0200282D */ daddu $a1, $s0, $zero +/* CD40C8 80242298 0C09058A */ jal func_80241628_CD3458 +/* CD40CC 8024229C 0260302D */ daddu $a2, $s3, $zero +/* CD40D0 802422A0 0280202D */ daddu $a0, $s4, $zero +/* CD40D4 802422A4 0200282D */ daddu $a1, $s0, $zero +/* CD40D8 802422A8 0C0905BA */ jal func_802416E8_CD3518 +/* CD40DC 802422AC 0260302D */ daddu $a2, $s3, $zero +/* CD40E0 802422B0 080908C9 */ j .L80242324 +/* CD40E4 802422B4 0000102D */ daddu $v0, $zero, $zero +/* CD40E8 802422B8 0280202D */ daddu $a0, $s4, $zero +/* CD40EC 802422BC 0200282D */ daddu $a1, $s0, $zero +/* CD40F0 802422C0 0C09068B */ jal func_80241A2C_CD385C +/* CD40F4 802422C4 0260302D */ daddu $a2, $s3, $zero +/* CD40F8 802422C8 0280202D */ daddu $a0, $s4, $zero +/* CD40FC 802422CC 0200282D */ daddu $a1, $s0, $zero +/* CD4100 802422D0 0C0906A9 */ jal func_80241AA4_CD38D4 +/* CD4104 802422D4 0260302D */ daddu $a2, $s3, $zero +/* CD4108 802422D8 080908C9 */ j .L80242324 +/* CD410C 802422DC 0000102D */ daddu $v0, $zero, $zero +/* CD4110 802422E0 0280202D */ daddu $a0, $s4, $zero +/* CD4114 802422E4 0200282D */ daddu $a1, $s0, $zero +/* CD4118 802422E8 0C0906C4 */ jal func_80241B10_CD3940 +/* CD411C 802422EC 0260302D */ daddu $a2, $s3, $zero +/* CD4120 802422F0 080908C9 */ j .L80242324 +/* CD4124 802422F4 0000102D */ daddu $v0, $zero, $zero +/* CD4128 802422F8 0280202D */ daddu $a0, $s4, $zero +/* CD412C 802422FC 0200282D */ daddu $a1, $s0, $zero +/* CD4130 80242300 0C090711 */ jal func_80241C44_CD3A74 +/* CD4134 80242304 0260302D */ daddu $a2, $s3, $zero +/* CD4138 80242308 080908C9 */ j .L80242324 +/* CD413C 8024230C 0000102D */ daddu $v0, $zero, $zero +/* CD4140 80242310 0280202D */ daddu $a0, $s4, $zero +/* CD4144 80242314 0200282D */ daddu $a1, $s0, $zero +/* CD4148 80242318 0C09072A */ jal func_80241CA8_CD3AD8 +/* CD414C 8024231C 0260302D */ daddu $a2, $s3, $zero +.L80242320: +/* CD4150 80242320 0000102D */ daddu $v0, $zero, $zero +.L80242324: +/* CD4154 80242324 8FBF0048 */ lw $ra, 0x48($sp) +/* CD4158 80242328 8FB50044 */ lw $s5, 0x44($sp) +/* CD415C 8024232C 8FB40040 */ lw $s4, 0x40($sp) +/* CD4160 80242330 8FB3003C */ lw $s3, 0x3c($sp) +/* CD4164 80242334 8FB20038 */ lw $s2, 0x38($sp) +/* CD4168 80242338 8FB10034 */ lw $s1, 0x34($sp) +/* CD416C 8024233C 8FB00030 */ lw $s0, 0x30($sp) +/* CD4170 80242340 03E00008 */ jr $ra +/* CD4174 80242344 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478.s deleted file mode 100644 index c877a00821..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478.s +++ /dev/null @@ -1,172 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242478 -/* CD42A8 80242478 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* CD42AC 8024247C AFB3004C */ sw $s3, 0x4c($sp) -/* CD42B0 80242480 0080982D */ daddu $s3, $a0, $zero -/* CD42B4 80242484 AFBF0050 */ sw $ra, 0x50($sp) -/* CD42B8 80242488 AFB20048 */ sw $s2, 0x48($sp) -/* CD42BC 8024248C AFB10044 */ sw $s1, 0x44($sp) -/* CD42C0 80242490 AFB00040 */ sw $s0, 0x40($sp) -/* CD42C4 80242494 8E720148 */ lw $s2, 0x148($s3) -/* CD42C8 80242498 00A0882D */ daddu $s1, $a1, $zero -/* CD42CC 8024249C 86440008 */ lh $a0, 8($s2) -/* CD42D0 802424A0 0C00EABB */ jal get_npc_unsafe -/* CD42D4 802424A4 00C0802D */ daddu $s0, $a2, $zero -/* CD42D8 802424A8 0200202D */ daddu $a0, $s0, $zero -/* CD42DC 802424AC 0240282D */ daddu $a1, $s2, $zero -/* CD42E0 802424B0 24030001 */ addiu $v1, $zero, 1 -/* CD42E4 802424B4 AFA30010 */ sw $v1, 0x10($sp) -/* CD42E8 802424B8 8E260024 */ lw $a2, 0x24($s1) -/* CD42EC 802424BC 8E270028 */ lw $a3, 0x28($s1) -/* CD42F0 802424C0 0C01242D */ jal func_800490B4 -/* CD42F4 802424C4 0040802D */ daddu $s0, $v0, $zero -/* CD42F8 802424C8 14400020 */ bnez $v0, .L8024254C -/* CD42FC 802424CC 24040002 */ addiu $a0, $zero, 2 -/* CD4300 802424D0 0200282D */ daddu $a1, $s0, $zero -/* CD4304 802424D4 0000302D */ daddu $a2, $zero, $zero -/* CD4308 802424D8 860300A8 */ lh $v1, 0xa8($s0) -/* CD430C 802424DC 3C013F80 */ lui $at, 0x3f80 -/* CD4310 802424E0 44810000 */ mtc1 $at, $f0 -/* CD4314 802424E4 3C014000 */ lui $at, 0x4000 -/* CD4318 802424E8 44811000 */ mtc1 $at, $f2 -/* CD431C 802424EC 3C01C1A0 */ lui $at, 0xc1a0 -/* CD4320 802424F0 44812000 */ mtc1 $at, $f4 -/* CD4324 802424F4 2402000F */ addiu $v0, $zero, 0xf -/* CD4328 802424F8 AFA2001C */ sw $v0, 0x1c($sp) -/* CD432C 802424FC 44834000 */ mtc1 $v1, $f8 -/* CD4330 80242500 00000000 */ nop -/* CD4334 80242504 46804220 */ cvt.s.w $f8, $f8 -/* CD4338 80242508 44074000 */ mfc1 $a3, $f8 -/* CD433C 8024250C 27A20028 */ addiu $v0, $sp, 0x28 -/* CD4340 80242510 AFA20020 */ sw $v0, 0x20($sp) -/* CD4344 80242514 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD4348 80242518 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD434C 8024251C 0C01BFA4 */ jal fx_emote -/* CD4350 80242520 E7A40018 */ swc1 $f4, 0x18($sp) -/* CD4354 80242524 8E4200CC */ lw $v0, 0xcc($s2) -/* CD4358 80242528 8C430000 */ lw $v1, ($v0) -/* CD435C 8024252C 2402001E */ addiu $v0, $zero, 0x1e -/* CD4360 80242530 A602008E */ sh $v0, 0x8e($s0) -/* CD4364 80242534 24020014 */ addiu $v0, $zero, 0x14 -/* CD4368 80242538 AE030028 */ sw $v1, 0x28($s0) -/* CD436C 8024253C AE620070 */ sw $v0, 0x70($s3) -/* CD4370 80242540 2402001E */ addiu $v0, $zero, 0x1e -/* CD4374 80242544 080909B7 */ j .L802426DC -/* CD4378 80242548 AE420090 */ sw $v0, 0x90($s2) -.L8024254C: -/* CD437C 8024254C 8E050018 */ lw $a1, 0x18($s0) -/* CD4380 80242550 8E06000C */ lw $a2, 0xc($s0) -/* CD4384 80242554 0C00EA95 */ jal npc_move_heading -/* CD4388 80242558 0200202D */ daddu $a0, $s0, $zero -/* CD438C 8024255C 8E020000 */ lw $v0, ($s0) -/* CD4390 80242560 30420008 */ andi $v0, $v0, 8 -/* CD4394 80242564 14400028 */ bnez $v0, .L80242608 -/* CD4398 80242568 0000882D */ daddu $s1, $zero, $zero -/* CD439C 8024256C 27A5002C */ addiu $a1, $sp, 0x2c -/* CD43A0 80242570 27A60030 */ addiu $a2, $sp, 0x30 -/* CD43A4 80242574 860200A8 */ lh $v0, 0xa8($s0) -/* CD43A8 80242578 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD43AC 8024257C 44821000 */ mtc1 $v0, $f2 -/* CD43B0 80242580 00000000 */ nop -/* CD43B4 80242584 468010A0 */ cvt.s.w $f2, $f2 -/* CD43B8 80242588 E7A0002C */ swc1 $f0, 0x2c($sp) -/* CD43BC 8024258C 860200A8 */ lh $v0, 0xa8($s0) -/* CD43C0 80242590 C604003C */ lwc1 $f4, 0x3c($s0) -/* CD43C4 80242594 C6060040 */ lwc1 $f6, 0x40($s0) -/* CD43C8 80242598 44820000 */ mtc1 $v0, $f0 -/* CD43CC 8024259C 00000000 */ nop -/* CD43D0 802425A0 46800021 */ cvt.d.w $f0, $f0 -/* CD43D4 802425A4 46022100 */ add.s $f4, $f4, $f2 -/* CD43D8 802425A8 3C014008 */ lui $at, 0x4008 -/* CD43DC 802425AC 44811800 */ mtc1 $at, $f3 -/* CD43E0 802425B0 44801000 */ mtc1 $zero, $f2 -/* CD43E4 802425B4 27A20038 */ addiu $v0, $sp, 0x38 -/* CD43E8 802425B8 46220000 */ add.d $f0, $f0, $f2 -/* CD43EC 802425BC E7A60034 */ swc1 $f6, 0x34($sp) -/* CD43F0 802425C0 E7A40030 */ swc1 $f4, 0x30($sp) -/* CD43F4 802425C4 46200020 */ cvt.s.d $f0, $f0 -/* CD43F8 802425C8 E7A00038 */ swc1 $f0, 0x38($sp) -/* CD43FC 802425CC AFA20010 */ sw $v0, 0x10($sp) -/* CD4400 802425D0 8E040080 */ lw $a0, 0x80($s0) -/* CD4404 802425D4 0C0372DF */ jal func_800DCB7C -/* CD4408 802425D8 27A70034 */ addiu $a3, $sp, 0x34 -/* CD440C 802425DC 1040000A */ beqz $v0, .L80242608 -/* CD4410 802425E0 00000000 */ nop -/* CD4414 802425E4 860200A8 */ lh $v0, 0xa8($s0) -/* CD4418 802425E8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* CD441C 802425EC 44820000 */ mtc1 $v0, $f0 -/* CD4420 802425F0 00000000 */ nop -/* CD4424 802425F4 46800020 */ cvt.s.w $f0, $f0 -/* CD4428 802425F8 4600103C */ c.lt.s $f2, $f0 -/* CD442C 802425FC 00000000 */ nop -/* CD4430 80242600 45030001 */ bc1tl .L80242608 -/* CD4434 80242604 24110001 */ addiu $s1, $zero, 1 -.L80242608: -/* CD4438 80242608 12200008 */ beqz $s1, .L8024262C -/* CD443C 8024260C 00000000 */ nop -/* CD4440 80242610 C7A00030 */ lwc1 $f0, 0x30($sp) -/* CD4444 80242614 3C013FF0 */ lui $at, 0x3ff0 -/* CD4448 80242618 44811800 */ mtc1 $at, $f3 -/* CD444C 8024261C 44801000 */ mtc1 $zero, $f2 -/* CD4450 80242620 46000021 */ cvt.d.s $f0, $f0 -/* CD4454 80242624 080909AD */ j .L802426B4 -/* CD4458 80242628 46220000 */ add.d $f0, $f0, $f2 -.L8024262C: -/* CD445C 8024262C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD4460 80242630 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD4464 80242634 3C014018 */ lui $at, 0x4018 -/* CD4468 80242638 44811800 */ mtc1 $at, $f3 -/* CD446C 8024263C 44801000 */ mtc1 $zero, $f2 -/* CD4470 80242640 C440002C */ lwc1 $f0, 0x2c($v0) -/* CD4474 80242644 C604003C */ lwc1 $f4, 0x3c($s0) -/* CD4478 80242648 46000021 */ cvt.d.s $f0, $f0 -/* CD447C 8024264C 46220000 */ add.d $f0, $f0, $f2 -/* CD4480 80242650 46002121 */ cvt.d.s $f4, $f4 -/* CD4484 80242654 46202001 */ sub.d $f0, $f4, $f0 -/* CD4488 80242658 462001A0 */ cvt.s.d $f6, $f0 -/* CD448C 8024265C 44800000 */ mtc1 $zero, $f0 -/* CD4490 80242660 44800800 */ mtc1 $zero, $f1 -/* CD4494 80242664 460030A1 */ cvt.d.s $f2, $f6 -/* CD4498 80242668 4620103C */ c.lt.d $f2, $f0 -/* CD449C 8024266C 00000000 */ nop -/* CD44A0 80242670 45010009 */ bc1t .L80242698 -/* CD44A4 80242674 00000000 */ nop -/* CD44A8 80242678 3C014010 */ lui $at, 0x4010 -/* CD44AC 8024267C 44810800 */ mtc1 $at, $f1 -/* CD44B0 80242680 44800000 */ mtc1 $zero, $f0 -/* CD44B4 80242684 00000000 */ nop -/* CD44B8 80242688 4622003C */ c.lt.d $f0, $f2 -/* CD44BC 8024268C 00000000 */ nop -/* CD44C0 80242690 4500000A */ bc1f .L802426BC -/* CD44C4 80242694 00000000 */ nop -.L80242698: -/* CD44C8 80242698 3C018024 */ lui $at, 0x8024 -/* CD44CC 8024269C D4225448 */ ldc1 $f2, 0x5448($at) -/* CD44D0 802426A0 46003187 */ neg.s $f6, $f6 -/* CD44D4 802426A4 46003021 */ cvt.d.s $f0, $f6 -/* CD44D8 802426A8 46220002 */ mul.d $f0, $f0, $f2 -/* CD44DC 802426AC 00000000 */ nop -/* CD44E0 802426B0 46202000 */ add.d $f0, $f4, $f0 -.L802426B4: -/* CD44E4 802426B4 46200020 */ cvt.s.d $f0, $f0 -/* CD44E8 802426B8 E600003C */ swc1 $f0, 0x3c($s0) -.L802426BC: -/* CD44EC 802426BC 8602008E */ lh $v0, 0x8e($s0) -/* CD44F0 802426C0 9603008E */ lhu $v1, 0x8e($s0) -/* CD44F4 802426C4 18400003 */ blez $v0, .L802426D4 -/* CD44F8 802426C8 2462FFFF */ addiu $v0, $v1, -1 -/* CD44FC 802426CC 080909B7 */ j .L802426DC -/* CD4500 802426D0 A602008E */ sh $v0, 0x8e($s0) -.L802426D4: -/* CD4504 802426D4 2402000C */ addiu $v0, $zero, 0xc -/* CD4508 802426D8 AE620070 */ sw $v0, 0x70($s3) -.L802426DC: -/* CD450C 802426DC 8FBF0050 */ lw $ra, 0x50($sp) -/* CD4510 802426E0 8FB3004C */ lw $s3, 0x4c($sp) -/* CD4514 802426E4 8FB20048 */ lw $s2, 0x48($sp) -/* CD4518 802426E8 8FB10044 */ lw $s1, 0x44($sp) -/* CD451C 802426EC 8FB00040 */ lw $s0, 0x40($sp) -/* CD4520 802426F0 03E00008 */ jr $ra -/* CD4524 802426F4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s new file mode 100644 index 0000000000..10170fb398 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242478_CD42A8.s @@ -0,0 +1,172 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242478_CD42A8 +/* CD42A8 80242478 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* CD42AC 8024247C AFB3004C */ sw $s3, 0x4c($sp) +/* CD42B0 80242480 0080982D */ daddu $s3, $a0, $zero +/* CD42B4 80242484 AFBF0050 */ sw $ra, 0x50($sp) +/* CD42B8 80242488 AFB20048 */ sw $s2, 0x48($sp) +/* CD42BC 8024248C AFB10044 */ sw $s1, 0x44($sp) +/* CD42C0 80242490 AFB00040 */ sw $s0, 0x40($sp) +/* CD42C4 80242494 8E720148 */ lw $s2, 0x148($s3) +/* CD42C8 80242498 00A0882D */ daddu $s1, $a1, $zero +/* CD42CC 8024249C 86440008 */ lh $a0, 8($s2) +/* CD42D0 802424A0 0C00EABB */ jal get_npc_unsafe +/* CD42D4 802424A4 00C0802D */ daddu $s0, $a2, $zero +/* CD42D8 802424A8 0200202D */ daddu $a0, $s0, $zero +/* CD42DC 802424AC 0240282D */ daddu $a1, $s2, $zero +/* CD42E0 802424B0 24030001 */ addiu $v1, $zero, 1 +/* CD42E4 802424B4 AFA30010 */ sw $v1, 0x10($sp) +/* CD42E8 802424B8 8E260024 */ lw $a2, 0x24($s1) +/* CD42EC 802424BC 8E270028 */ lw $a3, 0x28($s1) +/* CD42F0 802424C0 0C01242D */ jal func_800490B4 +/* CD42F4 802424C4 0040802D */ daddu $s0, $v0, $zero +/* CD42F8 802424C8 14400020 */ bnez $v0, .L8024254C +/* CD42FC 802424CC 24040002 */ addiu $a0, $zero, 2 +/* CD4300 802424D0 0200282D */ daddu $a1, $s0, $zero +/* CD4304 802424D4 0000302D */ daddu $a2, $zero, $zero +/* CD4308 802424D8 860300A8 */ lh $v1, 0xa8($s0) +/* CD430C 802424DC 3C013F80 */ lui $at, 0x3f80 +/* CD4310 802424E0 44810000 */ mtc1 $at, $f0 +/* CD4314 802424E4 3C014000 */ lui $at, 0x4000 +/* CD4318 802424E8 44811000 */ mtc1 $at, $f2 +/* CD431C 802424EC 3C01C1A0 */ lui $at, 0xc1a0 +/* CD4320 802424F0 44812000 */ mtc1 $at, $f4 +/* CD4324 802424F4 2402000F */ addiu $v0, $zero, 0xf +/* CD4328 802424F8 AFA2001C */ sw $v0, 0x1c($sp) +/* CD432C 802424FC 44834000 */ mtc1 $v1, $f8 +/* CD4330 80242500 00000000 */ nop +/* CD4334 80242504 46804220 */ cvt.s.w $f8, $f8 +/* CD4338 80242508 44074000 */ mfc1 $a3, $f8 +/* CD433C 8024250C 27A20028 */ addiu $v0, $sp, 0x28 +/* CD4340 80242510 AFA20020 */ sw $v0, 0x20($sp) +/* CD4344 80242514 E7A00010 */ swc1 $f0, 0x10($sp) +/* CD4348 80242518 E7A20014 */ swc1 $f2, 0x14($sp) +/* CD434C 8024251C 0C01BFA4 */ jal fx_emote +/* CD4350 80242520 E7A40018 */ swc1 $f4, 0x18($sp) +/* CD4354 80242524 8E4200CC */ lw $v0, 0xcc($s2) +/* CD4358 80242528 8C430000 */ lw $v1, ($v0) +/* CD435C 8024252C 2402001E */ addiu $v0, $zero, 0x1e +/* CD4360 80242530 A602008E */ sh $v0, 0x8e($s0) +/* CD4364 80242534 24020014 */ addiu $v0, $zero, 0x14 +/* CD4368 80242538 AE030028 */ sw $v1, 0x28($s0) +/* CD436C 8024253C AE620070 */ sw $v0, 0x70($s3) +/* CD4370 80242540 2402001E */ addiu $v0, $zero, 0x1e +/* CD4374 80242544 080909B7 */ j .L802426DC +/* CD4378 80242548 AE420090 */ sw $v0, 0x90($s2) +.L8024254C: +/* CD437C 8024254C 8E050018 */ lw $a1, 0x18($s0) +/* CD4380 80242550 8E06000C */ lw $a2, 0xc($s0) +/* CD4384 80242554 0C00EA95 */ jal npc_move_heading +/* CD4388 80242558 0200202D */ daddu $a0, $s0, $zero +/* CD438C 8024255C 8E020000 */ lw $v0, ($s0) +/* CD4390 80242560 30420008 */ andi $v0, $v0, 8 +/* CD4394 80242564 14400028 */ bnez $v0, .L80242608 +/* CD4398 80242568 0000882D */ daddu $s1, $zero, $zero +/* CD439C 8024256C 27A5002C */ addiu $a1, $sp, 0x2c +/* CD43A0 80242570 27A60030 */ addiu $a2, $sp, 0x30 +/* CD43A4 80242574 860200A8 */ lh $v0, 0xa8($s0) +/* CD43A8 80242578 C6000038 */ lwc1 $f0, 0x38($s0) +/* CD43AC 8024257C 44821000 */ mtc1 $v0, $f2 +/* CD43B0 80242580 00000000 */ nop +/* CD43B4 80242584 468010A0 */ cvt.s.w $f2, $f2 +/* CD43B8 80242588 E7A0002C */ swc1 $f0, 0x2c($sp) +/* CD43BC 8024258C 860200A8 */ lh $v0, 0xa8($s0) +/* CD43C0 80242590 C604003C */ lwc1 $f4, 0x3c($s0) +/* CD43C4 80242594 C6060040 */ lwc1 $f6, 0x40($s0) +/* CD43C8 80242598 44820000 */ mtc1 $v0, $f0 +/* CD43CC 8024259C 00000000 */ nop +/* CD43D0 802425A0 46800021 */ cvt.d.w $f0, $f0 +/* CD43D4 802425A4 46022100 */ add.s $f4, $f4, $f2 +/* CD43D8 802425A8 3C014008 */ lui $at, 0x4008 +/* CD43DC 802425AC 44811800 */ mtc1 $at, $f3 +/* CD43E0 802425B0 44801000 */ mtc1 $zero, $f2 +/* CD43E4 802425B4 27A20038 */ addiu $v0, $sp, 0x38 +/* CD43E8 802425B8 46220000 */ add.d $f0, $f0, $f2 +/* CD43EC 802425BC E7A60034 */ swc1 $f6, 0x34($sp) +/* CD43F0 802425C0 E7A40030 */ swc1 $f4, 0x30($sp) +/* CD43F4 802425C4 46200020 */ cvt.s.d $f0, $f0 +/* CD43F8 802425C8 E7A00038 */ swc1 $f0, 0x38($sp) +/* CD43FC 802425CC AFA20010 */ sw $v0, 0x10($sp) +/* CD4400 802425D0 8E040080 */ lw $a0, 0x80($s0) +/* CD4404 802425D4 0C0372DF */ jal func_800DCB7C +/* CD4408 802425D8 27A70034 */ addiu $a3, $sp, 0x34 +/* CD440C 802425DC 1040000A */ beqz $v0, .L80242608 +/* CD4410 802425E0 00000000 */ nop +/* CD4414 802425E4 860200A8 */ lh $v0, 0xa8($s0) +/* CD4418 802425E8 C7A20038 */ lwc1 $f2, 0x38($sp) +/* CD441C 802425EC 44820000 */ mtc1 $v0, $f0 +/* CD4420 802425F0 00000000 */ nop +/* CD4424 802425F4 46800020 */ cvt.s.w $f0, $f0 +/* CD4428 802425F8 4600103C */ c.lt.s $f2, $f0 +/* CD442C 802425FC 00000000 */ nop +/* CD4430 80242600 45030001 */ bc1tl .L80242608 +/* CD4434 80242604 24110001 */ addiu $s1, $zero, 1 +.L80242608: +/* CD4438 80242608 12200008 */ beqz $s1, .L8024262C +/* CD443C 8024260C 00000000 */ nop +/* CD4440 80242610 C7A00030 */ lwc1 $f0, 0x30($sp) +/* CD4444 80242614 3C013FF0 */ lui $at, 0x3ff0 +/* CD4448 80242618 44811800 */ mtc1 $at, $f3 +/* CD444C 8024261C 44801000 */ mtc1 $zero, $f2 +/* CD4450 80242620 46000021 */ cvt.d.s $f0, $f0 +/* CD4454 80242624 080909AD */ j .L802426B4 +/* CD4458 80242628 46220000 */ add.d $f0, $f0, $f2 +.L8024262C: +/* CD445C 8024262C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CD4460 80242630 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CD4464 80242634 3C014018 */ lui $at, 0x4018 +/* CD4468 80242638 44811800 */ mtc1 $at, $f3 +/* CD446C 8024263C 44801000 */ mtc1 $zero, $f2 +/* CD4470 80242640 C440002C */ lwc1 $f0, 0x2c($v0) +/* CD4474 80242644 C604003C */ lwc1 $f4, 0x3c($s0) +/* CD4478 80242648 46000021 */ cvt.d.s $f0, $f0 +/* CD447C 8024264C 46220000 */ add.d $f0, $f0, $f2 +/* CD4480 80242650 46002121 */ cvt.d.s $f4, $f4 +/* CD4484 80242654 46202001 */ sub.d $f0, $f4, $f0 +/* CD4488 80242658 462001A0 */ cvt.s.d $f6, $f0 +/* CD448C 8024265C 44800000 */ mtc1 $zero, $f0 +/* CD4490 80242660 44800800 */ mtc1 $zero, $f1 +/* CD4494 80242664 460030A1 */ cvt.d.s $f2, $f6 +/* CD4498 80242668 4620103C */ c.lt.d $f2, $f0 +/* CD449C 8024266C 00000000 */ nop +/* CD44A0 80242670 45010009 */ bc1t .L80242698 +/* CD44A4 80242674 00000000 */ nop +/* CD44A8 80242678 3C014010 */ lui $at, 0x4010 +/* CD44AC 8024267C 44810800 */ mtc1 $at, $f1 +/* CD44B0 80242680 44800000 */ mtc1 $zero, $f0 +/* CD44B4 80242684 00000000 */ nop +/* CD44B8 80242688 4622003C */ c.lt.d $f0, $f2 +/* CD44BC 8024268C 00000000 */ nop +/* CD44C0 80242690 4500000A */ bc1f .L802426BC +/* CD44C4 80242694 00000000 */ nop +.L80242698: +/* CD44C8 80242698 3C018024 */ lui $at, 0x8024 +/* CD44CC 8024269C D4225448 */ ldc1 $f2, 0x5448($at) +/* CD44D0 802426A0 46003187 */ neg.s $f6, $f6 +/* CD44D4 802426A4 46003021 */ cvt.d.s $f0, $f6 +/* CD44D8 802426A8 46220002 */ mul.d $f0, $f0, $f2 +/* CD44DC 802426AC 00000000 */ nop +/* CD44E0 802426B0 46202000 */ add.d $f0, $f4, $f0 +.L802426B4: +/* CD44E4 802426B4 46200020 */ cvt.s.d $f0, $f0 +/* CD44E8 802426B8 E600003C */ swc1 $f0, 0x3c($s0) +.L802426BC: +/* CD44EC 802426BC 8602008E */ lh $v0, 0x8e($s0) +/* CD44F0 802426C0 9603008E */ lhu $v1, 0x8e($s0) +/* CD44F4 802426C4 18400003 */ blez $v0, .L802426D4 +/* CD44F8 802426C8 2462FFFF */ addiu $v0, $v1, -1 +/* CD44FC 802426CC 080909B7 */ j .L802426DC +/* CD4500 802426D0 A602008E */ sh $v0, 0x8e($s0) +.L802426D4: +/* CD4504 802426D4 2402000C */ addiu $v0, $zero, 0xc +/* CD4508 802426D8 AE620070 */ sw $v0, 0x70($s3) +.L802426DC: +/* CD450C 802426DC 8FBF0050 */ lw $ra, 0x50($sp) +/* CD4510 802426E0 8FB3004C */ lw $s3, 0x4c($sp) +/* CD4514 802426E4 8FB20048 */ lw $s2, 0x48($sp) +/* CD4518 802426E8 8FB10044 */ lw $s1, 0x44($sp) +/* CD451C 802426EC 8FB00040 */ lw $s0, 0x40($sp) +/* CD4520 802426F0 03E00008 */ jr $ra +/* CD4524 802426F4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754.s deleted file mode 100644 index 063a1c9a82..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242754 -/* CD4584 80242754 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* CD4588 80242758 AFB40040 */ sw $s4, 0x40($sp) -/* CD458C 8024275C 0080A02D */ daddu $s4, $a0, $zero -/* CD4590 80242760 AFBF0048 */ sw $ra, 0x48($sp) -/* CD4594 80242764 AFB50044 */ sw $s5, 0x44($sp) -/* CD4598 80242768 AFB3003C */ sw $s3, 0x3c($sp) -/* CD459C 8024276C AFB20038 */ sw $s2, 0x38($sp) -/* CD45A0 80242770 AFB10034 */ sw $s1, 0x34($sp) -/* CD45A4 80242774 AFB00030 */ sw $s0, 0x30($sp) -/* CD45A8 80242778 8E920148 */ lw $s2, 0x148($s4) -/* CD45AC 8024277C 86440008 */ lh $a0, 8($s2) -/* CD45B0 80242780 8E90000C */ lw $s0, 0xc($s4) -/* CD45B4 80242784 0C00EABB */ jal get_npc_unsafe -/* CD45B8 80242788 00A0882D */ daddu $s1, $a1, $zero -/* CD45BC 8024278C 0280202D */ daddu $a0, $s4, $zero -/* CD45C0 80242790 8E050000 */ lw $a1, ($s0) -/* CD45C4 80242794 0C0B1EAF */ jal get_variable -/* CD45C8 80242798 0040A82D */ daddu $s5, $v0, $zero -/* CD45CC 8024279C AFA00010 */ sw $zero, 0x10($sp) -/* CD45D0 802427A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD45D4 802427A4 8C630030 */ lw $v1, 0x30($v1) -/* CD45D8 802427A8 AFA30014 */ sw $v1, 0x14($sp) -/* CD45DC 802427AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD45E0 802427B0 8C63001C */ lw $v1, 0x1c($v1) -/* CD45E4 802427B4 AFA30018 */ sw $v1, 0x18($sp) -/* CD45E8 802427B8 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD45EC 802427BC 8C630024 */ lw $v1, 0x24($v1) -/* CD45F0 802427C0 AFA3001C */ sw $v1, 0x1c($sp) -/* CD45F4 802427C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD45F8 802427C8 8C630028 */ lw $v1, 0x28($v1) -/* CD45FC 802427CC 27B30010 */ addiu $s3, $sp, 0x10 -/* CD4600 802427D0 AFA30020 */ sw $v1, 0x20($sp) -/* CD4604 802427D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD4608 802427D8 3C0142F0 */ lui $at, 0x42f0 -/* CD460C 802427DC 44810000 */ mtc1 $at, $f0 -/* CD4610 802427E0 8C63002C */ lw $v1, 0x2c($v1) -/* CD4614 802427E4 0040802D */ daddu $s0, $v0, $zero -/* CD4618 802427E8 E7A00028 */ swc1 $f0, 0x28($sp) -/* CD461C 802427EC A7A0002C */ sh $zero, 0x2c($sp) -/* CD4620 802427F0 12200007 */ beqz $s1, .L80242810 -/* CD4624 802427F4 AFA30024 */ sw $v1, 0x24($sp) -/* CD4628 802427F8 02A0202D */ daddu $a0, $s5, $zero -/* CD462C 802427FC 0240282D */ daddu $a1, $s2, $zero -/* CD4630 80242800 0280302D */ daddu $a2, $s4, $zero -/* CD4634 80242804 0C09080E */ jal func_80242038 -/* CD4638 80242808 0200382D */ daddu $a3, $s0, $zero -/* CD463C 8024280C AE800070 */ sw $zero, 0x70($s4) -.L80242810: -/* CD4640 80242810 2402FFFE */ addiu $v0, $zero, -2 -/* CD4644 80242814 A2A200AB */ sb $v0, 0xab($s5) -/* CD4648 80242818 8E4300B0 */ lw $v1, 0xb0($s2) -/* CD464C 8024281C 30620004 */ andi $v0, $v1, 4 -/* CD4650 80242820 10400007 */ beqz $v0, .L80242840 -/* CD4654 80242824 00000000 */ nop -/* CD4658 80242828 824200B4 */ lb $v0, 0xb4($s2) -/* CD465C 8024282C 1440003A */ bnez $v0, .L80242918 -/* CD4660 80242830 0000102D */ daddu $v0, $zero, $zero -/* CD4664 80242834 2402FFFB */ addiu $v0, $zero, -5 -/* CD4668 80242838 00621024 */ and $v0, $v1, $v0 -/* CD466C 8024283C AE4200B0 */ sw $v0, 0xb0($s2) -.L80242840: -/* CD4670 80242840 8E830070 */ lw $v1, 0x70($s4) -/* CD4674 80242844 2C620015 */ sltiu $v0, $v1, 0x15 -/* CD4678 80242848 10400032 */ beqz $v0, .L80242914 -/* CD467C 8024284C 00031080 */ sll $v0, $v1, 2 -/* CD4680 80242850 3C018024 */ lui $at, 0x8024 -/* CD4684 80242854 00220821 */ addu $at, $at, $v0 -/* CD4688 80242858 8C225450 */ lw $v0, 0x5450($at) -/* CD468C 8024285C 00400008 */ jr $v0 -/* CD4690 80242860 00000000 */ nop -/* CD4694 80242864 0280202D */ daddu $a0, $s4, $zero -/* CD4698 80242868 0200282D */ daddu $a1, $s0, $zero -/* CD469C 8024286C 0C090394 */ jal func_80240E50 -/* CD46A0 80242870 0260302D */ daddu $a2, $s3, $zero -/* CD46A4 80242874 0280202D */ daddu $a0, $s4, $zero -/* CD46A8 80242878 0200282D */ daddu $a1, $s0, $zero -/* CD46AC 8024287C 0C090400 */ jal func_80241000 -/* CD46B0 80242880 0260302D */ daddu $a2, $s3, $zero -/* CD46B4 80242884 08090A46 */ j .L80242918 -/* CD46B8 80242888 0000102D */ daddu $v0, $zero, $zero -/* CD46BC 8024288C 0280202D */ daddu $a0, $s4, $zero -/* CD46C0 80242890 0200282D */ daddu $a1, $s0, $zero -/* CD46C4 80242894 0C09058A */ jal func_80241628 -/* CD46C8 80242898 0260302D */ daddu $a2, $s3, $zero -/* CD46CC 8024289C 0280202D */ daddu $a0, $s4, $zero -/* CD46D0 802428A0 0200282D */ daddu $a1, $s0, $zero -/* CD46D4 802428A4 0C0905BA */ jal func_802416E8 -/* CD46D8 802428A8 0260302D */ daddu $a2, $s3, $zero -/* CD46DC 802428AC 08090A46 */ j .L80242918 -/* CD46E0 802428B0 0000102D */ daddu $v0, $zero, $zero -/* CD46E4 802428B4 0280202D */ daddu $a0, $s4, $zero -/* CD46E8 802428B8 0200282D */ daddu $a1, $s0, $zero -/* CD46EC 802428BC 0C09068B */ jal func_80241A2C -/* CD46F0 802428C0 0260302D */ daddu $a2, $s3, $zero -/* CD46F4 802428C4 0280202D */ daddu $a0, $s4, $zero -/* CD46F8 802428C8 0200282D */ daddu $a1, $s0, $zero -/* CD46FC 802428CC 0C0906A9 */ jal func_80241AA4 -/* CD4700 802428D0 0260302D */ daddu $a2, $s3, $zero -/* CD4704 802428D4 08090A46 */ j .L80242918 -/* CD4708 802428D8 0000102D */ daddu $v0, $zero, $zero -/* CD470C 802428DC 0280202D */ daddu $a0, $s4, $zero -/* CD4710 802428E0 0200282D */ daddu $a1, $s0, $zero -/* CD4714 802428E4 0C0908D2 */ jal func_80242348 -/* CD4718 802428E8 0260302D */ daddu $a2, $s3, $zero -/* CD471C 802428EC 0280202D */ daddu $a0, $s4, $zero -/* CD4720 802428F0 0200282D */ daddu $a1, $s0, $zero -/* CD4724 802428F4 0C09091E */ jal func_80242478 -/* CD4728 802428F8 0260302D */ daddu $a2, $s3, $zero -/* CD472C 802428FC 08090A46 */ j .L80242918 -/* CD4730 80242900 0000102D */ daddu $v0, $zero, $zero -/* CD4734 80242904 0280202D */ daddu $a0, $s4, $zero -/* CD4738 80242908 0200282D */ daddu $a1, $s0, $zero -/* CD473C 8024290C 0C0909BE */ jal func_802426F8 -/* CD4740 80242910 0260302D */ daddu $a2, $s3, $zero -.L80242914: -/* CD4744 80242914 0000102D */ daddu $v0, $zero, $zero -.L80242918: -/* CD4748 80242918 8FBF0048 */ lw $ra, 0x48($sp) -/* CD474C 8024291C 8FB50044 */ lw $s5, 0x44($sp) -/* CD4750 80242920 8FB40040 */ lw $s4, 0x40($sp) -/* CD4754 80242924 8FB3003C */ lw $s3, 0x3c($sp) -/* CD4758 80242928 8FB20038 */ lw $s2, 0x38($sp) -/* CD475C 8024292C 8FB10034 */ lw $s1, 0x34($sp) -/* CD4760 80242930 8FB00030 */ lw $s0, 0x30($sp) -/* CD4764 80242934 03E00008 */ jr $ra -/* CD4768 80242938 27BD0050 */ addiu $sp, $sp, 0x50 -/* CD476C 8024293C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s new file mode 100644 index 0000000000..7fe1bf8ffe --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_16/CD2C80/func_80242754_CD4584.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242754_CD4584 +/* CD4584 80242754 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* CD4588 80242758 AFB40040 */ sw $s4, 0x40($sp) +/* CD458C 8024275C 0080A02D */ daddu $s4, $a0, $zero +/* CD4590 80242760 AFBF0048 */ sw $ra, 0x48($sp) +/* CD4594 80242764 AFB50044 */ sw $s5, 0x44($sp) +/* CD4598 80242768 AFB3003C */ sw $s3, 0x3c($sp) +/* CD459C 8024276C AFB20038 */ sw $s2, 0x38($sp) +/* CD45A0 80242770 AFB10034 */ sw $s1, 0x34($sp) +/* CD45A4 80242774 AFB00030 */ sw $s0, 0x30($sp) +/* CD45A8 80242778 8E920148 */ lw $s2, 0x148($s4) +/* CD45AC 8024277C 86440008 */ lh $a0, 8($s2) +/* CD45B0 80242780 8E90000C */ lw $s0, 0xc($s4) +/* CD45B4 80242784 0C00EABB */ jal get_npc_unsafe +/* CD45B8 80242788 00A0882D */ daddu $s1, $a1, $zero +/* CD45BC 8024278C 0280202D */ daddu $a0, $s4, $zero +/* CD45C0 80242790 8E050000 */ lw $a1, ($s0) +/* CD45C4 80242794 0C0B1EAF */ jal get_variable +/* CD45C8 80242798 0040A82D */ daddu $s5, $v0, $zero +/* CD45CC 8024279C AFA00010 */ sw $zero, 0x10($sp) +/* CD45D0 802427A0 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD45D4 802427A4 8C630030 */ lw $v1, 0x30($v1) +/* CD45D8 802427A8 AFA30014 */ sw $v1, 0x14($sp) +/* CD45DC 802427AC 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD45E0 802427B0 8C63001C */ lw $v1, 0x1c($v1) +/* CD45E4 802427B4 AFA30018 */ sw $v1, 0x18($sp) +/* CD45E8 802427B8 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD45EC 802427BC 8C630024 */ lw $v1, 0x24($v1) +/* CD45F0 802427C0 AFA3001C */ sw $v1, 0x1c($sp) +/* CD45F4 802427C4 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD45F8 802427C8 8C630028 */ lw $v1, 0x28($v1) +/* CD45FC 802427CC 27B30010 */ addiu $s3, $sp, 0x10 +/* CD4600 802427D0 AFA30020 */ sw $v1, 0x20($sp) +/* CD4604 802427D4 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD4608 802427D8 3C0142F0 */ lui $at, 0x42f0 +/* CD460C 802427DC 44810000 */ mtc1 $at, $f0 +/* CD4610 802427E0 8C63002C */ lw $v1, 0x2c($v1) +/* CD4614 802427E4 0040802D */ daddu $s0, $v0, $zero +/* CD4618 802427E8 E7A00028 */ swc1 $f0, 0x28($sp) +/* CD461C 802427EC A7A0002C */ sh $zero, 0x2c($sp) +/* CD4620 802427F0 12200007 */ beqz $s1, .L80242810 +/* CD4624 802427F4 AFA30024 */ sw $v1, 0x24($sp) +/* CD4628 802427F8 02A0202D */ daddu $a0, $s5, $zero +/* CD462C 802427FC 0240282D */ daddu $a1, $s2, $zero +/* CD4630 80242800 0280302D */ daddu $a2, $s4, $zero +/* CD4634 80242804 0C09080E */ jal func_80242038_CD3E68 +/* CD4638 80242808 0200382D */ daddu $a3, $s0, $zero +/* CD463C 8024280C AE800070 */ sw $zero, 0x70($s4) +.L80242810: +/* CD4640 80242810 2402FFFE */ addiu $v0, $zero, -2 +/* CD4644 80242814 A2A200AB */ sb $v0, 0xab($s5) +/* CD4648 80242818 8E4300B0 */ lw $v1, 0xb0($s2) +/* CD464C 8024281C 30620004 */ andi $v0, $v1, 4 +/* CD4650 80242820 10400007 */ beqz $v0, .L80242840 +/* CD4654 80242824 00000000 */ nop +/* CD4658 80242828 824200B4 */ lb $v0, 0xb4($s2) +/* CD465C 8024282C 1440003A */ bnez $v0, .L80242918 +/* CD4660 80242830 0000102D */ daddu $v0, $zero, $zero +/* CD4664 80242834 2402FFFB */ addiu $v0, $zero, -5 +/* CD4668 80242838 00621024 */ and $v0, $v1, $v0 +/* CD466C 8024283C AE4200B0 */ sw $v0, 0xb0($s2) +.L80242840: +/* CD4670 80242840 8E830070 */ lw $v1, 0x70($s4) +/* CD4674 80242844 2C620015 */ sltiu $v0, $v1, 0x15 +/* CD4678 80242848 10400032 */ beqz $v0, .L80242914 +/* CD467C 8024284C 00031080 */ sll $v0, $v1, 2 +/* CD4680 80242850 3C018024 */ lui $at, 0x8024 +/* CD4684 80242854 00220821 */ addu $at, $at, $v0 +/* CD4688 80242858 8C225450 */ lw $v0, 0x5450($at) +/* CD468C 8024285C 00400008 */ jr $v0 +/* CD4690 80242860 00000000 */ nop +/* CD4694 80242864 0280202D */ daddu $a0, $s4, $zero +/* CD4698 80242868 0200282D */ daddu $a1, $s0, $zero +/* CD469C 8024286C 0C090394 */ jal func_80240E50_CD2C80 +/* CD46A0 80242870 0260302D */ daddu $a2, $s3, $zero +/* CD46A4 80242874 0280202D */ daddu $a0, $s4, $zero +/* CD46A8 80242878 0200282D */ daddu $a1, $s0, $zero +/* CD46AC 8024287C 0C090400 */ jal func_80241000_CD2E30 +/* CD46B0 80242880 0260302D */ daddu $a2, $s3, $zero +/* CD46B4 80242884 08090A46 */ j .L80242918 +/* CD46B8 80242888 0000102D */ daddu $v0, $zero, $zero +/* CD46BC 8024288C 0280202D */ daddu $a0, $s4, $zero +/* CD46C0 80242890 0200282D */ daddu $a1, $s0, $zero +/* CD46C4 80242894 0C09058A */ jal func_80241628_CD3458 +/* CD46C8 80242898 0260302D */ daddu $a2, $s3, $zero +/* CD46CC 8024289C 0280202D */ daddu $a0, $s4, $zero +/* CD46D0 802428A0 0200282D */ daddu $a1, $s0, $zero +/* CD46D4 802428A4 0C0905BA */ jal func_802416E8_CD3518 +/* CD46D8 802428A8 0260302D */ daddu $a2, $s3, $zero +/* CD46DC 802428AC 08090A46 */ j .L80242918 +/* CD46E0 802428B0 0000102D */ daddu $v0, $zero, $zero +/* CD46E4 802428B4 0280202D */ daddu $a0, $s4, $zero +/* CD46E8 802428B8 0200282D */ daddu $a1, $s0, $zero +/* CD46EC 802428BC 0C09068B */ jal func_80241A2C_CD385C +/* CD46F0 802428C0 0260302D */ daddu $a2, $s3, $zero +/* CD46F4 802428C4 0280202D */ daddu $a0, $s4, $zero +/* CD46F8 802428C8 0200282D */ daddu $a1, $s0, $zero +/* CD46FC 802428CC 0C0906A9 */ jal func_80241AA4_CD38D4 +/* CD4700 802428D0 0260302D */ daddu $a2, $s3, $zero +/* CD4704 802428D4 08090A46 */ j .L80242918 +/* CD4708 802428D8 0000102D */ daddu $v0, $zero, $zero +/* CD470C 802428DC 0280202D */ daddu $a0, $s4, $zero +/* CD4710 802428E0 0200282D */ daddu $a1, $s0, $zero +/* CD4714 802428E4 0C0908D2 */ jal func_80242348_CD4178 +/* CD4718 802428E8 0260302D */ daddu $a2, $s3, $zero +/* CD471C 802428EC 0280202D */ daddu $a0, $s4, $zero +/* CD4720 802428F0 0200282D */ daddu $a1, $s0, $zero +/* CD4724 802428F4 0C09091E */ jal func_80242478_CD42A8 +/* CD4728 802428F8 0260302D */ daddu $a2, $s3, $zero +/* CD472C 802428FC 08090A46 */ j .L80242918 +/* CD4730 80242900 0000102D */ daddu $v0, $zero, $zero +/* CD4734 80242904 0280202D */ daddu $a0, $s4, $zero +/* CD4738 80242908 0200282D */ daddu $a1, $s0, $zero +/* CD473C 8024290C 0C0909BE */ jal func_802426F8_CD4528 +/* CD4740 80242910 0260302D */ daddu $a2, $s3, $zero +.L80242914: +/* CD4744 80242914 0000102D */ daddu $v0, $zero, $zero +.L80242918: +/* CD4748 80242918 8FBF0048 */ lw $ra, 0x48($sp) +/* CD474C 8024291C 8FB50044 */ lw $s5, 0x44($sp) +/* CD4750 80242920 8FB40040 */ lw $s4, 0x40($sp) +/* CD4754 80242924 8FB3003C */ lw $s3, 0x3c($sp) +/* CD4758 80242928 8FB20038 */ lw $s2, 0x38($sp) +/* CD475C 8024292C 8FB10034 */ lw $s1, 0x34($sp) +/* CD4760 80242930 8FB00030 */ lw $s0, 0x30($sp) +/* CD4764 80242934 03E00008 */ jr $ra +/* CD4768 80242938 27BD0050 */ addiu $sp, $sp, 0x50 +/* CD476C 8024293C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD4770/func_80242940.s b/asm/nonmatchings/world/area_flo/flo_16/CD4770/func_80242940.s deleted file mode 100644 index 5d473bc785..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_16/CD4770/func_80242940.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242940 -/* CD4770 80242940 AC800084 */ sw $zero, 0x84($a0) -/* CD4774 80242944 3C038011 */ lui $v1, %hi(gPlayerActionState) -/* CD4778 80242948 8063F07C */ lb $v1, %lo(gPlayerActionState)($v1) -/* CD477C 8024294C 2402000E */ addiu $v0, $zero, 0xe -/* CD4780 80242950 10620004 */ beq $v1, $v0, .L80242964 -/* CD4784 80242954 24020001 */ addiu $v0, $zero, 1 -/* CD4788 80242958 24020010 */ addiu $v0, $zero, 0x10 -/* CD478C 8024295C 14620002 */ bne $v1, $v0, .L80242968 -/* CD4790 80242960 24020001 */ addiu $v0, $zero, 1 -.L80242964: -/* CD4794 80242964 AC820084 */ sw $v0, 0x84($a0) -.L80242968: -/* CD4798 80242968 03E00008 */ jr $ra -/* CD479C 8024296C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD4770/func_80242940_CD4770.s b/asm/nonmatchings/world/area_flo/flo_16/CD4770/func_80242940_CD4770.s new file mode 100644 index 0000000000..fc86a0e232 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_16/CD4770/func_80242940_CD4770.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242940_CD4770 +/* CD4770 80242940 AC800084 */ sw $zero, 0x84($a0) +/* CD4774 80242944 3C038011 */ lui $v1, %hi(gPlayerActionState) +/* CD4778 80242948 8063F07C */ lb $v1, %lo(gPlayerActionState)($v1) +/* CD477C 8024294C 2402000E */ addiu $v0, $zero, 0xe +/* CD4780 80242950 10620004 */ beq $v1, $v0, .L80242964 +/* CD4784 80242954 24020001 */ addiu $v0, $zero, 1 +/* CD4788 80242958 24020010 */ addiu $v0, $zero, 0x10 +/* CD478C 8024295C 14620002 */ bne $v1, $v0, .L80242968 +/* CD4790 80242960 24020001 */ addiu $v0, $zero, 1 +.L80242964: +/* CD4794 80242964 AC820084 */ sw $v0, 0x84($a0) +.L80242968: +/* CD4798 80242968 03E00008 */ jr $ra +/* CD479C 8024296C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848.s deleted file mode 100644 index a81c004fba..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240848 -/* CD7B28 80240848 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CD7B2C 8024084C AFB3001C */ sw $s3, 0x1c($sp) -/* CD7B30 80240850 0080982D */ daddu $s3, $a0, $zero -/* CD7B34 80240854 AFBF0020 */ sw $ra, 0x20($sp) -/* CD7B38 80240858 AFB20018 */ sw $s2, 0x18($sp) -/* CD7B3C 8024085C AFB10014 */ sw $s1, 0x14($sp) -/* CD7B40 80240860 AFB00010 */ sw $s0, 0x10($sp) -/* CD7B44 80240864 8E720148 */ lw $s2, 0x148($s3) -/* CD7B48 80240868 86440008 */ lh $a0, 8($s2) -/* CD7B4C 8024086C 0C00EABB */ jal get_npc_unsafe -/* CD7B50 80240870 00A0882D */ daddu $s1, $a1, $zero -/* CD7B54 80240874 8E240008 */ lw $a0, 8($s1) -/* CD7B58 80240878 0040802D */ daddu $s0, $v0, $zero -/* CD7B5C 8024087C 00041FC2 */ srl $v1, $a0, 0x1f -/* CD7B60 80240880 00832021 */ addu $a0, $a0, $v1 -/* CD7B64 80240884 00042043 */ sra $a0, $a0, 1 -/* CD7B68 80240888 0C00A67F */ jal rand_int -/* CD7B6C 8024088C 24840001 */ addiu $a0, $a0, 1 -/* CD7B70 80240890 8E230008 */ lw $v1, 8($s1) -/* CD7B74 80240894 240400B4 */ addiu $a0, $zero, 0xb4 -/* CD7B78 80240898 00032FC2 */ srl $a1, $v1, 0x1f -/* CD7B7C 8024089C 00651821 */ addu $v1, $v1, $a1 -/* CD7B80 802408A0 00031843 */ sra $v1, $v1, 1 -/* CD7B84 802408A4 00621821 */ addu $v1, $v1, $v0 -/* CD7B88 802408A8 0C00A67F */ jal rand_int -/* CD7B8C 802408AC A603008E */ sh $v1, 0x8e($s0) -/* CD7B90 802408B0 C60C000C */ lwc1 $f12, 0xc($s0) -/* CD7B94 802408B4 44820000 */ mtc1 $v0, $f0 -/* CD7B98 802408B8 00000000 */ nop -/* CD7B9C 802408BC 46800020 */ cvt.s.w $f0, $f0 -/* CD7BA0 802408C0 46006300 */ add.s $f12, $f12, $f0 -/* CD7BA4 802408C4 3C0142B4 */ lui $at, 0x42b4 -/* CD7BA8 802408C8 44810000 */ mtc1 $at, $f0 -/* CD7BAC 802408CC 0C00A6C9 */ jal clamp_angle -/* CD7BB0 802408D0 46006301 */ sub.s $f12, $f12, $f0 -/* CD7BB4 802408D4 E600000C */ swc1 $f0, 0xc($s0) -/* CD7BB8 802408D8 8E4200CC */ lw $v0, 0xcc($s2) -/* CD7BBC 802408DC 8C420000 */ lw $v0, ($v0) -/* CD7BC0 802408E0 AE020028 */ sw $v0, 0x28($s0) -/* CD7BC4 802408E4 24020003 */ addiu $v0, $zero, 3 -/* CD7BC8 802408E8 AE620070 */ sw $v0, 0x70($s3) -/* CD7BCC 802408EC 8FBF0020 */ lw $ra, 0x20($sp) -/* CD7BD0 802408F0 8FB3001C */ lw $s3, 0x1c($sp) -/* CD7BD4 802408F4 8FB20018 */ lw $s2, 0x18($sp) -/* CD7BD8 802408F8 8FB10014 */ lw $s1, 0x14($sp) -/* CD7BDC 802408FC 8FB00010 */ lw $s0, 0x10($sp) -/* CD7BE0 80240900 03E00008 */ jr $ra -/* CD7BE4 80240904 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s new file mode 100644 index 0000000000..383052f0ee --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240848_CD7B28.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240848_CD7B28 +/* CD7B28 80240848 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* CD7B2C 8024084C AFB3001C */ sw $s3, 0x1c($sp) +/* CD7B30 80240850 0080982D */ daddu $s3, $a0, $zero +/* CD7B34 80240854 AFBF0020 */ sw $ra, 0x20($sp) +/* CD7B38 80240858 AFB20018 */ sw $s2, 0x18($sp) +/* CD7B3C 8024085C AFB10014 */ sw $s1, 0x14($sp) +/* CD7B40 80240860 AFB00010 */ sw $s0, 0x10($sp) +/* CD7B44 80240864 8E720148 */ lw $s2, 0x148($s3) +/* CD7B48 80240868 86440008 */ lh $a0, 8($s2) +/* CD7B4C 8024086C 0C00EABB */ jal get_npc_unsafe +/* CD7B50 80240870 00A0882D */ daddu $s1, $a1, $zero +/* CD7B54 80240874 8E240008 */ lw $a0, 8($s1) +/* CD7B58 80240878 0040802D */ daddu $s0, $v0, $zero +/* CD7B5C 8024087C 00041FC2 */ srl $v1, $a0, 0x1f +/* CD7B60 80240880 00832021 */ addu $a0, $a0, $v1 +/* CD7B64 80240884 00042043 */ sra $a0, $a0, 1 +/* CD7B68 80240888 0C00A67F */ jal rand_int +/* CD7B6C 8024088C 24840001 */ addiu $a0, $a0, 1 +/* CD7B70 80240890 8E230008 */ lw $v1, 8($s1) +/* CD7B74 80240894 240400B4 */ addiu $a0, $zero, 0xb4 +/* CD7B78 80240898 00032FC2 */ srl $a1, $v1, 0x1f +/* CD7B7C 8024089C 00651821 */ addu $v1, $v1, $a1 +/* CD7B80 802408A0 00031843 */ sra $v1, $v1, 1 +/* CD7B84 802408A4 00621821 */ addu $v1, $v1, $v0 +/* CD7B88 802408A8 0C00A67F */ jal rand_int +/* CD7B8C 802408AC A603008E */ sh $v1, 0x8e($s0) +/* CD7B90 802408B0 C60C000C */ lwc1 $f12, 0xc($s0) +/* CD7B94 802408B4 44820000 */ mtc1 $v0, $f0 +/* CD7B98 802408B8 00000000 */ nop +/* CD7B9C 802408BC 46800020 */ cvt.s.w $f0, $f0 +/* CD7BA0 802408C0 46006300 */ add.s $f12, $f12, $f0 +/* CD7BA4 802408C4 3C0142B4 */ lui $at, 0x42b4 +/* CD7BA8 802408C8 44810000 */ mtc1 $at, $f0 +/* CD7BAC 802408CC 0C00A6C9 */ jal clamp_angle +/* CD7BB0 802408D0 46006301 */ sub.s $f12, $f12, $f0 +/* CD7BB4 802408D4 E600000C */ swc1 $f0, 0xc($s0) +/* CD7BB8 802408D8 8E4200CC */ lw $v0, 0xcc($s2) +/* CD7BBC 802408DC 8C420000 */ lw $v0, ($v0) +/* CD7BC0 802408E0 AE020028 */ sw $v0, 0x28($s0) +/* CD7BC4 802408E4 24020003 */ addiu $v0, $zero, 3 +/* CD7BC8 802408E8 AE620070 */ sw $v0, 0x70($s3) +/* CD7BCC 802408EC 8FBF0020 */ lw $ra, 0x20($sp) +/* CD7BD0 802408F0 8FB3001C */ lw $s3, 0x1c($sp) +/* CD7BD4 802408F4 8FB20018 */ lw $s2, 0x18($sp) +/* CD7BD8 802408F8 8FB10014 */ lw $s1, 0x14($sp) +/* CD7BDC 802408FC 8FB00010 */ lw $s0, 0x10($sp) +/* CD7BE0 80240900 03E00008 */ jr $ra +/* CD7BE4 80240904 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64.s deleted file mode 100644 index b43a59ac21..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E64 -/* CD8144 80240E64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD8148 80240E68 AFB00010 */ sw $s0, 0x10($sp) -/* CD814C 80240E6C 0080802D */ daddu $s0, $a0, $zero -/* CD8150 80240E70 AFBF0014 */ sw $ra, 0x14($sp) -/* CD8154 80240E74 8E020148 */ lw $v0, 0x148($s0) -/* CD8158 80240E78 0C00EABB */ jal get_npc_unsafe -/* CD815C 80240E7C 84440008 */ lh $a0, 8($v0) -/* CD8160 80240E80 0040202D */ daddu $a0, $v0, $zero -/* CD8164 80240E84 8482008E */ lh $v0, 0x8e($a0) -/* CD8168 80240E88 9483008E */ lhu $v1, 0x8e($a0) -/* CD816C 80240E8C 18400005 */ blez $v0, .L80240EA4 -/* CD8170 80240E90 2462FFFF */ addiu $v0, $v1, -1 -/* CD8174 80240E94 A482008E */ sh $v0, 0x8e($a0) -/* CD8178 80240E98 00021400 */ sll $v0, $v0, 0x10 -/* CD817C 80240E9C 1C400006 */ bgtz $v0, .L80240EB8 -/* CD8180 80240EA0 00000000 */ nop -.L80240EA4: -/* CD8184 80240EA4 8482008C */ lh $v0, 0x8c($a0) -/* CD8188 80240EA8 14400003 */ bnez $v0, .L80240EB8 -/* CD818C 80240EAC 2402000E */ addiu $v0, $zero, 0xe -/* CD8190 80240EB0 A480008E */ sh $zero, 0x8e($a0) -/* CD8194 80240EB4 AE020070 */ sw $v0, 0x70($s0) -.L80240EB8: -/* CD8198 80240EB8 8FBF0014 */ lw $ra, 0x14($sp) -/* CD819C 80240EBC 8FB00010 */ lw $s0, 0x10($sp) -/* CD81A0 80240EC0 03E00008 */ jr $ra -/* CD81A4 80240EC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s new file mode 100644 index 0000000000..d1e55e52fd --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80240E64_CD8144.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E64_CD8144 +/* CD8144 80240E64 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CD8148 80240E68 AFB00010 */ sw $s0, 0x10($sp) +/* CD814C 80240E6C 0080802D */ daddu $s0, $a0, $zero +/* CD8150 80240E70 AFBF0014 */ sw $ra, 0x14($sp) +/* CD8154 80240E74 8E020148 */ lw $v0, 0x148($s0) +/* CD8158 80240E78 0C00EABB */ jal get_npc_unsafe +/* CD815C 80240E7C 84440008 */ lh $a0, 8($v0) +/* CD8160 80240E80 0040202D */ daddu $a0, $v0, $zero +/* CD8164 80240E84 8482008E */ lh $v0, 0x8e($a0) +/* CD8168 80240E88 9483008E */ lhu $v1, 0x8e($a0) +/* CD816C 80240E8C 18400005 */ blez $v0, .L80240EA4 +/* CD8170 80240E90 2462FFFF */ addiu $v0, $v1, -1 +/* CD8174 80240E94 A482008E */ sh $v0, 0x8e($a0) +/* CD8178 80240E98 00021400 */ sll $v0, $v0, 0x10 +/* CD817C 80240E9C 1C400006 */ bgtz $v0, .L80240EB8 +/* CD8180 80240EA0 00000000 */ nop +.L80240EA4: +/* CD8184 80240EA4 8482008C */ lh $v0, 0x8c($a0) +/* CD8188 80240EA8 14400003 */ bnez $v0, .L80240EB8 +/* CD818C 80240EAC 2402000E */ addiu $v0, $zero, 0xe +/* CD8190 80240EB0 A480008E */ sh $zero, 0x8e($a0) +/* CD8194 80240EB4 AE020070 */ sw $v0, 0x70($s0) +.L80240EB8: +/* CD8198 80240EB8 8FBF0014 */ lw $ra, 0x14($sp) +/* CD819C 80240EBC 8FB00010 */ lw $s0, 0x10($sp) +/* CD81A0 80240EC0 03E00008 */ jr $ra +/* CD81A4 80240EC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258.s deleted file mode 100644 index 703df67bda..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241258 -/* CD8538 80241258 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* CD853C 8024125C AFB00028 */ sw $s0, 0x28($sp) -/* CD8540 80241260 00A0802D */ daddu $s0, $a1, $zero -/* CD8544 80241264 AFB1002C */ sw $s1, 0x2c($sp) -/* CD8548 80241268 00C0882D */ daddu $s1, $a2, $zero -/* CD854C 8024126C AFBF0034 */ sw $ra, 0x34($sp) -/* CD8550 80241270 AFB20030 */ sw $s2, 0x30($sp) -/* CD8554 80241274 AE200070 */ sw $zero, 0x70($s1) -/* CD8558 80241278 8C830000 */ lw $v1, ($a0) -/* CD855C 8024127C 2402FDFF */ addiu $v0, $zero, -0x201 -/* CD8560 80241280 A480008E */ sh $zero, 0x8e($a0) -/* CD8564 80241284 00621824 */ and $v1, $v1, $v0 -/* CD8568 80241288 34650800 */ ori $a1, $v1, 0x800 -/* CD856C 8024128C AC850000 */ sw $a1, ($a0) -/* CD8570 80241290 8E0200D0 */ lw $v0, 0xd0($s0) -/* CD8574 80241294 8C420034 */ lw $v0, 0x34($v0) -/* CD8578 80241298 10400003 */ beqz $v0, .L802412A8 -/* CD857C 8024129C 00E0902D */ daddu $s2, $a3, $zero -/* CD8580 802412A0 080904AC */ j .L802412B0 -/* CD8584 802412A4 34620808 */ ori $v0, $v1, 0x808 -.L802412A8: -/* CD8588 802412A8 2402FFF7 */ addiu $v0, $zero, -9 -/* CD858C 802412AC 00A21024 */ and $v0, $a1, $v0 -.L802412B0: -/* CD8590 802412B0 AC820000 */ sw $v0, ($a0) -/* CD8594 802412B4 27A20024 */ addiu $v0, $sp, 0x24 -/* CD8598 802412B8 27A50018 */ addiu $a1, $sp, 0x18 -/* CD859C 802412BC C4800038 */ lwc1 $f0, 0x38($a0) -/* CD85A0 802412C0 C482003C */ lwc1 $f2, 0x3c($a0) -/* CD85A4 802412C4 C4840040 */ lwc1 $f4, 0x40($a0) -/* CD85A8 802412C8 3C01447A */ lui $at, 0x447a -/* CD85AC 802412CC 44813000 */ mtc1 $at, $f6 -/* CD85B0 802412D0 27A6001C */ addiu $a2, $sp, 0x1c -/* CD85B4 802412D4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD85B8 802412D8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* CD85BC 802412DC E7A40020 */ swc1 $f4, 0x20($sp) -/* CD85C0 802412E0 E7A60024 */ swc1 $f6, 0x24($sp) -/* CD85C4 802412E4 AFA20010 */ sw $v0, 0x10($sp) -/* CD85C8 802412E8 8C840080 */ lw $a0, 0x80($a0) -/* CD85CC 802412EC 0C0372DF */ jal func_800DCB7C -/* CD85D0 802412F0 27A70020 */ addiu $a3, $sp, 0x20 -/* CD85D4 802412F4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* CD85D8 802412F8 3C014059 */ lui $at, 0x4059 -/* CD85DC 802412FC 44812800 */ mtc1 $at, $f5 -/* CD85E0 80241300 44802000 */ mtc1 $zero, $f4 -/* CD85E4 80241304 460010A1 */ cvt.d.s $f2, $f2 -/* CD85E8 80241308 46241082 */ mul.d $f2, $f2, $f4 -/* CD85EC 8024130C 00000000 */ nop -/* CD85F0 80241310 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* CD85F4 80241314 46000021 */ cvt.d.s $f0, $f0 -/* CD85F8 80241318 46240002 */ mul.d $f0, $f0, $f4 -/* CD85FC 8024131C 00000000 */ nop -/* CD8600 80241320 3C013FE0 */ lui $at, 0x3fe0 -/* CD8604 80241324 44812800 */ mtc1 $at, $f5 -/* CD8608 80241328 44802000 */ mtc1 $zero, $f4 -/* CD860C 8024132C 00000000 */ nop -/* CD8610 80241330 46241080 */ add.d $f2, $f2, $f4 -/* CD8614 80241334 AE000074 */ sw $zero, 0x74($s0) -/* CD8618 80241338 46240000 */ add.d $f0, $f0, $f4 -/* CD861C 8024133C AE000090 */ sw $zero, 0x90($s0) -/* CD8620 80241340 4620120D */ trunc.w.d $f8, $f2 -/* CD8624 80241344 E6080078 */ swc1 $f8, 0x78($s0) -/* CD8628 80241348 4620020D */ trunc.w.d $f8, $f0 -/* CD862C 8024134C E6080088 */ swc1 $f8, 0x88($s0) -/* CD8630 80241350 8E420014 */ lw $v0, 0x14($s2) -/* CD8634 80241354 AE220074 */ sw $v0, 0x74($s1) -/* CD8638 80241358 8E0200B0 */ lw $v0, 0xb0($s0) -/* CD863C 8024135C 34420010 */ ori $v0, $v0, 0x10 -/* CD8640 80241360 AE0200B0 */ sw $v0, 0xb0($s0) -/* CD8644 80241364 8FBF0034 */ lw $ra, 0x34($sp) -/* CD8648 80241368 8FB20030 */ lw $s2, 0x30($sp) -/* CD864C 8024136C 8FB1002C */ lw $s1, 0x2c($sp) -/* CD8650 80241370 8FB00028 */ lw $s0, 0x28($sp) -/* CD8654 80241374 03E00008 */ jr $ra -/* CD8658 80241378 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s new file mode 100644 index 0000000000..92f641807d --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241258_CD8538.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241258_CD8538 +/* CD8538 80241258 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* CD853C 8024125C AFB00028 */ sw $s0, 0x28($sp) +/* CD8540 80241260 00A0802D */ daddu $s0, $a1, $zero +/* CD8544 80241264 AFB1002C */ sw $s1, 0x2c($sp) +/* CD8548 80241268 00C0882D */ daddu $s1, $a2, $zero +/* CD854C 8024126C AFBF0034 */ sw $ra, 0x34($sp) +/* CD8550 80241270 AFB20030 */ sw $s2, 0x30($sp) +/* CD8554 80241274 AE200070 */ sw $zero, 0x70($s1) +/* CD8558 80241278 8C830000 */ lw $v1, ($a0) +/* CD855C 8024127C 2402FDFF */ addiu $v0, $zero, -0x201 +/* CD8560 80241280 A480008E */ sh $zero, 0x8e($a0) +/* CD8564 80241284 00621824 */ and $v1, $v1, $v0 +/* CD8568 80241288 34650800 */ ori $a1, $v1, 0x800 +/* CD856C 8024128C AC850000 */ sw $a1, ($a0) +/* CD8570 80241290 8E0200D0 */ lw $v0, 0xd0($s0) +/* CD8574 80241294 8C420034 */ lw $v0, 0x34($v0) +/* CD8578 80241298 10400003 */ beqz $v0, .L802412A8 +/* CD857C 8024129C 00E0902D */ daddu $s2, $a3, $zero +/* CD8580 802412A0 080904AC */ j .L802412B0 +/* CD8584 802412A4 34620808 */ ori $v0, $v1, 0x808 +.L802412A8: +/* CD8588 802412A8 2402FFF7 */ addiu $v0, $zero, -9 +/* CD858C 802412AC 00A21024 */ and $v0, $a1, $v0 +.L802412B0: +/* CD8590 802412B0 AC820000 */ sw $v0, ($a0) +/* CD8594 802412B4 27A20024 */ addiu $v0, $sp, 0x24 +/* CD8598 802412B8 27A50018 */ addiu $a1, $sp, 0x18 +/* CD859C 802412BC C4800038 */ lwc1 $f0, 0x38($a0) +/* CD85A0 802412C0 C482003C */ lwc1 $f2, 0x3c($a0) +/* CD85A4 802412C4 C4840040 */ lwc1 $f4, 0x40($a0) +/* CD85A8 802412C8 3C01447A */ lui $at, 0x447a +/* CD85AC 802412CC 44813000 */ mtc1 $at, $f6 +/* CD85B0 802412D0 27A6001C */ addiu $a2, $sp, 0x1c +/* CD85B4 802412D4 E7A00018 */ swc1 $f0, 0x18($sp) +/* CD85B8 802412D8 E7A2001C */ swc1 $f2, 0x1c($sp) +/* CD85BC 802412DC E7A40020 */ swc1 $f4, 0x20($sp) +/* CD85C0 802412E0 E7A60024 */ swc1 $f6, 0x24($sp) +/* CD85C4 802412E4 AFA20010 */ sw $v0, 0x10($sp) +/* CD85C8 802412E8 8C840080 */ lw $a0, 0x80($a0) +/* CD85CC 802412EC 0C0372DF */ jal func_800DCB7C +/* CD85D0 802412F0 27A70020 */ addiu $a3, $sp, 0x20 +/* CD85D4 802412F4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* CD85D8 802412F8 3C014059 */ lui $at, 0x4059 +/* CD85DC 802412FC 44812800 */ mtc1 $at, $f5 +/* CD85E0 80241300 44802000 */ mtc1 $zero, $f4 +/* CD85E4 80241304 460010A1 */ cvt.d.s $f2, $f2 +/* CD85E8 80241308 46241082 */ mul.d $f2, $f2, $f4 +/* CD85EC 8024130C 00000000 */ nop +/* CD85F0 80241310 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* CD85F4 80241314 46000021 */ cvt.d.s $f0, $f0 +/* CD85F8 80241318 46240002 */ mul.d $f0, $f0, $f4 +/* CD85FC 8024131C 00000000 */ nop +/* CD8600 80241320 3C013FE0 */ lui $at, 0x3fe0 +/* CD8604 80241324 44812800 */ mtc1 $at, $f5 +/* CD8608 80241328 44802000 */ mtc1 $zero, $f4 +/* CD860C 8024132C 00000000 */ nop +/* CD8610 80241330 46241080 */ add.d $f2, $f2, $f4 +/* CD8614 80241334 AE000074 */ sw $zero, 0x74($s0) +/* CD8618 80241338 46240000 */ add.d $f0, $f0, $f4 +/* CD861C 8024133C AE000090 */ sw $zero, 0x90($s0) +/* CD8620 80241340 4620120D */ trunc.w.d $f8, $f2 +/* CD8624 80241344 E6080078 */ swc1 $f8, 0x78($s0) +/* CD8628 80241348 4620020D */ trunc.w.d $f8, $f0 +/* CD862C 8024134C E6080088 */ swc1 $f8, 0x88($s0) +/* CD8630 80241350 8E420014 */ lw $v0, 0x14($s2) +/* CD8634 80241354 AE220074 */ sw $v0, 0x74($s1) +/* CD8638 80241358 8E0200B0 */ lw $v0, 0xb0($s0) +/* CD863C 8024135C 34420010 */ ori $v0, $v0, 0x10 +/* CD8640 80241360 AE0200B0 */ sw $v0, 0xb0($s0) +/* CD8644 80241364 8FBF0034 */ lw $ra, 0x34($sp) +/* CD8648 80241368 8FB20030 */ lw $s2, 0x30($sp) +/* CD864C 8024136C 8FB1002C */ lw $s1, 0x2c($sp) +/* CD8650 80241370 8FB00028 */ lw $s0, 0x28($sp) +/* CD8654 80241374 03E00008 */ jr $ra +/* CD8658 80241378 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s index 9fe700f069..7fb6c9cc63 100644 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_8024137C_CD865C.s @@ -46,7 +46,7 @@ glabel func_8024137C_CD865C /* CD8700 80241420 02A0202D */ daddu $a0, $s5, $zero /* CD8704 80241424 0240282D */ daddu $a1, $s2, $zero /* CD8708 80241428 0280302D */ daddu $a2, $s4, $zero -/* CD870C 8024142C 0C090496 */ jal func_80241258 +/* CD870C 8024142C 0C090496 */ jal func_80241258_CD8538 /* CD8710 80241430 0200382D */ daddu $a3, $s0, $zero .L80241434: /* CD8714 80241434 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_8024137C_CD865C /* CD8764 80241484 00000000 */ nop /* CD8768 80241488 0280202D */ daddu $a0, $s4, $zero /* CD876C 8024148C 0200282D */ daddu $a1, $s0, $zero -/* CD8770 80241490 0C09001C */ jal func_80240070 +/* CD8770 80241490 0C09001C */ jal func_80240070_CD7350 /* CD8774 80241494 0260302D */ daddu $a2, $s3, $zero /* CD8778 80241498 0280202D */ daddu $a0, $s4, $zero /* CD877C 8024149C 0200282D */ daddu $a1, $s0, $zero -/* CD8780 802414A0 0C090088 */ jal func_80240220 +/* CD8780 802414A0 0C090088 */ jal func_80240220_CD7500 /* CD8784 802414A4 0260302D */ daddu $a2, $s3, $zero /* CD8788 802414A8 08090551 */ j .L80241544 /* CD878C 802414AC 0000102D */ daddu $v0, $zero, $zero /* CD8790 802414B0 0280202D */ daddu $a0, $s4, $zero /* CD8794 802414B4 0200282D */ daddu $a1, $s0, $zero -/* CD8798 802414B8 0C090212 */ jal func_80240848 +/* CD8798 802414B8 0C090212 */ jal func_80240848_CD7B28 /* CD879C 802414BC 0260302D */ daddu $a2, $s3, $zero /* CD87A0 802414C0 0280202D */ daddu $a0, $s4, $zero /* CD87A4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* CD87A8 802414C8 0C090242 */ jal func_80240908 +/* CD87A8 802414C8 0C090242 */ jal func_80240908_CD7BE8 /* CD87AC 802414CC 0260302D */ daddu $a2, $s3, $zero /* CD87B0 802414D0 08090551 */ j .L80241544 /* CD87B4 802414D4 0000102D */ daddu $v0, $zero, $zero /* CD87B8 802414D8 0280202D */ daddu $a0, $s4, $zero /* CD87BC 802414DC 0200282D */ daddu $a1, $s0, $zero -/* CD87C0 802414E0 0C090313 */ jal func_80240C4C +/* CD87C0 802414E0 0C090313 */ jal func_80240C4C_CD7F2C /* CD87C4 802414E4 0260302D */ daddu $a2, $s3, $zero /* CD87C8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CD87CC 802414EC 0200282D */ daddu $a1, $s0, $zero -/* CD87D0 802414F0 0C090331 */ jal func_80240CC4 +/* CD87D0 802414F0 0C090331 */ jal func_80240CC4_CD7FA4 /* CD87D4 802414F4 0260302D */ daddu $a2, $s3, $zero /* CD87D8 802414F8 08090551 */ j .L80241544 /* CD87DC 802414FC 0000102D */ daddu $v0, $zero, $zero /* CD87E0 80241500 0280202D */ daddu $a0, $s4, $zero /* CD87E4 80241504 0200282D */ daddu $a1, $s0, $zero -/* CD87E8 80241508 0C09034C */ jal func_80240D30 +/* CD87E8 80241508 0C09034C */ jal func_80240D30_CD8010 /* CD87EC 8024150C 0260302D */ daddu $a2, $s3, $zero /* CD87F0 80241510 08090551 */ j .L80241544 /* CD87F4 80241514 0000102D */ daddu $v0, $zero, $zero /* CD87F8 80241518 0280202D */ daddu $a0, $s4, $zero /* CD87FC 8024151C 0200282D */ daddu $a1, $s0, $zero -/* CD8800 80241520 0C090399 */ jal func_80240E64 +/* CD8800 80241520 0C090399 */ jal func_80240E64_CD8144 /* CD8804 80241524 0260302D */ daddu $a2, $s3, $zero /* CD8808 80241528 08090551 */ j .L80241544 /* CD880C 8024152C 0000102D */ daddu $v0, $zero, $zero /* CD8810 80241530 0280202D */ daddu $a0, $s4, $zero /* CD8814 80241534 0200282D */ daddu $a1, $s0, $zero -/* CD8818 80241538 0C0903B2 */ jal func_80240EC8 +/* CD8818 80241538 0C0903B2 */ jal func_80240EC8_CD81A8 /* CD881C 8024153C 0260302D */ daddu $a2, $s3, $zero .L80241540: /* CD8820 80241540 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241568.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241568.s deleted file mode 100644 index 41480eb6ae..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241568.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241568 -/* CD8848 80241568 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CD884C 8024156C AFB00010 */ sw $s0, 0x10($sp) -/* CD8850 80241570 24100032 */ addiu $s0, $zero, 0x32 -/* CD8854 80241574 AFBF0014 */ sw $ra, 0x14($sp) -.L80241578: -/* CD8858 80241578 0C00FB3A */ jal get_enemy -/* CD885C 8024157C 0200202D */ daddu $a0, $s0, $zero -/* CD8860 80241580 8C420094 */ lw $v0, 0x94($v0) -/* CD8864 80241584 54400003 */ bnel $v0, $zero, .L80241594 -/* CD8868 80241588 26100001 */ addiu $s0, $s0, 1 -/* CD886C 8024158C 08090568 */ j .L802415A0 -/* CD8870 80241590 0200102D */ daddu $v0, $s0, $zero -.L80241594: -/* CD8874 80241594 2A020036 */ slti $v0, $s0, 0x36 -/* CD8878 80241598 1440FFF7 */ bnez $v0, .L80241578 -/* CD887C 8024159C 2402FFFF */ addiu $v0, $zero, -1 -.L802415A0: -/* CD8880 802415A0 8FBF0014 */ lw $ra, 0x14($sp) -/* CD8884 802415A4 8FB00010 */ lw $s0, 0x10($sp) -/* CD8888 802415A8 03E00008 */ jr $ra -/* CD888C 802415AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241568_CD8848.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241568_CD8848.s new file mode 100644 index 0000000000..c986ccf0cd --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241568_CD8848.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241568_CD8848 +/* CD8848 80241568 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CD884C 8024156C AFB00010 */ sw $s0, 0x10($sp) +/* CD8850 80241570 24100032 */ addiu $s0, $zero, 0x32 +/* CD8854 80241574 AFBF0014 */ sw $ra, 0x14($sp) +.L80241578: +/* CD8858 80241578 0C00FB3A */ jal get_enemy +/* CD885C 8024157C 0200202D */ daddu $a0, $s0, $zero +/* CD8860 80241580 8C420094 */ lw $v0, 0x94($v0) +/* CD8864 80241584 54400003 */ bnel $v0, $zero, .L80241594 +/* CD8868 80241588 26100001 */ addiu $s0, $s0, 1 +/* CD886C 8024158C 08090568 */ j .L802415A0 +/* CD8870 80241590 0200102D */ daddu $v0, $s0, $zero +.L80241594: +/* CD8874 80241594 2A020036 */ slti $v0, $s0, 0x36 +/* CD8878 80241598 1440FFF7 */ bnez $v0, .L80241578 +/* CD887C 8024159C 2402FFFF */ addiu $v0, $zero, -1 +.L802415A0: +/* CD8880 802415A0 8FBF0014 */ lw $ra, 0x14($sp) +/* CD8884 802415A4 8FB00010 */ lw $s0, 0x10($sp) +/* CD8888 802415A8 03E00008 */ jr $ra +/* CD888C 802415AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14.s deleted file mode 100644 index e3ae5b3fc1..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14.s +++ /dev/null @@ -1,156 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A14 -/* CD8CF4 80241A14 27BDFF98 */ addiu $sp, $sp, -0x68 -/* CD8CF8 80241A18 AFB20048 */ sw $s2, 0x48($sp) -/* CD8CFC 80241A1C 0080902D */ daddu $s2, $a0, $zero -/* CD8D00 80241A20 AFBF0054 */ sw $ra, 0x54($sp) -/* CD8D04 80241A24 AFB40050 */ sw $s4, 0x50($sp) -/* CD8D08 80241A28 AFB3004C */ sw $s3, 0x4c($sp) -/* CD8D0C 80241A2C AFB10044 */ sw $s1, 0x44($sp) -/* CD8D10 80241A30 AFB00040 */ sw $s0, 0x40($sp) -/* CD8D14 80241A34 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CD8D18 80241A38 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CD8D1C 80241A3C 8E510148 */ lw $s1, 0x148($s2) -/* CD8D20 80241A40 00A0982D */ daddu $s3, $a1, $zero -/* CD8D24 80241A44 86240008 */ lh $a0, 8($s1) -/* CD8D28 80241A48 0C00EABB */ jal get_npc_unsafe -/* CD8D2C 80241A4C 00C0A02D */ daddu $s4, $a2, $zero -/* CD8D30 80241A50 0040802D */ daddu $s0, $v0, $zero -/* CD8D34 80241A54 C6200078 */ lwc1 $f0, 0x78($s1) -/* CD8D38 80241A58 46800020 */ cvt.s.w $f0, $f0 -/* CD8D3C 80241A5C 46000021 */ cvt.d.s $f0, $f0 -/* CD8D40 80241A60 3C014059 */ lui $at, 0x4059 -/* CD8D44 80241A64 44814800 */ mtc1 $at, $f9 -/* CD8D48 80241A68 44804000 */ mtc1 $zero, $f8 -/* CD8D4C 80241A6C 8602008E */ lh $v0, 0x8e($s0) -/* CD8D50 80241A70 9603008E */ lhu $v1, 0x8e($s0) -/* CD8D54 80241A74 46280003 */ div.d $f0, $f0, $f8 -/* CD8D58 80241A78 18400003 */ blez $v0, .L80241A88 -/* CD8D5C 80241A7C 462005A0 */ cvt.s.d $f22, $f0 -/* CD8D60 80241A80 2462FFFF */ addiu $v0, $v1, -1 -/* CD8D64 80241A84 A602008E */ sh $v0, 0x8e($s0) -.L80241A88: -/* CD8D68 80241A88 27A50028 */ addiu $a1, $sp, 0x28 -/* CD8D6C 80241A8C 27A6002C */ addiu $a2, $sp, 0x2c -/* CD8D70 80241A90 27A70030 */ addiu $a3, $sp, 0x30 -/* CD8D74 80241A94 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD8D78 80241A98 C602003C */ lwc1 $f2, 0x3c($s0) -/* CD8D7C 80241A9C C6040040 */ lwc1 $f4, 0x40($s0) -/* CD8D80 80241AA0 3C01447A */ lui $at, 0x447a -/* CD8D84 80241AA4 44813000 */ mtc1 $at, $f6 -/* CD8D88 80241AA8 27A20034 */ addiu $v0, $sp, 0x34 -/* CD8D8C 80241AAC E7A00028 */ swc1 $f0, 0x28($sp) -/* CD8D90 80241AB0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CD8D94 80241AB4 E7A40030 */ swc1 $f4, 0x30($sp) -/* CD8D98 80241AB8 E7A60034 */ swc1 $f6, 0x34($sp) -/* CD8D9C 80241ABC C6340070 */ lwc1 $f20, 0x70($s1) -/* CD8DA0 80241AC0 4680A520 */ cvt.s.w $f20, $f20 -/* CD8DA4 80241AC4 4600A521 */ cvt.d.s $f20, $f20 -/* CD8DA8 80241AC8 4628A503 */ div.d $f20, $f20, $f8 -/* CD8DAC 80241ACC AFA20010 */ sw $v0, 0x10($sp) -/* CD8DB0 80241AD0 8E040080 */ lw $a0, 0x80($s0) -/* CD8DB4 80241AD4 0C0372DF */ jal func_800DCB7C -/* CD8DB8 80241AD8 4620A520 */ cvt.s.d $f20, $f20 -/* CD8DBC 80241ADC C62C0074 */ lwc1 $f12, 0x74($s1) -/* CD8DC0 80241AE0 0C00A8BB */ jal sin_deg -/* CD8DC4 80241AE4 46806320 */ cvt.s.w $f12, $f12 -/* CD8DC8 80241AE8 46140002 */ mul.s $f0, $f0, $f20 -/* CD8DCC 80241AEC 00000000 */ nop -/* CD8DD0 80241AF0 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* CD8DD4 80241AF4 46161080 */ add.s $f2, $f2, $f22 -/* CD8DD8 80241AF8 46001080 */ add.s $f2, $f2, $f0 -/* CD8DDC 80241AFC E602003C */ swc1 $f2, 0x3c($s0) -/* CD8DE0 80241B00 8E220074 */ lw $v0, 0x74($s1) -/* CD8DE4 80241B04 2442000C */ addiu $v0, $v0, 0xc -/* CD8DE8 80241B08 44826000 */ mtc1 $v0, $f12 -/* CD8DEC 80241B0C 00000000 */ nop -/* CD8DF0 80241B10 0C00A6C9 */ jal clamp_angle -/* CD8DF4 80241B14 46806320 */ cvt.s.w $f12, $f12 -/* CD8DF8 80241B18 4600028D */ trunc.w.s $f10, $f0 -/* CD8DFC 80241B1C E62A0074 */ swc1 $f10, 0x74($s1) -/* CD8E00 80241B20 0280202D */ daddu $a0, $s4, $zero -/* CD8E04 80241B24 24020001 */ addiu $v0, $zero, 1 -/* CD8E08 80241B28 AFA20010 */ sw $v0, 0x10($sp) -/* CD8E0C 80241B2C 8E660024 */ lw $a2, 0x24($s3) -/* CD8E10 80241B30 8E670028 */ lw $a3, 0x28($s3) -/* CD8E14 80241B34 0C01242D */ jal func_800490B4 -/* CD8E18 80241B38 0220282D */ daddu $a1, $s1, $zero -/* CD8E1C 80241B3C 1040001D */ beqz $v0, .L80241BB4 -/* CD8E20 80241B40 0000202D */ daddu $a0, $zero, $zero -/* CD8E24 80241B44 0200282D */ daddu $a1, $s0, $zero -/* CD8E28 80241B48 0000302D */ daddu $a2, $zero, $zero -/* CD8E2C 80241B4C 860300A8 */ lh $v1, 0xa8($s0) -/* CD8E30 80241B50 3C013F80 */ lui $at, 0x3f80 -/* CD8E34 80241B54 44810000 */ mtc1 $at, $f0 -/* CD8E38 80241B58 3C014000 */ lui $at, 0x4000 -/* CD8E3C 80241B5C 44811000 */ mtc1 $at, $f2 -/* CD8E40 80241B60 3C01C1A0 */ lui $at, 0xc1a0 -/* CD8E44 80241B64 44812000 */ mtc1 $at, $f4 -/* CD8E48 80241B68 2402000F */ addiu $v0, $zero, 0xf -/* CD8E4C 80241B6C AFA2001C */ sw $v0, 0x1c($sp) -/* CD8E50 80241B70 44835000 */ mtc1 $v1, $f10 -/* CD8E54 80241B74 00000000 */ nop -/* CD8E58 80241B78 468052A0 */ cvt.s.w $f10, $f10 -/* CD8E5C 80241B7C 44075000 */ mfc1 $a3, $f10 -/* CD8E60 80241B80 27A20038 */ addiu $v0, $sp, 0x38 -/* CD8E64 80241B84 AFA20020 */ sw $v0, 0x20($sp) -/* CD8E68 80241B88 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD8E6C 80241B8C E7A20014 */ swc1 $f2, 0x14($sp) -/* CD8E70 80241B90 0C01BFA4 */ jal fx_emote -/* CD8E74 80241B94 E7A40018 */ swc1 $f4, 0x18($sp) -/* CD8E78 80241B98 0200202D */ daddu $a0, $s0, $zero -/* CD8E7C 80241B9C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CD8E80 80241BA0 0C012530 */ jal func_800494C0 -/* CD8E84 80241BA4 3C060020 */ lui $a2, 0x20 -/* CD8E88 80241BA8 2402000C */ addiu $v0, $zero, 0xc -/* CD8E8C 80241BAC 0809070F */ j .L80241C3C -/* CD8E90 80241BB0 AE420070 */ sw $v0, 0x70($s2) -.L80241BB4: -/* CD8E94 80241BB4 8602008C */ lh $v0, 0x8c($s0) -/* CD8E98 80241BB8 14400020 */ bnez $v0, .L80241C3C -/* CD8E9C 80241BBC 00000000 */ nop -/* CD8EA0 80241BC0 8602008E */ lh $v0, 0x8e($s0) -/* CD8EA4 80241BC4 1C40001D */ bgtz $v0, .L80241C3C -/* CD8EA8 80241BC8 00000000 */ nop -/* CD8EAC 80241BCC 8E420074 */ lw $v0, 0x74($s2) -/* CD8EB0 80241BD0 2442FFFF */ addiu $v0, $v0, -1 -/* CD8EB4 80241BD4 18400018 */ blez $v0, .L80241C38 -/* CD8EB8 80241BD8 AE420074 */ sw $v0, 0x74($s2) -/* CD8EBC 80241BDC C600000C */ lwc1 $f0, 0xc($s0) -/* CD8EC0 80241BE0 3C014334 */ lui $at, 0x4334 -/* CD8EC4 80241BE4 44816000 */ mtc1 $at, $f12 -/* CD8EC8 80241BE8 0C00A6C9 */ jal clamp_angle -/* CD8ECC 80241BEC 460C0300 */ add.s $f12, $f0, $f12 -/* CD8ED0 80241BF0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CD8ED4 80241BF4 0C00A67F */ jal rand_int -/* CD8ED8 80241BF8 E600000C */ swc1 $f0, 0xc($s0) -/* CD8EDC 80241BFC 3C032E8B */ lui $v1, 0x2e8b -/* CD8EE0 80241C00 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CD8EE4 80241C04 00430018 */ mult $v0, $v1 -/* CD8EE8 80241C08 00021FC3 */ sra $v1, $v0, 0x1f -/* CD8EEC 80241C0C 00004010 */ mfhi $t0 -/* CD8EF0 80241C10 00082043 */ sra $a0, $t0, 1 -/* CD8EF4 80241C14 00832023 */ subu $a0, $a0, $v1 -/* CD8EF8 80241C18 00041840 */ sll $v1, $a0, 1 -/* CD8EFC 80241C1C 00641821 */ addu $v1, $v1, $a0 -/* CD8F00 80241C20 00031880 */ sll $v1, $v1, 2 -/* CD8F04 80241C24 00641823 */ subu $v1, $v1, $a0 -/* CD8F08 80241C28 00431023 */ subu $v0, $v0, $v1 -/* CD8F0C 80241C2C 24420005 */ addiu $v0, $v0, 5 -/* CD8F10 80241C30 0809070F */ j .L80241C3C -/* CD8F14 80241C34 A602008E */ sh $v0, 0x8e($s0) -.L80241C38: -/* CD8F18 80241C38 AE400070 */ sw $zero, 0x70($s2) -.L80241C3C: -/* CD8F1C 80241C3C 8FBF0054 */ lw $ra, 0x54($sp) -/* CD8F20 80241C40 8FB40050 */ lw $s4, 0x50($sp) -/* CD8F24 80241C44 8FB3004C */ lw $s3, 0x4c($sp) -/* CD8F28 80241C48 8FB20048 */ lw $s2, 0x48($sp) -/* CD8F2C 80241C4C 8FB10044 */ lw $s1, 0x44($sp) -/* CD8F30 80241C50 8FB00040 */ lw $s0, 0x40($sp) -/* CD8F34 80241C54 D7B60060 */ ldc1 $f22, 0x60($sp) -/* CD8F38 80241C58 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CD8F3C 80241C5C 03E00008 */ jr $ra -/* CD8F40 80241C60 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s new file mode 100644 index 0000000000..a0327cb53e --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241A14_CD8CF4.s @@ -0,0 +1,156 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A14_CD8CF4 +/* CD8CF4 80241A14 27BDFF98 */ addiu $sp, $sp, -0x68 +/* CD8CF8 80241A18 AFB20048 */ sw $s2, 0x48($sp) +/* CD8CFC 80241A1C 0080902D */ daddu $s2, $a0, $zero +/* CD8D00 80241A20 AFBF0054 */ sw $ra, 0x54($sp) +/* CD8D04 80241A24 AFB40050 */ sw $s4, 0x50($sp) +/* CD8D08 80241A28 AFB3004C */ sw $s3, 0x4c($sp) +/* CD8D0C 80241A2C AFB10044 */ sw $s1, 0x44($sp) +/* CD8D10 80241A30 AFB00040 */ sw $s0, 0x40($sp) +/* CD8D14 80241A34 F7B60060 */ sdc1 $f22, 0x60($sp) +/* CD8D18 80241A38 F7B40058 */ sdc1 $f20, 0x58($sp) +/* CD8D1C 80241A3C 8E510148 */ lw $s1, 0x148($s2) +/* CD8D20 80241A40 00A0982D */ daddu $s3, $a1, $zero +/* CD8D24 80241A44 86240008 */ lh $a0, 8($s1) +/* CD8D28 80241A48 0C00EABB */ jal get_npc_unsafe +/* CD8D2C 80241A4C 00C0A02D */ daddu $s4, $a2, $zero +/* CD8D30 80241A50 0040802D */ daddu $s0, $v0, $zero +/* CD8D34 80241A54 C6200078 */ lwc1 $f0, 0x78($s1) +/* CD8D38 80241A58 46800020 */ cvt.s.w $f0, $f0 +/* CD8D3C 80241A5C 46000021 */ cvt.d.s $f0, $f0 +/* CD8D40 80241A60 3C014059 */ lui $at, 0x4059 +/* CD8D44 80241A64 44814800 */ mtc1 $at, $f9 +/* CD8D48 80241A68 44804000 */ mtc1 $zero, $f8 +/* CD8D4C 80241A6C 8602008E */ lh $v0, 0x8e($s0) +/* CD8D50 80241A70 9603008E */ lhu $v1, 0x8e($s0) +/* CD8D54 80241A74 46280003 */ div.d $f0, $f0, $f8 +/* CD8D58 80241A78 18400003 */ blez $v0, .L80241A88 +/* CD8D5C 80241A7C 462005A0 */ cvt.s.d $f22, $f0 +/* CD8D60 80241A80 2462FFFF */ addiu $v0, $v1, -1 +/* CD8D64 80241A84 A602008E */ sh $v0, 0x8e($s0) +.L80241A88: +/* CD8D68 80241A88 27A50028 */ addiu $a1, $sp, 0x28 +/* CD8D6C 80241A8C 27A6002C */ addiu $a2, $sp, 0x2c +/* CD8D70 80241A90 27A70030 */ addiu $a3, $sp, 0x30 +/* CD8D74 80241A94 C6000038 */ lwc1 $f0, 0x38($s0) +/* CD8D78 80241A98 C602003C */ lwc1 $f2, 0x3c($s0) +/* CD8D7C 80241A9C C6040040 */ lwc1 $f4, 0x40($s0) +/* CD8D80 80241AA0 3C01447A */ lui $at, 0x447a +/* CD8D84 80241AA4 44813000 */ mtc1 $at, $f6 +/* CD8D88 80241AA8 27A20034 */ addiu $v0, $sp, 0x34 +/* CD8D8C 80241AAC E7A00028 */ swc1 $f0, 0x28($sp) +/* CD8D90 80241AB0 E7A2002C */ swc1 $f2, 0x2c($sp) +/* CD8D94 80241AB4 E7A40030 */ swc1 $f4, 0x30($sp) +/* CD8D98 80241AB8 E7A60034 */ swc1 $f6, 0x34($sp) +/* CD8D9C 80241ABC C6340070 */ lwc1 $f20, 0x70($s1) +/* CD8DA0 80241AC0 4680A520 */ cvt.s.w $f20, $f20 +/* CD8DA4 80241AC4 4600A521 */ cvt.d.s $f20, $f20 +/* CD8DA8 80241AC8 4628A503 */ div.d $f20, $f20, $f8 +/* CD8DAC 80241ACC AFA20010 */ sw $v0, 0x10($sp) +/* CD8DB0 80241AD0 8E040080 */ lw $a0, 0x80($s0) +/* CD8DB4 80241AD4 0C0372DF */ jal func_800DCB7C +/* CD8DB8 80241AD8 4620A520 */ cvt.s.d $f20, $f20 +/* CD8DBC 80241ADC C62C0074 */ lwc1 $f12, 0x74($s1) +/* CD8DC0 80241AE0 0C00A8BB */ jal sin_deg +/* CD8DC4 80241AE4 46806320 */ cvt.s.w $f12, $f12 +/* CD8DC8 80241AE8 46140002 */ mul.s $f0, $f0, $f20 +/* CD8DCC 80241AEC 00000000 */ nop +/* CD8DD0 80241AF0 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* CD8DD4 80241AF4 46161080 */ add.s $f2, $f2, $f22 +/* CD8DD8 80241AF8 46001080 */ add.s $f2, $f2, $f0 +/* CD8DDC 80241AFC E602003C */ swc1 $f2, 0x3c($s0) +/* CD8DE0 80241B00 8E220074 */ lw $v0, 0x74($s1) +/* CD8DE4 80241B04 2442000C */ addiu $v0, $v0, 0xc +/* CD8DE8 80241B08 44826000 */ mtc1 $v0, $f12 +/* CD8DEC 80241B0C 00000000 */ nop +/* CD8DF0 80241B10 0C00A6C9 */ jal clamp_angle +/* CD8DF4 80241B14 46806320 */ cvt.s.w $f12, $f12 +/* CD8DF8 80241B18 4600028D */ trunc.w.s $f10, $f0 +/* CD8DFC 80241B1C E62A0074 */ swc1 $f10, 0x74($s1) +/* CD8E00 80241B20 0280202D */ daddu $a0, $s4, $zero +/* CD8E04 80241B24 24020001 */ addiu $v0, $zero, 1 +/* CD8E08 80241B28 AFA20010 */ sw $v0, 0x10($sp) +/* CD8E0C 80241B2C 8E660024 */ lw $a2, 0x24($s3) +/* CD8E10 80241B30 8E670028 */ lw $a3, 0x28($s3) +/* CD8E14 80241B34 0C01242D */ jal func_800490B4 +/* CD8E18 80241B38 0220282D */ daddu $a1, $s1, $zero +/* CD8E1C 80241B3C 1040001D */ beqz $v0, .L80241BB4 +/* CD8E20 80241B40 0000202D */ daddu $a0, $zero, $zero +/* CD8E24 80241B44 0200282D */ daddu $a1, $s0, $zero +/* CD8E28 80241B48 0000302D */ daddu $a2, $zero, $zero +/* CD8E2C 80241B4C 860300A8 */ lh $v1, 0xa8($s0) +/* CD8E30 80241B50 3C013F80 */ lui $at, 0x3f80 +/* CD8E34 80241B54 44810000 */ mtc1 $at, $f0 +/* CD8E38 80241B58 3C014000 */ lui $at, 0x4000 +/* CD8E3C 80241B5C 44811000 */ mtc1 $at, $f2 +/* CD8E40 80241B60 3C01C1A0 */ lui $at, 0xc1a0 +/* CD8E44 80241B64 44812000 */ mtc1 $at, $f4 +/* CD8E48 80241B68 2402000F */ addiu $v0, $zero, 0xf +/* CD8E4C 80241B6C AFA2001C */ sw $v0, 0x1c($sp) +/* CD8E50 80241B70 44835000 */ mtc1 $v1, $f10 +/* CD8E54 80241B74 00000000 */ nop +/* CD8E58 80241B78 468052A0 */ cvt.s.w $f10, $f10 +/* CD8E5C 80241B7C 44075000 */ mfc1 $a3, $f10 +/* CD8E60 80241B80 27A20038 */ addiu $v0, $sp, 0x38 +/* CD8E64 80241B84 AFA20020 */ sw $v0, 0x20($sp) +/* CD8E68 80241B88 E7A00010 */ swc1 $f0, 0x10($sp) +/* CD8E6C 80241B8C E7A20014 */ swc1 $f2, 0x14($sp) +/* CD8E70 80241B90 0C01BFA4 */ jal fx_emote +/* CD8E74 80241B94 E7A40018 */ swc1 $f4, 0x18($sp) +/* CD8E78 80241B98 0200202D */ daddu $a0, $s0, $zero +/* CD8E7C 80241B9C 240502F4 */ addiu $a1, $zero, 0x2f4 +/* CD8E80 80241BA0 0C012530 */ jal func_800494C0 +/* CD8E84 80241BA4 3C060020 */ lui $a2, 0x20 +/* CD8E88 80241BA8 2402000C */ addiu $v0, $zero, 0xc +/* CD8E8C 80241BAC 0809070F */ j .L80241C3C +/* CD8E90 80241BB0 AE420070 */ sw $v0, 0x70($s2) +.L80241BB4: +/* CD8E94 80241BB4 8602008C */ lh $v0, 0x8c($s0) +/* CD8E98 80241BB8 14400020 */ bnez $v0, .L80241C3C +/* CD8E9C 80241BBC 00000000 */ nop +/* CD8EA0 80241BC0 8602008E */ lh $v0, 0x8e($s0) +/* CD8EA4 80241BC4 1C40001D */ bgtz $v0, .L80241C3C +/* CD8EA8 80241BC8 00000000 */ nop +/* CD8EAC 80241BCC 8E420074 */ lw $v0, 0x74($s2) +/* CD8EB0 80241BD0 2442FFFF */ addiu $v0, $v0, -1 +/* CD8EB4 80241BD4 18400018 */ blez $v0, .L80241C38 +/* CD8EB8 80241BD8 AE420074 */ sw $v0, 0x74($s2) +/* CD8EBC 80241BDC C600000C */ lwc1 $f0, 0xc($s0) +/* CD8EC0 80241BE0 3C014334 */ lui $at, 0x4334 +/* CD8EC4 80241BE4 44816000 */ mtc1 $at, $f12 +/* CD8EC8 80241BE8 0C00A6C9 */ jal clamp_angle +/* CD8ECC 80241BEC 460C0300 */ add.s $f12, $f0, $f12 +/* CD8ED0 80241BF0 240403E8 */ addiu $a0, $zero, 0x3e8 +/* CD8ED4 80241BF4 0C00A67F */ jal rand_int +/* CD8ED8 80241BF8 E600000C */ swc1 $f0, 0xc($s0) +/* CD8EDC 80241BFC 3C032E8B */ lui $v1, 0x2e8b +/* CD8EE0 80241C00 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* CD8EE4 80241C04 00430018 */ mult $v0, $v1 +/* CD8EE8 80241C08 00021FC3 */ sra $v1, $v0, 0x1f +/* CD8EEC 80241C0C 00004010 */ mfhi $t0 +/* CD8EF0 80241C10 00082043 */ sra $a0, $t0, 1 +/* CD8EF4 80241C14 00832023 */ subu $a0, $a0, $v1 +/* CD8EF8 80241C18 00041840 */ sll $v1, $a0, 1 +/* CD8EFC 80241C1C 00641821 */ addu $v1, $v1, $a0 +/* CD8F00 80241C20 00031880 */ sll $v1, $v1, 2 +/* CD8F04 80241C24 00641823 */ subu $v1, $v1, $a0 +/* CD8F08 80241C28 00431023 */ subu $v0, $v0, $v1 +/* CD8F0C 80241C2C 24420005 */ addiu $v0, $v0, 5 +/* CD8F10 80241C30 0809070F */ j .L80241C3C +/* CD8F14 80241C34 A602008E */ sh $v0, 0x8e($s0) +.L80241C38: +/* CD8F18 80241C38 AE400070 */ sw $zero, 0x70($s2) +.L80241C3C: +/* CD8F1C 80241C3C 8FBF0054 */ lw $ra, 0x54($sp) +/* CD8F20 80241C40 8FB40050 */ lw $s4, 0x50($sp) +/* CD8F24 80241C44 8FB3004C */ lw $s3, 0x4c($sp) +/* CD8F28 80241C48 8FB20048 */ lw $s2, 0x48($sp) +/* CD8F2C 80241C4C 8FB10044 */ lw $s1, 0x44($sp) +/* CD8F30 80241C50 8FB00040 */ lw $s0, 0x40($sp) +/* CD8F34 80241C54 D7B60060 */ ldc1 $f22, 0x60($sp) +/* CD8F38 80241C58 D7B40058 */ ldc1 $f20, 0x58($sp) +/* CD8F3C 80241C5C 03E00008 */ jr $ra +/* CD8F40 80241C60 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64.s deleted file mode 100644 index 51acb34d20..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64.s +++ /dev/null @@ -1,341 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C64 -/* CD8F44 80241C64 27BDFF98 */ addiu $sp, $sp, -0x68 -/* CD8F48 80241C68 AFB40050 */ sw $s4, 0x50($sp) -/* CD8F4C 80241C6C 0080A02D */ daddu $s4, $a0, $zero -/* CD8F50 80241C70 AFBF005C */ sw $ra, 0x5c($sp) -/* CD8F54 80241C74 AFB60058 */ sw $s6, 0x58($sp) -/* CD8F58 80241C78 AFB50054 */ sw $s5, 0x54($sp) -/* CD8F5C 80241C7C AFB3004C */ sw $s3, 0x4c($sp) -/* CD8F60 80241C80 AFB20048 */ sw $s2, 0x48($sp) -/* CD8F64 80241C84 AFB10044 */ sw $s1, 0x44($sp) -/* CD8F68 80241C88 AFB00040 */ sw $s0, 0x40($sp) -/* CD8F6C 80241C8C F7B40060 */ sdc1 $f20, 0x60($sp) -/* CD8F70 80241C90 8E930148 */ lw $s3, 0x148($s4) -/* CD8F74 80241C94 86640008 */ lh $a0, 8($s3) -/* CD8F78 80241C98 8E90000C */ lw $s0, 0xc($s4) -/* CD8F7C 80241C9C 0C00EABB */ jal get_npc_unsafe -/* CD8F80 80241CA0 00A0882D */ daddu $s1, $a1, $zero -/* CD8F84 80241CA4 0280202D */ daddu $a0, $s4, $zero -/* CD8F88 80241CA8 8E050000 */ lw $a1, ($s0) -/* CD8F8C 80241CAC 0C0B1EAF */ jal get_variable -/* CD8F90 80241CB0 0040902D */ daddu $s2, $v0, $zero -/* CD8F94 80241CB4 AFA00020 */ sw $zero, 0x20($sp) -/* CD8F98 80241CB8 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8F9C 80241CBC 8C630030 */ lw $v1, 0x30($v1) -/* CD8FA0 80241CC0 AFA30024 */ sw $v1, 0x24($sp) -/* CD8FA4 80241CC4 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8FA8 80241CC8 8C63001C */ lw $v1, 0x1c($v1) -/* CD8FAC 80241CCC AFA30028 */ sw $v1, 0x28($sp) -/* CD8FB0 80241CD0 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8FB4 80241CD4 8C630024 */ lw $v1, 0x24($v1) -/* CD8FB8 80241CD8 AFA3002C */ sw $v1, 0x2c($sp) -/* CD8FBC 80241CDC 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8FC0 80241CE0 8C630028 */ lw $v1, 0x28($v1) -/* CD8FC4 80241CE4 27B50020 */ addiu $s5, $sp, 0x20 -/* CD8FC8 80241CE8 AFA30030 */ sw $v1, 0x30($sp) -/* CD8FCC 80241CEC 8E6300D0 */ lw $v1, 0xd0($s3) -/* CD8FD0 80241CF0 3C0142F0 */ lui $at, 0x42f0 -/* CD8FD4 80241CF4 44810000 */ mtc1 $at, $f0 -/* CD8FD8 80241CF8 8C63002C */ lw $v1, 0x2c($v1) -/* CD8FDC 80241CFC 0040B02D */ daddu $s6, $v0, $zero -/* CD8FE0 80241D00 E7A00038 */ swc1 $f0, 0x38($sp) -/* CD8FE4 80241D04 A7A0003C */ sh $zero, 0x3c($sp) -/* CD8FE8 80241D08 12200007 */ beqz $s1, .L80241D28 -/* CD8FEC 80241D0C AFA30034 */ sw $v1, 0x34($sp) -/* CD8FF0 80241D10 0240202D */ daddu $a0, $s2, $zero -/* CD8FF4 80241D14 0260282D */ daddu $a1, $s3, $zero -/* CD8FF8 80241D18 0280302D */ daddu $a2, $s4, $zero -/* CD8FFC 80241D1C 0C090496 */ jal func_80241258 -/* CD9000 80241D20 02C0382D */ daddu $a3, $s6, $zero -/* CD9004 80241D24 AE800070 */ sw $zero, 0x70($s4) -.L80241D28: -/* CD9008 80241D28 2402FFFD */ addiu $v0, $zero, -3 -/* CD900C 80241D2C A24200AB */ sb $v0, 0xab($s2) -/* CD9010 80241D30 8E6300B0 */ lw $v1, 0xb0($s3) -/* CD9014 80241D34 30620004 */ andi $v0, $v1, 4 -/* CD9018 80241D38 10400007 */ beqz $v0, .L80241D58 -/* CD901C 80241D3C 00000000 */ nop -/* CD9020 80241D40 826200B4 */ lb $v0, 0xb4($s3) -/* CD9024 80241D44 144000F4 */ bnez $v0, .L80242118 -/* CD9028 80241D48 0000102D */ daddu $v0, $zero, $zero -/* CD902C 80241D4C 2402FFFB */ addiu $v0, $zero, -5 -/* CD9030 80241D50 00621024 */ and $v0, $v1, $v0 -/* CD9034 80241D54 AE6200B0 */ sw $v0, 0xb0($s3) -.L80241D58: -/* CD9038 80241D58 8E830070 */ lw $v1, 0x70($s4) -/* CD903C 80241D5C 24020001 */ addiu $v0, $zero, 1 -/* CD9040 80241D60 10620011 */ beq $v1, $v0, .L80241DA8 -/* CD9044 80241D64 28620002 */ slti $v0, $v1, 2 -/* CD9048 80241D68 10400005 */ beqz $v0, .L80241D80 -/* CD904C 80241D6C 24020002 */ addiu $v0, $zero, 2 -/* CD9050 80241D70 10600009 */ beqz $v1, .L80241D98 -/* CD9054 80241D74 2402000C */ addiu $v0, $zero, 0xc -/* CD9058 80241D78 0809077A */ j .L80241DE8 -/* CD905C 80241D7C 00000000 */ nop -.L80241D80: -/* CD9060 80241D80 1062000F */ beq $v1, $v0, .L80241DC0 -/* CD9064 80241D84 24020003 */ addiu $v0, $zero, 3 -/* CD9068 80241D88 10620012 */ beq $v1, $v0, .L80241DD4 -/* CD906C 80241D8C 0280202D */ daddu $a0, $s4, $zero -/* CD9070 80241D90 08090778 */ j .L80241DE0 -/* CD9074 80241D94 00000000 */ nop -.L80241D98: -/* CD9078 80241D98 0280202D */ daddu $a0, $s4, $zero -/* CD907C 80241D9C 02C0282D */ daddu $a1, $s6, $zero -/* CD9080 80241DA0 0C09001C */ jal func_80240070 -/* CD9084 80241DA4 02A0302D */ daddu $a2, $s5, $zero -.L80241DA8: -/* CD9088 80241DA8 0280202D */ daddu $a0, $s4, $zero -/* CD908C 80241DAC 02C0282D */ daddu $a1, $s6, $zero -/* CD9090 80241DB0 0C09056C */ jal func_802415B0 -/* CD9094 80241DB4 02A0302D */ daddu $a2, $s5, $zero -/* CD9098 80241DB8 08090778 */ j .L80241DE0 -/* CD909C 80241DBC 00000000 */ nop -.L80241DC0: -/* CD90A0 80241DC0 0280202D */ daddu $a0, $s4, $zero -/* CD90A4 80241DC4 02C0282D */ daddu $a1, $s6, $zero -/* CD90A8 80241DC8 0C090212 */ jal func_80240848 -/* CD90AC 80241DCC 02A0302D */ daddu $a2, $s5, $zero -/* CD90B0 80241DD0 0280202D */ daddu $a0, $s4, $zero -.L80241DD4: -/* CD90B4 80241DD4 02C0282D */ daddu $a1, $s6, $zero -/* CD90B8 80241DD8 0C090685 */ jal func_80241A14 -/* CD90BC 80241DDC 02A0302D */ daddu $a2, $s5, $zero -.L80241DE0: -/* CD90C0 80241DE0 8E830070 */ lw $v1, 0x70($s4) -/* CD90C4 80241DE4 2402000C */ addiu $v0, $zero, 0xc -.L80241DE8: -/* CD90C8 80241DE8 1462001A */ bne $v1, $v0, .L80241E54 -/* CD90CC 80241DEC 00000000 */ nop -/* CD90D0 80241DF0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CD90D4 80241DF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CD90D8 80241DF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CD90DC 80241DFC C64E0040 */ lwc1 $f14, 0x40($s2) -/* CD90E0 80241E00 8C460028 */ lw $a2, 0x28($v0) -/* CD90E4 80241E04 0C00A720 */ jal atan2 -/* CD90E8 80241E08 8C470030 */ lw $a3, 0x30($v0) -/* CD90EC 80241E0C 0C09055A */ jal func_80241568 -/* CD90F0 80241E10 E640000C */ swc1 $f0, 0xc($s2) -/* CD90F4 80241E14 0440000F */ bltz $v0, .L80241E54 -/* CD90F8 80241E18 AE62007C */ sw $v0, 0x7c($s3) -/* CD90FC 80241E1C 0C00FB3A */ jal get_enemy -/* CD9100 80241E20 0040202D */ daddu $a0, $v0, $zero -/* CD9104 80241E24 3C030049 */ lui $v1, 0x49 -/* CD9108 80241E28 0040202D */ daddu $a0, $v0, $zero -/* CD910C 80241E2C 24020001 */ addiu $v0, $zero, 1 -/* CD9110 80241E30 AC820094 */ sw $v0, 0x94($a0) -/* CD9114 80241E34 86620008 */ lh $v0, 8($s3) -/* CD9118 80241E38 34630014 */ ori $v1, $v1, 0x14 -/* CD911C 80241E3C AC820098 */ sw $v0, 0x98($a0) -/* CD9120 80241E40 2402000F */ addiu $v0, $zero, 0xf -/* CD9124 80241E44 A642008E */ sh $v0, 0x8e($s2) -/* CD9128 80241E48 2402001E */ addiu $v0, $zero, 0x1e -/* CD912C 80241E4C AE430028 */ sw $v1, 0x28($s2) -/* CD9130 80241E50 AE820070 */ sw $v0, 0x70($s4) -.L80241E54: -/* CD9134 80241E54 8E830070 */ lw $v1, 0x70($s4) -/* CD9138 80241E58 2402000D */ addiu $v0, $zero, 0xd -/* CD913C 80241E5C 10620010 */ beq $v1, $v0, .L80241EA0 -/* CD9140 80241E60 2862000E */ slti $v0, $v1, 0xe -/* CD9144 80241E64 10400005 */ beqz $v0, .L80241E7C -/* CD9148 80241E68 2402000C */ addiu $v0, $zero, 0xc -/* CD914C 80241E6C 10620008 */ beq $v1, $v0, .L80241E90 -/* CD9150 80241E70 2410001F */ addiu $s0, $zero, 0x1f -/* CD9154 80241E74 080907B3 */ j .L80241ECC -/* CD9158 80241E78 00000000 */ nop -.L80241E7C: -/* CD915C 80241E7C 2402000E */ addiu $v0, $zero, 0xe -/* CD9160 80241E80 1062000D */ beq $v1, $v0, .L80241EB8 -/* CD9164 80241E84 0280202D */ daddu $a0, $s4, $zero -/* CD9168 80241E88 080907B1 */ j .L80241EC4 -/* CD916C 80241E8C 00000000 */ nop -.L80241E90: -/* CD9170 80241E90 0280202D */ daddu $a0, $s4, $zero -/* CD9174 80241E94 02C0282D */ daddu $a1, $s6, $zero -/* CD9178 80241E98 0C09034C */ jal func_80240D30 -/* CD917C 80241E9C 02A0302D */ daddu $a2, $s5, $zero -.L80241EA0: -/* CD9180 80241EA0 0280202D */ daddu $a0, $s4, $zero -/* CD9184 80241EA4 02C0282D */ daddu $a1, $s6, $zero -/* CD9188 80241EA8 0C090399 */ jal func_80240E64 -/* CD918C 80241EAC 02A0302D */ daddu $a2, $s5, $zero -/* CD9190 80241EB0 080907B1 */ j .L80241EC4 -/* CD9194 80241EB4 00000000 */ nop -.L80241EB8: -/* CD9198 80241EB8 02C0282D */ daddu $a1, $s6, $zero -/* CD919C 80241EBC 0C0903B2 */ jal func_80240EC8 -/* CD91A0 80241EC0 02A0302D */ daddu $a2, $s5, $zero -.L80241EC4: -/* CD91A4 80241EC4 8E830070 */ lw $v1, 0x70($s4) -/* CD91A8 80241EC8 2410001F */ addiu $s0, $zero, 0x1f -.L80241ECC: -/* CD91AC 80241ECC 1070001B */ beq $v1, $s0, .L80241F3C -/* CD91B0 80241ED0 28620020 */ slti $v0, $v1, 0x20 -/* CD91B4 80241ED4 10400005 */ beqz $v0, .L80241EEC -/* CD91B8 80241ED8 2402001E */ addiu $v0, $zero, 0x1e -/* CD91BC 80241EDC 1062000A */ beq $v1, $v0, .L80241F08 -/* CD91C0 80241EE0 00000000 */ nop -/* CD91C4 80241EE4 080907EE */ j .L80241FB8 -/* CD91C8 80241EE8 00000000 */ nop -.L80241EEC: -/* CD91CC 80241EEC 24020020 */ addiu $v0, $zero, 0x20 -/* CD91D0 80241EF0 10620022 */ beq $v1, $v0, .L80241F7C -/* CD91D4 80241EF4 24020021 */ addiu $v0, $zero, 0x21 -/* CD91D8 80241EF8 10620029 */ beq $v1, $v0, .L80241FA0 -/* CD91DC 80241EFC 00000000 */ nop -/* CD91E0 80241F00 080907EE */ j .L80241FB8 -/* CD91E4 80241F04 00000000 */ nop -.L80241F08: -/* CD91E8 80241F08 9642008E */ lhu $v0, 0x8e($s2) -/* CD91EC 80241F0C 2442FFFF */ addiu $v0, $v0, -1 -/* CD91F0 80241F10 A642008E */ sh $v0, 0x8e($s2) -/* CD91F4 80241F14 00021400 */ sll $v0, $v0, 0x10 -/* CD91F8 80241F18 1C400027 */ bgtz $v0, .L80241FB8 -/* CD91FC 80241F1C 00000000 */ nop -/* CD9200 80241F20 0C00FB3A */ jal get_enemy -/* CD9204 80241F24 8E64007C */ lw $a0, 0x7c($s3) -/* CD9208 80241F28 24030002 */ addiu $v1, $zero, 2 -/* CD920C 80241F2C AC430094 */ sw $v1, 0x94($v0) -/* CD9210 80241F30 24020005 */ addiu $v0, $zero, 5 -/* CD9214 80241F34 A642008E */ sh $v0, 0x8e($s2) -/* CD9218 80241F38 AE900070 */ sw $s0, 0x70($s4) -.L80241F3C: -/* CD921C 80241F3C 9642008E */ lhu $v0, 0x8e($s2) -/* CD9220 80241F40 2442FFFF */ addiu $v0, $v0, -1 -/* CD9224 80241F44 A642008E */ sh $v0, 0x8e($s2) -/* CD9228 80241F48 00021400 */ sll $v0, $v0, 0x10 -/* CD922C 80241F4C 1C40001A */ bgtz $v0, .L80241FB8 -/* CD9230 80241F50 3C020049 */ lui $v0, 0x49 -/* CD9234 80241F54 34420015 */ ori $v0, $v0, 0x15 -/* CD9238 80241F58 AE420028 */ sw $v0, 0x28($s2) -/* CD923C 80241F5C 0C00FB3A */ jal get_enemy -/* CD9240 80241F60 8E64007C */ lw $a0, 0x7c($s3) -/* CD9244 80241F64 24030003 */ addiu $v1, $zero, 3 -/* CD9248 80241F68 AC430094 */ sw $v1, 0x94($v0) -/* CD924C 80241F6C 2402000A */ addiu $v0, $zero, 0xa -/* CD9250 80241F70 A642008E */ sh $v0, 0x8e($s2) -/* CD9254 80241F74 24020020 */ addiu $v0, $zero, 0x20 -/* CD9258 80241F78 AE820070 */ sw $v0, 0x70($s4) -.L80241F7C: -/* CD925C 80241F7C 9642008E */ lhu $v0, 0x8e($s2) -/* CD9260 80241F80 2442FFFF */ addiu $v0, $v0, -1 -/* CD9264 80241F84 A642008E */ sh $v0, 0x8e($s2) -/* CD9268 80241F88 00021400 */ sll $v0, $v0, 0x10 -/* CD926C 80241F8C 1C40000A */ bgtz $v0, .L80241FB8 -/* CD9270 80241F90 24020003 */ addiu $v0, $zero, 3 -/* CD9274 80241F94 A642008E */ sh $v0, 0x8e($s2) -/* CD9278 80241F98 24020021 */ addiu $v0, $zero, 0x21 -/* CD927C 80241F9C AE820070 */ sw $v0, 0x70($s4) -.L80241FA0: -/* CD9280 80241FA0 9642008E */ lhu $v0, 0x8e($s2) -/* CD9284 80241FA4 2442FFFF */ addiu $v0, $v0, -1 -/* CD9288 80241FA8 A642008E */ sh $v0, 0x8e($s2) -/* CD928C 80241FAC 00021400 */ sll $v0, $v0, 0x10 -/* CD9290 80241FB0 58400001 */ blezl $v0, .L80241FB8 -/* CD9294 80241FB4 AE800070 */ sw $zero, 0x70($s4) -.L80241FB8: -/* CD9298 80241FB8 8E820070 */ lw $v0, 0x70($s4) -/* CD929C 80241FBC 2442FFE2 */ addiu $v0, $v0, -0x1e -/* CD92A0 80241FC0 2C420002 */ sltiu $v0, $v0, 2 -/* CD92A4 80241FC4 10400054 */ beqz $v0, .L80242118 -/* CD92A8 80241FC8 0000102D */ daddu $v0, $zero, $zero -/* CD92AC 80241FCC 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* CD92B0 80241FD0 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* CD92B4 80241FD4 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CD92B8 80241FD8 8E020000 */ lw $v0, ($s0) -/* CD92BC 80241FDC C64E0040 */ lwc1 $f14, 0x40($s2) -/* CD92C0 80241FE0 8C460028 */ lw $a2, 0x28($v0) -/* CD92C4 80241FE4 0C00A720 */ jal atan2 -/* CD92C8 80241FE8 8C470030 */ lw $a3, 0x30($v0) -/* CD92CC 80241FEC 8E460038 */ lw $a2, 0x38($s2) -/* CD92D0 80241FF0 8E470040 */ lw $a3, 0x40($s2) -/* CD92D4 80241FF4 8E020000 */ lw $v0, ($s0) -/* CD92D8 80241FF8 E640000C */ swc1 $f0, 0xc($s2) -/* CD92DC 80241FFC C44C0028 */ lwc1 $f12, 0x28($v0) -/* CD92E0 80242000 0C00A7B5 */ jal dist2D -/* CD92E4 80242004 C44E0030 */ lwc1 $f14, 0x30($v0) -/* CD92E8 80242008 C6A20008 */ lwc1 $f2, 8($s5) -/* CD92EC 8024200C 468010A0 */ cvt.s.w $f2, $f2 -/* CD92F0 80242010 44051000 */ mfc1 $a1, $f2 -/* CD92F4 80242014 C6A2000C */ lwc1 $f2, 0xc($s5) -/* CD92F8 80242018 468010A0 */ cvt.s.w $f2, $f2 -/* CD92FC 8024201C 44061000 */ mfc1 $a2, $f2 -/* CD9300 80242020 C6420040 */ lwc1 $f2, 0x40($s2) -/* CD9304 80242024 E7A20010 */ swc1 $f2, 0x10($sp) -/* CD9308 80242028 C6A20010 */ lwc1 $f2, 0x10($s5) -/* CD930C 8024202C 468010A0 */ cvt.s.w $f2, $f2 -/* CD9310 80242030 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD9314 80242034 C6A20014 */ lwc1 $f2, 0x14($s5) -/* CD9318 80242038 468010A0 */ cvt.s.w $f2, $f2 -/* CD931C 8024203C E7A20018 */ swc1 $f2, 0x18($sp) -/* CD9320 80242040 8EA40004 */ lw $a0, 4($s5) -/* CD9324 80242044 8E470038 */ lw $a3, 0x38($s2) -/* CD9328 80242048 0C0123F5 */ jal is_point_within_region -/* CD932C 8024204C 46000506 */ mov.s $f20, $f0 -/* CD9330 80242050 14400031 */ bnez $v0, .L80242118 -/* CD9334 80242054 0000102D */ daddu $v0, $zero, $zero -/* CD9338 80242058 3C01403E */ lui $at, 0x403e -/* CD933C 8024205C 44810800 */ mtc1 $at, $f1 -/* CD9340 80242060 44800000 */ mtc1 $zero, $f0 -/* CD9344 80242064 4600A0A1 */ cvt.d.s $f2, $f20 -/* CD9348 80242068 4622003C */ c.lt.d $f0, $f2 -/* CD934C 8024206C 00000000 */ nop -/* CD9350 80242070 45000029 */ bc1f .L80242118 -/* CD9354 80242074 00000000 */ nop -/* CD9358 80242078 8642008C */ lh $v0, 0x8c($s2) -/* CD935C 8024207C 54400026 */ bnel $v0, $zero, .L80242118 -/* CD9360 80242080 0000102D */ daddu $v0, $zero, $zero -/* CD9364 80242084 3C014034 */ lui $at, 0x4034 -/* CD9368 80242088 44810800 */ mtc1 $at, $f1 -/* CD936C 8024208C 44800000 */ mtc1 $zero, $f0 -/* CD9370 80242090 00000000 */ nop -/* CD9374 80242094 46201001 */ sub.d $f0, $f2, $f0 -/* CD9378 80242098 44801000 */ mtc1 $zero, $f2 -/* CD937C 8024209C 44801800 */ mtc1 $zero, $f3 -/* CD9380 802420A0 46200120 */ cvt.s.d $f4, $f0 -/* CD9384 802420A4 46002021 */ cvt.d.s $f0, $f4 -/* CD9388 802420A8 4622003C */ c.lt.d $f0, $f2 -/* CD938C 802420AC 00000000 */ nop -/* CD9390 802420B0 45000002 */ bc1f .L802420BC -/* CD9394 802420B4 00000000 */ nop -/* CD9398 802420B8 44802000 */ mtc1 $zero, $f4 -.L802420BC: -/* CD939C 802420BC 3C014069 */ lui $at, 0x4069 -/* CD93A0 802420C0 44811800 */ mtc1 $at, $f3 -/* CD93A4 802420C4 44801000 */ mtc1 $zero, $f2 -/* CD93A8 802420C8 46002021 */ cvt.d.s $f0, $f4 -/* CD93AC 802420CC 4620103C */ c.lt.d $f2, $f0 -/* CD93B0 802420D0 00000000 */ nop -/* CD93B4 802420D4 45000003 */ bc1f .L802420E4 -/* CD93B8 802420D8 240200C8 */ addiu $v0, $zero, 0xc8 -/* CD93BC 802420DC 3C014348 */ lui $at, 0x4348 -/* CD93C0 802420E0 44812000 */ mtc1 $at, $f4 -.L802420E4: -/* CD93C4 802420E4 AFA20010 */ sw $v0, 0x10($sp) -/* CD93C8 802420E8 8EC50000 */ lw $a1, ($s6) -/* CD93CC 802420EC 8EC60018 */ lw $a2, 0x18($s6) -/* CD93D0 802420F0 4600218D */ trunc.w.s $f6, $f4 -/* CD93D4 802420F4 44073000 */ mfc1 $a3, $f6 -/* CD93D8 802420F8 0C00A8ED */ jal update_lerp -/* CD93DC 802420FC 0000202D */ daddu $a0, $zero, $zero -/* CD93E0 80242100 44050000 */ mfc1 $a1, $f0 -/* CD93E4 80242104 8E46000C */ lw $a2, 0xc($s2) -/* CD93E8 80242108 0240202D */ daddu $a0, $s2, $zero -/* CD93EC 8024210C 0C00EA95 */ jal npc_move_heading -/* CD93F0 80242110 AC850018 */ sw $a1, 0x18($a0) -/* CD93F4 80242114 0000102D */ daddu $v0, $zero, $zero -.L80242118: -/* CD93F8 80242118 8FBF005C */ lw $ra, 0x5c($sp) -/* CD93FC 8024211C 8FB60058 */ lw $s6, 0x58($sp) -/* CD9400 80242120 8FB50054 */ lw $s5, 0x54($sp) -/* CD9404 80242124 8FB40050 */ lw $s4, 0x50($sp) -/* CD9408 80242128 8FB3004C */ lw $s3, 0x4c($sp) -/* CD940C 8024212C 8FB20048 */ lw $s2, 0x48($sp) -/* CD9410 80242130 8FB10044 */ lw $s1, 0x44($sp) -/* CD9414 80242134 8FB00040 */ lw $s0, 0x40($sp) -/* CD9418 80242138 D7B40060 */ ldc1 $f20, 0x60($sp) -/* CD941C 8024213C 03E00008 */ jr $ra -/* CD9420 80242140 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s new file mode 100644 index 0000000000..4c2e22ec04 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80241C64_CD8F44.s @@ -0,0 +1,341 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C64_CD8F44 +/* CD8F44 80241C64 27BDFF98 */ addiu $sp, $sp, -0x68 +/* CD8F48 80241C68 AFB40050 */ sw $s4, 0x50($sp) +/* CD8F4C 80241C6C 0080A02D */ daddu $s4, $a0, $zero +/* CD8F50 80241C70 AFBF005C */ sw $ra, 0x5c($sp) +/* CD8F54 80241C74 AFB60058 */ sw $s6, 0x58($sp) +/* CD8F58 80241C78 AFB50054 */ sw $s5, 0x54($sp) +/* CD8F5C 80241C7C AFB3004C */ sw $s3, 0x4c($sp) +/* CD8F60 80241C80 AFB20048 */ sw $s2, 0x48($sp) +/* CD8F64 80241C84 AFB10044 */ sw $s1, 0x44($sp) +/* CD8F68 80241C88 AFB00040 */ sw $s0, 0x40($sp) +/* CD8F6C 80241C8C F7B40060 */ sdc1 $f20, 0x60($sp) +/* CD8F70 80241C90 8E930148 */ lw $s3, 0x148($s4) +/* CD8F74 80241C94 86640008 */ lh $a0, 8($s3) +/* CD8F78 80241C98 8E90000C */ lw $s0, 0xc($s4) +/* CD8F7C 80241C9C 0C00EABB */ jal get_npc_unsafe +/* CD8F80 80241CA0 00A0882D */ daddu $s1, $a1, $zero +/* CD8F84 80241CA4 0280202D */ daddu $a0, $s4, $zero +/* CD8F88 80241CA8 8E050000 */ lw $a1, ($s0) +/* CD8F8C 80241CAC 0C0B1EAF */ jal get_variable +/* CD8F90 80241CB0 0040902D */ daddu $s2, $v0, $zero +/* CD8F94 80241CB4 AFA00020 */ sw $zero, 0x20($sp) +/* CD8F98 80241CB8 8E6300D0 */ lw $v1, 0xd0($s3) +/* CD8F9C 80241CBC 8C630030 */ lw $v1, 0x30($v1) +/* CD8FA0 80241CC0 AFA30024 */ sw $v1, 0x24($sp) +/* CD8FA4 80241CC4 8E6300D0 */ lw $v1, 0xd0($s3) +/* CD8FA8 80241CC8 8C63001C */ lw $v1, 0x1c($v1) +/* CD8FAC 80241CCC AFA30028 */ sw $v1, 0x28($sp) +/* CD8FB0 80241CD0 8E6300D0 */ lw $v1, 0xd0($s3) +/* CD8FB4 80241CD4 8C630024 */ lw $v1, 0x24($v1) +/* CD8FB8 80241CD8 AFA3002C */ sw $v1, 0x2c($sp) +/* CD8FBC 80241CDC 8E6300D0 */ lw $v1, 0xd0($s3) +/* CD8FC0 80241CE0 8C630028 */ lw $v1, 0x28($v1) +/* CD8FC4 80241CE4 27B50020 */ addiu $s5, $sp, 0x20 +/* CD8FC8 80241CE8 AFA30030 */ sw $v1, 0x30($sp) +/* CD8FCC 80241CEC 8E6300D0 */ lw $v1, 0xd0($s3) +/* CD8FD0 80241CF0 3C0142F0 */ lui $at, 0x42f0 +/* CD8FD4 80241CF4 44810000 */ mtc1 $at, $f0 +/* CD8FD8 80241CF8 8C63002C */ lw $v1, 0x2c($v1) +/* CD8FDC 80241CFC 0040B02D */ daddu $s6, $v0, $zero +/* CD8FE0 80241D00 E7A00038 */ swc1 $f0, 0x38($sp) +/* CD8FE4 80241D04 A7A0003C */ sh $zero, 0x3c($sp) +/* CD8FE8 80241D08 12200007 */ beqz $s1, .L80241D28 +/* CD8FEC 80241D0C AFA30034 */ sw $v1, 0x34($sp) +/* CD8FF0 80241D10 0240202D */ daddu $a0, $s2, $zero +/* CD8FF4 80241D14 0260282D */ daddu $a1, $s3, $zero +/* CD8FF8 80241D18 0280302D */ daddu $a2, $s4, $zero +/* CD8FFC 80241D1C 0C090496 */ jal func_80241258_CD8538 +/* CD9000 80241D20 02C0382D */ daddu $a3, $s6, $zero +/* CD9004 80241D24 AE800070 */ sw $zero, 0x70($s4) +.L80241D28: +/* CD9008 80241D28 2402FFFD */ addiu $v0, $zero, -3 +/* CD900C 80241D2C A24200AB */ sb $v0, 0xab($s2) +/* CD9010 80241D30 8E6300B0 */ lw $v1, 0xb0($s3) +/* CD9014 80241D34 30620004 */ andi $v0, $v1, 4 +/* CD9018 80241D38 10400007 */ beqz $v0, .L80241D58 +/* CD901C 80241D3C 00000000 */ nop +/* CD9020 80241D40 826200B4 */ lb $v0, 0xb4($s3) +/* CD9024 80241D44 144000F4 */ bnez $v0, .L80242118 +/* CD9028 80241D48 0000102D */ daddu $v0, $zero, $zero +/* CD902C 80241D4C 2402FFFB */ addiu $v0, $zero, -5 +/* CD9030 80241D50 00621024 */ and $v0, $v1, $v0 +/* CD9034 80241D54 AE6200B0 */ sw $v0, 0xb0($s3) +.L80241D58: +/* CD9038 80241D58 8E830070 */ lw $v1, 0x70($s4) +/* CD903C 80241D5C 24020001 */ addiu $v0, $zero, 1 +/* CD9040 80241D60 10620011 */ beq $v1, $v0, .L80241DA8 +/* CD9044 80241D64 28620002 */ slti $v0, $v1, 2 +/* CD9048 80241D68 10400005 */ beqz $v0, .L80241D80 +/* CD904C 80241D6C 24020002 */ addiu $v0, $zero, 2 +/* CD9050 80241D70 10600009 */ beqz $v1, .L80241D98 +/* CD9054 80241D74 2402000C */ addiu $v0, $zero, 0xc +/* CD9058 80241D78 0809077A */ j .L80241DE8 +/* CD905C 80241D7C 00000000 */ nop +.L80241D80: +/* CD9060 80241D80 1062000F */ beq $v1, $v0, .L80241DC0 +/* CD9064 80241D84 24020003 */ addiu $v0, $zero, 3 +/* CD9068 80241D88 10620012 */ beq $v1, $v0, .L80241DD4 +/* CD906C 80241D8C 0280202D */ daddu $a0, $s4, $zero +/* CD9070 80241D90 08090778 */ j .L80241DE0 +/* CD9074 80241D94 00000000 */ nop +.L80241D98: +/* CD9078 80241D98 0280202D */ daddu $a0, $s4, $zero +/* CD907C 80241D9C 02C0282D */ daddu $a1, $s6, $zero +/* CD9080 80241DA0 0C09001C */ jal func_80240070_CD7350 +/* CD9084 80241DA4 02A0302D */ daddu $a2, $s5, $zero +.L80241DA8: +/* CD9088 80241DA8 0280202D */ daddu $a0, $s4, $zero +/* CD908C 80241DAC 02C0282D */ daddu $a1, $s6, $zero +/* CD9090 80241DB0 0C09056C */ jal func_802415B0_CD8890 +/* CD9094 80241DB4 02A0302D */ daddu $a2, $s5, $zero +/* CD9098 80241DB8 08090778 */ j .L80241DE0 +/* CD909C 80241DBC 00000000 */ nop +.L80241DC0: +/* CD90A0 80241DC0 0280202D */ daddu $a0, $s4, $zero +/* CD90A4 80241DC4 02C0282D */ daddu $a1, $s6, $zero +/* CD90A8 80241DC8 0C090212 */ jal func_80240848_CD7B28 +/* CD90AC 80241DCC 02A0302D */ daddu $a2, $s5, $zero +/* CD90B0 80241DD0 0280202D */ daddu $a0, $s4, $zero +.L80241DD4: +/* CD90B4 80241DD4 02C0282D */ daddu $a1, $s6, $zero +/* CD90B8 80241DD8 0C090685 */ jal func_80241A14_CD8CF4 +/* CD90BC 80241DDC 02A0302D */ daddu $a2, $s5, $zero +.L80241DE0: +/* CD90C0 80241DE0 8E830070 */ lw $v1, 0x70($s4) +/* CD90C4 80241DE4 2402000C */ addiu $v0, $zero, 0xc +.L80241DE8: +/* CD90C8 80241DE8 1462001A */ bne $v1, $v0, .L80241E54 +/* CD90CC 80241DEC 00000000 */ nop +/* CD90D0 80241DF0 C64C0038 */ lwc1 $f12, 0x38($s2) +/* CD90D4 80241DF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CD90D8 80241DF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CD90DC 80241DFC C64E0040 */ lwc1 $f14, 0x40($s2) +/* CD90E0 80241E00 8C460028 */ lw $a2, 0x28($v0) +/* CD90E4 80241E04 0C00A720 */ jal atan2 +/* CD90E8 80241E08 8C470030 */ lw $a3, 0x30($v0) +/* CD90EC 80241E0C 0C09055A */ jal func_80241568_CD8848 +/* CD90F0 80241E10 E640000C */ swc1 $f0, 0xc($s2) +/* CD90F4 80241E14 0440000F */ bltz $v0, .L80241E54 +/* CD90F8 80241E18 AE62007C */ sw $v0, 0x7c($s3) +/* CD90FC 80241E1C 0C00FB3A */ jal get_enemy +/* CD9100 80241E20 0040202D */ daddu $a0, $v0, $zero +/* CD9104 80241E24 3C030049 */ lui $v1, 0x49 +/* CD9108 80241E28 0040202D */ daddu $a0, $v0, $zero +/* CD910C 80241E2C 24020001 */ addiu $v0, $zero, 1 +/* CD9110 80241E30 AC820094 */ sw $v0, 0x94($a0) +/* CD9114 80241E34 86620008 */ lh $v0, 8($s3) +/* CD9118 80241E38 34630014 */ ori $v1, $v1, 0x14 +/* CD911C 80241E3C AC820098 */ sw $v0, 0x98($a0) +/* CD9120 80241E40 2402000F */ addiu $v0, $zero, 0xf +/* CD9124 80241E44 A642008E */ sh $v0, 0x8e($s2) +/* CD9128 80241E48 2402001E */ addiu $v0, $zero, 0x1e +/* CD912C 80241E4C AE430028 */ sw $v1, 0x28($s2) +/* CD9130 80241E50 AE820070 */ sw $v0, 0x70($s4) +.L80241E54: +/* CD9134 80241E54 8E830070 */ lw $v1, 0x70($s4) +/* CD9138 80241E58 2402000D */ addiu $v0, $zero, 0xd +/* CD913C 80241E5C 10620010 */ beq $v1, $v0, .L80241EA0 +/* CD9140 80241E60 2862000E */ slti $v0, $v1, 0xe +/* CD9144 80241E64 10400005 */ beqz $v0, .L80241E7C +/* CD9148 80241E68 2402000C */ addiu $v0, $zero, 0xc +/* CD914C 80241E6C 10620008 */ beq $v1, $v0, .L80241E90 +/* CD9150 80241E70 2410001F */ addiu $s0, $zero, 0x1f +/* CD9154 80241E74 080907B3 */ j .L80241ECC +/* CD9158 80241E78 00000000 */ nop +.L80241E7C: +/* CD915C 80241E7C 2402000E */ addiu $v0, $zero, 0xe +/* CD9160 80241E80 1062000D */ beq $v1, $v0, .L80241EB8 +/* CD9164 80241E84 0280202D */ daddu $a0, $s4, $zero +/* CD9168 80241E88 080907B1 */ j .L80241EC4 +/* CD916C 80241E8C 00000000 */ nop +.L80241E90: +/* CD9170 80241E90 0280202D */ daddu $a0, $s4, $zero +/* CD9174 80241E94 02C0282D */ daddu $a1, $s6, $zero +/* CD9178 80241E98 0C09034C */ jal func_80240D30_CD8010 +/* CD917C 80241E9C 02A0302D */ daddu $a2, $s5, $zero +.L80241EA0: +/* CD9180 80241EA0 0280202D */ daddu $a0, $s4, $zero +/* CD9184 80241EA4 02C0282D */ daddu $a1, $s6, $zero +/* CD9188 80241EA8 0C090399 */ jal func_80240E64_CD8144 +/* CD918C 80241EAC 02A0302D */ daddu $a2, $s5, $zero +/* CD9190 80241EB0 080907B1 */ j .L80241EC4 +/* CD9194 80241EB4 00000000 */ nop +.L80241EB8: +/* CD9198 80241EB8 02C0282D */ daddu $a1, $s6, $zero +/* CD919C 80241EBC 0C0903B2 */ jal func_80240EC8_CD81A8 +/* CD91A0 80241EC0 02A0302D */ daddu $a2, $s5, $zero +.L80241EC4: +/* CD91A4 80241EC4 8E830070 */ lw $v1, 0x70($s4) +/* CD91A8 80241EC8 2410001F */ addiu $s0, $zero, 0x1f +.L80241ECC: +/* CD91AC 80241ECC 1070001B */ beq $v1, $s0, .L80241F3C +/* CD91B0 80241ED0 28620020 */ slti $v0, $v1, 0x20 +/* CD91B4 80241ED4 10400005 */ beqz $v0, .L80241EEC +/* CD91B8 80241ED8 2402001E */ addiu $v0, $zero, 0x1e +/* CD91BC 80241EDC 1062000A */ beq $v1, $v0, .L80241F08 +/* CD91C0 80241EE0 00000000 */ nop +/* CD91C4 80241EE4 080907EE */ j .L80241FB8 +/* CD91C8 80241EE8 00000000 */ nop +.L80241EEC: +/* CD91CC 80241EEC 24020020 */ addiu $v0, $zero, 0x20 +/* CD91D0 80241EF0 10620022 */ beq $v1, $v0, .L80241F7C +/* CD91D4 80241EF4 24020021 */ addiu $v0, $zero, 0x21 +/* CD91D8 80241EF8 10620029 */ beq $v1, $v0, .L80241FA0 +/* CD91DC 80241EFC 00000000 */ nop +/* CD91E0 80241F00 080907EE */ j .L80241FB8 +/* CD91E4 80241F04 00000000 */ nop +.L80241F08: +/* CD91E8 80241F08 9642008E */ lhu $v0, 0x8e($s2) +/* CD91EC 80241F0C 2442FFFF */ addiu $v0, $v0, -1 +/* CD91F0 80241F10 A642008E */ sh $v0, 0x8e($s2) +/* CD91F4 80241F14 00021400 */ sll $v0, $v0, 0x10 +/* CD91F8 80241F18 1C400027 */ bgtz $v0, .L80241FB8 +/* CD91FC 80241F1C 00000000 */ nop +/* CD9200 80241F20 0C00FB3A */ jal get_enemy +/* CD9204 80241F24 8E64007C */ lw $a0, 0x7c($s3) +/* CD9208 80241F28 24030002 */ addiu $v1, $zero, 2 +/* CD920C 80241F2C AC430094 */ sw $v1, 0x94($v0) +/* CD9210 80241F30 24020005 */ addiu $v0, $zero, 5 +/* CD9214 80241F34 A642008E */ sh $v0, 0x8e($s2) +/* CD9218 80241F38 AE900070 */ sw $s0, 0x70($s4) +.L80241F3C: +/* CD921C 80241F3C 9642008E */ lhu $v0, 0x8e($s2) +/* CD9220 80241F40 2442FFFF */ addiu $v0, $v0, -1 +/* CD9224 80241F44 A642008E */ sh $v0, 0x8e($s2) +/* CD9228 80241F48 00021400 */ sll $v0, $v0, 0x10 +/* CD922C 80241F4C 1C40001A */ bgtz $v0, .L80241FB8 +/* CD9230 80241F50 3C020049 */ lui $v0, 0x49 +/* CD9234 80241F54 34420015 */ ori $v0, $v0, 0x15 +/* CD9238 80241F58 AE420028 */ sw $v0, 0x28($s2) +/* CD923C 80241F5C 0C00FB3A */ jal get_enemy +/* CD9240 80241F60 8E64007C */ lw $a0, 0x7c($s3) +/* CD9244 80241F64 24030003 */ addiu $v1, $zero, 3 +/* CD9248 80241F68 AC430094 */ sw $v1, 0x94($v0) +/* CD924C 80241F6C 2402000A */ addiu $v0, $zero, 0xa +/* CD9250 80241F70 A642008E */ sh $v0, 0x8e($s2) +/* CD9254 80241F74 24020020 */ addiu $v0, $zero, 0x20 +/* CD9258 80241F78 AE820070 */ sw $v0, 0x70($s4) +.L80241F7C: +/* CD925C 80241F7C 9642008E */ lhu $v0, 0x8e($s2) +/* CD9260 80241F80 2442FFFF */ addiu $v0, $v0, -1 +/* CD9264 80241F84 A642008E */ sh $v0, 0x8e($s2) +/* CD9268 80241F88 00021400 */ sll $v0, $v0, 0x10 +/* CD926C 80241F8C 1C40000A */ bgtz $v0, .L80241FB8 +/* CD9270 80241F90 24020003 */ addiu $v0, $zero, 3 +/* CD9274 80241F94 A642008E */ sh $v0, 0x8e($s2) +/* CD9278 80241F98 24020021 */ addiu $v0, $zero, 0x21 +/* CD927C 80241F9C AE820070 */ sw $v0, 0x70($s4) +.L80241FA0: +/* CD9280 80241FA0 9642008E */ lhu $v0, 0x8e($s2) +/* CD9284 80241FA4 2442FFFF */ addiu $v0, $v0, -1 +/* CD9288 80241FA8 A642008E */ sh $v0, 0x8e($s2) +/* CD928C 80241FAC 00021400 */ sll $v0, $v0, 0x10 +/* CD9290 80241FB0 58400001 */ blezl $v0, .L80241FB8 +/* CD9294 80241FB4 AE800070 */ sw $zero, 0x70($s4) +.L80241FB8: +/* CD9298 80241FB8 8E820070 */ lw $v0, 0x70($s4) +/* CD929C 80241FBC 2442FFE2 */ addiu $v0, $v0, -0x1e +/* CD92A0 80241FC0 2C420002 */ sltiu $v0, $v0, 2 +/* CD92A4 80241FC4 10400054 */ beqz $v0, .L80242118 +/* CD92A8 80241FC8 0000102D */ daddu $v0, $zero, $zero +/* CD92AC 80241FCC 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) +/* CD92B0 80241FD0 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) +/* CD92B4 80241FD4 C64C0038 */ lwc1 $f12, 0x38($s2) +/* CD92B8 80241FD8 8E020000 */ lw $v0, ($s0) +/* CD92BC 80241FDC C64E0040 */ lwc1 $f14, 0x40($s2) +/* CD92C0 80241FE0 8C460028 */ lw $a2, 0x28($v0) +/* CD92C4 80241FE4 0C00A720 */ jal atan2 +/* CD92C8 80241FE8 8C470030 */ lw $a3, 0x30($v0) +/* CD92CC 80241FEC 8E460038 */ lw $a2, 0x38($s2) +/* CD92D0 80241FF0 8E470040 */ lw $a3, 0x40($s2) +/* CD92D4 80241FF4 8E020000 */ lw $v0, ($s0) +/* CD92D8 80241FF8 E640000C */ swc1 $f0, 0xc($s2) +/* CD92DC 80241FFC C44C0028 */ lwc1 $f12, 0x28($v0) +/* CD92E0 80242000 0C00A7B5 */ jal dist2D +/* CD92E4 80242004 C44E0030 */ lwc1 $f14, 0x30($v0) +/* CD92E8 80242008 C6A20008 */ lwc1 $f2, 8($s5) +/* CD92EC 8024200C 468010A0 */ cvt.s.w $f2, $f2 +/* CD92F0 80242010 44051000 */ mfc1 $a1, $f2 +/* CD92F4 80242014 C6A2000C */ lwc1 $f2, 0xc($s5) +/* CD92F8 80242018 468010A0 */ cvt.s.w $f2, $f2 +/* CD92FC 8024201C 44061000 */ mfc1 $a2, $f2 +/* CD9300 80242020 C6420040 */ lwc1 $f2, 0x40($s2) +/* CD9304 80242024 E7A20010 */ swc1 $f2, 0x10($sp) +/* CD9308 80242028 C6A20010 */ lwc1 $f2, 0x10($s5) +/* CD930C 8024202C 468010A0 */ cvt.s.w $f2, $f2 +/* CD9310 80242030 E7A20014 */ swc1 $f2, 0x14($sp) +/* CD9314 80242034 C6A20014 */ lwc1 $f2, 0x14($s5) +/* CD9318 80242038 468010A0 */ cvt.s.w $f2, $f2 +/* CD931C 8024203C E7A20018 */ swc1 $f2, 0x18($sp) +/* CD9320 80242040 8EA40004 */ lw $a0, 4($s5) +/* CD9324 80242044 8E470038 */ lw $a3, 0x38($s2) +/* CD9328 80242048 0C0123F5 */ jal is_point_within_region +/* CD932C 8024204C 46000506 */ mov.s $f20, $f0 +/* CD9330 80242050 14400031 */ bnez $v0, .L80242118 +/* CD9334 80242054 0000102D */ daddu $v0, $zero, $zero +/* CD9338 80242058 3C01403E */ lui $at, 0x403e +/* CD933C 8024205C 44810800 */ mtc1 $at, $f1 +/* CD9340 80242060 44800000 */ mtc1 $zero, $f0 +/* CD9344 80242064 4600A0A1 */ cvt.d.s $f2, $f20 +/* CD9348 80242068 4622003C */ c.lt.d $f0, $f2 +/* CD934C 8024206C 00000000 */ nop +/* CD9350 80242070 45000029 */ bc1f .L80242118 +/* CD9354 80242074 00000000 */ nop +/* CD9358 80242078 8642008C */ lh $v0, 0x8c($s2) +/* CD935C 8024207C 54400026 */ bnel $v0, $zero, .L80242118 +/* CD9360 80242080 0000102D */ daddu $v0, $zero, $zero +/* CD9364 80242084 3C014034 */ lui $at, 0x4034 +/* CD9368 80242088 44810800 */ mtc1 $at, $f1 +/* CD936C 8024208C 44800000 */ mtc1 $zero, $f0 +/* CD9370 80242090 00000000 */ nop +/* CD9374 80242094 46201001 */ sub.d $f0, $f2, $f0 +/* CD9378 80242098 44801000 */ mtc1 $zero, $f2 +/* CD937C 8024209C 44801800 */ mtc1 $zero, $f3 +/* CD9380 802420A0 46200120 */ cvt.s.d $f4, $f0 +/* CD9384 802420A4 46002021 */ cvt.d.s $f0, $f4 +/* CD9388 802420A8 4622003C */ c.lt.d $f0, $f2 +/* CD938C 802420AC 00000000 */ nop +/* CD9390 802420B0 45000002 */ bc1f .L802420BC +/* CD9394 802420B4 00000000 */ nop +/* CD9398 802420B8 44802000 */ mtc1 $zero, $f4 +.L802420BC: +/* CD939C 802420BC 3C014069 */ lui $at, 0x4069 +/* CD93A0 802420C0 44811800 */ mtc1 $at, $f3 +/* CD93A4 802420C4 44801000 */ mtc1 $zero, $f2 +/* CD93A8 802420C8 46002021 */ cvt.d.s $f0, $f4 +/* CD93AC 802420CC 4620103C */ c.lt.d $f2, $f0 +/* CD93B0 802420D0 00000000 */ nop +/* CD93B4 802420D4 45000003 */ bc1f .L802420E4 +/* CD93B8 802420D8 240200C8 */ addiu $v0, $zero, 0xc8 +/* CD93BC 802420DC 3C014348 */ lui $at, 0x4348 +/* CD93C0 802420E0 44812000 */ mtc1 $at, $f4 +.L802420E4: +/* CD93C4 802420E4 AFA20010 */ sw $v0, 0x10($sp) +/* CD93C8 802420E8 8EC50000 */ lw $a1, ($s6) +/* CD93CC 802420EC 8EC60018 */ lw $a2, 0x18($s6) +/* CD93D0 802420F0 4600218D */ trunc.w.s $f6, $f4 +/* CD93D4 802420F4 44073000 */ mfc1 $a3, $f6 +/* CD93D8 802420F8 0C00A8ED */ jal update_lerp +/* CD93DC 802420FC 0000202D */ daddu $a0, $zero, $zero +/* CD93E0 80242100 44050000 */ mfc1 $a1, $f0 +/* CD93E4 80242104 8E46000C */ lw $a2, 0xc($s2) +/* CD93E8 80242108 0240202D */ daddu $a0, $s2, $zero +/* CD93EC 8024210C 0C00EA95 */ jal npc_move_heading +/* CD93F0 80242110 AC850018 */ sw $a1, 0x18($a0) +/* CD93F4 80242114 0000102D */ daddu $v0, $zero, $zero +.L80242118: +/* CD93F8 80242118 8FBF005C */ lw $ra, 0x5c($sp) +/* CD93FC 8024211C 8FB60058 */ lw $s6, 0x58($sp) +/* CD9400 80242120 8FB50054 */ lw $s5, 0x54($sp) +/* CD9404 80242124 8FB40050 */ lw $s4, 0x50($sp) +/* CD9408 80242128 8FB3004C */ lw $s3, 0x4c($sp) +/* CD940C 8024212C 8FB20048 */ lw $s2, 0x48($sp) +/* CD9410 80242130 8FB10044 */ lw $s1, 0x44($sp) +/* CD9414 80242134 8FB00040 */ lw $s0, 0x40($sp) +/* CD9418 80242138 D7B40060 */ ldc1 $f20, 0x60($sp) +/* CD941C 8024213C 03E00008 */ jr $ra +/* CD9420 80242140 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802422F4.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802422F4.s deleted file mode 100644 index 25a598c5cb..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802422F4.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F4 -/* CD95D4 802422F4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CD95D8 802422F8 AFB3003C */ sw $s3, 0x3c($sp) -/* CD95DC 802422FC 0080982D */ daddu $s3, $a0, $zero -/* CD95E0 80242300 AFBF0040 */ sw $ra, 0x40($sp) -/* CD95E4 80242304 AFB20038 */ sw $s2, 0x38($sp) -/* CD95E8 80242308 AFB10034 */ sw $s1, 0x34($sp) -/* CD95EC 8024230C AFB00030 */ sw $s0, 0x30($sp) -/* CD95F0 80242310 8E710148 */ lw $s1, 0x148($s3) -/* CD95F4 80242314 0C00EABB */ jal get_npc_unsafe -/* CD95F8 80242318 86240008 */ lh $a0, 8($s1) -/* CD95FC 8024231C 0040802D */ daddu $s0, $v0, $zero -/* CD9600 80242320 8E22007C */ lw $v0, 0x7c($s1) -/* CD9604 80242324 8603008E */ lh $v1, 0x8e($s0) -/* CD9608 80242328 2442FFFF */ addiu $v0, $v0, -1 -/* CD960C 8024232C 14620012 */ bne $v1, $v0, .L80242378 -/* CD9610 80242330 00000000 */ nop -/* CD9614 80242334 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD9618 80242338 4600020D */ trunc.w.s $f8, $f0 -/* CD961C 8024233C 44024000 */ mfc1 $v0, $f8 -/* CD9620 80242340 00000000 */ nop -/* CD9624 80242344 A6220010 */ sh $v0, 0x10($s1) -/* CD9628 80242348 C600003C */ lwc1 $f0, 0x3c($s0) -/* CD962C 8024234C 4600020D */ trunc.w.s $f8, $f0 -/* CD9630 80242350 44024000 */ mfc1 $v0, $f8 -/* CD9634 80242354 00000000 */ nop -/* CD9638 80242358 A6220012 */ sh $v0, 0x12($s1) -/* CD963C 8024235C C6000040 */ lwc1 $f0, 0x40($s0) -/* CD9640 80242360 24020001 */ addiu $v0, $zero, 1 -/* CD9644 80242364 A2220007 */ sb $v0, 7($s1) -/* CD9648 80242368 4600020D */ trunc.w.s $f8, $f0 -/* CD964C 8024236C 44024000 */ mfc1 $v0, $f8 -/* CD9650 80242370 00000000 */ nop -/* CD9654 80242374 A6220014 */ sh $v0, 0x14($s1) -.L80242378: -/* CD9658 80242378 C6000038 */ lwc1 $f0, 0x38($s0) -/* CD965C 8024237C C602003C */ lwc1 $f2, 0x3c($s0) -/* CD9660 80242380 C6040040 */ lwc1 $f4, 0x40($s0) -/* CD9664 80242384 C6060018 */ lwc1 $f6, 0x18($s0) -/* CD9668 80242388 E7A00020 */ swc1 $f0, 0x20($sp) -/* CD966C 8024238C E7A20024 */ swc1 $f2, 0x24($sp) -/* CD9670 80242390 E7A40028 */ swc1 $f4, 0x28($sp) -/* CD9674 80242394 E7A60010 */ swc1 $f6, 0x10($sp) -/* CD9678 80242398 C600000C */ lwc1 $f0, 0xc($s0) -/* CD967C 8024239C E7A00014 */ swc1 $f0, 0x14($sp) -/* CD9680 802423A0 860200A8 */ lh $v0, 0xa8($s0) -/* CD9684 802423A4 27A50020 */ addiu $a1, $sp, 0x20 -/* CD9688 802423A8 44820000 */ mtc1 $v0, $f0 -/* CD968C 802423AC 00000000 */ nop -/* CD9690 802423B0 46800020 */ cvt.s.w $f0, $f0 -/* CD9694 802423B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* CD9698 802423B8 860200A6 */ lh $v0, 0xa6($s0) -/* CD969C 802423BC 27A60024 */ addiu $a2, $sp, 0x24 -/* CD96A0 802423C0 44820000 */ mtc1 $v0, $f0 -/* CD96A4 802423C4 00000000 */ nop -/* CD96A8 802423C8 46800020 */ cvt.s.w $f0, $f0 -/* CD96AC 802423CC E7A0001C */ swc1 $f0, 0x1c($sp) -/* CD96B0 802423D0 8E040080 */ lw $a0, 0x80($s0) -/* CD96B4 802423D4 0C037711 */ jal func_800DDC44 -/* CD96B8 802423D8 27A70028 */ addiu $a3, $sp, 0x28 -/* CD96BC 802423DC 0040902D */ daddu $s2, $v0, $zero -/* CD96C0 802423E0 16400005 */ bnez $s2, .L802423F8 -/* CD96C4 802423E4 00000000 */ nop -/* CD96C8 802423E8 8E050018 */ lw $a1, 0x18($s0) -/* CD96CC 802423EC 8E06000C */ lw $a2, 0xc($s0) -/* CD96D0 802423F0 0C00EA95 */ jal npc_move_heading -/* CD96D4 802423F4 0200202D */ daddu $a0, $s0, $zero -.L802423F8: -/* CD96D8 802423F8 8602008E */ lh $v0, 0x8e($s0) -/* CD96DC 802423FC 9603008E */ lhu $v1, 0x8e($s0) -/* CD96E0 80242400 18400007 */ blez $v0, .L80242420 -/* CD96E4 80242404 2462FFFF */ addiu $v0, $v1, -1 -/* CD96E8 80242408 A602008E */ sh $v0, 0x8e($s0) -/* CD96EC 8024240C 00021400 */ sll $v0, $v0, 0x10 -/* CD96F0 80242410 18400003 */ blez $v0, .L80242420 -/* CD96F4 80242414 00000000 */ nop -/* CD96F8 80242418 12400008 */ beqz $s2, .L8024243C -/* CD96FC 8024241C 00000000 */ nop -.L80242420: -/* CD9700 80242420 8E2200CC */ lw $v0, 0xcc($s1) -/* CD9704 80242424 A2200007 */ sb $zero, 7($s1) -/* CD9708 80242428 8C420028 */ lw $v0, 0x28($v0) -/* CD970C 8024242C A600008E */ sh $zero, 0x8e($s0) -/* CD9710 80242430 AE020028 */ sw $v0, 0x28($s0) -/* CD9714 80242434 2402000F */ addiu $v0, $zero, 0xf -/* CD9718 80242438 AE620070 */ sw $v0, 0x70($s3) -.L8024243C: -/* CD971C 8024243C 8FBF0040 */ lw $ra, 0x40($sp) -/* CD9720 80242440 8FB3003C */ lw $s3, 0x3c($sp) -/* CD9724 80242444 8FB20038 */ lw $s2, 0x38($sp) -/* CD9728 80242448 8FB10034 */ lw $s1, 0x34($sp) -/* CD972C 8024244C 8FB00030 */ lw $s0, 0x30($sp) -/* CD9730 80242450 03E00008 */ jr $ra -/* CD9734 80242454 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802422F4_CD95D4.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802422F4_CD95D4.s new file mode 100644 index 0000000000..8aff2c8307 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802422F4_CD95D4.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422F4_CD95D4 +/* CD95D4 802422F4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* CD95D8 802422F8 AFB3003C */ sw $s3, 0x3c($sp) +/* CD95DC 802422FC 0080982D */ daddu $s3, $a0, $zero +/* CD95E0 80242300 AFBF0040 */ sw $ra, 0x40($sp) +/* CD95E4 80242304 AFB20038 */ sw $s2, 0x38($sp) +/* CD95E8 80242308 AFB10034 */ sw $s1, 0x34($sp) +/* CD95EC 8024230C AFB00030 */ sw $s0, 0x30($sp) +/* CD95F0 80242310 8E710148 */ lw $s1, 0x148($s3) +/* CD95F4 80242314 0C00EABB */ jal get_npc_unsafe +/* CD95F8 80242318 86240008 */ lh $a0, 8($s1) +/* CD95FC 8024231C 0040802D */ daddu $s0, $v0, $zero +/* CD9600 80242320 8E22007C */ lw $v0, 0x7c($s1) +/* CD9604 80242324 8603008E */ lh $v1, 0x8e($s0) +/* CD9608 80242328 2442FFFF */ addiu $v0, $v0, -1 +/* CD960C 8024232C 14620012 */ bne $v1, $v0, .L80242378 +/* CD9610 80242330 00000000 */ nop +/* CD9614 80242334 C6000038 */ lwc1 $f0, 0x38($s0) +/* CD9618 80242338 4600020D */ trunc.w.s $f8, $f0 +/* CD961C 8024233C 44024000 */ mfc1 $v0, $f8 +/* CD9620 80242340 00000000 */ nop +/* CD9624 80242344 A6220010 */ sh $v0, 0x10($s1) +/* CD9628 80242348 C600003C */ lwc1 $f0, 0x3c($s0) +/* CD962C 8024234C 4600020D */ trunc.w.s $f8, $f0 +/* CD9630 80242350 44024000 */ mfc1 $v0, $f8 +/* CD9634 80242354 00000000 */ nop +/* CD9638 80242358 A6220012 */ sh $v0, 0x12($s1) +/* CD963C 8024235C C6000040 */ lwc1 $f0, 0x40($s0) +/* CD9640 80242360 24020001 */ addiu $v0, $zero, 1 +/* CD9644 80242364 A2220007 */ sb $v0, 7($s1) +/* CD9648 80242368 4600020D */ trunc.w.s $f8, $f0 +/* CD964C 8024236C 44024000 */ mfc1 $v0, $f8 +/* CD9650 80242370 00000000 */ nop +/* CD9654 80242374 A6220014 */ sh $v0, 0x14($s1) +.L80242378: +/* CD9658 80242378 C6000038 */ lwc1 $f0, 0x38($s0) +/* CD965C 8024237C C602003C */ lwc1 $f2, 0x3c($s0) +/* CD9660 80242380 C6040040 */ lwc1 $f4, 0x40($s0) +/* CD9664 80242384 C6060018 */ lwc1 $f6, 0x18($s0) +/* CD9668 80242388 E7A00020 */ swc1 $f0, 0x20($sp) +/* CD966C 8024238C E7A20024 */ swc1 $f2, 0x24($sp) +/* CD9670 80242390 E7A40028 */ swc1 $f4, 0x28($sp) +/* CD9674 80242394 E7A60010 */ swc1 $f6, 0x10($sp) +/* CD9678 80242398 C600000C */ lwc1 $f0, 0xc($s0) +/* CD967C 8024239C E7A00014 */ swc1 $f0, 0x14($sp) +/* CD9680 802423A0 860200A8 */ lh $v0, 0xa8($s0) +/* CD9684 802423A4 27A50020 */ addiu $a1, $sp, 0x20 +/* CD9688 802423A8 44820000 */ mtc1 $v0, $f0 +/* CD968C 802423AC 00000000 */ nop +/* CD9690 802423B0 46800020 */ cvt.s.w $f0, $f0 +/* CD9694 802423B4 E7A00018 */ swc1 $f0, 0x18($sp) +/* CD9698 802423B8 860200A6 */ lh $v0, 0xa6($s0) +/* CD969C 802423BC 27A60024 */ addiu $a2, $sp, 0x24 +/* CD96A0 802423C0 44820000 */ mtc1 $v0, $f0 +/* CD96A4 802423C4 00000000 */ nop +/* CD96A8 802423C8 46800020 */ cvt.s.w $f0, $f0 +/* CD96AC 802423CC E7A0001C */ swc1 $f0, 0x1c($sp) +/* CD96B0 802423D0 8E040080 */ lw $a0, 0x80($s0) +/* CD96B4 802423D4 0C037711 */ jal func_800DDC44 +/* CD96B8 802423D8 27A70028 */ addiu $a3, $sp, 0x28 +/* CD96BC 802423DC 0040902D */ daddu $s2, $v0, $zero +/* CD96C0 802423E0 16400005 */ bnez $s2, .L802423F8 +/* CD96C4 802423E4 00000000 */ nop +/* CD96C8 802423E8 8E050018 */ lw $a1, 0x18($s0) +/* CD96CC 802423EC 8E06000C */ lw $a2, 0xc($s0) +/* CD96D0 802423F0 0C00EA95 */ jal npc_move_heading +/* CD96D4 802423F4 0200202D */ daddu $a0, $s0, $zero +.L802423F8: +/* CD96D8 802423F8 8602008E */ lh $v0, 0x8e($s0) +/* CD96DC 802423FC 9603008E */ lhu $v1, 0x8e($s0) +/* CD96E0 80242400 18400007 */ blez $v0, .L80242420 +/* CD96E4 80242404 2462FFFF */ addiu $v0, $v1, -1 +/* CD96E8 80242408 A602008E */ sh $v0, 0x8e($s0) +/* CD96EC 8024240C 00021400 */ sll $v0, $v0, 0x10 +/* CD96F0 80242410 18400003 */ blez $v0, .L80242420 +/* CD96F4 80242414 00000000 */ nop +/* CD96F8 80242418 12400008 */ beqz $s2, .L8024243C +/* CD96FC 8024241C 00000000 */ nop +.L80242420: +/* CD9700 80242420 8E2200CC */ lw $v0, 0xcc($s1) +/* CD9704 80242424 A2200007 */ sb $zero, 7($s1) +/* CD9708 80242428 8C420028 */ lw $v0, 0x28($v0) +/* CD970C 8024242C A600008E */ sh $zero, 0x8e($s0) +/* CD9710 80242430 AE020028 */ sw $v0, 0x28($s0) +/* CD9714 80242434 2402000F */ addiu $v0, $zero, 0xf +/* CD9718 80242438 AE620070 */ sw $v0, 0x70($s3) +.L8024243C: +/* CD971C 8024243C 8FBF0040 */ lw $ra, 0x40($sp) +/* CD9720 80242440 8FB3003C */ lw $s3, 0x3c($sp) +/* CD9724 80242444 8FB20038 */ lw $s2, 0x38($sp) +/* CD9728 80242448 8FB10034 */ lw $s1, 0x34($sp) +/* CD972C 8024244C 8FB00030 */ lw $s0, 0x30($sp) +/* CD9730 80242450 03E00008 */ jr $ra +/* CD9734 80242454 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242458.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242458.s deleted file mode 100644 index 92823dcd94..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242458.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242458 -/* CD9738 80242458 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CD973C 8024245C AFB10014 */ sw $s1, 0x14($sp) -/* CD9740 80242460 0080882D */ daddu $s1, $a0, $zero -/* CD9744 80242464 AFBF0018 */ sw $ra, 0x18($sp) -/* CD9748 80242468 AFB00010 */ sw $s0, 0x10($sp) -/* CD974C 8024246C 8E300148 */ lw $s0, 0x148($s1) -/* CD9750 80242470 0C00EABB */ jal get_npc_unsafe -/* CD9754 80242474 86040008 */ lh $a0, 8($s0) -/* CD9758 80242478 0040202D */ daddu $a0, $v0, $zero -/* CD975C 8024247C 9482008E */ lhu $v0, 0x8e($a0) -/* CD9760 80242480 24030003 */ addiu $v1, $zero, 3 -/* CD9764 80242484 24420001 */ addiu $v0, $v0, 1 -/* CD9768 80242488 A482008E */ sh $v0, 0x8e($a0) -/* CD976C 8024248C 00021400 */ sll $v0, $v0, 0x10 -/* CD9770 80242490 00021403 */ sra $v0, $v0, 0x10 -/* CD9774 80242494 14430003 */ bne $v0, $v1, .L802424A4 -/* CD9778 80242498 00000000 */ nop -/* CD977C 8024249C 96020086 */ lhu $v0, 0x86($s0) -/* CD9780 802424A0 A48200A8 */ sh $v0, 0xa8($a0) -.L802424A4: -/* CD9784 802424A4 8482008E */ lh $v0, 0x8e($a0) -/* CD9788 802424A8 8E030080 */ lw $v1, 0x80($s0) -/* CD978C 802424AC 0043102A */ slt $v0, $v0, $v1 -/* CD9790 802424B0 14400004 */ bnez $v0, .L802424C4 -/* CD9794 802424B4 00000000 */ nop -/* CD9798 802424B8 96020086 */ lhu $v0, 0x86($s0) -/* CD979C 802424BC A48200A8 */ sh $v0, 0xa8($a0) -/* CD97A0 802424C0 AE200070 */ sw $zero, 0x70($s1) -.L802424C4: -/* CD97A4 802424C4 8FBF0018 */ lw $ra, 0x18($sp) -/* CD97A8 802424C8 8FB10014 */ lw $s1, 0x14($sp) -/* CD97AC 802424CC 8FB00010 */ lw $s0, 0x10($sp) -/* CD97B0 802424D0 03E00008 */ jr $ra -/* CD97B4 802424D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242458_CD9738.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242458_CD9738.s new file mode 100644 index 0000000000..e7d3f86217 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242458_CD9738.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242458_CD9738 +/* CD9738 80242458 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* CD973C 8024245C AFB10014 */ sw $s1, 0x14($sp) +/* CD9740 80242460 0080882D */ daddu $s1, $a0, $zero +/* CD9744 80242464 AFBF0018 */ sw $ra, 0x18($sp) +/* CD9748 80242468 AFB00010 */ sw $s0, 0x10($sp) +/* CD974C 8024246C 8E300148 */ lw $s0, 0x148($s1) +/* CD9750 80242470 0C00EABB */ jal get_npc_unsafe +/* CD9754 80242474 86040008 */ lh $a0, 8($s0) +/* CD9758 80242478 0040202D */ daddu $a0, $v0, $zero +/* CD975C 8024247C 9482008E */ lhu $v0, 0x8e($a0) +/* CD9760 80242480 24030003 */ addiu $v1, $zero, 3 +/* CD9764 80242484 24420001 */ addiu $v0, $v0, 1 +/* CD9768 80242488 A482008E */ sh $v0, 0x8e($a0) +/* CD976C 8024248C 00021400 */ sll $v0, $v0, 0x10 +/* CD9770 80242490 00021403 */ sra $v0, $v0, 0x10 +/* CD9774 80242494 14430003 */ bne $v0, $v1, .L802424A4 +/* CD9778 80242498 00000000 */ nop +/* CD977C 8024249C 96020086 */ lhu $v0, 0x86($s0) +/* CD9780 802424A0 A48200A8 */ sh $v0, 0xa8($a0) +.L802424A4: +/* CD9784 802424A4 8482008E */ lh $v0, 0x8e($a0) +/* CD9788 802424A8 8E030080 */ lw $v1, 0x80($s0) +/* CD978C 802424AC 0043102A */ slt $v0, $v0, $v1 +/* CD9790 802424B0 14400004 */ bnez $v0, .L802424C4 +/* CD9794 802424B4 00000000 */ nop +/* CD9798 802424B8 96020086 */ lhu $v0, 0x86($s0) +/* CD979C 802424BC A48200A8 */ sh $v0, 0xa8($a0) +/* CD97A0 802424C0 AE200070 */ sw $zero, 0x70($s1) +.L802424C4: +/* CD97A4 802424C4 8FBF0018 */ lw $ra, 0x18($sp) +/* CD97A8 802424C8 8FB10014 */ lw $s1, 0x14($sp) +/* CD97AC 802424CC 8FB00010 */ lw $s0, 0x10($sp) +/* CD97B0 802424D0 03E00008 */ jr $ra +/* CD97B4 802424D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8.s deleted file mode 100644 index fe68cec14b..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424D8 -/* CD97B8 802424D8 27BDFF90 */ addiu $sp, $sp, -0x70 -/* CD97BC 802424DC AFB3005C */ sw $s3, 0x5c($sp) -/* CD97C0 802424E0 0080982D */ daddu $s3, $a0, $zero -/* CD97C4 802424E4 AFBF0068 */ sw $ra, 0x68($sp) -/* CD97C8 802424E8 AFB50064 */ sw $s5, 0x64($sp) -/* CD97CC 802424EC AFB40060 */ sw $s4, 0x60($sp) -/* CD97D0 802424F0 AFB20058 */ sw $s2, 0x58($sp) -/* CD97D4 802424F4 AFB10054 */ sw $s1, 0x54($sp) -/* CD97D8 802424F8 AFB00050 */ sw $s0, 0x50($sp) -/* CD97DC 802424FC 8E710148 */ lw $s1, 0x148($s3) -/* CD97E0 80242500 86240008 */ lh $a0, 8($s1) -/* CD97E4 80242504 0C00EABB */ jal get_npc_unsafe -/* CD97E8 80242508 00A0802D */ daddu $s0, $a1, $zero -/* CD97EC 8024250C 8E63000C */ lw $v1, 0xc($s3) -/* CD97F0 80242510 0260202D */ daddu $a0, $s3, $zero -/* CD97F4 80242514 8C650000 */ lw $a1, ($v1) -/* CD97F8 80242518 0C0B1EAF */ jal get_variable -/* CD97FC 8024251C 0040902D */ daddu $s2, $v0, $zero -/* CD9800 80242520 AFA00028 */ sw $zero, 0x28($sp) -/* CD9804 80242524 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD9808 80242528 8C630030 */ lw $v1, 0x30($v1) -/* CD980C 8024252C AFA3002C */ sw $v1, 0x2c($sp) -/* CD9810 80242530 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD9814 80242534 8C63001C */ lw $v1, 0x1c($v1) -/* CD9818 80242538 AFA30030 */ sw $v1, 0x30($sp) -/* CD981C 8024253C 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD9820 80242540 8C630024 */ lw $v1, 0x24($v1) -/* CD9824 80242544 AFA30034 */ sw $v1, 0x34($sp) -/* CD9828 80242548 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD982C 8024254C 8C630028 */ lw $v1, 0x28($v1) -/* CD9830 80242550 27B50028 */ addiu $s5, $sp, 0x28 -/* CD9834 80242554 AFA30038 */ sw $v1, 0x38($sp) -/* CD9838 80242558 8E2300D0 */ lw $v1, 0xd0($s1) -/* CD983C 8024255C 3C0142C8 */ lui $at, 0x42c8 -/* CD9840 80242560 44810000 */ mtc1 $at, $f0 -/* CD9844 80242564 8C63002C */ lw $v1, 0x2c($v1) -/* CD9848 80242568 0040A02D */ daddu $s4, $v0, $zero -/* CD984C 8024256C E7A00040 */ swc1 $f0, 0x40($sp) -/* CD9850 80242570 A7A00044 */ sh $zero, 0x44($sp) -/* CD9854 80242574 12000009 */ beqz $s0, .L8024259C -/* CD9858 80242578 AFA3003C */ sw $v1, 0x3c($sp) -/* CD985C 8024257C 864300A8 */ lh $v1, 0xa8($s2) -/* CD9860 80242580 8E2200B0 */ lw $v0, 0xb0($s1) -/* CD9864 80242584 AE20008C */ sw $zero, 0x8c($s1) -/* CD9868 80242588 A22000B5 */ sb $zero, 0xb5($s1) -/* CD986C 8024258C 34420008 */ ori $v0, $v0, 8 -/* CD9870 80242590 AE230084 */ sw $v1, 0x84($s1) -/* CD9874 80242594 0809096B */ j .L802425AC -/* CD9878 80242598 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024259C: -/* CD987C 8024259C 8E2200B0 */ lw $v0, 0xb0($s1) -/* CD9880 802425A0 30420004 */ andi $v0, $v0, 4 -/* CD9884 802425A4 10400047 */ beqz $v0, .L802426C4 -/* CD9888 802425A8 00000000 */ nop -.L802425AC: -/* CD988C 802425AC AE600070 */ sw $zero, 0x70($s3) -/* CD9890 802425B0 A640008E */ sh $zero, 0x8e($s2) -/* CD9894 802425B4 8E2300CC */ lw $v1, 0xcc($s1) -/* CD9898 802425B8 2404F7FF */ addiu $a0, $zero, -0x801 -/* CD989C 802425BC A2200007 */ sb $zero, 7($s1) -/* CD98A0 802425C0 8E420000 */ lw $v0, ($s2) -/* CD98A4 802425C4 8C630000 */ lw $v1, ($v1) -/* CD98A8 802425C8 00441024 */ and $v0, $v0, $a0 -/* CD98AC 802425CC AE420000 */ sw $v0, ($s2) -/* CD98B0 802425D0 AE430028 */ sw $v1, 0x28($s2) -/* CD98B4 802425D4 96220086 */ lhu $v0, 0x86($s1) -/* CD98B8 802425D8 A64200A8 */ sh $v0, 0xa8($s2) -/* CD98BC 802425DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* CD98C0 802425E0 AE200090 */ sw $zero, 0x90($s1) -/* CD98C4 802425E4 8C420034 */ lw $v0, 0x34($v0) -/* CD98C8 802425E8 14400006 */ bnez $v0, .L80242604 -/* CD98CC 802425EC 2403FDFF */ addiu $v1, $zero, -0x201 -/* CD98D0 802425F0 8E420000 */ lw $v0, ($s2) -/* CD98D4 802425F4 2403FFF7 */ addiu $v1, $zero, -9 -/* CD98D8 802425F8 34420200 */ ori $v0, $v0, 0x200 -/* CD98DC 802425FC 08090984 */ j .L80242610 -/* CD98E0 80242600 00431024 */ and $v0, $v0, $v1 -.L80242604: -/* CD98E4 80242604 8E420000 */ lw $v0, ($s2) -/* CD98E8 80242608 00431024 */ and $v0, $v0, $v1 -/* CD98EC 8024260C 34420008 */ ori $v0, $v0, 8 -.L80242610: -/* CD98F0 80242610 AE420000 */ sw $v0, ($s2) -/* CD98F4 80242614 8E2200B0 */ lw $v0, 0xb0($s1) -/* CD98F8 80242618 30420004 */ andi $v0, $v0, 4 -/* CD98FC 8024261C 1040001E */ beqz $v0, .L80242698 -/* CD9900 80242620 24040002 */ addiu $a0, $zero, 2 -/* CD9904 80242624 0240282D */ daddu $a1, $s2, $zero -/* CD9908 80242628 0000302D */ daddu $a2, $zero, $zero -/* CD990C 8024262C 24020063 */ addiu $v0, $zero, 0x63 -/* CD9910 80242630 AE620070 */ sw $v0, 0x70($s3) -/* CD9914 80242634 AE600074 */ sw $zero, 0x74($s3) -/* CD9918 80242638 864300A8 */ lh $v1, 0xa8($s2) -/* CD991C 8024263C 3C013F80 */ lui $at, 0x3f80 -/* CD9920 80242640 44810000 */ mtc1 $at, $f0 -/* CD9924 80242644 3C014000 */ lui $at, 0x4000 -/* CD9928 80242648 44811000 */ mtc1 $at, $f2 -/* CD992C 8024264C 3C01C1A0 */ lui $at, 0xc1a0 -/* CD9930 80242650 44812000 */ mtc1 $at, $f4 -/* CD9934 80242654 24020028 */ addiu $v0, $zero, 0x28 -/* CD9938 80242658 AFA2001C */ sw $v0, 0x1c($sp) -/* CD993C 8024265C 44833000 */ mtc1 $v1, $f6 -/* CD9940 80242660 00000000 */ nop -/* CD9944 80242664 468031A0 */ cvt.s.w $f6, $f6 -/* CD9948 80242668 44073000 */ mfc1 $a3, $f6 -/* CD994C 8024266C 27A20048 */ addiu $v0, $sp, 0x48 -/* CD9950 80242670 AFA20020 */ sw $v0, 0x20($sp) -/* CD9954 80242674 E7A00010 */ swc1 $f0, 0x10($sp) -/* CD9958 80242678 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD995C 8024267C 0C01BFA4 */ jal fx_emote -/* CD9960 80242680 E7A40018 */ swc1 $f4, 0x18($sp) -/* CD9964 80242684 8E2200B0 */ lw $v0, 0xb0($s1) -/* CD9968 80242688 2403FFFB */ addiu $v1, $zero, -5 -/* CD996C 8024268C 00431024 */ and $v0, $v0, $v1 -/* CD9970 80242690 080909B1 */ j .L802426C4 -/* CD9974 80242694 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242698: -/* CD9978 80242698 8E220000 */ lw $v0, ($s1) -/* CD997C 8024269C 3C034000 */ lui $v1, 0x4000 -/* CD9980 802426A0 00431024 */ and $v0, $v0, $v1 -/* CD9984 802426A4 10400007 */ beqz $v0, .L802426C4 -/* CD9988 802426A8 3C03BFFF */ lui $v1, 0xbfff -/* CD998C 802426AC 2402000C */ addiu $v0, $zero, 0xc -/* CD9990 802426B0 AE620070 */ sw $v0, 0x70($s3) -/* CD9994 802426B4 8E220000 */ lw $v0, ($s1) -/* CD9998 802426B8 3463FFFF */ ori $v1, $v1, 0xffff -/* CD999C 802426BC 00431024 */ and $v0, $v0, $v1 -/* CD99A0 802426C0 AE220000 */ sw $v0, ($s1) -.L802426C4: -/* CD99A4 802426C4 8E220090 */ lw $v0, 0x90($s1) -/* CD99A8 802426C8 1840000C */ blez $v0, .L802426FC -/* CD99AC 802426CC 2442FFFF */ addiu $v0, $v0, -1 -/* CD99B0 802426D0 14400087 */ bnez $v0, .L802428F0 -/* CD99B4 802426D4 AE220090 */ sw $v0, 0x90($s1) -/* CD99B8 802426D8 3C03FFAA */ lui $v1, 0xffaa -/* CD99BC 802426DC 8E420028 */ lw $v0, 0x28($s2) -/* CD99C0 802426E0 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* CD99C4 802426E4 00431021 */ addu $v0, $v0, $v1 -/* CD99C8 802426E8 2C420002 */ sltiu $v0, $v0, 2 -/* CD99CC 802426EC 10400003 */ beqz $v0, .L802426FC -/* CD99D0 802426F0 3C020055 */ lui $v0, 0x55 -/* CD99D4 802426F4 3442000C */ ori $v0, $v0, 0xc -/* CD99D8 802426F8 AE420028 */ sw $v0, 0x28($s2) -.L802426FC: -/* CD99DC 802426FC 8E630070 */ lw $v1, 0x70($s3) -/* CD99E0 80242700 2402000C */ addiu $v0, $zero, 0xc -/* CD99E4 80242704 10620048 */ beq $v1, $v0, .L80242828 -/* CD99E8 80242708 2862000D */ slti $v0, $v1, 0xd -/* CD99EC 8024270C 1040000F */ beqz $v0, .L8024274C -/* CD99F0 80242710 24100001 */ addiu $s0, $zero, 1 -/* CD99F4 80242714 1070001E */ beq $v1, $s0, .L80242790 -/* CD99F8 80242718 28620002 */ slti $v0, $v1, 2 -/* CD99FC 8024271C 10400005 */ beqz $v0, .L80242734 -/* CD9A00 80242720 24020002 */ addiu $v0, $zero, 2 -/* CD9A04 80242724 10600015 */ beqz $v1, .L8024277C -/* CD9A08 80242728 0260202D */ daddu $a0, $s3, $zero -/* CD9A0C 8024272C 08090A21 */ j .L80242884 -/* CD9A10 80242730 00000000 */ nop -.L80242734: -/* CD9A14 80242734 1062001C */ beq $v1, $v0, .L802427A8 -/* CD9A18 80242738 24020003 */ addiu $v0, $zero, 3 -/* CD9A1C 8024273C 10620035 */ beq $v1, $v0, .L80242814 -/* CD9A20 80242740 0260202D */ daddu $a0, $s3, $zero -/* CD9A24 80242744 08090A21 */ j .L80242884 -/* CD9A28 80242748 00000000 */ nop -.L8024274C: -/* CD9A2C 8024274C 2402000E */ addiu $v0, $zero, 0xe -/* CD9A30 80242750 1062003F */ beq $v1, $v0, .L80242850 -/* CD9A34 80242754 0062102A */ slt $v0, $v1, $v0 -/* CD9A38 80242758 14400038 */ bnez $v0, .L8024283C -/* CD9A3C 8024275C 0260202D */ daddu $a0, $s3, $zero -/* CD9A40 80242760 2402000F */ addiu $v0, $zero, 0xf -/* CD9A44 80242764 10620040 */ beq $v1, $v0, .L80242868 -/* CD9A48 80242768 24020063 */ addiu $v0, $zero, 0x63 -/* CD9A4C 8024276C 10620043 */ beq $v1, $v0, .L8024287C -/* CD9A50 80242770 00000000 */ nop -/* CD9A54 80242774 08090A21 */ j .L80242884 -/* CD9A58 80242778 00000000 */ nop -.L8024277C: -/* CD9A5C 8024277C 0280282D */ daddu $a1, $s4, $zero -/* CD9A60 80242780 0C012568 */ jal func_800495A0 -/* CD9A64 80242784 02A0302D */ daddu $a2, $s5, $zero -/* CD9A68 80242788 96220086 */ lhu $v0, 0x86($s1) -/* CD9A6C 8024278C A64200A8 */ sh $v0, 0xa8($s2) -.L80242790: -/* CD9A70 80242790 0260202D */ daddu $a0, $s3, $zero -/* CD9A74 80242794 0280282D */ daddu $a1, $s4, $zero -/* CD9A78 80242798 0C0125AE */ jal func_800496B8 -/* CD9A7C 8024279C 02A0302D */ daddu $a2, $s5, $zero -/* CD9A80 802427A0 08090A21 */ j .L80242884 -/* CD9A84 802427A4 00000000 */ nop -.L802427A8: -/* CD9A88 802427A8 0260202D */ daddu $a0, $s3, $zero -/* CD9A8C 802427AC 0280282D */ daddu $a1, $s4, $zero -/* CD9A90 802427B0 0C0126D1 */ jal func_80049B44 -/* CD9A94 802427B4 02A0302D */ daddu $a2, $s5, $zero -/* CD9A98 802427B8 8E230088 */ lw $v1, 0x88($s1) -/* CD9A9C 802427BC 24020006 */ addiu $v0, $zero, 6 -/* CD9AA0 802427C0 14620014 */ bne $v1, $v0, .L80242814 -/* CD9AA4 802427C4 0260202D */ daddu $a0, $s3, $zero -/* CD9AA8 802427C8 0C00A67F */ jal rand_int -/* CD9AAC 802427CC 24040064 */ addiu $a0, $zero, 0x64 -/* CD9AB0 802427D0 28420021 */ slti $v0, $v0, 0x21 -/* CD9AB4 802427D4 5040000F */ beql $v0, $zero, .L80242814 -/* CD9AB8 802427D8 0260202D */ daddu $a0, $s3, $zero -/* CD9ABC 802427DC 8E22008C */ lw $v0, 0x8c($s1) -/* CD9AC0 802427E0 10400005 */ beqz $v0, .L802427F8 -/* CD9AC4 802427E4 3C020055 */ lui $v0, 0x55 -/* CD9AC8 802427E8 3442002F */ ori $v0, $v0, 0x2f -/* CD9ACC 802427EC AE20008C */ sw $zero, 0x8c($s1) -/* CD9AD0 802427F0 08090A01 */ j .L80242804 -/* CD9AD4 802427F4 A22000B5 */ sb $zero, 0xb5($s1) -.L802427F8: -/* CD9AD8 802427F8 3442002E */ ori $v0, $v0, 0x2e -/* CD9ADC 802427FC AE30008C */ sw $s0, 0x8c($s1) -/* CD9AE0 80242800 A23000B5 */ sb $s0, 0xb5($s1) -.L80242804: -/* CD9AE4 80242804 AE420028 */ sw $v0, 0x28($s2) -/* CD9AE8 80242808 24020007 */ addiu $v0, $zero, 7 -/* CD9AEC 8024280C 08090A3C */ j .L802428F0 -/* CD9AF0 80242810 AE220090 */ sw $v0, 0x90($s1) -.L80242814: -/* CD9AF4 80242814 0280282D */ daddu $a1, $s4, $zero -/* CD9AF8 80242818 0C012701 */ jal func_80049C04 -/* CD9AFC 8024281C 02A0302D */ daddu $a2, $s5, $zero -/* CD9B00 80242820 08090A21 */ j .L80242884 -/* CD9B04 80242824 00000000 */ nop -.L80242828: -/* CD9B08 80242828 0260202D */ daddu $a0, $s3, $zero -/* CD9B0C 8024282C 0280282D */ daddu $a1, $s4, $zero -/* CD9B10 80242830 0C090851 */ jal func_80242144 -/* CD9B14 80242834 02A0302D */ daddu $a2, $s5, $zero -/* CD9B18 80242838 0260202D */ daddu $a0, $s3, $zero -.L8024283C: -/* CD9B1C 8024283C 0280282D */ daddu $a1, $s4, $zero -/* CD9B20 80242840 0C090870 */ jal func_802421C0 -/* CD9B24 80242844 02A0302D */ daddu $a2, $s5, $zero -/* CD9B28 80242848 08090A21 */ j .L80242884 -/* CD9B2C 8024284C 00000000 */ nop -.L80242850: -/* CD9B30 80242850 0260202D */ daddu $a0, $s3, $zero -/* CD9B34 80242854 0280282D */ daddu $a1, $s4, $zero -/* CD9B38 80242858 0C0908BD */ jal func_802422F4 -/* CD9B3C 8024285C 02A0302D */ daddu $a2, $s5, $zero -/* CD9B40 80242860 08090A21 */ j .L80242884 -/* CD9B44 80242864 00000000 */ nop -.L80242868: -/* CD9B48 80242868 0280282D */ daddu $a1, $s4, $zero -/* CD9B4C 8024286C 0C090916 */ jal func_80242458 -/* CD9B50 80242870 02A0302D */ daddu $a2, $s5, $zero -/* CD9B54 80242874 08090A21 */ j .L80242884 -/* CD9B58 80242878 00000000 */ nop -.L8024287C: -/* CD9B5C 8024287C 0C0129CF */ jal func_8004A73C -/* CD9B60 80242880 0260202D */ daddu $a0, $s3, $zero -.L80242884: -/* CD9B64 80242884 8E230088 */ lw $v1, 0x88($s1) -/* CD9B68 80242888 24020006 */ addiu $v0, $zero, 6 -/* CD9B6C 8024288C 14620019 */ bne $v1, $v0, .L802428F4 -/* CD9B70 80242890 0000102D */ daddu $v0, $zero, $zero -/* CD9B74 80242894 8E22008C */ lw $v0, 0x8c($s1) -/* CD9B78 80242898 10400003 */ beqz $v0, .L802428A8 -/* CD9B7C 8024289C 24020001 */ addiu $v0, $zero, 1 -/* CD9B80 802428A0 08090A2B */ j .L802428AC -/* CD9B84 802428A4 A22200B5 */ sb $v0, 0xb5($s1) -.L802428A8: -/* CD9B88 802428A8 A22000B5 */ sb $zero, 0xb5($s1) -.L802428AC: -/* CD9B8C 802428AC 8E22008C */ lw $v0, 0x8c($s1) -/* CD9B90 802428B0 1040000F */ beqz $v0, .L802428F0 -/* CD9B94 802428B4 3C03FFAA */ lui $v1, 0xffaa -/* CD9B98 802428B8 8E420028 */ lw $v0, 0x28($s2) -/* CD9B9C 802428BC 3463FFFC */ ori $v1, $v1, 0xfffc -/* CD9BA0 802428C0 00431821 */ addu $v1, $v0, $v1 -/* CD9BA4 802428C4 2C620015 */ sltiu $v0, $v1, 0x15 -/* CD9BA8 802428C8 10400009 */ beqz $v0, .L802428F0 -/* CD9BAC 802428CC 00031080 */ sll $v0, $v1, 2 -/* CD9BB0 802428D0 3C018024 */ lui $at, 0x8024 -/* CD9BB4 802428D4 00220821 */ addu $at, $at, $v0 -/* CD9BB8 802428D8 8C225360 */ lw $v0, 0x5360($at) -/* CD9BBC 802428DC 00400008 */ jr $v0 -/* CD9BC0 802428E0 00000000 */ nop -/* CD9BC4 802428E4 8E420028 */ lw $v0, 0x28($s2) -/* CD9BC8 802428E8 24420001 */ addiu $v0, $v0, 1 -/* CD9BCC 802428EC AE420028 */ sw $v0, 0x28($s2) -.L802428F0: -/* CD9BD0 802428F0 0000102D */ daddu $v0, $zero, $zero -.L802428F4: -/* CD9BD4 802428F4 8FBF0068 */ lw $ra, 0x68($sp) -/* CD9BD8 802428F8 8FB50064 */ lw $s5, 0x64($sp) -/* CD9BDC 802428FC 8FB40060 */ lw $s4, 0x60($sp) -/* CD9BE0 80242900 8FB3005C */ lw $s3, 0x5c($sp) -/* CD9BE4 80242904 8FB20058 */ lw $s2, 0x58($sp) -/* CD9BE8 80242908 8FB10054 */ lw $s1, 0x54($sp) -/* CD9BEC 8024290C 8FB00050 */ lw $s0, 0x50($sp) -/* CD9BF0 80242910 03E00008 */ jr $ra -/* CD9BF4 80242914 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s new file mode 100644 index 0000000000..8d41f9d02b --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_802424D8_CD97B8.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424D8_CD97B8 +/* CD97B8 802424D8 27BDFF90 */ addiu $sp, $sp, -0x70 +/* CD97BC 802424DC AFB3005C */ sw $s3, 0x5c($sp) +/* CD97C0 802424E0 0080982D */ daddu $s3, $a0, $zero +/* CD97C4 802424E4 AFBF0068 */ sw $ra, 0x68($sp) +/* CD97C8 802424E8 AFB50064 */ sw $s5, 0x64($sp) +/* CD97CC 802424EC AFB40060 */ sw $s4, 0x60($sp) +/* CD97D0 802424F0 AFB20058 */ sw $s2, 0x58($sp) +/* CD97D4 802424F4 AFB10054 */ sw $s1, 0x54($sp) +/* CD97D8 802424F8 AFB00050 */ sw $s0, 0x50($sp) +/* CD97DC 802424FC 8E710148 */ lw $s1, 0x148($s3) +/* CD97E0 80242500 86240008 */ lh $a0, 8($s1) +/* CD97E4 80242504 0C00EABB */ jal get_npc_unsafe +/* CD97E8 80242508 00A0802D */ daddu $s0, $a1, $zero +/* CD97EC 8024250C 8E63000C */ lw $v1, 0xc($s3) +/* CD97F0 80242510 0260202D */ daddu $a0, $s3, $zero +/* CD97F4 80242514 8C650000 */ lw $a1, ($v1) +/* CD97F8 80242518 0C0B1EAF */ jal get_variable +/* CD97FC 8024251C 0040902D */ daddu $s2, $v0, $zero +/* CD9800 80242520 AFA00028 */ sw $zero, 0x28($sp) +/* CD9804 80242524 8E2300D0 */ lw $v1, 0xd0($s1) +/* CD9808 80242528 8C630030 */ lw $v1, 0x30($v1) +/* CD980C 8024252C AFA3002C */ sw $v1, 0x2c($sp) +/* CD9810 80242530 8E2300D0 */ lw $v1, 0xd0($s1) +/* CD9814 80242534 8C63001C */ lw $v1, 0x1c($v1) +/* CD9818 80242538 AFA30030 */ sw $v1, 0x30($sp) +/* CD981C 8024253C 8E2300D0 */ lw $v1, 0xd0($s1) +/* CD9820 80242540 8C630024 */ lw $v1, 0x24($v1) +/* CD9824 80242544 AFA30034 */ sw $v1, 0x34($sp) +/* CD9828 80242548 8E2300D0 */ lw $v1, 0xd0($s1) +/* CD982C 8024254C 8C630028 */ lw $v1, 0x28($v1) +/* CD9830 80242550 27B50028 */ addiu $s5, $sp, 0x28 +/* CD9834 80242554 AFA30038 */ sw $v1, 0x38($sp) +/* CD9838 80242558 8E2300D0 */ lw $v1, 0xd0($s1) +/* CD983C 8024255C 3C0142C8 */ lui $at, 0x42c8 +/* CD9840 80242560 44810000 */ mtc1 $at, $f0 +/* CD9844 80242564 8C63002C */ lw $v1, 0x2c($v1) +/* CD9848 80242568 0040A02D */ daddu $s4, $v0, $zero +/* CD984C 8024256C E7A00040 */ swc1 $f0, 0x40($sp) +/* CD9850 80242570 A7A00044 */ sh $zero, 0x44($sp) +/* CD9854 80242574 12000009 */ beqz $s0, .L8024259C +/* CD9858 80242578 AFA3003C */ sw $v1, 0x3c($sp) +/* CD985C 8024257C 864300A8 */ lh $v1, 0xa8($s2) +/* CD9860 80242580 8E2200B0 */ lw $v0, 0xb0($s1) +/* CD9864 80242584 AE20008C */ sw $zero, 0x8c($s1) +/* CD9868 80242588 A22000B5 */ sb $zero, 0xb5($s1) +/* CD986C 8024258C 34420008 */ ori $v0, $v0, 8 +/* CD9870 80242590 AE230084 */ sw $v1, 0x84($s1) +/* CD9874 80242594 0809096B */ j .L802425AC +/* CD9878 80242598 AE2200B0 */ sw $v0, 0xb0($s1) +.L8024259C: +/* CD987C 8024259C 8E2200B0 */ lw $v0, 0xb0($s1) +/* CD9880 802425A0 30420004 */ andi $v0, $v0, 4 +/* CD9884 802425A4 10400047 */ beqz $v0, .L802426C4 +/* CD9888 802425A8 00000000 */ nop +.L802425AC: +/* CD988C 802425AC AE600070 */ sw $zero, 0x70($s3) +/* CD9890 802425B0 A640008E */ sh $zero, 0x8e($s2) +/* CD9894 802425B4 8E2300CC */ lw $v1, 0xcc($s1) +/* CD9898 802425B8 2404F7FF */ addiu $a0, $zero, -0x801 +/* CD989C 802425BC A2200007 */ sb $zero, 7($s1) +/* CD98A0 802425C0 8E420000 */ lw $v0, ($s2) +/* CD98A4 802425C4 8C630000 */ lw $v1, ($v1) +/* CD98A8 802425C8 00441024 */ and $v0, $v0, $a0 +/* CD98AC 802425CC AE420000 */ sw $v0, ($s2) +/* CD98B0 802425D0 AE430028 */ sw $v1, 0x28($s2) +/* CD98B4 802425D4 96220086 */ lhu $v0, 0x86($s1) +/* CD98B8 802425D8 A64200A8 */ sh $v0, 0xa8($s2) +/* CD98BC 802425DC 8E2200D0 */ lw $v0, 0xd0($s1) +/* CD98C0 802425E0 AE200090 */ sw $zero, 0x90($s1) +/* CD98C4 802425E4 8C420034 */ lw $v0, 0x34($v0) +/* CD98C8 802425E8 14400006 */ bnez $v0, .L80242604 +/* CD98CC 802425EC 2403FDFF */ addiu $v1, $zero, -0x201 +/* CD98D0 802425F0 8E420000 */ lw $v0, ($s2) +/* CD98D4 802425F4 2403FFF7 */ addiu $v1, $zero, -9 +/* CD98D8 802425F8 34420200 */ ori $v0, $v0, 0x200 +/* CD98DC 802425FC 08090984 */ j .L80242610 +/* CD98E0 80242600 00431024 */ and $v0, $v0, $v1 +.L80242604: +/* CD98E4 80242604 8E420000 */ lw $v0, ($s2) +/* CD98E8 80242608 00431024 */ and $v0, $v0, $v1 +/* CD98EC 8024260C 34420008 */ ori $v0, $v0, 8 +.L80242610: +/* CD98F0 80242610 AE420000 */ sw $v0, ($s2) +/* CD98F4 80242614 8E2200B0 */ lw $v0, 0xb0($s1) +/* CD98F8 80242618 30420004 */ andi $v0, $v0, 4 +/* CD98FC 8024261C 1040001E */ beqz $v0, .L80242698 +/* CD9900 80242620 24040002 */ addiu $a0, $zero, 2 +/* CD9904 80242624 0240282D */ daddu $a1, $s2, $zero +/* CD9908 80242628 0000302D */ daddu $a2, $zero, $zero +/* CD990C 8024262C 24020063 */ addiu $v0, $zero, 0x63 +/* CD9910 80242630 AE620070 */ sw $v0, 0x70($s3) +/* CD9914 80242634 AE600074 */ sw $zero, 0x74($s3) +/* CD9918 80242638 864300A8 */ lh $v1, 0xa8($s2) +/* CD991C 8024263C 3C013F80 */ lui $at, 0x3f80 +/* CD9920 80242640 44810000 */ mtc1 $at, $f0 +/* CD9924 80242644 3C014000 */ lui $at, 0x4000 +/* CD9928 80242648 44811000 */ mtc1 $at, $f2 +/* CD992C 8024264C 3C01C1A0 */ lui $at, 0xc1a0 +/* CD9930 80242650 44812000 */ mtc1 $at, $f4 +/* CD9934 80242654 24020028 */ addiu $v0, $zero, 0x28 +/* CD9938 80242658 AFA2001C */ sw $v0, 0x1c($sp) +/* CD993C 8024265C 44833000 */ mtc1 $v1, $f6 +/* CD9940 80242660 00000000 */ nop +/* CD9944 80242664 468031A0 */ cvt.s.w $f6, $f6 +/* CD9948 80242668 44073000 */ mfc1 $a3, $f6 +/* CD994C 8024266C 27A20048 */ addiu $v0, $sp, 0x48 +/* CD9950 80242670 AFA20020 */ sw $v0, 0x20($sp) +/* CD9954 80242674 E7A00010 */ swc1 $f0, 0x10($sp) +/* CD9958 80242678 E7A20014 */ swc1 $f2, 0x14($sp) +/* CD995C 8024267C 0C01BFA4 */ jal fx_emote +/* CD9960 80242680 E7A40018 */ swc1 $f4, 0x18($sp) +/* CD9964 80242684 8E2200B0 */ lw $v0, 0xb0($s1) +/* CD9968 80242688 2403FFFB */ addiu $v1, $zero, -5 +/* CD996C 8024268C 00431024 */ and $v0, $v0, $v1 +/* CD9970 80242690 080909B1 */ j .L802426C4 +/* CD9974 80242694 AE2200B0 */ sw $v0, 0xb0($s1) +.L80242698: +/* CD9978 80242698 8E220000 */ lw $v0, ($s1) +/* CD997C 8024269C 3C034000 */ lui $v1, 0x4000 +/* CD9980 802426A0 00431024 */ and $v0, $v0, $v1 +/* CD9984 802426A4 10400007 */ beqz $v0, .L802426C4 +/* CD9988 802426A8 3C03BFFF */ lui $v1, 0xbfff +/* CD998C 802426AC 2402000C */ addiu $v0, $zero, 0xc +/* CD9990 802426B0 AE620070 */ sw $v0, 0x70($s3) +/* CD9994 802426B4 8E220000 */ lw $v0, ($s1) +/* CD9998 802426B8 3463FFFF */ ori $v1, $v1, 0xffff +/* CD999C 802426BC 00431024 */ and $v0, $v0, $v1 +/* CD99A0 802426C0 AE220000 */ sw $v0, ($s1) +.L802426C4: +/* CD99A4 802426C4 8E220090 */ lw $v0, 0x90($s1) +/* CD99A8 802426C8 1840000C */ blez $v0, .L802426FC +/* CD99AC 802426CC 2442FFFF */ addiu $v0, $v0, -1 +/* CD99B0 802426D0 14400087 */ bnez $v0, .L802428F0 +/* CD99B4 802426D4 AE220090 */ sw $v0, 0x90($s1) +/* CD99B8 802426D8 3C03FFAA */ lui $v1, 0xffaa +/* CD99BC 802426DC 8E420028 */ lw $v0, 0x28($s2) +/* CD99C0 802426E0 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* CD99C4 802426E4 00431021 */ addu $v0, $v0, $v1 +/* CD99C8 802426E8 2C420002 */ sltiu $v0, $v0, 2 +/* CD99CC 802426EC 10400003 */ beqz $v0, .L802426FC +/* CD99D0 802426F0 3C020055 */ lui $v0, 0x55 +/* CD99D4 802426F4 3442000C */ ori $v0, $v0, 0xc +/* CD99D8 802426F8 AE420028 */ sw $v0, 0x28($s2) +.L802426FC: +/* CD99DC 802426FC 8E630070 */ lw $v1, 0x70($s3) +/* CD99E0 80242700 2402000C */ addiu $v0, $zero, 0xc +/* CD99E4 80242704 10620048 */ beq $v1, $v0, .L80242828 +/* CD99E8 80242708 2862000D */ slti $v0, $v1, 0xd +/* CD99EC 8024270C 1040000F */ beqz $v0, .L8024274C +/* CD99F0 80242710 24100001 */ addiu $s0, $zero, 1 +/* CD99F4 80242714 1070001E */ beq $v1, $s0, .L80242790 +/* CD99F8 80242718 28620002 */ slti $v0, $v1, 2 +/* CD99FC 8024271C 10400005 */ beqz $v0, .L80242734 +/* CD9A00 80242720 24020002 */ addiu $v0, $zero, 2 +/* CD9A04 80242724 10600015 */ beqz $v1, .L8024277C +/* CD9A08 80242728 0260202D */ daddu $a0, $s3, $zero +/* CD9A0C 8024272C 08090A21 */ j .L80242884 +/* CD9A10 80242730 00000000 */ nop +.L80242734: +/* CD9A14 80242734 1062001C */ beq $v1, $v0, .L802427A8 +/* CD9A18 80242738 24020003 */ addiu $v0, $zero, 3 +/* CD9A1C 8024273C 10620035 */ beq $v1, $v0, .L80242814 +/* CD9A20 80242740 0260202D */ daddu $a0, $s3, $zero +/* CD9A24 80242744 08090A21 */ j .L80242884 +/* CD9A28 80242748 00000000 */ nop +.L8024274C: +/* CD9A2C 8024274C 2402000E */ addiu $v0, $zero, 0xe +/* CD9A30 80242750 1062003F */ beq $v1, $v0, .L80242850 +/* CD9A34 80242754 0062102A */ slt $v0, $v1, $v0 +/* CD9A38 80242758 14400038 */ bnez $v0, .L8024283C +/* CD9A3C 8024275C 0260202D */ daddu $a0, $s3, $zero +/* CD9A40 80242760 2402000F */ addiu $v0, $zero, 0xf +/* CD9A44 80242764 10620040 */ beq $v1, $v0, .L80242868 +/* CD9A48 80242768 24020063 */ addiu $v0, $zero, 0x63 +/* CD9A4C 8024276C 10620043 */ beq $v1, $v0, .L8024287C +/* CD9A50 80242770 00000000 */ nop +/* CD9A54 80242774 08090A21 */ j .L80242884 +/* CD9A58 80242778 00000000 */ nop +.L8024277C: +/* CD9A5C 8024277C 0280282D */ daddu $a1, $s4, $zero +/* CD9A60 80242780 0C012568 */ jal func_800495A0 +/* CD9A64 80242784 02A0302D */ daddu $a2, $s5, $zero +/* CD9A68 80242788 96220086 */ lhu $v0, 0x86($s1) +/* CD9A6C 8024278C A64200A8 */ sh $v0, 0xa8($s2) +.L80242790: +/* CD9A70 80242790 0260202D */ daddu $a0, $s3, $zero +/* CD9A74 80242794 0280282D */ daddu $a1, $s4, $zero +/* CD9A78 80242798 0C0125AE */ jal func_800496B8 +/* CD9A7C 8024279C 02A0302D */ daddu $a2, $s5, $zero +/* CD9A80 802427A0 08090A21 */ j .L80242884 +/* CD9A84 802427A4 00000000 */ nop +.L802427A8: +/* CD9A88 802427A8 0260202D */ daddu $a0, $s3, $zero +/* CD9A8C 802427AC 0280282D */ daddu $a1, $s4, $zero +/* CD9A90 802427B0 0C0126D1 */ jal func_80049B44 +/* CD9A94 802427B4 02A0302D */ daddu $a2, $s5, $zero +/* CD9A98 802427B8 8E230088 */ lw $v1, 0x88($s1) +/* CD9A9C 802427BC 24020006 */ addiu $v0, $zero, 6 +/* CD9AA0 802427C0 14620014 */ bne $v1, $v0, .L80242814 +/* CD9AA4 802427C4 0260202D */ daddu $a0, $s3, $zero +/* CD9AA8 802427C8 0C00A67F */ jal rand_int +/* CD9AAC 802427CC 24040064 */ addiu $a0, $zero, 0x64 +/* CD9AB0 802427D0 28420021 */ slti $v0, $v0, 0x21 +/* CD9AB4 802427D4 5040000F */ beql $v0, $zero, .L80242814 +/* CD9AB8 802427D8 0260202D */ daddu $a0, $s3, $zero +/* CD9ABC 802427DC 8E22008C */ lw $v0, 0x8c($s1) +/* CD9AC0 802427E0 10400005 */ beqz $v0, .L802427F8 +/* CD9AC4 802427E4 3C020055 */ lui $v0, 0x55 +/* CD9AC8 802427E8 3442002F */ ori $v0, $v0, 0x2f +/* CD9ACC 802427EC AE20008C */ sw $zero, 0x8c($s1) +/* CD9AD0 802427F0 08090A01 */ j .L80242804 +/* CD9AD4 802427F4 A22000B5 */ sb $zero, 0xb5($s1) +.L802427F8: +/* CD9AD8 802427F8 3442002E */ ori $v0, $v0, 0x2e +/* CD9ADC 802427FC AE30008C */ sw $s0, 0x8c($s1) +/* CD9AE0 80242800 A23000B5 */ sb $s0, 0xb5($s1) +.L80242804: +/* CD9AE4 80242804 AE420028 */ sw $v0, 0x28($s2) +/* CD9AE8 80242808 24020007 */ addiu $v0, $zero, 7 +/* CD9AEC 8024280C 08090A3C */ j .L802428F0 +/* CD9AF0 80242810 AE220090 */ sw $v0, 0x90($s1) +.L80242814: +/* CD9AF4 80242814 0280282D */ daddu $a1, $s4, $zero +/* CD9AF8 80242818 0C012701 */ jal func_80049C04 +/* CD9AFC 8024281C 02A0302D */ daddu $a2, $s5, $zero +/* CD9B00 80242820 08090A21 */ j .L80242884 +/* CD9B04 80242824 00000000 */ nop +.L80242828: +/* CD9B08 80242828 0260202D */ daddu $a0, $s3, $zero +/* CD9B0C 8024282C 0280282D */ daddu $a1, $s4, $zero +/* CD9B10 80242830 0C090851 */ jal func_80242144_CD9424 +/* CD9B14 80242834 02A0302D */ daddu $a2, $s5, $zero +/* CD9B18 80242838 0260202D */ daddu $a0, $s3, $zero +.L8024283C: +/* CD9B1C 8024283C 0280282D */ daddu $a1, $s4, $zero +/* CD9B20 80242840 0C090870 */ jal func_802421C0_CD94A0 +/* CD9B24 80242844 02A0302D */ daddu $a2, $s5, $zero +/* CD9B28 80242848 08090A21 */ j .L80242884 +/* CD9B2C 8024284C 00000000 */ nop +.L80242850: +/* CD9B30 80242850 0260202D */ daddu $a0, $s3, $zero +/* CD9B34 80242854 0280282D */ daddu $a1, $s4, $zero +/* CD9B38 80242858 0C0908BD */ jal func_802422F4_CD95D4 +/* CD9B3C 8024285C 02A0302D */ daddu $a2, $s5, $zero +/* CD9B40 80242860 08090A21 */ j .L80242884 +/* CD9B44 80242864 00000000 */ nop +.L80242868: +/* CD9B48 80242868 0280282D */ daddu $a1, $s4, $zero +/* CD9B4C 8024286C 0C090916 */ jal func_80242458_CD9738 +/* CD9B50 80242870 02A0302D */ daddu $a2, $s5, $zero +/* CD9B54 80242874 08090A21 */ j .L80242884 +/* CD9B58 80242878 00000000 */ nop +.L8024287C: +/* CD9B5C 8024287C 0C0129CF */ jal func_8004A73C +/* CD9B60 80242880 0260202D */ daddu $a0, $s3, $zero +.L80242884: +/* CD9B64 80242884 8E230088 */ lw $v1, 0x88($s1) +/* CD9B68 80242888 24020006 */ addiu $v0, $zero, 6 +/* CD9B6C 8024288C 14620019 */ bne $v1, $v0, .L802428F4 +/* CD9B70 80242890 0000102D */ daddu $v0, $zero, $zero +/* CD9B74 80242894 8E22008C */ lw $v0, 0x8c($s1) +/* CD9B78 80242898 10400003 */ beqz $v0, .L802428A8 +/* CD9B7C 8024289C 24020001 */ addiu $v0, $zero, 1 +/* CD9B80 802428A0 08090A2B */ j .L802428AC +/* CD9B84 802428A4 A22200B5 */ sb $v0, 0xb5($s1) +.L802428A8: +/* CD9B88 802428A8 A22000B5 */ sb $zero, 0xb5($s1) +.L802428AC: +/* CD9B8C 802428AC 8E22008C */ lw $v0, 0x8c($s1) +/* CD9B90 802428B0 1040000F */ beqz $v0, .L802428F0 +/* CD9B94 802428B4 3C03FFAA */ lui $v1, 0xffaa +/* CD9B98 802428B8 8E420028 */ lw $v0, 0x28($s2) +/* CD9B9C 802428BC 3463FFFC */ ori $v1, $v1, 0xfffc +/* CD9BA0 802428C0 00431821 */ addu $v1, $v0, $v1 +/* CD9BA4 802428C4 2C620015 */ sltiu $v0, $v1, 0x15 +/* CD9BA8 802428C8 10400009 */ beqz $v0, .L802428F0 +/* CD9BAC 802428CC 00031080 */ sll $v0, $v1, 2 +/* CD9BB0 802428D0 3C018024 */ lui $at, 0x8024 +/* CD9BB4 802428D4 00220821 */ addu $at, $at, $v0 +/* CD9BB8 802428D8 8C225360 */ lw $v0, 0x5360($at) +/* CD9BBC 802428DC 00400008 */ jr $v0 +/* CD9BC0 802428E0 00000000 */ nop +/* CD9BC4 802428E4 8E420028 */ lw $v0, 0x28($s2) +/* CD9BC8 802428E8 24420001 */ addiu $v0, $v0, 1 +/* CD9BCC 802428EC AE420028 */ sw $v0, 0x28($s2) +.L802428F0: +/* CD9BD0 802428F0 0000102D */ daddu $v0, $zero, $zero +.L802428F4: +/* CD9BD4 802428F4 8FBF0068 */ lw $ra, 0x68($sp) +/* CD9BD8 802428F8 8FB50064 */ lw $s5, 0x64($sp) +/* CD9BDC 802428FC 8FB40060 */ lw $s4, 0x60($sp) +/* CD9BE0 80242900 8FB3005C */ lw $s3, 0x5c($sp) +/* CD9BE4 80242904 8FB20058 */ lw $s2, 0x58($sp) +/* CD9BE8 80242908 8FB10054 */ lw $s1, 0x54($sp) +/* CD9BEC 8024290C 8FB00050 */ lw $s0, 0x50($sp) +/* CD9BF0 80242910 03E00008 */ jr $ra +/* CD9BF4 80242914 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918.s deleted file mode 100644 index 706ec46926..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918.s +++ /dev/null @@ -1,619 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242918 -/* CD9BF8 80242918 27BDFF68 */ addiu $sp, $sp, -0x98 -/* CD9BFC 8024291C AFB5007C */ sw $s5, 0x7c($sp) -/* CD9C00 80242920 0080A82D */ daddu $s5, $a0, $zero -/* CD9C04 80242924 AFBF0080 */ sw $ra, 0x80($sp) -/* CD9C08 80242928 AFB40078 */ sw $s4, 0x78($sp) -/* CD9C0C 8024292C AFB30074 */ sw $s3, 0x74($sp) -/* CD9C10 80242930 AFB20070 */ sw $s2, 0x70($sp) -/* CD9C14 80242934 AFB1006C */ sw $s1, 0x6c($sp) -/* CD9C18 80242938 AFB00068 */ sw $s0, 0x68($sp) -/* CD9C1C 8024293C F7B60090 */ sdc1 $f22, 0x90($sp) -/* CD9C20 80242940 F7B40088 */ sdc1 $f20, 0x88($sp) -/* CD9C24 80242944 8EB20148 */ lw $s2, 0x148($s5) -/* CD9C28 80242948 86440008 */ lh $a0, 8($s2) -/* CD9C2C 8024294C 0C00EABB */ jal get_npc_unsafe -/* CD9C30 80242950 00A0802D */ daddu $s0, $a1, $zero -/* CD9C34 80242954 8EA3000C */ lw $v1, 0xc($s5) -/* CD9C38 80242958 02A0202D */ daddu $a0, $s5, $zero -/* CD9C3C 8024295C 8C650000 */ lw $a1, ($v1) -/* CD9C40 80242960 0C0B1EAF */ jal get_variable -/* CD9C44 80242964 0040882D */ daddu $s1, $v0, $zero -/* CD9C48 80242968 AFA00028 */ sw $zero, 0x28($sp) -/* CD9C4C 8024296C 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD9C50 80242970 8C630030 */ lw $v1, 0x30($v1) -/* CD9C54 80242974 AFA3002C */ sw $v1, 0x2c($sp) -/* CD9C58 80242978 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD9C5C 8024297C 8C63001C */ lw $v1, 0x1c($v1) -/* CD9C60 80242980 AFA30030 */ sw $v1, 0x30($sp) -/* CD9C64 80242984 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD9C68 80242988 8C630024 */ lw $v1, 0x24($v1) -/* CD9C6C 8024298C AFA30034 */ sw $v1, 0x34($sp) -/* CD9C70 80242990 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD9C74 80242994 8C630028 */ lw $v1, 0x28($v1) -/* CD9C78 80242998 27B40028 */ addiu $s4, $sp, 0x28 -/* CD9C7C 8024299C AFA30038 */ sw $v1, 0x38($sp) -/* CD9C80 802429A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* CD9C84 802429A4 3C014282 */ lui $at, 0x4282 -/* CD9C88 802429A8 44810000 */ mtc1 $at, $f0 -/* CD9C8C 802429AC 8C63002C */ lw $v1, 0x2c($v1) -/* CD9C90 802429B0 0040982D */ daddu $s3, $v0, $zero -/* CD9C94 802429B4 E7A00040 */ swc1 $f0, 0x40($sp) -/* CD9C98 802429B8 A7A00044 */ sh $zero, 0x44($sp) -/* CD9C9C 802429BC 12000007 */ beqz $s0, .L802429DC -/* CD9CA0 802429C0 AFA3003C */ sw $v1, 0x3c($sp) -/* CD9CA4 802429C4 8E4200B0 */ lw $v0, 0xb0($s2) -/* CD9CA8 802429C8 862300A8 */ lh $v1, 0xa8($s1) -/* CD9CAC 802429CC 34420008 */ ori $v0, $v0, 8 -/* CD9CB0 802429D0 AE430084 */ sw $v1, 0x84($s2) -/* CD9CB4 802429D4 08090A7B */ j .L802429EC -/* CD9CB8 802429D8 AE4200B0 */ sw $v0, 0xb0($s2) -.L802429DC: -/* CD9CBC 802429DC 8E430094 */ lw $v1, 0x94($s2) -/* CD9CC0 802429E0 24020064 */ addiu $v0, $zero, 0x64 -/* CD9CC4 802429E4 1462001C */ bne $v1, $v0, .L80242A58 -/* CD9CC8 802429E8 00000000 */ nop -.L802429EC: -/* CD9CCC 802429EC 24020064 */ addiu $v0, $zero, 0x64 -/* CD9CD0 802429F0 2404F7FF */ addiu $a0, $zero, -0x801 -/* CD9CD4 802429F4 AEA20070 */ sw $v0, 0x70($s5) -/* CD9CD8 802429F8 A620008E */ sh $zero, 0x8e($s1) -/* CD9CDC 802429FC 8E4300CC */ lw $v1, 0xcc($s2) -/* CD9CE0 80242A00 8E220000 */ lw $v0, ($s1) -/* CD9CE4 80242A04 3C01C47A */ lui $at, 0xc47a -/* CD9CE8 80242A08 44810000 */ mtc1 $at, $f0 -/* CD9CEC 80242A0C 8C630000 */ lw $v1, ($v1) -/* CD9CF0 80242A10 00441024 */ and $v0, $v0, $a0 -/* CD9CF4 80242A14 AE220000 */ sw $v0, ($s1) -/* CD9CF8 80242A18 AE230028 */ sw $v1, 0x28($s1) -/* CD9CFC 80242A1C 8E420000 */ lw $v0, ($s2) -/* CD9D00 80242A20 3C030020 */ lui $v1, 0x20 -/* CD9D04 80242A24 00431025 */ or $v0, $v0, $v1 -/* CD9D08 80242A28 AE420000 */ sw $v0, ($s2) -/* CD9D0C 80242A2C 8E220000 */ lw $v0, ($s1) -/* CD9D10 80242A30 2403FDFF */ addiu $v1, $zero, -0x201 -/* CD9D14 80242A34 00431024 */ and $v0, $v0, $v1 -/* CD9D18 80242A38 34420008 */ ori $v0, $v0, 8 -/* CD9D1C 80242A3C AE220000 */ sw $v0, ($s1) -/* CD9D20 80242A40 2402FFFF */ addiu $v0, $zero, -1 -/* CD9D24 80242A44 AE400094 */ sw $zero, 0x94($s2) -/* CD9D28 80242A48 AE420098 */ sw $v0, 0x98($s2) -/* CD9D2C 80242A4C AE200038 */ sw $zero, 0x38($s1) -/* CD9D30 80242A50 E620003C */ swc1 $f0, 0x3c($s1) -/* CD9D34 80242A54 AE200040 */ sw $zero, 0x40($s1) -.L80242A58: -/* CD9D38 80242A58 8E4200B0 */ lw $v0, 0xb0($s2) -/* CD9D3C 80242A5C 30420004 */ andi $v0, $v0, 4 -/* CD9D40 80242A60 10400030 */ beqz $v0, .L80242B24 -/* CD9D44 80242A64 2403FFFB */ addiu $v1, $zero, -5 -/* CD9D48 80242A68 A620008E */ sh $zero, 0x8e($s1) -/* CD9D4C 80242A6C 96420086 */ lhu $v0, 0x86($s2) -/* CD9D50 80242A70 A62200A8 */ sh $v0, 0xa8($s1) -/* CD9D54 80242A74 8E4200B0 */ lw $v0, 0xb0($s2) -/* CD9D58 80242A78 00431024 */ and $v0, $v0, $v1 -/* CD9D5C 80242A7C AE4200B0 */ sw $v0, 0xb0($s2) -/* CD9D60 80242A80 8E220000 */ lw $v0, ($s1) -/* CD9D64 80242A84 30420800 */ andi $v0, $v0, 0x800 -/* CD9D68 80242A88 1040000A */ beqz $v0, .L80242AB4 -/* CD9D6C 80242A8C 3C02004A */ lui $v0, 0x4a -/* CD9D70 80242A90 3C013F80 */ lui $at, 0x3f80 -/* CD9D74 80242A94 44810000 */ mtc1 $at, $f0 -/* CD9D78 80242A98 34420018 */ ori $v0, $v0, 0x18 -/* CD9D7C 80242A9C AE220028 */ sw $v0, 0x28($s1) -/* CD9D80 80242AA0 24020066 */ addiu $v0, $zero, 0x66 -/* CD9D84 80242AA4 AE200018 */ sw $zero, 0x18($s1) -/* CD9D88 80242AA8 AE20001C */ sw $zero, 0x1c($s1) -/* CD9D8C 80242AAC 08090AC8 */ j .L80242B20 -/* CD9D90 80242AB0 E6200014 */ swc1 $f0, 0x14($s1) -.L80242AB4: -/* CD9D94 80242AB4 24040002 */ addiu $a0, $zero, 2 -/* CD9D98 80242AB8 0220282D */ daddu $a1, $s1, $zero -/* CD9D9C 80242ABC 0000302D */ daddu $a2, $zero, $zero -/* CD9DA0 80242AC0 862300A8 */ lh $v1, 0xa8($s1) -/* CD9DA4 80242AC4 3C013F80 */ lui $at, 0x3f80 -/* CD9DA8 80242AC8 44810000 */ mtc1 $at, $f0 -/* CD9DAC 80242ACC 3C014000 */ lui $at, 0x4000 -/* CD9DB0 80242AD0 44811000 */ mtc1 $at, $f2 -/* CD9DB4 80242AD4 3C01C1A0 */ lui $at, 0xc1a0 -/* CD9DB8 80242AD8 44812000 */ mtc1 $at, $f4 -/* CD9DBC 80242ADC 24020028 */ addiu $v0, $zero, 0x28 -/* CD9DC0 80242AE0 AFA2001C */ sw $v0, 0x1c($sp) -/* CD9DC4 80242AE4 44834000 */ mtc1 $v1, $f8 -/* CD9DC8 80242AE8 00000000 */ nop -/* CD9DCC 80242AEC 46804220 */ cvt.s.w $f8, $f8 -/* CD9DD0 80242AF0 44074000 */ mfc1 $a3, $f8 -/* CD9DD4 80242AF4 27A20048 */ addiu $v0, $sp, 0x48 -/* CD9DD8 80242AF8 AFA20020 */ sw $v0, 0x20($sp) -/* CD9DDC 80242AFC E7A00010 */ swc1 $f0, 0x10($sp) -/* CD9DE0 80242B00 E7A20014 */ swc1 $f2, 0x14($sp) -/* CD9DE4 80242B04 0C01BFA4 */ jal fx_emote -/* CD9DE8 80242B08 E7A40018 */ swc1 $f4, 0x18($sp) -/* CD9DEC 80242B0C 8E4200CC */ lw $v0, 0xcc($s2) -/* CD9DF0 80242B10 8C420000 */ lw $v0, ($v0) -/* CD9DF4 80242B14 AE220028 */ sw $v0, 0x28($s1) -/* CD9DF8 80242B18 240200C8 */ addiu $v0, $zero, 0xc8 -/* CD9DFC 80242B1C AEA00074 */ sw $zero, 0x74($s5) -.L80242B20: -/* CD9E00 80242B20 AEA20070 */ sw $v0, 0x70($s5) -.L80242B24: -/* CD9E04 80242B24 27A2004C */ addiu $v0, $sp, 0x4c -/* CD9E08 80242B28 AFA20010 */ sw $v0, 0x10($sp) -/* CD9E0C 80242B2C 27A20050 */ addiu $v0, $sp, 0x50 -/* CD9E10 80242B30 AFA20014 */ sw $v0, 0x14($sp) -/* CD9E14 80242B34 27A20054 */ addiu $v0, $sp, 0x54 -/* CD9E18 80242B38 AFA20018 */ sw $v0, 0x18($sp) -/* CD9E1C 80242B3C 8E250038 */ lw $a1, 0x38($s1) -/* CD9E20 80242B40 8E26003C */ lw $a2, 0x3c($s1) -/* CD9E24 80242B44 8E270040 */ lw $a3, 0x40($s1) -/* CD9E28 80242B48 0C00B94E */ jal get_screen_coords -/* CD9E2C 80242B4C 0000202D */ daddu $a0, $zero, $zero -/* CD9E30 80242B50 8EA20070 */ lw $v0, 0x70($s5) -/* CD9E34 80242B54 28420064 */ slti $v0, $v0, 0x64 -/* CD9E38 80242B58 10400007 */ beqz $v0, .L80242B78 -/* CD9E3C 80242B5C 00000000 */ nop -/* CD9E40 80242B60 8FA2004C */ lw $v0, 0x4c($sp) -/* CD9E44 80242B64 24420032 */ addiu $v0, $v0, 0x32 -/* CD9E48 80242B68 2C4201A5 */ sltiu $v0, $v0, 0x1a5 -/* CD9E4C 80242B6C 14400002 */ bnez $v0, .L80242B78 -/* CD9E50 80242B70 2402006E */ addiu $v0, $zero, 0x6e -/* CD9E54 80242B74 AEA20070 */ sw $v0, 0x70($s5) -.L80242B78: -/* CD9E58 80242B78 8EA30070 */ lw $v1, 0x70($s5) -/* CD9E5C 80242B7C 2402000F */ addiu $v0, $zero, 0xf -/* CD9E60 80242B80 1062006B */ beq $v1, $v0, .L80242D30 -/* CD9E64 80242B84 28620010 */ slti $v0, $v1, 0x10 -/* CD9E68 80242B88 10400016 */ beqz $v0, .L80242BE4 -/* CD9E6C 80242B8C 24020003 */ addiu $v0, $zero, 3 -/* CD9E70 80242B90 10620051 */ beq $v1, $v0, .L80242CD8 -/* CD9E74 80242B94 28620004 */ slti $v0, $v1, 4 -/* CD9E78 80242B98 10400009 */ beqz $v0, .L80242BC0 -/* CD9E7C 80242B9C 24020001 */ addiu $v0, $zero, 1 -/* CD9E80 80242BA0 10620044 */ beq $v1, $v0, .L80242CB4 -/* CD9E84 80242BA4 28620002 */ slti $v0, $v1, 2 -/* CD9E88 80242BA8 50400048 */ beql $v0, $zero, .L80242CCC -/* CD9E8C 80242BAC 02A0202D */ daddu $a0, $s5, $zero -/* CD9E90 80242BB0 50600027 */ beql $v1, $zero, .L80242C50 -/* CD9E94 80242BB4 02A0202D */ daddu $a0, $s5, $zero -/* CD9E98 80242BB8 08090C79 */ j .L802431E4 -/* CD9E9C 80242BBC 00000000 */ nop -.L80242BC0: -/* CD9EA0 80242BC0 2402000D */ addiu $v0, $zero, 0xd -/* CD9EA4 80242BC4 1062004D */ beq $v1, $v0, .L80242CFC -/* CD9EA8 80242BC8 2862000E */ slti $v0, $v1, 0xe -/* CD9EAC 80242BCC 10400052 */ beqz $v0, .L80242D18 -/* CD9EB0 80242BD0 2402000C */ addiu $v0, $zero, 0xc -/* CD9EB4 80242BD4 10620046 */ beq $v1, $v0, .L80242CF0 -/* CD9EB8 80242BD8 02A0202D */ daddu $a0, $s5, $zero -/* CD9EBC 80242BDC 08090C79 */ j .L802431E4 -/* CD9EC0 80242BE0 00000000 */ nop -.L80242BE4: -/* CD9EC4 80242BE4 24020067 */ addiu $v0, $zero, 0x67 -/* CD9EC8 80242BE8 10620158 */ beq $v1, $v0, .L8024314C -/* CD9ECC 80242BEC 28620068 */ slti $v0, $v1, 0x68 -/* CD9ED0 80242BF0 10400009 */ beqz $v0, .L80242C18 -/* CD9ED4 80242BF4 24020065 */ addiu $v0, $zero, 0x65 -/* CD9ED8 80242BF8 1062008F */ beq $v1, $v0, .L80242E38 -/* CD9EDC 80242BFC 28620066 */ slti $v0, $v1, 0x66 -/* CD9EE0 80242C00 104000A9 */ beqz $v0, .L80242EA8 -/* CD9EE4 80242C04 24020064 */ addiu $v0, $zero, 0x64 -/* CD9EE8 80242C08 1062004F */ beq $v1, $v0, .L80242D48 -/* CD9EEC 80242C0C 24020002 */ addiu $v0, $zero, 2 -/* CD9EF0 80242C10 08090C79 */ j .L802431E4 -/* CD9EF4 80242C14 00000000 */ nop -.L80242C18: -/* CD9EF8 80242C18 2404006F */ addiu $a0, $zero, 0x6f -/* CD9EFC 80242C1C 10640166 */ beq $v1, $a0, .L802431B8 -/* CD9F00 80242C20 28620070 */ slti $v0, $v1, 0x70 -/* CD9F04 80242C24 10400005 */ beqz $v0, .L80242C3C -/* CD9F08 80242C28 2402006E */ addiu $v0, $zero, 0x6e -/* CD9F0C 80242C2C 10620156 */ beq $v1, $v0, .L80243188 -/* CD9F10 80242C30 2402001E */ addiu $v0, $zero, 0x1e -/* CD9F14 80242C34 08090C79 */ j .L802431E4 -/* CD9F18 80242C38 00000000 */ nop -.L80242C3C: -/* CD9F1C 80242C3C 240200C8 */ addiu $v0, $zero, 0xc8 -/* CD9F20 80242C40 10620166 */ beq $v1, $v0, .L802431DC -/* CD9F24 80242C44 00000000 */ nop -/* CD9F28 80242C48 08090C79 */ j .L802431E4 -/* CD9F2C 80242C4C 00000000 */ nop -.L80242C50: -/* CD9F30 80242C50 0260282D */ daddu $a1, $s3, $zero -/* CD9F34 80242C54 0C012568 */ jal func_800495A0 -/* CD9F38 80242C58 0280302D */ daddu $a2, $s4, $zero -/* CD9F3C 80242C5C 96420086 */ lhu $v0, 0x86($s2) -/* CD9F40 80242C60 A62200A8 */ sh $v0, 0xa8($s1) -/* CD9F44 80242C64 8E4200A0 */ lw $v0, 0xa0($s2) -/* CD9F48 80242C68 10400013 */ beqz $v0, .L80242CB8 -/* CD9F4C 80242C6C 02A0202D */ daddu $a0, $s5, $zero -/* CD9F50 80242C70 C620003C */ lwc1 $f0, 0x3c($s1) -/* CD9F54 80242C74 44801000 */ mtc1 $zero, $f2 -/* CD9F58 80242C78 44801800 */ mtc1 $zero, $f3 -/* CD9F5C 80242C7C 46000021 */ cvt.d.s $f0, $f0 -/* CD9F60 80242C80 4622003E */ c.le.d $f0, $f2 -/* CD9F64 80242C84 00000000 */ nop -/* CD9F68 80242C88 45000005 */ bc1f .L80242CA0 -/* CD9F6C 80242C8C 2403FDFF */ addiu $v1, $zero, -0x201 -/* CD9F70 80242C90 8E220000 */ lw $v0, ($s1) -/* CD9F74 80242C94 00431024 */ and $v0, $v0, $v1 -/* CD9F78 80242C98 08090B2C */ j .L80242CB0 -/* CD9F7C 80242C9C 34420008 */ ori $v0, $v0, 8 -.L80242CA0: -/* CD9F80 80242CA0 8E220000 */ lw $v0, ($s1) -/* CD9F84 80242CA4 2403FFF7 */ addiu $v1, $zero, -9 -/* CD9F88 80242CA8 34420200 */ ori $v0, $v0, 0x200 -/* CD9F8C 80242CAC 00431024 */ and $v0, $v0, $v1 -.L80242CB0: -/* CD9F90 80242CB0 AE220000 */ sw $v0, ($s1) -.L80242CB4: -/* CD9F94 80242CB4 02A0202D */ daddu $a0, $s5, $zero -.L80242CB8: -/* CD9F98 80242CB8 0260282D */ daddu $a1, $s3, $zero -/* CD9F9C 80242CBC 0C0125AE */ jal func_800496B8 -/* CD9FA0 80242CC0 0280302D */ daddu $a2, $s4, $zero -/* CD9FA4 80242CC4 08090C79 */ j .L802431E4 -/* CD9FA8 80242CC8 00000000 */ nop -.L80242CCC: -/* CD9FAC 80242CCC 0260282D */ daddu $a1, $s3, $zero -/* CD9FB0 80242CD0 0C0126D1 */ jal func_80049B44 -/* CD9FB4 80242CD4 0280302D */ daddu $a2, $s4, $zero -.L80242CD8: -/* CD9FB8 80242CD8 02A0202D */ daddu $a0, $s5, $zero -/* CD9FBC 80242CDC 0260282D */ daddu $a1, $s3, $zero -/* CD9FC0 80242CE0 0C012701 */ jal func_80049C04 -/* CD9FC4 80242CE4 0280302D */ daddu $a2, $s4, $zero -/* CD9FC8 80242CE8 08090C79 */ j .L802431E4 -/* CD9FCC 80242CEC 00000000 */ nop -.L80242CF0: -/* CD9FD0 80242CF0 0260282D */ daddu $a1, $s3, $zero -/* CD9FD4 80242CF4 0C090851 */ jal func_80242144 -/* CD9FD8 80242CF8 0280302D */ daddu $a2, $s4, $zero -.L80242CFC: -/* CD9FDC 80242CFC 02A0202D */ daddu $a0, $s5, $zero -/* CD9FE0 80242D00 0260282D */ daddu $a1, $s3, $zero -/* CD9FE4 80242D04 0C090870 */ jal func_802421C0 -/* CD9FE8 80242D08 0280302D */ daddu $a2, $s4, $zero -/* CD9FEC 80242D0C 96420086 */ lhu $v0, 0x86($s2) -/* CD9FF0 80242D10 08090C79 */ j .L802431E4 -/* CD9FF4 80242D14 A62200A8 */ sh $v0, 0xa8($s1) -.L80242D18: -/* CD9FF8 80242D18 02A0202D */ daddu $a0, $s5, $zero -/* CD9FFC 80242D1C 0260282D */ daddu $a1, $s3, $zero -/* CDA000 80242D20 0C0908BD */ jal func_802422F4 -/* CDA004 80242D24 0280302D */ daddu $a2, $s4, $zero -/* CDA008 80242D28 08090C79 */ j .L802431E4 -/* CDA00C 80242D2C 00000000 */ nop -.L80242D30: -/* CDA010 80242D30 02A0202D */ daddu $a0, $s5, $zero -/* CDA014 80242D34 0260282D */ daddu $a1, $s3, $zero -/* CDA018 80242D38 0C090916 */ jal func_80242458 -/* CDA01C 80242D3C 0280302D */ daddu $a2, $s4, $zero -/* CDA020 80242D40 08090C79 */ j .L802431E4 -/* CDA024 80242D44 00000000 */ nop -.L80242D48: -/* CDA028 80242D48 8E430094 */ lw $v1, 0x94($s2) -/* CDA02C 80242D4C 14620125 */ bne $v1, $v0, .L802431E4 -/* CDA030 80242D50 00000000 */ nop -/* CDA034 80242D54 0C00FB3A */ jal get_enemy -/* CDA038 80242D58 8E440098 */ lw $a0, 0x98($s2) -/* CDA03C 80242D5C 0C00EABB */ jal get_npc_unsafe -/* CDA040 80242D60 84440008 */ lh $a0, 8($v0) -/* CDA044 80242D64 C440000C */ lwc1 $f0, 0xc($v0) -/* CDA048 80242D68 3C018024 */ lui $at, 0x8024 -/* CDA04C 80242D6C D42253B8 */ ldc1 $f2, 0x53b8($at) -/* CDA050 80242D70 46000021 */ cvt.d.s $f0, $f0 -/* CDA054 80242D74 4622003C */ c.lt.d $f0, $f2 -/* CDA058 80242D78 00000000 */ nop -/* CDA05C 80242D7C 45000008 */ bc1f .L80242DA0 -/* CDA060 80242D80 00000000 */ nop -/* CDA064 80242D84 C4400038 */ lwc1 $f0, 0x38($v0) -/* CDA068 80242D88 3C014028 */ lui $at, 0x4028 -/* CDA06C 80242D8C 44811800 */ mtc1 $at, $f3 -/* CDA070 80242D90 44801000 */ mtc1 $zero, $f2 -/* CDA074 80242D94 46000021 */ cvt.d.s $f0, $f0 -/* CDA078 80242D98 08090B6E */ j .L80242DB8 -/* CDA07C 80242D9C 46220000 */ add.d $f0, $f0, $f2 -.L80242DA0: -/* CDA080 80242DA0 C4400038 */ lwc1 $f0, 0x38($v0) -/* CDA084 80242DA4 3C014028 */ lui $at, 0x4028 -/* CDA088 80242DA8 44811800 */ mtc1 $at, $f3 -/* CDA08C 80242DAC 44801000 */ mtc1 $zero, $f2 -/* CDA090 80242DB0 46000021 */ cvt.d.s $f0, $f0 -/* CDA094 80242DB4 46220001 */ sub.d $f0, $f0, $f2 -.L80242DB8: -/* CDA098 80242DB8 46200020 */ cvt.s.d $f0, $f0 -/* CDA09C 80242DBC E6200038 */ swc1 $f0, 0x38($s1) -/* CDA0A0 80242DC0 3C04004A */ lui $a0, 0x4a -/* CDA0A4 80242DC4 C440003C */ lwc1 $f0, 0x3c($v0) -/* CDA0A8 80242DC8 3C014039 */ lui $at, 0x4039 -/* CDA0AC 80242DCC 44811800 */ mtc1 $at, $f3 -/* CDA0B0 80242DD0 44801000 */ mtc1 $zero, $f2 -/* CDA0B4 80242DD4 46000021 */ cvt.d.s $f0, $f0 -/* CDA0B8 80242DD8 46220000 */ add.d $f0, $f0, $f2 -/* CDA0BC 80242DDC 34840018 */ ori $a0, $a0, 0x18 -/* CDA0C0 80242DE0 3C013FF0 */ lui $at, 0x3ff0 -/* CDA0C4 80242DE4 44811800 */ mtc1 $at, $f3 -/* CDA0C8 80242DE8 44801000 */ mtc1 $zero, $f2 -/* CDA0CC 80242DEC 46200020 */ cvt.s.d $f0, $f0 -/* CDA0D0 80242DF0 E620003C */ swc1 $f0, 0x3c($s1) -/* CDA0D4 80242DF4 C4400040 */ lwc1 $f0, 0x40($v0) -/* CDA0D8 80242DF8 8E220000 */ lw $v0, ($s1) -/* CDA0DC 80242DFC 2403FFFD */ addiu $v1, $zero, -3 -/* CDA0E0 80242E00 AE200048 */ sw $zero, 0x48($s1) -/* CDA0E4 80242E04 AE200034 */ sw $zero, 0x34($s1) -/* CDA0E8 80242E08 AE240028 */ sw $a0, 0x28($s1) -/* CDA0EC 80242E0C 34420008 */ ori $v0, $v0, 8 -/* CDA0F0 80242E10 00431024 */ and $v0, $v0, $v1 -/* CDA0F4 80242E14 2403FDFF */ addiu $v1, $zero, -0x201 -/* CDA0F8 80242E18 00431024 */ and $v0, $v0, $v1 -/* CDA0FC 80242E1C 46000021 */ cvt.d.s $f0, $f0 -/* CDA100 80242E20 46220000 */ add.d $f0, $f0, $f2 -/* CDA104 80242E24 AE220000 */ sw $v0, ($s1) -/* CDA108 80242E28 24020065 */ addiu $v0, $zero, 0x65 -/* CDA10C 80242E2C 46200020 */ cvt.s.d $f0, $f0 -/* CDA110 80242E30 E6200040 */ swc1 $f0, 0x40($s1) -/* CDA114 80242E34 AEA20070 */ sw $v0, 0x70($s5) -.L80242E38: -/* CDA118 80242E38 8E430094 */ lw $v1, 0x94($s2) -/* CDA11C 80242E3C 24020003 */ addiu $v0, $zero, 3 -/* CDA120 80242E40 146200E8 */ bne $v1, $v0, .L802431E4 -/* CDA124 80242E44 24020004 */ addiu $v0, $zero, 4 -/* CDA128 80242E48 AE420094 */ sw $v0, 0x94($s2) -/* CDA12C 80242E4C C62C0038 */ lwc1 $f12, 0x38($s1) -/* CDA130 80242E50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CDA134 80242E54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CDA138 80242E58 C62E0040 */ lwc1 $f14, 0x40($s1) -/* CDA13C 80242E5C 8C460028 */ lw $a2, 0x28($v0) -/* CDA140 80242E60 0C00A720 */ jal atan2 -/* CDA144 80242E64 8C470030 */ lw $a3, 0x30($v0) -/* CDA148 80242E68 3C014020 */ lui $at, 0x4020 -/* CDA14C 80242E6C 44811000 */ mtc1 $at, $f2 -/* CDA150 80242E70 3C014100 */ lui $at, 0x4100 -/* CDA154 80242E74 44812000 */ mtc1 $at, $f4 -/* CDA158 80242E78 3C013F4C */ lui $at, 0x3f4c -/* CDA15C 80242E7C 3421CCCD */ ori $at, $at, 0xcccd -/* CDA160 80242E80 44813000 */ mtc1 $at, $f6 -/* CDA164 80242E84 8E220000 */ lw $v0, ($s1) -/* CDA168 80242E88 E620000C */ swc1 $f0, 0xc($s1) -/* CDA16C 80242E8C 34420800 */ ori $v0, $v0, 0x800 -/* CDA170 80242E90 AE220000 */ sw $v0, ($s1) -/* CDA174 80242E94 24020066 */ addiu $v0, $zero, 0x66 -/* CDA178 80242E98 E6220018 */ swc1 $f2, 0x18($s1) -/* CDA17C 80242E9C E624001C */ swc1 $f4, 0x1c($s1) -/* CDA180 80242EA0 E6260014 */ swc1 $f6, 0x14($s1) -/* CDA184 80242EA4 AEA20070 */ sw $v0, 0x70($s5) -.L80242EA8: -/* CDA188 80242EA8 C6200018 */ lwc1 $f0, 0x18($s1) -/* CDA18C 80242EAC 44801000 */ mtc1 $zero, $f2 -/* CDA190 80242EB0 44801800 */ mtc1 $zero, $f3 -/* CDA194 80242EB4 46000021 */ cvt.d.s $f0, $f0 -/* CDA198 80242EB8 4620103C */ c.lt.d $f2, $f0 -/* CDA19C 80242EBC 00000000 */ nop -/* CDA1A0 80242EC0 4500001F */ bc1f .L80242F40 -/* CDA1A4 80242EC4 27A50058 */ addiu $a1, $sp, 0x58 -/* CDA1A8 80242EC8 C6200038 */ lwc1 $f0, 0x38($s1) -/* CDA1AC 80242ECC C622003C */ lwc1 $f2, 0x3c($s1) -/* CDA1B0 80242ED0 C6240040 */ lwc1 $f4, 0x40($s1) -/* CDA1B4 80242ED4 C6260018 */ lwc1 $f6, 0x18($s1) -/* CDA1B8 80242ED8 E7A00058 */ swc1 $f0, 0x58($sp) -/* CDA1BC 80242EDC E7A2005C */ swc1 $f2, 0x5c($sp) -/* CDA1C0 80242EE0 E7A40060 */ swc1 $f4, 0x60($sp) -/* CDA1C4 80242EE4 E7A60010 */ swc1 $f6, 0x10($sp) -/* CDA1C8 80242EE8 C620000C */ lwc1 $f0, 0xc($s1) -/* CDA1CC 80242EEC E7A00014 */ swc1 $f0, 0x14($sp) -/* CDA1D0 80242EF0 862200A8 */ lh $v0, 0xa8($s1) -/* CDA1D4 80242EF4 44820000 */ mtc1 $v0, $f0 -/* CDA1D8 80242EF8 00000000 */ nop -/* CDA1DC 80242EFC 46800020 */ cvt.s.w $f0, $f0 -/* CDA1E0 80242F00 E7A00018 */ swc1 $f0, 0x18($sp) -/* CDA1E4 80242F04 862200A6 */ lh $v0, 0xa6($s1) -/* CDA1E8 80242F08 27A6005C */ addiu $a2, $sp, 0x5c -/* CDA1EC 80242F0C 44820000 */ mtc1 $v0, $f0 -/* CDA1F0 80242F10 00000000 */ nop -/* CDA1F4 80242F14 46800020 */ cvt.s.w $f0, $f0 -/* CDA1F8 80242F18 E7A0001C */ swc1 $f0, 0x1c($sp) -/* CDA1FC 80242F1C 8E240080 */ lw $a0, 0x80($s1) -/* CDA200 80242F20 0C037711 */ jal func_800DDC44 -/* CDA204 80242F24 27A70060 */ addiu $a3, $sp, 0x60 -/* CDA208 80242F28 54400005 */ bnel $v0, $zero, .L80242F40 -/* CDA20C 80242F2C AE200018 */ sw $zero, 0x18($s1) -/* CDA210 80242F30 8E250018 */ lw $a1, 0x18($s1) -/* CDA214 80242F34 8E26000C */ lw $a2, 0xc($s1) -/* CDA218 80242F38 0C00EA95 */ jal npc_move_heading -/* CDA21C 80242F3C 0220202D */ daddu $a0, $s1, $zero -.L80242F40: -/* CDA220 80242F40 C620001C */ lwc1 $f0, 0x1c($s1) -/* CDA224 80242F44 4480B000 */ mtc1 $zero, $f22 -/* CDA228 80242F48 4480B800 */ mtc1 $zero, $f23 -/* CDA22C 80242F4C 46000021 */ cvt.d.s $f0, $f0 -/* CDA230 80242F50 4636003C */ c.lt.d $f0, $f22 -/* CDA234 80242F54 00000000 */ nop -/* CDA238 80242F58 45000074 */ bc1f .L8024312C -/* CDA23C 80242F5C 27A50058 */ addiu $a1, $sp, 0x58 -/* CDA240 80242F60 27A6005C */ addiu $a2, $sp, 0x5c -/* CDA244 80242F64 27A20064 */ addiu $v0, $sp, 0x64 -/* CDA248 80242F68 C622003C */ lwc1 $f2, 0x3c($s1) -/* CDA24C 80242F6C C6260038 */ lwc1 $f6, 0x38($s1) -/* CDA250 80242F70 3C01402A */ lui $at, 0x402a -/* CDA254 80242F74 4481A800 */ mtc1 $at, $f21 -/* CDA258 80242F78 4480A000 */ mtc1 $zero, $f20 -/* CDA25C 80242F7C 460010A1 */ cvt.d.s $f2, $f2 -/* CDA260 80242F80 46341080 */ add.d $f2, $f2, $f20 -/* CDA264 80242F84 C620001C */ lwc1 $f0, 0x1c($s1) -/* CDA268 80242F88 C6240040 */ lwc1 $f4, 0x40($s1) -/* CDA26C 80242F8C 46000005 */ abs.s $f0, $f0 -/* CDA270 80242F90 E7A40060 */ swc1 $f4, 0x60($sp) -/* CDA274 80242F94 3C014030 */ lui $at, 0x4030 -/* CDA278 80242F98 44812800 */ mtc1 $at, $f5 -/* CDA27C 80242F9C 44802000 */ mtc1 $zero, $f4 -/* CDA280 80242FA0 46000021 */ cvt.d.s $f0, $f0 -/* CDA284 80242FA4 E7A60058 */ swc1 $f6, 0x58($sp) -/* CDA288 80242FA8 46240000 */ add.d $f0, $f0, $f4 -/* CDA28C 80242FAC 462010A0 */ cvt.s.d $f2, $f2 -/* CDA290 80242FB0 E7A2005C */ swc1 $f2, 0x5c($sp) -/* CDA294 80242FB4 46200020 */ cvt.s.d $f0, $f0 -/* CDA298 80242FB8 E7A00064 */ swc1 $f0, 0x64($sp) -/* CDA29C 80242FBC AFA20010 */ sw $v0, 0x10($sp) -/* CDA2A0 80242FC0 8E240080 */ lw $a0, 0x80($s1) -/* CDA2A4 80242FC4 0C0372DF */ jal func_800DCB7C -/* CDA2A8 80242FC8 27A70060 */ addiu $a3, $sp, 0x60 -/* CDA2AC 80242FCC 10400057 */ beqz $v0, .L8024312C -/* CDA2B0 80242FD0 00000000 */ nop -/* CDA2B4 80242FD4 C620001C */ lwc1 $f0, 0x1c($s1) -/* CDA2B8 80242FD8 C7A20064 */ lwc1 $f2, 0x64($sp) -/* CDA2BC 80242FDC 46000005 */ abs.s $f0, $f0 -/* CDA2C0 80242FE0 46000021 */ cvt.d.s $f0, $f0 -/* CDA2C4 80242FE4 46340000 */ add.d $f0, $f0, $f20 -/* CDA2C8 80242FE8 460010A1 */ cvt.d.s $f2, $f2 -/* CDA2CC 80242FEC 4620103E */ c.le.d $f2, $f0 -/* CDA2D0 80242FF0 00000000 */ nop -/* CDA2D4 80242FF4 4500004D */ bc1f .L8024312C -/* CDA2D8 80242FF8 00000000 */ nop -/* CDA2DC 80242FFC C7A0005C */ lwc1 $f0, 0x5c($sp) -/* CDA2E0 80243000 E620003C */ swc1 $f0, 0x3c($s1) -/* CDA2E4 80243004 8E4200D0 */ lw $v0, 0xd0($s2) -/* CDA2E8 80243008 C6200038 */ lwc1 $f0, 0x38($s1) -/* CDA2EC 8024300C 4600020D */ trunc.w.s $f8, $f0 -/* CDA2F0 80243010 E4480000 */ swc1 $f8, ($v0) -/* CDA2F4 80243014 8E4200D0 */ lw $v0, 0xd0($s2) -/* CDA2F8 80243018 C620003C */ lwc1 $f0, 0x3c($s1) -/* CDA2FC 8024301C 4600020D */ trunc.w.s $f8, $f0 -/* CDA300 80243020 E4480004 */ swc1 $f8, 4($v0) -/* CDA304 80243024 8E4200D0 */ lw $v0, 0xd0($s2) -/* CDA308 80243028 C6200040 */ lwc1 $f0, 0x40($s1) -/* CDA30C 8024302C 4600020D */ trunc.w.s $f8, $f0 -/* CDA310 80243030 E4480008 */ swc1 $f8, 8($v0) -/* CDA314 80243034 8E4200D0 */ lw $v0, 0xd0($s2) -/* CDA318 80243038 C6200038 */ lwc1 $f0, 0x38($s1) -/* CDA31C 8024303C 4600020D */ trunc.w.s $f8, $f0 -/* CDA320 80243040 E448001C */ swc1 $f8, 0x1c($v0) -/* CDA324 80243044 8E4200D0 */ lw $v0, 0xd0($s2) -/* CDA328 80243048 C620003C */ lwc1 $f0, 0x3c($s1) -/* CDA32C 8024304C 4600020D */ trunc.w.s $f8, $f0 -/* CDA330 80243050 E4480020 */ swc1 $f8, 0x20($v0) -/* CDA334 80243054 8E4200D0 */ lw $v0, 0xd0($s2) -/* CDA338 80243058 C6200040 */ lwc1 $f0, 0x40($s1) -/* CDA33C 8024305C 4600020D */ trunc.w.s $f8, $f0 -/* CDA340 80243060 E4480024 */ swc1 $f8, 0x24($v0) -/* CDA344 80243064 8E4300A0 */ lw $v1, 0xa0($s2) -/* CDA348 80243068 24020005 */ addiu $v0, $zero, 5 -/* CDA34C 8024306C 1060000B */ beqz $v1, .L8024309C -/* CDA350 80243070 AE420094 */ sw $v0, 0x94($s2) -/* CDA354 80243074 C620003C */ lwc1 $f0, 0x3c($s1) -/* CDA358 80243078 46000021 */ cvt.d.s $f0, $f0 -/* CDA35C 8024307C 4636003E */ c.le.d $f0, $f22 -/* CDA360 80243080 00000000 */ nop -/* CDA364 80243084 4501000D */ bc1t .L802430BC -/* CDA368 80243088 2403FFF7 */ addiu $v1, $zero, -9 -/* CDA36C 8024308C 8E220000 */ lw $v0, ($s1) -/* CDA370 80243090 34420200 */ ori $v0, $v0, 0x200 -/* CDA374 80243094 08090C33 */ j .L802430CC -/* CDA378 80243098 00431024 */ and $v0, $v0, $v1 -.L8024309C: -/* CDA37C 8024309C 8E4200D0 */ lw $v0, 0xd0($s2) -/* CDA380 802430A0 8C420034 */ lw $v0, 0x34($v0) -/* CDA384 802430A4 14400005 */ bnez $v0, .L802430BC -/* CDA388 802430A8 2403FFF7 */ addiu $v1, $zero, -9 -/* CDA38C 802430AC 8E220000 */ lw $v0, ($s1) -/* CDA390 802430B0 34420200 */ ori $v0, $v0, 0x200 -/* CDA394 802430B4 08090C33 */ j .L802430CC -/* CDA398 802430B8 00431024 */ and $v0, $v0, $v1 -.L802430BC: -/* CDA39C 802430BC 8E220000 */ lw $v0, ($s1) -/* CDA3A0 802430C0 2403FDFF */ addiu $v1, $zero, -0x201 -/* CDA3A4 802430C4 00431024 */ and $v0, $v0, $v1 -/* CDA3A8 802430C8 34420008 */ ori $v0, $v0, 8 -.L802430CC: -/* CDA3AC 802430CC AE220000 */ sw $v0, ($s1) -/* CDA3B0 802430D0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* CDA3B4 802430D4 C62E0040 */ lwc1 $f14, 0x40($s1) -/* CDA3B8 802430D8 8E220000 */ lw $v0, ($s1) -/* CDA3BC 802430DC 3C04800F */ lui $a0, %hi(gPlayerStatusPtr) -/* CDA3C0 802430E0 8C847B30 */ lw $a0, %lo(gPlayerStatusPtr)($a0) -/* CDA3C4 802430E4 3C030004 */ lui $v1, 4 -/* CDA3C8 802430E8 AE20001C */ sw $zero, 0x1c($s1) -/* CDA3CC 802430EC 00431025 */ or $v0, $v0, $v1 -/* CDA3D0 802430F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* CDA3D4 802430F4 00431024 */ and $v0, $v0, $v1 -/* CDA3D8 802430F8 AE220000 */ sw $v0, ($s1) -/* CDA3DC 802430FC 8C860028 */ lw $a2, 0x28($a0) -/* CDA3E0 80243100 0C00A720 */ jal atan2 -/* CDA3E4 80243104 8C870030 */ lw $a3, 0x30($a0) -/* CDA3E8 80243108 3C02004A */ lui $v0, 0x4a -/* CDA3EC 8024310C 3442001A */ ori $v0, $v0, 0x1a -/* CDA3F0 80243110 AE220028 */ sw $v0, 0x28($s1) -/* CDA3F4 80243114 24020003 */ addiu $v0, $zero, 3 -/* CDA3F8 80243118 A622008E */ sh $v0, 0x8e($s1) -/* CDA3FC 8024311C 24020067 */ addiu $v0, $zero, 0x67 -/* CDA400 80243120 E620000C */ swc1 $f0, 0xc($s1) -/* CDA404 80243124 08090C79 */ j .L802431E4 -/* CDA408 80243128 AEA20070 */ sw $v0, 0x70($s5) -.L8024312C: -/* CDA40C 8024312C C624003C */ lwc1 $f4, 0x3c($s1) -/* CDA410 80243130 C620001C */ lwc1 $f0, 0x1c($s1) -/* CDA414 80243134 46002100 */ add.s $f4, $f4, $f0 -/* CDA418 80243138 C6220014 */ lwc1 $f2, 0x14($s1) -/* CDA41C 8024313C 46020001 */ sub.s $f0, $f0, $f2 -/* CDA420 80243140 E624003C */ swc1 $f4, 0x3c($s1) -/* CDA424 80243144 08090C79 */ j .L802431E4 -/* CDA428 80243148 E620001C */ swc1 $f0, 0x1c($s1) -.L8024314C: -/* CDA42C 8024314C 9622008E */ lhu $v0, 0x8e($s1) -/* CDA430 80243150 2442FFFF */ addiu $v0, $v0, -1 -/* CDA434 80243154 A622008E */ sh $v0, 0x8e($s1) -/* CDA438 80243158 00021400 */ sll $v0, $v0, 0x10 -/* CDA43C 8024315C 1C400021 */ bgtz $v0, .L802431E4 -/* CDA440 80243160 3C03004A */ lui $v1, 0x4a -/* CDA444 80243164 3C04FFFB */ lui $a0, 0xfffb -/* CDA448 80243168 3484FFFF */ ori $a0, $a0, 0xffff -/* CDA44C 8024316C 8E220000 */ lw $v0, ($s1) -/* CDA450 80243170 34630001 */ ori $v1, $v1, 1 -/* CDA454 80243174 AE230028 */ sw $v1, 0x28($s1) -/* CDA458 80243178 00441024 */ and $v0, $v0, $a0 -/* CDA45C 8024317C AE220000 */ sw $v0, ($s1) -/* CDA460 80243180 08090C79 */ j .L802431E4 -/* CDA464 80243184 AEA00070 */ sw $zero, 0x70($s5) -.L80243188: -/* CDA468 80243188 3C01C47A */ lui $at, 0xc47a -/* CDA46C 8024318C 44810000 */ mtc1 $at, $f0 -/* CDA470 80243190 8E230000 */ lw $v1, ($s1) -/* CDA474 80243194 A622008E */ sh $v0, 0x8e($s1) -/* CDA478 80243198 2402FDFF */ addiu $v0, $zero, -0x201 -/* CDA47C 8024319C AE200038 */ sw $zero, 0x38($s1) -/* CDA480 802431A0 AE200040 */ sw $zero, 0x40($s1) -/* CDA484 802431A4 3463000A */ ori $v1, $v1, 0xa -/* CDA488 802431A8 00621824 */ and $v1, $v1, $v0 -/* CDA48C 802431AC E620003C */ swc1 $f0, 0x3c($s1) -/* CDA490 802431B0 AE230000 */ sw $v1, ($s1) -/* CDA494 802431B4 AEA40070 */ sw $a0, 0x70($s5) -.L802431B8: -/* CDA498 802431B8 9622008E */ lhu $v0, 0x8e($s1) -/* CDA49C 802431BC 2442FFFF */ addiu $v0, $v0, -1 -/* CDA4A0 802431C0 A622008E */ sh $v0, 0x8e($s1) -/* CDA4A4 802431C4 00021400 */ sll $v0, $v0, 0x10 -/* CDA4A8 802431C8 1C400006 */ bgtz $v0, .L802431E4 -/* CDA4AC 802431CC 24020064 */ addiu $v0, $zero, 0x64 -/* CDA4B0 802431D0 AE400094 */ sw $zero, 0x94($s2) -/* CDA4B4 802431D4 08090C79 */ j .L802431E4 -/* CDA4B8 802431D8 AEA20070 */ sw $v0, 0x70($s5) -.L802431DC: -/* CDA4BC 802431DC 0C0129CF */ jal func_8004A73C -/* CDA4C0 802431E0 02A0202D */ daddu $a0, $s5, $zero -.L802431E4: -/* CDA4C4 802431E4 8FBF0080 */ lw $ra, 0x80($sp) -/* CDA4C8 802431E8 8FB5007C */ lw $s5, 0x7c($sp) -/* CDA4CC 802431EC 8FB40078 */ lw $s4, 0x78($sp) -/* CDA4D0 802431F0 8FB30074 */ lw $s3, 0x74($sp) -/* CDA4D4 802431F4 8FB20070 */ lw $s2, 0x70($sp) -/* CDA4D8 802431F8 8FB1006C */ lw $s1, 0x6c($sp) -/* CDA4DC 802431FC 8FB00068 */ lw $s0, 0x68($sp) -/* CDA4E0 80243200 D7B60090 */ ldc1 $f22, 0x90($sp) -/* CDA4E4 80243204 D7B40088 */ ldc1 $f20, 0x88($sp) -/* CDA4E8 80243208 0000102D */ daddu $v0, $zero, $zero -/* CDA4EC 8024320C 03E00008 */ jr $ra -/* CDA4F0 80243210 27BD0098 */ addiu $sp, $sp, 0x98 -/* CDA4F4 80243214 00000000 */ nop -/* CDA4F8 80243218 00000000 */ nop -/* CDA4FC 8024321C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s new file mode 100644 index 0000000000..0a9d63589b --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_17/CD7350/func_80242918_CD9BF8.s @@ -0,0 +1,619 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242918_CD9BF8 +/* CD9BF8 80242918 27BDFF68 */ addiu $sp, $sp, -0x98 +/* CD9BFC 8024291C AFB5007C */ sw $s5, 0x7c($sp) +/* CD9C00 80242920 0080A82D */ daddu $s5, $a0, $zero +/* CD9C04 80242924 AFBF0080 */ sw $ra, 0x80($sp) +/* CD9C08 80242928 AFB40078 */ sw $s4, 0x78($sp) +/* CD9C0C 8024292C AFB30074 */ sw $s3, 0x74($sp) +/* CD9C10 80242930 AFB20070 */ sw $s2, 0x70($sp) +/* CD9C14 80242934 AFB1006C */ sw $s1, 0x6c($sp) +/* CD9C18 80242938 AFB00068 */ sw $s0, 0x68($sp) +/* CD9C1C 8024293C F7B60090 */ sdc1 $f22, 0x90($sp) +/* CD9C20 80242940 F7B40088 */ sdc1 $f20, 0x88($sp) +/* CD9C24 80242944 8EB20148 */ lw $s2, 0x148($s5) +/* CD9C28 80242948 86440008 */ lh $a0, 8($s2) +/* CD9C2C 8024294C 0C00EABB */ jal get_npc_unsafe +/* CD9C30 80242950 00A0802D */ daddu $s0, $a1, $zero +/* CD9C34 80242954 8EA3000C */ lw $v1, 0xc($s5) +/* CD9C38 80242958 02A0202D */ daddu $a0, $s5, $zero +/* CD9C3C 8024295C 8C650000 */ lw $a1, ($v1) +/* CD9C40 80242960 0C0B1EAF */ jal get_variable +/* CD9C44 80242964 0040882D */ daddu $s1, $v0, $zero +/* CD9C48 80242968 AFA00028 */ sw $zero, 0x28($sp) +/* CD9C4C 8024296C 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD9C50 80242970 8C630030 */ lw $v1, 0x30($v1) +/* CD9C54 80242974 AFA3002C */ sw $v1, 0x2c($sp) +/* CD9C58 80242978 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD9C5C 8024297C 8C63001C */ lw $v1, 0x1c($v1) +/* CD9C60 80242980 AFA30030 */ sw $v1, 0x30($sp) +/* CD9C64 80242984 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD9C68 80242988 8C630024 */ lw $v1, 0x24($v1) +/* CD9C6C 8024298C AFA30034 */ sw $v1, 0x34($sp) +/* CD9C70 80242990 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD9C74 80242994 8C630028 */ lw $v1, 0x28($v1) +/* CD9C78 80242998 27B40028 */ addiu $s4, $sp, 0x28 +/* CD9C7C 8024299C AFA30038 */ sw $v1, 0x38($sp) +/* CD9C80 802429A0 8E4300D0 */ lw $v1, 0xd0($s2) +/* CD9C84 802429A4 3C014282 */ lui $at, 0x4282 +/* CD9C88 802429A8 44810000 */ mtc1 $at, $f0 +/* CD9C8C 802429AC 8C63002C */ lw $v1, 0x2c($v1) +/* CD9C90 802429B0 0040982D */ daddu $s3, $v0, $zero +/* CD9C94 802429B4 E7A00040 */ swc1 $f0, 0x40($sp) +/* CD9C98 802429B8 A7A00044 */ sh $zero, 0x44($sp) +/* CD9C9C 802429BC 12000007 */ beqz $s0, .L802429DC +/* CD9CA0 802429C0 AFA3003C */ sw $v1, 0x3c($sp) +/* CD9CA4 802429C4 8E4200B0 */ lw $v0, 0xb0($s2) +/* CD9CA8 802429C8 862300A8 */ lh $v1, 0xa8($s1) +/* CD9CAC 802429CC 34420008 */ ori $v0, $v0, 8 +/* CD9CB0 802429D0 AE430084 */ sw $v1, 0x84($s2) +/* CD9CB4 802429D4 08090A7B */ j .L802429EC +/* CD9CB8 802429D8 AE4200B0 */ sw $v0, 0xb0($s2) +.L802429DC: +/* CD9CBC 802429DC 8E430094 */ lw $v1, 0x94($s2) +/* CD9CC0 802429E0 24020064 */ addiu $v0, $zero, 0x64 +/* CD9CC4 802429E4 1462001C */ bne $v1, $v0, .L80242A58 +/* CD9CC8 802429E8 00000000 */ nop +.L802429EC: +/* CD9CCC 802429EC 24020064 */ addiu $v0, $zero, 0x64 +/* CD9CD0 802429F0 2404F7FF */ addiu $a0, $zero, -0x801 +/* CD9CD4 802429F4 AEA20070 */ sw $v0, 0x70($s5) +/* CD9CD8 802429F8 A620008E */ sh $zero, 0x8e($s1) +/* CD9CDC 802429FC 8E4300CC */ lw $v1, 0xcc($s2) +/* CD9CE0 80242A00 8E220000 */ lw $v0, ($s1) +/* CD9CE4 80242A04 3C01C47A */ lui $at, 0xc47a +/* CD9CE8 80242A08 44810000 */ mtc1 $at, $f0 +/* CD9CEC 80242A0C 8C630000 */ lw $v1, ($v1) +/* CD9CF0 80242A10 00441024 */ and $v0, $v0, $a0 +/* CD9CF4 80242A14 AE220000 */ sw $v0, ($s1) +/* CD9CF8 80242A18 AE230028 */ sw $v1, 0x28($s1) +/* CD9CFC 80242A1C 8E420000 */ lw $v0, ($s2) +/* CD9D00 80242A20 3C030020 */ lui $v1, 0x20 +/* CD9D04 80242A24 00431025 */ or $v0, $v0, $v1 +/* CD9D08 80242A28 AE420000 */ sw $v0, ($s2) +/* CD9D0C 80242A2C 8E220000 */ lw $v0, ($s1) +/* CD9D10 80242A30 2403FDFF */ addiu $v1, $zero, -0x201 +/* CD9D14 80242A34 00431024 */ and $v0, $v0, $v1 +/* CD9D18 80242A38 34420008 */ ori $v0, $v0, 8 +/* CD9D1C 80242A3C AE220000 */ sw $v0, ($s1) +/* CD9D20 80242A40 2402FFFF */ addiu $v0, $zero, -1 +/* CD9D24 80242A44 AE400094 */ sw $zero, 0x94($s2) +/* CD9D28 80242A48 AE420098 */ sw $v0, 0x98($s2) +/* CD9D2C 80242A4C AE200038 */ sw $zero, 0x38($s1) +/* CD9D30 80242A50 E620003C */ swc1 $f0, 0x3c($s1) +/* CD9D34 80242A54 AE200040 */ sw $zero, 0x40($s1) +.L80242A58: +/* CD9D38 80242A58 8E4200B0 */ lw $v0, 0xb0($s2) +/* CD9D3C 80242A5C 30420004 */ andi $v0, $v0, 4 +/* CD9D40 80242A60 10400030 */ beqz $v0, .L80242B24 +/* CD9D44 80242A64 2403FFFB */ addiu $v1, $zero, -5 +/* CD9D48 80242A68 A620008E */ sh $zero, 0x8e($s1) +/* CD9D4C 80242A6C 96420086 */ lhu $v0, 0x86($s2) +/* CD9D50 80242A70 A62200A8 */ sh $v0, 0xa8($s1) +/* CD9D54 80242A74 8E4200B0 */ lw $v0, 0xb0($s2) +/* CD9D58 80242A78 00431024 */ and $v0, $v0, $v1 +/* CD9D5C 80242A7C AE4200B0 */ sw $v0, 0xb0($s2) +/* CD9D60 80242A80 8E220000 */ lw $v0, ($s1) +/* CD9D64 80242A84 30420800 */ andi $v0, $v0, 0x800 +/* CD9D68 80242A88 1040000A */ beqz $v0, .L80242AB4 +/* CD9D6C 80242A8C 3C02004A */ lui $v0, 0x4a +/* CD9D70 80242A90 3C013F80 */ lui $at, 0x3f80 +/* CD9D74 80242A94 44810000 */ mtc1 $at, $f0 +/* CD9D78 80242A98 34420018 */ ori $v0, $v0, 0x18 +/* CD9D7C 80242A9C AE220028 */ sw $v0, 0x28($s1) +/* CD9D80 80242AA0 24020066 */ addiu $v0, $zero, 0x66 +/* CD9D84 80242AA4 AE200018 */ sw $zero, 0x18($s1) +/* CD9D88 80242AA8 AE20001C */ sw $zero, 0x1c($s1) +/* CD9D8C 80242AAC 08090AC8 */ j .L80242B20 +/* CD9D90 80242AB0 E6200014 */ swc1 $f0, 0x14($s1) +.L80242AB4: +/* CD9D94 80242AB4 24040002 */ addiu $a0, $zero, 2 +/* CD9D98 80242AB8 0220282D */ daddu $a1, $s1, $zero +/* CD9D9C 80242ABC 0000302D */ daddu $a2, $zero, $zero +/* CD9DA0 80242AC0 862300A8 */ lh $v1, 0xa8($s1) +/* CD9DA4 80242AC4 3C013F80 */ lui $at, 0x3f80 +/* CD9DA8 80242AC8 44810000 */ mtc1 $at, $f0 +/* CD9DAC 80242ACC 3C014000 */ lui $at, 0x4000 +/* CD9DB0 80242AD0 44811000 */ mtc1 $at, $f2 +/* CD9DB4 80242AD4 3C01C1A0 */ lui $at, 0xc1a0 +/* CD9DB8 80242AD8 44812000 */ mtc1 $at, $f4 +/* CD9DBC 80242ADC 24020028 */ addiu $v0, $zero, 0x28 +/* CD9DC0 80242AE0 AFA2001C */ sw $v0, 0x1c($sp) +/* CD9DC4 80242AE4 44834000 */ mtc1 $v1, $f8 +/* CD9DC8 80242AE8 00000000 */ nop +/* CD9DCC 80242AEC 46804220 */ cvt.s.w $f8, $f8 +/* CD9DD0 80242AF0 44074000 */ mfc1 $a3, $f8 +/* CD9DD4 80242AF4 27A20048 */ addiu $v0, $sp, 0x48 +/* CD9DD8 80242AF8 AFA20020 */ sw $v0, 0x20($sp) +/* CD9DDC 80242AFC E7A00010 */ swc1 $f0, 0x10($sp) +/* CD9DE0 80242B00 E7A20014 */ swc1 $f2, 0x14($sp) +/* CD9DE4 80242B04 0C01BFA4 */ jal fx_emote +/* CD9DE8 80242B08 E7A40018 */ swc1 $f4, 0x18($sp) +/* CD9DEC 80242B0C 8E4200CC */ lw $v0, 0xcc($s2) +/* CD9DF0 80242B10 8C420000 */ lw $v0, ($v0) +/* CD9DF4 80242B14 AE220028 */ sw $v0, 0x28($s1) +/* CD9DF8 80242B18 240200C8 */ addiu $v0, $zero, 0xc8 +/* CD9DFC 80242B1C AEA00074 */ sw $zero, 0x74($s5) +.L80242B20: +/* CD9E00 80242B20 AEA20070 */ sw $v0, 0x70($s5) +.L80242B24: +/* CD9E04 80242B24 27A2004C */ addiu $v0, $sp, 0x4c +/* CD9E08 80242B28 AFA20010 */ sw $v0, 0x10($sp) +/* CD9E0C 80242B2C 27A20050 */ addiu $v0, $sp, 0x50 +/* CD9E10 80242B30 AFA20014 */ sw $v0, 0x14($sp) +/* CD9E14 80242B34 27A20054 */ addiu $v0, $sp, 0x54 +/* CD9E18 80242B38 AFA20018 */ sw $v0, 0x18($sp) +/* CD9E1C 80242B3C 8E250038 */ lw $a1, 0x38($s1) +/* CD9E20 80242B40 8E26003C */ lw $a2, 0x3c($s1) +/* CD9E24 80242B44 8E270040 */ lw $a3, 0x40($s1) +/* CD9E28 80242B48 0C00B94E */ jal get_screen_coords +/* CD9E2C 80242B4C 0000202D */ daddu $a0, $zero, $zero +/* CD9E30 80242B50 8EA20070 */ lw $v0, 0x70($s5) +/* CD9E34 80242B54 28420064 */ slti $v0, $v0, 0x64 +/* CD9E38 80242B58 10400007 */ beqz $v0, .L80242B78 +/* CD9E3C 80242B5C 00000000 */ nop +/* CD9E40 80242B60 8FA2004C */ lw $v0, 0x4c($sp) +/* CD9E44 80242B64 24420032 */ addiu $v0, $v0, 0x32 +/* CD9E48 80242B68 2C4201A5 */ sltiu $v0, $v0, 0x1a5 +/* CD9E4C 80242B6C 14400002 */ bnez $v0, .L80242B78 +/* CD9E50 80242B70 2402006E */ addiu $v0, $zero, 0x6e +/* CD9E54 80242B74 AEA20070 */ sw $v0, 0x70($s5) +.L80242B78: +/* CD9E58 80242B78 8EA30070 */ lw $v1, 0x70($s5) +/* CD9E5C 80242B7C 2402000F */ addiu $v0, $zero, 0xf +/* CD9E60 80242B80 1062006B */ beq $v1, $v0, .L80242D30 +/* CD9E64 80242B84 28620010 */ slti $v0, $v1, 0x10 +/* CD9E68 80242B88 10400016 */ beqz $v0, .L80242BE4 +/* CD9E6C 80242B8C 24020003 */ addiu $v0, $zero, 3 +/* CD9E70 80242B90 10620051 */ beq $v1, $v0, .L80242CD8 +/* CD9E74 80242B94 28620004 */ slti $v0, $v1, 4 +/* CD9E78 80242B98 10400009 */ beqz $v0, .L80242BC0 +/* CD9E7C 80242B9C 24020001 */ addiu $v0, $zero, 1 +/* CD9E80 80242BA0 10620044 */ beq $v1, $v0, .L80242CB4 +/* CD9E84 80242BA4 28620002 */ slti $v0, $v1, 2 +/* CD9E88 80242BA8 50400048 */ beql $v0, $zero, .L80242CCC +/* CD9E8C 80242BAC 02A0202D */ daddu $a0, $s5, $zero +/* CD9E90 80242BB0 50600027 */ beql $v1, $zero, .L80242C50 +/* CD9E94 80242BB4 02A0202D */ daddu $a0, $s5, $zero +/* CD9E98 80242BB8 08090C79 */ j .L802431E4 +/* CD9E9C 80242BBC 00000000 */ nop +.L80242BC0: +/* CD9EA0 80242BC0 2402000D */ addiu $v0, $zero, 0xd +/* CD9EA4 80242BC4 1062004D */ beq $v1, $v0, .L80242CFC +/* CD9EA8 80242BC8 2862000E */ slti $v0, $v1, 0xe +/* CD9EAC 80242BCC 10400052 */ beqz $v0, .L80242D18 +/* CD9EB0 80242BD0 2402000C */ addiu $v0, $zero, 0xc +/* CD9EB4 80242BD4 10620046 */ beq $v1, $v0, .L80242CF0 +/* CD9EB8 80242BD8 02A0202D */ daddu $a0, $s5, $zero +/* CD9EBC 80242BDC 08090C79 */ j .L802431E4 +/* CD9EC0 80242BE0 00000000 */ nop +.L80242BE4: +/* CD9EC4 80242BE4 24020067 */ addiu $v0, $zero, 0x67 +/* CD9EC8 80242BE8 10620158 */ beq $v1, $v0, .L8024314C +/* CD9ECC 80242BEC 28620068 */ slti $v0, $v1, 0x68 +/* CD9ED0 80242BF0 10400009 */ beqz $v0, .L80242C18 +/* CD9ED4 80242BF4 24020065 */ addiu $v0, $zero, 0x65 +/* CD9ED8 80242BF8 1062008F */ beq $v1, $v0, .L80242E38 +/* CD9EDC 80242BFC 28620066 */ slti $v0, $v1, 0x66 +/* CD9EE0 80242C00 104000A9 */ beqz $v0, .L80242EA8 +/* CD9EE4 80242C04 24020064 */ addiu $v0, $zero, 0x64 +/* CD9EE8 80242C08 1062004F */ beq $v1, $v0, .L80242D48 +/* CD9EEC 80242C0C 24020002 */ addiu $v0, $zero, 2 +/* CD9EF0 80242C10 08090C79 */ j .L802431E4 +/* CD9EF4 80242C14 00000000 */ nop +.L80242C18: +/* CD9EF8 80242C18 2404006F */ addiu $a0, $zero, 0x6f +/* CD9EFC 80242C1C 10640166 */ beq $v1, $a0, .L802431B8 +/* CD9F00 80242C20 28620070 */ slti $v0, $v1, 0x70 +/* CD9F04 80242C24 10400005 */ beqz $v0, .L80242C3C +/* CD9F08 80242C28 2402006E */ addiu $v0, $zero, 0x6e +/* CD9F0C 80242C2C 10620156 */ beq $v1, $v0, .L80243188 +/* CD9F10 80242C30 2402001E */ addiu $v0, $zero, 0x1e +/* CD9F14 80242C34 08090C79 */ j .L802431E4 +/* CD9F18 80242C38 00000000 */ nop +.L80242C3C: +/* CD9F1C 80242C3C 240200C8 */ addiu $v0, $zero, 0xc8 +/* CD9F20 80242C40 10620166 */ beq $v1, $v0, .L802431DC +/* CD9F24 80242C44 00000000 */ nop +/* CD9F28 80242C48 08090C79 */ j .L802431E4 +/* CD9F2C 80242C4C 00000000 */ nop +.L80242C50: +/* CD9F30 80242C50 0260282D */ daddu $a1, $s3, $zero +/* CD9F34 80242C54 0C012568 */ jal func_800495A0 +/* CD9F38 80242C58 0280302D */ daddu $a2, $s4, $zero +/* CD9F3C 80242C5C 96420086 */ lhu $v0, 0x86($s2) +/* CD9F40 80242C60 A62200A8 */ sh $v0, 0xa8($s1) +/* CD9F44 80242C64 8E4200A0 */ lw $v0, 0xa0($s2) +/* CD9F48 80242C68 10400013 */ beqz $v0, .L80242CB8 +/* CD9F4C 80242C6C 02A0202D */ daddu $a0, $s5, $zero +/* CD9F50 80242C70 C620003C */ lwc1 $f0, 0x3c($s1) +/* CD9F54 80242C74 44801000 */ mtc1 $zero, $f2 +/* CD9F58 80242C78 44801800 */ mtc1 $zero, $f3 +/* CD9F5C 80242C7C 46000021 */ cvt.d.s $f0, $f0 +/* CD9F60 80242C80 4622003E */ c.le.d $f0, $f2 +/* CD9F64 80242C84 00000000 */ nop +/* CD9F68 80242C88 45000005 */ bc1f .L80242CA0 +/* CD9F6C 80242C8C 2403FDFF */ addiu $v1, $zero, -0x201 +/* CD9F70 80242C90 8E220000 */ lw $v0, ($s1) +/* CD9F74 80242C94 00431024 */ and $v0, $v0, $v1 +/* CD9F78 80242C98 08090B2C */ j .L80242CB0 +/* CD9F7C 80242C9C 34420008 */ ori $v0, $v0, 8 +.L80242CA0: +/* CD9F80 80242CA0 8E220000 */ lw $v0, ($s1) +/* CD9F84 80242CA4 2403FFF7 */ addiu $v1, $zero, -9 +/* CD9F88 80242CA8 34420200 */ ori $v0, $v0, 0x200 +/* CD9F8C 80242CAC 00431024 */ and $v0, $v0, $v1 +.L80242CB0: +/* CD9F90 80242CB0 AE220000 */ sw $v0, ($s1) +.L80242CB4: +/* CD9F94 80242CB4 02A0202D */ daddu $a0, $s5, $zero +.L80242CB8: +/* CD9F98 80242CB8 0260282D */ daddu $a1, $s3, $zero +/* CD9F9C 80242CBC 0C0125AE */ jal func_800496B8 +/* CD9FA0 80242CC0 0280302D */ daddu $a2, $s4, $zero +/* CD9FA4 80242CC4 08090C79 */ j .L802431E4 +/* CD9FA8 80242CC8 00000000 */ nop +.L80242CCC: +/* CD9FAC 80242CCC 0260282D */ daddu $a1, $s3, $zero +/* CD9FB0 80242CD0 0C0126D1 */ jal func_80049B44 +/* CD9FB4 80242CD4 0280302D */ daddu $a2, $s4, $zero +.L80242CD8: +/* CD9FB8 80242CD8 02A0202D */ daddu $a0, $s5, $zero +/* CD9FBC 80242CDC 0260282D */ daddu $a1, $s3, $zero +/* CD9FC0 80242CE0 0C012701 */ jal func_80049C04 +/* CD9FC4 80242CE4 0280302D */ daddu $a2, $s4, $zero +/* CD9FC8 80242CE8 08090C79 */ j .L802431E4 +/* CD9FCC 80242CEC 00000000 */ nop +.L80242CF0: +/* CD9FD0 80242CF0 0260282D */ daddu $a1, $s3, $zero +/* CD9FD4 80242CF4 0C090851 */ jal func_80242144_CD9424 +/* CD9FD8 80242CF8 0280302D */ daddu $a2, $s4, $zero +.L80242CFC: +/* CD9FDC 80242CFC 02A0202D */ daddu $a0, $s5, $zero +/* CD9FE0 80242D00 0260282D */ daddu $a1, $s3, $zero +/* CD9FE4 80242D04 0C090870 */ jal func_802421C0_CD94A0 +/* CD9FE8 80242D08 0280302D */ daddu $a2, $s4, $zero +/* CD9FEC 80242D0C 96420086 */ lhu $v0, 0x86($s2) +/* CD9FF0 80242D10 08090C79 */ j .L802431E4 +/* CD9FF4 80242D14 A62200A8 */ sh $v0, 0xa8($s1) +.L80242D18: +/* CD9FF8 80242D18 02A0202D */ daddu $a0, $s5, $zero +/* CD9FFC 80242D1C 0260282D */ daddu $a1, $s3, $zero +/* CDA000 80242D20 0C0908BD */ jal func_802422F4_CD95D4 +/* CDA004 80242D24 0280302D */ daddu $a2, $s4, $zero +/* CDA008 80242D28 08090C79 */ j .L802431E4 +/* CDA00C 80242D2C 00000000 */ nop +.L80242D30: +/* CDA010 80242D30 02A0202D */ daddu $a0, $s5, $zero +/* CDA014 80242D34 0260282D */ daddu $a1, $s3, $zero +/* CDA018 80242D38 0C090916 */ jal func_80242458_CD9738 +/* CDA01C 80242D3C 0280302D */ daddu $a2, $s4, $zero +/* CDA020 80242D40 08090C79 */ j .L802431E4 +/* CDA024 80242D44 00000000 */ nop +.L80242D48: +/* CDA028 80242D48 8E430094 */ lw $v1, 0x94($s2) +/* CDA02C 80242D4C 14620125 */ bne $v1, $v0, .L802431E4 +/* CDA030 80242D50 00000000 */ nop +/* CDA034 80242D54 0C00FB3A */ jal get_enemy +/* CDA038 80242D58 8E440098 */ lw $a0, 0x98($s2) +/* CDA03C 80242D5C 0C00EABB */ jal get_npc_unsafe +/* CDA040 80242D60 84440008 */ lh $a0, 8($v0) +/* CDA044 80242D64 C440000C */ lwc1 $f0, 0xc($v0) +/* CDA048 80242D68 3C018024 */ lui $at, 0x8024 +/* CDA04C 80242D6C D42253B8 */ ldc1 $f2, 0x53b8($at) +/* CDA050 80242D70 46000021 */ cvt.d.s $f0, $f0 +/* CDA054 80242D74 4622003C */ c.lt.d $f0, $f2 +/* CDA058 80242D78 00000000 */ nop +/* CDA05C 80242D7C 45000008 */ bc1f .L80242DA0 +/* CDA060 80242D80 00000000 */ nop +/* CDA064 80242D84 C4400038 */ lwc1 $f0, 0x38($v0) +/* CDA068 80242D88 3C014028 */ lui $at, 0x4028 +/* CDA06C 80242D8C 44811800 */ mtc1 $at, $f3 +/* CDA070 80242D90 44801000 */ mtc1 $zero, $f2 +/* CDA074 80242D94 46000021 */ cvt.d.s $f0, $f0 +/* CDA078 80242D98 08090B6E */ j .L80242DB8 +/* CDA07C 80242D9C 46220000 */ add.d $f0, $f0, $f2 +.L80242DA0: +/* CDA080 80242DA0 C4400038 */ lwc1 $f0, 0x38($v0) +/* CDA084 80242DA4 3C014028 */ lui $at, 0x4028 +/* CDA088 80242DA8 44811800 */ mtc1 $at, $f3 +/* CDA08C 80242DAC 44801000 */ mtc1 $zero, $f2 +/* CDA090 80242DB0 46000021 */ cvt.d.s $f0, $f0 +/* CDA094 80242DB4 46220001 */ sub.d $f0, $f0, $f2 +.L80242DB8: +/* CDA098 80242DB8 46200020 */ cvt.s.d $f0, $f0 +/* CDA09C 80242DBC E6200038 */ swc1 $f0, 0x38($s1) +/* CDA0A0 80242DC0 3C04004A */ lui $a0, 0x4a +/* CDA0A4 80242DC4 C440003C */ lwc1 $f0, 0x3c($v0) +/* CDA0A8 80242DC8 3C014039 */ lui $at, 0x4039 +/* CDA0AC 80242DCC 44811800 */ mtc1 $at, $f3 +/* CDA0B0 80242DD0 44801000 */ mtc1 $zero, $f2 +/* CDA0B4 80242DD4 46000021 */ cvt.d.s $f0, $f0 +/* CDA0B8 80242DD8 46220000 */ add.d $f0, $f0, $f2 +/* CDA0BC 80242DDC 34840018 */ ori $a0, $a0, 0x18 +/* CDA0C0 80242DE0 3C013FF0 */ lui $at, 0x3ff0 +/* CDA0C4 80242DE4 44811800 */ mtc1 $at, $f3 +/* CDA0C8 80242DE8 44801000 */ mtc1 $zero, $f2 +/* CDA0CC 80242DEC 46200020 */ cvt.s.d $f0, $f0 +/* CDA0D0 80242DF0 E620003C */ swc1 $f0, 0x3c($s1) +/* CDA0D4 80242DF4 C4400040 */ lwc1 $f0, 0x40($v0) +/* CDA0D8 80242DF8 8E220000 */ lw $v0, ($s1) +/* CDA0DC 80242DFC 2403FFFD */ addiu $v1, $zero, -3 +/* CDA0E0 80242E00 AE200048 */ sw $zero, 0x48($s1) +/* CDA0E4 80242E04 AE200034 */ sw $zero, 0x34($s1) +/* CDA0E8 80242E08 AE240028 */ sw $a0, 0x28($s1) +/* CDA0EC 80242E0C 34420008 */ ori $v0, $v0, 8 +/* CDA0F0 80242E10 00431024 */ and $v0, $v0, $v1 +/* CDA0F4 80242E14 2403FDFF */ addiu $v1, $zero, -0x201 +/* CDA0F8 80242E18 00431024 */ and $v0, $v0, $v1 +/* CDA0FC 80242E1C 46000021 */ cvt.d.s $f0, $f0 +/* CDA100 80242E20 46220000 */ add.d $f0, $f0, $f2 +/* CDA104 80242E24 AE220000 */ sw $v0, ($s1) +/* CDA108 80242E28 24020065 */ addiu $v0, $zero, 0x65 +/* CDA10C 80242E2C 46200020 */ cvt.s.d $f0, $f0 +/* CDA110 80242E30 E6200040 */ swc1 $f0, 0x40($s1) +/* CDA114 80242E34 AEA20070 */ sw $v0, 0x70($s5) +.L80242E38: +/* CDA118 80242E38 8E430094 */ lw $v1, 0x94($s2) +/* CDA11C 80242E3C 24020003 */ addiu $v0, $zero, 3 +/* CDA120 80242E40 146200E8 */ bne $v1, $v0, .L802431E4 +/* CDA124 80242E44 24020004 */ addiu $v0, $zero, 4 +/* CDA128 80242E48 AE420094 */ sw $v0, 0x94($s2) +/* CDA12C 80242E4C C62C0038 */ lwc1 $f12, 0x38($s1) +/* CDA130 80242E50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CDA134 80242E54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CDA138 80242E58 C62E0040 */ lwc1 $f14, 0x40($s1) +/* CDA13C 80242E5C 8C460028 */ lw $a2, 0x28($v0) +/* CDA140 80242E60 0C00A720 */ jal atan2 +/* CDA144 80242E64 8C470030 */ lw $a3, 0x30($v0) +/* CDA148 80242E68 3C014020 */ lui $at, 0x4020 +/* CDA14C 80242E6C 44811000 */ mtc1 $at, $f2 +/* CDA150 80242E70 3C014100 */ lui $at, 0x4100 +/* CDA154 80242E74 44812000 */ mtc1 $at, $f4 +/* CDA158 80242E78 3C013F4C */ lui $at, 0x3f4c +/* CDA15C 80242E7C 3421CCCD */ ori $at, $at, 0xcccd +/* CDA160 80242E80 44813000 */ mtc1 $at, $f6 +/* CDA164 80242E84 8E220000 */ lw $v0, ($s1) +/* CDA168 80242E88 E620000C */ swc1 $f0, 0xc($s1) +/* CDA16C 80242E8C 34420800 */ ori $v0, $v0, 0x800 +/* CDA170 80242E90 AE220000 */ sw $v0, ($s1) +/* CDA174 80242E94 24020066 */ addiu $v0, $zero, 0x66 +/* CDA178 80242E98 E6220018 */ swc1 $f2, 0x18($s1) +/* CDA17C 80242E9C E624001C */ swc1 $f4, 0x1c($s1) +/* CDA180 80242EA0 E6260014 */ swc1 $f6, 0x14($s1) +/* CDA184 80242EA4 AEA20070 */ sw $v0, 0x70($s5) +.L80242EA8: +/* CDA188 80242EA8 C6200018 */ lwc1 $f0, 0x18($s1) +/* CDA18C 80242EAC 44801000 */ mtc1 $zero, $f2 +/* CDA190 80242EB0 44801800 */ mtc1 $zero, $f3 +/* CDA194 80242EB4 46000021 */ cvt.d.s $f0, $f0 +/* CDA198 80242EB8 4620103C */ c.lt.d $f2, $f0 +/* CDA19C 80242EBC 00000000 */ nop +/* CDA1A0 80242EC0 4500001F */ bc1f .L80242F40 +/* CDA1A4 80242EC4 27A50058 */ addiu $a1, $sp, 0x58 +/* CDA1A8 80242EC8 C6200038 */ lwc1 $f0, 0x38($s1) +/* CDA1AC 80242ECC C622003C */ lwc1 $f2, 0x3c($s1) +/* CDA1B0 80242ED0 C6240040 */ lwc1 $f4, 0x40($s1) +/* CDA1B4 80242ED4 C6260018 */ lwc1 $f6, 0x18($s1) +/* CDA1B8 80242ED8 E7A00058 */ swc1 $f0, 0x58($sp) +/* CDA1BC 80242EDC E7A2005C */ swc1 $f2, 0x5c($sp) +/* CDA1C0 80242EE0 E7A40060 */ swc1 $f4, 0x60($sp) +/* CDA1C4 80242EE4 E7A60010 */ swc1 $f6, 0x10($sp) +/* CDA1C8 80242EE8 C620000C */ lwc1 $f0, 0xc($s1) +/* CDA1CC 80242EEC E7A00014 */ swc1 $f0, 0x14($sp) +/* CDA1D0 80242EF0 862200A8 */ lh $v0, 0xa8($s1) +/* CDA1D4 80242EF4 44820000 */ mtc1 $v0, $f0 +/* CDA1D8 80242EF8 00000000 */ nop +/* CDA1DC 80242EFC 46800020 */ cvt.s.w $f0, $f0 +/* CDA1E0 80242F00 E7A00018 */ swc1 $f0, 0x18($sp) +/* CDA1E4 80242F04 862200A6 */ lh $v0, 0xa6($s1) +/* CDA1E8 80242F08 27A6005C */ addiu $a2, $sp, 0x5c +/* CDA1EC 80242F0C 44820000 */ mtc1 $v0, $f0 +/* CDA1F0 80242F10 00000000 */ nop +/* CDA1F4 80242F14 46800020 */ cvt.s.w $f0, $f0 +/* CDA1F8 80242F18 E7A0001C */ swc1 $f0, 0x1c($sp) +/* CDA1FC 80242F1C 8E240080 */ lw $a0, 0x80($s1) +/* CDA200 80242F20 0C037711 */ jal func_800DDC44 +/* CDA204 80242F24 27A70060 */ addiu $a3, $sp, 0x60 +/* CDA208 80242F28 54400005 */ bnel $v0, $zero, .L80242F40 +/* CDA20C 80242F2C AE200018 */ sw $zero, 0x18($s1) +/* CDA210 80242F30 8E250018 */ lw $a1, 0x18($s1) +/* CDA214 80242F34 8E26000C */ lw $a2, 0xc($s1) +/* CDA218 80242F38 0C00EA95 */ jal npc_move_heading +/* CDA21C 80242F3C 0220202D */ daddu $a0, $s1, $zero +.L80242F40: +/* CDA220 80242F40 C620001C */ lwc1 $f0, 0x1c($s1) +/* CDA224 80242F44 4480B000 */ mtc1 $zero, $f22 +/* CDA228 80242F48 4480B800 */ mtc1 $zero, $f23 +/* CDA22C 80242F4C 46000021 */ cvt.d.s $f0, $f0 +/* CDA230 80242F50 4636003C */ c.lt.d $f0, $f22 +/* CDA234 80242F54 00000000 */ nop +/* CDA238 80242F58 45000074 */ bc1f .L8024312C +/* CDA23C 80242F5C 27A50058 */ addiu $a1, $sp, 0x58 +/* CDA240 80242F60 27A6005C */ addiu $a2, $sp, 0x5c +/* CDA244 80242F64 27A20064 */ addiu $v0, $sp, 0x64 +/* CDA248 80242F68 C622003C */ lwc1 $f2, 0x3c($s1) +/* CDA24C 80242F6C C6260038 */ lwc1 $f6, 0x38($s1) +/* CDA250 80242F70 3C01402A */ lui $at, 0x402a +/* CDA254 80242F74 4481A800 */ mtc1 $at, $f21 +/* CDA258 80242F78 4480A000 */ mtc1 $zero, $f20 +/* CDA25C 80242F7C 460010A1 */ cvt.d.s $f2, $f2 +/* CDA260 80242F80 46341080 */ add.d $f2, $f2, $f20 +/* CDA264 80242F84 C620001C */ lwc1 $f0, 0x1c($s1) +/* CDA268 80242F88 C6240040 */ lwc1 $f4, 0x40($s1) +/* CDA26C 80242F8C 46000005 */ abs.s $f0, $f0 +/* CDA270 80242F90 E7A40060 */ swc1 $f4, 0x60($sp) +/* CDA274 80242F94 3C014030 */ lui $at, 0x4030 +/* CDA278 80242F98 44812800 */ mtc1 $at, $f5 +/* CDA27C 80242F9C 44802000 */ mtc1 $zero, $f4 +/* CDA280 80242FA0 46000021 */ cvt.d.s $f0, $f0 +/* CDA284 80242FA4 E7A60058 */ swc1 $f6, 0x58($sp) +/* CDA288 80242FA8 46240000 */ add.d $f0, $f0, $f4 +/* CDA28C 80242FAC 462010A0 */ cvt.s.d $f2, $f2 +/* CDA290 80242FB0 E7A2005C */ swc1 $f2, 0x5c($sp) +/* CDA294 80242FB4 46200020 */ cvt.s.d $f0, $f0 +/* CDA298 80242FB8 E7A00064 */ swc1 $f0, 0x64($sp) +/* CDA29C 80242FBC AFA20010 */ sw $v0, 0x10($sp) +/* CDA2A0 80242FC0 8E240080 */ lw $a0, 0x80($s1) +/* CDA2A4 80242FC4 0C0372DF */ jal func_800DCB7C +/* CDA2A8 80242FC8 27A70060 */ addiu $a3, $sp, 0x60 +/* CDA2AC 80242FCC 10400057 */ beqz $v0, .L8024312C +/* CDA2B0 80242FD0 00000000 */ nop +/* CDA2B4 80242FD4 C620001C */ lwc1 $f0, 0x1c($s1) +/* CDA2B8 80242FD8 C7A20064 */ lwc1 $f2, 0x64($sp) +/* CDA2BC 80242FDC 46000005 */ abs.s $f0, $f0 +/* CDA2C0 80242FE0 46000021 */ cvt.d.s $f0, $f0 +/* CDA2C4 80242FE4 46340000 */ add.d $f0, $f0, $f20 +/* CDA2C8 80242FE8 460010A1 */ cvt.d.s $f2, $f2 +/* CDA2CC 80242FEC 4620103E */ c.le.d $f2, $f0 +/* CDA2D0 80242FF0 00000000 */ nop +/* CDA2D4 80242FF4 4500004D */ bc1f .L8024312C +/* CDA2D8 80242FF8 00000000 */ nop +/* CDA2DC 80242FFC C7A0005C */ lwc1 $f0, 0x5c($sp) +/* CDA2E0 80243000 E620003C */ swc1 $f0, 0x3c($s1) +/* CDA2E4 80243004 8E4200D0 */ lw $v0, 0xd0($s2) +/* CDA2E8 80243008 C6200038 */ lwc1 $f0, 0x38($s1) +/* CDA2EC 8024300C 4600020D */ trunc.w.s $f8, $f0 +/* CDA2F0 80243010 E4480000 */ swc1 $f8, ($v0) +/* CDA2F4 80243014 8E4200D0 */ lw $v0, 0xd0($s2) +/* CDA2F8 80243018 C620003C */ lwc1 $f0, 0x3c($s1) +/* CDA2FC 8024301C 4600020D */ trunc.w.s $f8, $f0 +/* CDA300 80243020 E4480004 */ swc1 $f8, 4($v0) +/* CDA304 80243024 8E4200D0 */ lw $v0, 0xd0($s2) +/* CDA308 80243028 C6200040 */ lwc1 $f0, 0x40($s1) +/* CDA30C 8024302C 4600020D */ trunc.w.s $f8, $f0 +/* CDA310 80243030 E4480008 */ swc1 $f8, 8($v0) +/* CDA314 80243034 8E4200D0 */ lw $v0, 0xd0($s2) +/* CDA318 80243038 C6200038 */ lwc1 $f0, 0x38($s1) +/* CDA31C 8024303C 4600020D */ trunc.w.s $f8, $f0 +/* CDA320 80243040 E448001C */ swc1 $f8, 0x1c($v0) +/* CDA324 80243044 8E4200D0 */ lw $v0, 0xd0($s2) +/* CDA328 80243048 C620003C */ lwc1 $f0, 0x3c($s1) +/* CDA32C 8024304C 4600020D */ trunc.w.s $f8, $f0 +/* CDA330 80243050 E4480020 */ swc1 $f8, 0x20($v0) +/* CDA334 80243054 8E4200D0 */ lw $v0, 0xd0($s2) +/* CDA338 80243058 C6200040 */ lwc1 $f0, 0x40($s1) +/* CDA33C 8024305C 4600020D */ trunc.w.s $f8, $f0 +/* CDA340 80243060 E4480024 */ swc1 $f8, 0x24($v0) +/* CDA344 80243064 8E4300A0 */ lw $v1, 0xa0($s2) +/* CDA348 80243068 24020005 */ addiu $v0, $zero, 5 +/* CDA34C 8024306C 1060000B */ beqz $v1, .L8024309C +/* CDA350 80243070 AE420094 */ sw $v0, 0x94($s2) +/* CDA354 80243074 C620003C */ lwc1 $f0, 0x3c($s1) +/* CDA358 80243078 46000021 */ cvt.d.s $f0, $f0 +/* CDA35C 8024307C 4636003E */ c.le.d $f0, $f22 +/* CDA360 80243080 00000000 */ nop +/* CDA364 80243084 4501000D */ bc1t .L802430BC +/* CDA368 80243088 2403FFF7 */ addiu $v1, $zero, -9 +/* CDA36C 8024308C 8E220000 */ lw $v0, ($s1) +/* CDA370 80243090 34420200 */ ori $v0, $v0, 0x200 +/* CDA374 80243094 08090C33 */ j .L802430CC +/* CDA378 80243098 00431024 */ and $v0, $v0, $v1 +.L8024309C: +/* CDA37C 8024309C 8E4200D0 */ lw $v0, 0xd0($s2) +/* CDA380 802430A0 8C420034 */ lw $v0, 0x34($v0) +/* CDA384 802430A4 14400005 */ bnez $v0, .L802430BC +/* CDA388 802430A8 2403FFF7 */ addiu $v1, $zero, -9 +/* CDA38C 802430AC 8E220000 */ lw $v0, ($s1) +/* CDA390 802430B0 34420200 */ ori $v0, $v0, 0x200 +/* CDA394 802430B4 08090C33 */ j .L802430CC +/* CDA398 802430B8 00431024 */ and $v0, $v0, $v1 +.L802430BC: +/* CDA39C 802430BC 8E220000 */ lw $v0, ($s1) +/* CDA3A0 802430C0 2403FDFF */ addiu $v1, $zero, -0x201 +/* CDA3A4 802430C4 00431024 */ and $v0, $v0, $v1 +/* CDA3A8 802430C8 34420008 */ ori $v0, $v0, 8 +.L802430CC: +/* CDA3AC 802430CC AE220000 */ sw $v0, ($s1) +/* CDA3B0 802430D0 C62C0038 */ lwc1 $f12, 0x38($s1) +/* CDA3B4 802430D4 C62E0040 */ lwc1 $f14, 0x40($s1) +/* CDA3B8 802430D8 8E220000 */ lw $v0, ($s1) +/* CDA3BC 802430DC 3C04800F */ lui $a0, %hi(gPlayerStatusPtr) +/* CDA3C0 802430E0 8C847B30 */ lw $a0, %lo(gPlayerStatusPtr)($a0) +/* CDA3C4 802430E4 3C030004 */ lui $v1, 4 +/* CDA3C8 802430E8 AE20001C */ sw $zero, 0x1c($s1) +/* CDA3CC 802430EC 00431025 */ or $v0, $v0, $v1 +/* CDA3D0 802430F0 2403F7FF */ addiu $v1, $zero, -0x801 +/* CDA3D4 802430F4 00431024 */ and $v0, $v0, $v1 +/* CDA3D8 802430F8 AE220000 */ sw $v0, ($s1) +/* CDA3DC 802430FC 8C860028 */ lw $a2, 0x28($a0) +/* CDA3E0 80243100 0C00A720 */ jal atan2 +/* CDA3E4 80243104 8C870030 */ lw $a3, 0x30($a0) +/* CDA3E8 80243108 3C02004A */ lui $v0, 0x4a +/* CDA3EC 8024310C 3442001A */ ori $v0, $v0, 0x1a +/* CDA3F0 80243110 AE220028 */ sw $v0, 0x28($s1) +/* CDA3F4 80243114 24020003 */ addiu $v0, $zero, 3 +/* CDA3F8 80243118 A622008E */ sh $v0, 0x8e($s1) +/* CDA3FC 8024311C 24020067 */ addiu $v0, $zero, 0x67 +/* CDA400 80243120 E620000C */ swc1 $f0, 0xc($s1) +/* CDA404 80243124 08090C79 */ j .L802431E4 +/* CDA408 80243128 AEA20070 */ sw $v0, 0x70($s5) +.L8024312C: +/* CDA40C 8024312C C624003C */ lwc1 $f4, 0x3c($s1) +/* CDA410 80243130 C620001C */ lwc1 $f0, 0x1c($s1) +/* CDA414 80243134 46002100 */ add.s $f4, $f4, $f0 +/* CDA418 80243138 C6220014 */ lwc1 $f2, 0x14($s1) +/* CDA41C 8024313C 46020001 */ sub.s $f0, $f0, $f2 +/* CDA420 80243140 E624003C */ swc1 $f4, 0x3c($s1) +/* CDA424 80243144 08090C79 */ j .L802431E4 +/* CDA428 80243148 E620001C */ swc1 $f0, 0x1c($s1) +.L8024314C: +/* CDA42C 8024314C 9622008E */ lhu $v0, 0x8e($s1) +/* CDA430 80243150 2442FFFF */ addiu $v0, $v0, -1 +/* CDA434 80243154 A622008E */ sh $v0, 0x8e($s1) +/* CDA438 80243158 00021400 */ sll $v0, $v0, 0x10 +/* CDA43C 8024315C 1C400021 */ bgtz $v0, .L802431E4 +/* CDA440 80243160 3C03004A */ lui $v1, 0x4a +/* CDA444 80243164 3C04FFFB */ lui $a0, 0xfffb +/* CDA448 80243168 3484FFFF */ ori $a0, $a0, 0xffff +/* CDA44C 8024316C 8E220000 */ lw $v0, ($s1) +/* CDA450 80243170 34630001 */ ori $v1, $v1, 1 +/* CDA454 80243174 AE230028 */ sw $v1, 0x28($s1) +/* CDA458 80243178 00441024 */ and $v0, $v0, $a0 +/* CDA45C 8024317C AE220000 */ sw $v0, ($s1) +/* CDA460 80243180 08090C79 */ j .L802431E4 +/* CDA464 80243184 AEA00070 */ sw $zero, 0x70($s5) +.L80243188: +/* CDA468 80243188 3C01C47A */ lui $at, 0xc47a +/* CDA46C 8024318C 44810000 */ mtc1 $at, $f0 +/* CDA470 80243190 8E230000 */ lw $v1, ($s1) +/* CDA474 80243194 A622008E */ sh $v0, 0x8e($s1) +/* CDA478 80243198 2402FDFF */ addiu $v0, $zero, -0x201 +/* CDA47C 8024319C AE200038 */ sw $zero, 0x38($s1) +/* CDA480 802431A0 AE200040 */ sw $zero, 0x40($s1) +/* CDA484 802431A4 3463000A */ ori $v1, $v1, 0xa +/* CDA488 802431A8 00621824 */ and $v1, $v1, $v0 +/* CDA48C 802431AC E620003C */ swc1 $f0, 0x3c($s1) +/* CDA490 802431B0 AE230000 */ sw $v1, ($s1) +/* CDA494 802431B4 AEA40070 */ sw $a0, 0x70($s5) +.L802431B8: +/* CDA498 802431B8 9622008E */ lhu $v0, 0x8e($s1) +/* CDA49C 802431BC 2442FFFF */ addiu $v0, $v0, -1 +/* CDA4A0 802431C0 A622008E */ sh $v0, 0x8e($s1) +/* CDA4A4 802431C4 00021400 */ sll $v0, $v0, 0x10 +/* CDA4A8 802431C8 1C400006 */ bgtz $v0, .L802431E4 +/* CDA4AC 802431CC 24020064 */ addiu $v0, $zero, 0x64 +/* CDA4B0 802431D0 AE400094 */ sw $zero, 0x94($s2) +/* CDA4B4 802431D4 08090C79 */ j .L802431E4 +/* CDA4B8 802431D8 AEA20070 */ sw $v0, 0x70($s5) +.L802431DC: +/* CDA4BC 802431DC 0C0129CF */ jal func_8004A73C +/* CDA4C0 802431E0 02A0202D */ daddu $a0, $s5, $zero +.L802431E4: +/* CDA4C4 802431E4 8FBF0080 */ lw $ra, 0x80($sp) +/* CDA4C8 802431E8 8FB5007C */ lw $s5, 0x7c($sp) +/* CDA4CC 802431EC 8FB40078 */ lw $s4, 0x78($sp) +/* CDA4D0 802431F0 8FB30074 */ lw $s3, 0x74($sp) +/* CDA4D4 802431F4 8FB20070 */ lw $s2, 0x70($sp) +/* CDA4D8 802431F8 8FB1006C */ lw $s1, 0x6c($sp) +/* CDA4DC 802431FC 8FB00068 */ lw $s0, 0x68($sp) +/* CDA4E0 80243200 D7B60090 */ ldc1 $f22, 0x90($sp) +/* CDA4E4 80243204 D7B40088 */ ldc1 $f20, 0x88($sp) +/* CDA4E8 80243208 0000102D */ daddu $v0, $zero, $zero +/* CDA4EC 8024320C 03E00008 */ jr $ra +/* CDA4F0 80243210 27BD0098 */ addiu $sp, $sp, 0x98 +/* CDA4F4 80243214 00000000 */ nop +/* CDA4F8 80243218 00000000 */ nop +/* CDA4FC 8024321C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_18/CDCC30/func_80240600_CDCCA0.s b/asm/nonmatchings/world/area_flo/flo_18/CDCC30/func_80240600_CDCCA0.s index 642009a3d0..8972a222d4 100644 --- a/asm/nonmatchings/world/area_flo/flo_18/CDCC30/func_80240600_CDCCA0.s +++ b/asm/nonmatchings/world/area_flo/flo_18/CDCC30/func_80240600_CDCCA0.s @@ -55,7 +55,7 @@ glabel func_80240600_CDCCA0 /* CDCD68 802406C8 4405E000 */ mfc1 $a1, $f28 /* CDCD6C 802406CC 4406D000 */ mfc1 $a2, $f26 /* CDCD70 802406D0 4407C000 */ mfc1 $a3, $f24 -/* CDCD74 802406D4 0C090164 */ jal func_80240590 +/* CDCD74 802406D4 0C090164 */ jal func_80240590_CDCC30 /* CDCD78 802406D8 27A40010 */ addiu $a0, $sp, 0x10 /* CDCD7C 802406DC 27A40010 */ addiu $a0, $sp, 0x10 /* CDCD80 802406E0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240600_CDCCA0 /* CDCDF0 80240750 4405E000 */ mfc1 $a1, $f28 /* CDCDF4 80240754 4406D000 */ mfc1 $a2, $f26 /* CDCDF8 80240758 4407C000 */ mfc1 $a3, $f24 -/* CDCDFC 8024075C 0C090164 */ jal func_80240590 +/* CDCDFC 8024075C 0C090164 */ jal func_80240590_CDCC30 /* CDCE00 80240760 27A40010 */ addiu $a0, $sp, 0x10 /* CDCE04 80240764 27A40010 */ addiu $a0, $sp, 0x10 /* CDCE08 80240768 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918.s b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918.s deleted file mode 100644 index 771cce0215..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240918 -/* CE7018 80240918 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CE701C 8024091C AFB00010 */ sw $s0, 0x10($sp) -/* CE7020 80240920 0080802D */ daddu $s0, $a0, $zero -/* CE7024 80240924 10A00005 */ beqz $a1, .L8024093C -/* CE7028 80240928 AFBF0014 */ sw $ra, 0x14($sp) -/* CE702C 8024092C AE000070 */ sw $zero, 0x70($s0) -/* CE7030 80240930 AE000074 */ sw $zero, 0x74($s0) -/* CE7034 80240934 AE000078 */ sw $zero, 0x78($s0) -/* CE7038 80240938 AE00007C */ sw $zero, 0x7c($s0) -.L8024093C: -/* CE703C 8024093C 8E020070 */ lw $v0, 0x70($s0) -/* CE7040 80240940 1440000E */ bnez $v0, .L8024097C -/* CE7044 80240944 00000000 */ nop -/* CE7048 80240948 8E0300A8 */ lw $v1, 0xa8($s0) -/* CE704C 8024094C 8E020088 */ lw $v0, 0x88($s0) -/* CE7050 80240950 00621821 */ addu $v1, $v1, $v0 -/* CE7054 80240954 04610004 */ bgez $v1, .L80240968 -/* CE7058 80240958 AE0300A8 */ sw $v1, 0xa8($s0) -/* CE705C 8024095C 3C020002 */ lui $v0, 2 -/* CE7060 80240960 0809025E */ j .L80240978 -/* CE7064 80240964 00621021 */ addu $v0, $v1, $v0 -.L80240968: -/* CE7068 80240968 3C040002 */ lui $a0, 2 -/* CE706C 8024096C 0083102A */ slt $v0, $a0, $v1 -/* CE7070 80240970 10400002 */ beqz $v0, .L8024097C -/* CE7074 80240974 00641023 */ subu $v0, $v1, $a0 -.L80240978: -/* CE7078 80240978 AE0200A8 */ sw $v0, 0xa8($s0) -.L8024097C: -/* CE707C 8024097C 8E020074 */ lw $v0, 0x74($s0) -/* CE7080 80240980 1440000E */ bnez $v0, .L802409BC -/* CE7084 80240984 00000000 */ nop -/* CE7088 80240988 8E0300AC */ lw $v1, 0xac($s0) -/* CE708C 8024098C 8E02008C */ lw $v0, 0x8c($s0) -/* CE7090 80240990 00621821 */ addu $v1, $v1, $v0 -/* CE7094 80240994 04610004 */ bgez $v1, .L802409A8 -/* CE7098 80240998 AE0300AC */ sw $v1, 0xac($s0) -/* CE709C 8024099C 3C020002 */ lui $v0, 2 -/* CE70A0 802409A0 0809026E */ j .L802409B8 -/* CE70A4 802409A4 00621021 */ addu $v0, $v1, $v0 -.L802409A8: -/* CE70A8 802409A8 3C040002 */ lui $a0, 2 -/* CE70AC 802409AC 0083102A */ slt $v0, $a0, $v1 -/* CE70B0 802409B0 10400002 */ beqz $v0, .L802409BC -/* CE70B4 802409B4 00641023 */ subu $v0, $v1, $a0 -.L802409B8: -/* CE70B8 802409B8 AE0200AC */ sw $v0, 0xac($s0) -.L802409BC: -/* CE70BC 802409BC 8E020078 */ lw $v0, 0x78($s0) -/* CE70C0 802409C0 1440000E */ bnez $v0, .L802409FC -/* CE70C4 802409C4 00000000 */ nop -/* CE70C8 802409C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* CE70CC 802409CC 8E020090 */ lw $v0, 0x90($s0) -/* CE70D0 802409D0 00621821 */ addu $v1, $v1, $v0 -/* CE70D4 802409D4 04610004 */ bgez $v1, .L802409E8 -/* CE70D8 802409D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* CE70DC 802409DC 3C020002 */ lui $v0, 2 -/* CE70E0 802409E0 0809027E */ j .L802409F8 -/* CE70E4 802409E4 00621021 */ addu $v0, $v1, $v0 -.L802409E8: -/* CE70E8 802409E8 3C040002 */ lui $a0, 2 -/* CE70EC 802409EC 0083102A */ slt $v0, $a0, $v1 -/* CE70F0 802409F0 10400002 */ beqz $v0, .L802409FC -/* CE70F4 802409F4 00641023 */ subu $v0, $v1, $a0 -.L802409F8: -/* CE70F8 802409F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802409FC: -/* CE70FC 802409FC 8E02007C */ lw $v0, 0x7c($s0) -/* CE7100 80240A00 1440000E */ bnez $v0, .L80240A3C -/* CE7104 80240A04 00000000 */ nop -/* CE7108 80240A08 8E0300B4 */ lw $v1, 0xb4($s0) -/* CE710C 80240A0C 8E020094 */ lw $v0, 0x94($s0) -/* CE7110 80240A10 00621821 */ addu $v1, $v1, $v0 -/* CE7114 80240A14 04610004 */ bgez $v1, .L80240A28 -/* CE7118 80240A18 AE0300B4 */ sw $v1, 0xb4($s0) -/* CE711C 80240A1C 3C020002 */ lui $v0, 2 -/* CE7120 80240A20 0809028E */ j .L80240A38 -/* CE7124 80240A24 00621021 */ addu $v0, $v1, $v0 -.L80240A28: -/* CE7128 80240A28 3C040002 */ lui $a0, 2 -/* CE712C 80240A2C 0083102A */ slt $v0, $a0, $v1 -/* CE7130 80240A30 10400002 */ beqz $v0, .L80240A3C -/* CE7134 80240A34 00641023 */ subu $v0, $v1, $a0 -.L80240A38: -/* CE7138 80240A38 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240A3C: -/* CE713C 80240A3C 8E040084 */ lw $a0, 0x84($s0) -/* CE7140 80240A40 0C046F07 */ jal set_main_pan_u -/* CE7144 80240A44 8E0500A8 */ lw $a1, 0xa8($s0) -/* CE7148 80240A48 8E040084 */ lw $a0, 0x84($s0) -/* CE714C 80240A4C 0C046F0D */ jal set_main_pan_v -/* CE7150 80240A50 8E0500AC */ lw $a1, 0xac($s0) -/* CE7154 80240A54 8E040084 */ lw $a0, 0x84($s0) -/* CE7158 80240A58 0C046F13 */ jal set_aux_pan_u -/* CE715C 80240A5C 8E0500B0 */ lw $a1, 0xb0($s0) -/* CE7160 80240A60 8E040084 */ lw $a0, 0x84($s0) -/* CE7164 80240A64 0C046F19 */ jal set_aux_pan_v -/* CE7168 80240A68 8E0500B4 */ lw $a1, 0xb4($s0) -/* CE716C 80240A6C 8E020070 */ lw $v0, 0x70($s0) -/* CE7170 80240A70 8E030078 */ lw $v1, 0x78($s0) -/* CE7174 80240A74 8E040098 */ lw $a0, 0x98($s0) -/* CE7178 80240A78 24420001 */ addiu $v0, $v0, 1 -/* CE717C 80240A7C AE020070 */ sw $v0, 0x70($s0) -/* CE7180 80240A80 8E020074 */ lw $v0, 0x74($s0) -/* CE7184 80240A84 24630001 */ addiu $v1, $v1, 1 -/* CE7188 80240A88 AE030078 */ sw $v1, 0x78($s0) -/* CE718C 80240A8C 8E030070 */ lw $v1, 0x70($s0) -/* CE7190 80240A90 24420001 */ addiu $v0, $v0, 1 -/* CE7194 80240A94 AE020074 */ sw $v0, 0x74($s0) -/* CE7198 80240A98 8E02007C */ lw $v0, 0x7c($s0) -/* CE719C 80240A9C 0064182A */ slt $v1, $v1, $a0 -/* CE71A0 80240AA0 24420001 */ addiu $v0, $v0, 1 -/* CE71A4 80240AA4 14600002 */ bnez $v1, .L80240AB0 -/* CE71A8 80240AA8 AE02007C */ sw $v0, 0x7c($s0) -/* CE71AC 80240AAC AE000070 */ sw $zero, 0x70($s0) -.L80240AB0: -/* CE71B0 80240AB0 8E020074 */ lw $v0, 0x74($s0) -/* CE71B4 80240AB4 8E03009C */ lw $v1, 0x9c($s0) -/* CE71B8 80240AB8 0043102A */ slt $v0, $v0, $v1 -/* CE71BC 80240ABC 50400001 */ beql $v0, $zero, .L80240AC4 -/* CE71C0 80240AC0 AE000074 */ sw $zero, 0x74($s0) -.L80240AC4: -/* CE71C4 80240AC4 8E020078 */ lw $v0, 0x78($s0) -/* CE71C8 80240AC8 8E0300A0 */ lw $v1, 0xa0($s0) -/* CE71CC 80240ACC 0043102A */ slt $v0, $v0, $v1 -/* CE71D0 80240AD0 50400001 */ beql $v0, $zero, .L80240AD8 -/* CE71D4 80240AD4 AE000078 */ sw $zero, 0x78($s0) -.L80240AD8: -/* CE71D8 80240AD8 8E02007C */ lw $v0, 0x7c($s0) -/* CE71DC 80240ADC 8E0300A4 */ lw $v1, 0xa4($s0) -/* CE71E0 80240AE0 0043102A */ slt $v0, $v0, $v1 -/* CE71E4 80240AE4 50400001 */ beql $v0, $zero, .L80240AEC -/* CE71E8 80240AE8 AE00007C */ sw $zero, 0x7c($s0) -.L80240AEC: -/* CE71EC 80240AEC 8FBF0014 */ lw $ra, 0x14($sp) -/* CE71F0 80240AF0 8FB00010 */ lw $s0, 0x10($sp) -/* CE71F4 80240AF4 0000102D */ daddu $v0, $zero, $zero -/* CE71F8 80240AF8 03E00008 */ jr $ra -/* CE71FC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918_CE7018.s b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918_CE7018.s new file mode 100644 index 0000000000..565fe9caac --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_21/CE6700/func_80240918_CE7018.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240918_CE7018 +/* CE7018 80240918 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CE701C 8024091C AFB00010 */ sw $s0, 0x10($sp) +/* CE7020 80240920 0080802D */ daddu $s0, $a0, $zero +/* CE7024 80240924 10A00005 */ beqz $a1, .L8024093C +/* CE7028 80240928 AFBF0014 */ sw $ra, 0x14($sp) +/* CE702C 8024092C AE000070 */ sw $zero, 0x70($s0) +/* CE7030 80240930 AE000074 */ sw $zero, 0x74($s0) +/* CE7034 80240934 AE000078 */ sw $zero, 0x78($s0) +/* CE7038 80240938 AE00007C */ sw $zero, 0x7c($s0) +.L8024093C: +/* CE703C 8024093C 8E020070 */ lw $v0, 0x70($s0) +/* CE7040 80240940 1440000E */ bnez $v0, .L8024097C +/* CE7044 80240944 00000000 */ nop +/* CE7048 80240948 8E0300A8 */ lw $v1, 0xa8($s0) +/* CE704C 8024094C 8E020088 */ lw $v0, 0x88($s0) +/* CE7050 80240950 00621821 */ addu $v1, $v1, $v0 +/* CE7054 80240954 04610004 */ bgez $v1, .L80240968 +/* CE7058 80240958 AE0300A8 */ sw $v1, 0xa8($s0) +/* CE705C 8024095C 3C020002 */ lui $v0, 2 +/* CE7060 80240960 0809025E */ j .L80240978 +/* CE7064 80240964 00621021 */ addu $v0, $v1, $v0 +.L80240968: +/* CE7068 80240968 3C040002 */ lui $a0, 2 +/* CE706C 8024096C 0083102A */ slt $v0, $a0, $v1 +/* CE7070 80240970 10400002 */ beqz $v0, .L8024097C +/* CE7074 80240974 00641023 */ subu $v0, $v1, $a0 +.L80240978: +/* CE7078 80240978 AE0200A8 */ sw $v0, 0xa8($s0) +.L8024097C: +/* CE707C 8024097C 8E020074 */ lw $v0, 0x74($s0) +/* CE7080 80240980 1440000E */ bnez $v0, .L802409BC +/* CE7084 80240984 00000000 */ nop +/* CE7088 80240988 8E0300AC */ lw $v1, 0xac($s0) +/* CE708C 8024098C 8E02008C */ lw $v0, 0x8c($s0) +/* CE7090 80240990 00621821 */ addu $v1, $v1, $v0 +/* CE7094 80240994 04610004 */ bgez $v1, .L802409A8 +/* CE7098 80240998 AE0300AC */ sw $v1, 0xac($s0) +/* CE709C 8024099C 3C020002 */ lui $v0, 2 +/* CE70A0 802409A0 0809026E */ j .L802409B8 +/* CE70A4 802409A4 00621021 */ addu $v0, $v1, $v0 +.L802409A8: +/* CE70A8 802409A8 3C040002 */ lui $a0, 2 +/* CE70AC 802409AC 0083102A */ slt $v0, $a0, $v1 +/* CE70B0 802409B0 10400002 */ beqz $v0, .L802409BC +/* CE70B4 802409B4 00641023 */ subu $v0, $v1, $a0 +.L802409B8: +/* CE70B8 802409B8 AE0200AC */ sw $v0, 0xac($s0) +.L802409BC: +/* CE70BC 802409BC 8E020078 */ lw $v0, 0x78($s0) +/* CE70C0 802409C0 1440000E */ bnez $v0, .L802409FC +/* CE70C4 802409C4 00000000 */ nop +/* CE70C8 802409C8 8E0300B0 */ lw $v1, 0xb0($s0) +/* CE70CC 802409CC 8E020090 */ lw $v0, 0x90($s0) +/* CE70D0 802409D0 00621821 */ addu $v1, $v1, $v0 +/* CE70D4 802409D4 04610004 */ bgez $v1, .L802409E8 +/* CE70D8 802409D8 AE0300B0 */ sw $v1, 0xb0($s0) +/* CE70DC 802409DC 3C020002 */ lui $v0, 2 +/* CE70E0 802409E0 0809027E */ j .L802409F8 +/* CE70E4 802409E4 00621021 */ addu $v0, $v1, $v0 +.L802409E8: +/* CE70E8 802409E8 3C040002 */ lui $a0, 2 +/* CE70EC 802409EC 0083102A */ slt $v0, $a0, $v1 +/* CE70F0 802409F0 10400002 */ beqz $v0, .L802409FC +/* CE70F4 802409F4 00641023 */ subu $v0, $v1, $a0 +.L802409F8: +/* CE70F8 802409F8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802409FC: +/* CE70FC 802409FC 8E02007C */ lw $v0, 0x7c($s0) +/* CE7100 80240A00 1440000E */ bnez $v0, .L80240A3C +/* CE7104 80240A04 00000000 */ nop +/* CE7108 80240A08 8E0300B4 */ lw $v1, 0xb4($s0) +/* CE710C 80240A0C 8E020094 */ lw $v0, 0x94($s0) +/* CE7110 80240A10 00621821 */ addu $v1, $v1, $v0 +/* CE7114 80240A14 04610004 */ bgez $v1, .L80240A28 +/* CE7118 80240A18 AE0300B4 */ sw $v1, 0xb4($s0) +/* CE711C 80240A1C 3C020002 */ lui $v0, 2 +/* CE7120 80240A20 0809028E */ j .L80240A38 +/* CE7124 80240A24 00621021 */ addu $v0, $v1, $v0 +.L80240A28: +/* CE7128 80240A28 3C040002 */ lui $a0, 2 +/* CE712C 80240A2C 0083102A */ slt $v0, $a0, $v1 +/* CE7130 80240A30 10400002 */ beqz $v0, .L80240A3C +/* CE7134 80240A34 00641023 */ subu $v0, $v1, $a0 +.L80240A38: +/* CE7138 80240A38 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240A3C: +/* CE713C 80240A3C 8E040084 */ lw $a0, 0x84($s0) +/* CE7140 80240A40 0C046F07 */ jal set_main_pan_u +/* CE7144 80240A44 8E0500A8 */ lw $a1, 0xa8($s0) +/* CE7148 80240A48 8E040084 */ lw $a0, 0x84($s0) +/* CE714C 80240A4C 0C046F0D */ jal set_main_pan_v +/* CE7150 80240A50 8E0500AC */ lw $a1, 0xac($s0) +/* CE7154 80240A54 8E040084 */ lw $a0, 0x84($s0) +/* CE7158 80240A58 0C046F13 */ jal set_aux_pan_u +/* CE715C 80240A5C 8E0500B0 */ lw $a1, 0xb0($s0) +/* CE7160 80240A60 8E040084 */ lw $a0, 0x84($s0) +/* CE7164 80240A64 0C046F19 */ jal set_aux_pan_v +/* CE7168 80240A68 8E0500B4 */ lw $a1, 0xb4($s0) +/* CE716C 80240A6C 8E020070 */ lw $v0, 0x70($s0) +/* CE7170 80240A70 8E030078 */ lw $v1, 0x78($s0) +/* CE7174 80240A74 8E040098 */ lw $a0, 0x98($s0) +/* CE7178 80240A78 24420001 */ addiu $v0, $v0, 1 +/* CE717C 80240A7C AE020070 */ sw $v0, 0x70($s0) +/* CE7180 80240A80 8E020074 */ lw $v0, 0x74($s0) +/* CE7184 80240A84 24630001 */ addiu $v1, $v1, 1 +/* CE7188 80240A88 AE030078 */ sw $v1, 0x78($s0) +/* CE718C 80240A8C 8E030070 */ lw $v1, 0x70($s0) +/* CE7190 80240A90 24420001 */ addiu $v0, $v0, 1 +/* CE7194 80240A94 AE020074 */ sw $v0, 0x74($s0) +/* CE7198 80240A98 8E02007C */ lw $v0, 0x7c($s0) +/* CE719C 80240A9C 0064182A */ slt $v1, $v1, $a0 +/* CE71A0 80240AA0 24420001 */ addiu $v0, $v0, 1 +/* CE71A4 80240AA4 14600002 */ bnez $v1, .L80240AB0 +/* CE71A8 80240AA8 AE02007C */ sw $v0, 0x7c($s0) +/* CE71AC 80240AAC AE000070 */ sw $zero, 0x70($s0) +.L80240AB0: +/* CE71B0 80240AB0 8E020074 */ lw $v0, 0x74($s0) +/* CE71B4 80240AB4 8E03009C */ lw $v1, 0x9c($s0) +/* CE71B8 80240AB8 0043102A */ slt $v0, $v0, $v1 +/* CE71BC 80240ABC 50400001 */ beql $v0, $zero, .L80240AC4 +/* CE71C0 80240AC0 AE000074 */ sw $zero, 0x74($s0) +.L80240AC4: +/* CE71C4 80240AC4 8E020078 */ lw $v0, 0x78($s0) +/* CE71C8 80240AC8 8E0300A0 */ lw $v1, 0xa0($s0) +/* CE71CC 80240ACC 0043102A */ slt $v0, $v0, $v1 +/* CE71D0 80240AD0 50400001 */ beql $v0, $zero, .L80240AD8 +/* CE71D4 80240AD4 AE000078 */ sw $zero, 0x78($s0) +.L80240AD8: +/* CE71D8 80240AD8 8E02007C */ lw $v0, 0x7c($s0) +/* CE71DC 80240ADC 8E0300A4 */ lw $v1, 0xa4($s0) +/* CE71E0 80240AE0 0043102A */ slt $v0, $v0, $v1 +/* CE71E4 80240AE4 50400001 */ beql $v0, $zero, .L80240AEC +/* CE71E8 80240AE8 AE00007C */ sw $zero, 0x7c($s0) +.L80240AEC: +/* CE71EC 80240AEC 8FBF0014 */ lw $ra, 0x14($sp) +/* CE71F0 80240AF0 8FB00010 */ lw $s0, 0x10($sp) +/* CE71F4 80240AF4 0000102D */ daddu $v0, $zero, $zero +/* CE71F8 80240AF8 03E00008 */ jr $ra +/* CE71FC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40.s b/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40.s deleted file mode 100644 index a25a520aa4..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B40 -/* CE7240 80240B40 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CE7244 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* CE7248 80240B48 0080902D */ daddu $s2, $a0, $zero -/* CE724C 80240B4C AFBF0028 */ sw $ra, 0x28($sp) -/* CE7250 80240B50 AFB50024 */ sw $s5, 0x24($sp) -/* CE7254 80240B54 AFB40020 */ sw $s4, 0x20($sp) -/* CE7258 80240B58 AFB3001C */ sw $s3, 0x1c($sp) -/* CE725C 80240B5C AFB10014 */ sw $s1, 0x14($sp) -/* CE7260 80240B60 AFB00010 */ sw $s0, 0x10($sp) -/* CE7264 80240B64 F7B80040 */ sdc1 $f24, 0x40($sp) -/* CE7268 80240B68 F7B60038 */ sdc1 $f22, 0x38($sp) -/* CE726C 80240B6C F7B40030 */ sdc1 $f20, 0x30($sp) -/* CE7270 80240B70 8E50000C */ lw $s0, 0xc($s2) -/* CE7274 80240B74 8E140000 */ lw $s4, ($s0) -/* CE7278 80240B78 26100004 */ addiu $s0, $s0, 4 -/* CE727C 80240B7C 0C0B1EAF */ jal get_variable -/* CE7280 80240B80 0280282D */ daddu $a1, $s4, $zero -/* CE7284 80240B84 0040982D */ daddu $s3, $v0, $zero -/* CE7288 80240B88 8E150000 */ lw $s5, ($s0) -/* CE728C 80240B8C 26100004 */ addiu $s0, $s0, 4 -/* CE7290 80240B90 8E050000 */ lw $a1, ($s0) -/* CE7294 80240B94 26100004 */ addiu $s0, $s0, 4 -/* CE7298 80240B98 0C0B210B */ jal get_float_variable -/* CE729C 80240B9C 0240202D */ daddu $a0, $s2, $zero -/* CE72A0 80240BA0 8E050000 */ lw $a1, ($s0) -/* CE72A4 80240BA4 26100004 */ addiu $s0, $s0, 4 -/* CE72A8 80240BA8 0240202D */ daddu $a0, $s2, $zero -/* CE72AC 80240BAC 0C0B210B */ jal get_float_variable -/* CE72B0 80240BB0 46000606 */ mov.s $f24, $f0 -/* CE72B4 80240BB4 8E050000 */ lw $a1, ($s0) -/* CE72B8 80240BB8 26100004 */ addiu $s0, $s0, 4 -/* CE72BC 80240BBC 0240202D */ daddu $a0, $s2, $zero -/* CE72C0 80240BC0 0C0B1EAF */ jal get_variable -/* CE72C4 80240BC4 46000506 */ mov.s $f20, $f0 -/* CE72C8 80240BC8 8E050000 */ lw $a1, ($s0) -/* CE72CC 80240BCC 26100004 */ addiu $s0, $s0, 4 -/* CE72D0 80240BD0 0240202D */ daddu $a0, $s2, $zero -/* CE72D4 80240BD4 0C0B1EAF */ jal get_variable -/* CE72D8 80240BD8 0040882D */ daddu $s1, $v0, $zero -/* CE72DC 80240BDC 0240202D */ daddu $a0, $s2, $zero -/* CE72E0 80240BE0 8E050000 */ lw $a1, ($s0) -/* CE72E4 80240BE4 0C0B210B */ jal get_float_variable -/* CE72E8 80240BE8 0040802D */ daddu $s0, $v0, $zero -/* CE72EC 80240BEC 3C014334 */ lui $at, 0x4334 -/* CE72F0 80240BF0 44811000 */ mtc1 $at, $f2 -/* CE72F4 80240BF4 3C014049 */ lui $at, 0x4049 -/* CE72F8 80240BF8 34210FD8 */ ori $at, $at, 0xfd8 -/* CE72FC 80240BFC 44812000 */ mtc1 $at, $f4 -/* CE7300 80240C00 46020003 */ div.s $f0, $f0, $f2 -/* CE7304 80240C04 46040582 */ mul.s $f22, $f0, $f4 -/* CE7308 80240C08 00000000 */ nop -/* CE730C 80240C0C 4618A501 */ sub.s $f20, $f20, $f24 -/* CE7310 80240C10 3C013F00 */ lui $at, 0x3f00 -/* CE7314 80240C14 44810000 */ mtc1 $at, $f0 -/* CE7318 80240C18 00000000 */ nop -/* CE731C 80240C1C 4600A502 */ mul.s $f20, $f20, $f0 -/* CE7320 80240C20 00000000 */ nop -/* CE7324 80240C24 12000007 */ beqz $s0, .L80240C44 -/* CE7328 80240C28 0233102A */ slt $v0, $s1, $s3 -/* CE732C 80240C2C 10400005 */ beqz $v0, .L80240C44 -/* CE7330 80240C30 0240202D */ daddu $a0, $s2, $zero -/* CE7334 80240C34 0220982D */ daddu $s3, $s1, $zero -/* CE7338 80240C38 0280282D */ daddu $a1, $s4, $zero -/* CE733C 80240C3C 0C0B2026 */ jal set_variable -/* CE7340 80240C40 0220302D */ daddu $a2, $s1, $zero -.L80240C44: -/* CE7344 80240C44 3C014049 */ lui $at, 0x4049 -/* CE7348 80240C48 34210FD8 */ ori $at, $at, 0xfd8 -/* CE734C 80240C4C 44810000 */ mtc1 $at, $f0 -/* CE7350 80240C50 44936000 */ mtc1 $s3, $f12 -/* CE7354 80240C54 00000000 */ nop -/* CE7358 80240C58 46806320 */ cvt.s.w $f12, $f12 -/* CE735C 80240C5C 46006302 */ mul.s $f12, $f12, $f0 -/* CE7360 80240C60 00000000 */ nop -/* CE7364 80240C64 44910000 */ mtc1 $s1, $f0 -/* CE7368 80240C68 00000000 */ nop -/* CE736C 80240C6C 46800020 */ cvt.s.w $f0, $f0 -/* CE7370 80240C70 46006303 */ div.s $f12, $f12, $f0 -/* CE7374 80240C74 0C00A874 */ jal cos_rad -/* CE7378 80240C78 46166300 */ add.s $f12, $f12, $f22 -/* CE737C 80240C7C 4600A002 */ mul.s $f0, $f20, $f0 -/* CE7380 80240C80 00000000 */ nop -/* CE7384 80240C84 4614C080 */ add.s $f2, $f24, $f20 -/* CE7388 80240C88 46001081 */ sub.s $f2, $f2, $f0 -/* CE738C 80240C8C 0240202D */ daddu $a0, $s2, $zero -/* CE7390 80240C90 44061000 */ mfc1 $a2, $f2 -/* CE7394 80240C94 0C0B2190 */ jal set_float_variable -/* CE7398 80240C98 02A0282D */ daddu $a1, $s5, $zero -/* CE739C 80240C9C 8FBF0028 */ lw $ra, 0x28($sp) -/* CE73A0 80240CA0 8FB50024 */ lw $s5, 0x24($sp) -/* CE73A4 80240CA4 8FB40020 */ lw $s4, 0x20($sp) -/* CE73A8 80240CA8 8FB3001C */ lw $s3, 0x1c($sp) -/* CE73AC 80240CAC 8FB20018 */ lw $s2, 0x18($sp) -/* CE73B0 80240CB0 8FB10014 */ lw $s1, 0x14($sp) -/* CE73B4 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* CE73B8 80240CB8 D7B80040 */ ldc1 $f24, 0x40($sp) -/* CE73BC 80240CBC D7B60038 */ ldc1 $f22, 0x38($sp) -/* CE73C0 80240CC0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* CE73C4 80240CC4 24020002 */ addiu $v0, $zero, 2 -/* CE73C8 80240CC8 03E00008 */ jr $ra -/* CE73CC 80240CCC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40_CE7240.s b/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40_CE7240.s new file mode 100644 index 0000000000..9619b06d10 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240B40_CE7240.s @@ -0,0 +1,105 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B40_CE7240 +/* CE7240 80240B40 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* CE7244 80240B44 AFB20018 */ sw $s2, 0x18($sp) +/* CE7248 80240B48 0080902D */ daddu $s2, $a0, $zero +/* CE724C 80240B4C AFBF0028 */ sw $ra, 0x28($sp) +/* CE7250 80240B50 AFB50024 */ sw $s5, 0x24($sp) +/* CE7254 80240B54 AFB40020 */ sw $s4, 0x20($sp) +/* CE7258 80240B58 AFB3001C */ sw $s3, 0x1c($sp) +/* CE725C 80240B5C AFB10014 */ sw $s1, 0x14($sp) +/* CE7260 80240B60 AFB00010 */ sw $s0, 0x10($sp) +/* CE7264 80240B64 F7B80040 */ sdc1 $f24, 0x40($sp) +/* CE7268 80240B68 F7B60038 */ sdc1 $f22, 0x38($sp) +/* CE726C 80240B6C F7B40030 */ sdc1 $f20, 0x30($sp) +/* CE7270 80240B70 8E50000C */ lw $s0, 0xc($s2) +/* CE7274 80240B74 8E140000 */ lw $s4, ($s0) +/* CE7278 80240B78 26100004 */ addiu $s0, $s0, 4 +/* CE727C 80240B7C 0C0B1EAF */ jal get_variable +/* CE7280 80240B80 0280282D */ daddu $a1, $s4, $zero +/* CE7284 80240B84 0040982D */ daddu $s3, $v0, $zero +/* CE7288 80240B88 8E150000 */ lw $s5, ($s0) +/* CE728C 80240B8C 26100004 */ addiu $s0, $s0, 4 +/* CE7290 80240B90 8E050000 */ lw $a1, ($s0) +/* CE7294 80240B94 26100004 */ addiu $s0, $s0, 4 +/* CE7298 80240B98 0C0B210B */ jal get_float_variable +/* CE729C 80240B9C 0240202D */ daddu $a0, $s2, $zero +/* CE72A0 80240BA0 8E050000 */ lw $a1, ($s0) +/* CE72A4 80240BA4 26100004 */ addiu $s0, $s0, 4 +/* CE72A8 80240BA8 0240202D */ daddu $a0, $s2, $zero +/* CE72AC 80240BAC 0C0B210B */ jal get_float_variable +/* CE72B0 80240BB0 46000606 */ mov.s $f24, $f0 +/* CE72B4 80240BB4 8E050000 */ lw $a1, ($s0) +/* CE72B8 80240BB8 26100004 */ addiu $s0, $s0, 4 +/* CE72BC 80240BBC 0240202D */ daddu $a0, $s2, $zero +/* CE72C0 80240BC0 0C0B1EAF */ jal get_variable +/* CE72C4 80240BC4 46000506 */ mov.s $f20, $f0 +/* CE72C8 80240BC8 8E050000 */ lw $a1, ($s0) +/* CE72CC 80240BCC 26100004 */ addiu $s0, $s0, 4 +/* CE72D0 80240BD0 0240202D */ daddu $a0, $s2, $zero +/* CE72D4 80240BD4 0C0B1EAF */ jal get_variable +/* CE72D8 80240BD8 0040882D */ daddu $s1, $v0, $zero +/* CE72DC 80240BDC 0240202D */ daddu $a0, $s2, $zero +/* CE72E0 80240BE0 8E050000 */ lw $a1, ($s0) +/* CE72E4 80240BE4 0C0B210B */ jal get_float_variable +/* CE72E8 80240BE8 0040802D */ daddu $s0, $v0, $zero +/* CE72EC 80240BEC 3C014334 */ lui $at, 0x4334 +/* CE72F0 80240BF0 44811000 */ mtc1 $at, $f2 +/* CE72F4 80240BF4 3C014049 */ lui $at, 0x4049 +/* CE72F8 80240BF8 34210FD8 */ ori $at, $at, 0xfd8 +/* CE72FC 80240BFC 44812000 */ mtc1 $at, $f4 +/* CE7300 80240C00 46020003 */ div.s $f0, $f0, $f2 +/* CE7304 80240C04 46040582 */ mul.s $f22, $f0, $f4 +/* CE7308 80240C08 00000000 */ nop +/* CE730C 80240C0C 4618A501 */ sub.s $f20, $f20, $f24 +/* CE7310 80240C10 3C013F00 */ lui $at, 0x3f00 +/* CE7314 80240C14 44810000 */ mtc1 $at, $f0 +/* CE7318 80240C18 00000000 */ nop +/* CE731C 80240C1C 4600A502 */ mul.s $f20, $f20, $f0 +/* CE7320 80240C20 00000000 */ nop +/* CE7324 80240C24 12000007 */ beqz $s0, .L80240C44 +/* CE7328 80240C28 0233102A */ slt $v0, $s1, $s3 +/* CE732C 80240C2C 10400005 */ beqz $v0, .L80240C44 +/* CE7330 80240C30 0240202D */ daddu $a0, $s2, $zero +/* CE7334 80240C34 0220982D */ daddu $s3, $s1, $zero +/* CE7338 80240C38 0280282D */ daddu $a1, $s4, $zero +/* CE733C 80240C3C 0C0B2026 */ jal set_variable +/* CE7340 80240C40 0220302D */ daddu $a2, $s1, $zero +.L80240C44: +/* CE7344 80240C44 3C014049 */ lui $at, 0x4049 +/* CE7348 80240C48 34210FD8 */ ori $at, $at, 0xfd8 +/* CE734C 80240C4C 44810000 */ mtc1 $at, $f0 +/* CE7350 80240C50 44936000 */ mtc1 $s3, $f12 +/* CE7354 80240C54 00000000 */ nop +/* CE7358 80240C58 46806320 */ cvt.s.w $f12, $f12 +/* CE735C 80240C5C 46006302 */ mul.s $f12, $f12, $f0 +/* CE7360 80240C60 00000000 */ nop +/* CE7364 80240C64 44910000 */ mtc1 $s1, $f0 +/* CE7368 80240C68 00000000 */ nop +/* CE736C 80240C6C 46800020 */ cvt.s.w $f0, $f0 +/* CE7370 80240C70 46006303 */ div.s $f12, $f12, $f0 +/* CE7374 80240C74 0C00A874 */ jal cos_rad +/* CE7378 80240C78 46166300 */ add.s $f12, $f12, $f22 +/* CE737C 80240C7C 4600A002 */ mul.s $f0, $f20, $f0 +/* CE7380 80240C80 00000000 */ nop +/* CE7384 80240C84 4614C080 */ add.s $f2, $f24, $f20 +/* CE7388 80240C88 46001081 */ sub.s $f2, $f2, $f0 +/* CE738C 80240C8C 0240202D */ daddu $a0, $s2, $zero +/* CE7390 80240C90 44061000 */ mfc1 $a2, $f2 +/* CE7394 80240C94 0C0B2190 */ jal set_float_variable +/* CE7398 80240C98 02A0282D */ daddu $a1, $s5, $zero +/* CE739C 80240C9C 8FBF0028 */ lw $ra, 0x28($sp) +/* CE73A0 80240CA0 8FB50024 */ lw $s5, 0x24($sp) +/* CE73A4 80240CA4 8FB40020 */ lw $s4, 0x20($sp) +/* CE73A8 80240CA8 8FB3001C */ lw $s3, 0x1c($sp) +/* CE73AC 80240CAC 8FB20018 */ lw $s2, 0x18($sp) +/* CE73B0 80240CB0 8FB10014 */ lw $s1, 0x14($sp) +/* CE73B4 80240CB4 8FB00010 */ lw $s0, 0x10($sp) +/* CE73B8 80240CB8 D7B80040 */ ldc1 $f24, 0x40($sp) +/* CE73BC 80240CBC D7B60038 */ ldc1 $f22, 0x38($sp) +/* CE73C0 80240CC0 D7B40030 */ ldc1 $f20, 0x30($sp) +/* CE73C4 80240CC4 24020002 */ addiu $v0, $zero, 2 +/* CE73C8 80240CC8 03E00008 */ jr $ra +/* CE73CC 80240CCC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_flo/flo_22/CEC290/func_802400C0_CEC300.s b/asm/nonmatchings/world/area_flo/flo_22/CEC290/func_802400C0_CEC300.s index 250dd9fbed..343f1a4963 100644 --- a/asm/nonmatchings/world/area_flo/flo_22/CEC290/func_802400C0_CEC300.s +++ b/asm/nonmatchings/world/area_flo/flo_22/CEC290/func_802400C0_CEC300.s @@ -55,7 +55,7 @@ glabel func_802400C0_CEC300 /* CEC3C8 80240188 4405E000 */ mfc1 $a1, $f28 /* CEC3CC 8024018C 4406D000 */ mfc1 $a2, $f26 /* CEC3D0 80240190 4407C000 */ mfc1 $a3, $f24 -/* CEC3D4 80240194 0C090014 */ jal func_80240050 +/* CEC3D4 80240194 0C090014 */ jal func_80240050_CEC290 /* CEC3D8 80240198 27A40010 */ addiu $a0, $sp, 0x10 /* CEC3DC 8024019C 27A40010 */ addiu $a0, $sp, 0x10 /* CEC3E0 802401A0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802400C0_CEC300 /* CEC450 80240210 4405E000 */ mfc1 $a1, $f28 /* CEC454 80240214 4406D000 */ mfc1 $a2, $f26 /* CEC458 80240218 4407C000 */ mfc1 $a3, $f24 -/* CEC45C 8024021C 0C090014 */ jal func_80240050 +/* CEC45C 8024021C 0C090014 */ jal func_80240050_CEC290 /* CEC460 80240220 27A40010 */ addiu $a0, $sp, 0x10 /* CEC464 80240224 27A40010 */ addiu $a0, $sp, 0x10 /* CEC468 80240228 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s index 5b73bb1115..a32a87e55b 100644 --- a/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s +++ b/asm/nonmatchings/world/area_flo/flo_23/CEE2A0/func_80240728_CEE988.s @@ -232,25 +232,25 @@ glabel func_80240728_CEE988 .L80240A78: /* CEECD8 80240A78 0260202D */ daddu $a0, $s3, $zero /* CEECDC 80240A7C 0280282D */ daddu $a1, $s4, $zero -/* CEECE0 80240A80 0C0900E5 */ jal func_80240394 +/* CEECE0 80240A80 0C0900E5 */ jal func_80240394_CEE5F4 /* CEECE4 80240A84 02A0302D */ daddu $a2, $s5, $zero /* CEECE8 80240A88 0260202D */ daddu $a0, $s3, $zero .L80240A8C: /* CEECEC 80240A8C 0280282D */ daddu $a1, $s4, $zero -/* CEECF0 80240A90 0C090104 */ jal func_80240410 +/* CEECF0 80240A90 0C090104 */ jal func_80240410_CEE670 /* CEECF4 80240A94 02A0302D */ daddu $a2, $s5, $zero /* CEECF8 80240A98 080902B5 */ j .L80240AD4 /* CEECFC 80240A9C 00000000 */ nop .L80240AA0: /* CEED00 80240AA0 0260202D */ daddu $a0, $s3, $zero /* CEED04 80240AA4 0280282D */ daddu $a1, $s4, $zero -/* CEED08 80240AA8 0C090151 */ jal func_80240544 +/* CEED08 80240AA8 0C090151 */ jal func_80240544_CEE7A4 /* CEED0C 80240AAC 02A0302D */ daddu $a2, $s5, $zero /* CEED10 80240AB0 080902B5 */ j .L80240AD4 /* CEED14 80240AB4 00000000 */ nop .L80240AB8: /* CEED18 80240AB8 0280282D */ daddu $a1, $s4, $zero -/* CEED1C 80240ABC 0C0901AA */ jal func_802406A8 +/* CEED1C 80240ABC 0C0901AA */ jal func_802406A8_CEE908 /* CEED20 80240AC0 02A0302D */ daddu $a2, $s5, $zero /* CEED24 80240AC4 080902B5 */ j .L80240AD4 /* CEED28 80240AC8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_24/CF0980/func_802400B0_CF09F0.s b/asm/nonmatchings/world/area_flo/flo_24/CF0980/func_802400B0_CF09F0.s index e39a5ff3c2..d0ddc947cb 100644 --- a/asm/nonmatchings/world/area_flo/flo_24/CF0980/func_802400B0_CF09F0.s +++ b/asm/nonmatchings/world/area_flo/flo_24/CF0980/func_802400B0_CF09F0.s @@ -55,7 +55,7 @@ glabel func_802400B0_CF09F0 /* CF0AB8 80240178 4405E000 */ mfc1 $a1, $f28 /* CF0ABC 8024017C 4406D000 */ mfc1 $a2, $f26 /* CF0AC0 80240180 4407C000 */ mfc1 $a3, $f24 -/* CF0AC4 80240184 0C090010 */ jal func_80240040 +/* CF0AC4 80240184 0C090010 */ jal func_80240040_CF0980 /* CF0AC8 80240188 27A40010 */ addiu $a0, $sp, 0x10 /* CF0ACC 8024018C 27A40010 */ addiu $a0, $sp, 0x10 /* CF0AD0 80240190 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802400B0_CF09F0 /* CF0B40 80240200 4405E000 */ mfc1 $a1, $f28 /* CF0B44 80240204 4406D000 */ mfc1 $a2, $f26 /* CF0B48 80240208 4407C000 */ mfc1 $a3, $f24 -/* CF0B4C 8024020C 0C090010 */ jal func_80240040 +/* CF0B4C 8024020C 0C090010 */ jal func_80240040_CF0980 /* CF0B50 80240210 27A40010 */ addiu $a0, $sp, 0x10 /* CF0B54 80240214 27A40010 */ addiu $a0, $sp, 0x10 /* CF0B58 80240218 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818.s deleted file mode 100644 index dbd2db8445..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240818 -/* CF33E8 80240818 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF33EC 8024081C AFB3001C */ sw $s3, 0x1c($sp) -/* CF33F0 80240820 0080982D */ daddu $s3, $a0, $zero -/* CF33F4 80240824 AFBF0020 */ sw $ra, 0x20($sp) -/* CF33F8 80240828 AFB20018 */ sw $s2, 0x18($sp) -/* CF33FC 8024082C AFB10014 */ sw $s1, 0x14($sp) -/* CF3400 80240830 AFB00010 */ sw $s0, 0x10($sp) -/* CF3404 80240834 8E720148 */ lw $s2, 0x148($s3) -/* CF3408 80240838 86440008 */ lh $a0, 8($s2) -/* CF340C 8024083C 0C00EABB */ jal get_npc_unsafe -/* CF3410 80240840 00A0882D */ daddu $s1, $a1, $zero -/* CF3414 80240844 8E240008 */ lw $a0, 8($s1) -/* CF3418 80240848 0040802D */ daddu $s0, $v0, $zero -/* CF341C 8024084C 00041FC2 */ srl $v1, $a0, 0x1f -/* CF3420 80240850 00832021 */ addu $a0, $a0, $v1 -/* CF3424 80240854 00042043 */ sra $a0, $a0, 1 -/* CF3428 80240858 0C00A67F */ jal rand_int -/* CF342C 8024085C 24840001 */ addiu $a0, $a0, 1 -/* CF3430 80240860 8E230008 */ lw $v1, 8($s1) -/* CF3434 80240864 240400B4 */ addiu $a0, $zero, 0xb4 -/* CF3438 80240868 00032FC2 */ srl $a1, $v1, 0x1f -/* CF343C 8024086C 00651821 */ addu $v1, $v1, $a1 -/* CF3440 80240870 00031843 */ sra $v1, $v1, 1 -/* CF3444 80240874 00621821 */ addu $v1, $v1, $v0 -/* CF3448 80240878 0C00A67F */ jal rand_int -/* CF344C 8024087C A603008E */ sh $v1, 0x8e($s0) -/* CF3450 80240880 C60C000C */ lwc1 $f12, 0xc($s0) -/* CF3454 80240884 44820000 */ mtc1 $v0, $f0 -/* CF3458 80240888 00000000 */ nop -/* CF345C 8024088C 46800020 */ cvt.s.w $f0, $f0 -/* CF3460 80240890 46006300 */ add.s $f12, $f12, $f0 -/* CF3464 80240894 3C0142B4 */ lui $at, 0x42b4 -/* CF3468 80240898 44810000 */ mtc1 $at, $f0 -/* CF346C 8024089C 0C00A6C9 */ jal clamp_angle -/* CF3470 802408A0 46006301 */ sub.s $f12, $f12, $f0 -/* CF3474 802408A4 E600000C */ swc1 $f0, 0xc($s0) -/* CF3478 802408A8 8E4200CC */ lw $v0, 0xcc($s2) -/* CF347C 802408AC 8C420000 */ lw $v0, ($v0) -/* CF3480 802408B0 AE020028 */ sw $v0, 0x28($s0) -/* CF3484 802408B4 24020003 */ addiu $v0, $zero, 3 -/* CF3488 802408B8 AE620070 */ sw $v0, 0x70($s3) -/* CF348C 802408BC 8FBF0020 */ lw $ra, 0x20($sp) -/* CF3490 802408C0 8FB3001C */ lw $s3, 0x1c($sp) -/* CF3494 802408C4 8FB20018 */ lw $s2, 0x18($sp) -/* CF3498 802408C8 8FB10014 */ lw $s1, 0x14($sp) -/* CF349C 802408CC 8FB00010 */ lw $s0, 0x10($sp) -/* CF34A0 802408D0 03E00008 */ jr $ra -/* CF34A4 802408D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s new file mode 100644 index 0000000000..9453cb25bb --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80240818_CF33E8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240818_CF33E8 +/* CF33E8 80240818 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* CF33EC 8024081C AFB3001C */ sw $s3, 0x1c($sp) +/* CF33F0 80240820 0080982D */ daddu $s3, $a0, $zero +/* CF33F4 80240824 AFBF0020 */ sw $ra, 0x20($sp) +/* CF33F8 80240828 AFB20018 */ sw $s2, 0x18($sp) +/* CF33FC 8024082C AFB10014 */ sw $s1, 0x14($sp) +/* CF3400 80240830 AFB00010 */ sw $s0, 0x10($sp) +/* CF3404 80240834 8E720148 */ lw $s2, 0x148($s3) +/* CF3408 80240838 86440008 */ lh $a0, 8($s2) +/* CF340C 8024083C 0C00EABB */ jal get_npc_unsafe +/* CF3410 80240840 00A0882D */ daddu $s1, $a1, $zero +/* CF3414 80240844 8E240008 */ lw $a0, 8($s1) +/* CF3418 80240848 0040802D */ daddu $s0, $v0, $zero +/* CF341C 8024084C 00041FC2 */ srl $v1, $a0, 0x1f +/* CF3420 80240850 00832021 */ addu $a0, $a0, $v1 +/* CF3424 80240854 00042043 */ sra $a0, $a0, 1 +/* CF3428 80240858 0C00A67F */ jal rand_int +/* CF342C 8024085C 24840001 */ addiu $a0, $a0, 1 +/* CF3430 80240860 8E230008 */ lw $v1, 8($s1) +/* CF3434 80240864 240400B4 */ addiu $a0, $zero, 0xb4 +/* CF3438 80240868 00032FC2 */ srl $a1, $v1, 0x1f +/* CF343C 8024086C 00651821 */ addu $v1, $v1, $a1 +/* CF3440 80240870 00031843 */ sra $v1, $v1, 1 +/* CF3444 80240874 00621821 */ addu $v1, $v1, $v0 +/* CF3448 80240878 0C00A67F */ jal rand_int +/* CF344C 8024087C A603008E */ sh $v1, 0x8e($s0) +/* CF3450 80240880 C60C000C */ lwc1 $f12, 0xc($s0) +/* CF3454 80240884 44820000 */ mtc1 $v0, $f0 +/* CF3458 80240888 00000000 */ nop +/* CF345C 8024088C 46800020 */ cvt.s.w $f0, $f0 +/* CF3460 80240890 46006300 */ add.s $f12, $f12, $f0 +/* CF3464 80240894 3C0142B4 */ lui $at, 0x42b4 +/* CF3468 80240898 44810000 */ mtc1 $at, $f0 +/* CF346C 8024089C 0C00A6C9 */ jal clamp_angle +/* CF3470 802408A0 46006301 */ sub.s $f12, $f12, $f0 +/* CF3474 802408A4 E600000C */ swc1 $f0, 0xc($s0) +/* CF3478 802408A8 8E4200CC */ lw $v0, 0xcc($s2) +/* CF347C 802408AC 8C420000 */ lw $v0, ($v0) +/* CF3480 802408B0 AE020028 */ sw $v0, 0x28($s0) +/* CF3484 802408B4 24020003 */ addiu $v0, $zero, 3 +/* CF3488 802408B8 AE620070 */ sw $v0, 0x70($s3) +/* CF348C 802408BC 8FBF0020 */ lw $ra, 0x20($sp) +/* CF3490 802408C0 8FB3001C */ lw $s3, 0x1c($sp) +/* CF3494 802408C4 8FB20018 */ lw $s2, 0x18($sp) +/* CF3498 802408C8 8FB10014 */ lw $s1, 0x14($sp) +/* CF349C 802408CC 8FB00010 */ lw $s0, 0x10($sp) +/* CF34A0 802408D0 03E00008 */ jr $ra +/* CF34A4 802408D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8.s deleted file mode 100644 index a55f8f2870..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D8 -/* CF34A8 802408D8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* CF34AC 802408DC AFB3004C */ sw $s3, 0x4c($sp) -/* CF34B0 802408E0 0080982D */ daddu $s3, $a0, $zero -/* CF34B4 802408E4 AFBF0054 */ sw $ra, 0x54($sp) -/* CF34B8 802408E8 AFB40050 */ sw $s4, 0x50($sp) -/* CF34BC 802408EC AFB20048 */ sw $s2, 0x48($sp) -/* CF34C0 802408F0 AFB10044 */ sw $s1, 0x44($sp) -/* CF34C4 802408F4 AFB00040 */ sw $s0, 0x40($sp) -/* CF34C8 802408F8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* CF34CC 802408FC F7B80068 */ sdc1 $f24, 0x68($sp) -/* CF34D0 80240900 F7B60060 */ sdc1 $f22, 0x60($sp) -/* CF34D4 80240904 F7B40058 */ sdc1 $f20, 0x58($sp) -/* CF34D8 80240908 8E710148 */ lw $s1, 0x148($s3) -/* CF34DC 8024090C 00A0902D */ daddu $s2, $a1, $zero -/* CF34E0 80240910 86240008 */ lh $a0, 8($s1) -/* CF34E4 80240914 0C00EABB */ jal get_npc_unsafe -/* CF34E8 80240918 00C0A02D */ daddu $s4, $a2, $zero -/* CF34EC 8024091C 0040802D */ daddu $s0, $v0, $zero -/* CF34F0 80240920 C6200078 */ lwc1 $f0, 0x78($s1) -/* CF34F4 80240924 46800020 */ cvt.s.w $f0, $f0 -/* CF34F8 80240928 46000021 */ cvt.d.s $f0, $f0 -/* CF34FC 8024092C 3C014059 */ lui $at, 0x4059 -/* CF3500 80240930 44811800 */ mtc1 $at, $f3 -/* CF3504 80240934 44801000 */ mtc1 $zero, $f2 -/* CF3508 80240938 8602008E */ lh $v0, 0x8e($s0) -/* CF350C 8024093C 9603008E */ lhu $v1, 0x8e($s0) -/* CF3510 80240940 46220003 */ div.d $f0, $f0, $f2 -/* CF3514 80240944 46200620 */ cvt.s.d $f24, $f0 -/* CF3518 80240948 C6200088 */ lwc1 $f0, 0x88($s1) -/* CF351C 8024094C 46800020 */ cvt.s.w $f0, $f0 -/* CF3520 80240950 46000021 */ cvt.d.s $f0, $f0 -/* CF3524 80240954 46220003 */ div.d $f0, $f0, $f2 -/* CF3528 80240958 46200020 */ cvt.s.d $f0, $f0 -/* CF352C 8024095C 18400003 */ blez $v0, .L8024096C -/* CF3530 80240960 4600C680 */ add.s $f26, $f24, $f0 -/* CF3534 80240964 2462FFFF */ addiu $v0, $v1, -1 -/* CF3538 80240968 A602008E */ sh $v0, 0x8e($s0) -.L8024096C: -/* CF353C 8024096C 8E220070 */ lw $v0, 0x70($s1) -/* CF3540 80240970 18400034 */ blez $v0, .L80240A44 -/* CF3544 80240974 00000000 */ nop -/* CF3548 80240978 C62C0074 */ lwc1 $f12, 0x74($s1) -/* CF354C 8024097C 46806320 */ cvt.s.w $f12, $f12 -/* CF3550 80240980 44820000 */ mtc1 $v0, $f0 -/* CF3554 80240984 00000000 */ nop -/* CF3558 80240988 46800020 */ cvt.s.w $f0, $f0 -/* CF355C 8024098C 46000021 */ cvt.d.s $f0, $f0 -/* CF3560 80240990 46220003 */ div.d $f0, $f0, $f2 -/* CF3564 80240994 0C00A8BB */ jal sin_deg -/* CF3568 80240998 462005A0 */ cvt.s.d $f22, $f0 -/* CF356C 8024099C 8E020000 */ lw $v0, ($s0) -/* CF3570 802409A0 30420008 */ andi $v0, $v0, 8 -/* CF3574 802409A4 10400003 */ beqz $v0, .L802409B4 -/* CF3578 802409A8 46000506 */ mov.s $f20, $f0 -/* CF357C 802409AC 0809027D */ j .L802409F4 -/* CF3580 802409B0 0000102D */ daddu $v0, $zero, $zero -.L802409B4: -/* CF3584 802409B4 27A50028 */ addiu $a1, $sp, 0x28 -/* CF3588 802409B8 27A6002C */ addiu $a2, $sp, 0x2c -/* CF358C 802409BC C6000038 */ lwc1 $f0, 0x38($s0) -/* CF3590 802409C0 C602003C */ lwc1 $f2, 0x3c($s0) -/* CF3594 802409C4 C6040040 */ lwc1 $f4, 0x40($s0) -/* CF3598 802409C8 3C01447A */ lui $at, 0x447a -/* CF359C 802409CC 44813000 */ mtc1 $at, $f6 -/* CF35A0 802409D0 27A20034 */ addiu $v0, $sp, 0x34 -/* CF35A4 802409D4 E7A00028 */ swc1 $f0, 0x28($sp) -/* CF35A8 802409D8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* CF35AC 802409DC E7A40030 */ swc1 $f4, 0x30($sp) -/* CF35B0 802409E0 E7A60034 */ swc1 $f6, 0x34($sp) -/* CF35B4 802409E4 AFA20010 */ sw $v0, 0x10($sp) -/* CF35B8 802409E8 8E040080 */ lw $a0, 0x80($s0) -/* CF35BC 802409EC 0C0372DF */ jal func_800DCB7C -/* CF35C0 802409F0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409F4: -/* CF35C4 802409F4 10400007 */ beqz $v0, .L80240A14 -/* CF35C8 802409F8 00000000 */ nop -/* CF35CC 802409FC 4616A082 */ mul.s $f2, $f20, $f22 -/* CF35D0 80240A00 00000000 */ nop -/* CF35D4 80240A04 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* CF35D8 80240A08 46180000 */ add.s $f0, $f0, $f24 -/* CF35DC 80240A0C 08090288 */ j .L80240A20 -/* CF35E0 80240A10 46020000 */ add.s $f0, $f0, $f2 -.L80240A14: -/* CF35E4 80240A14 4616A002 */ mul.s $f0, $f20, $f22 -/* CF35E8 80240A18 00000000 */ nop -/* CF35EC 80240A1C 4600D000 */ add.s $f0, $f26, $f0 -.L80240A20: -/* CF35F0 80240A20 E600003C */ swc1 $f0, 0x3c($s0) -/* CF35F4 80240A24 8E220074 */ lw $v0, 0x74($s1) -/* CF35F8 80240A28 2442000A */ addiu $v0, $v0, 0xa -/* CF35FC 80240A2C 44826000 */ mtc1 $v0, $f12 -/* CF3600 80240A30 00000000 */ nop -/* CF3604 80240A34 0C00A6C9 */ jal clamp_angle -/* CF3608 80240A38 46806320 */ cvt.s.w $f12, $f12 -/* CF360C 80240A3C 4600020D */ trunc.w.s $f8, $f0 -/* CF3610 80240A40 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A44: -/* CF3614 80240A44 8E220090 */ lw $v0, 0x90($s1) -/* CF3618 80240A48 1C400040 */ bgtz $v0, .L80240B4C -/* CF361C 80240A4C 2442FFFF */ addiu $v0, $v0, -1 -/* CF3620 80240A50 860200A8 */ lh $v0, 0xa8($s0) -/* CF3624 80240A54 C600003C */ lwc1 $f0, 0x3c($s0) -/* CF3628 80240A58 44821000 */ mtc1 $v0, $f2 -/* CF362C 80240A5C 00000000 */ nop -/* CF3630 80240A60 468010A0 */ cvt.s.w $f2, $f2 -/* CF3634 80240A64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF3638 80240A68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF363C 80240A6C 46020000 */ add.s $f0, $f0, $f2 -/* CF3640 80240A70 3C014024 */ lui $at, 0x4024 -/* CF3644 80240A74 44812800 */ mtc1 $at, $f5 -/* CF3648 80240A78 44802000 */ mtc1 $zero, $f4 -/* CF364C 80240A7C C442002C */ lwc1 $f2, 0x2c($v0) -/* CF3650 80240A80 46000021 */ cvt.d.s $f0, $f0 -/* CF3654 80240A84 46240000 */ add.d $f0, $f0, $f4 -/* CF3658 80240A88 460010A1 */ cvt.d.s $f2, $f2 -/* CF365C 80240A8C 4620103C */ c.lt.d $f2, $f0 -/* CF3660 80240A90 00000000 */ nop -/* CF3664 80240A94 4500002E */ bc1f .L80240B50 -/* CF3668 80240A98 0280202D */ daddu $a0, $s4, $zero -/* CF366C 80240A9C 24020001 */ addiu $v0, $zero, 1 -/* CF3670 80240AA0 AFA20010 */ sw $v0, 0x10($sp) -/* CF3674 80240AA4 8E460024 */ lw $a2, 0x24($s2) -/* CF3678 80240AA8 8E470028 */ lw $a3, 0x28($s2) -/* CF367C 80240AAC 0C01242D */ jal func_800490B4 -/* CF3680 80240AB0 0220282D */ daddu $a1, $s1, $zero -/* CF3684 80240AB4 10400026 */ beqz $v0, .L80240B50 -/* CF3688 80240AB8 0000202D */ daddu $a0, $zero, $zero -/* CF368C 80240ABC 0200282D */ daddu $a1, $s0, $zero -/* CF3690 80240AC0 0000302D */ daddu $a2, $zero, $zero -/* CF3694 80240AC4 2412000C */ addiu $s2, $zero, 0xc -/* CF3698 80240AC8 860300A8 */ lh $v1, 0xa8($s0) -/* CF369C 80240ACC 3C013F80 */ lui $at, 0x3f80 -/* CF36A0 80240AD0 44810000 */ mtc1 $at, $f0 -/* CF36A4 80240AD4 3C014000 */ lui $at, 0x4000 -/* CF36A8 80240AD8 44811000 */ mtc1 $at, $f2 -/* CF36AC 80240ADC 3C01C1A0 */ lui $at, 0xc1a0 -/* CF36B0 80240AE0 44812000 */ mtc1 $at, $f4 -/* CF36B4 80240AE4 44834000 */ mtc1 $v1, $f8 -/* CF36B8 80240AE8 00000000 */ nop -/* CF36BC 80240AEC 46804220 */ cvt.s.w $f8, $f8 -/* CF36C0 80240AF0 44074000 */ mfc1 $a3, $f8 -/* CF36C4 80240AF4 27A20038 */ addiu $v0, $sp, 0x38 -/* CF36C8 80240AF8 AFB2001C */ sw $s2, 0x1c($sp) -/* CF36CC 80240AFC AFA20020 */ sw $v0, 0x20($sp) -/* CF36D0 80240B00 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF36D4 80240B04 E7A20014 */ swc1 $f2, 0x14($sp) -/* CF36D8 80240B08 0C01BFA4 */ jal fx_emote -/* CF36DC 80240B0C E7A40018 */ swc1 $f4, 0x18($sp) -/* CF36E0 80240B10 0200202D */ daddu $a0, $s0, $zero -/* CF36E4 80240B14 240502F4 */ addiu $a1, $zero, 0x2f4 -/* CF36E8 80240B18 C480003C */ lwc1 $f0, 0x3c($a0) -/* CF36EC 80240B1C 3C060020 */ lui $a2, 0x20 -/* CF36F0 80240B20 0C012530 */ jal func_800494C0 -/* CF36F4 80240B24 E4800064 */ swc1 $f0, 0x64($a0) -/* CF36F8 80240B28 8E220018 */ lw $v0, 0x18($s1) -/* CF36FC 80240B2C 9442002A */ lhu $v0, 0x2a($v0) -/* CF3700 80240B30 30420001 */ andi $v0, $v0, 1 -/* CF3704 80240B34 10400003 */ beqz $v0, .L80240B44 -/* CF3708 80240B38 2402000A */ addiu $v0, $zero, 0xa -/* CF370C 80240B3C 080902FB */ j .L80240BEC -/* CF3710 80240B40 AE620070 */ sw $v0, 0x70($s3) -.L80240B44: -/* CF3714 80240B44 080902FB */ j .L80240BEC -/* CF3718 80240B48 AE720070 */ sw $s2, 0x70($s3) -.L80240B4C: -/* CF371C 80240B4C AE220090 */ sw $v0, 0x90($s1) -.L80240B50: -/* CF3720 80240B50 8602008C */ lh $v0, 0x8c($s0) -/* CF3724 80240B54 14400025 */ bnez $v0, .L80240BEC -/* CF3728 80240B58 00000000 */ nop -/* CF372C 80240B5C 8602008E */ lh $v0, 0x8e($s0) -/* CF3730 80240B60 1C400022 */ bgtz $v0, .L80240BEC -/* CF3734 80240B64 00000000 */ nop -/* CF3738 80240B68 8E620074 */ lw $v0, 0x74($s3) -/* CF373C 80240B6C 2442FFFF */ addiu $v0, $v0, -1 -/* CF3740 80240B70 1840001D */ blez $v0, .L80240BE8 -/* CF3744 80240B74 AE620074 */ sw $v0, 0x74($s3) -/* CF3748 80240B78 8E220018 */ lw $v0, 0x18($s1) -/* CF374C 80240B7C 9442002A */ lhu $v0, 0x2a($v0) -/* CF3750 80240B80 30420010 */ andi $v0, $v0, 0x10 -/* CF3754 80240B84 14400007 */ bnez $v0, .L80240BA4 -/* CF3758 80240B88 00000000 */ nop -/* CF375C 80240B8C C600000C */ lwc1 $f0, 0xc($s0) -/* CF3760 80240B90 3C014334 */ lui $at, 0x4334 -/* CF3764 80240B94 44816000 */ mtc1 $at, $f12 -/* CF3768 80240B98 0C00A6C9 */ jal clamp_angle -/* CF376C 80240B9C 460C0300 */ add.s $f12, $f0, $f12 -/* CF3770 80240BA0 E600000C */ swc1 $f0, 0xc($s0) -.L80240BA4: -/* CF3774 80240BA4 0C00A67F */ jal rand_int -/* CF3778 80240BA8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* CF377C 80240BAC 3C032E8B */ lui $v1, 0x2e8b -/* CF3780 80240BB0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* CF3784 80240BB4 00430018 */ mult $v0, $v1 -/* CF3788 80240BB8 00021FC3 */ sra $v1, $v0, 0x1f -/* CF378C 80240BBC 00004010 */ mfhi $t0 -/* CF3790 80240BC0 00082043 */ sra $a0, $t0, 1 -/* CF3794 80240BC4 00832023 */ subu $a0, $a0, $v1 -/* CF3798 80240BC8 00041840 */ sll $v1, $a0, 1 -/* CF379C 80240BCC 00641821 */ addu $v1, $v1, $a0 -/* CF37A0 80240BD0 00031880 */ sll $v1, $v1, 2 -/* CF37A4 80240BD4 00641823 */ subu $v1, $v1, $a0 -/* CF37A8 80240BD8 00431023 */ subu $v0, $v0, $v1 -/* CF37AC 80240BDC 24420005 */ addiu $v0, $v0, 5 -/* CF37B0 80240BE0 080902FB */ j .L80240BEC -/* CF37B4 80240BE4 A602008E */ sh $v0, 0x8e($s0) -.L80240BE8: -/* CF37B8 80240BE8 AE600070 */ sw $zero, 0x70($s3) -.L80240BEC: -/* CF37BC 80240BEC 8FBF0054 */ lw $ra, 0x54($sp) -/* CF37C0 80240BF0 8FB40050 */ lw $s4, 0x50($sp) -/* CF37C4 80240BF4 8FB3004C */ lw $s3, 0x4c($sp) -/* CF37C8 80240BF8 8FB20048 */ lw $s2, 0x48($sp) -/* CF37CC 80240BFC 8FB10044 */ lw $s1, 0x44($sp) -/* CF37D0 80240C00 8FB00040 */ lw $s0, 0x40($sp) -/* CF37D4 80240C04 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* CF37D8 80240C08 D7B80068 */ ldc1 $f24, 0x68($sp) -/* CF37DC 80240C0C D7B60060 */ ldc1 $f22, 0x60($sp) -/* CF37E0 80240C10 D7B40058 */ ldc1 $f20, 0x58($sp) -/* CF37E4 80240C14 03E00008 */ jr $ra -/* CF37E8 80240C18 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s new file mode 100644 index 0000000000..f641fb9e9e --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_802408D8_CF34A8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408D8_CF34A8 +/* CF34A8 802408D8 27BDFF88 */ addiu $sp, $sp, -0x78 +/* CF34AC 802408DC AFB3004C */ sw $s3, 0x4c($sp) +/* CF34B0 802408E0 0080982D */ daddu $s3, $a0, $zero +/* CF34B4 802408E4 AFBF0054 */ sw $ra, 0x54($sp) +/* CF34B8 802408E8 AFB40050 */ sw $s4, 0x50($sp) +/* CF34BC 802408EC AFB20048 */ sw $s2, 0x48($sp) +/* CF34C0 802408F0 AFB10044 */ sw $s1, 0x44($sp) +/* CF34C4 802408F4 AFB00040 */ sw $s0, 0x40($sp) +/* CF34C8 802408F8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* CF34CC 802408FC F7B80068 */ sdc1 $f24, 0x68($sp) +/* CF34D0 80240900 F7B60060 */ sdc1 $f22, 0x60($sp) +/* CF34D4 80240904 F7B40058 */ sdc1 $f20, 0x58($sp) +/* CF34D8 80240908 8E710148 */ lw $s1, 0x148($s3) +/* CF34DC 8024090C 00A0902D */ daddu $s2, $a1, $zero +/* CF34E0 80240910 86240008 */ lh $a0, 8($s1) +/* CF34E4 80240914 0C00EABB */ jal get_npc_unsafe +/* CF34E8 80240918 00C0A02D */ daddu $s4, $a2, $zero +/* CF34EC 8024091C 0040802D */ daddu $s0, $v0, $zero +/* CF34F0 80240920 C6200078 */ lwc1 $f0, 0x78($s1) +/* CF34F4 80240924 46800020 */ cvt.s.w $f0, $f0 +/* CF34F8 80240928 46000021 */ cvt.d.s $f0, $f0 +/* CF34FC 8024092C 3C014059 */ lui $at, 0x4059 +/* CF3500 80240930 44811800 */ mtc1 $at, $f3 +/* CF3504 80240934 44801000 */ mtc1 $zero, $f2 +/* CF3508 80240938 8602008E */ lh $v0, 0x8e($s0) +/* CF350C 8024093C 9603008E */ lhu $v1, 0x8e($s0) +/* CF3510 80240940 46220003 */ div.d $f0, $f0, $f2 +/* CF3514 80240944 46200620 */ cvt.s.d $f24, $f0 +/* CF3518 80240948 C6200088 */ lwc1 $f0, 0x88($s1) +/* CF351C 8024094C 46800020 */ cvt.s.w $f0, $f0 +/* CF3520 80240950 46000021 */ cvt.d.s $f0, $f0 +/* CF3524 80240954 46220003 */ div.d $f0, $f0, $f2 +/* CF3528 80240958 46200020 */ cvt.s.d $f0, $f0 +/* CF352C 8024095C 18400003 */ blez $v0, .L8024096C +/* CF3530 80240960 4600C680 */ add.s $f26, $f24, $f0 +/* CF3534 80240964 2462FFFF */ addiu $v0, $v1, -1 +/* CF3538 80240968 A602008E */ sh $v0, 0x8e($s0) +.L8024096C: +/* CF353C 8024096C 8E220070 */ lw $v0, 0x70($s1) +/* CF3540 80240970 18400034 */ blez $v0, .L80240A44 +/* CF3544 80240974 00000000 */ nop +/* CF3548 80240978 C62C0074 */ lwc1 $f12, 0x74($s1) +/* CF354C 8024097C 46806320 */ cvt.s.w $f12, $f12 +/* CF3550 80240980 44820000 */ mtc1 $v0, $f0 +/* CF3554 80240984 00000000 */ nop +/* CF3558 80240988 46800020 */ cvt.s.w $f0, $f0 +/* CF355C 8024098C 46000021 */ cvt.d.s $f0, $f0 +/* CF3560 80240990 46220003 */ div.d $f0, $f0, $f2 +/* CF3564 80240994 0C00A8BB */ jal sin_deg +/* CF3568 80240998 462005A0 */ cvt.s.d $f22, $f0 +/* CF356C 8024099C 8E020000 */ lw $v0, ($s0) +/* CF3570 802409A0 30420008 */ andi $v0, $v0, 8 +/* CF3574 802409A4 10400003 */ beqz $v0, .L802409B4 +/* CF3578 802409A8 46000506 */ mov.s $f20, $f0 +/* CF357C 802409AC 0809027D */ j .L802409F4 +/* CF3580 802409B0 0000102D */ daddu $v0, $zero, $zero +.L802409B4: +/* CF3584 802409B4 27A50028 */ addiu $a1, $sp, 0x28 +/* CF3588 802409B8 27A6002C */ addiu $a2, $sp, 0x2c +/* CF358C 802409BC C6000038 */ lwc1 $f0, 0x38($s0) +/* CF3590 802409C0 C602003C */ lwc1 $f2, 0x3c($s0) +/* CF3594 802409C4 C6040040 */ lwc1 $f4, 0x40($s0) +/* CF3598 802409C8 3C01447A */ lui $at, 0x447a +/* CF359C 802409CC 44813000 */ mtc1 $at, $f6 +/* CF35A0 802409D0 27A20034 */ addiu $v0, $sp, 0x34 +/* CF35A4 802409D4 E7A00028 */ swc1 $f0, 0x28($sp) +/* CF35A8 802409D8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* CF35AC 802409DC E7A40030 */ swc1 $f4, 0x30($sp) +/* CF35B0 802409E0 E7A60034 */ swc1 $f6, 0x34($sp) +/* CF35B4 802409E4 AFA20010 */ sw $v0, 0x10($sp) +/* CF35B8 802409E8 8E040080 */ lw $a0, 0x80($s0) +/* CF35BC 802409EC 0C0372DF */ jal func_800DCB7C +/* CF35C0 802409F0 27A70030 */ addiu $a3, $sp, 0x30 +.L802409F4: +/* CF35C4 802409F4 10400007 */ beqz $v0, .L80240A14 +/* CF35C8 802409F8 00000000 */ nop +/* CF35CC 802409FC 4616A082 */ mul.s $f2, $f20, $f22 +/* CF35D0 80240A00 00000000 */ nop +/* CF35D4 80240A04 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* CF35D8 80240A08 46180000 */ add.s $f0, $f0, $f24 +/* CF35DC 80240A0C 08090288 */ j .L80240A20 +/* CF35E0 80240A10 46020000 */ add.s $f0, $f0, $f2 +.L80240A14: +/* CF35E4 80240A14 4616A002 */ mul.s $f0, $f20, $f22 +/* CF35E8 80240A18 00000000 */ nop +/* CF35EC 80240A1C 4600D000 */ add.s $f0, $f26, $f0 +.L80240A20: +/* CF35F0 80240A20 E600003C */ swc1 $f0, 0x3c($s0) +/* CF35F4 80240A24 8E220074 */ lw $v0, 0x74($s1) +/* CF35F8 80240A28 2442000A */ addiu $v0, $v0, 0xa +/* CF35FC 80240A2C 44826000 */ mtc1 $v0, $f12 +/* CF3600 80240A30 00000000 */ nop +/* CF3604 80240A34 0C00A6C9 */ jal clamp_angle +/* CF3608 80240A38 46806320 */ cvt.s.w $f12, $f12 +/* CF360C 80240A3C 4600020D */ trunc.w.s $f8, $f0 +/* CF3610 80240A40 E6280074 */ swc1 $f8, 0x74($s1) +.L80240A44: +/* CF3614 80240A44 8E220090 */ lw $v0, 0x90($s1) +/* CF3618 80240A48 1C400040 */ bgtz $v0, .L80240B4C +/* CF361C 80240A4C 2442FFFF */ addiu $v0, $v0, -1 +/* CF3620 80240A50 860200A8 */ lh $v0, 0xa8($s0) +/* CF3624 80240A54 C600003C */ lwc1 $f0, 0x3c($s0) +/* CF3628 80240A58 44821000 */ mtc1 $v0, $f2 +/* CF362C 80240A5C 00000000 */ nop +/* CF3630 80240A60 468010A0 */ cvt.s.w $f2, $f2 +/* CF3634 80240A64 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CF3638 80240A68 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CF363C 80240A6C 46020000 */ add.s $f0, $f0, $f2 +/* CF3640 80240A70 3C014024 */ lui $at, 0x4024 +/* CF3644 80240A74 44812800 */ mtc1 $at, $f5 +/* CF3648 80240A78 44802000 */ mtc1 $zero, $f4 +/* CF364C 80240A7C C442002C */ lwc1 $f2, 0x2c($v0) +/* CF3650 80240A80 46000021 */ cvt.d.s $f0, $f0 +/* CF3654 80240A84 46240000 */ add.d $f0, $f0, $f4 +/* CF3658 80240A88 460010A1 */ cvt.d.s $f2, $f2 +/* CF365C 80240A8C 4620103C */ c.lt.d $f2, $f0 +/* CF3660 80240A90 00000000 */ nop +/* CF3664 80240A94 4500002E */ bc1f .L80240B50 +/* CF3668 80240A98 0280202D */ daddu $a0, $s4, $zero +/* CF366C 80240A9C 24020001 */ addiu $v0, $zero, 1 +/* CF3670 80240AA0 AFA20010 */ sw $v0, 0x10($sp) +/* CF3674 80240AA4 8E460024 */ lw $a2, 0x24($s2) +/* CF3678 80240AA8 8E470028 */ lw $a3, 0x28($s2) +/* CF367C 80240AAC 0C01242D */ jal func_800490B4 +/* CF3680 80240AB0 0220282D */ daddu $a1, $s1, $zero +/* CF3684 80240AB4 10400026 */ beqz $v0, .L80240B50 +/* CF3688 80240AB8 0000202D */ daddu $a0, $zero, $zero +/* CF368C 80240ABC 0200282D */ daddu $a1, $s0, $zero +/* CF3690 80240AC0 0000302D */ daddu $a2, $zero, $zero +/* CF3694 80240AC4 2412000C */ addiu $s2, $zero, 0xc +/* CF3698 80240AC8 860300A8 */ lh $v1, 0xa8($s0) +/* CF369C 80240ACC 3C013F80 */ lui $at, 0x3f80 +/* CF36A0 80240AD0 44810000 */ mtc1 $at, $f0 +/* CF36A4 80240AD4 3C014000 */ lui $at, 0x4000 +/* CF36A8 80240AD8 44811000 */ mtc1 $at, $f2 +/* CF36AC 80240ADC 3C01C1A0 */ lui $at, 0xc1a0 +/* CF36B0 80240AE0 44812000 */ mtc1 $at, $f4 +/* CF36B4 80240AE4 44834000 */ mtc1 $v1, $f8 +/* CF36B8 80240AE8 00000000 */ nop +/* CF36BC 80240AEC 46804220 */ cvt.s.w $f8, $f8 +/* CF36C0 80240AF0 44074000 */ mfc1 $a3, $f8 +/* CF36C4 80240AF4 27A20038 */ addiu $v0, $sp, 0x38 +/* CF36C8 80240AF8 AFB2001C */ sw $s2, 0x1c($sp) +/* CF36CC 80240AFC AFA20020 */ sw $v0, 0x20($sp) +/* CF36D0 80240B00 E7A00010 */ swc1 $f0, 0x10($sp) +/* CF36D4 80240B04 E7A20014 */ swc1 $f2, 0x14($sp) +/* CF36D8 80240B08 0C01BFA4 */ jal fx_emote +/* CF36DC 80240B0C E7A40018 */ swc1 $f4, 0x18($sp) +/* CF36E0 80240B10 0200202D */ daddu $a0, $s0, $zero +/* CF36E4 80240B14 240502F4 */ addiu $a1, $zero, 0x2f4 +/* CF36E8 80240B18 C480003C */ lwc1 $f0, 0x3c($a0) +/* CF36EC 80240B1C 3C060020 */ lui $a2, 0x20 +/* CF36F0 80240B20 0C012530 */ jal func_800494C0 +/* CF36F4 80240B24 E4800064 */ swc1 $f0, 0x64($a0) +/* CF36F8 80240B28 8E220018 */ lw $v0, 0x18($s1) +/* CF36FC 80240B2C 9442002A */ lhu $v0, 0x2a($v0) +/* CF3700 80240B30 30420001 */ andi $v0, $v0, 1 +/* CF3704 80240B34 10400003 */ beqz $v0, .L80240B44 +/* CF3708 80240B38 2402000A */ addiu $v0, $zero, 0xa +/* CF370C 80240B3C 080902FB */ j .L80240BEC +/* CF3710 80240B40 AE620070 */ sw $v0, 0x70($s3) +.L80240B44: +/* CF3714 80240B44 080902FB */ j .L80240BEC +/* CF3718 80240B48 AE720070 */ sw $s2, 0x70($s3) +.L80240B4C: +/* CF371C 80240B4C AE220090 */ sw $v0, 0x90($s1) +.L80240B50: +/* CF3720 80240B50 8602008C */ lh $v0, 0x8c($s0) +/* CF3724 80240B54 14400025 */ bnez $v0, .L80240BEC +/* CF3728 80240B58 00000000 */ nop +/* CF372C 80240B5C 8602008E */ lh $v0, 0x8e($s0) +/* CF3730 80240B60 1C400022 */ bgtz $v0, .L80240BEC +/* CF3734 80240B64 00000000 */ nop +/* CF3738 80240B68 8E620074 */ lw $v0, 0x74($s3) +/* CF373C 80240B6C 2442FFFF */ addiu $v0, $v0, -1 +/* CF3740 80240B70 1840001D */ blez $v0, .L80240BE8 +/* CF3744 80240B74 AE620074 */ sw $v0, 0x74($s3) +/* CF3748 80240B78 8E220018 */ lw $v0, 0x18($s1) +/* CF374C 80240B7C 9442002A */ lhu $v0, 0x2a($v0) +/* CF3750 80240B80 30420010 */ andi $v0, $v0, 0x10 +/* CF3754 80240B84 14400007 */ bnez $v0, .L80240BA4 +/* CF3758 80240B88 00000000 */ nop +/* CF375C 80240B8C C600000C */ lwc1 $f0, 0xc($s0) +/* CF3760 80240B90 3C014334 */ lui $at, 0x4334 +/* CF3764 80240B94 44816000 */ mtc1 $at, $f12 +/* CF3768 80240B98 0C00A6C9 */ jal clamp_angle +/* CF376C 80240B9C 460C0300 */ add.s $f12, $f0, $f12 +/* CF3770 80240BA0 E600000C */ swc1 $f0, 0xc($s0) +.L80240BA4: +/* CF3774 80240BA4 0C00A67F */ jal rand_int +/* CF3778 80240BA8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* CF377C 80240BAC 3C032E8B */ lui $v1, 0x2e8b +/* CF3780 80240BB0 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* CF3784 80240BB4 00430018 */ mult $v0, $v1 +/* CF3788 80240BB8 00021FC3 */ sra $v1, $v0, 0x1f +/* CF378C 80240BBC 00004010 */ mfhi $t0 +/* CF3790 80240BC0 00082043 */ sra $a0, $t0, 1 +/* CF3794 80240BC4 00832023 */ subu $a0, $a0, $v1 +/* CF3798 80240BC8 00041840 */ sll $v1, $a0, 1 +/* CF379C 80240BCC 00641821 */ addu $v1, $v1, $a0 +/* CF37A0 80240BD0 00031880 */ sll $v1, $v1, 2 +/* CF37A4 80240BD4 00641823 */ subu $v1, $v1, $a0 +/* CF37A8 80240BD8 00431023 */ subu $v0, $v0, $v1 +/* CF37AC 80240BDC 24420005 */ addiu $v0, $v0, 5 +/* CF37B0 80240BE0 080902FB */ j .L80240BEC +/* CF37B4 80240BE4 A602008E */ sh $v0, 0x8e($s0) +.L80240BE8: +/* CF37B8 80240BE8 AE600070 */ sw $zero, 0x70($s3) +.L80240BEC: +/* CF37BC 80240BEC 8FBF0054 */ lw $ra, 0x54($sp) +/* CF37C0 80240BF0 8FB40050 */ lw $s4, 0x50($sp) +/* CF37C4 80240BF4 8FB3004C */ lw $s3, 0x4c($sp) +/* CF37C8 80240BF8 8FB20048 */ lw $s2, 0x48($sp) +/* CF37CC 80240BFC 8FB10044 */ lw $s1, 0x44($sp) +/* CF37D0 80240C00 8FB00040 */ lw $s0, 0x40($sp) +/* CF37D4 80240C04 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* CF37D8 80240C08 D7B80068 */ ldc1 $f24, 0x68($sp) +/* CF37DC 80240C0C D7B60060 */ ldc1 $f22, 0x60($sp) +/* CF37E0 80240C10 D7B40058 */ ldc1 $f20, 0x58($sp) +/* CF37E4 80240C14 03E00008 */ jr $ra +/* CF37E8 80240C18 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s index 18c6e2ba3b..6085462406 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_8024134C_CF3F1C.s @@ -46,7 +46,7 @@ glabel func_8024134C_CF3F1C /* CF3FC0 802413F0 02A0202D */ daddu $a0, $s5, $zero /* CF3FC4 802413F4 0240282D */ daddu $a1, $s2, $zero /* CF3FC8 802413F8 0280302D */ daddu $a2, $s4, $zero -/* CF3FCC 802413FC 0C09048A */ jal func_80241228 +/* CF3FCC 802413FC 0C09048A */ jal func_80241228_CF3DF8 /* CF3FD0 80241400 0200382D */ daddu $a3, $s0, $zero .L80241404: /* CF3FD4 80241404 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_8024134C_CF3F1C /* CF4024 80241454 00000000 */ nop /* CF4028 80241458 0280202D */ daddu $a0, $s4, $zero /* CF402C 8024145C 0200282D */ daddu $a1, $s0, $zero -/* CF4030 80241460 0C090010 */ jal func_80240040 +/* CF4030 80241460 0C090010 */ jal func_80240040_CF2C10 /* CF4034 80241464 0260302D */ daddu $a2, $s3, $zero /* CF4038 80241468 0280202D */ daddu $a0, $s4, $zero /* CF403C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* CF4040 80241470 0C09007C */ jal func_802401F0 +/* CF4040 80241470 0C09007C */ jal func_802401F0_CF2DC0 /* CF4044 80241474 0260302D */ daddu $a2, $s3, $zero /* CF4048 80241478 08090545 */ j .L80241514 /* CF404C 8024147C 0000102D */ daddu $v0, $zero, $zero /* CF4050 80241480 0280202D */ daddu $a0, $s4, $zero /* CF4054 80241484 0200282D */ daddu $a1, $s0, $zero -/* CF4058 80241488 0C090206 */ jal func_80240818 +/* CF4058 80241488 0C090206 */ jal func_80240818_CF33E8 /* CF405C 8024148C 0260302D */ daddu $a2, $s3, $zero /* CF4060 80241490 0280202D */ daddu $a0, $s4, $zero /* CF4064 80241494 0200282D */ daddu $a1, $s0, $zero -/* CF4068 80241498 0C090236 */ jal func_802408D8 +/* CF4068 80241498 0C090236 */ jal func_802408D8_CF34A8 /* CF406C 8024149C 0260302D */ daddu $a2, $s3, $zero /* CF4070 802414A0 08090545 */ j .L80241514 /* CF4074 802414A4 0000102D */ daddu $v0, $zero, $zero /* CF4078 802414A8 0280202D */ daddu $a0, $s4, $zero /* CF407C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* CF4080 802414B0 0C090307 */ jal func_80240C1C +/* CF4080 802414B0 0C090307 */ jal func_80240C1C_CF37EC /* CF4084 802414B4 0260302D */ daddu $a2, $s3, $zero /* CF4088 802414B8 0280202D */ daddu $a0, $s4, $zero /* CF408C 802414BC 0200282D */ daddu $a1, $s0, $zero -/* CF4090 802414C0 0C090325 */ jal func_80240C94 +/* CF4090 802414C0 0C090325 */ jal func_80240C94_CF3864 /* CF4094 802414C4 0260302D */ daddu $a2, $s3, $zero /* CF4098 802414C8 08090545 */ j .L80241514 /* CF409C 802414CC 0000102D */ daddu $v0, $zero, $zero /* CF40A0 802414D0 0280202D */ daddu $a0, $s4, $zero /* CF40A4 802414D4 0200282D */ daddu $a1, $s0, $zero -/* CF40A8 802414D8 0C090340 */ jal func_80240D00 +/* CF40A8 802414D8 0C090340 */ jal func_80240D00_CF38D0 /* CF40AC 802414DC 0260302D */ daddu $a2, $s3, $zero /* CF40B0 802414E0 08090545 */ j .L80241514 /* CF40B4 802414E4 0000102D */ daddu $v0, $zero, $zero /* CF40B8 802414E8 0280202D */ daddu $a0, $s4, $zero /* CF40BC 802414EC 0200282D */ daddu $a1, $s0, $zero -/* CF40C0 802414F0 0C09038D */ jal func_80240E34 +/* CF40C0 802414F0 0C09038D */ jal func_80240E34_CF3A04 /* CF40C4 802414F4 0260302D */ daddu $a2, $s3, $zero /* CF40C8 802414F8 08090545 */ j .L80241514 /* CF40CC 802414FC 0000102D */ daddu $v0, $zero, $zero /* CF40D0 80241500 0280202D */ daddu $a0, $s4, $zero /* CF40D4 80241504 0200282D */ daddu $a1, $s0, $zero -/* CF40D8 80241508 0C0903A6 */ jal func_80240E98 +/* CF40D8 80241508 0C0903A6 */ jal func_80240E98_CF3A68 /* CF40DC 8024150C 0260302D */ daddu $a2, $s3, $zero .L80241510: /* CF40E0 80241510 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538.s deleted file mode 100644 index 2c4e819841..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241538 -/* CF4108 80241538 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* CF410C 8024153C AFB3001C */ sw $s3, 0x1c($sp) -/* CF4110 80241540 0080982D */ daddu $s3, $a0, $zero -/* CF4114 80241544 AFBF0020 */ sw $ra, 0x20($sp) -/* CF4118 80241548 AFB20018 */ sw $s2, 0x18($sp) -/* CF411C 8024154C AFB10014 */ sw $s1, 0x14($sp) -/* CF4120 80241550 AFB00010 */ sw $s0, 0x10($sp) -/* CF4124 80241554 F7B40028 */ sdc1 $f20, 0x28($sp) -/* CF4128 80241558 8E710148 */ lw $s1, 0x148($s3) -/* CF412C 8024155C 86240008 */ lh $a0, 8($s1) -/* CF4130 80241560 0C00EABB */ jal get_npc_unsafe -/* CF4134 80241564 00A0802D */ daddu $s0, $a1, $zero -/* CF4138 80241568 8E040020 */ lw $a0, 0x20($s0) -/* CF413C 8024156C 0040902D */ daddu $s2, $v0, $zero -/* CF4140 80241570 00041FC2 */ srl $v1, $a0, 0x1f -/* CF4144 80241574 00832021 */ addu $a0, $a0, $v1 -/* CF4148 80241578 00042043 */ sra $a0, $a0, 1 -/* CF414C 8024157C 0C00A67F */ jal rand_int -/* CF4150 80241580 24840001 */ addiu $a0, $a0, 1 -/* CF4154 80241584 8E030020 */ lw $v1, 0x20($s0) -/* CF4158 80241588 C64C0038 */ lwc1 $f12, 0x38($s2) -/* CF415C 8024158C 000327C2 */ srl $a0, $v1, 0x1f -/* CF4160 80241590 00641821 */ addu $v1, $v1, $a0 -/* CF4164 80241594 00031843 */ sra $v1, $v1, 1 -/* CF4168 80241598 00621821 */ addu $v1, $v1, $v0 -/* CF416C 8024159C A643008E */ sh $v1, 0x8e($s2) -/* CF4170 802415A0 8E2200CC */ lw $v0, 0xcc($s1) -/* CF4174 802415A4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* CF4178 802415A8 8C42000C */ lw $v0, 0xc($v0) -/* CF417C 802415AC AE420028 */ sw $v0, 0x28($s2) -/* CF4180 802415B0 C6000018 */ lwc1 $f0, 0x18($s0) -/* CF4184 802415B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* CF4188 802415B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* CF418C 802415BC E6400018 */ swc1 $f0, 0x18($s2) -/* CF4190 802415C0 8C460028 */ lw $a2, 0x28($v0) -/* CF4194 802415C4 0C00A720 */ jal atan2 -/* CF4198 802415C8 8C470030 */ lw $a3, 0x30($v0) -/* CF419C 802415CC 46000506 */ mov.s $f20, $f0 -/* CF41A0 802415D0 C64C000C */ lwc1 $f12, 0xc($s2) -/* CF41A4 802415D4 0C00A70A */ jal get_clamped_angle_diff -/* CF41A8 802415D8 4600A386 */ mov.s $f14, $f20 -/* CF41AC 802415DC 46000086 */ mov.s $f2, $f0 -/* CF41B0 802415E0 8E02001C */ lw $v0, 0x1c($s0) -/* CF41B4 802415E4 46001005 */ abs.s $f0, $f2 -/* CF41B8 802415E8 44822000 */ mtc1 $v0, $f4 -/* CF41BC 802415EC 00000000 */ nop -/* CF41C0 802415F0 46802120 */ cvt.s.w $f4, $f4 -/* CF41C4 802415F4 4600203C */ c.lt.s $f4, $f0 -/* CF41C8 802415F8 00000000 */ nop -/* CF41CC 802415FC 4500000D */ bc1f .L80241634 -/* CF41D0 80241600 00000000 */ nop -/* CF41D4 80241604 44800000 */ mtc1 $zero, $f0 -/* CF41D8 80241608 C654000C */ lwc1 $f20, 0xc($s2) -/* CF41DC 8024160C 4600103C */ c.lt.s $f2, $f0 -/* CF41E0 80241610 00000000 */ nop -/* CF41E4 80241614 45000006 */ bc1f .L80241630 -/* CF41E8 80241618 00021023 */ negu $v0, $v0 -/* CF41EC 8024161C 44820000 */ mtc1 $v0, $f0 -/* CF41F0 80241620 00000000 */ nop -/* CF41F4 80241624 46800020 */ cvt.s.w $f0, $f0 -/* CF41F8 80241628 0809058D */ j .L80241634 -/* CF41FC 8024162C 4600A500 */ add.s $f20, $f20, $f0 -.L80241630: -/* CF4200 80241630 4604A500 */ add.s $f20, $f20, $f4 -.L80241634: -/* CF4204 80241634 0C00A6C9 */ jal clamp_angle -/* CF4208 80241638 4600A306 */ mov.s $f12, $f20 -/* CF420C 8024163C 2402000D */ addiu $v0, $zero, 0xd -/* CF4210 80241640 E640000C */ swc1 $f0, 0xc($s2) -/* CF4214 80241644 AE620070 */ sw $v0, 0x70($s3) -/* CF4218 80241648 8FBF0020 */ lw $ra, 0x20($sp) -/* CF421C 8024164C 8FB3001C */ lw $s3, 0x1c($sp) -/* CF4220 80241650 8FB20018 */ lw $s2, 0x18($sp) -/* CF4224 80241654 8FB10014 */ lw $s1, 0x14($sp) -/* CF4228 80241658 8FB00010 */ lw $s0, 0x10($sp) -/* CF422C 8024165C D7B40028 */ ldc1 $f20, 0x28($sp) -/* CF4230 80241660 03E00008 */ jr $ra -/* CF4234 80241664 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538_CF4108.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538_CF4108.s new file mode 100644 index 0000000000..e11afb82a7 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241538_CF4108.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241538_CF4108 +/* CF4108 80241538 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* CF410C 8024153C AFB3001C */ sw $s3, 0x1c($sp) +/* CF4110 80241540 0080982D */ daddu $s3, $a0, $zero +/* CF4114 80241544 AFBF0020 */ sw $ra, 0x20($sp) +/* CF4118 80241548 AFB20018 */ sw $s2, 0x18($sp) +/* CF411C 8024154C AFB10014 */ sw $s1, 0x14($sp) +/* CF4120 80241550 AFB00010 */ sw $s0, 0x10($sp) +/* CF4124 80241554 F7B40028 */ sdc1 $f20, 0x28($sp) +/* CF4128 80241558 8E710148 */ lw $s1, 0x148($s3) +/* CF412C 8024155C 86240008 */ lh $a0, 8($s1) +/* CF4130 80241560 0C00EABB */ jal get_npc_unsafe +/* CF4134 80241564 00A0802D */ daddu $s0, $a1, $zero +/* CF4138 80241568 8E040020 */ lw $a0, 0x20($s0) +/* CF413C 8024156C 0040902D */ daddu $s2, $v0, $zero +/* CF4140 80241570 00041FC2 */ srl $v1, $a0, 0x1f +/* CF4144 80241574 00832021 */ addu $a0, $a0, $v1 +/* CF4148 80241578 00042043 */ sra $a0, $a0, 1 +/* CF414C 8024157C 0C00A67F */ jal rand_int +/* CF4150 80241580 24840001 */ addiu $a0, $a0, 1 +/* CF4154 80241584 8E030020 */ lw $v1, 0x20($s0) +/* CF4158 80241588 C64C0038 */ lwc1 $f12, 0x38($s2) +/* CF415C 8024158C 000327C2 */ srl $a0, $v1, 0x1f +/* CF4160 80241590 00641821 */ addu $v1, $v1, $a0 +/* CF4164 80241594 00031843 */ sra $v1, $v1, 1 +/* CF4168 80241598 00621821 */ addu $v1, $v1, $v0 +/* CF416C 8024159C A643008E */ sh $v1, 0x8e($s2) +/* CF4170 802415A0 8E2200CC */ lw $v0, 0xcc($s1) +/* CF4174 802415A4 C64E0040 */ lwc1 $f14, 0x40($s2) +/* CF4178 802415A8 8C42000C */ lw $v0, 0xc($v0) +/* CF417C 802415AC AE420028 */ sw $v0, 0x28($s2) +/* CF4180 802415B0 C6000018 */ lwc1 $f0, 0x18($s0) +/* CF4184 802415B4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* CF4188 802415B8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* CF418C 802415BC E6400018 */ swc1 $f0, 0x18($s2) +/* CF4190 802415C0 8C460028 */ lw $a2, 0x28($v0) +/* CF4194 802415C4 0C00A720 */ jal atan2 +/* CF4198 802415C8 8C470030 */ lw $a3, 0x30($v0) +/* CF419C 802415CC 46000506 */ mov.s $f20, $f0 +/* CF41A0 802415D0 C64C000C */ lwc1 $f12, 0xc($s2) +/* CF41A4 802415D4 0C00A70A */ jal get_clamped_angle_diff +/* CF41A8 802415D8 4600A386 */ mov.s $f14, $f20 +/* CF41AC 802415DC 46000086 */ mov.s $f2, $f0 +/* CF41B0 802415E0 8E02001C */ lw $v0, 0x1c($s0) +/* CF41B4 802415E4 46001005 */ abs.s $f0, $f2 +/* CF41B8 802415E8 44822000 */ mtc1 $v0, $f4 +/* CF41BC 802415EC 00000000 */ nop +/* CF41C0 802415F0 46802120 */ cvt.s.w $f4, $f4 +/* CF41C4 802415F4 4600203C */ c.lt.s $f4, $f0 +/* CF41C8 802415F8 00000000 */ nop +/* CF41CC 802415FC 4500000D */ bc1f .L80241634 +/* CF41D0 80241600 00000000 */ nop +/* CF41D4 80241604 44800000 */ mtc1 $zero, $f0 +/* CF41D8 80241608 C654000C */ lwc1 $f20, 0xc($s2) +/* CF41DC 8024160C 4600103C */ c.lt.s $f2, $f0 +/* CF41E0 80241610 00000000 */ nop +/* CF41E4 80241614 45000006 */ bc1f .L80241630 +/* CF41E8 80241618 00021023 */ negu $v0, $v0 +/* CF41EC 8024161C 44820000 */ mtc1 $v0, $f0 +/* CF41F0 80241620 00000000 */ nop +/* CF41F4 80241624 46800020 */ cvt.s.w $f0, $f0 +/* CF41F8 80241628 0809058D */ j .L80241634 +/* CF41FC 8024162C 4600A500 */ add.s $f20, $f20, $f0 +.L80241630: +/* CF4200 80241630 4604A500 */ add.s $f20, $f20, $f4 +.L80241634: +/* CF4204 80241634 0C00A6C9 */ jal clamp_angle +/* CF4208 80241638 4600A306 */ mov.s $f12, $f20 +/* CF420C 8024163C 2402000D */ addiu $v0, $zero, 0xd +/* CF4210 80241640 E640000C */ swc1 $f0, 0xc($s2) +/* CF4214 80241644 AE620070 */ sw $v0, 0x70($s3) +/* CF4218 80241648 8FBF0020 */ lw $ra, 0x20($sp) +/* CF421C 8024164C 8FB3001C */ lw $s3, 0x1c($sp) +/* CF4220 80241650 8FB20018 */ lw $s2, 0x18($sp) +/* CF4224 80241654 8FB10014 */ lw $s1, 0x14($sp) +/* CF4228 80241658 8FB00010 */ lw $s0, 0x10($sp) +/* CF422C 8024165C D7B40028 */ ldc1 $f20, 0x28($sp) +/* CF4230 80241660 03E00008 */ jr $ra +/* CF4234 80241664 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s index 0eb3ef1290..ee924bfe2a 100644 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241944_CF4514.s @@ -46,7 +46,7 @@ glabel func_80241944_CF4514 /* CF45B8 802419E8 02A0202D */ daddu $a0, $s5, $zero /* CF45BC 802419EC 0240282D */ daddu $a1, $s2, $zero /* CF45C0 802419F0 0280302D */ daddu $a2, $s4, $zero -/* CF45C4 802419F4 0C09048A */ jal func_80241228 +/* CF45C4 802419F4 0C09048A */ jal func_80241228_CF3DF8 /* CF45C8 802419F8 0200382D */ daddu $a3, $s0, $zero /* CF45CC 802419FC AE800070 */ sw $zero, 0x70($s4) .L80241A00: @@ -74,47 +74,47 @@ glabel func_80241944_CF4514 /* CF4620 80241A50 00000000 */ nop /* CF4624 80241A54 0280202D */ daddu $a0, $s4, $zero /* CF4628 80241A58 0200282D */ daddu $a1, $s0, $zero -/* CF462C 80241A5C 0C090010 */ jal func_80240040 +/* CF462C 80241A5C 0C090010 */ jal func_80240040_CF2C10 /* CF4630 80241A60 0260302D */ daddu $a2, $s3, $zero /* CF4634 80241A64 0280202D */ daddu $a0, $s4, $zero /* CF4638 80241A68 0200282D */ daddu $a1, $s0, $zero -/* CF463C 80241A6C 0C09007C */ jal func_802401F0 +/* CF463C 80241A6C 0C09007C */ jal func_802401F0_CF2DC0 /* CF4640 80241A70 0260302D */ daddu $a2, $s3, $zero /* CF4644 80241A74 080906C2 */ j .L80241B08 /* CF4648 80241A78 0000102D */ daddu $v0, $zero, $zero /* CF464C 80241A7C 0280202D */ daddu $a0, $s4, $zero /* CF4650 80241A80 0200282D */ daddu $a1, $s0, $zero -/* CF4654 80241A84 0C090206 */ jal func_80240818 +/* CF4654 80241A84 0C090206 */ jal func_80240818_CF33E8 /* CF4658 80241A88 0260302D */ daddu $a2, $s3, $zero /* CF465C 80241A8C 0280202D */ daddu $a0, $s4, $zero /* CF4660 80241A90 0200282D */ daddu $a1, $s0, $zero -/* CF4664 80241A94 0C090236 */ jal func_802408D8 +/* CF4664 80241A94 0C090236 */ jal func_802408D8_CF34A8 /* CF4668 80241A98 0260302D */ daddu $a2, $s3, $zero /* CF466C 80241A9C 080906C2 */ j .L80241B08 /* CF4670 80241AA0 0000102D */ daddu $v0, $zero, $zero /* CF4674 80241AA4 0280202D */ daddu $a0, $s4, $zero /* CF4678 80241AA8 0200282D */ daddu $a1, $s0, $zero -/* CF467C 80241AAC 0C090307 */ jal func_80240C1C +/* CF467C 80241AAC 0C090307 */ jal func_80240C1C_CF37EC /* CF4680 80241AB0 0260302D */ daddu $a2, $s3, $zero /* CF4684 80241AB4 0280202D */ daddu $a0, $s4, $zero /* CF4688 80241AB8 0200282D */ daddu $a1, $s0, $zero -/* CF468C 80241ABC 0C090325 */ jal func_80240C94 +/* CF468C 80241ABC 0C090325 */ jal func_80240C94_CF3864 /* CF4690 80241AC0 0260302D */ daddu $a2, $s3, $zero /* CF4694 80241AC4 080906C2 */ j .L80241B08 /* CF4698 80241AC8 0000102D */ daddu $v0, $zero, $zero /* CF469C 80241ACC 0280202D */ daddu $a0, $s4, $zero /* CF46A0 80241AD0 0200282D */ daddu $a1, $s0, $zero -/* CF46A4 80241AD4 0C09054E */ jal func_80241538 +/* CF46A4 80241AD4 0C09054E */ jal func_80241538_CF4108 /* CF46A8 80241AD8 0260302D */ daddu $a2, $s3, $zero /* CF46AC 80241ADC 0280202D */ daddu $a0, $s4, $zero /* CF46B0 80241AE0 0200282D */ daddu $a1, $s0, $zero -/* CF46B4 80241AE4 0C09059A */ jal func_80241668 +/* CF46B4 80241AE4 0C09059A */ jal func_80241668_CF4238 /* CF46B8 80241AE8 0260302D */ daddu $a2, $s3, $zero /* CF46BC 80241AEC 080906C2 */ j .L80241B08 /* CF46C0 80241AF0 0000102D */ daddu $v0, $zero, $zero /* CF46C4 80241AF4 0280202D */ daddu $a0, $s4, $zero /* CF46C8 80241AF8 0200282D */ daddu $a1, $s0, $zero -/* CF46CC 80241AFC 0C09063A */ jal func_802418E8 +/* CF46CC 80241AFC 0C09063A */ jal func_802418E8_CF44B8 /* CF46D0 80241B00 0260302D */ daddu $a2, $s3, $zero .L80241B04: /* CF46D4 80241B04 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58.s deleted file mode 100644 index 25e4b9b847..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D58 -/* CF4928 80241D58 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF492C 80241D5C AFBF0010 */ sw $ra, 0x10($sp) -/* CF4930 80241D60 10A00003 */ beqz $a1, .L80241D70 -/* CF4934 80241D64 8C86000C */ lw $a2, 0xc($a0) -/* CF4938 80241D68 3C018024 */ lui $at, 0x8024 -/* CF493C 80241D6C AC202ACC */ sw $zero, 0x2acc($at) -.L80241D70: -/* CF4940 80241D70 3C038024 */ lui $v1, 0x8024 -/* CF4944 80241D74 24632ACC */ addiu $v1, $v1, 0x2acc -/* CF4948 80241D78 8C620000 */ lw $v0, ($v1) -/* CF494C 80241D7C 54400003 */ bnel $v0, $zero, .L80241D8C -/* CF4950 80241D80 AC600000 */ sw $zero, ($v1) -/* CF4954 80241D84 08090768 */ j .L80241DA0 -/* CF4958 80241D88 0000102D */ daddu $v0, $zero, $zero -.L80241D8C: -/* CF495C 80241D8C 8CC50000 */ lw $a1, ($a2) -/* CF4960 80241D90 3C068024 */ lui $a2, 0x8024 -/* CF4964 80241D94 0C0B2026 */ jal set_variable -/* CF4968 80241D98 8CC62AD0 */ lw $a2, 0x2ad0($a2) -/* CF496C 80241D9C 24020002 */ addiu $v0, $zero, 2 -.L80241DA0: -/* CF4970 80241DA0 8FBF0010 */ lw $ra, 0x10($sp) -/* CF4974 80241DA4 03E00008 */ jr $ra -/* CF4978 80241DA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s new file mode 100644 index 0000000000..bf95cd0cfc --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241D58_CF4928.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D58_CF4928 +/* CF4928 80241D58 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CF492C 80241D5C AFBF0010 */ sw $ra, 0x10($sp) +/* CF4930 80241D60 10A00003 */ beqz $a1, .L80241D70 +/* CF4934 80241D64 8C86000C */ lw $a2, 0xc($a0) +/* CF4938 80241D68 3C018024 */ lui $at, 0x8024 +/* CF493C 80241D6C AC202ACC */ sw $zero, 0x2acc($at) +.L80241D70: +/* CF4940 80241D70 3C038024 */ lui $v1, 0x8024 +/* CF4944 80241D74 24632ACC */ addiu $v1, $v1, 0x2acc +/* CF4948 80241D78 8C620000 */ lw $v0, ($v1) +/* CF494C 80241D7C 54400003 */ bnel $v0, $zero, .L80241D8C +/* CF4950 80241D80 AC600000 */ sw $zero, ($v1) +/* CF4954 80241D84 08090768 */ j .L80241DA0 +/* CF4958 80241D88 0000102D */ daddu $v0, $zero, $zero +.L80241D8C: +/* CF495C 80241D8C 8CC50000 */ lw $a1, ($a2) +/* CF4960 80241D90 3C068024 */ lui $a2, 0x8024 +/* CF4964 80241D94 0C0B2026 */ jal set_variable +/* CF4968 80241D98 8CC62AD0 */ lw $a2, 0x2ad0($a2) +/* CF496C 80241D9C 24020002 */ addiu $v0, $zero, 2 +.L80241DA0: +/* CF4970 80241DA0 8FBF0010 */ lw $ra, 0x10($sp) +/* CF4974 80241DA4 03E00008 */ jr $ra +/* CF4978 80241DA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241F44.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241F44.s deleted file mode 100644 index a0d4ec6626..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241F44.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F44 -/* CF4B14 80241F44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF4B18 80241F48 AFB00010 */ sw $s0, 0x10($sp) -/* CF4B1C 80241F4C 0080802D */ daddu $s0, $a0, $zero -/* CF4B20 80241F50 AFBF0014 */ sw $ra, 0x14($sp) -/* CF4B24 80241F54 8E02000C */ lw $v0, 0xc($s0) -/* CF4B28 80241F58 0C0B1EAF */ jal get_variable -/* CF4B2C 80241F5C 8C450000 */ lw $a1, ($v0) -/* CF4B30 80241F60 3C048008 */ lui $a0, %hi(gItemTable) -/* CF4B34 80241F64 248478E0 */ addiu $a0, $a0, %lo(gItemTable) -/* CF4B38 80241F68 00021940 */ sll $v1, $v0, 5 -/* CF4B3C 80241F6C 00642021 */ addu $a0, $v1, $a0 -/* CF4B40 80241F70 240300BB */ addiu $v1, $zero, 0xbb -/* CF4B44 80241F74 14430003 */ bne $v0, $v1, .L80241F84 -/* CF4B48 80241F78 24020002 */ addiu $v0, $zero, 2 -/* CF4B4C 80241F7C 080907E8 */ j .L80241FA0 -/* CF4B50 80241F80 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241F84: -/* CF4B54 80241F84 94820018 */ lhu $v0, 0x18($a0) -/* CF4B58 80241F88 30420080 */ andi $v0, $v0, 0x80 -/* CF4B5C 80241F8C 10400003 */ beqz $v0, .L80241F9C -/* CF4B60 80241F90 24020001 */ addiu $v0, $zero, 1 -/* CF4B64 80241F94 080907E8 */ j .L80241FA0 -/* CF4B68 80241F98 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241F9C: -/* CF4B6C 80241F9C AE0000A8 */ sw $zero, 0xa8($s0) -.L80241FA0: -/* CF4B70 80241FA0 8FBF0014 */ lw $ra, 0x14($sp) -/* CF4B74 80241FA4 8FB00010 */ lw $s0, 0x10($sp) -/* CF4B78 80241FA8 24020002 */ addiu $v0, $zero, 2 -/* CF4B7C 80241FAC 03E00008 */ jr $ra -/* CF4B80 80241FB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241F44_CF4B14.s b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241F44_CF4B14.s new file mode 100644 index 0000000000..b9d6718f17 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_25/CF2C10/func_80241F44_CF4B14.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F44_CF4B14 +/* CF4B14 80241F44 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CF4B18 80241F48 AFB00010 */ sw $s0, 0x10($sp) +/* CF4B1C 80241F4C 0080802D */ daddu $s0, $a0, $zero +/* CF4B20 80241F50 AFBF0014 */ sw $ra, 0x14($sp) +/* CF4B24 80241F54 8E02000C */ lw $v0, 0xc($s0) +/* CF4B28 80241F58 0C0B1EAF */ jal get_variable +/* CF4B2C 80241F5C 8C450000 */ lw $a1, ($v0) +/* CF4B30 80241F60 3C048008 */ lui $a0, %hi(gItemTable) +/* CF4B34 80241F64 248478E0 */ addiu $a0, $a0, %lo(gItemTable) +/* CF4B38 80241F68 00021940 */ sll $v1, $v0, 5 +/* CF4B3C 80241F6C 00642021 */ addu $a0, $v1, $a0 +/* CF4B40 80241F70 240300BB */ addiu $v1, $zero, 0xbb +/* CF4B44 80241F74 14430003 */ bne $v0, $v1, .L80241F84 +/* CF4B48 80241F78 24020002 */ addiu $v0, $zero, 2 +/* CF4B4C 80241F7C 080907E8 */ j .L80241FA0 +/* CF4B50 80241F80 AE0200A8 */ sw $v0, 0xa8($s0) +.L80241F84: +/* CF4B54 80241F84 94820018 */ lhu $v0, 0x18($a0) +/* CF4B58 80241F88 30420080 */ andi $v0, $v0, 0x80 +/* CF4B5C 80241F8C 10400003 */ beqz $v0, .L80241F9C +/* CF4B60 80241F90 24020001 */ addiu $v0, $zero, 1 +/* CF4B64 80241F94 080907E8 */ j .L80241FA0 +/* CF4B68 80241F98 AE0200A8 */ sw $v0, 0xa8($s0) +.L80241F9C: +/* CF4B6C 80241F9C AE0000A8 */ sw $zero, 0xa8($s0) +.L80241FA0: +/* CF4B70 80241FA0 8FBF0014 */ lw $ra, 0x14($sp) +/* CF4B74 80241FA4 8FB00010 */ lw $s0, 0x10($sp) +/* CF4B78 80241FA8 24020002 */ addiu $v0, $zero, 2 +/* CF4B7C 80241FAC 03E00008 */ jr $ra +/* CF4B80 80241FB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF4BC0/func_80242060.s b/asm/nonmatchings/world/area_flo/flo_25/CF4BC0/func_80242060.s deleted file mode 100644 index 9cfaf5f56d..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_25/CF4BC0/func_80242060.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242060 -/* CF4C30 80242060 27BDFF78 */ addiu $sp, $sp, -0x88 -/* CF4C34 80242064 AFB10054 */ sw $s1, 0x54($sp) -/* CF4C38 80242068 0080882D */ daddu $s1, $a0, $zero -/* CF4C3C 8024206C AFBF005C */ sw $ra, 0x5c($sp) -/* CF4C40 80242070 AFB20058 */ sw $s2, 0x58($sp) -/* CF4C44 80242074 AFB00050 */ sw $s0, 0x50($sp) -/* CF4C48 80242078 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* CF4C4C 8024207C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* CF4C50 80242080 F7B80070 */ sdc1 $f24, 0x70($sp) -/* CF4C54 80242084 F7B60068 */ sdc1 $f22, 0x68($sp) -/* CF4C58 80242088 F7B40060 */ sdc1 $f20, 0x60($sp) -/* CF4C5C 8024208C 8E30000C */ lw $s0, 0xc($s1) -/* CF4C60 80242090 8E050000 */ lw $a1, ($s0) -/* CF4C64 80242094 0C0B1EAF */ jal get_variable -/* CF4C68 80242098 26100004 */ addiu $s0, $s0, 4 -/* CF4C6C 8024209C 0C046C04 */ jal get_model_list_index_from_tree_index -/* CF4C70 802420A0 0040202D */ daddu $a0, $v0, $zero -/* CF4C74 802420A4 8E050000 */ lw $a1, ($s0) -/* CF4C78 802420A8 26100004 */ addiu $s0, $s0, 4 -/* CF4C7C 802420AC 0220202D */ daddu $a0, $s1, $zero -/* CF4C80 802420B0 0C0B210B */ jal get_float_variable -/* CF4C84 802420B4 0040902D */ daddu $s2, $v0, $zero -/* CF4C88 802420B8 8E050000 */ lw $a1, ($s0) -/* CF4C8C 802420BC 26100004 */ addiu $s0, $s0, 4 -/* CF4C90 802420C0 0220202D */ daddu $a0, $s1, $zero -/* CF4C94 802420C4 0C0B210B */ jal get_float_variable -/* CF4C98 802420C8 46000706 */ mov.s $f28, $f0 -/* CF4C9C 802420CC 8E050000 */ lw $a1, ($s0) -/* CF4CA0 802420D0 26100004 */ addiu $s0, $s0, 4 -/* CF4CA4 802420D4 0220202D */ daddu $a0, $s1, $zero -/* CF4CA8 802420D8 0C0B210B */ jal get_float_variable -/* CF4CAC 802420DC 46000686 */ mov.s $f26, $f0 -/* CF4CB0 802420E0 0220202D */ daddu $a0, $s1, $zero -/* CF4CB4 802420E4 8E050000 */ lw $a1, ($s0) -/* CF4CB8 802420E8 0C0B210B */ jal get_float_variable -/* CF4CBC 802420EC 46000586 */ mov.s $f22, $f0 -/* CF4CC0 802420F0 0240202D */ daddu $a0, $s2, $zero -/* CF4CC4 802420F4 0C046B4C */ jal get_model_from_list_index -/* CF4CC8 802420F8 46000606 */ mov.s $f24, $f0 -/* CF4CCC 802420FC 0040882D */ daddu $s1, $v0, $zero -/* CF4CD0 80242100 96220000 */ lhu $v0, ($s1) -/* CF4CD4 80242104 30420400 */ andi $v0, $v0, 0x400 -/* CF4CD8 80242108 1440001E */ bnez $v0, .L80242184 -/* CF4CDC 8024210C 26300058 */ addiu $s0, $s1, 0x58 -/* CF4CE0 80242110 4480A000 */ mtc1 $zero, $f20 -/* CF4CE4 80242114 4406B000 */ mfc1 $a2, $f22 -/* CF4CE8 80242118 4405A000 */ mfc1 $a1, $f20 -/* CF4CEC 8024211C 4407A000 */ mfc1 $a3, $f20 -/* CF4CF0 80242120 0C019E40 */ jal guTranslateF -/* CF4CF4 80242124 0200202D */ daddu $a0, $s0, $zero -/* CF4CF8 80242128 4405E000 */ mfc1 $a1, $f28 -/* CF4CFC 8024212C 4406D000 */ mfc1 $a2, $f26 -/* CF4D00 80242130 4407C000 */ mfc1 $a3, $f24 -/* CF4D04 80242134 0C0907FC */ jal func_80241FF0 -/* CF4D08 80242138 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4D0C 8024213C 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4D10 80242140 0200282D */ daddu $a1, $s0, $zero -/* CF4D14 80242144 0C019D80 */ jal guMtxCatF -/* CF4D18 80242148 0200302D */ daddu $a2, $s0, $zero -/* CF4D1C 8024214C 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4D20 80242150 4600B587 */ neg.s $f22, $f22 -/* CF4D24 80242154 4405A000 */ mfc1 $a1, $f20 -/* CF4D28 80242158 4406B000 */ mfc1 $a2, $f22 -/* CF4D2C 8024215C 0C019E40 */ jal guTranslateF -/* CF4D30 80242160 00A0382D */ daddu $a3, $a1, $zero -/* CF4D34 80242164 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4D38 80242168 0200282D */ daddu $a1, $s0, $zero -/* CF4D3C 8024216C 0C019D80 */ jal guMtxCatF -/* CF4D40 80242170 00A0302D */ daddu $a2, $a1, $zero -/* CF4D44 80242174 96220000 */ lhu $v0, ($s1) -/* CF4D48 80242178 34421400 */ ori $v0, $v0, 0x1400 -/* CF4D4C 8024217C 0809087F */ j .L802421FC -/* CF4D50 80242180 A6220000 */ sh $v0, ($s1) -.L80242184: -/* CF4D54 80242184 4480A000 */ mtc1 $zero, $f20 -/* CF4D58 80242188 4406B000 */ mfc1 $a2, $f22 -/* CF4D5C 8024218C 4405A000 */ mfc1 $a1, $f20 -/* CF4D60 80242190 4407A000 */ mfc1 $a3, $f20 -/* CF4D64 80242194 0C019E40 */ jal guTranslateF -/* CF4D68 80242198 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4D6C 8024219C 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4D70 802421A0 26300058 */ addiu $s0, $s1, 0x58 -/* CF4D74 802421A4 0200282D */ daddu $a1, $s0, $zero -/* CF4D78 802421A8 0C019D80 */ jal guMtxCatF -/* CF4D7C 802421AC 0200302D */ daddu $a2, $s0, $zero -/* CF4D80 802421B0 4405E000 */ mfc1 $a1, $f28 -/* CF4D84 802421B4 4406D000 */ mfc1 $a2, $f26 -/* CF4D88 802421B8 4407C000 */ mfc1 $a3, $f24 -/* CF4D8C 802421BC 0C0907FC */ jal func_80241FF0 -/* CF4D90 802421C0 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4D94 802421C4 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4D98 802421C8 0200282D */ daddu $a1, $s0, $zero -/* CF4D9C 802421CC 0C019D80 */ jal guMtxCatF -/* CF4DA0 802421D0 0200302D */ daddu $a2, $s0, $zero -/* CF4DA4 802421D4 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4DA8 802421D8 4600B587 */ neg.s $f22, $f22 -/* CF4DAC 802421DC 4405A000 */ mfc1 $a1, $f20 -/* CF4DB0 802421E0 4406B000 */ mfc1 $a2, $f22 -/* CF4DB4 802421E4 0C019E40 */ jal guTranslateF -/* CF4DB8 802421E8 00A0382D */ daddu $a3, $a1, $zero -/* CF4DBC 802421EC 27A40010 */ addiu $a0, $sp, 0x10 -/* CF4DC0 802421F0 0200282D */ daddu $a1, $s0, $zero -/* CF4DC4 802421F4 0C019D80 */ jal guMtxCatF -/* CF4DC8 802421F8 00A0302D */ daddu $a2, $a1, $zero -.L802421FC: -/* CF4DCC 802421FC 8FBF005C */ lw $ra, 0x5c($sp) -/* CF4DD0 80242200 8FB20058 */ lw $s2, 0x58($sp) -/* CF4DD4 80242204 8FB10054 */ lw $s1, 0x54($sp) -/* CF4DD8 80242208 8FB00050 */ lw $s0, 0x50($sp) -/* CF4DDC 8024220C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* CF4DE0 80242210 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* CF4DE4 80242214 D7B80070 */ ldc1 $f24, 0x70($sp) -/* CF4DE8 80242218 D7B60068 */ ldc1 $f22, 0x68($sp) -/* CF4DEC 8024221C D7B40060 */ ldc1 $f20, 0x60($sp) -/* CF4DF0 80242220 24020002 */ addiu $v0, $zero, 2 -/* CF4DF4 80242224 03E00008 */ jr $ra -/* CF4DF8 80242228 27BD0088 */ addiu $sp, $sp, 0x88 -/* CF4DFC 8024222C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_flo/flo_25/CF4BC0/func_80242060_CF4C30.s b/asm/nonmatchings/world/area_flo/flo_25/CF4BC0/func_80242060_CF4C30.s new file mode 100644 index 0000000000..8ba9201ed2 --- /dev/null +++ b/asm/nonmatchings/world/area_flo/flo_25/CF4BC0/func_80242060_CF4C30.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242060_CF4C30 +/* CF4C30 80242060 27BDFF78 */ addiu $sp, $sp, -0x88 +/* CF4C34 80242064 AFB10054 */ sw $s1, 0x54($sp) +/* CF4C38 80242068 0080882D */ daddu $s1, $a0, $zero +/* CF4C3C 8024206C AFBF005C */ sw $ra, 0x5c($sp) +/* CF4C40 80242070 AFB20058 */ sw $s2, 0x58($sp) +/* CF4C44 80242074 AFB00050 */ sw $s0, 0x50($sp) +/* CF4C48 80242078 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* CF4C4C 8024207C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* CF4C50 80242080 F7B80070 */ sdc1 $f24, 0x70($sp) +/* CF4C54 80242084 F7B60068 */ sdc1 $f22, 0x68($sp) +/* CF4C58 80242088 F7B40060 */ sdc1 $f20, 0x60($sp) +/* CF4C5C 8024208C 8E30000C */ lw $s0, 0xc($s1) +/* CF4C60 80242090 8E050000 */ lw $a1, ($s0) +/* CF4C64 80242094 0C0B1EAF */ jal get_variable +/* CF4C68 80242098 26100004 */ addiu $s0, $s0, 4 +/* CF4C6C 8024209C 0C046C04 */ jal get_model_list_index_from_tree_index +/* CF4C70 802420A0 0040202D */ daddu $a0, $v0, $zero +/* CF4C74 802420A4 8E050000 */ lw $a1, ($s0) +/* CF4C78 802420A8 26100004 */ addiu $s0, $s0, 4 +/* CF4C7C 802420AC 0220202D */ daddu $a0, $s1, $zero +/* CF4C80 802420B0 0C0B210B */ jal get_float_variable +/* CF4C84 802420B4 0040902D */ daddu $s2, $v0, $zero +/* CF4C88 802420B8 8E050000 */ lw $a1, ($s0) +/* CF4C8C 802420BC 26100004 */ addiu $s0, $s0, 4 +/* CF4C90 802420C0 0220202D */ daddu $a0, $s1, $zero +/* CF4C94 802420C4 0C0B210B */ jal get_float_variable +/* CF4C98 802420C8 46000706 */ mov.s $f28, $f0 +/* CF4C9C 802420CC 8E050000 */ lw $a1, ($s0) +/* CF4CA0 802420D0 26100004 */ addiu $s0, $s0, 4 +/* CF4CA4 802420D4 0220202D */ daddu $a0, $s1, $zero +/* CF4CA8 802420D8 0C0B210B */ jal get_float_variable +/* CF4CAC 802420DC 46000686 */ mov.s $f26, $f0 +/* CF4CB0 802420E0 0220202D */ daddu $a0, $s1, $zero +/* CF4CB4 802420E4 8E050000 */ lw $a1, ($s0) +/* CF4CB8 802420E8 0C0B210B */ jal get_float_variable +/* CF4CBC 802420EC 46000586 */ mov.s $f22, $f0 +/* CF4CC0 802420F0 0240202D */ daddu $a0, $s2, $zero +/* CF4CC4 802420F4 0C046B4C */ jal get_model_from_list_index +/* CF4CC8 802420F8 46000606 */ mov.s $f24, $f0 +/* CF4CCC 802420FC 0040882D */ daddu $s1, $v0, $zero +/* CF4CD0 80242100 96220000 */ lhu $v0, ($s1) +/* CF4CD4 80242104 30420400 */ andi $v0, $v0, 0x400 +/* CF4CD8 80242108 1440001E */ bnez $v0, .L80242184 +/* CF4CDC 8024210C 26300058 */ addiu $s0, $s1, 0x58 +/* CF4CE0 80242110 4480A000 */ mtc1 $zero, $f20 +/* CF4CE4 80242114 4406B000 */ mfc1 $a2, $f22 +/* CF4CE8 80242118 4405A000 */ mfc1 $a1, $f20 +/* CF4CEC 8024211C 4407A000 */ mfc1 $a3, $f20 +/* CF4CF0 80242120 0C019E40 */ jal guTranslateF +/* CF4CF4 80242124 0200202D */ daddu $a0, $s0, $zero +/* CF4CF8 80242128 4405E000 */ mfc1 $a1, $f28 +/* CF4CFC 8024212C 4406D000 */ mfc1 $a2, $f26 +/* CF4D00 80242130 4407C000 */ mfc1 $a3, $f24 +/* CF4D04 80242134 0C0907FC */ jal func_80241FF0_CF4BC0 +/* CF4D08 80242138 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4D0C 8024213C 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4D10 80242140 0200282D */ daddu $a1, $s0, $zero +/* CF4D14 80242144 0C019D80 */ jal guMtxCatF +/* CF4D18 80242148 0200302D */ daddu $a2, $s0, $zero +/* CF4D1C 8024214C 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4D20 80242150 4600B587 */ neg.s $f22, $f22 +/* CF4D24 80242154 4405A000 */ mfc1 $a1, $f20 +/* CF4D28 80242158 4406B000 */ mfc1 $a2, $f22 +/* CF4D2C 8024215C 0C019E40 */ jal guTranslateF +/* CF4D30 80242160 00A0382D */ daddu $a3, $a1, $zero +/* CF4D34 80242164 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4D38 80242168 0200282D */ daddu $a1, $s0, $zero +/* CF4D3C 8024216C 0C019D80 */ jal guMtxCatF +/* CF4D40 80242170 00A0302D */ daddu $a2, $a1, $zero +/* CF4D44 80242174 96220000 */ lhu $v0, ($s1) +/* CF4D48 80242178 34421400 */ ori $v0, $v0, 0x1400 +/* CF4D4C 8024217C 0809087F */ j .L802421FC +/* CF4D50 80242180 A6220000 */ sh $v0, ($s1) +.L80242184: +/* CF4D54 80242184 4480A000 */ mtc1 $zero, $f20 +/* CF4D58 80242188 4406B000 */ mfc1 $a2, $f22 +/* CF4D5C 8024218C 4405A000 */ mfc1 $a1, $f20 +/* CF4D60 80242190 4407A000 */ mfc1 $a3, $f20 +/* CF4D64 80242194 0C019E40 */ jal guTranslateF +/* CF4D68 80242198 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4D6C 8024219C 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4D70 802421A0 26300058 */ addiu $s0, $s1, 0x58 +/* CF4D74 802421A4 0200282D */ daddu $a1, $s0, $zero +/* CF4D78 802421A8 0C019D80 */ jal guMtxCatF +/* CF4D7C 802421AC 0200302D */ daddu $a2, $s0, $zero +/* CF4D80 802421B0 4405E000 */ mfc1 $a1, $f28 +/* CF4D84 802421B4 4406D000 */ mfc1 $a2, $f26 +/* CF4D88 802421B8 4407C000 */ mfc1 $a3, $f24 +/* CF4D8C 802421BC 0C0907FC */ jal func_80241FF0_CF4BC0 +/* CF4D90 802421C0 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4D94 802421C4 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4D98 802421C8 0200282D */ daddu $a1, $s0, $zero +/* CF4D9C 802421CC 0C019D80 */ jal guMtxCatF +/* CF4DA0 802421D0 0200302D */ daddu $a2, $s0, $zero +/* CF4DA4 802421D4 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4DA8 802421D8 4600B587 */ neg.s $f22, $f22 +/* CF4DAC 802421DC 4405A000 */ mfc1 $a1, $f20 +/* CF4DB0 802421E0 4406B000 */ mfc1 $a2, $f22 +/* CF4DB4 802421E4 0C019E40 */ jal guTranslateF +/* CF4DB8 802421E8 00A0382D */ daddu $a3, $a1, $zero +/* CF4DBC 802421EC 27A40010 */ addiu $a0, $sp, 0x10 +/* CF4DC0 802421F0 0200282D */ daddu $a1, $s0, $zero +/* CF4DC4 802421F4 0C019D80 */ jal guMtxCatF +/* CF4DC8 802421F8 00A0302D */ daddu $a2, $a1, $zero +.L802421FC: +/* CF4DCC 802421FC 8FBF005C */ lw $ra, 0x5c($sp) +/* CF4DD0 80242200 8FB20058 */ lw $s2, 0x58($sp) +/* CF4DD4 80242204 8FB10054 */ lw $s1, 0x54($sp) +/* CF4DD8 80242208 8FB00050 */ lw $s0, 0x50($sp) +/* CF4DDC 8024220C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* CF4DE0 80242210 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* CF4DE4 80242214 D7B80070 */ ldc1 $f24, 0x70($sp) +/* CF4DE8 80242218 D7B60068 */ ldc1 $f22, 0x68($sp) +/* CF4DEC 8024221C D7B40060 */ ldc1 $f20, 0x60($sp) +/* CF4DF0 80242220 24020002 */ addiu $v0, $zero, 2 +/* CF4DF4 80242224 03E00008 */ jr $ra +/* CF4DF8 80242228 27BD0088 */ addiu $sp, $sp, 0x88 +/* CF4DFC 8024222C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170.s deleted file mode 100644 index 23f21dca07..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240170 -/* A0BE60 80240170 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A0BE64 80240174 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A0BE68 80240178 3C01800B */ lui $at, 0x800b -/* A0BE6C 8024017C C43A1DEC */ lwc1 $f26, 0x1dec($at) -/* A0BE70 80240180 3C014334 */ lui $at, 0x4334 -/* A0BE74 80240184 44810000 */ mtc1 $at, $f0 -/* A0BE78 80240188 3C014049 */ lui $at, 0x4049 -/* A0BE7C 8024018C 34210FD8 */ ori $at, $at, 0xfd8 -/* A0BE80 80240190 44811000 */ mtc1 $at, $f2 -/* A0BE84 80240194 240401F4 */ addiu $a0, $zero, 0x1f4 -/* A0BE88 80240198 AFBF0034 */ sw $ra, 0x34($sp) -/* A0BE8C 8024019C 4600D683 */ div.s $f26, $f26, $f0 -/* A0BE90 802401A0 4602D682 */ mul.s $f26, $f26, $f2 -/* A0BE94 802401A4 00000000 */ nop -/* A0BE98 802401A8 AFB00030 */ sw $s0, 0x30($sp) -/* A0BE9C 802401AC F7B60040 */ sdc1 $f22, 0x40($sp) -/* A0BEA0 802401B0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A0BEA4 802401B4 3C018024 */ lui $at, 0x8024 -/* A0BEA8 802401B8 D4204B40 */ ldc1 $f0, 0x4b40($at) -/* A0BEAC 802401BC 4600D521 */ cvt.d.s $f20, $f26 -/* A0BEB0 802401C0 4620A580 */ add.d $f22, $f20, $f0 -/* A0BEB4 802401C4 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A0BEB8 802401C8 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A0BEBC 802401CC 4620A501 */ sub.d $f20, $f20, $f0 -/* A0BEC0 802401D0 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A0BEC4 802401D4 4620B5A0 */ cvt.s.d $f22, $f22 -/* A0BEC8 802401D8 0C00A67F */ jal rand_int -/* A0BECC 802401DC 4620A520 */ cvt.s.d $f20, $f20 -/* A0BED0 802401E0 2442FF06 */ addiu $v0, $v0, -0xfa -/* A0BED4 802401E4 4482C000 */ mtc1 $v0, $f24 -/* A0BED8 802401E8 00000000 */ nop -/* A0BEDC 802401EC 4680C620 */ cvt.s.w $f24, $f24 -/* A0BEE0 802401F0 0C00A67F */ jal rand_int -/* A0BEE4 802401F4 240401F4 */ addiu $a0, $zero, 0x1f4 -/* A0BEE8 802401F8 24040064 */ addiu $a0, $zero, 0x64 -/* A0BEEC 802401FC 2442FF06 */ addiu $v0, $v0, -0xfa -/* A0BEF0 80240200 44822000 */ mtc1 $v0, $f4 -/* A0BEF4 80240204 00000000 */ nop -/* A0BEF8 80240208 46802120 */ cvt.s.w $f4, $f4 -/* A0BEFC 8024020C 0C00A67F */ jal rand_int -/* A0BF00 80240210 E7A40028 */ swc1 $f4, 0x28($sp) -/* A0BF04 80240214 24420258 */ addiu $v0, $v0, 0x258 -/* A0BF08 80240218 4482E000 */ mtc1 $v0, $f28 -/* A0BF0C 8024021C 00000000 */ nop -/* A0BF10 80240220 4680E720 */ cvt.s.w $f28, $f28 -/* A0BF14 80240224 0C00A85B */ jal sin_rad -/* A0BF18 80240228 4600D306 */ mov.s $f12, $f26 -/* A0BF1C 8024022C 4600E002 */ mul.s $f0, $f28, $f0 -/* A0BF20 80240230 00000000 */ nop -/* A0BF24 80240234 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A0BF28 80240238 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A0BF2C 8024023C C6020028 */ lwc1 $f2, 0x28($s0) -/* A0BF30 80240240 46001780 */ add.s $f30, $f2, $f0 -/* A0BF34 80240244 0C00A85B */ jal sin_rad -/* A0BF38 80240248 4600B306 */ mov.s $f12, $f22 -/* A0BF3C 8024024C 4600C002 */ mul.s $f0, $f24, $f0 -/* A0BF40 80240250 00000000 */ nop -/* A0BF44 80240254 C602002C */ lwc1 $f2, 0x2c($s0) -/* A0BF48 80240258 4600F780 */ add.s $f30, $f30, $f0 -/* A0BF4C 8024025C 3C014348 */ lui $at, 0x4348 -/* A0BF50 80240260 44810000 */ mtc1 $at, $f0 -/* A0BF54 80240264 00000000 */ nop -/* A0BF58 80240268 46001080 */ add.s $f2, $f2, $f0 -/* A0BF5C 8024026C 4600D306 */ mov.s $f12, $f26 -/* A0BF60 80240270 E7BE0020 */ swc1 $f30, 0x20($sp) -/* A0BF64 80240274 0C00A874 */ jal cos_rad -/* A0BF68 80240278 E7A20024 */ swc1 $f2, 0x24($sp) -/* A0BF6C 8024027C 4600E002 */ mul.s $f0, $f28, $f0 -/* A0BF70 80240280 00000000 */ nop -/* A0BF74 80240284 C61E0030 */ lwc1 $f30, 0x30($s0) -/* A0BF78 80240288 4600F781 */ sub.s $f30, $f30, $f0 -/* A0BF7C 8024028C 0C00A874 */ jal cos_rad -/* A0BF80 80240290 4600B306 */ mov.s $f12, $f22 -/* A0BF84 80240294 4600C602 */ mul.s $f24, $f24, $f0 -/* A0BF88 80240298 00000000 */ nop -/* A0BF8C 8024029C 4618F781 */ sub.s $f30, $f30, $f24 -/* A0BF90 802402A0 0C00A85B */ jal sin_rad -/* A0BF94 802402A4 4600D306 */ mov.s $f12, $f26 -/* A0BF98 802402A8 4600E002 */ mul.s $f0, $f28, $f0 -/* A0BF9C 802402AC 00000000 */ nop -/* A0BFA0 802402B0 C6180028 */ lwc1 $f24, 0x28($s0) -/* A0BFA4 802402B4 4600A306 */ mov.s $f12, $f20 -/* A0BFA8 802402B8 0C00A85B */ jal sin_rad -/* A0BFAC 802402BC 4600C600 */ add.s $f24, $f24, $f0 -/* A0BFB0 802402C0 C7A40028 */ lwc1 $f4, 0x28($sp) -/* A0BFB4 802402C4 46002002 */ mul.s $f0, $f4, $f0 -/* A0BFB8 802402C8 00000000 */ nop -/* A0BFBC 802402CC 4600D306 */ mov.s $f12, $f26 -/* A0BFC0 802402D0 C61A002C */ lwc1 $f26, 0x2c($s0) -/* A0BFC4 802402D4 0C00A874 */ jal cos_rad -/* A0BFC8 802402D8 4600C600 */ add.s $f24, $f24, $f0 -/* A0BFCC 802402DC 4600E702 */ mul.s $f28, $f28, $f0 -/* A0BFD0 802402E0 00000000 */ nop -/* A0BFD4 802402E4 C6160030 */ lwc1 $f22, 0x30($s0) -/* A0BFD8 802402E8 4600A306 */ mov.s $f12, $f20 -/* A0BFDC 802402EC 0C00A874 */ jal cos_rad -/* A0BFE0 802402F0 461CB581 */ sub.s $f22, $f22, $f28 -/* A0BFE4 802402F4 C7A40028 */ lwc1 $f4, 0x28($sp) -/* A0BFE8 802402F8 46002002 */ mul.s $f0, $f4, $f0 -/* A0BFEC 802402FC 00000000 */ nop -/* A0BFF0 80240300 2404000A */ addiu $a0, $zero, 0xa -/* A0BFF4 80240304 0C00A67F */ jal rand_int -/* A0BFF8 80240308 4600B581 */ sub.s $f22, $f22, $f0 -/* A0BFFC 8024030C 0000202D */ daddu $a0, $zero, $zero -/* A0C000 80240310 2442000A */ addiu $v0, $v0, 0xa -/* A0C004 80240314 8FA50020 */ lw $a1, 0x20($sp) -/* A0C008 80240318 8FA60024 */ lw $a2, 0x24($sp) -/* A0C00C 8024031C 4407F000 */ mfc1 $a3, $f30 -/* A0C010 80240320 44820000 */ mtc1 $v0, $f0 -/* A0C014 80240324 00000000 */ nop -/* A0C018 80240328 46800020 */ cvt.s.w $f0, $f0 -/* A0C01C 8024032C E7B80010 */ swc1 $f24, 0x10($sp) -/* A0C020 80240330 E7BA0014 */ swc1 $f26, 0x14($sp) -/* A0C024 80240334 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A0C028 80240338 0C01BF8C */ jal func_8006FE30 -/* A0C02C 8024033C E7B60018 */ swc1 $f22, 0x18($sp) -/* A0C030 80240340 8FBF0034 */ lw $ra, 0x34($sp) -/* A0C034 80240344 8FB00030 */ lw $s0, 0x30($sp) -/* A0C038 80240348 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A0C03C 8024034C D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A0C040 80240350 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A0C044 80240354 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A0C048 80240358 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A0C04C 8024035C D7B40038 */ ldc1 $f20, 0x38($sp) -/* A0C050 80240360 24020002 */ addiu $v0, $zero, 2 -/* A0C054 80240364 03E00008 */ jr $ra -/* A0C058 80240368 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s new file mode 100644 index 0000000000..f88fbee737 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_80240170_A0BE60.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240170_A0BE60 +/* A0BE60 80240170 27BDFF98 */ addiu $sp, $sp, -0x68 +/* A0BE64 80240174 F7BA0050 */ sdc1 $f26, 0x50($sp) +/* A0BE68 80240178 3C01800B */ lui $at, 0x800b +/* A0BE6C 8024017C C43A1DEC */ lwc1 $f26, 0x1dec($at) +/* A0BE70 80240180 3C014334 */ lui $at, 0x4334 +/* A0BE74 80240184 44810000 */ mtc1 $at, $f0 +/* A0BE78 80240188 3C014049 */ lui $at, 0x4049 +/* A0BE7C 8024018C 34210FD8 */ ori $at, $at, 0xfd8 +/* A0BE80 80240190 44811000 */ mtc1 $at, $f2 +/* A0BE84 80240194 240401F4 */ addiu $a0, $zero, 0x1f4 +/* A0BE88 80240198 AFBF0034 */ sw $ra, 0x34($sp) +/* A0BE8C 8024019C 4600D683 */ div.s $f26, $f26, $f0 +/* A0BE90 802401A0 4602D682 */ mul.s $f26, $f26, $f2 +/* A0BE94 802401A4 00000000 */ nop +/* A0BE98 802401A8 AFB00030 */ sw $s0, 0x30($sp) +/* A0BE9C 802401AC F7B60040 */ sdc1 $f22, 0x40($sp) +/* A0BEA0 802401B0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A0BEA4 802401B4 3C018024 */ lui $at, 0x8024 +/* A0BEA8 802401B8 D4204B40 */ ldc1 $f0, 0x4b40($at) +/* A0BEAC 802401BC 4600D521 */ cvt.d.s $f20, $f26 +/* A0BEB0 802401C0 4620A580 */ add.d $f22, $f20, $f0 +/* A0BEB4 802401C4 F7BE0060 */ sdc1 $f30, 0x60($sp) +/* A0BEB8 802401C8 F7BC0058 */ sdc1 $f28, 0x58($sp) +/* A0BEBC 802401CC 4620A501 */ sub.d $f20, $f20, $f0 +/* A0BEC0 802401D0 F7B80048 */ sdc1 $f24, 0x48($sp) +/* A0BEC4 802401D4 4620B5A0 */ cvt.s.d $f22, $f22 +/* A0BEC8 802401D8 0C00A67F */ jal rand_int +/* A0BECC 802401DC 4620A520 */ cvt.s.d $f20, $f20 +/* A0BED0 802401E0 2442FF06 */ addiu $v0, $v0, -0xfa +/* A0BED4 802401E4 4482C000 */ mtc1 $v0, $f24 +/* A0BED8 802401E8 00000000 */ nop +/* A0BEDC 802401EC 4680C620 */ cvt.s.w $f24, $f24 +/* A0BEE0 802401F0 0C00A67F */ jal rand_int +/* A0BEE4 802401F4 240401F4 */ addiu $a0, $zero, 0x1f4 +/* A0BEE8 802401F8 24040064 */ addiu $a0, $zero, 0x64 +/* A0BEEC 802401FC 2442FF06 */ addiu $v0, $v0, -0xfa +/* A0BEF0 80240200 44822000 */ mtc1 $v0, $f4 +/* A0BEF4 80240204 00000000 */ nop +/* A0BEF8 80240208 46802120 */ cvt.s.w $f4, $f4 +/* A0BEFC 8024020C 0C00A67F */ jal rand_int +/* A0BF00 80240210 E7A40028 */ swc1 $f4, 0x28($sp) +/* A0BF04 80240214 24420258 */ addiu $v0, $v0, 0x258 +/* A0BF08 80240218 4482E000 */ mtc1 $v0, $f28 +/* A0BF0C 8024021C 00000000 */ nop +/* A0BF10 80240220 4680E720 */ cvt.s.w $f28, $f28 +/* A0BF14 80240224 0C00A85B */ jal sin_rad +/* A0BF18 80240228 4600D306 */ mov.s $f12, $f26 +/* A0BF1C 8024022C 4600E002 */ mul.s $f0, $f28, $f0 +/* A0BF20 80240230 00000000 */ nop +/* A0BF24 80240234 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* A0BF28 80240238 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* A0BF2C 8024023C C6020028 */ lwc1 $f2, 0x28($s0) +/* A0BF30 80240240 46001780 */ add.s $f30, $f2, $f0 +/* A0BF34 80240244 0C00A85B */ jal sin_rad +/* A0BF38 80240248 4600B306 */ mov.s $f12, $f22 +/* A0BF3C 8024024C 4600C002 */ mul.s $f0, $f24, $f0 +/* A0BF40 80240250 00000000 */ nop +/* A0BF44 80240254 C602002C */ lwc1 $f2, 0x2c($s0) +/* A0BF48 80240258 4600F780 */ add.s $f30, $f30, $f0 +/* A0BF4C 8024025C 3C014348 */ lui $at, 0x4348 +/* A0BF50 80240260 44810000 */ mtc1 $at, $f0 +/* A0BF54 80240264 00000000 */ nop +/* A0BF58 80240268 46001080 */ add.s $f2, $f2, $f0 +/* A0BF5C 8024026C 4600D306 */ mov.s $f12, $f26 +/* A0BF60 80240270 E7BE0020 */ swc1 $f30, 0x20($sp) +/* A0BF64 80240274 0C00A874 */ jal cos_rad +/* A0BF68 80240278 E7A20024 */ swc1 $f2, 0x24($sp) +/* A0BF6C 8024027C 4600E002 */ mul.s $f0, $f28, $f0 +/* A0BF70 80240280 00000000 */ nop +/* A0BF74 80240284 C61E0030 */ lwc1 $f30, 0x30($s0) +/* A0BF78 80240288 4600F781 */ sub.s $f30, $f30, $f0 +/* A0BF7C 8024028C 0C00A874 */ jal cos_rad +/* A0BF80 80240290 4600B306 */ mov.s $f12, $f22 +/* A0BF84 80240294 4600C602 */ mul.s $f24, $f24, $f0 +/* A0BF88 80240298 00000000 */ nop +/* A0BF8C 8024029C 4618F781 */ sub.s $f30, $f30, $f24 +/* A0BF90 802402A0 0C00A85B */ jal sin_rad +/* A0BF94 802402A4 4600D306 */ mov.s $f12, $f26 +/* A0BF98 802402A8 4600E002 */ mul.s $f0, $f28, $f0 +/* A0BF9C 802402AC 00000000 */ nop +/* A0BFA0 802402B0 C6180028 */ lwc1 $f24, 0x28($s0) +/* A0BFA4 802402B4 4600A306 */ mov.s $f12, $f20 +/* A0BFA8 802402B8 0C00A85B */ jal sin_rad +/* A0BFAC 802402BC 4600C600 */ add.s $f24, $f24, $f0 +/* A0BFB0 802402C0 C7A40028 */ lwc1 $f4, 0x28($sp) +/* A0BFB4 802402C4 46002002 */ mul.s $f0, $f4, $f0 +/* A0BFB8 802402C8 00000000 */ nop +/* A0BFBC 802402CC 4600D306 */ mov.s $f12, $f26 +/* A0BFC0 802402D0 C61A002C */ lwc1 $f26, 0x2c($s0) +/* A0BFC4 802402D4 0C00A874 */ jal cos_rad +/* A0BFC8 802402D8 4600C600 */ add.s $f24, $f24, $f0 +/* A0BFCC 802402DC 4600E702 */ mul.s $f28, $f28, $f0 +/* A0BFD0 802402E0 00000000 */ nop +/* A0BFD4 802402E4 C6160030 */ lwc1 $f22, 0x30($s0) +/* A0BFD8 802402E8 4600A306 */ mov.s $f12, $f20 +/* A0BFDC 802402EC 0C00A874 */ jal cos_rad +/* A0BFE0 802402F0 461CB581 */ sub.s $f22, $f22, $f28 +/* A0BFE4 802402F4 C7A40028 */ lwc1 $f4, 0x28($sp) +/* A0BFE8 802402F8 46002002 */ mul.s $f0, $f4, $f0 +/* A0BFEC 802402FC 00000000 */ nop +/* A0BFF0 80240300 2404000A */ addiu $a0, $zero, 0xa +/* A0BFF4 80240304 0C00A67F */ jal rand_int +/* A0BFF8 80240308 4600B581 */ sub.s $f22, $f22, $f0 +/* A0BFFC 8024030C 0000202D */ daddu $a0, $zero, $zero +/* A0C000 80240310 2442000A */ addiu $v0, $v0, 0xa +/* A0C004 80240314 8FA50020 */ lw $a1, 0x20($sp) +/* A0C008 80240318 8FA60024 */ lw $a2, 0x24($sp) +/* A0C00C 8024031C 4407F000 */ mfc1 $a3, $f30 +/* A0C010 80240320 44820000 */ mtc1 $v0, $f0 +/* A0C014 80240324 00000000 */ nop +/* A0C018 80240328 46800020 */ cvt.s.w $f0, $f0 +/* A0C01C 8024032C E7B80010 */ swc1 $f24, 0x10($sp) +/* A0C020 80240330 E7BA0014 */ swc1 $f26, 0x14($sp) +/* A0C024 80240334 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A0C028 80240338 0C01BF8C */ jal func_8006FE30 +/* A0C02C 8024033C E7B60018 */ swc1 $f22, 0x18($sp) +/* A0C030 80240340 8FBF0034 */ lw $ra, 0x34($sp) +/* A0C034 80240344 8FB00030 */ lw $s0, 0x30($sp) +/* A0C038 80240348 D7BE0060 */ ldc1 $f30, 0x60($sp) +/* A0C03C 8024034C D7BC0058 */ ldc1 $f28, 0x58($sp) +/* A0C040 80240350 D7BA0050 */ ldc1 $f26, 0x50($sp) +/* A0C044 80240354 D7B80048 */ ldc1 $f24, 0x48($sp) +/* A0C048 80240358 D7B60040 */ ldc1 $f22, 0x40($sp) +/* A0C04C 8024035C D7B40038 */ ldc1 $f20, 0x38($sp) +/* A0C050 80240360 24020002 */ addiu $v0, $zero, 2 +/* A0C054 80240364 03E00008 */ jr $ra +/* A0C058 80240368 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C.s deleted file mode 100644 index 322b00775a..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C.s +++ /dev/null @@ -1,139 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024036C -/* A0C05C 8024036C 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A0C060 80240370 3C01800B */ lui $at, 0x800b -/* A0C064 80240374 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A0C068 80240378 3C014334 */ lui $at, 0x4334 -/* A0C06C 8024037C 44811000 */ mtc1 $at, $f2 -/* A0C070 80240380 3C014049 */ lui $at, 0x4049 -/* A0C074 80240384 34210FD8 */ ori $at, $at, 0xfd8 -/* A0C078 80240388 44812000 */ mtc1 $at, $f4 -/* A0C07C 8024038C 2404012C */ addiu $a0, $zero, 0x12c -/* A0C080 80240390 AFBF0034 */ sw $ra, 0x34($sp) -/* A0C084 80240394 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A0C088 80240398 46020003 */ div.s $f0, $f0, $f2 -/* A0C08C 8024039C 46040782 */ mul.s $f30, $f0, $f4 -/* A0C090 802403A0 00000000 */ nop -/* A0C094 802403A4 AFB00030 */ sw $s0, 0x30($sp) -/* A0C098 802403A8 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A0C09C 802403AC F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A0C0A0 802403B0 3C018024 */ lui $at, 0x8024 -/* A0C0A4 802403B4 D4224B48 */ ldc1 $f2, 0x4b48($at) -/* A0C0A8 802403B8 4600F021 */ cvt.d.s $f0, $f30 -/* A0C0AC 802403BC 46220100 */ add.d $f4, $f0, $f2 -/* A0C0B0 802403C0 F7B80048 */ sdc1 $f24, 0x48($sp) -/* A0C0B4 802403C4 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A0C0B8 802403C8 46220001 */ sub.d $f0, $f0, $f2 -/* A0C0BC 802403CC F7B40038 */ sdc1 $f20, 0x38($sp) -/* A0C0C0 802403D0 46202120 */ cvt.s.d $f4, $f4 -/* A0C0C4 802403D4 46200020 */ cvt.s.d $f0, $f0 -/* A0C0C8 802403D8 E7A40020 */ swc1 $f4, 0x20($sp) -/* A0C0CC 802403DC 0C00A67F */ jal rand_int -/* A0C0D0 802403E0 E7A00024 */ swc1 $f0, 0x24($sp) -/* A0C0D4 802403E4 2442FF6A */ addiu $v0, $v0, -0x96 -/* A0C0D8 802403E8 4482B000 */ mtc1 $v0, $f22 -/* A0C0DC 802403EC 00000000 */ nop -/* A0C0E0 802403F0 4680B5A0 */ cvt.s.w $f22, $f22 -/* A0C0E4 802403F4 0C00A67F */ jal rand_int -/* A0C0E8 802403F8 2404012C */ addiu $a0, $zero, 0x12c -/* A0C0EC 802403FC 24040064 */ addiu $a0, $zero, 0x64 -/* A0C0F0 80240400 2442FF6A */ addiu $v0, $v0, -0x96 -/* A0C0F4 80240404 44823000 */ mtc1 $v0, $f6 -/* A0C0F8 80240408 00000000 */ nop -/* A0C0FC 8024040C 468031A0 */ cvt.s.w $f6, $f6 -/* A0C100 80240410 0C00A67F */ jal rand_int -/* A0C104 80240414 E7A60028 */ swc1 $f6, 0x28($sp) -/* A0C108 80240418 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A0C10C 8024041C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A0C110 80240420 24420032 */ addiu $v0, $v0, 0x32 -/* A0C114 80240424 C602002C */ lwc1 $f2, 0x2c($s0) -/* A0C118 80240428 3C01437A */ lui $at, 0x437a -/* A0C11C 8024042C 44810000 */ mtc1 $at, $f0 -/* A0C120 80240430 4482A000 */ mtc1 $v0, $f20 -/* A0C124 80240434 00000000 */ nop -/* A0C128 80240438 4680A520 */ cvt.s.w $f20, $f20 -/* A0C12C 8024043C 4602003E */ c.le.s $f0, $f2 -/* A0C130 80240440 00000000 */ nop -/* A0C134 80240444 45010045 */ bc1t .L8024055C -/* A0C138 80240448 24020002 */ addiu $v0, $zero, 2 -/* A0C13C 8024044C 0C00A85B */ jal sin_rad -/* A0C140 80240450 4600F306 */ mov.s $f12, $f30 -/* A0C144 80240454 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C148 80240458 00000000 */ nop -/* A0C14C 8024045C C61A0028 */ lwc1 $f26, 0x28($s0) -/* A0C150 80240460 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A0C154 80240464 0C00A85B */ jal sin_rad -/* A0C158 80240468 4600D681 */ sub.s $f26, $f26, $f0 -/* A0C15C 8024046C 4600B002 */ mul.s $f0, $f22, $f0 -/* A0C160 80240470 00000000 */ nop -/* A0C164 80240474 C61C002C */ lwc1 $f28, 0x2c($s0) -/* A0C168 80240478 4600D680 */ add.s $f26, $f26, $f0 -/* A0C16C 8024047C 3C014348 */ lui $at, 0x4348 -/* A0C170 80240480 44810000 */ mtc1 $at, $f0 -/* A0C174 80240484 00000000 */ nop -/* A0C178 80240488 4600E700 */ add.s $f28, $f28, $f0 -/* A0C17C 8024048C 0C00A874 */ jal cos_rad -/* A0C180 80240490 4600F306 */ mov.s $f12, $f30 -/* A0C184 80240494 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C188 80240498 00000000 */ nop -/* A0C18C 8024049C C6180030 */ lwc1 $f24, 0x30($s0) -/* A0C190 802404A0 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A0C194 802404A4 0C00A874 */ jal cos_rad -/* A0C198 802404A8 4600C600 */ add.s $f24, $f24, $f0 -/* A0C19C 802404AC 4600B002 */ mul.s $f0, $f22, $f0 -/* A0C1A0 802404B0 00000000 */ nop -/* A0C1A4 802404B4 4600C601 */ sub.s $f24, $f24, $f0 -/* A0C1A8 802404B8 0C00A85B */ jal sin_rad -/* A0C1AC 802404BC 4600F306 */ mov.s $f12, $f30 -/* A0C1B0 802404C0 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C1B4 802404C4 00000000 */ nop -/* A0C1B8 802404C8 C6160028 */ lwc1 $f22, 0x28($s0) -/* A0C1BC 802404CC C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A0C1C0 802404D0 0C00A85B */ jal sin_rad -/* A0C1C4 802404D4 4600B581 */ sub.s $f22, $f22, $f0 -/* A0C1C8 802404D8 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A0C1CC 802404DC 46003002 */ mul.s $f0, $f6, $f0 -/* A0C1D0 802404E0 00000000 */ nop -/* A0C1D4 802404E4 4600F306 */ mov.s $f12, $f30 -/* A0C1D8 802404E8 C61E002C */ lwc1 $f30, 0x2c($s0) -/* A0C1DC 802404EC 0C00A874 */ jal cos_rad -/* A0C1E0 802404F0 4600B580 */ add.s $f22, $f22, $f0 -/* A0C1E4 802404F4 4600A002 */ mul.s $f0, $f20, $f0 -/* A0C1E8 802404F8 00000000 */ nop -/* A0C1EC 802404FC C6140030 */ lwc1 $f20, 0x30($s0) -/* A0C1F0 80240500 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A0C1F4 80240504 0C00A874 */ jal cos_rad -/* A0C1F8 80240508 4600A500 */ add.s $f20, $f20, $f0 -/* A0C1FC 8024050C C7A60028 */ lwc1 $f6, 0x28($sp) -/* A0C200 80240510 46003002 */ mul.s $f0, $f6, $f0 -/* A0C204 80240514 00000000 */ nop -/* A0C208 80240518 2404000A */ addiu $a0, $zero, 0xa -/* A0C20C 8024051C 0C00A67F */ jal rand_int -/* A0C210 80240520 4600A501 */ sub.s $f20, $f20, $f0 -/* A0C214 80240524 24040001 */ addiu $a0, $zero, 1 -/* A0C218 80240528 2442000A */ addiu $v0, $v0, 0xa -/* A0C21C 8024052C 4405D000 */ mfc1 $a1, $f26 -/* A0C220 80240530 4406E000 */ mfc1 $a2, $f28 -/* A0C224 80240534 4407C000 */ mfc1 $a3, $f24 -/* A0C228 80240538 44820000 */ mtc1 $v0, $f0 -/* A0C22C 8024053C 00000000 */ nop -/* A0C230 80240540 46800020 */ cvt.s.w $f0, $f0 -/* A0C234 80240544 E7B60010 */ swc1 $f22, 0x10($sp) -/* A0C238 80240548 E7BE0014 */ swc1 $f30, 0x14($sp) -/* A0C23C 8024054C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A0C240 80240550 0C01BF8C */ jal func_8006FE30 -/* A0C244 80240554 E7B40018 */ swc1 $f20, 0x18($sp) -/* A0C248 80240558 24020002 */ addiu $v0, $zero, 2 -.L8024055C: -/* A0C24C 8024055C 8FBF0034 */ lw $ra, 0x34($sp) -/* A0C250 80240560 8FB00030 */ lw $s0, 0x30($sp) -/* A0C254 80240564 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A0C258 80240568 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A0C25C 8024056C D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A0C260 80240570 D7B80048 */ ldc1 $f24, 0x48($sp) -/* A0C264 80240574 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A0C268 80240578 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A0C26C 8024057C 03E00008 */ jr $ra -/* A0C270 80240580 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s new file mode 100644 index 0000000000..de6dba1494 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_00/A0BD40/func_8024036C_A0C05C.s @@ -0,0 +1,139 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024036C_A0C05C +/* A0C05C 8024036C 27BDFF98 */ addiu $sp, $sp, -0x68 +/* A0C060 80240370 3C01800B */ lui $at, 0x800b +/* A0C064 80240374 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* A0C068 80240378 3C014334 */ lui $at, 0x4334 +/* A0C06C 8024037C 44811000 */ mtc1 $at, $f2 +/* A0C070 80240380 3C014049 */ lui $at, 0x4049 +/* A0C074 80240384 34210FD8 */ ori $at, $at, 0xfd8 +/* A0C078 80240388 44812000 */ mtc1 $at, $f4 +/* A0C07C 8024038C 2404012C */ addiu $a0, $zero, 0x12c +/* A0C080 80240390 AFBF0034 */ sw $ra, 0x34($sp) +/* A0C084 80240394 F7BE0060 */ sdc1 $f30, 0x60($sp) +/* A0C088 80240398 46020003 */ div.s $f0, $f0, $f2 +/* A0C08C 8024039C 46040782 */ mul.s $f30, $f0, $f4 +/* A0C090 802403A0 00000000 */ nop +/* A0C094 802403A4 AFB00030 */ sw $s0, 0x30($sp) +/* A0C098 802403A8 F7BC0058 */ sdc1 $f28, 0x58($sp) +/* A0C09C 802403AC F7BA0050 */ sdc1 $f26, 0x50($sp) +/* A0C0A0 802403B0 3C018024 */ lui $at, 0x8024 +/* A0C0A4 802403B4 D4224B48 */ ldc1 $f2, 0x4b48($at) +/* A0C0A8 802403B8 4600F021 */ cvt.d.s $f0, $f30 +/* A0C0AC 802403BC 46220100 */ add.d $f4, $f0, $f2 +/* A0C0B0 802403C0 F7B80048 */ sdc1 $f24, 0x48($sp) +/* A0C0B4 802403C4 F7B60040 */ sdc1 $f22, 0x40($sp) +/* A0C0B8 802403C8 46220001 */ sub.d $f0, $f0, $f2 +/* A0C0BC 802403CC F7B40038 */ sdc1 $f20, 0x38($sp) +/* A0C0C0 802403D0 46202120 */ cvt.s.d $f4, $f4 +/* A0C0C4 802403D4 46200020 */ cvt.s.d $f0, $f0 +/* A0C0C8 802403D8 E7A40020 */ swc1 $f4, 0x20($sp) +/* A0C0CC 802403DC 0C00A67F */ jal rand_int +/* A0C0D0 802403E0 E7A00024 */ swc1 $f0, 0x24($sp) +/* A0C0D4 802403E4 2442FF6A */ addiu $v0, $v0, -0x96 +/* A0C0D8 802403E8 4482B000 */ mtc1 $v0, $f22 +/* A0C0DC 802403EC 00000000 */ nop +/* A0C0E0 802403F0 4680B5A0 */ cvt.s.w $f22, $f22 +/* A0C0E4 802403F4 0C00A67F */ jal rand_int +/* A0C0E8 802403F8 2404012C */ addiu $a0, $zero, 0x12c +/* A0C0EC 802403FC 24040064 */ addiu $a0, $zero, 0x64 +/* A0C0F0 80240400 2442FF6A */ addiu $v0, $v0, -0x96 +/* A0C0F4 80240404 44823000 */ mtc1 $v0, $f6 +/* A0C0F8 80240408 00000000 */ nop +/* A0C0FC 8024040C 468031A0 */ cvt.s.w $f6, $f6 +/* A0C100 80240410 0C00A67F */ jal rand_int +/* A0C104 80240414 E7A60028 */ swc1 $f6, 0x28($sp) +/* A0C108 80240418 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* A0C10C 8024041C 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* A0C110 80240420 24420032 */ addiu $v0, $v0, 0x32 +/* A0C114 80240424 C602002C */ lwc1 $f2, 0x2c($s0) +/* A0C118 80240428 3C01437A */ lui $at, 0x437a +/* A0C11C 8024042C 44810000 */ mtc1 $at, $f0 +/* A0C120 80240430 4482A000 */ mtc1 $v0, $f20 +/* A0C124 80240434 00000000 */ nop +/* A0C128 80240438 4680A520 */ cvt.s.w $f20, $f20 +/* A0C12C 8024043C 4602003E */ c.le.s $f0, $f2 +/* A0C130 80240440 00000000 */ nop +/* A0C134 80240444 45010045 */ bc1t .L8024055C +/* A0C138 80240448 24020002 */ addiu $v0, $zero, 2 +/* A0C13C 8024044C 0C00A85B */ jal sin_rad +/* A0C140 80240450 4600F306 */ mov.s $f12, $f30 +/* A0C144 80240454 4600A002 */ mul.s $f0, $f20, $f0 +/* A0C148 80240458 00000000 */ nop +/* A0C14C 8024045C C61A0028 */ lwc1 $f26, 0x28($s0) +/* A0C150 80240460 C7AC0020 */ lwc1 $f12, 0x20($sp) +/* A0C154 80240464 0C00A85B */ jal sin_rad +/* A0C158 80240468 4600D681 */ sub.s $f26, $f26, $f0 +/* A0C15C 8024046C 4600B002 */ mul.s $f0, $f22, $f0 +/* A0C160 80240470 00000000 */ nop +/* A0C164 80240474 C61C002C */ lwc1 $f28, 0x2c($s0) +/* A0C168 80240478 4600D680 */ add.s $f26, $f26, $f0 +/* A0C16C 8024047C 3C014348 */ lui $at, 0x4348 +/* A0C170 80240480 44810000 */ mtc1 $at, $f0 +/* A0C174 80240484 00000000 */ nop +/* A0C178 80240488 4600E700 */ add.s $f28, $f28, $f0 +/* A0C17C 8024048C 0C00A874 */ jal cos_rad +/* A0C180 80240490 4600F306 */ mov.s $f12, $f30 +/* A0C184 80240494 4600A002 */ mul.s $f0, $f20, $f0 +/* A0C188 80240498 00000000 */ nop +/* A0C18C 8024049C C6180030 */ lwc1 $f24, 0x30($s0) +/* A0C190 802404A0 C7AC0020 */ lwc1 $f12, 0x20($sp) +/* A0C194 802404A4 0C00A874 */ jal cos_rad +/* A0C198 802404A8 4600C600 */ add.s $f24, $f24, $f0 +/* A0C19C 802404AC 4600B002 */ mul.s $f0, $f22, $f0 +/* A0C1A0 802404B0 00000000 */ nop +/* A0C1A4 802404B4 4600C601 */ sub.s $f24, $f24, $f0 +/* A0C1A8 802404B8 0C00A85B */ jal sin_rad +/* A0C1AC 802404BC 4600F306 */ mov.s $f12, $f30 +/* A0C1B0 802404C0 4600A002 */ mul.s $f0, $f20, $f0 +/* A0C1B4 802404C4 00000000 */ nop +/* A0C1B8 802404C8 C6160028 */ lwc1 $f22, 0x28($s0) +/* A0C1BC 802404CC C7AC0024 */ lwc1 $f12, 0x24($sp) +/* A0C1C0 802404D0 0C00A85B */ jal sin_rad +/* A0C1C4 802404D4 4600B581 */ sub.s $f22, $f22, $f0 +/* A0C1C8 802404D8 C7A60028 */ lwc1 $f6, 0x28($sp) +/* A0C1CC 802404DC 46003002 */ mul.s $f0, $f6, $f0 +/* A0C1D0 802404E0 00000000 */ nop +/* A0C1D4 802404E4 4600F306 */ mov.s $f12, $f30 +/* A0C1D8 802404E8 C61E002C */ lwc1 $f30, 0x2c($s0) +/* A0C1DC 802404EC 0C00A874 */ jal cos_rad +/* A0C1E0 802404F0 4600B580 */ add.s $f22, $f22, $f0 +/* A0C1E4 802404F4 4600A002 */ mul.s $f0, $f20, $f0 +/* A0C1E8 802404F8 00000000 */ nop +/* A0C1EC 802404FC C6140030 */ lwc1 $f20, 0x30($s0) +/* A0C1F0 80240500 C7AC0024 */ lwc1 $f12, 0x24($sp) +/* A0C1F4 80240504 0C00A874 */ jal cos_rad +/* A0C1F8 80240508 4600A500 */ add.s $f20, $f20, $f0 +/* A0C1FC 8024050C C7A60028 */ lwc1 $f6, 0x28($sp) +/* A0C200 80240510 46003002 */ mul.s $f0, $f6, $f0 +/* A0C204 80240514 00000000 */ nop +/* A0C208 80240518 2404000A */ addiu $a0, $zero, 0xa +/* A0C20C 8024051C 0C00A67F */ jal rand_int +/* A0C210 80240520 4600A501 */ sub.s $f20, $f20, $f0 +/* A0C214 80240524 24040001 */ addiu $a0, $zero, 1 +/* A0C218 80240528 2442000A */ addiu $v0, $v0, 0xa +/* A0C21C 8024052C 4405D000 */ mfc1 $a1, $f26 +/* A0C220 80240530 4406E000 */ mfc1 $a2, $f28 +/* A0C224 80240534 4407C000 */ mfc1 $a3, $f24 +/* A0C228 80240538 44820000 */ mtc1 $v0, $f0 +/* A0C22C 8024053C 00000000 */ nop +/* A0C230 80240540 46800020 */ cvt.s.w $f0, $f0 +/* A0C234 80240544 E7B60010 */ swc1 $f22, 0x10($sp) +/* A0C238 80240548 E7BE0014 */ swc1 $f30, 0x14($sp) +/* A0C23C 8024054C E7A0001C */ swc1 $f0, 0x1c($sp) +/* A0C240 80240550 0C01BF8C */ jal func_8006FE30 +/* A0C244 80240554 E7B40018 */ swc1 $f20, 0x18($sp) +/* A0C248 80240558 24020002 */ addiu $v0, $zero, 2 +.L8024055C: +/* A0C24C 8024055C 8FBF0034 */ lw $ra, 0x34($sp) +/* A0C250 80240560 8FB00030 */ lw $s0, 0x30($sp) +/* A0C254 80240564 D7BE0060 */ ldc1 $f30, 0x60($sp) +/* A0C258 80240568 D7BC0058 */ ldc1 $f28, 0x58($sp) +/* A0C25C 8024056C D7BA0050 */ ldc1 $f26, 0x50($sp) +/* A0C260 80240570 D7B80048 */ ldc1 $f24, 0x48($sp) +/* A0C264 80240574 D7B60040 */ ldc1 $f22, 0x40($sp) +/* A0C268 80240578 D7B40038 */ ldc1 $f20, 0x38($sp) +/* A0C26C 8024057C 03E00008 */ jr $ra +/* A0C270 80240580 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54.s deleted file mode 100644 index c795ab4c5b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A54 -/* A0C744 80240A54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A0C748 80240A58 AFB10014 */ sw $s1, 0x14($sp) -/* A0C74C 80240A5C 0080882D */ daddu $s1, $a0, $zero -/* A0C750 80240A60 24040001 */ addiu $a0, $zero, 1 -/* A0C754 80240A64 AFBF0018 */ sw $ra, 0x18($sp) -/* A0C758 80240A68 0C00EABB */ jal get_npc_unsafe -/* A0C75C 80240A6C AFB00010 */ sw $s0, 0x10($sp) -/* A0C760 80240A70 0040802D */ daddu $s0, $v0, $zero -/* A0C764 80240A74 C602000C */ lwc1 $f2, 0xc($s0) -/* A0C768 80240A78 3C014334 */ lui $at, 0x4334 -/* A0C76C 80240A7C 44810000 */ mtc1 $at, $f0 -/* A0C770 80240A80 00000000 */ nop -/* A0C774 80240A84 4600103C */ c.lt.s $f2, $f0 -/* A0C778 80240A88 00000000 */ nop -/* A0C77C 80240A8C 45000006 */ bc1f .L80240AA8 -/* A0C780 80240A90 00000000 */ nop -/* A0C784 80240A94 C6000038 */ lwc1 $f0, 0x38($s0) -/* A0C788 80240A98 3C014220 */ lui $at, 0x4220 -/* A0C78C 80240A9C 44811000 */ mtc1 $at, $f2 -/* A0C790 80240AA0 080902AF */ j .L80240ABC -/* A0C794 80240AA4 46020001 */ sub.s $f0, $f0, $f2 -.L80240AA8: -/* A0C798 80240AA8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A0C79C 80240AAC 3C014220 */ lui $at, 0x4220 -/* A0C7A0 80240AB0 44811000 */ mtc1 $at, $f2 -/* A0C7A4 80240AB4 00000000 */ nop -/* A0C7A8 80240AB8 46020000 */ add.s $f0, $f0, $f2 -.L80240ABC: -/* A0C7AC 80240ABC 3C014120 */ lui $at, 0x4120 -/* A0C7B0 80240AC0 44811000 */ mtc1 $at, $f2 -/* A0C7B4 80240AC4 4600010D */ trunc.w.s $f4, $f0 -/* A0C7B8 80240AC8 E6240084 */ swc1 $f4, 0x84($s1) -/* A0C7BC 80240ACC C600003C */ lwc1 $f0, 0x3c($s0) -/* A0C7C0 80240AD0 46020000 */ add.s $f0, $f0, $f2 -/* A0C7C4 80240AD4 4600010D */ trunc.w.s $f4, $f0 -/* A0C7C8 80240AD8 E6240088 */ swc1 $f4, 0x88($s1) -/* A0C7CC 80240ADC C6000040 */ lwc1 $f0, 0x40($s0) -/* A0C7D0 80240AE0 4600010D */ trunc.w.s $f4, $f0 -/* A0C7D4 80240AE4 E624008C */ swc1 $f4, 0x8c($s1) -/* A0C7D8 80240AE8 C62C009C */ lwc1 $f12, 0x9c($s1) -/* A0C7DC 80240AEC 46806320 */ cvt.s.w $f12, $f12 -/* A0C7E0 80240AF0 8E060038 */ lw $a2, 0x38($s0) -/* A0C7E4 80240AF4 8E070040 */ lw $a3, 0x40($s0) -/* A0C7E8 80240AF8 C62E00A4 */ lwc1 $f14, 0xa4($s1) -/* A0C7EC 80240AFC 0C00A720 */ jal atan2 -/* A0C7F0 80240B00 468073A0 */ cvt.s.w $f14, $f14 -/* A0C7F4 80240B04 E600000C */ swc1 $f0, 0xc($s0) -/* A0C7F8 80240B08 8FBF0018 */ lw $ra, 0x18($sp) -/* A0C7FC 80240B0C 8FB10014 */ lw $s1, 0x14($sp) -/* A0C800 80240B10 8FB00010 */ lw $s0, 0x10($sp) -/* A0C804 80240B14 24020002 */ addiu $v0, $zero, 2 -/* A0C808 80240B18 03E00008 */ jr $ra -/* A0C80C 80240B1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54_A0C744.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54_A0C744.s new file mode 100644 index 0000000000..88f8d18054 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240A54_A0C744.s @@ -0,0 +1,57 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A54_A0C744 +/* A0C744 80240A54 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A0C748 80240A58 AFB10014 */ sw $s1, 0x14($sp) +/* A0C74C 80240A5C 0080882D */ daddu $s1, $a0, $zero +/* A0C750 80240A60 24040001 */ addiu $a0, $zero, 1 +/* A0C754 80240A64 AFBF0018 */ sw $ra, 0x18($sp) +/* A0C758 80240A68 0C00EABB */ jal get_npc_unsafe +/* A0C75C 80240A6C AFB00010 */ sw $s0, 0x10($sp) +/* A0C760 80240A70 0040802D */ daddu $s0, $v0, $zero +/* A0C764 80240A74 C602000C */ lwc1 $f2, 0xc($s0) +/* A0C768 80240A78 3C014334 */ lui $at, 0x4334 +/* A0C76C 80240A7C 44810000 */ mtc1 $at, $f0 +/* A0C770 80240A80 00000000 */ nop +/* A0C774 80240A84 4600103C */ c.lt.s $f2, $f0 +/* A0C778 80240A88 00000000 */ nop +/* A0C77C 80240A8C 45000006 */ bc1f .L80240AA8 +/* A0C780 80240A90 00000000 */ nop +/* A0C784 80240A94 C6000038 */ lwc1 $f0, 0x38($s0) +/* A0C788 80240A98 3C014220 */ lui $at, 0x4220 +/* A0C78C 80240A9C 44811000 */ mtc1 $at, $f2 +/* A0C790 80240AA0 080902AF */ j .L80240ABC +/* A0C794 80240AA4 46020001 */ sub.s $f0, $f0, $f2 +.L80240AA8: +/* A0C798 80240AA8 C6000038 */ lwc1 $f0, 0x38($s0) +/* A0C79C 80240AAC 3C014220 */ lui $at, 0x4220 +/* A0C7A0 80240AB0 44811000 */ mtc1 $at, $f2 +/* A0C7A4 80240AB4 00000000 */ nop +/* A0C7A8 80240AB8 46020000 */ add.s $f0, $f0, $f2 +.L80240ABC: +/* A0C7AC 80240ABC 3C014120 */ lui $at, 0x4120 +/* A0C7B0 80240AC0 44811000 */ mtc1 $at, $f2 +/* A0C7B4 80240AC4 4600010D */ trunc.w.s $f4, $f0 +/* A0C7B8 80240AC8 E6240084 */ swc1 $f4, 0x84($s1) +/* A0C7BC 80240ACC C600003C */ lwc1 $f0, 0x3c($s0) +/* A0C7C0 80240AD0 46020000 */ add.s $f0, $f0, $f2 +/* A0C7C4 80240AD4 4600010D */ trunc.w.s $f4, $f0 +/* A0C7C8 80240AD8 E6240088 */ swc1 $f4, 0x88($s1) +/* A0C7CC 80240ADC C6000040 */ lwc1 $f0, 0x40($s0) +/* A0C7D0 80240AE0 4600010D */ trunc.w.s $f4, $f0 +/* A0C7D4 80240AE4 E624008C */ swc1 $f4, 0x8c($s1) +/* A0C7D8 80240AE8 C62C009C */ lwc1 $f12, 0x9c($s1) +/* A0C7DC 80240AEC 46806320 */ cvt.s.w $f12, $f12 +/* A0C7E0 80240AF0 8E060038 */ lw $a2, 0x38($s0) +/* A0C7E4 80240AF4 8E070040 */ lw $a3, 0x40($s0) +/* A0C7E8 80240AF8 C62E00A4 */ lwc1 $f14, 0xa4($s1) +/* A0C7EC 80240AFC 0C00A720 */ jal atan2 +/* A0C7F0 80240B00 468073A0 */ cvt.s.w $f14, $f14 +/* A0C7F4 80240B04 E600000C */ swc1 $f0, 0xc($s0) +/* A0C7F8 80240B08 8FBF0018 */ lw $ra, 0x18($sp) +/* A0C7FC 80240B0C 8FB10014 */ lw $s1, 0x14($sp) +/* A0C800 80240B10 8FB00010 */ lw $s0, 0x10($sp) +/* A0C804 80240B14 24020002 */ addiu $v0, $zero, 2 +/* A0C808 80240B18 03E00008 */ jr $ra +/* A0C80C 80240B1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40.s b/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40.s deleted file mode 100644 index 23aa1867fe..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C40 -/* A0C930 80240C40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A0C934 80240C44 240201F4 */ addiu $v0, $zero, 0x1f4 -/* A0C938 80240C48 0000202D */ daddu $a0, $zero, $zero -/* A0C93C 80240C4C 0000282D */ daddu $a1, $zero, $zero -/* A0C940 80240C50 3C018011 */ lui $at, 0x8011 -/* A0C944 80240C54 C420EFF0 */ lwc1 $f0, -0x1010($at) -/* A0C948 80240C58 3C014348 */ lui $at, 0x4348 -/* A0C94C 80240C5C 44811000 */ mtc1 $at, $f2 -/* A0C950 80240C60 3C064358 */ lui $a2, 0x4358 -/* A0C954 80240C64 46020001 */ sub.s $f0, $f0, $f2 -/* A0C958 80240C68 AFBF0018 */ sw $ra, 0x18($sp) -/* A0C95C 80240C6C 4600010D */ trunc.w.s $f4, $f0 -/* A0C960 80240C70 44072000 */ mfc1 $a3, $f4 -/* A0C964 80240C74 0C00A8ED */ jal update_lerp -/* 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 -/* A0C978 80240C88 05020001 */ bltzl $t0, .L80240C90 -/* A0C97C 80240C8C 0000402D */ daddu $t0, $zero, $zero -.L80240C90: -/* A0C980 80240C90 290200D9 */ slti $v0, $t0, 0xd9 -/* A0C984 80240C94 50400001 */ beql $v0, $zero, .L80240C9C -/* A0C988 80240C98 240800D8 */ addiu $t0, $zero, 0xd8 -.L80240C9C: -/* A0C98C 80240C9C 3C05E300 */ lui $a1, 0xe300 -/* A0C990 80240CA0 34A50A01 */ ori $a1, $a1, 0xa01 -/* A0C994 80240CA4 3C07FCFF */ lui $a3, 0xfcff -/* A0C998 80240CA8 34E7C7FF */ ori $a3, $a3, 0xc7ff -/* A0C99C 80240CAC 3C06FF8E */ lui $a2, 0xff8e -/* A0C9A0 80240CB0 3C04800A */ lui $a0, 0x800a -/* A0C9A4 80240CB4 2484A66C */ addiu $a0, $a0, -0x5994 -/* A0C9A8 80240CB8 8C820000 */ lw $v0, ($a0) -/* A0C9AC 80240CBC 34C67F3F */ ori $a2, $a2, 0x7f3f -/* A0C9B0 80240CC0 0040182D */ daddu $v1, $v0, $zero -/* A0C9B4 80240CC4 24420008 */ addiu $v0, $v0, 8 -/* A0C9B8 80240CC8 AC820000 */ sw $v0, ($a0) -/* A0C9BC 80240CCC AC650000 */ sw $a1, ($v1) -/* A0C9C0 80240CD0 AC600004 */ sw $zero, 4($v1) -/* A0C9C4 80240CD4 24430008 */ addiu $v1, $v0, 8 -/* A0C9C8 80240CD8 AC830000 */ sw $v1, ($a0) -/* A0C9CC 80240CDC 24430010 */ addiu $v1, $v0, 0x10 -/* A0C9D0 80240CE0 AC470000 */ sw $a3, ($v0) -/* A0C9D4 80240CE4 AC460004 */ sw $a2, 4($v0) -/* A0C9D8 80240CE8 AC830000 */ sw $v1, ($a0) -/* A0C9DC 80240CEC 3C03FA00 */ lui $v1, 0xfa00 -/* A0C9E0 80240CF0 AC430008 */ sw $v1, 8($v0) -/* A0C9E4 80240CF4 310300FF */ andi $v1, $t0, 0xff -/* A0C9E8 80240CF8 AC43000C */ sw $v1, 0xc($v0) -/* 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 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 new file mode 100644 index 0000000000..a64fc45b3c --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C930/func_80240C40_A0C930.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C40_A0C930 +/* A0C930 80240C40 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A0C934 80240C44 240201F4 */ addiu $v0, $zero, 0x1f4 +/* A0C938 80240C48 0000202D */ daddu $a0, $zero, $zero +/* A0C93C 80240C4C 0000282D */ daddu $a1, $zero, $zero +/* A0C940 80240C50 3C018011 */ lui $at, 0x8011 +/* A0C944 80240C54 C420EFF0 */ lwc1 $f0, -0x1010($at) +/* A0C948 80240C58 3C014348 */ lui $at, 0x4348 +/* A0C94C 80240C5C 44811000 */ mtc1 $at, $f2 +/* A0C950 80240C60 3C064358 */ lui $a2, 0x4358 +/* A0C954 80240C64 46020001 */ sub.s $f0, $f0, $f2 +/* A0C958 80240C68 AFBF0018 */ sw $ra, 0x18($sp) +/* A0C95C 80240C6C 4600010D */ trunc.w.s $f4, $f0 +/* A0C960 80240C70 44072000 */ mfc1 $a3, $f4 +/* A0C964 80240C74 0C00A8ED */ jal update_lerp +/* 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 +/* A0C978 80240C88 05020001 */ bltzl $t0, .L80240C90 +/* A0C97C 80240C8C 0000402D */ daddu $t0, $zero, $zero +.L80240C90: +/* A0C980 80240C90 290200D9 */ slti $v0, $t0, 0xd9 +/* A0C984 80240C94 50400001 */ beql $v0, $zero, .L80240C9C +/* A0C988 80240C98 240800D8 */ addiu $t0, $zero, 0xd8 +.L80240C9C: +/* A0C98C 80240C9C 3C05E300 */ lui $a1, 0xe300 +/* A0C990 80240CA0 34A50A01 */ ori $a1, $a1, 0xa01 +/* A0C994 80240CA4 3C07FCFF */ lui $a3, 0xfcff +/* A0C998 80240CA8 34E7C7FF */ ori $a3, $a3, 0xc7ff +/* A0C99C 80240CAC 3C06FF8E */ lui $a2, 0xff8e +/* A0C9A0 80240CB0 3C04800A */ lui $a0, 0x800a +/* A0C9A4 80240CB4 2484A66C */ addiu $a0, $a0, -0x5994 +/* A0C9A8 80240CB8 8C820000 */ lw $v0, ($a0) +/* A0C9AC 80240CBC 34C67F3F */ ori $a2, $a2, 0x7f3f +/* A0C9B0 80240CC0 0040182D */ daddu $v1, $v0, $zero +/* A0C9B4 80240CC4 24420008 */ addiu $v0, $v0, 8 +/* A0C9B8 80240CC8 AC820000 */ sw $v0, ($a0) +/* A0C9BC 80240CCC AC650000 */ sw $a1, ($v1) +/* A0C9C0 80240CD0 AC600004 */ sw $zero, 4($v1) +/* A0C9C4 80240CD4 24430008 */ addiu $v1, $v0, 8 +/* A0C9C8 80240CD8 AC830000 */ sw $v1, ($a0) +/* A0C9CC 80240CDC 24430010 */ addiu $v1, $v0, 0x10 +/* A0C9D0 80240CE0 AC470000 */ sw $a3, ($v0) +/* A0C9D4 80240CE4 AC460004 */ sw $a2, 4($v0) +/* A0C9D8 80240CE8 AC830000 */ sw $v1, ($a0) +/* A0C9DC 80240CEC 3C03FA00 */ lui $v1, 0xfa00 +/* A0C9E0 80240CF0 AC430008 */ sw $v1, 8($v0) +/* A0C9E4 80240CF4 310300FF */ andi $v1, $t0, 0xff +/* A0C9E8 80240CF8 AC43000C */ sw $v1, 0xc($v0) +/* 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 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534.s b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534.s deleted file mode 100644 index 96e777ec9e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240534 -/* A10DB4 80240534 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A10DB8 80240538 AFB10034 */ sw $s1, 0x34($sp) -/* A10DBC 8024053C 0080882D */ daddu $s1, $a0, $zero -/* A10DC0 80240540 3C01800B */ lui $at, 0x800b -/* A10DC4 80240544 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A10DC8 80240548 3C014334 */ lui $at, 0x4334 -/* A10DCC 8024054C 44811000 */ mtc1 $at, $f2 -/* A10DD0 80240550 3C014049 */ lui $at, 0x4049 -/* A10DD4 80240554 34210FD8 */ ori $at, $at, 0xfd8 -/* A10DD8 80240558 44812000 */ mtc1 $at, $f4 -/* A10DDC 8024055C 24040096 */ addiu $a0, $zero, 0x96 -/* A10DE0 80240560 AFBF0038 */ sw $ra, 0x38($sp) -/* A10DE4 80240564 F7BE0068 */ sdc1 $f30, 0x68($sp) -/* A10DE8 80240568 46020003 */ div.s $f0, $f0, $f2 -/* A10DEC 8024056C 46040782 */ mul.s $f30, $f0, $f4 -/* A10DF0 80240570 00000000 */ nop -/* A10DF4 80240574 AFB00030 */ sw $s0, 0x30($sp) -/* A10DF8 80240578 F7BC0060 */ sdc1 $f28, 0x60($sp) -/* A10DFC 8024057C F7BA0058 */ sdc1 $f26, 0x58($sp) -/* A10E00 80240580 3C018024 */ lui $at, 0x8024 -/* A10E04 80240584 D4225980 */ ldc1 $f2, 0x5980($at) -/* A10E08 80240588 4600F021 */ cvt.d.s $f0, $f30 -/* A10E0C 8024058C 46220100 */ add.d $f4, $f0, $f2 -/* A10E10 80240590 F7B80050 */ sdc1 $f24, 0x50($sp) -/* A10E14 80240594 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A10E18 80240598 46220001 */ sub.d $f0, $f0, $f2 -/* A10E1C 8024059C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A10E20 802405A0 46202120 */ cvt.s.d $f4, $f4 -/* A10E24 802405A4 46200020 */ cvt.s.d $f0, $f0 -/* A10E28 802405A8 E7A40020 */ swc1 $f4, 0x20($sp) -/* A10E2C 802405AC 0C00A67F */ jal rand_int -/* A10E30 802405B0 E7A00024 */ swc1 $f0, 0x24($sp) -/* A10E34 802405B4 24040096 */ addiu $a0, $zero, 0x96 -/* A10E38 802405B8 44823000 */ mtc1 $v0, $f6 -/* A10E3C 802405BC 00000000 */ nop -/* A10E40 802405C0 468031A0 */ cvt.s.w $f6, $f6 -/* A10E44 802405C4 0C00A67F */ jal rand_int -/* A10E48 802405C8 E7A60028 */ swc1 $f6, 0x28($sp) -/* A10E4C 802405CC 24040064 */ addiu $a0, $zero, 0x64 -/* A10E50 802405D0 44823000 */ mtc1 $v0, $f6 -/* A10E54 802405D4 00000000 */ nop -/* A10E58 802405D8 468031A0 */ cvt.s.w $f6, $f6 -/* A10E5C 802405DC 0C00A67F */ jal rand_int -/* A10E60 802405E0 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A10E64 802405E4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A10E68 802405E8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A10E6C 802405EC 2442FFCE */ addiu $v0, $v0, -0x32 -/* A10E70 802405F0 C6000030 */ lwc1 $f0, 0x30($s0) -/* A10E74 802405F4 3C014348 */ lui $at, 0x4348 -/* A10E78 802405F8 4481B000 */ mtc1 $at, $f22 -/* A10E7C 802405FC 4482A000 */ mtc1 $v0, $f20 -/* A10E80 80240600 00000000 */ nop -/* A10E84 80240604 4680A520 */ cvt.s.w $f20, $f20 -/* A10E88 80240608 4616003C */ c.lt.s $f0, $f22 -/* A10E8C 8024060C 00000000 */ nop -/* A10E90 80240610 4501004A */ bc1t .L8024073C -/* A10E94 80240614 24020002 */ addiu $v0, $zero, 2 -/* A10E98 80240618 0C00A85B */ jal sin_rad -/* A10E9C 8024061C 4600F306 */ mov.s $f12, $f30 -/* A10EA0 80240620 4600A002 */ mul.s $f0, $f20, $f0 -/* A10EA4 80240624 00000000 */ nop -/* A10EA8 80240628 C61A0028 */ lwc1 $f26, 0x28($s0) -/* A10EAC 8024062C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A10EB0 80240630 0C00A85B */ jal sin_rad -/* A10EB4 80240634 4600D681 */ sub.s $f26, $f26, $f0 -/* A10EB8 80240638 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A10EBC 8024063C 46003002 */ mul.s $f0, $f6, $f0 -/* A10EC0 80240640 00000000 */ nop -/* A10EC4 80240644 C61C002C */ lwc1 $f28, 0x2c($s0) -/* A10EC8 80240648 4616E700 */ add.s $f28, $f28, $f22 -/* A10ECC 8024064C 4600D680 */ add.s $f26, $f26, $f0 -/* A10ED0 80240650 0C00A874 */ jal cos_rad -/* A10ED4 80240654 4600F306 */ mov.s $f12, $f30 -/* A10ED8 80240658 4600A002 */ mul.s $f0, $f20, $f0 -/* A10EDC 8024065C 00000000 */ nop -/* A10EE0 80240660 C6180030 */ lwc1 $f24, 0x30($s0) -/* A10EE4 80240664 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* A10EE8 80240668 0C00A874 */ jal cos_rad -/* A10EEC 8024066C 4600C600 */ add.s $f24, $f24, $f0 -/* A10EF0 80240670 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A10EF4 80240674 46003002 */ mul.s $f0, $f6, $f0 -/* A10EF8 80240678 00000000 */ nop -/* A10EFC 8024067C 4600C601 */ sub.s $f24, $f24, $f0 -/* A10F00 80240680 4600D18D */ trunc.w.s $f6, $f26 -/* A10F04 80240684 E6260088 */ swc1 $f6, 0x88($s1) -/* A10F08 80240688 4600E18D */ trunc.w.s $f6, $f28 -/* A10F0C 8024068C E626008C */ swc1 $f6, 0x8c($s1) -/* A10F10 80240690 4600C18D */ trunc.w.s $f6, $f24 -/* A10F14 80240694 E6260090 */ swc1 $f6, 0x90($s1) -/* A10F18 80240698 0C00A85B */ jal sin_rad -/* A10F1C 8024069C 4600F306 */ mov.s $f12, $f30 -/* A10F20 802406A0 4600A002 */ mul.s $f0, $f20, $f0 -/* A10F24 802406A4 00000000 */ nop -/* A10F28 802406A8 C6160028 */ lwc1 $f22, 0x28($s0) -/* A10F2C 802406AC C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A10F30 802406B0 0C00A85B */ jal sin_rad -/* A10F34 802406B4 4600B581 */ sub.s $f22, $f22, $f0 -/* A10F38 802406B8 C7A6002C */ lwc1 $f6, 0x2c($sp) -/* A10F3C 802406BC 46003002 */ mul.s $f0, $f6, $f0 -/* A10F40 802406C0 00000000 */ nop -/* A10F44 802406C4 4600F306 */ mov.s $f12, $f30 -/* A10F48 802406C8 C61E002C */ lwc1 $f30, 0x2c($s0) -/* A10F4C 802406CC 0C00A874 */ jal cos_rad -/* A10F50 802406D0 4600B580 */ add.s $f22, $f22, $f0 -/* A10F54 802406D4 4600A002 */ mul.s $f0, $f20, $f0 -/* A10F58 802406D8 00000000 */ nop -/* A10F5C 802406DC C6140030 */ lwc1 $f20, 0x30($s0) -/* A10F60 802406E0 C7AC0024 */ lwc1 $f12, 0x24($sp) -/* A10F64 802406E4 0C00A874 */ jal cos_rad -/* A10F68 802406E8 4600A500 */ add.s $f20, $f20, $f0 -/* A10F6C 802406EC C7A6002C */ lwc1 $f6, 0x2c($sp) -/* A10F70 802406F0 46003002 */ mul.s $f0, $f6, $f0 -/* A10F74 802406F4 00000000 */ nop -/* A10F78 802406F8 24040004 */ addiu $a0, $zero, 4 -/* A10F7C 802406FC 0C00A67F */ jal rand_int -/* A10F80 80240700 4600A501 */ sub.s $f20, $f20, $f0 -/* A10F84 80240704 24040002 */ addiu $a0, $zero, 2 -/* A10F88 80240708 2442000A */ addiu $v0, $v0, 0xa -/* A10F8C 8024070C 4405D000 */ mfc1 $a1, $f26 -/* A10F90 80240710 4406E000 */ mfc1 $a2, $f28 -/* A10F94 80240714 4407C000 */ mfc1 $a3, $f24 -/* A10F98 80240718 44820000 */ mtc1 $v0, $f0 -/* A10F9C 8024071C 00000000 */ nop -/* A10FA0 80240720 46800020 */ cvt.s.w $f0, $f0 -/* A10FA4 80240724 E7B60010 */ swc1 $f22, 0x10($sp) -/* A10FA8 80240728 E7BE0014 */ swc1 $f30, 0x14($sp) -/* A10FAC 8024072C E7A0001C */ swc1 $f0, 0x1c($sp) -/* A10FB0 80240730 0C01BF8C */ jal func_8006FE30 -/* A10FB4 80240734 E7B40018 */ swc1 $f20, 0x18($sp) -/* A10FB8 80240738 24020002 */ addiu $v0, $zero, 2 -.L8024073C: -/* A10FBC 8024073C 8FBF0038 */ lw $ra, 0x38($sp) -/* A10FC0 80240740 8FB10034 */ lw $s1, 0x34($sp) -/* A10FC4 80240744 8FB00030 */ lw $s0, 0x30($sp) -/* A10FC8 80240748 D7BE0068 */ ldc1 $f30, 0x68($sp) -/* A10FCC 8024074C D7BC0060 */ ldc1 $f28, 0x60($sp) -/* A10FD0 80240750 D7BA0058 */ ldc1 $f26, 0x58($sp) -/* A10FD4 80240754 D7B80050 */ ldc1 $f24, 0x50($sp) -/* A10FD8 80240758 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A10FDC 8024075C D7B40040 */ ldc1 $f20, 0x40($sp) -/* A10FE0 80240760 03E00008 */ jr $ra -/* A10FE4 80240764 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s new file mode 100644 index 0000000000..eb6069d569 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_01/A10880/func_80240534_A10DB4.s @@ -0,0 +1,146 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240534_A10DB4 +/* A10DB4 80240534 27BDFF90 */ addiu $sp, $sp, -0x70 +/* A10DB8 80240538 AFB10034 */ sw $s1, 0x34($sp) +/* A10DBC 8024053C 0080882D */ daddu $s1, $a0, $zero +/* A10DC0 80240540 3C01800B */ lui $at, 0x800b +/* A10DC4 80240544 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* A10DC8 80240548 3C014334 */ lui $at, 0x4334 +/* A10DCC 8024054C 44811000 */ mtc1 $at, $f2 +/* A10DD0 80240550 3C014049 */ lui $at, 0x4049 +/* A10DD4 80240554 34210FD8 */ ori $at, $at, 0xfd8 +/* A10DD8 80240558 44812000 */ mtc1 $at, $f4 +/* A10DDC 8024055C 24040096 */ addiu $a0, $zero, 0x96 +/* A10DE0 80240560 AFBF0038 */ sw $ra, 0x38($sp) +/* A10DE4 80240564 F7BE0068 */ sdc1 $f30, 0x68($sp) +/* A10DE8 80240568 46020003 */ div.s $f0, $f0, $f2 +/* A10DEC 8024056C 46040782 */ mul.s $f30, $f0, $f4 +/* A10DF0 80240570 00000000 */ nop +/* A10DF4 80240574 AFB00030 */ sw $s0, 0x30($sp) +/* A10DF8 80240578 F7BC0060 */ sdc1 $f28, 0x60($sp) +/* A10DFC 8024057C F7BA0058 */ sdc1 $f26, 0x58($sp) +/* A10E00 80240580 3C018024 */ lui $at, 0x8024 +/* A10E04 80240584 D4225980 */ ldc1 $f2, 0x5980($at) +/* A10E08 80240588 4600F021 */ cvt.d.s $f0, $f30 +/* A10E0C 8024058C 46220100 */ add.d $f4, $f0, $f2 +/* A10E10 80240590 F7B80050 */ sdc1 $f24, 0x50($sp) +/* A10E14 80240594 F7B60048 */ sdc1 $f22, 0x48($sp) +/* A10E18 80240598 46220001 */ sub.d $f0, $f0, $f2 +/* A10E1C 8024059C F7B40040 */ sdc1 $f20, 0x40($sp) +/* A10E20 802405A0 46202120 */ cvt.s.d $f4, $f4 +/* A10E24 802405A4 46200020 */ cvt.s.d $f0, $f0 +/* A10E28 802405A8 E7A40020 */ swc1 $f4, 0x20($sp) +/* A10E2C 802405AC 0C00A67F */ jal rand_int +/* A10E30 802405B0 E7A00024 */ swc1 $f0, 0x24($sp) +/* A10E34 802405B4 24040096 */ addiu $a0, $zero, 0x96 +/* A10E38 802405B8 44823000 */ mtc1 $v0, $f6 +/* A10E3C 802405BC 00000000 */ nop +/* A10E40 802405C0 468031A0 */ cvt.s.w $f6, $f6 +/* A10E44 802405C4 0C00A67F */ jal rand_int +/* A10E48 802405C8 E7A60028 */ swc1 $f6, 0x28($sp) +/* A10E4C 802405CC 24040064 */ addiu $a0, $zero, 0x64 +/* A10E50 802405D0 44823000 */ mtc1 $v0, $f6 +/* A10E54 802405D4 00000000 */ nop +/* A10E58 802405D8 468031A0 */ cvt.s.w $f6, $f6 +/* A10E5C 802405DC 0C00A67F */ jal rand_int +/* A10E60 802405E0 E7A6002C */ swc1 $f6, 0x2c($sp) +/* A10E64 802405E4 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* A10E68 802405E8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* A10E6C 802405EC 2442FFCE */ addiu $v0, $v0, -0x32 +/* A10E70 802405F0 C6000030 */ lwc1 $f0, 0x30($s0) +/* A10E74 802405F4 3C014348 */ lui $at, 0x4348 +/* A10E78 802405F8 4481B000 */ mtc1 $at, $f22 +/* A10E7C 802405FC 4482A000 */ mtc1 $v0, $f20 +/* A10E80 80240600 00000000 */ nop +/* A10E84 80240604 4680A520 */ cvt.s.w $f20, $f20 +/* A10E88 80240608 4616003C */ c.lt.s $f0, $f22 +/* A10E8C 8024060C 00000000 */ nop +/* A10E90 80240610 4501004A */ bc1t .L8024073C +/* A10E94 80240614 24020002 */ addiu $v0, $zero, 2 +/* A10E98 80240618 0C00A85B */ jal sin_rad +/* A10E9C 8024061C 4600F306 */ mov.s $f12, $f30 +/* A10EA0 80240620 4600A002 */ mul.s $f0, $f20, $f0 +/* A10EA4 80240624 00000000 */ nop +/* A10EA8 80240628 C61A0028 */ lwc1 $f26, 0x28($s0) +/* A10EAC 8024062C C7AC0020 */ lwc1 $f12, 0x20($sp) +/* A10EB0 80240630 0C00A85B */ jal sin_rad +/* A10EB4 80240634 4600D681 */ sub.s $f26, $f26, $f0 +/* A10EB8 80240638 C7A60028 */ lwc1 $f6, 0x28($sp) +/* A10EBC 8024063C 46003002 */ mul.s $f0, $f6, $f0 +/* A10EC0 80240640 00000000 */ nop +/* A10EC4 80240644 C61C002C */ lwc1 $f28, 0x2c($s0) +/* A10EC8 80240648 4616E700 */ add.s $f28, $f28, $f22 +/* A10ECC 8024064C 4600D680 */ add.s $f26, $f26, $f0 +/* A10ED0 80240650 0C00A874 */ jal cos_rad +/* A10ED4 80240654 4600F306 */ mov.s $f12, $f30 +/* A10ED8 80240658 4600A002 */ mul.s $f0, $f20, $f0 +/* A10EDC 8024065C 00000000 */ nop +/* A10EE0 80240660 C6180030 */ lwc1 $f24, 0x30($s0) +/* A10EE4 80240664 C7AC0020 */ lwc1 $f12, 0x20($sp) +/* A10EE8 80240668 0C00A874 */ jal cos_rad +/* A10EEC 8024066C 4600C600 */ add.s $f24, $f24, $f0 +/* A10EF0 80240670 C7A60028 */ lwc1 $f6, 0x28($sp) +/* A10EF4 80240674 46003002 */ mul.s $f0, $f6, $f0 +/* A10EF8 80240678 00000000 */ nop +/* A10EFC 8024067C 4600C601 */ sub.s $f24, $f24, $f0 +/* A10F00 80240680 4600D18D */ trunc.w.s $f6, $f26 +/* A10F04 80240684 E6260088 */ swc1 $f6, 0x88($s1) +/* A10F08 80240688 4600E18D */ trunc.w.s $f6, $f28 +/* A10F0C 8024068C E626008C */ swc1 $f6, 0x8c($s1) +/* A10F10 80240690 4600C18D */ trunc.w.s $f6, $f24 +/* A10F14 80240694 E6260090 */ swc1 $f6, 0x90($s1) +/* A10F18 80240698 0C00A85B */ jal sin_rad +/* A10F1C 8024069C 4600F306 */ mov.s $f12, $f30 +/* A10F20 802406A0 4600A002 */ mul.s $f0, $f20, $f0 +/* A10F24 802406A4 00000000 */ nop +/* A10F28 802406A8 C6160028 */ lwc1 $f22, 0x28($s0) +/* A10F2C 802406AC C7AC0024 */ lwc1 $f12, 0x24($sp) +/* A10F30 802406B0 0C00A85B */ jal sin_rad +/* A10F34 802406B4 4600B581 */ sub.s $f22, $f22, $f0 +/* A10F38 802406B8 C7A6002C */ lwc1 $f6, 0x2c($sp) +/* A10F3C 802406BC 46003002 */ mul.s $f0, $f6, $f0 +/* A10F40 802406C0 00000000 */ nop +/* A10F44 802406C4 4600F306 */ mov.s $f12, $f30 +/* A10F48 802406C8 C61E002C */ lwc1 $f30, 0x2c($s0) +/* A10F4C 802406CC 0C00A874 */ jal cos_rad +/* A10F50 802406D0 4600B580 */ add.s $f22, $f22, $f0 +/* A10F54 802406D4 4600A002 */ mul.s $f0, $f20, $f0 +/* A10F58 802406D8 00000000 */ nop +/* A10F5C 802406DC C6140030 */ lwc1 $f20, 0x30($s0) +/* A10F60 802406E0 C7AC0024 */ lwc1 $f12, 0x24($sp) +/* A10F64 802406E4 0C00A874 */ jal cos_rad +/* A10F68 802406E8 4600A500 */ add.s $f20, $f20, $f0 +/* A10F6C 802406EC C7A6002C */ lwc1 $f6, 0x2c($sp) +/* A10F70 802406F0 46003002 */ mul.s $f0, $f6, $f0 +/* A10F74 802406F4 00000000 */ nop +/* A10F78 802406F8 24040004 */ addiu $a0, $zero, 4 +/* A10F7C 802406FC 0C00A67F */ jal rand_int +/* A10F80 80240700 4600A501 */ sub.s $f20, $f20, $f0 +/* A10F84 80240704 24040002 */ addiu $a0, $zero, 2 +/* A10F88 80240708 2442000A */ addiu $v0, $v0, 0xa +/* A10F8C 8024070C 4405D000 */ mfc1 $a1, $f26 +/* A10F90 80240710 4406E000 */ mfc1 $a2, $f28 +/* A10F94 80240714 4407C000 */ mfc1 $a3, $f24 +/* A10F98 80240718 44820000 */ mtc1 $v0, $f0 +/* A10F9C 8024071C 00000000 */ nop +/* A10FA0 80240720 46800020 */ cvt.s.w $f0, $f0 +/* A10FA4 80240724 E7B60010 */ swc1 $f22, 0x10($sp) +/* A10FA8 80240728 E7BE0014 */ swc1 $f30, 0x14($sp) +/* A10FAC 8024072C E7A0001C */ swc1 $f0, 0x1c($sp) +/* A10FB0 80240730 0C01BF8C */ jal func_8006FE30 +/* A10FB4 80240734 E7B40018 */ swc1 $f20, 0x18($sp) +/* A10FB8 80240738 24020002 */ addiu $v0, $zero, 2 +.L8024073C: +/* A10FBC 8024073C 8FBF0038 */ lw $ra, 0x38($sp) +/* A10FC0 80240740 8FB10034 */ lw $s1, 0x34($sp) +/* A10FC4 80240744 8FB00030 */ lw $s0, 0x30($sp) +/* A10FC8 80240748 D7BE0068 */ ldc1 $f30, 0x68($sp) +/* A10FCC 8024074C D7BC0060 */ ldc1 $f28, 0x60($sp) +/* A10FD0 80240750 D7BA0058 */ ldc1 $f26, 0x58($sp) +/* A10FD4 80240754 D7B80050 */ ldc1 $f24, 0x50($sp) +/* A10FD8 80240758 D7B60048 */ ldc1 $f22, 0x48($sp) +/* A10FDC 8024075C D7B40040 */ ldc1 $f20, 0x40($sp) +/* A10FE0 80240760 03E00008 */ jr $ra +/* A10FE4 80240764 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4.s deleted file mode 100644 index 33cb8897dc..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408C4 -/* A11144 802408C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11148 802408C8 AFB00010 */ sw $s0, 0x10($sp) -/* A1114C 802408CC 0080802D */ daddu $s0, $a0, $zero -/* A11150 802408D0 10A00005 */ beqz $a1, .L802408E8 -/* A11154 802408D4 AFBF0014 */ sw $ra, 0x14($sp) -/* A11158 802408D8 AE000070 */ sw $zero, 0x70($s0) -/* A1115C 802408DC AE000074 */ sw $zero, 0x74($s0) -/* A11160 802408E0 AE000078 */ sw $zero, 0x78($s0) -/* A11164 802408E4 AE00007C */ sw $zero, 0x7c($s0) -.L802408E8: -/* A11168 802408E8 8E020070 */ lw $v0, 0x70($s0) -/* A1116C 802408EC 1440000E */ bnez $v0, .L80240928 -/* A11170 802408F0 00000000 */ nop -/* A11174 802408F4 8E0300A8 */ lw $v1, 0xa8($s0) -/* A11178 802408F8 8E020088 */ lw $v0, 0x88($s0) -/* A1117C 802408FC 00621821 */ addu $v1, $v1, $v0 -/* A11180 80240900 04610004 */ bgez $v1, .L80240914 -/* A11184 80240904 AE0300A8 */ sw $v1, 0xa8($s0) -/* A11188 80240908 3C020002 */ lui $v0, 2 -/* A1118C 8024090C 08090249 */ j .L80240924 -/* A11190 80240910 00621021 */ addu $v0, $v1, $v0 -.L80240914: -/* A11194 80240914 3C040002 */ lui $a0, 2 -/* A11198 80240918 0083102A */ slt $v0, $a0, $v1 -/* A1119C 8024091C 10400002 */ beqz $v0, .L80240928 -/* A111A0 80240920 00641023 */ subu $v0, $v1, $a0 -.L80240924: -/* A111A4 80240924 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240928: -/* A111A8 80240928 8E020074 */ lw $v0, 0x74($s0) -/* A111AC 8024092C 1440000E */ bnez $v0, .L80240968 -/* A111B0 80240930 00000000 */ nop -/* A111B4 80240934 8E0300AC */ lw $v1, 0xac($s0) -/* A111B8 80240938 8E02008C */ lw $v0, 0x8c($s0) -/* A111BC 8024093C 00621821 */ addu $v1, $v1, $v0 -/* A111C0 80240940 04610004 */ bgez $v1, .L80240954 -/* A111C4 80240944 AE0300AC */ sw $v1, 0xac($s0) -/* A111C8 80240948 3C020002 */ lui $v0, 2 -/* A111CC 8024094C 08090259 */ j .L80240964 -/* A111D0 80240950 00621021 */ addu $v0, $v1, $v0 -.L80240954: -/* A111D4 80240954 3C040002 */ lui $a0, 2 -/* A111D8 80240958 0083102A */ slt $v0, $a0, $v1 -/* A111DC 8024095C 10400002 */ beqz $v0, .L80240968 -/* A111E0 80240960 00641023 */ subu $v0, $v1, $a0 -.L80240964: -/* A111E4 80240964 AE0200AC */ sw $v0, 0xac($s0) -.L80240968: -/* A111E8 80240968 8E020078 */ lw $v0, 0x78($s0) -/* A111EC 8024096C 1440000E */ bnez $v0, .L802409A8 -/* A111F0 80240970 00000000 */ nop -/* A111F4 80240974 8E0300B0 */ lw $v1, 0xb0($s0) -/* A111F8 80240978 8E020090 */ lw $v0, 0x90($s0) -/* A111FC 8024097C 00621821 */ addu $v1, $v1, $v0 -/* A11200 80240980 04610004 */ bgez $v1, .L80240994 -/* A11204 80240984 AE0300B0 */ sw $v1, 0xb0($s0) -/* A11208 80240988 3C020002 */ lui $v0, 2 -/* A1120C 8024098C 08090269 */ j .L802409A4 -/* A11210 80240990 00621021 */ addu $v0, $v1, $v0 -.L80240994: -/* A11214 80240994 3C040002 */ lui $a0, 2 -/* A11218 80240998 0083102A */ slt $v0, $a0, $v1 -/* A1121C 8024099C 10400002 */ beqz $v0, .L802409A8 -/* A11220 802409A0 00641023 */ subu $v0, $v1, $a0 -.L802409A4: -/* A11224 802409A4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802409A8: -/* A11228 802409A8 8E02007C */ lw $v0, 0x7c($s0) -/* A1122C 802409AC 1440000E */ bnez $v0, .L802409E8 -/* A11230 802409B0 00000000 */ nop -/* A11234 802409B4 8E0300B4 */ lw $v1, 0xb4($s0) -/* A11238 802409B8 8E020094 */ lw $v0, 0x94($s0) -/* A1123C 802409BC 00621821 */ addu $v1, $v1, $v0 -/* A11240 802409C0 04610004 */ bgez $v1, .L802409D4 -/* A11244 802409C4 AE0300B4 */ sw $v1, 0xb4($s0) -/* A11248 802409C8 3C020002 */ lui $v0, 2 -/* A1124C 802409CC 08090279 */ j .L802409E4 -/* A11250 802409D0 00621021 */ addu $v0, $v1, $v0 -.L802409D4: -/* A11254 802409D4 3C040002 */ lui $a0, 2 -/* A11258 802409D8 0083102A */ slt $v0, $a0, $v1 -/* A1125C 802409DC 10400002 */ beqz $v0, .L802409E8 -/* A11260 802409E0 00641023 */ subu $v0, $v1, $a0 -.L802409E4: -/* A11264 802409E4 AE0200B4 */ sw $v0, 0xb4($s0) -.L802409E8: -/* A11268 802409E8 8E040084 */ lw $a0, 0x84($s0) -/* A1126C 802409EC 0C046F07 */ jal set_main_pan_u -/* A11270 802409F0 8E0500A8 */ lw $a1, 0xa8($s0) -/* A11274 802409F4 8E040084 */ lw $a0, 0x84($s0) -/* A11278 802409F8 0C046F0D */ jal set_main_pan_v -/* A1127C 802409FC 8E0500AC */ lw $a1, 0xac($s0) -/* A11280 80240A00 8E040084 */ lw $a0, 0x84($s0) -/* A11284 80240A04 0C046F13 */ jal set_aux_pan_u -/* A11288 80240A08 8E0500B0 */ lw $a1, 0xb0($s0) -/* A1128C 80240A0C 8E040084 */ lw $a0, 0x84($s0) -/* A11290 80240A10 0C046F19 */ jal set_aux_pan_v -/* A11294 80240A14 8E0500B4 */ lw $a1, 0xb4($s0) -/* A11298 80240A18 8E020070 */ lw $v0, 0x70($s0) -/* A1129C 80240A1C 8E030078 */ lw $v1, 0x78($s0) -/* A112A0 80240A20 8E040098 */ lw $a0, 0x98($s0) -/* A112A4 80240A24 24420001 */ addiu $v0, $v0, 1 -/* A112A8 80240A28 AE020070 */ sw $v0, 0x70($s0) -/* A112AC 80240A2C 8E020074 */ lw $v0, 0x74($s0) -/* A112B0 80240A30 24630001 */ addiu $v1, $v1, 1 -/* A112B4 80240A34 AE030078 */ sw $v1, 0x78($s0) -/* A112B8 80240A38 8E030070 */ lw $v1, 0x70($s0) -/* A112BC 80240A3C 24420001 */ addiu $v0, $v0, 1 -/* A112C0 80240A40 AE020074 */ sw $v0, 0x74($s0) -/* A112C4 80240A44 8E02007C */ lw $v0, 0x7c($s0) -/* A112C8 80240A48 0064182A */ slt $v1, $v1, $a0 -/* A112CC 80240A4C 24420001 */ addiu $v0, $v0, 1 -/* A112D0 80240A50 14600002 */ bnez $v1, .L80240A5C -/* A112D4 80240A54 AE02007C */ sw $v0, 0x7c($s0) -/* A112D8 80240A58 AE000070 */ sw $zero, 0x70($s0) -.L80240A5C: -/* A112DC 80240A5C 8E020074 */ lw $v0, 0x74($s0) -/* A112E0 80240A60 8E03009C */ lw $v1, 0x9c($s0) -/* A112E4 80240A64 0043102A */ slt $v0, $v0, $v1 -/* A112E8 80240A68 50400001 */ beql $v0, $zero, .L80240A70 -/* A112EC 80240A6C AE000074 */ sw $zero, 0x74($s0) -.L80240A70: -/* A112F0 80240A70 8E020078 */ lw $v0, 0x78($s0) -/* A112F4 80240A74 8E0300A0 */ lw $v1, 0xa0($s0) -/* A112F8 80240A78 0043102A */ slt $v0, $v0, $v1 -/* A112FC 80240A7C 50400001 */ beql $v0, $zero, .L80240A84 -/* A11300 80240A80 AE000078 */ sw $zero, 0x78($s0) -.L80240A84: -/* A11304 80240A84 8E02007C */ lw $v0, 0x7c($s0) -/* A11308 80240A88 8E0300A4 */ lw $v1, 0xa4($s0) -/* A1130C 80240A8C 0043102A */ slt $v0, $v0, $v1 -/* A11310 80240A90 50400001 */ beql $v0, $zero, .L80240A98 -/* A11314 80240A94 AE00007C */ sw $zero, 0x7c($s0) -.L80240A98: -/* A11318 80240A98 8FBF0014 */ lw $ra, 0x14($sp) -/* A1131C 80240A9C 8FB00010 */ lw $s0, 0x10($sp) -/* A11320 80240AA0 0000102D */ daddu $v0, $zero, $zero -/* A11324 80240AA4 03E00008 */ jr $ra -/* A11328 80240AA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4_A11144.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4_A11144.s new file mode 100644 index 0000000000..5bca4e65af --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_802408C4_A11144.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408C4_A11144 +/* A11144 802408C4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A11148 802408C8 AFB00010 */ sw $s0, 0x10($sp) +/* A1114C 802408CC 0080802D */ daddu $s0, $a0, $zero +/* A11150 802408D0 10A00005 */ beqz $a1, .L802408E8 +/* A11154 802408D4 AFBF0014 */ sw $ra, 0x14($sp) +/* A11158 802408D8 AE000070 */ sw $zero, 0x70($s0) +/* A1115C 802408DC AE000074 */ sw $zero, 0x74($s0) +/* A11160 802408E0 AE000078 */ sw $zero, 0x78($s0) +/* A11164 802408E4 AE00007C */ sw $zero, 0x7c($s0) +.L802408E8: +/* A11168 802408E8 8E020070 */ lw $v0, 0x70($s0) +/* A1116C 802408EC 1440000E */ bnez $v0, .L80240928 +/* A11170 802408F0 00000000 */ nop +/* A11174 802408F4 8E0300A8 */ lw $v1, 0xa8($s0) +/* A11178 802408F8 8E020088 */ lw $v0, 0x88($s0) +/* A1117C 802408FC 00621821 */ addu $v1, $v1, $v0 +/* A11180 80240900 04610004 */ bgez $v1, .L80240914 +/* A11184 80240904 AE0300A8 */ sw $v1, 0xa8($s0) +/* A11188 80240908 3C020002 */ lui $v0, 2 +/* A1118C 8024090C 08090249 */ j .L80240924 +/* A11190 80240910 00621021 */ addu $v0, $v1, $v0 +.L80240914: +/* A11194 80240914 3C040002 */ lui $a0, 2 +/* A11198 80240918 0083102A */ slt $v0, $a0, $v1 +/* A1119C 8024091C 10400002 */ beqz $v0, .L80240928 +/* A111A0 80240920 00641023 */ subu $v0, $v1, $a0 +.L80240924: +/* A111A4 80240924 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240928: +/* A111A8 80240928 8E020074 */ lw $v0, 0x74($s0) +/* A111AC 8024092C 1440000E */ bnez $v0, .L80240968 +/* A111B0 80240930 00000000 */ nop +/* A111B4 80240934 8E0300AC */ lw $v1, 0xac($s0) +/* A111B8 80240938 8E02008C */ lw $v0, 0x8c($s0) +/* A111BC 8024093C 00621821 */ addu $v1, $v1, $v0 +/* A111C0 80240940 04610004 */ bgez $v1, .L80240954 +/* A111C4 80240944 AE0300AC */ sw $v1, 0xac($s0) +/* A111C8 80240948 3C020002 */ lui $v0, 2 +/* A111CC 8024094C 08090259 */ j .L80240964 +/* A111D0 80240950 00621021 */ addu $v0, $v1, $v0 +.L80240954: +/* A111D4 80240954 3C040002 */ lui $a0, 2 +/* A111D8 80240958 0083102A */ slt $v0, $a0, $v1 +/* A111DC 8024095C 10400002 */ beqz $v0, .L80240968 +/* A111E0 80240960 00641023 */ subu $v0, $v1, $a0 +.L80240964: +/* A111E4 80240964 AE0200AC */ sw $v0, 0xac($s0) +.L80240968: +/* A111E8 80240968 8E020078 */ lw $v0, 0x78($s0) +/* A111EC 8024096C 1440000E */ bnez $v0, .L802409A8 +/* A111F0 80240970 00000000 */ nop +/* A111F4 80240974 8E0300B0 */ lw $v1, 0xb0($s0) +/* A111F8 80240978 8E020090 */ lw $v0, 0x90($s0) +/* A111FC 8024097C 00621821 */ addu $v1, $v1, $v0 +/* A11200 80240980 04610004 */ bgez $v1, .L80240994 +/* A11204 80240984 AE0300B0 */ sw $v1, 0xb0($s0) +/* A11208 80240988 3C020002 */ lui $v0, 2 +/* A1120C 8024098C 08090269 */ j .L802409A4 +/* A11210 80240990 00621021 */ addu $v0, $v1, $v0 +.L80240994: +/* A11214 80240994 3C040002 */ lui $a0, 2 +/* A11218 80240998 0083102A */ slt $v0, $a0, $v1 +/* A1121C 8024099C 10400002 */ beqz $v0, .L802409A8 +/* A11220 802409A0 00641023 */ subu $v0, $v1, $a0 +.L802409A4: +/* A11224 802409A4 AE0200B0 */ sw $v0, 0xb0($s0) +.L802409A8: +/* A11228 802409A8 8E02007C */ lw $v0, 0x7c($s0) +/* A1122C 802409AC 1440000E */ bnez $v0, .L802409E8 +/* A11230 802409B0 00000000 */ nop +/* A11234 802409B4 8E0300B4 */ lw $v1, 0xb4($s0) +/* A11238 802409B8 8E020094 */ lw $v0, 0x94($s0) +/* A1123C 802409BC 00621821 */ addu $v1, $v1, $v0 +/* A11240 802409C0 04610004 */ bgez $v1, .L802409D4 +/* A11244 802409C4 AE0300B4 */ sw $v1, 0xb4($s0) +/* A11248 802409C8 3C020002 */ lui $v0, 2 +/* A1124C 802409CC 08090279 */ j .L802409E4 +/* A11250 802409D0 00621021 */ addu $v0, $v1, $v0 +.L802409D4: +/* A11254 802409D4 3C040002 */ lui $a0, 2 +/* A11258 802409D8 0083102A */ slt $v0, $a0, $v1 +/* A1125C 802409DC 10400002 */ beqz $v0, .L802409E8 +/* A11260 802409E0 00641023 */ subu $v0, $v1, $a0 +.L802409E4: +/* A11264 802409E4 AE0200B4 */ sw $v0, 0xb4($s0) +.L802409E8: +/* A11268 802409E8 8E040084 */ lw $a0, 0x84($s0) +/* A1126C 802409EC 0C046F07 */ jal set_main_pan_u +/* A11270 802409F0 8E0500A8 */ lw $a1, 0xa8($s0) +/* A11274 802409F4 8E040084 */ lw $a0, 0x84($s0) +/* A11278 802409F8 0C046F0D */ jal set_main_pan_v +/* A1127C 802409FC 8E0500AC */ lw $a1, 0xac($s0) +/* A11280 80240A00 8E040084 */ lw $a0, 0x84($s0) +/* A11284 80240A04 0C046F13 */ jal set_aux_pan_u +/* A11288 80240A08 8E0500B0 */ lw $a1, 0xb0($s0) +/* A1128C 80240A0C 8E040084 */ lw $a0, 0x84($s0) +/* A11290 80240A10 0C046F19 */ jal set_aux_pan_v +/* A11294 80240A14 8E0500B4 */ lw $a1, 0xb4($s0) +/* A11298 80240A18 8E020070 */ lw $v0, 0x70($s0) +/* A1129C 80240A1C 8E030078 */ lw $v1, 0x78($s0) +/* A112A0 80240A20 8E040098 */ lw $a0, 0x98($s0) +/* A112A4 80240A24 24420001 */ addiu $v0, $v0, 1 +/* A112A8 80240A28 AE020070 */ sw $v0, 0x70($s0) +/* A112AC 80240A2C 8E020074 */ lw $v0, 0x74($s0) +/* A112B0 80240A30 24630001 */ addiu $v1, $v1, 1 +/* A112B4 80240A34 AE030078 */ sw $v1, 0x78($s0) +/* A112B8 80240A38 8E030070 */ lw $v1, 0x70($s0) +/* A112BC 80240A3C 24420001 */ addiu $v0, $v0, 1 +/* A112C0 80240A40 AE020074 */ sw $v0, 0x74($s0) +/* A112C4 80240A44 8E02007C */ lw $v0, 0x7c($s0) +/* A112C8 80240A48 0064182A */ slt $v1, $v1, $a0 +/* A112CC 80240A4C 24420001 */ addiu $v0, $v0, 1 +/* A112D0 80240A50 14600002 */ bnez $v1, .L80240A5C +/* A112D4 80240A54 AE02007C */ sw $v0, 0x7c($s0) +/* A112D8 80240A58 AE000070 */ sw $zero, 0x70($s0) +.L80240A5C: +/* A112DC 80240A5C 8E020074 */ lw $v0, 0x74($s0) +/* A112E0 80240A60 8E03009C */ lw $v1, 0x9c($s0) +/* A112E4 80240A64 0043102A */ slt $v0, $v0, $v1 +/* A112E8 80240A68 50400001 */ beql $v0, $zero, .L80240A70 +/* A112EC 80240A6C AE000074 */ sw $zero, 0x74($s0) +.L80240A70: +/* A112F0 80240A70 8E020078 */ lw $v0, 0x78($s0) +/* A112F4 80240A74 8E0300A0 */ lw $v1, 0xa0($s0) +/* A112F8 80240A78 0043102A */ slt $v0, $v0, $v1 +/* A112FC 80240A7C 50400001 */ beql $v0, $zero, .L80240A84 +/* A11300 80240A80 AE000078 */ sw $zero, 0x78($s0) +.L80240A84: +/* A11304 80240A84 8E02007C */ lw $v0, 0x7c($s0) +/* A11308 80240A88 8E0300A4 */ lw $v1, 0xa4($s0) +/* A1130C 80240A8C 0043102A */ slt $v0, $v0, $v1 +/* A11310 80240A90 50400001 */ beql $v0, $zero, .L80240A98 +/* A11314 80240A94 AE00007C */ sw $zero, 0x7c($s0) +.L80240A98: +/* A11318 80240A98 8FBF0014 */ lw $ra, 0x14($sp) +/* A1131C 80240A9C 8FB00010 */ lw $s0, 0x10($sp) +/* A11320 80240AA0 0000102D */ daddu $v0, $zero, $zero +/* A11324 80240AA4 03E00008 */ jr $ra +/* A11328 80240AA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08.s deleted file mode 100644 index a08ab4ab8b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C08 -/* A11488 80240C08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1148C 80240C0C AFBF0010 */ sw $ra, 0x10($sp) -/* A11490 80240C10 8C82000C */ lw $v0, 0xc($a0) -/* A11494 80240C14 0C0B1EAF */ jal get_variable -/* A11498 80240C18 8C450000 */ lw $a1, ($v0) -/* A1149C 80240C1C 8FBF0010 */ lw $ra, 0x10($sp) -/* A114A0 80240C20 3C018024 */ lui $at, 0x8024 -/* A114A4 80240C24 AC221C2C */ sw $v0, 0x1c2c($at) -/* A114A8 80240C28 24020002 */ addiu $v0, $zero, 2 -/* A114AC 80240C2C 03E00008 */ jr $ra -/* A114B0 80240C30 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s new file mode 100644 index 0000000000..3f88b2ad43 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240C08_A11488.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C08_A11488 +/* A11488 80240C08 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1148C 80240C0C AFBF0010 */ sw $ra, 0x10($sp) +/* A11490 80240C10 8C82000C */ lw $v0, 0xc($a0) +/* A11494 80240C14 0C0B1EAF */ jal get_variable +/* A11498 80240C18 8C450000 */ lw $a1, ($v0) +/* A1149C 80240C1C 8FBF0010 */ lw $ra, 0x10($sp) +/* A114A0 80240C20 3C018024 */ lui $at, 0x8024 +/* A114A4 80240C24 AC221C2C */ sw $v0, 0x1c2c($at) +/* A114A8 80240C28 24020002 */ addiu $v0, $zero, 2 +/* A114AC 80240C2C 03E00008 */ jr $ra +/* A114B0 80240C30 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC.s deleted file mode 100644 index 11c8674900..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CDC -/* A1155C 80240CDC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A11560 80240CE0 AFB1001C */ sw $s1, 0x1c($sp) -/* A11564 80240CE4 0080882D */ daddu $s1, $a0, $zero -/* A11568 80240CE8 AFBF002C */ sw $ra, 0x2c($sp) -/* A1156C 80240CEC AFB40028 */ sw $s4, 0x28($sp) -/* A11570 80240CF0 AFB30024 */ sw $s3, 0x24($sp) -/* A11574 80240CF4 AFB20020 */ sw $s2, 0x20($sp) -/* A11578 80240CF8 AFB00018 */ sw $s0, 0x18($sp) -/* A1157C 80240CFC 8E30000C */ lw $s0, 0xc($s1) -/* A11580 80240D00 8E050000 */ lw $a1, ($s0) -/* A11584 80240D04 0C0B1EAF */ jal get_variable -/* A11588 80240D08 26100004 */ addiu $s0, $s0, 4 -/* A1158C 80240D0C 8E050000 */ lw $a1, ($s0) -/* A11590 80240D10 26100004 */ addiu $s0, $s0, 4 -/* A11594 80240D14 0220202D */ daddu $a0, $s1, $zero -/* A11598 80240D18 0C0B1EAF */ jal get_variable -/* A1159C 80240D1C 0040A02D */ daddu $s4, $v0, $zero -/* A115A0 80240D20 8E050000 */ lw $a1, ($s0) -/* A115A4 80240D24 26100004 */ addiu $s0, $s0, 4 -/* A115A8 80240D28 0220202D */ daddu $a0, $s1, $zero -/* A115AC 80240D2C 0C0B1EAF */ jal get_variable -/* A115B0 80240D30 0040982D */ daddu $s3, $v0, $zero -/* A115B4 80240D34 8E050000 */ lw $a1, ($s0) -/* A115B8 80240D38 26100004 */ addiu $s0, $s0, 4 -/* A115BC 80240D3C 0220202D */ daddu $a0, $s1, $zero -/* A115C0 80240D40 0C0B1EAF */ jal get_variable -/* A115C4 80240D44 0040902D */ daddu $s2, $v0, $zero -/* A115C8 80240D48 0220202D */ daddu $a0, $s1, $zero -/* A115CC 80240D4C 8E050000 */ lw $a1, ($s0) -/* A115D0 80240D50 0C0B1EAF */ jal get_variable -/* A115D4 80240D54 0040802D */ daddu $s0, $v0, $zero -/* A115D8 80240D58 0280202D */ daddu $a0, $s4, $zero -/* A115DC 80240D5C 44931000 */ mtc1 $s3, $f2 -/* A115E0 80240D60 00000000 */ nop -/* A115E4 80240D64 468010A0 */ cvt.s.w $f2, $f2 -/* A115E8 80240D68 44051000 */ mfc1 $a1, $f2 -/* A115EC 80240D6C 44921000 */ mtc1 $s2, $f2 -/* A115F0 80240D70 00000000 */ nop -/* A115F4 80240D74 468010A0 */ cvt.s.w $f2, $f2 -/* A115F8 80240D78 44061000 */ mfc1 $a2, $f2 -/* A115FC 80240D7C 44901000 */ mtc1 $s0, $f2 -/* A11600 80240D80 00000000 */ nop -/* A11604 80240D84 468010A0 */ cvt.s.w $f2, $f2 -/* A11608 80240D88 44071000 */ mfc1 $a3, $f2 -/* A1160C 80240D8C 44820000 */ mtc1 $v0, $f0 -/* A11610 80240D90 00000000 */ nop -/* A11614 80240D94 46800020 */ cvt.s.w $f0, $f0 -/* A11618 80240D98 0C01BFBC */ jal func_8006FEF0 -/* A1161C 80240D9C E7A00010 */ swc1 $f0, 0x10($sp) -/* A11620 80240DA0 8FBF002C */ lw $ra, 0x2c($sp) -/* A11624 80240DA4 8FB40028 */ lw $s4, 0x28($sp) -/* A11628 80240DA8 8FB30024 */ lw $s3, 0x24($sp) -/* A1162C 80240DAC 8FB20020 */ lw $s2, 0x20($sp) -/* A11630 80240DB0 8FB1001C */ lw $s1, 0x1c($sp) -/* A11634 80240DB4 8FB00018 */ lw $s0, 0x18($sp) -/* A11638 80240DB8 24020002 */ addiu $v0, $zero, 2 -/* A1163C 80240DBC 03E00008 */ jr $ra -/* A11640 80240DC0 27BD0030 */ addiu $sp, $sp, 0x30 -/* A11644 80240DC4 00000000 */ nop -/* A11648 80240DC8 00000000 */ nop -/* A1164C 80240DCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s new file mode 100644 index 0000000000..9ae068e23f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_01/A11020/func_80240CDC_A1155C.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CDC_A1155C +/* A1155C 80240CDC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A11560 80240CE0 AFB1001C */ sw $s1, 0x1c($sp) +/* A11564 80240CE4 0080882D */ daddu $s1, $a0, $zero +/* A11568 80240CE8 AFBF002C */ sw $ra, 0x2c($sp) +/* A1156C 80240CEC AFB40028 */ sw $s4, 0x28($sp) +/* A11570 80240CF0 AFB30024 */ sw $s3, 0x24($sp) +/* A11574 80240CF4 AFB20020 */ sw $s2, 0x20($sp) +/* A11578 80240CF8 AFB00018 */ sw $s0, 0x18($sp) +/* A1157C 80240CFC 8E30000C */ lw $s0, 0xc($s1) +/* A11580 80240D00 8E050000 */ lw $a1, ($s0) +/* A11584 80240D04 0C0B1EAF */ jal get_variable +/* A11588 80240D08 26100004 */ addiu $s0, $s0, 4 +/* A1158C 80240D0C 8E050000 */ lw $a1, ($s0) +/* A11590 80240D10 26100004 */ addiu $s0, $s0, 4 +/* A11594 80240D14 0220202D */ daddu $a0, $s1, $zero +/* A11598 80240D18 0C0B1EAF */ jal get_variable +/* A1159C 80240D1C 0040A02D */ daddu $s4, $v0, $zero +/* A115A0 80240D20 8E050000 */ lw $a1, ($s0) +/* A115A4 80240D24 26100004 */ addiu $s0, $s0, 4 +/* A115A8 80240D28 0220202D */ daddu $a0, $s1, $zero +/* A115AC 80240D2C 0C0B1EAF */ jal get_variable +/* A115B0 80240D30 0040982D */ daddu $s3, $v0, $zero +/* A115B4 80240D34 8E050000 */ lw $a1, ($s0) +/* A115B8 80240D38 26100004 */ addiu $s0, $s0, 4 +/* A115BC 80240D3C 0220202D */ daddu $a0, $s1, $zero +/* A115C0 80240D40 0C0B1EAF */ jal get_variable +/* A115C4 80240D44 0040902D */ daddu $s2, $v0, $zero +/* A115C8 80240D48 0220202D */ daddu $a0, $s1, $zero +/* A115CC 80240D4C 8E050000 */ lw $a1, ($s0) +/* A115D0 80240D50 0C0B1EAF */ jal get_variable +/* A115D4 80240D54 0040802D */ daddu $s0, $v0, $zero +/* A115D8 80240D58 0280202D */ daddu $a0, $s4, $zero +/* A115DC 80240D5C 44931000 */ mtc1 $s3, $f2 +/* A115E0 80240D60 00000000 */ nop +/* A115E4 80240D64 468010A0 */ cvt.s.w $f2, $f2 +/* A115E8 80240D68 44051000 */ mfc1 $a1, $f2 +/* A115EC 80240D6C 44921000 */ mtc1 $s2, $f2 +/* A115F0 80240D70 00000000 */ nop +/* A115F4 80240D74 468010A0 */ cvt.s.w $f2, $f2 +/* A115F8 80240D78 44061000 */ mfc1 $a2, $f2 +/* A115FC 80240D7C 44901000 */ mtc1 $s0, $f2 +/* A11600 80240D80 00000000 */ nop +/* A11604 80240D84 468010A0 */ cvt.s.w $f2, $f2 +/* A11608 80240D88 44071000 */ mfc1 $a3, $f2 +/* A1160C 80240D8C 44820000 */ mtc1 $v0, $f0 +/* A11610 80240D90 00000000 */ nop +/* A11614 80240D94 46800020 */ cvt.s.w $f0, $f0 +/* A11618 80240D98 0C01BFBC */ jal func_8006FEF0 +/* A1161C 80240D9C E7A00010 */ swc1 $f0, 0x10($sp) +/* A11620 80240DA0 8FBF002C */ lw $ra, 0x2c($sp) +/* A11624 80240DA4 8FB40028 */ lw $s4, 0x28($sp) +/* A11628 80240DA8 8FB30024 */ lw $s3, 0x24($sp) +/* A1162C 80240DAC 8FB20020 */ lw $s2, 0x20($sp) +/* A11630 80240DB0 8FB1001C */ lw $s1, 0x1c($sp) +/* A11634 80240DB4 8FB00018 */ lw $s0, 0x18($sp) +/* A11638 80240DB8 24020002 */ addiu $v0, $zero, 2 +/* A1163C 80240DBC 03E00008 */ jr $ra +/* A11640 80240DC0 27BD0030 */ addiu $sp, $sp, 0x30 +/* A11644 80240DC4 00000000 */ nop +/* A11648 80240DC8 00000000 */ nop +/* A1164C 80240DCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC.s b/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC.s deleted file mode 100644 index 521a5f1b45..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DEC -/* A1166C 80240DEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A11670 80240DF0 AFBF0010 */ sw $ra, 0x10($sp) -/* A11674 80240DF4 8C82000C */ lw $v0, 0xc($a0) -/* A11678 80240DF8 3C068016 */ lui $a2, 0x8016 -/* A1167C 80240DFC 84C6A552 */ lh $a2, -0x5aae($a2) -/* A11680 80240E00 0C0B2026 */ jal set_variable -/* A11684 80240E04 8C450000 */ lw $a1, ($v0) -/* A11688 80240E08 8FBF0010 */ lw $ra, 0x10($sp) -/* A1168C 80240E0C 24020002 */ addiu $v0, $zero, 2 -/* A11690 80240E10 03E00008 */ jr $ra -/* A11694 80240E14 27BD0018 */ addiu $sp, $sp, 0x18 -/* A11698 80240E18 00000000 */ nop -/* A1169C 80240E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s b/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s new file mode 100644 index 0000000000..3cd3d9e48f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DEC_A1166C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DEC_A1166C +/* A1166C 80240DEC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A11670 80240DF0 AFBF0010 */ sw $ra, 0x10($sp) +/* A11674 80240DF4 8C82000C */ lw $v0, 0xc($a0) +/* A11678 80240DF8 3C068016 */ lui $a2, 0x8016 +/* A1167C 80240DFC 84C6A552 */ lh $a2, -0x5aae($a2) +/* A11680 80240E00 0C0B2026 */ jal set_variable +/* A11684 80240E04 8C450000 */ lw $a1, ($v0) +/* A11688 80240E08 8FBF0010 */ lw $ra, 0x10($sp) +/* A1168C 80240E0C 24020002 */ addiu $v0, $zero, 2 +/* A11690 80240E10 03E00008 */ jr $ra +/* A11694 80240E14 27BD0018 */ addiu $sp, $sp, 0x18 +/* A11698 80240E18 00000000 */ nop +/* A1169C 80240E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610.s deleted file mode 100644 index 2617155a57..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610.s +++ /dev/null @@ -1,204 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240610 -/* A16830 80240610 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A16834 80240614 24040001 */ addiu $a0, $zero, 1 -/* A16838 80240618 27A50010 */ addiu $a1, $sp, 0x10 -/* A1683C 8024061C 27A60014 */ addiu $a2, $sp, 0x14 -/* A16840 80240620 AFBF0034 */ sw $ra, 0x34($sp) -/* A16844 80240624 AFB40030 */ sw $s4, 0x30($sp) -/* A16848 80240628 AFB3002C */ sw $s3, 0x2c($sp) -/* A1684C 8024062C AFB20028 */ sw $s2, 0x28($sp) -/* A16850 80240630 AFB10024 */ sw $s1, 0x24($sp) -/* A16854 80240634 AFB00020 */ sw $s0, 0x20($sp) -/* A16858 80240638 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A1685C 8024063C 0C0470AC */ jal func_8011C2B0 -/* A16860 80240640 27A70018 */ addiu $a3, $sp, 0x18 -/* A16864 80240644 8FA20018 */ lw $v0, 0x18($sp) -/* A16868 80240648 18400095 */ blez $v0, .L802408A0 -/* A1686C 8024064C 0000802D */ daddu $s0, $zero, $zero -/* A16870 80240650 3C125555 */ lui $s2, 0x5555 -/* A16874 80240654 36525556 */ ori $s2, $s2, 0x5556 -/* A16878 80240658 34148000 */ ori $s4, $zero, 0x8000 -/* A1687C 8024065C 3C0141E0 */ lui $at, 0x41e0 -/* A16880 80240660 4481A800 */ mtc1 $at, $f21 -/* A16884 80240664 4480A000 */ mtc1 $zero, $f20 -/* A16888 80240668 3C138000 */ lui $s3, 0x8000 -/* A1688C 8024066C 02120018 */ mult $s0, $s2 -.L80240670: -/* A16890 80240670 00101FC3 */ sra $v1, $s0, 0x1f -/* A16894 80240674 00004810 */ mfhi $t1 -/* A16898 80240678 01231823 */ subu $v1, $t1, $v1 -/* A1689C 8024067C 00031040 */ sll $v0, $v1, 1 -/* A168A0 80240680 00431021 */ addu $v0, $v0, $v1 -/* A168A4 80240684 02021023 */ subu $v0, $s0, $v0 -/* A168A8 80240688 3C038024 */ lui $v1, 0x8024 -/* A168AC 8024068C 946333B0 */ lhu $v1, 0x33b0($v1) -/* A168B0 80240690 24420001 */ addiu $v0, $v0, 1 -/* A168B4 80240694 00620018 */ mult $v1, $v0 -/* A168B8 80240698 8FA20014 */ lw $v0, 0x14($sp) -/* A168BC 8024069C 00001812 */ mflo $v1 -/* A168C0 802406A0 00702021 */ addu $a0, $v1, $s0 -/* A168C4 802406A4 3084FFFF */ andi $a0, $a0, 0xffff -/* A168C8 802406A8 00101900 */ sll $v1, $s0, 4 -/* A168CC 802406AC 00431021 */ addu $v0, $v0, $v1 -/* A168D0 802406B0 0C01917C */ jal sins -/* A168D4 802406B4 2451000C */ addiu $s1, $v0, 0xc -/* A168D8 802406B8 00021400 */ sll $v0, $v0, 0x10 -/* A168DC 802406BC 00021403 */ sra $v0, $v0, 0x10 -/* A168E0 802406C0 00541021 */ addu $v0, $v0, $s4 -/* A168E4 802406C4 00021FC2 */ srl $v1, $v0, 0x1f -/* A168E8 802406C8 00431021 */ addu $v0, $v0, $v1 -/* A168EC 802406CC 00021043 */ sra $v0, $v0, 1 -/* A168F0 802406D0 00021C00 */ sll $v1, $v0, 0x10 -/* A168F4 802406D4 00031C03 */ sra $v1, $v1, 0x10 -/* A168F8 802406D8 00032080 */ sll $a0, $v1, 2 -/* A168FC 802406DC 00832021 */ addu $a0, $a0, $v1 -/* A16900 802406E0 00041940 */ sll $v1, $a0, 5 -/* A16904 802406E4 00641823 */ subu $v1, $v1, $a0 -/* A16908 802406E8 04610002 */ bgez $v1, .L802406F4 -/* A1690C 802406EC 0040202D */ daddu $a0, $v0, $zero -/* A16910 802406F0 24637FFF */ addiu $v1, $v1, 0x7fff -.L802406F4: -/* A16914 802406F4 000313C3 */ sra $v0, $v1, 0xf -/* A16918 802406F8 3C018024 */ lui $at, 0x8024 -/* A1691C 802406FC D4224DE8 */ ldc1 $f2, 0x4de8($at) -/* A16920 80240700 44820000 */ mtc1 $v0, $f0 -/* 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 -/* A16938 80240718 45030005 */ bc1tl .L80240730 -/* A1693C 8024071C 46340001 */ sub.d $f0, $f0, $f20 -/* A16940 80240720 4620010D */ trunc.w.d $f4, $f0 -/* A16944 80240724 44022000 */ mfc1 $v0, $f4 -/* A16948 80240728 080901D1 */ j .L80240744 -/* A1694C 8024072C A2220000 */ sb $v0, ($s1) -.L80240730: -/* A16950 80240730 4620010D */ trunc.w.d $f4, $f0 -/* A16954 80240734 44022000 */ mfc1 $v0, $f4 -/* A16958 80240738 00000000 */ nop -/* A1695C 8024073C 00531025 */ or $v0, $v0, $s3 -/* A16960 80240740 A2220000 */ sb $v0, ($s1) -.L80240744: -/* A16964 80240744 00041400 */ sll $v0, $a0, 0x10 -/* A16968 80240748 00021403 */ sra $v0, $v0, 0x10 -/* A1696C 8024074C 00021880 */ sll $v1, $v0, 2 -/* A16970 80240750 00621821 */ addu $v1, $v1, $v0 -/* A16974 80240754 00031140 */ sll $v0, $v1, 5 -/* A16978 80240758 00431023 */ subu $v0, $v0, $v1 -/* A1697C 8024075C 04410002 */ bgez $v0, .L80240768 -/* A16980 80240760 26230001 */ addiu $v1, $s1, 1 -/* A16984 80240764 24427FFF */ addiu $v0, $v0, 0x7fff -.L80240768: -/* A16988 80240768 000213C3 */ sra $v0, $v0, 0xf -/* A1698C 8024076C 3C018024 */ lui $at, 0x8024 -/* A16990 80240770 D4224DF0 */ ldc1 $f2, 0x4df0($at) -/* A16994 80240774 44820000 */ mtc1 $v0, $f0 -/* 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 -/* A169AC 8024078C 45030005 */ bc1tl .L802407A4 -/* A169B0 80240790 46340001 */ sub.d $f0, $f0, $f20 -/* A169B4 80240794 4620010D */ trunc.w.d $f4, $f0 -/* A169B8 80240798 44022000 */ mfc1 $v0, $f4 -/* A169BC 8024079C 080901EE */ j .L802407B8 -/* A169C0 802407A0 A0620000 */ sb $v0, ($v1) -.L802407A4: -/* A169C4 802407A4 4620010D */ trunc.w.d $f4, $f0 -/* A169C8 802407A8 44022000 */ mfc1 $v0, $f4 -/* A169CC 802407AC 00000000 */ nop -/* A169D0 802407B0 00531025 */ or $v0, $v0, $s3 -/* A169D4 802407B4 A0620000 */ sb $v0, ($v1) -.L802407B8: -/* A169D8 802407B8 00101FC2 */ srl $v1, $s0, 0x1f -/* A169DC 802407BC 02031821 */ addu $v1, $s0, $v1 -/* A169E0 802407C0 00032843 */ sra $a1, $v1, 1 -/* A169E4 802407C4 00B20018 */ mult $a1, $s2 -/* A169E8 802407C8 3C048024 */ lui $a0, 0x8024 -/* A169EC 802407CC 948433B0 */ lhu $a0, 0x33b0($a0) -/* A169F0 802407D0 00031FC3 */ sra $v1, $v1, 0x1f -/* A169F4 802407D4 000433C2 */ srl $a2, $a0, 0xf -/* A169F8 802407D8 00004810 */ mfhi $t1 -/* A169FC 802407DC 01231823 */ subu $v1, $t1, $v1 -/* A16A00 802407E0 00031040 */ sll $v0, $v1, 1 -/* A16A04 802407E4 00431021 */ addu $v0, $v0, $v1 -/* A16A08 802407E8 00A22823 */ subu $a1, $a1, $v0 -/* A16A0C 802407EC 24A50001 */ addiu $a1, $a1, 1 -/* A16A10 802407F0 00052BC0 */ sll $a1, $a1, 0xf -/* A16A14 802407F4 00C50018 */ mult $a2, $a1 -/* A16A18 802407F8 00042382 */ srl $a0, $a0, 0xe -/* A16A1C 802407FC 000423C0 */ sll $a0, $a0, 0xf -/* A16A20 80240800 00001812 */ mflo $v1 -/* A16A24 80240804 00642021 */ addu $a0, $v1, $a0 -/* A16A28 80240808 00902021 */ addu $a0, $a0, $s0 -/* A16A2C 8024080C 0C01917C */ jal sins -/* A16A30 80240810 3084FFFF */ andi $a0, $a0, 0xffff -/* A16A34 80240814 00021400 */ sll $v0, $v0, 0x10 -/* A16A38 80240818 00021403 */ sra $v0, $v0, 0x10 -/* A16A3C 8024081C 92230000 */ lbu $v1, ($s1) -/* A16A40 80240820 00541021 */ addu $v0, $v0, $s4 -/* A16A44 80240824 00620018 */ mult $v1, $v0 -/* A16A48 80240828 00001812 */ mflo $v1 -/* A16A4C 8024082C 04610003 */ bgez $v1, .L8024083C -/* A16A50 80240830 26240002 */ addiu $a0, $s1, 2 -/* A16A54 80240834 3402FFFF */ ori $v0, $zero, 0xffff -/* A16A58 80240838 00621821 */ addu $v1, $v1, $v0 -.L8024083C: -/* A16A5C 8024083C 00031403 */ sra $v0, $v1, 0x10 -/* A16A60 80240840 3C018024 */ lui $at, 0x8024 -/* A16A64 80240844 D4224DF8 */ ldc1 $f2, 0x4df8($at) -/* A16A68 80240848 44820000 */ mtc1 $v0, $f0 -/* 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 -/* A16A80 80240860 45030005 */ bc1tl .L80240878 -/* A16A84 80240864 46340001 */ sub.d $f0, $f0, $f20 -/* A16A88 80240868 4620010D */ trunc.w.d $f4, $f0 -/* A16A8C 8024086C 44022000 */ mfc1 $v0, $f4 -/* A16A90 80240870 08090223 */ j .L8024088C -/* A16A94 80240874 A0820000 */ sb $v0, ($a0) -.L80240878: -/* A16A98 80240878 4620010D */ trunc.w.d $f4, $f0 -/* A16A9C 8024087C 44022000 */ mfc1 $v0, $f4 -/* A16AA0 80240880 00000000 */ nop -/* A16AA4 80240884 00531025 */ or $v0, $v0, $s3 -/* A16AA8 80240888 A0820000 */ sb $v0, ($a0) -.L8024088C: -/* A16AAC 8024088C 8FA20018 */ lw $v0, 0x18($sp) -/* A16AB0 80240890 26100001 */ addiu $s0, $s0, 1 -/* A16AB4 80240894 0202102A */ slt $v0, $s0, $v0 -/* A16AB8 80240898 1440FF75 */ bnez $v0, .L80240670 -/* A16ABC 8024089C 02120018 */ mult $s0, $s2 -.L802408A0: -/* A16AC0 802408A0 3C03800A */ lui $v1, 0x800a -/* A16AC4 802408A4 2463A66C */ addiu $v1, $v1, -0x5994 -/* A16AC8 802408A8 8C620000 */ lw $v0, ($v1) -/* A16ACC 802408AC 24040001 */ addiu $a0, $zero, 1 -/* A16AD0 802408B0 0040802D */ daddu $s0, $v0, $zero -/* A16AD4 802408B4 24420008 */ addiu $v0, $v0, 8 -/* A16AD8 802408B8 AC620000 */ sw $v0, ($v1) -/* A16ADC 802408BC 3C02DE00 */ lui $v0, 0xde00 -/* A16AE0 802408C0 0C0470BB */ jal func_8011C2EC -/* A16AE4 802408C4 AE020000 */ sw $v0, ($s0) -/* A16AE8 802408C8 3C048024 */ lui $a0, 0x8024 -/* A16AEC 802408CC 248433B0 */ addiu $a0, $a0, 0x33b0 -/* A16AF0 802408D0 94830000 */ lhu $v1, ($a0) -/* A16AF4 802408D4 AE020004 */ sw $v0, 4($s0) -/* A16AF8 802408D8 24630253 */ addiu $v1, $v1, 0x253 -/* A16AFC 802408DC A4830000 */ sh $v1, ($a0) -/* A16B00 802408E0 8FBF0034 */ lw $ra, 0x34($sp) -/* A16B04 802408E4 8FB40030 */ lw $s4, 0x30($sp) -/* A16B08 802408E8 8FB3002C */ lw $s3, 0x2c($sp) -/* A16B0C 802408EC 8FB20028 */ lw $s2, 0x28($sp) -/* A16B10 802408F0 8FB10024 */ lw $s1, 0x24($sp) -/* A16B14 802408F4 8FB00020 */ lw $s0, 0x20($sp) -/* A16B18 802408F8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A16B1C 802408FC 03E00008 */ jr $ra -/* A16B20 80240900 27BD0040 */ addiu $sp, $sp, 0x40 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 new file mode 100644 index 0000000000..534dbb9655 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240610_A16830.s @@ -0,0 +1,204 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240610_A16830 +/* A16830 80240610 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A16834 80240614 24040001 */ addiu $a0, $zero, 1 +/* A16838 80240618 27A50010 */ addiu $a1, $sp, 0x10 +/* A1683C 8024061C 27A60014 */ addiu $a2, $sp, 0x14 +/* A16840 80240620 AFBF0034 */ sw $ra, 0x34($sp) +/* A16844 80240624 AFB40030 */ sw $s4, 0x30($sp) +/* A16848 80240628 AFB3002C */ sw $s3, 0x2c($sp) +/* A1684C 8024062C AFB20028 */ sw $s2, 0x28($sp) +/* A16850 80240630 AFB10024 */ sw $s1, 0x24($sp) +/* A16854 80240634 AFB00020 */ sw $s0, 0x20($sp) +/* A16858 80240638 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A1685C 8024063C 0C0470AC */ jal func_8011C2B0 +/* A16860 80240640 27A70018 */ addiu $a3, $sp, 0x18 +/* A16864 80240644 8FA20018 */ lw $v0, 0x18($sp) +/* A16868 80240648 18400095 */ blez $v0, .L802408A0 +/* A1686C 8024064C 0000802D */ daddu $s0, $zero, $zero +/* A16870 80240650 3C125555 */ lui $s2, 0x5555 +/* A16874 80240654 36525556 */ ori $s2, $s2, 0x5556 +/* A16878 80240658 34148000 */ ori $s4, $zero, 0x8000 +/* A1687C 8024065C 3C0141E0 */ lui $at, 0x41e0 +/* A16880 80240660 4481A800 */ mtc1 $at, $f21 +/* A16884 80240664 4480A000 */ mtc1 $zero, $f20 +/* A16888 80240668 3C138000 */ lui $s3, 0x8000 +/* A1688C 8024066C 02120018 */ mult $s0, $s2 +.L80240670: +/* A16890 80240670 00101FC3 */ sra $v1, $s0, 0x1f +/* A16894 80240674 00004810 */ mfhi $t1 +/* A16898 80240678 01231823 */ subu $v1, $t1, $v1 +/* A1689C 8024067C 00031040 */ sll $v0, $v1, 1 +/* A168A0 80240680 00431021 */ addu $v0, $v0, $v1 +/* A168A4 80240684 02021023 */ subu $v0, $s0, $v0 +/* A168A8 80240688 3C038024 */ lui $v1, 0x8024 +/* A168AC 8024068C 946333B0 */ lhu $v1, 0x33b0($v1) +/* A168B0 80240690 24420001 */ addiu $v0, $v0, 1 +/* A168B4 80240694 00620018 */ mult $v1, $v0 +/* A168B8 80240698 8FA20014 */ lw $v0, 0x14($sp) +/* A168BC 8024069C 00001812 */ mflo $v1 +/* A168C0 802406A0 00702021 */ addu $a0, $v1, $s0 +/* A168C4 802406A4 3084FFFF */ andi $a0, $a0, 0xffff +/* A168C8 802406A8 00101900 */ sll $v1, $s0, 4 +/* A168CC 802406AC 00431021 */ addu $v0, $v0, $v1 +/* A168D0 802406B0 0C01917C */ jal sins +/* A168D4 802406B4 2451000C */ addiu $s1, $v0, 0xc +/* A168D8 802406B8 00021400 */ sll $v0, $v0, 0x10 +/* A168DC 802406BC 00021403 */ sra $v0, $v0, 0x10 +/* A168E0 802406C0 00541021 */ addu $v0, $v0, $s4 +/* A168E4 802406C4 00021FC2 */ srl $v1, $v0, 0x1f +/* A168E8 802406C8 00431021 */ addu $v0, $v0, $v1 +/* A168EC 802406CC 00021043 */ sra $v0, $v0, 1 +/* A168F0 802406D0 00021C00 */ sll $v1, $v0, 0x10 +/* A168F4 802406D4 00031C03 */ sra $v1, $v1, 0x10 +/* A168F8 802406D8 00032080 */ sll $a0, $v1, 2 +/* A168FC 802406DC 00832021 */ addu $a0, $a0, $v1 +/* A16900 802406E0 00041940 */ sll $v1, $a0, 5 +/* A16904 802406E4 00641823 */ subu $v1, $v1, $a0 +/* A16908 802406E8 04610002 */ bgez $v1, .L802406F4 +/* A1690C 802406EC 0040202D */ daddu $a0, $v0, $zero +/* A16910 802406F0 24637FFF */ addiu $v1, $v1, 0x7fff +.L802406F4: +/* A16914 802406F4 000313C3 */ sra $v0, $v1, 0xf +/* A16918 802406F8 3C018024 */ lui $at, 0x8024 +/* A1691C 802406FC D4224DE8 */ ldc1 $f2, 0x4de8($at) +/* A16920 80240700 44820000 */ mtc1 $v0, $f0 +/* 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 +/* A16938 80240718 45030005 */ bc1tl .L80240730 +/* A1693C 8024071C 46340001 */ sub.d $f0, $f0, $f20 +/* A16940 80240720 4620010D */ trunc.w.d $f4, $f0 +/* A16944 80240724 44022000 */ mfc1 $v0, $f4 +/* A16948 80240728 080901D1 */ j .L80240744 +/* A1694C 8024072C A2220000 */ sb $v0, ($s1) +.L80240730: +/* A16950 80240730 4620010D */ trunc.w.d $f4, $f0 +/* A16954 80240734 44022000 */ mfc1 $v0, $f4 +/* A16958 80240738 00000000 */ nop +/* A1695C 8024073C 00531025 */ or $v0, $v0, $s3 +/* A16960 80240740 A2220000 */ sb $v0, ($s1) +.L80240744: +/* A16964 80240744 00041400 */ sll $v0, $a0, 0x10 +/* A16968 80240748 00021403 */ sra $v0, $v0, 0x10 +/* A1696C 8024074C 00021880 */ sll $v1, $v0, 2 +/* A16970 80240750 00621821 */ addu $v1, $v1, $v0 +/* A16974 80240754 00031140 */ sll $v0, $v1, 5 +/* A16978 80240758 00431023 */ subu $v0, $v0, $v1 +/* A1697C 8024075C 04410002 */ bgez $v0, .L80240768 +/* A16980 80240760 26230001 */ addiu $v1, $s1, 1 +/* A16984 80240764 24427FFF */ addiu $v0, $v0, 0x7fff +.L80240768: +/* A16988 80240768 000213C3 */ sra $v0, $v0, 0xf +/* A1698C 8024076C 3C018024 */ lui $at, 0x8024 +/* A16990 80240770 D4224DF0 */ ldc1 $f2, 0x4df0($at) +/* A16994 80240774 44820000 */ mtc1 $v0, $f0 +/* 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 +/* A169AC 8024078C 45030005 */ bc1tl .L802407A4 +/* A169B0 80240790 46340001 */ sub.d $f0, $f0, $f20 +/* A169B4 80240794 4620010D */ trunc.w.d $f4, $f0 +/* A169B8 80240798 44022000 */ mfc1 $v0, $f4 +/* A169BC 8024079C 080901EE */ j .L802407B8 +/* A169C0 802407A0 A0620000 */ sb $v0, ($v1) +.L802407A4: +/* A169C4 802407A4 4620010D */ trunc.w.d $f4, $f0 +/* A169C8 802407A8 44022000 */ mfc1 $v0, $f4 +/* A169CC 802407AC 00000000 */ nop +/* A169D0 802407B0 00531025 */ or $v0, $v0, $s3 +/* A169D4 802407B4 A0620000 */ sb $v0, ($v1) +.L802407B8: +/* A169D8 802407B8 00101FC2 */ srl $v1, $s0, 0x1f +/* A169DC 802407BC 02031821 */ addu $v1, $s0, $v1 +/* A169E0 802407C0 00032843 */ sra $a1, $v1, 1 +/* A169E4 802407C4 00B20018 */ mult $a1, $s2 +/* A169E8 802407C8 3C048024 */ lui $a0, 0x8024 +/* A169EC 802407CC 948433B0 */ lhu $a0, 0x33b0($a0) +/* A169F0 802407D0 00031FC3 */ sra $v1, $v1, 0x1f +/* A169F4 802407D4 000433C2 */ srl $a2, $a0, 0xf +/* A169F8 802407D8 00004810 */ mfhi $t1 +/* A169FC 802407DC 01231823 */ subu $v1, $t1, $v1 +/* A16A00 802407E0 00031040 */ sll $v0, $v1, 1 +/* A16A04 802407E4 00431021 */ addu $v0, $v0, $v1 +/* A16A08 802407E8 00A22823 */ subu $a1, $a1, $v0 +/* A16A0C 802407EC 24A50001 */ addiu $a1, $a1, 1 +/* A16A10 802407F0 00052BC0 */ sll $a1, $a1, 0xf +/* A16A14 802407F4 00C50018 */ mult $a2, $a1 +/* A16A18 802407F8 00042382 */ srl $a0, $a0, 0xe +/* A16A1C 802407FC 000423C0 */ sll $a0, $a0, 0xf +/* A16A20 80240800 00001812 */ mflo $v1 +/* A16A24 80240804 00642021 */ addu $a0, $v1, $a0 +/* A16A28 80240808 00902021 */ addu $a0, $a0, $s0 +/* A16A2C 8024080C 0C01917C */ jal sins +/* A16A30 80240810 3084FFFF */ andi $a0, $a0, 0xffff +/* A16A34 80240814 00021400 */ sll $v0, $v0, 0x10 +/* A16A38 80240818 00021403 */ sra $v0, $v0, 0x10 +/* A16A3C 8024081C 92230000 */ lbu $v1, ($s1) +/* A16A40 80240820 00541021 */ addu $v0, $v0, $s4 +/* A16A44 80240824 00620018 */ mult $v1, $v0 +/* A16A48 80240828 00001812 */ mflo $v1 +/* A16A4C 8024082C 04610003 */ bgez $v1, .L8024083C +/* A16A50 80240830 26240002 */ addiu $a0, $s1, 2 +/* A16A54 80240834 3402FFFF */ ori $v0, $zero, 0xffff +/* A16A58 80240838 00621821 */ addu $v1, $v1, $v0 +.L8024083C: +/* A16A5C 8024083C 00031403 */ sra $v0, $v1, 0x10 +/* A16A60 80240840 3C018024 */ lui $at, 0x8024 +/* A16A64 80240844 D4224DF8 */ ldc1 $f2, 0x4df8($at) +/* A16A68 80240848 44820000 */ mtc1 $v0, $f0 +/* 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 +/* A16A80 80240860 45030005 */ bc1tl .L80240878 +/* A16A84 80240864 46340001 */ sub.d $f0, $f0, $f20 +/* A16A88 80240868 4620010D */ trunc.w.d $f4, $f0 +/* A16A8C 8024086C 44022000 */ mfc1 $v0, $f4 +/* A16A90 80240870 08090223 */ j .L8024088C +/* A16A94 80240874 A0820000 */ sb $v0, ($a0) +.L80240878: +/* A16A98 80240878 4620010D */ trunc.w.d $f4, $f0 +/* A16A9C 8024087C 44022000 */ mfc1 $v0, $f4 +/* A16AA0 80240880 00000000 */ nop +/* A16AA4 80240884 00531025 */ or $v0, $v0, $s3 +/* A16AA8 80240888 A0820000 */ sb $v0, ($a0) +.L8024088C: +/* A16AAC 8024088C 8FA20018 */ lw $v0, 0x18($sp) +/* A16AB0 80240890 26100001 */ addiu $s0, $s0, 1 +/* A16AB4 80240894 0202102A */ slt $v0, $s0, $v0 +/* A16AB8 80240898 1440FF75 */ bnez $v0, .L80240670 +/* A16ABC 8024089C 02120018 */ mult $s0, $s2 +.L802408A0: +/* A16AC0 802408A0 3C03800A */ lui $v1, 0x800a +/* A16AC4 802408A4 2463A66C */ addiu $v1, $v1, -0x5994 +/* A16AC8 802408A8 8C620000 */ lw $v0, ($v1) +/* A16ACC 802408AC 24040001 */ addiu $a0, $zero, 1 +/* A16AD0 802408B0 0040802D */ daddu $s0, $v0, $zero +/* A16AD4 802408B4 24420008 */ addiu $v0, $v0, 8 +/* A16AD8 802408B8 AC620000 */ sw $v0, ($v1) +/* A16ADC 802408BC 3C02DE00 */ lui $v0, 0xde00 +/* A16AE0 802408C0 0C0470BB */ jal func_8011C2EC +/* A16AE4 802408C4 AE020000 */ sw $v0, ($s0) +/* A16AE8 802408C8 3C048024 */ lui $a0, 0x8024 +/* A16AEC 802408CC 248433B0 */ addiu $a0, $a0, 0x33b0 +/* A16AF0 802408D0 94830000 */ lhu $v1, ($a0) +/* A16AF4 802408D4 AE020004 */ sw $v0, 4($s0) +/* A16AF8 802408D8 24630253 */ addiu $v1, $v1, 0x253 +/* A16AFC 802408DC A4830000 */ sh $v1, ($a0) +/* A16B00 802408E0 8FBF0034 */ lw $ra, 0x34($sp) +/* A16B04 802408E4 8FB40030 */ lw $s4, 0x30($sp) +/* A16B08 802408E8 8FB3002C */ lw $s3, 0x2c($sp) +/* A16B0C 802408EC 8FB20028 */ lw $s2, 0x28($sp) +/* A16B10 802408F0 8FB10024 */ lw $s1, 0x24($sp) +/* A16B14 802408F4 8FB00020 */ lw $s0, 0x20($sp) +/* A16B18 802408F8 D7B40038 */ ldc1 $f20, 0x38($sp) +/* A16B1C 802408FC 03E00008 */ jr $ra +/* A16B20 80240900 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC.s b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC.s deleted file mode 100644 index bd6a9cb431..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC.s +++ /dev/null @@ -1,205 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BFC -/* A16E1C 80240BFC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A16E20 80240C00 24040003 */ addiu $a0, $zero, 3 -/* A16E24 80240C04 27A50010 */ addiu $a1, $sp, 0x10 -/* A16E28 80240C08 27A60014 */ addiu $a2, $sp, 0x14 -/* A16E2C 80240C0C AFBF0034 */ sw $ra, 0x34($sp) -/* A16E30 80240C10 AFB40030 */ sw $s4, 0x30($sp) -/* A16E34 80240C14 AFB3002C */ sw $s3, 0x2c($sp) -/* A16E38 80240C18 AFB20028 */ sw $s2, 0x28($sp) -/* A16E3C 80240C1C AFB10024 */ sw $s1, 0x24($sp) -/* A16E40 80240C20 AFB00020 */ sw $s0, 0x20($sp) -/* A16E44 80240C24 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A16E48 80240C28 0C0470AC */ jal func_8011C2B0 -/* A16E4C 80240C2C 27A70018 */ addiu $a3, $sp, 0x18 -/* A16E50 80240C30 8FA20018 */ lw $v0, 0x18($sp) -/* A16E54 80240C34 18400096 */ blez $v0, .L80240E90 -/* A16E58 80240C38 0000802D */ daddu $s0, $zero, $zero -/* A16E5C 80240C3C 3C125555 */ lui $s2, 0x5555 -/* A16E60 80240C40 36525556 */ ori $s2, $s2, 0x5556 -/* A16E64 80240C44 34148000 */ ori $s4, $zero, 0x8000 -/* A16E68 80240C48 3C0141E0 */ lui $at, 0x41e0 -/* A16E6C 80240C4C 4481A800 */ mtc1 $at, $f21 -/* A16E70 80240C50 4480A000 */ mtc1 $zero, $f20 -/* A16E74 80240C54 3C138000 */ lui $s3, 0x8000 -/* A16E78 80240C58 02120018 */ mult $s0, $s2 -.L80240C5C: -/* A16E7C 80240C5C 00101FC3 */ sra $v1, $s0, 0x1f -/* A16E80 80240C60 00004810 */ mfhi $t1 -/* A16E84 80240C64 01231823 */ subu $v1, $t1, $v1 -/* A16E88 80240C68 00031040 */ sll $v0, $v1, 1 -/* A16E8C 80240C6C 00431021 */ addu $v0, $v0, $v1 -/* A16E90 80240C70 02021023 */ subu $v0, $s0, $v0 -/* A16E94 80240C74 3C038024 */ lui $v1, 0x8024 -/* A16E98 80240C78 946333B4 */ lhu $v1, 0x33b4($v1) -/* A16E9C 80240C7C 24420001 */ addiu $v0, $v0, 1 -/* A16EA0 80240C80 00620018 */ mult $v1, $v0 -/* A16EA4 80240C84 8FA20014 */ lw $v0, 0x14($sp) -/* A16EA8 80240C88 00001812 */ mflo $v1 -/* A16EAC 80240C8C 00702021 */ addu $a0, $v1, $s0 -/* A16EB0 80240C90 3084FFFF */ andi $a0, $a0, 0xffff -/* A16EB4 80240C94 00101900 */ sll $v1, $s0, 4 -/* A16EB8 80240C98 00431021 */ addu $v0, $v0, $v1 -/* A16EBC 80240C9C 0C01917C */ jal sins -/* A16EC0 80240CA0 2451000C */ addiu $s1, $v0, 0xc -/* A16EC4 80240CA4 00021400 */ sll $v0, $v0, 0x10 -/* A16EC8 80240CA8 00021403 */ sra $v0, $v0, 0x10 -/* A16ECC 80240CAC 00541021 */ addu $v0, $v0, $s4 -/* A16ED0 80240CB0 00021FC2 */ srl $v1, $v0, 0x1f -/* A16ED4 80240CB4 00431021 */ addu $v0, $v0, $v1 -/* A16ED8 80240CB8 00021043 */ sra $v0, $v0, 1 -/* A16EDC 80240CBC 00021C00 */ sll $v1, $v0, 0x10 -/* A16EE0 80240CC0 00031C03 */ sra $v1, $v1, 0x10 -/* A16EE4 80240CC4 00032080 */ sll $a0, $v1, 2 -/* A16EE8 80240CC8 00832021 */ addu $a0, $a0, $v1 -/* A16EEC 80240CCC 00041940 */ sll $v1, $a0, 5 -/* A16EF0 80240CD0 00641823 */ subu $v1, $v1, $a0 -/* A16EF4 80240CD4 04610002 */ bgez $v1, .L80240CE0 -/* A16EF8 80240CD8 0040202D */ daddu $a0, $v0, $zero -/* A16EFC 80240CDC 24637FFF */ addiu $v1, $v1, 0x7fff -.L80240CE0: -/* A16F00 80240CE0 000313C3 */ sra $v0, $v1, 0xf -/* A16F04 80240CE4 3C014059 */ lui $at, 0x4059 -/* A16F08 80240CE8 44811800 */ mtc1 $at, $f3 -/* A16F0C 80240CEC 44801000 */ mtc1 $zero, $f2 -/* A16F10 80240CF0 44820000 */ mtc1 $v0, $f0 -/* 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 -/* A16F28 80240D08 45030005 */ bc1tl .L80240D20 -/* A16F2C 80240D0C 46340001 */ sub.d $f0, $f0, $f20 -/* A16F30 80240D10 4620010D */ trunc.w.d $f4, $f0 -/* A16F34 80240D14 44022000 */ mfc1 $v0, $f4 -/* A16F38 80240D18 0809034D */ j .L80240D34 -/* A16F3C 80240D1C A2220000 */ sb $v0, ($s1) -.L80240D20: -/* A16F40 80240D20 4620010D */ trunc.w.d $f4, $f0 -/* A16F44 80240D24 44022000 */ mfc1 $v0, $f4 -/* A16F48 80240D28 00000000 */ nop -/* A16F4C 80240D2C 00531025 */ or $v0, $v0, $s3 -/* A16F50 80240D30 A2220000 */ sb $v0, ($s1) -.L80240D34: -/* A16F54 80240D34 00041400 */ sll $v0, $a0, 0x10 -/* A16F58 80240D38 00021403 */ sra $v0, $v0, 0x10 -/* A16F5C 80240D3C 00021880 */ sll $v1, $v0, 2 -/* A16F60 80240D40 00621821 */ addu $v1, $v1, $v0 -/* A16F64 80240D44 00031140 */ sll $v0, $v1, 5 -/* A16F68 80240D48 00431023 */ subu $v0, $v0, $v1 -/* A16F6C 80240D4C 04410002 */ bgez $v0, .L80240D58 -/* A16F70 80240D50 26230001 */ addiu $v1, $s1, 1 -/* A16F74 80240D54 24427FFF */ addiu $v0, $v0, 0x7fff -.L80240D58: -/* A16F78 80240D58 000213C3 */ sra $v0, $v0, 0xf -/* A16F7C 80240D5C 3C018024 */ lui $at, 0x8024 -/* A16F80 80240D60 D4224E10 */ ldc1 $f2, 0x4e10($at) -/* A16F84 80240D64 44820000 */ mtc1 $v0, $f0 -/* 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 -/* A16F9C 80240D7C 45030005 */ bc1tl .L80240D94 -/* A16FA0 80240D80 46340001 */ sub.d $f0, $f0, $f20 -/* A16FA4 80240D84 4620010D */ trunc.w.d $f4, $f0 -/* A16FA8 80240D88 44022000 */ mfc1 $v0, $f4 -/* A16FAC 80240D8C 0809036A */ j .L80240DA8 -/* A16FB0 80240D90 A0620000 */ sb $v0, ($v1) -.L80240D94: -/* A16FB4 80240D94 4620010D */ trunc.w.d $f4, $f0 -/* A16FB8 80240D98 44022000 */ mfc1 $v0, $f4 -/* A16FBC 80240D9C 00000000 */ nop -/* A16FC0 80240DA0 00531025 */ or $v0, $v0, $s3 -/* A16FC4 80240DA4 A0620000 */ sb $v0, ($v1) -.L80240DA8: -/* A16FC8 80240DA8 00101FC2 */ srl $v1, $s0, 0x1f -/* A16FCC 80240DAC 02031821 */ addu $v1, $s0, $v1 -/* A16FD0 80240DB0 00032843 */ sra $a1, $v1, 1 -/* A16FD4 80240DB4 00B20018 */ mult $a1, $s2 -/* A16FD8 80240DB8 3C048024 */ lui $a0, 0x8024 -/* A16FDC 80240DBC 948433B4 */ lhu $a0, 0x33b4($a0) -/* A16FE0 80240DC0 00031FC3 */ sra $v1, $v1, 0x1f -/* A16FE4 80240DC4 000433C2 */ srl $a2, $a0, 0xf -/* A16FE8 80240DC8 00004810 */ mfhi $t1 -/* A16FEC 80240DCC 01231823 */ subu $v1, $t1, $v1 -/* A16FF0 80240DD0 00031040 */ sll $v0, $v1, 1 -/* A16FF4 80240DD4 00431021 */ addu $v0, $v0, $v1 -/* A16FF8 80240DD8 00A22823 */ subu $a1, $a1, $v0 -/* A16FFC 80240DDC 24A50001 */ addiu $a1, $a1, 1 -/* A17000 80240DE0 00052BC0 */ sll $a1, $a1, 0xf -/* A17004 80240DE4 00C50018 */ mult $a2, $a1 -/* A17008 80240DE8 00042382 */ srl $a0, $a0, 0xe -/* A1700C 80240DEC 000423C0 */ sll $a0, $a0, 0xf -/* A17010 80240DF0 00001812 */ mflo $v1 -/* A17014 80240DF4 00642021 */ addu $a0, $v1, $a0 -/* A17018 80240DF8 00902021 */ addu $a0, $a0, $s0 -/* A1701C 80240DFC 0C01917C */ jal sins -/* A17020 80240E00 3084FFFF */ andi $a0, $a0, 0xffff -/* A17024 80240E04 00021400 */ sll $v0, $v0, 0x10 -/* A17028 80240E08 00021403 */ sra $v0, $v0, 0x10 -/* A1702C 80240E0C 92230000 */ lbu $v1, ($s1) -/* A17030 80240E10 00541021 */ addu $v0, $v0, $s4 -/* A17034 80240E14 00620018 */ mult $v1, $v0 -/* A17038 80240E18 00001812 */ mflo $v1 -/* A1703C 80240E1C 04610003 */ bgez $v1, .L80240E2C -/* A17040 80240E20 26240002 */ addiu $a0, $s1, 2 -/* A17044 80240E24 3402FFFF */ ori $v0, $zero, 0xffff -/* A17048 80240E28 00621821 */ addu $v1, $v1, $v0 -.L80240E2C: -/* A1704C 80240E2C 00031403 */ sra $v0, $v1, 0x10 -/* A17050 80240E30 3C018024 */ lui $at, 0x8024 -/* A17054 80240E34 D4224E18 */ ldc1 $f2, 0x4e18($at) -/* A17058 80240E38 44820000 */ mtc1 $v0, $f0 -/* 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 -/* A17070 80240E50 45030005 */ bc1tl .L80240E68 -/* A17074 80240E54 46340001 */ sub.d $f0, $f0, $f20 -/* A17078 80240E58 4620010D */ trunc.w.d $f4, $f0 -/* A1707C 80240E5C 44022000 */ mfc1 $v0, $f4 -/* A17080 80240E60 0809039F */ j .L80240E7C -/* A17084 80240E64 A0820000 */ sb $v0, ($a0) -.L80240E68: -/* A17088 80240E68 4620010D */ trunc.w.d $f4, $f0 -/* A1708C 80240E6C 44022000 */ mfc1 $v0, $f4 -/* A17090 80240E70 00000000 */ nop -/* A17094 80240E74 00531025 */ or $v0, $v0, $s3 -/* A17098 80240E78 A0820000 */ sb $v0, ($a0) -.L80240E7C: -/* A1709C 80240E7C 8FA20018 */ lw $v0, 0x18($sp) -/* A170A0 80240E80 26100001 */ addiu $s0, $s0, 1 -/* A170A4 80240E84 0202102A */ slt $v0, $s0, $v0 -/* A170A8 80240E88 1440FF74 */ bnez $v0, .L80240C5C -/* A170AC 80240E8C 02120018 */ mult $s0, $s2 -.L80240E90: -/* A170B0 80240E90 3C03800A */ lui $v1, 0x800a -/* A170B4 80240E94 2463A66C */ addiu $v1, $v1, -0x5994 -/* A170B8 80240E98 8C620000 */ lw $v0, ($v1) -/* A170BC 80240E9C 24040003 */ addiu $a0, $zero, 3 -/* A170C0 80240EA0 0040802D */ daddu $s0, $v0, $zero -/* A170C4 80240EA4 24420008 */ addiu $v0, $v0, 8 -/* A170C8 80240EA8 AC620000 */ sw $v0, ($v1) -/* A170CC 80240EAC 3C02DE00 */ lui $v0, 0xde00 -/* A170D0 80240EB0 0C0470BB */ jal func_8011C2EC -/* A170D4 80240EB4 AE020000 */ sw $v0, ($s0) -/* A170D8 80240EB8 3C048024 */ lui $a0, 0x8024 -/* A170DC 80240EBC 248433B4 */ addiu $a0, $a0, 0x33b4 -/* A170E0 80240EC0 94830000 */ lhu $v1, ($a0) -/* A170E4 80240EC4 AE020004 */ sw $v0, 4($s0) -/* A170E8 80240EC8 24630253 */ addiu $v1, $v1, 0x253 -/* A170EC 80240ECC A4830000 */ sh $v1, ($a0) -/* A170F0 80240ED0 8FBF0034 */ lw $ra, 0x34($sp) -/* A170F4 80240ED4 8FB40030 */ lw $s4, 0x30($sp) -/* A170F8 80240ED8 8FB3002C */ lw $s3, 0x2c($sp) -/* A170FC 80240EDC 8FB20028 */ lw $s2, 0x28($sp) -/* A17100 80240EE0 8FB10024 */ lw $s1, 0x24($sp) -/* A17104 80240EE4 8FB00020 */ lw $s0, 0x20($sp) -/* A17108 80240EE8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A1710C 80240EEC 03E00008 */ jr $ra -/* A17110 80240EF0 27BD0040 */ addiu $sp, $sp, 0x40 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 new file mode 100644 index 0000000000..0a4571640f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A16220/func_80240BFC_A16E1C.s @@ -0,0 +1,205 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BFC_A16E1C +/* A16E1C 80240BFC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A16E20 80240C00 24040003 */ addiu $a0, $zero, 3 +/* A16E24 80240C04 27A50010 */ addiu $a1, $sp, 0x10 +/* A16E28 80240C08 27A60014 */ addiu $a2, $sp, 0x14 +/* A16E2C 80240C0C AFBF0034 */ sw $ra, 0x34($sp) +/* A16E30 80240C10 AFB40030 */ sw $s4, 0x30($sp) +/* A16E34 80240C14 AFB3002C */ sw $s3, 0x2c($sp) +/* A16E38 80240C18 AFB20028 */ sw $s2, 0x28($sp) +/* A16E3C 80240C1C AFB10024 */ sw $s1, 0x24($sp) +/* A16E40 80240C20 AFB00020 */ sw $s0, 0x20($sp) +/* A16E44 80240C24 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A16E48 80240C28 0C0470AC */ jal func_8011C2B0 +/* A16E4C 80240C2C 27A70018 */ addiu $a3, $sp, 0x18 +/* A16E50 80240C30 8FA20018 */ lw $v0, 0x18($sp) +/* A16E54 80240C34 18400096 */ blez $v0, .L80240E90 +/* A16E58 80240C38 0000802D */ daddu $s0, $zero, $zero +/* A16E5C 80240C3C 3C125555 */ lui $s2, 0x5555 +/* A16E60 80240C40 36525556 */ ori $s2, $s2, 0x5556 +/* A16E64 80240C44 34148000 */ ori $s4, $zero, 0x8000 +/* A16E68 80240C48 3C0141E0 */ lui $at, 0x41e0 +/* A16E6C 80240C4C 4481A800 */ mtc1 $at, $f21 +/* A16E70 80240C50 4480A000 */ mtc1 $zero, $f20 +/* A16E74 80240C54 3C138000 */ lui $s3, 0x8000 +/* A16E78 80240C58 02120018 */ mult $s0, $s2 +.L80240C5C: +/* A16E7C 80240C5C 00101FC3 */ sra $v1, $s0, 0x1f +/* A16E80 80240C60 00004810 */ mfhi $t1 +/* A16E84 80240C64 01231823 */ subu $v1, $t1, $v1 +/* A16E88 80240C68 00031040 */ sll $v0, $v1, 1 +/* A16E8C 80240C6C 00431021 */ addu $v0, $v0, $v1 +/* A16E90 80240C70 02021023 */ subu $v0, $s0, $v0 +/* A16E94 80240C74 3C038024 */ lui $v1, 0x8024 +/* A16E98 80240C78 946333B4 */ lhu $v1, 0x33b4($v1) +/* A16E9C 80240C7C 24420001 */ addiu $v0, $v0, 1 +/* A16EA0 80240C80 00620018 */ mult $v1, $v0 +/* A16EA4 80240C84 8FA20014 */ lw $v0, 0x14($sp) +/* A16EA8 80240C88 00001812 */ mflo $v1 +/* A16EAC 80240C8C 00702021 */ addu $a0, $v1, $s0 +/* A16EB0 80240C90 3084FFFF */ andi $a0, $a0, 0xffff +/* A16EB4 80240C94 00101900 */ sll $v1, $s0, 4 +/* A16EB8 80240C98 00431021 */ addu $v0, $v0, $v1 +/* A16EBC 80240C9C 0C01917C */ jal sins +/* A16EC0 80240CA0 2451000C */ addiu $s1, $v0, 0xc +/* A16EC4 80240CA4 00021400 */ sll $v0, $v0, 0x10 +/* A16EC8 80240CA8 00021403 */ sra $v0, $v0, 0x10 +/* A16ECC 80240CAC 00541021 */ addu $v0, $v0, $s4 +/* A16ED0 80240CB0 00021FC2 */ srl $v1, $v0, 0x1f +/* A16ED4 80240CB4 00431021 */ addu $v0, $v0, $v1 +/* A16ED8 80240CB8 00021043 */ sra $v0, $v0, 1 +/* A16EDC 80240CBC 00021C00 */ sll $v1, $v0, 0x10 +/* A16EE0 80240CC0 00031C03 */ sra $v1, $v1, 0x10 +/* A16EE4 80240CC4 00032080 */ sll $a0, $v1, 2 +/* A16EE8 80240CC8 00832021 */ addu $a0, $a0, $v1 +/* A16EEC 80240CCC 00041940 */ sll $v1, $a0, 5 +/* A16EF0 80240CD0 00641823 */ subu $v1, $v1, $a0 +/* A16EF4 80240CD4 04610002 */ bgez $v1, .L80240CE0 +/* A16EF8 80240CD8 0040202D */ daddu $a0, $v0, $zero +/* A16EFC 80240CDC 24637FFF */ addiu $v1, $v1, 0x7fff +.L80240CE0: +/* A16F00 80240CE0 000313C3 */ sra $v0, $v1, 0xf +/* A16F04 80240CE4 3C014059 */ lui $at, 0x4059 +/* A16F08 80240CE8 44811800 */ mtc1 $at, $f3 +/* A16F0C 80240CEC 44801000 */ mtc1 $zero, $f2 +/* A16F10 80240CF0 44820000 */ mtc1 $v0, $f0 +/* 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 +/* A16F28 80240D08 45030005 */ bc1tl .L80240D20 +/* A16F2C 80240D0C 46340001 */ sub.d $f0, $f0, $f20 +/* A16F30 80240D10 4620010D */ trunc.w.d $f4, $f0 +/* A16F34 80240D14 44022000 */ mfc1 $v0, $f4 +/* A16F38 80240D18 0809034D */ j .L80240D34 +/* A16F3C 80240D1C A2220000 */ sb $v0, ($s1) +.L80240D20: +/* A16F40 80240D20 4620010D */ trunc.w.d $f4, $f0 +/* A16F44 80240D24 44022000 */ mfc1 $v0, $f4 +/* A16F48 80240D28 00000000 */ nop +/* A16F4C 80240D2C 00531025 */ or $v0, $v0, $s3 +/* A16F50 80240D30 A2220000 */ sb $v0, ($s1) +.L80240D34: +/* A16F54 80240D34 00041400 */ sll $v0, $a0, 0x10 +/* A16F58 80240D38 00021403 */ sra $v0, $v0, 0x10 +/* A16F5C 80240D3C 00021880 */ sll $v1, $v0, 2 +/* A16F60 80240D40 00621821 */ addu $v1, $v1, $v0 +/* A16F64 80240D44 00031140 */ sll $v0, $v1, 5 +/* A16F68 80240D48 00431023 */ subu $v0, $v0, $v1 +/* A16F6C 80240D4C 04410002 */ bgez $v0, .L80240D58 +/* A16F70 80240D50 26230001 */ addiu $v1, $s1, 1 +/* A16F74 80240D54 24427FFF */ addiu $v0, $v0, 0x7fff +.L80240D58: +/* A16F78 80240D58 000213C3 */ sra $v0, $v0, 0xf +/* A16F7C 80240D5C 3C018024 */ lui $at, 0x8024 +/* A16F80 80240D60 D4224E10 */ ldc1 $f2, 0x4e10($at) +/* A16F84 80240D64 44820000 */ mtc1 $v0, $f0 +/* 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 +/* A16F9C 80240D7C 45030005 */ bc1tl .L80240D94 +/* A16FA0 80240D80 46340001 */ sub.d $f0, $f0, $f20 +/* A16FA4 80240D84 4620010D */ trunc.w.d $f4, $f0 +/* A16FA8 80240D88 44022000 */ mfc1 $v0, $f4 +/* A16FAC 80240D8C 0809036A */ j .L80240DA8 +/* A16FB0 80240D90 A0620000 */ sb $v0, ($v1) +.L80240D94: +/* A16FB4 80240D94 4620010D */ trunc.w.d $f4, $f0 +/* A16FB8 80240D98 44022000 */ mfc1 $v0, $f4 +/* A16FBC 80240D9C 00000000 */ nop +/* A16FC0 80240DA0 00531025 */ or $v0, $v0, $s3 +/* A16FC4 80240DA4 A0620000 */ sb $v0, ($v1) +.L80240DA8: +/* A16FC8 80240DA8 00101FC2 */ srl $v1, $s0, 0x1f +/* A16FCC 80240DAC 02031821 */ addu $v1, $s0, $v1 +/* A16FD0 80240DB0 00032843 */ sra $a1, $v1, 1 +/* A16FD4 80240DB4 00B20018 */ mult $a1, $s2 +/* A16FD8 80240DB8 3C048024 */ lui $a0, 0x8024 +/* A16FDC 80240DBC 948433B4 */ lhu $a0, 0x33b4($a0) +/* A16FE0 80240DC0 00031FC3 */ sra $v1, $v1, 0x1f +/* A16FE4 80240DC4 000433C2 */ srl $a2, $a0, 0xf +/* A16FE8 80240DC8 00004810 */ mfhi $t1 +/* A16FEC 80240DCC 01231823 */ subu $v1, $t1, $v1 +/* A16FF0 80240DD0 00031040 */ sll $v0, $v1, 1 +/* A16FF4 80240DD4 00431021 */ addu $v0, $v0, $v1 +/* A16FF8 80240DD8 00A22823 */ subu $a1, $a1, $v0 +/* A16FFC 80240DDC 24A50001 */ addiu $a1, $a1, 1 +/* A17000 80240DE0 00052BC0 */ sll $a1, $a1, 0xf +/* A17004 80240DE4 00C50018 */ mult $a2, $a1 +/* A17008 80240DE8 00042382 */ srl $a0, $a0, 0xe +/* A1700C 80240DEC 000423C0 */ sll $a0, $a0, 0xf +/* A17010 80240DF0 00001812 */ mflo $v1 +/* A17014 80240DF4 00642021 */ addu $a0, $v1, $a0 +/* A17018 80240DF8 00902021 */ addu $a0, $a0, $s0 +/* A1701C 80240DFC 0C01917C */ jal sins +/* A17020 80240E00 3084FFFF */ andi $a0, $a0, 0xffff +/* A17024 80240E04 00021400 */ sll $v0, $v0, 0x10 +/* A17028 80240E08 00021403 */ sra $v0, $v0, 0x10 +/* A1702C 80240E0C 92230000 */ lbu $v1, ($s1) +/* A17030 80240E10 00541021 */ addu $v0, $v0, $s4 +/* A17034 80240E14 00620018 */ mult $v1, $v0 +/* A17038 80240E18 00001812 */ mflo $v1 +/* A1703C 80240E1C 04610003 */ bgez $v1, .L80240E2C +/* A17040 80240E20 26240002 */ addiu $a0, $s1, 2 +/* A17044 80240E24 3402FFFF */ ori $v0, $zero, 0xffff +/* A17048 80240E28 00621821 */ addu $v1, $v1, $v0 +.L80240E2C: +/* A1704C 80240E2C 00031403 */ sra $v0, $v1, 0x10 +/* A17050 80240E30 3C018024 */ lui $at, 0x8024 +/* A17054 80240E34 D4224E18 */ ldc1 $f2, 0x4e18($at) +/* A17058 80240E38 44820000 */ mtc1 $v0, $f0 +/* 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 +/* A17070 80240E50 45030005 */ bc1tl .L80240E68 +/* A17074 80240E54 46340001 */ sub.d $f0, $f0, $f20 +/* A17078 80240E58 4620010D */ trunc.w.d $f4, $f0 +/* A1707C 80240E5C 44022000 */ mfc1 $v0, $f4 +/* A17080 80240E60 0809039F */ j .L80240E7C +/* A17084 80240E64 A0820000 */ sb $v0, ($a0) +.L80240E68: +/* A17088 80240E68 4620010D */ trunc.w.d $f4, $f0 +/* A1708C 80240E6C 44022000 */ mfc1 $v0, $f4 +/* A17090 80240E70 00000000 */ nop +/* A17094 80240E74 00531025 */ or $v0, $v0, $s3 +/* A17098 80240E78 A0820000 */ sb $v0, ($a0) +.L80240E7C: +/* A1709C 80240E7C 8FA20018 */ lw $v0, 0x18($sp) +/* A170A0 80240E80 26100001 */ addiu $s0, $s0, 1 +/* A170A4 80240E84 0202102A */ slt $v0, $s0, $v0 +/* A170A8 80240E88 1440FF74 */ bnez $v0, .L80240C5C +/* A170AC 80240E8C 02120018 */ mult $s0, $s2 +.L80240E90: +/* A170B0 80240E90 3C03800A */ lui $v1, 0x800a +/* A170B4 80240E94 2463A66C */ addiu $v1, $v1, -0x5994 +/* A170B8 80240E98 8C620000 */ lw $v0, ($v1) +/* A170BC 80240E9C 24040003 */ addiu $a0, $zero, 3 +/* A170C0 80240EA0 0040802D */ daddu $s0, $v0, $zero +/* A170C4 80240EA4 24420008 */ addiu $v0, $v0, 8 +/* A170C8 80240EA8 AC620000 */ sw $v0, ($v1) +/* A170CC 80240EAC 3C02DE00 */ lui $v0, 0xde00 +/* A170D0 80240EB0 0C0470BB */ jal func_8011C2EC +/* A170D4 80240EB4 AE020000 */ sw $v0, ($s0) +/* A170D8 80240EB8 3C048024 */ lui $a0, 0x8024 +/* A170DC 80240EBC 248433B4 */ addiu $a0, $a0, 0x33b4 +/* A170E0 80240EC0 94830000 */ lhu $v1, ($a0) +/* A170E4 80240EC4 AE020004 */ sw $v0, 4($s0) +/* A170E8 80240EC8 24630253 */ addiu $v1, $v1, 0x253 +/* A170EC 80240ECC A4830000 */ sh $v1, ($a0) +/* A170F0 80240ED0 8FBF0034 */ lw $ra, 0x34($sp) +/* A170F4 80240ED4 8FB40030 */ lw $s4, 0x30($sp) +/* A170F8 80240ED8 8FB3002C */ lw $s3, 0x2c($sp) +/* A170FC 80240EDC 8FB20028 */ lw $s2, 0x28($sp) +/* A17100 80240EE0 8FB10024 */ lw $s1, 0x24($sp) +/* A17104 80240EE4 8FB00020 */ lw $s0, 0x20($sp) +/* A17108 80240EE8 D7B40038 */ ldc1 $f20, 0x38($sp) +/* A1710C 80240EEC 03E00008 */ jr $ra +/* A17110 80240EF0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0.s deleted file mode 100644 index b58475b5ef..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FF0 -/* A17210 80240FF0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A17214 80240FF4 AFB3002C */ sw $s3, 0x2c($sp) -/* A17218 80240FF8 0080982D */ daddu $s3, $a0, $zero -/* A1721C 80240FFC AFBF0030 */ sw $ra, 0x30($sp) -/* A17220 80241000 AFB20028 */ sw $s2, 0x28($sp) -/* A17224 80241004 AFB10024 */ sw $s1, 0x24($sp) -/* A17228 80241008 AFB00020 */ sw $s0, 0x20($sp) -/* A1722C 8024100C 8E710148 */ lw $s1, 0x148($s3) -/* A17230 80241010 86240008 */ lh $a0, 8($s1) -/* A17234 80241014 0C00EABB */ jal get_npc_unsafe -/* A17238 80241018 00A0902D */ daddu $s2, $a1, $zero -/* A1723C 8024101C 8E440004 */ lw $a0, 4($s2) -/* A17240 80241020 0040802D */ daddu $s0, $v0, $zero -/* A17244 80241024 00041FC2 */ srl $v1, $a0, 0x1f -/* A17248 80241028 00832021 */ addu $a0, $a0, $v1 -/* A1724C 8024102C 00042043 */ sra $a0, $a0, 1 -/* A17250 80241030 0C00A67F */ jal rand_int -/* A17254 80241034 24840001 */ addiu $a0, $a0, 1 -/* A17258 80241038 8E430004 */ lw $v1, 4($s2) -/* A1725C 8024103C 000327C2 */ srl $a0, $v1, 0x1f -/* A17260 80241040 00641821 */ addu $v1, $v1, $a0 -/* A17264 80241044 00031843 */ sra $v1, $v1, 1 -/* A17268 80241048 00621821 */ addu $v1, $v1, $v0 -/* A1726C 8024104C A603008E */ sh $v1, 0x8e($s0) -/* A17270 80241050 8E2300D0 */ lw $v1, 0xd0($s1) -/* A17274 80241054 C6000040 */ lwc1 $f0, 0x40($s0) -/* A17278 80241058 C4640000 */ lwc1 $f4, ($v1) -/* A1727C 8024105C 46802120 */ cvt.s.w $f4, $f4 -/* A17280 80241060 C4620008 */ lwc1 $f2, 8($v1) -/* A17284 80241064 468010A0 */ cvt.s.w $f2, $f2 -/* A17288 80241068 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1728C 8024106C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17290 80241070 44061000 */ mfc1 $a2, $f2 -/* A17294 80241074 C440000C */ lwc1 $f0, 0xc($v0) -/* A17298 80241078 46800020 */ cvt.s.w $f0, $f0 -/* A1729C 8024107C E7A00014 */ swc1 $f0, 0x14($sp) -/* A172A0 80241080 8E2200D0 */ lw $v0, 0xd0($s1) -/* A172A4 80241084 44052000 */ mfc1 $a1, $f4 -/* A172A8 80241088 C4400010 */ lwc1 $f0, 0x10($v0) -/* A172AC 8024108C 46800020 */ cvt.s.w $f0, $f0 -/* A172B0 80241090 E7A00018 */ swc1 $f0, 0x18($sp) -/* A172B4 80241094 8C640018 */ lw $a0, 0x18($v1) -/* A172B8 80241098 0C0123F5 */ jal is_point_within_region -/* A172BC 8024109C 8E070038 */ lw $a3, 0x38($s0) -/* A172C0 802410A0 1040000E */ beqz $v0, .L802410DC -/* A172C4 802410A4 00000000 */ nop -/* A172C8 802410A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A172CC 802410AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* A172D0 802410B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A172D4 802410B4 C4460000 */ lwc1 $f6, ($v0) -/* A172D8 802410B8 468031A0 */ cvt.s.w $f6, $f6 -/* A172DC 802410BC 44063000 */ mfc1 $a2, $f6 -/* A172E0 802410C0 C4460008 */ lwc1 $f6, 8($v0) -/* A172E4 802410C4 468031A0 */ cvt.s.w $f6, $f6 -/* A172E8 802410C8 44073000 */ mfc1 $a3, $f6 -/* A172EC 802410CC 0C00A720 */ jal atan2 -/* A172F0 802410D0 00000000 */ nop -/* A172F4 802410D4 08090443 */ j .L8024110C -/* A172F8 802410D8 E600000C */ swc1 $f0, 0xc($s0) -.L802410DC: -/* A172FC 802410DC 0C00A67F */ jal rand_int -/* A17300 802410E0 2404003C */ addiu $a0, $zero, 0x3c -/* A17304 802410E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A17308 802410E8 44820000 */ mtc1 $v0, $f0 -/* A1730C 802410EC 00000000 */ nop -/* A17310 802410F0 46800020 */ cvt.s.w $f0, $f0 -/* A17314 802410F4 46006300 */ add.s $f12, $f12, $f0 -/* A17318 802410F8 3C0141F0 */ lui $at, 0x41f0 -/* A1731C 802410FC 44810000 */ mtc1 $at, $f0 -/* A17320 80241100 0C00A6C9 */ jal clamp_angle -/* A17324 80241104 46006301 */ sub.s $f12, $f12, $f0 -/* A17328 80241108 E600000C */ swc1 $f0, 0xc($s0) -.L8024110C: -/* A1732C 8024110C 8E2200CC */ lw $v0, 0xcc($s1) -/* A17330 80241110 8C420004 */ lw $v0, 4($v0) -/* A17334 80241114 AE020028 */ sw $v0, 0x28($s0) -/* A17338 80241118 AE600074 */ sw $zero, 0x74($s3) -/* A1733C 8024111C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17340 80241120 8C420014 */ lw $v0, 0x14($v0) -/* A17344 80241124 04410004 */ bgez $v0, .L80241138 -/* A17348 80241128 00000000 */ nop -/* A1734C 8024112C C6400000 */ lwc1 $f0, ($s2) -/* A17350 80241130 08090456 */ j .L80241158 -/* A17354 80241134 E6000018 */ swc1 $f0, 0x18($s0) -.L80241138: -/* A17358 80241138 3C018024 */ lui $at, 0x8024 -/* A1735C 8024113C D4224E20 */ ldc1 $f2, 0x4e20($at) -/* A17360 80241140 44820000 */ mtc1 $v0, $f0 -/* A17364 80241144 00000000 */ nop -/* A17368 80241148 46800021 */ cvt.d.w $f0, $f0 -/* A1736C 8024114C 46220003 */ div.d $f0, $f0, $f2 -/* A17370 80241150 46200020 */ cvt.s.d $f0, $f0 -/* A17374 80241154 E6000018 */ swc1 $f0, 0x18($s0) -.L80241158: -/* A17378 80241158 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1737C 8024115C 3C014059 */ lui $at, 0x4059 -/* A17380 80241160 44811800 */ mtc1 $at, $f3 -/* A17384 80241164 44801000 */ mtc1 $zero, $f2 -/* A17388 80241168 46000021 */ cvt.d.s $f0, $f0 -/* A1738C 8024116C 46220002 */ mul.d $f0, $f0, $f2 -/* A17390 80241170 00000000 */ nop -/* A17394 80241174 24020001 */ addiu $v0, $zero, 1 -/* A17398 80241178 4620018D */ trunc.w.d $f6, $f0 -/* A1739C 8024117C E626007C */ swc1 $f6, 0x7c($s1) -/* A173A0 80241180 AE620070 */ sw $v0, 0x70($s3) -/* A173A4 80241184 8FBF0030 */ lw $ra, 0x30($sp) -/* A173A8 80241188 8FB3002C */ lw $s3, 0x2c($sp) -/* A173AC 8024118C 8FB20028 */ lw $s2, 0x28($sp) -/* A173B0 80241190 8FB10024 */ lw $s1, 0x24($sp) -/* A173B4 80241194 8FB00020 */ lw $s0, 0x20($sp) -/* A173B8 80241198 03E00008 */ jr $ra -/* A173BC 8024119C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s new file mode 100644 index 0000000000..d9fb3f9dfa --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80240FF0_A17210.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FF0_A17210 +/* A17210 80240FF0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A17214 80240FF4 AFB3002C */ sw $s3, 0x2c($sp) +/* A17218 80240FF8 0080982D */ daddu $s3, $a0, $zero +/* A1721C 80240FFC AFBF0030 */ sw $ra, 0x30($sp) +/* A17220 80241000 AFB20028 */ sw $s2, 0x28($sp) +/* A17224 80241004 AFB10024 */ sw $s1, 0x24($sp) +/* A17228 80241008 AFB00020 */ sw $s0, 0x20($sp) +/* A1722C 8024100C 8E710148 */ lw $s1, 0x148($s3) +/* A17230 80241010 86240008 */ lh $a0, 8($s1) +/* A17234 80241014 0C00EABB */ jal get_npc_unsafe +/* A17238 80241018 00A0902D */ daddu $s2, $a1, $zero +/* A1723C 8024101C 8E440004 */ lw $a0, 4($s2) +/* A17240 80241020 0040802D */ daddu $s0, $v0, $zero +/* A17244 80241024 00041FC2 */ srl $v1, $a0, 0x1f +/* A17248 80241028 00832021 */ addu $a0, $a0, $v1 +/* A1724C 8024102C 00042043 */ sra $a0, $a0, 1 +/* A17250 80241030 0C00A67F */ jal rand_int +/* A17254 80241034 24840001 */ addiu $a0, $a0, 1 +/* A17258 80241038 8E430004 */ lw $v1, 4($s2) +/* A1725C 8024103C 000327C2 */ srl $a0, $v1, 0x1f +/* A17260 80241040 00641821 */ addu $v1, $v1, $a0 +/* A17264 80241044 00031843 */ sra $v1, $v1, 1 +/* A17268 80241048 00621821 */ addu $v1, $v1, $v0 +/* A1726C 8024104C A603008E */ sh $v1, 0x8e($s0) +/* A17270 80241050 8E2300D0 */ lw $v1, 0xd0($s1) +/* A17274 80241054 C6000040 */ lwc1 $f0, 0x40($s0) +/* A17278 80241058 C4640000 */ lwc1 $f4, ($v1) +/* A1727C 8024105C 46802120 */ cvt.s.w $f4, $f4 +/* A17280 80241060 C4620008 */ lwc1 $f2, 8($v1) +/* A17284 80241064 468010A0 */ cvt.s.w $f2, $f2 +/* A17288 80241068 E7A00010 */ swc1 $f0, 0x10($sp) +/* A1728C 8024106C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17290 80241070 44061000 */ mfc1 $a2, $f2 +/* A17294 80241074 C440000C */ lwc1 $f0, 0xc($v0) +/* A17298 80241078 46800020 */ cvt.s.w $f0, $f0 +/* A1729C 8024107C E7A00014 */ swc1 $f0, 0x14($sp) +/* A172A0 80241080 8E2200D0 */ lw $v0, 0xd0($s1) +/* A172A4 80241084 44052000 */ mfc1 $a1, $f4 +/* A172A8 80241088 C4400010 */ lwc1 $f0, 0x10($v0) +/* A172AC 8024108C 46800020 */ cvt.s.w $f0, $f0 +/* A172B0 80241090 E7A00018 */ swc1 $f0, 0x18($sp) +/* A172B4 80241094 8C640018 */ lw $a0, 0x18($v1) +/* A172B8 80241098 0C0123F5 */ jal is_point_within_region +/* A172BC 8024109C 8E070038 */ lw $a3, 0x38($s0) +/* A172C0 802410A0 1040000E */ beqz $v0, .L802410DC +/* A172C4 802410A4 00000000 */ nop +/* A172C8 802410A8 8E2200D0 */ lw $v0, 0xd0($s1) +/* A172CC 802410AC C60C0038 */ lwc1 $f12, 0x38($s0) +/* A172D0 802410B0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A172D4 802410B4 C4460000 */ lwc1 $f6, ($v0) +/* A172D8 802410B8 468031A0 */ cvt.s.w $f6, $f6 +/* A172DC 802410BC 44063000 */ mfc1 $a2, $f6 +/* A172E0 802410C0 C4460008 */ lwc1 $f6, 8($v0) +/* A172E4 802410C4 468031A0 */ cvt.s.w $f6, $f6 +/* A172E8 802410C8 44073000 */ mfc1 $a3, $f6 +/* A172EC 802410CC 0C00A720 */ jal atan2 +/* A172F0 802410D0 00000000 */ nop +/* A172F4 802410D4 08090443 */ j .L8024110C +/* A172F8 802410D8 E600000C */ swc1 $f0, 0xc($s0) +.L802410DC: +/* A172FC 802410DC 0C00A67F */ jal rand_int +/* A17300 802410E0 2404003C */ addiu $a0, $zero, 0x3c +/* A17304 802410E4 C60C000C */ lwc1 $f12, 0xc($s0) +/* A17308 802410E8 44820000 */ mtc1 $v0, $f0 +/* A1730C 802410EC 00000000 */ nop +/* A17310 802410F0 46800020 */ cvt.s.w $f0, $f0 +/* A17314 802410F4 46006300 */ add.s $f12, $f12, $f0 +/* A17318 802410F8 3C0141F0 */ lui $at, 0x41f0 +/* A1731C 802410FC 44810000 */ mtc1 $at, $f0 +/* A17320 80241100 0C00A6C9 */ jal clamp_angle +/* A17324 80241104 46006301 */ sub.s $f12, $f12, $f0 +/* A17328 80241108 E600000C */ swc1 $f0, 0xc($s0) +.L8024110C: +/* A1732C 8024110C 8E2200CC */ lw $v0, 0xcc($s1) +/* A17330 80241110 8C420004 */ lw $v0, 4($v0) +/* A17334 80241114 AE020028 */ sw $v0, 0x28($s0) +/* A17338 80241118 AE600074 */ sw $zero, 0x74($s3) +/* A1733C 8024111C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17340 80241120 8C420014 */ lw $v0, 0x14($v0) +/* A17344 80241124 04410004 */ bgez $v0, .L80241138 +/* A17348 80241128 00000000 */ nop +/* A1734C 8024112C C6400000 */ lwc1 $f0, ($s2) +/* A17350 80241130 08090456 */ j .L80241158 +/* A17354 80241134 E6000018 */ swc1 $f0, 0x18($s0) +.L80241138: +/* A17358 80241138 3C018024 */ lui $at, 0x8024 +/* A1735C 8024113C D4224E20 */ ldc1 $f2, 0x4e20($at) +/* A17360 80241140 44820000 */ mtc1 $v0, $f0 +/* A17364 80241144 00000000 */ nop +/* A17368 80241148 46800021 */ cvt.d.w $f0, $f0 +/* A1736C 8024114C 46220003 */ div.d $f0, $f0, $f2 +/* A17370 80241150 46200020 */ cvt.s.d $f0, $f0 +/* A17374 80241154 E6000018 */ swc1 $f0, 0x18($s0) +.L80241158: +/* A17378 80241158 C600003C */ lwc1 $f0, 0x3c($s0) +/* A1737C 8024115C 3C014059 */ lui $at, 0x4059 +/* A17380 80241160 44811800 */ mtc1 $at, $f3 +/* A17384 80241164 44801000 */ mtc1 $zero, $f2 +/* A17388 80241168 46000021 */ cvt.d.s $f0, $f0 +/* A1738C 8024116C 46220002 */ mul.d $f0, $f0, $f2 +/* A17390 80241170 00000000 */ nop +/* A17394 80241174 24020001 */ addiu $v0, $zero, 1 +/* A17398 80241178 4620018D */ trunc.w.d $f6, $f0 +/* A1739C 8024117C E626007C */ swc1 $f6, 0x7c($s1) +/* A173A0 80241180 AE620070 */ sw $v0, 0x70($s3) +/* A173A4 80241184 8FBF0030 */ lw $ra, 0x30($sp) +/* A173A8 80241188 8FB3002C */ lw $s3, 0x2c($sp) +/* A173AC 8024118C 8FB20028 */ lw $s2, 0x28($sp) +/* A173B0 80241190 8FB10024 */ lw $s1, 0x24($sp) +/* A173B4 80241194 8FB00020 */ lw $s0, 0x20($sp) +/* A173B8 80241198 03E00008 */ jr $ra +/* A173BC 8024119C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0.s deleted file mode 100644 index 5e4ce30ca9..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A0 -/* A173C0 802411A0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A173C4 802411A4 AFB3004C */ sw $s3, 0x4c($sp) -/* A173C8 802411A8 0080982D */ daddu $s3, $a0, $zero -/* A173CC 802411AC AFBF0058 */ sw $ra, 0x58($sp) -/* A173D0 802411B0 AFB50054 */ sw $s5, 0x54($sp) -/* A173D4 802411B4 AFB40050 */ sw $s4, 0x50($sp) -/* A173D8 802411B8 AFB20048 */ sw $s2, 0x48($sp) -/* A173DC 802411BC AFB10044 */ sw $s1, 0x44($sp) -/* A173E0 802411C0 AFB00040 */ sw $s0, 0x40($sp) -/* A173E4 802411C4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A173E8 802411C8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* A173EC 802411CC F7B60068 */ sdc1 $f22, 0x68($sp) -/* A173F0 802411D0 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A173F4 802411D4 8E710148 */ lw $s1, 0x148($s3) -/* A173F8 802411D8 00A0902D */ daddu $s2, $a1, $zero -/* A173FC 802411DC 86240008 */ lh $a0, 8($s1) -/* A17400 802411E0 0C00EABB */ jal get_npc_unsafe -/* A17404 802411E4 00C0A82D */ daddu $s5, $a2, $zero -/* A17408 802411E8 0040802D */ daddu $s0, $v0, $zero -/* A1740C 802411EC 0000A02D */ daddu $s4, $zero, $zero -/* A17410 802411F0 C624007C */ lwc1 $f4, 0x7c($s1) -/* A17414 802411F4 46802120 */ cvt.s.w $f4, $f4 -/* A17418 802411F8 C6220088 */ lwc1 $f2, 0x88($s1) -/* A1741C 802411FC 468010A0 */ cvt.s.w $f2, $f2 -/* A17420 80241200 460010A1 */ cvt.d.s $f2, $f2 -/* A17424 80241204 46002121 */ cvt.d.s $f4, $f4 -/* A17428 80241208 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1742C 8024120C 3C014059 */ lui $at, 0x4059 -/* A17430 80241210 44813800 */ mtc1 $at, $f7 -/* A17434 80241214 44803000 */ mtc1 $zero, $f6 -/* A17438 80241218 46000021 */ cvt.d.s $f0, $f0 -/* A1743C 8024121C 46260002 */ mul.d $f0, $f0, $f6 -/* A17440 80241220 00000000 */ nop -/* A17444 80241224 24020001 */ addiu $v0, $zero, 1 -/* A17448 80241228 8E24006C */ lw $a0, 0x6c($s1) -/* A1744C 8024122C 46261083 */ div.d $f2, $f2, $f6 -/* A17450 80241230 462010A0 */ cvt.s.d $f2, $f2 -/* A17454 80241234 46262103 */ div.d $f4, $f4, $f6 -/* A17458 80241238 46202520 */ cvt.s.d $f20, $f4 -/* A1745C 8024123C 30830011 */ andi $v1, $a0, 0x11 -/* A17460 80241240 4620020D */ trunc.w.d $f8, $f0 -/* A17464 80241244 E628007C */ swc1 $f8, 0x7c($s1) -/* A17468 80241248 C6200078 */ lwc1 $f0, 0x78($s1) -/* A1746C 8024124C 46800020 */ cvt.s.w $f0, $f0 -/* A17470 80241250 46000021 */ cvt.d.s $f0, $f0 -/* A17474 80241254 46260003 */ div.d $f0, $f0, $f6 -/* A17478 80241258 462006A0 */ cvt.s.d $f26, $f0 -/* A1747C 8024125C C6200070 */ lwc1 $f0, 0x70($s1) -/* A17480 80241260 46800020 */ cvt.s.w $f0, $f0 -/* A17484 80241264 46000021 */ cvt.d.s $f0, $f0 -/* A17488 80241268 46260003 */ div.d $f0, $f0, $f6 -/* A1748C 8024126C 462005A0 */ cvt.s.d $f22, $f0 -/* A17490 80241270 14620025 */ bne $v1, $v0, .L80241308 -/* A17494 80241274 4602D600 */ add.s $f24, $f26, $f2 -/* A17498 80241278 8E020000 */ lw $v0, ($s0) -/* A1749C 8024127C 30420008 */ andi $v0, $v0, 8 -/* A174A0 80241280 10400009 */ beqz $v0, .L802412A8 -/* A174A4 80241284 27A50028 */ addiu $a1, $sp, 0x28 -/* A174A8 80241288 C600003C */ lwc1 $f0, 0x3c($s0) -/* A174AC 8024128C 4600C001 */ sub.s $f0, $f24, $f0 -/* A174B0 80241290 4600B03C */ c.lt.s $f22, $f0 -/* A174B4 80241294 00000000 */ nop -/* A174B8 80241298 4500001B */ bc1f .L80241308 -/* A174BC 8024129C 34820010 */ ori $v0, $a0, 0x10 -/* A174C0 802412A0 080904C2 */ j .L80241308 -/* A174C4 802412A4 AE22006C */ sw $v0, 0x6c($s1) -.L802412A8: -/* A174C8 802412A8 27A6002C */ addiu $a2, $sp, 0x2c -/* A174CC 802412AC C6000038 */ lwc1 $f0, 0x38($s0) -/* A174D0 802412B0 C602003C */ lwc1 $f2, 0x3c($s0) -/* A174D4 802412B4 C6040040 */ lwc1 $f4, 0x40($s0) -/* A174D8 802412B8 3C01447A */ lui $at, 0x447a -/* A174DC 802412BC 44813000 */ mtc1 $at, $f6 -/* A174E0 802412C0 27A20034 */ addiu $v0, $sp, 0x34 -/* A174E4 802412C4 E7A00028 */ swc1 $f0, 0x28($sp) -/* A174E8 802412C8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A174EC 802412CC E7A40030 */ swc1 $f4, 0x30($sp) -/* A174F0 802412D0 E7A60034 */ swc1 $f6, 0x34($sp) -/* A174F4 802412D4 AFA20010 */ sw $v0, 0x10($sp) -/* A174F8 802412D8 8E040080 */ lw $a0, 0x80($s0) -/* A174FC 802412DC 0C0372DF */ jal func_800DCB7C -/* A17500 802412E0 27A70030 */ addiu $a3, $sp, 0x30 -/* A17504 802412E4 C7A00034 */ lwc1 $f0, 0x34($sp) -/* A17508 802412E8 4600D001 */ sub.s $f0, $f26, $f0 -/* A1750C 802412EC 4600B03C */ c.lt.s $f22, $f0 -/* A17510 802412F0 00000000 */ nop -/* A17514 802412F4 45000004 */ bc1f .L80241308 -/* A17518 802412F8 00000000 */ nop -/* A1751C 802412FC 8E22006C */ lw $v0, 0x6c($s1) -/* A17520 80241300 34420010 */ ori $v0, $v0, 0x10 -/* A17524 80241304 AE22006C */ sw $v0, 0x6c($s1) -.L80241308: -/* A17528 80241308 8E22006C */ lw $v0, 0x6c($s1) -/* A1752C 8024130C 24030011 */ addiu $v1, $zero, 0x11 -/* A17530 80241310 30420011 */ andi $v0, $v0, 0x11 -/* A17534 80241314 14430039 */ bne $v0, $v1, .L802413FC -/* A17538 80241318 00000000 */ nop -/* A1753C 8024131C 8E020000 */ lw $v0, ($s0) -/* A17540 80241320 30420008 */ andi $v0, $v0, 8 -/* A17544 80241324 1040000A */ beqz $v0, .L80241350 -/* A17548 80241328 4600C106 */ mov.s $f4, $f24 -/* A1754C 8024132C 4614C081 */ sub.s $f2, $f24, $f20 -/* A17550 80241330 3C018024 */ lui $at, 0x8024 -/* A17554 80241334 D4204E28 */ ldc1 $f0, 0x4e28($at) -/* A17558 80241338 460010A1 */ cvt.d.s $f2, $f2 -/* A1755C 8024133C 46201082 */ mul.d $f2, $f2, $f0 -/* A17560 80241340 00000000 */ nop -/* A17564 80241344 4600A021 */ cvt.d.s $f0, $f20 -/* A17568 80241348 080904ED */ j .L802413B4 -/* A1756C 8024134C 46220000 */ add.d $f0, $f0, $f2 -.L80241350: -/* A17570 80241350 27A50028 */ addiu $a1, $sp, 0x28 -/* A17574 80241354 27A6002C */ addiu $a2, $sp, 0x2c -/* A17578 80241358 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1757C 8024135C C6020040 */ lwc1 $f2, 0x40($s0) -/* A17580 80241360 3C01447A */ lui $at, 0x447a -/* A17584 80241364 44812000 */ mtc1 $at, $f4 -/* A17588 80241368 27A20034 */ addiu $v0, $sp, 0x34 -/* A1758C 8024136C E7B4002C */ swc1 $f20, 0x2c($sp) -/* A17590 80241370 E7A00028 */ swc1 $f0, 0x28($sp) -/* A17594 80241374 E7A20030 */ swc1 $f2, 0x30($sp) -/* A17598 80241378 E7A40034 */ swc1 $f4, 0x34($sp) -/* A1759C 8024137C AFA20010 */ sw $v0, 0x10($sp) -/* A175A0 80241380 8E040080 */ lw $a0, 0x80($s0) -/* A175A4 80241384 0C0372DF */ jal func_800DCB7C -/* A175A8 80241388 27A70030 */ addiu $a3, $sp, 0x30 -/* A175AC 8024138C C7A4002C */ lwc1 $f4, 0x2c($sp) -/* A175B0 80241390 461A2100 */ add.s $f4, $f4, $f26 -/* A175B4 80241394 46142081 */ sub.s $f2, $f4, $f20 -/* A175B8 80241398 3C018024 */ lui $at, 0x8024 -/* A175BC 8024139C D4204E30 */ ldc1 $f0, 0x4e30($at) -/* A175C0 802413A0 460010A1 */ cvt.d.s $f2, $f2 -/* A175C4 802413A4 46201082 */ mul.d $f2, $f2, $f0 -/* A175C8 802413A8 00000000 */ nop -/* A175CC 802413AC 4600A021 */ cvt.d.s $f0, $f20 -/* A175D0 802413B0 46220000 */ add.d $f0, $f0, $f2 -.L802413B4: -/* A175D4 802413B4 46200020 */ cvt.s.d $f0, $f0 -/* A175D8 802413B8 E600003C */ swc1 $f0, 0x3c($s0) -/* A175DC 802413BC C600003C */ lwc1 $f0, 0x3c($s0) -/* A175E0 802413C0 46002001 */ sub.s $f0, $f4, $f0 -/* A175E4 802413C4 3C013FF0 */ lui $at, 0x3ff0 -/* A175E8 802413C8 44811800 */ mtc1 $at, $f3 -/* A175EC 802413CC 44801000 */ mtc1 $zero, $f2 -/* A175F0 802413D0 46000005 */ abs.s $f0, $f0 -/* A175F4 802413D4 46000021 */ cvt.d.s $f0, $f0 -/* A175F8 802413D8 4622003C */ c.lt.d $f0, $f2 -/* A175FC 802413DC 00000000 */ nop -/* A17600 802413E0 45000036 */ bc1f .L802414BC -/* A17604 802413E4 2403FFEF */ addiu $v1, $zero, -0x11 -/* A17608 802413E8 E604003C */ swc1 $f4, 0x3c($s0) -/* A1760C 802413EC 8E22006C */ lw $v0, 0x6c($s1) -/* A17610 802413F0 00431024 */ and $v0, $v0, $v1 -/* A17614 802413F4 0809052F */ j .L802414BC -/* A17618 802413F8 AE22006C */ sw $v0, 0x6c($s1) -.L802413FC: -/* A1761C 802413FC 8E220070 */ lw $v0, 0x70($s1) -/* A17620 80241400 1840002E */ blez $v0, .L802414BC -/* A17624 80241404 00000000 */ nop -/* A17628 80241408 C62C0074 */ lwc1 $f12, 0x74($s1) -/* A1762C 8024140C 0C00A8BB */ jal sin_deg -/* A17630 80241410 46806320 */ cvt.s.w $f12, $f12 -/* A17634 80241414 8E020000 */ lw $v0, ($s0) -/* A17638 80241418 30420008 */ andi $v0, $v0, 8 -/* A1763C 8024141C 10400003 */ beqz $v0, .L8024142C -/* A17640 80241420 46000506 */ mov.s $f20, $f0 -/* A17644 80241424 0809051B */ j .L8024146C -/* A17648 80241428 0000102D */ daddu $v0, $zero, $zero -.L8024142C: -/* A1764C 8024142C 27A50028 */ addiu $a1, $sp, 0x28 -/* A17650 80241430 27A6002C */ addiu $a2, $sp, 0x2c -/* A17654 80241434 C6000038 */ lwc1 $f0, 0x38($s0) -/* A17658 80241438 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1765C 8024143C C6040040 */ lwc1 $f4, 0x40($s0) -/* A17660 80241440 3C01447A */ lui $at, 0x447a -/* A17664 80241444 44813000 */ mtc1 $at, $f6 -/* A17668 80241448 27A20034 */ addiu $v0, $sp, 0x34 -/* A1766C 8024144C E7A00028 */ swc1 $f0, 0x28($sp) -/* A17670 80241450 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A17674 80241454 E7A40030 */ swc1 $f4, 0x30($sp) -/* A17678 80241458 E7A60034 */ swc1 $f6, 0x34($sp) -/* A1767C 8024145C AFA20010 */ sw $v0, 0x10($sp) -/* A17680 80241460 8E040080 */ lw $a0, 0x80($s0) -/* A17684 80241464 0C0372DF */ jal func_800DCB7C -/* A17688 80241468 27A70030 */ addiu $a3, $sp, 0x30 -.L8024146C: -/* A1768C 8024146C 10400007 */ beqz $v0, .L8024148C -/* A17690 80241470 00000000 */ nop -/* A17694 80241474 4616A082 */ mul.s $f2, $f20, $f22 -/* A17698 80241478 00000000 */ nop -/* A1769C 8024147C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A176A0 80241480 461A0000 */ add.s $f0, $f0, $f26 -/* A176A4 80241484 08090526 */ j .L80241498 -/* A176A8 80241488 46020000 */ add.s $f0, $f0, $f2 -.L8024148C: -/* A176AC 8024148C 4616A002 */ mul.s $f0, $f20, $f22 -/* A176B0 80241490 00000000 */ nop -/* A176B4 80241494 4600C000 */ add.s $f0, $f24, $f0 -.L80241498: -/* A176B8 80241498 E600003C */ swc1 $f0, 0x3c($s0) -/* A176BC 8024149C 8E220074 */ lw $v0, 0x74($s1) -/* A176C0 802414A0 2442000A */ addiu $v0, $v0, 0xa -/* A176C4 802414A4 44826000 */ mtc1 $v0, $f12 -/* A176C8 802414A8 00000000 */ nop -/* A176CC 802414AC 0C00A6C9 */ jal clamp_angle -/* A176D0 802414B0 46806320 */ cvt.s.w $f12, $f12 -/* A176D4 802414B4 4600020D */ trunc.w.s $f8, $f0 -/* A176D8 802414B8 E6280074 */ swc1 $f8, 0x74($s1) -.L802414BC: -/* A176DC 802414BC 8E220090 */ lw $v0, 0x90($s1) -/* A176E0 802414C0 1C40004A */ bgtz $v0, .L802415EC -/* A176E4 802414C4 2442FFFF */ addiu $v0, $v0, -1 -/* A176E8 802414C8 8E430014 */ lw $v1, 0x14($s2) -/* A176EC 802414CC 04600048 */ bltz $v1, .L802415F0 -/* A176F0 802414D0 00000000 */ nop -/* A176F4 802414D4 8E620074 */ lw $v0, 0x74($s3) -/* A176F8 802414D8 1C400042 */ bgtz $v0, .L802415E4 -/* A176FC 802414DC 2442FFFF */ addiu $v0, $v0, -1 -/* A17700 802414E0 AE630074 */ sw $v1, 0x74($s3) -/* A17704 802414E4 860200A8 */ lh $v0, 0xa8($s0) -/* A17708 802414E8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1770C 802414EC 44820000 */ mtc1 $v0, $f0 -/* A17710 802414F0 00000000 */ nop -/* A17714 802414F4 46800020 */ cvt.s.w $f0, $f0 -/* A17718 802414F8 46001080 */ add.s $f2, $f2, $f0 -/* A1771C 802414FC 3C014024 */ lui $at, 0x4024 -/* A17720 80241500 44810800 */ mtc1 $at, $f1 -/* A17724 80241504 44800000 */ mtc1 $zero, $f0 -/* A17728 80241508 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1772C 8024150C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A17730 80241510 460010A1 */ cvt.d.s $f2, $f2 -/* A17734 80241514 46201080 */ add.d $f2, $f2, $f0 -/* A17738 80241518 C440002C */ lwc1 $f0, 0x2c($v0) -/* A1773C 8024151C 46000021 */ cvt.d.s $f0, $f0 -/* A17740 80241520 4622003C */ c.lt.d $f0, $f2 -/* A17744 80241524 00000000 */ nop -/* A17748 80241528 4500002C */ bc1f .L802415DC -/* A1774C 8024152C 02A0202D */ daddu $a0, $s5, $zero -/* A17750 80241530 AFA00010 */ sw $zero, 0x10($sp) -/* A17754 80241534 8E46000C */ lw $a2, 0xc($s2) -/* A17758 80241538 8E470010 */ lw $a3, 0x10($s2) -/* A1775C 8024153C 0C01242D */ jal func_800490B4 -/* A17760 80241540 0220282D */ daddu $a1, $s1, $zero -/* A17764 80241544 10400025 */ beqz $v0, .L802415DC -/* A17768 80241548 0000202D */ daddu $a0, $zero, $zero -/* A1776C 8024154C 0200282D */ daddu $a1, $s0, $zero -/* A17770 80241550 0000302D */ daddu $a2, $zero, $zero -/* A17774 80241554 2412000C */ addiu $s2, $zero, 0xc -/* A17778 80241558 860300A8 */ lh $v1, 0xa8($s0) -/* A1777C 8024155C 3C013F80 */ lui $at, 0x3f80 -/* A17780 80241560 44810000 */ mtc1 $at, $f0 -/* A17784 80241564 3C014000 */ lui $at, 0x4000 -/* A17788 80241568 44811000 */ mtc1 $at, $f2 -/* A1778C 8024156C 3C01C1A0 */ lui $at, 0xc1a0 -/* A17790 80241570 44812000 */ mtc1 $at, $f4 -/* A17794 80241574 44834000 */ mtc1 $v1, $f8 -/* A17798 80241578 00000000 */ nop -/* A1779C 8024157C 46804220 */ cvt.s.w $f8, $f8 -/* A177A0 80241580 44074000 */ mfc1 $a3, $f8 -/* A177A4 80241584 27A20038 */ addiu $v0, $sp, 0x38 -/* A177A8 80241588 AFB2001C */ sw $s2, 0x1c($sp) -/* A177AC 8024158C AFA20020 */ sw $v0, 0x20($sp) -/* A177B0 80241590 E7A00010 */ swc1 $f0, 0x10($sp) -/* A177B4 80241594 E7A20014 */ swc1 $f2, 0x14($sp) -/* A177B8 80241598 0C01BFA4 */ jal fx_emote -/* A177BC 8024159C E7A40018 */ swc1 $f4, 0x18($sp) -/* A177C0 802415A0 0200202D */ daddu $a0, $s0, $zero -/* A177C4 802415A4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A177C8 802415A8 C480003C */ lwc1 $f0, 0x3c($a0) -/* A177CC 802415AC 3C060020 */ lui $a2, 0x20 -/* A177D0 802415B0 0C012530 */ jal func_800494C0 -/* A177D4 802415B4 E4800064 */ swc1 $f0, 0x64($a0) -/* A177D8 802415B8 8E220018 */ lw $v0, 0x18($s1) -/* A177DC 802415BC 9442002A */ lhu $v0, 0x2a($v0) -/* A177E0 802415C0 30420001 */ andi $v0, $v0, 1 -/* A177E4 802415C4 10400003 */ beqz $v0, .L802415D4 -/* A177E8 802415C8 2402000A */ addiu $v0, $zero, 0xa -/* A177EC 802415CC 080905E5 */ j .L80241794 -/* A177F0 802415D0 AE620070 */ sw $v0, 0x70($s3) -.L802415D4: -/* A177F4 802415D4 080905E5 */ j .L80241794 -/* A177F8 802415D8 AE720070 */ sw $s2, 0x70($s3) -.L802415DC: -/* A177FC 802415DC 8E620074 */ lw $v0, 0x74($s3) -/* A17800 802415E0 2442FFFF */ addiu $v0, $v0, -1 -.L802415E4: -/* A17804 802415E4 0809057C */ j .L802415F0 -/* A17808 802415E8 AE620074 */ sw $v0, 0x74($s3) -.L802415EC: -/* A1780C 802415EC AE220090 */ sw $v0, 0x90($s1) -.L802415F0: -/* A17810 802415F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A17814 802415F4 C6000040 */ lwc1 $f0, 0x40($s0) -/* A17818 802415F8 C4620000 */ lwc1 $f2, ($v1) -/* A1781C 802415FC 468010A0 */ cvt.s.w $f2, $f2 -/* A17820 80241600 C4640008 */ lwc1 $f4, 8($v1) -/* A17824 80241604 46802120 */ cvt.s.w $f4, $f4 -/* A17828 80241608 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1782C 8024160C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17830 80241610 44051000 */ mfc1 $a1, $f2 -/* A17834 80241614 C440000C */ lwc1 $f0, 0xc($v0) -/* A17838 80241618 46800020 */ cvt.s.w $f0, $f0 -/* A1783C 8024161C E7A00014 */ swc1 $f0, 0x14($sp) -/* A17840 80241620 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17844 80241624 44062000 */ mfc1 $a2, $f4 -/* A17848 80241628 C4400010 */ lwc1 $f0, 0x10($v0) -/* A1784C 8024162C 46800020 */ cvt.s.w $f0, $f0 -/* A17850 80241630 E7A00018 */ swc1 $f0, 0x18($sp) -/* A17854 80241634 8C640018 */ lw $a0, 0x18($v1) -/* A17858 80241638 0C0123F5 */ jal is_point_within_region -/* A1785C 8024163C 8E070038 */ lw $a3, 0x38($s0) -/* A17860 80241640 1040001A */ beqz $v0, .L802416AC -/* A17864 80241644 00000000 */ nop -/* A17868 80241648 8E060038 */ lw $a2, 0x38($s0) -/* A1786C 8024164C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A17870 80241650 8E070040 */ lw $a3, 0x40($s0) -/* A17874 80241654 C44C0000 */ lwc1 $f12, ($v0) -/* A17878 80241658 46806320 */ cvt.s.w $f12, $f12 -/* A1787C 8024165C C44E0008 */ lwc1 $f14, 8($v0) -/* A17880 80241660 0C00A7B5 */ jal dist2D -/* A17884 80241664 468073A0 */ cvt.s.w $f14, $f14 -/* A17888 80241668 C6020018 */ lwc1 $f2, 0x18($s0) -/* A1788C 8024166C 4600103C */ c.lt.s $f2, $f0 -/* A17890 80241670 00000000 */ nop -/* A17894 80241674 4500000D */ bc1f .L802416AC -/* A17898 80241678 E7A00034 */ swc1 $f0, 0x34($sp) -/* A1789C 8024167C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A178A0 80241680 8E2200D0 */ lw $v0, 0xd0($s1) -/* A178A4 80241684 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A178A8 80241688 C4480000 */ lwc1 $f8, ($v0) -/* A178AC 8024168C 46804220 */ cvt.s.w $f8, $f8 -/* A178B0 80241690 44064000 */ mfc1 $a2, $f8 -/* A178B4 80241694 C4480008 */ lwc1 $f8, 8($v0) -/* A178B8 80241698 46804220 */ cvt.s.w $f8, $f8 -/* A178BC 8024169C 44074000 */ mfc1 $a3, $f8 -/* A178C0 802416A0 0C00A720 */ jal atan2 -/* A178C4 802416A4 24140001 */ addiu $s4, $zero, 1 -/* A178C8 802416A8 E600000C */ swc1 $f0, 0xc($s0) -.L802416AC: -/* A178CC 802416AC 8E2200D0 */ lw $v0, 0xd0($s1) -/* A178D0 802416B0 8C43000C */ lw $v1, 0xc($v0) -/* A178D4 802416B4 8C420010 */ lw $v0, 0x10($v0) -/* A178D8 802416B8 00621825 */ or $v1, $v1, $v0 -/* A178DC 802416BC 00741825 */ or $v1, $v1, $s4 -/* A178E0 802416C0 10600008 */ beqz $v1, .L802416E4 -/* A178E4 802416C4 00000000 */ nop -/* A178E8 802416C8 8602008C */ lh $v0, 0x8c($s0) -/* A178EC 802416CC 14400031 */ bnez $v0, .L80241794 -/* A178F0 802416D0 00000000 */ nop -/* A178F4 802416D4 8E050018 */ lw $a1, 0x18($s0) -/* A178F8 802416D8 8E06000C */ lw $a2, 0xc($s0) -/* A178FC 802416DC 0C00EA95 */ jal npc_move_heading -/* A17900 802416E0 0200202D */ daddu $a0, $s0, $zero -.L802416E4: -/* A17904 802416E4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A17908 802416E8 3C014059 */ lui $at, 0x4059 -/* A1790C 802416EC 44811800 */ mtc1 $at, $f3 -/* A17910 802416F0 44801000 */ mtc1 $zero, $f2 -/* A17914 802416F4 46000021 */ cvt.d.s $f0, $f0 -/* A17918 802416F8 46220002 */ mul.d $f0, $f0, $f2 -/* A1791C 802416FC 00000000 */ nop -/* A17920 80241700 4620020D */ trunc.w.d $f8, $f0 -/* A17924 80241704 E628007C */ swc1 $f8, 0x7c($s1) -/* A17928 80241708 8E420004 */ lw $v0, 4($s2) -/* A1792C 8024170C 18400021 */ blez $v0, .L80241794 -/* A17930 80241710 00000000 */ nop -/* A17934 80241714 8602008E */ lh $v0, 0x8e($s0) -/* A17938 80241718 9603008E */ lhu $v1, 0x8e($s0) -/* A1793C 8024171C 18400005 */ blez $v0, .L80241734 -/* A17940 80241720 2462FFFF */ addiu $v0, $v1, -1 -/* A17944 80241724 A602008E */ sh $v0, 0x8e($s0) -/* A17948 80241728 00021400 */ sll $v0, $v0, 0x10 -/* A1794C 8024172C 1C400019 */ bgtz $v0, .L80241794 -/* A17950 80241730 00000000 */ nop -.L80241734: -/* A17954 80241734 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A17958 80241738 24020002 */ addiu $v0, $zero, 2 -/* A1795C 8024173C 0C00A67F */ jal rand_int -/* A17960 80241740 AE620070 */ sw $v0, 0x70($s3) -/* A17964 80241744 3C035555 */ lui $v1, 0x5555 -/* A17968 80241748 34635556 */ ori $v1, $v1, 0x5556 -/* A1796C 8024174C 00430018 */ mult $v0, $v1 -/* A17970 80241750 000227C3 */ sra $a0, $v0, 0x1f -/* A17974 80241754 00004010 */ mfhi $t0 -/* A17978 80241758 01042023 */ subu $a0, $t0, $a0 -/* A1797C 8024175C 00041840 */ sll $v1, $a0, 1 -/* A17980 80241760 00641821 */ addu $v1, $v1, $a0 -/* A17984 80241764 00431023 */ subu $v0, $v0, $v1 -/* A17988 80241768 24430002 */ addiu $v1, $v0, 2 -/* A1798C 8024176C AE630074 */ sw $v1, 0x74($s3) -/* A17990 80241770 8E42002C */ lw $v0, 0x2c($s2) -/* A17994 80241774 58400007 */ blezl $v0, .L80241794 -/* A17998 80241778 AE600070 */ sw $zero, 0x70($s3) -/* A1799C 8024177C 8E420008 */ lw $v0, 8($s2) -/* A179A0 80241780 18400003 */ blez $v0, .L80241790 -/* A179A4 80241784 28620003 */ slti $v0, $v1, 3 -/* A179A8 80241788 10400002 */ beqz $v0, .L80241794 -/* A179AC 8024178C 00000000 */ nop -.L80241790: -/* A179B0 80241790 AE600070 */ sw $zero, 0x70($s3) -.L80241794: -/* A179B4 80241794 8FBF0058 */ lw $ra, 0x58($sp) -/* A179B8 80241798 8FB50054 */ lw $s5, 0x54($sp) -/* A179BC 8024179C 8FB40050 */ lw $s4, 0x50($sp) -/* A179C0 802417A0 8FB3004C */ lw $s3, 0x4c($sp) -/* A179C4 802417A4 8FB20048 */ lw $s2, 0x48($sp) -/* A179C8 802417A8 8FB10044 */ lw $s1, 0x44($sp) -/* A179CC 802417AC 8FB00040 */ lw $s0, 0x40($sp) -/* A179D0 802417B0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A179D4 802417B4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A179D8 802417B8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* A179DC 802417BC D7B40060 */ ldc1 $f20, 0x60($sp) -/* A179E0 802417C0 03E00008 */ jr $ra -/* A179E4 802417C4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s new file mode 100644 index 0000000000..c28a26b1b0 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802411A0_A173C0.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411A0_A173C0 +/* A173C0 802411A0 27BDFF80 */ addiu $sp, $sp, -0x80 +/* A173C4 802411A4 AFB3004C */ sw $s3, 0x4c($sp) +/* A173C8 802411A8 0080982D */ daddu $s3, $a0, $zero +/* A173CC 802411AC AFBF0058 */ sw $ra, 0x58($sp) +/* A173D0 802411B0 AFB50054 */ sw $s5, 0x54($sp) +/* A173D4 802411B4 AFB40050 */ sw $s4, 0x50($sp) +/* A173D8 802411B8 AFB20048 */ sw $s2, 0x48($sp) +/* A173DC 802411BC AFB10044 */ sw $s1, 0x44($sp) +/* A173E0 802411C0 AFB00040 */ sw $s0, 0x40($sp) +/* A173E4 802411C4 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* A173E8 802411C8 F7B80070 */ sdc1 $f24, 0x70($sp) +/* A173EC 802411CC F7B60068 */ sdc1 $f22, 0x68($sp) +/* A173F0 802411D0 F7B40060 */ sdc1 $f20, 0x60($sp) +/* A173F4 802411D4 8E710148 */ lw $s1, 0x148($s3) +/* A173F8 802411D8 00A0902D */ daddu $s2, $a1, $zero +/* A173FC 802411DC 86240008 */ lh $a0, 8($s1) +/* A17400 802411E0 0C00EABB */ jal get_npc_unsafe +/* A17404 802411E4 00C0A82D */ daddu $s5, $a2, $zero +/* A17408 802411E8 0040802D */ daddu $s0, $v0, $zero +/* A1740C 802411EC 0000A02D */ daddu $s4, $zero, $zero +/* A17410 802411F0 C624007C */ lwc1 $f4, 0x7c($s1) +/* A17414 802411F4 46802120 */ cvt.s.w $f4, $f4 +/* A17418 802411F8 C6220088 */ lwc1 $f2, 0x88($s1) +/* A1741C 802411FC 468010A0 */ cvt.s.w $f2, $f2 +/* A17420 80241200 460010A1 */ cvt.d.s $f2, $f2 +/* A17424 80241204 46002121 */ cvt.d.s $f4, $f4 +/* A17428 80241208 C600003C */ lwc1 $f0, 0x3c($s0) +/* A1742C 8024120C 3C014059 */ lui $at, 0x4059 +/* A17430 80241210 44813800 */ mtc1 $at, $f7 +/* A17434 80241214 44803000 */ mtc1 $zero, $f6 +/* A17438 80241218 46000021 */ cvt.d.s $f0, $f0 +/* A1743C 8024121C 46260002 */ mul.d $f0, $f0, $f6 +/* A17440 80241220 00000000 */ nop +/* A17444 80241224 24020001 */ addiu $v0, $zero, 1 +/* A17448 80241228 8E24006C */ lw $a0, 0x6c($s1) +/* A1744C 8024122C 46261083 */ div.d $f2, $f2, $f6 +/* A17450 80241230 462010A0 */ cvt.s.d $f2, $f2 +/* A17454 80241234 46262103 */ div.d $f4, $f4, $f6 +/* A17458 80241238 46202520 */ cvt.s.d $f20, $f4 +/* A1745C 8024123C 30830011 */ andi $v1, $a0, 0x11 +/* A17460 80241240 4620020D */ trunc.w.d $f8, $f0 +/* A17464 80241244 E628007C */ swc1 $f8, 0x7c($s1) +/* A17468 80241248 C6200078 */ lwc1 $f0, 0x78($s1) +/* A1746C 8024124C 46800020 */ cvt.s.w $f0, $f0 +/* A17470 80241250 46000021 */ cvt.d.s $f0, $f0 +/* A17474 80241254 46260003 */ div.d $f0, $f0, $f6 +/* A17478 80241258 462006A0 */ cvt.s.d $f26, $f0 +/* A1747C 8024125C C6200070 */ lwc1 $f0, 0x70($s1) +/* A17480 80241260 46800020 */ cvt.s.w $f0, $f0 +/* A17484 80241264 46000021 */ cvt.d.s $f0, $f0 +/* A17488 80241268 46260003 */ div.d $f0, $f0, $f6 +/* A1748C 8024126C 462005A0 */ cvt.s.d $f22, $f0 +/* A17490 80241270 14620025 */ bne $v1, $v0, .L80241308 +/* A17494 80241274 4602D600 */ add.s $f24, $f26, $f2 +/* A17498 80241278 8E020000 */ lw $v0, ($s0) +/* A1749C 8024127C 30420008 */ andi $v0, $v0, 8 +/* A174A0 80241280 10400009 */ beqz $v0, .L802412A8 +/* A174A4 80241284 27A50028 */ addiu $a1, $sp, 0x28 +/* A174A8 80241288 C600003C */ lwc1 $f0, 0x3c($s0) +/* A174AC 8024128C 4600C001 */ sub.s $f0, $f24, $f0 +/* A174B0 80241290 4600B03C */ c.lt.s $f22, $f0 +/* A174B4 80241294 00000000 */ nop +/* A174B8 80241298 4500001B */ bc1f .L80241308 +/* A174BC 8024129C 34820010 */ ori $v0, $a0, 0x10 +/* A174C0 802412A0 080904C2 */ j .L80241308 +/* A174C4 802412A4 AE22006C */ sw $v0, 0x6c($s1) +.L802412A8: +/* A174C8 802412A8 27A6002C */ addiu $a2, $sp, 0x2c +/* A174CC 802412AC C6000038 */ lwc1 $f0, 0x38($s0) +/* A174D0 802412B0 C602003C */ lwc1 $f2, 0x3c($s0) +/* A174D4 802412B4 C6040040 */ lwc1 $f4, 0x40($s0) +/* A174D8 802412B8 3C01447A */ lui $at, 0x447a +/* A174DC 802412BC 44813000 */ mtc1 $at, $f6 +/* A174E0 802412C0 27A20034 */ addiu $v0, $sp, 0x34 +/* A174E4 802412C4 E7A00028 */ swc1 $f0, 0x28($sp) +/* A174E8 802412C8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* A174EC 802412CC E7A40030 */ swc1 $f4, 0x30($sp) +/* A174F0 802412D0 E7A60034 */ swc1 $f6, 0x34($sp) +/* A174F4 802412D4 AFA20010 */ sw $v0, 0x10($sp) +/* A174F8 802412D8 8E040080 */ lw $a0, 0x80($s0) +/* A174FC 802412DC 0C0372DF */ jal func_800DCB7C +/* A17500 802412E0 27A70030 */ addiu $a3, $sp, 0x30 +/* A17504 802412E4 C7A00034 */ lwc1 $f0, 0x34($sp) +/* A17508 802412E8 4600D001 */ sub.s $f0, $f26, $f0 +/* A1750C 802412EC 4600B03C */ c.lt.s $f22, $f0 +/* A17510 802412F0 00000000 */ nop +/* A17514 802412F4 45000004 */ bc1f .L80241308 +/* A17518 802412F8 00000000 */ nop +/* A1751C 802412FC 8E22006C */ lw $v0, 0x6c($s1) +/* A17520 80241300 34420010 */ ori $v0, $v0, 0x10 +/* A17524 80241304 AE22006C */ sw $v0, 0x6c($s1) +.L80241308: +/* A17528 80241308 8E22006C */ lw $v0, 0x6c($s1) +/* A1752C 8024130C 24030011 */ addiu $v1, $zero, 0x11 +/* A17530 80241310 30420011 */ andi $v0, $v0, 0x11 +/* A17534 80241314 14430039 */ bne $v0, $v1, .L802413FC +/* A17538 80241318 00000000 */ nop +/* A1753C 8024131C 8E020000 */ lw $v0, ($s0) +/* A17540 80241320 30420008 */ andi $v0, $v0, 8 +/* A17544 80241324 1040000A */ beqz $v0, .L80241350 +/* A17548 80241328 4600C106 */ mov.s $f4, $f24 +/* A1754C 8024132C 4614C081 */ sub.s $f2, $f24, $f20 +/* A17550 80241330 3C018024 */ lui $at, 0x8024 +/* A17554 80241334 D4204E28 */ ldc1 $f0, 0x4e28($at) +/* A17558 80241338 460010A1 */ cvt.d.s $f2, $f2 +/* A1755C 8024133C 46201082 */ mul.d $f2, $f2, $f0 +/* A17560 80241340 00000000 */ nop +/* A17564 80241344 4600A021 */ cvt.d.s $f0, $f20 +/* A17568 80241348 080904ED */ j .L802413B4 +/* A1756C 8024134C 46220000 */ add.d $f0, $f0, $f2 +.L80241350: +/* A17570 80241350 27A50028 */ addiu $a1, $sp, 0x28 +/* A17574 80241354 27A6002C */ addiu $a2, $sp, 0x2c +/* A17578 80241358 C6000038 */ lwc1 $f0, 0x38($s0) +/* A1757C 8024135C C6020040 */ lwc1 $f2, 0x40($s0) +/* A17580 80241360 3C01447A */ lui $at, 0x447a +/* A17584 80241364 44812000 */ mtc1 $at, $f4 +/* A17588 80241368 27A20034 */ addiu $v0, $sp, 0x34 +/* A1758C 8024136C E7B4002C */ swc1 $f20, 0x2c($sp) +/* A17590 80241370 E7A00028 */ swc1 $f0, 0x28($sp) +/* A17594 80241374 E7A20030 */ swc1 $f2, 0x30($sp) +/* A17598 80241378 E7A40034 */ swc1 $f4, 0x34($sp) +/* A1759C 8024137C AFA20010 */ sw $v0, 0x10($sp) +/* A175A0 80241380 8E040080 */ lw $a0, 0x80($s0) +/* A175A4 80241384 0C0372DF */ jal func_800DCB7C +/* A175A8 80241388 27A70030 */ addiu $a3, $sp, 0x30 +/* A175AC 8024138C C7A4002C */ lwc1 $f4, 0x2c($sp) +/* A175B0 80241390 461A2100 */ add.s $f4, $f4, $f26 +/* A175B4 80241394 46142081 */ sub.s $f2, $f4, $f20 +/* A175B8 80241398 3C018024 */ lui $at, 0x8024 +/* A175BC 8024139C D4204E30 */ ldc1 $f0, 0x4e30($at) +/* A175C0 802413A0 460010A1 */ cvt.d.s $f2, $f2 +/* A175C4 802413A4 46201082 */ mul.d $f2, $f2, $f0 +/* A175C8 802413A8 00000000 */ nop +/* A175CC 802413AC 4600A021 */ cvt.d.s $f0, $f20 +/* A175D0 802413B0 46220000 */ add.d $f0, $f0, $f2 +.L802413B4: +/* A175D4 802413B4 46200020 */ cvt.s.d $f0, $f0 +/* A175D8 802413B8 E600003C */ swc1 $f0, 0x3c($s0) +/* A175DC 802413BC C600003C */ lwc1 $f0, 0x3c($s0) +/* A175E0 802413C0 46002001 */ sub.s $f0, $f4, $f0 +/* A175E4 802413C4 3C013FF0 */ lui $at, 0x3ff0 +/* A175E8 802413C8 44811800 */ mtc1 $at, $f3 +/* A175EC 802413CC 44801000 */ mtc1 $zero, $f2 +/* A175F0 802413D0 46000005 */ abs.s $f0, $f0 +/* A175F4 802413D4 46000021 */ cvt.d.s $f0, $f0 +/* A175F8 802413D8 4622003C */ c.lt.d $f0, $f2 +/* A175FC 802413DC 00000000 */ nop +/* A17600 802413E0 45000036 */ bc1f .L802414BC +/* A17604 802413E4 2403FFEF */ addiu $v1, $zero, -0x11 +/* A17608 802413E8 E604003C */ swc1 $f4, 0x3c($s0) +/* A1760C 802413EC 8E22006C */ lw $v0, 0x6c($s1) +/* A17610 802413F0 00431024 */ and $v0, $v0, $v1 +/* A17614 802413F4 0809052F */ j .L802414BC +/* A17618 802413F8 AE22006C */ sw $v0, 0x6c($s1) +.L802413FC: +/* A1761C 802413FC 8E220070 */ lw $v0, 0x70($s1) +/* A17620 80241400 1840002E */ blez $v0, .L802414BC +/* A17624 80241404 00000000 */ nop +/* A17628 80241408 C62C0074 */ lwc1 $f12, 0x74($s1) +/* A1762C 8024140C 0C00A8BB */ jal sin_deg +/* A17630 80241410 46806320 */ cvt.s.w $f12, $f12 +/* A17634 80241414 8E020000 */ lw $v0, ($s0) +/* A17638 80241418 30420008 */ andi $v0, $v0, 8 +/* A1763C 8024141C 10400003 */ beqz $v0, .L8024142C +/* A17640 80241420 46000506 */ mov.s $f20, $f0 +/* A17644 80241424 0809051B */ j .L8024146C +/* A17648 80241428 0000102D */ daddu $v0, $zero, $zero +.L8024142C: +/* A1764C 8024142C 27A50028 */ addiu $a1, $sp, 0x28 +/* A17650 80241430 27A6002C */ addiu $a2, $sp, 0x2c +/* A17654 80241434 C6000038 */ lwc1 $f0, 0x38($s0) +/* A17658 80241438 C602003C */ lwc1 $f2, 0x3c($s0) +/* A1765C 8024143C C6040040 */ lwc1 $f4, 0x40($s0) +/* A17660 80241440 3C01447A */ lui $at, 0x447a +/* A17664 80241444 44813000 */ mtc1 $at, $f6 +/* A17668 80241448 27A20034 */ addiu $v0, $sp, 0x34 +/* A1766C 8024144C E7A00028 */ swc1 $f0, 0x28($sp) +/* A17670 80241450 E7A2002C */ swc1 $f2, 0x2c($sp) +/* A17674 80241454 E7A40030 */ swc1 $f4, 0x30($sp) +/* A17678 80241458 E7A60034 */ swc1 $f6, 0x34($sp) +/* A1767C 8024145C AFA20010 */ sw $v0, 0x10($sp) +/* A17680 80241460 8E040080 */ lw $a0, 0x80($s0) +/* A17684 80241464 0C0372DF */ jal func_800DCB7C +/* A17688 80241468 27A70030 */ addiu $a3, $sp, 0x30 +.L8024146C: +/* A1768C 8024146C 10400007 */ beqz $v0, .L8024148C +/* A17690 80241470 00000000 */ nop +/* A17694 80241474 4616A082 */ mul.s $f2, $f20, $f22 +/* A17698 80241478 00000000 */ nop +/* A1769C 8024147C C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A176A0 80241480 461A0000 */ add.s $f0, $f0, $f26 +/* A176A4 80241484 08090526 */ j .L80241498 +/* A176A8 80241488 46020000 */ add.s $f0, $f0, $f2 +.L8024148C: +/* A176AC 8024148C 4616A002 */ mul.s $f0, $f20, $f22 +/* A176B0 80241490 00000000 */ nop +/* A176B4 80241494 4600C000 */ add.s $f0, $f24, $f0 +.L80241498: +/* A176B8 80241498 E600003C */ swc1 $f0, 0x3c($s0) +/* A176BC 8024149C 8E220074 */ lw $v0, 0x74($s1) +/* A176C0 802414A0 2442000A */ addiu $v0, $v0, 0xa +/* A176C4 802414A4 44826000 */ mtc1 $v0, $f12 +/* A176C8 802414A8 00000000 */ nop +/* A176CC 802414AC 0C00A6C9 */ jal clamp_angle +/* A176D0 802414B0 46806320 */ cvt.s.w $f12, $f12 +/* A176D4 802414B4 4600020D */ trunc.w.s $f8, $f0 +/* A176D8 802414B8 E6280074 */ swc1 $f8, 0x74($s1) +.L802414BC: +/* A176DC 802414BC 8E220090 */ lw $v0, 0x90($s1) +/* A176E0 802414C0 1C40004A */ bgtz $v0, .L802415EC +/* A176E4 802414C4 2442FFFF */ addiu $v0, $v0, -1 +/* A176E8 802414C8 8E430014 */ lw $v1, 0x14($s2) +/* A176EC 802414CC 04600048 */ bltz $v1, .L802415F0 +/* A176F0 802414D0 00000000 */ nop +/* A176F4 802414D4 8E620074 */ lw $v0, 0x74($s3) +/* A176F8 802414D8 1C400042 */ bgtz $v0, .L802415E4 +/* A176FC 802414DC 2442FFFF */ addiu $v0, $v0, -1 +/* A17700 802414E0 AE630074 */ sw $v1, 0x74($s3) +/* A17704 802414E4 860200A8 */ lh $v0, 0xa8($s0) +/* A17708 802414E8 C602003C */ lwc1 $f2, 0x3c($s0) +/* A1770C 802414EC 44820000 */ mtc1 $v0, $f0 +/* A17710 802414F0 00000000 */ nop +/* A17714 802414F4 46800020 */ cvt.s.w $f0, $f0 +/* A17718 802414F8 46001080 */ add.s $f2, $f2, $f0 +/* A1771C 802414FC 3C014024 */ lui $at, 0x4024 +/* A17720 80241500 44810800 */ mtc1 $at, $f1 +/* A17724 80241504 44800000 */ mtc1 $zero, $f0 +/* A17728 80241508 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A1772C 8024150C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A17730 80241510 460010A1 */ cvt.d.s $f2, $f2 +/* A17734 80241514 46201080 */ add.d $f2, $f2, $f0 +/* A17738 80241518 C440002C */ lwc1 $f0, 0x2c($v0) +/* A1773C 8024151C 46000021 */ cvt.d.s $f0, $f0 +/* A17740 80241520 4622003C */ c.lt.d $f0, $f2 +/* A17744 80241524 00000000 */ nop +/* A17748 80241528 4500002C */ bc1f .L802415DC +/* A1774C 8024152C 02A0202D */ daddu $a0, $s5, $zero +/* A17750 80241530 AFA00010 */ sw $zero, 0x10($sp) +/* A17754 80241534 8E46000C */ lw $a2, 0xc($s2) +/* A17758 80241538 8E470010 */ lw $a3, 0x10($s2) +/* A1775C 8024153C 0C01242D */ jal func_800490B4 +/* A17760 80241540 0220282D */ daddu $a1, $s1, $zero +/* A17764 80241544 10400025 */ beqz $v0, .L802415DC +/* A17768 80241548 0000202D */ daddu $a0, $zero, $zero +/* A1776C 8024154C 0200282D */ daddu $a1, $s0, $zero +/* A17770 80241550 0000302D */ daddu $a2, $zero, $zero +/* A17774 80241554 2412000C */ addiu $s2, $zero, 0xc +/* A17778 80241558 860300A8 */ lh $v1, 0xa8($s0) +/* A1777C 8024155C 3C013F80 */ lui $at, 0x3f80 +/* A17780 80241560 44810000 */ mtc1 $at, $f0 +/* A17784 80241564 3C014000 */ lui $at, 0x4000 +/* A17788 80241568 44811000 */ mtc1 $at, $f2 +/* A1778C 8024156C 3C01C1A0 */ lui $at, 0xc1a0 +/* A17790 80241570 44812000 */ mtc1 $at, $f4 +/* A17794 80241574 44834000 */ mtc1 $v1, $f8 +/* A17798 80241578 00000000 */ nop +/* A1779C 8024157C 46804220 */ cvt.s.w $f8, $f8 +/* A177A0 80241580 44074000 */ mfc1 $a3, $f8 +/* A177A4 80241584 27A20038 */ addiu $v0, $sp, 0x38 +/* A177A8 80241588 AFB2001C */ sw $s2, 0x1c($sp) +/* A177AC 8024158C AFA20020 */ sw $v0, 0x20($sp) +/* A177B0 80241590 E7A00010 */ swc1 $f0, 0x10($sp) +/* A177B4 80241594 E7A20014 */ swc1 $f2, 0x14($sp) +/* A177B8 80241598 0C01BFA4 */ jal fx_emote +/* A177BC 8024159C E7A40018 */ swc1 $f4, 0x18($sp) +/* A177C0 802415A0 0200202D */ daddu $a0, $s0, $zero +/* A177C4 802415A4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* A177C8 802415A8 C480003C */ lwc1 $f0, 0x3c($a0) +/* A177CC 802415AC 3C060020 */ lui $a2, 0x20 +/* A177D0 802415B0 0C012530 */ jal func_800494C0 +/* A177D4 802415B4 E4800064 */ swc1 $f0, 0x64($a0) +/* A177D8 802415B8 8E220018 */ lw $v0, 0x18($s1) +/* A177DC 802415BC 9442002A */ lhu $v0, 0x2a($v0) +/* A177E0 802415C0 30420001 */ andi $v0, $v0, 1 +/* A177E4 802415C4 10400003 */ beqz $v0, .L802415D4 +/* A177E8 802415C8 2402000A */ addiu $v0, $zero, 0xa +/* A177EC 802415CC 080905E5 */ j .L80241794 +/* A177F0 802415D0 AE620070 */ sw $v0, 0x70($s3) +.L802415D4: +/* A177F4 802415D4 080905E5 */ j .L80241794 +/* A177F8 802415D8 AE720070 */ sw $s2, 0x70($s3) +.L802415DC: +/* A177FC 802415DC 8E620074 */ lw $v0, 0x74($s3) +/* A17800 802415E0 2442FFFF */ addiu $v0, $v0, -1 +.L802415E4: +/* A17804 802415E4 0809057C */ j .L802415F0 +/* A17808 802415E8 AE620074 */ sw $v0, 0x74($s3) +.L802415EC: +/* A1780C 802415EC AE220090 */ sw $v0, 0x90($s1) +.L802415F0: +/* A17810 802415F0 8E2300D0 */ lw $v1, 0xd0($s1) +/* A17814 802415F4 C6000040 */ lwc1 $f0, 0x40($s0) +/* A17818 802415F8 C4620000 */ lwc1 $f2, ($v1) +/* A1781C 802415FC 468010A0 */ cvt.s.w $f2, $f2 +/* A17820 80241600 C4640008 */ lwc1 $f4, 8($v1) +/* A17824 80241604 46802120 */ cvt.s.w $f4, $f4 +/* A17828 80241608 E7A00010 */ swc1 $f0, 0x10($sp) +/* A1782C 8024160C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17830 80241610 44051000 */ mfc1 $a1, $f2 +/* A17834 80241614 C440000C */ lwc1 $f0, 0xc($v0) +/* A17838 80241618 46800020 */ cvt.s.w $f0, $f0 +/* A1783C 8024161C E7A00014 */ swc1 $f0, 0x14($sp) +/* A17840 80241620 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17844 80241624 44062000 */ mfc1 $a2, $f4 +/* A17848 80241628 C4400010 */ lwc1 $f0, 0x10($v0) +/* A1784C 8024162C 46800020 */ cvt.s.w $f0, $f0 +/* A17850 80241630 E7A00018 */ swc1 $f0, 0x18($sp) +/* A17854 80241634 8C640018 */ lw $a0, 0x18($v1) +/* A17858 80241638 0C0123F5 */ jal is_point_within_region +/* A1785C 8024163C 8E070038 */ lw $a3, 0x38($s0) +/* A17860 80241640 1040001A */ beqz $v0, .L802416AC +/* A17864 80241644 00000000 */ nop +/* A17868 80241648 8E060038 */ lw $a2, 0x38($s0) +/* A1786C 8024164C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A17870 80241650 8E070040 */ lw $a3, 0x40($s0) +/* A17874 80241654 C44C0000 */ lwc1 $f12, ($v0) +/* A17878 80241658 46806320 */ cvt.s.w $f12, $f12 +/* A1787C 8024165C C44E0008 */ lwc1 $f14, 8($v0) +/* A17880 80241660 0C00A7B5 */ jal dist2D +/* A17884 80241664 468073A0 */ cvt.s.w $f14, $f14 +/* A17888 80241668 C6020018 */ lwc1 $f2, 0x18($s0) +/* A1788C 8024166C 4600103C */ c.lt.s $f2, $f0 +/* A17890 80241670 00000000 */ nop +/* A17894 80241674 4500000D */ bc1f .L802416AC +/* A17898 80241678 E7A00034 */ swc1 $f0, 0x34($sp) +/* A1789C 8024167C C60C0038 */ lwc1 $f12, 0x38($s0) +/* A178A0 80241680 8E2200D0 */ lw $v0, 0xd0($s1) +/* A178A4 80241684 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A178A8 80241688 C4480000 */ lwc1 $f8, ($v0) +/* A178AC 8024168C 46804220 */ cvt.s.w $f8, $f8 +/* A178B0 80241690 44064000 */ mfc1 $a2, $f8 +/* A178B4 80241694 C4480008 */ lwc1 $f8, 8($v0) +/* A178B8 80241698 46804220 */ cvt.s.w $f8, $f8 +/* A178BC 8024169C 44074000 */ mfc1 $a3, $f8 +/* A178C0 802416A0 0C00A720 */ jal atan2 +/* A178C4 802416A4 24140001 */ addiu $s4, $zero, 1 +/* A178C8 802416A8 E600000C */ swc1 $f0, 0xc($s0) +.L802416AC: +/* A178CC 802416AC 8E2200D0 */ lw $v0, 0xd0($s1) +/* A178D0 802416B0 8C43000C */ lw $v1, 0xc($v0) +/* A178D4 802416B4 8C420010 */ lw $v0, 0x10($v0) +/* A178D8 802416B8 00621825 */ or $v1, $v1, $v0 +/* A178DC 802416BC 00741825 */ or $v1, $v1, $s4 +/* A178E0 802416C0 10600008 */ beqz $v1, .L802416E4 +/* A178E4 802416C4 00000000 */ nop +/* A178E8 802416C8 8602008C */ lh $v0, 0x8c($s0) +/* A178EC 802416CC 14400031 */ bnez $v0, .L80241794 +/* A178F0 802416D0 00000000 */ nop +/* A178F4 802416D4 8E050018 */ lw $a1, 0x18($s0) +/* A178F8 802416D8 8E06000C */ lw $a2, 0xc($s0) +/* A178FC 802416DC 0C00EA95 */ jal npc_move_heading +/* A17900 802416E0 0200202D */ daddu $a0, $s0, $zero +.L802416E4: +/* A17904 802416E4 C600003C */ lwc1 $f0, 0x3c($s0) +/* A17908 802416E8 3C014059 */ lui $at, 0x4059 +/* A1790C 802416EC 44811800 */ mtc1 $at, $f3 +/* A17910 802416F0 44801000 */ mtc1 $zero, $f2 +/* A17914 802416F4 46000021 */ cvt.d.s $f0, $f0 +/* A17918 802416F8 46220002 */ mul.d $f0, $f0, $f2 +/* A1791C 802416FC 00000000 */ nop +/* A17920 80241700 4620020D */ trunc.w.d $f8, $f0 +/* A17924 80241704 E628007C */ swc1 $f8, 0x7c($s1) +/* A17928 80241708 8E420004 */ lw $v0, 4($s2) +/* A1792C 8024170C 18400021 */ blez $v0, .L80241794 +/* A17930 80241710 00000000 */ nop +/* A17934 80241714 8602008E */ lh $v0, 0x8e($s0) +/* A17938 80241718 9603008E */ lhu $v1, 0x8e($s0) +/* A1793C 8024171C 18400005 */ blez $v0, .L80241734 +/* A17940 80241720 2462FFFF */ addiu $v0, $v1, -1 +/* A17944 80241724 A602008E */ sh $v0, 0x8e($s0) +/* A17948 80241728 00021400 */ sll $v0, $v0, 0x10 +/* A1794C 8024172C 1C400019 */ bgtz $v0, .L80241794 +/* A17950 80241730 00000000 */ nop +.L80241734: +/* A17954 80241734 240403E8 */ addiu $a0, $zero, 0x3e8 +/* A17958 80241738 24020002 */ addiu $v0, $zero, 2 +/* A1795C 8024173C 0C00A67F */ jal rand_int +/* A17960 80241740 AE620070 */ sw $v0, 0x70($s3) +/* A17964 80241744 3C035555 */ lui $v1, 0x5555 +/* A17968 80241748 34635556 */ ori $v1, $v1, 0x5556 +/* A1796C 8024174C 00430018 */ mult $v0, $v1 +/* A17970 80241750 000227C3 */ sra $a0, $v0, 0x1f +/* A17974 80241754 00004010 */ mfhi $t0 +/* A17978 80241758 01042023 */ subu $a0, $t0, $a0 +/* A1797C 8024175C 00041840 */ sll $v1, $a0, 1 +/* A17980 80241760 00641821 */ addu $v1, $v1, $a0 +/* A17984 80241764 00431023 */ subu $v0, $v0, $v1 +/* A17988 80241768 24430002 */ addiu $v1, $v0, 2 +/* A1798C 8024176C AE630074 */ sw $v1, 0x74($s3) +/* A17990 80241770 8E42002C */ lw $v0, 0x2c($s2) +/* A17994 80241774 58400007 */ blezl $v0, .L80241794 +/* A17998 80241778 AE600070 */ sw $zero, 0x70($s3) +/* A1799C 8024177C 8E420008 */ lw $v0, 8($s2) +/* A179A0 80241780 18400003 */ blez $v0, .L80241790 +/* A179A4 80241784 28620003 */ slti $v0, $v1, 3 +/* A179A8 80241788 10400002 */ beqz $v0, .L80241794 +/* A179AC 8024178C 00000000 */ nop +.L80241790: +/* A179B0 80241790 AE600070 */ sw $zero, 0x70($s3) +.L80241794: +/* A179B4 80241794 8FBF0058 */ lw $ra, 0x58($sp) +/* A179B8 80241798 8FB50054 */ lw $s5, 0x54($sp) +/* A179BC 8024179C 8FB40050 */ lw $s4, 0x50($sp) +/* A179C0 802417A0 8FB3004C */ lw $s3, 0x4c($sp) +/* A179C4 802417A4 8FB20048 */ lw $s2, 0x48($sp) +/* A179C8 802417A8 8FB10044 */ lw $s1, 0x44($sp) +/* A179CC 802417AC 8FB00040 */ lw $s0, 0x40($sp) +/* A179D0 802417B0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* A179D4 802417B4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* A179D8 802417B8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* A179DC 802417BC D7B40060 */ ldc1 $f20, 0x60($sp) +/* A179E0 802417C0 03E00008 */ jr $ra +/* A179E4 802417C4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8.s deleted file mode 100644 index 0b906e3d65..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C8 -/* A179E8 802417C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A179EC 802417CC AFB3001C */ sw $s3, 0x1c($sp) -/* A179F0 802417D0 0080982D */ daddu $s3, $a0, $zero -/* A179F4 802417D4 AFBF0020 */ sw $ra, 0x20($sp) -/* A179F8 802417D8 AFB20018 */ sw $s2, 0x18($sp) -/* A179FC 802417DC AFB10014 */ sw $s1, 0x14($sp) -/* A17A00 802417E0 AFB00010 */ sw $s0, 0x10($sp) -/* A17A04 802417E4 8E720148 */ lw $s2, 0x148($s3) -/* A17A08 802417E8 86440008 */ lh $a0, 8($s2) -/* A17A0C 802417EC 0C00EABB */ jal get_npc_unsafe -/* A17A10 802417F0 00A0882D */ daddu $s1, $a1, $zero -/* A17A14 802417F4 8E240008 */ lw $a0, 8($s1) -/* A17A18 802417F8 0040802D */ daddu $s0, $v0, $zero -/* A17A1C 802417FC 00041FC2 */ srl $v1, $a0, 0x1f -/* A17A20 80241800 00832021 */ addu $a0, $a0, $v1 -/* A17A24 80241804 00042043 */ sra $a0, $a0, 1 -/* A17A28 80241808 0C00A67F */ jal rand_int -/* A17A2C 8024180C 24840001 */ addiu $a0, $a0, 1 -/* A17A30 80241810 8E230008 */ lw $v1, 8($s1) -/* A17A34 80241814 240400B4 */ addiu $a0, $zero, 0xb4 -/* A17A38 80241818 00032FC2 */ srl $a1, $v1, 0x1f -/* A17A3C 8024181C 00651821 */ addu $v1, $v1, $a1 -/* A17A40 80241820 00031843 */ sra $v1, $v1, 1 -/* A17A44 80241824 00621821 */ addu $v1, $v1, $v0 -/* A17A48 80241828 0C00A67F */ jal rand_int -/* A17A4C 8024182C A603008E */ sh $v1, 0x8e($s0) -/* A17A50 80241830 C60C000C */ lwc1 $f12, 0xc($s0) -/* A17A54 80241834 44820000 */ mtc1 $v0, $f0 -/* A17A58 80241838 00000000 */ nop -/* A17A5C 8024183C 46800020 */ cvt.s.w $f0, $f0 -/* A17A60 80241840 46006300 */ add.s $f12, $f12, $f0 -/* A17A64 80241844 3C0142B4 */ lui $at, 0x42b4 -/* A17A68 80241848 44810000 */ mtc1 $at, $f0 -/* A17A6C 8024184C 0C00A6C9 */ jal clamp_angle -/* A17A70 80241850 46006301 */ sub.s $f12, $f12, $f0 -/* A17A74 80241854 E600000C */ swc1 $f0, 0xc($s0) -/* A17A78 80241858 8E4200CC */ lw $v0, 0xcc($s2) -/* A17A7C 8024185C 8C420000 */ lw $v0, ($v0) -/* A17A80 80241860 AE020028 */ sw $v0, 0x28($s0) -/* A17A84 80241864 24020003 */ addiu $v0, $zero, 3 -/* A17A88 80241868 AE620070 */ sw $v0, 0x70($s3) -/* A17A8C 8024186C 8FBF0020 */ lw $ra, 0x20($sp) -/* A17A90 80241870 8FB3001C */ lw $s3, 0x1c($sp) -/* A17A94 80241874 8FB20018 */ lw $s2, 0x18($sp) -/* A17A98 80241878 8FB10014 */ lw $s1, 0x14($sp) -/* A17A9C 8024187C 8FB00010 */ lw $s0, 0x10($sp) -/* A17AA0 80241880 03E00008 */ jr $ra -/* A17AA4 80241884 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s new file mode 100644 index 0000000000..f50c6be9a7 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802417C8_A179E8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417C8_A179E8 +/* A179E8 802417C8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A179EC 802417CC AFB3001C */ sw $s3, 0x1c($sp) +/* A179F0 802417D0 0080982D */ daddu $s3, $a0, $zero +/* A179F4 802417D4 AFBF0020 */ sw $ra, 0x20($sp) +/* A179F8 802417D8 AFB20018 */ sw $s2, 0x18($sp) +/* A179FC 802417DC AFB10014 */ sw $s1, 0x14($sp) +/* A17A00 802417E0 AFB00010 */ sw $s0, 0x10($sp) +/* A17A04 802417E4 8E720148 */ lw $s2, 0x148($s3) +/* A17A08 802417E8 86440008 */ lh $a0, 8($s2) +/* A17A0C 802417EC 0C00EABB */ jal get_npc_unsafe +/* A17A10 802417F0 00A0882D */ daddu $s1, $a1, $zero +/* A17A14 802417F4 8E240008 */ lw $a0, 8($s1) +/* A17A18 802417F8 0040802D */ daddu $s0, $v0, $zero +/* A17A1C 802417FC 00041FC2 */ srl $v1, $a0, 0x1f +/* A17A20 80241800 00832021 */ addu $a0, $a0, $v1 +/* A17A24 80241804 00042043 */ sra $a0, $a0, 1 +/* A17A28 80241808 0C00A67F */ jal rand_int +/* A17A2C 8024180C 24840001 */ addiu $a0, $a0, 1 +/* A17A30 80241810 8E230008 */ lw $v1, 8($s1) +/* A17A34 80241814 240400B4 */ addiu $a0, $zero, 0xb4 +/* A17A38 80241818 00032FC2 */ srl $a1, $v1, 0x1f +/* A17A3C 8024181C 00651821 */ addu $v1, $v1, $a1 +/* A17A40 80241820 00031843 */ sra $v1, $v1, 1 +/* A17A44 80241824 00621821 */ addu $v1, $v1, $v0 +/* A17A48 80241828 0C00A67F */ jal rand_int +/* A17A4C 8024182C A603008E */ sh $v1, 0x8e($s0) +/* A17A50 80241830 C60C000C */ lwc1 $f12, 0xc($s0) +/* A17A54 80241834 44820000 */ mtc1 $v0, $f0 +/* A17A58 80241838 00000000 */ nop +/* A17A5C 8024183C 46800020 */ cvt.s.w $f0, $f0 +/* A17A60 80241840 46006300 */ add.s $f12, $f12, $f0 +/* A17A64 80241844 3C0142B4 */ lui $at, 0x42b4 +/* A17A68 80241848 44810000 */ mtc1 $at, $f0 +/* A17A6C 8024184C 0C00A6C9 */ jal clamp_angle +/* A17A70 80241850 46006301 */ sub.s $f12, $f12, $f0 +/* A17A74 80241854 E600000C */ swc1 $f0, 0xc($s0) +/* A17A78 80241858 8E4200CC */ lw $v0, 0xcc($s2) +/* A17A7C 8024185C 8C420000 */ lw $v0, ($v0) +/* A17A80 80241860 AE020028 */ sw $v0, 0x28($s0) +/* A17A84 80241864 24020003 */ addiu $v0, $zero, 3 +/* A17A88 80241868 AE620070 */ sw $v0, 0x70($s3) +/* A17A8C 8024186C 8FBF0020 */ lw $ra, 0x20($sp) +/* A17A90 80241870 8FB3001C */ lw $s3, 0x1c($sp) +/* A17A94 80241874 8FB20018 */ lw $s2, 0x18($sp) +/* A17A98 80241878 8FB10014 */ lw $s1, 0x14($sp) +/* A17A9C 8024187C 8FB00010 */ lw $s0, 0x10($sp) +/* A17AA0 80241880 03E00008 */ jr $ra +/* A17AA4 80241884 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888.s deleted file mode 100644 index 0f947be484..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241888 -/* A17AA8 80241888 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A17AAC 8024188C AFB3004C */ sw $s3, 0x4c($sp) -/* A17AB0 80241890 0080982D */ daddu $s3, $a0, $zero -/* A17AB4 80241894 AFBF0054 */ sw $ra, 0x54($sp) -/* A17AB8 80241898 AFB40050 */ sw $s4, 0x50($sp) -/* A17ABC 8024189C AFB20048 */ sw $s2, 0x48($sp) -/* A17AC0 802418A0 AFB10044 */ sw $s1, 0x44($sp) -/* A17AC4 802418A4 AFB00040 */ sw $s0, 0x40($sp) -/* A17AC8 802418A8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* A17ACC 802418AC F7B80068 */ sdc1 $f24, 0x68($sp) -/* A17AD0 802418B0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* A17AD4 802418B4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* A17AD8 802418B8 8E710148 */ lw $s1, 0x148($s3) -/* A17ADC 802418BC 00A0902D */ daddu $s2, $a1, $zero -/* A17AE0 802418C0 86240008 */ lh $a0, 8($s1) -/* A17AE4 802418C4 0C00EABB */ jal get_npc_unsafe -/* A17AE8 802418C8 00C0A02D */ daddu $s4, $a2, $zero -/* A17AEC 802418CC 0040802D */ daddu $s0, $v0, $zero -/* A17AF0 802418D0 C6200078 */ lwc1 $f0, 0x78($s1) -/* A17AF4 802418D4 46800020 */ cvt.s.w $f0, $f0 -/* A17AF8 802418D8 46000021 */ cvt.d.s $f0, $f0 -/* A17AFC 802418DC 3C014059 */ lui $at, 0x4059 -/* A17B00 802418E0 44811800 */ mtc1 $at, $f3 -/* A17B04 802418E4 44801000 */ mtc1 $zero, $f2 -/* A17B08 802418E8 8602008E */ lh $v0, 0x8e($s0) -/* A17B0C 802418EC 9603008E */ lhu $v1, 0x8e($s0) -/* A17B10 802418F0 46220003 */ div.d $f0, $f0, $f2 -/* A17B14 802418F4 46200620 */ cvt.s.d $f24, $f0 -/* A17B18 802418F8 C6200088 */ lwc1 $f0, 0x88($s1) -/* A17B1C 802418FC 46800020 */ cvt.s.w $f0, $f0 -/* A17B20 80241900 46000021 */ cvt.d.s $f0, $f0 -/* A17B24 80241904 46220003 */ div.d $f0, $f0, $f2 -/* A17B28 80241908 46200020 */ cvt.s.d $f0, $f0 -/* A17B2C 8024190C 18400003 */ blez $v0, .L8024191C -/* A17B30 80241910 4600C680 */ add.s $f26, $f24, $f0 -/* A17B34 80241914 2462FFFF */ addiu $v0, $v1, -1 -/* A17B38 80241918 A602008E */ sh $v0, 0x8e($s0) -.L8024191C: -/* A17B3C 8024191C 8E220070 */ lw $v0, 0x70($s1) -/* A17B40 80241920 18400034 */ blez $v0, .L802419F4 -/* A17B44 80241924 00000000 */ nop -/* A17B48 80241928 C62C0074 */ lwc1 $f12, 0x74($s1) -/* A17B4C 8024192C 46806320 */ cvt.s.w $f12, $f12 -/* A17B50 80241930 44820000 */ mtc1 $v0, $f0 -/* A17B54 80241934 00000000 */ nop -/* A17B58 80241938 46800020 */ cvt.s.w $f0, $f0 -/* A17B5C 8024193C 46000021 */ cvt.d.s $f0, $f0 -/* A17B60 80241940 46220003 */ div.d $f0, $f0, $f2 -/* A17B64 80241944 0C00A8BB */ jal sin_deg -/* A17B68 80241948 462005A0 */ cvt.s.d $f22, $f0 -/* A17B6C 8024194C 8E020000 */ lw $v0, ($s0) -/* A17B70 80241950 30420008 */ andi $v0, $v0, 8 -/* A17B74 80241954 10400003 */ beqz $v0, .L80241964 -/* A17B78 80241958 46000506 */ mov.s $f20, $f0 -/* A17B7C 8024195C 08090669 */ j .L802419A4 -/* A17B80 80241960 0000102D */ daddu $v0, $zero, $zero -.L80241964: -/* A17B84 80241964 27A50028 */ addiu $a1, $sp, 0x28 -/* A17B88 80241968 27A6002C */ addiu $a2, $sp, 0x2c -/* A17B8C 8024196C C6000038 */ lwc1 $f0, 0x38($s0) -/* A17B90 80241970 C602003C */ lwc1 $f2, 0x3c($s0) -/* A17B94 80241974 C6040040 */ lwc1 $f4, 0x40($s0) -/* A17B98 80241978 3C01447A */ lui $at, 0x447a -/* A17B9C 8024197C 44813000 */ mtc1 $at, $f6 -/* A17BA0 80241980 27A20034 */ addiu $v0, $sp, 0x34 -/* A17BA4 80241984 E7A00028 */ swc1 $f0, 0x28($sp) -/* A17BA8 80241988 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A17BAC 8024198C E7A40030 */ swc1 $f4, 0x30($sp) -/* A17BB0 80241990 E7A60034 */ swc1 $f6, 0x34($sp) -/* A17BB4 80241994 AFA20010 */ sw $v0, 0x10($sp) -/* A17BB8 80241998 8E040080 */ lw $a0, 0x80($s0) -/* A17BBC 8024199C 0C0372DF */ jal func_800DCB7C -/* A17BC0 802419A0 27A70030 */ addiu $a3, $sp, 0x30 -.L802419A4: -/* A17BC4 802419A4 10400007 */ beqz $v0, .L802419C4 -/* A17BC8 802419A8 00000000 */ nop -/* A17BCC 802419AC 4616A082 */ mul.s $f2, $f20, $f22 -/* A17BD0 802419B0 00000000 */ nop -/* A17BD4 802419B4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A17BD8 802419B8 46180000 */ add.s $f0, $f0, $f24 -/* A17BDC 802419BC 08090674 */ j .L802419D0 -/* A17BE0 802419C0 46020000 */ add.s $f0, $f0, $f2 -.L802419C4: -/* A17BE4 802419C4 4616A002 */ mul.s $f0, $f20, $f22 -/* A17BE8 802419C8 00000000 */ nop -/* A17BEC 802419CC 4600D000 */ add.s $f0, $f26, $f0 -.L802419D0: -/* A17BF0 802419D0 E600003C */ swc1 $f0, 0x3c($s0) -/* A17BF4 802419D4 8E220074 */ lw $v0, 0x74($s1) -/* A17BF8 802419D8 2442000A */ addiu $v0, $v0, 0xa -/* A17BFC 802419DC 44826000 */ mtc1 $v0, $f12 -/* A17C00 802419E0 00000000 */ nop -/* A17C04 802419E4 0C00A6C9 */ jal clamp_angle -/* A17C08 802419E8 46806320 */ cvt.s.w $f12, $f12 -/* A17C0C 802419EC 4600020D */ trunc.w.s $f8, $f0 -/* A17C10 802419F0 E6280074 */ swc1 $f8, 0x74($s1) -.L802419F4: -/* A17C14 802419F4 8E220090 */ lw $v0, 0x90($s1) -/* A17C18 802419F8 1C400040 */ bgtz $v0, .L80241AFC -/* A17C1C 802419FC 2442FFFF */ addiu $v0, $v0, -1 -/* A17C20 80241A00 860200A8 */ lh $v0, 0xa8($s0) -/* A17C24 80241A04 C600003C */ lwc1 $f0, 0x3c($s0) -/* A17C28 80241A08 44821000 */ mtc1 $v0, $f2 -/* A17C2C 80241A0C 00000000 */ nop -/* A17C30 80241A10 468010A0 */ cvt.s.w $f2, $f2 -/* A17C34 80241A14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A17C38 80241A18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A17C3C 80241A1C 46020000 */ add.s $f0, $f0, $f2 -/* A17C40 80241A20 3C014024 */ lui $at, 0x4024 -/* A17C44 80241A24 44812800 */ mtc1 $at, $f5 -/* A17C48 80241A28 44802000 */ mtc1 $zero, $f4 -/* A17C4C 80241A2C C442002C */ lwc1 $f2, 0x2c($v0) -/* A17C50 80241A30 46000021 */ cvt.d.s $f0, $f0 -/* A17C54 80241A34 46240000 */ add.d $f0, $f0, $f4 -/* A17C58 80241A38 460010A1 */ cvt.d.s $f2, $f2 -/* A17C5C 80241A3C 4620103C */ c.lt.d $f2, $f0 -/* A17C60 80241A40 00000000 */ nop -/* A17C64 80241A44 4500002E */ bc1f .L80241B00 -/* A17C68 80241A48 0280202D */ daddu $a0, $s4, $zero -/* A17C6C 80241A4C 24020001 */ addiu $v0, $zero, 1 -/* A17C70 80241A50 AFA20010 */ sw $v0, 0x10($sp) -/* A17C74 80241A54 8E460024 */ lw $a2, 0x24($s2) -/* A17C78 80241A58 8E470028 */ lw $a3, 0x28($s2) -/* A17C7C 80241A5C 0C01242D */ jal func_800490B4 -/* A17C80 80241A60 0220282D */ daddu $a1, $s1, $zero -/* A17C84 80241A64 10400026 */ beqz $v0, .L80241B00 -/* A17C88 80241A68 0000202D */ daddu $a0, $zero, $zero -/* A17C8C 80241A6C 0200282D */ daddu $a1, $s0, $zero -/* A17C90 80241A70 0000302D */ daddu $a2, $zero, $zero -/* A17C94 80241A74 2412000C */ addiu $s2, $zero, 0xc -/* A17C98 80241A78 860300A8 */ lh $v1, 0xa8($s0) -/* A17C9C 80241A7C 3C013F80 */ lui $at, 0x3f80 -/* A17CA0 80241A80 44810000 */ mtc1 $at, $f0 -/* A17CA4 80241A84 3C014000 */ lui $at, 0x4000 -/* A17CA8 80241A88 44811000 */ mtc1 $at, $f2 -/* A17CAC 80241A8C 3C01C1A0 */ lui $at, 0xc1a0 -/* A17CB0 80241A90 44812000 */ mtc1 $at, $f4 -/* A17CB4 80241A94 44834000 */ mtc1 $v1, $f8 -/* A17CB8 80241A98 00000000 */ nop -/* A17CBC 80241A9C 46804220 */ cvt.s.w $f8, $f8 -/* A17CC0 80241AA0 44074000 */ mfc1 $a3, $f8 -/* A17CC4 80241AA4 27A20038 */ addiu $v0, $sp, 0x38 -/* A17CC8 80241AA8 AFB2001C */ sw $s2, 0x1c($sp) -/* A17CCC 80241AAC AFA20020 */ sw $v0, 0x20($sp) -/* A17CD0 80241AB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A17CD4 80241AB4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A17CD8 80241AB8 0C01BFA4 */ jal fx_emote -/* A17CDC 80241ABC E7A40018 */ swc1 $f4, 0x18($sp) -/* A17CE0 80241AC0 0200202D */ daddu $a0, $s0, $zero -/* A17CE4 80241AC4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A17CE8 80241AC8 C480003C */ lwc1 $f0, 0x3c($a0) -/* A17CEC 80241ACC 3C060020 */ lui $a2, 0x20 -/* A17CF0 80241AD0 0C012530 */ jal func_800494C0 -/* A17CF4 80241AD4 E4800064 */ swc1 $f0, 0x64($a0) -/* A17CF8 80241AD8 8E220018 */ lw $v0, 0x18($s1) -/* A17CFC 80241ADC 9442002A */ lhu $v0, 0x2a($v0) -/* A17D00 80241AE0 30420001 */ andi $v0, $v0, 1 -/* A17D04 80241AE4 10400003 */ beqz $v0, .L80241AF4 -/* A17D08 80241AE8 2402000A */ addiu $v0, $zero, 0xa -/* A17D0C 80241AEC 080906E7 */ j .L80241B9C -/* A17D10 80241AF0 AE620070 */ sw $v0, 0x70($s3) -.L80241AF4: -/* A17D14 80241AF4 080906E7 */ j .L80241B9C -/* A17D18 80241AF8 AE720070 */ sw $s2, 0x70($s3) -.L80241AFC: -/* A17D1C 80241AFC AE220090 */ sw $v0, 0x90($s1) -.L80241B00: -/* A17D20 80241B00 8602008C */ lh $v0, 0x8c($s0) -/* A17D24 80241B04 14400025 */ bnez $v0, .L80241B9C -/* A17D28 80241B08 00000000 */ nop -/* A17D2C 80241B0C 8602008E */ lh $v0, 0x8e($s0) -/* A17D30 80241B10 1C400022 */ bgtz $v0, .L80241B9C -/* A17D34 80241B14 00000000 */ nop -/* A17D38 80241B18 8E620074 */ lw $v0, 0x74($s3) -/* A17D3C 80241B1C 2442FFFF */ addiu $v0, $v0, -1 -/* A17D40 80241B20 1840001D */ blez $v0, .L80241B98 -/* A17D44 80241B24 AE620074 */ sw $v0, 0x74($s3) -/* A17D48 80241B28 8E220018 */ lw $v0, 0x18($s1) -/* A17D4C 80241B2C 9442002A */ lhu $v0, 0x2a($v0) -/* A17D50 80241B30 30420010 */ andi $v0, $v0, 0x10 -/* A17D54 80241B34 14400007 */ bnez $v0, .L80241B54 -/* A17D58 80241B38 00000000 */ nop -/* A17D5C 80241B3C C600000C */ lwc1 $f0, 0xc($s0) -/* A17D60 80241B40 3C014334 */ lui $at, 0x4334 -/* A17D64 80241B44 44816000 */ mtc1 $at, $f12 -/* A17D68 80241B48 0C00A6C9 */ jal clamp_angle -/* A17D6C 80241B4C 460C0300 */ add.s $f12, $f0, $f12 -/* A17D70 80241B50 E600000C */ swc1 $f0, 0xc($s0) -.L80241B54: -/* A17D74 80241B54 0C00A67F */ jal rand_int -/* A17D78 80241B58 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A17D7C 80241B5C 3C032E8B */ lui $v1, 0x2e8b -/* A17D80 80241B60 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* A17D84 80241B64 00430018 */ mult $v0, $v1 -/* A17D88 80241B68 00021FC3 */ sra $v1, $v0, 0x1f -/* A17D8C 80241B6C 00004010 */ mfhi $t0 -/* A17D90 80241B70 00082043 */ sra $a0, $t0, 1 -/* A17D94 80241B74 00832023 */ subu $a0, $a0, $v1 -/* A17D98 80241B78 00041840 */ sll $v1, $a0, 1 -/* A17D9C 80241B7C 00641821 */ addu $v1, $v1, $a0 -/* A17DA0 80241B80 00031880 */ sll $v1, $v1, 2 -/* A17DA4 80241B84 00641823 */ subu $v1, $v1, $a0 -/* A17DA8 80241B88 00431023 */ subu $v0, $v0, $v1 -/* A17DAC 80241B8C 24420005 */ addiu $v0, $v0, 5 -/* A17DB0 80241B90 080906E7 */ j .L80241B9C -/* A17DB4 80241B94 A602008E */ sh $v0, 0x8e($s0) -.L80241B98: -/* A17DB8 80241B98 AE600070 */ sw $zero, 0x70($s3) -.L80241B9C: -/* A17DBC 80241B9C 8FBF0054 */ lw $ra, 0x54($sp) -/* A17DC0 80241BA0 8FB40050 */ lw $s4, 0x50($sp) -/* A17DC4 80241BA4 8FB3004C */ lw $s3, 0x4c($sp) -/* A17DC8 80241BA8 8FB20048 */ lw $s2, 0x48($sp) -/* A17DCC 80241BAC 8FB10044 */ lw $s1, 0x44($sp) -/* A17DD0 80241BB0 8FB00040 */ lw $s0, 0x40($sp) -/* A17DD4 80241BB4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* A17DD8 80241BB8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* A17DDC 80241BBC D7B60060 */ ldc1 $f22, 0x60($sp) -/* A17DE0 80241BC0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* A17DE4 80241BC4 03E00008 */ jr $ra -/* A17DE8 80241BC8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s new file mode 100644 index 0000000000..e283472907 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241888_A17AA8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241888_A17AA8 +/* A17AA8 80241888 27BDFF88 */ addiu $sp, $sp, -0x78 +/* A17AAC 8024188C AFB3004C */ sw $s3, 0x4c($sp) +/* A17AB0 80241890 0080982D */ daddu $s3, $a0, $zero +/* A17AB4 80241894 AFBF0054 */ sw $ra, 0x54($sp) +/* A17AB8 80241898 AFB40050 */ sw $s4, 0x50($sp) +/* A17ABC 8024189C AFB20048 */ sw $s2, 0x48($sp) +/* A17AC0 802418A0 AFB10044 */ sw $s1, 0x44($sp) +/* A17AC4 802418A4 AFB00040 */ sw $s0, 0x40($sp) +/* A17AC8 802418A8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* A17ACC 802418AC F7B80068 */ sdc1 $f24, 0x68($sp) +/* A17AD0 802418B0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* A17AD4 802418B4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* A17AD8 802418B8 8E710148 */ lw $s1, 0x148($s3) +/* A17ADC 802418BC 00A0902D */ daddu $s2, $a1, $zero +/* A17AE0 802418C0 86240008 */ lh $a0, 8($s1) +/* A17AE4 802418C4 0C00EABB */ jal get_npc_unsafe +/* A17AE8 802418C8 00C0A02D */ daddu $s4, $a2, $zero +/* A17AEC 802418CC 0040802D */ daddu $s0, $v0, $zero +/* A17AF0 802418D0 C6200078 */ lwc1 $f0, 0x78($s1) +/* A17AF4 802418D4 46800020 */ cvt.s.w $f0, $f0 +/* A17AF8 802418D8 46000021 */ cvt.d.s $f0, $f0 +/* A17AFC 802418DC 3C014059 */ lui $at, 0x4059 +/* A17B00 802418E0 44811800 */ mtc1 $at, $f3 +/* A17B04 802418E4 44801000 */ mtc1 $zero, $f2 +/* A17B08 802418E8 8602008E */ lh $v0, 0x8e($s0) +/* A17B0C 802418EC 9603008E */ lhu $v1, 0x8e($s0) +/* A17B10 802418F0 46220003 */ div.d $f0, $f0, $f2 +/* A17B14 802418F4 46200620 */ cvt.s.d $f24, $f0 +/* A17B18 802418F8 C6200088 */ lwc1 $f0, 0x88($s1) +/* A17B1C 802418FC 46800020 */ cvt.s.w $f0, $f0 +/* A17B20 80241900 46000021 */ cvt.d.s $f0, $f0 +/* A17B24 80241904 46220003 */ div.d $f0, $f0, $f2 +/* A17B28 80241908 46200020 */ cvt.s.d $f0, $f0 +/* A17B2C 8024190C 18400003 */ blez $v0, .L8024191C +/* A17B30 80241910 4600C680 */ add.s $f26, $f24, $f0 +/* A17B34 80241914 2462FFFF */ addiu $v0, $v1, -1 +/* A17B38 80241918 A602008E */ sh $v0, 0x8e($s0) +.L8024191C: +/* A17B3C 8024191C 8E220070 */ lw $v0, 0x70($s1) +/* A17B40 80241920 18400034 */ blez $v0, .L802419F4 +/* A17B44 80241924 00000000 */ nop +/* A17B48 80241928 C62C0074 */ lwc1 $f12, 0x74($s1) +/* A17B4C 8024192C 46806320 */ cvt.s.w $f12, $f12 +/* A17B50 80241930 44820000 */ mtc1 $v0, $f0 +/* A17B54 80241934 00000000 */ nop +/* A17B58 80241938 46800020 */ cvt.s.w $f0, $f0 +/* A17B5C 8024193C 46000021 */ cvt.d.s $f0, $f0 +/* A17B60 80241940 46220003 */ div.d $f0, $f0, $f2 +/* A17B64 80241944 0C00A8BB */ jal sin_deg +/* A17B68 80241948 462005A0 */ cvt.s.d $f22, $f0 +/* A17B6C 8024194C 8E020000 */ lw $v0, ($s0) +/* A17B70 80241950 30420008 */ andi $v0, $v0, 8 +/* A17B74 80241954 10400003 */ beqz $v0, .L80241964 +/* A17B78 80241958 46000506 */ mov.s $f20, $f0 +/* A17B7C 8024195C 08090669 */ j .L802419A4 +/* A17B80 80241960 0000102D */ daddu $v0, $zero, $zero +.L80241964: +/* A17B84 80241964 27A50028 */ addiu $a1, $sp, 0x28 +/* A17B88 80241968 27A6002C */ addiu $a2, $sp, 0x2c +/* A17B8C 8024196C C6000038 */ lwc1 $f0, 0x38($s0) +/* A17B90 80241970 C602003C */ lwc1 $f2, 0x3c($s0) +/* A17B94 80241974 C6040040 */ lwc1 $f4, 0x40($s0) +/* A17B98 80241978 3C01447A */ lui $at, 0x447a +/* A17B9C 8024197C 44813000 */ mtc1 $at, $f6 +/* A17BA0 80241980 27A20034 */ addiu $v0, $sp, 0x34 +/* A17BA4 80241984 E7A00028 */ swc1 $f0, 0x28($sp) +/* A17BA8 80241988 E7A2002C */ swc1 $f2, 0x2c($sp) +/* A17BAC 8024198C E7A40030 */ swc1 $f4, 0x30($sp) +/* A17BB0 80241990 E7A60034 */ swc1 $f6, 0x34($sp) +/* A17BB4 80241994 AFA20010 */ sw $v0, 0x10($sp) +/* A17BB8 80241998 8E040080 */ lw $a0, 0x80($s0) +/* A17BBC 8024199C 0C0372DF */ jal func_800DCB7C +/* A17BC0 802419A0 27A70030 */ addiu $a3, $sp, 0x30 +.L802419A4: +/* A17BC4 802419A4 10400007 */ beqz $v0, .L802419C4 +/* A17BC8 802419A8 00000000 */ nop +/* A17BCC 802419AC 4616A082 */ mul.s $f2, $f20, $f22 +/* A17BD0 802419B0 00000000 */ nop +/* A17BD4 802419B4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A17BD8 802419B8 46180000 */ add.s $f0, $f0, $f24 +/* A17BDC 802419BC 08090674 */ j .L802419D0 +/* A17BE0 802419C0 46020000 */ add.s $f0, $f0, $f2 +.L802419C4: +/* A17BE4 802419C4 4616A002 */ mul.s $f0, $f20, $f22 +/* A17BE8 802419C8 00000000 */ nop +/* A17BEC 802419CC 4600D000 */ add.s $f0, $f26, $f0 +.L802419D0: +/* A17BF0 802419D0 E600003C */ swc1 $f0, 0x3c($s0) +/* A17BF4 802419D4 8E220074 */ lw $v0, 0x74($s1) +/* A17BF8 802419D8 2442000A */ addiu $v0, $v0, 0xa +/* A17BFC 802419DC 44826000 */ mtc1 $v0, $f12 +/* A17C00 802419E0 00000000 */ nop +/* A17C04 802419E4 0C00A6C9 */ jal clamp_angle +/* A17C08 802419E8 46806320 */ cvt.s.w $f12, $f12 +/* A17C0C 802419EC 4600020D */ trunc.w.s $f8, $f0 +/* A17C10 802419F0 E6280074 */ swc1 $f8, 0x74($s1) +.L802419F4: +/* A17C14 802419F4 8E220090 */ lw $v0, 0x90($s1) +/* A17C18 802419F8 1C400040 */ bgtz $v0, .L80241AFC +/* A17C1C 802419FC 2442FFFF */ addiu $v0, $v0, -1 +/* A17C20 80241A00 860200A8 */ lh $v0, 0xa8($s0) +/* A17C24 80241A04 C600003C */ lwc1 $f0, 0x3c($s0) +/* A17C28 80241A08 44821000 */ mtc1 $v0, $f2 +/* A17C2C 80241A0C 00000000 */ nop +/* A17C30 80241A10 468010A0 */ cvt.s.w $f2, $f2 +/* A17C34 80241A14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A17C38 80241A18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A17C3C 80241A1C 46020000 */ add.s $f0, $f0, $f2 +/* A17C40 80241A20 3C014024 */ lui $at, 0x4024 +/* A17C44 80241A24 44812800 */ mtc1 $at, $f5 +/* A17C48 80241A28 44802000 */ mtc1 $zero, $f4 +/* A17C4C 80241A2C C442002C */ lwc1 $f2, 0x2c($v0) +/* A17C50 80241A30 46000021 */ cvt.d.s $f0, $f0 +/* A17C54 80241A34 46240000 */ add.d $f0, $f0, $f4 +/* A17C58 80241A38 460010A1 */ cvt.d.s $f2, $f2 +/* A17C5C 80241A3C 4620103C */ c.lt.d $f2, $f0 +/* A17C60 80241A40 00000000 */ nop +/* A17C64 80241A44 4500002E */ bc1f .L80241B00 +/* A17C68 80241A48 0280202D */ daddu $a0, $s4, $zero +/* A17C6C 80241A4C 24020001 */ addiu $v0, $zero, 1 +/* A17C70 80241A50 AFA20010 */ sw $v0, 0x10($sp) +/* A17C74 80241A54 8E460024 */ lw $a2, 0x24($s2) +/* A17C78 80241A58 8E470028 */ lw $a3, 0x28($s2) +/* A17C7C 80241A5C 0C01242D */ jal func_800490B4 +/* A17C80 80241A60 0220282D */ daddu $a1, $s1, $zero +/* A17C84 80241A64 10400026 */ beqz $v0, .L80241B00 +/* A17C88 80241A68 0000202D */ daddu $a0, $zero, $zero +/* A17C8C 80241A6C 0200282D */ daddu $a1, $s0, $zero +/* A17C90 80241A70 0000302D */ daddu $a2, $zero, $zero +/* A17C94 80241A74 2412000C */ addiu $s2, $zero, 0xc +/* A17C98 80241A78 860300A8 */ lh $v1, 0xa8($s0) +/* A17C9C 80241A7C 3C013F80 */ lui $at, 0x3f80 +/* A17CA0 80241A80 44810000 */ mtc1 $at, $f0 +/* A17CA4 80241A84 3C014000 */ lui $at, 0x4000 +/* A17CA8 80241A88 44811000 */ mtc1 $at, $f2 +/* A17CAC 80241A8C 3C01C1A0 */ lui $at, 0xc1a0 +/* A17CB0 80241A90 44812000 */ mtc1 $at, $f4 +/* A17CB4 80241A94 44834000 */ mtc1 $v1, $f8 +/* A17CB8 80241A98 00000000 */ nop +/* A17CBC 80241A9C 46804220 */ cvt.s.w $f8, $f8 +/* A17CC0 80241AA0 44074000 */ mfc1 $a3, $f8 +/* A17CC4 80241AA4 27A20038 */ addiu $v0, $sp, 0x38 +/* A17CC8 80241AA8 AFB2001C */ sw $s2, 0x1c($sp) +/* A17CCC 80241AAC AFA20020 */ sw $v0, 0x20($sp) +/* A17CD0 80241AB0 E7A00010 */ swc1 $f0, 0x10($sp) +/* A17CD4 80241AB4 E7A20014 */ swc1 $f2, 0x14($sp) +/* A17CD8 80241AB8 0C01BFA4 */ jal fx_emote +/* A17CDC 80241ABC E7A40018 */ swc1 $f4, 0x18($sp) +/* A17CE0 80241AC0 0200202D */ daddu $a0, $s0, $zero +/* A17CE4 80241AC4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* A17CE8 80241AC8 C480003C */ lwc1 $f0, 0x3c($a0) +/* A17CEC 80241ACC 3C060020 */ lui $a2, 0x20 +/* A17CF0 80241AD0 0C012530 */ jal func_800494C0 +/* A17CF4 80241AD4 E4800064 */ swc1 $f0, 0x64($a0) +/* A17CF8 80241AD8 8E220018 */ lw $v0, 0x18($s1) +/* A17CFC 80241ADC 9442002A */ lhu $v0, 0x2a($v0) +/* A17D00 80241AE0 30420001 */ andi $v0, $v0, 1 +/* A17D04 80241AE4 10400003 */ beqz $v0, .L80241AF4 +/* A17D08 80241AE8 2402000A */ addiu $v0, $zero, 0xa +/* A17D0C 80241AEC 080906E7 */ j .L80241B9C +/* A17D10 80241AF0 AE620070 */ sw $v0, 0x70($s3) +.L80241AF4: +/* A17D14 80241AF4 080906E7 */ j .L80241B9C +/* A17D18 80241AF8 AE720070 */ sw $s2, 0x70($s3) +.L80241AFC: +/* A17D1C 80241AFC AE220090 */ sw $v0, 0x90($s1) +.L80241B00: +/* A17D20 80241B00 8602008C */ lh $v0, 0x8c($s0) +/* A17D24 80241B04 14400025 */ bnez $v0, .L80241B9C +/* A17D28 80241B08 00000000 */ nop +/* A17D2C 80241B0C 8602008E */ lh $v0, 0x8e($s0) +/* A17D30 80241B10 1C400022 */ bgtz $v0, .L80241B9C +/* A17D34 80241B14 00000000 */ nop +/* A17D38 80241B18 8E620074 */ lw $v0, 0x74($s3) +/* A17D3C 80241B1C 2442FFFF */ addiu $v0, $v0, -1 +/* A17D40 80241B20 1840001D */ blez $v0, .L80241B98 +/* A17D44 80241B24 AE620074 */ sw $v0, 0x74($s3) +/* A17D48 80241B28 8E220018 */ lw $v0, 0x18($s1) +/* A17D4C 80241B2C 9442002A */ lhu $v0, 0x2a($v0) +/* A17D50 80241B30 30420010 */ andi $v0, $v0, 0x10 +/* A17D54 80241B34 14400007 */ bnez $v0, .L80241B54 +/* A17D58 80241B38 00000000 */ nop +/* A17D5C 80241B3C C600000C */ lwc1 $f0, 0xc($s0) +/* A17D60 80241B40 3C014334 */ lui $at, 0x4334 +/* A17D64 80241B44 44816000 */ mtc1 $at, $f12 +/* A17D68 80241B48 0C00A6C9 */ jal clamp_angle +/* A17D6C 80241B4C 460C0300 */ add.s $f12, $f0, $f12 +/* A17D70 80241B50 E600000C */ swc1 $f0, 0xc($s0) +.L80241B54: +/* A17D74 80241B54 0C00A67F */ jal rand_int +/* A17D78 80241B58 240403E8 */ addiu $a0, $zero, 0x3e8 +/* A17D7C 80241B5C 3C032E8B */ lui $v1, 0x2e8b +/* A17D80 80241B60 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* A17D84 80241B64 00430018 */ mult $v0, $v1 +/* A17D88 80241B68 00021FC3 */ sra $v1, $v0, 0x1f +/* A17D8C 80241B6C 00004010 */ mfhi $t0 +/* A17D90 80241B70 00082043 */ sra $a0, $t0, 1 +/* A17D94 80241B74 00832023 */ subu $a0, $a0, $v1 +/* A17D98 80241B78 00041840 */ sll $v1, $a0, 1 +/* A17D9C 80241B7C 00641821 */ addu $v1, $v1, $a0 +/* A17DA0 80241B80 00031880 */ sll $v1, $v1, 2 +/* A17DA4 80241B84 00641823 */ subu $v1, $v1, $a0 +/* A17DA8 80241B88 00431023 */ subu $v0, $v0, $v1 +/* A17DAC 80241B8C 24420005 */ addiu $v0, $v0, 5 +/* A17DB0 80241B90 080906E7 */ j .L80241B9C +/* A17DB4 80241B94 A602008E */ sh $v0, 0x8e($s0) +.L80241B98: +/* A17DB8 80241B98 AE600070 */ sw $zero, 0x70($s3) +.L80241B9C: +/* A17DBC 80241B9C 8FBF0054 */ lw $ra, 0x54($sp) +/* A17DC0 80241BA0 8FB40050 */ lw $s4, 0x50($sp) +/* A17DC4 80241BA4 8FB3004C */ lw $s3, 0x4c($sp) +/* A17DC8 80241BA8 8FB20048 */ lw $s2, 0x48($sp) +/* A17DCC 80241BAC 8FB10044 */ lw $s1, 0x44($sp) +/* A17DD0 80241BB0 8FB00040 */ lw $s0, 0x40($sp) +/* A17DD4 80241BB4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* A17DD8 80241BB8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* A17DDC 80241BBC D7B60060 */ ldc1 $f22, 0x60($sp) +/* A17DE0 80241BC0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* A17DE4 80241BC4 03E00008 */ jr $ra +/* A17DE8 80241BC8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC.s deleted file mode 100644 index effff62997..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BCC -/* A17DEC 80241BCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A17DF0 80241BD0 AFB20018 */ sw $s2, 0x18($sp) -/* A17DF4 80241BD4 0080902D */ daddu $s2, $a0, $zero -/* A17DF8 80241BD8 AFBF001C */ sw $ra, 0x1c($sp) -/* A17DFC 80241BDC AFB10014 */ sw $s1, 0x14($sp) -/* A17E00 80241BE0 AFB00010 */ sw $s0, 0x10($sp) -/* A17E04 80241BE4 8E510148 */ lw $s1, 0x148($s2) -/* A17E08 80241BE8 0C00EABB */ jal get_npc_unsafe -/* A17E0C 80241BEC 86240008 */ lh $a0, 8($s1) -/* A17E10 80241BF0 0040802D */ daddu $s0, $v0, $zero -/* A17E14 80241BF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A17E18 80241BF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A17E1C 80241BFC C60C0038 */ lwc1 $f12, 0x38($s0) -/* A17E20 80241C00 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A17E24 80241C04 A600008E */ sh $zero, 0x8e($s0) -/* A17E28 80241C08 8C460028 */ lw $a2, 0x28($v0) -/* A17E2C 80241C0C 0C00A720 */ jal atan2 -/* A17E30 80241C10 8C470030 */ lw $a3, 0x30($v0) -/* A17E34 80241C14 E600000C */ swc1 $f0, 0xc($s0) -/* A17E38 80241C18 8E2200CC */ lw $v0, 0xcc($s1) -/* A17E3C 80241C1C 8C420020 */ lw $v0, 0x20($v0) -/* A17E40 80241C20 AE020028 */ sw $v0, 0x28($s0) -/* A17E44 80241C24 2402000B */ addiu $v0, $zero, 0xb -/* A17E48 80241C28 AE420070 */ sw $v0, 0x70($s2) -/* A17E4C 80241C2C 8FBF001C */ lw $ra, 0x1c($sp) -/* A17E50 80241C30 8FB20018 */ lw $s2, 0x18($sp) -/* A17E54 80241C34 8FB10014 */ lw $s1, 0x14($sp) -/* A17E58 80241C38 8FB00010 */ lw $s0, 0x10($sp) -/* A17E5C 80241C3C 03E00008 */ jr $ra -/* A17E60 80241C40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC_A17DEC.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC_A17DEC.s new file mode 100644 index 0000000000..80c4ed72f9 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241BCC_A17DEC.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BCC_A17DEC +/* A17DEC 80241BCC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A17DF0 80241BD0 AFB20018 */ sw $s2, 0x18($sp) +/* A17DF4 80241BD4 0080902D */ daddu $s2, $a0, $zero +/* A17DF8 80241BD8 AFBF001C */ sw $ra, 0x1c($sp) +/* A17DFC 80241BDC AFB10014 */ sw $s1, 0x14($sp) +/* A17E00 80241BE0 AFB00010 */ sw $s0, 0x10($sp) +/* A17E04 80241BE4 8E510148 */ lw $s1, 0x148($s2) +/* A17E08 80241BE8 0C00EABB */ jal get_npc_unsafe +/* A17E0C 80241BEC 86240008 */ lh $a0, 8($s1) +/* A17E10 80241BF0 0040802D */ daddu $s0, $v0, $zero +/* A17E14 80241BF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A17E18 80241BF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A17E1C 80241BFC C60C0038 */ lwc1 $f12, 0x38($s0) +/* A17E20 80241C00 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A17E24 80241C04 A600008E */ sh $zero, 0x8e($s0) +/* A17E28 80241C08 8C460028 */ lw $a2, 0x28($v0) +/* A17E2C 80241C0C 0C00A720 */ jal atan2 +/* A17E30 80241C10 8C470030 */ lw $a3, 0x30($v0) +/* A17E34 80241C14 E600000C */ swc1 $f0, 0xc($s0) +/* A17E38 80241C18 8E2200CC */ lw $v0, 0xcc($s1) +/* A17E3C 80241C1C 8C420020 */ lw $v0, 0x20($v0) +/* A17E40 80241C20 AE020028 */ sw $v0, 0x28($s0) +/* A17E44 80241C24 2402000B */ addiu $v0, $zero, 0xb +/* A17E48 80241C28 AE420070 */ sw $v0, 0x70($s2) +/* A17E4C 80241C2C 8FBF001C */ lw $ra, 0x1c($sp) +/* A17E50 80241C30 8FB20018 */ lw $s2, 0x18($sp) +/* A17E54 80241C34 8FB10014 */ lw $s1, 0x14($sp) +/* A17E58 80241C38 8FB00010 */ lw $s0, 0x10($sp) +/* A17E5C 80241C3C 03E00008 */ jr $ra +/* A17E60 80241C40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44.s deleted file mode 100644 index 2c7d242d75..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C44 -/* A17E64 80241C44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A17E68 80241C48 AFB00010 */ sw $s0, 0x10($sp) -/* A17E6C 80241C4C 0080802D */ daddu $s0, $a0, $zero -/* A17E70 80241C50 AFBF0014 */ sw $ra, 0x14($sp) -/* A17E74 80241C54 8E020148 */ lw $v0, 0x148($s0) -/* A17E78 80241C58 0C00EABB */ jal get_npc_unsafe -/* A17E7C 80241C5C 84440008 */ lh $a0, 8($v0) -/* A17E80 80241C60 9443008E */ lhu $v1, 0x8e($v0) -/* A17E84 80241C64 C440003C */ lwc1 $f0, 0x3c($v0) -/* A17E88 80241C68 24640001 */ addiu $a0, $v1, 1 -/* A17E8C 80241C6C 00031C00 */ sll $v1, $v1, 0x10 -/* A17E90 80241C70 00031B83 */ sra $v1, $v1, 0xe -/* A17E94 80241C74 A444008E */ sh $a0, 0x8e($v0) -/* A17E98 80241C78 3C018024 */ lui $at, 0x8024 -/* A17E9C 80241C7C 00230821 */ addu $at, $at, $v1 -/* A17EA0 80241C80 C4224490 */ lwc1 $f2, 0x4490($at) -/* A17EA4 80241C84 8443008E */ lh $v1, 0x8e($v0) -/* A17EA8 80241C88 46020000 */ add.s $f0, $f0, $f2 -/* A17EAC 80241C8C 28630005 */ slti $v1, $v1, 5 -/* A17EB0 80241C90 14600003 */ bnez $v1, .L80241CA0 -/* A17EB4 80241C94 E440003C */ swc1 $f0, 0x3c($v0) -/* A17EB8 80241C98 2402000C */ addiu $v0, $zero, 0xc -/* A17EBC 80241C9C AE020070 */ sw $v0, 0x70($s0) -.L80241CA0: -/* A17EC0 80241CA0 8FBF0014 */ lw $ra, 0x14($sp) -/* A17EC4 80241CA4 8FB00010 */ lw $s0, 0x10($sp) -/* A17EC8 80241CA8 03E00008 */ jr $ra -/* A17ECC 80241CAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s new file mode 100644 index 0000000000..4f6d9347b8 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241C44_A17E64.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C44_A17E64 +/* A17E64 80241C44 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A17E68 80241C48 AFB00010 */ sw $s0, 0x10($sp) +/* A17E6C 80241C4C 0080802D */ daddu $s0, $a0, $zero +/* A17E70 80241C50 AFBF0014 */ sw $ra, 0x14($sp) +/* A17E74 80241C54 8E020148 */ lw $v0, 0x148($s0) +/* A17E78 80241C58 0C00EABB */ jal get_npc_unsafe +/* A17E7C 80241C5C 84440008 */ lh $a0, 8($v0) +/* A17E80 80241C60 9443008E */ lhu $v1, 0x8e($v0) +/* A17E84 80241C64 C440003C */ lwc1 $f0, 0x3c($v0) +/* A17E88 80241C68 24640001 */ addiu $a0, $v1, 1 +/* A17E8C 80241C6C 00031C00 */ sll $v1, $v1, 0x10 +/* A17E90 80241C70 00031B83 */ sra $v1, $v1, 0xe +/* A17E94 80241C74 A444008E */ sh $a0, 0x8e($v0) +/* A17E98 80241C78 3C018024 */ lui $at, 0x8024 +/* A17E9C 80241C7C 00230821 */ addu $at, $at, $v1 +/* A17EA0 80241C80 C4224490 */ lwc1 $f2, 0x4490($at) +/* A17EA4 80241C84 8443008E */ lh $v1, 0x8e($v0) +/* A17EA8 80241C88 46020000 */ add.s $f0, $f0, $f2 +/* A17EAC 80241C8C 28630005 */ slti $v1, $v1, 5 +/* A17EB0 80241C90 14600003 */ bnez $v1, .L80241CA0 +/* A17EB4 80241C94 E440003C */ swc1 $f0, 0x3c($v0) +/* A17EB8 80241C98 2402000C */ addiu $v0, $zero, 0xc +/* A17EBC 80241C9C AE020070 */ sw $v0, 0x70($s0) +.L80241CA0: +/* A17EC0 80241CA0 8FBF0014 */ lw $ra, 0x14($sp) +/* A17EC4 80241CA4 8FB00010 */ lw $s0, 0x10($sp) +/* A17EC8 80241CA8 03E00008 */ jr $ra +/* A17ECC 80241CAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0.s deleted file mode 100644 index 91ce529cf1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CB0 -/* A17ED0 80241CB0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A17ED4 80241CB4 AFB3001C */ sw $s3, 0x1c($sp) -/* A17ED8 80241CB8 0080982D */ daddu $s3, $a0, $zero -/* A17EDC 80241CBC AFBF0020 */ sw $ra, 0x20($sp) -/* A17EE0 80241CC0 AFB20018 */ sw $s2, 0x18($sp) -/* A17EE4 80241CC4 AFB10014 */ sw $s1, 0x14($sp) -/* A17EE8 80241CC8 AFB00010 */ sw $s0, 0x10($sp) -/* A17EEC 80241CCC 8E720148 */ lw $s2, 0x148($s3) -/* A17EF0 80241CD0 86440008 */ lh $a0, 8($s2) -/* A17EF4 80241CD4 0C00EABB */ jal get_npc_unsafe -/* A17EF8 80241CD8 00A0802D */ daddu $s0, $a1, $zero -/* A17EFC 80241CDC 0040882D */ daddu $s1, $v0, $zero -/* A17F00 80241CE0 C6420080 */ lwc1 $f2, 0x80($s2) -/* A17F04 80241CE4 468010A0 */ cvt.s.w $f2, $f2 -/* A17F08 80241CE8 460010A1 */ cvt.d.s $f2, $f2 -/* A17F0C 80241CEC C6400084 */ lwc1 $f0, 0x84($s2) -/* A17F10 80241CF0 46800020 */ cvt.s.w $f0, $f0 -/* A17F14 80241CF4 46000021 */ cvt.d.s $f0, $f0 -/* A17F18 80241CF8 3C014059 */ lui $at, 0x4059 -/* A17F1C 80241CFC 44812800 */ mtc1 $at, $f5 -/* A17F20 80241D00 44802000 */ mtc1 $zero, $f4 -/* A17F24 80241D04 8E4200CC */ lw $v0, 0xcc($s2) -/* A17F28 80241D08 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A17F2C 80241D0C C62E0040 */ lwc1 $f14, 0x40($s1) -/* A17F30 80241D10 46241083 */ div.d $f2, $f2, $f4 -/* A17F34 80241D14 462010A0 */ cvt.s.d $f2, $f2 -/* A17F38 80241D18 46240003 */ div.d $f0, $f0, $f4 -/* A17F3C 80241D1C 8C420020 */ lw $v0, 0x20($v0) -/* A17F40 80241D20 46200020 */ cvt.s.d $f0, $f0 -/* A17F44 80241D24 E622001C */ swc1 $f2, 0x1c($s1) -/* A17F48 80241D28 E6200014 */ swc1 $f0, 0x14($s1) -/* A17F4C 80241D2C AE220028 */ sw $v0, 0x28($s1) -/* A17F50 80241D30 C6000018 */ lwc1 $f0, 0x18($s0) -/* A17F54 80241D34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A17F58 80241D38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A17F5C 80241D3C E6200018 */ swc1 $f0, 0x18($s1) -/* A17F60 80241D40 8C460028 */ lw $a2, 0x28($v0) -/* A17F64 80241D44 0C00A720 */ jal atan2 -/* A17F68 80241D48 8C470030 */ lw $a3, 0x30($v0) -/* A17F6C 80241D4C E620000C */ swc1 $f0, 0xc($s1) -/* A17F70 80241D50 8E420018 */ lw $v0, 0x18($s2) -/* A17F74 80241D54 AE400074 */ sw $zero, 0x74($s2) -/* A17F78 80241D58 9442002A */ lhu $v0, 0x2a($v0) -/* A17F7C 80241D5C 30420002 */ andi $v0, $v0, 2 -/* A17F80 80241D60 10400005 */ beqz $v0, .L80241D78 -/* A17F84 80241D64 24020003 */ addiu $v0, $zero, 3 -/* A17F88 80241D68 A622008E */ sh $v0, 0x8e($s1) -/* A17F8C 80241D6C 2402000D */ addiu $v0, $zero, 0xd -/* A17F90 80241D70 08090772 */ j .L80241DC8 -/* A17F94 80241D74 AE620070 */ sw $v0, 0x70($s3) -.L80241D78: -/* A17F98 80241D78 24030001 */ addiu $v1, $zero, 1 -/* A17F9C 80241D7C 2402000E */ addiu $v0, $zero, 0xe -/* A17FA0 80241D80 A623008E */ sh $v1, 0x8e($s1) -/* A17FA4 80241D84 AE620070 */ sw $v0, 0x70($s3) -/* A17FA8 80241D88 C6200038 */ lwc1 $f0, 0x38($s1) -/* A17FAC 80241D8C 4600018D */ trunc.w.s $f6, $f0 -/* A17FB0 80241D90 44023000 */ mfc1 $v0, $f6 -/* A17FB4 80241D94 00000000 */ nop -/* A17FB8 80241D98 A6420010 */ sh $v0, 0x10($s2) -/* A17FBC 80241D9C C620003C */ lwc1 $f0, 0x3c($s1) -/* A17FC0 80241DA0 4600018D */ trunc.w.s $f6, $f0 -/* A17FC4 80241DA4 44023000 */ mfc1 $v0, $f6 -/* A17FC8 80241DA8 00000000 */ nop -/* A17FCC 80241DAC A6420012 */ sh $v0, 0x12($s2) -/* A17FD0 80241DB0 C6200040 */ lwc1 $f0, 0x40($s1) -/* A17FD4 80241DB4 A2430007 */ sb $v1, 7($s2) -/* A17FD8 80241DB8 4600018D */ trunc.w.s $f6, $f0 -/* A17FDC 80241DBC 44023000 */ mfc1 $v0, $f6 -/* A17FE0 80241DC0 00000000 */ nop -/* A17FE4 80241DC4 A6420014 */ sh $v0, 0x14($s2) -.L80241DC8: -/* A17FE8 80241DC8 8FBF0020 */ lw $ra, 0x20($sp) -/* A17FEC 80241DCC 8FB3001C */ lw $s3, 0x1c($sp) -/* A17FF0 80241DD0 8FB20018 */ lw $s2, 0x18($sp) -/* A17FF4 80241DD4 8FB10014 */ lw $s1, 0x14($sp) -/* A17FF8 80241DD8 8FB00010 */ lw $s0, 0x10($sp) -/* A17FFC 80241DDC 03E00008 */ jr $ra -/* A18000 80241DE0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s new file mode 100644 index 0000000000..054b0499bd --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241CB0_A17ED0.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CB0_A17ED0 +/* A17ED0 80241CB0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A17ED4 80241CB4 AFB3001C */ sw $s3, 0x1c($sp) +/* A17ED8 80241CB8 0080982D */ daddu $s3, $a0, $zero +/* A17EDC 80241CBC AFBF0020 */ sw $ra, 0x20($sp) +/* A17EE0 80241CC0 AFB20018 */ sw $s2, 0x18($sp) +/* A17EE4 80241CC4 AFB10014 */ sw $s1, 0x14($sp) +/* A17EE8 80241CC8 AFB00010 */ sw $s0, 0x10($sp) +/* A17EEC 80241CCC 8E720148 */ lw $s2, 0x148($s3) +/* A17EF0 80241CD0 86440008 */ lh $a0, 8($s2) +/* A17EF4 80241CD4 0C00EABB */ jal get_npc_unsafe +/* A17EF8 80241CD8 00A0802D */ daddu $s0, $a1, $zero +/* A17EFC 80241CDC 0040882D */ daddu $s1, $v0, $zero +/* A17F00 80241CE0 C6420080 */ lwc1 $f2, 0x80($s2) +/* A17F04 80241CE4 468010A0 */ cvt.s.w $f2, $f2 +/* A17F08 80241CE8 460010A1 */ cvt.d.s $f2, $f2 +/* A17F0C 80241CEC C6400084 */ lwc1 $f0, 0x84($s2) +/* A17F10 80241CF0 46800020 */ cvt.s.w $f0, $f0 +/* A17F14 80241CF4 46000021 */ cvt.d.s $f0, $f0 +/* A17F18 80241CF8 3C014059 */ lui $at, 0x4059 +/* A17F1C 80241CFC 44812800 */ mtc1 $at, $f5 +/* A17F20 80241D00 44802000 */ mtc1 $zero, $f4 +/* A17F24 80241D04 8E4200CC */ lw $v0, 0xcc($s2) +/* A17F28 80241D08 C62C0038 */ lwc1 $f12, 0x38($s1) +/* A17F2C 80241D0C C62E0040 */ lwc1 $f14, 0x40($s1) +/* A17F30 80241D10 46241083 */ div.d $f2, $f2, $f4 +/* A17F34 80241D14 462010A0 */ cvt.s.d $f2, $f2 +/* A17F38 80241D18 46240003 */ div.d $f0, $f0, $f4 +/* A17F3C 80241D1C 8C420020 */ lw $v0, 0x20($v0) +/* A17F40 80241D20 46200020 */ cvt.s.d $f0, $f0 +/* A17F44 80241D24 E622001C */ swc1 $f2, 0x1c($s1) +/* A17F48 80241D28 E6200014 */ swc1 $f0, 0x14($s1) +/* A17F4C 80241D2C AE220028 */ sw $v0, 0x28($s1) +/* A17F50 80241D30 C6000018 */ lwc1 $f0, 0x18($s0) +/* A17F54 80241D34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A17F58 80241D38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A17F5C 80241D3C E6200018 */ swc1 $f0, 0x18($s1) +/* A17F60 80241D40 8C460028 */ lw $a2, 0x28($v0) +/* A17F64 80241D44 0C00A720 */ jal atan2 +/* A17F68 80241D48 8C470030 */ lw $a3, 0x30($v0) +/* A17F6C 80241D4C E620000C */ swc1 $f0, 0xc($s1) +/* A17F70 80241D50 8E420018 */ lw $v0, 0x18($s2) +/* A17F74 80241D54 AE400074 */ sw $zero, 0x74($s2) +/* A17F78 80241D58 9442002A */ lhu $v0, 0x2a($v0) +/* A17F7C 80241D5C 30420002 */ andi $v0, $v0, 2 +/* A17F80 80241D60 10400005 */ beqz $v0, .L80241D78 +/* A17F84 80241D64 24020003 */ addiu $v0, $zero, 3 +/* A17F88 80241D68 A622008E */ sh $v0, 0x8e($s1) +/* A17F8C 80241D6C 2402000D */ addiu $v0, $zero, 0xd +/* A17F90 80241D70 08090772 */ j .L80241DC8 +/* A17F94 80241D74 AE620070 */ sw $v0, 0x70($s3) +.L80241D78: +/* A17F98 80241D78 24030001 */ addiu $v1, $zero, 1 +/* A17F9C 80241D7C 2402000E */ addiu $v0, $zero, 0xe +/* A17FA0 80241D80 A623008E */ sh $v1, 0x8e($s1) +/* A17FA4 80241D84 AE620070 */ sw $v0, 0x70($s3) +/* A17FA8 80241D88 C6200038 */ lwc1 $f0, 0x38($s1) +/* A17FAC 80241D8C 4600018D */ trunc.w.s $f6, $f0 +/* A17FB0 80241D90 44023000 */ mfc1 $v0, $f6 +/* A17FB4 80241D94 00000000 */ nop +/* A17FB8 80241D98 A6420010 */ sh $v0, 0x10($s2) +/* A17FBC 80241D9C C620003C */ lwc1 $f0, 0x3c($s1) +/* A17FC0 80241DA0 4600018D */ trunc.w.s $f6, $f0 +/* A17FC4 80241DA4 44023000 */ mfc1 $v0, $f6 +/* A17FC8 80241DA8 00000000 */ nop +/* A17FCC 80241DAC A6420012 */ sh $v0, 0x12($s2) +/* A17FD0 80241DB0 C6200040 */ lwc1 $f0, 0x40($s1) +/* A17FD4 80241DB4 A2430007 */ sb $v1, 7($s2) +/* A17FD8 80241DB8 4600018D */ trunc.w.s $f6, $f0 +/* A17FDC 80241DBC 44023000 */ mfc1 $v0, $f6 +/* A17FE0 80241DC0 00000000 */ nop +/* A17FE4 80241DC4 A6420014 */ sh $v0, 0x14($s2) +.L80241DC8: +/* A17FE8 80241DC8 8FBF0020 */ lw $ra, 0x20($sp) +/* A17FEC 80241DCC 8FB3001C */ lw $s3, 0x1c($sp) +/* A17FF0 80241DD0 8FB20018 */ lw $s2, 0x18($sp) +/* A17FF4 80241DD4 8FB10014 */ lw $s1, 0x14($sp) +/* A17FF8 80241DD8 8FB00010 */ lw $s0, 0x10($sp) +/* A17FFC 80241DDC 03E00008 */ jr $ra +/* A18000 80241DE0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4.s deleted file mode 100644 index 073d0008da..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DE4 -/* A18004 80241DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A18008 80241DE8 AFB00010 */ sw $s0, 0x10($sp) -/* A1800C 80241DEC 0080802D */ daddu $s0, $a0, $zero -/* A18010 80241DF0 AFBF0014 */ sw $ra, 0x14($sp) -/* A18014 80241DF4 8E020148 */ lw $v0, 0x148($s0) -/* A18018 80241DF8 0C00EABB */ jal get_npc_unsafe -/* A1801C 80241DFC 84440008 */ lh $a0, 8($v0) -/* A18020 80241E00 0040202D */ daddu $a0, $v0, $zero -/* A18024 80241E04 8482008E */ lh $v0, 0x8e($a0) -/* A18028 80241E08 9483008E */ lhu $v1, 0x8e($a0) -/* A1802C 80241E0C 18400005 */ blez $v0, .L80241E24 -/* A18030 80241E10 2462FFFF */ addiu $v0, $v1, -1 -/* A18034 80241E14 A482008E */ sh $v0, 0x8e($a0) -/* A18038 80241E18 00021400 */ sll $v0, $v0, 0x10 -/* A1803C 80241E1C 1C400006 */ bgtz $v0, .L80241E38 -/* A18040 80241E20 00000000 */ nop -.L80241E24: -/* A18044 80241E24 8482008C */ lh $v0, 0x8c($a0) -/* A18048 80241E28 14400003 */ bnez $v0, .L80241E38 -/* A1804C 80241E2C 2402000E */ addiu $v0, $zero, 0xe -/* A18050 80241E30 A480008E */ sh $zero, 0x8e($a0) -/* A18054 80241E34 AE020070 */ sw $v0, 0x70($s0) -.L80241E38: -/* A18058 80241E38 8FBF0014 */ lw $ra, 0x14($sp) -/* A1805C 80241E3C 8FB00010 */ lw $s0, 0x10($sp) -/* A18060 80241E40 03E00008 */ jr $ra -/* A18064 80241E44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s new file mode 100644 index 0000000000..e3dc839dec --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241DE4_A18004.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DE4_A18004 +/* A18004 80241DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A18008 80241DE8 AFB00010 */ sw $s0, 0x10($sp) +/* A1800C 80241DEC 0080802D */ daddu $s0, $a0, $zero +/* A18010 80241DF0 AFBF0014 */ sw $ra, 0x14($sp) +/* A18014 80241DF4 8E020148 */ lw $v0, 0x148($s0) +/* A18018 80241DF8 0C00EABB */ jal get_npc_unsafe +/* A1801C 80241DFC 84440008 */ lh $a0, 8($v0) +/* A18020 80241E00 0040202D */ daddu $a0, $v0, $zero +/* A18024 80241E04 8482008E */ lh $v0, 0x8e($a0) +/* A18028 80241E08 9483008E */ lhu $v1, 0x8e($a0) +/* A1802C 80241E0C 18400005 */ blez $v0, .L80241E24 +/* A18030 80241E10 2462FFFF */ addiu $v0, $v1, -1 +/* A18034 80241E14 A482008E */ sh $v0, 0x8e($a0) +/* A18038 80241E18 00021400 */ sll $v0, $v0, 0x10 +/* A1803C 80241E1C 1C400006 */ bgtz $v0, .L80241E38 +/* A18040 80241E20 00000000 */ nop +.L80241E24: +/* A18044 80241E24 8482008C */ lh $v0, 0x8c($a0) +/* A18048 80241E28 14400003 */ bnez $v0, .L80241E38 +/* A1804C 80241E2C 2402000E */ addiu $v0, $zero, 0xe +/* A18050 80241E30 A480008E */ sh $zero, 0x8e($a0) +/* A18054 80241E34 AE020070 */ sw $v0, 0x70($s0) +.L80241E38: +/* A18058 80241E38 8FBF0014 */ lw $ra, 0x14($sp) +/* A1805C 80241E3C 8FB00010 */ lw $s0, 0x10($sp) +/* A18060 80241E40 03E00008 */ jr $ra +/* A18064 80241E44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48.s deleted file mode 100644 index 0402ea3bef..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E48 -/* A18068 80241E48 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A1806C 80241E4C AFB20030 */ sw $s2, 0x30($sp) -/* A18070 80241E50 0080902D */ daddu $s2, $a0, $zero -/* A18074 80241E54 AFBF0038 */ sw $ra, 0x38($sp) -/* A18078 80241E58 AFB30034 */ sw $s3, 0x34($sp) -/* A1807C 80241E5C AFB1002C */ sw $s1, 0x2c($sp) -/* A18080 80241E60 AFB00028 */ sw $s0, 0x28($sp) -/* A18084 80241E64 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A18088 80241E68 F7B40040 */ sdc1 $f20, 0x40($sp) -/* A1808C 80241E6C 8E510148 */ lw $s1, 0x148($s2) -/* A18090 80241E70 86240008 */ lh $a0, 8($s1) -/* A18094 80241E74 0C00EABB */ jal get_npc_unsafe -/* A18098 80241E78 00A0982D */ daddu $s3, $a1, $zero -/* A1809C 80241E7C 0040802D */ daddu $s0, $v0, $zero -/* A180A0 80241E80 0200202D */ daddu $a0, $s0, $zero -/* A180A4 80241E84 C6220088 */ lwc1 $f2, 0x88($s1) -/* A180A8 80241E88 468010A0 */ cvt.s.w $f2, $f2 -/* A180AC 80241E8C 460010A1 */ cvt.d.s $f2, $f2 -/* A180B0 80241E90 C604001C */ lwc1 $f4, 0x1c($s0) -/* A180B4 80241E94 C6000014 */ lwc1 $f0, 0x14($s0) -/* A180B8 80241E98 8E050018 */ lw $a1, 0x18($s0) -/* A180BC 80241E9C 46002100 */ add.s $f4, $f4, $f0 -/* A180C0 80241EA0 8E06000C */ lw $a2, 0xc($s0) -/* A180C4 80241EA4 C6200078 */ lwc1 $f0, 0x78($s1) -/* A180C8 80241EA8 46800020 */ cvt.s.w $f0, $f0 -/* A180CC 80241EAC E604001C */ swc1 $f4, 0x1c($s0) -/* A180D0 80241EB0 3C014059 */ lui $at, 0x4059 -/* A180D4 80241EB4 44812800 */ mtc1 $at, $f5 -/* A180D8 80241EB8 44802000 */ mtc1 $zero, $f4 -/* A180DC 80241EBC 46000021 */ cvt.d.s $f0, $f0 -/* A180E0 80241EC0 46240003 */ div.d $f0, $f0, $f4 -/* A180E4 80241EC4 46200520 */ cvt.s.d $f20, $f0 -/* A180E8 80241EC8 46241083 */ div.d $f2, $f2, $f4 -/* A180EC 80241ECC 0C00EA95 */ jal npc_move_heading -/* A180F0 80241ED0 462015A0 */ cvt.s.d $f22, $f2 -/* A180F4 80241ED4 C604001C */ lwc1 $f4, 0x1c($s0) -/* A180F8 80241ED8 44801000 */ mtc1 $zero, $f2 -/* A180FC 80241EDC 44801800 */ mtc1 $zero, $f3 -/* A18100 80241EE0 46002021 */ cvt.d.s $f0, $f4 -/* A18104 80241EE4 4620103E */ c.le.d $f2, $f0 -/* A18108 80241EE8 00000000 */ nop -/* A1810C 80241EEC 45000030 */ bc1f .L80241FB0 -/* A18110 80241EF0 00000000 */ nop -/* A18114 80241EF4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A18118 80241EF8 46040000 */ add.s $f0, $f0, $f4 -/* A1811C 80241EFC E600003C */ swc1 $f0, 0x3c($s0) -/* A18120 80241F00 8E2200CC */ lw $v0, 0xcc($s1) -/* A18124 80241F04 8C420024 */ lw $v0, 0x24($v0) -/* A18128 80241F08 AE020028 */ sw $v0, 0x28($s0) -/* A1812C 80241F0C A2200007 */ sb $zero, 7($s1) -/* A18130 80241F10 8E020000 */ lw $v0, ($s0) -/* A18134 80241F14 30420008 */ andi $v0, $v0, 8 -/* A18138 80241F18 14400011 */ bnez $v0, .L80241F60 -/* A1813C 80241F1C 0000102D */ daddu $v0, $zero, $zero -/* A18140 80241F20 27A50018 */ addiu $a1, $sp, 0x18 -/* A18144 80241F24 27A6001C */ addiu $a2, $sp, 0x1c -/* A18148 80241F28 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1814C 80241F2C C602003C */ lwc1 $f2, 0x3c($s0) -/* A18150 80241F30 C6040040 */ lwc1 $f4, 0x40($s0) -/* A18154 80241F34 3C01447A */ lui $at, 0x447a -/* A18158 80241F38 44813000 */ mtc1 $at, $f6 -/* A1815C 80241F3C 27A20024 */ addiu $v0, $sp, 0x24 -/* A18160 80241F40 E7A00018 */ swc1 $f0, 0x18($sp) -/* A18164 80241F44 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A18168 80241F48 E7A40020 */ swc1 $f4, 0x20($sp) -/* A1816C 80241F4C E7A60024 */ swc1 $f6, 0x24($sp) -/* A18170 80241F50 AFA20010 */ sw $v0, 0x10($sp) -/* A18174 80241F54 8E040080 */ lw $a0, 0x80($s0) -/* A18178 80241F58 0C0372DF */ jal func_800DCB7C -/* A1817C 80241F5C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241F60: -/* A18180 80241F60 1040000B */ beqz $v0, .L80241F90 -/* A18184 80241F64 00000000 */ nop -/* A18188 80241F68 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A1818C 80241F6C 46140080 */ add.s $f2, $f0, $f20 -/* A18190 80241F70 C600003C */ lwc1 $f0, 0x3c($s0) -/* A18194 80241F74 4600103E */ c.le.s $f2, $f0 -/* A18198 80241F78 00000000 */ nop -/* A1819C 80241F7C 4500008D */ bc1f .L802421B4 -/* A181A0 80241F80 00000000 */ nop -/* A181A4 80241F84 E602003C */ swc1 $f2, 0x3c($s0) -/* A181A8 80241F88 0809086D */ j .L802421B4 -/* A181AC 80241F8C AE400070 */ sw $zero, 0x70($s2) -.L80241F90: -/* A181B0 80241F90 C602003C */ lwc1 $f2, 0x3c($s0) -/* A181B4 80241F94 C6000064 */ lwc1 $f0, 0x64($s0) -/* A181B8 80241F98 4602003E */ c.le.s $f0, $f2 -/* A181BC 80241F9C 00000000 */ nop -/* A181C0 80241FA0 45030084 */ bc1tl .L802421B4 -/* A181C4 80241FA4 AE400070 */ sw $zero, 0x70($s2) -/* A181C8 80241FA8 0809086D */ j .L802421B4 -/* A181CC 80241FAC 00000000 */ nop -.L80241FB0: -/* A181D0 80241FB0 4622003C */ c.lt.d $f0, $f2 -/* A181D4 80241FB4 00000000 */ nop -/* A181D8 80241FB8 4500007E */ bc1f .L802421B4 -/* A181DC 80241FBC 00000000 */ nop -/* A181E0 80241FC0 9602008E */ lhu $v0, 0x8e($s0) -/* A181E4 80241FC4 24420001 */ addiu $v0, $v0, 1 -/* A181E8 80241FC8 A602008E */ sh $v0, 0x8e($s0) -/* A181EC 80241FCC 00021400 */ sll $v0, $v0, 0x10 -/* A181F0 80241FD0 8E630020 */ lw $v1, 0x20($s3) -/* A181F4 80241FD4 00021403 */ sra $v0, $v0, 0x10 -/* A181F8 80241FD8 0043102A */ slt $v0, $v0, $v1 -/* A181FC 80241FDC 14400026 */ bnez $v0, .L80242078 -/* A18200 80241FE0 00000000 */ nop -/* A18204 80241FE4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A18208 80241FE8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1820C 80241FEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A18210 80241FF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A18214 80241FF4 A600008E */ sh $zero, 0x8e($s0) -/* A18218 80241FF8 8C460028 */ lw $a2, 0x28($v0) -/* A1821C 80241FFC 0C00A720 */ jal atan2 -/* A18220 80242000 8C470030 */ lw $a3, 0x30($v0) -/* A18224 80242004 46000506 */ mov.s $f20, $f0 -/* A18228 80242008 C60C000C */ lwc1 $f12, 0xc($s0) -/* A1822C 8024200C 0C00A70A */ jal get_clamped_angle_diff -/* A18230 80242010 4600A386 */ mov.s $f14, $f20 -/* A18234 80242014 46000086 */ mov.s $f2, $f0 -/* A18238 80242018 8E62001C */ lw $v0, 0x1c($s3) -/* A1823C 8024201C 46001005 */ abs.s $f0, $f2 -/* A18240 80242020 44822000 */ mtc1 $v0, $f4 -/* A18244 80242024 00000000 */ nop -/* A18248 80242028 46802120 */ cvt.s.w $f4, $f4 -/* A1824C 8024202C 4600203C */ c.lt.s $f4, $f0 -/* A18250 80242030 00000000 */ nop -/* A18254 80242034 4500000D */ bc1f .L8024206C -/* A18258 80242038 00000000 */ nop -/* A1825C 8024203C 44800000 */ mtc1 $zero, $f0 -/* A18260 80242040 C614000C */ lwc1 $f20, 0xc($s0) -/* A18264 80242044 4600103C */ c.lt.s $f2, $f0 -/* A18268 80242048 00000000 */ nop -/* A1826C 8024204C 45000006 */ bc1f .L80242068 -/* A18270 80242050 00021023 */ negu $v0, $v0 -/* A18274 80242054 44820000 */ mtc1 $v0, $f0 -/* A18278 80242058 00000000 */ nop -/* A1827C 8024205C 46800020 */ cvt.s.w $f0, $f0 -/* A18280 80242060 0809081B */ j .L8024206C -/* A18284 80242064 4600A500 */ add.s $f20, $f20, $f0 -.L80242068: -/* A18288 80242068 4604A500 */ add.s $f20, $f20, $f4 -.L8024206C: -/* A1828C 8024206C 0C00A6C9 */ jal clamp_angle -/* A18290 80242070 4600A306 */ mov.s $f12, $f20 -/* A18294 80242074 E600000C */ swc1 $f0, 0xc($s0) -.L80242078: -/* A18298 80242078 8E020000 */ lw $v0, ($s0) -/* A1829C 8024207C 30420008 */ andi $v0, $v0, 8 -/* A182A0 80242080 1040000A */ beqz $v0, .L802420AC -/* A182A4 80242084 27A50018 */ addiu $a1, $sp, 0x18 -/* A182A8 80242088 C602003C */ lwc1 $f2, 0x3c($s0) -/* A182AC 8024208C C600001C */ lwc1 $f0, 0x1c($s0) -/* A182B0 80242090 46001080 */ add.s $f2, $f2, $f0 -/* A182B4 80242094 4616103C */ c.lt.s $f2, $f22 -/* A182B8 80242098 00000000 */ nop -/* A182BC 8024209C 45020045 */ bc1fl .L802421B4 -/* A182C0 802420A0 E602003C */ swc1 $f2, 0x3c($s0) -/* A182C4 802420A4 0809086C */ j .L802421B0 -/* A182C8 802420A8 E616003C */ swc1 $f22, 0x3c($s0) -.L802420AC: -/* A182CC 802420AC C6000038 */ lwc1 $f0, 0x38($s0) -/* A182D0 802420B0 27A6001C */ addiu $a2, $sp, 0x1c -/* A182D4 802420B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A182D8 802420B8 860200A8 */ lh $v0, 0xa8($s0) -/* A182DC 802420BC C600001C */ lwc1 $f0, 0x1c($s0) -/* A182E0 802420C0 C604003C */ lwc1 $f4, 0x3c($s0) -/* A182E4 802420C4 44821000 */ mtc1 $v0, $f2 -/* A182E8 802420C8 00000000 */ nop -/* A182EC 802420CC 468010A0 */ cvt.s.w $f2, $f2 -/* A182F0 802420D0 46000005 */ abs.s $f0, $f0 -/* A182F4 802420D4 46020000 */ add.s $f0, $f0, $f2 -/* A182F8 802420D8 C6060040 */ lwc1 $f6, 0x40($s0) -/* A182FC 802420DC 27A20024 */ addiu $v0, $sp, 0x24 -/* A18300 802420E0 46022100 */ add.s $f4, $f4, $f2 -/* A18304 802420E4 3C014024 */ lui $at, 0x4024 -/* A18308 802420E8 44811800 */ mtc1 $at, $f3 -/* A1830C 802420EC 44801000 */ mtc1 $zero, $f2 -/* A18310 802420F0 46000021 */ cvt.d.s $f0, $f0 -/* A18314 802420F4 46220000 */ add.d $f0, $f0, $f2 -/* A18318 802420F8 E7A60020 */ swc1 $f6, 0x20($sp) -/* A1831C 802420FC E7A4001C */ swc1 $f4, 0x1c($sp) -/* A18320 80242100 46200020 */ cvt.s.d $f0, $f0 -/* A18324 80242104 E7A00024 */ swc1 $f0, 0x24($sp) -/* A18328 80242108 AFA20010 */ sw $v0, 0x10($sp) -/* A1832C 8024210C 8E040080 */ lw $a0, 0x80($s0) -/* A18330 80242110 0C0372DF */ jal func_800DCB7C -/* A18334 80242114 27A70020 */ addiu $a3, $sp, 0x20 -/* A18338 80242118 10400015 */ beqz $v0, .L80242170 -/* A1833C 8024211C 00000000 */ nop -/* A18340 80242120 860200A8 */ lh $v0, 0xa8($s0) -/* A18344 80242124 C604001C */ lwc1 $f4, 0x1c($s0) -/* A18348 80242128 44820000 */ mtc1 $v0, $f0 -/* A1834C 8024212C 00000000 */ nop -/* A18350 80242130 46800020 */ cvt.s.w $f0, $f0 -/* A18354 80242134 46002085 */ abs.s $f2, $f4 -/* A18358 80242138 46020000 */ add.s $f0, $f0, $f2 -/* A1835C 8024213C C7A20024 */ lwc1 $f2, 0x24($sp) -/* A18360 80242140 4600103E */ c.le.s $f2, $f0 -/* A18364 80242144 00000000 */ nop -/* A18368 80242148 45000005 */ bc1f .L80242160 -/* A1836C 8024214C 00000000 */ nop -/* A18370 80242150 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A18374 80242154 AE00001C */ sw $zero, 0x1c($s0) -/* A18378 80242158 0809086D */ j .L802421B4 -/* A1837C 8024215C E600003C */ swc1 $f0, 0x3c($s0) -.L80242160: -/* A18380 80242160 C600003C */ lwc1 $f0, 0x3c($s0) -/* A18384 80242164 46040000 */ add.s $f0, $f0, $f4 -/* A18388 80242168 0809086D */ j .L802421B4 -/* A1838C 8024216C E600003C */ swc1 $f0, 0x3c($s0) -.L80242170: -/* A18390 80242170 C606003C */ lwc1 $f6, 0x3c($s0) -/* A18394 80242174 860200A8 */ lh $v0, 0xa8($s0) -/* A18398 80242178 46163081 */ sub.s $f2, $f6, $f22 -/* A1839C 8024217C 44820000 */ mtc1 $v0, $f0 -/* A183A0 80242180 00000000 */ nop -/* A183A4 80242184 46800020 */ cvt.s.w $f0, $f0 -/* A183A8 80242188 46001080 */ add.s $f2, $f2, $f0 -/* A183AC 8024218C C604001C */ lwc1 $f4, 0x1c($s0) -/* A183B0 80242190 46002005 */ abs.s $f0, $f4 -/* A183B4 80242194 4602003C */ c.lt.s $f0, $f2 -/* A183B8 80242198 00000000 */ nop -/* A183BC 8024219C 45020005 */ bc1fl .L802421B4 -/* A183C0 802421A0 AE00001C */ sw $zero, 0x1c($s0) -/* A183C4 802421A4 46043000 */ add.s $f0, $f6, $f4 -/* A183C8 802421A8 0809086D */ j .L802421B4 -/* A183CC 802421AC E600003C */ swc1 $f0, 0x3c($s0) -.L802421B0: -/* A183D0 802421B0 AE00001C */ sw $zero, 0x1c($s0) -.L802421B4: -/* A183D4 802421B4 8FBF0038 */ lw $ra, 0x38($sp) -/* A183D8 802421B8 8FB30034 */ lw $s3, 0x34($sp) -/* A183DC 802421BC 8FB20030 */ lw $s2, 0x30($sp) -/* A183E0 802421C0 8FB1002C */ lw $s1, 0x2c($sp) -/* A183E4 802421C4 8FB00028 */ lw $s0, 0x28($sp) -/* A183E8 802421C8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A183EC 802421CC D7B40040 */ ldc1 $f20, 0x40($sp) -/* A183F0 802421D0 03E00008 */ jr $ra -/* A183F4 802421D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s new file mode 100644 index 0000000000..97e801a5d1 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80241E48_A18068.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E48_A18068 +/* A18068 80241E48 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A1806C 80241E4C AFB20030 */ sw $s2, 0x30($sp) +/* A18070 80241E50 0080902D */ daddu $s2, $a0, $zero +/* A18074 80241E54 AFBF0038 */ sw $ra, 0x38($sp) +/* A18078 80241E58 AFB30034 */ sw $s3, 0x34($sp) +/* A1807C 80241E5C AFB1002C */ sw $s1, 0x2c($sp) +/* A18080 80241E60 AFB00028 */ sw $s0, 0x28($sp) +/* A18084 80241E64 F7B60048 */ sdc1 $f22, 0x48($sp) +/* A18088 80241E68 F7B40040 */ sdc1 $f20, 0x40($sp) +/* A1808C 80241E6C 8E510148 */ lw $s1, 0x148($s2) +/* A18090 80241E70 86240008 */ lh $a0, 8($s1) +/* A18094 80241E74 0C00EABB */ jal get_npc_unsafe +/* A18098 80241E78 00A0982D */ daddu $s3, $a1, $zero +/* A1809C 80241E7C 0040802D */ daddu $s0, $v0, $zero +/* A180A0 80241E80 0200202D */ daddu $a0, $s0, $zero +/* A180A4 80241E84 C6220088 */ lwc1 $f2, 0x88($s1) +/* A180A8 80241E88 468010A0 */ cvt.s.w $f2, $f2 +/* A180AC 80241E8C 460010A1 */ cvt.d.s $f2, $f2 +/* A180B0 80241E90 C604001C */ lwc1 $f4, 0x1c($s0) +/* A180B4 80241E94 C6000014 */ lwc1 $f0, 0x14($s0) +/* A180B8 80241E98 8E050018 */ lw $a1, 0x18($s0) +/* A180BC 80241E9C 46002100 */ add.s $f4, $f4, $f0 +/* A180C0 80241EA0 8E06000C */ lw $a2, 0xc($s0) +/* A180C4 80241EA4 C6200078 */ lwc1 $f0, 0x78($s1) +/* A180C8 80241EA8 46800020 */ cvt.s.w $f0, $f0 +/* A180CC 80241EAC E604001C */ swc1 $f4, 0x1c($s0) +/* A180D0 80241EB0 3C014059 */ lui $at, 0x4059 +/* A180D4 80241EB4 44812800 */ mtc1 $at, $f5 +/* A180D8 80241EB8 44802000 */ mtc1 $zero, $f4 +/* A180DC 80241EBC 46000021 */ cvt.d.s $f0, $f0 +/* A180E0 80241EC0 46240003 */ div.d $f0, $f0, $f4 +/* A180E4 80241EC4 46200520 */ cvt.s.d $f20, $f0 +/* A180E8 80241EC8 46241083 */ div.d $f2, $f2, $f4 +/* A180EC 80241ECC 0C00EA95 */ jal npc_move_heading +/* A180F0 80241ED0 462015A0 */ cvt.s.d $f22, $f2 +/* A180F4 80241ED4 C604001C */ lwc1 $f4, 0x1c($s0) +/* A180F8 80241ED8 44801000 */ mtc1 $zero, $f2 +/* A180FC 80241EDC 44801800 */ mtc1 $zero, $f3 +/* A18100 80241EE0 46002021 */ cvt.d.s $f0, $f4 +/* A18104 80241EE4 4620103E */ c.le.d $f2, $f0 +/* A18108 80241EE8 00000000 */ nop +/* A1810C 80241EEC 45000030 */ bc1f .L80241FB0 +/* A18110 80241EF0 00000000 */ nop +/* A18114 80241EF4 C600003C */ lwc1 $f0, 0x3c($s0) +/* A18118 80241EF8 46040000 */ add.s $f0, $f0, $f4 +/* A1811C 80241EFC E600003C */ swc1 $f0, 0x3c($s0) +/* A18120 80241F00 8E2200CC */ lw $v0, 0xcc($s1) +/* A18124 80241F04 8C420024 */ lw $v0, 0x24($v0) +/* A18128 80241F08 AE020028 */ sw $v0, 0x28($s0) +/* A1812C 80241F0C A2200007 */ sb $zero, 7($s1) +/* A18130 80241F10 8E020000 */ lw $v0, ($s0) +/* A18134 80241F14 30420008 */ andi $v0, $v0, 8 +/* A18138 80241F18 14400011 */ bnez $v0, .L80241F60 +/* A1813C 80241F1C 0000102D */ daddu $v0, $zero, $zero +/* A18140 80241F20 27A50018 */ addiu $a1, $sp, 0x18 +/* A18144 80241F24 27A6001C */ addiu $a2, $sp, 0x1c +/* A18148 80241F28 C6000038 */ lwc1 $f0, 0x38($s0) +/* A1814C 80241F2C C602003C */ lwc1 $f2, 0x3c($s0) +/* A18150 80241F30 C6040040 */ lwc1 $f4, 0x40($s0) +/* A18154 80241F34 3C01447A */ lui $at, 0x447a +/* A18158 80241F38 44813000 */ mtc1 $at, $f6 +/* A1815C 80241F3C 27A20024 */ addiu $v0, $sp, 0x24 +/* A18160 80241F40 E7A00018 */ swc1 $f0, 0x18($sp) +/* A18164 80241F44 E7A2001C */ swc1 $f2, 0x1c($sp) +/* A18168 80241F48 E7A40020 */ swc1 $f4, 0x20($sp) +/* A1816C 80241F4C E7A60024 */ swc1 $f6, 0x24($sp) +/* A18170 80241F50 AFA20010 */ sw $v0, 0x10($sp) +/* A18174 80241F54 8E040080 */ lw $a0, 0x80($s0) +/* A18178 80241F58 0C0372DF */ jal func_800DCB7C +/* A1817C 80241F5C 27A70020 */ addiu $a3, $sp, 0x20 +.L80241F60: +/* A18180 80241F60 1040000B */ beqz $v0, .L80241F90 +/* A18184 80241F64 00000000 */ nop +/* A18188 80241F68 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A1818C 80241F6C 46140080 */ add.s $f2, $f0, $f20 +/* A18190 80241F70 C600003C */ lwc1 $f0, 0x3c($s0) +/* A18194 80241F74 4600103E */ c.le.s $f2, $f0 +/* A18198 80241F78 00000000 */ nop +/* A1819C 80241F7C 4500008D */ bc1f .L802421B4 +/* A181A0 80241F80 00000000 */ nop +/* A181A4 80241F84 E602003C */ swc1 $f2, 0x3c($s0) +/* A181A8 80241F88 0809086D */ j .L802421B4 +/* A181AC 80241F8C AE400070 */ sw $zero, 0x70($s2) +.L80241F90: +/* A181B0 80241F90 C602003C */ lwc1 $f2, 0x3c($s0) +/* A181B4 80241F94 C6000064 */ lwc1 $f0, 0x64($s0) +/* A181B8 80241F98 4602003E */ c.le.s $f0, $f2 +/* A181BC 80241F9C 00000000 */ nop +/* A181C0 80241FA0 45030084 */ bc1tl .L802421B4 +/* A181C4 80241FA4 AE400070 */ sw $zero, 0x70($s2) +/* A181C8 80241FA8 0809086D */ j .L802421B4 +/* A181CC 80241FAC 00000000 */ nop +.L80241FB0: +/* A181D0 80241FB0 4622003C */ c.lt.d $f0, $f2 +/* A181D4 80241FB4 00000000 */ nop +/* A181D8 80241FB8 4500007E */ bc1f .L802421B4 +/* A181DC 80241FBC 00000000 */ nop +/* A181E0 80241FC0 9602008E */ lhu $v0, 0x8e($s0) +/* A181E4 80241FC4 24420001 */ addiu $v0, $v0, 1 +/* A181E8 80241FC8 A602008E */ sh $v0, 0x8e($s0) +/* A181EC 80241FCC 00021400 */ sll $v0, $v0, 0x10 +/* A181F0 80241FD0 8E630020 */ lw $v1, 0x20($s3) +/* A181F4 80241FD4 00021403 */ sra $v0, $v0, 0x10 +/* A181F8 80241FD8 0043102A */ slt $v0, $v0, $v1 +/* A181FC 80241FDC 14400026 */ bnez $v0, .L80242078 +/* A18200 80241FE0 00000000 */ nop +/* A18204 80241FE4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A18208 80241FE8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A1820C 80241FEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A18210 80241FF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A18214 80241FF4 A600008E */ sh $zero, 0x8e($s0) +/* A18218 80241FF8 8C460028 */ lw $a2, 0x28($v0) +/* A1821C 80241FFC 0C00A720 */ jal atan2 +/* A18220 80242000 8C470030 */ lw $a3, 0x30($v0) +/* A18224 80242004 46000506 */ mov.s $f20, $f0 +/* A18228 80242008 C60C000C */ lwc1 $f12, 0xc($s0) +/* A1822C 8024200C 0C00A70A */ jal get_clamped_angle_diff +/* A18230 80242010 4600A386 */ mov.s $f14, $f20 +/* A18234 80242014 46000086 */ mov.s $f2, $f0 +/* A18238 80242018 8E62001C */ lw $v0, 0x1c($s3) +/* A1823C 8024201C 46001005 */ abs.s $f0, $f2 +/* A18240 80242020 44822000 */ mtc1 $v0, $f4 +/* A18244 80242024 00000000 */ nop +/* A18248 80242028 46802120 */ cvt.s.w $f4, $f4 +/* A1824C 8024202C 4600203C */ c.lt.s $f4, $f0 +/* A18250 80242030 00000000 */ nop +/* A18254 80242034 4500000D */ bc1f .L8024206C +/* A18258 80242038 00000000 */ nop +/* A1825C 8024203C 44800000 */ mtc1 $zero, $f0 +/* A18260 80242040 C614000C */ lwc1 $f20, 0xc($s0) +/* A18264 80242044 4600103C */ c.lt.s $f2, $f0 +/* A18268 80242048 00000000 */ nop +/* A1826C 8024204C 45000006 */ bc1f .L80242068 +/* A18270 80242050 00021023 */ negu $v0, $v0 +/* A18274 80242054 44820000 */ mtc1 $v0, $f0 +/* A18278 80242058 00000000 */ nop +/* A1827C 8024205C 46800020 */ cvt.s.w $f0, $f0 +/* A18280 80242060 0809081B */ j .L8024206C +/* A18284 80242064 4600A500 */ add.s $f20, $f20, $f0 +.L80242068: +/* A18288 80242068 4604A500 */ add.s $f20, $f20, $f4 +.L8024206C: +/* A1828C 8024206C 0C00A6C9 */ jal clamp_angle +/* A18290 80242070 4600A306 */ mov.s $f12, $f20 +/* A18294 80242074 E600000C */ swc1 $f0, 0xc($s0) +.L80242078: +/* A18298 80242078 8E020000 */ lw $v0, ($s0) +/* A1829C 8024207C 30420008 */ andi $v0, $v0, 8 +/* A182A0 80242080 1040000A */ beqz $v0, .L802420AC +/* A182A4 80242084 27A50018 */ addiu $a1, $sp, 0x18 +/* A182A8 80242088 C602003C */ lwc1 $f2, 0x3c($s0) +/* A182AC 8024208C C600001C */ lwc1 $f0, 0x1c($s0) +/* A182B0 80242090 46001080 */ add.s $f2, $f2, $f0 +/* A182B4 80242094 4616103C */ c.lt.s $f2, $f22 +/* A182B8 80242098 00000000 */ nop +/* A182BC 8024209C 45020045 */ bc1fl .L802421B4 +/* A182C0 802420A0 E602003C */ swc1 $f2, 0x3c($s0) +/* A182C4 802420A4 0809086C */ j .L802421B0 +/* A182C8 802420A8 E616003C */ swc1 $f22, 0x3c($s0) +.L802420AC: +/* A182CC 802420AC C6000038 */ lwc1 $f0, 0x38($s0) +/* A182D0 802420B0 27A6001C */ addiu $a2, $sp, 0x1c +/* A182D4 802420B4 E7A00018 */ swc1 $f0, 0x18($sp) +/* A182D8 802420B8 860200A8 */ lh $v0, 0xa8($s0) +/* A182DC 802420BC C600001C */ lwc1 $f0, 0x1c($s0) +/* A182E0 802420C0 C604003C */ lwc1 $f4, 0x3c($s0) +/* A182E4 802420C4 44821000 */ mtc1 $v0, $f2 +/* A182E8 802420C8 00000000 */ nop +/* A182EC 802420CC 468010A0 */ cvt.s.w $f2, $f2 +/* A182F0 802420D0 46000005 */ abs.s $f0, $f0 +/* A182F4 802420D4 46020000 */ add.s $f0, $f0, $f2 +/* A182F8 802420D8 C6060040 */ lwc1 $f6, 0x40($s0) +/* A182FC 802420DC 27A20024 */ addiu $v0, $sp, 0x24 +/* A18300 802420E0 46022100 */ add.s $f4, $f4, $f2 +/* A18304 802420E4 3C014024 */ lui $at, 0x4024 +/* A18308 802420E8 44811800 */ mtc1 $at, $f3 +/* A1830C 802420EC 44801000 */ mtc1 $zero, $f2 +/* A18310 802420F0 46000021 */ cvt.d.s $f0, $f0 +/* A18314 802420F4 46220000 */ add.d $f0, $f0, $f2 +/* A18318 802420F8 E7A60020 */ swc1 $f6, 0x20($sp) +/* A1831C 802420FC E7A4001C */ swc1 $f4, 0x1c($sp) +/* A18320 80242100 46200020 */ cvt.s.d $f0, $f0 +/* A18324 80242104 E7A00024 */ swc1 $f0, 0x24($sp) +/* A18328 80242108 AFA20010 */ sw $v0, 0x10($sp) +/* A1832C 8024210C 8E040080 */ lw $a0, 0x80($s0) +/* A18330 80242110 0C0372DF */ jal func_800DCB7C +/* A18334 80242114 27A70020 */ addiu $a3, $sp, 0x20 +/* A18338 80242118 10400015 */ beqz $v0, .L80242170 +/* A1833C 8024211C 00000000 */ nop +/* A18340 80242120 860200A8 */ lh $v0, 0xa8($s0) +/* A18344 80242124 C604001C */ lwc1 $f4, 0x1c($s0) +/* A18348 80242128 44820000 */ mtc1 $v0, $f0 +/* A1834C 8024212C 00000000 */ nop +/* A18350 80242130 46800020 */ cvt.s.w $f0, $f0 +/* A18354 80242134 46002085 */ abs.s $f2, $f4 +/* A18358 80242138 46020000 */ add.s $f0, $f0, $f2 +/* A1835C 8024213C C7A20024 */ lwc1 $f2, 0x24($sp) +/* A18360 80242140 4600103E */ c.le.s $f2, $f0 +/* A18364 80242144 00000000 */ nop +/* A18368 80242148 45000005 */ bc1f .L80242160 +/* A1836C 8024214C 00000000 */ nop +/* A18370 80242150 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A18374 80242154 AE00001C */ sw $zero, 0x1c($s0) +/* A18378 80242158 0809086D */ j .L802421B4 +/* A1837C 8024215C E600003C */ swc1 $f0, 0x3c($s0) +.L80242160: +/* A18380 80242160 C600003C */ lwc1 $f0, 0x3c($s0) +/* A18384 80242164 46040000 */ add.s $f0, $f0, $f4 +/* A18388 80242168 0809086D */ j .L802421B4 +/* A1838C 8024216C E600003C */ swc1 $f0, 0x3c($s0) +.L80242170: +/* A18390 80242170 C606003C */ lwc1 $f6, 0x3c($s0) +/* A18394 80242174 860200A8 */ lh $v0, 0xa8($s0) +/* A18398 80242178 46163081 */ sub.s $f2, $f6, $f22 +/* A1839C 8024217C 44820000 */ mtc1 $v0, $f0 +/* A183A0 80242180 00000000 */ nop +/* A183A4 80242184 46800020 */ cvt.s.w $f0, $f0 +/* A183A8 80242188 46001080 */ add.s $f2, $f2, $f0 +/* A183AC 8024218C C604001C */ lwc1 $f4, 0x1c($s0) +/* A183B0 80242190 46002005 */ abs.s $f0, $f4 +/* A183B4 80242194 4602003C */ c.lt.s $f0, $f2 +/* A183B8 80242198 00000000 */ nop +/* A183BC 8024219C 45020005 */ bc1fl .L802421B4 +/* A183C0 802421A0 AE00001C */ sw $zero, 0x1c($s0) +/* A183C4 802421A4 46043000 */ add.s $f0, $f6, $f4 +/* A183C8 802421A8 0809086D */ j .L802421B4 +/* A183CC 802421AC E600003C */ swc1 $f0, 0x3c($s0) +.L802421B0: +/* A183D0 802421B0 AE00001C */ sw $zero, 0x1c($s0) +.L802421B4: +/* A183D4 802421B4 8FBF0038 */ lw $ra, 0x38($sp) +/* A183D8 802421B8 8FB30034 */ lw $s3, 0x34($sp) +/* A183DC 802421BC 8FB20030 */ lw $s2, 0x30($sp) +/* A183E0 802421C0 8FB1002C */ lw $s1, 0x2c($sp) +/* A183E4 802421C4 8FB00028 */ lw $s0, 0x28($sp) +/* A183E8 802421C8 D7B60048 */ ldc1 $f22, 0x48($sp) +/* A183EC 802421CC D7B40040 */ ldc1 $f20, 0x40($sp) +/* A183F0 802421D0 03E00008 */ jr $ra +/* A183F4 802421D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8.s deleted file mode 100644 index 10edc1e6ac..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421D8 -/* A183F8 802421D8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A183FC 802421DC AFB00028 */ sw $s0, 0x28($sp) -/* A18400 802421E0 00A0802D */ daddu $s0, $a1, $zero -/* A18404 802421E4 AFB1002C */ sw $s1, 0x2c($sp) -/* A18408 802421E8 00C0882D */ daddu $s1, $a2, $zero -/* A1840C 802421EC AFBF0034 */ sw $ra, 0x34($sp) -/* A18410 802421F0 AFB20030 */ sw $s2, 0x30($sp) -/* A18414 802421F4 AE200070 */ sw $zero, 0x70($s1) -/* A18418 802421F8 8C830000 */ lw $v1, ($a0) -/* A1841C 802421FC 2402FDFF */ addiu $v0, $zero, -0x201 -/* A18420 80242200 A480008E */ sh $zero, 0x8e($a0) -/* A18424 80242204 00621824 */ and $v1, $v1, $v0 -/* A18428 80242208 34650800 */ ori $a1, $v1, 0x800 -/* A1842C 8024220C AC850000 */ sw $a1, ($a0) -/* A18430 80242210 8E0200D0 */ lw $v0, 0xd0($s0) -/* A18434 80242214 8C420034 */ lw $v0, 0x34($v0) -/* A18438 80242218 10400003 */ beqz $v0, .L80242228 -/* A1843C 8024221C 00E0902D */ daddu $s2, $a3, $zero -/* A18440 80242220 0809088C */ j .L80242230 -/* A18444 80242224 34620808 */ ori $v0, $v1, 0x808 -.L80242228: -/* A18448 80242228 2402FFF7 */ addiu $v0, $zero, -9 -/* A1844C 8024222C 00A21024 */ and $v0, $a1, $v0 -.L80242230: -/* A18450 80242230 AC820000 */ sw $v0, ($a0) -/* A18454 80242234 27A20024 */ addiu $v0, $sp, 0x24 -/* A18458 80242238 27A50018 */ addiu $a1, $sp, 0x18 -/* A1845C 8024223C C4800038 */ lwc1 $f0, 0x38($a0) -/* A18460 80242240 C482003C */ lwc1 $f2, 0x3c($a0) -/* A18464 80242244 C4840040 */ lwc1 $f4, 0x40($a0) -/* A18468 80242248 3C01447A */ lui $at, 0x447a -/* A1846C 8024224C 44813000 */ mtc1 $at, $f6 -/* A18470 80242250 27A6001C */ addiu $a2, $sp, 0x1c -/* A18474 80242254 E7A00018 */ swc1 $f0, 0x18($sp) -/* A18478 80242258 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A1847C 8024225C E7A40020 */ swc1 $f4, 0x20($sp) -/* A18480 80242260 E7A60024 */ swc1 $f6, 0x24($sp) -/* A18484 80242264 AFA20010 */ sw $v0, 0x10($sp) -/* A18488 80242268 8C840080 */ lw $a0, 0x80($a0) -/* A1848C 8024226C 0C0372DF */ jal func_800DCB7C -/* A18490 80242270 27A70020 */ addiu $a3, $sp, 0x20 -/* A18494 80242274 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A18498 80242278 3C014059 */ lui $at, 0x4059 -/* A1849C 8024227C 44812800 */ mtc1 $at, $f5 -/* A184A0 80242280 44802000 */ mtc1 $zero, $f4 -/* A184A4 80242284 460010A1 */ cvt.d.s $f2, $f2 -/* A184A8 80242288 46241082 */ mul.d $f2, $f2, $f4 -/* A184AC 8024228C 00000000 */ nop -/* A184B0 80242290 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A184B4 80242294 46000021 */ cvt.d.s $f0, $f0 -/* A184B8 80242298 46240002 */ mul.d $f0, $f0, $f4 -/* A184BC 8024229C 00000000 */ nop -/* A184C0 802422A0 3C013FE0 */ lui $at, 0x3fe0 -/* A184C4 802422A4 44812800 */ mtc1 $at, $f5 -/* A184C8 802422A8 44802000 */ mtc1 $zero, $f4 -/* A184CC 802422AC 00000000 */ nop -/* A184D0 802422B0 46241080 */ add.d $f2, $f2, $f4 -/* A184D4 802422B4 AE000074 */ sw $zero, 0x74($s0) -/* A184D8 802422B8 46240000 */ add.d $f0, $f0, $f4 -/* A184DC 802422BC AE000090 */ sw $zero, 0x90($s0) -/* A184E0 802422C0 4620120D */ trunc.w.d $f8, $f2 -/* A184E4 802422C4 E6080078 */ swc1 $f8, 0x78($s0) -/* A184E8 802422C8 4620020D */ trunc.w.d $f8, $f0 -/* A184EC 802422CC E6080088 */ swc1 $f8, 0x88($s0) -/* A184F0 802422D0 8E420014 */ lw $v0, 0x14($s2) -/* A184F4 802422D4 AE220074 */ sw $v0, 0x74($s1) -/* A184F8 802422D8 8E0200B0 */ lw $v0, 0xb0($s0) -/* A184FC 802422DC 34420010 */ ori $v0, $v0, 0x10 -/* A18500 802422E0 AE0200B0 */ sw $v0, 0xb0($s0) -/* A18504 802422E4 8FBF0034 */ lw $ra, 0x34($sp) -/* A18508 802422E8 8FB20030 */ lw $s2, 0x30($sp) -/* A1850C 802422EC 8FB1002C */ lw $s1, 0x2c($sp) -/* A18510 802422F0 8FB00028 */ lw $s0, 0x28($sp) -/* A18514 802422F4 03E00008 */ jr $ra -/* A18518 802422F8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s new file mode 100644 index 0000000000..7df3578ac2 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802421D8_A183F8.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421D8_A183F8 +/* A183F8 802421D8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A183FC 802421DC AFB00028 */ sw $s0, 0x28($sp) +/* A18400 802421E0 00A0802D */ daddu $s0, $a1, $zero +/* A18404 802421E4 AFB1002C */ sw $s1, 0x2c($sp) +/* A18408 802421E8 00C0882D */ daddu $s1, $a2, $zero +/* A1840C 802421EC AFBF0034 */ sw $ra, 0x34($sp) +/* A18410 802421F0 AFB20030 */ sw $s2, 0x30($sp) +/* A18414 802421F4 AE200070 */ sw $zero, 0x70($s1) +/* A18418 802421F8 8C830000 */ lw $v1, ($a0) +/* A1841C 802421FC 2402FDFF */ addiu $v0, $zero, -0x201 +/* A18420 80242200 A480008E */ sh $zero, 0x8e($a0) +/* A18424 80242204 00621824 */ and $v1, $v1, $v0 +/* A18428 80242208 34650800 */ ori $a1, $v1, 0x800 +/* A1842C 8024220C AC850000 */ sw $a1, ($a0) +/* A18430 80242210 8E0200D0 */ lw $v0, 0xd0($s0) +/* A18434 80242214 8C420034 */ lw $v0, 0x34($v0) +/* A18438 80242218 10400003 */ beqz $v0, .L80242228 +/* A1843C 8024221C 00E0902D */ daddu $s2, $a3, $zero +/* A18440 80242220 0809088C */ j .L80242230 +/* A18444 80242224 34620808 */ ori $v0, $v1, 0x808 +.L80242228: +/* A18448 80242228 2402FFF7 */ addiu $v0, $zero, -9 +/* A1844C 8024222C 00A21024 */ and $v0, $a1, $v0 +.L80242230: +/* A18450 80242230 AC820000 */ sw $v0, ($a0) +/* A18454 80242234 27A20024 */ addiu $v0, $sp, 0x24 +/* A18458 80242238 27A50018 */ addiu $a1, $sp, 0x18 +/* A1845C 8024223C C4800038 */ lwc1 $f0, 0x38($a0) +/* A18460 80242240 C482003C */ lwc1 $f2, 0x3c($a0) +/* A18464 80242244 C4840040 */ lwc1 $f4, 0x40($a0) +/* A18468 80242248 3C01447A */ lui $at, 0x447a +/* A1846C 8024224C 44813000 */ mtc1 $at, $f6 +/* A18470 80242250 27A6001C */ addiu $a2, $sp, 0x1c +/* A18474 80242254 E7A00018 */ swc1 $f0, 0x18($sp) +/* A18478 80242258 E7A2001C */ swc1 $f2, 0x1c($sp) +/* A1847C 8024225C E7A40020 */ swc1 $f4, 0x20($sp) +/* A18480 80242260 E7A60024 */ swc1 $f6, 0x24($sp) +/* A18484 80242264 AFA20010 */ sw $v0, 0x10($sp) +/* A18488 80242268 8C840080 */ lw $a0, 0x80($a0) +/* A1848C 8024226C 0C0372DF */ jal func_800DCB7C +/* A18490 80242270 27A70020 */ addiu $a3, $sp, 0x20 +/* A18494 80242274 C7A20024 */ lwc1 $f2, 0x24($sp) +/* A18498 80242278 3C014059 */ lui $at, 0x4059 +/* A1849C 8024227C 44812800 */ mtc1 $at, $f5 +/* A184A0 80242280 44802000 */ mtc1 $zero, $f4 +/* A184A4 80242284 460010A1 */ cvt.d.s $f2, $f2 +/* A184A8 80242288 46241082 */ mul.d $f2, $f2, $f4 +/* A184AC 8024228C 00000000 */ nop +/* A184B0 80242290 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A184B4 80242294 46000021 */ cvt.d.s $f0, $f0 +/* A184B8 80242298 46240002 */ mul.d $f0, $f0, $f4 +/* A184BC 8024229C 00000000 */ nop +/* A184C0 802422A0 3C013FE0 */ lui $at, 0x3fe0 +/* A184C4 802422A4 44812800 */ mtc1 $at, $f5 +/* A184C8 802422A8 44802000 */ mtc1 $zero, $f4 +/* A184CC 802422AC 00000000 */ nop +/* A184D0 802422B0 46241080 */ add.d $f2, $f2, $f4 +/* A184D4 802422B4 AE000074 */ sw $zero, 0x74($s0) +/* A184D8 802422B8 46240000 */ add.d $f0, $f0, $f4 +/* A184DC 802422BC AE000090 */ sw $zero, 0x90($s0) +/* A184E0 802422C0 4620120D */ trunc.w.d $f8, $f2 +/* A184E4 802422C4 E6080078 */ swc1 $f8, 0x78($s0) +/* A184E8 802422C8 4620020D */ trunc.w.d $f8, $f0 +/* A184EC 802422CC E6080088 */ swc1 $f8, 0x88($s0) +/* A184F0 802422D0 8E420014 */ lw $v0, 0x14($s2) +/* A184F4 802422D4 AE220074 */ sw $v0, 0x74($s1) +/* A184F8 802422D8 8E0200B0 */ lw $v0, 0xb0($s0) +/* A184FC 802422DC 34420010 */ ori $v0, $v0, 0x10 +/* A18500 802422E0 AE0200B0 */ sw $v0, 0xb0($s0) +/* A18504 802422E4 8FBF0034 */ lw $ra, 0x34($sp) +/* A18508 802422E8 8FB20030 */ lw $s2, 0x30($sp) +/* A1850C 802422EC 8FB1002C */ lw $s1, 0x2c($sp) +/* A18510 802422F0 8FB00028 */ lw $s0, 0x28($sp) +/* A18514 802422F4 03E00008 */ jr $ra +/* A18518 802422F8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s index 310484b835..0cdb1ef49b 100644 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802422FC_A1851C.s @@ -46,7 +46,7 @@ glabel func_802422FC_A1851C /* A185C0 802423A0 02A0202D */ daddu $a0, $s5, $zero /* A185C4 802423A4 0240282D */ daddu $a1, $s2, $zero /* A185C8 802423A8 0280302D */ daddu $a2, $s4, $zero -/* A185CC 802423AC 0C090876 */ jal func_802421D8 +/* A185CC 802423AC 0C090876 */ jal func_802421D8_A183F8 /* A185D0 802423B0 0200382D */ daddu $a3, $s0, $zero .L802423B4: /* A185D4 802423B4 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_802422FC_A1851C /* A18624 80242404 00000000 */ nop /* A18628 80242408 0280202D */ daddu $a0, $s4, $zero /* A1862C 8024240C 0200282D */ daddu $a1, $s0, $zero -/* A18630 80242410 0C0903FC */ jal func_80240FF0 +/* A18630 80242410 0C0903FC */ jal func_80240FF0_A17210 /* A18634 80242414 0260302D */ daddu $a2, $s3, $zero /* A18638 80242418 0280202D */ daddu $a0, $s4, $zero /* A1863C 8024241C 0200282D */ daddu $a1, $s0, $zero -/* A18640 80242420 0C090468 */ jal func_802411A0 +/* A18640 80242420 0C090468 */ jal func_802411A0_A173C0 /* A18644 80242424 0260302D */ daddu $a2, $s3, $zero /* A18648 80242428 08090931 */ j .L802424C4 /* A1864C 8024242C 0000102D */ daddu $v0, $zero, $zero /* A18650 80242430 0280202D */ daddu $a0, $s4, $zero /* A18654 80242434 0200282D */ daddu $a1, $s0, $zero -/* A18658 80242438 0C0905F2 */ jal func_802417C8 +/* A18658 80242438 0C0905F2 */ jal func_802417C8_A179E8 /* A1865C 8024243C 0260302D */ daddu $a2, $s3, $zero /* A18660 80242440 0280202D */ daddu $a0, $s4, $zero /* A18664 80242444 0200282D */ daddu $a1, $s0, $zero -/* A18668 80242448 0C090622 */ jal func_80241888 +/* A18668 80242448 0C090622 */ jal func_80241888_A17AA8 /* A1866C 8024244C 0260302D */ daddu $a2, $s3, $zero /* A18670 80242450 08090931 */ j .L802424C4 /* A18674 80242454 0000102D */ daddu $v0, $zero, $zero /* A18678 80242458 0280202D */ daddu $a0, $s4, $zero /* A1867C 8024245C 0200282D */ daddu $a1, $s0, $zero -/* A18680 80242460 0C0906F3 */ jal func_80241BCC +/* A18680 80242460 0C0906F3 */ jal func_80241BCC_A17DEC /* A18684 80242464 0260302D */ daddu $a2, $s3, $zero /* A18688 80242468 0280202D */ daddu $a0, $s4, $zero /* A1868C 8024246C 0200282D */ daddu $a1, $s0, $zero -/* A18690 80242470 0C090711 */ jal func_80241C44 +/* A18690 80242470 0C090711 */ jal func_80241C44_A17E64 /* A18694 80242474 0260302D */ daddu $a2, $s3, $zero /* A18698 80242478 08090931 */ j .L802424C4 /* A1869C 8024247C 0000102D */ daddu $v0, $zero, $zero /* A186A0 80242480 0280202D */ daddu $a0, $s4, $zero /* A186A4 80242484 0200282D */ daddu $a1, $s0, $zero -/* A186A8 80242488 0C09072C */ jal func_80241CB0 +/* A186A8 80242488 0C09072C */ jal func_80241CB0_A17ED0 /* A186AC 8024248C 0260302D */ daddu $a2, $s3, $zero /* A186B0 80242490 08090931 */ j .L802424C4 /* A186B4 80242494 0000102D */ daddu $v0, $zero, $zero /* A186B8 80242498 0280202D */ daddu $a0, $s4, $zero /* A186BC 8024249C 0200282D */ daddu $a1, $s0, $zero -/* A186C0 802424A0 0C090779 */ jal func_80241DE4 +/* A186C0 802424A0 0C090779 */ jal func_80241DE4_A18004 /* A186C4 802424A4 0260302D */ daddu $a2, $s3, $zero /* A186C8 802424A8 08090931 */ j .L802424C4 /* A186CC 802424AC 0000102D */ daddu $v0, $zero, $zero /* A186D0 802424B0 0280202D */ daddu $a0, $s4, $zero /* A186D4 802424B4 0200282D */ daddu $a1, $s0, $zero -/* A186D8 802424B8 0C090792 */ jal func_80241E48 +/* A186D8 802424B8 0C090792 */ jal func_80241E48_A18068 /* A186DC 802424BC 0260302D */ daddu $a2, $s3, $zero .L802424C0: /* A186E0 802424C0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8.s deleted file mode 100644 index 29212667ab..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424E8 -/* A18708 802424E8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A1870C 802424EC AFB3001C */ sw $s3, 0x1c($sp) -/* A18710 802424F0 0080982D */ daddu $s3, $a0, $zero -/* A18714 802424F4 AFBF0020 */ sw $ra, 0x20($sp) -/* A18718 802424F8 AFB20018 */ sw $s2, 0x18($sp) -/* A1871C 802424FC AFB10014 */ sw $s1, 0x14($sp) -/* A18720 80242500 AFB00010 */ sw $s0, 0x10($sp) -/* A18724 80242504 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A18728 80242508 8E710148 */ lw $s1, 0x148($s3) -/* A1872C 8024250C 86240008 */ lh $a0, 8($s1) -/* A18730 80242510 0C00EABB */ jal get_npc_unsafe -/* A18734 80242514 00A0802D */ daddu $s0, $a1, $zero -/* A18738 80242518 8E040020 */ lw $a0, 0x20($s0) -/* A1873C 8024251C 0040902D */ daddu $s2, $v0, $zero -/* A18740 80242520 00041FC2 */ srl $v1, $a0, 0x1f -/* A18744 80242524 00832021 */ addu $a0, $a0, $v1 -/* A18748 80242528 00042043 */ sra $a0, $a0, 1 -/* A1874C 8024252C 0C00A67F */ jal rand_int -/* A18750 80242530 24840001 */ addiu $a0, $a0, 1 -/* A18754 80242534 8E030020 */ lw $v1, 0x20($s0) -/* A18758 80242538 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A1875C 8024253C 000327C2 */ srl $a0, $v1, 0x1f -/* A18760 80242540 00641821 */ addu $v1, $v1, $a0 -/* A18764 80242544 00031843 */ sra $v1, $v1, 1 -/* A18768 80242548 00621821 */ addu $v1, $v1, $v0 -/* A1876C 8024254C A643008E */ sh $v1, 0x8e($s2) -/* A18770 80242550 8E2200CC */ lw $v0, 0xcc($s1) -/* A18774 80242554 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A18778 80242558 8C42000C */ lw $v0, 0xc($v0) -/* A1877C 8024255C AE420028 */ sw $v0, 0x28($s2) -/* A18780 80242560 C6000018 */ lwc1 $f0, 0x18($s0) -/* A18784 80242564 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A18788 80242568 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1878C 8024256C E6400018 */ swc1 $f0, 0x18($s2) -/* A18790 80242570 8C460028 */ lw $a2, 0x28($v0) -/* A18794 80242574 0C00A720 */ jal atan2 -/* A18798 80242578 8C470030 */ lw $a3, 0x30($v0) -/* A1879C 8024257C 46000506 */ mov.s $f20, $f0 -/* A187A0 80242580 C64C000C */ lwc1 $f12, 0xc($s2) -/* A187A4 80242584 0C00A70A */ jal get_clamped_angle_diff -/* A187A8 80242588 4600A386 */ mov.s $f14, $f20 -/* A187AC 8024258C 46000086 */ mov.s $f2, $f0 -/* A187B0 80242590 8E02001C */ lw $v0, 0x1c($s0) -/* A187B4 80242594 46001005 */ abs.s $f0, $f2 -/* A187B8 80242598 44822000 */ mtc1 $v0, $f4 -/* A187BC 8024259C 00000000 */ nop -/* A187C0 802425A0 46802120 */ cvt.s.w $f4, $f4 -/* A187C4 802425A4 4600203C */ c.lt.s $f4, $f0 -/* A187C8 802425A8 00000000 */ nop -/* A187CC 802425AC 4500000D */ bc1f .L802425E4 -/* A187D0 802425B0 00000000 */ nop -/* A187D4 802425B4 44800000 */ mtc1 $zero, $f0 -/* A187D8 802425B8 C654000C */ lwc1 $f20, 0xc($s2) -/* A187DC 802425BC 4600103C */ c.lt.s $f2, $f0 -/* A187E0 802425C0 00000000 */ nop -/* A187E4 802425C4 45000006 */ bc1f .L802425E0 -/* A187E8 802425C8 00021023 */ negu $v0, $v0 -/* A187EC 802425CC 44820000 */ mtc1 $v0, $f0 -/* A187F0 802425D0 00000000 */ nop -/* A187F4 802425D4 46800020 */ cvt.s.w $f0, $f0 -/* A187F8 802425D8 08090979 */ j .L802425E4 -/* A187FC 802425DC 4600A500 */ add.s $f20, $f20, $f0 -.L802425E0: -/* A18800 802425E0 4604A500 */ add.s $f20, $f20, $f4 -.L802425E4: -/* A18804 802425E4 0C00A6C9 */ jal clamp_angle -/* A18808 802425E8 4600A306 */ mov.s $f12, $f20 -/* A1880C 802425EC 2402000D */ addiu $v0, $zero, 0xd -/* A18810 802425F0 E640000C */ swc1 $f0, 0xc($s2) -/* A18814 802425F4 AE620070 */ sw $v0, 0x70($s3) -/* A18818 802425F8 8FBF0020 */ lw $ra, 0x20($sp) -/* A1881C 802425FC 8FB3001C */ lw $s3, 0x1c($sp) -/* A18820 80242600 8FB20018 */ lw $s2, 0x18($sp) -/* A18824 80242604 8FB10014 */ lw $s1, 0x14($sp) -/* A18828 80242608 8FB00010 */ lw $s0, 0x10($sp) -/* A1882C 8024260C D7B40028 */ ldc1 $f20, 0x28($sp) -/* A18830 80242610 03E00008 */ jr $ra -/* A18834 80242614 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8_A18708.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8_A18708.s new file mode 100644 index 0000000000..45ae82938f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802424E8_A18708.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424E8_A18708 +/* A18708 802424E8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A1870C 802424EC AFB3001C */ sw $s3, 0x1c($sp) +/* A18710 802424F0 0080982D */ daddu $s3, $a0, $zero +/* A18714 802424F4 AFBF0020 */ sw $ra, 0x20($sp) +/* A18718 802424F8 AFB20018 */ sw $s2, 0x18($sp) +/* A1871C 802424FC AFB10014 */ sw $s1, 0x14($sp) +/* A18720 80242500 AFB00010 */ sw $s0, 0x10($sp) +/* A18724 80242504 F7B40028 */ sdc1 $f20, 0x28($sp) +/* A18728 80242508 8E710148 */ lw $s1, 0x148($s3) +/* A1872C 8024250C 86240008 */ lh $a0, 8($s1) +/* A18730 80242510 0C00EABB */ jal get_npc_unsafe +/* A18734 80242514 00A0802D */ daddu $s0, $a1, $zero +/* A18738 80242518 8E040020 */ lw $a0, 0x20($s0) +/* A1873C 8024251C 0040902D */ daddu $s2, $v0, $zero +/* A18740 80242520 00041FC2 */ srl $v1, $a0, 0x1f +/* A18744 80242524 00832021 */ addu $a0, $a0, $v1 +/* A18748 80242528 00042043 */ sra $a0, $a0, 1 +/* A1874C 8024252C 0C00A67F */ jal rand_int +/* A18750 80242530 24840001 */ addiu $a0, $a0, 1 +/* A18754 80242534 8E030020 */ lw $v1, 0x20($s0) +/* A18758 80242538 C64C0038 */ lwc1 $f12, 0x38($s2) +/* A1875C 8024253C 000327C2 */ srl $a0, $v1, 0x1f +/* A18760 80242540 00641821 */ addu $v1, $v1, $a0 +/* A18764 80242544 00031843 */ sra $v1, $v1, 1 +/* A18768 80242548 00621821 */ addu $v1, $v1, $v0 +/* A1876C 8024254C A643008E */ sh $v1, 0x8e($s2) +/* A18770 80242550 8E2200CC */ lw $v0, 0xcc($s1) +/* A18774 80242554 C64E0040 */ lwc1 $f14, 0x40($s2) +/* A18778 80242558 8C42000C */ lw $v0, 0xc($v0) +/* A1877C 8024255C AE420028 */ sw $v0, 0x28($s2) +/* A18780 80242560 C6000018 */ lwc1 $f0, 0x18($s0) +/* A18784 80242564 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A18788 80242568 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A1878C 8024256C E6400018 */ swc1 $f0, 0x18($s2) +/* A18790 80242570 8C460028 */ lw $a2, 0x28($v0) +/* A18794 80242574 0C00A720 */ jal atan2 +/* A18798 80242578 8C470030 */ lw $a3, 0x30($v0) +/* A1879C 8024257C 46000506 */ mov.s $f20, $f0 +/* A187A0 80242580 C64C000C */ lwc1 $f12, 0xc($s2) +/* A187A4 80242584 0C00A70A */ jal get_clamped_angle_diff +/* A187A8 80242588 4600A386 */ mov.s $f14, $f20 +/* A187AC 8024258C 46000086 */ mov.s $f2, $f0 +/* A187B0 80242590 8E02001C */ lw $v0, 0x1c($s0) +/* A187B4 80242594 46001005 */ abs.s $f0, $f2 +/* A187B8 80242598 44822000 */ mtc1 $v0, $f4 +/* A187BC 8024259C 00000000 */ nop +/* A187C0 802425A0 46802120 */ cvt.s.w $f4, $f4 +/* A187C4 802425A4 4600203C */ c.lt.s $f4, $f0 +/* A187C8 802425A8 00000000 */ nop +/* A187CC 802425AC 4500000D */ bc1f .L802425E4 +/* A187D0 802425B0 00000000 */ nop +/* A187D4 802425B4 44800000 */ mtc1 $zero, $f0 +/* A187D8 802425B8 C654000C */ lwc1 $f20, 0xc($s2) +/* A187DC 802425BC 4600103C */ c.lt.s $f2, $f0 +/* A187E0 802425C0 00000000 */ nop +/* A187E4 802425C4 45000006 */ bc1f .L802425E0 +/* A187E8 802425C8 00021023 */ negu $v0, $v0 +/* A187EC 802425CC 44820000 */ mtc1 $v0, $f0 +/* A187F0 802425D0 00000000 */ nop +/* A187F4 802425D4 46800020 */ cvt.s.w $f0, $f0 +/* A187F8 802425D8 08090979 */ j .L802425E4 +/* A187FC 802425DC 4600A500 */ add.s $f20, $f20, $f0 +.L802425E0: +/* A18800 802425E0 4604A500 */ add.s $f20, $f20, $f4 +.L802425E4: +/* A18804 802425E4 0C00A6C9 */ jal clamp_angle +/* A18808 802425E8 4600A306 */ mov.s $f12, $f20 +/* A1880C 802425EC 2402000D */ addiu $v0, $zero, 0xd +/* A18810 802425F0 E640000C */ swc1 $f0, 0xc($s2) +/* A18814 802425F4 AE620070 */ sw $v0, 0x70($s3) +/* A18818 802425F8 8FBF0020 */ lw $ra, 0x20($sp) +/* A1881C 802425FC 8FB3001C */ lw $s3, 0x1c($sp) +/* A18820 80242600 8FB20018 */ lw $s2, 0x18($sp) +/* A18824 80242604 8FB10014 */ lw $s1, 0x14($sp) +/* A18828 80242608 8FB00010 */ lw $s0, 0x10($sp) +/* A1882C 8024260C D7B40028 */ ldc1 $f20, 0x28($sp) +/* A18830 80242610 03E00008 */ jr $ra +/* A18834 80242614 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618.s deleted file mode 100644 index 59b646877f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618.s +++ /dev/null @@ -1,172 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242618 -/* A18838 80242618 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A1883C 8024261C AFB3004C */ sw $s3, 0x4c($sp) -/* A18840 80242620 0080982D */ daddu $s3, $a0, $zero -/* A18844 80242624 AFBF0050 */ sw $ra, 0x50($sp) -/* A18848 80242628 AFB20048 */ sw $s2, 0x48($sp) -/* A1884C 8024262C AFB10044 */ sw $s1, 0x44($sp) -/* A18850 80242630 AFB00040 */ sw $s0, 0x40($sp) -/* A18854 80242634 8E720148 */ lw $s2, 0x148($s3) -/* A18858 80242638 00A0882D */ daddu $s1, $a1, $zero -/* A1885C 8024263C 86440008 */ lh $a0, 8($s2) -/* A18860 80242640 0C00EABB */ jal get_npc_unsafe -/* A18864 80242644 00C0802D */ daddu $s0, $a2, $zero -/* A18868 80242648 0200202D */ daddu $a0, $s0, $zero -/* A1886C 8024264C 0240282D */ daddu $a1, $s2, $zero -/* A18870 80242650 24030001 */ addiu $v1, $zero, 1 -/* A18874 80242654 AFA30010 */ sw $v1, 0x10($sp) -/* A18878 80242658 8E260024 */ lw $a2, 0x24($s1) -/* A1887C 8024265C 8E270028 */ lw $a3, 0x28($s1) -/* A18880 80242660 0C01242D */ jal func_800490B4 -/* A18884 80242664 0040802D */ daddu $s0, $v0, $zero -/* A18888 80242668 14400020 */ bnez $v0, .L802426EC -/* A1888C 8024266C 24040002 */ addiu $a0, $zero, 2 -/* A18890 80242670 0200282D */ daddu $a1, $s0, $zero -/* A18894 80242674 0000302D */ daddu $a2, $zero, $zero -/* A18898 80242678 860300A8 */ lh $v1, 0xa8($s0) -/* A1889C 8024267C 3C013F80 */ lui $at, 0x3f80 -/* A188A0 80242680 44810000 */ mtc1 $at, $f0 -/* A188A4 80242684 3C014000 */ lui $at, 0x4000 -/* A188A8 80242688 44811000 */ mtc1 $at, $f2 -/* A188AC 8024268C 3C01C1A0 */ lui $at, 0xc1a0 -/* A188B0 80242690 44812000 */ mtc1 $at, $f4 -/* A188B4 80242694 2402000F */ addiu $v0, $zero, 0xf -/* A188B8 80242698 AFA2001C */ sw $v0, 0x1c($sp) -/* A188BC 8024269C 44834000 */ mtc1 $v1, $f8 -/* A188C0 802426A0 00000000 */ nop -/* A188C4 802426A4 46804220 */ cvt.s.w $f8, $f8 -/* A188C8 802426A8 44074000 */ mfc1 $a3, $f8 -/* A188CC 802426AC 27A20028 */ addiu $v0, $sp, 0x28 -/* A188D0 802426B0 AFA20020 */ sw $v0, 0x20($sp) -/* A188D4 802426B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* A188D8 802426B8 E7A20014 */ swc1 $f2, 0x14($sp) -/* A188DC 802426BC 0C01BFA4 */ jal fx_emote -/* A188E0 802426C0 E7A40018 */ swc1 $f4, 0x18($sp) -/* A188E4 802426C4 8E4200CC */ lw $v0, 0xcc($s2) -/* A188E8 802426C8 8C430000 */ lw $v1, ($v0) -/* A188EC 802426CC 2402001E */ addiu $v0, $zero, 0x1e -/* A188F0 802426D0 A602008E */ sh $v0, 0x8e($s0) -/* A188F4 802426D4 24020014 */ addiu $v0, $zero, 0x14 -/* A188F8 802426D8 AE030028 */ sw $v1, 0x28($s0) -/* A188FC 802426DC AE620070 */ sw $v0, 0x70($s3) -/* A18900 802426E0 2402001E */ addiu $v0, $zero, 0x1e -/* A18904 802426E4 08090A1F */ j .L8024287C -/* A18908 802426E8 AE420090 */ sw $v0, 0x90($s2) -.L802426EC: -/* A1890C 802426EC 8E050018 */ lw $a1, 0x18($s0) -/* A18910 802426F0 8E06000C */ lw $a2, 0xc($s0) -/* A18914 802426F4 0C00EA95 */ jal npc_move_heading -/* A18918 802426F8 0200202D */ daddu $a0, $s0, $zero -/* A1891C 802426FC 8E020000 */ lw $v0, ($s0) -/* A18920 80242700 30420008 */ andi $v0, $v0, 8 -/* A18924 80242704 14400028 */ bnez $v0, .L802427A8 -/* A18928 80242708 0000882D */ daddu $s1, $zero, $zero -/* A1892C 8024270C 27A5002C */ addiu $a1, $sp, 0x2c -/* A18930 80242710 27A60030 */ addiu $a2, $sp, 0x30 -/* A18934 80242714 860200A8 */ lh $v0, 0xa8($s0) -/* A18938 80242718 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1893C 8024271C 44821000 */ mtc1 $v0, $f2 -/* A18940 80242720 00000000 */ nop -/* A18944 80242724 468010A0 */ cvt.s.w $f2, $f2 -/* A18948 80242728 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A1894C 8024272C 860200A8 */ lh $v0, 0xa8($s0) -/* A18950 80242730 C604003C */ lwc1 $f4, 0x3c($s0) -/* A18954 80242734 C6060040 */ lwc1 $f6, 0x40($s0) -/* A18958 80242738 44820000 */ mtc1 $v0, $f0 -/* A1895C 8024273C 00000000 */ nop -/* A18960 80242740 46800021 */ cvt.d.w $f0, $f0 -/* A18964 80242744 46022100 */ add.s $f4, $f4, $f2 -/* A18968 80242748 3C014008 */ lui $at, 0x4008 -/* A1896C 8024274C 44811800 */ mtc1 $at, $f3 -/* A18970 80242750 44801000 */ mtc1 $zero, $f2 -/* A18974 80242754 27A20038 */ addiu $v0, $sp, 0x38 -/* A18978 80242758 46220000 */ add.d $f0, $f0, $f2 -/* A1897C 8024275C E7A60034 */ swc1 $f6, 0x34($sp) -/* A18980 80242760 E7A40030 */ swc1 $f4, 0x30($sp) -/* A18984 80242764 46200020 */ cvt.s.d $f0, $f0 -/* A18988 80242768 E7A00038 */ swc1 $f0, 0x38($sp) -/* A1898C 8024276C AFA20010 */ sw $v0, 0x10($sp) -/* A18990 80242770 8E040080 */ lw $a0, 0x80($s0) -/* A18994 80242774 0C0372DF */ jal func_800DCB7C -/* A18998 80242778 27A70034 */ addiu $a3, $sp, 0x34 -/* A1899C 8024277C 1040000A */ beqz $v0, .L802427A8 -/* A189A0 80242780 00000000 */ nop -/* A189A4 80242784 860200A8 */ lh $v0, 0xa8($s0) -/* A189A8 80242788 C7A20038 */ lwc1 $f2, 0x38($sp) -/* A189AC 8024278C 44820000 */ mtc1 $v0, $f0 -/* A189B0 80242790 00000000 */ nop -/* A189B4 80242794 46800020 */ cvt.s.w $f0, $f0 -/* A189B8 80242798 4600103C */ c.lt.s $f2, $f0 -/* A189BC 8024279C 00000000 */ nop -/* A189C0 802427A0 45030001 */ bc1tl .L802427A8 -/* A189C4 802427A4 24110001 */ addiu $s1, $zero, 1 -.L802427A8: -/* A189C8 802427A8 12200008 */ beqz $s1, .L802427CC -/* A189CC 802427AC 00000000 */ nop -/* A189D0 802427B0 C7A00030 */ lwc1 $f0, 0x30($sp) -/* A189D4 802427B4 3C013FF0 */ lui $at, 0x3ff0 -/* A189D8 802427B8 44811800 */ mtc1 $at, $f3 -/* A189DC 802427BC 44801000 */ mtc1 $zero, $f2 -/* A189E0 802427C0 46000021 */ cvt.d.s $f0, $f0 -/* A189E4 802427C4 08090A15 */ j .L80242854 -/* A189E8 802427C8 46220000 */ add.d $f0, $f0, $f2 -.L802427CC: -/* A189EC 802427CC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A189F0 802427D0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A189F4 802427D4 3C014018 */ lui $at, 0x4018 -/* A189F8 802427D8 44811800 */ mtc1 $at, $f3 -/* A189FC 802427DC 44801000 */ mtc1 $zero, $f2 -/* A18A00 802427E0 C440002C */ lwc1 $f0, 0x2c($v0) -/* A18A04 802427E4 C604003C */ lwc1 $f4, 0x3c($s0) -/* A18A08 802427E8 46000021 */ cvt.d.s $f0, $f0 -/* A18A0C 802427EC 46220000 */ add.d $f0, $f0, $f2 -/* A18A10 802427F0 46002121 */ cvt.d.s $f4, $f4 -/* A18A14 802427F4 46202001 */ sub.d $f0, $f4, $f0 -/* A18A18 802427F8 462001A0 */ cvt.s.d $f6, $f0 -/* A18A1C 802427FC 44800000 */ mtc1 $zero, $f0 -/* A18A20 80242800 44800800 */ mtc1 $zero, $f1 -/* A18A24 80242804 460030A1 */ cvt.d.s $f2, $f6 -/* A18A28 80242808 4620103C */ c.lt.d $f2, $f0 -/* A18A2C 8024280C 00000000 */ nop -/* A18A30 80242810 45010009 */ bc1t .L80242838 -/* A18A34 80242814 00000000 */ nop -/* A18A38 80242818 3C014010 */ lui $at, 0x4010 -/* A18A3C 8024281C 44810800 */ mtc1 $at, $f1 -/* A18A40 80242820 44800000 */ mtc1 $zero, $f0 -/* A18A44 80242824 00000000 */ nop -/* A18A48 80242828 4622003C */ c.lt.d $f0, $f2 -/* A18A4C 8024282C 00000000 */ nop -/* A18A50 80242830 4500000A */ bc1f .L8024285C -/* A18A54 80242834 00000000 */ nop -.L80242838: -/* A18A58 80242838 3C018024 */ lui $at, 0x8024 -/* A18A5C 8024283C D4224E78 */ ldc1 $f2, 0x4e78($at) -/* A18A60 80242840 46003187 */ neg.s $f6, $f6 -/* A18A64 80242844 46003021 */ cvt.d.s $f0, $f6 -/* A18A68 80242848 46220002 */ mul.d $f0, $f0, $f2 -/* A18A6C 8024284C 00000000 */ nop -/* A18A70 80242850 46202000 */ add.d $f0, $f4, $f0 -.L80242854: -/* A18A74 80242854 46200020 */ cvt.s.d $f0, $f0 -/* A18A78 80242858 E600003C */ swc1 $f0, 0x3c($s0) -.L8024285C: -/* A18A7C 8024285C 8602008E */ lh $v0, 0x8e($s0) -/* A18A80 80242860 9603008E */ lhu $v1, 0x8e($s0) -/* A18A84 80242864 18400003 */ blez $v0, .L80242874 -/* A18A88 80242868 2462FFFF */ addiu $v0, $v1, -1 -/* A18A8C 8024286C 08090A1F */ j .L8024287C -/* A18A90 80242870 A602008E */ sh $v0, 0x8e($s0) -.L80242874: -/* A18A94 80242874 2402000C */ addiu $v0, $zero, 0xc -/* A18A98 80242878 AE620070 */ sw $v0, 0x70($s3) -.L8024287C: -/* A18A9C 8024287C 8FBF0050 */ lw $ra, 0x50($sp) -/* A18AA0 80242880 8FB3004C */ lw $s3, 0x4c($sp) -/* A18AA4 80242884 8FB20048 */ lw $s2, 0x48($sp) -/* A18AA8 80242888 8FB10044 */ lw $s1, 0x44($sp) -/* A18AAC 8024288C 8FB00040 */ lw $s0, 0x40($sp) -/* A18AB0 80242890 03E00008 */ jr $ra -/* A18AB4 80242894 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s new file mode 100644 index 0000000000..424e37741a --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_80242618_A18838.s @@ -0,0 +1,172 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242618_A18838 +/* A18838 80242618 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* A1883C 8024261C AFB3004C */ sw $s3, 0x4c($sp) +/* A18840 80242620 0080982D */ daddu $s3, $a0, $zero +/* A18844 80242624 AFBF0050 */ sw $ra, 0x50($sp) +/* A18848 80242628 AFB20048 */ sw $s2, 0x48($sp) +/* A1884C 8024262C AFB10044 */ sw $s1, 0x44($sp) +/* A18850 80242630 AFB00040 */ sw $s0, 0x40($sp) +/* A18854 80242634 8E720148 */ lw $s2, 0x148($s3) +/* A18858 80242638 00A0882D */ daddu $s1, $a1, $zero +/* A1885C 8024263C 86440008 */ lh $a0, 8($s2) +/* A18860 80242640 0C00EABB */ jal get_npc_unsafe +/* A18864 80242644 00C0802D */ daddu $s0, $a2, $zero +/* A18868 80242648 0200202D */ daddu $a0, $s0, $zero +/* A1886C 8024264C 0240282D */ daddu $a1, $s2, $zero +/* A18870 80242650 24030001 */ addiu $v1, $zero, 1 +/* A18874 80242654 AFA30010 */ sw $v1, 0x10($sp) +/* A18878 80242658 8E260024 */ lw $a2, 0x24($s1) +/* A1887C 8024265C 8E270028 */ lw $a3, 0x28($s1) +/* A18880 80242660 0C01242D */ jal func_800490B4 +/* A18884 80242664 0040802D */ daddu $s0, $v0, $zero +/* A18888 80242668 14400020 */ bnez $v0, .L802426EC +/* A1888C 8024266C 24040002 */ addiu $a0, $zero, 2 +/* A18890 80242670 0200282D */ daddu $a1, $s0, $zero +/* A18894 80242674 0000302D */ daddu $a2, $zero, $zero +/* A18898 80242678 860300A8 */ lh $v1, 0xa8($s0) +/* A1889C 8024267C 3C013F80 */ lui $at, 0x3f80 +/* A188A0 80242680 44810000 */ mtc1 $at, $f0 +/* A188A4 80242684 3C014000 */ lui $at, 0x4000 +/* A188A8 80242688 44811000 */ mtc1 $at, $f2 +/* A188AC 8024268C 3C01C1A0 */ lui $at, 0xc1a0 +/* A188B0 80242690 44812000 */ mtc1 $at, $f4 +/* A188B4 80242694 2402000F */ addiu $v0, $zero, 0xf +/* A188B8 80242698 AFA2001C */ sw $v0, 0x1c($sp) +/* A188BC 8024269C 44834000 */ mtc1 $v1, $f8 +/* A188C0 802426A0 00000000 */ nop +/* A188C4 802426A4 46804220 */ cvt.s.w $f8, $f8 +/* A188C8 802426A8 44074000 */ mfc1 $a3, $f8 +/* A188CC 802426AC 27A20028 */ addiu $v0, $sp, 0x28 +/* A188D0 802426B0 AFA20020 */ sw $v0, 0x20($sp) +/* A188D4 802426B4 E7A00010 */ swc1 $f0, 0x10($sp) +/* A188D8 802426B8 E7A20014 */ swc1 $f2, 0x14($sp) +/* A188DC 802426BC 0C01BFA4 */ jal fx_emote +/* A188E0 802426C0 E7A40018 */ swc1 $f4, 0x18($sp) +/* A188E4 802426C4 8E4200CC */ lw $v0, 0xcc($s2) +/* A188E8 802426C8 8C430000 */ lw $v1, ($v0) +/* A188EC 802426CC 2402001E */ addiu $v0, $zero, 0x1e +/* A188F0 802426D0 A602008E */ sh $v0, 0x8e($s0) +/* A188F4 802426D4 24020014 */ addiu $v0, $zero, 0x14 +/* A188F8 802426D8 AE030028 */ sw $v1, 0x28($s0) +/* A188FC 802426DC AE620070 */ sw $v0, 0x70($s3) +/* A18900 802426E0 2402001E */ addiu $v0, $zero, 0x1e +/* A18904 802426E4 08090A1F */ j .L8024287C +/* A18908 802426E8 AE420090 */ sw $v0, 0x90($s2) +.L802426EC: +/* A1890C 802426EC 8E050018 */ lw $a1, 0x18($s0) +/* A18910 802426F0 8E06000C */ lw $a2, 0xc($s0) +/* A18914 802426F4 0C00EA95 */ jal npc_move_heading +/* A18918 802426F8 0200202D */ daddu $a0, $s0, $zero +/* A1891C 802426FC 8E020000 */ lw $v0, ($s0) +/* A18920 80242700 30420008 */ andi $v0, $v0, 8 +/* A18924 80242704 14400028 */ bnez $v0, .L802427A8 +/* A18928 80242708 0000882D */ daddu $s1, $zero, $zero +/* A1892C 8024270C 27A5002C */ addiu $a1, $sp, 0x2c +/* A18930 80242710 27A60030 */ addiu $a2, $sp, 0x30 +/* A18934 80242714 860200A8 */ lh $v0, 0xa8($s0) +/* A18938 80242718 C6000038 */ lwc1 $f0, 0x38($s0) +/* A1893C 8024271C 44821000 */ mtc1 $v0, $f2 +/* A18940 80242720 00000000 */ nop +/* A18944 80242724 468010A0 */ cvt.s.w $f2, $f2 +/* A18948 80242728 E7A0002C */ swc1 $f0, 0x2c($sp) +/* A1894C 8024272C 860200A8 */ lh $v0, 0xa8($s0) +/* A18950 80242730 C604003C */ lwc1 $f4, 0x3c($s0) +/* A18954 80242734 C6060040 */ lwc1 $f6, 0x40($s0) +/* A18958 80242738 44820000 */ mtc1 $v0, $f0 +/* A1895C 8024273C 00000000 */ nop +/* A18960 80242740 46800021 */ cvt.d.w $f0, $f0 +/* A18964 80242744 46022100 */ add.s $f4, $f4, $f2 +/* A18968 80242748 3C014008 */ lui $at, 0x4008 +/* A1896C 8024274C 44811800 */ mtc1 $at, $f3 +/* A18970 80242750 44801000 */ mtc1 $zero, $f2 +/* A18974 80242754 27A20038 */ addiu $v0, $sp, 0x38 +/* A18978 80242758 46220000 */ add.d $f0, $f0, $f2 +/* A1897C 8024275C E7A60034 */ swc1 $f6, 0x34($sp) +/* A18980 80242760 E7A40030 */ swc1 $f4, 0x30($sp) +/* A18984 80242764 46200020 */ cvt.s.d $f0, $f0 +/* A18988 80242768 E7A00038 */ swc1 $f0, 0x38($sp) +/* A1898C 8024276C AFA20010 */ sw $v0, 0x10($sp) +/* A18990 80242770 8E040080 */ lw $a0, 0x80($s0) +/* A18994 80242774 0C0372DF */ jal func_800DCB7C +/* A18998 80242778 27A70034 */ addiu $a3, $sp, 0x34 +/* A1899C 8024277C 1040000A */ beqz $v0, .L802427A8 +/* A189A0 80242780 00000000 */ nop +/* A189A4 80242784 860200A8 */ lh $v0, 0xa8($s0) +/* A189A8 80242788 C7A20038 */ lwc1 $f2, 0x38($sp) +/* A189AC 8024278C 44820000 */ mtc1 $v0, $f0 +/* A189B0 80242790 00000000 */ nop +/* A189B4 80242794 46800020 */ cvt.s.w $f0, $f0 +/* A189B8 80242798 4600103C */ c.lt.s $f2, $f0 +/* A189BC 8024279C 00000000 */ nop +/* A189C0 802427A0 45030001 */ bc1tl .L802427A8 +/* A189C4 802427A4 24110001 */ addiu $s1, $zero, 1 +.L802427A8: +/* A189C8 802427A8 12200008 */ beqz $s1, .L802427CC +/* A189CC 802427AC 00000000 */ nop +/* A189D0 802427B0 C7A00030 */ lwc1 $f0, 0x30($sp) +/* A189D4 802427B4 3C013FF0 */ lui $at, 0x3ff0 +/* A189D8 802427B8 44811800 */ mtc1 $at, $f3 +/* A189DC 802427BC 44801000 */ mtc1 $zero, $f2 +/* A189E0 802427C0 46000021 */ cvt.d.s $f0, $f0 +/* A189E4 802427C4 08090A15 */ j .L80242854 +/* A189E8 802427C8 46220000 */ add.d $f0, $f0, $f2 +.L802427CC: +/* A189EC 802427CC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A189F0 802427D0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A189F4 802427D4 3C014018 */ lui $at, 0x4018 +/* A189F8 802427D8 44811800 */ mtc1 $at, $f3 +/* A189FC 802427DC 44801000 */ mtc1 $zero, $f2 +/* A18A00 802427E0 C440002C */ lwc1 $f0, 0x2c($v0) +/* A18A04 802427E4 C604003C */ lwc1 $f4, 0x3c($s0) +/* A18A08 802427E8 46000021 */ cvt.d.s $f0, $f0 +/* A18A0C 802427EC 46220000 */ add.d $f0, $f0, $f2 +/* A18A10 802427F0 46002121 */ cvt.d.s $f4, $f4 +/* A18A14 802427F4 46202001 */ sub.d $f0, $f4, $f0 +/* A18A18 802427F8 462001A0 */ cvt.s.d $f6, $f0 +/* A18A1C 802427FC 44800000 */ mtc1 $zero, $f0 +/* A18A20 80242800 44800800 */ mtc1 $zero, $f1 +/* A18A24 80242804 460030A1 */ cvt.d.s $f2, $f6 +/* A18A28 80242808 4620103C */ c.lt.d $f2, $f0 +/* A18A2C 8024280C 00000000 */ nop +/* A18A30 80242810 45010009 */ bc1t .L80242838 +/* A18A34 80242814 00000000 */ nop +/* A18A38 80242818 3C014010 */ lui $at, 0x4010 +/* A18A3C 8024281C 44810800 */ mtc1 $at, $f1 +/* A18A40 80242820 44800000 */ mtc1 $zero, $f0 +/* A18A44 80242824 00000000 */ nop +/* A18A48 80242828 4622003C */ c.lt.d $f0, $f2 +/* A18A4C 8024282C 00000000 */ nop +/* A18A50 80242830 4500000A */ bc1f .L8024285C +/* A18A54 80242834 00000000 */ nop +.L80242838: +/* A18A58 80242838 3C018024 */ lui $at, 0x8024 +/* A18A5C 8024283C D4224E78 */ ldc1 $f2, 0x4e78($at) +/* A18A60 80242840 46003187 */ neg.s $f6, $f6 +/* A18A64 80242844 46003021 */ cvt.d.s $f0, $f6 +/* A18A68 80242848 46220002 */ mul.d $f0, $f0, $f2 +/* A18A6C 8024284C 00000000 */ nop +/* A18A70 80242850 46202000 */ add.d $f0, $f4, $f0 +.L80242854: +/* A18A74 80242854 46200020 */ cvt.s.d $f0, $f0 +/* A18A78 80242858 E600003C */ swc1 $f0, 0x3c($s0) +.L8024285C: +/* A18A7C 8024285C 8602008E */ lh $v0, 0x8e($s0) +/* A18A80 80242860 9603008E */ lhu $v1, 0x8e($s0) +/* A18A84 80242864 18400003 */ blez $v0, .L80242874 +/* A18A88 80242868 2462FFFF */ addiu $v0, $v1, -1 +/* A18A8C 8024286C 08090A1F */ j .L8024287C +/* A18A90 80242870 A602008E */ sh $v0, 0x8e($s0) +.L80242874: +/* A18A94 80242874 2402000C */ addiu $v0, $zero, 0xc +/* A18A98 80242878 AE620070 */ sw $v0, 0x70($s3) +.L8024287C: +/* A18A9C 8024287C 8FBF0050 */ lw $ra, 0x50($sp) +/* A18AA0 80242880 8FB3004C */ lw $s3, 0x4c($sp) +/* A18AA4 80242884 8FB20048 */ lw $s2, 0x48($sp) +/* A18AA8 80242888 8FB10044 */ lw $s1, 0x44($sp) +/* A18AAC 8024288C 8FB00040 */ lw $s0, 0x40($sp) +/* A18AB0 80242890 03E00008 */ jr $ra +/* A18AB4 80242894 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4.s deleted file mode 100644 index 1c098fa6f1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428F4 -/* A18B14 802428F4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A18B18 802428F8 AFB40040 */ sw $s4, 0x40($sp) -/* A18B1C 802428FC 0080A02D */ daddu $s4, $a0, $zero -/* A18B20 80242900 AFBF0048 */ sw $ra, 0x48($sp) -/* A18B24 80242904 AFB50044 */ sw $s5, 0x44($sp) -/* A18B28 80242908 AFB3003C */ sw $s3, 0x3c($sp) -/* A18B2C 8024290C AFB20038 */ sw $s2, 0x38($sp) -/* A18B30 80242910 AFB10034 */ sw $s1, 0x34($sp) -/* A18B34 80242914 AFB00030 */ sw $s0, 0x30($sp) -/* A18B38 80242918 8E920148 */ lw $s2, 0x148($s4) -/* A18B3C 8024291C 86440008 */ lh $a0, 8($s2) -/* A18B40 80242920 8E90000C */ lw $s0, 0xc($s4) -/* A18B44 80242924 0C00EABB */ jal get_npc_unsafe -/* A18B48 80242928 00A0882D */ daddu $s1, $a1, $zero -/* A18B4C 8024292C 0280202D */ daddu $a0, $s4, $zero -/* A18B50 80242930 8E050000 */ lw $a1, ($s0) -/* A18B54 80242934 0C0B1EAF */ jal get_variable -/* A18B58 80242938 0040A82D */ daddu $s5, $v0, $zero -/* A18B5C 8024293C AFA00010 */ sw $zero, 0x10($sp) -/* A18B60 80242940 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B64 80242944 8C630030 */ lw $v1, 0x30($v1) -/* A18B68 80242948 AFA30014 */ sw $v1, 0x14($sp) -/* A18B6C 8024294C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B70 80242950 8C63001C */ lw $v1, 0x1c($v1) -/* A18B74 80242954 AFA30018 */ sw $v1, 0x18($sp) -/* A18B78 80242958 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B7C 8024295C 8C630024 */ lw $v1, 0x24($v1) -/* A18B80 80242960 AFA3001C */ sw $v1, 0x1c($sp) -/* A18B84 80242964 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B88 80242968 8C630028 */ lw $v1, 0x28($v1) -/* A18B8C 8024296C 27B30010 */ addiu $s3, $sp, 0x10 -/* A18B90 80242970 AFA30020 */ sw $v1, 0x20($sp) -/* A18B94 80242974 8E4300D0 */ lw $v1, 0xd0($s2) -/* A18B98 80242978 3C0142F0 */ lui $at, 0x42f0 -/* A18B9C 8024297C 44810000 */ mtc1 $at, $f0 -/* A18BA0 80242980 8C63002C */ lw $v1, 0x2c($v1) -/* A18BA4 80242984 0040802D */ daddu $s0, $v0, $zero -/* A18BA8 80242988 E7A00028 */ swc1 $f0, 0x28($sp) -/* A18BAC 8024298C A7A0002C */ sh $zero, 0x2c($sp) -/* A18BB0 80242990 12200007 */ beqz $s1, .L802429B0 -/* A18BB4 80242994 AFA30024 */ sw $v1, 0x24($sp) -/* A18BB8 80242998 02A0202D */ daddu $a0, $s5, $zero -/* A18BBC 8024299C 0240282D */ daddu $a1, $s2, $zero -/* A18BC0 802429A0 0280302D */ daddu $a2, $s4, $zero -/* A18BC4 802429A4 0C090876 */ jal func_802421D8 -/* A18BC8 802429A8 0200382D */ daddu $a3, $s0, $zero -/* A18BCC 802429AC AE800070 */ sw $zero, 0x70($s4) -.L802429B0: -/* A18BD0 802429B0 2402FFFE */ addiu $v0, $zero, -2 -/* A18BD4 802429B4 A2A200AB */ sb $v0, 0xab($s5) -/* A18BD8 802429B8 8E4300B0 */ lw $v1, 0xb0($s2) -/* A18BDC 802429BC 30620004 */ andi $v0, $v1, 4 -/* A18BE0 802429C0 10400007 */ beqz $v0, .L802429E0 -/* A18BE4 802429C4 00000000 */ nop -/* A18BE8 802429C8 824200B4 */ lb $v0, 0xb4($s2) -/* A18BEC 802429CC 1440003A */ bnez $v0, .L80242AB8 -/* A18BF0 802429D0 0000102D */ daddu $v0, $zero, $zero -/* A18BF4 802429D4 2402FFFB */ addiu $v0, $zero, -5 -/* A18BF8 802429D8 00621024 */ and $v0, $v1, $v0 -/* A18BFC 802429DC AE4200B0 */ sw $v0, 0xb0($s2) -.L802429E0: -/* A18C00 802429E0 8E830070 */ lw $v1, 0x70($s4) -/* A18C04 802429E4 2C620015 */ sltiu $v0, $v1, 0x15 -/* A18C08 802429E8 10400032 */ beqz $v0, .L80242AB4 -/* A18C0C 802429EC 00031080 */ sll $v0, $v1, 2 -/* A18C10 802429F0 3C018024 */ lui $at, 0x8024 -/* A18C14 802429F4 00220821 */ addu $at, $at, $v0 -/* A18C18 802429F8 8C224E80 */ lw $v0, 0x4e80($at) -/* A18C1C 802429FC 00400008 */ jr $v0 -/* A18C20 80242A00 00000000 */ nop -/* A18C24 80242A04 0280202D */ daddu $a0, $s4, $zero -/* A18C28 80242A08 0200282D */ daddu $a1, $s0, $zero -/* A18C2C 80242A0C 0C0903FC */ jal func_80240FF0 -/* A18C30 80242A10 0260302D */ daddu $a2, $s3, $zero -/* A18C34 80242A14 0280202D */ daddu $a0, $s4, $zero -/* A18C38 80242A18 0200282D */ daddu $a1, $s0, $zero -/* A18C3C 80242A1C 0C090468 */ jal func_802411A0 -/* A18C40 80242A20 0260302D */ daddu $a2, $s3, $zero -/* A18C44 80242A24 08090AAE */ j .L80242AB8 -/* A18C48 80242A28 0000102D */ daddu $v0, $zero, $zero -/* A18C4C 80242A2C 0280202D */ daddu $a0, $s4, $zero -/* A18C50 80242A30 0200282D */ daddu $a1, $s0, $zero -/* A18C54 80242A34 0C0905F2 */ jal func_802417C8 -/* A18C58 80242A38 0260302D */ daddu $a2, $s3, $zero -/* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero -/* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero -/* A18C64 80242A44 0C090622 */ jal func_80241888 -/* A18C68 80242A48 0260302D */ daddu $a2, $s3, $zero -/* A18C6C 80242A4C 08090AAE */ j .L80242AB8 -/* A18C70 80242A50 0000102D */ daddu $v0, $zero, $zero -/* A18C74 80242A54 0280202D */ daddu $a0, $s4, $zero -/* A18C78 80242A58 0200282D */ daddu $a1, $s0, $zero -/* A18C7C 80242A5C 0C0906F3 */ jal func_80241BCC -/* A18C80 80242A60 0260302D */ daddu $a2, $s3, $zero -/* A18C84 80242A64 0280202D */ daddu $a0, $s4, $zero -/* A18C88 80242A68 0200282D */ daddu $a1, $s0, $zero -/* A18C8C 80242A6C 0C090711 */ jal func_80241C44 -/* A18C90 80242A70 0260302D */ daddu $a2, $s3, $zero -/* A18C94 80242A74 08090AAE */ j .L80242AB8 -/* A18C98 80242A78 0000102D */ daddu $v0, $zero, $zero -/* A18C9C 80242A7C 0280202D */ daddu $a0, $s4, $zero -/* A18CA0 80242A80 0200282D */ daddu $a1, $s0, $zero -/* A18CA4 80242A84 0C09093A */ jal func_802424E8 -/* A18CA8 80242A88 0260302D */ daddu $a2, $s3, $zero -/* A18CAC 80242A8C 0280202D */ daddu $a0, $s4, $zero -/* A18CB0 80242A90 0200282D */ daddu $a1, $s0, $zero -/* A18CB4 80242A94 0C090986 */ jal func_80242618 -/* A18CB8 80242A98 0260302D */ daddu $a2, $s3, $zero -/* A18CBC 80242A9C 08090AAE */ j .L80242AB8 -/* A18CC0 80242AA0 0000102D */ daddu $v0, $zero, $zero -/* A18CC4 80242AA4 0280202D */ daddu $a0, $s4, $zero -/* A18CC8 80242AA8 0200282D */ daddu $a1, $s0, $zero -/* A18CCC 80242AAC 0C090A26 */ jal func_80242898 -/* A18CD0 80242AB0 0260302D */ daddu $a2, $s3, $zero -.L80242AB4: -/* A18CD4 80242AB4 0000102D */ daddu $v0, $zero, $zero -.L80242AB8: -/* A18CD8 80242AB8 8FBF0048 */ lw $ra, 0x48($sp) -/* A18CDC 80242ABC 8FB50044 */ lw $s5, 0x44($sp) -/* A18CE0 80242AC0 8FB40040 */ lw $s4, 0x40($sp) -/* A18CE4 80242AC4 8FB3003C */ lw $s3, 0x3c($sp) -/* A18CE8 80242AC8 8FB20038 */ lw $s2, 0x38($sp) -/* A18CEC 80242ACC 8FB10034 */ lw $s1, 0x34($sp) -/* A18CF0 80242AD0 8FB00030 */ lw $s0, 0x30($sp) -/* A18CF4 80242AD4 03E00008 */ jr $ra -/* A18CF8 80242AD8 27BD0050 */ addiu $sp, $sp, 0x50 -/* A18CFC 80242ADC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s new file mode 100644 index 0000000000..1b2999fc87 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_02/A17210/func_802428F4_A18B14.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428F4_A18B14 +/* A18B14 802428F4 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A18B18 802428F8 AFB40040 */ sw $s4, 0x40($sp) +/* A18B1C 802428FC 0080A02D */ daddu $s4, $a0, $zero +/* A18B20 80242900 AFBF0048 */ sw $ra, 0x48($sp) +/* A18B24 80242904 AFB50044 */ sw $s5, 0x44($sp) +/* A18B28 80242908 AFB3003C */ sw $s3, 0x3c($sp) +/* A18B2C 8024290C AFB20038 */ sw $s2, 0x38($sp) +/* A18B30 80242910 AFB10034 */ sw $s1, 0x34($sp) +/* A18B34 80242914 AFB00030 */ sw $s0, 0x30($sp) +/* A18B38 80242918 8E920148 */ lw $s2, 0x148($s4) +/* A18B3C 8024291C 86440008 */ lh $a0, 8($s2) +/* A18B40 80242920 8E90000C */ lw $s0, 0xc($s4) +/* A18B44 80242924 0C00EABB */ jal get_npc_unsafe +/* A18B48 80242928 00A0882D */ daddu $s1, $a1, $zero +/* A18B4C 8024292C 0280202D */ daddu $a0, $s4, $zero +/* A18B50 80242930 8E050000 */ lw $a1, ($s0) +/* A18B54 80242934 0C0B1EAF */ jal get_variable +/* A18B58 80242938 0040A82D */ daddu $s5, $v0, $zero +/* A18B5C 8024293C AFA00010 */ sw $zero, 0x10($sp) +/* A18B60 80242940 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B64 80242944 8C630030 */ lw $v1, 0x30($v1) +/* A18B68 80242948 AFA30014 */ sw $v1, 0x14($sp) +/* A18B6C 8024294C 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B70 80242950 8C63001C */ lw $v1, 0x1c($v1) +/* A18B74 80242954 AFA30018 */ sw $v1, 0x18($sp) +/* A18B78 80242958 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B7C 8024295C 8C630024 */ lw $v1, 0x24($v1) +/* A18B80 80242960 AFA3001C */ sw $v1, 0x1c($sp) +/* A18B84 80242964 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B88 80242968 8C630028 */ lw $v1, 0x28($v1) +/* A18B8C 8024296C 27B30010 */ addiu $s3, $sp, 0x10 +/* A18B90 80242970 AFA30020 */ sw $v1, 0x20($sp) +/* A18B94 80242974 8E4300D0 */ lw $v1, 0xd0($s2) +/* A18B98 80242978 3C0142F0 */ lui $at, 0x42f0 +/* A18B9C 8024297C 44810000 */ mtc1 $at, $f0 +/* A18BA0 80242980 8C63002C */ lw $v1, 0x2c($v1) +/* A18BA4 80242984 0040802D */ daddu $s0, $v0, $zero +/* A18BA8 80242988 E7A00028 */ swc1 $f0, 0x28($sp) +/* A18BAC 8024298C A7A0002C */ sh $zero, 0x2c($sp) +/* A18BB0 80242990 12200007 */ beqz $s1, .L802429B0 +/* A18BB4 80242994 AFA30024 */ sw $v1, 0x24($sp) +/* A18BB8 80242998 02A0202D */ daddu $a0, $s5, $zero +/* A18BBC 8024299C 0240282D */ daddu $a1, $s2, $zero +/* A18BC0 802429A0 0280302D */ daddu $a2, $s4, $zero +/* A18BC4 802429A4 0C090876 */ jal func_802421D8_A183F8 +/* A18BC8 802429A8 0200382D */ daddu $a3, $s0, $zero +/* A18BCC 802429AC AE800070 */ sw $zero, 0x70($s4) +.L802429B0: +/* A18BD0 802429B0 2402FFFE */ addiu $v0, $zero, -2 +/* A18BD4 802429B4 A2A200AB */ sb $v0, 0xab($s5) +/* A18BD8 802429B8 8E4300B0 */ lw $v1, 0xb0($s2) +/* A18BDC 802429BC 30620004 */ andi $v0, $v1, 4 +/* A18BE0 802429C0 10400007 */ beqz $v0, .L802429E0 +/* A18BE4 802429C4 00000000 */ nop +/* A18BE8 802429C8 824200B4 */ lb $v0, 0xb4($s2) +/* A18BEC 802429CC 1440003A */ bnez $v0, .L80242AB8 +/* A18BF0 802429D0 0000102D */ daddu $v0, $zero, $zero +/* A18BF4 802429D4 2402FFFB */ addiu $v0, $zero, -5 +/* A18BF8 802429D8 00621024 */ and $v0, $v1, $v0 +/* A18BFC 802429DC AE4200B0 */ sw $v0, 0xb0($s2) +.L802429E0: +/* A18C00 802429E0 8E830070 */ lw $v1, 0x70($s4) +/* A18C04 802429E4 2C620015 */ sltiu $v0, $v1, 0x15 +/* A18C08 802429E8 10400032 */ beqz $v0, .L80242AB4 +/* A18C0C 802429EC 00031080 */ sll $v0, $v1, 2 +/* A18C10 802429F0 3C018024 */ lui $at, 0x8024 +/* A18C14 802429F4 00220821 */ addu $at, $at, $v0 +/* A18C18 802429F8 8C224E80 */ lw $v0, 0x4e80($at) +/* A18C1C 802429FC 00400008 */ jr $v0 +/* A18C20 80242A00 00000000 */ nop +/* A18C24 80242A04 0280202D */ daddu $a0, $s4, $zero +/* A18C28 80242A08 0200282D */ daddu $a1, $s0, $zero +/* A18C2C 80242A0C 0C0903FC */ jal func_80240FF0_A17210 +/* A18C30 80242A10 0260302D */ daddu $a2, $s3, $zero +/* A18C34 80242A14 0280202D */ daddu $a0, $s4, $zero +/* A18C38 80242A18 0200282D */ daddu $a1, $s0, $zero +/* A18C3C 80242A1C 0C090468 */ jal func_802411A0_A173C0 +/* A18C40 80242A20 0260302D */ daddu $a2, $s3, $zero +/* A18C44 80242A24 08090AAE */ j .L80242AB8 +/* A18C48 80242A28 0000102D */ daddu $v0, $zero, $zero +/* A18C4C 80242A2C 0280202D */ daddu $a0, $s4, $zero +/* A18C50 80242A30 0200282D */ daddu $a1, $s0, $zero +/* A18C54 80242A34 0C0905F2 */ jal func_802417C8_A179E8 +/* A18C58 80242A38 0260302D */ daddu $a2, $s3, $zero +/* A18C5C 80242A3C 0280202D */ daddu $a0, $s4, $zero +/* A18C60 80242A40 0200282D */ daddu $a1, $s0, $zero +/* A18C64 80242A44 0C090622 */ jal func_80241888_A17AA8 +/* A18C68 80242A48 0260302D */ daddu $a2, $s3, $zero +/* A18C6C 80242A4C 08090AAE */ j .L80242AB8 +/* A18C70 80242A50 0000102D */ daddu $v0, $zero, $zero +/* A18C74 80242A54 0280202D */ daddu $a0, $s4, $zero +/* A18C78 80242A58 0200282D */ daddu $a1, $s0, $zero +/* A18C7C 80242A5C 0C0906F3 */ jal func_80241BCC_A17DEC +/* A18C80 80242A60 0260302D */ daddu $a2, $s3, $zero +/* A18C84 80242A64 0280202D */ daddu $a0, $s4, $zero +/* A18C88 80242A68 0200282D */ daddu $a1, $s0, $zero +/* A18C8C 80242A6C 0C090711 */ jal func_80241C44_A17E64 +/* A18C90 80242A70 0260302D */ daddu $a2, $s3, $zero +/* A18C94 80242A74 08090AAE */ j .L80242AB8 +/* A18C98 80242A78 0000102D */ daddu $v0, $zero, $zero +/* A18C9C 80242A7C 0280202D */ daddu $a0, $s4, $zero +/* A18CA0 80242A80 0200282D */ daddu $a1, $s0, $zero +/* A18CA4 80242A84 0C09093A */ jal func_802424E8_A18708 +/* A18CA8 80242A88 0260302D */ daddu $a2, $s3, $zero +/* A18CAC 80242A8C 0280202D */ daddu $a0, $s4, $zero +/* A18CB0 80242A90 0200282D */ daddu $a1, $s0, $zero +/* A18CB4 80242A94 0C090986 */ jal func_80242618_A18838 +/* A18CB8 80242A98 0260302D */ daddu $a2, $s3, $zero +/* A18CBC 80242A9C 08090AAE */ j .L80242AB8 +/* A18CC0 80242AA0 0000102D */ daddu $v0, $zero, $zero +/* A18CC4 80242AA4 0280202D */ daddu $a0, $s4, $zero +/* A18CC8 80242AA8 0200282D */ daddu $a1, $s0, $zero +/* A18CCC 80242AAC 0C090A26 */ jal func_80242898_A18AB8 +/* A18CD0 80242AB0 0260302D */ daddu $a2, $s3, $zero +.L80242AB4: +/* A18CD4 80242AB4 0000102D */ daddu $v0, $zero, $zero +.L80242AB8: +/* A18CD8 80242AB8 8FBF0048 */ lw $ra, 0x48($sp) +/* A18CDC 80242ABC 8FB50044 */ lw $s5, 0x44($sp) +/* A18CE0 80242AC0 8FB40040 */ lw $s4, 0x40($sp) +/* A18CE4 80242AC4 8FB3003C */ lw $s3, 0x3c($sp) +/* A18CE8 80242AC8 8FB20038 */ lw $s2, 0x38($sp) +/* A18CEC 80242ACC 8FB10034 */ lw $s1, 0x34($sp) +/* A18CF0 80242AD0 8FB00030 */ lw $s0, 0x30($sp) +/* A18CF4 80242AD4 03E00008 */ jr $ra +/* A18CF8 80242AD8 27BD0050 */ addiu $sp, $sp, 0x50 +/* A18CFC 80242ADC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8.s deleted file mode 100644 index 20eb42656d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8.s +++ /dev/null @@ -1,87 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407E8 -/* A1B8E8 802407E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A1B8EC 802407EC 0000202D */ daddu $a0, $zero, $zero -/* A1B8F0 802407F0 27A50010 */ addiu $a1, $sp, 0x10 -/* A1B8F4 802407F4 27A60014 */ addiu $a2, $sp, 0x14 -/* A1B8F8 802407F8 27A70018 */ addiu $a3, $sp, 0x18 -/* A1B8FC 802407FC AFBF0034 */ sw $ra, 0x34($sp) -/* A1B900 80240800 AFB40030 */ sw $s4, 0x30($sp) -/* A1B904 80240804 AFB3002C */ sw $s3, 0x2c($sp) -/* A1B908 80240808 AFB20028 */ sw $s2, 0x28($sp) -/* A1B90C 8024080C AFB10024 */ sw $s1, 0x24($sp) -/* A1B910 80240810 0C0470AC */ jal func_8011C2B0 -/* A1B914 80240814 AFB00020 */ sw $s0, 0x20($sp) -/* A1B918 80240818 8FA20018 */ lw $v0, 0x18($sp) -/* A1B91C 8024081C 1840002A */ blez $v0, .L802408C8 -/* A1B920 80240820 0000802D */ daddu $s0, $zero, $zero -/* A1B924 80240824 3C145555 */ lui $s4, 0x5555 -/* A1B928 80240828 36945556 */ ori $s4, $s4, 0x5556 -/* A1B92C 8024082C 0200982D */ daddu $s3, $s0, $zero -.L80240830: -/* A1B930 80240830 02140018 */ mult $s0, $s4 -/* A1B934 80240834 00101FC3 */ sra $v1, $s0, 0x1f -/* A1B938 80240838 00004810 */ mfhi $t1 -/* A1B93C 8024083C 01231823 */ subu $v1, $t1, $v1 -/* A1B940 80240840 00031040 */ sll $v0, $v1, 1 -/* A1B944 80240844 00431021 */ addu $v0, $v0, $v1 -/* A1B948 80240848 02021023 */ subu $v0, $s0, $v0 -/* A1B94C 8024084C 3C038024 */ lui $v1, 0x8024 -/* A1B950 80240850 94633BD2 */ lhu $v1, 0x3bd2($v1) -/* A1B954 80240854 24420001 */ addiu $v0, $v0, 1 -/* A1B958 80240858 00620018 */ mult $v1, $v0 -/* A1B95C 8024085C 8FA20014 */ lw $v0, 0x14($sp) -/* A1B960 80240860 00102900 */ sll $a1, $s0, 4 -/* A1B964 80240864 00459021 */ addu $s2, $v0, $a1 -/* A1B968 80240868 00001812 */ mflo $v1 -/* A1B96C 8024086C 00732021 */ addu $a0, $v1, $s3 -/* A1B970 80240870 8FA30010 */ lw $v1, 0x10($sp) -/* A1B974 80240874 3084FFFF */ andi $a0, $a0, 0xffff -/* A1B978 80240878 0C01917C */ jal sins -/* A1B97C 8024087C 00658821 */ addu $s1, $v1, $a1 -/* A1B980 80240880 00021400 */ sll $v0, $v0, 0x10 -/* A1B984 80240884 00021403 */ sra $v0, $v0, 0x10 -/* A1B988 80240888 00021840 */ sll $v1, $v0, 1 -/* A1B98C 8024088C 00621821 */ addu $v1, $v1, $v0 -/* A1B990 80240890 000318C0 */ sll $v1, $v1, 3 -/* A1B994 80240894 00621821 */ addu $v1, $v1, $v0 -/* A1B998 80240898 00031040 */ sll $v0, $v1, 1 -/* A1B99C 8024089C 04420001 */ bltzl $v0, .L802408A4 -/* A1B9A0 802408A0 24427FFF */ addiu $v0, $v0, 0x7fff -.L802408A4: -/* A1B9A4 802408A4 26732AAA */ addiu $s3, $s3, 0x2aaa -/* A1B9A8 802408A8 26100001 */ addiu $s0, $s0, 1 -/* A1B9AC 802408AC 000213C3 */ sra $v0, $v0, 0xf -/* A1B9B0 802408B0 96230002 */ lhu $v1, 2($s1) -/* A1B9B4 802408B4 8FA40018 */ lw $a0, 0x18($sp) -/* A1B9B8 802408B8 00621821 */ addu $v1, $v1, $v0 -/* A1B9BC 802408BC 0204202A */ slt $a0, $s0, $a0 -/* A1B9C0 802408C0 1480FFDB */ bnez $a0, .L80240830 -/* A1B9C4 802408C4 A6430002 */ sh $v1, 2($s2) -.L802408C8: -/* A1B9C8 802408C8 3C03800A */ lui $v1, 0x800a -/* A1B9CC 802408CC 2463A66C */ addiu $v1, $v1, -0x5994 -/* A1B9D0 802408D0 8C620000 */ lw $v0, ($v1) -/* A1B9D4 802408D4 0000202D */ daddu $a0, $zero, $zero -/* A1B9D8 802408D8 0040802D */ daddu $s0, $v0, $zero -/* A1B9DC 802408DC 24420008 */ addiu $v0, $v0, 8 -/* A1B9E0 802408E0 AC620000 */ sw $v0, ($v1) -/* A1B9E4 802408E4 3C02DE00 */ lui $v0, 0xde00 -/* A1B9E8 802408E8 0C0470BB */ jal func_8011C2EC -/* A1B9EC 802408EC AE020000 */ sw $v0, ($s0) -/* A1B9F0 802408F0 3C048024 */ lui $a0, 0x8024 -/* A1B9F4 802408F4 24843BD2 */ addiu $a0, $a0, 0x3bd2 -/* A1B9F8 802408F8 94830000 */ lhu $v1, ($a0) -/* A1B9FC 802408FC AE020004 */ sw $v0, 4($s0) -/* A1BA00 80240900 246300A3 */ addiu $v1, $v1, 0xa3 -/* A1BA04 80240904 A4830000 */ sh $v1, ($a0) -/* A1BA08 80240908 8FBF0034 */ lw $ra, 0x34($sp) -/* A1BA0C 8024090C 8FB40030 */ lw $s4, 0x30($sp) -/* A1BA10 80240910 8FB3002C */ lw $s3, 0x2c($sp) -/* A1BA14 80240914 8FB20028 */ lw $s2, 0x28($sp) -/* A1BA18 80240918 8FB10024 */ lw $s1, 0x24($sp) -/* A1BA1C 8024091C 8FB00020 */ lw $s0, 0x20($sp) -/* A1BA20 80240920 03E00008 */ jr $ra -/* A1BA24 80240924 27BD0038 */ addiu $sp, $sp, 0x38 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 new file mode 100644 index 0000000000..05d33e034b --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_802407E8_A1B8E8.s @@ -0,0 +1,87 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407E8_A1B8E8 +/* A1B8E8 802407E8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A1B8EC 802407EC 0000202D */ daddu $a0, $zero, $zero +/* A1B8F0 802407F0 27A50010 */ addiu $a1, $sp, 0x10 +/* A1B8F4 802407F4 27A60014 */ addiu $a2, $sp, 0x14 +/* A1B8F8 802407F8 27A70018 */ addiu $a3, $sp, 0x18 +/* A1B8FC 802407FC AFBF0034 */ sw $ra, 0x34($sp) +/* A1B900 80240800 AFB40030 */ sw $s4, 0x30($sp) +/* A1B904 80240804 AFB3002C */ sw $s3, 0x2c($sp) +/* A1B908 80240808 AFB20028 */ sw $s2, 0x28($sp) +/* A1B90C 8024080C AFB10024 */ sw $s1, 0x24($sp) +/* A1B910 80240810 0C0470AC */ jal func_8011C2B0 +/* A1B914 80240814 AFB00020 */ sw $s0, 0x20($sp) +/* A1B918 80240818 8FA20018 */ lw $v0, 0x18($sp) +/* A1B91C 8024081C 1840002A */ blez $v0, .L802408C8 +/* A1B920 80240820 0000802D */ daddu $s0, $zero, $zero +/* A1B924 80240824 3C145555 */ lui $s4, 0x5555 +/* A1B928 80240828 36945556 */ ori $s4, $s4, 0x5556 +/* A1B92C 8024082C 0200982D */ daddu $s3, $s0, $zero +.L80240830: +/* A1B930 80240830 02140018 */ mult $s0, $s4 +/* A1B934 80240834 00101FC3 */ sra $v1, $s0, 0x1f +/* A1B938 80240838 00004810 */ mfhi $t1 +/* A1B93C 8024083C 01231823 */ subu $v1, $t1, $v1 +/* A1B940 80240840 00031040 */ sll $v0, $v1, 1 +/* A1B944 80240844 00431021 */ addu $v0, $v0, $v1 +/* A1B948 80240848 02021023 */ subu $v0, $s0, $v0 +/* A1B94C 8024084C 3C038024 */ lui $v1, 0x8024 +/* A1B950 80240850 94633BD2 */ lhu $v1, 0x3bd2($v1) +/* A1B954 80240854 24420001 */ addiu $v0, $v0, 1 +/* A1B958 80240858 00620018 */ mult $v1, $v0 +/* A1B95C 8024085C 8FA20014 */ lw $v0, 0x14($sp) +/* A1B960 80240860 00102900 */ sll $a1, $s0, 4 +/* A1B964 80240864 00459021 */ addu $s2, $v0, $a1 +/* A1B968 80240868 00001812 */ mflo $v1 +/* A1B96C 8024086C 00732021 */ addu $a0, $v1, $s3 +/* A1B970 80240870 8FA30010 */ lw $v1, 0x10($sp) +/* A1B974 80240874 3084FFFF */ andi $a0, $a0, 0xffff +/* A1B978 80240878 0C01917C */ jal sins +/* A1B97C 8024087C 00658821 */ addu $s1, $v1, $a1 +/* A1B980 80240880 00021400 */ sll $v0, $v0, 0x10 +/* A1B984 80240884 00021403 */ sra $v0, $v0, 0x10 +/* A1B988 80240888 00021840 */ sll $v1, $v0, 1 +/* A1B98C 8024088C 00621821 */ addu $v1, $v1, $v0 +/* A1B990 80240890 000318C0 */ sll $v1, $v1, 3 +/* A1B994 80240894 00621821 */ addu $v1, $v1, $v0 +/* A1B998 80240898 00031040 */ sll $v0, $v1, 1 +/* A1B99C 8024089C 04420001 */ bltzl $v0, .L802408A4 +/* A1B9A0 802408A0 24427FFF */ addiu $v0, $v0, 0x7fff +.L802408A4: +/* A1B9A4 802408A4 26732AAA */ addiu $s3, $s3, 0x2aaa +/* A1B9A8 802408A8 26100001 */ addiu $s0, $s0, 1 +/* A1B9AC 802408AC 000213C3 */ sra $v0, $v0, 0xf +/* A1B9B0 802408B0 96230002 */ lhu $v1, 2($s1) +/* A1B9B4 802408B4 8FA40018 */ lw $a0, 0x18($sp) +/* A1B9B8 802408B8 00621821 */ addu $v1, $v1, $v0 +/* A1B9BC 802408BC 0204202A */ slt $a0, $s0, $a0 +/* A1B9C0 802408C0 1480FFDB */ bnez $a0, .L80240830 +/* A1B9C4 802408C4 A6430002 */ sh $v1, 2($s2) +.L802408C8: +/* A1B9C8 802408C8 3C03800A */ lui $v1, 0x800a +/* A1B9CC 802408CC 2463A66C */ addiu $v1, $v1, -0x5994 +/* A1B9D0 802408D0 8C620000 */ lw $v0, ($v1) +/* A1B9D4 802408D4 0000202D */ daddu $a0, $zero, $zero +/* A1B9D8 802408D8 0040802D */ daddu $s0, $v0, $zero +/* A1B9DC 802408DC 24420008 */ addiu $v0, $v0, 8 +/* A1B9E0 802408E0 AC620000 */ sw $v0, ($v1) +/* A1B9E4 802408E4 3C02DE00 */ lui $v0, 0xde00 +/* A1B9E8 802408E8 0C0470BB */ jal func_8011C2EC +/* A1B9EC 802408EC AE020000 */ sw $v0, ($s0) +/* A1B9F0 802408F0 3C048024 */ lui $a0, 0x8024 +/* A1B9F4 802408F4 24843BD2 */ addiu $a0, $a0, 0x3bd2 +/* A1B9F8 802408F8 94830000 */ lhu $v1, ($a0) +/* A1B9FC 802408FC AE020004 */ sw $v0, 4($s0) +/* A1BA00 80240900 246300A3 */ addiu $v1, $v1, 0xa3 +/* A1BA04 80240904 A4830000 */ sh $v1, ($a0) +/* A1BA08 80240908 8FBF0034 */ lw $ra, 0x34($sp) +/* A1BA0C 8024090C 8FB40030 */ lw $s4, 0x30($sp) +/* A1BA10 80240910 8FB3002C */ lw $s3, 0x2c($sp) +/* A1BA14 80240914 8FB20028 */ lw $s2, 0x28($sp) +/* A1BA18 80240918 8FB10024 */ lw $s1, 0x24($sp) +/* A1BA1C 8024091C 8FB00020 */ lw $s0, 0x20($sp) +/* A1BA20 80240920 03E00008 */ jr $ra +/* A1BA24 80240924 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928.s deleted file mode 100644 index fe1977e872..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240928 -/* A1BA28 80240928 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1BA2C 8024092C AFB10014 */ sw $s1, 0x14($sp) -/* A1BA30 80240930 3C118024 */ lui $s1, 0x8024 -/* A1BA34 80240934 26313BD4 */ addiu $s1, $s1, 0x3bd4 -/* A1BA38 80240938 AFBF0020 */ sw $ra, 0x20($sp) -/* A1BA3C 8024093C AFB3001C */ sw $s3, 0x1c($sp) -/* A1BA40 80240940 AFB20018 */ sw $s2, 0x18($sp) -/* A1BA44 80240944 AFB00010 */ sw $s0, 0x10($sp) -/* A1BA48 80240948 96240000 */ lhu $a0, ($s1) -/* A1BA4C 8024094C 0C01917C */ jal sins -/* A1BA50 80240950 3C130001 */ lui $s3, 1 -/* A1BA54 80240954 00021400 */ sll $v0, $v0, 0x10 -/* A1BA58 80240958 00021403 */ sra $v0, $v0, 0x10 -/* A1BA5C 8024095C 3C013800 */ lui $at, 0x3800 -/* A1BA60 80240960 44811000 */ mtc1 $at, $f2 -/* A1BA64 80240964 44820000 */ mtc1 $v0, $f0 -/* A1BA68 80240968 00000000 */ nop -/* A1BA6C 8024096C 46800020 */ cvt.s.w $f0, $f0 -/* A1BA70 80240970 46020002 */ mul.s $f0, $f0, $f2 -/* 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 -/* A1BA90 80240990 36731630 */ ori $s3, $s3, 0x1630 -/* A1BA94 80240994 46220002 */ mul.d $f0, $f0, $f2 -/* A1BA98 80240998 00000000 */ nop -/* A1BA9C 8024099C 3C12800A */ lui $s2, 0x800a -/* A1BAA0 802409A0 2652A674 */ addiu $s2, $s2, -0x598c -/* A1BAA4 802409A4 3C108007 */ lui $s0, 0x8007 -/* A1BAA8 802409A8 261041F0 */ addiu $s0, $s0, 0x41f0 -/* A1BAAC 802409AC 96040000 */ lhu $a0, ($s0) -/* A1BAB0 802409B0 8E420000 */ lw $v0, ($s2) -/* A1BAB4 802409B4 00042180 */ sll $a0, $a0, 6 -/* A1BAB8 802409B8 3C018025 */ lui $at, 0x8025 -/* A1BABC 802409BC D422BD60 */ ldc1 $f2, -0x42a0($at) -/* A1BAC0 802409C0 00932021 */ addu $a0, $a0, $s3 -/* A1BAC4 802409C4 46220000 */ add.d $f0, $f0, $f2 -/* A1BAC8 802409C8 00442021 */ addu $a0, $v0, $a0 -/* A1BACC 802409CC 96220000 */ lhu $v0, ($s1) -/* A1BAD0 802409D0 46200020 */ cvt.s.d $f0, $f0 -/* A1BAD4 802409D4 44050000 */ mfc1 $a1, $f0 -/* A1BAD8 802409D8 24420199 */ addiu $v0, $v0, 0x199 -/* A1BADC 802409DC A6220000 */ sh $v0, ($s1) -/* A1BAE0 802409E0 00A0302D */ daddu $a2, $a1, $zero -/* A1BAE4 802409E4 0C019DC0 */ jal guScale -/* A1BAE8 802409E8 00A0382D */ daddu $a3, $a1, $zero -/* A1BAEC 802409EC 3C05DA38 */ lui $a1, 0xda38 -/* A1BAF0 802409F0 3C04800A */ lui $a0, 0x800a -/* A1BAF4 802409F4 2484A66C */ addiu $a0, $a0, -0x5994 -/* A1BAF8 802409F8 34A50001 */ ori $a1, $a1, 1 -/* A1BAFC 802409FC 8C830000 */ lw $v1, ($a0) -/* A1BB00 80240A00 96020000 */ lhu $v0, ($s0) -/* A1BB04 80240A04 0060302D */ daddu $a2, $v1, $zero -/* A1BB08 80240A08 24630008 */ addiu $v1, $v1, 8 -/* A1BB0C 80240A0C AC830000 */ sw $v1, ($a0) -/* A1BB10 80240A10 24430001 */ addiu $v1, $v0, 1 -/* A1BB14 80240A14 3042FFFF */ andi $v0, $v0, 0xffff -/* A1BB18 80240A18 00021180 */ sll $v0, $v0, 6 -/* A1BB1C 80240A1C ACC50000 */ sw $a1, ($a2) -/* A1BB20 80240A20 A6030000 */ sh $v1, ($s0) -/* A1BB24 80240A24 8E430000 */ lw $v1, ($s2) -/* A1BB28 80240A28 00531021 */ addu $v0, $v0, $s3 -/* A1BB2C 80240A2C 00621821 */ addu $v1, $v1, $v0 -/* A1BB30 80240A30 ACC30004 */ sw $v1, 4($a2) -/* A1BB34 80240A34 8FBF0020 */ lw $ra, 0x20($sp) -/* A1BB38 80240A38 8FB3001C */ lw $s3, 0x1c($sp) -/* A1BB3C 80240A3C 8FB20018 */ lw $s2, 0x18($sp) -/* A1BB40 80240A40 8FB10014 */ lw $s1, 0x14($sp) -/* A1BB44 80240A44 8FB00010 */ lw $s0, 0x10($sp) -/* A1BB48 80240A48 03E00008 */ jr $ra -/* A1BB4C 80240A4C 27BD0028 */ addiu $sp, $sp, 0x28 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 new file mode 100644 index 0000000000..69cdd1b0cf --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240928_A1BA28.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240928_A1BA28 +/* A1BA28 80240928 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A1BA2C 8024092C AFB10014 */ sw $s1, 0x14($sp) +/* A1BA30 80240930 3C118024 */ lui $s1, 0x8024 +/* A1BA34 80240934 26313BD4 */ addiu $s1, $s1, 0x3bd4 +/* A1BA38 80240938 AFBF0020 */ sw $ra, 0x20($sp) +/* A1BA3C 8024093C AFB3001C */ sw $s3, 0x1c($sp) +/* A1BA40 80240940 AFB20018 */ sw $s2, 0x18($sp) +/* A1BA44 80240944 AFB00010 */ sw $s0, 0x10($sp) +/* A1BA48 80240948 96240000 */ lhu $a0, ($s1) +/* A1BA4C 8024094C 0C01917C */ jal sins +/* A1BA50 80240950 3C130001 */ lui $s3, 1 +/* A1BA54 80240954 00021400 */ sll $v0, $v0, 0x10 +/* A1BA58 80240958 00021403 */ sra $v0, $v0, 0x10 +/* A1BA5C 8024095C 3C013800 */ lui $at, 0x3800 +/* A1BA60 80240960 44811000 */ mtc1 $at, $f2 +/* A1BA64 80240964 44820000 */ mtc1 $v0, $f0 +/* A1BA68 80240968 00000000 */ nop +/* A1BA6C 8024096C 46800020 */ cvt.s.w $f0, $f0 +/* A1BA70 80240970 46020002 */ mul.s $f0, $f0, $f2 +/* 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 +/* A1BA90 80240990 36731630 */ ori $s3, $s3, 0x1630 +/* A1BA94 80240994 46220002 */ mul.d $f0, $f0, $f2 +/* A1BA98 80240998 00000000 */ nop +/* A1BA9C 8024099C 3C12800A */ lui $s2, 0x800a +/* A1BAA0 802409A0 2652A674 */ addiu $s2, $s2, -0x598c +/* A1BAA4 802409A4 3C108007 */ lui $s0, 0x8007 +/* A1BAA8 802409A8 261041F0 */ addiu $s0, $s0, 0x41f0 +/* A1BAAC 802409AC 96040000 */ lhu $a0, ($s0) +/* A1BAB0 802409B0 8E420000 */ lw $v0, ($s2) +/* A1BAB4 802409B4 00042180 */ sll $a0, $a0, 6 +/* A1BAB8 802409B8 3C018025 */ lui $at, 0x8025 +/* A1BABC 802409BC D422BD60 */ ldc1 $f2, -0x42a0($at) +/* A1BAC0 802409C0 00932021 */ addu $a0, $a0, $s3 +/* A1BAC4 802409C4 46220000 */ add.d $f0, $f0, $f2 +/* A1BAC8 802409C8 00442021 */ addu $a0, $v0, $a0 +/* A1BACC 802409CC 96220000 */ lhu $v0, ($s1) +/* A1BAD0 802409D0 46200020 */ cvt.s.d $f0, $f0 +/* A1BAD4 802409D4 44050000 */ mfc1 $a1, $f0 +/* A1BAD8 802409D8 24420199 */ addiu $v0, $v0, 0x199 +/* A1BADC 802409DC A6220000 */ sh $v0, ($s1) +/* A1BAE0 802409E0 00A0302D */ daddu $a2, $a1, $zero +/* A1BAE4 802409E4 0C019DC0 */ jal guScale +/* A1BAE8 802409E8 00A0382D */ daddu $a3, $a1, $zero +/* A1BAEC 802409EC 3C05DA38 */ lui $a1, 0xda38 +/* A1BAF0 802409F0 3C04800A */ lui $a0, 0x800a +/* A1BAF4 802409F4 2484A66C */ addiu $a0, $a0, -0x5994 +/* A1BAF8 802409F8 34A50001 */ ori $a1, $a1, 1 +/* A1BAFC 802409FC 8C830000 */ lw $v1, ($a0) +/* A1BB00 80240A00 96020000 */ lhu $v0, ($s0) +/* A1BB04 80240A04 0060302D */ daddu $a2, $v1, $zero +/* A1BB08 80240A08 24630008 */ addiu $v1, $v1, 8 +/* A1BB0C 80240A0C AC830000 */ sw $v1, ($a0) +/* A1BB10 80240A10 24430001 */ addiu $v1, $v0, 1 +/* A1BB14 80240A14 3042FFFF */ andi $v0, $v0, 0xffff +/* A1BB18 80240A18 00021180 */ sll $v0, $v0, 6 +/* A1BB1C 80240A1C ACC50000 */ sw $a1, ($a2) +/* A1BB20 80240A20 A6030000 */ sh $v1, ($s0) +/* A1BB24 80240A24 8E430000 */ lw $v1, ($s2) +/* A1BB28 80240A28 00531021 */ addu $v0, $v0, $s3 +/* A1BB2C 80240A2C 00621821 */ addu $v1, $v1, $v0 +/* A1BB30 80240A30 ACC30004 */ sw $v1, 4($a2) +/* A1BB34 80240A34 8FBF0020 */ lw $ra, 0x20($sp) +/* A1BB38 80240A38 8FB3001C */ lw $s3, 0x1c($sp) +/* A1BB3C 80240A3C 8FB20018 */ lw $s2, 0x18($sp) +/* A1BB40 80240A40 8FB10014 */ lw $s1, 0x14($sp) +/* A1BB44 80240A44 8FB00010 */ lw $s0, 0x10($sp) +/* A1BB48 80240A48 03E00008 */ jr $ra +/* A1BB4C 80240A4C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50.s deleted file mode 100644 index d3efbcc986..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A50 -/* A1BB50 80240A50 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A1BB54 80240A54 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A1BB58 80240A58 8442008E */ lh $v0, 0x8e($v0) -/* A1BB5C 80240A5C AC820084 */ sw $v0, 0x84($a0) -/* A1BB60 80240A60 03E00008 */ jr $ra -/* A1BB64 80240A64 24020002 */ addiu $v0, $zero, 2 -/* A1BB68 80240A68 00000000 */ nop -/* A1BB6C 80240A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s new file mode 100644 index 0000000000..1de1756e06 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1B130/func_80240A50_A1BB50.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A50_A1BB50 +/* A1BB50 80240A50 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* A1BB54 80240A54 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* A1BB58 80240A58 8442008E */ lh $v0, 0x8e($v0) +/* A1BB5C 80240A5C AC820084 */ sw $v0, 0x84($a0) +/* A1BB60 80240A60 03E00008 */ jr $ra +/* A1BB64 80240A64 24020002 */ addiu $v0, $zero, 2 +/* A1BB68 80240A68 00000000 */ nop +/* A1BB6C 80240A6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BB70/func_80240AE0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BB70/func_80240AE0.s deleted file mode 100644 index d6279a7a12..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BB70/func_80240AE0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE0 -/* A1BBE0 80240AE0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* A1BBE4 80240AE4 AFB10054 */ sw $s1, 0x54($sp) -/* A1BBE8 80240AE8 0080882D */ daddu $s1, $a0, $zero -/* A1BBEC 80240AEC AFBF005C */ sw $ra, 0x5c($sp) -/* A1BBF0 80240AF0 AFB20058 */ sw $s2, 0x58($sp) -/* A1BBF4 80240AF4 AFB00050 */ sw $s0, 0x50($sp) -/* A1BBF8 80240AF8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* A1BBFC 80240AFC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A1BC00 80240B00 F7B80070 */ sdc1 $f24, 0x70($sp) -/* A1BC04 80240B04 F7B60068 */ sdc1 $f22, 0x68($sp) -/* A1BC08 80240B08 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A1BC0C 80240B0C 8E30000C */ lw $s0, 0xc($s1) -/* A1BC10 80240B10 8E050000 */ lw $a1, ($s0) -/* A1BC14 80240B14 0C0B1EAF */ jal get_variable -/* A1BC18 80240B18 26100004 */ addiu $s0, $s0, 4 -/* A1BC1C 80240B1C 0C046C04 */ jal get_model_list_index_from_tree_index -/* A1BC20 80240B20 0040202D */ daddu $a0, $v0, $zero -/* A1BC24 80240B24 8E050000 */ lw $a1, ($s0) -/* A1BC28 80240B28 26100004 */ addiu $s0, $s0, 4 -/* A1BC2C 80240B2C 0220202D */ daddu $a0, $s1, $zero -/* A1BC30 80240B30 0C0B210B */ jal get_float_variable -/* A1BC34 80240B34 0040902D */ daddu $s2, $v0, $zero -/* A1BC38 80240B38 8E050000 */ lw $a1, ($s0) -/* A1BC3C 80240B3C 26100004 */ addiu $s0, $s0, 4 -/* A1BC40 80240B40 0220202D */ daddu $a0, $s1, $zero -/* A1BC44 80240B44 0C0B210B */ jal get_float_variable -/* A1BC48 80240B48 46000706 */ mov.s $f28, $f0 -/* A1BC4C 80240B4C 8E050000 */ lw $a1, ($s0) -/* A1BC50 80240B50 26100004 */ addiu $s0, $s0, 4 -/* A1BC54 80240B54 0220202D */ daddu $a0, $s1, $zero -/* A1BC58 80240B58 0C0B210B */ jal get_float_variable -/* A1BC5C 80240B5C 46000686 */ mov.s $f26, $f0 -/* A1BC60 80240B60 0220202D */ daddu $a0, $s1, $zero -/* A1BC64 80240B64 8E050000 */ lw $a1, ($s0) -/* A1BC68 80240B68 0C0B210B */ jal get_float_variable -/* A1BC6C 80240B6C 46000586 */ mov.s $f22, $f0 -/* A1BC70 80240B70 0240202D */ daddu $a0, $s2, $zero -/* A1BC74 80240B74 0C046B4C */ jal get_model_from_list_index -/* A1BC78 80240B78 46000606 */ mov.s $f24, $f0 -/* A1BC7C 80240B7C 0040882D */ daddu $s1, $v0, $zero -/* A1BC80 80240B80 96220000 */ lhu $v0, ($s1) -/* A1BC84 80240B84 30420400 */ andi $v0, $v0, 0x400 -/* A1BC88 80240B88 1440001E */ bnez $v0, .L80240C04 -/* A1BC8C 80240B8C 26300058 */ addiu $s0, $s1, 0x58 -/* A1BC90 80240B90 4480A000 */ mtc1 $zero, $f20 -/* A1BC94 80240B94 4406B000 */ mfc1 $a2, $f22 -/* A1BC98 80240B98 4405A000 */ mfc1 $a1, $f20 -/* A1BC9C 80240B9C 4407A000 */ mfc1 $a3, $f20 -/* A1BCA0 80240BA0 0C019E40 */ jal guTranslateF -/* A1BCA4 80240BA4 0200202D */ daddu $a0, $s0, $zero -/* A1BCA8 80240BA8 4405E000 */ mfc1 $a1, $f28 -/* A1BCAC 80240BAC 4406D000 */ mfc1 $a2, $f26 -/* A1BCB0 80240BB0 4407C000 */ mfc1 $a3, $f24 -/* A1BCB4 80240BB4 0C09029C */ jal func_80240A70 -/* A1BCB8 80240BB8 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BCBC 80240BBC 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BCC0 80240BC0 0200282D */ daddu $a1, $s0, $zero -/* A1BCC4 80240BC4 0C019D80 */ jal guMtxCatF -/* A1BCC8 80240BC8 0200302D */ daddu $a2, $s0, $zero -/* A1BCCC 80240BCC 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BCD0 80240BD0 4600B587 */ neg.s $f22, $f22 -/* A1BCD4 80240BD4 4405A000 */ mfc1 $a1, $f20 -/* A1BCD8 80240BD8 4406B000 */ mfc1 $a2, $f22 -/* A1BCDC 80240BDC 0C019E40 */ jal guTranslateF -/* A1BCE0 80240BE0 00A0382D */ daddu $a3, $a1, $zero -/* A1BCE4 80240BE4 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BCE8 80240BE8 0200282D */ daddu $a1, $s0, $zero -/* A1BCEC 80240BEC 0C019D80 */ jal guMtxCatF -/* A1BCF0 80240BF0 00A0302D */ daddu $a2, $a1, $zero -/* A1BCF4 80240BF4 96220000 */ lhu $v0, ($s1) -/* A1BCF8 80240BF8 34421400 */ ori $v0, $v0, 0x1400 -/* A1BCFC 80240BFC 0809031F */ j .L80240C7C -/* A1BD00 80240C00 A6220000 */ sh $v0, ($s1) -.L80240C04: -/* A1BD04 80240C04 4480A000 */ mtc1 $zero, $f20 -/* A1BD08 80240C08 4406B000 */ mfc1 $a2, $f22 -/* A1BD0C 80240C0C 4405A000 */ mfc1 $a1, $f20 -/* A1BD10 80240C10 4407A000 */ mfc1 $a3, $f20 -/* A1BD14 80240C14 0C019E40 */ jal guTranslateF -/* A1BD18 80240C18 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BD1C 80240C1C 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BD20 80240C20 26300058 */ addiu $s0, $s1, 0x58 -/* A1BD24 80240C24 0200282D */ daddu $a1, $s0, $zero -/* A1BD28 80240C28 0C019D80 */ jal guMtxCatF -/* A1BD2C 80240C2C 0200302D */ daddu $a2, $s0, $zero -/* A1BD30 80240C30 4405E000 */ mfc1 $a1, $f28 -/* A1BD34 80240C34 4406D000 */ mfc1 $a2, $f26 -/* A1BD38 80240C38 4407C000 */ mfc1 $a3, $f24 -/* A1BD3C 80240C3C 0C09029C */ jal func_80240A70 -/* A1BD40 80240C40 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BD44 80240C44 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BD48 80240C48 0200282D */ daddu $a1, $s0, $zero -/* A1BD4C 80240C4C 0C019D80 */ jal guMtxCatF -/* A1BD50 80240C50 0200302D */ daddu $a2, $s0, $zero -/* A1BD54 80240C54 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BD58 80240C58 4600B587 */ neg.s $f22, $f22 -/* A1BD5C 80240C5C 4405A000 */ mfc1 $a1, $f20 -/* A1BD60 80240C60 4406B000 */ mfc1 $a2, $f22 -/* A1BD64 80240C64 0C019E40 */ jal guTranslateF -/* A1BD68 80240C68 00A0382D */ daddu $a3, $a1, $zero -/* A1BD6C 80240C6C 27A40010 */ addiu $a0, $sp, 0x10 -/* A1BD70 80240C70 0200282D */ daddu $a1, $s0, $zero -/* A1BD74 80240C74 0C019D80 */ jal guMtxCatF -/* A1BD78 80240C78 00A0302D */ daddu $a2, $a1, $zero -.L80240C7C: -/* A1BD7C 80240C7C 8FBF005C */ lw $ra, 0x5c($sp) -/* A1BD80 80240C80 8FB20058 */ lw $s2, 0x58($sp) -/* A1BD84 80240C84 8FB10054 */ lw $s1, 0x54($sp) -/* A1BD88 80240C88 8FB00050 */ lw $s0, 0x50($sp) -/* A1BD8C 80240C8C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* A1BD90 80240C90 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A1BD94 80240C94 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A1BD98 80240C98 D7B60068 */ ldc1 $f22, 0x68($sp) -/* A1BD9C 80240C9C D7B40060 */ ldc1 $f20, 0x60($sp) -/* A1BDA0 80240CA0 24020002 */ addiu $v0, $zero, 2 -/* A1BDA4 80240CA4 03E00008 */ jr $ra -/* A1BDA8 80240CA8 27BD0088 */ addiu $sp, $sp, 0x88 -/* A1BDAC 80240CAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BB70/func_80240AE0_A1BBE0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BB70/func_80240AE0_A1BBE0.s new file mode 100644 index 0000000000..df20bc9a15 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BB70/func_80240AE0_A1BBE0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AE0_A1BBE0 +/* A1BBE0 80240AE0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* A1BBE4 80240AE4 AFB10054 */ sw $s1, 0x54($sp) +/* A1BBE8 80240AE8 0080882D */ daddu $s1, $a0, $zero +/* A1BBEC 80240AEC AFBF005C */ sw $ra, 0x5c($sp) +/* A1BBF0 80240AF0 AFB20058 */ sw $s2, 0x58($sp) +/* A1BBF4 80240AF4 AFB00050 */ sw $s0, 0x50($sp) +/* A1BBF8 80240AF8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* A1BBFC 80240AFC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* A1BC00 80240B00 F7B80070 */ sdc1 $f24, 0x70($sp) +/* A1BC04 80240B04 F7B60068 */ sdc1 $f22, 0x68($sp) +/* A1BC08 80240B08 F7B40060 */ sdc1 $f20, 0x60($sp) +/* A1BC0C 80240B0C 8E30000C */ lw $s0, 0xc($s1) +/* A1BC10 80240B10 8E050000 */ lw $a1, ($s0) +/* A1BC14 80240B14 0C0B1EAF */ jal get_variable +/* A1BC18 80240B18 26100004 */ addiu $s0, $s0, 4 +/* A1BC1C 80240B1C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A1BC20 80240B20 0040202D */ daddu $a0, $v0, $zero +/* A1BC24 80240B24 8E050000 */ lw $a1, ($s0) +/* A1BC28 80240B28 26100004 */ addiu $s0, $s0, 4 +/* A1BC2C 80240B2C 0220202D */ daddu $a0, $s1, $zero +/* A1BC30 80240B30 0C0B210B */ jal get_float_variable +/* A1BC34 80240B34 0040902D */ daddu $s2, $v0, $zero +/* A1BC38 80240B38 8E050000 */ lw $a1, ($s0) +/* A1BC3C 80240B3C 26100004 */ addiu $s0, $s0, 4 +/* A1BC40 80240B40 0220202D */ daddu $a0, $s1, $zero +/* A1BC44 80240B44 0C0B210B */ jal get_float_variable +/* A1BC48 80240B48 46000706 */ mov.s $f28, $f0 +/* A1BC4C 80240B4C 8E050000 */ lw $a1, ($s0) +/* A1BC50 80240B50 26100004 */ addiu $s0, $s0, 4 +/* A1BC54 80240B54 0220202D */ daddu $a0, $s1, $zero +/* A1BC58 80240B58 0C0B210B */ jal get_float_variable +/* A1BC5C 80240B5C 46000686 */ mov.s $f26, $f0 +/* A1BC60 80240B60 0220202D */ daddu $a0, $s1, $zero +/* A1BC64 80240B64 8E050000 */ lw $a1, ($s0) +/* A1BC68 80240B68 0C0B210B */ jal get_float_variable +/* A1BC6C 80240B6C 46000586 */ mov.s $f22, $f0 +/* A1BC70 80240B70 0240202D */ daddu $a0, $s2, $zero +/* A1BC74 80240B74 0C046B4C */ jal get_model_from_list_index +/* A1BC78 80240B78 46000606 */ mov.s $f24, $f0 +/* A1BC7C 80240B7C 0040882D */ daddu $s1, $v0, $zero +/* A1BC80 80240B80 96220000 */ lhu $v0, ($s1) +/* A1BC84 80240B84 30420400 */ andi $v0, $v0, 0x400 +/* A1BC88 80240B88 1440001E */ bnez $v0, .L80240C04 +/* A1BC8C 80240B8C 26300058 */ addiu $s0, $s1, 0x58 +/* A1BC90 80240B90 4480A000 */ mtc1 $zero, $f20 +/* A1BC94 80240B94 4406B000 */ mfc1 $a2, $f22 +/* A1BC98 80240B98 4405A000 */ mfc1 $a1, $f20 +/* A1BC9C 80240B9C 4407A000 */ mfc1 $a3, $f20 +/* A1BCA0 80240BA0 0C019E40 */ jal guTranslateF +/* A1BCA4 80240BA4 0200202D */ daddu $a0, $s0, $zero +/* A1BCA8 80240BA8 4405E000 */ mfc1 $a1, $f28 +/* A1BCAC 80240BAC 4406D000 */ mfc1 $a2, $f26 +/* A1BCB0 80240BB0 4407C000 */ mfc1 $a3, $f24 +/* A1BCB4 80240BB4 0C09029C */ jal func_80240A70_A1BB70 +/* A1BCB8 80240BB8 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BCBC 80240BBC 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BCC0 80240BC0 0200282D */ daddu $a1, $s0, $zero +/* A1BCC4 80240BC4 0C019D80 */ jal guMtxCatF +/* A1BCC8 80240BC8 0200302D */ daddu $a2, $s0, $zero +/* A1BCCC 80240BCC 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BCD0 80240BD0 4600B587 */ neg.s $f22, $f22 +/* A1BCD4 80240BD4 4405A000 */ mfc1 $a1, $f20 +/* A1BCD8 80240BD8 4406B000 */ mfc1 $a2, $f22 +/* A1BCDC 80240BDC 0C019E40 */ jal guTranslateF +/* A1BCE0 80240BE0 00A0382D */ daddu $a3, $a1, $zero +/* A1BCE4 80240BE4 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BCE8 80240BE8 0200282D */ daddu $a1, $s0, $zero +/* A1BCEC 80240BEC 0C019D80 */ jal guMtxCatF +/* A1BCF0 80240BF0 00A0302D */ daddu $a2, $a1, $zero +/* A1BCF4 80240BF4 96220000 */ lhu $v0, ($s1) +/* A1BCF8 80240BF8 34421400 */ ori $v0, $v0, 0x1400 +/* A1BCFC 80240BFC 0809031F */ j .L80240C7C +/* A1BD00 80240C00 A6220000 */ sh $v0, ($s1) +.L80240C04: +/* A1BD04 80240C04 4480A000 */ mtc1 $zero, $f20 +/* A1BD08 80240C08 4406B000 */ mfc1 $a2, $f22 +/* A1BD0C 80240C0C 4405A000 */ mfc1 $a1, $f20 +/* A1BD10 80240C10 4407A000 */ mfc1 $a3, $f20 +/* A1BD14 80240C14 0C019E40 */ jal guTranslateF +/* A1BD18 80240C18 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD1C 80240C1C 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD20 80240C20 26300058 */ addiu $s0, $s1, 0x58 +/* A1BD24 80240C24 0200282D */ daddu $a1, $s0, $zero +/* A1BD28 80240C28 0C019D80 */ jal guMtxCatF +/* A1BD2C 80240C2C 0200302D */ daddu $a2, $s0, $zero +/* A1BD30 80240C30 4405E000 */ mfc1 $a1, $f28 +/* A1BD34 80240C34 4406D000 */ mfc1 $a2, $f26 +/* A1BD38 80240C38 4407C000 */ mfc1 $a3, $f24 +/* A1BD3C 80240C3C 0C09029C */ jal func_80240A70_A1BB70 +/* A1BD40 80240C40 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD44 80240C44 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD48 80240C48 0200282D */ daddu $a1, $s0, $zero +/* A1BD4C 80240C4C 0C019D80 */ jal guMtxCatF +/* A1BD50 80240C50 0200302D */ daddu $a2, $s0, $zero +/* A1BD54 80240C54 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD58 80240C58 4600B587 */ neg.s $f22, $f22 +/* A1BD5C 80240C5C 4405A000 */ mfc1 $a1, $f20 +/* A1BD60 80240C60 4406B000 */ mfc1 $a2, $f22 +/* A1BD64 80240C64 0C019E40 */ jal guTranslateF +/* A1BD68 80240C68 00A0382D */ daddu $a3, $a1, $zero +/* A1BD6C 80240C6C 27A40010 */ addiu $a0, $sp, 0x10 +/* A1BD70 80240C70 0200282D */ daddu $a1, $s0, $zero +/* A1BD74 80240C74 0C019D80 */ jal guMtxCatF +/* A1BD78 80240C78 00A0302D */ daddu $a2, $a1, $zero +.L80240C7C: +/* A1BD7C 80240C7C 8FBF005C */ lw $ra, 0x5c($sp) +/* A1BD80 80240C80 8FB20058 */ lw $s2, 0x58($sp) +/* A1BD84 80240C84 8FB10054 */ lw $s1, 0x54($sp) +/* A1BD88 80240C88 8FB00050 */ lw $s0, 0x50($sp) +/* A1BD8C 80240C8C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* A1BD90 80240C90 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* A1BD94 80240C94 D7B80070 */ ldc1 $f24, 0x70($sp) +/* A1BD98 80240C98 D7B60068 */ ldc1 $f22, 0x68($sp) +/* A1BD9C 80240C9C D7B40060 */ ldc1 $f20, 0x60($sp) +/* A1BDA0 80240CA0 24020002 */ addiu $v0, $zero, 2 +/* A1BDA4 80240CA4 03E00008 */ jr $ra +/* A1BDA8 80240CA8 27BD0088 */ addiu $sp, $sp, 0x88 +/* A1BDAC 80240CAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488.s deleted file mode 100644 index dd16a969b6..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241488 -/* A1C588 80241488 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1C58C 8024148C AFB3001C */ sw $s3, 0x1c($sp) -/* A1C590 80241490 0080982D */ daddu $s3, $a0, $zero -/* A1C594 80241494 AFBF0020 */ sw $ra, 0x20($sp) -/* A1C598 80241498 AFB20018 */ sw $s2, 0x18($sp) -/* A1C59C 8024149C AFB10014 */ sw $s1, 0x14($sp) -/* A1C5A0 802414A0 AFB00010 */ sw $s0, 0x10($sp) -/* A1C5A4 802414A4 8E720148 */ lw $s2, 0x148($s3) -/* A1C5A8 802414A8 86440008 */ lh $a0, 8($s2) -/* A1C5AC 802414AC 0C00EABB */ jal get_npc_unsafe -/* A1C5B0 802414B0 00A0882D */ daddu $s1, $a1, $zero -/* A1C5B4 802414B4 8E240008 */ lw $a0, 8($s1) -/* A1C5B8 802414B8 0040802D */ daddu $s0, $v0, $zero -/* A1C5BC 802414BC 00041FC2 */ srl $v1, $a0, 0x1f -/* A1C5C0 802414C0 00832021 */ addu $a0, $a0, $v1 -/* A1C5C4 802414C4 00042043 */ sra $a0, $a0, 1 -/* A1C5C8 802414C8 0C00A67F */ jal rand_int -/* A1C5CC 802414CC 24840001 */ addiu $a0, $a0, 1 -/* A1C5D0 802414D0 8E230008 */ lw $v1, 8($s1) -/* A1C5D4 802414D4 240400B4 */ addiu $a0, $zero, 0xb4 -/* A1C5D8 802414D8 00032FC2 */ srl $a1, $v1, 0x1f -/* A1C5DC 802414DC 00651821 */ addu $v1, $v1, $a1 -/* A1C5E0 802414E0 00031843 */ sra $v1, $v1, 1 -/* A1C5E4 802414E4 00621821 */ addu $v1, $v1, $v0 -/* A1C5E8 802414E8 0C00A67F */ jal rand_int -/* A1C5EC 802414EC A603008E */ sh $v1, 0x8e($s0) -/* A1C5F0 802414F0 C60C000C */ lwc1 $f12, 0xc($s0) -/* A1C5F4 802414F4 44820000 */ mtc1 $v0, $f0 -/* A1C5F8 802414F8 00000000 */ nop -/* A1C5FC 802414FC 46800020 */ cvt.s.w $f0, $f0 -/* A1C600 80241500 46006300 */ add.s $f12, $f12, $f0 -/* A1C604 80241504 3C0142B4 */ lui $at, 0x42b4 -/* A1C608 80241508 44810000 */ mtc1 $at, $f0 -/* A1C60C 8024150C 0C00A6C9 */ jal clamp_angle -/* A1C610 80241510 46006301 */ sub.s $f12, $f12, $f0 -/* A1C614 80241514 E600000C */ swc1 $f0, 0xc($s0) -/* A1C618 80241518 8E4200CC */ lw $v0, 0xcc($s2) -/* A1C61C 8024151C 8C420000 */ lw $v0, ($v0) -/* A1C620 80241520 AE020028 */ sw $v0, 0x28($s0) -/* A1C624 80241524 24020003 */ addiu $v0, $zero, 3 -/* A1C628 80241528 AE620070 */ sw $v0, 0x70($s3) -/* A1C62C 8024152C 8FBF0020 */ lw $ra, 0x20($sp) -/* A1C630 80241530 8FB3001C */ lw $s3, 0x1c($sp) -/* A1C634 80241534 8FB20018 */ lw $s2, 0x18($sp) -/* A1C638 80241538 8FB10014 */ lw $s1, 0x14($sp) -/* A1C63C 8024153C 8FB00010 */ lw $s0, 0x10($sp) -/* A1C640 80241540 03E00008 */ jr $ra -/* A1C644 80241544 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s new file mode 100644 index 0000000000..d5cc1f7a71 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241488_A1C588.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241488_A1C588 +/* A1C588 80241488 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A1C58C 8024148C AFB3001C */ sw $s3, 0x1c($sp) +/* A1C590 80241490 0080982D */ daddu $s3, $a0, $zero +/* A1C594 80241494 AFBF0020 */ sw $ra, 0x20($sp) +/* A1C598 80241498 AFB20018 */ sw $s2, 0x18($sp) +/* A1C59C 8024149C AFB10014 */ sw $s1, 0x14($sp) +/* A1C5A0 802414A0 AFB00010 */ sw $s0, 0x10($sp) +/* A1C5A4 802414A4 8E720148 */ lw $s2, 0x148($s3) +/* A1C5A8 802414A8 86440008 */ lh $a0, 8($s2) +/* A1C5AC 802414AC 0C00EABB */ jal get_npc_unsafe +/* A1C5B0 802414B0 00A0882D */ daddu $s1, $a1, $zero +/* A1C5B4 802414B4 8E240008 */ lw $a0, 8($s1) +/* A1C5B8 802414B8 0040802D */ daddu $s0, $v0, $zero +/* A1C5BC 802414BC 00041FC2 */ srl $v1, $a0, 0x1f +/* A1C5C0 802414C0 00832021 */ addu $a0, $a0, $v1 +/* A1C5C4 802414C4 00042043 */ sra $a0, $a0, 1 +/* A1C5C8 802414C8 0C00A67F */ jal rand_int +/* A1C5CC 802414CC 24840001 */ addiu $a0, $a0, 1 +/* A1C5D0 802414D0 8E230008 */ lw $v1, 8($s1) +/* A1C5D4 802414D4 240400B4 */ addiu $a0, $zero, 0xb4 +/* A1C5D8 802414D8 00032FC2 */ srl $a1, $v1, 0x1f +/* A1C5DC 802414DC 00651821 */ addu $v1, $v1, $a1 +/* A1C5E0 802414E0 00031843 */ sra $v1, $v1, 1 +/* A1C5E4 802414E4 00621821 */ addu $v1, $v1, $v0 +/* A1C5E8 802414E8 0C00A67F */ jal rand_int +/* A1C5EC 802414EC A603008E */ sh $v1, 0x8e($s0) +/* A1C5F0 802414F0 C60C000C */ lwc1 $f12, 0xc($s0) +/* A1C5F4 802414F4 44820000 */ mtc1 $v0, $f0 +/* A1C5F8 802414F8 00000000 */ nop +/* A1C5FC 802414FC 46800020 */ cvt.s.w $f0, $f0 +/* A1C600 80241500 46006300 */ add.s $f12, $f12, $f0 +/* A1C604 80241504 3C0142B4 */ lui $at, 0x42b4 +/* A1C608 80241508 44810000 */ mtc1 $at, $f0 +/* A1C60C 8024150C 0C00A6C9 */ jal clamp_angle +/* A1C610 80241510 46006301 */ sub.s $f12, $f12, $f0 +/* A1C614 80241514 E600000C */ swc1 $f0, 0xc($s0) +/* A1C618 80241518 8E4200CC */ lw $v0, 0xcc($s2) +/* A1C61C 8024151C 8C420000 */ lw $v0, ($v0) +/* A1C620 80241520 AE020028 */ sw $v0, 0x28($s0) +/* A1C624 80241524 24020003 */ addiu $v0, $zero, 3 +/* A1C628 80241528 AE620070 */ sw $v0, 0x70($s3) +/* A1C62C 8024152C 8FBF0020 */ lw $ra, 0x20($sp) +/* A1C630 80241530 8FB3001C */ lw $s3, 0x1c($sp) +/* A1C634 80241534 8FB20018 */ lw $s2, 0x18($sp) +/* A1C638 80241538 8FB10014 */ lw $s1, 0x14($sp) +/* A1C63C 8024153C 8FB00010 */ lw $s0, 0x10($sp) +/* A1C640 80241540 03E00008 */ jr $ra +/* A1C644 80241544 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548.s deleted file mode 100644 index 094383f0c7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241548 -/* A1C648 80241548 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A1C64C 8024154C AFB3004C */ sw $s3, 0x4c($sp) -/* A1C650 80241550 0080982D */ daddu $s3, $a0, $zero -/* A1C654 80241554 AFBF0054 */ sw $ra, 0x54($sp) -/* A1C658 80241558 AFB40050 */ sw $s4, 0x50($sp) -/* A1C65C 8024155C AFB20048 */ sw $s2, 0x48($sp) -/* A1C660 80241560 AFB10044 */ sw $s1, 0x44($sp) -/* A1C664 80241564 AFB00040 */ sw $s0, 0x40($sp) -/* A1C668 80241568 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* A1C66C 8024156C F7B80068 */ sdc1 $f24, 0x68($sp) -/* A1C670 80241570 F7B60060 */ sdc1 $f22, 0x60($sp) -/* A1C674 80241574 F7B40058 */ sdc1 $f20, 0x58($sp) -/* A1C678 80241578 8E710148 */ lw $s1, 0x148($s3) -/* A1C67C 8024157C 00A0902D */ daddu $s2, $a1, $zero -/* A1C680 80241580 86240008 */ lh $a0, 8($s1) -/* A1C684 80241584 0C00EABB */ jal get_npc_unsafe -/* A1C688 80241588 00C0A02D */ daddu $s4, $a2, $zero -/* A1C68C 8024158C 0040802D */ daddu $s0, $v0, $zero -/* A1C690 80241590 C6200078 */ lwc1 $f0, 0x78($s1) -/* A1C694 80241594 46800020 */ cvt.s.w $f0, $f0 -/* A1C698 80241598 46000021 */ cvt.d.s $f0, $f0 -/* A1C69C 8024159C 3C014059 */ lui $at, 0x4059 -/* A1C6A0 802415A0 44811800 */ mtc1 $at, $f3 -/* A1C6A4 802415A4 44801000 */ mtc1 $zero, $f2 -/* A1C6A8 802415A8 8602008E */ lh $v0, 0x8e($s0) -/* A1C6AC 802415AC 9603008E */ lhu $v1, 0x8e($s0) -/* A1C6B0 802415B0 46220003 */ div.d $f0, $f0, $f2 -/* A1C6B4 802415B4 46200620 */ cvt.s.d $f24, $f0 -/* A1C6B8 802415B8 C6200088 */ lwc1 $f0, 0x88($s1) -/* A1C6BC 802415BC 46800020 */ cvt.s.w $f0, $f0 -/* A1C6C0 802415C0 46000021 */ cvt.d.s $f0, $f0 -/* A1C6C4 802415C4 46220003 */ div.d $f0, $f0, $f2 -/* A1C6C8 802415C8 46200020 */ cvt.s.d $f0, $f0 -/* A1C6CC 802415CC 18400003 */ blez $v0, .L802415DC -/* A1C6D0 802415D0 4600C680 */ add.s $f26, $f24, $f0 -/* A1C6D4 802415D4 2462FFFF */ addiu $v0, $v1, -1 -/* A1C6D8 802415D8 A602008E */ sh $v0, 0x8e($s0) -.L802415DC: -/* A1C6DC 802415DC 8E220070 */ lw $v0, 0x70($s1) -/* A1C6E0 802415E0 18400034 */ blez $v0, .L802416B4 -/* A1C6E4 802415E4 00000000 */ nop -/* A1C6E8 802415E8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* A1C6EC 802415EC 46806320 */ cvt.s.w $f12, $f12 -/* A1C6F0 802415F0 44820000 */ mtc1 $v0, $f0 -/* A1C6F4 802415F4 00000000 */ nop -/* A1C6F8 802415F8 46800020 */ cvt.s.w $f0, $f0 -/* A1C6FC 802415FC 46000021 */ cvt.d.s $f0, $f0 -/* A1C700 80241600 46220003 */ div.d $f0, $f0, $f2 -/* A1C704 80241604 0C00A8BB */ jal sin_deg -/* A1C708 80241608 462005A0 */ cvt.s.d $f22, $f0 -/* A1C70C 8024160C 8E020000 */ lw $v0, ($s0) -/* A1C710 80241610 30420008 */ andi $v0, $v0, 8 -/* A1C714 80241614 10400003 */ beqz $v0, .L80241624 -/* A1C718 80241618 46000506 */ mov.s $f20, $f0 -/* A1C71C 8024161C 08090599 */ j .L80241664 -/* A1C720 80241620 0000102D */ daddu $v0, $zero, $zero -.L80241624: -/* A1C724 80241624 27A50028 */ addiu $a1, $sp, 0x28 -/* A1C728 80241628 27A6002C */ addiu $a2, $sp, 0x2c -/* A1C72C 8024162C C6000038 */ lwc1 $f0, 0x38($s0) -/* A1C730 80241630 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1C734 80241634 C6040040 */ lwc1 $f4, 0x40($s0) -/* A1C738 80241638 3C01447A */ lui $at, 0x447a -/* A1C73C 8024163C 44813000 */ mtc1 $at, $f6 -/* A1C740 80241640 27A20034 */ addiu $v0, $sp, 0x34 -/* A1C744 80241644 E7A00028 */ swc1 $f0, 0x28($sp) -/* A1C748 80241648 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A1C74C 8024164C E7A40030 */ swc1 $f4, 0x30($sp) -/* A1C750 80241650 E7A60034 */ swc1 $f6, 0x34($sp) -/* A1C754 80241654 AFA20010 */ sw $v0, 0x10($sp) -/* A1C758 80241658 8E040080 */ lw $a0, 0x80($s0) -/* A1C75C 8024165C 0C0372DF */ jal func_800DCB7C -/* A1C760 80241660 27A70030 */ addiu $a3, $sp, 0x30 -.L80241664: -/* A1C764 80241664 10400007 */ beqz $v0, .L80241684 -/* A1C768 80241668 00000000 */ nop -/* A1C76C 8024166C 4616A082 */ mul.s $f2, $f20, $f22 -/* A1C770 80241670 00000000 */ nop -/* A1C774 80241674 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A1C778 80241678 46180000 */ add.s $f0, $f0, $f24 -/* A1C77C 8024167C 080905A4 */ j .L80241690 -/* A1C780 80241680 46020000 */ add.s $f0, $f0, $f2 -.L80241684: -/* A1C784 80241684 4616A002 */ mul.s $f0, $f20, $f22 -/* A1C788 80241688 00000000 */ nop -/* A1C78C 8024168C 4600D000 */ add.s $f0, $f26, $f0 -.L80241690: -/* A1C790 80241690 E600003C */ swc1 $f0, 0x3c($s0) -/* A1C794 80241694 8E220074 */ lw $v0, 0x74($s1) -/* A1C798 80241698 2442000A */ addiu $v0, $v0, 0xa -/* A1C79C 8024169C 44826000 */ mtc1 $v0, $f12 -/* A1C7A0 802416A0 00000000 */ nop -/* A1C7A4 802416A4 0C00A6C9 */ jal clamp_angle -/* A1C7A8 802416A8 46806320 */ cvt.s.w $f12, $f12 -/* A1C7AC 802416AC 4600020D */ trunc.w.s $f8, $f0 -/* A1C7B0 802416B0 E6280074 */ swc1 $f8, 0x74($s1) -.L802416B4: -/* A1C7B4 802416B4 8E220090 */ lw $v0, 0x90($s1) -/* A1C7B8 802416B8 1C400040 */ bgtz $v0, .L802417BC -/* A1C7BC 802416BC 2442FFFF */ addiu $v0, $v0, -1 -/* A1C7C0 802416C0 860200A8 */ lh $v0, 0xa8($s0) -/* A1C7C4 802416C4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1C7C8 802416C8 44821000 */ mtc1 $v0, $f2 -/* A1C7CC 802416CC 00000000 */ nop -/* A1C7D0 802416D0 468010A0 */ cvt.s.w $f2, $f2 -/* A1C7D4 802416D4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1C7D8 802416D8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1C7DC 802416DC 46020000 */ add.s $f0, $f0, $f2 -/* A1C7E0 802416E0 3C014024 */ lui $at, 0x4024 -/* A1C7E4 802416E4 44812800 */ mtc1 $at, $f5 -/* A1C7E8 802416E8 44802000 */ mtc1 $zero, $f4 -/* A1C7EC 802416EC C442002C */ lwc1 $f2, 0x2c($v0) -/* A1C7F0 802416F0 46000021 */ cvt.d.s $f0, $f0 -/* A1C7F4 802416F4 46240000 */ add.d $f0, $f0, $f4 -/* A1C7F8 802416F8 460010A1 */ cvt.d.s $f2, $f2 -/* A1C7FC 802416FC 4620103C */ c.lt.d $f2, $f0 -/* A1C800 80241700 00000000 */ nop -/* A1C804 80241704 4500002E */ bc1f .L802417C0 -/* A1C808 80241708 0280202D */ daddu $a0, $s4, $zero -/* A1C80C 8024170C 24020001 */ addiu $v0, $zero, 1 -/* A1C810 80241710 AFA20010 */ sw $v0, 0x10($sp) -/* A1C814 80241714 8E460024 */ lw $a2, 0x24($s2) -/* A1C818 80241718 8E470028 */ lw $a3, 0x28($s2) -/* A1C81C 8024171C 0C01242D */ jal func_800490B4 -/* A1C820 80241720 0220282D */ daddu $a1, $s1, $zero -/* A1C824 80241724 10400026 */ beqz $v0, .L802417C0 -/* A1C828 80241728 0000202D */ daddu $a0, $zero, $zero -/* A1C82C 8024172C 0200282D */ daddu $a1, $s0, $zero -/* A1C830 80241730 0000302D */ daddu $a2, $zero, $zero -/* A1C834 80241734 2412000C */ addiu $s2, $zero, 0xc -/* A1C838 80241738 860300A8 */ lh $v1, 0xa8($s0) -/* A1C83C 8024173C 3C013F80 */ lui $at, 0x3f80 -/* A1C840 80241740 44810000 */ mtc1 $at, $f0 -/* A1C844 80241744 3C014000 */ lui $at, 0x4000 -/* A1C848 80241748 44811000 */ mtc1 $at, $f2 -/* A1C84C 8024174C 3C01C1A0 */ lui $at, 0xc1a0 -/* A1C850 80241750 44812000 */ mtc1 $at, $f4 -/* A1C854 80241754 44834000 */ mtc1 $v1, $f8 -/* A1C858 80241758 00000000 */ nop -/* A1C85C 8024175C 46804220 */ cvt.s.w $f8, $f8 -/* A1C860 80241760 44074000 */ mfc1 $a3, $f8 -/* A1C864 80241764 27A20038 */ addiu $v0, $sp, 0x38 -/* A1C868 80241768 AFB2001C */ sw $s2, 0x1c($sp) -/* A1C86C 8024176C AFA20020 */ sw $v0, 0x20($sp) -/* A1C870 80241770 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1C874 80241774 E7A20014 */ swc1 $f2, 0x14($sp) -/* A1C878 80241778 0C01BFA4 */ jal fx_emote -/* A1C87C 8024177C E7A40018 */ swc1 $f4, 0x18($sp) -/* A1C880 80241780 0200202D */ daddu $a0, $s0, $zero -/* A1C884 80241784 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A1C888 80241788 C480003C */ lwc1 $f0, 0x3c($a0) -/* A1C88C 8024178C 3C060020 */ lui $a2, 0x20 -/* A1C890 80241790 0C012530 */ jal func_800494C0 -/* A1C894 80241794 E4800064 */ swc1 $f0, 0x64($a0) -/* A1C898 80241798 8E220018 */ lw $v0, 0x18($s1) -/* A1C89C 8024179C 9442002A */ lhu $v0, 0x2a($v0) -/* A1C8A0 802417A0 30420001 */ andi $v0, $v0, 1 -/* A1C8A4 802417A4 10400003 */ beqz $v0, .L802417B4 -/* A1C8A8 802417A8 2402000A */ addiu $v0, $zero, 0xa -/* A1C8AC 802417AC 08090617 */ j .L8024185C -/* A1C8B0 802417B0 AE620070 */ sw $v0, 0x70($s3) -.L802417B4: -/* A1C8B4 802417B4 08090617 */ j .L8024185C -/* A1C8B8 802417B8 AE720070 */ sw $s2, 0x70($s3) -.L802417BC: -/* A1C8BC 802417BC AE220090 */ sw $v0, 0x90($s1) -.L802417C0: -/* A1C8C0 802417C0 8602008C */ lh $v0, 0x8c($s0) -/* A1C8C4 802417C4 14400025 */ bnez $v0, .L8024185C -/* A1C8C8 802417C8 00000000 */ nop -/* A1C8CC 802417CC 8602008E */ lh $v0, 0x8e($s0) -/* A1C8D0 802417D0 1C400022 */ bgtz $v0, .L8024185C -/* A1C8D4 802417D4 00000000 */ nop -/* A1C8D8 802417D8 8E620074 */ lw $v0, 0x74($s3) -/* A1C8DC 802417DC 2442FFFF */ addiu $v0, $v0, -1 -/* A1C8E0 802417E0 1840001D */ blez $v0, .L80241858 -/* A1C8E4 802417E4 AE620074 */ sw $v0, 0x74($s3) -/* A1C8E8 802417E8 8E220018 */ lw $v0, 0x18($s1) -/* A1C8EC 802417EC 9442002A */ lhu $v0, 0x2a($v0) -/* A1C8F0 802417F0 30420010 */ andi $v0, $v0, 0x10 -/* A1C8F4 802417F4 14400007 */ bnez $v0, .L80241814 -/* A1C8F8 802417F8 00000000 */ nop -/* A1C8FC 802417FC C600000C */ lwc1 $f0, 0xc($s0) -/* A1C900 80241800 3C014334 */ lui $at, 0x4334 -/* A1C904 80241804 44816000 */ mtc1 $at, $f12 -/* A1C908 80241808 0C00A6C9 */ jal clamp_angle -/* A1C90C 8024180C 460C0300 */ add.s $f12, $f0, $f12 -/* A1C910 80241810 E600000C */ swc1 $f0, 0xc($s0) -.L80241814: -/* A1C914 80241814 0C00A67F */ jal rand_int -/* A1C918 80241818 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A1C91C 8024181C 3C032E8B */ lui $v1, 0x2e8b -/* A1C920 80241820 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* A1C924 80241824 00430018 */ mult $v0, $v1 -/* A1C928 80241828 00021FC3 */ sra $v1, $v0, 0x1f -/* A1C92C 8024182C 00004010 */ mfhi $t0 -/* A1C930 80241830 00082043 */ sra $a0, $t0, 1 -/* A1C934 80241834 00832023 */ subu $a0, $a0, $v1 -/* A1C938 80241838 00041840 */ sll $v1, $a0, 1 -/* A1C93C 8024183C 00641821 */ addu $v1, $v1, $a0 -/* A1C940 80241840 00031880 */ sll $v1, $v1, 2 -/* A1C944 80241844 00641823 */ subu $v1, $v1, $a0 -/* A1C948 80241848 00431023 */ subu $v0, $v0, $v1 -/* A1C94C 8024184C 24420005 */ addiu $v0, $v0, 5 -/* A1C950 80241850 08090617 */ j .L8024185C -/* A1C954 80241854 A602008E */ sh $v0, 0x8e($s0) -.L80241858: -/* A1C958 80241858 AE600070 */ sw $zero, 0x70($s3) -.L8024185C: -/* A1C95C 8024185C 8FBF0054 */ lw $ra, 0x54($sp) -/* A1C960 80241860 8FB40050 */ lw $s4, 0x50($sp) -/* A1C964 80241864 8FB3004C */ lw $s3, 0x4c($sp) -/* A1C968 80241868 8FB20048 */ lw $s2, 0x48($sp) -/* A1C96C 8024186C 8FB10044 */ lw $s1, 0x44($sp) -/* A1C970 80241870 8FB00040 */ lw $s0, 0x40($sp) -/* A1C974 80241874 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* A1C978 80241878 D7B80068 */ ldc1 $f24, 0x68($sp) -/* A1C97C 8024187C D7B60060 */ ldc1 $f22, 0x60($sp) -/* A1C980 80241880 D7B40058 */ ldc1 $f20, 0x58($sp) -/* A1C984 80241884 03E00008 */ jr $ra -/* A1C988 80241888 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s new file mode 100644 index 0000000000..dad2e69bda --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241548_A1C648.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241548_A1C648 +/* A1C648 80241548 27BDFF88 */ addiu $sp, $sp, -0x78 +/* A1C64C 8024154C AFB3004C */ sw $s3, 0x4c($sp) +/* A1C650 80241550 0080982D */ daddu $s3, $a0, $zero +/* A1C654 80241554 AFBF0054 */ sw $ra, 0x54($sp) +/* A1C658 80241558 AFB40050 */ sw $s4, 0x50($sp) +/* A1C65C 8024155C AFB20048 */ sw $s2, 0x48($sp) +/* A1C660 80241560 AFB10044 */ sw $s1, 0x44($sp) +/* A1C664 80241564 AFB00040 */ sw $s0, 0x40($sp) +/* A1C668 80241568 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* A1C66C 8024156C F7B80068 */ sdc1 $f24, 0x68($sp) +/* A1C670 80241570 F7B60060 */ sdc1 $f22, 0x60($sp) +/* A1C674 80241574 F7B40058 */ sdc1 $f20, 0x58($sp) +/* A1C678 80241578 8E710148 */ lw $s1, 0x148($s3) +/* A1C67C 8024157C 00A0902D */ daddu $s2, $a1, $zero +/* A1C680 80241580 86240008 */ lh $a0, 8($s1) +/* A1C684 80241584 0C00EABB */ jal get_npc_unsafe +/* A1C688 80241588 00C0A02D */ daddu $s4, $a2, $zero +/* A1C68C 8024158C 0040802D */ daddu $s0, $v0, $zero +/* A1C690 80241590 C6200078 */ lwc1 $f0, 0x78($s1) +/* A1C694 80241594 46800020 */ cvt.s.w $f0, $f0 +/* A1C698 80241598 46000021 */ cvt.d.s $f0, $f0 +/* A1C69C 8024159C 3C014059 */ lui $at, 0x4059 +/* A1C6A0 802415A0 44811800 */ mtc1 $at, $f3 +/* A1C6A4 802415A4 44801000 */ mtc1 $zero, $f2 +/* A1C6A8 802415A8 8602008E */ lh $v0, 0x8e($s0) +/* A1C6AC 802415AC 9603008E */ lhu $v1, 0x8e($s0) +/* A1C6B0 802415B0 46220003 */ div.d $f0, $f0, $f2 +/* A1C6B4 802415B4 46200620 */ cvt.s.d $f24, $f0 +/* A1C6B8 802415B8 C6200088 */ lwc1 $f0, 0x88($s1) +/* A1C6BC 802415BC 46800020 */ cvt.s.w $f0, $f0 +/* A1C6C0 802415C0 46000021 */ cvt.d.s $f0, $f0 +/* A1C6C4 802415C4 46220003 */ div.d $f0, $f0, $f2 +/* A1C6C8 802415C8 46200020 */ cvt.s.d $f0, $f0 +/* A1C6CC 802415CC 18400003 */ blez $v0, .L802415DC +/* A1C6D0 802415D0 4600C680 */ add.s $f26, $f24, $f0 +/* A1C6D4 802415D4 2462FFFF */ addiu $v0, $v1, -1 +/* A1C6D8 802415D8 A602008E */ sh $v0, 0x8e($s0) +.L802415DC: +/* A1C6DC 802415DC 8E220070 */ lw $v0, 0x70($s1) +/* A1C6E0 802415E0 18400034 */ blez $v0, .L802416B4 +/* A1C6E4 802415E4 00000000 */ nop +/* A1C6E8 802415E8 C62C0074 */ lwc1 $f12, 0x74($s1) +/* A1C6EC 802415EC 46806320 */ cvt.s.w $f12, $f12 +/* A1C6F0 802415F0 44820000 */ mtc1 $v0, $f0 +/* A1C6F4 802415F4 00000000 */ nop +/* A1C6F8 802415F8 46800020 */ cvt.s.w $f0, $f0 +/* A1C6FC 802415FC 46000021 */ cvt.d.s $f0, $f0 +/* A1C700 80241600 46220003 */ div.d $f0, $f0, $f2 +/* A1C704 80241604 0C00A8BB */ jal sin_deg +/* A1C708 80241608 462005A0 */ cvt.s.d $f22, $f0 +/* A1C70C 8024160C 8E020000 */ lw $v0, ($s0) +/* A1C710 80241610 30420008 */ andi $v0, $v0, 8 +/* A1C714 80241614 10400003 */ beqz $v0, .L80241624 +/* A1C718 80241618 46000506 */ mov.s $f20, $f0 +/* A1C71C 8024161C 08090599 */ j .L80241664 +/* A1C720 80241620 0000102D */ daddu $v0, $zero, $zero +.L80241624: +/* A1C724 80241624 27A50028 */ addiu $a1, $sp, 0x28 +/* A1C728 80241628 27A6002C */ addiu $a2, $sp, 0x2c +/* A1C72C 8024162C C6000038 */ lwc1 $f0, 0x38($s0) +/* A1C730 80241630 C602003C */ lwc1 $f2, 0x3c($s0) +/* A1C734 80241634 C6040040 */ lwc1 $f4, 0x40($s0) +/* A1C738 80241638 3C01447A */ lui $at, 0x447a +/* A1C73C 8024163C 44813000 */ mtc1 $at, $f6 +/* A1C740 80241640 27A20034 */ addiu $v0, $sp, 0x34 +/* A1C744 80241644 E7A00028 */ swc1 $f0, 0x28($sp) +/* A1C748 80241648 E7A2002C */ swc1 $f2, 0x2c($sp) +/* A1C74C 8024164C E7A40030 */ swc1 $f4, 0x30($sp) +/* A1C750 80241650 E7A60034 */ swc1 $f6, 0x34($sp) +/* A1C754 80241654 AFA20010 */ sw $v0, 0x10($sp) +/* A1C758 80241658 8E040080 */ lw $a0, 0x80($s0) +/* A1C75C 8024165C 0C0372DF */ jal func_800DCB7C +/* A1C760 80241660 27A70030 */ addiu $a3, $sp, 0x30 +.L80241664: +/* A1C764 80241664 10400007 */ beqz $v0, .L80241684 +/* A1C768 80241668 00000000 */ nop +/* A1C76C 8024166C 4616A082 */ mul.s $f2, $f20, $f22 +/* A1C770 80241670 00000000 */ nop +/* A1C774 80241674 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A1C778 80241678 46180000 */ add.s $f0, $f0, $f24 +/* A1C77C 8024167C 080905A4 */ j .L80241690 +/* A1C780 80241680 46020000 */ add.s $f0, $f0, $f2 +.L80241684: +/* A1C784 80241684 4616A002 */ mul.s $f0, $f20, $f22 +/* A1C788 80241688 00000000 */ nop +/* A1C78C 8024168C 4600D000 */ add.s $f0, $f26, $f0 +.L80241690: +/* A1C790 80241690 E600003C */ swc1 $f0, 0x3c($s0) +/* A1C794 80241694 8E220074 */ lw $v0, 0x74($s1) +/* A1C798 80241698 2442000A */ addiu $v0, $v0, 0xa +/* A1C79C 8024169C 44826000 */ mtc1 $v0, $f12 +/* A1C7A0 802416A0 00000000 */ nop +/* A1C7A4 802416A4 0C00A6C9 */ jal clamp_angle +/* A1C7A8 802416A8 46806320 */ cvt.s.w $f12, $f12 +/* A1C7AC 802416AC 4600020D */ trunc.w.s $f8, $f0 +/* A1C7B0 802416B0 E6280074 */ swc1 $f8, 0x74($s1) +.L802416B4: +/* A1C7B4 802416B4 8E220090 */ lw $v0, 0x90($s1) +/* A1C7B8 802416B8 1C400040 */ bgtz $v0, .L802417BC +/* A1C7BC 802416BC 2442FFFF */ addiu $v0, $v0, -1 +/* A1C7C0 802416C0 860200A8 */ lh $v0, 0xa8($s0) +/* A1C7C4 802416C4 C600003C */ lwc1 $f0, 0x3c($s0) +/* A1C7C8 802416C8 44821000 */ mtc1 $v0, $f2 +/* A1C7CC 802416CC 00000000 */ nop +/* A1C7D0 802416D0 468010A0 */ cvt.s.w $f2, $f2 +/* A1C7D4 802416D4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A1C7D8 802416D8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A1C7DC 802416DC 46020000 */ add.s $f0, $f0, $f2 +/* A1C7E0 802416E0 3C014024 */ lui $at, 0x4024 +/* A1C7E4 802416E4 44812800 */ mtc1 $at, $f5 +/* A1C7E8 802416E8 44802000 */ mtc1 $zero, $f4 +/* A1C7EC 802416EC C442002C */ lwc1 $f2, 0x2c($v0) +/* A1C7F0 802416F0 46000021 */ cvt.d.s $f0, $f0 +/* A1C7F4 802416F4 46240000 */ add.d $f0, $f0, $f4 +/* A1C7F8 802416F8 460010A1 */ cvt.d.s $f2, $f2 +/* A1C7FC 802416FC 4620103C */ c.lt.d $f2, $f0 +/* A1C800 80241700 00000000 */ nop +/* A1C804 80241704 4500002E */ bc1f .L802417C0 +/* A1C808 80241708 0280202D */ daddu $a0, $s4, $zero +/* A1C80C 8024170C 24020001 */ addiu $v0, $zero, 1 +/* A1C810 80241710 AFA20010 */ sw $v0, 0x10($sp) +/* A1C814 80241714 8E460024 */ lw $a2, 0x24($s2) +/* A1C818 80241718 8E470028 */ lw $a3, 0x28($s2) +/* A1C81C 8024171C 0C01242D */ jal func_800490B4 +/* A1C820 80241720 0220282D */ daddu $a1, $s1, $zero +/* A1C824 80241724 10400026 */ beqz $v0, .L802417C0 +/* A1C828 80241728 0000202D */ daddu $a0, $zero, $zero +/* A1C82C 8024172C 0200282D */ daddu $a1, $s0, $zero +/* A1C830 80241730 0000302D */ daddu $a2, $zero, $zero +/* A1C834 80241734 2412000C */ addiu $s2, $zero, 0xc +/* A1C838 80241738 860300A8 */ lh $v1, 0xa8($s0) +/* A1C83C 8024173C 3C013F80 */ lui $at, 0x3f80 +/* A1C840 80241740 44810000 */ mtc1 $at, $f0 +/* A1C844 80241744 3C014000 */ lui $at, 0x4000 +/* A1C848 80241748 44811000 */ mtc1 $at, $f2 +/* A1C84C 8024174C 3C01C1A0 */ lui $at, 0xc1a0 +/* A1C850 80241750 44812000 */ mtc1 $at, $f4 +/* A1C854 80241754 44834000 */ mtc1 $v1, $f8 +/* A1C858 80241758 00000000 */ nop +/* A1C85C 8024175C 46804220 */ cvt.s.w $f8, $f8 +/* A1C860 80241760 44074000 */ mfc1 $a3, $f8 +/* A1C864 80241764 27A20038 */ addiu $v0, $sp, 0x38 +/* A1C868 80241768 AFB2001C */ sw $s2, 0x1c($sp) +/* A1C86C 8024176C AFA20020 */ sw $v0, 0x20($sp) +/* A1C870 80241770 E7A00010 */ swc1 $f0, 0x10($sp) +/* A1C874 80241774 E7A20014 */ swc1 $f2, 0x14($sp) +/* A1C878 80241778 0C01BFA4 */ jal fx_emote +/* A1C87C 8024177C E7A40018 */ swc1 $f4, 0x18($sp) +/* A1C880 80241780 0200202D */ daddu $a0, $s0, $zero +/* A1C884 80241784 240502F4 */ addiu $a1, $zero, 0x2f4 +/* A1C888 80241788 C480003C */ lwc1 $f0, 0x3c($a0) +/* A1C88C 8024178C 3C060020 */ lui $a2, 0x20 +/* A1C890 80241790 0C012530 */ jal func_800494C0 +/* A1C894 80241794 E4800064 */ swc1 $f0, 0x64($a0) +/* A1C898 80241798 8E220018 */ lw $v0, 0x18($s1) +/* A1C89C 8024179C 9442002A */ lhu $v0, 0x2a($v0) +/* A1C8A0 802417A0 30420001 */ andi $v0, $v0, 1 +/* A1C8A4 802417A4 10400003 */ beqz $v0, .L802417B4 +/* A1C8A8 802417A8 2402000A */ addiu $v0, $zero, 0xa +/* A1C8AC 802417AC 08090617 */ j .L8024185C +/* A1C8B0 802417B0 AE620070 */ sw $v0, 0x70($s3) +.L802417B4: +/* A1C8B4 802417B4 08090617 */ j .L8024185C +/* A1C8B8 802417B8 AE720070 */ sw $s2, 0x70($s3) +.L802417BC: +/* A1C8BC 802417BC AE220090 */ sw $v0, 0x90($s1) +.L802417C0: +/* A1C8C0 802417C0 8602008C */ lh $v0, 0x8c($s0) +/* A1C8C4 802417C4 14400025 */ bnez $v0, .L8024185C +/* A1C8C8 802417C8 00000000 */ nop +/* A1C8CC 802417CC 8602008E */ lh $v0, 0x8e($s0) +/* A1C8D0 802417D0 1C400022 */ bgtz $v0, .L8024185C +/* A1C8D4 802417D4 00000000 */ nop +/* A1C8D8 802417D8 8E620074 */ lw $v0, 0x74($s3) +/* A1C8DC 802417DC 2442FFFF */ addiu $v0, $v0, -1 +/* A1C8E0 802417E0 1840001D */ blez $v0, .L80241858 +/* A1C8E4 802417E4 AE620074 */ sw $v0, 0x74($s3) +/* A1C8E8 802417E8 8E220018 */ lw $v0, 0x18($s1) +/* A1C8EC 802417EC 9442002A */ lhu $v0, 0x2a($v0) +/* A1C8F0 802417F0 30420010 */ andi $v0, $v0, 0x10 +/* A1C8F4 802417F4 14400007 */ bnez $v0, .L80241814 +/* A1C8F8 802417F8 00000000 */ nop +/* A1C8FC 802417FC C600000C */ lwc1 $f0, 0xc($s0) +/* A1C900 80241800 3C014334 */ lui $at, 0x4334 +/* A1C904 80241804 44816000 */ mtc1 $at, $f12 +/* A1C908 80241808 0C00A6C9 */ jal clamp_angle +/* A1C90C 8024180C 460C0300 */ add.s $f12, $f0, $f12 +/* A1C910 80241810 E600000C */ swc1 $f0, 0xc($s0) +.L80241814: +/* A1C914 80241814 0C00A67F */ jal rand_int +/* A1C918 80241818 240403E8 */ addiu $a0, $zero, 0x3e8 +/* A1C91C 8024181C 3C032E8B */ lui $v1, 0x2e8b +/* A1C920 80241820 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* A1C924 80241824 00430018 */ mult $v0, $v1 +/* A1C928 80241828 00021FC3 */ sra $v1, $v0, 0x1f +/* A1C92C 8024182C 00004010 */ mfhi $t0 +/* A1C930 80241830 00082043 */ sra $a0, $t0, 1 +/* A1C934 80241834 00832023 */ subu $a0, $a0, $v1 +/* A1C938 80241838 00041840 */ sll $v1, $a0, 1 +/* A1C93C 8024183C 00641821 */ addu $v1, $v1, $a0 +/* A1C940 80241840 00031880 */ sll $v1, $v1, 2 +/* A1C944 80241844 00641823 */ subu $v1, $v1, $a0 +/* A1C948 80241848 00431023 */ subu $v0, $v0, $v1 +/* A1C94C 8024184C 24420005 */ addiu $v0, $v0, 5 +/* A1C950 80241850 08090617 */ j .L8024185C +/* A1C954 80241854 A602008E */ sh $v0, 0x8e($s0) +.L80241858: +/* A1C958 80241858 AE600070 */ sw $zero, 0x70($s3) +.L8024185C: +/* A1C95C 8024185C 8FBF0054 */ lw $ra, 0x54($sp) +/* A1C960 80241860 8FB40050 */ lw $s4, 0x50($sp) +/* A1C964 80241864 8FB3004C */ lw $s3, 0x4c($sp) +/* A1C968 80241868 8FB20048 */ lw $s2, 0x48($sp) +/* A1C96C 8024186C 8FB10044 */ lw $s1, 0x44($sp) +/* A1C970 80241870 8FB00040 */ lw $s0, 0x40($sp) +/* A1C974 80241874 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* A1C978 80241878 D7B80068 */ ldc1 $f24, 0x68($sp) +/* A1C97C 8024187C D7B60060 */ ldc1 $f22, 0x60($sp) +/* A1C980 80241880 D7B40058 */ ldc1 $f20, 0x58($sp) +/* A1C984 80241884 03E00008 */ jr $ra +/* A1C988 80241888 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904.s deleted file mode 100644 index 8e71087a27..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241904 -/* A1CA04 80241904 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1CA08 80241908 AFB00010 */ sw $s0, 0x10($sp) -/* A1CA0C 8024190C 0080802D */ daddu $s0, $a0, $zero -/* A1CA10 80241910 AFBF0014 */ sw $ra, 0x14($sp) -/* A1CA14 80241914 8E020148 */ lw $v0, 0x148($s0) -/* A1CA18 80241918 0C00EABB */ jal get_npc_unsafe -/* A1CA1C 8024191C 84440008 */ lh $a0, 8($v0) -/* A1CA20 80241920 9443008E */ lhu $v1, 0x8e($v0) -/* A1CA24 80241924 C440003C */ lwc1 $f0, 0x3c($v0) -/* A1CA28 80241928 24640001 */ addiu $a0, $v1, 1 -/* A1CA2C 8024192C 00031C00 */ sll $v1, $v1, 0x10 -/* A1CA30 80241930 00031B83 */ sra $v1, $v1, 0xe -/* A1CA34 80241934 A444008E */ sh $a0, 0x8e($v0) -/* A1CA38 80241938 3C018024 */ lui $at, 0x8024 -/* A1CA3C 8024193C 00230821 */ addu $at, $at, $v1 -/* A1CA40 80241940 C42257F4 */ lwc1 $f2, 0x57f4($at) -/* A1CA44 80241944 8443008E */ lh $v1, 0x8e($v0) -/* A1CA48 80241948 46020000 */ add.s $f0, $f0, $f2 -/* A1CA4C 8024194C 28630005 */ slti $v1, $v1, 5 -/* A1CA50 80241950 14600003 */ bnez $v1, .L80241960 -/* A1CA54 80241954 E440003C */ swc1 $f0, 0x3c($v0) -/* A1CA58 80241958 2402000C */ addiu $v0, $zero, 0xc -/* A1CA5C 8024195C AE020070 */ sw $v0, 0x70($s0) -.L80241960: -/* A1CA60 80241960 8FBF0014 */ lw $ra, 0x14($sp) -/* A1CA64 80241964 8FB00010 */ lw $s0, 0x10($sp) -/* A1CA68 80241968 03E00008 */ jr $ra -/* A1CA6C 8024196C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s new file mode 100644 index 0000000000..42a59fac70 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241904_A1CA04.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241904_A1CA04 +/* A1CA04 80241904 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1CA08 80241908 AFB00010 */ sw $s0, 0x10($sp) +/* A1CA0C 8024190C 0080802D */ daddu $s0, $a0, $zero +/* A1CA10 80241910 AFBF0014 */ sw $ra, 0x14($sp) +/* A1CA14 80241914 8E020148 */ lw $v0, 0x148($s0) +/* A1CA18 80241918 0C00EABB */ jal get_npc_unsafe +/* A1CA1C 8024191C 84440008 */ lh $a0, 8($v0) +/* A1CA20 80241920 9443008E */ lhu $v1, 0x8e($v0) +/* A1CA24 80241924 C440003C */ lwc1 $f0, 0x3c($v0) +/* A1CA28 80241928 24640001 */ addiu $a0, $v1, 1 +/* A1CA2C 8024192C 00031C00 */ sll $v1, $v1, 0x10 +/* A1CA30 80241930 00031B83 */ sra $v1, $v1, 0xe +/* A1CA34 80241934 A444008E */ sh $a0, 0x8e($v0) +/* A1CA38 80241938 3C018024 */ lui $at, 0x8024 +/* A1CA3C 8024193C 00230821 */ addu $at, $at, $v1 +/* A1CA40 80241940 C42257F4 */ lwc1 $f2, 0x57f4($at) +/* A1CA44 80241944 8443008E */ lh $v1, 0x8e($v0) +/* A1CA48 80241948 46020000 */ add.s $f0, $f0, $f2 +/* A1CA4C 8024194C 28630005 */ slti $v1, $v1, 5 +/* A1CA50 80241950 14600003 */ bnez $v1, .L80241960 +/* A1CA54 80241954 E440003C */ swc1 $f0, 0x3c($v0) +/* A1CA58 80241958 2402000C */ addiu $v0, $zero, 0xc +/* A1CA5C 8024195C AE020070 */ sw $v0, 0x70($s0) +.L80241960: +/* A1CA60 80241960 8FBF0014 */ lw $ra, 0x14($sp) +/* A1CA64 80241964 8FB00010 */ lw $s0, 0x10($sp) +/* A1CA68 80241968 03E00008 */ jr $ra +/* A1CA6C 8024196C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970.s deleted file mode 100644 index 7113716c92..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241970 -/* A1CA70 80241970 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1CA74 80241974 AFB3001C */ sw $s3, 0x1c($sp) -/* A1CA78 80241978 0080982D */ daddu $s3, $a0, $zero -/* A1CA7C 8024197C AFBF0020 */ sw $ra, 0x20($sp) -/* A1CA80 80241980 AFB20018 */ sw $s2, 0x18($sp) -/* A1CA84 80241984 AFB10014 */ sw $s1, 0x14($sp) -/* A1CA88 80241988 AFB00010 */ sw $s0, 0x10($sp) -/* A1CA8C 8024198C 8E720148 */ lw $s2, 0x148($s3) -/* A1CA90 80241990 86440008 */ lh $a0, 8($s2) -/* A1CA94 80241994 0C00EABB */ jal get_npc_unsafe -/* A1CA98 80241998 00A0802D */ daddu $s0, $a1, $zero -/* A1CA9C 8024199C 0040882D */ daddu $s1, $v0, $zero -/* A1CAA0 802419A0 C6420080 */ lwc1 $f2, 0x80($s2) -/* A1CAA4 802419A4 468010A0 */ cvt.s.w $f2, $f2 -/* A1CAA8 802419A8 460010A1 */ cvt.d.s $f2, $f2 -/* A1CAAC 802419AC C6400084 */ lwc1 $f0, 0x84($s2) -/* A1CAB0 802419B0 46800020 */ cvt.s.w $f0, $f0 -/* A1CAB4 802419B4 46000021 */ cvt.d.s $f0, $f0 -/* A1CAB8 802419B8 3C014059 */ lui $at, 0x4059 -/* A1CABC 802419BC 44812800 */ mtc1 $at, $f5 -/* A1CAC0 802419C0 44802000 */ mtc1 $zero, $f4 -/* A1CAC4 802419C4 8E4200CC */ lw $v0, 0xcc($s2) -/* A1CAC8 802419C8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A1CACC 802419CC C62E0040 */ lwc1 $f14, 0x40($s1) -/* A1CAD0 802419D0 46241083 */ div.d $f2, $f2, $f4 -/* A1CAD4 802419D4 462010A0 */ cvt.s.d $f2, $f2 -/* A1CAD8 802419D8 46240003 */ div.d $f0, $f0, $f4 -/* A1CADC 802419DC 8C420020 */ lw $v0, 0x20($v0) -/* A1CAE0 802419E0 46200020 */ cvt.s.d $f0, $f0 -/* A1CAE4 802419E4 E622001C */ swc1 $f2, 0x1c($s1) -/* A1CAE8 802419E8 E6200014 */ swc1 $f0, 0x14($s1) -/* A1CAEC 802419EC AE220028 */ sw $v0, 0x28($s1) -/* A1CAF0 802419F0 C6000018 */ lwc1 $f0, 0x18($s0) -/* A1CAF4 802419F4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1CAF8 802419F8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1CAFC 802419FC E6200018 */ swc1 $f0, 0x18($s1) -/* A1CB00 80241A00 8C460028 */ lw $a2, 0x28($v0) -/* A1CB04 80241A04 0C00A720 */ jal atan2 -/* A1CB08 80241A08 8C470030 */ lw $a3, 0x30($v0) -/* A1CB0C 80241A0C E620000C */ swc1 $f0, 0xc($s1) -/* A1CB10 80241A10 8E420018 */ lw $v0, 0x18($s2) -/* A1CB14 80241A14 AE400074 */ sw $zero, 0x74($s2) -/* A1CB18 80241A18 9442002A */ lhu $v0, 0x2a($v0) -/* A1CB1C 80241A1C 30420002 */ andi $v0, $v0, 2 -/* A1CB20 80241A20 10400005 */ beqz $v0, .L80241A38 -/* A1CB24 80241A24 24020003 */ addiu $v0, $zero, 3 -/* A1CB28 80241A28 A622008E */ sh $v0, 0x8e($s1) -/* A1CB2C 80241A2C 2402000D */ addiu $v0, $zero, 0xd -/* A1CB30 80241A30 080906A2 */ j .L80241A88 -/* A1CB34 80241A34 AE620070 */ sw $v0, 0x70($s3) -.L80241A38: -/* A1CB38 80241A38 24030001 */ addiu $v1, $zero, 1 -/* A1CB3C 80241A3C 2402000E */ addiu $v0, $zero, 0xe -/* A1CB40 80241A40 A623008E */ sh $v1, 0x8e($s1) -/* A1CB44 80241A44 AE620070 */ sw $v0, 0x70($s3) -/* A1CB48 80241A48 C6200038 */ lwc1 $f0, 0x38($s1) -/* A1CB4C 80241A4C 4600018D */ trunc.w.s $f6, $f0 -/* A1CB50 80241A50 44023000 */ mfc1 $v0, $f6 -/* A1CB54 80241A54 00000000 */ nop -/* A1CB58 80241A58 A6420010 */ sh $v0, 0x10($s2) -/* A1CB5C 80241A5C C620003C */ lwc1 $f0, 0x3c($s1) -/* A1CB60 80241A60 4600018D */ trunc.w.s $f6, $f0 -/* A1CB64 80241A64 44023000 */ mfc1 $v0, $f6 -/* A1CB68 80241A68 00000000 */ nop -/* A1CB6C 80241A6C A6420012 */ sh $v0, 0x12($s2) -/* A1CB70 80241A70 C6200040 */ lwc1 $f0, 0x40($s1) -/* A1CB74 80241A74 A2430007 */ sb $v1, 7($s2) -/* A1CB78 80241A78 4600018D */ trunc.w.s $f6, $f0 -/* A1CB7C 80241A7C 44023000 */ mfc1 $v0, $f6 -/* A1CB80 80241A80 00000000 */ nop -/* A1CB84 80241A84 A6420014 */ sh $v0, 0x14($s2) -.L80241A88: -/* A1CB88 80241A88 8FBF0020 */ lw $ra, 0x20($sp) -/* A1CB8C 80241A8C 8FB3001C */ lw $s3, 0x1c($sp) -/* A1CB90 80241A90 8FB20018 */ lw $s2, 0x18($sp) -/* A1CB94 80241A94 8FB10014 */ lw $s1, 0x14($sp) -/* A1CB98 80241A98 8FB00010 */ lw $s0, 0x10($sp) -/* A1CB9C 80241A9C 03E00008 */ jr $ra -/* A1CBA0 80241AA0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s new file mode 100644 index 0000000000..cf7ce58c5d --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241970_A1CA70.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241970_A1CA70 +/* A1CA70 80241970 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A1CA74 80241974 AFB3001C */ sw $s3, 0x1c($sp) +/* A1CA78 80241978 0080982D */ daddu $s3, $a0, $zero +/* A1CA7C 8024197C AFBF0020 */ sw $ra, 0x20($sp) +/* A1CA80 80241980 AFB20018 */ sw $s2, 0x18($sp) +/* A1CA84 80241984 AFB10014 */ sw $s1, 0x14($sp) +/* A1CA88 80241988 AFB00010 */ sw $s0, 0x10($sp) +/* A1CA8C 8024198C 8E720148 */ lw $s2, 0x148($s3) +/* A1CA90 80241990 86440008 */ lh $a0, 8($s2) +/* A1CA94 80241994 0C00EABB */ jal get_npc_unsafe +/* A1CA98 80241998 00A0802D */ daddu $s0, $a1, $zero +/* A1CA9C 8024199C 0040882D */ daddu $s1, $v0, $zero +/* A1CAA0 802419A0 C6420080 */ lwc1 $f2, 0x80($s2) +/* A1CAA4 802419A4 468010A0 */ cvt.s.w $f2, $f2 +/* A1CAA8 802419A8 460010A1 */ cvt.d.s $f2, $f2 +/* A1CAAC 802419AC C6400084 */ lwc1 $f0, 0x84($s2) +/* A1CAB0 802419B0 46800020 */ cvt.s.w $f0, $f0 +/* A1CAB4 802419B4 46000021 */ cvt.d.s $f0, $f0 +/* A1CAB8 802419B8 3C014059 */ lui $at, 0x4059 +/* A1CABC 802419BC 44812800 */ mtc1 $at, $f5 +/* A1CAC0 802419C0 44802000 */ mtc1 $zero, $f4 +/* A1CAC4 802419C4 8E4200CC */ lw $v0, 0xcc($s2) +/* A1CAC8 802419C8 C62C0038 */ lwc1 $f12, 0x38($s1) +/* A1CACC 802419CC C62E0040 */ lwc1 $f14, 0x40($s1) +/* A1CAD0 802419D0 46241083 */ div.d $f2, $f2, $f4 +/* A1CAD4 802419D4 462010A0 */ cvt.s.d $f2, $f2 +/* A1CAD8 802419D8 46240003 */ div.d $f0, $f0, $f4 +/* A1CADC 802419DC 8C420020 */ lw $v0, 0x20($v0) +/* A1CAE0 802419E0 46200020 */ cvt.s.d $f0, $f0 +/* A1CAE4 802419E4 E622001C */ swc1 $f2, 0x1c($s1) +/* A1CAE8 802419E8 E6200014 */ swc1 $f0, 0x14($s1) +/* A1CAEC 802419EC AE220028 */ sw $v0, 0x28($s1) +/* A1CAF0 802419F0 C6000018 */ lwc1 $f0, 0x18($s0) +/* A1CAF4 802419F4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A1CAF8 802419F8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A1CAFC 802419FC E6200018 */ swc1 $f0, 0x18($s1) +/* A1CB00 80241A00 8C460028 */ lw $a2, 0x28($v0) +/* A1CB04 80241A04 0C00A720 */ jal atan2 +/* A1CB08 80241A08 8C470030 */ lw $a3, 0x30($v0) +/* A1CB0C 80241A0C E620000C */ swc1 $f0, 0xc($s1) +/* A1CB10 80241A10 8E420018 */ lw $v0, 0x18($s2) +/* A1CB14 80241A14 AE400074 */ sw $zero, 0x74($s2) +/* A1CB18 80241A18 9442002A */ lhu $v0, 0x2a($v0) +/* A1CB1C 80241A1C 30420002 */ andi $v0, $v0, 2 +/* A1CB20 80241A20 10400005 */ beqz $v0, .L80241A38 +/* A1CB24 80241A24 24020003 */ addiu $v0, $zero, 3 +/* A1CB28 80241A28 A622008E */ sh $v0, 0x8e($s1) +/* A1CB2C 80241A2C 2402000D */ addiu $v0, $zero, 0xd +/* A1CB30 80241A30 080906A2 */ j .L80241A88 +/* A1CB34 80241A34 AE620070 */ sw $v0, 0x70($s3) +.L80241A38: +/* A1CB38 80241A38 24030001 */ addiu $v1, $zero, 1 +/* A1CB3C 80241A3C 2402000E */ addiu $v0, $zero, 0xe +/* A1CB40 80241A40 A623008E */ sh $v1, 0x8e($s1) +/* A1CB44 80241A44 AE620070 */ sw $v0, 0x70($s3) +/* A1CB48 80241A48 C6200038 */ lwc1 $f0, 0x38($s1) +/* A1CB4C 80241A4C 4600018D */ trunc.w.s $f6, $f0 +/* A1CB50 80241A50 44023000 */ mfc1 $v0, $f6 +/* A1CB54 80241A54 00000000 */ nop +/* A1CB58 80241A58 A6420010 */ sh $v0, 0x10($s2) +/* A1CB5C 80241A5C C620003C */ lwc1 $f0, 0x3c($s1) +/* A1CB60 80241A60 4600018D */ trunc.w.s $f6, $f0 +/* A1CB64 80241A64 44023000 */ mfc1 $v0, $f6 +/* A1CB68 80241A68 00000000 */ nop +/* A1CB6C 80241A6C A6420012 */ sh $v0, 0x12($s2) +/* A1CB70 80241A70 C6200040 */ lwc1 $f0, 0x40($s1) +/* A1CB74 80241A74 A2430007 */ sb $v1, 7($s2) +/* A1CB78 80241A78 4600018D */ trunc.w.s $f6, $f0 +/* A1CB7C 80241A7C 44023000 */ mfc1 $v0, $f6 +/* A1CB80 80241A80 00000000 */ nop +/* A1CB84 80241A84 A6420014 */ sh $v0, 0x14($s2) +.L80241A88: +/* A1CB88 80241A88 8FBF0020 */ lw $ra, 0x20($sp) +/* A1CB8C 80241A8C 8FB3001C */ lw $s3, 0x1c($sp) +/* A1CB90 80241A90 8FB20018 */ lw $s2, 0x18($sp) +/* A1CB94 80241A94 8FB10014 */ lw $s1, 0x14($sp) +/* A1CB98 80241A98 8FB00010 */ lw $s0, 0x10($sp) +/* A1CB9C 80241A9C 03E00008 */ jr $ra +/* A1CBA0 80241AA0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4.s deleted file mode 100644 index a0b0dfa2b4..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AA4 -/* A1CBA4 80241AA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1CBA8 80241AA8 AFB00010 */ sw $s0, 0x10($sp) -/* A1CBAC 80241AAC 0080802D */ daddu $s0, $a0, $zero -/* A1CBB0 80241AB0 AFBF0014 */ sw $ra, 0x14($sp) -/* A1CBB4 80241AB4 8E020148 */ lw $v0, 0x148($s0) -/* A1CBB8 80241AB8 0C00EABB */ jal get_npc_unsafe -/* A1CBBC 80241ABC 84440008 */ lh $a0, 8($v0) -/* A1CBC0 80241AC0 0040202D */ daddu $a0, $v0, $zero -/* A1CBC4 80241AC4 8482008E */ lh $v0, 0x8e($a0) -/* A1CBC8 80241AC8 9483008E */ lhu $v1, 0x8e($a0) -/* A1CBCC 80241ACC 18400005 */ blez $v0, .L80241AE4 -/* A1CBD0 80241AD0 2462FFFF */ addiu $v0, $v1, -1 -/* A1CBD4 80241AD4 A482008E */ sh $v0, 0x8e($a0) -/* A1CBD8 80241AD8 00021400 */ sll $v0, $v0, 0x10 -/* A1CBDC 80241ADC 1C400006 */ bgtz $v0, .L80241AF8 -/* A1CBE0 80241AE0 00000000 */ nop -.L80241AE4: -/* A1CBE4 80241AE4 8482008C */ lh $v0, 0x8c($a0) -/* A1CBE8 80241AE8 14400003 */ bnez $v0, .L80241AF8 -/* A1CBEC 80241AEC 2402000E */ addiu $v0, $zero, 0xe -/* A1CBF0 80241AF0 A480008E */ sh $zero, 0x8e($a0) -/* A1CBF4 80241AF4 AE020070 */ sw $v0, 0x70($s0) -.L80241AF8: -/* A1CBF8 80241AF8 8FBF0014 */ lw $ra, 0x14($sp) -/* A1CBFC 80241AFC 8FB00010 */ lw $s0, 0x10($sp) -/* A1CC00 80241B00 03E00008 */ jr $ra -/* A1CC04 80241B04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s new file mode 100644 index 0000000000..d91894f8dc --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241AA4_A1CBA4.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AA4_A1CBA4 +/* A1CBA4 80241AA4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1CBA8 80241AA8 AFB00010 */ sw $s0, 0x10($sp) +/* A1CBAC 80241AAC 0080802D */ daddu $s0, $a0, $zero +/* A1CBB0 80241AB0 AFBF0014 */ sw $ra, 0x14($sp) +/* A1CBB4 80241AB4 8E020148 */ lw $v0, 0x148($s0) +/* A1CBB8 80241AB8 0C00EABB */ jal get_npc_unsafe +/* A1CBBC 80241ABC 84440008 */ lh $a0, 8($v0) +/* A1CBC0 80241AC0 0040202D */ daddu $a0, $v0, $zero +/* A1CBC4 80241AC4 8482008E */ lh $v0, 0x8e($a0) +/* A1CBC8 80241AC8 9483008E */ lhu $v1, 0x8e($a0) +/* A1CBCC 80241ACC 18400005 */ blez $v0, .L80241AE4 +/* A1CBD0 80241AD0 2462FFFF */ addiu $v0, $v1, -1 +/* A1CBD4 80241AD4 A482008E */ sh $v0, 0x8e($a0) +/* A1CBD8 80241AD8 00021400 */ sll $v0, $v0, 0x10 +/* A1CBDC 80241ADC 1C400006 */ bgtz $v0, .L80241AF8 +/* A1CBE0 80241AE0 00000000 */ nop +.L80241AE4: +/* A1CBE4 80241AE4 8482008C */ lh $v0, 0x8c($a0) +/* A1CBE8 80241AE8 14400003 */ bnez $v0, .L80241AF8 +/* A1CBEC 80241AEC 2402000E */ addiu $v0, $zero, 0xe +/* A1CBF0 80241AF0 A480008E */ sh $zero, 0x8e($a0) +/* A1CBF4 80241AF4 AE020070 */ sw $v0, 0x70($s0) +.L80241AF8: +/* A1CBF8 80241AF8 8FBF0014 */ lw $ra, 0x14($sp) +/* A1CBFC 80241AFC 8FB00010 */ lw $s0, 0x10($sp) +/* A1CC00 80241B00 03E00008 */ jr $ra +/* A1CC04 80241B04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08.s deleted file mode 100644 index aca3d1df52..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B08 -/* A1CC08 80241B08 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A1CC0C 80241B0C AFB20030 */ sw $s2, 0x30($sp) -/* A1CC10 80241B10 0080902D */ daddu $s2, $a0, $zero -/* A1CC14 80241B14 AFBF0038 */ sw $ra, 0x38($sp) -/* A1CC18 80241B18 AFB30034 */ sw $s3, 0x34($sp) -/* A1CC1C 80241B1C AFB1002C */ sw $s1, 0x2c($sp) -/* A1CC20 80241B20 AFB00028 */ sw $s0, 0x28($sp) -/* A1CC24 80241B24 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A1CC28 80241B28 F7B40040 */ sdc1 $f20, 0x40($sp) -/* A1CC2C 80241B2C 8E510148 */ lw $s1, 0x148($s2) -/* A1CC30 80241B30 86240008 */ lh $a0, 8($s1) -/* A1CC34 80241B34 0C00EABB */ jal get_npc_unsafe -/* A1CC38 80241B38 00A0982D */ daddu $s3, $a1, $zero -/* A1CC3C 80241B3C 0040802D */ daddu $s0, $v0, $zero -/* A1CC40 80241B40 0200202D */ daddu $a0, $s0, $zero -/* A1CC44 80241B44 C6220088 */ lwc1 $f2, 0x88($s1) -/* A1CC48 80241B48 468010A0 */ cvt.s.w $f2, $f2 -/* A1CC4C 80241B4C 460010A1 */ cvt.d.s $f2, $f2 -/* A1CC50 80241B50 C604001C */ lwc1 $f4, 0x1c($s0) -/* A1CC54 80241B54 C6000014 */ lwc1 $f0, 0x14($s0) -/* A1CC58 80241B58 8E050018 */ lw $a1, 0x18($s0) -/* A1CC5C 80241B5C 46002100 */ add.s $f4, $f4, $f0 -/* A1CC60 80241B60 8E06000C */ lw $a2, 0xc($s0) -/* A1CC64 80241B64 C6200078 */ lwc1 $f0, 0x78($s1) -/* A1CC68 80241B68 46800020 */ cvt.s.w $f0, $f0 -/* A1CC6C 80241B6C E604001C */ swc1 $f4, 0x1c($s0) -/* A1CC70 80241B70 3C014059 */ lui $at, 0x4059 -/* A1CC74 80241B74 44812800 */ mtc1 $at, $f5 -/* A1CC78 80241B78 44802000 */ mtc1 $zero, $f4 -/* A1CC7C 80241B7C 46000021 */ cvt.d.s $f0, $f0 -/* A1CC80 80241B80 46240003 */ div.d $f0, $f0, $f4 -/* A1CC84 80241B84 46200520 */ cvt.s.d $f20, $f0 -/* A1CC88 80241B88 46241083 */ div.d $f2, $f2, $f4 -/* A1CC8C 80241B8C 0C00EA95 */ jal npc_move_heading -/* A1CC90 80241B90 462015A0 */ cvt.s.d $f22, $f2 -/* A1CC94 80241B94 C604001C */ lwc1 $f4, 0x1c($s0) -/* A1CC98 80241B98 44801000 */ mtc1 $zero, $f2 -/* A1CC9C 80241B9C 44801800 */ mtc1 $zero, $f3 -/* A1CCA0 80241BA0 46002021 */ cvt.d.s $f0, $f4 -/* A1CCA4 80241BA4 4620103E */ c.le.d $f2, $f0 -/* A1CCA8 80241BA8 00000000 */ nop -/* A1CCAC 80241BAC 45000030 */ bc1f .L80241C70 -/* A1CCB0 80241BB0 00000000 */ nop -/* A1CCB4 80241BB4 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1CCB8 80241BB8 46040000 */ add.s $f0, $f0, $f4 -/* A1CCBC 80241BBC E600003C */ swc1 $f0, 0x3c($s0) -/* A1CCC0 80241BC0 8E2200CC */ lw $v0, 0xcc($s1) -/* A1CCC4 80241BC4 8C420024 */ lw $v0, 0x24($v0) -/* A1CCC8 80241BC8 AE020028 */ sw $v0, 0x28($s0) -/* A1CCCC 80241BCC A2200007 */ sb $zero, 7($s1) -/* A1CCD0 80241BD0 8E020000 */ lw $v0, ($s0) -/* A1CCD4 80241BD4 30420008 */ andi $v0, $v0, 8 -/* A1CCD8 80241BD8 14400011 */ bnez $v0, .L80241C20 -/* A1CCDC 80241BDC 0000102D */ daddu $v0, $zero, $zero -/* A1CCE0 80241BE0 27A50018 */ addiu $a1, $sp, 0x18 -/* A1CCE4 80241BE4 27A6001C */ addiu $a2, $sp, 0x1c -/* A1CCE8 80241BE8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A1CCEC 80241BEC C602003C */ lwc1 $f2, 0x3c($s0) -/* A1CCF0 80241BF0 C6040040 */ lwc1 $f4, 0x40($s0) -/* A1CCF4 80241BF4 3C01447A */ lui $at, 0x447a -/* A1CCF8 80241BF8 44813000 */ mtc1 $at, $f6 -/* A1CCFC 80241BFC 27A20024 */ addiu $v0, $sp, 0x24 -/* A1CD00 80241C00 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1CD04 80241C04 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A1CD08 80241C08 E7A40020 */ swc1 $f4, 0x20($sp) -/* A1CD0C 80241C0C E7A60024 */ swc1 $f6, 0x24($sp) -/* A1CD10 80241C10 AFA20010 */ sw $v0, 0x10($sp) -/* A1CD14 80241C14 8E040080 */ lw $a0, 0x80($s0) -/* A1CD18 80241C18 0C0372DF */ jal func_800DCB7C -/* A1CD1C 80241C1C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241C20: -/* A1CD20 80241C20 1040000B */ beqz $v0, .L80241C50 -/* A1CD24 80241C24 00000000 */ nop -/* A1CD28 80241C28 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A1CD2C 80241C2C 46140080 */ add.s $f2, $f0, $f20 -/* A1CD30 80241C30 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1CD34 80241C34 4600103E */ c.le.s $f2, $f0 -/* A1CD38 80241C38 00000000 */ nop -/* A1CD3C 80241C3C 4500008D */ bc1f .L80241E74 -/* A1CD40 80241C40 00000000 */ nop -/* A1CD44 80241C44 E602003C */ swc1 $f2, 0x3c($s0) -/* A1CD48 80241C48 0809079D */ j .L80241E74 -/* A1CD4C 80241C4C AE400070 */ sw $zero, 0x70($s2) -.L80241C50: -/* A1CD50 80241C50 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1CD54 80241C54 C6000064 */ lwc1 $f0, 0x64($s0) -/* A1CD58 80241C58 4602003E */ c.le.s $f0, $f2 -/* A1CD5C 80241C5C 00000000 */ nop -/* A1CD60 80241C60 45030084 */ bc1tl .L80241E74 -/* A1CD64 80241C64 AE400070 */ sw $zero, 0x70($s2) -/* A1CD68 80241C68 0809079D */ j .L80241E74 -/* A1CD6C 80241C6C 00000000 */ nop -.L80241C70: -/* A1CD70 80241C70 4622003C */ c.lt.d $f0, $f2 -/* A1CD74 80241C74 00000000 */ nop -/* A1CD78 80241C78 4500007E */ bc1f .L80241E74 -/* A1CD7C 80241C7C 00000000 */ nop -/* A1CD80 80241C80 9602008E */ lhu $v0, 0x8e($s0) -/* A1CD84 80241C84 24420001 */ addiu $v0, $v0, 1 -/* A1CD88 80241C88 A602008E */ sh $v0, 0x8e($s0) -/* A1CD8C 80241C8C 00021400 */ sll $v0, $v0, 0x10 -/* A1CD90 80241C90 8E630020 */ lw $v1, 0x20($s3) -/* A1CD94 80241C94 00021403 */ sra $v0, $v0, 0x10 -/* A1CD98 80241C98 0043102A */ slt $v0, $v0, $v1 -/* A1CD9C 80241C9C 14400026 */ bnez $v0, .L80241D38 -/* A1CDA0 80241CA0 00000000 */ nop -/* A1CDA4 80241CA4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A1CDA8 80241CA8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A1CDAC 80241CAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A1CDB0 80241CB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A1CDB4 80241CB4 A600008E */ sh $zero, 0x8e($s0) -/* A1CDB8 80241CB8 8C460028 */ lw $a2, 0x28($v0) -/* A1CDBC 80241CBC 0C00A720 */ jal atan2 -/* A1CDC0 80241CC0 8C470030 */ lw $a3, 0x30($v0) -/* A1CDC4 80241CC4 46000506 */ mov.s $f20, $f0 -/* A1CDC8 80241CC8 C60C000C */ lwc1 $f12, 0xc($s0) -/* A1CDCC 80241CCC 0C00A70A */ jal get_clamped_angle_diff -/* A1CDD0 80241CD0 4600A386 */ mov.s $f14, $f20 -/* A1CDD4 80241CD4 46000086 */ mov.s $f2, $f0 -/* A1CDD8 80241CD8 8E62001C */ lw $v0, 0x1c($s3) -/* A1CDDC 80241CDC 46001005 */ abs.s $f0, $f2 -/* A1CDE0 80241CE0 44822000 */ mtc1 $v0, $f4 -/* A1CDE4 80241CE4 00000000 */ nop -/* A1CDE8 80241CE8 46802120 */ cvt.s.w $f4, $f4 -/* A1CDEC 80241CEC 4600203C */ c.lt.s $f4, $f0 -/* A1CDF0 80241CF0 00000000 */ nop -/* A1CDF4 80241CF4 4500000D */ bc1f .L80241D2C -/* A1CDF8 80241CF8 00000000 */ nop -/* A1CDFC 80241CFC 44800000 */ mtc1 $zero, $f0 -/* A1CE00 80241D00 C614000C */ lwc1 $f20, 0xc($s0) -/* A1CE04 80241D04 4600103C */ c.lt.s $f2, $f0 -/* A1CE08 80241D08 00000000 */ nop -/* A1CE0C 80241D0C 45000006 */ bc1f .L80241D28 -/* A1CE10 80241D10 00021023 */ negu $v0, $v0 -/* A1CE14 80241D14 44820000 */ mtc1 $v0, $f0 -/* A1CE18 80241D18 00000000 */ nop -/* A1CE1C 80241D1C 46800020 */ cvt.s.w $f0, $f0 -/* A1CE20 80241D20 0809074B */ j .L80241D2C -/* A1CE24 80241D24 4600A500 */ add.s $f20, $f20, $f0 -.L80241D28: -/* A1CE28 80241D28 4604A500 */ add.s $f20, $f20, $f4 -.L80241D2C: -/* A1CE2C 80241D2C 0C00A6C9 */ jal clamp_angle -/* A1CE30 80241D30 4600A306 */ mov.s $f12, $f20 -/* A1CE34 80241D34 E600000C */ swc1 $f0, 0xc($s0) -.L80241D38: -/* A1CE38 80241D38 8E020000 */ lw $v0, ($s0) -/* A1CE3C 80241D3C 30420008 */ andi $v0, $v0, 8 -/* A1CE40 80241D40 1040000A */ beqz $v0, .L80241D6C -/* A1CE44 80241D44 27A50018 */ addiu $a1, $sp, 0x18 -/* A1CE48 80241D48 C602003C */ lwc1 $f2, 0x3c($s0) -/* A1CE4C 80241D4C C600001C */ lwc1 $f0, 0x1c($s0) -/* A1CE50 80241D50 46001080 */ add.s $f2, $f2, $f0 -/* A1CE54 80241D54 4616103C */ c.lt.s $f2, $f22 -/* A1CE58 80241D58 00000000 */ nop -/* A1CE5C 80241D5C 45020045 */ bc1fl .L80241E74 -/* A1CE60 80241D60 E602003C */ swc1 $f2, 0x3c($s0) -/* A1CE64 80241D64 0809079C */ j .L80241E70 -/* A1CE68 80241D68 E616003C */ swc1 $f22, 0x3c($s0) -.L80241D6C: -/* A1CE6C 80241D6C C6000038 */ lwc1 $f0, 0x38($s0) -/* A1CE70 80241D70 27A6001C */ addiu $a2, $sp, 0x1c -/* A1CE74 80241D74 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1CE78 80241D78 860200A8 */ lh $v0, 0xa8($s0) -/* A1CE7C 80241D7C C600001C */ lwc1 $f0, 0x1c($s0) -/* A1CE80 80241D80 C604003C */ lwc1 $f4, 0x3c($s0) -/* A1CE84 80241D84 44821000 */ mtc1 $v0, $f2 -/* A1CE88 80241D88 00000000 */ nop -/* A1CE8C 80241D8C 468010A0 */ cvt.s.w $f2, $f2 -/* A1CE90 80241D90 46000005 */ abs.s $f0, $f0 -/* A1CE94 80241D94 46020000 */ add.s $f0, $f0, $f2 -/* A1CE98 80241D98 C6060040 */ lwc1 $f6, 0x40($s0) -/* A1CE9C 80241D9C 27A20024 */ addiu $v0, $sp, 0x24 -/* A1CEA0 80241DA0 46022100 */ add.s $f4, $f4, $f2 -/* A1CEA4 80241DA4 3C014024 */ lui $at, 0x4024 -/* A1CEA8 80241DA8 44811800 */ mtc1 $at, $f3 -/* A1CEAC 80241DAC 44801000 */ mtc1 $zero, $f2 -/* A1CEB0 80241DB0 46000021 */ cvt.d.s $f0, $f0 -/* A1CEB4 80241DB4 46220000 */ add.d $f0, $f0, $f2 -/* A1CEB8 80241DB8 E7A60020 */ swc1 $f6, 0x20($sp) -/* A1CEBC 80241DBC E7A4001C */ swc1 $f4, 0x1c($sp) -/* A1CEC0 80241DC0 46200020 */ cvt.s.d $f0, $f0 -/* A1CEC4 80241DC4 E7A00024 */ swc1 $f0, 0x24($sp) -/* A1CEC8 80241DC8 AFA20010 */ sw $v0, 0x10($sp) -/* A1CECC 80241DCC 8E040080 */ lw $a0, 0x80($s0) -/* A1CED0 80241DD0 0C0372DF */ jal func_800DCB7C -/* A1CED4 80241DD4 27A70020 */ addiu $a3, $sp, 0x20 -/* A1CED8 80241DD8 10400015 */ beqz $v0, .L80241E30 -/* A1CEDC 80241DDC 00000000 */ nop -/* A1CEE0 80241DE0 860200A8 */ lh $v0, 0xa8($s0) -/* A1CEE4 80241DE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* A1CEE8 80241DE8 44820000 */ mtc1 $v0, $f0 -/* A1CEEC 80241DEC 00000000 */ nop -/* A1CEF0 80241DF0 46800020 */ cvt.s.w $f0, $f0 -/* A1CEF4 80241DF4 46002085 */ abs.s $f2, $f4 -/* A1CEF8 80241DF8 46020000 */ add.s $f0, $f0, $f2 -/* A1CEFC 80241DFC C7A20024 */ lwc1 $f2, 0x24($sp) -/* A1CF00 80241E00 4600103E */ c.le.s $f2, $f0 -/* A1CF04 80241E04 00000000 */ nop -/* A1CF08 80241E08 45000005 */ bc1f .L80241E20 -/* A1CF0C 80241E0C 00000000 */ nop -/* A1CF10 80241E10 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A1CF14 80241E14 AE00001C */ sw $zero, 0x1c($s0) -/* A1CF18 80241E18 0809079D */ j .L80241E74 -/* A1CF1C 80241E1C E600003C */ swc1 $f0, 0x3c($s0) -.L80241E20: -/* A1CF20 80241E20 C600003C */ lwc1 $f0, 0x3c($s0) -/* A1CF24 80241E24 46040000 */ add.s $f0, $f0, $f4 -/* A1CF28 80241E28 0809079D */ j .L80241E74 -/* A1CF2C 80241E2C E600003C */ swc1 $f0, 0x3c($s0) -.L80241E30: -/* A1CF30 80241E30 C606003C */ lwc1 $f6, 0x3c($s0) -/* A1CF34 80241E34 860200A8 */ lh $v0, 0xa8($s0) -/* A1CF38 80241E38 46163081 */ sub.s $f2, $f6, $f22 -/* A1CF3C 80241E3C 44820000 */ mtc1 $v0, $f0 -/* A1CF40 80241E40 00000000 */ nop -/* A1CF44 80241E44 46800020 */ cvt.s.w $f0, $f0 -/* A1CF48 80241E48 46001080 */ add.s $f2, $f2, $f0 -/* A1CF4C 80241E4C C604001C */ lwc1 $f4, 0x1c($s0) -/* A1CF50 80241E50 46002005 */ abs.s $f0, $f4 -/* A1CF54 80241E54 4602003C */ c.lt.s $f0, $f2 -/* A1CF58 80241E58 00000000 */ nop -/* A1CF5C 80241E5C 45020005 */ bc1fl .L80241E74 -/* A1CF60 80241E60 AE00001C */ sw $zero, 0x1c($s0) -/* A1CF64 80241E64 46043000 */ add.s $f0, $f6, $f4 -/* A1CF68 80241E68 0809079D */ j .L80241E74 -/* A1CF6C 80241E6C E600003C */ swc1 $f0, 0x3c($s0) -.L80241E70: -/* A1CF70 80241E70 AE00001C */ sw $zero, 0x1c($s0) -.L80241E74: -/* A1CF74 80241E74 8FBF0038 */ lw $ra, 0x38($sp) -/* A1CF78 80241E78 8FB30034 */ lw $s3, 0x34($sp) -/* A1CF7C 80241E7C 8FB20030 */ lw $s2, 0x30($sp) -/* A1CF80 80241E80 8FB1002C */ lw $s1, 0x2c($sp) -/* A1CF84 80241E84 8FB00028 */ lw $s0, 0x28($sp) -/* A1CF88 80241E88 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A1CF8C 80241E8C D7B40040 */ ldc1 $f20, 0x40($sp) -/* A1CF90 80241E90 03E00008 */ jr $ra -/* A1CF94 80241E94 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s new file mode 100644 index 0000000000..237468e9a5 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241B08_A1CC08.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B08_A1CC08 +/* A1CC08 80241B08 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A1CC0C 80241B0C AFB20030 */ sw $s2, 0x30($sp) +/* A1CC10 80241B10 0080902D */ daddu $s2, $a0, $zero +/* A1CC14 80241B14 AFBF0038 */ sw $ra, 0x38($sp) +/* A1CC18 80241B18 AFB30034 */ sw $s3, 0x34($sp) +/* A1CC1C 80241B1C AFB1002C */ sw $s1, 0x2c($sp) +/* A1CC20 80241B20 AFB00028 */ sw $s0, 0x28($sp) +/* A1CC24 80241B24 F7B60048 */ sdc1 $f22, 0x48($sp) +/* A1CC28 80241B28 F7B40040 */ sdc1 $f20, 0x40($sp) +/* A1CC2C 80241B2C 8E510148 */ lw $s1, 0x148($s2) +/* A1CC30 80241B30 86240008 */ lh $a0, 8($s1) +/* A1CC34 80241B34 0C00EABB */ jal get_npc_unsafe +/* A1CC38 80241B38 00A0982D */ daddu $s3, $a1, $zero +/* A1CC3C 80241B3C 0040802D */ daddu $s0, $v0, $zero +/* A1CC40 80241B40 0200202D */ daddu $a0, $s0, $zero +/* A1CC44 80241B44 C6220088 */ lwc1 $f2, 0x88($s1) +/* A1CC48 80241B48 468010A0 */ cvt.s.w $f2, $f2 +/* A1CC4C 80241B4C 460010A1 */ cvt.d.s $f2, $f2 +/* A1CC50 80241B50 C604001C */ lwc1 $f4, 0x1c($s0) +/* A1CC54 80241B54 C6000014 */ lwc1 $f0, 0x14($s0) +/* A1CC58 80241B58 8E050018 */ lw $a1, 0x18($s0) +/* A1CC5C 80241B5C 46002100 */ add.s $f4, $f4, $f0 +/* A1CC60 80241B60 8E06000C */ lw $a2, 0xc($s0) +/* A1CC64 80241B64 C6200078 */ lwc1 $f0, 0x78($s1) +/* A1CC68 80241B68 46800020 */ cvt.s.w $f0, $f0 +/* A1CC6C 80241B6C E604001C */ swc1 $f4, 0x1c($s0) +/* A1CC70 80241B70 3C014059 */ lui $at, 0x4059 +/* A1CC74 80241B74 44812800 */ mtc1 $at, $f5 +/* A1CC78 80241B78 44802000 */ mtc1 $zero, $f4 +/* A1CC7C 80241B7C 46000021 */ cvt.d.s $f0, $f0 +/* A1CC80 80241B80 46240003 */ div.d $f0, $f0, $f4 +/* A1CC84 80241B84 46200520 */ cvt.s.d $f20, $f0 +/* A1CC88 80241B88 46241083 */ div.d $f2, $f2, $f4 +/* A1CC8C 80241B8C 0C00EA95 */ jal npc_move_heading +/* A1CC90 80241B90 462015A0 */ cvt.s.d $f22, $f2 +/* A1CC94 80241B94 C604001C */ lwc1 $f4, 0x1c($s0) +/* A1CC98 80241B98 44801000 */ mtc1 $zero, $f2 +/* A1CC9C 80241B9C 44801800 */ mtc1 $zero, $f3 +/* A1CCA0 80241BA0 46002021 */ cvt.d.s $f0, $f4 +/* A1CCA4 80241BA4 4620103E */ c.le.d $f2, $f0 +/* A1CCA8 80241BA8 00000000 */ nop +/* A1CCAC 80241BAC 45000030 */ bc1f .L80241C70 +/* A1CCB0 80241BB0 00000000 */ nop +/* A1CCB4 80241BB4 C600003C */ lwc1 $f0, 0x3c($s0) +/* A1CCB8 80241BB8 46040000 */ add.s $f0, $f0, $f4 +/* A1CCBC 80241BBC E600003C */ swc1 $f0, 0x3c($s0) +/* A1CCC0 80241BC0 8E2200CC */ lw $v0, 0xcc($s1) +/* A1CCC4 80241BC4 8C420024 */ lw $v0, 0x24($v0) +/* A1CCC8 80241BC8 AE020028 */ sw $v0, 0x28($s0) +/* A1CCCC 80241BCC A2200007 */ sb $zero, 7($s1) +/* A1CCD0 80241BD0 8E020000 */ lw $v0, ($s0) +/* A1CCD4 80241BD4 30420008 */ andi $v0, $v0, 8 +/* A1CCD8 80241BD8 14400011 */ bnez $v0, .L80241C20 +/* A1CCDC 80241BDC 0000102D */ daddu $v0, $zero, $zero +/* A1CCE0 80241BE0 27A50018 */ addiu $a1, $sp, 0x18 +/* A1CCE4 80241BE4 27A6001C */ addiu $a2, $sp, 0x1c +/* A1CCE8 80241BE8 C6000038 */ lwc1 $f0, 0x38($s0) +/* A1CCEC 80241BEC C602003C */ lwc1 $f2, 0x3c($s0) +/* A1CCF0 80241BF0 C6040040 */ lwc1 $f4, 0x40($s0) +/* A1CCF4 80241BF4 3C01447A */ lui $at, 0x447a +/* A1CCF8 80241BF8 44813000 */ mtc1 $at, $f6 +/* A1CCFC 80241BFC 27A20024 */ addiu $v0, $sp, 0x24 +/* A1CD00 80241C00 E7A00018 */ swc1 $f0, 0x18($sp) +/* A1CD04 80241C04 E7A2001C */ swc1 $f2, 0x1c($sp) +/* A1CD08 80241C08 E7A40020 */ swc1 $f4, 0x20($sp) +/* A1CD0C 80241C0C E7A60024 */ swc1 $f6, 0x24($sp) +/* A1CD10 80241C10 AFA20010 */ sw $v0, 0x10($sp) +/* A1CD14 80241C14 8E040080 */ lw $a0, 0x80($s0) +/* A1CD18 80241C18 0C0372DF */ jal func_800DCB7C +/* A1CD1C 80241C1C 27A70020 */ addiu $a3, $sp, 0x20 +.L80241C20: +/* A1CD20 80241C20 1040000B */ beqz $v0, .L80241C50 +/* A1CD24 80241C24 00000000 */ nop +/* A1CD28 80241C28 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A1CD2C 80241C2C 46140080 */ add.s $f2, $f0, $f20 +/* A1CD30 80241C30 C600003C */ lwc1 $f0, 0x3c($s0) +/* A1CD34 80241C34 4600103E */ c.le.s $f2, $f0 +/* A1CD38 80241C38 00000000 */ nop +/* A1CD3C 80241C3C 4500008D */ bc1f .L80241E74 +/* A1CD40 80241C40 00000000 */ nop +/* A1CD44 80241C44 E602003C */ swc1 $f2, 0x3c($s0) +/* A1CD48 80241C48 0809079D */ j .L80241E74 +/* A1CD4C 80241C4C AE400070 */ sw $zero, 0x70($s2) +.L80241C50: +/* A1CD50 80241C50 C602003C */ lwc1 $f2, 0x3c($s0) +/* A1CD54 80241C54 C6000064 */ lwc1 $f0, 0x64($s0) +/* A1CD58 80241C58 4602003E */ c.le.s $f0, $f2 +/* A1CD5C 80241C5C 00000000 */ nop +/* A1CD60 80241C60 45030084 */ bc1tl .L80241E74 +/* A1CD64 80241C64 AE400070 */ sw $zero, 0x70($s2) +/* A1CD68 80241C68 0809079D */ j .L80241E74 +/* A1CD6C 80241C6C 00000000 */ nop +.L80241C70: +/* A1CD70 80241C70 4622003C */ c.lt.d $f0, $f2 +/* A1CD74 80241C74 00000000 */ nop +/* A1CD78 80241C78 4500007E */ bc1f .L80241E74 +/* A1CD7C 80241C7C 00000000 */ nop +/* A1CD80 80241C80 9602008E */ lhu $v0, 0x8e($s0) +/* A1CD84 80241C84 24420001 */ addiu $v0, $v0, 1 +/* A1CD88 80241C88 A602008E */ sh $v0, 0x8e($s0) +/* A1CD8C 80241C8C 00021400 */ sll $v0, $v0, 0x10 +/* A1CD90 80241C90 8E630020 */ lw $v1, 0x20($s3) +/* A1CD94 80241C94 00021403 */ sra $v0, $v0, 0x10 +/* A1CD98 80241C98 0043102A */ slt $v0, $v0, $v1 +/* A1CD9C 80241C9C 14400026 */ bnez $v0, .L80241D38 +/* A1CDA0 80241CA0 00000000 */ nop +/* A1CDA4 80241CA4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A1CDA8 80241CA8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A1CDAC 80241CAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A1CDB0 80241CB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A1CDB4 80241CB4 A600008E */ sh $zero, 0x8e($s0) +/* A1CDB8 80241CB8 8C460028 */ lw $a2, 0x28($v0) +/* A1CDBC 80241CBC 0C00A720 */ jal atan2 +/* A1CDC0 80241CC0 8C470030 */ lw $a3, 0x30($v0) +/* A1CDC4 80241CC4 46000506 */ mov.s $f20, $f0 +/* A1CDC8 80241CC8 C60C000C */ lwc1 $f12, 0xc($s0) +/* A1CDCC 80241CCC 0C00A70A */ jal get_clamped_angle_diff +/* A1CDD0 80241CD0 4600A386 */ mov.s $f14, $f20 +/* A1CDD4 80241CD4 46000086 */ mov.s $f2, $f0 +/* A1CDD8 80241CD8 8E62001C */ lw $v0, 0x1c($s3) +/* A1CDDC 80241CDC 46001005 */ abs.s $f0, $f2 +/* A1CDE0 80241CE0 44822000 */ mtc1 $v0, $f4 +/* A1CDE4 80241CE4 00000000 */ nop +/* A1CDE8 80241CE8 46802120 */ cvt.s.w $f4, $f4 +/* A1CDEC 80241CEC 4600203C */ c.lt.s $f4, $f0 +/* A1CDF0 80241CF0 00000000 */ nop +/* A1CDF4 80241CF4 4500000D */ bc1f .L80241D2C +/* A1CDF8 80241CF8 00000000 */ nop +/* A1CDFC 80241CFC 44800000 */ mtc1 $zero, $f0 +/* A1CE00 80241D00 C614000C */ lwc1 $f20, 0xc($s0) +/* A1CE04 80241D04 4600103C */ c.lt.s $f2, $f0 +/* A1CE08 80241D08 00000000 */ nop +/* A1CE0C 80241D0C 45000006 */ bc1f .L80241D28 +/* A1CE10 80241D10 00021023 */ negu $v0, $v0 +/* A1CE14 80241D14 44820000 */ mtc1 $v0, $f0 +/* A1CE18 80241D18 00000000 */ nop +/* A1CE1C 80241D1C 46800020 */ cvt.s.w $f0, $f0 +/* A1CE20 80241D20 0809074B */ j .L80241D2C +/* A1CE24 80241D24 4600A500 */ add.s $f20, $f20, $f0 +.L80241D28: +/* A1CE28 80241D28 4604A500 */ add.s $f20, $f20, $f4 +.L80241D2C: +/* A1CE2C 80241D2C 0C00A6C9 */ jal clamp_angle +/* A1CE30 80241D30 4600A306 */ mov.s $f12, $f20 +/* A1CE34 80241D34 E600000C */ swc1 $f0, 0xc($s0) +.L80241D38: +/* A1CE38 80241D38 8E020000 */ lw $v0, ($s0) +/* A1CE3C 80241D3C 30420008 */ andi $v0, $v0, 8 +/* A1CE40 80241D40 1040000A */ beqz $v0, .L80241D6C +/* A1CE44 80241D44 27A50018 */ addiu $a1, $sp, 0x18 +/* A1CE48 80241D48 C602003C */ lwc1 $f2, 0x3c($s0) +/* A1CE4C 80241D4C C600001C */ lwc1 $f0, 0x1c($s0) +/* A1CE50 80241D50 46001080 */ add.s $f2, $f2, $f0 +/* A1CE54 80241D54 4616103C */ c.lt.s $f2, $f22 +/* A1CE58 80241D58 00000000 */ nop +/* A1CE5C 80241D5C 45020045 */ bc1fl .L80241E74 +/* A1CE60 80241D60 E602003C */ swc1 $f2, 0x3c($s0) +/* A1CE64 80241D64 0809079C */ j .L80241E70 +/* A1CE68 80241D68 E616003C */ swc1 $f22, 0x3c($s0) +.L80241D6C: +/* A1CE6C 80241D6C C6000038 */ lwc1 $f0, 0x38($s0) +/* A1CE70 80241D70 27A6001C */ addiu $a2, $sp, 0x1c +/* A1CE74 80241D74 E7A00018 */ swc1 $f0, 0x18($sp) +/* A1CE78 80241D78 860200A8 */ lh $v0, 0xa8($s0) +/* A1CE7C 80241D7C C600001C */ lwc1 $f0, 0x1c($s0) +/* A1CE80 80241D80 C604003C */ lwc1 $f4, 0x3c($s0) +/* A1CE84 80241D84 44821000 */ mtc1 $v0, $f2 +/* A1CE88 80241D88 00000000 */ nop +/* A1CE8C 80241D8C 468010A0 */ cvt.s.w $f2, $f2 +/* A1CE90 80241D90 46000005 */ abs.s $f0, $f0 +/* A1CE94 80241D94 46020000 */ add.s $f0, $f0, $f2 +/* A1CE98 80241D98 C6060040 */ lwc1 $f6, 0x40($s0) +/* A1CE9C 80241D9C 27A20024 */ addiu $v0, $sp, 0x24 +/* A1CEA0 80241DA0 46022100 */ add.s $f4, $f4, $f2 +/* A1CEA4 80241DA4 3C014024 */ lui $at, 0x4024 +/* A1CEA8 80241DA8 44811800 */ mtc1 $at, $f3 +/* A1CEAC 80241DAC 44801000 */ mtc1 $zero, $f2 +/* A1CEB0 80241DB0 46000021 */ cvt.d.s $f0, $f0 +/* A1CEB4 80241DB4 46220000 */ add.d $f0, $f0, $f2 +/* A1CEB8 80241DB8 E7A60020 */ swc1 $f6, 0x20($sp) +/* A1CEBC 80241DBC E7A4001C */ swc1 $f4, 0x1c($sp) +/* A1CEC0 80241DC0 46200020 */ cvt.s.d $f0, $f0 +/* A1CEC4 80241DC4 E7A00024 */ swc1 $f0, 0x24($sp) +/* A1CEC8 80241DC8 AFA20010 */ sw $v0, 0x10($sp) +/* A1CECC 80241DCC 8E040080 */ lw $a0, 0x80($s0) +/* A1CED0 80241DD0 0C0372DF */ jal func_800DCB7C +/* A1CED4 80241DD4 27A70020 */ addiu $a3, $sp, 0x20 +/* A1CED8 80241DD8 10400015 */ beqz $v0, .L80241E30 +/* A1CEDC 80241DDC 00000000 */ nop +/* A1CEE0 80241DE0 860200A8 */ lh $v0, 0xa8($s0) +/* A1CEE4 80241DE4 C604001C */ lwc1 $f4, 0x1c($s0) +/* A1CEE8 80241DE8 44820000 */ mtc1 $v0, $f0 +/* A1CEEC 80241DEC 00000000 */ nop +/* A1CEF0 80241DF0 46800020 */ cvt.s.w $f0, $f0 +/* A1CEF4 80241DF4 46002085 */ abs.s $f2, $f4 +/* A1CEF8 80241DF8 46020000 */ add.s $f0, $f0, $f2 +/* A1CEFC 80241DFC C7A20024 */ lwc1 $f2, 0x24($sp) +/* A1CF00 80241E00 4600103E */ c.le.s $f2, $f0 +/* A1CF04 80241E04 00000000 */ nop +/* A1CF08 80241E08 45000005 */ bc1f .L80241E20 +/* A1CF0C 80241E0C 00000000 */ nop +/* A1CF10 80241E10 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A1CF14 80241E14 AE00001C */ sw $zero, 0x1c($s0) +/* A1CF18 80241E18 0809079D */ j .L80241E74 +/* A1CF1C 80241E1C E600003C */ swc1 $f0, 0x3c($s0) +.L80241E20: +/* A1CF20 80241E20 C600003C */ lwc1 $f0, 0x3c($s0) +/* A1CF24 80241E24 46040000 */ add.s $f0, $f0, $f4 +/* A1CF28 80241E28 0809079D */ j .L80241E74 +/* A1CF2C 80241E2C E600003C */ swc1 $f0, 0x3c($s0) +.L80241E30: +/* A1CF30 80241E30 C606003C */ lwc1 $f6, 0x3c($s0) +/* A1CF34 80241E34 860200A8 */ lh $v0, 0xa8($s0) +/* A1CF38 80241E38 46163081 */ sub.s $f2, $f6, $f22 +/* A1CF3C 80241E3C 44820000 */ mtc1 $v0, $f0 +/* A1CF40 80241E40 00000000 */ nop +/* A1CF44 80241E44 46800020 */ cvt.s.w $f0, $f0 +/* A1CF48 80241E48 46001080 */ add.s $f2, $f2, $f0 +/* A1CF4C 80241E4C C604001C */ lwc1 $f4, 0x1c($s0) +/* A1CF50 80241E50 46002005 */ abs.s $f0, $f4 +/* A1CF54 80241E54 4602003C */ c.lt.s $f0, $f2 +/* A1CF58 80241E58 00000000 */ nop +/* A1CF5C 80241E5C 45020005 */ bc1fl .L80241E74 +/* A1CF60 80241E60 AE00001C */ sw $zero, 0x1c($s0) +/* A1CF64 80241E64 46043000 */ add.s $f0, $f6, $f4 +/* A1CF68 80241E68 0809079D */ j .L80241E74 +/* A1CF6C 80241E6C E600003C */ swc1 $f0, 0x3c($s0) +.L80241E70: +/* A1CF70 80241E70 AE00001C */ sw $zero, 0x1c($s0) +.L80241E74: +/* A1CF74 80241E74 8FBF0038 */ lw $ra, 0x38($sp) +/* A1CF78 80241E78 8FB30034 */ lw $s3, 0x34($sp) +/* A1CF7C 80241E7C 8FB20030 */ lw $s2, 0x30($sp) +/* A1CF80 80241E80 8FB1002C */ lw $s1, 0x2c($sp) +/* A1CF84 80241E84 8FB00028 */ lw $s0, 0x28($sp) +/* A1CF88 80241E88 D7B60048 */ ldc1 $f22, 0x48($sp) +/* A1CF8C 80241E8C D7B40040 */ ldc1 $f20, 0x40($sp) +/* A1CF90 80241E90 03E00008 */ jr $ra +/* A1CF94 80241E94 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98.s deleted file mode 100644 index 5ec9cd4ac2..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E98 -/* A1CF98 80241E98 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A1CF9C 80241E9C AFB00028 */ sw $s0, 0x28($sp) -/* A1CFA0 80241EA0 00A0802D */ daddu $s0, $a1, $zero -/* A1CFA4 80241EA4 AFB1002C */ sw $s1, 0x2c($sp) -/* A1CFA8 80241EA8 00C0882D */ daddu $s1, $a2, $zero -/* A1CFAC 80241EAC AFBF0034 */ sw $ra, 0x34($sp) -/* A1CFB0 80241EB0 AFB20030 */ sw $s2, 0x30($sp) -/* A1CFB4 80241EB4 AE200070 */ sw $zero, 0x70($s1) -/* A1CFB8 80241EB8 8C830000 */ lw $v1, ($a0) -/* A1CFBC 80241EBC 2402FDFF */ addiu $v0, $zero, -0x201 -/* A1CFC0 80241EC0 A480008E */ sh $zero, 0x8e($a0) -/* A1CFC4 80241EC4 00621824 */ and $v1, $v1, $v0 -/* A1CFC8 80241EC8 34650800 */ ori $a1, $v1, 0x800 -/* A1CFCC 80241ECC AC850000 */ sw $a1, ($a0) -/* A1CFD0 80241ED0 8E0200D0 */ lw $v0, 0xd0($s0) -/* A1CFD4 80241ED4 8C420034 */ lw $v0, 0x34($v0) -/* A1CFD8 80241ED8 10400003 */ beqz $v0, .L80241EE8 -/* A1CFDC 80241EDC 00E0902D */ daddu $s2, $a3, $zero -/* A1CFE0 80241EE0 080907BC */ j .L80241EF0 -/* A1CFE4 80241EE4 34620808 */ ori $v0, $v1, 0x808 -.L80241EE8: -/* A1CFE8 80241EE8 2402FFF7 */ addiu $v0, $zero, -9 -/* A1CFEC 80241EEC 00A21024 */ and $v0, $a1, $v0 -.L80241EF0: -/* A1CFF0 80241EF0 AC820000 */ sw $v0, ($a0) -/* A1CFF4 80241EF4 27A20024 */ addiu $v0, $sp, 0x24 -/* A1CFF8 80241EF8 27A50018 */ addiu $a1, $sp, 0x18 -/* A1CFFC 80241EFC C4800038 */ lwc1 $f0, 0x38($a0) -/* A1D000 80241F00 C482003C */ lwc1 $f2, 0x3c($a0) -/* A1D004 80241F04 C4840040 */ lwc1 $f4, 0x40($a0) -/* A1D008 80241F08 3C01447A */ lui $at, 0x447a -/* A1D00C 80241F0C 44813000 */ mtc1 $at, $f6 -/* A1D010 80241F10 27A6001C */ addiu $a2, $sp, 0x1c -/* A1D014 80241F14 E7A00018 */ swc1 $f0, 0x18($sp) -/* A1D018 80241F18 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A1D01C 80241F1C E7A40020 */ swc1 $f4, 0x20($sp) -/* A1D020 80241F20 E7A60024 */ swc1 $f6, 0x24($sp) -/* A1D024 80241F24 AFA20010 */ sw $v0, 0x10($sp) -/* A1D028 80241F28 8C840080 */ lw $a0, 0x80($a0) -/* A1D02C 80241F2C 0C0372DF */ jal func_800DCB7C -/* A1D030 80241F30 27A70020 */ addiu $a3, $sp, 0x20 -/* A1D034 80241F34 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A1D038 80241F38 3C014059 */ lui $at, 0x4059 -/* A1D03C 80241F3C 44812800 */ mtc1 $at, $f5 -/* A1D040 80241F40 44802000 */ mtc1 $zero, $f4 -/* A1D044 80241F44 460010A1 */ cvt.d.s $f2, $f2 -/* A1D048 80241F48 46241082 */ mul.d $f2, $f2, $f4 -/* A1D04C 80241F4C 00000000 */ nop -/* A1D050 80241F50 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A1D054 80241F54 46000021 */ cvt.d.s $f0, $f0 -/* A1D058 80241F58 46240002 */ mul.d $f0, $f0, $f4 -/* A1D05C 80241F5C 00000000 */ nop -/* A1D060 80241F60 3C013FE0 */ lui $at, 0x3fe0 -/* A1D064 80241F64 44812800 */ mtc1 $at, $f5 -/* A1D068 80241F68 44802000 */ mtc1 $zero, $f4 -/* A1D06C 80241F6C 00000000 */ nop -/* A1D070 80241F70 46241080 */ add.d $f2, $f2, $f4 -/* A1D074 80241F74 AE000074 */ sw $zero, 0x74($s0) -/* A1D078 80241F78 46240000 */ add.d $f0, $f0, $f4 -/* A1D07C 80241F7C AE000090 */ sw $zero, 0x90($s0) -/* A1D080 80241F80 4620120D */ trunc.w.d $f8, $f2 -/* A1D084 80241F84 E6080078 */ swc1 $f8, 0x78($s0) -/* A1D088 80241F88 4620020D */ trunc.w.d $f8, $f0 -/* A1D08C 80241F8C E6080088 */ swc1 $f8, 0x88($s0) -/* A1D090 80241F90 8E420014 */ lw $v0, 0x14($s2) -/* A1D094 80241F94 AE220074 */ sw $v0, 0x74($s1) -/* A1D098 80241F98 8E0200B0 */ lw $v0, 0xb0($s0) -/* A1D09C 80241F9C 34420010 */ ori $v0, $v0, 0x10 -/* A1D0A0 80241FA0 AE0200B0 */ sw $v0, 0xb0($s0) -/* A1D0A4 80241FA4 8FBF0034 */ lw $ra, 0x34($sp) -/* A1D0A8 80241FA8 8FB20030 */ lw $s2, 0x30($sp) -/* A1D0AC 80241FAC 8FB1002C */ lw $s1, 0x2c($sp) -/* A1D0B0 80241FB0 8FB00028 */ lw $s0, 0x28($sp) -/* A1D0B4 80241FB4 03E00008 */ jr $ra -/* A1D0B8 80241FB8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s new file mode 100644 index 0000000000..ea01e8fe3c --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241E98_A1CF98.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E98_A1CF98 +/* A1CF98 80241E98 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A1CF9C 80241E9C AFB00028 */ sw $s0, 0x28($sp) +/* A1CFA0 80241EA0 00A0802D */ daddu $s0, $a1, $zero +/* A1CFA4 80241EA4 AFB1002C */ sw $s1, 0x2c($sp) +/* A1CFA8 80241EA8 00C0882D */ daddu $s1, $a2, $zero +/* A1CFAC 80241EAC AFBF0034 */ sw $ra, 0x34($sp) +/* A1CFB0 80241EB0 AFB20030 */ sw $s2, 0x30($sp) +/* A1CFB4 80241EB4 AE200070 */ sw $zero, 0x70($s1) +/* A1CFB8 80241EB8 8C830000 */ lw $v1, ($a0) +/* A1CFBC 80241EBC 2402FDFF */ addiu $v0, $zero, -0x201 +/* A1CFC0 80241EC0 A480008E */ sh $zero, 0x8e($a0) +/* A1CFC4 80241EC4 00621824 */ and $v1, $v1, $v0 +/* A1CFC8 80241EC8 34650800 */ ori $a1, $v1, 0x800 +/* A1CFCC 80241ECC AC850000 */ sw $a1, ($a0) +/* A1CFD0 80241ED0 8E0200D0 */ lw $v0, 0xd0($s0) +/* A1CFD4 80241ED4 8C420034 */ lw $v0, 0x34($v0) +/* A1CFD8 80241ED8 10400003 */ beqz $v0, .L80241EE8 +/* A1CFDC 80241EDC 00E0902D */ daddu $s2, $a3, $zero +/* A1CFE0 80241EE0 080907BC */ j .L80241EF0 +/* A1CFE4 80241EE4 34620808 */ ori $v0, $v1, 0x808 +.L80241EE8: +/* A1CFE8 80241EE8 2402FFF7 */ addiu $v0, $zero, -9 +/* A1CFEC 80241EEC 00A21024 */ and $v0, $a1, $v0 +.L80241EF0: +/* A1CFF0 80241EF0 AC820000 */ sw $v0, ($a0) +/* A1CFF4 80241EF4 27A20024 */ addiu $v0, $sp, 0x24 +/* A1CFF8 80241EF8 27A50018 */ addiu $a1, $sp, 0x18 +/* A1CFFC 80241EFC C4800038 */ lwc1 $f0, 0x38($a0) +/* A1D000 80241F00 C482003C */ lwc1 $f2, 0x3c($a0) +/* A1D004 80241F04 C4840040 */ lwc1 $f4, 0x40($a0) +/* A1D008 80241F08 3C01447A */ lui $at, 0x447a +/* A1D00C 80241F0C 44813000 */ mtc1 $at, $f6 +/* A1D010 80241F10 27A6001C */ addiu $a2, $sp, 0x1c +/* A1D014 80241F14 E7A00018 */ swc1 $f0, 0x18($sp) +/* A1D018 80241F18 E7A2001C */ swc1 $f2, 0x1c($sp) +/* A1D01C 80241F1C E7A40020 */ swc1 $f4, 0x20($sp) +/* A1D020 80241F20 E7A60024 */ swc1 $f6, 0x24($sp) +/* A1D024 80241F24 AFA20010 */ sw $v0, 0x10($sp) +/* A1D028 80241F28 8C840080 */ lw $a0, 0x80($a0) +/* A1D02C 80241F2C 0C0372DF */ jal func_800DCB7C +/* A1D030 80241F30 27A70020 */ addiu $a3, $sp, 0x20 +/* A1D034 80241F34 C7A20024 */ lwc1 $f2, 0x24($sp) +/* A1D038 80241F38 3C014059 */ lui $at, 0x4059 +/* A1D03C 80241F3C 44812800 */ mtc1 $at, $f5 +/* A1D040 80241F40 44802000 */ mtc1 $zero, $f4 +/* A1D044 80241F44 460010A1 */ cvt.d.s $f2, $f2 +/* A1D048 80241F48 46241082 */ mul.d $f2, $f2, $f4 +/* A1D04C 80241F4C 00000000 */ nop +/* A1D050 80241F50 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A1D054 80241F54 46000021 */ cvt.d.s $f0, $f0 +/* A1D058 80241F58 46240002 */ mul.d $f0, $f0, $f4 +/* A1D05C 80241F5C 00000000 */ nop +/* A1D060 80241F60 3C013FE0 */ lui $at, 0x3fe0 +/* A1D064 80241F64 44812800 */ mtc1 $at, $f5 +/* A1D068 80241F68 44802000 */ mtc1 $zero, $f4 +/* A1D06C 80241F6C 00000000 */ nop +/* A1D070 80241F70 46241080 */ add.d $f2, $f2, $f4 +/* A1D074 80241F74 AE000074 */ sw $zero, 0x74($s0) +/* A1D078 80241F78 46240000 */ add.d $f0, $f0, $f4 +/* A1D07C 80241F7C AE000090 */ sw $zero, 0x90($s0) +/* A1D080 80241F80 4620120D */ trunc.w.d $f8, $f2 +/* A1D084 80241F84 E6080078 */ swc1 $f8, 0x78($s0) +/* A1D088 80241F88 4620020D */ trunc.w.d $f8, $f0 +/* A1D08C 80241F8C E6080088 */ swc1 $f8, 0x88($s0) +/* A1D090 80241F90 8E420014 */ lw $v0, 0x14($s2) +/* A1D094 80241F94 AE220074 */ sw $v0, 0x74($s1) +/* A1D098 80241F98 8E0200B0 */ lw $v0, 0xb0($s0) +/* A1D09C 80241F9C 34420010 */ ori $v0, $v0, 0x10 +/* A1D0A0 80241FA0 AE0200B0 */ sw $v0, 0xb0($s0) +/* A1D0A4 80241FA4 8FBF0034 */ lw $ra, 0x34($sp) +/* A1D0A8 80241FA8 8FB20030 */ lw $s2, 0x30($sp) +/* A1D0AC 80241FAC 8FB1002C */ lw $s1, 0x2c($sp) +/* A1D0B0 80241FB0 8FB00028 */ lw $s0, 0x28($sp) +/* A1D0B4 80241FB4 03E00008 */ jr $ra +/* A1D0B8 80241FB8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC.s deleted file mode 100644 index 5ddfb41c9c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FBC -/* A1D0BC 80241FBC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A1D0C0 80241FC0 AFB40040 */ sw $s4, 0x40($sp) -/* A1D0C4 80241FC4 0080A02D */ daddu $s4, $a0, $zero -/* A1D0C8 80241FC8 AFBF0048 */ sw $ra, 0x48($sp) -/* A1D0CC 80241FCC AFB50044 */ sw $s5, 0x44($sp) -/* A1D0D0 80241FD0 AFB3003C */ sw $s3, 0x3c($sp) -/* A1D0D4 80241FD4 AFB20038 */ sw $s2, 0x38($sp) -/* A1D0D8 80241FD8 AFB10034 */ sw $s1, 0x34($sp) -/* A1D0DC 80241FDC AFB00030 */ sw $s0, 0x30($sp) -/* A1D0E0 80241FE0 8E920148 */ lw $s2, 0x148($s4) -/* A1D0E4 80241FE4 86440008 */ lh $a0, 8($s2) -/* A1D0E8 80241FE8 8E90000C */ lw $s0, 0xc($s4) -/* A1D0EC 80241FEC 0C00EABB */ jal get_npc_unsafe -/* A1D0F0 80241FF0 00A0882D */ daddu $s1, $a1, $zero -/* A1D0F4 80241FF4 0280202D */ daddu $a0, $s4, $zero -/* A1D0F8 80241FF8 8E050000 */ lw $a1, ($s0) -/* A1D0FC 80241FFC 0C0B1EAF */ jal get_variable -/* A1D100 80242000 0040A82D */ daddu $s5, $v0, $zero -/* A1D104 80242004 AFA00010 */ sw $zero, 0x10($sp) -/* A1D108 80242008 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D10C 8024200C 8C630030 */ lw $v1, 0x30($v1) -/* A1D110 80242010 AFA30014 */ sw $v1, 0x14($sp) -/* A1D114 80242014 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D118 80242018 8C63001C */ lw $v1, 0x1c($v1) -/* A1D11C 8024201C AFA30018 */ sw $v1, 0x18($sp) -/* A1D120 80242020 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D124 80242024 8C630024 */ lw $v1, 0x24($v1) -/* A1D128 80242028 AFA3001C */ sw $v1, 0x1c($sp) -/* A1D12C 8024202C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D130 80242030 8C630028 */ lw $v1, 0x28($v1) -/* A1D134 80242034 27B30010 */ addiu $s3, $sp, 0x10 -/* A1D138 80242038 AFA30020 */ sw $v1, 0x20($sp) -/* A1D13C 8024203C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A1D140 80242040 3C0142F0 */ lui $at, 0x42f0 -/* A1D144 80242044 44810000 */ mtc1 $at, $f0 -/* A1D148 80242048 8C63002C */ lw $v1, 0x2c($v1) -/* A1D14C 8024204C 0040802D */ daddu $s0, $v0, $zero -/* A1D150 80242050 E7A00028 */ swc1 $f0, 0x28($sp) -/* A1D154 80242054 A7A0002C */ sh $zero, 0x2c($sp) -/* A1D158 80242058 12200006 */ beqz $s1, .L80242074 -/* A1D15C 8024205C AFA30024 */ sw $v1, 0x24($sp) -/* A1D160 80242060 02A0202D */ daddu $a0, $s5, $zero -/* A1D164 80242064 0240282D */ daddu $a1, $s2, $zero -/* A1D168 80242068 0280302D */ daddu $a2, $s4, $zero -/* A1D16C 8024206C 0C0907A6 */ jal func_80241E98 -/* A1D170 80242070 0200382D */ daddu $a3, $s0, $zero -.L80242074: -/* A1D174 80242074 2402FFFE */ addiu $v0, $zero, -2 -/* A1D178 80242078 A2A200AB */ sb $v0, 0xab($s5) -/* A1D17C 8024207C 8E4300B0 */ lw $v1, 0xb0($s2) -/* A1D180 80242080 30620004 */ andi $v0, $v1, 4 -/* A1D184 80242084 10400007 */ beqz $v0, .L802420A4 -/* A1D188 80242088 00000000 */ nop -/* A1D18C 8024208C 824200B4 */ lb $v0, 0xb4($s2) -/* A1D190 80242090 1440003C */ bnez $v0, .L80242184 -/* A1D194 80242094 0000102D */ daddu $v0, $zero, $zero -/* A1D198 80242098 2402FFFB */ addiu $v0, $zero, -5 -/* A1D19C 8024209C 00621024 */ and $v0, $v1, $v0 -/* A1D1A0 802420A0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802420A4: -/* A1D1A4 802420A4 8E830070 */ lw $v1, 0x70($s4) -/* A1D1A8 802420A8 2C62000F */ sltiu $v0, $v1, 0xf -/* A1D1AC 802420AC 10400034 */ beqz $v0, .L80242180 -/* A1D1B0 802420B0 00031080 */ sll $v0, $v1, 2 -/* A1D1B4 802420B4 3C018025 */ lui $at, 0x8025 -/* A1D1B8 802420B8 00220821 */ addu $at, $at, $v0 -/* A1D1BC 802420BC 8C22BD88 */ lw $v0, -0x4278($at) -/* A1D1C0 802420C0 00400008 */ jr $v0 -/* A1D1C4 802420C4 00000000 */ nop -/* A1D1C8 802420C8 0280202D */ daddu $a0, $s4, $zero -/* A1D1CC 802420CC 0200282D */ daddu $a1, $s0, $zero -/* A1D1D0 802420D0 0C09032C */ jal func_80240CB0 -/* A1D1D4 802420D4 0260302D */ daddu $a2, $s3, $zero -/* A1D1D8 802420D8 0280202D */ daddu $a0, $s4, $zero -/* A1D1DC 802420DC 0200282D */ daddu $a1, $s0, $zero -/* A1D1E0 802420E0 0C090398 */ jal func_80240E60 -/* A1D1E4 802420E4 0260302D */ daddu $a2, $s3, $zero -/* A1D1E8 802420E8 08090861 */ j .L80242184 -/* A1D1EC 802420EC 0000102D */ daddu $v0, $zero, $zero -/* A1D1F0 802420F0 0280202D */ daddu $a0, $s4, $zero -/* A1D1F4 802420F4 0200282D */ daddu $a1, $s0, $zero -/* A1D1F8 802420F8 0C090522 */ jal func_80241488 -/* A1D1FC 802420FC 0260302D */ daddu $a2, $s3, $zero -/* A1D200 80242100 0280202D */ daddu $a0, $s4, $zero -/* A1D204 80242104 0200282D */ daddu $a1, $s0, $zero -/* A1D208 80242108 0C090552 */ jal func_80241548 -/* A1D20C 8024210C 0260302D */ daddu $a2, $s3, $zero -/* A1D210 80242110 08090861 */ j .L80242184 -/* A1D214 80242114 0000102D */ daddu $v0, $zero, $zero -/* A1D218 80242118 0280202D */ daddu $a0, $s4, $zero -/* A1D21C 8024211C 0200282D */ daddu $a1, $s0, $zero -/* A1D220 80242120 0C090623 */ jal func_8024188C -/* A1D224 80242124 0260302D */ daddu $a2, $s3, $zero -/* A1D228 80242128 0280202D */ daddu $a0, $s4, $zero -/* A1D22C 8024212C 0200282D */ daddu $a1, $s0, $zero -/* A1D230 80242130 0C090641 */ jal func_80241904 -/* A1D234 80242134 0260302D */ daddu $a2, $s3, $zero -/* A1D238 80242138 08090861 */ j .L80242184 -/* A1D23C 8024213C 0000102D */ daddu $v0, $zero, $zero -/* A1D240 80242140 0280202D */ daddu $a0, $s4, $zero -/* A1D244 80242144 0200282D */ daddu $a1, $s0, $zero -/* A1D248 80242148 0C09065C */ jal func_80241970 -/* A1D24C 8024214C 0260302D */ daddu $a2, $s3, $zero -/* A1D250 80242150 08090861 */ j .L80242184 -/* A1D254 80242154 0000102D */ daddu $v0, $zero, $zero -/* A1D258 80242158 0280202D */ daddu $a0, $s4, $zero -/* A1D25C 8024215C 0200282D */ daddu $a1, $s0, $zero -/* A1D260 80242160 0C0906A9 */ jal func_80241AA4 -/* A1D264 80242164 0260302D */ daddu $a2, $s3, $zero -/* A1D268 80242168 08090861 */ j .L80242184 -/* A1D26C 8024216C 0000102D */ daddu $v0, $zero, $zero -/* A1D270 80242170 0280202D */ daddu $a0, $s4, $zero -/* A1D274 80242174 0200282D */ daddu $a1, $s0, $zero -/* A1D278 80242178 0C0906C2 */ jal func_80241B08 -/* A1D27C 8024217C 0260302D */ daddu $a2, $s3, $zero -.L80242180: -/* A1D280 80242180 0000102D */ daddu $v0, $zero, $zero -.L80242184: -/* A1D284 80242184 8FBF0048 */ lw $ra, 0x48($sp) -/* A1D288 80242188 8FB50044 */ lw $s5, 0x44($sp) -/* A1D28C 8024218C 8FB40040 */ lw $s4, 0x40($sp) -/* A1D290 80242190 8FB3003C */ lw $s3, 0x3c($sp) -/* A1D294 80242194 8FB20038 */ lw $s2, 0x38($sp) -/* A1D298 80242198 8FB10034 */ lw $s1, 0x34($sp) -/* A1D29C 8024219C 8FB00030 */ lw $s0, 0x30($sp) -/* A1D2A0 802421A0 03E00008 */ jr $ra -/* A1D2A4 802421A4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s new file mode 100644 index 0000000000..31366f50df --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80241FBC_A1D0BC.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FBC_A1D0BC +/* A1D0BC 80241FBC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A1D0C0 80241FC0 AFB40040 */ sw $s4, 0x40($sp) +/* A1D0C4 80241FC4 0080A02D */ daddu $s4, $a0, $zero +/* A1D0C8 80241FC8 AFBF0048 */ sw $ra, 0x48($sp) +/* A1D0CC 80241FCC AFB50044 */ sw $s5, 0x44($sp) +/* A1D0D0 80241FD0 AFB3003C */ sw $s3, 0x3c($sp) +/* A1D0D4 80241FD4 AFB20038 */ sw $s2, 0x38($sp) +/* A1D0D8 80241FD8 AFB10034 */ sw $s1, 0x34($sp) +/* A1D0DC 80241FDC AFB00030 */ sw $s0, 0x30($sp) +/* A1D0E0 80241FE0 8E920148 */ lw $s2, 0x148($s4) +/* A1D0E4 80241FE4 86440008 */ lh $a0, 8($s2) +/* A1D0E8 80241FE8 8E90000C */ lw $s0, 0xc($s4) +/* A1D0EC 80241FEC 0C00EABB */ jal get_npc_unsafe +/* A1D0F0 80241FF0 00A0882D */ daddu $s1, $a1, $zero +/* A1D0F4 80241FF4 0280202D */ daddu $a0, $s4, $zero +/* A1D0F8 80241FF8 8E050000 */ lw $a1, ($s0) +/* A1D0FC 80241FFC 0C0B1EAF */ jal get_variable +/* A1D100 80242000 0040A82D */ daddu $s5, $v0, $zero +/* A1D104 80242004 AFA00010 */ sw $zero, 0x10($sp) +/* A1D108 80242008 8E4300D0 */ lw $v1, 0xd0($s2) +/* A1D10C 8024200C 8C630030 */ lw $v1, 0x30($v1) +/* A1D110 80242010 AFA30014 */ sw $v1, 0x14($sp) +/* A1D114 80242014 8E4300D0 */ lw $v1, 0xd0($s2) +/* A1D118 80242018 8C63001C */ lw $v1, 0x1c($v1) +/* A1D11C 8024201C AFA30018 */ sw $v1, 0x18($sp) +/* A1D120 80242020 8E4300D0 */ lw $v1, 0xd0($s2) +/* A1D124 80242024 8C630024 */ lw $v1, 0x24($v1) +/* A1D128 80242028 AFA3001C */ sw $v1, 0x1c($sp) +/* A1D12C 8024202C 8E4300D0 */ lw $v1, 0xd0($s2) +/* A1D130 80242030 8C630028 */ lw $v1, 0x28($v1) +/* A1D134 80242034 27B30010 */ addiu $s3, $sp, 0x10 +/* A1D138 80242038 AFA30020 */ sw $v1, 0x20($sp) +/* A1D13C 8024203C 8E4300D0 */ lw $v1, 0xd0($s2) +/* A1D140 80242040 3C0142F0 */ lui $at, 0x42f0 +/* A1D144 80242044 44810000 */ mtc1 $at, $f0 +/* A1D148 80242048 8C63002C */ lw $v1, 0x2c($v1) +/* A1D14C 8024204C 0040802D */ daddu $s0, $v0, $zero +/* A1D150 80242050 E7A00028 */ swc1 $f0, 0x28($sp) +/* A1D154 80242054 A7A0002C */ sh $zero, 0x2c($sp) +/* A1D158 80242058 12200006 */ beqz $s1, .L80242074 +/* A1D15C 8024205C AFA30024 */ sw $v1, 0x24($sp) +/* A1D160 80242060 02A0202D */ daddu $a0, $s5, $zero +/* A1D164 80242064 0240282D */ daddu $a1, $s2, $zero +/* A1D168 80242068 0280302D */ daddu $a2, $s4, $zero +/* A1D16C 8024206C 0C0907A6 */ jal func_80241E98_A1CF98 +/* A1D170 80242070 0200382D */ daddu $a3, $s0, $zero +.L80242074: +/* A1D174 80242074 2402FFFE */ addiu $v0, $zero, -2 +/* A1D178 80242078 A2A200AB */ sb $v0, 0xab($s5) +/* A1D17C 8024207C 8E4300B0 */ lw $v1, 0xb0($s2) +/* A1D180 80242080 30620004 */ andi $v0, $v1, 4 +/* A1D184 80242084 10400007 */ beqz $v0, .L802420A4 +/* A1D188 80242088 00000000 */ nop +/* A1D18C 8024208C 824200B4 */ lb $v0, 0xb4($s2) +/* A1D190 80242090 1440003C */ bnez $v0, .L80242184 +/* A1D194 80242094 0000102D */ daddu $v0, $zero, $zero +/* A1D198 80242098 2402FFFB */ addiu $v0, $zero, -5 +/* A1D19C 8024209C 00621024 */ and $v0, $v1, $v0 +/* A1D1A0 802420A0 AE4200B0 */ sw $v0, 0xb0($s2) +.L802420A4: +/* A1D1A4 802420A4 8E830070 */ lw $v1, 0x70($s4) +/* A1D1A8 802420A8 2C62000F */ sltiu $v0, $v1, 0xf +/* A1D1AC 802420AC 10400034 */ beqz $v0, .L80242180 +/* A1D1B0 802420B0 00031080 */ sll $v0, $v1, 2 +/* A1D1B4 802420B4 3C018025 */ lui $at, 0x8025 +/* A1D1B8 802420B8 00220821 */ addu $at, $at, $v0 +/* A1D1BC 802420BC 8C22BD88 */ lw $v0, -0x4278($at) +/* A1D1C0 802420C0 00400008 */ jr $v0 +/* A1D1C4 802420C4 00000000 */ nop +/* A1D1C8 802420C8 0280202D */ daddu $a0, $s4, $zero +/* A1D1CC 802420CC 0200282D */ daddu $a1, $s0, $zero +/* A1D1D0 802420D0 0C09032C */ jal func_80240CB0_A1BDB0 +/* A1D1D4 802420D4 0260302D */ daddu $a2, $s3, $zero +/* A1D1D8 802420D8 0280202D */ daddu $a0, $s4, $zero +/* A1D1DC 802420DC 0200282D */ daddu $a1, $s0, $zero +/* A1D1E0 802420E0 0C090398 */ jal func_80240E60_A1BF60 +/* A1D1E4 802420E4 0260302D */ daddu $a2, $s3, $zero +/* A1D1E8 802420E8 08090861 */ j .L80242184 +/* A1D1EC 802420EC 0000102D */ daddu $v0, $zero, $zero +/* A1D1F0 802420F0 0280202D */ daddu $a0, $s4, $zero +/* A1D1F4 802420F4 0200282D */ daddu $a1, $s0, $zero +/* A1D1F8 802420F8 0C090522 */ jal func_80241488_A1C588 +/* A1D1FC 802420FC 0260302D */ daddu $a2, $s3, $zero +/* A1D200 80242100 0280202D */ daddu $a0, $s4, $zero +/* A1D204 80242104 0200282D */ daddu $a1, $s0, $zero +/* A1D208 80242108 0C090552 */ jal func_80241548_A1C648 +/* A1D20C 8024210C 0260302D */ daddu $a2, $s3, $zero +/* A1D210 80242110 08090861 */ j .L80242184 +/* A1D214 80242114 0000102D */ daddu $v0, $zero, $zero +/* A1D218 80242118 0280202D */ daddu $a0, $s4, $zero +/* A1D21C 8024211C 0200282D */ daddu $a1, $s0, $zero +/* A1D220 80242120 0C090623 */ jal func_8024188C_A1C98C +/* A1D224 80242124 0260302D */ daddu $a2, $s3, $zero +/* A1D228 80242128 0280202D */ daddu $a0, $s4, $zero +/* A1D22C 8024212C 0200282D */ daddu $a1, $s0, $zero +/* A1D230 80242130 0C090641 */ jal func_80241904_A1CA04 +/* A1D234 80242134 0260302D */ daddu $a2, $s3, $zero +/* A1D238 80242138 08090861 */ j .L80242184 +/* A1D23C 8024213C 0000102D */ daddu $v0, $zero, $zero +/* A1D240 80242140 0280202D */ daddu $a0, $s4, $zero +/* A1D244 80242144 0200282D */ daddu $a1, $s0, $zero +/* A1D248 80242148 0C09065C */ jal func_80241970_A1CA70 +/* A1D24C 8024214C 0260302D */ daddu $a2, $s3, $zero +/* A1D250 80242150 08090861 */ j .L80242184 +/* A1D254 80242154 0000102D */ daddu $v0, $zero, $zero +/* A1D258 80242158 0280202D */ daddu $a0, $s4, $zero +/* A1D25C 8024215C 0200282D */ daddu $a1, $s0, $zero +/* A1D260 80242160 0C0906A9 */ jal func_80241AA4_A1CBA4 +/* A1D264 80242164 0260302D */ daddu $a2, $s3, $zero +/* A1D268 80242168 08090861 */ j .L80242184 +/* A1D26C 8024216C 0000102D */ daddu $v0, $zero, $zero +/* A1D270 80242170 0280202D */ daddu $a0, $s4, $zero +/* A1D274 80242174 0200282D */ daddu $a1, $s0, $zero +/* A1D278 80242178 0C0906C2 */ jal func_80241B08_A1CC08 +/* A1D27C 8024217C 0260302D */ daddu $a2, $s3, $zero +.L80242180: +/* A1D280 80242180 0000102D */ daddu $v0, $zero, $zero +.L80242184: +/* A1D284 80242184 8FBF0048 */ lw $ra, 0x48($sp) +/* A1D288 80242188 8FB50044 */ lw $s5, 0x44($sp) +/* A1D28C 8024218C 8FB40040 */ lw $s4, 0x40($sp) +/* A1D290 80242190 8FB3003C */ lw $s3, 0x3c($sp) +/* A1D294 80242194 8FB20038 */ lw $s2, 0x38($sp) +/* A1D298 80242198 8FB10034 */ lw $s1, 0x34($sp) +/* A1D29C 8024219C 8FB00030 */ lw $s0, 0x30($sp) +/* A1D2A0 802421A0 03E00008 */ jr $ra +/* A1D2A4 802421A4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8.s deleted file mode 100644 index 54ea70ee20..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421A8 -/* A1D2A8 802421A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D2AC 802421AC AFBF0010 */ sw $ra, 0x10($sp) -/* A1D2B0 802421B0 0C03A625 */ jal func_800E9894 -/* A1D2B4 802421B4 00000000 */ nop -/* A1D2B8 802421B8 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D2BC 802421BC 24020002 */ addiu $v0, $zero, 2 -/* A1D2C0 802421C0 03E00008 */ jr $ra -/* A1D2C4 802421C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s new file mode 100644 index 0000000000..347f95c415 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421A8_A1D2A8 +/* A1D2A8 802421A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1D2AC 802421AC AFBF0010 */ sw $ra, 0x10($sp) +/* A1D2B0 802421B0 0C03A625 */ jal func_800E9894 +/* A1D2B4 802421B4 00000000 */ nop +/* A1D2B8 802421B8 8FBF0010 */ lw $ra, 0x10($sp) +/* A1D2BC 802421BC 24020002 */ addiu $v0, $zero, 2 +/* A1D2C0 802421C0 03E00008 */ jr $ra +/* A1D2C4 802421C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8.s deleted file mode 100644 index c21fbf5fb2..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421C8 -/* A1D2C8 802421C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D2CC 802421CC AFBF0010 */ sw $ra, 0x10($sp) -/* A1D2D0 802421D0 0C03A631 */ jal func_800E98C4 -/* A1D2D4 802421D4 00000000 */ nop -/* A1D2D8 802421D8 0C03A6DB */ jal sync_status_menu -/* A1D2DC 802421DC 00000000 */ nop -/* A1D2E0 802421E0 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D2E4 802421E4 24020002 */ addiu $v0, $zero, 2 -/* A1D2E8 802421E8 03E00008 */ jr $ra -/* A1D2EC 802421EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s new file mode 100644 index 0000000000..3db6a153dc --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421C8_A1D2C8 +/* A1D2C8 802421C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1D2CC 802421CC AFBF0010 */ sw $ra, 0x10($sp) +/* A1D2D0 802421D0 0C03A631 */ jal func_800E98C4 +/* A1D2D4 802421D4 00000000 */ nop +/* A1D2D8 802421D8 0C03A6DB */ jal sync_status_menu +/* A1D2DC 802421DC 00000000 */ nop +/* A1D2E0 802421E0 8FBF0010 */ lw $ra, 0x10($sp) +/* A1D2E4 802421E4 24020002 */ addiu $v0, $zero, 2 +/* A1D2E8 802421E8 03E00008 */ jr $ra +/* A1D2EC 802421EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0.s deleted file mode 100644 index 5ef26520b9..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421F0 -/* A1D2F0 802421F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1D2F4 802421F4 AFB10014 */ sw $s1, 0x14($sp) -/* A1D2F8 802421F8 0080882D */ daddu $s1, $a0, $zero -/* A1D2FC 802421FC AFBF0018 */ sw $ra, 0x18($sp) -/* A1D300 80242200 AFB00010 */ sw $s0, 0x10($sp) -/* A1D304 80242204 8E30000C */ lw $s0, 0xc($s1) -/* A1D308 80242208 8E050000 */ lw $a1, ($s0) -/* A1D30C 8024220C 0C0B1EAF */ jal get_variable -/* A1D310 80242210 26100004 */ addiu $s0, $s0, 4 -/* A1D314 80242214 0220202D */ daddu $a0, $s1, $zero -/* A1D318 80242218 8E050000 */ lw $a1, ($s0) -/* A1D31C 8024221C 0C0B1EAF */ jal get_variable -/* A1D320 80242220 0040882D */ daddu $s1, $v0, $zero -/* A1D324 80242224 0000202D */ daddu $a0, $zero, $zero -/* A1D328 80242228 0080282D */ daddu $a1, $a0, $zero -/* A1D32C 8024222C 0040802D */ daddu $s0, $v0, $zero -/* A1D330 80242230 240600BE */ addiu $a2, $zero, 0xbe -/* A1D334 80242234 0C04DF93 */ jal func_80137E4C -/* A1D338 80242238 24070091 */ addiu $a3, $zero, 0x91 -/* A1D33C 8024223C 44900000 */ mtc1 $s0, $f0 -/* A1D340 80242240 00000000 */ nop -/* A1D344 80242244 46800020 */ cvt.s.w $f0, $f0 -/* A1D348 80242248 44050000 */ mfc1 $a1, $f0 -/* A1D34C 8024224C 0C04DF62 */ jal func_80137D88 -/* A1D350 80242250 322400FF */ andi $a0, $s1, 0xff -/* A1D354 80242254 8FBF0018 */ lw $ra, 0x18($sp) -/* A1D358 80242258 8FB10014 */ lw $s1, 0x14($sp) -/* A1D35C 8024225C 8FB00010 */ lw $s0, 0x10($sp) -/* A1D360 80242260 24020002 */ addiu $v0, $zero, 2 -/* A1D364 80242264 03E00008 */ jr $ra -/* A1D368 80242268 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s new file mode 100644 index 0000000000..1e51a61a3e --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421F0_A1D2F0.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421F0_A1D2F0 +/* A1D2F0 802421F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A1D2F4 802421F4 AFB10014 */ sw $s1, 0x14($sp) +/* A1D2F8 802421F8 0080882D */ daddu $s1, $a0, $zero +/* A1D2FC 802421FC AFBF0018 */ sw $ra, 0x18($sp) +/* A1D300 80242200 AFB00010 */ sw $s0, 0x10($sp) +/* A1D304 80242204 8E30000C */ lw $s0, 0xc($s1) +/* A1D308 80242208 8E050000 */ lw $a1, ($s0) +/* A1D30C 8024220C 0C0B1EAF */ jal get_variable +/* A1D310 80242210 26100004 */ addiu $s0, $s0, 4 +/* A1D314 80242214 0220202D */ daddu $a0, $s1, $zero +/* A1D318 80242218 8E050000 */ lw $a1, ($s0) +/* A1D31C 8024221C 0C0B1EAF */ jal get_variable +/* A1D320 80242220 0040882D */ daddu $s1, $v0, $zero +/* A1D324 80242224 0000202D */ daddu $a0, $zero, $zero +/* A1D328 80242228 0080282D */ daddu $a1, $a0, $zero +/* A1D32C 8024222C 0040802D */ daddu $s0, $v0, $zero +/* A1D330 80242230 240600BE */ addiu $a2, $zero, 0xbe +/* A1D334 80242234 0C04DF93 */ jal func_80137E4C +/* A1D338 80242238 24070091 */ addiu $a3, $zero, 0x91 +/* A1D33C 8024223C 44900000 */ mtc1 $s0, $f0 +/* A1D340 80242240 00000000 */ nop +/* A1D344 80242244 46800020 */ cvt.s.w $f0, $f0 +/* A1D348 80242248 44050000 */ mfc1 $a1, $f0 +/* A1D34C 8024224C 0C04DF62 */ jal func_80137D88 +/* A1D350 80242250 322400FF */ andi $a0, $s1, 0xff +/* A1D354 80242254 8FBF0018 */ lw $ra, 0x18($sp) +/* A1D358 80242258 8FB10014 */ lw $s1, 0x14($sp) +/* A1D35C 8024225C 8FB00010 */ lw $s0, 0x10($sp) +/* A1D360 80242260 24020002 */ addiu $v0, $zero, 2 +/* A1D364 80242264 03E00008 */ jr $ra +/* A1D368 80242268 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348.s deleted file mode 100644 index f0cf563ae4..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242348 -/* A1D448 80242348 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D44C 8024234C AFBF0010 */ sw $ra, 0x10($sp) -/* A1D450 80242350 0C03AE18 */ jal partner_resume_ability_script -/* A1D454 80242354 00000000 */ nop -/* A1D458 80242358 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D45C 8024235C 24020002 */ addiu $v0, $zero, 2 -/* A1D460 80242360 03E00008 */ jr $ra -/* A1D464 80242364 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s new file mode 100644 index 0000000000..d5befc3f78 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242348_A1D448 +/* A1D448 80242348 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1D44C 8024234C AFBF0010 */ sw $ra, 0x10($sp) +/* A1D450 80242350 0C03AE18 */ jal partner_resume_ability_script +/* A1D454 80242354 00000000 */ nop +/* A1D458 80242358 8FBF0010 */ lw $ra, 0x10($sp) +/* A1D45C 8024235C 24020002 */ addiu $v0, $zero, 2 +/* A1D460 80242360 03E00008 */ jr $ra +/* A1D464 80242364 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368.s deleted file mode 100644 index cc9272f57f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242368 -/* A1D468 80242368 3C058011 */ lui $a1, %hi(gPlayerData) -/* A1D46C 8024236C 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* A1D470 80242370 AC800088 */ sw $zero, 0x88($a0) -/* A1D474 80242374 80A30003 */ lb $v1, 3($a1) -/* A1D478 80242378 80A20002 */ lb $v0, 2($a1) -/* A1D47C 8024237C 1462000B */ bne $v1, $v0, .L802423AC -/* A1D480 80242380 00A0302D */ daddu $a2, $a1, $zero -/* A1D484 80242384 80A30006 */ lb $v1, 6($a1) -/* A1D488 80242388 80A20005 */ lb $v0, 5($a1) -/* A1D48C 8024238C 14620007 */ bne $v1, $v0, .L802423AC -/* A1D490 80242390 00000000 */ nop -/* A1D494 80242394 80C2028E */ lb $v0, 0x28e($a2) -/* A1D498 80242398 84C30290 */ lh $v1, 0x290($a2) -/* A1D49C 8024239C 00021200 */ sll $v0, $v0, 8 -/* A1D4A0 802423A0 14620004 */ bne $v1, $v0, .L802423B4 -/* A1D4A4 802423A4 24020001 */ addiu $v0, $zero, 1 -/* A1D4A8 802423A8 AC820088 */ sw $v0, 0x88($a0) -.L802423AC: -/* A1D4AC 802423AC 03E00008 */ jr $ra -/* A1D4B0 802423B0 24020002 */ addiu $v0, $zero, 2 -.L802423B4: -/* A1D4B4 802423B4 03E00008 */ jr $ra -/* A1D4B8 802423B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s new file mode 100644 index 0000000000..954400bbac --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242368_A1D468.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242368_A1D468 +/* A1D468 80242368 3C058011 */ lui $a1, %hi(gPlayerData) +/* A1D46C 8024236C 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* A1D470 80242370 AC800088 */ sw $zero, 0x88($a0) +/* A1D474 80242374 80A30003 */ lb $v1, 3($a1) +/* A1D478 80242378 80A20002 */ lb $v0, 2($a1) +/* A1D47C 8024237C 1462000B */ bne $v1, $v0, .L802423AC +/* A1D480 80242380 00A0302D */ daddu $a2, $a1, $zero +/* A1D484 80242384 80A30006 */ lb $v1, 6($a1) +/* A1D488 80242388 80A20005 */ lb $v0, 5($a1) +/* A1D48C 8024238C 14620007 */ bne $v1, $v0, .L802423AC +/* A1D490 80242390 00000000 */ nop +/* A1D494 80242394 80C2028E */ lb $v0, 0x28e($a2) +/* A1D498 80242398 84C30290 */ lh $v1, 0x290($a2) +/* A1D49C 8024239C 00021200 */ sll $v0, $v0, 8 +/* A1D4A0 802423A0 14620004 */ bne $v1, $v0, .L802423B4 +/* A1D4A4 802423A4 24020001 */ addiu $v0, $zero, 1 +/* A1D4A8 802423A8 AC820088 */ sw $v0, 0x88($a0) +.L802423AC: +/* A1D4AC 802423AC 03E00008 */ jr $ra +/* A1D4B0 802423B0 24020002 */ addiu $v0, $zero, 2 +.L802423B4: +/* A1D4B4 802423B4 03E00008 */ jr $ra +/* A1D4B8 802423B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC.s deleted file mode 100644 index a56f6ce968..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423BC -/* A1D4BC 802423BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1D4C0 802423C0 AFB10014 */ sw $s1, 0x14($sp) -/* A1D4C4 802423C4 0080882D */ daddu $s1, $a0, $zero -/* A1D4C8 802423C8 AFBF001C */ sw $ra, 0x1c($sp) -/* A1D4CC 802423CC AFB20018 */ sw $s2, 0x18($sp) -/* A1D4D0 802423D0 AFB00010 */ sw $s0, 0x10($sp) -/* A1D4D4 802423D4 8E30000C */ lw $s0, 0xc($s1) -/* A1D4D8 802423D8 8E050000 */ lw $a1, ($s0) -/* A1D4DC 802423DC 0C0B1EAF */ jal get_variable -/* A1D4E0 802423E0 26100004 */ addiu $s0, $s0, 4 -/* A1D4E4 802423E4 8E050000 */ lw $a1, ($s0) -/* A1D4E8 802423E8 26100004 */ addiu $s0, $s0, 4 -/* A1D4EC 802423EC 0220202D */ daddu $a0, $s1, $zero -/* A1D4F0 802423F0 0C0B1EAF */ jal get_variable -/* A1D4F4 802423F4 0040902D */ daddu $s2, $v0, $zero -/* A1D4F8 802423F8 0220202D */ daddu $a0, $s1, $zero -/* A1D4FC 802423FC 8E050000 */ lw $a1, ($s0) -/* A1D500 80242400 0C0B1EAF */ jal get_variable -/* A1D504 80242404 0040802D */ daddu $s0, $v0, $zero -/* A1D508 80242408 0000202D */ daddu $a0, $zero, $zero -/* A1D50C 8024240C 324500FF */ andi $a1, $s2, 0xff -/* A1D510 80242410 320600FF */ andi $a2, $s0, 0xff -/* A1D514 80242414 0C04DF84 */ jal func_80137E10 -/* A1D518 80242418 304700FF */ andi $a3, $v0, 0xff -/* A1D51C 8024241C 8FBF001C */ lw $ra, 0x1c($sp) -/* A1D520 80242420 8FB20018 */ lw $s2, 0x18($sp) -/* A1D524 80242424 8FB10014 */ lw $s1, 0x14($sp) -/* A1D528 80242428 8FB00010 */ lw $s0, 0x10($sp) -/* A1D52C 8024242C 24020002 */ addiu $v0, $zero, 2 -/* A1D530 80242430 03E00008 */ jr $ra -/* A1D534 80242434 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s new file mode 100644 index 0000000000..1e07837e88 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802423BC_A1D4BC.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423BC_A1D4BC +/* A1D4BC 802423BC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A1D4C0 802423C0 AFB10014 */ sw $s1, 0x14($sp) +/* A1D4C4 802423C4 0080882D */ daddu $s1, $a0, $zero +/* A1D4C8 802423C8 AFBF001C */ sw $ra, 0x1c($sp) +/* A1D4CC 802423CC AFB20018 */ sw $s2, 0x18($sp) +/* A1D4D0 802423D0 AFB00010 */ sw $s0, 0x10($sp) +/* A1D4D4 802423D4 8E30000C */ lw $s0, 0xc($s1) +/* A1D4D8 802423D8 8E050000 */ lw $a1, ($s0) +/* A1D4DC 802423DC 0C0B1EAF */ jal get_variable +/* A1D4E0 802423E0 26100004 */ addiu $s0, $s0, 4 +/* A1D4E4 802423E4 8E050000 */ lw $a1, ($s0) +/* A1D4E8 802423E8 26100004 */ addiu $s0, $s0, 4 +/* A1D4EC 802423EC 0220202D */ daddu $a0, $s1, $zero +/* A1D4F0 802423F0 0C0B1EAF */ jal get_variable +/* A1D4F4 802423F4 0040902D */ daddu $s2, $v0, $zero +/* A1D4F8 802423F8 0220202D */ daddu $a0, $s1, $zero +/* A1D4FC 802423FC 8E050000 */ lw $a1, ($s0) +/* A1D500 80242400 0C0B1EAF */ jal get_variable +/* A1D504 80242404 0040802D */ daddu $s0, $v0, $zero +/* A1D508 80242408 0000202D */ daddu $a0, $zero, $zero +/* A1D50C 8024240C 324500FF */ andi $a1, $s2, 0xff +/* A1D510 80242410 320600FF */ andi $a2, $s0, 0xff +/* A1D514 80242414 0C04DF84 */ jal func_80137E10 +/* A1D518 80242418 304700FF */ andi $a3, $v0, 0xff +/* A1D51C 8024241C 8FBF001C */ lw $ra, 0x1c($sp) +/* A1D520 80242420 8FB20018 */ lw $s2, 0x18($sp) +/* A1D524 80242424 8FB10014 */ lw $s1, 0x14($sp) +/* A1D528 80242428 8FB00010 */ lw $s0, 0x10($sp) +/* A1D52C 8024242C 24020002 */ addiu $v0, $zero, 2 +/* A1D530 80242430 03E00008 */ jr $ra +/* A1D534 80242434 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438.s deleted file mode 100644 index 9660c76576..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242438 -/* A1D538 80242438 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D53C 8024243C AFBF0010 */ sw $ra, 0x10($sp) -/* A1D540 80242440 8C82000C */ lw $v0, 0xc($a0) -/* A1D544 80242444 3C068011 */ lui $a2, 0x8011 -/* A1D548 80242448 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* A1D54C 8024244C 0C0B2026 */ jal set_variable -/* A1D550 80242450 8C450000 */ lw $a1, ($v0) -/* A1D554 80242454 0C03AC5A */ jal func_800EB168 -/* A1D558 80242458 0000202D */ daddu $a0, $zero, $zero -/* A1D55C 8024245C 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D560 80242460 24020002 */ addiu $v0, $zero, 2 -/* A1D564 80242464 03E00008 */ jr $ra -/* A1D568 80242468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s new file mode 100644 index 0000000000..35bd20a86d --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242438_A1D538 +/* A1D538 80242438 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1D53C 8024243C AFBF0010 */ sw $ra, 0x10($sp) +/* A1D540 80242440 8C82000C */ lw $v0, 0xc($a0) +/* A1D544 80242444 3C068011 */ lui $a2, 0x8011 +/* A1D548 80242448 80C6F2A2 */ lb $a2, -0xd5e($a2) +/* A1D54C 8024244C 0C0B2026 */ jal set_variable +/* A1D550 80242450 8C450000 */ lw $a1, ($v0) +/* A1D554 80242454 0C03AC5A */ jal func_800EB168 +/* A1D558 80242458 0000202D */ daddu $a0, $zero, $zero +/* A1D55C 8024245C 8FBF0010 */ lw $ra, 0x10($sp) +/* A1D560 80242460 24020002 */ addiu $v0, $zero, 2 +/* A1D564 80242464 03E00008 */ jr $ra +/* A1D568 80242468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C.s deleted file mode 100644 index 073211972f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024246C -/* A1D56C 8024246C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D570 80242470 AFBF0010 */ sw $ra, 0x10($sp) -/* A1D574 80242474 8C82000C */ lw $v0, 0xc($a0) -/* A1D578 80242478 0C0B1EAF */ jal get_variable -/* A1D57C 8024247C 8C450000 */ lw $a1, ($v0) -/* A1D580 80242480 00021600 */ sll $v0, $v0, 0x18 -/* A1D584 80242484 0C03AC5A */ jal func_800EB168 -/* A1D588 80242488 00022603 */ sra $a0, $v0, 0x18 -/* A1D58C 8024248C 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D590 80242490 24020002 */ addiu $v0, $zero, 2 -/* A1D594 80242494 03E00008 */ jr $ra -/* A1D598 80242498 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s new file mode 100644 index 0000000000..940aeaa07f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024246C_A1D56C +/* A1D56C 8024246C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1D570 80242470 AFBF0010 */ sw $ra, 0x10($sp) +/* A1D574 80242474 8C82000C */ lw $v0, 0xc($a0) +/* A1D578 80242478 0C0B1EAF */ jal get_variable +/* A1D57C 8024247C 8C450000 */ lw $a1, ($v0) +/* A1D580 80242480 00021600 */ sll $v0, $v0, 0x18 +/* A1D584 80242484 0C03AC5A */ jal func_800EB168 +/* A1D588 80242488 00022603 */ sra $a0, $v0, 0x18 +/* A1D58C 8024248C 8FBF0010 */ lw $ra, 0x10($sp) +/* A1D590 80242490 24020002 */ addiu $v0, $zero, 2 +/* A1D594 80242494 03E00008 */ jr $ra +/* A1D598 80242498 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024249C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024249C.s deleted file mode 100644 index 93b74ae3fe..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024249C.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024249C -/* A1D59C 8024249C 03E00008 */ jr $ra -/* A1D5A0 802424A0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024249C_A1D59C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024249C_A1D59C.s new file mode 100644 index 0000000000..4c72aff514 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024249C_A1D59C.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024249C_A1D59C +/* A1D59C 8024249C 03E00008 */ jr $ra +/* A1D5A0 802424A0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4.s deleted file mode 100644 index 1336b30371..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424A4 -/* A1D5A4 802424A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1D5A8 802424A8 AFB00010 */ sw $s0, 0x10($sp) -/* A1D5AC 802424AC 3C108025 */ lui $s0, 0x8025 -/* A1D5B0 802424B0 2610801C */ addiu $s0, $s0, -0x7fe4 -/* A1D5B4 802424B4 AFBF0018 */ sw $ra, 0x18($sp) -/* A1D5B8 802424B8 AFB10014 */ sw $s1, 0x14($sp) -/* A1D5BC 802424BC 8E020000 */ lw $v0, ($s0) -/* A1D5C0 802424C0 14400010 */ bnez $v0, .L80242504 -/* A1D5C4 802424C4 0080882D */ daddu $s1, $a0, $zero -/* A1D5C8 802424C8 0C00AB39 */ jal heap_malloc -/* A1D5CC 802424CC 24040040 */ addiu $a0, $zero, 0x40 -/* A1D5D0 802424D0 AE020000 */ sw $v0, ($s0) -/* A1D5D4 802424D4 0000182D */ daddu $v1, $zero, $zero -/* A1D5D8 802424D8 0040282D */ daddu $a1, $v0, $zero -/* A1D5DC 802424DC 0220202D */ daddu $a0, $s1, $zero -.L802424E0: -/* A1D5E0 802424E0 8C820084 */ lw $v0, 0x84($a0) -/* A1D5E4 802424E4 24840004 */ addiu $a0, $a0, 4 -/* A1D5E8 802424E8 24630001 */ addiu $v1, $v1, 1 -/* A1D5EC 802424EC ACA20000 */ sw $v0, ($a1) -/* A1D5F0 802424F0 28620010 */ slti $v0, $v1, 0x10 -/* A1D5F4 802424F4 1440FFFA */ bnez $v0, .L802424E0 -/* A1D5F8 802424F8 24A50004 */ addiu $a1, $a1, 4 -/* A1D5FC 802424FC 08090950 */ j .L80242540 -/* A1D600 80242500 00000000 */ nop -.L80242504: -/* A1D604 80242504 0000182D */ daddu $v1, $zero, $zero -/* A1D608 80242508 0040282D */ daddu $a1, $v0, $zero -/* A1D60C 8024250C 0220202D */ daddu $a0, $s1, $zero -.L80242510: -/* A1D610 80242510 8CA20000 */ lw $v0, ($a1) -/* A1D614 80242514 24A50004 */ addiu $a1, $a1, 4 -/* A1D618 80242518 24630001 */ addiu $v1, $v1, 1 -/* A1D61C 8024251C AC820084 */ sw $v0, 0x84($a0) -/* A1D620 80242520 28620010 */ slti $v0, $v1, 0x10 -/* A1D624 80242524 1440FFFA */ bnez $v0, .L80242510 -/* A1D628 80242528 24840004 */ addiu $a0, $a0, 4 -/* A1D62C 8024252C 3C108025 */ lui $s0, 0x8025 -/* A1D630 80242530 2610801C */ addiu $s0, $s0, -0x7fe4 -/* A1D634 80242534 0C00AB4B */ jal heap_free -/* A1D638 80242538 8E040000 */ lw $a0, ($s0) -/* A1D63C 8024253C AE000000 */ sw $zero, ($s0) -.L80242540: -/* A1D640 80242540 8FBF0018 */ lw $ra, 0x18($sp) -/* A1D644 80242544 8FB10014 */ lw $s1, 0x14($sp) -/* A1D648 80242548 8FB00010 */ lw $s0, 0x10($sp) -/* A1D64C 8024254C 24020002 */ addiu $v0, $zero, 2 -/* A1D650 80242550 03E00008 */ jr $ra -/* A1D654 80242554 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s new file mode 100644 index 0000000000..a00baa0753 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802424A4_A1D5A4.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424A4_A1D5A4 +/* A1D5A4 802424A4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A1D5A8 802424A8 AFB00010 */ sw $s0, 0x10($sp) +/* A1D5AC 802424AC 3C108025 */ lui $s0, 0x8025 +/* A1D5B0 802424B0 2610801C */ addiu $s0, $s0, -0x7fe4 +/* A1D5B4 802424B4 AFBF0018 */ sw $ra, 0x18($sp) +/* A1D5B8 802424B8 AFB10014 */ sw $s1, 0x14($sp) +/* A1D5BC 802424BC 8E020000 */ lw $v0, ($s0) +/* A1D5C0 802424C0 14400010 */ bnez $v0, .L80242504 +/* A1D5C4 802424C4 0080882D */ daddu $s1, $a0, $zero +/* A1D5C8 802424C8 0C00AB39 */ jal heap_malloc +/* A1D5CC 802424CC 24040040 */ addiu $a0, $zero, 0x40 +/* A1D5D0 802424D0 AE020000 */ sw $v0, ($s0) +/* A1D5D4 802424D4 0000182D */ daddu $v1, $zero, $zero +/* A1D5D8 802424D8 0040282D */ daddu $a1, $v0, $zero +/* A1D5DC 802424DC 0220202D */ daddu $a0, $s1, $zero +.L802424E0: +/* A1D5E0 802424E0 8C820084 */ lw $v0, 0x84($a0) +/* A1D5E4 802424E4 24840004 */ addiu $a0, $a0, 4 +/* A1D5E8 802424E8 24630001 */ addiu $v1, $v1, 1 +/* A1D5EC 802424EC ACA20000 */ sw $v0, ($a1) +/* A1D5F0 802424F0 28620010 */ slti $v0, $v1, 0x10 +/* A1D5F4 802424F4 1440FFFA */ bnez $v0, .L802424E0 +/* A1D5F8 802424F8 24A50004 */ addiu $a1, $a1, 4 +/* A1D5FC 802424FC 08090950 */ j .L80242540 +/* A1D600 80242500 00000000 */ nop +.L80242504: +/* A1D604 80242504 0000182D */ daddu $v1, $zero, $zero +/* A1D608 80242508 0040282D */ daddu $a1, $v0, $zero +/* A1D60C 8024250C 0220202D */ daddu $a0, $s1, $zero +.L80242510: +/* A1D610 80242510 8CA20000 */ lw $v0, ($a1) +/* A1D614 80242514 24A50004 */ addiu $a1, $a1, 4 +/* A1D618 80242518 24630001 */ addiu $v1, $v1, 1 +/* A1D61C 8024251C AC820084 */ sw $v0, 0x84($a0) +/* A1D620 80242520 28620010 */ slti $v0, $v1, 0x10 +/* A1D624 80242524 1440FFFA */ bnez $v0, .L80242510 +/* A1D628 80242528 24840004 */ addiu $a0, $a0, 4 +/* A1D62C 8024252C 3C108025 */ lui $s0, 0x8025 +/* A1D630 80242530 2610801C */ addiu $s0, $s0, -0x7fe4 +/* A1D634 80242534 0C00AB4B */ jal heap_free +/* A1D638 80242538 8E040000 */ lw $a0, ($s0) +/* A1D63C 8024253C AE000000 */ sw $zero, ($s0) +.L80242540: +/* A1D640 80242540 8FBF0018 */ lw $ra, 0x18($sp) +/* A1D644 80242544 8FB10014 */ lw $s1, 0x14($sp) +/* A1D648 80242548 8FB00010 */ lw $s0, 0x10($sp) +/* A1D64C 8024254C 24020002 */ addiu $v0, $zero, 2 +/* A1D650 80242550 03E00008 */ jr $ra +/* A1D654 80242554 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC.s deleted file mode 100644 index c73f049106..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425BC -/* A1D6BC 802425BC 24020001 */ addiu $v0, $zero, 1 -/* A1D6C0 802425C0 3C018015 */ lui $at, %hi(D_80151310) -/* A1D6C4 802425C4 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* A1D6C8 802425C8 03E00008 */ jr $ra -/* A1D6CC 802425CC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s new file mode 100644 index 0000000000..17f8a0fa7b --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425BC_A1D6BC +/* A1D6BC 802425BC 24020001 */ addiu $v0, $zero, 1 +/* A1D6C0 802425C0 3C018015 */ lui $at, %hi(D_80151310) +/* A1D6C4 802425C4 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* A1D6C8 802425C8 03E00008 */ jr $ra +/* A1D6CC 802425CC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0.s deleted file mode 100644 index 350be0940d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425D0 -/* A1D6D0 802425D0 3C018015 */ lui $at, %hi(D_80151310) -/* A1D6D4 802425D4 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* A1D6D8 802425D8 03E00008 */ jr $ra -/* A1D6DC 802425DC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s new file mode 100644 index 0000000000..67421acd62 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425D0_A1D6D0 +/* A1D6D0 802425D0 3C018015 */ lui $at, %hi(D_80151310) +/* A1D6D4 802425D4 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* A1D6D8 802425D8 03E00008 */ jr $ra +/* A1D6DC 802425DC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850.s deleted file mode 100644 index 88ebd1c4c1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242850 -/* A1D950 80242850 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D954 80242854 AFBF0010 */ sw $ra, 0x10($sp) -/* A1D958 80242858 0C00EABB */ jal get_npc_unsafe -/* A1D95C 8024285C 8C84014C */ lw $a0, 0x14c($a0) -/* A1D960 80242860 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D964 80242864 0000102D */ daddu $v0, $zero, $zero -/* A1D968 80242868 03E00008 */ jr $ra -/* A1D96C 8024286C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s new file mode 100644 index 0000000000..ae0d9174b2 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242850_A1D950 +/* A1D950 80242850 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1D954 80242854 AFBF0010 */ sw $ra, 0x10($sp) +/* A1D958 80242858 0C00EABB */ jal get_npc_unsafe +/* A1D95C 8024285C 8C84014C */ lw $a0, 0x14c($a0) +/* A1D960 80242860 8FBF0010 */ lw $ra, 0x10($sp) +/* A1D964 80242864 0000102D */ daddu $v0, $zero, $zero +/* A1D968 80242868 03E00008 */ jr $ra +/* A1D96C 8024286C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0.s deleted file mode 100644 index fbcb5704a1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428D0 -/* A1D9D0 802428D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1D9D4 802428D4 AFB10014 */ sw $s1, 0x14($sp) -/* A1D9D8 802428D8 0080882D */ daddu $s1, $a0, $zero -/* A1D9DC 802428DC AFBF0024 */ sw $ra, 0x24($sp) -/* A1D9E0 802428E0 AFB40020 */ sw $s4, 0x20($sp) -/* A1D9E4 802428E4 AFB3001C */ sw $s3, 0x1c($sp) -/* A1D9E8 802428E8 AFB20018 */ sw $s2, 0x18($sp) -/* A1D9EC 802428EC 10A00033 */ beqz $a1, .L802429BC -/* A1D9F0 802428F0 AFB00010 */ sw $s0, 0x10($sp) -/* A1D9F4 802428F4 0C04760B */ jal func_8011D82C -/* A1D9F8 802428F8 24040001 */ addiu $a0, $zero, 1 -/* A1D9FC 802428FC 0000202D */ daddu $a0, $zero, $zero -/* A1DA00 80242900 0080282D */ daddu $a1, $a0, $zero -/* A1DA04 80242904 0080302D */ daddu $a2, $a0, $zero -/* A1DA08 80242908 0080382D */ daddu $a3, $a0, $zero -/* A1DA0C 8024290C 0080802D */ daddu $s0, $a0, $zero -/* A1DA10 80242910 2414FFFC */ addiu $s4, $zero, -4 -/* A1DA14 80242914 24130007 */ addiu $s3, $zero, 7 -/* A1DA18 80242918 3C120080 */ lui $s2, 0x80 -/* A1DA1C 8024291C 3C038015 */ lui $v1, 0x8015 -/* A1DA20 80242920 8C6312F0 */ lw $v1, 0x12f0($v1) -/* A1DA24 80242924 24020001 */ addiu $v0, $zero, 1 -/* A1DA28 80242928 0C046F97 */ jal set_background_color_blend -/* A1DA2C 8024292C A0620000 */ sb $v0, ($v1) -.L80242930: -/* A1DA30 80242930 0C00E2B7 */ jal get_npc_by_index -/* A1DA34 80242934 0200202D */ daddu $a0, $s0, $zero -/* A1DA38 80242938 0040202D */ daddu $a0, $v0, $zero -/* A1DA3C 8024293C 5080000B */ beql $a0, $zero, .L8024296C -/* A1DA40 80242940 26100001 */ addiu $s0, $s0, 1 -/* A1DA44 80242944 8C820000 */ lw $v0, ($a0) -/* A1DA48 80242948 50400008 */ beql $v0, $zero, .L8024296C -/* A1DA4C 8024294C 26100001 */ addiu $s0, $s0, 1 -/* A1DA50 80242950 808300A4 */ lb $v1, 0xa4($a0) -/* A1DA54 80242954 10740005 */ beq $v1, $s4, .L8024296C -/* A1DA58 80242958 26100001 */ addiu $s0, $s0, 1 -/* A1DA5C 8024295C 10730003 */ beq $v1, $s3, .L8024296C -/* A1DA60 80242960 00000000 */ nop -/* A1DA64 80242964 00521025 */ or $v0, $v0, $s2 -/* A1DA68 80242968 AC820000 */ sw $v0, ($a0) -.L8024296C: -/* A1DA6C 8024296C 2A020040 */ slti $v0, $s0, 0x40 -/* A1DA70 80242970 1440FFEF */ bnez $v0, .L80242930 -/* A1DA74 80242974 00000000 */ nop -/* A1DA78 80242978 0000802D */ daddu $s0, $zero, $zero -/* A1DA7C 8024297C 3C120800 */ lui $s2, 0x800 -.L80242980: -/* A1DA80 80242980 0C04C3D6 */ jal get_item_entity -/* A1DA84 80242984 0200202D */ daddu $a0, $s0, $zero -/* A1DA88 80242988 0040182D */ daddu $v1, $v0, $zero -/* A1DA8C 8024298C 10600007 */ beqz $v1, .L802429AC -/* A1DA90 80242990 26100001 */ addiu $s0, $s0, 1 -/* A1DA94 80242994 8C640000 */ lw $a0, ($v1) -/* A1DA98 80242998 30820010 */ andi $v0, $a0, 0x10 -/* A1DA9C 8024299C 10400003 */ beqz $v0, .L802429AC -/* A1DAA0 802429A0 00000000 */ nop -/* A1DAA4 802429A4 00921025 */ or $v0, $a0, $s2 -/* A1DAA8 802429A8 AC620000 */ sw $v0, ($v1) -.L802429AC: -/* A1DAAC 802429AC 2A020100 */ slti $v0, $s0, 0x100 -/* A1DAB0 802429B0 1440FFF3 */ bnez $v0, .L80242980 -/* A1DAB4 802429B4 00000000 */ nop -/* A1DAB8 802429B8 AE200070 */ sw $zero, 0x70($s1) -.L802429BC: -/* A1DABC 802429BC 8E220070 */ lw $v0, 0x70($s1) -/* A1DAC0 802429C0 24420008 */ addiu $v0, $v0, 8 -/* A1DAC4 802429C4 AE220070 */ sw $v0, 0x70($s1) -/* A1DAC8 802429C8 28420100 */ slti $v0, $v0, 0x100 -/* A1DACC 802429CC 14400003 */ bnez $v0, .L802429DC -/* A1DAD0 802429D0 0000202D */ daddu $a0, $zero, $zero -/* A1DAD4 802429D4 240200FF */ addiu $v0, $zero, 0xff -/* A1DAD8 802429D8 AE220070 */ sw $v0, 0x70($s1) -.L802429DC: -/* A1DADC 802429DC 0080282D */ daddu $a1, $a0, $zero -/* A1DAE0 802429E0 92270073 */ lbu $a3, 0x73($s1) -/* A1DAE4 802429E4 0C046F97 */ jal set_background_color_blend -/* A1DAE8 802429E8 0080302D */ daddu $a2, $a0, $zero -/* A1DAEC 802429EC 8E220070 */ lw $v0, 0x70($s1) -/* A1DAF0 802429F0 8FBF0024 */ lw $ra, 0x24($sp) -/* A1DAF4 802429F4 8FB40020 */ lw $s4, 0x20($sp) -/* A1DAF8 802429F8 8FB3001C */ lw $s3, 0x1c($sp) -/* A1DAFC 802429FC 8FB20018 */ lw $s2, 0x18($sp) -/* A1DB00 80242A00 8FB10014 */ lw $s1, 0x14($sp) -/* A1DB04 80242A04 8FB00010 */ lw $s0, 0x10($sp) -/* A1DB08 80242A08 384200FF */ xori $v0, $v0, 0xff -/* A1DB0C 80242A0C 2C420001 */ sltiu $v0, $v0, 1 -/* A1DB10 80242A10 00021040 */ sll $v0, $v0, 1 -/* A1DB14 80242A14 03E00008 */ jr $ra -/* A1DB18 80242A18 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s new file mode 100644 index 0000000000..633bc277b3 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802428D0_A1D9D0.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428D0_A1D9D0 +/* A1D9D0 802428D0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A1D9D4 802428D4 AFB10014 */ sw $s1, 0x14($sp) +/* A1D9D8 802428D8 0080882D */ daddu $s1, $a0, $zero +/* A1D9DC 802428DC AFBF0024 */ sw $ra, 0x24($sp) +/* A1D9E0 802428E0 AFB40020 */ sw $s4, 0x20($sp) +/* A1D9E4 802428E4 AFB3001C */ sw $s3, 0x1c($sp) +/* A1D9E8 802428E8 AFB20018 */ sw $s2, 0x18($sp) +/* A1D9EC 802428EC 10A00033 */ beqz $a1, .L802429BC +/* A1D9F0 802428F0 AFB00010 */ sw $s0, 0x10($sp) +/* A1D9F4 802428F4 0C04760B */ jal func_8011D82C +/* A1D9F8 802428F8 24040001 */ addiu $a0, $zero, 1 +/* A1D9FC 802428FC 0000202D */ daddu $a0, $zero, $zero +/* A1DA00 80242900 0080282D */ daddu $a1, $a0, $zero +/* A1DA04 80242904 0080302D */ daddu $a2, $a0, $zero +/* A1DA08 80242908 0080382D */ daddu $a3, $a0, $zero +/* A1DA0C 8024290C 0080802D */ daddu $s0, $a0, $zero +/* A1DA10 80242910 2414FFFC */ addiu $s4, $zero, -4 +/* A1DA14 80242914 24130007 */ addiu $s3, $zero, 7 +/* A1DA18 80242918 3C120080 */ lui $s2, 0x80 +/* A1DA1C 8024291C 3C038015 */ lui $v1, 0x8015 +/* A1DA20 80242920 8C6312F0 */ lw $v1, 0x12f0($v1) +/* A1DA24 80242924 24020001 */ addiu $v0, $zero, 1 +/* A1DA28 80242928 0C046F97 */ jal set_background_color_blend +/* A1DA2C 8024292C A0620000 */ sb $v0, ($v1) +.L80242930: +/* A1DA30 80242930 0C00E2B7 */ jal get_npc_by_index +/* A1DA34 80242934 0200202D */ daddu $a0, $s0, $zero +/* A1DA38 80242938 0040202D */ daddu $a0, $v0, $zero +/* A1DA3C 8024293C 5080000B */ beql $a0, $zero, .L8024296C +/* A1DA40 80242940 26100001 */ addiu $s0, $s0, 1 +/* A1DA44 80242944 8C820000 */ lw $v0, ($a0) +/* A1DA48 80242948 50400008 */ beql $v0, $zero, .L8024296C +/* A1DA4C 8024294C 26100001 */ addiu $s0, $s0, 1 +/* A1DA50 80242950 808300A4 */ lb $v1, 0xa4($a0) +/* A1DA54 80242954 10740005 */ beq $v1, $s4, .L8024296C +/* A1DA58 80242958 26100001 */ addiu $s0, $s0, 1 +/* A1DA5C 8024295C 10730003 */ beq $v1, $s3, .L8024296C +/* A1DA60 80242960 00000000 */ nop +/* A1DA64 80242964 00521025 */ or $v0, $v0, $s2 +/* A1DA68 80242968 AC820000 */ sw $v0, ($a0) +.L8024296C: +/* A1DA6C 8024296C 2A020040 */ slti $v0, $s0, 0x40 +/* A1DA70 80242970 1440FFEF */ bnez $v0, .L80242930 +/* A1DA74 80242974 00000000 */ nop +/* A1DA78 80242978 0000802D */ daddu $s0, $zero, $zero +/* A1DA7C 8024297C 3C120800 */ lui $s2, 0x800 +.L80242980: +/* A1DA80 80242980 0C04C3D6 */ jal get_item_entity +/* A1DA84 80242984 0200202D */ daddu $a0, $s0, $zero +/* A1DA88 80242988 0040182D */ daddu $v1, $v0, $zero +/* A1DA8C 8024298C 10600007 */ beqz $v1, .L802429AC +/* A1DA90 80242990 26100001 */ addiu $s0, $s0, 1 +/* A1DA94 80242994 8C640000 */ lw $a0, ($v1) +/* A1DA98 80242998 30820010 */ andi $v0, $a0, 0x10 +/* A1DA9C 8024299C 10400003 */ beqz $v0, .L802429AC +/* A1DAA0 802429A0 00000000 */ nop +/* A1DAA4 802429A4 00921025 */ or $v0, $a0, $s2 +/* A1DAA8 802429A8 AC620000 */ sw $v0, ($v1) +.L802429AC: +/* A1DAAC 802429AC 2A020100 */ slti $v0, $s0, 0x100 +/* A1DAB0 802429B0 1440FFF3 */ bnez $v0, .L80242980 +/* A1DAB4 802429B4 00000000 */ nop +/* A1DAB8 802429B8 AE200070 */ sw $zero, 0x70($s1) +.L802429BC: +/* A1DABC 802429BC 8E220070 */ lw $v0, 0x70($s1) +/* A1DAC0 802429C0 24420008 */ addiu $v0, $v0, 8 +/* A1DAC4 802429C4 AE220070 */ sw $v0, 0x70($s1) +/* A1DAC8 802429C8 28420100 */ slti $v0, $v0, 0x100 +/* A1DACC 802429CC 14400003 */ bnez $v0, .L802429DC +/* A1DAD0 802429D0 0000202D */ daddu $a0, $zero, $zero +/* A1DAD4 802429D4 240200FF */ addiu $v0, $zero, 0xff +/* A1DAD8 802429D8 AE220070 */ sw $v0, 0x70($s1) +.L802429DC: +/* A1DADC 802429DC 0080282D */ daddu $a1, $a0, $zero +/* A1DAE0 802429E0 92270073 */ lbu $a3, 0x73($s1) +/* A1DAE4 802429E4 0C046F97 */ jal set_background_color_blend +/* A1DAE8 802429E8 0080302D */ daddu $a2, $a0, $zero +/* A1DAEC 802429EC 8E220070 */ lw $v0, 0x70($s1) +/* A1DAF0 802429F0 8FBF0024 */ lw $ra, 0x24($sp) +/* A1DAF4 802429F4 8FB40020 */ lw $s4, 0x20($sp) +/* A1DAF8 802429F8 8FB3001C */ lw $s3, 0x1c($sp) +/* A1DAFC 802429FC 8FB20018 */ lw $s2, 0x18($sp) +/* A1DB00 80242A00 8FB10014 */ lw $s1, 0x14($sp) +/* A1DB04 80242A04 8FB00010 */ lw $s0, 0x10($sp) +/* A1DB08 80242A08 384200FF */ xori $v0, $v0, 0xff +/* A1DB0C 80242A0C 2C420001 */ sltiu $v0, $v0, 1 +/* A1DB10 80242A10 00021040 */ sll $v0, $v0, 1 +/* A1DB14 80242A14 03E00008 */ jr $ra +/* A1DB18 80242A18 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C.s deleted file mode 100644 index b142c4e06f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A1C -/* A1DB1C 80242A1C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1DB20 80242A20 AFB00010 */ sw $s0, 0x10($sp) -/* A1DB24 80242A24 0080802D */ daddu $s0, $a0, $zero -/* A1DB28 80242A28 AFBF0020 */ sw $ra, 0x20($sp) -/* A1DB2C 80242A2C AFB3001C */ sw $s3, 0x1c($sp) -/* A1DB30 80242A30 AFB20018 */ sw $s2, 0x18($sp) -/* A1DB34 80242A34 10A00009 */ beqz $a1, .L80242A5C -/* A1DB38 80242A38 AFB10014 */ sw $s1, 0x14($sp) -/* A1DB3C 80242A3C 0000202D */ daddu $a0, $zero, $zero -/* A1DB40 80242A40 0080282D */ daddu $a1, $a0, $zero -/* A1DB44 80242A44 0080302D */ daddu $a2, $a0, $zero -/* A1DB48 80242A48 0C046F97 */ jal set_background_color_blend -/* A1DB4C 80242A4C 240700FF */ addiu $a3, $zero, 0xff -/* A1DB50 80242A50 240200FF */ addiu $v0, $zero, 0xff -/* A1DB54 80242A54 AE020070 */ sw $v0, 0x70($s0) -/* A1DB58 80242A58 AE000074 */ sw $zero, 0x74($s0) -.L80242A5C: -/* A1DB5C 80242A5C 8E020070 */ lw $v0, 0x70($s0) -/* A1DB60 80242A60 2442FFF8 */ addiu $v0, $v0, -8 -/* A1DB64 80242A64 04410002 */ bgez $v0, .L80242A70 -/* A1DB68 80242A68 AE020070 */ sw $v0, 0x70($s0) -/* A1DB6C 80242A6C AE000070 */ sw $zero, 0x70($s0) -.L80242A70: -/* A1DB70 80242A70 0000202D */ daddu $a0, $zero, $zero -/* A1DB74 80242A74 0080282D */ daddu $a1, $a0, $zero -/* A1DB78 80242A78 92070073 */ lbu $a3, 0x73($s0) -/* A1DB7C 80242A7C 0C046F97 */ jal set_background_color_blend -/* A1DB80 80242A80 0080302D */ daddu $a2, $a0, $zero -/* A1DB84 80242A84 8E020070 */ lw $v0, 0x70($s0) -/* A1DB88 80242A88 14400006 */ bnez $v0, .L80242AA4 -/* A1DB8C 80242A8C 00000000 */ nop -/* A1DB90 80242A90 8E020074 */ lw $v0, 0x74($s0) -/* A1DB94 80242A94 14400003 */ bnez $v0, .L80242AA4 -/* A1DB98 80242A98 24020001 */ addiu $v0, $zero, 1 -/* A1DB9C 80242A9C 08090ADC */ j .L80242B70 -/* A1DBA0 80242AA0 AE020074 */ sw $v0, 0x74($s0) -.L80242AA4: -/* A1DBA4 80242AA4 8E030074 */ lw $v1, 0x74($s0) -/* A1DBA8 80242AA8 24020001 */ addiu $v0, $zero, 1 -/* A1DBAC 80242AAC 14620031 */ bne $v1, $v0, .L80242B74 -/* A1DBB0 80242AB0 0000102D */ daddu $v0, $zero, $zero -/* A1DBB4 80242AB4 0C04760B */ jal func_8011D82C -/* A1DBB8 80242AB8 0000202D */ daddu $a0, $zero, $zero -/* A1DBBC 80242ABC 0000802D */ daddu $s0, $zero, $zero -/* A1DBC0 80242AC0 2413FFFC */ addiu $s3, $zero, -4 -/* A1DBC4 80242AC4 24120007 */ addiu $s2, $zero, 7 -/* A1DBC8 80242AC8 3C11FF7F */ lui $s1, 0xff7f -/* A1DBCC 80242ACC 3C028015 */ lui $v0, 0x8015 -/* A1DBD0 80242AD0 8C4212F0 */ lw $v0, 0x12f0($v0) -/* A1DBD4 80242AD4 3631FFFF */ ori $s1, $s1, 0xffff -/* A1DBD8 80242AD8 A0400000 */ sb $zero, ($v0) -.L80242ADC: -/* A1DBDC 80242ADC 0C00E2B7 */ jal get_npc_by_index -/* A1DBE0 80242AE0 0200202D */ daddu $a0, $s0, $zero -/* A1DBE4 80242AE4 0040202D */ daddu $a0, $v0, $zero -/* A1DBE8 80242AE8 5080000B */ beql $a0, $zero, .L80242B18 -/* A1DBEC 80242AEC 26100001 */ addiu $s0, $s0, 1 -/* A1DBF0 80242AF0 8C820000 */ lw $v0, ($a0) -/* A1DBF4 80242AF4 50400008 */ beql $v0, $zero, .L80242B18 -/* A1DBF8 80242AF8 26100001 */ addiu $s0, $s0, 1 -/* A1DBFC 80242AFC 808300A4 */ lb $v1, 0xa4($a0) -/* A1DC00 80242B00 10730005 */ beq $v1, $s3, .L80242B18 -/* A1DC04 80242B04 26100001 */ addiu $s0, $s0, 1 -/* A1DC08 80242B08 10720003 */ beq $v1, $s2, .L80242B18 -/* A1DC0C 80242B0C 00000000 */ nop -/* A1DC10 80242B10 00511024 */ and $v0, $v0, $s1 -/* A1DC14 80242B14 AC820000 */ sw $v0, ($a0) -.L80242B18: -/* A1DC18 80242B18 2A020040 */ slti $v0, $s0, 0x40 -/* A1DC1C 80242B1C 1440FFEF */ bnez $v0, .L80242ADC -/* A1DC20 80242B20 00000000 */ nop -/* A1DC24 80242B24 0000802D */ daddu $s0, $zero, $zero -/* A1DC28 80242B28 3C11F7FF */ lui $s1, 0xf7ff -/* A1DC2C 80242B2C 3631FFFF */ ori $s1, $s1, 0xffff -.L80242B30: -/* A1DC30 80242B30 0C04C3D6 */ jal get_item_entity -/* A1DC34 80242B34 0200202D */ daddu $a0, $s0, $zero -/* A1DC38 80242B38 0040182D */ daddu $v1, $v0, $zero -/* A1DC3C 80242B3C 10600007 */ beqz $v1, .L80242B5C -/* A1DC40 80242B40 26100001 */ addiu $s0, $s0, 1 -/* A1DC44 80242B44 8C640000 */ lw $a0, ($v1) -/* A1DC48 80242B48 30820010 */ andi $v0, $a0, 0x10 -/* A1DC4C 80242B4C 10400003 */ beqz $v0, .L80242B5C -/* A1DC50 80242B50 00000000 */ nop -/* A1DC54 80242B54 00911024 */ and $v0, $a0, $s1 -/* A1DC58 80242B58 AC620000 */ sw $v0, ($v1) -.L80242B5C: -/* A1DC5C 80242B5C 2A020100 */ slti $v0, $s0, 0x100 -/* A1DC60 80242B60 1440FFF3 */ bnez $v0, .L80242B30 -/* A1DC64 80242B64 24020002 */ addiu $v0, $zero, 2 -/* A1DC68 80242B68 08090ADD */ j .L80242B74 -/* A1DC6C 80242B6C 00000000 */ nop -.L80242B70: -/* A1DC70 80242B70 0000102D */ daddu $v0, $zero, $zero -.L80242B74: -/* A1DC74 80242B74 8FBF0020 */ lw $ra, 0x20($sp) -/* A1DC78 80242B78 8FB3001C */ lw $s3, 0x1c($sp) -/* A1DC7C 80242B7C 8FB20018 */ lw $s2, 0x18($sp) -/* A1DC80 80242B80 8FB10014 */ lw $s1, 0x14($sp) -/* A1DC84 80242B84 8FB00010 */ lw $s0, 0x10($sp) -/* A1DC88 80242B88 03E00008 */ jr $ra -/* A1DC8C 80242B8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s new file mode 100644 index 0000000000..44bc7d6a61 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242A1C_A1DB1C.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A1C_A1DB1C +/* A1DB1C 80242A1C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A1DB20 80242A20 AFB00010 */ sw $s0, 0x10($sp) +/* A1DB24 80242A24 0080802D */ daddu $s0, $a0, $zero +/* A1DB28 80242A28 AFBF0020 */ sw $ra, 0x20($sp) +/* A1DB2C 80242A2C AFB3001C */ sw $s3, 0x1c($sp) +/* A1DB30 80242A30 AFB20018 */ sw $s2, 0x18($sp) +/* A1DB34 80242A34 10A00009 */ beqz $a1, .L80242A5C +/* A1DB38 80242A38 AFB10014 */ sw $s1, 0x14($sp) +/* A1DB3C 80242A3C 0000202D */ daddu $a0, $zero, $zero +/* A1DB40 80242A40 0080282D */ daddu $a1, $a0, $zero +/* A1DB44 80242A44 0080302D */ daddu $a2, $a0, $zero +/* A1DB48 80242A48 0C046F97 */ jal set_background_color_blend +/* A1DB4C 80242A4C 240700FF */ addiu $a3, $zero, 0xff +/* A1DB50 80242A50 240200FF */ addiu $v0, $zero, 0xff +/* A1DB54 80242A54 AE020070 */ sw $v0, 0x70($s0) +/* A1DB58 80242A58 AE000074 */ sw $zero, 0x74($s0) +.L80242A5C: +/* A1DB5C 80242A5C 8E020070 */ lw $v0, 0x70($s0) +/* A1DB60 80242A60 2442FFF8 */ addiu $v0, $v0, -8 +/* A1DB64 80242A64 04410002 */ bgez $v0, .L80242A70 +/* A1DB68 80242A68 AE020070 */ sw $v0, 0x70($s0) +/* A1DB6C 80242A6C AE000070 */ sw $zero, 0x70($s0) +.L80242A70: +/* A1DB70 80242A70 0000202D */ daddu $a0, $zero, $zero +/* A1DB74 80242A74 0080282D */ daddu $a1, $a0, $zero +/* A1DB78 80242A78 92070073 */ lbu $a3, 0x73($s0) +/* A1DB7C 80242A7C 0C046F97 */ jal set_background_color_blend +/* A1DB80 80242A80 0080302D */ daddu $a2, $a0, $zero +/* A1DB84 80242A84 8E020070 */ lw $v0, 0x70($s0) +/* A1DB88 80242A88 14400006 */ bnez $v0, .L80242AA4 +/* A1DB8C 80242A8C 00000000 */ nop +/* A1DB90 80242A90 8E020074 */ lw $v0, 0x74($s0) +/* A1DB94 80242A94 14400003 */ bnez $v0, .L80242AA4 +/* A1DB98 80242A98 24020001 */ addiu $v0, $zero, 1 +/* A1DB9C 80242A9C 08090ADC */ j .L80242B70 +/* A1DBA0 80242AA0 AE020074 */ sw $v0, 0x74($s0) +.L80242AA4: +/* A1DBA4 80242AA4 8E030074 */ lw $v1, 0x74($s0) +/* A1DBA8 80242AA8 24020001 */ addiu $v0, $zero, 1 +/* A1DBAC 80242AAC 14620031 */ bne $v1, $v0, .L80242B74 +/* A1DBB0 80242AB0 0000102D */ daddu $v0, $zero, $zero +/* A1DBB4 80242AB4 0C04760B */ jal func_8011D82C +/* A1DBB8 80242AB8 0000202D */ daddu $a0, $zero, $zero +/* A1DBBC 80242ABC 0000802D */ daddu $s0, $zero, $zero +/* A1DBC0 80242AC0 2413FFFC */ addiu $s3, $zero, -4 +/* A1DBC4 80242AC4 24120007 */ addiu $s2, $zero, 7 +/* A1DBC8 80242AC8 3C11FF7F */ lui $s1, 0xff7f +/* A1DBCC 80242ACC 3C028015 */ lui $v0, 0x8015 +/* A1DBD0 80242AD0 8C4212F0 */ lw $v0, 0x12f0($v0) +/* A1DBD4 80242AD4 3631FFFF */ ori $s1, $s1, 0xffff +/* A1DBD8 80242AD8 A0400000 */ sb $zero, ($v0) +.L80242ADC: +/* A1DBDC 80242ADC 0C00E2B7 */ jal get_npc_by_index +/* A1DBE0 80242AE0 0200202D */ daddu $a0, $s0, $zero +/* A1DBE4 80242AE4 0040202D */ daddu $a0, $v0, $zero +/* A1DBE8 80242AE8 5080000B */ beql $a0, $zero, .L80242B18 +/* A1DBEC 80242AEC 26100001 */ addiu $s0, $s0, 1 +/* A1DBF0 80242AF0 8C820000 */ lw $v0, ($a0) +/* A1DBF4 80242AF4 50400008 */ beql $v0, $zero, .L80242B18 +/* A1DBF8 80242AF8 26100001 */ addiu $s0, $s0, 1 +/* A1DBFC 80242AFC 808300A4 */ lb $v1, 0xa4($a0) +/* A1DC00 80242B00 10730005 */ beq $v1, $s3, .L80242B18 +/* A1DC04 80242B04 26100001 */ addiu $s0, $s0, 1 +/* A1DC08 80242B08 10720003 */ beq $v1, $s2, .L80242B18 +/* A1DC0C 80242B0C 00000000 */ nop +/* A1DC10 80242B10 00511024 */ and $v0, $v0, $s1 +/* A1DC14 80242B14 AC820000 */ sw $v0, ($a0) +.L80242B18: +/* A1DC18 80242B18 2A020040 */ slti $v0, $s0, 0x40 +/* A1DC1C 80242B1C 1440FFEF */ bnez $v0, .L80242ADC +/* A1DC20 80242B20 00000000 */ nop +/* A1DC24 80242B24 0000802D */ daddu $s0, $zero, $zero +/* A1DC28 80242B28 3C11F7FF */ lui $s1, 0xf7ff +/* A1DC2C 80242B2C 3631FFFF */ ori $s1, $s1, 0xffff +.L80242B30: +/* A1DC30 80242B30 0C04C3D6 */ jal get_item_entity +/* A1DC34 80242B34 0200202D */ daddu $a0, $s0, $zero +/* A1DC38 80242B38 0040182D */ daddu $v1, $v0, $zero +/* A1DC3C 80242B3C 10600007 */ beqz $v1, .L80242B5C +/* A1DC40 80242B40 26100001 */ addiu $s0, $s0, 1 +/* A1DC44 80242B44 8C640000 */ lw $a0, ($v1) +/* A1DC48 80242B48 30820010 */ andi $v0, $a0, 0x10 +/* A1DC4C 80242B4C 10400003 */ beqz $v0, .L80242B5C +/* A1DC50 80242B50 00000000 */ nop +/* A1DC54 80242B54 00911024 */ and $v0, $a0, $s1 +/* A1DC58 80242B58 AC620000 */ sw $v0, ($v1) +.L80242B5C: +/* A1DC5C 80242B5C 2A020100 */ slti $v0, $s0, 0x100 +/* A1DC60 80242B60 1440FFF3 */ bnez $v0, .L80242B30 +/* A1DC64 80242B64 24020002 */ addiu $v0, $zero, 2 +/* A1DC68 80242B68 08090ADD */ j .L80242B74 +/* A1DC6C 80242B6C 00000000 */ nop +.L80242B70: +/* A1DC70 80242B70 0000102D */ daddu $v0, $zero, $zero +.L80242B74: +/* A1DC74 80242B74 8FBF0020 */ lw $ra, 0x20($sp) +/* A1DC78 80242B78 8FB3001C */ lw $s3, 0x1c($sp) +/* A1DC7C 80242B7C 8FB20018 */ lw $s2, 0x18($sp) +/* A1DC80 80242B80 8FB10014 */ lw $s1, 0x14($sp) +/* A1DC84 80242B84 8FB00010 */ lw $s0, 0x10($sp) +/* A1DC88 80242B88 03E00008 */ jr $ra +/* A1DC8C 80242B8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14.s deleted file mode 100644 index 6e31eb071d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C14 -/* A1DD14 80242C14 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A1DD18 80242C18 AFB1001C */ sw $s1, 0x1c($sp) -/* A1DD1C 80242C1C AFBF0020 */ sw $ra, 0x20($sp) -/* A1DD20 80242C20 AFB00018 */ sw $s0, 0x18($sp) -/* A1DD24 80242C24 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A1DD28 80242C28 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A1DD2C 80242C2C 10A00060 */ beqz $a1, .L80242DB0 -/* A1DD30 80242C30 0080882D */ daddu $s1, $a0, $zero -/* A1DD34 80242C34 3C05F4AC */ lui $a1, 0xf4ac -/* A1DD38 80242C38 0C0B1EAF */ jal get_variable -/* A1DD3C 80242C3C 34A5D481 */ ori $a1, $a1, 0xd481 -/* A1DD40 80242C40 0220202D */ daddu $a0, $s1, $zero -/* A1DD44 80242C44 3C05F4AC */ lui $a1, 0xf4ac -/* A1DD48 80242C48 4482B000 */ mtc1 $v0, $f22 -/* A1DD4C 80242C4C 00000000 */ nop -/* A1DD50 80242C50 4680B5A0 */ cvt.s.w $f22, $f22 -/* A1DD54 80242C54 0C0B1EAF */ jal get_variable -/* A1DD58 80242C58 34A5D482 */ ori $a1, $a1, 0xd482 -/* A1DD5C 80242C5C 0220202D */ daddu $a0, $s1, $zero -/* A1DD60 80242C60 3C05F4AC */ lui $a1, 0xf4ac -/* A1DD64 80242C64 4482A000 */ mtc1 $v0, $f20 -/* A1DD68 80242C68 00000000 */ nop -/* A1DD6C 80242C6C 4680A520 */ cvt.s.w $f20, $f20 -/* A1DD70 80242C70 0C0B1EAF */ jal get_variable -/* A1DD74 80242C74 34A5D483 */ ori $a1, $a1, 0xd483 -/* A1DD78 80242C78 44821000 */ mtc1 $v0, $f2 -/* A1DD7C 80242C7C 00000000 */ nop -/* A1DD80 80242C80 468010A0 */ cvt.s.w $f2, $f2 -/* A1DD84 80242C84 4405B000 */ mfc1 $a1, $f22 -/* A1DD88 80242C88 4406A000 */ mfc1 $a2, $f20 -/* A1DD8C 80242C8C 44071000 */ mfc1 $a3, $f2 -/* A1DD90 80242C90 0C01C574 */ jal func_800715D0 -/* A1DD94 80242C94 0000202D */ daddu $a0, $zero, $zero -/* A1DD98 80242C98 0220202D */ daddu $a0, $s1, $zero -/* A1DD9C 80242C9C 3C05F4AC */ lui $a1, 0xf4ac -/* A1DDA0 80242CA0 34A5D481 */ ori $a1, $a1, 0xd481 -/* A1DDA4 80242CA4 3C108025 */ lui $s0, 0x8025 -/* A1DDA8 80242CA8 2610BDF0 */ addiu $s0, $s0, -0x4210 -/* A1DDAC 80242CAC 0C0B1EAF */ jal get_variable -/* A1DDB0 80242CB0 AE020000 */ sw $v0, ($s0) -/* A1DDB4 80242CB4 0220202D */ daddu $a0, $s1, $zero -/* A1DDB8 80242CB8 3C05F4AC */ lui $a1, 0xf4ac -/* A1DDBC 80242CBC 4482B000 */ mtc1 $v0, $f22 -/* A1DDC0 80242CC0 00000000 */ nop -/* A1DDC4 80242CC4 4680B5A0 */ cvt.s.w $f22, $f22 -/* A1DDC8 80242CC8 0C0B1EAF */ jal get_variable -/* A1DDCC 80242CCC 34A5D482 */ ori $a1, $a1, 0xd482 -/* A1DDD0 80242CD0 0220202D */ daddu $a0, $s1, $zero -/* A1DDD4 80242CD4 3C05F4AC */ lui $a1, 0xf4ac -/* A1DDD8 80242CD8 4482A000 */ mtc1 $v0, $f20 -/* A1DDDC 80242CDC 00000000 */ nop -/* A1DDE0 80242CE0 4680A520 */ cvt.s.w $f20, $f20 -/* A1DDE4 80242CE4 0C0B1EAF */ jal get_variable -/* A1DDE8 80242CE8 34A5D483 */ ori $a1, $a1, 0xd483 -/* A1DDEC 80242CEC 44821000 */ mtc1 $v0, $f2 -/* A1DDF0 80242CF0 00000000 */ nop -/* A1DDF4 80242CF4 468010A0 */ cvt.s.w $f2, $f2 -/* A1DDF8 80242CF8 4405B000 */ mfc1 $a1, $f22 -/* A1DDFC 80242CFC 4406A000 */ mfc1 $a2, $f20 -/* A1DE00 80242D00 44071000 */ mfc1 $a3, $f2 -/* A1DE04 80242D04 0C01C604 */ jal func_80071810 -/* A1DE08 80242D08 0000202D */ daddu $a0, $zero, $zero -/* A1DE0C 80242D0C 0220202D */ daddu $a0, $s1, $zero -/* A1DE10 80242D10 3C05F4AC */ lui $a1, 0xf4ac -/* A1DE14 80242D14 3C018025 */ lui $at, 0x8025 -/* A1DE18 80242D18 AC22BDF4 */ sw $v0, -0x420c($at) -/* A1DE1C 80242D1C 0C0B1EAF */ jal get_variable -/* A1DE20 80242D20 34A5D481 */ ori $a1, $a1, 0xd481 -/* A1DE24 80242D24 0220202D */ daddu $a0, $s1, $zero -/* A1DE28 80242D28 3C05F4AC */ lui $a1, 0xf4ac -/* A1DE2C 80242D2C 4482B000 */ mtc1 $v0, $f22 -/* A1DE30 80242D30 00000000 */ nop -/* A1DE34 80242D34 4680B5A0 */ cvt.s.w $f22, $f22 -/* A1DE38 80242D38 0C0B1EAF */ jal get_variable -/* A1DE3C 80242D3C 34A5D482 */ ori $a1, $a1, 0xd482 -/* A1DE40 80242D40 0220202D */ daddu $a0, $s1, $zero -/* A1DE44 80242D44 3C05F4AC */ lui $a1, 0xf4ac -/* A1DE48 80242D48 4482A000 */ mtc1 $v0, $f20 -/* A1DE4C 80242D4C 00000000 */ nop -/* A1DE50 80242D50 4680A520 */ cvt.s.w $f20, $f20 -/* A1DE54 80242D54 0C0B1EAF */ jal get_variable -/* A1DE58 80242D58 34A5D483 */ ori $a1, $a1, 0xd483 -/* A1DE5C 80242D5C 44821000 */ mtc1 $v0, $f2 -/* A1DE60 80242D60 00000000 */ nop -/* A1DE64 80242D64 468010A0 */ cvt.s.w $f2, $f2 -/* A1DE68 80242D68 4405B000 */ mfc1 $a1, $f22 -/* A1DE6C 80242D6C 4406A000 */ mfc1 $a2, $f20 -/* A1DE70 80242D70 3C013F80 */ lui $at, 0x3f80 -/* A1DE74 80242D74 44810000 */ mtc1 $at, $f0 -/* A1DE78 80242D78 44071000 */ mfc1 $a3, $f2 -/* A1DE7C 80242D7C 0000202D */ daddu $a0, $zero, $zero -/* A1DE80 80242D80 AFA00014 */ sw $zero, 0x14($sp) -/* A1DE84 80242D84 0C01CA24 */ jal func_80072890 -/* A1DE88 80242D88 E7A00010 */ swc1 $f0, 0x10($sp) -/* A1DE8C 80242D8C 8E030000 */ lw $v1, ($s0) -/* A1DE90 80242D90 8C64000C */ lw $a0, 0xc($v1) -/* A1DE94 80242D94 3C018025 */ lui $at, 0x8025 -/* A1DE98 80242D98 AC22BDF8 */ sw $v0, -0x4208($at) -/* A1DE9C 80242D9C AC800018 */ sw $zero, 0x18($a0) -/* A1DEA0 80242DA0 AC800020 */ sw $zero, 0x20($a0) -/* A1DEA4 80242DA4 AC800024 */ sw $zero, 0x24($a0) -/* A1DEA8 80242DA8 AC800028 */ sw $zero, 0x28($a0) -/* A1DEAC 80242DAC AC80001C */ sw $zero, 0x1c($a0) -.L80242DB0: -/* A1DEB0 80242DB0 3C028025 */ lui $v0, 0x8025 -/* A1DEB4 80242DB4 8C42BDF0 */ lw $v0, -0x4210($v0) -/* A1DEB8 80242DB8 8C44000C */ lw $a0, 0xc($v0) -/* A1DEBC 80242DBC 8C820020 */ lw $v0, 0x20($a0) -/* A1DEC0 80242DC0 8C830028 */ lw $v1, 0x28($a0) -/* A1DEC4 80242DC4 2442000A */ addiu $v0, $v0, 0xa -/* A1DEC8 80242DC8 AC820020 */ sw $v0, 0x20($a0) -/* A1DECC 80242DCC 8C820024 */ lw $v0, 0x24($a0) -/* A1DED0 80242DD0 2463000A */ addiu $v1, $v1, 0xa -/* A1DED4 80242DD4 AC830028 */ sw $v1, 0x28($a0) -/* A1DED8 80242DD8 8C830018 */ lw $v1, 0x18($a0) -/* A1DEDC 80242DDC 2442000A */ addiu $v0, $v0, 0xa -/* A1DEE0 80242DE0 AC820024 */ sw $v0, 0x24($a0) -/* A1DEE4 80242DE4 8C82001C */ lw $v0, 0x1c($a0) -/* A1DEE8 80242DE8 2463000A */ addiu $v1, $v1, 0xa -/* A1DEEC 80242DEC AC830018 */ sw $v1, 0x18($a0) -/* A1DEF0 80242DF0 286300FF */ slti $v1, $v1, 0xff -/* A1DEF4 80242DF4 2442000A */ addiu $v0, $v0, 0xa -/* A1DEF8 80242DF8 AC82001C */ sw $v0, 0x1c($a0) -/* A1DEFC 80242DFC 14600004 */ bnez $v1, .L80242E10 -/* A1DF00 80242E00 0000102D */ daddu $v0, $zero, $zero -/* A1DF04 80242E04 240200FF */ addiu $v0, $zero, 0xff -/* A1DF08 80242E08 AC820018 */ sw $v0, 0x18($a0) -/* A1DF0C 80242E0C 24020002 */ addiu $v0, $zero, 2 -.L80242E10: -/* A1DF10 80242E10 8FBF0020 */ lw $ra, 0x20($sp) -/* A1DF14 80242E14 8FB1001C */ lw $s1, 0x1c($sp) -/* A1DF18 80242E18 8FB00018 */ lw $s0, 0x18($sp) -/* A1DF1C 80242E1C D7B60030 */ ldc1 $f22, 0x30($sp) -/* A1DF20 80242E20 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A1DF24 80242E24 03E00008 */ jr $ra -/* A1DF28 80242E28 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s new file mode 100644 index 0000000000..b69e695343 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242C14_A1DD14.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C14_A1DD14 +/* A1DD14 80242C14 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A1DD18 80242C18 AFB1001C */ sw $s1, 0x1c($sp) +/* A1DD1C 80242C1C AFBF0020 */ sw $ra, 0x20($sp) +/* A1DD20 80242C20 AFB00018 */ sw $s0, 0x18($sp) +/* A1DD24 80242C24 F7B60030 */ sdc1 $f22, 0x30($sp) +/* A1DD28 80242C28 F7B40028 */ sdc1 $f20, 0x28($sp) +/* A1DD2C 80242C2C 10A00060 */ beqz $a1, .L80242DB0 +/* A1DD30 80242C30 0080882D */ daddu $s1, $a0, $zero +/* A1DD34 80242C34 3C05F4AC */ lui $a1, 0xf4ac +/* A1DD38 80242C38 0C0B1EAF */ jal get_variable +/* A1DD3C 80242C3C 34A5D481 */ ori $a1, $a1, 0xd481 +/* A1DD40 80242C40 0220202D */ daddu $a0, $s1, $zero +/* A1DD44 80242C44 3C05F4AC */ lui $a1, 0xf4ac +/* A1DD48 80242C48 4482B000 */ mtc1 $v0, $f22 +/* A1DD4C 80242C4C 00000000 */ nop +/* A1DD50 80242C50 4680B5A0 */ cvt.s.w $f22, $f22 +/* A1DD54 80242C54 0C0B1EAF */ jal get_variable +/* A1DD58 80242C58 34A5D482 */ ori $a1, $a1, 0xd482 +/* A1DD5C 80242C5C 0220202D */ daddu $a0, $s1, $zero +/* A1DD60 80242C60 3C05F4AC */ lui $a1, 0xf4ac +/* A1DD64 80242C64 4482A000 */ mtc1 $v0, $f20 +/* A1DD68 80242C68 00000000 */ nop +/* A1DD6C 80242C6C 4680A520 */ cvt.s.w $f20, $f20 +/* A1DD70 80242C70 0C0B1EAF */ jal get_variable +/* A1DD74 80242C74 34A5D483 */ ori $a1, $a1, 0xd483 +/* A1DD78 80242C78 44821000 */ mtc1 $v0, $f2 +/* A1DD7C 80242C7C 00000000 */ nop +/* A1DD80 80242C80 468010A0 */ cvt.s.w $f2, $f2 +/* A1DD84 80242C84 4405B000 */ mfc1 $a1, $f22 +/* A1DD88 80242C88 4406A000 */ mfc1 $a2, $f20 +/* A1DD8C 80242C8C 44071000 */ mfc1 $a3, $f2 +/* A1DD90 80242C90 0C01C574 */ jal func_800715D0 +/* A1DD94 80242C94 0000202D */ daddu $a0, $zero, $zero +/* A1DD98 80242C98 0220202D */ daddu $a0, $s1, $zero +/* A1DD9C 80242C9C 3C05F4AC */ lui $a1, 0xf4ac +/* A1DDA0 80242CA0 34A5D481 */ ori $a1, $a1, 0xd481 +/* A1DDA4 80242CA4 3C108025 */ lui $s0, 0x8025 +/* A1DDA8 80242CA8 2610BDF0 */ addiu $s0, $s0, -0x4210 +/* A1DDAC 80242CAC 0C0B1EAF */ jal get_variable +/* A1DDB0 80242CB0 AE020000 */ sw $v0, ($s0) +/* A1DDB4 80242CB4 0220202D */ daddu $a0, $s1, $zero +/* A1DDB8 80242CB8 3C05F4AC */ lui $a1, 0xf4ac +/* A1DDBC 80242CBC 4482B000 */ mtc1 $v0, $f22 +/* A1DDC0 80242CC0 00000000 */ nop +/* A1DDC4 80242CC4 4680B5A0 */ cvt.s.w $f22, $f22 +/* A1DDC8 80242CC8 0C0B1EAF */ jal get_variable +/* A1DDCC 80242CCC 34A5D482 */ ori $a1, $a1, 0xd482 +/* A1DDD0 80242CD0 0220202D */ daddu $a0, $s1, $zero +/* A1DDD4 80242CD4 3C05F4AC */ lui $a1, 0xf4ac +/* A1DDD8 80242CD8 4482A000 */ mtc1 $v0, $f20 +/* A1DDDC 80242CDC 00000000 */ nop +/* A1DDE0 80242CE0 4680A520 */ cvt.s.w $f20, $f20 +/* A1DDE4 80242CE4 0C0B1EAF */ jal get_variable +/* A1DDE8 80242CE8 34A5D483 */ ori $a1, $a1, 0xd483 +/* A1DDEC 80242CEC 44821000 */ mtc1 $v0, $f2 +/* A1DDF0 80242CF0 00000000 */ nop +/* A1DDF4 80242CF4 468010A0 */ cvt.s.w $f2, $f2 +/* A1DDF8 80242CF8 4405B000 */ mfc1 $a1, $f22 +/* A1DDFC 80242CFC 4406A000 */ mfc1 $a2, $f20 +/* A1DE00 80242D00 44071000 */ mfc1 $a3, $f2 +/* A1DE04 80242D04 0C01C604 */ jal func_80071810 +/* A1DE08 80242D08 0000202D */ daddu $a0, $zero, $zero +/* A1DE0C 80242D0C 0220202D */ daddu $a0, $s1, $zero +/* A1DE10 80242D10 3C05F4AC */ lui $a1, 0xf4ac +/* A1DE14 80242D14 3C018025 */ lui $at, 0x8025 +/* A1DE18 80242D18 AC22BDF4 */ sw $v0, -0x420c($at) +/* A1DE1C 80242D1C 0C0B1EAF */ jal get_variable +/* A1DE20 80242D20 34A5D481 */ ori $a1, $a1, 0xd481 +/* A1DE24 80242D24 0220202D */ daddu $a0, $s1, $zero +/* A1DE28 80242D28 3C05F4AC */ lui $a1, 0xf4ac +/* A1DE2C 80242D2C 4482B000 */ mtc1 $v0, $f22 +/* A1DE30 80242D30 00000000 */ nop +/* A1DE34 80242D34 4680B5A0 */ cvt.s.w $f22, $f22 +/* A1DE38 80242D38 0C0B1EAF */ jal get_variable +/* A1DE3C 80242D3C 34A5D482 */ ori $a1, $a1, 0xd482 +/* A1DE40 80242D40 0220202D */ daddu $a0, $s1, $zero +/* A1DE44 80242D44 3C05F4AC */ lui $a1, 0xf4ac +/* A1DE48 80242D48 4482A000 */ mtc1 $v0, $f20 +/* A1DE4C 80242D4C 00000000 */ nop +/* A1DE50 80242D50 4680A520 */ cvt.s.w $f20, $f20 +/* A1DE54 80242D54 0C0B1EAF */ jal get_variable +/* A1DE58 80242D58 34A5D483 */ ori $a1, $a1, 0xd483 +/* A1DE5C 80242D5C 44821000 */ mtc1 $v0, $f2 +/* A1DE60 80242D60 00000000 */ nop +/* A1DE64 80242D64 468010A0 */ cvt.s.w $f2, $f2 +/* A1DE68 80242D68 4405B000 */ mfc1 $a1, $f22 +/* A1DE6C 80242D6C 4406A000 */ mfc1 $a2, $f20 +/* A1DE70 80242D70 3C013F80 */ lui $at, 0x3f80 +/* A1DE74 80242D74 44810000 */ mtc1 $at, $f0 +/* A1DE78 80242D78 44071000 */ mfc1 $a3, $f2 +/* A1DE7C 80242D7C 0000202D */ daddu $a0, $zero, $zero +/* A1DE80 80242D80 AFA00014 */ sw $zero, 0x14($sp) +/* A1DE84 80242D84 0C01CA24 */ jal func_80072890 +/* A1DE88 80242D88 E7A00010 */ swc1 $f0, 0x10($sp) +/* A1DE8C 80242D8C 8E030000 */ lw $v1, ($s0) +/* A1DE90 80242D90 8C64000C */ lw $a0, 0xc($v1) +/* A1DE94 80242D94 3C018025 */ lui $at, 0x8025 +/* A1DE98 80242D98 AC22BDF8 */ sw $v0, -0x4208($at) +/* A1DE9C 80242D9C AC800018 */ sw $zero, 0x18($a0) +/* A1DEA0 80242DA0 AC800020 */ sw $zero, 0x20($a0) +/* A1DEA4 80242DA4 AC800024 */ sw $zero, 0x24($a0) +/* A1DEA8 80242DA8 AC800028 */ sw $zero, 0x28($a0) +/* A1DEAC 80242DAC AC80001C */ sw $zero, 0x1c($a0) +.L80242DB0: +/* A1DEB0 80242DB0 3C028025 */ lui $v0, 0x8025 +/* A1DEB4 80242DB4 8C42BDF0 */ lw $v0, -0x4210($v0) +/* A1DEB8 80242DB8 8C44000C */ lw $a0, 0xc($v0) +/* A1DEBC 80242DBC 8C820020 */ lw $v0, 0x20($a0) +/* A1DEC0 80242DC0 8C830028 */ lw $v1, 0x28($a0) +/* A1DEC4 80242DC4 2442000A */ addiu $v0, $v0, 0xa +/* A1DEC8 80242DC8 AC820020 */ sw $v0, 0x20($a0) +/* A1DECC 80242DCC 8C820024 */ lw $v0, 0x24($a0) +/* A1DED0 80242DD0 2463000A */ addiu $v1, $v1, 0xa +/* A1DED4 80242DD4 AC830028 */ sw $v1, 0x28($a0) +/* A1DED8 80242DD8 8C830018 */ lw $v1, 0x18($a0) +/* A1DEDC 80242DDC 2442000A */ addiu $v0, $v0, 0xa +/* A1DEE0 80242DE0 AC820024 */ sw $v0, 0x24($a0) +/* A1DEE4 80242DE4 8C82001C */ lw $v0, 0x1c($a0) +/* A1DEE8 80242DE8 2463000A */ addiu $v1, $v1, 0xa +/* A1DEEC 80242DEC AC830018 */ sw $v1, 0x18($a0) +/* A1DEF0 80242DF0 286300FF */ slti $v1, $v1, 0xff +/* A1DEF4 80242DF4 2442000A */ addiu $v0, $v0, 0xa +/* A1DEF8 80242DF8 AC82001C */ sw $v0, 0x1c($a0) +/* A1DEFC 80242DFC 14600004 */ bnez $v1, .L80242E10 +/* A1DF00 80242E00 0000102D */ daddu $v0, $zero, $zero +/* A1DF04 80242E04 240200FF */ addiu $v0, $zero, 0xff +/* A1DF08 80242E08 AC820018 */ sw $v0, 0x18($a0) +/* A1DF0C 80242E0C 24020002 */ addiu $v0, $zero, 2 +.L80242E10: +/* A1DF10 80242E10 8FBF0020 */ lw $ra, 0x20($sp) +/* A1DF14 80242E14 8FB1001C */ lw $s1, 0x1c($sp) +/* A1DF18 80242E18 8FB00018 */ lw $s0, 0x18($sp) +/* A1DF1C 80242E1C D7B60030 */ ldc1 $f22, 0x30($sp) +/* A1DF20 80242E20 D7B40028 */ ldc1 $f20, 0x28($sp) +/* A1DF24 80242E24 03E00008 */ jr $ra +/* A1DF28 80242E28 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0.s deleted file mode 100644 index e8528c4bc4..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EE0 -/* A1DFE0 80242EE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1DFE4 80242EE4 AFBF0010 */ sw $ra, 0x10($sp) -/* A1DFE8 80242EE8 8C82000C */ lw $v0, 0xc($a0) -/* A1DFEC 80242EEC 0C0B1EAF */ jal get_variable -/* A1DFF0 80242EF0 8C450000 */ lw $a1, ($v0) -/* A1DFF4 80242EF4 3C038025 */ lui $v1, 0x8025 -/* A1DFF8 80242EF8 8C63BDF0 */ lw $v1, -0x4210($v1) -/* A1DFFC 80242EFC 8C63000C */ lw $v1, 0xc($v1) -/* A1E000 80242F00 AC620034 */ sw $v0, 0x34($v1) -/* A1E004 80242F04 8FBF0010 */ lw $ra, 0x10($sp) -/* A1E008 80242F08 24020002 */ addiu $v0, $zero, 2 -/* A1E00C 80242F0C 03E00008 */ jr $ra -/* A1E010 80242F10 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0_A1DFE0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0_A1DFE0.s new file mode 100644 index 0000000000..67875f05da --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242EE0_A1DFE0.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242EE0_A1DFE0 +/* A1DFE0 80242EE0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1DFE4 80242EE4 AFBF0010 */ sw $ra, 0x10($sp) +/* A1DFE8 80242EE8 8C82000C */ lw $v0, 0xc($a0) +/* A1DFEC 80242EEC 0C0B1EAF */ jal get_variable +/* A1DFF0 80242EF0 8C450000 */ lw $a1, ($v0) +/* A1DFF4 80242EF4 3C038025 */ lui $v1, 0x8025 +/* A1DFF8 80242EF8 8C63BDF0 */ lw $v1, -0x4210($v1) +/* A1DFFC 80242EFC 8C63000C */ lw $v1, 0xc($v1) +/* A1E000 80242F00 AC620034 */ sw $v0, 0x34($v1) +/* A1E004 80242F04 8FBF0010 */ lw $ra, 0x10($sp) +/* A1E008 80242F08 24020002 */ addiu $v0, $zero, 2 +/* A1E00C 80242F0C 03E00008 */ jr $ra +/* A1E010 80242F10 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14.s deleted file mode 100644 index 44916fec09..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F14 -/* A1E014 80242F14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1E018 80242F18 AFBF0010 */ sw $ra, 0x10($sp) -/* A1E01C 80242F1C 8C82000C */ lw $v0, 0xc($a0) -/* A1E020 80242F20 0C0B1EAF */ jal get_variable -/* A1E024 80242F24 8C450000 */ lw $a1, ($v0) -/* A1E028 80242F28 0040202D */ daddu $a0, $v0, $zero -/* A1E02C 80242F2C 3C028025 */ lui $v0, 0x8025 -/* A1E030 80242F30 8C42BDF0 */ lw $v0, -0x4210($v0) -/* A1E034 80242F34 24030001 */ addiu $v1, $zero, 1 -/* A1E038 80242F38 8C45000C */ lw $a1, 0xc($v0) -/* A1E03C 80242F3C 1083000D */ beq $a0, $v1, .L80242F74 -/* A1E040 80242F40 28820002 */ slti $v0, $a0, 2 -/* A1E044 80242F44 10400005 */ beqz $v0, .L80242F5C -/* A1E048 80242F48 24020002 */ addiu $v0, $zero, 2 -/* A1E04C 80242F4C 10800007 */ beqz $a0, .L80242F6C -/* A1E050 80242F50 240200C0 */ addiu $v0, $zero, 0xc0 -/* A1E054 80242F54 08090BE1 */ j .L80242F84 -/* A1E058 80242F58 ACA00038 */ sw $zero, 0x38($a1) -.L80242F5C: -/* A1E05C 80242F5C 10820008 */ beq $a0, $v0, .L80242F80 -/* A1E060 80242F60 24020040 */ addiu $v0, $zero, 0x40 -/* A1E064 80242F64 08090BE1 */ j .L80242F84 -/* A1E068 80242F68 ACA00038 */ sw $zero, 0x38($a1) -.L80242F6C: -/* A1E06C 80242F6C 08090BE1 */ j .L80242F84 -/* A1E070 80242F70 ACA20038 */ sw $v0, 0x38($a1) -.L80242F74: -/* A1E074 80242F74 24020080 */ addiu $v0, $zero, 0x80 -/* A1E078 80242F78 08090BE1 */ j .L80242F84 -/* A1E07C 80242F7C ACA20038 */ sw $v0, 0x38($a1) -.L80242F80: -/* A1E080 80242F80 ACA20038 */ sw $v0, 0x38($a1) -.L80242F84: -/* A1E084 80242F84 8FBF0010 */ lw $ra, 0x10($sp) -/* A1E088 80242F88 24020002 */ addiu $v0, $zero, 2 -/* A1E08C 80242F8C 03E00008 */ jr $ra -/* A1E090 80242F90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14_A1E014.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14_A1E014.s new file mode 100644 index 0000000000..3f52f4afb6 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F14_A1E014.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F14_A1E014 +/* A1E014 80242F14 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1E018 80242F18 AFBF0010 */ sw $ra, 0x10($sp) +/* A1E01C 80242F1C 8C82000C */ lw $v0, 0xc($a0) +/* A1E020 80242F20 0C0B1EAF */ jal get_variable +/* A1E024 80242F24 8C450000 */ lw $a1, ($v0) +/* A1E028 80242F28 0040202D */ daddu $a0, $v0, $zero +/* A1E02C 80242F2C 3C028025 */ lui $v0, 0x8025 +/* A1E030 80242F30 8C42BDF0 */ lw $v0, -0x4210($v0) +/* A1E034 80242F34 24030001 */ addiu $v1, $zero, 1 +/* A1E038 80242F38 8C45000C */ lw $a1, 0xc($v0) +/* A1E03C 80242F3C 1083000D */ beq $a0, $v1, .L80242F74 +/* A1E040 80242F40 28820002 */ slti $v0, $a0, 2 +/* A1E044 80242F44 10400005 */ beqz $v0, .L80242F5C +/* A1E048 80242F48 24020002 */ addiu $v0, $zero, 2 +/* A1E04C 80242F4C 10800007 */ beqz $a0, .L80242F6C +/* A1E050 80242F50 240200C0 */ addiu $v0, $zero, 0xc0 +/* A1E054 80242F54 08090BE1 */ j .L80242F84 +/* A1E058 80242F58 ACA00038 */ sw $zero, 0x38($a1) +.L80242F5C: +/* A1E05C 80242F5C 10820008 */ beq $a0, $v0, .L80242F80 +/* A1E060 80242F60 24020040 */ addiu $v0, $zero, 0x40 +/* A1E064 80242F64 08090BE1 */ j .L80242F84 +/* A1E068 80242F68 ACA00038 */ sw $zero, 0x38($a1) +.L80242F6C: +/* A1E06C 80242F6C 08090BE1 */ j .L80242F84 +/* A1E070 80242F70 ACA20038 */ sw $v0, 0x38($a1) +.L80242F74: +/* A1E074 80242F74 24020080 */ addiu $v0, $zero, 0x80 +/* A1E078 80242F78 08090BE1 */ j .L80242F84 +/* A1E07C 80242F7C ACA20038 */ sw $v0, 0x38($a1) +.L80242F80: +/* A1E080 80242F80 ACA20038 */ sw $v0, 0x38($a1) +.L80242F84: +/* A1E084 80242F84 8FBF0010 */ lw $ra, 0x10($sp) +/* A1E088 80242F88 24020002 */ addiu $v0, $zero, 2 +/* A1E08C 80242F8C 03E00008 */ jr $ra +/* A1E090 80242F90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94.s deleted file mode 100644 index 0091a1e102..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F94 -/* A1E094 80242F94 3C028025 */ lui $v0, 0x8025 -/* A1E098 80242F98 8C42BDF8 */ lw $v0, -0x4208($v0) -/* A1E09C 80242F9C 8C42000C */ lw $v0, 0xc($v0) -/* A1E0A0 80242FA0 AC40001C */ sw $zero, 0x1c($v0) -/* A1E0A4 80242FA4 03E00008 */ jr $ra -/* A1E0A8 80242FA8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94_A1E094.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94_A1E094.s new file mode 100644 index 0000000000..07d2367c9a --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242F94_A1E094.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F94_A1E094 +/* A1E094 80242F94 3C028025 */ lui $v0, 0x8025 +/* A1E098 80242F98 8C42BDF8 */ lw $v0, -0x4208($v0) +/* A1E09C 80242F9C 8C42000C */ lw $v0, 0xc($v0) +/* A1E0A0 80242FA0 AC40001C */ sw $zero, 0x1c($v0) +/* A1E0A4 80242FA4 03E00008 */ jr $ra +/* A1E0A8 80242FA8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC.s deleted file mode 100644 index 40358f604c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FAC -/* A1E0AC 80242FAC 3C028025 */ lui $v0, 0x8025 -/* A1E0B0 80242FB0 8C42BDF8 */ lw $v0, -0x4208($v0) -/* A1E0B4 80242FB4 8C43000C */ lw $v1, 0xc($v0) -/* A1E0B8 80242FB8 24020001 */ addiu $v0, $zero, 1 -/* A1E0BC 80242FBC AC62001C */ sw $v0, 0x1c($v1) -/* A1E0C0 80242FC0 03E00008 */ jr $ra -/* A1E0C4 80242FC4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC_A1E0AC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC_A1E0AC.s new file mode 100644 index 0000000000..c3fa781f17 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FAC_A1E0AC.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242FAC_A1E0AC +/* A1E0AC 80242FAC 3C028025 */ lui $v0, 0x8025 +/* A1E0B0 80242FB0 8C42BDF8 */ lw $v0, -0x4208($v0) +/* A1E0B4 80242FB4 8C43000C */ lw $v1, 0xc($v0) +/* A1E0B8 80242FB8 24020001 */ addiu $v0, $zero, 1 +/* A1E0BC 80242FBC AC62001C */ sw $v0, 0x1c($v1) +/* A1E0C0 80242FC0 03E00008 */ jr $ra +/* A1E0C4 80242FC4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8.s deleted file mode 100644 index f3d152d46f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FC8 -/* A1E0C8 80242FC8 3C028025 */ lui $v0, 0x8025 -/* A1E0CC 80242FCC 8C42BDF8 */ lw $v0, -0x4208($v0) -/* A1E0D0 80242FD0 8C43000C */ lw $v1, 0xc($v0) -/* A1E0D4 80242FD4 24020002 */ addiu $v0, $zero, 2 -/* A1E0D8 80242FD8 03E00008 */ jr $ra -/* A1E0DC 80242FDC AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8_A1E0C8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8_A1E0C8.s new file mode 100644 index 0000000000..5bb7479fa1 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FC8_A1E0C8.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242FC8_A1E0C8 +/* A1E0C8 80242FC8 3C028025 */ lui $v0, 0x8025 +/* A1E0CC 80242FCC 8C42BDF8 */ lw $v0, -0x4208($v0) +/* A1E0D0 80242FD0 8C43000C */ lw $v1, 0xc($v0) +/* A1E0D4 80242FD4 24020002 */ addiu $v0, $zero, 2 +/* A1E0D8 80242FD8 03E00008 */ jr $ra +/* A1E0DC 80242FDC AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324.s deleted file mode 100644 index 64c995e4c4..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243324 -/* A1E424 80243324 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1E428 80243328 AFB10014 */ sw $s1, 0x14($sp) -/* A1E42C 8024332C 0080882D */ daddu $s1, $a0, $zero -/* A1E430 80243330 AFB00010 */ sw $s0, 0x10($sp) -/* A1E434 80243334 00A0802D */ daddu $s0, $a1, $zero -/* A1E438 80243338 AFBF0018 */ sw $ra, 0x18($sp) -/* A1E43C 8024333C 0C00EABB */ jal get_npc_unsafe -/* A1E440 80243340 2404FFFC */ addiu $a0, $zero, -4 -/* A1E444 80243344 12000003 */ beqz $s0, .L80243354 -/* A1E448 80243348 0040182D */ daddu $v1, $v0, $zero -/* A1E44C 8024334C 2402003C */ addiu $v0, $zero, 0x3c -/* A1E450 80243350 AE220070 */ sw $v0, 0x70($s1) -.L80243354: -/* A1E454 80243354 C462000C */ lwc1 $f2, 0xc($v1) -/* A1E458 80243358 3C0141F0 */ lui $at, 0x41f0 -/* A1E45C 8024335C 44810000 */ mtc1 $at, $f0 -/* A1E460 80243360 00000000 */ nop -/* A1E464 80243364 46001000 */ add.s $f0, $f2, $f0 -/* A1E468 80243368 3C0143B4 */ lui $at, 0x43b4 -/* A1E46C 8024336C 44811000 */ mtc1 $at, $f2 -/* A1E470 80243370 00000000 */ nop -/* A1E474 80243374 4600103E */ c.le.s $f2, $f0 -/* A1E478 80243378 00000000 */ nop -/* A1E47C 8024337C 45000003 */ bc1f .L8024338C -/* A1E480 80243380 E460000C */ swc1 $f0, 0xc($v1) -/* A1E484 80243384 46020001 */ sub.s $f0, $f0, $f2 -/* A1E488 80243388 E460000C */ swc1 $f0, 0xc($v1) -.L8024338C: -/* A1E48C 8024338C 8E230070 */ lw $v1, 0x70($s1) -/* A1E490 80243390 2463FFFF */ addiu $v1, $v1, -1 -/* A1E494 80243394 000317C3 */ sra $v0, $v1, 0x1f -/* A1E498 80243398 AE230070 */ sw $v1, 0x70($s1) -/* A1E49C 8024339C 8FBF0018 */ lw $ra, 0x18($sp) -/* A1E4A0 802433A0 8FB10014 */ lw $s1, 0x14($sp) -/* A1E4A4 802433A4 8FB00010 */ lw $s0, 0x10($sp) -/* A1E4A8 802433A8 30420002 */ andi $v0, $v0, 2 -/* A1E4AC 802433AC 03E00008 */ jr $ra -/* A1E4B0 802433B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s new file mode 100644 index 0000000000..142902f789 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243324_A1E424 +/* A1E424 80243324 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A1E428 80243328 AFB10014 */ sw $s1, 0x14($sp) +/* A1E42C 8024332C 0080882D */ daddu $s1, $a0, $zero +/* A1E430 80243330 AFB00010 */ sw $s0, 0x10($sp) +/* A1E434 80243334 00A0802D */ daddu $s0, $a1, $zero +/* A1E438 80243338 AFBF0018 */ sw $ra, 0x18($sp) +/* A1E43C 8024333C 0C00EABB */ jal get_npc_unsafe +/* A1E440 80243340 2404FFFC */ addiu $a0, $zero, -4 +/* A1E444 80243344 12000003 */ beqz $s0, .L80243354 +/* A1E448 80243348 0040182D */ daddu $v1, $v0, $zero +/* A1E44C 8024334C 2402003C */ addiu $v0, $zero, 0x3c +/* A1E450 80243350 AE220070 */ sw $v0, 0x70($s1) +.L80243354: +/* A1E454 80243354 C462000C */ lwc1 $f2, 0xc($v1) +/* A1E458 80243358 3C0141F0 */ lui $at, 0x41f0 +/* A1E45C 8024335C 44810000 */ mtc1 $at, $f0 +/* A1E460 80243360 00000000 */ nop +/* A1E464 80243364 46001000 */ add.s $f0, $f2, $f0 +/* A1E468 80243368 3C0143B4 */ lui $at, 0x43b4 +/* A1E46C 8024336C 44811000 */ mtc1 $at, $f2 +/* A1E470 80243370 00000000 */ nop +/* A1E474 80243374 4600103E */ c.le.s $f2, $f0 +/* A1E478 80243378 00000000 */ nop +/* A1E47C 8024337C 45000003 */ bc1f .L8024338C +/* A1E480 80243380 E460000C */ swc1 $f0, 0xc($v1) +/* A1E484 80243384 46020001 */ sub.s $f0, $f0, $f2 +/* A1E488 80243388 E460000C */ swc1 $f0, 0xc($v1) +.L8024338C: +/* A1E48C 8024338C 8E230070 */ lw $v1, 0x70($s1) +/* A1E490 80243390 2463FFFF */ addiu $v1, $v1, -1 +/* A1E494 80243394 000317C3 */ sra $v0, $v1, 0x1f +/* A1E498 80243398 AE230070 */ sw $v1, 0x70($s1) +/* A1E49C 8024339C 8FBF0018 */ lw $ra, 0x18($sp) +/* A1E4A0 802433A0 8FB10014 */ lw $s1, 0x14($sp) +/* A1E4A4 802433A4 8FB00010 */ lw $s0, 0x10($sp) +/* A1E4A8 802433A8 30420002 */ andi $v0, $v0, 2 +/* A1E4AC 802433AC 03E00008 */ jr $ra +/* A1E4B0 802433B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4.s deleted file mode 100644 index c0b40ad1b9..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433B4 -/* A1E4B4 802433B4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1E4B8 802433B8 AFB10014 */ sw $s1, 0x14($sp) -/* A1E4BC 802433BC 0080882D */ daddu $s1, $a0, $zero -/* A1E4C0 802433C0 AFB00010 */ sw $s0, 0x10($sp) -/* A1E4C4 802433C4 00A0802D */ daddu $s0, $a1, $zero -/* A1E4C8 802433C8 AFBF001C */ sw $ra, 0x1c($sp) -/* A1E4CC 802433CC AFB20018 */ sw $s2, 0x18($sp) -/* A1E4D0 802433D0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A1E4D4 802433D4 0C00EABB */ jal get_npc_unsafe -/* A1E4D8 802433D8 2404FFFC */ addiu $a0, $zero, -4 -/* A1E4DC 802433DC 12000017 */ beqz $s0, .L8024343C -/* A1E4E0 802433E0 0040902D */ daddu $s2, $v0, $zero -/* A1E4E4 802433E4 0220202D */ daddu $a0, $s1, $zero -/* A1E4E8 802433E8 3C05FE36 */ lui $a1, 0xfe36 -/* A1E4EC 802433EC 0C0B210B */ jal get_float_variable -/* A1E4F0 802433F0 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A1E4F4 802433F4 0220202D */ daddu $a0, $s1, $zero -/* A1E4F8 802433F8 3C05FE36 */ lui $a1, 0xfe36 -/* A1E4FC 802433FC 3C014270 */ lui $at, 0x4270 -/* A1E500 80243400 4481A000 */ mtc1 $at, $f20 -/* A1E504 80243404 34A53C85 */ ori $a1, $a1, 0x3c85 -/* A1E508 80243408 46140003 */ div.s $f0, $f0, $f20 -/* A1E50C 8024340C 0C0B210B */ jal get_float_variable -/* A1E510 80243410 E6200074 */ swc1 $f0, 0x74($s1) -/* A1E514 80243414 0220202D */ daddu $a0, $s1, $zero -/* A1E518 80243418 3C05FE36 */ lui $a1, 0xfe36 -/* A1E51C 8024341C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A1E520 80243420 46140003 */ div.s $f0, $f0, $f20 -/* A1E524 80243424 0C0B210B */ jal get_float_variable -/* A1E528 80243428 E6200078 */ swc1 $f0, 0x78($s1) -/* A1E52C 8024342C 46140003 */ div.s $f0, $f0, $f20 -/* A1E530 80243430 2402003C */ addiu $v0, $zero, 0x3c -/* A1E534 80243434 E620007C */ swc1 $f0, 0x7c($s1) -/* A1E538 80243438 AE220070 */ sw $v0, 0x70($s1) -.L8024343C: -/* A1E53C 8024343C C6400038 */ lwc1 $f0, 0x38($s2) -/* A1E540 80243440 C6220074 */ lwc1 $f2, 0x74($s1) -/* A1E544 80243444 46020000 */ add.s $f0, $f0, $f2 -/* A1E548 80243448 E6400038 */ swc1 $f0, 0x38($s2) -/* A1E54C 8024344C C640003C */ lwc1 $f0, 0x3c($s2) -/* A1E550 80243450 C6220078 */ lwc1 $f2, 0x78($s1) -/* A1E554 80243454 46020000 */ add.s $f0, $f0, $f2 -/* A1E558 80243458 E640003C */ swc1 $f0, 0x3c($s2) -/* A1E55C 8024345C C6400040 */ lwc1 $f0, 0x40($s2) -/* A1E560 80243460 C622007C */ lwc1 $f2, 0x7c($s1) -/* A1E564 80243464 46020000 */ add.s $f0, $f0, $f2 -/* A1E568 80243468 E6400040 */ swc1 $f0, 0x40($s2) -/* A1E56C 8024346C 8E230070 */ lw $v1, 0x70($s1) -/* A1E570 80243470 2463FFFF */ addiu $v1, $v1, -1 -/* A1E574 80243474 2C620001 */ sltiu $v0, $v1, 1 -/* A1E578 80243478 AE230070 */ sw $v1, 0x70($s1) -/* A1E57C 8024347C 8FBF001C */ lw $ra, 0x1c($sp) -/* A1E580 80243480 8FB20018 */ lw $s2, 0x18($sp) -/* A1E584 80243484 8FB10014 */ lw $s1, 0x14($sp) -/* A1E588 80243488 8FB00010 */ lw $s0, 0x10($sp) -/* A1E58C 8024348C D7B40020 */ ldc1 $f20, 0x20($sp) -/* A1E590 80243490 00021040 */ sll $v0, $v0, 1 -/* A1E594 80243494 03E00008 */ jr $ra -/* A1E598 80243498 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s new file mode 100644 index 0000000000..bad058ad7d --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802433B4_A1E4B4 +/* A1E4B4 802433B4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A1E4B8 802433B8 AFB10014 */ sw $s1, 0x14($sp) +/* A1E4BC 802433BC 0080882D */ daddu $s1, $a0, $zero +/* A1E4C0 802433C0 AFB00010 */ sw $s0, 0x10($sp) +/* A1E4C4 802433C4 00A0802D */ daddu $s0, $a1, $zero +/* A1E4C8 802433C8 AFBF001C */ sw $ra, 0x1c($sp) +/* A1E4CC 802433CC AFB20018 */ sw $s2, 0x18($sp) +/* A1E4D0 802433D0 F7B40020 */ sdc1 $f20, 0x20($sp) +/* A1E4D4 802433D4 0C00EABB */ jal get_npc_unsafe +/* A1E4D8 802433D8 2404FFFC */ addiu $a0, $zero, -4 +/* A1E4DC 802433DC 12000017 */ beqz $s0, .L8024343C +/* A1E4E0 802433E0 0040902D */ daddu $s2, $v0, $zero +/* A1E4E4 802433E4 0220202D */ daddu $a0, $s1, $zero +/* A1E4E8 802433E8 3C05FE36 */ lui $a1, 0xfe36 +/* A1E4EC 802433EC 0C0B210B */ jal get_float_variable +/* A1E4F0 802433F0 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A1E4F4 802433F4 0220202D */ daddu $a0, $s1, $zero +/* A1E4F8 802433F8 3C05FE36 */ lui $a1, 0xfe36 +/* A1E4FC 802433FC 3C014270 */ lui $at, 0x4270 +/* A1E500 80243400 4481A000 */ mtc1 $at, $f20 +/* A1E504 80243404 34A53C85 */ ori $a1, $a1, 0x3c85 +/* A1E508 80243408 46140003 */ div.s $f0, $f0, $f20 +/* A1E50C 8024340C 0C0B210B */ jal get_float_variable +/* A1E510 80243410 E6200074 */ swc1 $f0, 0x74($s1) +/* A1E514 80243414 0220202D */ daddu $a0, $s1, $zero +/* A1E518 80243418 3C05FE36 */ lui $a1, 0xfe36 +/* A1E51C 8024341C 34A53C81 */ ori $a1, $a1, 0x3c81 +/* A1E520 80243420 46140003 */ div.s $f0, $f0, $f20 +/* A1E524 80243424 0C0B210B */ jal get_float_variable +/* A1E528 80243428 E6200078 */ swc1 $f0, 0x78($s1) +/* A1E52C 8024342C 46140003 */ div.s $f0, $f0, $f20 +/* A1E530 80243430 2402003C */ addiu $v0, $zero, 0x3c +/* A1E534 80243434 E620007C */ swc1 $f0, 0x7c($s1) +/* A1E538 80243438 AE220070 */ sw $v0, 0x70($s1) +.L8024343C: +/* A1E53C 8024343C C6400038 */ lwc1 $f0, 0x38($s2) +/* A1E540 80243440 C6220074 */ lwc1 $f2, 0x74($s1) +/* A1E544 80243444 46020000 */ add.s $f0, $f0, $f2 +/* A1E548 80243448 E6400038 */ swc1 $f0, 0x38($s2) +/* A1E54C 8024344C C640003C */ lwc1 $f0, 0x3c($s2) +/* A1E550 80243450 C6220078 */ lwc1 $f2, 0x78($s1) +/* A1E554 80243454 46020000 */ add.s $f0, $f0, $f2 +/* A1E558 80243458 E640003C */ swc1 $f0, 0x3c($s2) +/* A1E55C 8024345C C6400040 */ lwc1 $f0, 0x40($s2) +/* A1E560 80243460 C622007C */ lwc1 $f2, 0x7c($s1) +/* A1E564 80243464 46020000 */ add.s $f0, $f0, $f2 +/* A1E568 80243468 E6400040 */ swc1 $f0, 0x40($s2) +/* A1E56C 8024346C 8E230070 */ lw $v1, 0x70($s1) +/* A1E570 80243470 2463FFFF */ addiu $v1, $v1, -1 +/* A1E574 80243474 2C620001 */ sltiu $v0, $v1, 1 +/* A1E578 80243478 AE230070 */ sw $v1, 0x70($s1) +/* A1E57C 8024347C 8FBF001C */ lw $ra, 0x1c($sp) +/* A1E580 80243480 8FB20018 */ lw $s2, 0x18($sp) +/* A1E584 80243484 8FB10014 */ lw $s1, 0x14($sp) +/* A1E588 80243488 8FB00010 */ lw $s0, 0x10($sp) +/* A1E58C 8024348C D7B40020 */ ldc1 $f20, 0x20($sp) +/* A1E590 80243490 00021040 */ sll $v0, $v0, 1 +/* A1E594 80243494 03E00008 */ jr $ra +/* A1E598 80243498 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C.s deleted file mode 100644 index 3a4af70e1e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024349C -/* A1E59C 8024349C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1E5A0 802434A0 3C058025 */ lui $a1, 0x8025 -/* A1E5A4 802434A4 8CA5BDE8 */ lw $a1, -0x4218($a1) -/* A1E5A8 802434A8 AFBF0010 */ sw $ra, 0x10($sp) -/* A1E5AC 802434AC 0C0B1EAF */ jal get_variable -/* A1E5B0 802434B0 0000202D */ daddu $a0, $zero, $zero -/* A1E5B4 802434B4 0040182D */ daddu $v1, $v0, $zero -/* A1E5B8 802434B8 24020001 */ addiu $v0, $zero, 1 -/* A1E5BC 802434BC 14620006 */ bne $v1, $v0, .L802434D8 -/* A1E5C0 802434C0 24020002 */ addiu $v0, $zero, 2 -/* A1E5C4 802434C4 44800000 */ mtc1 $zero, $f0 -/* A1E5C8 802434C8 00000000 */ nop -/* A1E5CC 802434CC 44050000 */ mfc1 $a1, $f0 -/* A1E5D0 802434D0 08090D3C */ j .L802434F0 -/* A1E5D4 802434D4 0000202D */ daddu $a0, $zero, $zero -.L802434D8: -/* A1E5D8 802434D8 14620008 */ bne $v1, $v0, .L802434FC -/* A1E5DC 802434DC 24040001 */ addiu $a0, $zero, 1 -/* A1E5E0 802434E0 44800000 */ mtc1 $zero, $f0 -/* A1E5E4 802434E4 00000000 */ nop -/* A1E5E8 802434E8 44050000 */ mfc1 $a1, $f0 -/* A1E5EC 802434EC 00000000 */ nop -.L802434F0: -/* A1E5F0 802434F0 00A0302D */ daddu $a2, $a1, $zero -/* A1E5F4 802434F4 0C01C5A4 */ jal func_80071690 -/* A1E5F8 802434F8 00A0382D */ daddu $a3, $a1, $zero -.L802434FC: -/* A1E5FC 802434FC 8FBF0010 */ lw $ra, 0x10($sp) -/* A1E600 80243500 03E00008 */ jr $ra -/* A1E604 80243504 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s new file mode 100644 index 0000000000..846503e7fd --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024349C_A1E59C.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024349C_A1E59C +/* A1E59C 8024349C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1E5A0 802434A0 3C058025 */ lui $a1, 0x8025 +/* A1E5A4 802434A4 8CA5BDE8 */ lw $a1, -0x4218($a1) +/* A1E5A8 802434A8 AFBF0010 */ sw $ra, 0x10($sp) +/* A1E5AC 802434AC 0C0B1EAF */ jal get_variable +/* A1E5B0 802434B0 0000202D */ daddu $a0, $zero, $zero +/* A1E5B4 802434B4 0040182D */ daddu $v1, $v0, $zero +/* A1E5B8 802434B8 24020001 */ addiu $v0, $zero, 1 +/* A1E5BC 802434BC 14620006 */ bne $v1, $v0, .L802434D8 +/* A1E5C0 802434C0 24020002 */ addiu $v0, $zero, 2 +/* A1E5C4 802434C4 44800000 */ mtc1 $zero, $f0 +/* A1E5C8 802434C8 00000000 */ nop +/* A1E5CC 802434CC 44050000 */ mfc1 $a1, $f0 +/* A1E5D0 802434D0 08090D3C */ j .L802434F0 +/* A1E5D4 802434D4 0000202D */ daddu $a0, $zero, $zero +.L802434D8: +/* A1E5D8 802434D8 14620008 */ bne $v1, $v0, .L802434FC +/* A1E5DC 802434DC 24040001 */ addiu $a0, $zero, 1 +/* A1E5E0 802434E0 44800000 */ mtc1 $zero, $f0 +/* A1E5E4 802434E4 00000000 */ nop +/* A1E5E8 802434E8 44050000 */ mfc1 $a1, $f0 +/* A1E5EC 802434EC 00000000 */ nop +.L802434F0: +/* A1E5F0 802434F0 00A0302D */ daddu $a2, $a1, $zero +/* A1E5F4 802434F4 0C01C5A4 */ jal func_80071690 +/* A1E5F8 802434F8 00A0382D */ daddu $a3, $a1, $zero +.L802434FC: +/* A1E5FC 802434FC 8FBF0010 */ lw $ra, 0x10($sp) +/* A1E600 80243500 03E00008 */ jr $ra +/* A1E604 80243504 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508.s deleted file mode 100644 index d2f3570e25..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243508 -/* A1E608 80243508 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1E60C 8024350C 3C058024 */ lui $a1, 0x8024 -/* A1E610 80243510 24A5349C */ addiu $a1, $a1, 0x349c -/* A1E614 80243514 AFBF0010 */ sw $ra, 0x10($sp) -/* A1E618 80243518 0C048C8F */ jal bind_dynamic_entity_7 -/* A1E61C 8024351C 0000202D */ daddu $a0, $zero, $zero -/* A1E620 80243520 8FBF0010 */ lw $ra, 0x10($sp) -/* A1E624 80243524 3C018025 */ lui $at, 0x8025 -/* A1E628 80243528 AC22BDD0 */ sw $v0, -0x4230($at) -/* A1E62C 8024352C 24020002 */ addiu $v0, $zero, 2 -/* A1E630 80243530 03E00008 */ jr $ra -/* A1E634 80243534 27BD0018 */ addiu $sp, $sp, 0x18 -/* A1E638 80243538 00000000 */ nop -/* A1E63C 8024353C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s new file mode 100644 index 0000000000..23837c38e5 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243508_A1E608.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243508_A1E608 +/* A1E608 80243508 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A1E60C 8024350C 3C058024 */ lui $a1, 0x8024 +/* A1E610 80243510 24A5349C */ addiu $a1, $a1, 0x349c +/* A1E614 80243514 AFBF0010 */ sw $ra, 0x10($sp) +/* A1E618 80243518 0C048C8F */ jal bind_dynamic_entity_7 +/* A1E61C 8024351C 0000202D */ daddu $a0, $zero, $zero +/* A1E620 80243520 8FBF0010 */ lw $ra, 0x10($sp) +/* A1E624 80243524 3C018025 */ lui $at, 0x8025 +/* A1E628 80243528 AC22BDD0 */ sw $v0, -0x4230($at) +/* A1E62C 8024352C 24020002 */ addiu $v0, $zero, 2 +/* A1E630 80243530 03E00008 */ jr $ra +/* A1E634 80243534 27BD0018 */ addiu $sp, $sp, 0x18 +/* A1E638 80243538 00000000 */ nop +/* A1E63C 8024353C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8.s deleted file mode 100644 index 4c2ca49774..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402A8 -/* A27178 802402A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2717C 802402AC AFB00010 */ sw $s0, 0x10($sp) -/* A27180 802402B0 0080802D */ daddu $s0, $a0, $zero -/* A27184 802402B4 AFBF0014 */ sw $ra, 0x14($sp) -/* A27188 802402B8 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2718C 802402BC 8E020088 */ lw $v0, 0x88($s0) -/* A27190 802402C0 00621821 */ addu $v1, $v1, $v0 -/* A27194 802402C4 04610004 */ bgez $v1, .L802402D8 -/* A27198 802402C8 AE0300A8 */ sw $v1, 0xa8($s0) -/* A2719C 802402CC 3C020002 */ lui $v0, 2 -/* A271A0 802402D0 080900BA */ j .L802402E8 -/* A271A4 802402D4 00621021 */ addu $v0, $v1, $v0 -.L802402D8: -/* A271A8 802402D8 3C040002 */ lui $a0, 2 -/* A271AC 802402DC 0083102A */ slt $v0, $a0, $v1 -/* A271B0 802402E0 10400002 */ beqz $v0, .L802402EC -/* A271B4 802402E4 00641023 */ subu $v0, $v1, $a0 -.L802402E8: -/* A271B8 802402E8 AE0200A8 */ sw $v0, 0xa8($s0) -.L802402EC: -/* A271BC 802402EC 8E0300AC */ lw $v1, 0xac($s0) -/* A271C0 802402F0 8E02008C */ lw $v0, 0x8c($s0) -/* A271C4 802402F4 00621821 */ addu $v1, $v1, $v0 -/* A271C8 802402F8 04610004 */ bgez $v1, .L8024030C -/* A271CC 802402FC AE0300AC */ sw $v1, 0xac($s0) -/* A271D0 80240300 3C020002 */ lui $v0, 2 -/* A271D4 80240304 080900C7 */ j .L8024031C -/* A271D8 80240308 00621021 */ addu $v0, $v1, $v0 -.L8024030C: -/* A271DC 8024030C 3C040002 */ lui $a0, 2 -/* A271E0 80240310 0083102A */ slt $v0, $a0, $v1 -/* A271E4 80240314 10400002 */ beqz $v0, .L80240320 -/* A271E8 80240318 00641023 */ subu $v0, $v1, $a0 -.L8024031C: -/* A271EC 8024031C AE0200AC */ sw $v0, 0xac($s0) -.L80240320: -/* A271F0 80240320 8E0300B0 */ lw $v1, 0xb0($s0) -/* A271F4 80240324 8E020090 */ lw $v0, 0x90($s0) -/* A271F8 80240328 00621821 */ addu $v1, $v1, $v0 -/* A271FC 8024032C 04610004 */ bgez $v1, .L80240340 -/* A27200 80240330 AE0300B0 */ sw $v1, 0xb0($s0) -/* A27204 80240334 3C020002 */ lui $v0, 2 -/* A27208 80240338 080900D4 */ j .L80240350 -/* A2720C 8024033C 00621021 */ addu $v0, $v1, $v0 -.L80240340: -/* A27210 80240340 3C040002 */ lui $a0, 2 -/* A27214 80240344 0083102A */ slt $v0, $a0, $v1 -/* A27218 80240348 10400002 */ beqz $v0, .L80240354 -/* A2721C 8024034C 00641023 */ subu $v0, $v1, $a0 -.L80240350: -/* A27220 80240350 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240354: -/* A27224 80240354 8E0300B4 */ lw $v1, 0xb4($s0) -/* A27228 80240358 8E020094 */ lw $v0, 0x94($s0) -/* A2722C 8024035C 00621821 */ addu $v1, $v1, $v0 -/* A27230 80240360 04610004 */ bgez $v1, .L80240374 -/* A27234 80240364 AE0300B4 */ sw $v1, 0xb4($s0) -/* A27238 80240368 3C020002 */ lui $v0, 2 -/* A2723C 8024036C 080900E1 */ j .L80240384 -/* A27240 80240370 00621021 */ addu $v0, $v1, $v0 -.L80240374: -/* A27244 80240374 3C040002 */ lui $a0, 2 -/* A27248 80240378 0083102A */ slt $v0, $a0, $v1 -/* A2724C 8024037C 10400002 */ beqz $v0, .L80240388 -/* A27250 80240380 00641023 */ subu $v0, $v1, $a0 -.L80240384: -/* A27254 80240384 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240388: -/* A27258 80240388 8E040084 */ lw $a0, 0x84($s0) -/* A2725C 8024038C 0C046F07 */ jal set_main_pan_u -/* A27260 80240390 8E0500A8 */ lw $a1, 0xa8($s0) -/* A27264 80240394 8E040084 */ lw $a0, 0x84($s0) -/* A27268 80240398 0C046F0D */ jal set_main_pan_v -/* A2726C 8024039C 8E0500AC */ lw $a1, 0xac($s0) -/* A27270 802403A0 8E040084 */ lw $a0, 0x84($s0) -/* A27274 802403A4 0C046F13 */ jal set_aux_pan_u -/* A27278 802403A8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2727C 802403AC 8E040084 */ lw $a0, 0x84($s0) -/* A27280 802403B0 0C046F19 */ jal set_aux_pan_v -/* A27284 802403B4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A27288 802403B8 8FBF0014 */ lw $ra, 0x14($sp) -/* A2728C 802403BC 8FB00010 */ lw $s0, 0x10($sp) -/* A27290 802403C0 0000102D */ daddu $v0, $zero, $zero -/* A27294 802403C4 03E00008 */ jr $ra -/* A27298 802403C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8_A27178.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8_A27178.s new file mode 100644 index 0000000000..74356ade0f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802402A8_A27178.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402A8_A27178 +/* A27178 802402A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2717C 802402AC AFB00010 */ sw $s0, 0x10($sp) +/* A27180 802402B0 0080802D */ daddu $s0, $a0, $zero +/* A27184 802402B4 AFBF0014 */ sw $ra, 0x14($sp) +/* A27188 802402B8 8E0300A8 */ lw $v1, 0xa8($s0) +/* A2718C 802402BC 8E020088 */ lw $v0, 0x88($s0) +/* A27190 802402C0 00621821 */ addu $v1, $v1, $v0 +/* A27194 802402C4 04610004 */ bgez $v1, .L802402D8 +/* A27198 802402C8 AE0300A8 */ sw $v1, 0xa8($s0) +/* A2719C 802402CC 3C020002 */ lui $v0, 2 +/* A271A0 802402D0 080900BA */ j .L802402E8 +/* A271A4 802402D4 00621021 */ addu $v0, $v1, $v0 +.L802402D8: +/* A271A8 802402D8 3C040002 */ lui $a0, 2 +/* A271AC 802402DC 0083102A */ slt $v0, $a0, $v1 +/* A271B0 802402E0 10400002 */ beqz $v0, .L802402EC +/* A271B4 802402E4 00641023 */ subu $v0, $v1, $a0 +.L802402E8: +/* A271B8 802402E8 AE0200A8 */ sw $v0, 0xa8($s0) +.L802402EC: +/* A271BC 802402EC 8E0300AC */ lw $v1, 0xac($s0) +/* A271C0 802402F0 8E02008C */ lw $v0, 0x8c($s0) +/* A271C4 802402F4 00621821 */ addu $v1, $v1, $v0 +/* A271C8 802402F8 04610004 */ bgez $v1, .L8024030C +/* A271CC 802402FC AE0300AC */ sw $v1, 0xac($s0) +/* A271D0 80240300 3C020002 */ lui $v0, 2 +/* A271D4 80240304 080900C7 */ j .L8024031C +/* A271D8 80240308 00621021 */ addu $v0, $v1, $v0 +.L8024030C: +/* A271DC 8024030C 3C040002 */ lui $a0, 2 +/* A271E0 80240310 0083102A */ slt $v0, $a0, $v1 +/* A271E4 80240314 10400002 */ beqz $v0, .L80240320 +/* A271E8 80240318 00641023 */ subu $v0, $v1, $a0 +.L8024031C: +/* A271EC 8024031C AE0200AC */ sw $v0, 0xac($s0) +.L80240320: +/* A271F0 80240320 8E0300B0 */ lw $v1, 0xb0($s0) +/* A271F4 80240324 8E020090 */ lw $v0, 0x90($s0) +/* A271F8 80240328 00621821 */ addu $v1, $v1, $v0 +/* A271FC 8024032C 04610004 */ bgez $v1, .L80240340 +/* A27200 80240330 AE0300B0 */ sw $v1, 0xb0($s0) +/* A27204 80240334 3C020002 */ lui $v0, 2 +/* A27208 80240338 080900D4 */ j .L80240350 +/* A2720C 8024033C 00621021 */ addu $v0, $v1, $v0 +.L80240340: +/* A27210 80240340 3C040002 */ lui $a0, 2 +/* A27214 80240344 0083102A */ slt $v0, $a0, $v1 +/* A27218 80240348 10400002 */ beqz $v0, .L80240354 +/* A2721C 8024034C 00641023 */ subu $v0, $v1, $a0 +.L80240350: +/* A27220 80240350 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240354: +/* A27224 80240354 8E0300B4 */ lw $v1, 0xb4($s0) +/* A27228 80240358 8E020094 */ lw $v0, 0x94($s0) +/* A2722C 8024035C 00621821 */ addu $v1, $v1, $v0 +/* A27230 80240360 04610004 */ bgez $v1, .L80240374 +/* A27234 80240364 AE0300B4 */ sw $v1, 0xb4($s0) +/* A27238 80240368 3C020002 */ lui $v0, 2 +/* A2723C 8024036C 080900E1 */ j .L80240384 +/* A27240 80240370 00621021 */ addu $v0, $v1, $v0 +.L80240374: +/* A27244 80240374 3C040002 */ lui $a0, 2 +/* A27248 80240378 0083102A */ slt $v0, $a0, $v1 +/* A2724C 8024037C 10400002 */ beqz $v0, .L80240388 +/* A27250 80240380 00641023 */ subu $v0, $v1, $a0 +.L80240384: +/* A27254 80240384 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240388: +/* A27258 80240388 8E040084 */ lw $a0, 0x84($s0) +/* A2725C 8024038C 0C046F07 */ jal set_main_pan_u +/* A27260 80240390 8E0500A8 */ lw $a1, 0xa8($s0) +/* A27264 80240394 8E040084 */ lw $a0, 0x84($s0) +/* A27268 80240398 0C046F0D */ jal set_main_pan_v +/* A2726C 8024039C 8E0500AC */ lw $a1, 0xac($s0) +/* A27270 802403A0 8E040084 */ lw $a0, 0x84($s0) +/* A27274 802403A4 0C046F13 */ jal set_aux_pan_u +/* A27278 802403A8 8E0500B0 */ lw $a1, 0xb0($s0) +/* A2727C 802403AC 8E040084 */ lw $a0, 0x84($s0) +/* A27280 802403B0 0C046F19 */ jal set_aux_pan_v +/* A27284 802403B4 8E0500B4 */ lw $a1, 0xb4($s0) +/* A27288 802403B8 8FBF0014 */ lw $ra, 0x14($sp) +/* A2728C 802403BC 8FB00010 */ lw $s0, 0x10($sp) +/* A27290 802403C0 0000102D */ daddu $v0, $zero, $zero +/* A27294 802403C4 03E00008 */ jr $ra +/* A27298 802403C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC.s deleted file mode 100644 index e435e37d23..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403CC -/* A2729C 802403CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A272A0 802403D0 AFB00010 */ sw $s0, 0x10($sp) -/* A272A4 802403D4 0080802D */ daddu $s0, $a0, $zero -/* A272A8 802403D8 10A00005 */ beqz $a1, .L802403F0 -/* A272AC 802403DC AFBF0014 */ sw $ra, 0x14($sp) -/* A272B0 802403E0 AE000070 */ sw $zero, 0x70($s0) -/* A272B4 802403E4 AE000074 */ sw $zero, 0x74($s0) -/* A272B8 802403E8 AE000078 */ sw $zero, 0x78($s0) -/* A272BC 802403EC AE00007C */ sw $zero, 0x7c($s0) -.L802403F0: -/* A272C0 802403F0 8E020070 */ lw $v0, 0x70($s0) -/* A272C4 802403F4 1440000E */ bnez $v0, .L80240430 -/* A272C8 802403F8 00000000 */ nop -/* A272CC 802403FC 8E0300A8 */ lw $v1, 0xa8($s0) -/* A272D0 80240400 8E020088 */ lw $v0, 0x88($s0) -/* A272D4 80240404 00621821 */ addu $v1, $v1, $v0 -/* A272D8 80240408 04610004 */ bgez $v1, .L8024041C -/* A272DC 8024040C AE0300A8 */ sw $v1, 0xa8($s0) -/* A272E0 80240410 3C020002 */ lui $v0, 2 -/* A272E4 80240414 0809010B */ j .L8024042C -/* A272E8 80240418 00621021 */ addu $v0, $v1, $v0 -.L8024041C: -/* A272EC 8024041C 3C040002 */ lui $a0, 2 -/* A272F0 80240420 0083102A */ slt $v0, $a0, $v1 -/* A272F4 80240424 10400002 */ beqz $v0, .L80240430 -/* A272F8 80240428 00641023 */ subu $v0, $v1, $a0 -.L8024042C: -/* A272FC 8024042C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240430: -/* A27300 80240430 8E020074 */ lw $v0, 0x74($s0) -/* A27304 80240434 1440000E */ bnez $v0, .L80240470 -/* A27308 80240438 00000000 */ nop -/* A2730C 8024043C 8E0300AC */ lw $v1, 0xac($s0) -/* A27310 80240440 8E02008C */ lw $v0, 0x8c($s0) -/* A27314 80240444 00621821 */ addu $v1, $v1, $v0 -/* A27318 80240448 04610004 */ bgez $v1, .L8024045C -/* A2731C 8024044C AE0300AC */ sw $v1, 0xac($s0) -/* A27320 80240450 3C020002 */ lui $v0, 2 -/* A27324 80240454 0809011B */ j .L8024046C -/* A27328 80240458 00621021 */ addu $v0, $v1, $v0 -.L8024045C: -/* A2732C 8024045C 3C040002 */ lui $a0, 2 -/* A27330 80240460 0083102A */ slt $v0, $a0, $v1 -/* A27334 80240464 10400002 */ beqz $v0, .L80240470 -/* A27338 80240468 00641023 */ subu $v0, $v1, $a0 -.L8024046C: -/* A2733C 8024046C AE0200AC */ sw $v0, 0xac($s0) -.L80240470: -/* A27340 80240470 8E020078 */ lw $v0, 0x78($s0) -/* A27344 80240474 1440000E */ bnez $v0, .L802404B0 -/* A27348 80240478 00000000 */ nop -/* A2734C 8024047C 8E0300B0 */ lw $v1, 0xb0($s0) -/* A27350 80240480 8E020090 */ lw $v0, 0x90($s0) -/* A27354 80240484 00621821 */ addu $v1, $v1, $v0 -/* A27358 80240488 04610004 */ bgez $v1, .L8024049C -/* A2735C 8024048C AE0300B0 */ sw $v1, 0xb0($s0) -/* A27360 80240490 3C020002 */ lui $v0, 2 -/* A27364 80240494 0809012B */ j .L802404AC -/* A27368 80240498 00621021 */ addu $v0, $v1, $v0 -.L8024049C: -/* A2736C 8024049C 3C040002 */ lui $a0, 2 -/* A27370 802404A0 0083102A */ slt $v0, $a0, $v1 -/* A27374 802404A4 10400002 */ beqz $v0, .L802404B0 -/* A27378 802404A8 00641023 */ subu $v0, $v1, $a0 -.L802404AC: -/* A2737C 802404AC AE0200B0 */ sw $v0, 0xb0($s0) -.L802404B0: -/* A27380 802404B0 8E02007C */ lw $v0, 0x7c($s0) -/* A27384 802404B4 1440000E */ bnez $v0, .L802404F0 -/* A27388 802404B8 00000000 */ nop -/* A2738C 802404BC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A27390 802404C0 8E020094 */ lw $v0, 0x94($s0) -/* A27394 802404C4 00621821 */ addu $v1, $v1, $v0 -/* A27398 802404C8 04610004 */ bgez $v1, .L802404DC -/* A2739C 802404CC AE0300B4 */ sw $v1, 0xb4($s0) -/* A273A0 802404D0 3C020002 */ lui $v0, 2 -/* A273A4 802404D4 0809013B */ j .L802404EC -/* A273A8 802404D8 00621021 */ addu $v0, $v1, $v0 -.L802404DC: -/* A273AC 802404DC 3C040002 */ lui $a0, 2 -/* A273B0 802404E0 0083102A */ slt $v0, $a0, $v1 -/* A273B4 802404E4 10400002 */ beqz $v0, .L802404F0 -/* A273B8 802404E8 00641023 */ subu $v0, $v1, $a0 -.L802404EC: -/* A273BC 802404EC AE0200B4 */ sw $v0, 0xb4($s0) -.L802404F0: -/* A273C0 802404F0 8E040084 */ lw $a0, 0x84($s0) -/* A273C4 802404F4 0C046F07 */ jal set_main_pan_u -/* A273C8 802404F8 8E0500A8 */ lw $a1, 0xa8($s0) -/* A273CC 802404FC 8E040084 */ lw $a0, 0x84($s0) -/* A273D0 80240500 0C046F0D */ jal set_main_pan_v -/* A273D4 80240504 8E0500AC */ lw $a1, 0xac($s0) -/* A273D8 80240508 8E040084 */ lw $a0, 0x84($s0) -/* A273DC 8024050C 0C046F13 */ jal set_aux_pan_u -/* A273E0 80240510 8E0500B0 */ lw $a1, 0xb0($s0) -/* A273E4 80240514 8E040084 */ lw $a0, 0x84($s0) -/* A273E8 80240518 0C046F19 */ jal set_aux_pan_v -/* A273EC 8024051C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A273F0 80240520 8E020070 */ lw $v0, 0x70($s0) -/* A273F4 80240524 8E030078 */ lw $v1, 0x78($s0) -/* A273F8 80240528 8E040098 */ lw $a0, 0x98($s0) -/* A273FC 8024052C 24420001 */ addiu $v0, $v0, 1 -/* A27400 80240530 AE020070 */ sw $v0, 0x70($s0) -/* A27404 80240534 8E020074 */ lw $v0, 0x74($s0) -/* A27408 80240538 24630001 */ addiu $v1, $v1, 1 -/* A2740C 8024053C AE030078 */ sw $v1, 0x78($s0) -/* A27410 80240540 8E030070 */ lw $v1, 0x70($s0) -/* A27414 80240544 24420001 */ addiu $v0, $v0, 1 -/* A27418 80240548 AE020074 */ sw $v0, 0x74($s0) -/* A2741C 8024054C 8E02007C */ lw $v0, 0x7c($s0) -/* A27420 80240550 0064182A */ slt $v1, $v1, $a0 -/* A27424 80240554 24420001 */ addiu $v0, $v0, 1 -/* A27428 80240558 14600002 */ bnez $v1, .L80240564 -/* A2742C 8024055C AE02007C */ sw $v0, 0x7c($s0) -/* A27430 80240560 AE000070 */ sw $zero, 0x70($s0) -.L80240564: -/* A27434 80240564 8E020074 */ lw $v0, 0x74($s0) -/* A27438 80240568 8E03009C */ lw $v1, 0x9c($s0) -/* A2743C 8024056C 0043102A */ slt $v0, $v0, $v1 -/* A27440 80240570 50400001 */ beql $v0, $zero, .L80240578 -/* A27444 80240574 AE000074 */ sw $zero, 0x74($s0) -.L80240578: -/* A27448 80240578 8E020078 */ lw $v0, 0x78($s0) -/* A2744C 8024057C 8E0300A0 */ lw $v1, 0xa0($s0) -/* A27450 80240580 0043102A */ slt $v0, $v0, $v1 -/* A27454 80240584 50400001 */ beql $v0, $zero, .L8024058C -/* A27458 80240588 AE000078 */ sw $zero, 0x78($s0) -.L8024058C: -/* A2745C 8024058C 8E02007C */ lw $v0, 0x7c($s0) -/* A27460 80240590 8E0300A4 */ lw $v1, 0xa4($s0) -/* A27464 80240594 0043102A */ slt $v0, $v0, $v1 -/* A27468 80240598 50400001 */ beql $v0, $zero, .L802405A0 -/* A2746C 8024059C AE00007C */ sw $zero, 0x7c($s0) -.L802405A0: -/* A27470 802405A0 8FBF0014 */ lw $ra, 0x14($sp) -/* A27474 802405A4 8FB00010 */ lw $s0, 0x10($sp) -/* A27478 802405A8 0000102D */ daddu $v0, $zero, $zero -/* A2747C 802405AC 03E00008 */ jr $ra -/* A27480 802405B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* A27484 802405B4 00000000 */ nop -/* A27488 802405B8 00000000 */ nop -/* A2748C 802405BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC_A2729C.s b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC_A2729C.s new file mode 100644 index 0000000000..e841d250ac --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A26ED0/func_802403CC_A2729C.s @@ -0,0 +1,146 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403CC_A2729C +/* A2729C 802403CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A272A0 802403D0 AFB00010 */ sw $s0, 0x10($sp) +/* A272A4 802403D4 0080802D */ daddu $s0, $a0, $zero +/* A272A8 802403D8 10A00005 */ beqz $a1, .L802403F0 +/* A272AC 802403DC AFBF0014 */ sw $ra, 0x14($sp) +/* A272B0 802403E0 AE000070 */ sw $zero, 0x70($s0) +/* A272B4 802403E4 AE000074 */ sw $zero, 0x74($s0) +/* A272B8 802403E8 AE000078 */ sw $zero, 0x78($s0) +/* A272BC 802403EC AE00007C */ sw $zero, 0x7c($s0) +.L802403F0: +/* A272C0 802403F0 8E020070 */ lw $v0, 0x70($s0) +/* A272C4 802403F4 1440000E */ bnez $v0, .L80240430 +/* A272C8 802403F8 00000000 */ nop +/* A272CC 802403FC 8E0300A8 */ lw $v1, 0xa8($s0) +/* A272D0 80240400 8E020088 */ lw $v0, 0x88($s0) +/* A272D4 80240404 00621821 */ addu $v1, $v1, $v0 +/* A272D8 80240408 04610004 */ bgez $v1, .L8024041C +/* A272DC 8024040C AE0300A8 */ sw $v1, 0xa8($s0) +/* A272E0 80240410 3C020002 */ lui $v0, 2 +/* A272E4 80240414 0809010B */ j .L8024042C +/* A272E8 80240418 00621021 */ addu $v0, $v1, $v0 +.L8024041C: +/* A272EC 8024041C 3C040002 */ lui $a0, 2 +/* A272F0 80240420 0083102A */ slt $v0, $a0, $v1 +/* A272F4 80240424 10400002 */ beqz $v0, .L80240430 +/* A272F8 80240428 00641023 */ subu $v0, $v1, $a0 +.L8024042C: +/* A272FC 8024042C AE0200A8 */ sw $v0, 0xa8($s0) +.L80240430: +/* A27300 80240430 8E020074 */ lw $v0, 0x74($s0) +/* A27304 80240434 1440000E */ bnez $v0, .L80240470 +/* A27308 80240438 00000000 */ nop +/* A2730C 8024043C 8E0300AC */ lw $v1, 0xac($s0) +/* A27310 80240440 8E02008C */ lw $v0, 0x8c($s0) +/* A27314 80240444 00621821 */ addu $v1, $v1, $v0 +/* A27318 80240448 04610004 */ bgez $v1, .L8024045C +/* A2731C 8024044C AE0300AC */ sw $v1, 0xac($s0) +/* A27320 80240450 3C020002 */ lui $v0, 2 +/* A27324 80240454 0809011B */ j .L8024046C +/* A27328 80240458 00621021 */ addu $v0, $v1, $v0 +.L8024045C: +/* A2732C 8024045C 3C040002 */ lui $a0, 2 +/* A27330 80240460 0083102A */ slt $v0, $a0, $v1 +/* A27334 80240464 10400002 */ beqz $v0, .L80240470 +/* A27338 80240468 00641023 */ subu $v0, $v1, $a0 +.L8024046C: +/* A2733C 8024046C AE0200AC */ sw $v0, 0xac($s0) +.L80240470: +/* A27340 80240470 8E020078 */ lw $v0, 0x78($s0) +/* A27344 80240474 1440000E */ bnez $v0, .L802404B0 +/* A27348 80240478 00000000 */ nop +/* A2734C 8024047C 8E0300B0 */ lw $v1, 0xb0($s0) +/* A27350 80240480 8E020090 */ lw $v0, 0x90($s0) +/* A27354 80240484 00621821 */ addu $v1, $v1, $v0 +/* A27358 80240488 04610004 */ bgez $v1, .L8024049C +/* A2735C 8024048C AE0300B0 */ sw $v1, 0xb0($s0) +/* A27360 80240490 3C020002 */ lui $v0, 2 +/* A27364 80240494 0809012B */ j .L802404AC +/* A27368 80240498 00621021 */ addu $v0, $v1, $v0 +.L8024049C: +/* A2736C 8024049C 3C040002 */ lui $a0, 2 +/* A27370 802404A0 0083102A */ slt $v0, $a0, $v1 +/* A27374 802404A4 10400002 */ beqz $v0, .L802404B0 +/* A27378 802404A8 00641023 */ subu $v0, $v1, $a0 +.L802404AC: +/* A2737C 802404AC AE0200B0 */ sw $v0, 0xb0($s0) +.L802404B0: +/* A27380 802404B0 8E02007C */ lw $v0, 0x7c($s0) +/* A27384 802404B4 1440000E */ bnez $v0, .L802404F0 +/* A27388 802404B8 00000000 */ nop +/* A2738C 802404BC 8E0300B4 */ lw $v1, 0xb4($s0) +/* A27390 802404C0 8E020094 */ lw $v0, 0x94($s0) +/* A27394 802404C4 00621821 */ addu $v1, $v1, $v0 +/* A27398 802404C8 04610004 */ bgez $v1, .L802404DC +/* A2739C 802404CC AE0300B4 */ sw $v1, 0xb4($s0) +/* A273A0 802404D0 3C020002 */ lui $v0, 2 +/* A273A4 802404D4 0809013B */ j .L802404EC +/* A273A8 802404D8 00621021 */ addu $v0, $v1, $v0 +.L802404DC: +/* A273AC 802404DC 3C040002 */ lui $a0, 2 +/* A273B0 802404E0 0083102A */ slt $v0, $a0, $v1 +/* A273B4 802404E4 10400002 */ beqz $v0, .L802404F0 +/* A273B8 802404E8 00641023 */ subu $v0, $v1, $a0 +.L802404EC: +/* A273BC 802404EC AE0200B4 */ sw $v0, 0xb4($s0) +.L802404F0: +/* A273C0 802404F0 8E040084 */ lw $a0, 0x84($s0) +/* A273C4 802404F4 0C046F07 */ jal set_main_pan_u +/* A273C8 802404F8 8E0500A8 */ lw $a1, 0xa8($s0) +/* A273CC 802404FC 8E040084 */ lw $a0, 0x84($s0) +/* A273D0 80240500 0C046F0D */ jal set_main_pan_v +/* A273D4 80240504 8E0500AC */ lw $a1, 0xac($s0) +/* A273D8 80240508 8E040084 */ lw $a0, 0x84($s0) +/* A273DC 8024050C 0C046F13 */ jal set_aux_pan_u +/* A273E0 80240510 8E0500B0 */ lw $a1, 0xb0($s0) +/* A273E4 80240514 8E040084 */ lw $a0, 0x84($s0) +/* A273E8 80240518 0C046F19 */ jal set_aux_pan_v +/* A273EC 8024051C 8E0500B4 */ lw $a1, 0xb4($s0) +/* A273F0 80240520 8E020070 */ lw $v0, 0x70($s0) +/* A273F4 80240524 8E030078 */ lw $v1, 0x78($s0) +/* A273F8 80240528 8E040098 */ lw $a0, 0x98($s0) +/* A273FC 8024052C 24420001 */ addiu $v0, $v0, 1 +/* A27400 80240530 AE020070 */ sw $v0, 0x70($s0) +/* A27404 80240534 8E020074 */ lw $v0, 0x74($s0) +/* A27408 80240538 24630001 */ addiu $v1, $v1, 1 +/* A2740C 8024053C AE030078 */ sw $v1, 0x78($s0) +/* A27410 80240540 8E030070 */ lw $v1, 0x70($s0) +/* A27414 80240544 24420001 */ addiu $v0, $v0, 1 +/* A27418 80240548 AE020074 */ sw $v0, 0x74($s0) +/* A2741C 8024054C 8E02007C */ lw $v0, 0x7c($s0) +/* A27420 80240550 0064182A */ slt $v1, $v1, $a0 +/* A27424 80240554 24420001 */ addiu $v0, $v0, 1 +/* A27428 80240558 14600002 */ bnez $v1, .L80240564 +/* A2742C 8024055C AE02007C */ sw $v0, 0x7c($s0) +/* A27430 80240560 AE000070 */ sw $zero, 0x70($s0) +.L80240564: +/* A27434 80240564 8E020074 */ lw $v0, 0x74($s0) +/* A27438 80240568 8E03009C */ lw $v1, 0x9c($s0) +/* A2743C 8024056C 0043102A */ slt $v0, $v0, $v1 +/* A27440 80240570 50400001 */ beql $v0, $zero, .L80240578 +/* A27444 80240574 AE000074 */ sw $zero, 0x74($s0) +.L80240578: +/* A27448 80240578 8E020078 */ lw $v0, 0x78($s0) +/* A2744C 8024057C 8E0300A0 */ lw $v1, 0xa0($s0) +/* A27450 80240580 0043102A */ slt $v0, $v0, $v1 +/* A27454 80240584 50400001 */ beql $v0, $zero, .L8024058C +/* A27458 80240588 AE000078 */ sw $zero, 0x78($s0) +.L8024058C: +/* A2745C 8024058C 8E02007C */ lw $v0, 0x7c($s0) +/* A27460 80240590 8E0300A4 */ lw $v1, 0xa4($s0) +/* A27464 80240594 0043102A */ slt $v0, $v0, $v1 +/* A27468 80240598 50400001 */ beql $v0, $zero, .L802405A0 +/* A2746C 8024059C AE00007C */ sw $zero, 0x7c($s0) +.L802405A0: +/* A27470 802405A0 8FBF0014 */ lw $ra, 0x14($sp) +/* A27474 802405A4 8FB00010 */ lw $s0, 0x10($sp) +/* A27478 802405A8 0000102D */ daddu $v0, $zero, $zero +/* A2747C 802405AC 03E00008 */ jr $ra +/* A27480 802405B0 27BD0018 */ addiu $sp, $sp, 0x18 +/* A27484 802405B4 00000000 */ nop +/* A27488 802405B8 00000000 */ nop +/* A2748C 802405BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0.s b/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0.s deleted file mode 100644 index 3008064f65..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C0 -/* A27490 802405C0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A27494 802405C4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A27498 802405C8 8442008E */ lh $v0, 0x8e($v0) -/* A2749C 802405CC AC820084 */ sw $v0, 0x84($a0) -/* A274A0 802405D0 03E00008 */ jr $ra -/* A274A4 802405D4 24020002 */ addiu $v0, $zero, 2 -/* A274A8 802405D8 00000000 */ nop -/* A274AC 802405DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s b/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s new file mode 100644 index 0000000000..68711bfde8 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A27490/func_802405C0_A27490.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405C0_A27490 +/* A27490 802405C0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* A27494 802405C4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* A27498 802405C8 8442008E */ lh $v0, 0x8e($v0) +/* A2749C 802405CC AC820084 */ sw $v0, 0x84($a0) +/* A274A0 802405D0 03E00008 */ jr $ra +/* A274A4 802405D4 24020002 */ addiu $v0, $zero, 2 +/* A274A8 802405D8 00000000 */ nop +/* A274AC 802405DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654.s deleted file mode 100644 index e9888bf272..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240654 -/* A27524 80240654 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* A27528 80240658 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* A2752C 8024065C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A27530 80240660 AFBF0010 */ sw $ra, 0x10($sp) -/* A27534 80240664 908300A8 */ lbu $v1, 0xa8($a0) -/* A27538 80240668 2C620005 */ sltiu $v0, $v1, 5 -/* A2753C 8024066C 10400003 */ beqz $v0, .L8024067C -/* A27540 80240670 24620001 */ addiu $v0, $v1, 1 -/* A27544 80240674 0C00D994 */ jal begin_state_intro -/* A27548 80240678 A08200A8 */ sb $v0, 0xa8($a0) -.L8024067C: -/* A2754C 8024067C 8FBF0010 */ lw $ra, 0x10($sp) -/* A27550 80240680 24020001 */ addiu $v0, $zero, 1 -/* A27554 80240684 03E00008 */ jr $ra -/* A27558 80240688 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654_A27524.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654_A27524.s new file mode 100644 index 0000000000..2b6bfad1c5 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240654_A27524.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240654_A27524 +/* A27524 80240654 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* A27528 80240658 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) +/* A2752C 8024065C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A27530 80240660 AFBF0010 */ sw $ra, 0x10($sp) +/* A27534 80240664 908300A8 */ lbu $v1, 0xa8($a0) +/* A27538 80240668 2C620005 */ sltiu $v0, $v1, 5 +/* A2753C 8024066C 10400003 */ beqz $v0, .L8024067C +/* A27540 80240670 24620001 */ addiu $v0, $v1, 1 +/* A27544 80240674 0C00D994 */ jal begin_state_intro +/* A27548 80240678 A08200A8 */ sb $v0, 0xa8($a0) +.L8024067C: +/* A2754C 8024067C 8FBF0010 */ lw $ra, 0x10($sp) +/* A27550 80240680 24020001 */ addiu $v0, $zero, 1 +/* A27554 80240684 03E00008 */ jr $ra +/* A27558 80240688 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_8024068C.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_8024068C.s deleted file mode 100644 index c3217ea9ba..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_8024068C.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024068C -/* A2755C 8024068C 03E00008 */ jr $ra -/* A27560 80240690 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_8024068C_A2755C.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_8024068C_A2755C.s new file mode 100644 index 0000000000..e6bfdc2d05 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_8024068C_A2755C.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024068C_A2755C +/* A2755C 8024068C 03E00008 */ jr $ra +/* A27560 80240690 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8.s deleted file mode 100644 index dcde8dcb37..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F8 -/* A277C8 802408F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A277CC 802408FC 3C04800B */ lui $a0, %hi(gCameras) -/* A277D0 80240900 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A277D4 80240904 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A277D8 80240908 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A277DC 8024090C 3C05800A */ lui $a1, 0x800a -/* A277E0 80240910 8CA5A64C */ lw $a1, -0x59b4($a1) -/* A277E4 80240914 3C088024 */ lui $t0, 0x8024 -/* A277E8 80240918 25081B80 */ addiu $t0, $t0, 0x1b80 -/* A277EC 8024091C AFBF0020 */ sw $ra, 0x20($sp) -/* A277F0 80240920 AFB1001C */ sw $s1, 0x1c($sp) -/* A277F4 80240924 AFB00018 */ sw $s0, 0x18($sp) -/* A277F8 80240928 00031080 */ sll $v0, $v1, 2 -/* A277FC 8024092C 00431021 */ addu $v0, $v0, $v1 -/* A27800 80240930 00021080 */ sll $v0, $v0, 2 -/* A27804 80240934 00431023 */ subu $v0, $v0, $v1 -/* A27808 80240938 000218C0 */ sll $v1, $v0, 3 -/* A2780C 8024093C 00431021 */ addu $v0, $v0, $v1 -/* A27810 80240940 000210C0 */ sll $v0, $v0, 3 -/* A27814 80240944 8D030000 */ lw $v1, ($t0) -/* A27818 80240948 10A30013 */ beq $a1, $v1, .L80240998 -/* A2781C 8024094C 00448821 */ addu $s1, $v0, $a0 -/* A27820 80240950 3C108024 */ lui $s0, 0x8024 -/* A27824 80240954 26101B7C */ addiu $s0, $s0, 0x1b7c -/* A27828 80240958 3C01442F */ lui $at, 0x442f -/* A2782C 8024095C 44816000 */ mtc1 $at, $f12 -/* A27830 80240960 3C014396 */ lui $at, 0x4396 -/* A27834 80240964 44817000 */ mtc1 $at, $f14 -/* A27838 80240968 8E060000 */ lw $a2, ($s0) -/* A2783C 8024096C 3C073F99 */ lui $a3, 0x3f99 -/* A27840 80240970 34E7999A */ ori $a3, $a3, 0x999a -/* A27844 80240974 AD050000 */ sw $a1, ($t0) -/* A27848 80240978 0C0901A5 */ jal func_80240694 -/* A2784C 8024097C AFB00010 */ sw $s0, 0x10($sp) -/* A27850 80240980 0000102D */ daddu $v0, $zero, $zero -/* A27854 80240984 C6000000 */ lwc1 $f0, ($s0) -/* A27858 80240988 24030001 */ addiu $v1, $zero, 1 -/* A2785C 8024098C A6230506 */ sh $v1, 0x506($s1) -/* A27860 80240990 08090267 */ j .L8024099C -/* A27864 80240994 E62004DC */ swc1 $f0, 0x4dc($s1) -.L80240998: -/* A27868 80240998 0000102D */ daddu $v0, $zero, $zero -.L8024099C: -/* A2786C 8024099C 8FBF0020 */ lw $ra, 0x20($sp) -/* A27870 802409A0 8FB1001C */ lw $s1, 0x1c($sp) -/* A27874 802409A4 8FB00018 */ lw $s0, 0x18($sp) -/* A27878 802409A8 03E00008 */ jr $ra -/* A2787C 802409AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s new file mode 100644 index 0000000000..fa9f629ae2 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802408F8_A277C8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408F8_A277C8 +/* A277C8 802408F8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A277CC 802408FC 3C04800B */ lui $a0, %hi(gCameras) +/* A277D0 80240900 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A277D4 80240904 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* A277D8 80240908 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* A277DC 8024090C 3C05800A */ lui $a1, 0x800a +/* A277E0 80240910 8CA5A64C */ lw $a1, -0x59b4($a1) +/* A277E4 80240914 3C088024 */ lui $t0, 0x8024 +/* A277E8 80240918 25081B80 */ addiu $t0, $t0, 0x1b80 +/* A277EC 8024091C AFBF0020 */ sw $ra, 0x20($sp) +/* A277F0 80240920 AFB1001C */ sw $s1, 0x1c($sp) +/* A277F4 80240924 AFB00018 */ sw $s0, 0x18($sp) +/* A277F8 80240928 00031080 */ sll $v0, $v1, 2 +/* A277FC 8024092C 00431021 */ addu $v0, $v0, $v1 +/* A27800 80240930 00021080 */ sll $v0, $v0, 2 +/* A27804 80240934 00431023 */ subu $v0, $v0, $v1 +/* A27808 80240938 000218C0 */ sll $v1, $v0, 3 +/* A2780C 8024093C 00431021 */ addu $v0, $v0, $v1 +/* A27810 80240940 000210C0 */ sll $v0, $v0, 3 +/* A27814 80240944 8D030000 */ lw $v1, ($t0) +/* A27818 80240948 10A30013 */ beq $a1, $v1, .L80240998 +/* A2781C 8024094C 00448821 */ addu $s1, $v0, $a0 +/* A27820 80240950 3C108024 */ lui $s0, 0x8024 +/* A27824 80240954 26101B7C */ addiu $s0, $s0, 0x1b7c +/* A27828 80240958 3C01442F */ lui $at, 0x442f +/* A2782C 8024095C 44816000 */ mtc1 $at, $f12 +/* A27830 80240960 3C014396 */ lui $at, 0x4396 +/* A27834 80240964 44817000 */ mtc1 $at, $f14 +/* A27838 80240968 8E060000 */ lw $a2, ($s0) +/* A2783C 8024096C 3C073F99 */ lui $a3, 0x3f99 +/* A27840 80240970 34E7999A */ ori $a3, $a3, 0x999a +/* A27844 80240974 AD050000 */ sw $a1, ($t0) +/* A27848 80240978 0C0901A5 */ jal func_80240694_A27564 +/* A2784C 8024097C AFB00010 */ sw $s0, 0x10($sp) +/* A27850 80240980 0000102D */ daddu $v0, $zero, $zero +/* A27854 80240984 C6000000 */ lwc1 $f0, ($s0) +/* A27858 80240988 24030001 */ addiu $v1, $zero, 1 +/* A2785C 8024098C A6230506 */ sh $v1, 0x506($s1) +/* A27860 80240990 08090267 */ j .L8024099C +/* A27864 80240994 E62004DC */ swc1 $f0, 0x4dc($s1) +.L80240998: +/* A27868 80240998 0000102D */ daddu $v0, $zero, $zero +.L8024099C: +/* A2786C 8024099C 8FBF0020 */ lw $ra, 0x20($sp) +/* A27870 802409A0 8FB1001C */ lw $s1, 0x1c($sp) +/* A27874 802409A4 8FB00018 */ lw $s0, 0x18($sp) +/* A27878 802409A8 03E00008 */ jr $ra +/* A2787C 802409AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0.s deleted file mode 100644 index e0c8dce309..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409B0 -/* A27880 802409B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A27884 802409B4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A27888 802409B8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2788C 802409BC 3C04800B */ lui $a0, %hi(gCameras) -/* A27890 802409C0 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A27894 802409C4 AFBF0024 */ sw $ra, 0x24($sp) -/* A27898 802409C8 AFB20020 */ sw $s2, 0x20($sp) -/* A2789C 802409CC AFB1001C */ sw $s1, 0x1c($sp) -/* A278A0 802409D0 AFB00018 */ sw $s0, 0x18($sp) -/* A278A4 802409D4 00031080 */ sll $v0, $v1, 2 -/* A278A8 802409D8 00431021 */ addu $v0, $v0, $v1 -/* A278AC 802409DC 00021080 */ sll $v0, $v0, 2 -/* A278B0 802409E0 00431023 */ subu $v0, $v0, $v1 -/* A278B4 802409E4 000218C0 */ sll $v1, $v0, 3 -/* A278B8 802409E8 00431021 */ addu $v0, $v0, $v1 -/* A278BC 802409EC 000210C0 */ sll $v0, $v0, 3 -/* A278C0 802409F0 10A00005 */ beqz $a1, .L80240A08 -/* A278C4 802409F4 00449021 */ addu $s2, $v0, $a0 -/* A278C8 802409F8 3C018024 */ lui $at, 0x8024 -/* A278CC 802409FC C4201B54 */ lwc1 $f0, 0x1b54($at) -/* A278D0 80240A00 3C018024 */ lui $at, 0x8024 -/* A278D4 80240A04 E4203370 */ swc1 $f0, 0x3370($at) -.L80240A08: -/* A278D8 80240A08 3C118024 */ lui $s1, 0x8024 -/* A278DC 80240A0C 26313370 */ addiu $s1, $s1, 0x3370 -/* A278E0 80240A10 3C01428C */ lui $at, 0x428c -/* A278E4 80240A14 44810000 */ mtc1 $at, $f0 -/* A278E8 80240A18 3C058024 */ lui $a1, 0x8024 -/* A278EC 80240A1C 8CA51B54 */ lw $a1, 0x1b54($a1) -/* A278F0 80240A20 3C06442F */ lui $a2, 0x442f -/* A278F4 80240A24 3C108024 */ lui $s0, 0x8024 -/* A278F8 80240A28 26101B84 */ addiu $s0, $s0, 0x1b84 -/* A278FC 80240A2C AFB10014 */ sw $s1, 0x14($sp) -/* A27900 80240A30 E7A00010 */ swc1 $f0, 0x10($sp) -/* A27904 80240A34 C6000000 */ lwc1 $f0, ($s0) -/* A27908 80240A38 46800020 */ cvt.s.w $f0, $f0 -/* A2790C 80240A3C 44070000 */ mfc1 $a3, $f0 -/* A27910 80240A40 0C0901CD */ jal func_80240734_A27604 -/* A27914 80240A44 24040001 */ addiu $a0, $zero, 1 -/* A27918 80240A48 C6200000 */ lwc1 $f0, ($s1) -/* A2791C 80240A4C 8E020000 */ lw $v0, ($s0) -/* A27920 80240A50 24030001 */ addiu $v1, $zero, 1 -/* A27924 80240A54 A6430506 */ sh $v1, 0x506($s2) -/* A27928 80240A58 24420001 */ addiu $v0, $v0, 1 -/* A2792C 80240A5C E64004DC */ swc1 $f0, 0x4dc($s2) -/* A27930 80240A60 AE020000 */ sw $v0, ($s0) -/* A27934 80240A64 28420046 */ slti $v0, $v0, 0x46 -/* A27938 80240A68 8FBF0024 */ lw $ra, 0x24($sp) -/* A2793C 80240A6C 8FB20020 */ lw $s2, 0x20($sp) -/* A27940 80240A70 8FB1001C */ lw $s1, 0x1c($sp) -/* A27944 80240A74 8FB00018 */ lw $s0, 0x18($sp) -/* A27948 80240A78 38420001 */ xori $v0, $v0, 1 -/* A2794C 80240A7C 03E00008 */ jr $ra -/* A27950 80240A80 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s new file mode 100644 index 0000000000..d5d66e0144 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802409B0_A27880.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409B0_A27880 +/* A27880 802409B0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A27884 802409B4 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* A27888 802409B8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* A2788C 802409BC 3C04800B */ lui $a0, %hi(gCameras) +/* A27890 802409C0 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A27894 802409C4 AFBF0024 */ sw $ra, 0x24($sp) +/* A27898 802409C8 AFB20020 */ sw $s2, 0x20($sp) +/* A2789C 802409CC AFB1001C */ sw $s1, 0x1c($sp) +/* A278A0 802409D0 AFB00018 */ sw $s0, 0x18($sp) +/* A278A4 802409D4 00031080 */ sll $v0, $v1, 2 +/* A278A8 802409D8 00431021 */ addu $v0, $v0, $v1 +/* A278AC 802409DC 00021080 */ sll $v0, $v0, 2 +/* A278B0 802409E0 00431023 */ subu $v0, $v0, $v1 +/* A278B4 802409E4 000218C0 */ sll $v1, $v0, 3 +/* A278B8 802409E8 00431021 */ addu $v0, $v0, $v1 +/* A278BC 802409EC 000210C0 */ sll $v0, $v0, 3 +/* A278C0 802409F0 10A00005 */ beqz $a1, .L80240A08 +/* A278C4 802409F4 00449021 */ addu $s2, $v0, $a0 +/* A278C8 802409F8 3C018024 */ lui $at, 0x8024 +/* A278CC 802409FC C4201B54 */ lwc1 $f0, 0x1b54($at) +/* A278D0 80240A00 3C018024 */ lui $at, 0x8024 +/* A278D4 80240A04 E4203370 */ swc1 $f0, 0x3370($at) +.L80240A08: +/* A278D8 80240A08 3C118024 */ lui $s1, 0x8024 +/* A278DC 80240A0C 26313370 */ addiu $s1, $s1, 0x3370 +/* A278E0 80240A10 3C01428C */ lui $at, 0x428c +/* A278E4 80240A14 44810000 */ mtc1 $at, $f0 +/* A278E8 80240A18 3C058024 */ lui $a1, 0x8024 +/* A278EC 80240A1C 8CA51B54 */ lw $a1, 0x1b54($a1) +/* A278F0 80240A20 3C06442F */ lui $a2, 0x442f +/* A278F4 80240A24 3C108024 */ lui $s0, 0x8024 +/* A278F8 80240A28 26101B84 */ addiu $s0, $s0, 0x1b84 +/* A278FC 80240A2C AFB10014 */ sw $s1, 0x14($sp) +/* A27900 80240A30 E7A00010 */ swc1 $f0, 0x10($sp) +/* A27904 80240A34 C6000000 */ lwc1 $f0, ($s0) +/* A27908 80240A38 46800020 */ cvt.s.w $f0, $f0 +/* A2790C 80240A3C 44070000 */ mfc1 $a3, $f0 +/* A27910 80240A40 0C0901CD */ jal func_80240734_A27604 +/* A27914 80240A44 24040001 */ addiu $a0, $zero, 1 +/* A27918 80240A48 C6200000 */ lwc1 $f0, ($s1) +/* A2791C 80240A4C 8E020000 */ lw $v0, ($s0) +/* A27920 80240A50 24030001 */ addiu $v1, $zero, 1 +/* A27924 80240A54 A6430506 */ sh $v1, 0x506($s2) +/* A27928 80240A58 24420001 */ addiu $v0, $v0, 1 +/* A2792C 80240A5C E64004DC */ swc1 $f0, 0x4dc($s2) +/* A27930 80240A60 AE020000 */ sw $v0, ($s0) +/* A27934 80240A64 28420046 */ slti $v0, $v0, 0x46 +/* A27938 80240A68 8FBF0024 */ lw $ra, 0x24($sp) +/* A2793C 80240A6C 8FB20020 */ lw $s2, 0x20($sp) +/* A27940 80240A70 8FB1001C */ lw $s1, 0x1c($sp) +/* A27944 80240A74 8FB00018 */ lw $s0, 0x18($sp) +/* A27948 80240A78 38420001 */ xori $v0, $v0, 1 +/* A2794C 80240A7C 03E00008 */ jr $ra +/* A27950 80240A80 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84.s deleted file mode 100644 index 34152cc743..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A84 -/* A27954 80240A84 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A27958 80240A88 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A2795C 80240A8C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A27960 80240A90 3C04800B */ lui $a0, %hi(gCameras) -/* A27964 80240A94 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A27968 80240A98 AFBF0024 */ sw $ra, 0x24($sp) -/* A2796C 80240A9C AFB20020 */ sw $s2, 0x20($sp) -/* A27970 80240AA0 AFB1001C */ sw $s1, 0x1c($sp) -/* A27974 80240AA4 AFB00018 */ sw $s0, 0x18($sp) -/* A27978 80240AA8 00031080 */ sll $v0, $v1, 2 -/* A2797C 80240AAC 00431021 */ addu $v0, $v0, $v1 -/* A27980 80240AB0 00021080 */ sll $v0, $v0, 2 -/* A27984 80240AB4 00431023 */ subu $v0, $v0, $v1 -/* A27988 80240AB8 000218C0 */ sll $v1, $v0, 3 -/* A2798C 80240ABC 00431021 */ addu $v0, $v0, $v1 -/* A27990 80240AC0 000210C0 */ sll $v0, $v0, 3 -/* A27994 80240AC4 10A00005 */ beqz $a1, .L80240ADC -/* A27998 80240AC8 00449021 */ addu $s2, $v0, $a0 -/* A2799C 80240ACC 3C018024 */ lui $at, 0x8024 -/* A279A0 80240AD0 C4201B74 */ lwc1 $f0, 0x1b74($at) -/* A279A4 80240AD4 3C018024 */ lui $at, 0x8024 -/* A279A8 80240AD8 E4203374 */ swc1 $f0, 0x3374($at) -.L80240ADC: -/* A279AC 80240ADC 3C118024 */ lui $s1, 0x8024 -/* A279B0 80240AE0 26313374 */ addiu $s1, $s1, 0x3374 -/* A279B4 80240AE4 3C014348 */ lui $at, 0x4348 -/* A279B8 80240AE8 44810000 */ mtc1 $at, $f0 -/* A279BC 80240AEC 3C058024 */ lui $a1, 0x8024 -/* A279C0 80240AF0 8CA51B74 */ lw $a1, 0x1b74($a1) -/* A279C4 80240AF4 3C06C2A0 */ lui $a2, 0xc2a0 -/* A279C8 80240AF8 3C108024 */ lui $s0, 0x8024 -/* A279CC 80240AFC 26101B88 */ addiu $s0, $s0, 0x1b88 -/* A279D0 80240B00 AFB10014 */ sw $s1, 0x14($sp) -/* A279D4 80240B04 E7A00010 */ swc1 $f0, 0x10($sp) -/* A279D8 80240B08 C6000000 */ lwc1 $f0, ($s0) -/* A279DC 80240B0C 46800020 */ cvt.s.w $f0, $f0 -/* A279E0 80240B10 44070000 */ mfc1 $a3, $f0 -/* A279E4 80240B14 0C0901CD */ jal func_80240734_A27604 -/* A279E8 80240B18 24040005 */ addiu $a0, $zero, 5 -/* A279EC 80240B1C C6200000 */ lwc1 $f0, ($s1) -/* A279F0 80240B20 8E020000 */ lw $v0, ($s0) -/* A279F4 80240B24 24030001 */ addiu $v1, $zero, 1 -/* A279F8 80240B28 A6430506 */ sh $v1, 0x506($s2) -/* A279FC 80240B2C 24420001 */ addiu $v0, $v0, 1 -/* A27A00 80240B30 E64004FC */ swc1 $f0, 0x4fc($s2) -/* A27A04 80240B34 AE020000 */ sw $v0, ($s0) -/* A27A08 80240B38 384200C8 */ xori $v0, $v0, 0xc8 -/* A27A0C 80240B3C 2C420001 */ sltiu $v0, $v0, 1 -/* A27A10 80240B40 8FBF0024 */ lw $ra, 0x24($sp) -/* A27A14 80240B44 8FB20020 */ lw $s2, 0x20($sp) -/* A27A18 80240B48 8FB1001C */ lw $s1, 0x1c($sp) -/* A27A1C 80240B4C 8FB00018 */ lw $s0, 0x18($sp) -/* A27A20 80240B50 00021040 */ sll $v0, $v0, 1 -/* A27A24 80240B54 03E00008 */ jr $ra -/* A27A28 80240B58 27BD0028 */ addiu $sp, $sp, 0x28 -/* A27A2C 80240B5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s new file mode 100644 index 0000000000..0f1ca9a817 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_80240A84_A27954.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A84_A27954 +/* A27954 80240A84 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A27958 80240A88 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* A2795C 80240A8C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* A27960 80240A90 3C04800B */ lui $a0, %hi(gCameras) +/* A27964 80240A94 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A27968 80240A98 AFBF0024 */ sw $ra, 0x24($sp) +/* A2796C 80240A9C AFB20020 */ sw $s2, 0x20($sp) +/* A27970 80240AA0 AFB1001C */ sw $s1, 0x1c($sp) +/* A27974 80240AA4 AFB00018 */ sw $s0, 0x18($sp) +/* A27978 80240AA8 00031080 */ sll $v0, $v1, 2 +/* A2797C 80240AAC 00431021 */ addu $v0, $v0, $v1 +/* A27980 80240AB0 00021080 */ sll $v0, $v0, 2 +/* A27984 80240AB4 00431023 */ subu $v0, $v0, $v1 +/* A27988 80240AB8 000218C0 */ sll $v1, $v0, 3 +/* A2798C 80240ABC 00431021 */ addu $v0, $v0, $v1 +/* A27990 80240AC0 000210C0 */ sll $v0, $v0, 3 +/* A27994 80240AC4 10A00005 */ beqz $a1, .L80240ADC +/* A27998 80240AC8 00449021 */ addu $s2, $v0, $a0 +/* A2799C 80240ACC 3C018024 */ lui $at, 0x8024 +/* A279A0 80240AD0 C4201B74 */ lwc1 $f0, 0x1b74($at) +/* A279A4 80240AD4 3C018024 */ lui $at, 0x8024 +/* A279A8 80240AD8 E4203374 */ swc1 $f0, 0x3374($at) +.L80240ADC: +/* A279AC 80240ADC 3C118024 */ lui $s1, 0x8024 +/* A279B0 80240AE0 26313374 */ addiu $s1, $s1, 0x3374 +/* A279B4 80240AE4 3C014348 */ lui $at, 0x4348 +/* A279B8 80240AE8 44810000 */ mtc1 $at, $f0 +/* A279BC 80240AEC 3C058024 */ lui $a1, 0x8024 +/* A279C0 80240AF0 8CA51B74 */ lw $a1, 0x1b74($a1) +/* A279C4 80240AF4 3C06C2A0 */ lui $a2, 0xc2a0 +/* A279C8 80240AF8 3C108024 */ lui $s0, 0x8024 +/* A279CC 80240AFC 26101B88 */ addiu $s0, $s0, 0x1b88 +/* A279D0 80240B00 AFB10014 */ sw $s1, 0x14($sp) +/* A279D4 80240B04 E7A00010 */ swc1 $f0, 0x10($sp) +/* A279D8 80240B08 C6000000 */ lwc1 $f0, ($s0) +/* A279DC 80240B0C 46800020 */ cvt.s.w $f0, $f0 +/* A279E0 80240B10 44070000 */ mfc1 $a3, $f0 +/* A279E4 80240B14 0C0901CD */ jal func_80240734_A27604 +/* A279E8 80240B18 24040005 */ addiu $a0, $zero, 5 +/* A279EC 80240B1C C6200000 */ lwc1 $f0, ($s1) +/* A279F0 80240B20 8E020000 */ lw $v0, ($s0) +/* A279F4 80240B24 24030001 */ addiu $v1, $zero, 1 +/* A279F8 80240B28 A6430506 */ sh $v1, 0x506($s2) +/* A279FC 80240B2C 24420001 */ addiu $v0, $v0, 1 +/* A27A00 80240B30 E64004FC */ swc1 $f0, 0x4fc($s2) +/* A27A04 80240B34 AE020000 */ sw $v0, ($s0) +/* A27A08 80240B38 384200C8 */ xori $v0, $v0, 0xc8 +/* A27A0C 80240B3C 2C420001 */ sltiu $v0, $v0, 1 +/* A27A10 80240B40 8FBF0024 */ lw $ra, 0x24($sp) +/* A27A14 80240B44 8FB20020 */ lw $s2, 0x20($sp) +/* A27A18 80240B48 8FB1001C */ lw $s1, 0x1c($sp) +/* A27A1C 80240B4C 8FB00018 */ lw $s0, 0x18($sp) +/* A27A20 80240B50 00021040 */ sll $v0, $v0, 1 +/* A27A24 80240B54 03E00008 */ jr $ra +/* A27A28 80240B58 27BD0028 */ addiu $sp, $sp, 0x28 +/* A27A2C 80240B5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60.s b/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60.s deleted file mode 100644 index 267df29798..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B60 -/* A27A30 80240B60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A27A34 80240B64 AFB00010 */ sw $s0, 0x10($sp) -/* A27A38 80240B68 0080802D */ daddu $s0, $a0, $zero -/* A27A3C 80240B6C 10A00002 */ beqz $a1, .L80240B78 -/* A27A40 80240B70 AFBF0014 */ sw $ra, 0x14($sp) -/* A27A44 80240B74 AE000074 */ sw $zero, 0x74($s0) -.L80240B78: -/* A27A48 80240B78 8E020074 */ lw $v0, 0x74($s0) -/* A27A4C 80240B7C 24420010 */ addiu $v0, $v0, 0x10 -/* A27A50 80240B80 AE020074 */ sw $v0, 0x74($s0) -/* A27A54 80240B84 28420100 */ slti $v0, $v0, 0x100 -/* A27A58 80240B88 14400002 */ bnez $v0, .L80240B94 -/* A27A5C 80240B8C 240200FF */ addiu $v0, $zero, 0xff -/* A27A60 80240B90 AE020074 */ sw $v0, 0x74($s0) -.L80240B94: -/* A27A64 80240B94 C6000074 */ lwc1 $f0, 0x74($s0) -/* A27A68 80240B98 46800020 */ cvt.s.w $f0, $f0 -/* A27A6C 80240B9C 44050000 */ mfc1 $a1, $f0 -/* A27A70 80240BA0 0C04DF62 */ jal func_80137D88 -/* A27A74 80240BA4 0000202D */ daddu $a0, $zero, $zero -/* A27A78 80240BA8 8E020074 */ lw $v0, 0x74($s0) -/* A27A7C 80240BAC 8FBF0014 */ lw $ra, 0x14($sp) -/* A27A80 80240BB0 8FB00010 */ lw $s0, 0x10($sp) -/* A27A84 80240BB4 384200FF */ xori $v0, $v0, 0xff -/* A27A88 80240BB8 2C420001 */ sltiu $v0, $v0, 1 -/* A27A8C 80240BBC 00021040 */ sll $v0, $v0, 1 -/* A27A90 80240BC0 03E00008 */ jr $ra -/* A27A94 80240BC4 27BD0018 */ addiu $sp, $sp, 0x18 -/* A27A98 80240BC8 00000000 */ nop -/* A27A9C 80240BCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s b/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s new file mode 100644 index 0000000000..022d25856c --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A27A30/func_80240B60_A27A30.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B60_A27A30 +/* A27A30 80240B60 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A27A34 80240B64 AFB00010 */ sw $s0, 0x10($sp) +/* A27A38 80240B68 0080802D */ daddu $s0, $a0, $zero +/* A27A3C 80240B6C 10A00002 */ beqz $a1, .L80240B78 +/* A27A40 80240B70 AFBF0014 */ sw $ra, 0x14($sp) +/* A27A44 80240B74 AE000074 */ sw $zero, 0x74($s0) +.L80240B78: +/* A27A48 80240B78 8E020074 */ lw $v0, 0x74($s0) +/* A27A4C 80240B7C 24420010 */ addiu $v0, $v0, 0x10 +/* A27A50 80240B80 AE020074 */ sw $v0, 0x74($s0) +/* A27A54 80240B84 28420100 */ slti $v0, $v0, 0x100 +/* A27A58 80240B88 14400002 */ bnez $v0, .L80240B94 +/* A27A5C 80240B8C 240200FF */ addiu $v0, $zero, 0xff +/* A27A60 80240B90 AE020074 */ sw $v0, 0x74($s0) +.L80240B94: +/* A27A64 80240B94 C6000074 */ lwc1 $f0, 0x74($s0) +/* A27A68 80240B98 46800020 */ cvt.s.w $f0, $f0 +/* A27A6C 80240B9C 44050000 */ mfc1 $a1, $f0 +/* A27A70 80240BA0 0C04DF62 */ jal func_80137D88 +/* A27A74 80240BA4 0000202D */ daddu $a0, $zero, $zero +/* A27A78 80240BA8 8E020074 */ lw $v0, 0x74($s0) +/* A27A7C 80240BAC 8FBF0014 */ lw $ra, 0x14($sp) +/* A27A80 80240BB0 8FB00010 */ lw $s0, 0x10($sp) +/* A27A84 80240BB4 384200FF */ xori $v0, $v0, 0xff +/* A27A88 80240BB8 2C420001 */ sltiu $v0, $v0, 1 +/* A27A8C 80240BBC 00021040 */ sll $v0, $v0, 1 +/* A27A90 80240BC0 03E00008 */ jr $ra +/* A27A94 80240BC4 27BD0018 */ addiu $sp, $sp, 0x18 +/* A27A98 80240BC8 00000000 */ nop +/* A27A9C 80240BCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40.s deleted file mode 100644 index 2833daa0f0..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E40 -/* A27D10 80240E40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A27D14 80240E44 AFBF0010 */ sw $ra, 0x10($sp) -/* A27D18 80240E48 8C82000C */ lw $v0, 0xc($a0) -/* A27D1C 80240E4C 0C0B1EAF */ jal get_variable -/* A27D20 80240E50 8C450000 */ lw $a1, ($v0) -/* A27D24 80240E54 0C00AFC1 */ jal set_curtain_draw_callback -/* A27D28 80240E58 0040202D */ daddu $a0, $v0, $zero -/* A27D2C 80240E5C 8FBF0010 */ lw $ra, 0x10($sp) -/* A27D30 80240E60 24020002 */ addiu $v0, $zero, 2 -/* A27D34 80240E64 03E00008 */ jr $ra -/* A27D38 80240E68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40_A27D10.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40_A27D10.s new file mode 100644 index 0000000000..73d62347fa --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E40_A27D10.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E40_A27D10 +/* A27D10 80240E40 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A27D14 80240E44 AFBF0010 */ sw $ra, 0x10($sp) +/* A27D18 80240E48 8C82000C */ lw $v0, 0xc($a0) +/* A27D1C 80240E4C 0C0B1EAF */ jal get_variable +/* A27D20 80240E50 8C450000 */ lw $a1, ($v0) +/* A27D24 80240E54 0C00AFC1 */ jal set_curtain_draw_callback +/* A27D28 80240E58 0040202D */ daddu $a0, $v0, $zero +/* A27D2C 80240E5C 8FBF0010 */ lw $ra, 0x10($sp) +/* A27D30 80240E60 24020002 */ addiu $v0, $zero, 2 +/* A27D34 80240E64 03E00008 */ jr $ra +/* A27D38 80240E68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s index cdde7110d3..ac6362fdd0 100644 --- a/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s +++ b/asm/nonmatchings/world/area_hos/hos_04/A27AA0/func_80240E6C_A27D3C.s @@ -6,7 +6,7 @@ glabel func_80240E6C_A27D3C /* A27D40 80240E70 3C048024 */ lui $a0, 0x8024 /* A27D44 80240E74 24843284 */ addiu $a0, $a0, 0x3284 /* A27D48 80240E78 AFBF0010 */ sw $ra, 0x10($sp) -/* A27D4C 80240E7C 0C0902F4 */ jal func_80240BD0 +/* A27D4C 80240E7C 0C0902F4 */ jal func_80240BD0_A27AA0 /* A27D50 80240E80 00000000 */ nop /* A27D54 80240E84 8FBF0010 */ lw $ra, 0x10($sp) /* A27D58 80240E88 03E00008 */ jr $ra diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8.s deleted file mode 100644 index ea78d94343..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F8 -/* A2A538 802402F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2A53C 802402FC AFB00010 */ sw $s0, 0x10($sp) -/* A2A540 80240300 0080802D */ daddu $s0, $a0, $zero -/* A2A544 80240304 AFBF0014 */ sw $ra, 0x14($sp) -/* A2A548 80240308 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2A54C 8024030C 8E020088 */ lw $v0, 0x88($s0) -/* A2A550 80240310 00621821 */ addu $v1, $v1, $v0 -/* A2A554 80240314 04610004 */ bgez $v1, .L80240328 -/* A2A558 80240318 AE0300A8 */ sw $v1, 0xa8($s0) -/* A2A55C 8024031C 3C020002 */ lui $v0, 2 -/* A2A560 80240320 080900CE */ j .L80240338 -/* A2A564 80240324 00621021 */ addu $v0, $v1, $v0 -.L80240328: -/* A2A568 80240328 3C040002 */ lui $a0, 2 -/* A2A56C 8024032C 0083102A */ slt $v0, $a0, $v1 -/* A2A570 80240330 10400002 */ beqz $v0, .L8024033C -/* A2A574 80240334 00641023 */ subu $v0, $v1, $a0 -.L80240338: -/* A2A578 80240338 AE0200A8 */ sw $v0, 0xa8($s0) -.L8024033C: -/* A2A57C 8024033C 8E0300AC */ lw $v1, 0xac($s0) -/* A2A580 80240340 8E02008C */ lw $v0, 0x8c($s0) -/* A2A584 80240344 00621821 */ addu $v1, $v1, $v0 -/* A2A588 80240348 04610004 */ bgez $v1, .L8024035C -/* A2A58C 8024034C AE0300AC */ sw $v1, 0xac($s0) -/* A2A590 80240350 3C020002 */ lui $v0, 2 -/* A2A594 80240354 080900DB */ j .L8024036C -/* A2A598 80240358 00621021 */ addu $v0, $v1, $v0 -.L8024035C: -/* A2A59C 8024035C 3C040002 */ lui $a0, 2 -/* A2A5A0 80240360 0083102A */ slt $v0, $a0, $v1 -/* A2A5A4 80240364 10400002 */ beqz $v0, .L80240370 -/* A2A5A8 80240368 00641023 */ subu $v0, $v1, $a0 -.L8024036C: -/* A2A5AC 8024036C AE0200AC */ sw $v0, 0xac($s0) -.L80240370: -/* A2A5B0 80240370 8E0300B0 */ lw $v1, 0xb0($s0) -/* A2A5B4 80240374 8E020090 */ lw $v0, 0x90($s0) -/* A2A5B8 80240378 00621821 */ addu $v1, $v1, $v0 -/* A2A5BC 8024037C 04610004 */ bgez $v1, .L80240390 -/* A2A5C0 80240380 AE0300B0 */ sw $v1, 0xb0($s0) -/* A2A5C4 80240384 3C020002 */ lui $v0, 2 -/* A2A5C8 80240388 080900E8 */ j .L802403A0 -/* A2A5CC 8024038C 00621021 */ addu $v0, $v1, $v0 -.L80240390: -/* A2A5D0 80240390 3C040002 */ lui $a0, 2 -/* A2A5D4 80240394 0083102A */ slt $v0, $a0, $v1 -/* A2A5D8 80240398 10400002 */ beqz $v0, .L802403A4 -/* A2A5DC 8024039C 00641023 */ subu $v0, $v1, $a0 -.L802403A0: -/* A2A5E0 802403A0 AE0200B0 */ sw $v0, 0xb0($s0) -.L802403A4: -/* A2A5E4 802403A4 8E0300B4 */ lw $v1, 0xb4($s0) -/* A2A5E8 802403A8 8E020094 */ lw $v0, 0x94($s0) -/* A2A5EC 802403AC 00621821 */ addu $v1, $v1, $v0 -/* A2A5F0 802403B0 04610004 */ bgez $v1, .L802403C4 -/* A2A5F4 802403B4 AE0300B4 */ sw $v1, 0xb4($s0) -/* A2A5F8 802403B8 3C020002 */ lui $v0, 2 -/* A2A5FC 802403BC 080900F5 */ j .L802403D4 -/* A2A600 802403C0 00621021 */ addu $v0, $v1, $v0 -.L802403C4: -/* A2A604 802403C4 3C040002 */ lui $a0, 2 -/* A2A608 802403C8 0083102A */ slt $v0, $a0, $v1 -/* A2A60C 802403CC 10400002 */ beqz $v0, .L802403D8 -/* A2A610 802403D0 00641023 */ subu $v0, $v1, $a0 -.L802403D4: -/* A2A614 802403D4 AE0200B4 */ sw $v0, 0xb4($s0) -.L802403D8: -/* A2A618 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* A2A61C 802403DC 0C046F07 */ jal set_main_pan_u -/* A2A620 802403E0 8E0500A8 */ lw $a1, 0xa8($s0) -/* A2A624 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* A2A628 802403E8 0C046F0D */ jal set_main_pan_v -/* A2A62C 802403EC 8E0500AC */ lw $a1, 0xac($s0) -/* A2A630 802403F0 8E040084 */ lw $a0, 0x84($s0) -/* A2A634 802403F4 0C046F13 */ jal set_aux_pan_u -/* A2A638 802403F8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2A63C 802403FC 8E040084 */ lw $a0, 0x84($s0) -/* A2A640 80240400 0C046F19 */ jal set_aux_pan_v -/* A2A644 80240404 8E0500B4 */ lw $a1, 0xb4($s0) -/* A2A648 80240408 8FBF0014 */ lw $ra, 0x14($sp) -/* A2A64C 8024040C 8FB00010 */ lw $s0, 0x10($sp) -/* A2A650 80240410 0000102D */ daddu $v0, $zero, $zero -/* A2A654 80240414 03E00008 */ jr $ra -/* A2A658 80240418 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8_A2A538.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8_A2A538.s new file mode 100644 index 0000000000..b2d5f394bc --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_802402F8_A2A538.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402F8_A2A538 +/* A2A538 802402F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2A53C 802402FC AFB00010 */ sw $s0, 0x10($sp) +/* A2A540 80240300 0080802D */ daddu $s0, $a0, $zero +/* A2A544 80240304 AFBF0014 */ sw $ra, 0x14($sp) +/* A2A548 80240308 8E0300A8 */ lw $v1, 0xa8($s0) +/* A2A54C 8024030C 8E020088 */ lw $v0, 0x88($s0) +/* A2A550 80240310 00621821 */ addu $v1, $v1, $v0 +/* A2A554 80240314 04610004 */ bgez $v1, .L80240328 +/* A2A558 80240318 AE0300A8 */ sw $v1, 0xa8($s0) +/* A2A55C 8024031C 3C020002 */ lui $v0, 2 +/* A2A560 80240320 080900CE */ j .L80240338 +/* A2A564 80240324 00621021 */ addu $v0, $v1, $v0 +.L80240328: +/* A2A568 80240328 3C040002 */ lui $a0, 2 +/* A2A56C 8024032C 0083102A */ slt $v0, $a0, $v1 +/* A2A570 80240330 10400002 */ beqz $v0, .L8024033C +/* A2A574 80240334 00641023 */ subu $v0, $v1, $a0 +.L80240338: +/* A2A578 80240338 AE0200A8 */ sw $v0, 0xa8($s0) +.L8024033C: +/* A2A57C 8024033C 8E0300AC */ lw $v1, 0xac($s0) +/* A2A580 80240340 8E02008C */ lw $v0, 0x8c($s0) +/* A2A584 80240344 00621821 */ addu $v1, $v1, $v0 +/* A2A588 80240348 04610004 */ bgez $v1, .L8024035C +/* A2A58C 8024034C AE0300AC */ sw $v1, 0xac($s0) +/* A2A590 80240350 3C020002 */ lui $v0, 2 +/* A2A594 80240354 080900DB */ j .L8024036C +/* A2A598 80240358 00621021 */ addu $v0, $v1, $v0 +.L8024035C: +/* A2A59C 8024035C 3C040002 */ lui $a0, 2 +/* A2A5A0 80240360 0083102A */ slt $v0, $a0, $v1 +/* A2A5A4 80240364 10400002 */ beqz $v0, .L80240370 +/* A2A5A8 80240368 00641023 */ subu $v0, $v1, $a0 +.L8024036C: +/* A2A5AC 8024036C AE0200AC */ sw $v0, 0xac($s0) +.L80240370: +/* A2A5B0 80240370 8E0300B0 */ lw $v1, 0xb0($s0) +/* A2A5B4 80240374 8E020090 */ lw $v0, 0x90($s0) +/* A2A5B8 80240378 00621821 */ addu $v1, $v1, $v0 +/* A2A5BC 8024037C 04610004 */ bgez $v1, .L80240390 +/* A2A5C0 80240380 AE0300B0 */ sw $v1, 0xb0($s0) +/* A2A5C4 80240384 3C020002 */ lui $v0, 2 +/* A2A5C8 80240388 080900E8 */ j .L802403A0 +/* A2A5CC 8024038C 00621021 */ addu $v0, $v1, $v0 +.L80240390: +/* A2A5D0 80240390 3C040002 */ lui $a0, 2 +/* A2A5D4 80240394 0083102A */ slt $v0, $a0, $v1 +/* A2A5D8 80240398 10400002 */ beqz $v0, .L802403A4 +/* A2A5DC 8024039C 00641023 */ subu $v0, $v1, $a0 +.L802403A0: +/* A2A5E0 802403A0 AE0200B0 */ sw $v0, 0xb0($s0) +.L802403A4: +/* A2A5E4 802403A4 8E0300B4 */ lw $v1, 0xb4($s0) +/* A2A5E8 802403A8 8E020094 */ lw $v0, 0x94($s0) +/* A2A5EC 802403AC 00621821 */ addu $v1, $v1, $v0 +/* A2A5F0 802403B0 04610004 */ bgez $v1, .L802403C4 +/* A2A5F4 802403B4 AE0300B4 */ sw $v1, 0xb4($s0) +/* A2A5F8 802403B8 3C020002 */ lui $v0, 2 +/* A2A5FC 802403BC 080900F5 */ j .L802403D4 +/* A2A600 802403C0 00621021 */ addu $v0, $v1, $v0 +.L802403C4: +/* A2A604 802403C4 3C040002 */ lui $a0, 2 +/* A2A608 802403C8 0083102A */ slt $v0, $a0, $v1 +/* A2A60C 802403CC 10400002 */ beqz $v0, .L802403D8 +/* A2A610 802403D0 00641023 */ subu $v0, $v1, $a0 +.L802403D4: +/* A2A614 802403D4 AE0200B4 */ sw $v0, 0xb4($s0) +.L802403D8: +/* A2A618 802403D8 8E040084 */ lw $a0, 0x84($s0) +/* A2A61C 802403DC 0C046F07 */ jal set_main_pan_u +/* A2A620 802403E0 8E0500A8 */ lw $a1, 0xa8($s0) +/* A2A624 802403E4 8E040084 */ lw $a0, 0x84($s0) +/* A2A628 802403E8 0C046F0D */ jal set_main_pan_v +/* A2A62C 802403EC 8E0500AC */ lw $a1, 0xac($s0) +/* A2A630 802403F0 8E040084 */ lw $a0, 0x84($s0) +/* A2A634 802403F4 0C046F13 */ jal set_aux_pan_u +/* A2A638 802403F8 8E0500B0 */ lw $a1, 0xb0($s0) +/* A2A63C 802403FC 8E040084 */ lw $a0, 0x84($s0) +/* A2A640 80240400 0C046F19 */ jal set_aux_pan_v +/* A2A644 80240404 8E0500B4 */ lw $a1, 0xb4($s0) +/* A2A648 80240408 8FBF0014 */ lw $ra, 0x14($sp) +/* A2A64C 8024040C 8FB00010 */ lw $s0, 0x10($sp) +/* A2A650 80240410 0000102D */ daddu $v0, $zero, $zero +/* A2A654 80240414 03E00008 */ jr $ra +/* A2A658 80240418 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240604.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240604.s deleted file mode 100644 index d7b7e43542..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240604.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240604 -/* A2A844 80240604 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2A848 80240608 AFBF0010 */ sw $ra, 0x10($sp) -/* A2A84C 8024060C 8C82000C */ lw $v0, 0xc($a0) -/* A2A850 80240610 0C0B1EAF */ jal get_variable -/* A2A854 80240614 8C450000 */ lw $a1, ($v0) -/* A2A858 80240618 0C0B1059 */ jal does_script_exist -/* A2A85C 8024061C 0040202D */ daddu $a0, $v0, $zero -/* A2A860 80240620 2C420001 */ sltiu $v0, $v0, 1 -/* A2A864 80240624 8FBF0010 */ lw $ra, 0x10($sp) -/* A2A868 80240628 00021040 */ sll $v0, $v0, 1 -/* A2A86C 8024062C 03E00008 */ jr $ra -/* A2A870 80240630 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240604_A2A844.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240604_A2A844.s new file mode 100644 index 0000000000..8f4bd38344 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240604_A2A844.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240604_A2A844 +/* A2A844 80240604 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2A848 80240608 AFBF0010 */ sw $ra, 0x10($sp) +/* A2A84C 8024060C 8C82000C */ lw $v0, 0xc($a0) +/* A2A850 80240610 0C0B1EAF */ jal get_variable +/* A2A854 80240614 8C450000 */ lw $a1, ($v0) +/* A2A858 80240618 0C0B1059 */ jal does_script_exist +/* A2A85C 8024061C 0040202D */ daddu $a0, $v0, $zero +/* A2A860 80240620 2C420001 */ sltiu $v0, $v0, 1 +/* A2A864 80240624 8FBF0010 */ lw $ra, 0x10($sp) +/* A2A868 80240628 00021040 */ sll $v0, $v0, 1 +/* A2A86C 8024062C 03E00008 */ jr $ra +/* A2A870 80240630 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634.s deleted file mode 100644 index 51fcc37a64..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240634 -/* A2A874 80240634 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A2A878 80240638 AFB10014 */ sw $s1, 0x14($sp) -/* A2A87C 8024063C 0080882D */ daddu $s1, $a0, $zero -/* A2A880 80240640 AFBF0018 */ sw $ra, 0x18($sp) -/* A2A884 80240644 AFB00010 */ sw $s0, 0x10($sp) -/* A2A888 80240648 8E30000C */ lw $s0, 0xc($s1) -/* A2A88C 8024064C 8E050000 */ lw $a1, ($s0) -/* A2A890 80240650 0C0B1EAF */ jal get_variable -/* A2A894 80240654 26100004 */ addiu $s0, $s0, 4 -/* A2A898 80240658 0220202D */ daddu $a0, $s1, $zero -/* A2A89C 8024065C 8E050000 */ lw $a1, ($s0) -/* A2A8A0 80240660 0C0B210B */ jal get_float_variable -/* A2A8A4 80240664 0040802D */ daddu $s0, $v0, $zero -/* A2A8A8 80240668 00108080 */ sll $s0, $s0, 2 -/* A2A8AC 8024066C 02308821 */ addu $s1, $s1, $s0 -/* A2A8B0 80240670 4600008D */ trunc.w.s $f2, $f0 -/* A2A8B4 80240674 E6220084 */ swc1 $f2, 0x84($s1) -/* A2A8B8 80240678 8FBF0018 */ lw $ra, 0x18($sp) -/* A2A8BC 8024067C 8FB10014 */ lw $s1, 0x14($sp) -/* A2A8C0 80240680 8FB00010 */ lw $s0, 0x10($sp) -/* A2A8C4 80240684 24020002 */ addiu $v0, $zero, 2 -/* A2A8C8 80240688 03E00008 */ jr $ra -/* A2A8CC 8024068C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s new file mode 100644 index 0000000000..0649af0285 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240634_A2A874.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240634_A2A874 +/* A2A874 80240634 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A2A878 80240638 AFB10014 */ sw $s1, 0x14($sp) +/* A2A87C 8024063C 0080882D */ daddu $s1, $a0, $zero +/* A2A880 80240640 AFBF0018 */ sw $ra, 0x18($sp) +/* A2A884 80240644 AFB00010 */ sw $s0, 0x10($sp) +/* A2A888 80240648 8E30000C */ lw $s0, 0xc($s1) +/* A2A88C 8024064C 8E050000 */ lw $a1, ($s0) +/* A2A890 80240650 0C0B1EAF */ jal get_variable +/* A2A894 80240654 26100004 */ addiu $s0, $s0, 4 +/* A2A898 80240658 0220202D */ daddu $a0, $s1, $zero +/* A2A89C 8024065C 8E050000 */ lw $a1, ($s0) +/* A2A8A0 80240660 0C0B210B */ jal get_float_variable +/* A2A8A4 80240664 0040802D */ daddu $s0, $v0, $zero +/* A2A8A8 80240668 00108080 */ sll $s0, $s0, 2 +/* A2A8AC 8024066C 02308821 */ addu $s1, $s1, $s0 +/* A2A8B0 80240670 4600008D */ trunc.w.s $f2, $f0 +/* A2A8B4 80240674 E6220084 */ swc1 $f2, 0x84($s1) +/* A2A8B8 80240678 8FBF0018 */ lw $ra, 0x18($sp) +/* A2A8BC 8024067C 8FB10014 */ lw $s1, 0x14($sp) +/* A2A8C0 80240680 8FB00010 */ lw $s0, 0x10($sp) +/* A2A8C4 80240684 24020002 */ addiu $v0, $zero, 2 +/* A2A8C8 80240688 03E00008 */ jr $ra +/* A2A8CC 8024068C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690.s deleted file mode 100644 index cd10f1de02..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690.s +++ /dev/null @@ -1,108 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240690 -/* A2A8D0 80240690 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A2A8D4 80240694 AFB00010 */ sw $s0, 0x10($sp) -/* A2A8D8 80240698 0080802D */ daddu $s0, $a0, $zero -/* A2A8DC 8024069C 3C02F24A */ lui $v0, 0xf24a -/* A2A8E0 802406A0 34427A80 */ ori $v0, $v0, 0x7a80 -/* A2A8E4 802406A4 3C03F24C */ lui $v1, 0xf24c -/* A2A8E8 802406A8 34630A80 */ ori $v1, $v1, 0xa80 -/* A2A8EC 802406AC 2404000A */ addiu $a0, $zero, 0xa -/* A2A8F0 802406B0 AFBF0014 */ sw $ra, 0x14($sp) -/* A2A8F4 802406B4 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* A2A8F8 802406B8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* A2A8FC 802406BC F7B60020 */ sdc1 $f22, 0x20($sp) -/* A2A900 802406C0 F7B40018 */ sdc1 $f20, 0x18($sp) -/* A2A904 802406C4 C61A0088 */ lwc1 $f26, 0x88($s0) -/* A2A908 802406C8 4680D6A0 */ cvt.s.w $f26, $f26 -/* A2A90C 802406CC 3C014334 */ lui $at, 0x4334 -/* A2A910 802406D0 44810000 */ mtc1 $at, $f0 -/* A2A914 802406D4 3C014049 */ lui $at, 0x4049 -/* A2A918 802406D8 34210FD8 */ ori $at, $at, 0xfd8 -/* A2A91C 802406DC 44811000 */ mtc1 $at, $f2 -/* A2A920 802406E0 4600D682 */ mul.s $f26, $f26, $f0 -/* A2A924 802406E4 00000000 */ nop -/* A2A928 802406E8 C616008C */ lwc1 $f22, 0x8c($s0) -/* A2A92C 802406EC 4680B5A0 */ cvt.s.w $f22, $f22 -/* A2A930 802406F0 AE02008C */ sw $v0, 0x8c($s0) -/* A2A934 802406F4 AE030090 */ sw $v1, 0x90($s0) -/* A2A938 802406F8 AE020094 */ sw $v0, 0x94($s0) -/* A2A93C 802406FC 0C00A67F */ jal rand_int -/* A2A940 80240700 4602D683 */ div.s $f26, $f26, $f2 -/* A2A944 80240704 4482A000 */ mtc1 $v0, $f20 -/* A2A948 80240708 00000000 */ nop -/* A2A94C 8024070C 4680A520 */ cvt.s.w $f20, $f20 -/* A2A950 80240710 3C014040 */ lui $at, 0x4040 -/* A2A954 80240714 44810000 */ mtc1 $at, $f0 -/* A2A958 80240718 4616A503 */ div.s $f20, $f20, $f22 -/* A2A95C 8024071C 4600A500 */ add.s $f20, $f20, $f0 -/* A2A960 80240720 0C00A874 */ jal cos_rad -/* A2A964 80240724 4600D306 */ mov.s $f12, $f26 -/* A2A968 80240728 4600A002 */ mul.s $f0, $f20, $f0 -/* A2A96C 8024072C 00000000 */ nop -/* A2A970 80240730 3C014480 */ lui $at, 0x4480 -/* A2A974 80240734 4481C000 */ mtc1 $at, $f24 -/* A2A978 80240738 00000000 */ nop -/* A2A97C 8024073C 46180002 */ mul.s $f0, $f0, $f24 -/* A2A980 80240740 00000000 */ nop -/* A2A984 80240744 3C01CD5B */ lui $at, 0xcd5b -/* A2A988 80240748 34215858 */ ori $at, $at, 0x5858 -/* A2A98C 8024074C 4481B000 */ mtc1 $at, $f22 -/* A2A990 80240750 00000000 */ nop -/* A2A994 80240754 46160000 */ add.s $f0, $f0, $f22 -/* A2A998 80240758 4600010D */ trunc.w.s $f4, $f0 -/* A2A99C 8024075C E60400AC */ swc1 $f4, 0xac($s0) -/* A2A9A0 80240760 0C00A67F */ jal rand_int -/* A2A9A4 80240764 2404000F */ addiu $a0, $zero, 0xf -/* A2A9A8 80240768 24420005 */ addiu $v0, $v0, 5 -/* A2A9AC 8024076C 44820000 */ mtc1 $v0, $f0 -/* A2A9B0 80240770 00000000 */ nop -/* A2A9B4 80240774 46800020 */ cvt.s.w $f0, $f0 -/* A2A9B8 80240778 46180002 */ mul.s $f0, $f0, $f24 -/* A2A9BC 8024077C 00000000 */ nop -/* A2A9C0 80240780 46160000 */ add.s $f0, $f0, $f22 -/* A2A9C4 80240784 4600010D */ trunc.w.s $f4, $f0 -/* A2A9C8 80240788 E60400B0 */ swc1 $f4, 0xb0($s0) -/* A2A9CC 8024078C 0C00A85B */ jal sin_rad -/* A2A9D0 80240790 4600D306 */ mov.s $f12, $f26 -/* A2A9D4 80240794 4600A502 */ mul.s $f20, $f20, $f0 -/* A2A9D8 80240798 00000000 */ nop -/* A2A9DC 8024079C 4618A502 */ mul.s $f20, $f20, $f24 -/* A2A9E0 802407A0 00000000 */ nop -/* A2A9E4 802407A4 4616A500 */ add.s $f20, $f20, $f22 -/* A2A9E8 802407A8 4600A10D */ trunc.w.s $f4, $f20 -/* A2A9EC 802407AC E60400B4 */ swc1 $f4, 0xb4($s0) -/* A2A9F0 802407B0 0C00A67F */ jal rand_int -/* A2A9F4 802407B4 2404000A */ addiu $a0, $zero, 0xa -/* A2A9F8 802407B8 2442000A */ addiu $v0, $v0, 0xa -/* A2A9FC 802407BC 44820000 */ mtc1 $v0, $f0 -/* A2AA00 802407C0 00000000 */ nop -/* A2AA04 802407C4 46800020 */ cvt.s.w $f0, $f0 -/* A2AA08 802407C8 3C018025 */ lui $at, 0x8025 -/* A2AA0C 802407CC D422F1D0 */ ldc1 $f2, -0xe30($at) -/* A2AA10 802407D0 46000021 */ cvt.d.s $f0, $f0 -/* A2AA14 802407D4 46220002 */ mul.d $f0, $f0, $f2 -/* A2AA18 802407D8 00000000 */ nop -/* A2AA1C 802407DC 3C014090 */ lui $at, 0x4090 -/* A2AA20 802407E0 44811800 */ mtc1 $at, $f3 -/* A2AA24 802407E4 44801000 */ mtc1 $zero, $f2 -/* A2AA28 802407E8 00000000 */ nop -/* A2AA2C 802407EC 46220002 */ mul.d $f0, $f0, $f2 -/* A2AA30 802407F0 00000000 */ nop -/* A2AA34 802407F4 3C018025 */ lui $at, 0x8025 -/* A2AA38 802407F8 D422F1D8 */ ldc1 $f2, -0xe28($at) -/* A2AA3C 802407FC 46220000 */ add.d $f0, $f0, $f2 -/* A2AA40 80240800 4620010D */ trunc.w.d $f4, $f0 -/* A2AA44 80240804 E60400B8 */ swc1 $f4, 0xb8($s0) -/* A2AA48 80240808 8FBF0014 */ lw $ra, 0x14($sp) -/* A2AA4C 8024080C 8FB00010 */ lw $s0, 0x10($sp) -/* A2AA50 80240810 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* A2AA54 80240814 D7B80028 */ ldc1 $f24, 0x28($sp) -/* A2AA58 80240818 D7B60020 */ ldc1 $f22, 0x20($sp) -/* A2AA5C 8024081C D7B40018 */ ldc1 $f20, 0x18($sp) -/* A2AA60 80240820 24020002 */ addiu $v0, $zero, 2 -/* A2AA64 80240824 03E00008 */ jr $ra -/* A2AA68 80240828 27BD0038 */ addiu $sp, $sp, 0x38 -/* A2AA6C 8024082C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s new file mode 100644 index 0000000000..b103891291 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2A240/func_80240690_A2A8D0.s @@ -0,0 +1,108 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240690_A2A8D0 +/* A2A8D0 80240690 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A2A8D4 80240694 AFB00010 */ sw $s0, 0x10($sp) +/* A2A8D8 80240698 0080802D */ daddu $s0, $a0, $zero +/* A2A8DC 8024069C 3C02F24A */ lui $v0, 0xf24a +/* A2A8E0 802406A0 34427A80 */ ori $v0, $v0, 0x7a80 +/* A2A8E4 802406A4 3C03F24C */ lui $v1, 0xf24c +/* A2A8E8 802406A8 34630A80 */ ori $v1, $v1, 0xa80 +/* A2A8EC 802406AC 2404000A */ addiu $a0, $zero, 0xa +/* A2A8F0 802406B0 AFBF0014 */ sw $ra, 0x14($sp) +/* A2A8F4 802406B4 F7BA0030 */ sdc1 $f26, 0x30($sp) +/* A2A8F8 802406B8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* A2A8FC 802406BC F7B60020 */ sdc1 $f22, 0x20($sp) +/* A2A900 802406C0 F7B40018 */ sdc1 $f20, 0x18($sp) +/* A2A904 802406C4 C61A0088 */ lwc1 $f26, 0x88($s0) +/* A2A908 802406C8 4680D6A0 */ cvt.s.w $f26, $f26 +/* A2A90C 802406CC 3C014334 */ lui $at, 0x4334 +/* A2A910 802406D0 44810000 */ mtc1 $at, $f0 +/* A2A914 802406D4 3C014049 */ lui $at, 0x4049 +/* A2A918 802406D8 34210FD8 */ ori $at, $at, 0xfd8 +/* A2A91C 802406DC 44811000 */ mtc1 $at, $f2 +/* A2A920 802406E0 4600D682 */ mul.s $f26, $f26, $f0 +/* A2A924 802406E4 00000000 */ nop +/* A2A928 802406E8 C616008C */ lwc1 $f22, 0x8c($s0) +/* A2A92C 802406EC 4680B5A0 */ cvt.s.w $f22, $f22 +/* A2A930 802406F0 AE02008C */ sw $v0, 0x8c($s0) +/* A2A934 802406F4 AE030090 */ sw $v1, 0x90($s0) +/* A2A938 802406F8 AE020094 */ sw $v0, 0x94($s0) +/* A2A93C 802406FC 0C00A67F */ jal rand_int +/* A2A940 80240700 4602D683 */ div.s $f26, $f26, $f2 +/* A2A944 80240704 4482A000 */ mtc1 $v0, $f20 +/* A2A948 80240708 00000000 */ nop +/* A2A94C 8024070C 4680A520 */ cvt.s.w $f20, $f20 +/* A2A950 80240710 3C014040 */ lui $at, 0x4040 +/* A2A954 80240714 44810000 */ mtc1 $at, $f0 +/* A2A958 80240718 4616A503 */ div.s $f20, $f20, $f22 +/* A2A95C 8024071C 4600A500 */ add.s $f20, $f20, $f0 +/* A2A960 80240720 0C00A874 */ jal cos_rad +/* A2A964 80240724 4600D306 */ mov.s $f12, $f26 +/* A2A968 80240728 4600A002 */ mul.s $f0, $f20, $f0 +/* A2A96C 8024072C 00000000 */ nop +/* A2A970 80240730 3C014480 */ lui $at, 0x4480 +/* A2A974 80240734 4481C000 */ mtc1 $at, $f24 +/* A2A978 80240738 00000000 */ nop +/* A2A97C 8024073C 46180002 */ mul.s $f0, $f0, $f24 +/* A2A980 80240740 00000000 */ nop +/* A2A984 80240744 3C01CD5B */ lui $at, 0xcd5b +/* A2A988 80240748 34215858 */ ori $at, $at, 0x5858 +/* A2A98C 8024074C 4481B000 */ mtc1 $at, $f22 +/* A2A990 80240750 00000000 */ nop +/* A2A994 80240754 46160000 */ add.s $f0, $f0, $f22 +/* A2A998 80240758 4600010D */ trunc.w.s $f4, $f0 +/* A2A99C 8024075C E60400AC */ swc1 $f4, 0xac($s0) +/* A2A9A0 80240760 0C00A67F */ jal rand_int +/* A2A9A4 80240764 2404000F */ addiu $a0, $zero, 0xf +/* A2A9A8 80240768 24420005 */ addiu $v0, $v0, 5 +/* A2A9AC 8024076C 44820000 */ mtc1 $v0, $f0 +/* A2A9B0 80240770 00000000 */ nop +/* A2A9B4 80240774 46800020 */ cvt.s.w $f0, $f0 +/* A2A9B8 80240778 46180002 */ mul.s $f0, $f0, $f24 +/* A2A9BC 8024077C 00000000 */ nop +/* A2A9C0 80240780 46160000 */ add.s $f0, $f0, $f22 +/* A2A9C4 80240784 4600010D */ trunc.w.s $f4, $f0 +/* A2A9C8 80240788 E60400B0 */ swc1 $f4, 0xb0($s0) +/* A2A9CC 8024078C 0C00A85B */ jal sin_rad +/* A2A9D0 80240790 4600D306 */ mov.s $f12, $f26 +/* A2A9D4 80240794 4600A502 */ mul.s $f20, $f20, $f0 +/* A2A9D8 80240798 00000000 */ nop +/* A2A9DC 8024079C 4618A502 */ mul.s $f20, $f20, $f24 +/* A2A9E0 802407A0 00000000 */ nop +/* A2A9E4 802407A4 4616A500 */ add.s $f20, $f20, $f22 +/* A2A9E8 802407A8 4600A10D */ trunc.w.s $f4, $f20 +/* A2A9EC 802407AC E60400B4 */ swc1 $f4, 0xb4($s0) +/* A2A9F0 802407B0 0C00A67F */ jal rand_int +/* A2A9F4 802407B4 2404000A */ addiu $a0, $zero, 0xa +/* A2A9F8 802407B8 2442000A */ addiu $v0, $v0, 0xa +/* A2A9FC 802407BC 44820000 */ mtc1 $v0, $f0 +/* A2AA00 802407C0 00000000 */ nop +/* A2AA04 802407C4 46800020 */ cvt.s.w $f0, $f0 +/* A2AA08 802407C8 3C018025 */ lui $at, 0x8025 +/* A2AA0C 802407CC D422F1D0 */ ldc1 $f2, -0xe30($at) +/* A2AA10 802407D0 46000021 */ cvt.d.s $f0, $f0 +/* A2AA14 802407D4 46220002 */ mul.d $f0, $f0, $f2 +/* A2AA18 802407D8 00000000 */ nop +/* A2AA1C 802407DC 3C014090 */ lui $at, 0x4090 +/* A2AA20 802407E0 44811800 */ mtc1 $at, $f3 +/* A2AA24 802407E4 44801000 */ mtc1 $zero, $f2 +/* A2AA28 802407E8 00000000 */ nop +/* A2AA2C 802407EC 46220002 */ mul.d $f0, $f0, $f2 +/* A2AA30 802407F0 00000000 */ nop +/* A2AA34 802407F4 3C018025 */ lui $at, 0x8025 +/* A2AA38 802407F8 D422F1D8 */ ldc1 $f2, -0xe28($at) +/* A2AA3C 802407FC 46220000 */ add.d $f0, $f0, $f2 +/* A2AA40 80240800 4620010D */ trunc.w.d $f4, $f0 +/* A2AA44 80240804 E60400B8 */ swc1 $f4, 0xb8($s0) +/* A2AA48 80240808 8FBF0014 */ lw $ra, 0x14($sp) +/* A2AA4C 8024080C 8FB00010 */ lw $s0, 0x10($sp) +/* A2AA50 80240810 D7BA0030 */ ldc1 $f26, 0x30($sp) +/* A2AA54 80240814 D7B80028 */ ldc1 $f24, 0x28($sp) +/* A2AA58 80240818 D7B60020 */ ldc1 $f22, 0x20($sp) +/* A2AA5C 8024081C D7B40018 */ ldc1 $f20, 0x18($sp) +/* A2AA60 80240820 24020002 */ addiu $v0, $zero, 2 +/* A2AA64 80240824 03E00008 */ jr $ra +/* A2AA68 80240828 27BD0038 */ addiu $sp, $sp, 0x38 +/* A2AA6C 8024082C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830.s b/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830.s deleted file mode 100644 index dd5a35ff50..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240830 -/* A2AA70 80240830 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2AA74 80240834 3C028011 */ lui $v0, %hi(gPlayerData) -/* A2AA78 80240838 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* A2AA7C 8024083C AFBF0010 */ sw $ra, 0x10($sp) -/* A2AA80 80240840 90450003 */ lbu $a1, 3($v0) -/* A2AA84 80240844 90460006 */ lbu $a2, 6($v0) -/* A2AA88 80240848 8044028E */ lb $a0, 0x28e($v0) -/* A2AA8C 8024084C 24030001 */ addiu $v1, $zero, 1 -/* A2AA90 80240850 A0430292 */ sb $v1, 0x292($v0) -/* A2AA94 80240854 00042200 */ sll $a0, $a0, 8 -/* A2AA98 80240858 A0450002 */ sb $a1, 2($v0) -/* A2AA9C 8024085C A0460005 */ sb $a2, 5($v0) -/* A2AAA0 80240860 0C03A6DB */ jal sync_status_menu -/* A2AAA4 80240864 A4440290 */ sh $a0, 0x290($v0) -/* A2AAA8 80240868 8FBF0010 */ lw $ra, 0x10($sp) -/* A2AAAC 8024086C 24020002 */ addiu $v0, $zero, 2 -/* A2AAB0 80240870 03E00008 */ jr $ra -/* A2AAB4 80240874 27BD0018 */ addiu $sp, $sp, 0x18 -/* A2AAB8 80240878 00000000 */ nop -/* A2AABC 8024087C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s b/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s new file mode 100644 index 0000000000..aa96ccb8ca --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AA70/func_80240830_A2AA70.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240830_A2AA70 +/* A2AA70 80240830 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2AA74 80240834 3C028011 */ lui $v0, %hi(gPlayerData) +/* A2AA78 80240838 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* A2AA7C 8024083C AFBF0010 */ sw $ra, 0x10($sp) +/* A2AA80 80240840 90450003 */ lbu $a1, 3($v0) +/* A2AA84 80240844 90460006 */ lbu $a2, 6($v0) +/* A2AA88 80240848 8044028E */ lb $a0, 0x28e($v0) +/* A2AA8C 8024084C 24030001 */ addiu $v1, $zero, 1 +/* A2AA90 80240850 A0430292 */ sb $v1, 0x292($v0) +/* A2AA94 80240854 00042200 */ sll $a0, $a0, 8 +/* A2AA98 80240858 A0450002 */ sb $a1, 2($v0) +/* A2AA9C 8024085C A0460005 */ sb $a2, 5($v0) +/* A2AAA0 80240860 0C03A6DB */ jal sync_status_menu +/* A2AAA4 80240864 A4440290 */ sh $a0, 0x290($v0) +/* A2AAA8 80240868 8FBF0010 */ lw $ra, 0x10($sp) +/* A2AAAC 8024086C 24020002 */ addiu $v0, $zero, 2 +/* A2AAB0 80240870 03E00008 */ jr $ra +/* A2AAB4 80240874 27BD0018 */ addiu $sp, $sp, 0x18 +/* A2AAB8 80240878 00000000 */ nop +/* A2AABC 8024087C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4.s deleted file mode 100644 index 3d6d80a5f1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4.s +++ /dev/null @@ -1,248 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409C4 -/* A2AC04 802409C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A2AC08 802409C8 AFB1001C */ sw $s1, 0x1c($sp) -/* A2AC0C 802409CC 0080882D */ daddu $s1, $a0, $zero -/* A2AC10 802409D0 AFBF0020 */ sw $ra, 0x20($sp) -/* A2AC14 802409D4 AFB00018 */ sw $s0, 0x18($sp) -/* A2AC18 802409D8 10A0003B */ beqz $a1, .L80240AC8 -/* A2AC1C 802409DC 8E30000C */ lw $s0, 0xc($s1) -/* A2AC20 802409E0 3C048025 */ lui $a0, 0x8025 -/* A2AC24 802409E4 2484F2A0 */ addiu $a0, $a0, -0xd60 -/* A2AC28 802409E8 3C058025 */ lui $a1, 0x8025 -/* A2AC2C 802409EC 24A5F2A1 */ addiu $a1, $a1, -0xd5f -/* A2AC30 802409F0 3C068025 */ lui $a2, 0x8025 -/* A2AC34 802409F4 24C6F2A2 */ addiu $a2, $a2, -0xd5e -/* A2AC38 802409F8 3C078025 */ lui $a3, 0x8025 -/* A2AC3C 802409FC 24E7F2A3 */ addiu $a3, $a3, -0xd5d -/* A2AC40 80240A00 3C028025 */ lui $v0, 0x8025 -/* A2AC44 80240A04 2442F2A4 */ addiu $v0, $v0, -0xd5c -/* A2AC48 80240A08 AFA20010 */ sw $v0, 0x10($sp) -/* A2AC4C 80240A0C 3C028025 */ lui $v0, 0x8025 -/* A2AC50 80240A10 2442F2A5 */ addiu $v0, $v0, -0xd5b -/* A2AC54 80240A14 0C046FF5 */ jal func_8011BFD4 -/* A2AC58 80240A18 AFA20014 */ sw $v0, 0x14($sp) -/* A2AC5C 80240A1C 8E050000 */ lw $a1, ($s0) -/* A2AC60 80240A20 26100004 */ addiu $s0, $s0, 4 -/* A2AC64 80240A24 0C0B1EAF */ jal get_variable -/* A2AC68 80240A28 0220202D */ daddu $a0, $s1, $zero -/* A2AC6C 80240A2C 3C018025 */ lui $at, 0x8025 -/* A2AC70 80240A30 AC22F2A8 */ sw $v0, -0xd58($at) -/* A2AC74 80240A34 8E050000 */ lw $a1, ($s0) -/* A2AC78 80240A38 26100004 */ addiu $s0, $s0, 4 -/* A2AC7C 80240A3C 0C0B1EAF */ jal get_variable -/* A2AC80 80240A40 0220202D */ daddu $a0, $s1, $zero -/* A2AC84 80240A44 3C018025 */ lui $at, 0x8025 -/* A2AC88 80240A48 AC22F2AC */ sw $v0, -0xd54($at) -/* A2AC8C 80240A4C 8E050000 */ lw $a1, ($s0) -/* A2AC90 80240A50 26100004 */ addiu $s0, $s0, 4 -/* A2AC94 80240A54 0C0B1EAF */ jal get_variable -/* A2AC98 80240A58 0220202D */ daddu $a0, $s1, $zero -/* A2AC9C 80240A5C 3C018025 */ lui $at, 0x8025 -/* A2ACA0 80240A60 AC22F2B0 */ sw $v0, -0xd50($at) -/* A2ACA4 80240A64 8E050000 */ lw $a1, ($s0) -/* A2ACA8 80240A68 26100004 */ addiu $s0, $s0, 4 -/* A2ACAC 80240A6C 0C0B1EAF */ jal get_variable -/* A2ACB0 80240A70 0220202D */ daddu $a0, $s1, $zero -/* A2ACB4 80240A74 3C018025 */ lui $at, 0x8025 -/* A2ACB8 80240A78 AC22F2B4 */ sw $v0, -0xd4c($at) -/* A2ACBC 80240A7C 8E050000 */ lw $a1, ($s0) -/* A2ACC0 80240A80 26100004 */ addiu $s0, $s0, 4 -/* A2ACC4 80240A84 0C0B1EAF */ jal get_variable -/* A2ACC8 80240A88 0220202D */ daddu $a0, $s1, $zero -/* A2ACCC 80240A8C 3C018025 */ lui $at, 0x8025 -/* A2ACD0 80240A90 AC22F2B8 */ sw $v0, -0xd48($at) -/* A2ACD4 80240A94 8E050000 */ lw $a1, ($s0) -/* A2ACD8 80240A98 26100004 */ addiu $s0, $s0, 4 -/* A2ACDC 80240A9C 0C0B1EAF */ jal get_variable -/* A2ACE0 80240AA0 0220202D */ daddu $a0, $s1, $zero -/* A2ACE4 80240AA4 3C018025 */ lui $at, 0x8025 -/* A2ACE8 80240AA8 AC22F2BC */ sw $v0, -0xd44($at) -/* A2ACEC 80240AAC 8E050000 */ lw $a1, ($s0) -/* A2ACF0 80240AB0 0C0B1EAF */ jal get_variable -/* A2ACF4 80240AB4 0220202D */ daddu $a0, $s1, $zero -/* A2ACF8 80240AB8 3C018025 */ lui $at, 0x8025 -/* A2ACFC 80240ABC AC22F2C0 */ sw $v0, -0xd40($at) -/* A2AD00 80240AC0 3C018025 */ lui $at, 0x8025 -/* A2AD04 80240AC4 AC20F2C4 */ sw $zero, -0xd3c($at) -.L80240AC8: -/* A2AD08 80240AC8 3C118025 */ lui $s1, 0x8025 -/* A2AD0C 80240ACC 2631F2C0 */ addiu $s1, $s1, -0xd40 -/* A2AD10 80240AD0 8E2F0000 */ lw $t7, ($s1) -/* A2AD14 80240AD4 19E0008A */ blez $t7, .L80240D00 -/* A2AD18 80240AD8 00000000 */ nop -/* A2AD1C 80240ADC 3C108025 */ lui $s0, 0x8025 -/* A2AD20 80240AE0 2610F2C4 */ addiu $s0, $s0, -0xd3c -/* A2AD24 80240AE4 8E030000 */ lw $v1, ($s0) -/* A2AD28 80240AE8 006F102A */ slt $v0, $v1, $t7 -/* A2AD2C 80240AEC 10400093 */ beqz $v0, .L80240D3C -/* A2AD30 80240AF0 24630001 */ addiu $v1, $v1, 1 -/* A2AD34 80240AF4 3C048025 */ lui $a0, 0x8025 -/* A2AD38 80240AF8 9084F2A0 */ lbu $a0, -0xd60($a0) -/* A2AD3C 80240AFC 3C028025 */ lui $v0, 0x8025 -/* A2AD40 80240B00 8C42F2A8 */ lw $v0, -0xd58($v0) -/* A2AD44 80240B04 00441023 */ subu $v0, $v0, $a0 -/* A2AD48 80240B08 00430018 */ mult $v0, $v1 -/* A2AD4C 80240B0C 00004012 */ mflo $t0 -/* A2AD50 80240B10 00000000 */ nop -/* A2AD54 80240B14 15E00002 */ bnez $t7, .L80240B20 -/* A2AD58 80240B18 010F001A */ div $zero, $t0, $t7 -/* A2AD5C 80240B1C 0007000D */ break 7 -.L80240B20: -/* A2AD60 80240B20 2401FFFF */ addiu $at, $zero, -1 -/* A2AD64 80240B24 15E10004 */ bne $t7, $at, .L80240B38 -/* A2AD68 80240B28 3C018000 */ lui $at, 0x8000 -/* A2AD6C 80240B2C 15010002 */ bne $t0, $at, .L80240B38 -/* A2AD70 80240B30 00000000 */ nop -/* A2AD74 80240B34 0006000D */ break 6 -.L80240B38: -/* A2AD78 80240B38 00007012 */ mflo $t6 -/* A2AD7C 80240B3C 3C058025 */ lui $a1, 0x8025 -/* A2AD80 80240B40 90A5F2A1 */ lbu $a1, -0xd5f($a1) -/* A2AD84 80240B44 3C028025 */ lui $v0, 0x8025 -/* A2AD88 80240B48 8C42F2AC */ lw $v0, -0xd54($v0) -/* A2AD8C 80240B4C 00451023 */ subu $v0, $v0, $a1 -/* A2AD90 80240B50 00430018 */ mult $v0, $v1 -/* A2AD94 80240B54 00004012 */ mflo $t0 -/* A2AD98 80240B58 00000000 */ nop -/* A2AD9C 80240B5C 15E00002 */ bnez $t7, .L80240B68 -/* A2ADA0 80240B60 010F001A */ div $zero, $t0, $t7 -/* A2ADA4 80240B64 0007000D */ break 7 -.L80240B68: -/* A2ADA8 80240B68 2401FFFF */ addiu $at, $zero, -1 -/* A2ADAC 80240B6C 15E10004 */ bne $t7, $at, .L80240B80 -/* A2ADB0 80240B70 3C018000 */ lui $at, 0x8000 -/* A2ADB4 80240B74 15010002 */ bne $t0, $at, .L80240B80 -/* A2ADB8 80240B78 00000000 */ nop -/* A2ADBC 80240B7C 0006000D */ break 6 -.L80240B80: -/* A2ADC0 80240B80 00006812 */ mflo $t5 -/* A2ADC4 80240B84 3C068025 */ lui $a2, 0x8025 -/* A2ADC8 80240B88 90C6F2A2 */ lbu $a2, -0xd5e($a2) -/* A2ADCC 80240B8C 3C028025 */ lui $v0, 0x8025 -/* A2ADD0 80240B90 8C42F2B0 */ lw $v0, -0xd50($v0) -/* A2ADD4 80240B94 00461023 */ subu $v0, $v0, $a2 -/* A2ADD8 80240B98 00430018 */ mult $v0, $v1 -/* A2ADDC 80240B9C 00004012 */ mflo $t0 -/* A2ADE0 80240BA0 00000000 */ nop -/* A2ADE4 80240BA4 15E00002 */ bnez $t7, .L80240BB0 -/* A2ADE8 80240BA8 010F001A */ div $zero, $t0, $t7 -/* A2ADEC 80240BAC 0007000D */ break 7 -.L80240BB0: -/* A2ADF0 80240BB0 2401FFFF */ addiu $at, $zero, -1 -/* A2ADF4 80240BB4 15E10004 */ bne $t7, $at, .L80240BC8 -/* A2ADF8 80240BB8 3C018000 */ lui $at, 0x8000 -/* A2ADFC 80240BBC 15010002 */ bne $t0, $at, .L80240BC8 -/* A2AE00 80240BC0 00000000 */ nop -/* A2AE04 80240BC4 0006000D */ break 6 -.L80240BC8: -/* A2AE08 80240BC8 00006012 */ mflo $t4 -/* A2AE0C 80240BCC 3C078025 */ lui $a3, 0x8025 -/* A2AE10 80240BD0 90E7F2A3 */ lbu $a3, -0xd5d($a3) -/* A2AE14 80240BD4 3C028025 */ lui $v0, 0x8025 -/* A2AE18 80240BD8 8C42F2B4 */ lw $v0, -0xd4c($v0) -/* A2AE1C 80240BDC 00471023 */ subu $v0, $v0, $a3 -/* A2AE20 80240BE0 00430018 */ mult $v0, $v1 -/* A2AE24 80240BE4 00004012 */ mflo $t0 -/* A2AE28 80240BE8 00000000 */ nop -/* A2AE2C 80240BEC 15E00002 */ bnez $t7, .L80240BF8 -/* A2AE30 80240BF0 010F001A */ div $zero, $t0, $t7 -/* A2AE34 80240BF4 0007000D */ break 7 -.L80240BF8: -/* A2AE38 80240BF8 2401FFFF */ addiu $at, $zero, -1 -/* A2AE3C 80240BFC 15E10004 */ bne $t7, $at, .L80240C10 -/* A2AE40 80240C00 3C018000 */ lui $at, 0x8000 -/* A2AE44 80240C04 15010002 */ bne $t0, $at, .L80240C10 -/* A2AE48 80240C08 00000000 */ nop -/* A2AE4C 80240C0C 0006000D */ break 6 -.L80240C10: -/* A2AE50 80240C10 00005812 */ mflo $t3 -/* A2AE54 80240C14 3C098025 */ lui $t1, 0x8025 -/* A2AE58 80240C18 9129F2A4 */ lbu $t1, -0xd5c($t1) -/* A2AE5C 80240C1C 3C028025 */ lui $v0, 0x8025 -/* A2AE60 80240C20 8C42F2B8 */ lw $v0, -0xd48($v0) -/* A2AE64 80240C24 00491023 */ subu $v0, $v0, $t1 -/* A2AE68 80240C28 00430018 */ mult $v0, $v1 -/* A2AE6C 80240C2C 00004012 */ mflo $t0 -/* A2AE70 80240C30 00000000 */ nop -/* A2AE74 80240C34 15E00002 */ bnez $t7, .L80240C40 -/* A2AE78 80240C38 010F001A */ div $zero, $t0, $t7 -/* A2AE7C 80240C3C 0007000D */ break 7 -.L80240C40: -/* A2AE80 80240C40 2401FFFF */ addiu $at, $zero, -1 -/* A2AE84 80240C44 15E10004 */ bne $t7, $at, .L80240C58 -/* A2AE88 80240C48 3C018000 */ lui $at, 0x8000 -/* A2AE8C 80240C4C 15010002 */ bne $t0, $at, .L80240C58 -/* A2AE90 80240C50 00000000 */ nop -/* A2AE94 80240C54 0006000D */ break 6 -.L80240C58: -/* A2AE98 80240C58 00005012 */ mflo $t2 -/* A2AE9C 80240C5C 3C088025 */ lui $t0, 0x8025 -/* A2AEA0 80240C60 9108F2A5 */ lbu $t0, -0xd5b($t0) -/* A2AEA4 80240C64 3C028025 */ lui $v0, 0x8025 -/* A2AEA8 80240C68 8C42F2BC */ lw $v0, -0xd44($v0) -/* A2AEAC 80240C6C 00481023 */ subu $v0, $v0, $t0 -/* A2AEB0 80240C70 00430018 */ mult $v0, $v1 -/* A2AEB4 80240C74 0000C812 */ mflo $t9 -/* A2AEB8 80240C78 00000000 */ nop -/* A2AEBC 80240C7C 15E00002 */ bnez $t7, .L80240C88 -/* A2AEC0 80240C80 032F001A */ div $zero, $t9, $t7 -/* A2AEC4 80240C84 0007000D */ break 7 -.L80240C88: -/* A2AEC8 80240C88 2401FFFF */ addiu $at, $zero, -1 -/* A2AECC 80240C8C 15E10004 */ bne $t7, $at, .L80240CA0 -/* A2AED0 80240C90 3C018000 */ lui $at, 0x8000 -/* A2AED4 80240C94 17210002 */ bne $t9, $at, .L80240CA0 -/* A2AED8 80240C98 00000000 */ nop -/* A2AEDC 80240C9C 0006000D */ break 6 -.L80240CA0: -/* A2AEE0 80240CA0 00001012 */ mflo $v0 -/* A2AEE4 80240CA4 AE030000 */ sw $v1, ($s0) -/* A2AEE8 80240CA8 008E2021 */ addu $a0, $a0, $t6 -/* A2AEEC 80240CAC 308400FF */ andi $a0, $a0, 0xff -/* A2AEF0 80240CB0 00AD2821 */ addu $a1, $a1, $t5 -/* A2AEF4 80240CB4 30A500FF */ andi $a1, $a1, 0xff -/* A2AEF8 80240CB8 00CC3021 */ addu $a2, $a2, $t4 -/* A2AEFC 80240CBC 30C600FF */ andi $a2, $a2, 0xff -/* A2AF00 80240CC0 00EB3821 */ addu $a3, $a3, $t3 -/* A2AF04 80240CC4 30E700FF */ andi $a3, $a3, 0xff -/* A2AF08 80240CC8 012A4821 */ addu $t1, $t1, $t2 -/* A2AF0C 80240CCC 312900FF */ andi $t1, $t1, 0xff -/* A2AF10 80240CD0 AFA90010 */ sw $t1, 0x10($sp) -/* A2AF14 80240CD4 01024021 */ addu $t0, $t0, $v0 -/* A2AF18 80240CD8 310800FF */ andi $t0, $t0, 0xff -/* A2AF1C 80240CDC 0C046FE6 */ jal func_8011BF98 -/* A2AF20 80240CE0 AFA80014 */ sw $t0, 0x14($sp) -/* A2AF24 80240CE4 8E020000 */ lw $v0, ($s0) -/* A2AF28 80240CE8 8E230000 */ lw $v1, ($s1) -/* A2AF2C 80240CEC 0043102A */ slt $v0, $v0, $v1 -/* A2AF30 80240CF0 14400013 */ bnez $v0, .L80240D40 -/* A2AF34 80240CF4 0000102D */ daddu $v0, $zero, $zero -/* A2AF38 80240CF8 08090350 */ j .L80240D40 -/* A2AF3C 80240CFC 24020002 */ addiu $v0, $zero, 2 -.L80240D00: -/* A2AF40 80240D00 3C028025 */ lui $v0, 0x8025 -/* A2AF44 80240D04 9042F2BB */ lbu $v0, -0xd45($v0) -/* A2AF48 80240D08 3C048025 */ lui $a0, 0x8025 -/* A2AF4C 80240D0C 9084F2AB */ lbu $a0, -0xd55($a0) -/* A2AF50 80240D10 3C058025 */ lui $a1, 0x8025 -/* A2AF54 80240D14 90A5F2AF */ lbu $a1, -0xd51($a1) -/* A2AF58 80240D18 3C068025 */ lui $a2, 0x8025 -/* A2AF5C 80240D1C 90C6F2B3 */ lbu $a2, -0xd4d($a2) -/* A2AF60 80240D20 3C078025 */ lui $a3, 0x8025 -/* A2AF64 80240D24 90E7F2B7 */ lbu $a3, -0xd49($a3) -/* A2AF68 80240D28 3C038025 */ lui $v1, 0x8025 -/* A2AF6C 80240D2C 9063F2BF */ lbu $v1, -0xd41($v1) -/* A2AF70 80240D30 AFA20010 */ sw $v0, 0x10($sp) -/* A2AF74 80240D34 0C046FE6 */ jal func_8011BF98 -/* A2AF78 80240D38 AFA30014 */ sw $v1, 0x14($sp) -.L80240D3C: -/* A2AF7C 80240D3C 24020002 */ addiu $v0, $zero, 2 -.L80240D40: -/* A2AF80 80240D40 8FBF0020 */ lw $ra, 0x20($sp) -/* A2AF84 80240D44 8FB1001C */ lw $s1, 0x1c($sp) -/* A2AF88 80240D48 8FB00018 */ lw $s0, 0x18($sp) -/* A2AF8C 80240D4C 03E00008 */ jr $ra -/* A2AF90 80240D50 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s new file mode 100644 index 0000000000..44b426e280 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802409C4_A2AC04.s @@ -0,0 +1,248 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409C4_A2AC04 +/* A2AC04 802409C4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A2AC08 802409C8 AFB1001C */ sw $s1, 0x1c($sp) +/* A2AC0C 802409CC 0080882D */ daddu $s1, $a0, $zero +/* A2AC10 802409D0 AFBF0020 */ sw $ra, 0x20($sp) +/* A2AC14 802409D4 AFB00018 */ sw $s0, 0x18($sp) +/* A2AC18 802409D8 10A0003B */ beqz $a1, .L80240AC8 +/* A2AC1C 802409DC 8E30000C */ lw $s0, 0xc($s1) +/* A2AC20 802409E0 3C048025 */ lui $a0, 0x8025 +/* A2AC24 802409E4 2484F2A0 */ addiu $a0, $a0, -0xd60 +/* A2AC28 802409E8 3C058025 */ lui $a1, 0x8025 +/* A2AC2C 802409EC 24A5F2A1 */ addiu $a1, $a1, -0xd5f +/* A2AC30 802409F0 3C068025 */ lui $a2, 0x8025 +/* A2AC34 802409F4 24C6F2A2 */ addiu $a2, $a2, -0xd5e +/* A2AC38 802409F8 3C078025 */ lui $a3, 0x8025 +/* A2AC3C 802409FC 24E7F2A3 */ addiu $a3, $a3, -0xd5d +/* A2AC40 80240A00 3C028025 */ lui $v0, 0x8025 +/* A2AC44 80240A04 2442F2A4 */ addiu $v0, $v0, -0xd5c +/* A2AC48 80240A08 AFA20010 */ sw $v0, 0x10($sp) +/* A2AC4C 80240A0C 3C028025 */ lui $v0, 0x8025 +/* A2AC50 80240A10 2442F2A5 */ addiu $v0, $v0, -0xd5b +/* A2AC54 80240A14 0C046FF5 */ jal func_8011BFD4 +/* A2AC58 80240A18 AFA20014 */ sw $v0, 0x14($sp) +/* A2AC5C 80240A1C 8E050000 */ lw $a1, ($s0) +/* A2AC60 80240A20 26100004 */ addiu $s0, $s0, 4 +/* A2AC64 80240A24 0C0B1EAF */ jal get_variable +/* A2AC68 80240A28 0220202D */ daddu $a0, $s1, $zero +/* A2AC6C 80240A2C 3C018025 */ lui $at, 0x8025 +/* A2AC70 80240A30 AC22F2A8 */ sw $v0, -0xd58($at) +/* A2AC74 80240A34 8E050000 */ lw $a1, ($s0) +/* A2AC78 80240A38 26100004 */ addiu $s0, $s0, 4 +/* A2AC7C 80240A3C 0C0B1EAF */ jal get_variable +/* A2AC80 80240A40 0220202D */ daddu $a0, $s1, $zero +/* A2AC84 80240A44 3C018025 */ lui $at, 0x8025 +/* A2AC88 80240A48 AC22F2AC */ sw $v0, -0xd54($at) +/* A2AC8C 80240A4C 8E050000 */ lw $a1, ($s0) +/* A2AC90 80240A50 26100004 */ addiu $s0, $s0, 4 +/* A2AC94 80240A54 0C0B1EAF */ jal get_variable +/* A2AC98 80240A58 0220202D */ daddu $a0, $s1, $zero +/* A2AC9C 80240A5C 3C018025 */ lui $at, 0x8025 +/* A2ACA0 80240A60 AC22F2B0 */ sw $v0, -0xd50($at) +/* A2ACA4 80240A64 8E050000 */ lw $a1, ($s0) +/* A2ACA8 80240A68 26100004 */ addiu $s0, $s0, 4 +/* A2ACAC 80240A6C 0C0B1EAF */ jal get_variable +/* A2ACB0 80240A70 0220202D */ daddu $a0, $s1, $zero +/* A2ACB4 80240A74 3C018025 */ lui $at, 0x8025 +/* A2ACB8 80240A78 AC22F2B4 */ sw $v0, -0xd4c($at) +/* A2ACBC 80240A7C 8E050000 */ lw $a1, ($s0) +/* A2ACC0 80240A80 26100004 */ addiu $s0, $s0, 4 +/* A2ACC4 80240A84 0C0B1EAF */ jal get_variable +/* A2ACC8 80240A88 0220202D */ daddu $a0, $s1, $zero +/* A2ACCC 80240A8C 3C018025 */ lui $at, 0x8025 +/* A2ACD0 80240A90 AC22F2B8 */ sw $v0, -0xd48($at) +/* A2ACD4 80240A94 8E050000 */ lw $a1, ($s0) +/* A2ACD8 80240A98 26100004 */ addiu $s0, $s0, 4 +/* A2ACDC 80240A9C 0C0B1EAF */ jal get_variable +/* A2ACE0 80240AA0 0220202D */ daddu $a0, $s1, $zero +/* A2ACE4 80240AA4 3C018025 */ lui $at, 0x8025 +/* A2ACE8 80240AA8 AC22F2BC */ sw $v0, -0xd44($at) +/* A2ACEC 80240AAC 8E050000 */ lw $a1, ($s0) +/* A2ACF0 80240AB0 0C0B1EAF */ jal get_variable +/* A2ACF4 80240AB4 0220202D */ daddu $a0, $s1, $zero +/* A2ACF8 80240AB8 3C018025 */ lui $at, 0x8025 +/* A2ACFC 80240ABC AC22F2C0 */ sw $v0, -0xd40($at) +/* A2AD00 80240AC0 3C018025 */ lui $at, 0x8025 +/* A2AD04 80240AC4 AC20F2C4 */ sw $zero, -0xd3c($at) +.L80240AC8: +/* A2AD08 80240AC8 3C118025 */ lui $s1, 0x8025 +/* A2AD0C 80240ACC 2631F2C0 */ addiu $s1, $s1, -0xd40 +/* A2AD10 80240AD0 8E2F0000 */ lw $t7, ($s1) +/* A2AD14 80240AD4 19E0008A */ blez $t7, .L80240D00 +/* A2AD18 80240AD8 00000000 */ nop +/* A2AD1C 80240ADC 3C108025 */ lui $s0, 0x8025 +/* A2AD20 80240AE0 2610F2C4 */ addiu $s0, $s0, -0xd3c +/* A2AD24 80240AE4 8E030000 */ lw $v1, ($s0) +/* A2AD28 80240AE8 006F102A */ slt $v0, $v1, $t7 +/* A2AD2C 80240AEC 10400093 */ beqz $v0, .L80240D3C +/* A2AD30 80240AF0 24630001 */ addiu $v1, $v1, 1 +/* A2AD34 80240AF4 3C048025 */ lui $a0, 0x8025 +/* A2AD38 80240AF8 9084F2A0 */ lbu $a0, -0xd60($a0) +/* A2AD3C 80240AFC 3C028025 */ lui $v0, 0x8025 +/* A2AD40 80240B00 8C42F2A8 */ lw $v0, -0xd58($v0) +/* A2AD44 80240B04 00441023 */ subu $v0, $v0, $a0 +/* A2AD48 80240B08 00430018 */ mult $v0, $v1 +/* A2AD4C 80240B0C 00004012 */ mflo $t0 +/* A2AD50 80240B10 00000000 */ nop +/* A2AD54 80240B14 15E00002 */ bnez $t7, .L80240B20 +/* A2AD58 80240B18 010F001A */ div $zero, $t0, $t7 +/* A2AD5C 80240B1C 0007000D */ break 7 +.L80240B20: +/* A2AD60 80240B20 2401FFFF */ addiu $at, $zero, -1 +/* A2AD64 80240B24 15E10004 */ bne $t7, $at, .L80240B38 +/* A2AD68 80240B28 3C018000 */ lui $at, 0x8000 +/* A2AD6C 80240B2C 15010002 */ bne $t0, $at, .L80240B38 +/* A2AD70 80240B30 00000000 */ nop +/* A2AD74 80240B34 0006000D */ break 6 +.L80240B38: +/* A2AD78 80240B38 00007012 */ mflo $t6 +/* A2AD7C 80240B3C 3C058025 */ lui $a1, 0x8025 +/* A2AD80 80240B40 90A5F2A1 */ lbu $a1, -0xd5f($a1) +/* A2AD84 80240B44 3C028025 */ lui $v0, 0x8025 +/* A2AD88 80240B48 8C42F2AC */ lw $v0, -0xd54($v0) +/* A2AD8C 80240B4C 00451023 */ subu $v0, $v0, $a1 +/* A2AD90 80240B50 00430018 */ mult $v0, $v1 +/* A2AD94 80240B54 00004012 */ mflo $t0 +/* A2AD98 80240B58 00000000 */ nop +/* A2AD9C 80240B5C 15E00002 */ bnez $t7, .L80240B68 +/* A2ADA0 80240B60 010F001A */ div $zero, $t0, $t7 +/* A2ADA4 80240B64 0007000D */ break 7 +.L80240B68: +/* A2ADA8 80240B68 2401FFFF */ addiu $at, $zero, -1 +/* A2ADAC 80240B6C 15E10004 */ bne $t7, $at, .L80240B80 +/* A2ADB0 80240B70 3C018000 */ lui $at, 0x8000 +/* A2ADB4 80240B74 15010002 */ bne $t0, $at, .L80240B80 +/* A2ADB8 80240B78 00000000 */ nop +/* A2ADBC 80240B7C 0006000D */ break 6 +.L80240B80: +/* A2ADC0 80240B80 00006812 */ mflo $t5 +/* A2ADC4 80240B84 3C068025 */ lui $a2, 0x8025 +/* A2ADC8 80240B88 90C6F2A2 */ lbu $a2, -0xd5e($a2) +/* A2ADCC 80240B8C 3C028025 */ lui $v0, 0x8025 +/* A2ADD0 80240B90 8C42F2B0 */ lw $v0, -0xd50($v0) +/* A2ADD4 80240B94 00461023 */ subu $v0, $v0, $a2 +/* A2ADD8 80240B98 00430018 */ mult $v0, $v1 +/* A2ADDC 80240B9C 00004012 */ mflo $t0 +/* A2ADE0 80240BA0 00000000 */ nop +/* A2ADE4 80240BA4 15E00002 */ bnez $t7, .L80240BB0 +/* A2ADE8 80240BA8 010F001A */ div $zero, $t0, $t7 +/* A2ADEC 80240BAC 0007000D */ break 7 +.L80240BB0: +/* A2ADF0 80240BB0 2401FFFF */ addiu $at, $zero, -1 +/* A2ADF4 80240BB4 15E10004 */ bne $t7, $at, .L80240BC8 +/* A2ADF8 80240BB8 3C018000 */ lui $at, 0x8000 +/* A2ADFC 80240BBC 15010002 */ bne $t0, $at, .L80240BC8 +/* A2AE00 80240BC0 00000000 */ nop +/* A2AE04 80240BC4 0006000D */ break 6 +.L80240BC8: +/* A2AE08 80240BC8 00006012 */ mflo $t4 +/* A2AE0C 80240BCC 3C078025 */ lui $a3, 0x8025 +/* A2AE10 80240BD0 90E7F2A3 */ lbu $a3, -0xd5d($a3) +/* A2AE14 80240BD4 3C028025 */ lui $v0, 0x8025 +/* A2AE18 80240BD8 8C42F2B4 */ lw $v0, -0xd4c($v0) +/* A2AE1C 80240BDC 00471023 */ subu $v0, $v0, $a3 +/* A2AE20 80240BE0 00430018 */ mult $v0, $v1 +/* A2AE24 80240BE4 00004012 */ mflo $t0 +/* A2AE28 80240BE8 00000000 */ nop +/* A2AE2C 80240BEC 15E00002 */ bnez $t7, .L80240BF8 +/* A2AE30 80240BF0 010F001A */ div $zero, $t0, $t7 +/* A2AE34 80240BF4 0007000D */ break 7 +.L80240BF8: +/* A2AE38 80240BF8 2401FFFF */ addiu $at, $zero, -1 +/* A2AE3C 80240BFC 15E10004 */ bne $t7, $at, .L80240C10 +/* A2AE40 80240C00 3C018000 */ lui $at, 0x8000 +/* A2AE44 80240C04 15010002 */ bne $t0, $at, .L80240C10 +/* A2AE48 80240C08 00000000 */ nop +/* A2AE4C 80240C0C 0006000D */ break 6 +.L80240C10: +/* A2AE50 80240C10 00005812 */ mflo $t3 +/* A2AE54 80240C14 3C098025 */ lui $t1, 0x8025 +/* A2AE58 80240C18 9129F2A4 */ lbu $t1, -0xd5c($t1) +/* A2AE5C 80240C1C 3C028025 */ lui $v0, 0x8025 +/* A2AE60 80240C20 8C42F2B8 */ lw $v0, -0xd48($v0) +/* A2AE64 80240C24 00491023 */ subu $v0, $v0, $t1 +/* A2AE68 80240C28 00430018 */ mult $v0, $v1 +/* A2AE6C 80240C2C 00004012 */ mflo $t0 +/* A2AE70 80240C30 00000000 */ nop +/* A2AE74 80240C34 15E00002 */ bnez $t7, .L80240C40 +/* A2AE78 80240C38 010F001A */ div $zero, $t0, $t7 +/* A2AE7C 80240C3C 0007000D */ break 7 +.L80240C40: +/* A2AE80 80240C40 2401FFFF */ addiu $at, $zero, -1 +/* A2AE84 80240C44 15E10004 */ bne $t7, $at, .L80240C58 +/* A2AE88 80240C48 3C018000 */ lui $at, 0x8000 +/* A2AE8C 80240C4C 15010002 */ bne $t0, $at, .L80240C58 +/* A2AE90 80240C50 00000000 */ nop +/* A2AE94 80240C54 0006000D */ break 6 +.L80240C58: +/* A2AE98 80240C58 00005012 */ mflo $t2 +/* A2AE9C 80240C5C 3C088025 */ lui $t0, 0x8025 +/* A2AEA0 80240C60 9108F2A5 */ lbu $t0, -0xd5b($t0) +/* A2AEA4 80240C64 3C028025 */ lui $v0, 0x8025 +/* A2AEA8 80240C68 8C42F2BC */ lw $v0, -0xd44($v0) +/* A2AEAC 80240C6C 00481023 */ subu $v0, $v0, $t0 +/* A2AEB0 80240C70 00430018 */ mult $v0, $v1 +/* A2AEB4 80240C74 0000C812 */ mflo $t9 +/* A2AEB8 80240C78 00000000 */ nop +/* A2AEBC 80240C7C 15E00002 */ bnez $t7, .L80240C88 +/* A2AEC0 80240C80 032F001A */ div $zero, $t9, $t7 +/* A2AEC4 80240C84 0007000D */ break 7 +.L80240C88: +/* A2AEC8 80240C88 2401FFFF */ addiu $at, $zero, -1 +/* A2AECC 80240C8C 15E10004 */ bne $t7, $at, .L80240CA0 +/* A2AED0 80240C90 3C018000 */ lui $at, 0x8000 +/* A2AED4 80240C94 17210002 */ bne $t9, $at, .L80240CA0 +/* A2AED8 80240C98 00000000 */ nop +/* A2AEDC 80240C9C 0006000D */ break 6 +.L80240CA0: +/* A2AEE0 80240CA0 00001012 */ mflo $v0 +/* A2AEE4 80240CA4 AE030000 */ sw $v1, ($s0) +/* A2AEE8 80240CA8 008E2021 */ addu $a0, $a0, $t6 +/* A2AEEC 80240CAC 308400FF */ andi $a0, $a0, 0xff +/* A2AEF0 80240CB0 00AD2821 */ addu $a1, $a1, $t5 +/* A2AEF4 80240CB4 30A500FF */ andi $a1, $a1, 0xff +/* A2AEF8 80240CB8 00CC3021 */ addu $a2, $a2, $t4 +/* A2AEFC 80240CBC 30C600FF */ andi $a2, $a2, 0xff +/* A2AF00 80240CC0 00EB3821 */ addu $a3, $a3, $t3 +/* A2AF04 80240CC4 30E700FF */ andi $a3, $a3, 0xff +/* A2AF08 80240CC8 012A4821 */ addu $t1, $t1, $t2 +/* A2AF0C 80240CCC 312900FF */ andi $t1, $t1, 0xff +/* A2AF10 80240CD0 AFA90010 */ sw $t1, 0x10($sp) +/* A2AF14 80240CD4 01024021 */ addu $t0, $t0, $v0 +/* A2AF18 80240CD8 310800FF */ andi $t0, $t0, 0xff +/* A2AF1C 80240CDC 0C046FE6 */ jal func_8011BF98 +/* A2AF20 80240CE0 AFA80014 */ sw $t0, 0x14($sp) +/* A2AF24 80240CE4 8E020000 */ lw $v0, ($s0) +/* A2AF28 80240CE8 8E230000 */ lw $v1, ($s1) +/* A2AF2C 80240CEC 0043102A */ slt $v0, $v0, $v1 +/* A2AF30 80240CF0 14400013 */ bnez $v0, .L80240D40 +/* A2AF34 80240CF4 0000102D */ daddu $v0, $zero, $zero +/* A2AF38 80240CF8 08090350 */ j .L80240D40 +/* A2AF3C 80240CFC 24020002 */ addiu $v0, $zero, 2 +.L80240D00: +/* A2AF40 80240D00 3C028025 */ lui $v0, 0x8025 +/* A2AF44 80240D04 9042F2BB */ lbu $v0, -0xd45($v0) +/* A2AF48 80240D08 3C048025 */ lui $a0, 0x8025 +/* A2AF4C 80240D0C 9084F2AB */ lbu $a0, -0xd55($a0) +/* A2AF50 80240D10 3C058025 */ lui $a1, 0x8025 +/* A2AF54 80240D14 90A5F2AF */ lbu $a1, -0xd51($a1) +/* A2AF58 80240D18 3C068025 */ lui $a2, 0x8025 +/* A2AF5C 80240D1C 90C6F2B3 */ lbu $a2, -0xd4d($a2) +/* A2AF60 80240D20 3C078025 */ lui $a3, 0x8025 +/* A2AF64 80240D24 90E7F2B7 */ lbu $a3, -0xd49($a3) +/* A2AF68 80240D28 3C038025 */ lui $v1, 0x8025 +/* A2AF6C 80240D2C 9063F2BF */ lbu $v1, -0xd41($v1) +/* A2AF70 80240D30 AFA20010 */ sw $v0, 0x10($sp) +/* A2AF74 80240D34 0C046FE6 */ jal func_8011BF98 +/* A2AF78 80240D38 AFA30014 */ sw $v1, 0x14($sp) +.L80240D3C: +/* A2AF7C 80240D3C 24020002 */ addiu $v0, $zero, 2 +.L80240D40: +/* A2AF80 80240D40 8FBF0020 */ lw $ra, 0x20($sp) +/* A2AF84 80240D44 8FB1001C */ lw $s1, 0x1c($sp) +/* A2AF88 80240D48 8FB00018 */ lw $s0, 0x18($sp) +/* A2AF8C 80240D4C 03E00008 */ jr $ra +/* A2AF90 80240D50 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54.s deleted file mode 100644 index 849b0b2d67..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D54 -/* A2AF94 80240D54 44852000 */ mtc1 $a1, $f4 -/* A2AF98 80240D58 3C018025 */ lui $at, 0x8025 -/* A2AF9C 80240D5C D422F1E0 */ ldc1 $f2, -0xe20($at) -/* A2AFA0 80240D60 46002021 */ cvt.d.s $f0, $f4 -/* A2AFA4 80240D64 46220002 */ mul.d $f0, $f0, $f2 -/* A2AFA8 80240D68 00000000 */ nop -/* A2AFAC 80240D6C 00041080 */ sll $v0, $a0, 2 -/* A2AFB0 80240D70 00441021 */ addu $v0, $v0, $a0 -/* A2AFB4 80240D74 00021080 */ sll $v0, $v0, 2 -/* A2AFB8 80240D78 00441023 */ subu $v0, $v0, $a0 -/* A2AFBC 80240D7C 000218C0 */ sll $v1, $v0, 3 -/* A2AFC0 80240D80 00431021 */ addu $v0, $v0, $v1 -/* A2AFC4 80240D84 000210C0 */ sll $v0, $v0, 3 -/* A2AFC8 80240D88 46200020 */ cvt.s.d $f0, $f0 -/* A2AFCC 80240D8C 3C01800B */ lui $at, 0x800b -/* A2AFD0 80240D90 00220821 */ addu $at, $at, $v0 -/* A2AFD4 80240D94 E4201D98 */ swc1 $f0, 0x1d98($at) -/* A2AFD8 80240D98 03E00008 */ jr $ra -/* A2AFDC 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s new file mode 100644 index 0000000000..f1fdef19b3 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240D54_A2AF94.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D54_A2AF94 +/* A2AF94 80240D54 44852000 */ mtc1 $a1, $f4 +/* A2AF98 80240D58 3C018025 */ lui $at, 0x8025 +/* A2AF9C 80240D5C D422F1E0 */ ldc1 $f2, -0xe20($at) +/* A2AFA0 80240D60 46002021 */ cvt.d.s $f0, $f4 +/* A2AFA4 80240D64 46220002 */ mul.d $f0, $f0, $f2 +/* A2AFA8 80240D68 00000000 */ nop +/* A2AFAC 80240D6C 00041080 */ sll $v0, $a0, 2 +/* A2AFB0 80240D70 00441021 */ addu $v0, $v0, $a0 +/* A2AFB4 80240D74 00021080 */ sll $v0, $v0, 2 +/* A2AFB8 80240D78 00441023 */ subu $v0, $v0, $a0 +/* A2AFBC 80240D7C 000218C0 */ sll $v1, $v0, 3 +/* A2AFC0 80240D80 00431021 */ addu $v0, $v0, $v1 +/* A2AFC4 80240D84 000210C0 */ sll $v0, $v0, 3 +/* A2AFC8 80240D88 46200020 */ cvt.s.d $f0, $f0 +/* A2AFCC 80240D8C 3C01800B */ lui $at, 0x800b +/* A2AFD0 80240D90 00220821 */ addu $at, $at, $v0 +/* A2AFD4 80240D94 E4201D98 */ swc1 $f0, 0x1d98($at) +/* A2AFD8 80240D98 03E00008 */ jr $ra +/* A2AFDC 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s index 26baabcb23..250b14e4c2 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240DA0_A2AFE0.s @@ -16,7 +16,7 @@ glabel func_80240DA0_A2AFE0 /* A2B00C 80240DCC 0C0B210B */ jal get_float_variable /* A2B010 80240DD0 0040802D */ daddu $s0, $v0, $zero /* A2B014 80240DD4 44050000 */ mfc1 $a1, $f0 -/* A2B018 80240DD8 0C090355 */ jal func_80240D54 +/* A2B018 80240DD8 0C090355 */ jal func_80240D54_A2AF94 /* A2B01C 80240DDC 0200202D */ daddu $a0, $s0, $zero /* A2B020 80240DE0 8FBF0018 */ lw $ra, 0x18($sp) /* A2B024 80240DE4 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50.s deleted file mode 100644 index 8f9add3013..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E50 -/* A2B090 80240E50 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A2B094 80240E54 AFB10014 */ sw $s1, 0x14($sp) -/* A2B098 80240E58 0080882D */ daddu $s1, $a0, $zero -/* A2B09C 80240E5C AFBF0020 */ sw $ra, 0x20($sp) -/* A2B0A0 80240E60 AFB3001C */ sw $s3, 0x1c($sp) -/* A2B0A4 80240E64 AFB20018 */ sw $s2, 0x18($sp) -/* A2B0A8 80240E68 AFB00010 */ sw $s0, 0x10($sp) -/* A2B0AC 80240E6C 8E30000C */ lw $s0, 0xc($s1) -/* A2B0B0 80240E70 8E050000 */ lw $a1, ($s0) -/* A2B0B4 80240E74 0C0B1EAF */ jal get_variable -/* A2B0B8 80240E78 26100004 */ addiu $s0, $s0, 4 -/* A2B0BC 80240E7C 8E050000 */ lw $a1, ($s0) -/* A2B0C0 80240E80 26100004 */ addiu $s0, $s0, 4 -/* A2B0C4 80240E84 0220202D */ daddu $a0, $s1, $zero -/* A2B0C8 80240E88 0C0B1EAF */ jal get_variable -/* A2B0CC 80240E8C 0040902D */ daddu $s2, $v0, $zero -/* A2B0D0 80240E90 8E050000 */ lw $a1, ($s0) -/* A2B0D4 80240E94 26100004 */ addiu $s0, $s0, 4 -/* A2B0D8 80240E98 0C0B210B */ jal get_float_variable -/* A2B0DC 80240E9C 0220202D */ daddu $a0, $s1, $zero -/* A2B0E0 80240EA0 8E050000 */ lw $a1, ($s0) -/* A2B0E4 80240EA4 26100004 */ addiu $s0, $s0, 4 -/* A2B0E8 80240EA8 4600010D */ trunc.w.s $f4, $f0 -/* A2B0EC 80240EAC 44132000 */ mfc1 $s3, $f4 -/* A2B0F0 80240EB0 0C0B210B */ jal get_float_variable -/* A2B0F4 80240EB4 0220202D */ daddu $a0, $s1, $zero -/* A2B0F8 80240EB8 8E050000 */ lw $a1, ($s0) -/* A2B0FC 80240EBC 4600010D */ trunc.w.s $f4, $f0 -/* A2B100 80240EC0 44102000 */ mfc1 $s0, $f4 -/* A2B104 80240EC4 0C0B210B */ jal get_float_variable -/* A2B108 80240EC8 0220202D */ daddu $a0, $s1, $zero -/* A2B10C 80240ECC 8E43000C */ lw $v1, 0xc($s2) -/* A2B110 80240ED0 44931000 */ mtc1 $s3, $f2 -/* A2B114 80240ED4 00000000 */ nop -/* A2B118 80240ED8 468010A0 */ cvt.s.w $f2, $f2 -/* A2B11C 80240EDC E4620004 */ swc1 $f2, 4($v1) -/* A2B120 80240EE0 8E43000C */ lw $v1, 0xc($s2) -/* A2B124 80240EE4 44901000 */ mtc1 $s0, $f2 -/* A2B128 80240EE8 00000000 */ nop -/* A2B12C 80240EEC 468010A0 */ cvt.s.w $f2, $f2 -/* A2B130 80240EF0 E4620008 */ swc1 $f2, 8($v1) -/* A2B134 80240EF4 4600010D */ trunc.w.s $f4, $f0 -/* A2B138 80240EF8 44032000 */ mfc1 $v1, $f4 -/* A2B13C 80240EFC 8E44000C */ lw $a0, 0xc($s2) -/* A2B140 80240F00 44830000 */ mtc1 $v1, $f0 -/* A2B144 80240F04 00000000 */ nop -/* A2B148 80240F08 46800020 */ cvt.s.w $f0, $f0 -/* A2B14C 80240F0C E480000C */ swc1 $f0, 0xc($a0) -/* A2B150 80240F10 8FBF0020 */ lw $ra, 0x20($sp) -/* A2B154 80240F14 8FB3001C */ lw $s3, 0x1c($sp) -/* A2B158 80240F18 8FB20018 */ lw $s2, 0x18($sp) -/* A2B15C 80240F1C 8FB10014 */ lw $s1, 0x14($sp) -/* A2B160 80240F20 8FB00010 */ lw $s0, 0x10($sp) -/* A2B164 80240F24 24020002 */ addiu $v0, $zero, 2 -/* A2B168 80240F28 03E00008 */ jr $ra -/* A2B16C 80240F2C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s new file mode 100644 index 0000000000..2875b298af --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240E50_A2B090.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E50_A2B090 +/* A2B090 80240E50 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A2B094 80240E54 AFB10014 */ sw $s1, 0x14($sp) +/* A2B098 80240E58 0080882D */ daddu $s1, $a0, $zero +/* A2B09C 80240E5C AFBF0020 */ sw $ra, 0x20($sp) +/* A2B0A0 80240E60 AFB3001C */ sw $s3, 0x1c($sp) +/* A2B0A4 80240E64 AFB20018 */ sw $s2, 0x18($sp) +/* A2B0A8 80240E68 AFB00010 */ sw $s0, 0x10($sp) +/* A2B0AC 80240E6C 8E30000C */ lw $s0, 0xc($s1) +/* A2B0B0 80240E70 8E050000 */ lw $a1, ($s0) +/* A2B0B4 80240E74 0C0B1EAF */ jal get_variable +/* A2B0B8 80240E78 26100004 */ addiu $s0, $s0, 4 +/* A2B0BC 80240E7C 8E050000 */ lw $a1, ($s0) +/* A2B0C0 80240E80 26100004 */ addiu $s0, $s0, 4 +/* A2B0C4 80240E84 0220202D */ daddu $a0, $s1, $zero +/* A2B0C8 80240E88 0C0B1EAF */ jal get_variable +/* A2B0CC 80240E8C 0040902D */ daddu $s2, $v0, $zero +/* A2B0D0 80240E90 8E050000 */ lw $a1, ($s0) +/* A2B0D4 80240E94 26100004 */ addiu $s0, $s0, 4 +/* A2B0D8 80240E98 0C0B210B */ jal get_float_variable +/* A2B0DC 80240E9C 0220202D */ daddu $a0, $s1, $zero +/* A2B0E0 80240EA0 8E050000 */ lw $a1, ($s0) +/* A2B0E4 80240EA4 26100004 */ addiu $s0, $s0, 4 +/* A2B0E8 80240EA8 4600010D */ trunc.w.s $f4, $f0 +/* A2B0EC 80240EAC 44132000 */ mfc1 $s3, $f4 +/* A2B0F0 80240EB0 0C0B210B */ jal get_float_variable +/* A2B0F4 80240EB4 0220202D */ daddu $a0, $s1, $zero +/* A2B0F8 80240EB8 8E050000 */ lw $a1, ($s0) +/* A2B0FC 80240EBC 4600010D */ trunc.w.s $f4, $f0 +/* A2B100 80240EC0 44102000 */ mfc1 $s0, $f4 +/* A2B104 80240EC4 0C0B210B */ jal get_float_variable +/* A2B108 80240EC8 0220202D */ daddu $a0, $s1, $zero +/* A2B10C 80240ECC 8E43000C */ lw $v1, 0xc($s2) +/* A2B110 80240ED0 44931000 */ mtc1 $s3, $f2 +/* A2B114 80240ED4 00000000 */ nop +/* A2B118 80240ED8 468010A0 */ cvt.s.w $f2, $f2 +/* A2B11C 80240EDC E4620004 */ swc1 $f2, 4($v1) +/* A2B120 80240EE0 8E43000C */ lw $v1, 0xc($s2) +/* A2B124 80240EE4 44901000 */ mtc1 $s0, $f2 +/* A2B128 80240EE8 00000000 */ nop +/* A2B12C 80240EEC 468010A0 */ cvt.s.w $f2, $f2 +/* A2B130 80240EF0 E4620008 */ swc1 $f2, 8($v1) +/* A2B134 80240EF4 4600010D */ trunc.w.s $f4, $f0 +/* A2B138 80240EF8 44032000 */ mfc1 $v1, $f4 +/* A2B13C 80240EFC 8E44000C */ lw $a0, 0xc($s2) +/* A2B140 80240F00 44830000 */ mtc1 $v1, $f0 +/* A2B144 80240F04 00000000 */ nop +/* A2B148 80240F08 46800020 */ cvt.s.w $f0, $f0 +/* A2B14C 80240F0C E480000C */ swc1 $f0, 0xc($a0) +/* A2B150 80240F10 8FBF0020 */ lw $ra, 0x20($sp) +/* A2B154 80240F14 8FB3001C */ lw $s3, 0x1c($sp) +/* A2B158 80240F18 8FB20018 */ lw $s2, 0x18($sp) +/* A2B15C 80240F1C 8FB10014 */ lw $s1, 0x14($sp) +/* A2B160 80240F20 8FB00010 */ lw $s0, 0x10($sp) +/* A2B164 80240F24 24020002 */ addiu $v0, $zero, 2 +/* A2B168 80240F28 03E00008 */ jr $ra +/* A2B16C 80240F2C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88.s deleted file mode 100644 index 8b53583920..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F88 -/* A2B1C8 80240F88 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2B1CC 80240F8C 3C05F4AC */ lui $a1, 0xf4ac -/* A2B1D0 80240F90 AFBF0010 */ sw $ra, 0x10($sp) -/* A2B1D4 80240F94 0C0B1EAF */ jal get_variable -/* A2B1D8 80240F98 34A5D480 */ ori $a1, $a1, 0xd480 -/* A2B1DC 80240F9C 3C058025 */ lui $a1, 0x8025 -/* A2B1E0 80240FA0 24A595E0 */ addiu $a1, $a1, -0x6a20 -/* A2B1E4 80240FA4 8CA40000 */ lw $a0, ($a1) -/* A2B1E8 80240FA8 8C42000C */ lw $v0, 0xc($v0) -/* A2B1EC 80240FAC 00041840 */ sll $v1, $a0, 1 -/* A2B1F0 80240FB0 00641821 */ addu $v1, $v1, $a0 -/* A2B1F4 80240FB4 00031900 */ sll $v1, $v1, 4 -/* A2B1F8 80240FB8 00621821 */ addu $v1, $v1, $v0 -/* A2B1FC 80240FBC 24020003 */ addiu $v0, $zero, 3 -/* A2B200 80240FC0 A0620059 */ sb $v0, 0x59($v1) -/* A2B204 80240FC4 8CA30000 */ lw $v1, ($a1) -/* A2B208 80240FC8 24630001 */ addiu $v1, $v1, 1 -/* A2B20C 80240FCC ACA30000 */ sw $v1, ($a1) -/* A2B210 80240FD0 8FBF0010 */ lw $ra, 0x10($sp) -/* A2B214 80240FD4 24020002 */ addiu $v0, $zero, 2 -/* A2B218 80240FD8 03E00008 */ jr $ra -/* A2B21C 80240FDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88_A2B1C8.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88_A2B1C8.s new file mode 100644 index 0000000000..5a3ffce2d0 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80240F88_A2B1C8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F88_A2B1C8 +/* A2B1C8 80240F88 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2B1CC 80240F8C 3C05F4AC */ lui $a1, 0xf4ac +/* A2B1D0 80240F90 AFBF0010 */ sw $ra, 0x10($sp) +/* A2B1D4 80240F94 0C0B1EAF */ jal get_variable +/* A2B1D8 80240F98 34A5D480 */ ori $a1, $a1, 0xd480 +/* A2B1DC 80240F9C 3C058025 */ lui $a1, 0x8025 +/* A2B1E0 80240FA0 24A595E0 */ addiu $a1, $a1, -0x6a20 +/* A2B1E4 80240FA4 8CA40000 */ lw $a0, ($a1) +/* A2B1E8 80240FA8 8C42000C */ lw $v0, 0xc($v0) +/* A2B1EC 80240FAC 00041840 */ sll $v1, $a0, 1 +/* A2B1F0 80240FB0 00641821 */ addu $v1, $v1, $a0 +/* A2B1F4 80240FB4 00031900 */ sll $v1, $v1, 4 +/* A2B1F8 80240FB8 00621821 */ addu $v1, $v1, $v0 +/* A2B1FC 80240FBC 24020003 */ addiu $v0, $zero, 3 +/* A2B200 80240FC0 A0620059 */ sb $v0, 0x59($v1) +/* A2B204 80240FC4 8CA30000 */ lw $v1, ($a1) +/* A2B208 80240FC8 24630001 */ addiu $v1, $v1, 1 +/* A2B20C 80240FCC ACA30000 */ sw $v1, ($a1) +/* A2B210 80240FD0 8FBF0010 */ lw $ra, 0x10($sp) +/* A2B214 80240FD4 24020002 */ addiu $v0, $zero, 2 +/* A2B218 80240FD8 03E00008 */ jr $ra +/* A2B21C 80240FDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044.s deleted file mode 100644 index 2870da32bd..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241044 -/* A2B284 80241044 460C7301 */ sub.s $f12, $f14, $f12 -/* A2B288 80241048 44863000 */ mtc1 $a2, $f6 -/* A2B28C 8024104C 44800000 */ mtc1 $zero, $f0 -/* A2B290 80241050 44872000 */ mtc1 $a3, $f4 -/* A2B294 80241054 8FA20010 */ lw $v0, 0x10($sp) -/* A2B298 80241058 460C003C */ c.lt.s $f0, $f12 -/* A2B29C 8024105C 00000000 */ nop -/* A2B2A0 80241060 4500000F */ bc1f .L802410A0 -/* A2B2A4 80241064 46067081 */ sub.s $f2, $f14, $f6 -/* A2B2A8 80241068 4600103C */ c.lt.s $f2, $f0 -/* A2B2AC 8024106C 00000000 */ nop -/* A2B2B0 80241070 45000003 */ bc1f .L80241080 -/* A2B2B4 80241074 00000000 */ nop -.L80241078: -/* A2B2B8 80241078 03E00008 */ jr $ra -/* A2B2BC 8024107C E44E0000 */ swc1 $f14, ($v0) -.L80241080: -/* A2B2C0 80241080 4602203C */ c.lt.s $f4, $f2 -/* A2B2C4 80241084 00000000 */ nop -/* A2B2C8 80241088 45000012 */ bc1f .L802410D4 -/* A2B2CC 8024108C 00000000 */ nop -/* A2B2D0 80241090 C4400000 */ lwc1 $f0, ($v0) -/* A2B2D4 80241094 46040000 */ add.s $f0, $f0, $f4 -/* A2B2D8 80241098 03E00008 */ jr $ra -/* A2B2DC 8024109C E4400000 */ swc1 $f0, ($v0) -.L802410A0: -/* A2B2E0 802410A0 4602003C */ c.lt.s $f0, $f2 -/* A2B2E4 802410A4 00000000 */ nop -/* A2B2E8 802410A8 4501FFF3 */ bc1t .L80241078 -/* A2B2EC 802410AC 00000000 */ nop -/* A2B2F0 802410B0 46002007 */ neg.s $f0, $f4 -/* A2B2F4 802410B4 4600103C */ c.lt.s $f2, $f0 -/* A2B2F8 802410B8 00000000 */ nop -/* A2B2FC 802410BC 45000005 */ bc1f .L802410D4 -/* A2B300 802410C0 00000000 */ nop -/* A2B304 802410C4 C4400000 */ lwc1 $f0, ($v0) -/* A2B308 802410C8 46040001 */ sub.s $f0, $f0, $f4 -/* A2B30C 802410CC 03E00008 */ jr $ra -/* A2B310 802410D0 E4400000 */ swc1 $f0, ($v0) -.L802410D4: -/* A2B314 802410D4 C4400000 */ lwc1 $f0, ($v0) -/* A2B318 802410D8 46020000 */ add.s $f0, $f0, $f2 -/* A2B31C 802410DC 03E00008 */ jr $ra -/* A2B320 802410E0 E4400000 */ swc1 $f0, ($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044_A2B284.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044_A2B284.s new file mode 100644 index 0000000000..f46e53f21a --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241044_A2B284.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241044_A2B284 +/* A2B284 80241044 460C7301 */ sub.s $f12, $f14, $f12 +/* A2B288 80241048 44863000 */ mtc1 $a2, $f6 +/* A2B28C 8024104C 44800000 */ mtc1 $zero, $f0 +/* A2B290 80241050 44872000 */ mtc1 $a3, $f4 +/* A2B294 80241054 8FA20010 */ lw $v0, 0x10($sp) +/* A2B298 80241058 460C003C */ c.lt.s $f0, $f12 +/* A2B29C 8024105C 00000000 */ nop +/* A2B2A0 80241060 4500000F */ bc1f .L802410A0 +/* A2B2A4 80241064 46067081 */ sub.s $f2, $f14, $f6 +/* A2B2A8 80241068 4600103C */ c.lt.s $f2, $f0 +/* A2B2AC 8024106C 00000000 */ nop +/* A2B2B0 80241070 45000003 */ bc1f .L80241080 +/* A2B2B4 80241074 00000000 */ nop +.L80241078: +/* A2B2B8 80241078 03E00008 */ jr $ra +/* A2B2BC 8024107C E44E0000 */ swc1 $f14, ($v0) +.L80241080: +/* A2B2C0 80241080 4602203C */ c.lt.s $f4, $f2 +/* A2B2C4 80241084 00000000 */ nop +/* A2B2C8 80241088 45000012 */ bc1f .L802410D4 +/* A2B2CC 8024108C 00000000 */ nop +/* A2B2D0 80241090 C4400000 */ lwc1 $f0, ($v0) +/* A2B2D4 80241094 46040000 */ add.s $f0, $f0, $f4 +/* A2B2D8 80241098 03E00008 */ jr $ra +/* A2B2DC 8024109C E4400000 */ swc1 $f0, ($v0) +.L802410A0: +/* A2B2E0 802410A0 4602003C */ c.lt.s $f0, $f2 +/* A2B2E4 802410A4 00000000 */ nop +/* A2B2E8 802410A8 4501FFF3 */ bc1t .L80241078 +/* A2B2EC 802410AC 00000000 */ nop +/* A2B2F0 802410B0 46002007 */ neg.s $f0, $f4 +/* A2B2F4 802410B4 4600103C */ c.lt.s $f2, $f0 +/* A2B2F8 802410B8 00000000 */ nop +/* A2B2FC 802410BC 45000005 */ bc1f .L802410D4 +/* A2B300 802410C0 00000000 */ nop +/* A2B304 802410C4 C4400000 */ lwc1 $f0, ($v0) +/* A2B308 802410C8 46040001 */ sub.s $f0, $f0, $f4 +/* A2B30C 802410CC 03E00008 */ jr $ra +/* A2B310 802410D0 E4400000 */ swc1 $f0, ($v0) +.L802410D4: +/* A2B314 802410D4 C4400000 */ lwc1 $f0, ($v0) +/* A2B318 802410D8 46020000 */ add.s $f0, $f0, $f2 +/* A2B31C 802410DC 03E00008 */ jr $ra +/* A2B320 802410E0 E4400000 */ swc1 $f0, ($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4.s deleted file mode 100644 index 64e35704c8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4.s +++ /dev/null @@ -1,114 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410E4 -/* A2B324 802410E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A2B328 802410E8 F7B40018 */ sdc1 $f20, 0x18($sp) -/* A2B32C 802410EC 4485A000 */ mtc1 $a1, $f20 -/* A2B330 802410F0 F7B60020 */ sdc1 $f22, 0x20($sp) -/* A2B334 802410F4 4486B000 */ mtc1 $a2, $f22 -/* A2B338 802410F8 44876000 */ mtc1 $a3, $f12 -/* A2B33C 802410FC C7A20038 */ lwc1 $f2, 0x38($sp) -/* A2B340 80241100 460C103C */ c.lt.s $f2, $f12 -/* A2B344 80241104 00000000 */ nop -/* A2B348 80241108 45000002 */ bc1f .L80241114 -/* A2B34C 8024110C AFBF0010 */ sw $ra, 0x10($sp) -/* A2B350 80241110 46001306 */ mov.s $f12, $f2 -.L80241114: -/* A2B354 80241114 24020002 */ addiu $v0, $zero, 2 -/* A2B358 80241118 10820016 */ beq $a0, $v0, .L80241174 -/* A2B35C 8024111C 28820003 */ slti $v0, $a0, 3 -/* A2B360 80241120 10400005 */ beqz $v0, .L80241138 -/* A2B364 80241124 24020001 */ addiu $v0, $zero, 1 -/* A2B368 80241128 1082000A */ beq $a0, $v0, .L80241154 -/* A2B36C 8024112C 46026303 */ div.s $f12, $f12, $f2 -/* A2B370 80241130 08090493 */ j .L8024124C -/* A2B374 80241134 4614B001 */ sub.s $f0, $f22, $f20 -.L80241138: -/* A2B378 80241138 24020003 */ addiu $v0, $zero, 3 -/* A2B37C 8024113C 10820021 */ beq $a0, $v0, .L802411C4 -/* A2B380 80241140 24020004 */ addiu $v0, $zero, 4 -/* A2B384 80241144 10820034 */ beq $a0, $v0, .L80241218 -/* A2B388 80241148 46026303 */ div.s $f12, $f12, $f2 -/* A2B38C 8024114C 08090493 */ j .L8024124C -/* A2B390 80241150 4614B001 */ sub.s $f0, $f22, $f20 -.L80241154: -/* A2B394 80241154 3C0142B4 */ lui $at, 0x42b4 -/* A2B398 80241158 44810000 */ mtc1 $at, $f0 -/* A2B39C 8024115C 00000000 */ nop -/* A2B3A0 80241160 46006302 */ mul.s $f12, $f12, $f0 -/* A2B3A4 80241164 0C00A8BB */ jal sin_deg -/* A2B3A8 80241168 00000000 */ nop -/* A2B3AC 8024116C 08090492 */ j .L80241248 -/* A2B3B0 80241170 46000306 */ mov.s $f12, $f0 -.L80241174: -/* A2B3B4 80241174 3C0141F0 */ lui $at, 0x41f0 -/* A2B3B8 80241178 44810000 */ mtc1 $at, $f0 -/* A2B3BC 8024117C 00000000 */ nop -/* A2B3C0 80241180 4600603C */ c.lt.s $f12, $f0 -/* A2B3C4 80241184 00000000 */ nop -/* A2B3C8 80241188 45020004 */ bc1fl .L8024119C -/* A2B3CC 8024118C 46006301 */ sub.s $f12, $f12, $f0 -/* A2B3D0 80241190 44806000 */ mtc1 $zero, $f12 -/* A2B3D4 80241194 08090493 */ j .L8024124C -/* A2B3D8 80241198 4614B001 */ sub.s $f0, $f22, $f20 -.L8024119C: -/* A2B3DC 8024119C 46001001 */ sub.s $f0, $f2, $f0 -/* A2B3E0 802411A0 3C0142B4 */ lui $at, 0x42b4 -/* A2B3E4 802411A4 44811000 */ mtc1 $at, $f2 -/* A2B3E8 802411A8 46006303 */ div.s $f12, $f12, $f0 -/* A2B3EC 802411AC 46026302 */ mul.s $f12, $f12, $f2 -/* A2B3F0 802411B0 00000000 */ nop -/* A2B3F4 802411B4 3C01C2B4 */ lui $at, 0xc2b4 -/* A2B3F8 802411B8 44810000 */ mtc1 $at, $f0 -/* A2B3FC 802411BC 0809048C */ j .L80241230 -/* A2B400 802411C0 46006300 */ add.s $f12, $f12, $f0 -.L802411C4: -/* A2B404 802411C4 3C014334 */ lui $at, 0x4334 -/* A2B408 802411C8 44810000 */ mtc1 $at, $f0 -/* A2B40C 802411CC 46026303 */ div.s $f12, $f12, $f2 -/* A2B410 802411D0 46006302 */ mul.s $f12, $f12, $f0 -/* A2B414 802411D4 00000000 */ nop -/* A2B418 802411D8 3C0142B4 */ lui $at, 0x42b4 -/* A2B41C 802411DC 44810000 */ mtc1 $at, $f0 -/* A2B420 802411E0 0C00A8BB */ jal sin_deg -/* A2B424 802411E4 46006301 */ sub.s $f12, $f12, $f0 -/* A2B428 802411E8 3C013F80 */ lui $at, 0x3f80 -/* A2B42C 802411EC 44811000 */ mtc1 $at, $f2 -/* A2B430 802411F0 00000000 */ nop -/* A2B434 802411F4 46020000 */ add.s $f0, $f0, $f2 -/* A2B438 802411F8 3C013FE0 */ lui $at, 0x3fe0 -/* A2B43C 802411FC 44811800 */ mtc1 $at, $f3 -/* A2B440 80241200 44801000 */ mtc1 $zero, $f2 -/* A2B444 80241204 46000021 */ cvt.d.s $f0, $f0 -/* A2B448 80241208 46220002 */ mul.d $f0, $f0, $f2 -/* A2B44C 8024120C 00000000 */ nop -/* A2B450 80241210 08090492 */ j .L80241248 -/* A2B454 80241214 46200320 */ cvt.s.d $f12, $f0 -.L80241218: -/* A2B458 80241218 3C0142B4 */ lui $at, 0x42b4 -/* A2B45C 8024121C 44810000 */ mtc1 $at, $f0 -/* A2B460 80241220 00000000 */ nop -/* A2B464 80241224 46006302 */ mul.s $f12, $f12, $f0 -/* A2B468 80241228 00000000 */ nop -/* A2B46C 8024122C 46006301 */ sub.s $f12, $f12, $f0 -.L80241230: -/* A2B470 80241230 0C00A8BB */ jal sin_deg -/* A2B474 80241234 00000000 */ nop -/* A2B478 80241238 3C013F80 */ lui $at, 0x3f80 -/* A2B47C 8024123C 44811000 */ mtc1 $at, $f2 -/* A2B480 80241240 00000000 */ nop -/* A2B484 80241244 46020300 */ add.s $f12, $f0, $f2 -.L80241248: -/* A2B488 80241248 4614B001 */ sub.s $f0, $f22, $f20 -.L8024124C: -/* A2B48C 8024124C 460C0002 */ mul.s $f0, $f0, $f12 -/* A2B490 80241250 00000000 */ nop -/* A2B494 80241254 4600A000 */ add.s $f0, $f20, $f0 -/* A2B498 80241258 8FA2003C */ lw $v0, 0x3c($sp) -/* A2B49C 8024125C E4400000 */ swc1 $f0, ($v0) -/* A2B4A0 80241260 8FBF0010 */ lw $ra, 0x10($sp) -/* A2B4A4 80241264 D7B60020 */ ldc1 $f22, 0x20($sp) -/* A2B4A8 80241268 D7B40018 */ ldc1 $f20, 0x18($sp) -/* A2B4AC 8024126C 03E00008 */ jr $ra -/* A2B4B0 80241270 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s new file mode 100644 index 0000000000..6860d47a41 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802410E4_A2B324.s @@ -0,0 +1,114 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410E4_A2B324 +/* A2B324 802410E4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A2B328 802410E8 F7B40018 */ sdc1 $f20, 0x18($sp) +/* A2B32C 802410EC 4485A000 */ mtc1 $a1, $f20 +/* A2B330 802410F0 F7B60020 */ sdc1 $f22, 0x20($sp) +/* A2B334 802410F4 4486B000 */ mtc1 $a2, $f22 +/* A2B338 802410F8 44876000 */ mtc1 $a3, $f12 +/* A2B33C 802410FC C7A20038 */ lwc1 $f2, 0x38($sp) +/* A2B340 80241100 460C103C */ c.lt.s $f2, $f12 +/* A2B344 80241104 00000000 */ nop +/* A2B348 80241108 45000002 */ bc1f .L80241114 +/* A2B34C 8024110C AFBF0010 */ sw $ra, 0x10($sp) +/* A2B350 80241110 46001306 */ mov.s $f12, $f2 +.L80241114: +/* A2B354 80241114 24020002 */ addiu $v0, $zero, 2 +/* A2B358 80241118 10820016 */ beq $a0, $v0, .L80241174 +/* A2B35C 8024111C 28820003 */ slti $v0, $a0, 3 +/* A2B360 80241120 10400005 */ beqz $v0, .L80241138 +/* A2B364 80241124 24020001 */ addiu $v0, $zero, 1 +/* A2B368 80241128 1082000A */ beq $a0, $v0, .L80241154 +/* A2B36C 8024112C 46026303 */ div.s $f12, $f12, $f2 +/* A2B370 80241130 08090493 */ j .L8024124C +/* A2B374 80241134 4614B001 */ sub.s $f0, $f22, $f20 +.L80241138: +/* A2B378 80241138 24020003 */ addiu $v0, $zero, 3 +/* A2B37C 8024113C 10820021 */ beq $a0, $v0, .L802411C4 +/* A2B380 80241140 24020004 */ addiu $v0, $zero, 4 +/* A2B384 80241144 10820034 */ beq $a0, $v0, .L80241218 +/* A2B388 80241148 46026303 */ div.s $f12, $f12, $f2 +/* A2B38C 8024114C 08090493 */ j .L8024124C +/* A2B390 80241150 4614B001 */ sub.s $f0, $f22, $f20 +.L80241154: +/* A2B394 80241154 3C0142B4 */ lui $at, 0x42b4 +/* A2B398 80241158 44810000 */ mtc1 $at, $f0 +/* A2B39C 8024115C 00000000 */ nop +/* A2B3A0 80241160 46006302 */ mul.s $f12, $f12, $f0 +/* A2B3A4 80241164 0C00A8BB */ jal sin_deg +/* A2B3A8 80241168 00000000 */ nop +/* A2B3AC 8024116C 08090492 */ j .L80241248 +/* A2B3B0 80241170 46000306 */ mov.s $f12, $f0 +.L80241174: +/* A2B3B4 80241174 3C0141F0 */ lui $at, 0x41f0 +/* A2B3B8 80241178 44810000 */ mtc1 $at, $f0 +/* A2B3BC 8024117C 00000000 */ nop +/* A2B3C0 80241180 4600603C */ c.lt.s $f12, $f0 +/* A2B3C4 80241184 00000000 */ nop +/* A2B3C8 80241188 45020004 */ bc1fl .L8024119C +/* A2B3CC 8024118C 46006301 */ sub.s $f12, $f12, $f0 +/* A2B3D0 80241190 44806000 */ mtc1 $zero, $f12 +/* A2B3D4 80241194 08090493 */ j .L8024124C +/* A2B3D8 80241198 4614B001 */ sub.s $f0, $f22, $f20 +.L8024119C: +/* A2B3DC 8024119C 46001001 */ sub.s $f0, $f2, $f0 +/* A2B3E0 802411A0 3C0142B4 */ lui $at, 0x42b4 +/* A2B3E4 802411A4 44811000 */ mtc1 $at, $f2 +/* A2B3E8 802411A8 46006303 */ div.s $f12, $f12, $f0 +/* A2B3EC 802411AC 46026302 */ mul.s $f12, $f12, $f2 +/* A2B3F0 802411B0 00000000 */ nop +/* A2B3F4 802411B4 3C01C2B4 */ lui $at, 0xc2b4 +/* A2B3F8 802411B8 44810000 */ mtc1 $at, $f0 +/* A2B3FC 802411BC 0809048C */ j .L80241230 +/* A2B400 802411C0 46006300 */ add.s $f12, $f12, $f0 +.L802411C4: +/* A2B404 802411C4 3C014334 */ lui $at, 0x4334 +/* A2B408 802411C8 44810000 */ mtc1 $at, $f0 +/* A2B40C 802411CC 46026303 */ div.s $f12, $f12, $f2 +/* A2B410 802411D0 46006302 */ mul.s $f12, $f12, $f0 +/* A2B414 802411D4 00000000 */ nop +/* A2B418 802411D8 3C0142B4 */ lui $at, 0x42b4 +/* A2B41C 802411DC 44810000 */ mtc1 $at, $f0 +/* A2B420 802411E0 0C00A8BB */ jal sin_deg +/* A2B424 802411E4 46006301 */ sub.s $f12, $f12, $f0 +/* A2B428 802411E8 3C013F80 */ lui $at, 0x3f80 +/* A2B42C 802411EC 44811000 */ mtc1 $at, $f2 +/* A2B430 802411F0 00000000 */ nop +/* A2B434 802411F4 46020000 */ add.s $f0, $f0, $f2 +/* A2B438 802411F8 3C013FE0 */ lui $at, 0x3fe0 +/* A2B43C 802411FC 44811800 */ mtc1 $at, $f3 +/* A2B440 80241200 44801000 */ mtc1 $zero, $f2 +/* A2B444 80241204 46000021 */ cvt.d.s $f0, $f0 +/* A2B448 80241208 46220002 */ mul.d $f0, $f0, $f2 +/* A2B44C 8024120C 00000000 */ nop +/* A2B450 80241210 08090492 */ j .L80241248 +/* A2B454 80241214 46200320 */ cvt.s.d $f12, $f0 +.L80241218: +/* A2B458 80241218 3C0142B4 */ lui $at, 0x42b4 +/* A2B45C 8024121C 44810000 */ mtc1 $at, $f0 +/* A2B460 80241220 00000000 */ nop +/* A2B464 80241224 46006302 */ mul.s $f12, $f12, $f0 +/* A2B468 80241228 00000000 */ nop +/* A2B46C 8024122C 46006301 */ sub.s $f12, $f12, $f0 +.L80241230: +/* A2B470 80241230 0C00A8BB */ jal sin_deg +/* A2B474 80241234 00000000 */ nop +/* A2B478 80241238 3C013F80 */ lui $at, 0x3f80 +/* A2B47C 8024123C 44811000 */ mtc1 $at, $f2 +/* A2B480 80241240 00000000 */ nop +/* A2B484 80241244 46020300 */ add.s $f12, $f0, $f2 +.L80241248: +/* A2B488 80241248 4614B001 */ sub.s $f0, $f22, $f20 +.L8024124C: +/* A2B48C 8024124C 460C0002 */ mul.s $f0, $f0, $f12 +/* A2B490 80241250 00000000 */ nop +/* A2B494 80241254 4600A000 */ add.s $f0, $f20, $f0 +/* A2B498 80241258 8FA2003C */ lw $v0, 0x3c($sp) +/* A2B49C 8024125C E4400000 */ swc1 $f0, ($v0) +/* A2B4A0 80241260 8FBF0010 */ lw $ra, 0x10($sp) +/* A2B4A4 80241264 D7B60020 */ ldc1 $f22, 0x20($sp) +/* A2B4A8 80241268 D7B40018 */ ldc1 $f20, 0x18($sp) +/* A2B4AC 8024126C 03E00008 */ jr $ra +/* A2B4B0 80241270 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274.s deleted file mode 100644 index 2fb0033a1e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274.s +++ /dev/null @@ -1,132 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241274 -/* A2B4B4 80241274 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A2B4B8 80241278 3C04800B */ lui $a0, %hi(gCameras) -/* A2B4BC 8024127C 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A2B4C0 80241280 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A2B4C4 80241284 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2B4C8 80241288 3C05800A */ lui $a1, 0x800a -/* A2B4CC 8024128C 8CA5A64C */ lw $a1, -0x59b4($a1) -/* A2B4D0 80241290 3C088025 */ lui $t0, 0x8025 -/* A2B4D4 80241294 250898D4 */ addiu $t0, $t0, -0x672c -/* A2B4D8 80241298 AFBF0030 */ sw $ra, 0x30($sp) -/* A2B4DC 8024129C AFB5002C */ sw $s5, 0x2c($sp) -/* A2B4E0 802412A0 AFB40028 */ sw $s4, 0x28($sp) -/* A2B4E4 802412A4 AFB30024 */ sw $s3, 0x24($sp) -/* A2B4E8 802412A8 AFB20020 */ sw $s2, 0x20($sp) -/* A2B4EC 802412AC AFB1001C */ sw $s1, 0x1c($sp) -/* A2B4F0 802412B0 AFB00018 */ sw $s0, 0x18($sp) -/* A2B4F4 802412B4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A2B4F8 802412B8 00031080 */ sll $v0, $v1, 2 -/* A2B4FC 802412BC 00431021 */ addu $v0, $v0, $v1 -/* A2B500 802412C0 00021080 */ sll $v0, $v0, 2 -/* A2B504 802412C4 00431023 */ subu $v0, $v0, $v1 -/* A2B508 802412C8 000218C0 */ sll $v1, $v0, 3 -/* A2B50C 802412CC 00431021 */ addu $v0, $v0, $v1 -/* A2B510 802412D0 000210C0 */ sll $v0, $v0, 3 -/* A2B514 802412D4 8D030000 */ lw $v1, ($t0) -/* A2B518 802412D8 10A30059 */ beq $a1, $v1, .L80241440 -/* A2B51C 802412DC 0044A821 */ addu $s5, $v0, $a0 -/* A2B520 802412E0 3C138025 */ lui $s3, 0x8025 -/* A2B524 802412E4 267398D0 */ addiu $s3, $s3, -0x6730 -/* A2B528 802412E8 3C01437A */ lui $at, 0x437a -/* A2B52C 802412EC 44816000 */ mtc1 $at, $f12 -/* A2B530 802412F0 8E660000 */ lw $a2, ($s3) -/* A2B534 802412F4 3C073F00 */ lui $a3, 0x3f00 -/* A2B538 802412F8 4480A000 */ mtc1 $zero, $f20 -/* A2B53C 802412FC AD050000 */ sw $a1, ($t0) -/* A2B540 80241300 AFB30010 */ sw $s3, 0x10($sp) -/* A2B544 80241304 0C090411 */ jal func_80241044 -/* A2B548 80241308 4600A386 */ mov.s $f14, $f20 -/* A2B54C 8024130C 24040002 */ addiu $a0, $zero, 2 -/* A2B550 80241310 3C108025 */ lui $s0, 0x8025 -/* A2B554 80241314 2610963C */ addiu $s0, $s0, -0x69c4 -/* A2B558 80241318 3C054302 */ lui $a1, 0x4302 -/* A2B55C 8024131C 34A56666 */ ori $a1, $a1, 0x6666 -/* A2B560 80241320 8E060004 */ lw $a2, 4($s0) -/* A2B564 80241324 4407A000 */ mfc1 $a3, $f20 -/* A2B568 80241328 3C0143EB */ lui $at, 0x43eb -/* A2B56C 8024132C 44810000 */ mtc1 $at, $f0 -/* A2B570 80241330 3C148025 */ lui $s4, 0x8025 -/* A2B574 80241334 269498D8 */ addiu $s4, $s4, -0x6728 -/* A2B578 80241338 AFB40014 */ sw $s4, 0x14($sp) -/* A2B57C 8024133C 0C090439 */ jal func_802410E4 -/* A2B580 80241340 E7A00010 */ swc1 $f0, 0x10($sp) -/* A2B584 80241344 3C128025 */ lui $s2, 0x8025 -/* A2B588 80241348 265298DC */ addiu $s2, $s2, -0x6724 -/* A2B58C 8024134C 3C014146 */ lui $at, 0x4146 -/* A2B590 80241350 34216666 */ ori $at, $at, 0x6666 -/* A2B594 80241354 44816000 */ mtc1 $at, $f12 -/* A2B598 80241358 C60E0008 */ lwc1 $f14, 8($s0) -/* A2B59C 8024135C 3C013D4C */ lui $at, 0x3d4c -/* A2B5A0 80241360 3421CCCD */ ori $at, $at, 0xcccd -/* A2B5A4 80241364 4481A000 */ mtc1 $at, $f20 -/* A2B5A8 80241368 8E460000 */ lw $a2, ($s2) -/* A2B5AC 8024136C 4407A000 */ mfc1 $a3, $f20 -/* A2B5B0 80241370 0C090411 */ jal func_80241044 -/* A2B5B4 80241374 AFB20010 */ sw $s2, 0x10($sp) -/* A2B5B8 80241378 3C118025 */ lui $s1, %hi(pause_items_get_row) -/* A2B5BC 8024137C 263198E0 */ addiu $s1, $s1, %lo(pause_items_get_row) -/* A2B5C0 80241380 3C01C186 */ lui $at, 0xc186 -/* A2B5C4 80241384 34216666 */ ori $at, $at, 0x6666 -/* A2B5C8 80241388 44816000 */ mtc1 $at, $f12 -/* A2B5CC 8024138C C60E0024 */ lwc1 $f14, 0x24($s0) -/* A2B5D0 80241390 8E260000 */ lw $a2, ($s1) -/* A2B5D4 80241394 4407A000 */ mfc1 $a3, $f20 -/* A2B5D8 80241398 0C090411 */ jal func_80241044 -/* A2B5DC 8024139C AFB10010 */ sw $s1, 0x10($sp) -/* A2B5E0 802413A0 3C108025 */ lui $s0, 0x8025 -/* A2B5E4 802413A4 261098E4 */ addiu $s0, $s0, -0x671c -/* A2B5E8 802413A8 3C014278 */ lui $at, 0x4278 -/* A2B5EC 802413AC 44816000 */ mtc1 $at, $f12 -/* A2B5F0 802413B0 3C014244 */ lui $at, 0x4244 -/* A2B5F4 802413B4 44817000 */ mtc1 $at, $f14 -/* A2B5F8 802413B8 8E060000 */ lw $a2, ($s0) -/* A2B5FC 802413BC 3C073DCC */ lui $a3, 0x3dcc -/* A2B600 802413C0 34E7CCCD */ ori $a3, $a3, 0xcccd -/* A2B604 802413C4 0C090411 */ jal func_80241044 -/* A2B608 802413C8 AFB00010 */ sw $s0, 0x10($sp) -/* A2B60C 802413CC 8E050000 */ lw $a1, ($s0) -/* A2B610 802413D0 0C090355 */ jal func_80240D54 -/* A2B614 802413D4 0000202D */ daddu $a0, $zero, $zero -/* A2B618 802413D8 C6800000 */ lwc1 $f0, ($s4) -/* A2B61C 802413DC C66C0000 */ lwc1 $f12, ($s3) -/* A2B620 802413E0 C6420000 */ lwc1 $f2, ($s2) -/* A2B624 802413E4 C6240000 */ lwc1 $f4, ($s1) -/* A2B628 802413E8 E6A004DC */ swc1 $f0, 0x4dc($s5) -/* A2B62C 802413EC E6A204E0 */ swc1 $f2, 0x4e0($s5) -/* A2B630 802413F0 0C00A8BB */ jal sin_deg -/* A2B634 802413F4 E6A404FC */ swc1 $f4, 0x4fc($s5) -/* A2B638 802413F8 3C0143FA */ lui $at, 0x43fa -/* A2B63C 802413FC 44811000 */ mtc1 $at, $f2 -/* A2B640 80241400 00000000 */ nop -/* A2B644 80241404 46020002 */ mul.s $f0, $f0, $f2 -/* A2B648 80241408 00000000 */ nop -/* A2B64C 8024140C C66C0000 */ lwc1 $f12, ($s3) -/* A2B650 80241410 0C00A8D4 */ jal cos_deg -/* A2B654 80241414 E6A004F0 */ swc1 $f0, 0x4f0($s5) -/* A2B658 80241418 3C01C3FA */ lui $at, 0xc3fa -/* A2B65C 8024141C 44811000 */ mtc1 $at, $f2 -/* A2B660 80241420 00000000 */ nop -/* A2B664 80241424 46020002 */ mul.s $f0, $f0, $f2 -/* A2B668 80241428 00000000 */ nop -/* A2B66C 8024142C 24020002 */ addiu $v0, $zero, 2 -/* A2B670 80241430 24030001 */ addiu $v1, $zero, 1 -/* A2B674 80241434 A6A30506 */ sh $v1, 0x506($s5) -/* A2B678 80241438 08090511 */ j .L80241444 -/* A2B67C 8024143C E6A004F8 */ swc1 $f0, 0x4f8($s5) -.L80241440: -/* A2B680 80241440 0000102D */ daddu $v0, $zero, $zero -.L80241444: -/* A2B684 80241444 8FBF0030 */ lw $ra, 0x30($sp) -/* A2B688 80241448 8FB5002C */ lw $s5, 0x2c($sp) -/* A2B68C 8024144C 8FB40028 */ lw $s4, 0x28($sp) -/* A2B690 80241450 8FB30024 */ lw $s3, 0x24($sp) -/* A2B694 80241454 8FB20020 */ lw $s2, 0x20($sp) -/* A2B698 80241458 8FB1001C */ lw $s1, 0x1c($sp) -/* A2B69C 8024145C 8FB00018 */ lw $s0, 0x18($sp) -/* A2B6A0 80241460 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A2B6A4 80241464 03E00008 */ jr $ra -/* A2B6A8 80241468 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s new file mode 100644 index 0000000000..935f900024 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241274_A2B4B4.s @@ -0,0 +1,132 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241274_A2B4B4 +/* A2B4B4 80241274 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A2B4B8 80241278 3C04800B */ lui $a0, %hi(gCameras) +/* A2B4BC 8024127C 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A2B4C0 80241280 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* A2B4C4 80241284 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* A2B4C8 80241288 3C05800A */ lui $a1, 0x800a +/* A2B4CC 8024128C 8CA5A64C */ lw $a1, -0x59b4($a1) +/* A2B4D0 80241290 3C088025 */ lui $t0, 0x8025 +/* A2B4D4 80241294 250898D4 */ addiu $t0, $t0, -0x672c +/* A2B4D8 80241298 AFBF0030 */ sw $ra, 0x30($sp) +/* A2B4DC 8024129C AFB5002C */ sw $s5, 0x2c($sp) +/* A2B4E0 802412A0 AFB40028 */ sw $s4, 0x28($sp) +/* A2B4E4 802412A4 AFB30024 */ sw $s3, 0x24($sp) +/* A2B4E8 802412A8 AFB20020 */ sw $s2, 0x20($sp) +/* A2B4EC 802412AC AFB1001C */ sw $s1, 0x1c($sp) +/* A2B4F0 802412B0 AFB00018 */ sw $s0, 0x18($sp) +/* A2B4F4 802412B4 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A2B4F8 802412B8 00031080 */ sll $v0, $v1, 2 +/* A2B4FC 802412BC 00431021 */ addu $v0, $v0, $v1 +/* A2B500 802412C0 00021080 */ sll $v0, $v0, 2 +/* A2B504 802412C4 00431023 */ subu $v0, $v0, $v1 +/* A2B508 802412C8 000218C0 */ sll $v1, $v0, 3 +/* A2B50C 802412CC 00431021 */ addu $v0, $v0, $v1 +/* A2B510 802412D0 000210C0 */ sll $v0, $v0, 3 +/* A2B514 802412D4 8D030000 */ lw $v1, ($t0) +/* A2B518 802412D8 10A30059 */ beq $a1, $v1, .L80241440 +/* A2B51C 802412DC 0044A821 */ addu $s5, $v0, $a0 +/* A2B520 802412E0 3C138025 */ lui $s3, 0x8025 +/* A2B524 802412E4 267398D0 */ addiu $s3, $s3, -0x6730 +/* A2B528 802412E8 3C01437A */ lui $at, 0x437a +/* A2B52C 802412EC 44816000 */ mtc1 $at, $f12 +/* A2B530 802412F0 8E660000 */ lw $a2, ($s3) +/* A2B534 802412F4 3C073F00 */ lui $a3, 0x3f00 +/* A2B538 802412F8 4480A000 */ mtc1 $zero, $f20 +/* A2B53C 802412FC AD050000 */ sw $a1, ($t0) +/* A2B540 80241300 AFB30010 */ sw $s3, 0x10($sp) +/* A2B544 80241304 0C090411 */ jal func_80241044_A2B284 +/* A2B548 80241308 4600A386 */ mov.s $f14, $f20 +/* A2B54C 8024130C 24040002 */ addiu $a0, $zero, 2 +/* A2B550 80241310 3C108025 */ lui $s0, 0x8025 +/* A2B554 80241314 2610963C */ addiu $s0, $s0, -0x69c4 +/* A2B558 80241318 3C054302 */ lui $a1, 0x4302 +/* A2B55C 8024131C 34A56666 */ ori $a1, $a1, 0x6666 +/* A2B560 80241320 8E060004 */ lw $a2, 4($s0) +/* A2B564 80241324 4407A000 */ mfc1 $a3, $f20 +/* A2B568 80241328 3C0143EB */ lui $at, 0x43eb +/* A2B56C 8024132C 44810000 */ mtc1 $at, $f0 +/* A2B570 80241330 3C148025 */ lui $s4, 0x8025 +/* A2B574 80241334 269498D8 */ addiu $s4, $s4, -0x6728 +/* A2B578 80241338 AFB40014 */ sw $s4, 0x14($sp) +/* A2B57C 8024133C 0C090439 */ jal func_802410E4_A2B324 +/* A2B580 80241340 E7A00010 */ swc1 $f0, 0x10($sp) +/* A2B584 80241344 3C128025 */ lui $s2, 0x8025 +/* A2B588 80241348 265298DC */ addiu $s2, $s2, -0x6724 +/* A2B58C 8024134C 3C014146 */ lui $at, 0x4146 +/* A2B590 80241350 34216666 */ ori $at, $at, 0x6666 +/* A2B594 80241354 44816000 */ mtc1 $at, $f12 +/* A2B598 80241358 C60E0008 */ lwc1 $f14, 8($s0) +/* A2B59C 8024135C 3C013D4C */ lui $at, 0x3d4c +/* A2B5A0 80241360 3421CCCD */ ori $at, $at, 0xcccd +/* A2B5A4 80241364 4481A000 */ mtc1 $at, $f20 +/* A2B5A8 80241368 8E460000 */ lw $a2, ($s2) +/* A2B5AC 8024136C 4407A000 */ mfc1 $a3, $f20 +/* A2B5B0 80241370 0C090411 */ jal func_80241044_A2B284 +/* A2B5B4 80241374 AFB20010 */ sw $s2, 0x10($sp) +/* A2B5B8 80241378 3C118025 */ lui $s1, %hi(pause_items_get_row) +/* A2B5BC 8024137C 263198E0 */ addiu $s1, $s1, %lo(pause_items_get_row) +/* A2B5C0 80241380 3C01C186 */ lui $at, 0xc186 +/* A2B5C4 80241384 34216666 */ ori $at, $at, 0x6666 +/* A2B5C8 80241388 44816000 */ mtc1 $at, $f12 +/* A2B5CC 8024138C C60E0024 */ lwc1 $f14, 0x24($s0) +/* A2B5D0 80241390 8E260000 */ lw $a2, ($s1) +/* A2B5D4 80241394 4407A000 */ mfc1 $a3, $f20 +/* A2B5D8 80241398 0C090411 */ jal func_80241044_A2B284 +/* A2B5DC 8024139C AFB10010 */ sw $s1, 0x10($sp) +/* A2B5E0 802413A0 3C108025 */ lui $s0, 0x8025 +/* A2B5E4 802413A4 261098E4 */ addiu $s0, $s0, -0x671c +/* A2B5E8 802413A8 3C014278 */ lui $at, 0x4278 +/* A2B5EC 802413AC 44816000 */ mtc1 $at, $f12 +/* A2B5F0 802413B0 3C014244 */ lui $at, 0x4244 +/* A2B5F4 802413B4 44817000 */ mtc1 $at, $f14 +/* A2B5F8 802413B8 8E060000 */ lw $a2, ($s0) +/* A2B5FC 802413BC 3C073DCC */ lui $a3, 0x3dcc +/* A2B600 802413C0 34E7CCCD */ ori $a3, $a3, 0xcccd +/* A2B604 802413C4 0C090411 */ jal func_80241044_A2B284 +/* A2B608 802413C8 AFB00010 */ sw $s0, 0x10($sp) +/* A2B60C 802413CC 8E050000 */ lw $a1, ($s0) +/* A2B610 802413D0 0C090355 */ jal func_80240D54_A2AF94 +/* A2B614 802413D4 0000202D */ daddu $a0, $zero, $zero +/* A2B618 802413D8 C6800000 */ lwc1 $f0, ($s4) +/* A2B61C 802413DC C66C0000 */ lwc1 $f12, ($s3) +/* A2B620 802413E0 C6420000 */ lwc1 $f2, ($s2) +/* A2B624 802413E4 C6240000 */ lwc1 $f4, ($s1) +/* A2B628 802413E8 E6A004DC */ swc1 $f0, 0x4dc($s5) +/* A2B62C 802413EC E6A204E0 */ swc1 $f2, 0x4e0($s5) +/* A2B630 802413F0 0C00A8BB */ jal sin_deg +/* A2B634 802413F4 E6A404FC */ swc1 $f4, 0x4fc($s5) +/* A2B638 802413F8 3C0143FA */ lui $at, 0x43fa +/* A2B63C 802413FC 44811000 */ mtc1 $at, $f2 +/* A2B640 80241400 00000000 */ nop +/* A2B644 80241404 46020002 */ mul.s $f0, $f0, $f2 +/* A2B648 80241408 00000000 */ nop +/* A2B64C 8024140C C66C0000 */ lwc1 $f12, ($s3) +/* A2B650 80241410 0C00A8D4 */ jal cos_deg +/* A2B654 80241414 E6A004F0 */ swc1 $f0, 0x4f0($s5) +/* A2B658 80241418 3C01C3FA */ lui $at, 0xc3fa +/* A2B65C 8024141C 44811000 */ mtc1 $at, $f2 +/* A2B660 80241420 00000000 */ nop +/* A2B664 80241424 46020002 */ mul.s $f0, $f0, $f2 +/* A2B668 80241428 00000000 */ nop +/* A2B66C 8024142C 24020002 */ addiu $v0, $zero, 2 +/* A2B670 80241430 24030001 */ addiu $v1, $zero, 1 +/* A2B674 80241434 A6A30506 */ sh $v1, 0x506($s5) +/* A2B678 80241438 08090511 */ j .L80241444 +/* A2B67C 8024143C E6A004F8 */ swc1 $f0, 0x4f8($s5) +.L80241440: +/* A2B680 80241440 0000102D */ daddu $v0, $zero, $zero +.L80241444: +/* A2B684 80241444 8FBF0030 */ lw $ra, 0x30($sp) +/* A2B688 80241448 8FB5002C */ lw $s5, 0x2c($sp) +/* A2B68C 8024144C 8FB40028 */ lw $s4, 0x28($sp) +/* A2B690 80241450 8FB30024 */ lw $s3, 0x24($sp) +/* A2B694 80241454 8FB20020 */ lw $s2, 0x20($sp) +/* A2B698 80241458 8FB1001C */ lw $s1, 0x1c($sp) +/* A2B69C 8024145C 8FB00018 */ lw $s0, 0x18($sp) +/* A2B6A0 80241460 D7B40038 */ ldc1 $f20, 0x38($sp) +/* A2B6A4 80241464 03E00008 */ jr $ra +/* A2B6A8 80241468 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s index cafbd75c1c..c7dc157247 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024146C_A2B6AC.s @@ -43,7 +43,7 @@ glabel func_8024146C_A2B6AC /* A2B740 80241500 4480B000 */ mtc1 $zero, $f22 /* A2B744 80241504 AD050000 */ sw $a1, ($t0) /* A2B748 80241508 AFB30010 */ sw $s3, 0x10($sp) -/* A2B74C 8024150C 0C090411 */ jal func_80241044 +/* A2B74C 8024150C 0C090411 */ jal func_80241044_A2B284 /* A2B750 80241510 4600B386 */ mov.s $f14, $f22 /* A2B754 80241514 24040002 */ addiu $a0, $zero, 2 /* A2B758 80241518 3C108025 */ lui $s0, 0x8025 @@ -61,7 +61,7 @@ glabel func_8024146C_A2B6AC /* A2B788 80241548 3C158025 */ lui $s5, 0x8025 /* A2B78C 8024154C 26B598E8 */ addiu $s5, $s5, -0x6718 /* A2B790 80241550 AFB50014 */ sw $s5, 0x14($sp) -/* A2B794 80241554 0C090439 */ jal func_802410E4 +/* A2B794 80241554 0C090439 */ jal func_802410E4_A2B324 /* A2B798 80241558 E7A00010 */ swc1 $f0, 0x10($sp) /* A2B79C 8024155C 3C128025 */ lui $s2, 0x8025 /* A2B7A0 80241560 265298EC */ addiu $s2, $s2, -0x6714 @@ -74,7 +74,7 @@ glabel func_8024146C_A2B6AC /* A2B7BC 8024157C 4481A000 */ mtc1 $at, $f20 /* A2B7C0 80241580 8E460000 */ lw $a2, ($s2) /* A2B7C4 80241584 4407A000 */ mfc1 $a3, $f20 -/* A2B7C8 80241588 0C090411 */ jal func_80241044 +/* A2B7C8 80241588 0C090411 */ jal func_80241044_A2B284 /* A2B7CC 8024158C AFB20010 */ sw $s2, 0x10($sp) /* A2B7D0 80241590 3C118025 */ lui $s1, 0x8025 /* A2B7D4 80241594 263198F0 */ addiu $s1, $s1, -0x6710 @@ -84,7 +84,7 @@ glabel func_8024146C_A2B6AC /* A2B7E4 802415A4 C60E0024 */ lwc1 $f14, 0x24($s0) /* A2B7E8 802415A8 8E260000 */ lw $a2, ($s1) /* A2B7EC 802415AC 4407A000 */ mfc1 $a3, $f20 -/* A2B7F0 802415B0 0C090411 */ jal func_80241044 +/* A2B7F0 802415B0 0C090411 */ jal func_80241044_A2B284 /* A2B7F4 802415B4 AFB10010 */ sw $s1, 0x10($sp) /* A2B7F8 802415B8 3C108025 */ lui $s0, 0x8025 /* A2B7FC 802415BC 261098F4 */ addiu $s0, $s0, -0x670c @@ -95,10 +95,10 @@ glabel func_8024146C_A2B6AC /* A2B810 802415D0 8E060000 */ lw $a2, ($s0) /* A2B814 802415D4 3C073DCC */ lui $a3, 0x3dcc /* A2B818 802415D8 34E7CCCD */ ori $a3, $a3, 0xcccd -/* A2B81C 802415DC 0C090411 */ jal func_80241044 +/* A2B81C 802415DC 0C090411 */ jal func_80241044_A2B284 /* A2B820 802415E0 AFB00010 */ sw $s0, 0x10($sp) /* A2B824 802415E4 8E050000 */ lw $a1, ($s0) -/* A2B828 802415E8 0C090355 */ jal func_80240D54 +/* A2B828 802415E8 0C090355 */ jal func_80240D54_A2AF94 /* A2B82C 802415EC 0000202D */ daddu $a0, $zero, $zero /* A2B830 802415F0 C6A00000 */ lwc1 $f0, ($s5) /* A2B834 802415F4 C66C0000 */ lwc1 $f12, ($s3) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC.s deleted file mode 100644 index c0ddc16436..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC.s +++ /dev/null @@ -1,108 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416BC -/* A2B8FC 802416BC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A2B900 802416C0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A2B904 802416C4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2B908 802416C8 3C04800B */ lui $a0, %hi(gCameras) -/* A2B90C 802416CC 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A2B910 802416D0 AFBF0020 */ sw $ra, 0x20($sp) -/* A2B914 802416D4 AFB3001C */ sw $s3, 0x1c($sp) -/* A2B918 802416D8 AFB20018 */ sw $s2, 0x18($sp) -/* A2B91C 802416DC AFB10014 */ sw $s1, 0x14($sp) -/* A2B920 802416E0 AFB00010 */ sw $s0, 0x10($sp) -/* A2B924 802416E4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A2B928 802416E8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A2B92C 802416EC 00031080 */ sll $v0, $v1, 2 -/* A2B930 802416F0 00431021 */ addu $v0, $v0, $v1 -/* A2B934 802416F4 00021080 */ sll $v0, $v0, 2 -/* A2B938 802416F8 00431023 */ subu $v0, $v0, $v1 -/* A2B93C 802416FC 000218C0 */ sll $v1, $v0, 3 -/* A2B940 80241700 00431021 */ addu $v0, $v0, $v1 -/* A2B944 80241704 000210C0 */ sll $v0, $v0, 3 -/* A2B948 80241708 10A00004 */ beqz $a1, .L8024171C -/* A2B94C 8024170C 00449021 */ addu $s2, $v0, $a0 -/* A2B950 80241710 96420000 */ lhu $v0, ($s2) -/* A2B954 80241714 34420008 */ ori $v0, $v0, 8 -/* A2B958 80241718 A6420000 */ sh $v0, ($s2) -.L8024171C: -/* A2B95C 8024171C 3C118025 */ lui $s1, 0x8025 -/* A2B960 80241720 26319900 */ addiu $s1, $s1, -0x6700 -/* A2B964 80241724 8E230000 */ lw $v1, ($s1) -/* A2B968 80241728 00031100 */ sll $v0, $v1, 4 -/* A2B96C 8024172C 00431023 */ subu $v0, $v0, $v1 -/* A2B970 80241730 00021080 */ sll $v0, $v0, 2 -/* A2B974 80241734 00431021 */ addu $v0, $v0, $v1 -/* A2B978 80241738 00021080 */ sll $v0, $v0, 2 -/* A2B97C 8024173C 00431023 */ subu $v0, $v0, $v1 -/* A2B980 80241740 00021040 */ sll $v0, $v0, 1 -/* A2B984 80241744 44826000 */ mtc1 $v0, $f12 -/* A2B988 80241748 00000000 */ nop -/* A2B98C 8024174C 46806320 */ cvt.s.w $f12, $f12 -/* A2B990 80241750 0C00A8BB */ jal sin_deg -/* A2B994 80241754 26530194 */ addiu $s3, $s2, 0x194 -/* A2B998 80241758 3C108025 */ lui $s0, 0x8025 -/* A2B99C 8024175C 26109904 */ addiu $s0, $s0, -0x66fc -/* A2B9A0 80241760 8E230000 */ lw $v1, ($s1) -/* A2B9A4 80241764 C6140000 */ lwc1 $f20, ($s0) -/* A2B9A8 80241768 000311C0 */ sll $v0, $v1, 7 -/* A2B9AC 8024176C 00431023 */ subu $v0, $v0, $v1 -/* A2B9B0 80241770 00021040 */ sll $v0, $v0, 1 -/* A2B9B4 80241774 4600A502 */ mul.s $f20, $f20, $f0 -/* A2B9B8 80241778 00000000 */ nop -/* A2B9BC 8024177C 44826000 */ mtc1 $v0, $f12 -/* A2B9C0 80241780 00000000 */ nop -/* A2B9C4 80241784 0C00A8D4 */ jal cos_deg -/* A2B9C8 80241788 46806320 */ cvt.s.w $f12, $f12 -/* A2B9CC 8024178C C6020000 */ lwc1 $f2, ($s0) -/* A2B9D0 80241790 46001082 */ mul.s $f2, $f2, $f0 -/* A2B9D4 80241794 00000000 */ nop -/* A2B9D8 80241798 4480B000 */ mtc1 $zero, $f22 -/* A2B9DC 8024179C 00000000 */ nop -/* A2B9E0 802417A0 4407B000 */ mfc1 $a3, $f22 -/* A2B9E4 802417A4 4405A000 */ mfc1 $a1, $f20 -/* A2B9E8 802417A8 44061000 */ mfc1 $a2, $f2 -/* A2B9EC 802417AC 0C019E40 */ jal guTranslateF -/* A2B9F0 802417B0 0260202D */ daddu $a0, $s3, $zero -/* A2B9F4 802417B4 C6020000 */ lwc1 $f2, ($s0) -/* A2B9F8 802417B8 3C014140 */ lui $at, 0x4140 -/* A2B9FC 802417BC 44810000 */ mtc1 $at, $f0 -/* A2BA00 802417C0 00000000 */ nop -/* A2BA04 802417C4 46020001 */ sub.s $f0, $f0, $f2 -/* A2BA08 802417C8 3C018025 */ lui $at, 0x8025 -/* A2BA0C 802417CC D424F1E8 */ ldc1 $f4, -0xe18($at) -/* A2BA10 802417D0 46000021 */ cvt.d.s $f0, $f0 -/* A2BA14 802417D4 46240002 */ mul.d $f0, $f0, $f4 -/* A2BA18 802417D8 00000000 */ nop -/* A2BA1C 802417DC 8E220000 */ lw $v0, ($s1) -/* A2BA20 802417E0 460010A1 */ cvt.d.s $f2, $f2 -/* A2BA24 802417E4 24420001 */ addiu $v0, $v0, 1 -/* A2BA28 802417E8 46201080 */ add.d $f2, $f2, $f0 -/* A2BA2C 802417EC AE220000 */ sw $v0, ($s1) -/* A2BA30 802417F0 28420015 */ slti $v0, $v0, 0x15 -/* A2BA34 802417F4 462010A0 */ cvt.s.d $f2, $f2 -/* A2BA38 802417F8 10400003 */ beqz $v0, .L80241808 -/* A2BA3C 802417FC E6020000 */ swc1 $f2, ($s0) -/* A2BA40 80241800 0809060B */ j .L8024182C -/* A2BA44 80241804 0000102D */ daddu $v0, $zero, $zero -.L80241808: -/* A2BA48 80241808 4405B000 */ mfc1 $a1, $f22 -/* A2BA4C 8024180C 0260202D */ daddu $a0, $s3, $zero -/* A2BA50 80241810 00A0302D */ daddu $a2, $a1, $zero -/* A2BA54 80241814 0C019E40 */ jal guTranslateF -/* A2BA58 80241818 00A0382D */ daddu $a3, $a1, $zero -/* A2BA5C 8024181C 96430000 */ lhu $v1, ($s2) -/* A2BA60 80241820 24020001 */ addiu $v0, $zero, 1 -/* A2BA64 80241824 3063FFF7 */ andi $v1, $v1, 0xfff7 -/* A2BA68 80241828 A6430000 */ sh $v1, ($s2) -.L8024182C: -/* A2BA6C 8024182C 8FBF0020 */ lw $ra, 0x20($sp) -/* A2BA70 80241830 8FB3001C */ lw $s3, 0x1c($sp) -/* A2BA74 80241834 8FB20018 */ lw $s2, 0x18($sp) -/* A2BA78 80241838 8FB10014 */ lw $s1, 0x14($sp) -/* A2BA7C 8024183C 8FB00010 */ lw $s0, 0x10($sp) -/* A2BA80 80241840 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A2BA84 80241844 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A2BA88 80241848 03E00008 */ jr $ra -/* A2BA8C 8024184C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s new file mode 100644 index 0000000000..4f095c8b67 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802416BC_A2B8FC.s @@ -0,0 +1,108 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416BC_A2B8FC +/* A2B8FC 802416BC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A2B900 802416C0 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* A2B904 802416C4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* A2B908 802416C8 3C04800B */ lui $a0, %hi(gCameras) +/* A2B90C 802416CC 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A2B910 802416D0 AFBF0020 */ sw $ra, 0x20($sp) +/* A2B914 802416D4 AFB3001C */ sw $s3, 0x1c($sp) +/* A2B918 802416D8 AFB20018 */ sw $s2, 0x18($sp) +/* A2B91C 802416DC AFB10014 */ sw $s1, 0x14($sp) +/* A2B920 802416E0 AFB00010 */ sw $s0, 0x10($sp) +/* A2B924 802416E4 F7B60030 */ sdc1 $f22, 0x30($sp) +/* A2B928 802416E8 F7B40028 */ sdc1 $f20, 0x28($sp) +/* A2B92C 802416EC 00031080 */ sll $v0, $v1, 2 +/* A2B930 802416F0 00431021 */ addu $v0, $v0, $v1 +/* A2B934 802416F4 00021080 */ sll $v0, $v0, 2 +/* A2B938 802416F8 00431023 */ subu $v0, $v0, $v1 +/* A2B93C 802416FC 000218C0 */ sll $v1, $v0, 3 +/* A2B940 80241700 00431021 */ addu $v0, $v0, $v1 +/* A2B944 80241704 000210C0 */ sll $v0, $v0, 3 +/* A2B948 80241708 10A00004 */ beqz $a1, .L8024171C +/* A2B94C 8024170C 00449021 */ addu $s2, $v0, $a0 +/* A2B950 80241710 96420000 */ lhu $v0, ($s2) +/* A2B954 80241714 34420008 */ ori $v0, $v0, 8 +/* A2B958 80241718 A6420000 */ sh $v0, ($s2) +.L8024171C: +/* A2B95C 8024171C 3C118025 */ lui $s1, 0x8025 +/* A2B960 80241720 26319900 */ addiu $s1, $s1, -0x6700 +/* A2B964 80241724 8E230000 */ lw $v1, ($s1) +/* A2B968 80241728 00031100 */ sll $v0, $v1, 4 +/* A2B96C 8024172C 00431023 */ subu $v0, $v0, $v1 +/* A2B970 80241730 00021080 */ sll $v0, $v0, 2 +/* A2B974 80241734 00431021 */ addu $v0, $v0, $v1 +/* A2B978 80241738 00021080 */ sll $v0, $v0, 2 +/* A2B97C 8024173C 00431023 */ subu $v0, $v0, $v1 +/* A2B980 80241740 00021040 */ sll $v0, $v0, 1 +/* A2B984 80241744 44826000 */ mtc1 $v0, $f12 +/* A2B988 80241748 00000000 */ nop +/* A2B98C 8024174C 46806320 */ cvt.s.w $f12, $f12 +/* A2B990 80241750 0C00A8BB */ jal sin_deg +/* A2B994 80241754 26530194 */ addiu $s3, $s2, 0x194 +/* A2B998 80241758 3C108025 */ lui $s0, 0x8025 +/* A2B99C 8024175C 26109904 */ addiu $s0, $s0, -0x66fc +/* A2B9A0 80241760 8E230000 */ lw $v1, ($s1) +/* A2B9A4 80241764 C6140000 */ lwc1 $f20, ($s0) +/* A2B9A8 80241768 000311C0 */ sll $v0, $v1, 7 +/* A2B9AC 8024176C 00431023 */ subu $v0, $v0, $v1 +/* A2B9B0 80241770 00021040 */ sll $v0, $v0, 1 +/* A2B9B4 80241774 4600A502 */ mul.s $f20, $f20, $f0 +/* A2B9B8 80241778 00000000 */ nop +/* A2B9BC 8024177C 44826000 */ mtc1 $v0, $f12 +/* A2B9C0 80241780 00000000 */ nop +/* A2B9C4 80241784 0C00A8D4 */ jal cos_deg +/* A2B9C8 80241788 46806320 */ cvt.s.w $f12, $f12 +/* A2B9CC 8024178C C6020000 */ lwc1 $f2, ($s0) +/* A2B9D0 80241790 46001082 */ mul.s $f2, $f2, $f0 +/* A2B9D4 80241794 00000000 */ nop +/* A2B9D8 80241798 4480B000 */ mtc1 $zero, $f22 +/* A2B9DC 8024179C 00000000 */ nop +/* A2B9E0 802417A0 4407B000 */ mfc1 $a3, $f22 +/* A2B9E4 802417A4 4405A000 */ mfc1 $a1, $f20 +/* A2B9E8 802417A8 44061000 */ mfc1 $a2, $f2 +/* A2B9EC 802417AC 0C019E40 */ jal guTranslateF +/* A2B9F0 802417B0 0260202D */ daddu $a0, $s3, $zero +/* A2B9F4 802417B4 C6020000 */ lwc1 $f2, ($s0) +/* A2B9F8 802417B8 3C014140 */ lui $at, 0x4140 +/* A2B9FC 802417BC 44810000 */ mtc1 $at, $f0 +/* A2BA00 802417C0 00000000 */ nop +/* A2BA04 802417C4 46020001 */ sub.s $f0, $f0, $f2 +/* A2BA08 802417C8 3C018025 */ lui $at, 0x8025 +/* A2BA0C 802417CC D424F1E8 */ ldc1 $f4, -0xe18($at) +/* A2BA10 802417D0 46000021 */ cvt.d.s $f0, $f0 +/* A2BA14 802417D4 46240002 */ mul.d $f0, $f0, $f4 +/* A2BA18 802417D8 00000000 */ nop +/* A2BA1C 802417DC 8E220000 */ lw $v0, ($s1) +/* A2BA20 802417E0 460010A1 */ cvt.d.s $f2, $f2 +/* A2BA24 802417E4 24420001 */ addiu $v0, $v0, 1 +/* A2BA28 802417E8 46201080 */ add.d $f2, $f2, $f0 +/* A2BA2C 802417EC AE220000 */ sw $v0, ($s1) +/* A2BA30 802417F0 28420015 */ slti $v0, $v0, 0x15 +/* A2BA34 802417F4 462010A0 */ cvt.s.d $f2, $f2 +/* A2BA38 802417F8 10400003 */ beqz $v0, .L80241808 +/* A2BA3C 802417FC E6020000 */ swc1 $f2, ($s0) +/* A2BA40 80241800 0809060B */ j .L8024182C +/* A2BA44 80241804 0000102D */ daddu $v0, $zero, $zero +.L80241808: +/* A2BA48 80241808 4405B000 */ mfc1 $a1, $f22 +/* A2BA4C 8024180C 0260202D */ daddu $a0, $s3, $zero +/* A2BA50 80241810 00A0302D */ daddu $a2, $a1, $zero +/* A2BA54 80241814 0C019E40 */ jal guTranslateF +/* A2BA58 80241818 00A0382D */ daddu $a3, $a1, $zero +/* A2BA5C 8024181C 96430000 */ lhu $v1, ($s2) +/* A2BA60 80241820 24020001 */ addiu $v0, $zero, 1 +/* A2BA64 80241824 3063FFF7 */ andi $v1, $v1, 0xfff7 +/* A2BA68 80241828 A6430000 */ sh $v1, ($s2) +.L8024182C: +/* A2BA6C 8024182C 8FBF0020 */ lw $ra, 0x20($sp) +/* A2BA70 80241830 8FB3001C */ lw $s3, 0x1c($sp) +/* A2BA74 80241834 8FB20018 */ lw $s2, 0x18($sp) +/* A2BA78 80241838 8FB10014 */ lw $s1, 0x14($sp) +/* A2BA7C 8024183C 8FB00010 */ lw $s0, 0x10($sp) +/* A2BA80 80241840 D7B60030 */ ldc1 $f22, 0x30($sp) +/* A2BA84 80241844 D7B40028 */ ldc1 $f20, 0x28($sp) +/* A2BA88 80241848 03E00008 */ jr $ra +/* A2BA8C 8024184C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850.s deleted file mode 100644 index 2e63c1662e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241850 -/* A2BA90 80241850 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A2BA94 80241854 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A2BA98 80241858 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2BA9C 8024185C 3C04800B */ lui $a0, %hi(gCameras) -/* A2BAA0 80241860 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A2BAA4 80241864 AFBF0064 */ sw $ra, 0x64($sp) -/* A2BAA8 80241868 AFB20060 */ sw $s2, 0x60($sp) -/* A2BAAC 8024186C AFB1005C */ sw $s1, 0x5c($sp) -/* A2BAB0 80241870 AFB00058 */ sw $s0, 0x58($sp) -/* A2BAB4 80241874 F7B80078 */ sdc1 $f24, 0x78($sp) -/* A2BAB8 80241878 F7B60070 */ sdc1 $f22, 0x70($sp) -/* A2BABC 8024187C F7B40068 */ sdc1 $f20, 0x68($sp) -/* A2BAC0 80241880 00031080 */ sll $v0, $v1, 2 -/* A2BAC4 80241884 00431021 */ addu $v0, $v0, $v1 -/* A2BAC8 80241888 00021080 */ sll $v0, $v0, 2 -/* A2BACC 8024188C 00431023 */ subu $v0, $v0, $v1 -/* A2BAD0 80241890 000218C0 */ sll $v1, $v0, 3 -/* A2BAD4 80241894 00431021 */ addu $v0, $v0, $v1 -/* A2BAD8 80241898 000210C0 */ sll $v0, $v0, 3 -/* A2BADC 8024189C 10A00004 */ beqz $a1, .L802418B0 -/* A2BAE0 802418A0 00448821 */ addu $s1, $v0, $a0 -/* A2BAE4 802418A4 96220000 */ lhu $v0, ($s1) -/* A2BAE8 802418A8 34420008 */ ori $v0, $v0, 8 -/* A2BAEC 802418AC A6220000 */ sh $v0, ($s1) -.L802418B0: -/* A2BAF0 802418B0 3C128025 */ lui $s2, 0x8025 -/* A2BAF4 802418B4 26529908 */ addiu $s2, $s2, -0x66f8 -/* A2BAF8 802418B8 8E430000 */ lw $v1, ($s2) -/* A2BAFC 802418BC 00031100 */ sll $v0, $v1, 4 -/* A2BB00 802418C0 00431023 */ subu $v0, $v0, $v1 -/* A2BB04 802418C4 00021080 */ sll $v0, $v0, 2 -/* A2BB08 802418C8 00431021 */ addu $v0, $v0, $v1 -/* A2BB0C 802418CC 00021080 */ sll $v0, $v0, 2 -/* A2BB10 802418D0 00431023 */ subu $v0, $v0, $v1 -/* A2BB14 802418D4 00021040 */ sll $v0, $v0, 1 -/* A2BB18 802418D8 44826000 */ mtc1 $v0, $f12 -/* A2BB1C 802418DC 00000000 */ nop -/* A2BB20 802418E0 0C00A8BB */ jal sin_deg -/* A2BB24 802418E4 46806320 */ cvt.s.w $f12, $f12 -/* A2BB28 802418E8 3C108025 */ lui $s0, 0x8025 -/* A2BB2C 802418EC 2610990C */ addiu $s0, $s0, -0x66f4 -/* A2BB30 802418F0 8E430000 */ lw $v1, ($s2) -/* A2BB34 802418F4 C6160000 */ lwc1 $f22, ($s0) -/* A2BB38 802418F8 000311C0 */ sll $v0, $v1, 7 -/* A2BB3C 802418FC 00431023 */ subu $v0, $v0, $v1 -/* A2BB40 80241900 00021040 */ sll $v0, $v0, 1 -/* A2BB44 80241904 4600B582 */ mul.s $f22, $f22, $f0 -/* A2BB48 80241908 00000000 */ nop -/* A2BB4C 8024190C 44826000 */ mtc1 $v0, $f12 -/* A2BB50 80241910 00000000 */ nop -/* A2BB54 80241914 0C00A8D4 */ jal cos_deg -/* A2BB58 80241918 46806320 */ cvt.s.w $f12, $f12 -/* A2BB5C 8024191C C6140000 */ lwc1 $f20, ($s0) -/* A2BB60 80241920 4600A502 */ mul.s $f20, $f20, $f0 -/* A2BB64 80241924 00000000 */ nop -/* A2BB68 80241928 4480C000 */ mtc1 $zero, $f24 -/* A2BB6C 8024192C 26300194 */ addiu $s0, $s1, 0x194 -/* A2BB70 80241930 4407C000 */ mfc1 $a3, $f24 -/* A2BB74 80241934 4405B000 */ mfc1 $a1, $f22 -/* A2BB78 80241938 4406A000 */ mfc1 $a2, $f20 -/* A2BB7C 8024193C 0C019E40 */ jal guTranslateF -/* A2BB80 80241940 0200202D */ daddu $a0, $s0, $zero -/* A2BB84 80241944 4405B000 */ mfc1 $a1, $f22 -/* A2BB88 80241948 4406A000 */ mfc1 $a2, $f20 -/* A2BB8C 8024194C 4407C000 */ mfc1 $a3, $f24 -/* A2BB90 80241950 3C0141A0 */ lui $at, 0x41a0 -/* A2BB94 80241954 4481B000 */ mtc1 $at, $f22 -/* A2BB98 80241958 0C019E40 */ jal guTranslateF -/* A2BB9C 8024195C 0200202D */ daddu $a0, $s0, $zero -/* A2BBA0 80241960 4405B000 */ mfc1 $a1, $f22 -/* A2BBA4 80241964 4406C000 */ mfc1 $a2, $f24 -/* A2BBA8 80241968 4407C000 */ mfc1 $a3, $f24 -/* A2BBAC 8024196C 3C013F80 */ lui $at, 0x3f80 -/* A2BBB0 80241970 4481A000 */ mtc1 $at, $f20 -/* A2BBB4 80241974 27A40018 */ addiu $a0, $sp, 0x18 -/* A2BBB8 80241978 0C019EC8 */ jal guRotateF -/* A2BBBC 8024197C E7B40010 */ swc1 $f20, 0x10($sp) -/* A2BBC0 80241980 27A40018 */ addiu $a0, $sp, 0x18 -/* A2BBC4 80241984 0200282D */ daddu $a1, $s0, $zero -/* A2BBC8 80241988 0C019D80 */ jal guMtxCatF -/* A2BBCC 8024198C 0200302D */ daddu $a2, $s0, $zero -/* A2BBD0 80241990 8E430000 */ lw $v1, ($s2) -/* A2BBD4 80241994 24020001 */ addiu $v0, $zero, 1 -/* A2BBD8 80241998 A6220506 */ sh $v0, 0x506($s1) -/* A2BBDC 8024199C 2862000A */ slti $v0, $v1, 0xa -/* A2BBE0 802419A0 10400004 */ beqz $v0, .L802419B4 -/* A2BBE4 802419A4 24620001 */ addiu $v0, $v1, 1 -/* A2BBE8 802419A8 AE420000 */ sw $v0, ($s2) -/* A2BBEC 802419AC 08090674 */ j .L802419D0 -/* A2BBF0 802419B0 0000102D */ daddu $v0, $zero, $zero -.L802419B4: -/* A2BBF4 802419B4 4405B000 */ mfc1 $a1, $f22 -/* A2BBF8 802419B8 4406C000 */ mfc1 $a2, $f24 -/* A2BBFC 802419BC 0200202D */ daddu $a0, $s0, $zero -/* A2BC00 802419C0 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2BC04 802419C4 0C019EC8 */ jal guRotateF -/* A2BC08 802419C8 00C0382D */ daddu $a3, $a2, $zero -/* A2BC0C 802419CC 24020001 */ addiu $v0, $zero, 1 -.L802419D0: -/* A2BC10 802419D0 8FBF0064 */ lw $ra, 0x64($sp) -/* A2BC14 802419D4 8FB20060 */ lw $s2, 0x60($sp) -/* A2BC18 802419D8 8FB1005C */ lw $s1, 0x5c($sp) -/* A2BC1C 802419DC 8FB00058 */ lw $s0, 0x58($sp) -/* A2BC20 802419E0 D7B80078 */ ldc1 $f24, 0x78($sp) -/* A2BC24 802419E4 D7B60070 */ ldc1 $f22, 0x70($sp) -/* A2BC28 802419E8 D7B40068 */ ldc1 $f20, 0x68($sp) -/* A2BC2C 802419EC 03E00008 */ jr $ra -/* A2BC30 802419F0 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s new file mode 100644 index 0000000000..b9b00847c0 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241850_A2BA90.s @@ -0,0 +1,112 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241850_A2BA90 +/* A2BA90 80241850 27BDFF80 */ addiu $sp, $sp, -0x80 +/* A2BA94 80241854 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* A2BA98 80241858 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* A2BA9C 8024185C 3C04800B */ lui $a0, %hi(gCameras) +/* A2BAA0 80241860 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A2BAA4 80241864 AFBF0064 */ sw $ra, 0x64($sp) +/* A2BAA8 80241868 AFB20060 */ sw $s2, 0x60($sp) +/* A2BAAC 8024186C AFB1005C */ sw $s1, 0x5c($sp) +/* A2BAB0 80241870 AFB00058 */ sw $s0, 0x58($sp) +/* A2BAB4 80241874 F7B80078 */ sdc1 $f24, 0x78($sp) +/* A2BAB8 80241878 F7B60070 */ sdc1 $f22, 0x70($sp) +/* A2BABC 8024187C F7B40068 */ sdc1 $f20, 0x68($sp) +/* A2BAC0 80241880 00031080 */ sll $v0, $v1, 2 +/* A2BAC4 80241884 00431021 */ addu $v0, $v0, $v1 +/* A2BAC8 80241888 00021080 */ sll $v0, $v0, 2 +/* A2BACC 8024188C 00431023 */ subu $v0, $v0, $v1 +/* A2BAD0 80241890 000218C0 */ sll $v1, $v0, 3 +/* A2BAD4 80241894 00431021 */ addu $v0, $v0, $v1 +/* A2BAD8 80241898 000210C0 */ sll $v0, $v0, 3 +/* A2BADC 8024189C 10A00004 */ beqz $a1, .L802418B0 +/* A2BAE0 802418A0 00448821 */ addu $s1, $v0, $a0 +/* A2BAE4 802418A4 96220000 */ lhu $v0, ($s1) +/* A2BAE8 802418A8 34420008 */ ori $v0, $v0, 8 +/* A2BAEC 802418AC A6220000 */ sh $v0, ($s1) +.L802418B0: +/* A2BAF0 802418B0 3C128025 */ lui $s2, 0x8025 +/* A2BAF4 802418B4 26529908 */ addiu $s2, $s2, -0x66f8 +/* A2BAF8 802418B8 8E430000 */ lw $v1, ($s2) +/* A2BAFC 802418BC 00031100 */ sll $v0, $v1, 4 +/* A2BB00 802418C0 00431023 */ subu $v0, $v0, $v1 +/* A2BB04 802418C4 00021080 */ sll $v0, $v0, 2 +/* A2BB08 802418C8 00431021 */ addu $v0, $v0, $v1 +/* A2BB0C 802418CC 00021080 */ sll $v0, $v0, 2 +/* A2BB10 802418D0 00431023 */ subu $v0, $v0, $v1 +/* A2BB14 802418D4 00021040 */ sll $v0, $v0, 1 +/* A2BB18 802418D8 44826000 */ mtc1 $v0, $f12 +/* A2BB1C 802418DC 00000000 */ nop +/* A2BB20 802418E0 0C00A8BB */ jal sin_deg +/* A2BB24 802418E4 46806320 */ cvt.s.w $f12, $f12 +/* A2BB28 802418E8 3C108025 */ lui $s0, 0x8025 +/* A2BB2C 802418EC 2610990C */ addiu $s0, $s0, -0x66f4 +/* A2BB30 802418F0 8E430000 */ lw $v1, ($s2) +/* A2BB34 802418F4 C6160000 */ lwc1 $f22, ($s0) +/* A2BB38 802418F8 000311C0 */ sll $v0, $v1, 7 +/* A2BB3C 802418FC 00431023 */ subu $v0, $v0, $v1 +/* A2BB40 80241900 00021040 */ sll $v0, $v0, 1 +/* A2BB44 80241904 4600B582 */ mul.s $f22, $f22, $f0 +/* A2BB48 80241908 00000000 */ nop +/* A2BB4C 8024190C 44826000 */ mtc1 $v0, $f12 +/* A2BB50 80241910 00000000 */ nop +/* A2BB54 80241914 0C00A8D4 */ jal cos_deg +/* A2BB58 80241918 46806320 */ cvt.s.w $f12, $f12 +/* A2BB5C 8024191C C6140000 */ lwc1 $f20, ($s0) +/* A2BB60 80241920 4600A502 */ mul.s $f20, $f20, $f0 +/* A2BB64 80241924 00000000 */ nop +/* A2BB68 80241928 4480C000 */ mtc1 $zero, $f24 +/* A2BB6C 8024192C 26300194 */ addiu $s0, $s1, 0x194 +/* A2BB70 80241930 4407C000 */ mfc1 $a3, $f24 +/* A2BB74 80241934 4405B000 */ mfc1 $a1, $f22 +/* A2BB78 80241938 4406A000 */ mfc1 $a2, $f20 +/* A2BB7C 8024193C 0C019E40 */ jal guTranslateF +/* A2BB80 80241940 0200202D */ daddu $a0, $s0, $zero +/* A2BB84 80241944 4405B000 */ mfc1 $a1, $f22 +/* A2BB88 80241948 4406A000 */ mfc1 $a2, $f20 +/* A2BB8C 8024194C 4407C000 */ mfc1 $a3, $f24 +/* A2BB90 80241950 3C0141A0 */ lui $at, 0x41a0 +/* A2BB94 80241954 4481B000 */ mtc1 $at, $f22 +/* A2BB98 80241958 0C019E40 */ jal guTranslateF +/* A2BB9C 8024195C 0200202D */ daddu $a0, $s0, $zero +/* A2BBA0 80241960 4405B000 */ mfc1 $a1, $f22 +/* A2BBA4 80241964 4406C000 */ mfc1 $a2, $f24 +/* A2BBA8 80241968 4407C000 */ mfc1 $a3, $f24 +/* A2BBAC 8024196C 3C013F80 */ lui $at, 0x3f80 +/* A2BBB0 80241970 4481A000 */ mtc1 $at, $f20 +/* A2BBB4 80241974 27A40018 */ addiu $a0, $sp, 0x18 +/* A2BBB8 80241978 0C019EC8 */ jal guRotateF +/* A2BBBC 8024197C E7B40010 */ swc1 $f20, 0x10($sp) +/* A2BBC0 80241980 27A40018 */ addiu $a0, $sp, 0x18 +/* A2BBC4 80241984 0200282D */ daddu $a1, $s0, $zero +/* A2BBC8 80241988 0C019D80 */ jal guMtxCatF +/* A2BBCC 8024198C 0200302D */ daddu $a2, $s0, $zero +/* A2BBD0 80241990 8E430000 */ lw $v1, ($s2) +/* A2BBD4 80241994 24020001 */ addiu $v0, $zero, 1 +/* A2BBD8 80241998 A6220506 */ sh $v0, 0x506($s1) +/* A2BBDC 8024199C 2862000A */ slti $v0, $v1, 0xa +/* A2BBE0 802419A0 10400004 */ beqz $v0, .L802419B4 +/* A2BBE4 802419A4 24620001 */ addiu $v0, $v1, 1 +/* A2BBE8 802419A8 AE420000 */ sw $v0, ($s2) +/* A2BBEC 802419AC 08090674 */ j .L802419D0 +/* A2BBF0 802419B0 0000102D */ daddu $v0, $zero, $zero +.L802419B4: +/* A2BBF4 802419B4 4405B000 */ mfc1 $a1, $f22 +/* A2BBF8 802419B8 4406C000 */ mfc1 $a2, $f24 +/* A2BBFC 802419BC 0200202D */ daddu $a0, $s0, $zero +/* A2BC00 802419C0 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2BC04 802419C4 0C019EC8 */ jal guRotateF +/* A2BC08 802419C8 00C0382D */ daddu $a3, $a2, $zero +/* A2BC0C 802419CC 24020001 */ addiu $v0, $zero, 1 +.L802419D0: +/* A2BC10 802419D0 8FBF0064 */ lw $ra, 0x64($sp) +/* A2BC14 802419D4 8FB20060 */ lw $s2, 0x60($sp) +/* A2BC18 802419D8 8FB1005C */ lw $s1, 0x5c($sp) +/* A2BC1C 802419DC 8FB00058 */ lw $s0, 0x58($sp) +/* A2BC20 802419E0 D7B80078 */ ldc1 $f24, 0x78($sp) +/* A2BC24 802419E4 D7B60070 */ ldc1 $f22, 0x70($sp) +/* A2BC28 802419E8 D7B40068 */ ldc1 $f20, 0x68($sp) +/* A2BC2C 802419EC 03E00008 */ jr $ra +/* A2BC30 802419F0 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4.s deleted file mode 100644 index 48e4da02d7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4.s +++ /dev/null @@ -1,90 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419F4 -/* A2BC34 802419F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A2BC38 802419F8 AFB00010 */ sw $s0, 0x10($sp) -/* A2BC3C 802419FC 0080802D */ daddu $s0, $a0, $zero -/* A2BC40 80241A00 AFB10014 */ sw $s1, 0x14($sp) -/* A2BC44 80241A04 00A0882D */ daddu $s1, $a1, $zero -/* A2BC48 80241A08 AFBF0018 */ sw $ra, 0x18($sp) -/* A2BC4C 80241A0C 0C0B36B0 */ jal resolve_npc -/* A2BC50 80241A10 24050007 */ addiu $a1, $zero, 7 -/* A2BC54 80241A14 0200202D */ daddu $a0, $s0, $zero -/* A2BC58 80241A18 24050008 */ addiu $a1, $zero, 8 -/* A2BC5C 80241A1C 0C0B36B0 */ jal resolve_npc -/* A2BC60 80241A20 0040802D */ daddu $s0, $v0, $zero -/* A2BC64 80241A24 12200017 */ beqz $s1, .L80241A84 -/* A2BC68 80241A28 0040282D */ daddu $a1, $v0, $zero -/* A2BC6C 80241A2C 3C01C280 */ lui $at, 0xc280 -/* A2BC70 80241A30 44810000 */ mtc1 $at, $f0 -/* A2BC74 80241A34 3C0143C8 */ lui $at, 0x43c8 -/* A2BC78 80241A38 44811000 */ mtc1 $at, $f2 -/* A2BC7C 80241A3C 3C0142AA */ lui $at, 0x42aa -/* A2BC80 80241A40 44812000 */ mtc1 $at, $f4 -/* A2BC84 80241A44 E6000038 */ swc1 $f0, 0x38($s0) -/* A2BC88 80241A48 E602003C */ swc1 $f2, 0x3c($s0) -/* A2BC8C 80241A4C E6040040 */ swc1 $f4, 0x40($s0) -/* A2BC90 80241A50 E4A00038 */ swc1 $f0, 0x38($a1) -/* A2BC94 80241A54 E4A2003C */ swc1 $f2, 0x3c($a1) -/* A2BC98 80241A58 E4A40040 */ swc1 $f4, 0x40($a1) -/* A2BC9C 80241A5C C6000038 */ lwc1 $f0, 0x38($s0) -/* A2BCA0 80241A60 E600006C */ swc1 $f0, 0x6c($s0) -/* A2BCA4 80241A64 C4A00038 */ lwc1 $f0, 0x38($a1) -/* A2BCA8 80241A68 E4A0006C */ swc1 $f0, 0x6c($a1) -/* A2BCAC 80241A6C C6000040 */ lwc1 $f0, 0x40($s0) -/* A2BCB0 80241A70 E6000074 */ swc1 $f0, 0x74($s0) -/* A2BCB4 80241A74 C4A00040 */ lwc1 $f0, 0x40($a1) -/* A2BCB8 80241A78 3C018025 */ lui $at, 0x8025 -/* A2BCBC 80241A7C E422F2C8 */ swc1 $f2, -0xd38($at) -/* A2BCC0 80241A80 E4A00074 */ swc1 $f0, 0x74($a1) -.L80241A84: -/* A2BCC4 80241A84 3C038025 */ lui $v1, 0x8025 -/* A2BCC8 80241A88 8C639910 */ lw $v1, -0x66f0($v1) -/* A2BCCC 80241A8C 28620014 */ slti $v0, $v1, 0x14 -/* A2BCD0 80241A90 10400009 */ beqz $v0, .L80241AB8 -/* A2BCD4 80241A94 00031040 */ sll $v0, $v1, 1 -/* A2BCD8 80241A98 3C018025 */ lui $at, 0x8025 -/* A2BCDC 80241A9C 00220821 */ addu $at, $at, $v0 -/* A2BCE0 80241AA0 84229934 */ lh $v0, -0x66cc($at) -/* A2BCE4 80241AA4 44820000 */ mtc1 $v0, $f0 -/* A2BCE8 80241AA8 00000000 */ nop -/* A2BCEC 80241AAC 46800020 */ cvt.s.w $f0, $f0 -/* A2BCF0 80241AB0 080906BE */ j .L80241AF8 -/* A2BCF4 80241AB4 E600003C */ swc1 $f0, 0x3c($s0) -.L80241AB8: -/* A2BCF8 80241AB8 2462FFEC */ addiu $v0, $v1, -0x14 -/* A2BCFC 80241ABC 3042001E */ andi $v0, $v0, 0x1e -/* A2BD00 80241AC0 3C018025 */ lui $at, 0x8025 -/* A2BD04 80241AC4 00220821 */ addu $at, $at, $v0 -/* A2BD08 80241AC8 84229914 */ lh $v0, -0x66ec($at) -/* A2BD0C 80241ACC 3C013DCC */ lui $at, 0x3dcc -/* A2BD10 80241AD0 3421CCCD */ ori $at, $at, 0xcccd -/* A2BD14 80241AD4 44810000 */ mtc1 $at, $f0 -/* A2BD18 80241AD8 44821000 */ mtc1 $v0, $f2 -/* A2BD1C 80241ADC 00000000 */ nop -/* A2BD20 80241AE0 468010A0 */ cvt.s.w $f2, $f2 -/* A2BD24 80241AE4 46001082 */ mul.s $f2, $f2, $f0 -/* A2BD28 80241AE8 00000000 */ nop -/* A2BD2C 80241AEC C600003C */ lwc1 $f0, 0x3c($s0) -/* A2BD30 80241AF0 46020000 */ add.s $f0, $f0, $f2 -/* A2BD34 80241AF4 E600003C */ swc1 $f0, 0x3c($s0) -.L80241AF8: -/* A2BD38 80241AF8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A2BD3C 80241AFC 3C048025 */ lui $a0, 0x8025 -/* A2BD40 80241B00 24849910 */ addiu $a0, $a0, -0x66f0 -/* A2BD44 80241B04 E4A0003C */ swc1 $f0, 0x3c($a1) -/* A2BD48 80241B08 8C830000 */ lw $v1, ($a0) -/* A2BD4C 80241B0C C600003C */ lwc1 $f0, 0x3c($s0) -/* A2BD50 80241B10 24630001 */ addiu $v1, $v1, 1 -/* A2BD54 80241B14 E6000070 */ swc1 $f0, 0x70($s0) -/* A2BD58 80241B18 C4A0003C */ lwc1 $f0, 0x3c($a1) -/* A2BD5C 80241B1C 286207D0 */ slti $v0, $v1, 0x7d0 -/* A2BD60 80241B20 AC830000 */ sw $v1, ($a0) -/* A2BD64 80241B24 E4A00070 */ swc1 $f0, 0x70($a1) -/* A2BD68 80241B28 8FBF0018 */ lw $ra, 0x18($sp) -/* A2BD6C 80241B2C 8FB10014 */ lw $s1, 0x14($sp) -/* A2BD70 80241B30 8FB00010 */ lw $s0, 0x10($sp) -/* A2BD74 80241B34 38420001 */ xori $v0, $v0, 1 -/* A2BD78 80241B38 03E00008 */ jr $ra -/* A2BD7C 80241B3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s new file mode 100644 index 0000000000..c35a26568f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802419F4_A2BC34.s @@ -0,0 +1,90 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419F4_A2BC34 +/* A2BC34 802419F4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A2BC38 802419F8 AFB00010 */ sw $s0, 0x10($sp) +/* A2BC3C 802419FC 0080802D */ daddu $s0, $a0, $zero +/* A2BC40 80241A00 AFB10014 */ sw $s1, 0x14($sp) +/* A2BC44 80241A04 00A0882D */ daddu $s1, $a1, $zero +/* A2BC48 80241A08 AFBF0018 */ sw $ra, 0x18($sp) +/* A2BC4C 80241A0C 0C0B36B0 */ jal resolve_npc +/* A2BC50 80241A10 24050007 */ addiu $a1, $zero, 7 +/* A2BC54 80241A14 0200202D */ daddu $a0, $s0, $zero +/* A2BC58 80241A18 24050008 */ addiu $a1, $zero, 8 +/* A2BC5C 80241A1C 0C0B36B0 */ jal resolve_npc +/* A2BC60 80241A20 0040802D */ daddu $s0, $v0, $zero +/* A2BC64 80241A24 12200017 */ beqz $s1, .L80241A84 +/* A2BC68 80241A28 0040282D */ daddu $a1, $v0, $zero +/* A2BC6C 80241A2C 3C01C280 */ lui $at, 0xc280 +/* A2BC70 80241A30 44810000 */ mtc1 $at, $f0 +/* A2BC74 80241A34 3C0143C8 */ lui $at, 0x43c8 +/* A2BC78 80241A38 44811000 */ mtc1 $at, $f2 +/* A2BC7C 80241A3C 3C0142AA */ lui $at, 0x42aa +/* A2BC80 80241A40 44812000 */ mtc1 $at, $f4 +/* A2BC84 80241A44 E6000038 */ swc1 $f0, 0x38($s0) +/* A2BC88 80241A48 E602003C */ swc1 $f2, 0x3c($s0) +/* A2BC8C 80241A4C E6040040 */ swc1 $f4, 0x40($s0) +/* A2BC90 80241A50 E4A00038 */ swc1 $f0, 0x38($a1) +/* A2BC94 80241A54 E4A2003C */ swc1 $f2, 0x3c($a1) +/* A2BC98 80241A58 E4A40040 */ swc1 $f4, 0x40($a1) +/* A2BC9C 80241A5C C6000038 */ lwc1 $f0, 0x38($s0) +/* A2BCA0 80241A60 E600006C */ swc1 $f0, 0x6c($s0) +/* A2BCA4 80241A64 C4A00038 */ lwc1 $f0, 0x38($a1) +/* A2BCA8 80241A68 E4A0006C */ swc1 $f0, 0x6c($a1) +/* A2BCAC 80241A6C C6000040 */ lwc1 $f0, 0x40($s0) +/* A2BCB0 80241A70 E6000074 */ swc1 $f0, 0x74($s0) +/* A2BCB4 80241A74 C4A00040 */ lwc1 $f0, 0x40($a1) +/* A2BCB8 80241A78 3C018025 */ lui $at, 0x8025 +/* A2BCBC 80241A7C E422F2C8 */ swc1 $f2, -0xd38($at) +/* A2BCC0 80241A80 E4A00074 */ swc1 $f0, 0x74($a1) +.L80241A84: +/* A2BCC4 80241A84 3C038025 */ lui $v1, 0x8025 +/* A2BCC8 80241A88 8C639910 */ lw $v1, -0x66f0($v1) +/* A2BCCC 80241A8C 28620014 */ slti $v0, $v1, 0x14 +/* A2BCD0 80241A90 10400009 */ beqz $v0, .L80241AB8 +/* A2BCD4 80241A94 00031040 */ sll $v0, $v1, 1 +/* A2BCD8 80241A98 3C018025 */ lui $at, 0x8025 +/* A2BCDC 80241A9C 00220821 */ addu $at, $at, $v0 +/* A2BCE0 80241AA0 84229934 */ lh $v0, -0x66cc($at) +/* A2BCE4 80241AA4 44820000 */ mtc1 $v0, $f0 +/* A2BCE8 80241AA8 00000000 */ nop +/* A2BCEC 80241AAC 46800020 */ cvt.s.w $f0, $f0 +/* A2BCF0 80241AB0 080906BE */ j .L80241AF8 +/* A2BCF4 80241AB4 E600003C */ swc1 $f0, 0x3c($s0) +.L80241AB8: +/* A2BCF8 80241AB8 2462FFEC */ addiu $v0, $v1, -0x14 +/* A2BCFC 80241ABC 3042001E */ andi $v0, $v0, 0x1e +/* A2BD00 80241AC0 3C018025 */ lui $at, 0x8025 +/* A2BD04 80241AC4 00220821 */ addu $at, $at, $v0 +/* A2BD08 80241AC8 84229914 */ lh $v0, -0x66ec($at) +/* A2BD0C 80241ACC 3C013DCC */ lui $at, 0x3dcc +/* A2BD10 80241AD0 3421CCCD */ ori $at, $at, 0xcccd +/* A2BD14 80241AD4 44810000 */ mtc1 $at, $f0 +/* A2BD18 80241AD8 44821000 */ mtc1 $v0, $f2 +/* A2BD1C 80241ADC 00000000 */ nop +/* A2BD20 80241AE0 468010A0 */ cvt.s.w $f2, $f2 +/* A2BD24 80241AE4 46001082 */ mul.s $f2, $f2, $f0 +/* A2BD28 80241AE8 00000000 */ nop +/* A2BD2C 80241AEC C600003C */ lwc1 $f0, 0x3c($s0) +/* A2BD30 80241AF0 46020000 */ add.s $f0, $f0, $f2 +/* A2BD34 80241AF4 E600003C */ swc1 $f0, 0x3c($s0) +.L80241AF8: +/* A2BD38 80241AF8 C600003C */ lwc1 $f0, 0x3c($s0) +/* A2BD3C 80241AFC 3C048025 */ lui $a0, 0x8025 +/* A2BD40 80241B00 24849910 */ addiu $a0, $a0, -0x66f0 +/* A2BD44 80241B04 E4A0003C */ swc1 $f0, 0x3c($a1) +/* A2BD48 80241B08 8C830000 */ lw $v1, ($a0) +/* A2BD4C 80241B0C C600003C */ lwc1 $f0, 0x3c($s0) +/* A2BD50 80241B10 24630001 */ addiu $v1, $v1, 1 +/* A2BD54 80241B14 E6000070 */ swc1 $f0, 0x70($s0) +/* A2BD58 80241B18 C4A0003C */ lwc1 $f0, 0x3c($a1) +/* A2BD5C 80241B1C 286207D0 */ slti $v0, $v1, 0x7d0 +/* A2BD60 80241B20 AC830000 */ sw $v1, ($a0) +/* A2BD64 80241B24 E4A00070 */ swc1 $f0, 0x70($a1) +/* A2BD68 80241B28 8FBF0018 */ lw $ra, 0x18($sp) +/* A2BD6C 80241B2C 8FB10014 */ lw $s1, 0x14($sp) +/* A2BD70 80241B30 8FB00010 */ lw $s0, 0x10($sp) +/* A2BD74 80241B34 38420001 */ xori $v0, $v0, 1 +/* A2BD78 80241B38 03E00008 */ jr $ra +/* A2BD7C 80241B3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40.s deleted file mode 100644 index 84dbf7e045..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40.s +++ /dev/null @@ -1,74 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B40 -/* A2BD80 80241B40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A2BD84 80241B44 AFB00010 */ sw $s0, 0x10($sp) -/* A2BD88 80241B48 0080802D */ daddu $s0, $a0, $zero -/* A2BD8C 80241B4C AFB10014 */ sw $s1, 0x14($sp) -/* A2BD90 80241B50 00A0882D */ daddu $s1, $a1, $zero -/* A2BD94 80241B54 AFBF0018 */ sw $ra, 0x18($sp) -/* A2BD98 80241B58 0C0B36B0 */ jal resolve_npc -/* A2BD9C 80241B5C 24050007 */ addiu $a1, $zero, 7 -/* A2BDA0 80241B60 0200202D */ daddu $a0, $s0, $zero -/* A2BDA4 80241B64 24050008 */ addiu $a1, $zero, 8 -/* A2BDA8 80241B68 0C0B36B0 */ jal resolve_npc -/* A2BDAC 80241B6C 0040802D */ daddu $s0, $v0, $zero -/* A2BDB0 80241B70 12200017 */ beqz $s1, .L80241BD0 -/* A2BDB4 80241B74 0040282D */ daddu $a1, $v0, $zero -/* A2BDB8 80241B78 3C01C280 */ lui $at, 0xc280 -/* A2BDBC 80241B7C 44810000 */ mtc1 $at, $f0 -/* A2BDC0 80241B80 3C014307 */ lui $at, 0x4307 -/* A2BDC4 80241B84 44811000 */ mtc1 $at, $f2 -/* A2BDC8 80241B88 3C0142AA */ lui $at, 0x42aa -/* A2BDCC 80241B8C 44812000 */ mtc1 $at, $f4 -/* A2BDD0 80241B90 E6000038 */ swc1 $f0, 0x38($s0) -/* A2BDD4 80241B94 E602003C */ swc1 $f2, 0x3c($s0) -/* A2BDD8 80241B98 E6040040 */ swc1 $f4, 0x40($s0) -/* A2BDDC 80241B9C E4A00038 */ swc1 $f0, 0x38($a1) -/* A2BDE0 80241BA0 E4A2003C */ swc1 $f2, 0x3c($a1) -/* A2BDE4 80241BA4 E4A40040 */ swc1 $f4, 0x40($a1) -/* A2BDE8 80241BA8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A2BDEC 80241BAC E600006C */ swc1 $f0, 0x6c($s0) -/* A2BDF0 80241BB0 C4A00038 */ lwc1 $f0, 0x38($a1) -/* A2BDF4 80241BB4 E4A0006C */ swc1 $f0, 0x6c($a1) -/* A2BDF8 80241BB8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A2BDFC 80241BBC E6000074 */ swc1 $f0, 0x74($s0) -/* A2BE00 80241BC0 C4A00040 */ lwc1 $f0, 0x40($a1) -/* A2BE04 80241BC4 3C018025 */ lui $at, 0x8025 -/* A2BE08 80241BC8 E422F2CC */ swc1 $f2, -0xd34($at) -/* A2BE0C 80241BCC E4A00074 */ swc1 $f0, 0x74($a1) -.L80241BD0: -/* A2BE10 80241BD0 3C048025 */ lui $a0, 0x8025 -/* A2BE14 80241BD4 2484995C */ addiu $a0, $a0, -0x66a4 -/* A2BE18 80241BD8 8C830000 */ lw $v1, ($a0) -/* A2BE1C 80241BDC 2462FFEC */ addiu $v0, $v1, -0x14 -/* A2BE20 80241BE0 3042001E */ andi $v0, $v0, 0x1e -/* A2BE24 80241BE4 3C018025 */ lui $at, 0x8025 -/* A2BE28 80241BE8 00220821 */ addu $at, $at, $v0 -/* A2BE2C 80241BEC 84229960 */ lh $v0, -0x66a0($at) -/* A2BE30 80241BF0 3C013DCC */ lui $at, 0x3dcc -/* A2BE34 80241BF4 3421CCCD */ ori $at, $at, 0xcccd -/* A2BE38 80241BF8 44810000 */ mtc1 $at, $f0 -/* A2BE3C 80241BFC 44821000 */ mtc1 $v0, $f2 -/* A2BE40 80241C00 00000000 */ nop -/* A2BE44 80241C04 468010A0 */ cvt.s.w $f2, $f2 -/* A2BE48 80241C08 46001082 */ mul.s $f2, $f2, $f0 -/* A2BE4C 80241C0C 00000000 */ nop -/* A2BE50 80241C10 C600003C */ lwc1 $f0, 0x3c($s0) -/* A2BE54 80241C14 46020000 */ add.s $f0, $f0, $f2 -/* A2BE58 80241C18 E600003C */ swc1 $f0, 0x3c($s0) -/* A2BE5C 80241C1C E4A0003C */ swc1 $f0, 0x3c($a1) -/* A2BE60 80241C20 C600003C */ lwc1 $f0, 0x3c($s0) -/* A2BE64 80241C24 24630001 */ addiu $v1, $v1, 1 -/* A2BE68 80241C28 E6000070 */ swc1 $f0, 0x70($s0) -/* A2BE6C 80241C2C C4A0003C */ lwc1 $f0, 0x3c($a1) -/* A2BE70 80241C30 286207D0 */ slti $v0, $v1, 0x7d0 -/* A2BE74 80241C34 AC830000 */ sw $v1, ($a0) -/* A2BE78 80241C38 E4A00070 */ swc1 $f0, 0x70($a1) -/* A2BE7C 80241C3C 8FBF0018 */ lw $ra, 0x18($sp) -/* A2BE80 80241C40 8FB10014 */ lw $s1, 0x14($sp) -/* A2BE84 80241C44 8FB00010 */ lw $s0, 0x10($sp) -/* A2BE88 80241C48 38420001 */ xori $v0, $v0, 1 -/* A2BE8C 80241C4C 03E00008 */ jr $ra -/* A2BE90 80241C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s new file mode 100644 index 0000000000..4e2aac1ecd --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241B40_A2BD80.s @@ -0,0 +1,74 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B40_A2BD80 +/* A2BD80 80241B40 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A2BD84 80241B44 AFB00010 */ sw $s0, 0x10($sp) +/* A2BD88 80241B48 0080802D */ daddu $s0, $a0, $zero +/* A2BD8C 80241B4C AFB10014 */ sw $s1, 0x14($sp) +/* A2BD90 80241B50 00A0882D */ daddu $s1, $a1, $zero +/* A2BD94 80241B54 AFBF0018 */ sw $ra, 0x18($sp) +/* A2BD98 80241B58 0C0B36B0 */ jal resolve_npc +/* A2BD9C 80241B5C 24050007 */ addiu $a1, $zero, 7 +/* A2BDA0 80241B60 0200202D */ daddu $a0, $s0, $zero +/* A2BDA4 80241B64 24050008 */ addiu $a1, $zero, 8 +/* A2BDA8 80241B68 0C0B36B0 */ jal resolve_npc +/* A2BDAC 80241B6C 0040802D */ daddu $s0, $v0, $zero +/* A2BDB0 80241B70 12200017 */ beqz $s1, .L80241BD0 +/* A2BDB4 80241B74 0040282D */ daddu $a1, $v0, $zero +/* A2BDB8 80241B78 3C01C280 */ lui $at, 0xc280 +/* A2BDBC 80241B7C 44810000 */ mtc1 $at, $f0 +/* A2BDC0 80241B80 3C014307 */ lui $at, 0x4307 +/* A2BDC4 80241B84 44811000 */ mtc1 $at, $f2 +/* A2BDC8 80241B88 3C0142AA */ lui $at, 0x42aa +/* A2BDCC 80241B8C 44812000 */ mtc1 $at, $f4 +/* A2BDD0 80241B90 E6000038 */ swc1 $f0, 0x38($s0) +/* A2BDD4 80241B94 E602003C */ swc1 $f2, 0x3c($s0) +/* A2BDD8 80241B98 E6040040 */ swc1 $f4, 0x40($s0) +/* A2BDDC 80241B9C E4A00038 */ swc1 $f0, 0x38($a1) +/* A2BDE0 80241BA0 E4A2003C */ swc1 $f2, 0x3c($a1) +/* A2BDE4 80241BA4 E4A40040 */ swc1 $f4, 0x40($a1) +/* A2BDE8 80241BA8 C6000038 */ lwc1 $f0, 0x38($s0) +/* A2BDEC 80241BAC E600006C */ swc1 $f0, 0x6c($s0) +/* A2BDF0 80241BB0 C4A00038 */ lwc1 $f0, 0x38($a1) +/* A2BDF4 80241BB4 E4A0006C */ swc1 $f0, 0x6c($a1) +/* A2BDF8 80241BB8 C6000040 */ lwc1 $f0, 0x40($s0) +/* A2BDFC 80241BBC E6000074 */ swc1 $f0, 0x74($s0) +/* A2BE00 80241BC0 C4A00040 */ lwc1 $f0, 0x40($a1) +/* A2BE04 80241BC4 3C018025 */ lui $at, 0x8025 +/* A2BE08 80241BC8 E422F2CC */ swc1 $f2, -0xd34($at) +/* A2BE0C 80241BCC E4A00074 */ swc1 $f0, 0x74($a1) +.L80241BD0: +/* A2BE10 80241BD0 3C048025 */ lui $a0, 0x8025 +/* A2BE14 80241BD4 2484995C */ addiu $a0, $a0, -0x66a4 +/* A2BE18 80241BD8 8C830000 */ lw $v1, ($a0) +/* A2BE1C 80241BDC 2462FFEC */ addiu $v0, $v1, -0x14 +/* A2BE20 80241BE0 3042001E */ andi $v0, $v0, 0x1e +/* A2BE24 80241BE4 3C018025 */ lui $at, 0x8025 +/* A2BE28 80241BE8 00220821 */ addu $at, $at, $v0 +/* A2BE2C 80241BEC 84229960 */ lh $v0, -0x66a0($at) +/* A2BE30 80241BF0 3C013DCC */ lui $at, 0x3dcc +/* A2BE34 80241BF4 3421CCCD */ ori $at, $at, 0xcccd +/* A2BE38 80241BF8 44810000 */ mtc1 $at, $f0 +/* A2BE3C 80241BFC 44821000 */ mtc1 $v0, $f2 +/* A2BE40 80241C00 00000000 */ nop +/* A2BE44 80241C04 468010A0 */ cvt.s.w $f2, $f2 +/* A2BE48 80241C08 46001082 */ mul.s $f2, $f2, $f0 +/* A2BE4C 80241C0C 00000000 */ nop +/* A2BE50 80241C10 C600003C */ lwc1 $f0, 0x3c($s0) +/* A2BE54 80241C14 46020000 */ add.s $f0, $f0, $f2 +/* A2BE58 80241C18 E600003C */ swc1 $f0, 0x3c($s0) +/* A2BE5C 80241C1C E4A0003C */ swc1 $f0, 0x3c($a1) +/* A2BE60 80241C20 C600003C */ lwc1 $f0, 0x3c($s0) +/* A2BE64 80241C24 24630001 */ addiu $v1, $v1, 1 +/* A2BE68 80241C28 E6000070 */ swc1 $f0, 0x70($s0) +/* A2BE6C 80241C2C C4A0003C */ lwc1 $f0, 0x3c($a1) +/* A2BE70 80241C30 286207D0 */ slti $v0, $v1, 0x7d0 +/* A2BE74 80241C34 AC830000 */ sw $v1, ($a0) +/* A2BE78 80241C38 E4A00070 */ swc1 $f0, 0x70($a1) +/* A2BE7C 80241C3C 8FBF0018 */ lw $ra, 0x18($sp) +/* A2BE80 80241C40 8FB10014 */ lw $s1, 0x14($sp) +/* A2BE84 80241C44 8FB00010 */ lw $s0, 0x10($sp) +/* A2BE88 80241C48 38420001 */ xori $v0, $v0, 1 +/* A2BE8C 80241C4C 03E00008 */ jr $ra +/* A2BE90 80241C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54.s deleted file mode 100644 index 54c2839385..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C54 -/* A2BE94 80241C54 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* A2BE98 80241C58 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* A2BE9C 80241C5C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A2BEA0 80241C60 AFB1001C */ sw $s1, 0x1c($sp) -/* A2BEA4 80241C64 3C118025 */ lui $s1, 0x8025 -/* A2BEA8 80241C68 26319980 */ addiu $s1, $s1, -0x6680 -/* A2BEAC 80241C6C F7B40028 */ sdc1 $f20, 0x28($sp) -/* A2BEB0 80241C70 3C014170 */ lui $at, 0x4170 -/* A2BEB4 80241C74 4481A000 */ mtc1 $at, $f20 -/* A2BEB8 80241C78 3C0141F0 */ lui $at, 0x41f0 -/* A2BEBC 80241C7C 44816000 */ mtc1 $at, $f12 -/* A2BEC0 80241C80 3C03800B */ lui $v1, %hi(gCameras) -/* A2BEC4 80241C84 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A2BEC8 80241C88 AFBF0020 */ sw $ra, 0x20($sp) -/* A2BECC 80241C8C AFB00018 */ sw $s0, 0x18($sp) -/* A2BED0 80241C90 AFB10010 */ sw $s1, 0x10($sp) -/* A2BED4 80241C94 8E260000 */ lw $a2, ($s1) -/* A2BED8 80241C98 3C073F80 */ lui $a3, 0x3f80 -/* A2BEDC 80241C9C 00028080 */ sll $s0, $v0, 2 -/* A2BEE0 80241CA0 02028021 */ addu $s0, $s0, $v0 -/* A2BEE4 80241CA4 00108080 */ sll $s0, $s0, 2 -/* A2BEE8 80241CA8 02028023 */ subu $s0, $s0, $v0 -/* A2BEEC 80241CAC 001010C0 */ sll $v0, $s0, 3 -/* A2BEF0 80241CB0 02028021 */ addu $s0, $s0, $v0 -/* A2BEF4 80241CB4 001080C0 */ sll $s0, $s0, 3 -/* A2BEF8 80241CB8 02038021 */ addu $s0, $s0, $v1 -/* A2BEFC 80241CBC 0C090411 */ jal func_80241044 -/* A2BF00 80241CC0 4600A386 */ mov.s $f14, $f20 -/* A2BF04 80241CC4 8E250000 */ lw $a1, ($s1) -/* A2BF08 80241CC8 0C090355 */ jal func_80240D54 -/* A2BF0C 80241CCC 0000202D */ daddu $a0, $zero, $zero -/* A2BF10 80241CD0 24020001 */ addiu $v0, $zero, 1 -/* A2BF14 80241CD4 C6200000 */ lwc1 $f0, ($s1) -/* A2BF18 80241CD8 0040182D */ daddu $v1, $v0, $zero -/* A2BF1C 80241CDC 46140032 */ c.eq.s $f0, $f20 -/* A2BF20 80241CE0 00000000 */ nop -/* A2BF24 80241CE4 45010002 */ bc1t .L80241CF0 -/* A2BF28 80241CE8 A6030506 */ sh $v1, 0x506($s0) -/* A2BF2C 80241CEC 0000102D */ daddu $v0, $zero, $zero -.L80241CF0: -/* A2BF30 80241CF0 8FBF0020 */ lw $ra, 0x20($sp) -/* A2BF34 80241CF4 8FB1001C */ lw $s1, 0x1c($sp) -/* A2BF38 80241CF8 8FB00018 */ lw $s0, 0x18($sp) -/* A2BF3C 80241CFC D7B40028 */ ldc1 $f20, 0x28($sp) -/* A2BF40 80241D00 03E00008 */ jr $ra -/* A2BF44 80241D04 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s new file mode 100644 index 0000000000..f7465a14dc --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241C54_A2BE94.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C54_A2BE94 +/* A2BE94 80241C54 3C028007 */ lui $v0, %hi(gCurrentCameraID) +/* A2BE98 80241C58 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) +/* A2BE9C 80241C5C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A2BEA0 80241C60 AFB1001C */ sw $s1, 0x1c($sp) +/* A2BEA4 80241C64 3C118025 */ lui $s1, 0x8025 +/* A2BEA8 80241C68 26319980 */ addiu $s1, $s1, -0x6680 +/* A2BEAC 80241C6C F7B40028 */ sdc1 $f20, 0x28($sp) +/* A2BEB0 80241C70 3C014170 */ lui $at, 0x4170 +/* A2BEB4 80241C74 4481A000 */ mtc1 $at, $f20 +/* A2BEB8 80241C78 3C0141F0 */ lui $at, 0x41f0 +/* A2BEBC 80241C7C 44816000 */ mtc1 $at, $f12 +/* A2BEC0 80241C80 3C03800B */ lui $v1, %hi(gCameras) +/* A2BEC4 80241C84 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* A2BEC8 80241C88 AFBF0020 */ sw $ra, 0x20($sp) +/* A2BECC 80241C8C AFB00018 */ sw $s0, 0x18($sp) +/* A2BED0 80241C90 AFB10010 */ sw $s1, 0x10($sp) +/* A2BED4 80241C94 8E260000 */ lw $a2, ($s1) +/* A2BED8 80241C98 3C073F80 */ lui $a3, 0x3f80 +/* A2BEDC 80241C9C 00028080 */ sll $s0, $v0, 2 +/* A2BEE0 80241CA0 02028021 */ addu $s0, $s0, $v0 +/* A2BEE4 80241CA4 00108080 */ sll $s0, $s0, 2 +/* A2BEE8 80241CA8 02028023 */ subu $s0, $s0, $v0 +/* A2BEEC 80241CAC 001010C0 */ sll $v0, $s0, 3 +/* A2BEF0 80241CB0 02028021 */ addu $s0, $s0, $v0 +/* A2BEF4 80241CB4 001080C0 */ sll $s0, $s0, 3 +/* A2BEF8 80241CB8 02038021 */ addu $s0, $s0, $v1 +/* A2BEFC 80241CBC 0C090411 */ jal func_80241044_A2B284 +/* A2BF00 80241CC0 4600A386 */ mov.s $f14, $f20 +/* A2BF04 80241CC4 8E250000 */ lw $a1, ($s1) +/* A2BF08 80241CC8 0C090355 */ jal func_80240D54_A2AF94 +/* A2BF0C 80241CCC 0000202D */ daddu $a0, $zero, $zero +/* A2BF10 80241CD0 24020001 */ addiu $v0, $zero, 1 +/* A2BF14 80241CD4 C6200000 */ lwc1 $f0, ($s1) +/* A2BF18 80241CD8 0040182D */ daddu $v1, $v0, $zero +/* A2BF1C 80241CDC 46140032 */ c.eq.s $f0, $f20 +/* A2BF20 80241CE0 00000000 */ nop +/* A2BF24 80241CE4 45010002 */ bc1t .L80241CF0 +/* A2BF28 80241CE8 A6030506 */ sh $v1, 0x506($s0) +/* A2BF2C 80241CEC 0000102D */ daddu $v0, $zero, $zero +.L80241CF0: +/* A2BF30 80241CF0 8FBF0020 */ lw $ra, 0x20($sp) +/* A2BF34 80241CF4 8FB1001C */ lw $s1, 0x1c($sp) +/* A2BF38 80241CF8 8FB00018 */ lw $s0, 0x18($sp) +/* A2BF3C 80241CFC D7B40028 */ ldc1 $f20, 0x28($sp) +/* A2BF40 80241D00 03E00008 */ jr $ra +/* A2BF44 80241D04 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C.s deleted file mode 100644 index 90bd12a6d8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D7C -/* A2BFBC 80241D7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2BFC0 80241D80 AFB00010 */ sw $s0, 0x10($sp) -/* A2BFC4 80241D84 00A0802D */ daddu $s0, $a1, $zero -/* A2BFC8 80241D88 AFBF0014 */ sw $ra, 0x14($sp) -/* A2BFCC 80241D8C 0C0B36B0 */ jal resolve_npc -/* A2BFD0 80241D90 24050009 */ addiu $a1, $zero, 9 -/* A2BFD4 80241D94 1200000E */ beqz $s0, .L80241DD0 -/* A2BFD8 80241D98 0040282D */ daddu $a1, $v0, $zero -/* A2BFDC 80241D9C 3C01C311 */ lui $at, 0xc311 -/* A2BFE0 80241DA0 44810000 */ mtc1 $at, $f0 -/* A2BFE4 80241DA4 3C0142E4 */ lui $at, 0x42e4 -/* A2BFE8 80241DA8 44811000 */ mtc1 $at, $f2 -/* A2BFEC 80241DAC E4A00038 */ swc1 $f0, 0x38($a1) -/* A2BFF0 80241DB0 3C014387 */ lui $at, 0x4387 -/* A2BFF4 80241DB4 44810000 */ mtc1 $at, $f0 -/* A2BFF8 80241DB8 E4A20040 */ swc1 $f2, 0x40($a1) -/* A2BFFC 80241DBC C4A20038 */ lwc1 $f2, 0x38($a1) -/* A2C000 80241DC0 C4A40040 */ lwc1 $f4, 0x40($a1) -/* A2C004 80241DC4 E4A0000C */ swc1 $f0, 0xc($a1) -/* A2C008 80241DC8 E4A2006C */ swc1 $f2, 0x6c($a1) -/* A2C00C 80241DCC E4A40074 */ swc1 $f4, 0x74($a1) -.L80241DD0: -/* A2C010 80241DD0 3C048025 */ lui $a0, 0x8025 -/* A2C014 80241DD4 24849984 */ addiu $a0, $a0, -0x667c -/* A2C018 80241DD8 8C830000 */ lw $v1, ($a0) -/* A2C01C 80241DDC 2402001E */ addiu $v0, $zero, 0x1e -/* A2C020 80241DE0 14620005 */ bne $v1, $v0, .L80241DF8 -/* A2C024 80241DE4 00000000 */ nop -/* A2C028 80241DE8 3C0142B4 */ lui $at, 0x42b4 -/* A2C02C 80241DEC 44810000 */ mtc1 $at, $f0 -/* A2C030 80241DF0 00000000 */ nop -/* A2C034 80241DF4 E4A0000C */ swc1 $f0, 0xc($a1) -.L80241DF8: -/* A2C038 80241DF8 8C860000 */ lw $a2, ($a0) -/* A2C03C 80241DFC 28C20028 */ slti $v0, $a2, 0x28 -/* A2C040 80241E00 10400037 */ beqz $v0, .L80241EE0 -/* A2C044 80241E04 00061880 */ sll $v1, $a2, 2 -/* A2C048 80241E08 3C028025 */ lui $v0, 0x8025 -/* A2C04C 80241E0C 244299A8 */ addiu $v0, $v0, -0x6658 -/* A2C050 80241E10 00621821 */ addu $v1, $v1, $v0 -/* A2C054 80241E14 84620000 */ lh $v0, ($v1) -/* A2C058 80241E18 3C0491A2 */ lui $a0, 0x91a2 -/* A2C05C 80241E1C 2442FF6F */ addiu $v0, $v0, -0x91 -/* A2C060 80241E20 44820000 */ mtc1 $v0, $f0 -/* A2C064 80241E24 00000000 */ nop -/* A2C068 80241E28 46800020 */ cvt.s.w $f0, $f0 -/* A2C06C 80241E2C E4A00038 */ swc1 $f0, 0x38($a1) -/* A2C070 80241E30 84620002 */ lh $v0, 2($v1) -/* A2C074 80241E34 3484B3C5 */ ori $a0, $a0, 0xb3c5 -/* A2C078 80241E38 2442FF79 */ addiu $v0, $v0, -0x87 -/* A2C07C 80241E3C 00021840 */ sll $v1, $v0, 1 -/* A2C080 80241E40 00621821 */ addu $v1, $v1, $v0 -/* A2C084 80241E44 000318C0 */ sll $v1, $v1, 3 -/* A2C088 80241E48 00621821 */ addu $v1, $v1, $v0 -/* A2C08C 80241E4C 000318C0 */ sll $v1, $v1, 3 -/* A2C090 80241E50 00640018 */ mult $v1, $a0 -/* A2C094 80241E54 00003810 */ mfhi $a3 -/* A2C098 80241E58 00E31021 */ addu $v0, $a3, $v1 -/* A2C09C 80241E5C 000211C3 */ sra $v0, $v0, 7 -/* A2C0A0 80241E60 00031FC3 */ sra $v1, $v1, 0x1f -/* A2C0A4 80241E64 00431023 */ subu $v0, $v0, $v1 -/* A2C0A8 80241E68 24420093 */ addiu $v0, $v0, 0x93 -/* A2C0AC 80241E6C 44820000 */ mtc1 $v0, $f0 -/* A2C0B0 80241E70 00000000 */ nop -/* A2C0B4 80241E74 46800020 */ cvt.s.w $f0, $f0 -/* A2C0B8 80241E78 28C20014 */ slti $v0, $a2, 0x14 -/* A2C0BC 80241E7C 1040000F */ beqz $v0, .L80241EBC -/* A2C0C0 80241E80 E4A0003C */ swc1 $f0, 0x3c($a1) -/* A2C0C4 80241E84 3C0141F0 */ lui $at, 0x41f0 -/* A2C0C8 80241E88 44810000 */ mtc1 $at, $f0 -/* A2C0CC 80241E8C 44861000 */ mtc1 $a2, $f2 -/* A2C0D0 80241E90 00000000 */ nop -/* A2C0D4 80241E94 468010A0 */ cvt.s.w $f2, $f2 -/* A2C0D8 80241E98 46001082 */ mul.s $f2, $f2, $f0 -/* A2C0DC 80241E9C 00000000 */ nop -/* A2C0E0 80241EA0 3C0141A0 */ lui $at, 0x41a0 -/* A2C0E4 80241EA4 44812000 */ mtc1 $at, $f4 -/* A2C0E8 80241EA8 3C0142E4 */ lui $at, 0x42e4 -/* A2C0EC 80241EAC 44810000 */ mtc1 $at, $f0 -/* A2C0F0 80241EB0 46041083 */ div.s $f2, $f2, $f4 -/* A2C0F4 80241EB4 080907B2 */ j .L80241EC8 -/* A2C0F8 80241EB8 46020001 */ sub.s $f0, $f0, $f2 -.L80241EBC: -/* A2C0FC 80241EBC 3C0142A8 */ lui $at, 0x42a8 -/* A2C100 80241EC0 44810000 */ mtc1 $at, $f0 -/* A2C104 80241EC4 00000000 */ nop -.L80241EC8: -/* A2C108 80241EC8 E4A00040 */ swc1 $f0, 0x40($a1) -/* A2C10C 80241ECC C4A00038 */ lwc1 $f0, 0x38($a1) -/* A2C110 80241ED0 C4A20040 */ lwc1 $f2, 0x40($a1) -/* A2C114 80241ED4 E4A0006C */ swc1 $f0, 0x6c($a1) -/* A2C118 80241ED8 080907C8 */ j .L80241F20 -/* A2C11C 80241EDC E4A20074 */ swc1 $f2, 0x74($a1) -.L80241EE0: -/* A2C120 80241EE0 24C2FFD8 */ addiu $v0, $a2, -0x28 -/* A2C124 80241EE4 3042001E */ andi $v0, $v0, 0x1e -/* A2C128 80241EE8 3C018025 */ lui $at, 0x8025 -/* A2C12C 80241EEC 00220821 */ addu $at, $at, $v0 -/* A2C130 80241EF0 84229988 */ lh $v0, -0x6678($at) -/* A2C134 80241EF4 3C013DCC */ lui $at, 0x3dcc -/* A2C138 80241EF8 3421CCCD */ ori $at, $at, 0xcccd -/* A2C13C 80241EFC 44810000 */ mtc1 $at, $f0 -/* A2C140 80241F00 44821000 */ mtc1 $v0, $f2 -/* A2C144 80241F04 00000000 */ nop -/* A2C148 80241F08 468010A0 */ cvt.s.w $f2, $f2 -/* A2C14C 80241F0C 46001082 */ mul.s $f2, $f2, $f0 -/* A2C150 80241F10 00000000 */ nop -/* A2C154 80241F14 C4A0003C */ lwc1 $f0, 0x3c($a1) -/* A2C158 80241F18 46020000 */ add.s $f0, $f0, $f2 -/* A2C15C 80241F1C E4A0003C */ swc1 $f0, 0x3c($a1) -.L80241F20: -/* A2C160 80241F20 3C048025 */ lui $a0, 0x8025 -/* A2C164 80241F24 24849984 */ addiu $a0, $a0, -0x667c -/* A2C168 80241F28 8C830000 */ lw $v1, ($a0) -/* A2C16C 80241F2C C4A0003C */ lwc1 $f0, 0x3c($a1) -/* A2C170 80241F30 24630001 */ addiu $v1, $v1, 1 -/* A2C174 80241F34 286207D0 */ slti $v0, $v1, 0x7d0 -/* A2C178 80241F38 E4A00070 */ swc1 $f0, 0x70($a1) -/* A2C17C 80241F3C AC830000 */ sw $v1, ($a0) -/* A2C180 80241F40 8FBF0014 */ lw $ra, 0x14($sp) -/* A2C184 80241F44 8FB00010 */ lw $s0, 0x10($sp) -/* A2C188 80241F48 38420001 */ xori $v0, $v0, 1 -/* A2C18C 80241F4C 03E00008 */ jr $ra -/* A2C190 80241F50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s new file mode 100644 index 0000000000..d32e9bcd93 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241D7C_A2BFBC.s @@ -0,0 +1,128 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D7C_A2BFBC +/* A2BFBC 80241D7C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2BFC0 80241D80 AFB00010 */ sw $s0, 0x10($sp) +/* A2BFC4 80241D84 00A0802D */ daddu $s0, $a1, $zero +/* A2BFC8 80241D88 AFBF0014 */ sw $ra, 0x14($sp) +/* A2BFCC 80241D8C 0C0B36B0 */ jal resolve_npc +/* A2BFD0 80241D90 24050009 */ addiu $a1, $zero, 9 +/* A2BFD4 80241D94 1200000E */ beqz $s0, .L80241DD0 +/* A2BFD8 80241D98 0040282D */ daddu $a1, $v0, $zero +/* A2BFDC 80241D9C 3C01C311 */ lui $at, 0xc311 +/* A2BFE0 80241DA0 44810000 */ mtc1 $at, $f0 +/* A2BFE4 80241DA4 3C0142E4 */ lui $at, 0x42e4 +/* A2BFE8 80241DA8 44811000 */ mtc1 $at, $f2 +/* A2BFEC 80241DAC E4A00038 */ swc1 $f0, 0x38($a1) +/* A2BFF0 80241DB0 3C014387 */ lui $at, 0x4387 +/* A2BFF4 80241DB4 44810000 */ mtc1 $at, $f0 +/* A2BFF8 80241DB8 E4A20040 */ swc1 $f2, 0x40($a1) +/* A2BFFC 80241DBC C4A20038 */ lwc1 $f2, 0x38($a1) +/* A2C000 80241DC0 C4A40040 */ lwc1 $f4, 0x40($a1) +/* A2C004 80241DC4 E4A0000C */ swc1 $f0, 0xc($a1) +/* A2C008 80241DC8 E4A2006C */ swc1 $f2, 0x6c($a1) +/* A2C00C 80241DCC E4A40074 */ swc1 $f4, 0x74($a1) +.L80241DD0: +/* A2C010 80241DD0 3C048025 */ lui $a0, 0x8025 +/* A2C014 80241DD4 24849984 */ addiu $a0, $a0, -0x667c +/* A2C018 80241DD8 8C830000 */ lw $v1, ($a0) +/* A2C01C 80241DDC 2402001E */ addiu $v0, $zero, 0x1e +/* A2C020 80241DE0 14620005 */ bne $v1, $v0, .L80241DF8 +/* A2C024 80241DE4 00000000 */ nop +/* A2C028 80241DE8 3C0142B4 */ lui $at, 0x42b4 +/* A2C02C 80241DEC 44810000 */ mtc1 $at, $f0 +/* A2C030 80241DF0 00000000 */ nop +/* A2C034 80241DF4 E4A0000C */ swc1 $f0, 0xc($a1) +.L80241DF8: +/* A2C038 80241DF8 8C860000 */ lw $a2, ($a0) +/* A2C03C 80241DFC 28C20028 */ slti $v0, $a2, 0x28 +/* A2C040 80241E00 10400037 */ beqz $v0, .L80241EE0 +/* A2C044 80241E04 00061880 */ sll $v1, $a2, 2 +/* A2C048 80241E08 3C028025 */ lui $v0, 0x8025 +/* A2C04C 80241E0C 244299A8 */ addiu $v0, $v0, -0x6658 +/* A2C050 80241E10 00621821 */ addu $v1, $v1, $v0 +/* A2C054 80241E14 84620000 */ lh $v0, ($v1) +/* A2C058 80241E18 3C0491A2 */ lui $a0, 0x91a2 +/* A2C05C 80241E1C 2442FF6F */ addiu $v0, $v0, -0x91 +/* A2C060 80241E20 44820000 */ mtc1 $v0, $f0 +/* A2C064 80241E24 00000000 */ nop +/* A2C068 80241E28 46800020 */ cvt.s.w $f0, $f0 +/* A2C06C 80241E2C E4A00038 */ swc1 $f0, 0x38($a1) +/* A2C070 80241E30 84620002 */ lh $v0, 2($v1) +/* A2C074 80241E34 3484B3C5 */ ori $a0, $a0, 0xb3c5 +/* A2C078 80241E38 2442FF79 */ addiu $v0, $v0, -0x87 +/* A2C07C 80241E3C 00021840 */ sll $v1, $v0, 1 +/* A2C080 80241E40 00621821 */ addu $v1, $v1, $v0 +/* A2C084 80241E44 000318C0 */ sll $v1, $v1, 3 +/* A2C088 80241E48 00621821 */ addu $v1, $v1, $v0 +/* A2C08C 80241E4C 000318C0 */ sll $v1, $v1, 3 +/* A2C090 80241E50 00640018 */ mult $v1, $a0 +/* A2C094 80241E54 00003810 */ mfhi $a3 +/* A2C098 80241E58 00E31021 */ addu $v0, $a3, $v1 +/* A2C09C 80241E5C 000211C3 */ sra $v0, $v0, 7 +/* A2C0A0 80241E60 00031FC3 */ sra $v1, $v1, 0x1f +/* A2C0A4 80241E64 00431023 */ subu $v0, $v0, $v1 +/* A2C0A8 80241E68 24420093 */ addiu $v0, $v0, 0x93 +/* A2C0AC 80241E6C 44820000 */ mtc1 $v0, $f0 +/* A2C0B0 80241E70 00000000 */ nop +/* A2C0B4 80241E74 46800020 */ cvt.s.w $f0, $f0 +/* A2C0B8 80241E78 28C20014 */ slti $v0, $a2, 0x14 +/* A2C0BC 80241E7C 1040000F */ beqz $v0, .L80241EBC +/* A2C0C0 80241E80 E4A0003C */ swc1 $f0, 0x3c($a1) +/* A2C0C4 80241E84 3C0141F0 */ lui $at, 0x41f0 +/* A2C0C8 80241E88 44810000 */ mtc1 $at, $f0 +/* A2C0CC 80241E8C 44861000 */ mtc1 $a2, $f2 +/* A2C0D0 80241E90 00000000 */ nop +/* A2C0D4 80241E94 468010A0 */ cvt.s.w $f2, $f2 +/* A2C0D8 80241E98 46001082 */ mul.s $f2, $f2, $f0 +/* A2C0DC 80241E9C 00000000 */ nop +/* A2C0E0 80241EA0 3C0141A0 */ lui $at, 0x41a0 +/* A2C0E4 80241EA4 44812000 */ mtc1 $at, $f4 +/* A2C0E8 80241EA8 3C0142E4 */ lui $at, 0x42e4 +/* A2C0EC 80241EAC 44810000 */ mtc1 $at, $f0 +/* A2C0F0 80241EB0 46041083 */ div.s $f2, $f2, $f4 +/* A2C0F4 80241EB4 080907B2 */ j .L80241EC8 +/* A2C0F8 80241EB8 46020001 */ sub.s $f0, $f0, $f2 +.L80241EBC: +/* A2C0FC 80241EBC 3C0142A8 */ lui $at, 0x42a8 +/* A2C100 80241EC0 44810000 */ mtc1 $at, $f0 +/* A2C104 80241EC4 00000000 */ nop +.L80241EC8: +/* A2C108 80241EC8 E4A00040 */ swc1 $f0, 0x40($a1) +/* A2C10C 80241ECC C4A00038 */ lwc1 $f0, 0x38($a1) +/* A2C110 80241ED0 C4A20040 */ lwc1 $f2, 0x40($a1) +/* A2C114 80241ED4 E4A0006C */ swc1 $f0, 0x6c($a1) +/* A2C118 80241ED8 080907C8 */ j .L80241F20 +/* A2C11C 80241EDC E4A20074 */ swc1 $f2, 0x74($a1) +.L80241EE0: +/* A2C120 80241EE0 24C2FFD8 */ addiu $v0, $a2, -0x28 +/* A2C124 80241EE4 3042001E */ andi $v0, $v0, 0x1e +/* A2C128 80241EE8 3C018025 */ lui $at, 0x8025 +/* A2C12C 80241EEC 00220821 */ addu $at, $at, $v0 +/* A2C130 80241EF0 84229988 */ lh $v0, -0x6678($at) +/* A2C134 80241EF4 3C013DCC */ lui $at, 0x3dcc +/* A2C138 80241EF8 3421CCCD */ ori $at, $at, 0xcccd +/* A2C13C 80241EFC 44810000 */ mtc1 $at, $f0 +/* A2C140 80241F00 44821000 */ mtc1 $v0, $f2 +/* A2C144 80241F04 00000000 */ nop +/* A2C148 80241F08 468010A0 */ cvt.s.w $f2, $f2 +/* A2C14C 80241F0C 46001082 */ mul.s $f2, $f2, $f0 +/* A2C150 80241F10 00000000 */ nop +/* A2C154 80241F14 C4A0003C */ lwc1 $f0, 0x3c($a1) +/* A2C158 80241F18 46020000 */ add.s $f0, $f0, $f2 +/* A2C15C 80241F1C E4A0003C */ swc1 $f0, 0x3c($a1) +.L80241F20: +/* A2C160 80241F20 3C048025 */ lui $a0, 0x8025 +/* A2C164 80241F24 24849984 */ addiu $a0, $a0, -0x667c +/* A2C168 80241F28 8C830000 */ lw $v1, ($a0) +/* A2C16C 80241F2C C4A0003C */ lwc1 $f0, 0x3c($a1) +/* A2C170 80241F30 24630001 */ addiu $v1, $v1, 1 +/* A2C174 80241F34 286207D0 */ slti $v0, $v1, 0x7d0 +/* A2C178 80241F38 E4A00070 */ swc1 $f0, 0x70($a1) +/* A2C17C 80241F3C AC830000 */ sw $v1, ($a0) +/* A2C180 80241F40 8FBF0014 */ lw $ra, 0x14($sp) +/* A2C184 80241F44 8FB00010 */ lw $s0, 0x10($sp) +/* A2C188 80241F48 38420001 */ xori $v0, $v0, 1 +/* A2C18C 80241F4C 03E00008 */ jr $ra +/* A2C190 80241F50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54.s deleted file mode 100644 index 0f57a067a2..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F54 -/* A2C194 80241F54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2C198 80241F58 AFB00010 */ sw $s0, 0x10($sp) -/* A2C19C 80241F5C 00A0802D */ daddu $s0, $a1, $zero -/* A2C1A0 80241F60 AFBF0014 */ sw $ra, 0x14($sp) -/* A2C1A4 80241F64 0C0B36B0 */ jal resolve_npc -/* A2C1A8 80241F68 24050009 */ addiu $a1, $zero, 9 -/* A2C1AC 80241F6C 12000011 */ beqz $s0, .L80241FB4 -/* A2C1B0 80241F70 0040282D */ daddu $a1, $v0, $zero -/* A2C1B4 80241F74 3C01C311 */ lui $at, 0xc311 -/* A2C1B8 80241F78 44810000 */ mtc1 $at, $f0 -/* A2C1BC 80241F7C 3C0142A8 */ lui $at, 0x42a8 -/* A2C1C0 80241F80 44811000 */ mtc1 $at, $f2 -/* A2C1C4 80241F84 E4A00038 */ swc1 $f0, 0x38($a1) -/* A2C1C8 80241F88 46000106 */ mov.s $f4, $f0 -/* A2C1CC 80241F8C E4A20040 */ swc1 $f2, 0x40($a1) -/* A2C1D0 80241F90 3C0142B4 */ lui $at, 0x42b4 -/* A2C1D4 80241F94 44811000 */ mtc1 $at, $f2 -/* A2C1D8 80241F98 C4A60040 */ lwc1 $f6, 0x40($a1) -/* A2C1DC 80241F9C 3C014313 */ lui $at, 0x4313 -/* A2C1E0 80241FA0 44810000 */ mtc1 $at, $f0 -/* A2C1E4 80241FA4 E4A4006C */ swc1 $f4, 0x6c($a1) -/* A2C1E8 80241FA8 E4A2000C */ swc1 $f2, 0xc($a1) -/* A2C1EC 80241FAC E4A0003C */ swc1 $f0, 0x3c($a1) -/* A2C1F0 80241FB0 E4A60074 */ swc1 $f6, 0x74($a1) -.L80241FB4: -/* A2C1F4 80241FB4 3C048025 */ lui $a0, 0x8025 -/* A2C1F8 80241FB8 24849A48 */ addiu $a0, $a0, -0x65b8 -/* A2C1FC 80241FBC 8C830000 */ lw $v1, ($a0) -/* A2C200 80241FC0 2462FFD8 */ addiu $v0, $v1, -0x28 -/* A2C204 80241FC4 3042001E */ andi $v0, $v0, 0x1e -/* A2C208 80241FC8 3C018025 */ lui $at, 0x8025 -/* A2C20C 80241FCC 00220821 */ addu $at, $at, $v0 -/* A2C210 80241FD0 84229A4C */ lh $v0, -0x65b4($at) -/* A2C214 80241FD4 3C013DCC */ lui $at, 0x3dcc -/* A2C218 80241FD8 3421CCCD */ ori $at, $at, 0xcccd -/* A2C21C 80241FDC 44810000 */ mtc1 $at, $f0 -/* A2C220 80241FE0 44821000 */ mtc1 $v0, $f2 -/* A2C224 80241FE4 00000000 */ nop -/* A2C228 80241FE8 468010A0 */ cvt.s.w $f2, $f2 -/* A2C22C 80241FEC 46001082 */ mul.s $f2, $f2, $f0 -/* A2C230 80241FF0 00000000 */ nop -/* A2C234 80241FF4 C4A0003C */ lwc1 $f0, 0x3c($a1) -/* A2C238 80241FF8 24630001 */ addiu $v1, $v1, 1 -/* A2C23C 80241FFC 46020000 */ add.s $f0, $f0, $f2 -/* A2C240 80242000 286207D0 */ slti $v0, $v1, 0x7d0 -/* A2C244 80242004 AC830000 */ sw $v1, ($a0) -/* A2C248 80242008 E4A0003C */ swc1 $f0, 0x3c($a1) -/* A2C24C 8024200C E4A00070 */ swc1 $f0, 0x70($a1) -/* A2C250 80242010 8FBF0014 */ lw $ra, 0x14($sp) -/* A2C254 80242014 8FB00010 */ lw $s0, 0x10($sp) -/* A2C258 80242018 38420001 */ xori $v0, $v0, 1 -/* A2C25C 8024201C 03E00008 */ jr $ra -/* A2C260 80242020 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s new file mode 100644 index 0000000000..ba90b52d0f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80241F54_A2C194.s @@ -0,0 +1,57 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F54_A2C194 +/* A2C194 80241F54 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2C198 80241F58 AFB00010 */ sw $s0, 0x10($sp) +/* A2C19C 80241F5C 00A0802D */ daddu $s0, $a1, $zero +/* A2C1A0 80241F60 AFBF0014 */ sw $ra, 0x14($sp) +/* A2C1A4 80241F64 0C0B36B0 */ jal resolve_npc +/* A2C1A8 80241F68 24050009 */ addiu $a1, $zero, 9 +/* A2C1AC 80241F6C 12000011 */ beqz $s0, .L80241FB4 +/* A2C1B0 80241F70 0040282D */ daddu $a1, $v0, $zero +/* A2C1B4 80241F74 3C01C311 */ lui $at, 0xc311 +/* A2C1B8 80241F78 44810000 */ mtc1 $at, $f0 +/* A2C1BC 80241F7C 3C0142A8 */ lui $at, 0x42a8 +/* A2C1C0 80241F80 44811000 */ mtc1 $at, $f2 +/* A2C1C4 80241F84 E4A00038 */ swc1 $f0, 0x38($a1) +/* A2C1C8 80241F88 46000106 */ mov.s $f4, $f0 +/* A2C1CC 80241F8C E4A20040 */ swc1 $f2, 0x40($a1) +/* A2C1D0 80241F90 3C0142B4 */ lui $at, 0x42b4 +/* A2C1D4 80241F94 44811000 */ mtc1 $at, $f2 +/* A2C1D8 80241F98 C4A60040 */ lwc1 $f6, 0x40($a1) +/* A2C1DC 80241F9C 3C014313 */ lui $at, 0x4313 +/* A2C1E0 80241FA0 44810000 */ mtc1 $at, $f0 +/* A2C1E4 80241FA4 E4A4006C */ swc1 $f4, 0x6c($a1) +/* A2C1E8 80241FA8 E4A2000C */ swc1 $f2, 0xc($a1) +/* A2C1EC 80241FAC E4A0003C */ swc1 $f0, 0x3c($a1) +/* A2C1F0 80241FB0 E4A60074 */ swc1 $f6, 0x74($a1) +.L80241FB4: +/* A2C1F4 80241FB4 3C048025 */ lui $a0, 0x8025 +/* A2C1F8 80241FB8 24849A48 */ addiu $a0, $a0, -0x65b8 +/* A2C1FC 80241FBC 8C830000 */ lw $v1, ($a0) +/* A2C200 80241FC0 2462FFD8 */ addiu $v0, $v1, -0x28 +/* A2C204 80241FC4 3042001E */ andi $v0, $v0, 0x1e +/* A2C208 80241FC8 3C018025 */ lui $at, 0x8025 +/* A2C20C 80241FCC 00220821 */ addu $at, $at, $v0 +/* A2C210 80241FD0 84229A4C */ lh $v0, -0x65b4($at) +/* A2C214 80241FD4 3C013DCC */ lui $at, 0x3dcc +/* A2C218 80241FD8 3421CCCD */ ori $at, $at, 0xcccd +/* A2C21C 80241FDC 44810000 */ mtc1 $at, $f0 +/* A2C220 80241FE0 44821000 */ mtc1 $v0, $f2 +/* A2C224 80241FE4 00000000 */ nop +/* A2C228 80241FE8 468010A0 */ cvt.s.w $f2, $f2 +/* A2C22C 80241FEC 46001082 */ mul.s $f2, $f2, $f0 +/* A2C230 80241FF0 00000000 */ nop +/* A2C234 80241FF4 C4A0003C */ lwc1 $f0, 0x3c($a1) +/* A2C238 80241FF8 24630001 */ addiu $v1, $v1, 1 +/* A2C23C 80241FFC 46020000 */ add.s $f0, $f0, $f2 +/* A2C240 80242000 286207D0 */ slti $v0, $v1, 0x7d0 +/* A2C244 80242004 AC830000 */ sw $v1, ($a0) +/* A2C248 80242008 E4A0003C */ swc1 $f0, 0x3c($a1) +/* A2C24C 8024200C E4A00070 */ swc1 $f0, 0x70($a1) +/* A2C250 80242010 8FBF0014 */ lw $ra, 0x14($sp) +/* A2C254 80242014 8FB00010 */ lw $s0, 0x10($sp) +/* A2C258 80242018 38420001 */ xori $v0, $v0, 1 +/* A2C25C 8024201C 03E00008 */ jr $ra +/* A2C260 80242020 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0.s deleted file mode 100644 index 2df1b90f85..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421E0 -/* A2C420 802421E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A2C424 802421E4 AFB20020 */ sw $s2, 0x20($sp) -/* A2C428 802421E8 3C128025 */ lui $s2, 0x8025 -/* A2C42C 802421EC 26529A74 */ addiu $s2, $s2, -0x658c -/* A2C430 802421F0 3C03800B */ lui $v1, %hi(gCameras) -/* A2C434 802421F4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A2C438 802421F8 AFB1001C */ sw $s1, 0x1c($sp) -/* A2C43C 802421FC 3C118025 */ lui $s1, 0x8025 -/* A2C440 80242200 26319A78 */ addiu $s1, $s1, -0x6588 -/* A2C444 80242204 3C0141A0 */ lui $at, 0x41a0 -/* A2C448 80242208 44810000 */ mtc1 $at, $f0 -/* A2C44C 8024220C 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* A2C450 80242210 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* A2C454 80242214 3C0542B4 */ lui $a1, 0x42b4 -/* A2C458 80242218 3C0643ED */ lui $a2, 0x43ed -/* A2C45C 8024221C 34C6599A */ ori $a2, $a2, 0x599a -/* A2C460 80242220 24040004 */ addiu $a0, $zero, 4 -/* A2C464 80242224 AFBF0024 */ sw $ra, 0x24($sp) -/* A2C468 80242228 AFB00018 */ sw $s0, 0x18($sp) -/* A2C46C 8024222C AFB20014 */ sw $s2, 0x14($sp) -/* A2C470 80242230 00028080 */ sll $s0, $v0, 2 -/* A2C474 80242234 02028021 */ addu $s0, $s0, $v0 -/* A2C478 80242238 00108080 */ sll $s0, $s0, 2 -/* A2C47C 8024223C 02028023 */ subu $s0, $s0, $v0 -/* A2C480 80242240 001010C0 */ sll $v0, $s0, 3 -/* A2C484 80242244 02028021 */ addu $s0, $s0, $v0 -/* A2C488 80242248 001080C0 */ sll $s0, $s0, 3 -/* A2C48C 8024224C E7A00010 */ swc1 $f0, 0x10($sp) -/* A2C490 80242250 C6200000 */ lwc1 $f0, ($s1) -/* A2C494 80242254 46800020 */ cvt.s.w $f0, $f0 -/* A2C498 80242258 44070000 */ mfc1 $a3, $f0 -/* A2C49C 8024225C 0C090439 */ jal func_802410E4 -/* A2C4A0 80242260 02038021 */ addu $s0, $s0, $v1 -/* A2C4A4 80242264 C6400000 */ lwc1 $f0, ($s2) -/* A2C4A8 80242268 8E220000 */ lw $v0, ($s1) -/* A2C4AC 8024226C 24030001 */ addiu $v1, $zero, 1 -/* A2C4B0 80242270 A6030506 */ sh $v1, 0x506($s0) -/* A2C4B4 80242274 24420001 */ addiu $v0, $v0, 1 -/* A2C4B8 80242278 E60004DC */ swc1 $f0, 0x4dc($s0) -/* A2C4BC 8024227C AE220000 */ sw $v0, ($s1) -/* A2C4C0 80242280 28420015 */ slti $v0, $v0, 0x15 -/* A2C4C4 80242284 8FBF0024 */ lw $ra, 0x24($sp) -/* A2C4C8 80242288 8FB20020 */ lw $s2, 0x20($sp) -/* A2C4CC 8024228C 8FB1001C */ lw $s1, 0x1c($sp) -/* A2C4D0 80242290 8FB00018 */ lw $s0, 0x18($sp) -/* A2C4D4 80242294 38420001 */ xori $v0, $v0, 1 -/* A2C4D8 80242298 03E00008 */ jr $ra -/* A2C4DC 8024229C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s new file mode 100644 index 0000000000..84f84e391e --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802421E0_A2C420.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421E0_A2C420 +/* A2C420 802421E0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A2C424 802421E4 AFB20020 */ sw $s2, 0x20($sp) +/* A2C428 802421E8 3C128025 */ lui $s2, 0x8025 +/* A2C42C 802421EC 26529A74 */ addiu $s2, $s2, -0x658c +/* A2C430 802421F0 3C03800B */ lui $v1, %hi(gCameras) +/* A2C434 802421F4 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* A2C438 802421F8 AFB1001C */ sw $s1, 0x1c($sp) +/* A2C43C 802421FC 3C118025 */ lui $s1, 0x8025 +/* A2C440 80242200 26319A78 */ addiu $s1, $s1, -0x6588 +/* A2C444 80242204 3C0141A0 */ lui $at, 0x41a0 +/* A2C448 80242208 44810000 */ mtc1 $at, $f0 +/* A2C44C 8024220C 3C028007 */ lui $v0, %hi(gCurrentCameraID) +/* A2C450 80242210 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) +/* A2C454 80242214 3C0542B4 */ lui $a1, 0x42b4 +/* A2C458 80242218 3C0643ED */ lui $a2, 0x43ed +/* A2C45C 8024221C 34C6599A */ ori $a2, $a2, 0x599a +/* A2C460 80242220 24040004 */ addiu $a0, $zero, 4 +/* A2C464 80242224 AFBF0024 */ sw $ra, 0x24($sp) +/* A2C468 80242228 AFB00018 */ sw $s0, 0x18($sp) +/* A2C46C 8024222C AFB20014 */ sw $s2, 0x14($sp) +/* A2C470 80242230 00028080 */ sll $s0, $v0, 2 +/* A2C474 80242234 02028021 */ addu $s0, $s0, $v0 +/* A2C478 80242238 00108080 */ sll $s0, $s0, 2 +/* A2C47C 8024223C 02028023 */ subu $s0, $s0, $v0 +/* A2C480 80242240 001010C0 */ sll $v0, $s0, 3 +/* A2C484 80242244 02028021 */ addu $s0, $s0, $v0 +/* A2C488 80242248 001080C0 */ sll $s0, $s0, 3 +/* A2C48C 8024224C E7A00010 */ swc1 $f0, 0x10($sp) +/* A2C490 80242250 C6200000 */ lwc1 $f0, ($s1) +/* A2C494 80242254 46800020 */ cvt.s.w $f0, $f0 +/* A2C498 80242258 44070000 */ mfc1 $a3, $f0 +/* A2C49C 8024225C 0C090439 */ jal func_802410E4_A2B324 +/* A2C4A0 80242260 02038021 */ addu $s0, $s0, $v1 +/* A2C4A4 80242264 C6400000 */ lwc1 $f0, ($s2) +/* A2C4A8 80242268 8E220000 */ lw $v0, ($s1) +/* A2C4AC 8024226C 24030001 */ addiu $v1, $zero, 1 +/* A2C4B0 80242270 A6030506 */ sh $v1, 0x506($s0) +/* A2C4B4 80242274 24420001 */ addiu $v0, $v0, 1 +/* A2C4B8 80242278 E60004DC */ swc1 $f0, 0x4dc($s0) +/* A2C4BC 8024227C AE220000 */ sw $v0, ($s1) +/* A2C4C0 80242280 28420015 */ slti $v0, $v0, 0x15 +/* A2C4C4 80242284 8FBF0024 */ lw $ra, 0x24($sp) +/* A2C4C8 80242288 8FB20020 */ lw $s2, 0x20($sp) +/* A2C4CC 8024228C 8FB1001C */ lw $s1, 0x1c($sp) +/* A2C4D0 80242290 8FB00018 */ lw $s0, 0x18($sp) +/* A2C4D4 80242294 38420001 */ xori $v0, $v0, 1 +/* A2C4D8 80242298 03E00008 */ jr $ra +/* A2C4DC 8024229C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0.s deleted file mode 100644 index 0c504e6ce4..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422A0 -/* A2C4E0 802422A0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A2C4E4 802422A4 AFB00018 */ sw $s0, 0x18($sp) -/* A2C4E8 802422A8 0080802D */ daddu $s0, $a0, $zero -/* A2C4EC 802422AC AFB1001C */ sw $s1, 0x1c($sp) -/* A2C4F0 802422B0 00A0882D */ daddu $s1, $a1, $zero -/* A2C4F4 802422B4 AFBF0028 */ sw $ra, 0x28($sp) -/* A2C4F8 802422B8 AFB30024 */ sw $s3, 0x24($sp) -/* A2C4FC 802422BC AFB20020 */ sw $s2, 0x20($sp) -/* A2C500 802422C0 F7B60038 */ sdc1 $f22, 0x38($sp) -/* A2C504 802422C4 F7B40030 */ sdc1 $f20, 0x30($sp) -/* A2C508 802422C8 0C0B36B0 */ jal resolve_npc -/* A2C50C 802422CC 24050007 */ addiu $a1, $zero, 7 -/* A2C510 802422D0 0200202D */ daddu $a0, $s0, $zero -/* A2C514 802422D4 24050008 */ addiu $a1, $zero, 8 -/* A2C518 802422D8 0C0B36B0 */ jal resolve_npc -/* A2C51C 802422DC 0040902D */ daddu $s2, $v0, $zero -/* A2C520 802422E0 12200007 */ beqz $s1, .L80242300 -/* A2C524 802422E4 0040982D */ daddu $s3, $v0, $zero -/* A2C528 802422E8 C6400038 */ lwc1 $f0, 0x38($s2) -/* A2C52C 802422EC C6420040 */ lwc1 $f2, 0x40($s2) -/* A2C530 802422F0 3C018025 */ lui $at, 0x8025 -/* A2C534 802422F4 E420F2D8 */ swc1 $f0, -0xd28($at) -/* A2C538 802422F8 3C018025 */ lui $at, 0x8025 -/* A2C53C 802422FC E422F2DC */ swc1 $f2, -0xd24($at) -.L80242300: -/* A2C540 80242300 24040003 */ addiu $a0, $zero, 3 -/* A2C544 80242304 3C108025 */ lui $s0, 0x8025 -/* A2C548 80242308 26109A7C */ addiu $s0, $s0, -0x6584 -/* A2C54C 8024230C C6000000 */ lwc1 $f0, ($s0) -/* A2C550 80242310 46800020 */ cvt.s.w $f0, $f0 -/* A2C554 80242314 3C058025 */ lui $a1, 0x8025 -/* A2C558 80242318 8CA5F2D8 */ lw $a1, -0xd28($a1) -/* A2C55C 8024231C 4480A000 */ mtc1 $zero, $f20 -/* A2C560 80242320 44070000 */ mfc1 $a3, $f0 -/* A2C564 80242324 3C014220 */ lui $at, 0x4220 -/* A2C568 80242328 4481B000 */ mtc1 $at, $f22 -/* A2C56C 8024232C 4406A000 */ mfc1 $a2, $f20 -/* A2C570 80242330 26420038 */ addiu $v0, $s2, 0x38 -/* A2C574 80242334 AFA20014 */ sw $v0, 0x14($sp) -/* A2C578 80242338 0C090439 */ jal func_802410E4 -/* A2C57C 8024233C E7B60010 */ swc1 $f22, 0x10($sp) -/* A2C580 80242340 C6000000 */ lwc1 $f0, ($s0) -/* A2C584 80242344 46800020 */ cvt.s.w $f0, $f0 -/* A2C588 80242348 24040003 */ addiu $a0, $zero, 3 -/* A2C58C 8024234C 3C058025 */ lui $a1, 0x8025 -/* A2C590 80242350 8CA5F2DC */ lw $a1, -0xd24($a1) -/* A2C594 80242354 4406A000 */ mfc1 $a2, $f20 -/* A2C598 80242358 44070000 */ mfc1 $a3, $f0 -/* A2C59C 8024235C 26420040 */ addiu $v0, $s2, 0x40 -/* A2C5A0 80242360 E7B60010 */ swc1 $f22, 0x10($sp) -/* A2C5A4 80242364 0C090439 */ jal func_802410E4 -/* A2C5A8 80242368 AFA20014 */ sw $v0, 0x14($sp) -/* A2C5AC 8024236C C6400038 */ lwc1 $f0, 0x38($s2) -/* A2C5B0 80242370 E6600038 */ swc1 $f0, 0x38($s3) -/* A2C5B4 80242374 C6400040 */ lwc1 $f0, 0x40($s2) -/* A2C5B8 80242378 E6600040 */ swc1 $f0, 0x40($s3) -/* A2C5BC 8024237C C6400038 */ lwc1 $f0, 0x38($s2) -/* A2C5C0 80242380 8E030000 */ lw $v1, ($s0) -/* A2C5C4 80242384 C6420040 */ lwc1 $f2, 0x40($s2) -/* A2C5C8 80242388 24630001 */ addiu $v1, $v1, 1 -/* A2C5CC 8024238C E640006C */ swc1 $f0, 0x6c($s2) -/* A2C5D0 80242390 E6420074 */ swc1 $f2, 0x74($s2) -/* A2C5D4 80242394 C6600038 */ lwc1 $f0, 0x38($s3) -/* A2C5D8 80242398 C6620040 */ lwc1 $f2, 0x40($s3) -/* A2C5DC 8024239C 28620029 */ slti $v0, $v1, 0x29 -/* A2C5E0 802423A0 AE030000 */ sw $v1, ($s0) -/* A2C5E4 802423A4 E660006C */ swc1 $f0, 0x6c($s3) -/* A2C5E8 802423A8 E6620074 */ swc1 $f2, 0x74($s3) -/* A2C5EC 802423AC 8FBF0028 */ lw $ra, 0x28($sp) -/* A2C5F0 802423B0 8FB30024 */ lw $s3, 0x24($sp) -/* A2C5F4 802423B4 8FB20020 */ lw $s2, 0x20($sp) -/* A2C5F8 802423B8 8FB1001C */ lw $s1, 0x1c($sp) -/* A2C5FC 802423BC 8FB00018 */ lw $s0, 0x18($sp) -/* A2C600 802423C0 D7B60038 */ ldc1 $f22, 0x38($sp) -/* A2C604 802423C4 D7B40030 */ ldc1 $f20, 0x30($sp) -/* A2C608 802423C8 38420001 */ xori $v0, $v0, 1 -/* A2C60C 802423CC 03E00008 */ jr $ra -/* A2C610 802423D0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s new file mode 100644 index 0000000000..c0b7aadde6 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802422A0_A2C4E0.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422A0_A2C4E0 +/* A2C4E0 802422A0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A2C4E4 802422A4 AFB00018 */ sw $s0, 0x18($sp) +/* A2C4E8 802422A8 0080802D */ daddu $s0, $a0, $zero +/* A2C4EC 802422AC AFB1001C */ sw $s1, 0x1c($sp) +/* A2C4F0 802422B0 00A0882D */ daddu $s1, $a1, $zero +/* A2C4F4 802422B4 AFBF0028 */ sw $ra, 0x28($sp) +/* A2C4F8 802422B8 AFB30024 */ sw $s3, 0x24($sp) +/* A2C4FC 802422BC AFB20020 */ sw $s2, 0x20($sp) +/* A2C500 802422C0 F7B60038 */ sdc1 $f22, 0x38($sp) +/* A2C504 802422C4 F7B40030 */ sdc1 $f20, 0x30($sp) +/* A2C508 802422C8 0C0B36B0 */ jal resolve_npc +/* A2C50C 802422CC 24050007 */ addiu $a1, $zero, 7 +/* A2C510 802422D0 0200202D */ daddu $a0, $s0, $zero +/* A2C514 802422D4 24050008 */ addiu $a1, $zero, 8 +/* A2C518 802422D8 0C0B36B0 */ jal resolve_npc +/* A2C51C 802422DC 0040902D */ daddu $s2, $v0, $zero +/* A2C520 802422E0 12200007 */ beqz $s1, .L80242300 +/* A2C524 802422E4 0040982D */ daddu $s3, $v0, $zero +/* A2C528 802422E8 C6400038 */ lwc1 $f0, 0x38($s2) +/* A2C52C 802422EC C6420040 */ lwc1 $f2, 0x40($s2) +/* A2C530 802422F0 3C018025 */ lui $at, 0x8025 +/* A2C534 802422F4 E420F2D8 */ swc1 $f0, -0xd28($at) +/* A2C538 802422F8 3C018025 */ lui $at, 0x8025 +/* A2C53C 802422FC E422F2DC */ swc1 $f2, -0xd24($at) +.L80242300: +/* A2C540 80242300 24040003 */ addiu $a0, $zero, 3 +/* A2C544 80242304 3C108025 */ lui $s0, 0x8025 +/* A2C548 80242308 26109A7C */ addiu $s0, $s0, -0x6584 +/* A2C54C 8024230C C6000000 */ lwc1 $f0, ($s0) +/* A2C550 80242310 46800020 */ cvt.s.w $f0, $f0 +/* A2C554 80242314 3C058025 */ lui $a1, 0x8025 +/* A2C558 80242318 8CA5F2D8 */ lw $a1, -0xd28($a1) +/* A2C55C 8024231C 4480A000 */ mtc1 $zero, $f20 +/* A2C560 80242320 44070000 */ mfc1 $a3, $f0 +/* A2C564 80242324 3C014220 */ lui $at, 0x4220 +/* A2C568 80242328 4481B000 */ mtc1 $at, $f22 +/* A2C56C 8024232C 4406A000 */ mfc1 $a2, $f20 +/* A2C570 80242330 26420038 */ addiu $v0, $s2, 0x38 +/* A2C574 80242334 AFA20014 */ sw $v0, 0x14($sp) +/* A2C578 80242338 0C090439 */ jal func_802410E4_A2B324 +/* A2C57C 8024233C E7B60010 */ swc1 $f22, 0x10($sp) +/* A2C580 80242340 C6000000 */ lwc1 $f0, ($s0) +/* A2C584 80242344 46800020 */ cvt.s.w $f0, $f0 +/* A2C588 80242348 24040003 */ addiu $a0, $zero, 3 +/* A2C58C 8024234C 3C058025 */ lui $a1, 0x8025 +/* A2C590 80242350 8CA5F2DC */ lw $a1, -0xd24($a1) +/* A2C594 80242354 4406A000 */ mfc1 $a2, $f20 +/* A2C598 80242358 44070000 */ mfc1 $a3, $f0 +/* A2C59C 8024235C 26420040 */ addiu $v0, $s2, 0x40 +/* A2C5A0 80242360 E7B60010 */ swc1 $f22, 0x10($sp) +/* A2C5A4 80242364 0C090439 */ jal func_802410E4_A2B324 +/* A2C5A8 80242368 AFA20014 */ sw $v0, 0x14($sp) +/* A2C5AC 8024236C C6400038 */ lwc1 $f0, 0x38($s2) +/* A2C5B0 80242370 E6600038 */ swc1 $f0, 0x38($s3) +/* A2C5B4 80242374 C6400040 */ lwc1 $f0, 0x40($s2) +/* A2C5B8 80242378 E6600040 */ swc1 $f0, 0x40($s3) +/* A2C5BC 8024237C C6400038 */ lwc1 $f0, 0x38($s2) +/* A2C5C0 80242380 8E030000 */ lw $v1, ($s0) +/* A2C5C4 80242384 C6420040 */ lwc1 $f2, 0x40($s2) +/* A2C5C8 80242388 24630001 */ addiu $v1, $v1, 1 +/* A2C5CC 8024238C E640006C */ swc1 $f0, 0x6c($s2) +/* A2C5D0 80242390 E6420074 */ swc1 $f2, 0x74($s2) +/* A2C5D4 80242394 C6600038 */ lwc1 $f0, 0x38($s3) +/* A2C5D8 80242398 C6620040 */ lwc1 $f2, 0x40($s3) +/* A2C5DC 8024239C 28620029 */ slti $v0, $v1, 0x29 +/* A2C5E0 802423A0 AE030000 */ sw $v1, ($s0) +/* A2C5E4 802423A4 E660006C */ swc1 $f0, 0x6c($s3) +/* A2C5E8 802423A8 E6620074 */ swc1 $f2, 0x74($s3) +/* A2C5EC 802423AC 8FBF0028 */ lw $ra, 0x28($sp) +/* A2C5F0 802423B0 8FB30024 */ lw $s3, 0x24($sp) +/* A2C5F4 802423B4 8FB20020 */ lw $s2, 0x20($sp) +/* A2C5F8 802423B8 8FB1001C */ lw $s1, 0x1c($sp) +/* A2C5FC 802423BC 8FB00018 */ lw $s0, 0x18($sp) +/* A2C600 802423C0 D7B60038 */ ldc1 $f22, 0x38($sp) +/* A2C604 802423C4 D7B40030 */ ldc1 $f20, 0x30($sp) +/* A2C608 802423C8 38420001 */ xori $v0, $v0, 1 +/* A2C60C 802423CC 03E00008 */ jr $ra +/* A2C610 802423D0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4.s deleted file mode 100644 index 261ac74300..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423D4 -/* A2C614 802423D4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A2C618 802423D8 24040004 */ addiu $a0, $zero, 4 -/* A2C61C 802423DC AFB20020 */ sw $s2, 0x20($sp) -/* A2C620 802423E0 3C128025 */ lui $s2, 0x8025 -/* A2C624 802423E4 26529A80 */ addiu $s2, $s2, -0x6580 -/* A2C628 802423E8 AFBF0034 */ sw $ra, 0x34($sp) -/* A2C62C 802423EC AFB60030 */ sw $s6, 0x30($sp) -/* A2C630 802423F0 AFB5002C */ sw $s5, 0x2c($sp) -/* A2C634 802423F4 AFB40028 */ sw $s4, 0x28($sp) -/* A2C638 802423F8 AFB30024 */ sw $s3, 0x24($sp) -/* A2C63C 802423FC AFB1001C */ sw $s1, 0x1c($sp) -/* A2C640 80242400 AFB00018 */ sw $s0, 0x18($sp) -/* A2C644 80242404 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A2C648 80242408 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A2C64C 8024240C C6400000 */ lwc1 $f0, ($s2) -/* A2C650 80242410 46800020 */ cvt.s.w $f0, $f0 -/* A2C654 80242414 3C168025 */ lui $s6, 0x8025 -/* A2C658 80242418 26D6F2E0 */ addiu $s6, $s6, -0xd20 -/* A2C65C 8024241C 3C01420C */ lui $at, 0x420c -/* A2C660 80242420 44811000 */ mtc1 $at, $f2 -/* A2C664 80242424 44070000 */ mfc1 $a3, $f0 -/* A2C668 80242428 3C0142A0 */ lui $at, 0x42a0 -/* A2C66C 8024242C 4481A000 */ mtc1 $at, $f20 -/* A2C670 80242430 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* A2C674 80242434 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* A2C678 80242438 3C03800B */ lui $v1, %hi(gCameras) -/* A2C67C 8024243C 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A2C680 80242440 AFB60014 */ sw $s6, 0x14($sp) -/* A2C684 80242444 00028080 */ sll $s0, $v0, 2 -/* A2C688 80242448 02028021 */ addu $s0, $s0, $v0 -/* A2C68C 8024244C 00108080 */ sll $s0, $s0, 2 -/* A2C690 80242450 02028023 */ subu $s0, $s0, $v0 -/* A2C694 80242454 001010C0 */ sll $v0, $s0, 3 -/* A2C698 80242458 02028021 */ addu $s0, $s0, $v0 -/* A2C69C 8024245C 001080C0 */ sll $s0, $s0, 3 -/* A2C6A0 80242460 44051000 */ mfc1 $a1, $f2 -/* A2C6A4 80242464 02038021 */ addu $s0, $s0, $v1 -/* A2C6A8 80242468 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2C6AC 8024246C 0C090439 */ jal func_802410E4 -/* A2C6B0 80242470 00A0302D */ daddu $a2, $a1, $zero -/* A2C6B4 80242474 C6400000 */ lwc1 $f0, ($s2) -/* A2C6B8 80242478 46800020 */ cvt.s.w $f0, $f0 -/* A2C6BC 8024247C 24040004 */ addiu $a0, $zero, 4 -/* A2C6C0 80242480 3C054302 */ lui $a1, 0x4302 -/* A2C6C4 80242484 3C064387 */ lui $a2, 0x4387 -/* A2C6C8 80242488 44070000 */ mfc1 $a3, $f0 -/* A2C6CC 8024248C 3C158025 */ lui $s5, 0x8025 -/* A2C6D0 80242490 26B5F2E4 */ addiu $s5, $s5, -0xd1c -/* A2C6D4 80242494 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2C6D8 80242498 0C090439 */ jal func_802410E4 -/* A2C6DC 8024249C AFB50014 */ sw $s5, 0x14($sp) -/* A2C6E0 802424A0 C6400000 */ lwc1 $f0, ($s2) -/* A2C6E4 802424A4 46800020 */ cvt.s.w $f0, $f0 -/* A2C6E8 802424A8 24040004 */ addiu $a0, $zero, 4 -/* A2C6EC 802424AC 4480B000 */ mtc1 $zero, $f22 -/* A2C6F0 802424B0 3C0541F0 */ lui $a1, 0x41f0 -/* A2C6F4 802424B4 44070000 */ mfc1 $a3, $f0 -/* A2C6F8 802424B8 4406B000 */ mfc1 $a2, $f22 -/* A2C6FC 802424BC 3C148025 */ lui $s4, 0x8025 -/* A2C700 802424C0 2694F2E8 */ addiu $s4, $s4, -0xd18 -/* A2C704 802424C4 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2C708 802424C8 0C090439 */ jal func_802410E4 -/* A2C70C 802424CC AFB40014 */ sw $s4, 0x14($sp) -/* A2C710 802424D0 C6400000 */ lwc1 $f0, ($s2) -/* A2C714 802424D4 46800020 */ cvt.s.w $f0, $f0 -/* A2C718 802424D8 24040004 */ addiu $a0, $zero, 4 -/* A2C71C 802424DC 3C054368 */ lui $a1, 0x4368 -/* A2C720 802424E0 3C064331 */ lui $a2, 0x4331 -/* A2C724 802424E4 44070000 */ mfc1 $a3, $f0 -/* A2C728 802424E8 3C138025 */ lui $s3, 0x8025 -/* A2C72C 802424EC 2673F2EC */ addiu $s3, $s3, -0xd14 -/* A2C730 802424F0 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2C734 802424F4 0C090439 */ jal func_802410E4 -/* A2C738 802424F8 AFB30014 */ sw $s3, 0x14($sp) -/* A2C73C 802424FC C6400000 */ lwc1 $f0, ($s2) -/* A2C740 80242500 46800020 */ cvt.s.w $f0, $f0 -/* A2C744 80242504 24040004 */ addiu $a0, $zero, 4 -/* A2C748 80242508 4405B000 */ mfc1 $a1, $f22 -/* A2C74C 8024250C 44070000 */ mfc1 $a3, $f0 -/* A2C750 80242510 3C118025 */ lui $s1, 0x8025 -/* A2C754 80242514 2631F2F0 */ addiu $s1, $s1, -0xd10 -/* A2C758 80242518 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2C75C 8024251C AFB10014 */ sw $s1, 0x14($sp) -/* A2C760 80242520 0C090439 */ jal func_802410E4 -/* A2C764 80242524 00A0302D */ daddu $a2, $a1, $zero -/* A2C768 80242528 8EC50000 */ lw $a1, ($s6) -/* A2C76C 8024252C 0C090355 */ jal func_80240D54 -/* A2C770 80242530 0000202D */ daddu $a0, $zero, $zero -/* A2C774 80242534 C6A00000 */ lwc1 $f0, ($s5) -/* A2C778 80242538 C6820000 */ lwc1 $f2, ($s4) -/* A2C77C 8024253C C6640000 */ lwc1 $f4, ($s3) -/* A2C780 80242540 C6260000 */ lwc1 $f6, ($s1) -/* A2C784 80242544 8E420000 */ lw $v0, ($s2) -/* A2C788 80242548 24030001 */ addiu $v1, $zero, 1 -/* A2C78C 8024254C A6030506 */ sh $v1, 0x506($s0) -/* A2C790 80242550 24420001 */ addiu $v0, $v0, 1 -/* A2C794 80242554 E60004DC */ swc1 $f0, 0x4dc($s0) -/* A2C798 80242558 E60204B0 */ swc1 $f2, 0x4b0($s0) -/* A2C79C 8024255C E60404B4 */ swc1 $f4, 0x4b4($s0) -/* A2C7A0 80242560 E60604B8 */ swc1 $f6, 0x4b8($s0) -/* A2C7A4 80242564 AE420000 */ sw $v0, ($s2) -/* A2C7A8 80242568 2842005B */ slti $v0, $v0, 0x5b -/* A2C7AC 8024256C 8FBF0034 */ lw $ra, 0x34($sp) -/* A2C7B0 80242570 8FB60030 */ lw $s6, 0x30($sp) -/* A2C7B4 80242574 8FB5002C */ lw $s5, 0x2c($sp) -/* A2C7B8 80242578 8FB40028 */ lw $s4, 0x28($sp) -/* A2C7BC 8024257C 8FB30024 */ lw $s3, 0x24($sp) -/* A2C7C0 80242580 8FB20020 */ lw $s2, 0x20($sp) -/* A2C7C4 80242584 8FB1001C */ lw $s1, 0x1c($sp) -/* A2C7C8 80242588 8FB00018 */ lw $s0, 0x18($sp) -/* A2C7CC 8024258C D7B60040 */ ldc1 $f22, 0x40($sp) -/* A2C7D0 80242590 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A2C7D4 80242594 38420001 */ xori $v0, $v0, 1 -/* A2C7D8 80242598 03E00008 */ jr $ra -/* A2C7DC 8024259C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s new file mode 100644 index 0000000000..ad3159af46 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802423D4_A2C614.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423D4_A2C614 +/* A2C614 802423D4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A2C618 802423D8 24040004 */ addiu $a0, $zero, 4 +/* A2C61C 802423DC AFB20020 */ sw $s2, 0x20($sp) +/* A2C620 802423E0 3C128025 */ lui $s2, 0x8025 +/* A2C624 802423E4 26529A80 */ addiu $s2, $s2, -0x6580 +/* A2C628 802423E8 AFBF0034 */ sw $ra, 0x34($sp) +/* A2C62C 802423EC AFB60030 */ sw $s6, 0x30($sp) +/* A2C630 802423F0 AFB5002C */ sw $s5, 0x2c($sp) +/* A2C634 802423F4 AFB40028 */ sw $s4, 0x28($sp) +/* A2C638 802423F8 AFB30024 */ sw $s3, 0x24($sp) +/* A2C63C 802423FC AFB1001C */ sw $s1, 0x1c($sp) +/* A2C640 80242400 AFB00018 */ sw $s0, 0x18($sp) +/* A2C644 80242404 F7B60040 */ sdc1 $f22, 0x40($sp) +/* A2C648 80242408 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A2C64C 8024240C C6400000 */ lwc1 $f0, ($s2) +/* A2C650 80242410 46800020 */ cvt.s.w $f0, $f0 +/* A2C654 80242414 3C168025 */ lui $s6, 0x8025 +/* A2C658 80242418 26D6F2E0 */ addiu $s6, $s6, -0xd20 +/* A2C65C 8024241C 3C01420C */ lui $at, 0x420c +/* A2C660 80242420 44811000 */ mtc1 $at, $f2 +/* A2C664 80242424 44070000 */ mfc1 $a3, $f0 +/* A2C668 80242428 3C0142A0 */ lui $at, 0x42a0 +/* A2C66C 8024242C 4481A000 */ mtc1 $at, $f20 +/* A2C670 80242430 3C028007 */ lui $v0, %hi(gCurrentCameraID) +/* A2C674 80242434 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) +/* A2C678 80242438 3C03800B */ lui $v1, %hi(gCameras) +/* A2C67C 8024243C 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* A2C680 80242440 AFB60014 */ sw $s6, 0x14($sp) +/* A2C684 80242444 00028080 */ sll $s0, $v0, 2 +/* A2C688 80242448 02028021 */ addu $s0, $s0, $v0 +/* A2C68C 8024244C 00108080 */ sll $s0, $s0, 2 +/* A2C690 80242450 02028023 */ subu $s0, $s0, $v0 +/* A2C694 80242454 001010C0 */ sll $v0, $s0, 3 +/* A2C698 80242458 02028021 */ addu $s0, $s0, $v0 +/* A2C69C 8024245C 001080C0 */ sll $s0, $s0, 3 +/* A2C6A0 80242460 44051000 */ mfc1 $a1, $f2 +/* A2C6A4 80242464 02038021 */ addu $s0, $s0, $v1 +/* A2C6A8 80242468 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2C6AC 8024246C 0C090439 */ jal func_802410E4_A2B324 +/* A2C6B0 80242470 00A0302D */ daddu $a2, $a1, $zero +/* A2C6B4 80242474 C6400000 */ lwc1 $f0, ($s2) +/* A2C6B8 80242478 46800020 */ cvt.s.w $f0, $f0 +/* A2C6BC 8024247C 24040004 */ addiu $a0, $zero, 4 +/* A2C6C0 80242480 3C054302 */ lui $a1, 0x4302 +/* A2C6C4 80242484 3C064387 */ lui $a2, 0x4387 +/* A2C6C8 80242488 44070000 */ mfc1 $a3, $f0 +/* A2C6CC 8024248C 3C158025 */ lui $s5, 0x8025 +/* A2C6D0 80242490 26B5F2E4 */ addiu $s5, $s5, -0xd1c +/* A2C6D4 80242494 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2C6D8 80242498 0C090439 */ jal func_802410E4_A2B324 +/* A2C6DC 8024249C AFB50014 */ sw $s5, 0x14($sp) +/* A2C6E0 802424A0 C6400000 */ lwc1 $f0, ($s2) +/* A2C6E4 802424A4 46800020 */ cvt.s.w $f0, $f0 +/* A2C6E8 802424A8 24040004 */ addiu $a0, $zero, 4 +/* A2C6EC 802424AC 4480B000 */ mtc1 $zero, $f22 +/* A2C6F0 802424B0 3C0541F0 */ lui $a1, 0x41f0 +/* A2C6F4 802424B4 44070000 */ mfc1 $a3, $f0 +/* A2C6F8 802424B8 4406B000 */ mfc1 $a2, $f22 +/* A2C6FC 802424BC 3C148025 */ lui $s4, 0x8025 +/* A2C700 802424C0 2694F2E8 */ addiu $s4, $s4, -0xd18 +/* A2C704 802424C4 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2C708 802424C8 0C090439 */ jal func_802410E4_A2B324 +/* A2C70C 802424CC AFB40014 */ sw $s4, 0x14($sp) +/* A2C710 802424D0 C6400000 */ lwc1 $f0, ($s2) +/* A2C714 802424D4 46800020 */ cvt.s.w $f0, $f0 +/* A2C718 802424D8 24040004 */ addiu $a0, $zero, 4 +/* A2C71C 802424DC 3C054368 */ lui $a1, 0x4368 +/* A2C720 802424E0 3C064331 */ lui $a2, 0x4331 +/* A2C724 802424E4 44070000 */ mfc1 $a3, $f0 +/* A2C728 802424E8 3C138025 */ lui $s3, 0x8025 +/* A2C72C 802424EC 2673F2EC */ addiu $s3, $s3, -0xd14 +/* A2C730 802424F0 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2C734 802424F4 0C090439 */ jal func_802410E4_A2B324 +/* A2C738 802424F8 AFB30014 */ sw $s3, 0x14($sp) +/* A2C73C 802424FC C6400000 */ lwc1 $f0, ($s2) +/* A2C740 80242500 46800020 */ cvt.s.w $f0, $f0 +/* A2C744 80242504 24040004 */ addiu $a0, $zero, 4 +/* A2C748 80242508 4405B000 */ mfc1 $a1, $f22 +/* A2C74C 8024250C 44070000 */ mfc1 $a3, $f0 +/* A2C750 80242510 3C118025 */ lui $s1, 0x8025 +/* A2C754 80242514 2631F2F0 */ addiu $s1, $s1, -0xd10 +/* A2C758 80242518 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2C75C 8024251C AFB10014 */ sw $s1, 0x14($sp) +/* A2C760 80242520 0C090439 */ jal func_802410E4_A2B324 +/* A2C764 80242524 00A0302D */ daddu $a2, $a1, $zero +/* A2C768 80242528 8EC50000 */ lw $a1, ($s6) +/* A2C76C 8024252C 0C090355 */ jal func_80240D54_A2AF94 +/* A2C770 80242530 0000202D */ daddu $a0, $zero, $zero +/* A2C774 80242534 C6A00000 */ lwc1 $f0, ($s5) +/* A2C778 80242538 C6820000 */ lwc1 $f2, ($s4) +/* A2C77C 8024253C C6640000 */ lwc1 $f4, ($s3) +/* A2C780 80242540 C6260000 */ lwc1 $f6, ($s1) +/* A2C784 80242544 8E420000 */ lw $v0, ($s2) +/* A2C788 80242548 24030001 */ addiu $v1, $zero, 1 +/* A2C78C 8024254C A6030506 */ sh $v1, 0x506($s0) +/* A2C790 80242550 24420001 */ addiu $v0, $v0, 1 +/* A2C794 80242554 E60004DC */ swc1 $f0, 0x4dc($s0) +/* A2C798 80242558 E60204B0 */ swc1 $f2, 0x4b0($s0) +/* A2C79C 8024255C E60404B4 */ swc1 $f4, 0x4b4($s0) +/* A2C7A0 80242560 E60604B8 */ swc1 $f6, 0x4b8($s0) +/* A2C7A4 80242564 AE420000 */ sw $v0, ($s2) +/* A2C7A8 80242568 2842005B */ slti $v0, $v0, 0x5b +/* A2C7AC 8024256C 8FBF0034 */ lw $ra, 0x34($sp) +/* A2C7B0 80242570 8FB60030 */ lw $s6, 0x30($sp) +/* A2C7B4 80242574 8FB5002C */ lw $s5, 0x2c($sp) +/* A2C7B8 80242578 8FB40028 */ lw $s4, 0x28($sp) +/* A2C7BC 8024257C 8FB30024 */ lw $s3, 0x24($sp) +/* A2C7C0 80242580 8FB20020 */ lw $s2, 0x20($sp) +/* A2C7C4 80242584 8FB1001C */ lw $s1, 0x1c($sp) +/* A2C7C8 80242588 8FB00018 */ lw $s0, 0x18($sp) +/* A2C7CC 8024258C D7B60040 */ ldc1 $f22, 0x40($sp) +/* A2C7D0 80242590 D7B40038 */ ldc1 $f20, 0x38($sp) +/* A2C7D4 80242594 38420001 */ xori $v0, $v0, 1 +/* A2C7D8 80242598 03E00008 */ jr $ra +/* A2C7DC 8024259C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0.s deleted file mode 100644 index a3f75f36e2..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425A0 -/* A2C7E0 802425A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A2C7E4 802425A4 0000202D */ daddu $a0, $zero, $zero -/* A2C7E8 802425A8 AFB20020 */ sw $s2, 0x20($sp) -/* A2C7EC 802425AC 3C128025 */ lui $s2, 0x8025 -/* A2C7F0 802425B0 26529A90 */ addiu $s2, $s2, -0x6570 -/* A2C7F4 802425B4 AFBF002C */ sw $ra, 0x2c($sp) -/* A2C7F8 802425B8 AFB40028 */ sw $s4, 0x28($sp) -/* A2C7FC 802425BC AFB30024 */ sw $s3, 0x24($sp) -/* A2C800 802425C0 AFB1001C */ sw $s1, 0x1c($sp) -/* A2C804 802425C4 AFB00018 */ sw $s0, 0x18($sp) -/* A2C808 802425C8 F7B40030 */ sdc1 $f20, 0x30($sp) -/* A2C80C 802425CC C6400000 */ lwc1 $f0, ($s2) -/* A2C810 802425D0 46800020 */ cvt.s.w $f0, $f0 -/* A2C814 802425D4 3C148025 */ lui $s4, 0x8025 -/* A2C818 802425D8 26949A84 */ addiu $s4, $s4, -0x657c -/* A2C81C 802425DC 3C054220 */ lui $a1, 0x4220 -/* A2C820 802425E0 3C06C302 */ lui $a2, 0xc302 -/* A2C824 802425E4 44070000 */ mfc1 $a3, $f0 -/* A2C828 802425E8 3C01432A */ lui $at, 0x432a -/* A2C82C 802425EC 4481A000 */ mtc1 $at, $f20 -/* A2C830 802425F0 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* A2C834 802425F4 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* A2C838 802425F8 3C03800B */ lui $v1, %hi(gCameras) -/* A2C83C 802425FC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A2C840 80242600 AFB40014 */ sw $s4, 0x14($sp) -/* A2C844 80242604 00028080 */ sll $s0, $v0, 2 -/* A2C848 80242608 02028021 */ addu $s0, $s0, $v0 -/* A2C84C 8024260C 00108080 */ sll $s0, $s0, 2 -/* A2C850 80242610 02028023 */ subu $s0, $s0, $v0 -/* A2C854 80242614 001010C0 */ sll $v0, $s0, 3 -/* A2C858 80242618 02028021 */ addu $s0, $s0, $v0 -/* A2C85C 8024261C 001080C0 */ sll $s0, $s0, 3 -/* A2C860 80242620 02038021 */ addu $s0, $s0, $v1 -/* A2C864 80242624 0C090439 */ jal func_802410E4 -/* A2C868 80242628 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2C86C 8024262C C6400000 */ lwc1 $f0, ($s2) -/* A2C870 80242630 46800020 */ cvt.s.w $f0, $f0 -/* A2C874 80242634 0000202D */ daddu $a0, $zero, $zero -/* A2C878 80242638 3C05C220 */ lui $a1, 0xc220 -/* A2C87C 8024263C 3C064302 */ lui $a2, 0x4302 -/* A2C880 80242640 44070000 */ mfc1 $a3, $f0 -/* A2C884 80242644 3C138025 */ lui $s3, 0x8025 -/* A2C888 80242648 26739A88 */ addiu $s3, $s3, -0x6578 -/* A2C88C 8024264C E7B40010 */ swc1 $f20, 0x10($sp) -/* A2C890 80242650 0C090439 */ jal func_802410E4 -/* A2C894 80242654 AFB30014 */ sw $s3, 0x14($sp) -/* A2C898 80242658 C6400000 */ lwc1 $f0, ($s2) -/* A2C89C 8024265C 46800020 */ cvt.s.w $f0, $f0 -/* A2C8A0 80242660 24040003 */ addiu $a0, $zero, 3 -/* A2C8A4 80242664 3C054234 */ lui $a1, 0x4234 -/* A2C8A8 80242668 3C0641C8 */ lui $a2, 0x41c8 -/* A2C8AC 8024266C 44070000 */ mfc1 $a3, $f0 -/* A2C8B0 80242670 3C118025 */ lui $s1, 0x8025 -/* A2C8B4 80242674 26319A8C */ addiu $s1, $s1, -0x6574 -/* A2C8B8 80242678 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2C8BC 8024267C 0C090439 */ jal func_802410E4 -/* A2C8C0 80242680 AFB10014 */ sw $s1, 0x14($sp) -/* A2C8C4 80242684 C62C0000 */ lwc1 $f12, ($s1) -/* A2C8C8 80242688 C6800000 */ lwc1 $f0, ($s4) -/* A2C8CC 8024268C C6620000 */ lwc1 $f2, ($s3) -/* A2C8D0 80242690 3C0143FA */ lui $at, 0x43fa -/* A2C8D4 80242694 4481A000 */ mtc1 $at, $f20 -/* A2C8D8 80242698 24020001 */ addiu $v0, $zero, 1 -/* A2C8DC 8024269C A6020506 */ sh $v0, 0x506($s0) -/* A2C8E0 802426A0 E60004B0 */ swc1 $f0, 0x4b0($s0) -/* A2C8E4 802426A4 0C00A8BB */ jal sin_deg -/* A2C8E8 802426A8 E60204B8 */ swc1 $f2, 0x4b8($s0) -/* A2C8EC 802426AC 46140002 */ mul.s $f0, $f0, $f20 -/* A2C8F0 802426B0 00000000 */ nop -/* A2C8F4 802426B4 C62C0000 */ lwc1 $f12, ($s1) -/* A2C8F8 802426B8 0C00A8D4 */ jal cos_deg -/* A2C8FC 802426BC E60004F0 */ swc1 $f0, 0x4f0($s0) -/* A2C900 802426C0 46140002 */ mul.s $f0, $f0, $f20 -/* A2C904 802426C4 00000000 */ nop -/* A2C908 802426C8 8E420000 */ lw $v0, ($s2) -/* A2C90C 802426CC 24420001 */ addiu $v0, $v0, 1 -/* A2C910 802426D0 AE420000 */ sw $v0, ($s2) -/* A2C914 802426D4 384200AA */ xori $v0, $v0, 0xaa -/* A2C918 802426D8 E60004F8 */ swc1 $f0, 0x4f8($s0) -/* A2C91C 802426DC 8FBF002C */ lw $ra, 0x2c($sp) -/* A2C920 802426E0 8FB40028 */ lw $s4, 0x28($sp) -/* A2C924 802426E4 8FB30024 */ lw $s3, 0x24($sp) -/* A2C928 802426E8 8FB20020 */ lw $s2, 0x20($sp) -/* A2C92C 802426EC 8FB1001C */ lw $s1, 0x1c($sp) -/* A2C930 802426F0 8FB00018 */ lw $s0, 0x18($sp) -/* A2C934 802426F4 D7B40030 */ ldc1 $f20, 0x30($sp) -/* A2C938 802426F8 2C420001 */ sltiu $v0, $v0, 1 -/* A2C93C 802426FC 03E00008 */ jr $ra -/* A2C940 80242700 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s new file mode 100644 index 0000000000..3f8d1272f0 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802425A0_A2C7E0.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425A0_A2C7E0 +/* A2C7E0 802425A0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A2C7E4 802425A4 0000202D */ daddu $a0, $zero, $zero +/* A2C7E8 802425A8 AFB20020 */ sw $s2, 0x20($sp) +/* A2C7EC 802425AC 3C128025 */ lui $s2, 0x8025 +/* A2C7F0 802425B0 26529A90 */ addiu $s2, $s2, -0x6570 +/* A2C7F4 802425B4 AFBF002C */ sw $ra, 0x2c($sp) +/* A2C7F8 802425B8 AFB40028 */ sw $s4, 0x28($sp) +/* A2C7FC 802425BC AFB30024 */ sw $s3, 0x24($sp) +/* A2C800 802425C0 AFB1001C */ sw $s1, 0x1c($sp) +/* A2C804 802425C4 AFB00018 */ sw $s0, 0x18($sp) +/* A2C808 802425C8 F7B40030 */ sdc1 $f20, 0x30($sp) +/* A2C80C 802425CC C6400000 */ lwc1 $f0, ($s2) +/* A2C810 802425D0 46800020 */ cvt.s.w $f0, $f0 +/* A2C814 802425D4 3C148025 */ lui $s4, 0x8025 +/* A2C818 802425D8 26949A84 */ addiu $s4, $s4, -0x657c +/* A2C81C 802425DC 3C054220 */ lui $a1, 0x4220 +/* A2C820 802425E0 3C06C302 */ lui $a2, 0xc302 +/* A2C824 802425E4 44070000 */ mfc1 $a3, $f0 +/* A2C828 802425E8 3C01432A */ lui $at, 0x432a +/* A2C82C 802425EC 4481A000 */ mtc1 $at, $f20 +/* A2C830 802425F0 3C028007 */ lui $v0, %hi(gCurrentCameraID) +/* A2C834 802425F4 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) +/* A2C838 802425F8 3C03800B */ lui $v1, %hi(gCameras) +/* A2C83C 802425FC 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* A2C840 80242600 AFB40014 */ sw $s4, 0x14($sp) +/* A2C844 80242604 00028080 */ sll $s0, $v0, 2 +/* A2C848 80242608 02028021 */ addu $s0, $s0, $v0 +/* A2C84C 8024260C 00108080 */ sll $s0, $s0, 2 +/* A2C850 80242610 02028023 */ subu $s0, $s0, $v0 +/* A2C854 80242614 001010C0 */ sll $v0, $s0, 3 +/* A2C858 80242618 02028021 */ addu $s0, $s0, $v0 +/* A2C85C 8024261C 001080C0 */ sll $s0, $s0, 3 +/* A2C860 80242620 02038021 */ addu $s0, $s0, $v1 +/* A2C864 80242624 0C090439 */ jal func_802410E4_A2B324 +/* A2C868 80242628 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2C86C 8024262C C6400000 */ lwc1 $f0, ($s2) +/* A2C870 80242630 46800020 */ cvt.s.w $f0, $f0 +/* A2C874 80242634 0000202D */ daddu $a0, $zero, $zero +/* A2C878 80242638 3C05C220 */ lui $a1, 0xc220 +/* A2C87C 8024263C 3C064302 */ lui $a2, 0x4302 +/* A2C880 80242640 44070000 */ mfc1 $a3, $f0 +/* A2C884 80242644 3C138025 */ lui $s3, 0x8025 +/* A2C888 80242648 26739A88 */ addiu $s3, $s3, -0x6578 +/* A2C88C 8024264C E7B40010 */ swc1 $f20, 0x10($sp) +/* A2C890 80242650 0C090439 */ jal func_802410E4_A2B324 +/* A2C894 80242654 AFB30014 */ sw $s3, 0x14($sp) +/* A2C898 80242658 C6400000 */ lwc1 $f0, ($s2) +/* A2C89C 8024265C 46800020 */ cvt.s.w $f0, $f0 +/* A2C8A0 80242660 24040003 */ addiu $a0, $zero, 3 +/* A2C8A4 80242664 3C054234 */ lui $a1, 0x4234 +/* A2C8A8 80242668 3C0641C8 */ lui $a2, 0x41c8 +/* A2C8AC 8024266C 44070000 */ mfc1 $a3, $f0 +/* A2C8B0 80242670 3C118025 */ lui $s1, 0x8025 +/* A2C8B4 80242674 26319A8C */ addiu $s1, $s1, -0x6574 +/* A2C8B8 80242678 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2C8BC 8024267C 0C090439 */ jal func_802410E4_A2B324 +/* A2C8C0 80242680 AFB10014 */ sw $s1, 0x14($sp) +/* A2C8C4 80242684 C62C0000 */ lwc1 $f12, ($s1) +/* A2C8C8 80242688 C6800000 */ lwc1 $f0, ($s4) +/* A2C8CC 8024268C C6620000 */ lwc1 $f2, ($s3) +/* A2C8D0 80242690 3C0143FA */ lui $at, 0x43fa +/* A2C8D4 80242694 4481A000 */ mtc1 $at, $f20 +/* A2C8D8 80242698 24020001 */ addiu $v0, $zero, 1 +/* A2C8DC 8024269C A6020506 */ sh $v0, 0x506($s0) +/* A2C8E0 802426A0 E60004B0 */ swc1 $f0, 0x4b0($s0) +/* A2C8E4 802426A4 0C00A8BB */ jal sin_deg +/* A2C8E8 802426A8 E60204B8 */ swc1 $f2, 0x4b8($s0) +/* A2C8EC 802426AC 46140002 */ mul.s $f0, $f0, $f20 +/* A2C8F0 802426B0 00000000 */ nop +/* A2C8F4 802426B4 C62C0000 */ lwc1 $f12, ($s1) +/* A2C8F8 802426B8 0C00A8D4 */ jal cos_deg +/* A2C8FC 802426BC E60004F0 */ swc1 $f0, 0x4f0($s0) +/* A2C900 802426C0 46140002 */ mul.s $f0, $f0, $f20 +/* A2C904 802426C4 00000000 */ nop +/* A2C908 802426C8 8E420000 */ lw $v0, ($s2) +/* A2C90C 802426CC 24420001 */ addiu $v0, $v0, 1 +/* A2C910 802426D0 AE420000 */ sw $v0, ($s2) +/* A2C914 802426D4 384200AA */ xori $v0, $v0, 0xaa +/* A2C918 802426D8 E60004F8 */ swc1 $f0, 0x4f8($s0) +/* A2C91C 802426DC 8FBF002C */ lw $ra, 0x2c($sp) +/* A2C920 802426E0 8FB40028 */ lw $s4, 0x28($sp) +/* A2C924 802426E4 8FB30024 */ lw $s3, 0x24($sp) +/* A2C928 802426E8 8FB20020 */ lw $s2, 0x20($sp) +/* A2C92C 802426EC 8FB1001C */ lw $s1, 0x1c($sp) +/* A2C930 802426F0 8FB00018 */ lw $s0, 0x18($sp) +/* A2C934 802426F4 D7B40030 */ ldc1 $f20, 0x30($sp) +/* A2C938 802426F8 2C420001 */ sltiu $v0, $v0, 1 +/* A2C93C 802426FC 03E00008 */ jr $ra +/* A2C940 80242700 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704.s deleted file mode 100644 index 3f94309b26..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704.s +++ /dev/null @@ -1,117 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242704 -/* A2C944 80242704 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A2C948 80242708 24040003 */ addiu $a0, $zero, 3 -/* A2C94C 8024270C AFB1001C */ sw $s1, 0x1c($sp) -/* A2C950 80242710 3C118025 */ lui $s1, 0x8025 -/* A2C954 80242714 26319AA4 */ addiu $s1, $s1, -0x655c -/* A2C958 80242718 AFBF0030 */ sw $ra, 0x30($sp) -/* A2C95C 8024271C AFB5002C */ sw $s5, 0x2c($sp) -/* A2C960 80242720 AFB40028 */ sw $s4, 0x28($sp) -/* A2C964 80242724 AFB30024 */ sw $s3, 0x24($sp) -/* A2C968 80242728 AFB20020 */ sw $s2, 0x20($sp) -/* A2C96C 8024272C AFB00018 */ sw $s0, 0x18($sp) -/* A2C970 80242730 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A2C974 80242734 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A2C978 80242738 C6200000 */ lwc1 $f0, ($s1) -/* A2C97C 8024273C 46800020 */ cvt.s.w $f0, $f0 -/* A2C980 80242740 3C138025 */ lui $s3, 0x8025 -/* A2C984 80242744 26739AA0 */ addiu $s3, $s3, -0x6560 -/* A2C988 80242748 3C0541C8 */ lui $a1, 0x41c8 -/* A2C98C 8024274C 3C014348 */ lui $at, 0x4348 -/* A2C990 80242750 4481B000 */ mtc1 $at, $f22 -/* A2C994 80242754 44070000 */ mfc1 $a3, $f0 -/* A2C998 80242758 3C0142F0 */ lui $at, 0x42f0 -/* A2C99C 8024275C 44810000 */ mtc1 $at, $f0 -/* A2C9A0 80242760 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* A2C9A4 80242764 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* A2C9A8 80242768 3C03800B */ lui $v1, %hi(gCameras) -/* A2C9AC 8024276C 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A2C9B0 80242770 AFB30014 */ sw $s3, 0x14($sp) -/* A2C9B4 80242774 00028080 */ sll $s0, $v0, 2 -/* A2C9B8 80242778 02028021 */ addu $s0, $s0, $v0 -/* A2C9BC 8024277C 00108080 */ sll $s0, $s0, 2 -/* A2C9C0 80242780 02028023 */ subu $s0, $s0, $v0 -/* A2C9C4 80242784 00901004 */ sllv $v0, $s0, $a0 -/* A2C9C8 80242788 02028021 */ addu $s0, $s0, $v0 -/* A2C9CC 8024278C 00908004 */ sllv $s0, $s0, $a0 -/* A2C9D0 80242790 4406B000 */ mfc1 $a2, $f22 -/* A2C9D4 80242794 02038021 */ addu $s0, $s0, $v1 -/* A2C9D8 80242798 0C090439 */ jal func_802410E4 -/* A2C9DC 8024279C E7A00010 */ swc1 $f0, 0x10($sp) -/* A2C9E0 802427A0 C6200000 */ lwc1 $f0, ($s1) -/* A2C9E4 802427A4 46800020 */ cvt.s.w $f0, $f0 -/* A2C9E8 802427A8 24040003 */ addiu $a0, $zero, 3 -/* A2C9EC 802427AC 3C054248 */ lui $a1, 0x4248 -/* A2C9F0 802427B0 3C06420C */ lui $a2, 0x420c -/* A2C9F4 802427B4 44070000 */ mfc1 $a3, $f0 -/* A2C9F8 802427B8 3C0141F0 */ lui $at, 0x41f0 -/* A2C9FC 802427BC 4481A000 */ mtc1 $at, $f20 -/* A2CA00 802427C0 3C158025 */ lui $s5, 0x8025 -/* A2CA04 802427C4 26B59A94 */ addiu $s5, $s5, -0x656c -/* A2CA08 802427C8 AFB50014 */ sw $s5, 0x14($sp) -/* A2CA0C 802427CC 0C090439 */ jal func_802410E4 -/* A2CA10 802427D0 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2CA14 802427D4 C6200000 */ lwc1 $f0, ($s1) -/* A2CA18 802427D8 46800020 */ cvt.s.w $f0, $f0 -/* A2CA1C 802427DC 24040003 */ addiu $a0, $zero, 3 -/* A2CA20 802427E0 3C054376 */ lui $a1, 0x4376 -/* A2CA24 802427E4 34A5199A */ ori $a1, $a1, 0x199a -/* A2CA28 802427E8 3C064334 */ lui $a2, 0x4334 -/* A2CA2C 802427EC 44070000 */ mfc1 $a3, $f0 -/* A2CA30 802427F0 3C148025 */ lui $s4, 0x8025 -/* A2CA34 802427F4 26949A98 */ addiu $s4, $s4, -0x6568 -/* A2CA38 802427F8 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2CA3C 802427FC 0C090439 */ jal func_802410E4 -/* A2CA40 80242800 AFB40014 */ sw $s4, 0x14($sp) -/* A2CA44 80242804 C6200000 */ lwc1 $f0, ($s1) -/* A2CA48 80242808 46800020 */ cvt.s.w $f0, $f0 -/* A2CA4C 8024280C 24040003 */ addiu $a0, $zero, 3 -/* A2CA50 80242810 4405B000 */ mfc1 $a1, $f22 -/* A2CA54 80242814 3C06435C */ lui $a2, 0x435c -/* A2CA58 80242818 44070000 */ mfc1 $a3, $f0 -/* A2CA5C 8024281C 3C128025 */ lui $s2, 0x8025 -/* A2CA60 80242820 26529A9C */ addiu $s2, $s2, -0x6564 -/* A2CA64 80242824 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2CA68 80242828 0C090439 */ jal func_802410E4 -/* A2CA6C 8024282C AFB20014 */ sw $s2, 0x14($sp) -/* A2CA70 80242830 C66C0000 */ lwc1 $f12, ($s3) -/* A2CA74 80242834 3C0143FA */ lui $at, 0x43fa -/* A2CA78 80242838 4481A000 */ mtc1 $at, $f20 -/* A2CA7C 8024283C 0C00A8BB */ jal sin_deg -/* A2CA80 80242840 00000000 */ nop -/* A2CA84 80242844 46140002 */ mul.s $f0, $f0, $f20 -/* A2CA88 80242848 00000000 */ nop -/* A2CA8C 8024284C C66C0000 */ lwc1 $f12, ($s3) -/* A2CA90 80242850 0C00A8D4 */ jal cos_deg -/* A2CA94 80242854 E60004F0 */ swc1 $f0, 0x4f0($s0) -/* A2CA98 80242858 46140002 */ mul.s $f0, $f0, $f20 -/* A2CA9C 8024285C 00000000 */ nop -/* A2CAA0 80242860 8EA50000 */ lw $a1, ($s5) -/* A2CAA4 80242864 0000202D */ daddu $a0, $zero, $zero -/* A2CAA8 80242868 0C090355 */ jal func_80240D54 -/* A2CAAC 8024286C E60004F8 */ swc1 $f0, 0x4f8($s0) -/* A2CAB0 80242870 C6800000 */ lwc1 $f0, ($s4) -/* A2CAB4 80242874 C6420000 */ lwc1 $f2, ($s2) -/* A2CAB8 80242878 8E220000 */ lw $v0, ($s1) -/* A2CABC 8024287C 24030001 */ addiu $v1, $zero, 1 -/* A2CAC0 80242880 A6030506 */ sh $v1, 0x506($s0) -/* A2CAC4 80242884 24420001 */ addiu $v0, $v0, 1 -/* A2CAC8 80242888 E60004DC */ swc1 $f0, 0x4dc($s0) -/* A2CACC 8024288C E60204B4 */ swc1 $f2, 0x4b4($s0) -/* A2CAD0 80242890 AE220000 */ sw $v0, ($s1) -/* A2CAD4 80242894 28420079 */ slti $v0, $v0, 0x79 -/* A2CAD8 80242898 8FBF0030 */ lw $ra, 0x30($sp) -/* A2CADC 8024289C 8FB5002C */ lw $s5, 0x2c($sp) -/* A2CAE0 802428A0 8FB40028 */ lw $s4, 0x28($sp) -/* A2CAE4 802428A4 8FB30024 */ lw $s3, 0x24($sp) -/* A2CAE8 802428A8 8FB20020 */ lw $s2, 0x20($sp) -/* A2CAEC 802428AC 8FB1001C */ lw $s1, 0x1c($sp) -/* A2CAF0 802428B0 8FB00018 */ lw $s0, 0x18($sp) -/* A2CAF4 802428B4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A2CAF8 802428B8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A2CAFC 802428BC 38420001 */ xori $v0, $v0, 1 -/* A2CB00 802428C0 03E00008 */ jr $ra -/* A2CB04 802428C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s new file mode 100644 index 0000000000..a4912da51d --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242704_A2C944.s @@ -0,0 +1,117 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242704_A2C944 +/* A2C944 80242704 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A2C948 80242708 24040003 */ addiu $a0, $zero, 3 +/* A2C94C 8024270C AFB1001C */ sw $s1, 0x1c($sp) +/* A2C950 80242710 3C118025 */ lui $s1, 0x8025 +/* A2C954 80242714 26319AA4 */ addiu $s1, $s1, -0x655c +/* A2C958 80242718 AFBF0030 */ sw $ra, 0x30($sp) +/* A2C95C 8024271C AFB5002C */ sw $s5, 0x2c($sp) +/* A2C960 80242720 AFB40028 */ sw $s4, 0x28($sp) +/* A2C964 80242724 AFB30024 */ sw $s3, 0x24($sp) +/* A2C968 80242728 AFB20020 */ sw $s2, 0x20($sp) +/* A2C96C 8024272C AFB00018 */ sw $s0, 0x18($sp) +/* A2C970 80242730 F7B60040 */ sdc1 $f22, 0x40($sp) +/* A2C974 80242734 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A2C978 80242738 C6200000 */ lwc1 $f0, ($s1) +/* A2C97C 8024273C 46800020 */ cvt.s.w $f0, $f0 +/* A2C980 80242740 3C138025 */ lui $s3, 0x8025 +/* A2C984 80242744 26739AA0 */ addiu $s3, $s3, -0x6560 +/* A2C988 80242748 3C0541C8 */ lui $a1, 0x41c8 +/* A2C98C 8024274C 3C014348 */ lui $at, 0x4348 +/* A2C990 80242750 4481B000 */ mtc1 $at, $f22 +/* A2C994 80242754 44070000 */ mfc1 $a3, $f0 +/* A2C998 80242758 3C0142F0 */ lui $at, 0x42f0 +/* A2C99C 8024275C 44810000 */ mtc1 $at, $f0 +/* A2C9A0 80242760 3C028007 */ lui $v0, %hi(gCurrentCameraID) +/* A2C9A4 80242764 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) +/* A2C9A8 80242768 3C03800B */ lui $v1, %hi(gCameras) +/* A2C9AC 8024276C 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* A2C9B0 80242770 AFB30014 */ sw $s3, 0x14($sp) +/* A2C9B4 80242774 00028080 */ sll $s0, $v0, 2 +/* A2C9B8 80242778 02028021 */ addu $s0, $s0, $v0 +/* A2C9BC 8024277C 00108080 */ sll $s0, $s0, 2 +/* A2C9C0 80242780 02028023 */ subu $s0, $s0, $v0 +/* A2C9C4 80242784 00901004 */ sllv $v0, $s0, $a0 +/* A2C9C8 80242788 02028021 */ addu $s0, $s0, $v0 +/* A2C9CC 8024278C 00908004 */ sllv $s0, $s0, $a0 +/* A2C9D0 80242790 4406B000 */ mfc1 $a2, $f22 +/* A2C9D4 80242794 02038021 */ addu $s0, $s0, $v1 +/* A2C9D8 80242798 0C090439 */ jal func_802410E4_A2B324 +/* A2C9DC 8024279C E7A00010 */ swc1 $f0, 0x10($sp) +/* A2C9E0 802427A0 C6200000 */ lwc1 $f0, ($s1) +/* A2C9E4 802427A4 46800020 */ cvt.s.w $f0, $f0 +/* A2C9E8 802427A8 24040003 */ addiu $a0, $zero, 3 +/* A2C9EC 802427AC 3C054248 */ lui $a1, 0x4248 +/* A2C9F0 802427B0 3C06420C */ lui $a2, 0x420c +/* A2C9F4 802427B4 44070000 */ mfc1 $a3, $f0 +/* A2C9F8 802427B8 3C0141F0 */ lui $at, 0x41f0 +/* A2C9FC 802427BC 4481A000 */ mtc1 $at, $f20 +/* A2CA00 802427C0 3C158025 */ lui $s5, 0x8025 +/* A2CA04 802427C4 26B59A94 */ addiu $s5, $s5, -0x656c +/* A2CA08 802427C8 AFB50014 */ sw $s5, 0x14($sp) +/* A2CA0C 802427CC 0C090439 */ jal func_802410E4_A2B324 +/* A2CA10 802427D0 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2CA14 802427D4 C6200000 */ lwc1 $f0, ($s1) +/* A2CA18 802427D8 46800020 */ cvt.s.w $f0, $f0 +/* A2CA1C 802427DC 24040003 */ addiu $a0, $zero, 3 +/* A2CA20 802427E0 3C054376 */ lui $a1, 0x4376 +/* A2CA24 802427E4 34A5199A */ ori $a1, $a1, 0x199a +/* A2CA28 802427E8 3C064334 */ lui $a2, 0x4334 +/* A2CA2C 802427EC 44070000 */ mfc1 $a3, $f0 +/* A2CA30 802427F0 3C148025 */ lui $s4, 0x8025 +/* A2CA34 802427F4 26949A98 */ addiu $s4, $s4, -0x6568 +/* A2CA38 802427F8 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2CA3C 802427FC 0C090439 */ jal func_802410E4_A2B324 +/* A2CA40 80242800 AFB40014 */ sw $s4, 0x14($sp) +/* A2CA44 80242804 C6200000 */ lwc1 $f0, ($s1) +/* A2CA48 80242808 46800020 */ cvt.s.w $f0, $f0 +/* A2CA4C 8024280C 24040003 */ addiu $a0, $zero, 3 +/* A2CA50 80242810 4405B000 */ mfc1 $a1, $f22 +/* A2CA54 80242814 3C06435C */ lui $a2, 0x435c +/* A2CA58 80242818 44070000 */ mfc1 $a3, $f0 +/* A2CA5C 8024281C 3C128025 */ lui $s2, 0x8025 +/* A2CA60 80242820 26529A9C */ addiu $s2, $s2, -0x6564 +/* A2CA64 80242824 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2CA68 80242828 0C090439 */ jal func_802410E4_A2B324 +/* A2CA6C 8024282C AFB20014 */ sw $s2, 0x14($sp) +/* A2CA70 80242830 C66C0000 */ lwc1 $f12, ($s3) +/* A2CA74 80242834 3C0143FA */ lui $at, 0x43fa +/* A2CA78 80242838 4481A000 */ mtc1 $at, $f20 +/* A2CA7C 8024283C 0C00A8BB */ jal sin_deg +/* A2CA80 80242840 00000000 */ nop +/* A2CA84 80242844 46140002 */ mul.s $f0, $f0, $f20 +/* A2CA88 80242848 00000000 */ nop +/* A2CA8C 8024284C C66C0000 */ lwc1 $f12, ($s3) +/* A2CA90 80242850 0C00A8D4 */ jal cos_deg +/* A2CA94 80242854 E60004F0 */ swc1 $f0, 0x4f0($s0) +/* A2CA98 80242858 46140002 */ mul.s $f0, $f0, $f20 +/* A2CA9C 8024285C 00000000 */ nop +/* A2CAA0 80242860 8EA50000 */ lw $a1, ($s5) +/* A2CAA4 80242864 0000202D */ daddu $a0, $zero, $zero +/* A2CAA8 80242868 0C090355 */ jal func_80240D54_A2AF94 +/* A2CAAC 8024286C E60004F8 */ swc1 $f0, 0x4f8($s0) +/* A2CAB0 80242870 C6800000 */ lwc1 $f0, ($s4) +/* A2CAB4 80242874 C6420000 */ lwc1 $f2, ($s2) +/* A2CAB8 80242878 8E220000 */ lw $v0, ($s1) +/* A2CABC 8024287C 24030001 */ addiu $v1, $zero, 1 +/* A2CAC0 80242880 A6030506 */ sh $v1, 0x506($s0) +/* A2CAC4 80242884 24420001 */ addiu $v0, $v0, 1 +/* A2CAC8 80242888 E60004DC */ swc1 $f0, 0x4dc($s0) +/* A2CACC 8024288C E60204B4 */ swc1 $f2, 0x4b4($s0) +/* A2CAD0 80242890 AE220000 */ sw $v0, ($s1) +/* A2CAD4 80242894 28420079 */ slti $v0, $v0, 0x79 +/* A2CAD8 80242898 8FBF0030 */ lw $ra, 0x30($sp) +/* A2CADC 8024289C 8FB5002C */ lw $s5, 0x2c($sp) +/* A2CAE0 802428A0 8FB40028 */ lw $s4, 0x28($sp) +/* A2CAE4 802428A4 8FB30024 */ lw $s3, 0x24($sp) +/* A2CAE8 802428A8 8FB20020 */ lw $s2, 0x20($sp) +/* A2CAEC 802428AC 8FB1001C */ lw $s1, 0x1c($sp) +/* A2CAF0 802428B0 8FB00018 */ lw $s0, 0x18($sp) +/* A2CAF4 802428B4 D7B60040 */ ldc1 $f22, 0x40($sp) +/* A2CAF8 802428B8 D7B40038 */ ldc1 $f20, 0x38($sp) +/* A2CAFC 802428BC 38420001 */ xori $v0, $v0, 1 +/* A2CB00 802428C0 03E00008 */ jr $ra +/* A2CB04 802428C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8.s deleted file mode 100644 index cf6a269c3e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8.s +++ /dev/null @@ -1,443 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428C8 -/* A2CB08 802428C8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A2CB0C 802428CC AFB30024 */ sw $s3, 0x24($sp) -/* A2CB10 802428D0 0080982D */ daddu $s3, $a0, $zero -/* A2CB14 802428D4 AFBF0034 */ sw $ra, 0x34($sp) -/* A2CB18 802428D8 AFB60030 */ sw $s6, 0x30($sp) -/* A2CB1C 802428DC AFB5002C */ sw $s5, 0x2c($sp) -/* A2CB20 802428E0 AFB40028 */ sw $s4, 0x28($sp) -/* A2CB24 802428E4 AFB20020 */ sw $s2, 0x20($sp) -/* A2CB28 802428E8 AFB1001C */ sw $s1, 0x1c($sp) -/* A2CB2C 802428EC AFB00018 */ sw $s0, 0x18($sp) -/* A2CB30 802428F0 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* A2CB34 802428F4 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* A2CB38 802428F8 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* A2CB3C 802428FC F7B80048 */ sdc1 $f24, 0x48($sp) -/* A2CB40 80242900 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A2CB44 80242904 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A2CB48 80242908 8E70000C */ lw $s0, 0xc($s3) -/* A2CB4C 8024290C 8E050000 */ lw $a1, ($s0) -/* A2CB50 80242910 0C0B1EAF */ jal get_variable -/* A2CB54 80242914 26100004 */ addiu $s0, $s0, 4 -/* A2CB58 80242918 8E050000 */ lw $a1, ($s0) -/* A2CB5C 8024291C 26100004 */ addiu $s0, $s0, 4 -/* A2CB60 80242920 0260202D */ daddu $a0, $s3, $zero -/* A2CB64 80242924 0C0B210B */ jal get_float_variable -/* A2CB68 80242928 0040B02D */ daddu $s6, $v0, $zero -/* A2CB6C 8024292C 8E050000 */ lw $a1, ($s0) -/* A2CB70 80242930 0260202D */ daddu $a0, $s3, $zero -/* A2CB74 80242934 0C0B210B */ jal get_float_variable -/* A2CB78 80242938 E7A00010 */ swc1 $f0, 0x10($sp) -/* A2CB7C 8024293C 0260202D */ daddu $a0, $s3, $zero -/* A2CB80 80242940 3C05F4AC */ lui $a1, 0xf4ac -/* A2CB84 80242944 34A5D480 */ ori $a1, $a1, 0xd480 -/* A2CB88 80242948 0C0B1EAF */ jal get_variable -/* A2CB8C 8024294C 46000706 */ mov.s $f28, $f0 -/* A2CB90 80242950 0040202D */ daddu $a0, $v0, $zero -/* A2CB94 80242954 26C3FFFF */ addiu $v1, $s6, -1 -/* A2CB98 80242958 2C620006 */ sltiu $v0, $v1, 6 -/* A2CB9C 8024295C 104000CE */ beqz $v0, .L80242C98 -/* A2CBA0 80242960 0080882D */ daddu $s1, $a0, $zero -/* A2CBA4 80242964 00031080 */ sll $v0, $v1, 2 -/* A2CBA8 80242968 3C018025 */ lui $at, 0x8025 -/* A2CBAC 8024296C 00220821 */ addu $at, $at, $v0 -/* A2CBB0 80242970 8C22F1F0 */ lw $v0, -0xe10($at) -/* A2CBB4 80242974 00400008 */ jr $v0 -/* A2CBB8 80242978 00000000 */ nop -/* A2CBBC 8024297C 3C108025 */ lui $s0, 0x8025 -/* A2CBC0 80242980 2610F3F8 */ addiu $s0, $s0, -0xc08 -/* A2CBC4 80242984 0200902D */ daddu $s2, $s0, $zero -/* A2CBC8 80242988 2415001E */ addiu $s5, $zero, 0x1e -/* A2CBCC 8024298C 8E22000C */ lw $v0, 0xc($s1) -/* A2CBD0 80242990 8C420014 */ lw $v0, 0x14($v0) -/* A2CBD4 80242994 3C0142B4 */ lui $at, 0x42b4 -/* A2CBD8 80242998 4481F000 */ mtc1 $at, $f30 -/* A2CBDC 8024299C 00551021 */ addu $v0, $v0, $s5 -/* A2CBE0 802429A0 44821000 */ mtc1 $v0, $f2 -/* A2CBE4 802429A4 00000000 */ nop -/* A2CBE8 802429A8 468010A1 */ cvt.d.w $f2, $f2 -/* A2CBEC 802429AC 04410006 */ bgez $v0, .L802429C8 -/* A2CBF0 802429B0 24140003 */ addiu $s4, $zero, 3 -/* A2CBF4 802429B4 3C0141F0 */ lui $at, 0x41f0 -/* A2CBF8 802429B8 44810800 */ mtc1 $at, $f1 -/* A2CBFC 802429BC 44800000 */ mtc1 $zero, $f0 -/* A2CC00 802429C0 00000000 */ nop -/* A2CC04 802429C4 46201080 */ add.d $f2, $f2, $f0 -.L802429C8: -/* A2CC08 802429C8 3C014080 */ lui $at, 0x4080 -/* A2CC0C 802429CC 44810000 */ mtc1 $at, $f0 -/* A2CC10 802429D0 46201520 */ cvt.s.d $f20, $f2 -/* A2CC14 802429D4 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CC18 802429D8 00000000 */ nop -/* A2CC1C 802429DC 3C018025 */ lui $at, 0x8025 -/* A2CC20 802429E0 D420F208 */ ldc1 $f0, -0xdf8($at) -/* A2CC24 802429E4 08090B41 */ j .L80242D04 -/* A2CC28 802429E8 4600A521 */ cvt.d.s $f20, $f20 -/* A2CC2C 802429EC 3C108025 */ lui $s0, 0x8025 -/* A2CC30 802429F0 2610F420 */ addiu $s0, $s0, -0xbe0 -/* A2CC34 802429F4 0200902D */ daddu $s2, $s0, $zero -/* A2CC38 802429F8 2415001E */ addiu $s5, $zero, 0x1e -/* A2CC3C 802429FC 8E22000C */ lw $v0, 0xc($s1) -/* A2CC40 80242A00 8C420014 */ lw $v0, 0x14($v0) -/* A2CC44 80242A04 3C0142B4 */ lui $at, 0x42b4 -/* A2CC48 80242A08 4481F000 */ mtc1 $at, $f30 -/* A2CC4C 80242A0C 00551021 */ addu $v0, $v0, $s5 -/* A2CC50 80242A10 44821000 */ mtc1 $v0, $f2 -/* A2CC54 80242A14 00000000 */ nop -/* A2CC58 80242A18 468010A1 */ cvt.d.w $f2, $f2 -/* A2CC5C 80242A1C 04410006 */ bgez $v0, .L80242A38 -/* A2CC60 80242A20 24140003 */ addiu $s4, $zero, 3 -/* A2CC64 80242A24 3C0141F0 */ lui $at, 0x41f0 -/* A2CC68 80242A28 44810800 */ mtc1 $at, $f1 -/* A2CC6C 80242A2C 44800000 */ mtc1 $zero, $f0 -/* A2CC70 80242A30 00000000 */ nop -/* A2CC74 80242A34 46201080 */ add.d $f2, $f2, $f0 -.L80242A38: -/* A2CC78 80242A38 3C014080 */ lui $at, 0x4080 -/* A2CC7C 80242A3C 44810000 */ mtc1 $at, $f0 -/* A2CC80 80242A40 46201520 */ cvt.s.d $f20, $f2 -/* A2CC84 80242A44 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CC88 80242A48 00000000 */ nop -/* A2CC8C 80242A4C 3C018025 */ lui $at, 0x8025 -/* A2CC90 80242A50 D420F210 */ ldc1 $f0, -0xdf0($at) -/* A2CC94 80242A54 08090B41 */ j .L80242D04 -/* A2CC98 80242A58 4600A521 */ cvt.d.s $f20, $f20 -/* A2CC9C 80242A5C 3C108025 */ lui $s0, 0x8025 -/* A2CCA0 80242A60 2610F448 */ addiu $s0, $s0, -0xbb8 -/* A2CCA4 80242A64 0200902D */ daddu $s2, $s0, $zero -/* A2CCA8 80242A68 2415001E */ addiu $s5, $zero, 0x1e -/* A2CCAC 80242A6C 8E22000C */ lw $v0, 0xc($s1) -/* A2CCB0 80242A70 8C420014 */ lw $v0, 0x14($v0) -/* A2CCB4 80242A74 3C0142B4 */ lui $at, 0x42b4 -/* A2CCB8 80242A78 4481F000 */ mtc1 $at, $f30 -/* A2CCBC 80242A7C 00551021 */ addu $v0, $v0, $s5 -/* A2CCC0 80242A80 44821000 */ mtc1 $v0, $f2 -/* A2CCC4 80242A84 00000000 */ nop -/* A2CCC8 80242A88 468010A1 */ cvt.d.w $f2, $f2 -/* A2CCCC 80242A8C 04410006 */ bgez $v0, .L80242AA8 -/* A2CCD0 80242A90 24140003 */ addiu $s4, $zero, 3 -/* A2CCD4 80242A94 3C0141F0 */ lui $at, 0x41f0 -/* A2CCD8 80242A98 44810800 */ mtc1 $at, $f1 -/* A2CCDC 80242A9C 44800000 */ mtc1 $zero, $f0 -/* A2CCE0 80242AA0 00000000 */ nop -/* A2CCE4 80242AA4 46201080 */ add.d $f2, $f2, $f0 -.L80242AA8: -/* A2CCE8 80242AA8 3C014080 */ lui $at, 0x4080 -/* A2CCEC 80242AAC 44810000 */ mtc1 $at, $f0 -/* A2CCF0 80242AB0 46201520 */ cvt.s.d $f20, $f2 -/* A2CCF4 80242AB4 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CCF8 80242AB8 00000000 */ nop -/* A2CCFC 80242ABC 3C018025 */ lui $at, 0x8025 -/* A2CD00 80242AC0 D420F218 */ ldc1 $f0, -0xde8($at) -/* A2CD04 80242AC4 08090B41 */ j .L80242D04 -/* A2CD08 80242AC8 4600A521 */ cvt.d.s $f20, $f20 -/* A2CD0C 80242ACC 3C108025 */ lui $s0, 0x8025 -/* A2CD10 80242AD0 2610F470 */ addiu $s0, $s0, -0xb90 -/* A2CD14 80242AD4 8E22000C */ lw $v0, 0xc($s1) -/* A2CD18 80242AD8 2415001E */ addiu $s5, $zero, 0x1e -/* A2CD1C 80242ADC 8C420014 */ lw $v0, 0x14($v0) -/* A2CD20 80242AE0 3C0142B4 */ lui $at, 0x42b4 -/* A2CD24 80242AE4 4481F000 */ mtc1 $at, $f30 -/* A2CD28 80242AE8 00551021 */ addu $v0, $v0, $s5 -/* A2CD2C 80242AEC 44821000 */ mtc1 $v0, $f2 -/* A2CD30 80242AF0 00000000 */ nop -/* A2CD34 80242AF4 468010A1 */ cvt.d.w $f2, $f2 -/* A2CD38 80242AF8 04410006 */ bgez $v0, .L80242B14 -/* A2CD3C 80242AFC 0200902D */ daddu $s2, $s0, $zero -/* A2CD40 80242B00 3C0141F0 */ lui $at, 0x41f0 -/* A2CD44 80242B04 44810800 */ mtc1 $at, $f1 -/* A2CD48 80242B08 44800000 */ mtc1 $zero, $f0 -/* A2CD4C 80242B0C 00000000 */ nop -/* A2CD50 80242B10 46201080 */ add.d $f2, $f2, $f0 -.L80242B14: -/* A2CD54 80242B14 3C014080 */ lui $at, 0x4080 -/* A2CD58 80242B18 44810000 */ mtc1 $at, $f0 -/* A2CD5C 80242B1C 46201520 */ cvt.s.d $f20, $f2 -/* A2CD60 80242B20 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CD64 80242B24 00000000 */ nop -/* A2CD68 80242B28 3C018025 */ lui $at, 0x8025 -/* A2CD6C 80242B2C D420F220 */ ldc1 $f0, -0xde0($at) -/* A2CD70 80242B30 4600A521 */ cvt.d.s $f20, $f20 -/* A2CD74 80242B34 4620A500 */ add.d $f20, $f20, $f0 -/* A2CD78 80242B38 4620A520 */ cvt.s.d $f20, $f20 -/* A2CD7C 80242B3C 0C00A8BB */ jal sin_deg -/* A2CD80 80242B40 4600A306 */ mov.s $f12, $f20 -/* A2CD84 80242B44 4600F306 */ mov.s $f12, $f30 -/* A2CD88 80242B48 3C014248 */ lui $at, 0x4248 -/* A2CD8C 80242B4C 4481B000 */ mtc1 $at, $f22 -/* A2CD90 80242B50 0C00A8BB */ jal sin_deg -/* A2CD94 80242B54 46000606 */ mov.s $f24, $f0 -/* A2CD98 80242B58 46160002 */ mul.s $f0, $f0, $f22 -/* A2CD9C 80242B5C 00000000 */ nop -/* A2CDA0 80242B60 46180002 */ mul.s $f0, $f0, $f24 -/* A2CDA4 80242B64 00000000 */ nop -/* A2CDA8 80242B68 8E22000C */ lw $v0, 0xc($s1) -/* A2CDAC 80242B6C C4420004 */ lwc1 $f2, 4($v0) -/* A2CDB0 80242B70 46001680 */ add.s $f26, $f2, $f0 -/* A2CDB4 80242B74 0C00A8D4 */ jal cos_deg -/* A2CDB8 80242B78 4600A306 */ mov.s $f12, $f20 -/* A2CDBC 80242B7C 46160002 */ mul.s $f0, $f0, $f22 -/* A2CDC0 80242B80 00000000 */ nop -/* A2CDC4 80242B84 8E22000C */ lw $v0, 0xc($s1) -/* A2CDC8 80242B88 C4420008 */ lwc1 $f2, 8($v0) -/* A2CDCC 80242B8C 46001500 */ add.s $f20, $f2, $f0 -/* A2CDD0 80242B90 0C00A8BB */ jal sin_deg -/* A2CDD4 80242B94 4600F306 */ mov.s $f12, $f30 -/* A2CDD8 80242B98 46160002 */ mul.s $f0, $f0, $f22 -/* A2CDDC 80242B9C 00000000 */ nop -/* A2CDE0 80242BA0 46180002 */ mul.s $f0, $f0, $f24 -/* A2CDE4 80242BA4 00000000 */ nop -/* A2CDE8 80242BA8 8E22000C */ lw $v0, 0xc($s1) -/* A2CDEC 80242BAC C442000C */ lwc1 $f2, 0xc($v0) -/* A2CDF0 80242BB0 08090B60 */ j .L80242D80 -/* A2CDF4 80242BB4 24140003 */ addiu $s4, $zero, 3 -/* A2CDF8 80242BB8 3C108025 */ lui $s0, 0x8025 -/* A2CDFC 80242BBC 2610F498 */ addiu $s0, $s0, -0xb68 -/* A2CE00 80242BC0 0200902D */ daddu $s2, $s0, $zero -/* A2CE04 80242BC4 2415001E */ addiu $s5, $zero, 0x1e -/* A2CE08 80242BC8 8E22000C */ lw $v0, 0xc($s1) -/* A2CE0C 80242BCC 8C420014 */ lw $v0, 0x14($v0) -/* A2CE10 80242BD0 3C0142B4 */ lui $at, 0x42b4 -/* A2CE14 80242BD4 4481F000 */ mtc1 $at, $f30 -/* A2CE18 80242BD8 00551021 */ addu $v0, $v0, $s5 -/* A2CE1C 80242BDC 44821000 */ mtc1 $v0, $f2 -/* A2CE20 80242BE0 00000000 */ nop -/* A2CE24 80242BE4 468010A1 */ cvt.d.w $f2, $f2 -/* A2CE28 80242BE8 04410006 */ bgez $v0, .L80242C04 -/* A2CE2C 80242BEC 24140003 */ addiu $s4, $zero, 3 -/* A2CE30 80242BF0 3C0141F0 */ lui $at, 0x41f0 -/* A2CE34 80242BF4 44810800 */ mtc1 $at, $f1 -/* A2CE38 80242BF8 44800000 */ mtc1 $zero, $f0 -/* A2CE3C 80242BFC 00000000 */ nop -/* A2CE40 80242C00 46201080 */ add.d $f2, $f2, $f0 -.L80242C04: -/* A2CE44 80242C04 3C014080 */ lui $at, 0x4080 -/* A2CE48 80242C08 44810000 */ mtc1 $at, $f0 -/* A2CE4C 80242C0C 46201520 */ cvt.s.d $f20, $f2 -/* A2CE50 80242C10 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CE54 80242C14 00000000 */ nop -/* A2CE58 80242C18 3C018025 */ lui $at, 0x8025 -/* A2CE5C 80242C1C D420F228 */ ldc1 $f0, -0xdd8($at) -/* A2CE60 80242C20 08090B41 */ j .L80242D04 -/* A2CE64 80242C24 4600A521 */ cvt.d.s $f20, $f20 -/* A2CE68 80242C28 3C108025 */ lui $s0, 0x8025 -/* A2CE6C 80242C2C 2610F4C0 */ addiu $s0, $s0, -0xb40 -/* A2CE70 80242C30 0200902D */ daddu $s2, $s0, $zero -/* A2CE74 80242C34 2415001E */ addiu $s5, $zero, 0x1e -/* A2CE78 80242C38 8E22000C */ lw $v0, 0xc($s1) -/* A2CE7C 80242C3C 8C420014 */ lw $v0, 0x14($v0) -/* A2CE80 80242C40 3C0142B4 */ lui $at, 0x42b4 -/* A2CE84 80242C44 4481F000 */ mtc1 $at, $f30 -/* A2CE88 80242C48 00551021 */ addu $v0, $v0, $s5 -/* A2CE8C 80242C4C 44821000 */ mtc1 $v0, $f2 -/* A2CE90 80242C50 00000000 */ nop -/* A2CE94 80242C54 468010A1 */ cvt.d.w $f2, $f2 -/* A2CE98 80242C58 04410006 */ bgez $v0, .L80242C74 -/* A2CE9C 80242C5C 24140003 */ addiu $s4, $zero, 3 -/* A2CEA0 80242C60 3C0141F0 */ lui $at, 0x41f0 -/* A2CEA4 80242C64 44810800 */ mtc1 $at, $f1 -/* A2CEA8 80242C68 44800000 */ mtc1 $zero, $f0 -/* A2CEAC 80242C6C 00000000 */ nop -/* A2CEB0 80242C70 46201080 */ add.d $f2, $f2, $f0 -.L80242C74: -/* A2CEB4 80242C74 3C014080 */ lui $at, 0x4080 -/* A2CEB8 80242C78 44810000 */ mtc1 $at, $f0 -/* A2CEBC 80242C7C 46201520 */ cvt.s.d $f20, $f2 -/* A2CEC0 80242C80 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CEC4 80242C84 00000000 */ nop -/* A2CEC8 80242C88 3C018025 */ lui $at, 0x8025 -/* A2CECC 80242C8C D420F230 */ ldc1 $f0, -0xdd0($at) -/* A2CED0 80242C90 08090B41 */ j .L80242D04 -/* A2CED4 80242C94 4600A521 */ cvt.d.s $f20, $f20 -.L80242C98: -/* A2CED8 80242C98 3C108025 */ lui $s0, 0x8025 -/* A2CEDC 80242C9C 2610F4E8 */ addiu $s0, $s0, -0xb18 -/* A2CEE0 80242CA0 0200902D */ daddu $s2, $s0, $zero -/* A2CEE4 80242CA4 2415001E */ addiu $s5, $zero, 0x1e -/* A2CEE8 80242CA8 8C82000C */ lw $v0, 0xc($a0) -/* A2CEEC 80242CAC 8C420014 */ lw $v0, 0x14($v0) -/* A2CEF0 80242CB0 3C0142B4 */ lui $at, 0x42b4 -/* A2CEF4 80242CB4 4481F000 */ mtc1 $at, $f30 -/* A2CEF8 80242CB8 00551021 */ addu $v0, $v0, $s5 -/* A2CEFC 80242CBC 44821000 */ mtc1 $v0, $f2 -/* A2CF00 80242CC0 00000000 */ nop -/* A2CF04 80242CC4 468010A1 */ cvt.d.w $f2, $f2 -/* A2CF08 80242CC8 04410006 */ bgez $v0, .L80242CE4 -/* A2CF0C 80242CCC 24140003 */ addiu $s4, $zero, 3 -/* A2CF10 80242CD0 3C0141F0 */ lui $at, 0x41f0 -/* A2CF14 80242CD4 44810800 */ mtc1 $at, $f1 -/* A2CF18 80242CD8 44800000 */ mtc1 $zero, $f0 -/* A2CF1C 80242CDC 00000000 */ nop -/* A2CF20 80242CE0 46201080 */ add.d $f2, $f2, $f0 -.L80242CE4: -/* A2CF24 80242CE4 3C014080 */ lui $at, 0x4080 -/* A2CF28 80242CE8 44810000 */ mtc1 $at, $f0 -/* A2CF2C 80242CEC 46201520 */ cvt.s.d $f20, $f2 -/* A2CF30 80242CF0 4600A502 */ mul.s $f20, $f20, $f0 -/* A2CF34 80242CF4 00000000 */ nop -/* A2CF38 80242CF8 3C018025 */ lui $at, 0x8025 -/* A2CF3C 80242CFC D420F238 */ ldc1 $f0, -0xdc8($at) -/* A2CF40 80242D00 4600A521 */ cvt.d.s $f20, $f20 -.L80242D04: -/* A2CF44 80242D04 4620A500 */ add.d $f20, $f20, $f0 -/* A2CF48 80242D08 4620A520 */ cvt.s.d $f20, $f20 -/* A2CF4C 80242D0C 0C00A8BB */ jal sin_deg -/* A2CF50 80242D10 4600A306 */ mov.s $f12, $f20 -/* A2CF54 80242D14 4600F306 */ mov.s $f12, $f30 -/* A2CF58 80242D18 3C014248 */ lui $at, 0x4248 -/* A2CF5C 80242D1C 4481B000 */ mtc1 $at, $f22 -/* A2CF60 80242D20 0C00A8BB */ jal sin_deg -/* A2CF64 80242D24 46000606 */ mov.s $f24, $f0 -/* A2CF68 80242D28 46160002 */ mul.s $f0, $f0, $f22 -/* A2CF6C 80242D2C 00000000 */ nop -/* A2CF70 80242D30 46180002 */ mul.s $f0, $f0, $f24 -/* A2CF74 80242D34 00000000 */ nop -/* A2CF78 80242D38 8E22000C */ lw $v0, 0xc($s1) -/* A2CF7C 80242D3C C4420004 */ lwc1 $f2, 4($v0) -/* A2CF80 80242D40 46001680 */ add.s $f26, $f2, $f0 -/* A2CF84 80242D44 0C00A8D4 */ jal cos_deg -/* A2CF88 80242D48 4600A306 */ mov.s $f12, $f20 -/* A2CF8C 80242D4C 46160002 */ mul.s $f0, $f0, $f22 -/* A2CF90 80242D50 00000000 */ nop -/* A2CF94 80242D54 8E22000C */ lw $v0, 0xc($s1) -/* A2CF98 80242D58 C4420008 */ lwc1 $f2, 8($v0) -/* A2CF9C 80242D5C 46001500 */ add.s $f20, $f2, $f0 -/* A2CFA0 80242D60 0C00A8BB */ jal sin_deg -/* A2CFA4 80242D64 4600F306 */ mov.s $f12, $f30 -/* A2CFA8 80242D68 46160002 */ mul.s $f0, $f0, $f22 -/* A2CFAC 80242D6C 00000000 */ nop -/* A2CFB0 80242D70 46180002 */ mul.s $f0, $f0, $f24 -/* A2CFB4 80242D74 00000000 */ nop -/* A2CFB8 80242D78 8E22000C */ lw $v0, 0xc($s1) -/* A2CFBC 80242D7C C442000C */ lwc1 $f2, 0xc($v0) -.L80242D80: -/* A2CFC0 80242D80 46001080 */ add.s $f2, $f2, $f0 -/* A2CFC4 80242D84 E61A0018 */ swc1 $f26, 0x18($s0) -/* A2CFC8 80242D88 E614001C */ swc1 $f20, 0x1c($s0) -/* A2CFCC 80242D8C E6020020 */ swc1 $f2, 0x20($s0) -/* A2CFD0 80242D90 0260202D */ daddu $a0, $s3, $zero -/* A2CFD4 80242D94 3C05FE36 */ lui $a1, 0xfe36 -/* A2CFD8 80242D98 0C0B210B */ jal get_float_variable -/* A2CFDC 80242D9C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A2CFE0 80242DA0 0260202D */ daddu $a0, $s3, $zero -/* A2CFE4 80242DA4 3C05FE36 */ lui $a1, 0xfe36 -/* A2CFE8 80242DA8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A2CFEC 80242DAC 0C0B210B */ jal get_float_variable -/* A2CFF0 80242DB0 E6400000 */ swc1 $f0, ($s2) -/* A2CFF4 80242DB4 0260202D */ daddu $a0, $s3, $zero -/* A2CFF8 80242DB8 3C05FE36 */ lui $a1, 0xfe36 -/* A2CFFC 80242DBC 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A2D000 80242DC0 0C0B210B */ jal get_float_variable -/* A2D004 80242DC4 E6400004 */ swc1 $f0, 4($s2) -/* A2D008 80242DC8 26510018 */ addiu $s1, $s2, 0x18 -/* A2D00C 80242DCC E6400008 */ swc1 $f0, 8($s2) -/* A2D010 80242DD0 24020002 */ addiu $v0, $zero, 2 -/* A2D014 80242DD4 12C20028 */ beq $s6, $v0, .L80242E78 -/* A2D018 80242DD8 2652000C */ addiu $s2, $s2, 0xc -/* A2D01C 80242DDC 0260202D */ daddu $a0, $s3, $zero -/* A2D020 80242DE0 3C05FE36 */ lui $a1, 0xfe36 -/* A2D024 80242DE4 0C0B210B */ jal get_float_variable -/* A2D028 80242DE8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A2D02C 80242DEC 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D030 80242DF0 00000000 */ nop -/* A2D034 80242DF4 3C013F80 */ lui $at, 0x3f80 -/* A2D038 80242DF8 4481A000 */ mtc1 $at, $f20 -/* A2D03C 80242DFC 00000000 */ nop -/* A2D040 80242E00 461CA501 */ sub.s $f20, $f20, $f28 -/* A2D044 80242E04 C6220000 */ lwc1 $f2, ($s1) -/* A2D048 80242E08 46141082 */ mul.s $f2, $f2, $f20 -/* A2D04C 80242E0C 00000000 */ nop -/* A2D050 80242E10 0260202D */ daddu $a0, $s3, $zero -/* A2D054 80242E14 46020000 */ add.s $f0, $f0, $f2 -/* A2D058 80242E18 3C05FE36 */ lui $a1, 0xfe36 -/* A2D05C 80242E1C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A2D060 80242E20 0C0B210B */ jal get_float_variable -/* A2D064 80242E24 E6400000 */ swc1 $f0, ($s2) -/* A2D068 80242E28 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D06C 80242E2C 00000000 */ nop -/* A2D070 80242E30 C6220004 */ lwc1 $f2, 4($s1) -/* A2D074 80242E34 46141082 */ mul.s $f2, $f2, $f20 -/* A2D078 80242E38 00000000 */ nop -/* A2D07C 80242E3C 46020000 */ add.s $f0, $f0, $f2 -/* A2D080 80242E40 C7A40010 */ lwc1 $f4, 0x10($sp) -/* A2D084 80242E44 0260202D */ daddu $a0, $s3, $zero -/* A2D088 80242E48 46040000 */ add.s $f0, $f0, $f4 -/* A2D08C 80242E4C 3C05FE36 */ lui $a1, 0xfe36 -/* A2D090 80242E50 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A2D094 80242E54 0C0B210B */ jal get_float_variable -/* A2D098 80242E58 E6400004 */ swc1 $f0, 4($s2) -/* A2D09C 80242E5C 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D0A0 80242E60 00000000 */ nop -/* A2D0A4 80242E64 C6220008 */ lwc1 $f2, 8($s1) -/* A2D0A8 80242E68 46141082 */ mul.s $f2, $f2, $f20 -/* A2D0AC 80242E6C 00000000 */ nop -/* A2D0B0 80242E70 08090BC8 */ j .L80242F20 -/* A2D0B4 80242E74 46020000 */ add.s $f0, $f0, $f2 -.L80242E78: -/* A2D0B8 80242E78 0260202D */ daddu $a0, $s3, $zero -/* A2D0BC 80242E7C 3C05FE36 */ lui $a1, 0xfe36 -/* A2D0C0 80242E80 0C0B210B */ jal get_float_variable -/* A2D0C4 80242E84 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A2D0C8 80242E88 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D0CC 80242E8C 00000000 */ nop -/* A2D0D0 80242E90 3C013F80 */ lui $at, 0x3f80 -/* A2D0D4 80242E94 4481A000 */ mtc1 $at, $f20 -/* A2D0D8 80242E98 00000000 */ nop -/* A2D0DC 80242E9C 461CA501 */ sub.s $f20, $f20, $f28 -/* A2D0E0 80242EA0 C6220000 */ lwc1 $f2, ($s1) -/* A2D0E4 80242EA4 46141082 */ mul.s $f2, $f2, $f20 -/* A2D0E8 80242EA8 00000000 */ nop -/* A2D0EC 80242EAC 46020000 */ add.s $f0, $f0, $f2 -/* A2D0F0 80242EB0 3C014248 */ lui $at, 0x4248 -/* A2D0F4 80242EB4 4481B000 */ mtc1 $at, $f22 -/* A2D0F8 80242EB8 0260202D */ daddu $a0, $s3, $zero -/* A2D0FC 80242EBC 46160001 */ sub.s $f0, $f0, $f22 -/* A2D100 80242EC0 3C05FE36 */ lui $a1, 0xfe36 -/* A2D104 80242EC4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A2D108 80242EC8 0C0B210B */ jal get_float_variable -/* A2D10C 80242ECC E6400000 */ swc1 $f0, ($s2) -/* A2D110 80242ED0 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D114 80242ED4 00000000 */ nop -/* A2D118 80242ED8 C6220004 */ lwc1 $f2, 4($s1) -/* A2D11C 80242EDC 46141082 */ mul.s $f2, $f2, $f20 -/* A2D120 80242EE0 00000000 */ nop -/* A2D124 80242EE4 46020000 */ add.s $f0, $f0, $f2 -/* A2D128 80242EE8 C7A40010 */ lwc1 $f4, 0x10($sp) -/* A2D12C 80242EEC 0260202D */ daddu $a0, $s3, $zero -/* A2D130 80242EF0 46040000 */ add.s $f0, $f0, $f4 -/* A2D134 80242EF4 3C05FE36 */ lui $a1, 0xfe36 -/* A2D138 80242EF8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* A2D13C 80242EFC 0C0B210B */ jal get_float_variable -/* A2D140 80242F00 E6400004 */ swc1 $f0, 4($s2) -/* A2D144 80242F04 461C0002 */ mul.s $f0, $f0, $f28 -/* A2D148 80242F08 00000000 */ nop -/* A2D14C 80242F0C C6220008 */ lwc1 $f2, 8($s1) -/* A2D150 80242F10 46141082 */ mul.s $f2, $f2, $f20 -/* A2D154 80242F14 00000000 */ nop -/* A2D158 80242F18 46020000 */ add.s $f0, $f0, $f2 -/* A2D15C 80242F1C 46160001 */ sub.s $f0, $f0, $f22 -.L80242F20: -/* A2D160 80242F20 E6400008 */ swc1 $f0, 8($s2) -/* A2D164 80242F24 AE750084 */ sw $s5, 0x84($s3) -/* A2D168 80242F28 AE700088 */ sw $s0, 0x88($s3) -/* A2D16C 80242F2C AE74008C */ sw $s4, 0x8c($s3) -/* A2D170 80242F30 8FBF0034 */ lw $ra, 0x34($sp) -/* A2D174 80242F34 8FB60030 */ lw $s6, 0x30($sp) -/* A2D178 80242F38 8FB5002C */ lw $s5, 0x2c($sp) -/* A2D17C 80242F3C 8FB40028 */ lw $s4, 0x28($sp) -/* A2D180 80242F40 8FB30024 */ lw $s3, 0x24($sp) -/* A2D184 80242F44 8FB20020 */ lw $s2, 0x20($sp) -/* A2D188 80242F48 8FB1001C */ lw $s1, 0x1c($sp) -/* A2D18C 80242F4C 8FB00018 */ lw $s0, 0x18($sp) -/* A2D190 80242F50 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* A2D194 80242F54 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* A2D198 80242F58 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* A2D19C 80242F5C D7B80048 */ ldc1 $f24, 0x48($sp) -/* A2D1A0 80242F60 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A2D1A4 80242F64 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A2D1A8 80242F68 24020002 */ addiu $v0, $zero, 2 -/* A2D1AC 80242F6C 03E00008 */ jr $ra -/* A2D1B0 80242F70 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s new file mode 100644 index 0000000000..403bf01852 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802428C8_A2CB08.s @@ -0,0 +1,443 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428C8_A2CB08 +/* A2CB08 802428C8 27BDFF98 */ addiu $sp, $sp, -0x68 +/* A2CB0C 802428CC AFB30024 */ sw $s3, 0x24($sp) +/* A2CB10 802428D0 0080982D */ daddu $s3, $a0, $zero +/* A2CB14 802428D4 AFBF0034 */ sw $ra, 0x34($sp) +/* A2CB18 802428D8 AFB60030 */ sw $s6, 0x30($sp) +/* A2CB1C 802428DC AFB5002C */ sw $s5, 0x2c($sp) +/* A2CB20 802428E0 AFB40028 */ sw $s4, 0x28($sp) +/* A2CB24 802428E4 AFB20020 */ sw $s2, 0x20($sp) +/* A2CB28 802428E8 AFB1001C */ sw $s1, 0x1c($sp) +/* A2CB2C 802428EC AFB00018 */ sw $s0, 0x18($sp) +/* A2CB30 802428F0 F7BE0060 */ sdc1 $f30, 0x60($sp) +/* A2CB34 802428F4 F7BC0058 */ sdc1 $f28, 0x58($sp) +/* A2CB38 802428F8 F7BA0050 */ sdc1 $f26, 0x50($sp) +/* A2CB3C 802428FC F7B80048 */ sdc1 $f24, 0x48($sp) +/* A2CB40 80242900 F7B60040 */ sdc1 $f22, 0x40($sp) +/* A2CB44 80242904 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A2CB48 80242908 8E70000C */ lw $s0, 0xc($s3) +/* A2CB4C 8024290C 8E050000 */ lw $a1, ($s0) +/* A2CB50 80242910 0C0B1EAF */ jal get_variable +/* A2CB54 80242914 26100004 */ addiu $s0, $s0, 4 +/* A2CB58 80242918 8E050000 */ lw $a1, ($s0) +/* A2CB5C 8024291C 26100004 */ addiu $s0, $s0, 4 +/* A2CB60 80242920 0260202D */ daddu $a0, $s3, $zero +/* A2CB64 80242924 0C0B210B */ jal get_float_variable +/* A2CB68 80242928 0040B02D */ daddu $s6, $v0, $zero +/* A2CB6C 8024292C 8E050000 */ lw $a1, ($s0) +/* A2CB70 80242930 0260202D */ daddu $a0, $s3, $zero +/* A2CB74 80242934 0C0B210B */ jal get_float_variable +/* A2CB78 80242938 E7A00010 */ swc1 $f0, 0x10($sp) +/* A2CB7C 8024293C 0260202D */ daddu $a0, $s3, $zero +/* A2CB80 80242940 3C05F4AC */ lui $a1, 0xf4ac +/* A2CB84 80242944 34A5D480 */ ori $a1, $a1, 0xd480 +/* A2CB88 80242948 0C0B1EAF */ jal get_variable +/* A2CB8C 8024294C 46000706 */ mov.s $f28, $f0 +/* A2CB90 80242950 0040202D */ daddu $a0, $v0, $zero +/* A2CB94 80242954 26C3FFFF */ addiu $v1, $s6, -1 +/* A2CB98 80242958 2C620006 */ sltiu $v0, $v1, 6 +/* A2CB9C 8024295C 104000CE */ beqz $v0, .L80242C98 +/* A2CBA0 80242960 0080882D */ daddu $s1, $a0, $zero +/* A2CBA4 80242964 00031080 */ sll $v0, $v1, 2 +/* A2CBA8 80242968 3C018025 */ lui $at, 0x8025 +/* A2CBAC 8024296C 00220821 */ addu $at, $at, $v0 +/* A2CBB0 80242970 8C22F1F0 */ lw $v0, -0xe10($at) +/* A2CBB4 80242974 00400008 */ jr $v0 +/* A2CBB8 80242978 00000000 */ nop +/* A2CBBC 8024297C 3C108025 */ lui $s0, 0x8025 +/* A2CBC0 80242980 2610F3F8 */ addiu $s0, $s0, -0xc08 +/* A2CBC4 80242984 0200902D */ daddu $s2, $s0, $zero +/* A2CBC8 80242988 2415001E */ addiu $s5, $zero, 0x1e +/* A2CBCC 8024298C 8E22000C */ lw $v0, 0xc($s1) +/* A2CBD0 80242990 8C420014 */ lw $v0, 0x14($v0) +/* A2CBD4 80242994 3C0142B4 */ lui $at, 0x42b4 +/* A2CBD8 80242998 4481F000 */ mtc1 $at, $f30 +/* A2CBDC 8024299C 00551021 */ addu $v0, $v0, $s5 +/* A2CBE0 802429A0 44821000 */ mtc1 $v0, $f2 +/* A2CBE4 802429A4 00000000 */ nop +/* A2CBE8 802429A8 468010A1 */ cvt.d.w $f2, $f2 +/* A2CBEC 802429AC 04410006 */ bgez $v0, .L802429C8 +/* A2CBF0 802429B0 24140003 */ addiu $s4, $zero, 3 +/* A2CBF4 802429B4 3C0141F0 */ lui $at, 0x41f0 +/* A2CBF8 802429B8 44810800 */ mtc1 $at, $f1 +/* A2CBFC 802429BC 44800000 */ mtc1 $zero, $f0 +/* A2CC00 802429C0 00000000 */ nop +/* A2CC04 802429C4 46201080 */ add.d $f2, $f2, $f0 +.L802429C8: +/* A2CC08 802429C8 3C014080 */ lui $at, 0x4080 +/* A2CC0C 802429CC 44810000 */ mtc1 $at, $f0 +/* A2CC10 802429D0 46201520 */ cvt.s.d $f20, $f2 +/* A2CC14 802429D4 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CC18 802429D8 00000000 */ nop +/* A2CC1C 802429DC 3C018025 */ lui $at, 0x8025 +/* A2CC20 802429E0 D420F208 */ ldc1 $f0, -0xdf8($at) +/* A2CC24 802429E4 08090B41 */ j .L80242D04 +/* A2CC28 802429E8 4600A521 */ cvt.d.s $f20, $f20 +/* A2CC2C 802429EC 3C108025 */ lui $s0, 0x8025 +/* A2CC30 802429F0 2610F420 */ addiu $s0, $s0, -0xbe0 +/* A2CC34 802429F4 0200902D */ daddu $s2, $s0, $zero +/* A2CC38 802429F8 2415001E */ addiu $s5, $zero, 0x1e +/* A2CC3C 802429FC 8E22000C */ lw $v0, 0xc($s1) +/* A2CC40 80242A00 8C420014 */ lw $v0, 0x14($v0) +/* A2CC44 80242A04 3C0142B4 */ lui $at, 0x42b4 +/* A2CC48 80242A08 4481F000 */ mtc1 $at, $f30 +/* A2CC4C 80242A0C 00551021 */ addu $v0, $v0, $s5 +/* A2CC50 80242A10 44821000 */ mtc1 $v0, $f2 +/* A2CC54 80242A14 00000000 */ nop +/* A2CC58 80242A18 468010A1 */ cvt.d.w $f2, $f2 +/* A2CC5C 80242A1C 04410006 */ bgez $v0, .L80242A38 +/* A2CC60 80242A20 24140003 */ addiu $s4, $zero, 3 +/* A2CC64 80242A24 3C0141F0 */ lui $at, 0x41f0 +/* A2CC68 80242A28 44810800 */ mtc1 $at, $f1 +/* A2CC6C 80242A2C 44800000 */ mtc1 $zero, $f0 +/* A2CC70 80242A30 00000000 */ nop +/* A2CC74 80242A34 46201080 */ add.d $f2, $f2, $f0 +.L80242A38: +/* A2CC78 80242A38 3C014080 */ lui $at, 0x4080 +/* A2CC7C 80242A3C 44810000 */ mtc1 $at, $f0 +/* A2CC80 80242A40 46201520 */ cvt.s.d $f20, $f2 +/* A2CC84 80242A44 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CC88 80242A48 00000000 */ nop +/* A2CC8C 80242A4C 3C018025 */ lui $at, 0x8025 +/* A2CC90 80242A50 D420F210 */ ldc1 $f0, -0xdf0($at) +/* A2CC94 80242A54 08090B41 */ j .L80242D04 +/* A2CC98 80242A58 4600A521 */ cvt.d.s $f20, $f20 +/* A2CC9C 80242A5C 3C108025 */ lui $s0, 0x8025 +/* A2CCA0 80242A60 2610F448 */ addiu $s0, $s0, -0xbb8 +/* A2CCA4 80242A64 0200902D */ daddu $s2, $s0, $zero +/* A2CCA8 80242A68 2415001E */ addiu $s5, $zero, 0x1e +/* A2CCAC 80242A6C 8E22000C */ lw $v0, 0xc($s1) +/* A2CCB0 80242A70 8C420014 */ lw $v0, 0x14($v0) +/* A2CCB4 80242A74 3C0142B4 */ lui $at, 0x42b4 +/* A2CCB8 80242A78 4481F000 */ mtc1 $at, $f30 +/* A2CCBC 80242A7C 00551021 */ addu $v0, $v0, $s5 +/* A2CCC0 80242A80 44821000 */ mtc1 $v0, $f2 +/* A2CCC4 80242A84 00000000 */ nop +/* A2CCC8 80242A88 468010A1 */ cvt.d.w $f2, $f2 +/* A2CCCC 80242A8C 04410006 */ bgez $v0, .L80242AA8 +/* A2CCD0 80242A90 24140003 */ addiu $s4, $zero, 3 +/* A2CCD4 80242A94 3C0141F0 */ lui $at, 0x41f0 +/* A2CCD8 80242A98 44810800 */ mtc1 $at, $f1 +/* A2CCDC 80242A9C 44800000 */ mtc1 $zero, $f0 +/* A2CCE0 80242AA0 00000000 */ nop +/* A2CCE4 80242AA4 46201080 */ add.d $f2, $f2, $f0 +.L80242AA8: +/* A2CCE8 80242AA8 3C014080 */ lui $at, 0x4080 +/* A2CCEC 80242AAC 44810000 */ mtc1 $at, $f0 +/* A2CCF0 80242AB0 46201520 */ cvt.s.d $f20, $f2 +/* A2CCF4 80242AB4 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CCF8 80242AB8 00000000 */ nop +/* A2CCFC 80242ABC 3C018025 */ lui $at, 0x8025 +/* A2CD00 80242AC0 D420F218 */ ldc1 $f0, -0xde8($at) +/* A2CD04 80242AC4 08090B41 */ j .L80242D04 +/* A2CD08 80242AC8 4600A521 */ cvt.d.s $f20, $f20 +/* A2CD0C 80242ACC 3C108025 */ lui $s0, 0x8025 +/* A2CD10 80242AD0 2610F470 */ addiu $s0, $s0, -0xb90 +/* A2CD14 80242AD4 8E22000C */ lw $v0, 0xc($s1) +/* A2CD18 80242AD8 2415001E */ addiu $s5, $zero, 0x1e +/* A2CD1C 80242ADC 8C420014 */ lw $v0, 0x14($v0) +/* A2CD20 80242AE0 3C0142B4 */ lui $at, 0x42b4 +/* A2CD24 80242AE4 4481F000 */ mtc1 $at, $f30 +/* A2CD28 80242AE8 00551021 */ addu $v0, $v0, $s5 +/* A2CD2C 80242AEC 44821000 */ mtc1 $v0, $f2 +/* A2CD30 80242AF0 00000000 */ nop +/* A2CD34 80242AF4 468010A1 */ cvt.d.w $f2, $f2 +/* A2CD38 80242AF8 04410006 */ bgez $v0, .L80242B14 +/* A2CD3C 80242AFC 0200902D */ daddu $s2, $s0, $zero +/* A2CD40 80242B00 3C0141F0 */ lui $at, 0x41f0 +/* A2CD44 80242B04 44810800 */ mtc1 $at, $f1 +/* A2CD48 80242B08 44800000 */ mtc1 $zero, $f0 +/* A2CD4C 80242B0C 00000000 */ nop +/* A2CD50 80242B10 46201080 */ add.d $f2, $f2, $f0 +.L80242B14: +/* A2CD54 80242B14 3C014080 */ lui $at, 0x4080 +/* A2CD58 80242B18 44810000 */ mtc1 $at, $f0 +/* A2CD5C 80242B1C 46201520 */ cvt.s.d $f20, $f2 +/* A2CD60 80242B20 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CD64 80242B24 00000000 */ nop +/* A2CD68 80242B28 3C018025 */ lui $at, 0x8025 +/* A2CD6C 80242B2C D420F220 */ ldc1 $f0, -0xde0($at) +/* A2CD70 80242B30 4600A521 */ cvt.d.s $f20, $f20 +/* A2CD74 80242B34 4620A500 */ add.d $f20, $f20, $f0 +/* A2CD78 80242B38 4620A520 */ cvt.s.d $f20, $f20 +/* A2CD7C 80242B3C 0C00A8BB */ jal sin_deg +/* A2CD80 80242B40 4600A306 */ mov.s $f12, $f20 +/* A2CD84 80242B44 4600F306 */ mov.s $f12, $f30 +/* A2CD88 80242B48 3C014248 */ lui $at, 0x4248 +/* A2CD8C 80242B4C 4481B000 */ mtc1 $at, $f22 +/* A2CD90 80242B50 0C00A8BB */ jal sin_deg +/* A2CD94 80242B54 46000606 */ mov.s $f24, $f0 +/* A2CD98 80242B58 46160002 */ mul.s $f0, $f0, $f22 +/* A2CD9C 80242B5C 00000000 */ nop +/* A2CDA0 80242B60 46180002 */ mul.s $f0, $f0, $f24 +/* A2CDA4 80242B64 00000000 */ nop +/* A2CDA8 80242B68 8E22000C */ lw $v0, 0xc($s1) +/* A2CDAC 80242B6C C4420004 */ lwc1 $f2, 4($v0) +/* A2CDB0 80242B70 46001680 */ add.s $f26, $f2, $f0 +/* A2CDB4 80242B74 0C00A8D4 */ jal cos_deg +/* A2CDB8 80242B78 4600A306 */ mov.s $f12, $f20 +/* A2CDBC 80242B7C 46160002 */ mul.s $f0, $f0, $f22 +/* A2CDC0 80242B80 00000000 */ nop +/* A2CDC4 80242B84 8E22000C */ lw $v0, 0xc($s1) +/* A2CDC8 80242B88 C4420008 */ lwc1 $f2, 8($v0) +/* A2CDCC 80242B8C 46001500 */ add.s $f20, $f2, $f0 +/* A2CDD0 80242B90 0C00A8BB */ jal sin_deg +/* A2CDD4 80242B94 4600F306 */ mov.s $f12, $f30 +/* A2CDD8 80242B98 46160002 */ mul.s $f0, $f0, $f22 +/* A2CDDC 80242B9C 00000000 */ nop +/* A2CDE0 80242BA0 46180002 */ mul.s $f0, $f0, $f24 +/* A2CDE4 80242BA4 00000000 */ nop +/* A2CDE8 80242BA8 8E22000C */ lw $v0, 0xc($s1) +/* A2CDEC 80242BAC C442000C */ lwc1 $f2, 0xc($v0) +/* A2CDF0 80242BB0 08090B60 */ j .L80242D80 +/* A2CDF4 80242BB4 24140003 */ addiu $s4, $zero, 3 +/* A2CDF8 80242BB8 3C108025 */ lui $s0, 0x8025 +/* A2CDFC 80242BBC 2610F498 */ addiu $s0, $s0, -0xb68 +/* A2CE00 80242BC0 0200902D */ daddu $s2, $s0, $zero +/* A2CE04 80242BC4 2415001E */ addiu $s5, $zero, 0x1e +/* A2CE08 80242BC8 8E22000C */ lw $v0, 0xc($s1) +/* A2CE0C 80242BCC 8C420014 */ lw $v0, 0x14($v0) +/* A2CE10 80242BD0 3C0142B4 */ lui $at, 0x42b4 +/* A2CE14 80242BD4 4481F000 */ mtc1 $at, $f30 +/* A2CE18 80242BD8 00551021 */ addu $v0, $v0, $s5 +/* A2CE1C 80242BDC 44821000 */ mtc1 $v0, $f2 +/* A2CE20 80242BE0 00000000 */ nop +/* A2CE24 80242BE4 468010A1 */ cvt.d.w $f2, $f2 +/* A2CE28 80242BE8 04410006 */ bgez $v0, .L80242C04 +/* A2CE2C 80242BEC 24140003 */ addiu $s4, $zero, 3 +/* A2CE30 80242BF0 3C0141F0 */ lui $at, 0x41f0 +/* A2CE34 80242BF4 44810800 */ mtc1 $at, $f1 +/* A2CE38 80242BF8 44800000 */ mtc1 $zero, $f0 +/* A2CE3C 80242BFC 00000000 */ nop +/* A2CE40 80242C00 46201080 */ add.d $f2, $f2, $f0 +.L80242C04: +/* A2CE44 80242C04 3C014080 */ lui $at, 0x4080 +/* A2CE48 80242C08 44810000 */ mtc1 $at, $f0 +/* A2CE4C 80242C0C 46201520 */ cvt.s.d $f20, $f2 +/* A2CE50 80242C10 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CE54 80242C14 00000000 */ nop +/* A2CE58 80242C18 3C018025 */ lui $at, 0x8025 +/* A2CE5C 80242C1C D420F228 */ ldc1 $f0, -0xdd8($at) +/* A2CE60 80242C20 08090B41 */ j .L80242D04 +/* A2CE64 80242C24 4600A521 */ cvt.d.s $f20, $f20 +/* A2CE68 80242C28 3C108025 */ lui $s0, 0x8025 +/* A2CE6C 80242C2C 2610F4C0 */ addiu $s0, $s0, -0xb40 +/* A2CE70 80242C30 0200902D */ daddu $s2, $s0, $zero +/* A2CE74 80242C34 2415001E */ addiu $s5, $zero, 0x1e +/* A2CE78 80242C38 8E22000C */ lw $v0, 0xc($s1) +/* A2CE7C 80242C3C 8C420014 */ lw $v0, 0x14($v0) +/* A2CE80 80242C40 3C0142B4 */ lui $at, 0x42b4 +/* A2CE84 80242C44 4481F000 */ mtc1 $at, $f30 +/* A2CE88 80242C48 00551021 */ addu $v0, $v0, $s5 +/* A2CE8C 80242C4C 44821000 */ mtc1 $v0, $f2 +/* A2CE90 80242C50 00000000 */ nop +/* A2CE94 80242C54 468010A1 */ cvt.d.w $f2, $f2 +/* A2CE98 80242C58 04410006 */ bgez $v0, .L80242C74 +/* A2CE9C 80242C5C 24140003 */ addiu $s4, $zero, 3 +/* A2CEA0 80242C60 3C0141F0 */ lui $at, 0x41f0 +/* A2CEA4 80242C64 44810800 */ mtc1 $at, $f1 +/* A2CEA8 80242C68 44800000 */ mtc1 $zero, $f0 +/* A2CEAC 80242C6C 00000000 */ nop +/* A2CEB0 80242C70 46201080 */ add.d $f2, $f2, $f0 +.L80242C74: +/* A2CEB4 80242C74 3C014080 */ lui $at, 0x4080 +/* A2CEB8 80242C78 44810000 */ mtc1 $at, $f0 +/* A2CEBC 80242C7C 46201520 */ cvt.s.d $f20, $f2 +/* A2CEC0 80242C80 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CEC4 80242C84 00000000 */ nop +/* A2CEC8 80242C88 3C018025 */ lui $at, 0x8025 +/* A2CECC 80242C8C D420F230 */ ldc1 $f0, -0xdd0($at) +/* A2CED0 80242C90 08090B41 */ j .L80242D04 +/* A2CED4 80242C94 4600A521 */ cvt.d.s $f20, $f20 +.L80242C98: +/* A2CED8 80242C98 3C108025 */ lui $s0, 0x8025 +/* A2CEDC 80242C9C 2610F4E8 */ addiu $s0, $s0, -0xb18 +/* A2CEE0 80242CA0 0200902D */ daddu $s2, $s0, $zero +/* A2CEE4 80242CA4 2415001E */ addiu $s5, $zero, 0x1e +/* A2CEE8 80242CA8 8C82000C */ lw $v0, 0xc($a0) +/* A2CEEC 80242CAC 8C420014 */ lw $v0, 0x14($v0) +/* A2CEF0 80242CB0 3C0142B4 */ lui $at, 0x42b4 +/* A2CEF4 80242CB4 4481F000 */ mtc1 $at, $f30 +/* A2CEF8 80242CB8 00551021 */ addu $v0, $v0, $s5 +/* A2CEFC 80242CBC 44821000 */ mtc1 $v0, $f2 +/* A2CF00 80242CC0 00000000 */ nop +/* A2CF04 80242CC4 468010A1 */ cvt.d.w $f2, $f2 +/* A2CF08 80242CC8 04410006 */ bgez $v0, .L80242CE4 +/* A2CF0C 80242CCC 24140003 */ addiu $s4, $zero, 3 +/* A2CF10 80242CD0 3C0141F0 */ lui $at, 0x41f0 +/* A2CF14 80242CD4 44810800 */ mtc1 $at, $f1 +/* A2CF18 80242CD8 44800000 */ mtc1 $zero, $f0 +/* A2CF1C 80242CDC 00000000 */ nop +/* A2CF20 80242CE0 46201080 */ add.d $f2, $f2, $f0 +.L80242CE4: +/* A2CF24 80242CE4 3C014080 */ lui $at, 0x4080 +/* A2CF28 80242CE8 44810000 */ mtc1 $at, $f0 +/* A2CF2C 80242CEC 46201520 */ cvt.s.d $f20, $f2 +/* A2CF30 80242CF0 4600A502 */ mul.s $f20, $f20, $f0 +/* A2CF34 80242CF4 00000000 */ nop +/* A2CF38 80242CF8 3C018025 */ lui $at, 0x8025 +/* A2CF3C 80242CFC D420F238 */ ldc1 $f0, -0xdc8($at) +/* A2CF40 80242D00 4600A521 */ cvt.d.s $f20, $f20 +.L80242D04: +/* A2CF44 80242D04 4620A500 */ add.d $f20, $f20, $f0 +/* A2CF48 80242D08 4620A520 */ cvt.s.d $f20, $f20 +/* A2CF4C 80242D0C 0C00A8BB */ jal sin_deg +/* A2CF50 80242D10 4600A306 */ mov.s $f12, $f20 +/* A2CF54 80242D14 4600F306 */ mov.s $f12, $f30 +/* A2CF58 80242D18 3C014248 */ lui $at, 0x4248 +/* A2CF5C 80242D1C 4481B000 */ mtc1 $at, $f22 +/* A2CF60 80242D20 0C00A8BB */ jal sin_deg +/* A2CF64 80242D24 46000606 */ mov.s $f24, $f0 +/* A2CF68 80242D28 46160002 */ mul.s $f0, $f0, $f22 +/* A2CF6C 80242D2C 00000000 */ nop +/* A2CF70 80242D30 46180002 */ mul.s $f0, $f0, $f24 +/* A2CF74 80242D34 00000000 */ nop +/* A2CF78 80242D38 8E22000C */ lw $v0, 0xc($s1) +/* A2CF7C 80242D3C C4420004 */ lwc1 $f2, 4($v0) +/* A2CF80 80242D40 46001680 */ add.s $f26, $f2, $f0 +/* A2CF84 80242D44 0C00A8D4 */ jal cos_deg +/* A2CF88 80242D48 4600A306 */ mov.s $f12, $f20 +/* A2CF8C 80242D4C 46160002 */ mul.s $f0, $f0, $f22 +/* A2CF90 80242D50 00000000 */ nop +/* A2CF94 80242D54 8E22000C */ lw $v0, 0xc($s1) +/* A2CF98 80242D58 C4420008 */ lwc1 $f2, 8($v0) +/* A2CF9C 80242D5C 46001500 */ add.s $f20, $f2, $f0 +/* A2CFA0 80242D60 0C00A8BB */ jal sin_deg +/* A2CFA4 80242D64 4600F306 */ mov.s $f12, $f30 +/* A2CFA8 80242D68 46160002 */ mul.s $f0, $f0, $f22 +/* A2CFAC 80242D6C 00000000 */ nop +/* A2CFB0 80242D70 46180002 */ mul.s $f0, $f0, $f24 +/* A2CFB4 80242D74 00000000 */ nop +/* A2CFB8 80242D78 8E22000C */ lw $v0, 0xc($s1) +/* A2CFBC 80242D7C C442000C */ lwc1 $f2, 0xc($v0) +.L80242D80: +/* A2CFC0 80242D80 46001080 */ add.s $f2, $f2, $f0 +/* A2CFC4 80242D84 E61A0018 */ swc1 $f26, 0x18($s0) +/* A2CFC8 80242D88 E614001C */ swc1 $f20, 0x1c($s0) +/* A2CFCC 80242D8C E6020020 */ swc1 $f2, 0x20($s0) +/* A2CFD0 80242D90 0260202D */ daddu $a0, $s3, $zero +/* A2CFD4 80242D94 3C05FE36 */ lui $a1, 0xfe36 +/* A2CFD8 80242D98 0C0B210B */ jal get_float_variable +/* A2CFDC 80242D9C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A2CFE0 80242DA0 0260202D */ daddu $a0, $s3, $zero +/* A2CFE4 80242DA4 3C05FE36 */ lui $a1, 0xfe36 +/* A2CFE8 80242DA8 34A53C81 */ ori $a1, $a1, 0x3c81 +/* A2CFEC 80242DAC 0C0B210B */ jal get_float_variable +/* A2CFF0 80242DB0 E6400000 */ swc1 $f0, ($s2) +/* A2CFF4 80242DB4 0260202D */ daddu $a0, $s3, $zero +/* A2CFF8 80242DB8 3C05FE36 */ lui $a1, 0xfe36 +/* A2CFFC 80242DBC 34A53C82 */ ori $a1, $a1, 0x3c82 +/* A2D000 80242DC0 0C0B210B */ jal get_float_variable +/* A2D004 80242DC4 E6400004 */ swc1 $f0, 4($s2) +/* A2D008 80242DC8 26510018 */ addiu $s1, $s2, 0x18 +/* A2D00C 80242DCC E6400008 */ swc1 $f0, 8($s2) +/* A2D010 80242DD0 24020002 */ addiu $v0, $zero, 2 +/* A2D014 80242DD4 12C20028 */ beq $s6, $v0, .L80242E78 +/* A2D018 80242DD8 2652000C */ addiu $s2, $s2, 0xc +/* A2D01C 80242DDC 0260202D */ daddu $a0, $s3, $zero +/* A2D020 80242DE0 3C05FE36 */ lui $a1, 0xfe36 +/* A2D024 80242DE4 0C0B210B */ jal get_float_variable +/* A2D028 80242DE8 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A2D02C 80242DEC 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D030 80242DF0 00000000 */ nop +/* A2D034 80242DF4 3C013F80 */ lui $at, 0x3f80 +/* A2D038 80242DF8 4481A000 */ mtc1 $at, $f20 +/* A2D03C 80242DFC 00000000 */ nop +/* A2D040 80242E00 461CA501 */ sub.s $f20, $f20, $f28 +/* A2D044 80242E04 C6220000 */ lwc1 $f2, ($s1) +/* A2D048 80242E08 46141082 */ mul.s $f2, $f2, $f20 +/* A2D04C 80242E0C 00000000 */ nop +/* A2D050 80242E10 0260202D */ daddu $a0, $s3, $zero +/* A2D054 80242E14 46020000 */ add.s $f0, $f0, $f2 +/* A2D058 80242E18 3C05FE36 */ lui $a1, 0xfe36 +/* A2D05C 80242E1C 34A53C81 */ ori $a1, $a1, 0x3c81 +/* A2D060 80242E20 0C0B210B */ jal get_float_variable +/* A2D064 80242E24 E6400000 */ swc1 $f0, ($s2) +/* A2D068 80242E28 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D06C 80242E2C 00000000 */ nop +/* A2D070 80242E30 C6220004 */ lwc1 $f2, 4($s1) +/* A2D074 80242E34 46141082 */ mul.s $f2, $f2, $f20 +/* A2D078 80242E38 00000000 */ nop +/* A2D07C 80242E3C 46020000 */ add.s $f0, $f0, $f2 +/* A2D080 80242E40 C7A40010 */ lwc1 $f4, 0x10($sp) +/* A2D084 80242E44 0260202D */ daddu $a0, $s3, $zero +/* A2D088 80242E48 46040000 */ add.s $f0, $f0, $f4 +/* A2D08C 80242E4C 3C05FE36 */ lui $a1, 0xfe36 +/* A2D090 80242E50 34A53C82 */ ori $a1, $a1, 0x3c82 +/* A2D094 80242E54 0C0B210B */ jal get_float_variable +/* A2D098 80242E58 E6400004 */ swc1 $f0, 4($s2) +/* A2D09C 80242E5C 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D0A0 80242E60 00000000 */ nop +/* A2D0A4 80242E64 C6220008 */ lwc1 $f2, 8($s1) +/* A2D0A8 80242E68 46141082 */ mul.s $f2, $f2, $f20 +/* A2D0AC 80242E6C 00000000 */ nop +/* A2D0B0 80242E70 08090BC8 */ j .L80242F20 +/* A2D0B4 80242E74 46020000 */ add.s $f0, $f0, $f2 +.L80242E78: +/* A2D0B8 80242E78 0260202D */ daddu $a0, $s3, $zero +/* A2D0BC 80242E7C 3C05FE36 */ lui $a1, 0xfe36 +/* A2D0C0 80242E80 0C0B210B */ jal get_float_variable +/* A2D0C4 80242E84 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A2D0C8 80242E88 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D0CC 80242E8C 00000000 */ nop +/* A2D0D0 80242E90 3C013F80 */ lui $at, 0x3f80 +/* A2D0D4 80242E94 4481A000 */ mtc1 $at, $f20 +/* A2D0D8 80242E98 00000000 */ nop +/* A2D0DC 80242E9C 461CA501 */ sub.s $f20, $f20, $f28 +/* A2D0E0 80242EA0 C6220000 */ lwc1 $f2, ($s1) +/* A2D0E4 80242EA4 46141082 */ mul.s $f2, $f2, $f20 +/* A2D0E8 80242EA8 00000000 */ nop +/* A2D0EC 80242EAC 46020000 */ add.s $f0, $f0, $f2 +/* A2D0F0 80242EB0 3C014248 */ lui $at, 0x4248 +/* A2D0F4 80242EB4 4481B000 */ mtc1 $at, $f22 +/* A2D0F8 80242EB8 0260202D */ daddu $a0, $s3, $zero +/* A2D0FC 80242EBC 46160001 */ sub.s $f0, $f0, $f22 +/* A2D100 80242EC0 3C05FE36 */ lui $a1, 0xfe36 +/* A2D104 80242EC4 34A53C81 */ ori $a1, $a1, 0x3c81 +/* A2D108 80242EC8 0C0B210B */ jal get_float_variable +/* A2D10C 80242ECC E6400000 */ swc1 $f0, ($s2) +/* A2D110 80242ED0 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D114 80242ED4 00000000 */ nop +/* A2D118 80242ED8 C6220004 */ lwc1 $f2, 4($s1) +/* A2D11C 80242EDC 46141082 */ mul.s $f2, $f2, $f20 +/* A2D120 80242EE0 00000000 */ nop +/* A2D124 80242EE4 46020000 */ add.s $f0, $f0, $f2 +/* A2D128 80242EE8 C7A40010 */ lwc1 $f4, 0x10($sp) +/* A2D12C 80242EEC 0260202D */ daddu $a0, $s3, $zero +/* A2D130 80242EF0 46040000 */ add.s $f0, $f0, $f4 +/* A2D134 80242EF4 3C05FE36 */ lui $a1, 0xfe36 +/* A2D138 80242EF8 34A53C82 */ ori $a1, $a1, 0x3c82 +/* A2D13C 80242EFC 0C0B210B */ jal get_float_variable +/* A2D140 80242F00 E6400004 */ swc1 $f0, 4($s2) +/* A2D144 80242F04 461C0002 */ mul.s $f0, $f0, $f28 +/* A2D148 80242F08 00000000 */ nop +/* A2D14C 80242F0C C6220008 */ lwc1 $f2, 8($s1) +/* A2D150 80242F10 46141082 */ mul.s $f2, $f2, $f20 +/* A2D154 80242F14 00000000 */ nop +/* A2D158 80242F18 46020000 */ add.s $f0, $f0, $f2 +/* A2D15C 80242F1C 46160001 */ sub.s $f0, $f0, $f22 +.L80242F20: +/* A2D160 80242F20 E6400008 */ swc1 $f0, 8($s2) +/* A2D164 80242F24 AE750084 */ sw $s5, 0x84($s3) +/* A2D168 80242F28 AE700088 */ sw $s0, 0x88($s3) +/* A2D16C 80242F2C AE74008C */ sw $s4, 0x8c($s3) +/* A2D170 80242F30 8FBF0034 */ lw $ra, 0x34($sp) +/* A2D174 80242F34 8FB60030 */ lw $s6, 0x30($sp) +/* A2D178 80242F38 8FB5002C */ lw $s5, 0x2c($sp) +/* A2D17C 80242F3C 8FB40028 */ lw $s4, 0x28($sp) +/* A2D180 80242F40 8FB30024 */ lw $s3, 0x24($sp) +/* A2D184 80242F44 8FB20020 */ lw $s2, 0x20($sp) +/* A2D188 80242F48 8FB1001C */ lw $s1, 0x1c($sp) +/* A2D18C 80242F4C 8FB00018 */ lw $s0, 0x18($sp) +/* A2D190 80242F50 D7BE0060 */ ldc1 $f30, 0x60($sp) +/* A2D194 80242F54 D7BC0058 */ ldc1 $f28, 0x58($sp) +/* A2D198 80242F58 D7BA0050 */ ldc1 $f26, 0x50($sp) +/* A2D19C 80242F5C D7B80048 */ ldc1 $f24, 0x48($sp) +/* A2D1A0 80242F60 D7B60040 */ ldc1 $f22, 0x40($sp) +/* A2D1A4 80242F64 D7B40038 */ ldc1 $f20, 0x38($sp) +/* A2D1A8 80242F68 24020002 */ addiu $v0, $zero, 2 +/* A2D1AC 80242F6C 03E00008 */ jr $ra +/* A2D1B0 80242F70 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s index b0515e0ba8..22fe89b5fb 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80242F74_A2D1B4.s @@ -26,7 +26,7 @@ glabel func_80242F74_A2D1B4 /* A2D208 80242FC8 001010C0 */ sll $v0, $s0, 3 /* A2D20C 80242FCC 02028021 */ addu $s0, $s0, $v0 /* A2D210 80242FD0 001080C0 */ sll $s0, $s0, 3 -/* A2D214 80242FD4 0C090411 */ jal func_80241044 +/* A2D214 80242FD4 0C090411 */ jal func_80241044_A2B284 /* A2D218 80242FD8 02038021 */ addu $s0, $s0, $v1 /* A2D21C 80242FDC 24020001 */ addiu $v0, $zero, 1 /* A2D220 80242FE0 C6200000 */ lwc1 $f0, ($s1) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C.s deleted file mode 100644 index e733e7f93f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024301C -/* A2D25C 8024301C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A2D260 80243020 AFB00018 */ sw $s0, 0x18($sp) -/* A2D264 80243024 00A0802D */ daddu $s0, $a1, $zero -/* A2D268 80243028 AFBF0020 */ sw $ra, 0x20($sp) -/* A2D26C 8024302C AFB1001C */ sw $s1, 0x1c($sp) -/* A2D270 80243030 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A2D274 80243034 0C0B36B0 */ jal resolve_npc -/* A2D278 80243038 24050009 */ addiu $a1, $zero, 9 -/* A2D27C 8024303C 12000007 */ beqz $s0, .L8024305C -/* A2D280 80243040 0040882D */ daddu $s1, $v0, $zero -/* A2D284 80243044 C6200038 */ lwc1 $f0, 0x38($s1) -/* A2D288 80243048 C6220040 */ lwc1 $f2, 0x40($s1) -/* A2D28C 8024304C 3C018025 */ lui $at, 0x8025 -/* A2D290 80243050 E420F2F4 */ swc1 $f0, -0xd0c($at) -/* A2D294 80243054 3C018025 */ lui $at, 0x8025 -/* A2D298 80243058 E422F2F8 */ swc1 $f2, -0xd08($at) -.L8024305C: -/* A2D29C 8024305C 24040003 */ addiu $a0, $zero, 3 -/* A2D2A0 80243060 3C108025 */ lui $s0, 0x8025 -/* A2D2A4 80243064 2610A9CC */ addiu $s0, $s0, -0x5634 -/* A2D2A8 80243068 C6000000 */ lwc1 $f0, ($s0) -/* A2D2AC 8024306C 46800020 */ cvt.s.w $f0, $f0 -/* A2D2B0 80243070 3C058025 */ lui $a1, 0x8025 -/* A2D2B4 80243074 8CA5F2F4 */ lw $a1, -0xd0c($a1) -/* A2D2B8 80243078 3C06C2BE */ lui $a2, 0xc2be -/* A2D2BC 8024307C 44070000 */ mfc1 $a3, $f0 -/* A2D2C0 80243080 3C014220 */ lui $at, 0x4220 -/* A2D2C4 80243084 4481A000 */ mtc1 $at, $f20 -/* A2D2C8 80243088 26220038 */ addiu $v0, $s1, 0x38 -/* A2D2CC 8024308C AFA20014 */ sw $v0, 0x14($sp) -/* A2D2D0 80243090 0C090439 */ jal func_802410E4 -/* A2D2D4 80243094 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2D2D8 80243098 C6000000 */ lwc1 $f0, ($s0) -/* A2D2DC 8024309C 46800020 */ cvt.s.w $f0, $f0 -/* A2D2E0 802430A0 24040003 */ addiu $a0, $zero, 3 -/* A2D2E4 802430A4 3C058025 */ lui $a1, 0x8025 -/* A2D2E8 802430A8 8CA5F2F8 */ lw $a1, -0xd08($a1) -/* A2D2EC 802430AC 3C0641A0 */ lui $a2, 0x41a0 -/* A2D2F0 802430B0 44070000 */ mfc1 $a3, $f0 -/* A2D2F4 802430B4 26220040 */ addiu $v0, $s1, 0x40 -/* A2D2F8 802430B8 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2D2FC 802430BC 0C090439 */ jal func_802410E4 -/* A2D300 802430C0 AFA20014 */ sw $v0, 0x14($sp) -/* A2D304 802430C4 8E030000 */ lw $v1, ($s0) -/* A2D308 802430C8 C6200038 */ lwc1 $f0, 0x38($s1) -/* A2D30C 802430CC C6220040 */ lwc1 $f2, 0x40($s1) -/* A2D310 802430D0 24630001 */ addiu $v1, $v1, 1 -/* A2D314 802430D4 28620029 */ slti $v0, $v1, 0x29 -/* A2D318 802430D8 E620006C */ swc1 $f0, 0x6c($s1) -/* A2D31C 802430DC E6220074 */ swc1 $f2, 0x74($s1) -/* A2D320 802430E0 AE030000 */ sw $v1, ($s0) -/* A2D324 802430E4 8FBF0020 */ lw $ra, 0x20($sp) -/* A2D328 802430E8 8FB1001C */ lw $s1, 0x1c($sp) -/* A2D32C 802430EC 8FB00018 */ lw $s0, 0x18($sp) -/* A2D330 802430F0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A2D334 802430F4 38420001 */ xori $v0, $v0, 1 -/* A2D338 802430F8 03E00008 */ jr $ra -/* A2D33C 802430FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s new file mode 100644 index 0000000000..78f1975fc5 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024301C_A2D25C.s @@ -0,0 +1,62 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024301C_A2D25C +/* A2D25C 8024301C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A2D260 80243020 AFB00018 */ sw $s0, 0x18($sp) +/* A2D264 80243024 00A0802D */ daddu $s0, $a1, $zero +/* A2D268 80243028 AFBF0020 */ sw $ra, 0x20($sp) +/* A2D26C 8024302C AFB1001C */ sw $s1, 0x1c($sp) +/* A2D270 80243030 F7B40028 */ sdc1 $f20, 0x28($sp) +/* A2D274 80243034 0C0B36B0 */ jal resolve_npc +/* A2D278 80243038 24050009 */ addiu $a1, $zero, 9 +/* A2D27C 8024303C 12000007 */ beqz $s0, .L8024305C +/* A2D280 80243040 0040882D */ daddu $s1, $v0, $zero +/* A2D284 80243044 C6200038 */ lwc1 $f0, 0x38($s1) +/* A2D288 80243048 C6220040 */ lwc1 $f2, 0x40($s1) +/* A2D28C 8024304C 3C018025 */ lui $at, 0x8025 +/* A2D290 80243050 E420F2F4 */ swc1 $f0, -0xd0c($at) +/* A2D294 80243054 3C018025 */ lui $at, 0x8025 +/* A2D298 80243058 E422F2F8 */ swc1 $f2, -0xd08($at) +.L8024305C: +/* A2D29C 8024305C 24040003 */ addiu $a0, $zero, 3 +/* A2D2A0 80243060 3C108025 */ lui $s0, 0x8025 +/* A2D2A4 80243064 2610A9CC */ addiu $s0, $s0, -0x5634 +/* A2D2A8 80243068 C6000000 */ lwc1 $f0, ($s0) +/* A2D2AC 8024306C 46800020 */ cvt.s.w $f0, $f0 +/* A2D2B0 80243070 3C058025 */ lui $a1, 0x8025 +/* A2D2B4 80243074 8CA5F2F4 */ lw $a1, -0xd0c($a1) +/* A2D2B8 80243078 3C06C2BE */ lui $a2, 0xc2be +/* A2D2BC 8024307C 44070000 */ mfc1 $a3, $f0 +/* A2D2C0 80243080 3C014220 */ lui $at, 0x4220 +/* A2D2C4 80243084 4481A000 */ mtc1 $at, $f20 +/* A2D2C8 80243088 26220038 */ addiu $v0, $s1, 0x38 +/* A2D2CC 8024308C AFA20014 */ sw $v0, 0x14($sp) +/* A2D2D0 80243090 0C090439 */ jal func_802410E4_A2B324 +/* A2D2D4 80243094 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2D2D8 80243098 C6000000 */ lwc1 $f0, ($s0) +/* A2D2DC 8024309C 46800020 */ cvt.s.w $f0, $f0 +/* A2D2E0 802430A0 24040003 */ addiu $a0, $zero, 3 +/* A2D2E4 802430A4 3C058025 */ lui $a1, 0x8025 +/* A2D2E8 802430A8 8CA5F2F8 */ lw $a1, -0xd08($a1) +/* A2D2EC 802430AC 3C0641A0 */ lui $a2, 0x41a0 +/* A2D2F0 802430B0 44070000 */ mfc1 $a3, $f0 +/* A2D2F4 802430B4 26220040 */ addiu $v0, $s1, 0x40 +/* A2D2F8 802430B8 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2D2FC 802430BC 0C090439 */ jal func_802410E4_A2B324 +/* A2D300 802430C0 AFA20014 */ sw $v0, 0x14($sp) +/* A2D304 802430C4 8E030000 */ lw $v1, ($s0) +/* A2D308 802430C8 C6200038 */ lwc1 $f0, 0x38($s1) +/* A2D30C 802430CC C6220040 */ lwc1 $f2, 0x40($s1) +/* A2D310 802430D0 24630001 */ addiu $v1, $v1, 1 +/* A2D314 802430D4 28620029 */ slti $v0, $v1, 0x29 +/* A2D318 802430D8 E620006C */ swc1 $f0, 0x6c($s1) +/* A2D31C 802430DC E6220074 */ swc1 $f2, 0x74($s1) +/* A2D320 802430E0 AE030000 */ sw $v1, ($s0) +/* A2D324 802430E4 8FBF0020 */ lw $ra, 0x20($sp) +/* A2D328 802430E8 8FB1001C */ lw $s1, 0x1c($sp) +/* A2D32C 802430EC 8FB00018 */ lw $s0, 0x18($sp) +/* A2D330 802430F0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* A2D334 802430F4 38420001 */ xori $v0, $v0, 1 +/* A2D338 802430F8 03E00008 */ jr $ra +/* A2D33C 802430FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100.s deleted file mode 100644 index cf81126cde..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243100 -/* A2D340 80243100 3C078025 */ lui $a3, 0x8025 -/* A2D344 80243104 8CE7AA20 */ lw $a3, -0x55e0($a3) -/* A2D348 80243108 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A2D34C 8024310C AFBF0020 */ sw $ra, 0x20($sp) -/* A2D350 80243110 94E20044 */ lhu $v0, 0x44($a3) -/* A2D354 80243114 00022400 */ sll $a0, $v0, 0x10 -/* A2D358 80243118 94E20046 */ lhu $v0, 0x46($a3) -/* A2D35C 8024311C 8CE30000 */ lw $v1, ($a3) -/* A2D360 80243120 1060000D */ beqz $v1, .L80243158 -/* A2D364 80243124 00022C00 */ sll $a1, $v0, 0x10 -/* A2D368 80243128 240200FF */ addiu $v0, $zero, 0xff -/* A2D36C 8024312C AFA20010 */ sw $v0, 0x10($sp) -/* A2D370 80243130 24020080 */ addiu $v0, $zero, 0x80 -/* A2D374 80243134 AFA20014 */ sw $v0, 0x14($sp) -/* A2D378 80243138 AFA20018 */ sw $v0, 0x18($sp) -/* A2D37C 8024313C 24020010 */ addiu $v0, $zero, 0x10 -/* A2D380 80243140 00442007 */ srav $a0, $a0, $v0 -/* A2D384 80243144 AFA2001C */ sw $v0, 0x1c($sp) -/* A2D388 80243148 8CE6001C */ lw $a2, 0x1c($a3) -/* A2D38C 8024314C 8CE70020 */ lw $a3, 0x20($a3) -/* A2D390 80243150 0C090C59 */ jal func_80243164 -/* A2D394 80243154 00452807 */ srav $a1, $a1, $v0 -.L80243158: -/* A2D398 80243158 8FBF0020 */ lw $ra, 0x20($sp) -/* A2D39C 8024315C 03E00008 */ jr $ra -/* A2D3A0 80243160 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s new file mode 100644 index 0000000000..cfcb2e4215 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243100_A2D340.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243100_A2D340 +/* A2D340 80243100 3C078025 */ lui $a3, 0x8025 +/* A2D344 80243104 8CE7AA20 */ lw $a3, -0x55e0($a3) +/* A2D348 80243108 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A2D34C 8024310C AFBF0020 */ sw $ra, 0x20($sp) +/* A2D350 80243110 94E20044 */ lhu $v0, 0x44($a3) +/* A2D354 80243114 00022400 */ sll $a0, $v0, 0x10 +/* A2D358 80243118 94E20046 */ lhu $v0, 0x46($a3) +/* A2D35C 8024311C 8CE30000 */ lw $v1, ($a3) +/* A2D360 80243120 1060000D */ beqz $v1, .L80243158 +/* A2D364 80243124 00022C00 */ sll $a1, $v0, 0x10 +/* A2D368 80243128 240200FF */ addiu $v0, $zero, 0xff +/* A2D36C 8024312C AFA20010 */ sw $v0, 0x10($sp) +/* A2D370 80243130 24020080 */ addiu $v0, $zero, 0x80 +/* A2D374 80243134 AFA20014 */ sw $v0, 0x14($sp) +/* A2D378 80243138 AFA20018 */ sw $v0, 0x18($sp) +/* A2D37C 8024313C 24020010 */ addiu $v0, $zero, 0x10 +/* A2D380 80243140 00442007 */ srav $a0, $a0, $v0 +/* A2D384 80243144 AFA2001C */ sw $v0, 0x1c($sp) +/* A2D388 80243148 8CE6001C */ lw $a2, 0x1c($a3) +/* A2D38C 8024314C 8CE70020 */ lw $a3, 0x20($a3) +/* A2D390 80243150 0C090C59 */ jal func_80243164_A2D3A4 +/* A2D394 80243154 00452807 */ srav $a1, $a1, $v0 +.L80243158: +/* A2D398 80243158 8FBF0020 */ lw $ra, 0x20($sp) +/* A2D39C 8024315C 03E00008 */ jr $ra +/* A2D3A0 80243160 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164.s deleted file mode 100644 index fc1ce8d99f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164.s +++ /dev/null @@ -1,393 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243164 -/* A2D3A4 80243164 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A2D3A8 80243168 AFB1002C */ sw $s1, 0x2c($sp) -/* A2D3AC 8024316C 8FB10060 */ lw $s1, 0x60($sp) -/* A2D3B0 80243170 AFB40038 */ sw $s4, 0x38($sp) -/* A2D3B4 80243174 8FB40064 */ lw $s4, 0x64($sp) -/* A2D3B8 80243178 AFB5003C */ sw $s5, 0x3c($sp) -/* A2D3BC 8024317C 8FB50068 */ lw $s5, 0x68($sp) -/* A2D3C0 80243180 AFB20030 */ sw $s2, 0x30($sp) -/* A2D3C4 80243184 8FB2006C */ lw $s2, 0x6c($sp) -/* A2D3C8 80243188 AFBE0048 */ sw $fp, 0x48($sp) -/* A2D3CC 8024318C 0080F02D */ daddu $fp, $a0, $zero -/* A2D3D0 80243190 AFB30034 */ sw $s3, 0x34($sp) -/* A2D3D4 80243194 00E0982D */ daddu $s3, $a3, $zero -/* A2D3D8 80243198 AFBF004C */ sw $ra, 0x4c($sp) -/* A2D3DC 8024319C AFB70044 */ sw $s7, 0x44($sp) -/* A2D3E0 802431A0 AFB60040 */ sw $s6, 0x40($sp) -/* A2D3E4 802431A4 AFB00028 */ sw $s0, 0x28($sp) -/* 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, 0x800a -/* A2D3F8 802431B8 24C6A66C */ addiu $a2, $a2, -0x5994 -/* A2D3FC 802431BC 8CC50000 */ lw $a1, ($a2) -/* A2D400 802431C0 3C07E700 */ lui $a3, 0xe700 -/* A2D404 802431C4 00A0102D */ daddu $v0, $a1, $zero -/* A2D408 802431C8 24A50008 */ addiu $a1, $a1, 8 -/* A2D40C 802431CC ACC50000 */ sw $a1, ($a2) -/* A2D410 802431D0 AC470000 */ sw $a3, ($v0) -/* A2D414 802431D4 AC400004 */ sw $zero, 4($v0) -/* A2D418 802431D8 24A20008 */ addiu $v0, $a1, 8 -/* A2D41C 802431DC ACC20000 */ sw $v0, ($a2) -/* A2D420 802431E0 3C02DE00 */ lui $v0, 0xde00 -/* A2D424 802431E4 ACA20000 */ sw $v0, ($a1) -/* A2D428 802431E8 3C028025 */ lui $v0, 0x8025 -/* A2D42C 802431EC 2442AA28 */ addiu $v0, $v0, -0x55d8 -/* A2D430 802431F0 12600023 */ beqz $s3, .L80243280 -/* A2D434 802431F4 ACA20004 */ sw $v0, 4($a1) -/* A2D438 802431F8 3C03F500 */ lui $v1, 0xf500 -/* A2D43C 802431FC 34630100 */ ori $v1, $v1, 0x100 -/* A2D440 80243200 3C04073F */ lui $a0, 0x73f -/* A2D444 80243204 3484C000 */ ori $a0, $a0, 0xc000 -/* A2D448 80243208 24A20010 */ addiu $v0, $a1, 0x10 -/* A2D44C 8024320C ACC20000 */ sw $v0, ($a2) -/* A2D450 80243210 3C02FD10 */ lui $v0, 0xfd10 -/* A2D454 80243214 ACA20008 */ sw $v0, 8($a1) -/* A2D458 80243218 24A20018 */ addiu $v0, $a1, 0x18 -/* A2D45C 8024321C ACB3000C */ sw $s3, 0xc($a1) -/* A2D460 80243220 ACC20000 */ sw $v0, ($a2) -/* A2D464 80243224 3C02E800 */ lui $v0, 0xe800 -/* A2D468 80243228 ACA20010 */ sw $v0, 0x10($a1) -/* A2D46C 8024322C 24A20020 */ addiu $v0, $a1, 0x20 -/* A2D470 80243230 ACA00014 */ sw $zero, 0x14($a1) -/* A2D474 80243234 ACC20000 */ sw $v0, ($a2) -/* A2D478 80243238 3C020700 */ lui $v0, 0x700 -/* A2D47C 8024323C ACA2001C */ sw $v0, 0x1c($a1) -/* A2D480 80243240 24A20028 */ addiu $v0, $a1, 0x28 -/* A2D484 80243244 ACA30018 */ sw $v1, 0x18($a1) -/* A2D488 80243248 ACC20000 */ sw $v0, ($a2) -/* A2D48C 8024324C 3C02E600 */ lui $v0, 0xe600 -/* A2D490 80243250 ACA20020 */ sw $v0, 0x20($a1) -/* A2D494 80243254 24A20030 */ addiu $v0, $a1, 0x30 -/* A2D498 80243258 ACA00024 */ sw $zero, 0x24($a1) -/* A2D49C 8024325C ACC20000 */ sw $v0, ($a2) -/* A2D4A0 80243260 3C02F000 */ lui $v0, 0xf000 -/* A2D4A4 80243264 ACA20028 */ sw $v0, 0x28($a1) -/* A2D4A8 80243268 24A20038 */ addiu $v0, $a1, 0x38 -/* A2D4AC 8024326C ACA4002C */ sw $a0, 0x2c($a1) -/* A2D4B0 80243270 ACC20000 */ sw $v0, ($a2) -/* A2D4B4 80243274 ACA70030 */ sw $a3, 0x30($a1) -/* A2D4B8 80243278 08090CA6 */ j .L80243298 -/* A2D4BC 8024327C ACA00034 */ sw $zero, 0x34($a1) -.L80243280: -/* A2D4C0 80243280 3C03E300 */ lui $v1, 0xe300 -/* A2D4C4 80243284 34631001 */ ori $v1, $v1, 0x1001 -/* A2D4C8 80243288 24A20010 */ addiu $v0, $a1, 0x10 -/* A2D4CC 8024328C ACC20000 */ sw $v0, ($a2) -/* A2D4D0 80243290 ACA30008 */ sw $v1, 8($a1) -/* A2D4D4 80243294 ACA0000C */ sw $zero, 0xc($a1) -.L80243298: -/* A2D4D8 80243298 24040001 */ addiu $a0, $zero, 1 -/* A2D4DC 8024329C 27B00010 */ addiu $s0, $sp, 0x10 -/* A2D4E0 802432A0 0200282D */ daddu $a1, $s0, $zero -/* A2D4E4 802432A4 0C04DF70 */ jal func_80137DC0 -/* A2D4E8 802432A8 27A60014 */ addiu $a2, $sp, 0x14 -/* A2D4EC 802432AC 0000202D */ daddu $a0, $zero, $zero -/* A2D4F0 802432B0 0200282D */ daddu $a1, $s0, $zero -/* A2D4F4 802432B4 0C04DF70 */ jal func_80137DC0 -/* A2D4F8 802432B8 27A60018 */ addiu $a2, $sp, 0x18 -/* A2D4FC 802432BC C7A20014 */ lwc1 $f2, 0x14($sp) -/* A2D500 802432C0 3C01437F */ lui $at, 0x437f -/* A2D504 802432C4 44812000 */ mtc1 $at, $f4 -/* A2D508 802432C8 00000000 */ nop -/* A2D50C 802432CC 46022081 */ sub.s $f2, $f4, $f2 -/* A2D510 802432D0 44910000 */ mtc1 $s1, $f0 -/* A2D514 802432D4 00000000 */ nop -/* A2D518 802432D8 46800020 */ cvt.s.w $f0, $f0 -/* A2D51C 802432DC 46020002 */ mul.s $f0, $f0, $f2 -/* 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 -/* 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 -/* 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, 0x800a -/* A2D560 80243320 2484A66C */ addiu $a0, $a0, -0x5994 -/* A2D564 80243324 8C820000 */ lw $v0, ($a0) -/* A2D568 80243328 34A5FE7F */ ori $a1, $a1, 0xfe7f -/* A2D56C 8024332C 0040182D */ daddu $v1, $v0, $zero -/* A2D570 80243330 24420008 */ addiu $v0, $v0, 8 -/* A2D574 80243334 AC820000 */ sw $v0, ($a0) -/* A2D578 80243338 AC660000 */ sw $a2, ($v1) -/* A2D57C 8024333C AC650004 */ sw $a1, 4($v1) -/* A2D580 80243340 24430008 */ addiu $v1, $v0, 8 -/* A2D584 80243344 AC830000 */ sw $v1, ($a0) -/* A2D588 80243348 3C03FA00 */ lui $v1, 0xfa00 -/* A2D58C 8024334C AC430000 */ sw $v1, ($v0) -/* A2D590 80243350 322300FF */ andi $v1, $s1, 0xff -/* A2D594 80243354 08090CE2 */ j .L80243388 -/* A2D598 80243358 AC430004 */ sw $v1, 4($v0) -.L8024335C: -/* A2D59C 8024335C 34C6FFFF */ ori $a2, $a2, 0xffff -/* A2D5A0 80243360 3C05FFFC */ lui $a1, 0xfffc -/* A2D5A4 80243364 3C04800A */ lui $a0, 0x800a -/* A2D5A8 80243368 2484A66C */ addiu $a0, $a0, -0x5994 -/* A2D5AC 8024336C 8C820000 */ lw $v0, ($a0) -/* A2D5B0 80243370 34A5F279 */ ori $a1, $a1, 0xf279 -/* A2D5B4 80243374 0040182D */ daddu $v1, $v0, $zero -/* A2D5B8 80243378 24420008 */ addiu $v0, $v0, 8 -/* A2D5BC 8024337C AC820000 */ sw $v0, ($a0) -/* A2D5C0 80243380 AC660000 */ sw $a2, ($v1) -/* A2D5C4 80243384 AC650004 */ sw $a1, 4($v1) -.L80243388: -/* A2D5C8 80243388 16400002 */ bnez $s2, .L80243394 -/* A2D5CC 8024338C 02B2001A */ div $zero, $s5, $s2 -/* A2D5D0 80243390 0007000D */ break 7 -.L80243394: -/* A2D5D4 80243394 2401FFFF */ addiu $at, $zero, -1 -/* A2D5D8 80243398 16410004 */ bne $s2, $at, .L802433AC -/* A2D5DC 8024339C 3C018000 */ lui $at, 0x8000 -/* A2D5E0 802433A0 16A10002 */ bne $s5, $at, .L802433AC -/* A2D5E4 802433A4 00000000 */ nop -/* A2D5E8 802433A8 0006000D */ break 6 -.L802433AC: -/* A2D5EC 802433AC 00004812 */ mflo $t1 -/* A2D5F0 802433B0 3C050050 */ lui $a1, 0x50 -/* A2D5F4 802433B4 34A503C0 */ ori $a1, $a1, 0x3c0 -/* A2D5F8 802433B8 3C07E200 */ lui $a3, 0xe200 -/* 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, 0x800a -/* A2D60C 802433CC 2508A66C */ addiu $t0, $t0, -0x5994 -/* A2D610 802433D0 0000582D */ daddu $t3, $zero, $zero -/* A2D614 802433D4 8D020000 */ lw $v0, ($t0) -/* A2D618 802433D8 3C03ED00 */ lui $v1, 0xed00 -/* A2D61C 802433DC 0040202D */ daddu $a0, $v0, $zero -/* A2D620 802433E0 24420008 */ addiu $v0, $v0, 8 -/* A2D624 802433E4 AD020000 */ sw $v0, ($t0) -/* A2D628 802433E8 AC830000 */ sw $v1, ($a0) -/* A2D62C 802433EC 24430008 */ addiu $v1, $v0, 8 -/* A2D630 802433F0 AC850004 */ sw $a1, 4($a0) -/* A2D634 802433F4 AD030000 */ sw $v1, ($t0) -/* A2D638 802433F8 AC470000 */ sw $a3, ($v0) -/* A2D63C 802433FC 192000AE */ blez $t1, .L802436B8 -/* A2D640 80243400 AC460004 */ sw $a2, 4($v0) -/* A2D644 80243404 0100302D */ daddu $a2, $t0, $zero -/* A2D648 80243408 2684FFFF */ addiu $a0, $s4, -1 -/* A2D64C 8024340C 30830FFF */ andi $v1, $a0, 0xfff -/* A2D650 80243410 3C02FD48 */ lui $v0, 0xfd48 -/* A2D654 80243414 0062B825 */ or $s7, $v1, $v0 -/* A2D658 80243418 3C02FD68 */ lui $v0, 0xfd68 -/* A2D65C 8024341C 00621825 */ or $v1, $v1, $v0 -/* A2D660 80243420 26820007 */ addiu $v0, $s4, 7 -/* A2D664 80243424 000210C3 */ sra $v0, $v0, 3 -/* A2D668 80243428 304201FF */ andi $v0, $v0, 0x1ff -/* A2D66C 8024342C 00021240 */ sll $v0, $v0, 9 -/* A2D670 80243430 AFA30020 */ sw $v1, 0x20($sp) -/* A2D674 80243434 3C03F548 */ lui $v1, 0xf548 -/* A2D678 80243438 00437825 */ or $t7, $v0, $v1 -/* A2D67C 8024343C 3C03F568 */ lui $v1, 0xf568 -/* A2D680 80243440 00437025 */ or $t6, $v0, $v1 -/* A2D684 80243444 3C110700 */ lui $s1, 0x700 -/* A2D688 80243448 00042080 */ sll $a0, $a0, 2 -/* A2D68C 8024344C 30840FFF */ andi $a0, $a0, 0xfff -/* A2D690 80243450 00046B00 */ sll $t5, $a0, 0xc -/* A2D694 80243454 03D41021 */ addu $v0, $fp, $s4 -/* A2D698 80243458 00021480 */ sll $v0, $v0, 0x12 -/* A2D69C 8024345C 00028403 */ sra $s0, $v0, 0x10 -/* A2D6A0 80243460 32020FFF */ andi $v0, $s0, 0xfff -/* A2D6A4 80243464 0002CB00 */ sll $t9, $v0, 0xc -/* A2D6A8 80243468 001E1480 */ sll $v0, $fp, 0x12 -/* A2D6AC 8024346C 00026403 */ sra $t4, $v0, 0x10 -/* A2D6B0 80243470 31980FFF */ andi $t8, $t4, 0xfff -/* A2D6B4 80243474 000CA280 */ sll $s4, $t4, 0xa -/* A2D6B8 80243478 0160402D */ daddu $t0, $t3, $zero -/* A2D6BC 8024347C 0240502D */ daddu $t2, $s2, $zero -/* A2D6C0 80243480 8FA70054 */ lw $a3, 0x54($sp) -.L80243484: -/* A2D6C4 80243484 8CC30000 */ lw $v1, ($a2) -/* A2D6C8 80243488 24620008 */ addiu $v0, $v1, 8 -/* A2D6CC 8024348C 12600003 */ beqz $s3, .L8024349C -/* A2D6D0 80243490 ACC20000 */ sw $v0, ($a2) -/* A2D6D4 80243494 08090D29 */ j .L802434A4 -/* A2D6D8 80243498 AC770000 */ sw $s7, ($v1) -.L8024349C: -/* A2D6DC 8024349C 8FB60020 */ lw $s6, 0x20($sp) -/* A2D6E0 802434A0 AC760000 */ sw $s6, ($v1) -.L802434A4: -/* A2D6E4 802434A4 8CC50000 */ lw $a1, ($a2) -/* A2D6E8 802434A8 8FB60058 */ lw $s6, 0x58($sp) -/* A2D6EC 802434AC 24A20008 */ addiu $v0, $a1, 8 -/* A2D6F0 802434B0 AC760004 */ sw $s6, 4($v1) -/* A2D6F4 802434B4 12600003 */ beqz $s3, .L802434C4 -/* A2D6F8 802434B8 ACC20000 */ sw $v0, ($a2) -/* A2D6FC 802434BC 08090D32 */ j .L802434C8 -/* A2D700 802434C0 ACAF0000 */ sw $t7, ($a1) -.L802434C4: -/* A2D704 802434C4 ACAE0000 */ sw $t6, ($a1) -.L802434C8: -/* A2D708 802434C8 8CC40000 */ lw $a0, ($a2) -/* A2D70C 802434CC 3C02E600 */ lui $v0, 0xe600 -/* A2D710 802434D0 ACB10004 */ sw $s1, 4($a1) -/* A2D714 802434D4 0080182D */ daddu $v1, $a0, $zero -/* A2D718 802434D8 24840008 */ addiu $a0, $a0, 8 -/* A2D71C 802434DC ACC40000 */ sw $a0, ($a2) -/* A2D720 802434E0 AC620000 */ sw $v0, ($v1) -/* A2D724 802434E4 24820008 */ addiu $v0, $a0, 8 -/* A2D728 802434E8 AC600004 */ sw $zero, 4($v1) -/* A2D72C 802434EC ACC20000 */ sw $v0, ($a2) -/* A2D730 802434F0 00081080 */ sll $v0, $t0, 2 -/* A2D734 802434F4 30420FFF */ andi $v0, $v0, 0xfff -/* A2D738 802434F8 3C03F400 */ lui $v1, 0xf400 -/* A2D73C 802434FC 00431025 */ or $v0, $v0, $v1 -/* A2D740 80243500 AC820000 */ sw $v0, ($a0) -/* A2D744 80243504 2542FFFF */ addiu $v0, $t2, -1 -/* A2D748 80243508 00021080 */ sll $v0, $v0, 2 -/* A2D74C 8024350C 30420FFF */ andi $v0, $v0, 0xfff -/* A2D750 80243510 00511025 */ or $v0, $v0, $s1 -/* A2D754 80243514 01A21025 */ or $v0, $t5, $v0 -/* A2D758 80243518 24830010 */ addiu $v1, $a0, 0x10 -/* A2D75C 8024351C AC820004 */ sw $v0, 4($a0) -/* A2D760 80243520 3C02E700 */ lui $v0, 0xe700 -/* A2D764 80243524 ACC30000 */ sw $v1, ($a2) -/* A2D768 80243528 AC820008 */ sw $v0, 8($a0) -/* A2D76C 8024352C 24820018 */ addiu $v0, $a0, 0x18 -/* A2D770 80243530 AC80000C */ sw $zero, 0xc($a0) -/* A2D774 80243534 12600003 */ beqz $s3, .L80243544 -/* A2D778 80243538 ACC20000 */ sw $v0, ($a2) -/* A2D77C 8024353C 08090D52 */ j .L80243548 -/* A2D780 80243540 AC8F0010 */ sw $t7, 0x10($a0) -.L80243544: -/* A2D784 80243544 AC8E0010 */ sw $t6, 0x10($a0) -.L80243548: -/* A2D788 80243548 00081080 */ sll $v0, $t0, 2 -/* A2D78C 8024354C 8CC40000 */ lw $a0, ($a2) -/* A2D790 80243550 30420FFF */ andi $v0, $v0, 0xfff -/* A2D794 80243554 AC600004 */ sw $zero, 4($v1) -/* A2D798 80243558 3C03F200 */ lui $v1, 0xf200 -/* A2D79C 8024355C 00431025 */ or $v0, $v0, $v1 -/* A2D7A0 80243560 0080282D */ daddu $a1, $a0, $zero -/* A2D7A4 80243564 24840008 */ addiu $a0, $a0, 8 -/* A2D7A8 80243568 ACC40000 */ sw $a0, ($a2) -/* A2D7AC 8024356C ACA20000 */ sw $v0, ($a1) -/* A2D7B0 80243570 2542FFFF */ addiu $v0, $t2, -1 -/* A2D7B4 80243574 00021080 */ sll $v0, $v0, 2 -/* A2D7B8 80243578 30420FFF */ andi $v0, $v0, 0xfff -/* A2D7BC 8024357C 01A21025 */ or $v0, $t5, $v0 -/* A2D7C0 80243580 ACA20004 */ sw $v0, 4($a1) -/* A2D7C4 80243584 24820008 */ addiu $v0, $a0, 8 -/* A2D7C8 80243588 1A000004 */ blez $s0, .L8024359C -/* A2D7CC 8024358C ACC20000 */ sw $v0, ($a2) -/* A2D7D0 80243590 3C02E400 */ lui $v0, 0xe400 -/* A2D7D4 80243594 08090D68 */ j .L802435A0 -/* A2D7D8 80243598 03221825 */ or $v1, $t9, $v0 -.L8024359C: -/* A2D7DC 8024359C 3C03E400 */ lui $v1, 0xe400 -.L802435A0: -/* A2D7E0 802435A0 00F21021 */ addu $v0, $a3, $s2 -/* A2D7E4 802435A4 00021480 */ sll $v0, $v0, 0x12 -/* A2D7E8 802435A8 00021403 */ sra $v0, $v0, 0x10 -/* A2D7EC 802435AC 18400004 */ blez $v0, .L802435C0 -/* A2D7F0 802435B0 AC830000 */ sw $v1, ($a0) -/* A2D7F4 802435B4 30420FFF */ andi $v0, $v0, 0xfff -/* A2D7F8 802435B8 00621025 */ or $v0, $v1, $v0 -/* A2D7FC 802435BC AC820000 */ sw $v0, ($a0) -.L802435C0: -/* A2D800 802435C0 19800002 */ blez $t4, .L802435CC -/* A2D804 802435C4 0000182D */ daddu $v1, $zero, $zero -/* A2D808 802435C8 00181B00 */ sll $v1, $t8, 0xc -.L802435CC: -/* A2D80C 802435CC 00071480 */ sll $v0, $a3, 0x12 -/* A2D810 802435D0 00021403 */ sra $v0, $v0, 0x10 -/* A2D814 802435D4 18400004 */ blez $v0, .L802435E8 -/* A2D818 802435D8 AC830004 */ sw $v1, 4($a0) -/* A2D81C 802435DC 30420FFF */ andi $v0, $v0, 0xfff -/* A2D820 802435E0 00621025 */ or $v0, $v1, $v0 -/* A2D824 802435E4 AC820004 */ sw $v0, 4($a0) -.L802435E8: -/* A2D828 802435E8 8CC20000 */ lw $v0, ($a2) -/* A2D82C 802435EC 00082940 */ sll $a1, $t0, 5 -/* A2D830 802435F0 0040182D */ daddu $v1, $v0, $zero -/* A2D834 802435F4 24420008 */ addiu $v0, $v0, 8 -/* A2D838 802435F8 ACC20000 */ sw $v0, ($a2) -/* A2D83C 802435FC 3C02E100 */ lui $v0, 0xe100 -/* A2D840 80243600 AC620000 */ sw $v0, ($v1) -/* A2D844 80243604 05810007 */ bgez $t4, .L80243624 -/* A2D848 80243608 24630004 */ addiu $v1, $v1, 4 -/* A2D84C 8024360C 001411C3 */ sra $v0, $s4, 7 -/* A2D850 80243610 5C400001 */ bgtzl $v0, .L80243618 -/* A2D854 80243614 0000102D */ daddu $v0, $zero, $zero -.L80243618: -/* A2D858 80243618 00021023 */ negu $v0, $v0 -/* A2D85C 8024361C 08090D8A */ j .L80243628 -/* A2D860 80243620 00022400 */ sll $a0, $v0, 0x10 -.L80243624: -/* A2D864 80243624 0000202D */ daddu $a0, $zero, $zero -.L80243628: -/* A2D868 80243628 00071080 */ sll $v0, $a3, 2 -/* A2D86C 8024362C 04410007 */ bgez $v0, .L8024364C -/* A2D870 80243630 30A2FFFF */ andi $v0, $a1, 0xffff -/* A2D874 80243634 00071480 */ sll $v0, $a3, 0x12 -/* A2D878 80243638 00021343 */ sra $v0, $v0, 0xd -/* A2D87C 8024363C 5C400001 */ bgtzl $v0, .L80243644 -/* A2D880 80243640 0000102D */ daddu $v0, $zero, $zero -.L80243644: -/* A2D884 80243644 00A21023 */ subu $v0, $a1, $v0 -/* A2D888 80243648 3042FFFF */ andi $v0, $v0, 0xffff -.L8024364C: -/* A2D88C 8024364C 00821025 */ or $v0, $a0, $v0 -/* A2D890 80243650 AC620000 */ sw $v0, ($v1) -/* A2D894 80243654 16400002 */ bnez $s2, .L80243660 -/* A2D898 80243658 02B2001A */ div $zero, $s5, $s2 -/* A2D89C 8024365C 0007000D */ break 7 -.L80243660: -/* A2D8A0 80243660 2401FFFF */ addiu $at, $zero, -1 -/* A2D8A4 80243664 16410004 */ bne $s2, $at, .L80243678 -/* A2D8A8 80243668 3C018000 */ lui $at, 0x8000 -/* A2D8AC 8024366C 16A10002 */ bne $s5, $at, .L80243678 -/* A2D8B0 80243670 00000000 */ nop -/* A2D8B4 80243674 0006000D */ break 6 -.L80243678: -/* A2D8B8 80243678 00004812 */ mflo $t1 -/* A2D8BC 8024367C 3C040400 */ lui $a0, 0x400 -/* A2D8C0 80243680 34840400 */ ori $a0, $a0, 0x400 -/* A2D8C4 80243684 00F23821 */ addu $a3, $a3, $s2 -/* A2D8C8 80243688 01124021 */ addu $t0, $t0, $s2 -/* A2D8CC 8024368C 01525021 */ addu $t2, $t2, $s2 -/* A2D8D0 80243690 8CC20000 */ lw $v0, ($a2) -/* A2D8D4 80243694 256B0001 */ addiu $t3, $t3, 1 -/* A2D8D8 80243698 0040182D */ daddu $v1, $v0, $zero -/* A2D8DC 8024369C 24420008 */ addiu $v0, $v0, 8 -/* A2D8E0 802436A0 ACC20000 */ sw $v0, ($a2) -/* A2D8E4 802436A4 3C02F100 */ lui $v0, 0xf100 -/* A2D8E8 802436A8 AC620000 */ sw $v0, ($v1) -/* A2D8EC 802436AC 0169102A */ slt $v0, $t3, $t1 -/* A2D8F0 802436B0 1440FF74 */ bnez $v0, .L80243484 -/* A2D8F4 802436B4 AC640004 */ sw $a0, 4($v1) -.L802436B8: -/* A2D8F8 802436B8 3C03800A */ lui $v1, 0x800a -/* A2D8FC 802436BC 2463A66C */ addiu $v1, $v1, -0x5994 -/* A2D900 802436C0 8C620000 */ lw $v0, ($v1) -/* A2D904 802436C4 0040202D */ daddu $a0, $v0, $zero -/* A2D908 802436C8 24420008 */ addiu $v0, $v0, 8 -/* A2D90C 802436CC AC620000 */ sw $v0, ($v1) -/* A2D910 802436D0 3C02E700 */ lui $v0, 0xe700 -/* A2D914 802436D4 AC820000 */ sw $v0, ($a0) -/* A2D918 802436D8 AC800004 */ sw $zero, 4($a0) -.L802436DC: -/* A2D91C 802436DC 8FBF004C */ lw $ra, 0x4c($sp) -/* A2D920 802436E0 8FBE0048 */ lw $fp, 0x48($sp) -/* A2D924 802436E4 8FB70044 */ lw $s7, 0x44($sp) -/* A2D928 802436E8 8FB60040 */ lw $s6, 0x40($sp) -/* A2D92C 802436EC 8FB5003C */ lw $s5, 0x3c($sp) -/* A2D930 802436F0 8FB40038 */ lw $s4, 0x38($sp) -/* A2D934 802436F4 8FB30034 */ lw $s3, 0x34($sp) -/* A2D938 802436F8 8FB20030 */ lw $s2, 0x30($sp) -/* A2D93C 802436FC 8FB1002C */ lw $s1, 0x2c($sp) -/* A2D940 80243700 8FB00028 */ lw $s0, 0x28($sp) -/* A2D944 80243704 03E00008 */ jr $ra -/* A2D948 80243708 27BD0050 */ addiu $sp, $sp, 0x50 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 new file mode 100644 index 0000000000..c6ba9e08c5 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243164_A2D3A4.s @@ -0,0 +1,393 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243164_A2D3A4 +/* A2D3A4 80243164 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A2D3A8 80243168 AFB1002C */ sw $s1, 0x2c($sp) +/* A2D3AC 8024316C 8FB10060 */ lw $s1, 0x60($sp) +/* A2D3B0 80243170 AFB40038 */ sw $s4, 0x38($sp) +/* A2D3B4 80243174 8FB40064 */ lw $s4, 0x64($sp) +/* A2D3B8 80243178 AFB5003C */ sw $s5, 0x3c($sp) +/* A2D3BC 8024317C 8FB50068 */ lw $s5, 0x68($sp) +/* A2D3C0 80243180 AFB20030 */ sw $s2, 0x30($sp) +/* A2D3C4 80243184 8FB2006C */ lw $s2, 0x6c($sp) +/* A2D3C8 80243188 AFBE0048 */ sw $fp, 0x48($sp) +/* A2D3CC 8024318C 0080F02D */ daddu $fp, $a0, $zero +/* A2D3D0 80243190 AFB30034 */ sw $s3, 0x34($sp) +/* A2D3D4 80243194 00E0982D */ daddu $s3, $a3, $zero +/* A2D3D8 80243198 AFBF004C */ sw $ra, 0x4c($sp) +/* A2D3DC 8024319C AFB70044 */ sw $s7, 0x44($sp) +/* A2D3E0 802431A0 AFB60040 */ sw $s6, 0x40($sp) +/* A2D3E4 802431A4 AFB00028 */ sw $s0, 0x28($sp) +/* 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, 0x800a +/* A2D3F8 802431B8 24C6A66C */ addiu $a2, $a2, -0x5994 +/* A2D3FC 802431BC 8CC50000 */ lw $a1, ($a2) +/* A2D400 802431C0 3C07E700 */ lui $a3, 0xe700 +/* A2D404 802431C4 00A0102D */ daddu $v0, $a1, $zero +/* A2D408 802431C8 24A50008 */ addiu $a1, $a1, 8 +/* A2D40C 802431CC ACC50000 */ sw $a1, ($a2) +/* A2D410 802431D0 AC470000 */ sw $a3, ($v0) +/* A2D414 802431D4 AC400004 */ sw $zero, 4($v0) +/* A2D418 802431D8 24A20008 */ addiu $v0, $a1, 8 +/* A2D41C 802431DC ACC20000 */ sw $v0, ($a2) +/* A2D420 802431E0 3C02DE00 */ lui $v0, 0xde00 +/* A2D424 802431E4 ACA20000 */ sw $v0, ($a1) +/* A2D428 802431E8 3C028025 */ lui $v0, 0x8025 +/* A2D42C 802431EC 2442AA28 */ addiu $v0, $v0, -0x55d8 +/* A2D430 802431F0 12600023 */ beqz $s3, .L80243280 +/* A2D434 802431F4 ACA20004 */ sw $v0, 4($a1) +/* A2D438 802431F8 3C03F500 */ lui $v1, 0xf500 +/* A2D43C 802431FC 34630100 */ ori $v1, $v1, 0x100 +/* A2D440 80243200 3C04073F */ lui $a0, 0x73f +/* A2D444 80243204 3484C000 */ ori $a0, $a0, 0xc000 +/* A2D448 80243208 24A20010 */ addiu $v0, $a1, 0x10 +/* A2D44C 8024320C ACC20000 */ sw $v0, ($a2) +/* A2D450 80243210 3C02FD10 */ lui $v0, 0xfd10 +/* A2D454 80243214 ACA20008 */ sw $v0, 8($a1) +/* A2D458 80243218 24A20018 */ addiu $v0, $a1, 0x18 +/* A2D45C 8024321C ACB3000C */ sw $s3, 0xc($a1) +/* A2D460 80243220 ACC20000 */ sw $v0, ($a2) +/* A2D464 80243224 3C02E800 */ lui $v0, 0xe800 +/* A2D468 80243228 ACA20010 */ sw $v0, 0x10($a1) +/* A2D46C 8024322C 24A20020 */ addiu $v0, $a1, 0x20 +/* A2D470 80243230 ACA00014 */ sw $zero, 0x14($a1) +/* A2D474 80243234 ACC20000 */ sw $v0, ($a2) +/* A2D478 80243238 3C020700 */ lui $v0, 0x700 +/* A2D47C 8024323C ACA2001C */ sw $v0, 0x1c($a1) +/* A2D480 80243240 24A20028 */ addiu $v0, $a1, 0x28 +/* A2D484 80243244 ACA30018 */ sw $v1, 0x18($a1) +/* A2D488 80243248 ACC20000 */ sw $v0, ($a2) +/* A2D48C 8024324C 3C02E600 */ lui $v0, 0xe600 +/* A2D490 80243250 ACA20020 */ sw $v0, 0x20($a1) +/* A2D494 80243254 24A20030 */ addiu $v0, $a1, 0x30 +/* A2D498 80243258 ACA00024 */ sw $zero, 0x24($a1) +/* A2D49C 8024325C ACC20000 */ sw $v0, ($a2) +/* A2D4A0 80243260 3C02F000 */ lui $v0, 0xf000 +/* A2D4A4 80243264 ACA20028 */ sw $v0, 0x28($a1) +/* A2D4A8 80243268 24A20038 */ addiu $v0, $a1, 0x38 +/* A2D4AC 8024326C ACA4002C */ sw $a0, 0x2c($a1) +/* A2D4B0 80243270 ACC20000 */ sw $v0, ($a2) +/* A2D4B4 80243274 ACA70030 */ sw $a3, 0x30($a1) +/* A2D4B8 80243278 08090CA6 */ j .L80243298 +/* A2D4BC 8024327C ACA00034 */ sw $zero, 0x34($a1) +.L80243280: +/* A2D4C0 80243280 3C03E300 */ lui $v1, 0xe300 +/* A2D4C4 80243284 34631001 */ ori $v1, $v1, 0x1001 +/* A2D4C8 80243288 24A20010 */ addiu $v0, $a1, 0x10 +/* A2D4CC 8024328C ACC20000 */ sw $v0, ($a2) +/* A2D4D0 80243290 ACA30008 */ sw $v1, 8($a1) +/* A2D4D4 80243294 ACA0000C */ sw $zero, 0xc($a1) +.L80243298: +/* A2D4D8 80243298 24040001 */ addiu $a0, $zero, 1 +/* A2D4DC 8024329C 27B00010 */ addiu $s0, $sp, 0x10 +/* A2D4E0 802432A0 0200282D */ daddu $a1, $s0, $zero +/* A2D4E4 802432A4 0C04DF70 */ jal func_80137DC0 +/* A2D4E8 802432A8 27A60014 */ addiu $a2, $sp, 0x14 +/* A2D4EC 802432AC 0000202D */ daddu $a0, $zero, $zero +/* A2D4F0 802432B0 0200282D */ daddu $a1, $s0, $zero +/* A2D4F4 802432B4 0C04DF70 */ jal func_80137DC0 +/* A2D4F8 802432B8 27A60018 */ addiu $a2, $sp, 0x18 +/* A2D4FC 802432BC C7A20014 */ lwc1 $f2, 0x14($sp) +/* A2D500 802432C0 3C01437F */ lui $at, 0x437f +/* A2D504 802432C4 44812000 */ mtc1 $at, $f4 +/* A2D508 802432C8 00000000 */ nop +/* A2D50C 802432CC 46022081 */ sub.s $f2, $f4, $f2 +/* A2D510 802432D0 44910000 */ mtc1 $s1, $f0 +/* A2D514 802432D4 00000000 */ nop +/* A2D518 802432D8 46800020 */ cvt.s.w $f0, $f0 +/* A2D51C 802432DC 46020002 */ mul.s $f0, $f0, $f2 +/* 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 +/* 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 +/* 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, 0x800a +/* A2D560 80243320 2484A66C */ addiu $a0, $a0, -0x5994 +/* A2D564 80243324 8C820000 */ lw $v0, ($a0) +/* A2D568 80243328 34A5FE7F */ ori $a1, $a1, 0xfe7f +/* A2D56C 8024332C 0040182D */ daddu $v1, $v0, $zero +/* A2D570 80243330 24420008 */ addiu $v0, $v0, 8 +/* A2D574 80243334 AC820000 */ sw $v0, ($a0) +/* A2D578 80243338 AC660000 */ sw $a2, ($v1) +/* A2D57C 8024333C AC650004 */ sw $a1, 4($v1) +/* A2D580 80243340 24430008 */ addiu $v1, $v0, 8 +/* A2D584 80243344 AC830000 */ sw $v1, ($a0) +/* A2D588 80243348 3C03FA00 */ lui $v1, 0xfa00 +/* A2D58C 8024334C AC430000 */ sw $v1, ($v0) +/* A2D590 80243350 322300FF */ andi $v1, $s1, 0xff +/* A2D594 80243354 08090CE2 */ j .L80243388 +/* A2D598 80243358 AC430004 */ sw $v1, 4($v0) +.L8024335C: +/* A2D59C 8024335C 34C6FFFF */ ori $a2, $a2, 0xffff +/* A2D5A0 80243360 3C05FFFC */ lui $a1, 0xfffc +/* A2D5A4 80243364 3C04800A */ lui $a0, 0x800a +/* A2D5A8 80243368 2484A66C */ addiu $a0, $a0, -0x5994 +/* A2D5AC 8024336C 8C820000 */ lw $v0, ($a0) +/* A2D5B0 80243370 34A5F279 */ ori $a1, $a1, 0xf279 +/* A2D5B4 80243374 0040182D */ daddu $v1, $v0, $zero +/* A2D5B8 80243378 24420008 */ addiu $v0, $v0, 8 +/* A2D5BC 8024337C AC820000 */ sw $v0, ($a0) +/* A2D5C0 80243380 AC660000 */ sw $a2, ($v1) +/* A2D5C4 80243384 AC650004 */ sw $a1, 4($v1) +.L80243388: +/* A2D5C8 80243388 16400002 */ bnez $s2, .L80243394 +/* A2D5CC 8024338C 02B2001A */ div $zero, $s5, $s2 +/* A2D5D0 80243390 0007000D */ break 7 +.L80243394: +/* A2D5D4 80243394 2401FFFF */ addiu $at, $zero, -1 +/* A2D5D8 80243398 16410004 */ bne $s2, $at, .L802433AC +/* A2D5DC 8024339C 3C018000 */ lui $at, 0x8000 +/* A2D5E0 802433A0 16A10002 */ bne $s5, $at, .L802433AC +/* A2D5E4 802433A4 00000000 */ nop +/* A2D5E8 802433A8 0006000D */ break 6 +.L802433AC: +/* A2D5EC 802433AC 00004812 */ mflo $t1 +/* A2D5F0 802433B0 3C050050 */ lui $a1, 0x50 +/* A2D5F4 802433B4 34A503C0 */ ori $a1, $a1, 0x3c0 +/* A2D5F8 802433B8 3C07E200 */ lui $a3, 0xe200 +/* 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, 0x800a +/* A2D60C 802433CC 2508A66C */ addiu $t0, $t0, -0x5994 +/* A2D610 802433D0 0000582D */ daddu $t3, $zero, $zero +/* A2D614 802433D4 8D020000 */ lw $v0, ($t0) +/* A2D618 802433D8 3C03ED00 */ lui $v1, 0xed00 +/* A2D61C 802433DC 0040202D */ daddu $a0, $v0, $zero +/* A2D620 802433E0 24420008 */ addiu $v0, $v0, 8 +/* A2D624 802433E4 AD020000 */ sw $v0, ($t0) +/* A2D628 802433E8 AC830000 */ sw $v1, ($a0) +/* A2D62C 802433EC 24430008 */ addiu $v1, $v0, 8 +/* A2D630 802433F0 AC850004 */ sw $a1, 4($a0) +/* A2D634 802433F4 AD030000 */ sw $v1, ($t0) +/* A2D638 802433F8 AC470000 */ sw $a3, ($v0) +/* A2D63C 802433FC 192000AE */ blez $t1, .L802436B8 +/* A2D640 80243400 AC460004 */ sw $a2, 4($v0) +/* A2D644 80243404 0100302D */ daddu $a2, $t0, $zero +/* A2D648 80243408 2684FFFF */ addiu $a0, $s4, -1 +/* A2D64C 8024340C 30830FFF */ andi $v1, $a0, 0xfff +/* A2D650 80243410 3C02FD48 */ lui $v0, 0xfd48 +/* A2D654 80243414 0062B825 */ or $s7, $v1, $v0 +/* A2D658 80243418 3C02FD68 */ lui $v0, 0xfd68 +/* A2D65C 8024341C 00621825 */ or $v1, $v1, $v0 +/* A2D660 80243420 26820007 */ addiu $v0, $s4, 7 +/* A2D664 80243424 000210C3 */ sra $v0, $v0, 3 +/* A2D668 80243428 304201FF */ andi $v0, $v0, 0x1ff +/* A2D66C 8024342C 00021240 */ sll $v0, $v0, 9 +/* A2D670 80243430 AFA30020 */ sw $v1, 0x20($sp) +/* A2D674 80243434 3C03F548 */ lui $v1, 0xf548 +/* A2D678 80243438 00437825 */ or $t7, $v0, $v1 +/* A2D67C 8024343C 3C03F568 */ lui $v1, 0xf568 +/* A2D680 80243440 00437025 */ or $t6, $v0, $v1 +/* A2D684 80243444 3C110700 */ lui $s1, 0x700 +/* A2D688 80243448 00042080 */ sll $a0, $a0, 2 +/* A2D68C 8024344C 30840FFF */ andi $a0, $a0, 0xfff +/* A2D690 80243450 00046B00 */ sll $t5, $a0, 0xc +/* A2D694 80243454 03D41021 */ addu $v0, $fp, $s4 +/* A2D698 80243458 00021480 */ sll $v0, $v0, 0x12 +/* A2D69C 8024345C 00028403 */ sra $s0, $v0, 0x10 +/* A2D6A0 80243460 32020FFF */ andi $v0, $s0, 0xfff +/* A2D6A4 80243464 0002CB00 */ sll $t9, $v0, 0xc +/* A2D6A8 80243468 001E1480 */ sll $v0, $fp, 0x12 +/* A2D6AC 8024346C 00026403 */ sra $t4, $v0, 0x10 +/* A2D6B0 80243470 31980FFF */ andi $t8, $t4, 0xfff +/* A2D6B4 80243474 000CA280 */ sll $s4, $t4, 0xa +/* A2D6B8 80243478 0160402D */ daddu $t0, $t3, $zero +/* A2D6BC 8024347C 0240502D */ daddu $t2, $s2, $zero +/* A2D6C0 80243480 8FA70054 */ lw $a3, 0x54($sp) +.L80243484: +/* A2D6C4 80243484 8CC30000 */ lw $v1, ($a2) +/* A2D6C8 80243488 24620008 */ addiu $v0, $v1, 8 +/* A2D6CC 8024348C 12600003 */ beqz $s3, .L8024349C +/* A2D6D0 80243490 ACC20000 */ sw $v0, ($a2) +/* A2D6D4 80243494 08090D29 */ j .L802434A4 +/* A2D6D8 80243498 AC770000 */ sw $s7, ($v1) +.L8024349C: +/* A2D6DC 8024349C 8FB60020 */ lw $s6, 0x20($sp) +/* A2D6E0 802434A0 AC760000 */ sw $s6, ($v1) +.L802434A4: +/* A2D6E4 802434A4 8CC50000 */ lw $a1, ($a2) +/* A2D6E8 802434A8 8FB60058 */ lw $s6, 0x58($sp) +/* A2D6EC 802434AC 24A20008 */ addiu $v0, $a1, 8 +/* A2D6F0 802434B0 AC760004 */ sw $s6, 4($v1) +/* A2D6F4 802434B4 12600003 */ beqz $s3, .L802434C4 +/* A2D6F8 802434B8 ACC20000 */ sw $v0, ($a2) +/* A2D6FC 802434BC 08090D32 */ j .L802434C8 +/* A2D700 802434C0 ACAF0000 */ sw $t7, ($a1) +.L802434C4: +/* A2D704 802434C4 ACAE0000 */ sw $t6, ($a1) +.L802434C8: +/* A2D708 802434C8 8CC40000 */ lw $a0, ($a2) +/* A2D70C 802434CC 3C02E600 */ lui $v0, 0xe600 +/* A2D710 802434D0 ACB10004 */ sw $s1, 4($a1) +/* A2D714 802434D4 0080182D */ daddu $v1, $a0, $zero +/* A2D718 802434D8 24840008 */ addiu $a0, $a0, 8 +/* A2D71C 802434DC ACC40000 */ sw $a0, ($a2) +/* A2D720 802434E0 AC620000 */ sw $v0, ($v1) +/* A2D724 802434E4 24820008 */ addiu $v0, $a0, 8 +/* A2D728 802434E8 AC600004 */ sw $zero, 4($v1) +/* A2D72C 802434EC ACC20000 */ sw $v0, ($a2) +/* A2D730 802434F0 00081080 */ sll $v0, $t0, 2 +/* A2D734 802434F4 30420FFF */ andi $v0, $v0, 0xfff +/* A2D738 802434F8 3C03F400 */ lui $v1, 0xf400 +/* A2D73C 802434FC 00431025 */ or $v0, $v0, $v1 +/* A2D740 80243500 AC820000 */ sw $v0, ($a0) +/* A2D744 80243504 2542FFFF */ addiu $v0, $t2, -1 +/* A2D748 80243508 00021080 */ sll $v0, $v0, 2 +/* A2D74C 8024350C 30420FFF */ andi $v0, $v0, 0xfff +/* A2D750 80243510 00511025 */ or $v0, $v0, $s1 +/* A2D754 80243514 01A21025 */ or $v0, $t5, $v0 +/* A2D758 80243518 24830010 */ addiu $v1, $a0, 0x10 +/* A2D75C 8024351C AC820004 */ sw $v0, 4($a0) +/* A2D760 80243520 3C02E700 */ lui $v0, 0xe700 +/* A2D764 80243524 ACC30000 */ sw $v1, ($a2) +/* A2D768 80243528 AC820008 */ sw $v0, 8($a0) +/* A2D76C 8024352C 24820018 */ addiu $v0, $a0, 0x18 +/* A2D770 80243530 AC80000C */ sw $zero, 0xc($a0) +/* A2D774 80243534 12600003 */ beqz $s3, .L80243544 +/* A2D778 80243538 ACC20000 */ sw $v0, ($a2) +/* A2D77C 8024353C 08090D52 */ j .L80243548 +/* A2D780 80243540 AC8F0010 */ sw $t7, 0x10($a0) +.L80243544: +/* A2D784 80243544 AC8E0010 */ sw $t6, 0x10($a0) +.L80243548: +/* A2D788 80243548 00081080 */ sll $v0, $t0, 2 +/* A2D78C 8024354C 8CC40000 */ lw $a0, ($a2) +/* A2D790 80243550 30420FFF */ andi $v0, $v0, 0xfff +/* A2D794 80243554 AC600004 */ sw $zero, 4($v1) +/* A2D798 80243558 3C03F200 */ lui $v1, 0xf200 +/* A2D79C 8024355C 00431025 */ or $v0, $v0, $v1 +/* A2D7A0 80243560 0080282D */ daddu $a1, $a0, $zero +/* A2D7A4 80243564 24840008 */ addiu $a0, $a0, 8 +/* A2D7A8 80243568 ACC40000 */ sw $a0, ($a2) +/* A2D7AC 8024356C ACA20000 */ sw $v0, ($a1) +/* A2D7B0 80243570 2542FFFF */ addiu $v0, $t2, -1 +/* A2D7B4 80243574 00021080 */ sll $v0, $v0, 2 +/* A2D7B8 80243578 30420FFF */ andi $v0, $v0, 0xfff +/* A2D7BC 8024357C 01A21025 */ or $v0, $t5, $v0 +/* A2D7C0 80243580 ACA20004 */ sw $v0, 4($a1) +/* A2D7C4 80243584 24820008 */ addiu $v0, $a0, 8 +/* A2D7C8 80243588 1A000004 */ blez $s0, .L8024359C +/* A2D7CC 8024358C ACC20000 */ sw $v0, ($a2) +/* A2D7D0 80243590 3C02E400 */ lui $v0, 0xe400 +/* A2D7D4 80243594 08090D68 */ j .L802435A0 +/* A2D7D8 80243598 03221825 */ or $v1, $t9, $v0 +.L8024359C: +/* A2D7DC 8024359C 3C03E400 */ lui $v1, 0xe400 +.L802435A0: +/* A2D7E0 802435A0 00F21021 */ addu $v0, $a3, $s2 +/* A2D7E4 802435A4 00021480 */ sll $v0, $v0, 0x12 +/* A2D7E8 802435A8 00021403 */ sra $v0, $v0, 0x10 +/* A2D7EC 802435AC 18400004 */ blez $v0, .L802435C0 +/* A2D7F0 802435B0 AC830000 */ sw $v1, ($a0) +/* A2D7F4 802435B4 30420FFF */ andi $v0, $v0, 0xfff +/* A2D7F8 802435B8 00621025 */ or $v0, $v1, $v0 +/* A2D7FC 802435BC AC820000 */ sw $v0, ($a0) +.L802435C0: +/* A2D800 802435C0 19800002 */ blez $t4, .L802435CC +/* A2D804 802435C4 0000182D */ daddu $v1, $zero, $zero +/* A2D808 802435C8 00181B00 */ sll $v1, $t8, 0xc +.L802435CC: +/* A2D80C 802435CC 00071480 */ sll $v0, $a3, 0x12 +/* A2D810 802435D0 00021403 */ sra $v0, $v0, 0x10 +/* A2D814 802435D4 18400004 */ blez $v0, .L802435E8 +/* A2D818 802435D8 AC830004 */ sw $v1, 4($a0) +/* A2D81C 802435DC 30420FFF */ andi $v0, $v0, 0xfff +/* A2D820 802435E0 00621025 */ or $v0, $v1, $v0 +/* A2D824 802435E4 AC820004 */ sw $v0, 4($a0) +.L802435E8: +/* A2D828 802435E8 8CC20000 */ lw $v0, ($a2) +/* A2D82C 802435EC 00082940 */ sll $a1, $t0, 5 +/* A2D830 802435F0 0040182D */ daddu $v1, $v0, $zero +/* A2D834 802435F4 24420008 */ addiu $v0, $v0, 8 +/* A2D838 802435F8 ACC20000 */ sw $v0, ($a2) +/* A2D83C 802435FC 3C02E100 */ lui $v0, 0xe100 +/* A2D840 80243600 AC620000 */ sw $v0, ($v1) +/* A2D844 80243604 05810007 */ bgez $t4, .L80243624 +/* A2D848 80243608 24630004 */ addiu $v1, $v1, 4 +/* A2D84C 8024360C 001411C3 */ sra $v0, $s4, 7 +/* A2D850 80243610 5C400001 */ bgtzl $v0, .L80243618 +/* A2D854 80243614 0000102D */ daddu $v0, $zero, $zero +.L80243618: +/* A2D858 80243618 00021023 */ negu $v0, $v0 +/* A2D85C 8024361C 08090D8A */ j .L80243628 +/* A2D860 80243620 00022400 */ sll $a0, $v0, 0x10 +.L80243624: +/* A2D864 80243624 0000202D */ daddu $a0, $zero, $zero +.L80243628: +/* A2D868 80243628 00071080 */ sll $v0, $a3, 2 +/* A2D86C 8024362C 04410007 */ bgez $v0, .L8024364C +/* A2D870 80243630 30A2FFFF */ andi $v0, $a1, 0xffff +/* A2D874 80243634 00071480 */ sll $v0, $a3, 0x12 +/* A2D878 80243638 00021343 */ sra $v0, $v0, 0xd +/* A2D87C 8024363C 5C400001 */ bgtzl $v0, .L80243644 +/* A2D880 80243640 0000102D */ daddu $v0, $zero, $zero +.L80243644: +/* A2D884 80243644 00A21023 */ subu $v0, $a1, $v0 +/* A2D888 80243648 3042FFFF */ andi $v0, $v0, 0xffff +.L8024364C: +/* A2D88C 8024364C 00821025 */ or $v0, $a0, $v0 +/* A2D890 80243650 AC620000 */ sw $v0, ($v1) +/* A2D894 80243654 16400002 */ bnez $s2, .L80243660 +/* A2D898 80243658 02B2001A */ div $zero, $s5, $s2 +/* A2D89C 8024365C 0007000D */ break 7 +.L80243660: +/* A2D8A0 80243660 2401FFFF */ addiu $at, $zero, -1 +/* A2D8A4 80243664 16410004 */ bne $s2, $at, .L80243678 +/* A2D8A8 80243668 3C018000 */ lui $at, 0x8000 +/* A2D8AC 8024366C 16A10002 */ bne $s5, $at, .L80243678 +/* A2D8B0 80243670 00000000 */ nop +/* A2D8B4 80243674 0006000D */ break 6 +.L80243678: +/* A2D8B8 80243678 00004812 */ mflo $t1 +/* A2D8BC 8024367C 3C040400 */ lui $a0, 0x400 +/* A2D8C0 80243680 34840400 */ ori $a0, $a0, 0x400 +/* A2D8C4 80243684 00F23821 */ addu $a3, $a3, $s2 +/* A2D8C8 80243688 01124021 */ addu $t0, $t0, $s2 +/* A2D8CC 8024368C 01525021 */ addu $t2, $t2, $s2 +/* A2D8D0 80243690 8CC20000 */ lw $v0, ($a2) +/* A2D8D4 80243694 256B0001 */ addiu $t3, $t3, 1 +/* A2D8D8 80243698 0040182D */ daddu $v1, $v0, $zero +/* A2D8DC 8024369C 24420008 */ addiu $v0, $v0, 8 +/* A2D8E0 802436A0 ACC20000 */ sw $v0, ($a2) +/* A2D8E4 802436A4 3C02F100 */ lui $v0, 0xf100 +/* A2D8E8 802436A8 AC620000 */ sw $v0, ($v1) +/* A2D8EC 802436AC 0169102A */ slt $v0, $t3, $t1 +/* A2D8F0 802436B0 1440FF74 */ bnez $v0, .L80243484 +/* A2D8F4 802436B4 AC640004 */ sw $a0, 4($v1) +.L802436B8: +/* A2D8F8 802436B8 3C03800A */ lui $v1, 0x800a +/* A2D8FC 802436BC 2463A66C */ addiu $v1, $v1, -0x5994 +/* A2D900 802436C0 8C620000 */ lw $v0, ($v1) +/* A2D904 802436C4 0040202D */ daddu $a0, $v0, $zero +/* A2D908 802436C8 24420008 */ addiu $v0, $v0, 8 +/* A2D90C 802436CC AC620000 */ sw $v0, ($v1) +/* A2D910 802436D0 3C02E700 */ lui $v0, 0xe700 +/* A2D914 802436D4 AC820000 */ sw $v0, ($a0) +/* A2D918 802436D8 AC800004 */ sw $zero, 4($a0) +.L802436DC: +/* A2D91C 802436DC 8FBF004C */ lw $ra, 0x4c($sp) +/* A2D920 802436E0 8FBE0048 */ lw $fp, 0x48($sp) +/* A2D924 802436E4 8FB70044 */ lw $s7, 0x44($sp) +/* A2D928 802436E8 8FB60040 */ lw $s6, 0x40($sp) +/* A2D92C 802436EC 8FB5003C */ lw $s5, 0x3c($sp) +/* A2D930 802436F0 8FB40038 */ lw $s4, 0x38($sp) +/* A2D934 802436F4 8FB30034 */ lw $s3, 0x34($sp) +/* A2D938 802436F8 8FB20030 */ lw $s2, 0x30($sp) +/* A2D93C 802436FC 8FB1002C */ lw $s1, 0x2c($sp) +/* A2D940 80243700 8FB00028 */ lw $s0, 0x28($sp) +/* A2D944 80243704 03E00008 */ jr $ra +/* A2D948 80243708 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C.s deleted file mode 100644 index a8ba1139b6..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024370C -/* A2D94C 8024370C 3C038025 */ lui $v1, 0x8025 -/* A2D950 80243710 8C63AA20 */ lw $v1, -0x55e0($v1) -/* A2D954 80243714 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A2D958 80243718 AFBF0020 */ sw $ra, 0x20($sp) -/* A2D95C 8024371C 84640048 */ lh $a0, 0x48($v1) -/* A2D960 80243720 8465004A */ lh $a1, 0x4a($v1) -/* A2D964 80243724 8466005C */ lh $a2, 0x5c($v1) -/* A2D968 80243728 24020080 */ addiu $v0, $zero, 0x80 -/* A2D96C 8024372C AFA20014 */ sw $v0, 0x14($sp) -/* A2D970 80243730 AFA20018 */ sw $v0, 0x18($sp) -/* A2D974 80243734 24020020 */ addiu $v0, $zero, 0x20 -/* A2D978 80243738 AFA2001C */ sw $v0, 0x1c($sp) -/* A2D97C 8024373C AFA60010 */ sw $a2, 0x10($sp) -/* A2D980 80243740 8C660018 */ lw $a2, 0x18($v1) -/* A2D984 80243744 0C090C59 */ jal func_80243164 -/* A2D988 80243748 0000382D */ daddu $a3, $zero, $zero -/* A2D98C 8024374C 8FBF0020 */ lw $ra, 0x20($sp) -/* A2D990 80243750 03E00008 */ jr $ra -/* A2D994 80243754 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s new file mode 100644 index 0000000000..a63774cd66 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024370C_A2D94C.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024370C_A2D94C +/* A2D94C 8024370C 3C038025 */ lui $v1, 0x8025 +/* A2D950 80243710 8C63AA20 */ lw $v1, -0x55e0($v1) +/* A2D954 80243714 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A2D958 80243718 AFBF0020 */ sw $ra, 0x20($sp) +/* A2D95C 8024371C 84640048 */ lh $a0, 0x48($v1) +/* A2D960 80243720 8465004A */ lh $a1, 0x4a($v1) +/* A2D964 80243724 8466005C */ lh $a2, 0x5c($v1) +/* A2D968 80243728 24020080 */ addiu $v0, $zero, 0x80 +/* A2D96C 8024372C AFA20014 */ sw $v0, 0x14($sp) +/* A2D970 80243730 AFA20018 */ sw $v0, 0x18($sp) +/* A2D974 80243734 24020020 */ addiu $v0, $zero, 0x20 +/* A2D978 80243738 AFA2001C */ sw $v0, 0x1c($sp) +/* A2D97C 8024373C AFA60010 */ sw $a2, 0x10($sp) +/* A2D980 80243740 8C660018 */ lw $a2, 0x18($v1) +/* A2D984 80243744 0C090C59 */ jal func_80243164_A2D3A4 +/* A2D988 80243748 0000382D */ daddu $a3, $zero, $zero +/* A2D98C 8024374C 8FBF0020 */ lw $ra, 0x20($sp) +/* A2D990 80243750 03E00008 */ jr $ra +/* A2D994 80243754 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758.s deleted file mode 100644 index 38334dc872..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758.s +++ /dev/null @@ -1,373 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243758 -/* A2D998 80243758 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2D99C 8024375C 0080C82D */ daddu $t9, $a0, $zero -/* A2D9A0 80243760 AFB40010 */ sw $s4, 0x10($sp) -/* A2D9A4 80243764 00A0A02D */ daddu $s4, $a1, $zero -/* A2D9A8 80243768 AFB00000 */ sw $s0, ($sp) -/* A2D9AC 8024376C 00C0802D */ daddu $s0, $a2, $zero -/* A2D9B0 80243770 AFB50014 */ sw $s5, 0x14($sp) -/* A2D9B4 80243774 24150001 */ addiu $s5, $zero, 1 -/* A2D9B8 80243778 3C05F500 */ lui $a1, 0xf500 -/* A2D9BC 8024377C 34A50100 */ ori $a1, $a1, 0x100 -/* 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, 0x800a -/* A2D9D0 80243790 2442A66C */ addiu $v0, $v0, -0x5994 -/* A2D9D4 80243794 0040402D */ daddu $t0, $v0, $zero -/* A2D9D8 80243798 3C0FF548 */ lui $t7, 0xf548 -/* A2D9DC 8024379C 35EF4200 */ ori $t7, $t7, 0x4200 -/* A2D9E0 802437A0 27220108 */ addiu $v0, $t9, 0x108 -/* A2D9E4 802437A4 00021480 */ sll $v0, $v0, 0x12 -/* A2D9E8 802437A8 0002C403 */ sra $t8, $v0, 0x10 -/* A2D9EC 802437AC 33020FFF */ andi $v0, $t8, 0xfff -/* A2D9F0 802437B0 AFB3000C */ sw $s3, 0xc($sp) -/* A2D9F4 802437B4 00029B00 */ sll $s3, $v0, 0xc -/* A2D9F8 802437B8 00191480 */ sll $v0, $t9, 0x12 -/* A2D9FC 802437BC 00027403 */ sra $t6, $v0, 0x10 -/* A2DA00 802437C0 AFB20008 */ sw $s2, 8($sp) -/* A2DA04 802437C4 31D20FFF */ andi $s2, $t6, 0xfff -/* A2DA08 802437C8 AFB10004 */ sw $s1, 4($sp) -/* A2DA0C 802437CC 000E8A80 */ sll $s1, $t6, 0xa -/* A2DA10 802437D0 0280482D */ daddu $t1, $s4, $zero -/* A2DA14 802437D4 0140682D */ daddu $t5, $t2, $zero -/* A2DA18 802437D8 240C0018 */ addiu $t4, $zero, 0x18 -/* A2DA1C 802437DC 0140582D */ daddu $t3, $t2, $zero -/* A2DA20 802437E0 8D020000 */ lw $v0, ($t0) -/* A2DA24 802437E4 3C04E700 */ lui $a0, 0xe700 -/* A2DA28 802437E8 0040182D */ daddu $v1, $v0, $zero -/* A2DA2C 802437EC 24420008 */ addiu $v0, $v0, 8 -/* A2DA30 802437F0 AD020000 */ sw $v0, ($t0) -/* A2DA34 802437F4 AC640000 */ sw $a0, ($v1) -/* A2DA38 802437F8 AC600004 */ sw $zero, 4($v1) -/* A2DA3C 802437FC 24430008 */ addiu $v1, $v0, 8 -/* A2DA40 80243800 AD030000 */ sw $v1, ($t0) -/* A2DA44 80243804 3C03FD10 */ lui $v1, 0xfd10 -/* A2DA48 80243808 AC430000 */ sw $v1, ($v0) -/* A2DA4C 8024380C 24430010 */ addiu $v1, $v0, 0x10 -/* A2DA50 80243810 AC470004 */ sw $a3, 4($v0) -/* A2DA54 80243814 AD030000 */ sw $v1, ($t0) -/* A2DA58 80243818 3C03E800 */ lui $v1, 0xe800 -/* A2DA5C 8024381C AC430008 */ sw $v1, 8($v0) -/* A2DA60 80243820 004C1821 */ addu $v1, $v0, $t4 -/* A2DA64 80243824 AC40000C */ sw $zero, 0xc($v0) -/* A2DA68 80243828 AD030000 */ sw $v1, ($t0) -/* A2DA6C 8024382C 3C030700 */ lui $v1, 0x700 -/* A2DA70 80243830 AC430014 */ sw $v1, 0x14($v0) -/* A2DA74 80243834 24430020 */ addiu $v1, $v0, 0x20 -/* A2DA78 80243838 AC450010 */ sw $a1, 0x10($v0) -/* A2DA7C 8024383C AD030000 */ sw $v1, ($t0) -/* A2DA80 80243840 3C03E600 */ lui $v1, 0xe600 -/* A2DA84 80243844 AC430018 */ sw $v1, 0x18($v0) -/* A2DA88 80243848 24430028 */ addiu $v1, $v0, 0x28 -/* A2DA8C 8024384C AC40001C */ sw $zero, 0x1c($v0) -/* A2DA90 80243850 AD030000 */ sw $v1, ($t0) -/* A2DA94 80243854 3C03F000 */ lui $v1, 0xf000 -/* A2DA98 80243858 AC430020 */ sw $v1, 0x20($v0) -/* A2DA9C 8024385C 24430030 */ addiu $v1, $v0, 0x30 -/* A2DAA0 80243860 AC460024 */ sw $a2, 0x24($v0) -/* A2DAA4 80243864 AD030000 */ sw $v1, ($t0) -/* A2DAA8 80243868 AC440028 */ sw $a0, 0x28($v0) -/* A2DAAC 8024386C AC40002C */ sw $zero, 0x2c($v0) -.L80243870: -/* A2DAB0 80243870 3C04FD48 */ lui $a0, 0xfd48 -/* A2DAB4 80243874 34840107 */ ori $a0, $a0, 0x107 -/* A2DAB8 80243878 3C060741 */ lui $a2, 0x741 -/* A2DABC 8024387C 34C6C000 */ ori $a2, $a2, 0xc000 -/* A2DAC0 80243880 3C070041 */ lui $a3, 0x41 -/* A2DAC4 80243884 34E7C000 */ ori $a3, $a3, 0xc000 -/* A2DAC8 80243888 8D030000 */ lw $v1, ($t0) -/* A2DACC 8024388C 31650FFF */ andi $a1, $t3, 0xfff -/* A2DAD0 80243890 0060102D */ daddu $v0, $v1, $zero -/* A2DAD4 80243894 24630008 */ addiu $v1, $v1, 8 -/* A2DAD8 80243898 AD030000 */ sw $v1, ($t0) -/* A2DADC 8024389C AC440000 */ sw $a0, ($v0) -/* A2DAE0 802438A0 AC500004 */ sw $s0, 4($v0) -/* A2DAE4 802438A4 24620008 */ addiu $v0, $v1, 8 -/* A2DAE8 802438A8 AD020000 */ sw $v0, ($t0) -/* A2DAEC 802438AC 3C020700 */ lui $v0, 0x700 -/* A2DAF0 802438B0 AC620004 */ sw $v0, 4($v1) -/* A2DAF4 802438B4 24620010 */ addiu $v0, $v1, 0x10 -/* A2DAF8 802438B8 AC6F0000 */ sw $t7, ($v1) -/* A2DAFC 802438BC AD020000 */ sw $v0, ($t0) -/* A2DB00 802438C0 3C02E600 */ lui $v0, 0xe600 -/* A2DB04 802438C4 AC620008 */ sw $v0, 8($v1) -/* A2DB08 802438C8 24620018 */ addiu $v0, $v1, 0x18 -/* A2DB0C 802438CC AC60000C */ sw $zero, 0xc($v1) -/* A2DB10 802438D0 AD020000 */ sw $v0, ($t0) -/* A2DB14 802438D4 3C02F400 */ lui $v0, 0xf400 -/* A2DB18 802438D8 00A21025 */ or $v0, $a1, $v0 -/* A2DB1C 802438DC 31840FFF */ andi $a0, $t4, 0xfff -/* A2DB20 802438E0 00863025 */ or $a2, $a0, $a2 -/* A2DB24 802438E4 AC620010 */ sw $v0, 0x10($v1) -/* A2DB28 802438E8 24620020 */ addiu $v0, $v1, 0x20 -/* A2DB2C 802438EC AC660014 */ sw $a2, 0x14($v1) -/* A2DB30 802438F0 AD020000 */ sw $v0, ($t0) -/* A2DB34 802438F4 3C02E700 */ lui $v0, 0xe700 -/* A2DB38 802438F8 AC620018 */ sw $v0, 0x18($v1) -/* A2DB3C 802438FC 24620028 */ addiu $v0, $v1, 0x28 -/* A2DB40 80243900 24660030 */ addiu $a2, $v1, 0x30 -/* A2DB44 80243904 AC60001C */ sw $zero, 0x1c($v1) -/* A2DB48 80243908 AD020000 */ sw $v0, ($t0) -/* A2DB4C 8024390C 3C02F200 */ lui $v0, 0xf200 -/* A2DB50 80243910 00A22825 */ or $a1, $a1, $v0 -/* A2DB54 80243914 00872025 */ or $a0, $a0, $a3 -/* A2DB58 80243918 AC6F0020 */ sw $t7, 0x20($v1) -/* A2DB5C 8024391C AC600024 */ sw $zero, 0x24($v1) -/* A2DB60 80243920 AD060000 */ sw $a2, ($t0) -/* A2DB64 80243924 AC650028 */ sw $a1, 0x28($v1) -/* A2DB68 80243928 AC64002C */ sw $a0, 0x2c($v1) -/* A2DB6C 8024392C 24630038 */ addiu $v1, $v1, 0x38 -/* A2DB70 80243930 1B000004 */ blez $t8, .L80243944 -/* A2DB74 80243934 AD030000 */ sw $v1, ($t0) -/* A2DB78 80243938 3C02E400 */ lui $v0, 0xe400 -/* A2DB7C 8024393C 08090E52 */ j .L80243948 -/* A2DB80 80243940 02621825 */ or $v1, $s3, $v0 -.L80243944: -/* A2DB84 80243944 3C03E400 */ lui $v1, 0xe400 -.L80243948: -/* A2DB88 80243948 25220007 */ addiu $v0, $t1, 7 -/* A2DB8C 8024394C 00021480 */ sll $v0, $v0, 0x12 -/* A2DB90 80243950 00021403 */ sra $v0, $v0, 0x10 -/* A2DB94 80243954 18400004 */ blez $v0, .L80243968 -/* A2DB98 80243958 ACC30000 */ sw $v1, ($a2) -/* A2DB9C 8024395C 30420FFF */ andi $v0, $v0, 0xfff -/* A2DBA0 80243960 00621025 */ or $v0, $v1, $v0 -/* A2DBA4 80243964 ACC20000 */ sw $v0, ($a2) -.L80243968: -/* A2DBA8 80243968 19C00002 */ blez $t6, .L80243974 -/* A2DBAC 8024396C 0000182D */ daddu $v1, $zero, $zero -/* A2DBB0 80243970 00121B00 */ sll $v1, $s2, 0xc -.L80243974: -/* A2DBB4 80243974 00091480 */ sll $v0, $t1, 0x12 -/* A2DBB8 80243978 00021403 */ sra $v0, $v0, 0x10 -/* A2DBBC 8024397C 18400004 */ blez $v0, .L80243990 -/* A2DBC0 80243980 ACC30004 */ sw $v1, 4($a2) -/* A2DBC4 80243984 30420FFF */ andi $v0, $v0, 0xfff -/* A2DBC8 80243988 00621025 */ or $v0, $v1, $v0 -/* A2DBCC 8024398C ACC20004 */ sw $v0, 4($a2) -.L80243990: -/* A2DBD0 80243990 8D020000 */ lw $v0, ($t0) -/* A2DBD4 80243994 000D2940 */ sll $a1, $t5, 5 -/* A2DBD8 80243998 0040182D */ daddu $v1, $v0, $zero -/* A2DBDC 8024399C 24420008 */ addiu $v0, $v0, 8 -/* A2DBE0 802439A0 AD020000 */ sw $v0, ($t0) -/* A2DBE4 802439A4 3C02E100 */ lui $v0, 0xe100 -/* A2DBE8 802439A8 AC620000 */ sw $v0, ($v1) -/* A2DBEC 802439AC 05C10007 */ bgez $t6, .L802439CC -/* A2DBF0 802439B0 24630004 */ addiu $v1, $v1, 4 -/* A2DBF4 802439B4 001111C3 */ sra $v0, $s1, 7 -/* A2DBF8 802439B8 5C400001 */ bgtzl $v0, .L802439C0 -/* A2DBFC 802439BC 0000102D */ daddu $v0, $zero, $zero -.L802439C0: -/* A2DC00 802439C0 00021023 */ negu $v0, $v0 -/* A2DC04 802439C4 08090E74 */ j .L802439D0 -/* A2DC08 802439C8 00022400 */ sll $a0, $v0, 0x10 -.L802439CC: -/* A2DC0C 802439CC 0000202D */ daddu $a0, $zero, $zero -.L802439D0: -/* A2DC10 802439D0 00091080 */ sll $v0, $t1, 2 -/* A2DC14 802439D4 04410007 */ bgez $v0, .L802439F4 -/* A2DC18 802439D8 30A2FFFF */ andi $v0, $a1, 0xffff -/* A2DC1C 802439DC 00091480 */ sll $v0, $t1, 0x12 -/* A2DC20 802439E0 00021343 */ sra $v0, $v0, 0xd -/* A2DC24 802439E4 5C400001 */ bgtzl $v0, .L802439EC -/* A2DC28 802439E8 0000102D */ daddu $v0, $zero, $zero -.L802439EC: -/* A2DC2C 802439EC 00A21023 */ subu $v0, $a1, $v0 -/* A2DC30 802439F0 3042FFFF */ andi $v0, $v0, 0xffff -.L802439F4: -/* A2DC34 802439F4 00821025 */ or $v0, $a0, $v0 -/* A2DC38 802439F8 AC620000 */ sw $v0, ($v1) -/* A2DC3C 802439FC 3C040400 */ lui $a0, 0x400 -/* A2DC40 80243A00 34840400 */ ori $a0, $a0, 0x400 -/* A2DC44 80243A04 25290007 */ addiu $t1, $t1, 7 -/* A2DC48 80243A08 25AD0007 */ addiu $t5, $t5, 7 -/* A2DC4C 80243A0C 258C001C */ addiu $t4, $t4, 0x1c -/* A2DC50 80243A10 256B001C */ addiu $t3, $t3, 0x1c -/* A2DC54 80243A14 8D020000 */ lw $v0, ($t0) -/* A2DC58 80243A18 254A0001 */ addiu $t2, $t2, 1 -/* A2DC5C 80243A1C 0040182D */ daddu $v1, $v0, $zero -/* A2DC60 80243A20 24420008 */ addiu $v0, $v0, 8 -/* A2DC64 80243A24 AD020000 */ sw $v0, ($t0) -/* A2DC68 80243A28 3C02F100 */ lui $v0, 0xf100 -/* A2DC6C 80243A2C AC620000 */ sw $v0, ($v1) -/* A2DC70 80243A30 29420017 */ slti $v0, $t2, 0x17 -/* A2DC74 80243A34 1440FF8E */ bnez $v0, .L80243870 -/* A2DC78 80243A38 AC640004 */ sw $a0, 4($v1) -/* A2DC7C 80243A3C 12A0008F */ beqz $s5, .L80243C7C -/* A2DC80 80243A40 3C03FD48 */ lui $v1, 0xfd48 -/* A2DC84 80243A44 34630107 */ ori $v1, $v1, 0x107 -/* A2DC88 80243A48 3C08F548 */ lui $t0, 0xf548 -/* A2DC8C 80243A4C 35084200 */ ori $t0, $t0, 0x4200 -/* A2DC90 80243A50 3C070741 */ lui $a3, 0x741 -/* A2DC94 80243A54 34E7C000 */ ori $a3, $a3, 0xc000 -/* A2DC98 80243A58 3C090041 */ lui $t1, 0x41 -/* A2DC9C 80243A5C 3C05800A */ lui $a1, 0x800a -/* A2DCA0 80243A60 24A5A66C */ addiu $a1, $a1, -0x5994 -/* A2DCA4 80243A64 8CA40000 */ lw $a0, ($a1) -/* A2DCA8 80243A68 3529C000 */ ori $t1, $t1, 0xc000 -/* A2DCAC 80243A6C 0080102D */ daddu $v0, $a0, $zero -/* A2DCB0 80243A70 24840008 */ addiu $a0, $a0, 8 -/* A2DCB4 80243A74 ACA40000 */ sw $a0, ($a1) -/* A2DCB8 80243A78 AC430000 */ sw $v1, ($v0) -/* A2DCBC 80243A7C AC500004 */ sw $s0, 4($v0) -/* A2DCC0 80243A80 24820008 */ addiu $v0, $a0, 8 -/* A2DCC4 80243A84 ACA20000 */ sw $v0, ($a1) -/* A2DCC8 80243A88 3C020700 */ lui $v0, 0x700 -/* A2DCCC 80243A8C AC820004 */ sw $v0, 4($a0) -/* A2DCD0 80243A90 24820010 */ addiu $v0, $a0, 0x10 -/* A2DCD4 80243A94 AC880000 */ sw $t0, ($a0) -/* A2DCD8 80243A98 ACA20000 */ sw $v0, ($a1) -/* A2DCDC 80243A9C 3C02E600 */ lui $v0, 0xe600 -/* A2DCE0 80243AA0 AC820008 */ sw $v0, 8($a0) -/* A2DCE4 80243AA4 24820018 */ addiu $v0, $a0, 0x18 -/* A2DCE8 80243AA8 000A18C0 */ sll $v1, $t2, 3 -/* A2DCEC 80243AAC 006A1823 */ subu $v1, $v1, $t2 -/* A2DCF0 80243AB0 00033080 */ sll $a2, $v1, 2 -/* A2DCF4 80243AB4 30C60FFF */ andi $a2, $a2, 0xfff -/* A2DCF8 80243AB8 AC80000C */ sw $zero, 0xc($a0) -/* A2DCFC 80243ABC ACA20000 */ sw $v0, ($a1) -/* A2DD00 80243AC0 3C02F400 */ lui $v0, 0xf400 -/* A2DD04 80243AC4 00C21025 */ or $v0, $a2, $v0 -/* A2DD08 80243AC8 00751821 */ addu $v1, $v1, $s5 -/* A2DD0C 80243ACC 2463FFFF */ addiu $v1, $v1, -1 -/* A2DD10 80243AD0 00031880 */ sll $v1, $v1, 2 -/* A2DD14 80243AD4 30630FFF */ andi $v1, $v1, 0xfff -/* A2DD18 80243AD8 00673825 */ or $a3, $v1, $a3 -/* A2DD1C 80243ADC AC820010 */ sw $v0, 0x10($a0) -/* A2DD20 80243AE0 24820020 */ addiu $v0, $a0, 0x20 -/* A2DD24 80243AE4 AC870014 */ sw $a3, 0x14($a0) -/* A2DD28 80243AE8 ACA20000 */ sw $v0, ($a1) -/* A2DD2C 80243AEC 3C02E700 */ lui $v0, 0xe700 -/* A2DD30 80243AF0 AC820018 */ sw $v0, 0x18($a0) -/* A2DD34 80243AF4 24820028 */ addiu $v0, $a0, 0x28 -/* A2DD38 80243AF8 24870030 */ addiu $a3, $a0, 0x30 -/* A2DD3C 80243AFC AC80001C */ sw $zero, 0x1c($a0) -/* A2DD40 80243B00 ACA20000 */ sw $v0, ($a1) -/* A2DD44 80243B04 3C02F200 */ lui $v0, 0xf200 -/* A2DD48 80243B08 00C23025 */ or $a2, $a2, $v0 -/* A2DD4C 80243B0C 00691825 */ or $v1, $v1, $t1 -/* A2DD50 80243B10 AC880020 */ sw $t0, 0x20($a0) -/* A2DD54 80243B14 AC800024 */ sw $zero, 0x24($a0) -/* A2DD58 80243B18 ACA70000 */ sw $a3, ($a1) -/* A2DD5C 80243B1C AC860028 */ sw $a2, 0x28($a0) -/* A2DD60 80243B20 AC83002C */ sw $v1, 0x2c($a0) -/* A2DD64 80243B24 24840038 */ addiu $a0, $a0, 0x38 -/* A2DD68 80243B28 27220108 */ addiu $v0, $t9, 0x108 -/* A2DD6C 80243B2C 00021480 */ sll $v0, $v0, 0x12 -/* A2DD70 80243B30 00021403 */ sra $v0, $v0, 0x10 -/* A2DD74 80243B34 18400006 */ blez $v0, .L80243B50 -/* A2DD78 80243B38 ACA40000 */ sw $a0, ($a1) -/* A2DD7C 80243B3C 30420FFF */ andi $v0, $v0, 0xfff -/* A2DD80 80243B40 00021300 */ sll $v0, $v0, 0xc -/* A2DD84 80243B44 3C03E400 */ lui $v1, 0xe400 -/* A2DD88 80243B48 08090ED5 */ j .L80243B54 -/* A2DD8C 80243B4C 00431825 */ or $v1, $v0, $v1 -.L80243B50: -/* A2DD90 80243B50 3C03E400 */ lui $v1, 0xe400 -.L80243B54: -/* A2DD94 80243B54 000A10C0 */ sll $v0, $t2, 3 -/* A2DD98 80243B58 004A1023 */ subu $v0, $v0, $t2 -/* A2DD9C 80243B5C 02821021 */ addu $v0, $s4, $v0 -/* A2DDA0 80243B60 00551021 */ addu $v0, $v0, $s5 -/* A2DDA4 80243B64 00021480 */ sll $v0, $v0, 0x12 -/* A2DDA8 80243B68 00021403 */ sra $v0, $v0, 0x10 -/* A2DDAC 80243B6C 18400004 */ blez $v0, .L80243B80 -/* A2DDB0 80243B70 ACE30000 */ sw $v1, ($a3) -/* A2DDB4 80243B74 30420FFF */ andi $v0, $v0, 0xfff -/* A2DDB8 80243B78 00621025 */ or $v0, $v1, $v0 -/* A2DDBC 80243B7C ACE20000 */ sw $v0, ($a3) -.L80243B80: -/* A2DDC0 80243B80 00191480 */ sll $v0, $t9, 0x12 -/* A2DDC4 80243B84 00021403 */ sra $v0, $v0, 0x10 -/* A2DDC8 80243B88 18400004 */ blez $v0, .L80243B9C -/* A2DDCC 80243B8C 24E70004 */ addiu $a3, $a3, 4 -/* A2DDD0 80243B90 30420FFF */ andi $v0, $v0, 0xfff -/* A2DDD4 80243B94 08090EE8 */ j .L80243BA0 -/* A2DDD8 80243B98 00021B00 */ sll $v1, $v0, 0xc -.L80243B9C: -/* A2DDDC 80243B9C 0000182D */ daddu $v1, $zero, $zero -.L80243BA0: -/* A2DDE0 80243BA0 000A10C0 */ sll $v0, $t2, 3 -/* A2DDE4 80243BA4 004A2823 */ subu $a1, $v0, $t2 -/* A2DDE8 80243BA8 02851021 */ addu $v0, $s4, $a1 -/* A2DDEC 80243BAC 00021480 */ sll $v0, $v0, 0x12 -/* A2DDF0 80243BB0 00021403 */ sra $v0, $v0, 0x10 -/* A2DDF4 80243BB4 18400004 */ blez $v0, .L80243BC8 -/* A2DDF8 80243BB8 ACE30000 */ sw $v1, ($a3) -/* A2DDFC 80243BBC 30420FFF */ andi $v0, $v0, 0xfff -/* A2DE00 80243BC0 00621025 */ or $v0, $v1, $v0 -/* A2DE04 80243BC4 ACE20000 */ sw $v0, ($a3) -.L80243BC8: -/* A2DE08 80243BC8 3C03800A */ lui $v1, 0x800a -/* A2DE0C 80243BCC 2463A66C */ addiu $v1, $v1, -0x5994 -/* A2DE10 80243BD0 8C620000 */ lw $v0, ($v1) -/* A2DE14 80243BD4 00053140 */ sll $a2, $a1, 5 -/* A2DE18 80243BD8 0040202D */ daddu $a0, $v0, $zero -/* A2DE1C 80243BDC 24420008 */ addiu $v0, $v0, 8 -/* A2DE20 80243BE0 AC620000 */ sw $v0, ($v1) -/* A2DE24 80243BE4 3C02E100 */ lui $v0, 0xe100 -/* A2DE28 80243BE8 AC820000 */ sw $v0, ($a0) -/* A2DE2C 80243BEC 00191480 */ sll $v0, $t9, 0x12 -/* A2DE30 80243BF0 00021403 */ sra $v0, $v0, 0x10 -/* A2DE34 80243BF4 04410007 */ bgez $v0, .L80243C14 -/* A2DE38 80243BF8 24840004 */ addiu $a0, $a0, 4 -/* A2DE3C 80243BFC 000210C0 */ sll $v0, $v0, 3 -/* A2DE40 80243C00 5C400001 */ bgtzl $v0, .L80243C08 -/* A2DE44 80243C04 0000102D */ daddu $v0, $zero, $zero -.L80243C08: -/* A2DE48 80243C08 00021023 */ negu $v0, $v0 -/* A2DE4C 80243C0C 08090F06 */ j .L80243C18 -/* A2DE50 80243C10 00021C00 */ sll $v1, $v0, 0x10 -.L80243C14: -/* A2DE54 80243C14 0000182D */ daddu $v1, $zero, $zero -.L80243C18: -/* A2DE58 80243C18 000A10C0 */ sll $v0, $t2, 3 -/* A2DE5C 80243C1C 004A1023 */ subu $v0, $v0, $t2 -/* A2DE60 80243C20 02822821 */ addu $a1, $s4, $v0 -/* A2DE64 80243C24 00051080 */ sll $v0, $a1, 2 -/* A2DE68 80243C28 04410007 */ bgez $v0, .L80243C48 -/* A2DE6C 80243C2C 30C2FFFF */ andi $v0, $a2, 0xffff -/* A2DE70 80243C30 00051480 */ sll $v0, $a1, 0x12 -/* A2DE74 80243C34 00021343 */ sra $v0, $v0, 0xd -/* A2DE78 80243C38 5C400001 */ bgtzl $v0, .L80243C40 -/* A2DE7C 80243C3C 0000102D */ daddu $v0, $zero, $zero -.L80243C40: -/* A2DE80 80243C40 00C21023 */ subu $v0, $a2, $v0 -/* A2DE84 80243C44 3042FFFF */ andi $v0, $v0, 0xffff -.L80243C48: -/* A2DE88 80243C48 00621025 */ or $v0, $v1, $v0 -/* A2DE8C 80243C4C AC820000 */ sw $v0, ($a0) -/* A2DE90 80243C50 3C050400 */ lui $a1, 0x400 -/* A2DE94 80243C54 3C03800A */ lui $v1, 0x800a -/* A2DE98 80243C58 2463A66C */ addiu $v1, $v1, -0x5994 -/* A2DE9C 80243C5C 8C620000 */ lw $v0, ($v1) -/* A2DEA0 80243C60 34A50400 */ ori $a1, $a1, 0x400 -/* A2DEA4 80243C64 0040202D */ daddu $a0, $v0, $zero -/* A2DEA8 80243C68 24420008 */ addiu $v0, $v0, 8 -/* A2DEAC 80243C6C AC620000 */ sw $v0, ($v1) -/* A2DEB0 80243C70 3C02F100 */ lui $v0, 0xf100 -/* A2DEB4 80243C74 AC820000 */ sw $v0, ($a0) -/* A2DEB8 80243C78 AC850004 */ sw $a1, 4($a0) -.L80243C7C: -/* A2DEBC 80243C7C 3C03800A */ lui $v1, 0x800a -/* A2DEC0 80243C80 2463A66C */ addiu $v1, $v1, -0x5994 -/* A2DEC4 80243C84 8C620000 */ lw $v0, ($v1) -/* A2DEC8 80243C88 0040202D */ daddu $a0, $v0, $zero -/* A2DECC 80243C8C 24420008 */ addiu $v0, $v0, 8 -/* A2DED0 80243C90 AC620000 */ sw $v0, ($v1) -/* A2DED4 80243C94 3C02E700 */ lui $v0, 0xe700 -/* A2DED8 80243C98 AC820000 */ sw $v0, ($a0) -/* A2DEDC 80243C9C AC800004 */ sw $zero, 4($a0) -/* A2DEE0 80243CA0 8FB50014 */ lw $s5, 0x14($sp) -/* A2DEE4 80243CA4 8FB40010 */ lw $s4, 0x10($sp) -/* A2DEE8 80243CA8 8FB3000C */ lw $s3, 0xc($sp) -/* A2DEEC 80243CAC 8FB20008 */ lw $s2, 8($sp) -/* A2DEF0 80243CB0 8FB10004 */ lw $s1, 4($sp) -/* A2DEF4 80243CB4 8FB00000 */ lw $s0, ($sp) -/* A2DEF8 80243CB8 03E00008 */ jr $ra -/* A2DEFC 80243CBC 27BD0018 */ addiu $sp, $sp, 0x18 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 new file mode 100644 index 0000000000..9eef653fd5 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243758_A2D998.s @@ -0,0 +1,373 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243758_A2D998 +/* A2D998 80243758 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2D99C 8024375C 0080C82D */ daddu $t9, $a0, $zero +/* A2D9A0 80243760 AFB40010 */ sw $s4, 0x10($sp) +/* A2D9A4 80243764 00A0A02D */ daddu $s4, $a1, $zero +/* A2D9A8 80243768 AFB00000 */ sw $s0, ($sp) +/* A2D9AC 8024376C 00C0802D */ daddu $s0, $a2, $zero +/* A2D9B0 80243770 AFB50014 */ sw $s5, 0x14($sp) +/* A2D9B4 80243774 24150001 */ addiu $s5, $zero, 1 +/* A2D9B8 80243778 3C05F500 */ lui $a1, 0xf500 +/* A2D9BC 8024377C 34A50100 */ ori $a1, $a1, 0x100 +/* 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, 0x800a +/* A2D9D0 80243790 2442A66C */ addiu $v0, $v0, -0x5994 +/* A2D9D4 80243794 0040402D */ daddu $t0, $v0, $zero +/* A2D9D8 80243798 3C0FF548 */ lui $t7, 0xf548 +/* A2D9DC 8024379C 35EF4200 */ ori $t7, $t7, 0x4200 +/* A2D9E0 802437A0 27220108 */ addiu $v0, $t9, 0x108 +/* A2D9E4 802437A4 00021480 */ sll $v0, $v0, 0x12 +/* A2D9E8 802437A8 0002C403 */ sra $t8, $v0, 0x10 +/* A2D9EC 802437AC 33020FFF */ andi $v0, $t8, 0xfff +/* A2D9F0 802437B0 AFB3000C */ sw $s3, 0xc($sp) +/* A2D9F4 802437B4 00029B00 */ sll $s3, $v0, 0xc +/* A2D9F8 802437B8 00191480 */ sll $v0, $t9, 0x12 +/* A2D9FC 802437BC 00027403 */ sra $t6, $v0, 0x10 +/* A2DA00 802437C0 AFB20008 */ sw $s2, 8($sp) +/* A2DA04 802437C4 31D20FFF */ andi $s2, $t6, 0xfff +/* A2DA08 802437C8 AFB10004 */ sw $s1, 4($sp) +/* A2DA0C 802437CC 000E8A80 */ sll $s1, $t6, 0xa +/* A2DA10 802437D0 0280482D */ daddu $t1, $s4, $zero +/* A2DA14 802437D4 0140682D */ daddu $t5, $t2, $zero +/* A2DA18 802437D8 240C0018 */ addiu $t4, $zero, 0x18 +/* A2DA1C 802437DC 0140582D */ daddu $t3, $t2, $zero +/* A2DA20 802437E0 8D020000 */ lw $v0, ($t0) +/* A2DA24 802437E4 3C04E700 */ lui $a0, 0xe700 +/* A2DA28 802437E8 0040182D */ daddu $v1, $v0, $zero +/* A2DA2C 802437EC 24420008 */ addiu $v0, $v0, 8 +/* A2DA30 802437F0 AD020000 */ sw $v0, ($t0) +/* A2DA34 802437F4 AC640000 */ sw $a0, ($v1) +/* A2DA38 802437F8 AC600004 */ sw $zero, 4($v1) +/* A2DA3C 802437FC 24430008 */ addiu $v1, $v0, 8 +/* A2DA40 80243800 AD030000 */ sw $v1, ($t0) +/* A2DA44 80243804 3C03FD10 */ lui $v1, 0xfd10 +/* A2DA48 80243808 AC430000 */ sw $v1, ($v0) +/* A2DA4C 8024380C 24430010 */ addiu $v1, $v0, 0x10 +/* A2DA50 80243810 AC470004 */ sw $a3, 4($v0) +/* A2DA54 80243814 AD030000 */ sw $v1, ($t0) +/* A2DA58 80243818 3C03E800 */ lui $v1, 0xe800 +/* A2DA5C 8024381C AC430008 */ sw $v1, 8($v0) +/* A2DA60 80243820 004C1821 */ addu $v1, $v0, $t4 +/* A2DA64 80243824 AC40000C */ sw $zero, 0xc($v0) +/* A2DA68 80243828 AD030000 */ sw $v1, ($t0) +/* A2DA6C 8024382C 3C030700 */ lui $v1, 0x700 +/* A2DA70 80243830 AC430014 */ sw $v1, 0x14($v0) +/* A2DA74 80243834 24430020 */ addiu $v1, $v0, 0x20 +/* A2DA78 80243838 AC450010 */ sw $a1, 0x10($v0) +/* A2DA7C 8024383C AD030000 */ sw $v1, ($t0) +/* A2DA80 80243840 3C03E600 */ lui $v1, 0xe600 +/* A2DA84 80243844 AC430018 */ sw $v1, 0x18($v0) +/* A2DA88 80243848 24430028 */ addiu $v1, $v0, 0x28 +/* A2DA8C 8024384C AC40001C */ sw $zero, 0x1c($v0) +/* A2DA90 80243850 AD030000 */ sw $v1, ($t0) +/* A2DA94 80243854 3C03F000 */ lui $v1, 0xf000 +/* A2DA98 80243858 AC430020 */ sw $v1, 0x20($v0) +/* A2DA9C 8024385C 24430030 */ addiu $v1, $v0, 0x30 +/* A2DAA0 80243860 AC460024 */ sw $a2, 0x24($v0) +/* A2DAA4 80243864 AD030000 */ sw $v1, ($t0) +/* A2DAA8 80243868 AC440028 */ sw $a0, 0x28($v0) +/* A2DAAC 8024386C AC40002C */ sw $zero, 0x2c($v0) +.L80243870: +/* A2DAB0 80243870 3C04FD48 */ lui $a0, 0xfd48 +/* A2DAB4 80243874 34840107 */ ori $a0, $a0, 0x107 +/* A2DAB8 80243878 3C060741 */ lui $a2, 0x741 +/* A2DABC 8024387C 34C6C000 */ ori $a2, $a2, 0xc000 +/* A2DAC0 80243880 3C070041 */ lui $a3, 0x41 +/* A2DAC4 80243884 34E7C000 */ ori $a3, $a3, 0xc000 +/* A2DAC8 80243888 8D030000 */ lw $v1, ($t0) +/* A2DACC 8024388C 31650FFF */ andi $a1, $t3, 0xfff +/* A2DAD0 80243890 0060102D */ daddu $v0, $v1, $zero +/* A2DAD4 80243894 24630008 */ addiu $v1, $v1, 8 +/* A2DAD8 80243898 AD030000 */ sw $v1, ($t0) +/* A2DADC 8024389C AC440000 */ sw $a0, ($v0) +/* A2DAE0 802438A0 AC500004 */ sw $s0, 4($v0) +/* A2DAE4 802438A4 24620008 */ addiu $v0, $v1, 8 +/* A2DAE8 802438A8 AD020000 */ sw $v0, ($t0) +/* A2DAEC 802438AC 3C020700 */ lui $v0, 0x700 +/* A2DAF0 802438B0 AC620004 */ sw $v0, 4($v1) +/* A2DAF4 802438B4 24620010 */ addiu $v0, $v1, 0x10 +/* A2DAF8 802438B8 AC6F0000 */ sw $t7, ($v1) +/* A2DAFC 802438BC AD020000 */ sw $v0, ($t0) +/* A2DB00 802438C0 3C02E600 */ lui $v0, 0xe600 +/* A2DB04 802438C4 AC620008 */ sw $v0, 8($v1) +/* A2DB08 802438C8 24620018 */ addiu $v0, $v1, 0x18 +/* A2DB0C 802438CC AC60000C */ sw $zero, 0xc($v1) +/* A2DB10 802438D0 AD020000 */ sw $v0, ($t0) +/* A2DB14 802438D4 3C02F400 */ lui $v0, 0xf400 +/* A2DB18 802438D8 00A21025 */ or $v0, $a1, $v0 +/* A2DB1C 802438DC 31840FFF */ andi $a0, $t4, 0xfff +/* A2DB20 802438E0 00863025 */ or $a2, $a0, $a2 +/* A2DB24 802438E4 AC620010 */ sw $v0, 0x10($v1) +/* A2DB28 802438E8 24620020 */ addiu $v0, $v1, 0x20 +/* A2DB2C 802438EC AC660014 */ sw $a2, 0x14($v1) +/* A2DB30 802438F0 AD020000 */ sw $v0, ($t0) +/* A2DB34 802438F4 3C02E700 */ lui $v0, 0xe700 +/* A2DB38 802438F8 AC620018 */ sw $v0, 0x18($v1) +/* A2DB3C 802438FC 24620028 */ addiu $v0, $v1, 0x28 +/* A2DB40 80243900 24660030 */ addiu $a2, $v1, 0x30 +/* A2DB44 80243904 AC60001C */ sw $zero, 0x1c($v1) +/* A2DB48 80243908 AD020000 */ sw $v0, ($t0) +/* A2DB4C 8024390C 3C02F200 */ lui $v0, 0xf200 +/* A2DB50 80243910 00A22825 */ or $a1, $a1, $v0 +/* A2DB54 80243914 00872025 */ or $a0, $a0, $a3 +/* A2DB58 80243918 AC6F0020 */ sw $t7, 0x20($v1) +/* A2DB5C 8024391C AC600024 */ sw $zero, 0x24($v1) +/* A2DB60 80243920 AD060000 */ sw $a2, ($t0) +/* A2DB64 80243924 AC650028 */ sw $a1, 0x28($v1) +/* A2DB68 80243928 AC64002C */ sw $a0, 0x2c($v1) +/* A2DB6C 8024392C 24630038 */ addiu $v1, $v1, 0x38 +/* A2DB70 80243930 1B000004 */ blez $t8, .L80243944 +/* A2DB74 80243934 AD030000 */ sw $v1, ($t0) +/* A2DB78 80243938 3C02E400 */ lui $v0, 0xe400 +/* A2DB7C 8024393C 08090E52 */ j .L80243948 +/* A2DB80 80243940 02621825 */ or $v1, $s3, $v0 +.L80243944: +/* A2DB84 80243944 3C03E400 */ lui $v1, 0xe400 +.L80243948: +/* A2DB88 80243948 25220007 */ addiu $v0, $t1, 7 +/* A2DB8C 8024394C 00021480 */ sll $v0, $v0, 0x12 +/* A2DB90 80243950 00021403 */ sra $v0, $v0, 0x10 +/* A2DB94 80243954 18400004 */ blez $v0, .L80243968 +/* A2DB98 80243958 ACC30000 */ sw $v1, ($a2) +/* A2DB9C 8024395C 30420FFF */ andi $v0, $v0, 0xfff +/* A2DBA0 80243960 00621025 */ or $v0, $v1, $v0 +/* A2DBA4 80243964 ACC20000 */ sw $v0, ($a2) +.L80243968: +/* A2DBA8 80243968 19C00002 */ blez $t6, .L80243974 +/* A2DBAC 8024396C 0000182D */ daddu $v1, $zero, $zero +/* A2DBB0 80243970 00121B00 */ sll $v1, $s2, 0xc +.L80243974: +/* A2DBB4 80243974 00091480 */ sll $v0, $t1, 0x12 +/* A2DBB8 80243978 00021403 */ sra $v0, $v0, 0x10 +/* A2DBBC 8024397C 18400004 */ blez $v0, .L80243990 +/* A2DBC0 80243980 ACC30004 */ sw $v1, 4($a2) +/* A2DBC4 80243984 30420FFF */ andi $v0, $v0, 0xfff +/* A2DBC8 80243988 00621025 */ or $v0, $v1, $v0 +/* A2DBCC 8024398C ACC20004 */ sw $v0, 4($a2) +.L80243990: +/* A2DBD0 80243990 8D020000 */ lw $v0, ($t0) +/* A2DBD4 80243994 000D2940 */ sll $a1, $t5, 5 +/* A2DBD8 80243998 0040182D */ daddu $v1, $v0, $zero +/* A2DBDC 8024399C 24420008 */ addiu $v0, $v0, 8 +/* A2DBE0 802439A0 AD020000 */ sw $v0, ($t0) +/* A2DBE4 802439A4 3C02E100 */ lui $v0, 0xe100 +/* A2DBE8 802439A8 AC620000 */ sw $v0, ($v1) +/* A2DBEC 802439AC 05C10007 */ bgez $t6, .L802439CC +/* A2DBF0 802439B0 24630004 */ addiu $v1, $v1, 4 +/* A2DBF4 802439B4 001111C3 */ sra $v0, $s1, 7 +/* A2DBF8 802439B8 5C400001 */ bgtzl $v0, .L802439C0 +/* A2DBFC 802439BC 0000102D */ daddu $v0, $zero, $zero +.L802439C0: +/* A2DC00 802439C0 00021023 */ negu $v0, $v0 +/* A2DC04 802439C4 08090E74 */ j .L802439D0 +/* A2DC08 802439C8 00022400 */ sll $a0, $v0, 0x10 +.L802439CC: +/* A2DC0C 802439CC 0000202D */ daddu $a0, $zero, $zero +.L802439D0: +/* A2DC10 802439D0 00091080 */ sll $v0, $t1, 2 +/* A2DC14 802439D4 04410007 */ bgez $v0, .L802439F4 +/* A2DC18 802439D8 30A2FFFF */ andi $v0, $a1, 0xffff +/* A2DC1C 802439DC 00091480 */ sll $v0, $t1, 0x12 +/* A2DC20 802439E0 00021343 */ sra $v0, $v0, 0xd +/* A2DC24 802439E4 5C400001 */ bgtzl $v0, .L802439EC +/* A2DC28 802439E8 0000102D */ daddu $v0, $zero, $zero +.L802439EC: +/* A2DC2C 802439EC 00A21023 */ subu $v0, $a1, $v0 +/* A2DC30 802439F0 3042FFFF */ andi $v0, $v0, 0xffff +.L802439F4: +/* A2DC34 802439F4 00821025 */ or $v0, $a0, $v0 +/* A2DC38 802439F8 AC620000 */ sw $v0, ($v1) +/* A2DC3C 802439FC 3C040400 */ lui $a0, 0x400 +/* A2DC40 80243A00 34840400 */ ori $a0, $a0, 0x400 +/* A2DC44 80243A04 25290007 */ addiu $t1, $t1, 7 +/* A2DC48 80243A08 25AD0007 */ addiu $t5, $t5, 7 +/* A2DC4C 80243A0C 258C001C */ addiu $t4, $t4, 0x1c +/* A2DC50 80243A10 256B001C */ addiu $t3, $t3, 0x1c +/* A2DC54 80243A14 8D020000 */ lw $v0, ($t0) +/* A2DC58 80243A18 254A0001 */ addiu $t2, $t2, 1 +/* A2DC5C 80243A1C 0040182D */ daddu $v1, $v0, $zero +/* A2DC60 80243A20 24420008 */ addiu $v0, $v0, 8 +/* A2DC64 80243A24 AD020000 */ sw $v0, ($t0) +/* A2DC68 80243A28 3C02F100 */ lui $v0, 0xf100 +/* A2DC6C 80243A2C AC620000 */ sw $v0, ($v1) +/* A2DC70 80243A30 29420017 */ slti $v0, $t2, 0x17 +/* A2DC74 80243A34 1440FF8E */ bnez $v0, .L80243870 +/* A2DC78 80243A38 AC640004 */ sw $a0, 4($v1) +/* A2DC7C 80243A3C 12A0008F */ beqz $s5, .L80243C7C +/* A2DC80 80243A40 3C03FD48 */ lui $v1, 0xfd48 +/* A2DC84 80243A44 34630107 */ ori $v1, $v1, 0x107 +/* A2DC88 80243A48 3C08F548 */ lui $t0, 0xf548 +/* A2DC8C 80243A4C 35084200 */ ori $t0, $t0, 0x4200 +/* A2DC90 80243A50 3C070741 */ lui $a3, 0x741 +/* A2DC94 80243A54 34E7C000 */ ori $a3, $a3, 0xc000 +/* A2DC98 80243A58 3C090041 */ lui $t1, 0x41 +/* A2DC9C 80243A5C 3C05800A */ lui $a1, 0x800a +/* A2DCA0 80243A60 24A5A66C */ addiu $a1, $a1, -0x5994 +/* A2DCA4 80243A64 8CA40000 */ lw $a0, ($a1) +/* A2DCA8 80243A68 3529C000 */ ori $t1, $t1, 0xc000 +/* A2DCAC 80243A6C 0080102D */ daddu $v0, $a0, $zero +/* A2DCB0 80243A70 24840008 */ addiu $a0, $a0, 8 +/* A2DCB4 80243A74 ACA40000 */ sw $a0, ($a1) +/* A2DCB8 80243A78 AC430000 */ sw $v1, ($v0) +/* A2DCBC 80243A7C AC500004 */ sw $s0, 4($v0) +/* A2DCC0 80243A80 24820008 */ addiu $v0, $a0, 8 +/* A2DCC4 80243A84 ACA20000 */ sw $v0, ($a1) +/* A2DCC8 80243A88 3C020700 */ lui $v0, 0x700 +/* A2DCCC 80243A8C AC820004 */ sw $v0, 4($a0) +/* A2DCD0 80243A90 24820010 */ addiu $v0, $a0, 0x10 +/* A2DCD4 80243A94 AC880000 */ sw $t0, ($a0) +/* A2DCD8 80243A98 ACA20000 */ sw $v0, ($a1) +/* A2DCDC 80243A9C 3C02E600 */ lui $v0, 0xe600 +/* A2DCE0 80243AA0 AC820008 */ sw $v0, 8($a0) +/* A2DCE4 80243AA4 24820018 */ addiu $v0, $a0, 0x18 +/* A2DCE8 80243AA8 000A18C0 */ sll $v1, $t2, 3 +/* A2DCEC 80243AAC 006A1823 */ subu $v1, $v1, $t2 +/* A2DCF0 80243AB0 00033080 */ sll $a2, $v1, 2 +/* A2DCF4 80243AB4 30C60FFF */ andi $a2, $a2, 0xfff +/* A2DCF8 80243AB8 AC80000C */ sw $zero, 0xc($a0) +/* A2DCFC 80243ABC ACA20000 */ sw $v0, ($a1) +/* A2DD00 80243AC0 3C02F400 */ lui $v0, 0xf400 +/* A2DD04 80243AC4 00C21025 */ or $v0, $a2, $v0 +/* A2DD08 80243AC8 00751821 */ addu $v1, $v1, $s5 +/* A2DD0C 80243ACC 2463FFFF */ addiu $v1, $v1, -1 +/* A2DD10 80243AD0 00031880 */ sll $v1, $v1, 2 +/* A2DD14 80243AD4 30630FFF */ andi $v1, $v1, 0xfff +/* A2DD18 80243AD8 00673825 */ or $a3, $v1, $a3 +/* A2DD1C 80243ADC AC820010 */ sw $v0, 0x10($a0) +/* A2DD20 80243AE0 24820020 */ addiu $v0, $a0, 0x20 +/* A2DD24 80243AE4 AC870014 */ sw $a3, 0x14($a0) +/* A2DD28 80243AE8 ACA20000 */ sw $v0, ($a1) +/* A2DD2C 80243AEC 3C02E700 */ lui $v0, 0xe700 +/* A2DD30 80243AF0 AC820018 */ sw $v0, 0x18($a0) +/* A2DD34 80243AF4 24820028 */ addiu $v0, $a0, 0x28 +/* A2DD38 80243AF8 24870030 */ addiu $a3, $a0, 0x30 +/* A2DD3C 80243AFC AC80001C */ sw $zero, 0x1c($a0) +/* A2DD40 80243B00 ACA20000 */ sw $v0, ($a1) +/* A2DD44 80243B04 3C02F200 */ lui $v0, 0xf200 +/* A2DD48 80243B08 00C23025 */ or $a2, $a2, $v0 +/* A2DD4C 80243B0C 00691825 */ or $v1, $v1, $t1 +/* A2DD50 80243B10 AC880020 */ sw $t0, 0x20($a0) +/* A2DD54 80243B14 AC800024 */ sw $zero, 0x24($a0) +/* A2DD58 80243B18 ACA70000 */ sw $a3, ($a1) +/* A2DD5C 80243B1C AC860028 */ sw $a2, 0x28($a0) +/* A2DD60 80243B20 AC83002C */ sw $v1, 0x2c($a0) +/* A2DD64 80243B24 24840038 */ addiu $a0, $a0, 0x38 +/* A2DD68 80243B28 27220108 */ addiu $v0, $t9, 0x108 +/* A2DD6C 80243B2C 00021480 */ sll $v0, $v0, 0x12 +/* A2DD70 80243B30 00021403 */ sra $v0, $v0, 0x10 +/* A2DD74 80243B34 18400006 */ blez $v0, .L80243B50 +/* A2DD78 80243B38 ACA40000 */ sw $a0, ($a1) +/* A2DD7C 80243B3C 30420FFF */ andi $v0, $v0, 0xfff +/* A2DD80 80243B40 00021300 */ sll $v0, $v0, 0xc +/* A2DD84 80243B44 3C03E400 */ lui $v1, 0xe400 +/* A2DD88 80243B48 08090ED5 */ j .L80243B54 +/* A2DD8C 80243B4C 00431825 */ or $v1, $v0, $v1 +.L80243B50: +/* A2DD90 80243B50 3C03E400 */ lui $v1, 0xe400 +.L80243B54: +/* A2DD94 80243B54 000A10C0 */ sll $v0, $t2, 3 +/* A2DD98 80243B58 004A1023 */ subu $v0, $v0, $t2 +/* A2DD9C 80243B5C 02821021 */ addu $v0, $s4, $v0 +/* A2DDA0 80243B60 00551021 */ addu $v0, $v0, $s5 +/* A2DDA4 80243B64 00021480 */ sll $v0, $v0, 0x12 +/* A2DDA8 80243B68 00021403 */ sra $v0, $v0, 0x10 +/* A2DDAC 80243B6C 18400004 */ blez $v0, .L80243B80 +/* A2DDB0 80243B70 ACE30000 */ sw $v1, ($a3) +/* A2DDB4 80243B74 30420FFF */ andi $v0, $v0, 0xfff +/* A2DDB8 80243B78 00621025 */ or $v0, $v1, $v0 +/* A2DDBC 80243B7C ACE20000 */ sw $v0, ($a3) +.L80243B80: +/* A2DDC0 80243B80 00191480 */ sll $v0, $t9, 0x12 +/* A2DDC4 80243B84 00021403 */ sra $v0, $v0, 0x10 +/* A2DDC8 80243B88 18400004 */ blez $v0, .L80243B9C +/* A2DDCC 80243B8C 24E70004 */ addiu $a3, $a3, 4 +/* A2DDD0 80243B90 30420FFF */ andi $v0, $v0, 0xfff +/* A2DDD4 80243B94 08090EE8 */ j .L80243BA0 +/* A2DDD8 80243B98 00021B00 */ sll $v1, $v0, 0xc +.L80243B9C: +/* A2DDDC 80243B9C 0000182D */ daddu $v1, $zero, $zero +.L80243BA0: +/* A2DDE0 80243BA0 000A10C0 */ sll $v0, $t2, 3 +/* A2DDE4 80243BA4 004A2823 */ subu $a1, $v0, $t2 +/* A2DDE8 80243BA8 02851021 */ addu $v0, $s4, $a1 +/* A2DDEC 80243BAC 00021480 */ sll $v0, $v0, 0x12 +/* A2DDF0 80243BB0 00021403 */ sra $v0, $v0, 0x10 +/* A2DDF4 80243BB4 18400004 */ blez $v0, .L80243BC8 +/* A2DDF8 80243BB8 ACE30000 */ sw $v1, ($a3) +/* A2DDFC 80243BBC 30420FFF */ andi $v0, $v0, 0xfff +/* A2DE00 80243BC0 00621025 */ or $v0, $v1, $v0 +/* A2DE04 80243BC4 ACE20000 */ sw $v0, ($a3) +.L80243BC8: +/* A2DE08 80243BC8 3C03800A */ lui $v1, 0x800a +/* A2DE0C 80243BCC 2463A66C */ addiu $v1, $v1, -0x5994 +/* A2DE10 80243BD0 8C620000 */ lw $v0, ($v1) +/* A2DE14 80243BD4 00053140 */ sll $a2, $a1, 5 +/* A2DE18 80243BD8 0040202D */ daddu $a0, $v0, $zero +/* A2DE1C 80243BDC 24420008 */ addiu $v0, $v0, 8 +/* A2DE20 80243BE0 AC620000 */ sw $v0, ($v1) +/* A2DE24 80243BE4 3C02E100 */ lui $v0, 0xe100 +/* A2DE28 80243BE8 AC820000 */ sw $v0, ($a0) +/* A2DE2C 80243BEC 00191480 */ sll $v0, $t9, 0x12 +/* A2DE30 80243BF0 00021403 */ sra $v0, $v0, 0x10 +/* A2DE34 80243BF4 04410007 */ bgez $v0, .L80243C14 +/* A2DE38 80243BF8 24840004 */ addiu $a0, $a0, 4 +/* A2DE3C 80243BFC 000210C0 */ sll $v0, $v0, 3 +/* A2DE40 80243C00 5C400001 */ bgtzl $v0, .L80243C08 +/* A2DE44 80243C04 0000102D */ daddu $v0, $zero, $zero +.L80243C08: +/* A2DE48 80243C08 00021023 */ negu $v0, $v0 +/* A2DE4C 80243C0C 08090F06 */ j .L80243C18 +/* A2DE50 80243C10 00021C00 */ sll $v1, $v0, 0x10 +.L80243C14: +/* A2DE54 80243C14 0000182D */ daddu $v1, $zero, $zero +.L80243C18: +/* A2DE58 80243C18 000A10C0 */ sll $v0, $t2, 3 +/* A2DE5C 80243C1C 004A1023 */ subu $v0, $v0, $t2 +/* A2DE60 80243C20 02822821 */ addu $a1, $s4, $v0 +/* A2DE64 80243C24 00051080 */ sll $v0, $a1, 2 +/* A2DE68 80243C28 04410007 */ bgez $v0, .L80243C48 +/* A2DE6C 80243C2C 30C2FFFF */ andi $v0, $a2, 0xffff +/* A2DE70 80243C30 00051480 */ sll $v0, $a1, 0x12 +/* A2DE74 80243C34 00021343 */ sra $v0, $v0, 0xd +/* A2DE78 80243C38 5C400001 */ bgtzl $v0, .L80243C40 +/* A2DE7C 80243C3C 0000102D */ daddu $v0, $zero, $zero +.L80243C40: +/* A2DE80 80243C40 00C21023 */ subu $v0, $a2, $v0 +/* A2DE84 80243C44 3042FFFF */ andi $v0, $v0, 0xffff +.L80243C48: +/* A2DE88 80243C48 00621025 */ or $v0, $v1, $v0 +/* A2DE8C 80243C4C AC820000 */ sw $v0, ($a0) +/* A2DE90 80243C50 3C050400 */ lui $a1, 0x400 +/* A2DE94 80243C54 3C03800A */ lui $v1, 0x800a +/* A2DE98 80243C58 2463A66C */ addiu $v1, $v1, -0x5994 +/* A2DE9C 80243C5C 8C620000 */ lw $v0, ($v1) +/* A2DEA0 80243C60 34A50400 */ ori $a1, $a1, 0x400 +/* A2DEA4 80243C64 0040202D */ daddu $a0, $v0, $zero +/* A2DEA8 80243C68 24420008 */ addiu $v0, $v0, 8 +/* A2DEAC 80243C6C AC620000 */ sw $v0, ($v1) +/* A2DEB0 80243C70 3C02F100 */ lui $v0, 0xf100 +/* A2DEB4 80243C74 AC820000 */ sw $v0, ($a0) +/* A2DEB8 80243C78 AC850004 */ sw $a1, 4($a0) +.L80243C7C: +/* A2DEBC 80243C7C 3C03800A */ lui $v1, 0x800a +/* A2DEC0 80243C80 2463A66C */ addiu $v1, $v1, -0x5994 +/* A2DEC4 80243C84 8C620000 */ lw $v0, ($v1) +/* A2DEC8 80243C88 0040202D */ daddu $a0, $v0, $zero +/* A2DECC 80243C8C 24420008 */ addiu $v0, $v0, 8 +/* A2DED0 80243C90 AC620000 */ sw $v0, ($v1) +/* A2DED4 80243C94 3C02E700 */ lui $v0, 0xe700 +/* A2DED8 80243C98 AC820000 */ sw $v0, ($a0) +/* A2DEDC 80243C9C AC800004 */ sw $zero, 4($a0) +/* A2DEE0 80243CA0 8FB50014 */ lw $s5, 0x14($sp) +/* A2DEE4 80243CA4 8FB40010 */ lw $s4, 0x10($sp) +/* A2DEE8 80243CA8 8FB3000C */ lw $s3, 0xc($sp) +/* A2DEEC 80243CAC 8FB20008 */ lw $s2, 8($sp) +/* A2DEF0 80243CB0 8FB10004 */ lw $s1, 4($sp) +/* A2DEF4 80243CB4 8FB00000 */ lw $s0, ($sp) +/* A2DEF8 80243CB8 03E00008 */ jr $ra +/* A2DEFC 80243CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0.s deleted file mode 100644 index dad59e3285..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243CC0 -/* A2DF00 80243CC0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A2DF04 80243CC4 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* A2DF08 80243CC8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* A2DF0C 80243CCC 3C04800B */ lui $a0, %hi(gCameras) -/* A2DF10 80243CD0 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A2DF14 80243CD4 AFBF0028 */ sw $ra, 0x28($sp) -/* A2DF18 80243CD8 AFB30024 */ sw $s3, 0x24($sp) -/* A2DF1C 80243CDC AFB20020 */ sw $s2, 0x20($sp) -/* A2DF20 80243CE0 AFB1001C */ sw $s1, 0x1c($sp) -/* A2DF24 80243CE4 AFB00018 */ sw $s0, 0x18($sp) -/* A2DF28 80243CE8 00031080 */ sll $v0, $v1, 2 -/* A2DF2C 80243CEC 00431021 */ addu $v0, $v0, $v1 -/* A2DF30 80243CF0 00021080 */ sll $v0, $v0, 2 -/* A2DF34 80243CF4 00431023 */ subu $v0, $v0, $v1 -/* A2DF38 80243CF8 000218C0 */ sll $v1, $v0, 3 -/* A2DF3C 80243CFC 00431021 */ addu $v0, $v0, $v1 -/* A2DF40 80243D00 000210C0 */ sll $v0, $v0, 3 -/* A2DF44 80243D04 00441021 */ addu $v0, $v0, $a0 -/* A2DF48 80243D08 8451000E */ lh $s1, 0xe($v0) -/* A2DF4C 80243D0C 0C090DC3 */ jal func_8024370C -/* A2DF50 80243D10 84520010 */ lh $s2, 0x10($v0) -/* A2DF54 80243D14 3C05FF10 */ lui $a1, 0xff10 -/* A2DF58 80243D18 3C10800A */ lui $s0, 0x800a -/* A2DF5C 80243D1C 2610A66C */ addiu $s0, $s0, -0x5994 -/* A2DF60 80243D20 34A5013F */ ori $a1, $a1, 0x13f -/* A2DF64 80243D24 8E060000 */ lw $a2, ($s0) -/* A2DF68 80243D28 3C02DE00 */ lui $v0, 0xde00 -/* A2DF6C 80243D2C 00C0202D */ daddu $a0, $a2, $zero -/* A2DF70 80243D30 24C60008 */ addiu $a2, $a2, 8 -/* A2DF74 80243D34 AE060000 */ sw $a2, ($s0) -/* A2DF78 80243D38 3C03800A */ lui $v1, 0x800a -/* A2DF7C 80243D3C 8C63A64C */ lw $v1, -0x59b4($v1) -/* A2DF80 80243D40 3C138025 */ lui $s3, 0x8025 -/* A2DF84 80243D44 2673AA20 */ addiu $s3, $s3, -0x55e0 -/* A2DF88 80243D48 AC820000 */ sw $v0, ($a0) -/* A2DF8C 80243D4C 8E670000 */ lw $a3, ($s3) -/* A2DF90 80243D50 3C028025 */ lui $v0, 0x8025 -/* A2DF94 80243D54 2442AA28 */ addiu $v0, $v0, -0x55d8 -/* A2DF98 80243D58 AC820004 */ sw $v0, 4($a0) -/* A2DF9C 80243D5C ACC50000 */ sw $a1, ($a2) -/* A2DFA0 80243D60 ACC30004 */ sw $v1, 4($a2) -/* A2DFA4 80243D64 84E2005A */ lh $v0, 0x5a($a3) -/* A2DFA8 80243D68 24C30008 */ addiu $v1, $a2, 8 -/* A2DFAC 80243D6C 284200FF */ slti $v0, $v0, 0xff -/* A2DFB0 80243D70 1040000F */ beqz $v0, .L80243DB0 -/* A2DFB4 80243D74 AE030000 */ sw $v1, ($s0) -/* A2DFB8 80243D78 3C04E200 */ lui $a0, 0xe200 -/* A2DFBC 80243D7C 3484001C */ ori $a0, $a0, 0x1c -/* A2DFC0 80243D80 3C030050 */ lui $v1, 0x50 -/* A2DFC4 80243D84 34634340 */ ori $v1, $v1, 0x4340 -/* A2DFC8 80243D88 24C20010 */ addiu $v0, $a2, 0x10 -/* A2DFCC 80243D8C AE020000 */ sw $v0, ($s0) -/* A2DFD0 80243D90 24C20018 */ addiu $v0, $a2, 0x18 -/* A2DFD4 80243D94 ACC40008 */ sw $a0, 8($a2) -/* A2DFD8 80243D98 ACC3000C */ sw $v1, 0xc($a2) -/* A2DFDC 80243D9C AE020000 */ sw $v0, ($s0) -/* A2DFE0 80243DA0 3C02FA00 */ lui $v0, 0xfa00 -/* A2DFE4 80243DA4 ACC20010 */ sw $v0, 0x10($a2) -/* A2DFE8 80243DA8 90E2005B */ lbu $v0, 0x5b($a3) -/* A2DFEC 80243DAC ACC20014 */ sw $v0, 0x14($a2) -.L80243DB0: -/* A2DFF0 80243DB0 24040001 */ addiu $a0, $zero, 1 -/* A2DFF4 80243DB4 27A50010 */ addiu $a1, $sp, 0x10 -/* A2DFF8 80243DB8 0C04DF70 */ jal func_80137DC0 -/* A2DFFC 80243DBC 27A60014 */ addiu $a2, $sp, 0x14 -/* A2E000 80243DC0 C7A20014 */ lwc1 $f2, 0x14($sp) -/* A2E004 80243DC4 44800000 */ mtc1 $zero, $f0 -/* A2E008 80243DC8 00000000 */ nop -/* A2E00C 80243DCC 46001032 */ c.eq.s $f2, $f0 -/* A2E010 80243DD0 00000000 */ nop -/* A2E014 80243DD4 45010016 */ bc1t .L80243E30 -/* A2E018 80243DD8 3C05FC35 */ lui $a1, 0xfc35 -/* A2E01C 80243DDC 34A57E6A */ ori $a1, $a1, 0x7e6a -/* A2E020 80243DE0 3C0411FC */ lui $a0, 0x11fc -/* A2E024 80243DE4 3484FC7E */ ori $a0, $a0, 0xfc7e -/* A2E028 80243DE8 3C06D0D0 */ lui $a2, 0xd0d0 -/* A2E02C 80243DEC 8E030000 */ lw $v1, ($s0) -/* A2E030 80243DF0 34C6D000 */ ori $a2, $a2, 0xd000 -/* A2E034 80243DF4 0060102D */ daddu $v0, $v1, $zero -/* A2E038 80243DF8 24630008 */ addiu $v1, $v1, 8 -/* A2E03C 80243DFC AE030000 */ sw $v1, ($s0) -/* A2E040 80243E00 AC450000 */ sw $a1, ($v0) -/* A2E044 80243E04 AC440004 */ sw $a0, 4($v0) -/* A2E048 80243E08 24620008 */ addiu $v0, $v1, 8 -/* A2E04C 80243E0C AE020000 */ sw $v0, ($s0) -/* A2E050 80243E10 3C02FA00 */ lui $v0, 0xfa00 -/* A2E054 80243E14 AC620000 */ sw $v0, ($v1) -/* A2E058 80243E18 4600110D */ trunc.w.s $f4, $f2 -/* A2E05C 80243E1C 44022000 */ mfc1 $v0, $f4 -/* 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) -.L80243E30: -/* A2E070 80243E30 8E630000 */ lw $v1, ($s3) -/* A2E074 80243E34 84620058 */ lh $v0, 0x58($v1) -/* A2E078 80243E38 1440000F */ bnez $v0, .L80243E78 -/* 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) -/* A2E08C 80243E4C 84650042 */ lh $a1, 0x42($v1) -/* A2E090 80243E50 02242021 */ addu $a0, $s1, $a0 -/* A2E094 80243E54 0C090DD6 */ jal func_80243758 -/* A2E098 80243E58 02452821 */ addu $a1, $s2, $a1 -/* A2E09C 80243E5C 8E620000 */ lw $v0, ($s3) -/* A2E0A0 80243E60 8C460004 */ lw $a2, 4($v0) -/* A2E0A4 80243E64 8C470008 */ lw $a3, 8($v0) -/* A2E0A8 80243E68 8444003C */ lh $a0, 0x3c($v0) -/* A2E0AC 80243E6C 8445003E */ lh $a1, 0x3e($v0) -/* A2E0B0 80243E70 08090FAB */ j .L80243EAC -/* A2E0B4 80243E74 02242021 */ addu $a0, $s1, $a0 -.L80243E78: -/* A2E0B8 80243E78 8C660004 */ lw $a2, 4($v1) -/* A2E0BC 80243E7C 8C670008 */ lw $a3, 8($v1) -/* A2E0C0 80243E80 8464003C */ lh $a0, 0x3c($v1) -/* A2E0C4 80243E84 8465003E */ lh $a1, 0x3e($v1) -/* A2E0C8 80243E88 02242021 */ addu $a0, $s1, $a0 -/* A2E0CC 80243E8C 0C090DD6 */ jal func_80243758 -/* A2E0D0 80243E90 02452821 */ addu $a1, $s2, $a1 -/* A2E0D4 80243E94 8E620000 */ lw $v0, ($s3) -/* A2E0D8 80243E98 8C46000C */ lw $a2, 0xc($v0) -/* A2E0DC 80243E9C 8C470010 */ lw $a3, 0x10($v0) -/* A2E0E0 80243EA0 84440040 */ lh $a0, 0x40($v0) -/* A2E0E4 80243EA4 84450042 */ lh $a1, 0x42($v0) -/* A2E0E8 80243EA8 02242021 */ addu $a0, $s1, $a0 -.L80243EAC: -/* A2E0EC 80243EAC 0C090DD6 */ jal func_80243758 -/* A2E0F0 80243EB0 02452821 */ addu $a1, $s2, $a1 -/* A2E0F4 80243EB4 8FBF0028 */ lw $ra, 0x28($sp) -/* A2E0F8 80243EB8 8FB30024 */ lw $s3, 0x24($sp) -/* A2E0FC 80243EBC 8FB20020 */ lw $s2, 0x20($sp) -/* A2E100 80243EC0 8FB1001C */ lw $s1, 0x1c($sp) -/* A2E104 80243EC4 8FB00018 */ lw $s0, 0x18($sp) -/* A2E108 80243EC8 03E00008 */ jr $ra -/* A2E10C 80243ECC 27BD0030 */ addiu $sp, $sp, 0x30 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 new file mode 100644 index 0000000000..12d0e5f65c --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243CC0_A2DF00.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243CC0_A2DF00 +/* A2DF00 80243CC0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A2DF04 80243CC4 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* A2DF08 80243CC8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* A2DF0C 80243CCC 3C04800B */ lui $a0, %hi(gCameras) +/* A2DF10 80243CD0 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A2DF14 80243CD4 AFBF0028 */ sw $ra, 0x28($sp) +/* A2DF18 80243CD8 AFB30024 */ sw $s3, 0x24($sp) +/* A2DF1C 80243CDC AFB20020 */ sw $s2, 0x20($sp) +/* A2DF20 80243CE0 AFB1001C */ sw $s1, 0x1c($sp) +/* A2DF24 80243CE4 AFB00018 */ sw $s0, 0x18($sp) +/* A2DF28 80243CE8 00031080 */ sll $v0, $v1, 2 +/* A2DF2C 80243CEC 00431021 */ addu $v0, $v0, $v1 +/* A2DF30 80243CF0 00021080 */ sll $v0, $v0, 2 +/* A2DF34 80243CF4 00431023 */ subu $v0, $v0, $v1 +/* A2DF38 80243CF8 000218C0 */ sll $v1, $v0, 3 +/* A2DF3C 80243CFC 00431021 */ addu $v0, $v0, $v1 +/* A2DF40 80243D00 000210C0 */ sll $v0, $v0, 3 +/* A2DF44 80243D04 00441021 */ addu $v0, $v0, $a0 +/* A2DF48 80243D08 8451000E */ lh $s1, 0xe($v0) +/* 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, 0x800a +/* A2DF5C 80243D1C 2610A66C */ addiu $s0, $s0, -0x5994 +/* A2DF60 80243D20 34A5013F */ ori $a1, $a1, 0x13f +/* A2DF64 80243D24 8E060000 */ lw $a2, ($s0) +/* A2DF68 80243D28 3C02DE00 */ lui $v0, 0xde00 +/* A2DF6C 80243D2C 00C0202D */ daddu $a0, $a2, $zero +/* A2DF70 80243D30 24C60008 */ addiu $a2, $a2, 8 +/* A2DF74 80243D34 AE060000 */ sw $a2, ($s0) +/* A2DF78 80243D38 3C03800A */ lui $v1, 0x800a +/* A2DF7C 80243D3C 8C63A64C */ lw $v1, -0x59b4($v1) +/* A2DF80 80243D40 3C138025 */ lui $s3, 0x8025 +/* A2DF84 80243D44 2673AA20 */ addiu $s3, $s3, -0x55e0 +/* A2DF88 80243D48 AC820000 */ sw $v0, ($a0) +/* A2DF8C 80243D4C 8E670000 */ lw $a3, ($s3) +/* A2DF90 80243D50 3C028025 */ lui $v0, 0x8025 +/* A2DF94 80243D54 2442AA28 */ addiu $v0, $v0, -0x55d8 +/* A2DF98 80243D58 AC820004 */ sw $v0, 4($a0) +/* A2DF9C 80243D5C ACC50000 */ sw $a1, ($a2) +/* A2DFA0 80243D60 ACC30004 */ sw $v1, 4($a2) +/* A2DFA4 80243D64 84E2005A */ lh $v0, 0x5a($a3) +/* A2DFA8 80243D68 24C30008 */ addiu $v1, $a2, 8 +/* A2DFAC 80243D6C 284200FF */ slti $v0, $v0, 0xff +/* A2DFB0 80243D70 1040000F */ beqz $v0, .L80243DB0 +/* A2DFB4 80243D74 AE030000 */ sw $v1, ($s0) +/* A2DFB8 80243D78 3C04E200 */ lui $a0, 0xe200 +/* A2DFBC 80243D7C 3484001C */ ori $a0, $a0, 0x1c +/* A2DFC0 80243D80 3C030050 */ lui $v1, 0x50 +/* A2DFC4 80243D84 34634340 */ ori $v1, $v1, 0x4340 +/* A2DFC8 80243D88 24C20010 */ addiu $v0, $a2, 0x10 +/* A2DFCC 80243D8C AE020000 */ sw $v0, ($s0) +/* A2DFD0 80243D90 24C20018 */ addiu $v0, $a2, 0x18 +/* A2DFD4 80243D94 ACC40008 */ sw $a0, 8($a2) +/* A2DFD8 80243D98 ACC3000C */ sw $v1, 0xc($a2) +/* A2DFDC 80243D9C AE020000 */ sw $v0, ($s0) +/* A2DFE0 80243DA0 3C02FA00 */ lui $v0, 0xfa00 +/* A2DFE4 80243DA4 ACC20010 */ sw $v0, 0x10($a2) +/* A2DFE8 80243DA8 90E2005B */ lbu $v0, 0x5b($a3) +/* A2DFEC 80243DAC ACC20014 */ sw $v0, 0x14($a2) +.L80243DB0: +/* A2DFF0 80243DB0 24040001 */ addiu $a0, $zero, 1 +/* A2DFF4 80243DB4 27A50010 */ addiu $a1, $sp, 0x10 +/* A2DFF8 80243DB8 0C04DF70 */ jal func_80137DC0 +/* A2DFFC 80243DBC 27A60014 */ addiu $a2, $sp, 0x14 +/* A2E000 80243DC0 C7A20014 */ lwc1 $f2, 0x14($sp) +/* A2E004 80243DC4 44800000 */ mtc1 $zero, $f0 +/* A2E008 80243DC8 00000000 */ nop +/* A2E00C 80243DCC 46001032 */ c.eq.s $f2, $f0 +/* A2E010 80243DD0 00000000 */ nop +/* A2E014 80243DD4 45010016 */ bc1t .L80243E30 +/* A2E018 80243DD8 3C05FC35 */ lui $a1, 0xfc35 +/* A2E01C 80243DDC 34A57E6A */ ori $a1, $a1, 0x7e6a +/* A2E020 80243DE0 3C0411FC */ lui $a0, 0x11fc +/* A2E024 80243DE4 3484FC7E */ ori $a0, $a0, 0xfc7e +/* A2E028 80243DE8 3C06D0D0 */ lui $a2, 0xd0d0 +/* A2E02C 80243DEC 8E030000 */ lw $v1, ($s0) +/* A2E030 80243DF0 34C6D000 */ ori $a2, $a2, 0xd000 +/* A2E034 80243DF4 0060102D */ daddu $v0, $v1, $zero +/* A2E038 80243DF8 24630008 */ addiu $v1, $v1, 8 +/* A2E03C 80243DFC AE030000 */ sw $v1, ($s0) +/* A2E040 80243E00 AC450000 */ sw $a1, ($v0) +/* A2E044 80243E04 AC440004 */ sw $a0, 4($v0) +/* A2E048 80243E08 24620008 */ addiu $v0, $v1, 8 +/* A2E04C 80243E0C AE020000 */ sw $v0, ($s0) +/* A2E050 80243E10 3C02FA00 */ lui $v0, 0xfa00 +/* A2E054 80243E14 AC620000 */ sw $v0, ($v1) +/* A2E058 80243E18 4600110D */ trunc.w.s $f4, $f2 +/* A2E05C 80243E1C 44022000 */ mfc1 $v0, $f4 +/* 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) +.L80243E30: +/* A2E070 80243E30 8E630000 */ lw $v1, ($s3) +/* A2E074 80243E34 84620058 */ lh $v0, 0x58($v1) +/* A2E078 80243E38 1440000F */ bnez $v0, .L80243E78 +/* 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) +/* A2E08C 80243E4C 84650042 */ lh $a1, 0x42($v1) +/* A2E090 80243E50 02242021 */ addu $a0, $s1, $a0 +/* A2E094 80243E54 0C090DD6 */ jal func_80243758_A2D998 +/* A2E098 80243E58 02452821 */ addu $a1, $s2, $a1 +/* A2E09C 80243E5C 8E620000 */ lw $v0, ($s3) +/* A2E0A0 80243E60 8C460004 */ lw $a2, 4($v0) +/* A2E0A4 80243E64 8C470008 */ lw $a3, 8($v0) +/* A2E0A8 80243E68 8444003C */ lh $a0, 0x3c($v0) +/* A2E0AC 80243E6C 8445003E */ lh $a1, 0x3e($v0) +/* A2E0B0 80243E70 08090FAB */ j .L80243EAC +/* A2E0B4 80243E74 02242021 */ addu $a0, $s1, $a0 +.L80243E78: +/* A2E0B8 80243E78 8C660004 */ lw $a2, 4($v1) +/* A2E0BC 80243E7C 8C670008 */ lw $a3, 8($v1) +/* A2E0C0 80243E80 8464003C */ lh $a0, 0x3c($v1) +/* A2E0C4 80243E84 8465003E */ lh $a1, 0x3e($v1) +/* A2E0C8 80243E88 02242021 */ addu $a0, $s1, $a0 +/* A2E0CC 80243E8C 0C090DD6 */ jal func_80243758_A2D998 +/* A2E0D0 80243E90 02452821 */ addu $a1, $s2, $a1 +/* A2E0D4 80243E94 8E620000 */ lw $v0, ($s3) +/* A2E0D8 80243E98 8C46000C */ lw $a2, 0xc($v0) +/* A2E0DC 80243E9C 8C470010 */ lw $a3, 0x10($v0) +/* A2E0E0 80243EA0 84440040 */ lh $a0, 0x40($v0) +/* A2E0E4 80243EA4 84450042 */ lh $a1, 0x42($v0) +/* A2E0E8 80243EA8 02242021 */ addu $a0, $s1, $a0 +.L80243EAC: +/* A2E0EC 80243EAC 0C090DD6 */ jal func_80243758_A2D998 +/* A2E0F0 80243EB0 02452821 */ addu $a1, $s2, $a1 +/* A2E0F4 80243EB4 8FBF0028 */ lw $ra, 0x28($sp) +/* A2E0F8 80243EB8 8FB30024 */ lw $s3, 0x24($sp) +/* A2E0FC 80243EBC 8FB20020 */ lw $s2, 0x20($sp) +/* A2E100 80243EC0 8FB1001C */ lw $s1, 0x1c($sp) +/* A2E104 80243EC4 8FB00018 */ lw $s0, 0x18($sp) +/* A2E108 80243EC8 03E00008 */ jr $ra +/* A2E10C 80243ECC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0.s deleted file mode 100644 index 3267a62b71..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243ED0 -/* A2E110 80243ED0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2E114 80243ED4 24A5FFFF */ addiu $a1, $a1, -1 -/* A2E118 80243ED8 04A1000C */ bgez $a1, .L80243F0C -/* A2E11C 80243EDC AFBF0010 */ sw $ra, 0x10($sp) -/* A2E120 80243EE0 3404D6B5 */ ori $a0, $zero, 0xd6b5 -/* A2E124 80243EE4 3C028025 */ lui $v0, 0x8025 -/* A2E128 80243EE8 8C42AA20 */ lw $v0, -0x55e0($v0) -/* A2E12C 80243EEC 240300FF */ addiu $v1, $zero, 0xff -/* A2E130 80243EF0 8C420008 */ lw $v0, 8($v0) -.L80243EF4: -/* A2E134 80243EF4 A4440000 */ sh $a0, ($v0) -/* A2E138 80243EF8 2463FFFF */ addiu $v1, $v1, -1 -/* A2E13C 80243EFC 0461FFFD */ bgez $v1, .L80243EF4 -/* A2E140 80243F00 24420002 */ addiu $v0, $v0, 2 -/* A2E144 80243F04 08090FEE */ j .L80243FB8 -/* A2E148 80243F08 00000000 */ nop -.L80243F0C: -/* A2E14C 80243F0C 14800010 */ bnez $a0, .L80243F50 -/* A2E150 80243F10 00052080 */ sll $a0, $a1, 2 -/* A2E154 80243F14 3C030022 */ lui $v1, 0x22 -/* A2E158 80243F18 246391B0 */ addiu $v1, $v1, -0x6e50 -/* A2E15C 80243F1C 00852021 */ addu $a0, $a0, $a1 -/* A2E160 80243F20 00042080 */ sll $a0, $a0, 2 -/* A2E164 80243F24 00852021 */ addu $a0, $a0, $a1 -/* A2E168 80243F28 000420C0 */ sll $a0, $a0, 3 -/* A2E16C 80243F2C 00852021 */ addu $a0, $a0, $a1 -/* A2E170 80243F30 00042100 */ sll $a0, $a0, 4 -/* A2E174 80243F34 00852021 */ addu $a0, $a0, $a1 -/* A2E178 80243F38 00042100 */ sll $a0, $a0, 4 -/* A2E17C 80243F3C 3C028025 */ lui $v0, 0x8025 -/* A2E180 80243F40 8C42AA20 */ lw $v0, -0x55e0($v0) -/* A2E184 80243F44 8C460004 */ lw $a2, 4($v0) -/* A2E188 80243F48 08090FE2 */ j .L80243F88 -/* A2E18C 80243F4C 00832021 */ addu $a0, $a0, $v1 -.L80243F50: -/* A2E190 80243F50 3C030022 */ lui $v1, 0x22 -/* A2E194 80243F54 246391B0 */ addiu $v1, $v1, -0x6e50 -/* A2E198 80243F58 00852021 */ addu $a0, $a0, $a1 -/* A2E19C 80243F5C 00042080 */ sll $a0, $a0, 2 -/* A2E1A0 80243F60 00852021 */ addu $a0, $a0, $a1 -/* A2E1A4 80243F64 000420C0 */ sll $a0, $a0, 3 -/* A2E1A8 80243F68 00852021 */ addu $a0, $a0, $a1 -/* A2E1AC 80243F6C 00042100 */ sll $a0, $a0, 4 -/* A2E1B0 80243F70 00852021 */ addu $a0, $a0, $a1 -/* A2E1B4 80243F74 00042100 */ sll $a0, $a0, 4 -/* A2E1B8 80243F78 3C028025 */ lui $v0, 0x8025 -/* A2E1BC 80243F7C 8C42AA20 */ lw $v0, -0x55e0($v0) -/* A2E1C0 80243F80 00832021 */ addu $a0, $a0, $v1 -/* A2E1C4 80243F84 8C46000C */ lw $a2, 0xc($v0) -.L80243F88: -/* A2E1C8 80243F88 24A20001 */ addiu $v0, $a1, 1 -/* A2E1CC 80243F8C 00022880 */ sll $a1, $v0, 2 -/* A2E1D0 80243F90 00A22821 */ addu $a1, $a1, $v0 -/* A2E1D4 80243F94 00052880 */ sll $a1, $a1, 2 -/* A2E1D8 80243F98 00A22821 */ addu $a1, $a1, $v0 -/* A2E1DC 80243F9C 000528C0 */ sll $a1, $a1, 3 -/* A2E1E0 80243FA0 00A22821 */ addu $a1, $a1, $v0 -/* A2E1E4 80243FA4 00052900 */ sll $a1, $a1, 4 -/* A2E1E8 80243FA8 00A22821 */ addu $a1, $a1, $v0 -/* A2E1EC 80243FAC 00052900 */ sll $a1, $a1, 4 -/* A2E1F0 80243FB0 0C00A5CF */ jal dma_copy -/* A2E1F4 80243FB4 00A32821 */ addu $a1, $a1, $v1 -.L80243FB8: -/* A2E1F8 80243FB8 8FBF0010 */ lw $ra, 0x10($sp) -/* A2E1FC 80243FBC 03E00008 */ jr $ra -/* A2E200 80243FC0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s new file mode 100644 index 0000000000..7b040d1a45 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243ED0_A2E110.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243ED0_A2E110 +/* A2E110 80243ED0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2E114 80243ED4 24A5FFFF */ addiu $a1, $a1, -1 +/* A2E118 80243ED8 04A1000C */ bgez $a1, .L80243F0C +/* A2E11C 80243EDC AFBF0010 */ sw $ra, 0x10($sp) +/* A2E120 80243EE0 3404D6B5 */ ori $a0, $zero, 0xd6b5 +/* A2E124 80243EE4 3C028025 */ lui $v0, 0x8025 +/* A2E128 80243EE8 8C42AA20 */ lw $v0, -0x55e0($v0) +/* A2E12C 80243EEC 240300FF */ addiu $v1, $zero, 0xff +/* A2E130 80243EF0 8C420008 */ lw $v0, 8($v0) +.L80243EF4: +/* A2E134 80243EF4 A4440000 */ sh $a0, ($v0) +/* A2E138 80243EF8 2463FFFF */ addiu $v1, $v1, -1 +/* A2E13C 80243EFC 0461FFFD */ bgez $v1, .L80243EF4 +/* A2E140 80243F00 24420002 */ addiu $v0, $v0, 2 +/* A2E144 80243F04 08090FEE */ j .L80243FB8 +/* A2E148 80243F08 00000000 */ nop +.L80243F0C: +/* A2E14C 80243F0C 14800010 */ bnez $a0, .L80243F50 +/* A2E150 80243F10 00052080 */ sll $a0, $a1, 2 +/* A2E154 80243F14 3C030022 */ lui $v1, 0x22 +/* A2E158 80243F18 246391B0 */ addiu $v1, $v1, -0x6e50 +/* A2E15C 80243F1C 00852021 */ addu $a0, $a0, $a1 +/* A2E160 80243F20 00042080 */ sll $a0, $a0, 2 +/* A2E164 80243F24 00852021 */ addu $a0, $a0, $a1 +/* A2E168 80243F28 000420C0 */ sll $a0, $a0, 3 +/* A2E16C 80243F2C 00852021 */ addu $a0, $a0, $a1 +/* A2E170 80243F30 00042100 */ sll $a0, $a0, 4 +/* A2E174 80243F34 00852021 */ addu $a0, $a0, $a1 +/* A2E178 80243F38 00042100 */ sll $a0, $a0, 4 +/* A2E17C 80243F3C 3C028025 */ lui $v0, 0x8025 +/* A2E180 80243F40 8C42AA20 */ lw $v0, -0x55e0($v0) +/* A2E184 80243F44 8C460004 */ lw $a2, 4($v0) +/* A2E188 80243F48 08090FE2 */ j .L80243F88 +/* A2E18C 80243F4C 00832021 */ addu $a0, $a0, $v1 +.L80243F50: +/* A2E190 80243F50 3C030022 */ lui $v1, 0x22 +/* A2E194 80243F54 246391B0 */ addiu $v1, $v1, -0x6e50 +/* A2E198 80243F58 00852021 */ addu $a0, $a0, $a1 +/* A2E19C 80243F5C 00042080 */ sll $a0, $a0, 2 +/* A2E1A0 80243F60 00852021 */ addu $a0, $a0, $a1 +/* A2E1A4 80243F64 000420C0 */ sll $a0, $a0, 3 +/* A2E1A8 80243F68 00852021 */ addu $a0, $a0, $a1 +/* A2E1AC 80243F6C 00042100 */ sll $a0, $a0, 4 +/* A2E1B0 80243F70 00852021 */ addu $a0, $a0, $a1 +/* A2E1B4 80243F74 00042100 */ sll $a0, $a0, 4 +/* A2E1B8 80243F78 3C028025 */ lui $v0, 0x8025 +/* A2E1BC 80243F7C 8C42AA20 */ lw $v0, -0x55e0($v0) +/* A2E1C0 80243F80 00832021 */ addu $a0, $a0, $v1 +/* A2E1C4 80243F84 8C46000C */ lw $a2, 0xc($v0) +.L80243F88: +/* A2E1C8 80243F88 24A20001 */ addiu $v0, $a1, 1 +/* A2E1CC 80243F8C 00022880 */ sll $a1, $v0, 2 +/* A2E1D0 80243F90 00A22821 */ addu $a1, $a1, $v0 +/* A2E1D4 80243F94 00052880 */ sll $a1, $a1, 2 +/* A2E1D8 80243F98 00A22821 */ addu $a1, $a1, $v0 +/* A2E1DC 80243F9C 000528C0 */ sll $a1, $a1, 3 +/* A2E1E0 80243FA0 00A22821 */ addu $a1, $a1, $v0 +/* A2E1E4 80243FA4 00052900 */ sll $a1, $a1, 4 +/* A2E1E8 80243FA8 00A22821 */ addu $a1, $a1, $v0 +/* A2E1EC 80243FAC 00052900 */ sll $a1, $a1, 4 +/* A2E1F0 80243FB0 0C00A5CF */ jal dma_copy +/* A2E1F4 80243FB4 00A32821 */ addu $a1, $a1, $v1 +.L80243FB8: +/* A2E1F8 80243FB8 8FBF0010 */ lw $ra, 0x10($sp) +/* A2E1FC 80243FBC 03E00008 */ jr $ra +/* A2E200 80243FC0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4.s deleted file mode 100644 index d356f49a3e..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243FC4 -/* A2E204 80243FC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2E208 80243FC8 0000202D */ daddu $a0, $zero, $zero -/* A2E20C 80243FCC 3C058024 */ lui $a1, 0x8024 -/* A2E210 80243FD0 24A53CC0 */ addiu $a1, $a1, 0x3cc0 -/* A2E214 80243FD4 AFBF0014 */ sw $ra, 0x14($sp) -/* A2E218 80243FD8 0C048C8F */ jal bind_dynamic_entity_7 -/* A2E21C 80243FDC AFB00010 */ sw $s0, 0x10($sp) -/* A2E220 80243FE0 3C040001 */ lui $a0, 1 -/* A2E224 80243FE4 3C108025 */ lui $s0, 0x8025 -/* A2E228 80243FE8 2610AA20 */ addiu $s0, $s0, -0x55e0 -/* A2E22C 80243FEC 8E030000 */ lw $v1, ($s0) -/* A2E230 80243FF0 3484D420 */ ori $a0, $a0, 0xd420 -/* A2E234 80243FF4 0C0475F9 */ jal func_8011D7E4 -/* A2E238 80243FF8 AC620000 */ sw $v0, ($v1) -/* A2E23C 80243FFC 3407A710 */ ori $a3, $zero, 0xa710 -/* A2E240 80244000 00471821 */ addu $v1, $v0, $a3 -/* A2E244 80244004 0000202D */ daddu $a0, $zero, $zero -/* A2E248 80244008 8E060000 */ lw $a2, ($s0) -/* A2E24C 8024400C 0080282D */ daddu $a1, $a0, $zero -/* A2E250 80244010 ACC30008 */ sw $v1, 8($a2) -/* A2E254 80244014 24630200 */ addiu $v1, $v1, 0x200 -/* A2E258 80244018 ACC3000C */ sw $v1, 0xc($a2) -/* A2E25C 8024401C 00671821 */ addu $v1, $v1, $a3 -/* A2E260 80244020 ACC30010 */ sw $v1, 0x10($a2) -/* A2E264 80244024 24630200 */ addiu $v1, $v1, 0x200 -/* A2E268 80244028 ACC30018 */ sw $v1, 0x18($a2) -/* A2E26C 8024402C 24634000 */ addiu $v1, $v1, 0x4000 -/* A2E270 80244030 ACC3001C */ sw $v1, 0x1c($a2) -/* A2E274 80244034 24634000 */ addiu $v1, $v1, 0x4000 -/* A2E278 80244038 ACC20004 */ sw $v0, 4($a2) -/* A2E27C 8024403C 240200F0 */ addiu $v0, $zero, 0xf0 -/* A2E280 80244040 A4C20046 */ sh $v0, 0x46($a2) -/* A2E284 80244044 2402006F */ addiu $v0, $zero, 0x6f -/* A2E288 80244048 A4C20048 */ sh $v0, 0x48($a2) -/* A2E28C 8024404C 24020036 */ addiu $v0, $zero, 0x36 -/* A2E290 80244050 ACC30020 */ sw $v1, 0x20($a2) -/* A2E294 80244054 A4C0003C */ sh $zero, 0x3c($a2) -/* A2E298 80244058 A4C0003E */ sh $zero, 0x3e($a2) -/* A2E29C 8024405C A4C00040 */ sh $zero, 0x40($a2) -/* A2E2A0 80244060 A4C00042 */ sh $zero, 0x42($a2) -/* A2E2A4 80244064 A4C00044 */ sh $zero, 0x44($a2) -/* A2E2A8 80244068 0C090FB4 */ jal func_80243ED0 -/* A2E2AC 8024406C A4C2004A */ sh $v0, 0x4a($a2) -/* A2E2B0 80244070 24040001 */ addiu $a0, $zero, 1 -/* A2E2B4 80244074 0C090FB4 */ jal func_80243ED0 -/* A2E2B8 80244078 0080282D */ daddu $a1, $a0, $zero -/* A2E2BC 8024407C 3C030002 */ lui $v1, 2 -/* A2E2C0 80244080 3463A440 */ ori $v1, $v1, 0xa440 -/* A2E2C4 80244084 3C050022 */ lui $a1, 0x22 -/* A2E2C8 80244088 24A591B0 */ addiu $a1, $a1, -0x6e50 -/* A2E2CC 8024408C 00A32021 */ addu $a0, $a1, $v1 -/* A2E2D0 80244090 24A54000 */ addiu $a1, $a1, 0x4000 -/* A2E2D4 80244094 8E020000 */ lw $v0, ($s0) -/* A2E2D8 80244098 00A32821 */ addu $a1, $a1, $v1 -/* A2E2DC 8024409C 8C460018 */ lw $a2, 0x18($v0) -/* A2E2E0 802440A0 0C00A5CF */ jal dma_copy -/* A2E2E4 802440A4 24A54200 */ addiu $a1, $a1, 0x4200 -/* A2E2E8 802440A8 8E040000 */ lw $a0, ($s0) -/* A2E2EC 802440AC 240300FF */ addiu $v1, $zero, 0xff -/* A2E2F0 802440B0 A4800058 */ sh $zero, 0x58($a0) -/* A2E2F4 802440B4 A483005A */ sh $v1, 0x5a($a0) -/* A2E2F8 802440B8 A480005C */ sh $zero, 0x5c($a0) -/* A2E2FC 802440BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A2E300 802440C0 8FB00010 */ lw $s0, 0x10($sp) -/* A2E304 802440C4 24020002 */ addiu $v0, $zero, 2 -/* A2E308 802440C8 03E00008 */ jr $ra -/* A2E30C 802440CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s new file mode 100644 index 0000000000..f16010f3c2 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80243FC4_A2E204.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243FC4_A2E204 +/* A2E204 80243FC4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2E208 80243FC8 0000202D */ daddu $a0, $zero, $zero +/* A2E20C 80243FCC 3C058024 */ lui $a1, 0x8024 +/* A2E210 80243FD0 24A53CC0 */ addiu $a1, $a1, 0x3cc0 +/* A2E214 80243FD4 AFBF0014 */ sw $ra, 0x14($sp) +/* A2E218 80243FD8 0C048C8F */ jal bind_dynamic_entity_7 +/* A2E21C 80243FDC AFB00010 */ sw $s0, 0x10($sp) +/* A2E220 80243FE0 3C040001 */ lui $a0, 1 +/* A2E224 80243FE4 3C108025 */ lui $s0, 0x8025 +/* A2E228 80243FE8 2610AA20 */ addiu $s0, $s0, -0x55e0 +/* A2E22C 80243FEC 8E030000 */ lw $v1, ($s0) +/* A2E230 80243FF0 3484D420 */ ori $a0, $a0, 0xd420 +/* A2E234 80243FF4 0C0475F9 */ jal func_8011D7E4 +/* A2E238 80243FF8 AC620000 */ sw $v0, ($v1) +/* A2E23C 80243FFC 3407A710 */ ori $a3, $zero, 0xa710 +/* A2E240 80244000 00471821 */ addu $v1, $v0, $a3 +/* A2E244 80244004 0000202D */ daddu $a0, $zero, $zero +/* A2E248 80244008 8E060000 */ lw $a2, ($s0) +/* A2E24C 8024400C 0080282D */ daddu $a1, $a0, $zero +/* A2E250 80244010 ACC30008 */ sw $v1, 8($a2) +/* A2E254 80244014 24630200 */ addiu $v1, $v1, 0x200 +/* A2E258 80244018 ACC3000C */ sw $v1, 0xc($a2) +/* A2E25C 8024401C 00671821 */ addu $v1, $v1, $a3 +/* A2E260 80244020 ACC30010 */ sw $v1, 0x10($a2) +/* A2E264 80244024 24630200 */ addiu $v1, $v1, 0x200 +/* A2E268 80244028 ACC30018 */ sw $v1, 0x18($a2) +/* A2E26C 8024402C 24634000 */ addiu $v1, $v1, 0x4000 +/* A2E270 80244030 ACC3001C */ sw $v1, 0x1c($a2) +/* A2E274 80244034 24634000 */ addiu $v1, $v1, 0x4000 +/* A2E278 80244038 ACC20004 */ sw $v0, 4($a2) +/* A2E27C 8024403C 240200F0 */ addiu $v0, $zero, 0xf0 +/* A2E280 80244040 A4C20046 */ sh $v0, 0x46($a2) +/* A2E284 80244044 2402006F */ addiu $v0, $zero, 0x6f +/* A2E288 80244048 A4C20048 */ sh $v0, 0x48($a2) +/* A2E28C 8024404C 24020036 */ addiu $v0, $zero, 0x36 +/* A2E290 80244050 ACC30020 */ sw $v1, 0x20($a2) +/* A2E294 80244054 A4C0003C */ sh $zero, 0x3c($a2) +/* A2E298 80244058 A4C0003E */ sh $zero, 0x3e($a2) +/* A2E29C 8024405C A4C00040 */ sh $zero, 0x40($a2) +/* A2E2A0 80244060 A4C00042 */ sh $zero, 0x42($a2) +/* A2E2A4 80244064 A4C00044 */ sh $zero, 0x44($a2) +/* A2E2A8 80244068 0C090FB4 */ jal func_80243ED0_A2E110 +/* A2E2AC 8024406C A4C2004A */ sh $v0, 0x4a($a2) +/* A2E2B0 80244070 24040001 */ addiu $a0, $zero, 1 +/* A2E2B4 80244074 0C090FB4 */ jal func_80243ED0_A2E110 +/* A2E2B8 80244078 0080282D */ daddu $a1, $a0, $zero +/* A2E2BC 8024407C 3C030002 */ lui $v1, 2 +/* A2E2C0 80244080 3463A440 */ ori $v1, $v1, 0xa440 +/* A2E2C4 80244084 3C050022 */ lui $a1, 0x22 +/* A2E2C8 80244088 24A591B0 */ addiu $a1, $a1, -0x6e50 +/* A2E2CC 8024408C 00A32021 */ addu $a0, $a1, $v1 +/* A2E2D0 80244090 24A54000 */ addiu $a1, $a1, 0x4000 +/* A2E2D4 80244094 8E020000 */ lw $v0, ($s0) +/* A2E2D8 80244098 00A32821 */ addu $a1, $a1, $v1 +/* A2E2DC 8024409C 8C460018 */ lw $a2, 0x18($v0) +/* A2E2E0 802440A0 0C00A5CF */ jal dma_copy +/* A2E2E4 802440A4 24A54200 */ addiu $a1, $a1, 0x4200 +/* A2E2E8 802440A8 8E040000 */ lw $a0, ($s0) +/* A2E2EC 802440AC 240300FF */ addiu $v1, $zero, 0xff +/* A2E2F0 802440B0 A4800058 */ sh $zero, 0x58($a0) +/* A2E2F4 802440B4 A483005A */ sh $v1, 0x5a($a0) +/* A2E2F8 802440B8 A480005C */ sh $zero, 0x5c($a0) +/* A2E2FC 802440BC 8FBF0014 */ lw $ra, 0x14($sp) +/* A2E300 802440C0 8FB00010 */ lw $s0, 0x10($sp) +/* A2E304 802440C4 24020002 */ addiu $v0, $zero, 2 +/* A2E308 802440C8 03E00008 */ jr $ra +/* A2E30C 802440CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0.s deleted file mode 100644 index 6ebabb79c7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0.s +++ /dev/null @@ -1,245 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802440D0 -/* A2E310 802440D0 3C038025 */ lui $v1, 0x8025 -/* A2E314 802440D4 8C63AAB0 */ lw $v1, -0x5550($v1) -/* A2E318 802440D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2E31C 802440DC AFBF0014 */ sw $ra, 0x14($sp) -/* A2E320 802440E0 2C620007 */ sltiu $v0, $v1, 7 -/* A2E324 802440E4 104000D4 */ beqz $v0, .L80244438 -/* A2E328 802440E8 AFB00010 */ sw $s0, 0x10($sp) -/* A2E32C 802440EC 00031080 */ sll $v0, $v1, 2 -/* A2E330 802440F0 3C018025 */ lui $at, 0x8025 -/* A2E334 802440F4 00220821 */ addu $at, $at, $v0 -/* A2E338 802440F8 8C22F240 */ lw $v0, -0xdc0($at) -/* A2E33C 802440FC 00400008 */ jr $v0 -/* A2E340 80244100 00000000 */ nop -/* A2E344 80244104 3C048025 */ lui $a0, 0x8025 -/* A2E348 80244108 2484AAB0 */ addiu $a0, $a0, -0x5550 -/* A2E34C 8024410C 3C038025 */ lui $v1, 0x8025 -/* A2E350 80244110 08091097 */ j .L8024425C -/* A2E354 80244114 8C63AAB4 */ lw $v1, -0x554c($v1) -/* A2E358 80244118 3C068025 */ lui $a2, 0x8025 -/* A2E35C 8024411C 24C6AAB8 */ addiu $a2, $a2, -0x5548 -/* A2E360 80244120 8CC20000 */ lw $v0, ($a2) -/* A2E364 80244124 10400003 */ beqz $v0, .L80244134 -/* A2E368 80244128 2442FFFF */ addiu $v0, $v0, -1 -/* A2E36C 8024412C 08091110 */ j .L80244440 -/* A2E370 80244130 ACC20000 */ sw $v0, ($a2) -.L80244134: -/* A2E374 80244134 240400B0 */ addiu $a0, $zero, 0xb0 -/* A2E378 80244138 3C028025 */ lui $v0, 0x8025 -/* A2E37C 8024413C 2442AAB0 */ addiu $v0, $v0, -0x5550 -/* A2E380 80244140 8C430000 */ lw $v1, ($v0) -/* A2E384 80244144 2405001A */ addiu $a1, $zero, 0x1a -/* A2E388 80244148 ACC50000 */ sw $a1, ($a2) -/* A2E38C 8024414C 24630001 */ addiu $v1, $v1, 1 -/* A2E390 80244150 0C05272D */ jal play_sound -/* A2E394 80244154 AC430000 */ sw $v1, ($v0) -/* A2E398 80244158 08091111 */ j .L80244444 -/* A2E39C 8024415C 0000102D */ daddu $v0, $zero, $zero -/* A2E3A0 80244160 3C058025 */ lui $a1, 0x8025 -/* A2E3A4 80244164 24A5AAB8 */ addiu $a1, $a1, -0x5548 -/* A2E3A8 80244168 8CA30000 */ lw $v1, ($a1) -/* A2E3AC 8024416C 10600008 */ beqz $v1, .L80244190 -/* A2E3B0 80244170 2463FFFF */ addiu $v1, $v1, -1 -/* A2E3B4 80244174 3C048025 */ lui $a0, 0x8025 -/* A2E3B8 80244178 8C84AA20 */ lw $a0, -0x55e0($a0) -/* A2E3BC 8024417C 84820058 */ lh $v0, 0x58($a0) -/* A2E3C0 80244180 1040009E */ beqz $v0, .L802443FC -/* A2E3C4 80244184 ACA30000 */ sw $v1, ($a1) -/* A2E3C8 80244188 080910F7 */ j .L802443DC -/* A2E3CC 8024418C 24020019 */ addiu $v0, $zero, 0x19 -.L80244190: -/* A2E3D0 80244190 3C038025 */ lui $v1, 0x8025 -/* A2E3D4 80244194 2463AAB4 */ addiu $v1, $v1, -0x554c -/* A2E3D8 80244198 8C640000 */ lw $a0, ($v1) -/* A2E3DC 8024419C 24820001 */ addiu $v0, $a0, 1 -/* A2E3E0 802441A0 24850002 */ addiu $a1, $a0, 2 -/* A2E3E4 802441A4 AC620000 */ sw $v0, ($v1) -/* A2E3E8 802441A8 28A20005 */ slti $v0, $a1, 5 -/* A2E3EC 802441AC 10400011 */ beqz $v0, .L802441F4 -/* A2E3F0 802441B0 00000000 */ nop -/* A2E3F4 802441B4 3C108025 */ lui $s0, 0x8025 -/* A2E3F8 802441B8 2610AA20 */ addiu $s0, $s0, -0x55e0 -/* A2E3FC 802441BC 8E020000 */ lw $v0, ($s0) -/* A2E400 802441C0 0C090FB4 */ jal func_80243ED0 -/* A2E404 802441C4 84440058 */ lh $a0, 0x58($v0) -/* A2E408 802441C8 8E020000 */ lw $v0, ($s0) -/* A2E40C 802441CC 94430058 */ lhu $v1, 0x58($v0) -/* A2E410 802441D0 3C018025 */ lui $at, 0x8025 -/* A2E414 802441D4 AC20AAB0 */ sw $zero, -0x5550($at) -/* A2E418 802441D8 A440003C */ sh $zero, 0x3c($v0) -/* A2E41C 802441DC A440003E */ sh $zero, 0x3e($v0) -/* A2E420 802441E0 A4400040 */ sh $zero, 0x40($v0) -/* A2E424 802441E4 A4400042 */ sh $zero, 0x42($v0) -/* A2E428 802441E8 38630001 */ xori $v1, $v1, 1 -/* A2E42C 802441EC 08091110 */ j .L80244440 -/* A2E430 802441F0 A4430058 */ sh $v1, 0x58($v0) -.L802441F4: -/* A2E434 802441F4 3C038025 */ lui $v1, 0x8025 -/* A2E438 802441F8 8C63AA20 */ lw $v1, -0x55e0($v1) -/* A2E43C 802441FC 84620058 */ lh $v0, 0x58($v1) -/* A2E440 80244200 54400004 */ bnel $v0, $zero, .L80244214 -/* A2E444 80244204 A460003C */ sh $zero, 0x3c($v1) -/* A2E448 80244208 A4600040 */ sh $zero, 0x40($v1) -/* A2E44C 8024420C 08091086 */ j .L80244218 -/* A2E450 80244210 A4600042 */ sh $zero, 0x42($v1) -.L80244214: -/* A2E454 80244214 A460003E */ sh $zero, 0x3e($v1) -.L80244218: -/* A2E458 80244218 3C04800B */ lui $a0, %hi(gCameras) -/* A2E45C 8024421C 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A2E460 80244220 3C058025 */ lui $a1, 0x8025 -/* A2E464 80244224 24A5AAB0 */ addiu $a1, $a1, -0x5550 -/* A2E468 80244228 94820000 */ lhu $v0, ($a0) -/* A2E46C 8024422C 8CA30000 */ lw $v1, ($a1) -/* A2E470 80244230 3042FFFD */ andi $v0, $v0, 0xfffd -/* A2E474 80244234 24630001 */ addiu $v1, $v1, 1 -/* A2E478 80244238 A4820000 */ sh $v0, ($a0) -/* A2E47C 8024423C 08091110 */ j .L80244440 -/* A2E480 80244240 ACA30000 */ sw $v1, ($a1) -/* A2E484 80244244 3C038025 */ lui $v1, 0x8025 -/* A2E488 80244248 8C63AAB4 */ lw $v1, -0x554c($v1) -/* A2E48C 8024424C 3C048025 */ lui $a0, 0x8025 -/* A2E490 80244250 2484AAB0 */ addiu $a0, $a0, -0x5550 -/* A2E494 80244254 3C018025 */ lui $at, 0x8025 -/* A2E498 80244258 AC20AABC */ sw $zero, -0x5544($at) -.L8024425C: -/* A2E49C 8024425C 8C820000 */ lw $v0, ($a0) -/* A2E4A0 80244260 00031880 */ sll $v1, $v1, 2 -/* A2E4A4 80244264 3C018025 */ lui $at, 0x8025 -/* A2E4A8 80244268 00230821 */ addu $at, $at, $v1 -/* A2E4AC 8024426C 8C23AAC0 */ lw $v1, -0x5540($at) -/* A2E4B0 80244270 24420001 */ addiu $v0, $v0, 1 -/* A2E4B4 80244274 AC820000 */ sw $v0, ($a0) -/* A2E4B8 80244278 3C018025 */ lui $at, 0x8025 -/* A2E4BC 8024427C AC23AAB8 */ sw $v1, -0x5548($at) -/* A2E4C0 80244280 08091111 */ j .L80244444 -/* A2E4C4 80244284 0000102D */ daddu $v0, $zero, $zero -/* A2E4C8 80244288 3C068025 */ lui $a2, 0x8025 -/* A2E4CC 8024428C 24C6AAB8 */ addiu $a2, $a2, -0x5548 -/* A2E4D0 80244290 8CC30000 */ lw $v1, ($a2) -/* A2E4D4 80244294 10600038 */ beqz $v1, .L80244378 -/* A2E4D8 80244298 240400B0 */ addiu $a0, $zero, 0xb0 -/* A2E4DC 8024429C 3C028025 */ lui $v0, 0x8025 -/* A2E4E0 802442A0 8C42AAB4 */ lw $v0, -0x554c($v0) -/* A2E4E4 802442A4 00021080 */ sll $v0, $v0, 2 -/* A2E4E8 802442A8 3C018025 */ lui $at, 0x8025 -/* A2E4EC 802442AC 00220821 */ addu $at, $at, $v0 -/* A2E4F0 802442B0 8C22AAC0 */ lw $v0, -0x5540($at) -/* A2E4F4 802442B4 2442FEF4 */ addiu $v0, $v0, -0x10c -/* A2E4F8 802442B8 0062102A */ slt $v0, $v1, $v0 -/* A2E4FC 802442BC 10400028 */ beqz $v0, .L80244360 -/* A2E500 802442C0 00000000 */ nop -/* A2E504 802442C4 3C048025 */ lui $a0, 0x8025 -/* A2E508 802442C8 8C84AABC */ lw $a0, -0x5544($a0) -/* A2E50C 802442CC 2C820140 */ sltiu $v0, $a0, 0x140 -/* A2E510 802442D0 1040000B */ beqz $v0, .L80244300 -/* A2E514 802442D4 2483FEC0 */ addiu $v1, $a0, -0x140 -/* A2E518 802442D8 3C028025 */ lui $v0, 0x8025 -/* A2E51C 802442DC 8C42AA20 */ lw $v0, -0x55e0($v0) -/* A2E520 802442E0 3C038025 */ lui $v1, 0x8025 -/* A2E524 802442E4 9463AC7C */ lhu $v1, -0x5384($v1) -/* A2E528 802442E8 A4430044 */ sh $v1, 0x44($v0) -/* A2E52C 802442EC 3C038025 */ lui $v1, 0x8025 -/* A2E530 802442F0 00641821 */ addu $v1, $v1, $a0 -/* A2E534 802442F4 9063AB3C */ lbu $v1, -0x54c4($v1) -/* A2E538 802442F8 080910D3 */ j .L8024434C -/* A2E53C 802442FC A4430046 */ sh $v1, 0x46($v0) -.L80244300: -/* A2E540 80244300 2C62000F */ sltiu $v0, $v1, 0xf -/* A2E544 80244304 10400011 */ beqz $v0, .L8024434C -/* A2E548 80244308 00032040 */ sll $a0, $v1, 1 -/* A2E54C 8024430C 3C058025 */ lui $a1, 0x8025 -/* A2E550 80244310 8CA5AA20 */ lw $a1, -0x55e0($a1) -/* A2E554 80244314 3C028025 */ lui $v0, 0x8025 -/* A2E558 80244318 00441021 */ addu $v0, $v0, $a0 -/* A2E55C 8024431C 9442AC7C */ lhu $v0, -0x5384($v0) -/* A2E560 80244320 A4A20044 */ sh $v0, 0x44($a1) -/* A2E564 80244324 2C62000D */ sltiu $v0, $v1, 0xd -/* A2E568 80244328 10400008 */ beqz $v0, .L8024434C -/* A2E56C 8024432C 00000000 */ nop -/* A2E570 80244330 3C028025 */ lui $v0, 0x8025 -/* A2E574 80244334 9042AC7B */ lbu $v0, -0x5385($v0) -/* A2E578 80244338 3C038025 */ lui $v1, 0x8025 -/* A2E57C 8024433C 00641821 */ addu $v1, $v1, $a0 -/* A2E580 80244340 9463AC9C */ lhu $v1, -0x5364($v1) -/* A2E584 80244344 00431021 */ addu $v0, $v0, $v1 -/* A2E588 80244348 A4A20046 */ sh $v0, 0x46($a1) -.L8024434C: -/* A2E58C 8024434C 3C038025 */ lui $v1, 0x8025 -/* A2E590 80244350 2463AABC */ addiu $v1, $v1, -0x5544 -/* A2E594 80244354 8C620000 */ lw $v0, ($v1) -/* A2E598 80244358 24420001 */ addiu $v0, $v0, 1 -/* A2E59C 8024435C AC620000 */ sw $v0, ($v1) -.L80244360: -/* A2E5A0 80244360 3C038025 */ lui $v1, 0x8025 -/* A2E5A4 80244364 2463AAB8 */ addiu $v1, $v1, -0x5548 -/* A2E5A8 80244368 8C620000 */ lw $v0, ($v1) -/* A2E5AC 8024436C 2442FFFF */ addiu $v0, $v0, -1 -/* A2E5B0 80244370 08091110 */ j .L80244440 -/* A2E5B4 80244374 AC620000 */ sw $v0, ($v1) -.L80244378: -/* A2E5B8 80244378 3C058025 */ lui $a1, 0x8025 -/* A2E5BC 8024437C 24A5AAB0 */ addiu $a1, $a1, -0x5550 -/* A2E5C0 80244380 8CA20000 */ lw $v0, ($a1) -/* A2E5C4 80244384 2403001A */ addiu $v1, $zero, 0x1a -/* A2E5C8 80244388 ACC30000 */ sw $v1, ($a2) -/* A2E5CC 8024438C 24420001 */ addiu $v0, $v0, 1 -/* A2E5D0 80244390 ACA20000 */ sw $v0, ($a1) -/* A2E5D4 80244394 3C038025 */ lui $v1, 0x8025 -/* A2E5D8 80244398 8C63AA20 */ lw $v1, -0x55e0($v1) -/* A2E5DC 8024439C 240200FF */ addiu $v0, $zero, 0xff -/* A2E5E0 802443A0 0C05272D */ jal play_sound -/* A2E5E4 802443A4 A462005C */ sh $v0, 0x5c($v1) -/* A2E5E8 802443A8 08091111 */ j .L80244444 -/* A2E5EC 802443AC 0000102D */ daddu $v0, $zero, $zero -/* A2E5F0 802443B0 3C058025 */ lui $a1, 0x8025 -/* A2E5F4 802443B4 24A5AAB8 */ addiu $a1, $a1, -0x5548 -/* A2E5F8 802443B8 8CA30000 */ lw $v1, ($a1) -/* A2E5FC 802443BC 10600018 */ beqz $v1, .L80244420 -/* A2E600 802443C0 2463FFFF */ addiu $v1, $v1, -1 -/* A2E604 802443C4 3C048025 */ lui $a0, 0x8025 -/* A2E608 802443C8 8C84AA20 */ lw $a0, -0x55e0($a0) -/* A2E60C 802443CC 84820058 */ lh $v0, 0x58($a0) -/* A2E610 802443D0 1440000A */ bnez $v0, .L802443FC -/* A2E614 802443D4 ACA30000 */ sw $v1, ($a1) -/* A2E618 802443D8 24020019 */ addiu $v0, $zero, 0x19 -.L802443DC: -/* A2E61C 802443DC 00431023 */ subu $v0, $v0, $v1 -/* A2E620 802443E0 00021080 */ sll $v0, $v0, 2 -/* A2E624 802443E4 3C018025 */ lui $at, 0x8025 -/* A2E628 802443E8 00220821 */ addu $at, $at, $v0 -/* A2E62C 802443EC 9422AAD6 */ lhu $v0, -0x552a($at) -/* A2E630 802443F0 A4800042 */ sh $zero, 0x42($a0) -/* A2E634 802443F4 08091110 */ j .L80244440 -/* A2E638 802443F8 A4820040 */ sh $v0, 0x40($a0) -.L802443FC: -/* A2E63C 802443FC 24020019 */ addiu $v0, $zero, 0x19 -/* A2E640 80244400 00431023 */ subu $v0, $v0, $v1 -/* A2E644 80244404 00021080 */ sll $v0, $v0, 2 -/* A2E648 80244408 3C018025 */ lui $at, 0x8025 -/* A2E64C 8024440C 00220821 */ addu $at, $at, $v0 -/* A2E650 80244410 9422AAD6 */ lhu $v0, -0x552a($at) -/* A2E654 80244414 A480003E */ sh $zero, 0x3e($a0) -/* A2E658 80244418 08091110 */ j .L80244440 -/* A2E65C 8024441C A482003C */ sh $v0, 0x3c($a0) -.L80244420: -/* A2E660 80244420 3C038025 */ lui $v1, 0x8025 -/* A2E664 80244424 2463AAB0 */ addiu $v1, $v1, -0x5550 -/* A2E668 80244428 8C620000 */ lw $v0, ($v1) -/* A2E66C 8024442C 24420001 */ addiu $v0, $v0, 1 -/* A2E670 80244430 08091110 */ j .L80244440 -/* A2E674 80244434 AC620000 */ sw $v0, ($v1) -.L80244438: -/* A2E678 80244438 08091111 */ j .L80244444 -/* A2E67C 8024443C 24020001 */ addiu $v0, $zero, 1 -.L80244440: -/* A2E680 80244440 0000102D */ daddu $v0, $zero, $zero -.L80244444: -/* A2E684 80244444 8FBF0014 */ lw $ra, 0x14($sp) -/* A2E688 80244448 8FB00010 */ lw $s0, 0x10($sp) -/* A2E68C 8024444C 03E00008 */ jr $ra -/* A2E690 80244450 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s new file mode 100644 index 0000000000..57ed8d84ed --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802440D0_A2E310.s @@ -0,0 +1,245 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802440D0_A2E310 +/* A2E310 802440D0 3C038025 */ lui $v1, 0x8025 +/* A2E314 802440D4 8C63AAB0 */ lw $v1, -0x5550($v1) +/* A2E318 802440D8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2E31C 802440DC AFBF0014 */ sw $ra, 0x14($sp) +/* A2E320 802440E0 2C620007 */ sltiu $v0, $v1, 7 +/* A2E324 802440E4 104000D4 */ beqz $v0, .L80244438 +/* A2E328 802440E8 AFB00010 */ sw $s0, 0x10($sp) +/* A2E32C 802440EC 00031080 */ sll $v0, $v1, 2 +/* A2E330 802440F0 3C018025 */ lui $at, 0x8025 +/* A2E334 802440F4 00220821 */ addu $at, $at, $v0 +/* A2E338 802440F8 8C22F240 */ lw $v0, -0xdc0($at) +/* A2E33C 802440FC 00400008 */ jr $v0 +/* A2E340 80244100 00000000 */ nop +/* A2E344 80244104 3C048025 */ lui $a0, 0x8025 +/* A2E348 80244108 2484AAB0 */ addiu $a0, $a0, -0x5550 +/* A2E34C 8024410C 3C038025 */ lui $v1, 0x8025 +/* A2E350 80244110 08091097 */ j .L8024425C +/* A2E354 80244114 8C63AAB4 */ lw $v1, -0x554c($v1) +/* A2E358 80244118 3C068025 */ lui $a2, 0x8025 +/* A2E35C 8024411C 24C6AAB8 */ addiu $a2, $a2, -0x5548 +/* A2E360 80244120 8CC20000 */ lw $v0, ($a2) +/* A2E364 80244124 10400003 */ beqz $v0, .L80244134 +/* A2E368 80244128 2442FFFF */ addiu $v0, $v0, -1 +/* A2E36C 8024412C 08091110 */ j .L80244440 +/* A2E370 80244130 ACC20000 */ sw $v0, ($a2) +.L80244134: +/* A2E374 80244134 240400B0 */ addiu $a0, $zero, 0xb0 +/* A2E378 80244138 3C028025 */ lui $v0, 0x8025 +/* A2E37C 8024413C 2442AAB0 */ addiu $v0, $v0, -0x5550 +/* A2E380 80244140 8C430000 */ lw $v1, ($v0) +/* A2E384 80244144 2405001A */ addiu $a1, $zero, 0x1a +/* A2E388 80244148 ACC50000 */ sw $a1, ($a2) +/* A2E38C 8024414C 24630001 */ addiu $v1, $v1, 1 +/* A2E390 80244150 0C05272D */ jal play_sound +/* A2E394 80244154 AC430000 */ sw $v1, ($v0) +/* A2E398 80244158 08091111 */ j .L80244444 +/* A2E39C 8024415C 0000102D */ daddu $v0, $zero, $zero +/* A2E3A0 80244160 3C058025 */ lui $a1, 0x8025 +/* A2E3A4 80244164 24A5AAB8 */ addiu $a1, $a1, -0x5548 +/* A2E3A8 80244168 8CA30000 */ lw $v1, ($a1) +/* A2E3AC 8024416C 10600008 */ beqz $v1, .L80244190 +/* A2E3B0 80244170 2463FFFF */ addiu $v1, $v1, -1 +/* A2E3B4 80244174 3C048025 */ lui $a0, 0x8025 +/* A2E3B8 80244178 8C84AA20 */ lw $a0, -0x55e0($a0) +/* A2E3BC 8024417C 84820058 */ lh $v0, 0x58($a0) +/* A2E3C0 80244180 1040009E */ beqz $v0, .L802443FC +/* A2E3C4 80244184 ACA30000 */ sw $v1, ($a1) +/* A2E3C8 80244188 080910F7 */ j .L802443DC +/* A2E3CC 8024418C 24020019 */ addiu $v0, $zero, 0x19 +.L80244190: +/* A2E3D0 80244190 3C038025 */ lui $v1, 0x8025 +/* A2E3D4 80244194 2463AAB4 */ addiu $v1, $v1, -0x554c +/* A2E3D8 80244198 8C640000 */ lw $a0, ($v1) +/* A2E3DC 8024419C 24820001 */ addiu $v0, $a0, 1 +/* A2E3E0 802441A0 24850002 */ addiu $a1, $a0, 2 +/* A2E3E4 802441A4 AC620000 */ sw $v0, ($v1) +/* A2E3E8 802441A8 28A20005 */ slti $v0, $a1, 5 +/* A2E3EC 802441AC 10400011 */ beqz $v0, .L802441F4 +/* A2E3F0 802441B0 00000000 */ nop +/* A2E3F4 802441B4 3C108025 */ lui $s0, 0x8025 +/* A2E3F8 802441B8 2610AA20 */ addiu $s0, $s0, -0x55e0 +/* A2E3FC 802441BC 8E020000 */ lw $v0, ($s0) +/* A2E400 802441C0 0C090FB4 */ jal func_80243ED0_A2E110 +/* A2E404 802441C4 84440058 */ lh $a0, 0x58($v0) +/* A2E408 802441C8 8E020000 */ lw $v0, ($s0) +/* A2E40C 802441CC 94430058 */ lhu $v1, 0x58($v0) +/* A2E410 802441D0 3C018025 */ lui $at, 0x8025 +/* A2E414 802441D4 AC20AAB0 */ sw $zero, -0x5550($at) +/* A2E418 802441D8 A440003C */ sh $zero, 0x3c($v0) +/* A2E41C 802441DC A440003E */ sh $zero, 0x3e($v0) +/* A2E420 802441E0 A4400040 */ sh $zero, 0x40($v0) +/* A2E424 802441E4 A4400042 */ sh $zero, 0x42($v0) +/* A2E428 802441E8 38630001 */ xori $v1, $v1, 1 +/* A2E42C 802441EC 08091110 */ j .L80244440 +/* A2E430 802441F0 A4430058 */ sh $v1, 0x58($v0) +.L802441F4: +/* A2E434 802441F4 3C038025 */ lui $v1, 0x8025 +/* A2E438 802441F8 8C63AA20 */ lw $v1, -0x55e0($v1) +/* A2E43C 802441FC 84620058 */ lh $v0, 0x58($v1) +/* A2E440 80244200 54400004 */ bnel $v0, $zero, .L80244214 +/* A2E444 80244204 A460003C */ sh $zero, 0x3c($v1) +/* A2E448 80244208 A4600040 */ sh $zero, 0x40($v1) +/* A2E44C 8024420C 08091086 */ j .L80244218 +/* A2E450 80244210 A4600042 */ sh $zero, 0x42($v1) +.L80244214: +/* A2E454 80244214 A460003E */ sh $zero, 0x3e($v1) +.L80244218: +/* A2E458 80244218 3C04800B */ lui $a0, %hi(gCameras) +/* A2E45C 8024421C 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A2E460 80244220 3C058025 */ lui $a1, 0x8025 +/* A2E464 80244224 24A5AAB0 */ addiu $a1, $a1, -0x5550 +/* A2E468 80244228 94820000 */ lhu $v0, ($a0) +/* A2E46C 8024422C 8CA30000 */ lw $v1, ($a1) +/* A2E470 80244230 3042FFFD */ andi $v0, $v0, 0xfffd +/* A2E474 80244234 24630001 */ addiu $v1, $v1, 1 +/* A2E478 80244238 A4820000 */ sh $v0, ($a0) +/* A2E47C 8024423C 08091110 */ j .L80244440 +/* A2E480 80244240 ACA30000 */ sw $v1, ($a1) +/* A2E484 80244244 3C038025 */ lui $v1, 0x8025 +/* A2E488 80244248 8C63AAB4 */ lw $v1, -0x554c($v1) +/* A2E48C 8024424C 3C048025 */ lui $a0, 0x8025 +/* A2E490 80244250 2484AAB0 */ addiu $a0, $a0, -0x5550 +/* A2E494 80244254 3C018025 */ lui $at, 0x8025 +/* A2E498 80244258 AC20AABC */ sw $zero, -0x5544($at) +.L8024425C: +/* A2E49C 8024425C 8C820000 */ lw $v0, ($a0) +/* A2E4A0 80244260 00031880 */ sll $v1, $v1, 2 +/* A2E4A4 80244264 3C018025 */ lui $at, 0x8025 +/* A2E4A8 80244268 00230821 */ addu $at, $at, $v1 +/* A2E4AC 8024426C 8C23AAC0 */ lw $v1, -0x5540($at) +/* A2E4B0 80244270 24420001 */ addiu $v0, $v0, 1 +/* A2E4B4 80244274 AC820000 */ sw $v0, ($a0) +/* A2E4B8 80244278 3C018025 */ lui $at, 0x8025 +/* A2E4BC 8024427C AC23AAB8 */ sw $v1, -0x5548($at) +/* A2E4C0 80244280 08091111 */ j .L80244444 +/* A2E4C4 80244284 0000102D */ daddu $v0, $zero, $zero +/* A2E4C8 80244288 3C068025 */ lui $a2, 0x8025 +/* A2E4CC 8024428C 24C6AAB8 */ addiu $a2, $a2, -0x5548 +/* A2E4D0 80244290 8CC30000 */ lw $v1, ($a2) +/* A2E4D4 80244294 10600038 */ beqz $v1, .L80244378 +/* A2E4D8 80244298 240400B0 */ addiu $a0, $zero, 0xb0 +/* A2E4DC 8024429C 3C028025 */ lui $v0, 0x8025 +/* A2E4E0 802442A0 8C42AAB4 */ lw $v0, -0x554c($v0) +/* A2E4E4 802442A4 00021080 */ sll $v0, $v0, 2 +/* A2E4E8 802442A8 3C018025 */ lui $at, 0x8025 +/* A2E4EC 802442AC 00220821 */ addu $at, $at, $v0 +/* A2E4F0 802442B0 8C22AAC0 */ lw $v0, -0x5540($at) +/* A2E4F4 802442B4 2442FEF4 */ addiu $v0, $v0, -0x10c +/* A2E4F8 802442B8 0062102A */ slt $v0, $v1, $v0 +/* A2E4FC 802442BC 10400028 */ beqz $v0, .L80244360 +/* A2E500 802442C0 00000000 */ nop +/* A2E504 802442C4 3C048025 */ lui $a0, 0x8025 +/* A2E508 802442C8 8C84AABC */ lw $a0, -0x5544($a0) +/* A2E50C 802442CC 2C820140 */ sltiu $v0, $a0, 0x140 +/* A2E510 802442D0 1040000B */ beqz $v0, .L80244300 +/* A2E514 802442D4 2483FEC0 */ addiu $v1, $a0, -0x140 +/* A2E518 802442D8 3C028025 */ lui $v0, 0x8025 +/* A2E51C 802442DC 8C42AA20 */ lw $v0, -0x55e0($v0) +/* A2E520 802442E0 3C038025 */ lui $v1, 0x8025 +/* A2E524 802442E4 9463AC7C */ lhu $v1, -0x5384($v1) +/* A2E528 802442E8 A4430044 */ sh $v1, 0x44($v0) +/* A2E52C 802442EC 3C038025 */ lui $v1, 0x8025 +/* A2E530 802442F0 00641821 */ addu $v1, $v1, $a0 +/* A2E534 802442F4 9063AB3C */ lbu $v1, -0x54c4($v1) +/* A2E538 802442F8 080910D3 */ j .L8024434C +/* A2E53C 802442FC A4430046 */ sh $v1, 0x46($v0) +.L80244300: +/* A2E540 80244300 2C62000F */ sltiu $v0, $v1, 0xf +/* A2E544 80244304 10400011 */ beqz $v0, .L8024434C +/* A2E548 80244308 00032040 */ sll $a0, $v1, 1 +/* A2E54C 8024430C 3C058025 */ lui $a1, 0x8025 +/* A2E550 80244310 8CA5AA20 */ lw $a1, -0x55e0($a1) +/* A2E554 80244314 3C028025 */ lui $v0, 0x8025 +/* A2E558 80244318 00441021 */ addu $v0, $v0, $a0 +/* A2E55C 8024431C 9442AC7C */ lhu $v0, -0x5384($v0) +/* A2E560 80244320 A4A20044 */ sh $v0, 0x44($a1) +/* A2E564 80244324 2C62000D */ sltiu $v0, $v1, 0xd +/* A2E568 80244328 10400008 */ beqz $v0, .L8024434C +/* A2E56C 8024432C 00000000 */ nop +/* A2E570 80244330 3C028025 */ lui $v0, 0x8025 +/* A2E574 80244334 9042AC7B */ lbu $v0, -0x5385($v0) +/* A2E578 80244338 3C038025 */ lui $v1, 0x8025 +/* A2E57C 8024433C 00641821 */ addu $v1, $v1, $a0 +/* A2E580 80244340 9463AC9C */ lhu $v1, -0x5364($v1) +/* A2E584 80244344 00431021 */ addu $v0, $v0, $v1 +/* A2E588 80244348 A4A20046 */ sh $v0, 0x46($a1) +.L8024434C: +/* A2E58C 8024434C 3C038025 */ lui $v1, 0x8025 +/* A2E590 80244350 2463AABC */ addiu $v1, $v1, -0x5544 +/* A2E594 80244354 8C620000 */ lw $v0, ($v1) +/* A2E598 80244358 24420001 */ addiu $v0, $v0, 1 +/* A2E59C 8024435C AC620000 */ sw $v0, ($v1) +.L80244360: +/* A2E5A0 80244360 3C038025 */ lui $v1, 0x8025 +/* A2E5A4 80244364 2463AAB8 */ addiu $v1, $v1, -0x5548 +/* A2E5A8 80244368 8C620000 */ lw $v0, ($v1) +/* A2E5AC 8024436C 2442FFFF */ addiu $v0, $v0, -1 +/* A2E5B0 80244370 08091110 */ j .L80244440 +/* A2E5B4 80244374 AC620000 */ sw $v0, ($v1) +.L80244378: +/* A2E5B8 80244378 3C058025 */ lui $a1, 0x8025 +/* A2E5BC 8024437C 24A5AAB0 */ addiu $a1, $a1, -0x5550 +/* A2E5C0 80244380 8CA20000 */ lw $v0, ($a1) +/* A2E5C4 80244384 2403001A */ addiu $v1, $zero, 0x1a +/* A2E5C8 80244388 ACC30000 */ sw $v1, ($a2) +/* A2E5CC 8024438C 24420001 */ addiu $v0, $v0, 1 +/* A2E5D0 80244390 ACA20000 */ sw $v0, ($a1) +/* A2E5D4 80244394 3C038025 */ lui $v1, 0x8025 +/* A2E5D8 80244398 8C63AA20 */ lw $v1, -0x55e0($v1) +/* A2E5DC 8024439C 240200FF */ addiu $v0, $zero, 0xff +/* A2E5E0 802443A0 0C05272D */ jal play_sound +/* A2E5E4 802443A4 A462005C */ sh $v0, 0x5c($v1) +/* A2E5E8 802443A8 08091111 */ j .L80244444 +/* A2E5EC 802443AC 0000102D */ daddu $v0, $zero, $zero +/* A2E5F0 802443B0 3C058025 */ lui $a1, 0x8025 +/* A2E5F4 802443B4 24A5AAB8 */ addiu $a1, $a1, -0x5548 +/* A2E5F8 802443B8 8CA30000 */ lw $v1, ($a1) +/* A2E5FC 802443BC 10600018 */ beqz $v1, .L80244420 +/* A2E600 802443C0 2463FFFF */ addiu $v1, $v1, -1 +/* A2E604 802443C4 3C048025 */ lui $a0, 0x8025 +/* A2E608 802443C8 8C84AA20 */ lw $a0, -0x55e0($a0) +/* A2E60C 802443CC 84820058 */ lh $v0, 0x58($a0) +/* A2E610 802443D0 1440000A */ bnez $v0, .L802443FC +/* A2E614 802443D4 ACA30000 */ sw $v1, ($a1) +/* A2E618 802443D8 24020019 */ addiu $v0, $zero, 0x19 +.L802443DC: +/* A2E61C 802443DC 00431023 */ subu $v0, $v0, $v1 +/* A2E620 802443E0 00021080 */ sll $v0, $v0, 2 +/* A2E624 802443E4 3C018025 */ lui $at, 0x8025 +/* A2E628 802443E8 00220821 */ addu $at, $at, $v0 +/* A2E62C 802443EC 9422AAD6 */ lhu $v0, -0x552a($at) +/* A2E630 802443F0 A4800042 */ sh $zero, 0x42($a0) +/* A2E634 802443F4 08091110 */ j .L80244440 +/* A2E638 802443F8 A4820040 */ sh $v0, 0x40($a0) +.L802443FC: +/* A2E63C 802443FC 24020019 */ addiu $v0, $zero, 0x19 +/* A2E640 80244400 00431023 */ subu $v0, $v0, $v1 +/* A2E644 80244404 00021080 */ sll $v0, $v0, 2 +/* A2E648 80244408 3C018025 */ lui $at, 0x8025 +/* A2E64C 8024440C 00220821 */ addu $at, $at, $v0 +/* A2E650 80244410 9422AAD6 */ lhu $v0, -0x552a($at) +/* A2E654 80244414 A480003E */ sh $zero, 0x3e($a0) +/* A2E658 80244418 08091110 */ j .L80244440 +/* A2E65C 8024441C A482003C */ sh $v0, 0x3c($a0) +.L80244420: +/* A2E660 80244420 3C038025 */ lui $v1, 0x8025 +/* A2E664 80244424 2463AAB0 */ addiu $v1, $v1, -0x5550 +/* A2E668 80244428 8C620000 */ lw $v0, ($v1) +/* A2E66C 8024442C 24420001 */ addiu $v0, $v0, 1 +/* A2E670 80244430 08091110 */ j .L80244440 +/* A2E674 80244434 AC620000 */ sw $v0, ($v1) +.L80244438: +/* A2E678 80244438 08091111 */ j .L80244444 +/* A2E67C 8024443C 24020001 */ addiu $v0, $zero, 1 +.L80244440: +/* A2E680 80244440 0000102D */ daddu $v0, $zero, $zero +.L80244444: +/* A2E684 80244444 8FBF0014 */ lw $ra, 0x14($sp) +/* A2E688 80244448 8FB00010 */ lw $s0, 0x10($sp) +/* A2E68C 8024444C 03E00008 */ jr $ra +/* A2E690 80244450 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454.s deleted file mode 100644 index d333366d7b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244454 -/* A2E694 80244454 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2E698 80244458 3C058025 */ lui $a1, 0x8025 -/* A2E69C 8024445C 24A5ACB8 */ addiu $a1, $a1, -0x5348 -/* A2E6A0 80244460 AFBF0014 */ sw $ra, 0x14($sp) -/* A2E6A4 80244464 AFB00010 */ sw $s0, 0x10($sp) -/* A2E6A8 80244468 8CA40000 */ lw $a0, ($a1) -/* A2E6AC 8024446C 1480000B */ bnez $a0, .L8024449C -/* A2E6B0 80244470 3C028888 */ lui $v0, 0x8888 -/* A2E6B4 80244474 3C108025 */ lui $s0, 0x8025 -/* A2E6B8 80244478 2610AA20 */ addiu $s0, $s0, -0x55e0 -/* A2E6BC 8024447C 8E020000 */ lw $v0, ($s0) -/* A2E6C0 80244480 8C440000 */ lw $a0, ($v0) -/* A2E6C4 80244484 0C048D70 */ jal func_801235C0 -/* A2E6C8 80244488 A440005C */ sh $zero, 0x5c($v0) -/* A2E6CC 8024448C 8E030000 */ lw $v1, ($s0) -/* A2E6D0 80244490 24020001 */ addiu $v0, $zero, 1 -/* A2E6D4 80244494 08091136 */ j .L802444D8 -/* A2E6D8 80244498 AC600000 */ sw $zero, ($v1) -.L8024449C: -/* A2E6DC 8024449C 34428889 */ ori $v0, $v0, 0x8889 -/* A2E6E0 802444A0 2484FFFF */ addiu $a0, $a0, -1 -/* A2E6E4 802444A4 00041A00 */ sll $v1, $a0, 8 -/* A2E6E8 802444A8 00641823 */ subu $v1, $v1, $a0 -/* A2E6EC 802444AC 00620018 */ mult $v1, $v0 -/* A2E6F0 802444B0 0000102D */ daddu $v0, $zero, $zero -/* A2E6F4 802444B4 ACA40000 */ sw $a0, ($a1) -/* A2E6F8 802444B8 3C058025 */ lui $a1, 0x8025 -/* A2E6FC 802444BC 8CA5AA20 */ lw $a1, -0x55e0($a1) -/* A2E700 802444C0 00003010 */ mfhi $a2 -/* A2E704 802444C4 00C32021 */ addu $a0, $a2, $v1 -/* A2E708 802444C8 00042103 */ sra $a0, $a0, 4 -/* A2E70C 802444CC 00031FC3 */ sra $v1, $v1, 0x1f -/* A2E710 802444D0 00832023 */ subu $a0, $a0, $v1 -/* A2E714 802444D4 A4A4005C */ sh $a0, 0x5c($a1) -.L802444D8: -/* A2E718 802444D8 8FBF0014 */ lw $ra, 0x14($sp) -/* A2E71C 802444DC 8FB00010 */ lw $s0, 0x10($sp) -/* A2E720 802444E0 03E00008 */ jr $ra -/* A2E724 802444E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s new file mode 100644 index 0000000000..e281d5a18f --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244454_A2E694.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244454_A2E694 +/* A2E694 80244454 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2E698 80244458 3C058025 */ lui $a1, 0x8025 +/* A2E69C 8024445C 24A5ACB8 */ addiu $a1, $a1, -0x5348 +/* A2E6A0 80244460 AFBF0014 */ sw $ra, 0x14($sp) +/* A2E6A4 80244464 AFB00010 */ sw $s0, 0x10($sp) +/* A2E6A8 80244468 8CA40000 */ lw $a0, ($a1) +/* A2E6AC 8024446C 1480000B */ bnez $a0, .L8024449C +/* A2E6B0 80244470 3C028888 */ lui $v0, 0x8888 +/* A2E6B4 80244474 3C108025 */ lui $s0, 0x8025 +/* A2E6B8 80244478 2610AA20 */ addiu $s0, $s0, -0x55e0 +/* A2E6BC 8024447C 8E020000 */ lw $v0, ($s0) +/* A2E6C0 80244480 8C440000 */ lw $a0, ($v0) +/* A2E6C4 80244484 0C048D70 */ jal func_801235C0 +/* A2E6C8 80244488 A440005C */ sh $zero, 0x5c($v0) +/* A2E6CC 8024448C 8E030000 */ lw $v1, ($s0) +/* A2E6D0 80244490 24020001 */ addiu $v0, $zero, 1 +/* A2E6D4 80244494 08091136 */ j .L802444D8 +/* A2E6D8 80244498 AC600000 */ sw $zero, ($v1) +.L8024449C: +/* A2E6DC 8024449C 34428889 */ ori $v0, $v0, 0x8889 +/* A2E6E0 802444A0 2484FFFF */ addiu $a0, $a0, -1 +/* A2E6E4 802444A4 00041A00 */ sll $v1, $a0, 8 +/* A2E6E8 802444A8 00641823 */ subu $v1, $v1, $a0 +/* A2E6EC 802444AC 00620018 */ mult $v1, $v0 +/* A2E6F0 802444B0 0000102D */ daddu $v0, $zero, $zero +/* A2E6F4 802444B4 ACA40000 */ sw $a0, ($a1) +/* A2E6F8 802444B8 3C058025 */ lui $a1, 0x8025 +/* A2E6FC 802444BC 8CA5AA20 */ lw $a1, -0x55e0($a1) +/* A2E700 802444C0 00003010 */ mfhi $a2 +/* A2E704 802444C4 00C32021 */ addu $a0, $a2, $v1 +/* A2E708 802444C8 00042103 */ sra $a0, $a0, 4 +/* A2E70C 802444CC 00031FC3 */ sra $v1, $v1, 0x1f +/* A2E710 802444D0 00832023 */ subu $a0, $a0, $v1 +/* A2E714 802444D4 A4A4005C */ sh $a0, 0x5c($a1) +.L802444D8: +/* A2E718 802444D8 8FBF0014 */ lw $ra, 0x14($sp) +/* A2E71C 802444DC 8FB00010 */ lw $s0, 0x10($sp) +/* A2E720 802444E0 03E00008 */ jr $ra +/* A2E724 802444E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8.s deleted file mode 100644 index fadca3daf9..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802444E8 -/* A2E728 802444E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2E72C 802444EC AFBF0010 */ sw $ra, 0x10($sp) -/* A2E730 802444F0 0C0B36B0 */ jal resolve_npc -/* A2E734 802444F4 2405000A */ addiu $a1, $zero, 0xa -/* A2E738 802444F8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* A2E73C 802444FC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* A2E740 80244500 3C014334 */ lui $at, 0x4334 -/* A2E744 80244504 44810000 */ mtc1 $at, $f0 -/* A2E748 80244508 00041880 */ sll $v1, $a0, 2 -/* A2E74C 8024450C 00641821 */ addu $v1, $v1, $a0 -/* A2E750 80244510 00031880 */ sll $v1, $v1, 2 -/* A2E754 80244514 00641823 */ subu $v1, $v1, $a0 -/* A2E758 80244518 000320C0 */ sll $a0, $v1, 3 -/* A2E75C 8024451C 00641821 */ addu $v1, $v1, $a0 -/* A2E760 80244520 000318C0 */ sll $v1, $v1, 3 -/* A2E764 80244524 3C01800B */ lui $at, 0x800b -/* A2E768 80244528 00230821 */ addu $at, $at, $v1 -/* A2E76C 8024452C C4221DEC */ lwc1 $f2, 0x1dec($at) -/* A2E770 80244530 46020001 */ sub.s $f0, $f0, $f2 -/* A2E774 80244534 0040182D */ daddu $v1, $v0, $zero -/* A2E778 80244538 E4600034 */ swc1 $f0, 0x34($v1) -/* A2E77C 8024453C E460000C */ swc1 $f0, 0xc($v1) -/* A2E780 80244540 8FBF0010 */ lw $ra, 0x10($sp) -/* A2E784 80244544 0000102D */ daddu $v0, $zero, $zero -/* A2E788 80244548 03E00008 */ jr $ra -/* A2E78C 8024454C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s new file mode 100644 index 0000000000..35e8327d42 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_802444E8_A2E728.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802444E8_A2E728 +/* A2E728 802444E8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2E72C 802444EC AFBF0010 */ sw $ra, 0x10($sp) +/* A2E730 802444F0 0C0B36B0 */ jal resolve_npc +/* A2E734 802444F4 2405000A */ addiu $a1, $zero, 0xa +/* A2E738 802444F8 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* A2E73C 802444FC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* A2E740 80244500 3C014334 */ lui $at, 0x4334 +/* A2E744 80244504 44810000 */ mtc1 $at, $f0 +/* A2E748 80244508 00041880 */ sll $v1, $a0, 2 +/* A2E74C 8024450C 00641821 */ addu $v1, $v1, $a0 +/* A2E750 80244510 00031880 */ sll $v1, $v1, 2 +/* A2E754 80244514 00641823 */ subu $v1, $v1, $a0 +/* A2E758 80244518 000320C0 */ sll $a0, $v1, 3 +/* A2E75C 8024451C 00641821 */ addu $v1, $v1, $a0 +/* A2E760 80244520 000318C0 */ sll $v1, $v1, 3 +/* A2E764 80244524 3C01800B */ lui $at, 0x800b +/* A2E768 80244528 00230821 */ addu $at, $at, $v1 +/* A2E76C 8024452C C4221DEC */ lwc1 $f2, 0x1dec($at) +/* A2E770 80244530 46020001 */ sub.s $f0, $f0, $f2 +/* A2E774 80244534 0040182D */ daddu $v1, $v0, $zero +/* A2E778 80244538 E4600034 */ swc1 $f0, 0x34($v1) +/* A2E77C 8024453C E460000C */ swc1 $f0, 0xc($v1) +/* A2E780 80244540 8FBF0010 */ lw $ra, 0x10($sp) +/* A2E784 80244544 0000102D */ daddu $v0, $zero, $zero +/* A2E788 80244548 03E00008 */ jr $ra +/* A2E78C 8024454C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550.s deleted file mode 100644 index a39f2d1867..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244550 -/* A2E790 80244550 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A2E794 80244554 AFB60028 */ sw $s6, 0x28($sp) -/* A2E798 80244558 0080B02D */ daddu $s6, $a0, $zero -/* A2E79C 8024455C AFB00010 */ sw $s0, 0x10($sp) -/* A2E7A0 80244560 00A0802D */ daddu $s0, $a1, $zero -/* A2E7A4 80244564 AFBF002C */ sw $ra, 0x2c($sp) -/* A2E7A8 80244568 AFB50024 */ sw $s5, 0x24($sp) -/* A2E7AC 8024456C AFB40020 */ sw $s4, 0x20($sp) -/* A2E7B0 80244570 AFB3001C */ sw $s3, 0x1c($sp) -/* A2E7B4 80244574 AFB20018 */ sw $s2, 0x18($sp) -/* A2E7B8 80244578 AFB10014 */ sw $s1, 0x14($sp) -/* A2E7BC 8024457C F7B80040 */ sdc1 $f24, 0x40($sp) -/* A2E7C0 80244580 F7B60038 */ sdc1 $f22, 0x38($sp) -/* A2E7C4 80244584 F7B40030 */ sdc1 $f20, 0x30($sp) -/* A2E7C8 80244588 0C0B36B0 */ jal resolve_npc -/* A2E7CC 8024458C 24050009 */ addiu $a1, $zero, 9 -/* A2E7D0 80244590 02C0202D */ daddu $a0, $s6, $zero -/* A2E7D4 80244594 3C05F4AC */ lui $a1, 0xf4ac -/* A2E7D8 80244598 34A5D480 */ ori $a1, $a1, 0xd480 -/* A2E7DC 8024459C 0C0B1EAF */ jal get_variable -/* A2E7E0 802445A0 0040A02D */ daddu $s4, $v0, $zero -/* A2E7E4 802445A4 1200002B */ beqz $s0, .L80244654 -/* A2E7E8 802445A8 0040A82D */ daddu $s5, $v0, $zero -/* A2E7EC 802445AC 0000802D */ daddu $s0, $zero, $zero -/* A2E7F0 802445B0 3C138025 */ lui $s3, 0x8025 -/* A2E7F4 802445B4 2673F358 */ addiu $s3, $s3, -0xca8 -/* A2E7F8 802445B8 3C128025 */ lui $s2, 0x8025 -/* A2E7FC 802445BC 2652F338 */ addiu $s2, $s2, -0xcc8 -/* A2E800 802445C0 C6800038 */ lwc1 $f0, 0x38($s4) -/* A2E804 802445C4 C682003C */ lwc1 $f2, 0x3c($s4) -/* A2E808 802445C8 C6840040 */ lwc1 $f4, 0x40($s4) -/* A2E80C 802445CC 3C118025 */ lui $s1, 0x8025 -/* A2E810 802445D0 2631F318 */ addiu $s1, $s1, -0xce8 -/* A2E814 802445D4 3C018025 */ lui $at, 0x8025 -/* A2E818 802445D8 E420F2FC */ swc1 $f0, -0xd04($at) -/* A2E81C 802445DC 3C018025 */ lui $at, 0x8025 -/* A2E820 802445E0 E422F300 */ swc1 $f2, -0xd00($at) -/* A2E824 802445E4 3C018025 */ lui $at, 0x8025 -/* A2E828 802445E8 E424F304 */ swc1 $f4, -0xcfc($at) -.L802445EC: -/* A2E82C 802445EC 02C0202D */ daddu $a0, $s6, $zero -/* A2E830 802445F0 0C0B36B0 */ jal resolve_npc -/* A2E834 802445F4 0200282D */ daddu $a1, $s0, $zero -/* A2E838 802445F8 C4400038 */ lwc1 $f0, 0x38($v0) -/* A2E83C 802445FC 26100001 */ addiu $s0, $s0, 1 -/* A2E840 80244600 E6200000 */ swc1 $f0, ($s1) -/* A2E844 80244604 C440003C */ lwc1 $f0, 0x3c($v0) -/* A2E848 80244608 26310004 */ addiu $s1, $s1, 4 -/* A2E84C 8024460C E6400000 */ swc1 $f0, ($s2) -/* A2E850 80244610 26520004 */ addiu $s2, $s2, 4 -/* A2E854 80244614 C4400040 */ lwc1 $f0, 0x40($v0) -/* A2E858 80244618 2A020007 */ slti $v0, $s0, 7 -/* A2E85C 8024461C E6600000 */ swc1 $f0, ($s3) -/* A2E860 80244620 1440FFF2 */ bnez $v0, .L802445EC -/* A2E864 80244624 26730004 */ addiu $s3, $s3, 4 -/* A2E868 80244628 8EA2000C */ lw $v0, 0xc($s5) -/* A2E86C 8024462C 0040182D */ daddu $v1, $v0, $zero -/* A2E870 80244630 C4440004 */ lwc1 $f4, 4($v0) -/* A2E874 80244634 C4400008 */ lwc1 $f0, 8($v0) -/* A2E878 80244638 C462000C */ lwc1 $f2, 0xc($v1) -/* A2E87C 8024463C 3C018025 */ lui $at, 0x8025 -/* A2E880 80244640 E424F308 */ swc1 $f4, -0xcf8($at) -/* A2E884 80244644 3C018025 */ lui $at, 0x8025 -/* A2E888 80244648 E420F30C */ swc1 $f0, -0xcf4($at) -/* A2E88C 8024464C 3C018025 */ lui $at, 0x8025 -/* A2E890 80244650 E422F310 */ swc1 $f2, -0xcf0($at) -.L80244654: -/* A2E894 80244654 0000802D */ daddu $s0, $zero, $zero -/* A2E898 80244658 C6820038 */ lwc1 $f2, 0x38($s4) -/* A2E89C 8024465C 3C018025 */ lui $at, 0x8025 -/* A2E8A0 80244660 C420F2FC */ lwc1 $f0, -0xd04($at) -/* A2E8A4 80244664 3C138025 */ lui $s3, 0x8025 -/* A2E8A8 80244668 2673F358 */ addiu $s3, $s3, -0xca8 -/* A2E8AC 8024466C 46001501 */ sub.s $f20, $f2, $f0 -/* A2E8B0 80244670 C682003C */ lwc1 $f2, 0x3c($s4) -/* A2E8B4 80244674 3C018025 */ lui $at, 0x8025 -/* A2E8B8 80244678 C420F300 */ lwc1 $f0, -0xd00($at) -/* A2E8BC 8024467C 3C128025 */ lui $s2, 0x8025 -/* A2E8C0 80244680 2652F338 */ addiu $s2, $s2, -0xcc8 -/* A2E8C4 80244684 46001581 */ sub.s $f22, $f2, $f0 -/* A2E8C8 80244688 C6820040 */ lwc1 $f2, 0x40($s4) -/* A2E8CC 8024468C 3C018025 */ lui $at, 0x8025 -/* A2E8D0 80244690 C420F304 */ lwc1 $f0, -0xcfc($at) -/* A2E8D4 80244694 3C118025 */ lui $s1, 0x8025 -/* A2E8D8 80244698 2631F318 */ addiu $s1, $s1, -0xce8 -/* A2E8DC 8024469C 46001601 */ sub.s $f24, $f2, $f0 -.L802446A0: -/* A2E8E0 802446A0 02C0202D */ daddu $a0, $s6, $zero -/* A2E8E4 802446A4 0C0B36B0 */ jal resolve_npc -/* A2E8E8 802446A8 0200282D */ daddu $a1, $s0, $zero -/* A2E8EC 802446AC C6200000 */ lwc1 $f0, ($s1) -/* A2E8F0 802446B0 46140000 */ add.s $f0, $f0, $f20 -/* A2E8F4 802446B4 E4400038 */ swc1 $f0, 0x38($v0) -/* A2E8F8 802446B8 C6400000 */ lwc1 $f0, ($s2) -/* A2E8FC 802446BC 46160000 */ add.s $f0, $f0, $f22 -/* A2E900 802446C0 26100001 */ addiu $s0, $s0, 1 -/* A2E904 802446C4 E440003C */ swc1 $f0, 0x3c($v0) -/* A2E908 802446C8 C6600000 */ lwc1 $f0, ($s3) -/* A2E90C 802446CC 26310004 */ addiu $s1, $s1, 4 -/* A2E910 802446D0 46180000 */ add.s $f0, $f0, $f24 -/* A2E914 802446D4 C442003C */ lwc1 $f2, 0x3c($v0) -/* A2E918 802446D8 26520004 */ addiu $s2, $s2, 4 -/* A2E91C 802446DC E4400040 */ swc1 $f0, 0x40($v0) -/* A2E920 802446E0 C4400038 */ lwc1 $f0, 0x38($v0) -/* A2E924 802446E4 C4440040 */ lwc1 $f4, 0x40($v0) -/* A2E928 802446E8 E4420070 */ swc1 $f2, 0x70($v0) -/* A2E92C 802446EC E440006C */ swc1 $f0, 0x6c($v0) -/* A2E930 802446F0 E4440074 */ swc1 $f4, 0x74($v0) -/* A2E934 802446F4 2A020007 */ slti $v0, $s0, 7 -/* A2E938 802446F8 1440FFE9 */ bnez $v0, .L802446A0 -/* A2E93C 802446FC 26730004 */ addiu $s3, $s3, 4 -/* A2E940 80244700 3C018025 */ lui $at, 0x8025 -/* A2E944 80244704 C420F308 */ lwc1 $f0, -0xcf8($at) -/* A2E948 80244708 46140000 */ add.s $f0, $f0, $f20 -/* A2E94C 8024470C 3C018025 */ lui $at, 0x8025 -/* A2E950 80244710 C422F30C */ lwc1 $f2, -0xcf4($at) -/* A2E954 80244714 8EA2000C */ lw $v0, 0xc($s5) -/* A2E958 80244718 46161080 */ add.s $f2, $f2, $f22 -/* A2E95C 8024471C E4400004 */ swc1 $f0, 4($v0) -/* A2E960 80244720 3C018025 */ lui $at, 0x8025 -/* A2E964 80244724 C420F310 */ lwc1 $f0, -0xcf0($at) -/* A2E968 80244728 8EA2000C */ lw $v0, 0xc($s5) -/* A2E96C 8024472C 46180000 */ add.s $f0, $f0, $f24 -/* A2E970 80244730 E4420008 */ swc1 $f2, 8($v0) -/* A2E974 80244734 8EA3000C */ lw $v1, 0xc($s5) -/* A2E978 80244738 E460000C */ swc1 $f0, 0xc($v1) -/* A2E97C 8024473C 8FBF002C */ lw $ra, 0x2c($sp) -/* A2E980 80244740 8FB60028 */ lw $s6, 0x28($sp) -/* A2E984 80244744 8FB50024 */ lw $s5, 0x24($sp) -/* A2E988 80244748 8FB40020 */ lw $s4, 0x20($sp) -/* A2E98C 8024474C 8FB3001C */ lw $s3, 0x1c($sp) -/* A2E990 80244750 8FB20018 */ lw $s2, 0x18($sp) -/* A2E994 80244754 8FB10014 */ lw $s1, 0x14($sp) -/* A2E998 80244758 8FB00010 */ lw $s0, 0x10($sp) -/* A2E99C 8024475C D7B80040 */ ldc1 $f24, 0x40($sp) -/* A2E9A0 80244760 D7B60038 */ ldc1 $f22, 0x38($sp) -/* A2E9A4 80244764 D7B40030 */ ldc1 $f20, 0x30($sp) -/* A2E9A8 80244768 0000102D */ daddu $v0, $zero, $zero -/* A2E9AC 8024476C 03E00008 */ jr $ra -/* A2E9B0 80244770 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550_A2E790.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550_A2E790.s new file mode 100644 index 0000000000..441ea6d42a --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244550_A2E790.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244550_A2E790 +/* A2E790 80244550 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A2E794 80244554 AFB60028 */ sw $s6, 0x28($sp) +/* A2E798 80244558 0080B02D */ daddu $s6, $a0, $zero +/* A2E79C 8024455C AFB00010 */ sw $s0, 0x10($sp) +/* A2E7A0 80244560 00A0802D */ daddu $s0, $a1, $zero +/* A2E7A4 80244564 AFBF002C */ sw $ra, 0x2c($sp) +/* A2E7A8 80244568 AFB50024 */ sw $s5, 0x24($sp) +/* A2E7AC 8024456C AFB40020 */ sw $s4, 0x20($sp) +/* A2E7B0 80244570 AFB3001C */ sw $s3, 0x1c($sp) +/* A2E7B4 80244574 AFB20018 */ sw $s2, 0x18($sp) +/* A2E7B8 80244578 AFB10014 */ sw $s1, 0x14($sp) +/* A2E7BC 8024457C F7B80040 */ sdc1 $f24, 0x40($sp) +/* A2E7C0 80244580 F7B60038 */ sdc1 $f22, 0x38($sp) +/* A2E7C4 80244584 F7B40030 */ sdc1 $f20, 0x30($sp) +/* A2E7C8 80244588 0C0B36B0 */ jal resolve_npc +/* A2E7CC 8024458C 24050009 */ addiu $a1, $zero, 9 +/* A2E7D0 80244590 02C0202D */ daddu $a0, $s6, $zero +/* A2E7D4 80244594 3C05F4AC */ lui $a1, 0xf4ac +/* A2E7D8 80244598 34A5D480 */ ori $a1, $a1, 0xd480 +/* A2E7DC 8024459C 0C0B1EAF */ jal get_variable +/* A2E7E0 802445A0 0040A02D */ daddu $s4, $v0, $zero +/* A2E7E4 802445A4 1200002B */ beqz $s0, .L80244654 +/* A2E7E8 802445A8 0040A82D */ daddu $s5, $v0, $zero +/* A2E7EC 802445AC 0000802D */ daddu $s0, $zero, $zero +/* A2E7F0 802445B0 3C138025 */ lui $s3, 0x8025 +/* A2E7F4 802445B4 2673F358 */ addiu $s3, $s3, -0xca8 +/* A2E7F8 802445B8 3C128025 */ lui $s2, 0x8025 +/* A2E7FC 802445BC 2652F338 */ addiu $s2, $s2, -0xcc8 +/* A2E800 802445C0 C6800038 */ lwc1 $f0, 0x38($s4) +/* A2E804 802445C4 C682003C */ lwc1 $f2, 0x3c($s4) +/* A2E808 802445C8 C6840040 */ lwc1 $f4, 0x40($s4) +/* A2E80C 802445CC 3C118025 */ lui $s1, 0x8025 +/* A2E810 802445D0 2631F318 */ addiu $s1, $s1, -0xce8 +/* A2E814 802445D4 3C018025 */ lui $at, 0x8025 +/* A2E818 802445D8 E420F2FC */ swc1 $f0, -0xd04($at) +/* A2E81C 802445DC 3C018025 */ lui $at, 0x8025 +/* A2E820 802445E0 E422F300 */ swc1 $f2, -0xd00($at) +/* A2E824 802445E4 3C018025 */ lui $at, 0x8025 +/* A2E828 802445E8 E424F304 */ swc1 $f4, -0xcfc($at) +.L802445EC: +/* A2E82C 802445EC 02C0202D */ daddu $a0, $s6, $zero +/* A2E830 802445F0 0C0B36B0 */ jal resolve_npc +/* A2E834 802445F4 0200282D */ daddu $a1, $s0, $zero +/* A2E838 802445F8 C4400038 */ lwc1 $f0, 0x38($v0) +/* A2E83C 802445FC 26100001 */ addiu $s0, $s0, 1 +/* A2E840 80244600 E6200000 */ swc1 $f0, ($s1) +/* A2E844 80244604 C440003C */ lwc1 $f0, 0x3c($v0) +/* A2E848 80244608 26310004 */ addiu $s1, $s1, 4 +/* A2E84C 8024460C E6400000 */ swc1 $f0, ($s2) +/* A2E850 80244610 26520004 */ addiu $s2, $s2, 4 +/* A2E854 80244614 C4400040 */ lwc1 $f0, 0x40($v0) +/* A2E858 80244618 2A020007 */ slti $v0, $s0, 7 +/* A2E85C 8024461C E6600000 */ swc1 $f0, ($s3) +/* A2E860 80244620 1440FFF2 */ bnez $v0, .L802445EC +/* A2E864 80244624 26730004 */ addiu $s3, $s3, 4 +/* A2E868 80244628 8EA2000C */ lw $v0, 0xc($s5) +/* A2E86C 8024462C 0040182D */ daddu $v1, $v0, $zero +/* A2E870 80244630 C4440004 */ lwc1 $f4, 4($v0) +/* A2E874 80244634 C4400008 */ lwc1 $f0, 8($v0) +/* A2E878 80244638 C462000C */ lwc1 $f2, 0xc($v1) +/* A2E87C 8024463C 3C018025 */ lui $at, 0x8025 +/* A2E880 80244640 E424F308 */ swc1 $f4, -0xcf8($at) +/* A2E884 80244644 3C018025 */ lui $at, 0x8025 +/* A2E888 80244648 E420F30C */ swc1 $f0, -0xcf4($at) +/* A2E88C 8024464C 3C018025 */ lui $at, 0x8025 +/* A2E890 80244650 E422F310 */ swc1 $f2, -0xcf0($at) +.L80244654: +/* A2E894 80244654 0000802D */ daddu $s0, $zero, $zero +/* A2E898 80244658 C6820038 */ lwc1 $f2, 0x38($s4) +/* A2E89C 8024465C 3C018025 */ lui $at, 0x8025 +/* A2E8A0 80244660 C420F2FC */ lwc1 $f0, -0xd04($at) +/* A2E8A4 80244664 3C138025 */ lui $s3, 0x8025 +/* A2E8A8 80244668 2673F358 */ addiu $s3, $s3, -0xca8 +/* A2E8AC 8024466C 46001501 */ sub.s $f20, $f2, $f0 +/* A2E8B0 80244670 C682003C */ lwc1 $f2, 0x3c($s4) +/* A2E8B4 80244674 3C018025 */ lui $at, 0x8025 +/* A2E8B8 80244678 C420F300 */ lwc1 $f0, -0xd00($at) +/* A2E8BC 8024467C 3C128025 */ lui $s2, 0x8025 +/* A2E8C0 80244680 2652F338 */ addiu $s2, $s2, -0xcc8 +/* A2E8C4 80244684 46001581 */ sub.s $f22, $f2, $f0 +/* A2E8C8 80244688 C6820040 */ lwc1 $f2, 0x40($s4) +/* A2E8CC 8024468C 3C018025 */ lui $at, 0x8025 +/* A2E8D0 80244690 C420F304 */ lwc1 $f0, -0xcfc($at) +/* A2E8D4 80244694 3C118025 */ lui $s1, 0x8025 +/* A2E8D8 80244698 2631F318 */ addiu $s1, $s1, -0xce8 +/* A2E8DC 8024469C 46001601 */ sub.s $f24, $f2, $f0 +.L802446A0: +/* A2E8E0 802446A0 02C0202D */ daddu $a0, $s6, $zero +/* A2E8E4 802446A4 0C0B36B0 */ jal resolve_npc +/* A2E8E8 802446A8 0200282D */ daddu $a1, $s0, $zero +/* A2E8EC 802446AC C6200000 */ lwc1 $f0, ($s1) +/* A2E8F0 802446B0 46140000 */ add.s $f0, $f0, $f20 +/* A2E8F4 802446B4 E4400038 */ swc1 $f0, 0x38($v0) +/* A2E8F8 802446B8 C6400000 */ lwc1 $f0, ($s2) +/* A2E8FC 802446BC 46160000 */ add.s $f0, $f0, $f22 +/* A2E900 802446C0 26100001 */ addiu $s0, $s0, 1 +/* A2E904 802446C4 E440003C */ swc1 $f0, 0x3c($v0) +/* A2E908 802446C8 C6600000 */ lwc1 $f0, ($s3) +/* A2E90C 802446CC 26310004 */ addiu $s1, $s1, 4 +/* A2E910 802446D0 46180000 */ add.s $f0, $f0, $f24 +/* A2E914 802446D4 C442003C */ lwc1 $f2, 0x3c($v0) +/* A2E918 802446D8 26520004 */ addiu $s2, $s2, 4 +/* A2E91C 802446DC E4400040 */ swc1 $f0, 0x40($v0) +/* A2E920 802446E0 C4400038 */ lwc1 $f0, 0x38($v0) +/* A2E924 802446E4 C4440040 */ lwc1 $f4, 0x40($v0) +/* A2E928 802446E8 E4420070 */ swc1 $f2, 0x70($v0) +/* A2E92C 802446EC E440006C */ swc1 $f0, 0x6c($v0) +/* A2E930 802446F0 E4440074 */ swc1 $f4, 0x74($v0) +/* A2E934 802446F4 2A020007 */ slti $v0, $s0, 7 +/* A2E938 802446F8 1440FFE9 */ bnez $v0, .L802446A0 +/* A2E93C 802446FC 26730004 */ addiu $s3, $s3, 4 +/* A2E940 80244700 3C018025 */ lui $at, 0x8025 +/* A2E944 80244704 C420F308 */ lwc1 $f0, -0xcf8($at) +/* A2E948 80244708 46140000 */ add.s $f0, $f0, $f20 +/* A2E94C 8024470C 3C018025 */ lui $at, 0x8025 +/* A2E950 80244710 C422F30C */ lwc1 $f2, -0xcf4($at) +/* A2E954 80244714 8EA2000C */ lw $v0, 0xc($s5) +/* A2E958 80244718 46161080 */ add.s $f2, $f2, $f22 +/* A2E95C 8024471C E4400004 */ swc1 $f0, 4($v0) +/* A2E960 80244720 3C018025 */ lui $at, 0x8025 +/* A2E964 80244724 C420F310 */ lwc1 $f0, -0xcf0($at) +/* A2E968 80244728 8EA2000C */ lw $v0, 0xc($s5) +/* A2E96C 8024472C 46180000 */ add.s $f0, $f0, $f24 +/* A2E970 80244730 E4420008 */ swc1 $f2, 8($v0) +/* A2E974 80244734 8EA3000C */ lw $v1, 0xc($s5) +/* A2E978 80244738 E460000C */ swc1 $f0, 0xc($v1) +/* A2E97C 8024473C 8FBF002C */ lw $ra, 0x2c($sp) +/* A2E980 80244740 8FB60028 */ lw $s6, 0x28($sp) +/* A2E984 80244744 8FB50024 */ lw $s5, 0x24($sp) +/* A2E988 80244748 8FB40020 */ lw $s4, 0x20($sp) +/* A2E98C 8024474C 8FB3001C */ lw $s3, 0x1c($sp) +/* A2E990 80244750 8FB20018 */ lw $s2, 0x18($sp) +/* A2E994 80244754 8FB10014 */ lw $s1, 0x14($sp) +/* A2E998 80244758 8FB00010 */ lw $s0, 0x10($sp) +/* A2E99C 8024475C D7B80040 */ ldc1 $f24, 0x40($sp) +/* A2E9A0 80244760 D7B60038 */ ldc1 $f22, 0x38($sp) +/* A2E9A4 80244764 D7B40030 */ ldc1 $f20, 0x30($sp) +/* A2E9A8 80244768 0000102D */ daddu $v0, $zero, $zero +/* A2E9AC 8024476C 03E00008 */ jr $ra +/* A2E9B0 80244770 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774.s deleted file mode 100644 index 958edc3384..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244774 -/* A2E9B4 80244774 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A2E9B8 80244778 AFB00018 */ sw $s0, 0x18($sp) -/* A2E9BC 8024477C 0080802D */ daddu $s0, $a0, $zero -/* A2E9C0 80244780 AFB1001C */ sw $s1, 0x1c($sp) -/* A2E9C4 80244784 00A0882D */ daddu $s1, $a1, $zero -/* A2E9C8 80244788 AFBF0028 */ sw $ra, 0x28($sp) -/* A2E9CC 8024478C AFB30024 */ sw $s3, 0x24($sp) -/* A2E9D0 80244790 AFB20020 */ sw $s2, 0x20($sp) -/* A2E9D4 80244794 F7B40030 */ sdc1 $f20, 0x30($sp) -/* A2E9D8 80244798 0C0B36B0 */ jal resolve_npc -/* A2E9DC 8024479C 24050007 */ addiu $a1, $zero, 7 -/* A2E9E0 802447A0 0200202D */ daddu $a0, $s0, $zero -/* A2E9E4 802447A4 24050008 */ addiu $a1, $zero, 8 -/* A2E9E8 802447A8 0C0B36B0 */ jal resolve_npc -/* A2E9EC 802447AC 0040902D */ daddu $s2, $v0, $zero -/* A2E9F0 802447B0 12200004 */ beqz $s1, .L802447C4 -/* A2E9F4 802447B4 0040982D */ daddu $s3, $v0, $zero -/* A2E9F8 802447B8 C640003C */ lwc1 $f0, 0x3c($s2) -/* A2E9FC 802447BC 3C018025 */ lui $at, 0x8025 -/* A2EA00 802447C0 E420F374 */ swc1 $f0, -0xc8c($at) -.L802447C4: -/* A2EA04 802447C4 3C018025 */ lui $at, 0x8025 -/* A2EA08 802447C8 C420F374 */ lwc1 $f0, -0xc8c($at) -/* A2EA0C 802447CC 24040003 */ addiu $a0, $zero, 3 -/* A2EA10 802447D0 44050000 */ mfc1 $a1, $f0 -/* A2EA14 802447D4 3C0143FA */ lui $at, 0x43fa -/* A2EA18 802447D8 44810000 */ mtc1 $at, $f0 -/* A2EA1C 802447DC 44853000 */ mtc1 $a1, $f6 -/* A2EA20 802447E0 3C108025 */ lui $s0, 0x8025 -/* A2EA24 802447E4 2610AEC4 */ addiu $s0, $s0, -0x513c -/* A2EA28 802447E8 46003180 */ add.s $f6, $f6, $f0 -/* A2EA2C 802447EC 3C014220 */ lui $at, 0x4220 -/* A2EA30 802447F0 4481A000 */ mtc1 $at, $f20 -/* A2EA34 802447F4 8E070000 */ lw $a3, ($s0) -/* A2EA38 802447F8 44063000 */ mfc1 $a2, $f6 -/* A2EA3C 802447FC 2642003C */ addiu $v0, $s2, 0x3c -/* A2EA40 80244800 AFA20014 */ sw $v0, 0x14($sp) -/* A2EA44 80244804 0C090439 */ jal func_802410E4 -/* A2EA48 80244808 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2EA4C 8024480C C640003C */ lwc1 $f0, 0x3c($s2) -/* A2EA50 80244810 3C013F80 */ lui $at, 0x3f80 -/* A2EA54 80244814 44811000 */ mtc1 $at, $f2 -/* A2EA58 80244818 E660003C */ swc1 $f0, 0x3c($s3) -/* A2EA5C 8024481C C6000000 */ lwc1 $f0, ($s0) -/* A2EA60 80244820 C644003C */ lwc1 $f4, 0x3c($s2) -/* A2EA64 80244824 46020000 */ add.s $f0, $f0, $f2 -/* A2EA68 80244828 E6440070 */ swc1 $f4, 0x70($s2) -/* A2EA6C 8024482C C662003C */ lwc1 $f2, 0x3c($s3) -/* A2EA70 80244830 24020001 */ addiu $v0, $zero, 1 -/* A2EA74 80244834 E6620070 */ swc1 $f2, 0x70($s3) -/* A2EA78 80244838 4600A03C */ c.lt.s $f20, $f0 -/* A2EA7C 8024483C 00000000 */ nop -/* A2EA80 80244840 45010002 */ bc1t .L8024484C -/* A2EA84 80244844 E6000000 */ swc1 $f0, ($s0) -/* A2EA88 80244848 0000102D */ daddu $v0, $zero, $zero -.L8024484C: -/* A2EA8C 8024484C 8FBF0028 */ lw $ra, 0x28($sp) -/* A2EA90 80244850 8FB30024 */ lw $s3, 0x24($sp) -/* A2EA94 80244854 8FB20020 */ lw $s2, 0x20($sp) -/* A2EA98 80244858 8FB1001C */ lw $s1, 0x1c($sp) -/* A2EA9C 8024485C 8FB00018 */ lw $s0, 0x18($sp) -/* A2EAA0 80244860 D7B40030 */ ldc1 $f20, 0x30($sp) -/* A2EAA4 80244864 03E00008 */ jr $ra -/* A2EAA8 80244868 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s new file mode 100644 index 0000000000..3896af4eb6 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244774_A2E9B4.s @@ -0,0 +1,68 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244774_A2E9B4 +/* A2E9B4 80244774 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A2E9B8 80244778 AFB00018 */ sw $s0, 0x18($sp) +/* A2E9BC 8024477C 0080802D */ daddu $s0, $a0, $zero +/* A2E9C0 80244780 AFB1001C */ sw $s1, 0x1c($sp) +/* A2E9C4 80244784 00A0882D */ daddu $s1, $a1, $zero +/* A2E9C8 80244788 AFBF0028 */ sw $ra, 0x28($sp) +/* A2E9CC 8024478C AFB30024 */ sw $s3, 0x24($sp) +/* A2E9D0 80244790 AFB20020 */ sw $s2, 0x20($sp) +/* A2E9D4 80244794 F7B40030 */ sdc1 $f20, 0x30($sp) +/* A2E9D8 80244798 0C0B36B0 */ jal resolve_npc +/* A2E9DC 8024479C 24050007 */ addiu $a1, $zero, 7 +/* A2E9E0 802447A0 0200202D */ daddu $a0, $s0, $zero +/* A2E9E4 802447A4 24050008 */ addiu $a1, $zero, 8 +/* A2E9E8 802447A8 0C0B36B0 */ jal resolve_npc +/* A2E9EC 802447AC 0040902D */ daddu $s2, $v0, $zero +/* A2E9F0 802447B0 12200004 */ beqz $s1, .L802447C4 +/* A2E9F4 802447B4 0040982D */ daddu $s3, $v0, $zero +/* A2E9F8 802447B8 C640003C */ lwc1 $f0, 0x3c($s2) +/* A2E9FC 802447BC 3C018025 */ lui $at, 0x8025 +/* A2EA00 802447C0 E420F374 */ swc1 $f0, -0xc8c($at) +.L802447C4: +/* A2EA04 802447C4 3C018025 */ lui $at, 0x8025 +/* A2EA08 802447C8 C420F374 */ lwc1 $f0, -0xc8c($at) +/* A2EA0C 802447CC 24040003 */ addiu $a0, $zero, 3 +/* A2EA10 802447D0 44050000 */ mfc1 $a1, $f0 +/* A2EA14 802447D4 3C0143FA */ lui $at, 0x43fa +/* A2EA18 802447D8 44810000 */ mtc1 $at, $f0 +/* A2EA1C 802447DC 44853000 */ mtc1 $a1, $f6 +/* A2EA20 802447E0 3C108025 */ lui $s0, 0x8025 +/* A2EA24 802447E4 2610AEC4 */ addiu $s0, $s0, -0x513c +/* A2EA28 802447E8 46003180 */ add.s $f6, $f6, $f0 +/* A2EA2C 802447EC 3C014220 */ lui $at, 0x4220 +/* A2EA30 802447F0 4481A000 */ mtc1 $at, $f20 +/* A2EA34 802447F4 8E070000 */ lw $a3, ($s0) +/* A2EA38 802447F8 44063000 */ mfc1 $a2, $f6 +/* A2EA3C 802447FC 2642003C */ addiu $v0, $s2, 0x3c +/* A2EA40 80244800 AFA20014 */ sw $v0, 0x14($sp) +/* A2EA44 80244804 0C090439 */ jal func_802410E4_A2B324 +/* A2EA48 80244808 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2EA4C 8024480C C640003C */ lwc1 $f0, 0x3c($s2) +/* A2EA50 80244810 3C013F80 */ lui $at, 0x3f80 +/* A2EA54 80244814 44811000 */ mtc1 $at, $f2 +/* A2EA58 80244818 E660003C */ swc1 $f0, 0x3c($s3) +/* A2EA5C 8024481C C6000000 */ lwc1 $f0, ($s0) +/* A2EA60 80244820 C644003C */ lwc1 $f4, 0x3c($s2) +/* A2EA64 80244824 46020000 */ add.s $f0, $f0, $f2 +/* A2EA68 80244828 E6440070 */ swc1 $f4, 0x70($s2) +/* A2EA6C 8024482C C662003C */ lwc1 $f2, 0x3c($s3) +/* A2EA70 80244830 24020001 */ addiu $v0, $zero, 1 +/* A2EA74 80244834 E6620070 */ swc1 $f2, 0x70($s3) +/* A2EA78 80244838 4600A03C */ c.lt.s $f20, $f0 +/* A2EA7C 8024483C 00000000 */ nop +/* A2EA80 80244840 45010002 */ bc1t .L8024484C +/* A2EA84 80244844 E6000000 */ swc1 $f0, ($s0) +/* A2EA88 80244848 0000102D */ daddu $v0, $zero, $zero +.L8024484C: +/* A2EA8C 8024484C 8FBF0028 */ lw $ra, 0x28($sp) +/* A2EA90 80244850 8FB30024 */ lw $s3, 0x24($sp) +/* A2EA94 80244854 8FB20020 */ lw $s2, 0x20($sp) +/* A2EA98 80244858 8FB1001C */ lw $s1, 0x1c($sp) +/* A2EA9C 8024485C 8FB00018 */ lw $s0, 0x18($sp) +/* A2EAA0 80244860 D7B40030 */ ldc1 $f20, 0x30($sp) +/* A2EAA4 80244864 03E00008 */ jr $ra +/* A2EAA8 80244868 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C.s deleted file mode 100644 index 896b8b834b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024486C -/* A2EAAC 8024486C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A2EAB0 80244870 AFB00018 */ sw $s0, 0x18($sp) -/* A2EAB4 80244874 00A0802D */ daddu $s0, $a1, $zero -/* A2EAB8 80244878 AFBF0020 */ sw $ra, 0x20($sp) -/* A2EABC 8024487C AFB1001C */ sw $s1, 0x1c($sp) -/* A2EAC0 80244880 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A2EAC4 80244884 0C0B36B0 */ jal resolve_npc -/* A2EAC8 80244888 24050009 */ addiu $a1, $zero, 9 -/* A2EACC 8024488C 12000004 */ beqz $s0, .L802448A0 -/* A2EAD0 80244890 0040882D */ daddu $s1, $v0, $zero -/* A2EAD4 80244894 C620003C */ lwc1 $f0, 0x3c($s1) -/* A2EAD8 80244898 3C018025 */ lui $at, 0x8025 -/* A2EADC 8024489C E420F378 */ swc1 $f0, -0xc88($at) -.L802448A0: -/* A2EAE0 802448A0 3C018025 */ lui $at, 0x8025 -/* A2EAE4 802448A4 C420F378 */ lwc1 $f0, -0xc88($at) -/* A2EAE8 802448A8 24040003 */ addiu $a0, $zero, 3 -/* A2EAEC 802448AC 44050000 */ mfc1 $a1, $f0 -/* A2EAF0 802448B0 3C0143FA */ lui $at, 0x43fa -/* A2EAF4 802448B4 44810000 */ mtc1 $at, $f0 -/* A2EAF8 802448B8 44852000 */ mtc1 $a1, $f4 -/* A2EAFC 802448BC 3C108025 */ lui $s0, 0x8025 -/* A2EB00 802448C0 2610AEC8 */ addiu $s0, $s0, -0x5138 -/* A2EB04 802448C4 46002100 */ add.s $f4, $f4, $f0 -/* A2EB08 802448C8 3C014220 */ lui $at, 0x4220 -/* A2EB0C 802448CC 4481A000 */ mtc1 $at, $f20 -/* A2EB10 802448D0 8E070000 */ lw $a3, ($s0) -/* A2EB14 802448D4 44062000 */ mfc1 $a2, $f4 -/* A2EB18 802448D8 2622003C */ addiu $v0, $s1, 0x3c -/* A2EB1C 802448DC AFA20014 */ sw $v0, 0x14($sp) -/* A2EB20 802448E0 0C090439 */ jal func_802410E4 -/* A2EB24 802448E4 E7B40010 */ swc1 $f20, 0x10($sp) -/* A2EB28 802448E8 C6020000 */ lwc1 $f2, ($s0) -/* A2EB2C 802448EC 3C013F80 */ lui $at, 0x3f80 -/* A2EB30 802448F0 44810000 */ mtc1 $at, $f0 -/* A2EB34 802448F4 00000000 */ nop -/* A2EB38 802448F8 46001080 */ add.s $f2, $f2, $f0 -/* A2EB3C 802448FC C620003C */ lwc1 $f0, 0x3c($s1) -/* A2EB40 80244900 24020001 */ addiu $v0, $zero, 1 -/* A2EB44 80244904 E6200070 */ swc1 $f0, 0x70($s1) -/* A2EB48 80244908 4602A03C */ c.lt.s $f20, $f2 -/* A2EB4C 8024490C 00000000 */ nop -/* A2EB50 80244910 45010002 */ bc1t .L8024491C -/* A2EB54 80244914 E6020000 */ swc1 $f2, ($s0) -/* A2EB58 80244918 0000102D */ daddu $v0, $zero, $zero -.L8024491C: -/* A2EB5C 8024491C 8FBF0020 */ lw $ra, 0x20($sp) -/* A2EB60 80244920 8FB1001C */ lw $s1, 0x1c($sp) -/* A2EB64 80244924 8FB00018 */ lw $s0, 0x18($sp) -/* A2EB68 80244928 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A2EB6C 8024492C 03E00008 */ jr $ra -/* A2EB70 80244930 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s new file mode 100644 index 0000000000..7a86d9279d --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_8024486C_A2EAAC.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024486C_A2EAAC +/* A2EAAC 8024486C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A2EAB0 80244870 AFB00018 */ sw $s0, 0x18($sp) +/* A2EAB4 80244874 00A0802D */ daddu $s0, $a1, $zero +/* A2EAB8 80244878 AFBF0020 */ sw $ra, 0x20($sp) +/* A2EABC 8024487C AFB1001C */ sw $s1, 0x1c($sp) +/* A2EAC0 80244880 F7B40028 */ sdc1 $f20, 0x28($sp) +/* A2EAC4 80244884 0C0B36B0 */ jal resolve_npc +/* A2EAC8 80244888 24050009 */ addiu $a1, $zero, 9 +/* A2EACC 8024488C 12000004 */ beqz $s0, .L802448A0 +/* A2EAD0 80244890 0040882D */ daddu $s1, $v0, $zero +/* A2EAD4 80244894 C620003C */ lwc1 $f0, 0x3c($s1) +/* A2EAD8 80244898 3C018025 */ lui $at, 0x8025 +/* A2EADC 8024489C E420F378 */ swc1 $f0, -0xc88($at) +.L802448A0: +/* A2EAE0 802448A0 3C018025 */ lui $at, 0x8025 +/* A2EAE4 802448A4 C420F378 */ lwc1 $f0, -0xc88($at) +/* A2EAE8 802448A8 24040003 */ addiu $a0, $zero, 3 +/* A2EAEC 802448AC 44050000 */ mfc1 $a1, $f0 +/* A2EAF0 802448B0 3C0143FA */ lui $at, 0x43fa +/* A2EAF4 802448B4 44810000 */ mtc1 $at, $f0 +/* A2EAF8 802448B8 44852000 */ mtc1 $a1, $f4 +/* A2EAFC 802448BC 3C108025 */ lui $s0, 0x8025 +/* A2EB00 802448C0 2610AEC8 */ addiu $s0, $s0, -0x5138 +/* A2EB04 802448C4 46002100 */ add.s $f4, $f4, $f0 +/* A2EB08 802448C8 3C014220 */ lui $at, 0x4220 +/* A2EB0C 802448CC 4481A000 */ mtc1 $at, $f20 +/* A2EB10 802448D0 8E070000 */ lw $a3, ($s0) +/* A2EB14 802448D4 44062000 */ mfc1 $a2, $f4 +/* A2EB18 802448D8 2622003C */ addiu $v0, $s1, 0x3c +/* A2EB1C 802448DC AFA20014 */ sw $v0, 0x14($sp) +/* A2EB20 802448E0 0C090439 */ jal func_802410E4_A2B324 +/* A2EB24 802448E4 E7B40010 */ swc1 $f20, 0x10($sp) +/* A2EB28 802448E8 C6020000 */ lwc1 $f2, ($s0) +/* A2EB2C 802448EC 3C013F80 */ lui $at, 0x3f80 +/* A2EB30 802448F0 44810000 */ mtc1 $at, $f0 +/* A2EB34 802448F4 00000000 */ nop +/* A2EB38 802448F8 46001080 */ add.s $f2, $f2, $f0 +/* A2EB3C 802448FC C620003C */ lwc1 $f0, 0x3c($s1) +/* A2EB40 80244900 24020001 */ addiu $v0, $zero, 1 +/* A2EB44 80244904 E6200070 */ swc1 $f0, 0x70($s1) +/* A2EB48 80244908 4602A03C */ c.lt.s $f20, $f2 +/* A2EB4C 8024490C 00000000 */ nop +/* A2EB50 80244910 45010002 */ bc1t .L8024491C +/* A2EB54 80244914 E6020000 */ swc1 $f2, ($s0) +/* A2EB58 80244918 0000102D */ daddu $v0, $zero, $zero +.L8024491C: +/* A2EB5C 8024491C 8FBF0020 */ lw $ra, 0x20($sp) +/* A2EB60 80244920 8FB1001C */ lw $s1, 0x1c($sp) +/* A2EB64 80244924 8FB00018 */ lw $s0, 0x18($sp) +/* A2EB68 80244928 D7B40028 */ ldc1 $f20, 0x28($sp) +/* A2EB6C 8024492C 03E00008 */ jr $ra +/* A2EB70 80244930 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934.s deleted file mode 100644 index a98096a912..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244934 -/* A2EB74 80244934 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2EB78 80244938 AFBF0010 */ sw $ra, 0x10($sp) -/* A2EB7C 8024493C 10A00005 */ beqz $a1, .L80244954 -/* A2EB80 80244940 0080182D */ daddu $v1, $a0, $zero -/* A2EB84 80244944 3C05437F */ lui $a1, 0x437f -/* A2EB88 80244948 24040001 */ addiu $a0, $zero, 1 -/* A2EB8C 8024494C 08091264 */ j .L80244990 -/* A2EB90 80244950 AC600070 */ sw $zero, 0x70($v1) -.L80244954: -/* A2EB94 80244954 8C620070 */ lw $v0, 0x70($v1) -/* A2EB98 80244958 24420001 */ addiu $v0, $v0, 1 -/* A2EB9C 8024495C AC620070 */ sw $v0, 0x70($v1) -/* A2EBA0 80244960 2403000A */ addiu $v1, $zero, 0xa -/* A2EBA4 80244964 10430013 */ beq $v0, $v1, .L802449B4 -/* A2EBA8 80244968 24040001 */ addiu $a0, $zero, 1 -/* A2EBAC 8024496C 00621823 */ subu $v1, $v1, $v0 -/* A2EBB0 80244970 00831004 */ sllv $v0, $v1, $a0 -/* A2EBB4 80244974 00431021 */ addu $v0, $v0, $v1 -/* A2EBB8 80244978 000210C0 */ sll $v0, $v0, 3 -/* A2EBBC 8024497C 00431021 */ addu $v0, $v0, $v1 -/* A2EBC0 80244980 44820000 */ mtc1 $v0, $f0 -/* A2EBC4 80244984 00000000 */ nop -/* A2EBC8 80244988 46800020 */ cvt.s.w $f0, $f0 -/* A2EBCC 8024498C 44050000 */ mfc1 $a1, $f0 -.L80244990: -/* A2EBD0 80244990 0C04DF69 */ jal func_80137DA4 -/* A2EBD4 80244994 00000000 */ nop -/* A2EBD8 80244998 24040001 */ addiu $a0, $zero, 1 -/* A2EBDC 8024499C 240500FA */ addiu $a1, $zero, 0xfa -/* A2EBE0 802449A0 00A0302D */ daddu $a2, $a1, $zero -/* A2EBE4 802449A4 0C04DF84 */ jal func_80137E10 -/* A2EBE8 802449A8 00A0382D */ daddu $a3, $a1, $zero -/* A2EBEC 802449AC 08091276 */ j .L802449D8 -/* A2EBF0 802449B0 0000102D */ daddu $v0, $zero, $zero -.L802449B4: -/* A2EBF4 802449B4 0000202D */ daddu $a0, $zero, $zero -/* A2EBF8 802449B8 0C04DF69 */ jal func_80137DA4 -/* A2EBFC 802449BC 0000282D */ daddu $a1, $zero, $zero -/* A2EC00 802449C0 24040001 */ addiu $a0, $zero, 1 -/* A2EC04 802449C4 240500FA */ addiu $a1, $zero, 0xfa -/* A2EC08 802449C8 00A0302D */ daddu $a2, $a1, $zero -/* A2EC0C 802449CC 0C04DF84 */ jal func_80137E10 -/* A2EC10 802449D0 00A0382D */ daddu $a3, $a1, $zero -/* A2EC14 802449D4 24020002 */ addiu $v0, $zero, 2 -.L802449D8: -/* A2EC18 802449D8 8FBF0010 */ lw $ra, 0x10($sp) -/* A2EC1C 802449DC 03E00008 */ jr $ra -/* A2EC20 802449E0 27BD0018 */ addiu $sp, $sp, 0x18 -/* A2EC24 802449E4 00000000 */ nop -/* A2EC28 802449E8 00000000 */ nop -/* A2EC2C 802449EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s new file mode 100644 index 0000000000..df9d36bc18 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/func_80244934_A2EB74.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244934_A2EB74 +/* A2EB74 80244934 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2EB78 80244938 AFBF0010 */ sw $ra, 0x10($sp) +/* A2EB7C 8024493C 10A00005 */ beqz $a1, .L80244954 +/* A2EB80 80244940 0080182D */ daddu $v1, $a0, $zero +/* A2EB84 80244944 3C05437F */ lui $a1, 0x437f +/* A2EB88 80244948 24040001 */ addiu $a0, $zero, 1 +/* A2EB8C 8024494C 08091264 */ j .L80244990 +/* A2EB90 80244950 AC600070 */ sw $zero, 0x70($v1) +.L80244954: +/* A2EB94 80244954 8C620070 */ lw $v0, 0x70($v1) +/* A2EB98 80244958 24420001 */ addiu $v0, $v0, 1 +/* A2EB9C 8024495C AC620070 */ sw $v0, 0x70($v1) +/* A2EBA0 80244960 2403000A */ addiu $v1, $zero, 0xa +/* A2EBA4 80244964 10430013 */ beq $v0, $v1, .L802449B4 +/* A2EBA8 80244968 24040001 */ addiu $a0, $zero, 1 +/* A2EBAC 8024496C 00621823 */ subu $v1, $v1, $v0 +/* A2EBB0 80244970 00831004 */ sllv $v0, $v1, $a0 +/* A2EBB4 80244974 00431021 */ addu $v0, $v0, $v1 +/* A2EBB8 80244978 000210C0 */ sll $v0, $v0, 3 +/* A2EBBC 8024497C 00431021 */ addu $v0, $v0, $v1 +/* A2EBC0 80244980 44820000 */ mtc1 $v0, $f0 +/* A2EBC4 80244984 00000000 */ nop +/* A2EBC8 80244988 46800020 */ cvt.s.w $f0, $f0 +/* A2EBCC 8024498C 44050000 */ mfc1 $a1, $f0 +.L80244990: +/* A2EBD0 80244990 0C04DF69 */ jal func_80137DA4 +/* A2EBD4 80244994 00000000 */ nop +/* A2EBD8 80244998 24040001 */ addiu $a0, $zero, 1 +/* A2EBDC 8024499C 240500FA */ addiu $a1, $zero, 0xfa +/* A2EBE0 802449A0 00A0302D */ daddu $a2, $a1, $zero +/* A2EBE4 802449A4 0C04DF84 */ jal func_80137E10 +/* A2EBE8 802449A8 00A0382D */ daddu $a3, $a1, $zero +/* A2EBEC 802449AC 08091276 */ j .L802449D8 +/* A2EBF0 802449B0 0000102D */ daddu $v0, $zero, $zero +.L802449B4: +/* A2EBF4 802449B4 0000202D */ daddu $a0, $zero, $zero +/* A2EBF8 802449B8 0C04DF69 */ jal func_80137DA4 +/* A2EBFC 802449BC 0000282D */ daddu $a1, $zero, $zero +/* A2EC00 802449C0 24040001 */ addiu $a0, $zero, 1 +/* A2EC04 802449C4 240500FA */ addiu $a1, $zero, 0xfa +/* A2EC08 802449C8 00A0302D */ daddu $a2, $a1, $zero +/* A2EC0C 802449CC 0C04DF84 */ jal func_80137E10 +/* A2EC10 802449D0 00A0382D */ daddu $a3, $a1, $zero +/* A2EC14 802449D4 24020002 */ addiu $v0, $zero, 2 +.L802449D8: +/* A2EC18 802449D8 8FBF0010 */ lw $ra, 0x10($sp) +/* A2EC1C 802449DC 03E00008 */ jr $ra +/* A2EC20 802449E0 27BD0018 */ addiu $sp, $sp, 0x18 +/* A2EC24 802449E4 00000000 */ nop +/* A2EC28 802449E8 00000000 */ nop +/* A2EC2C 802449EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s index fe9f09d277..b1b19cee48 100644 --- a/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s +++ b/asm/nonmatchings/world/area_hos/hos_05/A2AAC0/update_heroes_start_turn_A2C264.s @@ -38,7 +38,7 @@ glabel update_heroes_start_turn_A2C264 /* A2C2E8 802420A8 001080C0 */ sll $s0, $s0, 3 /* A2C2EC 802420AC 4406A000 */ mfc1 $a2, $f20 /* A2C2F0 802420B0 02038021 */ addu $s0, $s0, $v1 -/* A2C2F4 802420B4 0C090439 */ jal func_802410E4 +/* A2C2F4 802420B4 0C090439 */ jal func_802410E4_A2B324 /* A2C2F8 802420B8 E7A00010 */ swc1 $f0, 0x10($sp) /* A2C2FC 802420BC 3C026666 */ lui $v0, 0x6666 /* A2C300 802420C0 34426667 */ ori $v0, $v0, 0x6667 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0.s deleted file mode 100644 index 28fa71d3c0..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0.s +++ /dev/null @@ -1,171 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802449F0 -/* A2EC30 802449F0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A2EC34 802449F4 3C038025 */ lui $v1, 0x8025 -/* A2EC38 802449F8 2463DA98 */ addiu $v1, $v1, -0x2568 -/* A2EC3C 802449FC AFBF0034 */ sw $ra, 0x34($sp) -/* A2EC40 80244A00 AFB20030 */ sw $s2, 0x30($sp) -/* A2EC44 80244A04 AFB1002C */ sw $s1, 0x2c($sp) -/* A2EC48 80244A08 AFB00028 */ sw $s0, 0x28($sp) -/* A2EC4C 80244A0C 8C620000 */ lw $v0, ($v1) -/* A2EC50 80244A10 14400007 */ bnez $v0, .L80244A30 -/* A2EC54 80244A14 00000000 */ nop -/* A2EC58 80244A18 3C028007 */ lui $v0, %hi(D_800779B0) -/* A2EC5C 80244A1C 904279B0 */ lbu $v0, %lo(D_800779B0)($v0) -/* A2EC60 80244A20 00021080 */ sll $v0, $v0, 2 -/* A2EC64 80244A24 00441021 */ addu $v0, $v0, $a0 -/* A2EC68 80244A28 8C420000 */ lw $v0, ($v0) -/* A2EC6C 80244A2C AC620000 */ sw $v0, ($v1) -.L80244A30: -/* A2EC70 80244A30 3C038025 */ lui $v1, 0x8025 -/* A2EC74 80244A34 8C63DA90 */ lw $v1, -0x2570($v1) -/* A2EC78 80244A38 2C620005 */ sltiu $v0, $v1, 5 -/* A2EC7C 80244A3C 10400050 */ beqz $v0, .L80244B80 -/* A2EC80 80244A40 00031080 */ sll $v0, $v1, 2 -/* A2EC84 80244A44 3C018025 */ lui $at, 0x8025 -/* A2EC88 80244A48 00220821 */ addu $at, $at, $v0 -/* A2EC8C 80244A4C 8C22F260 */ lw $v0, -0xda0($at) -/* A2EC90 80244A50 00400008 */ jr $v0 -/* A2EC94 80244A54 00000000 */ nop -/* A2EC98 80244A58 3C048025 */ lui $a0, 0x8025 -/* A2EC9C 80244A5C 8C84DA98 */ lw $a0, -0x2568($a0) -/* A2ECA0 80244A60 8C830000 */ lw $v1, ($a0) -/* A2ECA4 80244A64 2402FFFF */ addiu $v0, $zero, -1 -/* A2ECA8 80244A68 14620004 */ bne $v1, $v0, .L80244A7C -/* A2ECAC 80244A6C 24020004 */ addiu $v0, $zero, 4 -/* A2ECB0 80244A70 8C830004 */ lw $v1, 4($a0) -/* A2ECB4 80244A74 080912AB */ j .L80244AAC -/* A2ECB8 80244A78 00000000 */ nop -.L80244A7C: -/* A2ECBC 80244A7C 3C038025 */ lui $v1, 0x8025 -/* A2ECC0 80244A80 2463DA94 */ addiu $v1, $v1, -0x256c -/* A2ECC4 80244A84 8C620000 */ lw $v0, ($v1) -/* A2ECC8 80244A88 2442000A */ addiu $v0, $v0, 0xa -/* A2ECCC 80244A8C AC620000 */ sw $v0, ($v1) -/* A2ECD0 80244A90 28420100 */ slti $v0, $v0, 0x100 -/* A2ECD4 80244A94 5440003B */ bnel $v0, $zero, .L80244B84 -/* A2ECD8 80244A98 24040001 */ addiu $a0, $zero, 1 -/* A2ECDC 80244A9C 240200FF */ addiu $v0, $zero, 0xff -/* A2ECE0 80244AA0 AC620000 */ sw $v0, ($v1) -/* A2ECE4 80244AA4 8C830004 */ lw $v1, 4($a0) -/* A2ECE8 80244AA8 24020001 */ addiu $v0, $zero, 1 -.L80244AAC: -/* A2ECEC 80244AAC 3C018025 */ lui $at, 0x8025 -/* A2ECF0 80244AB0 AC22DA90 */ sw $v0, -0x2570($at) -/* A2ECF4 80244AB4 3C018025 */ lui $at, 0x8025 -/* A2ECF8 80244AB8 AC23F570 */ sw $v1, -0xa90($at) -/* A2ECFC 80244ABC 080912E1 */ j .L80244B84 -/* A2ED00 80244AC0 24040001 */ addiu $a0, $zero, 1 -/* A2ED04 80244AC4 3C038025 */ lui $v1, 0x8025 -/* A2ED08 80244AC8 2463F570 */ addiu $v1, $v1, -0xa90 -/* A2ED0C 80244ACC 8C620000 */ lw $v0, ($v1) -/* A2ED10 80244AD0 1440001B */ bnez $v0, .L80244B40 -/* A2ED14 80244AD4 2442FFFF */ addiu $v0, $v0, -1 -/* A2ED18 80244AD8 24020002 */ addiu $v0, $zero, 2 -/* A2ED1C 80244ADC 3C018025 */ lui $at, 0x8025 -/* A2ED20 80244AE0 AC22DA90 */ sw $v0, -0x2570($at) -/* A2ED24 80244AE4 080912E1 */ j .L80244B84 -/* A2ED28 80244AE8 24040001 */ addiu $a0, $zero, 1 -/* A2ED2C 80244AEC 3C048025 */ lui $a0, 0x8025 -/* A2ED30 80244AF0 2484DA94 */ addiu $a0, $a0, -0x256c -/* A2ED34 80244AF4 8C820000 */ lw $v0, ($a0) -/* A2ED38 80244AF8 2442FFF6 */ addiu $v0, $v0, -0xa -/* A2ED3C 80244AFC 04410020 */ bgez $v0, .L80244B80 -/* A2ED40 80244B00 AC820000 */ sw $v0, ($a0) -/* A2ED44 80244B04 3C028025 */ lui $v0, 0x8025 -/* A2ED48 80244B08 2442DA98 */ addiu $v0, $v0, -0x2568 -/* A2ED4C 80244B0C 8C430000 */ lw $v1, ($v0) -/* A2ED50 80244B10 AC800000 */ sw $zero, ($a0) -/* A2ED54 80244B14 8C640008 */ lw $a0, 8($v1) -/* A2ED58 80244B18 24630008 */ addiu $v1, $v1, 8 -/* A2ED5C 80244B1C 10800011 */ beqz $a0, .L80244B64 -/* A2ED60 80244B20 AC430000 */ sw $v1, ($v0) -/* A2ED64 80244B24 080912DE */ j .L80244B78 -/* A2ED68 80244B28 00000000 */ nop -/* A2ED6C 80244B2C 3C038025 */ lui $v1, 0x8025 -/* A2ED70 80244B30 2463F570 */ addiu $v1, $v1, -0xa90 -/* A2ED74 80244B34 8C620000 */ lw $v0, ($v1) -/* A2ED78 80244B38 10400003 */ beqz $v0, .L80244B48 -/* A2ED7C 80244B3C 2442FFFF */ addiu $v0, $v0, -1 -.L80244B40: -/* A2ED80 80244B40 080912E0 */ j .L80244B80 -/* A2ED84 80244B44 AC620000 */ sw $v0, ($v1) -.L80244B48: -/* A2ED88 80244B48 3C028025 */ lui $v0, 0x8025 -/* A2ED8C 80244B4C 2442DA98 */ addiu $v0, $v0, -0x2568 -/* A2ED90 80244B50 8C430000 */ lw $v1, ($v0) -/* A2ED94 80244B54 8C640008 */ lw $a0, 8($v1) -/* A2ED98 80244B58 24630008 */ addiu $v1, $v1, 8 -/* A2ED9C 80244B5C 14800006 */ bnez $a0, .L80244B78 -/* A2EDA0 80244B60 AC430000 */ sw $v1, ($v0) -.L80244B64: -/* A2EDA4 80244B64 24020003 */ addiu $v0, $zero, 3 -/* A2EDA8 80244B68 3C018025 */ lui $at, 0x8025 -/* A2EDAC 80244B6C AC22DA90 */ sw $v0, -0x2570($at) -/* A2EDB0 80244B70 080912E1 */ j .L80244B84 -/* A2EDB4 80244B74 24040001 */ addiu $a0, $zero, 1 -.L80244B78: -/* A2EDB8 80244B78 3C018025 */ lui $at, 0x8025 -/* A2EDBC 80244B7C AC20DA90 */ sw $zero, -0x2570($at) -.L80244B80: -/* A2EDC0 80244B80 24040001 */ addiu $a0, $zero, 1 -.L80244B84: -/* A2EDC4 80244B84 27B00018 */ addiu $s0, $sp, 0x18 -/* A2EDC8 80244B88 0200282D */ daddu $a1, $s0, $zero -/* A2EDCC 80244B8C 0C04DF70 */ jal func_80137DC0 -/* A2EDD0 80244B90 27A6001C */ addiu $a2, $sp, 0x1c -/* A2EDD4 80244B94 0000202D */ daddu $a0, $zero, $zero -/* A2EDD8 80244B98 0200282D */ daddu $a1, $s0, $zero -/* A2EDDC 80244B9C 0C04DF70 */ jal func_80137DC0 -/* A2EDE0 80244BA0 27A60020 */ addiu $a2, $sp, 0x20 -/* A2EDE4 80244BA4 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* A2EDE8 80244BA8 3C01437F */ lui $at, 0x437f -/* A2EDEC 80244BAC 44812000 */ mtc1 $at, $f4 -/* A2EDF0 80244BB0 00000000 */ nop -/* A2EDF4 80244BB4 46022081 */ sub.s $f2, $f4, $f2 -/* A2EDF8 80244BB8 3C018025 */ lui $at, 0x8025 -/* A2EDFC 80244BBC C420DA94 */ lwc1 $f0, -0x256c($at) -/* A2EE00 80244BC0 46800020 */ cvt.s.w $f0, $f0 -/* A2EE04 80244BC4 46020002 */ mul.s $f0, $f0, $f2 -/* A2EE08 80244BC8 00000000 */ nop -/* A2EE0C 80244BCC C7A20020 */ lwc1 $f2, 0x20($sp) -/* A2EE10 80244BD0 46022081 */ sub.s $f2, $f4, $f2 -/* A2EE14 80244BD4 46020002 */ mul.s $f0, $f0, $f2 -/* A2EE18 80244BD8 00000000 */ nop -/* A2EE1C 80244BDC 46040003 */ div.s $f0, $f0, $f4 -/* A2EE20 80244BE0 46040003 */ div.s $f0, $f0, $f4 -/* A2EE24 80244BE4 4600018D */ trunc.w.s $f6, $f0 -/* A2EE28 80244BE8 44113000 */ mfc1 $s1, $f6 -/* A2EE2C 80244BEC 00000000 */ nop -/* A2EE30 80244BF0 1A200015 */ blez $s1, .L80244C48 -/* A2EE34 80244BF4 00000000 */ nop -/* A2EE38 80244BF8 3C128025 */ lui $s2, 0x8025 -/* A2EE3C 80244BFC 2652DA98 */ addiu $s2, $s2, -0x2568 -/* A2EE40 80244C00 8E420000 */ lw $v0, ($s2) -/* A2EE44 80244C04 8C440000 */ lw $a0, ($v0) -/* A2EE48 80244C08 1080000F */ beqz $a0, .L80244C48 -/* A2EE4C 80244C0C 00000000 */ nop -/* A2EE50 80244C10 0C04992C */ jal func_801264B0 -/* A2EE54 80244C14 0000802D */ daddu $s0, $zero, $zero -/* A2EE58 80244C18 28420002 */ slti $v0, $v0, 2 -/* A2EE5C 80244C1C 50400001 */ beql $v0, $zero, .L80244C24 -/* A2EE60 80244C20 2410FFF9 */ addiu $s0, $zero, -7 -.L80244C24: -/* A2EE64 80244C24 0000282D */ daddu $a1, $zero, $zero -/* A2EE68 80244C28 260600C4 */ addiu $a2, $s0, 0xc4 -/* A2EE6C 80244C2C 8E430000 */ lw $v1, ($s2) -/* A2EE70 80244C30 2402FFFF */ addiu $v0, $zero, -1 -/* A2EE74 80244C34 AFA20010 */ sw $v0, 0x10($sp) -/* A2EE78 80244C38 AFA00014 */ sw $zero, 0x14($sp) -/* A2EE7C 80244C3C 8C640000 */ lw $a0, ($v1) -/* A2EE80 80244C40 0C04993B */ jal draw_string -/* A2EE84 80244C44 0220382D */ daddu $a3, $s1, $zero -.L80244C48: -/* A2EE88 80244C48 8FBF0034 */ lw $ra, 0x34($sp) -/* A2EE8C 80244C4C 8FB20030 */ lw $s2, 0x30($sp) -/* A2EE90 80244C50 8FB1002C */ lw $s1, 0x2c($sp) -/* A2EE94 80244C54 8FB00028 */ lw $s0, 0x28($sp) -/* A2EE98 80244C58 03E00008 */ jr $ra -/* A2EE9C 80244C5C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s new file mode 100644 index 0000000000..da48d622cf --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_802449F0_A2EC30.s @@ -0,0 +1,171 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802449F0_A2EC30 +/* A2EC30 802449F0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A2EC34 802449F4 3C038025 */ lui $v1, 0x8025 +/* A2EC38 802449F8 2463DA98 */ addiu $v1, $v1, -0x2568 +/* A2EC3C 802449FC AFBF0034 */ sw $ra, 0x34($sp) +/* A2EC40 80244A00 AFB20030 */ sw $s2, 0x30($sp) +/* A2EC44 80244A04 AFB1002C */ sw $s1, 0x2c($sp) +/* A2EC48 80244A08 AFB00028 */ sw $s0, 0x28($sp) +/* A2EC4C 80244A0C 8C620000 */ lw $v0, ($v1) +/* A2EC50 80244A10 14400007 */ bnez $v0, .L80244A30 +/* A2EC54 80244A14 00000000 */ nop +/* A2EC58 80244A18 3C028007 */ lui $v0, %hi(D_800779B0) +/* A2EC5C 80244A1C 904279B0 */ lbu $v0, %lo(D_800779B0)($v0) +/* A2EC60 80244A20 00021080 */ sll $v0, $v0, 2 +/* A2EC64 80244A24 00441021 */ addu $v0, $v0, $a0 +/* A2EC68 80244A28 8C420000 */ lw $v0, ($v0) +/* A2EC6C 80244A2C AC620000 */ sw $v0, ($v1) +.L80244A30: +/* A2EC70 80244A30 3C038025 */ lui $v1, 0x8025 +/* A2EC74 80244A34 8C63DA90 */ lw $v1, -0x2570($v1) +/* A2EC78 80244A38 2C620005 */ sltiu $v0, $v1, 5 +/* A2EC7C 80244A3C 10400050 */ beqz $v0, .L80244B80 +/* A2EC80 80244A40 00031080 */ sll $v0, $v1, 2 +/* A2EC84 80244A44 3C018025 */ lui $at, 0x8025 +/* A2EC88 80244A48 00220821 */ addu $at, $at, $v0 +/* A2EC8C 80244A4C 8C22F260 */ lw $v0, -0xda0($at) +/* A2EC90 80244A50 00400008 */ jr $v0 +/* A2EC94 80244A54 00000000 */ nop +/* A2EC98 80244A58 3C048025 */ lui $a0, 0x8025 +/* A2EC9C 80244A5C 8C84DA98 */ lw $a0, -0x2568($a0) +/* A2ECA0 80244A60 8C830000 */ lw $v1, ($a0) +/* A2ECA4 80244A64 2402FFFF */ addiu $v0, $zero, -1 +/* A2ECA8 80244A68 14620004 */ bne $v1, $v0, .L80244A7C +/* A2ECAC 80244A6C 24020004 */ addiu $v0, $zero, 4 +/* A2ECB0 80244A70 8C830004 */ lw $v1, 4($a0) +/* A2ECB4 80244A74 080912AB */ j .L80244AAC +/* A2ECB8 80244A78 00000000 */ nop +.L80244A7C: +/* A2ECBC 80244A7C 3C038025 */ lui $v1, 0x8025 +/* A2ECC0 80244A80 2463DA94 */ addiu $v1, $v1, -0x256c +/* A2ECC4 80244A84 8C620000 */ lw $v0, ($v1) +/* A2ECC8 80244A88 2442000A */ addiu $v0, $v0, 0xa +/* A2ECCC 80244A8C AC620000 */ sw $v0, ($v1) +/* A2ECD0 80244A90 28420100 */ slti $v0, $v0, 0x100 +/* A2ECD4 80244A94 5440003B */ bnel $v0, $zero, .L80244B84 +/* A2ECD8 80244A98 24040001 */ addiu $a0, $zero, 1 +/* A2ECDC 80244A9C 240200FF */ addiu $v0, $zero, 0xff +/* A2ECE0 80244AA0 AC620000 */ sw $v0, ($v1) +/* A2ECE4 80244AA4 8C830004 */ lw $v1, 4($a0) +/* A2ECE8 80244AA8 24020001 */ addiu $v0, $zero, 1 +.L80244AAC: +/* A2ECEC 80244AAC 3C018025 */ lui $at, 0x8025 +/* A2ECF0 80244AB0 AC22DA90 */ sw $v0, -0x2570($at) +/* A2ECF4 80244AB4 3C018025 */ lui $at, 0x8025 +/* A2ECF8 80244AB8 AC23F570 */ sw $v1, -0xa90($at) +/* A2ECFC 80244ABC 080912E1 */ j .L80244B84 +/* A2ED00 80244AC0 24040001 */ addiu $a0, $zero, 1 +/* A2ED04 80244AC4 3C038025 */ lui $v1, 0x8025 +/* A2ED08 80244AC8 2463F570 */ addiu $v1, $v1, -0xa90 +/* A2ED0C 80244ACC 8C620000 */ lw $v0, ($v1) +/* A2ED10 80244AD0 1440001B */ bnez $v0, .L80244B40 +/* A2ED14 80244AD4 2442FFFF */ addiu $v0, $v0, -1 +/* A2ED18 80244AD8 24020002 */ addiu $v0, $zero, 2 +/* A2ED1C 80244ADC 3C018025 */ lui $at, 0x8025 +/* A2ED20 80244AE0 AC22DA90 */ sw $v0, -0x2570($at) +/* A2ED24 80244AE4 080912E1 */ j .L80244B84 +/* A2ED28 80244AE8 24040001 */ addiu $a0, $zero, 1 +/* A2ED2C 80244AEC 3C048025 */ lui $a0, 0x8025 +/* A2ED30 80244AF0 2484DA94 */ addiu $a0, $a0, -0x256c +/* A2ED34 80244AF4 8C820000 */ lw $v0, ($a0) +/* A2ED38 80244AF8 2442FFF6 */ addiu $v0, $v0, -0xa +/* A2ED3C 80244AFC 04410020 */ bgez $v0, .L80244B80 +/* A2ED40 80244B00 AC820000 */ sw $v0, ($a0) +/* A2ED44 80244B04 3C028025 */ lui $v0, 0x8025 +/* A2ED48 80244B08 2442DA98 */ addiu $v0, $v0, -0x2568 +/* A2ED4C 80244B0C 8C430000 */ lw $v1, ($v0) +/* A2ED50 80244B10 AC800000 */ sw $zero, ($a0) +/* A2ED54 80244B14 8C640008 */ lw $a0, 8($v1) +/* A2ED58 80244B18 24630008 */ addiu $v1, $v1, 8 +/* A2ED5C 80244B1C 10800011 */ beqz $a0, .L80244B64 +/* A2ED60 80244B20 AC430000 */ sw $v1, ($v0) +/* A2ED64 80244B24 080912DE */ j .L80244B78 +/* A2ED68 80244B28 00000000 */ nop +/* A2ED6C 80244B2C 3C038025 */ lui $v1, 0x8025 +/* A2ED70 80244B30 2463F570 */ addiu $v1, $v1, -0xa90 +/* A2ED74 80244B34 8C620000 */ lw $v0, ($v1) +/* A2ED78 80244B38 10400003 */ beqz $v0, .L80244B48 +/* A2ED7C 80244B3C 2442FFFF */ addiu $v0, $v0, -1 +.L80244B40: +/* A2ED80 80244B40 080912E0 */ j .L80244B80 +/* A2ED84 80244B44 AC620000 */ sw $v0, ($v1) +.L80244B48: +/* A2ED88 80244B48 3C028025 */ lui $v0, 0x8025 +/* A2ED8C 80244B4C 2442DA98 */ addiu $v0, $v0, -0x2568 +/* A2ED90 80244B50 8C430000 */ lw $v1, ($v0) +/* A2ED94 80244B54 8C640008 */ lw $a0, 8($v1) +/* A2ED98 80244B58 24630008 */ addiu $v1, $v1, 8 +/* A2ED9C 80244B5C 14800006 */ bnez $a0, .L80244B78 +/* A2EDA0 80244B60 AC430000 */ sw $v1, ($v0) +.L80244B64: +/* A2EDA4 80244B64 24020003 */ addiu $v0, $zero, 3 +/* A2EDA8 80244B68 3C018025 */ lui $at, 0x8025 +/* A2EDAC 80244B6C AC22DA90 */ sw $v0, -0x2570($at) +/* A2EDB0 80244B70 080912E1 */ j .L80244B84 +/* A2EDB4 80244B74 24040001 */ addiu $a0, $zero, 1 +.L80244B78: +/* A2EDB8 80244B78 3C018025 */ lui $at, 0x8025 +/* A2EDBC 80244B7C AC20DA90 */ sw $zero, -0x2570($at) +.L80244B80: +/* A2EDC0 80244B80 24040001 */ addiu $a0, $zero, 1 +.L80244B84: +/* A2EDC4 80244B84 27B00018 */ addiu $s0, $sp, 0x18 +/* A2EDC8 80244B88 0200282D */ daddu $a1, $s0, $zero +/* A2EDCC 80244B8C 0C04DF70 */ jal func_80137DC0 +/* A2EDD0 80244B90 27A6001C */ addiu $a2, $sp, 0x1c +/* A2EDD4 80244B94 0000202D */ daddu $a0, $zero, $zero +/* A2EDD8 80244B98 0200282D */ daddu $a1, $s0, $zero +/* A2EDDC 80244B9C 0C04DF70 */ jal func_80137DC0 +/* A2EDE0 80244BA0 27A60020 */ addiu $a2, $sp, 0x20 +/* A2EDE4 80244BA4 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* A2EDE8 80244BA8 3C01437F */ lui $at, 0x437f +/* A2EDEC 80244BAC 44812000 */ mtc1 $at, $f4 +/* A2EDF0 80244BB0 00000000 */ nop +/* A2EDF4 80244BB4 46022081 */ sub.s $f2, $f4, $f2 +/* A2EDF8 80244BB8 3C018025 */ lui $at, 0x8025 +/* A2EDFC 80244BBC C420DA94 */ lwc1 $f0, -0x256c($at) +/* A2EE00 80244BC0 46800020 */ cvt.s.w $f0, $f0 +/* A2EE04 80244BC4 46020002 */ mul.s $f0, $f0, $f2 +/* A2EE08 80244BC8 00000000 */ nop +/* A2EE0C 80244BCC C7A20020 */ lwc1 $f2, 0x20($sp) +/* A2EE10 80244BD0 46022081 */ sub.s $f2, $f4, $f2 +/* A2EE14 80244BD4 46020002 */ mul.s $f0, $f0, $f2 +/* A2EE18 80244BD8 00000000 */ nop +/* A2EE1C 80244BDC 46040003 */ div.s $f0, $f0, $f4 +/* A2EE20 80244BE0 46040003 */ div.s $f0, $f0, $f4 +/* A2EE24 80244BE4 4600018D */ trunc.w.s $f6, $f0 +/* A2EE28 80244BE8 44113000 */ mfc1 $s1, $f6 +/* A2EE2C 80244BEC 00000000 */ nop +/* A2EE30 80244BF0 1A200015 */ blez $s1, .L80244C48 +/* A2EE34 80244BF4 00000000 */ nop +/* A2EE38 80244BF8 3C128025 */ lui $s2, 0x8025 +/* A2EE3C 80244BFC 2652DA98 */ addiu $s2, $s2, -0x2568 +/* A2EE40 80244C00 8E420000 */ lw $v0, ($s2) +/* A2EE44 80244C04 8C440000 */ lw $a0, ($v0) +/* A2EE48 80244C08 1080000F */ beqz $a0, .L80244C48 +/* A2EE4C 80244C0C 00000000 */ nop +/* A2EE50 80244C10 0C04992C */ jal func_801264B0 +/* A2EE54 80244C14 0000802D */ daddu $s0, $zero, $zero +/* A2EE58 80244C18 28420002 */ slti $v0, $v0, 2 +/* A2EE5C 80244C1C 50400001 */ beql $v0, $zero, .L80244C24 +/* A2EE60 80244C20 2410FFF9 */ addiu $s0, $zero, -7 +.L80244C24: +/* A2EE64 80244C24 0000282D */ daddu $a1, $zero, $zero +/* A2EE68 80244C28 260600C4 */ addiu $a2, $s0, 0xc4 +/* A2EE6C 80244C2C 8E430000 */ lw $v1, ($s2) +/* A2EE70 80244C30 2402FFFF */ addiu $v0, $zero, -1 +/* A2EE74 80244C34 AFA20010 */ sw $v0, 0x10($sp) +/* A2EE78 80244C38 AFA00014 */ sw $zero, 0x14($sp) +/* A2EE7C 80244C3C 8C640000 */ lw $a0, ($v1) +/* A2EE80 80244C40 0C04993B */ jal draw_string +/* A2EE84 80244C44 0220382D */ daddu $a3, $s1, $zero +.L80244C48: +/* A2EE88 80244C48 8FBF0034 */ lw $ra, 0x34($sp) +/* A2EE8C 80244C4C 8FB20030 */ lw $s2, 0x30($sp) +/* A2EE90 80244C50 8FB1002C */ lw $s1, 0x2c($sp) +/* A2EE94 80244C54 8FB00028 */ lw $s0, 0x28($sp) +/* A2EE98 80244C58 03E00008 */ jr $ra +/* A2EE9C 80244C5C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C60.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C60.s deleted file mode 100644 index 53dc211804..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C60.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244C60 -/* A2EEA0 80244C60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2EEA4 80244C64 AFBF0010 */ sw $ra, 0x10($sp) -/* A2EEA8 80244C68 8C82000C */ lw $v0, 0xc($a0) -/* A2EEAC 80244C6C 0C0B1EAF */ jal get_variable -/* A2EEB0 80244C70 8C450000 */ lw $a1, ($v0) -/* A2EEB4 80244C74 0C00AFC1 */ jal set_curtain_draw_callback -/* A2EEB8 80244C78 0040202D */ daddu $a0, $v0, $zero -/* A2EEBC 80244C7C 8FBF0010 */ lw $ra, 0x10($sp) -/* A2EEC0 80244C80 24020002 */ addiu $v0, $zero, 2 -/* A2EEC4 80244C84 03E00008 */ jr $ra -/* A2EEC8 80244C88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C60_A2EEA0.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C60_A2EEA0.s new file mode 100644 index 0000000000..6937704fbd --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C60_A2EEA0.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244C60_A2EEA0 +/* A2EEA0 80244C60 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2EEA4 80244C64 AFBF0010 */ sw $ra, 0x10($sp) +/* A2EEA8 80244C68 8C82000C */ lw $v0, 0xc($a0) +/* A2EEAC 80244C6C 0C0B1EAF */ jal get_variable +/* A2EEB0 80244C70 8C450000 */ lw $a1, ($v0) +/* A2EEB4 80244C74 0C00AFC1 */ jal set_curtain_draw_callback +/* A2EEB8 80244C78 0040202D */ daddu $a0, $v0, $zero +/* A2EEBC 80244C7C 8FBF0010 */ lw $ra, 0x10($sp) +/* A2EEC0 80244C80 24020002 */ addiu $v0, $zero, 2 +/* A2EEC4 80244C84 03E00008 */ jr $ra +/* A2EEC8 80244C88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C.s deleted file mode 100644 index b0fe2a077f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244C8C -/* A2EECC 80244C8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2EED0 80244C90 AFBF0010 */ sw $ra, 0x10($sp) -/* A2EED4 80244C94 0C090C40 */ jal func_80243100 -/* A2EED8 80244C98 00000000 */ nop -/* A2EEDC 80244C9C 3C048025 */ lui $a0, 0x8025 -/* A2EEE0 80244CA0 0C09127C */ jal func_802449F0 -/* A2EEE4 80244CA4 2484DBCC */ addiu $a0, $a0, -0x2434 -/* A2EEE8 80244CA8 8FBF0010 */ lw $ra, 0x10($sp) -/* A2EEEC 80244CAC 03E00008 */ jr $ra -/* A2EEF0 80244CB0 27BD0018 */ addiu $sp, $sp, 0x18 -/* A2EEF4 80244CB4 00000000 */ nop -/* A2EEF8 80244CB8 00000000 */ nop -/* A2EEFC 80244CBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s new file mode 100644 index 0000000000..7b7898e746 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EC30/func_80244C8C_A2EECC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244C8C_A2EECC +/* A2EECC 80244C8C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2EED0 80244C90 AFBF0010 */ sw $ra, 0x10($sp) +/* A2EED4 80244C94 0C090C40 */ jal func_80243100_A2D340 +/* A2EED8 80244C98 00000000 */ nop +/* A2EEDC 80244C9C 3C048025 */ lui $a0, 0x8025 +/* A2EEE0 80244CA0 0C09127C */ jal func_802449F0_A2EC30 +/* A2EEE4 80244CA4 2484DBCC */ addiu $a0, $a0, -0x2434 +/* A2EEE8 80244CA8 8FBF0010 */ lw $ra, 0x10($sp) +/* A2EEEC 80244CAC 03E00008 */ jr $ra +/* A2EEF0 80244CB0 27BD0018 */ addiu $sp, $sp, 0x18 +/* A2EEF4 80244CB4 00000000 */ nop +/* A2EEF8 80244CB8 00000000 */ nop +/* A2EEFC 80244CBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4.s deleted file mode 100644 index 0ef5cb2e91..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244DE4 -/* A2F024 80244DE4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A2F028 80244DE8 AFB10034 */ sw $s1, 0x34($sp) -/* A2F02C 80244DEC 0080882D */ daddu $s1, $a0, $zero -/* A2F030 80244DF0 AFBF0054 */ sw $ra, 0x54($sp) -/* A2F034 80244DF4 AFBE0050 */ sw $fp, 0x50($sp) -/* A2F038 80244DF8 AFB7004C */ sw $s7, 0x4c($sp) -/* A2F03C 80244DFC AFB60048 */ sw $s6, 0x48($sp) -/* A2F040 80244E00 AFB50044 */ sw $s5, 0x44($sp) -/* A2F044 80244E04 AFB40040 */ sw $s4, 0x40($sp) -/* A2F048 80244E08 AFB3003C */ sw $s3, 0x3c($sp) -/* A2F04C 80244E0C AFB20038 */ sw $s2, 0x38($sp) -/* A2F050 80244E10 AFB00030 */ sw $s0, 0x30($sp) -/* A2F054 80244E14 8E30000C */ lw $s0, 0xc($s1) -/* A2F058 80244E18 8E050000 */ lw $a1, ($s0) -/* A2F05C 80244E1C 0C0B1EAF */ jal get_variable -/* A2F060 80244E20 26100004 */ addiu $s0, $s0, 4 -/* A2F064 80244E24 8E050000 */ lw $a1, ($s0) -/* A2F068 80244E28 26100004 */ addiu $s0, $s0, 4 -/* A2F06C 80244E2C 0220202D */ daddu $a0, $s1, $zero -/* A2F070 80244E30 0C0B1EAF */ jal get_variable -/* A2F074 80244E34 0040982D */ daddu $s3, $v0, $zero -/* A2F078 80244E38 8E050000 */ lw $a1, ($s0) -/* A2F07C 80244E3C 26100004 */ addiu $s0, $s0, 4 -/* A2F080 80244E40 0220202D */ daddu $a0, $s1, $zero -/* A2F084 80244E44 0C0B1EAF */ jal get_variable -/* A2F088 80244E48 0040B02D */ daddu $s6, $v0, $zero -/* A2F08C 80244E4C 8E050000 */ lw $a1, ($s0) -/* A2F090 80244E50 26100004 */ addiu $s0, $s0, 4 -/* A2F094 80244E54 0220202D */ daddu $a0, $s1, $zero -/* A2F098 80244E58 0C0B1EAF */ jal get_variable -/* A2F09C 80244E5C 0040A82D */ daddu $s5, $v0, $zero -/* A2F0A0 80244E60 8E050000 */ lw $a1, ($s0) -/* A2F0A4 80244E64 26100004 */ addiu $s0, $s0, 4 -/* A2F0A8 80244E68 0220202D */ daddu $a0, $s1, $zero -/* A2F0AC 80244E6C 0C0B1EAF */ jal get_variable -/* A2F0B0 80244E70 0040A02D */ daddu $s4, $v0, $zero -/* A2F0B4 80244E74 8E050000 */ lw $a1, ($s0) -/* A2F0B8 80244E78 26100004 */ addiu $s0, $s0, 4 -/* A2F0BC 80244E7C 0220202D */ daddu $a0, $s1, $zero -/* A2F0C0 80244E80 0C0B1EAF */ jal get_variable -/* A2F0C4 80244E84 0040902D */ daddu $s2, $v0, $zero -/* A2F0C8 80244E88 8E050000 */ lw $a1, ($s0) -/* A2F0CC 80244E8C 26100004 */ addiu $s0, $s0, 4 -/* A2F0D0 80244E90 0220202D */ daddu $a0, $s1, $zero -/* A2F0D4 80244E94 0C0B1EAF */ jal get_variable -/* A2F0D8 80244E98 AFA20028 */ sw $v0, 0x28($sp) -/* A2F0DC 80244E9C 8E050000 */ lw $a1, ($s0) -/* A2F0E0 80244EA0 26100004 */ addiu $s0, $s0, 4 -/* A2F0E4 80244EA4 0220202D */ daddu $a0, $s1, $zero -/* A2F0E8 80244EA8 0C0B1EAF */ jal get_variable -/* A2F0EC 80244EAC 0040F02D */ daddu $fp, $v0, $zero -/* A2F0F0 80244EB0 8E050000 */ lw $a1, ($s0) -/* A2F0F4 80244EB4 26100004 */ addiu $s0, $s0, 4 -/* A2F0F8 80244EB8 0220202D */ daddu $a0, $s1, $zero -/* A2F0FC 80244EBC 0C0B1EAF */ jal get_variable -/* A2F100 80244EC0 0040B82D */ daddu $s7, $v0, $zero -/* A2F104 80244EC4 0220202D */ daddu $a0, $s1, $zero -/* A2F108 80244EC8 8E050000 */ lw $a1, ($s0) -/* A2F10C 80244ECC 0C0B1EAF */ jal get_variable -/* A2F110 80244ED0 0040802D */ daddu $s0, $v0, $zero -/* A2F114 80244ED4 0040182D */ daddu $v1, $v0, $zero -/* A2F118 80244ED8 24020002 */ addiu $v0, $zero, 2 -/* A2F11C 80244EDC 12620012 */ beq $s3, $v0, .L80244F28 -/* A2F120 80244EE0 2A620003 */ slti $v0, $s3, 3 -/* A2F124 80244EE4 10400005 */ beqz $v0, .L80244EFC -/* A2F128 80244EE8 24020001 */ addiu $v0, $zero, 1 -/* A2F12C 80244EEC 12620008 */ beq $s3, $v0, .L80244F10 -/* A2F130 80244EF0 32C400FF */ andi $a0, $s6, 0xff -/* A2F134 80244EF4 080913E1 */ j .L80244F84 -/* A2F138 80244EF8 00000000 */ nop -.L80244EFC: -/* A2F13C 80244EFC 24020003 */ addiu $v0, $zero, 3 -/* A2F140 80244F00 12620018 */ beq $s3, $v0, .L80244F64 -/* A2F144 80244F04 32C400FF */ andi $a0, $s6, 0xff -/* A2F148 80244F08 080913E1 */ j .L80244F84 -/* A2F14C 80244F0C 00000000 */ nop -.L80244F10: -/* A2F150 80244F10 32A500FF */ andi $a1, $s5, 0xff -/* A2F154 80244F14 328600FF */ andi $a2, $s4, 0xff -/* A2F158 80244F18 0C046F97 */ jal set_background_color_blend -/* A2F15C 80244F1C 324700FF */ andi $a3, $s2, 0xff -/* A2F160 80244F20 080913E1 */ j .L80244F84 -/* A2F164 80244F24 00000000 */ nop -.L80244F28: -/* A2F168 80244F28 32C400FF */ andi $a0, $s6, 0xff -/* A2F16C 80244F2C 32A500FF */ andi $a1, $s5, 0xff -/* A2F170 80244F30 328600FF */ andi $a2, $s4, 0xff -/* A2F174 80244F34 324700FF */ andi $a3, $s2, 0xff -/* A2F178 80244F38 93A2002B */ lbu $v0, 0x2b($sp) -/* A2F17C 80244F3C AFB0001C */ sw $s0, 0x1c($sp) -/* A2F180 80244F40 AFA30020 */ sw $v1, 0x20($sp) -/* A2F184 80244F44 AFA20010 */ sw $v0, 0x10($sp) -/* A2F188 80244F48 33C200FF */ andi $v0, $fp, 0xff -/* A2F18C 80244F4C AFA20014 */ sw $v0, 0x14($sp) -/* A2F190 80244F50 32E200FF */ andi $v0, $s7, 0xff -/* A2F194 80244F54 0C046FAD */ jal func_8011BEB4 -/* A2F198 80244F58 AFA20018 */ sw $v0, 0x18($sp) -/* A2F19C 80244F5C 080913E1 */ j .L80244F84 -/* A2F1A0 80244F60 00000000 */ nop -.L80244F64: -/* A2F1A4 80244F64 32A500FF */ andi $a1, $s5, 0xff -/* A2F1A8 80244F68 328600FF */ andi $a2, $s4, 0xff -/* A2F1AC 80244F6C 324700FF */ andi $a3, $s2, 0xff -/* A2F1B0 80244F70 93A2002B */ lbu $v0, 0x2b($sp) -/* A2F1B4 80244F74 AFA20010 */ sw $v0, 0x10($sp) -/* A2F1B8 80244F78 33C200FF */ andi $v0, $fp, 0xff -/* A2F1BC 80244F7C 0C046FE6 */ jal func_8011BF98 -/* A2F1C0 80244F80 AFA20014 */ sw $v0, 0x14($sp) -.L80244F84: -/* A2F1C4 80244F84 8FBF0054 */ lw $ra, 0x54($sp) -/* A2F1C8 80244F88 8FBE0050 */ lw $fp, 0x50($sp) -/* A2F1CC 80244F8C 8FB7004C */ lw $s7, 0x4c($sp) -/* A2F1D0 80244F90 8FB60048 */ lw $s6, 0x48($sp) -/* A2F1D4 80244F94 8FB50044 */ lw $s5, 0x44($sp) -/* A2F1D8 80244F98 8FB40040 */ lw $s4, 0x40($sp) -/* A2F1DC 80244F9C 8FB3003C */ lw $s3, 0x3c($sp) -/* A2F1E0 80244FA0 8FB20038 */ lw $s2, 0x38($sp) -/* A2F1E4 80244FA4 8FB10034 */ lw $s1, 0x34($sp) -/* A2F1E8 80244FA8 8FB00030 */ lw $s0, 0x30($sp) -/* A2F1EC 80244FAC 24020002 */ addiu $v0, $zero, 2 -/* A2F1F0 80244FB0 03E00008 */ jr $ra -/* A2F1F4 80244FB4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s new file mode 100644 index 0000000000..5c3137a869 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244DE4_A2F024.s @@ -0,0 +1,126 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244DE4_A2F024 +/* A2F024 80244DE4 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* A2F028 80244DE8 AFB10034 */ sw $s1, 0x34($sp) +/* A2F02C 80244DEC 0080882D */ daddu $s1, $a0, $zero +/* A2F030 80244DF0 AFBF0054 */ sw $ra, 0x54($sp) +/* A2F034 80244DF4 AFBE0050 */ sw $fp, 0x50($sp) +/* A2F038 80244DF8 AFB7004C */ sw $s7, 0x4c($sp) +/* A2F03C 80244DFC AFB60048 */ sw $s6, 0x48($sp) +/* A2F040 80244E00 AFB50044 */ sw $s5, 0x44($sp) +/* A2F044 80244E04 AFB40040 */ sw $s4, 0x40($sp) +/* A2F048 80244E08 AFB3003C */ sw $s3, 0x3c($sp) +/* A2F04C 80244E0C AFB20038 */ sw $s2, 0x38($sp) +/* A2F050 80244E10 AFB00030 */ sw $s0, 0x30($sp) +/* A2F054 80244E14 8E30000C */ lw $s0, 0xc($s1) +/* A2F058 80244E18 8E050000 */ lw $a1, ($s0) +/* A2F05C 80244E1C 0C0B1EAF */ jal get_variable +/* A2F060 80244E20 26100004 */ addiu $s0, $s0, 4 +/* A2F064 80244E24 8E050000 */ lw $a1, ($s0) +/* A2F068 80244E28 26100004 */ addiu $s0, $s0, 4 +/* A2F06C 80244E2C 0220202D */ daddu $a0, $s1, $zero +/* A2F070 80244E30 0C0B1EAF */ jal get_variable +/* A2F074 80244E34 0040982D */ daddu $s3, $v0, $zero +/* A2F078 80244E38 8E050000 */ lw $a1, ($s0) +/* A2F07C 80244E3C 26100004 */ addiu $s0, $s0, 4 +/* A2F080 80244E40 0220202D */ daddu $a0, $s1, $zero +/* A2F084 80244E44 0C0B1EAF */ jal get_variable +/* A2F088 80244E48 0040B02D */ daddu $s6, $v0, $zero +/* A2F08C 80244E4C 8E050000 */ lw $a1, ($s0) +/* A2F090 80244E50 26100004 */ addiu $s0, $s0, 4 +/* A2F094 80244E54 0220202D */ daddu $a0, $s1, $zero +/* A2F098 80244E58 0C0B1EAF */ jal get_variable +/* A2F09C 80244E5C 0040A82D */ daddu $s5, $v0, $zero +/* A2F0A0 80244E60 8E050000 */ lw $a1, ($s0) +/* A2F0A4 80244E64 26100004 */ addiu $s0, $s0, 4 +/* A2F0A8 80244E68 0220202D */ daddu $a0, $s1, $zero +/* A2F0AC 80244E6C 0C0B1EAF */ jal get_variable +/* A2F0B0 80244E70 0040A02D */ daddu $s4, $v0, $zero +/* A2F0B4 80244E74 8E050000 */ lw $a1, ($s0) +/* A2F0B8 80244E78 26100004 */ addiu $s0, $s0, 4 +/* A2F0BC 80244E7C 0220202D */ daddu $a0, $s1, $zero +/* A2F0C0 80244E80 0C0B1EAF */ jal get_variable +/* A2F0C4 80244E84 0040902D */ daddu $s2, $v0, $zero +/* A2F0C8 80244E88 8E050000 */ lw $a1, ($s0) +/* A2F0CC 80244E8C 26100004 */ addiu $s0, $s0, 4 +/* A2F0D0 80244E90 0220202D */ daddu $a0, $s1, $zero +/* A2F0D4 80244E94 0C0B1EAF */ jal get_variable +/* A2F0D8 80244E98 AFA20028 */ sw $v0, 0x28($sp) +/* A2F0DC 80244E9C 8E050000 */ lw $a1, ($s0) +/* A2F0E0 80244EA0 26100004 */ addiu $s0, $s0, 4 +/* A2F0E4 80244EA4 0220202D */ daddu $a0, $s1, $zero +/* A2F0E8 80244EA8 0C0B1EAF */ jal get_variable +/* A2F0EC 80244EAC 0040F02D */ daddu $fp, $v0, $zero +/* A2F0F0 80244EB0 8E050000 */ lw $a1, ($s0) +/* A2F0F4 80244EB4 26100004 */ addiu $s0, $s0, 4 +/* A2F0F8 80244EB8 0220202D */ daddu $a0, $s1, $zero +/* A2F0FC 80244EBC 0C0B1EAF */ jal get_variable +/* A2F100 80244EC0 0040B82D */ daddu $s7, $v0, $zero +/* A2F104 80244EC4 0220202D */ daddu $a0, $s1, $zero +/* A2F108 80244EC8 8E050000 */ lw $a1, ($s0) +/* A2F10C 80244ECC 0C0B1EAF */ jal get_variable +/* A2F110 80244ED0 0040802D */ daddu $s0, $v0, $zero +/* A2F114 80244ED4 0040182D */ daddu $v1, $v0, $zero +/* A2F118 80244ED8 24020002 */ addiu $v0, $zero, 2 +/* A2F11C 80244EDC 12620012 */ beq $s3, $v0, .L80244F28 +/* A2F120 80244EE0 2A620003 */ slti $v0, $s3, 3 +/* A2F124 80244EE4 10400005 */ beqz $v0, .L80244EFC +/* A2F128 80244EE8 24020001 */ addiu $v0, $zero, 1 +/* A2F12C 80244EEC 12620008 */ beq $s3, $v0, .L80244F10 +/* A2F130 80244EF0 32C400FF */ andi $a0, $s6, 0xff +/* A2F134 80244EF4 080913E1 */ j .L80244F84 +/* A2F138 80244EF8 00000000 */ nop +.L80244EFC: +/* A2F13C 80244EFC 24020003 */ addiu $v0, $zero, 3 +/* A2F140 80244F00 12620018 */ beq $s3, $v0, .L80244F64 +/* A2F144 80244F04 32C400FF */ andi $a0, $s6, 0xff +/* A2F148 80244F08 080913E1 */ j .L80244F84 +/* A2F14C 80244F0C 00000000 */ nop +.L80244F10: +/* A2F150 80244F10 32A500FF */ andi $a1, $s5, 0xff +/* A2F154 80244F14 328600FF */ andi $a2, $s4, 0xff +/* A2F158 80244F18 0C046F97 */ jal set_background_color_blend +/* A2F15C 80244F1C 324700FF */ andi $a3, $s2, 0xff +/* A2F160 80244F20 080913E1 */ j .L80244F84 +/* A2F164 80244F24 00000000 */ nop +.L80244F28: +/* A2F168 80244F28 32C400FF */ andi $a0, $s6, 0xff +/* A2F16C 80244F2C 32A500FF */ andi $a1, $s5, 0xff +/* A2F170 80244F30 328600FF */ andi $a2, $s4, 0xff +/* A2F174 80244F34 324700FF */ andi $a3, $s2, 0xff +/* A2F178 80244F38 93A2002B */ lbu $v0, 0x2b($sp) +/* A2F17C 80244F3C AFB0001C */ sw $s0, 0x1c($sp) +/* A2F180 80244F40 AFA30020 */ sw $v1, 0x20($sp) +/* A2F184 80244F44 AFA20010 */ sw $v0, 0x10($sp) +/* A2F188 80244F48 33C200FF */ andi $v0, $fp, 0xff +/* A2F18C 80244F4C AFA20014 */ sw $v0, 0x14($sp) +/* A2F190 80244F50 32E200FF */ andi $v0, $s7, 0xff +/* A2F194 80244F54 0C046FAD */ jal func_8011BEB4 +/* A2F198 80244F58 AFA20018 */ sw $v0, 0x18($sp) +/* A2F19C 80244F5C 080913E1 */ j .L80244F84 +/* A2F1A0 80244F60 00000000 */ nop +.L80244F64: +/* A2F1A4 80244F64 32A500FF */ andi $a1, $s5, 0xff +/* A2F1A8 80244F68 328600FF */ andi $a2, $s4, 0xff +/* A2F1AC 80244F6C 324700FF */ andi $a3, $s2, 0xff +/* A2F1B0 80244F70 93A2002B */ lbu $v0, 0x2b($sp) +/* A2F1B4 80244F74 AFA20010 */ sw $v0, 0x10($sp) +/* A2F1B8 80244F78 33C200FF */ andi $v0, $fp, 0xff +/* A2F1BC 80244F7C 0C046FE6 */ jal func_8011BF98 +/* A2F1C0 80244F80 AFA20014 */ sw $v0, 0x14($sp) +.L80244F84: +/* A2F1C4 80244F84 8FBF0054 */ lw $ra, 0x54($sp) +/* A2F1C8 80244F88 8FBE0050 */ lw $fp, 0x50($sp) +/* A2F1CC 80244F8C 8FB7004C */ lw $s7, 0x4c($sp) +/* A2F1D0 80244F90 8FB60048 */ lw $s6, 0x48($sp) +/* A2F1D4 80244F94 8FB50044 */ lw $s5, 0x44($sp) +/* A2F1D8 80244F98 8FB40040 */ lw $s4, 0x40($sp) +/* A2F1DC 80244F9C 8FB3003C */ lw $s3, 0x3c($sp) +/* A2F1E0 80244FA0 8FB20038 */ lw $s2, 0x38($sp) +/* A2F1E4 80244FA4 8FB10034 */ lw $s1, 0x34($sp) +/* A2F1E8 80244FA8 8FB00030 */ lw $s0, 0x30($sp) +/* A2F1EC 80244FAC 24020002 */ addiu $v0, $zero, 2 +/* A2F1F0 80244FB0 03E00008 */ jr $ra +/* A2F1F4 80244FB4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8.s deleted file mode 100644 index be2e39c468..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244FB8 -/* A2F1F8 80244FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2F1FC 80244FBC AFB00010 */ sw $s0, 0x10($sp) -/* A2F200 80244FC0 0080802D */ daddu $s0, $a0, $zero -/* A2F204 80244FC4 AFBF0014 */ sw $ra, 0x14($sp) -/* A2F208 80244FC8 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2F20C 80244FCC 8E020088 */ lw $v0, 0x88($s0) -/* A2F210 80244FD0 00621821 */ addu $v1, $v1, $v0 -/* A2F214 80244FD4 04610004 */ bgez $v1, .L80244FE8 -/* A2F218 80244FD8 AE0300A8 */ sw $v1, 0xa8($s0) -/* A2F21C 80244FDC 3C020002 */ lui $v0, 2 -/* A2F220 80244FE0 080913FE */ j .L80244FF8 -/* A2F224 80244FE4 00621021 */ addu $v0, $v1, $v0 -.L80244FE8: -/* A2F228 80244FE8 3C040002 */ lui $a0, 2 -/* A2F22C 80244FEC 0083102A */ slt $v0, $a0, $v1 -/* A2F230 80244FF0 10400002 */ beqz $v0, .L80244FFC -/* A2F234 80244FF4 00641023 */ subu $v0, $v1, $a0 -.L80244FF8: -/* A2F238 80244FF8 AE0200A8 */ sw $v0, 0xa8($s0) -.L80244FFC: -/* A2F23C 80244FFC 8E0300AC */ lw $v1, 0xac($s0) -/* A2F240 80245000 8E02008C */ lw $v0, 0x8c($s0) -/* A2F244 80245004 00621821 */ addu $v1, $v1, $v0 -/* A2F248 80245008 04610004 */ bgez $v1, .L8024501C -/* A2F24C 8024500C AE0300AC */ sw $v1, 0xac($s0) -/* A2F250 80245010 3C020002 */ lui $v0, 2 -/* A2F254 80245014 0809140B */ j .L8024502C -/* A2F258 80245018 00621021 */ addu $v0, $v1, $v0 -.L8024501C: -/* A2F25C 8024501C 3C040002 */ lui $a0, 2 -/* A2F260 80245020 0083102A */ slt $v0, $a0, $v1 -/* A2F264 80245024 10400002 */ beqz $v0, .L80245030 -/* A2F268 80245028 00641023 */ subu $v0, $v1, $a0 -.L8024502C: -/* A2F26C 8024502C AE0200AC */ sw $v0, 0xac($s0) -.L80245030: -/* A2F270 80245030 8E0300B0 */ lw $v1, 0xb0($s0) -/* A2F274 80245034 8E020090 */ lw $v0, 0x90($s0) -/* A2F278 80245038 00621821 */ addu $v1, $v1, $v0 -/* A2F27C 8024503C 04610004 */ bgez $v1, .L80245050 -/* A2F280 80245040 AE0300B0 */ sw $v1, 0xb0($s0) -/* A2F284 80245044 3C020002 */ lui $v0, 2 -/* A2F288 80245048 08091418 */ j .L80245060 -/* A2F28C 8024504C 00621021 */ addu $v0, $v1, $v0 -.L80245050: -/* A2F290 80245050 3C040002 */ lui $a0, 2 -/* A2F294 80245054 0083102A */ slt $v0, $a0, $v1 -/* A2F298 80245058 10400002 */ beqz $v0, .L80245064 -/* A2F29C 8024505C 00641023 */ subu $v0, $v1, $a0 -.L80245060: -/* A2F2A0 80245060 AE0200B0 */ sw $v0, 0xb0($s0) -.L80245064: -/* A2F2A4 80245064 8E0300B4 */ lw $v1, 0xb4($s0) -/* A2F2A8 80245068 8E020094 */ lw $v0, 0x94($s0) -/* A2F2AC 8024506C 00621821 */ addu $v1, $v1, $v0 -/* A2F2B0 80245070 04610004 */ bgez $v1, .L80245084 -/* A2F2B4 80245074 AE0300B4 */ sw $v1, 0xb4($s0) -/* A2F2B8 80245078 3C020002 */ lui $v0, 2 -/* A2F2BC 8024507C 08091425 */ j .L80245094 -/* A2F2C0 80245080 00621021 */ addu $v0, $v1, $v0 -.L80245084: -/* A2F2C4 80245084 3C040002 */ lui $a0, 2 -/* A2F2C8 80245088 0083102A */ slt $v0, $a0, $v1 -/* A2F2CC 8024508C 10400002 */ beqz $v0, .L80245098 -/* A2F2D0 80245090 00641023 */ subu $v0, $v1, $a0 -.L80245094: -/* A2F2D4 80245094 AE0200B4 */ sw $v0, 0xb4($s0) -.L80245098: -/* A2F2D8 80245098 8E040084 */ lw $a0, 0x84($s0) -/* A2F2DC 8024509C 0C046F07 */ jal set_main_pan_u -/* A2F2E0 802450A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* A2F2E4 802450A4 8E040084 */ lw $a0, 0x84($s0) -/* A2F2E8 802450A8 0C046F0D */ jal set_main_pan_v -/* A2F2EC 802450AC 8E0500AC */ lw $a1, 0xac($s0) -/* A2F2F0 802450B0 8E040084 */ lw $a0, 0x84($s0) -/* A2F2F4 802450B4 0C046F13 */ jal set_aux_pan_u -/* A2F2F8 802450B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2F2FC 802450BC 8E040084 */ lw $a0, 0x84($s0) -/* A2F300 802450C0 0C046F19 */ jal set_aux_pan_v -/* A2F304 802450C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* A2F308 802450C8 8FBF0014 */ lw $ra, 0x14($sp) -/* A2F30C 802450CC 8FB00010 */ lw $s0, 0x10($sp) -/* A2F310 802450D0 0000102D */ daddu $v0, $zero, $zero -/* A2F314 802450D4 03E00008 */ jr $ra -/* A2F318 802450D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8_A2F1F8.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8_A2F1F8.s new file mode 100644 index 0000000000..8cbfce2ba0 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80244FB8_A2F1F8.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244FB8_A2F1F8 +/* A2F1F8 80244FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2F1FC 80244FBC AFB00010 */ sw $s0, 0x10($sp) +/* A2F200 80244FC0 0080802D */ daddu $s0, $a0, $zero +/* A2F204 80244FC4 AFBF0014 */ sw $ra, 0x14($sp) +/* A2F208 80244FC8 8E0300A8 */ lw $v1, 0xa8($s0) +/* A2F20C 80244FCC 8E020088 */ lw $v0, 0x88($s0) +/* A2F210 80244FD0 00621821 */ addu $v1, $v1, $v0 +/* A2F214 80244FD4 04610004 */ bgez $v1, .L80244FE8 +/* A2F218 80244FD8 AE0300A8 */ sw $v1, 0xa8($s0) +/* A2F21C 80244FDC 3C020002 */ lui $v0, 2 +/* A2F220 80244FE0 080913FE */ j .L80244FF8 +/* A2F224 80244FE4 00621021 */ addu $v0, $v1, $v0 +.L80244FE8: +/* A2F228 80244FE8 3C040002 */ lui $a0, 2 +/* A2F22C 80244FEC 0083102A */ slt $v0, $a0, $v1 +/* A2F230 80244FF0 10400002 */ beqz $v0, .L80244FFC +/* A2F234 80244FF4 00641023 */ subu $v0, $v1, $a0 +.L80244FF8: +/* A2F238 80244FF8 AE0200A8 */ sw $v0, 0xa8($s0) +.L80244FFC: +/* A2F23C 80244FFC 8E0300AC */ lw $v1, 0xac($s0) +/* A2F240 80245000 8E02008C */ lw $v0, 0x8c($s0) +/* A2F244 80245004 00621821 */ addu $v1, $v1, $v0 +/* A2F248 80245008 04610004 */ bgez $v1, .L8024501C +/* A2F24C 8024500C AE0300AC */ sw $v1, 0xac($s0) +/* A2F250 80245010 3C020002 */ lui $v0, 2 +/* A2F254 80245014 0809140B */ j .L8024502C +/* A2F258 80245018 00621021 */ addu $v0, $v1, $v0 +.L8024501C: +/* A2F25C 8024501C 3C040002 */ lui $a0, 2 +/* A2F260 80245020 0083102A */ slt $v0, $a0, $v1 +/* A2F264 80245024 10400002 */ beqz $v0, .L80245030 +/* A2F268 80245028 00641023 */ subu $v0, $v1, $a0 +.L8024502C: +/* A2F26C 8024502C AE0200AC */ sw $v0, 0xac($s0) +.L80245030: +/* A2F270 80245030 8E0300B0 */ lw $v1, 0xb0($s0) +/* A2F274 80245034 8E020090 */ lw $v0, 0x90($s0) +/* A2F278 80245038 00621821 */ addu $v1, $v1, $v0 +/* A2F27C 8024503C 04610004 */ bgez $v1, .L80245050 +/* A2F280 80245040 AE0300B0 */ sw $v1, 0xb0($s0) +/* A2F284 80245044 3C020002 */ lui $v0, 2 +/* A2F288 80245048 08091418 */ j .L80245060 +/* A2F28C 8024504C 00621021 */ addu $v0, $v1, $v0 +.L80245050: +/* A2F290 80245050 3C040002 */ lui $a0, 2 +/* A2F294 80245054 0083102A */ slt $v0, $a0, $v1 +/* A2F298 80245058 10400002 */ beqz $v0, .L80245064 +/* A2F29C 8024505C 00641023 */ subu $v0, $v1, $a0 +.L80245060: +/* A2F2A0 80245060 AE0200B0 */ sw $v0, 0xb0($s0) +.L80245064: +/* A2F2A4 80245064 8E0300B4 */ lw $v1, 0xb4($s0) +/* A2F2A8 80245068 8E020094 */ lw $v0, 0x94($s0) +/* A2F2AC 8024506C 00621821 */ addu $v1, $v1, $v0 +/* A2F2B0 80245070 04610004 */ bgez $v1, .L80245084 +/* A2F2B4 80245074 AE0300B4 */ sw $v1, 0xb4($s0) +/* A2F2B8 80245078 3C020002 */ lui $v0, 2 +/* A2F2BC 8024507C 08091425 */ j .L80245094 +/* A2F2C0 80245080 00621021 */ addu $v0, $v1, $v0 +.L80245084: +/* A2F2C4 80245084 3C040002 */ lui $a0, 2 +/* A2F2C8 80245088 0083102A */ slt $v0, $a0, $v1 +/* A2F2CC 8024508C 10400002 */ beqz $v0, .L80245098 +/* A2F2D0 80245090 00641023 */ subu $v0, $v1, $a0 +.L80245094: +/* A2F2D4 80245094 AE0200B4 */ sw $v0, 0xb4($s0) +.L80245098: +/* A2F2D8 80245098 8E040084 */ lw $a0, 0x84($s0) +/* A2F2DC 8024509C 0C046F07 */ jal set_main_pan_u +/* A2F2E0 802450A0 8E0500A8 */ lw $a1, 0xa8($s0) +/* A2F2E4 802450A4 8E040084 */ lw $a0, 0x84($s0) +/* A2F2E8 802450A8 0C046F0D */ jal set_main_pan_v +/* A2F2EC 802450AC 8E0500AC */ lw $a1, 0xac($s0) +/* A2F2F0 802450B0 8E040084 */ lw $a0, 0x84($s0) +/* A2F2F4 802450B4 0C046F13 */ jal set_aux_pan_u +/* A2F2F8 802450B8 8E0500B0 */ lw $a1, 0xb0($s0) +/* A2F2FC 802450BC 8E040084 */ lw $a0, 0x84($s0) +/* A2F300 802450C0 0C046F19 */ jal set_aux_pan_v +/* A2F304 802450C4 8E0500B4 */ lw $a1, 0xb4($s0) +/* A2F308 802450C8 8FBF0014 */ lw $ra, 0x14($sp) +/* A2F30C 802450CC 8FB00010 */ lw $s0, 0x10($sp) +/* A2F310 802450D0 0000102D */ daddu $v0, $zero, $zero +/* A2F314 802450D4 03E00008 */ jr $ra +/* A2F318 802450D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC.s deleted file mode 100644 index 40edce0044..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802450DC -/* A2F31C 802450DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2F320 802450E0 AFB00010 */ sw $s0, 0x10($sp) -/* A2F324 802450E4 0080802D */ daddu $s0, $a0, $zero -/* A2F328 802450E8 10A00005 */ beqz $a1, .L80245100 -/* A2F32C 802450EC AFBF0014 */ sw $ra, 0x14($sp) -/* A2F330 802450F0 AE000070 */ sw $zero, 0x70($s0) -/* A2F334 802450F4 AE000074 */ sw $zero, 0x74($s0) -/* A2F338 802450F8 AE000078 */ sw $zero, 0x78($s0) -/* A2F33C 802450FC AE00007C */ sw $zero, 0x7c($s0) -.L80245100: -/* A2F340 80245100 8E020070 */ lw $v0, 0x70($s0) -/* A2F344 80245104 1440000E */ bnez $v0, .L80245140 -/* A2F348 80245108 00000000 */ nop -/* A2F34C 8024510C 8E0300A8 */ lw $v1, 0xa8($s0) -/* A2F350 80245110 8E020088 */ lw $v0, 0x88($s0) -/* A2F354 80245114 00621821 */ addu $v1, $v1, $v0 -/* A2F358 80245118 04610004 */ bgez $v1, .L8024512C -/* A2F35C 8024511C AE0300A8 */ sw $v1, 0xa8($s0) -/* A2F360 80245120 3C020002 */ lui $v0, 2 -/* A2F364 80245124 0809144F */ j .L8024513C -/* A2F368 80245128 00621021 */ addu $v0, $v1, $v0 -.L8024512C: -/* A2F36C 8024512C 3C040002 */ lui $a0, 2 -/* A2F370 80245130 0083102A */ slt $v0, $a0, $v1 -/* A2F374 80245134 10400002 */ beqz $v0, .L80245140 -/* A2F378 80245138 00641023 */ subu $v0, $v1, $a0 -.L8024513C: -/* A2F37C 8024513C AE0200A8 */ sw $v0, 0xa8($s0) -.L80245140: -/* A2F380 80245140 8E020074 */ lw $v0, 0x74($s0) -/* A2F384 80245144 1440000E */ bnez $v0, .L80245180 -/* A2F388 80245148 00000000 */ nop -/* A2F38C 8024514C 8E0300AC */ lw $v1, 0xac($s0) -/* A2F390 80245150 8E02008C */ lw $v0, 0x8c($s0) -/* A2F394 80245154 00621821 */ addu $v1, $v1, $v0 -/* A2F398 80245158 04610004 */ bgez $v1, .L8024516C -/* A2F39C 8024515C AE0300AC */ sw $v1, 0xac($s0) -/* A2F3A0 80245160 3C020002 */ lui $v0, 2 -/* A2F3A4 80245164 0809145F */ j .L8024517C -/* A2F3A8 80245168 00621021 */ addu $v0, $v1, $v0 -.L8024516C: -/* A2F3AC 8024516C 3C040002 */ lui $a0, 2 -/* A2F3B0 80245170 0083102A */ slt $v0, $a0, $v1 -/* A2F3B4 80245174 10400002 */ beqz $v0, .L80245180 -/* A2F3B8 80245178 00641023 */ subu $v0, $v1, $a0 -.L8024517C: -/* A2F3BC 8024517C AE0200AC */ sw $v0, 0xac($s0) -.L80245180: -/* A2F3C0 80245180 8E020078 */ lw $v0, 0x78($s0) -/* A2F3C4 80245184 1440000E */ bnez $v0, .L802451C0 -/* A2F3C8 80245188 00000000 */ nop -/* A2F3CC 8024518C 8E0300B0 */ lw $v1, 0xb0($s0) -/* A2F3D0 80245190 8E020090 */ lw $v0, 0x90($s0) -/* A2F3D4 80245194 00621821 */ addu $v1, $v1, $v0 -/* A2F3D8 80245198 04610004 */ bgez $v1, .L802451AC -/* A2F3DC 8024519C AE0300B0 */ sw $v1, 0xb0($s0) -/* A2F3E0 802451A0 3C020002 */ lui $v0, 2 -/* A2F3E4 802451A4 0809146F */ j .L802451BC -/* A2F3E8 802451A8 00621021 */ addu $v0, $v1, $v0 -.L802451AC: -/* A2F3EC 802451AC 3C040002 */ lui $a0, 2 -/* A2F3F0 802451B0 0083102A */ slt $v0, $a0, $v1 -/* A2F3F4 802451B4 10400002 */ beqz $v0, .L802451C0 -/* A2F3F8 802451B8 00641023 */ subu $v0, $v1, $a0 -.L802451BC: -/* A2F3FC 802451BC AE0200B0 */ sw $v0, 0xb0($s0) -.L802451C0: -/* A2F400 802451C0 8E02007C */ lw $v0, 0x7c($s0) -/* A2F404 802451C4 1440000E */ bnez $v0, .L80245200 -/* A2F408 802451C8 00000000 */ nop -/* A2F40C 802451CC 8E0300B4 */ lw $v1, 0xb4($s0) -/* A2F410 802451D0 8E020094 */ lw $v0, 0x94($s0) -/* A2F414 802451D4 00621821 */ addu $v1, $v1, $v0 -/* A2F418 802451D8 04610004 */ bgez $v1, .L802451EC -/* A2F41C 802451DC AE0300B4 */ sw $v1, 0xb4($s0) -/* A2F420 802451E0 3C020002 */ lui $v0, 2 -/* A2F424 802451E4 0809147F */ j .L802451FC -/* A2F428 802451E8 00621021 */ addu $v0, $v1, $v0 -.L802451EC: -/* A2F42C 802451EC 3C040002 */ lui $a0, 2 -/* A2F430 802451F0 0083102A */ slt $v0, $a0, $v1 -/* A2F434 802451F4 10400002 */ beqz $v0, .L80245200 -/* A2F438 802451F8 00641023 */ subu $v0, $v1, $a0 -.L802451FC: -/* A2F43C 802451FC AE0200B4 */ sw $v0, 0xb4($s0) -.L80245200: -/* A2F440 80245200 8E040084 */ lw $a0, 0x84($s0) -/* A2F444 80245204 0C046F07 */ jal set_main_pan_u -/* A2F448 80245208 8E0500A8 */ lw $a1, 0xa8($s0) -/* A2F44C 8024520C 8E040084 */ lw $a0, 0x84($s0) -/* A2F450 80245210 0C046F0D */ jal set_main_pan_v -/* A2F454 80245214 8E0500AC */ lw $a1, 0xac($s0) -/* A2F458 80245218 8E040084 */ lw $a0, 0x84($s0) -/* A2F45C 8024521C 0C046F13 */ jal set_aux_pan_u -/* A2F460 80245220 8E0500B0 */ lw $a1, 0xb0($s0) -/* A2F464 80245224 8E040084 */ lw $a0, 0x84($s0) -/* A2F468 80245228 0C046F19 */ jal set_aux_pan_v -/* A2F46C 8024522C 8E0500B4 */ lw $a1, 0xb4($s0) -/* A2F470 80245230 8E020070 */ lw $v0, 0x70($s0) -/* A2F474 80245234 8E030078 */ lw $v1, 0x78($s0) -/* A2F478 80245238 8E040098 */ lw $a0, 0x98($s0) -/* A2F47C 8024523C 24420001 */ addiu $v0, $v0, 1 -/* A2F480 80245240 AE020070 */ sw $v0, 0x70($s0) -/* A2F484 80245244 8E020074 */ lw $v0, 0x74($s0) -/* A2F488 80245248 24630001 */ addiu $v1, $v1, 1 -/* A2F48C 8024524C AE030078 */ sw $v1, 0x78($s0) -/* A2F490 80245250 8E030070 */ lw $v1, 0x70($s0) -/* A2F494 80245254 24420001 */ addiu $v0, $v0, 1 -/* A2F498 80245258 AE020074 */ sw $v0, 0x74($s0) -/* A2F49C 8024525C 8E02007C */ lw $v0, 0x7c($s0) -/* A2F4A0 80245260 0064182A */ slt $v1, $v1, $a0 -/* A2F4A4 80245264 24420001 */ addiu $v0, $v0, 1 -/* A2F4A8 80245268 14600002 */ bnez $v1, .L80245274 -/* A2F4AC 8024526C AE02007C */ sw $v0, 0x7c($s0) -/* A2F4B0 80245270 AE000070 */ sw $zero, 0x70($s0) -.L80245274: -/* A2F4B4 80245274 8E020074 */ lw $v0, 0x74($s0) -/* A2F4B8 80245278 8E03009C */ lw $v1, 0x9c($s0) -/* A2F4BC 8024527C 0043102A */ slt $v0, $v0, $v1 -/* A2F4C0 80245280 50400001 */ beql $v0, $zero, .L80245288 -/* A2F4C4 80245284 AE000074 */ sw $zero, 0x74($s0) -.L80245288: -/* A2F4C8 80245288 8E020078 */ lw $v0, 0x78($s0) -/* A2F4CC 8024528C 8E0300A0 */ lw $v1, 0xa0($s0) -/* A2F4D0 80245290 0043102A */ slt $v0, $v0, $v1 -/* A2F4D4 80245294 50400001 */ beql $v0, $zero, .L8024529C -/* A2F4D8 80245298 AE000078 */ sw $zero, 0x78($s0) -.L8024529C: -/* A2F4DC 8024529C 8E02007C */ lw $v0, 0x7c($s0) -/* A2F4E0 802452A0 8E0300A4 */ lw $v1, 0xa4($s0) -/* A2F4E4 802452A4 0043102A */ slt $v0, $v0, $v1 -/* A2F4E8 802452A8 50400001 */ beql $v0, $zero, .L802452B0 -/* A2F4EC 802452AC AE00007C */ sw $zero, 0x7c($s0) -.L802452B0: -/* A2F4F0 802452B0 8FBF0014 */ lw $ra, 0x14($sp) -/* A2F4F4 802452B4 8FB00010 */ lw $s0, 0x10($sp) -/* A2F4F8 802452B8 0000102D */ daddu $v0, $zero, $zero -/* A2F4FC 802452BC 03E00008 */ jr $ra -/* A2F500 802452C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC_A2F31C.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC_A2F31C.s new file mode 100644 index 0000000000..ced5f2edd9 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802450DC_A2F31C.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802450DC_A2F31C +/* A2F31C 802450DC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2F320 802450E0 AFB00010 */ sw $s0, 0x10($sp) +/* A2F324 802450E4 0080802D */ daddu $s0, $a0, $zero +/* A2F328 802450E8 10A00005 */ beqz $a1, .L80245100 +/* A2F32C 802450EC AFBF0014 */ sw $ra, 0x14($sp) +/* A2F330 802450F0 AE000070 */ sw $zero, 0x70($s0) +/* A2F334 802450F4 AE000074 */ sw $zero, 0x74($s0) +/* A2F338 802450F8 AE000078 */ sw $zero, 0x78($s0) +/* A2F33C 802450FC AE00007C */ sw $zero, 0x7c($s0) +.L80245100: +/* A2F340 80245100 8E020070 */ lw $v0, 0x70($s0) +/* A2F344 80245104 1440000E */ bnez $v0, .L80245140 +/* A2F348 80245108 00000000 */ nop +/* A2F34C 8024510C 8E0300A8 */ lw $v1, 0xa8($s0) +/* A2F350 80245110 8E020088 */ lw $v0, 0x88($s0) +/* A2F354 80245114 00621821 */ addu $v1, $v1, $v0 +/* A2F358 80245118 04610004 */ bgez $v1, .L8024512C +/* A2F35C 8024511C AE0300A8 */ sw $v1, 0xa8($s0) +/* A2F360 80245120 3C020002 */ lui $v0, 2 +/* A2F364 80245124 0809144F */ j .L8024513C +/* A2F368 80245128 00621021 */ addu $v0, $v1, $v0 +.L8024512C: +/* A2F36C 8024512C 3C040002 */ lui $a0, 2 +/* A2F370 80245130 0083102A */ slt $v0, $a0, $v1 +/* A2F374 80245134 10400002 */ beqz $v0, .L80245140 +/* A2F378 80245138 00641023 */ subu $v0, $v1, $a0 +.L8024513C: +/* A2F37C 8024513C AE0200A8 */ sw $v0, 0xa8($s0) +.L80245140: +/* A2F380 80245140 8E020074 */ lw $v0, 0x74($s0) +/* A2F384 80245144 1440000E */ bnez $v0, .L80245180 +/* A2F388 80245148 00000000 */ nop +/* A2F38C 8024514C 8E0300AC */ lw $v1, 0xac($s0) +/* A2F390 80245150 8E02008C */ lw $v0, 0x8c($s0) +/* A2F394 80245154 00621821 */ addu $v1, $v1, $v0 +/* A2F398 80245158 04610004 */ bgez $v1, .L8024516C +/* A2F39C 8024515C AE0300AC */ sw $v1, 0xac($s0) +/* A2F3A0 80245160 3C020002 */ lui $v0, 2 +/* A2F3A4 80245164 0809145F */ j .L8024517C +/* A2F3A8 80245168 00621021 */ addu $v0, $v1, $v0 +.L8024516C: +/* A2F3AC 8024516C 3C040002 */ lui $a0, 2 +/* A2F3B0 80245170 0083102A */ slt $v0, $a0, $v1 +/* A2F3B4 80245174 10400002 */ beqz $v0, .L80245180 +/* A2F3B8 80245178 00641023 */ subu $v0, $v1, $a0 +.L8024517C: +/* A2F3BC 8024517C AE0200AC */ sw $v0, 0xac($s0) +.L80245180: +/* A2F3C0 80245180 8E020078 */ lw $v0, 0x78($s0) +/* A2F3C4 80245184 1440000E */ bnez $v0, .L802451C0 +/* A2F3C8 80245188 00000000 */ nop +/* A2F3CC 8024518C 8E0300B0 */ lw $v1, 0xb0($s0) +/* A2F3D0 80245190 8E020090 */ lw $v0, 0x90($s0) +/* A2F3D4 80245194 00621821 */ addu $v1, $v1, $v0 +/* A2F3D8 80245198 04610004 */ bgez $v1, .L802451AC +/* A2F3DC 8024519C AE0300B0 */ sw $v1, 0xb0($s0) +/* A2F3E0 802451A0 3C020002 */ lui $v0, 2 +/* A2F3E4 802451A4 0809146F */ j .L802451BC +/* A2F3E8 802451A8 00621021 */ addu $v0, $v1, $v0 +.L802451AC: +/* A2F3EC 802451AC 3C040002 */ lui $a0, 2 +/* A2F3F0 802451B0 0083102A */ slt $v0, $a0, $v1 +/* A2F3F4 802451B4 10400002 */ beqz $v0, .L802451C0 +/* A2F3F8 802451B8 00641023 */ subu $v0, $v1, $a0 +.L802451BC: +/* A2F3FC 802451BC AE0200B0 */ sw $v0, 0xb0($s0) +.L802451C0: +/* A2F400 802451C0 8E02007C */ lw $v0, 0x7c($s0) +/* A2F404 802451C4 1440000E */ bnez $v0, .L80245200 +/* A2F408 802451C8 00000000 */ nop +/* A2F40C 802451CC 8E0300B4 */ lw $v1, 0xb4($s0) +/* A2F410 802451D0 8E020094 */ lw $v0, 0x94($s0) +/* A2F414 802451D4 00621821 */ addu $v1, $v1, $v0 +/* A2F418 802451D8 04610004 */ bgez $v1, .L802451EC +/* A2F41C 802451DC AE0300B4 */ sw $v1, 0xb4($s0) +/* A2F420 802451E0 3C020002 */ lui $v0, 2 +/* A2F424 802451E4 0809147F */ j .L802451FC +/* A2F428 802451E8 00621021 */ addu $v0, $v1, $v0 +.L802451EC: +/* A2F42C 802451EC 3C040002 */ lui $a0, 2 +/* A2F430 802451F0 0083102A */ slt $v0, $a0, $v1 +/* A2F434 802451F4 10400002 */ beqz $v0, .L80245200 +/* A2F438 802451F8 00641023 */ subu $v0, $v1, $a0 +.L802451FC: +/* A2F43C 802451FC AE0200B4 */ sw $v0, 0xb4($s0) +.L80245200: +/* A2F440 80245200 8E040084 */ lw $a0, 0x84($s0) +/* A2F444 80245204 0C046F07 */ jal set_main_pan_u +/* A2F448 80245208 8E0500A8 */ lw $a1, 0xa8($s0) +/* A2F44C 8024520C 8E040084 */ lw $a0, 0x84($s0) +/* A2F450 80245210 0C046F0D */ jal set_main_pan_v +/* A2F454 80245214 8E0500AC */ lw $a1, 0xac($s0) +/* A2F458 80245218 8E040084 */ lw $a0, 0x84($s0) +/* A2F45C 8024521C 0C046F13 */ jal set_aux_pan_u +/* A2F460 80245220 8E0500B0 */ lw $a1, 0xb0($s0) +/* A2F464 80245224 8E040084 */ lw $a0, 0x84($s0) +/* A2F468 80245228 0C046F19 */ jal set_aux_pan_v +/* A2F46C 8024522C 8E0500B4 */ lw $a1, 0xb4($s0) +/* A2F470 80245230 8E020070 */ lw $v0, 0x70($s0) +/* A2F474 80245234 8E030078 */ lw $v1, 0x78($s0) +/* A2F478 80245238 8E040098 */ lw $a0, 0x98($s0) +/* A2F47C 8024523C 24420001 */ addiu $v0, $v0, 1 +/* A2F480 80245240 AE020070 */ sw $v0, 0x70($s0) +/* A2F484 80245244 8E020074 */ lw $v0, 0x74($s0) +/* A2F488 80245248 24630001 */ addiu $v1, $v1, 1 +/* A2F48C 8024524C AE030078 */ sw $v1, 0x78($s0) +/* A2F490 80245250 8E030070 */ lw $v1, 0x70($s0) +/* A2F494 80245254 24420001 */ addiu $v0, $v0, 1 +/* A2F498 80245258 AE020074 */ sw $v0, 0x74($s0) +/* A2F49C 8024525C 8E02007C */ lw $v0, 0x7c($s0) +/* A2F4A0 80245260 0064182A */ slt $v1, $v1, $a0 +/* A2F4A4 80245264 24420001 */ addiu $v0, $v0, 1 +/* A2F4A8 80245268 14600002 */ bnez $v1, .L80245274 +/* A2F4AC 8024526C AE02007C */ sw $v0, 0x7c($s0) +/* A2F4B0 80245270 AE000070 */ sw $zero, 0x70($s0) +.L80245274: +/* A2F4B4 80245274 8E020074 */ lw $v0, 0x74($s0) +/* A2F4B8 80245278 8E03009C */ lw $v1, 0x9c($s0) +/* A2F4BC 8024527C 0043102A */ slt $v0, $v0, $v1 +/* A2F4C0 80245280 50400001 */ beql $v0, $zero, .L80245288 +/* A2F4C4 80245284 AE000074 */ sw $zero, 0x74($s0) +.L80245288: +/* A2F4C8 80245288 8E020078 */ lw $v0, 0x78($s0) +/* A2F4CC 8024528C 8E0300A0 */ lw $v1, 0xa0($s0) +/* A2F4D0 80245290 0043102A */ slt $v0, $v0, $v1 +/* A2F4D4 80245294 50400001 */ beql $v0, $zero, .L8024529C +/* A2F4D8 80245298 AE000078 */ sw $zero, 0x78($s0) +.L8024529C: +/* A2F4DC 8024529C 8E02007C */ lw $v0, 0x7c($s0) +/* A2F4E0 802452A0 8E0300A4 */ lw $v1, 0xa4($s0) +/* A2F4E4 802452A4 0043102A */ slt $v0, $v0, $v1 +/* A2F4E8 802452A8 50400001 */ beql $v0, $zero, .L802452B0 +/* A2F4EC 802452AC AE00007C */ sw $zero, 0x7c($s0) +.L802452B0: +/* A2F4F0 802452B0 8FBF0014 */ lw $ra, 0x14($sp) +/* A2F4F4 802452B4 8FB00010 */ lw $s0, 0x10($sp) +/* A2F4F8 802452B8 0000102D */ daddu $v0, $zero, $zero +/* A2F4FC 802452BC 03E00008 */ jr $ra +/* A2F500 802452C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4.s deleted file mode 100644 index 135c1d4dd7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4.s +++ /dev/null @@ -1,245 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802452C4 -/* A2F504 802452C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A2F508 802452C8 AFB1001C */ sw $s1, 0x1c($sp) -/* A2F50C 802452CC 0080882D */ daddu $s1, $a0, $zero -/* A2F510 802452D0 AFBF0020 */ sw $ra, 0x20($sp) -/* A2F514 802452D4 AFB00018 */ sw $s0, 0x18($sp) -/* A2F518 802452D8 10A0003B */ beqz $a1, .L802453C8 -/* A2F51C 802452DC 8E30000C */ lw $s0, 0xc($s1) -/* A2F520 802452E0 3C048025 */ lui $a0, 0x8025 -/* A2F524 802452E4 2484F580 */ addiu $a0, $a0, -0xa80 -/* A2F528 802452E8 3C058025 */ lui $a1, 0x8025 -/* A2F52C 802452EC 24A5F581 */ addiu $a1, $a1, -0xa7f -/* A2F530 802452F0 3C068025 */ lui $a2, 0x8025 -/* A2F534 802452F4 24C6F582 */ addiu $a2, $a2, -0xa7e -/* A2F538 802452F8 3C078025 */ lui $a3, 0x8025 -/* A2F53C 802452FC 24E7F583 */ addiu $a3, $a3, -0xa7d -/* A2F540 80245300 3C028025 */ lui $v0, 0x8025 -/* A2F544 80245304 2442F584 */ addiu $v0, $v0, -0xa7c -/* A2F548 80245308 AFA20010 */ sw $v0, 0x10($sp) -/* A2F54C 8024530C 3C028025 */ lui $v0, 0x8025 -/* A2F550 80245310 2442F585 */ addiu $v0, $v0, -0xa7b -/* A2F554 80245314 0C046FF5 */ jal func_8011BFD4 -/* A2F558 80245318 AFA20014 */ sw $v0, 0x14($sp) -/* A2F55C 8024531C 8E050000 */ lw $a1, ($s0) -/* A2F560 80245320 26100004 */ addiu $s0, $s0, 4 -/* A2F564 80245324 0C0B1EAF */ jal get_variable -/* A2F568 80245328 0220202D */ daddu $a0, $s1, $zero -/* A2F56C 8024532C 3C018025 */ lui $at, 0x8025 -/* A2F570 80245330 AC22F588 */ sw $v0, -0xa78($at) -/* A2F574 80245334 8E050000 */ lw $a1, ($s0) -/* A2F578 80245338 26100004 */ addiu $s0, $s0, 4 -/* A2F57C 8024533C 0C0B1EAF */ jal get_variable -/* A2F580 80245340 0220202D */ daddu $a0, $s1, $zero -/* A2F584 80245344 3C018025 */ lui $at, 0x8025 -/* A2F588 80245348 AC22F58C */ sw $v0, -0xa74($at) -/* A2F58C 8024534C 8E050000 */ lw $a1, ($s0) -/* A2F590 80245350 26100004 */ addiu $s0, $s0, 4 -/* A2F594 80245354 0C0B1EAF */ jal get_variable -/* A2F598 80245358 0220202D */ daddu $a0, $s1, $zero -/* A2F59C 8024535C 3C018025 */ lui $at, 0x8025 -/* A2F5A0 80245360 AC22F590 */ sw $v0, -0xa70($at) -/* A2F5A4 80245364 8E050000 */ lw $a1, ($s0) -/* A2F5A8 80245368 26100004 */ addiu $s0, $s0, 4 -/* A2F5AC 8024536C 0C0B1EAF */ jal get_variable -/* A2F5B0 80245370 0220202D */ daddu $a0, $s1, $zero -/* A2F5B4 80245374 3C018025 */ lui $at, 0x8025 -/* A2F5B8 80245378 AC22F594 */ sw $v0, -0xa6c($at) -/* A2F5BC 8024537C 8E050000 */ lw $a1, ($s0) -/* A2F5C0 80245380 26100004 */ addiu $s0, $s0, 4 -/* A2F5C4 80245384 0C0B1EAF */ jal get_variable -/* A2F5C8 80245388 0220202D */ daddu $a0, $s1, $zero -/* A2F5CC 8024538C 3C018025 */ lui $at, 0x8025 -/* A2F5D0 80245390 AC22F598 */ sw $v0, -0xa68($at) -/* A2F5D4 80245394 8E050000 */ lw $a1, ($s0) -/* A2F5D8 80245398 26100004 */ addiu $s0, $s0, 4 -/* A2F5DC 8024539C 0C0B1EAF */ jal get_variable -/* A2F5E0 802453A0 0220202D */ daddu $a0, $s1, $zero -/* A2F5E4 802453A4 3C018025 */ lui $at, 0x8025 -/* A2F5E8 802453A8 AC22F59C */ sw $v0, -0xa64($at) -/* A2F5EC 802453AC 8E050000 */ lw $a1, ($s0) -/* A2F5F0 802453B0 0C0B1EAF */ jal get_variable -/* A2F5F4 802453B4 0220202D */ daddu $a0, $s1, $zero -/* A2F5F8 802453B8 3C018025 */ lui $at, 0x8025 -/* A2F5FC 802453BC AC22F5A0 */ sw $v0, -0xa60($at) -/* A2F600 802453C0 3C018025 */ lui $at, 0x8025 -/* A2F604 802453C4 AC20F5A4 */ sw $zero, -0xa5c($at) -.L802453C8: -/* A2F608 802453C8 3C118025 */ lui $s1, 0x8025 -/* A2F60C 802453CC 2631F5A0 */ addiu $s1, $s1, -0xa60 -/* A2F610 802453D0 8E2F0000 */ lw $t7, ($s1) -/* A2F614 802453D4 19E00088 */ blez $t7, .L802455F8 -/* A2F618 802453D8 00000000 */ nop -/* A2F61C 802453DC 3C108025 */ lui $s0, 0x8025 -/* A2F620 802453E0 2610F5A4 */ addiu $s0, $s0, -0xa5c -/* A2F624 802453E4 8E030000 */ lw $v1, ($s0) -/* A2F628 802453E8 3C048025 */ lui $a0, 0x8025 -/* A2F62C 802453EC 9084F580 */ lbu $a0, -0xa80($a0) -/* A2F630 802453F0 3C028025 */ lui $v0, 0x8025 -/* A2F634 802453F4 8C42F588 */ lw $v0, -0xa78($v0) -/* A2F638 802453F8 24630001 */ addiu $v1, $v1, 1 -/* A2F63C 802453FC 00441023 */ subu $v0, $v0, $a0 -/* A2F640 80245400 00430018 */ mult $v0, $v1 -/* A2F644 80245404 00004012 */ mflo $t0 -/* A2F648 80245408 00000000 */ nop -/* A2F64C 8024540C 15E00002 */ bnez $t7, .L80245418 -/* A2F650 80245410 010F001A */ div $zero, $t0, $t7 -/* A2F654 80245414 0007000D */ break 7 -.L80245418: -/* A2F658 80245418 2401FFFF */ addiu $at, $zero, -1 -/* A2F65C 8024541C 15E10004 */ bne $t7, $at, .L80245430 -/* A2F660 80245420 3C018000 */ lui $at, 0x8000 -/* A2F664 80245424 15010002 */ bne $t0, $at, .L80245430 -/* A2F668 80245428 00000000 */ nop -/* A2F66C 8024542C 0006000D */ break 6 -.L80245430: -/* A2F670 80245430 00007012 */ mflo $t6 -/* A2F674 80245434 3C058025 */ lui $a1, 0x8025 -/* A2F678 80245438 90A5F581 */ lbu $a1, -0xa7f($a1) -/* A2F67C 8024543C 3C028025 */ lui $v0, 0x8025 -/* A2F680 80245440 8C42F58C */ lw $v0, -0xa74($v0) -/* A2F684 80245444 00451023 */ subu $v0, $v0, $a1 -/* A2F688 80245448 00430018 */ mult $v0, $v1 -/* A2F68C 8024544C 00004012 */ mflo $t0 -/* A2F690 80245450 00000000 */ nop -/* A2F694 80245454 15E00002 */ bnez $t7, .L80245460 -/* A2F698 80245458 010F001A */ div $zero, $t0, $t7 -/* A2F69C 8024545C 0007000D */ break 7 -.L80245460: -/* A2F6A0 80245460 2401FFFF */ addiu $at, $zero, -1 -/* A2F6A4 80245464 15E10004 */ bne $t7, $at, .L80245478 -/* A2F6A8 80245468 3C018000 */ lui $at, 0x8000 -/* A2F6AC 8024546C 15010002 */ bne $t0, $at, .L80245478 -/* A2F6B0 80245470 00000000 */ nop -/* A2F6B4 80245474 0006000D */ break 6 -.L80245478: -/* A2F6B8 80245478 00006812 */ mflo $t5 -/* A2F6BC 8024547C 3C068025 */ lui $a2, 0x8025 -/* A2F6C0 80245480 90C6F582 */ lbu $a2, -0xa7e($a2) -/* A2F6C4 80245484 3C028025 */ lui $v0, 0x8025 -/* A2F6C8 80245488 8C42F590 */ lw $v0, -0xa70($v0) -/* A2F6CC 8024548C 00461023 */ subu $v0, $v0, $a2 -/* A2F6D0 80245490 00430018 */ mult $v0, $v1 -/* A2F6D4 80245494 00004012 */ mflo $t0 -/* A2F6D8 80245498 00000000 */ nop -/* A2F6DC 8024549C 15E00002 */ bnez $t7, .L802454A8 -/* A2F6E0 802454A0 010F001A */ div $zero, $t0, $t7 -/* A2F6E4 802454A4 0007000D */ break 7 -.L802454A8: -/* A2F6E8 802454A8 2401FFFF */ addiu $at, $zero, -1 -/* A2F6EC 802454AC 15E10004 */ bne $t7, $at, .L802454C0 -/* A2F6F0 802454B0 3C018000 */ lui $at, 0x8000 -/* A2F6F4 802454B4 15010002 */ bne $t0, $at, .L802454C0 -/* A2F6F8 802454B8 00000000 */ nop -/* A2F6FC 802454BC 0006000D */ break 6 -.L802454C0: -/* A2F700 802454C0 00006012 */ mflo $t4 -/* A2F704 802454C4 3C078025 */ lui $a3, 0x8025 -/* A2F708 802454C8 90E7F583 */ lbu $a3, -0xa7d($a3) -/* A2F70C 802454CC 3C028025 */ lui $v0, 0x8025 -/* A2F710 802454D0 8C42F594 */ lw $v0, -0xa6c($v0) -/* A2F714 802454D4 00471023 */ subu $v0, $v0, $a3 -/* A2F718 802454D8 00430018 */ mult $v0, $v1 -/* A2F71C 802454DC 00004012 */ mflo $t0 -/* A2F720 802454E0 00000000 */ nop -/* A2F724 802454E4 15E00002 */ bnez $t7, .L802454F0 -/* A2F728 802454E8 010F001A */ div $zero, $t0, $t7 -/* A2F72C 802454EC 0007000D */ break 7 -.L802454F0: -/* A2F730 802454F0 2401FFFF */ addiu $at, $zero, -1 -/* A2F734 802454F4 15E10004 */ bne $t7, $at, .L80245508 -/* A2F738 802454F8 3C018000 */ lui $at, 0x8000 -/* A2F73C 802454FC 15010002 */ bne $t0, $at, .L80245508 -/* A2F740 80245500 00000000 */ nop -/* A2F744 80245504 0006000D */ break 6 -.L80245508: -/* A2F748 80245508 00005812 */ mflo $t3 -/* A2F74C 8024550C 3C098025 */ lui $t1, 0x8025 -/* A2F750 80245510 9129F584 */ lbu $t1, -0xa7c($t1) -/* A2F754 80245514 3C028025 */ lui $v0, 0x8025 -/* A2F758 80245518 8C42F598 */ lw $v0, -0xa68($v0) -/* A2F75C 8024551C 00491023 */ subu $v0, $v0, $t1 -/* A2F760 80245520 00430018 */ mult $v0, $v1 -/* A2F764 80245524 00004012 */ mflo $t0 -/* A2F768 80245528 00000000 */ nop -/* A2F76C 8024552C 15E00002 */ bnez $t7, .L80245538 -/* A2F770 80245530 010F001A */ div $zero, $t0, $t7 -/* A2F774 80245534 0007000D */ break 7 -.L80245538: -/* A2F778 80245538 2401FFFF */ addiu $at, $zero, -1 -/* A2F77C 8024553C 15E10004 */ bne $t7, $at, .L80245550 -/* A2F780 80245540 3C018000 */ lui $at, 0x8000 -/* A2F784 80245544 15010002 */ bne $t0, $at, .L80245550 -/* A2F788 80245548 00000000 */ nop -/* A2F78C 8024554C 0006000D */ break 6 -.L80245550: -/* A2F790 80245550 00005012 */ mflo $t2 -/* A2F794 80245554 3C088025 */ lui $t0, 0x8025 -/* A2F798 80245558 9108F585 */ lbu $t0, -0xa7b($t0) -/* A2F79C 8024555C 3C028025 */ lui $v0, 0x8025 -/* A2F7A0 80245560 8C42F59C */ lw $v0, -0xa64($v0) -/* A2F7A4 80245564 00481023 */ subu $v0, $v0, $t0 -/* A2F7A8 80245568 00430018 */ mult $v0, $v1 -/* A2F7AC 8024556C 0000C812 */ mflo $t9 -/* A2F7B0 80245570 00000000 */ nop -/* A2F7B4 80245574 15E00002 */ bnez $t7, .L80245580 -/* A2F7B8 80245578 032F001A */ div $zero, $t9, $t7 -/* A2F7BC 8024557C 0007000D */ break 7 -.L80245580: -/* A2F7C0 80245580 2401FFFF */ addiu $at, $zero, -1 -/* A2F7C4 80245584 15E10004 */ bne $t7, $at, .L80245598 -/* A2F7C8 80245588 3C018000 */ lui $at, 0x8000 -/* A2F7CC 8024558C 17210002 */ bne $t9, $at, .L80245598 -/* A2F7D0 80245590 00000000 */ nop -/* A2F7D4 80245594 0006000D */ break 6 -.L80245598: -/* A2F7D8 80245598 00001012 */ mflo $v0 -/* A2F7DC 8024559C AE030000 */ sw $v1, ($s0) -/* A2F7E0 802455A0 008E2021 */ addu $a0, $a0, $t6 -/* A2F7E4 802455A4 308400FF */ andi $a0, $a0, 0xff -/* A2F7E8 802455A8 00AD2821 */ addu $a1, $a1, $t5 -/* A2F7EC 802455AC 30A500FF */ andi $a1, $a1, 0xff -/* A2F7F0 802455B0 00CC3021 */ addu $a2, $a2, $t4 -/* A2F7F4 802455B4 30C600FF */ andi $a2, $a2, 0xff -/* A2F7F8 802455B8 00EB3821 */ addu $a3, $a3, $t3 -/* A2F7FC 802455BC 30E700FF */ andi $a3, $a3, 0xff -/* A2F800 802455C0 012A4821 */ addu $t1, $t1, $t2 -/* A2F804 802455C4 312900FF */ andi $t1, $t1, 0xff -/* A2F808 802455C8 AFA90010 */ sw $t1, 0x10($sp) -/* A2F80C 802455CC 01024021 */ addu $t0, $t0, $v0 -/* A2F810 802455D0 310800FF */ andi $t0, $t0, 0xff -/* A2F814 802455D4 0C046FE6 */ jal func_8011BF98 -/* A2F818 802455D8 AFA80014 */ sw $t0, 0x14($sp) -/* A2F81C 802455DC 8E020000 */ lw $v0, ($s0) -/* A2F820 802455E0 8E230000 */ lw $v1, ($s1) -/* A2F824 802455E4 0043102A */ slt $v0, $v0, $v1 -/* A2F828 802455E8 14400013 */ bnez $v0, .L80245638 -/* A2F82C 802455EC 0000102D */ daddu $v0, $zero, $zero -/* A2F830 802455F0 0809158E */ j .L80245638 -/* A2F834 802455F4 24020002 */ addiu $v0, $zero, 2 -.L802455F8: -/* A2F838 802455F8 3C028025 */ lui $v0, 0x8025 -/* A2F83C 802455FC 9042F59B */ lbu $v0, -0xa65($v0) -/* A2F840 80245600 3C048025 */ lui $a0, 0x8025 -/* A2F844 80245604 9084F58B */ lbu $a0, -0xa75($a0) -/* A2F848 80245608 3C058025 */ lui $a1, 0x8025 -/* A2F84C 8024560C 90A5F58F */ lbu $a1, -0xa71($a1) -/* A2F850 80245610 3C068025 */ lui $a2, 0x8025 -/* A2F854 80245614 90C6F593 */ lbu $a2, -0xa6d($a2) -/* A2F858 80245618 3C078025 */ lui $a3, 0x8025 -/* A2F85C 8024561C 90E7F597 */ lbu $a3, -0xa69($a3) -/* A2F860 80245620 3C038025 */ lui $v1, 0x8025 -/* A2F864 80245624 9063F59F */ lbu $v1, -0xa61($v1) -/* A2F868 80245628 AFA20010 */ sw $v0, 0x10($sp) -/* A2F86C 8024562C 0C046FE6 */ jal func_8011BF98 -/* A2F870 80245630 AFA30014 */ sw $v1, 0x14($sp) -/* A2F874 80245634 24020002 */ addiu $v0, $zero, 2 -.L80245638: -/* A2F878 80245638 8FBF0020 */ lw $ra, 0x20($sp) -/* A2F87C 8024563C 8FB1001C */ lw $s1, 0x1c($sp) -/* A2F880 80245640 8FB00018 */ lw $s0, 0x18($sp) -/* A2F884 80245644 03E00008 */ jr $ra -/* A2F888 80245648 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s new file mode 100644 index 0000000000..6f76767a28 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802452C4_A2F504.s @@ -0,0 +1,245 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802452C4_A2F504 +/* A2F504 802452C4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A2F508 802452C8 AFB1001C */ sw $s1, 0x1c($sp) +/* A2F50C 802452CC 0080882D */ daddu $s1, $a0, $zero +/* A2F510 802452D0 AFBF0020 */ sw $ra, 0x20($sp) +/* A2F514 802452D4 AFB00018 */ sw $s0, 0x18($sp) +/* A2F518 802452D8 10A0003B */ beqz $a1, .L802453C8 +/* A2F51C 802452DC 8E30000C */ lw $s0, 0xc($s1) +/* A2F520 802452E0 3C048025 */ lui $a0, 0x8025 +/* A2F524 802452E4 2484F580 */ addiu $a0, $a0, -0xa80 +/* A2F528 802452E8 3C058025 */ lui $a1, 0x8025 +/* A2F52C 802452EC 24A5F581 */ addiu $a1, $a1, -0xa7f +/* A2F530 802452F0 3C068025 */ lui $a2, 0x8025 +/* A2F534 802452F4 24C6F582 */ addiu $a2, $a2, -0xa7e +/* A2F538 802452F8 3C078025 */ lui $a3, 0x8025 +/* A2F53C 802452FC 24E7F583 */ addiu $a3, $a3, -0xa7d +/* A2F540 80245300 3C028025 */ lui $v0, 0x8025 +/* A2F544 80245304 2442F584 */ addiu $v0, $v0, -0xa7c +/* A2F548 80245308 AFA20010 */ sw $v0, 0x10($sp) +/* A2F54C 8024530C 3C028025 */ lui $v0, 0x8025 +/* A2F550 80245310 2442F585 */ addiu $v0, $v0, -0xa7b +/* A2F554 80245314 0C046FF5 */ jal func_8011BFD4 +/* A2F558 80245318 AFA20014 */ sw $v0, 0x14($sp) +/* A2F55C 8024531C 8E050000 */ lw $a1, ($s0) +/* A2F560 80245320 26100004 */ addiu $s0, $s0, 4 +/* A2F564 80245324 0C0B1EAF */ jal get_variable +/* A2F568 80245328 0220202D */ daddu $a0, $s1, $zero +/* A2F56C 8024532C 3C018025 */ lui $at, 0x8025 +/* A2F570 80245330 AC22F588 */ sw $v0, -0xa78($at) +/* A2F574 80245334 8E050000 */ lw $a1, ($s0) +/* A2F578 80245338 26100004 */ addiu $s0, $s0, 4 +/* A2F57C 8024533C 0C0B1EAF */ jal get_variable +/* A2F580 80245340 0220202D */ daddu $a0, $s1, $zero +/* A2F584 80245344 3C018025 */ lui $at, 0x8025 +/* A2F588 80245348 AC22F58C */ sw $v0, -0xa74($at) +/* A2F58C 8024534C 8E050000 */ lw $a1, ($s0) +/* A2F590 80245350 26100004 */ addiu $s0, $s0, 4 +/* A2F594 80245354 0C0B1EAF */ jal get_variable +/* A2F598 80245358 0220202D */ daddu $a0, $s1, $zero +/* A2F59C 8024535C 3C018025 */ lui $at, 0x8025 +/* A2F5A0 80245360 AC22F590 */ sw $v0, -0xa70($at) +/* A2F5A4 80245364 8E050000 */ lw $a1, ($s0) +/* A2F5A8 80245368 26100004 */ addiu $s0, $s0, 4 +/* A2F5AC 8024536C 0C0B1EAF */ jal get_variable +/* A2F5B0 80245370 0220202D */ daddu $a0, $s1, $zero +/* A2F5B4 80245374 3C018025 */ lui $at, 0x8025 +/* A2F5B8 80245378 AC22F594 */ sw $v0, -0xa6c($at) +/* A2F5BC 8024537C 8E050000 */ lw $a1, ($s0) +/* A2F5C0 80245380 26100004 */ addiu $s0, $s0, 4 +/* A2F5C4 80245384 0C0B1EAF */ jal get_variable +/* A2F5C8 80245388 0220202D */ daddu $a0, $s1, $zero +/* A2F5CC 8024538C 3C018025 */ lui $at, 0x8025 +/* A2F5D0 80245390 AC22F598 */ sw $v0, -0xa68($at) +/* A2F5D4 80245394 8E050000 */ lw $a1, ($s0) +/* A2F5D8 80245398 26100004 */ addiu $s0, $s0, 4 +/* A2F5DC 8024539C 0C0B1EAF */ jal get_variable +/* A2F5E0 802453A0 0220202D */ daddu $a0, $s1, $zero +/* A2F5E4 802453A4 3C018025 */ lui $at, 0x8025 +/* A2F5E8 802453A8 AC22F59C */ sw $v0, -0xa64($at) +/* A2F5EC 802453AC 8E050000 */ lw $a1, ($s0) +/* A2F5F0 802453B0 0C0B1EAF */ jal get_variable +/* A2F5F4 802453B4 0220202D */ daddu $a0, $s1, $zero +/* A2F5F8 802453B8 3C018025 */ lui $at, 0x8025 +/* A2F5FC 802453BC AC22F5A0 */ sw $v0, -0xa60($at) +/* A2F600 802453C0 3C018025 */ lui $at, 0x8025 +/* A2F604 802453C4 AC20F5A4 */ sw $zero, -0xa5c($at) +.L802453C8: +/* A2F608 802453C8 3C118025 */ lui $s1, 0x8025 +/* A2F60C 802453CC 2631F5A0 */ addiu $s1, $s1, -0xa60 +/* A2F610 802453D0 8E2F0000 */ lw $t7, ($s1) +/* A2F614 802453D4 19E00088 */ blez $t7, .L802455F8 +/* A2F618 802453D8 00000000 */ nop +/* A2F61C 802453DC 3C108025 */ lui $s0, 0x8025 +/* A2F620 802453E0 2610F5A4 */ addiu $s0, $s0, -0xa5c +/* A2F624 802453E4 8E030000 */ lw $v1, ($s0) +/* A2F628 802453E8 3C048025 */ lui $a0, 0x8025 +/* A2F62C 802453EC 9084F580 */ lbu $a0, -0xa80($a0) +/* A2F630 802453F0 3C028025 */ lui $v0, 0x8025 +/* A2F634 802453F4 8C42F588 */ lw $v0, -0xa78($v0) +/* A2F638 802453F8 24630001 */ addiu $v1, $v1, 1 +/* A2F63C 802453FC 00441023 */ subu $v0, $v0, $a0 +/* A2F640 80245400 00430018 */ mult $v0, $v1 +/* A2F644 80245404 00004012 */ mflo $t0 +/* A2F648 80245408 00000000 */ nop +/* A2F64C 8024540C 15E00002 */ bnez $t7, .L80245418 +/* A2F650 80245410 010F001A */ div $zero, $t0, $t7 +/* A2F654 80245414 0007000D */ break 7 +.L80245418: +/* A2F658 80245418 2401FFFF */ addiu $at, $zero, -1 +/* A2F65C 8024541C 15E10004 */ bne $t7, $at, .L80245430 +/* A2F660 80245420 3C018000 */ lui $at, 0x8000 +/* A2F664 80245424 15010002 */ bne $t0, $at, .L80245430 +/* A2F668 80245428 00000000 */ nop +/* A2F66C 8024542C 0006000D */ break 6 +.L80245430: +/* A2F670 80245430 00007012 */ mflo $t6 +/* A2F674 80245434 3C058025 */ lui $a1, 0x8025 +/* A2F678 80245438 90A5F581 */ lbu $a1, -0xa7f($a1) +/* A2F67C 8024543C 3C028025 */ lui $v0, 0x8025 +/* A2F680 80245440 8C42F58C */ lw $v0, -0xa74($v0) +/* A2F684 80245444 00451023 */ subu $v0, $v0, $a1 +/* A2F688 80245448 00430018 */ mult $v0, $v1 +/* A2F68C 8024544C 00004012 */ mflo $t0 +/* A2F690 80245450 00000000 */ nop +/* A2F694 80245454 15E00002 */ bnez $t7, .L80245460 +/* A2F698 80245458 010F001A */ div $zero, $t0, $t7 +/* A2F69C 8024545C 0007000D */ break 7 +.L80245460: +/* A2F6A0 80245460 2401FFFF */ addiu $at, $zero, -1 +/* A2F6A4 80245464 15E10004 */ bne $t7, $at, .L80245478 +/* A2F6A8 80245468 3C018000 */ lui $at, 0x8000 +/* A2F6AC 8024546C 15010002 */ bne $t0, $at, .L80245478 +/* A2F6B0 80245470 00000000 */ nop +/* A2F6B4 80245474 0006000D */ break 6 +.L80245478: +/* A2F6B8 80245478 00006812 */ mflo $t5 +/* A2F6BC 8024547C 3C068025 */ lui $a2, 0x8025 +/* A2F6C0 80245480 90C6F582 */ lbu $a2, -0xa7e($a2) +/* A2F6C4 80245484 3C028025 */ lui $v0, 0x8025 +/* A2F6C8 80245488 8C42F590 */ lw $v0, -0xa70($v0) +/* A2F6CC 8024548C 00461023 */ subu $v0, $v0, $a2 +/* A2F6D0 80245490 00430018 */ mult $v0, $v1 +/* A2F6D4 80245494 00004012 */ mflo $t0 +/* A2F6D8 80245498 00000000 */ nop +/* A2F6DC 8024549C 15E00002 */ bnez $t7, .L802454A8 +/* A2F6E0 802454A0 010F001A */ div $zero, $t0, $t7 +/* A2F6E4 802454A4 0007000D */ break 7 +.L802454A8: +/* A2F6E8 802454A8 2401FFFF */ addiu $at, $zero, -1 +/* A2F6EC 802454AC 15E10004 */ bne $t7, $at, .L802454C0 +/* A2F6F0 802454B0 3C018000 */ lui $at, 0x8000 +/* A2F6F4 802454B4 15010002 */ bne $t0, $at, .L802454C0 +/* A2F6F8 802454B8 00000000 */ nop +/* A2F6FC 802454BC 0006000D */ break 6 +.L802454C0: +/* A2F700 802454C0 00006012 */ mflo $t4 +/* A2F704 802454C4 3C078025 */ lui $a3, 0x8025 +/* A2F708 802454C8 90E7F583 */ lbu $a3, -0xa7d($a3) +/* A2F70C 802454CC 3C028025 */ lui $v0, 0x8025 +/* A2F710 802454D0 8C42F594 */ lw $v0, -0xa6c($v0) +/* A2F714 802454D4 00471023 */ subu $v0, $v0, $a3 +/* A2F718 802454D8 00430018 */ mult $v0, $v1 +/* A2F71C 802454DC 00004012 */ mflo $t0 +/* A2F720 802454E0 00000000 */ nop +/* A2F724 802454E4 15E00002 */ bnez $t7, .L802454F0 +/* A2F728 802454E8 010F001A */ div $zero, $t0, $t7 +/* A2F72C 802454EC 0007000D */ break 7 +.L802454F0: +/* A2F730 802454F0 2401FFFF */ addiu $at, $zero, -1 +/* A2F734 802454F4 15E10004 */ bne $t7, $at, .L80245508 +/* A2F738 802454F8 3C018000 */ lui $at, 0x8000 +/* A2F73C 802454FC 15010002 */ bne $t0, $at, .L80245508 +/* A2F740 80245500 00000000 */ nop +/* A2F744 80245504 0006000D */ break 6 +.L80245508: +/* A2F748 80245508 00005812 */ mflo $t3 +/* A2F74C 8024550C 3C098025 */ lui $t1, 0x8025 +/* A2F750 80245510 9129F584 */ lbu $t1, -0xa7c($t1) +/* A2F754 80245514 3C028025 */ lui $v0, 0x8025 +/* A2F758 80245518 8C42F598 */ lw $v0, -0xa68($v0) +/* A2F75C 8024551C 00491023 */ subu $v0, $v0, $t1 +/* A2F760 80245520 00430018 */ mult $v0, $v1 +/* A2F764 80245524 00004012 */ mflo $t0 +/* A2F768 80245528 00000000 */ nop +/* A2F76C 8024552C 15E00002 */ bnez $t7, .L80245538 +/* A2F770 80245530 010F001A */ div $zero, $t0, $t7 +/* A2F774 80245534 0007000D */ break 7 +.L80245538: +/* A2F778 80245538 2401FFFF */ addiu $at, $zero, -1 +/* A2F77C 8024553C 15E10004 */ bne $t7, $at, .L80245550 +/* A2F780 80245540 3C018000 */ lui $at, 0x8000 +/* A2F784 80245544 15010002 */ bne $t0, $at, .L80245550 +/* A2F788 80245548 00000000 */ nop +/* A2F78C 8024554C 0006000D */ break 6 +.L80245550: +/* A2F790 80245550 00005012 */ mflo $t2 +/* A2F794 80245554 3C088025 */ lui $t0, 0x8025 +/* A2F798 80245558 9108F585 */ lbu $t0, -0xa7b($t0) +/* A2F79C 8024555C 3C028025 */ lui $v0, 0x8025 +/* A2F7A0 80245560 8C42F59C */ lw $v0, -0xa64($v0) +/* A2F7A4 80245564 00481023 */ subu $v0, $v0, $t0 +/* A2F7A8 80245568 00430018 */ mult $v0, $v1 +/* A2F7AC 8024556C 0000C812 */ mflo $t9 +/* A2F7B0 80245570 00000000 */ nop +/* A2F7B4 80245574 15E00002 */ bnez $t7, .L80245580 +/* A2F7B8 80245578 032F001A */ div $zero, $t9, $t7 +/* A2F7BC 8024557C 0007000D */ break 7 +.L80245580: +/* A2F7C0 80245580 2401FFFF */ addiu $at, $zero, -1 +/* A2F7C4 80245584 15E10004 */ bne $t7, $at, .L80245598 +/* A2F7C8 80245588 3C018000 */ lui $at, 0x8000 +/* A2F7CC 8024558C 17210002 */ bne $t9, $at, .L80245598 +/* A2F7D0 80245590 00000000 */ nop +/* A2F7D4 80245594 0006000D */ break 6 +.L80245598: +/* A2F7D8 80245598 00001012 */ mflo $v0 +/* A2F7DC 8024559C AE030000 */ sw $v1, ($s0) +/* A2F7E0 802455A0 008E2021 */ addu $a0, $a0, $t6 +/* A2F7E4 802455A4 308400FF */ andi $a0, $a0, 0xff +/* A2F7E8 802455A8 00AD2821 */ addu $a1, $a1, $t5 +/* A2F7EC 802455AC 30A500FF */ andi $a1, $a1, 0xff +/* A2F7F0 802455B0 00CC3021 */ addu $a2, $a2, $t4 +/* A2F7F4 802455B4 30C600FF */ andi $a2, $a2, 0xff +/* A2F7F8 802455B8 00EB3821 */ addu $a3, $a3, $t3 +/* A2F7FC 802455BC 30E700FF */ andi $a3, $a3, 0xff +/* A2F800 802455C0 012A4821 */ addu $t1, $t1, $t2 +/* A2F804 802455C4 312900FF */ andi $t1, $t1, 0xff +/* A2F808 802455C8 AFA90010 */ sw $t1, 0x10($sp) +/* A2F80C 802455CC 01024021 */ addu $t0, $t0, $v0 +/* A2F810 802455D0 310800FF */ andi $t0, $t0, 0xff +/* A2F814 802455D4 0C046FE6 */ jal func_8011BF98 +/* A2F818 802455D8 AFA80014 */ sw $t0, 0x14($sp) +/* A2F81C 802455DC 8E020000 */ lw $v0, ($s0) +/* A2F820 802455E0 8E230000 */ lw $v1, ($s1) +/* A2F824 802455E4 0043102A */ slt $v0, $v0, $v1 +/* A2F828 802455E8 14400013 */ bnez $v0, .L80245638 +/* A2F82C 802455EC 0000102D */ daddu $v0, $zero, $zero +/* A2F830 802455F0 0809158E */ j .L80245638 +/* A2F834 802455F4 24020002 */ addiu $v0, $zero, 2 +.L802455F8: +/* A2F838 802455F8 3C028025 */ lui $v0, 0x8025 +/* A2F83C 802455FC 9042F59B */ lbu $v0, -0xa65($v0) +/* A2F840 80245600 3C048025 */ lui $a0, 0x8025 +/* A2F844 80245604 9084F58B */ lbu $a0, -0xa75($a0) +/* A2F848 80245608 3C058025 */ lui $a1, 0x8025 +/* A2F84C 8024560C 90A5F58F */ lbu $a1, -0xa71($a1) +/* A2F850 80245610 3C068025 */ lui $a2, 0x8025 +/* A2F854 80245614 90C6F593 */ lbu $a2, -0xa6d($a2) +/* A2F858 80245618 3C078025 */ lui $a3, 0x8025 +/* A2F85C 8024561C 90E7F597 */ lbu $a3, -0xa69($a3) +/* A2F860 80245620 3C038025 */ lui $v1, 0x8025 +/* A2F864 80245624 9063F59F */ lbu $v1, -0xa61($v1) +/* A2F868 80245628 AFA20010 */ sw $v0, 0x10($sp) +/* A2F86C 8024562C 0C046FE6 */ jal func_8011BF98 +/* A2F870 80245630 AFA30014 */ sw $v1, 0x14($sp) +/* A2F874 80245634 24020002 */ addiu $v0, $zero, 2 +.L80245638: +/* A2F878 80245638 8FBF0020 */ lw $ra, 0x20($sp) +/* A2F87C 8024563C 8FB1001C */ lw $s1, 0x1c($sp) +/* A2F880 80245640 8FB00018 */ lw $s0, 0x18($sp) +/* A2F884 80245644 03E00008 */ jr $ra +/* A2F888 80245648 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C.s deleted file mode 100644 index b570828106..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024564C -/* A2F88C 8024564C 3C06FC12 */ lui $a2, 0xfc12 -/* A2F890 80245650 34C61624 */ ori $a2, $a2, 0x1624 -/* A2F894 80245654 3C05FF2F */ lui $a1, 0xff2f -/* A2F898 80245658 3C04800A */ lui $a0, 0x800a -/* A2F89C 8024565C 2484A66C */ addiu $a0, $a0, -0x5994 -/* A2F8A0 80245660 8C820000 */ lw $v0, ($a0) -/* A2F8A4 80245664 34A5FFFF */ ori $a1, $a1, 0xffff -/* A2F8A8 80245668 0040182D */ daddu $v1, $v0, $zero -/* A2F8AC 8024566C 24420008 */ addiu $v0, $v0, 8 -/* A2F8B0 80245670 AC820000 */ sw $v0, ($a0) -/* A2F8B4 80245674 AC660000 */ sw $a2, ($v1) -/* A2F8B8 80245678 AC650004 */ sw $a1, 4($v1) -/* A2F8BC 8024567C 24430008 */ addiu $v1, $v0, 8 -/* A2F8C0 80245680 AC830000 */ sw $v1, ($a0) -/* A2F8C4 80245684 3C04802E */ lui $a0, 0x802e -/* A2F8C8 80245688 90849D73 */ lbu $a0, -0x628d($a0) -/* A2F8CC 8024568C 3C03FA00 */ lui $v1, 0xfa00 -/* A2F8D0 80245690 AC430000 */ sw $v1, ($v0) -/* A2F8D4 80245694 03E00008 */ jr $ra -/* A2F8D8 80245698 AC440004 */ sw $a0, 4($v0) 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 new file mode 100644 index 0000000000..6298ca2002 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024564C_A2F88C.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +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, 0x800a +/* A2F89C 8024565C 2484A66C */ addiu $a0, $a0, -0x5994 +/* A2F8A0 80245660 8C820000 */ lw $v0, ($a0) +/* A2F8A4 80245664 34A5FFFF */ ori $a1, $a1, 0xffff +/* A2F8A8 80245668 0040182D */ daddu $v1, $v0, $zero +/* A2F8AC 8024566C 24420008 */ addiu $v0, $v0, 8 +/* A2F8B0 80245670 AC820000 */ sw $v0, ($a0) +/* A2F8B4 80245674 AC660000 */ sw $a2, ($v1) +/* A2F8B8 80245678 AC650004 */ sw $a1, 4($v1) +/* A2F8BC 8024567C 24430008 */ addiu $v1, $v0, 8 +/* A2F8C0 80245680 AC830000 */ sw $v1, ($a0) +/* A2F8C4 80245684 3C04802E */ lui $a0, 0x802e +/* A2F8C8 80245688 90849D73 */ lbu $a0, -0x628d($a0) +/* A2F8CC 8024568C 3C03FA00 */ lui $v1, 0xfa00 +/* A2F8D0 80245690 AC430000 */ sw $v1, ($v0) +/* A2F8D4 80245694 03E00008 */ jr $ra +/* A2F8D8 80245698 AC440004 */ sw $a0, 4($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C.s deleted file mode 100644 index 1e4053f308..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024569C -/* A2F8DC 8024569C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2F8E0 802456A0 AFBF0010 */ sw $ra, 0x10($sp) -/* A2F8E4 802456A4 8C82000C */ lw $v0, 0xc($a0) -/* A2F8E8 802456A8 0C0B1EAF */ jal get_variable -/* A2F8EC 802456AC 8C450000 */ lw $a1, ($v0) -/* A2F8F0 802456B0 8FBF0010 */ lw $ra, 0x10($sp) -/* A2F8F4 802456B4 3C01802E */ lui $at, 0x802e -/* A2F8F8 802456B8 A4229D72 */ sh $v0, -0x628e($at) -/* A2F8FC 802456BC 24020002 */ addiu $v0, $zero, 2 -/* A2F900 802456C0 03E00008 */ jr $ra -/* A2F904 802456C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C_A2F8DC.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C_A2F8DC.s new file mode 100644 index 0000000000..3cbce8492a --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_8024569C_A2F8DC.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024569C_A2F8DC +/* A2F8DC 8024569C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2F8E0 802456A0 AFBF0010 */ sw $ra, 0x10($sp) +/* A2F8E4 802456A4 8C82000C */ lw $v0, 0xc($a0) +/* A2F8E8 802456A8 0C0B1EAF */ jal get_variable +/* A2F8EC 802456AC 8C450000 */ lw $a1, ($v0) +/* A2F8F0 802456B0 8FBF0010 */ lw $ra, 0x10($sp) +/* A2F8F4 802456B4 3C01802E */ lui $at, 0x802e +/* A2F8F8 802456B8 A4229D72 */ sh $v0, -0x628e($at) +/* A2F8FC 802456BC 24020002 */ addiu $v0, $zero, 2 +/* A2F900 802456C0 03E00008 */ jr $ra +/* A2F904 802456C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744.s deleted file mode 100644 index e7dc85d743..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245744 -/* A2F984 80245744 3C06FC12 */ lui $a2, 0xfc12 -/* A2F988 80245748 34C61624 */ ori $a2, $a2, 0x1624 -/* A2F98C 8024574C 3C05FF2F */ lui $a1, 0xff2f -/* A2F990 80245750 3C04800A */ lui $a0, 0x800a -/* A2F994 80245754 2484A66C */ addiu $a0, $a0, -0x5994 -/* A2F998 80245758 8C820000 */ lw $v0, ($a0) -/* A2F99C 8024575C 34A5FFFF */ ori $a1, $a1, 0xffff -/* A2F9A0 80245760 0040182D */ daddu $v1, $v0, $zero -/* A2F9A4 80245764 24420008 */ addiu $v0, $v0, 8 -/* A2F9A8 80245768 AC820000 */ sw $v0, ($a0) -/* A2F9AC 8024576C AC660000 */ sw $a2, ($v1) -/* A2F9B0 80245770 AC650004 */ sw $a1, 4($v1) -/* A2F9B4 80245774 24430008 */ addiu $v1, $v0, 8 -/* A2F9B8 80245778 AC830000 */ sw $v1, ($a0) -/* A2F9BC 8024577C 3C048025 */ lui $a0, 0x8025 -/* A2F9C0 80245780 9084DCD3 */ lbu $a0, -0x232d($a0) -/* A2F9C4 80245784 3C03FA00 */ lui $v1, 0xfa00 -/* A2F9C8 80245788 AC430000 */ sw $v1, ($v0) -/* A2F9CC 8024578C 03E00008 */ jr $ra -/* A2F9D0 80245790 AC440004 */ sw $a0, 4($v0) 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 new file mode 100644 index 0000000000..ce1e0ff0ba --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245744_A2F984.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +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, 0x800a +/* A2F994 80245754 2484A66C */ addiu $a0, $a0, -0x5994 +/* A2F998 80245758 8C820000 */ lw $v0, ($a0) +/* A2F99C 8024575C 34A5FFFF */ ori $a1, $a1, 0xffff +/* A2F9A0 80245760 0040182D */ daddu $v1, $v0, $zero +/* A2F9A4 80245764 24420008 */ addiu $v0, $v0, 8 +/* A2F9A8 80245768 AC820000 */ sw $v0, ($a0) +/* A2F9AC 8024576C AC660000 */ sw $a2, ($v1) +/* A2F9B0 80245770 AC650004 */ sw $a1, 4($v1) +/* A2F9B4 80245774 24430008 */ addiu $v1, $v0, 8 +/* A2F9B8 80245778 AC830000 */ sw $v1, ($a0) +/* A2F9BC 8024577C 3C048025 */ lui $a0, 0x8025 +/* A2F9C0 80245780 9084DCD3 */ lbu $a0, -0x232d($a0) +/* A2F9C4 80245784 3C03FA00 */ lui $v1, 0xfa00 +/* A2F9C8 80245788 AC430000 */ sw $v1, ($v0) +/* A2F9CC 8024578C 03E00008 */ jr $ra +/* A2F9D0 80245790 AC440004 */ sw $a0, 4($v0) diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794.s deleted file mode 100644 index b97a970163..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245794 -/* A2F9D4 80245794 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A2F9D8 80245798 AFBF0010 */ sw $ra, 0x10($sp) -/* A2F9DC 8024579C 8C82000C */ lw $v0, 0xc($a0) -/* A2F9E0 802457A0 0C0B1EAF */ jal get_variable -/* A2F9E4 802457A4 8C450000 */ lw $a1, ($v0) -/* A2F9E8 802457A8 8FBF0010 */ lw $ra, 0x10($sp) -/* A2F9EC 802457AC 3C018025 */ lui $at, 0x8025 -/* A2F9F0 802457B0 AC22DCD0 */ sw $v0, -0x2330($at) -/* A2F9F4 802457B4 24020002 */ addiu $v0, $zero, 2 -/* A2F9F8 802457B8 03E00008 */ jr $ra -/* A2F9FC 802457BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794_A2F9D4.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794_A2F9D4.s new file mode 100644 index 0000000000..376bf4db74 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_80245794_A2F9D4.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245794_A2F9D4 +/* A2F9D4 80245794 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A2F9D8 80245798 AFBF0010 */ sw $ra, 0x10($sp) +/* A2F9DC 8024579C 8C82000C */ lw $v0, 0xc($a0) +/* A2F9E0 802457A0 0C0B1EAF */ jal get_variable +/* A2F9E4 802457A4 8C450000 */ lw $a1, ($v0) +/* A2F9E8 802457A8 8FBF0010 */ lw $ra, 0x10($sp) +/* A2F9EC 802457AC 3C018025 */ lui $at, 0x8025 +/* A2F9F0 802457B0 AC22DCD0 */ sw $v0, -0x2330($at) +/* A2F9F4 802457B4 24020002 */ addiu $v0, $zero, 2 +/* A2F9F8 802457B8 03E00008 */ jr $ra +/* A2F9FC 802457BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0.s deleted file mode 100644 index a6c9529618..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802457C0 -/* A2FA00 802457C0 3C06800B */ lui $a2, %hi(gCameras) -/* A2FA04 802457C4 24C61D80 */ addiu $a2, $a2, %lo(gCameras) -/* A2FA08 802457C8 10A00003 */ beqz $a1, .L802457D8 -/* A2FA0C 802457CC 00C0382D */ daddu $a3, $a2, $zero -/* A2FA10 802457D0 24020028 */ addiu $v0, $zero, 0x28 -/* A2FA14 802457D4 AC820070 */ sw $v0, 0x70($a0) -.L802457D8: -/* A2FA18 802457D8 8C820070 */ lw $v0, 0x70($a0) -/* A2FA1C 802457DC 2443FFFF */ addiu $v1, $v0, -1 -/* A2FA20 802457E0 AC830070 */ sw $v1, 0x70($a0) -/* A2FA24 802457E4 8CC50448 */ lw $a1, 0x448($a2) -/* A2FA28 802457E8 54A00005 */ bnel $a1, $zero, .L80245800 -/* A2FA2C 802457EC 24020028 */ addiu $v0, $zero, 0x28 -/* A2FA30 802457F0 8CE50444 */ lw $a1, 0x444($a3) -/* A2FA34 802457F4 10A00014 */ beqz $a1, .L80245848 -/* A2FA38 802457F8 00000000 */ nop -/* A2FA3C 802457FC 24020028 */ addiu $v0, $zero, 0x28 -.L80245800: -/* A2FA40 80245800 00431023 */ subu $v0, $v0, $v1 -/* A2FA44 80245804 44821000 */ mtc1 $v0, $f2 -/* A2FA48 80245808 00000000 */ nop -/* A2FA4C 8024580C 468010A0 */ cvt.s.w $f2, $f2 -/* A2FA50 80245810 3C018025 */ lui $at, 0x8025 -/* A2FA54 80245814 D420F280 */ ldc1 $f0, -0xd80($at) -/* A2FA58 80245818 460010A1 */ cvt.d.s $f2, $f2 -/* A2FA5C 8024581C 46201082 */ mul.d $f2, $f2, $f0 -/* A2FA60 80245820 00000000 */ nop -/* A2FA64 80245824 3C013FF0 */ lui $at, 0x3ff0 -/* A2FA68 80245828 44812800 */ mtc1 $at, $f5 -/* A2FA6C 8024582C 44802000 */ mtc1 $zero, $f4 -/* A2FA70 80245830 C4A00024 */ lwc1 $f0, 0x24($a1) -/* A2FA74 80245834 46222101 */ sub.d $f4, $f4, $f2 -/* A2FA78 80245838 46000021 */ cvt.d.s $f0, $f0 -/* A2FA7C 8024583C 46240001 */ sub.d $f0, $f0, $f4 -/* A2FA80 80245840 46200020 */ cvt.s.d $f0, $f0 -/* A2FA84 80245844 E4A00024 */ swc1 $f0, 0x24($a1) -.L80245848: -/* A2FA88 80245848 8C820070 */ lw $v0, 0x70($a0) -/* A2FA8C 8024584C 2C420001 */ sltiu $v0, $v0, 1 -/* A2FA90 80245850 03E00008 */ jr $ra -/* A2FA94 80245854 00021040 */ sll $v0, $v0, 1 -/* A2FA98 80245858 00000000 */ nop -/* A2FA9C 8024585C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s new file mode 100644 index 0000000000..7471e94016 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_05/A2EF00/func_802457C0_A2FA00.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802457C0_A2FA00 +/* A2FA00 802457C0 3C06800B */ lui $a2, %hi(gCameras) +/* A2FA04 802457C4 24C61D80 */ addiu $a2, $a2, %lo(gCameras) +/* A2FA08 802457C8 10A00003 */ beqz $a1, .L802457D8 +/* A2FA0C 802457CC 00C0382D */ daddu $a3, $a2, $zero +/* A2FA10 802457D0 24020028 */ addiu $v0, $zero, 0x28 +/* A2FA14 802457D4 AC820070 */ sw $v0, 0x70($a0) +.L802457D8: +/* A2FA18 802457D8 8C820070 */ lw $v0, 0x70($a0) +/* A2FA1C 802457DC 2443FFFF */ addiu $v1, $v0, -1 +/* A2FA20 802457E0 AC830070 */ sw $v1, 0x70($a0) +/* A2FA24 802457E4 8CC50448 */ lw $a1, 0x448($a2) +/* A2FA28 802457E8 54A00005 */ bnel $a1, $zero, .L80245800 +/* A2FA2C 802457EC 24020028 */ addiu $v0, $zero, 0x28 +/* A2FA30 802457F0 8CE50444 */ lw $a1, 0x444($a3) +/* A2FA34 802457F4 10A00014 */ beqz $a1, .L80245848 +/* A2FA38 802457F8 00000000 */ nop +/* A2FA3C 802457FC 24020028 */ addiu $v0, $zero, 0x28 +.L80245800: +/* A2FA40 80245800 00431023 */ subu $v0, $v0, $v1 +/* A2FA44 80245804 44821000 */ mtc1 $v0, $f2 +/* A2FA48 80245808 00000000 */ nop +/* A2FA4C 8024580C 468010A0 */ cvt.s.w $f2, $f2 +/* A2FA50 80245810 3C018025 */ lui $at, 0x8025 +/* A2FA54 80245814 D420F280 */ ldc1 $f0, -0xd80($at) +/* A2FA58 80245818 460010A1 */ cvt.d.s $f2, $f2 +/* A2FA5C 8024581C 46201082 */ mul.d $f2, $f2, $f0 +/* A2FA60 80245820 00000000 */ nop +/* A2FA64 80245824 3C013FF0 */ lui $at, 0x3ff0 +/* A2FA68 80245828 44812800 */ mtc1 $at, $f5 +/* A2FA6C 8024582C 44802000 */ mtc1 $zero, $f4 +/* A2FA70 80245830 C4A00024 */ lwc1 $f0, 0x24($a1) +/* A2FA74 80245834 46222101 */ sub.d $f4, $f4, $f2 +/* A2FA78 80245838 46000021 */ cvt.d.s $f0, $f0 +/* A2FA7C 8024583C 46240001 */ sub.d $f0, $f0, $f4 +/* A2FA80 80245840 46200020 */ cvt.s.d $f0, $f0 +/* A2FA84 80245844 E4A00024 */ swc1 $f0, 0x24($a1) +.L80245848: +/* A2FA88 80245848 8C820070 */ lw $v0, 0x70($a0) +/* A2FA8C 8024584C 2C420001 */ sltiu $v0, $v0, 1 +/* A2FA90 80245850 03E00008 */ jr $ra +/* A2FA94 80245854 00021040 */ sll $v0, $v0, 1 +/* A2FA98 80245858 00000000 */ nop +/* A2FA9C 8024585C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8.s deleted file mode 100644 index 4b92651858..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A8 -/* A39B88 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39B8C 802406AC AFBF0010 */ sw $ra, 0x10($sp) -/* A39B90 802406B0 8C82000C */ lw $v0, 0xc($a0) -/* A39B94 802406B4 0C0B1EAF */ jal get_variable -/* A39B98 802406B8 8C450000 */ lw $a1, ($v0) -/* A39B9C 802406BC 3C018024 */ lui $at, 0x8024 -/* A39BA0 802406C0 AC222C70 */ sw $v0, 0x2c70($at) -/* A39BA4 802406C4 24020002 */ addiu $v0, $zero, 2 -/* A39BA8 802406C8 8FBF0010 */ lw $ra, 0x10($sp) -/* A39BAC 802406CC 24030001 */ addiu $v1, $zero, 1 -/* A39BB0 802406D0 3C018024 */ lui $at, 0x8024 -/* A39BB4 802406D4 AC232C6C */ sw $v1, 0x2c6c($at) -/* A39BB8 802406D8 03E00008 */ jr $ra -/* A39BBC 802406DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s new file mode 100644 index 0000000000..335d3994ea --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802406A8_A39B88.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406A8_A39B88 +/* A39B88 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A39B8C 802406AC AFBF0010 */ sw $ra, 0x10($sp) +/* A39B90 802406B0 8C82000C */ lw $v0, 0xc($a0) +/* A39B94 802406B4 0C0B1EAF */ jal get_variable +/* A39B98 802406B8 8C450000 */ lw $a1, ($v0) +/* A39B9C 802406BC 3C018024 */ lui $at, 0x8024 +/* A39BA0 802406C0 AC222C70 */ sw $v0, 0x2c70($at) +/* A39BA4 802406C4 24020002 */ addiu $v0, $zero, 2 +/* A39BA8 802406C8 8FBF0010 */ lw $ra, 0x10($sp) +/* A39BAC 802406CC 24030001 */ addiu $v1, $zero, 1 +/* A39BB0 802406D0 3C018024 */ lui $at, 0x8024 +/* A39BB4 802406D4 AC232C6C */ sw $v1, 0x2c6c($at) +/* A39BB8 802406D8 03E00008 */ jr $ra +/* A39BBC 802406DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024077C.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024077C.s deleted file mode 100644 index 9d21977337..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024077C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024077C -/* A39C5C 8024077C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A39C60 80240780 AFB10014 */ sw $s1, 0x14($sp) -/* A39C64 80240784 0080882D */ daddu $s1, $a0, $zero -/* A39C68 80240788 AFBF0018 */ sw $ra, 0x18($sp) -/* A39C6C 8024078C AFB00010 */ sw $s0, 0x10($sp) -/* A39C70 80240790 8E30000C */ lw $s0, 0xc($s1) -/* A39C74 80240794 8E050000 */ lw $a1, ($s0) -/* A39C78 80240798 0C0B1EAF */ jal get_variable -/* A39C7C 8024079C 26100004 */ addiu $s0, $s0, 4 -/* A39C80 802407A0 AE22008C */ sw $v0, 0x8c($s1) -/* A39C84 802407A4 8E050000 */ lw $a1, ($s0) -/* A39C88 802407A8 26100004 */ addiu $s0, $s0, 4 -/* A39C8C 802407AC 0C0B1EAF */ jal get_variable -/* A39C90 802407B0 0220202D */ daddu $a0, $s1, $zero -/* A39C94 802407B4 AE220090 */ sw $v0, 0x90($s1) -/* A39C98 802407B8 8E050000 */ lw $a1, ($s0) -/* A39C9C 802407BC 26100004 */ addiu $s0, $s0, 4 -/* A39CA0 802407C0 0C0B1EAF */ jal get_variable -/* A39CA4 802407C4 0220202D */ daddu $a0, $s1, $zero -/* A39CA8 802407C8 AE220094 */ sw $v0, 0x94($s1) -/* A39CAC 802407CC 8E050000 */ lw $a1, ($s0) -/* A39CB0 802407D0 26100004 */ addiu $s0, $s0, 4 -/* A39CB4 802407D4 0C0B1EAF */ jal get_variable -/* A39CB8 802407D8 0220202D */ daddu $a0, $s1, $zero -/* A39CBC 802407DC AE220098 */ sw $v0, 0x98($s1) -/* A39CC0 802407E0 8E050000 */ lw $a1, ($s0) -/* A39CC4 802407E4 26100004 */ addiu $s0, $s0, 4 -/* A39CC8 802407E8 0C0B1EAF */ jal get_variable -/* A39CCC 802407EC 0220202D */ daddu $a0, $s1, $zero -/* A39CD0 802407F0 AE22009C */ sw $v0, 0x9c($s1) -/* A39CD4 802407F4 8E050000 */ lw $a1, ($s0) -/* A39CD8 802407F8 26100004 */ addiu $s0, $s0, 4 -/* A39CDC 802407FC 0C0B1EAF */ jal get_variable -/* A39CE0 80240800 0220202D */ daddu $a0, $s1, $zero -/* A39CE4 80240804 AE2200A0 */ sw $v0, 0xa0($s1) -/* A39CE8 80240808 8E050000 */ lw $a1, ($s0) -/* A39CEC 8024080C 26100004 */ addiu $s0, $s0, 4 -/* A39CF0 80240810 0C0B1EAF */ jal get_variable -/* A39CF4 80240814 0220202D */ daddu $a0, $s1, $zero -/* A39CF8 80240818 AE2200A4 */ sw $v0, 0xa4($s1) -/* A39CFC 8024081C 8E050000 */ lw $a1, ($s0) -/* A39D00 80240820 26100004 */ addiu $s0, $s0, 4 -/* A39D04 80240824 0C0B1EAF */ jal get_variable -/* A39D08 80240828 0220202D */ daddu $a0, $s1, $zero -/* A39D0C 8024082C AE2200A8 */ sw $v0, 0xa8($s1) -/* A39D10 80240830 8E050000 */ lw $a1, ($s0) -/* A39D14 80240834 26100004 */ addiu $s0, $s0, 4 -/* A39D18 80240838 0C0B1EAF */ jal get_variable -/* A39D1C 8024083C 0220202D */ daddu $a0, $s1, $zero -/* A39D20 80240840 AE2200AC */ sw $v0, 0xac($s1) -/* A39D24 80240844 8E050000 */ lw $a1, ($s0) -/* A39D28 80240848 0C0B1EAF */ jal get_variable -/* A39D2C 8024084C 0220202D */ daddu $a0, $s1, $zero -/* A39D30 80240850 AE2200B0 */ sw $v0, 0xb0($s1) -/* A39D34 80240854 8FBF0018 */ lw $ra, 0x18($sp) -/* A39D38 80240858 8FB10014 */ lw $s1, 0x14($sp) -/* A39D3C 8024085C 8FB00010 */ lw $s0, 0x10($sp) -/* A39D40 80240860 24020002 */ addiu $v0, $zero, 2 -/* A39D44 80240864 03E00008 */ jr $ra -/* A39D48 80240868 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024077C_A39C5C.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024077C_A39C5C.s new file mode 100644 index 0000000000..4409ca1ff0 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024077C_A39C5C.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024077C_A39C5C +/* A39C5C 8024077C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A39C60 80240780 AFB10014 */ sw $s1, 0x14($sp) +/* A39C64 80240784 0080882D */ daddu $s1, $a0, $zero +/* A39C68 80240788 AFBF0018 */ sw $ra, 0x18($sp) +/* A39C6C 8024078C AFB00010 */ sw $s0, 0x10($sp) +/* A39C70 80240790 8E30000C */ lw $s0, 0xc($s1) +/* A39C74 80240794 8E050000 */ lw $a1, ($s0) +/* A39C78 80240798 0C0B1EAF */ jal get_variable +/* A39C7C 8024079C 26100004 */ addiu $s0, $s0, 4 +/* A39C80 802407A0 AE22008C */ sw $v0, 0x8c($s1) +/* A39C84 802407A4 8E050000 */ lw $a1, ($s0) +/* A39C88 802407A8 26100004 */ addiu $s0, $s0, 4 +/* A39C8C 802407AC 0C0B1EAF */ jal get_variable +/* A39C90 802407B0 0220202D */ daddu $a0, $s1, $zero +/* A39C94 802407B4 AE220090 */ sw $v0, 0x90($s1) +/* A39C98 802407B8 8E050000 */ lw $a1, ($s0) +/* A39C9C 802407BC 26100004 */ addiu $s0, $s0, 4 +/* A39CA0 802407C0 0C0B1EAF */ jal get_variable +/* A39CA4 802407C4 0220202D */ daddu $a0, $s1, $zero +/* A39CA8 802407C8 AE220094 */ sw $v0, 0x94($s1) +/* A39CAC 802407CC 8E050000 */ lw $a1, ($s0) +/* A39CB0 802407D0 26100004 */ addiu $s0, $s0, 4 +/* A39CB4 802407D4 0C0B1EAF */ jal get_variable +/* A39CB8 802407D8 0220202D */ daddu $a0, $s1, $zero +/* A39CBC 802407DC AE220098 */ sw $v0, 0x98($s1) +/* A39CC0 802407E0 8E050000 */ lw $a1, ($s0) +/* A39CC4 802407E4 26100004 */ addiu $s0, $s0, 4 +/* A39CC8 802407E8 0C0B1EAF */ jal get_variable +/* A39CCC 802407EC 0220202D */ daddu $a0, $s1, $zero +/* A39CD0 802407F0 AE22009C */ sw $v0, 0x9c($s1) +/* A39CD4 802407F4 8E050000 */ lw $a1, ($s0) +/* A39CD8 802407F8 26100004 */ addiu $s0, $s0, 4 +/* A39CDC 802407FC 0C0B1EAF */ jal get_variable +/* A39CE0 80240800 0220202D */ daddu $a0, $s1, $zero +/* A39CE4 80240804 AE2200A0 */ sw $v0, 0xa0($s1) +/* A39CE8 80240808 8E050000 */ lw $a1, ($s0) +/* A39CEC 8024080C 26100004 */ addiu $s0, $s0, 4 +/* A39CF0 80240810 0C0B1EAF */ jal get_variable +/* A39CF4 80240814 0220202D */ daddu $a0, $s1, $zero +/* A39CF8 80240818 AE2200A4 */ sw $v0, 0xa4($s1) +/* A39CFC 8024081C 8E050000 */ lw $a1, ($s0) +/* A39D00 80240820 26100004 */ addiu $s0, $s0, 4 +/* A39D04 80240824 0C0B1EAF */ jal get_variable +/* A39D08 80240828 0220202D */ daddu $a0, $s1, $zero +/* A39D0C 8024082C AE2200A8 */ sw $v0, 0xa8($s1) +/* A39D10 80240830 8E050000 */ lw $a1, ($s0) +/* A39D14 80240834 26100004 */ addiu $s0, $s0, 4 +/* A39D18 80240838 0C0B1EAF */ jal get_variable +/* A39D1C 8024083C 0220202D */ daddu $a0, $s1, $zero +/* A39D20 80240840 AE2200AC */ sw $v0, 0xac($s1) +/* A39D24 80240844 8E050000 */ lw $a1, ($s0) +/* A39D28 80240848 0C0B1EAF */ jal get_variable +/* A39D2C 8024084C 0220202D */ daddu $a0, $s1, $zero +/* A39D30 80240850 AE2200B0 */ sw $v0, 0xb0($s1) +/* A39D34 80240854 8FBF0018 */ lw $ra, 0x18($sp) +/* A39D38 80240858 8FB10014 */ lw $s1, 0x14($sp) +/* A39D3C 8024085C 8FB00010 */ lw $s0, 0x10($sp) +/* A39D40 80240860 24020002 */ addiu $v0, $zero, 2 +/* A39D44 80240864 03E00008 */ jr $ra +/* A39D48 80240868 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C.s deleted file mode 100644 index 38f352cafa..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024086C -/* A39D4C 8024086C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A39D50 80240870 AFB1001C */ sw $s1, 0x1c($sp) -/* A39D54 80240874 0080882D */ daddu $s1, $a0, $zero -/* A39D58 80240878 AFBF0034 */ sw $ra, 0x34($sp) -/* A39D5C 8024087C AFB60030 */ sw $s6, 0x30($sp) -/* A39D60 80240880 AFB5002C */ sw $s5, 0x2c($sp) -/* A39D64 80240884 AFB40028 */ sw $s4, 0x28($sp) -/* A39D68 80240888 AFB30024 */ sw $s3, 0x24($sp) -/* A39D6C 8024088C AFB20020 */ sw $s2, 0x20($sp) -/* A39D70 80240890 AFB00018 */ sw $s0, 0x18($sp) -/* A39D74 80240894 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A39D78 80240898 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A39D7C 8024089C 8E30000C */ lw $s0, 0xc($s1) -/* A39D80 802408A0 8E160000 */ lw $s6, ($s0) -/* A39D84 802408A4 26100004 */ addiu $s0, $s0, 4 -/* A39D88 802408A8 0C0B1EAF */ jal get_variable -/* A39D8C 802408AC 02C0282D */ daddu $a1, $s6, $zero -/* A39D90 802408B0 44820000 */ mtc1 $v0, $f0 -/* A39D94 802408B4 00000000 */ nop -/* A39D98 802408B8 46800020 */ cvt.s.w $f0, $f0 -/* A39D9C 802408BC E7A00010 */ swc1 $f0, 0x10($sp) -/* A39DA0 802408C0 8E140000 */ lw $s4, ($s0) -/* A39DA4 802408C4 26100004 */ addiu $s0, $s0, 4 -/* A39DA8 802408C8 0220202D */ daddu $a0, $s1, $zero -/* A39DAC 802408CC 0C0B1EAF */ jal get_variable -/* A39DB0 802408D0 0280282D */ daddu $a1, $s4, $zero -/* A39DB4 802408D4 0220202D */ daddu $a0, $s1, $zero -/* A39DB8 802408D8 8E150000 */ lw $s5, ($s0) -/* A39DBC 802408DC 4482B000 */ mtc1 $v0, $f22 -/* A39DC0 802408E0 00000000 */ nop -/* A39DC4 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* A39DC8 802408E8 0C0B1EAF */ jal get_variable -/* A39DCC 802408EC 02A0282D */ daddu $a1, $s5, $zero -/* A39DD0 802408F0 2404FFFC */ addiu $a0, $zero, -4 -/* A39DD4 802408F4 44820000 */ mtc1 $v0, $f0 -/* A39DD8 802408F8 00000000 */ nop -/* A39DDC 802408FC 46800020 */ cvt.s.w $f0, $f0 -/* A39DE0 80240900 0C00EABB */ jal get_npc_unsafe -/* A39DE4 80240904 E7A00014 */ swc1 $f0, 0x14($sp) -/* A39DE8 80240908 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* A39DEC 8024090C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* A39DF0 80240910 3C014334 */ lui $at, 0x4334 -/* A39DF4 80240914 44816000 */ mtc1 $at, $f12 -/* A39DF8 80240918 00041880 */ sll $v1, $a0, 2 -/* A39DFC 8024091C 00641821 */ addu $v1, $v1, $a0 -/* A39E00 80240920 00031880 */ sll $v1, $v1, 2 -/* A39E04 80240924 00641823 */ subu $v1, $v1, $a0 -/* A39E08 80240928 000320C0 */ sll $a0, $v1, 3 -/* A39E0C 8024092C 00641821 */ addu $v1, $v1, $a0 -/* A39E10 80240930 000318C0 */ sll $v1, $v1, 3 -/* A39E14 80240934 3C01800B */ lui $at, 0x800b -/* A39E18 80240938 00230821 */ addu $at, $at, $v1 -/* A39E1C 8024093C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A39E20 80240940 460C0300 */ add.s $f12, $f0, $f12 -/* A39E24 80240944 0C00A6C9 */ jal clamp_angle -/* A39E28 80240948 0040982D */ daddu $s3, $v0, $zero -/* A39E2C 8024094C 27B00010 */ addiu $s0, $sp, 0x10 -/* A39E30 80240950 0200202D */ daddu $a0, $s0, $zero -/* A39E34 80240954 27B20014 */ addiu $s2, $sp, 0x14 -/* A39E38 80240958 0240282D */ daddu $a1, $s2, $zero -/* A39E3C 8024095C 3C064170 */ lui $a2, 0x4170 -/* A39E40 80240960 8E67000C */ lw $a3, 0xc($s3) -/* A39E44 80240964 0C00A7E7 */ jal add_vec2D_polar -/* A39E48 80240968 46000506 */ mov.s $f20, $f0 -/* A39E4C 8024096C 0200202D */ daddu $a0, $s0, $zero -/* A39E50 80240970 3C064120 */ lui $a2, 0x4120 -/* A39E54 80240974 4407A000 */ mfc1 $a3, $f20 -/* A39E58 80240978 0C00A7E7 */ jal add_vec2D_polar -/* A39E5C 8024097C 0240282D */ daddu $a1, $s2, $zero -/* A39E60 80240980 0220202D */ daddu $a0, $s1, $zero -/* A39E64 80240984 C7A00010 */ lwc1 $f0, 0x10($sp) -/* A39E68 80240988 4600008D */ trunc.w.s $f2, $f0 -/* A39E6C 8024098C 44061000 */ mfc1 $a2, $f2 -/* A39E70 80240990 0C0B2026 */ jal set_variable -/* A39E74 80240994 02C0282D */ daddu $a1, $s6, $zero -/* A39E78 80240998 0220202D */ daddu $a0, $s1, $zero -/* A39E7C 8024099C 4600B08D */ trunc.w.s $f2, $f22 -/* A39E80 802409A0 44061000 */ mfc1 $a2, $f2 -/* A39E84 802409A4 0C0B2026 */ jal set_variable -/* A39E88 802409A8 0280282D */ daddu $a1, $s4, $zero -/* A39E8C 802409AC 0220202D */ daddu $a0, $s1, $zero -/* A39E90 802409B0 C7A00014 */ lwc1 $f0, 0x14($sp) -/* A39E94 802409B4 4600008D */ trunc.w.s $f2, $f0 -/* A39E98 802409B8 44061000 */ mfc1 $a2, $f2 -/* A39E9C 802409BC 0C0B2026 */ jal set_variable -/* A39EA0 802409C0 02A0282D */ daddu $a1, $s5, $zero -/* A39EA4 802409C4 8FBF0034 */ lw $ra, 0x34($sp) -/* A39EA8 802409C8 8FB60030 */ lw $s6, 0x30($sp) -/* A39EAC 802409CC 8FB5002C */ lw $s5, 0x2c($sp) -/* A39EB0 802409D0 8FB40028 */ lw $s4, 0x28($sp) -/* A39EB4 802409D4 8FB30024 */ lw $s3, 0x24($sp) -/* A39EB8 802409D8 8FB20020 */ lw $s2, 0x20($sp) -/* A39EBC 802409DC 8FB1001C */ lw $s1, 0x1c($sp) -/* A39EC0 802409E0 8FB00018 */ lw $s0, 0x18($sp) -/* A39EC4 802409E4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* A39EC8 802409E8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A39ECC 802409EC 24020002 */ addiu $v0, $zero, 2 -/* A39ED0 802409F0 03E00008 */ jr $ra -/* A39ED4 802409F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C_A39D4C.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C_A39D4C.s new file mode 100644 index 0000000000..15efd455a9 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_8024086C_A39D4C.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024086C_A39D4C +/* A39D4C 8024086C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A39D50 80240870 AFB1001C */ sw $s1, 0x1c($sp) +/* A39D54 80240874 0080882D */ daddu $s1, $a0, $zero +/* A39D58 80240878 AFBF0034 */ sw $ra, 0x34($sp) +/* A39D5C 8024087C AFB60030 */ sw $s6, 0x30($sp) +/* A39D60 80240880 AFB5002C */ sw $s5, 0x2c($sp) +/* A39D64 80240884 AFB40028 */ sw $s4, 0x28($sp) +/* A39D68 80240888 AFB30024 */ sw $s3, 0x24($sp) +/* A39D6C 8024088C AFB20020 */ sw $s2, 0x20($sp) +/* A39D70 80240890 AFB00018 */ sw $s0, 0x18($sp) +/* A39D74 80240894 F7B60040 */ sdc1 $f22, 0x40($sp) +/* A39D78 80240898 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A39D7C 8024089C 8E30000C */ lw $s0, 0xc($s1) +/* A39D80 802408A0 8E160000 */ lw $s6, ($s0) +/* A39D84 802408A4 26100004 */ addiu $s0, $s0, 4 +/* A39D88 802408A8 0C0B1EAF */ jal get_variable +/* A39D8C 802408AC 02C0282D */ daddu $a1, $s6, $zero +/* A39D90 802408B0 44820000 */ mtc1 $v0, $f0 +/* A39D94 802408B4 00000000 */ nop +/* A39D98 802408B8 46800020 */ cvt.s.w $f0, $f0 +/* A39D9C 802408BC E7A00010 */ swc1 $f0, 0x10($sp) +/* A39DA0 802408C0 8E140000 */ lw $s4, ($s0) +/* A39DA4 802408C4 26100004 */ addiu $s0, $s0, 4 +/* A39DA8 802408C8 0220202D */ daddu $a0, $s1, $zero +/* A39DAC 802408CC 0C0B1EAF */ jal get_variable +/* A39DB0 802408D0 0280282D */ daddu $a1, $s4, $zero +/* A39DB4 802408D4 0220202D */ daddu $a0, $s1, $zero +/* A39DB8 802408D8 8E150000 */ lw $s5, ($s0) +/* A39DBC 802408DC 4482B000 */ mtc1 $v0, $f22 +/* A39DC0 802408E0 00000000 */ nop +/* A39DC4 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 +/* A39DC8 802408E8 0C0B1EAF */ jal get_variable +/* A39DCC 802408EC 02A0282D */ daddu $a1, $s5, $zero +/* A39DD0 802408F0 2404FFFC */ addiu $a0, $zero, -4 +/* A39DD4 802408F4 44820000 */ mtc1 $v0, $f0 +/* A39DD8 802408F8 00000000 */ nop +/* A39DDC 802408FC 46800020 */ cvt.s.w $f0, $f0 +/* A39DE0 80240900 0C00EABB */ jal get_npc_unsafe +/* A39DE4 80240904 E7A00014 */ swc1 $f0, 0x14($sp) +/* A39DE8 80240908 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* A39DEC 8024090C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* A39DF0 80240910 3C014334 */ lui $at, 0x4334 +/* A39DF4 80240914 44816000 */ mtc1 $at, $f12 +/* A39DF8 80240918 00041880 */ sll $v1, $a0, 2 +/* A39DFC 8024091C 00641821 */ addu $v1, $v1, $a0 +/* A39E00 80240920 00031880 */ sll $v1, $v1, 2 +/* A39E04 80240924 00641823 */ subu $v1, $v1, $a0 +/* A39E08 80240928 000320C0 */ sll $a0, $v1, 3 +/* A39E0C 8024092C 00641821 */ addu $v1, $v1, $a0 +/* A39E10 80240930 000318C0 */ sll $v1, $v1, 3 +/* A39E14 80240934 3C01800B */ lui $at, 0x800b +/* A39E18 80240938 00230821 */ addu $at, $at, $v1 +/* A39E1C 8024093C C4201DEC */ lwc1 $f0, 0x1dec($at) +/* A39E20 80240940 460C0300 */ add.s $f12, $f0, $f12 +/* A39E24 80240944 0C00A6C9 */ jal clamp_angle +/* A39E28 80240948 0040982D */ daddu $s3, $v0, $zero +/* A39E2C 8024094C 27B00010 */ addiu $s0, $sp, 0x10 +/* A39E30 80240950 0200202D */ daddu $a0, $s0, $zero +/* A39E34 80240954 27B20014 */ addiu $s2, $sp, 0x14 +/* A39E38 80240958 0240282D */ daddu $a1, $s2, $zero +/* A39E3C 8024095C 3C064170 */ lui $a2, 0x4170 +/* A39E40 80240960 8E67000C */ lw $a3, 0xc($s3) +/* A39E44 80240964 0C00A7E7 */ jal add_vec2D_polar +/* A39E48 80240968 46000506 */ mov.s $f20, $f0 +/* A39E4C 8024096C 0200202D */ daddu $a0, $s0, $zero +/* A39E50 80240970 3C064120 */ lui $a2, 0x4120 +/* A39E54 80240974 4407A000 */ mfc1 $a3, $f20 +/* A39E58 80240978 0C00A7E7 */ jal add_vec2D_polar +/* A39E5C 8024097C 0240282D */ daddu $a1, $s2, $zero +/* A39E60 80240980 0220202D */ daddu $a0, $s1, $zero +/* A39E64 80240984 C7A00010 */ lwc1 $f0, 0x10($sp) +/* A39E68 80240988 4600008D */ trunc.w.s $f2, $f0 +/* A39E6C 8024098C 44061000 */ mfc1 $a2, $f2 +/* A39E70 80240990 0C0B2026 */ jal set_variable +/* A39E74 80240994 02C0282D */ daddu $a1, $s6, $zero +/* A39E78 80240998 0220202D */ daddu $a0, $s1, $zero +/* A39E7C 8024099C 4600B08D */ trunc.w.s $f2, $f22 +/* A39E80 802409A0 44061000 */ mfc1 $a2, $f2 +/* A39E84 802409A4 0C0B2026 */ jal set_variable +/* A39E88 802409A8 0280282D */ daddu $a1, $s4, $zero +/* A39E8C 802409AC 0220202D */ daddu $a0, $s1, $zero +/* A39E90 802409B0 C7A00014 */ lwc1 $f0, 0x14($sp) +/* A39E94 802409B4 4600008D */ trunc.w.s $f2, $f0 +/* A39E98 802409B8 44061000 */ mfc1 $a2, $f2 +/* A39E9C 802409BC 0C0B2026 */ jal set_variable +/* A39EA0 802409C0 02A0282D */ daddu $a1, $s5, $zero +/* A39EA4 802409C4 8FBF0034 */ lw $ra, 0x34($sp) +/* A39EA8 802409C8 8FB60030 */ lw $s6, 0x30($sp) +/* A39EAC 802409CC 8FB5002C */ lw $s5, 0x2c($sp) +/* A39EB0 802409D0 8FB40028 */ lw $s4, 0x28($sp) +/* A39EB4 802409D4 8FB30024 */ lw $s3, 0x24($sp) +/* A39EB8 802409D8 8FB20020 */ lw $s2, 0x20($sp) +/* A39EBC 802409DC 8FB1001C */ lw $s1, 0x1c($sp) +/* A39EC0 802409E0 8FB00018 */ lw $s0, 0x18($sp) +/* A39EC4 802409E4 D7B60040 */ ldc1 $f22, 0x40($sp) +/* A39EC8 802409E8 D7B40038 */ ldc1 $f20, 0x38($sp) +/* A39ECC 802409EC 24020002 */ addiu $v0, $zero, 2 +/* A39ED0 802409F0 03E00008 */ jr $ra +/* A39ED4 802409F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8.s deleted file mode 100644 index 0bdfedd421..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F8 -/* A39ED8 802409F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39EDC 802409FC AFB00010 */ sw $s0, 0x10($sp) -/* A39EE0 80240A00 0080802D */ daddu $s0, $a0, $zero -/* A39EE4 80240A04 AFBF0014 */ sw $ra, 0x14($sp) -/* A39EE8 80240A08 0C00EABB */ jal get_npc_unsafe -/* A39EEC 80240A0C 8E04008C */ lw $a0, 0x8c($s0) -/* A39EF0 80240A10 0040282D */ daddu $a1, $v0, $zero -/* A39EF4 80240A14 8E040094 */ lw $a0, 0x94($s0) -/* A39EF8 80240A18 8CA30028 */ lw $v1, 0x28($a1) -/* A39EFC 80240A1C ACA40028 */ sw $a0, 0x28($a1) -/* A39F00 80240A20 8FBF0014 */ lw $ra, 0x14($sp) -/* A39F04 80240A24 8FB00010 */ lw $s0, 0x10($sp) -/* A39F08 80240A28 24020002 */ addiu $v0, $zero, 2 -/* A39F0C 80240A2C 3C018024 */ lui $at, 0x8024 -/* A39F10 80240A30 AC236424 */ sw $v1, 0x6424($at) -/* A39F14 80240A34 03E00008 */ jr $ra -/* A39F18 80240A38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s new file mode 100644 index 0000000000..7f9a5a5940 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_802409F8_A39ED8.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409F8_A39ED8 +/* A39ED8 802409F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A39EDC 802409FC AFB00010 */ sw $s0, 0x10($sp) +/* A39EE0 80240A00 0080802D */ daddu $s0, $a0, $zero +/* A39EE4 80240A04 AFBF0014 */ sw $ra, 0x14($sp) +/* A39EE8 80240A08 0C00EABB */ jal get_npc_unsafe +/* A39EEC 80240A0C 8E04008C */ lw $a0, 0x8c($s0) +/* A39EF0 80240A10 0040282D */ daddu $a1, $v0, $zero +/* A39EF4 80240A14 8E040094 */ lw $a0, 0x94($s0) +/* A39EF8 80240A18 8CA30028 */ lw $v1, 0x28($a1) +/* A39EFC 80240A1C ACA40028 */ sw $a0, 0x28($a1) +/* A39F00 80240A20 8FBF0014 */ lw $ra, 0x14($sp) +/* A39F04 80240A24 8FB00010 */ lw $s0, 0x10($sp) +/* A39F08 80240A28 24020002 */ addiu $v0, $zero, 2 +/* A39F0C 80240A2C 3C018024 */ lui $at, 0x8024 +/* A39F10 80240A30 AC236424 */ sw $v1, 0x6424($at) +/* A39F14 80240A34 03E00008 */ jr $ra +/* A39F18 80240A38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C.s deleted file mode 100644 index aa54ae55c1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A3C -/* A39F1C 80240A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39F20 80240A40 AFBF0010 */ sw $ra, 0x10($sp) -/* A39F24 80240A44 0C00EABB */ jal get_npc_unsafe -/* A39F28 80240A48 8C84008C */ lw $a0, 0x8c($a0) -/* A39F2C 80240A4C 3C038024 */ lui $v1, 0x8024 -/* A39F30 80240A50 8C636424 */ lw $v1, 0x6424($v1) -/* A39F34 80240A54 AC430028 */ sw $v1, 0x28($v0) -/* A39F38 80240A58 8FBF0010 */ lw $ra, 0x10($sp) -/* A39F3C 80240A5C 24020002 */ addiu $v0, $zero, 2 -/* A39F40 80240A60 03E00008 */ jr $ra -/* A39F44 80240A64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s new file mode 100644 index 0000000000..3a6300e8cc --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A3C_A39F1C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A3C_A39F1C +/* A39F1C 80240A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A39F20 80240A40 AFBF0010 */ sw $ra, 0x10($sp) +/* A39F24 80240A44 0C00EABB */ jal get_npc_unsafe +/* A39F28 80240A48 8C84008C */ lw $a0, 0x8c($a0) +/* A39F2C 80240A4C 3C038024 */ lui $v1, 0x8024 +/* A39F30 80240A50 8C636424 */ lw $v1, 0x6424($v1) +/* A39F34 80240A54 AC430028 */ sw $v1, 0x28($v0) +/* A39F38 80240A58 8FBF0010 */ lw $ra, 0x10($sp) +/* A39F3C 80240A5C 24020002 */ addiu $v0, $zero, 2 +/* A39F40 80240A60 03E00008 */ jr $ra +/* A39F44 80240A64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68.s deleted file mode 100644 index 63e31ed405..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A68 -/* A39F48 80240A68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39F4C 80240A6C AFBF0010 */ sw $ra, 0x10($sp) -/* A39F50 80240A70 8C82000C */ lw $v0, 0xc($a0) -/* A39F54 80240A74 3C068011 */ lui $a2, 0x8011 -/* A39F58 80240A78 90C6F29F */ lbu $a2, -0xd61($a2) -/* A39F5C 80240A7C 0C0B2026 */ jal set_variable -/* A39F60 80240A80 8C450000 */ lw $a1, ($v0) -/* A39F64 80240A84 8FBF0010 */ lw $ra, 0x10($sp) -/* A39F68 80240A88 24020002 */ addiu $v0, $zero, 2 -/* A39F6C 80240A8C 03E00008 */ jr $ra -/* A39F70 80240A90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s new file mode 100644 index 0000000000..08a17c7972 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A68_A39F48 +/* A39F48 80240A68 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A39F4C 80240A6C AFBF0010 */ sw $ra, 0x10($sp) +/* A39F50 80240A70 8C82000C */ lw $v0, 0xc($a0) +/* A39F54 80240A74 3C068011 */ lui $a2, 0x8011 +/* A39F58 80240A78 90C6F29F */ lbu $a2, -0xd61($a2) +/* A39F5C 80240A7C 0C0B2026 */ jal set_variable +/* A39F60 80240A80 8C450000 */ lw $a1, ($v0) +/* A39F64 80240A84 8FBF0010 */ lw $ra, 0x10($sp) +/* A39F68 80240A88 24020002 */ addiu $v0, $zero, 2 +/* A39F6C 80240A8C 03E00008 */ jr $ra +/* A39F70 80240A90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94.s deleted file mode 100644 index 8213f90393..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A94 -/* A39F74 80240A94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A39F78 80240A98 AFBF0010 */ sw $ra, 0x10($sp) -/* A39F7C 80240A9C 8C82000C */ lw $v0, 0xc($a0) -/* A39F80 80240AA0 0C0B1EAF */ jal get_variable -/* A39F84 80240AA4 8C450000 */ lw $a1, ($v0) -/* A39F88 80240AA8 3C05F840 */ lui $a1, 0xf840 -/* A39F8C 80240AAC 34A5626B */ ori $a1, $a1, 0x626b -/* A39F90 80240AB0 0000202D */ daddu $a0, $zero, $zero -/* A39F94 80240AB4 00452821 */ addu $a1, $v0, $a1 -/* A39F98 80240AB8 0C0B2026 */ jal set_variable -/* A39F9C 80240ABC 24060001 */ addiu $a2, $zero, 1 -/* A39FA0 80240AC0 8FBF0010 */ lw $ra, 0x10($sp) -/* A39FA4 80240AC4 24020002 */ addiu $v0, $zero, 2 -/* A39FA8 80240AC8 03E00008 */ jr $ra -/* A39FAC 80240ACC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94_A39F74.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94_A39F74.s new file mode 100644 index 0000000000..6dff15c745 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A94_A39F74.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A94_A39F74 +/* A39F74 80240A94 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A39F78 80240A98 AFBF0010 */ sw $ra, 0x10($sp) +/* A39F7C 80240A9C 8C82000C */ lw $v0, 0xc($a0) +/* A39F80 80240AA0 0C0B1EAF */ jal get_variable +/* A39F84 80240AA4 8C450000 */ lw $a1, ($v0) +/* A39F88 80240AA8 3C05F840 */ lui $a1, 0xf840 +/* A39F8C 80240AAC 34A5626B */ ori $a1, $a1, 0x626b +/* A39F90 80240AB0 0000202D */ daddu $a0, $zero, $zero +/* A39F94 80240AB4 00452821 */ addu $a1, $v0, $a1 +/* A39F98 80240AB8 0C0B2026 */ jal set_variable +/* A39F9C 80240ABC 24060001 */ addiu $a2, $zero, 1 +/* A39FA0 80240AC0 8FBF0010 */ lw $ra, 0x10($sp) +/* A39FA4 80240AC4 24020002 */ addiu $v0, $zero, 2 +/* A39FA8 80240AC8 03E00008 */ jr $ra +/* A39FAC 80240ACC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C.s deleted file mode 100644 index 579d27d0f5..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F7C -/* A3A45C 80240F7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3A460 80240F80 AFBF0010 */ sw $ra, 0x10($sp) -/* A3A464 80240F84 10A00003 */ beqz $a1, .L80240F94 -/* A3A468 80240F88 8C86000C */ lw $a2, 0xc($a0) -/* A3A46C 80240F8C 3C018024 */ lui $at, 0x8024 -/* A3A470 80240F90 AC2045D0 */ sw $zero, 0x45d0($at) -.L80240F94: -/* A3A474 80240F94 3C038024 */ lui $v1, 0x8024 -/* A3A478 80240F98 246345D0 */ addiu $v1, $v1, 0x45d0 -/* A3A47C 80240F9C 8C620000 */ lw $v0, ($v1) -/* A3A480 80240FA0 54400003 */ bnel $v0, $zero, .L80240FB0 -/* A3A484 80240FA4 AC600000 */ sw $zero, ($v1) -/* A3A488 80240FA8 080903F1 */ j .L80240FC4 -/* A3A48C 80240FAC 0000102D */ daddu $v0, $zero, $zero -.L80240FB0: -/* A3A490 80240FB0 8CC50000 */ lw $a1, ($a2) -/* A3A494 80240FB4 3C068024 */ lui $a2, 0x8024 -/* A3A498 80240FB8 0C0B2026 */ jal set_variable -/* A3A49C 80240FBC 8CC645D4 */ lw $a2, 0x45d4($a2) -/* A3A4A0 80240FC0 24020002 */ addiu $v0, $zero, 2 -.L80240FC4: -/* A3A4A4 80240FC4 8FBF0010 */ lw $ra, 0x10($sp) -/* A3A4A8 80240FC8 03E00008 */ jr $ra -/* A3A4AC 80240FCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s new file mode 100644 index 0000000000..ee559458f3 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80240F7C_A3A45C.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F7C_A3A45C +/* A3A45C 80240F7C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3A460 80240F80 AFBF0010 */ sw $ra, 0x10($sp) +/* A3A464 80240F84 10A00003 */ beqz $a1, .L80240F94 +/* A3A468 80240F88 8C86000C */ lw $a2, 0xc($a0) +/* A3A46C 80240F8C 3C018024 */ lui $at, 0x8024 +/* A3A470 80240F90 AC2045D0 */ sw $zero, 0x45d0($at) +.L80240F94: +/* A3A474 80240F94 3C038024 */ lui $v1, 0x8024 +/* A3A478 80240F98 246345D0 */ addiu $v1, $v1, 0x45d0 +/* A3A47C 80240F9C 8C620000 */ lw $v0, ($v1) +/* A3A480 80240FA0 54400003 */ bnel $v0, $zero, .L80240FB0 +/* A3A484 80240FA4 AC600000 */ sw $zero, ($v1) +/* A3A488 80240FA8 080903F1 */ j .L80240FC4 +/* A3A48C 80240FAC 0000102D */ daddu $v0, $zero, $zero +.L80240FB0: +/* A3A490 80240FB0 8CC50000 */ lw $a1, ($a2) +/* A3A494 80240FB4 3C068024 */ lui $a2, 0x8024 +/* A3A498 80240FB8 0C0B2026 */ jal set_variable +/* A3A49C 80240FBC 8CC645D4 */ lw $a2, 0x45d4($a2) +/* A3A4A0 80240FC0 24020002 */ addiu $v0, $zero, 2 +.L80240FC4: +/* A3A4A4 80240FC4 8FBF0010 */ lw $ra, 0x10($sp) +/* A3A4A8 80240FC8 03E00008 */ jr $ra +/* A3A4AC 80240FCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008.s deleted file mode 100644 index 31e5ffb863..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241008 -/* A3A4E8 80241008 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3A4EC 8024100C AFBF0010 */ sw $ra, 0x10($sp) -/* A3A4F0 80241010 8C82000C */ lw $v0, 0xc($a0) -/* A3A4F4 80241014 0C0B1EAF */ jal get_variable -/* A3A4F8 80241018 8C450000 */ lw $a1, ($v0) -/* A3A4FC 8024101C 0040182D */ daddu $v1, $v0, $zero -/* A3A500 80241020 10600012 */ beqz $v1, .L8024106C -/* A3A504 80241024 0000202D */ daddu $a0, $zero, $zero -/* A3A508 80241028 8C620000 */ lw $v0, ($v1) -/* A3A50C 8024102C 5040000A */ beql $v0, $zero, .L80241058 -/* A3A510 80241030 00041080 */ sll $v0, $a0, 2 -/* A3A514 80241034 3C058024 */ lui $a1, 0x8024 -/* A3A518 80241038 24A56430 */ addiu $a1, $a1, 0x6430 -.L8024103C: -/* A3A51C 8024103C 24630004 */ addiu $v1, $v1, 4 -/* A3A520 80241040 24840001 */ addiu $a0, $a0, 1 -/* A3A524 80241044 ACA20000 */ sw $v0, ($a1) -/* A3A528 80241048 8C620000 */ lw $v0, ($v1) -/* A3A52C 8024104C 1440FFFB */ bnez $v0, .L8024103C -/* A3A530 80241050 24A50004 */ addiu $a1, $a1, 4 -/* A3A534 80241054 00041080 */ sll $v0, $a0, 2 -.L80241058: -/* A3A538 80241058 3C018024 */ lui $at, 0x8024 -/* A3A53C 8024105C 00220821 */ addu $at, $at, $v0 -/* A3A540 80241060 AC206430 */ sw $zero, 0x6430($at) -/* A3A544 80241064 08090425 */ j .L80241094 -/* A3A548 80241068 00000000 */ nop -.L8024106C: -/* A3A54C 8024106C 3C038024 */ lui $v1, 0x8024 -/* A3A550 80241070 24636430 */ addiu $v1, $v1, 0x6430 -/* A3A554 80241074 0060282D */ daddu $a1, $v1, $zero -.L80241078: -/* A3A558 80241078 24820010 */ addiu $v0, $a0, 0x10 -/* A3A55C 8024107C AC620000 */ sw $v0, ($v1) -/* A3A560 80241080 24630004 */ addiu $v1, $v1, 4 -/* A3A564 80241084 24840001 */ addiu $a0, $a0, 1 -/* A3A568 80241088 28820070 */ slti $v0, $a0, 0x70 -/* A3A56C 8024108C 1440FFFA */ bnez $v0, .L80241078 -/* A3A570 80241090 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241094: -/* A3A574 80241094 8FBF0010 */ lw $ra, 0x10($sp) -/* A3A578 80241098 24020002 */ addiu $v0, $zero, 2 -/* A3A57C 8024109C 03E00008 */ jr $ra -/* A3A580 802410A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s new file mode 100644 index 0000000000..70181e5706 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241008_A3A4E8.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241008_A3A4E8 +/* A3A4E8 80241008 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3A4EC 8024100C AFBF0010 */ sw $ra, 0x10($sp) +/* A3A4F0 80241010 8C82000C */ lw $v0, 0xc($a0) +/* A3A4F4 80241014 0C0B1EAF */ jal get_variable +/* A3A4F8 80241018 8C450000 */ lw $a1, ($v0) +/* A3A4FC 8024101C 0040182D */ daddu $v1, $v0, $zero +/* A3A500 80241020 10600012 */ beqz $v1, .L8024106C +/* A3A504 80241024 0000202D */ daddu $a0, $zero, $zero +/* A3A508 80241028 8C620000 */ lw $v0, ($v1) +/* A3A50C 8024102C 5040000A */ beql $v0, $zero, .L80241058 +/* A3A510 80241030 00041080 */ sll $v0, $a0, 2 +/* A3A514 80241034 3C058024 */ lui $a1, 0x8024 +/* A3A518 80241038 24A56430 */ addiu $a1, $a1, 0x6430 +.L8024103C: +/* A3A51C 8024103C 24630004 */ addiu $v1, $v1, 4 +/* A3A520 80241040 24840001 */ addiu $a0, $a0, 1 +/* A3A524 80241044 ACA20000 */ sw $v0, ($a1) +/* A3A528 80241048 8C620000 */ lw $v0, ($v1) +/* A3A52C 8024104C 1440FFFB */ bnez $v0, .L8024103C +/* A3A530 80241050 24A50004 */ addiu $a1, $a1, 4 +/* A3A534 80241054 00041080 */ sll $v0, $a0, 2 +.L80241058: +/* A3A538 80241058 3C018024 */ lui $at, 0x8024 +/* A3A53C 8024105C 00220821 */ addu $at, $at, $v0 +/* A3A540 80241060 AC206430 */ sw $zero, 0x6430($at) +/* A3A544 80241064 08090425 */ j .L80241094 +/* A3A548 80241068 00000000 */ nop +.L8024106C: +/* A3A54C 8024106C 3C038024 */ lui $v1, 0x8024 +/* A3A550 80241070 24636430 */ addiu $v1, $v1, 0x6430 +/* A3A554 80241074 0060282D */ daddu $a1, $v1, $zero +.L80241078: +/* A3A558 80241078 24820010 */ addiu $v0, $a0, 0x10 +/* A3A55C 8024107C AC620000 */ sw $v0, ($v1) +/* A3A560 80241080 24630004 */ addiu $v1, $v1, 4 +/* A3A564 80241084 24840001 */ addiu $a0, $a0, 1 +/* A3A568 80241088 28820070 */ slti $v0, $a0, 0x70 +/* A3A56C 8024108C 1440FFFA */ bnez $v0, .L80241078 +/* A3A570 80241090 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80241094: +/* A3A574 80241094 8FBF0010 */ lw $ra, 0x10($sp) +/* A3A578 80241098 24020002 */ addiu $v0, $zero, 2 +/* A3A57C 8024109C 03E00008 */ jr $ra +/* A3A580 802410A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4.s deleted file mode 100644 index 99c7fd1cd6..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410A4 -/* A3A584 802410A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3A588 802410A8 AFB00010 */ sw $s0, 0x10($sp) -/* A3A58C 802410AC 3C108024 */ lui $s0, 0x8024 -/* A3A590 802410B0 2610476C */ addiu $s0, $s0, 0x476c -/* A3A594 802410B4 AFBF0018 */ sw $ra, 0x18($sp) -/* A3A598 802410B8 AFB10014 */ sw $s1, 0x14($sp) -/* A3A59C 802410BC 8E020000 */ lw $v0, ($s0) -/* A3A5A0 802410C0 14400010 */ bnez $v0, .L80241104 -/* A3A5A4 802410C4 0080882D */ daddu $s1, $a0, $zero -/* A3A5A8 802410C8 0C00AB39 */ jal heap_malloc -/* A3A5AC 802410CC 24040040 */ addiu $a0, $zero, 0x40 -/* A3A5B0 802410D0 AE020000 */ sw $v0, ($s0) -/* A3A5B4 802410D4 0000182D */ daddu $v1, $zero, $zero -/* A3A5B8 802410D8 0040282D */ daddu $a1, $v0, $zero -/* A3A5BC 802410DC 0220202D */ daddu $a0, $s1, $zero -.L802410E0: -/* A3A5C0 802410E0 8C820084 */ lw $v0, 0x84($a0) -/* A3A5C4 802410E4 24840004 */ addiu $a0, $a0, 4 -/* A3A5C8 802410E8 24630001 */ addiu $v1, $v1, 1 -/* A3A5CC 802410EC ACA20000 */ sw $v0, ($a1) -/* A3A5D0 802410F0 28620010 */ slti $v0, $v1, 0x10 -/* A3A5D4 802410F4 1440FFFA */ bnez $v0, .L802410E0 -/* A3A5D8 802410F8 24A50004 */ addiu $a1, $a1, 4 -/* A3A5DC 802410FC 08090450 */ j .L80241140 -/* A3A5E0 80241100 00000000 */ nop -.L80241104: -/* A3A5E4 80241104 0000182D */ daddu $v1, $zero, $zero -/* A3A5E8 80241108 0040282D */ daddu $a1, $v0, $zero -/* A3A5EC 8024110C 0220202D */ daddu $a0, $s1, $zero -.L80241110: -/* A3A5F0 80241110 8CA20000 */ lw $v0, ($a1) -/* A3A5F4 80241114 24A50004 */ addiu $a1, $a1, 4 -/* A3A5F8 80241118 24630001 */ addiu $v1, $v1, 1 -/* A3A5FC 8024111C AC820084 */ sw $v0, 0x84($a0) -/* A3A600 80241120 28620010 */ slti $v0, $v1, 0x10 -/* A3A604 80241124 1440FFFA */ bnez $v0, .L80241110 -/* A3A608 80241128 24840004 */ addiu $a0, $a0, 4 -/* A3A60C 8024112C 3C108024 */ lui $s0, 0x8024 -/* A3A610 80241130 2610476C */ addiu $s0, $s0, 0x476c -/* A3A614 80241134 0C00AB4B */ jal heap_free -/* A3A618 80241138 8E040000 */ lw $a0, ($s0) -/* A3A61C 8024113C AE000000 */ sw $zero, ($s0) -.L80241140: -/* A3A620 80241140 8FBF0018 */ lw $ra, 0x18($sp) -/* A3A624 80241144 8FB10014 */ lw $s1, 0x14($sp) -/* A3A628 80241148 8FB00010 */ lw $s0, 0x10($sp) -/* A3A62C 8024114C 24020002 */ addiu $v0, $zero, 2 -/* A3A630 80241150 03E00008 */ jr $ra -/* A3A634 80241154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s new file mode 100644 index 0000000000..a46924702a --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802410A4_A3A584.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410A4_A3A584 +/* A3A584 802410A4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3A588 802410A8 AFB00010 */ sw $s0, 0x10($sp) +/* A3A58C 802410AC 3C108024 */ lui $s0, 0x8024 +/* A3A590 802410B0 2610476C */ addiu $s0, $s0, 0x476c +/* A3A594 802410B4 AFBF0018 */ sw $ra, 0x18($sp) +/* A3A598 802410B8 AFB10014 */ sw $s1, 0x14($sp) +/* A3A59C 802410BC 8E020000 */ lw $v0, ($s0) +/* A3A5A0 802410C0 14400010 */ bnez $v0, .L80241104 +/* A3A5A4 802410C4 0080882D */ daddu $s1, $a0, $zero +/* A3A5A8 802410C8 0C00AB39 */ jal heap_malloc +/* A3A5AC 802410CC 24040040 */ addiu $a0, $zero, 0x40 +/* A3A5B0 802410D0 AE020000 */ sw $v0, ($s0) +/* A3A5B4 802410D4 0000182D */ daddu $v1, $zero, $zero +/* A3A5B8 802410D8 0040282D */ daddu $a1, $v0, $zero +/* A3A5BC 802410DC 0220202D */ daddu $a0, $s1, $zero +.L802410E0: +/* A3A5C0 802410E0 8C820084 */ lw $v0, 0x84($a0) +/* A3A5C4 802410E4 24840004 */ addiu $a0, $a0, 4 +/* A3A5C8 802410E8 24630001 */ addiu $v1, $v1, 1 +/* A3A5CC 802410EC ACA20000 */ sw $v0, ($a1) +/* A3A5D0 802410F0 28620010 */ slti $v0, $v1, 0x10 +/* A3A5D4 802410F4 1440FFFA */ bnez $v0, .L802410E0 +/* A3A5D8 802410F8 24A50004 */ addiu $a1, $a1, 4 +/* A3A5DC 802410FC 08090450 */ j .L80241140 +/* A3A5E0 80241100 00000000 */ nop +.L80241104: +/* A3A5E4 80241104 0000182D */ daddu $v1, $zero, $zero +/* A3A5E8 80241108 0040282D */ daddu $a1, $v0, $zero +/* A3A5EC 8024110C 0220202D */ daddu $a0, $s1, $zero +.L80241110: +/* A3A5F0 80241110 8CA20000 */ lw $v0, ($a1) +/* A3A5F4 80241114 24A50004 */ addiu $a1, $a1, 4 +/* A3A5F8 80241118 24630001 */ addiu $v1, $v1, 1 +/* A3A5FC 8024111C AC820084 */ sw $v0, 0x84($a0) +/* A3A600 80241120 28620010 */ slti $v0, $v1, 0x10 +/* A3A604 80241124 1440FFFA */ bnez $v0, .L80241110 +/* A3A608 80241128 24840004 */ addiu $a0, $a0, 4 +/* A3A60C 8024112C 3C108024 */ lui $s0, 0x8024 +/* A3A610 80241130 2610476C */ addiu $s0, $s0, 0x476c +/* A3A614 80241134 0C00AB4B */ jal heap_free +/* A3A618 80241138 8E040000 */ lw $a0, ($s0) +/* A3A61C 8024113C AE000000 */ sw $zero, ($s0) +.L80241140: +/* A3A620 80241140 8FBF0018 */ lw $ra, 0x18($sp) +/* A3A624 80241144 8FB10014 */ lw $s1, 0x14($sp) +/* A3A628 80241148 8FB00010 */ lw $s0, 0x10($sp) +/* A3A62C 8024114C 24020002 */ addiu $v0, $zero, 2 +/* A3A630 80241150 03E00008 */ jr $ra +/* A3A634 80241154 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411BC.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411BC.s deleted file mode 100644 index 70c8f25f7f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411BC.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411BC -/* A3A69C 802411BC 0000282D */ daddu $a1, $zero, $zero -/* A3A6A0 802411C0 3C038011 */ lui $v1, %hi(gPlayerData) -/* A3A6A4 802411C4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -.L802411C8: -/* A3A6A8 802411C8 846200B4 */ lh $v0, 0xb4($v1) -/* A3A6AC 802411CC 14440003 */ bne $v0, $a0, .L802411DC -/* A3A6B0 802411D0 24A50001 */ addiu $a1, $a1, 1 -/* A3A6B4 802411D4 03E00008 */ jr $ra -/* A3A6B8 802411D8 24020001 */ addiu $v0, $zero, 1 -.L802411DC: -/* A3A6BC 802411DC 28A20080 */ slti $v0, $a1, 0x80 -/* A3A6C0 802411E0 1440FFF9 */ bnez $v0, .L802411C8 -/* A3A6C4 802411E4 24630002 */ addiu $v1, $v1, 2 -/* A3A6C8 802411E8 03E00008 */ jr $ra -/* A3A6CC 802411EC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411BC_A3A69C.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411BC_A3A69C.s new file mode 100644 index 0000000000..33d396fcaa --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411BC_A3A69C.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411BC_A3A69C +/* A3A69C 802411BC 0000282D */ daddu $a1, $zero, $zero +/* A3A6A0 802411C0 3C038011 */ lui $v1, %hi(gPlayerData) +/* A3A6A4 802411C4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +.L802411C8: +/* A3A6A8 802411C8 846200B4 */ lh $v0, 0xb4($v1) +/* A3A6AC 802411CC 14440003 */ bne $v0, $a0, .L802411DC +/* A3A6B0 802411D0 24A50001 */ addiu $a1, $a1, 1 +/* A3A6B4 802411D4 03E00008 */ jr $ra +/* A3A6B8 802411D8 24020001 */ addiu $v0, $zero, 1 +.L802411DC: +/* A3A6BC 802411DC 28A20080 */ slti $v0, $a1, 0x80 +/* A3A6C0 802411E0 1440FFF9 */ bnez $v0, .L802411C8 +/* A3A6C4 802411E4 24630002 */ addiu $v1, $v1, 2 +/* A3A6C8 802411E8 03E00008 */ jr $ra +/* A3A6CC 802411EC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0.s deleted file mode 100644 index 2bf4e957f7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411F0 -/* A3A6D0 802411F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3A6D4 802411F4 AFB00010 */ sw $s0, 0x10($sp) -/* A3A6D8 802411F8 0000802D */ daddu $s0, $zero, $zero -/* A3A6DC 802411FC AFB10014 */ sw $s1, 0x14($sp) -/* A3A6E0 80241200 3C11F971 */ lui $s1, 0xf971 -/* A3A6E4 80241204 36318883 */ ori $s1, $s1, 0x8883 -/* A3A6E8 80241208 AFBF0018 */ sw $ra, 0x18($sp) -/* A3A6EC 8024120C 0000202D */ daddu $a0, $zero, $zero -.L80241210: -/* A3A6F0 80241210 02112821 */ addu $a1, $s0, $s1 -/* A3A6F4 80241214 0C0B2026 */ jal set_variable -/* A3A6F8 80241218 0080302D */ daddu $a2, $a0, $zero -/* A3A6FC 8024121C 26100001 */ addiu $s0, $s0, 1 -/* A3A700 80241220 2E02004F */ sltiu $v0, $s0, 0x4f -/* A3A704 80241224 1440FFFA */ bnez $v0, .L80241210 -/* A3A708 80241228 0000202D */ daddu $a0, $zero, $zero -/* A3A70C 8024122C 0000802D */ daddu $s0, $zero, $zero -/* A3A710 80241230 3C11F971 */ lui $s1, 0xf971 -/* A3A714 80241234 363188E4 */ ori $s1, $s1, 0x88e4 -.L80241238: -/* A3A718 80241238 02112821 */ addu $a1, $s0, $s1 -/* A3A71C 8024123C 0C0B2026 */ jal set_variable -/* A3A720 80241240 0080302D */ daddu $a2, $a0, $zero -/* A3A724 80241244 26100001 */ addiu $s0, $s0, 1 -/* A3A728 80241248 2E020010 */ sltiu $v0, $s0, 0x10 -/* A3A72C 8024124C 1440FFFA */ bnez $v0, .L80241238 -/* A3A730 80241250 0000202D */ daddu $a0, $zero, $zero -/* A3A734 80241254 8FBF0018 */ lw $ra, 0x18($sp) -/* A3A738 80241258 8FB10014 */ lw $s1, 0x14($sp) -/* A3A73C 8024125C 8FB00010 */ lw $s0, 0x10($sp) -/* A3A740 80241260 24020002 */ addiu $v0, $zero, 2 -/* A3A744 80241264 03E00008 */ jr $ra -/* A3A748 80241268 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0_A3A6D0.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0_A3A6D0.s new file mode 100644 index 0000000000..64c8d73d2e --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802411F0_A3A6D0.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411F0_A3A6D0 +/* A3A6D0 802411F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3A6D4 802411F4 AFB00010 */ sw $s0, 0x10($sp) +/* A3A6D8 802411F8 0000802D */ daddu $s0, $zero, $zero +/* A3A6DC 802411FC AFB10014 */ sw $s1, 0x14($sp) +/* A3A6E0 80241200 3C11F971 */ lui $s1, 0xf971 +/* A3A6E4 80241204 36318883 */ ori $s1, $s1, 0x8883 +/* A3A6E8 80241208 AFBF0018 */ sw $ra, 0x18($sp) +/* A3A6EC 8024120C 0000202D */ daddu $a0, $zero, $zero +.L80241210: +/* A3A6F0 80241210 02112821 */ addu $a1, $s0, $s1 +/* A3A6F4 80241214 0C0B2026 */ jal set_variable +/* A3A6F8 80241218 0080302D */ daddu $a2, $a0, $zero +/* A3A6FC 8024121C 26100001 */ addiu $s0, $s0, 1 +/* A3A700 80241220 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A704 80241224 1440FFFA */ bnez $v0, .L80241210 +/* A3A708 80241228 0000202D */ daddu $a0, $zero, $zero +/* A3A70C 8024122C 0000802D */ daddu $s0, $zero, $zero +/* A3A710 80241230 3C11F971 */ lui $s1, 0xf971 +/* A3A714 80241234 363188E4 */ ori $s1, $s1, 0x88e4 +.L80241238: +/* A3A718 80241238 02112821 */ addu $a1, $s0, $s1 +/* A3A71C 8024123C 0C0B2026 */ jal set_variable +/* A3A720 80241240 0080302D */ daddu $a2, $a0, $zero +/* A3A724 80241244 26100001 */ addiu $s0, $s0, 1 +/* A3A728 80241248 2E020010 */ sltiu $v0, $s0, 0x10 +/* A3A72C 8024124C 1440FFFA */ bnez $v0, .L80241238 +/* A3A730 80241250 0000202D */ daddu $a0, $zero, $zero +/* A3A734 80241254 8FBF0018 */ lw $ra, 0x18($sp) +/* A3A738 80241258 8FB10014 */ lw $s1, 0x14($sp) +/* A3A73C 8024125C 8FB00010 */ lw $s0, 0x10($sp) +/* A3A740 80241260 24020002 */ addiu $v0, $zero, 2 +/* A3A744 80241264 03E00008 */ jr $ra +/* A3A748 80241268 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C.s deleted file mode 100644 index 79ef16e7eb..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C.s +++ /dev/null @@ -1,177 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024126C -/* A3A74C 8024126C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A3A750 80241270 AFBE0030 */ sw $fp, 0x30($sp) -/* A3A754 80241274 0080F02D */ daddu $fp, $a0, $zero -/* A3A758 80241278 0000202D */ daddu $a0, $zero, $zero -/* A3A75C 8024127C 3C05F5DE */ lui $a1, 0xf5de -/* A3A760 80241280 34A50180 */ ori $a1, $a1, 0x180 -/* A3A764 80241284 AFBF0034 */ sw $ra, 0x34($sp) -/* A3A768 80241288 AFB7002C */ sw $s7, 0x2c($sp) -/* A3A76C 8024128C AFB60028 */ sw $s6, 0x28($sp) -/* A3A770 80241290 AFB50024 */ sw $s5, 0x24($sp) -/* A3A774 80241294 AFB40020 */ sw $s4, 0x20($sp) -/* A3A778 80241298 AFB3001C */ sw $s3, 0x1c($sp) -/* A3A77C 8024129C AFB20018 */ sw $s2, 0x18($sp) -/* A3A780 802412A0 AFB10014 */ sw $s1, 0x14($sp) -/* A3A784 802412A4 0C0B1EAF */ jal get_variable -/* A3A788 802412A8 AFB00010 */ sw $s0, 0x10($sp) -/* A3A78C 802412AC 0040B02D */ daddu $s6, $v0, $zero -/* A3A790 802412B0 0000A02D */ daddu $s4, $zero, $zero -/* A3A794 802412B4 0280802D */ daddu $s0, $s4, $zero -/* A3A798 802412B8 3C12F971 */ lui $s2, 0xf971 -/* A3A79C 802412BC 36528883 */ ori $s2, $s2, 0x8883 -/* A3A7A0 802412C0 3C118024 */ lui $s1, 0x8024 -/* A3A7A4 802412C4 263147D8 */ addiu $s1, $s1, 0x47d8 -/* A3A7A8 802412C8 AFC00088 */ sw $zero, 0x88($fp) -.L802412CC: -/* A3A7AC 802412CC 8E220004 */ lw $v0, 4($s1) -/* A3A7B0 802412D0 02C2102A */ slt $v0, $s6, $v0 -/* A3A7B4 802412D4 5440000C */ bnel $v0, $zero, .L80241308 -/* A3A7B8 802412D8 26100001 */ addiu $s0, $s0, 1 -/* A3A7BC 802412DC 8E240000 */ lw $a0, ($s1) -/* A3A7C0 802412E0 0C09046F */ jal func_802411BC -/* A3A7C4 802412E4 00000000 */ nop -/* A3A7C8 802412E8 54400007 */ bnel $v0, $zero, .L80241308 -/* A3A7CC 802412EC 26100001 */ addiu $s0, $s0, 1 -/* A3A7D0 802412F0 0000202D */ daddu $a0, $zero, $zero -/* A3A7D4 802412F4 0C0B1EAF */ jal get_variable -/* A3A7D8 802412F8 02122821 */ addu $a1, $s0, $s2 -/* A3A7DC 802412FC 50400001 */ beql $v0, $zero, .L80241304 -/* A3A7E0 80241300 26940001 */ addiu $s4, $s4, 1 -.L80241304: -/* A3A7E4 80241304 26100001 */ addiu $s0, $s0, 1 -.L80241308: -/* A3A7E8 80241308 2E02004F */ sltiu $v0, $s0, 0x4f -/* A3A7EC 8024130C 1440FFEF */ bnez $v0, .L802412CC -/* A3A7F0 80241310 2631000C */ addiu $s1, $s1, 0xc -/* A3A7F4 80241314 3C118024 */ lui $s1, 0x8024 -/* A3A7F8 80241318 263147D4 */ addiu $s1, $s1, 0x47d4 -/* A3A7FC 8024131C 1280002D */ beqz $s4, .L802413D4 -/* A3A800 80241320 0000802D */ daddu $s0, $zero, $zero -/* A3A804 80241324 0C00A67F */ jal rand_int -/* A3A808 80241328 2684FFFF */ addiu $a0, $s4, -1 -/* A3A80C 8024132C 0040A82D */ daddu $s5, $v0, $zero -/* A3A810 80241330 0220982D */ daddu $s3, $s1, $zero -/* A3A814 80241334 0000A02D */ daddu $s4, $zero, $zero -/* A3A818 80241338 0280802D */ daddu $s0, $s4, $zero -/* A3A81C 8024133C 3C17F971 */ lui $s7, 0xf971 -/* A3A820 80241340 36F78883 */ ori $s7, $s7, 0x8883 -/* A3A824 80241344 26720004 */ addiu $s2, $s3, 4 -.L80241348: -/* A3A828 80241348 8E420004 */ lw $v0, 4($s2) -/* A3A82C 8024134C 02C2102A */ slt $v0, $s6, $v0 -/* A3A830 80241350 5440000F */ bnel $v0, $zero, .L80241390 -/* A3A834 80241354 26100001 */ addiu $s0, $s0, 1 -/* A3A838 80241358 8E440000 */ lw $a0, ($s2) -/* A3A83C 8024135C 0C09046F */ jal func_802411BC -/* A3A840 80241360 00000000 */ nop -/* A3A844 80241364 5440000A */ bnel $v0, $zero, .L80241390 -/* A3A848 80241368 26100001 */ addiu $s0, $s0, 1 -/* A3A84C 8024136C 0000202D */ daddu $a0, $zero, $zero -/* A3A850 80241370 02178821 */ addu $s1, $s0, $s7 -/* A3A854 80241374 0C0B1EAF */ jal get_variable -/* A3A858 80241378 0220282D */ daddu $a1, $s1, $zero -/* A3A85C 8024137C 54400004 */ bnel $v0, $zero, .L80241390 -/* A3A860 80241380 26100001 */ addiu $s0, $s0, 1 -/* A3A864 80241384 12950008 */ beq $s4, $s5, .L802413A8 -/* A3A868 80241388 26940001 */ addiu $s4, $s4, 1 -/* A3A86C 8024138C 26100001 */ addiu $s0, $s0, 1 -.L80241390: -/* A3A870 80241390 2652000C */ addiu $s2, $s2, 0xc -/* A3A874 80241394 2E02004F */ sltiu $v0, $s0, 0x4f -/* A3A878 80241398 1440FFEB */ bnez $v0, .L80241348 -/* A3A87C 8024139C 2673000C */ addiu $s3, $s3, 0xc -/* A3A880 802413A0 0809052D */ j .L802414B4 -/* A3A884 802413A4 24020002 */ addiu $v0, $zero, 2 -.L802413A8: -/* A3A888 802413A8 0000202D */ daddu $a0, $zero, $zero -/* A3A88C 802413AC 080904EF */ j .L802413BC -/* A3A890 802413B0 0220282D */ daddu $a1, $s1, $zero -.L802413B4: -/* A3A894 802413B4 0000202D */ daddu $a0, $zero, $zero -/* A3A898 802413B8 0240282D */ daddu $a1, $s2, $zero -.L802413BC: -/* A3A89C 802413BC 8E620000 */ lw $v0, ($s3) -/* A3A8A0 802413C0 24060001 */ addiu $a2, $zero, 1 -/* A3A8A4 802413C4 0C0B2026 */ jal set_variable -/* A3A8A8 802413C8 AFC20088 */ sw $v0, 0x88($fp) -/* A3A8AC 802413CC 0809052D */ j .L802414B4 -/* A3A8B0 802413D0 24020002 */ addiu $v0, $zero, 2 -.L802413D4: -/* A3A8B4 802413D4 24132712 */ addiu $s3, $zero, 0x2712 -/* A3A8B8 802413D8 3C12F971 */ lui $s2, 0xf971 -/* A3A8BC 802413DC 36528883 */ ori $s2, $s2, 0x8883 -/* A3A8C0 802413E0 26310004 */ addiu $s1, $s1, 4 -.L802413E4: -/* A3A8C4 802413E4 8E220004 */ lw $v0, 4($s1) -/* A3A8C8 802413E8 5453000C */ bnel $v0, $s3, .L8024141C -/* A3A8CC 802413EC 26100001 */ addiu $s0, $s0, 1 -/* A3A8D0 802413F0 8E240000 */ lw $a0, ($s1) -/* A3A8D4 802413F4 0C09046F */ jal func_802411BC -/* A3A8D8 802413F8 00000000 */ nop -/* A3A8DC 802413FC 54400007 */ bnel $v0, $zero, .L8024141C -/* A3A8E0 80241400 26100001 */ addiu $s0, $s0, 1 -/* A3A8E4 80241404 0000202D */ daddu $a0, $zero, $zero -/* A3A8E8 80241408 0C0B1EAF */ jal get_variable -/* A3A8EC 8024140C 02122821 */ addu $a1, $s0, $s2 -/* A3A8F0 80241410 50400001 */ beql $v0, $zero, .L80241418 -/* A3A8F4 80241414 26940001 */ addiu $s4, $s4, 1 -.L80241418: -/* A3A8F8 80241418 26100001 */ addiu $s0, $s0, 1 -.L8024141C: -/* A3A8FC 8024141C 2E02004F */ sltiu $v0, $s0, 0x4f -/* A3A900 80241420 1440FFF0 */ bnez $v0, .L802413E4 -/* A3A904 80241424 2631000C */ addiu $s1, $s1, 0xc -/* A3A908 80241428 12800022 */ beqz $s4, .L802414B4 -/* A3A90C 8024142C 24020002 */ addiu $v0, $zero, 2 -/* A3A910 80241430 0C00A67F */ jal rand_int -/* A3A914 80241434 2684FFFF */ addiu $a0, $s4, -1 -/* A3A918 80241438 0040A82D */ daddu $s5, $v0, $zero -/* A3A91C 8024143C 3C138024 */ lui $s3, 0x8024 -/* A3A920 80241440 267347D4 */ addiu $s3, $s3, 0x47d4 -/* A3A924 80241444 0000A02D */ daddu $s4, $zero, $zero -/* A3A928 80241448 0280802D */ daddu $s0, $s4, $zero -/* A3A92C 8024144C 24172712 */ addiu $s7, $zero, 0x2712 -/* A3A930 80241450 3C16F971 */ lui $s6, 0xf971 -/* A3A934 80241454 36D68883 */ ori $s6, $s6, 0x8883 -/* A3A938 80241458 26710004 */ addiu $s1, $s3, 4 -.L8024145C: -/* A3A93C 8024145C 8E220004 */ lw $v0, 4($s1) -/* A3A940 80241460 5457000F */ bnel $v0, $s7, .L802414A0 -/* A3A944 80241464 26100001 */ addiu $s0, $s0, 1 -/* A3A948 80241468 8E240000 */ lw $a0, ($s1) -/* A3A94C 8024146C 0C09046F */ jal func_802411BC -/* A3A950 80241470 00000000 */ nop -/* A3A954 80241474 5440000A */ bnel $v0, $zero, .L802414A0 -/* A3A958 80241478 26100001 */ addiu $s0, $s0, 1 -/* A3A95C 8024147C 0000202D */ daddu $a0, $zero, $zero -/* A3A960 80241480 02169021 */ addu $s2, $s0, $s6 -/* A3A964 80241484 0C0B1EAF */ jal get_variable -/* A3A968 80241488 0240282D */ daddu $a1, $s2, $zero -/* A3A96C 8024148C 54400004 */ bnel $v0, $zero, .L802414A0 -/* A3A970 80241490 26100001 */ addiu $s0, $s0, 1 -/* A3A974 80241494 1295FFC7 */ beq $s4, $s5, .L802413B4 -/* A3A978 80241498 26940001 */ addiu $s4, $s4, 1 -/* A3A97C 8024149C 26100001 */ addiu $s0, $s0, 1 -.L802414A0: -/* A3A980 802414A0 2631000C */ addiu $s1, $s1, 0xc -/* A3A984 802414A4 2E02004F */ sltiu $v0, $s0, 0x4f -/* A3A988 802414A8 1440FFEC */ bnez $v0, .L8024145C -/* A3A98C 802414AC 2673000C */ addiu $s3, $s3, 0xc -/* A3A990 802414B0 24020002 */ addiu $v0, $zero, 2 -.L802414B4: -/* A3A994 802414B4 8FBF0034 */ lw $ra, 0x34($sp) -/* A3A998 802414B8 8FBE0030 */ lw $fp, 0x30($sp) -/* A3A99C 802414BC 8FB7002C */ lw $s7, 0x2c($sp) -/* A3A9A0 802414C0 8FB60028 */ lw $s6, 0x28($sp) -/* A3A9A4 802414C4 8FB50024 */ lw $s5, 0x24($sp) -/* A3A9A8 802414C8 8FB40020 */ lw $s4, 0x20($sp) -/* A3A9AC 802414CC 8FB3001C */ lw $s3, 0x1c($sp) -/* A3A9B0 802414D0 8FB20018 */ lw $s2, 0x18($sp) -/* A3A9B4 802414D4 8FB10014 */ lw $s1, 0x14($sp) -/* A3A9B8 802414D8 8FB00010 */ lw $s0, 0x10($sp) -/* A3A9BC 802414DC 03E00008 */ jr $ra -/* A3A9C0 802414E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s new file mode 100644 index 0000000000..307e06e129 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_8024126C_A3A74C.s @@ -0,0 +1,177 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024126C_A3A74C +/* A3A74C 8024126C 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A3A750 80241270 AFBE0030 */ sw $fp, 0x30($sp) +/* A3A754 80241274 0080F02D */ daddu $fp, $a0, $zero +/* A3A758 80241278 0000202D */ daddu $a0, $zero, $zero +/* A3A75C 8024127C 3C05F5DE */ lui $a1, 0xf5de +/* A3A760 80241280 34A50180 */ ori $a1, $a1, 0x180 +/* A3A764 80241284 AFBF0034 */ sw $ra, 0x34($sp) +/* A3A768 80241288 AFB7002C */ sw $s7, 0x2c($sp) +/* A3A76C 8024128C AFB60028 */ sw $s6, 0x28($sp) +/* A3A770 80241290 AFB50024 */ sw $s5, 0x24($sp) +/* A3A774 80241294 AFB40020 */ sw $s4, 0x20($sp) +/* A3A778 80241298 AFB3001C */ sw $s3, 0x1c($sp) +/* A3A77C 8024129C AFB20018 */ sw $s2, 0x18($sp) +/* A3A780 802412A0 AFB10014 */ sw $s1, 0x14($sp) +/* A3A784 802412A4 0C0B1EAF */ jal get_variable +/* A3A788 802412A8 AFB00010 */ sw $s0, 0x10($sp) +/* A3A78C 802412AC 0040B02D */ daddu $s6, $v0, $zero +/* A3A790 802412B0 0000A02D */ daddu $s4, $zero, $zero +/* A3A794 802412B4 0280802D */ daddu $s0, $s4, $zero +/* A3A798 802412B8 3C12F971 */ lui $s2, 0xf971 +/* A3A79C 802412BC 36528883 */ ori $s2, $s2, 0x8883 +/* A3A7A0 802412C0 3C118024 */ lui $s1, 0x8024 +/* A3A7A4 802412C4 263147D8 */ addiu $s1, $s1, 0x47d8 +/* A3A7A8 802412C8 AFC00088 */ sw $zero, 0x88($fp) +.L802412CC: +/* A3A7AC 802412CC 8E220004 */ lw $v0, 4($s1) +/* A3A7B0 802412D0 02C2102A */ slt $v0, $s6, $v0 +/* A3A7B4 802412D4 5440000C */ bnel $v0, $zero, .L80241308 +/* A3A7B8 802412D8 26100001 */ addiu $s0, $s0, 1 +/* A3A7BC 802412DC 8E240000 */ lw $a0, ($s1) +/* A3A7C0 802412E0 0C09046F */ jal func_802411BC_A3A69C +/* A3A7C4 802412E4 00000000 */ nop +/* A3A7C8 802412E8 54400007 */ bnel $v0, $zero, .L80241308 +/* A3A7CC 802412EC 26100001 */ addiu $s0, $s0, 1 +/* A3A7D0 802412F0 0000202D */ daddu $a0, $zero, $zero +/* A3A7D4 802412F4 0C0B1EAF */ jal get_variable +/* A3A7D8 802412F8 02122821 */ addu $a1, $s0, $s2 +/* A3A7DC 802412FC 50400001 */ beql $v0, $zero, .L80241304 +/* A3A7E0 80241300 26940001 */ addiu $s4, $s4, 1 +.L80241304: +/* A3A7E4 80241304 26100001 */ addiu $s0, $s0, 1 +.L80241308: +/* A3A7E8 80241308 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A7EC 8024130C 1440FFEF */ bnez $v0, .L802412CC +/* A3A7F0 80241310 2631000C */ addiu $s1, $s1, 0xc +/* A3A7F4 80241314 3C118024 */ lui $s1, 0x8024 +/* A3A7F8 80241318 263147D4 */ addiu $s1, $s1, 0x47d4 +/* A3A7FC 8024131C 1280002D */ beqz $s4, .L802413D4 +/* A3A800 80241320 0000802D */ daddu $s0, $zero, $zero +/* A3A804 80241324 0C00A67F */ jal rand_int +/* A3A808 80241328 2684FFFF */ addiu $a0, $s4, -1 +/* A3A80C 8024132C 0040A82D */ daddu $s5, $v0, $zero +/* A3A810 80241330 0220982D */ daddu $s3, $s1, $zero +/* A3A814 80241334 0000A02D */ daddu $s4, $zero, $zero +/* A3A818 80241338 0280802D */ daddu $s0, $s4, $zero +/* A3A81C 8024133C 3C17F971 */ lui $s7, 0xf971 +/* A3A820 80241340 36F78883 */ ori $s7, $s7, 0x8883 +/* A3A824 80241344 26720004 */ addiu $s2, $s3, 4 +.L80241348: +/* A3A828 80241348 8E420004 */ lw $v0, 4($s2) +/* A3A82C 8024134C 02C2102A */ slt $v0, $s6, $v0 +/* A3A830 80241350 5440000F */ bnel $v0, $zero, .L80241390 +/* A3A834 80241354 26100001 */ addiu $s0, $s0, 1 +/* A3A838 80241358 8E440000 */ lw $a0, ($s2) +/* A3A83C 8024135C 0C09046F */ jal func_802411BC_A3A69C +/* A3A840 80241360 00000000 */ nop +/* A3A844 80241364 5440000A */ bnel $v0, $zero, .L80241390 +/* A3A848 80241368 26100001 */ addiu $s0, $s0, 1 +/* A3A84C 8024136C 0000202D */ daddu $a0, $zero, $zero +/* A3A850 80241370 02178821 */ addu $s1, $s0, $s7 +/* A3A854 80241374 0C0B1EAF */ jal get_variable +/* A3A858 80241378 0220282D */ daddu $a1, $s1, $zero +/* A3A85C 8024137C 54400004 */ bnel $v0, $zero, .L80241390 +/* A3A860 80241380 26100001 */ addiu $s0, $s0, 1 +/* A3A864 80241384 12950008 */ beq $s4, $s5, .L802413A8 +/* A3A868 80241388 26940001 */ addiu $s4, $s4, 1 +/* A3A86C 8024138C 26100001 */ addiu $s0, $s0, 1 +.L80241390: +/* A3A870 80241390 2652000C */ addiu $s2, $s2, 0xc +/* A3A874 80241394 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A878 80241398 1440FFEB */ bnez $v0, .L80241348 +/* A3A87C 8024139C 2673000C */ addiu $s3, $s3, 0xc +/* A3A880 802413A0 0809052D */ j .L802414B4 +/* A3A884 802413A4 24020002 */ addiu $v0, $zero, 2 +.L802413A8: +/* A3A888 802413A8 0000202D */ daddu $a0, $zero, $zero +/* A3A88C 802413AC 080904EF */ j .L802413BC +/* A3A890 802413B0 0220282D */ daddu $a1, $s1, $zero +.L802413B4: +/* A3A894 802413B4 0000202D */ daddu $a0, $zero, $zero +/* A3A898 802413B8 0240282D */ daddu $a1, $s2, $zero +.L802413BC: +/* A3A89C 802413BC 8E620000 */ lw $v0, ($s3) +/* A3A8A0 802413C0 24060001 */ addiu $a2, $zero, 1 +/* A3A8A4 802413C4 0C0B2026 */ jal set_variable +/* A3A8A8 802413C8 AFC20088 */ sw $v0, 0x88($fp) +/* A3A8AC 802413CC 0809052D */ j .L802414B4 +/* A3A8B0 802413D0 24020002 */ addiu $v0, $zero, 2 +.L802413D4: +/* A3A8B4 802413D4 24132712 */ addiu $s3, $zero, 0x2712 +/* A3A8B8 802413D8 3C12F971 */ lui $s2, 0xf971 +/* A3A8BC 802413DC 36528883 */ ori $s2, $s2, 0x8883 +/* A3A8C0 802413E0 26310004 */ addiu $s1, $s1, 4 +.L802413E4: +/* A3A8C4 802413E4 8E220004 */ lw $v0, 4($s1) +/* A3A8C8 802413E8 5453000C */ bnel $v0, $s3, .L8024141C +/* A3A8CC 802413EC 26100001 */ addiu $s0, $s0, 1 +/* A3A8D0 802413F0 8E240000 */ lw $a0, ($s1) +/* A3A8D4 802413F4 0C09046F */ jal func_802411BC_A3A69C +/* A3A8D8 802413F8 00000000 */ nop +/* A3A8DC 802413FC 54400007 */ bnel $v0, $zero, .L8024141C +/* A3A8E0 80241400 26100001 */ addiu $s0, $s0, 1 +/* A3A8E4 80241404 0000202D */ daddu $a0, $zero, $zero +/* A3A8E8 80241408 0C0B1EAF */ jal get_variable +/* A3A8EC 8024140C 02122821 */ addu $a1, $s0, $s2 +/* A3A8F0 80241410 50400001 */ beql $v0, $zero, .L80241418 +/* A3A8F4 80241414 26940001 */ addiu $s4, $s4, 1 +.L80241418: +/* A3A8F8 80241418 26100001 */ addiu $s0, $s0, 1 +.L8024141C: +/* A3A8FC 8024141C 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A900 80241420 1440FFF0 */ bnez $v0, .L802413E4 +/* A3A904 80241424 2631000C */ addiu $s1, $s1, 0xc +/* A3A908 80241428 12800022 */ beqz $s4, .L802414B4 +/* A3A90C 8024142C 24020002 */ addiu $v0, $zero, 2 +/* A3A910 80241430 0C00A67F */ jal rand_int +/* A3A914 80241434 2684FFFF */ addiu $a0, $s4, -1 +/* A3A918 80241438 0040A82D */ daddu $s5, $v0, $zero +/* A3A91C 8024143C 3C138024 */ lui $s3, 0x8024 +/* A3A920 80241440 267347D4 */ addiu $s3, $s3, 0x47d4 +/* A3A924 80241444 0000A02D */ daddu $s4, $zero, $zero +/* A3A928 80241448 0280802D */ daddu $s0, $s4, $zero +/* A3A92C 8024144C 24172712 */ addiu $s7, $zero, 0x2712 +/* A3A930 80241450 3C16F971 */ lui $s6, 0xf971 +/* A3A934 80241454 36D68883 */ ori $s6, $s6, 0x8883 +/* A3A938 80241458 26710004 */ addiu $s1, $s3, 4 +.L8024145C: +/* A3A93C 8024145C 8E220004 */ lw $v0, 4($s1) +/* A3A940 80241460 5457000F */ bnel $v0, $s7, .L802414A0 +/* A3A944 80241464 26100001 */ addiu $s0, $s0, 1 +/* A3A948 80241468 8E240000 */ lw $a0, ($s1) +/* A3A94C 8024146C 0C09046F */ jal func_802411BC_A3A69C +/* A3A950 80241470 00000000 */ nop +/* A3A954 80241474 5440000A */ bnel $v0, $zero, .L802414A0 +/* A3A958 80241478 26100001 */ addiu $s0, $s0, 1 +/* A3A95C 8024147C 0000202D */ daddu $a0, $zero, $zero +/* A3A960 80241480 02169021 */ addu $s2, $s0, $s6 +/* A3A964 80241484 0C0B1EAF */ jal get_variable +/* A3A968 80241488 0240282D */ daddu $a1, $s2, $zero +/* A3A96C 8024148C 54400004 */ bnel $v0, $zero, .L802414A0 +/* A3A970 80241490 26100001 */ addiu $s0, $s0, 1 +/* A3A974 80241494 1295FFC7 */ beq $s4, $s5, .L802413B4 +/* A3A978 80241498 26940001 */ addiu $s4, $s4, 1 +/* A3A97C 8024149C 26100001 */ addiu $s0, $s0, 1 +.L802414A0: +/* A3A980 802414A0 2631000C */ addiu $s1, $s1, 0xc +/* A3A984 802414A4 2E02004F */ sltiu $v0, $s0, 0x4f +/* A3A988 802414A8 1440FFEC */ bnez $v0, .L8024145C +/* A3A98C 802414AC 2673000C */ addiu $s3, $s3, 0xc +/* A3A990 802414B0 24020002 */ addiu $v0, $zero, 2 +.L802414B4: +/* A3A994 802414B4 8FBF0034 */ lw $ra, 0x34($sp) +/* A3A998 802414B8 8FBE0030 */ lw $fp, 0x30($sp) +/* A3A99C 802414BC 8FB7002C */ lw $s7, 0x2c($sp) +/* A3A9A0 802414C0 8FB60028 */ lw $s6, 0x28($sp) +/* A3A9A4 802414C4 8FB50024 */ lw $s5, 0x24($sp) +/* A3A9A8 802414C8 8FB40020 */ lw $s4, 0x20($sp) +/* A3A9AC 802414CC 8FB3001C */ lw $s3, 0x1c($sp) +/* A3A9B0 802414D0 8FB20018 */ lw $s2, 0x18($sp) +/* A3A9B4 802414D4 8FB10014 */ lw $s1, 0x14($sp) +/* A3A9B8 802414D8 8FB00010 */ lw $s0, 0x10($sp) +/* A3A9BC 802414DC 03E00008 */ jr $ra +/* A3A9C0 802414E0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4.s deleted file mode 100644 index b4607b9313..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4.s +++ /dev/null @@ -1,108 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414E4 -/* A3A9C4 802414E4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A3A9C8 802414E8 AFBE0030 */ sw $fp, 0x30($sp) -/* A3A9CC 802414EC 0080F02D */ daddu $fp, $a0, $zero -/* A3A9D0 802414F0 0000202D */ daddu $a0, $zero, $zero -/* A3A9D4 802414F4 3C05F5DE */ lui $a1, 0xf5de -/* A3A9D8 802414F8 34A50180 */ ori $a1, $a1, 0x180 -/* A3A9DC 802414FC AFBF0034 */ sw $ra, 0x34($sp) -/* A3A9E0 80241500 AFB7002C */ sw $s7, 0x2c($sp) -/* A3A9E4 80241504 AFB60028 */ sw $s6, 0x28($sp) -/* A3A9E8 80241508 AFB50024 */ sw $s5, 0x24($sp) -/* A3A9EC 8024150C AFB40020 */ sw $s4, 0x20($sp) -/* A3A9F0 80241510 AFB3001C */ sw $s3, 0x1c($sp) -/* A3A9F4 80241514 AFB20018 */ sw $s2, 0x18($sp) -/* A3A9F8 80241518 AFB10014 */ sw $s1, 0x14($sp) -/* A3A9FC 8024151C 0C0B1EAF */ jal get_variable -/* A3AA00 80241520 AFB00010 */ sw $s0, 0x10($sp) -/* A3AA04 80241524 0040A82D */ daddu $s5, $v0, $zero -/* A3AA08 80241528 0000A02D */ daddu $s4, $zero, $zero -/* A3AA0C 8024152C 0280802D */ daddu $s0, $s4, $zero -/* A3AA10 80241530 3C12F971 */ lui $s2, 0xf971 -/* A3AA14 80241534 365288E4 */ ori $s2, $s2, 0x88e4 -/* A3AA18 80241538 3C118024 */ lui $s1, 0x8024 -/* A3AA1C 8024153C 26314B8C */ addiu $s1, $s1, 0x4b8c -/* A3AA20 80241540 AFC00088 */ sw $zero, 0x88($fp) -.L80241544: -/* A3AA24 80241544 8E220004 */ lw $v0, 4($s1) -/* A3AA28 80241548 02A2102A */ slt $v0, $s5, $v0 -/* A3AA2C 8024154C 5440000C */ bnel $v0, $zero, .L80241580 -/* A3AA30 80241550 26100001 */ addiu $s0, $s0, 1 -/* A3AA34 80241554 8E250000 */ lw $a1, ($s1) -/* A3AA38 80241558 0C0B1EAF */ jal get_variable -/* A3AA3C 8024155C 0000202D */ daddu $a0, $zero, $zero -/* A3AA40 80241560 54400007 */ bnel $v0, $zero, .L80241580 -/* A3AA44 80241564 26100001 */ addiu $s0, $s0, 1 -/* A3AA48 80241568 0000202D */ daddu $a0, $zero, $zero -/* A3AA4C 8024156C 0C0B1EAF */ jal get_variable -/* A3AA50 80241570 02122821 */ addu $a1, $s0, $s2 -/* A3AA54 80241574 50400001 */ beql $v0, $zero, .L8024157C -/* A3AA58 80241578 26940001 */ addiu $s4, $s4, 1 -.L8024157C: -/* A3AA5C 8024157C 26100001 */ addiu $s0, $s0, 1 -.L80241580: -/* A3AA60 80241580 2E020010 */ sltiu $v0, $s0, 0x10 -/* A3AA64 80241584 1440FFEF */ bnez $v0, .L80241544 -/* A3AA68 80241588 2631000C */ addiu $s1, $s1, 0xc -/* A3AA6C 8024158C 12800029 */ beqz $s4, .L80241634 -/* A3AA70 80241590 00000000 */ nop -/* A3AA74 80241594 0C00A67F */ jal rand_int -/* A3AA78 80241598 2684FFFF */ addiu $a0, $s4, -1 -/* A3AA7C 8024159C 0040B82D */ daddu $s7, $v0, $zero -/* A3AA80 802415A0 3C138024 */ lui $s3, 0x8024 -/* A3AA84 802415A4 26734B88 */ addiu $s3, $s3, 0x4b88 -/* A3AA88 802415A8 0000A02D */ daddu $s4, $zero, $zero -/* A3AA8C 802415AC 0280802D */ daddu $s0, $s4, $zero -/* A3AA90 802415B0 3C16F971 */ lui $s6, 0xf971 -/* A3AA94 802415B4 36D688E4 */ ori $s6, $s6, 0x88e4 -/* A3AA98 802415B8 26720004 */ addiu $s2, $s3, 4 -.L802415BC: -/* A3AA9C 802415BC 8E420004 */ lw $v0, 4($s2) -/* A3AAA0 802415C0 02A2102A */ slt $v0, $s5, $v0 -/* A3AAA4 802415C4 54400017 */ bnel $v0, $zero, .L80241624 -/* A3AAA8 802415C8 26100001 */ addiu $s0, $s0, 1 -/* A3AAAC 802415CC 8E450000 */ lw $a1, ($s2) -/* A3AAB0 802415D0 0C0B1EAF */ jal get_variable -/* A3AAB4 802415D4 0000202D */ daddu $a0, $zero, $zero -/* A3AAB8 802415D8 54400012 */ bnel $v0, $zero, .L80241624 -/* A3AABC 802415DC 26100001 */ addiu $s0, $s0, 1 -/* A3AAC0 802415E0 0000202D */ daddu $a0, $zero, $zero -/* A3AAC4 802415E4 02168821 */ addu $s1, $s0, $s6 -/* A3AAC8 802415E8 0C0B1EAF */ jal get_variable -/* A3AACC 802415EC 0220282D */ daddu $a1, $s1, $zero -/* A3AAD0 802415F0 5440000C */ bnel $v0, $zero, .L80241624 -/* A3AAD4 802415F4 26100001 */ addiu $s0, $s0, 1 -/* A3AAD8 802415F8 16970009 */ bne $s4, $s7, .L80241620 -/* A3AADC 802415FC 26940001 */ addiu $s4, $s4, 1 -/* A3AAE0 80241600 0000202D */ daddu $a0, $zero, $zero -/* A3AAE4 80241604 0220282D */ daddu $a1, $s1, $zero -/* A3AAE8 80241608 8E620000 */ lw $v0, ($s3) -/* A3AAEC 8024160C 24060001 */ addiu $a2, $zero, 1 -/* A3AAF0 80241610 0C0B2026 */ jal set_variable -/* A3AAF4 80241614 AFC20088 */ sw $v0, 0x88($fp) -/* A3AAF8 80241618 0809058D */ j .L80241634 -/* A3AAFC 8024161C 00000000 */ nop -.L80241620: -/* A3AB00 80241620 26100001 */ addiu $s0, $s0, 1 -.L80241624: -/* A3AB04 80241624 2652000C */ addiu $s2, $s2, 0xc -/* A3AB08 80241628 2E020010 */ sltiu $v0, $s0, 0x10 -/* A3AB0C 8024162C 1440FFE3 */ bnez $v0, .L802415BC -/* A3AB10 80241630 2673000C */ addiu $s3, $s3, 0xc -.L80241634: -/* A3AB14 80241634 8FBF0034 */ lw $ra, 0x34($sp) -/* A3AB18 80241638 8FBE0030 */ lw $fp, 0x30($sp) -/* A3AB1C 8024163C 8FB7002C */ lw $s7, 0x2c($sp) -/* A3AB20 80241640 8FB60028 */ lw $s6, 0x28($sp) -/* A3AB24 80241644 8FB50024 */ lw $s5, 0x24($sp) -/* A3AB28 80241648 8FB40020 */ lw $s4, 0x20($sp) -/* A3AB2C 8024164C 8FB3001C */ lw $s3, 0x1c($sp) -/* A3AB30 80241650 8FB20018 */ lw $s2, 0x18($sp) -/* A3AB34 80241654 8FB10014 */ lw $s1, 0x14($sp) -/* A3AB38 80241658 8FB00010 */ lw $s0, 0x10($sp) -/* A3AB3C 8024165C 24020002 */ addiu $v0, $zero, 2 -/* A3AB40 80241660 03E00008 */ jr $ra -/* A3AB44 80241664 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s new file mode 100644 index 0000000000..64964c2acb --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802414E4_A3A9C4.s @@ -0,0 +1,108 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414E4_A3A9C4 +/* A3A9C4 802414E4 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A3A9C8 802414E8 AFBE0030 */ sw $fp, 0x30($sp) +/* A3A9CC 802414EC 0080F02D */ daddu $fp, $a0, $zero +/* A3A9D0 802414F0 0000202D */ daddu $a0, $zero, $zero +/* A3A9D4 802414F4 3C05F5DE */ lui $a1, 0xf5de +/* A3A9D8 802414F8 34A50180 */ ori $a1, $a1, 0x180 +/* A3A9DC 802414FC AFBF0034 */ sw $ra, 0x34($sp) +/* A3A9E0 80241500 AFB7002C */ sw $s7, 0x2c($sp) +/* A3A9E4 80241504 AFB60028 */ sw $s6, 0x28($sp) +/* A3A9E8 80241508 AFB50024 */ sw $s5, 0x24($sp) +/* A3A9EC 8024150C AFB40020 */ sw $s4, 0x20($sp) +/* A3A9F0 80241510 AFB3001C */ sw $s3, 0x1c($sp) +/* A3A9F4 80241514 AFB20018 */ sw $s2, 0x18($sp) +/* A3A9F8 80241518 AFB10014 */ sw $s1, 0x14($sp) +/* A3A9FC 8024151C 0C0B1EAF */ jal get_variable +/* A3AA00 80241520 AFB00010 */ sw $s0, 0x10($sp) +/* A3AA04 80241524 0040A82D */ daddu $s5, $v0, $zero +/* A3AA08 80241528 0000A02D */ daddu $s4, $zero, $zero +/* A3AA0C 8024152C 0280802D */ daddu $s0, $s4, $zero +/* A3AA10 80241530 3C12F971 */ lui $s2, 0xf971 +/* A3AA14 80241534 365288E4 */ ori $s2, $s2, 0x88e4 +/* A3AA18 80241538 3C118024 */ lui $s1, 0x8024 +/* A3AA1C 8024153C 26314B8C */ addiu $s1, $s1, 0x4b8c +/* A3AA20 80241540 AFC00088 */ sw $zero, 0x88($fp) +.L80241544: +/* A3AA24 80241544 8E220004 */ lw $v0, 4($s1) +/* A3AA28 80241548 02A2102A */ slt $v0, $s5, $v0 +/* A3AA2C 8024154C 5440000C */ bnel $v0, $zero, .L80241580 +/* A3AA30 80241550 26100001 */ addiu $s0, $s0, 1 +/* A3AA34 80241554 8E250000 */ lw $a1, ($s1) +/* A3AA38 80241558 0C0B1EAF */ jal get_variable +/* A3AA3C 8024155C 0000202D */ daddu $a0, $zero, $zero +/* A3AA40 80241560 54400007 */ bnel $v0, $zero, .L80241580 +/* A3AA44 80241564 26100001 */ addiu $s0, $s0, 1 +/* A3AA48 80241568 0000202D */ daddu $a0, $zero, $zero +/* A3AA4C 8024156C 0C0B1EAF */ jal get_variable +/* A3AA50 80241570 02122821 */ addu $a1, $s0, $s2 +/* A3AA54 80241574 50400001 */ beql $v0, $zero, .L8024157C +/* A3AA58 80241578 26940001 */ addiu $s4, $s4, 1 +.L8024157C: +/* A3AA5C 8024157C 26100001 */ addiu $s0, $s0, 1 +.L80241580: +/* A3AA60 80241580 2E020010 */ sltiu $v0, $s0, 0x10 +/* A3AA64 80241584 1440FFEF */ bnez $v0, .L80241544 +/* A3AA68 80241588 2631000C */ addiu $s1, $s1, 0xc +/* A3AA6C 8024158C 12800029 */ beqz $s4, .L80241634 +/* A3AA70 80241590 00000000 */ nop +/* A3AA74 80241594 0C00A67F */ jal rand_int +/* A3AA78 80241598 2684FFFF */ addiu $a0, $s4, -1 +/* A3AA7C 8024159C 0040B82D */ daddu $s7, $v0, $zero +/* A3AA80 802415A0 3C138024 */ lui $s3, 0x8024 +/* A3AA84 802415A4 26734B88 */ addiu $s3, $s3, 0x4b88 +/* A3AA88 802415A8 0000A02D */ daddu $s4, $zero, $zero +/* A3AA8C 802415AC 0280802D */ daddu $s0, $s4, $zero +/* A3AA90 802415B0 3C16F971 */ lui $s6, 0xf971 +/* A3AA94 802415B4 36D688E4 */ ori $s6, $s6, 0x88e4 +/* A3AA98 802415B8 26720004 */ addiu $s2, $s3, 4 +.L802415BC: +/* A3AA9C 802415BC 8E420004 */ lw $v0, 4($s2) +/* A3AAA0 802415C0 02A2102A */ slt $v0, $s5, $v0 +/* A3AAA4 802415C4 54400017 */ bnel $v0, $zero, .L80241624 +/* A3AAA8 802415C8 26100001 */ addiu $s0, $s0, 1 +/* A3AAAC 802415CC 8E450000 */ lw $a1, ($s2) +/* A3AAB0 802415D0 0C0B1EAF */ jal get_variable +/* A3AAB4 802415D4 0000202D */ daddu $a0, $zero, $zero +/* A3AAB8 802415D8 54400012 */ bnel $v0, $zero, .L80241624 +/* A3AABC 802415DC 26100001 */ addiu $s0, $s0, 1 +/* A3AAC0 802415E0 0000202D */ daddu $a0, $zero, $zero +/* A3AAC4 802415E4 02168821 */ addu $s1, $s0, $s6 +/* A3AAC8 802415E8 0C0B1EAF */ jal get_variable +/* A3AACC 802415EC 0220282D */ daddu $a1, $s1, $zero +/* A3AAD0 802415F0 5440000C */ bnel $v0, $zero, .L80241624 +/* A3AAD4 802415F4 26100001 */ addiu $s0, $s0, 1 +/* A3AAD8 802415F8 16970009 */ bne $s4, $s7, .L80241620 +/* A3AADC 802415FC 26940001 */ addiu $s4, $s4, 1 +/* A3AAE0 80241600 0000202D */ daddu $a0, $zero, $zero +/* A3AAE4 80241604 0220282D */ daddu $a1, $s1, $zero +/* A3AAE8 80241608 8E620000 */ lw $v0, ($s3) +/* A3AAEC 8024160C 24060001 */ addiu $a2, $zero, 1 +/* A3AAF0 80241610 0C0B2026 */ jal set_variable +/* A3AAF4 80241614 AFC20088 */ sw $v0, 0x88($fp) +/* A3AAF8 80241618 0809058D */ j .L80241634 +/* A3AAFC 8024161C 00000000 */ nop +.L80241620: +/* A3AB00 80241620 26100001 */ addiu $s0, $s0, 1 +.L80241624: +/* A3AB04 80241624 2652000C */ addiu $s2, $s2, 0xc +/* A3AB08 80241628 2E020010 */ sltiu $v0, $s0, 0x10 +/* A3AB0C 8024162C 1440FFE3 */ bnez $v0, .L802415BC +/* A3AB10 80241630 2673000C */ addiu $s3, $s3, 0xc +.L80241634: +/* A3AB14 80241634 8FBF0034 */ lw $ra, 0x34($sp) +/* A3AB18 80241638 8FBE0030 */ lw $fp, 0x30($sp) +/* A3AB1C 8024163C 8FB7002C */ lw $s7, 0x2c($sp) +/* A3AB20 80241640 8FB60028 */ lw $s6, 0x28($sp) +/* A3AB24 80241644 8FB50024 */ lw $s5, 0x24($sp) +/* A3AB28 80241648 8FB40020 */ lw $s4, 0x20($sp) +/* A3AB2C 8024164C 8FB3001C */ lw $s3, 0x1c($sp) +/* A3AB30 80241650 8FB20018 */ lw $s2, 0x18($sp) +/* A3AB34 80241654 8FB10014 */ lw $s1, 0x14($sp) +/* A3AB38 80241658 8FB00010 */ lw $s0, 0x10($sp) +/* A3AB3C 8024165C 24020002 */ addiu $v0, $zero, 2 +/* A3AB40 80241660 03E00008 */ jr $ra +/* A3AB44 80241664 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668.s deleted file mode 100644 index 210840847c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668.s +++ /dev/null @@ -1,108 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668 -/* A3AB48 80241668 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A3AB4C 8024166C AFBE0030 */ sw $fp, 0x30($sp) -/* A3AB50 80241670 0080F02D */ daddu $fp, $a0, $zero -/* A3AB54 80241674 0000202D */ daddu $a0, $zero, $zero -/* A3AB58 80241678 3C05F5DE */ lui $a1, 0xf5de -/* A3AB5C 8024167C 34A50180 */ ori $a1, $a1, 0x180 -/* A3AB60 80241680 AFBF0034 */ sw $ra, 0x34($sp) -/* A3AB64 80241684 AFB7002C */ sw $s7, 0x2c($sp) -/* A3AB68 80241688 AFB60028 */ sw $s6, 0x28($sp) -/* A3AB6C 8024168C AFB50024 */ sw $s5, 0x24($sp) -/* A3AB70 80241690 AFB40020 */ sw $s4, 0x20($sp) -/* A3AB74 80241694 AFB3001C */ sw $s3, 0x1c($sp) -/* A3AB78 80241698 AFB20018 */ sw $s2, 0x18($sp) -/* A3AB7C 8024169C AFB10014 */ sw $s1, 0x14($sp) -/* A3AB80 802416A0 0C0B1EAF */ jal get_variable -/* A3AB84 802416A4 AFB00010 */ sw $s0, 0x10($sp) -/* A3AB88 802416A8 0040A82D */ daddu $s5, $v0, $zero -/* A3AB8C 802416AC 0000A02D */ daddu $s4, $zero, $zero -/* A3AB90 802416B0 0280802D */ daddu $s0, $s4, $zero -/* A3AB94 802416B4 3C12F971 */ lui $s2, 0xf971 -/* A3AB98 802416B8 365288F4 */ ori $s2, $s2, 0x88f4 -/* A3AB9C 802416BC 3C118024 */ lui $s1, 0x8024 -/* A3ABA0 802416C0 26314C4C */ addiu $s1, $s1, 0x4c4c -/* A3ABA4 802416C4 AFC00088 */ sw $zero, 0x88($fp) -.L802416C8: -/* A3ABA8 802416C8 8E220004 */ lw $v0, 4($s1) -/* A3ABAC 802416CC 02A2102A */ slt $v0, $s5, $v0 -/* A3ABB0 802416D0 5440000C */ bnel $v0, $zero, .L80241704 -/* A3ABB4 802416D4 26100001 */ addiu $s0, $s0, 1 -/* A3ABB8 802416D8 8E250000 */ lw $a1, ($s1) -/* A3ABBC 802416DC 0C0B1EAF */ jal get_variable -/* A3ABC0 802416E0 0000202D */ daddu $a0, $zero, $zero -/* A3ABC4 802416E4 54400007 */ bnel $v0, $zero, .L80241704 -/* A3ABC8 802416E8 26100001 */ addiu $s0, $s0, 1 -/* A3ABCC 802416EC 0000202D */ daddu $a0, $zero, $zero -/* A3ABD0 802416F0 0C0B1EAF */ jal get_variable -/* A3ABD4 802416F4 02122821 */ addu $a1, $s0, $s2 -/* A3ABD8 802416F8 50400001 */ beql $v0, $zero, .L80241700 -/* A3ABDC 802416FC 26940001 */ addiu $s4, $s4, 1 -.L80241700: -/* A3ABE0 80241700 26100001 */ addiu $s0, $s0, 1 -.L80241704: -/* A3ABE4 80241704 2E02003F */ sltiu $v0, $s0, 0x3f -/* A3ABE8 80241708 1440FFEF */ bnez $v0, .L802416C8 -/* A3ABEC 8024170C 2631000C */ addiu $s1, $s1, 0xc -/* A3ABF0 80241710 12800029 */ beqz $s4, .L802417B8 -/* A3ABF4 80241714 00000000 */ nop -/* A3ABF8 80241718 0C00A67F */ jal rand_int -/* A3ABFC 8024171C 2684FFFF */ addiu $a0, $s4, -1 -/* A3AC00 80241720 0040B82D */ daddu $s7, $v0, $zero -/* A3AC04 80241724 3C138024 */ lui $s3, 0x8024 -/* A3AC08 80241728 26734C48 */ addiu $s3, $s3, 0x4c48 -/* A3AC0C 8024172C 0000A02D */ daddu $s4, $zero, $zero -/* A3AC10 80241730 0280802D */ daddu $s0, $s4, $zero -/* A3AC14 80241734 3C16F971 */ lui $s6, 0xf971 -/* A3AC18 80241738 36D688F4 */ ori $s6, $s6, 0x88f4 -/* A3AC1C 8024173C 26720004 */ addiu $s2, $s3, 4 -.L80241740: -/* A3AC20 80241740 8E420004 */ lw $v0, 4($s2) -/* A3AC24 80241744 02A2102A */ slt $v0, $s5, $v0 -/* A3AC28 80241748 54400017 */ bnel $v0, $zero, .L802417A8 -/* A3AC2C 8024174C 26100001 */ addiu $s0, $s0, 1 -/* A3AC30 80241750 8E450000 */ lw $a1, ($s2) -/* A3AC34 80241754 0C0B1EAF */ jal get_variable -/* A3AC38 80241758 0000202D */ daddu $a0, $zero, $zero -/* A3AC3C 8024175C 54400012 */ bnel $v0, $zero, .L802417A8 -/* A3AC40 80241760 26100001 */ addiu $s0, $s0, 1 -/* A3AC44 80241764 0000202D */ daddu $a0, $zero, $zero -/* A3AC48 80241768 02168821 */ addu $s1, $s0, $s6 -/* A3AC4C 8024176C 0C0B1EAF */ jal get_variable -/* A3AC50 80241770 0220282D */ daddu $a1, $s1, $zero -/* A3AC54 80241774 5440000C */ bnel $v0, $zero, .L802417A8 -/* A3AC58 80241778 26100001 */ addiu $s0, $s0, 1 -/* A3AC5C 8024177C 16970009 */ bne $s4, $s7, .L802417A4 -/* A3AC60 80241780 26940001 */ addiu $s4, $s4, 1 -/* A3AC64 80241784 0000202D */ daddu $a0, $zero, $zero -/* A3AC68 80241788 0220282D */ daddu $a1, $s1, $zero -/* A3AC6C 8024178C 8E620000 */ lw $v0, ($s3) -/* A3AC70 80241790 24060001 */ addiu $a2, $zero, 1 -/* A3AC74 80241794 0C0B2026 */ jal set_variable -/* A3AC78 80241798 AFC20088 */ sw $v0, 0x88($fp) -/* A3AC7C 8024179C 080905EE */ j .L802417B8 -/* A3AC80 802417A0 00000000 */ nop -.L802417A4: -/* A3AC84 802417A4 26100001 */ addiu $s0, $s0, 1 -.L802417A8: -/* A3AC88 802417A8 2652000C */ addiu $s2, $s2, 0xc -/* A3AC8C 802417AC 2E02003F */ sltiu $v0, $s0, 0x3f -/* A3AC90 802417B0 1440FFE3 */ bnez $v0, .L80241740 -/* A3AC94 802417B4 2673000C */ addiu $s3, $s3, 0xc -.L802417B8: -/* A3AC98 802417B8 8FBF0034 */ lw $ra, 0x34($sp) -/* A3AC9C 802417BC 8FBE0030 */ lw $fp, 0x30($sp) -/* A3ACA0 802417C0 8FB7002C */ lw $s7, 0x2c($sp) -/* A3ACA4 802417C4 8FB60028 */ lw $s6, 0x28($sp) -/* A3ACA8 802417C8 8FB50024 */ lw $s5, 0x24($sp) -/* A3ACAC 802417CC 8FB40020 */ lw $s4, 0x20($sp) -/* A3ACB0 802417D0 8FB3001C */ lw $s3, 0x1c($sp) -/* A3ACB4 802417D4 8FB20018 */ lw $s2, 0x18($sp) -/* A3ACB8 802417D8 8FB10014 */ lw $s1, 0x14($sp) -/* A3ACBC 802417DC 8FB00010 */ lw $s0, 0x10($sp) -/* A3ACC0 802417E0 24020002 */ addiu $v0, $zero, 2 -/* A3ACC4 802417E4 03E00008 */ jr $ra -/* A3ACC8 802417E8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s new file mode 100644 index 0000000000..56b15d1aa9 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241668_A3AB48.s @@ -0,0 +1,108 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241668_A3AB48 +/* A3AB48 80241668 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A3AB4C 8024166C AFBE0030 */ sw $fp, 0x30($sp) +/* A3AB50 80241670 0080F02D */ daddu $fp, $a0, $zero +/* A3AB54 80241674 0000202D */ daddu $a0, $zero, $zero +/* A3AB58 80241678 3C05F5DE */ lui $a1, 0xf5de +/* A3AB5C 8024167C 34A50180 */ ori $a1, $a1, 0x180 +/* A3AB60 80241680 AFBF0034 */ sw $ra, 0x34($sp) +/* A3AB64 80241684 AFB7002C */ sw $s7, 0x2c($sp) +/* A3AB68 80241688 AFB60028 */ sw $s6, 0x28($sp) +/* A3AB6C 8024168C AFB50024 */ sw $s5, 0x24($sp) +/* A3AB70 80241690 AFB40020 */ sw $s4, 0x20($sp) +/* A3AB74 80241694 AFB3001C */ sw $s3, 0x1c($sp) +/* A3AB78 80241698 AFB20018 */ sw $s2, 0x18($sp) +/* A3AB7C 8024169C AFB10014 */ sw $s1, 0x14($sp) +/* A3AB80 802416A0 0C0B1EAF */ jal get_variable +/* A3AB84 802416A4 AFB00010 */ sw $s0, 0x10($sp) +/* A3AB88 802416A8 0040A82D */ daddu $s5, $v0, $zero +/* A3AB8C 802416AC 0000A02D */ daddu $s4, $zero, $zero +/* A3AB90 802416B0 0280802D */ daddu $s0, $s4, $zero +/* A3AB94 802416B4 3C12F971 */ lui $s2, 0xf971 +/* A3AB98 802416B8 365288F4 */ ori $s2, $s2, 0x88f4 +/* A3AB9C 802416BC 3C118024 */ lui $s1, 0x8024 +/* A3ABA0 802416C0 26314C4C */ addiu $s1, $s1, 0x4c4c +/* A3ABA4 802416C4 AFC00088 */ sw $zero, 0x88($fp) +.L802416C8: +/* A3ABA8 802416C8 8E220004 */ lw $v0, 4($s1) +/* A3ABAC 802416CC 02A2102A */ slt $v0, $s5, $v0 +/* A3ABB0 802416D0 5440000C */ bnel $v0, $zero, .L80241704 +/* A3ABB4 802416D4 26100001 */ addiu $s0, $s0, 1 +/* A3ABB8 802416D8 8E250000 */ lw $a1, ($s1) +/* A3ABBC 802416DC 0C0B1EAF */ jal get_variable +/* A3ABC0 802416E0 0000202D */ daddu $a0, $zero, $zero +/* A3ABC4 802416E4 54400007 */ bnel $v0, $zero, .L80241704 +/* A3ABC8 802416E8 26100001 */ addiu $s0, $s0, 1 +/* A3ABCC 802416EC 0000202D */ daddu $a0, $zero, $zero +/* A3ABD0 802416F0 0C0B1EAF */ jal get_variable +/* A3ABD4 802416F4 02122821 */ addu $a1, $s0, $s2 +/* A3ABD8 802416F8 50400001 */ beql $v0, $zero, .L80241700 +/* A3ABDC 802416FC 26940001 */ addiu $s4, $s4, 1 +.L80241700: +/* A3ABE0 80241700 26100001 */ addiu $s0, $s0, 1 +.L80241704: +/* A3ABE4 80241704 2E02003F */ sltiu $v0, $s0, 0x3f +/* A3ABE8 80241708 1440FFEF */ bnez $v0, .L802416C8 +/* A3ABEC 8024170C 2631000C */ addiu $s1, $s1, 0xc +/* A3ABF0 80241710 12800029 */ beqz $s4, .L802417B8 +/* A3ABF4 80241714 00000000 */ nop +/* A3ABF8 80241718 0C00A67F */ jal rand_int +/* A3ABFC 8024171C 2684FFFF */ addiu $a0, $s4, -1 +/* A3AC00 80241720 0040B82D */ daddu $s7, $v0, $zero +/* A3AC04 80241724 3C138024 */ lui $s3, 0x8024 +/* A3AC08 80241728 26734C48 */ addiu $s3, $s3, 0x4c48 +/* A3AC0C 8024172C 0000A02D */ daddu $s4, $zero, $zero +/* A3AC10 80241730 0280802D */ daddu $s0, $s4, $zero +/* A3AC14 80241734 3C16F971 */ lui $s6, 0xf971 +/* A3AC18 80241738 36D688F4 */ ori $s6, $s6, 0x88f4 +/* A3AC1C 8024173C 26720004 */ addiu $s2, $s3, 4 +.L80241740: +/* A3AC20 80241740 8E420004 */ lw $v0, 4($s2) +/* A3AC24 80241744 02A2102A */ slt $v0, $s5, $v0 +/* A3AC28 80241748 54400017 */ bnel $v0, $zero, .L802417A8 +/* A3AC2C 8024174C 26100001 */ addiu $s0, $s0, 1 +/* A3AC30 80241750 8E450000 */ lw $a1, ($s2) +/* A3AC34 80241754 0C0B1EAF */ jal get_variable +/* A3AC38 80241758 0000202D */ daddu $a0, $zero, $zero +/* A3AC3C 8024175C 54400012 */ bnel $v0, $zero, .L802417A8 +/* A3AC40 80241760 26100001 */ addiu $s0, $s0, 1 +/* A3AC44 80241764 0000202D */ daddu $a0, $zero, $zero +/* A3AC48 80241768 02168821 */ addu $s1, $s0, $s6 +/* A3AC4C 8024176C 0C0B1EAF */ jal get_variable +/* A3AC50 80241770 0220282D */ daddu $a1, $s1, $zero +/* A3AC54 80241774 5440000C */ bnel $v0, $zero, .L802417A8 +/* A3AC58 80241778 26100001 */ addiu $s0, $s0, 1 +/* A3AC5C 8024177C 16970009 */ bne $s4, $s7, .L802417A4 +/* A3AC60 80241780 26940001 */ addiu $s4, $s4, 1 +/* A3AC64 80241784 0000202D */ daddu $a0, $zero, $zero +/* A3AC68 80241788 0220282D */ daddu $a1, $s1, $zero +/* A3AC6C 8024178C 8E620000 */ lw $v0, ($s3) +/* A3AC70 80241790 24060001 */ addiu $a2, $zero, 1 +/* A3AC74 80241794 0C0B2026 */ jal set_variable +/* A3AC78 80241798 AFC20088 */ sw $v0, 0x88($fp) +/* A3AC7C 8024179C 080905EE */ j .L802417B8 +/* A3AC80 802417A0 00000000 */ nop +.L802417A4: +/* A3AC84 802417A4 26100001 */ addiu $s0, $s0, 1 +.L802417A8: +/* A3AC88 802417A8 2652000C */ addiu $s2, $s2, 0xc +/* A3AC8C 802417AC 2E02003F */ sltiu $v0, $s0, 0x3f +/* A3AC90 802417B0 1440FFE3 */ bnez $v0, .L80241740 +/* A3AC94 802417B4 2673000C */ addiu $s3, $s3, 0xc +.L802417B8: +/* A3AC98 802417B8 8FBF0034 */ lw $ra, 0x34($sp) +/* A3AC9C 802417BC 8FBE0030 */ lw $fp, 0x30($sp) +/* A3ACA0 802417C0 8FB7002C */ lw $s7, 0x2c($sp) +/* A3ACA4 802417C4 8FB60028 */ lw $s6, 0x28($sp) +/* A3ACA8 802417C8 8FB50024 */ lw $s5, 0x24($sp) +/* A3ACAC 802417CC 8FB40020 */ lw $s4, 0x20($sp) +/* A3ACB0 802417D0 8FB3001C */ lw $s3, 0x1c($sp) +/* A3ACB4 802417D4 8FB20018 */ lw $s2, 0x18($sp) +/* A3ACB8 802417D8 8FB10014 */ lw $s1, 0x14($sp) +/* A3ACBC 802417DC 8FB00010 */ lw $s0, 0x10($sp) +/* A3ACC0 802417E0 24020002 */ addiu $v0, $zero, 2 +/* A3ACC4 802417E4 03E00008 */ jr $ra +/* A3ACC8 802417E8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860.s deleted file mode 100644 index 807779f52f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241860 -/* A3AD40 80241860 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3AD44 80241864 AFBF0010 */ sw $ra, 0x10($sp) -/* A3AD48 80241868 8C82000C */ lw $v0, 0xc($a0) -/* A3AD4C 8024186C 0C0B1EAF */ jal get_variable -/* A3AD50 80241870 8C450000 */ lw $a1, ($v0) -/* A3AD54 80241874 3C058011 */ lui $a1, %hi(gPlayerData) -/* A3AD58 80241878 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* A3AD5C 8024187C 3C048024 */ lui $a0, 0x8024 -/* A3AD60 80241880 00822021 */ addu $a0, $a0, $v0 -/* A3AD64 80241884 908447D0 */ lbu $a0, 0x47d0($a0) -/* A3AD68 80241888 94A3000C */ lhu $v1, 0xc($a1) -/* A3AD6C 8024188C 00641823 */ subu $v1, $v1, $a0 -/* A3AD70 80241890 A4A3000C */ sh $v1, 0xc($a1) -/* A3AD74 80241894 8FBF0010 */ lw $ra, 0x10($sp) -/* A3AD78 80241898 24020002 */ addiu $v0, $zero, 2 -/* A3AD7C 8024189C 03E00008 */ jr $ra -/* A3AD80 802418A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860_A3AD40.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860_A3AD40.s new file mode 100644 index 0000000000..59f2c82a15 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241860_A3AD40.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241860_A3AD40 +/* A3AD40 80241860 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3AD44 80241864 AFBF0010 */ sw $ra, 0x10($sp) +/* A3AD48 80241868 8C82000C */ lw $v0, 0xc($a0) +/* A3AD4C 8024186C 0C0B1EAF */ jal get_variable +/* A3AD50 80241870 8C450000 */ lw $a1, ($v0) +/* A3AD54 80241874 3C058011 */ lui $a1, %hi(gPlayerData) +/* A3AD58 80241878 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* A3AD5C 8024187C 3C048024 */ lui $a0, 0x8024 +/* A3AD60 80241880 00822021 */ addu $a0, $a0, $v0 +/* A3AD64 80241884 908447D0 */ lbu $a0, 0x47d0($a0) +/* A3AD68 80241888 94A3000C */ lhu $v1, 0xc($a1) +/* A3AD6C 8024188C 00641823 */ subu $v1, $v1, $a0 +/* A3AD70 80241890 A4A3000C */ sh $v1, 0xc($a1) +/* A3AD74 80241894 8FBF0010 */ lw $ra, 0x10($sp) +/* A3AD78 80241898 24020002 */ addiu $v0, $zero, 2 +/* A3AD7C 8024189C 03E00008 */ jr $ra +/* A3AD80 802418A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418E8.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418E8.s deleted file mode 100644 index d8cca8b1e8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418E8.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418E8 -/* A3ADC8 802418E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3ADCC 802418EC AFB00018 */ sw $s0, 0x18($sp) -/* A3ADD0 802418F0 0080802D */ daddu $s0, $a0, $zero -/* A3ADD4 802418F4 10A00042 */ beqz $a1, .L80241A00 -/* A3ADD8 802418F8 AFBF001C */ sw $ra, 0x1c($sp) -/* A3ADDC 802418FC 0C046C04 */ jal get_model_list_index_from_tree_index -/* A3ADE0 80241900 24040079 */ addiu $a0, $zero, 0x79 -/* A3ADE4 80241904 0C046B4C */ jal get_model_from_list_index -/* A3ADE8 80241908 0040202D */ daddu $a0, $v0, $zero -/* A3ADEC 8024190C 0040202D */ daddu $a0, $v0, $zero -/* A3ADF0 80241910 2405FFFF */ addiu $a1, $zero, -1 -/* A3ADF4 80241914 0C046F1F */ jal func_8011BC7C -/* A3ADF8 80241918 24060003 */ addiu $a2, $zero, 3 -/* A3ADFC 8024191C 0C046C04 */ jal get_model_list_index_from_tree_index -/* A3AE00 80241920 2404007A */ addiu $a0, $zero, 0x7a -/* A3AE04 80241924 0C046B4C */ jal get_model_from_list_index -/* A3AE08 80241928 0040202D */ daddu $a0, $v0, $zero -/* A3AE0C 8024192C 0040202D */ daddu $a0, $v0, $zero -/* A3AE10 80241930 2405FFFF */ addiu $a1, $zero, -1 -/* A3AE14 80241934 0C046F1F */ jal func_8011BC7C -/* A3AE18 80241938 24060003 */ addiu $a2, $zero, 3 -/* A3AE1C 8024193C 0C046C04 */ jal get_model_list_index_from_tree_index -/* A3AE20 80241940 2404007B */ addiu $a0, $zero, 0x7b -/* A3AE24 80241944 0C046B4C */ jal get_model_from_list_index -/* A3AE28 80241948 0040202D */ daddu $a0, $v0, $zero -/* A3AE2C 8024194C 0040202D */ daddu $a0, $v0, $zero -/* A3AE30 80241950 2405FFFF */ addiu $a1, $zero, -1 -/* A3AE34 80241954 0C046F1F */ jal func_8011BC7C -/* A3AE38 80241958 24060003 */ addiu $a2, $zero, 3 -/* A3AE3C 8024195C 0C046C04 */ jal get_model_list_index_from_tree_index -/* A3AE40 80241960 2404007C */ addiu $a0, $zero, 0x7c -/* A3AE44 80241964 0C046B4C */ jal get_model_from_list_index -/* A3AE48 80241968 0040202D */ daddu $a0, $v0, $zero -/* A3AE4C 8024196C 0040202D */ daddu $a0, $v0, $zero -/* A3AE50 80241970 2405FFFF */ addiu $a1, $zero, -1 -/* A3AE54 80241974 0C046F1F */ jal func_8011BC7C -/* A3AE58 80241978 24060003 */ addiu $a2, $zero, 3 -/* A3AE5C 8024197C 0C046C04 */ jal get_model_list_index_from_tree_index -/* A3AE60 80241980 2404007D */ addiu $a0, $zero, 0x7d -/* A3AE64 80241984 0C046B4C */ jal get_model_from_list_index -/* A3AE68 80241988 0040202D */ daddu $a0, $v0, $zero -/* A3AE6C 8024198C 0040202D */ daddu $a0, $v0, $zero -/* A3AE70 80241990 2405FFFF */ addiu $a1, $zero, -1 -/* A3AE74 80241994 0C046F1F */ jal func_8011BC7C -/* A3AE78 80241998 24060003 */ addiu $a2, $zero, 3 -/* A3AE7C 8024199C 0C046C04 */ jal get_model_list_index_from_tree_index -/* A3AE80 802419A0 2404007F */ addiu $a0, $zero, 0x7f -/* A3AE84 802419A4 0C046B4C */ jal get_model_from_list_index -/* A3AE88 802419A8 0040202D */ daddu $a0, $v0, $zero -/* A3AE8C 802419AC 0040202D */ daddu $a0, $v0, $zero -/* A3AE90 802419B0 2405FFFF */ addiu $a1, $zero, -1 -/* A3AE94 802419B4 0C046F1F */ jal func_8011BC7C -/* A3AE98 802419B8 24060003 */ addiu $a2, $zero, 3 -/* A3AE9C 802419BC 0C046C04 */ jal get_model_list_index_from_tree_index -/* A3AEA0 802419C0 240400D0 */ addiu $a0, $zero, 0xd0 -/* A3AEA4 802419C4 0C046B4C */ jal get_model_from_list_index -/* A3AEA8 802419C8 0040202D */ daddu $a0, $v0, $zero -/* A3AEAC 802419CC 0040202D */ daddu $a0, $v0, $zero -/* A3AEB0 802419D0 2405FFFF */ addiu $a1, $zero, -1 -/* A3AEB4 802419D4 0C046F1F */ jal func_8011BC7C -/* A3AEB8 802419D8 24060003 */ addiu $a2, $zero, 3 -/* A3AEBC 802419DC 240400FF */ addiu $a0, $zero, 0xff -/* A3AEC0 802419E0 0080282D */ daddu $a1, $a0, $zero -/* A3AEC4 802419E4 0080302D */ daddu $a2, $a0, $zero -/* A3AEC8 802419E8 0000382D */ daddu $a3, $zero, $zero -/* A3AECC 802419EC AFA00010 */ sw $zero, 0x10($sp) -/* A3AED0 802419F0 0C046FE6 */ jal func_8011BF98 -/* A3AED4 802419F4 AFA00014 */ sw $zero, 0x14($sp) -/* A3AED8 802419F8 240200FF */ addiu $v0, $zero, 0xff -/* A3AEDC 802419FC AE020070 */ sw $v0, 0x70($s0) -.L80241A00: -/* A3AEE0 80241A00 8E020070 */ lw $v0, 0x70($s0) -/* A3AEE4 80241A04 2442FFFC */ addiu $v0, $v0, -4 -/* A3AEE8 80241A08 AE020070 */ sw $v0, 0x70($s0) -/* A3AEEC 80241A0C 28420040 */ slti $v0, $v0, 0x40 -/* A3AEF0 80241A10 10400002 */ beqz $v0, .L80241A1C -/* A3AEF4 80241A14 24020040 */ addiu $v0, $zero, 0x40 -/* A3AEF8 80241A18 AE020070 */ sw $v0, 0x70($s0) -.L80241A1C: -/* A3AEFC 80241A1C 92040073 */ lbu $a0, 0x73($s0) -/* A3AF00 80241A20 0000382D */ daddu $a3, $zero, $zero -/* A3AF04 80241A24 AFA00010 */ sw $zero, 0x10($sp) -/* A3AF08 80241A28 AFA00014 */ sw $zero, 0x14($sp) -/* A3AF0C 80241A2C 0080282D */ daddu $a1, $a0, $zero -/* A3AF10 80241A30 0C046FE6 */ jal func_8011BF98 -/* A3AF14 80241A34 0080302D */ daddu $a2, $a0, $zero -/* A3AF18 80241A38 8E020070 */ lw $v0, 0x70($s0) -/* A3AF1C 80241A3C 8FBF001C */ lw $ra, 0x1c($sp) -/* A3AF20 80241A40 8FB00018 */ lw $s0, 0x18($sp) -/* A3AF24 80241A44 38420040 */ xori $v0, $v0, 0x40 -/* A3AF28 80241A48 2C420001 */ sltiu $v0, $v0, 1 -/* A3AF2C 80241A4C 00021040 */ sll $v0, $v0, 1 -/* A3AF30 80241A50 03E00008 */ jr $ra -/* A3AF34 80241A54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418E8_A3ADC8.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418E8_A3ADC8.s new file mode 100644 index 0000000000..41621a3920 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802418E8_A3ADC8.s @@ -0,0 +1,98 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418E8_A3ADC8 +/* A3ADC8 802418E8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3ADCC 802418EC AFB00018 */ sw $s0, 0x18($sp) +/* A3ADD0 802418F0 0080802D */ daddu $s0, $a0, $zero +/* A3ADD4 802418F4 10A00042 */ beqz $a1, .L80241A00 +/* A3ADD8 802418F8 AFBF001C */ sw $ra, 0x1c($sp) +/* A3ADDC 802418FC 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3ADE0 80241900 24040079 */ addiu $a0, $zero, 0x79 +/* A3ADE4 80241904 0C046B4C */ jal get_model_from_list_index +/* A3ADE8 80241908 0040202D */ daddu $a0, $v0, $zero +/* A3ADEC 8024190C 0040202D */ daddu $a0, $v0, $zero +/* A3ADF0 80241910 2405FFFF */ addiu $a1, $zero, -1 +/* A3ADF4 80241914 0C046F1F */ jal func_8011BC7C +/* A3ADF8 80241918 24060003 */ addiu $a2, $zero, 3 +/* A3ADFC 8024191C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE00 80241920 2404007A */ addiu $a0, $zero, 0x7a +/* A3AE04 80241924 0C046B4C */ jal get_model_from_list_index +/* A3AE08 80241928 0040202D */ daddu $a0, $v0, $zero +/* A3AE0C 8024192C 0040202D */ daddu $a0, $v0, $zero +/* A3AE10 80241930 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE14 80241934 0C046F1F */ jal func_8011BC7C +/* A3AE18 80241938 24060003 */ addiu $a2, $zero, 3 +/* A3AE1C 8024193C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE20 80241940 2404007B */ addiu $a0, $zero, 0x7b +/* A3AE24 80241944 0C046B4C */ jal get_model_from_list_index +/* A3AE28 80241948 0040202D */ daddu $a0, $v0, $zero +/* A3AE2C 8024194C 0040202D */ daddu $a0, $v0, $zero +/* A3AE30 80241950 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE34 80241954 0C046F1F */ jal func_8011BC7C +/* A3AE38 80241958 24060003 */ addiu $a2, $zero, 3 +/* A3AE3C 8024195C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE40 80241960 2404007C */ addiu $a0, $zero, 0x7c +/* A3AE44 80241964 0C046B4C */ jal get_model_from_list_index +/* A3AE48 80241968 0040202D */ daddu $a0, $v0, $zero +/* A3AE4C 8024196C 0040202D */ daddu $a0, $v0, $zero +/* A3AE50 80241970 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE54 80241974 0C046F1F */ jal func_8011BC7C +/* A3AE58 80241978 24060003 */ addiu $a2, $zero, 3 +/* A3AE5C 8024197C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE60 80241980 2404007D */ addiu $a0, $zero, 0x7d +/* A3AE64 80241984 0C046B4C */ jal get_model_from_list_index +/* A3AE68 80241988 0040202D */ daddu $a0, $v0, $zero +/* A3AE6C 8024198C 0040202D */ daddu $a0, $v0, $zero +/* A3AE70 80241990 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE74 80241994 0C046F1F */ jal func_8011BC7C +/* A3AE78 80241998 24060003 */ addiu $a2, $zero, 3 +/* A3AE7C 8024199C 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AE80 802419A0 2404007F */ addiu $a0, $zero, 0x7f +/* A3AE84 802419A4 0C046B4C */ jal get_model_from_list_index +/* A3AE88 802419A8 0040202D */ daddu $a0, $v0, $zero +/* A3AE8C 802419AC 0040202D */ daddu $a0, $v0, $zero +/* A3AE90 802419B0 2405FFFF */ addiu $a1, $zero, -1 +/* A3AE94 802419B4 0C046F1F */ jal func_8011BC7C +/* A3AE98 802419B8 24060003 */ addiu $a2, $zero, 3 +/* A3AE9C 802419BC 0C046C04 */ jal get_model_list_index_from_tree_index +/* A3AEA0 802419C0 240400D0 */ addiu $a0, $zero, 0xd0 +/* A3AEA4 802419C4 0C046B4C */ jal get_model_from_list_index +/* A3AEA8 802419C8 0040202D */ daddu $a0, $v0, $zero +/* A3AEAC 802419CC 0040202D */ daddu $a0, $v0, $zero +/* A3AEB0 802419D0 2405FFFF */ addiu $a1, $zero, -1 +/* A3AEB4 802419D4 0C046F1F */ jal func_8011BC7C +/* A3AEB8 802419D8 24060003 */ addiu $a2, $zero, 3 +/* A3AEBC 802419DC 240400FF */ addiu $a0, $zero, 0xff +/* A3AEC0 802419E0 0080282D */ daddu $a1, $a0, $zero +/* A3AEC4 802419E4 0080302D */ daddu $a2, $a0, $zero +/* A3AEC8 802419E8 0000382D */ daddu $a3, $zero, $zero +/* A3AECC 802419EC AFA00010 */ sw $zero, 0x10($sp) +/* A3AED0 802419F0 0C046FE6 */ jal func_8011BF98 +/* A3AED4 802419F4 AFA00014 */ sw $zero, 0x14($sp) +/* A3AED8 802419F8 240200FF */ addiu $v0, $zero, 0xff +/* A3AEDC 802419FC AE020070 */ sw $v0, 0x70($s0) +.L80241A00: +/* A3AEE0 80241A00 8E020070 */ lw $v0, 0x70($s0) +/* A3AEE4 80241A04 2442FFFC */ addiu $v0, $v0, -4 +/* A3AEE8 80241A08 AE020070 */ sw $v0, 0x70($s0) +/* A3AEEC 80241A0C 28420040 */ slti $v0, $v0, 0x40 +/* A3AEF0 80241A10 10400002 */ beqz $v0, .L80241A1C +/* A3AEF4 80241A14 24020040 */ addiu $v0, $zero, 0x40 +/* A3AEF8 80241A18 AE020070 */ sw $v0, 0x70($s0) +.L80241A1C: +/* A3AEFC 80241A1C 92040073 */ lbu $a0, 0x73($s0) +/* A3AF00 80241A20 0000382D */ daddu $a3, $zero, $zero +/* A3AF04 80241A24 AFA00010 */ sw $zero, 0x10($sp) +/* A3AF08 80241A28 AFA00014 */ sw $zero, 0x14($sp) +/* A3AF0C 80241A2C 0080282D */ daddu $a1, $a0, $zero +/* A3AF10 80241A30 0C046FE6 */ jal func_8011BF98 +/* A3AF14 80241A34 0080302D */ daddu $a2, $a0, $zero +/* A3AF18 80241A38 8E020070 */ lw $v0, 0x70($s0) +/* A3AF1C 80241A3C 8FBF001C */ lw $ra, 0x1c($sp) +/* A3AF20 80241A40 8FB00018 */ lw $s0, 0x18($sp) +/* A3AF24 80241A44 38420040 */ xori $v0, $v0, 0x40 +/* A3AF28 80241A48 2C420001 */ sltiu $v0, $v0, 1 +/* A3AF2C 80241A4C 00021040 */ sll $v0, $v0, 1 +/* A3AF30 80241A50 03E00008 */ jr $ra +/* A3AF34 80241A54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58.s deleted file mode 100644 index c1d2747ea1..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A58 -/* A3AF38 80241A58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3AF3C 80241A5C AFB00018 */ sw $s0, 0x18($sp) -/* A3AF40 80241A60 0080802D */ daddu $s0, $a0, $zero -/* A3AF44 80241A64 10A00005 */ beqz $a1, .L80241A7C -/* A3AF48 80241A68 AFBF001C */ sw $ra, 0x1c($sp) -/* A3AF4C 80241A6C 24020040 */ addiu $v0, $zero, 0x40 -/* A3AF50 80241A70 AE020070 */ sw $v0, 0x70($s0) -/* A3AF54 80241A74 AE020078 */ sw $v0, 0x78($s0) -/* A3AF58 80241A78 AE000074 */ sw $zero, 0x74($s0) -.L80241A7C: -/* A3AF5C 80241A7C 8E020074 */ lw $v0, 0x74($s0) -/* A3AF60 80241A80 1440001A */ bnez $v0, .L80241AEC -/* A3AF64 80241A84 00000000 */ nop -/* A3AF68 80241A88 8E020070 */ lw $v0, 0x70($s0) -/* A3AF6C 80241A8C 24420004 */ addiu $v0, $v0, 4 -/* A3AF70 80241A90 AE020070 */ sw $v0, 0x70($s0) -/* A3AF74 80241A94 8E020078 */ lw $v0, 0x78($s0) -/* A3AF78 80241A98 8E030070 */ lw $v1, 0x70($s0) -/* A3AF7C 80241A9C 24420004 */ addiu $v0, $v0, 4 -/* A3AF80 80241AA0 28630080 */ slti $v1, $v1, 0x80 -/* A3AF84 80241AA4 14600003 */ bnez $v1, .L80241AB4 -/* A3AF88 80241AA8 AE020078 */ sw $v0, 0x78($s0) -/* A3AF8C 80241AAC 2402007F */ addiu $v0, $zero, 0x7f -/* A3AF90 80241AB0 AE020070 */ sw $v0, 0x70($s0) -.L80241AB4: -/* A3AF94 80241AB4 8E020078 */ lw $v0, 0x78($s0) -/* A3AF98 80241AB8 28420080 */ slti $v0, $v0, 0x80 -/* A3AF9C 80241ABC 14400002 */ bnez $v0, .L80241AC8 -/* A3AFA0 80241AC0 2402007F */ addiu $v0, $zero, 0x7f -/* A3AFA4 80241AC4 AE020078 */ sw $v0, 0x78($s0) -.L80241AC8: -/* A3AFA8 80241AC8 8E030070 */ lw $v1, 0x70($s0) -/* A3AFAC 80241ACC 2402007F */ addiu $v0, $zero, 0x7f -/* A3AFB0 80241AD0 14620014 */ bne $v1, $v0, .L80241B24 -/* A3AFB4 80241AD4 00000000 */ nop -/* A3AFB8 80241AD8 8E020078 */ lw $v0, 0x78($s0) -/* A3AFBC 80241ADC 14430011 */ bne $v0, $v1, .L80241B24 -/* A3AFC0 80241AE0 24020001 */ addiu $v0, $zero, 1 -/* A3AFC4 80241AE4 080906C9 */ j .L80241B24 -/* A3AFC8 80241AE8 AE020074 */ sw $v0, 0x74($s0) -.L80241AEC: -/* A3AFCC 80241AEC 8E020070 */ lw $v0, 0x70($s0) -/* A3AFD0 80241AF0 2442FFFC */ addiu $v0, $v0, -4 -/* A3AFD4 80241AF4 AE020070 */ sw $v0, 0x70($s0) -/* A3AFD8 80241AF8 8E020078 */ lw $v0, 0x78($s0) -/* A3AFDC 80241AFC 8E030070 */ lw $v1, 0x70($s0) -/* A3AFE0 80241B00 2442FFFC */ addiu $v0, $v0, -4 -/* A3AFE4 80241B04 28630040 */ slti $v1, $v1, 0x40 -/* A3AFE8 80241B08 10600003 */ beqz $v1, .L80241B18 -/* A3AFEC 80241B0C AE020078 */ sw $v0, 0x78($s0) -/* A3AFF0 80241B10 24020040 */ addiu $v0, $zero, 0x40 -/* A3AFF4 80241B14 AE020070 */ sw $v0, 0x70($s0) -.L80241B18: -/* A3AFF8 80241B18 8E020078 */ lw $v0, 0x78($s0) -/* A3AFFC 80241B1C 04420001 */ bltzl $v0, .L80241B24 -/* A3B000 80241B20 AE000078 */ sw $zero, 0x78($s0) -.L80241B24: -/* A3B004 80241B24 92040073 */ lbu $a0, 0x73($s0) -/* A3B008 80241B28 9207007B */ lbu $a3, 0x7b($s0) -/* A3B00C 80241B2C 0080282D */ daddu $a1, $a0, $zero -/* A3B010 80241B30 AFA70010 */ sw $a3, 0x10($sp) -/* A3B014 80241B34 9202007B */ lbu $v0, 0x7b($s0) -/* A3B018 80241B38 0080302D */ daddu $a2, $a0, $zero -/* A3B01C 80241B3C 0C046FE6 */ jal func_8011BF98 -/* A3B020 80241B40 AFA20014 */ sw $v0, 0x14($sp) -/* A3B024 80241B44 8E030070 */ lw $v1, 0x70($s0) -/* A3B028 80241B48 24020040 */ addiu $v0, $zero, 0x40 -/* A3B02C 80241B4C 14620005 */ bne $v1, $v0, .L80241B64 -/* A3B030 80241B50 0000102D */ daddu $v0, $zero, $zero -/* A3B034 80241B54 8E030078 */ lw $v1, 0x78($s0) -/* A3B038 80241B58 10600002 */ beqz $v1, .L80241B64 -/* A3B03C 80241B5C 24020002 */ addiu $v0, $zero, 2 -/* A3B040 80241B60 0000102D */ daddu $v0, $zero, $zero -.L80241B64: -/* A3B044 80241B64 8FBF001C */ lw $ra, 0x1c($sp) -/* A3B048 80241B68 8FB00018 */ lw $s0, 0x18($sp) -/* A3B04C 80241B6C 03E00008 */ jr $ra -/* A3B050 80241B70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58_A3AF38.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58_A3AF38.s new file mode 100644 index 0000000000..f48d992fe3 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241A58_A3AF38.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A58_A3AF38 +/* A3AF38 80241A58 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3AF3C 80241A5C AFB00018 */ sw $s0, 0x18($sp) +/* A3AF40 80241A60 0080802D */ daddu $s0, $a0, $zero +/* A3AF44 80241A64 10A00005 */ beqz $a1, .L80241A7C +/* A3AF48 80241A68 AFBF001C */ sw $ra, 0x1c($sp) +/* A3AF4C 80241A6C 24020040 */ addiu $v0, $zero, 0x40 +/* A3AF50 80241A70 AE020070 */ sw $v0, 0x70($s0) +/* A3AF54 80241A74 AE020078 */ sw $v0, 0x78($s0) +/* A3AF58 80241A78 AE000074 */ sw $zero, 0x74($s0) +.L80241A7C: +/* A3AF5C 80241A7C 8E020074 */ lw $v0, 0x74($s0) +/* A3AF60 80241A80 1440001A */ bnez $v0, .L80241AEC +/* A3AF64 80241A84 00000000 */ nop +/* A3AF68 80241A88 8E020070 */ lw $v0, 0x70($s0) +/* A3AF6C 80241A8C 24420004 */ addiu $v0, $v0, 4 +/* A3AF70 80241A90 AE020070 */ sw $v0, 0x70($s0) +/* A3AF74 80241A94 8E020078 */ lw $v0, 0x78($s0) +/* A3AF78 80241A98 8E030070 */ lw $v1, 0x70($s0) +/* A3AF7C 80241A9C 24420004 */ addiu $v0, $v0, 4 +/* A3AF80 80241AA0 28630080 */ slti $v1, $v1, 0x80 +/* A3AF84 80241AA4 14600003 */ bnez $v1, .L80241AB4 +/* A3AF88 80241AA8 AE020078 */ sw $v0, 0x78($s0) +/* A3AF8C 80241AAC 2402007F */ addiu $v0, $zero, 0x7f +/* A3AF90 80241AB0 AE020070 */ sw $v0, 0x70($s0) +.L80241AB4: +/* A3AF94 80241AB4 8E020078 */ lw $v0, 0x78($s0) +/* A3AF98 80241AB8 28420080 */ slti $v0, $v0, 0x80 +/* A3AF9C 80241ABC 14400002 */ bnez $v0, .L80241AC8 +/* A3AFA0 80241AC0 2402007F */ addiu $v0, $zero, 0x7f +/* A3AFA4 80241AC4 AE020078 */ sw $v0, 0x78($s0) +.L80241AC8: +/* A3AFA8 80241AC8 8E030070 */ lw $v1, 0x70($s0) +/* A3AFAC 80241ACC 2402007F */ addiu $v0, $zero, 0x7f +/* A3AFB0 80241AD0 14620014 */ bne $v1, $v0, .L80241B24 +/* A3AFB4 80241AD4 00000000 */ nop +/* A3AFB8 80241AD8 8E020078 */ lw $v0, 0x78($s0) +/* A3AFBC 80241ADC 14430011 */ bne $v0, $v1, .L80241B24 +/* A3AFC0 80241AE0 24020001 */ addiu $v0, $zero, 1 +/* A3AFC4 80241AE4 080906C9 */ j .L80241B24 +/* A3AFC8 80241AE8 AE020074 */ sw $v0, 0x74($s0) +.L80241AEC: +/* A3AFCC 80241AEC 8E020070 */ lw $v0, 0x70($s0) +/* A3AFD0 80241AF0 2442FFFC */ addiu $v0, $v0, -4 +/* A3AFD4 80241AF4 AE020070 */ sw $v0, 0x70($s0) +/* A3AFD8 80241AF8 8E020078 */ lw $v0, 0x78($s0) +/* A3AFDC 80241AFC 8E030070 */ lw $v1, 0x70($s0) +/* A3AFE0 80241B00 2442FFFC */ addiu $v0, $v0, -4 +/* A3AFE4 80241B04 28630040 */ slti $v1, $v1, 0x40 +/* A3AFE8 80241B08 10600003 */ beqz $v1, .L80241B18 +/* A3AFEC 80241B0C AE020078 */ sw $v0, 0x78($s0) +/* A3AFF0 80241B10 24020040 */ addiu $v0, $zero, 0x40 +/* A3AFF4 80241B14 AE020070 */ sw $v0, 0x70($s0) +.L80241B18: +/* A3AFF8 80241B18 8E020078 */ lw $v0, 0x78($s0) +/* A3AFFC 80241B1C 04420001 */ bltzl $v0, .L80241B24 +/* A3B000 80241B20 AE000078 */ sw $zero, 0x78($s0) +.L80241B24: +/* A3B004 80241B24 92040073 */ lbu $a0, 0x73($s0) +/* A3B008 80241B28 9207007B */ lbu $a3, 0x7b($s0) +/* A3B00C 80241B2C 0080282D */ daddu $a1, $a0, $zero +/* A3B010 80241B30 AFA70010 */ sw $a3, 0x10($sp) +/* A3B014 80241B34 9202007B */ lbu $v0, 0x7b($s0) +/* A3B018 80241B38 0080302D */ daddu $a2, $a0, $zero +/* A3B01C 80241B3C 0C046FE6 */ jal func_8011BF98 +/* A3B020 80241B40 AFA20014 */ sw $v0, 0x14($sp) +/* A3B024 80241B44 8E030070 */ lw $v1, 0x70($s0) +/* A3B028 80241B48 24020040 */ addiu $v0, $zero, 0x40 +/* A3B02C 80241B4C 14620005 */ bne $v1, $v0, .L80241B64 +/* A3B030 80241B50 0000102D */ daddu $v0, $zero, $zero +/* A3B034 80241B54 8E030078 */ lw $v1, 0x78($s0) +/* A3B038 80241B58 10600002 */ beqz $v1, .L80241B64 +/* A3B03C 80241B5C 24020002 */ addiu $v0, $zero, 2 +/* A3B040 80241B60 0000102D */ daddu $v0, $zero, $zero +.L80241B64: +/* A3B044 80241B64 8FBF001C */ lw $ra, 0x1c($sp) +/* A3B048 80241B68 8FB00018 */ lw $s0, 0x18($sp) +/* A3B04C 80241B6C 03E00008 */ jr $ra +/* A3B050 80241B70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98.s deleted file mode 100644 index 2ef708e6b7..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F98 -/* A3B478 80241F98 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3B47C 80241F9C AFBF0010 */ sw $ra, 0x10($sp) -/* A3B480 80241FA0 8C82000C */ lw $v0, 0xc($a0) -/* A3B484 80241FA4 0C0B1EAF */ jal get_variable -/* A3B488 80241FA8 8C450000 */ lw $a1, ($v0) -/* A3B48C 80241FAC 8C44000C */ lw $a0, 0xc($v0) -/* A3B490 80241FB0 8C83001C */ lw $v1, 0x1c($a0) -/* A3B494 80241FB4 24630001 */ addiu $v1, $v1, 1 -/* A3B498 80241FB8 AC83001C */ sw $v1, 0x1c($a0) -/* A3B49C 80241FBC 8FBF0010 */ lw $ra, 0x10($sp) -/* A3B4A0 80241FC0 24020002 */ addiu $v0, $zero, 2 -/* A3B4A4 80241FC4 03E00008 */ jr $ra -/* A3B4A8 80241FC8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A3B4AC 80241FCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98_A3B478.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98_A3B478.s new file mode 100644 index 0000000000..a618826c36 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_80241F98_A3B478.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F98_A3B478 +/* A3B478 80241F98 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3B47C 80241F9C AFBF0010 */ sw $ra, 0x10($sp) +/* A3B480 80241FA0 8C82000C */ lw $v0, 0xc($a0) +/* A3B484 80241FA4 0C0B1EAF */ jal get_variable +/* A3B488 80241FA8 8C450000 */ lw $a1, ($v0) +/* A3B48C 80241FAC 8C44000C */ lw $a0, 0xc($v0) +/* A3B490 80241FB0 8C83001C */ lw $v1, 0x1c($a0) +/* A3B494 80241FB4 24630001 */ addiu $v1, $v1, 1 +/* A3B498 80241FB8 AC83001C */ sw $v1, 0x1c($a0) +/* A3B49C 80241FBC 8FBF0010 */ lw $ra, 0x10($sp) +/* A3B4A0 80241FC0 24020002 */ addiu $v0, $zero, 2 +/* A3B4A4 80241FC4 03E00008 */ jr $ra +/* A3B4A8 80241FC8 27BD0018 */ addiu $sp, $sp, 0x18 +/* A3B4AC 80241FCC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8.s deleted file mode 100644 index fcd2298671..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420E8 -/* A3B5C8 802420E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A3B5CC 802420EC AFB10014 */ sw $s1, 0x14($sp) -/* A3B5D0 802420F0 0080882D */ daddu $s1, $a0, $zero -/* A3B5D4 802420F4 AFBF001C */ sw $ra, 0x1c($sp) -/* A3B5D8 802420F8 AFB20018 */ sw $s2, 0x18($sp) -/* A3B5DC 802420FC AFB00010 */ sw $s0, 0x10($sp) -/* A3B5E0 80242100 8E240084 */ lw $a0, 0x84($s1) -/* A3B5E4 80242104 0C04C3D6 */ jal get_item_entity -/* A3B5E8 80242108 00A0802D */ daddu $s0, $a1, $zero -/* A3B5EC 8024210C 12000005 */ beqz $s0, .L80242124 -/* A3B5F0 80242110 0040902D */ daddu $s2, $v0, $zero -/* A3B5F4 80242114 C640000C */ lwc1 $f0, 0xc($s2) -/* A3B5F8 80242118 AE200074 */ sw $zero, 0x74($s1) -/* A3B5FC 8024211C AE20007C */ sw $zero, 0x7c($s1) -/* A3B600 80242120 E6200078 */ swc1 $f0, 0x78($s1) -.L80242124: -/* A3B604 80242124 8E230074 */ lw $v1, 0x74($s1) -/* A3B608 80242128 10600005 */ beqz $v1, .L80242140 -/* A3B60C 8024212C 24020001 */ addiu $v0, $zero, 1 -/* A3B610 80242130 10620024 */ beq $v1, $v0, .L802421C4 -/* A3B614 80242134 00000000 */ nop -/* A3B618 80242138 08090887 */ j .L8024221C -/* A3B61C 8024213C 00000000 */ nop -.L80242140: -/* A3B620 80242140 3C013FC9 */ lui $at, 0x3fc9 -/* A3B624 80242144 34210FD8 */ ori $at, $at, 0xfd8 -/* A3B628 80242148 44810000 */ mtc1 $at, $f0 -/* A3B62C 8024214C C62C007C */ lwc1 $f12, 0x7c($s1) -/* A3B630 80242150 46806320 */ cvt.s.w $f12, $f12 -/* A3B634 80242154 46006302 */ mul.s $f12, $f12, $f0 -/* A3B638 80242158 00000000 */ nop -/* A3B63C 8024215C 3C0141F0 */ lui $at, 0x41f0 -/* A3B640 80242160 44810000 */ mtc1 $at, $f0 -/* A3B644 80242164 0C00A874 */ jal cos_rad -/* A3B648 80242168 46006303 */ div.s $f12, $f12, $f0 -/* A3B64C 8024216C 3C013F80 */ lui $at, 0x3f80 -/* A3B650 80242170 44811000 */ mtc1 $at, $f2 -/* A3B654 80242174 00000000 */ nop -/* A3B658 80242178 46001081 */ sub.s $f2, $f2, $f0 -/* A3B65C 8024217C 3C0141A0 */ lui $at, 0x41a0 -/* A3B660 80242180 44810000 */ mtc1 $at, $f0 -/* A3B664 80242184 00000000 */ nop -/* A3B668 80242188 46001082 */ mul.s $f2, $f2, $f0 -/* A3B66C 8024218C 00000000 */ nop -/* A3B670 80242190 C6200078 */ lwc1 $f0, 0x78($s1) -/* A3B674 80242194 46020000 */ add.s $f0, $f0, $f2 -/* A3B678 80242198 E640000C */ swc1 $f0, 0xc($s2) -/* A3B67C 8024219C 8E23007C */ lw $v1, 0x7c($s1) -/* A3B680 802421A0 2402001E */ addiu $v0, $zero, 0x1e -/* A3B684 802421A4 14620005 */ bne $v1, $v0, .L802421BC -/* A3B688 802421A8 24620001 */ addiu $v0, $v1, 1 -/* A3B68C 802421AC 24020001 */ addiu $v0, $zero, 1 -/* A3B690 802421B0 AE220074 */ sw $v0, 0x74($s1) -/* A3B694 802421B4 08090887 */ j .L8024221C -/* A3B698 802421B8 AE20007C */ sw $zero, 0x7c($s1) -.L802421BC: -/* A3B69C 802421BC 08090887 */ j .L8024221C -/* A3B6A0 802421C0 AE22007C */ sw $v0, 0x7c($s1) -.L802421C4: -/* A3B6A4 802421C4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* A3B6A8 802421C8 0C00A8D4 */ jal cos_deg -/* A3B6AC 802421CC 46806320 */ cvt.s.w $f12, $f12 -/* A3B6B0 802421D0 3C014040 */ lui $at, 0x4040 -/* A3B6B4 802421D4 44811000 */ mtc1 $at, $f2 -/* A3B6B8 802421D8 00000000 */ nop -/* A3B6BC 802421DC 46020002 */ mul.s $f0, $f0, $f2 -/* A3B6C0 802421E0 00000000 */ nop -/* A3B6C4 802421E4 3C014188 */ lui $at, 0x4188 -/* A3B6C8 802421E8 44812000 */ mtc1 $at, $f4 -/* A3B6CC 802421EC C6220078 */ lwc1 $f2, 0x78($s1) -/* A3B6D0 802421F0 46041080 */ add.s $f2, $f2, $f4 -/* A3B6D4 802421F4 46001080 */ add.s $f2, $f2, $f0 -/* A3B6D8 802421F8 E642000C */ swc1 $f2, 0xc($s2) -/* A3B6DC 802421FC 8E22007C */ lw $v0, 0x7c($s1) -/* A3B6E0 80242200 24420009 */ addiu $v0, $v0, 9 -/* A3B6E4 80242204 44826000 */ mtc1 $v0, $f12 -/* A3B6E8 80242208 00000000 */ nop -/* A3B6EC 8024220C 0C00A6C9 */ jal clamp_angle -/* A3B6F0 80242210 46806320 */ cvt.s.w $f12, $f12 -/* A3B6F4 80242214 4600018D */ trunc.w.s $f6, $f0 -/* A3B6F8 80242218 E626007C */ swc1 $f6, 0x7c($s1) -.L8024221C: -/* A3B6FC 8024221C 8FBF001C */ lw $ra, 0x1c($sp) -/* A3B700 80242220 8FB20018 */ lw $s2, 0x18($sp) -/* A3B704 80242224 8FB10014 */ lw $s1, 0x14($sp) -/* A3B708 80242228 8FB00010 */ lw $s0, 0x10($sp) -/* A3B70C 8024222C 0000102D */ daddu $v0, $zero, $zero -/* A3B710 80242230 03E00008 */ jr $ra -/* A3B714 80242234 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s new file mode 100644 index 0000000000..404358a58c --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802420E8_A3B5C8.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420E8_A3B5C8 +/* A3B5C8 802420E8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A3B5CC 802420EC AFB10014 */ sw $s1, 0x14($sp) +/* A3B5D0 802420F0 0080882D */ daddu $s1, $a0, $zero +/* A3B5D4 802420F4 AFBF001C */ sw $ra, 0x1c($sp) +/* A3B5D8 802420F8 AFB20018 */ sw $s2, 0x18($sp) +/* A3B5DC 802420FC AFB00010 */ sw $s0, 0x10($sp) +/* A3B5E0 80242100 8E240084 */ lw $a0, 0x84($s1) +/* A3B5E4 80242104 0C04C3D6 */ jal get_item_entity +/* A3B5E8 80242108 00A0802D */ daddu $s0, $a1, $zero +/* A3B5EC 8024210C 12000005 */ beqz $s0, .L80242124 +/* A3B5F0 80242110 0040902D */ daddu $s2, $v0, $zero +/* A3B5F4 80242114 C640000C */ lwc1 $f0, 0xc($s2) +/* A3B5F8 80242118 AE200074 */ sw $zero, 0x74($s1) +/* A3B5FC 8024211C AE20007C */ sw $zero, 0x7c($s1) +/* A3B600 80242120 E6200078 */ swc1 $f0, 0x78($s1) +.L80242124: +/* A3B604 80242124 8E230074 */ lw $v1, 0x74($s1) +/* A3B608 80242128 10600005 */ beqz $v1, .L80242140 +/* A3B60C 8024212C 24020001 */ addiu $v0, $zero, 1 +/* A3B610 80242130 10620024 */ beq $v1, $v0, .L802421C4 +/* A3B614 80242134 00000000 */ nop +/* A3B618 80242138 08090887 */ j .L8024221C +/* A3B61C 8024213C 00000000 */ nop +.L80242140: +/* A3B620 80242140 3C013FC9 */ lui $at, 0x3fc9 +/* A3B624 80242144 34210FD8 */ ori $at, $at, 0xfd8 +/* A3B628 80242148 44810000 */ mtc1 $at, $f0 +/* A3B62C 8024214C C62C007C */ lwc1 $f12, 0x7c($s1) +/* A3B630 80242150 46806320 */ cvt.s.w $f12, $f12 +/* A3B634 80242154 46006302 */ mul.s $f12, $f12, $f0 +/* A3B638 80242158 00000000 */ nop +/* A3B63C 8024215C 3C0141F0 */ lui $at, 0x41f0 +/* A3B640 80242160 44810000 */ mtc1 $at, $f0 +/* A3B644 80242164 0C00A874 */ jal cos_rad +/* A3B648 80242168 46006303 */ div.s $f12, $f12, $f0 +/* A3B64C 8024216C 3C013F80 */ lui $at, 0x3f80 +/* A3B650 80242170 44811000 */ mtc1 $at, $f2 +/* A3B654 80242174 00000000 */ nop +/* A3B658 80242178 46001081 */ sub.s $f2, $f2, $f0 +/* A3B65C 8024217C 3C0141A0 */ lui $at, 0x41a0 +/* A3B660 80242180 44810000 */ mtc1 $at, $f0 +/* A3B664 80242184 00000000 */ nop +/* A3B668 80242188 46001082 */ mul.s $f2, $f2, $f0 +/* A3B66C 8024218C 00000000 */ nop +/* A3B670 80242190 C6200078 */ lwc1 $f0, 0x78($s1) +/* A3B674 80242194 46020000 */ add.s $f0, $f0, $f2 +/* A3B678 80242198 E640000C */ swc1 $f0, 0xc($s2) +/* A3B67C 8024219C 8E23007C */ lw $v1, 0x7c($s1) +/* A3B680 802421A0 2402001E */ addiu $v0, $zero, 0x1e +/* A3B684 802421A4 14620005 */ bne $v1, $v0, .L802421BC +/* A3B688 802421A8 24620001 */ addiu $v0, $v1, 1 +/* A3B68C 802421AC 24020001 */ addiu $v0, $zero, 1 +/* A3B690 802421B0 AE220074 */ sw $v0, 0x74($s1) +/* A3B694 802421B4 08090887 */ j .L8024221C +/* A3B698 802421B8 AE20007C */ sw $zero, 0x7c($s1) +.L802421BC: +/* A3B69C 802421BC 08090887 */ j .L8024221C +/* A3B6A0 802421C0 AE22007C */ sw $v0, 0x7c($s1) +.L802421C4: +/* A3B6A4 802421C4 C62C007C */ lwc1 $f12, 0x7c($s1) +/* A3B6A8 802421C8 0C00A8D4 */ jal cos_deg +/* A3B6AC 802421CC 46806320 */ cvt.s.w $f12, $f12 +/* A3B6B0 802421D0 3C014040 */ lui $at, 0x4040 +/* A3B6B4 802421D4 44811000 */ mtc1 $at, $f2 +/* A3B6B8 802421D8 00000000 */ nop +/* A3B6BC 802421DC 46020002 */ mul.s $f0, $f0, $f2 +/* A3B6C0 802421E0 00000000 */ nop +/* A3B6C4 802421E4 3C014188 */ lui $at, 0x4188 +/* A3B6C8 802421E8 44812000 */ mtc1 $at, $f4 +/* A3B6CC 802421EC C6220078 */ lwc1 $f2, 0x78($s1) +/* A3B6D0 802421F0 46041080 */ add.s $f2, $f2, $f4 +/* A3B6D4 802421F4 46001080 */ add.s $f2, $f2, $f0 +/* A3B6D8 802421F8 E642000C */ swc1 $f2, 0xc($s2) +/* A3B6DC 802421FC 8E22007C */ lw $v0, 0x7c($s1) +/* A3B6E0 80242200 24420009 */ addiu $v0, $v0, 9 +/* A3B6E4 80242204 44826000 */ mtc1 $v0, $f12 +/* A3B6E8 80242208 00000000 */ nop +/* A3B6EC 8024220C 0C00A6C9 */ jal clamp_angle +/* A3B6F0 80242210 46806320 */ cvt.s.w $f12, $f12 +/* A3B6F4 80242214 4600018D */ trunc.w.s $f6, $f0 +/* A3B6F8 80242218 E626007C */ swc1 $f6, 0x7c($s1) +.L8024221C: +/* A3B6FC 8024221C 8FBF001C */ lw $ra, 0x1c($sp) +/* A3B700 80242220 8FB20018 */ lw $s2, 0x18($sp) +/* A3B704 80242224 8FB10014 */ lw $s1, 0x14($sp) +/* A3B708 80242228 8FB00010 */ lw $s0, 0x10($sp) +/* A3B70C 8024222C 0000102D */ daddu $v0, $zero, $zero +/* A3B710 80242230 03E00008 */ jr $ra +/* A3B714 80242234 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238.s deleted file mode 100644 index 8d537f58d6..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242238 -/* A3B718 80242238 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3B71C 8024223C AFB00010 */ sw $s0, 0x10($sp) -/* A3B720 80242240 0080802D */ daddu $s0, $a0, $zero -/* A3B724 80242244 AFBF0014 */ sw $ra, 0x14($sp) -/* A3B728 80242248 8E02000C */ lw $v0, 0xc($s0) -/* A3B72C 8024224C 0C0B1EAF */ jal get_variable -/* A3B730 80242250 8C450000 */ lw $a1, ($v0) -/* A3B734 80242254 00021140 */ sll $v0, $v0, 5 -/* A3B738 80242258 AE000084 */ sw $zero, 0x84($s0) -/* A3B73C 8024225C 3C018008 */ lui $at, 0x8008 -/* A3B740 80242260 00220821 */ addu $at, $at, $v0 -/* A3B744 80242264 942278F8 */ lhu $v0, 0x78f8($at) -/* A3B748 80242268 30420040 */ andi $v0, $v0, 0x40 -/* A3B74C 8024226C 10400002 */ beqz $v0, .L80242278 -/* A3B750 80242270 24020001 */ addiu $v0, $zero, 1 -/* A3B754 80242274 AE020084 */ sw $v0, 0x84($s0) -.L80242278: -/* A3B758 80242278 8FBF0014 */ lw $ra, 0x14($sp) -/* A3B75C 8024227C 8FB00010 */ lw $s0, 0x10($sp) -/* A3B760 80242280 24020002 */ addiu $v0, $zero, 2 -/* A3B764 80242284 03E00008 */ jr $ra -/* A3B768 80242288 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s new file mode 100644 index 0000000000..6d5b641387 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242238_A3B718.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242238_A3B718 +/* A3B718 80242238 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3B71C 8024223C AFB00010 */ sw $s0, 0x10($sp) +/* A3B720 80242240 0080802D */ daddu $s0, $a0, $zero +/* A3B724 80242244 AFBF0014 */ sw $ra, 0x14($sp) +/* A3B728 80242248 8E02000C */ lw $v0, 0xc($s0) +/* A3B72C 8024224C 0C0B1EAF */ jal get_variable +/* A3B730 80242250 8C450000 */ lw $a1, ($v0) +/* A3B734 80242254 00021140 */ sll $v0, $v0, 5 +/* A3B738 80242258 AE000084 */ sw $zero, 0x84($s0) +/* A3B73C 8024225C 3C018008 */ lui $at, 0x8008 +/* A3B740 80242260 00220821 */ addu $at, $at, $v0 +/* A3B744 80242264 942278F8 */ lhu $v0, 0x78f8($at) +/* A3B748 80242268 30420040 */ andi $v0, $v0, 0x40 +/* A3B74C 8024226C 10400002 */ beqz $v0, .L80242278 +/* A3B750 80242270 24020001 */ addiu $v0, $zero, 1 +/* A3B754 80242274 AE020084 */ sw $v0, 0x84($s0) +.L80242278: +/* A3B758 80242278 8FBF0014 */ lw $ra, 0x14($sp) +/* A3B75C 8024227C 8FB00010 */ lw $s0, 0x10($sp) +/* A3B760 80242280 24020002 */ addiu $v0, $zero, 2 +/* A3B764 80242284 03E00008 */ jr $ra +/* A3B768 80242288 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC.s deleted file mode 100644 index 3c7c28783c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424CC -/* A3B9AC 802424CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3B9B0 802424D0 0000282D */ daddu $a1, $zero, $zero -/* A3B9B4 802424D4 00A0302D */ daddu $a2, $a1, $zero -/* A3B9B8 802424D8 3C038024 */ lui $v1, 0x8024 -/* A3B9BC 802424DC 24635EEC */ addiu $v1, $v1, 0x5eec -/* A3B9C0 802424E0 AFBF0010 */ sw $ra, 0x10($sp) -/* A3B9C4 802424E4 8C840084 */ lw $a0, 0x84($a0) -.L802424E8: -/* A3B9C8 802424E8 8C620000 */ lw $v0, ($v1) -/* A3B9CC 802424EC 54820003 */ bnel $a0, $v0, .L802424FC -/* A3B9D0 802424F0 24C60001 */ addiu $a2, $a2, 1 -/* A3B9D4 802424F4 08090942 */ j .L80242508 -/* A3B9D8 802424F8 24050001 */ addiu $a1, $zero, 1 -.L802424FC: -/* A3B9DC 802424FC 28C20005 */ slti $v0, $a2, 5 -/* A3B9E0 80242500 1440FFF9 */ bnez $v0, .L802424E8 -/* A3B9E4 80242504 24630004 */ addiu $v1, $v1, 4 -.L80242508: -/* A3B9E8 80242508 10A00006 */ beqz $a1, .L80242524 -/* A3B9EC 8024250C 3C05F840 */ lui $a1, 0xf840 -/* A3B9F0 80242510 34A55D6E */ ori $a1, $a1, 0x5d6e -/* A3B9F4 80242514 0000202D */ daddu $a0, $zero, $zero -/* A3B9F8 80242518 00C52821 */ addu $a1, $a2, $a1 -/* A3B9FC 8024251C 0C0B2026 */ jal set_variable -/* A3BA00 80242520 24060001 */ addiu $a2, $zero, 1 -.L80242524: -/* A3BA04 80242524 8FBF0010 */ lw $ra, 0x10($sp) -/* A3BA08 80242528 24020002 */ addiu $v0, $zero, 2 -/* A3BA0C 8024252C 03E00008 */ jr $ra -/* A3BA10 80242530 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s new file mode 100644 index 0000000000..d6573b2783 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_802424CC_A3B9AC.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424CC_A3B9AC +/* A3B9AC 802424CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3B9B0 802424D0 0000282D */ daddu $a1, $zero, $zero +/* A3B9B4 802424D4 00A0302D */ daddu $a2, $a1, $zero +/* A3B9B8 802424D8 3C038024 */ lui $v1, 0x8024 +/* A3B9BC 802424DC 24635EEC */ addiu $v1, $v1, 0x5eec +/* A3B9C0 802424E0 AFBF0010 */ sw $ra, 0x10($sp) +/* A3B9C4 802424E4 8C840084 */ lw $a0, 0x84($a0) +.L802424E8: +/* A3B9C8 802424E8 8C620000 */ lw $v0, ($v1) +/* A3B9CC 802424EC 54820003 */ bnel $a0, $v0, .L802424FC +/* A3B9D0 802424F0 24C60001 */ addiu $a2, $a2, 1 +/* A3B9D4 802424F4 08090942 */ j .L80242508 +/* A3B9D8 802424F8 24050001 */ addiu $a1, $zero, 1 +.L802424FC: +/* A3B9DC 802424FC 28C20005 */ slti $v0, $a2, 5 +/* A3B9E0 80242500 1440FFF9 */ bnez $v0, .L802424E8 +/* A3B9E4 80242504 24630004 */ addiu $v1, $v1, 4 +.L80242508: +/* A3B9E8 80242508 10A00006 */ beqz $a1, .L80242524 +/* A3B9EC 8024250C 3C05F840 */ lui $a1, 0xf840 +/* A3B9F0 80242510 34A55D6E */ ori $a1, $a1, 0x5d6e +/* A3B9F4 80242514 0000202D */ daddu $a0, $zero, $zero +/* A3B9F8 80242518 00C52821 */ addu $a1, $a2, $a1 +/* A3B9FC 8024251C 0C0B2026 */ jal set_variable +/* A3BA00 80242520 24060001 */ addiu $a2, $zero, 1 +.L80242524: +/* A3BA04 80242524 8FBF0010 */ lw $ra, 0x10($sp) +/* A3BA08 80242528 24020002 */ addiu $v0, $zero, 2 +/* A3BA0C 8024252C 03E00008 */ jr $ra +/* A3BA10 80242530 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242534.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242534.s deleted file mode 100644 index 5da1542d8b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242534.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242534 -/* A3BA14 80242534 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3BA18 80242538 AFB00010 */ sw $s0, 0x10($sp) -/* A3BA1C 8024253C AFBF0014 */ sw $ra, 0x14($sp) -/* A3BA20 80242540 0C039D88 */ jal get_item_empty_count -/* A3BA24 80242544 0080802D */ daddu $s0, $a0, $zero -/* A3BA28 80242548 AE020088 */ sw $v0, 0x88($s0) -/* A3BA2C 8024254C 8FBF0014 */ lw $ra, 0x14($sp) -/* A3BA30 80242550 8FB00010 */ lw $s0, 0x10($sp) -/* A3BA34 80242554 24020002 */ addiu $v0, $zero, 2 -/* A3BA38 80242558 03E00008 */ jr $ra -/* A3BA3C 8024255C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242534_A3BA14.s b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242534_A3BA14.s new file mode 100644 index 0000000000..25a8347ce2 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_06/A3B4B0/func_80242534_A3BA14.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242534_A3BA14 +/* A3BA14 80242534 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3BA18 80242538 AFB00010 */ sw $s0, 0x10($sp) +/* A3BA1C 8024253C AFBF0014 */ sw $ra, 0x14($sp) +/* A3BA20 80242540 0C039D88 */ jal get_item_empty_count +/* A3BA24 80242544 0080802D */ daddu $s0, $a0, $zero +/* A3BA28 80242548 AE020088 */ sw $v0, 0x88($s0) +/* A3BA2C 8024254C 8FBF0014 */ lw $ra, 0x14($sp) +/* A3BA30 80242550 8FB00010 */ lw $s0, 0x10($sp) +/* A3BA34 80242554 24020002 */ addiu $v0, $zero, 2 +/* A3BA38 80242558 03E00008 */ jr $ra +/* A3BA3C 8024255C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144.s b/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144.s deleted file mode 100644 index 04a7b84405..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240144 -/* A3F884 80240144 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A3F888 80240148 AFB00010 */ sw $s0, 0x10($sp) -/* A3F88C 8024014C 0080802D */ daddu $s0, $a0, $zero -/* A3F890 80240150 10A00005 */ beqz $a1, .L80240168 -/* A3F894 80240154 AFBF0014 */ sw $ra, 0x14($sp) -/* A3F898 80240158 AE000070 */ sw $zero, 0x70($s0) -/* A3F89C 8024015C AE000074 */ sw $zero, 0x74($s0) -/* A3F8A0 80240160 AE000078 */ sw $zero, 0x78($s0) -/* A3F8A4 80240164 AE00007C */ sw $zero, 0x7c($s0) -.L80240168: -/* A3F8A8 80240168 8E020070 */ lw $v0, 0x70($s0) -/* A3F8AC 8024016C 1440000E */ bnez $v0, .L802401A8 -/* A3F8B0 80240170 00000000 */ nop -/* A3F8B4 80240174 8E0300A8 */ lw $v1, 0xa8($s0) -/* A3F8B8 80240178 8E020088 */ lw $v0, 0x88($s0) -/* A3F8BC 8024017C 00621821 */ addu $v1, $v1, $v0 -/* A3F8C0 80240180 04610004 */ bgez $v1, .L80240194 -/* A3F8C4 80240184 AE0300A8 */ sw $v1, 0xa8($s0) -/* A3F8C8 80240188 3C020002 */ lui $v0, 2 -/* A3F8CC 8024018C 08090069 */ j .L802401A4 -/* A3F8D0 80240190 00621021 */ addu $v0, $v1, $v0 -.L80240194: -/* A3F8D4 80240194 3C040002 */ lui $a0, 2 -/* A3F8D8 80240198 0083102A */ slt $v0, $a0, $v1 -/* A3F8DC 8024019C 10400002 */ beqz $v0, .L802401A8 -/* A3F8E0 802401A0 00641023 */ subu $v0, $v1, $a0 -.L802401A4: -/* A3F8E4 802401A4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401A8: -/* A3F8E8 802401A8 8E020074 */ lw $v0, 0x74($s0) -/* A3F8EC 802401AC 1440000E */ bnez $v0, .L802401E8 -/* A3F8F0 802401B0 00000000 */ nop -/* A3F8F4 802401B4 8E0300AC */ lw $v1, 0xac($s0) -/* A3F8F8 802401B8 8E02008C */ lw $v0, 0x8c($s0) -/* A3F8FC 802401BC 00621821 */ addu $v1, $v1, $v0 -/* A3F900 802401C0 04610004 */ bgez $v1, .L802401D4 -/* A3F904 802401C4 AE0300AC */ sw $v1, 0xac($s0) -/* A3F908 802401C8 3C020002 */ lui $v0, 2 -/* A3F90C 802401CC 08090079 */ j .L802401E4 -/* A3F910 802401D0 00621021 */ addu $v0, $v1, $v0 -.L802401D4: -/* A3F914 802401D4 3C040002 */ lui $a0, 2 -/* A3F918 802401D8 0083102A */ slt $v0, $a0, $v1 -/* A3F91C 802401DC 10400002 */ beqz $v0, .L802401E8 -/* A3F920 802401E0 00641023 */ subu $v0, $v1, $a0 -.L802401E4: -/* A3F924 802401E4 AE0200AC */ sw $v0, 0xac($s0) -.L802401E8: -/* A3F928 802401E8 8E020078 */ lw $v0, 0x78($s0) -/* A3F92C 802401EC 1440000E */ bnez $v0, .L80240228 -/* A3F930 802401F0 00000000 */ nop -/* A3F934 802401F4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A3F938 802401F8 8E020090 */ lw $v0, 0x90($s0) -/* A3F93C 802401FC 00621821 */ addu $v1, $v1, $v0 -/* A3F940 80240200 04610004 */ bgez $v1, .L80240214 -/* A3F944 80240204 AE0300B0 */ sw $v1, 0xb0($s0) -/* A3F948 80240208 3C020002 */ lui $v0, 2 -/* A3F94C 8024020C 08090089 */ j .L80240224 -/* A3F950 80240210 00621021 */ addu $v0, $v1, $v0 -.L80240214: -/* A3F954 80240214 3C040002 */ lui $a0, 2 -/* A3F958 80240218 0083102A */ slt $v0, $a0, $v1 -/* A3F95C 8024021C 10400002 */ beqz $v0, .L80240228 -/* A3F960 80240220 00641023 */ subu $v0, $v1, $a0 -.L80240224: -/* A3F964 80240224 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240228: -/* A3F968 80240228 8E02007C */ lw $v0, 0x7c($s0) -/* A3F96C 8024022C 1440000E */ bnez $v0, .L80240268 -/* A3F970 80240230 00000000 */ nop -/* A3F974 80240234 8E0300B4 */ lw $v1, 0xb4($s0) -/* A3F978 80240238 8E020094 */ lw $v0, 0x94($s0) -/* A3F97C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* A3F980 80240240 04610004 */ bgez $v1, .L80240254 -/* A3F984 80240244 AE0300B4 */ sw $v1, 0xb4($s0) -/* A3F988 80240248 3C020002 */ lui $v0, 2 -/* A3F98C 8024024C 08090099 */ j .L80240264 -/* A3F990 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* A3F994 80240254 3C040002 */ lui $a0, 2 -/* A3F998 80240258 0083102A */ slt $v0, $a0, $v1 -/* A3F99C 8024025C 10400002 */ beqz $v0, .L80240268 -/* A3F9A0 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* A3F9A4 80240264 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240268: -/* A3F9A8 80240268 8E040084 */ lw $a0, 0x84($s0) -/* A3F9AC 8024026C 0C046F07 */ jal set_main_pan_u -/* A3F9B0 80240270 8E0500A8 */ lw $a1, 0xa8($s0) -/* A3F9B4 80240274 8E040084 */ lw $a0, 0x84($s0) -/* A3F9B8 80240278 0C046F0D */ jal set_main_pan_v -/* A3F9BC 8024027C 8E0500AC */ lw $a1, 0xac($s0) -/* A3F9C0 80240280 8E040084 */ lw $a0, 0x84($s0) -/* A3F9C4 80240284 0C046F13 */ jal set_aux_pan_u -/* A3F9C8 80240288 8E0500B0 */ lw $a1, 0xb0($s0) -/* A3F9CC 8024028C 8E040084 */ lw $a0, 0x84($s0) -/* A3F9D0 80240290 0C046F19 */ jal set_aux_pan_v -/* A3F9D4 80240294 8E0500B4 */ lw $a1, 0xb4($s0) -/* A3F9D8 80240298 8E020070 */ lw $v0, 0x70($s0) -/* A3F9DC 8024029C 8E030078 */ lw $v1, 0x78($s0) -/* A3F9E0 802402A0 8E040098 */ lw $a0, 0x98($s0) -/* A3F9E4 802402A4 24420001 */ addiu $v0, $v0, 1 -/* A3F9E8 802402A8 AE020070 */ sw $v0, 0x70($s0) -/* A3F9EC 802402AC 8E020074 */ lw $v0, 0x74($s0) -/* A3F9F0 802402B0 24630001 */ addiu $v1, $v1, 1 -/* A3F9F4 802402B4 AE030078 */ sw $v1, 0x78($s0) -/* A3F9F8 802402B8 8E030070 */ lw $v1, 0x70($s0) -/* A3F9FC 802402BC 24420001 */ addiu $v0, $v0, 1 -/* A3FA00 802402C0 AE020074 */ sw $v0, 0x74($s0) -/* A3FA04 802402C4 8E02007C */ lw $v0, 0x7c($s0) -/* A3FA08 802402C8 0064182A */ slt $v1, $v1, $a0 -/* A3FA0C 802402CC 24420001 */ addiu $v0, $v0, 1 -/* A3FA10 802402D0 14600002 */ bnez $v1, .L802402DC -/* A3FA14 802402D4 AE02007C */ sw $v0, 0x7c($s0) -/* A3FA18 802402D8 AE000070 */ sw $zero, 0x70($s0) -.L802402DC: -/* A3FA1C 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* A3FA20 802402E0 8E03009C */ lw $v1, 0x9c($s0) -/* A3FA24 802402E4 0043102A */ slt $v0, $v0, $v1 -/* A3FA28 802402E8 50400001 */ beql $v0, $zero, .L802402F0 -/* A3FA2C 802402EC AE000074 */ sw $zero, 0x74($s0) -.L802402F0: -/* A3FA30 802402F0 8E020078 */ lw $v0, 0x78($s0) -/* A3FA34 802402F4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A3FA38 802402F8 0043102A */ slt $v0, $v0, $v1 -/* A3FA3C 802402FC 50400001 */ beql $v0, $zero, .L80240304 -/* A3FA40 80240300 AE000078 */ sw $zero, 0x78($s0) -.L80240304: -/* A3FA44 80240304 8E02007C */ lw $v0, 0x7c($s0) -/* A3FA48 80240308 8E0300A4 */ lw $v1, 0xa4($s0) -/* A3FA4C 8024030C 0043102A */ slt $v0, $v0, $v1 -/* A3FA50 80240310 50400001 */ beql $v0, $zero, .L80240318 -/* A3FA54 80240314 AE00007C */ sw $zero, 0x7c($s0) -.L80240318: -/* A3FA58 80240318 8FBF0014 */ lw $ra, 0x14($sp) -/* A3FA5C 8024031C 8FB00010 */ lw $s0, 0x10($sp) -/* A3FA60 80240320 0000102D */ daddu $v0, $zero, $zero -/* A3FA64 80240324 03E00008 */ jr $ra -/* A3FA68 80240328 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144_A3F884.s b/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144_A3F884.s new file mode 100644 index 0000000000..36af1ea506 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_10/A3F760/func_80240144_A3F884.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240144_A3F884 +/* A3F884 80240144 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A3F888 80240148 AFB00010 */ sw $s0, 0x10($sp) +/* A3F88C 8024014C 0080802D */ daddu $s0, $a0, $zero +/* A3F890 80240150 10A00005 */ beqz $a1, .L80240168 +/* A3F894 80240154 AFBF0014 */ sw $ra, 0x14($sp) +/* A3F898 80240158 AE000070 */ sw $zero, 0x70($s0) +/* A3F89C 8024015C AE000074 */ sw $zero, 0x74($s0) +/* A3F8A0 80240160 AE000078 */ sw $zero, 0x78($s0) +/* A3F8A4 80240164 AE00007C */ sw $zero, 0x7c($s0) +.L80240168: +/* A3F8A8 80240168 8E020070 */ lw $v0, 0x70($s0) +/* A3F8AC 8024016C 1440000E */ bnez $v0, .L802401A8 +/* A3F8B0 80240170 00000000 */ nop +/* A3F8B4 80240174 8E0300A8 */ lw $v1, 0xa8($s0) +/* A3F8B8 80240178 8E020088 */ lw $v0, 0x88($s0) +/* A3F8BC 8024017C 00621821 */ addu $v1, $v1, $v0 +/* A3F8C0 80240180 04610004 */ bgez $v1, .L80240194 +/* A3F8C4 80240184 AE0300A8 */ sw $v1, 0xa8($s0) +/* A3F8C8 80240188 3C020002 */ lui $v0, 2 +/* A3F8CC 8024018C 08090069 */ j .L802401A4 +/* A3F8D0 80240190 00621021 */ addu $v0, $v1, $v0 +.L80240194: +/* A3F8D4 80240194 3C040002 */ lui $a0, 2 +/* A3F8D8 80240198 0083102A */ slt $v0, $a0, $v1 +/* A3F8DC 8024019C 10400002 */ beqz $v0, .L802401A8 +/* A3F8E0 802401A0 00641023 */ subu $v0, $v1, $a0 +.L802401A4: +/* A3F8E4 802401A4 AE0200A8 */ sw $v0, 0xa8($s0) +.L802401A8: +/* A3F8E8 802401A8 8E020074 */ lw $v0, 0x74($s0) +/* A3F8EC 802401AC 1440000E */ bnez $v0, .L802401E8 +/* A3F8F0 802401B0 00000000 */ nop +/* A3F8F4 802401B4 8E0300AC */ lw $v1, 0xac($s0) +/* A3F8F8 802401B8 8E02008C */ lw $v0, 0x8c($s0) +/* A3F8FC 802401BC 00621821 */ addu $v1, $v1, $v0 +/* A3F900 802401C0 04610004 */ bgez $v1, .L802401D4 +/* A3F904 802401C4 AE0300AC */ sw $v1, 0xac($s0) +/* A3F908 802401C8 3C020002 */ lui $v0, 2 +/* A3F90C 802401CC 08090079 */ j .L802401E4 +/* A3F910 802401D0 00621021 */ addu $v0, $v1, $v0 +.L802401D4: +/* A3F914 802401D4 3C040002 */ lui $a0, 2 +/* A3F918 802401D8 0083102A */ slt $v0, $a0, $v1 +/* A3F91C 802401DC 10400002 */ beqz $v0, .L802401E8 +/* A3F920 802401E0 00641023 */ subu $v0, $v1, $a0 +.L802401E4: +/* A3F924 802401E4 AE0200AC */ sw $v0, 0xac($s0) +.L802401E8: +/* A3F928 802401E8 8E020078 */ lw $v0, 0x78($s0) +/* A3F92C 802401EC 1440000E */ bnez $v0, .L80240228 +/* A3F930 802401F0 00000000 */ nop +/* A3F934 802401F4 8E0300B0 */ lw $v1, 0xb0($s0) +/* A3F938 802401F8 8E020090 */ lw $v0, 0x90($s0) +/* A3F93C 802401FC 00621821 */ addu $v1, $v1, $v0 +/* A3F940 80240200 04610004 */ bgez $v1, .L80240214 +/* A3F944 80240204 AE0300B0 */ sw $v1, 0xb0($s0) +/* A3F948 80240208 3C020002 */ lui $v0, 2 +/* A3F94C 8024020C 08090089 */ j .L80240224 +/* A3F950 80240210 00621021 */ addu $v0, $v1, $v0 +.L80240214: +/* A3F954 80240214 3C040002 */ lui $a0, 2 +/* A3F958 80240218 0083102A */ slt $v0, $a0, $v1 +/* A3F95C 8024021C 10400002 */ beqz $v0, .L80240228 +/* A3F960 80240220 00641023 */ subu $v0, $v1, $a0 +.L80240224: +/* A3F964 80240224 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240228: +/* A3F968 80240228 8E02007C */ lw $v0, 0x7c($s0) +/* A3F96C 8024022C 1440000E */ bnez $v0, .L80240268 +/* A3F970 80240230 00000000 */ nop +/* A3F974 80240234 8E0300B4 */ lw $v1, 0xb4($s0) +/* A3F978 80240238 8E020094 */ lw $v0, 0x94($s0) +/* A3F97C 8024023C 00621821 */ addu $v1, $v1, $v0 +/* A3F980 80240240 04610004 */ bgez $v1, .L80240254 +/* A3F984 80240244 AE0300B4 */ sw $v1, 0xb4($s0) +/* A3F988 80240248 3C020002 */ lui $v0, 2 +/* A3F98C 8024024C 08090099 */ j .L80240264 +/* A3F990 80240250 00621021 */ addu $v0, $v1, $v0 +.L80240254: +/* A3F994 80240254 3C040002 */ lui $a0, 2 +/* A3F998 80240258 0083102A */ slt $v0, $a0, $v1 +/* A3F99C 8024025C 10400002 */ beqz $v0, .L80240268 +/* A3F9A0 80240260 00641023 */ subu $v0, $v1, $a0 +.L80240264: +/* A3F9A4 80240264 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240268: +/* A3F9A8 80240268 8E040084 */ lw $a0, 0x84($s0) +/* A3F9AC 8024026C 0C046F07 */ jal set_main_pan_u +/* A3F9B0 80240270 8E0500A8 */ lw $a1, 0xa8($s0) +/* A3F9B4 80240274 8E040084 */ lw $a0, 0x84($s0) +/* A3F9B8 80240278 0C046F0D */ jal set_main_pan_v +/* A3F9BC 8024027C 8E0500AC */ lw $a1, 0xac($s0) +/* A3F9C0 80240280 8E040084 */ lw $a0, 0x84($s0) +/* A3F9C4 80240284 0C046F13 */ jal set_aux_pan_u +/* A3F9C8 80240288 8E0500B0 */ lw $a1, 0xb0($s0) +/* A3F9CC 8024028C 8E040084 */ lw $a0, 0x84($s0) +/* A3F9D0 80240290 0C046F19 */ jal set_aux_pan_v +/* A3F9D4 80240294 8E0500B4 */ lw $a1, 0xb4($s0) +/* A3F9D8 80240298 8E020070 */ lw $v0, 0x70($s0) +/* A3F9DC 8024029C 8E030078 */ lw $v1, 0x78($s0) +/* A3F9E0 802402A0 8E040098 */ lw $a0, 0x98($s0) +/* A3F9E4 802402A4 24420001 */ addiu $v0, $v0, 1 +/* A3F9E8 802402A8 AE020070 */ sw $v0, 0x70($s0) +/* A3F9EC 802402AC 8E020074 */ lw $v0, 0x74($s0) +/* A3F9F0 802402B0 24630001 */ addiu $v1, $v1, 1 +/* A3F9F4 802402B4 AE030078 */ sw $v1, 0x78($s0) +/* A3F9F8 802402B8 8E030070 */ lw $v1, 0x70($s0) +/* A3F9FC 802402BC 24420001 */ addiu $v0, $v0, 1 +/* A3FA00 802402C0 AE020074 */ sw $v0, 0x74($s0) +/* A3FA04 802402C4 8E02007C */ lw $v0, 0x7c($s0) +/* A3FA08 802402C8 0064182A */ slt $v1, $v1, $a0 +/* A3FA0C 802402CC 24420001 */ addiu $v0, $v0, 1 +/* A3FA10 802402D0 14600002 */ bnez $v1, .L802402DC +/* A3FA14 802402D4 AE02007C */ sw $v0, 0x7c($s0) +/* A3FA18 802402D8 AE000070 */ sw $zero, 0x70($s0) +.L802402DC: +/* A3FA1C 802402DC 8E020074 */ lw $v0, 0x74($s0) +/* A3FA20 802402E0 8E03009C */ lw $v1, 0x9c($s0) +/* A3FA24 802402E4 0043102A */ slt $v0, $v0, $v1 +/* A3FA28 802402E8 50400001 */ beql $v0, $zero, .L802402F0 +/* A3FA2C 802402EC AE000074 */ sw $zero, 0x74($s0) +.L802402F0: +/* A3FA30 802402F0 8E020078 */ lw $v0, 0x78($s0) +/* A3FA34 802402F4 8E0300A0 */ lw $v1, 0xa0($s0) +/* A3FA38 802402F8 0043102A */ slt $v0, $v0, $v1 +/* A3FA3C 802402FC 50400001 */ beql $v0, $zero, .L80240304 +/* A3FA40 80240300 AE000078 */ sw $zero, 0x78($s0) +.L80240304: +/* A3FA44 80240304 8E02007C */ lw $v0, 0x7c($s0) +/* A3FA48 80240308 8E0300A4 */ lw $v1, 0xa4($s0) +/* A3FA4C 8024030C 0043102A */ slt $v0, $v0, $v1 +/* A3FA50 80240310 50400001 */ beql $v0, $zero, .L80240318 +/* A3FA54 80240314 AE00007C */ sw $zero, 0x7c($s0) +.L80240318: +/* A3FA58 80240318 8FBF0014 */ lw $ra, 0x14($sp) +/* A3FA5C 8024031C 8FB00010 */ lw $s0, 0x10($sp) +/* A3FA60 80240320 0000102D */ daddu $v0, $zero, $zero +/* A3FA64 80240324 03E00008 */ jr $ra +/* A3FA68 80240328 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC.s deleted file mode 100644 index 1756610dad..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BEC -/* A4032C 80240BEC 3C018011 */ lui $at, 0x8011 -/* A40330 80240BF0 A020F2A2 */ sb $zero, -0xd5e($at) -/* A40334 80240BF4 03E00008 */ jr $ra -/* A40338 80240BF8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s new file mode 100644 index 0000000000..71cf0b78e9 --- /dev/null +++ b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BEC_A4032C +/* A4032C 80240BEC 3C018011 */ lui $at, 0x8011 +/* A40330 80240BF0 A020F2A2 */ sb $zero, -0xd5e($at) +/* A40334 80240BF4 03E00008 */ jr $ra +/* A40338 80240BF8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802401F0.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802401F0.s deleted file mode 100644 index bbf0c01518..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802401F0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401F0 -/* 97B820 802401F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 97B824 802401F4 AFB3003C */ sw $s3, 0x3c($sp) -/* 97B828 802401F8 0080982D */ daddu $s3, $a0, $zero -/* 97B82C 802401FC AFBF0040 */ sw $ra, 0x40($sp) -/* 97B830 80240200 AFB20038 */ sw $s2, 0x38($sp) -/* 97B834 80240204 AFB10034 */ sw $s1, 0x34($sp) -/* 97B838 80240208 AFB00030 */ sw $s0, 0x30($sp) -/* 97B83C 8024020C 8E710148 */ lw $s1, 0x148($s3) -/* 97B840 80240210 0C00EABB */ jal get_npc_unsafe -/* 97B844 80240214 86240008 */ lh $a0, 8($s1) -/* 97B848 80240218 0040802D */ daddu $s0, $v0, $zero -/* 97B84C 8024021C 8E22007C */ lw $v0, 0x7c($s1) -/* 97B850 80240220 8603008E */ lh $v1, 0x8e($s0) -/* 97B854 80240224 2442FFFF */ addiu $v0, $v0, -1 -/* 97B858 80240228 14620012 */ bne $v1, $v0, .L80240274 -/* 97B85C 8024022C 00000000 */ nop -/* 97B860 80240230 C6000038 */ lwc1 $f0, 0x38($s0) -/* 97B864 80240234 4600020D */ trunc.w.s $f8, $f0 -/* 97B868 80240238 44024000 */ mfc1 $v0, $f8 -/* 97B86C 8024023C 00000000 */ nop -/* 97B870 80240240 A6220010 */ sh $v0, 0x10($s1) -/* 97B874 80240244 C600003C */ lwc1 $f0, 0x3c($s0) -/* 97B878 80240248 4600020D */ trunc.w.s $f8, $f0 -/* 97B87C 8024024C 44024000 */ mfc1 $v0, $f8 -/* 97B880 80240250 00000000 */ nop -/* 97B884 80240254 A6220012 */ sh $v0, 0x12($s1) -/* 97B888 80240258 C6000040 */ lwc1 $f0, 0x40($s0) -/* 97B88C 8024025C 24020001 */ addiu $v0, $zero, 1 -/* 97B890 80240260 A2220007 */ sb $v0, 7($s1) -/* 97B894 80240264 4600020D */ trunc.w.s $f8, $f0 -/* 97B898 80240268 44024000 */ mfc1 $v0, $f8 -/* 97B89C 8024026C 00000000 */ nop -/* 97B8A0 80240270 A6220014 */ sh $v0, 0x14($s1) -.L80240274: -/* 97B8A4 80240274 C6000038 */ lwc1 $f0, 0x38($s0) -/* 97B8A8 80240278 C602003C */ lwc1 $f2, 0x3c($s0) -/* 97B8AC 8024027C C6040040 */ lwc1 $f4, 0x40($s0) -/* 97B8B0 80240280 C6060018 */ lwc1 $f6, 0x18($s0) -/* 97B8B4 80240284 E7A00020 */ swc1 $f0, 0x20($sp) -/* 97B8B8 80240288 E7A20024 */ swc1 $f2, 0x24($sp) -/* 97B8BC 8024028C E7A40028 */ swc1 $f4, 0x28($sp) -/* 97B8C0 80240290 E7A60010 */ swc1 $f6, 0x10($sp) -/* 97B8C4 80240294 C600000C */ lwc1 $f0, 0xc($s0) -/* 97B8C8 80240298 E7A00014 */ swc1 $f0, 0x14($sp) -/* 97B8CC 8024029C 860200A8 */ lh $v0, 0xa8($s0) -/* 97B8D0 802402A0 27A50020 */ addiu $a1, $sp, 0x20 -/* 97B8D4 802402A4 44820000 */ mtc1 $v0, $f0 -/* 97B8D8 802402A8 00000000 */ nop -/* 97B8DC 802402AC 46800020 */ cvt.s.w $f0, $f0 -/* 97B8E0 802402B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 97B8E4 802402B4 860200A6 */ lh $v0, 0xa6($s0) -/* 97B8E8 802402B8 27A60024 */ addiu $a2, $sp, 0x24 -/* 97B8EC 802402BC 44820000 */ mtc1 $v0, $f0 -/* 97B8F0 802402C0 00000000 */ nop -/* 97B8F4 802402C4 46800020 */ cvt.s.w $f0, $f0 -/* 97B8F8 802402C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 97B8FC 802402CC 8E040080 */ lw $a0, 0x80($s0) -/* 97B900 802402D0 0C037711 */ jal func_800DDC44 -/* 97B904 802402D4 27A70028 */ addiu $a3, $sp, 0x28 -/* 97B908 802402D8 0040902D */ daddu $s2, $v0, $zero -/* 97B90C 802402DC 16400005 */ bnez $s2, .L802402F4 -/* 97B910 802402E0 00000000 */ nop -/* 97B914 802402E4 8E050018 */ lw $a1, 0x18($s0) -/* 97B918 802402E8 8E06000C */ lw $a2, 0xc($s0) -/* 97B91C 802402EC 0C00EA95 */ jal npc_move_heading -/* 97B920 802402F0 0200202D */ daddu $a0, $s0, $zero -.L802402F4: -/* 97B924 802402F4 8602008E */ lh $v0, 0x8e($s0) -/* 97B928 802402F8 9603008E */ lhu $v1, 0x8e($s0) -/* 97B92C 802402FC 18400007 */ blez $v0, .L8024031C -/* 97B930 80240300 2462FFFF */ addiu $v0, $v1, -1 -/* 97B934 80240304 A602008E */ sh $v0, 0x8e($s0) -/* 97B938 80240308 00021400 */ sll $v0, $v0, 0x10 -/* 97B93C 8024030C 18400003 */ blez $v0, .L8024031C -/* 97B940 80240310 00000000 */ nop -/* 97B944 80240314 12400008 */ beqz $s2, .L80240338 -/* 97B948 80240318 00000000 */ nop -.L8024031C: -/* 97B94C 8024031C 8E2200CC */ lw $v0, 0xcc($s1) -/* 97B950 80240320 A2200007 */ sb $zero, 7($s1) -/* 97B954 80240324 8C420028 */ lw $v0, 0x28($v0) -/* 97B958 80240328 A600008E */ sh $zero, 0x8e($s0) -/* 97B95C 8024032C AE020028 */ sw $v0, 0x28($s0) -/* 97B960 80240330 2402000F */ addiu $v0, $zero, 0xf -/* 97B964 80240334 AE620070 */ sw $v0, 0x70($s3) -.L80240338: -/* 97B968 80240338 8FBF0040 */ lw $ra, 0x40($sp) -/* 97B96C 8024033C 8FB3003C */ lw $s3, 0x3c($sp) -/* 97B970 80240340 8FB20038 */ lw $s2, 0x38($sp) -/* 97B974 80240344 8FB10034 */ lw $s1, 0x34($sp) -/* 97B978 80240348 8FB00030 */ lw $s0, 0x30($sp) -/* 97B97C 8024034C 03E00008 */ jr $ra -/* 97B980 80240350 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802401F0_97B820.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802401F0_97B820.s new file mode 100644 index 0000000000..235b2de688 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802401F0_97B820.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401F0_97B820 +/* 97B820 802401F0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 97B824 802401F4 AFB3003C */ sw $s3, 0x3c($sp) +/* 97B828 802401F8 0080982D */ daddu $s3, $a0, $zero +/* 97B82C 802401FC AFBF0040 */ sw $ra, 0x40($sp) +/* 97B830 80240200 AFB20038 */ sw $s2, 0x38($sp) +/* 97B834 80240204 AFB10034 */ sw $s1, 0x34($sp) +/* 97B838 80240208 AFB00030 */ sw $s0, 0x30($sp) +/* 97B83C 8024020C 8E710148 */ lw $s1, 0x148($s3) +/* 97B840 80240210 0C00EABB */ jal get_npc_unsafe +/* 97B844 80240214 86240008 */ lh $a0, 8($s1) +/* 97B848 80240218 0040802D */ daddu $s0, $v0, $zero +/* 97B84C 8024021C 8E22007C */ lw $v0, 0x7c($s1) +/* 97B850 80240220 8603008E */ lh $v1, 0x8e($s0) +/* 97B854 80240224 2442FFFF */ addiu $v0, $v0, -1 +/* 97B858 80240228 14620012 */ bne $v1, $v0, .L80240274 +/* 97B85C 8024022C 00000000 */ nop +/* 97B860 80240230 C6000038 */ lwc1 $f0, 0x38($s0) +/* 97B864 80240234 4600020D */ trunc.w.s $f8, $f0 +/* 97B868 80240238 44024000 */ mfc1 $v0, $f8 +/* 97B86C 8024023C 00000000 */ nop +/* 97B870 80240240 A6220010 */ sh $v0, 0x10($s1) +/* 97B874 80240244 C600003C */ lwc1 $f0, 0x3c($s0) +/* 97B878 80240248 4600020D */ trunc.w.s $f8, $f0 +/* 97B87C 8024024C 44024000 */ mfc1 $v0, $f8 +/* 97B880 80240250 00000000 */ nop +/* 97B884 80240254 A6220012 */ sh $v0, 0x12($s1) +/* 97B888 80240258 C6000040 */ lwc1 $f0, 0x40($s0) +/* 97B88C 8024025C 24020001 */ addiu $v0, $zero, 1 +/* 97B890 80240260 A2220007 */ sb $v0, 7($s1) +/* 97B894 80240264 4600020D */ trunc.w.s $f8, $f0 +/* 97B898 80240268 44024000 */ mfc1 $v0, $f8 +/* 97B89C 8024026C 00000000 */ nop +/* 97B8A0 80240270 A6220014 */ sh $v0, 0x14($s1) +.L80240274: +/* 97B8A4 80240274 C6000038 */ lwc1 $f0, 0x38($s0) +/* 97B8A8 80240278 C602003C */ lwc1 $f2, 0x3c($s0) +/* 97B8AC 8024027C C6040040 */ lwc1 $f4, 0x40($s0) +/* 97B8B0 80240280 C6060018 */ lwc1 $f6, 0x18($s0) +/* 97B8B4 80240284 E7A00020 */ swc1 $f0, 0x20($sp) +/* 97B8B8 80240288 E7A20024 */ swc1 $f2, 0x24($sp) +/* 97B8BC 8024028C E7A40028 */ swc1 $f4, 0x28($sp) +/* 97B8C0 80240290 E7A60010 */ swc1 $f6, 0x10($sp) +/* 97B8C4 80240294 C600000C */ lwc1 $f0, 0xc($s0) +/* 97B8C8 80240298 E7A00014 */ swc1 $f0, 0x14($sp) +/* 97B8CC 8024029C 860200A8 */ lh $v0, 0xa8($s0) +/* 97B8D0 802402A0 27A50020 */ addiu $a1, $sp, 0x20 +/* 97B8D4 802402A4 44820000 */ mtc1 $v0, $f0 +/* 97B8D8 802402A8 00000000 */ nop +/* 97B8DC 802402AC 46800020 */ cvt.s.w $f0, $f0 +/* 97B8E0 802402B0 E7A00018 */ swc1 $f0, 0x18($sp) +/* 97B8E4 802402B4 860200A6 */ lh $v0, 0xa6($s0) +/* 97B8E8 802402B8 27A60024 */ addiu $a2, $sp, 0x24 +/* 97B8EC 802402BC 44820000 */ mtc1 $v0, $f0 +/* 97B8F0 802402C0 00000000 */ nop +/* 97B8F4 802402C4 46800020 */ cvt.s.w $f0, $f0 +/* 97B8F8 802402C8 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 97B8FC 802402CC 8E040080 */ lw $a0, 0x80($s0) +/* 97B900 802402D0 0C037711 */ jal func_800DDC44 +/* 97B904 802402D4 27A70028 */ addiu $a3, $sp, 0x28 +/* 97B908 802402D8 0040902D */ daddu $s2, $v0, $zero +/* 97B90C 802402DC 16400005 */ bnez $s2, .L802402F4 +/* 97B910 802402E0 00000000 */ nop +/* 97B914 802402E4 8E050018 */ lw $a1, 0x18($s0) +/* 97B918 802402E8 8E06000C */ lw $a2, 0xc($s0) +/* 97B91C 802402EC 0C00EA95 */ jal npc_move_heading +/* 97B920 802402F0 0200202D */ daddu $a0, $s0, $zero +.L802402F4: +/* 97B924 802402F4 8602008E */ lh $v0, 0x8e($s0) +/* 97B928 802402F8 9603008E */ lhu $v1, 0x8e($s0) +/* 97B92C 802402FC 18400007 */ blez $v0, .L8024031C +/* 97B930 80240300 2462FFFF */ addiu $v0, $v1, -1 +/* 97B934 80240304 A602008E */ sh $v0, 0x8e($s0) +/* 97B938 80240308 00021400 */ sll $v0, $v0, 0x10 +/* 97B93C 8024030C 18400003 */ blez $v0, .L8024031C +/* 97B940 80240310 00000000 */ nop +/* 97B944 80240314 12400008 */ beqz $s2, .L80240338 +/* 97B948 80240318 00000000 */ nop +.L8024031C: +/* 97B94C 8024031C 8E2200CC */ lw $v0, 0xcc($s1) +/* 97B950 80240320 A2200007 */ sb $zero, 7($s1) +/* 97B954 80240324 8C420028 */ lw $v0, 0x28($v0) +/* 97B958 80240328 A600008E */ sh $zero, 0x8e($s0) +/* 97B95C 8024032C AE020028 */ sw $v0, 0x28($s0) +/* 97B960 80240330 2402000F */ addiu $v0, $zero, 0xf +/* 97B964 80240334 AE620070 */ sw $v0, 0x70($s3) +.L80240338: +/* 97B968 80240338 8FBF0040 */ lw $ra, 0x40($sp) +/* 97B96C 8024033C 8FB3003C */ lw $s3, 0x3c($sp) +/* 97B970 80240340 8FB20038 */ lw $s2, 0x38($sp) +/* 97B974 80240344 8FB10034 */ lw $s1, 0x34($sp) +/* 97B978 80240348 8FB00030 */ lw $s0, 0x30($sp) +/* 97B97C 8024034C 03E00008 */ jr $ra +/* 97B980 80240350 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4.s deleted file mode 100644 index bf4a791f6d..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D4 -/* 97BA04 802403D4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 97BA08 802403D8 AFB3005C */ sw $s3, 0x5c($sp) -/* 97BA0C 802403DC 0080982D */ daddu $s3, $a0, $zero -/* 97BA10 802403E0 AFBF0068 */ sw $ra, 0x68($sp) -/* 97BA14 802403E4 AFB50064 */ sw $s5, 0x64($sp) -/* 97BA18 802403E8 AFB40060 */ sw $s4, 0x60($sp) -/* 97BA1C 802403EC AFB20058 */ sw $s2, 0x58($sp) -/* 97BA20 802403F0 AFB10054 */ sw $s1, 0x54($sp) -/* 97BA24 802403F4 AFB00050 */ sw $s0, 0x50($sp) -/* 97BA28 802403F8 8E710148 */ lw $s1, 0x148($s3) -/* 97BA2C 802403FC 86240008 */ lh $a0, 8($s1) -/* 97BA30 80240400 0C00EABB */ jal get_npc_unsafe -/* 97BA34 80240404 00A0802D */ daddu $s0, $a1, $zero -/* 97BA38 80240408 8E63000C */ lw $v1, 0xc($s3) -/* 97BA3C 8024040C 0260202D */ daddu $a0, $s3, $zero -/* 97BA40 80240410 8C650000 */ lw $a1, ($v1) -/* 97BA44 80240414 0C0B1EAF */ jal get_variable -/* 97BA48 80240418 0040902D */ daddu $s2, $v0, $zero -/* 97BA4C 8024041C AFA00028 */ sw $zero, 0x28($sp) -/* 97BA50 80240420 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA54 80240424 8C630030 */ lw $v1, 0x30($v1) -/* 97BA58 80240428 AFA3002C */ sw $v1, 0x2c($sp) -/* 97BA5C 8024042C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA60 80240430 8C63001C */ lw $v1, 0x1c($v1) -/* 97BA64 80240434 AFA30030 */ sw $v1, 0x30($sp) -/* 97BA68 80240438 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA6C 8024043C 8C630024 */ lw $v1, 0x24($v1) -/* 97BA70 80240440 AFA30034 */ sw $v1, 0x34($sp) -/* 97BA74 80240444 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA78 80240448 8C630028 */ lw $v1, 0x28($v1) -/* 97BA7C 8024044C 27B50028 */ addiu $s5, $sp, 0x28 -/* 97BA80 80240450 AFA30038 */ sw $v1, 0x38($sp) -/* 97BA84 80240454 8E2300D0 */ lw $v1, 0xd0($s1) -/* 97BA88 80240458 3C0142C8 */ lui $at, 0x42c8 -/* 97BA8C 8024045C 44810000 */ mtc1 $at, $f0 -/* 97BA90 80240460 8C63002C */ lw $v1, 0x2c($v1) -/* 97BA94 80240464 0040A02D */ daddu $s4, $v0, $zero -/* 97BA98 80240468 E7A00040 */ swc1 $f0, 0x40($sp) -/* 97BA9C 8024046C A7A00044 */ sh $zero, 0x44($sp) -/* 97BAA0 80240470 12000009 */ beqz $s0, .L80240498 -/* 97BAA4 80240474 AFA3003C */ sw $v1, 0x3c($sp) -/* 97BAA8 80240478 864300A8 */ lh $v1, 0xa8($s2) -/* 97BAAC 8024047C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 97BAB0 80240480 AE20008C */ sw $zero, 0x8c($s1) -/* 97BAB4 80240484 A22000B5 */ sb $zero, 0xb5($s1) -/* 97BAB8 80240488 34420008 */ ori $v0, $v0, 8 -/* 97BABC 8024048C AE230084 */ sw $v1, 0x84($s1) -/* 97BAC0 80240490 0809012A */ j .L802404A8 -/* 97BAC4 80240494 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240498: -/* 97BAC8 80240498 8E2200B0 */ lw $v0, 0xb0($s1) -/* 97BACC 8024049C 30420004 */ andi $v0, $v0, 4 -/* 97BAD0 802404A0 10400047 */ beqz $v0, .L802405C0 -/* 97BAD4 802404A4 00000000 */ nop -.L802404A8: -/* 97BAD8 802404A8 AE600070 */ sw $zero, 0x70($s3) -/* 97BADC 802404AC A640008E */ sh $zero, 0x8e($s2) -/* 97BAE0 802404B0 8E2300CC */ lw $v1, 0xcc($s1) -/* 97BAE4 802404B4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 97BAE8 802404B8 A2200007 */ sb $zero, 7($s1) -/* 97BAEC 802404BC 8E420000 */ lw $v0, ($s2) -/* 97BAF0 802404C0 8C630000 */ lw $v1, ($v1) -/* 97BAF4 802404C4 00441024 */ and $v0, $v0, $a0 -/* 97BAF8 802404C8 AE420000 */ sw $v0, ($s2) -/* 97BAFC 802404CC AE430028 */ sw $v1, 0x28($s2) -/* 97BB00 802404D0 96220086 */ lhu $v0, 0x86($s1) -/* 97BB04 802404D4 A64200A8 */ sh $v0, 0xa8($s2) -/* 97BB08 802404D8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 97BB0C 802404DC AE200090 */ sw $zero, 0x90($s1) -/* 97BB10 802404E0 8C420034 */ lw $v0, 0x34($v0) -/* 97BB14 802404E4 14400006 */ bnez $v0, .L80240500 -/* 97BB18 802404E8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 97BB1C 802404EC 8E420000 */ lw $v0, ($s2) -/* 97BB20 802404F0 2403FFF7 */ addiu $v1, $zero, -9 -/* 97BB24 802404F4 34420200 */ ori $v0, $v0, 0x200 -/* 97BB28 802404F8 08090143 */ j .L8024050C -/* 97BB2C 802404FC 00431024 */ and $v0, $v0, $v1 -.L80240500: -/* 97BB30 80240500 8E420000 */ lw $v0, ($s2) -/* 97BB34 80240504 00431024 */ and $v0, $v0, $v1 -/* 97BB38 80240508 34420008 */ ori $v0, $v0, 8 -.L8024050C: -/* 97BB3C 8024050C AE420000 */ sw $v0, ($s2) -/* 97BB40 80240510 8E2200B0 */ lw $v0, 0xb0($s1) -/* 97BB44 80240514 30420004 */ andi $v0, $v0, 4 -/* 97BB48 80240518 1040001E */ beqz $v0, .L80240594 -/* 97BB4C 8024051C 24040002 */ addiu $a0, $zero, 2 -/* 97BB50 80240520 0240282D */ daddu $a1, $s2, $zero -/* 97BB54 80240524 0000302D */ daddu $a2, $zero, $zero -/* 97BB58 80240528 24020063 */ addiu $v0, $zero, 0x63 -/* 97BB5C 8024052C AE620070 */ sw $v0, 0x70($s3) -/* 97BB60 80240530 AE600074 */ sw $zero, 0x74($s3) -/* 97BB64 80240534 864300A8 */ lh $v1, 0xa8($s2) -/* 97BB68 80240538 3C013F80 */ lui $at, 0x3f80 -/* 97BB6C 8024053C 44810000 */ mtc1 $at, $f0 -/* 97BB70 80240540 3C014000 */ lui $at, 0x4000 -/* 97BB74 80240544 44811000 */ mtc1 $at, $f2 -/* 97BB78 80240548 3C01C1A0 */ lui $at, 0xc1a0 -/* 97BB7C 8024054C 44812000 */ mtc1 $at, $f4 -/* 97BB80 80240550 24020028 */ addiu $v0, $zero, 0x28 -/* 97BB84 80240554 AFA2001C */ sw $v0, 0x1c($sp) -/* 97BB88 80240558 44833000 */ mtc1 $v1, $f6 -/* 97BB8C 8024055C 00000000 */ nop -/* 97BB90 80240560 468031A0 */ cvt.s.w $f6, $f6 -/* 97BB94 80240564 44073000 */ mfc1 $a3, $f6 -/* 97BB98 80240568 27A20048 */ addiu $v0, $sp, 0x48 -/* 97BB9C 8024056C AFA20020 */ sw $v0, 0x20($sp) -/* 97BBA0 80240570 E7A00010 */ swc1 $f0, 0x10($sp) -/* 97BBA4 80240574 E7A20014 */ swc1 $f2, 0x14($sp) -/* 97BBA8 80240578 0C01BFA4 */ jal fx_emote -/* 97BBAC 8024057C E7A40018 */ swc1 $f4, 0x18($sp) -/* 97BBB0 80240580 8E2200B0 */ lw $v0, 0xb0($s1) -/* 97BBB4 80240584 2403FFFB */ addiu $v1, $zero, -5 -/* 97BBB8 80240588 00431024 */ and $v0, $v0, $v1 -/* 97BBBC 8024058C 08090170 */ j .L802405C0 -/* 97BBC0 80240590 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240594: -/* 97BBC4 80240594 8E220000 */ lw $v0, ($s1) -/* 97BBC8 80240598 3C034000 */ lui $v1, 0x4000 -/* 97BBCC 8024059C 00431024 */ and $v0, $v0, $v1 -/* 97BBD0 802405A0 10400007 */ beqz $v0, .L802405C0 -/* 97BBD4 802405A4 3C03BFFF */ lui $v1, 0xbfff -/* 97BBD8 802405A8 2402000C */ addiu $v0, $zero, 0xc -/* 97BBDC 802405AC AE620070 */ sw $v0, 0x70($s3) -/* 97BBE0 802405B0 8E220000 */ lw $v0, ($s1) -/* 97BBE4 802405B4 3463FFFF */ ori $v1, $v1, 0xffff -/* 97BBE8 802405B8 00431024 */ and $v0, $v0, $v1 -/* 97BBEC 802405BC AE220000 */ sw $v0, ($s1) -.L802405C0: -/* 97BBF0 802405C0 8E220090 */ lw $v0, 0x90($s1) -/* 97BBF4 802405C4 1840000C */ blez $v0, .L802405F8 -/* 97BBF8 802405C8 2442FFFF */ addiu $v0, $v0, -1 -/* 97BBFC 802405CC 14400087 */ bnez $v0, .L802407EC -/* 97BC00 802405D0 AE220090 */ sw $v0, 0x90($s1) -/* 97BC04 802405D4 3C03FFAA */ lui $v1, 0xffaa -/* 97BC08 802405D8 8E420028 */ lw $v0, 0x28($s2) -/* 97BC0C 802405DC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 97BC10 802405E0 00431021 */ addu $v0, $v0, $v1 -/* 97BC14 802405E4 2C420002 */ sltiu $v0, $v0, 2 -/* 97BC18 802405E8 10400003 */ beqz $v0, .L802405F8 -/* 97BC1C 802405EC 3C020055 */ lui $v0, 0x55 -/* 97BC20 802405F0 3442000C */ ori $v0, $v0, 0xc -/* 97BC24 802405F4 AE420028 */ sw $v0, 0x28($s2) -.L802405F8: -/* 97BC28 802405F8 8E630070 */ lw $v1, 0x70($s3) -/* 97BC2C 802405FC 2402000C */ addiu $v0, $zero, 0xc -/* 97BC30 80240600 10620048 */ beq $v1, $v0, .L80240724 -/* 97BC34 80240604 2862000D */ slti $v0, $v1, 0xd -/* 97BC38 80240608 1040000F */ beqz $v0, .L80240648 -/* 97BC3C 8024060C 24100001 */ addiu $s0, $zero, 1 -/* 97BC40 80240610 1070001E */ beq $v1, $s0, .L8024068C -/* 97BC44 80240614 28620002 */ slti $v0, $v1, 2 -/* 97BC48 80240618 10400005 */ beqz $v0, .L80240630 -/* 97BC4C 8024061C 24020002 */ addiu $v0, $zero, 2 -/* 97BC50 80240620 10600015 */ beqz $v1, .L80240678 -/* 97BC54 80240624 0260202D */ daddu $a0, $s3, $zero -/* 97BC58 80240628 080901E0 */ j .L80240780 -/* 97BC5C 8024062C 00000000 */ nop -.L80240630: -/* 97BC60 80240630 1062001C */ beq $v1, $v0, .L802406A4 -/* 97BC64 80240634 24020003 */ addiu $v0, $zero, 3 -/* 97BC68 80240638 10620035 */ beq $v1, $v0, .L80240710 -/* 97BC6C 8024063C 0260202D */ daddu $a0, $s3, $zero -/* 97BC70 80240640 080901E0 */ j .L80240780 -/* 97BC74 80240644 00000000 */ nop -.L80240648: -/* 97BC78 80240648 2402000E */ addiu $v0, $zero, 0xe -/* 97BC7C 8024064C 1062003F */ beq $v1, $v0, .L8024074C -/* 97BC80 80240650 0062102A */ slt $v0, $v1, $v0 -/* 97BC84 80240654 14400038 */ bnez $v0, .L80240738 -/* 97BC88 80240658 0260202D */ daddu $a0, $s3, $zero -/* 97BC8C 8024065C 2402000F */ addiu $v0, $zero, 0xf -/* 97BC90 80240660 10620040 */ beq $v1, $v0, .L80240764 -/* 97BC94 80240664 24020063 */ addiu $v0, $zero, 0x63 -/* 97BC98 80240668 10620043 */ beq $v1, $v0, .L80240778 -/* 97BC9C 8024066C 00000000 */ nop -/* 97BCA0 80240670 080901E0 */ j .L80240780 -/* 97BCA4 80240674 00000000 */ nop -.L80240678: -/* 97BCA8 80240678 0280282D */ daddu $a1, $s4, $zero -/* 97BCAC 8024067C 0C012568 */ jal func_800495A0 -/* 97BCB0 80240680 02A0302D */ daddu $a2, $s5, $zero -/* 97BCB4 80240684 96220086 */ lhu $v0, 0x86($s1) -/* 97BCB8 80240688 A64200A8 */ sh $v0, 0xa8($s2) -.L8024068C: -/* 97BCBC 8024068C 0260202D */ daddu $a0, $s3, $zero -/* 97BCC0 80240690 0280282D */ daddu $a1, $s4, $zero -/* 97BCC4 80240694 0C0125AE */ jal func_800496B8 -/* 97BCC8 80240698 02A0302D */ daddu $a2, $s5, $zero -/* 97BCCC 8024069C 080901E0 */ j .L80240780 -/* 97BCD0 802406A0 00000000 */ nop -.L802406A4: -/* 97BCD4 802406A4 0260202D */ daddu $a0, $s3, $zero -/* 97BCD8 802406A8 0280282D */ daddu $a1, $s4, $zero -/* 97BCDC 802406AC 0C0126D1 */ jal func_80049B44 -/* 97BCE0 802406B0 02A0302D */ daddu $a2, $s5, $zero -/* 97BCE4 802406B4 8E230088 */ lw $v1, 0x88($s1) -/* 97BCE8 802406B8 24020006 */ addiu $v0, $zero, 6 -/* 97BCEC 802406BC 14620014 */ bne $v1, $v0, .L80240710 -/* 97BCF0 802406C0 0260202D */ daddu $a0, $s3, $zero -/* 97BCF4 802406C4 0C00A67F */ jal rand_int -/* 97BCF8 802406C8 24040064 */ addiu $a0, $zero, 0x64 -/* 97BCFC 802406CC 28420021 */ slti $v0, $v0, 0x21 -/* 97BD00 802406D0 5040000F */ beql $v0, $zero, .L80240710 -/* 97BD04 802406D4 0260202D */ daddu $a0, $s3, $zero -/* 97BD08 802406D8 8E22008C */ lw $v0, 0x8c($s1) -/* 97BD0C 802406DC 10400005 */ beqz $v0, .L802406F4 -/* 97BD10 802406E0 3C020055 */ lui $v0, 0x55 -/* 97BD14 802406E4 3442002F */ ori $v0, $v0, 0x2f -/* 97BD18 802406E8 AE20008C */ sw $zero, 0x8c($s1) -/* 97BD1C 802406EC 080901C0 */ j .L80240700 -/* 97BD20 802406F0 A22000B5 */ sb $zero, 0xb5($s1) -.L802406F4: -/* 97BD24 802406F4 3442002E */ ori $v0, $v0, 0x2e -/* 97BD28 802406F8 AE30008C */ sw $s0, 0x8c($s1) -/* 97BD2C 802406FC A23000B5 */ sb $s0, 0xb5($s1) -.L80240700: -/* 97BD30 80240700 AE420028 */ sw $v0, 0x28($s2) -/* 97BD34 80240704 24020007 */ addiu $v0, $zero, 7 -/* 97BD38 80240708 080901FB */ j .L802407EC -/* 97BD3C 8024070C AE220090 */ sw $v0, 0x90($s1) -.L80240710: -/* 97BD40 80240710 0280282D */ daddu $a1, $s4, $zero -/* 97BD44 80240714 0C012701 */ jal func_80049C04 -/* 97BD48 80240718 02A0302D */ daddu $a2, $s5, $zero -/* 97BD4C 8024071C 080901E0 */ j .L80240780 -/* 97BD50 80240720 00000000 */ nop -.L80240724: -/* 97BD54 80240724 0260202D */ daddu $a0, $s3, $zero -/* 97BD58 80240728 0280282D */ daddu $a1, $s4, $zero -/* 97BD5C 8024072C 0C090010 */ jal func_80240040 -/* 97BD60 80240730 02A0302D */ daddu $a2, $s5, $zero -/* 97BD64 80240734 0260202D */ daddu $a0, $s3, $zero -.L80240738: -/* 97BD68 80240738 0280282D */ daddu $a1, $s4, $zero -/* 97BD6C 8024073C 0C09002F */ jal func_802400BC -/* 97BD70 80240740 02A0302D */ daddu $a2, $s5, $zero -/* 97BD74 80240744 080901E0 */ j .L80240780 -/* 97BD78 80240748 00000000 */ nop -.L8024074C: -/* 97BD7C 8024074C 0260202D */ daddu $a0, $s3, $zero -/* 97BD80 80240750 0280282D */ daddu $a1, $s4, $zero -/* 97BD84 80240754 0C09007C */ jal func_802401F0 -/* 97BD88 80240758 02A0302D */ daddu $a2, $s5, $zero -/* 97BD8C 8024075C 080901E0 */ j .L80240780 -/* 97BD90 80240760 00000000 */ nop -.L80240764: -/* 97BD94 80240764 0280282D */ daddu $a1, $s4, $zero -/* 97BD98 80240768 0C0900D5 */ jal func_80240354 -/* 97BD9C 8024076C 02A0302D */ daddu $a2, $s5, $zero -/* 97BDA0 80240770 080901E0 */ j .L80240780 -/* 97BDA4 80240774 00000000 */ nop -.L80240778: -/* 97BDA8 80240778 0C0129CF */ jal func_8004A73C -/* 97BDAC 8024077C 0260202D */ daddu $a0, $s3, $zero -.L80240780: -/* 97BDB0 80240780 8E230088 */ lw $v1, 0x88($s1) -/* 97BDB4 80240784 24020006 */ addiu $v0, $zero, 6 -/* 97BDB8 80240788 14620019 */ bne $v1, $v0, .L802407F0 -/* 97BDBC 8024078C 0000102D */ daddu $v0, $zero, $zero -/* 97BDC0 80240790 8E22008C */ lw $v0, 0x8c($s1) -/* 97BDC4 80240794 10400003 */ beqz $v0, .L802407A4 -/* 97BDC8 80240798 24020001 */ addiu $v0, $zero, 1 -/* 97BDCC 8024079C 080901EA */ j .L802407A8 -/* 97BDD0 802407A0 A22200B5 */ sb $v0, 0xb5($s1) -.L802407A4: -/* 97BDD4 802407A4 A22000B5 */ sb $zero, 0xb5($s1) -.L802407A8: -/* 97BDD8 802407A8 8E22008C */ lw $v0, 0x8c($s1) -/* 97BDDC 802407AC 1040000F */ beqz $v0, .L802407EC -/* 97BDE0 802407B0 3C03FFAA */ lui $v1, 0xffaa -/* 97BDE4 802407B4 8E420028 */ lw $v0, 0x28($s2) -/* 97BDE8 802407B8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 97BDEC 802407BC 00431821 */ addu $v1, $v0, $v1 -/* 97BDF0 802407C0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 97BDF4 802407C4 10400009 */ beqz $v0, .L802407EC -/* 97BDF8 802407C8 00031080 */ sll $v0, $v1, 2 -/* 97BDFC 802407CC 3C018024 */ lui $at, 0x8024 -/* 97BE00 802407D0 00220821 */ addu $at, $at, $v0 -/* 97BE04 802407D4 8C222438 */ lw $v0, 0x2438($at) -/* 97BE08 802407D8 00400008 */ jr $v0 -/* 97BE0C 802407DC 00000000 */ nop -/* 97BE10 802407E0 8E420028 */ lw $v0, 0x28($s2) -/* 97BE14 802407E4 24420001 */ addiu $v0, $v0, 1 -/* 97BE18 802407E8 AE420028 */ sw $v0, 0x28($s2) -.L802407EC: -/* 97BE1C 802407EC 0000102D */ daddu $v0, $zero, $zero -.L802407F0: -/* 97BE20 802407F0 8FBF0068 */ lw $ra, 0x68($sp) -/* 97BE24 802407F4 8FB50064 */ lw $s5, 0x64($sp) -/* 97BE28 802407F8 8FB40060 */ lw $s4, 0x60($sp) -/* 97BE2C 802407FC 8FB3005C */ lw $s3, 0x5c($sp) -/* 97BE30 80240800 8FB20058 */ lw $s2, 0x58($sp) -/* 97BE34 80240804 8FB10054 */ lw $s1, 0x54($sp) -/* 97BE38 80240808 8FB00050 */ lw $s0, 0x50($sp) -/* 97BE3C 8024080C 03E00008 */ jr $ra -/* 97BE40 80240810 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s new file mode 100644 index 0000000000..7f4532a629 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_802403D4_97BA04.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403D4_97BA04 +/* 97BA04 802403D4 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 97BA08 802403D8 AFB3005C */ sw $s3, 0x5c($sp) +/* 97BA0C 802403DC 0080982D */ daddu $s3, $a0, $zero +/* 97BA10 802403E0 AFBF0068 */ sw $ra, 0x68($sp) +/* 97BA14 802403E4 AFB50064 */ sw $s5, 0x64($sp) +/* 97BA18 802403E8 AFB40060 */ sw $s4, 0x60($sp) +/* 97BA1C 802403EC AFB20058 */ sw $s2, 0x58($sp) +/* 97BA20 802403F0 AFB10054 */ sw $s1, 0x54($sp) +/* 97BA24 802403F4 AFB00050 */ sw $s0, 0x50($sp) +/* 97BA28 802403F8 8E710148 */ lw $s1, 0x148($s3) +/* 97BA2C 802403FC 86240008 */ lh $a0, 8($s1) +/* 97BA30 80240400 0C00EABB */ jal get_npc_unsafe +/* 97BA34 80240404 00A0802D */ daddu $s0, $a1, $zero +/* 97BA38 80240408 8E63000C */ lw $v1, 0xc($s3) +/* 97BA3C 8024040C 0260202D */ daddu $a0, $s3, $zero +/* 97BA40 80240410 8C650000 */ lw $a1, ($v1) +/* 97BA44 80240414 0C0B1EAF */ jal get_variable +/* 97BA48 80240418 0040902D */ daddu $s2, $v0, $zero +/* 97BA4C 8024041C AFA00028 */ sw $zero, 0x28($sp) +/* 97BA50 80240420 8E2300D0 */ lw $v1, 0xd0($s1) +/* 97BA54 80240424 8C630030 */ lw $v1, 0x30($v1) +/* 97BA58 80240428 AFA3002C */ sw $v1, 0x2c($sp) +/* 97BA5C 8024042C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 97BA60 80240430 8C63001C */ lw $v1, 0x1c($v1) +/* 97BA64 80240434 AFA30030 */ sw $v1, 0x30($sp) +/* 97BA68 80240438 8E2300D0 */ lw $v1, 0xd0($s1) +/* 97BA6C 8024043C 8C630024 */ lw $v1, 0x24($v1) +/* 97BA70 80240440 AFA30034 */ sw $v1, 0x34($sp) +/* 97BA74 80240444 8E2300D0 */ lw $v1, 0xd0($s1) +/* 97BA78 80240448 8C630028 */ lw $v1, 0x28($v1) +/* 97BA7C 8024044C 27B50028 */ addiu $s5, $sp, 0x28 +/* 97BA80 80240450 AFA30038 */ sw $v1, 0x38($sp) +/* 97BA84 80240454 8E2300D0 */ lw $v1, 0xd0($s1) +/* 97BA88 80240458 3C0142C8 */ lui $at, 0x42c8 +/* 97BA8C 8024045C 44810000 */ mtc1 $at, $f0 +/* 97BA90 80240460 8C63002C */ lw $v1, 0x2c($v1) +/* 97BA94 80240464 0040A02D */ daddu $s4, $v0, $zero +/* 97BA98 80240468 E7A00040 */ swc1 $f0, 0x40($sp) +/* 97BA9C 8024046C A7A00044 */ sh $zero, 0x44($sp) +/* 97BAA0 80240470 12000009 */ beqz $s0, .L80240498 +/* 97BAA4 80240474 AFA3003C */ sw $v1, 0x3c($sp) +/* 97BAA8 80240478 864300A8 */ lh $v1, 0xa8($s2) +/* 97BAAC 8024047C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 97BAB0 80240480 AE20008C */ sw $zero, 0x8c($s1) +/* 97BAB4 80240484 A22000B5 */ sb $zero, 0xb5($s1) +/* 97BAB8 80240488 34420008 */ ori $v0, $v0, 8 +/* 97BABC 8024048C AE230084 */ sw $v1, 0x84($s1) +/* 97BAC0 80240490 0809012A */ j .L802404A8 +/* 97BAC4 80240494 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240498: +/* 97BAC8 80240498 8E2200B0 */ lw $v0, 0xb0($s1) +/* 97BACC 8024049C 30420004 */ andi $v0, $v0, 4 +/* 97BAD0 802404A0 10400047 */ beqz $v0, .L802405C0 +/* 97BAD4 802404A4 00000000 */ nop +.L802404A8: +/* 97BAD8 802404A8 AE600070 */ sw $zero, 0x70($s3) +/* 97BADC 802404AC A640008E */ sh $zero, 0x8e($s2) +/* 97BAE0 802404B0 8E2300CC */ lw $v1, 0xcc($s1) +/* 97BAE4 802404B4 2404F7FF */ addiu $a0, $zero, -0x801 +/* 97BAE8 802404B8 A2200007 */ sb $zero, 7($s1) +/* 97BAEC 802404BC 8E420000 */ lw $v0, ($s2) +/* 97BAF0 802404C0 8C630000 */ lw $v1, ($v1) +/* 97BAF4 802404C4 00441024 */ and $v0, $v0, $a0 +/* 97BAF8 802404C8 AE420000 */ sw $v0, ($s2) +/* 97BAFC 802404CC AE430028 */ sw $v1, 0x28($s2) +/* 97BB00 802404D0 96220086 */ lhu $v0, 0x86($s1) +/* 97BB04 802404D4 A64200A8 */ sh $v0, 0xa8($s2) +/* 97BB08 802404D8 8E2200D0 */ lw $v0, 0xd0($s1) +/* 97BB0C 802404DC AE200090 */ sw $zero, 0x90($s1) +/* 97BB10 802404E0 8C420034 */ lw $v0, 0x34($v0) +/* 97BB14 802404E4 14400006 */ bnez $v0, .L80240500 +/* 97BB18 802404E8 2403FDFF */ addiu $v1, $zero, -0x201 +/* 97BB1C 802404EC 8E420000 */ lw $v0, ($s2) +/* 97BB20 802404F0 2403FFF7 */ addiu $v1, $zero, -9 +/* 97BB24 802404F4 34420200 */ ori $v0, $v0, 0x200 +/* 97BB28 802404F8 08090143 */ j .L8024050C +/* 97BB2C 802404FC 00431024 */ and $v0, $v0, $v1 +.L80240500: +/* 97BB30 80240500 8E420000 */ lw $v0, ($s2) +/* 97BB34 80240504 00431024 */ and $v0, $v0, $v1 +/* 97BB38 80240508 34420008 */ ori $v0, $v0, 8 +.L8024050C: +/* 97BB3C 8024050C AE420000 */ sw $v0, ($s2) +/* 97BB40 80240510 8E2200B0 */ lw $v0, 0xb0($s1) +/* 97BB44 80240514 30420004 */ andi $v0, $v0, 4 +/* 97BB48 80240518 1040001E */ beqz $v0, .L80240594 +/* 97BB4C 8024051C 24040002 */ addiu $a0, $zero, 2 +/* 97BB50 80240520 0240282D */ daddu $a1, $s2, $zero +/* 97BB54 80240524 0000302D */ daddu $a2, $zero, $zero +/* 97BB58 80240528 24020063 */ addiu $v0, $zero, 0x63 +/* 97BB5C 8024052C AE620070 */ sw $v0, 0x70($s3) +/* 97BB60 80240530 AE600074 */ sw $zero, 0x74($s3) +/* 97BB64 80240534 864300A8 */ lh $v1, 0xa8($s2) +/* 97BB68 80240538 3C013F80 */ lui $at, 0x3f80 +/* 97BB6C 8024053C 44810000 */ mtc1 $at, $f0 +/* 97BB70 80240540 3C014000 */ lui $at, 0x4000 +/* 97BB74 80240544 44811000 */ mtc1 $at, $f2 +/* 97BB78 80240548 3C01C1A0 */ lui $at, 0xc1a0 +/* 97BB7C 8024054C 44812000 */ mtc1 $at, $f4 +/* 97BB80 80240550 24020028 */ addiu $v0, $zero, 0x28 +/* 97BB84 80240554 AFA2001C */ sw $v0, 0x1c($sp) +/* 97BB88 80240558 44833000 */ mtc1 $v1, $f6 +/* 97BB8C 8024055C 00000000 */ nop +/* 97BB90 80240560 468031A0 */ cvt.s.w $f6, $f6 +/* 97BB94 80240564 44073000 */ mfc1 $a3, $f6 +/* 97BB98 80240568 27A20048 */ addiu $v0, $sp, 0x48 +/* 97BB9C 8024056C AFA20020 */ sw $v0, 0x20($sp) +/* 97BBA0 80240570 E7A00010 */ swc1 $f0, 0x10($sp) +/* 97BBA4 80240574 E7A20014 */ swc1 $f2, 0x14($sp) +/* 97BBA8 80240578 0C01BFA4 */ jal fx_emote +/* 97BBAC 8024057C E7A40018 */ swc1 $f4, 0x18($sp) +/* 97BBB0 80240580 8E2200B0 */ lw $v0, 0xb0($s1) +/* 97BBB4 80240584 2403FFFB */ addiu $v1, $zero, -5 +/* 97BBB8 80240588 00431024 */ and $v0, $v0, $v1 +/* 97BBBC 8024058C 08090170 */ j .L802405C0 +/* 97BBC0 80240590 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240594: +/* 97BBC4 80240594 8E220000 */ lw $v0, ($s1) +/* 97BBC8 80240598 3C034000 */ lui $v1, 0x4000 +/* 97BBCC 8024059C 00431024 */ and $v0, $v0, $v1 +/* 97BBD0 802405A0 10400007 */ beqz $v0, .L802405C0 +/* 97BBD4 802405A4 3C03BFFF */ lui $v1, 0xbfff +/* 97BBD8 802405A8 2402000C */ addiu $v0, $zero, 0xc +/* 97BBDC 802405AC AE620070 */ sw $v0, 0x70($s3) +/* 97BBE0 802405B0 8E220000 */ lw $v0, ($s1) +/* 97BBE4 802405B4 3463FFFF */ ori $v1, $v1, 0xffff +/* 97BBE8 802405B8 00431024 */ and $v0, $v0, $v1 +/* 97BBEC 802405BC AE220000 */ sw $v0, ($s1) +.L802405C0: +/* 97BBF0 802405C0 8E220090 */ lw $v0, 0x90($s1) +/* 97BBF4 802405C4 1840000C */ blez $v0, .L802405F8 +/* 97BBF8 802405C8 2442FFFF */ addiu $v0, $v0, -1 +/* 97BBFC 802405CC 14400087 */ bnez $v0, .L802407EC +/* 97BC00 802405D0 AE220090 */ sw $v0, 0x90($s1) +/* 97BC04 802405D4 3C03FFAA */ lui $v1, 0xffaa +/* 97BC08 802405D8 8E420028 */ lw $v0, 0x28($s2) +/* 97BC0C 802405DC 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 97BC10 802405E0 00431021 */ addu $v0, $v0, $v1 +/* 97BC14 802405E4 2C420002 */ sltiu $v0, $v0, 2 +/* 97BC18 802405E8 10400003 */ beqz $v0, .L802405F8 +/* 97BC1C 802405EC 3C020055 */ lui $v0, 0x55 +/* 97BC20 802405F0 3442000C */ ori $v0, $v0, 0xc +/* 97BC24 802405F4 AE420028 */ sw $v0, 0x28($s2) +.L802405F8: +/* 97BC28 802405F8 8E630070 */ lw $v1, 0x70($s3) +/* 97BC2C 802405FC 2402000C */ addiu $v0, $zero, 0xc +/* 97BC30 80240600 10620048 */ beq $v1, $v0, .L80240724 +/* 97BC34 80240604 2862000D */ slti $v0, $v1, 0xd +/* 97BC38 80240608 1040000F */ beqz $v0, .L80240648 +/* 97BC3C 8024060C 24100001 */ addiu $s0, $zero, 1 +/* 97BC40 80240610 1070001E */ beq $v1, $s0, .L8024068C +/* 97BC44 80240614 28620002 */ slti $v0, $v1, 2 +/* 97BC48 80240618 10400005 */ beqz $v0, .L80240630 +/* 97BC4C 8024061C 24020002 */ addiu $v0, $zero, 2 +/* 97BC50 80240620 10600015 */ beqz $v1, .L80240678 +/* 97BC54 80240624 0260202D */ daddu $a0, $s3, $zero +/* 97BC58 80240628 080901E0 */ j .L80240780 +/* 97BC5C 8024062C 00000000 */ nop +.L80240630: +/* 97BC60 80240630 1062001C */ beq $v1, $v0, .L802406A4 +/* 97BC64 80240634 24020003 */ addiu $v0, $zero, 3 +/* 97BC68 80240638 10620035 */ beq $v1, $v0, .L80240710 +/* 97BC6C 8024063C 0260202D */ daddu $a0, $s3, $zero +/* 97BC70 80240640 080901E0 */ j .L80240780 +/* 97BC74 80240644 00000000 */ nop +.L80240648: +/* 97BC78 80240648 2402000E */ addiu $v0, $zero, 0xe +/* 97BC7C 8024064C 1062003F */ beq $v1, $v0, .L8024074C +/* 97BC80 80240650 0062102A */ slt $v0, $v1, $v0 +/* 97BC84 80240654 14400038 */ bnez $v0, .L80240738 +/* 97BC88 80240658 0260202D */ daddu $a0, $s3, $zero +/* 97BC8C 8024065C 2402000F */ addiu $v0, $zero, 0xf +/* 97BC90 80240660 10620040 */ beq $v1, $v0, .L80240764 +/* 97BC94 80240664 24020063 */ addiu $v0, $zero, 0x63 +/* 97BC98 80240668 10620043 */ beq $v1, $v0, .L80240778 +/* 97BC9C 8024066C 00000000 */ nop +/* 97BCA0 80240670 080901E0 */ j .L80240780 +/* 97BCA4 80240674 00000000 */ nop +.L80240678: +/* 97BCA8 80240678 0280282D */ daddu $a1, $s4, $zero +/* 97BCAC 8024067C 0C012568 */ jal func_800495A0 +/* 97BCB0 80240680 02A0302D */ daddu $a2, $s5, $zero +/* 97BCB4 80240684 96220086 */ lhu $v0, 0x86($s1) +/* 97BCB8 80240688 A64200A8 */ sh $v0, 0xa8($s2) +.L8024068C: +/* 97BCBC 8024068C 0260202D */ daddu $a0, $s3, $zero +/* 97BCC0 80240690 0280282D */ daddu $a1, $s4, $zero +/* 97BCC4 80240694 0C0125AE */ jal func_800496B8 +/* 97BCC8 80240698 02A0302D */ daddu $a2, $s5, $zero +/* 97BCCC 8024069C 080901E0 */ j .L80240780 +/* 97BCD0 802406A0 00000000 */ nop +.L802406A4: +/* 97BCD4 802406A4 0260202D */ daddu $a0, $s3, $zero +/* 97BCD8 802406A8 0280282D */ daddu $a1, $s4, $zero +/* 97BCDC 802406AC 0C0126D1 */ jal func_80049B44 +/* 97BCE0 802406B0 02A0302D */ daddu $a2, $s5, $zero +/* 97BCE4 802406B4 8E230088 */ lw $v1, 0x88($s1) +/* 97BCE8 802406B8 24020006 */ addiu $v0, $zero, 6 +/* 97BCEC 802406BC 14620014 */ bne $v1, $v0, .L80240710 +/* 97BCF0 802406C0 0260202D */ daddu $a0, $s3, $zero +/* 97BCF4 802406C4 0C00A67F */ jal rand_int +/* 97BCF8 802406C8 24040064 */ addiu $a0, $zero, 0x64 +/* 97BCFC 802406CC 28420021 */ slti $v0, $v0, 0x21 +/* 97BD00 802406D0 5040000F */ beql $v0, $zero, .L80240710 +/* 97BD04 802406D4 0260202D */ daddu $a0, $s3, $zero +/* 97BD08 802406D8 8E22008C */ lw $v0, 0x8c($s1) +/* 97BD0C 802406DC 10400005 */ beqz $v0, .L802406F4 +/* 97BD10 802406E0 3C020055 */ lui $v0, 0x55 +/* 97BD14 802406E4 3442002F */ ori $v0, $v0, 0x2f +/* 97BD18 802406E8 AE20008C */ sw $zero, 0x8c($s1) +/* 97BD1C 802406EC 080901C0 */ j .L80240700 +/* 97BD20 802406F0 A22000B5 */ sb $zero, 0xb5($s1) +.L802406F4: +/* 97BD24 802406F4 3442002E */ ori $v0, $v0, 0x2e +/* 97BD28 802406F8 AE30008C */ sw $s0, 0x8c($s1) +/* 97BD2C 802406FC A23000B5 */ sb $s0, 0xb5($s1) +.L80240700: +/* 97BD30 80240700 AE420028 */ sw $v0, 0x28($s2) +/* 97BD34 80240704 24020007 */ addiu $v0, $zero, 7 +/* 97BD38 80240708 080901FB */ j .L802407EC +/* 97BD3C 8024070C AE220090 */ sw $v0, 0x90($s1) +.L80240710: +/* 97BD40 80240710 0280282D */ daddu $a1, $s4, $zero +/* 97BD44 80240714 0C012701 */ jal func_80049C04 +/* 97BD48 80240718 02A0302D */ daddu $a2, $s5, $zero +/* 97BD4C 8024071C 080901E0 */ j .L80240780 +/* 97BD50 80240720 00000000 */ nop +.L80240724: +/* 97BD54 80240724 0260202D */ daddu $a0, $s3, $zero +/* 97BD58 80240728 0280282D */ daddu $a1, $s4, $zero +/* 97BD5C 8024072C 0C090010 */ jal func_80240040_97B670 +/* 97BD60 80240730 02A0302D */ daddu $a2, $s5, $zero +/* 97BD64 80240734 0260202D */ daddu $a0, $s3, $zero +.L80240738: +/* 97BD68 80240738 0280282D */ daddu $a1, $s4, $zero +/* 97BD6C 8024073C 0C09002F */ jal func_802400BC_97B6EC +/* 97BD70 80240740 02A0302D */ daddu $a2, $s5, $zero +/* 97BD74 80240744 080901E0 */ j .L80240780 +/* 97BD78 80240748 00000000 */ nop +.L8024074C: +/* 97BD7C 8024074C 0260202D */ daddu $a0, $s3, $zero +/* 97BD80 80240750 0280282D */ daddu $a1, $s4, $zero +/* 97BD84 80240754 0C09007C */ jal func_802401F0_97B820 +/* 97BD88 80240758 02A0302D */ daddu $a2, $s5, $zero +/* 97BD8C 8024075C 080901E0 */ j .L80240780 +/* 97BD90 80240760 00000000 */ nop +.L80240764: +/* 97BD94 80240764 0280282D */ daddu $a1, $s4, $zero +/* 97BD98 80240768 0C0900D5 */ jal func_80240354_97B984 +/* 97BD9C 8024076C 02A0302D */ daddu $a2, $s5, $zero +/* 97BDA0 80240770 080901E0 */ j .L80240780 +/* 97BDA4 80240774 00000000 */ nop +.L80240778: +/* 97BDA8 80240778 0C0129CF */ jal func_8004A73C +/* 97BDAC 8024077C 0260202D */ daddu $a0, $s3, $zero +.L80240780: +/* 97BDB0 80240780 8E230088 */ lw $v1, 0x88($s1) +/* 97BDB4 80240784 24020006 */ addiu $v0, $zero, 6 +/* 97BDB8 80240788 14620019 */ bne $v1, $v0, .L802407F0 +/* 97BDBC 8024078C 0000102D */ daddu $v0, $zero, $zero +/* 97BDC0 80240790 8E22008C */ lw $v0, 0x8c($s1) +/* 97BDC4 80240794 10400003 */ beqz $v0, .L802407A4 +/* 97BDC8 80240798 24020001 */ addiu $v0, $zero, 1 +/* 97BDCC 8024079C 080901EA */ j .L802407A8 +/* 97BDD0 802407A0 A22200B5 */ sb $v0, 0xb5($s1) +.L802407A4: +/* 97BDD4 802407A4 A22000B5 */ sb $zero, 0xb5($s1) +.L802407A8: +/* 97BDD8 802407A8 8E22008C */ lw $v0, 0x8c($s1) +/* 97BDDC 802407AC 1040000F */ beqz $v0, .L802407EC +/* 97BDE0 802407B0 3C03FFAA */ lui $v1, 0xffaa +/* 97BDE4 802407B4 8E420028 */ lw $v0, 0x28($s2) +/* 97BDE8 802407B8 3463FFFC */ ori $v1, $v1, 0xfffc +/* 97BDEC 802407BC 00431821 */ addu $v1, $v0, $v1 +/* 97BDF0 802407C0 2C620015 */ sltiu $v0, $v1, 0x15 +/* 97BDF4 802407C4 10400009 */ beqz $v0, .L802407EC +/* 97BDF8 802407C8 00031080 */ sll $v0, $v1, 2 +/* 97BDFC 802407CC 3C018024 */ lui $at, 0x8024 +/* 97BE00 802407D0 00220821 */ addu $at, $at, $v0 +/* 97BE04 802407D4 8C222438 */ lw $v0, 0x2438($at) +/* 97BE08 802407D8 00400008 */ jr $v0 +/* 97BE0C 802407DC 00000000 */ nop +/* 97BE10 802407E0 8E420028 */ lw $v0, 0x28($s2) +/* 97BE14 802407E4 24420001 */ addiu $v0, $v0, 1 +/* 97BE18 802407E8 AE420028 */ sw $v0, 0x28($s2) +.L802407EC: +/* 97BE1C 802407EC 0000102D */ daddu $v0, $zero, $zero +.L802407F0: +/* 97BE20 802407F0 8FBF0068 */ lw $ra, 0x68($sp) +/* 97BE24 802407F4 8FB50064 */ lw $s5, 0x64($sp) +/* 97BE28 802407F8 8FB40060 */ lw $s4, 0x60($sp) +/* 97BE2C 802407FC 8FB3005C */ lw $s3, 0x5c($sp) +/* 97BE30 80240800 8FB20058 */ lw $s2, 0x58($sp) +/* 97BE34 80240804 8FB10054 */ lw $s1, 0x54($sp) +/* 97BE38 80240808 8FB00050 */ lw $s0, 0x50($sp) +/* 97BE3C 8024080C 03E00008 */ jr $ra +/* 97BE40 80240810 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_80240814.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_80240814.s deleted file mode 100644 index 88a5377cd1..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_80240814.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240814 -/* 97BE44 80240814 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97BE48 80240818 AFBF0010 */ sw $ra, 0x10($sp) -/* 97BE4C 8024081C 0C00EAD2 */ jal get_npc_safe -/* 97BE50 80240820 8C84014C */ lw $a0, 0x14c($a0) -/* 97BE54 80240824 0040182D */ daddu $v1, $v0, $zero -/* 97BE58 80240828 846200A8 */ lh $v0, 0xa8($v1) -/* 97BE5C 8024082C C462003C */ lwc1 $f2, 0x3c($v1) -/* 97BE60 80240830 906400A9 */ lbu $a0, 0xa9($v1) -/* 97BE64 80240834 44820000 */ mtc1 $v0, $f0 -/* 97BE68 80240838 00000000 */ nop -/* 97BE6C 8024083C 46800020 */ cvt.s.w $f0, $f0 -/* 97BE70 80240840 46001081 */ sub.s $f2, $f2, $f0 -/* 97BE74 80240844 A06400AB */ sb $a0, 0xab($v1) -/* 97BE78 80240848 E462003C */ swc1 $f2, 0x3c($v1) -/* 97BE7C 8024084C 8FBF0010 */ lw $ra, 0x10($sp) -/* 97BE80 80240850 24020002 */ addiu $v0, $zero, 2 -/* 97BE84 80240854 03E00008 */ jr $ra -/* 97BE88 80240858 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_04/97B670/func_80240814_97BE44.s b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_80240814_97BE44.s new file mode 100644 index 0000000000..5f469060ef --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_04/97B670/func_80240814_97BE44.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240814_97BE44 +/* 97BE44 80240814 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 97BE48 80240818 AFBF0010 */ sw $ra, 0x10($sp) +/* 97BE4C 8024081C 0C00EAD2 */ jal get_npc_safe +/* 97BE50 80240820 8C84014C */ lw $a0, 0x14c($a0) +/* 97BE54 80240824 0040182D */ daddu $v1, $v0, $zero +/* 97BE58 80240828 846200A8 */ lh $v0, 0xa8($v1) +/* 97BE5C 8024082C C462003C */ lwc1 $f2, 0x3c($v1) +/* 97BE60 80240830 906400A9 */ lbu $a0, 0xa9($v1) +/* 97BE64 80240834 44820000 */ mtc1 $v0, $f0 +/* 97BE68 80240838 00000000 */ nop +/* 97BE6C 8024083C 46800020 */ cvt.s.w $f0, $f0 +/* 97BE70 80240840 46001081 */ sub.s $f2, $f2, $f0 +/* 97BE74 80240844 A06400AB */ sb $a0, 0xab($v1) +/* 97BE78 80240848 E462003C */ swc1 $f2, 0x3c($v1) +/* 97BE7C 8024084C 8FBF0010 */ lw $ra, 0x10($sp) +/* 97BE80 80240850 24020002 */ addiu $v0, $zero, 2 +/* 97BE84 80240854 03E00008 */ jr $ra +/* 97BE88 80240858 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230.s deleted file mode 100644 index c981e3bca3..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230.s +++ /dev/null @@ -1,216 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240230 -/* 97DD00 80240230 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 97DD04 80240234 AFB3004C */ sw $s3, 0x4c($sp) -/* 97DD08 80240238 0080982D */ daddu $s3, $a0, $zero -/* 97DD0C 8024023C AFBF0054 */ sw $ra, 0x54($sp) -/* 97DD10 80240240 AFB40050 */ sw $s4, 0x50($sp) -/* 97DD14 80240244 AFB20048 */ sw $s2, 0x48($sp) -/* 97DD18 80240248 AFB10044 */ sw $s1, 0x44($sp) -/* 97DD1C 8024024C AFB00040 */ sw $s0, 0x40($sp) -/* 97DD20 80240250 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 97DD24 80240254 8E710148 */ lw $s1, 0x148($s3) -/* 97DD28 80240258 00A0A02D */ daddu $s4, $a1, $zero -/* 97DD2C 8024025C 86240008 */ lh $a0, 8($s1) -/* 97DD30 80240260 0C00EABB */ jal get_npc_unsafe -/* 97DD34 80240264 00C0902D */ daddu $s2, $a2, $zero -/* 97DD38 80240268 8E830014 */ lw $v1, 0x14($s4) -/* 97DD3C 8024026C 04600034 */ bltz $v1, .L80240340 -/* 97DD40 80240270 0040802D */ daddu $s0, $v0, $zero -/* 97DD44 80240274 8E620074 */ lw $v0, 0x74($s3) -/* 97DD48 80240278 1C400030 */ bgtz $v0, .L8024033C -/* 97DD4C 8024027C 2442FFFF */ addiu $v0, $v0, -1 -/* 97DD50 80240280 0240202D */ daddu $a0, $s2, $zero -/* 97DD54 80240284 AE630074 */ sw $v1, 0x74($s3) -/* 97DD58 80240288 AFA00010 */ sw $zero, 0x10($sp) -/* 97DD5C 8024028C 8E86000C */ lw $a2, 0xc($s4) -/* 97DD60 80240290 8E870010 */ lw $a3, 0x10($s4) -/* 97DD64 80240294 0C01242D */ jal func_800490B4 -/* 97DD68 80240298 0220282D */ daddu $a1, $s1, $zero -/* 97DD6C 8024029C 10400025 */ beqz $v0, .L80240334 -/* 97DD70 802402A0 0000202D */ daddu $a0, $zero, $zero -/* 97DD74 802402A4 0200282D */ daddu $a1, $s0, $zero -/* 97DD78 802402A8 0000302D */ daddu $a2, $zero, $zero -/* 97DD7C 802402AC 860300A8 */ lh $v1, 0xa8($s0) -/* 97DD80 802402B0 3C013F80 */ lui $at, 0x3f80 -/* 97DD84 802402B4 44810000 */ mtc1 $at, $f0 -/* 97DD88 802402B8 3C014000 */ lui $at, 0x4000 -/* 97DD8C 802402BC 44811000 */ mtc1 $at, $f2 -/* 97DD90 802402C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 97DD94 802402C4 44812000 */ mtc1 $at, $f4 -/* 97DD98 802402C8 2402000F */ addiu $v0, $zero, 0xf -/* 97DD9C 802402CC AFA2001C */ sw $v0, 0x1c($sp) -/* 97DDA0 802402D0 44835000 */ mtc1 $v1, $f10 -/* 97DDA4 802402D4 00000000 */ nop -/* 97DDA8 802402D8 468052A0 */ cvt.s.w $f10, $f10 -/* 97DDAC 802402DC 44075000 */ mfc1 $a3, $f10 -/* 97DDB0 802402E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 97DDB4 802402E4 AFA20020 */ sw $v0, 0x20($sp) -/* 97DDB8 802402E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 97DDBC 802402EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 97DDC0 802402F0 0C01BFA4 */ jal fx_emote -/* 97DDC4 802402F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 97DDC8 802402F8 0200202D */ daddu $a0, $s0, $zero -/* 97DDCC 802402FC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 97DDD0 80240300 0C012530 */ jal func_800494C0 -/* 97DDD4 80240304 3C060020 */ lui $a2, 0x20 -/* 97DDD8 80240308 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 97DDDC 8024030C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 97DDE0 80240310 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97DDE4 80240314 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 97DDE8 80240318 8C460028 */ lw $a2, 0x28($v0) -/* 97DDEC 8024031C 0C00A720 */ jal atan2 -/* 97DDF0 80240320 8C470030 */ lw $a3, 0x30($v0) -/* 97DDF4 80240324 2402000C */ addiu $v0, $zero, 0xc -/* 97DDF8 80240328 E600000C */ swc1 $f0, 0xc($s0) -/* 97DDFC 8024032C 08090151 */ j .L80240544 -/* 97DE00 80240330 AE620070 */ sw $v0, 0x70($s3) -.L80240334: -/* 97DE04 80240334 8E620074 */ lw $v0, 0x74($s3) -/* 97DE08 80240338 2442FFFF */ addiu $v0, $v0, -1 -.L8024033C: -/* 97DE0C 8024033C AE620074 */ sw $v0, 0x74($s3) -.L80240340: -/* 97DE10 80240340 C6000018 */ lwc1 $f0, 0x18($s0) -/* 97DE14 80240344 44801000 */ mtc1 $zero, $f2 -/* 97DE18 80240348 44801800 */ mtc1 $zero, $f3 -/* 97DE1C 8024034C 46000021 */ cvt.d.s $f0, $f0 -/* 97DE20 80240350 4620103C */ c.lt.d $f2, $f0 -/* 97DE24 80240354 00000000 */ nop -/* 97DE28 80240358 45000025 */ bc1f .L802403F0 -/* 97DE2C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c -/* 97DE30 80240360 C6000038 */ lwc1 $f0, 0x38($s0) -/* 97DE34 80240364 860200A6 */ lh $v0, 0xa6($s0) -/* 97DE38 80240368 3C018024 */ lui $at, 0x8024 -/* 97DE3C 8024036C D4222EB0 */ ldc1 $f2, 0x2eb0($at) -/* 97DE40 80240370 27A60030 */ addiu $a2, $sp, 0x30 -/* 97DE44 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) -/* 97DE48 80240378 44820000 */ mtc1 $v0, $f0 -/* 97DE4C 8024037C 00000000 */ nop -/* 97DE50 80240380 46800020 */ cvt.s.w $f0, $f0 -/* 97DE54 80240384 46000021 */ cvt.d.s $f0, $f0 -/* 97DE58 80240388 C604003C */ lwc1 $f4, 0x3c($s0) -/* 97DE5C 8024038C C6060040 */ lwc1 $f6, 0x40($s0) -/* 97DE60 80240390 C6080018 */ lwc1 $f8, 0x18($s0) -/* 97DE64 80240394 860200A8 */ lh $v0, 0xa8($s0) -/* 97DE68 80240398 46220002 */ mul.d $f0, $f0, $f2 -/* 97DE6C 8024039C 00000000 */ nop -/* 97DE70 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) -/* 97DE74 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) -/* 97DE78 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) -/* 97DE7C 802403AC C604000C */ lwc1 $f4, 0xc($s0) -/* 97DE80 802403B0 44821000 */ mtc1 $v0, $f2 -/* 97DE84 802403B4 00000000 */ nop -/* 97DE88 802403B8 468010A0 */ cvt.s.w $f2, $f2 -/* 97DE8C 802403BC E7A20018 */ swc1 $f2, 0x18($sp) -/* 97DE90 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) -/* 97DE94 802403C4 46200020 */ cvt.s.d $f0, $f0 -/* 97DE98 802403C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 97DE9C 802403CC 8E040080 */ lw $a0, 0x80($s0) -/* 97DEA0 802403D0 0C037711 */ jal func_800DDC44 -/* 97DEA4 802403D4 27A70034 */ addiu $a3, $sp, 0x34 -/* 97DEA8 802403D8 54400005 */ bnel $v0, $zero, .L802403F0 -/* 97DEAC 802403DC AE000018 */ sw $zero, 0x18($s0) -/* 97DEB0 802403E0 8E050018 */ lw $a1, 0x18($s0) -/* 97DEB4 802403E4 8E06000C */ lw $a2, 0xc($s0) -/* 97DEB8 802403E8 0C00EA95 */ jal npc_move_heading -/* 97DEBC 802403EC 0200202D */ daddu $a0, $s0, $zero -.L802403F0: -/* 97DEC0 802403F0 C600001C */ lwc1 $f0, 0x1c($s0) -/* 97DEC4 802403F4 44801000 */ mtc1 $zero, $f2 -/* 97DEC8 802403F8 44801800 */ mtc1 $zero, $f3 -/* 97DECC 802403FC 46000021 */ cvt.d.s $f0, $f0 -/* 97DED0 80240400 4622003C */ c.lt.d $f0, $f2 -/* 97DED4 80240404 00000000 */ nop -/* 97DED8 80240408 45000047 */ bc1f .L80240528 -/* 97DEDC 8024040C 27A5002C */ addiu $a1, $sp, 0x2c -/* 97DEE0 80240410 27A60030 */ addiu $a2, $sp, 0x30 -/* 97DEE4 80240414 27A20038 */ addiu $v0, $sp, 0x38 -/* 97DEE8 80240418 C602003C */ lwc1 $f2, 0x3c($s0) -/* 97DEEC 8024041C C6060038 */ lwc1 $f6, 0x38($s0) -/* 97DEF0 80240420 3C01402A */ lui $at, 0x402a -/* 97DEF4 80240424 4481A800 */ mtc1 $at, $f21 -/* 97DEF8 80240428 4480A000 */ mtc1 $zero, $f20 -/* 97DEFC 8024042C 460010A1 */ cvt.d.s $f2, $f2 -/* 97DF00 80240430 46341080 */ add.d $f2, $f2, $f20 -/* 97DF04 80240434 C600001C */ lwc1 $f0, 0x1c($s0) -/* 97DF08 80240438 C6040040 */ lwc1 $f4, 0x40($s0) -/* 97DF0C 8024043C 46000005 */ abs.s $f0, $f0 -/* 97DF10 80240440 E7A40034 */ swc1 $f4, 0x34($sp) -/* 97DF14 80240444 3C014030 */ lui $at, 0x4030 -/* 97DF18 80240448 44812800 */ mtc1 $at, $f5 -/* 97DF1C 8024044C 44802000 */ mtc1 $zero, $f4 -/* 97DF20 80240450 46000021 */ cvt.d.s $f0, $f0 -/* 97DF24 80240454 E7A6002C */ swc1 $f6, 0x2c($sp) -/* 97DF28 80240458 46240000 */ add.d $f0, $f0, $f4 -/* 97DF2C 8024045C 462010A0 */ cvt.s.d $f2, $f2 -/* 97DF30 80240460 E7A20030 */ swc1 $f2, 0x30($sp) -/* 97DF34 80240464 46200020 */ cvt.s.d $f0, $f0 -/* 97DF38 80240468 E7A00038 */ swc1 $f0, 0x38($sp) -/* 97DF3C 8024046C AFA20010 */ sw $v0, 0x10($sp) -/* 97DF40 80240470 8E040080 */ lw $a0, 0x80($s0) -/* 97DF44 80240474 0C0372DF */ jal func_800DCB7C -/* 97DF48 80240478 27A70034 */ addiu $a3, $sp, 0x34 -/* 97DF4C 8024047C 1040002A */ beqz $v0, .L80240528 -/* 97DF50 80240480 00000000 */ nop -/* 97DF54 80240484 C600001C */ lwc1 $f0, 0x1c($s0) -/* 97DF58 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) -/* 97DF5C 8024048C 46000005 */ abs.s $f0, $f0 -/* 97DF60 80240490 46000021 */ cvt.d.s $f0, $f0 -/* 97DF64 80240494 46340000 */ add.d $f0, $f0, $f20 -/* 97DF68 80240498 460010A1 */ cvt.d.s $f2, $f2 -/* 97DF6C 8024049C 4620103E */ c.le.d $f2, $f0 -/* 97DF70 802404A0 00000000 */ nop -/* 97DF74 802404A4 45000020 */ bc1f .L80240528 -/* 97DF78 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 97DF7C 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) -/* 97DF80 802404B0 8E020000 */ lw $v0, ($s0) -/* 97DF84 802404B4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 97DF88 802404B8 AE00001C */ sw $zero, 0x1c($s0) -/* 97DF8C 802404BC 00431024 */ and $v0, $v0, $v1 -/* 97DF90 802404C0 AE020000 */ sw $v0, ($s0) -/* 97DF94 802404C4 24020002 */ addiu $v0, $zero, 2 -/* 97DF98 802404C8 E600003C */ swc1 $f0, 0x3c($s0) -/* 97DF9C 802404CC 0C00A67F */ jal rand_int -/* 97DFA0 802404D0 AE620070 */ sw $v0, 0x70($s3) -/* 97DFA4 802404D4 3C035555 */ lui $v1, 0x5555 -/* 97DFA8 802404D8 34635556 */ ori $v1, $v1, 0x5556 -/* 97DFAC 802404DC 00430018 */ mult $v0, $v1 -/* 97DFB0 802404E0 000227C3 */ sra $a0, $v0, 0x1f -/* 97DFB4 802404E4 00004010 */ mfhi $t0 -/* 97DFB8 802404E8 01042023 */ subu $a0, $t0, $a0 -/* 97DFBC 802404EC 00041840 */ sll $v1, $a0, 1 -/* 97DFC0 802404F0 00641821 */ addu $v1, $v1, $a0 -/* 97DFC4 802404F4 00431023 */ subu $v0, $v0, $v1 -/* 97DFC8 802404F8 24430002 */ addiu $v1, $v0, 2 -/* 97DFCC 802404FC AE630074 */ sw $v1, 0x74($s3) -/* 97DFD0 80240500 8E82002C */ lw $v0, 0x2c($s4) -/* 97DFD4 80240504 5840000F */ blezl $v0, .L80240544 -/* 97DFD8 80240508 AE600070 */ sw $zero, 0x70($s3) -/* 97DFDC 8024050C 8E820004 */ lw $v0, 4($s4) -/* 97DFE0 80240510 5840000C */ blezl $v0, .L80240544 -/* 97DFE4 80240514 AE600070 */ sw $zero, 0x70($s3) -/* 97DFE8 80240518 1460000A */ bnez $v1, .L80240544 -/* 97DFEC 8024051C 00000000 */ nop -/* 97DFF0 80240520 08090151 */ j .L80240544 -/* 97DFF4 80240524 AE600070 */ sw $zero, 0x70($s3) -.L80240528: -/* 97DFF8 80240528 C604003C */ lwc1 $f4, 0x3c($s0) -/* 97DFFC 8024052C C600001C */ lwc1 $f0, 0x1c($s0) -/* 97E000 80240530 46002100 */ add.s $f4, $f4, $f0 -/* 97E004 80240534 C6020014 */ lwc1 $f2, 0x14($s0) -/* 97E008 80240538 46020001 */ sub.s $f0, $f0, $f2 -/* 97E00C 8024053C E604003C */ swc1 $f4, 0x3c($s0) -/* 97E010 80240540 E600001C */ swc1 $f0, 0x1c($s0) -.L80240544: -/* 97E014 80240544 8FBF0054 */ lw $ra, 0x54($sp) -/* 97E018 80240548 8FB40050 */ lw $s4, 0x50($sp) -/* 97E01C 8024054C 8FB3004C */ lw $s3, 0x4c($sp) -/* 97E020 80240550 8FB20048 */ lw $s2, 0x48($sp) -/* 97E024 80240554 8FB10044 */ lw $s1, 0x44($sp) -/* 97E028 80240558 8FB00040 */ lw $s0, 0x40($sp) -/* 97E02C 8024055C D7B40058 */ ldc1 $f20, 0x58($sp) -/* 97E030 80240560 03E00008 */ jr $ra -/* 97E034 80240564 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s new file mode 100644 index 0000000000..7887fc56d5 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240230_97DD00.s @@ -0,0 +1,216 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240230_97DD00 +/* 97DD00 80240230 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* 97DD04 80240234 AFB3004C */ sw $s3, 0x4c($sp) +/* 97DD08 80240238 0080982D */ daddu $s3, $a0, $zero +/* 97DD0C 8024023C AFBF0054 */ sw $ra, 0x54($sp) +/* 97DD10 80240240 AFB40050 */ sw $s4, 0x50($sp) +/* 97DD14 80240244 AFB20048 */ sw $s2, 0x48($sp) +/* 97DD18 80240248 AFB10044 */ sw $s1, 0x44($sp) +/* 97DD1C 8024024C AFB00040 */ sw $s0, 0x40($sp) +/* 97DD20 80240250 F7B40058 */ sdc1 $f20, 0x58($sp) +/* 97DD24 80240254 8E710148 */ lw $s1, 0x148($s3) +/* 97DD28 80240258 00A0A02D */ daddu $s4, $a1, $zero +/* 97DD2C 8024025C 86240008 */ lh $a0, 8($s1) +/* 97DD30 80240260 0C00EABB */ jal get_npc_unsafe +/* 97DD34 80240264 00C0902D */ daddu $s2, $a2, $zero +/* 97DD38 80240268 8E830014 */ lw $v1, 0x14($s4) +/* 97DD3C 8024026C 04600034 */ bltz $v1, .L80240340 +/* 97DD40 80240270 0040802D */ daddu $s0, $v0, $zero +/* 97DD44 80240274 8E620074 */ lw $v0, 0x74($s3) +/* 97DD48 80240278 1C400030 */ bgtz $v0, .L8024033C +/* 97DD4C 8024027C 2442FFFF */ addiu $v0, $v0, -1 +/* 97DD50 80240280 0240202D */ daddu $a0, $s2, $zero +/* 97DD54 80240284 AE630074 */ sw $v1, 0x74($s3) +/* 97DD58 80240288 AFA00010 */ sw $zero, 0x10($sp) +/* 97DD5C 8024028C 8E86000C */ lw $a2, 0xc($s4) +/* 97DD60 80240290 8E870010 */ lw $a3, 0x10($s4) +/* 97DD64 80240294 0C01242D */ jal func_800490B4 +/* 97DD68 80240298 0220282D */ daddu $a1, $s1, $zero +/* 97DD6C 8024029C 10400025 */ beqz $v0, .L80240334 +/* 97DD70 802402A0 0000202D */ daddu $a0, $zero, $zero +/* 97DD74 802402A4 0200282D */ daddu $a1, $s0, $zero +/* 97DD78 802402A8 0000302D */ daddu $a2, $zero, $zero +/* 97DD7C 802402AC 860300A8 */ lh $v1, 0xa8($s0) +/* 97DD80 802402B0 3C013F80 */ lui $at, 0x3f80 +/* 97DD84 802402B4 44810000 */ mtc1 $at, $f0 +/* 97DD88 802402B8 3C014000 */ lui $at, 0x4000 +/* 97DD8C 802402BC 44811000 */ mtc1 $at, $f2 +/* 97DD90 802402C0 3C01C1A0 */ lui $at, 0xc1a0 +/* 97DD94 802402C4 44812000 */ mtc1 $at, $f4 +/* 97DD98 802402C8 2402000F */ addiu $v0, $zero, 0xf +/* 97DD9C 802402CC AFA2001C */ sw $v0, 0x1c($sp) +/* 97DDA0 802402D0 44835000 */ mtc1 $v1, $f10 +/* 97DDA4 802402D4 00000000 */ nop +/* 97DDA8 802402D8 468052A0 */ cvt.s.w $f10, $f10 +/* 97DDAC 802402DC 44075000 */ mfc1 $a3, $f10 +/* 97DDB0 802402E0 27A20028 */ addiu $v0, $sp, 0x28 +/* 97DDB4 802402E4 AFA20020 */ sw $v0, 0x20($sp) +/* 97DDB8 802402E8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 97DDBC 802402EC E7A20014 */ swc1 $f2, 0x14($sp) +/* 97DDC0 802402F0 0C01BFA4 */ jal fx_emote +/* 97DDC4 802402F4 E7A40018 */ swc1 $f4, 0x18($sp) +/* 97DDC8 802402F8 0200202D */ daddu $a0, $s0, $zero +/* 97DDCC 802402FC 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 97DDD0 80240300 0C012530 */ jal func_800494C0 +/* 97DDD4 80240304 3C060020 */ lui $a2, 0x20 +/* 97DDD8 80240308 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 97DDDC 8024030C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 97DDE0 80240310 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 97DDE4 80240314 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 97DDE8 80240318 8C460028 */ lw $a2, 0x28($v0) +/* 97DDEC 8024031C 0C00A720 */ jal atan2 +/* 97DDF0 80240320 8C470030 */ lw $a3, 0x30($v0) +/* 97DDF4 80240324 2402000C */ addiu $v0, $zero, 0xc +/* 97DDF8 80240328 E600000C */ swc1 $f0, 0xc($s0) +/* 97DDFC 8024032C 08090151 */ j .L80240544 +/* 97DE00 80240330 AE620070 */ sw $v0, 0x70($s3) +.L80240334: +/* 97DE04 80240334 8E620074 */ lw $v0, 0x74($s3) +/* 97DE08 80240338 2442FFFF */ addiu $v0, $v0, -1 +.L8024033C: +/* 97DE0C 8024033C AE620074 */ sw $v0, 0x74($s3) +.L80240340: +/* 97DE10 80240340 C6000018 */ lwc1 $f0, 0x18($s0) +/* 97DE14 80240344 44801000 */ mtc1 $zero, $f2 +/* 97DE18 80240348 44801800 */ mtc1 $zero, $f3 +/* 97DE1C 8024034C 46000021 */ cvt.d.s $f0, $f0 +/* 97DE20 80240350 4620103C */ c.lt.d $f2, $f0 +/* 97DE24 80240354 00000000 */ nop +/* 97DE28 80240358 45000025 */ bc1f .L802403F0 +/* 97DE2C 8024035C 27A5002C */ addiu $a1, $sp, 0x2c +/* 97DE30 80240360 C6000038 */ lwc1 $f0, 0x38($s0) +/* 97DE34 80240364 860200A6 */ lh $v0, 0xa6($s0) +/* 97DE38 80240368 3C018024 */ lui $at, 0x8024 +/* 97DE3C 8024036C D4222EB0 */ ldc1 $f2, 0x2eb0($at) +/* 97DE40 80240370 27A60030 */ addiu $a2, $sp, 0x30 +/* 97DE44 80240374 E7A0002C */ swc1 $f0, 0x2c($sp) +/* 97DE48 80240378 44820000 */ mtc1 $v0, $f0 +/* 97DE4C 8024037C 00000000 */ nop +/* 97DE50 80240380 46800020 */ cvt.s.w $f0, $f0 +/* 97DE54 80240384 46000021 */ cvt.d.s $f0, $f0 +/* 97DE58 80240388 C604003C */ lwc1 $f4, 0x3c($s0) +/* 97DE5C 8024038C C6060040 */ lwc1 $f6, 0x40($s0) +/* 97DE60 80240390 C6080018 */ lwc1 $f8, 0x18($s0) +/* 97DE64 80240394 860200A8 */ lh $v0, 0xa8($s0) +/* 97DE68 80240398 46220002 */ mul.d $f0, $f0, $f2 +/* 97DE6C 8024039C 00000000 */ nop +/* 97DE70 802403A0 E7A40030 */ swc1 $f4, 0x30($sp) +/* 97DE74 802403A4 E7A60034 */ swc1 $f6, 0x34($sp) +/* 97DE78 802403A8 E7A80010 */ swc1 $f8, 0x10($sp) +/* 97DE7C 802403AC C604000C */ lwc1 $f4, 0xc($s0) +/* 97DE80 802403B0 44821000 */ mtc1 $v0, $f2 +/* 97DE84 802403B4 00000000 */ nop +/* 97DE88 802403B8 468010A0 */ cvt.s.w $f2, $f2 +/* 97DE8C 802403BC E7A20018 */ swc1 $f2, 0x18($sp) +/* 97DE90 802403C0 E7A40014 */ swc1 $f4, 0x14($sp) +/* 97DE94 802403C4 46200020 */ cvt.s.d $f0, $f0 +/* 97DE98 802403C8 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 97DE9C 802403CC 8E040080 */ lw $a0, 0x80($s0) +/* 97DEA0 802403D0 0C037711 */ jal func_800DDC44 +/* 97DEA4 802403D4 27A70034 */ addiu $a3, $sp, 0x34 +/* 97DEA8 802403D8 54400005 */ bnel $v0, $zero, .L802403F0 +/* 97DEAC 802403DC AE000018 */ sw $zero, 0x18($s0) +/* 97DEB0 802403E0 8E050018 */ lw $a1, 0x18($s0) +/* 97DEB4 802403E4 8E06000C */ lw $a2, 0xc($s0) +/* 97DEB8 802403E8 0C00EA95 */ jal npc_move_heading +/* 97DEBC 802403EC 0200202D */ daddu $a0, $s0, $zero +.L802403F0: +/* 97DEC0 802403F0 C600001C */ lwc1 $f0, 0x1c($s0) +/* 97DEC4 802403F4 44801000 */ mtc1 $zero, $f2 +/* 97DEC8 802403F8 44801800 */ mtc1 $zero, $f3 +/* 97DECC 802403FC 46000021 */ cvt.d.s $f0, $f0 +/* 97DED0 80240400 4622003C */ c.lt.d $f0, $f2 +/* 97DED4 80240404 00000000 */ nop +/* 97DED8 80240408 45000047 */ bc1f .L80240528 +/* 97DEDC 8024040C 27A5002C */ addiu $a1, $sp, 0x2c +/* 97DEE0 80240410 27A60030 */ addiu $a2, $sp, 0x30 +/* 97DEE4 80240414 27A20038 */ addiu $v0, $sp, 0x38 +/* 97DEE8 80240418 C602003C */ lwc1 $f2, 0x3c($s0) +/* 97DEEC 8024041C C6060038 */ lwc1 $f6, 0x38($s0) +/* 97DEF0 80240420 3C01402A */ lui $at, 0x402a +/* 97DEF4 80240424 4481A800 */ mtc1 $at, $f21 +/* 97DEF8 80240428 4480A000 */ mtc1 $zero, $f20 +/* 97DEFC 8024042C 460010A1 */ cvt.d.s $f2, $f2 +/* 97DF00 80240430 46341080 */ add.d $f2, $f2, $f20 +/* 97DF04 80240434 C600001C */ lwc1 $f0, 0x1c($s0) +/* 97DF08 80240438 C6040040 */ lwc1 $f4, 0x40($s0) +/* 97DF0C 8024043C 46000005 */ abs.s $f0, $f0 +/* 97DF10 80240440 E7A40034 */ swc1 $f4, 0x34($sp) +/* 97DF14 80240444 3C014030 */ lui $at, 0x4030 +/* 97DF18 80240448 44812800 */ mtc1 $at, $f5 +/* 97DF1C 8024044C 44802000 */ mtc1 $zero, $f4 +/* 97DF20 80240450 46000021 */ cvt.d.s $f0, $f0 +/* 97DF24 80240454 E7A6002C */ swc1 $f6, 0x2c($sp) +/* 97DF28 80240458 46240000 */ add.d $f0, $f0, $f4 +/* 97DF2C 8024045C 462010A0 */ cvt.s.d $f2, $f2 +/* 97DF30 80240460 E7A20030 */ swc1 $f2, 0x30($sp) +/* 97DF34 80240464 46200020 */ cvt.s.d $f0, $f0 +/* 97DF38 80240468 E7A00038 */ swc1 $f0, 0x38($sp) +/* 97DF3C 8024046C AFA20010 */ sw $v0, 0x10($sp) +/* 97DF40 80240470 8E040080 */ lw $a0, 0x80($s0) +/* 97DF44 80240474 0C0372DF */ jal func_800DCB7C +/* 97DF48 80240478 27A70034 */ addiu $a3, $sp, 0x34 +/* 97DF4C 8024047C 1040002A */ beqz $v0, .L80240528 +/* 97DF50 80240480 00000000 */ nop +/* 97DF54 80240484 C600001C */ lwc1 $f0, 0x1c($s0) +/* 97DF58 80240488 C7A20038 */ lwc1 $f2, 0x38($sp) +/* 97DF5C 8024048C 46000005 */ abs.s $f0, $f0 +/* 97DF60 80240490 46000021 */ cvt.d.s $f0, $f0 +/* 97DF64 80240494 46340000 */ add.d $f0, $f0, $f20 +/* 97DF68 80240498 460010A1 */ cvt.d.s $f2, $f2 +/* 97DF6C 8024049C 4620103E */ c.le.d $f2, $f0 +/* 97DF70 802404A0 00000000 */ nop +/* 97DF74 802404A4 45000020 */ bc1f .L80240528 +/* 97DF78 802404A8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 97DF7C 802404AC C7A00030 */ lwc1 $f0, 0x30($sp) +/* 97DF80 802404B0 8E020000 */ lw $v0, ($s0) +/* 97DF84 802404B4 2403F7FF */ addiu $v1, $zero, -0x801 +/* 97DF88 802404B8 AE00001C */ sw $zero, 0x1c($s0) +/* 97DF8C 802404BC 00431024 */ and $v0, $v0, $v1 +/* 97DF90 802404C0 AE020000 */ sw $v0, ($s0) +/* 97DF94 802404C4 24020002 */ addiu $v0, $zero, 2 +/* 97DF98 802404C8 E600003C */ swc1 $f0, 0x3c($s0) +/* 97DF9C 802404CC 0C00A67F */ jal rand_int +/* 97DFA0 802404D0 AE620070 */ sw $v0, 0x70($s3) +/* 97DFA4 802404D4 3C035555 */ lui $v1, 0x5555 +/* 97DFA8 802404D8 34635556 */ ori $v1, $v1, 0x5556 +/* 97DFAC 802404DC 00430018 */ mult $v0, $v1 +/* 97DFB0 802404E0 000227C3 */ sra $a0, $v0, 0x1f +/* 97DFB4 802404E4 00004010 */ mfhi $t0 +/* 97DFB8 802404E8 01042023 */ subu $a0, $t0, $a0 +/* 97DFBC 802404EC 00041840 */ sll $v1, $a0, 1 +/* 97DFC0 802404F0 00641821 */ addu $v1, $v1, $a0 +/* 97DFC4 802404F4 00431023 */ subu $v0, $v0, $v1 +/* 97DFC8 802404F8 24430002 */ addiu $v1, $v0, 2 +/* 97DFCC 802404FC AE630074 */ sw $v1, 0x74($s3) +/* 97DFD0 80240500 8E82002C */ lw $v0, 0x2c($s4) +/* 97DFD4 80240504 5840000F */ blezl $v0, .L80240544 +/* 97DFD8 80240508 AE600070 */ sw $zero, 0x70($s3) +/* 97DFDC 8024050C 8E820004 */ lw $v0, 4($s4) +/* 97DFE0 80240510 5840000C */ blezl $v0, .L80240544 +/* 97DFE4 80240514 AE600070 */ sw $zero, 0x70($s3) +/* 97DFE8 80240518 1460000A */ bnez $v1, .L80240544 +/* 97DFEC 8024051C 00000000 */ nop +/* 97DFF0 80240520 08090151 */ j .L80240544 +/* 97DFF4 80240524 AE600070 */ sw $zero, 0x70($s3) +.L80240528: +/* 97DFF8 80240528 C604003C */ lwc1 $f4, 0x3c($s0) +/* 97DFFC 8024052C C600001C */ lwc1 $f0, 0x1c($s0) +/* 97E000 80240530 46002100 */ add.s $f4, $f4, $f0 +/* 97E004 80240534 C6020014 */ lwc1 $f2, 0x14($s0) +/* 97E008 80240538 46020001 */ sub.s $f0, $f0, $f2 +/* 97E00C 8024053C E604003C */ swc1 $f4, 0x3c($s0) +/* 97E010 80240540 E600001C */ swc1 $f0, 0x1c($s0) +.L80240544: +/* 97E014 80240544 8FBF0054 */ lw $ra, 0x54($sp) +/* 97E018 80240548 8FB40050 */ lw $s4, 0x50($sp) +/* 97E01C 8024054C 8FB3004C */ lw $s3, 0x4c($sp) +/* 97E020 80240550 8FB20048 */ lw $s2, 0x48($sp) +/* 97E024 80240554 8FB10044 */ lw $s1, 0x44($sp) +/* 97E028 80240558 8FB00040 */ lw $s0, 0x40($sp) +/* 97E02C 8024055C D7B40058 */ ldc1 $f20, 0x58($sp) +/* 97E030 80240560 03E00008 */ jr $ra +/* 97E034 80240564 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568.s deleted file mode 100644 index d19ca61a83..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240568 -/* 97E038 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 97E03C 8024056C AFB3001C */ sw $s3, 0x1c($sp) -/* 97E040 80240570 0080982D */ daddu $s3, $a0, $zero -/* 97E044 80240574 AFBF0020 */ sw $ra, 0x20($sp) -/* 97E048 80240578 AFB20018 */ sw $s2, 0x18($sp) -/* 97E04C 8024057C AFB10014 */ sw $s1, 0x14($sp) -/* 97E050 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* 97E054 80240584 8E720148 */ lw $s2, 0x148($s3) -/* 97E058 80240588 86440008 */ lh $a0, 8($s2) -/* 97E05C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 97E060 80240590 00A0882D */ daddu $s1, $a1, $zero -/* 97E064 80240594 8E240008 */ lw $a0, 8($s1) -/* 97E068 80240598 0040802D */ daddu $s0, $v0, $zero -/* 97E06C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f -/* 97E070 802405A0 00832021 */ addu $a0, $a0, $v1 -/* 97E074 802405A4 00042043 */ sra $a0, $a0, 1 -/* 97E078 802405A8 0C00A67F */ jal rand_int -/* 97E07C 802405AC 24840001 */ addiu $a0, $a0, 1 -/* 97E080 802405B0 8E230008 */ lw $v1, 8($s1) -/* 97E084 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 -/* 97E088 802405B8 00032FC2 */ srl $a1, $v1, 0x1f -/* 97E08C 802405BC 00651821 */ addu $v1, $v1, $a1 -/* 97E090 802405C0 00031843 */ sra $v1, $v1, 1 -/* 97E094 802405C4 00621821 */ addu $v1, $v1, $v0 -/* 97E098 802405C8 0C00A67F */ jal rand_int -/* 97E09C 802405CC A603008E */ sh $v1, 0x8e($s0) -/* 97E0A0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) -/* 97E0A4 802405D4 44820000 */ mtc1 $v0, $f0 -/* 97E0A8 802405D8 00000000 */ nop -/* 97E0AC 802405DC 46800020 */ cvt.s.w $f0, $f0 -/* 97E0B0 802405E0 46006300 */ add.s $f12, $f12, $f0 -/* 97E0B4 802405E4 3C0142B4 */ lui $at, 0x42b4 -/* 97E0B8 802405E8 44810000 */ mtc1 $at, $f0 -/* 97E0BC 802405EC 0C00A6C9 */ jal clamp_angle -/* 97E0C0 802405F0 46006301 */ sub.s $f12, $f12, $f0 -/* 97E0C4 802405F4 E600000C */ swc1 $f0, 0xc($s0) -/* 97E0C8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 97E0CC 802405FC 8C420000 */ lw $v0, ($v0) -/* 97E0D0 80240600 AE020028 */ sw $v0, 0x28($s0) -/* 97E0D4 80240604 24020003 */ addiu $v0, $zero, 3 -/* 97E0D8 80240608 AE620070 */ sw $v0, 0x70($s3) -/* 97E0DC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) -/* 97E0E0 80240610 8FB3001C */ lw $s3, 0x1c($sp) -/* 97E0E4 80240614 8FB20018 */ lw $s2, 0x18($sp) -/* 97E0E8 80240618 8FB10014 */ lw $s1, 0x14($sp) -/* 97E0EC 8024061C 8FB00010 */ lw $s0, 0x10($sp) -/* 97E0F0 80240620 03E00008 */ jr $ra -/* 97E0F4 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s new file mode 100644 index 0000000000..8c75c05b17 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240568_97E038.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240568_97E038 +/* 97E038 80240568 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 97E03C 8024056C AFB3001C */ sw $s3, 0x1c($sp) +/* 97E040 80240570 0080982D */ daddu $s3, $a0, $zero +/* 97E044 80240574 AFBF0020 */ sw $ra, 0x20($sp) +/* 97E048 80240578 AFB20018 */ sw $s2, 0x18($sp) +/* 97E04C 8024057C AFB10014 */ sw $s1, 0x14($sp) +/* 97E050 80240580 AFB00010 */ sw $s0, 0x10($sp) +/* 97E054 80240584 8E720148 */ lw $s2, 0x148($s3) +/* 97E058 80240588 86440008 */ lh $a0, 8($s2) +/* 97E05C 8024058C 0C00EABB */ jal get_npc_unsafe +/* 97E060 80240590 00A0882D */ daddu $s1, $a1, $zero +/* 97E064 80240594 8E240008 */ lw $a0, 8($s1) +/* 97E068 80240598 0040802D */ daddu $s0, $v0, $zero +/* 97E06C 8024059C 00041FC2 */ srl $v1, $a0, 0x1f +/* 97E070 802405A0 00832021 */ addu $a0, $a0, $v1 +/* 97E074 802405A4 00042043 */ sra $a0, $a0, 1 +/* 97E078 802405A8 0C00A67F */ jal rand_int +/* 97E07C 802405AC 24840001 */ addiu $a0, $a0, 1 +/* 97E080 802405B0 8E230008 */ lw $v1, 8($s1) +/* 97E084 802405B4 240400B4 */ addiu $a0, $zero, 0xb4 +/* 97E088 802405B8 00032FC2 */ srl $a1, $v1, 0x1f +/* 97E08C 802405BC 00651821 */ addu $v1, $v1, $a1 +/* 97E090 802405C0 00031843 */ sra $v1, $v1, 1 +/* 97E094 802405C4 00621821 */ addu $v1, $v1, $v0 +/* 97E098 802405C8 0C00A67F */ jal rand_int +/* 97E09C 802405CC A603008E */ sh $v1, 0x8e($s0) +/* 97E0A0 802405D0 C60C000C */ lwc1 $f12, 0xc($s0) +/* 97E0A4 802405D4 44820000 */ mtc1 $v0, $f0 +/* 97E0A8 802405D8 00000000 */ nop +/* 97E0AC 802405DC 46800020 */ cvt.s.w $f0, $f0 +/* 97E0B0 802405E0 46006300 */ add.s $f12, $f12, $f0 +/* 97E0B4 802405E4 3C0142B4 */ lui $at, 0x42b4 +/* 97E0B8 802405E8 44810000 */ mtc1 $at, $f0 +/* 97E0BC 802405EC 0C00A6C9 */ jal clamp_angle +/* 97E0C0 802405F0 46006301 */ sub.s $f12, $f12, $f0 +/* 97E0C4 802405F4 E600000C */ swc1 $f0, 0xc($s0) +/* 97E0C8 802405F8 8E4200CC */ lw $v0, 0xcc($s2) +/* 97E0CC 802405FC 8C420000 */ lw $v0, ($v0) +/* 97E0D0 80240600 AE020028 */ sw $v0, 0x28($s0) +/* 97E0D4 80240604 24020003 */ addiu $v0, $zero, 3 +/* 97E0D8 80240608 AE620070 */ sw $v0, 0x70($s3) +/* 97E0DC 8024060C 8FBF0020 */ lw $ra, 0x20($sp) +/* 97E0E0 80240610 8FB3001C */ lw $s3, 0x1c($sp) +/* 97E0E4 80240614 8FB20018 */ lw $s2, 0x18($sp) +/* 97E0E8 80240618 8FB10014 */ lw $s1, 0x14($sp) +/* 97E0EC 8024061C 8FB00010 */ lw $s0, 0x10($sp) +/* 97E0F0 80240620 03E00008 */ jr $ra +/* 97E0F4 80240624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC.s deleted file mode 100644 index 5fffba319e..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407CC -/* 97E29C 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97E2A0 802407D0 AFB10014 */ sw $s1, 0x14($sp) -/* 97E2A4 802407D4 0080882D */ daddu $s1, $a0, $zero -/* 97E2A8 802407D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 97E2AC 802407DC AFB20018 */ sw $s2, 0x18($sp) -/* 97E2B0 802407E0 AFB00010 */ sw $s0, 0x10($sp) -/* 97E2B4 802407E4 8E220148 */ lw $v0, 0x148($s1) -/* 97E2B8 802407E8 00A0902D */ daddu $s2, $a1, $zero -/* 97E2BC 802407EC 84440008 */ lh $a0, 8($v0) -/* 97E2C0 802407F0 0C00EABB */ jal get_npc_unsafe -/* 97E2C4 802407F4 00C0802D */ daddu $s0, $a2, $zero -/* 97E2C8 802407F8 0220202D */ daddu $a0, $s1, $zero -/* 97E2CC 802407FC 0240282D */ daddu $a1, $s2, $zero -/* 97E2D0 80240800 0200302D */ daddu $a2, $s0, $zero -/* 97E2D4 80240804 0C0127DF */ jal func_80049F7C -/* 97E2D8 80240808 0040802D */ daddu $s0, $v0, $zero -/* 97E2DC 8024080C 8E020000 */ lw $v0, ($s0) -/* 97E2E0 80240810 24040005 */ addiu $a0, $zero, 5 -/* 97E2E4 80240814 34420800 */ ori $v0, $v0, 0x800 -/* 97E2E8 80240818 0C00A67F */ jal rand_int -/* 97E2EC 8024081C AE020000 */ sw $v0, ($s0) -/* 97E2F0 80240820 44820000 */ mtc1 $v0, $f0 -/* 97E2F4 80240824 00000000 */ nop -/* 97E2F8 80240828 46800021 */ cvt.d.w $f0, $f0 -/* 97E2FC 8024082C 3C014024 */ lui $at, 0x4024 -/* 97E300 80240830 44811800 */ mtc1 $at, $f3 -/* 97E304 80240834 44801000 */ mtc1 $zero, $f2 -/* 97E308 80240838 3C013FC0 */ lui $at, 0x3fc0 -/* 97E30C 8024083C 44812000 */ mtc1 $at, $f4 -/* 97E310 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 97E314 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 97E318 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97E31C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 97E320 80240850 46220000 */ add.d $f0, $f0, $f2 -/* 97E324 80240854 E6040014 */ swc1 $f4, 0x14($s0) -/* 97E328 80240858 46200020 */ cvt.s.d $f0, $f0 -/* 97E32C 8024085C E600001C */ swc1 $f0, 0x1c($s0) -/* 97E330 80240860 8C460028 */ lw $a2, 0x28($v0) -/* 97E334 80240864 0C00A720 */ jal atan2 -/* 97E338 80240868 8C470030 */ lw $a3, 0x30($v0) -/* 97E33C 8024086C 0200202D */ daddu $a0, $s0, $zero -/* 97E340 80240870 3C05B000 */ lui $a1, 0xb000 -/* 97E344 80240874 34A50017 */ ori $a1, $a1, 0x17 -/* 97E348 80240878 0000302D */ daddu $a2, $zero, $zero -/* 97E34C 8024087C E480000C */ swc1 $f0, 0xc($a0) -/* 97E350 80240880 C6400018 */ lwc1 $f0, 0x18($s2) -/* 97E354 80240884 2402000D */ addiu $v0, $zero, 0xd -/* 97E358 80240888 E4800018 */ swc1 $f0, 0x18($a0) -/* 97E35C 8024088C 0C012530 */ jal func_800494C0 -/* 97E360 80240890 AE220070 */ sw $v0, 0x70($s1) -/* 97E364 80240894 8FBF001C */ lw $ra, 0x1c($sp) -/* 97E368 80240898 8FB20018 */ lw $s2, 0x18($sp) -/* 97E36C 8024089C 8FB10014 */ lw $s1, 0x14($sp) -/* 97E370 802408A0 8FB00010 */ lw $s0, 0x10($sp) -/* 97E374 802408A4 03E00008 */ jr $ra -/* 97E378 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s new file mode 100644 index 0000000000..f301708b4f --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802407CC_97E29C.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407CC_97E29C +/* 97E29C 802407CC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 97E2A0 802407D0 AFB10014 */ sw $s1, 0x14($sp) +/* 97E2A4 802407D4 0080882D */ daddu $s1, $a0, $zero +/* 97E2A8 802407D8 AFBF001C */ sw $ra, 0x1c($sp) +/* 97E2AC 802407DC AFB20018 */ sw $s2, 0x18($sp) +/* 97E2B0 802407E0 AFB00010 */ sw $s0, 0x10($sp) +/* 97E2B4 802407E4 8E220148 */ lw $v0, 0x148($s1) +/* 97E2B8 802407E8 00A0902D */ daddu $s2, $a1, $zero +/* 97E2BC 802407EC 84440008 */ lh $a0, 8($v0) +/* 97E2C0 802407F0 0C00EABB */ jal get_npc_unsafe +/* 97E2C4 802407F4 00C0802D */ daddu $s0, $a2, $zero +/* 97E2C8 802407F8 0220202D */ daddu $a0, $s1, $zero +/* 97E2CC 802407FC 0240282D */ daddu $a1, $s2, $zero +/* 97E2D0 80240800 0200302D */ daddu $a2, $s0, $zero +/* 97E2D4 80240804 0C0127DF */ jal func_80049F7C +/* 97E2D8 80240808 0040802D */ daddu $s0, $v0, $zero +/* 97E2DC 8024080C 8E020000 */ lw $v0, ($s0) +/* 97E2E0 80240810 24040005 */ addiu $a0, $zero, 5 +/* 97E2E4 80240814 34420800 */ ori $v0, $v0, 0x800 +/* 97E2E8 80240818 0C00A67F */ jal rand_int +/* 97E2EC 8024081C AE020000 */ sw $v0, ($s0) +/* 97E2F0 80240820 44820000 */ mtc1 $v0, $f0 +/* 97E2F4 80240824 00000000 */ nop +/* 97E2F8 80240828 46800021 */ cvt.d.w $f0, $f0 +/* 97E2FC 8024082C 3C014024 */ lui $at, 0x4024 +/* 97E300 80240830 44811800 */ mtc1 $at, $f3 +/* 97E304 80240834 44801000 */ mtc1 $zero, $f2 +/* 97E308 80240838 3C013FC0 */ lui $at, 0x3fc0 +/* 97E30C 8024083C 44812000 */ mtc1 $at, $f4 +/* 97E310 80240840 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 97E314 80240844 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 97E318 80240848 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 97E31C 8024084C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 97E320 80240850 46220000 */ add.d $f0, $f0, $f2 +/* 97E324 80240854 E6040014 */ swc1 $f4, 0x14($s0) +/* 97E328 80240858 46200020 */ cvt.s.d $f0, $f0 +/* 97E32C 8024085C E600001C */ swc1 $f0, 0x1c($s0) +/* 97E330 80240860 8C460028 */ lw $a2, 0x28($v0) +/* 97E334 80240864 0C00A720 */ jal atan2 +/* 97E338 80240868 8C470030 */ lw $a3, 0x30($v0) +/* 97E33C 8024086C 0200202D */ daddu $a0, $s0, $zero +/* 97E340 80240870 3C05B000 */ lui $a1, 0xb000 +/* 97E344 80240874 34A50017 */ ori $a1, $a1, 0x17 +/* 97E348 80240878 0000302D */ daddu $a2, $zero, $zero +/* 97E34C 8024087C E480000C */ swc1 $f0, 0xc($a0) +/* 97E350 80240880 C6400018 */ lwc1 $f0, 0x18($s2) +/* 97E354 80240884 2402000D */ addiu $v0, $zero, 0xd +/* 97E358 80240888 E4800018 */ swc1 $f0, 0x18($a0) +/* 97E35C 8024088C 0C012530 */ jal func_800494C0 +/* 97E360 80240890 AE220070 */ sw $v0, 0x70($s1) +/* 97E364 80240894 8FBF001C */ lw $ra, 0x1c($sp) +/* 97E368 80240898 8FB20018 */ lw $s2, 0x18($sp) +/* 97E36C 8024089C 8FB10014 */ lw $s1, 0x14($sp) +/* 97E370 802408A0 8FB00010 */ lw $s0, 0x10($sp) +/* 97E374 802408A4 03E00008 */ jr $ra +/* 97E378 802408A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC.s deleted file mode 100644 index be28ceec93..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408AC -/* 97E37C 802408AC 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 97E380 802408B0 AFB40050 */ sw $s4, 0x50($sp) -/* 97E384 802408B4 0080A02D */ daddu $s4, $a0, $zero -/* 97E388 802408B8 AFBF0060 */ sw $ra, 0x60($sp) -/* 97E38C 802408BC AFB7005C */ sw $s7, 0x5c($sp) -/* 97E390 802408C0 AFB60058 */ sw $s6, 0x58($sp) -/* 97E394 802408C4 AFB50054 */ sw $s5, 0x54($sp) -/* 97E398 802408C8 AFB3004C */ sw $s3, 0x4c($sp) -/* 97E39C 802408CC AFB20048 */ sw $s2, 0x48($sp) -/* 97E3A0 802408D0 AFB10044 */ sw $s1, 0x44($sp) -/* 97E3A4 802408D4 AFB00040 */ sw $s0, 0x40($sp) -/* 97E3A8 802408D8 F7B40068 */ sdc1 $f20, 0x68($sp) -/* 97E3AC 802408DC 8E950148 */ lw $s5, 0x148($s4) -/* 97E3B0 802408E0 00A0B02D */ daddu $s6, $a1, $zero -/* 97E3B4 802408E4 86A40008 */ lh $a0, 8($s5) -/* 97E3B8 802408E8 0C00EABB */ jal get_npc_unsafe -/* 97E3BC 802408EC 00C0B82D */ daddu $s7, $a2, $zero -/* 97E3C0 802408F0 0040982D */ daddu $s3, $v0, $zero -/* 97E3C4 802408F4 C6600018 */ lwc1 $f0, 0x18($s3) -/* 97E3C8 802408F8 44801000 */ mtc1 $zero, $f2 -/* 97E3CC 802408FC 44801800 */ mtc1 $zero, $f3 -/* 97E3D0 80240900 46000021 */ cvt.d.s $f0, $f0 -/* 97E3D4 80240904 4620103C */ c.lt.d $f2, $f0 -/* 97E3D8 80240908 00000000 */ nop -/* 97E3DC 8024090C 45000021 */ bc1f .L80240994 -/* 97E3E0 80240910 27A50028 */ addiu $a1, $sp, 0x28 -/* 97E3E4 80240914 C6600038 */ lwc1 $f0, 0x38($s3) -/* 97E3E8 80240918 C662003C */ lwc1 $f2, 0x3c($s3) -/* 97E3EC 8024091C C6640040 */ lwc1 $f4, 0x40($s3) -/* 97E3F0 80240920 C6660018 */ lwc1 $f6, 0x18($s3) -/* 97E3F4 80240924 E7A00028 */ swc1 $f0, 0x28($sp) -/* 97E3F8 80240928 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 97E3FC 8024092C E7A40030 */ swc1 $f4, 0x30($sp) -/* 97E400 80240930 E7A60010 */ swc1 $f6, 0x10($sp) -/* 97E404 80240934 C660000C */ lwc1 $f0, 0xc($s3) -/* 97E408 80240938 E7A00014 */ swc1 $f0, 0x14($sp) -/* 97E40C 8024093C 866200A8 */ lh $v0, 0xa8($s3) -/* 97E410 80240940 44820000 */ mtc1 $v0, $f0 -/* 97E414 80240944 00000000 */ nop -/* 97E418 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 97E41C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) -/* 97E420 80240950 866200A6 */ lh $v0, 0xa6($s3) -/* 97E424 80240954 27A6002C */ addiu $a2, $sp, 0x2c -/* 97E428 80240958 44820000 */ mtc1 $v0, $f0 -/* 97E42C 8024095C 00000000 */ nop -/* 97E430 80240960 46800020 */ cvt.s.w $f0, $f0 -/* 97E434 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 97E438 80240968 8E640080 */ lw $a0, 0x80($s3) -/* 97E43C 8024096C 0C037711 */ jal func_800DDC44 -/* 97E440 80240970 27A70030 */ addiu $a3, $sp, 0x30 -/* 97E444 80240974 10400003 */ beqz $v0, .L80240984 -/* 97E448 80240978 00000000 */ nop -/* 97E44C 8024097C 08090265 */ j .L80240994 -/* 97E450 80240980 AE600018 */ sw $zero, 0x18($s3) -.L80240984: -/* 97E454 80240984 8E650018 */ lw $a1, 0x18($s3) -/* 97E458 80240988 8E66000C */ lw $a2, 0xc($s3) -/* 97E45C 8024098C 0C00EA95 */ jal npc_move_heading -/* 97E460 80240990 0260202D */ daddu $a0, $s3, $zero -.L80240994: -/* 97E464 80240994 C660001C */ lwc1 $f0, 0x1c($s3) -/* 97E468 80240998 44801000 */ mtc1 $zero, $f2 -/* 97E46C 8024099C 44801800 */ mtc1 $zero, $f3 -/* 97E470 802409A0 46000021 */ cvt.d.s $f0, $f0 -/* 97E474 802409A4 4622003C */ c.lt.d $f0, $f2 -/* 97E478 802409A8 00000000 */ nop -/* 97E47C 802409AC 4500006C */ bc1f .L80240B60 -/* 97E480 802409B0 27B00028 */ addiu $s0, $sp, 0x28 -/* 97E484 802409B4 0200282D */ daddu $a1, $s0, $zero -/* 97E488 802409B8 27A60034 */ addiu $a2, $sp, 0x34 -/* 97E48C 802409BC 27B20038 */ addiu $s2, $sp, 0x38 -/* 97E490 802409C0 C6600038 */ lwc1 $f0, 0x38($s3) -/* 97E494 802409C4 3C0142C8 */ lui $at, 0x42c8 -/* 97E498 802409C8 44811000 */ mtc1 $at, $f2 -/* 97E49C 802409CC C6640040 */ lwc1 $f4, 0x40($s3) -/* 97E4A0 802409D0 3C01447A */ lui $at, 0x447a -/* 97E4A4 802409D4 44813000 */ mtc1 $at, $f6 -/* 97E4A8 802409D8 27B10030 */ addiu $s1, $sp, 0x30 -/* 97E4AC 802409DC E7A00028 */ swc1 $f0, 0x28($sp) -/* 97E4B0 802409E0 E7A20034 */ swc1 $f2, 0x34($sp) -/* 97E4B4 802409E4 E7A40030 */ swc1 $f4, 0x30($sp) -/* 97E4B8 802409E8 E7A60038 */ swc1 $f6, 0x38($sp) -/* 97E4BC 802409EC AFB20010 */ sw $s2, 0x10($sp) -/* 97E4C0 802409F0 8E640080 */ lw $a0, 0x80($s3) -/* 97E4C4 802409F4 0C0372DF */ jal func_800DCB7C -/* 97E4C8 802409F8 0220382D */ daddu $a3, $s1, $zero -/* 97E4CC 802409FC 0200282D */ daddu $a1, $s0, $zero -/* 97E4D0 80240A00 27A6002C */ addiu $a2, $sp, 0x2c -/* 97E4D4 80240A04 C662003C */ lwc1 $f2, 0x3c($s3) -/* 97E4D8 80240A08 C6660038 */ lwc1 $f6, 0x38($s3) -/* 97E4DC 80240A0C 3C01402A */ lui $at, 0x402a -/* 97E4E0 80240A10 4481A800 */ mtc1 $at, $f21 -/* 97E4E4 80240A14 4480A000 */ mtc1 $zero, $f20 -/* 97E4E8 80240A18 460010A1 */ cvt.d.s $f2, $f2 -/* 97E4EC 80240A1C 46341080 */ add.d $f2, $f2, $f20 -/* 97E4F0 80240A20 C660001C */ lwc1 $f0, 0x1c($s3) -/* 97E4F4 80240A24 C6640040 */ lwc1 $f4, 0x40($s3) -/* 97E4F8 80240A28 46000005 */ abs.s $f0, $f0 -/* 97E4FC 80240A2C E7A40030 */ swc1 $f4, 0x30($sp) -/* 97E500 80240A30 3C014030 */ lui $at, 0x4030 -/* 97E504 80240A34 44812800 */ mtc1 $at, $f5 -/* 97E508 80240A38 44802000 */ mtc1 $zero, $f4 -/* 97E50C 80240A3C 46000021 */ cvt.d.s $f0, $f0 -/* 97E510 80240A40 E7A60028 */ swc1 $f6, 0x28($sp) -/* 97E514 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 97E518 80240A48 462010A0 */ cvt.s.d $f2, $f2 -/* 97E51C 80240A4C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 97E520 80240A50 46200020 */ cvt.s.d $f0, $f0 -/* 97E524 80240A54 E7A00038 */ swc1 $f0, 0x38($sp) -/* 97E528 80240A58 AFB20010 */ sw $s2, 0x10($sp) -/* 97E52C 80240A5C 8E640080 */ lw $a0, 0x80($s3) -/* 97E530 80240A60 0C0372DF */ jal func_800DCB7C -/* 97E534 80240A64 0220382D */ daddu $a3, $s1, $zero -/* 97E538 80240A68 1040003D */ beqz $v0, .L80240B60 -/* 97E53C 80240A6C 00000000 */ nop -/* 97E540 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) -/* 97E544 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) -/* 97E548 80240A78 46000005 */ abs.s $f0, $f0 -/* 97E54C 80240A7C 46000021 */ cvt.d.s $f0, $f0 -/* 97E550 80240A80 46340000 */ add.d $f0, $f0, $f20 -/* 97E554 80240A84 460010A1 */ cvt.d.s $f2, $f2 -/* 97E558 80240A88 4620103E */ c.le.d $f2, $f0 -/* 97E55C 80240A8C 00000000 */ nop -/* 97E560 80240A90 45000033 */ bc1f .L80240B60 -/* 97E564 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 -/* 97E568 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 97E56C 80240A9C 8E620000 */ lw $v0, ($s3) -/* 97E570 80240AA0 AE60001C */ sw $zero, 0x1c($s3) -/* 97E574 80240AA4 00431024 */ and $v0, $v0, $v1 -/* 97E578 80240AA8 E660003C */ swc1 $f0, 0x3c($s3) -/* 97E57C 80240AAC AE620000 */ sw $v0, ($s3) -/* 97E580 80240AB0 AFA00010 */ sw $zero, 0x10($sp) -/* 97E584 80240AB4 AFA00014 */ sw $zero, 0x14($sp) -/* 97E588 80240AB8 8E650038 */ lw $a1, 0x38($s3) -/* 97E58C 80240ABC 8E66003C */ lw $a2, 0x3c($s3) -/* 97E590 80240AC0 8E670040 */ lw $a3, 0x40($s3) -/* 97E594 80240AC4 0C01BECC */ jal fx_walk_normal -/* 97E598 80240AC8 24040002 */ addiu $a0, $zero, 2 -/* 97E59C 80240ACC 02E0202D */ daddu $a0, $s7, $zero -/* 97E5A0 80240AD0 2402000C */ addiu $v0, $zero, 0xc -/* 97E5A4 80240AD4 AE820070 */ sw $v0, 0x70($s4) -/* 97E5A8 80240AD8 24020001 */ addiu $v0, $zero, 1 -/* 97E5AC 80240ADC AFA20010 */ sw $v0, 0x10($sp) -/* 97E5B0 80240AE0 8EC60024 */ lw $a2, 0x24($s6) -/* 97E5B4 80240AE4 8EC70028 */ lw $a3, 0x28($s6) -/* 97E5B8 80240AE8 0C01242D */ jal func_800490B4 -/* 97E5BC 80240AEC 02A0282D */ daddu $a1, $s5, $zero -/* 97E5C0 80240AF0 14400022 */ bnez $v0, .L80240B7C -/* 97E5C4 80240AF4 24040002 */ addiu $a0, $zero, 2 -/* 97E5C8 80240AF8 0260282D */ daddu $a1, $s3, $zero -/* 97E5CC 80240AFC 0000302D */ daddu $a2, $zero, $zero -/* 97E5D0 80240B00 866300A8 */ lh $v1, 0xa8($s3) -/* 97E5D4 80240B04 3C013F80 */ lui $at, 0x3f80 -/* 97E5D8 80240B08 44810000 */ mtc1 $at, $f0 -/* 97E5DC 80240B0C 3C014000 */ lui $at, 0x4000 -/* 97E5E0 80240B10 44811000 */ mtc1 $at, $f2 -/* 97E5E4 80240B14 3C01C1A0 */ lui $at, 0xc1a0 -/* 97E5E8 80240B18 44812000 */ mtc1 $at, $f4 -/* 97E5EC 80240B1C 2402000F */ addiu $v0, $zero, 0xf -/* 97E5F0 80240B20 AFA2001C */ sw $v0, 0x1c($sp) -/* 97E5F4 80240B24 44834000 */ mtc1 $v1, $f8 -/* 97E5F8 80240B28 00000000 */ nop -/* 97E5FC 80240B2C 46804220 */ cvt.s.w $f8, $f8 -/* 97E600 80240B30 44074000 */ mfc1 $a3, $f8 -/* 97E604 80240B34 27A2003C */ addiu $v0, $sp, 0x3c -/* 97E608 80240B38 AFA20020 */ sw $v0, 0x20($sp) -/* 97E60C 80240B3C E7A00010 */ swc1 $f0, 0x10($sp) -/* 97E610 80240B40 E7A20014 */ swc1 $f2, 0x14($sp) -/* 97E614 80240B44 0C01BFA4 */ jal fx_emote -/* 97E618 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) -/* 97E61C 80240B4C 24020019 */ addiu $v0, $zero, 0x19 -/* 97E620 80240B50 A662008E */ sh $v0, 0x8e($s3) -/* 97E624 80240B54 2402000E */ addiu $v0, $zero, 0xe -/* 97E628 80240B58 080902DF */ j .L80240B7C -/* 97E62C 80240B5C AE820070 */ sw $v0, 0x70($s4) -.L80240B60: -/* 97E630 80240B60 C664003C */ lwc1 $f4, 0x3c($s3) -/* 97E634 80240B64 C660001C */ lwc1 $f0, 0x1c($s3) -/* 97E638 80240B68 46002100 */ add.s $f4, $f4, $f0 -/* 97E63C 80240B6C C6620014 */ lwc1 $f2, 0x14($s3) -/* 97E640 80240B70 46020001 */ sub.s $f0, $f0, $f2 -/* 97E644 80240B74 E664003C */ swc1 $f4, 0x3c($s3) -/* 97E648 80240B78 E660001C */ swc1 $f0, 0x1c($s3) -.L80240B7C: -/* 97E64C 80240B7C 8FBF0060 */ lw $ra, 0x60($sp) -/* 97E650 80240B80 8FB7005C */ lw $s7, 0x5c($sp) -/* 97E654 80240B84 8FB60058 */ lw $s6, 0x58($sp) -/* 97E658 80240B88 8FB50054 */ lw $s5, 0x54($sp) -/* 97E65C 80240B8C 8FB40050 */ lw $s4, 0x50($sp) -/* 97E660 80240B90 8FB3004C */ lw $s3, 0x4c($sp) -/* 97E664 80240B94 8FB20048 */ lw $s2, 0x48($sp) -/* 97E668 80240B98 8FB10044 */ lw $s1, 0x44($sp) -/* 97E66C 80240B9C 8FB00040 */ lw $s0, 0x40($sp) -/* 97E670 80240BA0 D7B40068 */ ldc1 $f20, 0x68($sp) -/* 97E674 80240BA4 03E00008 */ jr $ra -/* 97E678 80240BA8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC_97E37C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC_97E37C.s new file mode 100644 index 0000000000..f9f713c99a --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802408AC_97E37C.s @@ -0,0 +1,200 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408AC_97E37C +/* 97E37C 802408AC 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 97E380 802408B0 AFB40050 */ sw $s4, 0x50($sp) +/* 97E384 802408B4 0080A02D */ daddu $s4, $a0, $zero +/* 97E388 802408B8 AFBF0060 */ sw $ra, 0x60($sp) +/* 97E38C 802408BC AFB7005C */ sw $s7, 0x5c($sp) +/* 97E390 802408C0 AFB60058 */ sw $s6, 0x58($sp) +/* 97E394 802408C4 AFB50054 */ sw $s5, 0x54($sp) +/* 97E398 802408C8 AFB3004C */ sw $s3, 0x4c($sp) +/* 97E39C 802408CC AFB20048 */ sw $s2, 0x48($sp) +/* 97E3A0 802408D0 AFB10044 */ sw $s1, 0x44($sp) +/* 97E3A4 802408D4 AFB00040 */ sw $s0, 0x40($sp) +/* 97E3A8 802408D8 F7B40068 */ sdc1 $f20, 0x68($sp) +/* 97E3AC 802408DC 8E950148 */ lw $s5, 0x148($s4) +/* 97E3B0 802408E0 00A0B02D */ daddu $s6, $a1, $zero +/* 97E3B4 802408E4 86A40008 */ lh $a0, 8($s5) +/* 97E3B8 802408E8 0C00EABB */ jal get_npc_unsafe +/* 97E3BC 802408EC 00C0B82D */ daddu $s7, $a2, $zero +/* 97E3C0 802408F0 0040982D */ daddu $s3, $v0, $zero +/* 97E3C4 802408F4 C6600018 */ lwc1 $f0, 0x18($s3) +/* 97E3C8 802408F8 44801000 */ mtc1 $zero, $f2 +/* 97E3CC 802408FC 44801800 */ mtc1 $zero, $f3 +/* 97E3D0 80240900 46000021 */ cvt.d.s $f0, $f0 +/* 97E3D4 80240904 4620103C */ c.lt.d $f2, $f0 +/* 97E3D8 80240908 00000000 */ nop +/* 97E3DC 8024090C 45000021 */ bc1f .L80240994 +/* 97E3E0 80240910 27A50028 */ addiu $a1, $sp, 0x28 +/* 97E3E4 80240914 C6600038 */ lwc1 $f0, 0x38($s3) +/* 97E3E8 80240918 C662003C */ lwc1 $f2, 0x3c($s3) +/* 97E3EC 8024091C C6640040 */ lwc1 $f4, 0x40($s3) +/* 97E3F0 80240920 C6660018 */ lwc1 $f6, 0x18($s3) +/* 97E3F4 80240924 E7A00028 */ swc1 $f0, 0x28($sp) +/* 97E3F8 80240928 E7A2002C */ swc1 $f2, 0x2c($sp) +/* 97E3FC 8024092C E7A40030 */ swc1 $f4, 0x30($sp) +/* 97E400 80240930 E7A60010 */ swc1 $f6, 0x10($sp) +/* 97E404 80240934 C660000C */ lwc1 $f0, 0xc($s3) +/* 97E408 80240938 E7A00014 */ swc1 $f0, 0x14($sp) +/* 97E40C 8024093C 866200A8 */ lh $v0, 0xa8($s3) +/* 97E410 80240940 44820000 */ mtc1 $v0, $f0 +/* 97E414 80240944 00000000 */ nop +/* 97E418 80240948 46800020 */ cvt.s.w $f0, $f0 +/* 97E41C 8024094C E7A00018 */ swc1 $f0, 0x18($sp) +/* 97E420 80240950 866200A6 */ lh $v0, 0xa6($s3) +/* 97E424 80240954 27A6002C */ addiu $a2, $sp, 0x2c +/* 97E428 80240958 44820000 */ mtc1 $v0, $f0 +/* 97E42C 8024095C 00000000 */ nop +/* 97E430 80240960 46800020 */ cvt.s.w $f0, $f0 +/* 97E434 80240964 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 97E438 80240968 8E640080 */ lw $a0, 0x80($s3) +/* 97E43C 8024096C 0C037711 */ jal func_800DDC44 +/* 97E440 80240970 27A70030 */ addiu $a3, $sp, 0x30 +/* 97E444 80240974 10400003 */ beqz $v0, .L80240984 +/* 97E448 80240978 00000000 */ nop +/* 97E44C 8024097C 08090265 */ j .L80240994 +/* 97E450 80240980 AE600018 */ sw $zero, 0x18($s3) +.L80240984: +/* 97E454 80240984 8E650018 */ lw $a1, 0x18($s3) +/* 97E458 80240988 8E66000C */ lw $a2, 0xc($s3) +/* 97E45C 8024098C 0C00EA95 */ jal npc_move_heading +/* 97E460 80240990 0260202D */ daddu $a0, $s3, $zero +.L80240994: +/* 97E464 80240994 C660001C */ lwc1 $f0, 0x1c($s3) +/* 97E468 80240998 44801000 */ mtc1 $zero, $f2 +/* 97E46C 8024099C 44801800 */ mtc1 $zero, $f3 +/* 97E470 802409A0 46000021 */ cvt.d.s $f0, $f0 +/* 97E474 802409A4 4622003C */ c.lt.d $f0, $f2 +/* 97E478 802409A8 00000000 */ nop +/* 97E47C 802409AC 4500006C */ bc1f .L80240B60 +/* 97E480 802409B0 27B00028 */ addiu $s0, $sp, 0x28 +/* 97E484 802409B4 0200282D */ daddu $a1, $s0, $zero +/* 97E488 802409B8 27A60034 */ addiu $a2, $sp, 0x34 +/* 97E48C 802409BC 27B20038 */ addiu $s2, $sp, 0x38 +/* 97E490 802409C0 C6600038 */ lwc1 $f0, 0x38($s3) +/* 97E494 802409C4 3C0142C8 */ lui $at, 0x42c8 +/* 97E498 802409C8 44811000 */ mtc1 $at, $f2 +/* 97E49C 802409CC C6640040 */ lwc1 $f4, 0x40($s3) +/* 97E4A0 802409D0 3C01447A */ lui $at, 0x447a +/* 97E4A4 802409D4 44813000 */ mtc1 $at, $f6 +/* 97E4A8 802409D8 27B10030 */ addiu $s1, $sp, 0x30 +/* 97E4AC 802409DC E7A00028 */ swc1 $f0, 0x28($sp) +/* 97E4B0 802409E0 E7A20034 */ swc1 $f2, 0x34($sp) +/* 97E4B4 802409E4 E7A40030 */ swc1 $f4, 0x30($sp) +/* 97E4B8 802409E8 E7A60038 */ swc1 $f6, 0x38($sp) +/* 97E4BC 802409EC AFB20010 */ sw $s2, 0x10($sp) +/* 97E4C0 802409F0 8E640080 */ lw $a0, 0x80($s3) +/* 97E4C4 802409F4 0C0372DF */ jal func_800DCB7C +/* 97E4C8 802409F8 0220382D */ daddu $a3, $s1, $zero +/* 97E4CC 802409FC 0200282D */ daddu $a1, $s0, $zero +/* 97E4D0 80240A00 27A6002C */ addiu $a2, $sp, 0x2c +/* 97E4D4 80240A04 C662003C */ lwc1 $f2, 0x3c($s3) +/* 97E4D8 80240A08 C6660038 */ lwc1 $f6, 0x38($s3) +/* 97E4DC 80240A0C 3C01402A */ lui $at, 0x402a +/* 97E4E0 80240A10 4481A800 */ mtc1 $at, $f21 +/* 97E4E4 80240A14 4480A000 */ mtc1 $zero, $f20 +/* 97E4E8 80240A18 460010A1 */ cvt.d.s $f2, $f2 +/* 97E4EC 80240A1C 46341080 */ add.d $f2, $f2, $f20 +/* 97E4F0 80240A20 C660001C */ lwc1 $f0, 0x1c($s3) +/* 97E4F4 80240A24 C6640040 */ lwc1 $f4, 0x40($s3) +/* 97E4F8 80240A28 46000005 */ abs.s $f0, $f0 +/* 97E4FC 80240A2C E7A40030 */ swc1 $f4, 0x30($sp) +/* 97E500 80240A30 3C014030 */ lui $at, 0x4030 +/* 97E504 80240A34 44812800 */ mtc1 $at, $f5 +/* 97E508 80240A38 44802000 */ mtc1 $zero, $f4 +/* 97E50C 80240A3C 46000021 */ cvt.d.s $f0, $f0 +/* 97E510 80240A40 E7A60028 */ swc1 $f6, 0x28($sp) +/* 97E514 80240A44 46240000 */ add.d $f0, $f0, $f4 +/* 97E518 80240A48 462010A0 */ cvt.s.d $f2, $f2 +/* 97E51C 80240A4C E7A2002C */ swc1 $f2, 0x2c($sp) +/* 97E520 80240A50 46200020 */ cvt.s.d $f0, $f0 +/* 97E524 80240A54 E7A00038 */ swc1 $f0, 0x38($sp) +/* 97E528 80240A58 AFB20010 */ sw $s2, 0x10($sp) +/* 97E52C 80240A5C 8E640080 */ lw $a0, 0x80($s3) +/* 97E530 80240A60 0C0372DF */ jal func_800DCB7C +/* 97E534 80240A64 0220382D */ daddu $a3, $s1, $zero +/* 97E538 80240A68 1040003D */ beqz $v0, .L80240B60 +/* 97E53C 80240A6C 00000000 */ nop +/* 97E540 80240A70 C660001C */ lwc1 $f0, 0x1c($s3) +/* 97E544 80240A74 C7A20038 */ lwc1 $f2, 0x38($sp) +/* 97E548 80240A78 46000005 */ abs.s $f0, $f0 +/* 97E54C 80240A7C 46000021 */ cvt.d.s $f0, $f0 +/* 97E550 80240A80 46340000 */ add.d $f0, $f0, $f20 +/* 97E554 80240A84 460010A1 */ cvt.d.s $f2, $f2 +/* 97E558 80240A88 4620103E */ c.le.d $f2, $f0 +/* 97E55C 80240A8C 00000000 */ nop +/* 97E560 80240A90 45000033 */ bc1f .L80240B60 +/* 97E564 80240A94 2403F7FF */ addiu $v1, $zero, -0x801 +/* 97E568 80240A98 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* 97E56C 80240A9C 8E620000 */ lw $v0, ($s3) +/* 97E570 80240AA0 AE60001C */ sw $zero, 0x1c($s3) +/* 97E574 80240AA4 00431024 */ and $v0, $v0, $v1 +/* 97E578 80240AA8 E660003C */ swc1 $f0, 0x3c($s3) +/* 97E57C 80240AAC AE620000 */ sw $v0, ($s3) +/* 97E580 80240AB0 AFA00010 */ sw $zero, 0x10($sp) +/* 97E584 80240AB4 AFA00014 */ sw $zero, 0x14($sp) +/* 97E588 80240AB8 8E650038 */ lw $a1, 0x38($s3) +/* 97E58C 80240ABC 8E66003C */ lw $a2, 0x3c($s3) +/* 97E590 80240AC0 8E670040 */ lw $a3, 0x40($s3) +/* 97E594 80240AC4 0C01BECC */ jal fx_walk_normal +/* 97E598 80240AC8 24040002 */ addiu $a0, $zero, 2 +/* 97E59C 80240ACC 02E0202D */ daddu $a0, $s7, $zero +/* 97E5A0 80240AD0 2402000C */ addiu $v0, $zero, 0xc +/* 97E5A4 80240AD4 AE820070 */ sw $v0, 0x70($s4) +/* 97E5A8 80240AD8 24020001 */ addiu $v0, $zero, 1 +/* 97E5AC 80240ADC AFA20010 */ sw $v0, 0x10($sp) +/* 97E5B0 80240AE0 8EC60024 */ lw $a2, 0x24($s6) +/* 97E5B4 80240AE4 8EC70028 */ lw $a3, 0x28($s6) +/* 97E5B8 80240AE8 0C01242D */ jal func_800490B4 +/* 97E5BC 80240AEC 02A0282D */ daddu $a1, $s5, $zero +/* 97E5C0 80240AF0 14400022 */ bnez $v0, .L80240B7C +/* 97E5C4 80240AF4 24040002 */ addiu $a0, $zero, 2 +/* 97E5C8 80240AF8 0260282D */ daddu $a1, $s3, $zero +/* 97E5CC 80240AFC 0000302D */ daddu $a2, $zero, $zero +/* 97E5D0 80240B00 866300A8 */ lh $v1, 0xa8($s3) +/* 97E5D4 80240B04 3C013F80 */ lui $at, 0x3f80 +/* 97E5D8 80240B08 44810000 */ mtc1 $at, $f0 +/* 97E5DC 80240B0C 3C014000 */ lui $at, 0x4000 +/* 97E5E0 80240B10 44811000 */ mtc1 $at, $f2 +/* 97E5E4 80240B14 3C01C1A0 */ lui $at, 0xc1a0 +/* 97E5E8 80240B18 44812000 */ mtc1 $at, $f4 +/* 97E5EC 80240B1C 2402000F */ addiu $v0, $zero, 0xf +/* 97E5F0 80240B20 AFA2001C */ sw $v0, 0x1c($sp) +/* 97E5F4 80240B24 44834000 */ mtc1 $v1, $f8 +/* 97E5F8 80240B28 00000000 */ nop +/* 97E5FC 80240B2C 46804220 */ cvt.s.w $f8, $f8 +/* 97E600 80240B30 44074000 */ mfc1 $a3, $f8 +/* 97E604 80240B34 27A2003C */ addiu $v0, $sp, 0x3c +/* 97E608 80240B38 AFA20020 */ sw $v0, 0x20($sp) +/* 97E60C 80240B3C E7A00010 */ swc1 $f0, 0x10($sp) +/* 97E610 80240B40 E7A20014 */ swc1 $f2, 0x14($sp) +/* 97E614 80240B44 0C01BFA4 */ jal fx_emote +/* 97E618 80240B48 E7A40018 */ swc1 $f4, 0x18($sp) +/* 97E61C 80240B4C 24020019 */ addiu $v0, $zero, 0x19 +/* 97E620 80240B50 A662008E */ sh $v0, 0x8e($s3) +/* 97E624 80240B54 2402000E */ addiu $v0, $zero, 0xe +/* 97E628 80240B58 080902DF */ j .L80240B7C +/* 97E62C 80240B5C AE820070 */ sw $v0, 0x70($s4) +.L80240B60: +/* 97E630 80240B60 C664003C */ lwc1 $f4, 0x3c($s3) +/* 97E634 80240B64 C660001C */ lwc1 $f0, 0x1c($s3) +/* 97E638 80240B68 46002100 */ add.s $f4, $f4, $f0 +/* 97E63C 80240B6C C6620014 */ lwc1 $f2, 0x14($s3) +/* 97E640 80240B70 46020001 */ sub.s $f0, $f0, $f2 +/* 97E644 80240B74 E664003C */ swc1 $f4, 0x3c($s3) +/* 97E648 80240B78 E660001C */ swc1 $f0, 0x1c($s3) +.L80240B7C: +/* 97E64C 80240B7C 8FBF0060 */ lw $ra, 0x60($sp) +/* 97E650 80240B80 8FB7005C */ lw $s7, 0x5c($sp) +/* 97E654 80240B84 8FB60058 */ lw $s6, 0x58($sp) +/* 97E658 80240B88 8FB50054 */ lw $s5, 0x54($sp) +/* 97E65C 80240B8C 8FB40050 */ lw $s4, 0x50($sp) +/* 97E660 80240B90 8FB3004C */ lw $s3, 0x4c($sp) +/* 97E664 80240B94 8FB20048 */ lw $s2, 0x48($sp) +/* 97E668 80240B98 8FB10044 */ lw $s1, 0x44($sp) +/* 97E66C 80240B9C 8FB00040 */ lw $s0, 0x40($sp) +/* 97E670 80240BA0 D7B40068 */ ldc1 $f20, 0x68($sp) +/* 97E674 80240BA4 03E00008 */ jr $ra +/* 97E678 80240BA8 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC.s deleted file mode 100644 index 91d1db6a4b..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BAC -/* 97E67C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97E680 80240BB0 AFB00010 */ sw $s0, 0x10($sp) -/* 97E684 80240BB4 0080802D */ daddu $s0, $a0, $zero -/* 97E688 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) -/* 97E68C 80240BBC 8E020148 */ lw $v0, 0x148($s0) -/* 97E690 80240BC0 0C00EABB */ jal get_npc_unsafe -/* 97E694 80240BC4 84440008 */ lh $a0, 8($v0) -/* 97E698 80240BC8 9443008E */ lhu $v1, 0x8e($v0) -/* 97E69C 80240BCC 2463FFFF */ addiu $v1, $v1, -1 -/* 97E6A0 80240BD0 A443008E */ sh $v1, 0x8e($v0) -/* 97E6A4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 -/* 97E6A8 80240BD8 58600001 */ blezl $v1, .L80240BE0 -/* 97E6AC 80240BDC AE000070 */ sw $zero, 0x70($s0) -.L80240BE0: -/* 97E6B0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 97E6B4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) -/* 97E6B8 80240BE8 03E00008 */ jr $ra -/* 97E6BC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s new file mode 100644 index 0000000000..22b1d220dd --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BAC_97E67C.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BAC_97E67C +/* 97E67C 80240BAC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 97E680 80240BB0 AFB00010 */ sw $s0, 0x10($sp) +/* 97E684 80240BB4 0080802D */ daddu $s0, $a0, $zero +/* 97E688 80240BB8 AFBF0014 */ sw $ra, 0x14($sp) +/* 97E68C 80240BBC 8E020148 */ lw $v0, 0x148($s0) +/* 97E690 80240BC0 0C00EABB */ jal get_npc_unsafe +/* 97E694 80240BC4 84440008 */ lh $a0, 8($v0) +/* 97E698 80240BC8 9443008E */ lhu $v1, 0x8e($v0) +/* 97E69C 80240BCC 2463FFFF */ addiu $v1, $v1, -1 +/* 97E6A0 80240BD0 A443008E */ sh $v1, 0x8e($v0) +/* 97E6A4 80240BD4 00031C00 */ sll $v1, $v1, 0x10 +/* 97E6A8 80240BD8 58600001 */ blezl $v1, .L80240BE0 +/* 97E6AC 80240BDC AE000070 */ sw $zero, 0x70($s0) +.L80240BE0: +/* 97E6B0 80240BE0 8FBF0014 */ lw $ra, 0x14($sp) +/* 97E6B4 80240BE4 8FB00010 */ lw $s0, 0x10($sp) +/* 97E6B8 80240BE8 03E00008 */ jr $ra +/* 97E6BC 80240BEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s index 0ba6270228..3de351f987 100644 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240BF0_97E6C0.s @@ -95,17 +95,17 @@ glabel func_80240BF0_97E6C0 /* 97E820 80240D50 00000000 */ nop /* 97E824 80240D54 0260202D */ daddu $a0, $s3, $zero /* 97E828 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 97E82C 80240D5C 0C090000 */ jal func_80240000 +/* 97E82C 80240D5C 0C090000 */ jal func_80240000_97DAD0 /* 97E830 80240D60 0200302D */ daddu $a2, $s0, $zero /* 97E834 80240D64 0260202D */ daddu $a0, $s3, $zero /* 97E838 80240D68 0280282D */ daddu $a1, $s4, $zero -/* 97E83C 80240D6C 0C09008C */ jal func_80240230 +/* 97E83C 80240D6C 0C09008C */ jal func_80240230_97DD00 /* 97E840 80240D70 0200302D */ daddu $a2, $s0, $zero /* 97E844 80240D74 0809037C */ j .L80240DF0 /* 97E848 80240D78 0000102D */ daddu $v0, $zero, $zero /* 97E84C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 97E850 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 97E854 80240D84 0C09015A */ jal func_80240568 +/* 97E854 80240D84 0C09015A */ jal func_80240568_97E038 /* 97E858 80240D88 0200302D */ daddu $a2, $s0, $zero /* 97E85C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 97E860 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80240BF0_97E6C0 /* 97E868 80240D98 0000102D */ daddu $v0, $zero, $zero /* 97E86C 80240D9C 0260202D */ daddu $a0, $s3, $zero /* 97E870 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 97E874 80240DA4 0C09018A */ jal func_80240628 +/* 97E874 80240DA4 0C09018A */ jal func_80240628_97E0F8 /* 97E878 80240DA8 0200302D */ daddu $a2, $s0, $zero /* 97E87C 80240DAC 0809037C */ j .L80240DF0 /* 97E880 80240DB0 0000102D */ daddu $v0, $zero, $zero /* 97E884 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 97E888 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 97E88C 80240DBC 0C0901F3 */ jal func_802407CC +/* 97E88C 80240DBC 0C0901F3 */ jal func_802407CC_97E29C /* 97E890 80240DC0 0200302D */ daddu $a2, $s0, $zero /* 97E894 80240DC4 0260202D */ daddu $a0, $s3, $zero /* 97E898 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 97E89C 80240DCC 0C09022B */ jal func_802408AC +/* 97E89C 80240DCC 0C09022B */ jal func_802408AC_97E37C /* 97E8A0 80240DD0 0200302D */ daddu $a2, $s0, $zero /* 97E8A4 80240DD4 0809037C */ j .L80240DF0 /* 97E8A8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 97E8AC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 97E8B0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 97E8B4 80240DE4 0C0902EB */ jal func_80240BAC +/* 97E8B4 80240DE4 0C0902EB */ jal func_80240BAC_97E67C /* 97E8B8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 97E8BC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14.s deleted file mode 100644 index 37d1a048b2..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E14 -/* 97E8E4 80240E14 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97E8E8 80240E18 AFB00010 */ sw $s0, 0x10($sp) -/* 97E8EC 80240E1C 0080802D */ daddu $s0, $a0, $zero -/* 97E8F0 80240E20 AFBF001C */ sw $ra, 0x1c($sp) -/* 97E8F4 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* 97E8F8 80240E28 AFB10014 */ sw $s1, 0x14($sp) -/* 97E8FC 80240E2C 8E020148 */ lw $v0, 0x148($s0) -/* 97E900 80240E30 00A0882D */ daddu $s1, $a1, $zero -/* 97E904 80240E34 84440008 */ lh $a0, 8($v0) -/* 97E908 80240E38 0C00EABB */ jal get_npc_unsafe -/* 97E90C 80240E3C 00C0902D */ daddu $s2, $a2, $zero -/* 97E910 80240E40 0200202D */ daddu $a0, $s0, $zero -/* 97E914 80240E44 0040802D */ daddu $s0, $v0, $zero -/* 97E918 80240E48 0220282D */ daddu $a1, $s1, $zero -/* 97E91C 80240E4C 0C012568 */ jal func_800495A0 -/* 97E920 80240E50 0240302D */ daddu $a2, $s2, $zero -/* 97E924 80240E54 0C00A67F */ jal rand_int -/* 97E928 80240E58 24040005 */ addiu $a0, $zero, 5 -/* 97E92C 80240E5C 3C014020 */ lui $at, 0x4020 -/* 97E930 80240E60 44811800 */ mtc1 $at, $f3 -/* 97E934 80240E64 44801000 */ mtc1 $zero, $f2 -/* 97E938 80240E68 44820000 */ mtc1 $v0, $f0 -/* 97E93C 80240E6C 00000000 */ nop -/* 97E940 80240E70 46800021 */ cvt.d.w $f0, $f0 -/* 97E944 80240E74 46220000 */ add.d $f0, $f0, $f2 -/* 97E948 80240E78 3C013FC0 */ lui $at, 0x3fc0 -/* 97E94C 80240E7C 44811000 */ mtc1 $at, $f2 -/* 97E950 80240E80 00000000 */ nop -/* 97E954 80240E84 E6020014 */ swc1 $f2, 0x14($s0) -/* 97E958 80240E88 46200020 */ cvt.s.d $f0, $f0 -/* 97E95C 80240E8C E600001C */ swc1 $f0, 0x1c($s0) -/* 97E960 80240E90 8FBF001C */ lw $ra, 0x1c($sp) -/* 97E964 80240E94 8FB20018 */ lw $s2, 0x18($sp) -/* 97E968 80240E98 8FB10014 */ lw $s1, 0x14($sp) -/* 97E96C 80240E9C 8FB00010 */ lw $s0, 0x10($sp) -/* 97E970 80240EA0 03E00008 */ jr $ra -/* 97E974 80240EA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s new file mode 100644 index 0000000000..eac8c36e2f --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240E14_97E8E4.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E14_97E8E4 +/* 97E8E4 80240E14 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 97E8E8 80240E18 AFB00010 */ sw $s0, 0x10($sp) +/* 97E8EC 80240E1C 0080802D */ daddu $s0, $a0, $zero +/* 97E8F0 80240E20 AFBF001C */ sw $ra, 0x1c($sp) +/* 97E8F4 80240E24 AFB20018 */ sw $s2, 0x18($sp) +/* 97E8F8 80240E28 AFB10014 */ sw $s1, 0x14($sp) +/* 97E8FC 80240E2C 8E020148 */ lw $v0, 0x148($s0) +/* 97E900 80240E30 00A0882D */ daddu $s1, $a1, $zero +/* 97E904 80240E34 84440008 */ lh $a0, 8($v0) +/* 97E908 80240E38 0C00EABB */ jal get_npc_unsafe +/* 97E90C 80240E3C 00C0902D */ daddu $s2, $a2, $zero +/* 97E910 80240E40 0200202D */ daddu $a0, $s0, $zero +/* 97E914 80240E44 0040802D */ daddu $s0, $v0, $zero +/* 97E918 80240E48 0220282D */ daddu $a1, $s1, $zero +/* 97E91C 80240E4C 0C012568 */ jal func_800495A0 +/* 97E920 80240E50 0240302D */ daddu $a2, $s2, $zero +/* 97E924 80240E54 0C00A67F */ jal rand_int +/* 97E928 80240E58 24040005 */ addiu $a0, $zero, 5 +/* 97E92C 80240E5C 3C014020 */ lui $at, 0x4020 +/* 97E930 80240E60 44811800 */ mtc1 $at, $f3 +/* 97E934 80240E64 44801000 */ mtc1 $zero, $f2 +/* 97E938 80240E68 44820000 */ mtc1 $v0, $f0 +/* 97E93C 80240E6C 00000000 */ nop +/* 97E940 80240E70 46800021 */ cvt.d.w $f0, $f0 +/* 97E944 80240E74 46220000 */ add.d $f0, $f0, $f2 +/* 97E948 80240E78 3C013FC0 */ lui $at, 0x3fc0 +/* 97E94C 80240E7C 44811000 */ mtc1 $at, $f2 +/* 97E950 80240E80 00000000 */ nop +/* 97E954 80240E84 E6020014 */ swc1 $f2, 0x14($s0) +/* 97E958 80240E88 46200020 */ cvt.s.d $f0, $f0 +/* 97E95C 80240E8C E600001C */ swc1 $f0, 0x1c($s0) +/* 97E960 80240E90 8FBF001C */ lw $ra, 0x1c($sp) +/* 97E964 80240E94 8FB20018 */ lw $s2, 0x18($sp) +/* 97E968 80240E98 8FB10014 */ lw $s1, 0x14($sp) +/* 97E96C 80240E9C 8FB00010 */ lw $s0, 0x10($sp) +/* 97E970 80240EA0 03E00008 */ jr $ra +/* 97E974 80240EA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C.s deleted file mode 100644 index 58d873c8a1..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F3C -/* 97EA0C 80240F3C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 97EA10 80240F40 AFB40040 */ sw $s4, 0x40($sp) -/* 97EA14 80240F44 0080A02D */ daddu $s4, $a0, $zero -/* 97EA18 80240F48 AFBF0048 */ sw $ra, 0x48($sp) -/* 97EA1C 80240F4C AFB50044 */ sw $s5, 0x44($sp) -/* 97EA20 80240F50 AFB3003C */ sw $s3, 0x3c($sp) -/* 97EA24 80240F54 AFB20038 */ sw $s2, 0x38($sp) -/* 97EA28 80240F58 AFB10034 */ sw $s1, 0x34($sp) -/* 97EA2C 80240F5C AFB00030 */ sw $s0, 0x30($sp) -/* 97EA30 80240F60 8E920148 */ lw $s2, 0x148($s4) -/* 97EA34 80240F64 86440008 */ lh $a0, 8($s2) -/* 97EA38 80240F68 8E90000C */ lw $s0, 0xc($s4) -/* 97EA3C 80240F6C 0C00EABB */ jal get_npc_unsafe -/* 97EA40 80240F70 00A0882D */ daddu $s1, $a1, $zero -/* 97EA44 80240F74 0280202D */ daddu $a0, $s4, $zero -/* 97EA48 80240F78 8E050000 */ lw $a1, ($s0) -/* 97EA4C 80240F7C 0C0B1EAF */ jal get_variable -/* 97EA50 80240F80 0040A82D */ daddu $s5, $v0, $zero -/* 97EA54 80240F84 AFA00010 */ sw $zero, 0x10($sp) -/* 97EA58 80240F88 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA5C 80240F8C 8C630030 */ lw $v1, 0x30($v1) -/* 97EA60 80240F90 AFA30014 */ sw $v1, 0x14($sp) -/* 97EA64 80240F94 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA68 80240F98 8C63001C */ lw $v1, 0x1c($v1) -/* 97EA6C 80240F9C AFA30018 */ sw $v1, 0x18($sp) -/* 97EA70 80240FA0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA74 80240FA4 8C630024 */ lw $v1, 0x24($v1) -/* 97EA78 80240FA8 AFA3001C */ sw $v1, 0x1c($sp) -/* 97EA7C 80240FAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA80 80240FB0 8C630028 */ lw $v1, 0x28($v1) -/* 97EA84 80240FB4 27B30010 */ addiu $s3, $sp, 0x10 -/* 97EA88 80240FB8 AFA30020 */ sw $v1, 0x20($sp) -/* 97EA8C 80240FBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 97EA90 80240FC0 3C0142C8 */ lui $at, 0x42c8 -/* 97EA94 80240FC4 44810000 */ mtc1 $at, $f0 -/* 97EA98 80240FC8 8C63002C */ lw $v1, 0x2c($v1) -/* 97EA9C 80240FCC 0040802D */ daddu $s0, $v0, $zero -/* 97EAA0 80240FD0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 97EAA4 80240FD4 A7A0002C */ sh $zero, 0x2c($sp) -/* 97EAA8 80240FD8 12200016 */ beqz $s1, .L80241034 -/* 97EAAC 80240FDC AFA30024 */ sw $v1, 0x24($sp) -/* 97EAB0 80240FE0 8EA20000 */ lw $v0, ($s5) -/* 97EAB4 80240FE4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 97EAB8 80240FE8 A6A0008E */ sh $zero, 0x8e($s5) -/* 97EABC 80240FEC 00431024 */ and $v0, $v0, $v1 -/* 97EAC0 80240FF0 2403FDFF */ addiu $v1, $zero, -0x201 -/* 97EAC4 80240FF4 00431024 */ and $v0, $v0, $v1 -/* 97EAC8 80240FF8 34420008 */ ori $v0, $v0, 8 -/* 97EACC 80240FFC AEA20000 */ sw $v0, ($s5) -/* 97EAD0 80241000 AE800074 */ sw $zero, 0x74($s4) -/* 97EAD4 80241004 AE800070 */ sw $zero, 0x70($s4) -/* 97EAD8 80241008 8E420000 */ lw $v0, ($s2) -/* 97EADC 8024100C 3C034000 */ lui $v1, 0x4000 -/* 97EAE0 80241010 00431024 */ and $v0, $v0, $v1 -/* 97EAE4 80241014 10400007 */ beqz $v0, .L80241034 -/* 97EAE8 80241018 3C03BFFF */ lui $v1, 0xbfff -/* 97EAEC 8024101C 2402000C */ addiu $v0, $zero, 0xc -/* 97EAF0 80241020 AE820070 */ sw $v0, 0x70($s4) -/* 97EAF4 80241024 8E420000 */ lw $v0, ($s2) -/* 97EAF8 80241028 3463FFFF */ ori $v1, $v1, 0xffff -/* 97EAFC 8024102C 00431024 */ and $v0, $v0, $v1 -/* 97EB00 80241030 AE420000 */ sw $v0, ($s2) -.L80241034: -/* 97EB04 80241034 8E830070 */ lw $v1, 0x70($s4) -/* 97EB08 80241038 2C62000F */ sltiu $v0, $v1, 0xf -/* 97EB0C 8024103C 10400028 */ beqz $v0, .L802410E0 -/* 97EB10 80241040 00031080 */ sll $v0, $v1, 2 -/* 97EB14 80241044 3C018024 */ lui $at, 0x8024 -/* 97EB18 80241048 00220821 */ addu $at, $at, $v0 -/* 97EB1C 8024104C 8C222EF8 */ lw $v0, 0x2ef8($at) -/* 97EB20 80241050 00400008 */ jr $v0 -/* 97EB24 80241054 00000000 */ nop -/* 97EB28 80241058 0280202D */ daddu $a0, $s4, $zero -/* 97EB2C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* 97EB30 80241060 0C090385 */ jal func_80240E14 -/* 97EB34 80241064 0260302D */ daddu $a2, $s3, $zero -/* 97EB38 80241068 0280202D */ daddu $a0, $s4, $zero -/* 97EB3C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* 97EB40 80241070 0C09008C */ jal func_80240230 -/* 97EB44 80241074 0260302D */ daddu $a2, $s3, $zero -/* 97EB48 80241078 08090438 */ j .L802410E0 -/* 97EB4C 8024107C 00000000 */ nop -/* 97EB50 80241080 0280202D */ daddu $a0, $s4, $zero -/* 97EB54 80241084 0200282D */ daddu $a1, $s0, $zero -/* 97EB58 80241088 0C09015A */ jal func_80240568 -/* 97EB5C 8024108C 0260302D */ daddu $a2, $s3, $zero -/* 97EB60 80241090 0280202D */ daddu $a0, $s4, $zero -/* 97EB64 80241094 0200282D */ daddu $a1, $s0, $zero -/* 97EB68 80241098 0C09018A */ jal func_80240628 -/* 97EB6C 8024109C 0260302D */ daddu $a2, $s3, $zero -/* 97EB70 802410A0 08090438 */ j .L802410E0 -/* 97EB74 802410A4 00000000 */ nop -/* 97EB78 802410A8 0280202D */ daddu $a0, $s4, $zero -/* 97EB7C 802410AC 0200282D */ daddu $a1, $s0, $zero -/* 97EB80 802410B0 0C0903AA */ jal func_80240EA8 -/* 97EB84 802410B4 0260302D */ daddu $a2, $s3, $zero -/* 97EB88 802410B8 0280202D */ daddu $a0, $s4, $zero -/* 97EB8C 802410BC 0200282D */ daddu $a1, $s0, $zero -/* 97EB90 802410C0 0C09022B */ jal func_802408AC -/* 97EB94 802410C4 0260302D */ daddu $a2, $s3, $zero -/* 97EB98 802410C8 08090438 */ j .L802410E0 -/* 97EB9C 802410CC 00000000 */ nop -/* 97EBA0 802410D0 0280202D */ daddu $a0, $s4, $zero -/* 97EBA4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 97EBA8 802410D8 0C0902EB */ jal func_80240BAC -/* 97EBAC 802410DC 0260302D */ daddu $a2, $s3, $zero -.L802410E0: -/* 97EBB0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) -/* 97EBB4 802410E4 8FB50044 */ lw $s5, 0x44($sp) -/* 97EBB8 802410E8 8FB40040 */ lw $s4, 0x40($sp) -/* 97EBBC 802410EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 97EBC0 802410F0 8FB20038 */ lw $s2, 0x38($sp) -/* 97EBC4 802410F4 8FB10034 */ lw $s1, 0x34($sp) -/* 97EBC8 802410F8 8FB00030 */ lw $s0, 0x30($sp) -/* 97EBCC 802410FC 0000102D */ daddu $v0, $zero, $zero -/* 97EBD0 80241100 03E00008 */ jr $ra -/* 97EBD4 80241104 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s new file mode 100644 index 0000000000..98ed6be130 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80240F3C_97EA0C.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F3C_97EA0C +/* 97EA0C 80240F3C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 97EA10 80240F40 AFB40040 */ sw $s4, 0x40($sp) +/* 97EA14 80240F44 0080A02D */ daddu $s4, $a0, $zero +/* 97EA18 80240F48 AFBF0048 */ sw $ra, 0x48($sp) +/* 97EA1C 80240F4C AFB50044 */ sw $s5, 0x44($sp) +/* 97EA20 80240F50 AFB3003C */ sw $s3, 0x3c($sp) +/* 97EA24 80240F54 AFB20038 */ sw $s2, 0x38($sp) +/* 97EA28 80240F58 AFB10034 */ sw $s1, 0x34($sp) +/* 97EA2C 80240F5C AFB00030 */ sw $s0, 0x30($sp) +/* 97EA30 80240F60 8E920148 */ lw $s2, 0x148($s4) +/* 97EA34 80240F64 86440008 */ lh $a0, 8($s2) +/* 97EA38 80240F68 8E90000C */ lw $s0, 0xc($s4) +/* 97EA3C 80240F6C 0C00EABB */ jal get_npc_unsafe +/* 97EA40 80240F70 00A0882D */ daddu $s1, $a1, $zero +/* 97EA44 80240F74 0280202D */ daddu $a0, $s4, $zero +/* 97EA48 80240F78 8E050000 */ lw $a1, ($s0) +/* 97EA4C 80240F7C 0C0B1EAF */ jal get_variable +/* 97EA50 80240F80 0040A82D */ daddu $s5, $v0, $zero +/* 97EA54 80240F84 AFA00010 */ sw $zero, 0x10($sp) +/* 97EA58 80240F88 8E4300D0 */ lw $v1, 0xd0($s2) +/* 97EA5C 80240F8C 8C630030 */ lw $v1, 0x30($v1) +/* 97EA60 80240F90 AFA30014 */ sw $v1, 0x14($sp) +/* 97EA64 80240F94 8E4300D0 */ lw $v1, 0xd0($s2) +/* 97EA68 80240F98 8C63001C */ lw $v1, 0x1c($v1) +/* 97EA6C 80240F9C AFA30018 */ sw $v1, 0x18($sp) +/* 97EA70 80240FA0 8E4300D0 */ lw $v1, 0xd0($s2) +/* 97EA74 80240FA4 8C630024 */ lw $v1, 0x24($v1) +/* 97EA78 80240FA8 AFA3001C */ sw $v1, 0x1c($sp) +/* 97EA7C 80240FAC 8E4300D0 */ lw $v1, 0xd0($s2) +/* 97EA80 80240FB0 8C630028 */ lw $v1, 0x28($v1) +/* 97EA84 80240FB4 27B30010 */ addiu $s3, $sp, 0x10 +/* 97EA88 80240FB8 AFA30020 */ sw $v1, 0x20($sp) +/* 97EA8C 80240FBC 8E4300D0 */ lw $v1, 0xd0($s2) +/* 97EA90 80240FC0 3C0142C8 */ lui $at, 0x42c8 +/* 97EA94 80240FC4 44810000 */ mtc1 $at, $f0 +/* 97EA98 80240FC8 8C63002C */ lw $v1, 0x2c($v1) +/* 97EA9C 80240FCC 0040802D */ daddu $s0, $v0, $zero +/* 97EAA0 80240FD0 E7A00028 */ swc1 $f0, 0x28($sp) +/* 97EAA4 80240FD4 A7A0002C */ sh $zero, 0x2c($sp) +/* 97EAA8 80240FD8 12200016 */ beqz $s1, .L80241034 +/* 97EAAC 80240FDC AFA30024 */ sw $v1, 0x24($sp) +/* 97EAB0 80240FE0 8EA20000 */ lw $v0, ($s5) +/* 97EAB4 80240FE4 2403F7FF */ addiu $v1, $zero, -0x801 +/* 97EAB8 80240FE8 A6A0008E */ sh $zero, 0x8e($s5) +/* 97EABC 80240FEC 00431024 */ and $v0, $v0, $v1 +/* 97EAC0 80240FF0 2403FDFF */ addiu $v1, $zero, -0x201 +/* 97EAC4 80240FF4 00431024 */ and $v0, $v0, $v1 +/* 97EAC8 80240FF8 34420008 */ ori $v0, $v0, 8 +/* 97EACC 80240FFC AEA20000 */ sw $v0, ($s5) +/* 97EAD0 80241000 AE800074 */ sw $zero, 0x74($s4) +/* 97EAD4 80241004 AE800070 */ sw $zero, 0x70($s4) +/* 97EAD8 80241008 8E420000 */ lw $v0, ($s2) +/* 97EADC 8024100C 3C034000 */ lui $v1, 0x4000 +/* 97EAE0 80241010 00431024 */ and $v0, $v0, $v1 +/* 97EAE4 80241014 10400007 */ beqz $v0, .L80241034 +/* 97EAE8 80241018 3C03BFFF */ lui $v1, 0xbfff +/* 97EAEC 8024101C 2402000C */ addiu $v0, $zero, 0xc +/* 97EAF0 80241020 AE820070 */ sw $v0, 0x70($s4) +/* 97EAF4 80241024 8E420000 */ lw $v0, ($s2) +/* 97EAF8 80241028 3463FFFF */ ori $v1, $v1, 0xffff +/* 97EAFC 8024102C 00431024 */ and $v0, $v0, $v1 +/* 97EB00 80241030 AE420000 */ sw $v0, ($s2) +.L80241034: +/* 97EB04 80241034 8E830070 */ lw $v1, 0x70($s4) +/* 97EB08 80241038 2C62000F */ sltiu $v0, $v1, 0xf +/* 97EB0C 8024103C 10400028 */ beqz $v0, .L802410E0 +/* 97EB10 80241040 00031080 */ sll $v0, $v1, 2 +/* 97EB14 80241044 3C018024 */ lui $at, 0x8024 +/* 97EB18 80241048 00220821 */ addu $at, $at, $v0 +/* 97EB1C 8024104C 8C222EF8 */ lw $v0, 0x2ef8($at) +/* 97EB20 80241050 00400008 */ jr $v0 +/* 97EB24 80241054 00000000 */ nop +/* 97EB28 80241058 0280202D */ daddu $a0, $s4, $zero +/* 97EB2C 8024105C 0200282D */ daddu $a1, $s0, $zero +/* 97EB30 80241060 0C090385 */ jal func_80240E14_97E8E4 +/* 97EB34 80241064 0260302D */ daddu $a2, $s3, $zero +/* 97EB38 80241068 0280202D */ daddu $a0, $s4, $zero +/* 97EB3C 8024106C 0200282D */ daddu $a1, $s0, $zero +/* 97EB40 80241070 0C09008C */ jal func_80240230_97DD00 +/* 97EB44 80241074 0260302D */ daddu $a2, $s3, $zero +/* 97EB48 80241078 08090438 */ j .L802410E0 +/* 97EB4C 8024107C 00000000 */ nop +/* 97EB50 80241080 0280202D */ daddu $a0, $s4, $zero +/* 97EB54 80241084 0200282D */ daddu $a1, $s0, $zero +/* 97EB58 80241088 0C09015A */ jal func_80240568_97E038 +/* 97EB5C 8024108C 0260302D */ daddu $a2, $s3, $zero +/* 97EB60 80241090 0280202D */ daddu $a0, $s4, $zero +/* 97EB64 80241094 0200282D */ daddu $a1, $s0, $zero +/* 97EB68 80241098 0C09018A */ jal func_80240628_97E0F8 +/* 97EB6C 8024109C 0260302D */ daddu $a2, $s3, $zero +/* 97EB70 802410A0 08090438 */ j .L802410E0 +/* 97EB74 802410A4 00000000 */ nop +/* 97EB78 802410A8 0280202D */ daddu $a0, $s4, $zero +/* 97EB7C 802410AC 0200282D */ daddu $a1, $s0, $zero +/* 97EB80 802410B0 0C0903AA */ jal func_80240EA8_97E978 +/* 97EB84 802410B4 0260302D */ daddu $a2, $s3, $zero +/* 97EB88 802410B8 0280202D */ daddu $a0, $s4, $zero +/* 97EB8C 802410BC 0200282D */ daddu $a1, $s0, $zero +/* 97EB90 802410C0 0C09022B */ jal func_802408AC_97E37C +/* 97EB94 802410C4 0260302D */ daddu $a2, $s3, $zero +/* 97EB98 802410C8 08090438 */ j .L802410E0 +/* 97EB9C 802410CC 00000000 */ nop +/* 97EBA0 802410D0 0280202D */ daddu $a0, $s4, $zero +/* 97EBA4 802410D4 0200282D */ daddu $a1, $s0, $zero +/* 97EBA8 802410D8 0C0902EB */ jal func_80240BAC_97E67C +/* 97EBAC 802410DC 0260302D */ daddu $a2, $s3, $zero +.L802410E0: +/* 97EBB0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) +/* 97EBB4 802410E4 8FB50044 */ lw $s5, 0x44($sp) +/* 97EBB8 802410E8 8FB40040 */ lw $s4, 0x40($sp) +/* 97EBBC 802410EC 8FB3003C */ lw $s3, 0x3c($sp) +/* 97EBC0 802410F0 8FB20038 */ lw $s2, 0x38($sp) +/* 97EBC4 802410F4 8FB10034 */ lw $s1, 0x34($sp) +/* 97EBC8 802410F8 8FB00030 */ lw $s0, 0x30($sp) +/* 97EBCC 802410FC 0000102D */ daddu $v0, $zero, $zero +/* 97EBD0 80241100 03E00008 */ jr $ra +/* 97EBD4 80241104 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108.s deleted file mode 100644 index dd20e378ed..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241108 -/* 97EBD8 80241108 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 97EBDC 8024110C AFB40030 */ sw $s4, 0x30($sp) -/* 97EBE0 80241110 27B40010 */ addiu $s4, $sp, 0x10 -/* 97EBE4 80241114 AFB3002C */ sw $s3, 0x2c($sp) -/* 97EBE8 80241118 0000982D */ daddu $s3, $zero, $zero -/* 97EBEC 8024111C AFBF0038 */ sw $ra, 0x38($sp) -/* 97EBF0 80241120 AFB50034 */ sw $s5, 0x34($sp) -/* 97EBF4 80241124 AFB20028 */ sw $s2, 0x28($sp) -/* 97EBF8 80241128 AFB10024 */ sw $s1, 0x24($sp) -/* 97EBFC 8024112C AFB00020 */ sw $s0, 0x20($sp) -/* 97EC00 80241130 8C84014C */ lw $a0, 0x14c($a0) -/* 97EC04 80241134 0C00EAD2 */ jal get_npc_safe -/* 97EC08 80241138 24150003 */ addiu $s5, $zero, 3 -/* 97EC0C 8024113C 24040080 */ addiu $a0, $zero, 0x80 -/* 97EC10 80241140 0C00AB39 */ jal heap_malloc -/* 97EC14 80241144 0040882D */ daddu $s1, $v0, $zero -/* 97EC18 80241148 0040902D */ daddu $s2, $v0, $zero -/* 97EC1C 8024114C 3C030035 */ lui $v1, 0x35 -/* 97EC20 80241150 34630002 */ ori $v1, $v1, 2 -/* 97EC24 80241154 2650000C */ addiu $s0, $s2, 0xc -/* 97EC28 80241158 3402814A */ ori $v0, $zero, 0x814a -/* 97EC2C 8024115C AE320020 */ sw $s2, 0x20($s1) -/* 97EC30 80241160 AFA20010 */ sw $v0, 0x10($sp) -/* 97EC34 80241164 AFA30014 */ sw $v1, 0x14($sp) -/* 97EC38 80241168 AFA00018 */ sw $zero, 0x18($sp) -/* 97EC3C 8024116C AFA0001C */ sw $zero, 0x1c($sp) -.L80241170: -/* 97EC40 80241170 0C00E211 */ jal create_basic_npc -/* 97EC44 80241174 0280202D */ daddu $a0, $s4, $zero -/* 97EC48 80241178 0C00E2B7 */ jal get_npc_by_index -/* 97EC4C 8024117C 0040202D */ daddu $a0, $v0, $zero -/* 97EC50 80241180 AE420000 */ sw $v0, ($s2) -/* 97EC54 80241184 C6200038 */ lwc1 $f0, 0x38($s1) -/* 97EC58 80241188 E4400038 */ swc1 $f0, 0x38($v0) -/* 97EC5C 8024118C C620003C */ lwc1 $f0, 0x3c($s1) -/* 97EC60 80241190 0040202D */ daddu $a0, $v0, $zero -/* 97EC64 80241194 E480003C */ swc1 $f0, 0x3c($a0) -/* 97EC68 80241198 C6200040 */ lwc1 $f0, 0x40($s1) -/* 97EC6C 8024119C 26730001 */ addiu $s3, $s3, 1 -/* 97EC70 802411A0 E4800040 */ swc1 $f0, 0x40($a0) -/* 97EC74 802411A4 C620000C */ lwc1 $f0, 0xc($s1) -/* 97EC78 802411A8 26520010 */ addiu $s2, $s2, 0x10 -/* 97EC7C 802411AC A09500AB */ sb $s5, 0xab($a0) -/* 97EC80 802411B0 0C00EAFF */ jal disable_npc_shadow -/* 97EC84 802411B4 E480000C */ swc1 $f0, 0xc($a0) -/* 97EC88 802411B8 AE00FFF8 */ sw $zero, -8($s0) -/* 97EC8C 802411BC AE00FFFC */ sw $zero, -4($s0) -/* 97EC90 802411C0 AE000000 */ sw $zero, ($s0) -/* 97EC94 802411C4 2A620008 */ slti $v0, $s3, 8 -/* 97EC98 802411C8 1440FFE9 */ bnez $v0, .L80241170 -/* 97EC9C 802411CC 26100010 */ addiu $s0, $s0, 0x10 -/* 97ECA0 802411D0 8FBF0038 */ lw $ra, 0x38($sp) -/* 97ECA4 802411D4 8FB50034 */ lw $s5, 0x34($sp) -/* 97ECA8 802411D8 8FB40030 */ lw $s4, 0x30($sp) -/* 97ECAC 802411DC 8FB3002C */ lw $s3, 0x2c($sp) -/* 97ECB0 802411E0 8FB20028 */ lw $s2, 0x28($sp) -/* 97ECB4 802411E4 8FB10024 */ lw $s1, 0x24($sp) -/* 97ECB8 802411E8 8FB00020 */ lw $s0, 0x20($sp) -/* 97ECBC 802411EC 24020002 */ addiu $v0, $zero, 2 -/* 97ECC0 802411F0 03E00008 */ jr $ra -/* 97ECC4 802411F4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s new file mode 100644 index 0000000000..4d03996ada --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241108_97EBD8 +/* 97EBD8 80241108 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 97EBDC 8024110C AFB40030 */ sw $s4, 0x30($sp) +/* 97EBE0 80241110 27B40010 */ addiu $s4, $sp, 0x10 +/* 97EBE4 80241114 AFB3002C */ sw $s3, 0x2c($sp) +/* 97EBE8 80241118 0000982D */ daddu $s3, $zero, $zero +/* 97EBEC 8024111C AFBF0038 */ sw $ra, 0x38($sp) +/* 97EBF0 80241120 AFB50034 */ sw $s5, 0x34($sp) +/* 97EBF4 80241124 AFB20028 */ sw $s2, 0x28($sp) +/* 97EBF8 80241128 AFB10024 */ sw $s1, 0x24($sp) +/* 97EBFC 8024112C AFB00020 */ sw $s0, 0x20($sp) +/* 97EC00 80241130 8C84014C */ lw $a0, 0x14c($a0) +/* 97EC04 80241134 0C00EAD2 */ jal get_npc_safe +/* 97EC08 80241138 24150003 */ addiu $s5, $zero, 3 +/* 97EC0C 8024113C 24040080 */ addiu $a0, $zero, 0x80 +/* 97EC10 80241140 0C00AB39 */ jal heap_malloc +/* 97EC14 80241144 0040882D */ daddu $s1, $v0, $zero +/* 97EC18 80241148 0040902D */ daddu $s2, $v0, $zero +/* 97EC1C 8024114C 3C030035 */ lui $v1, 0x35 +/* 97EC20 80241150 34630002 */ ori $v1, $v1, 2 +/* 97EC24 80241154 2650000C */ addiu $s0, $s2, 0xc +/* 97EC28 80241158 3402814A */ ori $v0, $zero, 0x814a +/* 97EC2C 8024115C AE320020 */ sw $s2, 0x20($s1) +/* 97EC30 80241160 AFA20010 */ sw $v0, 0x10($sp) +/* 97EC34 80241164 AFA30014 */ sw $v1, 0x14($sp) +/* 97EC38 80241168 AFA00018 */ sw $zero, 0x18($sp) +/* 97EC3C 8024116C AFA0001C */ sw $zero, 0x1c($sp) +.L80241170: +/* 97EC40 80241170 0C00E211 */ jal create_basic_npc +/* 97EC44 80241174 0280202D */ daddu $a0, $s4, $zero +/* 97EC48 80241178 0C00E2B7 */ jal get_npc_by_index +/* 97EC4C 8024117C 0040202D */ daddu $a0, $v0, $zero +/* 97EC50 80241180 AE420000 */ sw $v0, ($s2) +/* 97EC54 80241184 C6200038 */ lwc1 $f0, 0x38($s1) +/* 97EC58 80241188 E4400038 */ swc1 $f0, 0x38($v0) +/* 97EC5C 8024118C C620003C */ lwc1 $f0, 0x3c($s1) +/* 97EC60 80241190 0040202D */ daddu $a0, $v0, $zero +/* 97EC64 80241194 E480003C */ swc1 $f0, 0x3c($a0) +/* 97EC68 80241198 C6200040 */ lwc1 $f0, 0x40($s1) +/* 97EC6C 8024119C 26730001 */ addiu $s3, $s3, 1 +/* 97EC70 802411A0 E4800040 */ swc1 $f0, 0x40($a0) +/* 97EC74 802411A4 C620000C */ lwc1 $f0, 0xc($s1) +/* 97EC78 802411A8 26520010 */ addiu $s2, $s2, 0x10 +/* 97EC7C 802411AC A09500AB */ sb $s5, 0xab($a0) +/* 97EC80 802411B0 0C00EAFF */ jal disable_npc_shadow +/* 97EC84 802411B4 E480000C */ swc1 $f0, 0xc($a0) +/* 97EC88 802411B8 AE00FFF8 */ sw $zero, -8($s0) +/* 97EC8C 802411BC AE00FFFC */ sw $zero, -4($s0) +/* 97EC90 802411C0 AE000000 */ sw $zero, ($s0) +/* 97EC94 802411C4 2A620008 */ slti $v0, $s3, 8 +/* 97EC98 802411C8 1440FFE9 */ bnez $v0, .L80241170 +/* 97EC9C 802411CC 26100010 */ addiu $s0, $s0, 0x10 +/* 97ECA0 802411D0 8FBF0038 */ lw $ra, 0x38($sp) +/* 97ECA4 802411D4 8FB50034 */ lw $s5, 0x34($sp) +/* 97ECA8 802411D8 8FB40030 */ lw $s4, 0x30($sp) +/* 97ECAC 802411DC 8FB3002C */ lw $s3, 0x2c($sp) +/* 97ECB0 802411E0 8FB20028 */ lw $s2, 0x28($sp) +/* 97ECB4 802411E4 8FB10024 */ lw $s1, 0x24($sp) +/* 97ECB8 802411E8 8FB00020 */ lw $s0, 0x20($sp) +/* 97ECBC 802411EC 24020002 */ addiu $v0, $zero, 2 +/* 97ECC0 802411F0 03E00008 */ jr $ra +/* 97ECC4 802411F4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8.s deleted file mode 100644 index 87ef7fb931..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8.s +++ /dev/null @@ -1,254 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411F8 -/* 97ECC8 802411F8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 97ECCC 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* 97ECD0 80241200 AFB40030 */ sw $s4, 0x30($sp) -/* 97ECD4 80241204 AFB3002C */ sw $s3, 0x2c($sp) -/* 97ECD8 80241208 AFB20028 */ sw $s2, 0x28($sp) -/* 97ECDC 8024120C AFB10024 */ sw $s1, 0x24($sp) -/* 97ECE0 80241210 AFB00020 */ sw $s0, 0x20($sp) -/* 97ECE4 80241214 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* 97ECE8 80241218 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* 97ECEC 8024121C F7BA0050 */ sdc1 $f26, 0x50($sp) -/* 97ECF0 80241220 F7B80048 */ sdc1 $f24, 0x48($sp) -/* 97ECF4 80241224 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 97ECF8 80241228 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 97ECFC 8024122C 8C820148 */ lw $v0, 0x148($a0) -/* 97ED00 80241230 8C84014C */ lw $a0, 0x14c($a0) -/* 97ED04 80241234 C45A006C */ lwc1 $f26, 0x6c($v0) -/* 97ED08 80241238 0C00EAD2 */ jal get_npc_safe -/* 97ED0C 8024123C 4680D6A0 */ cvt.s.w $f26, $f26 -/* 97ED10 80241240 0040A02D */ daddu $s4, $v0, $zero -/* 97ED14 80241244 8E930020 */ lw $s3, 0x20($s4) -/* 97ED18 80241248 868200A8 */ lh $v0, 0xa8($s4) -/* 97ED1C 8024124C 3C013E4C */ lui $at, 0x3e4c -/* 97ED20 80241250 3421CCCD */ ori $at, $at, 0xcccd -/* 97ED24 80241254 44810000 */ mtc1 $at, $f0 -/* 97ED28 80241258 C6860038 */ lwc1 $f6, 0x38($s4) -/* 97ED2C 8024125C 44821000 */ mtc1 $v0, $f2 -/* 97ED30 80241260 00000000 */ nop -/* 97ED34 80241264 468010A0 */ cvt.s.w $f2, $f2 -/* 97ED38 80241268 46001082 */ mul.s $f2, $f2, $f0 -/* 97ED3C 8024126C 00000000 */ nop -/* 97ED40 80241270 C688003C */ lwc1 $f8, 0x3c($s4) -/* 97ED44 80241274 3C014334 */ lui $at, 0x4334 -/* 97ED48 80241278 44816000 */ mtc1 $at, $f12 -/* 97ED4C 8024127C C6800034 */ lwc1 $f0, 0x34($s4) -/* 97ED50 80241280 C6840040 */ lwc1 $f4, 0x40($s4) -/* 97ED54 80241284 460C0300 */ add.s $f12, $f0, $f12 -/* 97ED58 80241288 E7A60018 */ swc1 $f6, 0x18($sp) -/* 97ED5C 8024128C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 97ED60 80241290 0C00A6C9 */ jal clamp_angle -/* 97ED64 80241294 46024500 */ add.s $f20, $f8, $f2 -/* 97ED68 80241298 868200A6 */ lh $v0, 0xa6($s4) -/* 97ED6C 8024129C 3C013E99 */ lui $at, 0x3e99 -/* 97ED70 802412A0 3421999A */ ori $at, $at, 0x999a -/* 97ED74 802412A4 44812000 */ mtc1 $at, $f4 -/* 97ED78 802412A8 44821000 */ mtc1 $v0, $f2 -/* 97ED7C 802412AC 00000000 */ nop -/* 97ED80 802412B0 468010A0 */ cvt.s.w $f2, $f2 -/* 97ED84 802412B4 46041082 */ mul.s $f2, $f2, $f4 -/* 97ED88 802412B8 00000000 */ nop -/* 97ED8C 802412BC 27A40018 */ addiu $a0, $sp, 0x18 -/* 97ED90 802412C0 44070000 */ mfc1 $a3, $f0 -/* 97ED94 802412C4 44061000 */ mfc1 $a2, $f2 -/* 97ED98 802412C8 0C00A7E7 */ jal add_vec2D_polar -/* 97ED9C 802412CC 27A5001C */ addiu $a1, $sp, 0x1c -/* 97EDA0 802412D0 8E820000 */ lw $v0, ($s4) -/* 97EDA4 802412D4 30420002 */ andi $v0, $v0, 2 -/* 97EDA8 802412D8 1040000D */ beqz $v0, .L80241310 -/* 97EDAC 802412DC 0000902D */ daddu $s2, $zero, $zero -/* 97EDB0 802412E0 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 97EDB4 802412E4 C7A0001C */ lwc1 $f0, 0x1c($sp) -.L802412E8: -/* 97EDB8 802412E8 26520001 */ addiu $s2, $s2, 1 -/* 97EDBC 802412EC 8E700000 */ lw $s0, ($s3) -/* 97EDC0 802412F0 26730010 */ addiu $s3, $s3, 0x10 -/* 97EDC4 802412F4 2A420008 */ slti $v0, $s2, 8 -/* 97EDC8 802412F8 E6020038 */ swc1 $f2, 0x38($s0) -/* 97EDCC 802412FC E614003C */ swc1 $f20, 0x3c($s0) -/* 97EDD0 80241300 1440FFF9 */ bnez $v0, .L802412E8 -/* 97EDD4 80241304 E6000040 */ swc1 $f0, 0x40($s0) -/* 97EDD8 80241308 08090562 */ j .L80241588 -/* 97EDDC 8024130C 0000102D */ daddu $v0, $zero, $zero -.L80241310: -/* 97EDE0 80241310 26710008 */ addiu $s1, $s3, 8 -/* 97EDE4 80241314 3C014024 */ lui $at, 0x4024 -/* 97EDE8 80241318 4481C800 */ mtc1 $at, $f25 -/* 97EDEC 8024131C 4480C000 */ mtc1 $zero, $f24 -/* 97EDF0 80241320 3C013F4C */ lui $at, 0x3f4c -/* 97EDF4 80241324 3421CCCD */ ori $at, $at, 0xcccd -/* 97EDF8 80241328 4481B000 */ mtc1 $at, $f22 -/* 97EDFC 8024132C 3C013F33 */ lui $at, 0x3f33 -/* 97EE00 80241330 34213333 */ ori $at, $at, 0x3333 -/* 97EE04 80241334 4481E000 */ mtc1 $at, $f28 -/* 97EE08 80241338 3C01C120 */ lui $at, 0xc120 -/* 97EE0C 8024133C 4481F000 */ mtc1 $at, $f30 -.L80241340: -/* 97EE10 80241340 8E700000 */ lw $s0, ($s3) -/* 97EE14 80241344 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 97EE18 80241348 E7B40010 */ swc1 $f20, 0x10($sp) -/* 97EE1C 8024134C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 97EE20 80241350 E7A00014 */ swc1 $f0, 0x14($sp) -/* 97EE24 80241354 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97EE28 80241358 C60E003C */ lwc1 $f14, 0x3c($s0) -/* 97EE2C 8024135C 8E060040 */ lw $a2, 0x40($s0) -/* 97EE30 80241360 44071000 */ mfc1 $a3, $f2 -/* 97EE34 80241364 0C00A7CB */ jal dist3D -/* 97EE38 80241368 00000000 */ nop -/* 97EE3C 8024136C 46000021 */ cvt.d.s $f0, $f0 -/* 97EE40 80241370 4620C03E */ c.le.d $f24, $f0 -/* 97EE44 80241374 00000000 */ nop -/* 97EE48 80241378 45000047 */ bc1f .L80241498 -/* 97EE4C 8024137C 00000000 */ nop -/* 97EE50 80241380 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 97EE54 80241384 C7A40018 */ lwc1 $f4, 0x18($sp) -/* 97EE58 80241388 46046301 */ sub.s $f12, $f12, $f4 -/* 97EE5C 8024138C 46166302 */ mul.s $f12, $f12, $f22 -/* 97EE60 80241390 00000000 */ nop -/* 97EE64 80241394 C6000040 */ lwc1 $f0, 0x40($s0) -/* 97EE68 80241398 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 97EE6C 8024139C 46020001 */ sub.s $f0, $f0, $f2 -/* 97EE70 802413A0 46160002 */ mul.s $f0, $f0, $f22 -/* 97EE74 802413A4 00000000 */ nop -/* 97EE78 802413A8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 97EE7C 802413AC E7A20014 */ swc1 $f2, 0x14($sp) -/* 97EE80 802413B0 46020000 */ add.s $f0, $f0, $f2 -/* 97EE84 802413B4 C60E003C */ lwc1 $f14, 0x3c($s0) -/* 97EE88 802413B8 44072000 */ mfc1 $a3, $f4 -/* 97EE8C 802413BC 44060000 */ mfc1 $a2, $f0 -/* 97EE90 802413C0 0C00A7CB */ jal dist3D -/* 97EE94 802413C4 46046300 */ add.s $f12, $f12, $f4 -/* 97EE98 802413C8 C6080038 */ lwc1 $f8, 0x38($s0) -/* 97EE9C 802413CC C7A20018 */ lwc1 $f2, 0x18($sp) -/* 97EEA0 802413D0 46024201 */ sub.s $f8, $f8, $f2 -/* 97EEA4 802413D4 46164202 */ mul.s $f8, $f8, $f22 -/* 97EEA8 802413D8 00000000 */ nop -/* 97EEAC 802413DC C606003C */ lwc1 $f6, 0x3c($s0) -/* 97EEB0 802413E0 46000021 */ cvt.d.s $f0, $f0 -/* 97EEB4 802413E4 46143181 */ sub.s $f6, $f6, $f20 -/* 97EEB8 802413E8 4620C003 */ div.d $f0, $f24, $f0 -/* 97EEBC 802413EC 46200020 */ cvt.s.d $f0, $f0 -/* 97EEC0 802413F0 46003182 */ mul.s $f6, $f6, $f0 -/* 97EEC4 802413F4 00000000 */ nop -/* 97EEC8 802413F8 C6040040 */ lwc1 $f4, 0x40($s0) -/* 97EECC 802413FC C7AA001C */ lwc1 $f10, 0x1c($sp) -/* 97EED0 80241400 460A2101 */ sub.s $f4, $f4, $f10 -/* 97EED4 80241404 46162102 */ mul.s $f4, $f4, $f22 -/* 97EED8 80241408 00000000 */ nop -/* 97EEDC 8024140C 46004202 */ mul.s $f8, $f8, $f0 -/* 97EEE0 80241410 00000000 */ nop -/* 97EEE4 80241414 46002102 */ mul.s $f4, $f4, $f0 -/* 97EEE8 80241418 00000000 */ nop -/* 97EEEC 8024141C 46024200 */ add.s $f8, $f8, $f2 -/* 97EEF0 80241420 C6020038 */ lwc1 $f2, 0x38($s0) -/* 97EEF4 80241424 46024081 */ sub.s $f2, $f8, $f2 -/* 97EEF8 80241428 461C1082 */ mul.s $f2, $f2, $f28 -/* 97EEFC 8024142C 00000000 */ nop -/* 97EF00 80241430 4606A500 */ add.s $f20, $f20, $f6 -/* 97EF04 80241434 E622FFFC */ swc1 $f2, -4($s1) -/* 97EF08 80241438 C602003C */ lwc1 $f2, 0x3c($s0) -/* 97EF0C 8024143C 4602A081 */ sub.s $f2, $f20, $f2 -/* 97EF10 80241440 461C1082 */ mul.s $f2, $f2, $f28 -/* 97EF14 80241444 00000000 */ nop -/* 97EF18 80241448 460A2100 */ add.s $f4, $f4, $f10 -/* 97EF1C 8024144C E6220000 */ swc1 $f2, ($s1) -/* 97EF20 80241450 C6000040 */ lwc1 $f0, 0x40($s0) -/* 97EF24 80241454 46002001 */ sub.s $f0, $f4, $f0 -/* 97EF28 80241458 461C0002 */ mul.s $f0, $f0, $f28 -/* 97EF2C 8024145C 00000000 */ nop -/* 97EF30 80241460 3C014120 */ lui $at, 0x4120 -/* 97EF34 80241464 44818000 */ mtc1 $at, $f16 -/* 97EF38 80241468 E6200004 */ swc1 $f0, 4($s1) -/* 97EF3C 8024146C E6080038 */ swc1 $f8, 0x38($s0) -/* 97EF40 80241470 E614003C */ swc1 $f20, 0x3c($s0) -/* 97EF44 80241474 E6040040 */ swc1 $f4, 0x40($s0) -/* 97EF48 80241478 C6200000 */ lwc1 $f0, ($s1) -/* 97EF4C 8024147C E7A80018 */ swc1 $f8, 0x18($sp) -/* 97EF50 80241480 4600803C */ c.lt.s $f16, $f0 -/* 97EF54 80241484 00000000 */ nop -/* 97EF58 80241488 45000016 */ bc1f .L802414E4 -/* 97EF5C 8024148C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 97EF60 80241490 08090539 */ j .L802414E4 -/* 97EF64 80241494 E6300000 */ swc1 $f16, ($s1) -.L80241498: -/* 97EF68 80241498 C622FFFC */ lwc1 $f2, -4($s1) -/* 97EF6C 8024149C 3C013F66 */ lui $at, 0x3f66 -/* 97EF70 802414A0 34216666 */ ori $at, $at, 0x6666 -/* 97EF74 802414A4 44818000 */ mtc1 $at, $f16 -/* 97EF78 802414A8 00000000 */ nop -/* 97EF7C 802414AC 46101082 */ mul.s $f2, $f2, $f16 -/* 97EF80 802414B0 00000000 */ nop -/* 97EF84 802414B4 C6200004 */ lwc1 $f0, 4($s1) -/* 97EF88 802414B8 46100002 */ mul.s $f0, $f0, $f16 -/* 97EF8C 802414BC 00000000 */ nop -/* 97EF90 802414C0 E622FFFC */ swc1 $f2, -4($s1) -/* 97EF94 802414C4 E6200004 */ swc1 $f0, 4($s1) -/* 97EF98 802414C8 C6000038 */ lwc1 $f0, 0x38($s0) -/* 97EF9C 802414CC 46020000 */ add.s $f0, $f0, $f2 -/* 97EFA0 802414D0 E6000038 */ swc1 $f0, 0x38($s0) -/* 97EFA4 802414D4 C6000040 */ lwc1 $f0, 0x40($s0) -/* 97EFA8 802414D8 C6220004 */ lwc1 $f2, 4($s1) -/* 97EFAC 802414DC 46020000 */ add.s $f0, $f0, $f2 -/* 97EFB0 802414E0 E6000040 */ swc1 $f0, 0x40($s0) -.L802414E4: -/* 97EFB4 802414E4 C6220000 */ lwc1 $f2, ($s1) -/* 97EFB8 802414E8 3C013F80 */ lui $at, 0x3f80 -/* 97EFBC 802414EC 44810000 */ mtc1 $at, $f0 -/* 97EFC0 802414F0 00000000 */ nop -/* 97EFC4 802414F4 46001081 */ sub.s $f2, $f2, $f0 -/* 97EFC8 802414F8 461E103C */ c.lt.s $f2, $f30 -/* 97EFCC 802414FC 00000000 */ nop -/* 97EFD0 80241500 45000002 */ bc1f .L8024150C -/* 97EFD4 80241504 E6220000 */ swc1 $f2, ($s1) -/* 97EFD8 80241508 E63E0000 */ swc1 $f30, ($s1) -.L8024150C: -/* 97EFDC 8024150C C602003C */ lwc1 $f2, 0x3c($s0) -/* 97EFE0 80241510 C6200000 */ lwc1 $f0, ($s1) -/* 97EFE4 80241514 46001080 */ add.s $f2, $f2, $f0 -/* 97EFE8 80241518 461A103E */ c.le.s $f2, $f26 -/* 97EFEC 8024151C 00000000 */ nop -/* 97EFF0 80241520 4500000C */ bc1f .L80241554 -/* 97EFF4 80241524 E602003C */ swc1 $f2, 0x3c($s0) -/* 97EFF8 80241528 E61A003C */ swc1 $f26, 0x3c($s0) -/* 97EFFC 8024152C C6200000 */ lwc1 $f0, ($s1) -/* 97F000 80241530 3C013FE0 */ lui $at, 0x3fe0 -/* 97F004 80241534 44811800 */ mtc1 $at, $f3 -/* 97F008 80241538 44801000 */ mtc1 $zero, $f2 -/* 97F00C 8024153C 46000007 */ neg.s $f0, $f0 -/* 97F010 80241540 46000021 */ cvt.d.s $f0, $f0 -/* 97F014 80241544 46220002 */ mul.d $f0, $f0, $f2 -/* 97F018 80241548 00000000 */ nop -/* 97F01C 8024154C 46200020 */ cvt.s.d $f0, $f0 -/* 97F020 80241550 E6200000 */ swc1 $f0, ($s1) -.L80241554: -/* 97F024 80241554 26520001 */ addiu $s2, $s2, 1 -/* 97F028 80241558 26310010 */ addiu $s1, $s1, 0x10 -/* 97F02C 8024155C C614003C */ lwc1 $f20, 0x3c($s0) -/* 97F030 80241560 C6000038 */ lwc1 $f0, 0x38($s0) -/* 97F034 80241564 C6020040 */ lwc1 $f2, 0x40($s0) -/* 97F038 80241568 8E820000 */ lw $v0, ($s4) -/* 97F03C 8024156C E7A00018 */ swc1 $f0, 0x18($sp) -/* 97F040 80241570 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 97F044 80241574 AE020000 */ sw $v0, ($s0) -/* 97F048 80241578 2A420008 */ slti $v0, $s2, 8 -/* 97F04C 8024157C 1440FF70 */ bnez $v0, .L80241340 -/* 97F050 80241580 26730010 */ addiu $s3, $s3, 0x10 -/* 97F054 80241584 0000102D */ daddu $v0, $zero, $zero -.L80241588: -/* 97F058 80241588 8FBF0034 */ lw $ra, 0x34($sp) -/* 97F05C 8024158C 8FB40030 */ lw $s4, 0x30($sp) -/* 97F060 80241590 8FB3002C */ lw $s3, 0x2c($sp) -/* 97F064 80241594 8FB20028 */ lw $s2, 0x28($sp) -/* 97F068 80241598 8FB10024 */ lw $s1, 0x24($sp) -/* 97F06C 8024159C 8FB00020 */ lw $s0, 0x20($sp) -/* 97F070 802415A0 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* 97F074 802415A4 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* 97F078 802415A8 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* 97F07C 802415AC D7B80048 */ ldc1 $f24, 0x48($sp) -/* 97F080 802415B0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 97F084 802415B4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 97F088 802415B8 03E00008 */ jr $ra -/* 97F08C 802415BC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8_97ECC8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8_97ECC8.s new file mode 100644 index 0000000000..0305dd7a53 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802411F8_97ECC8.s @@ -0,0 +1,254 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411F8_97ECC8 +/* 97ECC8 802411F8 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 97ECCC 802411FC AFBF0034 */ sw $ra, 0x34($sp) +/* 97ECD0 80241200 AFB40030 */ sw $s4, 0x30($sp) +/* 97ECD4 80241204 AFB3002C */ sw $s3, 0x2c($sp) +/* 97ECD8 80241208 AFB20028 */ sw $s2, 0x28($sp) +/* 97ECDC 8024120C AFB10024 */ sw $s1, 0x24($sp) +/* 97ECE0 80241210 AFB00020 */ sw $s0, 0x20($sp) +/* 97ECE4 80241214 F7BE0060 */ sdc1 $f30, 0x60($sp) +/* 97ECE8 80241218 F7BC0058 */ sdc1 $f28, 0x58($sp) +/* 97ECEC 8024121C F7BA0050 */ sdc1 $f26, 0x50($sp) +/* 97ECF0 80241220 F7B80048 */ sdc1 $f24, 0x48($sp) +/* 97ECF4 80241224 F7B60040 */ sdc1 $f22, 0x40($sp) +/* 97ECF8 80241228 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 97ECFC 8024122C 8C820148 */ lw $v0, 0x148($a0) +/* 97ED00 80241230 8C84014C */ lw $a0, 0x14c($a0) +/* 97ED04 80241234 C45A006C */ lwc1 $f26, 0x6c($v0) +/* 97ED08 80241238 0C00EAD2 */ jal get_npc_safe +/* 97ED0C 8024123C 4680D6A0 */ cvt.s.w $f26, $f26 +/* 97ED10 80241240 0040A02D */ daddu $s4, $v0, $zero +/* 97ED14 80241244 8E930020 */ lw $s3, 0x20($s4) +/* 97ED18 80241248 868200A8 */ lh $v0, 0xa8($s4) +/* 97ED1C 8024124C 3C013E4C */ lui $at, 0x3e4c +/* 97ED20 80241250 3421CCCD */ ori $at, $at, 0xcccd +/* 97ED24 80241254 44810000 */ mtc1 $at, $f0 +/* 97ED28 80241258 C6860038 */ lwc1 $f6, 0x38($s4) +/* 97ED2C 8024125C 44821000 */ mtc1 $v0, $f2 +/* 97ED30 80241260 00000000 */ nop +/* 97ED34 80241264 468010A0 */ cvt.s.w $f2, $f2 +/* 97ED38 80241268 46001082 */ mul.s $f2, $f2, $f0 +/* 97ED3C 8024126C 00000000 */ nop +/* 97ED40 80241270 C688003C */ lwc1 $f8, 0x3c($s4) +/* 97ED44 80241274 3C014334 */ lui $at, 0x4334 +/* 97ED48 80241278 44816000 */ mtc1 $at, $f12 +/* 97ED4C 8024127C C6800034 */ lwc1 $f0, 0x34($s4) +/* 97ED50 80241280 C6840040 */ lwc1 $f4, 0x40($s4) +/* 97ED54 80241284 460C0300 */ add.s $f12, $f0, $f12 +/* 97ED58 80241288 E7A60018 */ swc1 $f6, 0x18($sp) +/* 97ED5C 8024128C E7A4001C */ swc1 $f4, 0x1c($sp) +/* 97ED60 80241290 0C00A6C9 */ jal clamp_angle +/* 97ED64 80241294 46024500 */ add.s $f20, $f8, $f2 +/* 97ED68 80241298 868200A6 */ lh $v0, 0xa6($s4) +/* 97ED6C 8024129C 3C013E99 */ lui $at, 0x3e99 +/* 97ED70 802412A0 3421999A */ ori $at, $at, 0x999a +/* 97ED74 802412A4 44812000 */ mtc1 $at, $f4 +/* 97ED78 802412A8 44821000 */ mtc1 $v0, $f2 +/* 97ED7C 802412AC 00000000 */ nop +/* 97ED80 802412B0 468010A0 */ cvt.s.w $f2, $f2 +/* 97ED84 802412B4 46041082 */ mul.s $f2, $f2, $f4 +/* 97ED88 802412B8 00000000 */ nop +/* 97ED8C 802412BC 27A40018 */ addiu $a0, $sp, 0x18 +/* 97ED90 802412C0 44070000 */ mfc1 $a3, $f0 +/* 97ED94 802412C4 44061000 */ mfc1 $a2, $f2 +/* 97ED98 802412C8 0C00A7E7 */ jal add_vec2D_polar +/* 97ED9C 802412CC 27A5001C */ addiu $a1, $sp, 0x1c +/* 97EDA0 802412D0 8E820000 */ lw $v0, ($s4) +/* 97EDA4 802412D4 30420002 */ andi $v0, $v0, 2 +/* 97EDA8 802412D8 1040000D */ beqz $v0, .L80241310 +/* 97EDAC 802412DC 0000902D */ daddu $s2, $zero, $zero +/* 97EDB0 802412E0 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 97EDB4 802412E4 C7A0001C */ lwc1 $f0, 0x1c($sp) +.L802412E8: +/* 97EDB8 802412E8 26520001 */ addiu $s2, $s2, 1 +/* 97EDBC 802412EC 8E700000 */ lw $s0, ($s3) +/* 97EDC0 802412F0 26730010 */ addiu $s3, $s3, 0x10 +/* 97EDC4 802412F4 2A420008 */ slti $v0, $s2, 8 +/* 97EDC8 802412F8 E6020038 */ swc1 $f2, 0x38($s0) +/* 97EDCC 802412FC E614003C */ swc1 $f20, 0x3c($s0) +/* 97EDD0 80241300 1440FFF9 */ bnez $v0, .L802412E8 +/* 97EDD4 80241304 E6000040 */ swc1 $f0, 0x40($s0) +/* 97EDD8 80241308 08090562 */ j .L80241588 +/* 97EDDC 8024130C 0000102D */ daddu $v0, $zero, $zero +.L80241310: +/* 97EDE0 80241310 26710008 */ addiu $s1, $s3, 8 +/* 97EDE4 80241314 3C014024 */ lui $at, 0x4024 +/* 97EDE8 80241318 4481C800 */ mtc1 $at, $f25 +/* 97EDEC 8024131C 4480C000 */ mtc1 $zero, $f24 +/* 97EDF0 80241320 3C013F4C */ lui $at, 0x3f4c +/* 97EDF4 80241324 3421CCCD */ ori $at, $at, 0xcccd +/* 97EDF8 80241328 4481B000 */ mtc1 $at, $f22 +/* 97EDFC 8024132C 3C013F33 */ lui $at, 0x3f33 +/* 97EE00 80241330 34213333 */ ori $at, $at, 0x3333 +/* 97EE04 80241334 4481E000 */ mtc1 $at, $f28 +/* 97EE08 80241338 3C01C120 */ lui $at, 0xc120 +/* 97EE0C 8024133C 4481F000 */ mtc1 $at, $f30 +.L80241340: +/* 97EE10 80241340 8E700000 */ lw $s0, ($s3) +/* 97EE14 80241344 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 97EE18 80241348 E7B40010 */ swc1 $f20, 0x10($sp) +/* 97EE1C 8024134C C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 97EE20 80241350 E7A00014 */ swc1 $f0, 0x14($sp) +/* 97EE24 80241354 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 97EE28 80241358 C60E003C */ lwc1 $f14, 0x3c($s0) +/* 97EE2C 8024135C 8E060040 */ lw $a2, 0x40($s0) +/* 97EE30 80241360 44071000 */ mfc1 $a3, $f2 +/* 97EE34 80241364 0C00A7CB */ jal dist3D +/* 97EE38 80241368 00000000 */ nop +/* 97EE3C 8024136C 46000021 */ cvt.d.s $f0, $f0 +/* 97EE40 80241370 4620C03E */ c.le.d $f24, $f0 +/* 97EE44 80241374 00000000 */ nop +/* 97EE48 80241378 45000047 */ bc1f .L80241498 +/* 97EE4C 8024137C 00000000 */ nop +/* 97EE50 80241380 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 97EE54 80241384 C7A40018 */ lwc1 $f4, 0x18($sp) +/* 97EE58 80241388 46046301 */ sub.s $f12, $f12, $f4 +/* 97EE5C 8024138C 46166302 */ mul.s $f12, $f12, $f22 +/* 97EE60 80241390 00000000 */ nop +/* 97EE64 80241394 C6000040 */ lwc1 $f0, 0x40($s0) +/* 97EE68 80241398 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* 97EE6C 8024139C 46020001 */ sub.s $f0, $f0, $f2 +/* 97EE70 802413A0 46160002 */ mul.s $f0, $f0, $f22 +/* 97EE74 802413A4 00000000 */ nop +/* 97EE78 802413A8 E7B40010 */ swc1 $f20, 0x10($sp) +/* 97EE7C 802413AC E7A20014 */ swc1 $f2, 0x14($sp) +/* 97EE80 802413B0 46020000 */ add.s $f0, $f0, $f2 +/* 97EE84 802413B4 C60E003C */ lwc1 $f14, 0x3c($s0) +/* 97EE88 802413B8 44072000 */ mfc1 $a3, $f4 +/* 97EE8C 802413BC 44060000 */ mfc1 $a2, $f0 +/* 97EE90 802413C0 0C00A7CB */ jal dist3D +/* 97EE94 802413C4 46046300 */ add.s $f12, $f12, $f4 +/* 97EE98 802413C8 C6080038 */ lwc1 $f8, 0x38($s0) +/* 97EE9C 802413CC C7A20018 */ lwc1 $f2, 0x18($sp) +/* 97EEA0 802413D0 46024201 */ sub.s $f8, $f8, $f2 +/* 97EEA4 802413D4 46164202 */ mul.s $f8, $f8, $f22 +/* 97EEA8 802413D8 00000000 */ nop +/* 97EEAC 802413DC C606003C */ lwc1 $f6, 0x3c($s0) +/* 97EEB0 802413E0 46000021 */ cvt.d.s $f0, $f0 +/* 97EEB4 802413E4 46143181 */ sub.s $f6, $f6, $f20 +/* 97EEB8 802413E8 4620C003 */ div.d $f0, $f24, $f0 +/* 97EEBC 802413EC 46200020 */ cvt.s.d $f0, $f0 +/* 97EEC0 802413F0 46003182 */ mul.s $f6, $f6, $f0 +/* 97EEC4 802413F4 00000000 */ nop +/* 97EEC8 802413F8 C6040040 */ lwc1 $f4, 0x40($s0) +/* 97EECC 802413FC C7AA001C */ lwc1 $f10, 0x1c($sp) +/* 97EED0 80241400 460A2101 */ sub.s $f4, $f4, $f10 +/* 97EED4 80241404 46162102 */ mul.s $f4, $f4, $f22 +/* 97EED8 80241408 00000000 */ nop +/* 97EEDC 8024140C 46004202 */ mul.s $f8, $f8, $f0 +/* 97EEE0 80241410 00000000 */ nop +/* 97EEE4 80241414 46002102 */ mul.s $f4, $f4, $f0 +/* 97EEE8 80241418 00000000 */ nop +/* 97EEEC 8024141C 46024200 */ add.s $f8, $f8, $f2 +/* 97EEF0 80241420 C6020038 */ lwc1 $f2, 0x38($s0) +/* 97EEF4 80241424 46024081 */ sub.s $f2, $f8, $f2 +/* 97EEF8 80241428 461C1082 */ mul.s $f2, $f2, $f28 +/* 97EEFC 8024142C 00000000 */ nop +/* 97EF00 80241430 4606A500 */ add.s $f20, $f20, $f6 +/* 97EF04 80241434 E622FFFC */ swc1 $f2, -4($s1) +/* 97EF08 80241438 C602003C */ lwc1 $f2, 0x3c($s0) +/* 97EF0C 8024143C 4602A081 */ sub.s $f2, $f20, $f2 +/* 97EF10 80241440 461C1082 */ mul.s $f2, $f2, $f28 +/* 97EF14 80241444 00000000 */ nop +/* 97EF18 80241448 460A2100 */ add.s $f4, $f4, $f10 +/* 97EF1C 8024144C E6220000 */ swc1 $f2, ($s1) +/* 97EF20 80241450 C6000040 */ lwc1 $f0, 0x40($s0) +/* 97EF24 80241454 46002001 */ sub.s $f0, $f4, $f0 +/* 97EF28 80241458 461C0002 */ mul.s $f0, $f0, $f28 +/* 97EF2C 8024145C 00000000 */ nop +/* 97EF30 80241460 3C014120 */ lui $at, 0x4120 +/* 97EF34 80241464 44818000 */ mtc1 $at, $f16 +/* 97EF38 80241468 E6200004 */ swc1 $f0, 4($s1) +/* 97EF3C 8024146C E6080038 */ swc1 $f8, 0x38($s0) +/* 97EF40 80241470 E614003C */ swc1 $f20, 0x3c($s0) +/* 97EF44 80241474 E6040040 */ swc1 $f4, 0x40($s0) +/* 97EF48 80241478 C6200000 */ lwc1 $f0, ($s1) +/* 97EF4C 8024147C E7A80018 */ swc1 $f8, 0x18($sp) +/* 97EF50 80241480 4600803C */ c.lt.s $f16, $f0 +/* 97EF54 80241484 00000000 */ nop +/* 97EF58 80241488 45000016 */ bc1f .L802414E4 +/* 97EF5C 8024148C E7A4001C */ swc1 $f4, 0x1c($sp) +/* 97EF60 80241490 08090539 */ j .L802414E4 +/* 97EF64 80241494 E6300000 */ swc1 $f16, ($s1) +.L80241498: +/* 97EF68 80241498 C622FFFC */ lwc1 $f2, -4($s1) +/* 97EF6C 8024149C 3C013F66 */ lui $at, 0x3f66 +/* 97EF70 802414A0 34216666 */ ori $at, $at, 0x6666 +/* 97EF74 802414A4 44818000 */ mtc1 $at, $f16 +/* 97EF78 802414A8 00000000 */ nop +/* 97EF7C 802414AC 46101082 */ mul.s $f2, $f2, $f16 +/* 97EF80 802414B0 00000000 */ nop +/* 97EF84 802414B4 C6200004 */ lwc1 $f0, 4($s1) +/* 97EF88 802414B8 46100002 */ mul.s $f0, $f0, $f16 +/* 97EF8C 802414BC 00000000 */ nop +/* 97EF90 802414C0 E622FFFC */ swc1 $f2, -4($s1) +/* 97EF94 802414C4 E6200004 */ swc1 $f0, 4($s1) +/* 97EF98 802414C8 C6000038 */ lwc1 $f0, 0x38($s0) +/* 97EF9C 802414CC 46020000 */ add.s $f0, $f0, $f2 +/* 97EFA0 802414D0 E6000038 */ swc1 $f0, 0x38($s0) +/* 97EFA4 802414D4 C6000040 */ lwc1 $f0, 0x40($s0) +/* 97EFA8 802414D8 C6220004 */ lwc1 $f2, 4($s1) +/* 97EFAC 802414DC 46020000 */ add.s $f0, $f0, $f2 +/* 97EFB0 802414E0 E6000040 */ swc1 $f0, 0x40($s0) +.L802414E4: +/* 97EFB4 802414E4 C6220000 */ lwc1 $f2, ($s1) +/* 97EFB8 802414E8 3C013F80 */ lui $at, 0x3f80 +/* 97EFBC 802414EC 44810000 */ mtc1 $at, $f0 +/* 97EFC0 802414F0 00000000 */ nop +/* 97EFC4 802414F4 46001081 */ sub.s $f2, $f2, $f0 +/* 97EFC8 802414F8 461E103C */ c.lt.s $f2, $f30 +/* 97EFCC 802414FC 00000000 */ nop +/* 97EFD0 80241500 45000002 */ bc1f .L8024150C +/* 97EFD4 80241504 E6220000 */ swc1 $f2, ($s1) +/* 97EFD8 80241508 E63E0000 */ swc1 $f30, ($s1) +.L8024150C: +/* 97EFDC 8024150C C602003C */ lwc1 $f2, 0x3c($s0) +/* 97EFE0 80241510 C6200000 */ lwc1 $f0, ($s1) +/* 97EFE4 80241514 46001080 */ add.s $f2, $f2, $f0 +/* 97EFE8 80241518 461A103E */ c.le.s $f2, $f26 +/* 97EFEC 8024151C 00000000 */ nop +/* 97EFF0 80241520 4500000C */ bc1f .L80241554 +/* 97EFF4 80241524 E602003C */ swc1 $f2, 0x3c($s0) +/* 97EFF8 80241528 E61A003C */ swc1 $f26, 0x3c($s0) +/* 97EFFC 8024152C C6200000 */ lwc1 $f0, ($s1) +/* 97F000 80241530 3C013FE0 */ lui $at, 0x3fe0 +/* 97F004 80241534 44811800 */ mtc1 $at, $f3 +/* 97F008 80241538 44801000 */ mtc1 $zero, $f2 +/* 97F00C 8024153C 46000007 */ neg.s $f0, $f0 +/* 97F010 80241540 46000021 */ cvt.d.s $f0, $f0 +/* 97F014 80241544 46220002 */ mul.d $f0, $f0, $f2 +/* 97F018 80241548 00000000 */ nop +/* 97F01C 8024154C 46200020 */ cvt.s.d $f0, $f0 +/* 97F020 80241550 E6200000 */ swc1 $f0, ($s1) +.L80241554: +/* 97F024 80241554 26520001 */ addiu $s2, $s2, 1 +/* 97F028 80241558 26310010 */ addiu $s1, $s1, 0x10 +/* 97F02C 8024155C C614003C */ lwc1 $f20, 0x3c($s0) +/* 97F030 80241560 C6000038 */ lwc1 $f0, 0x38($s0) +/* 97F034 80241564 C6020040 */ lwc1 $f2, 0x40($s0) +/* 97F038 80241568 8E820000 */ lw $v0, ($s4) +/* 97F03C 8024156C E7A00018 */ swc1 $f0, 0x18($sp) +/* 97F040 80241570 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 97F044 80241574 AE020000 */ sw $v0, ($s0) +/* 97F048 80241578 2A420008 */ slti $v0, $s2, 8 +/* 97F04C 8024157C 1440FF70 */ bnez $v0, .L80241340 +/* 97F050 80241580 26730010 */ addiu $s3, $s3, 0x10 +/* 97F054 80241584 0000102D */ daddu $v0, $zero, $zero +.L80241588: +/* 97F058 80241588 8FBF0034 */ lw $ra, 0x34($sp) +/* 97F05C 8024158C 8FB40030 */ lw $s4, 0x30($sp) +/* 97F060 80241590 8FB3002C */ lw $s3, 0x2c($sp) +/* 97F064 80241594 8FB20028 */ lw $s2, 0x28($sp) +/* 97F068 80241598 8FB10024 */ lw $s1, 0x24($sp) +/* 97F06C 8024159C 8FB00020 */ lw $s0, 0x20($sp) +/* 97F070 802415A0 D7BE0060 */ ldc1 $f30, 0x60($sp) +/* 97F074 802415A4 D7BC0058 */ ldc1 $f28, 0x58($sp) +/* 97F078 802415A8 D7BA0050 */ ldc1 $f26, 0x50($sp) +/* 97F07C 802415AC D7B80048 */ ldc1 $f24, 0x48($sp) +/* 97F080 802415B0 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 97F084 802415B4 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 97F088 802415B8 03E00008 */ jr $ra +/* 97F08C 802415BC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0.s deleted file mode 100644 index 27deeb5947..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415C0 -/* 97F090 802415C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97F094 802415C4 AFBF0018 */ sw $ra, 0x18($sp) -/* 97F098 802415C8 AFB10014 */ sw $s1, 0x14($sp) -/* 97F09C 802415CC AFB00010 */ sw $s0, 0x10($sp) -/* 97F0A0 802415D0 8C84014C */ lw $a0, 0x14c($a0) -/* 97F0A4 802415D4 0C00EAD2 */ jal get_npc_safe -/* 97F0A8 802415D8 0000882D */ daddu $s1, $zero, $zero -/* 97F0AC 802415DC 8C500020 */ lw $s0, 0x20($v0) -.L802415E0: -/* 97F0B0 802415E0 8E040000 */ lw $a0, ($s0) -/* 97F0B4 802415E4 26310001 */ addiu $s1, $s1, 1 -/* 97F0B8 802415E8 0C00E273 */ jal free_npc -/* 97F0BC 802415EC 26100010 */ addiu $s0, $s0, 0x10 -/* 97F0C0 802415F0 2A220008 */ slti $v0, $s1, 8 -/* 97F0C4 802415F4 1440FFFA */ bnez $v0, .L802415E0 -/* 97F0C8 802415F8 24020002 */ addiu $v0, $zero, 2 -/* 97F0CC 802415FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 97F0D0 80241600 8FB10014 */ lw $s1, 0x14($sp) -/* 97F0D4 80241604 8FB00010 */ lw $s0, 0x10($sp) -/* 97F0D8 80241608 03E00008 */ jr $ra -/* 97F0DC 8024160C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0_97F090.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0_97F090.s new file mode 100644 index 0000000000..d2dbce2e4c --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0_97F090.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415C0_97F090 +/* 97F090 802415C0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 97F094 802415C4 AFBF0018 */ sw $ra, 0x18($sp) +/* 97F098 802415C8 AFB10014 */ sw $s1, 0x14($sp) +/* 97F09C 802415CC AFB00010 */ sw $s0, 0x10($sp) +/* 97F0A0 802415D0 8C84014C */ lw $a0, 0x14c($a0) +/* 97F0A4 802415D4 0C00EAD2 */ jal get_npc_safe +/* 97F0A8 802415D8 0000882D */ daddu $s1, $zero, $zero +/* 97F0AC 802415DC 8C500020 */ lw $s0, 0x20($v0) +.L802415E0: +/* 97F0B0 802415E0 8E040000 */ lw $a0, ($s0) +/* 97F0B4 802415E4 26310001 */ addiu $s1, $s1, 1 +/* 97F0B8 802415E8 0C00E273 */ jal free_npc +/* 97F0BC 802415EC 26100010 */ addiu $s0, $s0, 0x10 +/* 97F0C0 802415F0 2A220008 */ slti $v0, $s1, 8 +/* 97F0C4 802415F4 1440FFFA */ bnez $v0, .L802415E0 +/* 97F0C8 802415F8 24020002 */ addiu $v0, $zero, 2 +/* 97F0CC 802415FC 8FBF0018 */ lw $ra, 0x18($sp) +/* 97F0D0 80241600 8FB10014 */ lw $s1, 0x14($sp) +/* 97F0D4 80241604 8FB00010 */ lw $s0, 0x10($sp) +/* 97F0D8 80241608 03E00008 */ jr $ra +/* 97F0DC 8024160C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610.s deleted file mode 100644 index 631033d3cd..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610.s +++ /dev/null @@ -1,331 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241610 -/* 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, 0x800a -/* 97F0F0 80241620 26F7A66C */ addiu $s7, $s7, -0x5994 -/* 97F0F4 80241624 34420008 */ ori $v0, $v0, 8 -/* 97F0F8 80241628 AFBF00F4 */ sw $ra, 0xf4($sp) -/* 97F0FC 8024162C AFBE00F0 */ sw $fp, 0xf0($sp) -/* 97F100 80241630 AFB600E8 */ sw $s6, 0xe8($sp) -/* 97F104 80241634 AFB500E4 */ sw $s5, 0xe4($sp) -/* 97F108 80241638 AFB400E0 */ sw $s4, 0xe0($sp) -/* 97F10C 8024163C AFB300DC */ sw $s3, 0xdc($sp) -/* 97F110 80241640 AFB200D8 */ sw $s2, 0xd8($sp) -/* 97F114 80241644 AFB100D4 */ sw $s1, 0xd4($sp) -/* 97F118 80241648 AFB000D0 */ sw $s0, 0xd0($sp) -/* 97F11C 8024164C F7B60100 */ sdc1 $f22, 0x100($sp) -/* 97F120 80241650 F7B400F8 */ sdc1 $f20, 0xf8($sp) -/* 97F124 80241654 8EE50000 */ lw $a1, ($s7) -/* 97F128 80241658 3C168007 */ lui $s6, %hi(gCurrentCameraID) -/* 97F12C 8024165C 26D67410 */ addiu $s6, $s6, %lo(gCurrentCameraID) -/* 97F130 80241660 00A0202D */ daddu $a0, $a1, $zero -/* 97F134 80241664 24A50008 */ addiu $a1, $a1, 8 -/* 97F138 80241668 AEE50000 */ sw $a1, ($s7) -/* 97F13C 8024166C AC820000 */ sw $v0, ($a0) -/* 97F140 80241670 8EC30000 */ lw $v1, ($s6) -/* 97F144 80241674 3C18800B */ lui $t8, %hi(gCameras) -/* 97F148 80241678 27181D80 */ addiu $t8, $t8, %lo(gCameras) -/* 97F14C 8024167C 00031080 */ sll $v0, $v1, 2 -/* 97F150 80241680 00431021 */ addu $v0, $v0, $v1 -/* 97F154 80241684 00021080 */ sll $v0, $v0, 2 -/* 97F158 80241688 00431023 */ subu $v0, $v0, $v1 -/* 97F15C 8024168C 000218C0 */ sll $v1, $v0, 3 -/* 97F160 80241690 00431021 */ addu $v0, $v0, $v1 -/* 97F164 80241694 000210C0 */ sll $v0, $v0, 3 -/* 97F168 80241698 00583021 */ addu $a2, $v0, $t8 -/* 97F16C 8024169C 24C200A0 */ addiu $v0, $a2, 0xa0 -/* 97F170 802416A0 AC820004 */ sw $v0, 4($a0) -/* 97F174 802416A4 94C20000 */ lhu $v0, ($a2) -/* 97F178 802416A8 3C1E8024 */ lui $fp, 0x8024 -/* 97F17C 802416AC 27DE2614 */ addiu $fp, $fp, 0x2614 -/* 97F180 802416B0 30420010 */ andi $v0, $v0, 0x10 -/* 97F184 802416B4 14400007 */ bnez $v0, .L802416D4 -/* 97F188 802416B8 24C400D4 */ addiu $a0, $a2, 0xd4 -/* 97F18C 802416BC 3C02DB0E */ lui $v0, 0xdb0e -/* 97F190 802416C0 ACA20000 */ sw $v0, ($a1) -/* 97F194 802416C4 94C30038 */ lhu $v1, 0x38($a2) -/* 97F198 802416C8 24A20008 */ addiu $v0, $a1, 8 -/* 97F19C 802416CC AEE20000 */ sw $v0, ($s7) -/* 97F1A0 802416D0 ACA30004 */ sw $v1, 4($a1) -.L802416D4: -/* 97F1A4 802416D4 3C180001 */ lui $t8, 1 -/* 97F1A8 802416D8 3C12800A */ lui $s2, 0x800a -/* 97F1AC 802416DC 2652A674 */ addiu $s2, $s2, -0x598c -/* 97F1B0 802416E0 AFB800C8 */ sw $t8, 0xc8($sp) -/* 97F1B4 802416E4 8EC50000 */ lw $a1, ($s6) -/* 97F1B8 802416E8 8E420000 */ lw $v0, ($s2) -/* 97F1BC 802416EC 00052980 */ sll $a1, $a1, 6 -/* 97F1C0 802416F0 24A50030 */ addiu $a1, $a1, 0x30 -/* 97F1C4 802416F4 0C019D40 */ jal guMtxF2L -/* 97F1C8 802416F8 00452821 */ addu $a1, $v0, $a1 -/* 97F1CC 802416FC 3C03DA38 */ lui $v1, 0xda38 -/* 97F1D0 80241700 34630007 */ ori $v1, $v1, 7 -/* 97F1D4 80241704 3C07E300 */ lui $a3, 0xe300 -/* 97F1D8 80241708 34E70A01 */ ori $a3, $a3, 0xa01 -/* 97F1DC 8024170C 3C08D9C0 */ lui $t0, 0xd9c0 -/* 97F1E0 80241710 3508F9FB */ ori $t0, $t0, 0xf9fb -/* 97F1E4 80241714 3C0AD9FF */ lui $t2, 0xd9ff -/* 97F1E8 80241718 354AFFFF */ ori $t2, $t2, 0xffff -/* 97F1EC 8024171C 3C090020 */ lui $t1, 0x20 -/* 97F1F0 80241720 35290005 */ ori $t1, $t1, 5 -/* 97F1F4 80241724 3C0BD700 */ lui $t3, 0xd700 -/* 97F1F8 80241728 356B0002 */ ori $t3, $t3, 2 -/* 97F1FC 8024172C 3C0CE300 */ lui $t4, 0xe300 -/* 97F200 80241730 358C0F00 */ ori $t4, $t4, 0xf00 -/* 97F204 80241734 3C0DE300 */ lui $t5, 0xe300 -/* 97F208 80241738 35AD0C00 */ ori $t5, $t5, 0xc00 -/* 97F20C 8024173C 3C0EE300 */ lui $t6, 0xe300 -/* 97F210 80241740 35CE1201 */ ori $t6, $t6, 0x1201 -/* 97F214 80241744 3C0FE300 */ lui $t7, 0xe300 -/* 97F218 80241748 35EF1801 */ ori $t7, $t7, 0x1801 -/* 97F21C 8024174C 3C10E300 */ lui $s0, 0xe300 -/* 97F220 80241750 36100D01 */ ori $s0, $s0, 0xd01 -/* 97F224 80241754 3C13E300 */ lui $s3, 0xe300 -/* 97F228 80241758 36731402 */ ori $s3, $s3, 0x1402 -/* 97F22C 8024175C 3C14E300 */ lui $s4, 0xe300 -/* 97F230 80241760 36941700 */ ori $s4, $s4, 0x1700 -/* 97F234 80241764 3C15E200 */ lui $s5, 0xe200 -/* 97F238 80241768 36B51E01 */ ori $s5, $s5, 0x1e01 -/* 97F23C 8024176C 27B10048 */ addiu $s1, $sp, 0x48 -/* 97F240 80241770 0220202D */ daddu $a0, $s1, $zero -/* 97F244 80241774 8EE20000 */ lw $v0, ($s7) -/* 97F248 80241778 8EC50000 */ lw $a1, ($s6) -/* 97F24C 8024177C 0040302D */ daddu $a2, $v0, $zero -/* 97F250 80241780 24420008 */ addiu $v0, $v0, 8 -/* 97F254 80241784 00052980 */ sll $a1, $a1, 6 -/* 97F258 80241788 AEE20000 */ sw $v0, ($s7) -/* 97F25C 8024178C ACC30000 */ sw $v1, ($a2) -/* 97F260 80241790 8E430000 */ lw $v1, ($s2) -/* 97F264 80241794 24A50030 */ addiu $a1, $a1, 0x30 -/* 97F268 80241798 00651821 */ addu $v1, $v1, $a1 -/* 97F26C 8024179C ACC30004 */ sw $v1, 4($a2) -/* 97F270 802417A0 24430008 */ addiu $v1, $v0, 8 -/* 97F274 802417A4 AEE30000 */ sw $v1, ($s7) -/* 97F278 802417A8 3C03E700 */ lui $v1, 0xe700 -/* 97F27C 802417AC AC430000 */ sw $v1, ($v0) -/* 97F280 802417B0 24430010 */ addiu $v1, $v0, 0x10 -/* 97F284 802417B4 AC400004 */ sw $zero, 4($v0) -/* 97F288 802417B8 AEE30000 */ sw $v1, ($s7) -/* 97F28C 802417BC 24430018 */ addiu $v1, $v0, 0x18 -/* 97F290 802417C0 AC470008 */ sw $a3, 8($v0) -/* 97F294 802417C4 AC40000C */ sw $zero, 0xc($v0) -/* 97F298 802417C8 AEE30000 */ sw $v1, ($s7) -/* 97F29C 802417CC 24430020 */ addiu $v1, $v0, 0x20 -/* 97F2A0 802417D0 AC480010 */ sw $t0, 0x10($v0) -/* 97F2A4 802417D4 AC400014 */ sw $zero, 0x14($v0) -/* 97F2A8 802417D8 AEE30000 */ sw $v1, ($s7) -/* 97F2AC 802417DC 24430028 */ addiu $v1, $v0, 0x28 -/* 97F2B0 802417E0 AC4A0018 */ sw $t2, 0x18($v0) -/* 97F2B4 802417E4 AC49001C */ sw $t1, 0x1c($v0) -/* 97F2B8 802417E8 AEE30000 */ sw $v1, ($s7) -/* 97F2BC 802417EC 2403FFFF */ addiu $v1, $zero, -1 -/* 97F2C0 802417F0 AC430024 */ sw $v1, 0x24($v0) -/* 97F2C4 802417F4 24430030 */ addiu $v1, $v0, 0x30 -/* 97F2C8 802417F8 AC4B0020 */ sw $t3, 0x20($v0) -/* 97F2CC 802417FC AEE30000 */ sw $v1, ($s7) -/* 97F2D0 80241800 24430038 */ addiu $v1, $v0, 0x38 -/* 97F2D4 80241804 AC4C0028 */ sw $t4, 0x28($v0) -/* 97F2D8 80241808 AC40002C */ sw $zero, 0x2c($v0) -/* 97F2DC 8024180C AEE30000 */ sw $v1, ($s7) -/* 97F2E0 80241810 3C030008 */ lui $v1, 8 -/* 97F2E4 80241814 AC430034 */ sw $v1, 0x34($v0) -/* 97F2E8 80241818 24430040 */ addiu $v1, $v0, 0x40 -/* 97F2EC 8024181C AC4D0030 */ sw $t5, 0x30($v0) -/* 97F2F0 80241820 AEE30000 */ sw $v1, ($s7) -/* 97F2F4 80241824 24032000 */ addiu $v1, $zero, 0x2000 -/* 97F2F8 80241828 AC43003C */ sw $v1, 0x3c($v0) -/* 97F2FC 8024182C 24430048 */ addiu $v1, $v0, 0x48 -/* 97F300 80241830 AC4E0038 */ sw $t6, 0x38($v0) -/* 97F304 80241834 AEE30000 */ sw $v1, ($s7) -/* 97F308 80241838 240300C0 */ addiu $v1, $zero, 0xc0 -/* 97F30C 8024183C AC430044 */ sw $v1, 0x44($v0) -/* 97F310 80241840 24430050 */ addiu $v1, $v0, 0x50 -/* 97F314 80241844 AC4F0040 */ sw $t7, 0x40($v0) -/* 97F318 80241848 AEE30000 */ sw $v1, ($s7) -/* 97F31C 8024184C 24030C00 */ addiu $v1, $zero, 0xc00 -/* 97F320 80241850 AC500048 */ sw $s0, 0x48($v0) -/* 97F324 80241854 AC40004C */ sw $zero, 0x4c($v0) -/* 97F328 80241858 AC530050 */ sw $s3, 0x50($v0) -/* 97F32C 8024185C AC430054 */ sw $v1, 0x54($v0) -/* 97F330 80241860 AC540058 */ sw $s4, 0x58($v0) -/* 97F334 80241864 AC40005C */ sw $zero, 0x5c($v0) -/* 97F338 80241868 AC550060 */ sw $s5, 0x60($v0) -/* 97F33C 8024186C AC400064 */ sw $zero, 0x64($v0) -/* 97F340 80241870 8FC50010 */ lw $a1, 0x10($fp) -/* 97F344 80241874 8FC60014 */ lw $a2, 0x14($fp) -/* 97F348 80241878 8FC70018 */ lw $a3, 0x18($fp) -/* 97F34C 8024187C 24430058 */ addiu $v1, $v0, 0x58 -/* 97F350 80241880 AEE30000 */ sw $v1, ($s7) -/* 97F354 80241884 24430060 */ addiu $v1, $v0, 0x60 -/* 97F358 80241888 24420068 */ addiu $v0, $v0, 0x68 -/* 97F35C 8024188C AEE30000 */ sw $v1, ($s7) -/* 97F360 80241890 0C019E40 */ jal guTranslateF -/* 97F364 80241894 AEE20000 */ sw $v0, ($s7) -/* 97F368 80241898 27B00088 */ addiu $s0, $sp, 0x88 -/* 97F36C 8024189C 8FB800C8 */ lw $t8, 0xc8($sp) -/* 97F370 802418A0 8EC30000 */ lw $v1, ($s6) -/* 97F374 802418A4 37181630 */ ori $t8, $t8, 0x1630 -/* 97F378 802418A8 00031080 */ sll $v0, $v1, 2 -/* 97F37C 802418AC 00431021 */ addu $v0, $v0, $v1 -/* 97F380 802418B0 00021080 */ sll $v0, $v0, 2 -/* 97F384 802418B4 00431023 */ subu $v0, $v0, $v1 -/* 97F388 802418B8 000218C0 */ sll $v1, $v0, 3 -/* 97F38C 802418BC 00431021 */ addu $v0, $v0, $v1 -/* 97F390 802418C0 000210C0 */ sll $v0, $v0, 3 -/* 97F394 802418C4 AFB800C8 */ sw $t8, 0xc8($sp) -/* 97F398 802418C8 3C18800B */ lui $t8, %hi(gCameras) -/* 97F39C 802418CC 27181D80 */ addiu $t8, $t8, %lo(gCameras) -/* 97F3A0 802418D0 00581021 */ addu $v0, $v0, $t8 -/* 97F3A4 802418D4 C7C00020 */ lwc1 $f0, 0x20($fp) -/* 97F3A8 802418D8 C442006C */ lwc1 $f2, 0x6c($v0) -/* 97F3AC 802418DC 4480A000 */ mtc1 $zero, $f20 -/* 97F3B0 802418E0 46020000 */ add.s $f0, $f0, $f2 -/* 97F3B4 802418E4 C7C20034 */ lwc1 $f2, 0x34($fp) -/* 97F3B8 802418E8 3C013F80 */ lui $at, 0x3f80 -/* 97F3BC 802418EC 4481B000 */ mtc1 $at, $f22 -/* 97F3C0 802418F0 46020000 */ add.s $f0, $f0, $f2 -/* 97F3C4 802418F4 4406A000 */ mfc1 $a2, $f20 -/* 97F3C8 802418F8 4407B000 */ mfc1 $a3, $f22 -/* 97F3CC 802418FC 44050000 */ mfc1 $a1, $f0 -/* 97F3D0 80241900 0200202D */ daddu $a0, $s0, $zero -/* 97F3D4 80241904 0C019EC8 */ jal guRotateF -/* 97F3D8 80241908 E7B40010 */ swc1 $f20, 0x10($sp) -/* 97F3DC 8024190C 0200202D */ daddu $a0, $s0, $zero -/* 97F3E0 80241910 0220282D */ daddu $a1, $s1, $zero -/* 97F3E4 80241914 0C019D80 */ jal guMtxCatF -/* 97F3E8 80241918 0220302D */ daddu $a2, $s1, $zero -/* 97F3EC 8024191C 8FC50024 */ lw $a1, 0x24($fp) -/* 97F3F0 80241920 4406A000 */ mfc1 $a2, $f20 -/* 97F3F4 80241924 4407A000 */ mfc1 $a3, $f20 -/* 97F3F8 80241928 0200202D */ daddu $a0, $s0, $zero -/* 97F3FC 8024192C 0C019EC8 */ jal guRotateF -/* 97F400 80241930 E7B60010 */ swc1 $f22, 0x10($sp) -/* 97F404 80241934 0200202D */ daddu $a0, $s0, $zero -/* 97F408 80241938 0220282D */ daddu $a1, $s1, $zero -/* 97F40C 8024193C 0C019D80 */ jal guMtxCatF -/* 97F410 80241940 0220302D */ daddu $a2, $s1, $zero -/* 97F414 80241944 8FC5001C */ lw $a1, 0x1c($fp) -/* 97F418 80241948 4406B000 */ mfc1 $a2, $f22 -/* 97F41C 8024194C 4407A000 */ mfc1 $a3, $f20 -/* 97F420 80241950 0200202D */ daddu $a0, $s0, $zero -/* 97F424 80241954 0C019EC8 */ jal guRotateF -/* 97F428 80241958 AFA70010 */ sw $a3, 0x10($sp) -/* 97F42C 8024195C 0200202D */ daddu $a0, $s0, $zero -/* 97F430 80241960 0220282D */ daddu $a1, $s1, $zero -/* 97F434 80241964 0C019D80 */ jal guMtxCatF -/* 97F438 80241968 0220302D */ daddu $a2, $s1, $zero -/* 97F43C 8024196C 8FC50028 */ lw $a1, 0x28($fp) -/* 97F440 80241970 8FC6002C */ lw $a2, 0x2c($fp) -/* 97F444 80241974 8FC70030 */ lw $a3, 0x30($fp) -/* 97F448 80241978 0C019DF0 */ jal guScaleF -/* 97F44C 8024197C 0200202D */ daddu $a0, $s0, $zero -/* 97F450 80241980 0200202D */ daddu $a0, $s0, $zero -/* 97F454 80241984 0220282D */ daddu $a1, $s1, $zero -/* 97F458 80241988 0C019D80 */ jal guMtxCatF -/* 97F45C 8024198C 0220302D */ daddu $a2, $s1, $zero -/* 97F460 80241990 3C108007 */ lui $s0, 0x8007 -/* 97F464 80241994 261041F0 */ addiu $s0, $s0, 0x41f0 -/* 97F468 80241998 0220202D */ daddu $a0, $s1, $zero -/* 97F46C 8024199C 96050000 */ lhu $a1, ($s0) -/* 97F470 802419A0 8E420000 */ lw $v0, ($s2) -/* 97F474 802419A4 8FB800C8 */ lw $t8, 0xc8($sp) -/* 97F478 802419A8 00052980 */ sll $a1, $a1, 6 -/* 97F47C 802419AC 00B82821 */ addu $a1, $a1, $t8 -/* 97F480 802419B0 0C019D40 */ jal guMtxF2L -/* 97F484 802419B4 00452821 */ addu $a1, $v0, $a1 -/* 97F488 802419B8 3C02DA38 */ lui $v0, 0xda38 -/* 97F48C 802419BC 34420002 */ ori $v0, $v0, 2 -/* 97F490 802419C0 27A40038 */ addiu $a0, $sp, 0x38 -/* 97F494 802419C4 8EE70000 */ lw $a3, ($s7) -/* 97F498 802419C8 96080000 */ lhu $t0, ($s0) -/* 97F49C 802419CC 00E0282D */ daddu $a1, $a3, $zero -/* 97F4A0 802419D0 ACA20000 */ sw $v0, ($a1) -/* 97F4A4 802419D4 3102FFFF */ andi $v0, $t0, 0xffff -/* 97F4A8 802419D8 00021180 */ sll $v0, $v0, 6 -/* 97F4AC 802419DC 24E70008 */ addiu $a3, $a3, 8 -/* 97F4B0 802419E0 8FB800C8 */ lw $t8, 0xc8($sp) -/* 97F4B4 802419E4 8E430000 */ lw $v1, ($s2) -/* 97F4B8 802419E8 00581021 */ addu $v0, $v0, $t8 -/* 97F4BC 802419EC 00621821 */ addu $v1, $v1, $v0 -/* 97F4C0 802419F0 3C028000 */ lui $v0, 0x8000 -/* 97F4C4 802419F4 00621821 */ addu $v1, $v1, $v0 -/* 97F4C8 802419F8 ACA30004 */ sw $v1, 4($a1) -/* 97F4CC 802419FC 8FC50008 */ lw $a1, 8($fp) -/* 97F4D0 80241A00 8FC6000C */ lw $a2, 0xc($fp) -/* 97F4D4 80241A04 25080001 */ addiu $t0, $t0, 1 -/* 97F4D8 80241A08 AEE70000 */ sw $a3, ($s7) -/* 97F4DC 80241A0C 0C0B7A76 */ jal func_802DE9D8 -/* 97F4E0 80241A10 A6080000 */ sh $t0, ($s0) -/* 97F4E4 80241A14 24050007 */ addiu $a1, $zero, 7 -/* 97F4E8 80241A18 240600FF */ addiu $a2, $zero, 0xff -/* 97F4EC 80241A1C 8FC40000 */ lw $a0, ($fp) -/* 97F4F0 80241A20 8FA30038 */ lw $v1, 0x38($sp) -/* 97F4F4 80241A24 8FA9003C */ lw $t1, 0x3c($sp) -/* 97F4F8 80241A28 97A80042 */ lhu $t0, 0x42($sp) -/* 97F4FC 80241A2C 00C0102D */ daddu $v0, $a2, $zero -/* 97F500 80241A30 A3A20030 */ sb $v0, 0x30($sp) -/* 97F504 80241A34 A7A80028 */ sh $t0, 0x28($sp) -/* 97F508 80241A38 3108FFFF */ andi $t0, $t0, 0xffff -/* 97F50C 80241A3C AFA30020 */ sw $v1, 0x20($sp) -/* 97F510 80241A40 97A30046 */ lhu $v1, 0x46($sp) -/* 97F514 80241A44 44880000 */ mtc1 $t0, $f0 -/* 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) -/* 97F528 80241A58 8FA20040 */ lw $v0, 0x40($sp) -/* 97F52C 80241A5C 00C0382D */ daddu $a3, $a2, $zero -/* 97F530 80241A60 A7A3002A */ sh $v1, 0x2a($sp) -/* 97F534 80241A64 3063FFFF */ andi $v1, $v1, 0xffff -/* 97F538 80241A68 44830000 */ mtc1 $v1, $f0 -/* 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 -/* 97F54C 80241A7C 00021043 */ sra $v0, $v0, 1 -/* 97F550 80241A80 E7C00040 */ swc1 $f0, 0x40($fp) -/* 97F554 80241A84 8FA30044 */ lw $v1, 0x44($sp) -/* 97F558 80241A88 00021023 */ negu $v0, $v0 -/* 97F55C 80241A8C A7A2002C */ sh $v0, 0x2c($sp) -/* 97F560 80241A90 000317C2 */ srl $v0, $v1, 0x1f -/* 97F564 80241A94 00621821 */ addu $v1, $v1, $v0 -/* 97F568 80241A98 00031843 */ sra $v1, $v1, 1 -/* 97F56C 80241A9C A7A3002E */ sh $v1, 0x2e($sp) -/* 97F570 80241AA0 8FC30038 */ lw $v1, 0x38($fp) -/* 97F574 80241AA4 00C0102D */ daddu $v0, $a2, $zero -/* 97F578 80241AA8 AFA20010 */ sw $v0, 0x10($sp) -/* 97F57C 80241AAC AFA00018 */ sw $zero, 0x18($sp) -/* 97F580 80241AB0 0C04EAA7 */ jal func_8013AA9C -/* 97F584 80241AB4 AFA30014 */ sw $v1, 0x14($sp) -/* 97F588 80241AB8 27A50020 */ addiu $a1, $sp, 0x20 -/* 97F58C 80241ABC 0000302D */ daddu $a2, $zero, $zero -/* 97F590 80241AC0 8FC40000 */ lw $a0, ($fp) -/* 97F594 80241AC4 0C04EBDC */ jal func_8013AF70 -/* 97F598 80241AC8 0220382D */ daddu $a3, $s1, $zero -/* 97F59C 80241ACC 3C04D838 */ lui $a0, 0xd838 -/* 97F5A0 80241AD0 8EE20000 */ lw $v0, ($s7) -/* 97F5A4 80241AD4 34840002 */ ori $a0, $a0, 2 -/* 97F5A8 80241AD8 0040182D */ daddu $v1, $v0, $zero -/* 97F5AC 80241ADC 24420008 */ addiu $v0, $v0, 8 -/* 97F5B0 80241AE0 AEE20000 */ sw $v0, ($s7) -/* 97F5B4 80241AE4 24020040 */ addiu $v0, $zero, 0x40 -/* 97F5B8 80241AE8 AC640000 */ sw $a0, ($v1) -/* 97F5BC 80241AEC AC620004 */ sw $v0, 4($v1) -/* 97F5C0 80241AF0 8FBF00F4 */ lw $ra, 0xf4($sp) -/* 97F5C4 80241AF4 8FBE00F0 */ lw $fp, 0xf0($sp) -/* 97F5C8 80241AF8 8FB700EC */ lw $s7, 0xec($sp) -/* 97F5CC 80241AFC 8FB600E8 */ lw $s6, 0xe8($sp) -/* 97F5D0 80241B00 8FB500E4 */ lw $s5, 0xe4($sp) -/* 97F5D4 80241B04 8FB400E0 */ lw $s4, 0xe0($sp) -/* 97F5D8 80241B08 8FB300DC */ lw $s3, 0xdc($sp) -/* 97F5DC 80241B0C 8FB200D8 */ lw $s2, 0xd8($sp) -/* 97F5E0 80241B10 8FB100D4 */ lw $s1, 0xd4($sp) -/* 97F5E4 80241B14 8FB000D0 */ lw $s0, 0xd0($sp) -/* 97F5E8 80241B18 D7B60100 */ ldc1 $f22, 0x100($sp) -/* 97F5EC 80241B1C D7B400F8 */ ldc1 $f20, 0xf8($sp) -/* 97F5F0 80241B20 03E00008 */ jr $ra -/* 97F5F4 80241B24 27BD0108 */ addiu $sp, $sp, 0x108 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 new file mode 100644 index 0000000000..96f0b225b0 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241610_97F0E0.s @@ -0,0 +1,331 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +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, 0x800a +/* 97F0F0 80241620 26F7A66C */ addiu $s7, $s7, -0x5994 +/* 97F0F4 80241624 34420008 */ ori $v0, $v0, 8 +/* 97F0F8 80241628 AFBF00F4 */ sw $ra, 0xf4($sp) +/* 97F0FC 8024162C AFBE00F0 */ sw $fp, 0xf0($sp) +/* 97F100 80241630 AFB600E8 */ sw $s6, 0xe8($sp) +/* 97F104 80241634 AFB500E4 */ sw $s5, 0xe4($sp) +/* 97F108 80241638 AFB400E0 */ sw $s4, 0xe0($sp) +/* 97F10C 8024163C AFB300DC */ sw $s3, 0xdc($sp) +/* 97F110 80241640 AFB200D8 */ sw $s2, 0xd8($sp) +/* 97F114 80241644 AFB100D4 */ sw $s1, 0xd4($sp) +/* 97F118 80241648 AFB000D0 */ sw $s0, 0xd0($sp) +/* 97F11C 8024164C F7B60100 */ sdc1 $f22, 0x100($sp) +/* 97F120 80241650 F7B400F8 */ sdc1 $f20, 0xf8($sp) +/* 97F124 80241654 8EE50000 */ lw $a1, ($s7) +/* 97F128 80241658 3C168007 */ lui $s6, %hi(gCurrentCameraID) +/* 97F12C 8024165C 26D67410 */ addiu $s6, $s6, %lo(gCurrentCameraID) +/* 97F130 80241660 00A0202D */ daddu $a0, $a1, $zero +/* 97F134 80241664 24A50008 */ addiu $a1, $a1, 8 +/* 97F138 80241668 AEE50000 */ sw $a1, ($s7) +/* 97F13C 8024166C AC820000 */ sw $v0, ($a0) +/* 97F140 80241670 8EC30000 */ lw $v1, ($s6) +/* 97F144 80241674 3C18800B */ lui $t8, %hi(gCameras) +/* 97F148 80241678 27181D80 */ addiu $t8, $t8, %lo(gCameras) +/* 97F14C 8024167C 00031080 */ sll $v0, $v1, 2 +/* 97F150 80241680 00431021 */ addu $v0, $v0, $v1 +/* 97F154 80241684 00021080 */ sll $v0, $v0, 2 +/* 97F158 80241688 00431023 */ subu $v0, $v0, $v1 +/* 97F15C 8024168C 000218C0 */ sll $v1, $v0, 3 +/* 97F160 80241690 00431021 */ addu $v0, $v0, $v1 +/* 97F164 80241694 000210C0 */ sll $v0, $v0, 3 +/* 97F168 80241698 00583021 */ addu $a2, $v0, $t8 +/* 97F16C 8024169C 24C200A0 */ addiu $v0, $a2, 0xa0 +/* 97F170 802416A0 AC820004 */ sw $v0, 4($a0) +/* 97F174 802416A4 94C20000 */ lhu $v0, ($a2) +/* 97F178 802416A8 3C1E8024 */ lui $fp, 0x8024 +/* 97F17C 802416AC 27DE2614 */ addiu $fp, $fp, 0x2614 +/* 97F180 802416B0 30420010 */ andi $v0, $v0, 0x10 +/* 97F184 802416B4 14400007 */ bnez $v0, .L802416D4 +/* 97F188 802416B8 24C400D4 */ addiu $a0, $a2, 0xd4 +/* 97F18C 802416BC 3C02DB0E */ lui $v0, 0xdb0e +/* 97F190 802416C0 ACA20000 */ sw $v0, ($a1) +/* 97F194 802416C4 94C30038 */ lhu $v1, 0x38($a2) +/* 97F198 802416C8 24A20008 */ addiu $v0, $a1, 8 +/* 97F19C 802416CC AEE20000 */ sw $v0, ($s7) +/* 97F1A0 802416D0 ACA30004 */ sw $v1, 4($a1) +.L802416D4: +/* 97F1A4 802416D4 3C180001 */ lui $t8, 1 +/* 97F1A8 802416D8 3C12800A */ lui $s2, 0x800a +/* 97F1AC 802416DC 2652A674 */ addiu $s2, $s2, -0x598c +/* 97F1B0 802416E0 AFB800C8 */ sw $t8, 0xc8($sp) +/* 97F1B4 802416E4 8EC50000 */ lw $a1, ($s6) +/* 97F1B8 802416E8 8E420000 */ lw $v0, ($s2) +/* 97F1BC 802416EC 00052980 */ sll $a1, $a1, 6 +/* 97F1C0 802416F0 24A50030 */ addiu $a1, $a1, 0x30 +/* 97F1C4 802416F4 0C019D40 */ jal guMtxF2L +/* 97F1C8 802416F8 00452821 */ addu $a1, $v0, $a1 +/* 97F1CC 802416FC 3C03DA38 */ lui $v1, 0xda38 +/* 97F1D0 80241700 34630007 */ ori $v1, $v1, 7 +/* 97F1D4 80241704 3C07E300 */ lui $a3, 0xe300 +/* 97F1D8 80241708 34E70A01 */ ori $a3, $a3, 0xa01 +/* 97F1DC 8024170C 3C08D9C0 */ lui $t0, 0xd9c0 +/* 97F1E0 80241710 3508F9FB */ ori $t0, $t0, 0xf9fb +/* 97F1E4 80241714 3C0AD9FF */ lui $t2, 0xd9ff +/* 97F1E8 80241718 354AFFFF */ ori $t2, $t2, 0xffff +/* 97F1EC 8024171C 3C090020 */ lui $t1, 0x20 +/* 97F1F0 80241720 35290005 */ ori $t1, $t1, 5 +/* 97F1F4 80241724 3C0BD700 */ lui $t3, 0xd700 +/* 97F1F8 80241728 356B0002 */ ori $t3, $t3, 2 +/* 97F1FC 8024172C 3C0CE300 */ lui $t4, 0xe300 +/* 97F200 80241730 358C0F00 */ ori $t4, $t4, 0xf00 +/* 97F204 80241734 3C0DE300 */ lui $t5, 0xe300 +/* 97F208 80241738 35AD0C00 */ ori $t5, $t5, 0xc00 +/* 97F20C 8024173C 3C0EE300 */ lui $t6, 0xe300 +/* 97F210 80241740 35CE1201 */ ori $t6, $t6, 0x1201 +/* 97F214 80241744 3C0FE300 */ lui $t7, 0xe300 +/* 97F218 80241748 35EF1801 */ ori $t7, $t7, 0x1801 +/* 97F21C 8024174C 3C10E300 */ lui $s0, 0xe300 +/* 97F220 80241750 36100D01 */ ori $s0, $s0, 0xd01 +/* 97F224 80241754 3C13E300 */ lui $s3, 0xe300 +/* 97F228 80241758 36731402 */ ori $s3, $s3, 0x1402 +/* 97F22C 8024175C 3C14E300 */ lui $s4, 0xe300 +/* 97F230 80241760 36941700 */ ori $s4, $s4, 0x1700 +/* 97F234 80241764 3C15E200 */ lui $s5, 0xe200 +/* 97F238 80241768 36B51E01 */ ori $s5, $s5, 0x1e01 +/* 97F23C 8024176C 27B10048 */ addiu $s1, $sp, 0x48 +/* 97F240 80241770 0220202D */ daddu $a0, $s1, $zero +/* 97F244 80241774 8EE20000 */ lw $v0, ($s7) +/* 97F248 80241778 8EC50000 */ lw $a1, ($s6) +/* 97F24C 8024177C 0040302D */ daddu $a2, $v0, $zero +/* 97F250 80241780 24420008 */ addiu $v0, $v0, 8 +/* 97F254 80241784 00052980 */ sll $a1, $a1, 6 +/* 97F258 80241788 AEE20000 */ sw $v0, ($s7) +/* 97F25C 8024178C ACC30000 */ sw $v1, ($a2) +/* 97F260 80241790 8E430000 */ lw $v1, ($s2) +/* 97F264 80241794 24A50030 */ addiu $a1, $a1, 0x30 +/* 97F268 80241798 00651821 */ addu $v1, $v1, $a1 +/* 97F26C 8024179C ACC30004 */ sw $v1, 4($a2) +/* 97F270 802417A0 24430008 */ addiu $v1, $v0, 8 +/* 97F274 802417A4 AEE30000 */ sw $v1, ($s7) +/* 97F278 802417A8 3C03E700 */ lui $v1, 0xe700 +/* 97F27C 802417AC AC430000 */ sw $v1, ($v0) +/* 97F280 802417B0 24430010 */ addiu $v1, $v0, 0x10 +/* 97F284 802417B4 AC400004 */ sw $zero, 4($v0) +/* 97F288 802417B8 AEE30000 */ sw $v1, ($s7) +/* 97F28C 802417BC 24430018 */ addiu $v1, $v0, 0x18 +/* 97F290 802417C0 AC470008 */ sw $a3, 8($v0) +/* 97F294 802417C4 AC40000C */ sw $zero, 0xc($v0) +/* 97F298 802417C8 AEE30000 */ sw $v1, ($s7) +/* 97F29C 802417CC 24430020 */ addiu $v1, $v0, 0x20 +/* 97F2A0 802417D0 AC480010 */ sw $t0, 0x10($v0) +/* 97F2A4 802417D4 AC400014 */ sw $zero, 0x14($v0) +/* 97F2A8 802417D8 AEE30000 */ sw $v1, ($s7) +/* 97F2AC 802417DC 24430028 */ addiu $v1, $v0, 0x28 +/* 97F2B0 802417E0 AC4A0018 */ sw $t2, 0x18($v0) +/* 97F2B4 802417E4 AC49001C */ sw $t1, 0x1c($v0) +/* 97F2B8 802417E8 AEE30000 */ sw $v1, ($s7) +/* 97F2BC 802417EC 2403FFFF */ addiu $v1, $zero, -1 +/* 97F2C0 802417F0 AC430024 */ sw $v1, 0x24($v0) +/* 97F2C4 802417F4 24430030 */ addiu $v1, $v0, 0x30 +/* 97F2C8 802417F8 AC4B0020 */ sw $t3, 0x20($v0) +/* 97F2CC 802417FC AEE30000 */ sw $v1, ($s7) +/* 97F2D0 80241800 24430038 */ addiu $v1, $v0, 0x38 +/* 97F2D4 80241804 AC4C0028 */ sw $t4, 0x28($v0) +/* 97F2D8 80241808 AC40002C */ sw $zero, 0x2c($v0) +/* 97F2DC 8024180C AEE30000 */ sw $v1, ($s7) +/* 97F2E0 80241810 3C030008 */ lui $v1, 8 +/* 97F2E4 80241814 AC430034 */ sw $v1, 0x34($v0) +/* 97F2E8 80241818 24430040 */ addiu $v1, $v0, 0x40 +/* 97F2EC 8024181C AC4D0030 */ sw $t5, 0x30($v0) +/* 97F2F0 80241820 AEE30000 */ sw $v1, ($s7) +/* 97F2F4 80241824 24032000 */ addiu $v1, $zero, 0x2000 +/* 97F2F8 80241828 AC43003C */ sw $v1, 0x3c($v0) +/* 97F2FC 8024182C 24430048 */ addiu $v1, $v0, 0x48 +/* 97F300 80241830 AC4E0038 */ sw $t6, 0x38($v0) +/* 97F304 80241834 AEE30000 */ sw $v1, ($s7) +/* 97F308 80241838 240300C0 */ addiu $v1, $zero, 0xc0 +/* 97F30C 8024183C AC430044 */ sw $v1, 0x44($v0) +/* 97F310 80241840 24430050 */ addiu $v1, $v0, 0x50 +/* 97F314 80241844 AC4F0040 */ sw $t7, 0x40($v0) +/* 97F318 80241848 AEE30000 */ sw $v1, ($s7) +/* 97F31C 8024184C 24030C00 */ addiu $v1, $zero, 0xc00 +/* 97F320 80241850 AC500048 */ sw $s0, 0x48($v0) +/* 97F324 80241854 AC40004C */ sw $zero, 0x4c($v0) +/* 97F328 80241858 AC530050 */ sw $s3, 0x50($v0) +/* 97F32C 8024185C AC430054 */ sw $v1, 0x54($v0) +/* 97F330 80241860 AC540058 */ sw $s4, 0x58($v0) +/* 97F334 80241864 AC40005C */ sw $zero, 0x5c($v0) +/* 97F338 80241868 AC550060 */ sw $s5, 0x60($v0) +/* 97F33C 8024186C AC400064 */ sw $zero, 0x64($v0) +/* 97F340 80241870 8FC50010 */ lw $a1, 0x10($fp) +/* 97F344 80241874 8FC60014 */ lw $a2, 0x14($fp) +/* 97F348 80241878 8FC70018 */ lw $a3, 0x18($fp) +/* 97F34C 8024187C 24430058 */ addiu $v1, $v0, 0x58 +/* 97F350 80241880 AEE30000 */ sw $v1, ($s7) +/* 97F354 80241884 24430060 */ addiu $v1, $v0, 0x60 +/* 97F358 80241888 24420068 */ addiu $v0, $v0, 0x68 +/* 97F35C 8024188C AEE30000 */ sw $v1, ($s7) +/* 97F360 80241890 0C019E40 */ jal guTranslateF +/* 97F364 80241894 AEE20000 */ sw $v0, ($s7) +/* 97F368 80241898 27B00088 */ addiu $s0, $sp, 0x88 +/* 97F36C 8024189C 8FB800C8 */ lw $t8, 0xc8($sp) +/* 97F370 802418A0 8EC30000 */ lw $v1, ($s6) +/* 97F374 802418A4 37181630 */ ori $t8, $t8, 0x1630 +/* 97F378 802418A8 00031080 */ sll $v0, $v1, 2 +/* 97F37C 802418AC 00431021 */ addu $v0, $v0, $v1 +/* 97F380 802418B0 00021080 */ sll $v0, $v0, 2 +/* 97F384 802418B4 00431023 */ subu $v0, $v0, $v1 +/* 97F388 802418B8 000218C0 */ sll $v1, $v0, 3 +/* 97F38C 802418BC 00431021 */ addu $v0, $v0, $v1 +/* 97F390 802418C0 000210C0 */ sll $v0, $v0, 3 +/* 97F394 802418C4 AFB800C8 */ sw $t8, 0xc8($sp) +/* 97F398 802418C8 3C18800B */ lui $t8, %hi(gCameras) +/* 97F39C 802418CC 27181D80 */ addiu $t8, $t8, %lo(gCameras) +/* 97F3A0 802418D0 00581021 */ addu $v0, $v0, $t8 +/* 97F3A4 802418D4 C7C00020 */ lwc1 $f0, 0x20($fp) +/* 97F3A8 802418D8 C442006C */ lwc1 $f2, 0x6c($v0) +/* 97F3AC 802418DC 4480A000 */ mtc1 $zero, $f20 +/* 97F3B0 802418E0 46020000 */ add.s $f0, $f0, $f2 +/* 97F3B4 802418E4 C7C20034 */ lwc1 $f2, 0x34($fp) +/* 97F3B8 802418E8 3C013F80 */ lui $at, 0x3f80 +/* 97F3BC 802418EC 4481B000 */ mtc1 $at, $f22 +/* 97F3C0 802418F0 46020000 */ add.s $f0, $f0, $f2 +/* 97F3C4 802418F4 4406A000 */ mfc1 $a2, $f20 +/* 97F3C8 802418F8 4407B000 */ mfc1 $a3, $f22 +/* 97F3CC 802418FC 44050000 */ mfc1 $a1, $f0 +/* 97F3D0 80241900 0200202D */ daddu $a0, $s0, $zero +/* 97F3D4 80241904 0C019EC8 */ jal guRotateF +/* 97F3D8 80241908 E7B40010 */ swc1 $f20, 0x10($sp) +/* 97F3DC 8024190C 0200202D */ daddu $a0, $s0, $zero +/* 97F3E0 80241910 0220282D */ daddu $a1, $s1, $zero +/* 97F3E4 80241914 0C019D80 */ jal guMtxCatF +/* 97F3E8 80241918 0220302D */ daddu $a2, $s1, $zero +/* 97F3EC 8024191C 8FC50024 */ lw $a1, 0x24($fp) +/* 97F3F0 80241920 4406A000 */ mfc1 $a2, $f20 +/* 97F3F4 80241924 4407A000 */ mfc1 $a3, $f20 +/* 97F3F8 80241928 0200202D */ daddu $a0, $s0, $zero +/* 97F3FC 8024192C 0C019EC8 */ jal guRotateF +/* 97F400 80241930 E7B60010 */ swc1 $f22, 0x10($sp) +/* 97F404 80241934 0200202D */ daddu $a0, $s0, $zero +/* 97F408 80241938 0220282D */ daddu $a1, $s1, $zero +/* 97F40C 8024193C 0C019D80 */ jal guMtxCatF +/* 97F410 80241940 0220302D */ daddu $a2, $s1, $zero +/* 97F414 80241944 8FC5001C */ lw $a1, 0x1c($fp) +/* 97F418 80241948 4406B000 */ mfc1 $a2, $f22 +/* 97F41C 8024194C 4407A000 */ mfc1 $a3, $f20 +/* 97F420 80241950 0200202D */ daddu $a0, $s0, $zero +/* 97F424 80241954 0C019EC8 */ jal guRotateF +/* 97F428 80241958 AFA70010 */ sw $a3, 0x10($sp) +/* 97F42C 8024195C 0200202D */ daddu $a0, $s0, $zero +/* 97F430 80241960 0220282D */ daddu $a1, $s1, $zero +/* 97F434 80241964 0C019D80 */ jal guMtxCatF +/* 97F438 80241968 0220302D */ daddu $a2, $s1, $zero +/* 97F43C 8024196C 8FC50028 */ lw $a1, 0x28($fp) +/* 97F440 80241970 8FC6002C */ lw $a2, 0x2c($fp) +/* 97F444 80241974 8FC70030 */ lw $a3, 0x30($fp) +/* 97F448 80241978 0C019DF0 */ jal guScaleF +/* 97F44C 8024197C 0200202D */ daddu $a0, $s0, $zero +/* 97F450 80241980 0200202D */ daddu $a0, $s0, $zero +/* 97F454 80241984 0220282D */ daddu $a1, $s1, $zero +/* 97F458 80241988 0C019D80 */ jal guMtxCatF +/* 97F45C 8024198C 0220302D */ daddu $a2, $s1, $zero +/* 97F460 80241990 3C108007 */ lui $s0, 0x8007 +/* 97F464 80241994 261041F0 */ addiu $s0, $s0, 0x41f0 +/* 97F468 80241998 0220202D */ daddu $a0, $s1, $zero +/* 97F46C 8024199C 96050000 */ lhu $a1, ($s0) +/* 97F470 802419A0 8E420000 */ lw $v0, ($s2) +/* 97F474 802419A4 8FB800C8 */ lw $t8, 0xc8($sp) +/* 97F478 802419A8 00052980 */ sll $a1, $a1, 6 +/* 97F47C 802419AC 00B82821 */ addu $a1, $a1, $t8 +/* 97F480 802419B0 0C019D40 */ jal guMtxF2L +/* 97F484 802419B4 00452821 */ addu $a1, $v0, $a1 +/* 97F488 802419B8 3C02DA38 */ lui $v0, 0xda38 +/* 97F48C 802419BC 34420002 */ ori $v0, $v0, 2 +/* 97F490 802419C0 27A40038 */ addiu $a0, $sp, 0x38 +/* 97F494 802419C4 8EE70000 */ lw $a3, ($s7) +/* 97F498 802419C8 96080000 */ lhu $t0, ($s0) +/* 97F49C 802419CC 00E0282D */ daddu $a1, $a3, $zero +/* 97F4A0 802419D0 ACA20000 */ sw $v0, ($a1) +/* 97F4A4 802419D4 3102FFFF */ andi $v0, $t0, 0xffff +/* 97F4A8 802419D8 00021180 */ sll $v0, $v0, 6 +/* 97F4AC 802419DC 24E70008 */ addiu $a3, $a3, 8 +/* 97F4B0 802419E0 8FB800C8 */ lw $t8, 0xc8($sp) +/* 97F4B4 802419E4 8E430000 */ lw $v1, ($s2) +/* 97F4B8 802419E8 00581021 */ addu $v0, $v0, $t8 +/* 97F4BC 802419EC 00621821 */ addu $v1, $v1, $v0 +/* 97F4C0 802419F0 3C028000 */ lui $v0, 0x8000 +/* 97F4C4 802419F4 00621821 */ addu $v1, $v1, $v0 +/* 97F4C8 802419F8 ACA30004 */ sw $v1, 4($a1) +/* 97F4CC 802419FC 8FC50008 */ lw $a1, 8($fp) +/* 97F4D0 80241A00 8FC6000C */ lw $a2, 0xc($fp) +/* 97F4D4 80241A04 25080001 */ addiu $t0, $t0, 1 +/* 97F4D8 80241A08 AEE70000 */ sw $a3, ($s7) +/* 97F4DC 80241A0C 0C0B7A76 */ jal func_802DE9D8 +/* 97F4E0 80241A10 A6080000 */ sh $t0, ($s0) +/* 97F4E4 80241A14 24050007 */ addiu $a1, $zero, 7 +/* 97F4E8 80241A18 240600FF */ addiu $a2, $zero, 0xff +/* 97F4EC 80241A1C 8FC40000 */ lw $a0, ($fp) +/* 97F4F0 80241A20 8FA30038 */ lw $v1, 0x38($sp) +/* 97F4F4 80241A24 8FA9003C */ lw $t1, 0x3c($sp) +/* 97F4F8 80241A28 97A80042 */ lhu $t0, 0x42($sp) +/* 97F4FC 80241A2C 00C0102D */ daddu $v0, $a2, $zero +/* 97F500 80241A30 A3A20030 */ sb $v0, 0x30($sp) +/* 97F504 80241A34 A7A80028 */ sh $t0, 0x28($sp) +/* 97F508 80241A38 3108FFFF */ andi $t0, $t0, 0xffff +/* 97F50C 80241A3C AFA30020 */ sw $v1, 0x20($sp) +/* 97F510 80241A40 97A30046 */ lhu $v1, 0x46($sp) +/* 97F514 80241A44 44880000 */ mtc1 $t0, $f0 +/* 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) +/* 97F528 80241A58 8FA20040 */ lw $v0, 0x40($sp) +/* 97F52C 80241A5C 00C0382D */ daddu $a3, $a2, $zero +/* 97F530 80241A60 A7A3002A */ sh $v1, 0x2a($sp) +/* 97F534 80241A64 3063FFFF */ andi $v1, $v1, 0xffff +/* 97F538 80241A68 44830000 */ mtc1 $v1, $f0 +/* 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 +/* 97F54C 80241A7C 00021043 */ sra $v0, $v0, 1 +/* 97F550 80241A80 E7C00040 */ swc1 $f0, 0x40($fp) +/* 97F554 80241A84 8FA30044 */ lw $v1, 0x44($sp) +/* 97F558 80241A88 00021023 */ negu $v0, $v0 +/* 97F55C 80241A8C A7A2002C */ sh $v0, 0x2c($sp) +/* 97F560 80241A90 000317C2 */ srl $v0, $v1, 0x1f +/* 97F564 80241A94 00621821 */ addu $v1, $v1, $v0 +/* 97F568 80241A98 00031843 */ sra $v1, $v1, 1 +/* 97F56C 80241A9C A7A3002E */ sh $v1, 0x2e($sp) +/* 97F570 80241AA0 8FC30038 */ lw $v1, 0x38($fp) +/* 97F574 80241AA4 00C0102D */ daddu $v0, $a2, $zero +/* 97F578 80241AA8 AFA20010 */ sw $v0, 0x10($sp) +/* 97F57C 80241AAC AFA00018 */ sw $zero, 0x18($sp) +/* 97F580 80241AB0 0C04EAA7 */ jal func_8013AA9C +/* 97F584 80241AB4 AFA30014 */ sw $v1, 0x14($sp) +/* 97F588 80241AB8 27A50020 */ addiu $a1, $sp, 0x20 +/* 97F58C 80241ABC 0000302D */ daddu $a2, $zero, $zero +/* 97F590 80241AC0 8FC40000 */ lw $a0, ($fp) +/* 97F594 80241AC4 0C04EBDC */ jal func_8013AF70 +/* 97F598 80241AC8 0220382D */ daddu $a3, $s1, $zero +/* 97F59C 80241ACC 3C04D838 */ lui $a0, 0xd838 +/* 97F5A0 80241AD0 8EE20000 */ lw $v0, ($s7) +/* 97F5A4 80241AD4 34840002 */ ori $a0, $a0, 2 +/* 97F5A8 80241AD8 0040182D */ daddu $v1, $v0, $zero +/* 97F5AC 80241ADC 24420008 */ addiu $v0, $v0, 8 +/* 97F5B0 80241AE0 AEE20000 */ sw $v0, ($s7) +/* 97F5B4 80241AE4 24020040 */ addiu $v0, $zero, 0x40 +/* 97F5B8 80241AE8 AC640000 */ sw $a0, ($v1) +/* 97F5BC 80241AEC AC620004 */ sw $v0, 4($v1) +/* 97F5C0 80241AF0 8FBF00F4 */ lw $ra, 0xf4($sp) +/* 97F5C4 80241AF4 8FBE00F0 */ lw $fp, 0xf0($sp) +/* 97F5C8 80241AF8 8FB700EC */ lw $s7, 0xec($sp) +/* 97F5CC 80241AFC 8FB600E8 */ lw $s6, 0xe8($sp) +/* 97F5D0 80241B00 8FB500E4 */ lw $s5, 0xe4($sp) +/* 97F5D4 80241B04 8FB400E0 */ lw $s4, 0xe0($sp) +/* 97F5D8 80241B08 8FB300DC */ lw $s3, 0xdc($sp) +/* 97F5DC 80241B0C 8FB200D8 */ lw $s2, 0xd8($sp) +/* 97F5E0 80241B10 8FB100D4 */ lw $s1, 0xd4($sp) +/* 97F5E4 80241B14 8FB000D0 */ lw $s0, 0xd0($sp) +/* 97F5E8 80241B18 D7B60100 */ ldc1 $f22, 0x100($sp) +/* 97F5EC 80241B1C D7B400F8 */ ldc1 $f20, 0xf8($sp) +/* 97F5F0 80241B20 03E00008 */ jr $ra +/* 97F5F4 80241B24 27BD0108 */ addiu $sp, $sp, 0x108 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28.s deleted file mode 100644 index 162b0db981..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B28 -/* 97F5F8 80241B28 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 97F5FC 80241B2C AFBF0028 */ sw $ra, 0x28($sp) -/* 97F600 80241B30 AFB10024 */ sw $s1, 0x24($sp) -/* 97F604 80241B34 AFB00020 */ sw $s0, 0x20($sp) -/* 97F608 80241B38 8C820148 */ lw $v0, 0x148($a0) -/* 97F60C 80241B3C 0C00EABB */ jal get_npc_unsafe -/* 97F610 80241B40 84440008 */ lh $a0, 8($v0) -/* 97F614 80241B44 27A40010 */ addiu $a0, $sp, 0x10 -/* 97F618 80241B48 24050035 */ addiu $a1, $zero, 0x35 -/* 97F61C 80241B4C 3C108024 */ lui $s0, 0x8024 -/* 97F620 80241B50 26102614 */ addiu $s0, $s0, 0x2614 -/* 97F624 80241B54 00A0182D */ daddu $v1, $a1, $zero -/* 97F628 80241B58 0040882D */ daddu $s1, $v0, $zero -/* 97F62C 80241B5C 0000302D */ daddu $a2, $zero, $zero -/* 97F630 80241B60 AE030008 */ sw $v1, 8($s0) -/* 97F634 80241B64 0C0B7A76 */ jal func_802DE9D8 -/* 97F638 80241B68 AE00000C */ sw $zero, 0xc($s0) -/* 97F63C 80241B6C C7A6001C */ lwc1 $f6, 0x1c($sp) -/* 97F640 80241B70 468031A0 */ cvt.s.w $f6, $f6 -/* 97F644 80241B74 3C018024 */ lui $at, 0x8024 -/* 97F648 80241B78 D4202F38 */ ldc1 $f0, 0x2f38($at) -/* 97F64C 80241B7C 460030A1 */ cvt.d.s $f2, $f6 -/* 97F650 80241B80 46201082 */ mul.d $f2, $f2, $f0 -/* 97F654 80241B84 00000000 */ nop -/* 97F658 80241B88 3C013FE0 */ lui $at, 0x3fe0 -/* 97F65C 80241B8C 44812800 */ mtc1 $at, $f5 -/* 97F660 80241B90 44802000 */ mtc1 $zero, $f4 -/* 97F664 80241B94 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 97F668 80241B98 46800020 */ cvt.s.w $f0, $f0 -/* 97F66C 80241B9C E600003C */ swc1 $f0, 0x3c($s0) -/* 97F670 80241BA0 46241082 */ mul.d $f2, $f2, $f4 -/* 97F674 80241BA4 00000000 */ nop -/* 97F678 80241BA8 E6060040 */ swc1 $f6, 0x40($s0) -/* 97F67C 80241BAC C6200038 */ lwc1 $f0, 0x38($s1) -/* 97F680 80241BB0 E6000010 */ swc1 $f0, 0x10($s0) -/* 97F684 80241BB4 C620003C */ lwc1 $f0, 0x3c($s1) -/* 97F688 80241BB8 46000021 */ cvt.d.s $f0, $f0 -/* 97F68C 80241BBC 46220000 */ add.d $f0, $f0, $f2 -/* 97F690 80241BC0 0000202D */ daddu $a0, $zero, $zero -/* 97F694 80241BC4 3C0142AA */ lui $at, 0x42aa -/* 97F698 80241BC8 44811000 */ mtc1 $at, $f2 -/* 97F69C 80241BCC 46200020 */ cvt.s.d $f0, $f0 -/* 97F6A0 80241BD0 E6000014 */ swc1 $f0, 0x14($s0) -/* 97F6A4 80241BD4 C6240040 */ lwc1 $f4, 0x40($s1) -/* 97F6A8 80241BD8 3C013F36 */ lui $at, 0x3f36 -/* 97F6AC 80241BDC 3421DB6E */ ori $at, $at, 0xdb6e -/* 97F6B0 80241BE0 44810000 */ mtc1 $at, $f0 -/* 97F6B4 80241BE4 3C058024 */ lui $a1, 0x8024 -/* 97F6B8 80241BE8 24A51610 */ addiu $a1, $a1, 0x1610 -/* 97F6BC 80241BEC AE00001C */ sw $zero, 0x1c($s0) -/* 97F6C0 80241BF0 AE000020 */ sw $zero, 0x20($s0) -/* 97F6C4 80241BF4 AE000024 */ sw $zero, 0x24($s0) -/* 97F6C8 80241BF8 E6020034 */ swc1 $f2, 0x34($s0) -/* 97F6CC 80241BFC AE000038 */ sw $zero, 0x38($s0) -/* 97F6D0 80241C00 AE000000 */ sw $zero, ($s0) -/* 97F6D4 80241C04 E6000028 */ swc1 $f0, 0x28($s0) -/* 97F6D8 80241C08 E600002C */ swc1 $f0, 0x2c($s0) -/* 97F6DC 80241C0C E6000030 */ swc1 $f0, 0x30($s0) -/* 97F6E0 80241C10 0C048C8F */ jal bind_dynamic_entity_7 -/* 97F6E4 80241C14 E6040018 */ swc1 $f4, 0x18($s0) -/* 97F6E8 80241C18 AE020004 */ sw $v0, 4($s0) -/* 97F6EC 80241C1C 8FBF0028 */ lw $ra, 0x28($sp) -/* 97F6F0 80241C20 8FB10024 */ lw $s1, 0x24($sp) -/* 97F6F4 80241C24 8FB00020 */ lw $s0, 0x20($sp) -/* 97F6F8 80241C28 24020002 */ addiu $v0, $zero, 2 -/* 97F6FC 80241C2C 03E00008 */ jr $ra -/* 97F700 80241C30 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s new file mode 100644 index 0000000000..69981efa5e --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241B28_97F5F8.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B28_97F5F8 +/* 97F5F8 80241B28 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 97F5FC 80241B2C AFBF0028 */ sw $ra, 0x28($sp) +/* 97F600 80241B30 AFB10024 */ sw $s1, 0x24($sp) +/* 97F604 80241B34 AFB00020 */ sw $s0, 0x20($sp) +/* 97F608 80241B38 8C820148 */ lw $v0, 0x148($a0) +/* 97F60C 80241B3C 0C00EABB */ jal get_npc_unsafe +/* 97F610 80241B40 84440008 */ lh $a0, 8($v0) +/* 97F614 80241B44 27A40010 */ addiu $a0, $sp, 0x10 +/* 97F618 80241B48 24050035 */ addiu $a1, $zero, 0x35 +/* 97F61C 80241B4C 3C108024 */ lui $s0, 0x8024 +/* 97F620 80241B50 26102614 */ addiu $s0, $s0, 0x2614 +/* 97F624 80241B54 00A0182D */ daddu $v1, $a1, $zero +/* 97F628 80241B58 0040882D */ daddu $s1, $v0, $zero +/* 97F62C 80241B5C 0000302D */ daddu $a2, $zero, $zero +/* 97F630 80241B60 AE030008 */ sw $v1, 8($s0) +/* 97F634 80241B64 0C0B7A76 */ jal func_802DE9D8 +/* 97F638 80241B68 AE00000C */ sw $zero, 0xc($s0) +/* 97F63C 80241B6C C7A6001C */ lwc1 $f6, 0x1c($sp) +/* 97F640 80241B70 468031A0 */ cvt.s.w $f6, $f6 +/* 97F644 80241B74 3C018024 */ lui $at, 0x8024 +/* 97F648 80241B78 D4202F38 */ ldc1 $f0, 0x2f38($at) +/* 97F64C 80241B7C 460030A1 */ cvt.d.s $f2, $f6 +/* 97F650 80241B80 46201082 */ mul.d $f2, $f2, $f0 +/* 97F654 80241B84 00000000 */ nop +/* 97F658 80241B88 3C013FE0 */ lui $at, 0x3fe0 +/* 97F65C 80241B8C 44812800 */ mtc1 $at, $f5 +/* 97F660 80241B90 44802000 */ mtc1 $zero, $f4 +/* 97F664 80241B94 C7A00018 */ lwc1 $f0, 0x18($sp) +/* 97F668 80241B98 46800020 */ cvt.s.w $f0, $f0 +/* 97F66C 80241B9C E600003C */ swc1 $f0, 0x3c($s0) +/* 97F670 80241BA0 46241082 */ mul.d $f2, $f2, $f4 +/* 97F674 80241BA4 00000000 */ nop +/* 97F678 80241BA8 E6060040 */ swc1 $f6, 0x40($s0) +/* 97F67C 80241BAC C6200038 */ lwc1 $f0, 0x38($s1) +/* 97F680 80241BB0 E6000010 */ swc1 $f0, 0x10($s0) +/* 97F684 80241BB4 C620003C */ lwc1 $f0, 0x3c($s1) +/* 97F688 80241BB8 46000021 */ cvt.d.s $f0, $f0 +/* 97F68C 80241BBC 46220000 */ add.d $f0, $f0, $f2 +/* 97F690 80241BC0 0000202D */ daddu $a0, $zero, $zero +/* 97F694 80241BC4 3C0142AA */ lui $at, 0x42aa +/* 97F698 80241BC8 44811000 */ mtc1 $at, $f2 +/* 97F69C 80241BCC 46200020 */ cvt.s.d $f0, $f0 +/* 97F6A0 80241BD0 E6000014 */ swc1 $f0, 0x14($s0) +/* 97F6A4 80241BD4 C6240040 */ lwc1 $f4, 0x40($s1) +/* 97F6A8 80241BD8 3C013F36 */ lui $at, 0x3f36 +/* 97F6AC 80241BDC 3421DB6E */ ori $at, $at, 0xdb6e +/* 97F6B0 80241BE0 44810000 */ mtc1 $at, $f0 +/* 97F6B4 80241BE4 3C058024 */ lui $a1, 0x8024 +/* 97F6B8 80241BE8 24A51610 */ addiu $a1, $a1, 0x1610 +/* 97F6BC 80241BEC AE00001C */ sw $zero, 0x1c($s0) +/* 97F6C0 80241BF0 AE000020 */ sw $zero, 0x20($s0) +/* 97F6C4 80241BF4 AE000024 */ sw $zero, 0x24($s0) +/* 97F6C8 80241BF8 E6020034 */ swc1 $f2, 0x34($s0) +/* 97F6CC 80241BFC AE000038 */ sw $zero, 0x38($s0) +/* 97F6D0 80241C00 AE000000 */ sw $zero, ($s0) +/* 97F6D4 80241C04 E6000028 */ swc1 $f0, 0x28($s0) +/* 97F6D8 80241C08 E600002C */ swc1 $f0, 0x2c($s0) +/* 97F6DC 80241C0C E6000030 */ swc1 $f0, 0x30($s0) +/* 97F6E0 80241C10 0C048C8F */ jal bind_dynamic_entity_7 +/* 97F6E4 80241C14 E6040018 */ swc1 $f4, 0x18($s0) +/* 97F6E8 80241C18 AE020004 */ sw $v0, 4($s0) +/* 97F6EC 80241C1C 8FBF0028 */ lw $ra, 0x28($sp) +/* 97F6F0 80241C20 8FB10024 */ lw $s1, 0x24($sp) +/* 97F6F4 80241C24 8FB00020 */ lw $s0, 0x20($sp) +/* 97F6F8 80241C28 24020002 */ addiu $v0, $zero, 2 +/* 97F6FC 80241C2C 03E00008 */ jr $ra +/* 97F700 80241C30 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34.s deleted file mode 100644 index f72872351b..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C34 -/* 97F704 80241C34 3C048024 */ lui $a0, 0x8024 -/* 97F708 80241C38 8C842618 */ lw $a0, 0x2618($a0) -/* 97F70C 80241C3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 97F710 80241C40 AFBF0010 */ sw $ra, 0x10($sp) -/* 97F714 80241C44 0C048D70 */ jal func_801235C0 -/* 97F718 80241C48 00000000 */ nop -/* 97F71C 80241C4C 8FBF0010 */ lw $ra, 0x10($sp) -/* 97F720 80241C50 24020002 */ addiu $v0, $zero, 2 -/* 97F724 80241C54 03E00008 */ jr $ra -/* 97F728 80241C58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s new file mode 100644 index 0000000000..6efed8aa4d --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C34_97F704.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C34_97F704 +/* 97F704 80241C34 3C048024 */ lui $a0, 0x8024 +/* 97F708 80241C38 8C842618 */ lw $a0, 0x2618($a0) +/* 97F70C 80241C3C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 97F710 80241C40 AFBF0010 */ sw $ra, 0x10($sp) +/* 97F714 80241C44 0C048D70 */ jal func_801235C0 +/* 97F718 80241C48 00000000 */ nop +/* 97F71C 80241C4C 8FBF0010 */ lw $ra, 0x10($sp) +/* 97F720 80241C50 24020002 */ addiu $v0, $zero, 2 +/* 97F724 80241C54 03E00008 */ jr $ra +/* 97F728 80241C58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C.s deleted file mode 100644 index 3c5941bae1..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C5C -/* 97F72C 80241C5C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97F730 80241C60 AFB10014 */ sw $s1, 0x14($sp) -/* 97F734 80241C64 0080882D */ daddu $s1, $a0, $zero -/* 97F738 80241C68 AFBF001C */ sw $ra, 0x1c($sp) -/* 97F73C 80241C6C AFB20018 */ sw $s2, 0x18($sp) -/* 97F740 80241C70 AFB00010 */ sw $s0, 0x10($sp) -/* 97F744 80241C74 8E30000C */ lw $s0, 0xc($s1) -/* 97F748 80241C78 8E050000 */ lw $a1, ($s0) -/* 97F74C 80241C7C 0C0B210B */ jal get_float_variable -/* 97F750 80241C80 26100004 */ addiu $s0, $s0, 4 -/* 97F754 80241C84 8E050000 */ lw $a1, ($s0) -/* 97F758 80241C88 26100004 */ addiu $s0, $s0, 4 -/* 97F75C 80241C8C 4600018D */ trunc.w.s $f6, $f0 -/* 97F760 80241C90 44123000 */ mfc1 $s2, $f6 -/* 97F764 80241C94 0C0B210B */ jal get_float_variable -/* 97F768 80241C98 0220202D */ daddu $a0, $s1, $zero -/* 97F76C 80241C9C 8E050000 */ lw $a1, ($s0) -/* 97F770 80241CA0 4600018D */ trunc.w.s $f6, $f0 -/* 97F774 80241CA4 44103000 */ mfc1 $s0, $f6 -/* 97F778 80241CA8 0C0B210B */ jal get_float_variable -/* 97F77C 80241CAC 0220202D */ daddu $a0, $s1, $zero -/* 97F780 80241CB0 3C028024 */ lui $v0, 0x8024 -/* 97F784 80241CB4 24422614 */ addiu $v0, $v0, 0x2614 -/* 97F788 80241CB8 C4420040 */ lwc1 $f2, 0x40($v0) -/* 97F78C 80241CBC 3C018024 */ lui $at, 0x8024 -/* 97F790 80241CC0 D4242F40 */ ldc1 $f4, 0x2f40($at) -/* 97F794 80241CC4 460010A1 */ cvt.d.s $f2, $f2 -/* 97F798 80241CC8 46241082 */ mul.d $f2, $f2, $f4 -/* 97F79C 80241CCC 00000000 */ nop -/* 97F7A0 80241CD0 3C013FE0 */ lui $at, 0x3fe0 -/* 97F7A4 80241CD4 44812800 */ mtc1 $at, $f5 -/* 97F7A8 80241CD8 44802000 */ mtc1 $zero, $f4 -/* 97F7AC 80241CDC 00000000 */ nop -/* 97F7B0 80241CE0 46241082 */ mul.d $f2, $f2, $f4 -/* 97F7B4 80241CE4 00000000 */ nop -/* 97F7B8 80241CE8 4600018D */ trunc.w.s $f6, $f0 -/* 97F7BC 80241CEC 44033000 */ mfc1 $v1, $f6 -/* 97F7C0 80241CF0 44900000 */ mtc1 $s0, $f0 -/* 97F7C4 80241CF4 00000000 */ nop -/* 97F7C8 80241CF8 46800021 */ cvt.d.w $f0, $f0 -/* 97F7CC 80241CFC 44922000 */ mtc1 $s2, $f4 -/* 97F7D0 80241D00 00000000 */ nop -/* 97F7D4 80241D04 46802120 */ cvt.s.w $f4, $f4 -/* 97F7D8 80241D08 E4440010 */ swc1 $f4, 0x10($v0) -/* 97F7DC 80241D0C 46220000 */ add.d $f0, $f0, $f2 -/* 97F7E0 80241D10 44831000 */ mtc1 $v1, $f2 -/* 97F7E4 80241D14 00000000 */ nop -/* 97F7E8 80241D18 468010A0 */ cvt.s.w $f2, $f2 -/* 97F7EC 80241D1C E4420018 */ swc1 $f2, 0x18($v0) -/* 97F7F0 80241D20 46200020 */ cvt.s.d $f0, $f0 -/* 97F7F4 80241D24 E4400014 */ swc1 $f0, 0x14($v0) -/* 97F7F8 80241D28 8FBF001C */ lw $ra, 0x1c($sp) -/* 97F7FC 80241D2C 8FB20018 */ lw $s2, 0x18($sp) -/* 97F800 80241D30 8FB10014 */ lw $s1, 0x14($sp) -/* 97F804 80241D34 8FB00010 */ lw $s0, 0x10($sp) -/* 97F808 80241D38 24020002 */ addiu $v0, $zero, 2 -/* 97F80C 80241D3C 03E00008 */ jr $ra -/* 97F810 80241D40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s new file mode 100644 index 0000000000..a1f9fec5a8 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241C5C_97F72C.s @@ -0,0 +1,62 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C5C_97F72C +/* 97F72C 80241C5C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 97F730 80241C60 AFB10014 */ sw $s1, 0x14($sp) +/* 97F734 80241C64 0080882D */ daddu $s1, $a0, $zero +/* 97F738 80241C68 AFBF001C */ sw $ra, 0x1c($sp) +/* 97F73C 80241C6C AFB20018 */ sw $s2, 0x18($sp) +/* 97F740 80241C70 AFB00010 */ sw $s0, 0x10($sp) +/* 97F744 80241C74 8E30000C */ lw $s0, 0xc($s1) +/* 97F748 80241C78 8E050000 */ lw $a1, ($s0) +/* 97F74C 80241C7C 0C0B210B */ jal get_float_variable +/* 97F750 80241C80 26100004 */ addiu $s0, $s0, 4 +/* 97F754 80241C84 8E050000 */ lw $a1, ($s0) +/* 97F758 80241C88 26100004 */ addiu $s0, $s0, 4 +/* 97F75C 80241C8C 4600018D */ trunc.w.s $f6, $f0 +/* 97F760 80241C90 44123000 */ mfc1 $s2, $f6 +/* 97F764 80241C94 0C0B210B */ jal get_float_variable +/* 97F768 80241C98 0220202D */ daddu $a0, $s1, $zero +/* 97F76C 80241C9C 8E050000 */ lw $a1, ($s0) +/* 97F770 80241CA0 4600018D */ trunc.w.s $f6, $f0 +/* 97F774 80241CA4 44103000 */ mfc1 $s0, $f6 +/* 97F778 80241CA8 0C0B210B */ jal get_float_variable +/* 97F77C 80241CAC 0220202D */ daddu $a0, $s1, $zero +/* 97F780 80241CB0 3C028024 */ lui $v0, 0x8024 +/* 97F784 80241CB4 24422614 */ addiu $v0, $v0, 0x2614 +/* 97F788 80241CB8 C4420040 */ lwc1 $f2, 0x40($v0) +/* 97F78C 80241CBC 3C018024 */ lui $at, 0x8024 +/* 97F790 80241CC0 D4242F40 */ ldc1 $f4, 0x2f40($at) +/* 97F794 80241CC4 460010A1 */ cvt.d.s $f2, $f2 +/* 97F798 80241CC8 46241082 */ mul.d $f2, $f2, $f4 +/* 97F79C 80241CCC 00000000 */ nop +/* 97F7A0 80241CD0 3C013FE0 */ lui $at, 0x3fe0 +/* 97F7A4 80241CD4 44812800 */ mtc1 $at, $f5 +/* 97F7A8 80241CD8 44802000 */ mtc1 $zero, $f4 +/* 97F7AC 80241CDC 00000000 */ nop +/* 97F7B0 80241CE0 46241082 */ mul.d $f2, $f2, $f4 +/* 97F7B4 80241CE4 00000000 */ nop +/* 97F7B8 80241CE8 4600018D */ trunc.w.s $f6, $f0 +/* 97F7BC 80241CEC 44033000 */ mfc1 $v1, $f6 +/* 97F7C0 80241CF0 44900000 */ mtc1 $s0, $f0 +/* 97F7C4 80241CF4 00000000 */ nop +/* 97F7C8 80241CF8 46800021 */ cvt.d.w $f0, $f0 +/* 97F7CC 80241CFC 44922000 */ mtc1 $s2, $f4 +/* 97F7D0 80241D00 00000000 */ nop +/* 97F7D4 80241D04 46802120 */ cvt.s.w $f4, $f4 +/* 97F7D8 80241D08 E4440010 */ swc1 $f4, 0x10($v0) +/* 97F7DC 80241D0C 46220000 */ add.d $f0, $f0, $f2 +/* 97F7E0 80241D10 44831000 */ mtc1 $v1, $f2 +/* 97F7E4 80241D14 00000000 */ nop +/* 97F7E8 80241D18 468010A0 */ cvt.s.w $f2, $f2 +/* 97F7EC 80241D1C E4420018 */ swc1 $f2, 0x18($v0) +/* 97F7F0 80241D20 46200020 */ cvt.s.d $f0, $f0 +/* 97F7F4 80241D24 E4400014 */ swc1 $f0, 0x14($v0) +/* 97F7F8 80241D28 8FBF001C */ lw $ra, 0x1c($sp) +/* 97F7FC 80241D2C 8FB20018 */ lw $s2, 0x18($sp) +/* 97F800 80241D30 8FB10014 */ lw $s1, 0x14($sp) +/* 97F804 80241D34 8FB00010 */ lw $s0, 0x10($sp) +/* 97F808 80241D38 24020002 */ addiu $v0, $zero, 2 +/* 97F80C 80241D3C 03E00008 */ jr $ra +/* 97F810 80241D40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44.s deleted file mode 100644 index a31bb75914..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D44 -/* 97F814 80241D44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 97F818 80241D48 AFB10014 */ sw $s1, 0x14($sp) -/* 97F81C 80241D4C 0080882D */ daddu $s1, $a0, $zero -/* 97F820 80241D50 AFBF001C */ sw $ra, 0x1c($sp) -/* 97F824 80241D54 AFB20018 */ sw $s2, 0x18($sp) -/* 97F828 80241D58 AFB00010 */ sw $s0, 0x10($sp) -/* 97F82C 80241D5C 8E30000C */ lw $s0, 0xc($s1) -/* 97F830 80241D60 8E050000 */ lw $a1, ($s0) -/* 97F834 80241D64 0C0B210B */ jal get_float_variable -/* 97F838 80241D68 26100004 */ addiu $s0, $s0, 4 -/* 97F83C 80241D6C 8E050000 */ lw $a1, ($s0) -/* 97F840 80241D70 26100004 */ addiu $s0, $s0, 4 -/* 97F844 80241D74 4600010D */ trunc.w.s $f4, $f0 -/* 97F848 80241D78 44122000 */ mfc1 $s2, $f4 -/* 97F84C 80241D7C 0C0B210B */ jal get_float_variable -/* 97F850 80241D80 0220202D */ daddu $a0, $s1, $zero -/* 97F854 80241D84 8E050000 */ lw $a1, ($s0) -/* 97F858 80241D88 4600010D */ trunc.w.s $f4, $f0 -/* 97F85C 80241D8C 44102000 */ mfc1 $s0, $f4 -/* 97F860 80241D90 0C0B210B */ jal get_float_variable -/* 97F864 80241D94 0220202D */ daddu $a0, $s1, $zero -/* 97F868 80241D98 3C038024 */ lui $v1, 0x8024 -/* 97F86C 80241D9C 24632614 */ addiu $v1, $v1, 0x2614 -/* 97F870 80241DA0 44921000 */ mtc1 $s2, $f2 -/* 97F874 80241DA4 00000000 */ nop -/* 97F878 80241DA8 468010A0 */ cvt.s.w $f2, $f2 -/* 97F87C 80241DAC E462001C */ swc1 $f2, 0x1c($v1) -/* 97F880 80241DB0 44901000 */ mtc1 $s0, $f2 -/* 97F884 80241DB4 00000000 */ nop -/* 97F888 80241DB8 468010A0 */ cvt.s.w $f2, $f2 -/* 97F88C 80241DBC 4600010D */ trunc.w.s $f4, $f0 -/* 97F890 80241DC0 44022000 */ mfc1 $v0, $f4 -/* 97F894 80241DC4 00000000 */ nop -/* 97F898 80241DC8 44820000 */ mtc1 $v0, $f0 -/* 97F89C 80241DCC 00000000 */ nop -/* 97F8A0 80241DD0 46800020 */ cvt.s.w $f0, $f0 -/* 97F8A4 80241DD4 E4620020 */ swc1 $f2, 0x20($v1) -/* 97F8A8 80241DD8 E4600024 */ swc1 $f0, 0x24($v1) -/* 97F8AC 80241DDC 8FBF001C */ lw $ra, 0x1c($sp) -/* 97F8B0 80241DE0 8FB20018 */ lw $s2, 0x18($sp) -/* 97F8B4 80241DE4 8FB10014 */ lw $s1, 0x14($sp) -/* 97F8B8 80241DE8 8FB00010 */ lw $s0, 0x10($sp) -/* 97F8BC 80241DEC 24020002 */ addiu $v0, $zero, 2 -/* 97F8C0 80241DF0 03E00008 */ jr $ra -/* 97F8C4 80241DF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s new file mode 100644 index 0000000000..61e6abed2e --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241D44_97F814.s @@ -0,0 +1,49 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D44_97F814 +/* 97F814 80241D44 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 97F818 80241D48 AFB10014 */ sw $s1, 0x14($sp) +/* 97F81C 80241D4C 0080882D */ daddu $s1, $a0, $zero +/* 97F820 80241D50 AFBF001C */ sw $ra, 0x1c($sp) +/* 97F824 80241D54 AFB20018 */ sw $s2, 0x18($sp) +/* 97F828 80241D58 AFB00010 */ sw $s0, 0x10($sp) +/* 97F82C 80241D5C 8E30000C */ lw $s0, 0xc($s1) +/* 97F830 80241D60 8E050000 */ lw $a1, ($s0) +/* 97F834 80241D64 0C0B210B */ jal get_float_variable +/* 97F838 80241D68 26100004 */ addiu $s0, $s0, 4 +/* 97F83C 80241D6C 8E050000 */ lw $a1, ($s0) +/* 97F840 80241D70 26100004 */ addiu $s0, $s0, 4 +/* 97F844 80241D74 4600010D */ trunc.w.s $f4, $f0 +/* 97F848 80241D78 44122000 */ mfc1 $s2, $f4 +/* 97F84C 80241D7C 0C0B210B */ jal get_float_variable +/* 97F850 80241D80 0220202D */ daddu $a0, $s1, $zero +/* 97F854 80241D84 8E050000 */ lw $a1, ($s0) +/* 97F858 80241D88 4600010D */ trunc.w.s $f4, $f0 +/* 97F85C 80241D8C 44102000 */ mfc1 $s0, $f4 +/* 97F860 80241D90 0C0B210B */ jal get_float_variable +/* 97F864 80241D94 0220202D */ daddu $a0, $s1, $zero +/* 97F868 80241D98 3C038024 */ lui $v1, 0x8024 +/* 97F86C 80241D9C 24632614 */ addiu $v1, $v1, 0x2614 +/* 97F870 80241DA0 44921000 */ mtc1 $s2, $f2 +/* 97F874 80241DA4 00000000 */ nop +/* 97F878 80241DA8 468010A0 */ cvt.s.w $f2, $f2 +/* 97F87C 80241DAC E462001C */ swc1 $f2, 0x1c($v1) +/* 97F880 80241DB0 44901000 */ mtc1 $s0, $f2 +/* 97F884 80241DB4 00000000 */ nop +/* 97F888 80241DB8 468010A0 */ cvt.s.w $f2, $f2 +/* 97F88C 80241DBC 4600010D */ trunc.w.s $f4, $f0 +/* 97F890 80241DC0 44022000 */ mfc1 $v0, $f4 +/* 97F894 80241DC4 00000000 */ nop +/* 97F898 80241DC8 44820000 */ mtc1 $v0, $f0 +/* 97F89C 80241DCC 00000000 */ nop +/* 97F8A0 80241DD0 46800020 */ cvt.s.w $f0, $f0 +/* 97F8A4 80241DD4 E4620020 */ swc1 $f2, 0x20($v1) +/* 97F8A8 80241DD8 E4600024 */ swc1 $f0, 0x24($v1) +/* 97F8AC 80241DDC 8FBF001C */ lw $ra, 0x1c($sp) +/* 97F8B0 80241DE0 8FB20018 */ lw $s2, 0x18($sp) +/* 97F8B4 80241DE4 8FB10014 */ lw $s1, 0x14($sp) +/* 97F8B8 80241DE8 8FB00010 */ lw $s0, 0x10($sp) +/* 97F8BC 80241DEC 24020002 */ addiu $v0, $zero, 2 +/* 97F8C0 80241DF0 03E00008 */ jr $ra +/* 97F8C4 80241DF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24.s deleted file mode 100644 index db389ef38e..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E24 -/* 97F8F4 80241E24 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 97F8F8 80241E28 AFB00018 */ sw $s0, 0x18($sp) -/* 97F8FC 80241E2C 0080802D */ daddu $s0, $a0, $zero -/* 97F900 80241E30 3C05FE36 */ lui $a1, 0xfe36 -/* 97F904 80241E34 AFBF001C */ sw $ra, 0x1c($sp) -/* 97F908 80241E38 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 97F90C 80241E3C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 97F910 80241E40 0C0B1EAF */ jal get_variable -/* 97F914 80241E44 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 97F918 80241E48 0200202D */ daddu $a0, $s0, $zero -/* 97F91C 80241E4C 3C05FE36 */ lui $a1, 0xfe36 -/* 97F920 80241E50 4482B000 */ mtc1 $v0, $f22 -/* 97F924 80241E54 00000000 */ nop -/* 97F928 80241E58 4680B5A0 */ cvt.s.w $f22, $f22 -/* 97F92C 80241E5C 0C0B1EAF */ jal get_variable -/* 97F930 80241E60 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 97F934 80241E64 0200202D */ daddu $a0, $s0, $zero -/* 97F938 80241E68 3C05FE36 */ lui $a1, 0xfe36 -/* 97F93C 80241E6C 4482A000 */ mtc1 $v0, $f20 -/* 97F940 80241E70 00000000 */ nop -/* 97F944 80241E74 4680A520 */ cvt.s.w $f20, $f20 -/* 97F948 80241E78 0C0B1EAF */ jal get_variable -/* 97F94C 80241E7C 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 97F950 80241E80 44820000 */ mtc1 $v0, $f0 -/* 97F954 80241E84 00000000 */ nop -/* 97F958 80241E88 46800020 */ cvt.s.w $f0, $f0 -/* 97F95C 80241E8C 4405B000 */ mfc1 $a1, $f22 -/* 97F960 80241E90 4406A000 */ mfc1 $a2, $f20 -/* 97F964 80241E94 44070000 */ mfc1 $a3, $f0 -/* 97F968 80241E98 0000202D */ daddu $a0, $zero, $zero -/* 97F96C 80241E9C 0C01BEB4 */ jal fx_walk_large -/* 97F970 80241EA0 AFA00010 */ sw $zero, 0x10($sp) -/* 97F974 80241EA4 8FBF001C */ lw $ra, 0x1c($sp) -/* 97F978 80241EA8 8FB00018 */ lw $s0, 0x18($sp) -/* 97F97C 80241EAC D7B60028 */ ldc1 $f22, 0x28($sp) -/* 97F980 80241EB0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 97F984 80241EB4 24020002 */ addiu $v0, $zero, 2 -/* 97F988 80241EB8 03E00008 */ jr $ra -/* 97F98C 80241EBC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s new file mode 100644 index 0000000000..76267bed09 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241E24_97F8F4.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E24_97F8F4 +/* 97F8F4 80241E24 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 97F8F8 80241E28 AFB00018 */ sw $s0, 0x18($sp) +/* 97F8FC 80241E2C 0080802D */ daddu $s0, $a0, $zero +/* 97F900 80241E30 3C05FE36 */ lui $a1, 0xfe36 +/* 97F904 80241E34 AFBF001C */ sw $ra, 0x1c($sp) +/* 97F908 80241E38 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 97F90C 80241E3C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 97F910 80241E40 0C0B1EAF */ jal get_variable +/* 97F914 80241E44 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 97F918 80241E48 0200202D */ daddu $a0, $s0, $zero +/* 97F91C 80241E4C 3C05FE36 */ lui $a1, 0xfe36 +/* 97F920 80241E50 4482B000 */ mtc1 $v0, $f22 +/* 97F924 80241E54 00000000 */ nop +/* 97F928 80241E58 4680B5A0 */ cvt.s.w $f22, $f22 +/* 97F92C 80241E5C 0C0B1EAF */ jal get_variable +/* 97F930 80241E60 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 97F934 80241E64 0200202D */ daddu $a0, $s0, $zero +/* 97F938 80241E68 3C05FE36 */ lui $a1, 0xfe36 +/* 97F93C 80241E6C 4482A000 */ mtc1 $v0, $f20 +/* 97F940 80241E70 00000000 */ nop +/* 97F944 80241E74 4680A520 */ cvt.s.w $f20, $f20 +/* 97F948 80241E78 0C0B1EAF */ jal get_variable +/* 97F94C 80241E7C 34A53C84 */ ori $a1, $a1, 0x3c84 +/* 97F950 80241E80 44820000 */ mtc1 $v0, $f0 +/* 97F954 80241E84 00000000 */ nop +/* 97F958 80241E88 46800020 */ cvt.s.w $f0, $f0 +/* 97F95C 80241E8C 4405B000 */ mfc1 $a1, $f22 +/* 97F960 80241E90 4406A000 */ mfc1 $a2, $f20 +/* 97F964 80241E94 44070000 */ mfc1 $a3, $f0 +/* 97F968 80241E98 0000202D */ daddu $a0, $zero, $zero +/* 97F96C 80241E9C 0C01BEB4 */ jal fx_walk_large +/* 97F970 80241EA0 AFA00010 */ sw $zero, 0x10($sp) +/* 97F974 80241EA4 8FBF001C */ lw $ra, 0x1c($sp) +/* 97F978 80241EA8 8FB00018 */ lw $s0, 0x18($sp) +/* 97F97C 80241EAC D7B60028 */ ldc1 $f22, 0x28($sp) +/* 97F980 80241EB0 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 97F984 80241EB4 24020002 */ addiu $v0, $zero, 2 +/* 97F988 80241EB8 03E00008 */ jr $ra +/* 97F98C 80241EBC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014.s b/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014.s deleted file mode 100644 index 78eff6609c..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240014 -/* 982454 80240014 0000502D */ daddu $t2, $zero, $zero -/* 982458 80240018 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* 98245C 8024001C 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* 982460 80240020 AC800088 */ sw $zero, 0x88($a0) -/* 982464 80240024 8062001C */ lb $v0, 0x1c($v1) -/* 982468 80240028 18400018 */ blez $v0, .L8024008C -/* 98246C 8024002C 0140402D */ daddu $t0, $t2, $zero -/* 982470 80240030 0040582D */ daddu $t3, $v0, $zero -/* 982474 80240034 0060482D */ daddu $t1, $v1, $zero -.L80240038: -/* 982478 80240038 8D230028 */ lw $v1, 0x28($t1) -/* 98247C 8024003C 50600010 */ beql $v1, $zero, .L80240080 -/* 982480 80240040 254A0001 */ addiu $t2, $t2, 1 -/* 982484 80240044 0000282D */ daddu $a1, $zero, $zero -/* 982488 80240048 8C620000 */ lw $v0, ($v1) -/* 98248C 8024004C 18400009 */ blez $v0, .L80240074 -/* 982490 80240050 00A0302D */ daddu $a2, $a1, $zero -/* 982494 80240054 0040382D */ daddu $a3, $v0, $zero -.L80240058: -/* 982498 80240058 8C620004 */ lw $v0, 4($v1) -/* 98249C 8024005C 54400001 */ bnel $v0, $zero, .L80240064 -/* 9824A0 80240060 24060001 */ addiu $a2, $zero, 1 -.L80240064: -/* 9824A4 80240064 24A50001 */ addiu $a1, $a1, 1 -/* 9824A8 80240068 00A7102A */ slt $v0, $a1, $a3 -/* 9824AC 8024006C 1440FFFA */ bnez $v0, .L80240058 -/* 9824B0 80240070 24630004 */ addiu $v1, $v1, 4 -.L80240074: -/* 9824B4 80240074 54C00001 */ bnel $a2, $zero, .L8024007C -/* 9824B8 80240078 25080001 */ addiu $t0, $t0, 1 -.L8024007C: -/* 9824BC 8024007C 254A0001 */ addiu $t2, $t2, 1 -.L80240080: -/* 9824C0 80240080 014B102A */ slt $v0, $t2, $t3 -/* 9824C4 80240084 1440FFEC */ bnez $v0, .L80240038 -/* 9824C8 80240088 25290004 */ addiu $t1, $t1, 4 -.L8024008C: -/* 9824CC 8024008C 24020001 */ addiu $v0, $zero, 1 -/* 9824D0 80240090 15020003 */ bne $t0, $v0, .L802400A0 -/* 9824D4 80240094 24020002 */ addiu $v0, $zero, 2 -/* 9824D8 80240098 03E00008 */ jr $ra -/* 9824DC 8024009C AC880088 */ sw $t0, 0x88($a0) -.L802400A0: -/* 9824E0 802400A0 03E00008 */ jr $ra -/* 9824E4 802400A4 00000000 */ nop -/* 9824E8 802400A8 00000000 */ nop -/* 9824EC 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014_982454.s b/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014_982454.s new file mode 100644 index 0000000000..bd969eca9a --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_07/982440/func_80240014_982454.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240014_982454 +/* 982454 80240014 0000502D */ daddu $t2, $zero, $zero +/* 982458 80240018 3C03800B */ lui $v1, %hi(gCurrentEncounter) +/* 98245C 8024001C 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) +/* 982460 80240020 AC800088 */ sw $zero, 0x88($a0) +/* 982464 80240024 8062001C */ lb $v0, 0x1c($v1) +/* 982468 80240028 18400018 */ blez $v0, .L8024008C +/* 98246C 8024002C 0140402D */ daddu $t0, $t2, $zero +/* 982470 80240030 0040582D */ daddu $t3, $v0, $zero +/* 982474 80240034 0060482D */ daddu $t1, $v1, $zero +.L80240038: +/* 982478 80240038 8D230028 */ lw $v1, 0x28($t1) +/* 98247C 8024003C 50600010 */ beql $v1, $zero, .L80240080 +/* 982480 80240040 254A0001 */ addiu $t2, $t2, 1 +/* 982484 80240044 0000282D */ daddu $a1, $zero, $zero +/* 982488 80240048 8C620000 */ lw $v0, ($v1) +/* 98248C 8024004C 18400009 */ blez $v0, .L80240074 +/* 982490 80240050 00A0302D */ daddu $a2, $a1, $zero +/* 982494 80240054 0040382D */ daddu $a3, $v0, $zero +.L80240058: +/* 982498 80240058 8C620004 */ lw $v0, 4($v1) +/* 98249C 8024005C 54400001 */ bnel $v0, $zero, .L80240064 +/* 9824A0 80240060 24060001 */ addiu $a2, $zero, 1 +.L80240064: +/* 9824A4 80240064 24A50001 */ addiu $a1, $a1, 1 +/* 9824A8 80240068 00A7102A */ slt $v0, $a1, $a3 +/* 9824AC 8024006C 1440FFFA */ bnez $v0, .L80240058 +/* 9824B0 80240070 24630004 */ addiu $v1, $v1, 4 +.L80240074: +/* 9824B4 80240074 54C00001 */ bnel $a2, $zero, .L8024007C +/* 9824B8 80240078 25080001 */ addiu $t0, $t0, 1 +.L8024007C: +/* 9824BC 8024007C 254A0001 */ addiu $t2, $t2, 1 +.L80240080: +/* 9824C0 80240080 014B102A */ slt $v0, $t2, $t3 +/* 9824C4 80240084 1440FFEC */ bnez $v0, .L80240038 +/* 9824C8 80240088 25290004 */ addiu $t1, $t1, 4 +.L8024008C: +/* 9824CC 8024008C 24020001 */ addiu $v0, $zero, 1 +/* 9824D0 80240090 15020003 */ bne $t0, $v0, .L802400A0 +/* 9824D4 80240094 24020002 */ addiu $v0, $zero, 2 +/* 9824D8 80240098 03E00008 */ jr $ra +/* 9824DC 8024009C AC880088 */ sw $t0, 0x88($a0) +.L802400A0: +/* 9824E0 802400A0 03E00008 */ jr $ra +/* 9824E4 802400A4 00000000 */ nop +/* 9824E8 802400A8 00000000 */ nop +/* 9824EC 802400AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C.s deleted file mode 100644 index 336fc39168..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024007C -/* 984EAC 8024007C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 984EB0 80240080 AFB3001C */ sw $s3, 0x1c($sp) -/* 984EB4 80240084 0080982D */ daddu $s3, $a0, $zero -/* 984EB8 80240088 AFBF0020 */ sw $ra, 0x20($sp) -/* 984EBC 8024008C AFB20018 */ sw $s2, 0x18($sp) -/* 984EC0 80240090 AFB10014 */ sw $s1, 0x14($sp) -/* 984EC4 80240094 AFB00010 */ sw $s0, 0x10($sp) -/* 984EC8 80240098 8E710148 */ lw $s1, 0x148($s3) -/* 984ECC 8024009C 86240008 */ lh $a0, 8($s1) -/* 984ED0 802400A0 0C00EABB */ jal get_npc_unsafe -/* 984ED4 802400A4 00A0902D */ daddu $s2, $a1, $zero -/* 984ED8 802400A8 0040802D */ daddu $s0, $v0, $zero -/* 984EDC 802400AC 8602008E */ lh $v0, 0x8e($s0) -/* 984EE0 802400B0 9603008E */ lhu $v1, 0x8e($s0) -/* 984EE4 802400B4 18400005 */ blez $v0, .L802400CC -/* 984EE8 802400B8 2462FFFF */ addiu $v0, $v1, -1 -/* 984EEC 802400BC A602008E */ sh $v0, 0x8e($s0) -/* 984EF0 802400C0 00021400 */ sll $v0, $v0, 0x10 -/* 984EF4 802400C4 1C400033 */ bgtz $v0, .L80240194 -/* 984EF8 802400C8 00000000 */ nop -.L802400CC: -/* 984EFC 802400CC 8602008C */ lh $v0, 0x8c($s0) -/* 984F00 802400D0 14400030 */ bnez $v0, .L80240194 -/* 984F04 802400D4 00000000 */ nop -/* 984F08 802400D8 8E2200CC */ lw $v0, 0xcc($s1) -/* 984F0C 802400DC 8C420024 */ lw $v0, 0x24($v0) -/* 984F10 802400E0 AE020028 */ sw $v0, 0x28($s0) -/* 984F14 802400E4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 984F18 802400E8 E6000018 */ swc1 $f0, 0x18($s0) -/* 984F1C 802400EC 8E230088 */ lw $v1, 0x88($s1) -/* 984F20 802400F0 24020005 */ addiu $v0, $zero, 5 -/* 984F24 802400F4 10620005 */ beq $v1, $v0, .L8024010C -/* 984F28 802400F8 00000000 */ nop -/* 984F2C 802400FC 10600003 */ beqz $v1, .L8024010C -/* 984F30 80240100 24020001 */ addiu $v0, $zero, 1 -/* 984F34 80240104 14620006 */ bne $v1, $v0, .L80240120 -/* 984F38 80240108 00000000 */ nop -.L8024010C: -/* 984F3C 8024010C 8E220084 */ lw $v0, 0x84($s1) -/* 984F40 80240110 00021FC2 */ srl $v1, $v0, 0x1f -/* 984F44 80240114 00431021 */ addu $v0, $v0, $v1 -/* 984F48 80240118 00021043 */ sra $v0, $v0, 1 -/* 984F4C 8024011C A60200A8 */ sh $v0, 0xa8($s0) -.L80240120: -/* 984F50 80240120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 984F54 80240124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 984F58 80240128 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 984F5C 8024012C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 984F60 80240130 8C460028 */ lw $a2, 0x28($v0) -/* 984F64 80240134 0C00A7B5 */ jal dist2D -/* 984F68 80240138 8C470030 */ lw $a3, 0x30($v0) -/* 984F6C 8024013C C6020018 */ lwc1 $f2, 0x18($s0) -/* 984F70 80240140 46020003 */ div.s $f0, $f0, $f2 -/* 984F74 80240144 3C018024 */ lui $at, 0x8024 -/* 984F78 80240148 D4221650 */ ldc1 $f2, 0x1650($at) -/* 984F7C 8024014C 46000021 */ cvt.d.s $f0, $f0 -/* 984F80 80240150 46220000 */ add.d $f0, $f0, $f2 -/* 984F84 80240154 4620010D */ trunc.w.d $f4, $f0 -/* 984F88 80240158 44022000 */ mfc1 $v0, $f4 -/* 984F8C 8024015C 00000000 */ nop -/* 984F90 80240160 A602008E */ sh $v0, 0x8e($s0) -/* 984F94 80240164 00021400 */ sll $v0, $v0, 0x10 -/* 984F98 80240168 8E230078 */ lw $v1, 0x78($s1) -/* 984F9C 8024016C 00021403 */ sra $v0, $v0, 0x10 -/* 984FA0 80240170 0043102A */ slt $v0, $v0, $v1 -/* 984FA4 80240174 10400003 */ beqz $v0, .L80240184 -/* 984FA8 80240178 00000000 */ nop -/* 984FAC 8024017C 9622007A */ lhu $v0, 0x7a($s1) -/* 984FB0 80240180 A602008E */ sh $v0, 0x8e($s0) -.L80240184: -/* 984FB4 80240184 8602008E */ lh $v0, 0x8e($s0) -/* 984FB8 80240188 AE22007C */ sw $v0, 0x7c($s1) -/* 984FBC 8024018C 2402000E */ addiu $v0, $zero, 0xe -/* 984FC0 80240190 AE620070 */ sw $v0, 0x70($s3) -.L80240194: -/* 984FC4 80240194 8FBF0020 */ lw $ra, 0x20($sp) -/* 984FC8 80240198 8FB3001C */ lw $s3, 0x1c($sp) -/* 984FCC 8024019C 8FB20018 */ lw $s2, 0x18($sp) -/* 984FD0 802401A0 8FB10014 */ lw $s1, 0x14($sp) -/* 984FD4 802401A4 8FB00010 */ lw $s0, 0x10($sp) -/* 984FD8 802401A8 03E00008 */ jr $ra -/* 984FDC 802401AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s new file mode 100644 index 0000000000..21d25b310b --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_8024007C_984EAC.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024007C_984EAC +/* 984EAC 8024007C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 984EB0 80240080 AFB3001C */ sw $s3, 0x1c($sp) +/* 984EB4 80240084 0080982D */ daddu $s3, $a0, $zero +/* 984EB8 80240088 AFBF0020 */ sw $ra, 0x20($sp) +/* 984EBC 8024008C AFB20018 */ sw $s2, 0x18($sp) +/* 984EC0 80240090 AFB10014 */ sw $s1, 0x14($sp) +/* 984EC4 80240094 AFB00010 */ sw $s0, 0x10($sp) +/* 984EC8 80240098 8E710148 */ lw $s1, 0x148($s3) +/* 984ECC 8024009C 86240008 */ lh $a0, 8($s1) +/* 984ED0 802400A0 0C00EABB */ jal get_npc_unsafe +/* 984ED4 802400A4 00A0902D */ daddu $s2, $a1, $zero +/* 984ED8 802400A8 0040802D */ daddu $s0, $v0, $zero +/* 984EDC 802400AC 8602008E */ lh $v0, 0x8e($s0) +/* 984EE0 802400B0 9603008E */ lhu $v1, 0x8e($s0) +/* 984EE4 802400B4 18400005 */ blez $v0, .L802400CC +/* 984EE8 802400B8 2462FFFF */ addiu $v0, $v1, -1 +/* 984EEC 802400BC A602008E */ sh $v0, 0x8e($s0) +/* 984EF0 802400C0 00021400 */ sll $v0, $v0, 0x10 +/* 984EF4 802400C4 1C400033 */ bgtz $v0, .L80240194 +/* 984EF8 802400C8 00000000 */ nop +.L802400CC: +/* 984EFC 802400CC 8602008C */ lh $v0, 0x8c($s0) +/* 984F00 802400D0 14400030 */ bnez $v0, .L80240194 +/* 984F04 802400D4 00000000 */ nop +/* 984F08 802400D8 8E2200CC */ lw $v0, 0xcc($s1) +/* 984F0C 802400DC 8C420024 */ lw $v0, 0x24($v0) +/* 984F10 802400E0 AE020028 */ sw $v0, 0x28($s0) +/* 984F14 802400E4 C6400018 */ lwc1 $f0, 0x18($s2) +/* 984F18 802400E8 E6000018 */ swc1 $f0, 0x18($s0) +/* 984F1C 802400EC 8E230088 */ lw $v1, 0x88($s1) +/* 984F20 802400F0 24020005 */ addiu $v0, $zero, 5 +/* 984F24 802400F4 10620005 */ beq $v1, $v0, .L8024010C +/* 984F28 802400F8 00000000 */ nop +/* 984F2C 802400FC 10600003 */ beqz $v1, .L8024010C +/* 984F30 80240100 24020001 */ addiu $v0, $zero, 1 +/* 984F34 80240104 14620006 */ bne $v1, $v0, .L80240120 +/* 984F38 80240108 00000000 */ nop +.L8024010C: +/* 984F3C 8024010C 8E220084 */ lw $v0, 0x84($s1) +/* 984F40 80240110 00021FC2 */ srl $v1, $v0, 0x1f +/* 984F44 80240114 00431021 */ addu $v0, $v0, $v1 +/* 984F48 80240118 00021043 */ sra $v0, $v0, 1 +/* 984F4C 8024011C A60200A8 */ sh $v0, 0xa8($s0) +.L80240120: +/* 984F50 80240120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 984F54 80240124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 984F58 80240128 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 984F5C 8024012C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 984F60 80240130 8C460028 */ lw $a2, 0x28($v0) +/* 984F64 80240134 0C00A7B5 */ jal dist2D +/* 984F68 80240138 8C470030 */ lw $a3, 0x30($v0) +/* 984F6C 8024013C C6020018 */ lwc1 $f2, 0x18($s0) +/* 984F70 80240140 46020003 */ div.s $f0, $f0, $f2 +/* 984F74 80240144 3C018024 */ lui $at, 0x8024 +/* 984F78 80240148 D4221650 */ ldc1 $f2, 0x1650($at) +/* 984F7C 8024014C 46000021 */ cvt.d.s $f0, $f0 +/* 984F80 80240150 46220000 */ add.d $f0, $f0, $f2 +/* 984F84 80240154 4620010D */ trunc.w.d $f4, $f0 +/* 984F88 80240158 44022000 */ mfc1 $v0, $f4 +/* 984F8C 8024015C 00000000 */ nop +/* 984F90 80240160 A602008E */ sh $v0, 0x8e($s0) +/* 984F94 80240164 00021400 */ sll $v0, $v0, 0x10 +/* 984F98 80240168 8E230078 */ lw $v1, 0x78($s1) +/* 984F9C 8024016C 00021403 */ sra $v0, $v0, 0x10 +/* 984FA0 80240170 0043102A */ slt $v0, $v0, $v1 +/* 984FA4 80240174 10400003 */ beqz $v0, .L80240184 +/* 984FA8 80240178 00000000 */ nop +/* 984FAC 8024017C 9622007A */ lhu $v0, 0x7a($s1) +/* 984FB0 80240180 A602008E */ sh $v0, 0x8e($s0) +.L80240184: +/* 984FB4 80240184 8602008E */ lh $v0, 0x8e($s0) +/* 984FB8 80240188 AE22007C */ sw $v0, 0x7c($s1) +/* 984FBC 8024018C 2402000E */ addiu $v0, $zero, 0xe +/* 984FC0 80240190 AE620070 */ sw $v0, 0x70($s3) +.L80240194: +/* 984FC4 80240194 8FBF0020 */ lw $ra, 0x20($sp) +/* 984FC8 80240198 8FB3001C */ lw $s3, 0x1c($sp) +/* 984FCC 8024019C 8FB20018 */ lw $s2, 0x18($sp) +/* 984FD0 802401A0 8FB10014 */ lw $s1, 0x14($sp) +/* 984FD4 802401A4 8FB00010 */ lw $s0, 0x10($sp) +/* 984FD8 802401A8 03E00008 */ jr $ra +/* 984FDC 802401AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394.s deleted file mode 100644 index da03c104dd..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240394 -/* 9851C4 80240394 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9851C8 80240398 AFB3005C */ sw $s3, 0x5c($sp) -/* 9851CC 8024039C 0080982D */ daddu $s3, $a0, $zero -/* 9851D0 802403A0 AFBF0068 */ sw $ra, 0x68($sp) -/* 9851D4 802403A4 AFB50064 */ sw $s5, 0x64($sp) -/* 9851D8 802403A8 AFB40060 */ sw $s4, 0x60($sp) -/* 9851DC 802403AC AFB20058 */ sw $s2, 0x58($sp) -/* 9851E0 802403B0 AFB10054 */ sw $s1, 0x54($sp) -/* 9851E4 802403B4 AFB00050 */ sw $s0, 0x50($sp) -/* 9851E8 802403B8 8E710148 */ lw $s1, 0x148($s3) -/* 9851EC 802403BC 86240008 */ lh $a0, 8($s1) -/* 9851F0 802403C0 0C00EABB */ jal get_npc_unsafe -/* 9851F4 802403C4 00A0802D */ daddu $s0, $a1, $zero -/* 9851F8 802403C8 8E63000C */ lw $v1, 0xc($s3) -/* 9851FC 802403CC 0260202D */ daddu $a0, $s3, $zero -/* 985200 802403D0 8C650000 */ lw $a1, ($v1) -/* 985204 802403D4 0C0B1EAF */ jal get_variable -/* 985208 802403D8 0040902D */ daddu $s2, $v0, $zero -/* 98520C 802403DC AFA00028 */ sw $zero, 0x28($sp) -/* 985210 802403E0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 985214 802403E4 8C630030 */ lw $v1, 0x30($v1) -/* 985218 802403E8 AFA3002C */ sw $v1, 0x2c($sp) -/* 98521C 802403EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 985220 802403F0 8C63001C */ lw $v1, 0x1c($v1) -/* 985224 802403F4 AFA30030 */ sw $v1, 0x30($sp) -/* 985228 802403F8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 98522C 802403FC 8C630024 */ lw $v1, 0x24($v1) -/* 985230 80240400 AFA30034 */ sw $v1, 0x34($sp) -/* 985234 80240404 8E2300D0 */ lw $v1, 0xd0($s1) -/* 985238 80240408 8C630028 */ lw $v1, 0x28($v1) -/* 98523C 8024040C 27B50028 */ addiu $s5, $sp, 0x28 -/* 985240 80240410 AFA30038 */ sw $v1, 0x38($sp) -/* 985244 80240414 8E2300D0 */ lw $v1, 0xd0($s1) -/* 985248 80240418 3C0142C8 */ lui $at, 0x42c8 -/* 98524C 8024041C 44810000 */ mtc1 $at, $f0 -/* 985250 80240420 8C63002C */ lw $v1, 0x2c($v1) -/* 985254 80240424 0040A02D */ daddu $s4, $v0, $zero -/* 985258 80240428 E7A00040 */ swc1 $f0, 0x40($sp) -/* 98525C 8024042C A7A00044 */ sh $zero, 0x44($sp) -/* 985260 80240430 12000009 */ beqz $s0, .L80240458 -/* 985264 80240434 AFA3003C */ sw $v1, 0x3c($sp) -/* 985268 80240438 864300A8 */ lh $v1, 0xa8($s2) -/* 98526C 8024043C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 985270 80240440 AE20008C */ sw $zero, 0x8c($s1) -/* 985274 80240444 A22000B5 */ sb $zero, 0xb5($s1) -/* 985278 80240448 34420008 */ ori $v0, $v0, 8 -/* 98527C 8024044C AE230084 */ sw $v1, 0x84($s1) -/* 985280 80240450 0809011A */ j .L80240468 -/* 985284 80240454 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240458: -/* 985288 80240458 8E2200B0 */ lw $v0, 0xb0($s1) -/* 98528C 8024045C 30420004 */ andi $v0, $v0, 4 -/* 985290 80240460 10400047 */ beqz $v0, .L80240580 -/* 985294 80240464 00000000 */ nop -.L80240468: -/* 985298 80240468 AE600070 */ sw $zero, 0x70($s3) -/* 98529C 8024046C A640008E */ sh $zero, 0x8e($s2) -/* 9852A0 80240470 8E2300CC */ lw $v1, 0xcc($s1) -/* 9852A4 80240474 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9852A8 80240478 A2200007 */ sb $zero, 7($s1) -/* 9852AC 8024047C 8E420000 */ lw $v0, ($s2) -/* 9852B0 80240480 8C630000 */ lw $v1, ($v1) -/* 9852B4 80240484 00441024 */ and $v0, $v0, $a0 -/* 9852B8 80240488 AE420000 */ sw $v0, ($s2) -/* 9852BC 8024048C AE430028 */ sw $v1, 0x28($s2) -/* 9852C0 80240490 96220086 */ lhu $v0, 0x86($s1) -/* 9852C4 80240494 A64200A8 */ sh $v0, 0xa8($s2) -/* 9852C8 80240498 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9852CC 8024049C AE200090 */ sw $zero, 0x90($s1) -/* 9852D0 802404A0 8C420034 */ lw $v0, 0x34($v0) -/* 9852D4 802404A4 14400006 */ bnez $v0, .L802404C0 -/* 9852D8 802404A8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9852DC 802404AC 8E420000 */ lw $v0, ($s2) -/* 9852E0 802404B0 2403FFF7 */ addiu $v1, $zero, -9 -/* 9852E4 802404B4 34420200 */ ori $v0, $v0, 0x200 -/* 9852E8 802404B8 08090133 */ j .L802404CC -/* 9852EC 802404BC 00431024 */ and $v0, $v0, $v1 -.L802404C0: -/* 9852F0 802404C0 8E420000 */ lw $v0, ($s2) -/* 9852F4 802404C4 00431024 */ and $v0, $v0, $v1 -/* 9852F8 802404C8 34420008 */ ori $v0, $v0, 8 -.L802404CC: -/* 9852FC 802404CC AE420000 */ sw $v0, ($s2) -/* 985300 802404D0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 985304 802404D4 30420004 */ andi $v0, $v0, 4 -/* 985308 802404D8 1040001E */ beqz $v0, .L80240554 -/* 98530C 802404DC 24040002 */ addiu $a0, $zero, 2 -/* 985310 802404E0 0240282D */ daddu $a1, $s2, $zero -/* 985314 802404E4 0000302D */ daddu $a2, $zero, $zero -/* 985318 802404E8 24020063 */ addiu $v0, $zero, 0x63 -/* 98531C 802404EC AE620070 */ sw $v0, 0x70($s3) -/* 985320 802404F0 AE600074 */ sw $zero, 0x74($s3) -/* 985324 802404F4 864300A8 */ lh $v1, 0xa8($s2) -/* 985328 802404F8 3C013F80 */ lui $at, 0x3f80 -/* 98532C 802404FC 44810000 */ mtc1 $at, $f0 -/* 985330 80240500 3C014000 */ lui $at, 0x4000 -/* 985334 80240504 44811000 */ mtc1 $at, $f2 -/* 985338 80240508 3C01C1A0 */ lui $at, 0xc1a0 -/* 98533C 8024050C 44812000 */ mtc1 $at, $f4 -/* 985340 80240510 24020028 */ addiu $v0, $zero, 0x28 -/* 985344 80240514 AFA2001C */ sw $v0, 0x1c($sp) -/* 985348 80240518 44833000 */ mtc1 $v1, $f6 -/* 98534C 8024051C 00000000 */ nop -/* 985350 80240520 468031A0 */ cvt.s.w $f6, $f6 -/* 985354 80240524 44073000 */ mfc1 $a3, $f6 -/* 985358 80240528 27A20048 */ addiu $v0, $sp, 0x48 -/* 98535C 8024052C AFA20020 */ sw $v0, 0x20($sp) -/* 985360 80240530 E7A00010 */ swc1 $f0, 0x10($sp) -/* 985364 80240534 E7A20014 */ swc1 $f2, 0x14($sp) -/* 985368 80240538 0C01BFA4 */ jal fx_emote -/* 98536C 8024053C E7A40018 */ swc1 $f4, 0x18($sp) -/* 985370 80240540 8E2200B0 */ lw $v0, 0xb0($s1) -/* 985374 80240544 2403FFFB */ addiu $v1, $zero, -5 -/* 985378 80240548 00431024 */ and $v0, $v0, $v1 -/* 98537C 8024054C 08090160 */ j .L80240580 -/* 985380 80240550 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240554: -/* 985384 80240554 8E220000 */ lw $v0, ($s1) -/* 985388 80240558 3C034000 */ lui $v1, 0x4000 -/* 98538C 8024055C 00431024 */ and $v0, $v0, $v1 -/* 985390 80240560 10400007 */ beqz $v0, .L80240580 -/* 985394 80240564 3C03BFFF */ lui $v1, 0xbfff -/* 985398 80240568 2402000C */ addiu $v0, $zero, 0xc -/* 98539C 8024056C AE620070 */ sw $v0, 0x70($s3) -/* 9853A0 80240570 8E220000 */ lw $v0, ($s1) -/* 9853A4 80240574 3463FFFF */ ori $v1, $v1, 0xffff -/* 9853A8 80240578 00431024 */ and $v0, $v0, $v1 -/* 9853AC 8024057C AE220000 */ sw $v0, ($s1) -.L80240580: -/* 9853B0 80240580 8E220090 */ lw $v0, 0x90($s1) -/* 9853B4 80240584 1840000C */ blez $v0, .L802405B8 -/* 9853B8 80240588 2442FFFF */ addiu $v0, $v0, -1 -/* 9853BC 8024058C 14400087 */ bnez $v0, .L802407AC -/* 9853C0 80240590 AE220090 */ sw $v0, 0x90($s1) -/* 9853C4 80240594 3C03FFAA */ lui $v1, 0xffaa -/* 9853C8 80240598 8E420028 */ lw $v0, 0x28($s2) -/* 9853CC 8024059C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9853D0 802405A0 00431021 */ addu $v0, $v0, $v1 -/* 9853D4 802405A4 2C420002 */ sltiu $v0, $v0, 2 -/* 9853D8 802405A8 10400003 */ beqz $v0, .L802405B8 -/* 9853DC 802405AC 3C020055 */ lui $v0, 0x55 -/* 9853E0 802405B0 3442000C */ ori $v0, $v0, 0xc -/* 9853E4 802405B4 AE420028 */ sw $v0, 0x28($s2) -.L802405B8: -/* 9853E8 802405B8 8E630070 */ lw $v1, 0x70($s3) -/* 9853EC 802405BC 2402000C */ addiu $v0, $zero, 0xc -/* 9853F0 802405C0 10620048 */ beq $v1, $v0, .L802406E4 -/* 9853F4 802405C4 2862000D */ slti $v0, $v1, 0xd -/* 9853F8 802405C8 1040000F */ beqz $v0, .L80240608 -/* 9853FC 802405CC 24100001 */ addiu $s0, $zero, 1 -/* 985400 802405D0 1070001E */ beq $v1, $s0, .L8024064C -/* 985404 802405D4 28620002 */ slti $v0, $v1, 2 -/* 985408 802405D8 10400005 */ beqz $v0, .L802405F0 -/* 98540C 802405DC 24020002 */ addiu $v0, $zero, 2 -/* 985410 802405E0 10600015 */ beqz $v1, .L80240638 -/* 985414 802405E4 0260202D */ daddu $a0, $s3, $zero -/* 985418 802405E8 080901D0 */ j .L80240740 -/* 98541C 802405EC 00000000 */ nop -.L802405F0: -/* 985420 802405F0 1062001C */ beq $v1, $v0, .L80240664 -/* 985424 802405F4 24020003 */ addiu $v0, $zero, 3 -/* 985428 802405F8 10620035 */ beq $v1, $v0, .L802406D0 -/* 98542C 802405FC 0260202D */ daddu $a0, $s3, $zero -/* 985430 80240600 080901D0 */ j .L80240740 -/* 985434 80240604 00000000 */ nop -.L80240608: -/* 985438 80240608 2402000E */ addiu $v0, $zero, 0xe -/* 98543C 8024060C 1062003F */ beq $v1, $v0, .L8024070C -/* 985440 80240610 0062102A */ slt $v0, $v1, $v0 -/* 985444 80240614 14400038 */ bnez $v0, .L802406F8 -/* 985448 80240618 0260202D */ daddu $a0, $s3, $zero -/* 98544C 8024061C 2402000F */ addiu $v0, $zero, 0xf -/* 985450 80240620 10620040 */ beq $v1, $v0, .L80240724 -/* 985454 80240624 24020063 */ addiu $v0, $zero, 0x63 -/* 985458 80240628 10620043 */ beq $v1, $v0, .L80240738 -/* 98545C 8024062C 00000000 */ nop -/* 985460 80240630 080901D0 */ j .L80240740 -/* 985464 80240634 00000000 */ nop -.L80240638: -/* 985468 80240638 0280282D */ daddu $a1, $s4, $zero -/* 98546C 8024063C 0C012568 */ jal func_800495A0 -/* 985470 80240640 02A0302D */ daddu $a2, $s5, $zero -/* 985474 80240644 96220086 */ lhu $v0, 0x86($s1) -/* 985478 80240648 A64200A8 */ sh $v0, 0xa8($s2) -.L8024064C: -/* 98547C 8024064C 0260202D */ daddu $a0, $s3, $zero -/* 985480 80240650 0280282D */ daddu $a1, $s4, $zero -/* 985484 80240654 0C0125AE */ jal func_800496B8 -/* 985488 80240658 02A0302D */ daddu $a2, $s5, $zero -/* 98548C 8024065C 080901D0 */ j .L80240740 -/* 985490 80240660 00000000 */ nop -.L80240664: -/* 985494 80240664 0260202D */ daddu $a0, $s3, $zero -/* 985498 80240668 0280282D */ daddu $a1, $s4, $zero -/* 98549C 8024066C 0C0126D1 */ jal func_80049B44 -/* 9854A0 80240670 02A0302D */ daddu $a2, $s5, $zero -/* 9854A4 80240674 8E230088 */ lw $v1, 0x88($s1) -/* 9854A8 80240678 24020006 */ addiu $v0, $zero, 6 -/* 9854AC 8024067C 14620014 */ bne $v1, $v0, .L802406D0 -/* 9854B0 80240680 0260202D */ daddu $a0, $s3, $zero -/* 9854B4 80240684 0C00A67F */ jal rand_int -/* 9854B8 80240688 24040064 */ addiu $a0, $zero, 0x64 -/* 9854BC 8024068C 28420021 */ slti $v0, $v0, 0x21 -/* 9854C0 80240690 5040000F */ beql $v0, $zero, .L802406D0 -/* 9854C4 80240694 0260202D */ daddu $a0, $s3, $zero -/* 9854C8 80240698 8E22008C */ lw $v0, 0x8c($s1) -/* 9854CC 8024069C 10400005 */ beqz $v0, .L802406B4 -/* 9854D0 802406A0 3C020055 */ lui $v0, 0x55 -/* 9854D4 802406A4 3442002F */ ori $v0, $v0, 0x2f -/* 9854D8 802406A8 AE20008C */ sw $zero, 0x8c($s1) -/* 9854DC 802406AC 080901B0 */ j .L802406C0 -/* 9854E0 802406B0 A22000B5 */ sb $zero, 0xb5($s1) -.L802406B4: -/* 9854E4 802406B4 3442002E */ ori $v0, $v0, 0x2e -/* 9854E8 802406B8 AE30008C */ sw $s0, 0x8c($s1) -/* 9854EC 802406BC A23000B5 */ sb $s0, 0xb5($s1) -.L802406C0: -/* 9854F0 802406C0 AE420028 */ sw $v0, 0x28($s2) -/* 9854F4 802406C4 24020007 */ addiu $v0, $zero, 7 -/* 9854F8 802406C8 080901EB */ j .L802407AC -/* 9854FC 802406CC AE220090 */ sw $v0, 0x90($s1) -.L802406D0: -/* 985500 802406D0 0280282D */ daddu $a1, $s4, $zero -/* 985504 802406D4 0C012701 */ jal func_80049C04 -/* 985508 802406D8 02A0302D */ daddu $a2, $s5, $zero -/* 98550C 802406DC 080901D0 */ j .L80240740 -/* 985510 802406E0 00000000 */ nop -.L802406E4: -/* 985514 802406E4 0260202D */ daddu $a0, $s3, $zero -/* 985518 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 98551C 802406EC 0C090000 */ jal func_80240000 -/* 985520 802406F0 02A0302D */ daddu $a2, $s5, $zero -/* 985524 802406F4 0260202D */ daddu $a0, $s3, $zero -.L802406F8: -/* 985528 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 98552C 802406FC 0C09001F */ jal func_8024007C -/* 985530 80240700 02A0302D */ daddu $a2, $s5, $zero -/* 985534 80240704 080901D0 */ j .L80240740 -/* 985538 80240708 00000000 */ nop -.L8024070C: -/* 98553C 8024070C 0260202D */ daddu $a0, $s3, $zero -/* 985540 80240710 0280282D */ daddu $a1, $s4, $zero -/* 985544 80240714 0C09006C */ jal func_802401B0 -/* 985548 80240718 02A0302D */ daddu $a2, $s5, $zero -/* 98554C 8024071C 080901D0 */ j .L80240740 -/* 985550 80240720 00000000 */ nop -.L80240724: -/* 985554 80240724 0280282D */ daddu $a1, $s4, $zero -/* 985558 80240728 0C0900C5 */ jal func_80240314 -/* 98555C 8024072C 02A0302D */ daddu $a2, $s5, $zero -/* 985560 80240730 080901D0 */ j .L80240740 -/* 985564 80240734 00000000 */ nop -.L80240738: -/* 985568 80240738 0C0129CF */ jal func_8004A73C -/* 98556C 8024073C 0260202D */ daddu $a0, $s3, $zero -.L80240740: -/* 985570 80240740 8E230088 */ lw $v1, 0x88($s1) -/* 985574 80240744 24020006 */ addiu $v0, $zero, 6 -/* 985578 80240748 14620019 */ bne $v1, $v0, .L802407B0 -/* 98557C 8024074C 0000102D */ daddu $v0, $zero, $zero -/* 985580 80240750 8E22008C */ lw $v0, 0x8c($s1) -/* 985584 80240754 10400003 */ beqz $v0, .L80240764 -/* 985588 80240758 24020001 */ addiu $v0, $zero, 1 -/* 98558C 8024075C 080901DA */ j .L80240768 -/* 985590 80240760 A22200B5 */ sb $v0, 0xb5($s1) -.L80240764: -/* 985594 80240764 A22000B5 */ sb $zero, 0xb5($s1) -.L80240768: -/* 985598 80240768 8E22008C */ lw $v0, 0x8c($s1) -/* 98559C 8024076C 1040000F */ beqz $v0, .L802407AC -/* 9855A0 80240770 3C03FFAA */ lui $v1, 0xffaa -/* 9855A4 80240774 8E420028 */ lw $v0, 0x28($s2) -/* 9855A8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9855AC 8024077C 00431821 */ addu $v1, $v0, $v1 -/* 9855B0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9855B4 80240784 10400009 */ beqz $v0, .L802407AC -/* 9855B8 80240788 00031080 */ sll $v0, $v1, 2 -/* 9855BC 8024078C 3C018024 */ lui $at, 0x8024 -/* 9855C0 80240790 00220821 */ addu $at, $at, $v0 -/* 9855C4 80240794 8C221658 */ lw $v0, 0x1658($at) -/* 9855C8 80240798 00400008 */ jr $v0 -/* 9855CC 8024079C 00000000 */ nop -/* 9855D0 802407A0 8E420028 */ lw $v0, 0x28($s2) -/* 9855D4 802407A4 24420001 */ addiu $v0, $v0, 1 -/* 9855D8 802407A8 AE420028 */ sw $v0, 0x28($s2) -.L802407AC: -/* 9855DC 802407AC 0000102D */ daddu $v0, $zero, $zero -.L802407B0: -/* 9855E0 802407B0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9855E4 802407B4 8FB50064 */ lw $s5, 0x64($sp) -/* 9855E8 802407B8 8FB40060 */ lw $s4, 0x60($sp) -/* 9855EC 802407BC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9855F0 802407C0 8FB20058 */ lw $s2, 0x58($sp) -/* 9855F4 802407C4 8FB10054 */ lw $s1, 0x54($sp) -/* 9855F8 802407C8 8FB00050 */ lw $s0, 0x50($sp) -/* 9855FC 802407CC 03E00008 */ jr $ra -/* 985600 802407D0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s new file mode 100644 index 0000000000..9adc79c06e --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240394_9851C4.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240394_9851C4 +/* 9851C4 80240394 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 9851C8 80240398 AFB3005C */ sw $s3, 0x5c($sp) +/* 9851CC 8024039C 0080982D */ daddu $s3, $a0, $zero +/* 9851D0 802403A0 AFBF0068 */ sw $ra, 0x68($sp) +/* 9851D4 802403A4 AFB50064 */ sw $s5, 0x64($sp) +/* 9851D8 802403A8 AFB40060 */ sw $s4, 0x60($sp) +/* 9851DC 802403AC AFB20058 */ sw $s2, 0x58($sp) +/* 9851E0 802403B0 AFB10054 */ sw $s1, 0x54($sp) +/* 9851E4 802403B4 AFB00050 */ sw $s0, 0x50($sp) +/* 9851E8 802403B8 8E710148 */ lw $s1, 0x148($s3) +/* 9851EC 802403BC 86240008 */ lh $a0, 8($s1) +/* 9851F0 802403C0 0C00EABB */ jal get_npc_unsafe +/* 9851F4 802403C4 00A0802D */ daddu $s0, $a1, $zero +/* 9851F8 802403C8 8E63000C */ lw $v1, 0xc($s3) +/* 9851FC 802403CC 0260202D */ daddu $a0, $s3, $zero +/* 985200 802403D0 8C650000 */ lw $a1, ($v1) +/* 985204 802403D4 0C0B1EAF */ jal get_variable +/* 985208 802403D8 0040902D */ daddu $s2, $v0, $zero +/* 98520C 802403DC AFA00028 */ sw $zero, 0x28($sp) +/* 985210 802403E0 8E2300D0 */ lw $v1, 0xd0($s1) +/* 985214 802403E4 8C630030 */ lw $v1, 0x30($v1) +/* 985218 802403E8 AFA3002C */ sw $v1, 0x2c($sp) +/* 98521C 802403EC 8E2300D0 */ lw $v1, 0xd0($s1) +/* 985220 802403F0 8C63001C */ lw $v1, 0x1c($v1) +/* 985224 802403F4 AFA30030 */ sw $v1, 0x30($sp) +/* 985228 802403F8 8E2300D0 */ lw $v1, 0xd0($s1) +/* 98522C 802403FC 8C630024 */ lw $v1, 0x24($v1) +/* 985230 80240400 AFA30034 */ sw $v1, 0x34($sp) +/* 985234 80240404 8E2300D0 */ lw $v1, 0xd0($s1) +/* 985238 80240408 8C630028 */ lw $v1, 0x28($v1) +/* 98523C 8024040C 27B50028 */ addiu $s5, $sp, 0x28 +/* 985240 80240410 AFA30038 */ sw $v1, 0x38($sp) +/* 985244 80240414 8E2300D0 */ lw $v1, 0xd0($s1) +/* 985248 80240418 3C0142C8 */ lui $at, 0x42c8 +/* 98524C 8024041C 44810000 */ mtc1 $at, $f0 +/* 985250 80240420 8C63002C */ lw $v1, 0x2c($v1) +/* 985254 80240424 0040A02D */ daddu $s4, $v0, $zero +/* 985258 80240428 E7A00040 */ swc1 $f0, 0x40($sp) +/* 98525C 8024042C A7A00044 */ sh $zero, 0x44($sp) +/* 985260 80240430 12000009 */ beqz $s0, .L80240458 +/* 985264 80240434 AFA3003C */ sw $v1, 0x3c($sp) +/* 985268 80240438 864300A8 */ lh $v1, 0xa8($s2) +/* 98526C 8024043C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 985270 80240440 AE20008C */ sw $zero, 0x8c($s1) +/* 985274 80240444 A22000B5 */ sb $zero, 0xb5($s1) +/* 985278 80240448 34420008 */ ori $v0, $v0, 8 +/* 98527C 8024044C AE230084 */ sw $v1, 0x84($s1) +/* 985280 80240450 0809011A */ j .L80240468 +/* 985284 80240454 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240458: +/* 985288 80240458 8E2200B0 */ lw $v0, 0xb0($s1) +/* 98528C 8024045C 30420004 */ andi $v0, $v0, 4 +/* 985290 80240460 10400047 */ beqz $v0, .L80240580 +/* 985294 80240464 00000000 */ nop +.L80240468: +/* 985298 80240468 AE600070 */ sw $zero, 0x70($s3) +/* 98529C 8024046C A640008E */ sh $zero, 0x8e($s2) +/* 9852A0 80240470 8E2300CC */ lw $v1, 0xcc($s1) +/* 9852A4 80240474 2404F7FF */ addiu $a0, $zero, -0x801 +/* 9852A8 80240478 A2200007 */ sb $zero, 7($s1) +/* 9852AC 8024047C 8E420000 */ lw $v0, ($s2) +/* 9852B0 80240480 8C630000 */ lw $v1, ($v1) +/* 9852B4 80240484 00441024 */ and $v0, $v0, $a0 +/* 9852B8 80240488 AE420000 */ sw $v0, ($s2) +/* 9852BC 8024048C AE430028 */ sw $v1, 0x28($s2) +/* 9852C0 80240490 96220086 */ lhu $v0, 0x86($s1) +/* 9852C4 80240494 A64200A8 */ sh $v0, 0xa8($s2) +/* 9852C8 80240498 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9852CC 8024049C AE200090 */ sw $zero, 0x90($s1) +/* 9852D0 802404A0 8C420034 */ lw $v0, 0x34($v0) +/* 9852D4 802404A4 14400006 */ bnez $v0, .L802404C0 +/* 9852D8 802404A8 2403FDFF */ addiu $v1, $zero, -0x201 +/* 9852DC 802404AC 8E420000 */ lw $v0, ($s2) +/* 9852E0 802404B0 2403FFF7 */ addiu $v1, $zero, -9 +/* 9852E4 802404B4 34420200 */ ori $v0, $v0, 0x200 +/* 9852E8 802404B8 08090133 */ j .L802404CC +/* 9852EC 802404BC 00431024 */ and $v0, $v0, $v1 +.L802404C0: +/* 9852F0 802404C0 8E420000 */ lw $v0, ($s2) +/* 9852F4 802404C4 00431024 */ and $v0, $v0, $v1 +/* 9852F8 802404C8 34420008 */ ori $v0, $v0, 8 +.L802404CC: +/* 9852FC 802404CC AE420000 */ sw $v0, ($s2) +/* 985300 802404D0 8E2200B0 */ lw $v0, 0xb0($s1) +/* 985304 802404D4 30420004 */ andi $v0, $v0, 4 +/* 985308 802404D8 1040001E */ beqz $v0, .L80240554 +/* 98530C 802404DC 24040002 */ addiu $a0, $zero, 2 +/* 985310 802404E0 0240282D */ daddu $a1, $s2, $zero +/* 985314 802404E4 0000302D */ daddu $a2, $zero, $zero +/* 985318 802404E8 24020063 */ addiu $v0, $zero, 0x63 +/* 98531C 802404EC AE620070 */ sw $v0, 0x70($s3) +/* 985320 802404F0 AE600074 */ sw $zero, 0x74($s3) +/* 985324 802404F4 864300A8 */ lh $v1, 0xa8($s2) +/* 985328 802404F8 3C013F80 */ lui $at, 0x3f80 +/* 98532C 802404FC 44810000 */ mtc1 $at, $f0 +/* 985330 80240500 3C014000 */ lui $at, 0x4000 +/* 985334 80240504 44811000 */ mtc1 $at, $f2 +/* 985338 80240508 3C01C1A0 */ lui $at, 0xc1a0 +/* 98533C 8024050C 44812000 */ mtc1 $at, $f4 +/* 985340 80240510 24020028 */ addiu $v0, $zero, 0x28 +/* 985344 80240514 AFA2001C */ sw $v0, 0x1c($sp) +/* 985348 80240518 44833000 */ mtc1 $v1, $f6 +/* 98534C 8024051C 00000000 */ nop +/* 985350 80240520 468031A0 */ cvt.s.w $f6, $f6 +/* 985354 80240524 44073000 */ mfc1 $a3, $f6 +/* 985358 80240528 27A20048 */ addiu $v0, $sp, 0x48 +/* 98535C 8024052C AFA20020 */ sw $v0, 0x20($sp) +/* 985360 80240530 E7A00010 */ swc1 $f0, 0x10($sp) +/* 985364 80240534 E7A20014 */ swc1 $f2, 0x14($sp) +/* 985368 80240538 0C01BFA4 */ jal fx_emote +/* 98536C 8024053C E7A40018 */ swc1 $f4, 0x18($sp) +/* 985370 80240540 8E2200B0 */ lw $v0, 0xb0($s1) +/* 985374 80240544 2403FFFB */ addiu $v1, $zero, -5 +/* 985378 80240548 00431024 */ and $v0, $v0, $v1 +/* 98537C 8024054C 08090160 */ j .L80240580 +/* 985380 80240550 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240554: +/* 985384 80240554 8E220000 */ lw $v0, ($s1) +/* 985388 80240558 3C034000 */ lui $v1, 0x4000 +/* 98538C 8024055C 00431024 */ and $v0, $v0, $v1 +/* 985390 80240560 10400007 */ beqz $v0, .L80240580 +/* 985394 80240564 3C03BFFF */ lui $v1, 0xbfff +/* 985398 80240568 2402000C */ addiu $v0, $zero, 0xc +/* 98539C 8024056C AE620070 */ sw $v0, 0x70($s3) +/* 9853A0 80240570 8E220000 */ lw $v0, ($s1) +/* 9853A4 80240574 3463FFFF */ ori $v1, $v1, 0xffff +/* 9853A8 80240578 00431024 */ and $v0, $v0, $v1 +/* 9853AC 8024057C AE220000 */ sw $v0, ($s1) +.L80240580: +/* 9853B0 80240580 8E220090 */ lw $v0, 0x90($s1) +/* 9853B4 80240584 1840000C */ blez $v0, .L802405B8 +/* 9853B8 80240588 2442FFFF */ addiu $v0, $v0, -1 +/* 9853BC 8024058C 14400087 */ bnez $v0, .L802407AC +/* 9853C0 80240590 AE220090 */ sw $v0, 0x90($s1) +/* 9853C4 80240594 3C03FFAA */ lui $v1, 0xffaa +/* 9853C8 80240598 8E420028 */ lw $v0, 0x28($s2) +/* 9853CC 8024059C 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 9853D0 802405A0 00431021 */ addu $v0, $v0, $v1 +/* 9853D4 802405A4 2C420002 */ sltiu $v0, $v0, 2 +/* 9853D8 802405A8 10400003 */ beqz $v0, .L802405B8 +/* 9853DC 802405AC 3C020055 */ lui $v0, 0x55 +/* 9853E0 802405B0 3442000C */ ori $v0, $v0, 0xc +/* 9853E4 802405B4 AE420028 */ sw $v0, 0x28($s2) +.L802405B8: +/* 9853E8 802405B8 8E630070 */ lw $v1, 0x70($s3) +/* 9853EC 802405BC 2402000C */ addiu $v0, $zero, 0xc +/* 9853F0 802405C0 10620048 */ beq $v1, $v0, .L802406E4 +/* 9853F4 802405C4 2862000D */ slti $v0, $v1, 0xd +/* 9853F8 802405C8 1040000F */ beqz $v0, .L80240608 +/* 9853FC 802405CC 24100001 */ addiu $s0, $zero, 1 +/* 985400 802405D0 1070001E */ beq $v1, $s0, .L8024064C +/* 985404 802405D4 28620002 */ slti $v0, $v1, 2 +/* 985408 802405D8 10400005 */ beqz $v0, .L802405F0 +/* 98540C 802405DC 24020002 */ addiu $v0, $zero, 2 +/* 985410 802405E0 10600015 */ beqz $v1, .L80240638 +/* 985414 802405E4 0260202D */ daddu $a0, $s3, $zero +/* 985418 802405E8 080901D0 */ j .L80240740 +/* 98541C 802405EC 00000000 */ nop +.L802405F0: +/* 985420 802405F0 1062001C */ beq $v1, $v0, .L80240664 +/* 985424 802405F4 24020003 */ addiu $v0, $zero, 3 +/* 985428 802405F8 10620035 */ beq $v1, $v0, .L802406D0 +/* 98542C 802405FC 0260202D */ daddu $a0, $s3, $zero +/* 985430 80240600 080901D0 */ j .L80240740 +/* 985434 80240604 00000000 */ nop +.L80240608: +/* 985438 80240608 2402000E */ addiu $v0, $zero, 0xe +/* 98543C 8024060C 1062003F */ beq $v1, $v0, .L8024070C +/* 985440 80240610 0062102A */ slt $v0, $v1, $v0 +/* 985444 80240614 14400038 */ bnez $v0, .L802406F8 +/* 985448 80240618 0260202D */ daddu $a0, $s3, $zero +/* 98544C 8024061C 2402000F */ addiu $v0, $zero, 0xf +/* 985450 80240620 10620040 */ beq $v1, $v0, .L80240724 +/* 985454 80240624 24020063 */ addiu $v0, $zero, 0x63 +/* 985458 80240628 10620043 */ beq $v1, $v0, .L80240738 +/* 98545C 8024062C 00000000 */ nop +/* 985460 80240630 080901D0 */ j .L80240740 +/* 985464 80240634 00000000 */ nop +.L80240638: +/* 985468 80240638 0280282D */ daddu $a1, $s4, $zero +/* 98546C 8024063C 0C012568 */ jal func_800495A0 +/* 985470 80240640 02A0302D */ daddu $a2, $s5, $zero +/* 985474 80240644 96220086 */ lhu $v0, 0x86($s1) +/* 985478 80240648 A64200A8 */ sh $v0, 0xa8($s2) +.L8024064C: +/* 98547C 8024064C 0260202D */ daddu $a0, $s3, $zero +/* 985480 80240650 0280282D */ daddu $a1, $s4, $zero +/* 985484 80240654 0C0125AE */ jal func_800496B8 +/* 985488 80240658 02A0302D */ daddu $a2, $s5, $zero +/* 98548C 8024065C 080901D0 */ j .L80240740 +/* 985490 80240660 00000000 */ nop +.L80240664: +/* 985494 80240664 0260202D */ daddu $a0, $s3, $zero +/* 985498 80240668 0280282D */ daddu $a1, $s4, $zero +/* 98549C 8024066C 0C0126D1 */ jal func_80049B44 +/* 9854A0 80240670 02A0302D */ daddu $a2, $s5, $zero +/* 9854A4 80240674 8E230088 */ lw $v1, 0x88($s1) +/* 9854A8 80240678 24020006 */ addiu $v0, $zero, 6 +/* 9854AC 8024067C 14620014 */ bne $v1, $v0, .L802406D0 +/* 9854B0 80240680 0260202D */ daddu $a0, $s3, $zero +/* 9854B4 80240684 0C00A67F */ jal rand_int +/* 9854B8 80240688 24040064 */ addiu $a0, $zero, 0x64 +/* 9854BC 8024068C 28420021 */ slti $v0, $v0, 0x21 +/* 9854C0 80240690 5040000F */ beql $v0, $zero, .L802406D0 +/* 9854C4 80240694 0260202D */ daddu $a0, $s3, $zero +/* 9854C8 80240698 8E22008C */ lw $v0, 0x8c($s1) +/* 9854CC 8024069C 10400005 */ beqz $v0, .L802406B4 +/* 9854D0 802406A0 3C020055 */ lui $v0, 0x55 +/* 9854D4 802406A4 3442002F */ ori $v0, $v0, 0x2f +/* 9854D8 802406A8 AE20008C */ sw $zero, 0x8c($s1) +/* 9854DC 802406AC 080901B0 */ j .L802406C0 +/* 9854E0 802406B0 A22000B5 */ sb $zero, 0xb5($s1) +.L802406B4: +/* 9854E4 802406B4 3442002E */ ori $v0, $v0, 0x2e +/* 9854E8 802406B8 AE30008C */ sw $s0, 0x8c($s1) +/* 9854EC 802406BC A23000B5 */ sb $s0, 0xb5($s1) +.L802406C0: +/* 9854F0 802406C0 AE420028 */ sw $v0, 0x28($s2) +/* 9854F4 802406C4 24020007 */ addiu $v0, $zero, 7 +/* 9854F8 802406C8 080901EB */ j .L802407AC +/* 9854FC 802406CC AE220090 */ sw $v0, 0x90($s1) +.L802406D0: +/* 985500 802406D0 0280282D */ daddu $a1, $s4, $zero +/* 985504 802406D4 0C012701 */ jal func_80049C04 +/* 985508 802406D8 02A0302D */ daddu $a2, $s5, $zero +/* 98550C 802406DC 080901D0 */ j .L80240740 +/* 985510 802406E0 00000000 */ nop +.L802406E4: +/* 985514 802406E4 0260202D */ daddu $a0, $s3, $zero +/* 985518 802406E8 0280282D */ daddu $a1, $s4, $zero +/* 98551C 802406EC 0C090000 */ jal func_80240000_984E30 +/* 985520 802406F0 02A0302D */ daddu $a2, $s5, $zero +/* 985524 802406F4 0260202D */ daddu $a0, $s3, $zero +.L802406F8: +/* 985528 802406F8 0280282D */ daddu $a1, $s4, $zero +/* 98552C 802406FC 0C09001F */ jal func_8024007C_984EAC +/* 985530 80240700 02A0302D */ daddu $a2, $s5, $zero +/* 985534 80240704 080901D0 */ j .L80240740 +/* 985538 80240708 00000000 */ nop +.L8024070C: +/* 98553C 8024070C 0260202D */ daddu $a0, $s3, $zero +/* 985540 80240710 0280282D */ daddu $a1, $s4, $zero +/* 985544 80240714 0C09006C */ jal func_802401B0_984FE0 +/* 985548 80240718 02A0302D */ daddu $a2, $s5, $zero +/* 98554C 8024071C 080901D0 */ j .L80240740 +/* 985550 80240720 00000000 */ nop +.L80240724: +/* 985554 80240724 0280282D */ daddu $a1, $s4, $zero +/* 985558 80240728 0C0900C5 */ jal func_80240314_985144 +/* 98555C 8024072C 02A0302D */ daddu $a2, $s5, $zero +/* 985560 80240730 080901D0 */ j .L80240740 +/* 985564 80240734 00000000 */ nop +.L80240738: +/* 985568 80240738 0C0129CF */ jal func_8004A73C +/* 98556C 8024073C 0260202D */ daddu $a0, $s3, $zero +.L80240740: +/* 985570 80240740 8E230088 */ lw $v1, 0x88($s1) +/* 985574 80240744 24020006 */ addiu $v0, $zero, 6 +/* 985578 80240748 14620019 */ bne $v1, $v0, .L802407B0 +/* 98557C 8024074C 0000102D */ daddu $v0, $zero, $zero +/* 985580 80240750 8E22008C */ lw $v0, 0x8c($s1) +/* 985584 80240754 10400003 */ beqz $v0, .L80240764 +/* 985588 80240758 24020001 */ addiu $v0, $zero, 1 +/* 98558C 8024075C 080901DA */ j .L80240768 +/* 985590 80240760 A22200B5 */ sb $v0, 0xb5($s1) +.L80240764: +/* 985594 80240764 A22000B5 */ sb $zero, 0xb5($s1) +.L80240768: +/* 985598 80240768 8E22008C */ lw $v0, 0x8c($s1) +/* 98559C 8024076C 1040000F */ beqz $v0, .L802407AC +/* 9855A0 80240770 3C03FFAA */ lui $v1, 0xffaa +/* 9855A4 80240774 8E420028 */ lw $v0, 0x28($s2) +/* 9855A8 80240778 3463FFFC */ ori $v1, $v1, 0xfffc +/* 9855AC 8024077C 00431821 */ addu $v1, $v0, $v1 +/* 9855B0 80240780 2C620015 */ sltiu $v0, $v1, 0x15 +/* 9855B4 80240784 10400009 */ beqz $v0, .L802407AC +/* 9855B8 80240788 00031080 */ sll $v0, $v1, 2 +/* 9855BC 8024078C 3C018024 */ lui $at, 0x8024 +/* 9855C0 80240790 00220821 */ addu $at, $at, $v0 +/* 9855C4 80240794 8C221658 */ lw $v0, 0x1658($at) +/* 9855C8 80240798 00400008 */ jr $v0 +/* 9855CC 8024079C 00000000 */ nop +/* 9855D0 802407A0 8E420028 */ lw $v0, 0x28($s2) +/* 9855D4 802407A4 24420001 */ addiu $v0, $v0, 1 +/* 9855D8 802407A8 AE420028 */ sw $v0, 0x28($s2) +.L802407AC: +/* 9855DC 802407AC 0000102D */ daddu $v0, $zero, $zero +.L802407B0: +/* 9855E0 802407B0 8FBF0068 */ lw $ra, 0x68($sp) +/* 9855E4 802407B4 8FB50064 */ lw $s5, 0x64($sp) +/* 9855E8 802407B8 8FB40060 */ lw $s4, 0x60($sp) +/* 9855EC 802407BC 8FB3005C */ lw $s3, 0x5c($sp) +/* 9855F0 802407C0 8FB20058 */ lw $s2, 0x58($sp) +/* 9855F4 802407C4 8FB10054 */ lw $s1, 0x54($sp) +/* 9855F8 802407C8 8FB00050 */ lw $s0, 0x50($sp) +/* 9855FC 802407CC 03E00008 */ jr $ra +/* 985600 802407D0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_802407D4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_802407D4.s deleted file mode 100644 index 961ec83ce8..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_802407D4.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D4 -/* 985604 802407D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 985608 802407D8 AFBF0010 */ sw $ra, 0x10($sp) -/* 98560C 802407DC 0C00EAD2 */ jal get_npc_safe -/* 985610 802407E0 8C84014C */ lw $a0, 0x14c($a0) -/* 985614 802407E4 0040182D */ daddu $v1, $v0, $zero -/* 985618 802407E8 846200A8 */ lh $v0, 0xa8($v1) -/* 98561C 802407EC C462003C */ lwc1 $f2, 0x3c($v1) -/* 985620 802407F0 906400A9 */ lbu $a0, 0xa9($v1) -/* 985624 802407F4 44820000 */ mtc1 $v0, $f0 -/* 985628 802407F8 00000000 */ nop -/* 98562C 802407FC 46800020 */ cvt.s.w $f0, $f0 -/* 985630 80240800 46001081 */ sub.s $f2, $f2, $f0 -/* 985634 80240804 A06400AB */ sb $a0, 0xab($v1) -/* 985638 80240808 E462003C */ swc1 $f2, 0x3c($v1) -/* 98563C 8024080C 8FBF0010 */ lw $ra, 0x10($sp) -/* 985640 80240810 24020002 */ addiu $v0, $zero, 2 -/* 985644 80240814 03E00008 */ jr $ra -/* 985648 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_802407D4_985604.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_802407D4_985604.s new file mode 100644 index 0000000000..4442359106 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_802407D4_985604.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407D4_985604 +/* 985604 802407D4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 985608 802407D8 AFBF0010 */ sw $ra, 0x10($sp) +/* 98560C 802407DC 0C00EAD2 */ jal get_npc_safe +/* 985610 802407E0 8C84014C */ lw $a0, 0x14c($a0) +/* 985614 802407E4 0040182D */ daddu $v1, $v0, $zero +/* 985618 802407E8 846200A8 */ lh $v0, 0xa8($v1) +/* 98561C 802407EC C462003C */ lwc1 $f2, 0x3c($v1) +/* 985620 802407F0 906400A9 */ lbu $a0, 0xa9($v1) +/* 985624 802407F4 44820000 */ mtc1 $v0, $f0 +/* 985628 802407F8 00000000 */ nop +/* 98562C 802407FC 46800020 */ cvt.s.w $f0, $f0 +/* 985630 80240800 46001081 */ sub.s $f2, $f2, $f0 +/* 985634 80240804 A06400AB */ sb $a0, 0xab($v1) +/* 985638 80240808 E462003C */ swc1 $f2, 0x3c($v1) +/* 98563C 8024080C 8FBF0010 */ lw $ra, 0x10($sp) +/* 985640 80240810 24020002 */ addiu $v0, $zero, 2 +/* 985644 80240814 03E00008 */ jr $ra +/* 985648 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240874.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240874.s deleted file mode 100644 index f37dd87946..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240874.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240874 -/* 9856A4 80240874 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9856A8 80240878 0080102D */ daddu $v0, $a0, $zero -/* 9856AC 8024087C AFB00010 */ sw $s0, 0x10($sp) -/* 9856B0 80240880 AFBF0018 */ sw $ra, 0x18($sp) -/* 9856B4 80240884 AFB10014 */ sw $s1, 0x14($sp) -/* 9856B8 80240888 8C44014C */ lw $a0, 0x14c($v0) -/* 9856BC 8024088C 8C510148 */ lw $s1, 0x148($v0) -/* 9856C0 80240890 0C00EAD2 */ jal get_npc_safe -/* 9856C4 80240894 00A0802D */ daddu $s0, $a1, $zero -/* 9856C8 80240898 56000001 */ bnel $s0, $zero, .L802408A0 -/* 9856CC 8024089C A04000AB */ sb $zero, 0xab($v0) -.L802408A0: -/* 9856D0 802408A0 8C420000 */ lw $v0, ($v0) -/* 9856D4 802408A4 30421000 */ andi $v0, $v0, 0x1000 -/* 9856D8 802408A8 1040000A */ beqz $v0, .L802408D4 -/* 9856DC 802408AC 0000102D */ daddu $v0, $zero, $zero -/* 9856E0 802408B0 82220004 */ lb $v0, 4($s1) -/* 9856E4 802408B4 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* 9856E8 802408B8 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* 9856EC 802408BC 00021080 */ sll $v0, $v0, 2 -/* 9856F0 802408C0 00431021 */ addu $v0, $v0, $v1 -/* 9856F4 802408C4 8C440028 */ lw $a0, 0x28($v0) -/* 9856F8 802408C8 9623006E */ lhu $v1, 0x6e($s1) -/* 9856FC 802408CC 24020002 */ addiu $v0, $zero, 2 -/* 985700 802408D0 A4830044 */ sh $v1, 0x44($a0) -.L802408D4: -/* 985704 802408D4 8FBF0018 */ lw $ra, 0x18($sp) -/* 985708 802408D8 8FB10014 */ lw $s1, 0x14($sp) -/* 98570C 802408DC 8FB00010 */ lw $s0, 0x10($sp) -/* 985710 802408E0 03E00008 */ jr $ra -/* 985714 802408E4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 985718 802408E8 00000000 */ nop -/* 98571C 802408EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240874_9856A4.s b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240874_9856A4.s new file mode 100644 index 0000000000..d320679692 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_08/984E30/func_80240874_9856A4.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240874_9856A4 +/* 9856A4 80240874 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9856A8 80240878 0080102D */ daddu $v0, $a0, $zero +/* 9856AC 8024087C AFB00010 */ sw $s0, 0x10($sp) +/* 9856B0 80240880 AFBF0018 */ sw $ra, 0x18($sp) +/* 9856B4 80240884 AFB10014 */ sw $s1, 0x14($sp) +/* 9856B8 80240888 8C44014C */ lw $a0, 0x14c($v0) +/* 9856BC 8024088C 8C510148 */ lw $s1, 0x148($v0) +/* 9856C0 80240890 0C00EAD2 */ jal get_npc_safe +/* 9856C4 80240894 00A0802D */ daddu $s0, $a1, $zero +/* 9856C8 80240898 56000001 */ bnel $s0, $zero, .L802408A0 +/* 9856CC 8024089C A04000AB */ sb $zero, 0xab($v0) +.L802408A0: +/* 9856D0 802408A0 8C420000 */ lw $v0, ($v0) +/* 9856D4 802408A4 30421000 */ andi $v0, $v0, 0x1000 +/* 9856D8 802408A8 1040000A */ beqz $v0, .L802408D4 +/* 9856DC 802408AC 0000102D */ daddu $v0, $zero, $zero +/* 9856E0 802408B0 82220004 */ lb $v0, 4($s1) +/* 9856E4 802408B4 3C03800B */ lui $v1, %hi(gCurrentEncounter) +/* 9856E8 802408B8 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) +/* 9856EC 802408BC 00021080 */ sll $v0, $v0, 2 +/* 9856F0 802408C0 00431021 */ addu $v0, $v0, $v1 +/* 9856F4 802408C4 8C440028 */ lw $a0, 0x28($v0) +/* 9856F8 802408C8 9623006E */ lhu $v1, 0x6e($s1) +/* 9856FC 802408CC 24020002 */ addiu $v0, $zero, 2 +/* 985700 802408D0 A4830044 */ sh $v1, 0x44($a0) +.L802408D4: +/* 985704 802408D4 8FBF0018 */ lw $ra, 0x18($sp) +/* 985708 802408D8 8FB10014 */ lw $s1, 0x14($sp) +/* 98570C 802408DC 8FB00010 */ lw $s0, 0x10($sp) +/* 985710 802408E0 03E00008 */ jr $ra +/* 985714 802408E4 27BD0020 */ addiu $sp, $sp, 0x20 +/* 985718 802408E8 00000000 */ nop +/* 98571C 802408EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C.s deleted file mode 100644 index e8e0a4b499..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C -/* 988B7C 8024001C 3C02800A */ lui $v0, %hi(D_8009A650) -/* 988B80 80240020 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 988B84 80240024 8C430000 */ lw $v1, ($v0) -/* 988B88 80240028 2404FFBF */ addiu $a0, $zero, -0x41 -/* 988B8C 8024002C 00641824 */ and $v1, $v1, $a0 -/* 988B90 80240030 AC430000 */ sw $v1, ($v0) -/* 988B94 80240034 03E00008 */ jr $ra -/* 988B98 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C_988B7C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C_988B7C.s new file mode 100644 index 0000000000..dd6ceca2de --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024001C_988B7C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024001C_988B7C +/* 988B7C 8024001C 3C02800A */ lui $v0, %hi(D_8009A650) +/* 988B80 80240020 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* 988B84 80240024 8C430000 */ lw $v1, ($v0) +/* 988B88 80240028 2404FFBF */ addiu $a0, $zero, -0x41 +/* 988B8C 8024002C 00641824 */ and $v1, $v1, $a0 +/* 988B90 80240030 AC430000 */ sw $v1, ($v0) +/* 988B94 80240034 03E00008 */ jr $ra +/* 988B98 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024003C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024003C.s deleted file mode 100644 index 9d98cc4df1..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024003C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024003C -/* 988B9C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 988BA0 80240040 AFBF0010 */ sw $ra, 0x10($sp) -/* 988BA4 80240044 8C82000C */ lw $v0, 0xc($a0) -/* 988BA8 80240048 0C0B1EAF */ jal get_variable -/* 988BAC 8024004C 8C450000 */ lw $a1, ($v0) -/* 988BB0 80240050 0C0B95A4 */ jal func_802E5690 -/* 988BB4 80240054 0040202D */ daddu $a0, $v0, $zero -/* 988BB8 80240058 8FBF0010 */ lw $ra, 0x10($sp) -/* 988BBC 8024005C 24020002 */ addiu $v0, $zero, 2 -/* 988BC0 80240060 03E00008 */ jr $ra -/* 988BC4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024003C_988B9C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024003C_988B9C.s new file mode 100644 index 0000000000..ecfabf9cee --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024003C_988B9C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024003C_988B9C +/* 988B9C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 988BA0 80240040 AFBF0010 */ sw $ra, 0x10($sp) +/* 988BA4 80240044 8C82000C */ lw $v0, 0xc($a0) +/* 988BA8 80240048 0C0B1EAF */ jal get_variable +/* 988BAC 8024004C 8C450000 */ lw $a1, ($v0) +/* 988BB0 80240050 0C0B95A4 */ jal func_802E5690 +/* 988BB4 80240054 0040202D */ daddu $a0, $v0, $zero +/* 988BB8 80240058 8FBF0010 */ lw $ra, 0x10($sp) +/* 988BBC 8024005C 24020002 */ addiu $v0, $zero, 2 +/* 988BC0 80240060 03E00008 */ jr $ra +/* 988BC4 80240064 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068.s deleted file mode 100644 index b4da6be87f..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240068 -/* 988BC8 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 988BCC 8024006C AFB00010 */ sw $s0, 0x10($sp) -/* 988BD0 80240070 0080802D */ daddu $s0, $a0, $zero -/* 988BD4 80240074 AFBF0018 */ sw $ra, 0x18($sp) -/* 988BD8 80240078 AFB10014 */ sw $s1, 0x14($sp) -/* 988BDC 8024007C 8E11000C */ lw $s1, 0xc($s0) -/* 988BE0 80240080 8E250000 */ lw $a1, ($s1) -/* 988BE4 80240084 0C0B1EAF */ jal get_variable -/* 988BE8 80240088 26310004 */ addiu $s1, $s1, 4 -/* 988BEC 8024008C 0200202D */ daddu $a0, $s0, $zero -/* 988BF0 80240090 3C038011 */ lui $v1, %hi(gPlayerData) -/* 988BF4 80240094 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 988BF8 80240098 000210C0 */ sll $v0, $v0, 3 -/* 988BFC 8024009C 00431021 */ addu $v0, $v0, $v1 -/* 988C00 802400A0 90460015 */ lbu $a2, 0x15($v0) -/* 988C04 802400A4 8E250000 */ lw $a1, ($s1) -/* 988C08 802400A8 24C60001 */ addiu $a2, $a2, 1 -/* 988C0C 802400AC A0460015 */ sb $a2, 0x15($v0) -/* 988C10 802400B0 00063600 */ sll $a2, $a2, 0x18 -/* 988C14 802400B4 0C0B2026 */ jal set_variable -/* 988C18 802400B8 00063603 */ sra $a2, $a2, 0x18 -/* 988C1C 802400BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 988C20 802400C0 8FB10014 */ lw $s1, 0x14($sp) -/* 988C24 802400C4 8FB00010 */ lw $s0, 0x10($sp) -/* 988C28 802400C8 24020002 */ addiu $v0, $zero, 2 -/* 988C2C 802400CC 03E00008 */ jr $ra -/* 988C30 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068_988BC8.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068_988BC8.s new file mode 100644 index 0000000000..4aebfee073 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240068_988BC8.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240068_988BC8 +/* 988BC8 80240068 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 988BCC 8024006C AFB00010 */ sw $s0, 0x10($sp) +/* 988BD0 80240070 0080802D */ daddu $s0, $a0, $zero +/* 988BD4 80240074 AFBF0018 */ sw $ra, 0x18($sp) +/* 988BD8 80240078 AFB10014 */ sw $s1, 0x14($sp) +/* 988BDC 8024007C 8E11000C */ lw $s1, 0xc($s0) +/* 988BE0 80240080 8E250000 */ lw $a1, ($s1) +/* 988BE4 80240084 0C0B1EAF */ jal get_variable +/* 988BE8 80240088 26310004 */ addiu $s1, $s1, 4 +/* 988BEC 8024008C 0200202D */ daddu $a0, $s0, $zero +/* 988BF0 80240090 3C038011 */ lui $v1, %hi(gPlayerData) +/* 988BF4 80240094 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 988BF8 80240098 000210C0 */ sll $v0, $v0, 3 +/* 988BFC 8024009C 00431021 */ addu $v0, $v0, $v1 +/* 988C00 802400A0 90460015 */ lbu $a2, 0x15($v0) +/* 988C04 802400A4 8E250000 */ lw $a1, ($s1) +/* 988C08 802400A8 24C60001 */ addiu $a2, $a2, 1 +/* 988C0C 802400AC A0460015 */ sb $a2, 0x15($v0) +/* 988C10 802400B0 00063600 */ sll $a2, $a2, 0x18 +/* 988C14 802400B4 0C0B2026 */ jal set_variable +/* 988C18 802400B8 00063603 */ sra $a2, $a2, 0x18 +/* 988C1C 802400BC 8FBF0018 */ lw $ra, 0x18($sp) +/* 988C20 802400C0 8FB10014 */ lw $s1, 0x14($sp) +/* 988C24 802400C4 8FB00010 */ lw $s0, 0x10($sp) +/* 988C28 802400C8 24020002 */ addiu $v0, $zero, 2 +/* 988C2C 802400CC 03E00008 */ jr $ra +/* 988C30 802400D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4.s deleted file mode 100644 index d99b1ddc19..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400D4 -/* 988C34 802400D4 3C028011 */ lui $v0, %hi(gPlayerData) -/* 988C38 802400D8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 988C3C 802400DC 000420C0 */ sll $a0, $a0, 3 -/* 988C40 802400E0 00822021 */ addu $a0, $a0, $v0 -/* 988C44 802400E4 90820014 */ lbu $v0, 0x14($a0) -/* 988C48 802400E8 10400009 */ beqz $v0, .L80240110 -/* 988C4C 802400EC 00000000 */ nop -/* 988C50 802400F0 90820015 */ lbu $v0, 0x15($a0) -/* 988C54 802400F4 00022600 */ sll $a0, $v0, 0x18 -/* 988C58 802400F8 00041E03 */ sra $v1, $a0, 0x18 -/* 988C5C 802400FC 00051400 */ sll $v0, $a1, 0x10 -/* 988C60 80240100 00021403 */ sra $v0, $v0, 0x10 -/* 988C64 80240104 0043102A */ slt $v0, $v0, $v1 -/* 988C68 80240108 10400003 */ beqz $v0, .L80240118 -/* 988C6C 8024010C 00000000 */ nop -.L80240110: -/* 988C70 80240110 03E00008 */ jr $ra -/* 988C74 80240114 2402FFFF */ addiu $v0, $zero, -1 -.L80240118: -/* 988C78 80240118 03E00008 */ jr $ra -/* 988C7C 8024011C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s new file mode 100644 index 0000000000..daa8851308 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802400D4_988C34.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400D4_988C34 +/* 988C34 802400D4 3C028011 */ lui $v0, %hi(gPlayerData) +/* 988C38 802400D8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 988C3C 802400DC 000420C0 */ sll $a0, $a0, 3 +/* 988C40 802400E0 00822021 */ addu $a0, $a0, $v0 +/* 988C44 802400E4 90820014 */ lbu $v0, 0x14($a0) +/* 988C48 802400E8 10400009 */ beqz $v0, .L80240110 +/* 988C4C 802400EC 00000000 */ nop +/* 988C50 802400F0 90820015 */ lbu $v0, 0x15($a0) +/* 988C54 802400F4 00022600 */ sll $a0, $v0, 0x18 +/* 988C58 802400F8 00041E03 */ sra $v1, $a0, 0x18 +/* 988C5C 802400FC 00051400 */ sll $v0, $a1, 0x10 +/* 988C60 80240100 00021403 */ sra $v0, $v0, 0x10 +/* 988C64 80240104 0043102A */ slt $v0, $v0, $v1 +/* 988C68 80240108 10400003 */ beqz $v0, .L80240118 +/* 988C6C 8024010C 00000000 */ nop +.L80240110: +/* 988C70 80240110 03E00008 */ jr $ra +/* 988C74 80240114 2402FFFF */ addiu $v0, $zero, -1 +.L80240118: +/* 988C78 80240118 03E00008 */ jr $ra +/* 988C7C 8024011C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s index dc3311e58e..0918131edf 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s @@ -27,7 +27,7 @@ glabel func_80240120_988C80 /* 988CD4 80240174 50400008 */ beql $v0, $zero, .L80240198 /* 988CD8 80240178 26100001 */ addiu $s0, $s0, 1 /* 988CDC 8024017C 0200202D */ daddu $a0, $s0, $zero -/* 988CE0 80240180 0C090035 */ jal func_802400D4 +/* 988CE0 80240180 0C090035 */ jal func_802400D4_988C34 /* 988CE4 80240184 00122C03 */ sra $a1, $s2, 0x10 /* 988CE8 80240188 10540003 */ beq $v0, $s4, .L80240198 /* 988CEC 8024018C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC.s deleted file mode 100644 index c6955fbc58..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401CC -/* 988D2C 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 988D30 802401D0 AFB5002C */ sw $s5, 0x2c($sp) -/* 988D34 802401D4 0080A82D */ daddu $s5, $a0, $zero -/* 988D38 802401D8 AFBE0038 */ sw $fp, 0x38($sp) -/* 988D3C 802401DC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 988D40 802401E0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 988D44 802401E4 AFBF003C */ sw $ra, 0x3c($sp) -/* 988D48 802401E8 AFB70034 */ sw $s7, 0x34($sp) -/* 988D4C 802401EC AFB60030 */ sw $s6, 0x30($sp) -/* 988D50 802401F0 AFB40028 */ sw $s4, 0x28($sp) -/* 988D54 802401F4 AFB30024 */ sw $s3, 0x24($sp) -/* 988D58 802401F8 AFB20020 */ sw $s2, 0x20($sp) -/* 988D5C 802401FC AFB1001C */ sw $s1, 0x1c($sp) -/* 988D60 80240200 10A0004F */ beqz $a1, .L80240340 -/* 988D64 80240204 AFB00018 */ sw $s0, 0x18($sp) -/* 988D68 80240208 0C00AB39 */ jal heap_malloc -/* 988D6C 8024020C 24040330 */ addiu $a0, $zero, 0x330 -/* 988D70 80240210 0040982D */ daddu $s3, $v0, $zero -/* 988D74 80240214 0000B02D */ daddu $s6, $zero, $zero -/* 988D78 80240218 02C0902D */ daddu $s2, $s6, $zero -/* 988D7C 8024021C 3C148024 */ lui $s4, 0x8024 -/* 988D80 80240220 26941108 */ addiu $s4, $s4, 0x1108 -/* 988D84 80240224 0260882D */ daddu $s1, $s3, $zero -/* 988D88 80240228 8EA200B4 */ lw $v0, 0xb4($s5) -/* 988D8C 8024022C 3C038024 */ lui $v1, 0x8024 -/* 988D90 80240230 24631100 */ addiu $v1, $v1, 0x1100 -/* 988D94 80240234 AEB30078 */ sw $s3, 0x78($s5) -/* 988D98 80240238 00021027 */ nor $v0, $zero, $v0 -/* 988D9C 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 988DA0 80240240 00171080 */ sll $v0, $s7, 2 -/* 988DA4 80240244 00431021 */ addu $v0, $v0, $v1 -/* 988DA8 80240248 AFA20010 */ sw $v0, 0x10($sp) -.L8024024C: -/* 988DAC 8024024C 86900000 */ lh $s0, ($s4) -/* 988DB0 80240250 001010C0 */ sll $v0, $s0, 3 -/* 988DB4 80240254 03C21021 */ addu $v0, $fp, $v0 -/* 988DB8 80240258 90420014 */ lbu $v0, 0x14($v0) -/* 988DBC 8024025C 5040002E */ beql $v0, $zero, .L80240318 -/* 988DC0 80240260 26520001 */ addiu $s2, $s2, 1 -/* 988DC4 80240264 00101100 */ sll $v0, $s0, 4 -/* 988DC8 80240268 3C068009 */ lui $a2, 0x8009 -/* 988DCC 8024026C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* 988DD0 80240270 00461021 */ addu $v0, $v0, $a2 -/* 988DD4 80240274 0200202D */ daddu $a0, $s0, $zero -/* 988DD8 80240278 AE300108 */ sw $s0, 0x108($s1) -/* 988DDC 8024027C 8C420000 */ lw $v0, ($v0) -/* 988DE0 80240280 02E0282D */ daddu $a1, $s7, $zero -/* 988DE4 80240284 0C090035 */ jal func_802400D4 -/* 988DE8 80240288 AE220084 */ sw $v0, 0x84($s1) -/* 988DEC 8024028C 0040202D */ daddu $a0, $v0, $zero -/* 988DF0 80240290 04800011 */ bltz $a0, .L802402D8 -/* 988DF4 80240294 00101080 */ sll $v0, $s0, 2 -/* 988DF8 80240298 3C06800F */ lui $a2, 0x800f -/* 988DFC 8024029C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* 988E00 802402A0 00461021 */ addu $v0, $v0, $a2 -/* 988E04 802402A4 8C430000 */ lw $v1, ($v0) -/* 988E08 802402A8 24020001 */ addiu $v0, $zero, 1 -/* 988E0C 802402AC AE22018C */ sw $v0, 0x18c($s1) -/* 988E10 802402B0 00041080 */ sll $v0, $a0, 2 -/* 988E14 802402B4 3C068024 */ lui $a2, 0x8024 -/* 988E18 802402B8 24C61118 */ addiu $a2, $a2, 0x1118 -/* 988E1C 802402BC AE230000 */ sw $v1, ($s1) -/* 988E20 802402C0 001218C0 */ sll $v1, $s2, 3 -/* 988E24 802402C4 00431021 */ addu $v0, $v0, $v1 -/* 988E28 802402C8 00461021 */ addu $v0, $v0, $a2 -/* 988E2C 802402CC 8C420000 */ lw $v0, ($v0) -/* 988E30 802402D0 080900BF */ j .L802402FC -/* 988E34 802402D4 AE220294 */ sw $v0, 0x294($s1) -.L802402D8: -/* 988E38 802402D8 3C06800F */ lui $a2, 0x800f -/* 988E3C 802402DC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* 988E40 802402E0 00461021 */ addu $v0, $v0, $a2 -/* 988E44 802402E4 8C420000 */ lw $v0, ($v0) -/* 988E48 802402E8 AE20018C */ sw $zero, 0x18c($s1) -/* 988E4C 802402EC AE220000 */ sw $v0, ($s1) -/* 988E50 802402F0 8FA60010 */ lw $a2, 0x10($sp) -/* 988E54 802402F4 8CC20000 */ lw $v0, ($a2) -/* 988E58 802402F8 AE220294 */ sw $v0, 0x294($s1) -.L802402FC: -/* 988E5C 802402FC 001010C0 */ sll $v0, $s0, 3 -/* 988E60 80240300 03C21021 */ addu $v0, $fp, $v0 -/* 988E64 80240304 80420015 */ lb $v0, 0x15($v0) -/* 988E68 80240308 26D60001 */ addiu $s6, $s6, 1 -/* 988E6C 8024030C AE220210 */ sw $v0, 0x210($s1) -/* 988E70 80240310 26310004 */ addiu $s1, $s1, 4 -/* 988E74 80240314 26520001 */ addiu $s2, $s2, 1 -.L80240318: -/* 988E78 80240318 2A420008 */ slti $v0, $s2, 8 -/* 988E7C 8024031C 1440FFCB */ bnez $v0, .L8024024C -/* 988E80 80240320 26940002 */ addiu $s4, $s4, 2 -/* 988E84 80240324 0260202D */ daddu $a0, $s3, $zero -/* 988E88 80240328 24020004 */ addiu $v0, $zero, 4 -/* 988E8C 8024032C AC820318 */ sw $v0, 0x318($a0) -/* 988E90 80240330 AC960324 */ sw $s6, 0x324($a0) -/* 988E94 80240334 0C03D390 */ jal func_800F4E40 -/* 988E98 80240338 AC800328 */ sw $zero, 0x328($a0) -/* 988E9C 8024033C AEA00070 */ sw $zero, 0x70($s5) -.L80240340: -/* 988EA0 80240340 8EA20070 */ lw $v0, 0x70($s5) -/* 988EA4 80240344 8EB30078 */ lw $s3, 0x78($s5) -/* 988EA8 80240348 14400008 */ bnez $v0, .L8024036C -/* 988EAC 8024034C 24420001 */ addiu $v0, $v0, 1 -/* 988EB0 80240350 8662032C */ lh $v0, 0x32c($s3) -/* 988EB4 80240354 10400009 */ beqz $v0, .L8024037C -/* 988EB8 80240358 AEA20074 */ sw $v0, 0x74($s5) -/* 988EBC 8024035C 0C03C4EC */ jal func_800F13B0 -/* 988EC0 80240360 00000000 */ nop -/* 988EC4 80240364 8EA20070 */ lw $v0, 0x70($s5) -/* 988EC8 80240368 24420001 */ addiu $v0, $v0, 1 -.L8024036C: -/* 988ECC 8024036C AEA20070 */ sw $v0, 0x70($s5) -/* 988ED0 80240370 2842000F */ slti $v0, $v0, 0xf -/* 988ED4 80240374 10400003 */ beqz $v0, .L80240384 -/* 988ED8 80240378 00000000 */ nop -.L8024037C: -/* 988EDC 8024037C 080900FB */ j .L802403EC -/* 988EE0 80240380 0000102D */ daddu $v0, $zero, $zero -.L80240384: -/* 988EE4 80240384 0C03C54E */ jal func_800F1538 -/* 988EE8 80240388 00000000 */ nop -/* 988EEC 8024038C 8EA30074 */ lw $v1, 0x74($s5) -/* 988EF0 80240390 240200FF */ addiu $v0, $zero, 0xff -/* 988EF4 80240394 10620010 */ beq $v1, $v0, .L802403D8 -/* 988EF8 80240398 2462FFFF */ addiu $v0, $v1, -1 -/* 988EFC 8024039C 00021080 */ sll $v0, $v0, 2 -/* 988F00 802403A0 02621021 */ addu $v0, $s3, $v0 -/* 988F04 802403A4 8C420108 */ lw $v0, 0x108($v0) -/* 988F08 802403A8 00021100 */ sll $v0, $v0, 4 -/* 988F0C 802403AC 3C038009 */ lui $v1, 0x8009 -/* 988F10 802403B0 00621821 */ addu $v1, $v1, $v0 -/* 988F14 802403B4 8C63EF20 */ lw $v1, -0x10e0($v1) -/* 988F18 802403B8 8EA20074 */ lw $v0, 0x74($s5) -/* 988F1C 802403BC 2442FFFF */ addiu $v0, $v0, -1 -/* 988F20 802403C0 00021080 */ sll $v0, $v0, 2 -/* 988F24 802403C4 02621021 */ addu $v0, $s3, $v0 -/* 988F28 802403C8 AEA30084 */ sw $v1, 0x84($s5) -/* 988F2C 802403CC 8C420108 */ lw $v0, 0x108($v0) -/* 988F30 802403D0 080900F8 */ j .L802403E0 -/* 988F34 802403D4 AEA20088 */ sw $v0, 0x88($s5) -.L802403D8: -/* 988F38 802403D8 2402FFFF */ addiu $v0, $zero, -1 -/* 988F3C 802403DC AEA20084 */ sw $v0, 0x84($s5) -.L802403E0: -/* 988F40 802403E0 0C00AB4B */ jal heap_free -/* 988F44 802403E4 8EA40078 */ lw $a0, 0x78($s5) -/* 988F48 802403E8 24020002 */ addiu $v0, $zero, 2 -.L802403EC: -/* 988F4C 802403EC 8FBF003C */ lw $ra, 0x3c($sp) -/* 988F50 802403F0 8FBE0038 */ lw $fp, 0x38($sp) -/* 988F54 802403F4 8FB70034 */ lw $s7, 0x34($sp) -/* 988F58 802403F8 8FB60030 */ lw $s6, 0x30($sp) -/* 988F5C 802403FC 8FB5002C */ lw $s5, 0x2c($sp) -/* 988F60 80240400 8FB40028 */ lw $s4, 0x28($sp) -/* 988F64 80240404 8FB30024 */ lw $s3, 0x24($sp) -/* 988F68 80240408 8FB20020 */ lw $s2, 0x20($sp) -/* 988F6C 8024040C 8FB1001C */ lw $s1, 0x1c($sp) -/* 988F70 80240410 8FB00018 */ lw $s0, 0x18($sp) -/* 988F74 80240414 03E00008 */ jr $ra -/* 988F78 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s new file mode 100644 index 0000000000..45a2ece26c --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_802401CC_988D2C.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401CC_988D2C +/* 988D2C 802401CC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 988D30 802401D0 AFB5002C */ sw $s5, 0x2c($sp) +/* 988D34 802401D4 0080A82D */ daddu $s5, $a0, $zero +/* 988D38 802401D8 AFBE0038 */ sw $fp, 0x38($sp) +/* 988D3C 802401DC 3C1E8011 */ lui $fp, %hi(gPlayerData) +/* 988D40 802401E0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) +/* 988D44 802401E4 AFBF003C */ sw $ra, 0x3c($sp) +/* 988D48 802401E8 AFB70034 */ sw $s7, 0x34($sp) +/* 988D4C 802401EC AFB60030 */ sw $s6, 0x30($sp) +/* 988D50 802401F0 AFB40028 */ sw $s4, 0x28($sp) +/* 988D54 802401F4 AFB30024 */ sw $s3, 0x24($sp) +/* 988D58 802401F8 AFB20020 */ sw $s2, 0x20($sp) +/* 988D5C 802401FC AFB1001C */ sw $s1, 0x1c($sp) +/* 988D60 80240200 10A0004F */ beqz $a1, .L80240340 +/* 988D64 80240204 AFB00018 */ sw $s0, 0x18($sp) +/* 988D68 80240208 0C00AB39 */ jal heap_malloc +/* 988D6C 8024020C 24040330 */ addiu $a0, $zero, 0x330 +/* 988D70 80240210 0040982D */ daddu $s3, $v0, $zero +/* 988D74 80240214 0000B02D */ daddu $s6, $zero, $zero +/* 988D78 80240218 02C0902D */ daddu $s2, $s6, $zero +/* 988D7C 8024021C 3C148024 */ lui $s4, 0x8024 +/* 988D80 80240220 26941108 */ addiu $s4, $s4, 0x1108 +/* 988D84 80240224 0260882D */ daddu $s1, $s3, $zero +/* 988D88 80240228 8EA200B4 */ lw $v0, 0xb4($s5) +/* 988D8C 8024022C 3C038024 */ lui $v1, 0x8024 +/* 988D90 80240230 24631100 */ addiu $v1, $v1, 0x1100 +/* 988D94 80240234 AEB30078 */ sw $s3, 0x78($s5) +/* 988D98 80240238 00021027 */ nor $v0, $zero, $v0 +/* 988D9C 8024023C 0002BFC2 */ srl $s7, $v0, 0x1f +/* 988DA0 80240240 00171080 */ sll $v0, $s7, 2 +/* 988DA4 80240244 00431021 */ addu $v0, $v0, $v1 +/* 988DA8 80240248 AFA20010 */ sw $v0, 0x10($sp) +.L8024024C: +/* 988DAC 8024024C 86900000 */ lh $s0, ($s4) +/* 988DB0 80240250 001010C0 */ sll $v0, $s0, 3 +/* 988DB4 80240254 03C21021 */ addu $v0, $fp, $v0 +/* 988DB8 80240258 90420014 */ lbu $v0, 0x14($v0) +/* 988DBC 8024025C 5040002E */ beql $v0, $zero, .L80240318 +/* 988DC0 80240260 26520001 */ addiu $s2, $s2, 1 +/* 988DC4 80240264 00101100 */ sll $v0, $s0, 4 +/* 988DC8 80240268 3C068009 */ lui $a2, 0x8009 +/* 988DCC 8024026C 24C6EF20 */ addiu $a2, $a2, -0x10e0 +/* 988DD0 80240270 00461021 */ addu $v0, $v0, $a2 +/* 988DD4 80240274 0200202D */ daddu $a0, $s0, $zero +/* 988DD8 80240278 AE300108 */ sw $s0, 0x108($s1) +/* 988DDC 8024027C 8C420000 */ lw $v0, ($v0) +/* 988DE0 80240280 02E0282D */ daddu $a1, $s7, $zero +/* 988DE4 80240284 0C090035 */ jal func_802400D4_988C34 +/* 988DE8 80240288 AE220084 */ sw $v0, 0x84($s1) +/* 988DEC 8024028C 0040202D */ daddu $a0, $v0, $zero +/* 988DF0 80240290 04800011 */ bltz $a0, .L802402D8 +/* 988DF4 80240294 00101080 */ sll $v0, $s0, 2 +/* 988DF8 80240298 3C06800F */ lui $a2, 0x800f +/* 988DFC 8024029C 24C67F00 */ addiu $a2, $a2, 0x7f00 +/* 988E00 802402A0 00461021 */ addu $v0, $v0, $a2 +/* 988E04 802402A4 8C430000 */ lw $v1, ($v0) +/* 988E08 802402A8 24020001 */ addiu $v0, $zero, 1 +/* 988E0C 802402AC AE22018C */ sw $v0, 0x18c($s1) +/* 988E10 802402B0 00041080 */ sll $v0, $a0, 2 +/* 988E14 802402B4 3C068024 */ lui $a2, 0x8024 +/* 988E18 802402B8 24C61118 */ addiu $a2, $a2, 0x1118 +/* 988E1C 802402BC AE230000 */ sw $v1, ($s1) +/* 988E20 802402C0 001218C0 */ sll $v1, $s2, 3 +/* 988E24 802402C4 00431021 */ addu $v0, $v0, $v1 +/* 988E28 802402C8 00461021 */ addu $v0, $v0, $a2 +/* 988E2C 802402CC 8C420000 */ lw $v0, ($v0) +/* 988E30 802402D0 080900BF */ j .L802402FC +/* 988E34 802402D4 AE220294 */ sw $v0, 0x294($s1) +.L802402D8: +/* 988E38 802402D8 3C06800F */ lui $a2, 0x800f +/* 988E3C 802402DC 24C67F40 */ addiu $a2, $a2, 0x7f40 +/* 988E40 802402E0 00461021 */ addu $v0, $v0, $a2 +/* 988E44 802402E4 8C420000 */ lw $v0, ($v0) +/* 988E48 802402E8 AE20018C */ sw $zero, 0x18c($s1) +/* 988E4C 802402EC AE220000 */ sw $v0, ($s1) +/* 988E50 802402F0 8FA60010 */ lw $a2, 0x10($sp) +/* 988E54 802402F4 8CC20000 */ lw $v0, ($a2) +/* 988E58 802402F8 AE220294 */ sw $v0, 0x294($s1) +.L802402FC: +/* 988E5C 802402FC 001010C0 */ sll $v0, $s0, 3 +/* 988E60 80240300 03C21021 */ addu $v0, $fp, $v0 +/* 988E64 80240304 80420015 */ lb $v0, 0x15($v0) +/* 988E68 80240308 26D60001 */ addiu $s6, $s6, 1 +/* 988E6C 8024030C AE220210 */ sw $v0, 0x210($s1) +/* 988E70 80240310 26310004 */ addiu $s1, $s1, 4 +/* 988E74 80240314 26520001 */ addiu $s2, $s2, 1 +.L80240318: +/* 988E78 80240318 2A420008 */ slti $v0, $s2, 8 +/* 988E7C 8024031C 1440FFCB */ bnez $v0, .L8024024C +/* 988E80 80240320 26940002 */ addiu $s4, $s4, 2 +/* 988E84 80240324 0260202D */ daddu $a0, $s3, $zero +/* 988E88 80240328 24020004 */ addiu $v0, $zero, 4 +/* 988E8C 8024032C AC820318 */ sw $v0, 0x318($a0) +/* 988E90 80240330 AC960324 */ sw $s6, 0x324($a0) +/* 988E94 80240334 0C03D390 */ jal func_800F4E40 +/* 988E98 80240338 AC800328 */ sw $zero, 0x328($a0) +/* 988E9C 8024033C AEA00070 */ sw $zero, 0x70($s5) +.L80240340: +/* 988EA0 80240340 8EA20070 */ lw $v0, 0x70($s5) +/* 988EA4 80240344 8EB30078 */ lw $s3, 0x78($s5) +/* 988EA8 80240348 14400008 */ bnez $v0, .L8024036C +/* 988EAC 8024034C 24420001 */ addiu $v0, $v0, 1 +/* 988EB0 80240350 8662032C */ lh $v0, 0x32c($s3) +/* 988EB4 80240354 10400009 */ beqz $v0, .L8024037C +/* 988EB8 80240358 AEA20074 */ sw $v0, 0x74($s5) +/* 988EBC 8024035C 0C03C4EC */ jal func_800F13B0 +/* 988EC0 80240360 00000000 */ nop +/* 988EC4 80240364 8EA20070 */ lw $v0, 0x70($s5) +/* 988EC8 80240368 24420001 */ addiu $v0, $v0, 1 +.L8024036C: +/* 988ECC 8024036C AEA20070 */ sw $v0, 0x70($s5) +/* 988ED0 80240370 2842000F */ slti $v0, $v0, 0xf +/* 988ED4 80240374 10400003 */ beqz $v0, .L80240384 +/* 988ED8 80240378 00000000 */ nop +.L8024037C: +/* 988EDC 8024037C 080900FB */ j .L802403EC +/* 988EE0 80240380 0000102D */ daddu $v0, $zero, $zero +.L80240384: +/* 988EE4 80240384 0C03C54E */ jal func_800F1538 +/* 988EE8 80240388 00000000 */ nop +/* 988EEC 8024038C 8EA30074 */ lw $v1, 0x74($s5) +/* 988EF0 80240390 240200FF */ addiu $v0, $zero, 0xff +/* 988EF4 80240394 10620010 */ beq $v1, $v0, .L802403D8 +/* 988EF8 80240398 2462FFFF */ addiu $v0, $v1, -1 +/* 988EFC 8024039C 00021080 */ sll $v0, $v0, 2 +/* 988F00 802403A0 02621021 */ addu $v0, $s3, $v0 +/* 988F04 802403A4 8C420108 */ lw $v0, 0x108($v0) +/* 988F08 802403A8 00021100 */ sll $v0, $v0, 4 +/* 988F0C 802403AC 3C038009 */ lui $v1, 0x8009 +/* 988F10 802403B0 00621821 */ addu $v1, $v1, $v0 +/* 988F14 802403B4 8C63EF20 */ lw $v1, -0x10e0($v1) +/* 988F18 802403B8 8EA20074 */ lw $v0, 0x74($s5) +/* 988F1C 802403BC 2442FFFF */ addiu $v0, $v0, -1 +/* 988F20 802403C0 00021080 */ sll $v0, $v0, 2 +/* 988F24 802403C4 02621021 */ addu $v0, $s3, $v0 +/* 988F28 802403C8 AEA30084 */ sw $v1, 0x84($s5) +/* 988F2C 802403CC 8C420108 */ lw $v0, 0x108($v0) +/* 988F30 802403D0 080900F8 */ j .L802403E0 +/* 988F34 802403D4 AEA20088 */ sw $v0, 0x88($s5) +.L802403D8: +/* 988F38 802403D8 2402FFFF */ addiu $v0, $zero, -1 +/* 988F3C 802403DC AEA20084 */ sw $v0, 0x84($s5) +.L802403E0: +/* 988F40 802403E0 0C00AB4B */ jal heap_free +/* 988F44 802403E4 8EA40078 */ lw $a0, 0x78($s5) +/* 988F48 802403E8 24020002 */ addiu $v0, $zero, 2 +.L802403EC: +/* 988F4C 802403EC 8FBF003C */ lw $ra, 0x3c($sp) +/* 988F50 802403F0 8FBE0038 */ lw $fp, 0x38($sp) +/* 988F54 802403F4 8FB70034 */ lw $s7, 0x34($sp) +/* 988F58 802403F8 8FB60030 */ lw $s6, 0x30($sp) +/* 988F5C 802403FC 8FB5002C */ lw $s5, 0x2c($sp) +/* 988F60 80240400 8FB40028 */ lw $s4, 0x28($sp) +/* 988F64 80240404 8FB30024 */ lw $s3, 0x24($sp) +/* 988F68 80240408 8FB20020 */ lw $s2, 0x20($sp) +/* 988F6C 8024040C 8FB1001C */ lw $s1, 0x1c($sp) +/* 988F70 80240410 8FB00018 */ lw $s0, 0x18($sp) +/* 988F74 80240414 03E00008 */ jr $ra +/* 988F78 80240418 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C.s deleted file mode 100644 index c2d13eb4c1..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024041C -/* 988F7C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 988F80 80240420 AFBF0010 */ sw $ra, 0x10($sp) -/* 988F84 80240424 8C82000C */ lw $v0, 0xc($a0) -/* 988F88 80240428 0C0B1EAF */ jal get_variable -/* 988F8C 8024042C 8C450000 */ lw $a1, ($v0) -/* 988F90 80240430 0C03AC5A */ jal func_800EB168 -/* 988F94 80240434 0040202D */ daddu $a0, $v0, $zero -/* 988F98 80240438 8FBF0010 */ lw $ra, 0x10($sp) -/* 988F9C 8024043C 24020002 */ addiu $v0, $zero, 2 -/* 988FA0 80240440 03E00008 */ jr $ra -/* 988FA4 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C_988F7C.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C_988F7C.s new file mode 100644 index 0000000000..955726e65a --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_8024041C_988F7C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024041C_988F7C +/* 988F7C 8024041C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 988F80 80240420 AFBF0010 */ sw $ra, 0x10($sp) +/* 988F84 80240424 8C82000C */ lw $v0, 0xc($a0) +/* 988F88 80240428 0C0B1EAF */ jal get_variable +/* 988F8C 8024042C 8C450000 */ lw $a1, ($v0) +/* 988F90 80240430 0C03AC5A */ jal func_800EB168 +/* 988F94 80240434 0040202D */ daddu $a0, $v0, $zero +/* 988F98 80240438 8FBF0010 */ lw $ra, 0x10($sp) +/* 988F9C 8024043C 24020002 */ addiu $v0, $zero, 2 +/* 988FA0 80240440 03E00008 */ jr $ra +/* 988FA4 80240444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448.s deleted file mode 100644 index a7aca612a3..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240448 -/* 988FA8 80240448 3C028011 */ lui $v0, 0x8011 -/* 988FAC 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 988FB0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 988FB4 80240454 AFBF0010 */ sw $ra, 0x10($sp) -/* 988FB8 80240458 00021100 */ sll $v0, $v0, 4 -/* 988FBC 8024045C 3C048009 */ lui $a0, 0x8009 -/* 988FC0 80240460 00822021 */ addu $a0, $a0, $v0 -/* 988FC4 80240464 8C84EF20 */ lw $a0, -0x10e0($a0) -/* 988FC8 80240468 0C0496CF */ jal set_message_string -/* 988FCC 8024046C 0000282D */ daddu $a1, $zero, $zero -/* 988FD0 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* 988FD4 80240474 24020002 */ addiu $v0, $zero, 2 -/* 988FD8 80240478 03E00008 */ jr $ra -/* 988FDC 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s new file mode 100644 index 0000000000..62065d9373 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240448_988FA8 +/* 988FA8 80240448 3C028011 */ lui $v0, 0x8011 +/* 988FAC 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 988FB0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 988FB4 80240454 AFBF0010 */ sw $ra, 0x10($sp) +/* 988FB8 80240458 00021100 */ sll $v0, $v0, 4 +/* 988FBC 8024045C 3C048009 */ lui $a0, 0x8009 +/* 988FC0 80240460 00822021 */ addu $a0, $a0, $v0 +/* 988FC4 80240464 8C84EF20 */ lw $a0, -0x10e0($a0) +/* 988FC8 80240468 0C0496CF */ jal set_message_string +/* 988FCC 8024046C 0000282D */ daddu $a1, $zero, $zero +/* 988FD0 80240470 8FBF0010 */ lw $ra, 0x10($sp) +/* 988FD4 80240474 24020002 */ addiu $v0, $zero, 2 +/* 988FD8 80240478 03E00008 */ jr $ra +/* 988FDC 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240510.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240510.s deleted file mode 100644 index e594e80d3d..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240510.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240510 -/* 989070 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 989074 80240514 AFBF0010 */ sw $ra, 0x10($sp) -/* 989078 80240518 8C82000C */ lw $v0, 0xc($a0) -/* 98907C 8024051C 0C0B1EAF */ jal get_variable -/* 989080 80240520 8C450000 */ lw $a1, ($v0) -/* 989084 80240524 0040202D */ daddu $a0, $v0, $zero -/* 989088 80240528 8C830000 */ lw $v1, ($a0) -/* 98908C 8024052C 34630010 */ ori $v1, $v1, 0x10 -/* 989090 80240530 AC830000 */ sw $v1, ($a0) -/* 989094 80240534 8FBF0010 */ lw $ra, 0x10($sp) -/* 989098 80240538 24020002 */ addiu $v0, $zero, 2 -/* 98909C 8024053C 03E00008 */ jr $ra -/* 9890A0 80240540 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240510_989070.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240510_989070.s new file mode 100644 index 0000000000..a24efcde3e --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240510_989070.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240510_989070 +/* 989070 80240510 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 989074 80240514 AFBF0010 */ sw $ra, 0x10($sp) +/* 989078 80240518 8C82000C */ lw $v0, 0xc($a0) +/* 98907C 8024051C 0C0B1EAF */ jal get_variable +/* 989080 80240520 8C450000 */ lw $a1, ($v0) +/* 989084 80240524 0040202D */ daddu $a0, $v0, $zero +/* 989088 80240528 8C830000 */ lw $v1, ($a0) +/* 98908C 8024052C 34630010 */ ori $v1, $v1, 0x10 +/* 989090 80240530 AC830000 */ sw $v1, ($a0) +/* 989094 80240534 8FBF0010 */ lw $ra, 0x10($sp) +/* 989098 80240538 24020002 */ addiu $v0, $zero, 2 +/* 98909C 8024053C 03E00008 */ jr $ra +/* 9890A0 80240540 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600.s deleted file mode 100644 index 65515647bc..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240600 -/* 989160 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 989164 80240604 AFB60040 */ sw $s6, 0x40($sp) -/* 989168 80240608 0080B02D */ daddu $s6, $a0, $zero -/* 98916C 8024060C AFB00028 */ sw $s0, 0x28($sp) -/* 989170 80240610 00A0802D */ daddu $s0, $a1, $zero -/* 989174 80240614 AFBF0044 */ sw $ra, 0x44($sp) -/* 989178 80240618 AFB5003C */ sw $s5, 0x3c($sp) -/* 98917C 8024061C AFB40038 */ sw $s4, 0x38($sp) -/* 989180 80240620 AFB30034 */ sw $s3, 0x34($sp) -/* 989184 80240624 AFB20030 */ sw $s2, 0x30($sp) -/* 989188 80240628 AFB1002C */ sw $s1, 0x2c($sp) -/* 98918C 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 989190 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 989194 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 989198 80240638 8ED3000C */ lw $s3, 0xc($s6) -/* 98919C 8024063C 0C00EAD2 */ jal get_npc_safe -/* 9891A0 80240640 2404FFFC */ addiu $a0, $zero, -4 -/* 9891A4 80240644 27A50018 */ addiu $a1, $sp, 0x18 -/* 9891A8 80240648 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 9891AC 8024064C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 9891B0 80240650 27A6001C */ addiu $a2, $sp, 0x1c -/* 9891B4 80240654 00041880 */ sll $v1, $a0, 2 -/* 9891B8 80240658 00641821 */ addu $v1, $v1, $a0 -/* 9891BC 8024065C 00031880 */ sll $v1, $v1, 2 -/* 9891C0 80240660 00641823 */ subu $v1, $v1, $a0 -/* 9891C4 80240664 000320C0 */ sll $a0, $v1, 3 -/* 9891C8 80240668 00641821 */ addu $v1, $v1, $a0 -/* 9891CC 8024066C 000318C0 */ sll $v1, $v1, 3 -/* 9891D0 80240670 3C01800B */ lui $at, 0x800b -/* 9891D4 80240674 00230821 */ addu $at, $at, $v1 -/* 9891D8 80240678 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* 9891DC 8024067C 0C00A88D */ jal sin_cos_deg -/* 9891E0 80240680 0040A82D */ daddu $s5, $v0, $zero -/* 9891E4 80240684 1200005D */ beqz $s0, .L802407FC -/* 9891E8 80240688 00000000 */ nop -/* 9891EC 8024068C 0C00AB0A */ jal general_heap_malloc -/* 9891F0 80240690 24040068 */ addiu $a0, $zero, 0x68 -/* 9891F4 80240694 0040902D */ daddu $s2, $v0, $zero -/* 9891F8 80240698 02C0202D */ daddu $a0, $s6, $zero -/* 9891FC 8024069C 0000882D */ daddu $s1, $zero, $zero -/* 989200 802406A0 2414FFFF */ addiu $s4, $zero, -1 -/* 989204 802406A4 AED20060 */ sw $s2, 0x60($s6) -/* 989208 802406A8 8E650000 */ lw $a1, ($s3) -/* 98920C 802406AC 3C014148 */ lui $at, 0x4148 -/* 989210 802406B0 4481C000 */ mtc1 $at, $f24 -/* 989214 802406B4 3C013F80 */ lui $at, 0x3f80 -/* 989218 802406B8 4481B000 */ mtc1 $at, $f22 -/* 98921C 802406BC 4480A000 */ mtc1 $zero, $f20 -/* 989220 802406C0 0C0B1EAF */ jal get_variable -/* 989224 802406C4 0240802D */ daddu $s0, $s2, $zero -/* 989228 802406C8 0C04417A */ jal get_entity_by_index -/* 98922C 802406CC 0040202D */ daddu $a0, $v0, $zero -/* 989230 802406D0 AE42005C */ sw $v0, 0x5c($s2) -.L802406D4: -/* 989234 802406D4 8E42005C */ lw $v0, 0x5c($s2) -/* 989238 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) -/* 98923C 802406DC 0000202D */ daddu $a0, $zero, $zero -/* 989240 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 989244 802406E4 AFB40014 */ sw $s4, 0x14($sp) -/* 989248 802406E8 46180000 */ add.s $f0, $f0, $f24 -/* 98924C 802406EC 8C450048 */ lw $a1, 0x48($v0) -/* 989250 802406F0 8C470050 */ lw $a3, 0x50($v0) -/* 989254 802406F4 44060000 */ mfc1 $a2, $f0 -/* 989258 802406F8 0C01C5BC */ jal func_800716F0 -/* 98925C 802406FC 26310001 */ addiu $s1, $s1, 1 -/* 989260 80240700 AE020008 */ sw $v0, 8($s0) -/* 989264 80240704 E614002C */ swc1 $f20, 0x2c($s0) -/* 989268 80240708 E6140020 */ swc1 $f20, 0x20($s0) -/* 98926C 8024070C E6140014 */ swc1 $f20, 0x14($s0) -/* 989270 80240710 E6140050 */ swc1 $f20, 0x50($s0) -/* 989274 80240714 E6140044 */ swc1 $f20, 0x44($s0) -/* 989278 80240718 E6140038 */ swc1 $f20, 0x38($s0) -/* 98927C 8024071C 2A220003 */ slti $v0, $s1, 3 -/* 989280 80240720 1440FFEC */ bnez $v0, .L802406D4 -/* 989284 80240724 26100004 */ addiu $s0, $s0, 4 -/* 989288 80240728 0000882D */ daddu $s1, $zero, $zero -/* 98928C 8024072C 0240802D */ daddu $s0, $s2, $zero -/* 989290 80240730 3C148024 */ lui $s4, 0x8024 -/* 989294 80240734 26941158 */ addiu $s4, $s4, 0x1158 -/* 989298 80240738 3C014248 */ lui $at, 0x4248 -/* 98929C 8024073C 4481A000 */ mtc1 $at, $f20 -/* 9892A0 80240740 24130044 */ addiu $s3, $zero, 0x44 -/* 9892A4 80240744 AE400000 */ sw $zero, ($s2) -/* 9892A8 80240748 AE400004 */ sw $zero, 4($s2) -/* 9892AC 8024074C AE400060 */ sw $zero, 0x60($s2) -/* 9892B0 80240750 AE400064 */ sw $zero, 0x64($s2) -.L80240754: -/* 9892B4 80240754 27A40020 */ addiu $a0, $sp, 0x20 -/* 9892B8 80240758 4406A000 */ mfc1 $a2, $f20 -/* 9892BC 8024075C 8E870000 */ lw $a3, ($s4) -/* 9892C0 80240760 02532821 */ addu $a1, $s2, $s3 -/* 9892C4 80240764 0C00A7E7 */ jal add_vec2D_polar -/* 9892C8 80240768 AFA00020 */ sw $zero, 0x20($sp) -/* 9892CC 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 9892D0 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 9892D4 80240774 46041082 */ mul.s $f2, $f2, $f4 -/* 9892D8 80240778 00000000 */ nop -/* 9892DC 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) -/* 9892E0 80240780 46040002 */ mul.s $f0, $f0, $f4 -/* 9892E4 80240784 00000000 */ nop -/* 9892E8 80240788 E6020038 */ swc1 $f2, 0x38($s0) -/* 9892EC 8024078C E6000050 */ swc1 $f0, 0x50($s0) -/* 9892F0 80240790 8E42005C */ lw $v0, 0x5c($s2) -/* 9892F4 80240794 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9892F8 80240798 C4420048 */ lwc1 $f2, 0x48($v0) -/* 9892FC 8024079C 46001080 */ add.s $f2, $f2, $f0 -/* 989300 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 989304 802407A4 46020001 */ sub.s $f0, $f0, $f2 -/* 989308 802407A8 E6000038 */ swc1 $f0, 0x38($s0) -/* 98930C 802407AC 8E42005C */ lw $v0, 0x5c($s2) -/* 989310 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) -/* 989314 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) -/* 989318 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* 98931C 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 989320 802407C0 46020001 */ sub.s $f0, $f0, $f2 -/* 989324 802407C4 E6000044 */ swc1 $f0, 0x44($s0) -/* 989328 802407C8 8E42005C */ lw $v0, 0x5c($s2) -/* 98932C 802407CC C6000050 */ lwc1 $f0, 0x50($s0) -/* 989330 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) -/* 989334 802407D4 26940004 */ addiu $s4, $s4, 4 -/* 989338 802407D8 46001080 */ add.s $f2, $f2, $f0 -/* 98933C 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) -/* 989340 802407E0 26730004 */ addiu $s3, $s3, 4 -/* 989344 802407E4 46020001 */ sub.s $f0, $f0, $f2 -/* 989348 802407E8 26310001 */ addiu $s1, $s1, 1 -/* 98934C 802407EC 2A220003 */ slti $v0, $s1, 3 -/* 989350 802407F0 E6000050 */ swc1 $f0, 0x50($s0) -/* 989354 802407F4 1440FFD7 */ bnez $v0, .L80240754 -/* 989358 802407F8 26100004 */ addiu $s0, $s0, 4 -.L802407FC: -/* 98935C 802407FC 8ED20060 */ lw $s2, 0x60($s6) -/* 989360 80240800 8E430000 */ lw $v1, ($s2) -/* 989364 80240804 24020001 */ addiu $v0, $zero, 1 -/* 989368 80240808 10620038 */ beq $v1, $v0, .L802408EC -/* 98936C 8024080C 28620002 */ slti $v0, $v1, 2 -/* 989370 80240810 50400005 */ beql $v0, $zero, .L80240828 -/* 989374 80240814 24020002 */ addiu $v0, $zero, 2 -/* 989378 80240818 10600007 */ beqz $v1, .L80240838 -/* 98937C 8024081C 24040005 */ addiu $a0, $zero, 5 -/* 989380 80240820 08090274 */ j .L802409D0 -/* 989384 80240824 00000000 */ nop -.L80240828: -/* 989388 80240828 10620058 */ beq $v1, $v0, .L8024098C -/* 98938C 8024082C 00000000 */ nop -/* 989390 80240830 08090274 */ j .L802409D0 -/* 989394 80240834 00000000 */ nop -.L80240838: -/* 989398 80240838 0000882D */ daddu $s1, $zero, $zero -/* 98939C 8024083C 3C148024 */ lui $s4, 0x8024 -/* 9893A0 80240840 26941158 */ addiu $s4, $s4, 0x1158 -/* 9893A4 80240844 24130020 */ addiu $s3, $zero, 0x20 -/* 9893A8 80240848 3C064248 */ lui $a2, 0x4248 -/* 9893AC 8024084C 44800000 */ mtc1 $zero, $f0 -/* 9893B0 80240850 24020014 */ addiu $v0, $zero, 0x14 -/* 9893B4 80240854 AFA20010 */ sw $v0, 0x10($sp) -/* 9893B8 80240858 44050000 */ mfc1 $a1, $f0 -/* 9893BC 8024085C 8E470060 */ lw $a3, 0x60($s2) -/* 9893C0 80240860 4485B000 */ mtc1 $a1, $f22 -/* 9893C4 80240864 0C00A8ED */ jal update_lerp -/* 9893C8 80240868 0240802D */ daddu $s0, $s2, $zero -/* 9893CC 8024086C 46000506 */ mov.s $f20, $f0 -.L80240870: -/* 9893D0 80240870 4406A000 */ mfc1 $a2, $f20 -/* 9893D4 80240874 27A40020 */ addiu $a0, $sp, 0x20 -/* 9893D8 80240878 E6160020 */ swc1 $f22, 0x20($s0) -/* 9893DC 8024087C 8E870000 */ lw $a3, ($s4) -/* 9893E0 80240880 02532821 */ addu $a1, $s2, $s3 -/* 9893E4 80240884 0C00A7E7 */ jal add_vec2D_polar -/* 9893E8 80240888 E7B60020 */ swc1 $f22, 0x20($sp) -/* 9893EC 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 9893F0 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 9893F4 80240894 46002102 */ mul.s $f4, $f4, $f0 -/* 9893F8 80240898 00000000 */ nop -/* 9893FC 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 989400 802408A0 26940004 */ addiu $s4, $s4, 4 -/* 989404 802408A4 46001082 */ mul.s $f2, $f2, $f0 -/* 989408 802408A8 00000000 */ nop -/* 98940C 802408AC 26730004 */ addiu $s3, $s3, 4 -/* 989410 802408B0 26310001 */ addiu $s1, $s1, 1 -/* 989414 802408B4 2A220003 */ slti $v0, $s1, 3 -/* 989418 802408B8 E6040014 */ swc1 $f4, 0x14($s0) -/* 98941C 802408BC E602002C */ swc1 $f2, 0x2c($s0) -/* 989420 802408C0 1440FFEB */ bnez $v0, .L80240870 -/* 989424 802408C4 26100004 */ addiu $s0, $s0, 4 -/* 989428 802408C8 8E420060 */ lw $v0, 0x60($s2) -/* 98942C 802408CC 24420001 */ addiu $v0, $v0, 1 -/* 989430 802408D0 AE420060 */ sw $v0, 0x60($s2) -/* 989434 802408D4 28420015 */ slti $v0, $v0, 0x15 -/* 989438 802408D8 1440003D */ bnez $v0, .L802409D0 -/* 98943C 802408DC 24020001 */ addiu $v0, $zero, 1 -/* 989440 802408E0 AE420000 */ sw $v0, ($s2) -/* 989444 802408E4 08090274 */ j .L802409D0 -/* 989448 802408E8 AE400060 */ sw $zero, 0x60($s2) -.L802408EC: -/* 98944C 802408EC 0000882D */ daddu $s1, $zero, $zero -/* 989450 802408F0 3C148024 */ lui $s4, 0x8024 -/* 989454 802408F4 26941158 */ addiu $s4, $s4, 0x1158 -/* 989458 802408F8 24130020 */ addiu $s3, $zero, 0x20 -/* 98945C 802408FC 0240802D */ daddu $s0, $s2, $zero -/* 989460 80240900 3C014248 */ lui $at, 0x4248 -/* 989464 80240904 4481A000 */ mtc1 $at, $f20 -/* 989468 80240908 4480B000 */ mtc1 $zero, $f22 -.L8024090C: -/* 98946C 8024090C 4406A000 */ mfc1 $a2, $f20 -/* 989470 80240910 27A40020 */ addiu $a0, $sp, 0x20 -/* 989474 80240914 E6160020 */ swc1 $f22, 0x20($s0) -/* 989478 80240918 8E870000 */ lw $a3, ($s4) -/* 98947C 8024091C 02532821 */ addu $a1, $s2, $s3 -/* 989480 80240920 0C00A7E7 */ jal add_vec2D_polar -/* 989484 80240924 E7B60020 */ swc1 $f22, 0x20($sp) -/* 989488 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 98948C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 989490 80240930 46002102 */ mul.s $f4, $f4, $f0 -/* 989494 80240934 00000000 */ nop -/* 989498 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 98949C 8024093C 26940004 */ addiu $s4, $s4, 4 -/* 9894A0 80240940 46001082 */ mul.s $f2, $f2, $f0 -/* 9894A4 80240944 00000000 */ nop -/* 9894A8 80240948 26730004 */ addiu $s3, $s3, 4 -/* 9894AC 8024094C 26310001 */ addiu $s1, $s1, 1 -/* 9894B0 80240950 2A220003 */ slti $v0, $s1, 3 -/* 9894B4 80240954 E6040014 */ swc1 $f4, 0x14($s0) -/* 9894B8 80240958 E602002C */ swc1 $f2, 0x2c($s0) -/* 9894BC 8024095C 1440FFEB */ bnez $v0, .L8024090C -/* 9894C0 80240960 26100004 */ addiu $s0, $s0, 4 -/* 9894C4 80240964 8E420060 */ lw $v0, 0x60($s2) -/* 9894C8 80240968 24420001 */ addiu $v0, $v0, 1 -/* 9894CC 8024096C AE420060 */ sw $v0, 0x60($s2) -/* 9894D0 80240970 28420010 */ slti $v0, $v0, 0x10 -/* 9894D4 80240974 14400016 */ bnez $v0, .L802409D0 -/* 9894D8 80240978 2402000F */ addiu $v0, $zero, 0xf -/* 9894DC 8024097C AE420060 */ sw $v0, 0x60($s2) -/* 9894E0 80240980 24020002 */ addiu $v0, $zero, 2 -/* 9894E4 80240984 08090274 */ j .L802409D0 -/* 9894E8 80240988 AE420000 */ sw $v0, ($s2) -.L8024098C: -/* 9894EC 8024098C 8E420060 */ lw $v0, 0x60($s2) -/* 9894F0 80240990 24420001 */ addiu $v0, $v0, 1 -/* 9894F4 80240994 AE420060 */ sw $v0, 0x60($s2) -/* 9894F8 80240998 2842001F */ slti $v0, $v0, 0x1f -/* 9894FC 8024099C 1440000C */ bnez $v0, .L802409D0 -/* 989500 802409A0 0000882D */ daddu $s1, $zero, $zero -/* 989504 802409A4 0240282D */ daddu $a1, $s2, $zero -.L802409A8: -/* 989508 802409A8 8CA20008 */ lw $v0, 8($a1) -/* 98950C 802409AC 8C430000 */ lw $v1, ($v0) -/* 989510 802409B0 26310001 */ addiu $s1, $s1, 1 -/* 989514 802409B4 34630010 */ ori $v1, $v1, 0x10 -/* 989518 802409B8 AC430000 */ sw $v1, ($v0) -/* 98951C 802409BC 2A220003 */ slti $v0, $s1, 3 -/* 989520 802409C0 1440FFF9 */ bnez $v0, .L802409A8 -/* 989524 802409C4 24A50004 */ addiu $a1, $a1, 4 -/* 989528 802409C8 080902C1 */ j .L80240B04 -/* 98952C 802409CC 24020002 */ addiu $v0, $zero, 2 -.L802409D0: -/* 989530 802409D0 8E430004 */ lw $v1, 4($s2) -/* 989534 802409D4 10600005 */ beqz $v1, .L802409EC -/* 989538 802409D8 24020001 */ addiu $v0, $zero, 1 -/* 98953C 802409DC 1062000B */ beq $v1, $v0, .L80240A0C -/* 989540 802409E0 0000882D */ daddu $s1, $zero, $zero -/* 989544 802409E4 080902B0 */ j .L80240AC0 -/* 989548 802409E8 0240282D */ daddu $a1, $s2, $zero -.L802409EC: -/* 98954C 802409EC 8E420064 */ lw $v0, 0x64($s2) -/* 989550 802409F0 24420001 */ addiu $v0, $v0, 1 -/* 989554 802409F4 AE420064 */ sw $v0, 0x64($s2) -/* 989558 802409F8 28420010 */ slti $v0, $v0, 0x10 -/* 98955C 802409FC 1440002F */ bnez $v0, .L80240ABC -/* 989560 80240A00 0000882D */ daddu $s1, $zero, $zero -/* 989564 80240A04 080902AC */ j .L80240AB0 -/* 989568 80240A08 24020001 */ addiu $v0, $zero, 1 -.L80240A0C: -/* 98956C 80240A0C 4480A000 */ mtc1 $zero, $f20 -/* 989570 80240A10 24130014 */ addiu $s3, $zero, 0x14 -/* 989574 80240A14 0240802D */ daddu $s0, $s2, $zero -.L80240A18: -/* 989578 80240A18 4405A000 */ mfc1 $a1, $f20 -/* 98957C 80240A1C AFB30010 */ sw $s3, 0x10($sp) -/* 989580 80240A20 8E060038 */ lw $a2, 0x38($s0) -/* 989584 80240A24 8E470064 */ lw $a3, 0x64($s2) -/* 989588 80240A28 0C00A8ED */ jal update_lerp -/* 98958C 80240A2C 24040001 */ addiu $a0, $zero, 1 -/* 989590 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) -/* 989594 80240A34 46001080 */ add.s $f2, $f2, $f0 -/* 989598 80240A38 4405A000 */ mfc1 $a1, $f20 -/* 98959C 80240A3C E6020014 */ swc1 $f2, 0x14($s0) -/* 9895A0 80240A40 AFB30010 */ sw $s3, 0x10($sp) -/* 9895A4 80240A44 8E060044 */ lw $a2, 0x44($s0) -/* 9895A8 80240A48 8E470064 */ lw $a3, 0x64($s2) -/* 9895AC 80240A4C 0C00A8ED */ jal update_lerp -/* 9895B0 80240A50 24040001 */ addiu $a0, $zero, 1 -/* 9895B4 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) -/* 9895B8 80240A58 46001080 */ add.s $f2, $f2, $f0 -/* 9895BC 80240A5C 4405A000 */ mfc1 $a1, $f20 -/* 9895C0 80240A60 E6020020 */ swc1 $f2, 0x20($s0) -/* 9895C4 80240A64 AFB30010 */ sw $s3, 0x10($sp) -/* 9895C8 80240A68 8E060050 */ lw $a2, 0x50($s0) -/* 9895CC 80240A6C 8E470064 */ lw $a3, 0x64($s2) -/* 9895D0 80240A70 0C00A8ED */ jal update_lerp -/* 9895D4 80240A74 24040001 */ addiu $a0, $zero, 1 -/* 9895D8 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) -/* 9895DC 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* 9895E0 80240A80 26310001 */ addiu $s1, $s1, 1 -/* 9895E4 80240A84 2A220003 */ slti $v0, $s1, 3 -/* 9895E8 80240A88 E602002C */ swc1 $f2, 0x2c($s0) -/* 9895EC 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 -/* 9895F0 80240A90 26100004 */ addiu $s0, $s0, 4 -/* 9895F4 80240A94 8E420064 */ lw $v0, 0x64($s2) -/* 9895F8 80240A98 24420001 */ addiu $v0, $v0, 1 -/* 9895FC 80240A9C AE420064 */ sw $v0, 0x64($s2) -/* 989600 80240AA0 28420015 */ slti $v0, $v0, 0x15 -/* 989604 80240AA4 14400005 */ bnez $v0, .L80240ABC -/* 989608 80240AA8 0000882D */ daddu $s1, $zero, $zero -/* 98960C 80240AAC 24020002 */ addiu $v0, $zero, 2 -.L80240AB0: -/* 989610 80240AB0 AE420004 */ sw $v0, 4($s2) -/* 989614 80240AB4 AE400064 */ sw $zero, 0x64($s2) -/* 989618 80240AB8 0000882D */ daddu $s1, $zero, $zero -.L80240ABC: -/* 98961C 80240ABC 0240282D */ daddu $a1, $s2, $zero -.L80240AC0: -/* 989620 80240AC0 8CA20008 */ lw $v0, 8($a1) -/* 989624 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 989628 80240AC8 8C42000C */ lw $v0, 0xc($v0) -/* 98962C 80240ACC E4400010 */ swc1 $f0, 0x10($v0) -/* 989630 80240AD0 8CA20008 */ lw $v0, 8($a1) -/* 989634 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 989638 80240AD8 8C42000C */ lw $v0, 0xc($v0) -/* 98963C 80240ADC 26310001 */ addiu $s1, $s1, 1 -/* 989640 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) -/* 989644 80240AE4 8CA20008 */ lw $v0, 8($a1) -/* 989648 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 98964C 80240AEC 8C42000C */ lw $v0, 0xc($v0) -/* 989650 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) -/* 989654 80240AF4 2A220003 */ slti $v0, $s1, 3 -/* 989658 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 -/* 98965C 80240AFC 24A50004 */ addiu $a1, $a1, 4 -/* 989660 80240B00 0000102D */ daddu $v0, $zero, $zero -.L80240B04: -/* 989664 80240B04 8FBF0044 */ lw $ra, 0x44($sp) -/* 989668 80240B08 8FB60040 */ lw $s6, 0x40($sp) -/* 98966C 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) -/* 989670 80240B10 8FB40038 */ lw $s4, 0x38($sp) -/* 989674 80240B14 8FB30034 */ lw $s3, 0x34($sp) -/* 989678 80240B18 8FB20030 */ lw $s2, 0x30($sp) -/* 98967C 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) -/* 989680 80240B20 8FB00028 */ lw $s0, 0x28($sp) -/* 989684 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 989688 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 98968C 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 989690 80240B30 03E00008 */ jr $ra -/* 989694 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s new file mode 100644 index 0000000000..94ec916685 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240600_989160.s @@ -0,0 +1,356 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240600_989160 +/* 989160 80240600 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* 989164 80240604 AFB60040 */ sw $s6, 0x40($sp) +/* 989168 80240608 0080B02D */ daddu $s6, $a0, $zero +/* 98916C 8024060C AFB00028 */ sw $s0, 0x28($sp) +/* 989170 80240610 00A0802D */ daddu $s0, $a1, $zero +/* 989174 80240614 AFBF0044 */ sw $ra, 0x44($sp) +/* 989178 80240618 AFB5003C */ sw $s5, 0x3c($sp) +/* 98917C 8024061C AFB40038 */ sw $s4, 0x38($sp) +/* 989180 80240620 AFB30034 */ sw $s3, 0x34($sp) +/* 989184 80240624 AFB20030 */ sw $s2, 0x30($sp) +/* 989188 80240628 AFB1002C */ sw $s1, 0x2c($sp) +/* 98918C 8024062C F7B80058 */ sdc1 $f24, 0x58($sp) +/* 989190 80240630 F7B60050 */ sdc1 $f22, 0x50($sp) +/* 989194 80240634 F7B40048 */ sdc1 $f20, 0x48($sp) +/* 989198 80240638 8ED3000C */ lw $s3, 0xc($s6) +/* 98919C 8024063C 0C00EAD2 */ jal get_npc_safe +/* 9891A0 80240640 2404FFFC */ addiu $a0, $zero, -4 +/* 9891A4 80240644 27A50018 */ addiu $a1, $sp, 0x18 +/* 9891A8 80240648 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 9891AC 8024064C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 9891B0 80240650 27A6001C */ addiu $a2, $sp, 0x1c +/* 9891B4 80240654 00041880 */ sll $v1, $a0, 2 +/* 9891B8 80240658 00641821 */ addu $v1, $v1, $a0 +/* 9891BC 8024065C 00031880 */ sll $v1, $v1, 2 +/* 9891C0 80240660 00641823 */ subu $v1, $v1, $a0 +/* 9891C4 80240664 000320C0 */ sll $a0, $v1, 3 +/* 9891C8 80240668 00641821 */ addu $v1, $v1, $a0 +/* 9891CC 8024066C 000318C0 */ sll $v1, $v1, 3 +/* 9891D0 80240670 3C01800B */ lui $at, 0x800b +/* 9891D4 80240674 00230821 */ addu $at, $at, $v1 +/* 9891D8 80240678 C42C1DEC */ lwc1 $f12, 0x1dec($at) +/* 9891DC 8024067C 0C00A88D */ jal sin_cos_deg +/* 9891E0 80240680 0040A82D */ daddu $s5, $v0, $zero +/* 9891E4 80240684 1200005D */ beqz $s0, .L802407FC +/* 9891E8 80240688 00000000 */ nop +/* 9891EC 8024068C 0C00AB0A */ jal general_heap_malloc +/* 9891F0 80240690 24040068 */ addiu $a0, $zero, 0x68 +/* 9891F4 80240694 0040902D */ daddu $s2, $v0, $zero +/* 9891F8 80240698 02C0202D */ daddu $a0, $s6, $zero +/* 9891FC 8024069C 0000882D */ daddu $s1, $zero, $zero +/* 989200 802406A0 2414FFFF */ addiu $s4, $zero, -1 +/* 989204 802406A4 AED20060 */ sw $s2, 0x60($s6) +/* 989208 802406A8 8E650000 */ lw $a1, ($s3) +/* 98920C 802406AC 3C014148 */ lui $at, 0x4148 +/* 989210 802406B0 4481C000 */ mtc1 $at, $f24 +/* 989214 802406B4 3C013F80 */ lui $at, 0x3f80 +/* 989218 802406B8 4481B000 */ mtc1 $at, $f22 +/* 98921C 802406BC 4480A000 */ mtc1 $zero, $f20 +/* 989220 802406C0 0C0B1EAF */ jal get_variable +/* 989224 802406C4 0240802D */ daddu $s0, $s2, $zero +/* 989228 802406C8 0C04417A */ jal get_entity_by_index +/* 98922C 802406CC 0040202D */ daddu $a0, $v0, $zero +/* 989230 802406D0 AE42005C */ sw $v0, 0x5c($s2) +.L802406D4: +/* 989234 802406D4 8E42005C */ lw $v0, 0x5c($s2) +/* 989238 802406D8 C440004C */ lwc1 $f0, 0x4c($v0) +/* 98923C 802406DC 0000202D */ daddu $a0, $zero, $zero +/* 989240 802406E0 E7B60010 */ swc1 $f22, 0x10($sp) +/* 989244 802406E4 AFB40014 */ sw $s4, 0x14($sp) +/* 989248 802406E8 46180000 */ add.s $f0, $f0, $f24 +/* 98924C 802406EC 8C450048 */ lw $a1, 0x48($v0) +/* 989250 802406F0 8C470050 */ lw $a3, 0x50($v0) +/* 989254 802406F4 44060000 */ mfc1 $a2, $f0 +/* 989258 802406F8 0C01C5BC */ jal func_800716F0 +/* 98925C 802406FC 26310001 */ addiu $s1, $s1, 1 +/* 989260 80240700 AE020008 */ sw $v0, 8($s0) +/* 989264 80240704 E614002C */ swc1 $f20, 0x2c($s0) +/* 989268 80240708 E6140020 */ swc1 $f20, 0x20($s0) +/* 98926C 8024070C E6140014 */ swc1 $f20, 0x14($s0) +/* 989270 80240710 E6140050 */ swc1 $f20, 0x50($s0) +/* 989274 80240714 E6140044 */ swc1 $f20, 0x44($s0) +/* 989278 80240718 E6140038 */ swc1 $f20, 0x38($s0) +/* 98927C 8024071C 2A220003 */ slti $v0, $s1, 3 +/* 989280 80240720 1440FFEC */ bnez $v0, .L802406D4 +/* 989284 80240724 26100004 */ addiu $s0, $s0, 4 +/* 989288 80240728 0000882D */ daddu $s1, $zero, $zero +/* 98928C 8024072C 0240802D */ daddu $s0, $s2, $zero +/* 989290 80240730 3C148024 */ lui $s4, 0x8024 +/* 989294 80240734 26941158 */ addiu $s4, $s4, 0x1158 +/* 989298 80240738 3C014248 */ lui $at, 0x4248 +/* 98929C 8024073C 4481A000 */ mtc1 $at, $f20 +/* 9892A0 80240740 24130044 */ addiu $s3, $zero, 0x44 +/* 9892A4 80240744 AE400000 */ sw $zero, ($s2) +/* 9892A8 80240748 AE400004 */ sw $zero, 4($s2) +/* 9892AC 8024074C AE400060 */ sw $zero, 0x60($s2) +/* 9892B0 80240750 AE400064 */ sw $zero, 0x64($s2) +.L80240754: +/* 9892B4 80240754 27A40020 */ addiu $a0, $sp, 0x20 +/* 9892B8 80240758 4406A000 */ mfc1 $a2, $f20 +/* 9892BC 8024075C 8E870000 */ lw $a3, ($s4) +/* 9892C0 80240760 02532821 */ addu $a1, $s2, $s3 +/* 9892C4 80240764 0C00A7E7 */ jal add_vec2D_polar +/* 9892C8 80240768 AFA00020 */ sw $zero, 0x20($sp) +/* 9892CC 8024076C C7A2001C */ lwc1 $f2, 0x1c($sp) +/* 9892D0 80240770 C7A40020 */ lwc1 $f4, 0x20($sp) +/* 9892D4 80240774 46041082 */ mul.s $f2, $f2, $f4 +/* 9892D8 80240778 00000000 */ nop +/* 9892DC 8024077C C7A00018 */ lwc1 $f0, 0x18($sp) +/* 9892E0 80240780 46040002 */ mul.s $f0, $f0, $f4 +/* 9892E4 80240784 00000000 */ nop +/* 9892E8 80240788 E6020038 */ swc1 $f2, 0x38($s0) +/* 9892EC 8024078C E6000050 */ swc1 $f0, 0x50($s0) +/* 9892F0 80240790 8E42005C */ lw $v0, 0x5c($s2) +/* 9892F4 80240794 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9892F8 80240798 C4420048 */ lwc1 $f2, 0x48($v0) +/* 9892FC 8024079C 46001080 */ add.s $f2, $f2, $f0 +/* 989300 802407A0 C6A00038 */ lwc1 $f0, 0x38($s5) +/* 989304 802407A4 46020001 */ sub.s $f0, $f0, $f2 +/* 989308 802407A8 E6000038 */ swc1 $f0, 0x38($s0) +/* 98930C 802407AC 8E42005C */ lw $v0, 0x5c($s2) +/* 989310 802407B0 C6000044 */ lwc1 $f0, 0x44($s0) +/* 989314 802407B4 C442004C */ lwc1 $f2, 0x4c($v0) +/* 989318 802407B8 46001080 */ add.s $f2, $f2, $f0 +/* 98931C 802407BC C6A0003C */ lwc1 $f0, 0x3c($s5) +/* 989320 802407C0 46020001 */ sub.s $f0, $f0, $f2 +/* 989324 802407C4 E6000044 */ swc1 $f0, 0x44($s0) +/* 989328 802407C8 8E42005C */ lw $v0, 0x5c($s2) +/* 98932C 802407CC C6000050 */ lwc1 $f0, 0x50($s0) +/* 989330 802407D0 C4420050 */ lwc1 $f2, 0x50($v0) +/* 989334 802407D4 26940004 */ addiu $s4, $s4, 4 +/* 989338 802407D8 46001080 */ add.s $f2, $f2, $f0 +/* 98933C 802407DC C6A00040 */ lwc1 $f0, 0x40($s5) +/* 989340 802407E0 26730004 */ addiu $s3, $s3, 4 +/* 989344 802407E4 46020001 */ sub.s $f0, $f0, $f2 +/* 989348 802407E8 26310001 */ addiu $s1, $s1, 1 +/* 98934C 802407EC 2A220003 */ slti $v0, $s1, 3 +/* 989350 802407F0 E6000050 */ swc1 $f0, 0x50($s0) +/* 989354 802407F4 1440FFD7 */ bnez $v0, .L80240754 +/* 989358 802407F8 26100004 */ addiu $s0, $s0, 4 +.L802407FC: +/* 98935C 802407FC 8ED20060 */ lw $s2, 0x60($s6) +/* 989360 80240800 8E430000 */ lw $v1, ($s2) +/* 989364 80240804 24020001 */ addiu $v0, $zero, 1 +/* 989368 80240808 10620038 */ beq $v1, $v0, .L802408EC +/* 98936C 8024080C 28620002 */ slti $v0, $v1, 2 +/* 989370 80240810 50400005 */ beql $v0, $zero, .L80240828 +/* 989374 80240814 24020002 */ addiu $v0, $zero, 2 +/* 989378 80240818 10600007 */ beqz $v1, .L80240838 +/* 98937C 8024081C 24040005 */ addiu $a0, $zero, 5 +/* 989380 80240820 08090274 */ j .L802409D0 +/* 989384 80240824 00000000 */ nop +.L80240828: +/* 989388 80240828 10620058 */ beq $v1, $v0, .L8024098C +/* 98938C 8024082C 00000000 */ nop +/* 989390 80240830 08090274 */ j .L802409D0 +/* 989394 80240834 00000000 */ nop +.L80240838: +/* 989398 80240838 0000882D */ daddu $s1, $zero, $zero +/* 98939C 8024083C 3C148024 */ lui $s4, 0x8024 +/* 9893A0 80240840 26941158 */ addiu $s4, $s4, 0x1158 +/* 9893A4 80240844 24130020 */ addiu $s3, $zero, 0x20 +/* 9893A8 80240848 3C064248 */ lui $a2, 0x4248 +/* 9893AC 8024084C 44800000 */ mtc1 $zero, $f0 +/* 9893B0 80240850 24020014 */ addiu $v0, $zero, 0x14 +/* 9893B4 80240854 AFA20010 */ sw $v0, 0x10($sp) +/* 9893B8 80240858 44050000 */ mfc1 $a1, $f0 +/* 9893BC 8024085C 8E470060 */ lw $a3, 0x60($s2) +/* 9893C0 80240860 4485B000 */ mtc1 $a1, $f22 +/* 9893C4 80240864 0C00A8ED */ jal update_lerp +/* 9893C8 80240868 0240802D */ daddu $s0, $s2, $zero +/* 9893CC 8024086C 46000506 */ mov.s $f20, $f0 +.L80240870: +/* 9893D0 80240870 4406A000 */ mfc1 $a2, $f20 +/* 9893D4 80240874 27A40020 */ addiu $a0, $sp, 0x20 +/* 9893D8 80240878 E6160020 */ swc1 $f22, 0x20($s0) +/* 9893DC 8024087C 8E870000 */ lw $a3, ($s4) +/* 9893E0 80240880 02532821 */ addu $a1, $s2, $s3 +/* 9893E4 80240884 0C00A7E7 */ jal add_vec2D_polar +/* 9893E8 80240888 E7B60020 */ swc1 $f22, 0x20($sp) +/* 9893EC 8024088C C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 9893F0 80240890 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 9893F4 80240894 46002102 */ mul.s $f4, $f4, $f0 +/* 9893F8 80240898 00000000 */ nop +/* 9893FC 8024089C C7A20018 */ lwc1 $f2, 0x18($sp) +/* 989400 802408A0 26940004 */ addiu $s4, $s4, 4 +/* 989404 802408A4 46001082 */ mul.s $f2, $f2, $f0 +/* 989408 802408A8 00000000 */ nop +/* 98940C 802408AC 26730004 */ addiu $s3, $s3, 4 +/* 989410 802408B0 26310001 */ addiu $s1, $s1, 1 +/* 989414 802408B4 2A220003 */ slti $v0, $s1, 3 +/* 989418 802408B8 E6040014 */ swc1 $f4, 0x14($s0) +/* 98941C 802408BC E602002C */ swc1 $f2, 0x2c($s0) +/* 989420 802408C0 1440FFEB */ bnez $v0, .L80240870 +/* 989424 802408C4 26100004 */ addiu $s0, $s0, 4 +/* 989428 802408C8 8E420060 */ lw $v0, 0x60($s2) +/* 98942C 802408CC 24420001 */ addiu $v0, $v0, 1 +/* 989430 802408D0 AE420060 */ sw $v0, 0x60($s2) +/* 989434 802408D4 28420015 */ slti $v0, $v0, 0x15 +/* 989438 802408D8 1440003D */ bnez $v0, .L802409D0 +/* 98943C 802408DC 24020001 */ addiu $v0, $zero, 1 +/* 989440 802408E0 AE420000 */ sw $v0, ($s2) +/* 989444 802408E4 08090274 */ j .L802409D0 +/* 989448 802408E8 AE400060 */ sw $zero, 0x60($s2) +.L802408EC: +/* 98944C 802408EC 0000882D */ daddu $s1, $zero, $zero +/* 989450 802408F0 3C148024 */ lui $s4, 0x8024 +/* 989454 802408F4 26941158 */ addiu $s4, $s4, 0x1158 +/* 989458 802408F8 24130020 */ addiu $s3, $zero, 0x20 +/* 98945C 802408FC 0240802D */ daddu $s0, $s2, $zero +/* 989460 80240900 3C014248 */ lui $at, 0x4248 +/* 989464 80240904 4481A000 */ mtc1 $at, $f20 +/* 989468 80240908 4480B000 */ mtc1 $zero, $f22 +.L8024090C: +/* 98946C 8024090C 4406A000 */ mfc1 $a2, $f20 +/* 989470 80240910 27A40020 */ addiu $a0, $sp, 0x20 +/* 989474 80240914 E6160020 */ swc1 $f22, 0x20($s0) +/* 989478 80240918 8E870000 */ lw $a3, ($s4) +/* 98947C 8024091C 02532821 */ addu $a1, $s2, $s3 +/* 989480 80240920 0C00A7E7 */ jal add_vec2D_polar +/* 989484 80240924 E7B60020 */ swc1 $f22, 0x20($sp) +/* 989488 80240928 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 98948C 8024092C C7A00020 */ lwc1 $f0, 0x20($sp) +/* 989490 80240930 46002102 */ mul.s $f4, $f4, $f0 +/* 989494 80240934 00000000 */ nop +/* 989498 80240938 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 98949C 8024093C 26940004 */ addiu $s4, $s4, 4 +/* 9894A0 80240940 46001082 */ mul.s $f2, $f2, $f0 +/* 9894A4 80240944 00000000 */ nop +/* 9894A8 80240948 26730004 */ addiu $s3, $s3, 4 +/* 9894AC 8024094C 26310001 */ addiu $s1, $s1, 1 +/* 9894B0 80240950 2A220003 */ slti $v0, $s1, 3 +/* 9894B4 80240954 E6040014 */ swc1 $f4, 0x14($s0) +/* 9894B8 80240958 E602002C */ swc1 $f2, 0x2c($s0) +/* 9894BC 8024095C 1440FFEB */ bnez $v0, .L8024090C +/* 9894C0 80240960 26100004 */ addiu $s0, $s0, 4 +/* 9894C4 80240964 8E420060 */ lw $v0, 0x60($s2) +/* 9894C8 80240968 24420001 */ addiu $v0, $v0, 1 +/* 9894CC 8024096C AE420060 */ sw $v0, 0x60($s2) +/* 9894D0 80240970 28420010 */ slti $v0, $v0, 0x10 +/* 9894D4 80240974 14400016 */ bnez $v0, .L802409D0 +/* 9894D8 80240978 2402000F */ addiu $v0, $zero, 0xf +/* 9894DC 8024097C AE420060 */ sw $v0, 0x60($s2) +/* 9894E0 80240980 24020002 */ addiu $v0, $zero, 2 +/* 9894E4 80240984 08090274 */ j .L802409D0 +/* 9894E8 80240988 AE420000 */ sw $v0, ($s2) +.L8024098C: +/* 9894EC 8024098C 8E420060 */ lw $v0, 0x60($s2) +/* 9894F0 80240990 24420001 */ addiu $v0, $v0, 1 +/* 9894F4 80240994 AE420060 */ sw $v0, 0x60($s2) +/* 9894F8 80240998 2842001F */ slti $v0, $v0, 0x1f +/* 9894FC 8024099C 1440000C */ bnez $v0, .L802409D0 +/* 989500 802409A0 0000882D */ daddu $s1, $zero, $zero +/* 989504 802409A4 0240282D */ daddu $a1, $s2, $zero +.L802409A8: +/* 989508 802409A8 8CA20008 */ lw $v0, 8($a1) +/* 98950C 802409AC 8C430000 */ lw $v1, ($v0) +/* 989510 802409B0 26310001 */ addiu $s1, $s1, 1 +/* 989514 802409B4 34630010 */ ori $v1, $v1, 0x10 +/* 989518 802409B8 AC430000 */ sw $v1, ($v0) +/* 98951C 802409BC 2A220003 */ slti $v0, $s1, 3 +/* 989520 802409C0 1440FFF9 */ bnez $v0, .L802409A8 +/* 989524 802409C4 24A50004 */ addiu $a1, $a1, 4 +/* 989528 802409C8 080902C1 */ j .L80240B04 +/* 98952C 802409CC 24020002 */ addiu $v0, $zero, 2 +.L802409D0: +/* 989530 802409D0 8E430004 */ lw $v1, 4($s2) +/* 989534 802409D4 10600005 */ beqz $v1, .L802409EC +/* 989538 802409D8 24020001 */ addiu $v0, $zero, 1 +/* 98953C 802409DC 1062000B */ beq $v1, $v0, .L80240A0C +/* 989540 802409E0 0000882D */ daddu $s1, $zero, $zero +/* 989544 802409E4 080902B0 */ j .L80240AC0 +/* 989548 802409E8 0240282D */ daddu $a1, $s2, $zero +.L802409EC: +/* 98954C 802409EC 8E420064 */ lw $v0, 0x64($s2) +/* 989550 802409F0 24420001 */ addiu $v0, $v0, 1 +/* 989554 802409F4 AE420064 */ sw $v0, 0x64($s2) +/* 989558 802409F8 28420010 */ slti $v0, $v0, 0x10 +/* 98955C 802409FC 1440002F */ bnez $v0, .L80240ABC +/* 989560 80240A00 0000882D */ daddu $s1, $zero, $zero +/* 989564 80240A04 080902AC */ j .L80240AB0 +/* 989568 80240A08 24020001 */ addiu $v0, $zero, 1 +.L80240A0C: +/* 98956C 80240A0C 4480A000 */ mtc1 $zero, $f20 +/* 989570 80240A10 24130014 */ addiu $s3, $zero, 0x14 +/* 989574 80240A14 0240802D */ daddu $s0, $s2, $zero +.L80240A18: +/* 989578 80240A18 4405A000 */ mfc1 $a1, $f20 +/* 98957C 80240A1C AFB30010 */ sw $s3, 0x10($sp) +/* 989580 80240A20 8E060038 */ lw $a2, 0x38($s0) +/* 989584 80240A24 8E470064 */ lw $a3, 0x64($s2) +/* 989588 80240A28 0C00A8ED */ jal update_lerp +/* 98958C 80240A2C 24040001 */ addiu $a0, $zero, 1 +/* 989590 80240A30 C6020014 */ lwc1 $f2, 0x14($s0) +/* 989594 80240A34 46001080 */ add.s $f2, $f2, $f0 +/* 989598 80240A38 4405A000 */ mfc1 $a1, $f20 +/* 98959C 80240A3C E6020014 */ swc1 $f2, 0x14($s0) +/* 9895A0 80240A40 AFB30010 */ sw $s3, 0x10($sp) +/* 9895A4 80240A44 8E060044 */ lw $a2, 0x44($s0) +/* 9895A8 80240A48 8E470064 */ lw $a3, 0x64($s2) +/* 9895AC 80240A4C 0C00A8ED */ jal update_lerp +/* 9895B0 80240A50 24040001 */ addiu $a0, $zero, 1 +/* 9895B4 80240A54 C6020020 */ lwc1 $f2, 0x20($s0) +/* 9895B8 80240A58 46001080 */ add.s $f2, $f2, $f0 +/* 9895BC 80240A5C 4405A000 */ mfc1 $a1, $f20 +/* 9895C0 80240A60 E6020020 */ swc1 $f2, 0x20($s0) +/* 9895C4 80240A64 AFB30010 */ sw $s3, 0x10($sp) +/* 9895C8 80240A68 8E060050 */ lw $a2, 0x50($s0) +/* 9895CC 80240A6C 8E470064 */ lw $a3, 0x64($s2) +/* 9895D0 80240A70 0C00A8ED */ jal update_lerp +/* 9895D4 80240A74 24040001 */ addiu $a0, $zero, 1 +/* 9895D8 80240A78 C602002C */ lwc1 $f2, 0x2c($s0) +/* 9895DC 80240A7C 46001080 */ add.s $f2, $f2, $f0 +/* 9895E0 80240A80 26310001 */ addiu $s1, $s1, 1 +/* 9895E4 80240A84 2A220003 */ slti $v0, $s1, 3 +/* 9895E8 80240A88 E602002C */ swc1 $f2, 0x2c($s0) +/* 9895EC 80240A8C 1440FFE2 */ bnez $v0, .L80240A18 +/* 9895F0 80240A90 26100004 */ addiu $s0, $s0, 4 +/* 9895F4 80240A94 8E420064 */ lw $v0, 0x64($s2) +/* 9895F8 80240A98 24420001 */ addiu $v0, $v0, 1 +/* 9895FC 80240A9C AE420064 */ sw $v0, 0x64($s2) +/* 989600 80240AA0 28420015 */ slti $v0, $v0, 0x15 +/* 989604 80240AA4 14400005 */ bnez $v0, .L80240ABC +/* 989608 80240AA8 0000882D */ daddu $s1, $zero, $zero +/* 98960C 80240AAC 24020002 */ addiu $v0, $zero, 2 +.L80240AB0: +/* 989610 80240AB0 AE420004 */ sw $v0, 4($s2) +/* 989614 80240AB4 AE400064 */ sw $zero, 0x64($s2) +/* 989618 80240AB8 0000882D */ daddu $s1, $zero, $zero +.L80240ABC: +/* 98961C 80240ABC 0240282D */ daddu $a1, $s2, $zero +.L80240AC0: +/* 989620 80240AC0 8CA20008 */ lw $v0, 8($a1) +/* 989624 80240AC4 C4A00014 */ lwc1 $f0, 0x14($a1) +/* 989628 80240AC8 8C42000C */ lw $v0, 0xc($v0) +/* 98962C 80240ACC E4400010 */ swc1 $f0, 0x10($v0) +/* 989630 80240AD0 8CA20008 */ lw $v0, 8($a1) +/* 989634 80240AD4 C4A00020 */ lwc1 $f0, 0x20($a1) +/* 989638 80240AD8 8C42000C */ lw $v0, 0xc($v0) +/* 98963C 80240ADC 26310001 */ addiu $s1, $s1, 1 +/* 989640 80240AE0 E4400014 */ swc1 $f0, 0x14($v0) +/* 989644 80240AE4 8CA20008 */ lw $v0, 8($a1) +/* 989648 80240AE8 C4A0002C */ lwc1 $f0, 0x2c($a1) +/* 98964C 80240AEC 8C42000C */ lw $v0, 0xc($v0) +/* 989650 80240AF0 E4400018 */ swc1 $f0, 0x18($v0) +/* 989654 80240AF4 2A220003 */ slti $v0, $s1, 3 +/* 989658 80240AF8 1440FFF1 */ bnez $v0, .L80240AC0 +/* 98965C 80240AFC 24A50004 */ addiu $a1, $a1, 4 +/* 989660 80240B00 0000102D */ daddu $v0, $zero, $zero +.L80240B04: +/* 989664 80240B04 8FBF0044 */ lw $ra, 0x44($sp) +/* 989668 80240B08 8FB60040 */ lw $s6, 0x40($sp) +/* 98966C 80240B0C 8FB5003C */ lw $s5, 0x3c($sp) +/* 989670 80240B10 8FB40038 */ lw $s4, 0x38($sp) +/* 989674 80240B14 8FB30034 */ lw $s3, 0x34($sp) +/* 989678 80240B18 8FB20030 */ lw $s2, 0x30($sp) +/* 98967C 80240B1C 8FB1002C */ lw $s1, 0x2c($sp) +/* 989680 80240B20 8FB00028 */ lw $s0, 0x28($sp) +/* 989684 80240B24 D7B80058 */ ldc1 $f24, 0x58($sp) +/* 989688 80240B28 D7B60050 */ ldc1 $f22, 0x50($sp) +/* 98968C 80240B2C D7B40048 */ ldc1 $f20, 0x48($sp) +/* 989690 80240B30 03E00008 */ jr $ra +/* 989694 80240B34 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38.s deleted file mode 100644 index 5d32452cf3..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B38 -/* 989698 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 98969C 80240B3C AFB10014 */ sw $s1, 0x14($sp) -/* 9896A0 80240B40 0080882D */ daddu $s1, $a0, $zero -/* 9896A4 80240B44 AFB20018 */ sw $s2, 0x18($sp) -/* 9896A8 80240B48 AFBF001C */ sw $ra, 0x1c($sp) -/* 9896AC 80240B4C AFB00010 */ sw $s0, 0x10($sp) -/* 9896B0 80240B50 8E30000C */ lw $s0, 0xc($s1) -/* 9896B4 80240B54 10A00010 */ beqz $a1, .L80240B98 -/* 9896B8 80240B58 0000902D */ daddu $s2, $zero, $zero -/* 9896BC 80240B5C 8E050000 */ lw $a1, ($s0) -/* 9896C0 80240B60 0C0B1EAF */ jal get_variable -/* 9896C4 80240B64 26100004 */ addiu $s0, $s0, 4 -/* 9896C8 80240B68 AE220084 */ sw $v0, 0x84($s1) -/* 9896CC 80240B6C 8E050000 */ lw $a1, ($s0) -/* 9896D0 80240B70 0C0B1EAF */ jal get_variable -/* 9896D4 80240B74 0220202D */ daddu $a0, $s1, $zero -/* 9896D8 80240B78 0240202D */ daddu $a0, $s2, $zero -/* 9896DC 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 -/* 9896E0 80240B80 00A0302D */ daddu $a2, $a1, $zero -/* 9896E4 80240B84 00A0382D */ daddu $a3, $a1, $zero -/* 9896E8 80240B88 AE220088 */ sw $v0, 0x88($s1) -/* 9896EC 80240B8C AE200070 */ sw $zero, 0x70($s1) -/* 9896F0 80240B90 0C04DF84 */ jal func_80137E10 -/* 9896F4 80240B94 AE200074 */ sw $zero, 0x74($s1) -.L80240B98: -/* 9896F8 80240B98 8E230070 */ lw $v1, 0x70($s1) -/* 9896FC 80240B9C 24040001 */ addiu $a0, $zero, 1 -/* 989700 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 -/* 989704 80240BA4 28620002 */ slti $v0, $v1, 2 -/* 989708 80240BA8 10400005 */ beqz $v0, .L80240BC0 -/* 98970C 80240BAC 24020002 */ addiu $v0, $zero, 2 -/* 989710 80240BB0 10600007 */ beqz $v1, .L80240BD0 -/* 989714 80240BB4 240500FF */ addiu $a1, $zero, 0xff -/* 989718 80240BB8 08090312 */ j .L80240C48 -/* 98971C 80240BBC 00000000 */ nop -.L80240BC0: -/* 989720 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 -/* 989724 80240BC4 00000000 */ nop -/* 989728 80240BC8 08090312 */ j .L80240C48 -/* 98972C 80240BCC 00000000 */ nop -.L80240BD0: -/* 989730 80240BD0 8E220074 */ lw $v0, 0x74($s1) -/* 989734 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 -/* 989738 80240BD8 00000000 */ nop -/* 98973C 80240BDC AE240070 */ sw $a0, 0x70($s1) -/* 989740 80240BE0 AE200078 */ sw $zero, 0x78($s1) -/* 989744 80240BE4 8E220074 */ lw $v0, 0x74($s1) -.L80240BE8: -/* 989748 80240BE8 8E230084 */ lw $v1, 0x84($s1) -/* 98974C 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* 989750 80240BF0 AE220074 */ sw $v0, 0x74($s1) -/* 989754 80240BF4 28420100 */ slti $v0, $v0, 0x100 -/* 989758 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 -/* 98975C 80240BFC AE250074 */ sw $a1, 0x74($s1) -/* 989760 80240C00 08090312 */ j .L80240C48 -/* 989764 80240C04 00000000 */ nop -.L80240C08: -/* 989768 80240C08 8E220078 */ lw $v0, 0x78($s1) -/* 98976C 80240C0C 24420001 */ addiu $v0, $v0, 1 -/* 989770 80240C10 AE220078 */ sw $v0, 0x78($s1) -/* 989774 80240C14 28420002 */ slti $v0, $v0, 2 -/* 989778 80240C18 1440000B */ bnez $v0, .L80240C48 -/* 98977C 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* 989780 80240C20 08090312 */ j .L80240C48 -/* 989784 80240C24 AE220070 */ sw $v0, 0x70($s1) -.L80240C28: -/* 989788 80240C28 8E230074 */ lw $v1, 0x74($s1) -/* 98978C 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 -/* 989790 80240C30 24120001 */ addiu $s2, $zero, 1 -.L80240C34: -/* 989794 80240C34 8E220088 */ lw $v0, 0x88($s1) -/* 989798 80240C38 00621023 */ subu $v0, $v1, $v0 -/* 98979C 80240C3C 04410002 */ bgez $v0, .L80240C48 -/* 9897A0 80240C40 AE220074 */ sw $v0, 0x74($s1) -/* 9897A4 80240C44 AE200074 */ sw $zero, 0x74($s1) -.L80240C48: -/* 9897A8 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) -/* 9897AC 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* 9897B0 80240C50 44050000 */ mfc1 $a1, $f0 -/* 9897B4 80240C54 0C04DF62 */ jal func_80137D88 -/* 9897B8 80240C58 24040001 */ addiu $a0, $zero, 1 -/* 9897BC 80240C5C 0240102D */ daddu $v0, $s2, $zero -/* 9897C0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) -/* 9897C4 80240C64 8FB20018 */ lw $s2, 0x18($sp) -/* 9897C8 80240C68 8FB10014 */ lw $s1, 0x14($sp) -/* 9897CC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) -/* 9897D0 80240C70 03E00008 */ jr $ra -/* 9897D4 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s new file mode 100644 index 0000000000..a262665bbf --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240B38_989698.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B38_989698 +/* 989698 80240B38 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 98969C 80240B3C AFB10014 */ sw $s1, 0x14($sp) +/* 9896A0 80240B40 0080882D */ daddu $s1, $a0, $zero +/* 9896A4 80240B44 AFB20018 */ sw $s2, 0x18($sp) +/* 9896A8 80240B48 AFBF001C */ sw $ra, 0x1c($sp) +/* 9896AC 80240B4C AFB00010 */ sw $s0, 0x10($sp) +/* 9896B0 80240B50 8E30000C */ lw $s0, 0xc($s1) +/* 9896B4 80240B54 10A00010 */ beqz $a1, .L80240B98 +/* 9896B8 80240B58 0000902D */ daddu $s2, $zero, $zero +/* 9896BC 80240B5C 8E050000 */ lw $a1, ($s0) +/* 9896C0 80240B60 0C0B1EAF */ jal get_variable +/* 9896C4 80240B64 26100004 */ addiu $s0, $s0, 4 +/* 9896C8 80240B68 AE220084 */ sw $v0, 0x84($s1) +/* 9896CC 80240B6C 8E050000 */ lw $a1, ($s0) +/* 9896D0 80240B70 0C0B1EAF */ jal get_variable +/* 9896D4 80240B74 0220202D */ daddu $a0, $s1, $zero +/* 9896D8 80240B78 0240202D */ daddu $a0, $s2, $zero +/* 9896DC 80240B7C 240500D0 */ addiu $a1, $zero, 0xd0 +/* 9896E0 80240B80 00A0302D */ daddu $a2, $a1, $zero +/* 9896E4 80240B84 00A0382D */ daddu $a3, $a1, $zero +/* 9896E8 80240B88 AE220088 */ sw $v0, 0x88($s1) +/* 9896EC 80240B8C AE200070 */ sw $zero, 0x70($s1) +/* 9896F0 80240B90 0C04DF84 */ jal func_80137E10 +/* 9896F4 80240B94 AE200074 */ sw $zero, 0x74($s1) +.L80240B98: +/* 9896F8 80240B98 8E230070 */ lw $v1, 0x70($s1) +/* 9896FC 80240B9C 24040001 */ addiu $a0, $zero, 1 +/* 989700 80240BA0 10640019 */ beq $v1, $a0, .L80240C08 +/* 989704 80240BA4 28620002 */ slti $v0, $v1, 2 +/* 989708 80240BA8 10400005 */ beqz $v0, .L80240BC0 +/* 98970C 80240BAC 24020002 */ addiu $v0, $zero, 2 +/* 989710 80240BB0 10600007 */ beqz $v1, .L80240BD0 +/* 989714 80240BB4 240500FF */ addiu $a1, $zero, 0xff +/* 989718 80240BB8 08090312 */ j .L80240C48 +/* 98971C 80240BBC 00000000 */ nop +.L80240BC0: +/* 989720 80240BC0 10620019 */ beq $v1, $v0, .L80240C28 +/* 989724 80240BC4 00000000 */ nop +/* 989728 80240BC8 08090312 */ j .L80240C48 +/* 98972C 80240BCC 00000000 */ nop +.L80240BD0: +/* 989730 80240BD0 8E220074 */ lw $v0, 0x74($s1) +/* 989734 80240BD4 14450004 */ bne $v0, $a1, .L80240BE8 +/* 989738 80240BD8 00000000 */ nop +/* 98973C 80240BDC AE240070 */ sw $a0, 0x70($s1) +/* 989740 80240BE0 AE200078 */ sw $zero, 0x78($s1) +/* 989744 80240BE4 8E220074 */ lw $v0, 0x74($s1) +.L80240BE8: +/* 989748 80240BE8 8E230084 */ lw $v1, 0x84($s1) +/* 98974C 80240BEC 00431021 */ addu $v0, $v0, $v1 +/* 989750 80240BF0 AE220074 */ sw $v0, 0x74($s1) +/* 989754 80240BF4 28420100 */ slti $v0, $v0, 0x100 +/* 989758 80240BF8 50400013 */ beql $v0, $zero, .L80240C48 +/* 98975C 80240BFC AE250074 */ sw $a1, 0x74($s1) +/* 989760 80240C00 08090312 */ j .L80240C48 +/* 989764 80240C04 00000000 */ nop +.L80240C08: +/* 989768 80240C08 8E220078 */ lw $v0, 0x78($s1) +/* 98976C 80240C0C 24420001 */ addiu $v0, $v0, 1 +/* 989770 80240C10 AE220078 */ sw $v0, 0x78($s1) +/* 989774 80240C14 28420002 */ slti $v0, $v0, 2 +/* 989778 80240C18 1440000B */ bnez $v0, .L80240C48 +/* 98977C 80240C1C 24020002 */ addiu $v0, $zero, 2 +/* 989780 80240C20 08090312 */ j .L80240C48 +/* 989784 80240C24 AE220070 */ sw $v0, 0x70($s1) +.L80240C28: +/* 989788 80240C28 8E230074 */ lw $v1, 0x74($s1) +/* 98978C 80240C2C 50600001 */ beql $v1, $zero, .L80240C34 +/* 989790 80240C30 24120001 */ addiu $s2, $zero, 1 +.L80240C34: +/* 989794 80240C34 8E220088 */ lw $v0, 0x88($s1) +/* 989798 80240C38 00621023 */ subu $v0, $v1, $v0 +/* 98979C 80240C3C 04410002 */ bgez $v0, .L80240C48 +/* 9897A0 80240C40 AE220074 */ sw $v0, 0x74($s1) +/* 9897A4 80240C44 AE200074 */ sw $zero, 0x74($s1) +.L80240C48: +/* 9897A8 80240C48 C6200074 */ lwc1 $f0, 0x74($s1) +/* 9897AC 80240C4C 46800020 */ cvt.s.w $f0, $f0 +/* 9897B0 80240C50 44050000 */ mfc1 $a1, $f0 +/* 9897B4 80240C54 0C04DF62 */ jal func_80137D88 +/* 9897B8 80240C58 24040001 */ addiu $a0, $zero, 1 +/* 9897BC 80240C5C 0240102D */ daddu $v0, $s2, $zero +/* 9897C0 80240C60 8FBF001C */ lw $ra, 0x1c($sp) +/* 9897C4 80240C64 8FB20018 */ lw $s2, 0x18($sp) +/* 9897C8 80240C68 8FB10014 */ lw $s1, 0x14($sp) +/* 9897CC 80240C6C 8FB00010 */ lw $s0, 0x10($sp) +/* 9897D0 80240C70 03E00008 */ jr $ra +/* 9897D4 80240C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78.s deleted file mode 100644 index 5296be57fd..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C78 -/* 9897D8 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9897DC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* 9897E0 80240C80 0C00EAD2 */ jal get_npc_safe -/* 9897E4 80240C84 2404FFFC */ addiu $a0, $zero, -4 -/* 9897E8 80240C88 3C0141F0 */ lui $at, 0x41f0 -/* 9897EC 80240C8C 44810000 */ mtc1 $at, $f0 -/* 9897F0 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9897F4 80240C94 46001080 */ add.s $f2, $f2, $f0 -/* 9897F8 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9897FC 80240C9C 8C450038 */ lw $a1, 0x38($v0) -/* 989800 80240CA0 8C470040 */ lw $a3, 0x40($v0) -/* 989804 80240CA4 44061000 */ mfc1 $a2, $f2 -/* 989808 80240CA8 0C01BFBC */ jal func_8006FEF0 -/* 98980C 80240CAC 24040002 */ addiu $a0, $zero, 2 -/* 989810 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) -/* 989814 80240CB4 24020002 */ addiu $v0, $zero, 2 -/* 989818 80240CB8 03E00008 */ jr $ra -/* 98981C 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78_9897D8.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78_9897D8.s new file mode 100644 index 0000000000..1bf4649df1 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240C78_9897D8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C78_9897D8 +/* 9897D8 80240C78 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9897DC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) +/* 9897E0 80240C80 0C00EAD2 */ jal get_npc_safe +/* 9897E4 80240C84 2404FFFC */ addiu $a0, $zero, -4 +/* 9897E8 80240C88 3C0141F0 */ lui $at, 0x41f0 +/* 9897EC 80240C8C 44810000 */ mtc1 $at, $f0 +/* 9897F0 80240C90 C442003C */ lwc1 $f2, 0x3c($v0) +/* 9897F4 80240C94 46001080 */ add.s $f2, $f2, $f0 +/* 9897F8 80240C98 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9897FC 80240C9C 8C450038 */ lw $a1, 0x38($v0) +/* 989800 80240CA0 8C470040 */ lw $a3, 0x40($v0) +/* 989804 80240CA4 44061000 */ mfc1 $a2, $f2 +/* 989808 80240CA8 0C01BFBC */ jal func_8006FEF0 +/* 98980C 80240CAC 24040002 */ addiu $a0, $zero, 2 +/* 989810 80240CB0 8FBF0018 */ lw $ra, 0x18($sp) +/* 989814 80240CB4 24020002 */ addiu $v0, $zero, 2 +/* 989818 80240CB8 03E00008 */ jr $ra +/* 98981C 80240CBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08.s deleted file mode 100644 index 5155693847..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D08 -/* 989868 80240D08 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 98986C 80240D0C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 989870 80240D10 AC800084 */ sw $zero, 0x84($a0) -/* 989874 80240D14 80620000 */ lb $v0, ($v1) -/* 989878 80240D18 10400005 */ beqz $v0, .L80240D30 -/* 98987C 80240D1C 24020003 */ addiu $v0, $zero, 3 -/* 989880 80240D20 80630003 */ lb $v1, 3($v1) -/* 989884 80240D24 14620002 */ bne $v1, $v0, .L80240D30 -/* 989888 80240D28 24020001 */ addiu $v0, $zero, 1 -/* 98988C 80240D2C AC820084 */ sw $v0, 0x84($a0) -.L80240D30: -/* 989890 80240D30 03E00008 */ jr $ra -/* 989894 80240D34 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08_989868.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08_989868.s new file mode 100644 index 0000000000..00767e028f --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D08_989868.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D08_989868 +/* 989868 80240D08 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* 98986C 80240D0C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 989870 80240D10 AC800084 */ sw $zero, 0x84($a0) +/* 989874 80240D14 80620000 */ lb $v0, ($v1) +/* 989878 80240D18 10400005 */ beqz $v0, .L80240D30 +/* 98987C 80240D1C 24020003 */ addiu $v0, $zero, 3 +/* 989880 80240D20 80630003 */ lb $v1, 3($v1) +/* 989884 80240D24 14620002 */ bne $v1, $v0, .L80240D30 +/* 989888 80240D28 24020001 */ addiu $v0, $zero, 1 +/* 98988C 80240D2C AC820084 */ sw $v0, 0x84($a0) +.L80240D30: +/* 989890 80240D30 03E00008 */ jr $ra +/* 989894 80240D34 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s index 59c9f0a907..73c52ce572 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240BF0_9903D0.s @@ -95,17 +95,17 @@ glabel func_80240BF0_9903D0 /* 990530 80240D50 00000000 */ nop /* 990534 80240D54 0260202D */ daddu $a0, $s3, $zero /* 990538 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 99053C 80240D5C 0C090000 */ jal func_80240000 +/* 99053C 80240D5C 0C090000 */ jal func_80240000_98F7E0 /* 990540 80240D60 0200302D */ daddu $a2, $s0, $zero /* 990544 80240D64 0260202D */ daddu $a0, $s3, $zero /* 990548 80240D68 0280282D */ daddu $a1, $s4, $zero -/* 99054C 80240D6C 0C09008C */ jal func_80240230 +/* 99054C 80240D6C 0C09008C */ jal func_80240230_98FA10 /* 990550 80240D70 0200302D */ daddu $a2, $s0, $zero /* 990554 80240D74 0809037C */ j .L80240DF0 /* 990558 80240D78 0000102D */ daddu $v0, $zero, $zero /* 99055C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 990560 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 990564 80240D84 0C09015A */ jal func_80240568 +/* 990564 80240D84 0C09015A */ jal func_80240568_98FD48 /* 990568 80240D88 0200302D */ daddu $a2, $s0, $zero /* 99056C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 990570 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80240BF0_9903D0 /* 990578 80240D98 0000102D */ daddu $v0, $zero, $zero /* 99057C 80240D9C 0260202D */ daddu $a0, $s3, $zero /* 990580 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 990584 80240DA4 0C09018A */ jal func_80240628 +/* 990584 80240DA4 0C09018A */ jal func_80240628_98FE08 /* 990588 80240DA8 0200302D */ daddu $a2, $s0, $zero /* 99058C 80240DAC 0809037C */ j .L80240DF0 /* 990590 80240DB0 0000102D */ daddu $v0, $zero, $zero /* 990594 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 990598 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 99059C 80240DBC 0C0901F3 */ jal func_802407CC +/* 99059C 80240DBC 0C0901F3 */ jal func_802407CC_98FFAC /* 9905A0 80240DC0 0200302D */ daddu $a2, $s0, $zero /* 9905A4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* 9905A8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 9905AC 80240DCC 0C09022B */ jal func_802408AC +/* 9905AC 80240DCC 0C09022B */ jal func_802408AC_99008C /* 9905B0 80240DD0 0200302D */ daddu $a2, $s0, $zero /* 9905B4 80240DD4 0809037C */ j .L80240DF0 /* 9905B8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 9905BC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9905C0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9905C4 80240DE4 0C0902EB */ jal func_80240BAC +/* 9905C4 80240DE4 0C0902EB */ jal func_80240BAC_99038C /* 9905C8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 9905CC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s index 30b5bf95b1..87429e7be5 100644 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80240F3C_99071C.s @@ -76,37 +76,37 @@ glabel func_80240F3C_99071C /* 990834 80241054 00000000 */ nop /* 990838 80241058 0280202D */ daddu $a0, $s4, $zero /* 99083C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* 990840 80241060 0C090385 */ jal func_80240E14 +/* 990840 80241060 0C090385 */ jal func_80240E14_9905F4 /* 990844 80241064 0260302D */ daddu $a2, $s3, $zero /* 990848 80241068 0280202D */ daddu $a0, $s4, $zero /* 99084C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* 990850 80241070 0C09008C */ jal func_80240230 +/* 990850 80241070 0C09008C */ jal func_80240230_98FA10 /* 990854 80241074 0260302D */ daddu $a2, $s3, $zero /* 990858 80241078 08090438 */ j .L802410E0 /* 99085C 8024107C 00000000 */ nop /* 990860 80241080 0280202D */ daddu $a0, $s4, $zero /* 990864 80241084 0200282D */ daddu $a1, $s0, $zero -/* 990868 80241088 0C09015A */ jal func_80240568 +/* 990868 80241088 0C09015A */ jal func_80240568_98FD48 /* 99086C 8024108C 0260302D */ daddu $a2, $s3, $zero /* 990870 80241090 0280202D */ daddu $a0, $s4, $zero /* 990874 80241094 0200282D */ daddu $a1, $s0, $zero -/* 990878 80241098 0C09018A */ jal func_80240628 +/* 990878 80241098 0C09018A */ jal func_80240628_98FE08 /* 99087C 8024109C 0260302D */ daddu $a2, $s3, $zero /* 990880 802410A0 08090438 */ j .L802410E0 /* 990884 802410A4 00000000 */ nop /* 990888 802410A8 0280202D */ daddu $a0, $s4, $zero /* 99088C 802410AC 0200282D */ daddu $a1, $s0, $zero -/* 990890 802410B0 0C0903AA */ jal func_80240EA8 +/* 990890 802410B0 0C0903AA */ jal func_80240EA8_990688 /* 990894 802410B4 0260302D */ daddu $a2, $s3, $zero /* 990898 802410B8 0280202D */ daddu $a0, $s4, $zero /* 99089C 802410BC 0200282D */ daddu $a1, $s0, $zero -/* 9908A0 802410C0 0C09022B */ jal func_802408AC +/* 9908A0 802410C0 0C09022B */ jal func_802408AC_99008C /* 9908A4 802410C4 0260302D */ daddu $a2, $s3, $zero /* 9908A8 802410C8 08090438 */ j .L802410E0 /* 9908AC 802410CC 00000000 */ nop /* 9908B0 802410D0 0280202D */ daddu $a0, $s4, $zero /* 9908B4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 9908B8 802410D8 0C0902EB */ jal func_80240BAC +/* 9908B8 802410D8 0C0902EB */ jal func_80240BAC_99038C /* 9908BC 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 9908C0 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8.s deleted file mode 100644 index 62ef32f032..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BA8 -/* 991388 80241BA8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 99138C 80241BAC AFB20028 */ sw $s2, 0x28($sp) -/* 991390 80241BB0 0080902D */ daddu $s2, $a0, $zero -/* 991394 80241BB4 AFBF002C */ sw $ra, 0x2c($sp) -/* 991398 80241BB8 AFB10024 */ sw $s1, 0x24($sp) -/* 99139C 80241BBC AFB00020 */ sw $s0, 0x20($sp) -/* 9913A0 80241BC0 8E420148 */ lw $v0, 0x148($s2) -/* 9913A4 80241BC4 0C00EABB */ jal get_npc_unsafe -/* 9913A8 80241BC8 84440008 */ lh $a0, 8($v0) -/* 9913AC 80241BCC 24040054 */ addiu $a0, $zero, 0x54 -/* 9913B0 80241BD0 0C00AB39 */ jal heap_malloc -/* 9913B4 80241BD4 0040882D */ daddu $s1, $v0, $zero -/* 9913B8 80241BD8 27A40010 */ addiu $a0, $sp, 0x10 -/* 9913BC 80241BDC 0040802D */ daddu $s0, $v0, $zero -/* 9913C0 80241BE0 24020035 */ addiu $v0, $zero, 0x35 -/* 9913C4 80241BE4 AE02000C */ sw $v0, 0xc($s0) -/* 9913C8 80241BE8 0040282D */ daddu $a1, $v0, $zero -/* 9913CC 80241BEC 0000302D */ daddu $a2, $zero, $zero -/* 9913D0 80241BF0 AE000000 */ sw $zero, ($s0) -/* 9913D4 80241BF4 0C0B7A76 */ jal func_802DE9D8 -/* 9913D8 80241BF8 AE000010 */ sw $zero, 0x10($s0) -/* 9913DC 80241BFC C7A00018 */ lwc1 $f0, 0x18($sp) -/* 9913E0 80241C00 46800020 */ cvt.s.w $f0, $f0 -/* 9913E4 80241C04 E600004C */ swc1 $f0, 0x4c($s0) -/* 9913E8 80241C08 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9913EC 80241C0C 46800020 */ cvt.s.w $f0, $f0 -/* 9913F0 80241C10 E6000050 */ swc1 $f0, 0x50($s0) -/* 9913F4 80241C14 46000086 */ mov.s $f2, $f0 -/* 9913F8 80241C18 3C018024 */ lui $at, 0x8024 -/* 9913FC 80241C1C D4202F38 */ ldc1 $f0, 0x2f38($at) -/* 991400 80241C20 460010A1 */ cvt.d.s $f2, $f2 -/* 991404 80241C24 46201082 */ mul.d $f2, $f2, $f0 -/* 991408 80241C28 00000000 */ nop -/* 99140C 80241C2C 3C013FE0 */ lui $at, 0x3fe0 -/* 991410 80241C30 44810800 */ mtc1 $at, $f1 -/* 991414 80241C34 44800000 */ mtc1 $zero, $f0 -/* 991418 80241C38 00000000 */ nop -/* 99141C 80241C3C 46201082 */ mul.d $f2, $f2, $f0 -/* 991420 80241C40 00000000 */ nop -/* 991424 80241C44 3C014270 */ lui $at, 0x4270 -/* 991428 80241C48 44813000 */ mtc1 $at, $f6 -/* 99142C 80241C4C C6200038 */ lwc1 $f0, 0x38($s1) -/* 991430 80241C50 0000202D */ daddu $a0, $zero, $zero -/* 991434 80241C54 E6000014 */ swc1 $f0, 0x14($s0) -/* 991438 80241C58 C620003C */ lwc1 $f0, 0x3c($s1) -/* 99143C 80241C5C 3C01437F */ lui $at, 0x437f -/* 991440 80241C60 44812000 */ mtc1 $at, $f4 -/* 991444 80241C64 46000021 */ cvt.d.s $f0, $f0 -/* 991448 80241C68 46220000 */ add.d $f0, $f0, $f2 -/* 99144C 80241C6C 3C014300 */ lui $at, 0x4300 -/* 991450 80241C70 44814000 */ mtc1 $at, $f8 -/* 991454 80241C74 3C0142B4 */ lui $at, 0x42b4 -/* 991458 80241C78 44811000 */ mtc1 $at, $f2 -/* 99145C 80241C7C 46200020 */ cvt.s.d $f0, $f0 -/* 991460 80241C80 E6000018 */ swc1 $f0, 0x18($s0) -/* 991464 80241C84 C62A0040 */ lwc1 $f10, 0x40($s1) -/* 991468 80241C88 3C013F36 */ lui $at, 0x3f36 -/* 99146C 80241C8C 3421DB6E */ ori $at, $at, 0xdb6e -/* 991470 80241C90 44810000 */ mtc1 $at, $f0 -/* 991474 80241C94 3C058024 */ lui $a1, 0x8024 -/* 991478 80241C98 24A51610 */ addiu $a1, $a1, 0x1610 -/* 99147C 80241C9C AE000020 */ sw $zero, 0x20($s0) -/* 991480 80241CA0 AE000024 */ sw $zero, 0x24($s0) -/* 991484 80241CA4 E6020028 */ swc1 $f2, 0x28($s0) -/* 991488 80241CA8 E6060038 */ swc1 $f6, 0x38($s0) -/* 99148C 80241CAC E604003C */ swc1 $f4, 0x3c($s0) -/* 991490 80241CB0 E6080040 */ swc1 $f8, 0x40($s0) -/* 991494 80241CB4 E6040044 */ swc1 $f4, 0x44($s0) -/* 991498 80241CB8 AE000048 */ sw $zero, 0x48($s0) -/* 99149C 80241CBC AE000004 */ sw $zero, 4($s0) -/* 9914A0 80241CC0 E600002C */ swc1 $f0, 0x2c($s0) -/* 9914A4 80241CC4 E6000030 */ swc1 $f0, 0x30($s0) -/* 9914A8 80241CC8 E6000034 */ swc1 $f0, 0x34($s0) -/* 9914AC 80241CCC 0C048C8F */ jal bind_dynamic_entity_7 -/* 9914B0 80241CD0 E60A001C */ swc1 $f10, 0x1c($s0) -/* 9914B4 80241CD4 0240202D */ daddu $a0, $s2, $zero -/* 9914B8 80241CD8 3C05FD05 */ lui $a1, 0xfd05 -/* 9914BC 80241CDC 34A50F8A */ ori $a1, $a1, 0xf8a -/* 9914C0 80241CE0 0200302D */ daddu $a2, $s0, $zero -/* 9914C4 80241CE4 0C0B2026 */ jal set_variable -/* 9914C8 80241CE8 ACC20008 */ sw $v0, 8($a2) -/* 9914CC 80241CEC 8FBF002C */ lw $ra, 0x2c($sp) -/* 9914D0 80241CF0 8FB20028 */ lw $s2, 0x28($sp) -/* 9914D4 80241CF4 8FB10024 */ lw $s1, 0x24($sp) -/* 9914D8 80241CF8 8FB00020 */ lw $s0, 0x20($sp) -/* 9914DC 80241CFC 24020002 */ addiu $v0, $zero, 2 -/* 9914E0 80241D00 03E00008 */ jr $ra -/* 9914E4 80241D04 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s new file mode 100644 index 0000000000..3bfd31b324 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241BA8_991388.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BA8_991388 +/* 991388 80241BA8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 99138C 80241BAC AFB20028 */ sw $s2, 0x28($sp) +/* 991390 80241BB0 0080902D */ daddu $s2, $a0, $zero +/* 991394 80241BB4 AFBF002C */ sw $ra, 0x2c($sp) +/* 991398 80241BB8 AFB10024 */ sw $s1, 0x24($sp) +/* 99139C 80241BBC AFB00020 */ sw $s0, 0x20($sp) +/* 9913A0 80241BC0 8E420148 */ lw $v0, 0x148($s2) +/* 9913A4 80241BC4 0C00EABB */ jal get_npc_unsafe +/* 9913A8 80241BC8 84440008 */ lh $a0, 8($v0) +/* 9913AC 80241BCC 24040054 */ addiu $a0, $zero, 0x54 +/* 9913B0 80241BD0 0C00AB39 */ jal heap_malloc +/* 9913B4 80241BD4 0040882D */ daddu $s1, $v0, $zero +/* 9913B8 80241BD8 27A40010 */ addiu $a0, $sp, 0x10 +/* 9913BC 80241BDC 0040802D */ daddu $s0, $v0, $zero +/* 9913C0 80241BE0 24020035 */ addiu $v0, $zero, 0x35 +/* 9913C4 80241BE4 AE02000C */ sw $v0, 0xc($s0) +/* 9913C8 80241BE8 0040282D */ daddu $a1, $v0, $zero +/* 9913CC 80241BEC 0000302D */ daddu $a2, $zero, $zero +/* 9913D0 80241BF0 AE000000 */ sw $zero, ($s0) +/* 9913D4 80241BF4 0C0B7A76 */ jal func_802DE9D8 +/* 9913D8 80241BF8 AE000010 */ sw $zero, 0x10($s0) +/* 9913DC 80241BFC C7A00018 */ lwc1 $f0, 0x18($sp) +/* 9913E0 80241C00 46800020 */ cvt.s.w $f0, $f0 +/* 9913E4 80241C04 E600004C */ swc1 $f0, 0x4c($s0) +/* 9913E8 80241C08 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9913EC 80241C0C 46800020 */ cvt.s.w $f0, $f0 +/* 9913F0 80241C10 E6000050 */ swc1 $f0, 0x50($s0) +/* 9913F4 80241C14 46000086 */ mov.s $f2, $f0 +/* 9913F8 80241C18 3C018024 */ lui $at, 0x8024 +/* 9913FC 80241C1C D4202F38 */ ldc1 $f0, 0x2f38($at) +/* 991400 80241C20 460010A1 */ cvt.d.s $f2, $f2 +/* 991404 80241C24 46201082 */ mul.d $f2, $f2, $f0 +/* 991408 80241C28 00000000 */ nop +/* 99140C 80241C2C 3C013FE0 */ lui $at, 0x3fe0 +/* 991410 80241C30 44810800 */ mtc1 $at, $f1 +/* 991414 80241C34 44800000 */ mtc1 $zero, $f0 +/* 991418 80241C38 00000000 */ nop +/* 99141C 80241C3C 46201082 */ mul.d $f2, $f2, $f0 +/* 991420 80241C40 00000000 */ nop +/* 991424 80241C44 3C014270 */ lui $at, 0x4270 +/* 991428 80241C48 44813000 */ mtc1 $at, $f6 +/* 99142C 80241C4C C6200038 */ lwc1 $f0, 0x38($s1) +/* 991430 80241C50 0000202D */ daddu $a0, $zero, $zero +/* 991434 80241C54 E6000014 */ swc1 $f0, 0x14($s0) +/* 991438 80241C58 C620003C */ lwc1 $f0, 0x3c($s1) +/* 99143C 80241C5C 3C01437F */ lui $at, 0x437f +/* 991440 80241C60 44812000 */ mtc1 $at, $f4 +/* 991444 80241C64 46000021 */ cvt.d.s $f0, $f0 +/* 991448 80241C68 46220000 */ add.d $f0, $f0, $f2 +/* 99144C 80241C6C 3C014300 */ lui $at, 0x4300 +/* 991450 80241C70 44814000 */ mtc1 $at, $f8 +/* 991454 80241C74 3C0142B4 */ lui $at, 0x42b4 +/* 991458 80241C78 44811000 */ mtc1 $at, $f2 +/* 99145C 80241C7C 46200020 */ cvt.s.d $f0, $f0 +/* 991460 80241C80 E6000018 */ swc1 $f0, 0x18($s0) +/* 991464 80241C84 C62A0040 */ lwc1 $f10, 0x40($s1) +/* 991468 80241C88 3C013F36 */ lui $at, 0x3f36 +/* 99146C 80241C8C 3421DB6E */ ori $at, $at, 0xdb6e +/* 991470 80241C90 44810000 */ mtc1 $at, $f0 +/* 991474 80241C94 3C058024 */ lui $a1, 0x8024 +/* 991478 80241C98 24A51610 */ addiu $a1, $a1, 0x1610 +/* 99147C 80241C9C AE000020 */ sw $zero, 0x20($s0) +/* 991480 80241CA0 AE000024 */ sw $zero, 0x24($s0) +/* 991484 80241CA4 E6020028 */ swc1 $f2, 0x28($s0) +/* 991488 80241CA8 E6060038 */ swc1 $f6, 0x38($s0) +/* 99148C 80241CAC E604003C */ swc1 $f4, 0x3c($s0) +/* 991490 80241CB0 E6080040 */ swc1 $f8, 0x40($s0) +/* 991494 80241CB4 E6040044 */ swc1 $f4, 0x44($s0) +/* 991498 80241CB8 AE000048 */ sw $zero, 0x48($s0) +/* 99149C 80241CBC AE000004 */ sw $zero, 4($s0) +/* 9914A0 80241CC0 E600002C */ swc1 $f0, 0x2c($s0) +/* 9914A4 80241CC4 E6000030 */ swc1 $f0, 0x30($s0) +/* 9914A8 80241CC8 E6000034 */ swc1 $f0, 0x34($s0) +/* 9914AC 80241CCC 0C048C8F */ jal bind_dynamic_entity_7 +/* 9914B0 80241CD0 E60A001C */ swc1 $f10, 0x1c($s0) +/* 9914B4 80241CD4 0240202D */ daddu $a0, $s2, $zero +/* 9914B8 80241CD8 3C05FD05 */ lui $a1, 0xfd05 +/* 9914BC 80241CDC 34A50F8A */ ori $a1, $a1, 0xf8a +/* 9914C0 80241CE0 0200302D */ daddu $a2, $s0, $zero +/* 9914C4 80241CE4 0C0B2026 */ jal set_variable +/* 9914C8 80241CE8 ACC20008 */ sw $v0, 8($a2) +/* 9914CC 80241CEC 8FBF002C */ lw $ra, 0x2c($sp) +/* 9914D0 80241CF0 8FB20028 */ lw $s2, 0x28($sp) +/* 9914D4 80241CF4 8FB10024 */ lw $s1, 0x24($sp) +/* 9914D8 80241CF8 8FB00020 */ lw $s0, 0x20($sp) +/* 9914DC 80241CFC 24020002 */ addiu $v0, $zero, 2 +/* 9914E0 80241D00 03E00008 */ jr $ra +/* 9914E4 80241D04 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08.s deleted file mode 100644 index e7cdd186dd..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D08 -/* 9914E8 80241D08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9914EC 80241D0C 3C05FD05 */ lui $a1, 0xfd05 -/* 9914F0 80241D10 AFBF0010 */ sw $ra, 0x10($sp) -/* 9914F4 80241D14 0C0B1EAF */ jal get_variable -/* 9914F8 80241D18 34A50F8A */ ori $a1, $a1, 0xf8a -/* 9914FC 80241D1C 8C440008 */ lw $a0, 8($v0) -/* 991500 80241D20 0C048D70 */ jal func_801235C0 -/* 991504 80241D24 00000000 */ nop -/* 991508 80241D28 8FBF0010 */ lw $ra, 0x10($sp) -/* 99150C 80241D2C 24020002 */ addiu $v0, $zero, 2 -/* 991510 80241D30 03E00008 */ jr $ra -/* 991514 80241D34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08_9914E8.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08_9914E8.s new file mode 100644 index 0000000000..26d6c89a2d --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241D08_9914E8.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D08_9914E8 +/* 9914E8 80241D08 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9914EC 80241D0C 3C05FD05 */ lui $a1, 0xfd05 +/* 9914F0 80241D10 AFBF0010 */ sw $ra, 0x10($sp) +/* 9914F4 80241D14 0C0B1EAF */ jal get_variable +/* 9914F8 80241D18 34A50F8A */ ori $a1, $a1, 0xf8a +/* 9914FC 80241D1C 8C440008 */ lw $a0, 8($v0) +/* 991500 80241D20 0C048D70 */ jal func_801235C0 +/* 991504 80241D24 00000000 */ nop +/* 991508 80241D28 8FBF0010 */ lw $ra, 0x10($sp) +/* 99150C 80241D2C 24020002 */ addiu $v0, $zero, 2 +/* 991510 80241D30 03E00008 */ jr $ra +/* 991514 80241D34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34.s deleted file mode 100644 index e643cd1686..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E34 -/* 991614 80241E34 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 991618 80241E38 AFB10014 */ sw $s1, 0x14($sp) -/* 99161C 80241E3C 0080882D */ daddu $s1, $a0, $zero -/* 991620 80241E40 AFBF0020 */ sw $ra, 0x20($sp) -/* 991624 80241E44 AFB3001C */ sw $s3, 0x1c($sp) -/* 991628 80241E48 AFB20018 */ sw $s2, 0x18($sp) -/* 99162C 80241E4C AFB00010 */ sw $s0, 0x10($sp) -/* 991630 80241E50 8E30000C */ lw $s0, 0xc($s1) -/* 991634 80241E54 8E050000 */ lw $a1, ($s0) -/* 991638 80241E58 0C0B210B */ jal get_float_variable -/* 99163C 80241E5C 26100004 */ addiu $s0, $s0, 4 -/* 991640 80241E60 8E050000 */ lw $a1, ($s0) -/* 991644 80241E64 26100004 */ addiu $s0, $s0, 4 -/* 991648 80241E68 4600008D */ trunc.w.s $f2, $f0 -/* 99164C 80241E6C 44131000 */ mfc1 $s3, $f2 -/* 991650 80241E70 0C0B210B */ jal get_float_variable -/* 991654 80241E74 0220202D */ daddu $a0, $s1, $zero -/* 991658 80241E78 8E050000 */ lw $a1, ($s0) -/* 99165C 80241E7C 4600008D */ trunc.w.s $f2, $f0 -/* 991660 80241E80 44121000 */ mfc1 $s2, $f2 -/* 991664 80241E84 0C0B210B */ jal get_float_variable -/* 991668 80241E88 0220202D */ daddu $a0, $s1, $zero -/* 99166C 80241E8C 0220202D */ daddu $a0, $s1, $zero -/* 991670 80241E90 3C05FD05 */ lui $a1, 0xfd05 -/* 991674 80241E94 4600008D */ trunc.w.s $f2, $f0 -/* 991678 80241E98 44101000 */ mfc1 $s0, $f2 -/* 99167C 80241E9C 0C0B1EAF */ jal get_variable -/* 991680 80241EA0 34A50F8A */ ori $a1, $a1, 0xf8a -/* 991684 80241EA4 0040182D */ daddu $v1, $v0, $zero -/* 991688 80241EA8 44930000 */ mtc1 $s3, $f0 -/* 99168C 80241EAC 00000000 */ nop -/* 991690 80241EB0 46800020 */ cvt.s.w $f0, $f0 -/* 991694 80241EB4 E4600020 */ swc1 $f0, 0x20($v1) -/* 991698 80241EB8 44920000 */ mtc1 $s2, $f0 -/* 99169C 80241EBC 00000000 */ nop -/* 9916A0 80241EC0 46800020 */ cvt.s.w $f0, $f0 -/* 9916A4 80241EC4 E4600024 */ swc1 $f0, 0x24($v1) -/* 9916A8 80241EC8 44900000 */ mtc1 $s0, $f0 -/* 9916AC 80241ECC 00000000 */ nop -/* 9916B0 80241ED0 46800020 */ cvt.s.w $f0, $f0 -/* 9916B4 80241ED4 E4600028 */ swc1 $f0, 0x28($v1) -/* 9916B8 80241ED8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9916BC 80241EDC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9916C0 80241EE0 8FB20018 */ lw $s2, 0x18($sp) -/* 9916C4 80241EE4 8FB10014 */ lw $s1, 0x14($sp) -/* 9916C8 80241EE8 8FB00010 */ lw $s0, 0x10($sp) -/* 9916CC 80241EEC 24020002 */ addiu $v0, $zero, 2 -/* 9916D0 80241EF0 03E00008 */ jr $ra -/* 9916D4 80241EF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s new file mode 100644 index 0000000000..44d4fe72e3 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241E34_991614.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E34_991614 +/* 991614 80241E34 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 991618 80241E38 AFB10014 */ sw $s1, 0x14($sp) +/* 99161C 80241E3C 0080882D */ daddu $s1, $a0, $zero +/* 991620 80241E40 AFBF0020 */ sw $ra, 0x20($sp) +/* 991624 80241E44 AFB3001C */ sw $s3, 0x1c($sp) +/* 991628 80241E48 AFB20018 */ sw $s2, 0x18($sp) +/* 99162C 80241E4C AFB00010 */ sw $s0, 0x10($sp) +/* 991630 80241E50 8E30000C */ lw $s0, 0xc($s1) +/* 991634 80241E54 8E050000 */ lw $a1, ($s0) +/* 991638 80241E58 0C0B210B */ jal get_float_variable +/* 99163C 80241E5C 26100004 */ addiu $s0, $s0, 4 +/* 991640 80241E60 8E050000 */ lw $a1, ($s0) +/* 991644 80241E64 26100004 */ addiu $s0, $s0, 4 +/* 991648 80241E68 4600008D */ trunc.w.s $f2, $f0 +/* 99164C 80241E6C 44131000 */ mfc1 $s3, $f2 +/* 991650 80241E70 0C0B210B */ jal get_float_variable +/* 991654 80241E74 0220202D */ daddu $a0, $s1, $zero +/* 991658 80241E78 8E050000 */ lw $a1, ($s0) +/* 99165C 80241E7C 4600008D */ trunc.w.s $f2, $f0 +/* 991660 80241E80 44121000 */ mfc1 $s2, $f2 +/* 991664 80241E84 0C0B210B */ jal get_float_variable +/* 991668 80241E88 0220202D */ daddu $a0, $s1, $zero +/* 99166C 80241E8C 0220202D */ daddu $a0, $s1, $zero +/* 991670 80241E90 3C05FD05 */ lui $a1, 0xfd05 +/* 991674 80241E94 4600008D */ trunc.w.s $f2, $f0 +/* 991678 80241E98 44101000 */ mfc1 $s0, $f2 +/* 99167C 80241E9C 0C0B1EAF */ jal get_variable +/* 991680 80241EA0 34A50F8A */ ori $a1, $a1, 0xf8a +/* 991684 80241EA4 0040182D */ daddu $v1, $v0, $zero +/* 991688 80241EA8 44930000 */ mtc1 $s3, $f0 +/* 99168C 80241EAC 00000000 */ nop +/* 991690 80241EB0 46800020 */ cvt.s.w $f0, $f0 +/* 991694 80241EB4 E4600020 */ swc1 $f0, 0x20($v1) +/* 991698 80241EB8 44920000 */ mtc1 $s2, $f0 +/* 99169C 80241EBC 00000000 */ nop +/* 9916A0 80241EC0 46800020 */ cvt.s.w $f0, $f0 +/* 9916A4 80241EC4 E4600024 */ swc1 $f0, 0x24($v1) +/* 9916A8 80241EC8 44900000 */ mtc1 $s0, $f0 +/* 9916AC 80241ECC 00000000 */ nop +/* 9916B0 80241ED0 46800020 */ cvt.s.w $f0, $f0 +/* 9916B4 80241ED4 E4600028 */ swc1 $f0, 0x28($v1) +/* 9916B8 80241ED8 8FBF0020 */ lw $ra, 0x20($sp) +/* 9916BC 80241EDC 8FB3001C */ lw $s3, 0x1c($sp) +/* 9916C0 80241EE0 8FB20018 */ lw $s2, 0x18($sp) +/* 9916C4 80241EE4 8FB10014 */ lw $s1, 0x14($sp) +/* 9916C8 80241EE8 8FB00010 */ lw $s0, 0x10($sp) +/* 9916CC 80241EEC 24020002 */ addiu $v0, $zero, 2 +/* 9916D0 80241EF0 03E00008 */ jr $ra +/* 9916D4 80241EF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8.s deleted file mode 100644 index 17ead8d71c..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EF8 -/* 9916D8 80241EF8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9916DC 80241EFC AFB10014 */ sw $s1, 0x14($sp) -/* 9916E0 80241F00 0080882D */ daddu $s1, $a0, $zero -/* 9916E4 80241F04 3C05FD05 */ lui $a1, 0xfd05 -/* 9916E8 80241F08 AFBF001C */ sw $ra, 0x1c($sp) -/* 9916EC 80241F0C AFB20018 */ sw $s2, 0x18($sp) -/* 9916F0 80241F10 AFB00010 */ sw $s0, 0x10($sp) -/* 9916F4 80241F14 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 9916F8 80241F18 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 9916FC 80241F1C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 991700 80241F20 8E30000C */ lw $s0, 0xc($s1) -/* 991704 80241F24 0C0B1EAF */ jal get_variable -/* 991708 80241F28 34A50F8A */ ori $a1, $a1, 0xf8a -/* 99170C 80241F2C 0220202D */ daddu $a0, $s1, $zero -/* 991710 80241F30 0040902D */ daddu $s2, $v0, $zero -/* 991714 80241F34 8E050000 */ lw $a1, ($s0) -/* 991718 80241F38 0C0B210B */ jal get_float_variable -/* 99171C 80241F3C 26100004 */ addiu $s0, $s0, 4 -/* 991720 80241F40 46000606 */ mov.s $f24, $f0 -/* 991724 80241F44 8E050000 */ lw $a1, ($s0) -/* 991728 80241F48 26100004 */ addiu $s0, $s0, 4 -/* 99172C 80241F4C 0C0B210B */ jal get_float_variable -/* 991730 80241F50 0220202D */ daddu $a0, $s1, $zero -/* 991734 80241F54 46000586 */ mov.s $f22, $f0 -/* 991738 80241F58 8E050000 */ lw $a1, ($s0) -/* 99173C 80241F5C 26100004 */ addiu $s0, $s0, 4 -/* 991740 80241F60 0C0B210B */ jal get_float_variable -/* 991744 80241F64 0220202D */ daddu $a0, $s1, $zero -/* 991748 80241F68 46000506 */ mov.s $f20, $f0 -/* 99174C 80241F6C 8E050000 */ lw $a1, ($s0) -/* 991750 80241F70 0C0B210B */ jal get_float_variable -/* 991754 80241F74 0220202D */ daddu $a0, $s1, $zero -/* 991758 80241F78 44801000 */ mtc1 $zero, $f2 -/* 99175C 80241F7C 00000000 */ nop -/* 991760 80241F80 4602C03C */ c.lt.s $f24, $f2 -/* 991764 80241F84 00000000 */ nop -/* 991768 80241F88 45030001 */ bc1tl .L80241F90 -/* 99176C 80241F8C 46001606 */ mov.s $f24, $f2 -.L80241F90: -/* 991770 80241F90 4602B03C */ c.lt.s $f22, $f2 -/* 991774 80241F94 00000000 */ nop -/* 991778 80241F98 45030001 */ bc1tl .L80241FA0 -/* 99177C 80241F9C 46001586 */ mov.s $f22, $f2 -.L80241FA0: -/* 991780 80241FA0 4602A03C */ c.lt.s $f20, $f2 -/* 991784 80241FA4 00000000 */ nop -/* 991788 80241FA8 45030001 */ bc1tl .L80241FB0 -/* 99178C 80241FAC 46001506 */ mov.s $f20, $f2 -.L80241FB0: -/* 991790 80241FB0 4602003C */ c.lt.s $f0, $f2 -/* 991794 80241FB4 00000000 */ nop -/* 991798 80241FB8 45030001 */ bc1tl .L80241FC0 -/* 99179C 80241FBC 46001006 */ mov.s $f0, $f2 -.L80241FC0: -/* 9917A0 80241FC0 3C01437F */ lui $at, 0x437f -/* 9917A4 80241FC4 44811000 */ mtc1 $at, $f2 -/* 9917A8 80241FC8 00000000 */ nop -/* 9917AC 80241FCC 4618103C */ c.lt.s $f2, $f24 -/* 9917B0 80241FD0 00000000 */ nop -/* 9917B4 80241FD4 45030001 */ bc1tl .L80241FDC -/* 9917B8 80241FD8 46001606 */ mov.s $f24, $f2 -.L80241FDC: -/* 9917BC 80241FDC 4616103C */ c.lt.s $f2, $f22 -/* 9917C0 80241FE0 00000000 */ nop -/* 9917C4 80241FE4 45030001 */ bc1tl .L80241FEC -/* 9917C8 80241FE8 46001586 */ mov.s $f22, $f2 -.L80241FEC: -/* 9917CC 80241FEC 4614103C */ c.lt.s $f2, $f20 -/* 9917D0 80241FF0 00000000 */ nop -/* 9917D4 80241FF4 45030001 */ bc1tl .L80241FFC -/* 9917D8 80241FF8 46001506 */ mov.s $f20, $f2 -.L80241FFC: -/* 9917DC 80241FFC 4600103C */ c.lt.s $f2, $f0 -/* 9917E0 80242000 00000000 */ nop -/* 9917E4 80242004 45030001 */ bc1tl .L8024200C -/* 9917E8 80242008 46001006 */ mov.s $f0, $f2 -.L8024200C: -/* 9917EC 8024200C E658003C */ swc1 $f24, 0x3c($s2) -/* 9917F0 80242010 E6560040 */ swc1 $f22, 0x40($s2) -/* 9917F4 80242014 E6540044 */ swc1 $f20, 0x44($s2) -/* 9917F8 80242018 E6400048 */ swc1 $f0, 0x48($s2) -/* 9917FC 8024201C 8FBF001C */ lw $ra, 0x1c($sp) -/* 991800 80242020 8FB20018 */ lw $s2, 0x18($sp) -/* 991804 80242024 8FB10014 */ lw $s1, 0x14($sp) -/* 991808 80242028 8FB00010 */ lw $s0, 0x10($sp) -/* 99180C 8024202C D7B80030 */ ldc1 $f24, 0x30($sp) -/* 991810 80242030 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 991814 80242034 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 991818 80242038 24020002 */ addiu $v0, $zero, 2 -/* 99181C 8024203C 03E00008 */ jr $ra -/* 991820 80242040 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s new file mode 100644 index 0000000000..bfe50941e0 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241EF8_9916D8.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241EF8_9916D8 +/* 9916D8 80241EF8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 9916DC 80241EFC AFB10014 */ sw $s1, 0x14($sp) +/* 9916E0 80241F00 0080882D */ daddu $s1, $a0, $zero +/* 9916E4 80241F04 3C05FD05 */ lui $a1, 0xfd05 +/* 9916E8 80241F08 AFBF001C */ sw $ra, 0x1c($sp) +/* 9916EC 80241F0C AFB20018 */ sw $s2, 0x18($sp) +/* 9916F0 80241F10 AFB00010 */ sw $s0, 0x10($sp) +/* 9916F4 80241F14 F7B80030 */ sdc1 $f24, 0x30($sp) +/* 9916F8 80241F18 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 9916FC 80241F1C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 991700 80241F20 8E30000C */ lw $s0, 0xc($s1) +/* 991704 80241F24 0C0B1EAF */ jal get_variable +/* 991708 80241F28 34A50F8A */ ori $a1, $a1, 0xf8a +/* 99170C 80241F2C 0220202D */ daddu $a0, $s1, $zero +/* 991710 80241F30 0040902D */ daddu $s2, $v0, $zero +/* 991714 80241F34 8E050000 */ lw $a1, ($s0) +/* 991718 80241F38 0C0B210B */ jal get_float_variable +/* 99171C 80241F3C 26100004 */ addiu $s0, $s0, 4 +/* 991720 80241F40 46000606 */ mov.s $f24, $f0 +/* 991724 80241F44 8E050000 */ lw $a1, ($s0) +/* 991728 80241F48 26100004 */ addiu $s0, $s0, 4 +/* 99172C 80241F4C 0C0B210B */ jal get_float_variable +/* 991730 80241F50 0220202D */ daddu $a0, $s1, $zero +/* 991734 80241F54 46000586 */ mov.s $f22, $f0 +/* 991738 80241F58 8E050000 */ lw $a1, ($s0) +/* 99173C 80241F5C 26100004 */ addiu $s0, $s0, 4 +/* 991740 80241F60 0C0B210B */ jal get_float_variable +/* 991744 80241F64 0220202D */ daddu $a0, $s1, $zero +/* 991748 80241F68 46000506 */ mov.s $f20, $f0 +/* 99174C 80241F6C 8E050000 */ lw $a1, ($s0) +/* 991750 80241F70 0C0B210B */ jal get_float_variable +/* 991754 80241F74 0220202D */ daddu $a0, $s1, $zero +/* 991758 80241F78 44801000 */ mtc1 $zero, $f2 +/* 99175C 80241F7C 00000000 */ nop +/* 991760 80241F80 4602C03C */ c.lt.s $f24, $f2 +/* 991764 80241F84 00000000 */ nop +/* 991768 80241F88 45030001 */ bc1tl .L80241F90 +/* 99176C 80241F8C 46001606 */ mov.s $f24, $f2 +.L80241F90: +/* 991770 80241F90 4602B03C */ c.lt.s $f22, $f2 +/* 991774 80241F94 00000000 */ nop +/* 991778 80241F98 45030001 */ bc1tl .L80241FA0 +/* 99177C 80241F9C 46001586 */ mov.s $f22, $f2 +.L80241FA0: +/* 991780 80241FA0 4602A03C */ c.lt.s $f20, $f2 +/* 991784 80241FA4 00000000 */ nop +/* 991788 80241FA8 45030001 */ bc1tl .L80241FB0 +/* 99178C 80241FAC 46001506 */ mov.s $f20, $f2 +.L80241FB0: +/* 991790 80241FB0 4602003C */ c.lt.s $f0, $f2 +/* 991794 80241FB4 00000000 */ nop +/* 991798 80241FB8 45030001 */ bc1tl .L80241FC0 +/* 99179C 80241FBC 46001006 */ mov.s $f0, $f2 +.L80241FC0: +/* 9917A0 80241FC0 3C01437F */ lui $at, 0x437f +/* 9917A4 80241FC4 44811000 */ mtc1 $at, $f2 +/* 9917A8 80241FC8 00000000 */ nop +/* 9917AC 80241FCC 4618103C */ c.lt.s $f2, $f24 +/* 9917B0 80241FD0 00000000 */ nop +/* 9917B4 80241FD4 45030001 */ bc1tl .L80241FDC +/* 9917B8 80241FD8 46001606 */ mov.s $f24, $f2 +.L80241FDC: +/* 9917BC 80241FDC 4616103C */ c.lt.s $f2, $f22 +/* 9917C0 80241FE0 00000000 */ nop +/* 9917C4 80241FE4 45030001 */ bc1tl .L80241FEC +/* 9917C8 80241FE8 46001586 */ mov.s $f22, $f2 +.L80241FEC: +/* 9917CC 80241FEC 4614103C */ c.lt.s $f2, $f20 +/* 9917D0 80241FF0 00000000 */ nop +/* 9917D4 80241FF4 45030001 */ bc1tl .L80241FFC +/* 9917D8 80241FF8 46001506 */ mov.s $f20, $f2 +.L80241FFC: +/* 9917DC 80241FFC 4600103C */ c.lt.s $f2, $f0 +/* 9917E0 80242000 00000000 */ nop +/* 9917E4 80242004 45030001 */ bc1tl .L8024200C +/* 9917E8 80242008 46001006 */ mov.s $f0, $f2 +.L8024200C: +/* 9917EC 8024200C E658003C */ swc1 $f24, 0x3c($s2) +/* 9917F0 80242010 E6560040 */ swc1 $f22, 0x40($s2) +/* 9917F4 80242014 E6540044 */ swc1 $f20, 0x44($s2) +/* 9917F8 80242018 E6400048 */ swc1 $f0, 0x48($s2) +/* 9917FC 8024201C 8FBF001C */ lw $ra, 0x1c($sp) +/* 991800 80242020 8FB20018 */ lw $s2, 0x18($sp) +/* 991804 80242024 8FB10014 */ lw $s1, 0x14($sp) +/* 991808 80242028 8FB00010 */ lw $s0, 0x10($sp) +/* 99180C 8024202C D7B80030 */ ldc1 $f24, 0x30($sp) +/* 991810 80242030 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 991814 80242034 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 991818 80242038 24020002 */ addiu $v0, $zero, 2 +/* 99181C 8024203C 03E00008 */ jr $ra +/* 991820 80242040 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s index 4978209cbd..fdb205c4ad 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240BF0_993320.s @@ -95,17 +95,17 @@ glabel func_80240BF0_993320 /* 993480 80240D50 00000000 */ nop /* 993484 80240D54 0260202D */ daddu $a0, $s3, $zero /* 993488 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 99348C 80240D5C 0C090000 */ jal func_80240000 +/* 99348C 80240D5C 0C090000 */ jal func_80240000_992730 /* 993490 80240D60 0200302D */ daddu $a2, $s0, $zero /* 993494 80240D64 0260202D */ daddu $a0, $s3, $zero /* 993498 80240D68 0280282D */ daddu $a1, $s4, $zero -/* 99349C 80240D6C 0C09008C */ jal func_80240230 +/* 99349C 80240D6C 0C09008C */ jal func_80240230_992960 /* 9934A0 80240D70 0200302D */ daddu $a2, $s0, $zero /* 9934A4 80240D74 0809037C */ j .L80240DF0 /* 9934A8 80240D78 0000102D */ daddu $v0, $zero, $zero /* 9934AC 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9934B0 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9934B4 80240D84 0C09015A */ jal func_80240568 +/* 9934B4 80240D84 0C09015A */ jal func_80240568_992C98 /* 9934B8 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9934BC 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9934C0 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80240BF0_993320 /* 9934C8 80240D98 0000102D */ daddu $v0, $zero, $zero /* 9934CC 80240D9C 0260202D */ daddu $a0, $s3, $zero /* 9934D0 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 9934D4 80240DA4 0C09018A */ jal func_80240628 +/* 9934D4 80240DA4 0C09018A */ jal func_80240628_992D58 /* 9934D8 80240DA8 0200302D */ daddu $a2, $s0, $zero /* 9934DC 80240DAC 0809037C */ j .L80240DF0 /* 9934E0 80240DB0 0000102D */ daddu $v0, $zero, $zero /* 9934E4 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 9934E8 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 9934EC 80240DBC 0C0901F3 */ jal func_802407CC +/* 9934EC 80240DBC 0C0901F3 */ jal func_802407CC_992EFC /* 9934F0 80240DC0 0200302D */ daddu $a2, $s0, $zero /* 9934F4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* 9934F8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 9934FC 80240DCC 0C09022B */ jal func_802408AC +/* 9934FC 80240DCC 0C09022B */ jal func_802408AC_992FDC /* 993500 80240DD0 0200302D */ daddu $a2, $s0, $zero /* 993504 80240DD4 0809037C */ j .L80240DF0 /* 993508 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 99350C 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 993510 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 993514 80240DE4 0C0902EB */ jal func_80240BAC +/* 993514 80240DE4 0C0902EB */ jal func_80240BAC_9932DC /* 993518 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 99351C 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s index b513410ca6..15ad834cfe 100644 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80240F3C_99366C.s @@ -76,37 +76,37 @@ glabel func_80240F3C_99366C /* 993784 80241054 00000000 */ nop /* 993788 80241058 0280202D */ daddu $a0, $s4, $zero /* 99378C 8024105C 0200282D */ daddu $a1, $s0, $zero -/* 993790 80241060 0C090385 */ jal func_80240E14 +/* 993790 80241060 0C090385 */ jal func_80240E14_993544 /* 993794 80241064 0260302D */ daddu $a2, $s3, $zero /* 993798 80241068 0280202D */ daddu $a0, $s4, $zero /* 99379C 8024106C 0200282D */ daddu $a1, $s0, $zero -/* 9937A0 80241070 0C09008C */ jal func_80240230 +/* 9937A0 80241070 0C09008C */ jal func_80240230_992960 /* 9937A4 80241074 0260302D */ daddu $a2, $s3, $zero /* 9937A8 80241078 08090438 */ j .L802410E0 /* 9937AC 8024107C 00000000 */ nop /* 9937B0 80241080 0280202D */ daddu $a0, $s4, $zero /* 9937B4 80241084 0200282D */ daddu $a1, $s0, $zero -/* 9937B8 80241088 0C09015A */ jal func_80240568 +/* 9937B8 80241088 0C09015A */ jal func_80240568_992C98 /* 9937BC 8024108C 0260302D */ daddu $a2, $s3, $zero /* 9937C0 80241090 0280202D */ daddu $a0, $s4, $zero /* 9937C4 80241094 0200282D */ daddu $a1, $s0, $zero -/* 9937C8 80241098 0C09018A */ jal func_80240628 +/* 9937C8 80241098 0C09018A */ jal func_80240628_992D58 /* 9937CC 8024109C 0260302D */ daddu $a2, $s3, $zero /* 9937D0 802410A0 08090438 */ j .L802410E0 /* 9937D4 802410A4 00000000 */ nop /* 9937D8 802410A8 0280202D */ daddu $a0, $s4, $zero /* 9937DC 802410AC 0200282D */ daddu $a1, $s0, $zero -/* 9937E0 802410B0 0C0903AA */ jal func_80240EA8 +/* 9937E0 802410B0 0C0903AA */ jal func_80240EA8_9935D8 /* 9937E4 802410B4 0260302D */ daddu $a2, $s3, $zero /* 9937E8 802410B8 0280202D */ daddu $a0, $s4, $zero /* 9937EC 802410BC 0200282D */ daddu $a1, $s0, $zero -/* 9937F0 802410C0 0C09022B */ jal func_802408AC +/* 9937F0 802410C0 0C09022B */ jal func_802408AC_992FDC /* 9937F4 802410C4 0260302D */ daddu $a2, $s3, $zero /* 9937F8 802410C8 08090438 */ j .L802410E0 /* 9937FC 802410CC 00000000 */ nop /* 993800 802410D0 0280202D */ daddu $a0, $s4, $zero /* 993804 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 993808 802410D8 0C0902EB */ jal func_80240BAC +/* 993808 802410D8 0C0902EB */ jal func_80240BAC_9932DC /* 99380C 802410DC 0260302D */ daddu $a2, $s3, $zero .L802410E0: /* 993810 802410E0 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0.s deleted file mode 100644 index 681727539f..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0.s +++ /dev/null @@ -1,57 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AF0 -/* 994220 80241AF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 994224 80241AF4 AFBF0028 */ sw $ra, 0x28($sp) -/* 994228 80241AF8 AFB10024 */ sw $s1, 0x24($sp) -/* 99422C 80241AFC AFB00020 */ sw $s0, 0x20($sp) -/* 994230 80241B00 8C820148 */ lw $v0, 0x148($a0) -/* 994234 80241B04 0C00EABB */ jal get_npc_unsafe -/* 994238 80241B08 84440008 */ lh $a0, 8($v0) -/* 99423C 80241B0C 27A40010 */ addiu $a0, $sp, 0x10 -/* 994240 80241B10 24050035 */ addiu $a1, $zero, 0x35 -/* 994244 80241B14 3C108024 */ lui $s0, 0x8024 -/* 994248 80241B18 26102AC0 */ addiu $s0, $s0, 0x2ac0 -/* 99424C 80241B1C 00A0182D */ daddu $v1, $a1, $zero -/* 994250 80241B20 0040882D */ daddu $s1, $v0, $zero -/* 994254 80241B24 0000302D */ daddu $a2, $zero, $zero -/* 994258 80241B28 AE030008 */ sw $v1, 8($s0) -/* 99425C 80241B2C 0C0B7A76 */ jal func_802DE9D8 -/* 994260 80241B30 AE00000C */ sw $zero, 0xc($s0) -/* 994264 80241B34 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 994268 80241B38 46800020 */ cvt.s.w $f0, $f0 -/* 99426C 80241B3C E6000038 */ swc1 $f0, 0x38($s0) -/* 994270 80241B40 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 994274 80241B44 46800020 */ cvt.s.w $f0, $f0 -/* 994278 80241B48 E600003C */ swc1 $f0, 0x3c($s0) -/* 99427C 80241B4C C6200038 */ lwc1 $f0, 0x38($s1) -/* 994280 80241B50 3C014387 */ lui $at, 0x4387 -/* 994284 80241B54 44811000 */ mtc1 $at, $f2 -/* 994288 80241B58 E6000010 */ swc1 $f0, 0x10($s0) -/* 99428C 80241B5C C620003C */ lwc1 $f0, 0x3c($s1) -/* 994290 80241B60 0000202D */ daddu $a0, $zero, $zero -/* 994294 80241B64 E6000014 */ swc1 $f0, 0x14($s0) -/* 994298 80241B68 C6240040 */ lwc1 $f4, 0x40($s1) -/* 99429C 80241B6C 3C013F36 */ lui $at, 0x3f36 -/* 9942A0 80241B70 3421DB6E */ ori $at, $at, 0xdb6e -/* 9942A4 80241B74 44810000 */ mtc1 $at, $f0 -/* 9942A8 80241B78 3C058024 */ lui $a1, 0x8024 -/* 9942AC 80241B7C 24A51610 */ addiu $a1, $a1, 0x1610 -/* 9942B0 80241B80 AE00001C */ sw $zero, 0x1c($s0) -/* 9942B4 80241B84 AE000020 */ sw $zero, 0x20($s0) -/* 9942B8 80241B88 AE000024 */ sw $zero, 0x24($s0) -/* 9942BC 80241B8C E6020034 */ swc1 $f2, 0x34($s0) -/* 9942C0 80241B90 AE000000 */ sw $zero, ($s0) -/* 9942C4 80241B94 E6000028 */ swc1 $f0, 0x28($s0) -/* 9942C8 80241B98 E600002C */ swc1 $f0, 0x2c($s0) -/* 9942CC 80241B9C E6000030 */ swc1 $f0, 0x30($s0) -/* 9942D0 80241BA0 0C048C8F */ jal bind_dynamic_entity_7 -/* 9942D4 80241BA4 E6040018 */ swc1 $f4, 0x18($s0) -/* 9942D8 80241BA8 AE020004 */ sw $v0, 4($s0) -/* 9942DC 80241BAC 8FBF0028 */ lw $ra, 0x28($sp) -/* 9942E0 80241BB0 8FB10024 */ lw $s1, 0x24($sp) -/* 9942E4 80241BB4 8FB00020 */ lw $s0, 0x20($sp) -/* 9942E8 80241BB8 24020002 */ addiu $v0, $zero, 2 -/* 9942EC 80241BBC 03E00008 */ jr $ra -/* 9942F0 80241BC0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s new file mode 100644 index 0000000000..f262abc8de --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241AF0_994220.s @@ -0,0 +1,57 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AF0_994220 +/* 994220 80241AF0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 994224 80241AF4 AFBF0028 */ sw $ra, 0x28($sp) +/* 994228 80241AF8 AFB10024 */ sw $s1, 0x24($sp) +/* 99422C 80241AFC AFB00020 */ sw $s0, 0x20($sp) +/* 994230 80241B00 8C820148 */ lw $v0, 0x148($a0) +/* 994234 80241B04 0C00EABB */ jal get_npc_unsafe +/* 994238 80241B08 84440008 */ lh $a0, 8($v0) +/* 99423C 80241B0C 27A40010 */ addiu $a0, $sp, 0x10 +/* 994240 80241B10 24050035 */ addiu $a1, $zero, 0x35 +/* 994244 80241B14 3C108024 */ lui $s0, 0x8024 +/* 994248 80241B18 26102AC0 */ addiu $s0, $s0, 0x2ac0 +/* 99424C 80241B1C 00A0182D */ daddu $v1, $a1, $zero +/* 994250 80241B20 0040882D */ daddu $s1, $v0, $zero +/* 994254 80241B24 0000302D */ daddu $a2, $zero, $zero +/* 994258 80241B28 AE030008 */ sw $v1, 8($s0) +/* 99425C 80241B2C 0C0B7A76 */ jal func_802DE9D8 +/* 994260 80241B30 AE00000C */ sw $zero, 0xc($s0) +/* 994264 80241B34 C7A00018 */ lwc1 $f0, 0x18($sp) +/* 994268 80241B38 46800020 */ cvt.s.w $f0, $f0 +/* 99426C 80241B3C E6000038 */ swc1 $f0, 0x38($s0) +/* 994270 80241B40 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 994274 80241B44 46800020 */ cvt.s.w $f0, $f0 +/* 994278 80241B48 E600003C */ swc1 $f0, 0x3c($s0) +/* 99427C 80241B4C C6200038 */ lwc1 $f0, 0x38($s1) +/* 994280 80241B50 3C014387 */ lui $at, 0x4387 +/* 994284 80241B54 44811000 */ mtc1 $at, $f2 +/* 994288 80241B58 E6000010 */ swc1 $f0, 0x10($s0) +/* 99428C 80241B5C C620003C */ lwc1 $f0, 0x3c($s1) +/* 994290 80241B60 0000202D */ daddu $a0, $zero, $zero +/* 994294 80241B64 E6000014 */ swc1 $f0, 0x14($s0) +/* 994298 80241B68 C6240040 */ lwc1 $f4, 0x40($s1) +/* 99429C 80241B6C 3C013F36 */ lui $at, 0x3f36 +/* 9942A0 80241B70 3421DB6E */ ori $at, $at, 0xdb6e +/* 9942A4 80241B74 44810000 */ mtc1 $at, $f0 +/* 9942A8 80241B78 3C058024 */ lui $a1, 0x8024 +/* 9942AC 80241B7C 24A51610 */ addiu $a1, $a1, 0x1610 +/* 9942B0 80241B80 AE00001C */ sw $zero, 0x1c($s0) +/* 9942B4 80241B84 AE000020 */ sw $zero, 0x20($s0) +/* 9942B8 80241B88 AE000024 */ sw $zero, 0x24($s0) +/* 9942BC 80241B8C E6020034 */ swc1 $f2, 0x34($s0) +/* 9942C0 80241B90 AE000000 */ sw $zero, ($s0) +/* 9942C4 80241B94 E6000028 */ swc1 $f0, 0x28($s0) +/* 9942C8 80241B98 E600002C */ swc1 $f0, 0x2c($s0) +/* 9942CC 80241B9C E6000030 */ swc1 $f0, 0x30($s0) +/* 9942D0 80241BA0 0C048C8F */ jal bind_dynamic_entity_7 +/* 9942D4 80241BA4 E6040018 */ swc1 $f4, 0x18($s0) +/* 9942D8 80241BA8 AE020004 */ sw $v0, 4($s0) +/* 9942DC 80241BAC 8FBF0028 */ lw $ra, 0x28($sp) +/* 9942E0 80241BB0 8FB10024 */ lw $s1, 0x24($sp) +/* 9942E4 80241BB4 8FB00020 */ lw $s0, 0x20($sp) +/* 9942E8 80241BB8 24020002 */ addiu $v0, $zero, 2 +/* 9942EC 80241BBC 03E00008 */ jr $ra +/* 9942F0 80241BC0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4.s deleted file mode 100644 index 86e2e9ab12..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BC4 -/* 9942F4 80241BC4 3C048024 */ lui $a0, 0x8024 -/* 9942F8 80241BC8 8C842AC4 */ lw $a0, 0x2ac4($a0) -/* 9942FC 80241BCC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 994300 80241BD0 AFBF0010 */ sw $ra, 0x10($sp) -/* 994304 80241BD4 0C048D70 */ jal func_801235C0 -/* 994308 80241BD8 00000000 */ nop -/* 99430C 80241BDC 8FBF0010 */ lw $ra, 0x10($sp) -/* 994310 80241BE0 24020002 */ addiu $v0, $zero, 2 -/* 994314 80241BE4 03E00008 */ jr $ra -/* 994318 80241BE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s new file mode 100644 index 0000000000..e4357ec2ea --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241BC4_9942F4.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BC4_9942F4 +/* 9942F4 80241BC4 3C048024 */ lui $a0, 0x8024 +/* 9942F8 80241BC8 8C842AC4 */ lw $a0, 0x2ac4($a0) +/* 9942FC 80241BCC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 994300 80241BD0 AFBF0010 */ sw $ra, 0x10($sp) +/* 994304 80241BD4 0C048D70 */ jal func_801235C0 +/* 994308 80241BD8 00000000 */ nop +/* 99430C 80241BDC 8FBF0010 */ lw $ra, 0x10($sp) +/* 994310 80241BE0 24020002 */ addiu $v0, $zero, 2 +/* 994314 80241BE4 03E00008 */ jr $ra +/* 994318 80241BE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0.s deleted file mode 100644 index 4367cb41b6..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CA0 -/* 9943D0 80241CA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9943D4 80241CA4 AFB10014 */ sw $s1, 0x14($sp) -/* 9943D8 80241CA8 0080882D */ daddu $s1, $a0, $zero -/* 9943DC 80241CAC AFBF001C */ sw $ra, 0x1c($sp) -/* 9943E0 80241CB0 AFB20018 */ sw $s2, 0x18($sp) -/* 9943E4 80241CB4 AFB00010 */ sw $s0, 0x10($sp) -/* 9943E8 80241CB8 8E30000C */ lw $s0, 0xc($s1) -/* 9943EC 80241CBC 8E050000 */ lw $a1, ($s0) -/* 9943F0 80241CC0 0C0B210B */ jal get_float_variable -/* 9943F4 80241CC4 26100004 */ addiu $s0, $s0, 4 -/* 9943F8 80241CC8 8E050000 */ lw $a1, ($s0) -/* 9943FC 80241CCC 26100004 */ addiu $s0, $s0, 4 -/* 994400 80241CD0 4600010D */ trunc.w.s $f4, $f0 -/* 994404 80241CD4 44122000 */ mfc1 $s2, $f4 -/* 994408 80241CD8 0C0B210B */ jal get_float_variable -/* 99440C 80241CDC 0220202D */ daddu $a0, $s1, $zero -/* 994410 80241CE0 8E050000 */ lw $a1, ($s0) -/* 994414 80241CE4 4600010D */ trunc.w.s $f4, $f0 -/* 994418 80241CE8 44102000 */ mfc1 $s0, $f4 -/* 99441C 80241CEC 0C0B210B */ jal get_float_variable -/* 994420 80241CF0 0220202D */ daddu $a0, $s1, $zero -/* 994424 80241CF4 3C038024 */ lui $v1, 0x8024 -/* 994428 80241CF8 24632AC0 */ addiu $v1, $v1, 0x2ac0 -/* 99442C 80241CFC 44921000 */ mtc1 $s2, $f2 -/* 994430 80241D00 00000000 */ nop -/* 994434 80241D04 468010A0 */ cvt.s.w $f2, $f2 -/* 994438 80241D08 E462001C */ swc1 $f2, 0x1c($v1) -/* 99443C 80241D0C 44901000 */ mtc1 $s0, $f2 -/* 994440 80241D10 00000000 */ nop -/* 994444 80241D14 468010A0 */ cvt.s.w $f2, $f2 -/* 994448 80241D18 4600010D */ trunc.w.s $f4, $f0 -/* 99444C 80241D1C 44022000 */ mfc1 $v0, $f4 -/* 994450 80241D20 00000000 */ nop -/* 994454 80241D24 44820000 */ mtc1 $v0, $f0 -/* 994458 80241D28 00000000 */ nop -/* 99445C 80241D2C 46800020 */ cvt.s.w $f0, $f0 -/* 994460 80241D30 E4620020 */ swc1 $f2, 0x20($v1) -/* 994464 80241D34 E4600024 */ swc1 $f0, 0x24($v1) -/* 994468 80241D38 8FBF001C */ lw $ra, 0x1c($sp) -/* 99446C 80241D3C 8FB20018 */ lw $s2, 0x18($sp) -/* 994470 80241D40 8FB10014 */ lw $s1, 0x14($sp) -/* 994474 80241D44 8FB00010 */ lw $s0, 0x10($sp) -/* 994478 80241D48 24020002 */ addiu $v0, $zero, 2 -/* 99447C 80241D4C 03E00008 */ jr $ra -/* 994480 80241D50 27BD0020 */ addiu $sp, $sp, 0x20 -/* 994484 80241D54 00000000 */ nop -/* 994488 80241D58 00000000 */ nop -/* 99448C 80241D5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s new file mode 100644 index 0000000000..112d07520c --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241CA0_9943D0.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CA0_9943D0 +/* 9943D0 80241CA0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9943D4 80241CA4 AFB10014 */ sw $s1, 0x14($sp) +/* 9943D8 80241CA8 0080882D */ daddu $s1, $a0, $zero +/* 9943DC 80241CAC AFBF001C */ sw $ra, 0x1c($sp) +/* 9943E0 80241CB0 AFB20018 */ sw $s2, 0x18($sp) +/* 9943E4 80241CB4 AFB00010 */ sw $s0, 0x10($sp) +/* 9943E8 80241CB8 8E30000C */ lw $s0, 0xc($s1) +/* 9943EC 80241CBC 8E050000 */ lw $a1, ($s0) +/* 9943F0 80241CC0 0C0B210B */ jal get_float_variable +/* 9943F4 80241CC4 26100004 */ addiu $s0, $s0, 4 +/* 9943F8 80241CC8 8E050000 */ lw $a1, ($s0) +/* 9943FC 80241CCC 26100004 */ addiu $s0, $s0, 4 +/* 994400 80241CD0 4600010D */ trunc.w.s $f4, $f0 +/* 994404 80241CD4 44122000 */ mfc1 $s2, $f4 +/* 994408 80241CD8 0C0B210B */ jal get_float_variable +/* 99440C 80241CDC 0220202D */ daddu $a0, $s1, $zero +/* 994410 80241CE0 8E050000 */ lw $a1, ($s0) +/* 994414 80241CE4 4600010D */ trunc.w.s $f4, $f0 +/* 994418 80241CE8 44102000 */ mfc1 $s0, $f4 +/* 99441C 80241CEC 0C0B210B */ jal get_float_variable +/* 994420 80241CF0 0220202D */ daddu $a0, $s1, $zero +/* 994424 80241CF4 3C038024 */ lui $v1, 0x8024 +/* 994428 80241CF8 24632AC0 */ addiu $v1, $v1, 0x2ac0 +/* 99442C 80241CFC 44921000 */ mtc1 $s2, $f2 +/* 994430 80241D00 00000000 */ nop +/* 994434 80241D04 468010A0 */ cvt.s.w $f2, $f2 +/* 994438 80241D08 E462001C */ swc1 $f2, 0x1c($v1) +/* 99443C 80241D0C 44901000 */ mtc1 $s0, $f2 +/* 994440 80241D10 00000000 */ nop +/* 994444 80241D14 468010A0 */ cvt.s.w $f2, $f2 +/* 994448 80241D18 4600010D */ trunc.w.s $f4, $f0 +/* 99444C 80241D1C 44022000 */ mfc1 $v0, $f4 +/* 994450 80241D20 00000000 */ nop +/* 994454 80241D24 44820000 */ mtc1 $v0, $f0 +/* 994458 80241D28 00000000 */ nop +/* 99445C 80241D2C 46800020 */ cvt.s.w $f0, $f0 +/* 994460 80241D30 E4620020 */ swc1 $f2, 0x20($v1) +/* 994464 80241D34 E4600024 */ swc1 $f0, 0x24($v1) +/* 994468 80241D38 8FBF001C */ lw $ra, 0x1c($sp) +/* 99446C 80241D3C 8FB20018 */ lw $s2, 0x18($sp) +/* 994470 80241D40 8FB10014 */ lw $s1, 0x14($sp) +/* 994474 80241D44 8FB00010 */ lw $s0, 0x10($sp) +/* 994478 80241D48 24020002 */ addiu $v0, $zero, 2 +/* 99447C 80241D4C 03E00008 */ jr $ra +/* 994480 80241D50 27BD0020 */ addiu $sp, $sp, 0x20 +/* 994484 80241D54 00000000 */ nop +/* 994488 80241D58 00000000 */ nop +/* 99448C 80241D5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC.s b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC.s deleted file mode 100644 index 6619a5d31f..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC.s +++ /dev/null @@ -1,272 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401AC -/* 99539C 802401AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9953A0 802401B0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9953A4 802401B4 AFB1001C */ sw $s1, 0x1c($sp) -/* 9953A8 802401B8 AFB00018 */ sw $s0, 0x18($sp) -/* 9953AC 802401BC 8C910084 */ lw $s1, 0x84($a0) -/* 9953B0 802401C0 86230044 */ lh $v1, 0x44($s1) -/* 9953B4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 9953B8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 9953BC 802401CC 2C620005 */ sltiu $v0, $v1, 5 -/* 9953C0 802401D0 1040008A */ beqz $v0, .L802403FC -/* 9953C4 802401D4 00031080 */ sll $v0, $v1, 2 -/* 9953C8 802401D8 3C018024 */ lui $at, 0x8024 -/* 9953CC 802401DC 00220821 */ addu $at, $at, $v0 -/* 9953D0 802401E0 8C222D50 */ lw $v0, 0x2d50($at) -/* 9953D4 802401E4 00400008 */ jr $v0 -/* 9953D8 802401E8 00000000 */ nop -/* 9953DC 802401EC 8E22003C */ lw $v0, 0x3c($s1) -/* 9953E0 802401F0 86270046 */ lh $a3, 0x46($s1) -/* 9953E4 802401F4 AFA20010 */ sw $v0, 0x10($sp) -/* 9953E8 802401F8 8E250010 */ lw $a1, 0x10($s1) -/* 9953EC 802401FC 8E26001C */ lw $a2, 0x1c($s1) -/* 9953F0 80240200 0C00A8ED */ jal update_lerp -/* 9953F4 80240204 24040005 */ addiu $a0, $zero, 5 -/* 9953F8 80240208 86270046 */ lh $a3, 0x46($s1) -/* 9953FC 8024020C 8E22003C */ lw $v0, 0x3c($s1) -/* 995400 80240210 E6200004 */ swc1 $f0, 4($s1) -/* 995404 80240214 AFA20010 */ sw $v0, 0x10($sp) -/* 995408 80240218 8E25000C */ lw $a1, 0xc($s1) -/* 99540C 8024021C 8E260018 */ lw $a2, 0x18($s1) -/* 995410 80240220 0C00A8ED */ jal update_lerp -/* 995414 80240224 0000202D */ daddu $a0, $zero, $zero -/* 995418 80240228 86270046 */ lh $a3, 0x46($s1) -/* 99541C 8024022C 8E22003C */ lw $v0, 0x3c($s1) -/* 995420 80240230 E6200000 */ swc1 $f0, ($s1) -/* 995424 80240234 AFA20010 */ sw $v0, 0x10($sp) -/* 995428 80240238 8E250014 */ lw $a1, 0x14($s1) -/* 99542C 8024023C 8E260020 */ lw $a2, 0x20($s1) -/* 995430 80240240 0C00A8ED */ jal update_lerp -/* 995434 80240244 0000202D */ daddu $a0, $zero, $zero -/* 995438 80240248 8E220050 */ lw $v0, 0x50($s1) -/* 99543C 8024024C E6200008 */ swc1 $f0, 8($s1) -/* 995440 80240250 C6200000 */ lwc1 $f0, ($s1) -/* 995444 80240254 8C42000C */ lw $v0, 0xc($v0) -/* 995448 80240258 E4400008 */ swc1 $f0, 8($v0) -/* 99544C 8024025C 8E220050 */ lw $v0, 0x50($s1) -/* 995450 80240260 C6200004 */ lwc1 $f0, 4($s1) -/* 995454 80240264 8C42000C */ lw $v0, 0xc($v0) -/* 995458 80240268 E440000C */ swc1 $f0, 0xc($v0) -/* 99545C 8024026C 8E220050 */ lw $v0, 0x50($s1) -/* 995460 80240270 C6200008 */ lwc1 $f0, 8($s1) -/* 995464 80240274 8C42000C */ lw $v0, 0xc($v0) -/* 995468 80240278 E4400010 */ swc1 $f0, 0x10($v0) -/* 99546C 8024027C 96220046 */ lhu $v0, 0x46($s1) -/* 995470 80240280 8E23003C */ lw $v1, 0x3c($s1) -/* 995474 80240284 24420001 */ addiu $v0, $v0, 1 -/* 995478 80240288 A6220046 */ sh $v0, 0x46($s1) -/* 99547C 8024028C 00021400 */ sll $v0, $v0, 0x10 -/* 995480 80240290 00021403 */ sra $v0, $v0, 0x10 -/* 995484 80240294 0043102A */ slt $v0, $v0, $v1 -/* 995488 80240298 14400058 */ bnez $v0, .L802403FC -/* 99548C 8024029C 24020001 */ addiu $v0, $zero, 1 -/* 995490 802402A0 A6220044 */ sh $v0, 0x44($s1) -/* 995494 802402A4 080900FF */ j .L802403FC -/* 995498 802402A8 A6200046 */ sh $zero, 0x46($s1) -/* 99549C 802402AC 96220046 */ lhu $v0, 0x46($s1) -/* 9954A0 802402B0 24420001 */ addiu $v0, $v0, 1 -/* 9954A4 802402B4 A6220046 */ sh $v0, 0x46($s1) -/* 9954A8 802402B8 00021400 */ sll $v0, $v0, 0x10 -/* 9954AC 802402BC 00021403 */ sra $v0, $v0, 0x10 -/* 9954B0 802402C0 2842003C */ slti $v0, $v0, 0x3c -/* 9954B4 802402C4 1440004D */ bnez $v0, .L802403FC -/* 9954B8 802402C8 24020002 */ addiu $v0, $zero, 2 -/* 9954BC 802402CC 8E230050 */ lw $v1, 0x50($s1) -/* 9954C0 802402D0 A6220044 */ sh $v0, 0x44($s1) -/* 9954C4 802402D4 A6200046 */ sh $zero, 0x46($s1) -/* 9954C8 802402D8 8C63000C */ lw $v1, 0xc($v1) -/* 9954CC 802402DC 24020001 */ addiu $v0, $zero, 1 -/* 9954D0 802402E0 AC620070 */ sw $v0, 0x70($v1) -/* 9954D4 802402E4 8E220050 */ lw $v0, 0x50($s1) -/* 9954D8 802402E8 8C42000C */ lw $v0, 0xc($v0) -/* 9954DC 802402EC 080900FF */ j .L802403FC -/* 9954E0 802402F0 AC400074 */ sw $zero, 0x74($v0) -/* 9954E4 802402F4 96220046 */ lhu $v0, 0x46($s1) -/* 9954E8 802402F8 24420001 */ addiu $v0, $v0, 1 -/* 9954EC 802402FC A6220046 */ sh $v0, 0x46($s1) -/* 9954F0 80240300 00021400 */ sll $v0, $v0, 0x10 -/* 9954F4 80240304 00021403 */ sra $v0, $v0, 0x10 -/* 9954F8 80240308 2842003C */ slti $v0, $v0, 0x3c -/* 9954FC 8024030C 1440003B */ bnez $v0, .L802403FC -/* 995500 80240310 00000000 */ nop -/* 995504 80240314 3C013F80 */ lui $at, 0x3f80 -/* 995508 80240318 44810000 */ mtc1 $at, $f0 -/* 99550C 8024031C AFA00014 */ sw $zero, 0x14($sp) -/* 995510 80240320 E7A00010 */ swc1 $f0, 0x10($sp) -/* 995514 80240324 8E250018 */ lw $a1, 0x18($s1) -/* 995518 80240328 8E26001C */ lw $a2, 0x1c($s1) -/* 99551C 8024032C 8E270020 */ lw $a3, 0x20($s1) -/* 995520 80240330 0C01C9AC */ jal func_800726B0 -/* 995524 80240334 24040001 */ addiu $a0, $zero, 1 -/* 995528 80240338 AE220054 */ sw $v0, 0x54($s1) -/* 99552C 8024033C 8C43000C */ lw $v1, 0xc($v0) -/* 995530 80240340 9222003B */ lbu $v0, 0x3b($s1) -/* 995534 80240344 A0620034 */ sb $v0, 0x34($v1) -/* 995538 80240348 8E220054 */ lw $v0, 0x54($s1) -/* 99553C 8024034C 8C42000C */ lw $v0, 0xc($v0) -/* 995540 80240350 AC400020 */ sw $zero, 0x20($v0) -/* 995544 80240354 8E250018 */ lw $a1, 0x18($s1) -/* 995548 80240358 8E260028 */ lw $a2, 0x28($s1) -/* 99554C 8024035C 8E270020 */ lw $a3, 0x20($s1) -/* 995550 80240360 0C044898 */ jal create_shadow_type -/* 995554 80240364 0000202D */ daddu $a0, $zero, $zero -/* 995558 80240368 3C014210 */ lui $at, 0x4210 -/* 99555C 8024036C 44810000 */ mtc1 $at, $f0 -/* 995560 80240370 AE220040 */ sw $v0, 0x40($s1) -/* 995564 80240374 24020003 */ addiu $v0, $zero, 3 -/* 995568 80240378 A6220044 */ sh $v0, 0x44($s1) -/* 99556C 8024037C 24020001 */ addiu $v0, $zero, 1 -/* 995570 80240380 A6200046 */ sh $zero, 0x46($s1) -/* 995574 80240384 AE20002C */ sw $zero, 0x2c($s1) -/* 995578 80240388 A6220048 */ sh $v0, 0x48($s1) -/* 99557C 8024038C 080900FF */ j .L802403FC -/* 995580 80240390 E6200030 */ swc1 $f0, 0x30($s1) -/* 995584 80240394 0000202D */ daddu $a0, $zero, $zero -/* 995588 80240398 3C054210 */ lui $a1, 0x4210 -/* 99558C 8024039C 3C064198 */ lui $a2, 0x4198 -/* 995590 802403A0 86270046 */ lh $a3, 0x46($s1) -/* 995594 802403A4 24020078 */ addiu $v0, $zero, 0x78 -/* 995598 802403A8 0C00A8ED */ jal update_lerp -/* 99559C 802403AC AFA20010 */ sw $v0, 0x10($sp) -/* 9955A0 802403B0 96220046 */ lhu $v0, 0x46($s1) -/* 9955A4 802403B4 E6200030 */ swc1 $f0, 0x30($s1) -/* 9955A8 802403B8 24420001 */ addiu $v0, $v0, 1 -/* 9955AC 802403BC A6220046 */ sh $v0, 0x46($s1) -/* 9955B0 802403C0 00021400 */ sll $v0, $v0, 0x10 -/* 9955B4 802403C4 00021403 */ sra $v0, $v0, 0x10 -/* 9955B8 802403C8 28420078 */ slti $v0, $v0, 0x78 -/* 9955BC 802403CC 1440000B */ bnez $v0, .L802403FC -/* 9955C0 802403D0 24030001 */ addiu $v1, $zero, 1 -/* 9955C4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) -/* 9955C8 802403D8 24020002 */ addiu $v0, $zero, 2 -/* 9955CC 802403DC A6220048 */ sh $v0, 0x48($s1) -/* 9955D0 802403E0 24020004 */ addiu $v0, $zero, 4 -/* 9955D4 802403E4 A620004C */ sh $zero, 0x4c($s1) -/* 9955D8 802403E8 A623004A */ sh $v1, 0x4a($s1) -/* 9955DC 802403EC A623004E */ sh $v1, 0x4e($s1) -/* 9955E0 802403F0 A6220044 */ sh $v0, 0x44($s1) -/* 9955E4 802403F4 A6200046 */ sh $zero, 0x46($s1) -/* 9955E8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) -.L802403FC: -/* 9955EC 802403FC 8623004A */ lh $v1, 0x4a($s1) -/* 9955F0 80240400 24020001 */ addiu $v0, $zero, 1 -/* 9955F4 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* 9955F8 80240408 24020002 */ addiu $v0, $zero, 2 -/* 9955FC 8024040C 1062001E */ beq $v1, $v0, .L80240488 -/* 995600 80240410 00000000 */ nop -/* 995604 80240414 0809014C */ j .L80240530 -/* 995608 80240418 00000000 */ nop -.L8024041C: -/* 99560C 8024041C 8627004C */ lh $a3, 0x4c($s1) -/* 995610 80240420 24100078 */ addiu $s0, $zero, 0x78 -/* 995614 80240424 AFB00010 */ sw $s0, 0x10($sp) -/* 995618 80240428 8E250034 */ lw $a1, 0x34($s1) -/* 99561C 8024042C 3C0644B4 */ lui $a2, 0x44b4 -/* 995620 80240430 0C00A8ED */ jal update_lerp -/* 995624 80240434 24040004 */ addiu $a0, $zero, 4 -/* 995628 80240438 8627004C */ lh $a3, 0x4c($s1) -/* 99562C 8024043C E620002C */ swc1 $f0, 0x2c($s1) -/* 995630 80240440 AFB00010 */ sw $s0, 0x10($sp) -/* 995634 80240444 8E25001C */ lw $a1, 0x1c($s1) -/* 995638 80240448 8E260024 */ lw $a2, 0x24($s1) -/* 99563C 8024044C 0C00A8ED */ jal update_lerp -/* 995640 80240450 2404000A */ addiu $a0, $zero, 0xa -/* 995644 80240454 9622004C */ lhu $v0, 0x4c($s1) -/* 995648 80240458 E6200004 */ swc1 $f0, 4($s1) -/* 99564C 8024045C 24420001 */ addiu $v0, $v0, 1 -/* 995650 80240460 A622004C */ sh $v0, 0x4c($s1) -/* 995654 80240464 00021400 */ sll $v0, $v0, 0x10 -/* 995658 80240468 00021403 */ sra $v0, $v0, 0x10 -/* 99565C 8024046C 0050102A */ slt $v0, $v0, $s0 -/* 995660 80240470 1440002F */ bnez $v0, .L80240530 -/* 995664 80240474 2402010E */ addiu $v0, $zero, 0x10e -/* 995668 80240478 A622004C */ sh $v0, 0x4c($s1) -/* 99566C 8024047C 24020002 */ addiu $v0, $zero, 2 -/* 995670 80240480 0809014B */ j .L8024052C -/* 995674 80240484 A622004A */ sh $v0, 0x4a($s1) -.L80240488: -/* 995678 80240488 8622004C */ lh $v0, 0x4c($s1) -/* 99567C 8024048C 44826000 */ mtc1 $v0, $f12 -/* 995680 80240490 00000000 */ nop -/* 995684 80240494 0C00A8BB */ jal sin_deg -/* 995688 80240498 46806320 */ cvt.s.w $f12, $f12 -/* 99568C 8024049C 3C013F80 */ lui $at, 0x3f80 -/* 995690 802404A0 44811000 */ mtc1 $at, $f2 -/* 995694 802404A4 00000000 */ nop -/* 995698 802404A8 46020000 */ add.s $f0, $f0, $f2 -/* 99569C 802404AC 46000000 */ add.s $f0, $f0, $f0 -/* 9956A0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) -/* 9956A4 802404B4 8622004C */ lh $v0, 0x4c($s1) -/* 9956A8 802404B8 46001080 */ add.s $f2, $f2, $f0 -/* 9956AC 802404BC 24420008 */ addiu $v0, $v0, 8 -/* 9956B0 802404C0 44826000 */ mtc1 $v0, $f12 -/* 9956B4 802404C4 00000000 */ nop -/* 9956B8 802404C8 46806320 */ cvt.s.w $f12, $f12 -/* 9956BC 802404CC 0C00A6C9 */ jal clamp_angle -/* 9956C0 802404D0 E6220004 */ swc1 $f2, 4($s1) -/* 9956C4 802404D4 4600010D */ trunc.w.s $f4, $f0 -/* 9956C8 802404D8 44022000 */ mfc1 $v0, $f4 -/* 9956CC 802404DC C6200004 */ lwc1 $f0, 4($s1) -/* 9956D0 802404E0 A622004C */ sh $v0, 0x4c($s1) -/* 9956D4 802404E4 C60C0028 */ lwc1 $f12, 0x28($s0) -/* 9956D8 802404E8 8E060030 */ lw $a2, 0x30($s0) -/* 9956DC 802404EC 3C0141A0 */ lui $at, 0x41a0 -/* 9956E0 802404F0 44817000 */ mtc1 $at, $f14 -/* 9956E4 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9956E8 802404F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 9956EC 802404FC C6200008 */ lwc1 $f0, 8($s1) -/* 9956F0 80240500 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9956F4 80240504 8E270000 */ lw $a3, ($s1) -/* 9956F8 80240508 0C00A7CB */ jal dist3D -/* 9956FC 8024050C 460E1380 */ add.s $f14, $f2, $f14 -/* 995700 80240510 3C0141F0 */ lui $at, 0x41f0 -/* 995704 80240514 44811000 */ mtc1 $at, $f2 -/* 995708 80240518 00000000 */ nop -/* 99570C 8024051C 4600103C */ c.lt.s $f2, $f0 -/* 995710 80240520 00000000 */ nop -/* 995714 80240524 45010002 */ bc1t .L80240530 -/* 995718 80240528 24020003 */ addiu $v0, $zero, 3 -.L8024052C: -/* 99571C 8024052C A622004E */ sh $v0, 0x4e($s1) -.L80240530: -/* 995720 80240530 86230048 */ lh $v1, 0x48($s1) -/* 995724 80240534 24020001 */ addiu $v0, $zero, 1 -/* 995728 80240538 10620005 */ beq $v1, $v0, .L80240550 -/* 99572C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 995730 80240540 10620008 */ beq $v1, $v0, .L80240564 -/* 995734 80240544 00000000 */ nop -/* 995738 80240548 08090169 */ j .L802405A4 -/* 99573C 8024054C 00000000 */ nop -.L80240550: -/* 995740 80240550 C620002C */ lwc1 $f0, 0x2c($s1) -/* 995744 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) -/* 995748 80240558 0C00A6C9 */ jal clamp_angle -/* 99574C 8024055C 460C0300 */ add.s $f12, $f0, $f12 -/* 995750 80240560 E620002C */ swc1 $f0, 0x2c($s1) -.L80240564: -/* 995754 80240564 8E220054 */ lw $v0, 0x54($s1) -/* 995758 80240568 C620002C */ lwc1 $f0, 0x2c($s1) -/* 99575C 8024056C 8C42000C */ lw $v0, 0xc($v0) -/* 995760 80240570 E4400024 */ swc1 $f0, 0x24($v0) -/* 995764 80240574 8E220054 */ lw $v0, 0x54($s1) -/* 995768 80240578 C6200018 */ lwc1 $f0, 0x18($s1) -/* 99576C 8024057C 8C42000C */ lw $v0, 0xc($v0) -/* 995770 80240580 E4400004 */ swc1 $f0, 4($v0) -/* 995774 80240584 8E220054 */ lw $v0, 0x54($s1) -/* 995778 80240588 C6200004 */ lwc1 $f0, 4($s1) -/* 99577C 8024058C 8C42000C */ lw $v0, 0xc($v0) -/* 995780 80240590 E4400008 */ swc1 $f0, 8($v0) -/* 995784 80240594 8E220054 */ lw $v0, 0x54($s1) -/* 995788 80240598 C6200020 */ lwc1 $f0, 0x20($s1) -/* 99578C 8024059C 8C42000C */ lw $v0, 0xc($v0) -/* 995790 802405A0 E440000C */ swc1 $f0, 0xc($v0) -.L802405A4: -/* 995794 802405A4 8FBF0020 */ lw $ra, 0x20($sp) -/* 995798 802405A8 8FB1001C */ lw $s1, 0x1c($sp) -/* 99579C 802405AC 8FB00018 */ lw $s0, 0x18($sp) -/* 9957A0 802405B0 0000102D */ daddu $v0, $zero, $zero -/* 9957A4 802405B4 03E00008 */ jr $ra -/* 9957A8 802405B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s new file mode 100644 index 0000000000..a4d4ae6975 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802401AC_99539C.s @@ -0,0 +1,272 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401AC_99539C +/* 99539C 802401AC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9953A0 802401B0 AFBF0020 */ sw $ra, 0x20($sp) +/* 9953A4 802401B4 AFB1001C */ sw $s1, 0x1c($sp) +/* 9953A8 802401B8 AFB00018 */ sw $s0, 0x18($sp) +/* 9953AC 802401BC 8C910084 */ lw $s1, 0x84($a0) +/* 9953B0 802401C0 86230044 */ lh $v1, 0x44($s1) +/* 9953B4 802401C4 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* 9953B8 802401C8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* 9953BC 802401CC 2C620005 */ sltiu $v0, $v1, 5 +/* 9953C0 802401D0 1040008A */ beqz $v0, .L802403FC +/* 9953C4 802401D4 00031080 */ sll $v0, $v1, 2 +/* 9953C8 802401D8 3C018024 */ lui $at, 0x8024 +/* 9953CC 802401DC 00220821 */ addu $at, $at, $v0 +/* 9953D0 802401E0 8C222D50 */ lw $v0, 0x2d50($at) +/* 9953D4 802401E4 00400008 */ jr $v0 +/* 9953D8 802401E8 00000000 */ nop +/* 9953DC 802401EC 8E22003C */ lw $v0, 0x3c($s1) +/* 9953E0 802401F0 86270046 */ lh $a3, 0x46($s1) +/* 9953E4 802401F4 AFA20010 */ sw $v0, 0x10($sp) +/* 9953E8 802401F8 8E250010 */ lw $a1, 0x10($s1) +/* 9953EC 802401FC 8E26001C */ lw $a2, 0x1c($s1) +/* 9953F0 80240200 0C00A8ED */ jal update_lerp +/* 9953F4 80240204 24040005 */ addiu $a0, $zero, 5 +/* 9953F8 80240208 86270046 */ lh $a3, 0x46($s1) +/* 9953FC 8024020C 8E22003C */ lw $v0, 0x3c($s1) +/* 995400 80240210 E6200004 */ swc1 $f0, 4($s1) +/* 995404 80240214 AFA20010 */ sw $v0, 0x10($sp) +/* 995408 80240218 8E25000C */ lw $a1, 0xc($s1) +/* 99540C 8024021C 8E260018 */ lw $a2, 0x18($s1) +/* 995410 80240220 0C00A8ED */ jal update_lerp +/* 995414 80240224 0000202D */ daddu $a0, $zero, $zero +/* 995418 80240228 86270046 */ lh $a3, 0x46($s1) +/* 99541C 8024022C 8E22003C */ lw $v0, 0x3c($s1) +/* 995420 80240230 E6200000 */ swc1 $f0, ($s1) +/* 995424 80240234 AFA20010 */ sw $v0, 0x10($sp) +/* 995428 80240238 8E250014 */ lw $a1, 0x14($s1) +/* 99542C 8024023C 8E260020 */ lw $a2, 0x20($s1) +/* 995430 80240240 0C00A8ED */ jal update_lerp +/* 995434 80240244 0000202D */ daddu $a0, $zero, $zero +/* 995438 80240248 8E220050 */ lw $v0, 0x50($s1) +/* 99543C 8024024C E6200008 */ swc1 $f0, 8($s1) +/* 995440 80240250 C6200000 */ lwc1 $f0, ($s1) +/* 995444 80240254 8C42000C */ lw $v0, 0xc($v0) +/* 995448 80240258 E4400008 */ swc1 $f0, 8($v0) +/* 99544C 8024025C 8E220050 */ lw $v0, 0x50($s1) +/* 995450 80240260 C6200004 */ lwc1 $f0, 4($s1) +/* 995454 80240264 8C42000C */ lw $v0, 0xc($v0) +/* 995458 80240268 E440000C */ swc1 $f0, 0xc($v0) +/* 99545C 8024026C 8E220050 */ lw $v0, 0x50($s1) +/* 995460 80240270 C6200008 */ lwc1 $f0, 8($s1) +/* 995464 80240274 8C42000C */ lw $v0, 0xc($v0) +/* 995468 80240278 E4400010 */ swc1 $f0, 0x10($v0) +/* 99546C 8024027C 96220046 */ lhu $v0, 0x46($s1) +/* 995470 80240280 8E23003C */ lw $v1, 0x3c($s1) +/* 995474 80240284 24420001 */ addiu $v0, $v0, 1 +/* 995478 80240288 A6220046 */ sh $v0, 0x46($s1) +/* 99547C 8024028C 00021400 */ sll $v0, $v0, 0x10 +/* 995480 80240290 00021403 */ sra $v0, $v0, 0x10 +/* 995484 80240294 0043102A */ slt $v0, $v0, $v1 +/* 995488 80240298 14400058 */ bnez $v0, .L802403FC +/* 99548C 8024029C 24020001 */ addiu $v0, $zero, 1 +/* 995490 802402A0 A6220044 */ sh $v0, 0x44($s1) +/* 995494 802402A4 080900FF */ j .L802403FC +/* 995498 802402A8 A6200046 */ sh $zero, 0x46($s1) +/* 99549C 802402AC 96220046 */ lhu $v0, 0x46($s1) +/* 9954A0 802402B0 24420001 */ addiu $v0, $v0, 1 +/* 9954A4 802402B4 A6220046 */ sh $v0, 0x46($s1) +/* 9954A8 802402B8 00021400 */ sll $v0, $v0, 0x10 +/* 9954AC 802402BC 00021403 */ sra $v0, $v0, 0x10 +/* 9954B0 802402C0 2842003C */ slti $v0, $v0, 0x3c +/* 9954B4 802402C4 1440004D */ bnez $v0, .L802403FC +/* 9954B8 802402C8 24020002 */ addiu $v0, $zero, 2 +/* 9954BC 802402CC 8E230050 */ lw $v1, 0x50($s1) +/* 9954C0 802402D0 A6220044 */ sh $v0, 0x44($s1) +/* 9954C4 802402D4 A6200046 */ sh $zero, 0x46($s1) +/* 9954C8 802402D8 8C63000C */ lw $v1, 0xc($v1) +/* 9954CC 802402DC 24020001 */ addiu $v0, $zero, 1 +/* 9954D0 802402E0 AC620070 */ sw $v0, 0x70($v1) +/* 9954D4 802402E4 8E220050 */ lw $v0, 0x50($s1) +/* 9954D8 802402E8 8C42000C */ lw $v0, 0xc($v0) +/* 9954DC 802402EC 080900FF */ j .L802403FC +/* 9954E0 802402F0 AC400074 */ sw $zero, 0x74($v0) +/* 9954E4 802402F4 96220046 */ lhu $v0, 0x46($s1) +/* 9954E8 802402F8 24420001 */ addiu $v0, $v0, 1 +/* 9954EC 802402FC A6220046 */ sh $v0, 0x46($s1) +/* 9954F0 80240300 00021400 */ sll $v0, $v0, 0x10 +/* 9954F4 80240304 00021403 */ sra $v0, $v0, 0x10 +/* 9954F8 80240308 2842003C */ slti $v0, $v0, 0x3c +/* 9954FC 8024030C 1440003B */ bnez $v0, .L802403FC +/* 995500 80240310 00000000 */ nop +/* 995504 80240314 3C013F80 */ lui $at, 0x3f80 +/* 995508 80240318 44810000 */ mtc1 $at, $f0 +/* 99550C 8024031C AFA00014 */ sw $zero, 0x14($sp) +/* 995510 80240320 E7A00010 */ swc1 $f0, 0x10($sp) +/* 995514 80240324 8E250018 */ lw $a1, 0x18($s1) +/* 995518 80240328 8E26001C */ lw $a2, 0x1c($s1) +/* 99551C 8024032C 8E270020 */ lw $a3, 0x20($s1) +/* 995520 80240330 0C01C9AC */ jal func_800726B0 +/* 995524 80240334 24040001 */ addiu $a0, $zero, 1 +/* 995528 80240338 AE220054 */ sw $v0, 0x54($s1) +/* 99552C 8024033C 8C43000C */ lw $v1, 0xc($v0) +/* 995530 80240340 9222003B */ lbu $v0, 0x3b($s1) +/* 995534 80240344 A0620034 */ sb $v0, 0x34($v1) +/* 995538 80240348 8E220054 */ lw $v0, 0x54($s1) +/* 99553C 8024034C 8C42000C */ lw $v0, 0xc($v0) +/* 995540 80240350 AC400020 */ sw $zero, 0x20($v0) +/* 995544 80240354 8E250018 */ lw $a1, 0x18($s1) +/* 995548 80240358 8E260028 */ lw $a2, 0x28($s1) +/* 99554C 8024035C 8E270020 */ lw $a3, 0x20($s1) +/* 995550 80240360 0C044898 */ jal create_shadow_type +/* 995554 80240364 0000202D */ daddu $a0, $zero, $zero +/* 995558 80240368 3C014210 */ lui $at, 0x4210 +/* 99555C 8024036C 44810000 */ mtc1 $at, $f0 +/* 995560 80240370 AE220040 */ sw $v0, 0x40($s1) +/* 995564 80240374 24020003 */ addiu $v0, $zero, 3 +/* 995568 80240378 A6220044 */ sh $v0, 0x44($s1) +/* 99556C 8024037C 24020001 */ addiu $v0, $zero, 1 +/* 995570 80240380 A6200046 */ sh $zero, 0x46($s1) +/* 995574 80240384 AE20002C */ sw $zero, 0x2c($s1) +/* 995578 80240388 A6220048 */ sh $v0, 0x48($s1) +/* 99557C 8024038C 080900FF */ j .L802403FC +/* 995580 80240390 E6200030 */ swc1 $f0, 0x30($s1) +/* 995584 80240394 0000202D */ daddu $a0, $zero, $zero +/* 995588 80240398 3C054210 */ lui $a1, 0x4210 +/* 99558C 8024039C 3C064198 */ lui $a2, 0x4198 +/* 995590 802403A0 86270046 */ lh $a3, 0x46($s1) +/* 995594 802403A4 24020078 */ addiu $v0, $zero, 0x78 +/* 995598 802403A8 0C00A8ED */ jal update_lerp +/* 99559C 802403AC AFA20010 */ sw $v0, 0x10($sp) +/* 9955A0 802403B0 96220046 */ lhu $v0, 0x46($s1) +/* 9955A4 802403B4 E6200030 */ swc1 $f0, 0x30($s1) +/* 9955A8 802403B8 24420001 */ addiu $v0, $v0, 1 +/* 9955AC 802403BC A6220046 */ sh $v0, 0x46($s1) +/* 9955B0 802403C0 00021400 */ sll $v0, $v0, 0x10 +/* 9955B4 802403C4 00021403 */ sra $v0, $v0, 0x10 +/* 9955B8 802403C8 28420078 */ slti $v0, $v0, 0x78 +/* 9955BC 802403CC 1440000B */ bnez $v0, .L802403FC +/* 9955C0 802403D0 24030001 */ addiu $v1, $zero, 1 +/* 9955C4 802403D4 C620002C */ lwc1 $f0, 0x2c($s1) +/* 9955C8 802403D8 24020002 */ addiu $v0, $zero, 2 +/* 9955CC 802403DC A6220048 */ sh $v0, 0x48($s1) +/* 9955D0 802403E0 24020004 */ addiu $v0, $zero, 4 +/* 9955D4 802403E4 A620004C */ sh $zero, 0x4c($s1) +/* 9955D8 802403E8 A623004A */ sh $v1, 0x4a($s1) +/* 9955DC 802403EC A623004E */ sh $v1, 0x4e($s1) +/* 9955E0 802403F0 A6220044 */ sh $v0, 0x44($s1) +/* 9955E4 802403F4 A6200046 */ sh $zero, 0x46($s1) +/* 9955E8 802403F8 E6200034 */ swc1 $f0, 0x34($s1) +.L802403FC: +/* 9955EC 802403FC 8623004A */ lh $v1, 0x4a($s1) +/* 9955F0 80240400 24020001 */ addiu $v0, $zero, 1 +/* 9955F4 80240404 10620005 */ beq $v1, $v0, .L8024041C +/* 9955F8 80240408 24020002 */ addiu $v0, $zero, 2 +/* 9955FC 8024040C 1062001E */ beq $v1, $v0, .L80240488 +/* 995600 80240410 00000000 */ nop +/* 995604 80240414 0809014C */ j .L80240530 +/* 995608 80240418 00000000 */ nop +.L8024041C: +/* 99560C 8024041C 8627004C */ lh $a3, 0x4c($s1) +/* 995610 80240420 24100078 */ addiu $s0, $zero, 0x78 +/* 995614 80240424 AFB00010 */ sw $s0, 0x10($sp) +/* 995618 80240428 8E250034 */ lw $a1, 0x34($s1) +/* 99561C 8024042C 3C0644B4 */ lui $a2, 0x44b4 +/* 995620 80240430 0C00A8ED */ jal update_lerp +/* 995624 80240434 24040004 */ addiu $a0, $zero, 4 +/* 995628 80240438 8627004C */ lh $a3, 0x4c($s1) +/* 99562C 8024043C E620002C */ swc1 $f0, 0x2c($s1) +/* 995630 80240440 AFB00010 */ sw $s0, 0x10($sp) +/* 995634 80240444 8E25001C */ lw $a1, 0x1c($s1) +/* 995638 80240448 8E260024 */ lw $a2, 0x24($s1) +/* 99563C 8024044C 0C00A8ED */ jal update_lerp +/* 995640 80240450 2404000A */ addiu $a0, $zero, 0xa +/* 995644 80240454 9622004C */ lhu $v0, 0x4c($s1) +/* 995648 80240458 E6200004 */ swc1 $f0, 4($s1) +/* 99564C 8024045C 24420001 */ addiu $v0, $v0, 1 +/* 995650 80240460 A622004C */ sh $v0, 0x4c($s1) +/* 995654 80240464 00021400 */ sll $v0, $v0, 0x10 +/* 995658 80240468 00021403 */ sra $v0, $v0, 0x10 +/* 99565C 8024046C 0050102A */ slt $v0, $v0, $s0 +/* 995660 80240470 1440002F */ bnez $v0, .L80240530 +/* 995664 80240474 2402010E */ addiu $v0, $zero, 0x10e +/* 995668 80240478 A622004C */ sh $v0, 0x4c($s1) +/* 99566C 8024047C 24020002 */ addiu $v0, $zero, 2 +/* 995670 80240480 0809014B */ j .L8024052C +/* 995674 80240484 A622004A */ sh $v0, 0x4a($s1) +.L80240488: +/* 995678 80240488 8622004C */ lh $v0, 0x4c($s1) +/* 99567C 8024048C 44826000 */ mtc1 $v0, $f12 +/* 995680 80240490 00000000 */ nop +/* 995684 80240494 0C00A8BB */ jal sin_deg +/* 995688 80240498 46806320 */ cvt.s.w $f12, $f12 +/* 99568C 8024049C 3C013F80 */ lui $at, 0x3f80 +/* 995690 802404A0 44811000 */ mtc1 $at, $f2 +/* 995694 802404A4 00000000 */ nop +/* 995698 802404A8 46020000 */ add.s $f0, $f0, $f2 +/* 99569C 802404AC 46000000 */ add.s $f0, $f0, $f0 +/* 9956A0 802404B0 C6220024 */ lwc1 $f2, 0x24($s1) +/* 9956A4 802404B4 8622004C */ lh $v0, 0x4c($s1) +/* 9956A8 802404B8 46001080 */ add.s $f2, $f2, $f0 +/* 9956AC 802404BC 24420008 */ addiu $v0, $v0, 8 +/* 9956B0 802404C0 44826000 */ mtc1 $v0, $f12 +/* 9956B4 802404C4 00000000 */ nop +/* 9956B8 802404C8 46806320 */ cvt.s.w $f12, $f12 +/* 9956BC 802404CC 0C00A6C9 */ jal clamp_angle +/* 9956C0 802404D0 E6220004 */ swc1 $f2, 4($s1) +/* 9956C4 802404D4 4600010D */ trunc.w.s $f4, $f0 +/* 9956C8 802404D8 44022000 */ mfc1 $v0, $f4 +/* 9956CC 802404DC C6200004 */ lwc1 $f0, 4($s1) +/* 9956D0 802404E0 A622004C */ sh $v0, 0x4c($s1) +/* 9956D4 802404E4 C60C0028 */ lwc1 $f12, 0x28($s0) +/* 9956D8 802404E8 8E060030 */ lw $a2, 0x30($s0) +/* 9956DC 802404EC 3C0141A0 */ lui $at, 0x41a0 +/* 9956E0 802404F0 44817000 */ mtc1 $at, $f14 +/* 9956E4 802404F4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9956E8 802404F8 C602002C */ lwc1 $f2, 0x2c($s0) +/* 9956EC 802404FC C6200008 */ lwc1 $f0, 8($s1) +/* 9956F0 80240500 E7A00014 */ swc1 $f0, 0x14($sp) +/* 9956F4 80240504 8E270000 */ lw $a3, ($s1) +/* 9956F8 80240508 0C00A7CB */ jal dist3D +/* 9956FC 8024050C 460E1380 */ add.s $f14, $f2, $f14 +/* 995700 80240510 3C0141F0 */ lui $at, 0x41f0 +/* 995704 80240514 44811000 */ mtc1 $at, $f2 +/* 995708 80240518 00000000 */ nop +/* 99570C 8024051C 4600103C */ c.lt.s $f2, $f0 +/* 995710 80240520 00000000 */ nop +/* 995714 80240524 45010002 */ bc1t .L80240530 +/* 995718 80240528 24020003 */ addiu $v0, $zero, 3 +.L8024052C: +/* 99571C 8024052C A622004E */ sh $v0, 0x4e($s1) +.L80240530: +/* 995720 80240530 86230048 */ lh $v1, 0x48($s1) +/* 995724 80240534 24020001 */ addiu $v0, $zero, 1 +/* 995728 80240538 10620005 */ beq $v1, $v0, .L80240550 +/* 99572C 8024053C 24020002 */ addiu $v0, $zero, 2 +/* 995730 80240540 10620008 */ beq $v1, $v0, .L80240564 +/* 995734 80240544 00000000 */ nop +/* 995738 80240548 08090169 */ j .L802405A4 +/* 99573C 8024054C 00000000 */ nop +.L80240550: +/* 995740 80240550 C620002C */ lwc1 $f0, 0x2c($s1) +/* 995744 80240554 C62C0030 */ lwc1 $f12, 0x30($s1) +/* 995748 80240558 0C00A6C9 */ jal clamp_angle +/* 99574C 8024055C 460C0300 */ add.s $f12, $f0, $f12 +/* 995750 80240560 E620002C */ swc1 $f0, 0x2c($s1) +.L80240564: +/* 995754 80240564 8E220054 */ lw $v0, 0x54($s1) +/* 995758 80240568 C620002C */ lwc1 $f0, 0x2c($s1) +/* 99575C 8024056C 8C42000C */ lw $v0, 0xc($v0) +/* 995760 80240570 E4400024 */ swc1 $f0, 0x24($v0) +/* 995764 80240574 8E220054 */ lw $v0, 0x54($s1) +/* 995768 80240578 C6200018 */ lwc1 $f0, 0x18($s1) +/* 99576C 8024057C 8C42000C */ lw $v0, 0xc($v0) +/* 995770 80240580 E4400004 */ swc1 $f0, 4($v0) +/* 995774 80240584 8E220054 */ lw $v0, 0x54($s1) +/* 995778 80240588 C6200004 */ lwc1 $f0, 4($s1) +/* 99577C 8024058C 8C42000C */ lw $v0, 0xc($v0) +/* 995780 80240590 E4400008 */ swc1 $f0, 8($v0) +/* 995784 80240594 8E220054 */ lw $v0, 0x54($s1) +/* 995788 80240598 C6200020 */ lwc1 $f0, 0x20($s1) +/* 99578C 8024059C 8C42000C */ lw $v0, 0xc($v0) +/* 995790 802405A0 E440000C */ swc1 $f0, 0xc($v0) +.L802405A4: +/* 995794 802405A4 8FBF0020 */ lw $ra, 0x20($sp) +/* 995798 802405A8 8FB1001C */ lw $s1, 0x1c($sp) +/* 99579C 802405AC 8FB00018 */ lw $s0, 0x18($sp) +/* 9957A0 802405B0 0000102D */ daddu $v0, $zero, $zero +/* 9957A4 802405B4 03E00008 */ jr $ra +/* 9957A8 802405B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC.s b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC.s deleted file mode 100644 index b7904f3326..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405FC -/* 9957EC 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9957F0 80240600 AFB20020 */ sw $s2, 0x20($sp) -/* 9957F4 80240604 0080902D */ daddu $s2, $a0, $zero -/* 9957F8 80240608 AFBF0024 */ sw $ra, 0x24($sp) -/* 9957FC 8024060C AFB1001C */ sw $s1, 0x1c($sp) -/* 995800 80240610 AFB00018 */ sw $s0, 0x18($sp) -/* 995804 80240614 10A00035 */ beqz $a1, .L802406EC -/* 995808 80240618 8E51000C */ lw $s1, 0xc($s2) -/* 99580C 8024061C 0C00AB39 */ jal heap_malloc -/* 995810 80240620 24040058 */ addiu $a0, $zero, 0x58 -/* 995814 80240624 0040802D */ daddu $s0, $v0, $zero -/* 995818 80240628 AE500084 */ sw $s0, 0x84($s2) -/* 99581C 8024062C 8E250000 */ lw $a1, ($s1) -/* 995820 80240630 26310004 */ addiu $s1, $s1, 4 -/* 995824 80240634 0C0B1EAF */ jal get_variable -/* 995828 80240638 0240202D */ daddu $a0, $s2, $zero -/* 99582C 8024063C AE020038 */ sw $v0, 0x38($s0) -/* 995830 80240640 8E250000 */ lw $a1, ($s1) -/* 995834 80240644 26310004 */ addiu $s1, $s1, 4 -/* 995838 80240648 0C0B210B */ jal get_float_variable -/* 99583C 8024064C 0240202D */ daddu $a0, $s2, $zero -/* 995840 80240650 E6000018 */ swc1 $f0, 0x18($s0) -/* 995844 80240654 8E250000 */ lw $a1, ($s1) -/* 995848 80240658 26310004 */ addiu $s1, $s1, 4 -/* 99584C 8024065C 0C0B210B */ jal get_float_variable -/* 995850 80240660 0240202D */ daddu $a0, $s2, $zero -/* 995854 80240664 E6000024 */ swc1 $f0, 0x24($s0) -/* 995858 80240668 8E250000 */ lw $a1, ($s1) -/* 99585C 8024066C 26310004 */ addiu $s1, $s1, 4 -/* 995860 80240670 0C0B210B */ jal get_float_variable -/* 995864 80240674 0240202D */ daddu $a0, $s2, $zero -/* 995868 80240678 E6000020 */ swc1 $f0, 0x20($s0) -/* 99586C 8024067C 8E250000 */ lw $a1, ($s1) -/* 995870 80240680 0C0B210B */ jal get_float_variable -/* 995874 80240684 0240202D */ daddu $a0, $s2, $zero -/* 995878 80240688 3C013F80 */ lui $at, 0x3f80 -/* 99587C 8024068C 44811000 */ mtc1 $at, $f2 -/* 995880 80240690 E6000028 */ swc1 $f0, 0x28($s0) -/* 995884 80240694 AFA00014 */ sw $zero, 0x14($sp) -/* 995888 80240698 E7A20010 */ swc1 $f2, 0x10($sp) -/* 99588C 8024069C 8E050018 */ lw $a1, 0x18($s0) -/* 995890 802406A0 8E060024 */ lw $a2, 0x24($s0) -/* 995894 802406A4 8E070020 */ lw $a3, 0x20($s0) -/* 995898 802406A8 0C01C9AC */ jal func_800726B0 -/* 99589C 802406AC 24040001 */ addiu $a0, $zero, 1 -/* 9958A0 802406B0 AE020054 */ sw $v0, 0x54($s0) -/* 9958A4 802406B4 8C43000C */ lw $v1, 0xc($v0) -/* 9958A8 802406B8 9202003B */ lbu $v0, 0x3b($s0) -/* 9958AC 802406BC A0620034 */ sb $v0, 0x34($v1) -/* 9958B0 802406C0 8E020054 */ lw $v0, 0x54($s0) -/* 9958B4 802406C4 8C42000C */ lw $v0, 0xc($v0) -/* 9958B8 802406C8 AC400020 */ sw $zero, 0x20($v0) -/* 9958BC 802406CC 8E050018 */ lw $a1, 0x18($s0) -/* 9958C0 802406D0 8E060028 */ lw $a2, 0x28($s0) -/* 9958C4 802406D4 8E070020 */ lw $a3, 0x20($s0) -/* 9958C8 802406D8 0C044898 */ jal create_shadow_type -/* 9958CC 802406DC 0000202D */ daddu $a0, $zero, $zero -/* 9958D0 802406E0 AE020040 */ sw $v0, 0x40($s0) -/* 9958D4 802406E4 2402010E */ addiu $v0, $zero, 0x10e -/* 9958D8 802406E8 A602004C */ sh $v0, 0x4c($s0) -.L802406EC: -/* 9958DC 802406EC 8FBF0024 */ lw $ra, 0x24($sp) -/* 9958E0 802406F0 8FB20020 */ lw $s2, 0x20($sp) -/* 9958E4 802406F4 8FB1001C */ lw $s1, 0x1c($sp) -/* 9958E8 802406F8 8FB00018 */ lw $s0, 0x18($sp) -/* 9958EC 802406FC 24020002 */ addiu $v0, $zero, 2 -/* 9958F0 80240700 03E00008 */ jr $ra -/* 9958F4 80240704 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s new file mode 100644 index 0000000000..47e5a4be09 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_802405FC_9957EC.s @@ -0,0 +1,72 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405FC_9957EC +/* 9957EC 802405FC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9957F0 80240600 AFB20020 */ sw $s2, 0x20($sp) +/* 9957F4 80240604 0080902D */ daddu $s2, $a0, $zero +/* 9957F8 80240608 AFBF0024 */ sw $ra, 0x24($sp) +/* 9957FC 8024060C AFB1001C */ sw $s1, 0x1c($sp) +/* 995800 80240610 AFB00018 */ sw $s0, 0x18($sp) +/* 995804 80240614 10A00035 */ beqz $a1, .L802406EC +/* 995808 80240618 8E51000C */ lw $s1, 0xc($s2) +/* 99580C 8024061C 0C00AB39 */ jal heap_malloc +/* 995810 80240620 24040058 */ addiu $a0, $zero, 0x58 +/* 995814 80240624 0040802D */ daddu $s0, $v0, $zero +/* 995818 80240628 AE500084 */ sw $s0, 0x84($s2) +/* 99581C 8024062C 8E250000 */ lw $a1, ($s1) +/* 995820 80240630 26310004 */ addiu $s1, $s1, 4 +/* 995824 80240634 0C0B1EAF */ jal get_variable +/* 995828 80240638 0240202D */ daddu $a0, $s2, $zero +/* 99582C 8024063C AE020038 */ sw $v0, 0x38($s0) +/* 995830 80240640 8E250000 */ lw $a1, ($s1) +/* 995834 80240644 26310004 */ addiu $s1, $s1, 4 +/* 995838 80240648 0C0B210B */ jal get_float_variable +/* 99583C 8024064C 0240202D */ daddu $a0, $s2, $zero +/* 995840 80240650 E6000018 */ swc1 $f0, 0x18($s0) +/* 995844 80240654 8E250000 */ lw $a1, ($s1) +/* 995848 80240658 26310004 */ addiu $s1, $s1, 4 +/* 99584C 8024065C 0C0B210B */ jal get_float_variable +/* 995850 80240660 0240202D */ daddu $a0, $s2, $zero +/* 995854 80240664 E6000024 */ swc1 $f0, 0x24($s0) +/* 995858 80240668 8E250000 */ lw $a1, ($s1) +/* 99585C 8024066C 26310004 */ addiu $s1, $s1, 4 +/* 995860 80240670 0C0B210B */ jal get_float_variable +/* 995864 80240674 0240202D */ daddu $a0, $s2, $zero +/* 995868 80240678 E6000020 */ swc1 $f0, 0x20($s0) +/* 99586C 8024067C 8E250000 */ lw $a1, ($s1) +/* 995870 80240680 0C0B210B */ jal get_float_variable +/* 995874 80240684 0240202D */ daddu $a0, $s2, $zero +/* 995878 80240688 3C013F80 */ lui $at, 0x3f80 +/* 99587C 8024068C 44811000 */ mtc1 $at, $f2 +/* 995880 80240690 E6000028 */ swc1 $f0, 0x28($s0) +/* 995884 80240694 AFA00014 */ sw $zero, 0x14($sp) +/* 995888 80240698 E7A20010 */ swc1 $f2, 0x10($sp) +/* 99588C 8024069C 8E050018 */ lw $a1, 0x18($s0) +/* 995890 802406A0 8E060024 */ lw $a2, 0x24($s0) +/* 995894 802406A4 8E070020 */ lw $a3, 0x20($s0) +/* 995898 802406A8 0C01C9AC */ jal func_800726B0 +/* 99589C 802406AC 24040001 */ addiu $a0, $zero, 1 +/* 9958A0 802406B0 AE020054 */ sw $v0, 0x54($s0) +/* 9958A4 802406B4 8C43000C */ lw $v1, 0xc($v0) +/* 9958A8 802406B8 9202003B */ lbu $v0, 0x3b($s0) +/* 9958AC 802406BC A0620034 */ sb $v0, 0x34($v1) +/* 9958B0 802406C0 8E020054 */ lw $v0, 0x54($s0) +/* 9958B4 802406C4 8C42000C */ lw $v0, 0xc($v0) +/* 9958B8 802406C8 AC400020 */ sw $zero, 0x20($v0) +/* 9958BC 802406CC 8E050018 */ lw $a1, 0x18($s0) +/* 9958C0 802406D0 8E060028 */ lw $a2, 0x28($s0) +/* 9958C4 802406D4 8E070020 */ lw $a3, 0x20($s0) +/* 9958C8 802406D8 0C044898 */ jal create_shadow_type +/* 9958CC 802406DC 0000202D */ daddu $a0, $zero, $zero +/* 9958D0 802406E0 AE020040 */ sw $v0, 0x40($s0) +/* 9958D4 802406E4 2402010E */ addiu $v0, $zero, 0x10e +/* 9958D8 802406E8 A602004C */ sh $v0, 0x4c($s0) +.L802406EC: +/* 9958DC 802406EC 8FBF0024 */ lw $ra, 0x24($sp) +/* 9958E0 802406F0 8FB20020 */ lw $s2, 0x20($sp) +/* 9958E4 802406F4 8FB1001C */ lw $s1, 0x1c($sp) +/* 9958E8 802406F8 8FB00018 */ lw $s0, 0x18($sp) +/* 9958EC 802406FC 24020002 */ addiu $v0, $zero, 2 +/* 9958F0 80240700 03E00008 */ jr $ra +/* 9958F4 80240704 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708.s b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708.s deleted file mode 100644 index 14aeab5a1a..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240708 -/* 9958F8 80240708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9958FC 8024070C AFBF0014 */ sw $ra, 0x14($sp) -/* 995900 80240710 AFB00010 */ sw $s0, 0x10($sp) -/* 995904 80240714 8C900084 */ lw $s0, 0x84($a0) -/* 995908 80240718 8602004C */ lh $v0, 0x4c($s0) -/* 99590C 8024071C 44826000 */ mtc1 $v0, $f12 -/* 995910 80240720 00000000 */ nop -/* 995914 80240724 0C00A8BB */ jal sin_deg -/* 995918 80240728 46806320 */ cvt.s.w $f12, $f12 -/* 99591C 8024072C 3C013F80 */ lui $at, 0x3f80 -/* 995920 80240730 44811000 */ mtc1 $at, $f2 -/* 995924 80240734 00000000 */ nop -/* 995928 80240738 46020000 */ add.s $f0, $f0, $f2 -/* 99592C 8024073C 46000000 */ add.s $f0, $f0, $f0 -/* 995930 80240740 C6020024 */ lwc1 $f2, 0x24($s0) -/* 995934 80240744 8602004C */ lh $v0, 0x4c($s0) -/* 995938 80240748 46001080 */ add.s $f2, $f2, $f0 -/* 99593C 8024074C 24420008 */ addiu $v0, $v0, 8 -/* 995940 80240750 44826000 */ mtc1 $v0, $f12 -/* 995944 80240754 00000000 */ nop -/* 995948 80240758 46806320 */ cvt.s.w $f12, $f12 -/* 99594C 8024075C 0C00A6C9 */ jal clamp_angle -/* 995950 80240760 E6020004 */ swc1 $f2, 4($s0) -/* 995954 80240764 4600010D */ trunc.w.s $f4, $f0 -/* 995958 80240768 44022000 */ mfc1 $v0, $f4 -/* 99595C 8024076C 00000000 */ nop -/* 995960 80240770 A602004C */ sh $v0, 0x4c($s0) -/* 995964 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 995968 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 99596C 8024077C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 995970 80240780 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 995974 80240784 8E060018 */ lw $a2, 0x18($s0) -/* 995978 80240788 0C00A7B5 */ jal dist2D -/* 99597C 8024078C 8E070020 */ lw $a3, 0x20($s0) -/* 995980 80240790 3C0141F0 */ lui $at, 0x41f0 -/* 995984 80240794 44811000 */ mtc1 $at, $f2 -/* 995988 80240798 00000000 */ nop -/* 99598C 8024079C 4602003E */ c.le.s $f0, $f2 -/* 995990 802407A0 00000000 */ nop -/* 995994 802407A4 45000002 */ bc1f .L802407B0 -/* 995998 802407A8 24020003 */ addiu $v0, $zero, 3 -/* 99599C 802407AC A602004E */ sh $v0, 0x4e($s0) -.L802407B0: -/* 9959A0 802407B0 8E020054 */ lw $v0, 0x54($s0) -/* 9959A4 802407B4 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9959A8 802407B8 8C42000C */ lw $v0, 0xc($v0) -/* 9959AC 802407BC E4400004 */ swc1 $f0, 4($v0) -/* 9959B0 802407C0 8E020054 */ lw $v0, 0x54($s0) -/* 9959B4 802407C4 C6000004 */ lwc1 $f0, 4($s0) -/* 9959B8 802407C8 8C42000C */ lw $v0, 0xc($v0) -/* 9959BC 802407CC E4400008 */ swc1 $f0, 8($v0) -/* 9959C0 802407D0 8E020054 */ lw $v0, 0x54($s0) -/* 9959C4 802407D4 C6000020 */ lwc1 $f0, 0x20($s0) -/* 9959C8 802407D8 8C42000C */ lw $v0, 0xc($v0) -/* 9959CC 802407DC E440000C */ swc1 $f0, 0xc($v0) -/* 9959D0 802407E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9959D4 802407E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9959D8 802407E8 0000102D */ daddu $v0, $zero, $zero -/* 9959DC 802407EC 03E00008 */ jr $ra -/* 9959E0 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9959E4 802407F4 00000000 */ nop -/* 9959E8 802407F8 00000000 */ nop -/* 9959EC 802407FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s new file mode 100644 index 0000000000..2c631d5000 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_16/9951F0/func_80240708_9958F8.s @@ -0,0 +1,67 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240708_9958F8 +/* 9958F8 80240708 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9958FC 8024070C AFBF0014 */ sw $ra, 0x14($sp) +/* 995900 80240710 AFB00010 */ sw $s0, 0x10($sp) +/* 995904 80240714 8C900084 */ lw $s0, 0x84($a0) +/* 995908 80240718 8602004C */ lh $v0, 0x4c($s0) +/* 99590C 8024071C 44826000 */ mtc1 $v0, $f12 +/* 995910 80240720 00000000 */ nop +/* 995914 80240724 0C00A8BB */ jal sin_deg +/* 995918 80240728 46806320 */ cvt.s.w $f12, $f12 +/* 99591C 8024072C 3C013F80 */ lui $at, 0x3f80 +/* 995920 80240730 44811000 */ mtc1 $at, $f2 +/* 995924 80240734 00000000 */ nop +/* 995928 80240738 46020000 */ add.s $f0, $f0, $f2 +/* 99592C 8024073C 46000000 */ add.s $f0, $f0, $f0 +/* 995930 80240740 C6020024 */ lwc1 $f2, 0x24($s0) +/* 995934 80240744 8602004C */ lh $v0, 0x4c($s0) +/* 995938 80240748 46001080 */ add.s $f2, $f2, $f0 +/* 99593C 8024074C 24420008 */ addiu $v0, $v0, 8 +/* 995940 80240750 44826000 */ mtc1 $v0, $f12 +/* 995944 80240754 00000000 */ nop +/* 995948 80240758 46806320 */ cvt.s.w $f12, $f12 +/* 99594C 8024075C 0C00A6C9 */ jal clamp_angle +/* 995950 80240760 E6020004 */ swc1 $f2, 4($s0) +/* 995954 80240764 4600010D */ trunc.w.s $f4, $f0 +/* 995958 80240768 44022000 */ mfc1 $v0, $f4 +/* 99595C 8024076C 00000000 */ nop +/* 995960 80240770 A602004C */ sh $v0, 0x4c($s0) +/* 995964 80240774 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 995968 80240778 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 99596C 8024077C C44C0028 */ lwc1 $f12, 0x28($v0) +/* 995970 80240780 C44E0030 */ lwc1 $f14, 0x30($v0) +/* 995974 80240784 8E060018 */ lw $a2, 0x18($s0) +/* 995978 80240788 0C00A7B5 */ jal dist2D +/* 99597C 8024078C 8E070020 */ lw $a3, 0x20($s0) +/* 995980 80240790 3C0141F0 */ lui $at, 0x41f0 +/* 995984 80240794 44811000 */ mtc1 $at, $f2 +/* 995988 80240798 00000000 */ nop +/* 99598C 8024079C 4602003E */ c.le.s $f0, $f2 +/* 995990 802407A0 00000000 */ nop +/* 995994 802407A4 45000002 */ bc1f .L802407B0 +/* 995998 802407A8 24020003 */ addiu $v0, $zero, 3 +/* 99599C 802407AC A602004E */ sh $v0, 0x4e($s0) +.L802407B0: +/* 9959A0 802407B0 8E020054 */ lw $v0, 0x54($s0) +/* 9959A4 802407B4 C6000018 */ lwc1 $f0, 0x18($s0) +/* 9959A8 802407B8 8C42000C */ lw $v0, 0xc($v0) +/* 9959AC 802407BC E4400004 */ swc1 $f0, 4($v0) +/* 9959B0 802407C0 8E020054 */ lw $v0, 0x54($s0) +/* 9959B4 802407C4 C6000004 */ lwc1 $f0, 4($s0) +/* 9959B8 802407C8 8C42000C */ lw $v0, 0xc($v0) +/* 9959BC 802407CC E4400008 */ swc1 $f0, 8($v0) +/* 9959C0 802407D0 8E020054 */ lw $v0, 0x54($s0) +/* 9959C4 802407D4 C6000020 */ lwc1 $f0, 0x20($s0) +/* 9959C8 802407D8 8C42000C */ lw $v0, 0xc($v0) +/* 9959CC 802407DC E440000C */ swc1 $f0, 0xc($v0) +/* 9959D0 802407E0 8FBF0014 */ lw $ra, 0x14($sp) +/* 9959D4 802407E4 8FB00010 */ lw $s0, 0x10($sp) +/* 9959D8 802407E8 0000102D */ daddu $v0, $zero, $zero +/* 9959DC 802407EC 03E00008 */ jr $ra +/* 9959E0 802407F0 27BD0018 */ addiu $sp, $sp, 0x18 +/* 9959E4 802407F4 00000000 */ nop +/* 9959E8 802407F8 00000000 */ nop +/* 9959EC 802407FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924.s b/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924.s deleted file mode 100644 index 12b9e4dbb5..0000000000 --- a/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924.s +++ /dev/null @@ -1,128 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240924 -/* 995B14 80240924 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 995B18 80240928 AFB10034 */ sw $s1, 0x34($sp) -/* 995B1C 8024092C 0080882D */ daddu $s1, $a0, $zero -/* 995B20 80240930 AFBF0054 */ sw $ra, 0x54($sp) -/* 995B24 80240934 AFBE0050 */ sw $fp, 0x50($sp) -/* 995B28 80240938 AFB7004C */ sw $s7, 0x4c($sp) -/* 995B2C 8024093C AFB60048 */ sw $s6, 0x48($sp) -/* 995B30 80240940 AFB50044 */ sw $s5, 0x44($sp) -/* 995B34 80240944 AFB40040 */ sw $s4, 0x40($sp) -/* 995B38 80240948 AFB3003C */ sw $s3, 0x3c($sp) -/* 995B3C 8024094C AFB20038 */ sw $s2, 0x38($sp) -/* 995B40 80240950 AFB00030 */ sw $s0, 0x30($sp) -/* 995B44 80240954 8E30000C */ lw $s0, 0xc($s1) -/* 995B48 80240958 8E050000 */ lw $a1, ($s0) -/* 995B4C 8024095C 0C0B1EAF */ jal get_variable -/* 995B50 80240960 26100004 */ addiu $s0, $s0, 4 -/* 995B54 80240964 8E050000 */ lw $a1, ($s0) -/* 995B58 80240968 26100004 */ addiu $s0, $s0, 4 -/* 995B5C 8024096C 0220202D */ daddu $a0, $s1, $zero -/* 995B60 80240970 0C0B1EAF */ jal get_variable -/* 995B64 80240974 0040982D */ daddu $s3, $v0, $zero -/* 995B68 80240978 8E050000 */ lw $a1, ($s0) -/* 995B6C 8024097C 26100004 */ addiu $s0, $s0, 4 -/* 995B70 80240980 0220202D */ daddu $a0, $s1, $zero -/* 995B74 80240984 0C0B1EAF */ jal get_variable -/* 995B78 80240988 0040B02D */ daddu $s6, $v0, $zero -/* 995B7C 8024098C 8E050000 */ lw $a1, ($s0) -/* 995B80 80240990 26100004 */ addiu $s0, $s0, 4 -/* 995B84 80240994 0220202D */ daddu $a0, $s1, $zero -/* 995B88 80240998 0C0B1EAF */ jal get_variable -/* 995B8C 8024099C 0040A82D */ daddu $s5, $v0, $zero -/* 995B90 802409A0 8E050000 */ lw $a1, ($s0) -/* 995B94 802409A4 26100004 */ addiu $s0, $s0, 4 -/* 995B98 802409A8 0220202D */ daddu $a0, $s1, $zero -/* 995B9C 802409AC 0C0B1EAF */ jal get_variable -/* 995BA0 802409B0 0040A02D */ daddu $s4, $v0, $zero -/* 995BA4 802409B4 8E050000 */ lw $a1, ($s0) -/* 995BA8 802409B8 26100004 */ addiu $s0, $s0, 4 -/* 995BAC 802409BC 0220202D */ daddu $a0, $s1, $zero -/* 995BB0 802409C0 0C0B1EAF */ jal get_variable -/* 995BB4 802409C4 0040902D */ daddu $s2, $v0, $zero -/* 995BB8 802409C8 8E050000 */ lw $a1, ($s0) -/* 995BBC 802409CC 26100004 */ addiu $s0, $s0, 4 -/* 995BC0 802409D0 0220202D */ daddu $a0, $s1, $zero -/* 995BC4 802409D4 0C0B1EAF */ jal get_variable -/* 995BC8 802409D8 AFA20028 */ sw $v0, 0x28($sp) -/* 995BCC 802409DC 8E050000 */ lw $a1, ($s0) -/* 995BD0 802409E0 26100004 */ addiu $s0, $s0, 4 -/* 995BD4 802409E4 0220202D */ daddu $a0, $s1, $zero -/* 995BD8 802409E8 0C0B1EAF */ jal get_variable -/* 995BDC 802409EC 0040F02D */ daddu $fp, $v0, $zero -/* 995BE0 802409F0 8E050000 */ lw $a1, ($s0) -/* 995BE4 802409F4 26100004 */ addiu $s0, $s0, 4 -/* 995BE8 802409F8 0220202D */ daddu $a0, $s1, $zero -/* 995BEC 802409FC 0C0B1EAF */ jal get_variable -/* 995BF0 80240A00 0040B82D */ daddu $s7, $v0, $zero -/* 995BF4 80240A04 0220202D */ daddu $a0, $s1, $zero -/* 995BF8 80240A08 8E050000 */ lw $a1, ($s0) -/* 995BFC 80240A0C 0C0B1EAF */ jal get_variable -/* 995C00 80240A10 0040802D */ daddu $s0, $v0, $zero -/* 995C04 80240A14 0040182D */ daddu $v1, $v0, $zero -/* 995C08 80240A18 24020002 */ addiu $v0, $zero, 2 -/* 995C0C 80240A1C 12620012 */ beq $s3, $v0, .L80240A68 -/* 995C10 80240A20 2A620003 */ slti $v0, $s3, 3 -/* 995C14 80240A24 10400005 */ beqz $v0, .L80240A3C -/* 995C18 80240A28 24020001 */ addiu $v0, $zero, 1 -/* 995C1C 80240A2C 12620008 */ beq $s3, $v0, .L80240A50 -/* 995C20 80240A30 32C400FF */ andi $a0, $s6, 0xff -/* 995C24 80240A34 080902B1 */ j .L80240AC4 -/* 995C28 80240A38 00000000 */ nop -.L80240A3C: -/* 995C2C 80240A3C 24020003 */ addiu $v0, $zero, 3 -/* 995C30 80240A40 12620018 */ beq $s3, $v0, .L80240AA4 -/* 995C34 80240A44 32C400FF */ andi $a0, $s6, 0xff -/* 995C38 80240A48 080902B1 */ j .L80240AC4 -/* 995C3C 80240A4C 00000000 */ nop -.L80240A50: -/* 995C40 80240A50 32A500FF */ andi $a1, $s5, 0xff -/* 995C44 80240A54 328600FF */ andi $a2, $s4, 0xff -/* 995C48 80240A58 0C046F97 */ jal set_background_color_blend -/* 995C4C 80240A5C 324700FF */ andi $a3, $s2, 0xff -/* 995C50 80240A60 080902B1 */ j .L80240AC4 -/* 995C54 80240A64 00000000 */ nop -.L80240A68: -/* 995C58 80240A68 32C400FF */ andi $a0, $s6, 0xff -/* 995C5C 80240A6C 32A500FF */ andi $a1, $s5, 0xff -/* 995C60 80240A70 328600FF */ andi $a2, $s4, 0xff -/* 995C64 80240A74 324700FF */ andi $a3, $s2, 0xff -/* 995C68 80240A78 93A2002B */ lbu $v0, 0x2b($sp) -/* 995C6C 80240A7C AFB0001C */ sw $s0, 0x1c($sp) -/* 995C70 80240A80 AFA30020 */ sw $v1, 0x20($sp) -/* 995C74 80240A84 AFA20010 */ sw $v0, 0x10($sp) -/* 995C78 80240A88 33C200FF */ andi $v0, $fp, 0xff -/* 995C7C 80240A8C AFA20014 */ sw $v0, 0x14($sp) -/* 995C80 80240A90 32E200FF */ andi $v0, $s7, 0xff -/* 995C84 80240A94 0C046FAD */ jal func_8011BEB4 -/* 995C88 80240A98 AFA20018 */ sw $v0, 0x18($sp) -/* 995C8C 80240A9C 080902B1 */ j .L80240AC4 -/* 995C90 80240AA0 00000000 */ nop -.L80240AA4: -/* 995C94 80240AA4 32A500FF */ andi $a1, $s5, 0xff -/* 995C98 80240AA8 328600FF */ andi $a2, $s4, 0xff -/* 995C9C 80240AAC 324700FF */ andi $a3, $s2, 0xff -/* 995CA0 80240AB0 93A2002B */ lbu $v0, 0x2b($sp) -/* 995CA4 80240AB4 AFA20010 */ sw $v0, 0x10($sp) -/* 995CA8 80240AB8 33C200FF */ andi $v0, $fp, 0xff -/* 995CAC 80240ABC 0C046FE6 */ jal func_8011BF98 -/* 995CB0 80240AC0 AFA20014 */ sw $v0, 0x14($sp) -.L80240AC4: -/* 995CB4 80240AC4 8FBF0054 */ lw $ra, 0x54($sp) -/* 995CB8 80240AC8 8FBE0050 */ lw $fp, 0x50($sp) -/* 995CBC 80240ACC 8FB7004C */ lw $s7, 0x4c($sp) -/* 995CC0 80240AD0 8FB60048 */ lw $s6, 0x48($sp) -/* 995CC4 80240AD4 8FB50044 */ lw $s5, 0x44($sp) -/* 995CC8 80240AD8 8FB40040 */ lw $s4, 0x40($sp) -/* 995CCC 80240ADC 8FB3003C */ lw $s3, 0x3c($sp) -/* 995CD0 80240AE0 8FB20038 */ lw $s2, 0x38($sp) -/* 995CD4 80240AE4 8FB10034 */ lw $s1, 0x34($sp) -/* 995CD8 80240AE8 8FB00030 */ lw $s0, 0x30($sp) -/* 995CDC 80240AEC 24020002 */ addiu $v0, $zero, 2 -/* 995CE0 80240AF0 03E00008 */ jr $ra -/* 995CE4 80240AF4 27BD0058 */ addiu $sp, $sp, 0x58 -/* 995CE8 80240AF8 00000000 */ nop -/* 995CEC 80240AFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s b/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s new file mode 100644 index 0000000000..a46e110f89 --- /dev/null +++ b/asm/nonmatchings/world/area_isk/isk_16/9959F0/func_80240924_995B14.s @@ -0,0 +1,128 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240924_995B14 +/* 995B14 80240924 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* 995B18 80240928 AFB10034 */ sw $s1, 0x34($sp) +/* 995B1C 8024092C 0080882D */ daddu $s1, $a0, $zero +/* 995B20 80240930 AFBF0054 */ sw $ra, 0x54($sp) +/* 995B24 80240934 AFBE0050 */ sw $fp, 0x50($sp) +/* 995B28 80240938 AFB7004C */ sw $s7, 0x4c($sp) +/* 995B2C 8024093C AFB60048 */ sw $s6, 0x48($sp) +/* 995B30 80240940 AFB50044 */ sw $s5, 0x44($sp) +/* 995B34 80240944 AFB40040 */ sw $s4, 0x40($sp) +/* 995B38 80240948 AFB3003C */ sw $s3, 0x3c($sp) +/* 995B3C 8024094C AFB20038 */ sw $s2, 0x38($sp) +/* 995B40 80240950 AFB00030 */ sw $s0, 0x30($sp) +/* 995B44 80240954 8E30000C */ lw $s0, 0xc($s1) +/* 995B48 80240958 8E050000 */ lw $a1, ($s0) +/* 995B4C 8024095C 0C0B1EAF */ jal get_variable +/* 995B50 80240960 26100004 */ addiu $s0, $s0, 4 +/* 995B54 80240964 8E050000 */ lw $a1, ($s0) +/* 995B58 80240968 26100004 */ addiu $s0, $s0, 4 +/* 995B5C 8024096C 0220202D */ daddu $a0, $s1, $zero +/* 995B60 80240970 0C0B1EAF */ jal get_variable +/* 995B64 80240974 0040982D */ daddu $s3, $v0, $zero +/* 995B68 80240978 8E050000 */ lw $a1, ($s0) +/* 995B6C 8024097C 26100004 */ addiu $s0, $s0, 4 +/* 995B70 80240980 0220202D */ daddu $a0, $s1, $zero +/* 995B74 80240984 0C0B1EAF */ jal get_variable +/* 995B78 80240988 0040B02D */ daddu $s6, $v0, $zero +/* 995B7C 8024098C 8E050000 */ lw $a1, ($s0) +/* 995B80 80240990 26100004 */ addiu $s0, $s0, 4 +/* 995B84 80240994 0220202D */ daddu $a0, $s1, $zero +/* 995B88 80240998 0C0B1EAF */ jal get_variable +/* 995B8C 8024099C 0040A82D */ daddu $s5, $v0, $zero +/* 995B90 802409A0 8E050000 */ lw $a1, ($s0) +/* 995B94 802409A4 26100004 */ addiu $s0, $s0, 4 +/* 995B98 802409A8 0220202D */ daddu $a0, $s1, $zero +/* 995B9C 802409AC 0C0B1EAF */ jal get_variable +/* 995BA0 802409B0 0040A02D */ daddu $s4, $v0, $zero +/* 995BA4 802409B4 8E050000 */ lw $a1, ($s0) +/* 995BA8 802409B8 26100004 */ addiu $s0, $s0, 4 +/* 995BAC 802409BC 0220202D */ daddu $a0, $s1, $zero +/* 995BB0 802409C0 0C0B1EAF */ jal get_variable +/* 995BB4 802409C4 0040902D */ daddu $s2, $v0, $zero +/* 995BB8 802409C8 8E050000 */ lw $a1, ($s0) +/* 995BBC 802409CC 26100004 */ addiu $s0, $s0, 4 +/* 995BC0 802409D0 0220202D */ daddu $a0, $s1, $zero +/* 995BC4 802409D4 0C0B1EAF */ jal get_variable +/* 995BC8 802409D8 AFA20028 */ sw $v0, 0x28($sp) +/* 995BCC 802409DC 8E050000 */ lw $a1, ($s0) +/* 995BD0 802409E0 26100004 */ addiu $s0, $s0, 4 +/* 995BD4 802409E4 0220202D */ daddu $a0, $s1, $zero +/* 995BD8 802409E8 0C0B1EAF */ jal get_variable +/* 995BDC 802409EC 0040F02D */ daddu $fp, $v0, $zero +/* 995BE0 802409F0 8E050000 */ lw $a1, ($s0) +/* 995BE4 802409F4 26100004 */ addiu $s0, $s0, 4 +/* 995BE8 802409F8 0220202D */ daddu $a0, $s1, $zero +/* 995BEC 802409FC 0C0B1EAF */ jal get_variable +/* 995BF0 80240A00 0040B82D */ daddu $s7, $v0, $zero +/* 995BF4 80240A04 0220202D */ daddu $a0, $s1, $zero +/* 995BF8 80240A08 8E050000 */ lw $a1, ($s0) +/* 995BFC 80240A0C 0C0B1EAF */ jal get_variable +/* 995C00 80240A10 0040802D */ daddu $s0, $v0, $zero +/* 995C04 80240A14 0040182D */ daddu $v1, $v0, $zero +/* 995C08 80240A18 24020002 */ addiu $v0, $zero, 2 +/* 995C0C 80240A1C 12620012 */ beq $s3, $v0, .L80240A68 +/* 995C10 80240A20 2A620003 */ slti $v0, $s3, 3 +/* 995C14 80240A24 10400005 */ beqz $v0, .L80240A3C +/* 995C18 80240A28 24020001 */ addiu $v0, $zero, 1 +/* 995C1C 80240A2C 12620008 */ beq $s3, $v0, .L80240A50 +/* 995C20 80240A30 32C400FF */ andi $a0, $s6, 0xff +/* 995C24 80240A34 080902B1 */ j .L80240AC4 +/* 995C28 80240A38 00000000 */ nop +.L80240A3C: +/* 995C2C 80240A3C 24020003 */ addiu $v0, $zero, 3 +/* 995C30 80240A40 12620018 */ beq $s3, $v0, .L80240AA4 +/* 995C34 80240A44 32C400FF */ andi $a0, $s6, 0xff +/* 995C38 80240A48 080902B1 */ j .L80240AC4 +/* 995C3C 80240A4C 00000000 */ nop +.L80240A50: +/* 995C40 80240A50 32A500FF */ andi $a1, $s5, 0xff +/* 995C44 80240A54 328600FF */ andi $a2, $s4, 0xff +/* 995C48 80240A58 0C046F97 */ jal set_background_color_blend +/* 995C4C 80240A5C 324700FF */ andi $a3, $s2, 0xff +/* 995C50 80240A60 080902B1 */ j .L80240AC4 +/* 995C54 80240A64 00000000 */ nop +.L80240A68: +/* 995C58 80240A68 32C400FF */ andi $a0, $s6, 0xff +/* 995C5C 80240A6C 32A500FF */ andi $a1, $s5, 0xff +/* 995C60 80240A70 328600FF */ andi $a2, $s4, 0xff +/* 995C64 80240A74 324700FF */ andi $a3, $s2, 0xff +/* 995C68 80240A78 93A2002B */ lbu $v0, 0x2b($sp) +/* 995C6C 80240A7C AFB0001C */ sw $s0, 0x1c($sp) +/* 995C70 80240A80 AFA30020 */ sw $v1, 0x20($sp) +/* 995C74 80240A84 AFA20010 */ sw $v0, 0x10($sp) +/* 995C78 80240A88 33C200FF */ andi $v0, $fp, 0xff +/* 995C7C 80240A8C AFA20014 */ sw $v0, 0x14($sp) +/* 995C80 80240A90 32E200FF */ andi $v0, $s7, 0xff +/* 995C84 80240A94 0C046FAD */ jal func_8011BEB4 +/* 995C88 80240A98 AFA20018 */ sw $v0, 0x18($sp) +/* 995C8C 80240A9C 080902B1 */ j .L80240AC4 +/* 995C90 80240AA0 00000000 */ nop +.L80240AA4: +/* 995C94 80240AA4 32A500FF */ andi $a1, $s5, 0xff +/* 995C98 80240AA8 328600FF */ andi $a2, $s4, 0xff +/* 995C9C 80240AAC 324700FF */ andi $a3, $s2, 0xff +/* 995CA0 80240AB0 93A2002B */ lbu $v0, 0x2b($sp) +/* 995CA4 80240AB4 AFA20010 */ sw $v0, 0x10($sp) +/* 995CA8 80240AB8 33C200FF */ andi $v0, $fp, 0xff +/* 995CAC 80240ABC 0C046FE6 */ jal func_8011BF98 +/* 995CB0 80240AC0 AFA20014 */ sw $v0, 0x14($sp) +.L80240AC4: +/* 995CB4 80240AC4 8FBF0054 */ lw $ra, 0x54($sp) +/* 995CB8 80240AC8 8FBE0050 */ lw $fp, 0x50($sp) +/* 995CBC 80240ACC 8FB7004C */ lw $s7, 0x4c($sp) +/* 995CC0 80240AD0 8FB60048 */ lw $s6, 0x48($sp) +/* 995CC4 80240AD4 8FB50044 */ lw $s5, 0x44($sp) +/* 995CC8 80240AD8 8FB40040 */ lw $s4, 0x40($sp) +/* 995CCC 80240ADC 8FB3003C */ lw $s3, 0x3c($sp) +/* 995CD0 80240AE0 8FB20038 */ lw $s2, 0x38($sp) +/* 995CD4 80240AE4 8FB10034 */ lw $s1, 0x34($sp) +/* 995CD8 80240AE8 8FB00030 */ lw $s0, 0x30($sp) +/* 995CDC 80240AEC 24020002 */ addiu $v0, $zero, 2 +/* 995CE0 80240AF0 03E00008 */ jr $ra +/* 995CE4 80240AF4 27BD0058 */ addiu $sp, $sp, 0x58 +/* 995CE8 80240AF8 00000000 */ nop +/* 995CEC 80240AFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s index f4eb722b2e..4a394c7ccf 100644 --- a/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s +++ b/asm/nonmatchings/world/area_isk/isk_18/997F70/func_80240394_998304.s @@ -232,25 +232,25 @@ glabel func_80240394_998304 .L802406E4: /* 998654 802406E4 0260202D */ daddu $a0, $s3, $zero /* 998658 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 99865C 802406EC 0C090000 */ jal func_80240000 +/* 99865C 802406EC 0C090000 */ jal func_80240000_997F70 /* 998660 802406F0 02A0302D */ daddu $a2, $s5, $zero /* 998664 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: /* 998668 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 99866C 802406FC 0C09001F */ jal func_8024007C +/* 99866C 802406FC 0C09001F */ jal func_8024007C_997FEC /* 998670 80240700 02A0302D */ daddu $a2, $s5, $zero /* 998674 80240704 080901D0 */ j .L80240740 /* 998678 80240708 00000000 */ nop .L8024070C: /* 99867C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 998680 80240710 0280282D */ daddu $a1, $s4, $zero -/* 998684 80240714 0C09006C */ jal func_802401B0 +/* 998684 80240714 0C09006C */ jal func_802401B0_998120 /* 998688 80240718 02A0302D */ daddu $a2, $s5, $zero /* 99868C 8024071C 080901D0 */ j .L80240740 /* 998690 80240720 00000000 */ nop .L80240724: /* 998694 80240724 0280282D */ daddu $a1, $s4, $zero -/* 998698 80240728 0C0900C5 */ jal func_80240314 +/* 998698 80240728 0C0900C5 */ jal func_80240314_998284 /* 99869C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 9986A0 80240730 080901D0 */ j .L80240740 /* 9986A4 80240734 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0.s b/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0.s deleted file mode 100644 index 654605c936..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B0 -/* 90CEF0 802402B0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 90CEF4 802402B4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 90CEF8 802402B8 8C430000 */ lw $v1, ($v0) -/* 90CEFC 802402BC 8C840084 */ lw $a0, 0x84($a0) -/* 90CF00 802402C0 34630010 */ ori $v1, $v1, 0x10 -/* 90CF04 802402C4 AC4400D0 */ sw $a0, 0xd0($v0) -/* 90CF08 802402C8 AC430000 */ sw $v1, ($v0) -/* 90CF0C 802402CC 03E00008 */ jr $ra -/* 90CF10 802402D0 24020002 */ addiu $v0, $zero, 2 -/* 90CF14 802402D4 00000000 */ nop -/* 90CF18 802402D8 00000000 */ nop -/* 90CF1C 802402DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s b/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s new file mode 100644 index 0000000000..04f1321c81 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_00/90CEF0/func_802402B0_90CEF0.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402B0_90CEF0 +/* 90CEF0 802402B0 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 90CEF4 802402B4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 90CEF8 802402B8 8C430000 */ lw $v1, ($v0) +/* 90CEFC 802402BC 8C840084 */ lw $a0, 0x84($a0) +/* 90CF00 802402C0 34630010 */ ori $v1, $v1, 0x10 +/* 90CF04 802402C4 AC4400D0 */ sw $a0, 0xd0($v0) +/* 90CF08 802402C8 AC430000 */ sw $v1, ($v0) +/* 90CF0C 802402CC 03E00008 */ jr $ra +/* 90CF10 802402D0 24020002 */ addiu $v0, $zero, 2 +/* 90CF14 802402D4 00000000 */ nop +/* 90CF18 802402D8 00000000 */ nop +/* 90CF1C 802402DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398.s b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398.s deleted file mode 100644 index 21dc4b7d4a..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240398 -/* 90FA48 80240398 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 90FA4C 8024039C AFBF0024 */ sw $ra, 0x24($sp) -/* 90FA50 802403A0 AFB40020 */ sw $s4, 0x20($sp) -/* 90FA54 802403A4 AFB3001C */ sw $s3, 0x1c($sp) -/* 90FA58 802403A8 AFB20018 */ sw $s2, 0x18($sp) -/* 90FA5C 802403AC AFB10014 */ sw $s1, 0x14($sp) -/* 90FA60 802403B0 AFB00010 */ sw $s0, 0x10($sp) -/* 90FA64 802403B4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 90FA68 802403B8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 90FA6C 802403BC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 90FA70 802403C0 0C00AB39 */ jal heap_malloc -/* 90FA74 802403C4 24040320 */ addiu $a0, $zero, 0x320 -/* 90FA78 802403C8 0040982D */ daddu $s3, $v0, $zero -/* 90FA7C 802403CC 0000202D */ daddu $a0, $zero, $zero -/* 90FA80 802403D0 3C05FD05 */ lui $a1, 0xfd05 -/* 90FA84 802403D4 34A50F8F */ ori $a1, $a1, 0xf8f -/* 90FA88 802403D8 0C0B2026 */ jal set_variable -/* 90FA8C 802403DC 0260302D */ daddu $a2, $s3, $zero -/* 90FA90 802403E0 0000902D */ daddu $s2, $zero, $zero -/* 90FA94 802403E4 3C146666 */ lui $s4, 0x6666 -/* 90FA98 802403E8 36946667 */ ori $s4, $s4, 0x6667 -/* 90FA9C 802403EC 26700018 */ addiu $s0, $s3, 0x18 -/* 90FAA0 802403F0 0240882D */ daddu $s1, $s2, $zero -/* 90FAA4 802403F4 3C014120 */ lui $at, 0x4120 -/* 90FAA8 802403F8 4481C000 */ mtc1 $at, $f24 -/* 90FAAC 802403FC 3C018024 */ lui $at, 0x8024 -/* 90FAB0 80240400 D4346380 */ ldc1 $f20, 0x6380($at) -/* 90FAB4 80240404 3C013F80 */ lui $at, 0x3f80 -/* 90FAB8 80240408 4481B000 */ mtc1 $at, $f22 -.L8024040C: -/* 90FABC 8024040C 2404000A */ addiu $a0, $zero, 0xa -/* 90FAC0 80240410 02340018 */ mult $s1, $s4 -/* 90FAC4 80240414 00111FC3 */ sra $v1, $s1, 0x1f -/* 90FAC8 80240418 AE600000 */ sw $zero, ($s3) -/* 90FACC 8024041C AE00FFF0 */ sw $zero, -0x10($s0) -/* 90FAD0 80240420 AE000004 */ sw $zero, 4($s0) -/* 90FAD4 80240424 00003810 */ mfhi $a3 -/* 90FAD8 80240428 000710C3 */ sra $v0, $a3, 3 -/* 90FADC 8024042C 00431023 */ subu $v0, $v0, $v1 -/* 90FAE0 80240430 44820000 */ mtc1 $v0, $f0 -/* 90FAE4 80240434 00000000 */ nop -/* 90FAE8 80240438 46800020 */ cvt.s.w $f0, $f0 -/* 90FAEC 8024043C 0C00A67F */ jal rand_int -/* 90FAF0 80240440 E600FFEC */ swc1 $f0, -0x14($s0) -/* 90FAF4 80240444 44921000 */ mtc1 $s2, $f2 -/* 90FAF8 80240448 00000000 */ nop -/* 90FAFC 8024044C 468010A0 */ cvt.s.w $f2, $f2 -/* 90FB00 80240450 460010A1 */ cvt.d.s $f2, $f2 -/* 90FB04 80240454 46341082 */ mul.d $f2, $f2, $f20 -/* 90FB08 80240458 00000000 */ nop -/* 90FB0C 8024045C 2631FFE2 */ addiu $s1, $s1, -0x1e -/* 90FB10 80240460 26730028 */ addiu $s3, $s3, 0x28 -/* 90FB14 80240464 24040167 */ addiu $a0, $zero, 0x167 -/* 90FB18 80240468 26520001 */ addiu $s2, $s2, 1 -/* 90FB1C 8024046C 44820000 */ mtc1 $v0, $f0 -/* 90FB20 80240470 00000000 */ nop -/* 90FB24 80240474 46800020 */ cvt.s.w $f0, $f0 -/* 90FB28 80240478 46180003 */ div.s $f0, $f0, $f24 -/* 90FB2C 8024047C 46000021 */ cvt.d.s $f0, $f0 -/* 90FB30 80240480 46220001 */ sub.d $f0, $f0, $f2 -/* 90FB34 80240484 AE00000C */ sw $zero, 0xc($s0) -/* 90FB38 80240488 E616FFF4 */ swc1 $f22, -0xc($s0) -/* 90FB3C 8024048C 46200020 */ cvt.s.d $f0, $f0 -/* 90FB40 80240490 0C00A67F */ jal rand_int -/* 90FB44 80240494 E6000008 */ swc1 $f0, 8($s0) -/* 90FB48 80240498 24040167 */ addiu $a0, $zero, 0x167 -/* 90FB4C 8024049C 44820000 */ mtc1 $v0, $f0 -/* 90FB50 802404A0 00000000 */ nop -/* 90FB54 802404A4 46800020 */ cvt.s.w $f0, $f0 -/* 90FB58 802404A8 0C00A67F */ jal rand_int -/* 90FB5C 802404AC E600FFF8 */ swc1 $f0, -8($s0) -/* 90FB60 802404B0 24040167 */ addiu $a0, $zero, 0x167 -/* 90FB64 802404B4 44820000 */ mtc1 $v0, $f0 -/* 90FB68 802404B8 00000000 */ nop -/* 90FB6C 802404BC 46800020 */ cvt.s.w $f0, $f0 -/* 90FB70 802404C0 0C00A67F */ jal rand_int -/* 90FB74 802404C4 E600FFFC */ swc1 $f0, -4($s0) -/* 90FB78 802404C8 44820000 */ mtc1 $v0, $f0 -/* 90FB7C 802404CC 00000000 */ nop -/* 90FB80 802404D0 46800020 */ cvt.s.w $f0, $f0 -/* 90FB84 802404D4 E6000000 */ swc1 $f0, ($s0) -/* 90FB88 802404D8 2A420014 */ slti $v0, $s2, 0x14 -/* 90FB8C 802404DC 1440FFCB */ bnez $v0, .L8024040C -/* 90FB90 802404E0 26100028 */ addiu $s0, $s0, 0x28 -/* 90FB94 802404E4 8FBF0024 */ lw $ra, 0x24($sp) -/* 90FB98 802404E8 8FB40020 */ lw $s4, 0x20($sp) -/* 90FB9C 802404EC 8FB3001C */ lw $s3, 0x1c($sp) -/* 90FBA0 802404F0 8FB20018 */ lw $s2, 0x18($sp) -/* 90FBA4 802404F4 8FB10014 */ lw $s1, 0x14($sp) -/* 90FBA8 802404F8 8FB00010 */ lw $s0, 0x10($sp) -/* 90FBAC 802404FC D7B80038 */ ldc1 $f24, 0x38($sp) -/* 90FBB0 80240500 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 90FBB4 80240504 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 90FBB8 80240508 24020002 */ addiu $v0, $zero, 2 -/* 90FBBC 8024050C 03E00008 */ jr $ra -/* 90FBC0 80240510 27BD0040 */ addiu $sp, $sp, 0x40 -/* 90FBC4 80240514 00000000 */ nop -/* 90FBC8 80240518 00000000 */ nop -/* 90FBCC 8024051C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s new file mode 100644 index 0000000000..95cd2816be --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90F6B0/func_80240398_90FA48.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240398_90FA48 +/* 90FA48 80240398 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 90FA4C 8024039C AFBF0024 */ sw $ra, 0x24($sp) +/* 90FA50 802403A0 AFB40020 */ sw $s4, 0x20($sp) +/* 90FA54 802403A4 AFB3001C */ sw $s3, 0x1c($sp) +/* 90FA58 802403A8 AFB20018 */ sw $s2, 0x18($sp) +/* 90FA5C 802403AC AFB10014 */ sw $s1, 0x14($sp) +/* 90FA60 802403B0 AFB00010 */ sw $s0, 0x10($sp) +/* 90FA64 802403B4 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 90FA68 802403B8 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 90FA6C 802403BC F7B40028 */ sdc1 $f20, 0x28($sp) +/* 90FA70 802403C0 0C00AB39 */ jal heap_malloc +/* 90FA74 802403C4 24040320 */ addiu $a0, $zero, 0x320 +/* 90FA78 802403C8 0040982D */ daddu $s3, $v0, $zero +/* 90FA7C 802403CC 0000202D */ daddu $a0, $zero, $zero +/* 90FA80 802403D0 3C05FD05 */ lui $a1, 0xfd05 +/* 90FA84 802403D4 34A50F8F */ ori $a1, $a1, 0xf8f +/* 90FA88 802403D8 0C0B2026 */ jal set_variable +/* 90FA8C 802403DC 0260302D */ daddu $a2, $s3, $zero +/* 90FA90 802403E0 0000902D */ daddu $s2, $zero, $zero +/* 90FA94 802403E4 3C146666 */ lui $s4, 0x6666 +/* 90FA98 802403E8 36946667 */ ori $s4, $s4, 0x6667 +/* 90FA9C 802403EC 26700018 */ addiu $s0, $s3, 0x18 +/* 90FAA0 802403F0 0240882D */ daddu $s1, $s2, $zero +/* 90FAA4 802403F4 3C014120 */ lui $at, 0x4120 +/* 90FAA8 802403F8 4481C000 */ mtc1 $at, $f24 +/* 90FAAC 802403FC 3C018024 */ lui $at, 0x8024 +/* 90FAB0 80240400 D4346380 */ ldc1 $f20, 0x6380($at) +/* 90FAB4 80240404 3C013F80 */ lui $at, 0x3f80 +/* 90FAB8 80240408 4481B000 */ mtc1 $at, $f22 +.L8024040C: +/* 90FABC 8024040C 2404000A */ addiu $a0, $zero, 0xa +/* 90FAC0 80240410 02340018 */ mult $s1, $s4 +/* 90FAC4 80240414 00111FC3 */ sra $v1, $s1, 0x1f +/* 90FAC8 80240418 AE600000 */ sw $zero, ($s3) +/* 90FACC 8024041C AE00FFF0 */ sw $zero, -0x10($s0) +/* 90FAD0 80240420 AE000004 */ sw $zero, 4($s0) +/* 90FAD4 80240424 00003810 */ mfhi $a3 +/* 90FAD8 80240428 000710C3 */ sra $v0, $a3, 3 +/* 90FADC 8024042C 00431023 */ subu $v0, $v0, $v1 +/* 90FAE0 80240430 44820000 */ mtc1 $v0, $f0 +/* 90FAE4 80240434 00000000 */ nop +/* 90FAE8 80240438 46800020 */ cvt.s.w $f0, $f0 +/* 90FAEC 8024043C 0C00A67F */ jal rand_int +/* 90FAF0 80240440 E600FFEC */ swc1 $f0, -0x14($s0) +/* 90FAF4 80240444 44921000 */ mtc1 $s2, $f2 +/* 90FAF8 80240448 00000000 */ nop +/* 90FAFC 8024044C 468010A0 */ cvt.s.w $f2, $f2 +/* 90FB00 80240450 460010A1 */ cvt.d.s $f2, $f2 +/* 90FB04 80240454 46341082 */ mul.d $f2, $f2, $f20 +/* 90FB08 80240458 00000000 */ nop +/* 90FB0C 8024045C 2631FFE2 */ addiu $s1, $s1, -0x1e +/* 90FB10 80240460 26730028 */ addiu $s3, $s3, 0x28 +/* 90FB14 80240464 24040167 */ addiu $a0, $zero, 0x167 +/* 90FB18 80240468 26520001 */ addiu $s2, $s2, 1 +/* 90FB1C 8024046C 44820000 */ mtc1 $v0, $f0 +/* 90FB20 80240470 00000000 */ nop +/* 90FB24 80240474 46800020 */ cvt.s.w $f0, $f0 +/* 90FB28 80240478 46180003 */ div.s $f0, $f0, $f24 +/* 90FB2C 8024047C 46000021 */ cvt.d.s $f0, $f0 +/* 90FB30 80240480 46220001 */ sub.d $f0, $f0, $f2 +/* 90FB34 80240484 AE00000C */ sw $zero, 0xc($s0) +/* 90FB38 80240488 E616FFF4 */ swc1 $f22, -0xc($s0) +/* 90FB3C 8024048C 46200020 */ cvt.s.d $f0, $f0 +/* 90FB40 80240490 0C00A67F */ jal rand_int +/* 90FB44 80240494 E6000008 */ swc1 $f0, 8($s0) +/* 90FB48 80240498 24040167 */ addiu $a0, $zero, 0x167 +/* 90FB4C 8024049C 44820000 */ mtc1 $v0, $f0 +/* 90FB50 802404A0 00000000 */ nop +/* 90FB54 802404A4 46800020 */ cvt.s.w $f0, $f0 +/* 90FB58 802404A8 0C00A67F */ jal rand_int +/* 90FB5C 802404AC E600FFF8 */ swc1 $f0, -8($s0) +/* 90FB60 802404B0 24040167 */ addiu $a0, $zero, 0x167 +/* 90FB64 802404B4 44820000 */ mtc1 $v0, $f0 +/* 90FB68 802404B8 00000000 */ nop +/* 90FB6C 802404BC 46800020 */ cvt.s.w $f0, $f0 +/* 90FB70 802404C0 0C00A67F */ jal rand_int +/* 90FB74 802404C4 E600FFFC */ swc1 $f0, -4($s0) +/* 90FB78 802404C8 44820000 */ mtc1 $v0, $f0 +/* 90FB7C 802404CC 00000000 */ nop +/* 90FB80 802404D0 46800020 */ cvt.s.w $f0, $f0 +/* 90FB84 802404D4 E6000000 */ swc1 $f0, ($s0) +/* 90FB88 802404D8 2A420014 */ slti $v0, $s2, 0x14 +/* 90FB8C 802404DC 1440FFCB */ bnez $v0, .L8024040C +/* 90FB90 802404E0 26100028 */ addiu $s0, $s0, 0x28 +/* 90FB94 802404E4 8FBF0024 */ lw $ra, 0x24($sp) +/* 90FB98 802404E8 8FB40020 */ lw $s4, 0x20($sp) +/* 90FB9C 802404EC 8FB3001C */ lw $s3, 0x1c($sp) +/* 90FBA0 802404F0 8FB20018 */ lw $s2, 0x18($sp) +/* 90FBA4 802404F4 8FB10014 */ lw $s1, 0x14($sp) +/* 90FBA8 802404F8 8FB00010 */ lw $s0, 0x10($sp) +/* 90FBAC 802404FC D7B80038 */ ldc1 $f24, 0x38($sp) +/* 90FBB0 80240500 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 90FBB4 80240504 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 90FBB8 80240508 24020002 */ addiu $v0, $zero, 2 +/* 90FBBC 8024050C 03E00008 */ jr $ra +/* 90FBC0 80240510 27BD0040 */ addiu $sp, $sp, 0x40 +/* 90FBC4 80240514 00000000 */ nop +/* 90FBC8 80240518 00000000 */ nop +/* 90FBCC 8024051C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520.s deleted file mode 100644 index e1d882ab64..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240520 -/* 90FBD0 80240520 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 90FBD4 80240524 AFB10014 */ sw $s1, 0x14($sp) -/* 90FBD8 80240528 0080882D */ daddu $s1, $a0, $zero -/* 90FBDC 8024052C 3C05800B */ lui $a1, %hi(gCameras) -/* 90FBE0 80240530 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 90FBE4 80240534 AFBF0020 */ sw $ra, 0x20($sp) -/* 90FBE8 80240538 AFB3001C */ sw $s3, 0x1c($sp) -/* 90FBEC 8024053C AFB20018 */ sw $s2, 0x18($sp) -/* 90FBF0 80240540 AFB00010 */ sw $s0, 0x10($sp) -/* 90FBF4 80240544 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 90FBF8 80240548 8E330148 */ lw $s3, 0x148($s1) -/* 90FBFC 8024054C 3C03800A */ lui $v1, 0x800a -/* 90FC00 80240550 8463A634 */ lh $v1, -0x59cc($v1) -/* 90FC04 80240554 8E30000C */ lw $s0, 0xc($s1) -/* 90FC08 80240558 00031080 */ sll $v0, $v1, 2 -/* 90FC0C 8024055C 00431021 */ addu $v0, $v0, $v1 -/* 90FC10 80240560 00021080 */ sll $v0, $v0, 2 -/* 90FC14 80240564 00431023 */ subu $v0, $v0, $v1 -/* 90FC18 80240568 000218C0 */ sll $v1, $v0, 3 -/* 90FC1C 8024056C 00431021 */ addu $v0, $v0, $v1 -/* 90FC20 80240570 000210C0 */ sll $v0, $v0, 3 -/* 90FC24 80240574 86640008 */ lh $a0, 8($s3) -/* 90FC28 80240578 0C00EABB */ jal get_npc_unsafe -/* 90FC2C 8024057C 00459021 */ addu $s2, $v0, $a1 -/* 90FC30 80240580 0220202D */ daddu $a0, $s1, $zero -/* 90FC34 80240584 8E050000 */ lw $a1, ($s0) -/* 90FC38 80240588 0C0B1EAF */ jal get_variable -/* 90FC3C 8024058C 0040802D */ daddu $s0, $v0, $zero -/* 90FC40 80240590 0260202D */ daddu $a0, $s3, $zero -/* 90FC44 80240594 8C460024 */ lw $a2, 0x24($v0) -/* 90FC48 80240598 8C470028 */ lw $a3, 0x28($v0) -/* 90FC4C 8024059C 0C0124FB */ jal func_800493EC -/* 90FC50 802405A0 0000282D */ daddu $a1, $zero, $zero -/* 90FC54 802405A4 10400052 */ beqz $v0, .L802406F0 -/* 90FC58 802405A8 2402FFFF */ addiu $v0, $zero, -1 -/* 90FC5C 802405AC C64C006C */ lwc1 $f12, 0x6c($s2) -/* 90FC60 802405B0 C60E000C */ lwc1 $f14, 0xc($s0) -/* 90FC64 802405B4 3C014387 */ lui $at, 0x4387 -/* 90FC68 802405B8 4481A000 */ mtc1 $at, $f20 -/* 90FC6C 802405BC 0C00A70A */ jal get_clamped_angle_diff -/* 90FC70 802405C0 00000000 */ nop -/* 90FC74 802405C4 0C00A6C9 */ jal clamp_angle -/* 90FC78 802405C8 46000306 */ mov.s $f12, $f0 -/* 90FC7C 802405CC 3C018024 */ lui $at, 0x8024 -/* 90FC80 802405D0 D4226390 */ ldc1 $f2, 0x6390($at) -/* 90FC84 802405D4 46000021 */ cvt.d.s $f0, $f0 -/* 90FC88 802405D8 4622003C */ c.lt.d $f0, $f2 -/* 90FC8C 802405DC 00000000 */ nop -/* 90FC90 802405E0 45000003 */ bc1f .L802405F0 -/* 90FC94 802405E4 00000000 */ nop -/* 90FC98 802405E8 3C0142B4 */ lui $at, 0x42b4 -/* 90FC9C 802405EC 4481A000 */ mtc1 $at, $f20 -.L802405F0: -/* 90FCA0 802405F0 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* 90FCA4 802405F4 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* 90FCA8 802405F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 90FCAC 802405FC 8E220000 */ lw $v0, ($s1) -/* 90FCB0 80240600 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 90FCB4 80240604 8C460028 */ lw $a2, 0x28($v0) -/* 90FCB8 80240608 0C00A720 */ jal atan2 -/* 90FCBC 8024060C 8C470030 */ lw $a3, 0x30($v0) -/* 90FCC0 80240610 4600A306 */ mov.s $f12, $f20 -/* 90FCC4 80240614 0C00A70A */ jal get_clamped_angle_diff -/* 90FCC8 80240618 46000386 */ mov.s $f14, $f0 -/* 90FCCC 8024061C 46000005 */ abs.s $f0, $f0 -/* 90FCD0 80240620 3C018024 */ lui $at, 0x8024 -/* 90FCD4 80240624 D4226398 */ ldc1 $f2, 0x6398($at) -/* 90FCD8 80240628 46000021 */ cvt.d.s $f0, $f0 -/* 90FCDC 8024062C 4620103C */ c.lt.d $f2, $f0 -/* 90FCE0 80240630 00000000 */ nop -/* 90FCE4 80240634 4501002E */ bc1t .L802406F0 -/* 90FCE8 80240638 2402FFFF */ addiu $v0, $zero, -1 -/* 90FCEC 8024063C 8E220000 */ lw $v0, ($s1) -/* 90FCF0 80240640 C600003C */ lwc1 $f0, 0x3c($s0) -/* 90FCF4 80240644 C442002C */ lwc1 $f2, 0x2c($v0) -/* 90FCF8 80240648 860200A8 */ lh $v0, 0xa8($s0) -/* 90FCFC 8024064C 46020001 */ sub.s $f0, $f0, $f2 -/* 90FD00 80240650 44821000 */ mtc1 $v0, $f2 -/* 90FD04 80240654 00000000 */ nop -/* 90FD08 80240658 468010A1 */ cvt.d.w $f2, $f2 -/* 90FD0C 8024065C 46221080 */ add.d $f2, $f2, $f2 -/* 90FD10 80240660 46000005 */ abs.s $f0, $f0 -/* 90FD14 80240664 46000021 */ cvt.d.s $f0, $f0 -/* 90FD18 80240668 4620103E */ c.le.d $f2, $f0 -/* 90FD1C 8024066C 00000000 */ nop -/* 90FD20 80240670 4501001F */ bc1t .L802406F0 -/* 90FD24 80240674 2402FFFF */ addiu $v0, $zero, -1 -/* 90FD28 80240678 3C038011 */ lui $v1, 0x8011 -/* 90FD2C 8024067C 8063EBB3 */ lb $v1, -0x144d($v1) -/* 90FD30 80240680 24020009 */ addiu $v0, $zero, 9 -/* 90FD34 80240684 10620019 */ beq $v1, $v0, .L802406EC -/* 90FD38 80240688 24020007 */ addiu $v0, $zero, 7 -/* 90FD3C 8024068C 14620005 */ bne $v1, $v0, .L802406A4 -/* 90FD40 80240690 2402FFFF */ addiu $v0, $zero, -1 -/* 90FD44 80240694 080901BC */ j .L802406F0 -/* 90FD48 80240698 00000000 */ nop -.L8024069C: -/* 90FD4C 8024069C 080901BC */ j .L802406F0 -/* 90FD50 802406A0 0240102D */ daddu $v0, $s2, $zero -.L802406A4: -/* 90FD54 802406A4 8E620078 */ lw $v0, 0x78($s3) -/* 90FD58 802406A8 18400010 */ blez $v0, .L802406EC -/* 90FD5C 802406AC 0000882D */ daddu $s1, $zero, $zero -.L802406B0: -/* 90FD60 802406B0 86620008 */ lh $v0, 8($s3) -/* 90FD64 802406B4 00511021 */ addu $v0, $v0, $s1 -/* 90FD68 802406B8 24520001 */ addiu $s2, $v0, 1 -/* 90FD6C 802406BC 0C00FB3A */ jal get_enemy -/* 90FD70 802406C0 0240202D */ daddu $a0, $s2, $zero -/* 90FD74 802406C4 0240202D */ daddu $a0, $s2, $zero -/* 90FD78 802406C8 0C00EABB */ jal get_npc_unsafe -/* 90FD7C 802406CC 0040802D */ daddu $s0, $v0, $zero -/* 90FD80 802406D0 8E02006C */ lw $v0, 0x6c($s0) -/* 90FD84 802406D4 1040FFF1 */ beqz $v0, .L8024069C -/* 90FD88 802406D8 26310001 */ addiu $s1, $s1, 1 -/* 90FD8C 802406DC 8E620078 */ lw $v0, 0x78($s3) -/* 90FD90 802406E0 0222102A */ slt $v0, $s1, $v0 -/* 90FD94 802406E4 1440FFF2 */ bnez $v0, .L802406B0 -/* 90FD98 802406E8 00000000 */ nop -.L802406EC: -/* 90FD9C 802406EC 2402FFFF */ addiu $v0, $zero, -1 -.L802406F0: -/* 90FDA0 802406F0 8FBF0020 */ lw $ra, 0x20($sp) -/* 90FDA4 802406F4 8FB3001C */ lw $s3, 0x1c($sp) -/* 90FDA8 802406F8 8FB20018 */ lw $s2, 0x18($sp) -/* 90FDAC 802406FC 8FB10014 */ lw $s1, 0x14($sp) -/* 90FDB0 80240700 8FB00010 */ lw $s0, 0x10($sp) -/* 90FDB4 80240704 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 90FDB8 80240708 03E00008 */ jr $ra -/* 90FDBC 8024070C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s new file mode 100644 index 0000000000..33f0ab2417 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240520_90FBD0.s @@ -0,0 +1,134 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240520_90FBD0 +/* 90FBD0 80240520 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 90FBD4 80240524 AFB10014 */ sw $s1, 0x14($sp) +/* 90FBD8 80240528 0080882D */ daddu $s1, $a0, $zero +/* 90FBDC 8024052C 3C05800B */ lui $a1, %hi(gCameras) +/* 90FBE0 80240530 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 90FBE4 80240534 AFBF0020 */ sw $ra, 0x20($sp) +/* 90FBE8 80240538 AFB3001C */ sw $s3, 0x1c($sp) +/* 90FBEC 8024053C AFB20018 */ sw $s2, 0x18($sp) +/* 90FBF0 80240540 AFB00010 */ sw $s0, 0x10($sp) +/* 90FBF4 80240544 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 90FBF8 80240548 8E330148 */ lw $s3, 0x148($s1) +/* 90FBFC 8024054C 3C03800A */ lui $v1, 0x800a +/* 90FC00 80240550 8463A634 */ lh $v1, -0x59cc($v1) +/* 90FC04 80240554 8E30000C */ lw $s0, 0xc($s1) +/* 90FC08 80240558 00031080 */ sll $v0, $v1, 2 +/* 90FC0C 8024055C 00431021 */ addu $v0, $v0, $v1 +/* 90FC10 80240560 00021080 */ sll $v0, $v0, 2 +/* 90FC14 80240564 00431023 */ subu $v0, $v0, $v1 +/* 90FC18 80240568 000218C0 */ sll $v1, $v0, 3 +/* 90FC1C 8024056C 00431021 */ addu $v0, $v0, $v1 +/* 90FC20 80240570 000210C0 */ sll $v0, $v0, 3 +/* 90FC24 80240574 86640008 */ lh $a0, 8($s3) +/* 90FC28 80240578 0C00EABB */ jal get_npc_unsafe +/* 90FC2C 8024057C 00459021 */ addu $s2, $v0, $a1 +/* 90FC30 80240580 0220202D */ daddu $a0, $s1, $zero +/* 90FC34 80240584 8E050000 */ lw $a1, ($s0) +/* 90FC38 80240588 0C0B1EAF */ jal get_variable +/* 90FC3C 8024058C 0040802D */ daddu $s0, $v0, $zero +/* 90FC40 80240590 0260202D */ daddu $a0, $s3, $zero +/* 90FC44 80240594 8C460024 */ lw $a2, 0x24($v0) +/* 90FC48 80240598 8C470028 */ lw $a3, 0x28($v0) +/* 90FC4C 8024059C 0C0124FB */ jal func_800493EC +/* 90FC50 802405A0 0000282D */ daddu $a1, $zero, $zero +/* 90FC54 802405A4 10400052 */ beqz $v0, .L802406F0 +/* 90FC58 802405A8 2402FFFF */ addiu $v0, $zero, -1 +/* 90FC5C 802405AC C64C006C */ lwc1 $f12, 0x6c($s2) +/* 90FC60 802405B0 C60E000C */ lwc1 $f14, 0xc($s0) +/* 90FC64 802405B4 3C014387 */ lui $at, 0x4387 +/* 90FC68 802405B8 4481A000 */ mtc1 $at, $f20 +/* 90FC6C 802405BC 0C00A70A */ jal get_clamped_angle_diff +/* 90FC70 802405C0 00000000 */ nop +/* 90FC74 802405C4 0C00A6C9 */ jal clamp_angle +/* 90FC78 802405C8 46000306 */ mov.s $f12, $f0 +/* 90FC7C 802405CC 3C018024 */ lui $at, 0x8024 +/* 90FC80 802405D0 D4226390 */ ldc1 $f2, 0x6390($at) +/* 90FC84 802405D4 46000021 */ cvt.d.s $f0, $f0 +/* 90FC88 802405D8 4622003C */ c.lt.d $f0, $f2 +/* 90FC8C 802405DC 00000000 */ nop +/* 90FC90 802405E0 45000003 */ bc1f .L802405F0 +/* 90FC94 802405E4 00000000 */ nop +/* 90FC98 802405E8 3C0142B4 */ lui $at, 0x42b4 +/* 90FC9C 802405EC 4481A000 */ mtc1 $at, $f20 +.L802405F0: +/* 90FCA0 802405F0 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) +/* 90FCA4 802405F4 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) +/* 90FCA8 802405F8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 90FCAC 802405FC 8E220000 */ lw $v0, ($s1) +/* 90FCB0 80240600 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 90FCB4 80240604 8C460028 */ lw $a2, 0x28($v0) +/* 90FCB8 80240608 0C00A720 */ jal atan2 +/* 90FCBC 8024060C 8C470030 */ lw $a3, 0x30($v0) +/* 90FCC0 80240610 4600A306 */ mov.s $f12, $f20 +/* 90FCC4 80240614 0C00A70A */ jal get_clamped_angle_diff +/* 90FCC8 80240618 46000386 */ mov.s $f14, $f0 +/* 90FCCC 8024061C 46000005 */ abs.s $f0, $f0 +/* 90FCD0 80240620 3C018024 */ lui $at, 0x8024 +/* 90FCD4 80240624 D4226398 */ ldc1 $f2, 0x6398($at) +/* 90FCD8 80240628 46000021 */ cvt.d.s $f0, $f0 +/* 90FCDC 8024062C 4620103C */ c.lt.d $f2, $f0 +/* 90FCE0 80240630 00000000 */ nop +/* 90FCE4 80240634 4501002E */ bc1t .L802406F0 +/* 90FCE8 80240638 2402FFFF */ addiu $v0, $zero, -1 +/* 90FCEC 8024063C 8E220000 */ lw $v0, ($s1) +/* 90FCF0 80240640 C600003C */ lwc1 $f0, 0x3c($s0) +/* 90FCF4 80240644 C442002C */ lwc1 $f2, 0x2c($v0) +/* 90FCF8 80240648 860200A8 */ lh $v0, 0xa8($s0) +/* 90FCFC 8024064C 46020001 */ sub.s $f0, $f0, $f2 +/* 90FD00 80240650 44821000 */ mtc1 $v0, $f2 +/* 90FD04 80240654 00000000 */ nop +/* 90FD08 80240658 468010A1 */ cvt.d.w $f2, $f2 +/* 90FD0C 8024065C 46221080 */ add.d $f2, $f2, $f2 +/* 90FD10 80240660 46000005 */ abs.s $f0, $f0 +/* 90FD14 80240664 46000021 */ cvt.d.s $f0, $f0 +/* 90FD18 80240668 4620103E */ c.le.d $f2, $f0 +/* 90FD1C 8024066C 00000000 */ nop +/* 90FD20 80240670 4501001F */ bc1t .L802406F0 +/* 90FD24 80240674 2402FFFF */ addiu $v0, $zero, -1 +/* 90FD28 80240678 3C038011 */ lui $v1, 0x8011 +/* 90FD2C 8024067C 8063EBB3 */ lb $v1, -0x144d($v1) +/* 90FD30 80240680 24020009 */ addiu $v0, $zero, 9 +/* 90FD34 80240684 10620019 */ beq $v1, $v0, .L802406EC +/* 90FD38 80240688 24020007 */ addiu $v0, $zero, 7 +/* 90FD3C 8024068C 14620005 */ bne $v1, $v0, .L802406A4 +/* 90FD40 80240690 2402FFFF */ addiu $v0, $zero, -1 +/* 90FD44 80240694 080901BC */ j .L802406F0 +/* 90FD48 80240698 00000000 */ nop +.L8024069C: +/* 90FD4C 8024069C 080901BC */ j .L802406F0 +/* 90FD50 802406A0 0240102D */ daddu $v0, $s2, $zero +.L802406A4: +/* 90FD54 802406A4 8E620078 */ lw $v0, 0x78($s3) +/* 90FD58 802406A8 18400010 */ blez $v0, .L802406EC +/* 90FD5C 802406AC 0000882D */ daddu $s1, $zero, $zero +.L802406B0: +/* 90FD60 802406B0 86620008 */ lh $v0, 8($s3) +/* 90FD64 802406B4 00511021 */ addu $v0, $v0, $s1 +/* 90FD68 802406B8 24520001 */ addiu $s2, $v0, 1 +/* 90FD6C 802406BC 0C00FB3A */ jal get_enemy +/* 90FD70 802406C0 0240202D */ daddu $a0, $s2, $zero +/* 90FD74 802406C4 0240202D */ daddu $a0, $s2, $zero +/* 90FD78 802406C8 0C00EABB */ jal get_npc_unsafe +/* 90FD7C 802406CC 0040802D */ daddu $s0, $v0, $zero +/* 90FD80 802406D0 8E02006C */ lw $v0, 0x6c($s0) +/* 90FD84 802406D4 1040FFF1 */ beqz $v0, .L8024069C +/* 90FD88 802406D8 26310001 */ addiu $s1, $s1, 1 +/* 90FD8C 802406DC 8E620078 */ lw $v0, 0x78($s3) +/* 90FD90 802406E0 0222102A */ slt $v0, $s1, $v0 +/* 90FD94 802406E4 1440FFF2 */ bnez $v0, .L802406B0 +/* 90FD98 802406E8 00000000 */ nop +.L802406EC: +/* 90FD9C 802406EC 2402FFFF */ addiu $v0, $zero, -1 +.L802406F0: +/* 90FDA0 802406F0 8FBF0020 */ lw $ra, 0x20($sp) +/* 90FDA4 802406F4 8FB3001C */ lw $s3, 0x1c($sp) +/* 90FDA8 802406F8 8FB20018 */ lw $s2, 0x18($sp) +/* 90FDAC 802406FC 8FB10014 */ lw $s1, 0x14($sp) +/* 90FDB0 80240700 8FB00010 */ lw $s0, 0x10($sp) +/* 90FDB4 80240704 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 90FDB8 80240708 03E00008 */ jr $ra +/* 90FDBC 8024070C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s index d8f1265e3b..2a833b7a83 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240710_90FDC0.s @@ -55,7 +55,7 @@ glabel func_80240710_90FDC0 /* 90FE88 802407D8 0809020C */ j .L80240830 /* 90FE8C 802407DC AE030028 */ sw $v1, 0x28($s0) .L802407E0: -/* 90FE90 802407E0 0C090148 */ jal func_80240520 +/* 90FE90 802407E0 0C090148 */ jal func_80240520_90FBD0 /* 90FE94 802407E4 0240202D */ daddu $a0, $s2, $zero /* 90FE98 802407E8 0040202D */ daddu $a0, $v0, $zero /* 90FE9C 802407EC 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854.s deleted file mode 100644 index fd92474397..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240854 -/* 90FF04 80240854 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 90FF08 80240858 AFB20038 */ sw $s2, 0x38($sp) -/* 90FF0C 8024085C 0080902D */ daddu $s2, $a0, $zero -/* 90FF10 80240860 AFBF003C */ sw $ra, 0x3c($sp) -/* 90FF14 80240864 AFB10034 */ sw $s1, 0x34($sp) -/* 90FF18 80240868 AFB00030 */ sw $s0, 0x30($sp) -/* 90FF1C 8024086C 8E510148 */ lw $s1, 0x148($s2) -/* 90FF20 80240870 0C00EABB */ jal get_npc_unsafe -/* 90FF24 80240874 86240008 */ lh $a0, 8($s1) -/* 90FF28 80240878 0040802D */ daddu $s0, $v0, $zero -/* 90FF2C 8024087C 9602008E */ lhu $v0, 0x8e($s0) -/* 90FF30 80240880 2442FFFF */ addiu $v0, $v0, -1 -/* 90FF34 80240884 A602008E */ sh $v0, 0x8e($s0) -/* 90FF38 80240888 00021400 */ sll $v0, $v0, 0x10 -/* 90FF3C 8024088C 1C40002B */ bgtz $v0, .L8024093C -/* 90FF40 80240890 00000000 */ nop -/* 90FF44 80240894 0C090148 */ jal func_80240520 -/* 90FF48 80240898 0240202D */ daddu $a0, $s2, $zero -/* 90FF4C 8024089C 0040202D */ daddu $a0, $v0, $zero -/* 90FF50 802408A0 0481001A */ bgez $a0, .L8024090C -/* 90FF54 802408A4 2402000F */ addiu $v0, $zero, 0xf -/* 90FF58 802408A8 24040002 */ addiu $a0, $zero, 2 -/* 90FF5C 802408AC 860300A8 */ lh $v1, 0xa8($s0) -/* 90FF60 802408B0 AFA2001C */ sw $v0, 0x1c($sp) -/* 90FF64 802408B4 27A20028 */ addiu $v0, $sp, 0x28 -/* 90FF68 802408B8 0200282D */ daddu $a1, $s0, $zero -/* 90FF6C 802408BC 3C013F80 */ lui $at, 0x3f80 -/* 90FF70 802408C0 44810000 */ mtc1 $at, $f0 -/* 90FF74 802408C4 3C014000 */ lui $at, 0x4000 -/* 90FF78 802408C8 44811000 */ mtc1 $at, $f2 -/* 90FF7C 802408CC 3C01C1A0 */ lui $at, 0xc1a0 -/* 90FF80 802408D0 44812000 */ mtc1 $at, $f4 -/* 90FF84 802408D4 44833000 */ mtc1 $v1, $f6 -/* 90FF88 802408D8 00000000 */ nop -/* 90FF8C 802408DC 468031A0 */ cvt.s.w $f6, $f6 -/* 90FF90 802408E0 44073000 */ mfc1 $a3, $f6 -/* 90FF94 802408E4 0000302D */ daddu $a2, $zero, $zero -/* 90FF98 802408E8 AFA20020 */ sw $v0, 0x20($sp) -/* 90FF9C 802408EC E7A00010 */ swc1 $f0, 0x10($sp) -/* 90FFA0 802408F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 90FFA4 802408F4 0C01BFA4 */ jal fx_emote -/* 90FFA8 802408F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 90FFAC 802408FC 8E2200CC */ lw $v0, 0xcc($s1) -/* 90FFB0 80240900 8C420000 */ lw $v0, ($v0) -/* 90FFB4 80240904 0809024B */ j .L8024092C -/* 90FFB8 80240908 AE020028 */ sw $v0, 0x28($s0) -.L8024090C: -/* 90FFBC 8024090C 8E2200CC */ lw $v0, 0xcc($s1) -/* 90FFC0 80240910 8C420024 */ lw $v0, 0x24($v0) -/* 90FFC4 80240914 0C00FB3A */ jal get_enemy -/* 90FFC8 80240918 AE020028 */ sw $v0, 0x28($s0) -/* 90FFCC 8024091C 86240008 */ lh $a0, 8($s1) -/* 90FFD0 80240920 24030001 */ addiu $v1, $zero, 1 -/* 90FFD4 80240924 AC43006C */ sw $v1, 0x6c($v0) -/* 90FFD8 80240928 AC44007C */ sw $a0, 0x7c($v0) -.L8024092C: -/* 90FFDC 8024092C 96220076 */ lhu $v0, 0x76($s1) -/* 90FFE0 80240930 A602008E */ sh $v0, 0x8e($s0) -/* 90FFE4 80240934 24020021 */ addiu $v0, $zero, 0x21 -/* 90FFE8 80240938 AE420070 */ sw $v0, 0x70($s2) -.L8024093C: -/* 90FFEC 8024093C 8FBF003C */ lw $ra, 0x3c($sp) -/* 90FFF0 80240940 8FB20038 */ lw $s2, 0x38($sp) -/* 90FFF4 80240944 8FB10034 */ lw $s1, 0x34($sp) -/* 90FFF8 80240948 8FB00030 */ lw $s0, 0x30($sp) -/* 90FFFC 8024094C 03E00008 */ jr $ra -/* 910000 80240950 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s new file mode 100644 index 0000000000..7d26b2e095 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240854_90FF04.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240854_90FF04 +/* 90FF04 80240854 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 90FF08 80240858 AFB20038 */ sw $s2, 0x38($sp) +/* 90FF0C 8024085C 0080902D */ daddu $s2, $a0, $zero +/* 90FF10 80240860 AFBF003C */ sw $ra, 0x3c($sp) +/* 90FF14 80240864 AFB10034 */ sw $s1, 0x34($sp) +/* 90FF18 80240868 AFB00030 */ sw $s0, 0x30($sp) +/* 90FF1C 8024086C 8E510148 */ lw $s1, 0x148($s2) +/* 90FF20 80240870 0C00EABB */ jal get_npc_unsafe +/* 90FF24 80240874 86240008 */ lh $a0, 8($s1) +/* 90FF28 80240878 0040802D */ daddu $s0, $v0, $zero +/* 90FF2C 8024087C 9602008E */ lhu $v0, 0x8e($s0) +/* 90FF30 80240880 2442FFFF */ addiu $v0, $v0, -1 +/* 90FF34 80240884 A602008E */ sh $v0, 0x8e($s0) +/* 90FF38 80240888 00021400 */ sll $v0, $v0, 0x10 +/* 90FF3C 8024088C 1C40002B */ bgtz $v0, .L8024093C +/* 90FF40 80240890 00000000 */ nop +/* 90FF44 80240894 0C090148 */ jal func_80240520_90FBD0 +/* 90FF48 80240898 0240202D */ daddu $a0, $s2, $zero +/* 90FF4C 8024089C 0040202D */ daddu $a0, $v0, $zero +/* 90FF50 802408A0 0481001A */ bgez $a0, .L8024090C +/* 90FF54 802408A4 2402000F */ addiu $v0, $zero, 0xf +/* 90FF58 802408A8 24040002 */ addiu $a0, $zero, 2 +/* 90FF5C 802408AC 860300A8 */ lh $v1, 0xa8($s0) +/* 90FF60 802408B0 AFA2001C */ sw $v0, 0x1c($sp) +/* 90FF64 802408B4 27A20028 */ addiu $v0, $sp, 0x28 +/* 90FF68 802408B8 0200282D */ daddu $a1, $s0, $zero +/* 90FF6C 802408BC 3C013F80 */ lui $at, 0x3f80 +/* 90FF70 802408C0 44810000 */ mtc1 $at, $f0 +/* 90FF74 802408C4 3C014000 */ lui $at, 0x4000 +/* 90FF78 802408C8 44811000 */ mtc1 $at, $f2 +/* 90FF7C 802408CC 3C01C1A0 */ lui $at, 0xc1a0 +/* 90FF80 802408D0 44812000 */ mtc1 $at, $f4 +/* 90FF84 802408D4 44833000 */ mtc1 $v1, $f6 +/* 90FF88 802408D8 00000000 */ nop +/* 90FF8C 802408DC 468031A0 */ cvt.s.w $f6, $f6 +/* 90FF90 802408E0 44073000 */ mfc1 $a3, $f6 +/* 90FF94 802408E4 0000302D */ daddu $a2, $zero, $zero +/* 90FF98 802408E8 AFA20020 */ sw $v0, 0x20($sp) +/* 90FF9C 802408EC E7A00010 */ swc1 $f0, 0x10($sp) +/* 90FFA0 802408F0 E7A20014 */ swc1 $f2, 0x14($sp) +/* 90FFA4 802408F4 0C01BFA4 */ jal fx_emote +/* 90FFA8 802408F8 E7A40018 */ swc1 $f4, 0x18($sp) +/* 90FFAC 802408FC 8E2200CC */ lw $v0, 0xcc($s1) +/* 90FFB0 80240900 8C420000 */ lw $v0, ($v0) +/* 90FFB4 80240904 0809024B */ j .L8024092C +/* 90FFB8 80240908 AE020028 */ sw $v0, 0x28($s0) +.L8024090C: +/* 90FFBC 8024090C 8E2200CC */ lw $v0, 0xcc($s1) +/* 90FFC0 80240910 8C420024 */ lw $v0, 0x24($v0) +/* 90FFC4 80240914 0C00FB3A */ jal get_enemy +/* 90FFC8 80240918 AE020028 */ sw $v0, 0x28($s0) +/* 90FFCC 8024091C 86240008 */ lh $a0, 8($s1) +/* 90FFD0 80240920 24030001 */ addiu $v1, $zero, 1 +/* 90FFD4 80240924 AC43006C */ sw $v1, 0x6c($v0) +/* 90FFD8 80240928 AC44007C */ sw $a0, 0x7c($v0) +.L8024092C: +/* 90FFDC 8024092C 96220076 */ lhu $v0, 0x76($s1) +/* 90FFE0 80240930 A602008E */ sh $v0, 0x8e($s0) +/* 90FFE4 80240934 24020021 */ addiu $v0, $zero, 0x21 +/* 90FFE8 80240938 AE420070 */ sw $v0, 0x70($s2) +.L8024093C: +/* 90FFEC 8024093C 8FBF003C */ lw $ra, 0x3c($sp) +/* 90FFF0 80240940 8FB20038 */ lw $s2, 0x38($sp) +/* 90FFF4 80240944 8FB10034 */ lw $s1, 0x34($sp) +/* 90FFF8 80240948 8FB00030 */ lw $s0, 0x30($sp) +/* 90FFFC 8024094C 03E00008 */ jr $ra +/* 910000 80240950 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954.s deleted file mode 100644 index c58b1df7a5..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240954 -/* 910004 80240954 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 910008 80240958 AFB10014 */ sw $s1, 0x14($sp) -/* 91000C 8024095C 0080882D */ daddu $s1, $a0, $zero -/* 910010 80240960 AFBF0018 */ sw $ra, 0x18($sp) -/* 910014 80240964 AFB00010 */ sw $s0, 0x10($sp) -/* 910018 80240968 8E300148 */ lw $s0, 0x148($s1) -/* 91001C 8024096C 0C00EABB */ jal get_npc_unsafe -/* 910020 80240970 86040008 */ lh $a0, 8($s0) -/* 910024 80240974 96030076 */ lhu $v1, 0x76($s0) -/* 910028 80240978 A443008E */ sh $v1, 0x8e($v0) -/* 91002C 8024097C 24020021 */ addiu $v0, $zero, 0x21 -/* 910030 80240980 AE220070 */ sw $v0, 0x70($s1) -/* 910034 80240984 8FBF0018 */ lw $ra, 0x18($sp) -/* 910038 80240988 8FB10014 */ lw $s1, 0x14($sp) -/* 91003C 8024098C 8FB00010 */ lw $s0, 0x10($sp) -/* 910040 80240990 03E00008 */ jr $ra -/* 910044 80240994 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s new file mode 100644 index 0000000000..e936bd2749 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240954_910004.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240954_910004 +/* 910004 80240954 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 910008 80240958 AFB10014 */ sw $s1, 0x14($sp) +/* 91000C 8024095C 0080882D */ daddu $s1, $a0, $zero +/* 910010 80240960 AFBF0018 */ sw $ra, 0x18($sp) +/* 910014 80240964 AFB00010 */ sw $s0, 0x10($sp) +/* 910018 80240968 8E300148 */ lw $s0, 0x148($s1) +/* 91001C 8024096C 0C00EABB */ jal get_npc_unsafe +/* 910020 80240970 86040008 */ lh $a0, 8($s0) +/* 910024 80240974 96030076 */ lhu $v1, 0x76($s0) +/* 910028 80240978 A443008E */ sh $v1, 0x8e($v0) +/* 91002C 8024097C 24020021 */ addiu $v0, $zero, 0x21 +/* 910030 80240980 AE220070 */ sw $v0, 0x70($s1) +/* 910034 80240984 8FBF0018 */ lw $ra, 0x18($sp) +/* 910038 80240988 8FB10014 */ lw $s1, 0x14($sp) +/* 91003C 8024098C 8FB00010 */ lw $s0, 0x10($sp) +/* 910040 80240990 03E00008 */ jr $ra +/* 910044 80240994 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998.s deleted file mode 100644 index 7091f95087..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240998 -/* 910048 80240998 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 91004C 8024099C AFB3001C */ sw $s3, 0x1c($sp) -/* 910050 802409A0 0080982D */ daddu $s3, $a0, $zero -/* 910054 802409A4 AFBF0020 */ sw $ra, 0x20($sp) -/* 910058 802409A8 AFB20018 */ sw $s2, 0x18($sp) -/* 91005C 802409AC AFB10014 */ sw $s1, 0x14($sp) -/* 910060 802409B0 AFB00010 */ sw $s0, 0x10($sp) -/* 910064 802409B4 8E720148 */ lw $s2, 0x148($s3) -/* 910068 802409B8 0C00EABB */ jal get_npc_unsafe -/* 91006C 802409BC 86440008 */ lh $a0, 8($s2) -/* 910070 802409C0 86440008 */ lh $a0, 8($s2) -/* 910074 802409C4 0040882D */ daddu $s1, $v0, $zero -/* 910078 802409C8 0C00FB3A */ jal get_enemy -/* 91007C 802409CC 24840001 */ addiu $a0, $a0, 1 -/* 910080 802409D0 0040802D */ daddu $s0, $v0, $zero -/* 910084 802409D4 0C00EABB */ jal get_npc_unsafe -/* 910088 802409D8 86040008 */ lh $a0, 8($s0) -/* 91008C 802409DC C62C0038 */ lwc1 $f12, 0x38($s1) -/* 910090 802409E0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 910094 802409E4 8C460038 */ lw $a2, 0x38($v0) -/* 910098 802409E8 0C00A720 */ jal atan2 -/* 91009C 802409EC 8C470040 */ lw $a3, 0x40($v0) -/* 9100A0 802409F0 E620000C */ swc1 $f0, 0xc($s1) -/* 9100A4 802409F4 8E02006C */ lw $v0, 0x6c($s0) -/* 9100A8 802409F8 14400008 */ bnez $v0, .L80240A1C -/* 9100AC 802409FC 00000000 */ nop -/* 9100B0 80240A00 8E4200CC */ lw $v0, 0xcc($s2) -/* 9100B4 80240A04 8C420000 */ lw $v0, ($v0) -/* 9100B8 80240A08 AE220028 */ sw $v0, 0x28($s1) -/* 9100BC 80240A0C 96420076 */ lhu $v0, 0x76($s2) -/* 9100C0 80240A10 A622008E */ sh $v0, 0x8e($s1) -/* 9100C4 80240A14 24020021 */ addiu $v0, $zero, 0x21 -/* 9100C8 80240A18 AE620070 */ sw $v0, 0x70($s3) -.L80240A1C: -/* 9100CC 80240A1C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9100D0 80240A20 8FB3001C */ lw $s3, 0x1c($sp) -/* 9100D4 80240A24 8FB20018 */ lw $s2, 0x18($sp) -/* 9100D8 80240A28 8FB10014 */ lw $s1, 0x14($sp) -/* 9100DC 80240A2C 8FB00010 */ lw $s0, 0x10($sp) -/* 9100E0 80240A30 03E00008 */ jr $ra -/* 9100E4 80240A34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998_910048.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998_910048.s new file mode 100644 index 0000000000..9f880e84ba --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80240998_910048.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240998_910048 +/* 910048 80240998 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 91004C 8024099C AFB3001C */ sw $s3, 0x1c($sp) +/* 910050 802409A0 0080982D */ daddu $s3, $a0, $zero +/* 910054 802409A4 AFBF0020 */ sw $ra, 0x20($sp) +/* 910058 802409A8 AFB20018 */ sw $s2, 0x18($sp) +/* 91005C 802409AC AFB10014 */ sw $s1, 0x14($sp) +/* 910060 802409B0 AFB00010 */ sw $s0, 0x10($sp) +/* 910064 802409B4 8E720148 */ lw $s2, 0x148($s3) +/* 910068 802409B8 0C00EABB */ jal get_npc_unsafe +/* 91006C 802409BC 86440008 */ lh $a0, 8($s2) +/* 910070 802409C0 86440008 */ lh $a0, 8($s2) +/* 910074 802409C4 0040882D */ daddu $s1, $v0, $zero +/* 910078 802409C8 0C00FB3A */ jal get_enemy +/* 91007C 802409CC 24840001 */ addiu $a0, $a0, 1 +/* 910080 802409D0 0040802D */ daddu $s0, $v0, $zero +/* 910084 802409D4 0C00EABB */ jal get_npc_unsafe +/* 910088 802409D8 86040008 */ lh $a0, 8($s0) +/* 91008C 802409DC C62C0038 */ lwc1 $f12, 0x38($s1) +/* 910090 802409E0 C62E0040 */ lwc1 $f14, 0x40($s1) +/* 910094 802409E4 8C460038 */ lw $a2, 0x38($v0) +/* 910098 802409E8 0C00A720 */ jal atan2 +/* 91009C 802409EC 8C470040 */ lw $a3, 0x40($v0) +/* 9100A0 802409F0 E620000C */ swc1 $f0, 0xc($s1) +/* 9100A4 802409F4 8E02006C */ lw $v0, 0x6c($s0) +/* 9100A8 802409F8 14400008 */ bnez $v0, .L80240A1C +/* 9100AC 802409FC 00000000 */ nop +/* 9100B0 80240A00 8E4200CC */ lw $v0, 0xcc($s2) +/* 9100B4 80240A04 8C420000 */ lw $v0, ($v0) +/* 9100B8 80240A08 AE220028 */ sw $v0, 0x28($s1) +/* 9100BC 80240A0C 96420076 */ lhu $v0, 0x76($s2) +/* 9100C0 80240A10 A622008E */ sh $v0, 0x8e($s1) +/* 9100C4 80240A14 24020021 */ addiu $v0, $zero, 0x21 +/* 9100C8 80240A18 AE620070 */ sw $v0, 0x70($s3) +.L80240A1C: +/* 9100CC 80240A1C 8FBF0020 */ lw $ra, 0x20($sp) +/* 9100D0 80240A20 8FB3001C */ lw $s3, 0x1c($sp) +/* 9100D4 80240A24 8FB20018 */ lw $s2, 0x18($sp) +/* 9100D8 80240A28 8FB10014 */ lw $s1, 0x14($sp) +/* 9100DC 80240A2C 8FB00010 */ lw $s0, 0x10($sp) +/* 9100E0 80240A30 03E00008 */ jr $ra +/* 9100E4 80240A34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0.s deleted file mode 100644 index 5327258872..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0.s +++ /dev/null @@ -1,74 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415E0 -/* 910C90 802415E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 910C94 802415E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 910C98 802415E8 0080982D */ daddu $s3, $a0, $zero -/* 910C9C 802415EC AFBF0020 */ sw $ra, 0x20($sp) -/* 910CA0 802415F0 AFB20018 */ sw $s2, 0x18($sp) -/* 910CA4 802415F4 AFB10014 */ sw $s1, 0x14($sp) -/* 910CA8 802415F8 AFB00010 */ sw $s0, 0x10($sp) -/* 910CAC 802415FC 8E710148 */ lw $s1, 0x148($s3) -/* 910CB0 80241600 86240008 */ lh $a0, 8($s1) -/* 910CB4 80241604 0C00EABB */ jal get_npc_unsafe -/* 910CB8 80241608 00A0902D */ daddu $s2, $a1, $zero -/* 910CBC 8024160C 8E440004 */ lw $a0, 4($s2) -/* 910CC0 80241610 0040802D */ daddu $s0, $v0, $zero -/* 910CC4 80241614 00041FC2 */ srl $v1, $a0, 0x1f -/* 910CC8 80241618 00832021 */ addu $a0, $a0, $v1 -/* 910CCC 8024161C 00042043 */ sra $a0, $a0, 1 -/* 910CD0 80241620 0C00A67F */ jal rand_int -/* 910CD4 80241624 24840001 */ addiu $a0, $a0, 1 -/* 910CD8 80241628 8E430004 */ lw $v1, 4($s2) -/* 910CDC 8024162C 2404003C */ addiu $a0, $zero, 0x3c -/* 910CE0 80241630 00032FC2 */ srl $a1, $v1, 0x1f -/* 910CE4 80241634 00651821 */ addu $v1, $v1, $a1 -/* 910CE8 80241638 00031843 */ sra $v1, $v1, 1 -/* 910CEC 8024163C 00621821 */ addu $v1, $v1, $v0 -/* 910CF0 80241640 0C00A67F */ jal rand_int -/* 910CF4 80241644 A603008E */ sh $v1, 0x8e($s0) -/* 910CF8 80241648 C60C000C */ lwc1 $f12, 0xc($s0) -/* 910CFC 8024164C 44820000 */ mtc1 $v0, $f0 -/* 910D00 80241650 00000000 */ nop -/* 910D04 80241654 46800020 */ cvt.s.w $f0, $f0 -/* 910D08 80241658 46006300 */ add.s $f12, $f12, $f0 -/* 910D0C 8024165C 3C0141F0 */ lui $at, 0x41f0 -/* 910D10 80241660 44810000 */ mtc1 $at, $f0 -/* 910D14 80241664 0C00A6C9 */ jal clamp_angle -/* 910D18 80241668 46006301 */ sub.s $f12, $f12, $f0 -/* 910D1C 8024166C E600000C */ swc1 $f0, 0xc($s0) -/* 910D20 80241670 8E2200D0 */ lw $v0, 0xd0($s1) -/* 910D24 80241674 8C420014 */ lw $v0, 0x14($v0) -/* 910D28 80241678 04410004 */ bgez $v0, .L8024168C -/* 910D2C 8024167C 00000000 */ nop -/* 910D30 80241680 C6400000 */ lwc1 $f0, ($s2) -/* 910D34 80241684 080905AB */ j .L802416AC -/* 910D38 80241688 E6000018 */ swc1 $f0, 0x18($s0) -.L8024168C: -/* 910D3C 8024168C 3C018024 */ lui $at, 0x8024 -/* 910D40 80241690 D42263C8 */ ldc1 $f2, 0x63c8($at) -/* 910D44 80241694 44820000 */ mtc1 $v0, $f0 -/* 910D48 80241698 00000000 */ nop -/* 910D4C 8024169C 46800021 */ cvt.d.w $f0, $f0 -/* 910D50 802416A0 46220003 */ div.d $f0, $f0, $f2 -/* 910D54 802416A4 46200020 */ cvt.s.d $f0, $f0 -/* 910D58 802416A8 E6000018 */ swc1 $f0, 0x18($s0) -.L802416AC: -/* 910D5C 802416AC 8E220000 */ lw $v0, ($s1) -/* 910D60 802416B0 3C031F10 */ lui $v1, 0x1f10 -/* 910D64 802416B4 00431025 */ or $v0, $v0, $v1 -/* 910D68 802416B8 AE220000 */ sw $v0, ($s1) -/* 910D6C 802416BC 8E020000 */ lw $v0, ($s0) -/* 910D70 802416C0 34420002 */ ori $v0, $v0, 2 -/* 910D74 802416C4 AE020000 */ sw $v0, ($s0) -/* 910D78 802416C8 24020001 */ addiu $v0, $zero, 1 -/* 910D7C 802416CC AE600074 */ sw $zero, 0x74($s3) -/* 910D80 802416D0 AE620070 */ sw $v0, 0x70($s3) -/* 910D84 802416D4 8FBF0020 */ lw $ra, 0x20($sp) -/* 910D88 802416D8 8FB3001C */ lw $s3, 0x1c($sp) -/* 910D8C 802416DC 8FB20018 */ lw $s2, 0x18($sp) -/* 910D90 802416E0 8FB10014 */ lw $s1, 0x14($sp) -/* 910D94 802416E4 8FB00010 */ lw $s0, 0x10($sp) -/* 910D98 802416E8 03E00008 */ jr $ra -/* 910D9C 802416EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s new file mode 100644 index 0000000000..4dd64d08a9 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802415E0_910C90.s @@ -0,0 +1,74 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415E0_910C90 +/* 910C90 802415E0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 910C94 802415E4 AFB3001C */ sw $s3, 0x1c($sp) +/* 910C98 802415E8 0080982D */ daddu $s3, $a0, $zero +/* 910C9C 802415EC AFBF0020 */ sw $ra, 0x20($sp) +/* 910CA0 802415F0 AFB20018 */ sw $s2, 0x18($sp) +/* 910CA4 802415F4 AFB10014 */ sw $s1, 0x14($sp) +/* 910CA8 802415F8 AFB00010 */ sw $s0, 0x10($sp) +/* 910CAC 802415FC 8E710148 */ lw $s1, 0x148($s3) +/* 910CB0 80241600 86240008 */ lh $a0, 8($s1) +/* 910CB4 80241604 0C00EABB */ jal get_npc_unsafe +/* 910CB8 80241608 00A0902D */ daddu $s2, $a1, $zero +/* 910CBC 8024160C 8E440004 */ lw $a0, 4($s2) +/* 910CC0 80241610 0040802D */ daddu $s0, $v0, $zero +/* 910CC4 80241614 00041FC2 */ srl $v1, $a0, 0x1f +/* 910CC8 80241618 00832021 */ addu $a0, $a0, $v1 +/* 910CCC 8024161C 00042043 */ sra $a0, $a0, 1 +/* 910CD0 80241620 0C00A67F */ jal rand_int +/* 910CD4 80241624 24840001 */ addiu $a0, $a0, 1 +/* 910CD8 80241628 8E430004 */ lw $v1, 4($s2) +/* 910CDC 8024162C 2404003C */ addiu $a0, $zero, 0x3c +/* 910CE0 80241630 00032FC2 */ srl $a1, $v1, 0x1f +/* 910CE4 80241634 00651821 */ addu $v1, $v1, $a1 +/* 910CE8 80241638 00031843 */ sra $v1, $v1, 1 +/* 910CEC 8024163C 00621821 */ addu $v1, $v1, $v0 +/* 910CF0 80241640 0C00A67F */ jal rand_int +/* 910CF4 80241644 A603008E */ sh $v1, 0x8e($s0) +/* 910CF8 80241648 C60C000C */ lwc1 $f12, 0xc($s0) +/* 910CFC 8024164C 44820000 */ mtc1 $v0, $f0 +/* 910D00 80241650 00000000 */ nop +/* 910D04 80241654 46800020 */ cvt.s.w $f0, $f0 +/* 910D08 80241658 46006300 */ add.s $f12, $f12, $f0 +/* 910D0C 8024165C 3C0141F0 */ lui $at, 0x41f0 +/* 910D10 80241660 44810000 */ mtc1 $at, $f0 +/* 910D14 80241664 0C00A6C9 */ jal clamp_angle +/* 910D18 80241668 46006301 */ sub.s $f12, $f12, $f0 +/* 910D1C 8024166C E600000C */ swc1 $f0, 0xc($s0) +/* 910D20 80241670 8E2200D0 */ lw $v0, 0xd0($s1) +/* 910D24 80241674 8C420014 */ lw $v0, 0x14($v0) +/* 910D28 80241678 04410004 */ bgez $v0, .L8024168C +/* 910D2C 8024167C 00000000 */ nop +/* 910D30 80241680 C6400000 */ lwc1 $f0, ($s2) +/* 910D34 80241684 080905AB */ j .L802416AC +/* 910D38 80241688 E6000018 */ swc1 $f0, 0x18($s0) +.L8024168C: +/* 910D3C 8024168C 3C018024 */ lui $at, 0x8024 +/* 910D40 80241690 D42263C8 */ ldc1 $f2, 0x63c8($at) +/* 910D44 80241694 44820000 */ mtc1 $v0, $f0 +/* 910D48 80241698 00000000 */ nop +/* 910D4C 8024169C 46800021 */ cvt.d.w $f0, $f0 +/* 910D50 802416A0 46220003 */ div.d $f0, $f0, $f2 +/* 910D54 802416A4 46200020 */ cvt.s.d $f0, $f0 +/* 910D58 802416A8 E6000018 */ swc1 $f0, 0x18($s0) +.L802416AC: +/* 910D5C 802416AC 8E220000 */ lw $v0, ($s1) +/* 910D60 802416B0 3C031F10 */ lui $v1, 0x1f10 +/* 910D64 802416B4 00431025 */ or $v0, $v0, $v1 +/* 910D68 802416B8 AE220000 */ sw $v0, ($s1) +/* 910D6C 802416BC 8E020000 */ lw $v0, ($s0) +/* 910D70 802416C0 34420002 */ ori $v0, $v0, 2 +/* 910D74 802416C4 AE020000 */ sw $v0, ($s0) +/* 910D78 802416C8 24020001 */ addiu $v0, $zero, 1 +/* 910D7C 802416CC AE600074 */ sw $zero, 0x74($s3) +/* 910D80 802416D0 AE620070 */ sw $v0, 0x70($s3) +/* 910D84 802416D4 8FBF0020 */ lw $ra, 0x20($sp) +/* 910D88 802416D8 8FB3001C */ lw $s3, 0x1c($sp) +/* 910D8C 802416DC 8FB20018 */ lw $s2, 0x18($sp) +/* 910D90 802416E0 8FB10014 */ lw $s1, 0x14($sp) +/* 910D94 802416E4 8FB00010 */ lw $s0, 0x10($sp) +/* 910D98 802416E8 03E00008 */ jr $ra +/* 910D9C 802416EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0.s deleted file mode 100644 index 78a31375bc..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0.s +++ /dev/null @@ -1,155 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F0 -/* 910DA0 802416F0 27BDFC80 */ addiu $sp, $sp, -0x380 -/* 910DA4 802416F4 AFB20370 */ sw $s2, 0x370($sp) -/* 910DA8 802416F8 0080902D */ daddu $s2, $a0, $zero -/* 910DAC 802416FC AFBF037C */ sw $ra, 0x37c($sp) -/* 910DB0 80241700 AFB40378 */ sw $s4, 0x378($sp) -/* 910DB4 80241704 AFB30374 */ sw $s3, 0x374($sp) -/* 910DB8 80241708 AFB1036C */ sw $s1, 0x36c($sp) -/* 910DBC 8024170C AFB00368 */ sw $s0, 0x368($sp) -/* 910DC0 80241710 8E510148 */ lw $s1, 0x148($s2) -/* 910DC4 80241714 00A0982D */ daddu $s3, $a1, $zero -/* 910DC8 80241718 86240008 */ lh $a0, 8($s1) -/* 910DCC 8024171C 0C00EABB */ jal get_npc_unsafe -/* 910DD0 80241720 00C0A02D */ daddu $s4, $a2, $zero -/* 910DD4 80241724 0040802D */ daddu $s0, $v0, $zero -/* 910DD8 80241728 8E2300D0 */ lw $v1, 0xd0($s1) -/* 910DDC 8024172C C6000040 */ lwc1 $f0, 0x40($s0) -/* 910DE0 80241730 C4620000 */ lwc1 $f2, ($v1) -/* 910DE4 80241734 468010A0 */ cvt.s.w $f2, $f2 -/* 910DE8 80241738 C4640008 */ lwc1 $f4, 8($v1) -/* 910DEC 8024173C 46802120 */ cvt.s.w $f4, $f4 -/* 910DF0 80241740 E7A00010 */ swc1 $f0, 0x10($sp) -/* 910DF4 80241744 8E2200D0 */ lw $v0, 0xd0($s1) -/* 910DF8 80241748 44051000 */ mfc1 $a1, $f2 -/* 910DFC 8024174C C440000C */ lwc1 $f0, 0xc($v0) -/* 910E00 80241750 46800020 */ cvt.s.w $f0, $f0 -/* 910E04 80241754 E7A00014 */ swc1 $f0, 0x14($sp) -/* 910E08 80241758 8E2200D0 */ lw $v0, 0xd0($s1) -/* 910E0C 8024175C 44062000 */ mfc1 $a2, $f4 -/* 910E10 80241760 C4400010 */ lwc1 $f0, 0x10($v0) -/* 910E14 80241764 46800020 */ cvt.s.w $f0, $f0 -/* 910E18 80241768 E7A00018 */ swc1 $f0, 0x18($sp) -/* 910E1C 8024176C 8C640018 */ lw $a0, 0x18($v1) -/* 910E20 80241770 0C0123F5 */ jal is_point_within_region -/* 910E24 80241774 8E070038 */ lw $a3, 0x38($s0) -/* 910E28 80241778 1040000D */ beqz $v0, .L802417B0 -/* 910E2C 8024177C 00000000 */ nop -/* 910E30 80241780 8E2200D0 */ lw $v0, 0xd0($s1) -/* 910E34 80241784 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 910E38 80241788 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 910E3C 8024178C C4460000 */ lwc1 $f6, ($v0) -/* 910E40 80241790 468031A0 */ cvt.s.w $f6, $f6 -/* 910E44 80241794 44063000 */ mfc1 $a2, $f6 -/* 910E48 80241798 C4460008 */ lwc1 $f6, 8($v0) -/* 910E4C 8024179C 468031A0 */ cvt.s.w $f6, $f6 -/* 910E50 802417A0 44073000 */ mfc1 $a3, $f6 -/* 910E54 802417A4 0C00A720 */ jal atan2 -/* 910E58 802417A8 00000000 */ nop -/* 910E5C 802417AC E600000C */ swc1 $f0, 0xc($s0) -.L802417B0: -/* 910E60 802417B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 910E64 802417B4 3C013F80 */ lui $at, 0x3f80 -/* 910E68 802417B8 44811000 */ mtc1 $at, $f2 -/* 910E6C 802417BC E7A00058 */ swc1 $f0, 0x58($sp) -/* 910E70 802417C0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 910E74 802417C4 46020000 */ add.s $f0, $f0, $f2 -/* 910E78 802417C8 E7A0005C */ swc1 $f0, 0x5c($sp) -/* 910E7C 802417CC C6000040 */ lwc1 $f0, 0x40($s0) -/* 910E80 802417D0 E7A00060 */ swc1 $f0, 0x60($sp) -/* 910E84 802417D4 860200A6 */ lh $v0, 0xa6($s0) -/* 910E88 802417D8 C6020018 */ lwc1 $f2, 0x18($s0) -/* 910E8C 802417DC 44820000 */ mtc1 $v0, $f0 -/* 910E90 802417E0 00000000 */ nop -/* 910E94 802417E4 46800020 */ cvt.s.w $f0, $f0 -/* 910E98 802417E8 46001080 */ add.s $f2, $f2, $f0 -/* 910E9C 802417EC 8E06000C */ lw $a2, 0xc($s0) -/* 910EA0 802417F0 44051000 */ mfc1 $a1, $f2 -/* 910EA4 802417F4 0C00EA95 */ jal npc_move_heading -/* 910EA8 802417F8 27A40020 */ addiu $a0, $sp, 0x20 -/* 910EAC 802417FC 0000202D */ daddu $a0, $zero, $zero -/* 910EB0 80241800 27A50058 */ addiu $a1, $sp, 0x58 -/* 910EB4 80241804 27A6005C */ addiu $a2, $sp, 0x5c -/* 910EB8 80241808 27A70060 */ addiu $a3, $sp, 0x60 -/* 910EBC 8024180C 3C01447A */ lui $at, 0x447a -/* 910EC0 80241810 44810000 */ mtc1 $at, $f0 -/* 910EC4 80241814 27A20360 */ addiu $v0, $sp, 0x360 -/* 910EC8 80241818 E7A00360 */ swc1 $f0, 0x360($sp) -/* 910ECC 8024181C 0C0372DF */ jal func_800DCB7C -/* 910ED0 80241820 AFA20010 */ sw $v0, 0x10($sp) -/* 910ED4 80241824 1040000D */ beqz $v0, .L8024185C -/* 910ED8 80241828 00000000 */ nop -/* 910EDC 8024182C C7A20360 */ lwc1 $f2, 0x360($sp) -/* 910EE0 80241830 3C0140A0 */ lui $at, 0x40a0 -/* 910EE4 80241834 44810000 */ mtc1 $at, $f0 -/* 910EE8 80241838 00000000 */ nop -/* 910EEC 8024183C 4600103C */ c.lt.s $f2, $f0 -/* 910EF0 80241840 00000000 */ nop -/* 910EF4 80241844 45000005 */ bc1f .L8024185C -/* 910EF8 80241848 00000000 */ nop -/* 910EFC 8024184C 8E050018 */ lw $a1, 0x18($s0) -/* 910F00 80241850 8E06000C */ lw $a2, 0xc($s0) -/* 910F04 80241854 0C00EA95 */ jal npc_move_heading -/* 910F08 80241858 0200202D */ daddu $a0, $s0, $zero -.L8024185C: -/* 910F0C 8024185C 8E020000 */ lw $v0, ($s0) -/* 910F10 80241860 30424000 */ andi $v0, $v0, 0x4000 -/* 910F14 80241864 54400001 */ bnel $v0, $zero, .L8024186C -/* 910F18 80241868 AE400070 */ sw $zero, 0x70($s2) -.L8024186C: -/* 910F1C 8024186C 8E630014 */ lw $v1, 0x14($s3) -/* 910F20 80241870 04600012 */ bltz $v1, .L802418BC -/* 910F24 80241874 00000000 */ nop -/* 910F28 80241878 8E420074 */ lw $v0, 0x74($s2) -/* 910F2C 8024187C 1C40000E */ bgtz $v0, .L802418B8 -/* 910F30 80241880 2442FFFF */ addiu $v0, $v0, -1 -/* 910F34 80241884 0240202D */ daddu $a0, $s2, $zero -/* 910F38 80241888 AE430074 */ sw $v1, 0x74($s2) -/* 910F3C 8024188C 8E66000C */ lw $a2, 0xc($s3) -/* 910F40 80241890 8E670010 */ lw $a3, 0x10($s3) -/* 910F44 80241894 0C090505 */ jal func_80241414 -/* 910F48 80241898 0280282D */ daddu $a1, $s4, $zero -/* 910F4C 8024189C 10400004 */ beqz $v0, .L802418B0 -/* 910F50 802418A0 2402000C */ addiu $v0, $zero, 0xc -/* 910F54 802418A4 A600008E */ sh $zero, 0x8e($s0) -/* 910F58 802418A8 08090643 */ j .L8024190C -/* 910F5C 802418AC AE420070 */ sw $v0, 0x70($s2) -.L802418B0: -/* 910F60 802418B0 8E420074 */ lw $v0, 0x74($s2) -/* 910F64 802418B4 2442FFFF */ addiu $v0, $v0, -1 -.L802418B8: -/* 910F68 802418B8 AE420074 */ sw $v0, 0x74($s2) -.L802418BC: -/* 910F6C 802418BC 8E020000 */ lw $v0, ($s0) -/* 910F70 802418C0 30421008 */ andi $v0, $v0, 0x1008 -/* 910F74 802418C4 1440000B */ bnez $v0, .L802418F4 -/* 910F78 802418C8 00000000 */ nop -/* 910F7C 802418CC C6000038 */ lwc1 $f0, 0x38($s0) -/* 910F80 802418D0 C6020040 */ lwc1 $f2, 0x40($s0) -/* 910F84 802418D4 4600018D */ trunc.w.s $f6, $f0 -/* 910F88 802418D8 44023000 */ mfc1 $v0, $f6 -/* 910F8C 802418DC 00000000 */ nop -/* 910F90 802418E0 A6020090 */ sh $v0, 0x90($s0) -/* 910F94 802418E4 4600118D */ trunc.w.s $f6, $f2 -/* 910F98 802418E8 44023000 */ mfc1 $v0, $f6 -/* 910F9C 802418EC 00000000 */ nop -/* 910FA0 802418F0 A6020094 */ sh $v0, 0x94($s0) -.L802418F4: -/* 910FA4 802418F4 9602008E */ lhu $v0, 0x8e($s0) -/* 910FA8 802418F8 2442FFFF */ addiu $v0, $v0, -1 -/* 910FAC 802418FC A602008E */ sh $v0, 0x8e($s0) -/* 910FB0 80241900 00021400 */ sll $v0, $v0, 0x10 -/* 910FB4 80241904 50400001 */ beql $v0, $zero, .L8024190C -/* 910FB8 80241908 AE400070 */ sw $zero, 0x70($s2) -.L8024190C: -/* 910FBC 8024190C 8FBF037C */ lw $ra, 0x37c($sp) -/* 910FC0 80241910 8FB40378 */ lw $s4, 0x378($sp) -/* 910FC4 80241914 8FB30374 */ lw $s3, 0x374($sp) -/* 910FC8 80241918 8FB20370 */ lw $s2, 0x370($sp) -/* 910FCC 8024191C 8FB1036C */ lw $s1, 0x36c($sp) -/* 910FD0 80241920 8FB00368 */ lw $s0, 0x368($sp) -/* 910FD4 80241924 03E00008 */ jr $ra -/* 910FD8 80241928 27BD0380 */ addiu $sp, $sp, 0x380 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s new file mode 100644 index 0000000000..56f9d9dcf3 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802416F0_910DA0.s @@ -0,0 +1,155 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416F0_910DA0 +/* 910DA0 802416F0 27BDFC80 */ addiu $sp, $sp, -0x380 +/* 910DA4 802416F4 AFB20370 */ sw $s2, 0x370($sp) +/* 910DA8 802416F8 0080902D */ daddu $s2, $a0, $zero +/* 910DAC 802416FC AFBF037C */ sw $ra, 0x37c($sp) +/* 910DB0 80241700 AFB40378 */ sw $s4, 0x378($sp) +/* 910DB4 80241704 AFB30374 */ sw $s3, 0x374($sp) +/* 910DB8 80241708 AFB1036C */ sw $s1, 0x36c($sp) +/* 910DBC 8024170C AFB00368 */ sw $s0, 0x368($sp) +/* 910DC0 80241710 8E510148 */ lw $s1, 0x148($s2) +/* 910DC4 80241714 00A0982D */ daddu $s3, $a1, $zero +/* 910DC8 80241718 86240008 */ lh $a0, 8($s1) +/* 910DCC 8024171C 0C00EABB */ jal get_npc_unsafe +/* 910DD0 80241720 00C0A02D */ daddu $s4, $a2, $zero +/* 910DD4 80241724 0040802D */ daddu $s0, $v0, $zero +/* 910DD8 80241728 8E2300D0 */ lw $v1, 0xd0($s1) +/* 910DDC 8024172C C6000040 */ lwc1 $f0, 0x40($s0) +/* 910DE0 80241730 C4620000 */ lwc1 $f2, ($v1) +/* 910DE4 80241734 468010A0 */ cvt.s.w $f2, $f2 +/* 910DE8 80241738 C4640008 */ lwc1 $f4, 8($v1) +/* 910DEC 8024173C 46802120 */ cvt.s.w $f4, $f4 +/* 910DF0 80241740 E7A00010 */ swc1 $f0, 0x10($sp) +/* 910DF4 80241744 8E2200D0 */ lw $v0, 0xd0($s1) +/* 910DF8 80241748 44051000 */ mfc1 $a1, $f2 +/* 910DFC 8024174C C440000C */ lwc1 $f0, 0xc($v0) +/* 910E00 80241750 46800020 */ cvt.s.w $f0, $f0 +/* 910E04 80241754 E7A00014 */ swc1 $f0, 0x14($sp) +/* 910E08 80241758 8E2200D0 */ lw $v0, 0xd0($s1) +/* 910E0C 8024175C 44062000 */ mfc1 $a2, $f4 +/* 910E10 80241760 C4400010 */ lwc1 $f0, 0x10($v0) +/* 910E14 80241764 46800020 */ cvt.s.w $f0, $f0 +/* 910E18 80241768 E7A00018 */ swc1 $f0, 0x18($sp) +/* 910E1C 8024176C 8C640018 */ lw $a0, 0x18($v1) +/* 910E20 80241770 0C0123F5 */ jal is_point_within_region +/* 910E24 80241774 8E070038 */ lw $a3, 0x38($s0) +/* 910E28 80241778 1040000D */ beqz $v0, .L802417B0 +/* 910E2C 8024177C 00000000 */ nop +/* 910E30 80241780 8E2200D0 */ lw $v0, 0xd0($s1) +/* 910E34 80241784 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 910E38 80241788 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 910E3C 8024178C C4460000 */ lwc1 $f6, ($v0) +/* 910E40 80241790 468031A0 */ cvt.s.w $f6, $f6 +/* 910E44 80241794 44063000 */ mfc1 $a2, $f6 +/* 910E48 80241798 C4460008 */ lwc1 $f6, 8($v0) +/* 910E4C 8024179C 468031A0 */ cvt.s.w $f6, $f6 +/* 910E50 802417A0 44073000 */ mfc1 $a3, $f6 +/* 910E54 802417A4 0C00A720 */ jal atan2 +/* 910E58 802417A8 00000000 */ nop +/* 910E5C 802417AC E600000C */ swc1 $f0, 0xc($s0) +.L802417B0: +/* 910E60 802417B0 C6000038 */ lwc1 $f0, 0x38($s0) +/* 910E64 802417B4 3C013F80 */ lui $at, 0x3f80 +/* 910E68 802417B8 44811000 */ mtc1 $at, $f2 +/* 910E6C 802417BC E7A00058 */ swc1 $f0, 0x58($sp) +/* 910E70 802417C0 C600003C */ lwc1 $f0, 0x3c($s0) +/* 910E74 802417C4 46020000 */ add.s $f0, $f0, $f2 +/* 910E78 802417C8 E7A0005C */ swc1 $f0, 0x5c($sp) +/* 910E7C 802417CC C6000040 */ lwc1 $f0, 0x40($s0) +/* 910E80 802417D0 E7A00060 */ swc1 $f0, 0x60($sp) +/* 910E84 802417D4 860200A6 */ lh $v0, 0xa6($s0) +/* 910E88 802417D8 C6020018 */ lwc1 $f2, 0x18($s0) +/* 910E8C 802417DC 44820000 */ mtc1 $v0, $f0 +/* 910E90 802417E0 00000000 */ nop +/* 910E94 802417E4 46800020 */ cvt.s.w $f0, $f0 +/* 910E98 802417E8 46001080 */ add.s $f2, $f2, $f0 +/* 910E9C 802417EC 8E06000C */ lw $a2, 0xc($s0) +/* 910EA0 802417F0 44051000 */ mfc1 $a1, $f2 +/* 910EA4 802417F4 0C00EA95 */ jal npc_move_heading +/* 910EA8 802417F8 27A40020 */ addiu $a0, $sp, 0x20 +/* 910EAC 802417FC 0000202D */ daddu $a0, $zero, $zero +/* 910EB0 80241800 27A50058 */ addiu $a1, $sp, 0x58 +/* 910EB4 80241804 27A6005C */ addiu $a2, $sp, 0x5c +/* 910EB8 80241808 27A70060 */ addiu $a3, $sp, 0x60 +/* 910EBC 8024180C 3C01447A */ lui $at, 0x447a +/* 910EC0 80241810 44810000 */ mtc1 $at, $f0 +/* 910EC4 80241814 27A20360 */ addiu $v0, $sp, 0x360 +/* 910EC8 80241818 E7A00360 */ swc1 $f0, 0x360($sp) +/* 910ECC 8024181C 0C0372DF */ jal func_800DCB7C +/* 910ED0 80241820 AFA20010 */ sw $v0, 0x10($sp) +/* 910ED4 80241824 1040000D */ beqz $v0, .L8024185C +/* 910ED8 80241828 00000000 */ nop +/* 910EDC 8024182C C7A20360 */ lwc1 $f2, 0x360($sp) +/* 910EE0 80241830 3C0140A0 */ lui $at, 0x40a0 +/* 910EE4 80241834 44810000 */ mtc1 $at, $f0 +/* 910EE8 80241838 00000000 */ nop +/* 910EEC 8024183C 4600103C */ c.lt.s $f2, $f0 +/* 910EF0 80241840 00000000 */ nop +/* 910EF4 80241844 45000005 */ bc1f .L8024185C +/* 910EF8 80241848 00000000 */ nop +/* 910EFC 8024184C 8E050018 */ lw $a1, 0x18($s0) +/* 910F00 80241850 8E06000C */ lw $a2, 0xc($s0) +/* 910F04 80241854 0C00EA95 */ jal npc_move_heading +/* 910F08 80241858 0200202D */ daddu $a0, $s0, $zero +.L8024185C: +/* 910F0C 8024185C 8E020000 */ lw $v0, ($s0) +/* 910F10 80241860 30424000 */ andi $v0, $v0, 0x4000 +/* 910F14 80241864 54400001 */ bnel $v0, $zero, .L8024186C +/* 910F18 80241868 AE400070 */ sw $zero, 0x70($s2) +.L8024186C: +/* 910F1C 8024186C 8E630014 */ lw $v1, 0x14($s3) +/* 910F20 80241870 04600012 */ bltz $v1, .L802418BC +/* 910F24 80241874 00000000 */ nop +/* 910F28 80241878 8E420074 */ lw $v0, 0x74($s2) +/* 910F2C 8024187C 1C40000E */ bgtz $v0, .L802418B8 +/* 910F30 80241880 2442FFFF */ addiu $v0, $v0, -1 +/* 910F34 80241884 0240202D */ daddu $a0, $s2, $zero +/* 910F38 80241888 AE430074 */ sw $v1, 0x74($s2) +/* 910F3C 8024188C 8E66000C */ lw $a2, 0xc($s3) +/* 910F40 80241890 8E670010 */ lw $a3, 0x10($s3) +/* 910F44 80241894 0C090505 */ jal func_80241414_910AC4 +/* 910F48 80241898 0280282D */ daddu $a1, $s4, $zero +/* 910F4C 8024189C 10400004 */ beqz $v0, .L802418B0 +/* 910F50 802418A0 2402000C */ addiu $v0, $zero, 0xc +/* 910F54 802418A4 A600008E */ sh $zero, 0x8e($s0) +/* 910F58 802418A8 08090643 */ j .L8024190C +/* 910F5C 802418AC AE420070 */ sw $v0, 0x70($s2) +.L802418B0: +/* 910F60 802418B0 8E420074 */ lw $v0, 0x74($s2) +/* 910F64 802418B4 2442FFFF */ addiu $v0, $v0, -1 +.L802418B8: +/* 910F68 802418B8 AE420074 */ sw $v0, 0x74($s2) +.L802418BC: +/* 910F6C 802418BC 8E020000 */ lw $v0, ($s0) +/* 910F70 802418C0 30421008 */ andi $v0, $v0, 0x1008 +/* 910F74 802418C4 1440000B */ bnez $v0, .L802418F4 +/* 910F78 802418C8 00000000 */ nop +/* 910F7C 802418CC C6000038 */ lwc1 $f0, 0x38($s0) +/* 910F80 802418D0 C6020040 */ lwc1 $f2, 0x40($s0) +/* 910F84 802418D4 4600018D */ trunc.w.s $f6, $f0 +/* 910F88 802418D8 44023000 */ mfc1 $v0, $f6 +/* 910F8C 802418DC 00000000 */ nop +/* 910F90 802418E0 A6020090 */ sh $v0, 0x90($s0) +/* 910F94 802418E4 4600118D */ trunc.w.s $f6, $f2 +/* 910F98 802418E8 44023000 */ mfc1 $v0, $f6 +/* 910F9C 802418EC 00000000 */ nop +/* 910FA0 802418F0 A6020094 */ sh $v0, 0x94($s0) +.L802418F4: +/* 910FA4 802418F4 9602008E */ lhu $v0, 0x8e($s0) +/* 910FA8 802418F8 2442FFFF */ addiu $v0, $v0, -1 +/* 910FAC 802418FC A602008E */ sh $v0, 0x8e($s0) +/* 910FB0 80241900 00021400 */ sll $v0, $v0, 0x10 +/* 910FB4 80241904 50400001 */ beql $v0, $zero, .L8024190C +/* 910FB8 80241908 AE400070 */ sw $zero, 0x70($s2) +.L8024190C: +/* 910FBC 8024190C 8FBF037C */ lw $ra, 0x37c($sp) +/* 910FC0 80241910 8FB40378 */ lw $s4, 0x378($sp) +/* 910FC4 80241914 8FB30374 */ lw $s3, 0x374($sp) +/* 910FC8 80241918 8FB20370 */ lw $s2, 0x370($sp) +/* 910FCC 8024191C 8FB1036C */ lw $s1, 0x36c($sp) +/* 910FD0 80241920 8FB00368 */ lw $s0, 0x368($sp) +/* 910FD4 80241924 03E00008 */ jr $ra +/* 910FD8 80241928 27BD0380 */ addiu $sp, $sp, 0x380 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024192C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024192C.s deleted file mode 100644 index 82902e213f..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024192C.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024192C -/* 910FDC 8024192C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 910FE0 80241930 AFB10014 */ sw $s1, 0x14($sp) -/* 910FE4 80241934 0080882D */ daddu $s1, $a0, $zero -/* 910FE8 80241938 AFBF0018 */ sw $ra, 0x18($sp) -/* 910FEC 8024193C AFB00010 */ sw $s0, 0x10($sp) -/* 910FF0 80241940 8E220148 */ lw $v0, 0x148($s1) -/* 910FF4 80241944 0C00EABB */ jal get_npc_unsafe -/* 910FF8 80241948 84440008 */ lh $a0, 8($v0) -/* 910FFC 8024194C 0040802D */ daddu $s0, $v0, $zero -/* 911000 80241950 0200202D */ daddu $a0, $s0, $zero -/* 911004 80241954 0000302D */ daddu $a2, $zero, $zero -/* 911008 80241958 2403FFFD */ addiu $v1, $zero, -3 -/* 91100C 8024195C 8E020000 */ lw $v0, ($s0) -/* 911010 80241960 24050321 */ addiu $a1, $zero, 0x321 -/* 911014 80241964 00431024 */ and $v0, $v0, $v1 -/* 911018 80241968 0C012530 */ jal func_800494C0 -/* 91101C 8024196C AE020000 */ sw $v0, ($s0) -/* 911020 80241970 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 911024 80241974 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 911028 80241978 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91102C 8024197C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 911030 80241980 8C460028 */ lw $a2, 0x28($v0) -/* 911034 80241984 0C00A720 */ jal atan2 -/* 911038 80241988 8C470030 */ lw $a3, 0x30($v0) -/* 91103C 8024198C 3C02002F */ lui $v0, 0x2f -/* 911040 80241990 34420010 */ ori $v0, $v0, 0x10 -/* 911044 80241994 AE020028 */ sw $v0, 0x28($s0) -/* 911048 80241998 2402000A */ addiu $v0, $zero, 0xa -/* 91104C 8024199C A602008E */ sh $v0, 0x8e($s0) -/* 911050 802419A0 2402000D */ addiu $v0, $zero, 0xd -/* 911054 802419A4 E600000C */ swc1 $f0, 0xc($s0) -/* 911058 802419A8 AE220070 */ sw $v0, 0x70($s1) -/* 91105C 802419AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 911060 802419B0 8FB10014 */ lw $s1, 0x14($sp) -/* 911064 802419B4 8FB00010 */ lw $s0, 0x10($sp) -/* 911068 802419B8 03E00008 */ jr $ra -/* 91106C 802419BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024192C_910FDC.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024192C_910FDC.s new file mode 100644 index 0000000000..707820bc4a --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024192C_910FDC.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024192C_910FDC +/* 910FDC 8024192C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 910FE0 80241930 AFB10014 */ sw $s1, 0x14($sp) +/* 910FE4 80241934 0080882D */ daddu $s1, $a0, $zero +/* 910FE8 80241938 AFBF0018 */ sw $ra, 0x18($sp) +/* 910FEC 8024193C AFB00010 */ sw $s0, 0x10($sp) +/* 910FF0 80241940 8E220148 */ lw $v0, 0x148($s1) +/* 910FF4 80241944 0C00EABB */ jal get_npc_unsafe +/* 910FF8 80241948 84440008 */ lh $a0, 8($v0) +/* 910FFC 8024194C 0040802D */ daddu $s0, $v0, $zero +/* 911000 80241950 0200202D */ daddu $a0, $s0, $zero +/* 911004 80241954 0000302D */ daddu $a2, $zero, $zero +/* 911008 80241958 2403FFFD */ addiu $v1, $zero, -3 +/* 91100C 8024195C 8E020000 */ lw $v0, ($s0) +/* 911010 80241960 24050321 */ addiu $a1, $zero, 0x321 +/* 911014 80241964 00431024 */ and $v0, $v0, $v1 +/* 911018 80241968 0C012530 */ jal func_800494C0 +/* 91101C 8024196C AE020000 */ sw $v0, ($s0) +/* 911020 80241970 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 911024 80241974 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 911028 80241978 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 91102C 8024197C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 911030 80241980 8C460028 */ lw $a2, 0x28($v0) +/* 911034 80241984 0C00A720 */ jal atan2 +/* 911038 80241988 8C470030 */ lw $a3, 0x30($v0) +/* 91103C 8024198C 3C02002F */ lui $v0, 0x2f +/* 911040 80241990 34420010 */ ori $v0, $v0, 0x10 +/* 911044 80241994 AE020028 */ sw $v0, 0x28($s0) +/* 911048 80241998 2402000A */ addiu $v0, $zero, 0xa +/* 91104C 8024199C A602008E */ sh $v0, 0x8e($s0) +/* 911050 802419A0 2402000D */ addiu $v0, $zero, 0xd +/* 911054 802419A4 E600000C */ swc1 $f0, 0xc($s0) +/* 911058 802419A8 AE220070 */ sw $v0, 0x70($s1) +/* 91105C 802419AC 8FBF0018 */ lw $ra, 0x18($sp) +/* 911060 802419B0 8FB10014 */ lw $s1, 0x14($sp) +/* 911064 802419B4 8FB00010 */ lw $s0, 0x10($sp) +/* 911068 802419B8 03E00008 */ jr $ra +/* 91106C 802419BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802419C0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802419C0.s deleted file mode 100644 index f69c47ce1c..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802419C0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419C0 -/* 911070 802419C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 911074 802419C4 AFB10014 */ sw $s1, 0x14($sp) -/* 911078 802419C8 0080882D */ daddu $s1, $a0, $zero -/* 91107C 802419CC AFBF0018 */ sw $ra, 0x18($sp) -/* 911080 802419D0 AFB00010 */ sw $s0, 0x10($sp) -/* 911084 802419D4 8E300148 */ lw $s0, 0x148($s1) -/* 911088 802419D8 0C00EABB */ jal get_npc_unsafe -/* 91108C 802419DC 86040008 */ lh $a0, 8($s0) -/* 911090 802419E0 0040202D */ daddu $a0, $v0, $zero -/* 911094 802419E4 9482008E */ lhu $v0, 0x8e($a0) -/* 911098 802419E8 24030002 */ addiu $v1, $zero, 2 -/* 91109C 802419EC 2442FFFF */ addiu $v0, $v0, -1 -/* 9110A0 802419F0 A482008E */ sh $v0, 0x8e($a0) -/* 9110A4 802419F4 00021400 */ sll $v0, $v0, 0x10 -/* 9110A8 802419F8 00021403 */ sra $v0, $v0, 0x10 -/* 9110AC 802419FC 14430005 */ bne $v0, $v1, .L80241A14 -/* 9110B0 80241A00 3C03E0EF */ lui $v1, 0xe0ef -/* 9110B4 80241A04 8E020000 */ lw $v0, ($s0) -/* 9110B8 80241A08 3463FFFF */ ori $v1, $v1, 0xffff -/* 9110BC 80241A0C 00431024 */ and $v0, $v0, $v1 -/* 9110C0 80241A10 AE020000 */ sw $v0, ($s0) -.L80241A14: -/* 9110C4 80241A14 8482008E */ lh $v0, 0x8e($a0) -/* 9110C8 80241A18 1C400007 */ bgtz $v0, .L80241A38 -/* 9110CC 80241A1C 3C02002F */ lui $v0, 0x2f -/* 9110D0 80241A20 34420018 */ ori $v0, $v0, 0x18 -/* 9110D4 80241A24 AC820028 */ sw $v0, 0x28($a0) -/* 9110D8 80241A28 2402000A */ addiu $v0, $zero, 0xa -/* 9110DC 80241A2C A482008E */ sh $v0, 0x8e($a0) -/* 9110E0 80241A30 2402000E */ addiu $v0, $zero, 0xe -/* 9110E4 80241A34 AE220070 */ sw $v0, 0x70($s1) -.L80241A38: -/* 9110E8 80241A38 8FBF0018 */ lw $ra, 0x18($sp) -/* 9110EC 80241A3C 8FB10014 */ lw $s1, 0x14($sp) -/* 9110F0 80241A40 8FB00010 */ lw $s0, 0x10($sp) -/* 9110F4 80241A44 03E00008 */ jr $ra -/* 9110F8 80241A48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802419C0_911070.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802419C0_911070.s new file mode 100644 index 0000000000..e0bfde6790 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802419C0_911070.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419C0_911070 +/* 911070 802419C0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 911074 802419C4 AFB10014 */ sw $s1, 0x14($sp) +/* 911078 802419C8 0080882D */ daddu $s1, $a0, $zero +/* 91107C 802419CC AFBF0018 */ sw $ra, 0x18($sp) +/* 911080 802419D0 AFB00010 */ sw $s0, 0x10($sp) +/* 911084 802419D4 8E300148 */ lw $s0, 0x148($s1) +/* 911088 802419D8 0C00EABB */ jal get_npc_unsafe +/* 91108C 802419DC 86040008 */ lh $a0, 8($s0) +/* 911090 802419E0 0040202D */ daddu $a0, $v0, $zero +/* 911094 802419E4 9482008E */ lhu $v0, 0x8e($a0) +/* 911098 802419E8 24030002 */ addiu $v1, $zero, 2 +/* 91109C 802419EC 2442FFFF */ addiu $v0, $v0, -1 +/* 9110A0 802419F0 A482008E */ sh $v0, 0x8e($a0) +/* 9110A4 802419F4 00021400 */ sll $v0, $v0, 0x10 +/* 9110A8 802419F8 00021403 */ sra $v0, $v0, 0x10 +/* 9110AC 802419FC 14430005 */ bne $v0, $v1, .L80241A14 +/* 9110B0 80241A00 3C03E0EF */ lui $v1, 0xe0ef +/* 9110B4 80241A04 8E020000 */ lw $v0, ($s0) +/* 9110B8 80241A08 3463FFFF */ ori $v1, $v1, 0xffff +/* 9110BC 80241A0C 00431024 */ and $v0, $v0, $v1 +/* 9110C0 80241A10 AE020000 */ sw $v0, ($s0) +.L80241A14: +/* 9110C4 80241A14 8482008E */ lh $v0, 0x8e($a0) +/* 9110C8 80241A18 1C400007 */ bgtz $v0, .L80241A38 +/* 9110CC 80241A1C 3C02002F */ lui $v0, 0x2f +/* 9110D0 80241A20 34420018 */ ori $v0, $v0, 0x18 +/* 9110D4 80241A24 AC820028 */ sw $v0, 0x28($a0) +/* 9110D8 80241A28 2402000A */ addiu $v0, $zero, 0xa +/* 9110DC 80241A2C A482008E */ sh $v0, 0x8e($a0) +/* 9110E0 80241A30 2402000E */ addiu $v0, $zero, 0xe +/* 9110E4 80241A34 AE220070 */ sw $v0, 0x70($s1) +.L80241A38: +/* 9110E8 80241A38 8FBF0018 */ lw $ra, 0x18($sp) +/* 9110EC 80241A3C 8FB10014 */ lw $s1, 0x14($sp) +/* 9110F0 80241A40 8FB00010 */ lw $s0, 0x10($sp) +/* 9110F4 80241A44 03E00008 */ jr $ra +/* 9110F8 80241A48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C.s deleted file mode 100644 index 0b5b6d37f9..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A4C -/* 9110FC 80241A4C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 911100 80241A50 AFB10034 */ sw $s1, 0x34($sp) -/* 911104 80241A54 0080882D */ daddu $s1, $a0, $zero -/* 911108 80241A58 AFBF0040 */ sw $ra, 0x40($sp) -/* 91110C 80241A5C AFB3003C */ sw $s3, 0x3c($sp) -/* 911110 80241A60 AFB20038 */ sw $s2, 0x38($sp) -/* 911114 80241A64 AFB00030 */ sw $s0, 0x30($sp) -/* 911118 80241A68 8E220148 */ lw $v0, 0x148($s1) -/* 91111C 80241A6C 00A0902D */ daddu $s2, $a1, $zero -/* 911120 80241A70 84440008 */ lh $a0, 8($v0) -/* 911124 80241A74 0C00EABB */ jal get_npc_unsafe -/* 911128 80241A78 00C0982D */ daddu $s3, $a2, $zero -/* 91112C 80241A7C 0040802D */ daddu $s0, $v0, $zero -/* 911130 80241A80 9602008E */ lhu $v0, 0x8e($s0) -/* 911134 80241A84 2442FFFF */ addiu $v0, $v0, -1 -/* 911138 80241A88 A602008E */ sh $v0, 0x8e($s0) -/* 91113C 80241A8C 00021400 */ sll $v0, $v0, 0x10 -/* 911140 80241A90 1C400031 */ bgtz $v0, .L80241B58 -/* 911144 80241A94 0220202D */ daddu $a0, $s1, $zero -/* 911148 80241A98 C640000C */ lwc1 $f0, 0xc($s2) -/* 91114C 80241A9C 3C018024 */ lui $at, 0x8024 -/* 911150 80241AA0 D42263D0 */ ldc1 $f2, 0x63d0($at) -/* 911154 80241AA4 46000021 */ cvt.d.s $f0, $f0 -/* 911158 80241AA8 46220002 */ mul.d $f0, $f0, $f2 -/* 91115C 80241AAC 00000000 */ nop -/* 911160 80241AB0 8E470010 */ lw $a3, 0x10($s2) -/* 911164 80241AB4 46200020 */ cvt.s.d $f0, $f0 -/* 911168 80241AB8 44060000 */ mfc1 $a2, $f0 -/* 91116C 80241ABC 0C090505 */ jal func_80241414 -/* 911170 80241AC0 0260282D */ daddu $a1, $s3, $zero -/* 911174 80241AC4 5440001E */ bnel $v0, $zero, .L80241B40 -/* 911178 80241AC8 3C02002F */ lui $v0, 0x2f -/* 91117C 80241ACC 24040002 */ addiu $a0, $zero, 2 -/* 911180 80241AD0 0200282D */ daddu $a1, $s0, $zero -/* 911184 80241AD4 0000302D */ daddu $a2, $zero, $zero -/* 911188 80241AD8 860300A8 */ lh $v1, 0xa8($s0) -/* 91118C 80241ADC 3C013F80 */ lui $at, 0x3f80 -/* 911190 80241AE0 44810000 */ mtc1 $at, $f0 -/* 911194 80241AE4 3C014000 */ lui $at, 0x4000 -/* 911198 80241AE8 44811000 */ mtc1 $at, $f2 -/* 91119C 80241AEC 3C01C1A0 */ lui $at, 0xc1a0 -/* 9111A0 80241AF0 44812000 */ mtc1 $at, $f4 -/* 9111A4 80241AF4 2402000F */ addiu $v0, $zero, 0xf -/* 9111A8 80241AF8 AFA2001C */ sw $v0, 0x1c($sp) -/* 9111AC 80241AFC 44833000 */ mtc1 $v1, $f6 -/* 9111B0 80241B00 00000000 */ nop -/* 9111B4 80241B04 468031A0 */ cvt.s.w $f6, $f6 -/* 9111B8 80241B08 44073000 */ mfc1 $a3, $f6 -/* 9111BC 80241B0C 27A20028 */ addiu $v0, $sp, 0x28 -/* 9111C0 80241B10 AFA20020 */ sw $v0, 0x20($sp) -/* 9111C4 80241B14 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9111C8 80241B18 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9111CC 80241B1C 0C01BFA4 */ jal fx_emote -/* 9111D0 80241B20 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9111D4 80241B24 3C02002F */ lui $v0, 0x2f -/* 9111D8 80241B28 34420001 */ ori $v0, $v0, 1 -/* 9111DC 80241B2C AE020028 */ sw $v0, 0x28($s0) -/* 9111E0 80241B30 2402001E */ addiu $v0, $zero, 0x1e -/* 9111E4 80241B34 A602008E */ sh $v0, 0x8e($s0) -/* 9111E8 80241B38 080906D5 */ j .L80241B54 -/* 9111EC 80241B3C 24020014 */ addiu $v0, $zero, 0x14 -.L80241B40: -/* 9111F0 80241B40 3442001B */ ori $v0, $v0, 0x1b -/* 9111F4 80241B44 AE020028 */ sw $v0, 0x28($s0) -/* 9111F8 80241B48 2402000F */ addiu $v0, $zero, 0xf -/* 9111FC 80241B4C A602008E */ sh $v0, 0x8e($s0) -/* 911200 80241B50 2402000F */ addiu $v0, $zero, 0xf -.L80241B54: -/* 911204 80241B54 AE220070 */ sw $v0, 0x70($s1) -.L80241B58: -/* 911208 80241B58 8FBF0040 */ lw $ra, 0x40($sp) -/* 91120C 80241B5C 8FB3003C */ lw $s3, 0x3c($sp) -/* 911210 80241B60 8FB20038 */ lw $s2, 0x38($sp) -/* 911214 80241B64 8FB10034 */ lw $s1, 0x34($sp) -/* 911218 80241B68 8FB00030 */ lw $s0, 0x30($sp) -/* 91121C 80241B6C 03E00008 */ jr $ra -/* 911220 80241B70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s new file mode 100644 index 0000000000..72fbe082ba --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241A4C_9110FC.s @@ -0,0 +1,81 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A4C_9110FC +/* 9110FC 80241A4C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 911100 80241A50 AFB10034 */ sw $s1, 0x34($sp) +/* 911104 80241A54 0080882D */ daddu $s1, $a0, $zero +/* 911108 80241A58 AFBF0040 */ sw $ra, 0x40($sp) +/* 91110C 80241A5C AFB3003C */ sw $s3, 0x3c($sp) +/* 911110 80241A60 AFB20038 */ sw $s2, 0x38($sp) +/* 911114 80241A64 AFB00030 */ sw $s0, 0x30($sp) +/* 911118 80241A68 8E220148 */ lw $v0, 0x148($s1) +/* 91111C 80241A6C 00A0902D */ daddu $s2, $a1, $zero +/* 911120 80241A70 84440008 */ lh $a0, 8($v0) +/* 911124 80241A74 0C00EABB */ jal get_npc_unsafe +/* 911128 80241A78 00C0982D */ daddu $s3, $a2, $zero +/* 91112C 80241A7C 0040802D */ daddu $s0, $v0, $zero +/* 911130 80241A80 9602008E */ lhu $v0, 0x8e($s0) +/* 911134 80241A84 2442FFFF */ addiu $v0, $v0, -1 +/* 911138 80241A88 A602008E */ sh $v0, 0x8e($s0) +/* 91113C 80241A8C 00021400 */ sll $v0, $v0, 0x10 +/* 911140 80241A90 1C400031 */ bgtz $v0, .L80241B58 +/* 911144 80241A94 0220202D */ daddu $a0, $s1, $zero +/* 911148 80241A98 C640000C */ lwc1 $f0, 0xc($s2) +/* 91114C 80241A9C 3C018024 */ lui $at, 0x8024 +/* 911150 80241AA0 D42263D0 */ ldc1 $f2, 0x63d0($at) +/* 911154 80241AA4 46000021 */ cvt.d.s $f0, $f0 +/* 911158 80241AA8 46220002 */ mul.d $f0, $f0, $f2 +/* 91115C 80241AAC 00000000 */ nop +/* 911160 80241AB0 8E470010 */ lw $a3, 0x10($s2) +/* 911164 80241AB4 46200020 */ cvt.s.d $f0, $f0 +/* 911168 80241AB8 44060000 */ mfc1 $a2, $f0 +/* 91116C 80241ABC 0C090505 */ jal func_80241414_910AC4 +/* 911170 80241AC0 0260282D */ daddu $a1, $s3, $zero +/* 911174 80241AC4 5440001E */ bnel $v0, $zero, .L80241B40 +/* 911178 80241AC8 3C02002F */ lui $v0, 0x2f +/* 91117C 80241ACC 24040002 */ addiu $a0, $zero, 2 +/* 911180 80241AD0 0200282D */ daddu $a1, $s0, $zero +/* 911184 80241AD4 0000302D */ daddu $a2, $zero, $zero +/* 911188 80241AD8 860300A8 */ lh $v1, 0xa8($s0) +/* 91118C 80241ADC 3C013F80 */ lui $at, 0x3f80 +/* 911190 80241AE0 44810000 */ mtc1 $at, $f0 +/* 911194 80241AE4 3C014000 */ lui $at, 0x4000 +/* 911198 80241AE8 44811000 */ mtc1 $at, $f2 +/* 91119C 80241AEC 3C01C1A0 */ lui $at, 0xc1a0 +/* 9111A0 80241AF0 44812000 */ mtc1 $at, $f4 +/* 9111A4 80241AF4 2402000F */ addiu $v0, $zero, 0xf +/* 9111A8 80241AF8 AFA2001C */ sw $v0, 0x1c($sp) +/* 9111AC 80241AFC 44833000 */ mtc1 $v1, $f6 +/* 9111B0 80241B00 00000000 */ nop +/* 9111B4 80241B04 468031A0 */ cvt.s.w $f6, $f6 +/* 9111B8 80241B08 44073000 */ mfc1 $a3, $f6 +/* 9111BC 80241B0C 27A20028 */ addiu $v0, $sp, 0x28 +/* 9111C0 80241B10 AFA20020 */ sw $v0, 0x20($sp) +/* 9111C4 80241B14 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9111C8 80241B18 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9111CC 80241B1C 0C01BFA4 */ jal fx_emote +/* 9111D0 80241B20 E7A40018 */ swc1 $f4, 0x18($sp) +/* 9111D4 80241B24 3C02002F */ lui $v0, 0x2f +/* 9111D8 80241B28 34420001 */ ori $v0, $v0, 1 +/* 9111DC 80241B2C AE020028 */ sw $v0, 0x28($s0) +/* 9111E0 80241B30 2402001E */ addiu $v0, $zero, 0x1e +/* 9111E4 80241B34 A602008E */ sh $v0, 0x8e($s0) +/* 9111E8 80241B38 080906D5 */ j .L80241B54 +/* 9111EC 80241B3C 24020014 */ addiu $v0, $zero, 0x14 +.L80241B40: +/* 9111F0 80241B40 3442001B */ ori $v0, $v0, 0x1b +/* 9111F4 80241B44 AE020028 */ sw $v0, 0x28($s0) +/* 9111F8 80241B48 2402000F */ addiu $v0, $zero, 0xf +/* 9111FC 80241B4C A602008E */ sh $v0, 0x8e($s0) +/* 911200 80241B50 2402000F */ addiu $v0, $zero, 0xf +.L80241B54: +/* 911204 80241B54 AE220070 */ sw $v0, 0x70($s1) +.L80241B58: +/* 911208 80241B58 8FBF0040 */ lw $ra, 0x40($sp) +/* 91120C 80241B5C 8FB3003C */ lw $s3, 0x3c($sp) +/* 911210 80241B60 8FB20038 */ lw $s2, 0x38($sp) +/* 911214 80241B64 8FB10034 */ lw $s1, 0x34($sp) +/* 911218 80241B68 8FB00030 */ lw $s0, 0x30($sp) +/* 91121C 80241B6C 03E00008 */ jr $ra +/* 911220 80241B70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74.s deleted file mode 100644 index ada3957c0f..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B74 -/* 911224 80241B74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 911228 80241B78 AFB20018 */ sw $s2, 0x18($sp) -/* 91122C 80241B7C 0080902D */ daddu $s2, $a0, $zero -/* 911230 80241B80 AFBF001C */ sw $ra, 0x1c($sp) -/* 911234 80241B84 AFB10014 */ sw $s1, 0x14($sp) -/* 911238 80241B88 AFB00010 */ sw $s0, 0x10($sp) -/* 91123C 80241B8C 8E510148 */ lw $s1, 0x148($s2) -/* 911240 80241B90 0C00EABB */ jal get_npc_unsafe -/* 911244 80241B94 86240008 */ lh $a0, 8($s1) -/* 911248 80241B98 0040802D */ daddu $s0, $v0, $zero -/* 91124C 80241B9C 9602008E */ lhu $v0, 0x8e($s0) -/* 911250 80241BA0 2403000D */ addiu $v1, $zero, 0xd -/* 911254 80241BA4 2442FFFF */ addiu $v0, $v0, -1 -/* 911258 80241BA8 A602008E */ sh $v0, 0x8e($s0) -/* 91125C 80241BAC 00021400 */ sll $v0, $v0, 0x10 -/* 911260 80241BB0 00021403 */ sra $v0, $v0, 0x10 -/* 911264 80241BB4 14430008 */ bne $v0, $v1, .L80241BD8 -/* 911268 80241BB8 00000000 */ nop -/* 91126C 80241BBC 86240008 */ lh $a0, 8($s1) -/* 911270 80241BC0 0C00FB3A */ jal get_enemy -/* 911274 80241BC4 24840001 */ addiu $a0, $a0, 1 -/* 911278 80241BC8 86240008 */ lh $a0, 8($s1) -/* 91127C 80241BCC 24030001 */ addiu $v1, $zero, 1 -/* 911280 80241BD0 AC43006C */ sw $v1, 0x6c($v0) -/* 911284 80241BD4 AC44007C */ sw $a0, 0x7c($v0) -.L80241BD8: -/* 911288 80241BD8 8602008E */ lh $v0, 0x8e($s0) -/* 91128C 80241BDC 28420008 */ slti $v0, $v0, 8 -/* 911290 80241BE0 10400012 */ beqz $v0, .L80241C2C -/* 911294 80241BE4 00000000 */ nop -/* 911298 80241BE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91129C 80241BEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9112A0 80241BF0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9112A4 80241BF4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9112A8 80241BF8 8C460028 */ lw $a2, 0x28($v0) -/* 9112AC 80241BFC 0C00A7B5 */ jal dist2D -/* 9112B0 80241C00 8C470030 */ lw $a3, 0x30($v0) -/* 9112B4 80241C04 3C014059 */ lui $at, 0x4059 -/* 9112B8 80241C08 44811800 */ mtc1 $at, $f3 -/* 9112BC 80241C0C 44801000 */ mtc1 $zero, $f2 -/* 9112C0 80241C10 46000021 */ cvt.d.s $f0, $f0 -/* 9112C4 80241C14 4620103C */ c.lt.d $f2, $f0 -/* 9112C8 80241C18 00000000 */ nop -/* 9112CC 80241C1C 45000003 */ bc1f .L80241C2C -/* 9112D0 80241C20 3C02002F */ lui $v0, 0x2f -/* 9112D4 80241C24 34420015 */ ori $v0, $v0, 0x15 -/* 9112D8 80241C28 AE020028 */ sw $v0, 0x28($s0) -.L80241C2C: -/* 9112DC 80241C2C 8602008E */ lh $v0, 0x8e($s0) -/* 9112E0 80241C30 1C40000B */ bgtz $v0, .L80241C60 -/* 9112E4 80241C34 3C03002F */ lui $v1, 0x2f -/* 9112E8 80241C38 8E020028 */ lw $v0, 0x28($s0) -/* 9112EC 80241C3C 34630015 */ ori $v1, $v1, 0x15 -/* 9112F0 80241C40 10430003 */ beq $v0, $v1, .L80241C50 -/* 9112F4 80241C44 3C02002F */ lui $v0, 0x2f -/* 9112F8 80241C48 34420001 */ ori $v0, $v0, 1 -/* 9112FC 80241C4C AE020028 */ sw $v0, 0x28($s0) -.L80241C50: -/* 911300 80241C50 2402000F */ addiu $v0, $zero, 0xf -/* 911304 80241C54 A602008E */ sh $v0, 0x8e($s0) -/* 911308 80241C58 24020014 */ addiu $v0, $zero, 0x14 -/* 91130C 80241C5C AE420070 */ sw $v0, 0x70($s2) -.L80241C60: -/* 911310 80241C60 8FBF001C */ lw $ra, 0x1c($sp) -/* 911314 80241C64 8FB20018 */ lw $s2, 0x18($sp) -/* 911318 80241C68 8FB10014 */ lw $s1, 0x14($sp) -/* 91131C 80241C6C 8FB00010 */ lw $s0, 0x10($sp) -/* 911320 80241C70 03E00008 */ jr $ra -/* 911324 80241C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s new file mode 100644 index 0000000000..c9fb0f2f07 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241B74_911224.s @@ -0,0 +1,73 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B74_911224 +/* 911224 80241B74 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 911228 80241B78 AFB20018 */ sw $s2, 0x18($sp) +/* 91122C 80241B7C 0080902D */ daddu $s2, $a0, $zero +/* 911230 80241B80 AFBF001C */ sw $ra, 0x1c($sp) +/* 911234 80241B84 AFB10014 */ sw $s1, 0x14($sp) +/* 911238 80241B88 AFB00010 */ sw $s0, 0x10($sp) +/* 91123C 80241B8C 8E510148 */ lw $s1, 0x148($s2) +/* 911240 80241B90 0C00EABB */ jal get_npc_unsafe +/* 911244 80241B94 86240008 */ lh $a0, 8($s1) +/* 911248 80241B98 0040802D */ daddu $s0, $v0, $zero +/* 91124C 80241B9C 9602008E */ lhu $v0, 0x8e($s0) +/* 911250 80241BA0 2403000D */ addiu $v1, $zero, 0xd +/* 911254 80241BA4 2442FFFF */ addiu $v0, $v0, -1 +/* 911258 80241BA8 A602008E */ sh $v0, 0x8e($s0) +/* 91125C 80241BAC 00021400 */ sll $v0, $v0, 0x10 +/* 911260 80241BB0 00021403 */ sra $v0, $v0, 0x10 +/* 911264 80241BB4 14430008 */ bne $v0, $v1, .L80241BD8 +/* 911268 80241BB8 00000000 */ nop +/* 91126C 80241BBC 86240008 */ lh $a0, 8($s1) +/* 911270 80241BC0 0C00FB3A */ jal get_enemy +/* 911274 80241BC4 24840001 */ addiu $a0, $a0, 1 +/* 911278 80241BC8 86240008 */ lh $a0, 8($s1) +/* 91127C 80241BCC 24030001 */ addiu $v1, $zero, 1 +/* 911280 80241BD0 AC43006C */ sw $v1, 0x6c($v0) +/* 911284 80241BD4 AC44007C */ sw $a0, 0x7c($v0) +.L80241BD8: +/* 911288 80241BD8 8602008E */ lh $v0, 0x8e($s0) +/* 91128C 80241BDC 28420008 */ slti $v0, $v0, 8 +/* 911290 80241BE0 10400012 */ beqz $v0, .L80241C2C +/* 911294 80241BE4 00000000 */ nop +/* 911298 80241BE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 91129C 80241BEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9112A0 80241BF0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9112A4 80241BF4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9112A8 80241BF8 8C460028 */ lw $a2, 0x28($v0) +/* 9112AC 80241BFC 0C00A7B5 */ jal dist2D +/* 9112B0 80241C00 8C470030 */ lw $a3, 0x30($v0) +/* 9112B4 80241C04 3C014059 */ lui $at, 0x4059 +/* 9112B8 80241C08 44811800 */ mtc1 $at, $f3 +/* 9112BC 80241C0C 44801000 */ mtc1 $zero, $f2 +/* 9112C0 80241C10 46000021 */ cvt.d.s $f0, $f0 +/* 9112C4 80241C14 4620103C */ c.lt.d $f2, $f0 +/* 9112C8 80241C18 00000000 */ nop +/* 9112CC 80241C1C 45000003 */ bc1f .L80241C2C +/* 9112D0 80241C20 3C02002F */ lui $v0, 0x2f +/* 9112D4 80241C24 34420015 */ ori $v0, $v0, 0x15 +/* 9112D8 80241C28 AE020028 */ sw $v0, 0x28($s0) +.L80241C2C: +/* 9112DC 80241C2C 8602008E */ lh $v0, 0x8e($s0) +/* 9112E0 80241C30 1C40000B */ bgtz $v0, .L80241C60 +/* 9112E4 80241C34 3C03002F */ lui $v1, 0x2f +/* 9112E8 80241C38 8E020028 */ lw $v0, 0x28($s0) +/* 9112EC 80241C3C 34630015 */ ori $v1, $v1, 0x15 +/* 9112F0 80241C40 10430003 */ beq $v0, $v1, .L80241C50 +/* 9112F4 80241C44 3C02002F */ lui $v0, 0x2f +/* 9112F8 80241C48 34420001 */ ori $v0, $v0, 1 +/* 9112FC 80241C4C AE020028 */ sw $v0, 0x28($s0) +.L80241C50: +/* 911300 80241C50 2402000F */ addiu $v0, $zero, 0xf +/* 911304 80241C54 A602008E */ sh $v0, 0x8e($s0) +/* 911308 80241C58 24020014 */ addiu $v0, $zero, 0x14 +/* 91130C 80241C5C AE420070 */ sw $v0, 0x70($s2) +.L80241C60: +/* 911310 80241C60 8FBF001C */ lw $ra, 0x1c($sp) +/* 911314 80241C64 8FB20018 */ lw $s2, 0x18($sp) +/* 911318 80241C68 8FB10014 */ lw $s1, 0x14($sp) +/* 91131C 80241C6C 8FB00010 */ lw $s0, 0x10($sp) +/* 911320 80241C70 03E00008 */ jr $ra +/* 911324 80241C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s index c33f3ba486..2ce200a846 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241D70_911420.s @@ -75,21 +75,21 @@ glabel func_80241D70_911420 /* 911530 80241E80 00000000 */ nop /* 911534 80241E84 0280202D */ daddu $a0, $s4, $zero /* 911538 80241E88 0200282D */ daddu $a1, $s0, $zero -/* 91153C 80241E8C 0C090578 */ jal func_802415E0 +/* 91153C 80241E8C 0C090578 */ jal func_802415E0_910C90 /* 911540 80241E90 0260302D */ daddu $a2, $s3, $zero /* 911544 80241E94 0280202D */ daddu $a0, $s4, $zero /* 911548 80241E98 0200282D */ daddu $a1, $s0, $zero -/* 91154C 80241E9C 0C0905BC */ jal func_802416F0 +/* 91154C 80241E9C 0C0905BC */ jal func_802416F0_910DA0 /* 911550 80241EA0 0260302D */ daddu $a2, $s3, $zero /* 911554 80241EA4 080907D2 */ j .L80241F48 /* 911558 80241EA8 0000102D */ daddu $v0, $zero, $zero /* 91155C 80241EAC 0280202D */ daddu $a0, $s4, $zero /* 911560 80241EB0 0200282D */ daddu $a1, $s0, $zero -/* 911564 80241EB4 0C09064B */ jal func_8024192C +/* 911564 80241EB4 0C09064B */ jal func_8024192C_910FDC /* 911568 80241EB8 0260302D */ daddu $a2, $s3, $zero /* 91156C 80241EBC 0280202D */ daddu $a0, $s4, $zero /* 911570 80241EC0 0200282D */ daddu $a1, $s0, $zero -/* 911574 80241EC4 0C090670 */ jal func_802419C0 +/* 911574 80241EC4 0C090670 */ jal func_802419C0_911070 /* 911578 80241EC8 0260302D */ daddu $a2, $s3, $zero /* 91157C 80241ECC 8E830070 */ lw $v1, 0x70($s4) /* 911580 80241ED0 2402000E */ addiu $v0, $zero, 0xe @@ -97,7 +97,7 @@ glabel func_80241D70_911420 /* 911588 80241ED8 0000102D */ daddu $v0, $zero, $zero /* 91158C 80241EDC 0280202D */ daddu $a0, $s4, $zero /* 911590 80241EE0 0200282D */ daddu $a1, $s0, $zero -/* 911594 80241EE4 0C090693 */ jal func_80241A4C +/* 911594 80241EE4 0C090693 */ jal func_80241A4C_9110FC /* 911598 80241EE8 0260302D */ daddu $a2, $s3, $zero /* 91159C 80241EEC 8E830070 */ lw $v1, 0x70($s4) /* 9115A0 80241EF0 2402000F */ addiu $v0, $zero, 0xf @@ -105,7 +105,7 @@ glabel func_80241D70_911420 /* 9115A8 80241EF8 0000102D */ daddu $v0, $zero, $zero /* 9115AC 80241EFC 0280202D */ daddu $a0, $s4, $zero /* 9115B0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* 9115B4 80241F04 0C0906DD */ jal func_80241B74 +/* 9115B4 80241F04 0C0906DD */ jal func_80241B74_911224 /* 9115B8 80241F08 0260302D */ daddu $a2, $s3, $zero /* 9115BC 80241F0C 8E830070 */ lw $v1, 0x70($s4) /* 9115C0 80241F10 24020010 */ addiu $v0, $zero, 0x10 @@ -113,13 +113,13 @@ glabel func_80241D70_911420 /* 9115C8 80241F18 0000102D */ daddu $v0, $zero, $zero /* 9115CC 80241F1C 0280202D */ daddu $a0, $s4, $zero /* 9115D0 80241F20 0200282D */ daddu $a1, $s0, $zero -/* 9115D4 80241F24 0C09071E */ jal func_80241C78 +/* 9115D4 80241F24 0C09071E */ jal func_80241C78_911328 /* 9115D8 80241F28 0260302D */ daddu $a2, $s3, $zero /* 9115DC 80241F2C 080907D2 */ j .L80241F48 /* 9115E0 80241F30 0000102D */ daddu $v0, $zero, $zero /* 9115E4 80241F34 0280202D */ daddu $a0, $s4, $zero /* 9115E8 80241F38 0200282D */ daddu $a1, $s0, $zero -/* 9115EC 80241F3C 0C09073C */ jal func_80241CF0 +/* 9115EC 80241F3C 0C09073C */ jal func_80241CF0_9113A0 /* 9115F0 80241F40 0260302D */ daddu $a2, $s3, $zero .L80241F44: /* 9115F4 80241F44 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s index 7612e2ee9a..4f897974d1 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s @@ -159,7 +159,7 @@ glabel func_80241F6C_91161C /* 911868 802421B8 0260202D */ daddu $a0, $s3, $zero /* 91186C 802421BC 8E050024 */ lw $a1, 0x24($s0) /* 911870 802421C0 8E060028 */ lw $a2, 0x28($s0) -/* 911874 802421C4 0C0901C4 */ jal func_80240710 +/* 911874 802421C4 0C0901C4 */ jal func_80240710_90FDC0 /* 911878 802421C8 02A0382D */ daddu $a3, $s5, $zero /* 91187C 802421CC 8E630070 */ lw $v1, 0x70($s3) /* 911880 802421D0 2402000C */ addiu $v0, $zero, 0xc @@ -182,19 +182,19 @@ glabel func_80241F6C_91161C /* 9118C0 80242210 02A0302D */ daddu $a2, $s5, $zero /* 9118C4 80242214 08090899 */ j .L80242264 /* 9118C8 80242218 00000000 */ nop -/* 9118CC 8024221C 0C090215 */ jal func_80240854 +/* 9118CC 8024221C 0C090215 */ jal func_80240854_90FF04 /* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero /* 9118D4 80242224 08090899 */ j .L80242264 /* 9118D8 80242228 00000000 */ nop -/* 9118DC 8024222C 0C090255 */ jal func_80240954 +/* 9118DC 8024222C 0C090255 */ jal func_80240954_910004 /* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero /* 9118E4 80242234 08090899 */ j .L80242264 /* 9118E8 80242238 00000000 */ nop -/* 9118EC 8024223C 0C090266 */ jal func_80240998 +/* 9118EC 8024223C 0C090266 */ jal func_80240998_910048 /* 9118F0 80242240 0260202D */ daddu $a0, $s3, $zero /* 9118F4 80242244 08090899 */ j .L80242264 /* 9118F8 80242248 00000000 */ nop -/* 9118FC 8024224C 0C09028E */ jal func_80240A38 +/* 9118FC 8024224C 0C09028E */ jal func_80240A38_9100E8 /* 911900 80242250 0260202D */ daddu $a0, $s3, $zero /* 911904 80242254 08090899 */ j .L80242264 /* 911908 80242258 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4.s deleted file mode 100644 index b3fe5132eb..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422C4 -/* 911974 802422C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 911978 802422C8 AFBF001C */ sw $ra, 0x1c($sp) -/* 91197C 802422CC AFB20018 */ sw $s2, 0x18($sp) -/* 911980 802422D0 AFB10014 */ sw $s1, 0x14($sp) -/* 911984 802422D4 AFB00010 */ sw $s0, 0x10($sp) -/* 911988 802422D8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 91198C 802422DC 8C900148 */ lw $s0, 0x148($a0) -/* 911990 802422E0 86040008 */ lh $a0, 8($s0) -/* 911994 802422E4 3C014387 */ lui $at, 0x4387 -/* 911998 802422E8 4481A000 */ mtc1 $at, $f20 -/* 91199C 802422EC 0C00EABB */ jal get_npc_unsafe -/* 9119A0 802422F0 00A0882D */ daddu $s1, $a1, $zero -/* 9119A4 802422F4 0200202D */ daddu $a0, $s0, $zero -/* 9119A8 802422F8 8E26000C */ lw $a2, 0xc($s1) -/* 9119AC 802422FC 8E270010 */ lw $a3, 0x10($s1) -/* 9119B0 80242300 0040882D */ daddu $s1, $v0, $zero -/* 9119B4 80242304 3C03800B */ lui $v1, %hi(gCameras) -/* 9119B8 80242308 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 9119BC 8024230C 3C02800A */ lui $v0, 0x800a -/* 9119C0 80242310 8442A634 */ lh $v0, -0x59cc($v0) -/* 9119C4 80242314 0000282D */ daddu $a1, $zero, $zero -/* 9119C8 80242318 00028080 */ sll $s0, $v0, 2 -/* 9119CC 8024231C 02028021 */ addu $s0, $s0, $v0 -/* 9119D0 80242320 00108080 */ sll $s0, $s0, 2 -/* 9119D4 80242324 02028023 */ subu $s0, $s0, $v0 -/* 9119D8 80242328 001010C0 */ sll $v0, $s0, 3 -/* 9119DC 8024232C 02028021 */ addu $s0, $s0, $v0 -/* 9119E0 80242330 001080C0 */ sll $s0, $s0, 3 -/* 9119E4 80242334 0C0124FB */ jal func_800493EC -/* 9119E8 80242338 02038021 */ addu $s0, $s0, $v1 -/* 9119EC 8024233C C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9119F0 80242340 C62E000C */ lwc1 $f14, 0xc($s1) -/* 9119F4 80242344 0C00A70A */ jal get_clamped_angle_diff -/* 9119F8 80242348 0002802B */ sltu $s0, $zero, $v0 -/* 9119FC 8024234C 0C00A6C9 */ jal clamp_angle -/* 911A00 80242350 46000306 */ mov.s $f12, $f0 -/* 911A04 80242354 3C018024 */ lui $at, 0x8024 -/* 911A08 80242358 D42265C0 */ ldc1 $f2, 0x65c0($at) -/* 911A0C 8024235C 46000021 */ cvt.d.s $f0, $f0 -/* 911A10 80242360 4622003C */ c.lt.d $f0, $f2 -/* 911A14 80242364 00000000 */ nop -/* 911A18 80242368 45000003 */ bc1f .L80242378 -/* 911A1C 8024236C 00000000 */ nop -/* 911A20 80242370 3C0142B4 */ lui $at, 0x42b4 -/* 911A24 80242374 4481A000 */ mtc1 $at, $f20 -.L80242378: -/* 911A28 80242378 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 911A2C 8024237C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 911A30 80242380 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 911A34 80242384 8E420000 */ lw $v0, ($s2) -/* 911A38 80242388 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 911A3C 8024238C 8C460028 */ lw $a2, 0x28($v0) -/* 911A40 80242390 0C00A720 */ jal atan2 -/* 911A44 80242394 8C470030 */ lw $a3, 0x30($v0) -/* 911A48 80242398 4600A306 */ mov.s $f12, $f20 -/* 911A4C 8024239C 0C00A70A */ jal get_clamped_angle_diff -/* 911A50 802423A0 46000386 */ mov.s $f14, $f0 -/* 911A54 802423A4 46000005 */ abs.s $f0, $f0 -/* 911A58 802423A8 3C018024 */ lui $at, 0x8024 -/* 911A5C 802423AC D42265C8 */ ldc1 $f2, 0x65c8($at) -/* 911A60 802423B0 46000021 */ cvt.d.s $f0, $f0 -/* 911A64 802423B4 4620103C */ c.lt.d $f2, $f0 -/* 911A68 802423B8 00000000 */ nop -/* 911A6C 802423BC 45030001 */ bc1tl .L802423C4 -/* 911A70 802423C0 0000802D */ daddu $s0, $zero, $zero -.L802423C4: -/* 911A74 802423C4 8E420000 */ lw $v0, ($s2) -/* 911A78 802423C8 C620003C */ lwc1 $f0, 0x3c($s1) -/* 911A7C 802423CC C442002C */ lwc1 $f2, 0x2c($v0) -/* 911A80 802423D0 46020001 */ sub.s $f0, $f0, $f2 -/* 911A84 802423D4 3C014220 */ lui $at, 0x4220 -/* 911A88 802423D8 44811000 */ mtc1 $at, $f2 -/* 911A8C 802423DC 46000005 */ abs.s $f0, $f0 -/* 911A90 802423E0 4600103E */ c.le.s $f2, $f0 -/* 911A94 802423E4 00000000 */ nop -/* 911A98 802423E8 45030001 */ bc1tl .L802423F0 -/* 911A9C 802423EC 0000802D */ daddu $s0, $zero, $zero -.L802423F0: -/* 911AA0 802423F0 3C038011 */ lui $v1, 0x8011 -/* 911AA4 802423F4 8063EBB3 */ lb $v1, -0x144d($v1) -/* 911AA8 802423F8 24020009 */ addiu $v0, $zero, 9 -/* 911AAC 802423FC 50620001 */ beql $v1, $v0, .L80242404 -/* 911AB0 80242400 0000802D */ daddu $s0, $zero, $zero -.L80242404: -/* 911AB4 80242404 0200102D */ daddu $v0, $s0, $zero -/* 911AB8 80242408 8FBF001C */ lw $ra, 0x1c($sp) -/* 911ABC 8024240C 8FB20018 */ lw $s2, 0x18($sp) -/* 911AC0 80242410 8FB10014 */ lw $s1, 0x14($sp) -/* 911AC4 80242414 8FB00010 */ lw $s0, 0x10($sp) -/* 911AC8 80242418 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 911ACC 8024241C 03E00008 */ jr $ra -/* 911AD0 80242420 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s new file mode 100644 index 0000000000..6004bc6399 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802422C4_911974.s @@ -0,0 +1,96 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422C4_911974 +/* 911974 802422C4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 911978 802422C8 AFBF001C */ sw $ra, 0x1c($sp) +/* 91197C 802422CC AFB20018 */ sw $s2, 0x18($sp) +/* 911980 802422D0 AFB10014 */ sw $s1, 0x14($sp) +/* 911984 802422D4 AFB00010 */ sw $s0, 0x10($sp) +/* 911988 802422D8 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 91198C 802422DC 8C900148 */ lw $s0, 0x148($a0) +/* 911990 802422E0 86040008 */ lh $a0, 8($s0) +/* 911994 802422E4 3C014387 */ lui $at, 0x4387 +/* 911998 802422E8 4481A000 */ mtc1 $at, $f20 +/* 91199C 802422EC 0C00EABB */ jal get_npc_unsafe +/* 9119A0 802422F0 00A0882D */ daddu $s1, $a1, $zero +/* 9119A4 802422F4 0200202D */ daddu $a0, $s0, $zero +/* 9119A8 802422F8 8E26000C */ lw $a2, 0xc($s1) +/* 9119AC 802422FC 8E270010 */ lw $a3, 0x10($s1) +/* 9119B0 80242300 0040882D */ daddu $s1, $v0, $zero +/* 9119B4 80242304 3C03800B */ lui $v1, %hi(gCameras) +/* 9119B8 80242308 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* 9119BC 8024230C 3C02800A */ lui $v0, 0x800a +/* 9119C0 80242310 8442A634 */ lh $v0, -0x59cc($v0) +/* 9119C4 80242314 0000282D */ daddu $a1, $zero, $zero +/* 9119C8 80242318 00028080 */ sll $s0, $v0, 2 +/* 9119CC 8024231C 02028021 */ addu $s0, $s0, $v0 +/* 9119D0 80242320 00108080 */ sll $s0, $s0, 2 +/* 9119D4 80242324 02028023 */ subu $s0, $s0, $v0 +/* 9119D8 80242328 001010C0 */ sll $v0, $s0, 3 +/* 9119DC 8024232C 02028021 */ addu $s0, $s0, $v0 +/* 9119E0 80242330 001080C0 */ sll $s0, $s0, 3 +/* 9119E4 80242334 0C0124FB */ jal func_800493EC +/* 9119E8 80242338 02038021 */ addu $s0, $s0, $v1 +/* 9119EC 8024233C C60C006C */ lwc1 $f12, 0x6c($s0) +/* 9119F0 80242340 C62E000C */ lwc1 $f14, 0xc($s1) +/* 9119F4 80242344 0C00A70A */ jal get_clamped_angle_diff +/* 9119F8 80242348 0002802B */ sltu $s0, $zero, $v0 +/* 9119FC 8024234C 0C00A6C9 */ jal clamp_angle +/* 911A00 80242350 46000306 */ mov.s $f12, $f0 +/* 911A04 80242354 3C018024 */ lui $at, 0x8024 +/* 911A08 80242358 D42265C0 */ ldc1 $f2, 0x65c0($at) +/* 911A0C 8024235C 46000021 */ cvt.d.s $f0, $f0 +/* 911A10 80242360 4622003C */ c.lt.d $f0, $f2 +/* 911A14 80242364 00000000 */ nop +/* 911A18 80242368 45000003 */ bc1f .L80242378 +/* 911A1C 8024236C 00000000 */ nop +/* 911A20 80242370 3C0142B4 */ lui $at, 0x42b4 +/* 911A24 80242374 4481A000 */ mtc1 $at, $f20 +.L80242378: +/* 911A28 80242378 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) +/* 911A2C 8024237C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) +/* 911A30 80242380 C62C0038 */ lwc1 $f12, 0x38($s1) +/* 911A34 80242384 8E420000 */ lw $v0, ($s2) +/* 911A38 80242388 C62E0040 */ lwc1 $f14, 0x40($s1) +/* 911A3C 8024238C 8C460028 */ lw $a2, 0x28($v0) +/* 911A40 80242390 0C00A720 */ jal atan2 +/* 911A44 80242394 8C470030 */ lw $a3, 0x30($v0) +/* 911A48 80242398 4600A306 */ mov.s $f12, $f20 +/* 911A4C 8024239C 0C00A70A */ jal get_clamped_angle_diff +/* 911A50 802423A0 46000386 */ mov.s $f14, $f0 +/* 911A54 802423A4 46000005 */ abs.s $f0, $f0 +/* 911A58 802423A8 3C018024 */ lui $at, 0x8024 +/* 911A5C 802423AC D42265C8 */ ldc1 $f2, 0x65c8($at) +/* 911A60 802423B0 46000021 */ cvt.d.s $f0, $f0 +/* 911A64 802423B4 4620103C */ c.lt.d $f2, $f0 +/* 911A68 802423B8 00000000 */ nop +/* 911A6C 802423BC 45030001 */ bc1tl .L802423C4 +/* 911A70 802423C0 0000802D */ daddu $s0, $zero, $zero +.L802423C4: +/* 911A74 802423C4 8E420000 */ lw $v0, ($s2) +/* 911A78 802423C8 C620003C */ lwc1 $f0, 0x3c($s1) +/* 911A7C 802423CC C442002C */ lwc1 $f2, 0x2c($v0) +/* 911A80 802423D0 46020001 */ sub.s $f0, $f0, $f2 +/* 911A84 802423D4 3C014220 */ lui $at, 0x4220 +/* 911A88 802423D8 44811000 */ mtc1 $at, $f2 +/* 911A8C 802423DC 46000005 */ abs.s $f0, $f0 +/* 911A90 802423E0 4600103E */ c.le.s $f2, $f0 +/* 911A94 802423E4 00000000 */ nop +/* 911A98 802423E8 45030001 */ bc1tl .L802423F0 +/* 911A9C 802423EC 0000802D */ daddu $s0, $zero, $zero +.L802423F0: +/* 911AA0 802423F0 3C038011 */ lui $v1, 0x8011 +/* 911AA4 802423F4 8063EBB3 */ lb $v1, -0x144d($v1) +/* 911AA8 802423F8 24020009 */ addiu $v0, $zero, 9 +/* 911AAC 802423FC 50620001 */ beql $v1, $v0, .L80242404 +/* 911AB0 80242400 0000802D */ daddu $s0, $zero, $zero +.L80242404: +/* 911AB4 80242404 0200102D */ daddu $v0, $s0, $zero +/* 911AB8 80242408 8FBF001C */ lw $ra, 0x1c($sp) +/* 911ABC 8024240C 8FB20018 */ lw $s2, 0x18($sp) +/* 911AC0 80242410 8FB10014 */ lw $s1, 0x14($sp) +/* 911AC4 80242414 8FB00010 */ lw $s0, 0x10($sp) +/* 911AC8 80242418 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 911ACC 8024241C 03E00008 */ jr $ra +/* 911AD0 80242420 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498.s deleted file mode 100644 index db50d8fab3..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242498 -/* 911B48 80242498 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 911B4C 8024249C AFB3003C */ sw $s3, 0x3c($sp) -/* 911B50 802424A0 0080982D */ daddu $s3, $a0, $zero -/* 911B54 802424A4 AFBF0044 */ sw $ra, 0x44($sp) -/* 911B58 802424A8 AFB40040 */ sw $s4, 0x40($sp) -/* 911B5C 802424AC AFB20038 */ sw $s2, 0x38($sp) -/* 911B60 802424B0 AFB10034 */ sw $s1, 0x34($sp) -/* 911B64 802424B4 AFB00030 */ sw $s0, 0x30($sp) -/* 911B68 802424B8 8E700148 */ lw $s0, 0x148($s3) -/* 911B6C 802424BC 00A0902D */ daddu $s2, $a1, $zero -/* 911B70 802424C0 86040008 */ lh $a0, 8($s0) -/* 911B74 802424C4 0C00EABB */ jal get_npc_unsafe -/* 911B78 802424C8 00C0A02D */ daddu $s4, $a2, $zero -/* 911B7C 802424CC 8E630074 */ lw $v1, 0x74($s3) -/* 911B80 802424D0 1C600032 */ bgtz $v1, .L8024259C -/* 911B84 802424D4 0040882D */ daddu $s1, $v0, $zero -/* 911B88 802424D8 8E420014 */ lw $v0, 0x14($s2) -/* 911B8C 802424DC AE620074 */ sw $v0, 0x74($s3) -/* 911B90 802424E0 C640000C */ lwc1 $f0, 0xc($s2) -/* 911B94 802424E4 3C018024 */ lui $at, 0x8024 -/* 911B98 802424E8 D42265D0 */ ldc1 $f2, 0x65d0($at) -/* 911B9C 802424EC 46000021 */ cvt.d.s $f0, $f0 -/* 911BA0 802424F0 46220002 */ mul.d $f0, $f0, $f2 -/* 911BA4 802424F4 00000000 */ nop -/* 911BA8 802424F8 0280202D */ daddu $a0, $s4, $zero -/* 911BAC 802424FC AFA00010 */ sw $zero, 0x10($sp) -/* 911BB0 80242500 8E470010 */ lw $a3, 0x10($s2) -/* 911BB4 80242504 46200020 */ cvt.s.d $f0, $f0 -/* 911BB8 80242508 44060000 */ mfc1 $a2, $f0 -/* 911BBC 8024250C 0C01242D */ jal func_800490B4 -/* 911BC0 80242510 0200282D */ daddu $a1, $s0, $zero -/* 911BC4 80242514 10400021 */ beqz $v0, .L8024259C -/* 911BC8 80242518 0000202D */ daddu $a0, $zero, $zero -/* 911BCC 8024251C 0220282D */ daddu $a1, $s1, $zero -/* 911BD0 80242520 0000302D */ daddu $a2, $zero, $zero -/* 911BD4 80242524 8E0200CC */ lw $v0, 0xcc($s0) -/* 911BD8 80242528 3C013F80 */ lui $at, 0x3f80 -/* 911BDC 8024252C 44810000 */ mtc1 $at, $f0 -/* 911BE0 80242530 3C014000 */ lui $at, 0x4000 -/* 911BE4 80242534 44811000 */ mtc1 $at, $f2 -/* 911BE8 80242538 8C430024 */ lw $v1, 0x24($v0) -/* 911BEC 8024253C 862200A8 */ lh $v0, 0xa8($s1) -/* 911BF0 80242540 3C01C1A0 */ lui $at, 0xc1a0 -/* 911BF4 80242544 44812000 */ mtc1 $at, $f4 -/* 911BF8 80242548 44823000 */ mtc1 $v0, $f6 -/* 911BFC 8024254C 00000000 */ nop -/* 911C00 80242550 468031A0 */ cvt.s.w $f6, $f6 -/* 911C04 80242554 44073000 */ mfc1 $a3, $f6 -/* 911C08 80242558 2402000F */ addiu $v0, $zero, 0xf -/* 911C0C 8024255C AE230028 */ sw $v1, 0x28($s1) -/* 911C10 80242560 AFA2001C */ sw $v0, 0x1c($sp) -/* 911C14 80242564 27A20028 */ addiu $v0, $sp, 0x28 -/* 911C18 80242568 E7A00010 */ swc1 $f0, 0x10($sp) -/* 911C1C 8024256C E7A20014 */ swc1 $f2, 0x14($sp) -/* 911C20 80242570 E7A40018 */ swc1 $f4, 0x18($sp) -/* 911C24 80242574 0C01BFA4 */ jal fx_emote -/* 911C28 80242578 AFA20020 */ sw $v0, 0x20($sp) -/* 911C2C 8024257C 0220202D */ daddu $a0, $s1, $zero -/* 911C30 80242580 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 911C34 80242584 0C012530 */ jal func_800494C0 -/* 911C38 80242588 3C060020 */ lui $a2, 0x20 -/* 911C3C 8024258C 2402000C */ addiu $v0, $zero, 0xc -/* 911C40 80242590 A622008E */ sh $v0, 0x8e($s1) -/* 911C44 80242594 24020002 */ addiu $v0, $zero, 2 -/* 911C48 80242598 AE620070 */ sw $v0, 0x70($s3) -.L8024259C: -/* 911C4C 8024259C 8E620074 */ lw $v0, 0x74($s3) -/* 911C50 802425A0 2442FFFF */ addiu $v0, $v0, -1 -/* 911C54 802425A4 AE620074 */ sw $v0, 0x74($s3) -/* 911C58 802425A8 8FBF0044 */ lw $ra, 0x44($sp) -/* 911C5C 802425AC 8FB40040 */ lw $s4, 0x40($sp) -/* 911C60 802425B0 8FB3003C */ lw $s3, 0x3c($sp) -/* 911C64 802425B4 8FB20038 */ lw $s2, 0x38($sp) -/* 911C68 802425B8 8FB10034 */ lw $s1, 0x34($sp) -/* 911C6C 802425BC 8FB00030 */ lw $s0, 0x30($sp) -/* 911C70 802425C0 03E00008 */ jr $ra -/* 911C74 802425C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s new file mode 100644 index 0000000000..56bd5f893b --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242498_911B48.s @@ -0,0 +1,81 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242498_911B48 +/* 911B48 80242498 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 911B4C 8024249C AFB3003C */ sw $s3, 0x3c($sp) +/* 911B50 802424A0 0080982D */ daddu $s3, $a0, $zero +/* 911B54 802424A4 AFBF0044 */ sw $ra, 0x44($sp) +/* 911B58 802424A8 AFB40040 */ sw $s4, 0x40($sp) +/* 911B5C 802424AC AFB20038 */ sw $s2, 0x38($sp) +/* 911B60 802424B0 AFB10034 */ sw $s1, 0x34($sp) +/* 911B64 802424B4 AFB00030 */ sw $s0, 0x30($sp) +/* 911B68 802424B8 8E700148 */ lw $s0, 0x148($s3) +/* 911B6C 802424BC 00A0902D */ daddu $s2, $a1, $zero +/* 911B70 802424C0 86040008 */ lh $a0, 8($s0) +/* 911B74 802424C4 0C00EABB */ jal get_npc_unsafe +/* 911B78 802424C8 00C0A02D */ daddu $s4, $a2, $zero +/* 911B7C 802424CC 8E630074 */ lw $v1, 0x74($s3) +/* 911B80 802424D0 1C600032 */ bgtz $v1, .L8024259C +/* 911B84 802424D4 0040882D */ daddu $s1, $v0, $zero +/* 911B88 802424D8 8E420014 */ lw $v0, 0x14($s2) +/* 911B8C 802424DC AE620074 */ sw $v0, 0x74($s3) +/* 911B90 802424E0 C640000C */ lwc1 $f0, 0xc($s2) +/* 911B94 802424E4 3C018024 */ lui $at, 0x8024 +/* 911B98 802424E8 D42265D0 */ ldc1 $f2, 0x65d0($at) +/* 911B9C 802424EC 46000021 */ cvt.d.s $f0, $f0 +/* 911BA0 802424F0 46220002 */ mul.d $f0, $f0, $f2 +/* 911BA4 802424F4 00000000 */ nop +/* 911BA8 802424F8 0280202D */ daddu $a0, $s4, $zero +/* 911BAC 802424FC AFA00010 */ sw $zero, 0x10($sp) +/* 911BB0 80242500 8E470010 */ lw $a3, 0x10($s2) +/* 911BB4 80242504 46200020 */ cvt.s.d $f0, $f0 +/* 911BB8 80242508 44060000 */ mfc1 $a2, $f0 +/* 911BBC 8024250C 0C01242D */ jal func_800490B4 +/* 911BC0 80242510 0200282D */ daddu $a1, $s0, $zero +/* 911BC4 80242514 10400021 */ beqz $v0, .L8024259C +/* 911BC8 80242518 0000202D */ daddu $a0, $zero, $zero +/* 911BCC 8024251C 0220282D */ daddu $a1, $s1, $zero +/* 911BD0 80242520 0000302D */ daddu $a2, $zero, $zero +/* 911BD4 80242524 8E0200CC */ lw $v0, 0xcc($s0) +/* 911BD8 80242528 3C013F80 */ lui $at, 0x3f80 +/* 911BDC 8024252C 44810000 */ mtc1 $at, $f0 +/* 911BE0 80242530 3C014000 */ lui $at, 0x4000 +/* 911BE4 80242534 44811000 */ mtc1 $at, $f2 +/* 911BE8 80242538 8C430024 */ lw $v1, 0x24($v0) +/* 911BEC 8024253C 862200A8 */ lh $v0, 0xa8($s1) +/* 911BF0 80242540 3C01C1A0 */ lui $at, 0xc1a0 +/* 911BF4 80242544 44812000 */ mtc1 $at, $f4 +/* 911BF8 80242548 44823000 */ mtc1 $v0, $f6 +/* 911BFC 8024254C 00000000 */ nop +/* 911C00 80242550 468031A0 */ cvt.s.w $f6, $f6 +/* 911C04 80242554 44073000 */ mfc1 $a3, $f6 +/* 911C08 80242558 2402000F */ addiu $v0, $zero, 0xf +/* 911C0C 8024255C AE230028 */ sw $v1, 0x28($s1) +/* 911C10 80242560 AFA2001C */ sw $v0, 0x1c($sp) +/* 911C14 80242564 27A20028 */ addiu $v0, $sp, 0x28 +/* 911C18 80242568 E7A00010 */ swc1 $f0, 0x10($sp) +/* 911C1C 8024256C E7A20014 */ swc1 $f2, 0x14($sp) +/* 911C20 80242570 E7A40018 */ swc1 $f4, 0x18($sp) +/* 911C24 80242574 0C01BFA4 */ jal fx_emote +/* 911C28 80242578 AFA20020 */ sw $v0, 0x20($sp) +/* 911C2C 8024257C 0220202D */ daddu $a0, $s1, $zero +/* 911C30 80242580 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 911C34 80242584 0C012530 */ jal func_800494C0 +/* 911C38 80242588 3C060020 */ lui $a2, 0x20 +/* 911C3C 8024258C 2402000C */ addiu $v0, $zero, 0xc +/* 911C40 80242590 A622008E */ sh $v0, 0x8e($s1) +/* 911C44 80242594 24020002 */ addiu $v0, $zero, 2 +/* 911C48 80242598 AE620070 */ sw $v0, 0x70($s3) +.L8024259C: +/* 911C4C 8024259C 8E620074 */ lw $v0, 0x74($s3) +/* 911C50 802425A0 2442FFFF */ addiu $v0, $v0, -1 +/* 911C54 802425A4 AE620074 */ sw $v0, 0x74($s3) +/* 911C58 802425A8 8FBF0044 */ lw $ra, 0x44($sp) +/* 911C5C 802425AC 8FB40040 */ lw $s4, 0x40($sp) +/* 911C60 802425B0 8FB3003C */ lw $s3, 0x3c($sp) +/* 911C64 802425B4 8FB20038 */ lw $s2, 0x38($sp) +/* 911C68 802425B8 8FB10034 */ lw $s1, 0x34($sp) +/* 911C6C 802425BC 8FB00030 */ lw $s0, 0x30($sp) +/* 911C70 802425C0 03E00008 */ jr $ra +/* 911C74 802425C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8.s deleted file mode 100644 index a9acce296a..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425C8 -/* 911C78 802425C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 911C7C 802425CC AFB20018 */ sw $s2, 0x18($sp) -/* 911C80 802425D0 0080902D */ daddu $s2, $a0, $zero -/* 911C84 802425D4 AFBF001C */ sw $ra, 0x1c($sp) -/* 911C88 802425D8 AFB10014 */ sw $s1, 0x14($sp) -/* 911C8C 802425DC AFB00010 */ sw $s0, 0x10($sp) -/* 911C90 802425E0 8E510148 */ lw $s1, 0x148($s2) -/* 911C94 802425E4 0C00EABB */ jal get_npc_unsafe -/* 911C98 802425E8 86240008 */ lh $a0, 8($s1) -/* 911C9C 802425EC 0040802D */ daddu $s0, $v0, $zero -/* 911CA0 802425F0 9602008E */ lhu $v0, 0x8e($s0) -/* 911CA4 802425F4 2442FFFF */ addiu $v0, $v0, -1 -/* 911CA8 802425F8 A602008E */ sh $v0, 0x8e($s0) -/* 911CAC 802425FC 00021400 */ sll $v0, $v0, 0x10 -/* 911CB0 80242600 1C400012 */ bgtz $v0, .L8024264C -/* 911CB4 80242604 00000000 */ nop -/* 911CB8 80242608 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 911CBC 8024260C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 911CC0 80242610 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 911CC4 80242614 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 911CC8 80242618 8C460028 */ lw $a2, 0x28($v0) -/* 911CCC 8024261C 0C00A720 */ jal atan2 -/* 911CD0 80242620 8C470030 */ lw $a3, 0x30($v0) -/* 911CD4 80242624 0200202D */ daddu $a0, $s0, $zero -/* 911CD8 80242628 0C00EAE8 */ jal enable_npc_shadow -/* 911CDC 8024262C E600000C */ swc1 $f0, 0xc($s0) -/* 911CE0 80242630 8E2200CC */ lw $v0, 0xcc($s1) -/* 911CE4 80242634 8C430028 */ lw $v1, 0x28($v0) -/* 911CE8 80242638 24020008 */ addiu $v0, $zero, 8 -/* 911CEC 8024263C A602008E */ sh $v0, 0x8e($s0) -/* 911CF0 80242640 24020003 */ addiu $v0, $zero, 3 -/* 911CF4 80242644 AE030028 */ sw $v1, 0x28($s0) -/* 911CF8 80242648 AE420070 */ sw $v0, 0x70($s2) -.L8024264C: -/* 911CFC 8024264C 8FBF001C */ lw $ra, 0x1c($sp) -/* 911D00 80242650 8FB20018 */ lw $s2, 0x18($sp) -/* 911D04 80242654 8FB10014 */ lw $s1, 0x14($sp) -/* 911D08 80242658 8FB00010 */ lw $s0, 0x10($sp) -/* 911D0C 8024265C 03E00008 */ jr $ra -/* 911D10 80242660 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8_911C78.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8_911C78.s new file mode 100644 index 0000000000..ad3b2fd6ee --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802425C8_911C78.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425C8_911C78 +/* 911C78 802425C8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 911C7C 802425CC AFB20018 */ sw $s2, 0x18($sp) +/* 911C80 802425D0 0080902D */ daddu $s2, $a0, $zero +/* 911C84 802425D4 AFBF001C */ sw $ra, 0x1c($sp) +/* 911C88 802425D8 AFB10014 */ sw $s1, 0x14($sp) +/* 911C8C 802425DC AFB00010 */ sw $s0, 0x10($sp) +/* 911C90 802425E0 8E510148 */ lw $s1, 0x148($s2) +/* 911C94 802425E4 0C00EABB */ jal get_npc_unsafe +/* 911C98 802425E8 86240008 */ lh $a0, 8($s1) +/* 911C9C 802425EC 0040802D */ daddu $s0, $v0, $zero +/* 911CA0 802425F0 9602008E */ lhu $v0, 0x8e($s0) +/* 911CA4 802425F4 2442FFFF */ addiu $v0, $v0, -1 +/* 911CA8 802425F8 A602008E */ sh $v0, 0x8e($s0) +/* 911CAC 802425FC 00021400 */ sll $v0, $v0, 0x10 +/* 911CB0 80242600 1C400012 */ bgtz $v0, .L8024264C +/* 911CB4 80242604 00000000 */ nop +/* 911CB8 80242608 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 911CBC 8024260C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 911CC0 80242610 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 911CC4 80242614 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 911CC8 80242618 8C460028 */ lw $a2, 0x28($v0) +/* 911CCC 8024261C 0C00A720 */ jal atan2 +/* 911CD0 80242620 8C470030 */ lw $a3, 0x30($v0) +/* 911CD4 80242624 0200202D */ daddu $a0, $s0, $zero +/* 911CD8 80242628 0C00EAE8 */ jal enable_npc_shadow +/* 911CDC 8024262C E600000C */ swc1 $f0, 0xc($s0) +/* 911CE0 80242630 8E2200CC */ lw $v0, 0xcc($s1) +/* 911CE4 80242634 8C430028 */ lw $v1, 0x28($v0) +/* 911CE8 80242638 24020008 */ addiu $v0, $zero, 8 +/* 911CEC 8024263C A602008E */ sh $v0, 0x8e($s0) +/* 911CF0 80242640 24020003 */ addiu $v0, $zero, 3 +/* 911CF4 80242644 AE030028 */ sw $v1, 0x28($s0) +/* 911CF8 80242648 AE420070 */ sw $v0, 0x70($s2) +.L8024264C: +/* 911CFC 8024264C 8FBF001C */ lw $ra, 0x1c($sp) +/* 911D00 80242650 8FB20018 */ lw $s2, 0x18($sp) +/* 911D04 80242654 8FB10014 */ lw $s1, 0x14($sp) +/* 911D08 80242658 8FB00010 */ lw $s0, 0x10($sp) +/* 911D0C 8024265C 03E00008 */ jr $ra +/* 911D10 80242660 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664.s deleted file mode 100644 index bab26408b8..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242664 -/* 911D14 80242664 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 911D18 80242668 AFB10014 */ sw $s1, 0x14($sp) -/* 911D1C 8024266C 0080882D */ daddu $s1, $a0, $zero -/* 911D20 80242670 AFBF0018 */ sw $ra, 0x18($sp) -/* 911D24 80242674 AFB00010 */ sw $s0, 0x10($sp) -/* 911D28 80242678 8E220148 */ lw $v0, 0x148($s1) -/* 911D2C 8024267C 0C00EABB */ jal get_npc_unsafe -/* 911D30 80242680 84440008 */ lh $a0, 8($v0) -/* 911D34 80242684 0040802D */ daddu $s0, $v0, $zero -/* 911D38 80242688 9602008E */ lhu $v0, 0x8e($s0) -/* 911D3C 8024268C 2442FFFF */ addiu $v0, $v0, -1 -/* 911D40 80242690 A602008E */ sh $v0, 0x8e($s0) -/* 911D44 80242694 00021400 */ sll $v0, $v0, 0x10 -/* 911D48 80242698 1C40000F */ bgtz $v0, .L802426D8 -/* 911D4C 8024269C 00000000 */ nop -/* 911D50 802426A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 911D54 802426A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 911D58 802426A8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 911D5C 802426AC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 911D60 802426B0 8C460028 */ lw $a2, 0x28($v0) -/* 911D64 802426B4 0C00A720 */ jal atan2 -/* 911D68 802426B8 8C470030 */ lw $a3, 0x30($v0) -/* 911D6C 802426BC 2402001A */ addiu $v0, $zero, 0x1a -/* 911D70 802426C0 A60200A8 */ sh $v0, 0xa8($s0) -/* 911D74 802426C4 24020018 */ addiu $v0, $zero, 0x18 -/* 911D78 802426C8 A60200A6 */ sh $v0, 0xa6($s0) -/* 911D7C 802426CC 24020004 */ addiu $v0, $zero, 4 -/* 911D80 802426D0 E600000C */ swc1 $f0, 0xc($s0) -/* 911D84 802426D4 AE220070 */ sw $v0, 0x70($s1) -.L802426D8: -/* 911D88 802426D8 8FBF0018 */ lw $ra, 0x18($sp) -/* 911D8C 802426DC 8FB10014 */ lw $s1, 0x14($sp) -/* 911D90 802426E0 8FB00010 */ lw $s0, 0x10($sp) -/* 911D94 802426E4 03E00008 */ jr $ra -/* 911D98 802426E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664_911D14.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664_911D14.s new file mode 100644 index 0000000000..7095da917b --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242664_911D14.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242664_911D14 +/* 911D14 80242664 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 911D18 80242668 AFB10014 */ sw $s1, 0x14($sp) +/* 911D1C 8024266C 0080882D */ daddu $s1, $a0, $zero +/* 911D20 80242670 AFBF0018 */ sw $ra, 0x18($sp) +/* 911D24 80242674 AFB00010 */ sw $s0, 0x10($sp) +/* 911D28 80242678 8E220148 */ lw $v0, 0x148($s1) +/* 911D2C 8024267C 0C00EABB */ jal get_npc_unsafe +/* 911D30 80242680 84440008 */ lh $a0, 8($v0) +/* 911D34 80242684 0040802D */ daddu $s0, $v0, $zero +/* 911D38 80242688 9602008E */ lhu $v0, 0x8e($s0) +/* 911D3C 8024268C 2442FFFF */ addiu $v0, $v0, -1 +/* 911D40 80242690 A602008E */ sh $v0, 0x8e($s0) +/* 911D44 80242694 00021400 */ sll $v0, $v0, 0x10 +/* 911D48 80242698 1C40000F */ bgtz $v0, .L802426D8 +/* 911D4C 8024269C 00000000 */ nop +/* 911D50 802426A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 911D54 802426A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 911D58 802426A8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 911D5C 802426AC C60E0040 */ lwc1 $f14, 0x40($s0) +/* 911D60 802426B0 8C460028 */ lw $a2, 0x28($v0) +/* 911D64 802426B4 0C00A720 */ jal atan2 +/* 911D68 802426B8 8C470030 */ lw $a3, 0x30($v0) +/* 911D6C 802426BC 2402001A */ addiu $v0, $zero, 0x1a +/* 911D70 802426C0 A60200A8 */ sh $v0, 0xa8($s0) +/* 911D74 802426C4 24020018 */ addiu $v0, $zero, 0x18 +/* 911D78 802426C8 A60200A6 */ sh $v0, 0xa6($s0) +/* 911D7C 802426CC 24020004 */ addiu $v0, $zero, 4 +/* 911D80 802426D0 E600000C */ swc1 $f0, 0xc($s0) +/* 911D84 802426D4 AE220070 */ sw $v0, 0x70($s1) +.L802426D8: +/* 911D88 802426D8 8FBF0018 */ lw $ra, 0x18($sp) +/* 911D8C 802426DC 8FB10014 */ lw $s1, 0x14($sp) +/* 911D90 802426E0 8FB00010 */ lw $s0, 0x10($sp) +/* 911D94 802426E4 03E00008 */ jr $ra +/* 911D98 802426E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC.s deleted file mode 100644 index 12ea288515..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426EC -/* 911D9C 802426EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 911DA0 802426F0 AFB10014 */ sw $s1, 0x14($sp) -/* 911DA4 802426F4 0080882D */ daddu $s1, $a0, $zero -/* 911DA8 802426F8 AFBF001C */ sw $ra, 0x1c($sp) -/* 911DAC 802426FC AFB20018 */ sw $s2, 0x18($sp) -/* 911DB0 80242700 AFB00010 */ sw $s0, 0x10($sp) -/* 911DB4 80242704 8E320148 */ lw $s2, 0x148($s1) -/* 911DB8 80242708 0C00EABB */ jal get_npc_unsafe -/* 911DBC 8024270C 86440008 */ lh $a0, 8($s2) -/* 911DC0 80242710 240400B4 */ addiu $a0, $zero, 0xb4 -/* 911DC4 80242714 0C00A67F */ jal rand_int -/* 911DC8 80242718 0040802D */ daddu $s0, $v0, $zero -/* 911DCC 8024271C C60C000C */ lwc1 $f12, 0xc($s0) -/* 911DD0 80242720 44820000 */ mtc1 $v0, $f0 -/* 911DD4 80242724 00000000 */ nop -/* 911DD8 80242728 46800020 */ cvt.s.w $f0, $f0 -/* 911DDC 8024272C 46006300 */ add.s $f12, $f12, $f0 -/* 911DE0 80242730 3C0142B4 */ lui $at, 0x42b4 -/* 911DE4 80242734 44810000 */ mtc1 $at, $f0 -/* 911DE8 80242738 0C00A6C9 */ jal clamp_angle -/* 911DEC 8024273C 46006301 */ sub.s $f12, $f12, $f0 -/* 911DF0 80242740 E600000C */ swc1 $f0, 0xc($s0) -/* 911DF4 80242744 8E4200CC */ lw $v0, 0xcc($s2) -/* 911DF8 80242748 8C420000 */ lw $v0, ($v0) -/* 911DFC 8024274C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 911E00 80242750 0C00A67F */ jal rand_int -/* 911E04 80242754 AE020028 */ sw $v0, 0x28($s0) -/* 911E08 80242758 00021FC2 */ srl $v1, $v0, 0x1f -/* 911E0C 8024275C 00431821 */ addu $v1, $v0, $v1 -/* 911E10 80242760 00031843 */ sra $v1, $v1, 1 -/* 911E14 80242764 00031840 */ sll $v1, $v1, 1 -/* 911E18 80242768 00431023 */ subu $v0, $v0, $v1 -/* 911E1C 8024276C 24420002 */ addiu $v0, $v0, 2 -/* 911E20 80242770 AE220074 */ sw $v0, 0x74($s1) -/* 911E24 80242774 24020005 */ addiu $v0, $zero, 5 -/* 911E28 80242778 AE220070 */ sw $v0, 0x70($s1) -/* 911E2C 8024277C 8FBF001C */ lw $ra, 0x1c($sp) -/* 911E30 80242780 8FB20018 */ lw $s2, 0x18($sp) -/* 911E34 80242784 8FB10014 */ lw $s1, 0x14($sp) -/* 911E38 80242788 8FB00010 */ lw $s0, 0x10($sp) -/* 911E3C 8024278C 03E00008 */ jr $ra -/* 911E40 80242790 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC_911D9C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC_911D9C.s new file mode 100644 index 0000000000..5c6a79e6a5 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_802426EC_911D9C.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426EC_911D9C +/* 911D9C 802426EC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 911DA0 802426F0 AFB10014 */ sw $s1, 0x14($sp) +/* 911DA4 802426F4 0080882D */ daddu $s1, $a0, $zero +/* 911DA8 802426F8 AFBF001C */ sw $ra, 0x1c($sp) +/* 911DAC 802426FC AFB20018 */ sw $s2, 0x18($sp) +/* 911DB0 80242700 AFB00010 */ sw $s0, 0x10($sp) +/* 911DB4 80242704 8E320148 */ lw $s2, 0x148($s1) +/* 911DB8 80242708 0C00EABB */ jal get_npc_unsafe +/* 911DBC 8024270C 86440008 */ lh $a0, 8($s2) +/* 911DC0 80242710 240400B4 */ addiu $a0, $zero, 0xb4 +/* 911DC4 80242714 0C00A67F */ jal rand_int +/* 911DC8 80242718 0040802D */ daddu $s0, $v0, $zero +/* 911DCC 8024271C C60C000C */ lwc1 $f12, 0xc($s0) +/* 911DD0 80242720 44820000 */ mtc1 $v0, $f0 +/* 911DD4 80242724 00000000 */ nop +/* 911DD8 80242728 46800020 */ cvt.s.w $f0, $f0 +/* 911DDC 8024272C 46006300 */ add.s $f12, $f12, $f0 +/* 911DE0 80242730 3C0142B4 */ lui $at, 0x42b4 +/* 911DE4 80242734 44810000 */ mtc1 $at, $f0 +/* 911DE8 80242738 0C00A6C9 */ jal clamp_angle +/* 911DEC 8024273C 46006301 */ sub.s $f12, $f12, $f0 +/* 911DF0 80242740 E600000C */ swc1 $f0, 0xc($s0) +/* 911DF4 80242744 8E4200CC */ lw $v0, 0xcc($s2) +/* 911DF8 80242748 8C420000 */ lw $v0, ($v0) +/* 911DFC 8024274C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 911E00 80242750 0C00A67F */ jal rand_int +/* 911E04 80242754 AE020028 */ sw $v0, 0x28($s0) +/* 911E08 80242758 00021FC2 */ srl $v1, $v0, 0x1f +/* 911E0C 8024275C 00431821 */ addu $v1, $v0, $v1 +/* 911E10 80242760 00031843 */ sra $v1, $v1, 1 +/* 911E14 80242764 00031840 */ sll $v1, $v1, 1 +/* 911E18 80242768 00431023 */ subu $v0, $v0, $v1 +/* 911E1C 8024276C 24420002 */ addiu $v0, $v0, 2 +/* 911E20 80242770 AE220074 */ sw $v0, 0x74($s1) +/* 911E24 80242774 24020005 */ addiu $v0, $zero, 5 +/* 911E28 80242778 AE220070 */ sw $v0, 0x70($s1) +/* 911E2C 8024277C 8FBF001C */ lw $ra, 0x1c($sp) +/* 911E30 80242780 8FB20018 */ lw $s2, 0x18($sp) +/* 911E34 80242784 8FB10014 */ lw $s1, 0x14($sp) +/* 911E38 80242788 8FB00010 */ lw $s0, 0x10($sp) +/* 911E3C 8024278C 03E00008 */ jr $ra +/* 911E40 80242790 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794.s deleted file mode 100644 index cecbc36b6e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242794 -/* 911E44 80242794 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 911E48 80242798 AFB3003C */ sw $s3, 0x3c($sp) -/* 911E4C 8024279C 0080982D */ daddu $s3, $a0, $zero -/* 911E50 802427A0 AFBF0040 */ sw $ra, 0x40($sp) -/* 911E54 802427A4 AFB20038 */ sw $s2, 0x38($sp) -/* 911E58 802427A8 AFB10034 */ sw $s1, 0x34($sp) -/* 911E5C 802427AC AFB00030 */ sw $s0, 0x30($sp) -/* 911E60 802427B0 8E700148 */ lw $s0, 0x148($s3) -/* 911E64 802427B4 00A0902D */ daddu $s2, $a1, $zero -/* 911E68 802427B8 86040008 */ lh $a0, 8($s0) -/* 911E6C 802427BC 0C00EABB */ jal get_npc_unsafe -/* 911E70 802427C0 00C0882D */ daddu $s1, $a2, $zero -/* 911E74 802427C4 0220202D */ daddu $a0, $s1, $zero -/* 911E78 802427C8 0200282D */ daddu $a1, $s0, $zero -/* 911E7C 802427CC AFA00010 */ sw $zero, 0x10($sp) -/* 911E80 802427D0 8E460024 */ lw $a2, 0x24($s2) -/* 911E84 802427D4 8E470028 */ lw $a3, 0x28($s2) -/* 911E88 802427D8 0C01242D */ jal func_800490B4 -/* 911E8C 802427DC 0040802D */ daddu $s0, $v0, $zero -/* 911E90 802427E0 1040000B */ beqz $v0, .L80242810 -/* 911E94 802427E4 00000000 */ nop -/* 911E98 802427E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 911E9C 802427EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 911EA0 802427F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 911EA4 802427F4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 911EA8 802427F8 8C460028 */ lw $a2, 0x28($v0) -/* 911EAC 802427FC 0C00A720 */ jal atan2 -/* 911EB0 80242800 8C470030 */ lw $a3, 0x30($v0) -/* 911EB4 80242804 2402000C */ addiu $v0, $zero, 0xc -/* 911EB8 80242808 08090A3A */ j .L802428E8 -/* 911EBC 8024280C E600000C */ swc1 $f0, 0xc($s0) -.L80242810: -/* 911EC0 80242810 9602008E */ lhu $v0, 0x8e($s0) -/* 911EC4 80242814 2442FFFF */ addiu $v0, $v0, -1 -/* 911EC8 80242818 A602008E */ sh $v0, 0x8e($s0) -/* 911ECC 8024281C 00021400 */ sll $v0, $v0, 0x10 -/* 911ED0 80242820 1C400032 */ bgtz $v0, .L802428EC -/* 911ED4 80242824 00000000 */ nop -/* 911ED8 80242828 8E620074 */ lw $v0, 0x74($s3) -/* 911EDC 8024282C 2442FFFF */ addiu $v0, $v0, -1 -/* 911EE0 80242830 18400014 */ blez $v0, .L80242884 -/* 911EE4 80242834 AE620074 */ sw $v0, 0x74($s3) -/* 911EE8 80242838 C600000C */ lwc1 $f0, 0xc($s0) -/* 911EEC 8024283C 3C014334 */ lui $at, 0x4334 -/* 911EF0 80242840 44816000 */ mtc1 $at, $f12 -/* 911EF4 80242844 0C00A6C9 */ jal clamp_angle -/* 911EF8 80242848 460C0300 */ add.s $f12, $f0, $f12 -/* 911EFC 8024284C E600000C */ swc1 $f0, 0xc($s0) -/* 911F00 80242850 8E440008 */ lw $a0, 8($s2) -/* 911F04 80242854 000417C2 */ srl $v0, $a0, 0x1f -/* 911F08 80242858 00822021 */ addu $a0, $a0, $v0 -/* 911F0C 8024285C 00042043 */ sra $a0, $a0, 1 -/* 911F10 80242860 0C00A67F */ jal rand_int -/* 911F14 80242864 24840001 */ addiu $a0, $a0, 1 -/* 911F18 80242868 8E430008 */ lw $v1, 8($s2) -/* 911F1C 8024286C 000327C2 */ srl $a0, $v1, 0x1f -/* 911F20 80242870 00641821 */ addu $v1, $v1, $a0 -/* 911F24 80242874 00031843 */ sra $v1, $v1, 1 -/* 911F28 80242878 00621821 */ addu $v1, $v1, $v0 -/* 911F2C 8024287C 08090A3B */ j .L802428EC -/* 911F30 80242880 A603008E */ sh $v1, 0x8e($s0) -.L80242884: -/* 911F34 80242884 24040002 */ addiu $a0, $zero, 2 -/* 911F38 80242888 0200282D */ daddu $a1, $s0, $zero -/* 911F3C 8024288C 0000302D */ daddu $a2, $zero, $zero -/* 911F40 80242890 860300A8 */ lh $v1, 0xa8($s0) -/* 911F44 80242894 3C013F80 */ lui $at, 0x3f80 -/* 911F48 80242898 44810000 */ mtc1 $at, $f0 -/* 911F4C 8024289C 3C014000 */ lui $at, 0x4000 -/* 911F50 802428A0 44811000 */ mtc1 $at, $f2 -/* 911F54 802428A4 3C01C1A0 */ lui $at, 0xc1a0 -/* 911F58 802428A8 44812000 */ mtc1 $at, $f4 -/* 911F5C 802428AC 2402000C */ addiu $v0, $zero, 0xc -/* 911F60 802428B0 AFA2001C */ sw $v0, 0x1c($sp) -/* 911F64 802428B4 44833000 */ mtc1 $v1, $f6 -/* 911F68 802428B8 00000000 */ nop -/* 911F6C 802428BC 468031A0 */ cvt.s.w $f6, $f6 -/* 911F70 802428C0 44073000 */ mfc1 $a3, $f6 -/* 911F74 802428C4 27A20028 */ addiu $v0, $sp, 0x28 -/* 911F78 802428C8 AFA20020 */ sw $v0, 0x20($sp) -/* 911F7C 802428CC E7A00010 */ swc1 $f0, 0x10($sp) -/* 911F80 802428D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 911F84 802428D4 0C01BFA4 */ jal fx_emote -/* 911F88 802428D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 911F8C 802428DC 2402000F */ addiu $v0, $zero, 0xf -/* 911F90 802428E0 A602008E */ sh $v0, 0x8e($s0) -/* 911F94 802428E4 24020028 */ addiu $v0, $zero, 0x28 -.L802428E8: -/* 911F98 802428E8 AE620070 */ sw $v0, 0x70($s3) -.L802428EC: -/* 911F9C 802428EC 8FBF0040 */ lw $ra, 0x40($sp) -/* 911FA0 802428F0 8FB3003C */ lw $s3, 0x3c($sp) -/* 911FA4 802428F4 8FB20038 */ lw $s2, 0x38($sp) -/* 911FA8 802428F8 8FB10034 */ lw $s1, 0x34($sp) -/* 911FAC 802428FC 8FB00030 */ lw $s0, 0x30($sp) -/* 911FB0 80242900 03E00008 */ jr $ra -/* 911FB4 80242904 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s new file mode 100644 index 0000000000..f83c27a6bb --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242794_911E44.s @@ -0,0 +1,101 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242794_911E44 +/* 911E44 80242794 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 911E48 80242798 AFB3003C */ sw $s3, 0x3c($sp) +/* 911E4C 8024279C 0080982D */ daddu $s3, $a0, $zero +/* 911E50 802427A0 AFBF0040 */ sw $ra, 0x40($sp) +/* 911E54 802427A4 AFB20038 */ sw $s2, 0x38($sp) +/* 911E58 802427A8 AFB10034 */ sw $s1, 0x34($sp) +/* 911E5C 802427AC AFB00030 */ sw $s0, 0x30($sp) +/* 911E60 802427B0 8E700148 */ lw $s0, 0x148($s3) +/* 911E64 802427B4 00A0902D */ daddu $s2, $a1, $zero +/* 911E68 802427B8 86040008 */ lh $a0, 8($s0) +/* 911E6C 802427BC 0C00EABB */ jal get_npc_unsafe +/* 911E70 802427C0 00C0882D */ daddu $s1, $a2, $zero +/* 911E74 802427C4 0220202D */ daddu $a0, $s1, $zero +/* 911E78 802427C8 0200282D */ daddu $a1, $s0, $zero +/* 911E7C 802427CC AFA00010 */ sw $zero, 0x10($sp) +/* 911E80 802427D0 8E460024 */ lw $a2, 0x24($s2) +/* 911E84 802427D4 8E470028 */ lw $a3, 0x28($s2) +/* 911E88 802427D8 0C01242D */ jal func_800490B4 +/* 911E8C 802427DC 0040802D */ daddu $s0, $v0, $zero +/* 911E90 802427E0 1040000B */ beqz $v0, .L80242810 +/* 911E94 802427E4 00000000 */ nop +/* 911E98 802427E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 911E9C 802427EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 911EA0 802427F0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 911EA4 802427F4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 911EA8 802427F8 8C460028 */ lw $a2, 0x28($v0) +/* 911EAC 802427FC 0C00A720 */ jal atan2 +/* 911EB0 80242800 8C470030 */ lw $a3, 0x30($v0) +/* 911EB4 80242804 2402000C */ addiu $v0, $zero, 0xc +/* 911EB8 80242808 08090A3A */ j .L802428E8 +/* 911EBC 8024280C E600000C */ swc1 $f0, 0xc($s0) +.L80242810: +/* 911EC0 80242810 9602008E */ lhu $v0, 0x8e($s0) +/* 911EC4 80242814 2442FFFF */ addiu $v0, $v0, -1 +/* 911EC8 80242818 A602008E */ sh $v0, 0x8e($s0) +/* 911ECC 8024281C 00021400 */ sll $v0, $v0, 0x10 +/* 911ED0 80242820 1C400032 */ bgtz $v0, .L802428EC +/* 911ED4 80242824 00000000 */ nop +/* 911ED8 80242828 8E620074 */ lw $v0, 0x74($s3) +/* 911EDC 8024282C 2442FFFF */ addiu $v0, $v0, -1 +/* 911EE0 80242830 18400014 */ blez $v0, .L80242884 +/* 911EE4 80242834 AE620074 */ sw $v0, 0x74($s3) +/* 911EE8 80242838 C600000C */ lwc1 $f0, 0xc($s0) +/* 911EEC 8024283C 3C014334 */ lui $at, 0x4334 +/* 911EF0 80242840 44816000 */ mtc1 $at, $f12 +/* 911EF4 80242844 0C00A6C9 */ jal clamp_angle +/* 911EF8 80242848 460C0300 */ add.s $f12, $f0, $f12 +/* 911EFC 8024284C E600000C */ swc1 $f0, 0xc($s0) +/* 911F00 80242850 8E440008 */ lw $a0, 8($s2) +/* 911F04 80242854 000417C2 */ srl $v0, $a0, 0x1f +/* 911F08 80242858 00822021 */ addu $a0, $a0, $v0 +/* 911F0C 8024285C 00042043 */ sra $a0, $a0, 1 +/* 911F10 80242860 0C00A67F */ jal rand_int +/* 911F14 80242864 24840001 */ addiu $a0, $a0, 1 +/* 911F18 80242868 8E430008 */ lw $v1, 8($s2) +/* 911F1C 8024286C 000327C2 */ srl $a0, $v1, 0x1f +/* 911F20 80242870 00641821 */ addu $v1, $v1, $a0 +/* 911F24 80242874 00031843 */ sra $v1, $v1, 1 +/* 911F28 80242878 00621821 */ addu $v1, $v1, $v0 +/* 911F2C 8024287C 08090A3B */ j .L802428EC +/* 911F30 80242880 A603008E */ sh $v1, 0x8e($s0) +.L80242884: +/* 911F34 80242884 24040002 */ addiu $a0, $zero, 2 +/* 911F38 80242888 0200282D */ daddu $a1, $s0, $zero +/* 911F3C 8024288C 0000302D */ daddu $a2, $zero, $zero +/* 911F40 80242890 860300A8 */ lh $v1, 0xa8($s0) +/* 911F44 80242894 3C013F80 */ lui $at, 0x3f80 +/* 911F48 80242898 44810000 */ mtc1 $at, $f0 +/* 911F4C 8024289C 3C014000 */ lui $at, 0x4000 +/* 911F50 802428A0 44811000 */ mtc1 $at, $f2 +/* 911F54 802428A4 3C01C1A0 */ lui $at, 0xc1a0 +/* 911F58 802428A8 44812000 */ mtc1 $at, $f4 +/* 911F5C 802428AC 2402000C */ addiu $v0, $zero, 0xc +/* 911F60 802428B0 AFA2001C */ sw $v0, 0x1c($sp) +/* 911F64 802428B4 44833000 */ mtc1 $v1, $f6 +/* 911F68 802428B8 00000000 */ nop +/* 911F6C 802428BC 468031A0 */ cvt.s.w $f6, $f6 +/* 911F70 802428C0 44073000 */ mfc1 $a3, $f6 +/* 911F74 802428C4 27A20028 */ addiu $v0, $sp, 0x28 +/* 911F78 802428C8 AFA20020 */ sw $v0, 0x20($sp) +/* 911F7C 802428CC E7A00010 */ swc1 $f0, 0x10($sp) +/* 911F80 802428D0 E7A20014 */ swc1 $f2, 0x14($sp) +/* 911F84 802428D4 0C01BFA4 */ jal fx_emote +/* 911F88 802428D8 E7A40018 */ swc1 $f4, 0x18($sp) +/* 911F8C 802428DC 2402000F */ addiu $v0, $zero, 0xf +/* 911F90 802428E0 A602008E */ sh $v0, 0x8e($s0) +/* 911F94 802428E4 24020028 */ addiu $v0, $zero, 0x28 +.L802428E8: +/* 911F98 802428E8 AE620070 */ sw $v0, 0x70($s3) +.L802428EC: +/* 911F9C 802428EC 8FBF0040 */ lw $ra, 0x40($sp) +/* 911FA0 802428F0 8FB3003C */ lw $s3, 0x3c($sp) +/* 911FA4 802428F4 8FB20038 */ lw $s2, 0x38($sp) +/* 911FA8 802428F8 8FB10034 */ lw $s1, 0x34($sp) +/* 911FAC 802428FC 8FB00030 */ lw $s0, 0x30($sp) +/* 911FB0 80242900 03E00008 */ jr $ra +/* 911FB4 80242904 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242908.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242908.s deleted file mode 100644 index 4466a4c3c6..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242908.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242908 -/* 911FB8 80242908 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 911FBC 8024290C AFB10014 */ sw $s1, 0x14($sp) -/* 911FC0 80242910 0080882D */ daddu $s1, $a0, $zero -/* 911FC4 80242914 AFBF0018 */ sw $ra, 0x18($sp) -/* 911FC8 80242918 AFB00010 */ sw $s0, 0x10($sp) -/* 911FCC 8024291C 8E300148 */ lw $s0, 0x148($s1) -/* 911FD0 80242920 0C00EABB */ jal get_npc_unsafe -/* 911FD4 80242924 86040008 */ lh $a0, 8($s0) -/* 911FD8 80242928 96030096 */ lhu $v1, 0x96($s0) -/* 911FDC 8024292C A443008E */ sh $v1, 0x8e($v0) -/* 911FE0 80242930 8E0300CC */ lw $v1, 0xcc($s0) -/* 911FE4 80242934 8C630034 */ lw $v1, 0x34($v1) -/* 911FE8 80242938 AC430028 */ sw $v1, 0x28($v0) -/* 911FEC 8024293C 24020015 */ addiu $v0, $zero, 0x15 -/* 911FF0 80242940 AE220070 */ sw $v0, 0x70($s1) -/* 911FF4 80242944 8FBF0018 */ lw $ra, 0x18($sp) -/* 911FF8 80242948 8FB10014 */ lw $s1, 0x14($sp) -/* 911FFC 8024294C 8FB00010 */ lw $s0, 0x10($sp) -/* 912000 80242950 03E00008 */ jr $ra -/* 912004 80242954 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242908_911FB8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242908_911FB8.s new file mode 100644 index 0000000000..45184554f9 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242908_911FB8.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242908_911FB8 +/* 911FB8 80242908 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 911FBC 8024290C AFB10014 */ sw $s1, 0x14($sp) +/* 911FC0 80242910 0080882D */ daddu $s1, $a0, $zero +/* 911FC4 80242914 AFBF0018 */ sw $ra, 0x18($sp) +/* 911FC8 80242918 AFB00010 */ sw $s0, 0x10($sp) +/* 911FCC 8024291C 8E300148 */ lw $s0, 0x148($s1) +/* 911FD0 80242920 0C00EABB */ jal get_npc_unsafe +/* 911FD4 80242924 86040008 */ lh $a0, 8($s0) +/* 911FD8 80242928 96030096 */ lhu $v1, 0x96($s0) +/* 911FDC 8024292C A443008E */ sh $v1, 0x8e($v0) +/* 911FE0 80242930 8E0300CC */ lw $v1, 0xcc($s0) +/* 911FE4 80242934 8C630034 */ lw $v1, 0x34($v1) +/* 911FE8 80242938 AC430028 */ sw $v1, 0x28($v0) +/* 911FEC 8024293C 24020015 */ addiu $v0, $zero, 0x15 +/* 911FF0 80242940 AE220070 */ sw $v0, 0x70($s1) +/* 911FF4 80242944 8FBF0018 */ lw $ra, 0x18($sp) +/* 911FF8 80242948 8FB10014 */ lw $s1, 0x14($sp) +/* 911FFC 8024294C 8FB00010 */ lw $s0, 0x10($sp) +/* 912000 80242950 03E00008 */ jr $ra +/* 912004 80242954 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958.s deleted file mode 100644 index 38c71cfe73..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242958 -/* 912008 80242958 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 91200C 8024295C AFB30024 */ sw $s3, 0x24($sp) -/* 912010 80242960 0080982D */ daddu $s3, $a0, $zero -/* 912014 80242964 AFBF002C */ sw $ra, 0x2c($sp) -/* 912018 80242968 AFB40028 */ sw $s4, 0x28($sp) -/* 91201C 8024296C AFB20020 */ sw $s2, 0x20($sp) -/* 912020 80242970 AFB1001C */ sw $s1, 0x1c($sp) -/* 912024 80242974 AFB00018 */ sw $s0, 0x18($sp) -/* 912028 80242978 8E710148 */ lw $s1, 0x148($s3) -/* 91202C 8024297C 86240008 */ lh $a0, 8($s1) -/* 912030 80242980 0C00EABB */ jal get_npc_unsafe -/* 912034 80242984 00A0A02D */ daddu $s4, $a1, $zero -/* 912038 80242988 0040802D */ daddu $s0, $v0, $zero -/* 91203C 8024298C 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 912040 80242990 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 912044 80242994 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 912048 80242998 8E420000 */ lw $v0, ($s2) -/* 91204C 8024299C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 912050 802429A0 8C460028 */ lw $a2, 0x28($v0) -/* 912054 802429A4 0C00A720 */ jal atan2 -/* 912058 802429A8 8C470030 */ lw $a3, 0x30($v0) -/* 91205C 802429AC 3C025555 */ lui $v0, 0x5555 -/* 912060 802429B0 9603008E */ lhu $v1, 0x8e($s0) -/* 912064 802429B4 34425556 */ ori $v0, $v0, 0x5556 -/* 912068 802429B8 00031C00 */ sll $v1, $v1, 0x10 -/* 91206C 802429BC 00032403 */ sra $a0, $v1, 0x10 -/* 912070 802429C0 00820018 */ mult $a0, $v0 -/* 912074 802429C4 00031FC3 */ sra $v1, $v1, 0x1f -/* 912078 802429C8 00004010 */ mfhi $t0 -/* 91207C 802429CC 01031823 */ subu $v1, $t0, $v1 -/* 912080 802429D0 00031040 */ sll $v0, $v1, 1 -/* 912084 802429D4 00431021 */ addu $v0, $v0, $v1 -/* 912088 802429D8 00822023 */ subu $a0, $a0, $v0 -/* 91208C 802429DC 00042400 */ sll $a0, $a0, 0x10 -/* 912090 802429E0 1480000C */ bnez $a0, .L80242A14 -/* 912094 802429E4 E600000C */ swc1 $f0, 0xc($s0) -/* 912098 802429E8 C6020040 */ lwc1 $f2, 0x40($s0) -/* 91209C 802429EC 3C014000 */ lui $at, 0x4000 -/* 9120A0 802429F0 44810000 */ mtc1 $at, $f0 -/* 9120A4 802429F4 AFA00010 */ sw $zero, 0x10($sp) -/* 9120A8 802429F8 AFA00014 */ sw $zero, 0x14($sp) -/* 9120AC 802429FC 46001080 */ add.s $f2, $f2, $f0 -/* 9120B0 80242A00 8E06003C */ lw $a2, 0x3c($s0) -/* 9120B4 80242A04 8E050038 */ lw $a1, 0x38($s0) -/* 9120B8 80242A08 44071000 */ mfc1 $a3, $f2 -/* 9120BC 80242A0C 0C01BECC */ jal fx_walk_normal -/* 9120C0 80242A10 24040002 */ addiu $a0, $zero, 2 -.L80242A14: -/* 9120C4 80242A14 9602008E */ lhu $v0, 0x8e($s0) -/* 9120C8 80242A18 2442FFFF */ addiu $v0, $v0, -1 -/* 9120CC 80242A1C A602008E */ sh $v0, 0x8e($s0) -/* 9120D0 80242A20 00021400 */ sll $v0, $v0, 0x10 -/* 9120D4 80242A24 1C40002C */ bgtz $v0, .L80242AD8 -/* 9120D8 80242A28 00000000 */ nop -/* 9120DC 80242A2C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9120E0 80242A30 4600010D */ trunc.w.s $f4, $f0 -/* 9120E4 80242A34 44022000 */ mfc1 $v0, $f4 -/* 9120E8 80242A38 00000000 */ nop -/* 9120EC 80242A3C A6220010 */ sh $v0, 0x10($s1) -/* 9120F0 80242A40 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9120F4 80242A44 4600010D */ trunc.w.s $f4, $f0 -/* 9120F8 80242A48 44022000 */ mfc1 $v0, $f4 -/* 9120FC 80242A4C 00000000 */ nop -/* 912100 80242A50 A6220012 */ sh $v0, 0x12($s1) -/* 912104 80242A54 C6000040 */ lwc1 $f0, 0x40($s0) -/* 912108 80242A58 24020001 */ addiu $v0, $zero, 1 -/* 91210C 80242A5C A2220007 */ sb $v0, 7($s1) -/* 912110 80242A60 4600010D */ trunc.w.s $f4, $f0 -/* 912114 80242A64 44022000 */ mfc1 $v0, $f4 -/* 912118 80242A68 00000000 */ nop -/* 91211C 80242A6C A6220014 */ sh $v0, 0x14($s1) -/* 912120 80242A70 C6800018 */ lwc1 $f0, 0x18($s4) -/* 912124 80242A74 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 912128 80242A78 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91212C 80242A7C 8E420000 */ lw $v0, ($s2) -/* 912130 80242A80 E6000018 */ swc1 $f0, 0x18($s0) -/* 912134 80242A84 8C460028 */ lw $a2, 0x28($v0) -/* 912138 80242A88 0C00A7B5 */ jal dist2D -/* 91213C 80242A8C 8C470030 */ lw $a3, 0x30($v0) -/* 912140 80242A90 C6020018 */ lwc1 $f2, 0x18($s0) -/* 912144 80242A94 46020003 */ div.s $f0, $f0, $f2 -/* 912148 80242A98 3C018024 */ lui $at, 0x8024 -/* 91214C 80242A9C D42265D8 */ ldc1 $f2, 0x65d8($at) -/* 912150 80242AA0 46000021 */ cvt.d.s $f0, $f0 -/* 912154 80242AA4 46220000 */ add.d $f0, $f0, $f2 -/* 912158 80242AA8 4620010D */ trunc.w.d $f4, $f0 -/* 91215C 80242AAC 44022000 */ mfc1 $v0, $f4 -/* 912160 80242AB0 00000000 */ nop -/* 912164 80242AB4 A602008E */ sh $v0, 0x8e($s0) -/* 912168 80242AB8 00021400 */ sll $v0, $v0, 0x10 -/* 91216C 80242ABC 00021403 */ sra $v0, $v0, 0x10 -/* 912170 80242AC0 2842000F */ slti $v0, $v0, 0xf -/* 912174 80242AC4 10400002 */ beqz $v0, .L80242AD0 -/* 912178 80242AC8 2402000F */ addiu $v0, $zero, 0xf -/* 91217C 80242ACC A602008E */ sh $v0, 0x8e($s0) -.L80242AD0: -/* 912180 80242AD0 24020016 */ addiu $v0, $zero, 0x16 -/* 912184 80242AD4 AE620070 */ sw $v0, 0x70($s3) -.L80242AD8: -/* 912188 80242AD8 8FBF002C */ lw $ra, 0x2c($sp) -/* 91218C 80242ADC 8FB40028 */ lw $s4, 0x28($sp) -/* 912190 80242AE0 8FB30024 */ lw $s3, 0x24($sp) -/* 912194 80242AE4 8FB20020 */ lw $s2, 0x20($sp) -/* 912198 80242AE8 8FB1001C */ lw $s1, 0x1c($sp) -/* 91219C 80242AEC 8FB00018 */ lw $s0, 0x18($sp) -/* 9121A0 80242AF0 03E00008 */ jr $ra -/* 9121A4 80242AF4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s new file mode 100644 index 0000000000..911e58e4a0 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242958_912008.s @@ -0,0 +1,111 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242958_912008 +/* 912008 80242958 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 91200C 8024295C AFB30024 */ sw $s3, 0x24($sp) +/* 912010 80242960 0080982D */ daddu $s3, $a0, $zero +/* 912014 80242964 AFBF002C */ sw $ra, 0x2c($sp) +/* 912018 80242968 AFB40028 */ sw $s4, 0x28($sp) +/* 91201C 8024296C AFB20020 */ sw $s2, 0x20($sp) +/* 912020 80242970 AFB1001C */ sw $s1, 0x1c($sp) +/* 912024 80242974 AFB00018 */ sw $s0, 0x18($sp) +/* 912028 80242978 8E710148 */ lw $s1, 0x148($s3) +/* 91202C 8024297C 86240008 */ lh $a0, 8($s1) +/* 912030 80242980 0C00EABB */ jal get_npc_unsafe +/* 912034 80242984 00A0A02D */ daddu $s4, $a1, $zero +/* 912038 80242988 0040802D */ daddu $s0, $v0, $zero +/* 91203C 8024298C 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) +/* 912040 80242990 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) +/* 912044 80242994 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 912048 80242998 8E420000 */ lw $v0, ($s2) +/* 91204C 8024299C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 912050 802429A0 8C460028 */ lw $a2, 0x28($v0) +/* 912054 802429A4 0C00A720 */ jal atan2 +/* 912058 802429A8 8C470030 */ lw $a3, 0x30($v0) +/* 91205C 802429AC 3C025555 */ lui $v0, 0x5555 +/* 912060 802429B0 9603008E */ lhu $v1, 0x8e($s0) +/* 912064 802429B4 34425556 */ ori $v0, $v0, 0x5556 +/* 912068 802429B8 00031C00 */ sll $v1, $v1, 0x10 +/* 91206C 802429BC 00032403 */ sra $a0, $v1, 0x10 +/* 912070 802429C0 00820018 */ mult $a0, $v0 +/* 912074 802429C4 00031FC3 */ sra $v1, $v1, 0x1f +/* 912078 802429C8 00004010 */ mfhi $t0 +/* 91207C 802429CC 01031823 */ subu $v1, $t0, $v1 +/* 912080 802429D0 00031040 */ sll $v0, $v1, 1 +/* 912084 802429D4 00431021 */ addu $v0, $v0, $v1 +/* 912088 802429D8 00822023 */ subu $a0, $a0, $v0 +/* 91208C 802429DC 00042400 */ sll $a0, $a0, 0x10 +/* 912090 802429E0 1480000C */ bnez $a0, .L80242A14 +/* 912094 802429E4 E600000C */ swc1 $f0, 0xc($s0) +/* 912098 802429E8 C6020040 */ lwc1 $f2, 0x40($s0) +/* 91209C 802429EC 3C014000 */ lui $at, 0x4000 +/* 9120A0 802429F0 44810000 */ mtc1 $at, $f0 +/* 9120A4 802429F4 AFA00010 */ sw $zero, 0x10($sp) +/* 9120A8 802429F8 AFA00014 */ sw $zero, 0x14($sp) +/* 9120AC 802429FC 46001080 */ add.s $f2, $f2, $f0 +/* 9120B0 80242A00 8E06003C */ lw $a2, 0x3c($s0) +/* 9120B4 80242A04 8E050038 */ lw $a1, 0x38($s0) +/* 9120B8 80242A08 44071000 */ mfc1 $a3, $f2 +/* 9120BC 80242A0C 0C01BECC */ jal fx_walk_normal +/* 9120C0 80242A10 24040002 */ addiu $a0, $zero, 2 +.L80242A14: +/* 9120C4 80242A14 9602008E */ lhu $v0, 0x8e($s0) +/* 9120C8 80242A18 2442FFFF */ addiu $v0, $v0, -1 +/* 9120CC 80242A1C A602008E */ sh $v0, 0x8e($s0) +/* 9120D0 80242A20 00021400 */ sll $v0, $v0, 0x10 +/* 9120D4 80242A24 1C40002C */ bgtz $v0, .L80242AD8 +/* 9120D8 80242A28 00000000 */ nop +/* 9120DC 80242A2C C6000038 */ lwc1 $f0, 0x38($s0) +/* 9120E0 80242A30 4600010D */ trunc.w.s $f4, $f0 +/* 9120E4 80242A34 44022000 */ mfc1 $v0, $f4 +/* 9120E8 80242A38 00000000 */ nop +/* 9120EC 80242A3C A6220010 */ sh $v0, 0x10($s1) +/* 9120F0 80242A40 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9120F4 80242A44 4600010D */ trunc.w.s $f4, $f0 +/* 9120F8 80242A48 44022000 */ mfc1 $v0, $f4 +/* 9120FC 80242A4C 00000000 */ nop +/* 912100 80242A50 A6220012 */ sh $v0, 0x12($s1) +/* 912104 80242A54 C6000040 */ lwc1 $f0, 0x40($s0) +/* 912108 80242A58 24020001 */ addiu $v0, $zero, 1 +/* 91210C 80242A5C A2220007 */ sb $v0, 7($s1) +/* 912110 80242A60 4600010D */ trunc.w.s $f4, $f0 +/* 912114 80242A64 44022000 */ mfc1 $v0, $f4 +/* 912118 80242A68 00000000 */ nop +/* 91211C 80242A6C A6220014 */ sh $v0, 0x14($s1) +/* 912120 80242A70 C6800018 */ lwc1 $f0, 0x18($s4) +/* 912124 80242A74 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 912128 80242A78 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91212C 80242A7C 8E420000 */ lw $v0, ($s2) +/* 912130 80242A80 E6000018 */ swc1 $f0, 0x18($s0) +/* 912134 80242A84 8C460028 */ lw $a2, 0x28($v0) +/* 912138 80242A88 0C00A7B5 */ jal dist2D +/* 91213C 80242A8C 8C470030 */ lw $a3, 0x30($v0) +/* 912140 80242A90 C6020018 */ lwc1 $f2, 0x18($s0) +/* 912144 80242A94 46020003 */ div.s $f0, $f0, $f2 +/* 912148 80242A98 3C018024 */ lui $at, 0x8024 +/* 91214C 80242A9C D42265D8 */ ldc1 $f2, 0x65d8($at) +/* 912150 80242AA0 46000021 */ cvt.d.s $f0, $f0 +/* 912154 80242AA4 46220000 */ add.d $f0, $f0, $f2 +/* 912158 80242AA8 4620010D */ trunc.w.d $f4, $f0 +/* 91215C 80242AAC 44022000 */ mfc1 $v0, $f4 +/* 912160 80242AB0 00000000 */ nop +/* 912164 80242AB4 A602008E */ sh $v0, 0x8e($s0) +/* 912168 80242AB8 00021400 */ sll $v0, $v0, 0x10 +/* 91216C 80242ABC 00021403 */ sra $v0, $v0, 0x10 +/* 912170 80242AC0 2842000F */ slti $v0, $v0, 0xf +/* 912174 80242AC4 10400002 */ beqz $v0, .L80242AD0 +/* 912178 80242AC8 2402000F */ addiu $v0, $zero, 0xf +/* 91217C 80242ACC A602008E */ sh $v0, 0x8e($s0) +.L80242AD0: +/* 912180 80242AD0 24020016 */ addiu $v0, $zero, 0x16 +/* 912184 80242AD4 AE620070 */ sw $v0, 0x70($s3) +.L80242AD8: +/* 912188 80242AD8 8FBF002C */ lw $ra, 0x2c($sp) +/* 91218C 80242ADC 8FB40028 */ lw $s4, 0x28($sp) +/* 912190 80242AE0 8FB30024 */ lw $s3, 0x24($sp) +/* 912194 80242AE4 8FB20020 */ lw $s2, 0x20($sp) +/* 912198 80242AE8 8FB1001C */ lw $s1, 0x1c($sp) +/* 91219C 80242AEC 8FB00018 */ lw $s0, 0x18($sp) +/* 9121A0 80242AF0 03E00008 */ jr $ra +/* 9121A4 80242AF4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8.s deleted file mode 100644 index 3b9d4b759f..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AF8 -/* 9121A8 80242AF8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9121AC 80242AFC AFB3003C */ sw $s3, 0x3c($sp) -/* 9121B0 80242B00 0080982D */ daddu $s3, $a0, $zero -/* 9121B4 80242B04 AFBF0040 */ sw $ra, 0x40($sp) -/* 9121B8 80242B08 AFB20038 */ sw $s2, 0x38($sp) -/* 9121BC 80242B0C AFB10034 */ sw $s1, 0x34($sp) -/* 9121C0 80242B10 AFB00030 */ sw $s0, 0x30($sp) -/* 9121C4 80242B14 8E720148 */ lw $s2, 0x148($s3) -/* 9121C8 80242B18 0C00EABB */ jal get_npc_unsafe -/* 9121CC 80242B1C 86440008 */ lh $a0, 8($s2) -/* 9121D0 80242B20 0040802D */ daddu $s0, $v0, $zero -/* 9121D4 80242B24 0200202D */ daddu $a0, $s0, $zero -/* 9121D8 80242B28 0C00F598 */ jal func_8003D660 -/* 9121DC 80242B2C 24050001 */ addiu $a1, $zero, 1 -/* 9121E0 80242B30 8E050018 */ lw $a1, 0x18($s0) -/* 9121E4 80242B34 8E06000C */ lw $a2, 0xc($s0) -/* 9121E8 80242B38 0C00EA95 */ jal npc_move_heading -/* 9121EC 80242B3C 0200202D */ daddu $a0, $s0, $zero -/* 9121F0 80242B40 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9121F4 80242B44 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9121F8 80242B48 C462001C */ lwc1 $f2, 0x1c($v1) -/* 9121FC 80242B4C 468010A0 */ cvt.s.w $f2, $f2 -/* 912200 80242B50 C4640024 */ lwc1 $f4, 0x24($v1) -/* 912204 80242B54 46802120 */ cvt.s.w $f4, $f4 -/* 912208 80242B58 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91220C 80242B5C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912210 80242B60 44051000 */ mfc1 $a1, $f2 -/* 912214 80242B64 C4400028 */ lwc1 $f0, 0x28($v0) -/* 912218 80242B68 46800020 */ cvt.s.w $f0, $f0 -/* 91221C 80242B6C E7A00014 */ swc1 $f0, 0x14($sp) -/* 912220 80242B70 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912224 80242B74 44062000 */ mfc1 $a2, $f4 -/* 912228 80242B78 C440002C */ lwc1 $f0, 0x2c($v0) -/* 91222C 80242B7C 46800020 */ cvt.s.w $f0, $f0 -/* 912230 80242B80 E7A00018 */ swc1 $f0, 0x18($sp) -/* 912234 80242B84 8C640030 */ lw $a0, 0x30($v1) -/* 912238 80242B88 0C0123F5 */ jal is_point_within_region -/* 91223C 80242B8C 8E070038 */ lw $a3, 0x38($s0) -/* 912240 80242B90 C6000038 */ lwc1 $f0, 0x38($s0) -/* 912244 80242B94 C602003C */ lwc1 $f2, 0x3c($s0) -/* 912248 80242B98 C6040040 */ lwc1 $f4, 0x40($s0) -/* 91224C 80242B9C 3C013F80 */ lui $at, 0x3f80 -/* 912250 80242BA0 44813000 */ mtc1 $at, $f6 -/* 912254 80242BA4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 912258 80242BA8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 91225C 80242BAC E7A40028 */ swc1 $f4, 0x28($sp) -/* 912260 80242BB0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 912264 80242BB4 C600000C */ lwc1 $f0, 0xc($s0) -/* 912268 80242BB8 0002882B */ sltu $s1, $zero, $v0 -/* 91226C 80242BBC E7A00014 */ swc1 $f0, 0x14($sp) -/* 912270 80242BC0 860200A8 */ lh $v0, 0xa8($s0) -/* 912274 80242BC4 27A50020 */ addiu $a1, $sp, 0x20 -/* 912278 80242BC8 44820000 */ mtc1 $v0, $f0 -/* 91227C 80242BCC 00000000 */ nop -/* 912280 80242BD0 46800020 */ cvt.s.w $f0, $f0 -/* 912284 80242BD4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 912288 80242BD8 860200A6 */ lh $v0, 0xa6($s0) -/* 91228C 80242BDC 27A60024 */ addiu $a2, $sp, 0x24 -/* 912290 80242BE0 44820000 */ mtc1 $v0, $f0 -/* 912294 80242BE4 00000000 */ nop -/* 912298 80242BE8 46800020 */ cvt.s.w $f0, $f0 -/* 91229C 80242BEC E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9122A0 80242BF0 8E040080 */ lw $a0, 0x80($s0) -/* 9122A4 80242BF4 0C037711 */ jal func_800DDC44 -/* 9122A8 80242BF8 27A70028 */ addiu $a3, $sp, 0x28 -/* 9122AC 80242BFC 54400001 */ bnel $v0, $zero, .L80242C04 -/* 9122B0 80242C00 24110001 */ addiu $s1, $zero, 1 -.L80242C04: -/* 9122B4 80242C04 9602008E */ lhu $v0, 0x8e($s0) -/* 9122B8 80242C08 2442FFFF */ addiu $v0, $v0, -1 -/* 9122BC 80242C0C A602008E */ sh $v0, 0x8e($s0) -/* 9122C0 80242C10 00021400 */ sll $v0, $v0, 0x10 -/* 9122C4 80242C14 58400001 */ blezl $v0, .L80242C1C -/* 9122C8 80242C18 24110001 */ addiu $s1, $zero, 1 -.L80242C1C: -/* 9122CC 80242C1C 12200003 */ beqz $s1, .L80242C2C -/* 9122D0 80242C20 24020004 */ addiu $v0, $zero, 4 -/* 9122D4 80242C24 AE620070 */ sw $v0, 0x70($s3) -/* 9122D8 80242C28 A2400007 */ sb $zero, 7($s2) -.L80242C2C: -/* 9122DC 80242C2C 8FBF0040 */ lw $ra, 0x40($sp) -/* 9122E0 80242C30 8FB3003C */ lw $s3, 0x3c($sp) -/* 9122E4 80242C34 8FB20038 */ lw $s2, 0x38($sp) -/* 9122E8 80242C38 8FB10034 */ lw $s1, 0x34($sp) -/* 9122EC 80242C3C 8FB00030 */ lw $s0, 0x30($sp) -/* 9122F0 80242C40 03E00008 */ jr $ra -/* 9122F4 80242C44 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s new file mode 100644 index 0000000000..1c9745e3e3 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242AF8_9121A8.s @@ -0,0 +1,91 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242AF8_9121A8 +/* 9121A8 80242AF8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9121AC 80242AFC AFB3003C */ sw $s3, 0x3c($sp) +/* 9121B0 80242B00 0080982D */ daddu $s3, $a0, $zero +/* 9121B4 80242B04 AFBF0040 */ sw $ra, 0x40($sp) +/* 9121B8 80242B08 AFB20038 */ sw $s2, 0x38($sp) +/* 9121BC 80242B0C AFB10034 */ sw $s1, 0x34($sp) +/* 9121C0 80242B10 AFB00030 */ sw $s0, 0x30($sp) +/* 9121C4 80242B14 8E720148 */ lw $s2, 0x148($s3) +/* 9121C8 80242B18 0C00EABB */ jal get_npc_unsafe +/* 9121CC 80242B1C 86440008 */ lh $a0, 8($s2) +/* 9121D0 80242B20 0040802D */ daddu $s0, $v0, $zero +/* 9121D4 80242B24 0200202D */ daddu $a0, $s0, $zero +/* 9121D8 80242B28 0C00F598 */ jal func_8003D660 +/* 9121DC 80242B2C 24050001 */ addiu $a1, $zero, 1 +/* 9121E0 80242B30 8E050018 */ lw $a1, 0x18($s0) +/* 9121E4 80242B34 8E06000C */ lw $a2, 0xc($s0) +/* 9121E8 80242B38 0C00EA95 */ jal npc_move_heading +/* 9121EC 80242B3C 0200202D */ daddu $a0, $s0, $zero +/* 9121F0 80242B40 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9121F4 80242B44 C6000040 */ lwc1 $f0, 0x40($s0) +/* 9121F8 80242B48 C462001C */ lwc1 $f2, 0x1c($v1) +/* 9121FC 80242B4C 468010A0 */ cvt.s.w $f2, $f2 +/* 912200 80242B50 C4640024 */ lwc1 $f4, 0x24($v1) +/* 912204 80242B54 46802120 */ cvt.s.w $f4, $f4 +/* 912208 80242B58 E7A00010 */ swc1 $f0, 0x10($sp) +/* 91220C 80242B5C 8E4200D0 */ lw $v0, 0xd0($s2) +/* 912210 80242B60 44051000 */ mfc1 $a1, $f2 +/* 912214 80242B64 C4400028 */ lwc1 $f0, 0x28($v0) +/* 912218 80242B68 46800020 */ cvt.s.w $f0, $f0 +/* 91221C 80242B6C E7A00014 */ swc1 $f0, 0x14($sp) +/* 912220 80242B70 8E4200D0 */ lw $v0, 0xd0($s2) +/* 912224 80242B74 44062000 */ mfc1 $a2, $f4 +/* 912228 80242B78 C440002C */ lwc1 $f0, 0x2c($v0) +/* 91222C 80242B7C 46800020 */ cvt.s.w $f0, $f0 +/* 912230 80242B80 E7A00018 */ swc1 $f0, 0x18($sp) +/* 912234 80242B84 8C640030 */ lw $a0, 0x30($v1) +/* 912238 80242B88 0C0123F5 */ jal is_point_within_region +/* 91223C 80242B8C 8E070038 */ lw $a3, 0x38($s0) +/* 912240 80242B90 C6000038 */ lwc1 $f0, 0x38($s0) +/* 912244 80242B94 C602003C */ lwc1 $f2, 0x3c($s0) +/* 912248 80242B98 C6040040 */ lwc1 $f4, 0x40($s0) +/* 91224C 80242B9C 3C013F80 */ lui $at, 0x3f80 +/* 912250 80242BA0 44813000 */ mtc1 $at, $f6 +/* 912254 80242BA4 E7A00020 */ swc1 $f0, 0x20($sp) +/* 912258 80242BA8 E7A20024 */ swc1 $f2, 0x24($sp) +/* 91225C 80242BAC E7A40028 */ swc1 $f4, 0x28($sp) +/* 912260 80242BB0 E7A60010 */ swc1 $f6, 0x10($sp) +/* 912264 80242BB4 C600000C */ lwc1 $f0, 0xc($s0) +/* 912268 80242BB8 0002882B */ sltu $s1, $zero, $v0 +/* 91226C 80242BBC E7A00014 */ swc1 $f0, 0x14($sp) +/* 912270 80242BC0 860200A8 */ lh $v0, 0xa8($s0) +/* 912274 80242BC4 27A50020 */ addiu $a1, $sp, 0x20 +/* 912278 80242BC8 44820000 */ mtc1 $v0, $f0 +/* 91227C 80242BCC 00000000 */ nop +/* 912280 80242BD0 46800020 */ cvt.s.w $f0, $f0 +/* 912284 80242BD4 E7A00018 */ swc1 $f0, 0x18($sp) +/* 912288 80242BD8 860200A6 */ lh $v0, 0xa6($s0) +/* 91228C 80242BDC 27A60024 */ addiu $a2, $sp, 0x24 +/* 912290 80242BE0 44820000 */ mtc1 $v0, $f0 +/* 912294 80242BE4 00000000 */ nop +/* 912298 80242BE8 46800020 */ cvt.s.w $f0, $f0 +/* 91229C 80242BEC E7A0001C */ swc1 $f0, 0x1c($sp) +/* 9122A0 80242BF0 8E040080 */ lw $a0, 0x80($s0) +/* 9122A4 80242BF4 0C037711 */ jal func_800DDC44 +/* 9122A8 80242BF8 27A70028 */ addiu $a3, $sp, 0x28 +/* 9122AC 80242BFC 54400001 */ bnel $v0, $zero, .L80242C04 +/* 9122B0 80242C00 24110001 */ addiu $s1, $zero, 1 +.L80242C04: +/* 9122B4 80242C04 9602008E */ lhu $v0, 0x8e($s0) +/* 9122B8 80242C08 2442FFFF */ addiu $v0, $v0, -1 +/* 9122BC 80242C0C A602008E */ sh $v0, 0x8e($s0) +/* 9122C0 80242C10 00021400 */ sll $v0, $v0, 0x10 +/* 9122C4 80242C14 58400001 */ blezl $v0, .L80242C1C +/* 9122C8 80242C18 24110001 */ addiu $s1, $zero, 1 +.L80242C1C: +/* 9122CC 80242C1C 12200003 */ beqz $s1, .L80242C2C +/* 9122D0 80242C20 24020004 */ addiu $v0, $zero, 4 +/* 9122D4 80242C24 AE620070 */ sw $v0, 0x70($s3) +/* 9122D8 80242C28 A2400007 */ sb $zero, 7($s2) +.L80242C2C: +/* 9122DC 80242C2C 8FBF0040 */ lw $ra, 0x40($sp) +/* 9122E0 80242C30 8FB3003C */ lw $s3, 0x3c($sp) +/* 9122E4 80242C34 8FB20038 */ lw $s2, 0x38($sp) +/* 9122E8 80242C38 8FB10034 */ lw $s1, 0x34($sp) +/* 9122EC 80242C3C 8FB00030 */ lw $s0, 0x30($sp) +/* 9122F0 80242C40 03E00008 */ jr $ra +/* 9122F4 80242C44 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48.s deleted file mode 100644 index 40b7d70860..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C48 -/* 9122F8 80242C48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9122FC 80242C4C AFB20018 */ sw $s2, 0x18($sp) -/* 912300 80242C50 0080902D */ daddu $s2, $a0, $zero -/* 912304 80242C54 AFBF001C */ sw $ra, 0x1c($sp) -/* 912308 80242C58 AFB10014 */ sw $s1, 0x14($sp) -/* 91230C 80242C5C AFB00010 */ sw $s0, 0x10($sp) -/* 912310 80242C60 8E500148 */ lw $s0, 0x148($s2) -/* 912314 80242C64 86040008 */ lh $a0, 8($s0) -/* 912318 80242C68 0C00EABB */ jal get_npc_unsafe -/* 91231C 80242C6C 00A0882D */ daddu $s1, $a1, $zero -/* 912320 80242C70 0040182D */ daddu $v1, $v0, $zero -/* 912324 80242C74 9462008E */ lhu $v0, 0x8e($v1) -/* 912328 80242C78 2442FFFF */ addiu $v0, $v0, -1 -/* 91232C 80242C7C A462008E */ sh $v0, 0x8e($v1) -/* 912330 80242C80 00021400 */ sll $v0, $v0, 0x10 -/* 912334 80242C84 1C400015 */ bgtz $v0, .L80242CDC -/* 912338 80242C88 00000000 */ nop -/* 91233C 80242C8C 8E0200CC */ lw $v0, 0xcc($s0) -/* 912340 80242C90 8C420004 */ lw $v0, 4($v0) -/* 912344 80242C94 AC620028 */ sw $v0, 0x28($v1) -/* 912348 80242C98 8E0200D0 */ lw $v0, 0xd0($s0) -/* 91234C 80242C9C 8C420014 */ lw $v0, 0x14($v0) -/* 912350 80242CA0 04410004 */ bgez $v0, .L80242CB4 -/* 912354 80242CA4 00000000 */ nop -/* 912358 80242CA8 C6200000 */ lwc1 $f0, ($s1) -/* 91235C 80242CAC 08090B35 */ j .L80242CD4 -/* 912360 80242CB0 E4600018 */ swc1 $f0, 0x18($v1) -.L80242CB4: -/* 912364 80242CB4 3C018024 */ lui $at, 0x8024 -/* 912368 80242CB8 D42265E0 */ ldc1 $f2, 0x65e0($at) -/* 91236C 80242CBC 44820000 */ mtc1 $v0, $f0 -/* 912370 80242CC0 00000000 */ nop -/* 912374 80242CC4 46800021 */ cvt.d.w $f0, $f0 -/* 912378 80242CC8 46220003 */ div.d $f0, $f0, $f2 -/* 91237C 80242CCC 46200020 */ cvt.s.d $f0, $f0 -/* 912380 80242CD0 E4600018 */ swc1 $f0, 0x18($v1) -.L80242CD4: -/* 912384 80242CD4 24020029 */ addiu $v0, $zero, 0x29 -/* 912388 80242CD8 AE420070 */ sw $v0, 0x70($s2) -.L80242CDC: -/* 91238C 80242CDC 8FBF001C */ lw $ra, 0x1c($sp) -/* 912390 80242CE0 8FB20018 */ lw $s2, 0x18($sp) -/* 912394 80242CE4 8FB10014 */ lw $s1, 0x14($sp) -/* 912398 80242CE8 8FB00010 */ lw $s0, 0x10($sp) -/* 91239C 80242CEC 03E00008 */ jr $ra -/* 9123A0 80242CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s new file mode 100644 index 0000000000..fb714bd8ba --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242C48_9122F8.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C48_9122F8 +/* 9122F8 80242C48 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9122FC 80242C4C AFB20018 */ sw $s2, 0x18($sp) +/* 912300 80242C50 0080902D */ daddu $s2, $a0, $zero +/* 912304 80242C54 AFBF001C */ sw $ra, 0x1c($sp) +/* 912308 80242C58 AFB10014 */ sw $s1, 0x14($sp) +/* 91230C 80242C5C AFB00010 */ sw $s0, 0x10($sp) +/* 912310 80242C60 8E500148 */ lw $s0, 0x148($s2) +/* 912314 80242C64 86040008 */ lh $a0, 8($s0) +/* 912318 80242C68 0C00EABB */ jal get_npc_unsafe +/* 91231C 80242C6C 00A0882D */ daddu $s1, $a1, $zero +/* 912320 80242C70 0040182D */ daddu $v1, $v0, $zero +/* 912324 80242C74 9462008E */ lhu $v0, 0x8e($v1) +/* 912328 80242C78 2442FFFF */ addiu $v0, $v0, -1 +/* 91232C 80242C7C A462008E */ sh $v0, 0x8e($v1) +/* 912330 80242C80 00021400 */ sll $v0, $v0, 0x10 +/* 912334 80242C84 1C400015 */ bgtz $v0, .L80242CDC +/* 912338 80242C88 00000000 */ nop +/* 91233C 80242C8C 8E0200CC */ lw $v0, 0xcc($s0) +/* 912340 80242C90 8C420004 */ lw $v0, 4($v0) +/* 912344 80242C94 AC620028 */ sw $v0, 0x28($v1) +/* 912348 80242C98 8E0200D0 */ lw $v0, 0xd0($s0) +/* 91234C 80242C9C 8C420014 */ lw $v0, 0x14($v0) +/* 912350 80242CA0 04410004 */ bgez $v0, .L80242CB4 +/* 912354 80242CA4 00000000 */ nop +/* 912358 80242CA8 C6200000 */ lwc1 $f0, ($s1) +/* 91235C 80242CAC 08090B35 */ j .L80242CD4 +/* 912360 80242CB0 E4600018 */ swc1 $f0, 0x18($v1) +.L80242CB4: +/* 912364 80242CB4 3C018024 */ lui $at, 0x8024 +/* 912368 80242CB8 D42265E0 */ ldc1 $f2, 0x65e0($at) +/* 91236C 80242CBC 44820000 */ mtc1 $v0, $f0 +/* 912370 80242CC0 00000000 */ nop +/* 912374 80242CC4 46800021 */ cvt.d.w $f0, $f0 +/* 912378 80242CC8 46220003 */ div.d $f0, $f0, $f2 +/* 91237C 80242CCC 46200020 */ cvt.s.d $f0, $f0 +/* 912380 80242CD0 E4600018 */ swc1 $f0, 0x18($v1) +.L80242CD4: +/* 912384 80242CD4 24020029 */ addiu $v0, $zero, 0x29 +/* 912388 80242CD8 AE420070 */ sw $v0, 0x70($s2) +.L80242CDC: +/* 91238C 80242CDC 8FBF001C */ lw $ra, 0x1c($sp) +/* 912390 80242CE0 8FB20018 */ lw $s2, 0x18($sp) +/* 912394 80242CE4 8FB10014 */ lw $s1, 0x14($sp) +/* 912398 80242CE8 8FB00010 */ lw $s0, 0x10($sp) +/* 91239C 80242CEC 03E00008 */ jr $ra +/* 9123A0 80242CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4.s deleted file mode 100644 index 69b02792c7..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CF4 -/* 9123A4 80242CF4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9123A8 80242CF8 AFB30024 */ sw $s3, 0x24($sp) -/* 9123AC 80242CFC 0080982D */ daddu $s3, $a0, $zero -/* 9123B0 80242D00 AFBF0028 */ sw $ra, 0x28($sp) -/* 9123B4 80242D04 AFB20020 */ sw $s2, 0x20($sp) -/* 9123B8 80242D08 AFB1001C */ sw $s1, 0x1c($sp) -/* 9123BC 80242D0C AFB00018 */ sw $s0, 0x18($sp) -/* 9123C0 80242D10 8E720148 */ lw $s2, 0x148($s3) -/* 9123C4 80242D14 00A0882D */ daddu $s1, $a1, $zero -/* 9123C8 80242D18 86440008 */ lh $a0, 8($s2) -/* 9123CC 80242D1C 0C00EABB */ jal get_npc_unsafe -/* 9123D0 80242D20 00C0802D */ daddu $s0, $a2, $zero -/* 9123D4 80242D24 0200202D */ daddu $a0, $s0, $zero -/* 9123D8 80242D28 0240282D */ daddu $a1, $s2, $zero -/* 9123DC 80242D2C AFA00010 */ sw $zero, 0x10($sp) -/* 9123E0 80242D30 8E260024 */ lw $a2, 0x24($s1) -/* 9123E4 80242D34 8E270028 */ lw $a3, 0x28($s1) -/* 9123E8 80242D38 0C01242D */ jal func_800490B4 -/* 9123EC 80242D3C 0040802D */ daddu $s0, $v0, $zero -/* 9123F0 80242D40 1040000C */ beqz $v0, .L80242D74 -/* 9123F4 80242D44 00000000 */ nop -/* 9123F8 80242D48 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9123FC 80242D4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 912400 80242D50 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 912404 80242D54 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 912408 80242D58 8C460028 */ lw $a2, 0x28($v0) -/* 91240C 80242D5C 0C00A720 */ jal atan2 -/* 912410 80242D60 8C470030 */ lw $a3, 0x30($v0) -/* 912414 80242D64 2402000C */ addiu $v0, $zero, 0xc -/* 912418 80242D68 E600000C */ swc1 $f0, 0xc($s0) -/* 91241C 80242D6C 08090B84 */ j .L80242E10 -/* 912420 80242D70 AE620070 */ sw $v0, 0x70($s3) -.L80242D74: -/* 912424 80242D74 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 912428 80242D78 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91242C 80242D7C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 912430 80242D80 C4440000 */ lwc1 $f4, ($v0) -/* 912434 80242D84 46802120 */ cvt.s.w $f4, $f4 -/* 912438 80242D88 44062000 */ mfc1 $a2, $f4 -/* 91243C 80242D8C C4440008 */ lwc1 $f4, 8($v0) -/* 912440 80242D90 46802120 */ cvt.s.w $f4, $f4 -/* 912444 80242D94 44072000 */ mfc1 $a3, $f4 -/* 912448 80242D98 0C00A7B5 */ jal dist2D -/* 91244C 80242D9C 00000000 */ nop -/* 912450 80242DA0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 912454 80242DA4 4602003E */ c.le.s $f0, $f2 -/* 912458 80242DA8 00000000 */ nop -/* 91245C 80242DAC 45000005 */ bc1f .L80242DC4 -/* 912460 80242DB0 2402000A */ addiu $v0, $zero, 0xa -/* 912464 80242DB4 A602008E */ sh $v0, 0x8e($s0) -/* 912468 80242DB8 24020032 */ addiu $v0, $zero, 0x32 -/* 91246C 80242DBC 08090B84 */ j .L80242E10 -/* 912470 80242DC0 AE620070 */ sw $v0, 0x70($s3) -.L80242DC4: -/* 912474 80242DC4 8602008C */ lh $v0, 0x8c($s0) -/* 912478 80242DC8 14400011 */ bnez $v0, .L80242E10 -/* 91247C 80242DCC 00000000 */ nop -/* 912480 80242DD0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 912484 80242DD4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912488 80242DD8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91248C 80242DDC C4440000 */ lwc1 $f4, ($v0) -/* 912490 80242DE0 46802120 */ cvt.s.w $f4, $f4 -/* 912494 80242DE4 44062000 */ mfc1 $a2, $f4 -/* 912498 80242DE8 C4440008 */ lwc1 $f4, 8($v0) -/* 91249C 80242DEC 46802120 */ cvt.s.w $f4, $f4 -/* 9124A0 80242DF0 44072000 */ mfc1 $a3, $f4 -/* 9124A4 80242DF4 0C00A720 */ jal atan2 -/* 9124A8 80242DF8 00000000 */ nop -/* 9124AC 80242DFC 8E050018 */ lw $a1, 0x18($s0) -/* 9124B0 80242E00 44060000 */ mfc1 $a2, $f0 -/* 9124B4 80242E04 0200202D */ daddu $a0, $s0, $zero -/* 9124B8 80242E08 0C00EA95 */ jal npc_move_heading -/* 9124BC 80242E0C AC86000C */ sw $a2, 0xc($a0) -.L80242E10: -/* 9124C0 80242E10 8FBF0028 */ lw $ra, 0x28($sp) -/* 9124C4 80242E14 8FB30024 */ lw $s3, 0x24($sp) -/* 9124C8 80242E18 8FB20020 */ lw $s2, 0x20($sp) -/* 9124CC 80242E1C 8FB1001C */ lw $s1, 0x1c($sp) -/* 9124D0 80242E20 8FB00018 */ lw $s0, 0x18($sp) -/* 9124D4 80242E24 03E00008 */ jr $ra -/* 9124D8 80242E28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s new file mode 100644 index 0000000000..e93fdb4aba --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242CF4_9123A4.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242CF4_9123A4 +/* 9123A4 80242CF4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9123A8 80242CF8 AFB30024 */ sw $s3, 0x24($sp) +/* 9123AC 80242CFC 0080982D */ daddu $s3, $a0, $zero +/* 9123B0 80242D00 AFBF0028 */ sw $ra, 0x28($sp) +/* 9123B4 80242D04 AFB20020 */ sw $s2, 0x20($sp) +/* 9123B8 80242D08 AFB1001C */ sw $s1, 0x1c($sp) +/* 9123BC 80242D0C AFB00018 */ sw $s0, 0x18($sp) +/* 9123C0 80242D10 8E720148 */ lw $s2, 0x148($s3) +/* 9123C4 80242D14 00A0882D */ daddu $s1, $a1, $zero +/* 9123C8 80242D18 86440008 */ lh $a0, 8($s2) +/* 9123CC 80242D1C 0C00EABB */ jal get_npc_unsafe +/* 9123D0 80242D20 00C0802D */ daddu $s0, $a2, $zero +/* 9123D4 80242D24 0200202D */ daddu $a0, $s0, $zero +/* 9123D8 80242D28 0240282D */ daddu $a1, $s2, $zero +/* 9123DC 80242D2C AFA00010 */ sw $zero, 0x10($sp) +/* 9123E0 80242D30 8E260024 */ lw $a2, 0x24($s1) +/* 9123E4 80242D34 8E270028 */ lw $a3, 0x28($s1) +/* 9123E8 80242D38 0C01242D */ jal func_800490B4 +/* 9123EC 80242D3C 0040802D */ daddu $s0, $v0, $zero +/* 9123F0 80242D40 1040000C */ beqz $v0, .L80242D74 +/* 9123F4 80242D44 00000000 */ nop +/* 9123F8 80242D48 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9123FC 80242D4C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 912400 80242D50 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 912404 80242D54 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 912408 80242D58 8C460028 */ lw $a2, 0x28($v0) +/* 91240C 80242D5C 0C00A720 */ jal atan2 +/* 912410 80242D60 8C470030 */ lw $a3, 0x30($v0) +/* 912414 80242D64 2402000C */ addiu $v0, $zero, 0xc +/* 912418 80242D68 E600000C */ swc1 $f0, 0xc($s0) +/* 91241C 80242D6C 08090B84 */ j .L80242E10 +/* 912420 80242D70 AE620070 */ sw $v0, 0x70($s3) +.L80242D74: +/* 912424 80242D74 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 912428 80242D78 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91242C 80242D7C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 912430 80242D80 C4440000 */ lwc1 $f4, ($v0) +/* 912434 80242D84 46802120 */ cvt.s.w $f4, $f4 +/* 912438 80242D88 44062000 */ mfc1 $a2, $f4 +/* 91243C 80242D8C C4440008 */ lwc1 $f4, 8($v0) +/* 912440 80242D90 46802120 */ cvt.s.w $f4, $f4 +/* 912444 80242D94 44072000 */ mfc1 $a3, $f4 +/* 912448 80242D98 0C00A7B5 */ jal dist2D +/* 91244C 80242D9C 00000000 */ nop +/* 912450 80242DA0 C6020018 */ lwc1 $f2, 0x18($s0) +/* 912454 80242DA4 4602003E */ c.le.s $f0, $f2 +/* 912458 80242DA8 00000000 */ nop +/* 91245C 80242DAC 45000005 */ bc1f .L80242DC4 +/* 912460 80242DB0 2402000A */ addiu $v0, $zero, 0xa +/* 912464 80242DB4 A602008E */ sh $v0, 0x8e($s0) +/* 912468 80242DB8 24020032 */ addiu $v0, $zero, 0x32 +/* 91246C 80242DBC 08090B84 */ j .L80242E10 +/* 912470 80242DC0 AE620070 */ sw $v0, 0x70($s3) +.L80242DC4: +/* 912474 80242DC4 8602008C */ lh $v0, 0x8c($s0) +/* 912478 80242DC8 14400011 */ bnez $v0, .L80242E10 +/* 91247C 80242DCC 00000000 */ nop +/* 912480 80242DD0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 912484 80242DD4 8E4200D0 */ lw $v0, 0xd0($s2) +/* 912488 80242DD8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91248C 80242DDC C4440000 */ lwc1 $f4, ($v0) +/* 912490 80242DE0 46802120 */ cvt.s.w $f4, $f4 +/* 912494 80242DE4 44062000 */ mfc1 $a2, $f4 +/* 912498 80242DE8 C4440008 */ lwc1 $f4, 8($v0) +/* 91249C 80242DEC 46802120 */ cvt.s.w $f4, $f4 +/* 9124A0 80242DF0 44072000 */ mfc1 $a3, $f4 +/* 9124A4 80242DF4 0C00A720 */ jal atan2 +/* 9124A8 80242DF8 00000000 */ nop +/* 9124AC 80242DFC 8E050018 */ lw $a1, 0x18($s0) +/* 9124B0 80242E00 44060000 */ mfc1 $a2, $f0 +/* 9124B4 80242E04 0200202D */ daddu $a0, $s0, $zero +/* 9124B8 80242E08 0C00EA95 */ jal npc_move_heading +/* 9124BC 80242E0C AC86000C */ sw $a2, 0xc($a0) +.L80242E10: +/* 9124C0 80242E10 8FBF0028 */ lw $ra, 0x28($sp) +/* 9124C4 80242E14 8FB30024 */ lw $s3, 0x24($sp) +/* 9124C8 80242E18 8FB20020 */ lw $s2, 0x20($sp) +/* 9124CC 80242E1C 8FB1001C */ lw $s1, 0x1c($sp) +/* 9124D0 80242E20 8FB00018 */ lw $s0, 0x18($sp) +/* 9124D4 80242E24 03E00008 */ jr $ra +/* 9124D8 80242E28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C.s deleted file mode 100644 index 4a7983410c..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E2C -/* 9124DC 80242E2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9124E0 80242E30 AFB10014 */ sw $s1, 0x14($sp) -/* 9124E4 80242E34 0080882D */ daddu $s1, $a0, $zero -/* 9124E8 80242E38 AFBF0018 */ sw $ra, 0x18($sp) -/* 9124EC 80242E3C AFB00010 */ sw $s0, 0x10($sp) -/* 9124F0 80242E40 8E300148 */ lw $s0, 0x148($s1) -/* 9124F4 80242E44 0C00EABB */ jal get_npc_unsafe -/* 9124F8 80242E48 86040008 */ lh $a0, 8($s0) -/* 9124FC 80242E4C 0040202D */ daddu $a0, $v0, $zero -/* 912500 80242E50 8482008E */ lh $v0, 0x8e($a0) -/* 912504 80242E54 9483008E */ lhu $v1, 0x8e($a0) -/* 912508 80242E58 18400002 */ blez $v0, .L80242E64 -/* 91250C 80242E5C 2462FFFF */ addiu $v0, $v1, -1 -/* 912510 80242E60 A482008E */ sh $v0, 0x8e($a0) -.L80242E64: -/* 912514 80242E64 8482008C */ lh $v0, 0x8c($a0) -/* 912518 80242E68 1440000A */ bnez $v0, .L80242E94 -/* 91251C 80242E6C 00000000 */ nop -/* 912520 80242E70 8482008E */ lh $v0, 0x8e($a0) -/* 912524 80242E74 1C400007 */ bgtz $v0, .L80242E94 -/* 912528 80242E78 24020008 */ addiu $v0, $zero, 8 -/* 91252C 80242E7C A482008E */ sh $v0, 0x8e($a0) -/* 912530 80242E80 8E0200CC */ lw $v0, 0xcc($s0) -/* 912534 80242E84 8C42002C */ lw $v0, 0x2c($v0) -/* 912538 80242E88 AC820028 */ sw $v0, 0x28($a0) -/* 91253C 80242E8C 24020033 */ addiu $v0, $zero, 0x33 -/* 912540 80242E90 AE220070 */ sw $v0, 0x70($s1) -.L80242E94: -/* 912544 80242E94 8FBF0018 */ lw $ra, 0x18($sp) -/* 912548 80242E98 8FB10014 */ lw $s1, 0x14($sp) -/* 91254C 80242E9C 8FB00010 */ lw $s0, 0x10($sp) -/* 912550 80242EA0 03E00008 */ jr $ra -/* 912554 80242EA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C_9124DC.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C_9124DC.s new file mode 100644 index 0000000000..da6167078a --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242E2C_9124DC.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E2C_9124DC +/* 9124DC 80242E2C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9124E0 80242E30 AFB10014 */ sw $s1, 0x14($sp) +/* 9124E4 80242E34 0080882D */ daddu $s1, $a0, $zero +/* 9124E8 80242E38 AFBF0018 */ sw $ra, 0x18($sp) +/* 9124EC 80242E3C AFB00010 */ sw $s0, 0x10($sp) +/* 9124F0 80242E40 8E300148 */ lw $s0, 0x148($s1) +/* 9124F4 80242E44 0C00EABB */ jal get_npc_unsafe +/* 9124F8 80242E48 86040008 */ lh $a0, 8($s0) +/* 9124FC 80242E4C 0040202D */ daddu $a0, $v0, $zero +/* 912500 80242E50 8482008E */ lh $v0, 0x8e($a0) +/* 912504 80242E54 9483008E */ lhu $v1, 0x8e($a0) +/* 912508 80242E58 18400002 */ blez $v0, .L80242E64 +/* 91250C 80242E5C 2462FFFF */ addiu $v0, $v1, -1 +/* 912510 80242E60 A482008E */ sh $v0, 0x8e($a0) +.L80242E64: +/* 912514 80242E64 8482008C */ lh $v0, 0x8c($a0) +/* 912518 80242E68 1440000A */ bnez $v0, .L80242E94 +/* 91251C 80242E6C 00000000 */ nop +/* 912520 80242E70 8482008E */ lh $v0, 0x8e($a0) +/* 912524 80242E74 1C400007 */ bgtz $v0, .L80242E94 +/* 912528 80242E78 24020008 */ addiu $v0, $zero, 8 +/* 91252C 80242E7C A482008E */ sh $v0, 0x8e($a0) +/* 912530 80242E80 8E0200CC */ lw $v0, 0xcc($s0) +/* 912534 80242E84 8C42002C */ lw $v0, 0x2c($v0) +/* 912538 80242E88 AC820028 */ sw $v0, 0x28($a0) +/* 91253C 80242E8C 24020033 */ addiu $v0, $zero, 0x33 +/* 912540 80242E90 AE220070 */ sw $v0, 0x70($s1) +.L80242E94: +/* 912544 80242E94 8FBF0018 */ lw $ra, 0x18($sp) +/* 912548 80242E98 8FB10014 */ lw $s1, 0x14($sp) +/* 91254C 80242E9C 8FB00010 */ lw $s0, 0x10($sp) +/* 912550 80242EA0 03E00008 */ jr $ra +/* 912554 80242EA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242EA8.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242EA8.s deleted file mode 100644 index 4872bdcbae..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242EA8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EA8 -/* 912558 80242EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91255C 80242EAC AFB10014 */ sw $s1, 0x14($sp) -/* 912560 80242EB0 0080882D */ daddu $s1, $a0, $zero -/* 912564 80242EB4 AFBF0018 */ sw $ra, 0x18($sp) -/* 912568 80242EB8 AFB00010 */ sw $s0, 0x10($sp) -/* 91256C 80242EBC 8E300148 */ lw $s0, 0x148($s1) -/* 912570 80242EC0 0C00EABB */ jal get_npc_unsafe -/* 912574 80242EC4 86040008 */ lh $a0, 8($s0) -/* 912578 80242EC8 0040182D */ daddu $v1, $v0, $zero -/* 91257C 80242ECC 9462008E */ lhu $v0, 0x8e($v1) -/* 912580 80242ED0 2442FFFF */ addiu $v0, $v0, -1 -/* 912584 80242ED4 A462008E */ sh $v0, 0x8e($v1) -/* 912588 80242ED8 00021400 */ sll $v0, $v0, 0x10 -/* 91258C 80242EDC 1C400007 */ bgtz $v0, .L80242EFC -/* 912590 80242EE0 24020008 */ addiu $v0, $zero, 8 -/* 912594 80242EE4 A462008E */ sh $v0, 0x8e($v1) -/* 912598 80242EE8 8E0200CC */ lw $v0, 0xcc($s0) -/* 91259C 80242EEC 8C420038 */ lw $v0, 0x38($v0) -/* 9125A0 80242EF0 AC620028 */ sw $v0, 0x28($v1) -/* 9125A4 80242EF4 24020034 */ addiu $v0, $zero, 0x34 -/* 9125A8 80242EF8 AE220070 */ sw $v0, 0x70($s1) -.L80242EFC: -/* 9125AC 80242EFC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9125B0 80242F00 8FB10014 */ lw $s1, 0x14($sp) -/* 9125B4 80242F04 8FB00010 */ lw $s0, 0x10($sp) -/* 9125B8 80242F08 03E00008 */ jr $ra -/* 9125BC 80242F0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242EA8_912558.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242EA8_912558.s new file mode 100644 index 0000000000..5bb698605f --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242EA8_912558.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242EA8_912558 +/* 912558 80242EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91255C 80242EAC AFB10014 */ sw $s1, 0x14($sp) +/* 912560 80242EB0 0080882D */ daddu $s1, $a0, $zero +/* 912564 80242EB4 AFBF0018 */ sw $ra, 0x18($sp) +/* 912568 80242EB8 AFB00010 */ sw $s0, 0x10($sp) +/* 91256C 80242EBC 8E300148 */ lw $s0, 0x148($s1) +/* 912570 80242EC0 0C00EABB */ jal get_npc_unsafe +/* 912574 80242EC4 86040008 */ lh $a0, 8($s0) +/* 912578 80242EC8 0040182D */ daddu $v1, $v0, $zero +/* 91257C 80242ECC 9462008E */ lhu $v0, 0x8e($v1) +/* 912580 80242ED0 2442FFFF */ addiu $v0, $v0, -1 +/* 912584 80242ED4 A462008E */ sh $v0, 0x8e($v1) +/* 912588 80242ED8 00021400 */ sll $v0, $v0, 0x10 +/* 91258C 80242EDC 1C400007 */ bgtz $v0, .L80242EFC +/* 912590 80242EE0 24020008 */ addiu $v0, $zero, 8 +/* 912594 80242EE4 A462008E */ sh $v0, 0x8e($v1) +/* 912598 80242EE8 8E0200CC */ lw $v0, 0xcc($s0) +/* 91259C 80242EEC 8C420038 */ lw $v0, 0x38($v0) +/* 9125A0 80242EF0 AC620028 */ sw $v0, 0x28($v1) +/* 9125A4 80242EF4 24020034 */ addiu $v0, $zero, 0x34 +/* 9125A8 80242EF8 AE220070 */ sw $v0, 0x70($s1) +.L80242EFC: +/* 9125AC 80242EFC 8FBF0018 */ lw $ra, 0x18($sp) +/* 9125B0 80242F00 8FB10014 */ lw $s1, 0x14($sp) +/* 9125B4 80242F04 8FB00010 */ lw $s0, 0x10($sp) +/* 9125B8 80242F08 03E00008 */ jr $ra +/* 9125BC 80242F0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F10.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F10.s deleted file mode 100644 index b336b15a70..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F10.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F10 -/* 9125C0 80242F10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9125C4 80242F14 AFB00010 */ sw $s0, 0x10($sp) -/* 9125C8 80242F18 0080802D */ daddu $s0, $a0, $zero -/* 9125CC 80242F1C AFBF0014 */ sw $ra, 0x14($sp) -/* 9125D0 80242F20 8E020148 */ lw $v0, 0x148($s0) -/* 9125D4 80242F24 0C00EABB */ jal get_npc_unsafe -/* 9125D8 80242F28 84440008 */ lh $a0, 8($v0) -/* 9125DC 80242F2C 9443008E */ lhu $v1, 0x8e($v0) -/* 9125E0 80242F30 2463FFFF */ addiu $v1, $v1, -1 -/* 9125E4 80242F34 A443008E */ sh $v1, 0x8e($v0) -/* 9125E8 80242F38 00031C00 */ sll $v1, $v1, 0x10 -/* 9125EC 80242F3C 58600001 */ blezl $v1, .L80242F44 -/* 9125F0 80242F40 AE000070 */ sw $zero, 0x70($s0) -.L80242F44: -/* 9125F4 80242F44 8FBF0014 */ lw $ra, 0x14($sp) -/* 9125F8 80242F48 8FB00010 */ lw $s0, 0x10($sp) -/* 9125FC 80242F4C 03E00008 */ jr $ra -/* 912600 80242F50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F10_9125C0.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F10_9125C0.s new file mode 100644 index 0000000000..86ccb8009b --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F10_9125C0.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F10_9125C0 +/* 9125C0 80242F10 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9125C4 80242F14 AFB00010 */ sw $s0, 0x10($sp) +/* 9125C8 80242F18 0080802D */ daddu $s0, $a0, $zero +/* 9125CC 80242F1C AFBF0014 */ sw $ra, 0x14($sp) +/* 9125D0 80242F20 8E020148 */ lw $v0, 0x148($s0) +/* 9125D4 80242F24 0C00EABB */ jal get_npc_unsafe +/* 9125D8 80242F28 84440008 */ lh $a0, 8($v0) +/* 9125DC 80242F2C 9443008E */ lhu $v1, 0x8e($v0) +/* 9125E0 80242F30 2463FFFF */ addiu $v1, $v1, -1 +/* 9125E4 80242F34 A443008E */ sh $v1, 0x8e($v0) +/* 9125E8 80242F38 00031C00 */ sll $v1, $v1, 0x10 +/* 9125EC 80242F3C 58600001 */ blezl $v1, .L80242F44 +/* 9125F0 80242F40 AE000070 */ sw $zero, 0x70($s0) +.L80242F44: +/* 9125F4 80242F44 8FBF0014 */ lw $ra, 0x14($sp) +/* 9125F8 80242F48 8FB00010 */ lw $s0, 0x10($sp) +/* 9125FC 80242F4C 03E00008 */ jr $ra +/* 912600 80242F50 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54.s deleted file mode 100644 index a879481d77..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54.s +++ /dev/null @@ -1,226 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F54 -/* 912604 80242F54 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 912608 80242F58 AFB3003C */ sw $s3, 0x3c($sp) -/* 91260C 80242F5C 0080982D */ daddu $s3, $a0, $zero -/* 912610 80242F60 AFBF0048 */ sw $ra, 0x48($sp) -/* 912614 80242F64 AFB50044 */ sw $s5, 0x44($sp) -/* 912618 80242F68 AFB40040 */ sw $s4, 0x40($sp) -/* 91261C 80242F6C AFB20038 */ sw $s2, 0x38($sp) -/* 912620 80242F70 AFB10034 */ sw $s1, 0x34($sp) -/* 912624 80242F74 AFB00030 */ sw $s0, 0x30($sp) -/* 912628 80242F78 8E720148 */ lw $s2, 0x148($s3) -/* 91262C 80242F7C 86440008 */ lh $a0, 8($s2) -/* 912630 80242F80 0C00EABB */ jal get_npc_unsafe -/* 912634 80242F84 00A0882D */ daddu $s1, $a1, $zero -/* 912638 80242F88 0260202D */ daddu $a0, $s3, $zero -/* 91263C 80242F8C 8E70000C */ lw $s0, 0xc($s3) -/* 912640 80242F90 0040A82D */ daddu $s5, $v0, $zero -/* 912644 80242F94 8E050000 */ lw $a1, ($s0) -/* 912648 80242F98 0C0B1EAF */ jal get_variable -/* 91264C 80242F9C 26100004 */ addiu $s0, $s0, 4 -/* 912650 80242FA0 0260202D */ daddu $a0, $s3, $zero -/* 912654 80242FA4 8E050000 */ lw $a1, ($s0) -/* 912658 80242FA8 0C0B1EAF */ jal get_variable -/* 91265C 80242FAC 0040A02D */ daddu $s4, $v0, $zero -/* 912660 80242FB0 AE420094 */ sw $v0, 0x94($s2) -/* 912664 80242FB4 AFA00010 */ sw $zero, 0x10($sp) -/* 912668 80242FB8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91266C 80242FBC 8C420030 */ lw $v0, 0x30($v0) -/* 912670 80242FC0 AFA20014 */ sw $v0, 0x14($sp) -/* 912674 80242FC4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912678 80242FC8 8C42001C */ lw $v0, 0x1c($v0) -/* 91267C 80242FCC AFA20018 */ sw $v0, 0x18($sp) -/* 912680 80242FD0 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912684 80242FD4 8C420024 */ lw $v0, 0x24($v0) -/* 912688 80242FD8 AFA2001C */ sw $v0, 0x1c($sp) -/* 91268C 80242FDC 8E4200D0 */ lw $v0, 0xd0($s2) -/* 912690 80242FE0 8C420028 */ lw $v0, 0x28($v0) -/* 912694 80242FE4 AFA20020 */ sw $v0, 0x20($sp) -/* 912698 80242FE8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91269C 80242FEC 3C014220 */ lui $at, 0x4220 -/* 9126A0 80242FF0 44810000 */ mtc1 $at, $f0 -/* 9126A4 80242FF4 8C42002C */ lw $v0, 0x2c($v0) -/* 9126A8 80242FF8 27B00010 */ addiu $s0, $sp, 0x10 -/* 9126AC 80242FFC E7A00028 */ swc1 $f0, 0x28($sp) -/* 9126B0 80243000 A7A0002C */ sh $zero, 0x2c($sp) -/* 9126B4 80243004 12200012 */ beqz $s1, .L80243050 -/* 9126B8 80243008 AFA20024 */ sw $v0, 0x24($sp) -/* 9126BC 8024300C AE600070 */ sw $zero, 0x70($s3) -/* 9126C0 80243010 8EA30000 */ lw $v1, ($s5) -/* 9126C4 80243014 2402F7FF */ addiu $v0, $zero, -0x801 -/* 9126C8 80243018 A6A0008E */ sh $zero, 0x8e($s5) -/* 9126CC 8024301C 00621824 */ and $v1, $v1, $v0 -/* 9126D0 80243020 AEA30000 */ sw $v1, ($s5) -/* 9126D4 80243024 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9126D8 80243028 8C420034 */ lw $v0, 0x34($v0) -/* 9126DC 8024302C 54400005 */ bnel $v0, $zero, .L80243044 -/* 9126E0 80243030 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9126E4 80243034 34620200 */ ori $v0, $v1, 0x200 -/* 9126E8 80243038 2403FFF7 */ addiu $v1, $zero, -9 -/* 9126EC 8024303C 08090C13 */ j .L8024304C -/* 9126F0 80243040 00431024 */ and $v0, $v0, $v1 -.L80243044: -/* 9126F4 80243044 00621024 */ and $v0, $v1, $v0 -/* 9126F8 80243048 34420008 */ ori $v0, $v0, 8 -.L8024304C: -/* 9126FC 8024304C AEA20000 */ sw $v0, ($s5) -.L80243050: -/* 912700 80243050 8E4300B0 */ lw $v1, 0xb0($s2) -/* 912704 80243054 30620004 */ andi $v0, $v1, 4 -/* 912708 80243058 10400007 */ beqz $v0, .L80243078 -/* 91270C 8024305C 00000000 */ nop -/* 912710 80243060 824200B4 */ lb $v0, 0xb4($s2) -/* 912714 80243064 14400086 */ bnez $v0, .L80243280 -/* 912718 80243068 0000102D */ daddu $v0, $zero, $zero -/* 91271C 8024306C 2402FFFB */ addiu $v0, $zero, -5 -/* 912720 80243070 00621024 */ and $v0, $v1, $v0 -/* 912724 80243074 AE4200B0 */ sw $v0, 0xb0($s2) -.L80243078: -/* 912728 80243078 8E620070 */ lw $v0, 0x70($s3) -/* 91272C 8024307C 2442FFF4 */ addiu $v0, $v0, -0xc -/* 912730 80243080 2C420003 */ sltiu $v0, $v0, 3 -/* 912734 80243084 10400007 */ beqz $v0, .L802430A4 -/* 912738 80243088 0260202D */ daddu $a0, $s3, $zero -/* 91273C 8024308C 0280282D */ daddu $a1, $s4, $zero -/* 912740 80243090 0C0908B1 */ jal func_802422C4 -/* 912744 80243094 0200302D */ daddu $a2, $s0, $zero -/* 912748 80243098 10400002 */ beqz $v0, .L802430A4 -/* 91274C 8024309C 24020014 */ addiu $v0, $zero, 0x14 -/* 912750 802430A0 AE620070 */ sw $v0, 0x70($s3) -.L802430A4: -/* 912754 802430A4 8E630070 */ lw $v1, 0x70($s3) -/* 912758 802430A8 2C620035 */ sltiu $v0, $v1, 0x35 -/* 91275C 802430AC 10400073 */ beqz $v0, .L8024327C -/* 912760 802430B0 00031080 */ sll $v0, $v1, 2 -/* 912764 802430B4 3C018024 */ lui $at, 0x8024 -/* 912768 802430B8 00220821 */ addu $at, $at, $v0 -/* 91276C 802430BC 8C2265E8 */ lw $v0, 0x65e8($at) -/* 912770 802430C0 00400008 */ jr $v0 -/* 912774 802430C4 00000000 */ nop -/* 912778 802430C8 0260202D */ daddu $a0, $s3, $zero -/* 91277C 802430CC 0280282D */ daddu $a1, $s4, $zero -/* 912780 802430D0 0C090909 */ jal func_80242424 -/* 912784 802430D4 0200302D */ daddu $a2, $s0, $zero -/* 912788 802430D8 0260202D */ daddu $a0, $s3, $zero -/* 91278C 802430DC 0280282D */ daddu $a1, $s4, $zero -/* 912790 802430E0 0C090926 */ jal func_80242498 -/* 912794 802430E4 0200302D */ daddu $a2, $s0, $zero -/* 912798 802430E8 8E630070 */ lw $v1, 0x70($s3) -/* 91279C 802430EC 24020002 */ addiu $v0, $zero, 2 -/* 9127A0 802430F0 14620063 */ bne $v1, $v0, .L80243280 -/* 9127A4 802430F4 0000102D */ daddu $v0, $zero, $zero -/* 9127A8 802430F8 0260202D */ daddu $a0, $s3, $zero -/* 9127AC 802430FC 0280282D */ daddu $a1, $s4, $zero -/* 9127B0 80243100 0C090972 */ jal func_802425C8 -/* 9127B4 80243104 0200302D */ daddu $a2, $s0, $zero -/* 9127B8 80243108 8E630070 */ lw $v1, 0x70($s3) -/* 9127BC 8024310C 24020003 */ addiu $v0, $zero, 3 -/* 9127C0 80243110 1462005B */ bne $v1, $v0, .L80243280 -/* 9127C4 80243114 0000102D */ daddu $v0, $zero, $zero -/* 9127C8 80243118 0260202D */ daddu $a0, $s3, $zero -/* 9127CC 8024311C 0280282D */ daddu $a1, $s4, $zero -/* 9127D0 80243120 0C090999 */ jal func_80242664 -/* 9127D4 80243124 0200302D */ daddu $a2, $s0, $zero -/* 9127D8 80243128 8E630070 */ lw $v1, 0x70($s3) -/* 9127DC 8024312C 24020004 */ addiu $v0, $zero, 4 -/* 9127E0 80243130 14620053 */ bne $v1, $v0, .L80243280 -/* 9127E4 80243134 0000102D */ daddu $v0, $zero, $zero -/* 9127E8 80243138 0260202D */ daddu $a0, $s3, $zero -/* 9127EC 8024313C 0280282D */ daddu $a1, $s4, $zero -/* 9127F0 80243140 0C0909BB */ jal func_802426EC -/* 9127F4 80243144 0200302D */ daddu $a2, $s0, $zero -/* 9127F8 80243148 0260202D */ daddu $a0, $s3, $zero -/* 9127FC 8024314C 0280282D */ daddu $a1, $s4, $zero -/* 912800 80243150 0C0909E5 */ jal func_80242794 -/* 912804 80243154 0200302D */ daddu $a2, $s0, $zero -/* 912808 80243158 08090CA0 */ j .L80243280 -/* 91280C 8024315C 0000102D */ daddu $v0, $zero, $zero -/* 912810 80243160 0260202D */ daddu $a0, $s3, $zero -/* 912814 80243164 0280282D */ daddu $a1, $s4, $zero -/* 912818 80243168 0C0127DF */ jal func_80049F7C -/* 91281C 8024316C 0200302D */ daddu $a2, $s0, $zero -/* 912820 80243170 8E630070 */ lw $v1, 0x70($s3) -/* 912824 80243174 2402000D */ addiu $v0, $zero, 0xd -/* 912828 80243178 14620041 */ bne $v1, $v0, .L80243280 -/* 91282C 8024317C 0000102D */ daddu $v0, $zero, $zero -/* 912830 80243180 0260202D */ daddu $a0, $s3, $zero -/* 912834 80243184 0280282D */ daddu $a1, $s4, $zero -/* 912838 80243188 0C012849 */ jal func_8004A124 -/* 91283C 8024318C 0200302D */ daddu $a2, $s0, $zero -/* 912840 80243190 8E630070 */ lw $v1, 0x70($s3) -/* 912844 80243194 2402000E */ addiu $v0, $zero, 0xe -/* 912848 80243198 14620039 */ bne $v1, $v0, .L80243280 -/* 91284C 8024319C 0000102D */ daddu $v0, $zero, $zero -/* 912850 802431A0 96A2008E */ lhu $v0, 0x8e($s5) -/* 912854 802431A4 2442FFFF */ addiu $v0, $v0, -1 -/* 912858 802431A8 A6A2008E */ sh $v0, 0x8e($s5) -/* 91285C 802431AC 00021400 */ sll $v0, $v0, 0x10 -/* 912860 802431B0 14400033 */ bnez $v0, .L80243280 -/* 912864 802431B4 0000102D */ daddu $v0, $zero, $zero -/* 912868 802431B8 24020028 */ addiu $v0, $zero, 0x28 -/* 91286C 802431BC 08090C9F */ j .L8024327C -/* 912870 802431C0 AE620070 */ sw $v0, 0x70($s3) -/* 912874 802431C4 0260202D */ daddu $a0, $s3, $zero -/* 912878 802431C8 0280282D */ daddu $a1, $s4, $zero -/* 91287C 802431CC 0C090A42 */ jal func_80242908 -/* 912880 802431D0 0200302D */ daddu $a2, $s0, $zero -/* 912884 802431D4 0260202D */ daddu $a0, $s3, $zero -/* 912888 802431D8 0280282D */ daddu $a1, $s4, $zero -/* 91288C 802431DC 0C090A56 */ jal func_80242958 -/* 912890 802431E0 0200302D */ daddu $a2, $s0, $zero -/* 912894 802431E4 08090CA0 */ j .L80243280 -/* 912898 802431E8 0000102D */ daddu $v0, $zero, $zero -/* 91289C 802431EC 0260202D */ daddu $a0, $s3, $zero -/* 9128A0 802431F0 0280282D */ daddu $a1, $s4, $zero -/* 9128A4 802431F4 0C090ABE */ jal func_80242AF8 -/* 9128A8 802431F8 0200302D */ daddu $a2, $s0, $zero -/* 9128AC 802431FC 08090CA0 */ j .L80243280 -/* 9128B0 80243200 0000102D */ daddu $v0, $zero, $zero -/* 9128B4 80243204 0260202D */ daddu $a0, $s3, $zero -/* 9128B8 80243208 0280282D */ daddu $a1, $s4, $zero -/* 9128BC 8024320C 0C090B12 */ jal func_80242C48 -/* 9128C0 80243210 0200302D */ daddu $a2, $s0, $zero -/* 9128C4 80243214 8E630070 */ lw $v1, 0x70($s3) -/* 9128C8 80243218 24020029 */ addiu $v0, $zero, 0x29 -/* 9128CC 8024321C 14620018 */ bne $v1, $v0, .L80243280 -/* 9128D0 80243220 0000102D */ daddu $v0, $zero, $zero -/* 9128D4 80243224 0260202D */ daddu $a0, $s3, $zero -/* 9128D8 80243228 0280282D */ daddu $a1, $s4, $zero -/* 9128DC 8024322C 0C090B3D */ jal func_80242CF4 -/* 9128E0 80243230 0200302D */ daddu $a2, $s0, $zero -/* 9128E4 80243234 08090CA0 */ j .L80243280 -/* 9128E8 80243238 0000102D */ daddu $v0, $zero, $zero -/* 9128EC 8024323C 0260202D */ daddu $a0, $s3, $zero -/* 9128F0 80243240 0280282D */ daddu $a1, $s4, $zero -/* 9128F4 80243244 0C090B8B */ jal func_80242E2C -/* 9128F8 80243248 0200302D */ daddu $a2, $s0, $zero -/* 9128FC 8024324C 0260202D */ daddu $a0, $s3, $zero -/* 912900 80243250 0280282D */ daddu $a1, $s4, $zero -/* 912904 80243254 0C090BAA */ jal func_80242EA8 -/* 912908 80243258 0200302D */ daddu $a2, $s0, $zero -/* 91290C 8024325C 8E630070 */ lw $v1, 0x70($s3) -/* 912910 80243260 24020034 */ addiu $v0, $zero, 0x34 -/* 912914 80243264 14620006 */ bne $v1, $v0, .L80243280 -/* 912918 80243268 0000102D */ daddu $v0, $zero, $zero -/* 91291C 8024326C 0260202D */ daddu $a0, $s3, $zero -/* 912920 80243270 0280282D */ daddu $a1, $s4, $zero -/* 912924 80243274 0C090BC4 */ jal func_80242F10 -/* 912928 80243278 0200302D */ daddu $a2, $s0, $zero -.L8024327C: -/* 91292C 8024327C 0000102D */ daddu $v0, $zero, $zero -.L80243280: -/* 912930 80243280 8FBF0048 */ lw $ra, 0x48($sp) -/* 912934 80243284 8FB50044 */ lw $s5, 0x44($sp) -/* 912938 80243288 8FB40040 */ lw $s4, 0x40($sp) -/* 91293C 8024328C 8FB3003C */ lw $s3, 0x3c($sp) -/* 912940 80243290 8FB20038 */ lw $s2, 0x38($sp) -/* 912944 80243294 8FB10034 */ lw $s1, 0x34($sp) -/* 912948 80243298 8FB00030 */ lw $s0, 0x30($sp) -/* 91294C 8024329C 03E00008 */ jr $ra -/* 912950 802432A0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 912954 802432A4 00000000 */ nop -/* 912958 802432A8 00000000 */ nop -/* 91295C 802432AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s new file mode 100644 index 0000000000..c7f694a5ac --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s @@ -0,0 +1,226 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F54_912604 +/* 912604 80242F54 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 912608 80242F58 AFB3003C */ sw $s3, 0x3c($sp) +/* 91260C 80242F5C 0080982D */ daddu $s3, $a0, $zero +/* 912610 80242F60 AFBF0048 */ sw $ra, 0x48($sp) +/* 912614 80242F64 AFB50044 */ sw $s5, 0x44($sp) +/* 912618 80242F68 AFB40040 */ sw $s4, 0x40($sp) +/* 91261C 80242F6C AFB20038 */ sw $s2, 0x38($sp) +/* 912620 80242F70 AFB10034 */ sw $s1, 0x34($sp) +/* 912624 80242F74 AFB00030 */ sw $s0, 0x30($sp) +/* 912628 80242F78 8E720148 */ lw $s2, 0x148($s3) +/* 91262C 80242F7C 86440008 */ lh $a0, 8($s2) +/* 912630 80242F80 0C00EABB */ jal get_npc_unsafe +/* 912634 80242F84 00A0882D */ daddu $s1, $a1, $zero +/* 912638 80242F88 0260202D */ daddu $a0, $s3, $zero +/* 91263C 80242F8C 8E70000C */ lw $s0, 0xc($s3) +/* 912640 80242F90 0040A82D */ daddu $s5, $v0, $zero +/* 912644 80242F94 8E050000 */ lw $a1, ($s0) +/* 912648 80242F98 0C0B1EAF */ jal get_variable +/* 91264C 80242F9C 26100004 */ addiu $s0, $s0, 4 +/* 912650 80242FA0 0260202D */ daddu $a0, $s3, $zero +/* 912654 80242FA4 8E050000 */ lw $a1, ($s0) +/* 912658 80242FA8 0C0B1EAF */ jal get_variable +/* 91265C 80242FAC 0040A02D */ daddu $s4, $v0, $zero +/* 912660 80242FB0 AE420094 */ sw $v0, 0x94($s2) +/* 912664 80242FB4 AFA00010 */ sw $zero, 0x10($sp) +/* 912668 80242FB8 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91266C 80242FBC 8C420030 */ lw $v0, 0x30($v0) +/* 912670 80242FC0 AFA20014 */ sw $v0, 0x14($sp) +/* 912674 80242FC4 8E4200D0 */ lw $v0, 0xd0($s2) +/* 912678 80242FC8 8C42001C */ lw $v0, 0x1c($v0) +/* 91267C 80242FCC AFA20018 */ sw $v0, 0x18($sp) +/* 912680 80242FD0 8E4200D0 */ lw $v0, 0xd0($s2) +/* 912684 80242FD4 8C420024 */ lw $v0, 0x24($v0) +/* 912688 80242FD8 AFA2001C */ sw $v0, 0x1c($sp) +/* 91268C 80242FDC 8E4200D0 */ lw $v0, 0xd0($s2) +/* 912690 80242FE0 8C420028 */ lw $v0, 0x28($v0) +/* 912694 80242FE4 AFA20020 */ sw $v0, 0x20($sp) +/* 912698 80242FE8 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91269C 80242FEC 3C014220 */ lui $at, 0x4220 +/* 9126A0 80242FF0 44810000 */ mtc1 $at, $f0 +/* 9126A4 80242FF4 8C42002C */ lw $v0, 0x2c($v0) +/* 9126A8 80242FF8 27B00010 */ addiu $s0, $sp, 0x10 +/* 9126AC 80242FFC E7A00028 */ swc1 $f0, 0x28($sp) +/* 9126B0 80243000 A7A0002C */ sh $zero, 0x2c($sp) +/* 9126B4 80243004 12200012 */ beqz $s1, .L80243050 +/* 9126B8 80243008 AFA20024 */ sw $v0, 0x24($sp) +/* 9126BC 8024300C AE600070 */ sw $zero, 0x70($s3) +/* 9126C0 80243010 8EA30000 */ lw $v1, ($s5) +/* 9126C4 80243014 2402F7FF */ addiu $v0, $zero, -0x801 +/* 9126C8 80243018 A6A0008E */ sh $zero, 0x8e($s5) +/* 9126CC 8024301C 00621824 */ and $v1, $v1, $v0 +/* 9126D0 80243020 AEA30000 */ sw $v1, ($s5) +/* 9126D4 80243024 8E4200D0 */ lw $v0, 0xd0($s2) +/* 9126D8 80243028 8C420034 */ lw $v0, 0x34($v0) +/* 9126DC 8024302C 54400005 */ bnel $v0, $zero, .L80243044 +/* 9126E0 80243030 2402FDFF */ addiu $v0, $zero, -0x201 +/* 9126E4 80243034 34620200 */ ori $v0, $v1, 0x200 +/* 9126E8 80243038 2403FFF7 */ addiu $v1, $zero, -9 +/* 9126EC 8024303C 08090C13 */ j .L8024304C +/* 9126F0 80243040 00431024 */ and $v0, $v0, $v1 +.L80243044: +/* 9126F4 80243044 00621024 */ and $v0, $v1, $v0 +/* 9126F8 80243048 34420008 */ ori $v0, $v0, 8 +.L8024304C: +/* 9126FC 8024304C AEA20000 */ sw $v0, ($s5) +.L80243050: +/* 912700 80243050 8E4300B0 */ lw $v1, 0xb0($s2) +/* 912704 80243054 30620004 */ andi $v0, $v1, 4 +/* 912708 80243058 10400007 */ beqz $v0, .L80243078 +/* 91270C 8024305C 00000000 */ nop +/* 912710 80243060 824200B4 */ lb $v0, 0xb4($s2) +/* 912714 80243064 14400086 */ bnez $v0, .L80243280 +/* 912718 80243068 0000102D */ daddu $v0, $zero, $zero +/* 91271C 8024306C 2402FFFB */ addiu $v0, $zero, -5 +/* 912720 80243070 00621024 */ and $v0, $v1, $v0 +/* 912724 80243074 AE4200B0 */ sw $v0, 0xb0($s2) +.L80243078: +/* 912728 80243078 8E620070 */ lw $v0, 0x70($s3) +/* 91272C 8024307C 2442FFF4 */ addiu $v0, $v0, -0xc +/* 912730 80243080 2C420003 */ sltiu $v0, $v0, 3 +/* 912734 80243084 10400007 */ beqz $v0, .L802430A4 +/* 912738 80243088 0260202D */ daddu $a0, $s3, $zero +/* 91273C 8024308C 0280282D */ daddu $a1, $s4, $zero +/* 912740 80243090 0C0908B1 */ jal func_802422C4_911974 +/* 912744 80243094 0200302D */ daddu $a2, $s0, $zero +/* 912748 80243098 10400002 */ beqz $v0, .L802430A4 +/* 91274C 8024309C 24020014 */ addiu $v0, $zero, 0x14 +/* 912750 802430A0 AE620070 */ sw $v0, 0x70($s3) +.L802430A4: +/* 912754 802430A4 8E630070 */ lw $v1, 0x70($s3) +/* 912758 802430A8 2C620035 */ sltiu $v0, $v1, 0x35 +/* 91275C 802430AC 10400073 */ beqz $v0, .L8024327C +/* 912760 802430B0 00031080 */ sll $v0, $v1, 2 +/* 912764 802430B4 3C018024 */ lui $at, 0x8024 +/* 912768 802430B8 00220821 */ addu $at, $at, $v0 +/* 91276C 802430BC 8C2265E8 */ lw $v0, 0x65e8($at) +/* 912770 802430C0 00400008 */ jr $v0 +/* 912774 802430C4 00000000 */ nop +/* 912778 802430C8 0260202D */ daddu $a0, $s3, $zero +/* 91277C 802430CC 0280282D */ daddu $a1, $s4, $zero +/* 912780 802430D0 0C090909 */ jal func_80242424_911AD4 +/* 912784 802430D4 0200302D */ daddu $a2, $s0, $zero +/* 912788 802430D8 0260202D */ daddu $a0, $s3, $zero +/* 91278C 802430DC 0280282D */ daddu $a1, $s4, $zero +/* 912790 802430E0 0C090926 */ jal func_80242498_911B48 +/* 912794 802430E4 0200302D */ daddu $a2, $s0, $zero +/* 912798 802430E8 8E630070 */ lw $v1, 0x70($s3) +/* 91279C 802430EC 24020002 */ addiu $v0, $zero, 2 +/* 9127A0 802430F0 14620063 */ bne $v1, $v0, .L80243280 +/* 9127A4 802430F4 0000102D */ daddu $v0, $zero, $zero +/* 9127A8 802430F8 0260202D */ daddu $a0, $s3, $zero +/* 9127AC 802430FC 0280282D */ daddu $a1, $s4, $zero +/* 9127B0 80243100 0C090972 */ jal func_802425C8_911C78 +/* 9127B4 80243104 0200302D */ daddu $a2, $s0, $zero +/* 9127B8 80243108 8E630070 */ lw $v1, 0x70($s3) +/* 9127BC 8024310C 24020003 */ addiu $v0, $zero, 3 +/* 9127C0 80243110 1462005B */ bne $v1, $v0, .L80243280 +/* 9127C4 80243114 0000102D */ daddu $v0, $zero, $zero +/* 9127C8 80243118 0260202D */ daddu $a0, $s3, $zero +/* 9127CC 8024311C 0280282D */ daddu $a1, $s4, $zero +/* 9127D0 80243120 0C090999 */ jal func_80242664_911D14 +/* 9127D4 80243124 0200302D */ daddu $a2, $s0, $zero +/* 9127D8 80243128 8E630070 */ lw $v1, 0x70($s3) +/* 9127DC 8024312C 24020004 */ addiu $v0, $zero, 4 +/* 9127E0 80243130 14620053 */ bne $v1, $v0, .L80243280 +/* 9127E4 80243134 0000102D */ daddu $v0, $zero, $zero +/* 9127E8 80243138 0260202D */ daddu $a0, $s3, $zero +/* 9127EC 8024313C 0280282D */ daddu $a1, $s4, $zero +/* 9127F0 80243140 0C0909BB */ jal func_802426EC_911D9C +/* 9127F4 80243144 0200302D */ daddu $a2, $s0, $zero +/* 9127F8 80243148 0260202D */ daddu $a0, $s3, $zero +/* 9127FC 8024314C 0280282D */ daddu $a1, $s4, $zero +/* 912800 80243150 0C0909E5 */ jal func_80242794_911E44 +/* 912804 80243154 0200302D */ daddu $a2, $s0, $zero +/* 912808 80243158 08090CA0 */ j .L80243280 +/* 91280C 8024315C 0000102D */ daddu $v0, $zero, $zero +/* 912810 80243160 0260202D */ daddu $a0, $s3, $zero +/* 912814 80243164 0280282D */ daddu $a1, $s4, $zero +/* 912818 80243168 0C0127DF */ jal func_80049F7C +/* 91281C 8024316C 0200302D */ daddu $a2, $s0, $zero +/* 912820 80243170 8E630070 */ lw $v1, 0x70($s3) +/* 912824 80243174 2402000D */ addiu $v0, $zero, 0xd +/* 912828 80243178 14620041 */ bne $v1, $v0, .L80243280 +/* 91282C 8024317C 0000102D */ daddu $v0, $zero, $zero +/* 912830 80243180 0260202D */ daddu $a0, $s3, $zero +/* 912834 80243184 0280282D */ daddu $a1, $s4, $zero +/* 912838 80243188 0C012849 */ jal func_8004A124 +/* 91283C 8024318C 0200302D */ daddu $a2, $s0, $zero +/* 912840 80243190 8E630070 */ lw $v1, 0x70($s3) +/* 912844 80243194 2402000E */ addiu $v0, $zero, 0xe +/* 912848 80243198 14620039 */ bne $v1, $v0, .L80243280 +/* 91284C 8024319C 0000102D */ daddu $v0, $zero, $zero +/* 912850 802431A0 96A2008E */ lhu $v0, 0x8e($s5) +/* 912854 802431A4 2442FFFF */ addiu $v0, $v0, -1 +/* 912858 802431A8 A6A2008E */ sh $v0, 0x8e($s5) +/* 91285C 802431AC 00021400 */ sll $v0, $v0, 0x10 +/* 912860 802431B0 14400033 */ bnez $v0, .L80243280 +/* 912864 802431B4 0000102D */ daddu $v0, $zero, $zero +/* 912868 802431B8 24020028 */ addiu $v0, $zero, 0x28 +/* 91286C 802431BC 08090C9F */ j .L8024327C +/* 912870 802431C0 AE620070 */ sw $v0, 0x70($s3) +/* 912874 802431C4 0260202D */ daddu $a0, $s3, $zero +/* 912878 802431C8 0280282D */ daddu $a1, $s4, $zero +/* 91287C 802431CC 0C090A42 */ jal func_80242908_911FB8 +/* 912880 802431D0 0200302D */ daddu $a2, $s0, $zero +/* 912884 802431D4 0260202D */ daddu $a0, $s3, $zero +/* 912888 802431D8 0280282D */ daddu $a1, $s4, $zero +/* 91288C 802431DC 0C090A56 */ jal func_80242958_912008 +/* 912890 802431E0 0200302D */ daddu $a2, $s0, $zero +/* 912894 802431E4 08090CA0 */ j .L80243280 +/* 912898 802431E8 0000102D */ daddu $v0, $zero, $zero +/* 91289C 802431EC 0260202D */ daddu $a0, $s3, $zero +/* 9128A0 802431F0 0280282D */ daddu $a1, $s4, $zero +/* 9128A4 802431F4 0C090ABE */ jal func_80242AF8_9121A8 +/* 9128A8 802431F8 0200302D */ daddu $a2, $s0, $zero +/* 9128AC 802431FC 08090CA0 */ j .L80243280 +/* 9128B0 80243200 0000102D */ daddu $v0, $zero, $zero +/* 9128B4 80243204 0260202D */ daddu $a0, $s3, $zero +/* 9128B8 80243208 0280282D */ daddu $a1, $s4, $zero +/* 9128BC 8024320C 0C090B12 */ jal func_80242C48_9122F8 +/* 9128C0 80243210 0200302D */ daddu $a2, $s0, $zero +/* 9128C4 80243214 8E630070 */ lw $v1, 0x70($s3) +/* 9128C8 80243218 24020029 */ addiu $v0, $zero, 0x29 +/* 9128CC 8024321C 14620018 */ bne $v1, $v0, .L80243280 +/* 9128D0 80243220 0000102D */ daddu $v0, $zero, $zero +/* 9128D4 80243224 0260202D */ daddu $a0, $s3, $zero +/* 9128D8 80243228 0280282D */ daddu $a1, $s4, $zero +/* 9128DC 8024322C 0C090B3D */ jal func_80242CF4_9123A4 +/* 9128E0 80243230 0200302D */ daddu $a2, $s0, $zero +/* 9128E4 80243234 08090CA0 */ j .L80243280 +/* 9128E8 80243238 0000102D */ daddu $v0, $zero, $zero +/* 9128EC 8024323C 0260202D */ daddu $a0, $s3, $zero +/* 9128F0 80243240 0280282D */ daddu $a1, $s4, $zero +/* 9128F4 80243244 0C090B8B */ jal func_80242E2C_9124DC +/* 9128F8 80243248 0200302D */ daddu $a2, $s0, $zero +/* 9128FC 8024324C 0260202D */ daddu $a0, $s3, $zero +/* 912900 80243250 0280282D */ daddu $a1, $s4, $zero +/* 912904 80243254 0C090BAA */ jal func_80242EA8_912558 +/* 912908 80243258 0200302D */ daddu $a2, $s0, $zero +/* 91290C 8024325C 8E630070 */ lw $v1, 0x70($s3) +/* 912910 80243260 24020034 */ addiu $v0, $zero, 0x34 +/* 912914 80243264 14620006 */ bne $v1, $v0, .L80243280 +/* 912918 80243268 0000102D */ daddu $v0, $zero, $zero +/* 91291C 8024326C 0260202D */ daddu $a0, $s3, $zero +/* 912920 80243270 0280282D */ daddu $a1, $s4, $zero +/* 912924 80243274 0C090BC4 */ jal func_80242F10_9125C0 +/* 912928 80243278 0200302D */ daddu $a2, $s0, $zero +.L8024327C: +/* 91292C 8024327C 0000102D */ daddu $v0, $zero, $zero +.L80243280: +/* 912930 80243280 8FBF0048 */ lw $ra, 0x48($sp) +/* 912934 80243284 8FB50044 */ lw $s5, 0x44($sp) +/* 912938 80243288 8FB40040 */ lw $s4, 0x40($sp) +/* 91293C 8024328C 8FB3003C */ lw $s3, 0x3c($sp) +/* 912940 80243290 8FB20038 */ lw $s2, 0x38($sp) +/* 912944 80243294 8FB10034 */ lw $s1, 0x34($sp) +/* 912948 80243298 8FB00030 */ lw $s0, 0x30($sp) +/* 91294C 8024329C 03E00008 */ jr $ra +/* 912950 802432A0 27BD0050 */ addiu $sp, $sp, 0x50 +/* 912954 802432A4 00000000 */ nop +/* 912958 802432A8 00000000 */ nop +/* 91295C 802432AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0.s b/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0.s deleted file mode 100644 index a419772e2d..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802432B0 -/* 912960 802432B0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 912964 802432B4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 912968 802432B8 8C430000 */ lw $v1, ($v0) -/* 91296C 802432BC 8C840084 */ lw $a0, 0x84($a0) -/* 912970 802432C0 34630010 */ ori $v1, $v1, 0x10 -/* 912974 802432C4 AC4400D0 */ sw $a0, 0xd0($v0) -/* 912978 802432C8 AC430000 */ sw $v1, ($v0) -/* 91297C 802432CC 03E00008 */ jr $ra -/* 912980 802432D0 24020002 */ addiu $v0, $zero, 2 -/* 912984 802432D4 00000000 */ nop -/* 912988 802432D8 00000000 */ nop -/* 91298C 802432DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s b/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s new file mode 100644 index 0000000000..a794c4c105 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_01/912960/func_802432B0_912960.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802432B0_912960 +/* 912960 802432B0 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 912964 802432B4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 912968 802432B8 8C430000 */ lw $v1, ($v0) +/* 91296C 802432BC 8C840084 */ lw $a0, 0x84($a0) +/* 912970 802432C0 34630010 */ ori $v1, $v1, 0x10 +/* 912974 802432C4 AC4400D0 */ sw $a0, 0xd0($v0) +/* 912978 802432C8 AC430000 */ sw $v1, ($v0) +/* 91297C 802432CC 03E00008 */ jr $ra +/* 912980 802432D0 24020002 */ addiu $v0, $zero, 2 +/* 912984 802432D4 00000000 */ nop +/* 912988 802432D8 00000000 */ nop +/* 91298C 802432DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0.s deleted file mode 100644 index 70cde67ca6..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D0 -/* 916240 802404D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 916244 802404D4 AFB3003C */ sw $s3, 0x3c($sp) -/* 916248 802404D8 0080982D */ daddu $s3, $a0, $zero -/* 91624C 802404DC AFBF0040 */ sw $ra, 0x40($sp) -/* 916250 802404E0 AFB20038 */ sw $s2, 0x38($sp) -/* 916254 802404E4 AFB10034 */ sw $s1, 0x34($sp) -/* 916258 802404E8 AFB00030 */ sw $s0, 0x30($sp) -/* 91625C 802404EC 8E700148 */ lw $s0, 0x148($s3) -/* 916260 802404F0 00A0902D */ daddu $s2, $a1, $zero -/* 916264 802404F4 86040008 */ lh $a0, 8($s0) -/* 916268 802404F8 0C00EABB */ jal get_npc_unsafe -/* 91626C 802404FC 00C0882D */ daddu $s1, $a2, $zero -/* 916270 80240500 0220202D */ daddu $a0, $s1, $zero -/* 916274 80240504 0200282D */ daddu $a1, $s0, $zero -/* 916278 80240508 AFA00010 */ sw $zero, 0x10($sp) -/* 91627C 8024050C 8E460024 */ lw $a2, 0x24($s2) -/* 916280 80240510 8E470028 */ lw $a3, 0x28($s2) -/* 916284 80240514 0C01242D */ jal func_800490B4 -/* 916288 80240518 0040802D */ daddu $s0, $v0, $zero -/* 91628C 8024051C 1040000B */ beqz $v0, .L8024054C -/* 916290 80240520 00000000 */ nop -/* 916294 80240524 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 916298 80240528 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91629C 8024052C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9162A0 80240530 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9162A4 80240534 8C460028 */ lw $a2, 0x28($v0) -/* 9162A8 80240538 0C00A720 */ jal atan2 -/* 9162AC 8024053C 8C470030 */ lw $a3, 0x30($v0) -/* 9162B0 80240540 2402000C */ addiu $v0, $zero, 0xc -/* 9162B4 80240544 08090189 */ j .L80240624 -/* 9162B8 80240548 E600000C */ swc1 $f0, 0xc($s0) -.L8024054C: -/* 9162BC 8024054C 9602008E */ lhu $v0, 0x8e($s0) -/* 9162C0 80240550 2442FFFF */ addiu $v0, $v0, -1 -/* 9162C4 80240554 A602008E */ sh $v0, 0x8e($s0) -/* 9162C8 80240558 00021400 */ sll $v0, $v0, 0x10 -/* 9162CC 8024055C 1C400032 */ bgtz $v0, .L80240628 -/* 9162D0 80240560 00000000 */ nop -/* 9162D4 80240564 8E620074 */ lw $v0, 0x74($s3) -/* 9162D8 80240568 2442FFFF */ addiu $v0, $v0, -1 -/* 9162DC 8024056C 18400014 */ blez $v0, .L802405C0 -/* 9162E0 80240570 AE620074 */ sw $v0, 0x74($s3) -/* 9162E4 80240574 C600000C */ lwc1 $f0, 0xc($s0) -/* 9162E8 80240578 3C014334 */ lui $at, 0x4334 -/* 9162EC 8024057C 44816000 */ mtc1 $at, $f12 -/* 9162F0 80240580 0C00A6C9 */ jal clamp_angle -/* 9162F4 80240584 460C0300 */ add.s $f12, $f0, $f12 -/* 9162F8 80240588 E600000C */ swc1 $f0, 0xc($s0) -/* 9162FC 8024058C 8E440008 */ lw $a0, 8($s2) -/* 916300 80240590 000417C2 */ srl $v0, $a0, 0x1f -/* 916304 80240594 00822021 */ addu $a0, $a0, $v0 -/* 916308 80240598 00042043 */ sra $a0, $a0, 1 -/* 91630C 8024059C 0C00A67F */ jal rand_int -/* 916310 802405A0 24840001 */ addiu $a0, $a0, 1 -/* 916314 802405A4 8E430008 */ lw $v1, 8($s2) -/* 916318 802405A8 000327C2 */ srl $a0, $v1, 0x1f -/* 91631C 802405AC 00641821 */ addu $v1, $v1, $a0 -/* 916320 802405B0 00031843 */ sra $v1, $v1, 1 -/* 916324 802405B4 00621821 */ addu $v1, $v1, $v0 -/* 916328 802405B8 0809018A */ j .L80240628 -/* 91632C 802405BC A603008E */ sh $v1, 0x8e($s0) -.L802405C0: -/* 916330 802405C0 24040002 */ addiu $a0, $zero, 2 -/* 916334 802405C4 0200282D */ daddu $a1, $s0, $zero -/* 916338 802405C8 0000302D */ daddu $a2, $zero, $zero -/* 91633C 802405CC 860300A8 */ lh $v1, 0xa8($s0) -/* 916340 802405D0 3C013F80 */ lui $at, 0x3f80 -/* 916344 802405D4 44810000 */ mtc1 $at, $f0 -/* 916348 802405D8 3C014000 */ lui $at, 0x4000 -/* 91634C 802405DC 44811000 */ mtc1 $at, $f2 -/* 916350 802405E0 3C01C1A0 */ lui $at, 0xc1a0 -/* 916354 802405E4 44812000 */ mtc1 $at, $f4 -/* 916358 802405E8 2402000C */ addiu $v0, $zero, 0xc -/* 91635C 802405EC AFA2001C */ sw $v0, 0x1c($sp) -/* 916360 802405F0 44833000 */ mtc1 $v1, $f6 -/* 916364 802405F4 00000000 */ nop -/* 916368 802405F8 468031A0 */ cvt.s.w $f6, $f6 -/* 91636C 802405FC 44073000 */ mfc1 $a3, $f6 -/* 916370 80240600 27A20028 */ addiu $v0, $sp, 0x28 -/* 916374 80240604 AFA20020 */ sw $v0, 0x20($sp) -/* 916378 80240608 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91637C 8024060C E7A20014 */ swc1 $f2, 0x14($sp) -/* 916380 80240610 0C01BFA4 */ jal fx_emote -/* 916384 80240614 E7A40018 */ swc1 $f4, 0x18($sp) -/* 916388 80240618 2402000F */ addiu $v0, $zero, 0xf -/* 91638C 8024061C A602008E */ sh $v0, 0x8e($s0) -/* 916390 80240620 24020028 */ addiu $v0, $zero, 0x28 -.L80240624: -/* 916394 80240624 AE620070 */ sw $v0, 0x70($s3) -.L80240628: -/* 916398 80240628 8FBF0040 */ lw $ra, 0x40($sp) -/* 91639C 8024062C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9163A0 80240630 8FB20038 */ lw $s2, 0x38($sp) -/* 9163A4 80240634 8FB10034 */ lw $s1, 0x34($sp) -/* 9163A8 80240638 8FB00030 */ lw $s0, 0x30($sp) -/* 9163AC 8024063C 03E00008 */ jr $ra -/* 9163B0 80240640 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s new file mode 100644 index 0000000000..ebc098402a --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_802404D0_916240.s @@ -0,0 +1,101 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404D0_916240 +/* 916240 802404D0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 916244 802404D4 AFB3003C */ sw $s3, 0x3c($sp) +/* 916248 802404D8 0080982D */ daddu $s3, $a0, $zero +/* 91624C 802404DC AFBF0040 */ sw $ra, 0x40($sp) +/* 916250 802404E0 AFB20038 */ sw $s2, 0x38($sp) +/* 916254 802404E4 AFB10034 */ sw $s1, 0x34($sp) +/* 916258 802404E8 AFB00030 */ sw $s0, 0x30($sp) +/* 91625C 802404EC 8E700148 */ lw $s0, 0x148($s3) +/* 916260 802404F0 00A0902D */ daddu $s2, $a1, $zero +/* 916264 802404F4 86040008 */ lh $a0, 8($s0) +/* 916268 802404F8 0C00EABB */ jal get_npc_unsafe +/* 91626C 802404FC 00C0882D */ daddu $s1, $a2, $zero +/* 916270 80240500 0220202D */ daddu $a0, $s1, $zero +/* 916274 80240504 0200282D */ daddu $a1, $s0, $zero +/* 916278 80240508 AFA00010 */ sw $zero, 0x10($sp) +/* 91627C 8024050C 8E460024 */ lw $a2, 0x24($s2) +/* 916280 80240510 8E470028 */ lw $a3, 0x28($s2) +/* 916284 80240514 0C01242D */ jal func_800490B4 +/* 916288 80240518 0040802D */ daddu $s0, $v0, $zero +/* 91628C 8024051C 1040000B */ beqz $v0, .L8024054C +/* 916290 80240520 00000000 */ nop +/* 916294 80240524 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 916298 80240528 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 91629C 8024052C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9162A0 80240530 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9162A4 80240534 8C460028 */ lw $a2, 0x28($v0) +/* 9162A8 80240538 0C00A720 */ jal atan2 +/* 9162AC 8024053C 8C470030 */ lw $a3, 0x30($v0) +/* 9162B0 80240540 2402000C */ addiu $v0, $zero, 0xc +/* 9162B4 80240544 08090189 */ j .L80240624 +/* 9162B8 80240548 E600000C */ swc1 $f0, 0xc($s0) +.L8024054C: +/* 9162BC 8024054C 9602008E */ lhu $v0, 0x8e($s0) +/* 9162C0 80240550 2442FFFF */ addiu $v0, $v0, -1 +/* 9162C4 80240554 A602008E */ sh $v0, 0x8e($s0) +/* 9162C8 80240558 00021400 */ sll $v0, $v0, 0x10 +/* 9162CC 8024055C 1C400032 */ bgtz $v0, .L80240628 +/* 9162D0 80240560 00000000 */ nop +/* 9162D4 80240564 8E620074 */ lw $v0, 0x74($s3) +/* 9162D8 80240568 2442FFFF */ addiu $v0, $v0, -1 +/* 9162DC 8024056C 18400014 */ blez $v0, .L802405C0 +/* 9162E0 80240570 AE620074 */ sw $v0, 0x74($s3) +/* 9162E4 80240574 C600000C */ lwc1 $f0, 0xc($s0) +/* 9162E8 80240578 3C014334 */ lui $at, 0x4334 +/* 9162EC 8024057C 44816000 */ mtc1 $at, $f12 +/* 9162F0 80240580 0C00A6C9 */ jal clamp_angle +/* 9162F4 80240584 460C0300 */ add.s $f12, $f0, $f12 +/* 9162F8 80240588 E600000C */ swc1 $f0, 0xc($s0) +/* 9162FC 8024058C 8E440008 */ lw $a0, 8($s2) +/* 916300 80240590 000417C2 */ srl $v0, $a0, 0x1f +/* 916304 80240594 00822021 */ addu $a0, $a0, $v0 +/* 916308 80240598 00042043 */ sra $a0, $a0, 1 +/* 91630C 8024059C 0C00A67F */ jal rand_int +/* 916310 802405A0 24840001 */ addiu $a0, $a0, 1 +/* 916314 802405A4 8E430008 */ lw $v1, 8($s2) +/* 916318 802405A8 000327C2 */ srl $a0, $v1, 0x1f +/* 91631C 802405AC 00641821 */ addu $v1, $v1, $a0 +/* 916320 802405B0 00031843 */ sra $v1, $v1, 1 +/* 916324 802405B4 00621821 */ addu $v1, $v1, $v0 +/* 916328 802405B8 0809018A */ j .L80240628 +/* 91632C 802405BC A603008E */ sh $v1, 0x8e($s0) +.L802405C0: +/* 916330 802405C0 24040002 */ addiu $a0, $zero, 2 +/* 916334 802405C4 0200282D */ daddu $a1, $s0, $zero +/* 916338 802405C8 0000302D */ daddu $a2, $zero, $zero +/* 91633C 802405CC 860300A8 */ lh $v1, 0xa8($s0) +/* 916340 802405D0 3C013F80 */ lui $at, 0x3f80 +/* 916344 802405D4 44810000 */ mtc1 $at, $f0 +/* 916348 802405D8 3C014000 */ lui $at, 0x4000 +/* 91634C 802405DC 44811000 */ mtc1 $at, $f2 +/* 916350 802405E0 3C01C1A0 */ lui $at, 0xc1a0 +/* 916354 802405E4 44812000 */ mtc1 $at, $f4 +/* 916358 802405E8 2402000C */ addiu $v0, $zero, 0xc +/* 91635C 802405EC AFA2001C */ sw $v0, 0x1c($sp) +/* 916360 802405F0 44833000 */ mtc1 $v1, $f6 +/* 916364 802405F4 00000000 */ nop +/* 916368 802405F8 468031A0 */ cvt.s.w $f6, $f6 +/* 91636C 802405FC 44073000 */ mfc1 $a3, $f6 +/* 916370 80240600 27A20028 */ addiu $v0, $sp, 0x28 +/* 916374 80240604 AFA20020 */ sw $v0, 0x20($sp) +/* 916378 80240608 E7A00010 */ swc1 $f0, 0x10($sp) +/* 91637C 8024060C E7A20014 */ swc1 $f2, 0x14($sp) +/* 916380 80240610 0C01BFA4 */ jal fx_emote +/* 916384 80240614 E7A40018 */ swc1 $f4, 0x18($sp) +/* 916388 80240618 2402000F */ addiu $v0, $zero, 0xf +/* 91638C 8024061C A602008E */ sh $v0, 0x8e($s0) +/* 916390 80240620 24020028 */ addiu $v0, $zero, 0x28 +.L80240624: +/* 916394 80240624 AE620070 */ sw $v0, 0x70($s3) +.L80240628: +/* 916398 80240628 8FBF0040 */ lw $ra, 0x40($sp) +/* 91639C 8024062C 8FB3003C */ lw $s3, 0x3c($sp) +/* 9163A0 80240630 8FB20038 */ lw $s2, 0x38($sp) +/* 9163A4 80240634 8FB10034 */ lw $s1, 0x34($sp) +/* 9163A8 80240638 8FB00030 */ lw $s0, 0x30($sp) +/* 9163AC 8024063C 03E00008 */ jr $ra +/* 9163B0 80240640 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240644.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240644.s deleted file mode 100644 index 524f6d4bfd..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240644.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240644 -/* 9163B4 80240644 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9163B8 80240648 AFB10014 */ sw $s1, 0x14($sp) -/* 9163BC 8024064C 0080882D */ daddu $s1, $a0, $zero -/* 9163C0 80240650 AFBF0018 */ sw $ra, 0x18($sp) -/* 9163C4 80240654 AFB00010 */ sw $s0, 0x10($sp) -/* 9163C8 80240658 8E300148 */ lw $s0, 0x148($s1) -/* 9163CC 8024065C 0C00EABB */ jal get_npc_unsafe -/* 9163D0 80240660 86040008 */ lh $a0, 8($s0) -/* 9163D4 80240664 96030096 */ lhu $v1, 0x96($s0) -/* 9163D8 80240668 A443008E */ sh $v1, 0x8e($v0) -/* 9163DC 8024066C 8E0300CC */ lw $v1, 0xcc($s0) -/* 9163E0 80240670 8C630034 */ lw $v1, 0x34($v1) -/* 9163E4 80240674 AC430028 */ sw $v1, 0x28($v0) -/* 9163E8 80240678 24020015 */ addiu $v0, $zero, 0x15 -/* 9163EC 8024067C AE220070 */ sw $v0, 0x70($s1) -/* 9163F0 80240680 8FBF0018 */ lw $ra, 0x18($sp) -/* 9163F4 80240684 8FB10014 */ lw $s1, 0x14($sp) -/* 9163F8 80240688 8FB00010 */ lw $s0, 0x10($sp) -/* 9163FC 8024068C 03E00008 */ jr $ra -/* 916400 80240690 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240644_9163B4.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240644_9163B4.s new file mode 100644 index 0000000000..5ea3bfe72b --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240644_9163B4.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240644_9163B4 +/* 9163B4 80240644 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9163B8 80240648 AFB10014 */ sw $s1, 0x14($sp) +/* 9163BC 8024064C 0080882D */ daddu $s1, $a0, $zero +/* 9163C0 80240650 AFBF0018 */ sw $ra, 0x18($sp) +/* 9163C4 80240654 AFB00010 */ sw $s0, 0x10($sp) +/* 9163C8 80240658 8E300148 */ lw $s0, 0x148($s1) +/* 9163CC 8024065C 0C00EABB */ jal get_npc_unsafe +/* 9163D0 80240660 86040008 */ lh $a0, 8($s0) +/* 9163D4 80240664 96030096 */ lhu $v1, 0x96($s0) +/* 9163D8 80240668 A443008E */ sh $v1, 0x8e($v0) +/* 9163DC 8024066C 8E0300CC */ lw $v1, 0xcc($s0) +/* 9163E0 80240670 8C630034 */ lw $v1, 0x34($v1) +/* 9163E4 80240674 AC430028 */ sw $v1, 0x28($v0) +/* 9163E8 80240678 24020015 */ addiu $v0, $zero, 0x15 +/* 9163EC 8024067C AE220070 */ sw $v0, 0x70($s1) +/* 9163F0 80240680 8FBF0018 */ lw $ra, 0x18($sp) +/* 9163F4 80240684 8FB10014 */ lw $s1, 0x14($sp) +/* 9163F8 80240688 8FB00010 */ lw $s0, 0x10($sp) +/* 9163FC 8024068C 03E00008 */ jr $ra +/* 916400 80240690 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694.s deleted file mode 100644 index 87a9c9bff4..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240694 -/* 916404 80240694 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 916408 80240698 AFB30024 */ sw $s3, 0x24($sp) -/* 91640C 8024069C 0080982D */ daddu $s3, $a0, $zero -/* 916410 802406A0 AFBF002C */ sw $ra, 0x2c($sp) -/* 916414 802406A4 AFB40028 */ sw $s4, 0x28($sp) -/* 916418 802406A8 AFB20020 */ sw $s2, 0x20($sp) -/* 91641C 802406AC AFB1001C */ sw $s1, 0x1c($sp) -/* 916420 802406B0 AFB00018 */ sw $s0, 0x18($sp) -/* 916424 802406B4 8E710148 */ lw $s1, 0x148($s3) -/* 916428 802406B8 86240008 */ lh $a0, 8($s1) -/* 91642C 802406BC 0C00EABB */ jal get_npc_unsafe -/* 916430 802406C0 00A0A02D */ daddu $s4, $a1, $zero -/* 916434 802406C4 0040802D */ daddu $s0, $v0, $zero -/* 916438 802406C8 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 91643C 802406CC 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 916440 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 916444 802406D4 8E420000 */ lw $v0, ($s2) -/* 916448 802406D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91644C 802406DC 8C460028 */ lw $a2, 0x28($v0) -/* 916450 802406E0 0C00A720 */ jal atan2 -/* 916454 802406E4 8C470030 */ lw $a3, 0x30($v0) -/* 916458 802406E8 3C025555 */ lui $v0, 0x5555 -/* 91645C 802406EC 9603008E */ lhu $v1, 0x8e($s0) -/* 916460 802406F0 34425556 */ ori $v0, $v0, 0x5556 -/* 916464 802406F4 00031C00 */ sll $v1, $v1, 0x10 -/* 916468 802406F8 00032403 */ sra $a0, $v1, 0x10 -/* 91646C 802406FC 00820018 */ mult $a0, $v0 -/* 916470 80240700 00031FC3 */ sra $v1, $v1, 0x1f -/* 916474 80240704 00004010 */ mfhi $t0 -/* 916478 80240708 01031823 */ subu $v1, $t0, $v1 -/* 91647C 8024070C 00031040 */ sll $v0, $v1, 1 -/* 916480 80240710 00431021 */ addu $v0, $v0, $v1 -/* 916484 80240714 00822023 */ subu $a0, $a0, $v0 -/* 916488 80240718 00042400 */ sll $a0, $a0, 0x10 -/* 91648C 8024071C 1480000C */ bnez $a0, .L80240750 -/* 916490 80240720 E600000C */ swc1 $f0, 0xc($s0) -/* 916494 80240724 C6020040 */ lwc1 $f2, 0x40($s0) -/* 916498 80240728 3C014000 */ lui $at, 0x4000 -/* 91649C 8024072C 44810000 */ mtc1 $at, $f0 -/* 9164A0 80240730 AFA00010 */ sw $zero, 0x10($sp) -/* 9164A4 80240734 AFA00014 */ sw $zero, 0x14($sp) -/* 9164A8 80240738 46001080 */ add.s $f2, $f2, $f0 -/* 9164AC 8024073C 8E06003C */ lw $a2, 0x3c($s0) -/* 9164B0 80240740 8E050038 */ lw $a1, 0x38($s0) -/* 9164B4 80240744 44071000 */ mfc1 $a3, $f2 -/* 9164B8 80240748 0C01BECC */ jal fx_walk_normal -/* 9164BC 8024074C 24040002 */ addiu $a0, $zero, 2 -.L80240750: -/* 9164C0 80240750 9602008E */ lhu $v0, 0x8e($s0) -/* 9164C4 80240754 2442FFFF */ addiu $v0, $v0, -1 -/* 9164C8 80240758 A602008E */ sh $v0, 0x8e($s0) -/* 9164CC 8024075C 00021400 */ sll $v0, $v0, 0x10 -/* 9164D0 80240760 1C40002C */ bgtz $v0, .L80240814 -/* 9164D4 80240764 00000000 */ nop -/* 9164D8 80240768 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9164DC 8024076C 4600010D */ trunc.w.s $f4, $f0 -/* 9164E0 80240770 44022000 */ mfc1 $v0, $f4 -/* 9164E4 80240774 00000000 */ nop -/* 9164E8 80240778 A6220010 */ sh $v0, 0x10($s1) -/* 9164EC 8024077C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9164F0 80240780 4600010D */ trunc.w.s $f4, $f0 -/* 9164F4 80240784 44022000 */ mfc1 $v0, $f4 -/* 9164F8 80240788 00000000 */ nop -/* 9164FC 8024078C A6220012 */ sh $v0, 0x12($s1) -/* 916500 80240790 C6000040 */ lwc1 $f0, 0x40($s0) -/* 916504 80240794 24020001 */ addiu $v0, $zero, 1 -/* 916508 80240798 A2220007 */ sb $v0, 7($s1) -/* 91650C 8024079C 4600010D */ trunc.w.s $f4, $f0 -/* 916510 802407A0 44022000 */ mfc1 $v0, $f4 -/* 916514 802407A4 00000000 */ nop -/* 916518 802407A8 A6220014 */ sh $v0, 0x14($s1) -/* 91651C 802407AC C6800018 */ lwc1 $f0, 0x18($s4) -/* 916520 802407B0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 916524 802407B4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 916528 802407B8 8E420000 */ lw $v0, ($s2) -/* 91652C 802407BC E6000018 */ swc1 $f0, 0x18($s0) -/* 916530 802407C0 8C460028 */ lw $a2, 0x28($v0) -/* 916534 802407C4 0C00A7B5 */ jal dist2D -/* 916538 802407C8 8C470030 */ lw $a3, 0x30($v0) -/* 91653C 802407CC C6020018 */ lwc1 $f2, 0x18($s0) -/* 916540 802407D0 46020003 */ div.s $f0, $f0, $f2 -/* 916544 802407D4 3C018024 */ lui $at, 0x8024 -/* 916548 802407D8 D4222D58 */ ldc1 $f2, 0x2d58($at) -/* 91654C 802407DC 46000021 */ cvt.d.s $f0, $f0 -/* 916550 802407E0 46220000 */ add.d $f0, $f0, $f2 -/* 916554 802407E4 4620010D */ trunc.w.d $f4, $f0 -/* 916558 802407E8 44022000 */ mfc1 $v0, $f4 -/* 91655C 802407EC 00000000 */ nop -/* 916560 802407F0 A602008E */ sh $v0, 0x8e($s0) -/* 916564 802407F4 00021400 */ sll $v0, $v0, 0x10 -/* 916568 802407F8 00021403 */ sra $v0, $v0, 0x10 -/* 91656C 802407FC 2842000F */ slti $v0, $v0, 0xf -/* 916570 80240800 10400002 */ beqz $v0, .L8024080C -/* 916574 80240804 2402000F */ addiu $v0, $zero, 0xf -/* 916578 80240808 A602008E */ sh $v0, 0x8e($s0) -.L8024080C: -/* 91657C 8024080C 24020016 */ addiu $v0, $zero, 0x16 -/* 916580 80240810 AE620070 */ sw $v0, 0x70($s3) -.L80240814: -/* 916584 80240814 8FBF002C */ lw $ra, 0x2c($sp) -/* 916588 80240818 8FB40028 */ lw $s4, 0x28($sp) -/* 91658C 8024081C 8FB30024 */ lw $s3, 0x24($sp) -/* 916590 80240820 8FB20020 */ lw $s2, 0x20($sp) -/* 916594 80240824 8FB1001C */ lw $s1, 0x1c($sp) -/* 916598 80240828 8FB00018 */ lw $s0, 0x18($sp) -/* 91659C 8024082C 03E00008 */ jr $ra -/* 9165A0 80240830 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s new file mode 100644 index 0000000000..91f8051d7c --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240694_916404.s @@ -0,0 +1,111 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240694_916404 +/* 916404 80240694 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 916408 80240698 AFB30024 */ sw $s3, 0x24($sp) +/* 91640C 8024069C 0080982D */ daddu $s3, $a0, $zero +/* 916410 802406A0 AFBF002C */ sw $ra, 0x2c($sp) +/* 916414 802406A4 AFB40028 */ sw $s4, 0x28($sp) +/* 916418 802406A8 AFB20020 */ sw $s2, 0x20($sp) +/* 91641C 802406AC AFB1001C */ sw $s1, 0x1c($sp) +/* 916420 802406B0 AFB00018 */ sw $s0, 0x18($sp) +/* 916424 802406B4 8E710148 */ lw $s1, 0x148($s3) +/* 916428 802406B8 86240008 */ lh $a0, 8($s1) +/* 91642C 802406BC 0C00EABB */ jal get_npc_unsafe +/* 916430 802406C0 00A0A02D */ daddu $s4, $a1, $zero +/* 916434 802406C4 0040802D */ daddu $s0, $v0, $zero +/* 916438 802406C8 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) +/* 91643C 802406CC 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) +/* 916440 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 916444 802406D4 8E420000 */ lw $v0, ($s2) +/* 916448 802406D8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91644C 802406DC 8C460028 */ lw $a2, 0x28($v0) +/* 916450 802406E0 0C00A720 */ jal atan2 +/* 916454 802406E4 8C470030 */ lw $a3, 0x30($v0) +/* 916458 802406E8 3C025555 */ lui $v0, 0x5555 +/* 91645C 802406EC 9603008E */ lhu $v1, 0x8e($s0) +/* 916460 802406F0 34425556 */ ori $v0, $v0, 0x5556 +/* 916464 802406F4 00031C00 */ sll $v1, $v1, 0x10 +/* 916468 802406F8 00032403 */ sra $a0, $v1, 0x10 +/* 91646C 802406FC 00820018 */ mult $a0, $v0 +/* 916470 80240700 00031FC3 */ sra $v1, $v1, 0x1f +/* 916474 80240704 00004010 */ mfhi $t0 +/* 916478 80240708 01031823 */ subu $v1, $t0, $v1 +/* 91647C 8024070C 00031040 */ sll $v0, $v1, 1 +/* 916480 80240710 00431021 */ addu $v0, $v0, $v1 +/* 916484 80240714 00822023 */ subu $a0, $a0, $v0 +/* 916488 80240718 00042400 */ sll $a0, $a0, 0x10 +/* 91648C 8024071C 1480000C */ bnez $a0, .L80240750 +/* 916490 80240720 E600000C */ swc1 $f0, 0xc($s0) +/* 916494 80240724 C6020040 */ lwc1 $f2, 0x40($s0) +/* 916498 80240728 3C014000 */ lui $at, 0x4000 +/* 91649C 8024072C 44810000 */ mtc1 $at, $f0 +/* 9164A0 80240730 AFA00010 */ sw $zero, 0x10($sp) +/* 9164A4 80240734 AFA00014 */ sw $zero, 0x14($sp) +/* 9164A8 80240738 46001080 */ add.s $f2, $f2, $f0 +/* 9164AC 8024073C 8E06003C */ lw $a2, 0x3c($s0) +/* 9164B0 80240740 8E050038 */ lw $a1, 0x38($s0) +/* 9164B4 80240744 44071000 */ mfc1 $a3, $f2 +/* 9164B8 80240748 0C01BECC */ jal fx_walk_normal +/* 9164BC 8024074C 24040002 */ addiu $a0, $zero, 2 +.L80240750: +/* 9164C0 80240750 9602008E */ lhu $v0, 0x8e($s0) +/* 9164C4 80240754 2442FFFF */ addiu $v0, $v0, -1 +/* 9164C8 80240758 A602008E */ sh $v0, 0x8e($s0) +/* 9164CC 8024075C 00021400 */ sll $v0, $v0, 0x10 +/* 9164D0 80240760 1C40002C */ bgtz $v0, .L80240814 +/* 9164D4 80240764 00000000 */ nop +/* 9164D8 80240768 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9164DC 8024076C 4600010D */ trunc.w.s $f4, $f0 +/* 9164E0 80240770 44022000 */ mfc1 $v0, $f4 +/* 9164E4 80240774 00000000 */ nop +/* 9164E8 80240778 A6220010 */ sh $v0, 0x10($s1) +/* 9164EC 8024077C C600003C */ lwc1 $f0, 0x3c($s0) +/* 9164F0 80240780 4600010D */ trunc.w.s $f4, $f0 +/* 9164F4 80240784 44022000 */ mfc1 $v0, $f4 +/* 9164F8 80240788 00000000 */ nop +/* 9164FC 8024078C A6220012 */ sh $v0, 0x12($s1) +/* 916500 80240790 C6000040 */ lwc1 $f0, 0x40($s0) +/* 916504 80240794 24020001 */ addiu $v0, $zero, 1 +/* 916508 80240798 A2220007 */ sb $v0, 7($s1) +/* 91650C 8024079C 4600010D */ trunc.w.s $f4, $f0 +/* 916510 802407A0 44022000 */ mfc1 $v0, $f4 +/* 916514 802407A4 00000000 */ nop +/* 916518 802407A8 A6220014 */ sh $v0, 0x14($s1) +/* 91651C 802407AC C6800018 */ lwc1 $f0, 0x18($s4) +/* 916520 802407B0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 916524 802407B4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 916528 802407B8 8E420000 */ lw $v0, ($s2) +/* 91652C 802407BC E6000018 */ swc1 $f0, 0x18($s0) +/* 916530 802407C0 8C460028 */ lw $a2, 0x28($v0) +/* 916534 802407C4 0C00A7B5 */ jal dist2D +/* 916538 802407C8 8C470030 */ lw $a3, 0x30($v0) +/* 91653C 802407CC C6020018 */ lwc1 $f2, 0x18($s0) +/* 916540 802407D0 46020003 */ div.s $f0, $f0, $f2 +/* 916544 802407D4 3C018024 */ lui $at, 0x8024 +/* 916548 802407D8 D4222D58 */ ldc1 $f2, 0x2d58($at) +/* 91654C 802407DC 46000021 */ cvt.d.s $f0, $f0 +/* 916550 802407E0 46220000 */ add.d $f0, $f0, $f2 +/* 916554 802407E4 4620010D */ trunc.w.d $f4, $f0 +/* 916558 802407E8 44022000 */ mfc1 $v0, $f4 +/* 91655C 802407EC 00000000 */ nop +/* 916560 802407F0 A602008E */ sh $v0, 0x8e($s0) +/* 916564 802407F4 00021400 */ sll $v0, $v0, 0x10 +/* 916568 802407F8 00021403 */ sra $v0, $v0, 0x10 +/* 91656C 802407FC 2842000F */ slti $v0, $v0, 0xf +/* 916570 80240800 10400002 */ beqz $v0, .L8024080C +/* 916574 80240804 2402000F */ addiu $v0, $zero, 0xf +/* 916578 80240808 A602008E */ sh $v0, 0x8e($s0) +.L8024080C: +/* 91657C 8024080C 24020016 */ addiu $v0, $zero, 0x16 +/* 916580 80240810 AE620070 */ sw $v0, 0x70($s3) +.L80240814: +/* 916584 80240814 8FBF002C */ lw $ra, 0x2c($sp) +/* 916588 80240818 8FB40028 */ lw $s4, 0x28($sp) +/* 91658C 8024081C 8FB30024 */ lw $s3, 0x24($sp) +/* 916590 80240820 8FB20020 */ lw $s2, 0x20($sp) +/* 916594 80240824 8FB1001C */ lw $s1, 0x1c($sp) +/* 916598 80240828 8FB00018 */ lw $s0, 0x18($sp) +/* 91659C 8024082C 03E00008 */ jr $ra +/* 9165A0 80240830 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834.s deleted file mode 100644 index d1f184c2dd..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240834 -/* 9165A4 80240834 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9165A8 80240838 AFB3003C */ sw $s3, 0x3c($sp) -/* 9165AC 8024083C 0080982D */ daddu $s3, $a0, $zero -/* 9165B0 80240840 AFBF0040 */ sw $ra, 0x40($sp) -/* 9165B4 80240844 AFB20038 */ sw $s2, 0x38($sp) -/* 9165B8 80240848 AFB10034 */ sw $s1, 0x34($sp) -/* 9165BC 8024084C AFB00030 */ sw $s0, 0x30($sp) -/* 9165C0 80240850 8E720148 */ lw $s2, 0x148($s3) -/* 9165C4 80240854 0C00EABB */ jal get_npc_unsafe -/* 9165C8 80240858 86440008 */ lh $a0, 8($s2) -/* 9165CC 8024085C 0040802D */ daddu $s0, $v0, $zero -/* 9165D0 80240860 0200202D */ daddu $a0, $s0, $zero -/* 9165D4 80240864 0C00F598 */ jal func_8003D660 -/* 9165D8 80240868 24050001 */ addiu $a1, $zero, 1 -/* 9165DC 8024086C 8E050018 */ lw $a1, 0x18($s0) -/* 9165E0 80240870 8E06000C */ lw $a2, 0xc($s0) -/* 9165E4 80240874 0C00EA95 */ jal npc_move_heading -/* 9165E8 80240878 0200202D */ daddu $a0, $s0, $zero -/* 9165EC 8024087C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9165F0 80240880 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9165F4 80240884 C462001C */ lwc1 $f2, 0x1c($v1) -/* 9165F8 80240888 468010A0 */ cvt.s.w $f2, $f2 -/* 9165FC 8024088C C4640024 */ lwc1 $f4, 0x24($v1) -/* 916600 80240890 46802120 */ cvt.s.w $f4, $f4 -/* 916604 80240894 E7A00010 */ swc1 $f0, 0x10($sp) -/* 916608 80240898 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91660C 8024089C 44051000 */ mfc1 $a1, $f2 -/* 916610 802408A0 C4400028 */ lwc1 $f0, 0x28($v0) -/* 916614 802408A4 46800020 */ cvt.s.w $f0, $f0 -/* 916618 802408A8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91661C 802408AC 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916620 802408B0 44062000 */ mfc1 $a2, $f4 -/* 916624 802408B4 C440002C */ lwc1 $f0, 0x2c($v0) -/* 916628 802408B8 46800020 */ cvt.s.w $f0, $f0 -/* 91662C 802408BC E7A00018 */ swc1 $f0, 0x18($sp) -/* 916630 802408C0 8C640030 */ lw $a0, 0x30($v1) -/* 916634 802408C4 0C0123F5 */ jal is_point_within_region -/* 916638 802408C8 8E070038 */ lw $a3, 0x38($s0) -/* 91663C 802408CC C6000038 */ lwc1 $f0, 0x38($s0) -/* 916640 802408D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 916644 802408D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* 916648 802408D8 3C013F80 */ lui $at, 0x3f80 -/* 91664C 802408DC 44813000 */ mtc1 $at, $f6 -/* 916650 802408E0 E7A00020 */ swc1 $f0, 0x20($sp) -/* 916654 802408E4 E7A20024 */ swc1 $f2, 0x24($sp) -/* 916658 802408E8 E7A40028 */ swc1 $f4, 0x28($sp) -/* 91665C 802408EC E7A60010 */ swc1 $f6, 0x10($sp) -/* 916660 802408F0 C600000C */ lwc1 $f0, 0xc($s0) -/* 916664 802408F4 0002882B */ sltu $s1, $zero, $v0 -/* 916668 802408F8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91666C 802408FC 860200A8 */ lh $v0, 0xa8($s0) -/* 916670 80240900 27A50020 */ addiu $a1, $sp, 0x20 -/* 916674 80240904 44820000 */ mtc1 $v0, $f0 -/* 916678 80240908 00000000 */ nop -/* 91667C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* 916680 80240910 E7A00018 */ swc1 $f0, 0x18($sp) -/* 916684 80240914 860200A6 */ lh $v0, 0xa6($s0) -/* 916688 80240918 27A60024 */ addiu $a2, $sp, 0x24 -/* 91668C 8024091C 44820000 */ mtc1 $v0, $f0 -/* 916690 80240920 00000000 */ nop -/* 916694 80240924 46800020 */ cvt.s.w $f0, $f0 -/* 916698 80240928 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 91669C 8024092C 8E040080 */ lw $a0, 0x80($s0) -/* 9166A0 80240930 0C037711 */ jal func_800DDC44 -/* 9166A4 80240934 27A70028 */ addiu $a3, $sp, 0x28 -/* 9166A8 80240938 54400001 */ bnel $v0, $zero, .L80240940 -/* 9166AC 8024093C 24110001 */ addiu $s1, $zero, 1 -.L80240940: -/* 9166B0 80240940 9602008E */ lhu $v0, 0x8e($s0) -/* 9166B4 80240944 2442FFFF */ addiu $v0, $v0, -1 -/* 9166B8 80240948 A602008E */ sh $v0, 0x8e($s0) -/* 9166BC 8024094C 00021400 */ sll $v0, $v0, 0x10 -/* 9166C0 80240950 58400001 */ blezl $v0, .L80240958 -/* 9166C4 80240954 24110001 */ addiu $s1, $zero, 1 -.L80240958: -/* 9166C8 80240958 12200003 */ beqz $s1, .L80240968 -/* 9166CC 8024095C 24020004 */ addiu $v0, $zero, 4 -/* 9166D0 80240960 AE620070 */ sw $v0, 0x70($s3) -/* 9166D4 80240964 A2400007 */ sb $zero, 7($s2) -.L80240968: -/* 9166D8 80240968 8FBF0040 */ lw $ra, 0x40($sp) -/* 9166DC 8024096C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9166E0 80240970 8FB20038 */ lw $s2, 0x38($sp) -/* 9166E4 80240974 8FB10034 */ lw $s1, 0x34($sp) -/* 9166E8 80240978 8FB00030 */ lw $s0, 0x30($sp) -/* 9166EC 8024097C 03E00008 */ jr $ra -/* 9166F0 80240980 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s new file mode 100644 index 0000000000..254f6bdab9 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240834_9165A4.s @@ -0,0 +1,91 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240834_9165A4 +/* 9165A4 80240834 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9165A8 80240838 AFB3003C */ sw $s3, 0x3c($sp) +/* 9165AC 8024083C 0080982D */ daddu $s3, $a0, $zero +/* 9165B0 80240840 AFBF0040 */ sw $ra, 0x40($sp) +/* 9165B4 80240844 AFB20038 */ sw $s2, 0x38($sp) +/* 9165B8 80240848 AFB10034 */ sw $s1, 0x34($sp) +/* 9165BC 8024084C AFB00030 */ sw $s0, 0x30($sp) +/* 9165C0 80240850 8E720148 */ lw $s2, 0x148($s3) +/* 9165C4 80240854 0C00EABB */ jal get_npc_unsafe +/* 9165C8 80240858 86440008 */ lh $a0, 8($s2) +/* 9165CC 8024085C 0040802D */ daddu $s0, $v0, $zero +/* 9165D0 80240860 0200202D */ daddu $a0, $s0, $zero +/* 9165D4 80240864 0C00F598 */ jal func_8003D660 +/* 9165D8 80240868 24050001 */ addiu $a1, $zero, 1 +/* 9165DC 8024086C 8E050018 */ lw $a1, 0x18($s0) +/* 9165E0 80240870 8E06000C */ lw $a2, 0xc($s0) +/* 9165E4 80240874 0C00EA95 */ jal npc_move_heading +/* 9165E8 80240878 0200202D */ daddu $a0, $s0, $zero +/* 9165EC 8024087C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9165F0 80240880 C6000040 */ lwc1 $f0, 0x40($s0) +/* 9165F4 80240884 C462001C */ lwc1 $f2, 0x1c($v1) +/* 9165F8 80240888 468010A0 */ cvt.s.w $f2, $f2 +/* 9165FC 8024088C C4640024 */ lwc1 $f4, 0x24($v1) +/* 916600 80240890 46802120 */ cvt.s.w $f4, $f4 +/* 916604 80240894 E7A00010 */ swc1 $f0, 0x10($sp) +/* 916608 80240898 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91660C 8024089C 44051000 */ mfc1 $a1, $f2 +/* 916610 802408A0 C4400028 */ lwc1 $f0, 0x28($v0) +/* 916614 802408A4 46800020 */ cvt.s.w $f0, $f0 +/* 916618 802408A8 E7A00014 */ swc1 $f0, 0x14($sp) +/* 91661C 802408AC 8E4200D0 */ lw $v0, 0xd0($s2) +/* 916620 802408B0 44062000 */ mfc1 $a2, $f4 +/* 916624 802408B4 C440002C */ lwc1 $f0, 0x2c($v0) +/* 916628 802408B8 46800020 */ cvt.s.w $f0, $f0 +/* 91662C 802408BC E7A00018 */ swc1 $f0, 0x18($sp) +/* 916630 802408C0 8C640030 */ lw $a0, 0x30($v1) +/* 916634 802408C4 0C0123F5 */ jal is_point_within_region +/* 916638 802408C8 8E070038 */ lw $a3, 0x38($s0) +/* 91663C 802408CC C6000038 */ lwc1 $f0, 0x38($s0) +/* 916640 802408D0 C602003C */ lwc1 $f2, 0x3c($s0) +/* 916644 802408D4 C6040040 */ lwc1 $f4, 0x40($s0) +/* 916648 802408D8 3C013F80 */ lui $at, 0x3f80 +/* 91664C 802408DC 44813000 */ mtc1 $at, $f6 +/* 916650 802408E0 E7A00020 */ swc1 $f0, 0x20($sp) +/* 916654 802408E4 E7A20024 */ swc1 $f2, 0x24($sp) +/* 916658 802408E8 E7A40028 */ swc1 $f4, 0x28($sp) +/* 91665C 802408EC E7A60010 */ swc1 $f6, 0x10($sp) +/* 916660 802408F0 C600000C */ lwc1 $f0, 0xc($s0) +/* 916664 802408F4 0002882B */ sltu $s1, $zero, $v0 +/* 916668 802408F8 E7A00014 */ swc1 $f0, 0x14($sp) +/* 91666C 802408FC 860200A8 */ lh $v0, 0xa8($s0) +/* 916670 80240900 27A50020 */ addiu $a1, $sp, 0x20 +/* 916674 80240904 44820000 */ mtc1 $v0, $f0 +/* 916678 80240908 00000000 */ nop +/* 91667C 8024090C 46800020 */ cvt.s.w $f0, $f0 +/* 916680 80240910 E7A00018 */ swc1 $f0, 0x18($sp) +/* 916684 80240914 860200A6 */ lh $v0, 0xa6($s0) +/* 916688 80240918 27A60024 */ addiu $a2, $sp, 0x24 +/* 91668C 8024091C 44820000 */ mtc1 $v0, $f0 +/* 916690 80240920 00000000 */ nop +/* 916694 80240924 46800020 */ cvt.s.w $f0, $f0 +/* 916698 80240928 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 91669C 8024092C 8E040080 */ lw $a0, 0x80($s0) +/* 9166A0 80240930 0C037711 */ jal func_800DDC44 +/* 9166A4 80240934 27A70028 */ addiu $a3, $sp, 0x28 +/* 9166A8 80240938 54400001 */ bnel $v0, $zero, .L80240940 +/* 9166AC 8024093C 24110001 */ addiu $s1, $zero, 1 +.L80240940: +/* 9166B0 80240940 9602008E */ lhu $v0, 0x8e($s0) +/* 9166B4 80240944 2442FFFF */ addiu $v0, $v0, -1 +/* 9166B8 80240948 A602008E */ sh $v0, 0x8e($s0) +/* 9166BC 8024094C 00021400 */ sll $v0, $v0, 0x10 +/* 9166C0 80240950 58400001 */ blezl $v0, .L80240958 +/* 9166C4 80240954 24110001 */ addiu $s1, $zero, 1 +.L80240958: +/* 9166C8 80240958 12200003 */ beqz $s1, .L80240968 +/* 9166CC 8024095C 24020004 */ addiu $v0, $zero, 4 +/* 9166D0 80240960 AE620070 */ sw $v0, 0x70($s3) +/* 9166D4 80240964 A2400007 */ sb $zero, 7($s2) +.L80240968: +/* 9166D8 80240968 8FBF0040 */ lw $ra, 0x40($sp) +/* 9166DC 8024096C 8FB3003C */ lw $s3, 0x3c($sp) +/* 9166E0 80240970 8FB20038 */ lw $s2, 0x38($sp) +/* 9166E4 80240974 8FB10034 */ lw $s1, 0x34($sp) +/* 9166E8 80240978 8FB00030 */ lw $s0, 0x30($sp) +/* 9166EC 8024097C 03E00008 */ jr $ra +/* 9166F0 80240980 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240BE4.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240BE4.s deleted file mode 100644 index 94bbaf88d5..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240BE4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE4 -/* 916954 80240BE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 916958 80240BE8 AFB10014 */ sw $s1, 0x14($sp) -/* 91695C 80240BEC 0080882D */ daddu $s1, $a0, $zero -/* 916960 80240BF0 AFBF0018 */ sw $ra, 0x18($sp) -/* 916964 80240BF4 AFB00010 */ sw $s0, 0x10($sp) -/* 916968 80240BF8 8E300148 */ lw $s0, 0x148($s1) -/* 91696C 80240BFC 0C00EABB */ jal get_npc_unsafe -/* 916970 80240C00 86040008 */ lh $a0, 8($s0) -/* 916974 80240C04 0040182D */ daddu $v1, $v0, $zero -/* 916978 80240C08 9462008E */ lhu $v0, 0x8e($v1) -/* 91697C 80240C0C 2442FFFF */ addiu $v0, $v0, -1 -/* 916980 80240C10 A462008E */ sh $v0, 0x8e($v1) -/* 916984 80240C14 00021400 */ sll $v0, $v0, 0x10 -/* 916988 80240C18 1C400007 */ bgtz $v0, .L80240C38 -/* 91698C 80240C1C 24020008 */ addiu $v0, $zero, 8 -/* 916990 80240C20 A462008E */ sh $v0, 0x8e($v1) -/* 916994 80240C24 8E0200CC */ lw $v0, 0xcc($s0) -/* 916998 80240C28 8C420038 */ lw $v0, 0x38($v0) -/* 91699C 80240C2C AC620028 */ sw $v0, 0x28($v1) -/* 9169A0 80240C30 24020034 */ addiu $v0, $zero, 0x34 -/* 9169A4 80240C34 AE220070 */ sw $v0, 0x70($s1) -.L80240C38: -/* 9169A8 80240C38 8FBF0018 */ lw $ra, 0x18($sp) -/* 9169AC 80240C3C 8FB10014 */ lw $s1, 0x14($sp) -/* 9169B0 80240C40 8FB00010 */ lw $s0, 0x10($sp) -/* 9169B4 80240C44 03E00008 */ jr $ra -/* 9169B8 80240C48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240BE4_916954.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240BE4_916954.s new file mode 100644 index 0000000000..2af7d6cb2d --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240BE4_916954.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BE4_916954 +/* 916954 80240BE4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 916958 80240BE8 AFB10014 */ sw $s1, 0x14($sp) +/* 91695C 80240BEC 0080882D */ daddu $s1, $a0, $zero +/* 916960 80240BF0 AFBF0018 */ sw $ra, 0x18($sp) +/* 916964 80240BF4 AFB00010 */ sw $s0, 0x10($sp) +/* 916968 80240BF8 8E300148 */ lw $s0, 0x148($s1) +/* 91696C 80240BFC 0C00EABB */ jal get_npc_unsafe +/* 916970 80240C00 86040008 */ lh $a0, 8($s0) +/* 916974 80240C04 0040182D */ daddu $v1, $v0, $zero +/* 916978 80240C08 9462008E */ lhu $v0, 0x8e($v1) +/* 91697C 80240C0C 2442FFFF */ addiu $v0, $v0, -1 +/* 916980 80240C10 A462008E */ sh $v0, 0x8e($v1) +/* 916984 80240C14 00021400 */ sll $v0, $v0, 0x10 +/* 916988 80240C18 1C400007 */ bgtz $v0, .L80240C38 +/* 91698C 80240C1C 24020008 */ addiu $v0, $zero, 8 +/* 916990 80240C20 A462008E */ sh $v0, 0x8e($v1) +/* 916994 80240C24 8E0200CC */ lw $v0, 0xcc($s0) +/* 916998 80240C28 8C420038 */ lw $v0, 0x38($v0) +/* 91699C 80240C2C AC620028 */ sw $v0, 0x28($v1) +/* 9169A0 80240C30 24020034 */ addiu $v0, $zero, 0x34 +/* 9169A4 80240C34 AE220070 */ sw $v0, 0x70($s1) +.L80240C38: +/* 9169A8 80240C38 8FBF0018 */ lw $ra, 0x18($sp) +/* 9169AC 80240C3C 8FB10014 */ lw $s1, 0x14($sp) +/* 9169B0 80240C40 8FB00010 */ lw $s0, 0x10($sp) +/* 9169B4 80240C44 03E00008 */ jr $ra +/* 9169B8 80240C48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C.s deleted file mode 100644 index 7b0fc1cdc9..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C4C -/* 9169BC 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9169C0 80240C50 AFB00010 */ sw $s0, 0x10($sp) -/* 9169C4 80240C54 0080802D */ daddu $s0, $a0, $zero -/* 9169C8 80240C58 AFBF0014 */ sw $ra, 0x14($sp) -/* 9169CC 80240C5C 8E020148 */ lw $v0, 0x148($s0) -/* 9169D0 80240C60 0C00EABB */ jal get_npc_unsafe -/* 9169D4 80240C64 84440008 */ lh $a0, 8($v0) -/* 9169D8 80240C68 9443008E */ lhu $v1, 0x8e($v0) -/* 9169DC 80240C6C 2463FFFF */ addiu $v1, $v1, -1 -/* 9169E0 80240C70 A443008E */ sh $v1, 0x8e($v0) -/* 9169E4 80240C74 00031C00 */ sll $v1, $v1, 0x10 -/* 9169E8 80240C78 58600001 */ blezl $v1, .L80240C80 -/* 9169EC 80240C7C AE000070 */ sw $zero, 0x70($s0) -.L80240C80: -/* 9169F0 80240C80 8FBF0014 */ lw $ra, 0x14($sp) -/* 9169F4 80240C84 8FB00010 */ lw $s0, 0x10($sp) -/* 9169F8 80240C88 03E00008 */ jr $ra -/* 9169FC 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s new file mode 100644 index 0000000000..cff5f0cfa5 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C4C_9169BC.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C4C_9169BC +/* 9169BC 80240C4C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9169C0 80240C50 AFB00010 */ sw $s0, 0x10($sp) +/* 9169C4 80240C54 0080802D */ daddu $s0, $a0, $zero +/* 9169C8 80240C58 AFBF0014 */ sw $ra, 0x14($sp) +/* 9169CC 80240C5C 8E020148 */ lw $v0, 0x148($s0) +/* 9169D0 80240C60 0C00EABB */ jal get_npc_unsafe +/* 9169D4 80240C64 84440008 */ lh $a0, 8($v0) +/* 9169D8 80240C68 9443008E */ lhu $v1, 0x8e($v0) +/* 9169DC 80240C6C 2463FFFF */ addiu $v1, $v1, -1 +/* 9169E0 80240C70 A443008E */ sh $v1, 0x8e($v0) +/* 9169E4 80240C74 00031C00 */ sll $v1, $v1, 0x10 +/* 9169E8 80240C78 58600001 */ blezl $v1, .L80240C80 +/* 9169EC 80240C7C AE000070 */ sw $zero, 0x70($s0) +.L80240C80: +/* 9169F0 80240C80 8FBF0014 */ lw $ra, 0x14($sp) +/* 9169F4 80240C84 8FB00010 */ lw $s0, 0x10($sp) +/* 9169F8 80240C88 03E00008 */ jr $ra +/* 9169FC 80240C8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90.s deleted file mode 100644 index 1d62246d2f..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C90 -/* 916A00 80240C90 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 916A04 80240C94 AFB3003C */ sw $s3, 0x3c($sp) -/* 916A08 80240C98 0080982D */ daddu $s3, $a0, $zero -/* 916A0C 80240C9C AFBF0048 */ sw $ra, 0x48($sp) -/* 916A10 80240CA0 AFB50044 */ sw $s5, 0x44($sp) -/* 916A14 80240CA4 AFB40040 */ sw $s4, 0x40($sp) -/* 916A18 80240CA8 AFB20038 */ sw $s2, 0x38($sp) -/* 916A1C 80240CAC AFB10034 */ sw $s1, 0x34($sp) -/* 916A20 80240CB0 AFB00030 */ sw $s0, 0x30($sp) -/* 916A24 80240CB4 8E720148 */ lw $s2, 0x148($s3) -/* 916A28 80240CB8 86440008 */ lh $a0, 8($s2) -/* 916A2C 80240CBC 0C00EABB */ jal get_npc_unsafe -/* 916A30 80240CC0 00A0882D */ daddu $s1, $a1, $zero -/* 916A34 80240CC4 0260202D */ daddu $a0, $s3, $zero -/* 916A38 80240CC8 8E70000C */ lw $s0, 0xc($s3) -/* 916A3C 80240CCC 0040A82D */ daddu $s5, $v0, $zero -/* 916A40 80240CD0 8E050000 */ lw $a1, ($s0) -/* 916A44 80240CD4 0C0B1EAF */ jal get_variable -/* 916A48 80240CD8 26100004 */ addiu $s0, $s0, 4 -/* 916A4C 80240CDC 0260202D */ daddu $a0, $s3, $zero -/* 916A50 80240CE0 8E050000 */ lw $a1, ($s0) -/* 916A54 80240CE4 0C0B1EAF */ jal get_variable -/* 916A58 80240CE8 0040A02D */ daddu $s4, $v0, $zero -/* 916A5C 80240CEC AE420094 */ sw $v0, 0x94($s2) -/* 916A60 80240CF0 AFA00010 */ sw $zero, 0x10($sp) -/* 916A64 80240CF4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A68 80240CF8 8C420030 */ lw $v0, 0x30($v0) -/* 916A6C 80240CFC AFA20014 */ sw $v0, 0x14($sp) -/* 916A70 80240D00 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A74 80240D04 8C42001C */ lw $v0, 0x1c($v0) -/* 916A78 80240D08 AFA20018 */ sw $v0, 0x18($sp) -/* 916A7C 80240D0C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A80 80240D10 8C420024 */ lw $v0, 0x24($v0) -/* 916A84 80240D14 AFA2001C */ sw $v0, 0x1c($sp) -/* 916A88 80240D18 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A8C 80240D1C 8C420028 */ lw $v0, 0x28($v0) -/* 916A90 80240D20 AFA20020 */ sw $v0, 0x20($sp) -/* 916A94 80240D24 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916A98 80240D28 3C014220 */ lui $at, 0x4220 -/* 916A9C 80240D2C 44810000 */ mtc1 $at, $f0 -/* 916AA0 80240D30 8C42002C */ lw $v0, 0x2c($v0) -/* 916AA4 80240D34 27B00010 */ addiu $s0, $sp, 0x10 -/* 916AA8 80240D38 E7A00028 */ swc1 $f0, 0x28($sp) -/* 916AAC 80240D3C A7A0002C */ sh $zero, 0x2c($sp) -/* 916AB0 80240D40 12200012 */ beqz $s1, .L80240D8C -/* 916AB4 80240D44 AFA20024 */ sw $v0, 0x24($sp) -/* 916AB8 80240D48 AE600070 */ sw $zero, 0x70($s3) -/* 916ABC 80240D4C 8EA30000 */ lw $v1, ($s5) -/* 916AC0 80240D50 2402F7FF */ addiu $v0, $zero, -0x801 -/* 916AC4 80240D54 A6A0008E */ sh $zero, 0x8e($s5) -/* 916AC8 80240D58 00621824 */ and $v1, $v1, $v0 -/* 916ACC 80240D5C AEA30000 */ sw $v1, ($s5) -/* 916AD0 80240D60 8E4200D0 */ lw $v0, 0xd0($s2) -/* 916AD4 80240D64 8C420034 */ lw $v0, 0x34($v0) -/* 916AD8 80240D68 54400005 */ bnel $v0, $zero, .L80240D80 -/* 916ADC 80240D6C 2402FDFF */ addiu $v0, $zero, -0x201 -/* 916AE0 80240D70 34620200 */ ori $v0, $v1, 0x200 -/* 916AE4 80240D74 2403FFF7 */ addiu $v1, $zero, -9 -/* 916AE8 80240D78 08090362 */ j .L80240D88 -/* 916AEC 80240D7C 00431024 */ and $v0, $v0, $v1 -.L80240D80: -/* 916AF0 80240D80 00621024 */ and $v0, $v1, $v0 -/* 916AF4 80240D84 34420008 */ ori $v0, $v0, 8 -.L80240D88: -/* 916AF8 80240D88 AEA20000 */ sw $v0, ($s5) -.L80240D8C: -/* 916AFC 80240D8C 8E4300B0 */ lw $v1, 0xb0($s2) -/* 916B00 80240D90 30620004 */ andi $v0, $v1, 4 -/* 916B04 80240D94 10400007 */ beqz $v0, .L80240DB4 -/* 916B08 80240D98 00000000 */ nop -/* 916B0C 80240D9C 824200B4 */ lb $v0, 0xb4($s2) -/* 916B10 80240DA0 14400086 */ bnez $v0, .L80240FBC -/* 916B14 80240DA4 0000102D */ daddu $v0, $zero, $zero -/* 916B18 80240DA8 2402FFFB */ addiu $v0, $zero, -5 -/* 916B1C 80240DAC 00621024 */ and $v0, $v1, $v0 -/* 916B20 80240DB0 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240DB4: -/* 916B24 80240DB4 8E620070 */ lw $v0, 0x70($s3) -/* 916B28 80240DB8 2442FFF4 */ addiu $v0, $v0, -0xc -/* 916B2C 80240DBC 2C420003 */ sltiu $v0, $v0, 3 -/* 916B30 80240DC0 10400007 */ beqz $v0, .L80240DE0 -/* 916B34 80240DC4 0260202D */ daddu $a0, $s3, $zero -/* 916B38 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 916B3C 80240DCC 0C090000 */ jal func_80240000 -/* 916B40 80240DD0 0200302D */ daddu $a2, $s0, $zero -/* 916B44 80240DD4 10400002 */ beqz $v0, .L80240DE0 -/* 916B48 80240DD8 24020014 */ addiu $v0, $zero, 0x14 -/* 916B4C 80240DDC AE620070 */ sw $v0, 0x70($s3) -.L80240DE0: -/* 916B50 80240DE0 8E630070 */ lw $v1, 0x70($s3) -/* 916B54 80240DE4 2C620035 */ sltiu $v0, $v1, 0x35 -/* 916B58 80240DE8 10400073 */ beqz $v0, .L80240FB8 -/* 916B5C 80240DEC 00031080 */ sll $v0, $v1, 2 -/* 916B60 80240DF0 3C018024 */ lui $at, 0x8024 -/* 916B64 80240DF4 00220821 */ addu $at, $at, $v0 -/* 916B68 80240DF8 8C222D68 */ lw $v0, 0x2d68($at) -/* 916B6C 80240DFC 00400008 */ jr $v0 -/* 916B70 80240E00 00000000 */ nop -/* 916B74 80240E04 0260202D */ daddu $a0, $s3, $zero -/* 916B78 80240E08 0280282D */ daddu $a1, $s4, $zero -/* 916B7C 80240E0C 0C090058 */ jal func_80240160 -/* 916B80 80240E10 0200302D */ daddu $a2, $s0, $zero -/* 916B84 80240E14 0260202D */ daddu $a0, $s3, $zero -/* 916B88 80240E18 0280282D */ daddu $a1, $s4, $zero -/* 916B8C 80240E1C 0C090075 */ jal func_802401D4 -/* 916B90 80240E20 0200302D */ daddu $a2, $s0, $zero -/* 916B94 80240E24 8E630070 */ lw $v1, 0x70($s3) -/* 916B98 80240E28 24020002 */ addiu $v0, $zero, 2 -/* 916B9C 80240E2C 14620063 */ bne $v1, $v0, .L80240FBC -/* 916BA0 80240E30 0000102D */ daddu $v0, $zero, $zero -/* 916BA4 80240E34 0260202D */ daddu $a0, $s3, $zero -/* 916BA8 80240E38 0280282D */ daddu $a1, $s4, $zero -/* 916BAC 80240E3C 0C0900C1 */ jal func_80240304 -/* 916BB0 80240E40 0200302D */ daddu $a2, $s0, $zero -/* 916BB4 80240E44 8E630070 */ lw $v1, 0x70($s3) -/* 916BB8 80240E48 24020003 */ addiu $v0, $zero, 3 -/* 916BBC 80240E4C 1462005B */ bne $v1, $v0, .L80240FBC -/* 916BC0 80240E50 0000102D */ daddu $v0, $zero, $zero -/* 916BC4 80240E54 0260202D */ daddu $a0, $s3, $zero -/* 916BC8 80240E58 0280282D */ daddu $a1, $s4, $zero -/* 916BCC 80240E5C 0C0900E8 */ jal func_802403A0 -/* 916BD0 80240E60 0200302D */ daddu $a2, $s0, $zero -/* 916BD4 80240E64 8E630070 */ lw $v1, 0x70($s3) -/* 916BD8 80240E68 24020004 */ addiu $v0, $zero, 4 -/* 916BDC 80240E6C 14620053 */ bne $v1, $v0, .L80240FBC -/* 916BE0 80240E70 0000102D */ daddu $v0, $zero, $zero -/* 916BE4 80240E74 0260202D */ daddu $a0, $s3, $zero -/* 916BE8 80240E78 0280282D */ daddu $a1, $s4, $zero -/* 916BEC 80240E7C 0C09010A */ jal func_80240428 -/* 916BF0 80240E80 0200302D */ daddu $a2, $s0, $zero -/* 916BF4 80240E84 0260202D */ daddu $a0, $s3, $zero -/* 916BF8 80240E88 0280282D */ daddu $a1, $s4, $zero -/* 916BFC 80240E8C 0C090134 */ jal func_802404D0 -/* 916C00 80240E90 0200302D */ daddu $a2, $s0, $zero -/* 916C04 80240E94 080903EF */ j .L80240FBC -/* 916C08 80240E98 0000102D */ daddu $v0, $zero, $zero -/* 916C0C 80240E9C 0260202D */ daddu $a0, $s3, $zero -/* 916C10 80240EA0 0280282D */ daddu $a1, $s4, $zero -/* 916C14 80240EA4 0C0127DF */ jal func_80049F7C -/* 916C18 80240EA8 0200302D */ daddu $a2, $s0, $zero -/* 916C1C 80240EAC 8E630070 */ lw $v1, 0x70($s3) -/* 916C20 80240EB0 2402000D */ addiu $v0, $zero, 0xd -/* 916C24 80240EB4 14620041 */ bne $v1, $v0, .L80240FBC -/* 916C28 80240EB8 0000102D */ daddu $v0, $zero, $zero -/* 916C2C 80240EBC 0260202D */ daddu $a0, $s3, $zero -/* 916C30 80240EC0 0280282D */ daddu $a1, $s4, $zero -/* 916C34 80240EC4 0C012849 */ jal func_8004A124 -/* 916C38 80240EC8 0200302D */ daddu $a2, $s0, $zero -/* 916C3C 80240ECC 8E630070 */ lw $v1, 0x70($s3) -/* 916C40 80240ED0 2402000E */ addiu $v0, $zero, 0xe -/* 916C44 80240ED4 14620039 */ bne $v1, $v0, .L80240FBC -/* 916C48 80240ED8 0000102D */ daddu $v0, $zero, $zero -/* 916C4C 80240EDC 96A2008E */ lhu $v0, 0x8e($s5) -/* 916C50 80240EE0 2442FFFF */ addiu $v0, $v0, -1 -/* 916C54 80240EE4 A6A2008E */ sh $v0, 0x8e($s5) -/* 916C58 80240EE8 00021400 */ sll $v0, $v0, 0x10 -/* 916C5C 80240EEC 14400033 */ bnez $v0, .L80240FBC -/* 916C60 80240EF0 0000102D */ daddu $v0, $zero, $zero -/* 916C64 80240EF4 24020028 */ addiu $v0, $zero, 0x28 -/* 916C68 80240EF8 080903EE */ j .L80240FB8 -/* 916C6C 80240EFC AE620070 */ sw $v0, 0x70($s3) -/* 916C70 80240F00 0260202D */ daddu $a0, $s3, $zero -/* 916C74 80240F04 0280282D */ daddu $a1, $s4, $zero -/* 916C78 80240F08 0C090191 */ jal func_80240644 -/* 916C7C 80240F0C 0200302D */ daddu $a2, $s0, $zero -/* 916C80 80240F10 0260202D */ daddu $a0, $s3, $zero -/* 916C84 80240F14 0280282D */ daddu $a1, $s4, $zero -/* 916C88 80240F18 0C0901A5 */ jal func_80240694 -/* 916C8C 80240F1C 0200302D */ daddu $a2, $s0, $zero -/* 916C90 80240F20 080903EF */ j .L80240FBC -/* 916C94 80240F24 0000102D */ daddu $v0, $zero, $zero -/* 916C98 80240F28 0260202D */ daddu $a0, $s3, $zero -/* 916C9C 80240F2C 0280282D */ daddu $a1, $s4, $zero -/* 916CA0 80240F30 0C09020D */ jal func_80240834 -/* 916CA4 80240F34 0200302D */ daddu $a2, $s0, $zero -/* 916CA8 80240F38 080903EF */ j .L80240FBC -/* 916CAC 80240F3C 0000102D */ daddu $v0, $zero, $zero -/* 916CB0 80240F40 0260202D */ daddu $a0, $s3, $zero -/* 916CB4 80240F44 0280282D */ daddu $a1, $s4, $zero -/* 916CB8 80240F48 0C090261 */ jal func_80240984 -/* 916CBC 80240F4C 0200302D */ daddu $a2, $s0, $zero -/* 916CC0 80240F50 8E630070 */ lw $v1, 0x70($s3) -/* 916CC4 80240F54 24020029 */ addiu $v0, $zero, 0x29 -/* 916CC8 80240F58 14620018 */ bne $v1, $v0, .L80240FBC -/* 916CCC 80240F5C 0000102D */ daddu $v0, $zero, $zero -/* 916CD0 80240F60 0260202D */ daddu $a0, $s3, $zero -/* 916CD4 80240F64 0280282D */ daddu $a1, $s4, $zero -/* 916CD8 80240F68 0C09028C */ jal func_80240A30 -/* 916CDC 80240F6C 0200302D */ daddu $a2, $s0, $zero -/* 916CE0 80240F70 080903EF */ j .L80240FBC -/* 916CE4 80240F74 0000102D */ daddu $v0, $zero, $zero -/* 916CE8 80240F78 0260202D */ daddu $a0, $s3, $zero -/* 916CEC 80240F7C 0280282D */ daddu $a1, $s4, $zero -/* 916CF0 80240F80 0C0902DA */ jal func_80240B68 -/* 916CF4 80240F84 0200302D */ daddu $a2, $s0, $zero -/* 916CF8 80240F88 0260202D */ daddu $a0, $s3, $zero -/* 916CFC 80240F8C 0280282D */ daddu $a1, $s4, $zero -/* 916D00 80240F90 0C0902F9 */ jal func_80240BE4 -/* 916D04 80240F94 0200302D */ daddu $a2, $s0, $zero -/* 916D08 80240F98 8E630070 */ lw $v1, 0x70($s3) -/* 916D0C 80240F9C 24020034 */ addiu $v0, $zero, 0x34 -/* 916D10 80240FA0 14620006 */ bne $v1, $v0, .L80240FBC -/* 916D14 80240FA4 0000102D */ daddu $v0, $zero, $zero -/* 916D18 80240FA8 0260202D */ daddu $a0, $s3, $zero -/* 916D1C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* 916D20 80240FB0 0C090313 */ jal func_80240C4C -/* 916D24 80240FB4 0200302D */ daddu $a2, $s0, $zero -.L80240FB8: -/* 916D28 80240FB8 0000102D */ daddu $v0, $zero, $zero -.L80240FBC: -/* 916D2C 80240FBC 8FBF0048 */ lw $ra, 0x48($sp) -/* 916D30 80240FC0 8FB50044 */ lw $s5, 0x44($sp) -/* 916D34 80240FC4 8FB40040 */ lw $s4, 0x40($sp) -/* 916D38 80240FC8 8FB3003C */ lw $s3, 0x3c($sp) -/* 916D3C 80240FCC 8FB20038 */ lw $s2, 0x38($sp) -/* 916D40 80240FD0 8FB10034 */ lw $s1, 0x34($sp) -/* 916D44 80240FD4 8FB00030 */ lw $s0, 0x30($sp) -/* 916D48 80240FD8 03E00008 */ jr $ra -/* 916D4C 80240FDC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s new file mode 100644 index 0000000000..32f7f8c1c4 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240C90_916A00.s @@ -0,0 +1,223 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C90_916A00 +/* 916A00 80240C90 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 916A04 80240C94 AFB3003C */ sw $s3, 0x3c($sp) +/* 916A08 80240C98 0080982D */ daddu $s3, $a0, $zero +/* 916A0C 80240C9C AFBF0048 */ sw $ra, 0x48($sp) +/* 916A10 80240CA0 AFB50044 */ sw $s5, 0x44($sp) +/* 916A14 80240CA4 AFB40040 */ sw $s4, 0x40($sp) +/* 916A18 80240CA8 AFB20038 */ sw $s2, 0x38($sp) +/* 916A1C 80240CAC AFB10034 */ sw $s1, 0x34($sp) +/* 916A20 80240CB0 AFB00030 */ sw $s0, 0x30($sp) +/* 916A24 80240CB4 8E720148 */ lw $s2, 0x148($s3) +/* 916A28 80240CB8 86440008 */ lh $a0, 8($s2) +/* 916A2C 80240CBC 0C00EABB */ jal get_npc_unsafe +/* 916A30 80240CC0 00A0882D */ daddu $s1, $a1, $zero +/* 916A34 80240CC4 0260202D */ daddu $a0, $s3, $zero +/* 916A38 80240CC8 8E70000C */ lw $s0, 0xc($s3) +/* 916A3C 80240CCC 0040A82D */ daddu $s5, $v0, $zero +/* 916A40 80240CD0 8E050000 */ lw $a1, ($s0) +/* 916A44 80240CD4 0C0B1EAF */ jal get_variable +/* 916A48 80240CD8 26100004 */ addiu $s0, $s0, 4 +/* 916A4C 80240CDC 0260202D */ daddu $a0, $s3, $zero +/* 916A50 80240CE0 8E050000 */ lw $a1, ($s0) +/* 916A54 80240CE4 0C0B1EAF */ jal get_variable +/* 916A58 80240CE8 0040A02D */ daddu $s4, $v0, $zero +/* 916A5C 80240CEC AE420094 */ sw $v0, 0x94($s2) +/* 916A60 80240CF0 AFA00010 */ sw $zero, 0x10($sp) +/* 916A64 80240CF4 8E4200D0 */ lw $v0, 0xd0($s2) +/* 916A68 80240CF8 8C420030 */ lw $v0, 0x30($v0) +/* 916A6C 80240CFC AFA20014 */ sw $v0, 0x14($sp) +/* 916A70 80240D00 8E4200D0 */ lw $v0, 0xd0($s2) +/* 916A74 80240D04 8C42001C */ lw $v0, 0x1c($v0) +/* 916A78 80240D08 AFA20018 */ sw $v0, 0x18($sp) +/* 916A7C 80240D0C 8E4200D0 */ lw $v0, 0xd0($s2) +/* 916A80 80240D10 8C420024 */ lw $v0, 0x24($v0) +/* 916A84 80240D14 AFA2001C */ sw $v0, 0x1c($sp) +/* 916A88 80240D18 8E4200D0 */ lw $v0, 0xd0($s2) +/* 916A8C 80240D1C 8C420028 */ lw $v0, 0x28($v0) +/* 916A90 80240D20 AFA20020 */ sw $v0, 0x20($sp) +/* 916A94 80240D24 8E4200D0 */ lw $v0, 0xd0($s2) +/* 916A98 80240D28 3C014220 */ lui $at, 0x4220 +/* 916A9C 80240D2C 44810000 */ mtc1 $at, $f0 +/* 916AA0 80240D30 8C42002C */ lw $v0, 0x2c($v0) +/* 916AA4 80240D34 27B00010 */ addiu $s0, $sp, 0x10 +/* 916AA8 80240D38 E7A00028 */ swc1 $f0, 0x28($sp) +/* 916AAC 80240D3C A7A0002C */ sh $zero, 0x2c($sp) +/* 916AB0 80240D40 12200012 */ beqz $s1, .L80240D8C +/* 916AB4 80240D44 AFA20024 */ sw $v0, 0x24($sp) +/* 916AB8 80240D48 AE600070 */ sw $zero, 0x70($s3) +/* 916ABC 80240D4C 8EA30000 */ lw $v1, ($s5) +/* 916AC0 80240D50 2402F7FF */ addiu $v0, $zero, -0x801 +/* 916AC4 80240D54 A6A0008E */ sh $zero, 0x8e($s5) +/* 916AC8 80240D58 00621824 */ and $v1, $v1, $v0 +/* 916ACC 80240D5C AEA30000 */ sw $v1, ($s5) +/* 916AD0 80240D60 8E4200D0 */ lw $v0, 0xd0($s2) +/* 916AD4 80240D64 8C420034 */ lw $v0, 0x34($v0) +/* 916AD8 80240D68 54400005 */ bnel $v0, $zero, .L80240D80 +/* 916ADC 80240D6C 2402FDFF */ addiu $v0, $zero, -0x201 +/* 916AE0 80240D70 34620200 */ ori $v0, $v1, 0x200 +/* 916AE4 80240D74 2403FFF7 */ addiu $v1, $zero, -9 +/* 916AE8 80240D78 08090362 */ j .L80240D88 +/* 916AEC 80240D7C 00431024 */ and $v0, $v0, $v1 +.L80240D80: +/* 916AF0 80240D80 00621024 */ and $v0, $v1, $v0 +/* 916AF4 80240D84 34420008 */ ori $v0, $v0, 8 +.L80240D88: +/* 916AF8 80240D88 AEA20000 */ sw $v0, ($s5) +.L80240D8C: +/* 916AFC 80240D8C 8E4300B0 */ lw $v1, 0xb0($s2) +/* 916B00 80240D90 30620004 */ andi $v0, $v1, 4 +/* 916B04 80240D94 10400007 */ beqz $v0, .L80240DB4 +/* 916B08 80240D98 00000000 */ nop +/* 916B0C 80240D9C 824200B4 */ lb $v0, 0xb4($s2) +/* 916B10 80240DA0 14400086 */ bnez $v0, .L80240FBC +/* 916B14 80240DA4 0000102D */ daddu $v0, $zero, $zero +/* 916B18 80240DA8 2402FFFB */ addiu $v0, $zero, -5 +/* 916B1C 80240DAC 00621024 */ and $v0, $v1, $v0 +/* 916B20 80240DB0 AE4200B0 */ sw $v0, 0xb0($s2) +.L80240DB4: +/* 916B24 80240DB4 8E620070 */ lw $v0, 0x70($s3) +/* 916B28 80240DB8 2442FFF4 */ addiu $v0, $v0, -0xc +/* 916B2C 80240DBC 2C420003 */ sltiu $v0, $v0, 3 +/* 916B30 80240DC0 10400007 */ beqz $v0, .L80240DE0 +/* 916B34 80240DC4 0260202D */ daddu $a0, $s3, $zero +/* 916B38 80240DC8 0280282D */ daddu $a1, $s4, $zero +/* 916B3C 80240DCC 0C090000 */ jal func_80240000_915D70 +/* 916B40 80240DD0 0200302D */ daddu $a2, $s0, $zero +/* 916B44 80240DD4 10400002 */ beqz $v0, .L80240DE0 +/* 916B48 80240DD8 24020014 */ addiu $v0, $zero, 0x14 +/* 916B4C 80240DDC AE620070 */ sw $v0, 0x70($s3) +.L80240DE0: +/* 916B50 80240DE0 8E630070 */ lw $v1, 0x70($s3) +/* 916B54 80240DE4 2C620035 */ sltiu $v0, $v1, 0x35 +/* 916B58 80240DE8 10400073 */ beqz $v0, .L80240FB8 +/* 916B5C 80240DEC 00031080 */ sll $v0, $v1, 2 +/* 916B60 80240DF0 3C018024 */ lui $at, 0x8024 +/* 916B64 80240DF4 00220821 */ addu $at, $at, $v0 +/* 916B68 80240DF8 8C222D68 */ lw $v0, 0x2d68($at) +/* 916B6C 80240DFC 00400008 */ jr $v0 +/* 916B70 80240E00 00000000 */ nop +/* 916B74 80240E04 0260202D */ daddu $a0, $s3, $zero +/* 916B78 80240E08 0280282D */ daddu $a1, $s4, $zero +/* 916B7C 80240E0C 0C090058 */ jal func_80240160_915ED0 +/* 916B80 80240E10 0200302D */ daddu $a2, $s0, $zero +/* 916B84 80240E14 0260202D */ daddu $a0, $s3, $zero +/* 916B88 80240E18 0280282D */ daddu $a1, $s4, $zero +/* 916B8C 80240E1C 0C090075 */ jal func_802401D4_915F44 +/* 916B90 80240E20 0200302D */ daddu $a2, $s0, $zero +/* 916B94 80240E24 8E630070 */ lw $v1, 0x70($s3) +/* 916B98 80240E28 24020002 */ addiu $v0, $zero, 2 +/* 916B9C 80240E2C 14620063 */ bne $v1, $v0, .L80240FBC +/* 916BA0 80240E30 0000102D */ daddu $v0, $zero, $zero +/* 916BA4 80240E34 0260202D */ daddu $a0, $s3, $zero +/* 916BA8 80240E38 0280282D */ daddu $a1, $s4, $zero +/* 916BAC 80240E3C 0C0900C1 */ jal func_80240304_916074 +/* 916BB0 80240E40 0200302D */ daddu $a2, $s0, $zero +/* 916BB4 80240E44 8E630070 */ lw $v1, 0x70($s3) +/* 916BB8 80240E48 24020003 */ addiu $v0, $zero, 3 +/* 916BBC 80240E4C 1462005B */ bne $v1, $v0, .L80240FBC +/* 916BC0 80240E50 0000102D */ daddu $v0, $zero, $zero +/* 916BC4 80240E54 0260202D */ daddu $a0, $s3, $zero +/* 916BC8 80240E58 0280282D */ daddu $a1, $s4, $zero +/* 916BCC 80240E5C 0C0900E8 */ jal func_802403A0_916110 +/* 916BD0 80240E60 0200302D */ daddu $a2, $s0, $zero +/* 916BD4 80240E64 8E630070 */ lw $v1, 0x70($s3) +/* 916BD8 80240E68 24020004 */ addiu $v0, $zero, 4 +/* 916BDC 80240E6C 14620053 */ bne $v1, $v0, .L80240FBC +/* 916BE0 80240E70 0000102D */ daddu $v0, $zero, $zero +/* 916BE4 80240E74 0260202D */ daddu $a0, $s3, $zero +/* 916BE8 80240E78 0280282D */ daddu $a1, $s4, $zero +/* 916BEC 80240E7C 0C09010A */ jal func_80240428_916198 +/* 916BF0 80240E80 0200302D */ daddu $a2, $s0, $zero +/* 916BF4 80240E84 0260202D */ daddu $a0, $s3, $zero +/* 916BF8 80240E88 0280282D */ daddu $a1, $s4, $zero +/* 916BFC 80240E8C 0C090134 */ jal func_802404D0_916240 +/* 916C00 80240E90 0200302D */ daddu $a2, $s0, $zero +/* 916C04 80240E94 080903EF */ j .L80240FBC +/* 916C08 80240E98 0000102D */ daddu $v0, $zero, $zero +/* 916C0C 80240E9C 0260202D */ daddu $a0, $s3, $zero +/* 916C10 80240EA0 0280282D */ daddu $a1, $s4, $zero +/* 916C14 80240EA4 0C0127DF */ jal func_80049F7C +/* 916C18 80240EA8 0200302D */ daddu $a2, $s0, $zero +/* 916C1C 80240EAC 8E630070 */ lw $v1, 0x70($s3) +/* 916C20 80240EB0 2402000D */ addiu $v0, $zero, 0xd +/* 916C24 80240EB4 14620041 */ bne $v1, $v0, .L80240FBC +/* 916C28 80240EB8 0000102D */ daddu $v0, $zero, $zero +/* 916C2C 80240EBC 0260202D */ daddu $a0, $s3, $zero +/* 916C30 80240EC0 0280282D */ daddu $a1, $s4, $zero +/* 916C34 80240EC4 0C012849 */ jal func_8004A124 +/* 916C38 80240EC8 0200302D */ daddu $a2, $s0, $zero +/* 916C3C 80240ECC 8E630070 */ lw $v1, 0x70($s3) +/* 916C40 80240ED0 2402000E */ addiu $v0, $zero, 0xe +/* 916C44 80240ED4 14620039 */ bne $v1, $v0, .L80240FBC +/* 916C48 80240ED8 0000102D */ daddu $v0, $zero, $zero +/* 916C4C 80240EDC 96A2008E */ lhu $v0, 0x8e($s5) +/* 916C50 80240EE0 2442FFFF */ addiu $v0, $v0, -1 +/* 916C54 80240EE4 A6A2008E */ sh $v0, 0x8e($s5) +/* 916C58 80240EE8 00021400 */ sll $v0, $v0, 0x10 +/* 916C5C 80240EEC 14400033 */ bnez $v0, .L80240FBC +/* 916C60 80240EF0 0000102D */ daddu $v0, $zero, $zero +/* 916C64 80240EF4 24020028 */ addiu $v0, $zero, 0x28 +/* 916C68 80240EF8 080903EE */ j .L80240FB8 +/* 916C6C 80240EFC AE620070 */ sw $v0, 0x70($s3) +/* 916C70 80240F00 0260202D */ daddu $a0, $s3, $zero +/* 916C74 80240F04 0280282D */ daddu $a1, $s4, $zero +/* 916C78 80240F08 0C090191 */ jal func_80240644_9163B4 +/* 916C7C 80240F0C 0200302D */ daddu $a2, $s0, $zero +/* 916C80 80240F10 0260202D */ daddu $a0, $s3, $zero +/* 916C84 80240F14 0280282D */ daddu $a1, $s4, $zero +/* 916C88 80240F18 0C0901A5 */ jal func_80240694_916404 +/* 916C8C 80240F1C 0200302D */ daddu $a2, $s0, $zero +/* 916C90 80240F20 080903EF */ j .L80240FBC +/* 916C94 80240F24 0000102D */ daddu $v0, $zero, $zero +/* 916C98 80240F28 0260202D */ daddu $a0, $s3, $zero +/* 916C9C 80240F2C 0280282D */ daddu $a1, $s4, $zero +/* 916CA0 80240F30 0C09020D */ jal func_80240834_9165A4 +/* 916CA4 80240F34 0200302D */ daddu $a2, $s0, $zero +/* 916CA8 80240F38 080903EF */ j .L80240FBC +/* 916CAC 80240F3C 0000102D */ daddu $v0, $zero, $zero +/* 916CB0 80240F40 0260202D */ daddu $a0, $s3, $zero +/* 916CB4 80240F44 0280282D */ daddu $a1, $s4, $zero +/* 916CB8 80240F48 0C090261 */ jal func_80240984_9166F4 +/* 916CBC 80240F4C 0200302D */ daddu $a2, $s0, $zero +/* 916CC0 80240F50 8E630070 */ lw $v1, 0x70($s3) +/* 916CC4 80240F54 24020029 */ addiu $v0, $zero, 0x29 +/* 916CC8 80240F58 14620018 */ bne $v1, $v0, .L80240FBC +/* 916CCC 80240F5C 0000102D */ daddu $v0, $zero, $zero +/* 916CD0 80240F60 0260202D */ daddu $a0, $s3, $zero +/* 916CD4 80240F64 0280282D */ daddu $a1, $s4, $zero +/* 916CD8 80240F68 0C09028C */ jal func_80240A30_9167A0 +/* 916CDC 80240F6C 0200302D */ daddu $a2, $s0, $zero +/* 916CE0 80240F70 080903EF */ j .L80240FBC +/* 916CE4 80240F74 0000102D */ daddu $v0, $zero, $zero +/* 916CE8 80240F78 0260202D */ daddu $a0, $s3, $zero +/* 916CEC 80240F7C 0280282D */ daddu $a1, $s4, $zero +/* 916CF0 80240F80 0C0902DA */ jal func_80240B68_9168D8 +/* 916CF4 80240F84 0200302D */ daddu $a2, $s0, $zero +/* 916CF8 80240F88 0260202D */ daddu $a0, $s3, $zero +/* 916CFC 80240F8C 0280282D */ daddu $a1, $s4, $zero +/* 916D00 80240F90 0C0902F9 */ jal func_80240BE4_916954 +/* 916D04 80240F94 0200302D */ daddu $a2, $s0, $zero +/* 916D08 80240F98 8E630070 */ lw $v1, 0x70($s3) +/* 916D0C 80240F9C 24020034 */ addiu $v0, $zero, 0x34 +/* 916D10 80240FA0 14620006 */ bne $v1, $v0, .L80240FBC +/* 916D14 80240FA4 0000102D */ daddu $v0, $zero, $zero +/* 916D18 80240FA8 0260202D */ daddu $a0, $s3, $zero +/* 916D1C 80240FAC 0280282D */ daddu $a1, $s4, $zero +/* 916D20 80240FB0 0C090313 */ jal func_80240C4C_9169BC +/* 916D24 80240FB4 0200302D */ daddu $a2, $s0, $zero +.L80240FB8: +/* 916D28 80240FB8 0000102D */ daddu $v0, $zero, $zero +.L80240FBC: +/* 916D2C 80240FBC 8FBF0048 */ lw $ra, 0x48($sp) +/* 916D30 80240FC0 8FB50044 */ lw $s5, 0x44($sp) +/* 916D34 80240FC4 8FB40040 */ lw $s4, 0x40($sp) +/* 916D38 80240FC8 8FB3003C */ lw $s3, 0x3c($sp) +/* 916D3C 80240FCC 8FB20038 */ lw $s2, 0x38($sp) +/* 916D40 80240FD0 8FB10034 */ lw $s1, 0x34($sp) +/* 916D44 80240FD4 8FB00030 */ lw $s0, 0x30($sp) +/* 916D48 80240FD8 03E00008 */ jr $ra +/* 916D4C 80240FDC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0.s deleted file mode 100644 index 2890bb5754..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE0 -/* 916D50 80240FE0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 916D54 80240FE4 AFB00010 */ sw $s0, 0x10($sp) -/* 916D58 80240FE8 3C108024 */ lui $s0, 0x8024 -/* 916D5C 80240FEC 26101DA8 */ addiu $s0, $s0, 0x1da8 -/* 916D60 80240FF0 AFBF0018 */ sw $ra, 0x18($sp) -/* 916D64 80240FF4 AFB10014 */ sw $s1, 0x14($sp) -/* 916D68 80240FF8 8E020000 */ lw $v0, ($s0) -/* 916D6C 80240FFC 14400010 */ bnez $v0, .L80241040 -/* 916D70 80241000 0080882D */ daddu $s1, $a0, $zero -/* 916D74 80241004 0C00AB39 */ jal heap_malloc -/* 916D78 80241008 24040040 */ addiu $a0, $zero, 0x40 -/* 916D7C 8024100C AE020000 */ sw $v0, ($s0) -/* 916D80 80241010 0000182D */ daddu $v1, $zero, $zero -/* 916D84 80241014 0040282D */ daddu $a1, $v0, $zero -/* 916D88 80241018 0220202D */ daddu $a0, $s1, $zero -.L8024101C: -/* 916D8C 8024101C 8C820084 */ lw $v0, 0x84($a0) -/* 916D90 80241020 24840004 */ addiu $a0, $a0, 4 -/* 916D94 80241024 24630001 */ addiu $v1, $v1, 1 -/* 916D98 80241028 ACA20000 */ sw $v0, ($a1) -/* 916D9C 8024102C 28620010 */ slti $v0, $v1, 0x10 -/* 916DA0 80241030 1440FFFA */ bnez $v0, .L8024101C -/* 916DA4 80241034 24A50004 */ addiu $a1, $a1, 4 -/* 916DA8 80241038 0809041F */ j .L8024107C -/* 916DAC 8024103C 00000000 */ nop -.L80241040: -/* 916DB0 80241040 0000182D */ daddu $v1, $zero, $zero -/* 916DB4 80241044 0040282D */ daddu $a1, $v0, $zero -/* 916DB8 80241048 0220202D */ daddu $a0, $s1, $zero -.L8024104C: -/* 916DBC 8024104C 8CA20000 */ lw $v0, ($a1) -/* 916DC0 80241050 24A50004 */ addiu $a1, $a1, 4 -/* 916DC4 80241054 24630001 */ addiu $v1, $v1, 1 -/* 916DC8 80241058 AC820084 */ sw $v0, 0x84($a0) -/* 916DCC 8024105C 28620010 */ slti $v0, $v1, 0x10 -/* 916DD0 80241060 1440FFFA */ bnez $v0, .L8024104C -/* 916DD4 80241064 24840004 */ addiu $a0, $a0, 4 -/* 916DD8 80241068 3C108024 */ lui $s0, 0x8024 -/* 916DDC 8024106C 26101DA8 */ addiu $s0, $s0, 0x1da8 -/* 916DE0 80241070 0C00AB4B */ jal heap_free -/* 916DE4 80241074 8E040000 */ lw $a0, ($s0) -/* 916DE8 80241078 AE000000 */ sw $zero, ($s0) -.L8024107C: -/* 916DEC 8024107C 8FBF0018 */ lw $ra, 0x18($sp) -/* 916DF0 80241080 8FB10014 */ lw $s1, 0x14($sp) -/* 916DF4 80241084 8FB00010 */ lw $s0, 0x10($sp) -/* 916DF8 80241088 24020002 */ addiu $v0, $zero, 2 -/* 916DFC 8024108C 03E00008 */ jr $ra -/* 916E00 80241090 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s new file mode 100644 index 0000000000..89235fc56d --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80240FE0_916D50.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FE0_916D50 +/* 916D50 80240FE0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 916D54 80240FE4 AFB00010 */ sw $s0, 0x10($sp) +/* 916D58 80240FE8 3C108024 */ lui $s0, 0x8024 +/* 916D5C 80240FEC 26101DA8 */ addiu $s0, $s0, 0x1da8 +/* 916D60 80240FF0 AFBF0018 */ sw $ra, 0x18($sp) +/* 916D64 80240FF4 AFB10014 */ sw $s1, 0x14($sp) +/* 916D68 80240FF8 8E020000 */ lw $v0, ($s0) +/* 916D6C 80240FFC 14400010 */ bnez $v0, .L80241040 +/* 916D70 80241000 0080882D */ daddu $s1, $a0, $zero +/* 916D74 80241004 0C00AB39 */ jal heap_malloc +/* 916D78 80241008 24040040 */ addiu $a0, $zero, 0x40 +/* 916D7C 8024100C AE020000 */ sw $v0, ($s0) +/* 916D80 80241010 0000182D */ daddu $v1, $zero, $zero +/* 916D84 80241014 0040282D */ daddu $a1, $v0, $zero +/* 916D88 80241018 0220202D */ daddu $a0, $s1, $zero +.L8024101C: +/* 916D8C 8024101C 8C820084 */ lw $v0, 0x84($a0) +/* 916D90 80241020 24840004 */ addiu $a0, $a0, 4 +/* 916D94 80241024 24630001 */ addiu $v1, $v1, 1 +/* 916D98 80241028 ACA20000 */ sw $v0, ($a1) +/* 916D9C 8024102C 28620010 */ slti $v0, $v1, 0x10 +/* 916DA0 80241030 1440FFFA */ bnez $v0, .L8024101C +/* 916DA4 80241034 24A50004 */ addiu $a1, $a1, 4 +/* 916DA8 80241038 0809041F */ j .L8024107C +/* 916DAC 8024103C 00000000 */ nop +.L80241040: +/* 916DB0 80241040 0000182D */ daddu $v1, $zero, $zero +/* 916DB4 80241044 0040282D */ daddu $a1, $v0, $zero +/* 916DB8 80241048 0220202D */ daddu $a0, $s1, $zero +.L8024104C: +/* 916DBC 8024104C 8CA20000 */ lw $v0, ($a1) +/* 916DC0 80241050 24A50004 */ addiu $a1, $a1, 4 +/* 916DC4 80241054 24630001 */ addiu $v1, $v1, 1 +/* 916DC8 80241058 AC820084 */ sw $v0, 0x84($a0) +/* 916DCC 8024105C 28620010 */ slti $v0, $v1, 0x10 +/* 916DD0 80241060 1440FFFA */ bnez $v0, .L8024104C +/* 916DD4 80241064 24840004 */ addiu $a0, $a0, 4 +/* 916DD8 80241068 3C108024 */ lui $s0, 0x8024 +/* 916DDC 8024106C 26101DA8 */ addiu $s0, $s0, 0x1da8 +/* 916DE0 80241070 0C00AB4B */ jal heap_free +/* 916DE4 80241074 8E040000 */ lw $a0, ($s0) +/* 916DE8 80241078 AE000000 */ sw $zero, ($s0) +.L8024107C: +/* 916DEC 8024107C 8FBF0018 */ lw $ra, 0x18($sp) +/* 916DF0 80241080 8FB10014 */ lw $s1, 0x14($sp) +/* 916DF4 80241084 8FB00010 */ lw $s0, 0x10($sp) +/* 916DF8 80241088 24020002 */ addiu $v0, $zero, 2 +/* 916DFC 8024108C 03E00008 */ jr $ra +/* 916E00 80241090 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80241094.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80241094.s deleted file mode 100644 index 76882c5333..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80241094.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241094 -/* 916E04 80241094 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 916E08 80241098 AFB00010 */ sw $s0, 0x10($sp) -/* 916E0C 8024109C 0080802D */ daddu $s0, $a0, $zero -/* 916E10 802410A0 AFBF0018 */ sw $ra, 0x18($sp) -/* 916E14 802410A4 AFB10014 */ sw $s1, 0x14($sp) -/* 916E18 802410A8 8E02000C */ lw $v0, 0xc($s0) -/* 916E1C 802410AC 8C510000 */ lw $s1, ($v0) -/* 916E20 802410B0 0C0B1EAF */ jal get_variable -/* 916E24 802410B4 0220282D */ daddu $a1, $s1, $zero -/* 916E28 802410B8 3C03FFF0 */ lui $v1, 0xfff0 -/* 916E2C 802410BC 3463FFFF */ ori $v1, $v1, 0xffff -/* 916E30 802410C0 0200202D */ daddu $a0, $s0, $zero -/* 916E34 802410C4 00431024 */ and $v0, $v0, $v1 -/* 916E38 802410C8 00021140 */ sll $v0, $v0, 5 -/* 916E3C 802410CC 3C068008 */ lui $a2, %hi(gItemTable) -/* 916E40 802410D0 00C23021 */ addu $a2, $a2, $v0 -/* 916E44 802410D4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 916E48 802410D8 0C0B2026 */ jal set_variable -/* 916E4C 802410DC 0220282D */ daddu $a1, $s1, $zero -/* 916E50 802410E0 8FBF0018 */ lw $ra, 0x18($sp) -/* 916E54 802410E4 8FB10014 */ lw $s1, 0x14($sp) -/* 916E58 802410E8 8FB00010 */ lw $s0, 0x10($sp) -/* 916E5C 802410EC 24020002 */ addiu $v0, $zero, 2 -/* 916E60 802410F0 03E00008 */ jr $ra -/* 916E64 802410F4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 916E68 802410F8 00000000 */ nop -/* 916E6C 802410FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80241094_916E04.s b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80241094_916E04.s new file mode 100644 index 0000000000..05cb4cfffa --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_02/915D70/func_80241094_916E04.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241094_916E04 +/* 916E04 80241094 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 916E08 80241098 AFB00010 */ sw $s0, 0x10($sp) +/* 916E0C 8024109C 0080802D */ daddu $s0, $a0, $zero +/* 916E10 802410A0 AFBF0018 */ sw $ra, 0x18($sp) +/* 916E14 802410A4 AFB10014 */ sw $s1, 0x14($sp) +/* 916E18 802410A8 8E02000C */ lw $v0, 0xc($s0) +/* 916E1C 802410AC 8C510000 */ lw $s1, ($v0) +/* 916E20 802410B0 0C0B1EAF */ jal get_variable +/* 916E24 802410B4 0220282D */ daddu $a1, $s1, $zero +/* 916E28 802410B8 3C03FFF0 */ lui $v1, 0xfff0 +/* 916E2C 802410BC 3463FFFF */ ori $v1, $v1, 0xffff +/* 916E30 802410C0 0200202D */ daddu $a0, $s0, $zero +/* 916E34 802410C4 00431024 */ and $v0, $v0, $v1 +/* 916E38 802410C8 00021140 */ sll $v0, $v0, 5 +/* 916E3C 802410CC 3C068008 */ lui $a2, %hi(gItemTable) +/* 916E40 802410D0 00C23021 */ addu $a2, $a2, $v0 +/* 916E44 802410D4 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) +/* 916E48 802410D8 0C0B2026 */ jal set_variable +/* 916E4C 802410DC 0220282D */ daddu $a1, $s1, $zero +/* 916E50 802410E0 8FBF0018 */ lw $ra, 0x18($sp) +/* 916E54 802410E4 8FB10014 */ lw $s1, 0x14($sp) +/* 916E58 802410E8 8FB00010 */ lw $s0, 0x10($sp) +/* 916E5C 802410EC 24020002 */ addiu $v0, $zero, 2 +/* 916E60 802410F0 03E00008 */ jr $ra +/* 916E64 802410F4 27BD0020 */ addiu $sp, $sp, 0x20 +/* 916E68 802410F8 00000000 */ nop +/* 916E6C 802410FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0.s deleted file mode 100644 index 84a2cfca6e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E0 -/* 919290 802406E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 919294 802406E4 AFB10014 */ sw $s1, 0x14($sp) -/* 919298 802406E8 0080882D */ daddu $s1, $a0, $zero -/* 91929C 802406EC AFBF0018 */ sw $ra, 0x18($sp) -/* 9192A0 802406F0 AFB00010 */ sw $s0, 0x10($sp) -/* 9192A4 802406F4 8E220148 */ lw $v0, 0x148($s1) -/* 9192A8 802406F8 0C00EABB */ jal get_npc_unsafe -/* 9192AC 802406FC 84440008 */ lh $a0, 8($v0) -/* 9192B0 80240700 0040802D */ daddu $s0, $v0, $zero -/* 9192B4 80240704 9602008E */ lhu $v0, 0x8e($s0) -/* 9192B8 80240708 2442FFFF */ addiu $v0, $v0, -1 -/* 9192BC 8024070C A602008E */ sh $v0, 0x8e($s0) -/* 9192C0 80240710 00021400 */ sll $v0, $v0, 0x10 -/* 9192C4 80240714 1C40000F */ bgtz $v0, .L80240754 -/* 9192C8 80240718 00000000 */ nop -/* 9192CC 8024071C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9192D0 80240720 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9192D4 80240724 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9192D8 80240728 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9192DC 8024072C 8C460028 */ lw $a2, 0x28($v0) -/* 9192E0 80240730 0C00A720 */ jal atan2 -/* 9192E4 80240734 8C470030 */ lw $a3, 0x30($v0) -/* 9192E8 80240738 2402001A */ addiu $v0, $zero, 0x1a -/* 9192EC 8024073C A60200A8 */ sh $v0, 0xa8($s0) -/* 9192F0 80240740 24020018 */ addiu $v0, $zero, 0x18 -/* 9192F4 80240744 A60200A6 */ sh $v0, 0xa6($s0) -/* 9192F8 80240748 24020004 */ addiu $v0, $zero, 4 -/* 9192FC 8024074C E600000C */ swc1 $f0, 0xc($s0) -/* 919300 80240750 AE220070 */ sw $v0, 0x70($s1) -.L80240754: -/* 919304 80240754 8FBF0018 */ lw $ra, 0x18($sp) -/* 919308 80240758 8FB10014 */ lw $s1, 0x14($sp) -/* 91930C 8024075C 8FB00010 */ lw $s0, 0x10($sp) -/* 919310 80240760 03E00008 */ jr $ra -/* 919314 80240764 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0_919290.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0_919290.s new file mode 100644 index 0000000000..57e4a45613 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802406E0_919290.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406E0_919290 +/* 919290 802406E0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 919294 802406E4 AFB10014 */ sw $s1, 0x14($sp) +/* 919298 802406E8 0080882D */ daddu $s1, $a0, $zero +/* 91929C 802406EC AFBF0018 */ sw $ra, 0x18($sp) +/* 9192A0 802406F0 AFB00010 */ sw $s0, 0x10($sp) +/* 9192A4 802406F4 8E220148 */ lw $v0, 0x148($s1) +/* 9192A8 802406F8 0C00EABB */ jal get_npc_unsafe +/* 9192AC 802406FC 84440008 */ lh $a0, 8($v0) +/* 9192B0 80240700 0040802D */ daddu $s0, $v0, $zero +/* 9192B4 80240704 9602008E */ lhu $v0, 0x8e($s0) +/* 9192B8 80240708 2442FFFF */ addiu $v0, $v0, -1 +/* 9192BC 8024070C A602008E */ sh $v0, 0x8e($s0) +/* 9192C0 80240710 00021400 */ sll $v0, $v0, 0x10 +/* 9192C4 80240714 1C40000F */ bgtz $v0, .L80240754 +/* 9192C8 80240718 00000000 */ nop +/* 9192CC 8024071C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9192D0 80240720 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9192D4 80240724 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9192D8 80240728 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9192DC 8024072C 8C460028 */ lw $a2, 0x28($v0) +/* 9192E0 80240730 0C00A720 */ jal atan2 +/* 9192E4 80240734 8C470030 */ lw $a3, 0x30($v0) +/* 9192E8 80240738 2402001A */ addiu $v0, $zero, 0x1a +/* 9192EC 8024073C A60200A8 */ sh $v0, 0xa8($s0) +/* 9192F0 80240740 24020018 */ addiu $v0, $zero, 0x18 +/* 9192F4 80240744 A60200A6 */ sh $v0, 0xa6($s0) +/* 9192F8 80240748 24020004 */ addiu $v0, $zero, 4 +/* 9192FC 8024074C E600000C */ swc1 $f0, 0xc($s0) +/* 919300 80240750 AE220070 */ sw $v0, 0x70($s1) +.L80240754: +/* 919304 80240754 8FBF0018 */ lw $ra, 0x18($sp) +/* 919308 80240758 8FB10014 */ lw $s1, 0x14($sp) +/* 91930C 8024075C 8FB00010 */ lw $s0, 0x10($sp) +/* 919310 80240760 03E00008 */ jr $ra +/* 919314 80240764 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768.s deleted file mode 100644 index 2a8f108fa3..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240768 -/* 919318 80240768 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91931C 8024076C AFB10014 */ sw $s1, 0x14($sp) -/* 919320 80240770 0080882D */ daddu $s1, $a0, $zero -/* 919324 80240774 AFBF001C */ sw $ra, 0x1c($sp) -/* 919328 80240778 AFB20018 */ sw $s2, 0x18($sp) -/* 91932C 8024077C AFB00010 */ sw $s0, 0x10($sp) -/* 919330 80240780 8E320148 */ lw $s2, 0x148($s1) -/* 919334 80240784 0C00EABB */ jal get_npc_unsafe -/* 919338 80240788 86440008 */ lh $a0, 8($s2) -/* 91933C 8024078C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 919340 80240790 0C00A67F */ jal rand_int -/* 919344 80240794 0040802D */ daddu $s0, $v0, $zero -/* 919348 80240798 C60C000C */ lwc1 $f12, 0xc($s0) -/* 91934C 8024079C 44820000 */ mtc1 $v0, $f0 -/* 919350 802407A0 00000000 */ nop -/* 919354 802407A4 46800020 */ cvt.s.w $f0, $f0 -/* 919358 802407A8 46006300 */ add.s $f12, $f12, $f0 -/* 91935C 802407AC 3C0142B4 */ lui $at, 0x42b4 -/* 919360 802407B0 44810000 */ mtc1 $at, $f0 -/* 919364 802407B4 0C00A6C9 */ jal clamp_angle -/* 919368 802407B8 46006301 */ sub.s $f12, $f12, $f0 -/* 91936C 802407BC E600000C */ swc1 $f0, 0xc($s0) -/* 919370 802407C0 8E4200CC */ lw $v0, 0xcc($s2) -/* 919374 802407C4 8C420000 */ lw $v0, ($v0) -/* 919378 802407C8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 91937C 802407CC 0C00A67F */ jal rand_int -/* 919380 802407D0 AE020028 */ sw $v0, 0x28($s0) -/* 919384 802407D4 00021FC2 */ srl $v1, $v0, 0x1f -/* 919388 802407D8 00431821 */ addu $v1, $v0, $v1 -/* 91938C 802407DC 00031843 */ sra $v1, $v1, 1 -/* 919390 802407E0 00031840 */ sll $v1, $v1, 1 -/* 919394 802407E4 00431023 */ subu $v0, $v0, $v1 -/* 919398 802407E8 24420002 */ addiu $v0, $v0, 2 -/* 91939C 802407EC AE220074 */ sw $v0, 0x74($s1) -/* 9193A0 802407F0 24020005 */ addiu $v0, $zero, 5 -/* 9193A4 802407F4 AE220070 */ sw $v0, 0x70($s1) -/* 9193A8 802407F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9193AC 802407FC 8FB20018 */ lw $s2, 0x18($sp) -/* 9193B0 80240800 8FB10014 */ lw $s1, 0x14($sp) -/* 9193B4 80240804 8FB00010 */ lw $s0, 0x10($sp) -/* 9193B8 80240808 03E00008 */ jr $ra -/* 9193BC 8024080C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768_919318.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768_919318.s new file mode 100644 index 0000000000..693410b994 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240768_919318.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240768_919318 +/* 919318 80240768 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91931C 8024076C AFB10014 */ sw $s1, 0x14($sp) +/* 919320 80240770 0080882D */ daddu $s1, $a0, $zero +/* 919324 80240774 AFBF001C */ sw $ra, 0x1c($sp) +/* 919328 80240778 AFB20018 */ sw $s2, 0x18($sp) +/* 91932C 8024077C AFB00010 */ sw $s0, 0x10($sp) +/* 919330 80240780 8E320148 */ lw $s2, 0x148($s1) +/* 919334 80240784 0C00EABB */ jal get_npc_unsafe +/* 919338 80240788 86440008 */ lh $a0, 8($s2) +/* 91933C 8024078C 240400B4 */ addiu $a0, $zero, 0xb4 +/* 919340 80240790 0C00A67F */ jal rand_int +/* 919344 80240794 0040802D */ daddu $s0, $v0, $zero +/* 919348 80240798 C60C000C */ lwc1 $f12, 0xc($s0) +/* 91934C 8024079C 44820000 */ mtc1 $v0, $f0 +/* 919350 802407A0 00000000 */ nop +/* 919354 802407A4 46800020 */ cvt.s.w $f0, $f0 +/* 919358 802407A8 46006300 */ add.s $f12, $f12, $f0 +/* 91935C 802407AC 3C0142B4 */ lui $at, 0x42b4 +/* 919360 802407B0 44810000 */ mtc1 $at, $f0 +/* 919364 802407B4 0C00A6C9 */ jal clamp_angle +/* 919368 802407B8 46006301 */ sub.s $f12, $f12, $f0 +/* 91936C 802407BC E600000C */ swc1 $f0, 0xc($s0) +/* 919370 802407C0 8E4200CC */ lw $v0, 0xcc($s2) +/* 919374 802407C4 8C420000 */ lw $v0, ($v0) +/* 919378 802407C8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 91937C 802407CC 0C00A67F */ jal rand_int +/* 919380 802407D0 AE020028 */ sw $v0, 0x28($s0) +/* 919384 802407D4 00021FC2 */ srl $v1, $v0, 0x1f +/* 919388 802407D8 00431821 */ addu $v1, $v0, $v1 +/* 91938C 802407DC 00031843 */ sra $v1, $v1, 1 +/* 919390 802407E0 00031840 */ sll $v1, $v1, 1 +/* 919394 802407E4 00431023 */ subu $v0, $v0, $v1 +/* 919398 802407E8 24420002 */ addiu $v0, $v0, 2 +/* 91939C 802407EC AE220074 */ sw $v0, 0x74($s1) +/* 9193A0 802407F0 24020005 */ addiu $v0, $zero, 5 +/* 9193A4 802407F4 AE220070 */ sw $v0, 0x70($s1) +/* 9193A8 802407F8 8FBF001C */ lw $ra, 0x1c($sp) +/* 9193AC 802407FC 8FB20018 */ lw $s2, 0x18($sp) +/* 9193B0 80240800 8FB10014 */ lw $s1, 0x14($sp) +/* 9193B4 80240804 8FB00010 */ lw $s0, 0x10($sp) +/* 9193B8 80240808 03E00008 */ jr $ra +/* 9193BC 8024080C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4.s deleted file mode 100644 index 2eab176081..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409D4 -/* 919584 802409D4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 919588 802409D8 AFB30024 */ sw $s3, 0x24($sp) -/* 91958C 802409DC 0080982D */ daddu $s3, $a0, $zero -/* 919590 802409E0 AFBF002C */ sw $ra, 0x2c($sp) -/* 919594 802409E4 AFB40028 */ sw $s4, 0x28($sp) -/* 919598 802409E8 AFB20020 */ sw $s2, 0x20($sp) -/* 91959C 802409EC AFB1001C */ sw $s1, 0x1c($sp) -/* 9195A0 802409F0 AFB00018 */ sw $s0, 0x18($sp) -/* 9195A4 802409F4 8E710148 */ lw $s1, 0x148($s3) -/* 9195A8 802409F8 86240008 */ lh $a0, 8($s1) -/* 9195AC 802409FC 0C00EABB */ jal get_npc_unsafe -/* 9195B0 80240A00 00A0A02D */ daddu $s4, $a1, $zero -/* 9195B4 80240A04 0040802D */ daddu $s0, $v0, $zero -/* 9195B8 80240A08 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 9195BC 80240A0C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 9195C0 80240A10 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9195C4 80240A14 8E420000 */ lw $v0, ($s2) -/* 9195C8 80240A18 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9195CC 80240A1C 8C460028 */ lw $a2, 0x28($v0) -/* 9195D0 80240A20 0C00A720 */ jal atan2 -/* 9195D4 80240A24 8C470030 */ lw $a3, 0x30($v0) -/* 9195D8 80240A28 3C025555 */ lui $v0, 0x5555 -/* 9195DC 80240A2C 9603008E */ lhu $v1, 0x8e($s0) -/* 9195E0 80240A30 34425556 */ ori $v0, $v0, 0x5556 -/* 9195E4 80240A34 00031C00 */ sll $v1, $v1, 0x10 -/* 9195E8 80240A38 00032403 */ sra $a0, $v1, 0x10 -/* 9195EC 80240A3C 00820018 */ mult $a0, $v0 -/* 9195F0 80240A40 00031FC3 */ sra $v1, $v1, 0x1f -/* 9195F4 80240A44 00004010 */ mfhi $t0 -/* 9195F8 80240A48 01031823 */ subu $v1, $t0, $v1 -/* 9195FC 80240A4C 00031040 */ sll $v0, $v1, 1 -/* 919600 80240A50 00431021 */ addu $v0, $v0, $v1 -/* 919604 80240A54 00822023 */ subu $a0, $a0, $v0 -/* 919608 80240A58 00042400 */ sll $a0, $a0, 0x10 -/* 91960C 80240A5C 1480000C */ bnez $a0, .L80240A90 -/* 919610 80240A60 E600000C */ swc1 $f0, 0xc($s0) -/* 919614 80240A64 C6020040 */ lwc1 $f2, 0x40($s0) -/* 919618 80240A68 3C014000 */ lui $at, 0x4000 -/* 91961C 80240A6C 44810000 */ mtc1 $at, $f0 -/* 919620 80240A70 AFA00010 */ sw $zero, 0x10($sp) -/* 919624 80240A74 AFA00014 */ sw $zero, 0x14($sp) -/* 919628 80240A78 46001080 */ add.s $f2, $f2, $f0 -/* 91962C 80240A7C 8E06003C */ lw $a2, 0x3c($s0) -/* 919630 80240A80 8E050038 */ lw $a1, 0x38($s0) -/* 919634 80240A84 44071000 */ mfc1 $a3, $f2 -/* 919638 80240A88 0C01BECC */ jal fx_walk_normal -/* 91963C 80240A8C 24040002 */ addiu $a0, $zero, 2 -.L80240A90: -/* 919640 80240A90 9602008E */ lhu $v0, 0x8e($s0) -/* 919644 80240A94 2442FFFF */ addiu $v0, $v0, -1 -/* 919648 80240A98 A602008E */ sh $v0, 0x8e($s0) -/* 91964C 80240A9C 00021400 */ sll $v0, $v0, 0x10 -/* 919650 80240AA0 1C40002C */ bgtz $v0, .L80240B54 -/* 919654 80240AA4 00000000 */ nop -/* 919658 80240AA8 C6000038 */ lwc1 $f0, 0x38($s0) -/* 91965C 80240AAC 4600010D */ trunc.w.s $f4, $f0 -/* 919660 80240AB0 44022000 */ mfc1 $v0, $f4 -/* 919664 80240AB4 00000000 */ nop -/* 919668 80240AB8 A6220010 */ sh $v0, 0x10($s1) -/* 91966C 80240ABC C600003C */ lwc1 $f0, 0x3c($s0) -/* 919670 80240AC0 4600010D */ trunc.w.s $f4, $f0 -/* 919674 80240AC4 44022000 */ mfc1 $v0, $f4 -/* 919678 80240AC8 00000000 */ nop -/* 91967C 80240ACC A6220012 */ sh $v0, 0x12($s1) -/* 919680 80240AD0 C6000040 */ lwc1 $f0, 0x40($s0) -/* 919684 80240AD4 24020001 */ addiu $v0, $zero, 1 -/* 919688 80240AD8 A2220007 */ sb $v0, 7($s1) -/* 91968C 80240ADC 4600010D */ trunc.w.s $f4, $f0 -/* 919690 80240AE0 44022000 */ mfc1 $v0, $f4 -/* 919694 80240AE4 00000000 */ nop -/* 919698 80240AE8 A6220014 */ sh $v0, 0x14($s1) -/* 91969C 80240AEC C6800018 */ lwc1 $f0, 0x18($s4) -/* 9196A0 80240AF0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9196A4 80240AF4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9196A8 80240AF8 8E420000 */ lw $v0, ($s2) -/* 9196AC 80240AFC E6000018 */ swc1 $f0, 0x18($s0) -/* 9196B0 80240B00 8C460028 */ lw $a2, 0x28($v0) -/* 9196B4 80240B04 0C00A7B5 */ jal dist2D -/* 9196B8 80240B08 8C470030 */ lw $a3, 0x30($v0) -/* 9196BC 80240B0C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9196C0 80240B10 46020003 */ div.s $f0, $f0, $f2 -/* 9196C4 80240B14 3C018024 */ lui $at, 0x8024 -/* 9196C8 80240B18 D4222C48 */ ldc1 $f2, 0x2c48($at) -/* 9196CC 80240B1C 46000021 */ cvt.d.s $f0, $f0 -/* 9196D0 80240B20 46220000 */ add.d $f0, $f0, $f2 -/* 9196D4 80240B24 4620010D */ trunc.w.d $f4, $f0 -/* 9196D8 80240B28 44022000 */ mfc1 $v0, $f4 -/* 9196DC 80240B2C 00000000 */ nop -/* 9196E0 80240B30 A602008E */ sh $v0, 0x8e($s0) -/* 9196E4 80240B34 00021400 */ sll $v0, $v0, 0x10 -/* 9196E8 80240B38 00021403 */ sra $v0, $v0, 0x10 -/* 9196EC 80240B3C 2842000F */ slti $v0, $v0, 0xf -/* 9196F0 80240B40 10400002 */ beqz $v0, .L80240B4C -/* 9196F4 80240B44 2402000F */ addiu $v0, $zero, 0xf -/* 9196F8 80240B48 A602008E */ sh $v0, 0x8e($s0) -.L80240B4C: -/* 9196FC 80240B4C 24020016 */ addiu $v0, $zero, 0x16 -/* 919700 80240B50 AE620070 */ sw $v0, 0x70($s3) -.L80240B54: -/* 919704 80240B54 8FBF002C */ lw $ra, 0x2c($sp) -/* 919708 80240B58 8FB40028 */ lw $s4, 0x28($sp) -/* 91970C 80240B5C 8FB30024 */ lw $s3, 0x24($sp) -/* 919710 80240B60 8FB20020 */ lw $s2, 0x20($sp) -/* 919714 80240B64 8FB1001C */ lw $s1, 0x1c($sp) -/* 919718 80240B68 8FB00018 */ lw $s0, 0x18($sp) -/* 91971C 80240B6C 03E00008 */ jr $ra -/* 919720 80240B70 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s new file mode 100644 index 0000000000..2a0ef3c3b1 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_802409D4_919584.s @@ -0,0 +1,111 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409D4_919584 +/* 919584 802409D4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 919588 802409D8 AFB30024 */ sw $s3, 0x24($sp) +/* 91958C 802409DC 0080982D */ daddu $s3, $a0, $zero +/* 919590 802409E0 AFBF002C */ sw $ra, 0x2c($sp) +/* 919594 802409E4 AFB40028 */ sw $s4, 0x28($sp) +/* 919598 802409E8 AFB20020 */ sw $s2, 0x20($sp) +/* 91959C 802409EC AFB1001C */ sw $s1, 0x1c($sp) +/* 9195A0 802409F0 AFB00018 */ sw $s0, 0x18($sp) +/* 9195A4 802409F4 8E710148 */ lw $s1, 0x148($s3) +/* 9195A8 802409F8 86240008 */ lh $a0, 8($s1) +/* 9195AC 802409FC 0C00EABB */ jal get_npc_unsafe +/* 9195B0 80240A00 00A0A02D */ daddu $s4, $a1, $zero +/* 9195B4 80240A04 0040802D */ daddu $s0, $v0, $zero +/* 9195B8 80240A08 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) +/* 9195BC 80240A0C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) +/* 9195C0 80240A10 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9195C4 80240A14 8E420000 */ lw $v0, ($s2) +/* 9195C8 80240A18 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9195CC 80240A1C 8C460028 */ lw $a2, 0x28($v0) +/* 9195D0 80240A20 0C00A720 */ jal atan2 +/* 9195D4 80240A24 8C470030 */ lw $a3, 0x30($v0) +/* 9195D8 80240A28 3C025555 */ lui $v0, 0x5555 +/* 9195DC 80240A2C 9603008E */ lhu $v1, 0x8e($s0) +/* 9195E0 80240A30 34425556 */ ori $v0, $v0, 0x5556 +/* 9195E4 80240A34 00031C00 */ sll $v1, $v1, 0x10 +/* 9195E8 80240A38 00032403 */ sra $a0, $v1, 0x10 +/* 9195EC 80240A3C 00820018 */ mult $a0, $v0 +/* 9195F0 80240A40 00031FC3 */ sra $v1, $v1, 0x1f +/* 9195F4 80240A44 00004010 */ mfhi $t0 +/* 9195F8 80240A48 01031823 */ subu $v1, $t0, $v1 +/* 9195FC 80240A4C 00031040 */ sll $v0, $v1, 1 +/* 919600 80240A50 00431021 */ addu $v0, $v0, $v1 +/* 919604 80240A54 00822023 */ subu $a0, $a0, $v0 +/* 919608 80240A58 00042400 */ sll $a0, $a0, 0x10 +/* 91960C 80240A5C 1480000C */ bnez $a0, .L80240A90 +/* 919610 80240A60 E600000C */ swc1 $f0, 0xc($s0) +/* 919614 80240A64 C6020040 */ lwc1 $f2, 0x40($s0) +/* 919618 80240A68 3C014000 */ lui $at, 0x4000 +/* 91961C 80240A6C 44810000 */ mtc1 $at, $f0 +/* 919620 80240A70 AFA00010 */ sw $zero, 0x10($sp) +/* 919624 80240A74 AFA00014 */ sw $zero, 0x14($sp) +/* 919628 80240A78 46001080 */ add.s $f2, $f2, $f0 +/* 91962C 80240A7C 8E06003C */ lw $a2, 0x3c($s0) +/* 919630 80240A80 8E050038 */ lw $a1, 0x38($s0) +/* 919634 80240A84 44071000 */ mfc1 $a3, $f2 +/* 919638 80240A88 0C01BECC */ jal fx_walk_normal +/* 91963C 80240A8C 24040002 */ addiu $a0, $zero, 2 +.L80240A90: +/* 919640 80240A90 9602008E */ lhu $v0, 0x8e($s0) +/* 919644 80240A94 2442FFFF */ addiu $v0, $v0, -1 +/* 919648 80240A98 A602008E */ sh $v0, 0x8e($s0) +/* 91964C 80240A9C 00021400 */ sll $v0, $v0, 0x10 +/* 919650 80240AA0 1C40002C */ bgtz $v0, .L80240B54 +/* 919654 80240AA4 00000000 */ nop +/* 919658 80240AA8 C6000038 */ lwc1 $f0, 0x38($s0) +/* 91965C 80240AAC 4600010D */ trunc.w.s $f4, $f0 +/* 919660 80240AB0 44022000 */ mfc1 $v0, $f4 +/* 919664 80240AB4 00000000 */ nop +/* 919668 80240AB8 A6220010 */ sh $v0, 0x10($s1) +/* 91966C 80240ABC C600003C */ lwc1 $f0, 0x3c($s0) +/* 919670 80240AC0 4600010D */ trunc.w.s $f4, $f0 +/* 919674 80240AC4 44022000 */ mfc1 $v0, $f4 +/* 919678 80240AC8 00000000 */ nop +/* 91967C 80240ACC A6220012 */ sh $v0, 0x12($s1) +/* 919680 80240AD0 C6000040 */ lwc1 $f0, 0x40($s0) +/* 919684 80240AD4 24020001 */ addiu $v0, $zero, 1 +/* 919688 80240AD8 A2220007 */ sb $v0, 7($s1) +/* 91968C 80240ADC 4600010D */ trunc.w.s $f4, $f0 +/* 919690 80240AE0 44022000 */ mfc1 $v0, $f4 +/* 919694 80240AE4 00000000 */ nop +/* 919698 80240AE8 A6220014 */ sh $v0, 0x14($s1) +/* 91969C 80240AEC C6800018 */ lwc1 $f0, 0x18($s4) +/* 9196A0 80240AF0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9196A4 80240AF4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9196A8 80240AF8 8E420000 */ lw $v0, ($s2) +/* 9196AC 80240AFC E6000018 */ swc1 $f0, 0x18($s0) +/* 9196B0 80240B00 8C460028 */ lw $a2, 0x28($v0) +/* 9196B4 80240B04 0C00A7B5 */ jal dist2D +/* 9196B8 80240B08 8C470030 */ lw $a3, 0x30($v0) +/* 9196BC 80240B0C C6020018 */ lwc1 $f2, 0x18($s0) +/* 9196C0 80240B10 46020003 */ div.s $f0, $f0, $f2 +/* 9196C4 80240B14 3C018024 */ lui $at, 0x8024 +/* 9196C8 80240B18 D4222C48 */ ldc1 $f2, 0x2c48($at) +/* 9196CC 80240B1C 46000021 */ cvt.d.s $f0, $f0 +/* 9196D0 80240B20 46220000 */ add.d $f0, $f0, $f2 +/* 9196D4 80240B24 4620010D */ trunc.w.d $f4, $f0 +/* 9196D8 80240B28 44022000 */ mfc1 $v0, $f4 +/* 9196DC 80240B2C 00000000 */ nop +/* 9196E0 80240B30 A602008E */ sh $v0, 0x8e($s0) +/* 9196E4 80240B34 00021400 */ sll $v0, $v0, 0x10 +/* 9196E8 80240B38 00021403 */ sra $v0, $v0, 0x10 +/* 9196EC 80240B3C 2842000F */ slti $v0, $v0, 0xf +/* 9196F0 80240B40 10400002 */ beqz $v0, .L80240B4C +/* 9196F4 80240B44 2402000F */ addiu $v0, $zero, 0xf +/* 9196F8 80240B48 A602008E */ sh $v0, 0x8e($s0) +.L80240B4C: +/* 9196FC 80240B4C 24020016 */ addiu $v0, $zero, 0x16 +/* 919700 80240B50 AE620070 */ sw $v0, 0x70($s3) +.L80240B54: +/* 919704 80240B54 8FBF002C */ lw $ra, 0x2c($sp) +/* 919708 80240B58 8FB40028 */ lw $s4, 0x28($sp) +/* 91970C 80240B5C 8FB30024 */ lw $s3, 0x24($sp) +/* 919710 80240B60 8FB20020 */ lw $s2, 0x20($sp) +/* 919714 80240B64 8FB1001C */ lw $s1, 0x1c($sp) +/* 919718 80240B68 8FB00018 */ lw $s0, 0x18($sp) +/* 91971C 80240B6C 03E00008 */ jr $ra +/* 919720 80240B70 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74.s deleted file mode 100644 index 8475ed53d2..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B74 -/* 919724 80240B74 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 919728 80240B78 AFB3003C */ sw $s3, 0x3c($sp) -/* 91972C 80240B7C 0080982D */ daddu $s3, $a0, $zero -/* 919730 80240B80 AFBF0040 */ sw $ra, 0x40($sp) -/* 919734 80240B84 AFB20038 */ sw $s2, 0x38($sp) -/* 919738 80240B88 AFB10034 */ sw $s1, 0x34($sp) -/* 91973C 80240B8C AFB00030 */ sw $s0, 0x30($sp) -/* 919740 80240B90 8E720148 */ lw $s2, 0x148($s3) -/* 919744 80240B94 0C00EABB */ jal get_npc_unsafe -/* 919748 80240B98 86440008 */ lh $a0, 8($s2) -/* 91974C 80240B9C 0040802D */ daddu $s0, $v0, $zero -/* 919750 80240BA0 0200202D */ daddu $a0, $s0, $zero -/* 919754 80240BA4 0C00F598 */ jal func_8003D660 -/* 919758 80240BA8 24050001 */ addiu $a1, $zero, 1 -/* 91975C 80240BAC 8E050018 */ lw $a1, 0x18($s0) -/* 919760 80240BB0 8E06000C */ lw $a2, 0xc($s0) -/* 919764 80240BB4 0C00EA95 */ jal npc_move_heading -/* 919768 80240BB8 0200202D */ daddu $a0, $s0, $zero -/* 91976C 80240BBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 919770 80240BC0 C6000040 */ lwc1 $f0, 0x40($s0) -/* 919774 80240BC4 C462001C */ lwc1 $f2, 0x1c($v1) -/* 919778 80240BC8 468010A0 */ cvt.s.w $f2, $f2 -/* 91977C 80240BCC C4640024 */ lwc1 $f4, 0x24($v1) -/* 919780 80240BD0 46802120 */ cvt.s.w $f4, $f4 -/* 919784 80240BD4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 919788 80240BD8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91978C 80240BDC 44051000 */ mfc1 $a1, $f2 -/* 919790 80240BE0 C4400028 */ lwc1 $f0, 0x28($v0) -/* 919794 80240BE4 46800020 */ cvt.s.w $f0, $f0 -/* 919798 80240BE8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91979C 80240BEC 8E4200D0 */ lw $v0, 0xd0($s2) -/* 9197A0 80240BF0 44062000 */ mfc1 $a2, $f4 -/* 9197A4 80240BF4 C440002C */ lwc1 $f0, 0x2c($v0) -/* 9197A8 80240BF8 46800020 */ cvt.s.w $f0, $f0 -/* 9197AC 80240BFC E7A00018 */ swc1 $f0, 0x18($sp) -/* 9197B0 80240C00 8C640030 */ lw $a0, 0x30($v1) -/* 9197B4 80240C04 0C0123F5 */ jal is_point_within_region -/* 9197B8 80240C08 8E070038 */ lw $a3, 0x38($s0) -/* 9197BC 80240C0C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9197C0 80240C10 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9197C4 80240C14 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9197C8 80240C18 3C013F80 */ lui $at, 0x3f80 -/* 9197CC 80240C1C 44813000 */ mtc1 $at, $f6 -/* 9197D0 80240C20 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9197D4 80240C24 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9197D8 80240C28 E7A40028 */ swc1 $f4, 0x28($sp) -/* 9197DC 80240C2C E7A60010 */ swc1 $f6, 0x10($sp) -/* 9197E0 80240C30 C600000C */ lwc1 $f0, 0xc($s0) -/* 9197E4 80240C34 0002882B */ sltu $s1, $zero, $v0 -/* 9197E8 80240C38 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9197EC 80240C3C 860200A8 */ lh $v0, 0xa8($s0) -/* 9197F0 80240C40 27A50020 */ addiu $a1, $sp, 0x20 -/* 9197F4 80240C44 44820000 */ mtc1 $v0, $f0 -/* 9197F8 80240C48 00000000 */ nop -/* 9197FC 80240C4C 46800020 */ cvt.s.w $f0, $f0 -/* 919800 80240C50 E7A00018 */ swc1 $f0, 0x18($sp) -/* 919804 80240C54 860200A6 */ lh $v0, 0xa6($s0) -/* 919808 80240C58 27A60024 */ addiu $a2, $sp, 0x24 -/* 91980C 80240C5C 44820000 */ mtc1 $v0, $f0 -/* 919810 80240C60 00000000 */ nop -/* 919814 80240C64 46800020 */ cvt.s.w $f0, $f0 -/* 919818 80240C68 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 91981C 80240C6C 8E040080 */ lw $a0, 0x80($s0) -/* 919820 80240C70 0C037711 */ jal func_800DDC44 -/* 919824 80240C74 27A70028 */ addiu $a3, $sp, 0x28 -/* 919828 80240C78 54400001 */ bnel $v0, $zero, .L80240C80 -/* 91982C 80240C7C 24110001 */ addiu $s1, $zero, 1 -.L80240C80: -/* 919830 80240C80 9602008E */ lhu $v0, 0x8e($s0) -/* 919834 80240C84 2442FFFF */ addiu $v0, $v0, -1 -/* 919838 80240C88 A602008E */ sh $v0, 0x8e($s0) -/* 91983C 80240C8C 00021400 */ sll $v0, $v0, 0x10 -/* 919840 80240C90 58400001 */ blezl $v0, .L80240C98 -/* 919844 80240C94 24110001 */ addiu $s1, $zero, 1 -.L80240C98: -/* 919848 80240C98 12200003 */ beqz $s1, .L80240CA8 -/* 91984C 80240C9C 24020004 */ addiu $v0, $zero, 4 -/* 919850 80240CA0 AE620070 */ sw $v0, 0x70($s3) -/* 919854 80240CA4 A2400007 */ sb $zero, 7($s2) -.L80240CA8: -/* 919858 80240CA8 8FBF0040 */ lw $ra, 0x40($sp) -/* 91985C 80240CAC 8FB3003C */ lw $s3, 0x3c($sp) -/* 919860 80240CB0 8FB20038 */ lw $s2, 0x38($sp) -/* 919864 80240CB4 8FB10034 */ lw $s1, 0x34($sp) -/* 919868 80240CB8 8FB00030 */ lw $s0, 0x30($sp) -/* 91986C 80240CBC 03E00008 */ jr $ra -/* 919870 80240CC0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s new file mode 100644 index 0000000000..c28d82ce37 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240B74_919724.s @@ -0,0 +1,91 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B74_919724 +/* 919724 80240B74 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 919728 80240B78 AFB3003C */ sw $s3, 0x3c($sp) +/* 91972C 80240B7C 0080982D */ daddu $s3, $a0, $zero +/* 919730 80240B80 AFBF0040 */ sw $ra, 0x40($sp) +/* 919734 80240B84 AFB20038 */ sw $s2, 0x38($sp) +/* 919738 80240B88 AFB10034 */ sw $s1, 0x34($sp) +/* 91973C 80240B8C AFB00030 */ sw $s0, 0x30($sp) +/* 919740 80240B90 8E720148 */ lw $s2, 0x148($s3) +/* 919744 80240B94 0C00EABB */ jal get_npc_unsafe +/* 919748 80240B98 86440008 */ lh $a0, 8($s2) +/* 91974C 80240B9C 0040802D */ daddu $s0, $v0, $zero +/* 919750 80240BA0 0200202D */ daddu $a0, $s0, $zero +/* 919754 80240BA4 0C00F598 */ jal func_8003D660 +/* 919758 80240BA8 24050001 */ addiu $a1, $zero, 1 +/* 91975C 80240BAC 8E050018 */ lw $a1, 0x18($s0) +/* 919760 80240BB0 8E06000C */ lw $a2, 0xc($s0) +/* 919764 80240BB4 0C00EA95 */ jal npc_move_heading +/* 919768 80240BB8 0200202D */ daddu $a0, $s0, $zero +/* 91976C 80240BBC 8E4300D0 */ lw $v1, 0xd0($s2) +/* 919770 80240BC0 C6000040 */ lwc1 $f0, 0x40($s0) +/* 919774 80240BC4 C462001C */ lwc1 $f2, 0x1c($v1) +/* 919778 80240BC8 468010A0 */ cvt.s.w $f2, $f2 +/* 91977C 80240BCC C4640024 */ lwc1 $f4, 0x24($v1) +/* 919780 80240BD0 46802120 */ cvt.s.w $f4, $f4 +/* 919784 80240BD4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 919788 80240BD8 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91978C 80240BDC 44051000 */ mfc1 $a1, $f2 +/* 919790 80240BE0 C4400028 */ lwc1 $f0, 0x28($v0) +/* 919794 80240BE4 46800020 */ cvt.s.w $f0, $f0 +/* 919798 80240BE8 E7A00014 */ swc1 $f0, 0x14($sp) +/* 91979C 80240BEC 8E4200D0 */ lw $v0, 0xd0($s2) +/* 9197A0 80240BF0 44062000 */ mfc1 $a2, $f4 +/* 9197A4 80240BF4 C440002C */ lwc1 $f0, 0x2c($v0) +/* 9197A8 80240BF8 46800020 */ cvt.s.w $f0, $f0 +/* 9197AC 80240BFC E7A00018 */ swc1 $f0, 0x18($sp) +/* 9197B0 80240C00 8C640030 */ lw $a0, 0x30($v1) +/* 9197B4 80240C04 0C0123F5 */ jal is_point_within_region +/* 9197B8 80240C08 8E070038 */ lw $a3, 0x38($s0) +/* 9197BC 80240C0C C6000038 */ lwc1 $f0, 0x38($s0) +/* 9197C0 80240C10 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9197C4 80240C14 C6040040 */ lwc1 $f4, 0x40($s0) +/* 9197C8 80240C18 3C013F80 */ lui $at, 0x3f80 +/* 9197CC 80240C1C 44813000 */ mtc1 $at, $f6 +/* 9197D0 80240C20 E7A00020 */ swc1 $f0, 0x20($sp) +/* 9197D4 80240C24 E7A20024 */ swc1 $f2, 0x24($sp) +/* 9197D8 80240C28 E7A40028 */ swc1 $f4, 0x28($sp) +/* 9197DC 80240C2C E7A60010 */ swc1 $f6, 0x10($sp) +/* 9197E0 80240C30 C600000C */ lwc1 $f0, 0xc($s0) +/* 9197E4 80240C34 0002882B */ sltu $s1, $zero, $v0 +/* 9197E8 80240C38 E7A00014 */ swc1 $f0, 0x14($sp) +/* 9197EC 80240C3C 860200A8 */ lh $v0, 0xa8($s0) +/* 9197F0 80240C40 27A50020 */ addiu $a1, $sp, 0x20 +/* 9197F4 80240C44 44820000 */ mtc1 $v0, $f0 +/* 9197F8 80240C48 00000000 */ nop +/* 9197FC 80240C4C 46800020 */ cvt.s.w $f0, $f0 +/* 919800 80240C50 E7A00018 */ swc1 $f0, 0x18($sp) +/* 919804 80240C54 860200A6 */ lh $v0, 0xa6($s0) +/* 919808 80240C58 27A60024 */ addiu $a2, $sp, 0x24 +/* 91980C 80240C5C 44820000 */ mtc1 $v0, $f0 +/* 919810 80240C60 00000000 */ nop +/* 919814 80240C64 46800020 */ cvt.s.w $f0, $f0 +/* 919818 80240C68 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 91981C 80240C6C 8E040080 */ lw $a0, 0x80($s0) +/* 919820 80240C70 0C037711 */ jal func_800DDC44 +/* 919824 80240C74 27A70028 */ addiu $a3, $sp, 0x28 +/* 919828 80240C78 54400001 */ bnel $v0, $zero, .L80240C80 +/* 91982C 80240C7C 24110001 */ addiu $s1, $zero, 1 +.L80240C80: +/* 919830 80240C80 9602008E */ lhu $v0, 0x8e($s0) +/* 919834 80240C84 2442FFFF */ addiu $v0, $v0, -1 +/* 919838 80240C88 A602008E */ sh $v0, 0x8e($s0) +/* 91983C 80240C8C 00021400 */ sll $v0, $v0, 0x10 +/* 919840 80240C90 58400001 */ blezl $v0, .L80240C98 +/* 919844 80240C94 24110001 */ addiu $s1, $zero, 1 +.L80240C98: +/* 919848 80240C98 12200003 */ beqz $s1, .L80240CA8 +/* 91984C 80240C9C 24020004 */ addiu $v0, $zero, 4 +/* 919850 80240CA0 AE620070 */ sw $v0, 0x70($s3) +/* 919854 80240CA4 A2400007 */ sb $zero, 7($s2) +.L80240CA8: +/* 919858 80240CA8 8FBF0040 */ lw $ra, 0x40($sp) +/* 91985C 80240CAC 8FB3003C */ lw $s3, 0x3c($sp) +/* 919860 80240CB0 8FB20038 */ lw $s2, 0x38($sp) +/* 919864 80240CB4 8FB10034 */ lw $s1, 0x34($sp) +/* 919868 80240CB8 8FB00030 */ lw $s0, 0x30($sp) +/* 91986C 80240CBC 03E00008 */ jr $ra +/* 919870 80240CC0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4.s deleted file mode 100644 index d868b5c8fd..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC4 -/* 919874 80240CC4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 919878 80240CC8 AFB20018 */ sw $s2, 0x18($sp) -/* 91987C 80240CCC 0080902D */ daddu $s2, $a0, $zero -/* 919880 80240CD0 AFBF001C */ sw $ra, 0x1c($sp) -/* 919884 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* 919888 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* 91988C 80240CDC 8E500148 */ lw $s0, 0x148($s2) -/* 919890 80240CE0 86040008 */ lh $a0, 8($s0) -/* 919894 80240CE4 0C00EABB */ jal get_npc_unsafe -/* 919898 80240CE8 00A0882D */ daddu $s1, $a1, $zero -/* 91989C 80240CEC 0040182D */ daddu $v1, $v0, $zero -/* 9198A0 80240CF0 9462008E */ lhu $v0, 0x8e($v1) -/* 9198A4 80240CF4 2442FFFF */ addiu $v0, $v0, -1 -/* 9198A8 80240CF8 A462008E */ sh $v0, 0x8e($v1) -/* 9198AC 80240CFC 00021400 */ sll $v0, $v0, 0x10 -/* 9198B0 80240D00 1C400015 */ bgtz $v0, .L80240D58 -/* 9198B4 80240D04 00000000 */ nop -/* 9198B8 80240D08 8E0200CC */ lw $v0, 0xcc($s0) -/* 9198BC 80240D0C 8C420004 */ lw $v0, 4($v0) -/* 9198C0 80240D10 AC620028 */ sw $v0, 0x28($v1) -/* 9198C4 80240D14 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9198C8 80240D18 8C420014 */ lw $v0, 0x14($v0) -/* 9198CC 80240D1C 04410004 */ bgez $v0, .L80240D30 -/* 9198D0 80240D20 00000000 */ nop -/* 9198D4 80240D24 C6200000 */ lwc1 $f0, ($s1) -/* 9198D8 80240D28 08090354 */ j .L80240D50 -/* 9198DC 80240D2C E4600018 */ swc1 $f0, 0x18($v1) -.L80240D30: -/* 9198E0 80240D30 3C018024 */ lui $at, 0x8024 -/* 9198E4 80240D34 D4222C50 */ ldc1 $f2, 0x2c50($at) -/* 9198E8 80240D38 44820000 */ mtc1 $v0, $f0 -/* 9198EC 80240D3C 00000000 */ nop -/* 9198F0 80240D40 46800021 */ cvt.d.w $f0, $f0 -/* 9198F4 80240D44 46220003 */ div.d $f0, $f0, $f2 -/* 9198F8 80240D48 46200020 */ cvt.s.d $f0, $f0 -/* 9198FC 80240D4C E4600018 */ swc1 $f0, 0x18($v1) -.L80240D50: -/* 919900 80240D50 24020029 */ addiu $v0, $zero, 0x29 -/* 919904 80240D54 AE420070 */ sw $v0, 0x70($s2) -.L80240D58: -/* 919908 80240D58 8FBF001C */ lw $ra, 0x1c($sp) -/* 91990C 80240D5C 8FB20018 */ lw $s2, 0x18($sp) -/* 919910 80240D60 8FB10014 */ lw $s1, 0x14($sp) -/* 919914 80240D64 8FB00010 */ lw $s0, 0x10($sp) -/* 919918 80240D68 03E00008 */ jr $ra -/* 91991C 80240D6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s new file mode 100644 index 0000000000..fd22942e40 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240CC4_919874.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CC4_919874 +/* 919874 80240CC4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 919878 80240CC8 AFB20018 */ sw $s2, 0x18($sp) +/* 91987C 80240CCC 0080902D */ daddu $s2, $a0, $zero +/* 919880 80240CD0 AFBF001C */ sw $ra, 0x1c($sp) +/* 919884 80240CD4 AFB10014 */ sw $s1, 0x14($sp) +/* 919888 80240CD8 AFB00010 */ sw $s0, 0x10($sp) +/* 91988C 80240CDC 8E500148 */ lw $s0, 0x148($s2) +/* 919890 80240CE0 86040008 */ lh $a0, 8($s0) +/* 919894 80240CE4 0C00EABB */ jal get_npc_unsafe +/* 919898 80240CE8 00A0882D */ daddu $s1, $a1, $zero +/* 91989C 80240CEC 0040182D */ daddu $v1, $v0, $zero +/* 9198A0 80240CF0 9462008E */ lhu $v0, 0x8e($v1) +/* 9198A4 80240CF4 2442FFFF */ addiu $v0, $v0, -1 +/* 9198A8 80240CF8 A462008E */ sh $v0, 0x8e($v1) +/* 9198AC 80240CFC 00021400 */ sll $v0, $v0, 0x10 +/* 9198B0 80240D00 1C400015 */ bgtz $v0, .L80240D58 +/* 9198B4 80240D04 00000000 */ nop +/* 9198B8 80240D08 8E0200CC */ lw $v0, 0xcc($s0) +/* 9198BC 80240D0C 8C420004 */ lw $v0, 4($v0) +/* 9198C0 80240D10 AC620028 */ sw $v0, 0x28($v1) +/* 9198C4 80240D14 8E0200D0 */ lw $v0, 0xd0($s0) +/* 9198C8 80240D18 8C420014 */ lw $v0, 0x14($v0) +/* 9198CC 80240D1C 04410004 */ bgez $v0, .L80240D30 +/* 9198D0 80240D20 00000000 */ nop +/* 9198D4 80240D24 C6200000 */ lwc1 $f0, ($s1) +/* 9198D8 80240D28 08090354 */ j .L80240D50 +/* 9198DC 80240D2C E4600018 */ swc1 $f0, 0x18($v1) +.L80240D30: +/* 9198E0 80240D30 3C018024 */ lui $at, 0x8024 +/* 9198E4 80240D34 D4222C50 */ ldc1 $f2, 0x2c50($at) +/* 9198E8 80240D38 44820000 */ mtc1 $v0, $f0 +/* 9198EC 80240D3C 00000000 */ nop +/* 9198F0 80240D40 46800021 */ cvt.d.w $f0, $f0 +/* 9198F4 80240D44 46220003 */ div.d $f0, $f0, $f2 +/* 9198F8 80240D48 46200020 */ cvt.s.d $f0, $f0 +/* 9198FC 80240D4C E4600018 */ swc1 $f0, 0x18($v1) +.L80240D50: +/* 919900 80240D50 24020029 */ addiu $v0, $zero, 0x29 +/* 919904 80240D54 AE420070 */ sw $v0, 0x70($s2) +.L80240D58: +/* 919908 80240D58 8FBF001C */ lw $ra, 0x1c($sp) +/* 91990C 80240D5C 8FB20018 */ lw $s2, 0x18($sp) +/* 919910 80240D60 8FB10014 */ lw $s1, 0x14($sp) +/* 919914 80240D64 8FB00010 */ lw $s0, 0x10($sp) +/* 919918 80240D68 03E00008 */ jr $ra +/* 91991C 80240D6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8.s deleted file mode 100644 index 2eab50bf21..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EA8 -/* 919A58 80240EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 919A5C 80240EAC AFB10014 */ sw $s1, 0x14($sp) -/* 919A60 80240EB0 0080882D */ daddu $s1, $a0, $zero -/* 919A64 80240EB4 AFBF0018 */ sw $ra, 0x18($sp) -/* 919A68 80240EB8 AFB00010 */ sw $s0, 0x10($sp) -/* 919A6C 80240EBC 8E300148 */ lw $s0, 0x148($s1) -/* 919A70 80240EC0 0C00EABB */ jal get_npc_unsafe -/* 919A74 80240EC4 86040008 */ lh $a0, 8($s0) -/* 919A78 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* 919A7C 80240ECC 8482008E */ lh $v0, 0x8e($a0) -/* 919A80 80240ED0 9483008E */ lhu $v1, 0x8e($a0) -/* 919A84 80240ED4 18400002 */ blez $v0, .L80240EE0 -/* 919A88 80240ED8 2462FFFF */ addiu $v0, $v1, -1 -/* 919A8C 80240EDC A482008E */ sh $v0, 0x8e($a0) -.L80240EE0: -/* 919A90 80240EE0 8482008C */ lh $v0, 0x8c($a0) -/* 919A94 80240EE4 1440000A */ bnez $v0, .L80240F10 -/* 919A98 80240EE8 00000000 */ nop -/* 919A9C 80240EEC 8482008E */ lh $v0, 0x8e($a0) -/* 919AA0 80240EF0 1C400007 */ bgtz $v0, .L80240F10 -/* 919AA4 80240EF4 24020008 */ addiu $v0, $zero, 8 -/* 919AA8 80240EF8 A482008E */ sh $v0, 0x8e($a0) -/* 919AAC 80240EFC 8E0200CC */ lw $v0, 0xcc($s0) -/* 919AB0 80240F00 8C42002C */ lw $v0, 0x2c($v0) -/* 919AB4 80240F04 AC820028 */ sw $v0, 0x28($a0) -/* 919AB8 80240F08 24020033 */ addiu $v0, $zero, 0x33 -/* 919ABC 80240F0C AE220070 */ sw $v0, 0x70($s1) -.L80240F10: -/* 919AC0 80240F10 8FBF0018 */ lw $ra, 0x18($sp) -/* 919AC4 80240F14 8FB10014 */ lw $s1, 0x14($sp) -/* 919AC8 80240F18 8FB00010 */ lw $s0, 0x10($sp) -/* 919ACC 80240F1C 03E00008 */ jr $ra -/* 919AD0 80240F20 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8_919A58.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8_919A58.s new file mode 100644 index 0000000000..7401a0a8be --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240EA8_919A58.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EA8_919A58 +/* 919A58 80240EA8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 919A5C 80240EAC AFB10014 */ sw $s1, 0x14($sp) +/* 919A60 80240EB0 0080882D */ daddu $s1, $a0, $zero +/* 919A64 80240EB4 AFBF0018 */ sw $ra, 0x18($sp) +/* 919A68 80240EB8 AFB00010 */ sw $s0, 0x10($sp) +/* 919A6C 80240EBC 8E300148 */ lw $s0, 0x148($s1) +/* 919A70 80240EC0 0C00EABB */ jal get_npc_unsafe +/* 919A74 80240EC4 86040008 */ lh $a0, 8($s0) +/* 919A78 80240EC8 0040202D */ daddu $a0, $v0, $zero +/* 919A7C 80240ECC 8482008E */ lh $v0, 0x8e($a0) +/* 919A80 80240ED0 9483008E */ lhu $v1, 0x8e($a0) +/* 919A84 80240ED4 18400002 */ blez $v0, .L80240EE0 +/* 919A88 80240ED8 2462FFFF */ addiu $v0, $v1, -1 +/* 919A8C 80240EDC A482008E */ sh $v0, 0x8e($a0) +.L80240EE0: +/* 919A90 80240EE0 8482008C */ lh $v0, 0x8c($a0) +/* 919A94 80240EE4 1440000A */ bnez $v0, .L80240F10 +/* 919A98 80240EE8 00000000 */ nop +/* 919A9C 80240EEC 8482008E */ lh $v0, 0x8e($a0) +/* 919AA0 80240EF0 1C400007 */ bgtz $v0, .L80240F10 +/* 919AA4 80240EF4 24020008 */ addiu $v0, $zero, 8 +/* 919AA8 80240EF8 A482008E */ sh $v0, 0x8e($a0) +/* 919AAC 80240EFC 8E0200CC */ lw $v0, 0xcc($s0) +/* 919AB0 80240F00 8C42002C */ lw $v0, 0x2c($v0) +/* 919AB4 80240F04 AC820028 */ sw $v0, 0x28($a0) +/* 919AB8 80240F08 24020033 */ addiu $v0, $zero, 0x33 +/* 919ABC 80240F0C AE220070 */ sw $v0, 0x70($s1) +.L80240F10: +/* 919AC0 80240F10 8FBF0018 */ lw $ra, 0x18($sp) +/* 919AC4 80240F14 8FB10014 */ lw $s1, 0x14($sp) +/* 919AC8 80240F18 8FB00010 */ lw $s0, 0x10($sp) +/* 919ACC 80240F1C 03E00008 */ jr $ra +/* 919AD0 80240F20 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F24.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F24.s deleted file mode 100644 index 9eb0fb39f6..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F24.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F24 -/* 919AD4 80240F24 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 919AD8 80240F28 AFB10014 */ sw $s1, 0x14($sp) -/* 919ADC 80240F2C 0080882D */ daddu $s1, $a0, $zero -/* 919AE0 80240F30 AFBF0018 */ sw $ra, 0x18($sp) -/* 919AE4 80240F34 AFB00010 */ sw $s0, 0x10($sp) -/* 919AE8 80240F38 8E300148 */ lw $s0, 0x148($s1) -/* 919AEC 80240F3C 0C00EABB */ jal get_npc_unsafe -/* 919AF0 80240F40 86040008 */ lh $a0, 8($s0) -/* 919AF4 80240F44 0040182D */ daddu $v1, $v0, $zero -/* 919AF8 80240F48 9462008E */ lhu $v0, 0x8e($v1) -/* 919AFC 80240F4C 2442FFFF */ addiu $v0, $v0, -1 -/* 919B00 80240F50 A462008E */ sh $v0, 0x8e($v1) -/* 919B04 80240F54 00021400 */ sll $v0, $v0, 0x10 -/* 919B08 80240F58 1C400007 */ bgtz $v0, .L80240F78 -/* 919B0C 80240F5C 24020008 */ addiu $v0, $zero, 8 -/* 919B10 80240F60 A462008E */ sh $v0, 0x8e($v1) -/* 919B14 80240F64 8E0200CC */ lw $v0, 0xcc($s0) -/* 919B18 80240F68 8C420038 */ lw $v0, 0x38($v0) -/* 919B1C 80240F6C AC620028 */ sw $v0, 0x28($v1) -/* 919B20 80240F70 24020034 */ addiu $v0, $zero, 0x34 -/* 919B24 80240F74 AE220070 */ sw $v0, 0x70($s1) -.L80240F78: -/* 919B28 80240F78 8FBF0018 */ lw $ra, 0x18($sp) -/* 919B2C 80240F7C 8FB10014 */ lw $s1, 0x14($sp) -/* 919B30 80240F80 8FB00010 */ lw $s0, 0x10($sp) -/* 919B34 80240F84 03E00008 */ jr $ra -/* 919B38 80240F88 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F24_919AD4.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F24_919AD4.s new file mode 100644 index 0000000000..8b17c285c5 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F24_919AD4.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F24_919AD4 +/* 919AD4 80240F24 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 919AD8 80240F28 AFB10014 */ sw $s1, 0x14($sp) +/* 919ADC 80240F2C 0080882D */ daddu $s1, $a0, $zero +/* 919AE0 80240F30 AFBF0018 */ sw $ra, 0x18($sp) +/* 919AE4 80240F34 AFB00010 */ sw $s0, 0x10($sp) +/* 919AE8 80240F38 8E300148 */ lw $s0, 0x148($s1) +/* 919AEC 80240F3C 0C00EABB */ jal get_npc_unsafe +/* 919AF0 80240F40 86040008 */ lh $a0, 8($s0) +/* 919AF4 80240F44 0040182D */ daddu $v1, $v0, $zero +/* 919AF8 80240F48 9462008E */ lhu $v0, 0x8e($v1) +/* 919AFC 80240F4C 2442FFFF */ addiu $v0, $v0, -1 +/* 919B00 80240F50 A462008E */ sh $v0, 0x8e($v1) +/* 919B04 80240F54 00021400 */ sll $v0, $v0, 0x10 +/* 919B08 80240F58 1C400007 */ bgtz $v0, .L80240F78 +/* 919B0C 80240F5C 24020008 */ addiu $v0, $zero, 8 +/* 919B10 80240F60 A462008E */ sh $v0, 0x8e($v1) +/* 919B14 80240F64 8E0200CC */ lw $v0, 0xcc($s0) +/* 919B18 80240F68 8C420038 */ lw $v0, 0x38($v0) +/* 919B1C 80240F6C AC620028 */ sw $v0, 0x28($v1) +/* 919B20 80240F70 24020034 */ addiu $v0, $zero, 0x34 +/* 919B24 80240F74 AE220070 */ sw $v0, 0x70($s1) +.L80240F78: +/* 919B28 80240F78 8FBF0018 */ lw $ra, 0x18($sp) +/* 919B2C 80240F7C 8FB10014 */ lw $s1, 0x14($sp) +/* 919B30 80240F80 8FB00010 */ lw $s0, 0x10($sp) +/* 919B34 80240F84 03E00008 */ jr $ra +/* 919B38 80240F88 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C.s deleted file mode 100644 index 4198f84664..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F8C -/* 919B3C 80240F8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 919B40 80240F90 AFB00010 */ sw $s0, 0x10($sp) -/* 919B44 80240F94 0080802D */ daddu $s0, $a0, $zero -/* 919B48 80240F98 AFBF0014 */ sw $ra, 0x14($sp) -/* 919B4C 80240F9C 8E020148 */ lw $v0, 0x148($s0) -/* 919B50 80240FA0 0C00EABB */ jal get_npc_unsafe -/* 919B54 80240FA4 84440008 */ lh $a0, 8($v0) -/* 919B58 80240FA8 9443008E */ lhu $v1, 0x8e($v0) -/* 919B5C 80240FAC 2463FFFF */ addiu $v1, $v1, -1 -/* 919B60 80240FB0 A443008E */ sh $v1, 0x8e($v0) -/* 919B64 80240FB4 00031C00 */ sll $v1, $v1, 0x10 -/* 919B68 80240FB8 58600001 */ blezl $v1, .L80240FC0 -/* 919B6C 80240FBC AE000070 */ sw $zero, 0x70($s0) -.L80240FC0: -/* 919B70 80240FC0 8FBF0014 */ lw $ra, 0x14($sp) -/* 919B74 80240FC4 8FB00010 */ lw $s0, 0x10($sp) -/* 919B78 80240FC8 03E00008 */ jr $ra -/* 919B7C 80240FCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s new file mode 100644 index 0000000000..72fabeed68 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240F8C_919B3C.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F8C_919B3C +/* 919B3C 80240F8C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 919B40 80240F90 AFB00010 */ sw $s0, 0x10($sp) +/* 919B44 80240F94 0080802D */ daddu $s0, $a0, $zero +/* 919B48 80240F98 AFBF0014 */ sw $ra, 0x14($sp) +/* 919B4C 80240F9C 8E020148 */ lw $v0, 0x148($s0) +/* 919B50 80240FA0 0C00EABB */ jal get_npc_unsafe +/* 919B54 80240FA4 84440008 */ lh $a0, 8($v0) +/* 919B58 80240FA8 9443008E */ lhu $v1, 0x8e($v0) +/* 919B5C 80240FAC 2463FFFF */ addiu $v1, $v1, -1 +/* 919B60 80240FB0 A443008E */ sh $v1, 0x8e($v0) +/* 919B64 80240FB4 00031C00 */ sll $v1, $v1, 0x10 +/* 919B68 80240FB8 58600001 */ blezl $v1, .L80240FC0 +/* 919B6C 80240FBC AE000070 */ sw $zero, 0x70($s0) +.L80240FC0: +/* 919B70 80240FC0 8FBF0014 */ lw $ra, 0x14($sp) +/* 919B74 80240FC4 8FB00010 */ lw $s0, 0x10($sp) +/* 919B78 80240FC8 03E00008 */ jr $ra +/* 919B7C 80240FCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0.s deleted file mode 100644 index 2652961fc9..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD0 -/* 919B80 80240FD0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 919B84 80240FD4 AFB3003C */ sw $s3, 0x3c($sp) -/* 919B88 80240FD8 0080982D */ daddu $s3, $a0, $zero -/* 919B8C 80240FDC AFBF0048 */ sw $ra, 0x48($sp) -/* 919B90 80240FE0 AFB50044 */ sw $s5, 0x44($sp) -/* 919B94 80240FE4 AFB40040 */ sw $s4, 0x40($sp) -/* 919B98 80240FE8 AFB20038 */ sw $s2, 0x38($sp) -/* 919B9C 80240FEC AFB10034 */ sw $s1, 0x34($sp) -/* 919BA0 80240FF0 AFB00030 */ sw $s0, 0x30($sp) -/* 919BA4 80240FF4 8E720148 */ lw $s2, 0x148($s3) -/* 919BA8 80240FF8 86440008 */ lh $a0, 8($s2) -/* 919BAC 80240FFC 0C00EABB */ jal get_npc_unsafe -/* 919BB0 80241000 00A0882D */ daddu $s1, $a1, $zero -/* 919BB4 80241004 0260202D */ daddu $a0, $s3, $zero -/* 919BB8 80241008 8E70000C */ lw $s0, 0xc($s3) -/* 919BBC 8024100C 0040A82D */ daddu $s5, $v0, $zero -/* 919BC0 80241010 8E050000 */ lw $a1, ($s0) -/* 919BC4 80241014 0C0B1EAF */ jal get_variable -/* 919BC8 80241018 26100004 */ addiu $s0, $s0, 4 -/* 919BCC 8024101C 0260202D */ daddu $a0, $s3, $zero -/* 919BD0 80241020 8E050000 */ lw $a1, ($s0) -/* 919BD4 80241024 0C0B1EAF */ jal get_variable -/* 919BD8 80241028 0040A02D */ daddu $s4, $v0, $zero -/* 919BDC 8024102C AE420094 */ sw $v0, 0x94($s2) -/* 919BE0 80241030 AFA00010 */ sw $zero, 0x10($sp) -/* 919BE4 80241034 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919BE8 80241038 8C420030 */ lw $v0, 0x30($v0) -/* 919BEC 8024103C AFA20014 */ sw $v0, 0x14($sp) -/* 919BF0 80241040 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919BF4 80241044 8C42001C */ lw $v0, 0x1c($v0) -/* 919BF8 80241048 AFA20018 */ sw $v0, 0x18($sp) -/* 919BFC 8024104C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919C00 80241050 8C420024 */ lw $v0, 0x24($v0) -/* 919C04 80241054 AFA2001C */ sw $v0, 0x1c($sp) -/* 919C08 80241058 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919C0C 8024105C 8C420028 */ lw $v0, 0x28($v0) -/* 919C10 80241060 AFA20020 */ sw $v0, 0x20($sp) -/* 919C14 80241064 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919C18 80241068 3C014220 */ lui $at, 0x4220 -/* 919C1C 8024106C 44810000 */ mtc1 $at, $f0 -/* 919C20 80241070 8C42002C */ lw $v0, 0x2c($v0) -/* 919C24 80241074 27B00010 */ addiu $s0, $sp, 0x10 -/* 919C28 80241078 E7A00028 */ swc1 $f0, 0x28($sp) -/* 919C2C 8024107C A7A0002C */ sh $zero, 0x2c($sp) -/* 919C30 80241080 12200012 */ beqz $s1, .L802410CC -/* 919C34 80241084 AFA20024 */ sw $v0, 0x24($sp) -/* 919C38 80241088 AE600070 */ sw $zero, 0x70($s3) -/* 919C3C 8024108C 8EA30000 */ lw $v1, ($s5) -/* 919C40 80241090 2402F7FF */ addiu $v0, $zero, -0x801 -/* 919C44 80241094 A6A0008E */ sh $zero, 0x8e($s5) -/* 919C48 80241098 00621824 */ and $v1, $v1, $v0 -/* 919C4C 8024109C AEA30000 */ sw $v1, ($s5) -/* 919C50 802410A0 8E4200D0 */ lw $v0, 0xd0($s2) -/* 919C54 802410A4 8C420034 */ lw $v0, 0x34($v0) -/* 919C58 802410A8 54400005 */ bnel $v0, $zero, .L802410C0 -/* 919C5C 802410AC 2402FDFF */ addiu $v0, $zero, -0x201 -/* 919C60 802410B0 34620200 */ ori $v0, $v1, 0x200 -/* 919C64 802410B4 2403FFF7 */ addiu $v1, $zero, -9 -/* 919C68 802410B8 08090432 */ j .L802410C8 -/* 919C6C 802410BC 00431024 */ and $v0, $v0, $v1 -.L802410C0: -/* 919C70 802410C0 00621024 */ and $v0, $v1, $v0 -/* 919C74 802410C4 34420008 */ ori $v0, $v0, 8 -.L802410C8: -/* 919C78 802410C8 AEA20000 */ sw $v0, ($s5) -.L802410CC: -/* 919C7C 802410CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 919C80 802410D0 30620004 */ andi $v0, $v1, 4 -/* 919C84 802410D4 10400007 */ beqz $v0, .L802410F4 -/* 919C88 802410D8 00000000 */ nop -/* 919C8C 802410DC 824200B4 */ lb $v0, 0xb4($s2) -/* 919C90 802410E0 14400086 */ bnez $v0, .L802412FC -/* 919C94 802410E4 0000102D */ daddu $v0, $zero, $zero -/* 919C98 802410E8 2402FFFB */ addiu $v0, $zero, -5 -/* 919C9C 802410EC 00621024 */ and $v0, $v1, $v0 -/* 919CA0 802410F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802410F4: -/* 919CA4 802410F4 8E620070 */ lw $v0, 0x70($s3) -/* 919CA8 802410F8 2442FFF4 */ addiu $v0, $v0, -0xc -/* 919CAC 802410FC 2C420003 */ sltiu $v0, $v0, 3 -/* 919CB0 80241100 10400007 */ beqz $v0, .L80241120 -/* 919CB4 80241104 0260202D */ daddu $a0, $s3, $zero -/* 919CB8 80241108 0280282D */ daddu $a1, $s4, $zero -/* 919CBC 8024110C 0C0900D0 */ jal func_80240340 -/* 919CC0 80241110 0200302D */ daddu $a2, $s0, $zero -/* 919CC4 80241114 10400002 */ beqz $v0, .L80241120 -/* 919CC8 80241118 24020014 */ addiu $v0, $zero, 0x14 -/* 919CCC 8024111C AE620070 */ sw $v0, 0x70($s3) -.L80241120: -/* 919CD0 80241120 8E630070 */ lw $v1, 0x70($s3) -/* 919CD4 80241124 2C620035 */ sltiu $v0, $v1, 0x35 -/* 919CD8 80241128 10400073 */ beqz $v0, .L802412F8 -/* 919CDC 8024112C 00031080 */ sll $v0, $v1, 2 -/* 919CE0 80241130 3C018024 */ lui $at, 0x8024 -/* 919CE4 80241134 00220821 */ addu $at, $at, $v0 -/* 919CE8 80241138 8C222C58 */ lw $v0, 0x2c58($at) -/* 919CEC 8024113C 00400008 */ jr $v0 -/* 919CF0 80241140 00000000 */ nop -/* 919CF4 80241144 0260202D */ daddu $a0, $s3, $zero -/* 919CF8 80241148 0280282D */ daddu $a1, $s4, $zero -/* 919CFC 8024114C 0C090128 */ jal func_802404A0 -/* 919D00 80241150 0200302D */ daddu $a2, $s0, $zero -/* 919D04 80241154 0260202D */ daddu $a0, $s3, $zero -/* 919D08 80241158 0280282D */ daddu $a1, $s4, $zero -/* 919D0C 8024115C 0C090145 */ jal func_80240514_9190C4 -/* 919D10 80241160 0200302D */ daddu $a2, $s0, $zero -/* 919D14 80241164 8E630070 */ lw $v1, 0x70($s3) -/* 919D18 80241168 24020002 */ addiu $v0, $zero, 2 -/* 919D1C 8024116C 14620063 */ bne $v1, $v0, .L802412FC -/* 919D20 80241170 0000102D */ daddu $v0, $zero, $zero -/* 919D24 80241174 0260202D */ daddu $a0, $s3, $zero -/* 919D28 80241178 0280282D */ daddu $a1, $s4, $zero -/* 919D2C 8024117C 0C090191 */ jal func_80240644 -/* 919D30 80241180 0200302D */ daddu $a2, $s0, $zero -/* 919D34 80241184 8E630070 */ lw $v1, 0x70($s3) -/* 919D38 80241188 24020003 */ addiu $v0, $zero, 3 -/* 919D3C 8024118C 1462005B */ bne $v1, $v0, .L802412FC -/* 919D40 80241190 0000102D */ daddu $v0, $zero, $zero -/* 919D44 80241194 0260202D */ daddu $a0, $s3, $zero -/* 919D48 80241198 0280282D */ daddu $a1, $s4, $zero -/* 919D4C 8024119C 0C0901B8 */ jal func_802406E0 -/* 919D50 802411A0 0200302D */ daddu $a2, $s0, $zero -/* 919D54 802411A4 8E630070 */ lw $v1, 0x70($s3) -/* 919D58 802411A8 24020004 */ addiu $v0, $zero, 4 -/* 919D5C 802411AC 14620053 */ bne $v1, $v0, .L802412FC -/* 919D60 802411B0 0000102D */ daddu $v0, $zero, $zero -/* 919D64 802411B4 0260202D */ daddu $a0, $s3, $zero -/* 919D68 802411B8 0280282D */ daddu $a1, $s4, $zero -/* 919D6C 802411BC 0C0901DA */ jal func_80240768 -/* 919D70 802411C0 0200302D */ daddu $a2, $s0, $zero -/* 919D74 802411C4 0260202D */ daddu $a0, $s3, $zero -/* 919D78 802411C8 0280282D */ daddu $a1, $s4, $zero -/* 919D7C 802411CC 0C090204 */ jal func_80240810 -/* 919D80 802411D0 0200302D */ daddu $a2, $s0, $zero -/* 919D84 802411D4 080904BF */ j .L802412FC -/* 919D88 802411D8 0000102D */ daddu $v0, $zero, $zero -/* 919D8C 802411DC 0260202D */ daddu $a0, $s3, $zero -/* 919D90 802411E0 0280282D */ daddu $a1, $s4, $zero -/* 919D94 802411E4 0C0127DF */ jal func_80049F7C -/* 919D98 802411E8 0200302D */ daddu $a2, $s0, $zero -/* 919D9C 802411EC 8E630070 */ lw $v1, 0x70($s3) -/* 919DA0 802411F0 2402000D */ addiu $v0, $zero, 0xd -/* 919DA4 802411F4 14620041 */ bne $v1, $v0, .L802412FC -/* 919DA8 802411F8 0000102D */ daddu $v0, $zero, $zero -/* 919DAC 802411FC 0260202D */ daddu $a0, $s3, $zero -/* 919DB0 80241200 0280282D */ daddu $a1, $s4, $zero -/* 919DB4 80241204 0C012849 */ jal func_8004A124 -/* 919DB8 80241208 0200302D */ daddu $a2, $s0, $zero -/* 919DBC 8024120C 8E630070 */ lw $v1, 0x70($s3) -/* 919DC0 80241210 2402000E */ addiu $v0, $zero, 0xe -/* 919DC4 80241214 14620039 */ bne $v1, $v0, .L802412FC -/* 919DC8 80241218 0000102D */ daddu $v0, $zero, $zero -/* 919DCC 8024121C 96A2008E */ lhu $v0, 0x8e($s5) -/* 919DD0 80241220 2442FFFF */ addiu $v0, $v0, -1 -/* 919DD4 80241224 A6A2008E */ sh $v0, 0x8e($s5) -/* 919DD8 80241228 00021400 */ sll $v0, $v0, 0x10 -/* 919DDC 8024122C 14400033 */ bnez $v0, .L802412FC -/* 919DE0 80241230 0000102D */ daddu $v0, $zero, $zero -/* 919DE4 80241234 24020028 */ addiu $v0, $zero, 0x28 -/* 919DE8 80241238 080904BE */ j .L802412F8 -/* 919DEC 8024123C AE620070 */ sw $v0, 0x70($s3) -/* 919DF0 80241240 0260202D */ daddu $a0, $s3, $zero -/* 919DF4 80241244 0280282D */ daddu $a1, $s4, $zero -/* 919DF8 80241248 0C090261 */ jal func_80240984 -/* 919DFC 8024124C 0200302D */ daddu $a2, $s0, $zero -/* 919E00 80241250 0260202D */ daddu $a0, $s3, $zero -/* 919E04 80241254 0280282D */ daddu $a1, $s4, $zero -/* 919E08 80241258 0C090275 */ jal func_802409D4 -/* 919E0C 8024125C 0200302D */ daddu $a2, $s0, $zero -/* 919E10 80241260 080904BF */ j .L802412FC -/* 919E14 80241264 0000102D */ daddu $v0, $zero, $zero -/* 919E18 80241268 0260202D */ daddu $a0, $s3, $zero -/* 919E1C 8024126C 0280282D */ daddu $a1, $s4, $zero -/* 919E20 80241270 0C0902DD */ jal func_80240B74 -/* 919E24 80241274 0200302D */ daddu $a2, $s0, $zero -/* 919E28 80241278 080904BF */ j .L802412FC -/* 919E2C 8024127C 0000102D */ daddu $v0, $zero, $zero -/* 919E30 80241280 0260202D */ daddu $a0, $s3, $zero -/* 919E34 80241284 0280282D */ daddu $a1, $s4, $zero -/* 919E38 80241288 0C090331 */ jal func_80240CC4 -/* 919E3C 8024128C 0200302D */ daddu $a2, $s0, $zero -/* 919E40 80241290 8E630070 */ lw $v1, 0x70($s3) -/* 919E44 80241294 24020029 */ addiu $v0, $zero, 0x29 -/* 919E48 80241298 14620018 */ bne $v1, $v0, .L802412FC -/* 919E4C 8024129C 0000102D */ daddu $v0, $zero, $zero -/* 919E50 802412A0 0260202D */ daddu $a0, $s3, $zero -/* 919E54 802412A4 0280282D */ daddu $a1, $s4, $zero -/* 919E58 802412A8 0C09035C */ jal func_80240D70 -/* 919E5C 802412AC 0200302D */ daddu $a2, $s0, $zero -/* 919E60 802412B0 080904BF */ j .L802412FC -/* 919E64 802412B4 0000102D */ daddu $v0, $zero, $zero -/* 919E68 802412B8 0260202D */ daddu $a0, $s3, $zero -/* 919E6C 802412BC 0280282D */ daddu $a1, $s4, $zero -/* 919E70 802412C0 0C0903AA */ jal func_80240EA8 -/* 919E74 802412C4 0200302D */ daddu $a2, $s0, $zero -/* 919E78 802412C8 0260202D */ daddu $a0, $s3, $zero -/* 919E7C 802412CC 0280282D */ daddu $a1, $s4, $zero -/* 919E80 802412D0 0C0903C9 */ jal func_80240F24 -/* 919E84 802412D4 0200302D */ daddu $a2, $s0, $zero -/* 919E88 802412D8 8E630070 */ lw $v1, 0x70($s3) -/* 919E8C 802412DC 24020034 */ addiu $v0, $zero, 0x34 -/* 919E90 802412E0 14620006 */ bne $v1, $v0, .L802412FC -/* 919E94 802412E4 0000102D */ daddu $v0, $zero, $zero -/* 919E98 802412E8 0260202D */ daddu $a0, $s3, $zero -/* 919E9C 802412EC 0280282D */ daddu $a1, $s4, $zero -/* 919EA0 802412F0 0C0903E3 */ jal func_80240F8C -/* 919EA4 802412F4 0200302D */ daddu $a2, $s0, $zero -.L802412F8: -/* 919EA8 802412F8 0000102D */ daddu $v0, $zero, $zero -.L802412FC: -/* 919EAC 802412FC 8FBF0048 */ lw $ra, 0x48($sp) -/* 919EB0 80241300 8FB50044 */ lw $s5, 0x44($sp) -/* 919EB4 80241304 8FB40040 */ lw $s4, 0x40($sp) -/* 919EB8 80241308 8FB3003C */ lw $s3, 0x3c($sp) -/* 919EBC 8024130C 8FB20038 */ lw $s2, 0x38($sp) -/* 919EC0 80241310 8FB10034 */ lw $s1, 0x34($sp) -/* 919EC4 80241314 8FB00030 */ lw $s0, 0x30($sp) -/* 919EC8 80241318 03E00008 */ jr $ra -/* 919ECC 8024131C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s new file mode 100644 index 0000000000..fef23cdc40 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918EF0/func_80240FD0_919B80.s @@ -0,0 +1,223 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FD0_919B80 +/* 919B80 80240FD0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 919B84 80240FD4 AFB3003C */ sw $s3, 0x3c($sp) +/* 919B88 80240FD8 0080982D */ daddu $s3, $a0, $zero +/* 919B8C 80240FDC AFBF0048 */ sw $ra, 0x48($sp) +/* 919B90 80240FE0 AFB50044 */ sw $s5, 0x44($sp) +/* 919B94 80240FE4 AFB40040 */ sw $s4, 0x40($sp) +/* 919B98 80240FE8 AFB20038 */ sw $s2, 0x38($sp) +/* 919B9C 80240FEC AFB10034 */ sw $s1, 0x34($sp) +/* 919BA0 80240FF0 AFB00030 */ sw $s0, 0x30($sp) +/* 919BA4 80240FF4 8E720148 */ lw $s2, 0x148($s3) +/* 919BA8 80240FF8 86440008 */ lh $a0, 8($s2) +/* 919BAC 80240FFC 0C00EABB */ jal get_npc_unsafe +/* 919BB0 80241000 00A0882D */ daddu $s1, $a1, $zero +/* 919BB4 80241004 0260202D */ daddu $a0, $s3, $zero +/* 919BB8 80241008 8E70000C */ lw $s0, 0xc($s3) +/* 919BBC 8024100C 0040A82D */ daddu $s5, $v0, $zero +/* 919BC0 80241010 8E050000 */ lw $a1, ($s0) +/* 919BC4 80241014 0C0B1EAF */ jal get_variable +/* 919BC8 80241018 26100004 */ addiu $s0, $s0, 4 +/* 919BCC 8024101C 0260202D */ daddu $a0, $s3, $zero +/* 919BD0 80241020 8E050000 */ lw $a1, ($s0) +/* 919BD4 80241024 0C0B1EAF */ jal get_variable +/* 919BD8 80241028 0040A02D */ daddu $s4, $v0, $zero +/* 919BDC 8024102C AE420094 */ sw $v0, 0x94($s2) +/* 919BE0 80241030 AFA00010 */ sw $zero, 0x10($sp) +/* 919BE4 80241034 8E4200D0 */ lw $v0, 0xd0($s2) +/* 919BE8 80241038 8C420030 */ lw $v0, 0x30($v0) +/* 919BEC 8024103C AFA20014 */ sw $v0, 0x14($sp) +/* 919BF0 80241040 8E4200D0 */ lw $v0, 0xd0($s2) +/* 919BF4 80241044 8C42001C */ lw $v0, 0x1c($v0) +/* 919BF8 80241048 AFA20018 */ sw $v0, 0x18($sp) +/* 919BFC 8024104C 8E4200D0 */ lw $v0, 0xd0($s2) +/* 919C00 80241050 8C420024 */ lw $v0, 0x24($v0) +/* 919C04 80241054 AFA2001C */ sw $v0, 0x1c($sp) +/* 919C08 80241058 8E4200D0 */ lw $v0, 0xd0($s2) +/* 919C0C 8024105C 8C420028 */ lw $v0, 0x28($v0) +/* 919C10 80241060 AFA20020 */ sw $v0, 0x20($sp) +/* 919C14 80241064 8E4200D0 */ lw $v0, 0xd0($s2) +/* 919C18 80241068 3C014220 */ lui $at, 0x4220 +/* 919C1C 8024106C 44810000 */ mtc1 $at, $f0 +/* 919C20 80241070 8C42002C */ lw $v0, 0x2c($v0) +/* 919C24 80241074 27B00010 */ addiu $s0, $sp, 0x10 +/* 919C28 80241078 E7A00028 */ swc1 $f0, 0x28($sp) +/* 919C2C 8024107C A7A0002C */ sh $zero, 0x2c($sp) +/* 919C30 80241080 12200012 */ beqz $s1, .L802410CC +/* 919C34 80241084 AFA20024 */ sw $v0, 0x24($sp) +/* 919C38 80241088 AE600070 */ sw $zero, 0x70($s3) +/* 919C3C 8024108C 8EA30000 */ lw $v1, ($s5) +/* 919C40 80241090 2402F7FF */ addiu $v0, $zero, -0x801 +/* 919C44 80241094 A6A0008E */ sh $zero, 0x8e($s5) +/* 919C48 80241098 00621824 */ and $v1, $v1, $v0 +/* 919C4C 8024109C AEA30000 */ sw $v1, ($s5) +/* 919C50 802410A0 8E4200D0 */ lw $v0, 0xd0($s2) +/* 919C54 802410A4 8C420034 */ lw $v0, 0x34($v0) +/* 919C58 802410A8 54400005 */ bnel $v0, $zero, .L802410C0 +/* 919C5C 802410AC 2402FDFF */ addiu $v0, $zero, -0x201 +/* 919C60 802410B0 34620200 */ ori $v0, $v1, 0x200 +/* 919C64 802410B4 2403FFF7 */ addiu $v1, $zero, -9 +/* 919C68 802410B8 08090432 */ j .L802410C8 +/* 919C6C 802410BC 00431024 */ and $v0, $v0, $v1 +.L802410C0: +/* 919C70 802410C0 00621024 */ and $v0, $v1, $v0 +/* 919C74 802410C4 34420008 */ ori $v0, $v0, 8 +.L802410C8: +/* 919C78 802410C8 AEA20000 */ sw $v0, ($s5) +.L802410CC: +/* 919C7C 802410CC 8E4300B0 */ lw $v1, 0xb0($s2) +/* 919C80 802410D0 30620004 */ andi $v0, $v1, 4 +/* 919C84 802410D4 10400007 */ beqz $v0, .L802410F4 +/* 919C88 802410D8 00000000 */ nop +/* 919C8C 802410DC 824200B4 */ lb $v0, 0xb4($s2) +/* 919C90 802410E0 14400086 */ bnez $v0, .L802412FC +/* 919C94 802410E4 0000102D */ daddu $v0, $zero, $zero +/* 919C98 802410E8 2402FFFB */ addiu $v0, $zero, -5 +/* 919C9C 802410EC 00621024 */ and $v0, $v1, $v0 +/* 919CA0 802410F0 AE4200B0 */ sw $v0, 0xb0($s2) +.L802410F4: +/* 919CA4 802410F4 8E620070 */ lw $v0, 0x70($s3) +/* 919CA8 802410F8 2442FFF4 */ addiu $v0, $v0, -0xc +/* 919CAC 802410FC 2C420003 */ sltiu $v0, $v0, 3 +/* 919CB0 80241100 10400007 */ beqz $v0, .L80241120 +/* 919CB4 80241104 0260202D */ daddu $a0, $s3, $zero +/* 919CB8 80241108 0280282D */ daddu $a1, $s4, $zero +/* 919CBC 8024110C 0C0900D0 */ jal func_80240340_918EF0 +/* 919CC0 80241110 0200302D */ daddu $a2, $s0, $zero +/* 919CC4 80241114 10400002 */ beqz $v0, .L80241120 +/* 919CC8 80241118 24020014 */ addiu $v0, $zero, 0x14 +/* 919CCC 8024111C AE620070 */ sw $v0, 0x70($s3) +.L80241120: +/* 919CD0 80241120 8E630070 */ lw $v1, 0x70($s3) +/* 919CD4 80241124 2C620035 */ sltiu $v0, $v1, 0x35 +/* 919CD8 80241128 10400073 */ beqz $v0, .L802412F8 +/* 919CDC 8024112C 00031080 */ sll $v0, $v1, 2 +/* 919CE0 80241130 3C018024 */ lui $at, 0x8024 +/* 919CE4 80241134 00220821 */ addu $at, $at, $v0 +/* 919CE8 80241138 8C222C58 */ lw $v0, 0x2c58($at) +/* 919CEC 8024113C 00400008 */ jr $v0 +/* 919CF0 80241140 00000000 */ nop +/* 919CF4 80241144 0260202D */ daddu $a0, $s3, $zero +/* 919CF8 80241148 0280282D */ daddu $a1, $s4, $zero +/* 919CFC 8024114C 0C090128 */ jal func_802404A0_919050 +/* 919D00 80241150 0200302D */ daddu $a2, $s0, $zero +/* 919D04 80241154 0260202D */ daddu $a0, $s3, $zero +/* 919D08 80241158 0280282D */ daddu $a1, $s4, $zero +/* 919D0C 8024115C 0C090145 */ jal func_80240514_9190C4 +/* 919D10 80241160 0200302D */ daddu $a2, $s0, $zero +/* 919D14 80241164 8E630070 */ lw $v1, 0x70($s3) +/* 919D18 80241168 24020002 */ addiu $v0, $zero, 2 +/* 919D1C 8024116C 14620063 */ bne $v1, $v0, .L802412FC +/* 919D20 80241170 0000102D */ daddu $v0, $zero, $zero +/* 919D24 80241174 0260202D */ daddu $a0, $s3, $zero +/* 919D28 80241178 0280282D */ daddu $a1, $s4, $zero +/* 919D2C 8024117C 0C090191 */ jal func_80240644_9191F4 +/* 919D30 80241180 0200302D */ daddu $a2, $s0, $zero +/* 919D34 80241184 8E630070 */ lw $v1, 0x70($s3) +/* 919D38 80241188 24020003 */ addiu $v0, $zero, 3 +/* 919D3C 8024118C 1462005B */ bne $v1, $v0, .L802412FC +/* 919D40 80241190 0000102D */ daddu $v0, $zero, $zero +/* 919D44 80241194 0260202D */ daddu $a0, $s3, $zero +/* 919D48 80241198 0280282D */ daddu $a1, $s4, $zero +/* 919D4C 8024119C 0C0901B8 */ jal func_802406E0_919290 +/* 919D50 802411A0 0200302D */ daddu $a2, $s0, $zero +/* 919D54 802411A4 8E630070 */ lw $v1, 0x70($s3) +/* 919D58 802411A8 24020004 */ addiu $v0, $zero, 4 +/* 919D5C 802411AC 14620053 */ bne $v1, $v0, .L802412FC +/* 919D60 802411B0 0000102D */ daddu $v0, $zero, $zero +/* 919D64 802411B4 0260202D */ daddu $a0, $s3, $zero +/* 919D68 802411B8 0280282D */ daddu $a1, $s4, $zero +/* 919D6C 802411BC 0C0901DA */ jal func_80240768_919318 +/* 919D70 802411C0 0200302D */ daddu $a2, $s0, $zero +/* 919D74 802411C4 0260202D */ daddu $a0, $s3, $zero +/* 919D78 802411C8 0280282D */ daddu $a1, $s4, $zero +/* 919D7C 802411CC 0C090204 */ jal func_80240810_9193C0 +/* 919D80 802411D0 0200302D */ daddu $a2, $s0, $zero +/* 919D84 802411D4 080904BF */ j .L802412FC +/* 919D88 802411D8 0000102D */ daddu $v0, $zero, $zero +/* 919D8C 802411DC 0260202D */ daddu $a0, $s3, $zero +/* 919D90 802411E0 0280282D */ daddu $a1, $s4, $zero +/* 919D94 802411E4 0C0127DF */ jal func_80049F7C +/* 919D98 802411E8 0200302D */ daddu $a2, $s0, $zero +/* 919D9C 802411EC 8E630070 */ lw $v1, 0x70($s3) +/* 919DA0 802411F0 2402000D */ addiu $v0, $zero, 0xd +/* 919DA4 802411F4 14620041 */ bne $v1, $v0, .L802412FC +/* 919DA8 802411F8 0000102D */ daddu $v0, $zero, $zero +/* 919DAC 802411FC 0260202D */ daddu $a0, $s3, $zero +/* 919DB0 80241200 0280282D */ daddu $a1, $s4, $zero +/* 919DB4 80241204 0C012849 */ jal func_8004A124 +/* 919DB8 80241208 0200302D */ daddu $a2, $s0, $zero +/* 919DBC 8024120C 8E630070 */ lw $v1, 0x70($s3) +/* 919DC0 80241210 2402000E */ addiu $v0, $zero, 0xe +/* 919DC4 80241214 14620039 */ bne $v1, $v0, .L802412FC +/* 919DC8 80241218 0000102D */ daddu $v0, $zero, $zero +/* 919DCC 8024121C 96A2008E */ lhu $v0, 0x8e($s5) +/* 919DD0 80241220 2442FFFF */ addiu $v0, $v0, -1 +/* 919DD4 80241224 A6A2008E */ sh $v0, 0x8e($s5) +/* 919DD8 80241228 00021400 */ sll $v0, $v0, 0x10 +/* 919DDC 8024122C 14400033 */ bnez $v0, .L802412FC +/* 919DE0 80241230 0000102D */ daddu $v0, $zero, $zero +/* 919DE4 80241234 24020028 */ addiu $v0, $zero, 0x28 +/* 919DE8 80241238 080904BE */ j .L802412F8 +/* 919DEC 8024123C AE620070 */ sw $v0, 0x70($s3) +/* 919DF0 80241240 0260202D */ daddu $a0, $s3, $zero +/* 919DF4 80241244 0280282D */ daddu $a1, $s4, $zero +/* 919DF8 80241248 0C090261 */ jal func_80240984_919534 +/* 919DFC 8024124C 0200302D */ daddu $a2, $s0, $zero +/* 919E00 80241250 0260202D */ daddu $a0, $s3, $zero +/* 919E04 80241254 0280282D */ daddu $a1, $s4, $zero +/* 919E08 80241258 0C090275 */ jal func_802409D4_919584 +/* 919E0C 8024125C 0200302D */ daddu $a2, $s0, $zero +/* 919E10 80241260 080904BF */ j .L802412FC +/* 919E14 80241264 0000102D */ daddu $v0, $zero, $zero +/* 919E18 80241268 0260202D */ daddu $a0, $s3, $zero +/* 919E1C 8024126C 0280282D */ daddu $a1, $s4, $zero +/* 919E20 80241270 0C0902DD */ jal func_80240B74_919724 +/* 919E24 80241274 0200302D */ daddu $a2, $s0, $zero +/* 919E28 80241278 080904BF */ j .L802412FC +/* 919E2C 8024127C 0000102D */ daddu $v0, $zero, $zero +/* 919E30 80241280 0260202D */ daddu $a0, $s3, $zero +/* 919E34 80241284 0280282D */ daddu $a1, $s4, $zero +/* 919E38 80241288 0C090331 */ jal func_80240CC4_919874 +/* 919E3C 8024128C 0200302D */ daddu $a2, $s0, $zero +/* 919E40 80241290 8E630070 */ lw $v1, 0x70($s3) +/* 919E44 80241294 24020029 */ addiu $v0, $zero, 0x29 +/* 919E48 80241298 14620018 */ bne $v1, $v0, .L802412FC +/* 919E4C 8024129C 0000102D */ daddu $v0, $zero, $zero +/* 919E50 802412A0 0260202D */ daddu $a0, $s3, $zero +/* 919E54 802412A4 0280282D */ daddu $a1, $s4, $zero +/* 919E58 802412A8 0C09035C */ jal func_80240D70_919920 +/* 919E5C 802412AC 0200302D */ daddu $a2, $s0, $zero +/* 919E60 802412B0 080904BF */ j .L802412FC +/* 919E64 802412B4 0000102D */ daddu $v0, $zero, $zero +/* 919E68 802412B8 0260202D */ daddu $a0, $s3, $zero +/* 919E6C 802412BC 0280282D */ daddu $a1, $s4, $zero +/* 919E70 802412C0 0C0903AA */ jal func_80240EA8_919A58 +/* 919E74 802412C4 0200302D */ daddu $a2, $s0, $zero +/* 919E78 802412C8 0260202D */ daddu $a0, $s3, $zero +/* 919E7C 802412CC 0280282D */ daddu $a1, $s4, $zero +/* 919E80 802412D0 0C0903C9 */ jal func_80240F24_919AD4 +/* 919E84 802412D4 0200302D */ daddu $a2, $s0, $zero +/* 919E88 802412D8 8E630070 */ lw $v1, 0x70($s3) +/* 919E8C 802412DC 24020034 */ addiu $v0, $zero, 0x34 +/* 919E90 802412E0 14620006 */ bne $v1, $v0, .L802412FC +/* 919E94 802412E4 0000102D */ daddu $v0, $zero, $zero +/* 919E98 802412E8 0260202D */ daddu $a0, $s3, $zero +/* 919E9C 802412EC 0280282D */ daddu $a1, $s4, $zero +/* 919EA0 802412F0 0C0903E3 */ jal func_80240F8C_919B3C +/* 919EA4 802412F4 0200302D */ daddu $a2, $s0, $zero +.L802412F8: +/* 919EA8 802412F8 0000102D */ daddu $v0, $zero, $zero +.L802412FC: +/* 919EAC 802412FC 8FBF0048 */ lw $ra, 0x48($sp) +/* 919EB0 80241300 8FB50044 */ lw $s5, 0x44($sp) +/* 919EB4 80241304 8FB40040 */ lw $s4, 0x40($sp) +/* 919EB8 80241308 8FB3003C */ lw $s3, 0x3c($sp) +/* 919EBC 8024130C 8FB20038 */ lw $s2, 0x38($sp) +/* 919EC0 80241310 8FB10034 */ lw $s1, 0x34($sp) +/* 919EC4 80241314 8FB00030 */ lw $s0, 0x30($sp) +/* 919EC8 80241318 03E00008 */ jr $ra +/* 919ECC 8024131C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080.s deleted file mode 100644 index 0806386310..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240080 -/* 91B960 80240080 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 91B964 80240084 AFBF001C */ sw $ra, 0x1c($sp) -/* 91B968 80240088 AFB20018 */ sw $s2, 0x18($sp) -/* 91B96C 8024008C AFB10014 */ sw $s1, 0x14($sp) -/* 91B970 80240090 AFB00010 */ sw $s0, 0x10($sp) -/* 91B974 80240094 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 91B978 80240098 8C900148 */ lw $s0, 0x148($a0) -/* 91B97C 8024009C 86040008 */ lh $a0, 8($s0) -/* 91B980 802400A0 3C014387 */ lui $at, 0x4387 -/* 91B984 802400A4 4481A000 */ mtc1 $at, $f20 -/* 91B988 802400A8 0C00EABB */ jal get_npc_unsafe -/* 91B98C 802400AC 00A0882D */ daddu $s1, $a1, $zero -/* 91B990 802400B0 0200202D */ daddu $a0, $s0, $zero -/* 91B994 802400B4 8E26000C */ lw $a2, 0xc($s1) -/* 91B998 802400B8 8E270010 */ lw $a3, 0x10($s1) -/* 91B99C 802400BC 0040882D */ daddu $s1, $v0, $zero -/* 91B9A0 802400C0 3C03800B */ lui $v1, %hi(gCameras) -/* 91B9A4 802400C4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 91B9A8 802400C8 3C02800A */ lui $v0, 0x800a -/* 91B9AC 802400CC 8442A634 */ lh $v0, -0x59cc($v0) -/* 91B9B0 802400D0 0000282D */ daddu $a1, $zero, $zero -/* 91B9B4 802400D4 00028080 */ sll $s0, $v0, 2 -/* 91B9B8 802400D8 02028021 */ addu $s0, $s0, $v0 -/* 91B9BC 802400DC 00108080 */ sll $s0, $s0, 2 -/* 91B9C0 802400E0 02028023 */ subu $s0, $s0, $v0 -/* 91B9C4 802400E4 001010C0 */ sll $v0, $s0, 3 -/* 91B9C8 802400E8 02028021 */ addu $s0, $s0, $v0 -/* 91B9CC 802400EC 001080C0 */ sll $s0, $s0, 3 -/* 91B9D0 802400F0 0C0124FB */ jal func_800493EC -/* 91B9D4 802400F4 02038021 */ addu $s0, $s0, $v1 -/* 91B9D8 802400F8 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 91B9DC 802400FC C62E000C */ lwc1 $f14, 0xc($s1) -/* 91B9E0 80240100 0C00A70A */ jal get_clamped_angle_diff -/* 91B9E4 80240104 0002802B */ sltu $s0, $zero, $v0 -/* 91B9E8 80240108 0C00A6C9 */ jal clamp_angle -/* 91B9EC 8024010C 46000306 */ mov.s $f12, $f0 -/* 91B9F0 80240110 3C018024 */ lui $at, 0x8024 -/* 91B9F4 80240114 D4222B90 */ ldc1 $f2, 0x2b90($at) -/* 91B9F8 80240118 46000021 */ cvt.d.s $f0, $f0 -/* 91B9FC 8024011C 4622003C */ c.lt.d $f0, $f2 -/* 91BA00 80240120 00000000 */ nop -/* 91BA04 80240124 45000003 */ bc1f .L80240134 -/* 91BA08 80240128 00000000 */ nop -/* 91BA0C 8024012C 3C0142B4 */ lui $at, 0x42b4 -/* 91BA10 80240130 4481A000 */ mtc1 $at, $f20 -.L80240134: -/* 91BA14 80240134 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 91BA18 80240138 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 91BA1C 8024013C C62C0038 */ lwc1 $f12, 0x38($s1) -/* 91BA20 80240140 8E420000 */ lw $v0, ($s2) -/* 91BA24 80240144 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 91BA28 80240148 8C460028 */ lw $a2, 0x28($v0) -/* 91BA2C 8024014C 0C00A720 */ jal atan2 -/* 91BA30 80240150 8C470030 */ lw $a3, 0x30($v0) -/* 91BA34 80240154 4600A306 */ mov.s $f12, $f20 -/* 91BA38 80240158 0C00A70A */ jal get_clamped_angle_diff -/* 91BA3C 8024015C 46000386 */ mov.s $f14, $f0 -/* 91BA40 80240160 46000005 */ abs.s $f0, $f0 -/* 91BA44 80240164 3C018024 */ lui $at, 0x8024 -/* 91BA48 80240168 D4222B98 */ ldc1 $f2, 0x2b98($at) -/* 91BA4C 8024016C 46000021 */ cvt.d.s $f0, $f0 -/* 91BA50 80240170 4620103C */ c.lt.d $f2, $f0 -/* 91BA54 80240174 00000000 */ nop -/* 91BA58 80240178 45030001 */ bc1tl .L80240180 -/* 91BA5C 8024017C 0000802D */ daddu $s0, $zero, $zero -.L80240180: -/* 91BA60 80240180 8E420000 */ lw $v0, ($s2) -/* 91BA64 80240184 C620003C */ lwc1 $f0, 0x3c($s1) -/* 91BA68 80240188 C442002C */ lwc1 $f2, 0x2c($v0) -/* 91BA6C 8024018C 46020001 */ sub.s $f0, $f0, $f2 -/* 91BA70 80240190 3C014220 */ lui $at, 0x4220 -/* 91BA74 80240194 44811000 */ mtc1 $at, $f2 -/* 91BA78 80240198 46000005 */ abs.s $f0, $f0 -/* 91BA7C 8024019C 4600103E */ c.le.s $f2, $f0 -/* 91BA80 802401A0 00000000 */ nop -/* 91BA84 802401A4 45030001 */ bc1tl .L802401AC -/* 91BA88 802401A8 0000802D */ daddu $s0, $zero, $zero -.L802401AC: -/* 91BA8C 802401AC 3C038011 */ lui $v1, 0x8011 -/* 91BA90 802401B0 8063EBB3 */ lb $v1, -0x144d($v1) -/* 91BA94 802401B4 24020009 */ addiu $v0, $zero, 9 -/* 91BA98 802401B8 50620001 */ beql $v1, $v0, .L802401C0 -/* 91BA9C 802401BC 0000802D */ daddu $s0, $zero, $zero -.L802401C0: -/* 91BAA0 802401C0 0200102D */ daddu $v0, $s0, $zero -/* 91BAA4 802401C4 8FBF001C */ lw $ra, 0x1c($sp) -/* 91BAA8 802401C8 8FB20018 */ lw $s2, 0x18($sp) -/* 91BAAC 802401CC 8FB10014 */ lw $s1, 0x14($sp) -/* 91BAB0 802401D0 8FB00010 */ lw $s0, 0x10($sp) -/* 91BAB4 802401D4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 91BAB8 802401D8 03E00008 */ jr $ra -/* 91BABC 802401DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s new file mode 100644 index 0000000000..854b520592 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240080_91B960.s @@ -0,0 +1,96 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240080_91B960 +/* 91B960 80240080 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 91B964 80240084 AFBF001C */ sw $ra, 0x1c($sp) +/* 91B968 80240088 AFB20018 */ sw $s2, 0x18($sp) +/* 91B96C 8024008C AFB10014 */ sw $s1, 0x14($sp) +/* 91B970 80240090 AFB00010 */ sw $s0, 0x10($sp) +/* 91B974 80240094 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 91B978 80240098 8C900148 */ lw $s0, 0x148($a0) +/* 91B97C 8024009C 86040008 */ lh $a0, 8($s0) +/* 91B980 802400A0 3C014387 */ lui $at, 0x4387 +/* 91B984 802400A4 4481A000 */ mtc1 $at, $f20 +/* 91B988 802400A8 0C00EABB */ jal get_npc_unsafe +/* 91B98C 802400AC 00A0882D */ daddu $s1, $a1, $zero +/* 91B990 802400B0 0200202D */ daddu $a0, $s0, $zero +/* 91B994 802400B4 8E26000C */ lw $a2, 0xc($s1) +/* 91B998 802400B8 8E270010 */ lw $a3, 0x10($s1) +/* 91B99C 802400BC 0040882D */ daddu $s1, $v0, $zero +/* 91B9A0 802400C0 3C03800B */ lui $v1, %hi(gCameras) +/* 91B9A4 802400C4 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* 91B9A8 802400C8 3C02800A */ lui $v0, 0x800a +/* 91B9AC 802400CC 8442A634 */ lh $v0, -0x59cc($v0) +/* 91B9B0 802400D0 0000282D */ daddu $a1, $zero, $zero +/* 91B9B4 802400D4 00028080 */ sll $s0, $v0, 2 +/* 91B9B8 802400D8 02028021 */ addu $s0, $s0, $v0 +/* 91B9BC 802400DC 00108080 */ sll $s0, $s0, 2 +/* 91B9C0 802400E0 02028023 */ subu $s0, $s0, $v0 +/* 91B9C4 802400E4 001010C0 */ sll $v0, $s0, 3 +/* 91B9C8 802400E8 02028021 */ addu $s0, $s0, $v0 +/* 91B9CC 802400EC 001080C0 */ sll $s0, $s0, 3 +/* 91B9D0 802400F0 0C0124FB */ jal func_800493EC +/* 91B9D4 802400F4 02038021 */ addu $s0, $s0, $v1 +/* 91B9D8 802400F8 C60C006C */ lwc1 $f12, 0x6c($s0) +/* 91B9DC 802400FC C62E000C */ lwc1 $f14, 0xc($s1) +/* 91B9E0 80240100 0C00A70A */ jal get_clamped_angle_diff +/* 91B9E4 80240104 0002802B */ sltu $s0, $zero, $v0 +/* 91B9E8 80240108 0C00A6C9 */ jal clamp_angle +/* 91B9EC 8024010C 46000306 */ mov.s $f12, $f0 +/* 91B9F0 80240110 3C018024 */ lui $at, 0x8024 +/* 91B9F4 80240114 D4222B90 */ ldc1 $f2, 0x2b90($at) +/* 91B9F8 80240118 46000021 */ cvt.d.s $f0, $f0 +/* 91B9FC 8024011C 4622003C */ c.lt.d $f0, $f2 +/* 91BA00 80240120 00000000 */ nop +/* 91BA04 80240124 45000003 */ bc1f .L80240134 +/* 91BA08 80240128 00000000 */ nop +/* 91BA0C 8024012C 3C0142B4 */ lui $at, 0x42b4 +/* 91BA10 80240130 4481A000 */ mtc1 $at, $f20 +.L80240134: +/* 91BA14 80240134 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) +/* 91BA18 80240138 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) +/* 91BA1C 8024013C C62C0038 */ lwc1 $f12, 0x38($s1) +/* 91BA20 80240140 8E420000 */ lw $v0, ($s2) +/* 91BA24 80240144 C62E0040 */ lwc1 $f14, 0x40($s1) +/* 91BA28 80240148 8C460028 */ lw $a2, 0x28($v0) +/* 91BA2C 8024014C 0C00A720 */ jal atan2 +/* 91BA30 80240150 8C470030 */ lw $a3, 0x30($v0) +/* 91BA34 80240154 4600A306 */ mov.s $f12, $f20 +/* 91BA38 80240158 0C00A70A */ jal get_clamped_angle_diff +/* 91BA3C 8024015C 46000386 */ mov.s $f14, $f0 +/* 91BA40 80240160 46000005 */ abs.s $f0, $f0 +/* 91BA44 80240164 3C018024 */ lui $at, 0x8024 +/* 91BA48 80240168 D4222B98 */ ldc1 $f2, 0x2b98($at) +/* 91BA4C 8024016C 46000021 */ cvt.d.s $f0, $f0 +/* 91BA50 80240170 4620103C */ c.lt.d $f2, $f0 +/* 91BA54 80240174 00000000 */ nop +/* 91BA58 80240178 45030001 */ bc1tl .L80240180 +/* 91BA5C 8024017C 0000802D */ daddu $s0, $zero, $zero +.L80240180: +/* 91BA60 80240180 8E420000 */ lw $v0, ($s2) +/* 91BA64 80240184 C620003C */ lwc1 $f0, 0x3c($s1) +/* 91BA68 80240188 C442002C */ lwc1 $f2, 0x2c($v0) +/* 91BA6C 8024018C 46020001 */ sub.s $f0, $f0, $f2 +/* 91BA70 80240190 3C014220 */ lui $at, 0x4220 +/* 91BA74 80240194 44811000 */ mtc1 $at, $f2 +/* 91BA78 80240198 46000005 */ abs.s $f0, $f0 +/* 91BA7C 8024019C 4600103E */ c.le.s $f2, $f0 +/* 91BA80 802401A0 00000000 */ nop +/* 91BA84 802401A4 45030001 */ bc1tl .L802401AC +/* 91BA88 802401A8 0000802D */ daddu $s0, $zero, $zero +.L802401AC: +/* 91BA8C 802401AC 3C038011 */ lui $v1, 0x8011 +/* 91BA90 802401B0 8063EBB3 */ lb $v1, -0x144d($v1) +/* 91BA94 802401B4 24020009 */ addiu $v0, $zero, 9 +/* 91BA98 802401B8 50620001 */ beql $v1, $v0, .L802401C0 +/* 91BA9C 802401BC 0000802D */ daddu $s0, $zero, $zero +.L802401C0: +/* 91BAA0 802401C0 0200102D */ daddu $v0, $s0, $zero +/* 91BAA4 802401C4 8FBF001C */ lw $ra, 0x1c($sp) +/* 91BAA8 802401C8 8FB20018 */ lw $s2, 0x18($sp) +/* 91BAAC 802401CC 8FB10014 */ lw $s1, 0x14($sp) +/* 91BAB0 802401D0 8FB00010 */ lw $s0, 0x10($sp) +/* 91BAB4 802401D4 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 91BAB8 802401D8 03E00008 */ jr $ra +/* 91BABC 802401DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254.s deleted file mode 100644 index 121c58dd6b..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240254 -/* 91BB34 80240254 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 91BB38 80240258 AFB3003C */ sw $s3, 0x3c($sp) -/* 91BB3C 8024025C 0080982D */ daddu $s3, $a0, $zero -/* 91BB40 80240260 AFBF0044 */ sw $ra, 0x44($sp) -/* 91BB44 80240264 AFB40040 */ sw $s4, 0x40($sp) -/* 91BB48 80240268 AFB20038 */ sw $s2, 0x38($sp) -/* 91BB4C 8024026C AFB10034 */ sw $s1, 0x34($sp) -/* 91BB50 80240270 AFB00030 */ sw $s0, 0x30($sp) -/* 91BB54 80240274 8E700148 */ lw $s0, 0x148($s3) -/* 91BB58 80240278 00A0902D */ daddu $s2, $a1, $zero -/* 91BB5C 8024027C 86040008 */ lh $a0, 8($s0) -/* 91BB60 80240280 0C00EABB */ jal get_npc_unsafe -/* 91BB64 80240284 00C0A02D */ daddu $s4, $a2, $zero -/* 91BB68 80240288 8E630074 */ lw $v1, 0x74($s3) -/* 91BB6C 8024028C 1C600032 */ bgtz $v1, .L80240358 -/* 91BB70 80240290 0040882D */ daddu $s1, $v0, $zero -/* 91BB74 80240294 8E420014 */ lw $v0, 0x14($s2) -/* 91BB78 80240298 AE620074 */ sw $v0, 0x74($s3) -/* 91BB7C 8024029C C640000C */ lwc1 $f0, 0xc($s2) -/* 91BB80 802402A0 3C018024 */ lui $at, 0x8024 -/* 91BB84 802402A4 D4222BA0 */ ldc1 $f2, 0x2ba0($at) -/* 91BB88 802402A8 46000021 */ cvt.d.s $f0, $f0 -/* 91BB8C 802402AC 46220002 */ mul.d $f0, $f0, $f2 -/* 91BB90 802402B0 00000000 */ nop -/* 91BB94 802402B4 0280202D */ daddu $a0, $s4, $zero -/* 91BB98 802402B8 AFA00010 */ sw $zero, 0x10($sp) -/* 91BB9C 802402BC 8E470010 */ lw $a3, 0x10($s2) -/* 91BBA0 802402C0 46200020 */ cvt.s.d $f0, $f0 -/* 91BBA4 802402C4 44060000 */ mfc1 $a2, $f0 -/* 91BBA8 802402C8 0C01242D */ jal func_800490B4 -/* 91BBAC 802402CC 0200282D */ daddu $a1, $s0, $zero -/* 91BBB0 802402D0 10400021 */ beqz $v0, .L80240358 -/* 91BBB4 802402D4 0000202D */ daddu $a0, $zero, $zero -/* 91BBB8 802402D8 0220282D */ daddu $a1, $s1, $zero -/* 91BBBC 802402DC 0000302D */ daddu $a2, $zero, $zero -/* 91BBC0 802402E0 8E0200CC */ lw $v0, 0xcc($s0) -/* 91BBC4 802402E4 3C013F80 */ lui $at, 0x3f80 -/* 91BBC8 802402E8 44810000 */ mtc1 $at, $f0 -/* 91BBCC 802402EC 3C014000 */ lui $at, 0x4000 -/* 91BBD0 802402F0 44811000 */ mtc1 $at, $f2 -/* 91BBD4 802402F4 8C430024 */ lw $v1, 0x24($v0) -/* 91BBD8 802402F8 862200A8 */ lh $v0, 0xa8($s1) -/* 91BBDC 802402FC 3C01C1A0 */ lui $at, 0xc1a0 -/* 91BBE0 80240300 44812000 */ mtc1 $at, $f4 -/* 91BBE4 80240304 44823000 */ mtc1 $v0, $f6 -/* 91BBE8 80240308 00000000 */ nop -/* 91BBEC 8024030C 468031A0 */ cvt.s.w $f6, $f6 -/* 91BBF0 80240310 44073000 */ mfc1 $a3, $f6 -/* 91BBF4 80240314 2402000F */ addiu $v0, $zero, 0xf -/* 91BBF8 80240318 AE230028 */ sw $v1, 0x28($s1) -/* 91BBFC 8024031C AFA2001C */ sw $v0, 0x1c($sp) -/* 91BC00 80240320 27A20028 */ addiu $v0, $sp, 0x28 -/* 91BC04 80240324 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91BC08 80240328 E7A20014 */ swc1 $f2, 0x14($sp) -/* 91BC0C 8024032C E7A40018 */ swc1 $f4, 0x18($sp) -/* 91BC10 80240330 0C01BFA4 */ jal fx_emote -/* 91BC14 80240334 AFA20020 */ sw $v0, 0x20($sp) -/* 91BC18 80240338 0220202D */ daddu $a0, $s1, $zero -/* 91BC1C 8024033C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 91BC20 80240340 0C012530 */ jal func_800494C0 -/* 91BC24 80240344 3C060020 */ lui $a2, 0x20 -/* 91BC28 80240348 2402000C */ addiu $v0, $zero, 0xc -/* 91BC2C 8024034C A622008E */ sh $v0, 0x8e($s1) -/* 91BC30 80240350 24020002 */ addiu $v0, $zero, 2 -/* 91BC34 80240354 AE620070 */ sw $v0, 0x70($s3) -.L80240358: -/* 91BC38 80240358 8E620074 */ lw $v0, 0x74($s3) -/* 91BC3C 8024035C 2442FFFF */ addiu $v0, $v0, -1 -/* 91BC40 80240360 AE620074 */ sw $v0, 0x74($s3) -/* 91BC44 80240364 8FBF0044 */ lw $ra, 0x44($sp) -/* 91BC48 80240368 8FB40040 */ lw $s4, 0x40($sp) -/* 91BC4C 8024036C 8FB3003C */ lw $s3, 0x3c($sp) -/* 91BC50 80240370 8FB20038 */ lw $s2, 0x38($sp) -/* 91BC54 80240374 8FB10034 */ lw $s1, 0x34($sp) -/* 91BC58 80240378 8FB00030 */ lw $s0, 0x30($sp) -/* 91BC5C 8024037C 03E00008 */ jr $ra -/* 91BC60 80240380 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s new file mode 100644 index 0000000000..3a0737775a --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240254_91BB34.s @@ -0,0 +1,81 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240254_91BB34 +/* 91BB34 80240254 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 91BB38 80240258 AFB3003C */ sw $s3, 0x3c($sp) +/* 91BB3C 8024025C 0080982D */ daddu $s3, $a0, $zero +/* 91BB40 80240260 AFBF0044 */ sw $ra, 0x44($sp) +/* 91BB44 80240264 AFB40040 */ sw $s4, 0x40($sp) +/* 91BB48 80240268 AFB20038 */ sw $s2, 0x38($sp) +/* 91BB4C 8024026C AFB10034 */ sw $s1, 0x34($sp) +/* 91BB50 80240270 AFB00030 */ sw $s0, 0x30($sp) +/* 91BB54 80240274 8E700148 */ lw $s0, 0x148($s3) +/* 91BB58 80240278 00A0902D */ daddu $s2, $a1, $zero +/* 91BB5C 8024027C 86040008 */ lh $a0, 8($s0) +/* 91BB60 80240280 0C00EABB */ jal get_npc_unsafe +/* 91BB64 80240284 00C0A02D */ daddu $s4, $a2, $zero +/* 91BB68 80240288 8E630074 */ lw $v1, 0x74($s3) +/* 91BB6C 8024028C 1C600032 */ bgtz $v1, .L80240358 +/* 91BB70 80240290 0040882D */ daddu $s1, $v0, $zero +/* 91BB74 80240294 8E420014 */ lw $v0, 0x14($s2) +/* 91BB78 80240298 AE620074 */ sw $v0, 0x74($s3) +/* 91BB7C 8024029C C640000C */ lwc1 $f0, 0xc($s2) +/* 91BB80 802402A0 3C018024 */ lui $at, 0x8024 +/* 91BB84 802402A4 D4222BA0 */ ldc1 $f2, 0x2ba0($at) +/* 91BB88 802402A8 46000021 */ cvt.d.s $f0, $f0 +/* 91BB8C 802402AC 46220002 */ mul.d $f0, $f0, $f2 +/* 91BB90 802402B0 00000000 */ nop +/* 91BB94 802402B4 0280202D */ daddu $a0, $s4, $zero +/* 91BB98 802402B8 AFA00010 */ sw $zero, 0x10($sp) +/* 91BB9C 802402BC 8E470010 */ lw $a3, 0x10($s2) +/* 91BBA0 802402C0 46200020 */ cvt.s.d $f0, $f0 +/* 91BBA4 802402C4 44060000 */ mfc1 $a2, $f0 +/* 91BBA8 802402C8 0C01242D */ jal func_800490B4 +/* 91BBAC 802402CC 0200282D */ daddu $a1, $s0, $zero +/* 91BBB0 802402D0 10400021 */ beqz $v0, .L80240358 +/* 91BBB4 802402D4 0000202D */ daddu $a0, $zero, $zero +/* 91BBB8 802402D8 0220282D */ daddu $a1, $s1, $zero +/* 91BBBC 802402DC 0000302D */ daddu $a2, $zero, $zero +/* 91BBC0 802402E0 8E0200CC */ lw $v0, 0xcc($s0) +/* 91BBC4 802402E4 3C013F80 */ lui $at, 0x3f80 +/* 91BBC8 802402E8 44810000 */ mtc1 $at, $f0 +/* 91BBCC 802402EC 3C014000 */ lui $at, 0x4000 +/* 91BBD0 802402F0 44811000 */ mtc1 $at, $f2 +/* 91BBD4 802402F4 8C430024 */ lw $v1, 0x24($v0) +/* 91BBD8 802402F8 862200A8 */ lh $v0, 0xa8($s1) +/* 91BBDC 802402FC 3C01C1A0 */ lui $at, 0xc1a0 +/* 91BBE0 80240300 44812000 */ mtc1 $at, $f4 +/* 91BBE4 80240304 44823000 */ mtc1 $v0, $f6 +/* 91BBE8 80240308 00000000 */ nop +/* 91BBEC 8024030C 468031A0 */ cvt.s.w $f6, $f6 +/* 91BBF0 80240310 44073000 */ mfc1 $a3, $f6 +/* 91BBF4 80240314 2402000F */ addiu $v0, $zero, 0xf +/* 91BBF8 80240318 AE230028 */ sw $v1, 0x28($s1) +/* 91BBFC 8024031C AFA2001C */ sw $v0, 0x1c($sp) +/* 91BC00 80240320 27A20028 */ addiu $v0, $sp, 0x28 +/* 91BC04 80240324 E7A00010 */ swc1 $f0, 0x10($sp) +/* 91BC08 80240328 E7A20014 */ swc1 $f2, 0x14($sp) +/* 91BC0C 8024032C E7A40018 */ swc1 $f4, 0x18($sp) +/* 91BC10 80240330 0C01BFA4 */ jal fx_emote +/* 91BC14 80240334 AFA20020 */ sw $v0, 0x20($sp) +/* 91BC18 80240338 0220202D */ daddu $a0, $s1, $zero +/* 91BC1C 8024033C 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 91BC20 80240340 0C012530 */ jal func_800494C0 +/* 91BC24 80240344 3C060020 */ lui $a2, 0x20 +/* 91BC28 80240348 2402000C */ addiu $v0, $zero, 0xc +/* 91BC2C 8024034C A622008E */ sh $v0, 0x8e($s1) +/* 91BC30 80240350 24020002 */ addiu $v0, $zero, 2 +/* 91BC34 80240354 AE620070 */ sw $v0, 0x70($s3) +.L80240358: +/* 91BC38 80240358 8E620074 */ lw $v0, 0x74($s3) +/* 91BC3C 8024035C 2442FFFF */ addiu $v0, $v0, -1 +/* 91BC40 80240360 AE620074 */ sw $v0, 0x74($s3) +/* 91BC44 80240364 8FBF0044 */ lw $ra, 0x44($sp) +/* 91BC48 80240368 8FB40040 */ lw $s4, 0x40($sp) +/* 91BC4C 8024036C 8FB3003C */ lw $s3, 0x3c($sp) +/* 91BC50 80240370 8FB20038 */ lw $s2, 0x38($sp) +/* 91BC54 80240374 8FB10034 */ lw $s1, 0x34($sp) +/* 91BC58 80240378 8FB00030 */ lw $s0, 0x30($sp) +/* 91BC5C 8024037C 03E00008 */ jr $ra +/* 91BC60 80240380 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384.s deleted file mode 100644 index 89f7f94e95..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240384 -/* 91BC64 80240384 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91BC68 80240388 AFB20018 */ sw $s2, 0x18($sp) -/* 91BC6C 8024038C 0080902D */ daddu $s2, $a0, $zero -/* 91BC70 80240390 AFBF001C */ sw $ra, 0x1c($sp) -/* 91BC74 80240394 AFB10014 */ sw $s1, 0x14($sp) -/* 91BC78 80240398 AFB00010 */ sw $s0, 0x10($sp) -/* 91BC7C 8024039C 8E510148 */ lw $s1, 0x148($s2) -/* 91BC80 802403A0 0C00EABB */ jal get_npc_unsafe -/* 91BC84 802403A4 86240008 */ lh $a0, 8($s1) -/* 91BC88 802403A8 0040802D */ daddu $s0, $v0, $zero -/* 91BC8C 802403AC 9602008E */ lhu $v0, 0x8e($s0) -/* 91BC90 802403B0 2442FFFF */ addiu $v0, $v0, -1 -/* 91BC94 802403B4 A602008E */ sh $v0, 0x8e($s0) -/* 91BC98 802403B8 00021400 */ sll $v0, $v0, 0x10 -/* 91BC9C 802403BC 1C400012 */ bgtz $v0, .L80240408 -/* 91BCA0 802403C0 00000000 */ nop -/* 91BCA4 802403C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91BCA8 802403C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91BCAC 802403CC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91BCB0 802403D0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91BCB4 802403D4 8C460028 */ lw $a2, 0x28($v0) -/* 91BCB8 802403D8 0C00A720 */ jal atan2 -/* 91BCBC 802403DC 8C470030 */ lw $a3, 0x30($v0) -/* 91BCC0 802403E0 0200202D */ daddu $a0, $s0, $zero -/* 91BCC4 802403E4 0C00EAE8 */ jal enable_npc_shadow -/* 91BCC8 802403E8 E600000C */ swc1 $f0, 0xc($s0) -/* 91BCCC 802403EC 8E2200CC */ lw $v0, 0xcc($s1) -/* 91BCD0 802403F0 8C430028 */ lw $v1, 0x28($v0) -/* 91BCD4 802403F4 24020008 */ addiu $v0, $zero, 8 -/* 91BCD8 802403F8 A602008E */ sh $v0, 0x8e($s0) -/* 91BCDC 802403FC 24020003 */ addiu $v0, $zero, 3 -/* 91BCE0 80240400 AE030028 */ sw $v1, 0x28($s0) -/* 91BCE4 80240404 AE420070 */ sw $v0, 0x70($s2) -.L80240408: -/* 91BCE8 80240408 8FBF001C */ lw $ra, 0x1c($sp) -/* 91BCEC 8024040C 8FB20018 */ lw $s2, 0x18($sp) -/* 91BCF0 80240410 8FB10014 */ lw $s1, 0x14($sp) -/* 91BCF4 80240414 8FB00010 */ lw $s0, 0x10($sp) -/* 91BCF8 80240418 03E00008 */ jr $ra -/* 91BCFC 8024041C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384_91BC64.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384_91BC64.s new file mode 100644 index 0000000000..31bfd30720 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240384_91BC64.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240384_91BC64 +/* 91BC64 80240384 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91BC68 80240388 AFB20018 */ sw $s2, 0x18($sp) +/* 91BC6C 8024038C 0080902D */ daddu $s2, $a0, $zero +/* 91BC70 80240390 AFBF001C */ sw $ra, 0x1c($sp) +/* 91BC74 80240394 AFB10014 */ sw $s1, 0x14($sp) +/* 91BC78 80240398 AFB00010 */ sw $s0, 0x10($sp) +/* 91BC7C 8024039C 8E510148 */ lw $s1, 0x148($s2) +/* 91BC80 802403A0 0C00EABB */ jal get_npc_unsafe +/* 91BC84 802403A4 86240008 */ lh $a0, 8($s1) +/* 91BC88 802403A8 0040802D */ daddu $s0, $v0, $zero +/* 91BC8C 802403AC 9602008E */ lhu $v0, 0x8e($s0) +/* 91BC90 802403B0 2442FFFF */ addiu $v0, $v0, -1 +/* 91BC94 802403B4 A602008E */ sh $v0, 0x8e($s0) +/* 91BC98 802403B8 00021400 */ sll $v0, $v0, 0x10 +/* 91BC9C 802403BC 1C400012 */ bgtz $v0, .L80240408 +/* 91BCA0 802403C0 00000000 */ nop +/* 91BCA4 802403C4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 91BCA8 802403C8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 91BCAC 802403CC C60C0038 */ lwc1 $f12, 0x38($s0) +/* 91BCB0 802403D0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91BCB4 802403D4 8C460028 */ lw $a2, 0x28($v0) +/* 91BCB8 802403D8 0C00A720 */ jal atan2 +/* 91BCBC 802403DC 8C470030 */ lw $a3, 0x30($v0) +/* 91BCC0 802403E0 0200202D */ daddu $a0, $s0, $zero +/* 91BCC4 802403E4 0C00EAE8 */ jal enable_npc_shadow +/* 91BCC8 802403E8 E600000C */ swc1 $f0, 0xc($s0) +/* 91BCCC 802403EC 8E2200CC */ lw $v0, 0xcc($s1) +/* 91BCD0 802403F0 8C430028 */ lw $v1, 0x28($v0) +/* 91BCD4 802403F4 24020008 */ addiu $v0, $zero, 8 +/* 91BCD8 802403F8 A602008E */ sh $v0, 0x8e($s0) +/* 91BCDC 802403FC 24020003 */ addiu $v0, $zero, 3 +/* 91BCE0 80240400 AE030028 */ sw $v1, 0x28($s0) +/* 91BCE4 80240404 AE420070 */ sw $v0, 0x70($s2) +.L80240408: +/* 91BCE8 80240408 8FBF001C */ lw $ra, 0x1c($sp) +/* 91BCEC 8024040C 8FB20018 */ lw $s2, 0x18($sp) +/* 91BCF0 80240410 8FB10014 */ lw $s1, 0x14($sp) +/* 91BCF4 80240414 8FB00010 */ lw $s0, 0x10($sp) +/* 91BCF8 80240418 03E00008 */ jr $ra +/* 91BCFC 8024041C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420.s deleted file mode 100644 index dd1a7fa7d9..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240420 -/* 91BD00 80240420 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91BD04 80240424 AFB10014 */ sw $s1, 0x14($sp) -/* 91BD08 80240428 0080882D */ daddu $s1, $a0, $zero -/* 91BD0C 8024042C AFBF0018 */ sw $ra, 0x18($sp) -/* 91BD10 80240430 AFB00010 */ sw $s0, 0x10($sp) -/* 91BD14 80240434 8E220148 */ lw $v0, 0x148($s1) -/* 91BD18 80240438 0C00EABB */ jal get_npc_unsafe -/* 91BD1C 8024043C 84440008 */ lh $a0, 8($v0) -/* 91BD20 80240440 0040802D */ daddu $s0, $v0, $zero -/* 91BD24 80240444 9602008E */ lhu $v0, 0x8e($s0) -/* 91BD28 80240448 2442FFFF */ addiu $v0, $v0, -1 -/* 91BD2C 8024044C A602008E */ sh $v0, 0x8e($s0) -/* 91BD30 80240450 00021400 */ sll $v0, $v0, 0x10 -/* 91BD34 80240454 1C40000F */ bgtz $v0, .L80240494 -/* 91BD38 80240458 00000000 */ nop -/* 91BD3C 8024045C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91BD40 80240460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91BD44 80240464 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91BD48 80240468 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91BD4C 8024046C 8C460028 */ lw $a2, 0x28($v0) -/* 91BD50 80240470 0C00A720 */ jal atan2 -/* 91BD54 80240474 8C470030 */ lw $a3, 0x30($v0) -/* 91BD58 80240478 2402001A */ addiu $v0, $zero, 0x1a -/* 91BD5C 8024047C A60200A8 */ sh $v0, 0xa8($s0) -/* 91BD60 80240480 24020018 */ addiu $v0, $zero, 0x18 -/* 91BD64 80240484 A60200A6 */ sh $v0, 0xa6($s0) -/* 91BD68 80240488 24020004 */ addiu $v0, $zero, 4 -/* 91BD6C 8024048C E600000C */ swc1 $f0, 0xc($s0) -/* 91BD70 80240490 AE220070 */ sw $v0, 0x70($s1) -.L80240494: -/* 91BD74 80240494 8FBF0018 */ lw $ra, 0x18($sp) -/* 91BD78 80240498 8FB10014 */ lw $s1, 0x14($sp) -/* 91BD7C 8024049C 8FB00010 */ lw $s0, 0x10($sp) -/* 91BD80 802404A0 03E00008 */ jr $ra -/* 91BD84 802404A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420_91BD00.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420_91BD00.s new file mode 100644 index 0000000000..1009182204 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240420_91BD00.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240420_91BD00 +/* 91BD00 80240420 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91BD04 80240424 AFB10014 */ sw $s1, 0x14($sp) +/* 91BD08 80240428 0080882D */ daddu $s1, $a0, $zero +/* 91BD0C 8024042C AFBF0018 */ sw $ra, 0x18($sp) +/* 91BD10 80240430 AFB00010 */ sw $s0, 0x10($sp) +/* 91BD14 80240434 8E220148 */ lw $v0, 0x148($s1) +/* 91BD18 80240438 0C00EABB */ jal get_npc_unsafe +/* 91BD1C 8024043C 84440008 */ lh $a0, 8($v0) +/* 91BD20 80240440 0040802D */ daddu $s0, $v0, $zero +/* 91BD24 80240444 9602008E */ lhu $v0, 0x8e($s0) +/* 91BD28 80240448 2442FFFF */ addiu $v0, $v0, -1 +/* 91BD2C 8024044C A602008E */ sh $v0, 0x8e($s0) +/* 91BD30 80240450 00021400 */ sll $v0, $v0, 0x10 +/* 91BD34 80240454 1C40000F */ bgtz $v0, .L80240494 +/* 91BD38 80240458 00000000 */ nop +/* 91BD3C 8024045C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 91BD40 80240460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 91BD44 80240464 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 91BD48 80240468 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91BD4C 8024046C 8C460028 */ lw $a2, 0x28($v0) +/* 91BD50 80240470 0C00A720 */ jal atan2 +/* 91BD54 80240474 8C470030 */ lw $a3, 0x30($v0) +/* 91BD58 80240478 2402001A */ addiu $v0, $zero, 0x1a +/* 91BD5C 8024047C A60200A8 */ sh $v0, 0xa8($s0) +/* 91BD60 80240480 24020018 */ addiu $v0, $zero, 0x18 +/* 91BD64 80240484 A60200A6 */ sh $v0, 0xa6($s0) +/* 91BD68 80240488 24020004 */ addiu $v0, $zero, 4 +/* 91BD6C 8024048C E600000C */ swc1 $f0, 0xc($s0) +/* 91BD70 80240490 AE220070 */ sw $v0, 0x70($s1) +.L80240494: +/* 91BD74 80240494 8FBF0018 */ lw $ra, 0x18($sp) +/* 91BD78 80240498 8FB10014 */ lw $s1, 0x14($sp) +/* 91BD7C 8024049C 8FB00010 */ lw $s0, 0x10($sp) +/* 91BD80 802404A0 03E00008 */ jr $ra +/* 91BD84 802404A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550.s deleted file mode 100644 index 38001feea4..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240550 -/* 91BE30 80240550 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 91BE34 80240554 AFB3003C */ sw $s3, 0x3c($sp) -/* 91BE38 80240558 0080982D */ daddu $s3, $a0, $zero -/* 91BE3C 8024055C AFBF0040 */ sw $ra, 0x40($sp) -/* 91BE40 80240560 AFB20038 */ sw $s2, 0x38($sp) -/* 91BE44 80240564 AFB10034 */ sw $s1, 0x34($sp) -/* 91BE48 80240568 AFB00030 */ sw $s0, 0x30($sp) -/* 91BE4C 8024056C 8E700148 */ lw $s0, 0x148($s3) -/* 91BE50 80240570 00A0902D */ daddu $s2, $a1, $zero -/* 91BE54 80240574 86040008 */ lh $a0, 8($s0) -/* 91BE58 80240578 0C00EABB */ jal get_npc_unsafe -/* 91BE5C 8024057C 00C0882D */ daddu $s1, $a2, $zero -/* 91BE60 80240580 0220202D */ daddu $a0, $s1, $zero -/* 91BE64 80240584 0200282D */ daddu $a1, $s0, $zero -/* 91BE68 80240588 AFA00010 */ sw $zero, 0x10($sp) -/* 91BE6C 8024058C 8E460024 */ lw $a2, 0x24($s2) -/* 91BE70 80240590 8E470028 */ lw $a3, 0x28($s2) -/* 91BE74 80240594 0C01242D */ jal func_800490B4 -/* 91BE78 80240598 0040802D */ daddu $s0, $v0, $zero -/* 91BE7C 8024059C 1040000B */ beqz $v0, .L802405CC -/* 91BE80 802405A0 00000000 */ nop -/* 91BE84 802405A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91BE88 802405A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91BE8C 802405AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91BE90 802405B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91BE94 802405B4 8C460028 */ lw $a2, 0x28($v0) -/* 91BE98 802405B8 0C00A720 */ jal atan2 -/* 91BE9C 802405BC 8C470030 */ lw $a3, 0x30($v0) -/* 91BEA0 802405C0 2402000C */ addiu $v0, $zero, 0xc -/* 91BEA4 802405C4 080901A9 */ j .L802406A4 -/* 91BEA8 802405C8 E600000C */ swc1 $f0, 0xc($s0) -.L802405CC: -/* 91BEAC 802405CC 9602008E */ lhu $v0, 0x8e($s0) -/* 91BEB0 802405D0 2442FFFF */ addiu $v0, $v0, -1 -/* 91BEB4 802405D4 A602008E */ sh $v0, 0x8e($s0) -/* 91BEB8 802405D8 00021400 */ sll $v0, $v0, 0x10 -/* 91BEBC 802405DC 1C400032 */ bgtz $v0, .L802406A8 -/* 91BEC0 802405E0 00000000 */ nop -/* 91BEC4 802405E4 8E620074 */ lw $v0, 0x74($s3) -/* 91BEC8 802405E8 2442FFFF */ addiu $v0, $v0, -1 -/* 91BECC 802405EC 18400014 */ blez $v0, .L80240640 -/* 91BED0 802405F0 AE620074 */ sw $v0, 0x74($s3) -/* 91BED4 802405F4 C600000C */ lwc1 $f0, 0xc($s0) -/* 91BED8 802405F8 3C014334 */ lui $at, 0x4334 -/* 91BEDC 802405FC 44816000 */ mtc1 $at, $f12 -/* 91BEE0 80240600 0C00A6C9 */ jal clamp_angle -/* 91BEE4 80240604 460C0300 */ add.s $f12, $f0, $f12 -/* 91BEE8 80240608 E600000C */ swc1 $f0, 0xc($s0) -/* 91BEEC 8024060C 8E440008 */ lw $a0, 8($s2) -/* 91BEF0 80240610 000417C2 */ srl $v0, $a0, 0x1f -/* 91BEF4 80240614 00822021 */ addu $a0, $a0, $v0 -/* 91BEF8 80240618 00042043 */ sra $a0, $a0, 1 -/* 91BEFC 8024061C 0C00A67F */ jal rand_int -/* 91BF00 80240620 24840001 */ addiu $a0, $a0, 1 -/* 91BF04 80240624 8E430008 */ lw $v1, 8($s2) -/* 91BF08 80240628 000327C2 */ srl $a0, $v1, 0x1f -/* 91BF0C 8024062C 00641821 */ addu $v1, $v1, $a0 -/* 91BF10 80240630 00031843 */ sra $v1, $v1, 1 -/* 91BF14 80240634 00621821 */ addu $v1, $v1, $v0 -/* 91BF18 80240638 080901AA */ j .L802406A8 -/* 91BF1C 8024063C A603008E */ sh $v1, 0x8e($s0) -.L80240640: -/* 91BF20 80240640 24040002 */ addiu $a0, $zero, 2 -/* 91BF24 80240644 0200282D */ daddu $a1, $s0, $zero -/* 91BF28 80240648 0000302D */ daddu $a2, $zero, $zero -/* 91BF2C 8024064C 860300A8 */ lh $v1, 0xa8($s0) -/* 91BF30 80240650 3C013F80 */ lui $at, 0x3f80 -/* 91BF34 80240654 44810000 */ mtc1 $at, $f0 -/* 91BF38 80240658 3C014000 */ lui $at, 0x4000 -/* 91BF3C 8024065C 44811000 */ mtc1 $at, $f2 -/* 91BF40 80240660 3C01C1A0 */ lui $at, 0xc1a0 -/* 91BF44 80240664 44812000 */ mtc1 $at, $f4 -/* 91BF48 80240668 2402000C */ addiu $v0, $zero, 0xc -/* 91BF4C 8024066C AFA2001C */ sw $v0, 0x1c($sp) -/* 91BF50 80240670 44833000 */ mtc1 $v1, $f6 -/* 91BF54 80240674 00000000 */ nop -/* 91BF58 80240678 468031A0 */ cvt.s.w $f6, $f6 -/* 91BF5C 8024067C 44073000 */ mfc1 $a3, $f6 -/* 91BF60 80240680 27A20028 */ addiu $v0, $sp, 0x28 -/* 91BF64 80240684 AFA20020 */ sw $v0, 0x20($sp) -/* 91BF68 80240688 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91BF6C 8024068C E7A20014 */ swc1 $f2, 0x14($sp) -/* 91BF70 80240690 0C01BFA4 */ jal fx_emote -/* 91BF74 80240694 E7A40018 */ swc1 $f4, 0x18($sp) -/* 91BF78 80240698 2402000F */ addiu $v0, $zero, 0xf -/* 91BF7C 8024069C A602008E */ sh $v0, 0x8e($s0) -/* 91BF80 802406A0 24020028 */ addiu $v0, $zero, 0x28 -.L802406A4: -/* 91BF84 802406A4 AE620070 */ sw $v0, 0x70($s3) -.L802406A8: -/* 91BF88 802406A8 8FBF0040 */ lw $ra, 0x40($sp) -/* 91BF8C 802406AC 8FB3003C */ lw $s3, 0x3c($sp) -/* 91BF90 802406B0 8FB20038 */ lw $s2, 0x38($sp) -/* 91BF94 802406B4 8FB10034 */ lw $s1, 0x34($sp) -/* 91BF98 802406B8 8FB00030 */ lw $s0, 0x30($sp) -/* 91BF9C 802406BC 03E00008 */ jr $ra -/* 91BFA0 802406C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s new file mode 100644 index 0000000000..c8cca79339 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240550_91BE30.s @@ -0,0 +1,101 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240550_91BE30 +/* 91BE30 80240550 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 91BE34 80240554 AFB3003C */ sw $s3, 0x3c($sp) +/* 91BE38 80240558 0080982D */ daddu $s3, $a0, $zero +/* 91BE3C 8024055C AFBF0040 */ sw $ra, 0x40($sp) +/* 91BE40 80240560 AFB20038 */ sw $s2, 0x38($sp) +/* 91BE44 80240564 AFB10034 */ sw $s1, 0x34($sp) +/* 91BE48 80240568 AFB00030 */ sw $s0, 0x30($sp) +/* 91BE4C 8024056C 8E700148 */ lw $s0, 0x148($s3) +/* 91BE50 80240570 00A0902D */ daddu $s2, $a1, $zero +/* 91BE54 80240574 86040008 */ lh $a0, 8($s0) +/* 91BE58 80240578 0C00EABB */ jal get_npc_unsafe +/* 91BE5C 8024057C 00C0882D */ daddu $s1, $a2, $zero +/* 91BE60 80240580 0220202D */ daddu $a0, $s1, $zero +/* 91BE64 80240584 0200282D */ daddu $a1, $s0, $zero +/* 91BE68 80240588 AFA00010 */ sw $zero, 0x10($sp) +/* 91BE6C 8024058C 8E460024 */ lw $a2, 0x24($s2) +/* 91BE70 80240590 8E470028 */ lw $a3, 0x28($s2) +/* 91BE74 80240594 0C01242D */ jal func_800490B4 +/* 91BE78 80240598 0040802D */ daddu $s0, $v0, $zero +/* 91BE7C 8024059C 1040000B */ beqz $v0, .L802405CC +/* 91BE80 802405A0 00000000 */ nop +/* 91BE84 802405A4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 91BE88 802405A8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 91BE8C 802405AC C60C0038 */ lwc1 $f12, 0x38($s0) +/* 91BE90 802405B0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91BE94 802405B4 8C460028 */ lw $a2, 0x28($v0) +/* 91BE98 802405B8 0C00A720 */ jal atan2 +/* 91BE9C 802405BC 8C470030 */ lw $a3, 0x30($v0) +/* 91BEA0 802405C0 2402000C */ addiu $v0, $zero, 0xc +/* 91BEA4 802405C4 080901A9 */ j .L802406A4 +/* 91BEA8 802405C8 E600000C */ swc1 $f0, 0xc($s0) +.L802405CC: +/* 91BEAC 802405CC 9602008E */ lhu $v0, 0x8e($s0) +/* 91BEB0 802405D0 2442FFFF */ addiu $v0, $v0, -1 +/* 91BEB4 802405D4 A602008E */ sh $v0, 0x8e($s0) +/* 91BEB8 802405D8 00021400 */ sll $v0, $v0, 0x10 +/* 91BEBC 802405DC 1C400032 */ bgtz $v0, .L802406A8 +/* 91BEC0 802405E0 00000000 */ nop +/* 91BEC4 802405E4 8E620074 */ lw $v0, 0x74($s3) +/* 91BEC8 802405E8 2442FFFF */ addiu $v0, $v0, -1 +/* 91BECC 802405EC 18400014 */ blez $v0, .L80240640 +/* 91BED0 802405F0 AE620074 */ sw $v0, 0x74($s3) +/* 91BED4 802405F4 C600000C */ lwc1 $f0, 0xc($s0) +/* 91BED8 802405F8 3C014334 */ lui $at, 0x4334 +/* 91BEDC 802405FC 44816000 */ mtc1 $at, $f12 +/* 91BEE0 80240600 0C00A6C9 */ jal clamp_angle +/* 91BEE4 80240604 460C0300 */ add.s $f12, $f0, $f12 +/* 91BEE8 80240608 E600000C */ swc1 $f0, 0xc($s0) +/* 91BEEC 8024060C 8E440008 */ lw $a0, 8($s2) +/* 91BEF0 80240610 000417C2 */ srl $v0, $a0, 0x1f +/* 91BEF4 80240614 00822021 */ addu $a0, $a0, $v0 +/* 91BEF8 80240618 00042043 */ sra $a0, $a0, 1 +/* 91BEFC 8024061C 0C00A67F */ jal rand_int +/* 91BF00 80240620 24840001 */ addiu $a0, $a0, 1 +/* 91BF04 80240624 8E430008 */ lw $v1, 8($s2) +/* 91BF08 80240628 000327C2 */ srl $a0, $v1, 0x1f +/* 91BF0C 8024062C 00641821 */ addu $v1, $v1, $a0 +/* 91BF10 80240630 00031843 */ sra $v1, $v1, 1 +/* 91BF14 80240634 00621821 */ addu $v1, $v1, $v0 +/* 91BF18 80240638 080901AA */ j .L802406A8 +/* 91BF1C 8024063C A603008E */ sh $v1, 0x8e($s0) +.L80240640: +/* 91BF20 80240640 24040002 */ addiu $a0, $zero, 2 +/* 91BF24 80240644 0200282D */ daddu $a1, $s0, $zero +/* 91BF28 80240648 0000302D */ daddu $a2, $zero, $zero +/* 91BF2C 8024064C 860300A8 */ lh $v1, 0xa8($s0) +/* 91BF30 80240650 3C013F80 */ lui $at, 0x3f80 +/* 91BF34 80240654 44810000 */ mtc1 $at, $f0 +/* 91BF38 80240658 3C014000 */ lui $at, 0x4000 +/* 91BF3C 8024065C 44811000 */ mtc1 $at, $f2 +/* 91BF40 80240660 3C01C1A0 */ lui $at, 0xc1a0 +/* 91BF44 80240664 44812000 */ mtc1 $at, $f4 +/* 91BF48 80240668 2402000C */ addiu $v0, $zero, 0xc +/* 91BF4C 8024066C AFA2001C */ sw $v0, 0x1c($sp) +/* 91BF50 80240670 44833000 */ mtc1 $v1, $f6 +/* 91BF54 80240674 00000000 */ nop +/* 91BF58 80240678 468031A0 */ cvt.s.w $f6, $f6 +/* 91BF5C 8024067C 44073000 */ mfc1 $a3, $f6 +/* 91BF60 80240680 27A20028 */ addiu $v0, $sp, 0x28 +/* 91BF64 80240684 AFA20020 */ sw $v0, 0x20($sp) +/* 91BF68 80240688 E7A00010 */ swc1 $f0, 0x10($sp) +/* 91BF6C 8024068C E7A20014 */ swc1 $f2, 0x14($sp) +/* 91BF70 80240690 0C01BFA4 */ jal fx_emote +/* 91BF74 80240694 E7A40018 */ swc1 $f4, 0x18($sp) +/* 91BF78 80240698 2402000F */ addiu $v0, $zero, 0xf +/* 91BF7C 8024069C A602008E */ sh $v0, 0x8e($s0) +/* 91BF80 802406A0 24020028 */ addiu $v0, $zero, 0x28 +.L802406A4: +/* 91BF84 802406A4 AE620070 */ sw $v0, 0x70($s3) +.L802406A8: +/* 91BF88 802406A8 8FBF0040 */ lw $ra, 0x40($sp) +/* 91BF8C 802406AC 8FB3003C */ lw $s3, 0x3c($sp) +/* 91BF90 802406B0 8FB20038 */ lw $s2, 0x38($sp) +/* 91BF94 802406B4 8FB10034 */ lw $s1, 0x34($sp) +/* 91BF98 802406B8 8FB00030 */ lw $s0, 0x30($sp) +/* 91BF9C 802406BC 03E00008 */ jr $ra +/* 91BFA0 802406C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714.s deleted file mode 100644 index aa787fb909..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714.s +++ /dev/null @@ -1,111 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240714 -/* 91BFF4 80240714 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 91BFF8 80240718 AFB30024 */ sw $s3, 0x24($sp) -/* 91BFFC 8024071C 0080982D */ daddu $s3, $a0, $zero -/* 91C000 80240720 AFBF002C */ sw $ra, 0x2c($sp) -/* 91C004 80240724 AFB40028 */ sw $s4, 0x28($sp) -/* 91C008 80240728 AFB20020 */ sw $s2, 0x20($sp) -/* 91C00C 8024072C AFB1001C */ sw $s1, 0x1c($sp) -/* 91C010 80240730 AFB00018 */ sw $s0, 0x18($sp) -/* 91C014 80240734 8E710148 */ lw $s1, 0x148($s3) -/* 91C018 80240738 86240008 */ lh $a0, 8($s1) -/* 91C01C 8024073C 0C00EABB */ jal get_npc_unsafe -/* 91C020 80240740 00A0A02D */ daddu $s4, $a1, $zero -/* 91C024 80240744 0040802D */ daddu $s0, $v0, $zero -/* 91C028 80240748 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 91C02C 8024074C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 91C030 80240750 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C034 80240754 8E420000 */ lw $v0, ($s2) -/* 91C038 80240758 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C03C 8024075C 8C460028 */ lw $a2, 0x28($v0) -/* 91C040 80240760 0C00A720 */ jal atan2 -/* 91C044 80240764 8C470030 */ lw $a3, 0x30($v0) -/* 91C048 80240768 3C025555 */ lui $v0, 0x5555 -/* 91C04C 8024076C 9603008E */ lhu $v1, 0x8e($s0) -/* 91C050 80240770 34425556 */ ori $v0, $v0, 0x5556 -/* 91C054 80240774 00031C00 */ sll $v1, $v1, 0x10 -/* 91C058 80240778 00032403 */ sra $a0, $v1, 0x10 -/* 91C05C 8024077C 00820018 */ mult $a0, $v0 -/* 91C060 80240780 00031FC3 */ sra $v1, $v1, 0x1f -/* 91C064 80240784 00004010 */ mfhi $t0 -/* 91C068 80240788 01031823 */ subu $v1, $t0, $v1 -/* 91C06C 8024078C 00031040 */ sll $v0, $v1, 1 -/* 91C070 80240790 00431021 */ addu $v0, $v0, $v1 -/* 91C074 80240794 00822023 */ subu $a0, $a0, $v0 -/* 91C078 80240798 00042400 */ sll $a0, $a0, 0x10 -/* 91C07C 8024079C 1480000C */ bnez $a0, .L802407D0 -/* 91C080 802407A0 E600000C */ swc1 $f0, 0xc($s0) -/* 91C084 802407A4 C6020040 */ lwc1 $f2, 0x40($s0) -/* 91C088 802407A8 3C014000 */ lui $at, 0x4000 -/* 91C08C 802407AC 44810000 */ mtc1 $at, $f0 -/* 91C090 802407B0 AFA00010 */ sw $zero, 0x10($sp) -/* 91C094 802407B4 AFA00014 */ sw $zero, 0x14($sp) -/* 91C098 802407B8 46001080 */ add.s $f2, $f2, $f0 -/* 91C09C 802407BC 8E06003C */ lw $a2, 0x3c($s0) -/* 91C0A0 802407C0 8E050038 */ lw $a1, 0x38($s0) -/* 91C0A4 802407C4 44071000 */ mfc1 $a3, $f2 -/* 91C0A8 802407C8 0C01BECC */ jal fx_walk_normal -/* 91C0AC 802407CC 24040002 */ addiu $a0, $zero, 2 -.L802407D0: -/* 91C0B0 802407D0 9602008E */ lhu $v0, 0x8e($s0) -/* 91C0B4 802407D4 2442FFFF */ addiu $v0, $v0, -1 -/* 91C0B8 802407D8 A602008E */ sh $v0, 0x8e($s0) -/* 91C0BC 802407DC 00021400 */ sll $v0, $v0, 0x10 -/* 91C0C0 802407E0 1C40002C */ bgtz $v0, .L80240894 -/* 91C0C4 802407E4 00000000 */ nop -/* 91C0C8 802407E8 C6000038 */ lwc1 $f0, 0x38($s0) -/* 91C0CC 802407EC 4600010D */ trunc.w.s $f4, $f0 -/* 91C0D0 802407F0 44022000 */ mfc1 $v0, $f4 -/* 91C0D4 802407F4 00000000 */ nop -/* 91C0D8 802407F8 A6220010 */ sh $v0, 0x10($s1) -/* 91C0DC 802407FC C600003C */ lwc1 $f0, 0x3c($s0) -/* 91C0E0 80240800 4600010D */ trunc.w.s $f4, $f0 -/* 91C0E4 80240804 44022000 */ mfc1 $v0, $f4 -/* 91C0E8 80240808 00000000 */ nop -/* 91C0EC 8024080C A6220012 */ sh $v0, 0x12($s1) -/* 91C0F0 80240810 C6000040 */ lwc1 $f0, 0x40($s0) -/* 91C0F4 80240814 24020001 */ addiu $v0, $zero, 1 -/* 91C0F8 80240818 A2220007 */ sb $v0, 7($s1) -/* 91C0FC 8024081C 4600010D */ trunc.w.s $f4, $f0 -/* 91C100 80240820 44022000 */ mfc1 $v0, $f4 -/* 91C104 80240824 00000000 */ nop -/* 91C108 80240828 A6220014 */ sh $v0, 0x14($s1) -/* 91C10C 8024082C C6800018 */ lwc1 $f0, 0x18($s4) -/* 91C110 80240830 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C114 80240834 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C118 80240838 8E420000 */ lw $v0, ($s2) -/* 91C11C 8024083C E6000018 */ swc1 $f0, 0x18($s0) -/* 91C120 80240840 8C460028 */ lw $a2, 0x28($v0) -/* 91C124 80240844 0C00A7B5 */ jal dist2D -/* 91C128 80240848 8C470030 */ lw $a3, 0x30($v0) -/* 91C12C 8024084C C6020018 */ lwc1 $f2, 0x18($s0) -/* 91C130 80240850 46020003 */ div.s $f0, $f0, $f2 -/* 91C134 80240854 3C018024 */ lui $at, 0x8024 -/* 91C138 80240858 D4222BA8 */ ldc1 $f2, 0x2ba8($at) -/* 91C13C 8024085C 46000021 */ cvt.d.s $f0, $f0 -/* 91C140 80240860 46220000 */ add.d $f0, $f0, $f2 -/* 91C144 80240864 4620010D */ trunc.w.d $f4, $f0 -/* 91C148 80240868 44022000 */ mfc1 $v0, $f4 -/* 91C14C 8024086C 00000000 */ nop -/* 91C150 80240870 A602008E */ sh $v0, 0x8e($s0) -/* 91C154 80240874 00021400 */ sll $v0, $v0, 0x10 -/* 91C158 80240878 00021403 */ sra $v0, $v0, 0x10 -/* 91C15C 8024087C 2842000F */ slti $v0, $v0, 0xf -/* 91C160 80240880 10400002 */ beqz $v0, .L8024088C -/* 91C164 80240884 2402000F */ addiu $v0, $zero, 0xf -/* 91C168 80240888 A602008E */ sh $v0, 0x8e($s0) -.L8024088C: -/* 91C16C 8024088C 24020016 */ addiu $v0, $zero, 0x16 -/* 91C170 80240890 AE620070 */ sw $v0, 0x70($s3) -.L80240894: -/* 91C174 80240894 8FBF002C */ lw $ra, 0x2c($sp) -/* 91C178 80240898 8FB40028 */ lw $s4, 0x28($sp) -/* 91C17C 8024089C 8FB30024 */ lw $s3, 0x24($sp) -/* 91C180 802408A0 8FB20020 */ lw $s2, 0x20($sp) -/* 91C184 802408A4 8FB1001C */ lw $s1, 0x1c($sp) -/* 91C188 802408A8 8FB00018 */ lw $s0, 0x18($sp) -/* 91C18C 802408AC 03E00008 */ jr $ra -/* 91C190 802408B0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s new file mode 100644 index 0000000000..6afd1924f8 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240714_91BFF4.s @@ -0,0 +1,111 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240714_91BFF4 +/* 91BFF4 80240714 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 91BFF8 80240718 AFB30024 */ sw $s3, 0x24($sp) +/* 91BFFC 8024071C 0080982D */ daddu $s3, $a0, $zero +/* 91C000 80240720 AFBF002C */ sw $ra, 0x2c($sp) +/* 91C004 80240724 AFB40028 */ sw $s4, 0x28($sp) +/* 91C008 80240728 AFB20020 */ sw $s2, 0x20($sp) +/* 91C00C 8024072C AFB1001C */ sw $s1, 0x1c($sp) +/* 91C010 80240730 AFB00018 */ sw $s0, 0x18($sp) +/* 91C014 80240734 8E710148 */ lw $s1, 0x148($s3) +/* 91C018 80240738 86240008 */ lh $a0, 8($s1) +/* 91C01C 8024073C 0C00EABB */ jal get_npc_unsafe +/* 91C020 80240740 00A0A02D */ daddu $s4, $a1, $zero +/* 91C024 80240744 0040802D */ daddu $s0, $v0, $zero +/* 91C028 80240748 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) +/* 91C02C 8024074C 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) +/* 91C030 80240750 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 91C034 80240754 8E420000 */ lw $v0, ($s2) +/* 91C038 80240758 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91C03C 8024075C 8C460028 */ lw $a2, 0x28($v0) +/* 91C040 80240760 0C00A720 */ jal atan2 +/* 91C044 80240764 8C470030 */ lw $a3, 0x30($v0) +/* 91C048 80240768 3C025555 */ lui $v0, 0x5555 +/* 91C04C 8024076C 9603008E */ lhu $v1, 0x8e($s0) +/* 91C050 80240770 34425556 */ ori $v0, $v0, 0x5556 +/* 91C054 80240774 00031C00 */ sll $v1, $v1, 0x10 +/* 91C058 80240778 00032403 */ sra $a0, $v1, 0x10 +/* 91C05C 8024077C 00820018 */ mult $a0, $v0 +/* 91C060 80240780 00031FC3 */ sra $v1, $v1, 0x1f +/* 91C064 80240784 00004010 */ mfhi $t0 +/* 91C068 80240788 01031823 */ subu $v1, $t0, $v1 +/* 91C06C 8024078C 00031040 */ sll $v0, $v1, 1 +/* 91C070 80240790 00431021 */ addu $v0, $v0, $v1 +/* 91C074 80240794 00822023 */ subu $a0, $a0, $v0 +/* 91C078 80240798 00042400 */ sll $a0, $a0, 0x10 +/* 91C07C 8024079C 1480000C */ bnez $a0, .L802407D0 +/* 91C080 802407A0 E600000C */ swc1 $f0, 0xc($s0) +/* 91C084 802407A4 C6020040 */ lwc1 $f2, 0x40($s0) +/* 91C088 802407A8 3C014000 */ lui $at, 0x4000 +/* 91C08C 802407AC 44810000 */ mtc1 $at, $f0 +/* 91C090 802407B0 AFA00010 */ sw $zero, 0x10($sp) +/* 91C094 802407B4 AFA00014 */ sw $zero, 0x14($sp) +/* 91C098 802407B8 46001080 */ add.s $f2, $f2, $f0 +/* 91C09C 802407BC 8E06003C */ lw $a2, 0x3c($s0) +/* 91C0A0 802407C0 8E050038 */ lw $a1, 0x38($s0) +/* 91C0A4 802407C4 44071000 */ mfc1 $a3, $f2 +/* 91C0A8 802407C8 0C01BECC */ jal fx_walk_normal +/* 91C0AC 802407CC 24040002 */ addiu $a0, $zero, 2 +.L802407D0: +/* 91C0B0 802407D0 9602008E */ lhu $v0, 0x8e($s0) +/* 91C0B4 802407D4 2442FFFF */ addiu $v0, $v0, -1 +/* 91C0B8 802407D8 A602008E */ sh $v0, 0x8e($s0) +/* 91C0BC 802407DC 00021400 */ sll $v0, $v0, 0x10 +/* 91C0C0 802407E0 1C40002C */ bgtz $v0, .L80240894 +/* 91C0C4 802407E4 00000000 */ nop +/* 91C0C8 802407E8 C6000038 */ lwc1 $f0, 0x38($s0) +/* 91C0CC 802407EC 4600010D */ trunc.w.s $f4, $f0 +/* 91C0D0 802407F0 44022000 */ mfc1 $v0, $f4 +/* 91C0D4 802407F4 00000000 */ nop +/* 91C0D8 802407F8 A6220010 */ sh $v0, 0x10($s1) +/* 91C0DC 802407FC C600003C */ lwc1 $f0, 0x3c($s0) +/* 91C0E0 80240800 4600010D */ trunc.w.s $f4, $f0 +/* 91C0E4 80240804 44022000 */ mfc1 $v0, $f4 +/* 91C0E8 80240808 00000000 */ nop +/* 91C0EC 8024080C A6220012 */ sh $v0, 0x12($s1) +/* 91C0F0 80240810 C6000040 */ lwc1 $f0, 0x40($s0) +/* 91C0F4 80240814 24020001 */ addiu $v0, $zero, 1 +/* 91C0F8 80240818 A2220007 */ sb $v0, 7($s1) +/* 91C0FC 8024081C 4600010D */ trunc.w.s $f4, $f0 +/* 91C100 80240820 44022000 */ mfc1 $v0, $f4 +/* 91C104 80240824 00000000 */ nop +/* 91C108 80240828 A6220014 */ sh $v0, 0x14($s1) +/* 91C10C 8024082C C6800018 */ lwc1 $f0, 0x18($s4) +/* 91C110 80240830 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 91C114 80240834 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91C118 80240838 8E420000 */ lw $v0, ($s2) +/* 91C11C 8024083C E6000018 */ swc1 $f0, 0x18($s0) +/* 91C120 80240840 8C460028 */ lw $a2, 0x28($v0) +/* 91C124 80240844 0C00A7B5 */ jal dist2D +/* 91C128 80240848 8C470030 */ lw $a3, 0x30($v0) +/* 91C12C 8024084C C6020018 */ lwc1 $f2, 0x18($s0) +/* 91C130 80240850 46020003 */ div.s $f0, $f0, $f2 +/* 91C134 80240854 3C018024 */ lui $at, 0x8024 +/* 91C138 80240858 D4222BA8 */ ldc1 $f2, 0x2ba8($at) +/* 91C13C 8024085C 46000021 */ cvt.d.s $f0, $f0 +/* 91C140 80240860 46220000 */ add.d $f0, $f0, $f2 +/* 91C144 80240864 4620010D */ trunc.w.d $f4, $f0 +/* 91C148 80240868 44022000 */ mfc1 $v0, $f4 +/* 91C14C 8024086C 00000000 */ nop +/* 91C150 80240870 A602008E */ sh $v0, 0x8e($s0) +/* 91C154 80240874 00021400 */ sll $v0, $v0, 0x10 +/* 91C158 80240878 00021403 */ sra $v0, $v0, 0x10 +/* 91C15C 8024087C 2842000F */ slti $v0, $v0, 0xf +/* 91C160 80240880 10400002 */ beqz $v0, .L8024088C +/* 91C164 80240884 2402000F */ addiu $v0, $zero, 0xf +/* 91C168 80240888 A602008E */ sh $v0, 0x8e($s0) +.L8024088C: +/* 91C16C 8024088C 24020016 */ addiu $v0, $zero, 0x16 +/* 91C170 80240890 AE620070 */ sw $v0, 0x70($s3) +.L80240894: +/* 91C174 80240894 8FBF002C */ lw $ra, 0x2c($sp) +/* 91C178 80240898 8FB40028 */ lw $s4, 0x28($sp) +/* 91C17C 8024089C 8FB30024 */ lw $s3, 0x24($sp) +/* 91C180 802408A0 8FB20020 */ lw $s2, 0x20($sp) +/* 91C184 802408A4 8FB1001C */ lw $s1, 0x1c($sp) +/* 91C188 802408A8 8FB00018 */ lw $s0, 0x18($sp) +/* 91C18C 802408AC 03E00008 */ jr $ra +/* 91C190 802408B0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4.s deleted file mode 100644 index 352da189f4..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408B4 -/* 91C194 802408B4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 91C198 802408B8 AFB3003C */ sw $s3, 0x3c($sp) -/* 91C19C 802408BC 0080982D */ daddu $s3, $a0, $zero -/* 91C1A0 802408C0 AFBF0040 */ sw $ra, 0x40($sp) -/* 91C1A4 802408C4 AFB20038 */ sw $s2, 0x38($sp) -/* 91C1A8 802408C8 AFB10034 */ sw $s1, 0x34($sp) -/* 91C1AC 802408CC AFB00030 */ sw $s0, 0x30($sp) -/* 91C1B0 802408D0 8E720148 */ lw $s2, 0x148($s3) -/* 91C1B4 802408D4 0C00EABB */ jal get_npc_unsafe -/* 91C1B8 802408D8 86440008 */ lh $a0, 8($s2) -/* 91C1BC 802408DC 0040802D */ daddu $s0, $v0, $zero -/* 91C1C0 802408E0 0200202D */ daddu $a0, $s0, $zero -/* 91C1C4 802408E4 0C00F598 */ jal func_8003D660 -/* 91C1C8 802408E8 24050001 */ addiu $a1, $zero, 1 -/* 91C1CC 802408EC 8E050018 */ lw $a1, 0x18($s0) -/* 91C1D0 802408F0 8E06000C */ lw $a2, 0xc($s0) -/* 91C1D4 802408F4 0C00EA95 */ jal npc_move_heading -/* 91C1D8 802408F8 0200202D */ daddu $a0, $s0, $zero -/* 91C1DC 802408FC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 91C1E0 80240900 C6000040 */ lwc1 $f0, 0x40($s0) -/* 91C1E4 80240904 C462001C */ lwc1 $f2, 0x1c($v1) -/* 91C1E8 80240908 468010A0 */ cvt.s.w $f2, $f2 -/* 91C1EC 8024090C C4640024 */ lwc1 $f4, 0x24($v1) -/* 91C1F0 80240910 46802120 */ cvt.s.w $f4, $f4 -/* 91C1F4 80240914 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91C1F8 80240918 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C1FC 8024091C 44051000 */ mfc1 $a1, $f2 -/* 91C200 80240920 C4400028 */ lwc1 $f0, 0x28($v0) -/* 91C204 80240924 46800020 */ cvt.s.w $f0, $f0 -/* 91C208 80240928 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91C20C 8024092C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C210 80240930 44062000 */ mfc1 $a2, $f4 -/* 91C214 80240934 C440002C */ lwc1 $f0, 0x2c($v0) -/* 91C218 80240938 46800020 */ cvt.s.w $f0, $f0 -/* 91C21C 8024093C E7A00018 */ swc1 $f0, 0x18($sp) -/* 91C220 80240940 8C640030 */ lw $a0, 0x30($v1) -/* 91C224 80240944 0C0123F5 */ jal is_point_within_region -/* 91C228 80240948 8E070038 */ lw $a3, 0x38($s0) -/* 91C22C 8024094C C6000038 */ lwc1 $f0, 0x38($s0) -/* 91C230 80240950 C602003C */ lwc1 $f2, 0x3c($s0) -/* 91C234 80240954 C6040040 */ lwc1 $f4, 0x40($s0) -/* 91C238 80240958 3C013F80 */ lui $at, 0x3f80 -/* 91C23C 8024095C 44813000 */ mtc1 $at, $f6 -/* 91C240 80240960 E7A00020 */ swc1 $f0, 0x20($sp) -/* 91C244 80240964 E7A20024 */ swc1 $f2, 0x24($sp) -/* 91C248 80240968 E7A40028 */ swc1 $f4, 0x28($sp) -/* 91C24C 8024096C E7A60010 */ swc1 $f6, 0x10($sp) -/* 91C250 80240970 C600000C */ lwc1 $f0, 0xc($s0) -/* 91C254 80240974 0002882B */ sltu $s1, $zero, $v0 -/* 91C258 80240978 E7A00014 */ swc1 $f0, 0x14($sp) -/* 91C25C 8024097C 860200A8 */ lh $v0, 0xa8($s0) -/* 91C260 80240980 27A50020 */ addiu $a1, $sp, 0x20 -/* 91C264 80240984 44820000 */ mtc1 $v0, $f0 -/* 91C268 80240988 00000000 */ nop -/* 91C26C 8024098C 46800020 */ cvt.s.w $f0, $f0 -/* 91C270 80240990 E7A00018 */ swc1 $f0, 0x18($sp) -/* 91C274 80240994 860200A6 */ lh $v0, 0xa6($s0) -/* 91C278 80240998 27A60024 */ addiu $a2, $sp, 0x24 -/* 91C27C 8024099C 44820000 */ mtc1 $v0, $f0 -/* 91C280 802409A0 00000000 */ nop -/* 91C284 802409A4 46800020 */ cvt.s.w $f0, $f0 -/* 91C288 802409A8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 91C28C 802409AC 8E040080 */ lw $a0, 0x80($s0) -/* 91C290 802409B0 0C037711 */ jal func_800DDC44 -/* 91C294 802409B4 27A70028 */ addiu $a3, $sp, 0x28 -/* 91C298 802409B8 54400001 */ bnel $v0, $zero, .L802409C0 -/* 91C29C 802409BC 24110001 */ addiu $s1, $zero, 1 -.L802409C0: -/* 91C2A0 802409C0 9602008E */ lhu $v0, 0x8e($s0) -/* 91C2A4 802409C4 2442FFFF */ addiu $v0, $v0, -1 -/* 91C2A8 802409C8 A602008E */ sh $v0, 0x8e($s0) -/* 91C2AC 802409CC 00021400 */ sll $v0, $v0, 0x10 -/* 91C2B0 802409D0 58400001 */ blezl $v0, .L802409D8 -/* 91C2B4 802409D4 24110001 */ addiu $s1, $zero, 1 -.L802409D8: -/* 91C2B8 802409D8 12200003 */ beqz $s1, .L802409E8 -/* 91C2BC 802409DC 24020004 */ addiu $v0, $zero, 4 -/* 91C2C0 802409E0 AE620070 */ sw $v0, 0x70($s3) -/* 91C2C4 802409E4 A2400007 */ sb $zero, 7($s2) -.L802409E8: -/* 91C2C8 802409E8 8FBF0040 */ lw $ra, 0x40($sp) -/* 91C2CC 802409EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 91C2D0 802409F0 8FB20038 */ lw $s2, 0x38($sp) -/* 91C2D4 802409F4 8FB10034 */ lw $s1, 0x34($sp) -/* 91C2D8 802409F8 8FB00030 */ lw $s0, 0x30($sp) -/* 91C2DC 802409FC 03E00008 */ jr $ra -/* 91C2E0 80240A00 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s new file mode 100644 index 0000000000..ec5ac37f3e --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_802408B4_91C194.s @@ -0,0 +1,91 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408B4_91C194 +/* 91C194 802408B4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 91C198 802408B8 AFB3003C */ sw $s3, 0x3c($sp) +/* 91C19C 802408BC 0080982D */ daddu $s3, $a0, $zero +/* 91C1A0 802408C0 AFBF0040 */ sw $ra, 0x40($sp) +/* 91C1A4 802408C4 AFB20038 */ sw $s2, 0x38($sp) +/* 91C1A8 802408C8 AFB10034 */ sw $s1, 0x34($sp) +/* 91C1AC 802408CC AFB00030 */ sw $s0, 0x30($sp) +/* 91C1B0 802408D0 8E720148 */ lw $s2, 0x148($s3) +/* 91C1B4 802408D4 0C00EABB */ jal get_npc_unsafe +/* 91C1B8 802408D8 86440008 */ lh $a0, 8($s2) +/* 91C1BC 802408DC 0040802D */ daddu $s0, $v0, $zero +/* 91C1C0 802408E0 0200202D */ daddu $a0, $s0, $zero +/* 91C1C4 802408E4 0C00F598 */ jal func_8003D660 +/* 91C1C8 802408E8 24050001 */ addiu $a1, $zero, 1 +/* 91C1CC 802408EC 8E050018 */ lw $a1, 0x18($s0) +/* 91C1D0 802408F0 8E06000C */ lw $a2, 0xc($s0) +/* 91C1D4 802408F4 0C00EA95 */ jal npc_move_heading +/* 91C1D8 802408F8 0200202D */ daddu $a0, $s0, $zero +/* 91C1DC 802408FC 8E4300D0 */ lw $v1, 0xd0($s2) +/* 91C1E0 80240900 C6000040 */ lwc1 $f0, 0x40($s0) +/* 91C1E4 80240904 C462001C */ lwc1 $f2, 0x1c($v1) +/* 91C1E8 80240908 468010A0 */ cvt.s.w $f2, $f2 +/* 91C1EC 8024090C C4640024 */ lwc1 $f4, 0x24($v1) +/* 91C1F0 80240910 46802120 */ cvt.s.w $f4, $f4 +/* 91C1F4 80240914 E7A00010 */ swc1 $f0, 0x10($sp) +/* 91C1F8 80240918 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C1FC 8024091C 44051000 */ mfc1 $a1, $f2 +/* 91C200 80240920 C4400028 */ lwc1 $f0, 0x28($v0) +/* 91C204 80240924 46800020 */ cvt.s.w $f0, $f0 +/* 91C208 80240928 E7A00014 */ swc1 $f0, 0x14($sp) +/* 91C20C 8024092C 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C210 80240930 44062000 */ mfc1 $a2, $f4 +/* 91C214 80240934 C440002C */ lwc1 $f0, 0x2c($v0) +/* 91C218 80240938 46800020 */ cvt.s.w $f0, $f0 +/* 91C21C 8024093C E7A00018 */ swc1 $f0, 0x18($sp) +/* 91C220 80240940 8C640030 */ lw $a0, 0x30($v1) +/* 91C224 80240944 0C0123F5 */ jal is_point_within_region +/* 91C228 80240948 8E070038 */ lw $a3, 0x38($s0) +/* 91C22C 8024094C C6000038 */ lwc1 $f0, 0x38($s0) +/* 91C230 80240950 C602003C */ lwc1 $f2, 0x3c($s0) +/* 91C234 80240954 C6040040 */ lwc1 $f4, 0x40($s0) +/* 91C238 80240958 3C013F80 */ lui $at, 0x3f80 +/* 91C23C 8024095C 44813000 */ mtc1 $at, $f6 +/* 91C240 80240960 E7A00020 */ swc1 $f0, 0x20($sp) +/* 91C244 80240964 E7A20024 */ swc1 $f2, 0x24($sp) +/* 91C248 80240968 E7A40028 */ swc1 $f4, 0x28($sp) +/* 91C24C 8024096C E7A60010 */ swc1 $f6, 0x10($sp) +/* 91C250 80240970 C600000C */ lwc1 $f0, 0xc($s0) +/* 91C254 80240974 0002882B */ sltu $s1, $zero, $v0 +/* 91C258 80240978 E7A00014 */ swc1 $f0, 0x14($sp) +/* 91C25C 8024097C 860200A8 */ lh $v0, 0xa8($s0) +/* 91C260 80240980 27A50020 */ addiu $a1, $sp, 0x20 +/* 91C264 80240984 44820000 */ mtc1 $v0, $f0 +/* 91C268 80240988 00000000 */ nop +/* 91C26C 8024098C 46800020 */ cvt.s.w $f0, $f0 +/* 91C270 80240990 E7A00018 */ swc1 $f0, 0x18($sp) +/* 91C274 80240994 860200A6 */ lh $v0, 0xa6($s0) +/* 91C278 80240998 27A60024 */ addiu $a2, $sp, 0x24 +/* 91C27C 8024099C 44820000 */ mtc1 $v0, $f0 +/* 91C280 802409A0 00000000 */ nop +/* 91C284 802409A4 46800020 */ cvt.s.w $f0, $f0 +/* 91C288 802409A8 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 91C28C 802409AC 8E040080 */ lw $a0, 0x80($s0) +/* 91C290 802409B0 0C037711 */ jal func_800DDC44 +/* 91C294 802409B4 27A70028 */ addiu $a3, $sp, 0x28 +/* 91C298 802409B8 54400001 */ bnel $v0, $zero, .L802409C0 +/* 91C29C 802409BC 24110001 */ addiu $s1, $zero, 1 +.L802409C0: +/* 91C2A0 802409C0 9602008E */ lhu $v0, 0x8e($s0) +/* 91C2A4 802409C4 2442FFFF */ addiu $v0, $v0, -1 +/* 91C2A8 802409C8 A602008E */ sh $v0, 0x8e($s0) +/* 91C2AC 802409CC 00021400 */ sll $v0, $v0, 0x10 +/* 91C2B0 802409D0 58400001 */ blezl $v0, .L802409D8 +/* 91C2B4 802409D4 24110001 */ addiu $s1, $zero, 1 +.L802409D8: +/* 91C2B8 802409D8 12200003 */ beqz $s1, .L802409E8 +/* 91C2BC 802409DC 24020004 */ addiu $v0, $zero, 4 +/* 91C2C0 802409E0 AE620070 */ sw $v0, 0x70($s3) +/* 91C2C4 802409E4 A2400007 */ sb $zero, 7($s2) +.L802409E8: +/* 91C2C8 802409E8 8FBF0040 */ lw $ra, 0x40($sp) +/* 91C2CC 802409EC 8FB3003C */ lw $s3, 0x3c($sp) +/* 91C2D0 802409F0 8FB20038 */ lw $s2, 0x38($sp) +/* 91C2D4 802409F4 8FB10034 */ lw $s1, 0x34($sp) +/* 91C2D8 802409F8 8FB00030 */ lw $s0, 0x30($sp) +/* 91C2DC 802409FC 03E00008 */ jr $ra +/* 91C2E0 80240A00 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04.s deleted file mode 100644 index e460d3b6e1..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A04 -/* 91C2E4 80240A04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91C2E8 80240A08 AFB20018 */ sw $s2, 0x18($sp) -/* 91C2EC 80240A0C 0080902D */ daddu $s2, $a0, $zero -/* 91C2F0 80240A10 AFBF001C */ sw $ra, 0x1c($sp) -/* 91C2F4 80240A14 AFB10014 */ sw $s1, 0x14($sp) -/* 91C2F8 80240A18 AFB00010 */ sw $s0, 0x10($sp) -/* 91C2FC 80240A1C 8E500148 */ lw $s0, 0x148($s2) -/* 91C300 80240A20 86040008 */ lh $a0, 8($s0) -/* 91C304 80240A24 0C00EABB */ jal get_npc_unsafe -/* 91C308 80240A28 00A0882D */ daddu $s1, $a1, $zero -/* 91C30C 80240A2C 0040182D */ daddu $v1, $v0, $zero -/* 91C310 80240A30 9462008E */ lhu $v0, 0x8e($v1) -/* 91C314 80240A34 2442FFFF */ addiu $v0, $v0, -1 -/* 91C318 80240A38 A462008E */ sh $v0, 0x8e($v1) -/* 91C31C 80240A3C 00021400 */ sll $v0, $v0, 0x10 -/* 91C320 80240A40 1C400015 */ bgtz $v0, .L80240A98 -/* 91C324 80240A44 00000000 */ nop -/* 91C328 80240A48 8E0200CC */ lw $v0, 0xcc($s0) -/* 91C32C 80240A4C 8C420004 */ lw $v0, 4($v0) -/* 91C330 80240A50 AC620028 */ sw $v0, 0x28($v1) -/* 91C334 80240A54 8E0200D0 */ lw $v0, 0xd0($s0) -/* 91C338 80240A58 8C420014 */ lw $v0, 0x14($v0) -/* 91C33C 80240A5C 04410004 */ bgez $v0, .L80240A70 -/* 91C340 80240A60 00000000 */ nop -/* 91C344 80240A64 C6200000 */ lwc1 $f0, ($s1) -/* 91C348 80240A68 080902A4 */ j .L80240A90 -/* 91C34C 80240A6C E4600018 */ swc1 $f0, 0x18($v1) -.L80240A70: -/* 91C350 80240A70 3C018024 */ lui $at, 0x8024 -/* 91C354 80240A74 D4222BB0 */ ldc1 $f2, 0x2bb0($at) -/* 91C358 80240A78 44820000 */ mtc1 $v0, $f0 -/* 91C35C 80240A7C 00000000 */ nop -/* 91C360 80240A80 46800021 */ cvt.d.w $f0, $f0 -/* 91C364 80240A84 46220003 */ div.d $f0, $f0, $f2 -/* 91C368 80240A88 46200020 */ cvt.s.d $f0, $f0 -/* 91C36C 80240A8C E4600018 */ swc1 $f0, 0x18($v1) -.L80240A90: -/* 91C370 80240A90 24020029 */ addiu $v0, $zero, 0x29 -/* 91C374 80240A94 AE420070 */ sw $v0, 0x70($s2) -.L80240A98: -/* 91C378 80240A98 8FBF001C */ lw $ra, 0x1c($sp) -/* 91C37C 80240A9C 8FB20018 */ lw $s2, 0x18($sp) -/* 91C380 80240AA0 8FB10014 */ lw $s1, 0x14($sp) -/* 91C384 80240AA4 8FB00010 */ lw $s0, 0x10($sp) -/* 91C388 80240AA8 03E00008 */ jr $ra -/* 91C38C 80240AAC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s new file mode 100644 index 0000000000..dce736a908 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240A04_91C2E4.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A04_91C2E4 +/* 91C2E4 80240A04 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91C2E8 80240A08 AFB20018 */ sw $s2, 0x18($sp) +/* 91C2EC 80240A0C 0080902D */ daddu $s2, $a0, $zero +/* 91C2F0 80240A10 AFBF001C */ sw $ra, 0x1c($sp) +/* 91C2F4 80240A14 AFB10014 */ sw $s1, 0x14($sp) +/* 91C2F8 80240A18 AFB00010 */ sw $s0, 0x10($sp) +/* 91C2FC 80240A1C 8E500148 */ lw $s0, 0x148($s2) +/* 91C300 80240A20 86040008 */ lh $a0, 8($s0) +/* 91C304 80240A24 0C00EABB */ jal get_npc_unsafe +/* 91C308 80240A28 00A0882D */ daddu $s1, $a1, $zero +/* 91C30C 80240A2C 0040182D */ daddu $v1, $v0, $zero +/* 91C310 80240A30 9462008E */ lhu $v0, 0x8e($v1) +/* 91C314 80240A34 2442FFFF */ addiu $v0, $v0, -1 +/* 91C318 80240A38 A462008E */ sh $v0, 0x8e($v1) +/* 91C31C 80240A3C 00021400 */ sll $v0, $v0, 0x10 +/* 91C320 80240A40 1C400015 */ bgtz $v0, .L80240A98 +/* 91C324 80240A44 00000000 */ nop +/* 91C328 80240A48 8E0200CC */ lw $v0, 0xcc($s0) +/* 91C32C 80240A4C 8C420004 */ lw $v0, 4($v0) +/* 91C330 80240A50 AC620028 */ sw $v0, 0x28($v1) +/* 91C334 80240A54 8E0200D0 */ lw $v0, 0xd0($s0) +/* 91C338 80240A58 8C420014 */ lw $v0, 0x14($v0) +/* 91C33C 80240A5C 04410004 */ bgez $v0, .L80240A70 +/* 91C340 80240A60 00000000 */ nop +/* 91C344 80240A64 C6200000 */ lwc1 $f0, ($s1) +/* 91C348 80240A68 080902A4 */ j .L80240A90 +/* 91C34C 80240A6C E4600018 */ swc1 $f0, 0x18($v1) +.L80240A70: +/* 91C350 80240A70 3C018024 */ lui $at, 0x8024 +/* 91C354 80240A74 D4222BB0 */ ldc1 $f2, 0x2bb0($at) +/* 91C358 80240A78 44820000 */ mtc1 $v0, $f0 +/* 91C35C 80240A7C 00000000 */ nop +/* 91C360 80240A80 46800021 */ cvt.d.w $f0, $f0 +/* 91C364 80240A84 46220003 */ div.d $f0, $f0, $f2 +/* 91C368 80240A88 46200020 */ cvt.s.d $f0, $f0 +/* 91C36C 80240A8C E4600018 */ swc1 $f0, 0x18($v1) +.L80240A90: +/* 91C370 80240A90 24020029 */ addiu $v0, $zero, 0x29 +/* 91C374 80240A94 AE420070 */ sw $v0, 0x70($s2) +.L80240A98: +/* 91C378 80240A98 8FBF001C */ lw $ra, 0x1c($sp) +/* 91C37C 80240A9C 8FB20018 */ lw $s2, 0x18($sp) +/* 91C380 80240AA0 8FB10014 */ lw $s1, 0x14($sp) +/* 91C384 80240AA4 8FB00010 */ lw $s0, 0x10($sp) +/* 91C388 80240AA8 03E00008 */ jr $ra +/* 91C38C 80240AAC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0.s deleted file mode 100644 index ec4b01d38c..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AB0 -/* 91C390 80240AB0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 91C394 80240AB4 AFB30024 */ sw $s3, 0x24($sp) -/* 91C398 80240AB8 0080982D */ daddu $s3, $a0, $zero -/* 91C39C 80240ABC AFBF0028 */ sw $ra, 0x28($sp) -/* 91C3A0 80240AC0 AFB20020 */ sw $s2, 0x20($sp) -/* 91C3A4 80240AC4 AFB1001C */ sw $s1, 0x1c($sp) -/* 91C3A8 80240AC8 AFB00018 */ sw $s0, 0x18($sp) -/* 91C3AC 80240ACC 8E720148 */ lw $s2, 0x148($s3) -/* 91C3B0 80240AD0 00A0882D */ daddu $s1, $a1, $zero -/* 91C3B4 80240AD4 86440008 */ lh $a0, 8($s2) -/* 91C3B8 80240AD8 0C00EABB */ jal get_npc_unsafe -/* 91C3BC 80240ADC 00C0802D */ daddu $s0, $a2, $zero -/* 91C3C0 80240AE0 0200202D */ daddu $a0, $s0, $zero -/* 91C3C4 80240AE4 0240282D */ daddu $a1, $s2, $zero -/* 91C3C8 80240AE8 AFA00010 */ sw $zero, 0x10($sp) -/* 91C3CC 80240AEC 8E260024 */ lw $a2, 0x24($s1) -/* 91C3D0 80240AF0 8E270028 */ lw $a3, 0x28($s1) -/* 91C3D4 80240AF4 0C01242D */ jal func_800490B4 -/* 91C3D8 80240AF8 0040802D */ daddu $s0, $v0, $zero -/* 91C3DC 80240AFC 1040000C */ beqz $v0, .L80240B30 -/* 91C3E0 80240B00 00000000 */ nop -/* 91C3E4 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C3E8 80240B08 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 91C3EC 80240B0C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 91C3F0 80240B10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C3F4 80240B14 8C460028 */ lw $a2, 0x28($v0) -/* 91C3F8 80240B18 0C00A720 */ jal atan2 -/* 91C3FC 80240B1C 8C470030 */ lw $a3, 0x30($v0) -/* 91C400 80240B20 2402000C */ addiu $v0, $zero, 0xc -/* 91C404 80240B24 E600000C */ swc1 $f0, 0xc($s0) -/* 91C408 80240B28 080902F3 */ j .L80240BCC -/* 91C40C 80240B2C AE620070 */ sw $v0, 0x70($s3) -.L80240B30: -/* 91C410 80240B30 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C414 80240B34 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C418 80240B38 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C41C 80240B3C C4440000 */ lwc1 $f4, ($v0) -/* 91C420 80240B40 46802120 */ cvt.s.w $f4, $f4 -/* 91C424 80240B44 44062000 */ mfc1 $a2, $f4 -/* 91C428 80240B48 C4440008 */ lwc1 $f4, 8($v0) -/* 91C42C 80240B4C 46802120 */ cvt.s.w $f4, $f4 -/* 91C430 80240B50 44072000 */ mfc1 $a3, $f4 -/* 91C434 80240B54 0C00A7B5 */ jal dist2D -/* 91C438 80240B58 00000000 */ nop -/* 91C43C 80240B5C C6020018 */ lwc1 $f2, 0x18($s0) -/* 91C440 80240B60 4602003E */ c.le.s $f0, $f2 -/* 91C444 80240B64 00000000 */ nop -/* 91C448 80240B68 45000005 */ bc1f .L80240B80 -/* 91C44C 80240B6C 2402000A */ addiu $v0, $zero, 0xa -/* 91C450 80240B70 A602008E */ sh $v0, 0x8e($s0) -/* 91C454 80240B74 24020032 */ addiu $v0, $zero, 0x32 -/* 91C458 80240B78 080902F3 */ j .L80240BCC -/* 91C45C 80240B7C AE620070 */ sw $v0, 0x70($s3) -.L80240B80: -/* 91C460 80240B80 8602008C */ lh $v0, 0x8c($s0) -/* 91C464 80240B84 14400011 */ bnez $v0, .L80240BCC -/* 91C468 80240B88 00000000 */ nop -/* 91C46C 80240B8C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 91C470 80240B90 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C474 80240B94 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 91C478 80240B98 C4440000 */ lwc1 $f4, ($v0) -/* 91C47C 80240B9C 46802120 */ cvt.s.w $f4, $f4 -/* 91C480 80240BA0 44062000 */ mfc1 $a2, $f4 -/* 91C484 80240BA4 C4440008 */ lwc1 $f4, 8($v0) -/* 91C488 80240BA8 46802120 */ cvt.s.w $f4, $f4 -/* 91C48C 80240BAC 44072000 */ mfc1 $a3, $f4 -/* 91C490 80240BB0 0C00A720 */ jal atan2 -/* 91C494 80240BB4 00000000 */ nop -/* 91C498 80240BB8 8E050018 */ lw $a1, 0x18($s0) -/* 91C49C 80240BBC 44060000 */ mfc1 $a2, $f0 -/* 91C4A0 80240BC0 0200202D */ daddu $a0, $s0, $zero -/* 91C4A4 80240BC4 0C00EA95 */ jal npc_move_heading -/* 91C4A8 80240BC8 AC86000C */ sw $a2, 0xc($a0) -.L80240BCC: -/* 91C4AC 80240BCC 8FBF0028 */ lw $ra, 0x28($sp) -/* 91C4B0 80240BD0 8FB30024 */ lw $s3, 0x24($sp) -/* 91C4B4 80240BD4 8FB20020 */ lw $s2, 0x20($sp) -/* 91C4B8 80240BD8 8FB1001C */ lw $s1, 0x1c($sp) -/* 91C4BC 80240BDC 8FB00018 */ lw $s0, 0x18($sp) -/* 91C4C0 80240BE0 03E00008 */ jr $ra -/* 91C4C4 80240BE4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s new file mode 100644 index 0000000000..dbdd038a4c --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240AB0_91C390.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AB0_91C390 +/* 91C390 80240AB0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 91C394 80240AB4 AFB30024 */ sw $s3, 0x24($sp) +/* 91C398 80240AB8 0080982D */ daddu $s3, $a0, $zero +/* 91C39C 80240ABC AFBF0028 */ sw $ra, 0x28($sp) +/* 91C3A0 80240AC0 AFB20020 */ sw $s2, 0x20($sp) +/* 91C3A4 80240AC4 AFB1001C */ sw $s1, 0x1c($sp) +/* 91C3A8 80240AC8 AFB00018 */ sw $s0, 0x18($sp) +/* 91C3AC 80240ACC 8E720148 */ lw $s2, 0x148($s3) +/* 91C3B0 80240AD0 00A0882D */ daddu $s1, $a1, $zero +/* 91C3B4 80240AD4 86440008 */ lh $a0, 8($s2) +/* 91C3B8 80240AD8 0C00EABB */ jal get_npc_unsafe +/* 91C3BC 80240ADC 00C0802D */ daddu $s0, $a2, $zero +/* 91C3C0 80240AE0 0200202D */ daddu $a0, $s0, $zero +/* 91C3C4 80240AE4 0240282D */ daddu $a1, $s2, $zero +/* 91C3C8 80240AE8 AFA00010 */ sw $zero, 0x10($sp) +/* 91C3CC 80240AEC 8E260024 */ lw $a2, 0x24($s1) +/* 91C3D0 80240AF0 8E270028 */ lw $a3, 0x28($s1) +/* 91C3D4 80240AF4 0C01242D */ jal func_800490B4 +/* 91C3D8 80240AF8 0040802D */ daddu $s0, $v0, $zero +/* 91C3DC 80240AFC 1040000C */ beqz $v0, .L80240B30 +/* 91C3E0 80240B00 00000000 */ nop +/* 91C3E4 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 91C3E8 80240B08 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 91C3EC 80240B0C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 91C3F0 80240B10 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91C3F4 80240B14 8C460028 */ lw $a2, 0x28($v0) +/* 91C3F8 80240B18 0C00A720 */ jal atan2 +/* 91C3FC 80240B1C 8C470030 */ lw $a3, 0x30($v0) +/* 91C400 80240B20 2402000C */ addiu $v0, $zero, 0xc +/* 91C404 80240B24 E600000C */ swc1 $f0, 0xc($s0) +/* 91C408 80240B28 080902F3 */ j .L80240BCC +/* 91C40C 80240B2C AE620070 */ sw $v0, 0x70($s3) +.L80240B30: +/* 91C410 80240B30 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 91C414 80240B34 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C418 80240B38 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91C41C 80240B3C C4440000 */ lwc1 $f4, ($v0) +/* 91C420 80240B40 46802120 */ cvt.s.w $f4, $f4 +/* 91C424 80240B44 44062000 */ mfc1 $a2, $f4 +/* 91C428 80240B48 C4440008 */ lwc1 $f4, 8($v0) +/* 91C42C 80240B4C 46802120 */ cvt.s.w $f4, $f4 +/* 91C430 80240B50 44072000 */ mfc1 $a3, $f4 +/* 91C434 80240B54 0C00A7B5 */ jal dist2D +/* 91C438 80240B58 00000000 */ nop +/* 91C43C 80240B5C C6020018 */ lwc1 $f2, 0x18($s0) +/* 91C440 80240B60 4602003E */ c.le.s $f0, $f2 +/* 91C444 80240B64 00000000 */ nop +/* 91C448 80240B68 45000005 */ bc1f .L80240B80 +/* 91C44C 80240B6C 2402000A */ addiu $v0, $zero, 0xa +/* 91C450 80240B70 A602008E */ sh $v0, 0x8e($s0) +/* 91C454 80240B74 24020032 */ addiu $v0, $zero, 0x32 +/* 91C458 80240B78 080902F3 */ j .L80240BCC +/* 91C45C 80240B7C AE620070 */ sw $v0, 0x70($s3) +.L80240B80: +/* 91C460 80240B80 8602008C */ lh $v0, 0x8c($s0) +/* 91C464 80240B84 14400011 */ bnez $v0, .L80240BCC +/* 91C468 80240B88 00000000 */ nop +/* 91C46C 80240B8C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 91C470 80240B90 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C474 80240B94 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 91C478 80240B98 C4440000 */ lwc1 $f4, ($v0) +/* 91C47C 80240B9C 46802120 */ cvt.s.w $f4, $f4 +/* 91C480 80240BA0 44062000 */ mfc1 $a2, $f4 +/* 91C484 80240BA4 C4440008 */ lwc1 $f4, 8($v0) +/* 91C488 80240BA8 46802120 */ cvt.s.w $f4, $f4 +/* 91C48C 80240BAC 44072000 */ mfc1 $a3, $f4 +/* 91C490 80240BB0 0C00A720 */ jal atan2 +/* 91C494 80240BB4 00000000 */ nop +/* 91C498 80240BB8 8E050018 */ lw $a1, 0x18($s0) +/* 91C49C 80240BBC 44060000 */ mfc1 $a2, $f0 +/* 91C4A0 80240BC0 0200202D */ daddu $a0, $s0, $zero +/* 91C4A4 80240BC4 0C00EA95 */ jal npc_move_heading +/* 91C4A8 80240BC8 AC86000C */ sw $a2, 0xc($a0) +.L80240BCC: +/* 91C4AC 80240BCC 8FBF0028 */ lw $ra, 0x28($sp) +/* 91C4B0 80240BD0 8FB30024 */ lw $s3, 0x24($sp) +/* 91C4B4 80240BD4 8FB20020 */ lw $s2, 0x20($sp) +/* 91C4B8 80240BD8 8FB1001C */ lw $s1, 0x1c($sp) +/* 91C4BC 80240BDC 8FB00018 */ lw $s0, 0x18($sp) +/* 91C4C0 80240BE0 03E00008 */ jr $ra +/* 91C4C4 80240BE4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8.s deleted file mode 100644 index 87d3d5b78f..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE8 -/* 91C4C8 80240BE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91C4CC 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* 91C4D0 80240BF0 0080882D */ daddu $s1, $a0, $zero -/* 91C4D4 80240BF4 AFBF0018 */ sw $ra, 0x18($sp) -/* 91C4D8 80240BF8 AFB00010 */ sw $s0, 0x10($sp) -/* 91C4DC 80240BFC 8E300148 */ lw $s0, 0x148($s1) -/* 91C4E0 80240C00 0C00EABB */ jal get_npc_unsafe -/* 91C4E4 80240C04 86040008 */ lh $a0, 8($s0) -/* 91C4E8 80240C08 0040202D */ daddu $a0, $v0, $zero -/* 91C4EC 80240C0C 8482008E */ lh $v0, 0x8e($a0) -/* 91C4F0 80240C10 9483008E */ lhu $v1, 0x8e($a0) -/* 91C4F4 80240C14 18400002 */ blez $v0, .L80240C20 -/* 91C4F8 80240C18 2462FFFF */ addiu $v0, $v1, -1 -/* 91C4FC 80240C1C A482008E */ sh $v0, 0x8e($a0) -.L80240C20: -/* 91C500 80240C20 8482008C */ lh $v0, 0x8c($a0) -/* 91C504 80240C24 1440000A */ bnez $v0, .L80240C50 -/* 91C508 80240C28 00000000 */ nop -/* 91C50C 80240C2C 8482008E */ lh $v0, 0x8e($a0) -/* 91C510 80240C30 1C400007 */ bgtz $v0, .L80240C50 -/* 91C514 80240C34 24020008 */ addiu $v0, $zero, 8 -/* 91C518 80240C38 A482008E */ sh $v0, 0x8e($a0) -/* 91C51C 80240C3C 8E0200CC */ lw $v0, 0xcc($s0) -/* 91C520 80240C40 8C42002C */ lw $v0, 0x2c($v0) -/* 91C524 80240C44 AC820028 */ sw $v0, 0x28($a0) -/* 91C528 80240C48 24020033 */ addiu $v0, $zero, 0x33 -/* 91C52C 80240C4C AE220070 */ sw $v0, 0x70($s1) -.L80240C50: -/* 91C530 80240C50 8FBF0018 */ lw $ra, 0x18($sp) -/* 91C534 80240C54 8FB10014 */ lw $s1, 0x14($sp) -/* 91C538 80240C58 8FB00010 */ lw $s0, 0x10($sp) -/* 91C53C 80240C5C 03E00008 */ jr $ra -/* 91C540 80240C60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8_91C4C8.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8_91C4C8.s new file mode 100644 index 0000000000..4fe2d25116 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240BE8_91C4C8.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BE8_91C4C8 +/* 91C4C8 80240BE8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91C4CC 80240BEC AFB10014 */ sw $s1, 0x14($sp) +/* 91C4D0 80240BF0 0080882D */ daddu $s1, $a0, $zero +/* 91C4D4 80240BF4 AFBF0018 */ sw $ra, 0x18($sp) +/* 91C4D8 80240BF8 AFB00010 */ sw $s0, 0x10($sp) +/* 91C4DC 80240BFC 8E300148 */ lw $s0, 0x148($s1) +/* 91C4E0 80240C00 0C00EABB */ jal get_npc_unsafe +/* 91C4E4 80240C04 86040008 */ lh $a0, 8($s0) +/* 91C4E8 80240C08 0040202D */ daddu $a0, $v0, $zero +/* 91C4EC 80240C0C 8482008E */ lh $v0, 0x8e($a0) +/* 91C4F0 80240C10 9483008E */ lhu $v1, 0x8e($a0) +/* 91C4F4 80240C14 18400002 */ blez $v0, .L80240C20 +/* 91C4F8 80240C18 2462FFFF */ addiu $v0, $v1, -1 +/* 91C4FC 80240C1C A482008E */ sh $v0, 0x8e($a0) +.L80240C20: +/* 91C500 80240C20 8482008C */ lh $v0, 0x8c($a0) +/* 91C504 80240C24 1440000A */ bnez $v0, .L80240C50 +/* 91C508 80240C28 00000000 */ nop +/* 91C50C 80240C2C 8482008E */ lh $v0, 0x8e($a0) +/* 91C510 80240C30 1C400007 */ bgtz $v0, .L80240C50 +/* 91C514 80240C34 24020008 */ addiu $v0, $zero, 8 +/* 91C518 80240C38 A482008E */ sh $v0, 0x8e($a0) +/* 91C51C 80240C3C 8E0200CC */ lw $v0, 0xcc($s0) +/* 91C520 80240C40 8C42002C */ lw $v0, 0x2c($v0) +/* 91C524 80240C44 AC820028 */ sw $v0, 0x28($a0) +/* 91C528 80240C48 24020033 */ addiu $v0, $zero, 0x33 +/* 91C52C 80240C4C AE220070 */ sw $v0, 0x70($s1) +.L80240C50: +/* 91C530 80240C50 8FBF0018 */ lw $ra, 0x18($sp) +/* 91C534 80240C54 8FB10014 */ lw $s1, 0x14($sp) +/* 91C538 80240C58 8FB00010 */ lw $s0, 0x10($sp) +/* 91C53C 80240C5C 03E00008 */ jr $ra +/* 91C540 80240C60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240C64.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240C64.s deleted file mode 100644 index 77fa65d206..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240C64.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C64 -/* 91C544 80240C64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91C548 80240C68 AFB10014 */ sw $s1, 0x14($sp) -/* 91C54C 80240C6C 0080882D */ daddu $s1, $a0, $zero -/* 91C550 80240C70 AFBF0018 */ sw $ra, 0x18($sp) -/* 91C554 80240C74 AFB00010 */ sw $s0, 0x10($sp) -/* 91C558 80240C78 8E300148 */ lw $s0, 0x148($s1) -/* 91C55C 80240C7C 0C00EABB */ jal get_npc_unsafe -/* 91C560 80240C80 86040008 */ lh $a0, 8($s0) -/* 91C564 80240C84 0040182D */ daddu $v1, $v0, $zero -/* 91C568 80240C88 9462008E */ lhu $v0, 0x8e($v1) -/* 91C56C 80240C8C 2442FFFF */ addiu $v0, $v0, -1 -/* 91C570 80240C90 A462008E */ sh $v0, 0x8e($v1) -/* 91C574 80240C94 00021400 */ sll $v0, $v0, 0x10 -/* 91C578 80240C98 1C400007 */ bgtz $v0, .L80240CB8 -/* 91C57C 80240C9C 24020008 */ addiu $v0, $zero, 8 -/* 91C580 80240CA0 A462008E */ sh $v0, 0x8e($v1) -/* 91C584 80240CA4 8E0200CC */ lw $v0, 0xcc($s0) -/* 91C588 80240CA8 8C420038 */ lw $v0, 0x38($v0) -/* 91C58C 80240CAC AC620028 */ sw $v0, 0x28($v1) -/* 91C590 80240CB0 24020034 */ addiu $v0, $zero, 0x34 -/* 91C594 80240CB4 AE220070 */ sw $v0, 0x70($s1) -.L80240CB8: -/* 91C598 80240CB8 8FBF0018 */ lw $ra, 0x18($sp) -/* 91C59C 80240CBC 8FB10014 */ lw $s1, 0x14($sp) -/* 91C5A0 80240CC0 8FB00010 */ lw $s0, 0x10($sp) -/* 91C5A4 80240CC4 03E00008 */ jr $ra -/* 91C5A8 80240CC8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240C64_91C544.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240C64_91C544.s new file mode 100644 index 0000000000..08fd425314 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240C64_91C544.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C64_91C544 +/* 91C544 80240C64 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91C548 80240C68 AFB10014 */ sw $s1, 0x14($sp) +/* 91C54C 80240C6C 0080882D */ daddu $s1, $a0, $zero +/* 91C550 80240C70 AFBF0018 */ sw $ra, 0x18($sp) +/* 91C554 80240C74 AFB00010 */ sw $s0, 0x10($sp) +/* 91C558 80240C78 8E300148 */ lw $s0, 0x148($s1) +/* 91C55C 80240C7C 0C00EABB */ jal get_npc_unsafe +/* 91C560 80240C80 86040008 */ lh $a0, 8($s0) +/* 91C564 80240C84 0040182D */ daddu $v1, $v0, $zero +/* 91C568 80240C88 9462008E */ lhu $v0, 0x8e($v1) +/* 91C56C 80240C8C 2442FFFF */ addiu $v0, $v0, -1 +/* 91C570 80240C90 A462008E */ sh $v0, 0x8e($v1) +/* 91C574 80240C94 00021400 */ sll $v0, $v0, 0x10 +/* 91C578 80240C98 1C400007 */ bgtz $v0, .L80240CB8 +/* 91C57C 80240C9C 24020008 */ addiu $v0, $zero, 8 +/* 91C580 80240CA0 A462008E */ sh $v0, 0x8e($v1) +/* 91C584 80240CA4 8E0200CC */ lw $v0, 0xcc($s0) +/* 91C588 80240CA8 8C420038 */ lw $v0, 0x38($v0) +/* 91C58C 80240CAC AC620028 */ sw $v0, 0x28($v1) +/* 91C590 80240CB0 24020034 */ addiu $v0, $zero, 0x34 +/* 91C594 80240CB4 AE220070 */ sw $v0, 0x70($s1) +.L80240CB8: +/* 91C598 80240CB8 8FBF0018 */ lw $ra, 0x18($sp) +/* 91C59C 80240CBC 8FB10014 */ lw $s1, 0x14($sp) +/* 91C5A0 80240CC0 8FB00010 */ lw $s0, 0x10($sp) +/* 91C5A4 80240CC4 03E00008 */ jr $ra +/* 91C5A8 80240CC8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC.s deleted file mode 100644 index ef5f426d8e..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CCC -/* 91C5AC 80240CCC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91C5B0 80240CD0 AFB00010 */ sw $s0, 0x10($sp) -/* 91C5B4 80240CD4 0080802D */ daddu $s0, $a0, $zero -/* 91C5B8 80240CD8 AFBF0014 */ sw $ra, 0x14($sp) -/* 91C5BC 80240CDC 8E020148 */ lw $v0, 0x148($s0) -/* 91C5C0 80240CE0 0C00EABB */ jal get_npc_unsafe -/* 91C5C4 80240CE4 84440008 */ lh $a0, 8($v0) -/* 91C5C8 80240CE8 9443008E */ lhu $v1, 0x8e($v0) -/* 91C5CC 80240CEC 2463FFFF */ addiu $v1, $v1, -1 -/* 91C5D0 80240CF0 A443008E */ sh $v1, 0x8e($v0) -/* 91C5D4 80240CF4 00031C00 */ sll $v1, $v1, 0x10 -/* 91C5D8 80240CF8 58600001 */ blezl $v1, .L80240D00 -/* 91C5DC 80240CFC AE000070 */ sw $zero, 0x70($s0) -.L80240D00: -/* 91C5E0 80240D00 8FBF0014 */ lw $ra, 0x14($sp) -/* 91C5E4 80240D04 8FB00010 */ lw $s0, 0x10($sp) -/* 91C5E8 80240D08 03E00008 */ jr $ra -/* 91C5EC 80240D0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s new file mode 100644 index 0000000000..a78c00eff9 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240CCC_91C5AC.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CCC_91C5AC +/* 91C5AC 80240CCC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 91C5B0 80240CD0 AFB00010 */ sw $s0, 0x10($sp) +/* 91C5B4 80240CD4 0080802D */ daddu $s0, $a0, $zero +/* 91C5B8 80240CD8 AFBF0014 */ sw $ra, 0x14($sp) +/* 91C5BC 80240CDC 8E020148 */ lw $v0, 0x148($s0) +/* 91C5C0 80240CE0 0C00EABB */ jal get_npc_unsafe +/* 91C5C4 80240CE4 84440008 */ lh $a0, 8($v0) +/* 91C5C8 80240CE8 9443008E */ lhu $v1, 0x8e($v0) +/* 91C5CC 80240CEC 2463FFFF */ addiu $v1, $v1, -1 +/* 91C5D0 80240CF0 A443008E */ sh $v1, 0x8e($v0) +/* 91C5D4 80240CF4 00031C00 */ sll $v1, $v1, 0x10 +/* 91C5D8 80240CF8 58600001 */ blezl $v1, .L80240D00 +/* 91C5DC 80240CFC AE000070 */ sw $zero, 0x70($s0) +.L80240D00: +/* 91C5E0 80240D00 8FBF0014 */ lw $ra, 0x14($sp) +/* 91C5E4 80240D04 8FB00010 */ lw $s0, 0x10($sp) +/* 91C5E8 80240D08 03E00008 */ jr $ra +/* 91C5EC 80240D0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10.s deleted file mode 100644 index 3e1f0d5a13..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10.s +++ /dev/null @@ -1,223 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D10 -/* 91C5F0 80240D10 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 91C5F4 80240D14 AFB3003C */ sw $s3, 0x3c($sp) -/* 91C5F8 80240D18 0080982D */ daddu $s3, $a0, $zero -/* 91C5FC 80240D1C AFBF0048 */ sw $ra, 0x48($sp) -/* 91C600 80240D20 AFB50044 */ sw $s5, 0x44($sp) -/* 91C604 80240D24 AFB40040 */ sw $s4, 0x40($sp) -/* 91C608 80240D28 AFB20038 */ sw $s2, 0x38($sp) -/* 91C60C 80240D2C AFB10034 */ sw $s1, 0x34($sp) -/* 91C610 80240D30 AFB00030 */ sw $s0, 0x30($sp) -/* 91C614 80240D34 8E720148 */ lw $s2, 0x148($s3) -/* 91C618 80240D38 86440008 */ lh $a0, 8($s2) -/* 91C61C 80240D3C 0C00EABB */ jal get_npc_unsafe -/* 91C620 80240D40 00A0882D */ daddu $s1, $a1, $zero -/* 91C624 80240D44 0260202D */ daddu $a0, $s3, $zero -/* 91C628 80240D48 8E70000C */ lw $s0, 0xc($s3) -/* 91C62C 80240D4C 0040A82D */ daddu $s5, $v0, $zero -/* 91C630 80240D50 8E050000 */ lw $a1, ($s0) -/* 91C634 80240D54 0C0B1EAF */ jal get_variable -/* 91C638 80240D58 26100004 */ addiu $s0, $s0, 4 -/* 91C63C 80240D5C 0260202D */ daddu $a0, $s3, $zero -/* 91C640 80240D60 8E050000 */ lw $a1, ($s0) -/* 91C644 80240D64 0C0B1EAF */ jal get_variable -/* 91C648 80240D68 0040A02D */ daddu $s4, $v0, $zero -/* 91C64C 80240D6C AE420094 */ sw $v0, 0x94($s2) -/* 91C650 80240D70 AFA00010 */ sw $zero, 0x10($sp) -/* 91C654 80240D74 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C658 80240D78 8C420030 */ lw $v0, 0x30($v0) -/* 91C65C 80240D7C AFA20014 */ sw $v0, 0x14($sp) -/* 91C660 80240D80 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C664 80240D84 8C42001C */ lw $v0, 0x1c($v0) -/* 91C668 80240D88 AFA20018 */ sw $v0, 0x18($sp) -/* 91C66C 80240D8C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C670 80240D90 8C420024 */ lw $v0, 0x24($v0) -/* 91C674 80240D94 AFA2001C */ sw $v0, 0x1c($sp) -/* 91C678 80240D98 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C67C 80240D9C 8C420028 */ lw $v0, 0x28($v0) -/* 91C680 80240DA0 AFA20020 */ sw $v0, 0x20($sp) -/* 91C684 80240DA4 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C688 80240DA8 3C014220 */ lui $at, 0x4220 -/* 91C68C 80240DAC 44810000 */ mtc1 $at, $f0 -/* 91C690 80240DB0 8C42002C */ lw $v0, 0x2c($v0) -/* 91C694 80240DB4 27B00010 */ addiu $s0, $sp, 0x10 -/* 91C698 80240DB8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 91C69C 80240DBC A7A0002C */ sh $zero, 0x2c($sp) -/* 91C6A0 80240DC0 12200012 */ beqz $s1, .L80240E0C -/* 91C6A4 80240DC4 AFA20024 */ sw $v0, 0x24($sp) -/* 91C6A8 80240DC8 AE600070 */ sw $zero, 0x70($s3) -/* 91C6AC 80240DCC 8EA30000 */ lw $v1, ($s5) -/* 91C6B0 80240DD0 2402F7FF */ addiu $v0, $zero, -0x801 -/* 91C6B4 80240DD4 A6A0008E */ sh $zero, 0x8e($s5) -/* 91C6B8 80240DD8 00621824 */ and $v1, $v1, $v0 -/* 91C6BC 80240DDC AEA30000 */ sw $v1, ($s5) -/* 91C6C0 80240DE0 8E4200D0 */ lw $v0, 0xd0($s2) -/* 91C6C4 80240DE4 8C420034 */ lw $v0, 0x34($v0) -/* 91C6C8 80240DE8 54400005 */ bnel $v0, $zero, .L80240E00 -/* 91C6CC 80240DEC 2402FDFF */ addiu $v0, $zero, -0x201 -/* 91C6D0 80240DF0 34620200 */ ori $v0, $v1, 0x200 -/* 91C6D4 80240DF4 2403FFF7 */ addiu $v1, $zero, -9 -/* 91C6D8 80240DF8 08090382 */ j .L80240E08 -/* 91C6DC 80240DFC 00431024 */ and $v0, $v0, $v1 -.L80240E00: -/* 91C6E0 80240E00 00621024 */ and $v0, $v1, $v0 -/* 91C6E4 80240E04 34420008 */ ori $v0, $v0, 8 -.L80240E08: -/* 91C6E8 80240E08 AEA20000 */ sw $v0, ($s5) -.L80240E0C: -/* 91C6EC 80240E0C 8E4300B0 */ lw $v1, 0xb0($s2) -/* 91C6F0 80240E10 30620004 */ andi $v0, $v1, 4 -/* 91C6F4 80240E14 10400007 */ beqz $v0, .L80240E34 -/* 91C6F8 80240E18 00000000 */ nop -/* 91C6FC 80240E1C 824200B4 */ lb $v0, 0xb4($s2) -/* 91C700 80240E20 14400086 */ bnez $v0, .L8024103C -/* 91C704 80240E24 0000102D */ daddu $v0, $zero, $zero -/* 91C708 80240E28 2402FFFB */ addiu $v0, $zero, -5 -/* 91C70C 80240E2C 00621024 */ and $v0, $v1, $v0 -/* 91C710 80240E30 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240E34: -/* 91C714 80240E34 8E620070 */ lw $v0, 0x70($s3) -/* 91C718 80240E38 2442FFF4 */ addiu $v0, $v0, -0xc -/* 91C71C 80240E3C 2C420003 */ sltiu $v0, $v0, 3 -/* 91C720 80240E40 10400007 */ beqz $v0, .L80240E60 -/* 91C724 80240E44 0260202D */ daddu $a0, $s3, $zero -/* 91C728 80240E48 0280282D */ daddu $a1, $s4, $zero -/* 91C72C 80240E4C 0C090020 */ jal func_80240080 -/* 91C730 80240E50 0200302D */ daddu $a2, $s0, $zero -/* 91C734 80240E54 10400002 */ beqz $v0, .L80240E60 -/* 91C738 80240E58 24020014 */ addiu $v0, $zero, 0x14 -/* 91C73C 80240E5C AE620070 */ sw $v0, 0x70($s3) -.L80240E60: -/* 91C740 80240E60 8E630070 */ lw $v1, 0x70($s3) -/* 91C744 80240E64 2C620035 */ sltiu $v0, $v1, 0x35 -/* 91C748 80240E68 10400073 */ beqz $v0, .L80241038 -/* 91C74C 80240E6C 00031080 */ sll $v0, $v1, 2 -/* 91C750 80240E70 3C018024 */ lui $at, 0x8024 -/* 91C754 80240E74 00220821 */ addu $at, $at, $v0 -/* 91C758 80240E78 8C222BB8 */ lw $v0, 0x2bb8($at) -/* 91C75C 80240E7C 00400008 */ jr $v0 -/* 91C760 80240E80 00000000 */ nop -/* 91C764 80240E84 0260202D */ daddu $a0, $s3, $zero -/* 91C768 80240E88 0280282D */ daddu $a1, $s4, $zero -/* 91C76C 80240E8C 0C090078 */ jal func_802401E0 -/* 91C770 80240E90 0200302D */ daddu $a2, $s0, $zero -/* 91C774 80240E94 0260202D */ daddu $a0, $s3, $zero -/* 91C778 80240E98 0280282D */ daddu $a1, $s4, $zero -/* 91C77C 80240E9C 0C090095 */ jal func_80240254 -/* 91C780 80240EA0 0200302D */ daddu $a2, $s0, $zero -/* 91C784 80240EA4 8E630070 */ lw $v1, 0x70($s3) -/* 91C788 80240EA8 24020002 */ addiu $v0, $zero, 2 -/* 91C78C 80240EAC 14620063 */ bne $v1, $v0, .L8024103C -/* 91C790 80240EB0 0000102D */ daddu $v0, $zero, $zero -/* 91C794 80240EB4 0260202D */ daddu $a0, $s3, $zero -/* 91C798 80240EB8 0280282D */ daddu $a1, $s4, $zero -/* 91C79C 80240EBC 0C0900E1 */ jal func_80240384 -/* 91C7A0 80240EC0 0200302D */ daddu $a2, $s0, $zero -/* 91C7A4 80240EC4 8E630070 */ lw $v1, 0x70($s3) -/* 91C7A8 80240EC8 24020003 */ addiu $v0, $zero, 3 -/* 91C7AC 80240ECC 1462005B */ bne $v1, $v0, .L8024103C -/* 91C7B0 80240ED0 0000102D */ daddu $v0, $zero, $zero -/* 91C7B4 80240ED4 0260202D */ daddu $a0, $s3, $zero -/* 91C7B8 80240ED8 0280282D */ daddu $a1, $s4, $zero -/* 91C7BC 80240EDC 0C090108 */ jal func_80240420 -/* 91C7C0 80240EE0 0200302D */ daddu $a2, $s0, $zero -/* 91C7C4 80240EE4 8E630070 */ lw $v1, 0x70($s3) -/* 91C7C8 80240EE8 24020004 */ addiu $v0, $zero, 4 -/* 91C7CC 80240EEC 14620053 */ bne $v1, $v0, .L8024103C -/* 91C7D0 80240EF0 0000102D */ daddu $v0, $zero, $zero -/* 91C7D4 80240EF4 0260202D */ daddu $a0, $s3, $zero -/* 91C7D8 80240EF8 0280282D */ daddu $a1, $s4, $zero -/* 91C7DC 80240EFC 0C09012A */ jal func_802404A8 -/* 91C7E0 80240F00 0200302D */ daddu $a2, $s0, $zero -/* 91C7E4 80240F04 0260202D */ daddu $a0, $s3, $zero -/* 91C7E8 80240F08 0280282D */ daddu $a1, $s4, $zero -/* 91C7EC 80240F0C 0C090154 */ jal func_80240550 -/* 91C7F0 80240F10 0200302D */ daddu $a2, $s0, $zero -/* 91C7F4 80240F14 0809040F */ j .L8024103C -/* 91C7F8 80240F18 0000102D */ daddu $v0, $zero, $zero -/* 91C7FC 80240F1C 0260202D */ daddu $a0, $s3, $zero -/* 91C800 80240F20 0280282D */ daddu $a1, $s4, $zero -/* 91C804 80240F24 0C0127DF */ jal func_80049F7C -/* 91C808 80240F28 0200302D */ daddu $a2, $s0, $zero -/* 91C80C 80240F2C 8E630070 */ lw $v1, 0x70($s3) -/* 91C810 80240F30 2402000D */ addiu $v0, $zero, 0xd -/* 91C814 80240F34 14620041 */ bne $v1, $v0, .L8024103C -/* 91C818 80240F38 0000102D */ daddu $v0, $zero, $zero -/* 91C81C 80240F3C 0260202D */ daddu $a0, $s3, $zero -/* 91C820 80240F40 0280282D */ daddu $a1, $s4, $zero -/* 91C824 80240F44 0C012849 */ jal func_8004A124 -/* 91C828 80240F48 0200302D */ daddu $a2, $s0, $zero -/* 91C82C 80240F4C 8E630070 */ lw $v1, 0x70($s3) -/* 91C830 80240F50 2402000E */ addiu $v0, $zero, 0xe -/* 91C834 80240F54 14620039 */ bne $v1, $v0, .L8024103C -/* 91C838 80240F58 0000102D */ daddu $v0, $zero, $zero -/* 91C83C 80240F5C 96A2008E */ lhu $v0, 0x8e($s5) -/* 91C840 80240F60 2442FFFF */ addiu $v0, $v0, -1 -/* 91C844 80240F64 A6A2008E */ sh $v0, 0x8e($s5) -/* 91C848 80240F68 00021400 */ sll $v0, $v0, 0x10 -/* 91C84C 80240F6C 14400033 */ bnez $v0, .L8024103C -/* 91C850 80240F70 0000102D */ daddu $v0, $zero, $zero -/* 91C854 80240F74 24020028 */ addiu $v0, $zero, 0x28 -/* 91C858 80240F78 0809040E */ j .L80241038 -/* 91C85C 80240F7C AE620070 */ sw $v0, 0x70($s3) -/* 91C860 80240F80 0260202D */ daddu $a0, $s3, $zero -/* 91C864 80240F84 0280282D */ daddu $a1, $s4, $zero -/* 91C868 80240F88 0C0901B1 */ jal func_802406C4 -/* 91C86C 80240F8C 0200302D */ daddu $a2, $s0, $zero -/* 91C870 80240F90 0260202D */ daddu $a0, $s3, $zero -/* 91C874 80240F94 0280282D */ daddu $a1, $s4, $zero -/* 91C878 80240F98 0C0901C5 */ jal func_80240714 -/* 91C87C 80240F9C 0200302D */ daddu $a2, $s0, $zero -/* 91C880 80240FA0 0809040F */ j .L8024103C -/* 91C884 80240FA4 0000102D */ daddu $v0, $zero, $zero -/* 91C888 80240FA8 0260202D */ daddu $a0, $s3, $zero -/* 91C88C 80240FAC 0280282D */ daddu $a1, $s4, $zero -/* 91C890 80240FB0 0C09022D */ jal func_802408B4 -/* 91C894 80240FB4 0200302D */ daddu $a2, $s0, $zero -/* 91C898 80240FB8 0809040F */ j .L8024103C -/* 91C89C 80240FBC 0000102D */ daddu $v0, $zero, $zero -/* 91C8A0 80240FC0 0260202D */ daddu $a0, $s3, $zero -/* 91C8A4 80240FC4 0280282D */ daddu $a1, $s4, $zero -/* 91C8A8 80240FC8 0C090281 */ jal func_80240A04 -/* 91C8AC 80240FCC 0200302D */ daddu $a2, $s0, $zero -/* 91C8B0 80240FD0 8E630070 */ lw $v1, 0x70($s3) -/* 91C8B4 80240FD4 24020029 */ addiu $v0, $zero, 0x29 -/* 91C8B8 80240FD8 14620018 */ bne $v1, $v0, .L8024103C -/* 91C8BC 80240FDC 0000102D */ daddu $v0, $zero, $zero -/* 91C8C0 80240FE0 0260202D */ daddu $a0, $s3, $zero -/* 91C8C4 80240FE4 0280282D */ daddu $a1, $s4, $zero -/* 91C8C8 80240FE8 0C0902AC */ jal func_80240AB0 -/* 91C8CC 80240FEC 0200302D */ daddu $a2, $s0, $zero -/* 91C8D0 80240FF0 0809040F */ j .L8024103C -/* 91C8D4 80240FF4 0000102D */ daddu $v0, $zero, $zero -/* 91C8D8 80240FF8 0260202D */ daddu $a0, $s3, $zero -/* 91C8DC 80240FFC 0280282D */ daddu $a1, $s4, $zero -/* 91C8E0 80241000 0C0902FA */ jal func_80240BE8 -/* 91C8E4 80241004 0200302D */ daddu $a2, $s0, $zero -/* 91C8E8 80241008 0260202D */ daddu $a0, $s3, $zero -/* 91C8EC 8024100C 0280282D */ daddu $a1, $s4, $zero -/* 91C8F0 80241010 0C090319 */ jal func_80240C64 -/* 91C8F4 80241014 0200302D */ daddu $a2, $s0, $zero -/* 91C8F8 80241018 8E630070 */ lw $v1, 0x70($s3) -/* 91C8FC 8024101C 24020034 */ addiu $v0, $zero, 0x34 -/* 91C900 80241020 14620006 */ bne $v1, $v0, .L8024103C -/* 91C904 80241024 0000102D */ daddu $v0, $zero, $zero -/* 91C908 80241028 0260202D */ daddu $a0, $s3, $zero -/* 91C90C 8024102C 0280282D */ daddu $a1, $s4, $zero -/* 91C910 80241030 0C090333 */ jal func_80240CCC -/* 91C914 80241034 0200302D */ daddu $a2, $s0, $zero -.L80241038: -/* 91C918 80241038 0000102D */ daddu $v0, $zero, $zero -.L8024103C: -/* 91C91C 8024103C 8FBF0048 */ lw $ra, 0x48($sp) -/* 91C920 80241040 8FB50044 */ lw $s5, 0x44($sp) -/* 91C924 80241044 8FB40040 */ lw $s4, 0x40($sp) -/* 91C928 80241048 8FB3003C */ lw $s3, 0x3c($sp) -/* 91C92C 8024104C 8FB20038 */ lw $s2, 0x38($sp) -/* 91C930 80241050 8FB10034 */ lw $s1, 0x34($sp) -/* 91C934 80241054 8FB00030 */ lw $s0, 0x30($sp) -/* 91C938 80241058 03E00008 */ jr $ra -/* 91C93C 8024105C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s new file mode 100644 index 0000000000..a0ad8cb2a1 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240D10_91C5F0.s @@ -0,0 +1,223 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D10_91C5F0 +/* 91C5F0 80240D10 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 91C5F4 80240D14 AFB3003C */ sw $s3, 0x3c($sp) +/* 91C5F8 80240D18 0080982D */ daddu $s3, $a0, $zero +/* 91C5FC 80240D1C AFBF0048 */ sw $ra, 0x48($sp) +/* 91C600 80240D20 AFB50044 */ sw $s5, 0x44($sp) +/* 91C604 80240D24 AFB40040 */ sw $s4, 0x40($sp) +/* 91C608 80240D28 AFB20038 */ sw $s2, 0x38($sp) +/* 91C60C 80240D2C AFB10034 */ sw $s1, 0x34($sp) +/* 91C610 80240D30 AFB00030 */ sw $s0, 0x30($sp) +/* 91C614 80240D34 8E720148 */ lw $s2, 0x148($s3) +/* 91C618 80240D38 86440008 */ lh $a0, 8($s2) +/* 91C61C 80240D3C 0C00EABB */ jal get_npc_unsafe +/* 91C620 80240D40 00A0882D */ daddu $s1, $a1, $zero +/* 91C624 80240D44 0260202D */ daddu $a0, $s3, $zero +/* 91C628 80240D48 8E70000C */ lw $s0, 0xc($s3) +/* 91C62C 80240D4C 0040A82D */ daddu $s5, $v0, $zero +/* 91C630 80240D50 8E050000 */ lw $a1, ($s0) +/* 91C634 80240D54 0C0B1EAF */ jal get_variable +/* 91C638 80240D58 26100004 */ addiu $s0, $s0, 4 +/* 91C63C 80240D5C 0260202D */ daddu $a0, $s3, $zero +/* 91C640 80240D60 8E050000 */ lw $a1, ($s0) +/* 91C644 80240D64 0C0B1EAF */ jal get_variable +/* 91C648 80240D68 0040A02D */ daddu $s4, $v0, $zero +/* 91C64C 80240D6C AE420094 */ sw $v0, 0x94($s2) +/* 91C650 80240D70 AFA00010 */ sw $zero, 0x10($sp) +/* 91C654 80240D74 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C658 80240D78 8C420030 */ lw $v0, 0x30($v0) +/* 91C65C 80240D7C AFA20014 */ sw $v0, 0x14($sp) +/* 91C660 80240D80 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C664 80240D84 8C42001C */ lw $v0, 0x1c($v0) +/* 91C668 80240D88 AFA20018 */ sw $v0, 0x18($sp) +/* 91C66C 80240D8C 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C670 80240D90 8C420024 */ lw $v0, 0x24($v0) +/* 91C674 80240D94 AFA2001C */ sw $v0, 0x1c($sp) +/* 91C678 80240D98 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C67C 80240D9C 8C420028 */ lw $v0, 0x28($v0) +/* 91C680 80240DA0 AFA20020 */ sw $v0, 0x20($sp) +/* 91C684 80240DA4 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C688 80240DA8 3C014220 */ lui $at, 0x4220 +/* 91C68C 80240DAC 44810000 */ mtc1 $at, $f0 +/* 91C690 80240DB0 8C42002C */ lw $v0, 0x2c($v0) +/* 91C694 80240DB4 27B00010 */ addiu $s0, $sp, 0x10 +/* 91C698 80240DB8 E7A00028 */ swc1 $f0, 0x28($sp) +/* 91C69C 80240DBC A7A0002C */ sh $zero, 0x2c($sp) +/* 91C6A0 80240DC0 12200012 */ beqz $s1, .L80240E0C +/* 91C6A4 80240DC4 AFA20024 */ sw $v0, 0x24($sp) +/* 91C6A8 80240DC8 AE600070 */ sw $zero, 0x70($s3) +/* 91C6AC 80240DCC 8EA30000 */ lw $v1, ($s5) +/* 91C6B0 80240DD0 2402F7FF */ addiu $v0, $zero, -0x801 +/* 91C6B4 80240DD4 A6A0008E */ sh $zero, 0x8e($s5) +/* 91C6B8 80240DD8 00621824 */ and $v1, $v1, $v0 +/* 91C6BC 80240DDC AEA30000 */ sw $v1, ($s5) +/* 91C6C0 80240DE0 8E4200D0 */ lw $v0, 0xd0($s2) +/* 91C6C4 80240DE4 8C420034 */ lw $v0, 0x34($v0) +/* 91C6C8 80240DE8 54400005 */ bnel $v0, $zero, .L80240E00 +/* 91C6CC 80240DEC 2402FDFF */ addiu $v0, $zero, -0x201 +/* 91C6D0 80240DF0 34620200 */ ori $v0, $v1, 0x200 +/* 91C6D4 80240DF4 2403FFF7 */ addiu $v1, $zero, -9 +/* 91C6D8 80240DF8 08090382 */ j .L80240E08 +/* 91C6DC 80240DFC 00431024 */ and $v0, $v0, $v1 +.L80240E00: +/* 91C6E0 80240E00 00621024 */ and $v0, $v1, $v0 +/* 91C6E4 80240E04 34420008 */ ori $v0, $v0, 8 +.L80240E08: +/* 91C6E8 80240E08 AEA20000 */ sw $v0, ($s5) +.L80240E0C: +/* 91C6EC 80240E0C 8E4300B0 */ lw $v1, 0xb0($s2) +/* 91C6F0 80240E10 30620004 */ andi $v0, $v1, 4 +/* 91C6F4 80240E14 10400007 */ beqz $v0, .L80240E34 +/* 91C6F8 80240E18 00000000 */ nop +/* 91C6FC 80240E1C 824200B4 */ lb $v0, 0xb4($s2) +/* 91C700 80240E20 14400086 */ bnez $v0, .L8024103C +/* 91C704 80240E24 0000102D */ daddu $v0, $zero, $zero +/* 91C708 80240E28 2402FFFB */ addiu $v0, $zero, -5 +/* 91C70C 80240E2C 00621024 */ and $v0, $v1, $v0 +/* 91C710 80240E30 AE4200B0 */ sw $v0, 0xb0($s2) +.L80240E34: +/* 91C714 80240E34 8E620070 */ lw $v0, 0x70($s3) +/* 91C718 80240E38 2442FFF4 */ addiu $v0, $v0, -0xc +/* 91C71C 80240E3C 2C420003 */ sltiu $v0, $v0, 3 +/* 91C720 80240E40 10400007 */ beqz $v0, .L80240E60 +/* 91C724 80240E44 0260202D */ daddu $a0, $s3, $zero +/* 91C728 80240E48 0280282D */ daddu $a1, $s4, $zero +/* 91C72C 80240E4C 0C090020 */ jal func_80240080_91B960 +/* 91C730 80240E50 0200302D */ daddu $a2, $s0, $zero +/* 91C734 80240E54 10400002 */ beqz $v0, .L80240E60 +/* 91C738 80240E58 24020014 */ addiu $v0, $zero, 0x14 +/* 91C73C 80240E5C AE620070 */ sw $v0, 0x70($s3) +.L80240E60: +/* 91C740 80240E60 8E630070 */ lw $v1, 0x70($s3) +/* 91C744 80240E64 2C620035 */ sltiu $v0, $v1, 0x35 +/* 91C748 80240E68 10400073 */ beqz $v0, .L80241038 +/* 91C74C 80240E6C 00031080 */ sll $v0, $v1, 2 +/* 91C750 80240E70 3C018024 */ lui $at, 0x8024 +/* 91C754 80240E74 00220821 */ addu $at, $at, $v0 +/* 91C758 80240E78 8C222BB8 */ lw $v0, 0x2bb8($at) +/* 91C75C 80240E7C 00400008 */ jr $v0 +/* 91C760 80240E80 00000000 */ nop +/* 91C764 80240E84 0260202D */ daddu $a0, $s3, $zero +/* 91C768 80240E88 0280282D */ daddu $a1, $s4, $zero +/* 91C76C 80240E8C 0C090078 */ jal func_802401E0_91BAC0 +/* 91C770 80240E90 0200302D */ daddu $a2, $s0, $zero +/* 91C774 80240E94 0260202D */ daddu $a0, $s3, $zero +/* 91C778 80240E98 0280282D */ daddu $a1, $s4, $zero +/* 91C77C 80240E9C 0C090095 */ jal func_80240254_91BB34 +/* 91C780 80240EA0 0200302D */ daddu $a2, $s0, $zero +/* 91C784 80240EA4 8E630070 */ lw $v1, 0x70($s3) +/* 91C788 80240EA8 24020002 */ addiu $v0, $zero, 2 +/* 91C78C 80240EAC 14620063 */ bne $v1, $v0, .L8024103C +/* 91C790 80240EB0 0000102D */ daddu $v0, $zero, $zero +/* 91C794 80240EB4 0260202D */ daddu $a0, $s3, $zero +/* 91C798 80240EB8 0280282D */ daddu $a1, $s4, $zero +/* 91C79C 80240EBC 0C0900E1 */ jal func_80240384_91BC64 +/* 91C7A0 80240EC0 0200302D */ daddu $a2, $s0, $zero +/* 91C7A4 80240EC4 8E630070 */ lw $v1, 0x70($s3) +/* 91C7A8 80240EC8 24020003 */ addiu $v0, $zero, 3 +/* 91C7AC 80240ECC 1462005B */ bne $v1, $v0, .L8024103C +/* 91C7B0 80240ED0 0000102D */ daddu $v0, $zero, $zero +/* 91C7B4 80240ED4 0260202D */ daddu $a0, $s3, $zero +/* 91C7B8 80240ED8 0280282D */ daddu $a1, $s4, $zero +/* 91C7BC 80240EDC 0C090108 */ jal func_80240420_91BD00 +/* 91C7C0 80240EE0 0200302D */ daddu $a2, $s0, $zero +/* 91C7C4 80240EE4 8E630070 */ lw $v1, 0x70($s3) +/* 91C7C8 80240EE8 24020004 */ addiu $v0, $zero, 4 +/* 91C7CC 80240EEC 14620053 */ bne $v1, $v0, .L8024103C +/* 91C7D0 80240EF0 0000102D */ daddu $v0, $zero, $zero +/* 91C7D4 80240EF4 0260202D */ daddu $a0, $s3, $zero +/* 91C7D8 80240EF8 0280282D */ daddu $a1, $s4, $zero +/* 91C7DC 80240EFC 0C09012A */ jal func_802404A8_91BD88 +/* 91C7E0 80240F00 0200302D */ daddu $a2, $s0, $zero +/* 91C7E4 80240F04 0260202D */ daddu $a0, $s3, $zero +/* 91C7E8 80240F08 0280282D */ daddu $a1, $s4, $zero +/* 91C7EC 80240F0C 0C090154 */ jal func_80240550_91BE30 +/* 91C7F0 80240F10 0200302D */ daddu $a2, $s0, $zero +/* 91C7F4 80240F14 0809040F */ j .L8024103C +/* 91C7F8 80240F18 0000102D */ daddu $v0, $zero, $zero +/* 91C7FC 80240F1C 0260202D */ daddu $a0, $s3, $zero +/* 91C800 80240F20 0280282D */ daddu $a1, $s4, $zero +/* 91C804 80240F24 0C0127DF */ jal func_80049F7C +/* 91C808 80240F28 0200302D */ daddu $a2, $s0, $zero +/* 91C80C 80240F2C 8E630070 */ lw $v1, 0x70($s3) +/* 91C810 80240F30 2402000D */ addiu $v0, $zero, 0xd +/* 91C814 80240F34 14620041 */ bne $v1, $v0, .L8024103C +/* 91C818 80240F38 0000102D */ daddu $v0, $zero, $zero +/* 91C81C 80240F3C 0260202D */ daddu $a0, $s3, $zero +/* 91C820 80240F40 0280282D */ daddu $a1, $s4, $zero +/* 91C824 80240F44 0C012849 */ jal func_8004A124 +/* 91C828 80240F48 0200302D */ daddu $a2, $s0, $zero +/* 91C82C 80240F4C 8E630070 */ lw $v1, 0x70($s3) +/* 91C830 80240F50 2402000E */ addiu $v0, $zero, 0xe +/* 91C834 80240F54 14620039 */ bne $v1, $v0, .L8024103C +/* 91C838 80240F58 0000102D */ daddu $v0, $zero, $zero +/* 91C83C 80240F5C 96A2008E */ lhu $v0, 0x8e($s5) +/* 91C840 80240F60 2442FFFF */ addiu $v0, $v0, -1 +/* 91C844 80240F64 A6A2008E */ sh $v0, 0x8e($s5) +/* 91C848 80240F68 00021400 */ sll $v0, $v0, 0x10 +/* 91C84C 80240F6C 14400033 */ bnez $v0, .L8024103C +/* 91C850 80240F70 0000102D */ daddu $v0, $zero, $zero +/* 91C854 80240F74 24020028 */ addiu $v0, $zero, 0x28 +/* 91C858 80240F78 0809040E */ j .L80241038 +/* 91C85C 80240F7C AE620070 */ sw $v0, 0x70($s3) +/* 91C860 80240F80 0260202D */ daddu $a0, $s3, $zero +/* 91C864 80240F84 0280282D */ daddu $a1, $s4, $zero +/* 91C868 80240F88 0C0901B1 */ jal func_802406C4_91BFA4 +/* 91C86C 80240F8C 0200302D */ daddu $a2, $s0, $zero +/* 91C870 80240F90 0260202D */ daddu $a0, $s3, $zero +/* 91C874 80240F94 0280282D */ daddu $a1, $s4, $zero +/* 91C878 80240F98 0C0901C5 */ jal func_80240714_91BFF4 +/* 91C87C 80240F9C 0200302D */ daddu $a2, $s0, $zero +/* 91C880 80240FA0 0809040F */ j .L8024103C +/* 91C884 80240FA4 0000102D */ daddu $v0, $zero, $zero +/* 91C888 80240FA8 0260202D */ daddu $a0, $s3, $zero +/* 91C88C 80240FAC 0280282D */ daddu $a1, $s4, $zero +/* 91C890 80240FB0 0C09022D */ jal func_802408B4_91C194 +/* 91C894 80240FB4 0200302D */ daddu $a2, $s0, $zero +/* 91C898 80240FB8 0809040F */ j .L8024103C +/* 91C89C 80240FBC 0000102D */ daddu $v0, $zero, $zero +/* 91C8A0 80240FC0 0260202D */ daddu $a0, $s3, $zero +/* 91C8A4 80240FC4 0280282D */ daddu $a1, $s4, $zero +/* 91C8A8 80240FC8 0C090281 */ jal func_80240A04_91C2E4 +/* 91C8AC 80240FCC 0200302D */ daddu $a2, $s0, $zero +/* 91C8B0 80240FD0 8E630070 */ lw $v1, 0x70($s3) +/* 91C8B4 80240FD4 24020029 */ addiu $v0, $zero, 0x29 +/* 91C8B8 80240FD8 14620018 */ bne $v1, $v0, .L8024103C +/* 91C8BC 80240FDC 0000102D */ daddu $v0, $zero, $zero +/* 91C8C0 80240FE0 0260202D */ daddu $a0, $s3, $zero +/* 91C8C4 80240FE4 0280282D */ daddu $a1, $s4, $zero +/* 91C8C8 80240FE8 0C0902AC */ jal func_80240AB0_91C390 +/* 91C8CC 80240FEC 0200302D */ daddu $a2, $s0, $zero +/* 91C8D0 80240FF0 0809040F */ j .L8024103C +/* 91C8D4 80240FF4 0000102D */ daddu $v0, $zero, $zero +/* 91C8D8 80240FF8 0260202D */ daddu $a0, $s3, $zero +/* 91C8DC 80240FFC 0280282D */ daddu $a1, $s4, $zero +/* 91C8E0 80241000 0C0902FA */ jal func_80240BE8_91C4C8 +/* 91C8E4 80241004 0200302D */ daddu $a2, $s0, $zero +/* 91C8E8 80241008 0260202D */ daddu $a0, $s3, $zero +/* 91C8EC 8024100C 0280282D */ daddu $a1, $s4, $zero +/* 91C8F0 80241010 0C090319 */ jal func_80240C64_91C544 +/* 91C8F4 80241014 0200302D */ daddu $a2, $s0, $zero +/* 91C8F8 80241018 8E630070 */ lw $v1, 0x70($s3) +/* 91C8FC 8024101C 24020034 */ addiu $v0, $zero, 0x34 +/* 91C900 80241020 14620006 */ bne $v1, $v0, .L8024103C +/* 91C904 80241024 0000102D */ daddu $v0, $zero, $zero +/* 91C908 80241028 0260202D */ daddu $a0, $s3, $zero +/* 91C90C 8024102C 0280282D */ daddu $a1, $s4, $zero +/* 91C910 80241030 0C090333 */ jal func_80240CCC_91C5AC +/* 91C914 80241034 0200302D */ daddu $a2, $s0, $zero +.L80241038: +/* 91C918 80241038 0000102D */ daddu $v0, $zero, $zero +.L8024103C: +/* 91C91C 8024103C 8FBF0048 */ lw $ra, 0x48($sp) +/* 91C920 80241040 8FB50044 */ lw $s5, 0x44($sp) +/* 91C924 80241044 8FB40040 */ lw $s4, 0x40($sp) +/* 91C928 80241048 8FB3003C */ lw $s3, 0x3c($sp) +/* 91C92C 8024104C 8FB20038 */ lw $s2, 0x38($sp) +/* 91C930 80241050 8FB10034 */ lw $s1, 0x34($sp) +/* 91C934 80241054 8FB00030 */ lw $s0, 0x30($sp) +/* 91C938 80241058 03E00008 */ jr $ra +/* 91C93C 8024105C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C.s deleted file mode 100644 index 8768a80a93..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024107C -/* 91C95C 8024107C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91C960 80241080 AFB00010 */ sw $s0, 0x10($sp) -/* 91C964 80241084 0080802D */ daddu $s0, $a0, $zero -/* 91C968 80241088 AFBF0018 */ sw $ra, 0x18($sp) -/* 91C96C 8024108C AFB10014 */ sw $s1, 0x14($sp) -/* 91C970 80241090 8E11000C */ lw $s1, 0xc($s0) -/* 91C974 80241094 0C0B36B0 */ jal resolve_npc -/* 91C978 80241098 2405FFFF */ addiu $a1, $zero, -1 -/* 91C97C 8024109C 0200202D */ daddu $a0, $s0, $zero -/* 91C980 802410A0 8E250000 */ lw $a1, ($s1) -/* 91C984 802410A4 0C0B1EAF */ jal get_variable -/* 91C988 802410A8 0040802D */ daddu $s0, $v0, $zero -/* 91C98C 802410AC 44820000 */ mtc1 $v0, $f0 -/* 91C990 802410B0 00000000 */ nop -/* 91C994 802410B4 46800020 */ cvt.s.w $f0, $f0 -/* 91C998 802410B8 E6000034 */ swc1 $f0, 0x34($s0) -/* 91C99C 802410BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 91C9A0 802410C0 8FB10014 */ lw $s1, 0x14($sp) -/* 91C9A4 802410C4 8FB00010 */ lw $s0, 0x10($sp) -/* 91C9A8 802410C8 24020002 */ addiu $v0, $zero, 2 -/* 91C9AC 802410CC 03E00008 */ jr $ra -/* 91C9B0 802410D0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 91C9B4 802410D4 00000000 */ nop -/* 91C9B8 802410D8 00000000 */ nop -/* 91C9BC 802410DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s new file mode 100644 index 0000000000..1669e3c5f7 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_8024107C_91C95C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024107C_91C95C +/* 91C95C 8024107C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91C960 80241080 AFB00010 */ sw $s0, 0x10($sp) +/* 91C964 80241084 0080802D */ daddu $s0, $a0, $zero +/* 91C968 80241088 AFBF0018 */ sw $ra, 0x18($sp) +/* 91C96C 8024108C AFB10014 */ sw $s1, 0x14($sp) +/* 91C970 80241090 8E11000C */ lw $s1, 0xc($s0) +/* 91C974 80241094 0C0B36B0 */ jal resolve_npc +/* 91C978 80241098 2405FFFF */ addiu $a1, $zero, -1 +/* 91C97C 8024109C 0200202D */ daddu $a0, $s0, $zero +/* 91C980 802410A0 8E250000 */ lw $a1, ($s1) +/* 91C984 802410A4 0C0B1EAF */ jal get_variable +/* 91C988 802410A8 0040802D */ daddu $s0, $v0, $zero +/* 91C98C 802410AC 44820000 */ mtc1 $v0, $f0 +/* 91C990 802410B0 00000000 */ nop +/* 91C994 802410B4 46800020 */ cvt.s.w $f0, $f0 +/* 91C998 802410B8 E6000034 */ swc1 $f0, 0x34($s0) +/* 91C99C 802410BC 8FBF0018 */ lw $ra, 0x18($sp) +/* 91C9A0 802410C0 8FB10014 */ lw $s1, 0x14($sp) +/* 91C9A4 802410C4 8FB00010 */ lw $s0, 0x10($sp) +/* 91C9A8 802410C8 24020002 */ addiu $v0, $zero, 2 +/* 91C9AC 802410CC 03E00008 */ jr $ra +/* 91C9B0 802410D0 27BD0020 */ addiu $sp, $sp, 0x20 +/* 91C9B4 802410D4 00000000 */ nop +/* 91C9B8 802410D8 00000000 */ nop +/* 91C9BC 802410DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_802400F4.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_802400F4.s deleted file mode 100644 index 521eb8a13a..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_802400F4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F4 -/* 91E664 802400F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91E668 802400F8 AFB00010 */ sw $s0, 0x10($sp) -/* 91E66C 802400FC 0080802D */ daddu $s0, $a0, $zero -/* 91E670 80240100 AFBF0018 */ sw $ra, 0x18($sp) -/* 91E674 80240104 AFB10014 */ sw $s1, 0x14($sp) -/* 91E678 80240108 8E02000C */ lw $v0, 0xc($s0) -/* 91E67C 8024010C 8C510000 */ lw $s1, ($v0) -/* 91E680 80240110 0C0B1EAF */ jal get_variable -/* 91E684 80240114 0220282D */ daddu $a1, $s1, $zero -/* 91E688 80240118 3C03FFF0 */ lui $v1, 0xfff0 -/* 91E68C 8024011C 3463FFFF */ ori $v1, $v1, 0xffff -/* 91E690 80240120 0200202D */ daddu $a0, $s0, $zero -/* 91E694 80240124 00431024 */ and $v0, $v0, $v1 -/* 91E698 80240128 00021140 */ sll $v0, $v0, 5 -/* 91E69C 8024012C 3C068008 */ lui $a2, %hi(gItemTable) -/* 91E6A0 80240130 00C23021 */ addu $a2, $a2, $v0 -/* 91E6A4 80240134 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* 91E6A8 80240138 0C0B2026 */ jal set_variable -/* 91E6AC 8024013C 0220282D */ daddu $a1, $s1, $zero -/* 91E6B0 80240140 8FBF0018 */ lw $ra, 0x18($sp) -/* 91E6B4 80240144 8FB10014 */ lw $s1, 0x14($sp) -/* 91E6B8 80240148 8FB00010 */ lw $s0, 0x10($sp) -/* 91E6BC 8024014C 24020002 */ addiu $v0, $zero, 2 -/* 91E6C0 80240150 03E00008 */ jr $ra -/* 91E6C4 80240154 27BD0020 */ addiu $sp, $sp, 0x20 -/* 91E6C8 80240158 00000000 */ nop -/* 91E6CC 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_802400F4_91E664.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_802400F4_91E664.s new file mode 100644 index 0000000000..a27c89d1c6 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E5B0/func_802400F4_91E664.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400F4_91E664 +/* 91E664 802400F4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91E668 802400F8 AFB00010 */ sw $s0, 0x10($sp) +/* 91E66C 802400FC 0080802D */ daddu $s0, $a0, $zero +/* 91E670 80240100 AFBF0018 */ sw $ra, 0x18($sp) +/* 91E674 80240104 AFB10014 */ sw $s1, 0x14($sp) +/* 91E678 80240108 8E02000C */ lw $v0, 0xc($s0) +/* 91E67C 8024010C 8C510000 */ lw $s1, ($v0) +/* 91E680 80240110 0C0B1EAF */ jal get_variable +/* 91E684 80240114 0220282D */ daddu $a1, $s1, $zero +/* 91E688 80240118 3C03FFF0 */ lui $v1, 0xfff0 +/* 91E68C 8024011C 3463FFFF */ ori $v1, $v1, 0xffff +/* 91E690 80240120 0200202D */ daddu $a0, $s0, $zero +/* 91E694 80240124 00431024 */ and $v0, $v0, $v1 +/* 91E698 80240128 00021140 */ sll $v0, $v0, 5 +/* 91E69C 8024012C 3C068008 */ lui $a2, %hi(gItemTable) +/* 91E6A0 80240130 00C23021 */ addu $a2, $a2, $v0 +/* 91E6A4 80240134 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) +/* 91E6A8 80240138 0C0B2026 */ jal set_variable +/* 91E6AC 8024013C 0220282D */ daddu $a1, $s1, $zero +/* 91E6B0 80240140 8FBF0018 */ lw $ra, 0x18($sp) +/* 91E6B4 80240144 8FB10014 */ lw $s1, 0x14($sp) +/* 91E6B8 80240148 8FB00010 */ lw $s0, 0x10($sp) +/* 91E6BC 8024014C 24020002 */ addiu $v0, $zero, 2 +/* 91E6C0 80240150 03E00008 */ jr $ra +/* 91E6C4 80240154 27BD0020 */ addiu $sp, $sp, 0x20 +/* 91E6C8 80240158 00000000 */ nop +/* 91E6CC 8024015C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0.s deleted file mode 100644 index bc9baa3e91..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F0 -/* 91E860 802402F0 3C03800A */ lui $v1, %hi(D_8009A650) -/* 91E864 802402F4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 91E868 802402F8 8C620000 */ lw $v0, ($v1) -/* 91E86C 802402FC 34420040 */ ori $v0, $v0, 0x40 -/* 91E870 80240300 AC620000 */ sw $v0, ($v1) -/* 91E874 80240304 03E00008 */ jr $ra -/* 91E878 80240308 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0_91E860.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0_91E860.s new file mode 100644 index 0000000000..4136538a5e --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_802402F0_91E860.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402F0_91E860 +/* 91E860 802402F0 3C03800A */ lui $v1, %hi(D_8009A650) +/* 91E864 802402F4 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) +/* 91E868 802402F8 8C620000 */ lw $v0, ($v1) +/* 91E86C 802402FC 34420040 */ ori $v0, $v0, 0x40 +/* 91E870 80240300 AC620000 */ sw $v0, ($v1) +/* 91E874 80240304 03E00008 */ jr $ra +/* 91E878 80240308 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C.s deleted file mode 100644 index b562aa25c9..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024070C -/* 91EC7C 8024070C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91EC80 80240710 AFBF0010 */ sw $ra, 0x10($sp) -/* 91EC84 80240714 8C82000C */ lw $v0, 0xc($a0) -/* 91EC88 80240718 0C0B1EAF */ jal get_variable -/* 91EC8C 8024071C 8C450000 */ lw $a1, ($v0) -/* 91EC90 80240720 0C03AC5A */ jal func_800EB168 -/* 91EC94 80240724 0040202D */ daddu $a0, $v0, $zero -/* 91EC98 80240728 8FBF0010 */ lw $ra, 0x10($sp) -/* 91EC9C 8024072C 24020002 */ addiu $v0, $zero, 2 -/* 91ECA0 80240730 03E00008 */ jr $ra -/* 91ECA4 80240734 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C_91EC7C.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C_91EC7C.s new file mode 100644 index 0000000000..80476ddabf --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_8024070C_91EC7C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024070C_91EC7C +/* 91EC7C 8024070C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 91EC80 80240710 AFBF0010 */ sw $ra, 0x10($sp) +/* 91EC84 80240714 8C82000C */ lw $v0, 0xc($a0) +/* 91EC88 80240718 0C0B1EAF */ jal get_variable +/* 91EC8C 8024071C 8C450000 */ lw $a1, ($v0) +/* 91EC90 80240720 0C03AC5A */ jal func_800EB168 +/* 91EC94 80240724 0040202D */ daddu $a0, $v0, $zero +/* 91EC98 80240728 8FBF0010 */ lw $ra, 0x10($sp) +/* 91EC9C 8024072C 24020002 */ addiu $v0, $zero, 2 +/* 91ECA0 80240730 03E00008 */ jr $ra +/* 91ECA4 80240734 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738.s deleted file mode 100644 index a62c75fa1a..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240738 -/* 91ECA8 80240738 3C028011 */ lui $v0, 0x8011 -/* 91ECAC 8024073C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 91ECB0 80240740 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91ECB4 80240744 AFBF0010 */ sw $ra, 0x10($sp) -/* 91ECB8 80240748 00021100 */ sll $v0, $v0, 4 -/* 91ECBC 8024074C 3C048009 */ lui $a0, 0x8009 -/* 91ECC0 80240750 00822021 */ addu $a0, $a0, $v0 -/* 91ECC4 80240754 8C84EF20 */ lw $a0, -0x10e0($a0) -/* 91ECC8 80240758 0C0496CF */ jal set_message_string -/* 91ECCC 8024075C 0000282D */ daddu $a1, $zero, $zero -/* 91ECD0 80240760 8FBF0010 */ lw $ra, 0x10($sp) -/* 91ECD4 80240764 24020002 */ addiu $v0, $zero, 2 -/* 91ECD8 80240768 03E00008 */ jr $ra -/* 91ECDC 8024076C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s new file mode 100644 index 0000000000..4077c47e03 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240738_91ECA8 +/* 91ECA8 80240738 3C028011 */ lui $v0, 0x8011 +/* 91ECAC 8024073C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 91ECB0 80240740 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 91ECB4 80240744 AFBF0010 */ sw $ra, 0x10($sp) +/* 91ECB8 80240748 00021100 */ sll $v0, $v0, 4 +/* 91ECBC 8024074C 3C048009 */ lui $a0, 0x8009 +/* 91ECC0 80240750 00822021 */ addu $a0, $a0, $v0 +/* 91ECC4 80240754 8C84EF20 */ lw $a0, -0x10e0($a0) +/* 91ECC8 80240758 0C0496CF */ jal set_message_string +/* 91ECCC 8024075C 0000282D */ daddu $a1, $zero, $zero +/* 91ECD0 80240760 8FBF0010 */ lw $ra, 0x10($sp) +/* 91ECD4 80240764 24020002 */ addiu $v0, $zero, 2 +/* 91ECD8 80240768 03E00008 */ jr $ra +/* 91ECDC 8024076C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240800.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240800.s deleted file mode 100644 index 8e74e8c6eb..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240800.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240800 -/* 91ED70 80240800 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91ED74 80240804 AFBF0010 */ sw $ra, 0x10($sp) -/* 91ED78 80240808 8C82000C */ lw $v0, 0xc($a0) -/* 91ED7C 8024080C 0C0B1EAF */ jal get_variable -/* 91ED80 80240810 8C450000 */ lw $a1, ($v0) -/* 91ED84 80240814 0040202D */ daddu $a0, $v0, $zero -/* 91ED88 80240818 8C830000 */ lw $v1, ($a0) -/* 91ED8C 8024081C 34630010 */ ori $v1, $v1, 0x10 -/* 91ED90 80240820 AC830000 */ sw $v1, ($a0) -/* 91ED94 80240824 8FBF0010 */ lw $ra, 0x10($sp) -/* 91ED98 80240828 24020002 */ addiu $v0, $zero, 2 -/* 91ED9C 8024082C 03E00008 */ jr $ra -/* 91EDA0 80240830 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240800_91ED70.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240800_91ED70.s new file mode 100644 index 0000000000..1db97ca50d --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240800_91ED70.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240800_91ED70 +/* 91ED70 80240800 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 91ED74 80240804 AFBF0010 */ sw $ra, 0x10($sp) +/* 91ED78 80240808 8C82000C */ lw $v0, 0xc($a0) +/* 91ED7C 8024080C 0C0B1EAF */ jal get_variable +/* 91ED80 80240810 8C450000 */ lw $a1, ($v0) +/* 91ED84 80240814 0040202D */ daddu $a0, $v0, $zero +/* 91ED88 80240818 8C830000 */ lw $v1, ($a0) +/* 91ED8C 8024081C 34630010 */ ori $v1, $v1, 0x10 +/* 91ED90 80240820 AC830000 */ sw $v1, ($a0) +/* 91ED94 80240824 8FBF0010 */ lw $ra, 0x10($sp) +/* 91ED98 80240828 24020002 */ addiu $v0, $zero, 2 +/* 91ED9C 8024082C 03E00008 */ jr $ra +/* 91EDA0 80240830 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28.s deleted file mode 100644 index f6e1b00c32..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E28 -/* 91F398 80240E28 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91F39C 80240E2C AFB10014 */ sw $s1, 0x14($sp) -/* 91F3A0 80240E30 0080882D */ daddu $s1, $a0, $zero -/* 91F3A4 80240E34 AFB20018 */ sw $s2, 0x18($sp) -/* 91F3A8 80240E38 AFBF001C */ sw $ra, 0x1c($sp) -/* 91F3AC 80240E3C AFB00010 */ sw $s0, 0x10($sp) -/* 91F3B0 80240E40 8E30000C */ lw $s0, 0xc($s1) -/* 91F3B4 80240E44 10A00010 */ beqz $a1, .L80240E88 -/* 91F3B8 80240E48 0000902D */ daddu $s2, $zero, $zero -/* 91F3BC 80240E4C 8E050000 */ lw $a1, ($s0) -/* 91F3C0 80240E50 0C0B1EAF */ jal get_variable -/* 91F3C4 80240E54 26100004 */ addiu $s0, $s0, 4 -/* 91F3C8 80240E58 AE220084 */ sw $v0, 0x84($s1) -/* 91F3CC 80240E5C 8E050000 */ lw $a1, ($s0) -/* 91F3D0 80240E60 0C0B1EAF */ jal get_variable -/* 91F3D4 80240E64 0220202D */ daddu $a0, $s1, $zero -/* 91F3D8 80240E68 0240202D */ daddu $a0, $s2, $zero -/* 91F3DC 80240E6C 240500D0 */ addiu $a1, $zero, 0xd0 -/* 91F3E0 80240E70 00A0302D */ daddu $a2, $a1, $zero -/* 91F3E4 80240E74 00A0382D */ daddu $a3, $a1, $zero -/* 91F3E8 80240E78 AE220088 */ sw $v0, 0x88($s1) -/* 91F3EC 80240E7C AE200070 */ sw $zero, 0x70($s1) -/* 91F3F0 80240E80 0C04DF84 */ jal func_80137E10 -/* 91F3F4 80240E84 AE200074 */ sw $zero, 0x74($s1) -.L80240E88: -/* 91F3F8 80240E88 8E230070 */ lw $v1, 0x70($s1) -/* 91F3FC 80240E8C 24040001 */ addiu $a0, $zero, 1 -/* 91F400 80240E90 10640019 */ beq $v1, $a0, .L80240EF8 -/* 91F404 80240E94 28620002 */ slti $v0, $v1, 2 -/* 91F408 80240E98 10400005 */ beqz $v0, .L80240EB0 -/* 91F40C 80240E9C 24020002 */ addiu $v0, $zero, 2 -/* 91F410 80240EA0 10600007 */ beqz $v1, .L80240EC0 -/* 91F414 80240EA4 240500FF */ addiu $a1, $zero, 0xff -/* 91F418 80240EA8 080903CE */ j .L80240F38 -/* 91F41C 80240EAC 00000000 */ nop -.L80240EB0: -/* 91F420 80240EB0 10620019 */ beq $v1, $v0, .L80240F18 -/* 91F424 80240EB4 00000000 */ nop -/* 91F428 80240EB8 080903CE */ j .L80240F38 -/* 91F42C 80240EBC 00000000 */ nop -.L80240EC0: -/* 91F430 80240EC0 8E220074 */ lw $v0, 0x74($s1) -/* 91F434 80240EC4 14450004 */ bne $v0, $a1, .L80240ED8 -/* 91F438 80240EC8 00000000 */ nop -/* 91F43C 80240ECC AE240070 */ sw $a0, 0x70($s1) -/* 91F440 80240ED0 AE200078 */ sw $zero, 0x78($s1) -/* 91F444 80240ED4 8E220074 */ lw $v0, 0x74($s1) -.L80240ED8: -/* 91F448 80240ED8 8E230084 */ lw $v1, 0x84($s1) -/* 91F44C 80240EDC 00431021 */ addu $v0, $v0, $v1 -/* 91F450 80240EE0 AE220074 */ sw $v0, 0x74($s1) -/* 91F454 80240EE4 28420100 */ slti $v0, $v0, 0x100 -/* 91F458 80240EE8 50400013 */ beql $v0, $zero, .L80240F38 -/* 91F45C 80240EEC AE250074 */ sw $a1, 0x74($s1) -/* 91F460 80240EF0 080903CE */ j .L80240F38 -/* 91F464 80240EF4 00000000 */ nop -.L80240EF8: -/* 91F468 80240EF8 8E220078 */ lw $v0, 0x78($s1) -/* 91F46C 80240EFC 24420001 */ addiu $v0, $v0, 1 -/* 91F470 80240F00 AE220078 */ sw $v0, 0x78($s1) -/* 91F474 80240F04 28420002 */ slti $v0, $v0, 2 -/* 91F478 80240F08 1440000B */ bnez $v0, .L80240F38 -/* 91F47C 80240F0C 24020002 */ addiu $v0, $zero, 2 -/* 91F480 80240F10 080903CE */ j .L80240F38 -/* 91F484 80240F14 AE220070 */ sw $v0, 0x70($s1) -.L80240F18: -/* 91F488 80240F18 8E230074 */ lw $v1, 0x74($s1) -/* 91F48C 80240F1C 50600001 */ beql $v1, $zero, .L80240F24 -/* 91F490 80240F20 24120001 */ addiu $s2, $zero, 1 -.L80240F24: -/* 91F494 80240F24 8E220088 */ lw $v0, 0x88($s1) -/* 91F498 80240F28 00621023 */ subu $v0, $v1, $v0 -/* 91F49C 80240F2C 04410002 */ bgez $v0, .L80240F38 -/* 91F4A0 80240F30 AE220074 */ sw $v0, 0x74($s1) -/* 91F4A4 80240F34 AE200074 */ sw $zero, 0x74($s1) -.L80240F38: -/* 91F4A8 80240F38 C6200074 */ lwc1 $f0, 0x74($s1) -/* 91F4AC 80240F3C 46800020 */ cvt.s.w $f0, $f0 -/* 91F4B0 80240F40 44050000 */ mfc1 $a1, $f0 -/* 91F4B4 80240F44 0C04DF62 */ jal func_80137D88 -/* 91F4B8 80240F48 24040001 */ addiu $a0, $zero, 1 -/* 91F4BC 80240F4C 0240102D */ daddu $v0, $s2, $zero -/* 91F4C0 80240F50 8FBF001C */ lw $ra, 0x1c($sp) -/* 91F4C4 80240F54 8FB20018 */ lw $s2, 0x18($sp) -/* 91F4C8 80240F58 8FB10014 */ lw $s1, 0x14($sp) -/* 91F4CC 80240F5C 8FB00010 */ lw $s0, 0x10($sp) -/* 91F4D0 80240F60 03E00008 */ jr $ra -/* 91F4D4 80240F64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s new file mode 100644 index 0000000000..791e9bb388 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240E28_91F398.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E28_91F398 +/* 91F398 80240E28 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91F39C 80240E2C AFB10014 */ sw $s1, 0x14($sp) +/* 91F3A0 80240E30 0080882D */ daddu $s1, $a0, $zero +/* 91F3A4 80240E34 AFB20018 */ sw $s2, 0x18($sp) +/* 91F3A8 80240E38 AFBF001C */ sw $ra, 0x1c($sp) +/* 91F3AC 80240E3C AFB00010 */ sw $s0, 0x10($sp) +/* 91F3B0 80240E40 8E30000C */ lw $s0, 0xc($s1) +/* 91F3B4 80240E44 10A00010 */ beqz $a1, .L80240E88 +/* 91F3B8 80240E48 0000902D */ daddu $s2, $zero, $zero +/* 91F3BC 80240E4C 8E050000 */ lw $a1, ($s0) +/* 91F3C0 80240E50 0C0B1EAF */ jal get_variable +/* 91F3C4 80240E54 26100004 */ addiu $s0, $s0, 4 +/* 91F3C8 80240E58 AE220084 */ sw $v0, 0x84($s1) +/* 91F3CC 80240E5C 8E050000 */ lw $a1, ($s0) +/* 91F3D0 80240E60 0C0B1EAF */ jal get_variable +/* 91F3D4 80240E64 0220202D */ daddu $a0, $s1, $zero +/* 91F3D8 80240E68 0240202D */ daddu $a0, $s2, $zero +/* 91F3DC 80240E6C 240500D0 */ addiu $a1, $zero, 0xd0 +/* 91F3E0 80240E70 00A0302D */ daddu $a2, $a1, $zero +/* 91F3E4 80240E74 00A0382D */ daddu $a3, $a1, $zero +/* 91F3E8 80240E78 AE220088 */ sw $v0, 0x88($s1) +/* 91F3EC 80240E7C AE200070 */ sw $zero, 0x70($s1) +/* 91F3F0 80240E80 0C04DF84 */ jal func_80137E10 +/* 91F3F4 80240E84 AE200074 */ sw $zero, 0x74($s1) +.L80240E88: +/* 91F3F8 80240E88 8E230070 */ lw $v1, 0x70($s1) +/* 91F3FC 80240E8C 24040001 */ addiu $a0, $zero, 1 +/* 91F400 80240E90 10640019 */ beq $v1, $a0, .L80240EF8 +/* 91F404 80240E94 28620002 */ slti $v0, $v1, 2 +/* 91F408 80240E98 10400005 */ beqz $v0, .L80240EB0 +/* 91F40C 80240E9C 24020002 */ addiu $v0, $zero, 2 +/* 91F410 80240EA0 10600007 */ beqz $v1, .L80240EC0 +/* 91F414 80240EA4 240500FF */ addiu $a1, $zero, 0xff +/* 91F418 80240EA8 080903CE */ j .L80240F38 +/* 91F41C 80240EAC 00000000 */ nop +.L80240EB0: +/* 91F420 80240EB0 10620019 */ beq $v1, $v0, .L80240F18 +/* 91F424 80240EB4 00000000 */ nop +/* 91F428 80240EB8 080903CE */ j .L80240F38 +/* 91F42C 80240EBC 00000000 */ nop +.L80240EC0: +/* 91F430 80240EC0 8E220074 */ lw $v0, 0x74($s1) +/* 91F434 80240EC4 14450004 */ bne $v0, $a1, .L80240ED8 +/* 91F438 80240EC8 00000000 */ nop +/* 91F43C 80240ECC AE240070 */ sw $a0, 0x70($s1) +/* 91F440 80240ED0 AE200078 */ sw $zero, 0x78($s1) +/* 91F444 80240ED4 8E220074 */ lw $v0, 0x74($s1) +.L80240ED8: +/* 91F448 80240ED8 8E230084 */ lw $v1, 0x84($s1) +/* 91F44C 80240EDC 00431021 */ addu $v0, $v0, $v1 +/* 91F450 80240EE0 AE220074 */ sw $v0, 0x74($s1) +/* 91F454 80240EE4 28420100 */ slti $v0, $v0, 0x100 +/* 91F458 80240EE8 50400013 */ beql $v0, $zero, .L80240F38 +/* 91F45C 80240EEC AE250074 */ sw $a1, 0x74($s1) +/* 91F460 80240EF0 080903CE */ j .L80240F38 +/* 91F464 80240EF4 00000000 */ nop +.L80240EF8: +/* 91F468 80240EF8 8E220078 */ lw $v0, 0x78($s1) +/* 91F46C 80240EFC 24420001 */ addiu $v0, $v0, 1 +/* 91F470 80240F00 AE220078 */ sw $v0, 0x78($s1) +/* 91F474 80240F04 28420002 */ slti $v0, $v0, 2 +/* 91F478 80240F08 1440000B */ bnez $v0, .L80240F38 +/* 91F47C 80240F0C 24020002 */ addiu $v0, $zero, 2 +/* 91F480 80240F10 080903CE */ j .L80240F38 +/* 91F484 80240F14 AE220070 */ sw $v0, 0x70($s1) +.L80240F18: +/* 91F488 80240F18 8E230074 */ lw $v1, 0x74($s1) +/* 91F48C 80240F1C 50600001 */ beql $v1, $zero, .L80240F24 +/* 91F490 80240F20 24120001 */ addiu $s2, $zero, 1 +.L80240F24: +/* 91F494 80240F24 8E220088 */ lw $v0, 0x88($s1) +/* 91F498 80240F28 00621023 */ subu $v0, $v1, $v0 +/* 91F49C 80240F2C 04410002 */ bgez $v0, .L80240F38 +/* 91F4A0 80240F30 AE220074 */ sw $v0, 0x74($s1) +/* 91F4A4 80240F34 AE200074 */ sw $zero, 0x74($s1) +.L80240F38: +/* 91F4A8 80240F38 C6200074 */ lwc1 $f0, 0x74($s1) +/* 91F4AC 80240F3C 46800020 */ cvt.s.w $f0, $f0 +/* 91F4B0 80240F40 44050000 */ mfc1 $a1, $f0 +/* 91F4B4 80240F44 0C04DF62 */ jal func_80137D88 +/* 91F4B8 80240F48 24040001 */ addiu $a0, $zero, 1 +/* 91F4BC 80240F4C 0240102D */ daddu $v0, $s2, $zero +/* 91F4C0 80240F50 8FBF001C */ lw $ra, 0x1c($sp) +/* 91F4C4 80240F54 8FB20018 */ lw $s2, 0x18($sp) +/* 91F4C8 80240F58 8FB10014 */ lw $s1, 0x14($sp) +/* 91F4CC 80240F5C 8FB00010 */ lw $s0, 0x10($sp) +/* 91F4D0 80240F60 03E00008 */ jr $ra +/* 91F4D4 80240F64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0.s deleted file mode 100644 index 0e53219324..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB0 -/* 91F520 80240FB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 91F524 80240FB4 AFBF0018 */ sw $ra, 0x18($sp) -/* 91F528 80240FB8 0C00EAD2 */ jal get_npc_safe -/* 91F52C 80240FBC 2404FFFC */ addiu $a0, $zero, -4 -/* 91F530 80240FC0 3C0141F0 */ lui $at, 0x41f0 -/* 91F534 80240FC4 44810000 */ mtc1 $at, $f0 -/* 91F538 80240FC8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 91F53C 80240FCC 46001080 */ add.s $f2, $f2, $f0 -/* 91F540 80240FD0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 91F544 80240FD4 8C450038 */ lw $a1, 0x38($v0) -/* 91F548 80240FD8 8C470040 */ lw $a3, 0x40($v0) -/* 91F54C 80240FDC 44061000 */ mfc1 $a2, $f2 -/* 91F550 80240FE0 0C01BFBC */ jal func_8006FEF0 -/* 91F554 80240FE4 24040004 */ addiu $a0, $zero, 4 -/* 91F558 80240FE8 8FBF0018 */ lw $ra, 0x18($sp) -/* 91F55C 80240FEC 24020002 */ addiu $v0, $zero, 2 -/* 91F560 80240FF0 03E00008 */ jr $ra -/* 91F564 80240FF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0_91F520.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0_91F520.s new file mode 100644 index 0000000000..f6cff5e50f --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FB0_91F520.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FB0_91F520 +/* 91F520 80240FB0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 91F524 80240FB4 AFBF0018 */ sw $ra, 0x18($sp) +/* 91F528 80240FB8 0C00EAD2 */ jal get_npc_safe +/* 91F52C 80240FBC 2404FFFC */ addiu $a0, $zero, -4 +/* 91F530 80240FC0 3C0141F0 */ lui $at, 0x41f0 +/* 91F534 80240FC4 44810000 */ mtc1 $at, $f0 +/* 91F538 80240FC8 C442003C */ lwc1 $f2, 0x3c($v0) +/* 91F53C 80240FCC 46001080 */ add.s $f2, $f2, $f0 +/* 91F540 80240FD0 E7A00010 */ swc1 $f0, 0x10($sp) +/* 91F544 80240FD4 8C450038 */ lw $a1, 0x38($v0) +/* 91F548 80240FD8 8C470040 */ lw $a3, 0x40($v0) +/* 91F54C 80240FDC 44061000 */ mfc1 $a2, $f2 +/* 91F550 80240FE0 0C01BFBC */ jal func_8006FEF0 +/* 91F554 80240FE4 24040004 */ addiu $a0, $zero, 4 +/* 91F558 80240FE8 8FBF0018 */ lw $ra, 0x18($sp) +/* 91F55C 80240FEC 24020002 */ addiu $v0, $zero, 2 +/* 91F560 80240FF0 03E00008 */ jr $ra +/* 91F564 80240FF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8.s deleted file mode 100644 index 88092ae622..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FF8 -/* 91F568 80240FF8 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 91F56C 80240FFC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 91F570 80241000 AC800084 */ sw $zero, 0x84($a0) -/* 91F574 80241004 80620000 */ lb $v0, ($v1) -/* 91F578 80241008 10400005 */ beqz $v0, .L80241020 -/* 91F57C 8024100C 24020003 */ addiu $v0, $zero, 3 -/* 91F580 80241010 80630003 */ lb $v1, 3($v1) -/* 91F584 80241014 14620002 */ bne $v1, $v0, .L80241020 -/* 91F588 80241018 24020001 */ addiu $v0, $zero, 1 -/* 91F58C 8024101C AC820084 */ sw $v0, 0x84($a0) -.L80241020: -/* 91F590 80241020 03E00008 */ jr $ra -/* 91F594 80241024 24020002 */ addiu $v0, $zero, 2 -/* 91F598 80241028 00000000 */ nop -/* 91F59C 8024102C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s new file mode 100644 index 0000000000..9a09db5dbd --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240FF8_91F568.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FF8_91F568 +/* 91F568 80240FF8 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* 91F56C 80240FFC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 91F570 80241000 AC800084 */ sw $zero, 0x84($a0) +/* 91F574 80241004 80620000 */ lb $v0, ($v1) +/* 91F578 80241008 10400005 */ beqz $v0, .L80241020 +/* 91F57C 8024100C 24020003 */ addiu $v0, $zero, 3 +/* 91F580 80241010 80630003 */ lb $v1, 3($v1) +/* 91F584 80241014 14620002 */ bne $v1, $v0, .L80241020 +/* 91F588 80241018 24020001 */ addiu $v0, $zero, 1 +/* 91F58C 8024101C AC820084 */ sw $v0, 0x84($a0) +.L80241020: +/* 91F590 80241020 03E00008 */ jr $ra +/* 91F594 80241024 24020002 */ addiu $v0, $zero, 2 +/* 91F598 80241028 00000000 */ nop +/* 91F59C 8024102C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030.s deleted file mode 100644 index 1993d68032..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241030 -/* 91F5A0 80241030 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 91F5A4 80241034 AFB20018 */ sw $s2, 0x18($sp) -/* 91F5A8 80241038 0080902D */ daddu $s2, $a0, $zero -/* 91F5AC 8024103C AFB10014 */ sw $s1, 0x14($sp) -/* 91F5B0 80241040 00A0882D */ daddu $s1, $a1, $zero -/* 91F5B4 80241044 AFBF0024 */ sw $ra, 0x24($sp) -/* 91F5B8 80241048 AFB40020 */ sw $s4, 0x20($sp) -/* 91F5BC 8024104C AFB3001C */ sw $s3, 0x1c($sp) -/* 91F5C0 80241050 AFB00010 */ sw $s0, 0x10($sp) -/* 91F5C4 80241054 8E50000C */ lw $s0, 0xc($s2) -/* 91F5C8 80241058 8E050000 */ lw $a1, ($s0) -/* 91F5CC 8024105C 0C0B1EAF */ jal get_variable -/* 91F5D0 80241060 26100004 */ addiu $s0, $s0, 4 -/* 91F5D4 80241064 0240202D */ daddu $a0, $s2, $zero -/* 91F5D8 80241068 8E050000 */ lw $a1, ($s0) -/* 91F5DC 8024106C 0C0B1EAF */ jal get_variable -/* 91F5E0 80241070 0040802D */ daddu $s0, $v0, $zero -/* 91F5E4 80241074 0200202D */ daddu $a0, $s0, $zero -/* 91F5E8 80241078 0C00EAD2 */ jal get_npc_safe -/* 91F5EC 8024107C 0040A02D */ daddu $s4, $v0, $zero -/* 91F5F0 80241080 3C138011 */ lui $s3, %hi(gPlayerData) -/* 91F5F4 80241084 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) -/* 91F5F8 80241088 12200006 */ beqz $s1, .L802410A4 -/* 91F5FC 8024108C 0040802D */ daddu $s0, $v0, $zero -/* 91F600 80241090 82620012 */ lb $v0, 0x12($s3) -/* 91F604 80241094 54400003 */ bnel $v0, $zero, .L802410A4 -/* 91F608 80241098 AE400070 */ sw $zero, 0x70($s2) -/* 91F60C 8024109C 24020002 */ addiu $v0, $zero, 2 -/* 91F610 802410A0 AE420070 */ sw $v0, 0x70($s2) -.L802410A4: -/* 91F614 802410A4 8E430070 */ lw $v1, 0x70($s2) -/* 91F618 802410A8 24110001 */ addiu $s1, $zero, 1 -/* 91F61C 802410AC 10710013 */ beq $v1, $s1, .L802410FC -/* 91F620 802410B0 28620002 */ slti $v0, $v1, 2 -/* 91F624 802410B4 10400005 */ beqz $v0, .L802410CC -/* 91F628 802410B8 24020002 */ addiu $v0, $zero, 2 -/* 91F62C 802410BC 10600009 */ beqz $v1, .L802410E4 -/* 91F630 802410C0 0000102D */ daddu $v0, $zero, $zero -/* 91F634 802410C4 08090465 */ j .L80241194 -/* 91F638 802410C8 00000000 */ nop -.L802410CC: -/* 91F63C 802410CC 10620013 */ beq $v1, $v0, .L8024111C -/* 91F640 802410D0 24020003 */ addiu $v0, $zero, 3 -/* 91F644 802410D4 1062001E */ beq $v1, $v0, .L80241150 -/* 91F648 802410D8 0000102D */ daddu $v0, $zero, $zero -/* 91F64C 802410DC 08090465 */ j .L80241194 -/* 91F650 802410E0 00000000 */ nop -.L802410E4: -/* 91F654 802410E4 0C03AC5A */ jal func_800EB168 -/* 91F658 802410E8 0000202D */ daddu $a0, $zero, $zero -/* 91F65C 802410EC 2402001E */ addiu $v0, $zero, 0x1e -/* 91F660 802410F0 AE420074 */ sw $v0, 0x74($s2) -/* 91F664 802410F4 08090464 */ j .L80241190 -/* 91F668 802410F8 AE510070 */ sw $s1, 0x70($s2) -.L802410FC: -/* 91F66C 802410FC 8E420074 */ lw $v0, 0x74($s2) -/* 91F670 80241100 2403FFFF */ addiu $v1, $zero, -1 -/* 91F674 80241104 2442FFFF */ addiu $v0, $v0, -1 -/* 91F678 80241108 14430021 */ bne $v0, $v1, .L80241190 -/* 91F67C 8024110C AE420074 */ sw $v0, 0x74($s2) -/* 91F680 80241110 24020002 */ addiu $v0, $zero, 2 -/* 91F684 80241114 08090464 */ j .L80241190 -/* 91F688 80241118 AE420070 */ sw $v0, 0x70($s2) -.L8024111C: -/* 91F68C 8024111C 0200202D */ daddu $a0, $s0, $zero -/* 91F690 80241120 00141600 */ sll $v0, $s4, 0x18 -/* 91F694 80241124 00021543 */ sra $v0, $v0, 0x15 -/* 91F698 80241128 02621021 */ addu $v0, $s3, $v0 -/* 91F69C 8024112C A2740012 */ sb $s4, 0x12($s3) -/* 91F6A0 80241130 0C03BD17 */ jal clear_partner_move_history -/* 91F6A4 80241134 A0510014 */ sb $s1, 0x14($v0) -/* 91F6A8 80241138 82640012 */ lb $a0, 0x12($s3) -/* 91F6AC 8024113C 0C03ACA9 */ jal func_800EB2A4 -/* 91F6B0 80241140 00000000 */ nop -/* 91F6B4 80241144 24020003 */ addiu $v0, $zero, 3 -/* 91F6B8 80241148 08090464 */ j .L80241190 -/* 91F6BC 8024114C AE420070 */ sw $v0, 0x70($s2) -.L80241150: -/* 91F6C0 80241150 0C00EAD2 */ jal get_npc_safe -/* 91F6C4 80241154 2404FFFC */ addiu $a0, $zero, -4 -/* 91F6C8 80241158 8E05000C */ lw $a1, 0xc($s0) -/* 91F6CC 8024115C 0C00ECD0 */ jal set_npc_yaw -/* 91F6D0 80241160 0040202D */ daddu $a0, $v0, $zero -/* 91F6D4 80241164 0200202D */ daddu $a0, $s0, $zero -/* 91F6D8 80241168 8E020000 */ lw $v0, ($s0) -/* 91F6DC 8024116C 2403FFFB */ addiu $v1, $zero, -5 -/* 91F6E0 80241170 00431024 */ and $v0, $v0, $v1 -/* 91F6E4 80241174 0C00EAFF */ jal disable_npc_shadow -/* 91F6E8 80241178 AE020000 */ sw $v0, ($s0) -/* 91F6EC 8024117C 3C01C47A */ lui $at, 0xc47a -/* 91F6F0 80241180 44810000 */ mtc1 $at, $f0 -/* 91F6F4 80241184 24020002 */ addiu $v0, $zero, 2 -/* 91F6F8 80241188 08090465 */ j .L80241194 -/* 91F6FC 8024118C E600003C */ swc1 $f0, 0x3c($s0) -.L80241190: -/* 91F700 80241190 0000102D */ daddu $v0, $zero, $zero -.L80241194: -/* 91F704 80241194 8FBF0024 */ lw $ra, 0x24($sp) -/* 91F708 80241198 8FB40020 */ lw $s4, 0x20($sp) -/* 91F70C 8024119C 8FB3001C */ lw $s3, 0x1c($sp) -/* 91F710 802411A0 8FB20018 */ lw $s2, 0x18($sp) -/* 91F714 802411A4 8FB10014 */ lw $s1, 0x14($sp) -/* 91F718 802411A8 8FB00010 */ lw $s0, 0x10($sp) -/* 91F71C 802411AC 03E00008 */ jr $ra -/* 91F720 802411B0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s new file mode 100644 index 0000000000..a1b1aeece1 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241030_91F5A0.s @@ -0,0 +1,109 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241030_91F5A0 +/* 91F5A0 80241030 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 91F5A4 80241034 AFB20018 */ sw $s2, 0x18($sp) +/* 91F5A8 80241038 0080902D */ daddu $s2, $a0, $zero +/* 91F5AC 8024103C AFB10014 */ sw $s1, 0x14($sp) +/* 91F5B0 80241040 00A0882D */ daddu $s1, $a1, $zero +/* 91F5B4 80241044 AFBF0024 */ sw $ra, 0x24($sp) +/* 91F5B8 80241048 AFB40020 */ sw $s4, 0x20($sp) +/* 91F5BC 8024104C AFB3001C */ sw $s3, 0x1c($sp) +/* 91F5C0 80241050 AFB00010 */ sw $s0, 0x10($sp) +/* 91F5C4 80241054 8E50000C */ lw $s0, 0xc($s2) +/* 91F5C8 80241058 8E050000 */ lw $a1, ($s0) +/* 91F5CC 8024105C 0C0B1EAF */ jal get_variable +/* 91F5D0 80241060 26100004 */ addiu $s0, $s0, 4 +/* 91F5D4 80241064 0240202D */ daddu $a0, $s2, $zero +/* 91F5D8 80241068 8E050000 */ lw $a1, ($s0) +/* 91F5DC 8024106C 0C0B1EAF */ jal get_variable +/* 91F5E0 80241070 0040802D */ daddu $s0, $v0, $zero +/* 91F5E4 80241074 0200202D */ daddu $a0, $s0, $zero +/* 91F5E8 80241078 0C00EAD2 */ jal get_npc_safe +/* 91F5EC 8024107C 0040A02D */ daddu $s4, $v0, $zero +/* 91F5F0 80241080 3C138011 */ lui $s3, %hi(gPlayerData) +/* 91F5F4 80241084 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) +/* 91F5F8 80241088 12200006 */ beqz $s1, .L802410A4 +/* 91F5FC 8024108C 0040802D */ daddu $s0, $v0, $zero +/* 91F600 80241090 82620012 */ lb $v0, 0x12($s3) +/* 91F604 80241094 54400003 */ bnel $v0, $zero, .L802410A4 +/* 91F608 80241098 AE400070 */ sw $zero, 0x70($s2) +/* 91F60C 8024109C 24020002 */ addiu $v0, $zero, 2 +/* 91F610 802410A0 AE420070 */ sw $v0, 0x70($s2) +.L802410A4: +/* 91F614 802410A4 8E430070 */ lw $v1, 0x70($s2) +/* 91F618 802410A8 24110001 */ addiu $s1, $zero, 1 +/* 91F61C 802410AC 10710013 */ beq $v1, $s1, .L802410FC +/* 91F620 802410B0 28620002 */ slti $v0, $v1, 2 +/* 91F624 802410B4 10400005 */ beqz $v0, .L802410CC +/* 91F628 802410B8 24020002 */ addiu $v0, $zero, 2 +/* 91F62C 802410BC 10600009 */ beqz $v1, .L802410E4 +/* 91F630 802410C0 0000102D */ daddu $v0, $zero, $zero +/* 91F634 802410C4 08090465 */ j .L80241194 +/* 91F638 802410C8 00000000 */ nop +.L802410CC: +/* 91F63C 802410CC 10620013 */ beq $v1, $v0, .L8024111C +/* 91F640 802410D0 24020003 */ addiu $v0, $zero, 3 +/* 91F644 802410D4 1062001E */ beq $v1, $v0, .L80241150 +/* 91F648 802410D8 0000102D */ daddu $v0, $zero, $zero +/* 91F64C 802410DC 08090465 */ j .L80241194 +/* 91F650 802410E0 00000000 */ nop +.L802410E4: +/* 91F654 802410E4 0C03AC5A */ jal func_800EB168 +/* 91F658 802410E8 0000202D */ daddu $a0, $zero, $zero +/* 91F65C 802410EC 2402001E */ addiu $v0, $zero, 0x1e +/* 91F660 802410F0 AE420074 */ sw $v0, 0x74($s2) +/* 91F664 802410F4 08090464 */ j .L80241190 +/* 91F668 802410F8 AE510070 */ sw $s1, 0x70($s2) +.L802410FC: +/* 91F66C 802410FC 8E420074 */ lw $v0, 0x74($s2) +/* 91F670 80241100 2403FFFF */ addiu $v1, $zero, -1 +/* 91F674 80241104 2442FFFF */ addiu $v0, $v0, -1 +/* 91F678 80241108 14430021 */ bne $v0, $v1, .L80241190 +/* 91F67C 8024110C AE420074 */ sw $v0, 0x74($s2) +/* 91F680 80241110 24020002 */ addiu $v0, $zero, 2 +/* 91F684 80241114 08090464 */ j .L80241190 +/* 91F688 80241118 AE420070 */ sw $v0, 0x70($s2) +.L8024111C: +/* 91F68C 8024111C 0200202D */ daddu $a0, $s0, $zero +/* 91F690 80241120 00141600 */ sll $v0, $s4, 0x18 +/* 91F694 80241124 00021543 */ sra $v0, $v0, 0x15 +/* 91F698 80241128 02621021 */ addu $v0, $s3, $v0 +/* 91F69C 8024112C A2740012 */ sb $s4, 0x12($s3) +/* 91F6A0 80241130 0C03BD17 */ jal clear_partner_move_history +/* 91F6A4 80241134 A0510014 */ sb $s1, 0x14($v0) +/* 91F6A8 80241138 82640012 */ lb $a0, 0x12($s3) +/* 91F6AC 8024113C 0C03ACA9 */ jal func_800EB2A4 +/* 91F6B0 80241140 00000000 */ nop +/* 91F6B4 80241144 24020003 */ addiu $v0, $zero, 3 +/* 91F6B8 80241148 08090464 */ j .L80241190 +/* 91F6BC 8024114C AE420070 */ sw $v0, 0x70($s2) +.L80241150: +/* 91F6C0 80241150 0C00EAD2 */ jal get_npc_safe +/* 91F6C4 80241154 2404FFFC */ addiu $a0, $zero, -4 +/* 91F6C8 80241158 8E05000C */ lw $a1, 0xc($s0) +/* 91F6CC 8024115C 0C00ECD0 */ jal set_npc_yaw +/* 91F6D0 80241160 0040202D */ daddu $a0, $v0, $zero +/* 91F6D4 80241164 0200202D */ daddu $a0, $s0, $zero +/* 91F6D8 80241168 8E020000 */ lw $v0, ($s0) +/* 91F6DC 8024116C 2403FFFB */ addiu $v1, $zero, -5 +/* 91F6E0 80241170 00431024 */ and $v0, $v0, $v1 +/* 91F6E4 80241174 0C00EAFF */ jal disable_npc_shadow +/* 91F6E8 80241178 AE020000 */ sw $v0, ($s0) +/* 91F6EC 8024117C 3C01C47A */ lui $at, 0xc47a +/* 91F6F0 80241180 44810000 */ mtc1 $at, $f0 +/* 91F6F4 80241184 24020002 */ addiu $v0, $zero, 2 +/* 91F6F8 80241188 08090465 */ j .L80241194 +/* 91F6FC 8024118C E600003C */ swc1 $f0, 0x3c($s0) +.L80241190: +/* 91F700 80241190 0000102D */ daddu $v0, $zero, $zero +.L80241194: +/* 91F704 80241194 8FBF0024 */ lw $ra, 0x24($sp) +/* 91F708 80241198 8FB40020 */ lw $s4, 0x20($sp) +/* 91F70C 8024119C 8FB3001C */ lw $s3, 0x1c($sp) +/* 91F710 802411A0 8FB20018 */ lw $s2, 0x18($sp) +/* 91F714 802411A4 8FB10014 */ lw $s1, 0x14($sp) +/* 91F718 802411A8 8FB00010 */ lw $s0, 0x10($sp) +/* 91F71C 802411AC 03E00008 */ jr $ra +/* 91F720 802411B0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0.s deleted file mode 100644 index 1658fa13c5..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413E0 -/* 91F950 802413E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91F954 802413E4 AFBF0010 */ sw $ra, 0x10($sp) -/* 91F958 802413E8 10A00003 */ beqz $a1, .L802413F8 -/* 91F95C 802413EC 8C86000C */ lw $a2, 0xc($a0) -/* 91F960 802413F0 3C018024 */ lui $at, 0x8024 -/* 91F964 802413F4 AC20626C */ sw $zero, 0x626c($at) -.L802413F8: -/* 91F968 802413F8 3C038024 */ lui $v1, 0x8024 -/* 91F96C 802413FC 2463626C */ addiu $v1, $v1, 0x626c -/* 91F970 80241400 8C620000 */ lw $v0, ($v1) -/* 91F974 80241404 54400003 */ bnel $v0, $zero, .L80241414 -/* 91F978 80241408 AC600000 */ sw $zero, ($v1) -/* 91F97C 8024140C 0809050A */ j .L80241428 -/* 91F980 80241410 0000102D */ daddu $v0, $zero, $zero -.L80241414: -/* 91F984 80241414 8CC50000 */ lw $a1, ($a2) -/* 91F988 80241418 3C068024 */ lui $a2, 0x8024 -/* 91F98C 8024141C 0C0B2026 */ jal set_variable -/* 91F990 80241420 8CC66270 */ lw $a2, 0x6270($a2) -/* 91F994 80241424 24020002 */ addiu $v0, $zero, 2 -.L80241428: -/* 91F998 80241428 8FBF0010 */ lw $ra, 0x10($sp) -/* 91F99C 8024142C 03E00008 */ jr $ra -/* 91F9A0 80241430 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s new file mode 100644 index 0000000000..27ee6d0218 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_802413E0_91F950.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413E0_91F950 +/* 91F950 802413E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 91F954 802413E4 AFBF0010 */ sw $ra, 0x10($sp) +/* 91F958 802413E8 10A00003 */ beqz $a1, .L802413F8 +/* 91F95C 802413EC 8C86000C */ lw $a2, 0xc($a0) +/* 91F960 802413F0 3C018024 */ lui $at, 0x8024 +/* 91F964 802413F4 AC20626C */ sw $zero, 0x626c($at) +.L802413F8: +/* 91F968 802413F8 3C038024 */ lui $v1, 0x8024 +/* 91F96C 802413FC 2463626C */ addiu $v1, $v1, 0x626c +/* 91F970 80241400 8C620000 */ lw $v0, ($v1) +/* 91F974 80241404 54400003 */ bnel $v0, $zero, .L80241414 +/* 91F978 80241408 AC600000 */ sw $zero, ($v1) +/* 91F97C 8024140C 0809050A */ j .L80241428 +/* 91F980 80241410 0000102D */ daddu $v0, $zero, $zero +.L80241414: +/* 91F984 80241414 8CC50000 */ lw $a1, ($a2) +/* 91F988 80241418 3C068024 */ lui $a2, 0x8024 +/* 91F98C 8024141C 0C0B2026 */ jal set_variable +/* 91F990 80241420 8CC66270 */ lw $a2, 0x6270($a2) +/* 91F994 80241424 24020002 */ addiu $v0, $zero, 2 +.L80241428: +/* 91F998 80241428 8FBF0010 */ lw $ra, 0x10($sp) +/* 91F99C 8024142C 03E00008 */ jr $ra +/* 91F9A0 80241430 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434.s deleted file mode 100644 index d38cfcf054..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241434 -/* 91F9A4 80241434 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91F9A8 80241438 AFBF0010 */ sw $ra, 0x10($sp) -/* 91F9AC 8024143C 8C82000C */ lw $v0, 0xc($a0) -/* 91F9B0 80241440 0C0B1EAF */ jal get_variable -/* 91F9B4 80241444 8C450000 */ lw $a1, ($v0) -/* 91F9B8 80241448 3C018024 */ lui $at, 0x8024 -/* 91F9BC 8024144C AC226270 */ sw $v0, 0x6270($at) -/* 91F9C0 80241450 24020002 */ addiu $v0, $zero, 2 -/* 91F9C4 80241454 8FBF0010 */ lw $ra, 0x10($sp) -/* 91F9C8 80241458 24030001 */ addiu $v1, $zero, 1 -/* 91F9CC 8024145C 3C018024 */ lui $at, 0x8024 -/* 91F9D0 80241460 AC23626C */ sw $v1, 0x626c($at) -/* 91F9D4 80241464 03E00008 */ jr $ra -/* 91F9D8 80241468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434_91F9A4.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434_91F9A4.s new file mode 100644 index 0000000000..550ad9118f --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_80241434_91F9A4.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241434_91F9A4 +/* 91F9A4 80241434 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 91F9A8 80241438 AFBF0010 */ sw $ra, 0x10($sp) +/* 91F9AC 8024143C 8C82000C */ lw $v0, 0xc($a0) +/* 91F9B0 80241440 0C0B1EAF */ jal get_variable +/* 91F9B4 80241444 8C450000 */ lw $a1, ($v0) +/* 91F9B8 80241448 3C018024 */ lui $at, 0x8024 +/* 91F9BC 8024144C AC226270 */ sw $v0, 0x6270($at) +/* 91F9C0 80241450 24020002 */ addiu $v0, $zero, 2 +/* 91F9C4 80241454 8FBF0010 */ lw $ra, 0x10($sp) +/* 91F9C8 80241458 24030001 */ addiu $v1, $zero, 1 +/* 91F9CC 8024145C 3C018024 */ lui $at, 0x8024 +/* 91F9D0 80241460 AC23626C */ sw $v1, 0x626c($at) +/* 91F9D4 80241464 03E00008 */ jr $ra +/* 91F9D8 80241468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C.s deleted file mode 100644 index 8482c81f64..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024146C -/* 91F9DC 8024146C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91F9E0 80241470 AFBF0010 */ sw $ra, 0x10($sp) -/* 91F9E4 80241474 8C82000C */ lw $v0, 0xc($a0) -/* 91F9E8 80241478 0C0B1EAF */ jal get_variable -/* 91F9EC 8024147C 8C450000 */ lw $a1, ($v0) -/* 91F9F0 80241480 0040182D */ daddu $v1, $v0, $zero -/* 91F9F4 80241484 10600012 */ beqz $v1, .L802414D0 -/* 91F9F8 80241488 0000202D */ daddu $a0, $zero, $zero -/* 91F9FC 8024148C 8C620000 */ lw $v0, ($v1) -/* 91FA00 80241490 5040000A */ beql $v0, $zero, .L802414BC -/* 91FA04 80241494 00041080 */ sll $v0, $a0, 2 -/* 91FA08 80241498 3C058025 */ lui $a1, 0x8025 -/* 91FA0C 8024149C 24A58480 */ addiu $a1, $a1, -0x7b80 -.L802414A0: -/* 91FA10 802414A0 24630004 */ addiu $v1, $v1, 4 -/* 91FA14 802414A4 24840001 */ addiu $a0, $a0, 1 -/* 91FA18 802414A8 ACA20000 */ sw $v0, ($a1) -/* 91FA1C 802414AC 8C620000 */ lw $v0, ($v1) -/* 91FA20 802414B0 1440FFFB */ bnez $v0, .L802414A0 -/* 91FA24 802414B4 24A50004 */ addiu $a1, $a1, 4 -/* 91FA28 802414B8 00041080 */ sll $v0, $a0, 2 -.L802414BC: -/* 91FA2C 802414BC 3C018025 */ lui $at, 0x8025 -/* 91FA30 802414C0 00220821 */ addu $at, $at, $v0 -/* 91FA34 802414C4 AC208480 */ sw $zero, -0x7b80($at) -/* 91FA38 802414C8 0809053E */ j .L802414F8 -/* 91FA3C 802414CC 00000000 */ nop -.L802414D0: -/* 91FA40 802414D0 3C038025 */ lui $v1, 0x8025 -/* 91FA44 802414D4 24638480 */ addiu $v1, $v1, -0x7b80 -/* 91FA48 802414D8 0060282D */ daddu $a1, $v1, $zero -.L802414DC: -/* 91FA4C 802414DC 24820010 */ addiu $v0, $a0, 0x10 -/* 91FA50 802414E0 AC620000 */ sw $v0, ($v1) -/* 91FA54 802414E4 24630004 */ addiu $v1, $v1, 4 -/* 91FA58 802414E8 24840001 */ addiu $a0, $a0, 1 -/* 91FA5C 802414EC 28820070 */ slti $v0, $a0, 0x70 -/* 91FA60 802414F0 1440FFFA */ bnez $v0, .L802414DC -/* 91FA64 802414F4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802414F8: -/* 91FA68 802414F8 8FBF0010 */ lw $ra, 0x10($sp) -/* 91FA6C 802414FC 24020002 */ addiu $v0, $zero, 2 -/* 91FA70 80241500 03E00008 */ jr $ra -/* 91FA74 80241504 27BD0018 */ addiu $sp, $sp, 0x18 -/* 91FA78 80241508 00000000 */ nop -/* 91FA7C 8024150C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s new file mode 100644 index 0000000000..5495c48d57 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91F5A0/func_8024146C_91F9DC.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024146C_91F9DC +/* 91F9DC 8024146C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 91F9E0 80241470 AFBF0010 */ sw $ra, 0x10($sp) +/* 91F9E4 80241474 8C82000C */ lw $v0, 0xc($a0) +/* 91F9E8 80241478 0C0B1EAF */ jal get_variable +/* 91F9EC 8024147C 8C450000 */ lw $a1, ($v0) +/* 91F9F0 80241480 0040182D */ daddu $v1, $v0, $zero +/* 91F9F4 80241484 10600012 */ beqz $v1, .L802414D0 +/* 91F9F8 80241488 0000202D */ daddu $a0, $zero, $zero +/* 91F9FC 8024148C 8C620000 */ lw $v0, ($v1) +/* 91FA00 80241490 5040000A */ beql $v0, $zero, .L802414BC +/* 91FA04 80241494 00041080 */ sll $v0, $a0, 2 +/* 91FA08 80241498 3C058025 */ lui $a1, 0x8025 +/* 91FA0C 8024149C 24A58480 */ addiu $a1, $a1, -0x7b80 +.L802414A0: +/* 91FA10 802414A0 24630004 */ addiu $v1, $v1, 4 +/* 91FA14 802414A4 24840001 */ addiu $a0, $a0, 1 +/* 91FA18 802414A8 ACA20000 */ sw $v0, ($a1) +/* 91FA1C 802414AC 8C620000 */ lw $v0, ($v1) +/* 91FA20 802414B0 1440FFFB */ bnez $v0, .L802414A0 +/* 91FA24 802414B4 24A50004 */ addiu $a1, $a1, 4 +/* 91FA28 802414B8 00041080 */ sll $v0, $a0, 2 +.L802414BC: +/* 91FA2C 802414BC 3C018025 */ lui $at, 0x8025 +/* 91FA30 802414C0 00220821 */ addu $at, $at, $v0 +/* 91FA34 802414C4 AC208480 */ sw $zero, -0x7b80($at) +/* 91FA38 802414C8 0809053E */ j .L802414F8 +/* 91FA3C 802414CC 00000000 */ nop +.L802414D0: +/* 91FA40 802414D0 3C038025 */ lui $v1, 0x8025 +/* 91FA44 802414D4 24638480 */ addiu $v1, $v1, -0x7b80 +/* 91FA48 802414D8 0060282D */ daddu $a1, $v1, $zero +.L802414DC: +/* 91FA4C 802414DC 24820010 */ addiu $v0, $a0, 0x10 +/* 91FA50 802414E0 AC620000 */ sw $v0, ($v1) +/* 91FA54 802414E4 24630004 */ addiu $v1, $v1, 4 +/* 91FA58 802414E8 24840001 */ addiu $a0, $a0, 1 +/* 91FA5C 802414EC 28820070 */ slti $v0, $a0, 0x70 +/* 91FA60 802414F0 1440FFFA */ bnez $v0, .L802414DC +/* 91FA64 802414F4 ACA001C0 */ sw $zero, 0x1c0($a1) +.L802414F8: +/* 91FA68 802414F8 8FBF0010 */ lw $ra, 0x10($sp) +/* 91FA6C 802414FC 24020002 */ addiu $v0, $zero, 2 +/* 91FA70 80241500 03E00008 */ jr $ra +/* 91FA74 80241504 27BD0018 */ addiu $sp, $sp, 0x18 +/* 91FA78 80241508 00000000 */ nop +/* 91FA7C 8024150C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510.s b/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510.s deleted file mode 100644 index ecea1223d1..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241510 -/* 91FA80 80241510 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 91FA84 80241514 3C048025 */ lui $a0, 0x8025 -/* 91FA88 80241518 24848470 */ addiu $a0, $a0, -0x7b90 -/* 91FA8C 8024151C 27A50010 */ addiu $a1, $sp, 0x10 -/* 91FA90 80241520 AFBF0020 */ sw $ra, 0x20($sp) -/* 91FA94 80241524 AFB1001C */ sw $s1, 0x1c($sp) -/* 91FA98 80241528 0C016B3A */ jal load_asset_by_name -/* 91FA9C 8024152C AFB00018 */ sw $s0, 0x18($sp) -/* 91FAA0 80241530 0040802D */ daddu $s0, $v0, $zero -/* 91FAA4 80241534 0200202D */ daddu $a0, $s0, $zero -/* 91FAA8 80241538 3C118025 */ lui $s1, 0x8025 -/* 91FAAC 8024153C 26318650 */ addiu $s1, $s1, -0x79b0 -/* 91FAB0 80241540 0C01BB7C */ jal decode_yay0 -/* 91FAB4 80241544 0220282D */ daddu $a1, $s1, $zero -/* 91FAB8 80241548 0C00AB1E */ jal general_heap_free -/* 91FABC 8024154C 0200202D */ daddu $a0, $s0, $zero -/* 91FAC0 80241550 3C048025 */ lui $a0, 0x8025 -/* 91FAC4 80241554 2484C5E0 */ addiu $a0, $a0, -0x3a20 -/* 91FAC8 80241558 3C028025 */ lui $v0, 0x8025 -/* 91FACC 8024155C 24428850 */ addiu $v0, $v0, -0x77b0 -/* 91FAD0 80241560 AC820000 */ sw $v0, ($a0) -/* 91FAD4 80241564 24020096 */ addiu $v0, $zero, 0x96 -/* 91FAD8 80241568 A4820008 */ sh $v0, 8($a0) -/* 91FADC 8024156C 24020069 */ addiu $v0, $zero, 0x69 -/* 91FAE0 80241570 A482000A */ sh $v0, 0xa($a0) -/* 91FAE4 80241574 24020002 */ addiu $v0, $zero, 2 -/* 91FAE8 80241578 AC82000C */ sw $v0, 0xc($a0) -/* 91FAEC 8024157C 24020001 */ addiu $v0, $zero, 1 -/* 91FAF0 80241580 AC910004 */ sw $s1, 4($a0) -/* 91FAF4 80241584 0C0496CB */ jal set_message_images -/* 91FAF8 80241588 AC820010 */ sw $v0, 0x10($a0) -/* 91FAFC 8024158C 8FBF0020 */ lw $ra, 0x20($sp) -/* 91FB00 80241590 8FB1001C */ lw $s1, 0x1c($sp) -/* 91FB04 80241594 8FB00018 */ lw $s0, 0x18($sp) -/* 91FB08 80241598 24020002 */ addiu $v0, $zero, 2 -/* 91FB0C 8024159C 03E00008 */ jr $ra -/* 91FB10 802415A0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 91FB14 802415A4 00000000 */ nop -/* 91FB18 802415A8 00000000 */ nop -/* 91FB1C 802415AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s b/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s new file mode 100644 index 0000000000..0c16a39100 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91FA80/func_80241510_91FA80.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241510_91FA80 +/* 91FA80 80241510 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 91FA84 80241514 3C048025 */ lui $a0, 0x8025 +/* 91FA88 80241518 24848470 */ addiu $a0, $a0, -0x7b90 +/* 91FA8C 8024151C 27A50010 */ addiu $a1, $sp, 0x10 +/* 91FA90 80241520 AFBF0020 */ sw $ra, 0x20($sp) +/* 91FA94 80241524 AFB1001C */ sw $s1, 0x1c($sp) +/* 91FA98 80241528 0C016B3A */ jal load_asset_by_name +/* 91FA9C 8024152C AFB00018 */ sw $s0, 0x18($sp) +/* 91FAA0 80241530 0040802D */ daddu $s0, $v0, $zero +/* 91FAA4 80241534 0200202D */ daddu $a0, $s0, $zero +/* 91FAA8 80241538 3C118025 */ lui $s1, 0x8025 +/* 91FAAC 8024153C 26318650 */ addiu $s1, $s1, -0x79b0 +/* 91FAB0 80241540 0C01BB7C */ jal decode_yay0 +/* 91FAB4 80241544 0220282D */ daddu $a1, $s1, $zero +/* 91FAB8 80241548 0C00AB1E */ jal general_heap_free +/* 91FABC 8024154C 0200202D */ daddu $a0, $s0, $zero +/* 91FAC0 80241550 3C048025 */ lui $a0, 0x8025 +/* 91FAC4 80241554 2484C5E0 */ addiu $a0, $a0, -0x3a20 +/* 91FAC8 80241558 3C028025 */ lui $v0, 0x8025 +/* 91FACC 8024155C 24428850 */ addiu $v0, $v0, -0x77b0 +/* 91FAD0 80241560 AC820000 */ sw $v0, ($a0) +/* 91FAD4 80241564 24020096 */ addiu $v0, $zero, 0x96 +/* 91FAD8 80241568 A4820008 */ sh $v0, 8($a0) +/* 91FADC 8024156C 24020069 */ addiu $v0, $zero, 0x69 +/* 91FAE0 80241570 A482000A */ sh $v0, 0xa($a0) +/* 91FAE4 80241574 24020002 */ addiu $v0, $zero, 2 +/* 91FAE8 80241578 AC82000C */ sw $v0, 0xc($a0) +/* 91FAEC 8024157C 24020001 */ addiu $v0, $zero, 1 +/* 91FAF0 80241580 AC910004 */ sw $s1, 4($a0) +/* 91FAF4 80241584 0C0496CB */ jal set_message_images +/* 91FAF8 80241588 AC820010 */ sw $v0, 0x10($a0) +/* 91FAFC 8024158C 8FBF0020 */ lw $ra, 0x20($sp) +/* 91FB00 80241590 8FB1001C */ lw $s1, 0x1c($sp) +/* 91FB04 80241594 8FB00018 */ lw $s0, 0x18($sp) +/* 91FB08 80241598 24020002 */ addiu $v0, $zero, 2 +/* 91FB0C 8024159C 03E00008 */ jr $ra +/* 91FB10 802415A0 27BD0028 */ addiu $sp, $sp, 0x28 +/* 91FB14 802415A4 00000000 */ nop +/* 91FB18 802415A8 00000000 */ nop +/* 91FB1C 802415AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_802415B0.s b/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_802415B0.s deleted file mode 100644 index 9bf99bad40..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_802415B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415B0 -/* 91FB20 802415B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 91FB24 802415B4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 91FB28 802415B8 4485A000 */ mtc1 $a1, $f20 -/* 91FB2C 802415BC F7B60020 */ sdc1 $f22, 0x20($sp) -/* 91FB30 802415C0 4486B000 */ mtc1 $a2, $f22 -/* 91FB34 802415C4 AFB00010 */ sw $s0, 0x10($sp) -/* 91FB38 802415C8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 91FB3C 802415CC 4487C000 */ mtc1 $a3, $f24 -/* 91FB40 802415D0 AFBF0014 */ sw $ra, 0x14($sp) -/* 91FB44 802415D4 0C019D28 */ jal guMtxIdentF -/* 91FB48 802415D8 0080802D */ daddu $s0, $a0, $zero -/* 91FB4C 802415DC 4616A582 */ mul.s $f22, $f20, $f22 -/* 91FB50 802415E0 00000000 */ nop -/* 91FB54 802415E4 4618A502 */ mul.s $f20, $f20, $f24 -/* 91FB58 802415E8 00000000 */ nop -/* 91FB5C 802415EC 3C013F80 */ lui $at, 0x3f80 -/* 91FB60 802415F0 44810000 */ mtc1 $at, $f0 -/* 91FB64 802415F4 00000000 */ nop -/* 91FB68 802415F8 E6000014 */ swc1 $f0, 0x14($s0) -/* 91FB6C 802415FC E6160010 */ swc1 $f22, 0x10($s0) -/* 91FB70 80241600 E6140018 */ swc1 $f20, 0x18($s0) -/* 91FB74 80241604 8FBF0014 */ lw $ra, 0x14($sp) -/* 91FB78 80241608 8FB00010 */ lw $s0, 0x10($sp) -/* 91FB7C 8024160C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 91FB80 80241610 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 91FB84 80241614 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 91FB88 80241618 03E00008 */ jr $ra -/* 91FB8C 8024161C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_802415B0_91FB20.s b/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_802415B0_91FB20.s new file mode 100644 index 0000000000..8ce77dbdb9 --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_802415B0_91FB20.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415B0_91FB20 +/* 91FB20 802415B0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 91FB24 802415B4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 91FB28 802415B8 4485A000 */ mtc1 $a1, $f20 +/* 91FB2C 802415BC F7B60020 */ sdc1 $f22, 0x20($sp) +/* 91FB30 802415C0 4486B000 */ mtc1 $a2, $f22 +/* 91FB34 802415C4 AFB00010 */ sw $s0, 0x10($sp) +/* 91FB38 802415C8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 91FB3C 802415CC 4487C000 */ mtc1 $a3, $f24 +/* 91FB40 802415D0 AFBF0014 */ sw $ra, 0x14($sp) +/* 91FB44 802415D4 0C019D28 */ jal guMtxIdentF +/* 91FB48 802415D8 0080802D */ daddu $s0, $a0, $zero +/* 91FB4C 802415DC 4616A582 */ mul.s $f22, $f20, $f22 +/* 91FB50 802415E0 00000000 */ nop +/* 91FB54 802415E4 4618A502 */ mul.s $f20, $f20, $f24 +/* 91FB58 802415E8 00000000 */ nop +/* 91FB5C 802415EC 3C013F80 */ lui $at, 0x3f80 +/* 91FB60 802415F0 44810000 */ mtc1 $at, $f0 +/* 91FB64 802415F4 00000000 */ nop +/* 91FB68 802415F8 E6000014 */ swc1 $f0, 0x14($s0) +/* 91FB6C 802415FC E6160010 */ swc1 $f22, 0x10($s0) +/* 91FB70 80241600 E6140018 */ swc1 $f20, 0x18($s0) +/* 91FB74 80241604 8FBF0014 */ lw $ra, 0x14($sp) +/* 91FB78 80241608 8FB00010 */ lw $s0, 0x10($sp) +/* 91FB7C 8024160C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 91FB80 80241610 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 91FB84 80241614 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 91FB88 80241618 03E00008 */ jr $ra +/* 91FB8C 8024161C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_80241620_91FB90.s b/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_80241620_91FB90.s index 26dbdecc76..890f6501bf 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_80241620_91FB90.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91FB20/func_80241620_91FB90.s @@ -55,7 +55,7 @@ glabel func_80241620_91FB90 /* 91FC58 802416E8 4405E000 */ mfc1 $a1, $f28 /* 91FC5C 802416EC 4406D000 */ mfc1 $a2, $f26 /* 91FC60 802416F0 4407C000 */ mfc1 $a3, $f24 -/* 91FC64 802416F4 0C09056C */ jal func_802415B0 +/* 91FC64 802416F4 0C09056C */ jal func_802415B0_91FB20 /* 91FC68 802416F8 27A40010 */ addiu $a0, $sp, 0x10 /* 91FC6C 802416FC 27A40010 */ addiu $a0, $sp, 0x10 /* 91FC70 80241700 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80241620_91FB90 /* 91FCE0 80241770 4405E000 */ mfc1 $a1, $f28 /* 91FCE4 80241774 4406D000 */ mfc1 $a2, $f26 /* 91FCE8 80241778 4407C000 */ mfc1 $a3, $f24 -/* 91FCEC 8024177C 0C09056C */ jal func_802415B0 +/* 91FCEC 8024177C 0C09056C */ jal func_802415B0_91FB20 /* 91FCF0 80241780 27A40010 */ addiu $a0, $sp, 0x10 /* 91FCF4 80241784 27A40010 */ addiu $a0, $sp, 0x10 /* 91FCF8 80241788 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280.s b/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280.s deleted file mode 100644 index d3ed22fbc8..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240280 -/* 926C70 80240280 8C860084 */ lw $a2, 0x84($a0) -/* 926C74 80240284 0000282D */ daddu $a1, $zero, $zero -/* 926C78 80240288 3C038024 */ lui $v1, 0x8024 -/* 926C7C 8024028C 24632148 */ addiu $v1, $v1, 0x2148 -.L80240290: -/* 926C80 80240290 8C620000 */ lw $v0, ($v1) -/* 926C84 80240294 00C2102A */ slt $v0, $a2, $v0 -/* 926C88 80240298 54400006 */ bnel $v0, $zero, .L802402B4 -/* 926C8C 8024029C 24A3FFFF */ addiu $v1, $a1, -1 -/* 926C90 802402A0 24A50001 */ addiu $a1, $a1, 1 -/* 926C94 802402A4 28A2000E */ slti $v0, $a1, 0xe -/* 926C98 802402A8 1440FFF9 */ bnez $v0, .L80240290 -/* 926C9C 802402AC 2463001C */ addiu $v1, $v1, 0x1c -/* 926CA0 802402B0 24A3FFFF */ addiu $v1, $a1, -1 -.L802402B4: -/* 926CA4 802402B4 0000282D */ daddu $a1, $zero, $zero -/* 926CA8 802402B8 3C078024 */ lui $a3, 0x8024 -/* 926CAC 802402BC 24E72148 */ addiu $a3, $a3, 0x2148 -/* 926CB0 802402C0 000310C0 */ sll $v0, $v1, 3 -/* 926CB4 802402C4 00431023 */ subu $v0, $v0, $v1 -/* 926CB8 802402C8 00023080 */ sll $a2, $v0, 2 -/* 926CBC 802402CC 24A30005 */ addiu $v1, $a1, 5 -.L802402D0: -/* 926CC0 802402D0 24A20001 */ addiu $v0, $a1, 1 -/* 926CC4 802402D4 0040282D */ daddu $a1, $v0, $zero -/* 926CC8 802402D8 00031880 */ sll $v1, $v1, 2 -/* 926CCC 802402DC 00051080 */ sll $v0, $a1, 2 -/* 926CD0 802402E0 00461021 */ addu $v0, $v0, $a2 -/* 926CD4 802402E4 00471021 */ addu $v0, $v0, $a3 -/* 926CD8 802402E8 8C420000 */ lw $v0, ($v0) -/* 926CDC 802402EC 00831821 */ addu $v1, $a0, $v1 -/* 926CE0 802402F0 AC620084 */ sw $v0, 0x84($v1) -/* 926CE4 802402F4 28A20006 */ slti $v0, $a1, 6 -/* 926CE8 802402F8 1440FFF5 */ bnez $v0, .L802402D0 -/* 926CEC 802402FC 24A30005 */ addiu $v1, $a1, 5 -/* 926CF0 80240300 03E00008 */ jr $ra -/* 926CF4 80240304 24020002 */ addiu $v0, $zero, 2 -/* 926CF8 80240308 00000000 */ nop -/* 926CFC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s b/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s new file mode 100644 index 0000000000..370ce730bd --- /dev/null +++ b/asm/nonmatchings/world/area_iwa/iwa_11/926C70/func_80240280_926C70.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240280_926C70 +/* 926C70 80240280 8C860084 */ lw $a2, 0x84($a0) +/* 926C74 80240284 0000282D */ daddu $a1, $zero, $zero +/* 926C78 80240288 3C038024 */ lui $v1, 0x8024 +/* 926C7C 8024028C 24632148 */ addiu $v1, $v1, 0x2148 +.L80240290: +/* 926C80 80240290 8C620000 */ lw $v0, ($v1) +/* 926C84 80240294 00C2102A */ slt $v0, $a2, $v0 +/* 926C88 80240298 54400006 */ bnel $v0, $zero, .L802402B4 +/* 926C8C 8024029C 24A3FFFF */ addiu $v1, $a1, -1 +/* 926C90 802402A0 24A50001 */ addiu $a1, $a1, 1 +/* 926C94 802402A4 28A2000E */ slti $v0, $a1, 0xe +/* 926C98 802402A8 1440FFF9 */ bnez $v0, .L80240290 +/* 926C9C 802402AC 2463001C */ addiu $v1, $v1, 0x1c +/* 926CA0 802402B0 24A3FFFF */ addiu $v1, $a1, -1 +.L802402B4: +/* 926CA4 802402B4 0000282D */ daddu $a1, $zero, $zero +/* 926CA8 802402B8 3C078024 */ lui $a3, 0x8024 +/* 926CAC 802402BC 24E72148 */ addiu $a3, $a3, 0x2148 +/* 926CB0 802402C0 000310C0 */ sll $v0, $v1, 3 +/* 926CB4 802402C4 00431023 */ subu $v0, $v0, $v1 +/* 926CB8 802402C8 00023080 */ sll $a2, $v0, 2 +/* 926CBC 802402CC 24A30005 */ addiu $v1, $a1, 5 +.L802402D0: +/* 926CC0 802402D0 24A20001 */ addiu $v0, $a1, 1 +/* 926CC4 802402D4 0040282D */ daddu $a1, $v0, $zero +/* 926CC8 802402D8 00031880 */ sll $v1, $v1, 2 +/* 926CCC 802402DC 00051080 */ sll $v0, $a1, 2 +/* 926CD0 802402E0 00461021 */ addu $v0, $v0, $a2 +/* 926CD4 802402E4 00471021 */ addu $v0, $v0, $a3 +/* 926CD8 802402E8 8C420000 */ lw $v0, ($v0) +/* 926CDC 802402EC 00831821 */ addu $v1, $a0, $v1 +/* 926CE0 802402F0 AC620084 */ sw $v0, 0x84($v1) +/* 926CE4 802402F4 28A20006 */ slti $v0, $a1, 6 +/* 926CE8 802402F8 1440FFF5 */ bnez $v0, .L802402D0 +/* 926CEC 802402FC 24A30005 */ addiu $v1, $a1, 5 +/* 926CF0 80240300 03E00008 */ jr $ra +/* 926CF4 80240304 24020002 */ addiu $v0, $zero, 2 +/* 926CF8 80240308 00000000 */ nop +/* 926CFC 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C.s deleted file mode 100644 index ad3cd13caa..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024078C -/* B20CCC 8024078C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B20CD0 80240790 AFBF0010 */ sw $ra, 0x10($sp) -/* B20CD4 80240794 8C82000C */ lw $v0, 0xc($a0) -/* B20CD8 80240798 0C0B1EAF */ jal get_variable -/* B20CDC 8024079C 8C450000 */ lw $a1, ($v0) -/* B20CE0 802407A0 3C018024 */ lui $at, 0x8024 -/* B20CE4 802407A4 AC222430 */ sw $v0, 0x2430($at) -/* B20CE8 802407A8 24020002 */ addiu $v0, $zero, 2 -/* B20CEC 802407AC 8FBF0010 */ lw $ra, 0x10($sp) -/* B20CF0 802407B0 24030001 */ addiu $v1, $zero, 1 -/* B20CF4 802407B4 3C018024 */ lui $at, 0x8024 -/* B20CF8 802407B8 AC23242C */ sw $v1, 0x242c($at) -/* B20CFC 802407BC 03E00008 */ jr $ra -/* B20D00 802407C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s new file mode 100644 index 0000000000..39935b0030 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_8024078C_B20CCC.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024078C_B20CCC +/* B20CCC 8024078C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B20CD0 80240790 AFBF0010 */ sw $ra, 0x10($sp) +/* B20CD4 80240794 8C82000C */ lw $v0, 0xc($a0) +/* B20CD8 80240798 0C0B1EAF */ jal get_variable +/* B20CDC 8024079C 8C450000 */ lw $a1, ($v0) +/* B20CE0 802407A0 3C018024 */ lui $at, 0x8024 +/* B20CE4 802407A4 AC222430 */ sw $v0, 0x2430($at) +/* B20CE8 802407A8 24020002 */ addiu $v0, $zero, 2 +/* B20CEC 802407AC 8FBF0010 */ lw $ra, 0x10($sp) +/* B20CF0 802407B0 24030001 */ addiu $v1, $zero, 1 +/* B20CF4 802407B4 3C018024 */ lui $at, 0x8024 +/* B20CF8 802407B8 AC23242C */ sw $v1, 0x242c($at) +/* B20CFC 802407BC 03E00008 */ jr $ra +/* B20D00 802407C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240860.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240860.s deleted file mode 100644 index c677b0f8f8..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240860.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240860 -/* B20DA0 80240860 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B20DA4 80240864 AFB10014 */ sw $s1, 0x14($sp) -/* B20DA8 80240868 0080882D */ daddu $s1, $a0, $zero -/* B20DAC 8024086C AFBF0018 */ sw $ra, 0x18($sp) -/* B20DB0 80240870 AFB00010 */ sw $s0, 0x10($sp) -/* B20DB4 80240874 8E30000C */ lw $s0, 0xc($s1) -/* B20DB8 80240878 8E050000 */ lw $a1, ($s0) -/* B20DBC 8024087C 0C0B1EAF */ jal get_variable -/* B20DC0 80240880 26100004 */ addiu $s0, $s0, 4 -/* B20DC4 80240884 AE22008C */ sw $v0, 0x8c($s1) -/* B20DC8 80240888 8E050000 */ lw $a1, ($s0) -/* B20DCC 8024088C 26100004 */ addiu $s0, $s0, 4 -/* B20DD0 80240890 0C0B1EAF */ jal get_variable -/* B20DD4 80240894 0220202D */ daddu $a0, $s1, $zero -/* B20DD8 80240898 AE220090 */ sw $v0, 0x90($s1) -/* B20DDC 8024089C 8E050000 */ lw $a1, ($s0) -/* B20DE0 802408A0 26100004 */ addiu $s0, $s0, 4 -/* B20DE4 802408A4 0C0B1EAF */ jal get_variable -/* B20DE8 802408A8 0220202D */ daddu $a0, $s1, $zero -/* B20DEC 802408AC AE220094 */ sw $v0, 0x94($s1) -/* B20DF0 802408B0 8E050000 */ lw $a1, ($s0) -/* B20DF4 802408B4 26100004 */ addiu $s0, $s0, 4 -/* B20DF8 802408B8 0C0B1EAF */ jal get_variable -/* B20DFC 802408BC 0220202D */ daddu $a0, $s1, $zero -/* B20E00 802408C0 AE220098 */ sw $v0, 0x98($s1) -/* B20E04 802408C4 8E050000 */ lw $a1, ($s0) -/* B20E08 802408C8 26100004 */ addiu $s0, $s0, 4 -/* B20E0C 802408CC 0C0B1EAF */ jal get_variable -/* B20E10 802408D0 0220202D */ daddu $a0, $s1, $zero -/* B20E14 802408D4 AE22009C */ sw $v0, 0x9c($s1) -/* B20E18 802408D8 8E050000 */ lw $a1, ($s0) -/* B20E1C 802408DC 26100004 */ addiu $s0, $s0, 4 -/* B20E20 802408E0 0C0B1EAF */ jal get_variable -/* B20E24 802408E4 0220202D */ daddu $a0, $s1, $zero -/* B20E28 802408E8 AE2200A0 */ sw $v0, 0xa0($s1) -/* B20E2C 802408EC 8E050000 */ lw $a1, ($s0) -/* B20E30 802408F0 26100004 */ addiu $s0, $s0, 4 -/* B20E34 802408F4 0C0B1EAF */ jal get_variable -/* B20E38 802408F8 0220202D */ daddu $a0, $s1, $zero -/* B20E3C 802408FC AE2200A4 */ sw $v0, 0xa4($s1) -/* B20E40 80240900 8E050000 */ lw $a1, ($s0) -/* B20E44 80240904 26100004 */ addiu $s0, $s0, 4 -/* B20E48 80240908 0C0B1EAF */ jal get_variable -/* B20E4C 8024090C 0220202D */ daddu $a0, $s1, $zero -/* B20E50 80240910 AE2200A8 */ sw $v0, 0xa8($s1) -/* B20E54 80240914 8E050000 */ lw $a1, ($s0) -/* B20E58 80240918 26100004 */ addiu $s0, $s0, 4 -/* B20E5C 8024091C 0C0B1EAF */ jal get_variable -/* B20E60 80240920 0220202D */ daddu $a0, $s1, $zero -/* B20E64 80240924 AE2200AC */ sw $v0, 0xac($s1) -/* B20E68 80240928 8E050000 */ lw $a1, ($s0) -/* B20E6C 8024092C 0C0B1EAF */ jal get_variable -/* B20E70 80240930 0220202D */ daddu $a0, $s1, $zero -/* B20E74 80240934 AE2200B0 */ sw $v0, 0xb0($s1) -/* B20E78 80240938 8FBF0018 */ lw $ra, 0x18($sp) -/* B20E7C 8024093C 8FB10014 */ lw $s1, 0x14($sp) -/* B20E80 80240940 8FB00010 */ lw $s0, 0x10($sp) -/* B20E84 80240944 24020002 */ addiu $v0, $zero, 2 -/* B20E88 80240948 03E00008 */ jr $ra -/* B20E8C 8024094C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240860_B20DA0.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240860_B20DA0.s new file mode 100644 index 0000000000..0a022614ec --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240860_B20DA0.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240860_B20DA0 +/* B20DA0 80240860 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B20DA4 80240864 AFB10014 */ sw $s1, 0x14($sp) +/* B20DA8 80240868 0080882D */ daddu $s1, $a0, $zero +/* B20DAC 8024086C AFBF0018 */ sw $ra, 0x18($sp) +/* B20DB0 80240870 AFB00010 */ sw $s0, 0x10($sp) +/* B20DB4 80240874 8E30000C */ lw $s0, 0xc($s1) +/* B20DB8 80240878 8E050000 */ lw $a1, ($s0) +/* B20DBC 8024087C 0C0B1EAF */ jal get_variable +/* B20DC0 80240880 26100004 */ addiu $s0, $s0, 4 +/* B20DC4 80240884 AE22008C */ sw $v0, 0x8c($s1) +/* B20DC8 80240888 8E050000 */ lw $a1, ($s0) +/* B20DCC 8024088C 26100004 */ addiu $s0, $s0, 4 +/* B20DD0 80240890 0C0B1EAF */ jal get_variable +/* B20DD4 80240894 0220202D */ daddu $a0, $s1, $zero +/* B20DD8 80240898 AE220090 */ sw $v0, 0x90($s1) +/* B20DDC 8024089C 8E050000 */ lw $a1, ($s0) +/* B20DE0 802408A0 26100004 */ addiu $s0, $s0, 4 +/* B20DE4 802408A4 0C0B1EAF */ jal get_variable +/* B20DE8 802408A8 0220202D */ daddu $a0, $s1, $zero +/* B20DEC 802408AC AE220094 */ sw $v0, 0x94($s1) +/* B20DF0 802408B0 8E050000 */ lw $a1, ($s0) +/* B20DF4 802408B4 26100004 */ addiu $s0, $s0, 4 +/* B20DF8 802408B8 0C0B1EAF */ jal get_variable +/* B20DFC 802408BC 0220202D */ daddu $a0, $s1, $zero +/* B20E00 802408C0 AE220098 */ sw $v0, 0x98($s1) +/* B20E04 802408C4 8E050000 */ lw $a1, ($s0) +/* B20E08 802408C8 26100004 */ addiu $s0, $s0, 4 +/* B20E0C 802408CC 0C0B1EAF */ jal get_variable +/* B20E10 802408D0 0220202D */ daddu $a0, $s1, $zero +/* B20E14 802408D4 AE22009C */ sw $v0, 0x9c($s1) +/* B20E18 802408D8 8E050000 */ lw $a1, ($s0) +/* B20E1C 802408DC 26100004 */ addiu $s0, $s0, 4 +/* B20E20 802408E0 0C0B1EAF */ jal get_variable +/* B20E24 802408E4 0220202D */ daddu $a0, $s1, $zero +/* B20E28 802408E8 AE2200A0 */ sw $v0, 0xa0($s1) +/* B20E2C 802408EC 8E050000 */ lw $a1, ($s0) +/* B20E30 802408F0 26100004 */ addiu $s0, $s0, 4 +/* B20E34 802408F4 0C0B1EAF */ jal get_variable +/* B20E38 802408F8 0220202D */ daddu $a0, $s1, $zero +/* B20E3C 802408FC AE2200A4 */ sw $v0, 0xa4($s1) +/* B20E40 80240900 8E050000 */ lw $a1, ($s0) +/* B20E44 80240904 26100004 */ addiu $s0, $s0, 4 +/* B20E48 80240908 0C0B1EAF */ jal get_variable +/* B20E4C 8024090C 0220202D */ daddu $a0, $s1, $zero +/* B20E50 80240910 AE2200A8 */ sw $v0, 0xa8($s1) +/* B20E54 80240914 8E050000 */ lw $a1, ($s0) +/* B20E58 80240918 26100004 */ addiu $s0, $s0, 4 +/* B20E5C 8024091C 0C0B1EAF */ jal get_variable +/* B20E60 80240920 0220202D */ daddu $a0, $s1, $zero +/* B20E64 80240924 AE2200AC */ sw $v0, 0xac($s1) +/* B20E68 80240928 8E050000 */ lw $a1, ($s0) +/* B20E6C 8024092C 0C0B1EAF */ jal get_variable +/* B20E70 80240930 0220202D */ daddu $a0, $s1, $zero +/* B20E74 80240934 AE2200B0 */ sw $v0, 0xb0($s1) +/* B20E78 80240938 8FBF0018 */ lw $ra, 0x18($sp) +/* B20E7C 8024093C 8FB10014 */ lw $s1, 0x14($sp) +/* B20E80 80240940 8FB00010 */ lw $s0, 0x10($sp) +/* B20E84 80240944 24020002 */ addiu $v0, $zero, 2 +/* B20E88 80240948 03E00008 */ jr $ra +/* B20E8C 8024094C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC.s deleted file mode 100644 index a929bd2b7b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ADC -/* B2101C 80240ADC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B21020 80240AE0 AFB00010 */ sw $s0, 0x10($sp) -/* B21024 80240AE4 0080802D */ daddu $s0, $a0, $zero -/* B21028 80240AE8 AFBF0014 */ sw $ra, 0x14($sp) -/* B2102C 80240AEC 0C00EABB */ jal get_npc_unsafe -/* B21030 80240AF0 8E04008C */ lw $a0, 0x8c($s0) -/* B21034 80240AF4 0040282D */ daddu $a1, $v0, $zero -/* B21038 80240AF8 8E040094 */ lw $a0, 0x94($s0) -/* B2103C 80240AFC 8CA30028 */ lw $v1, 0x28($a1) -/* B21040 80240B00 ACA40028 */ sw $a0, 0x28($a1) -/* B21044 80240B04 8FBF0014 */ lw $ra, 0x14($sp) -/* B21048 80240B08 8FB00010 */ lw $s0, 0x10($sp) -/* B2104C 80240B0C 24020002 */ addiu $v0, $zero, 2 -/* B21050 80240B10 3C018024 */ lui $at, 0x8024 -/* B21054 80240B14 AC237CB4 */ sw $v1, 0x7cb4($at) -/* B21058 80240B18 03E00008 */ jr $ra -/* B2105C 80240B1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s new file mode 100644 index 0000000000..6550d0e90c --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240ADC_B2101C.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240ADC_B2101C +/* B2101C 80240ADC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B21020 80240AE0 AFB00010 */ sw $s0, 0x10($sp) +/* B21024 80240AE4 0080802D */ daddu $s0, $a0, $zero +/* B21028 80240AE8 AFBF0014 */ sw $ra, 0x14($sp) +/* B2102C 80240AEC 0C00EABB */ jal get_npc_unsafe +/* B21030 80240AF0 8E04008C */ lw $a0, 0x8c($s0) +/* B21034 80240AF4 0040282D */ daddu $a1, $v0, $zero +/* B21038 80240AF8 8E040094 */ lw $a0, 0x94($s0) +/* B2103C 80240AFC 8CA30028 */ lw $v1, 0x28($a1) +/* B21040 80240B00 ACA40028 */ sw $a0, 0x28($a1) +/* B21044 80240B04 8FBF0014 */ lw $ra, 0x14($sp) +/* B21048 80240B08 8FB00010 */ lw $s0, 0x10($sp) +/* B2104C 80240B0C 24020002 */ addiu $v0, $zero, 2 +/* B21050 80240B10 3C018024 */ lui $at, 0x8024 +/* B21054 80240B14 AC237CB4 */ sw $v1, 0x7cb4($at) +/* B21058 80240B18 03E00008 */ jr $ra +/* B2105C 80240B1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14.s deleted file mode 100644 index e600973d7a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14.s +++ /dev/null @@ -1,151 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F14 -/* B21454 80240F14 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B21458 80240F18 AFB20018 */ sw $s2, 0x18($sp) -/* B2145C 80240F1C 0080902D */ daddu $s2, $a0, $zero -/* B21460 80240F20 AFB00010 */ sw $s0, 0x10($sp) -/* B21464 80240F24 00A0802D */ daddu $s0, $a1, $zero -/* B21468 80240F28 AFBF0020 */ sw $ra, 0x20($sp) -/* B2146C 80240F2C AFB3001C */ sw $s3, 0x1c($sp) -/* B21470 80240F30 AFB10014 */ sw $s1, 0x14($sp) -/* B21474 80240F34 8E53000C */ lw $s3, 0xc($s2) -/* B21478 80240F38 0C00EAD2 */ jal get_npc_safe -/* B2147C 80240F3C 0000202D */ daddu $a0, $zero, $zero -/* B21480 80240F40 12000021 */ beqz $s0, .L80240FC8 -/* B21484 80240F44 0040882D */ daddu $s1, $v0, $zero -/* B21488 80240F48 8E650000 */ lw $a1, ($s3) -/* B2148C 80240F4C 0C0B1EAF */ jal get_variable -/* B21490 80240F50 0240202D */ daddu $a0, $s2, $zero -/* B21494 80240F54 0040182D */ daddu $v1, $v0, $zero -/* B21498 80240F58 10600006 */ beqz $v1, .L80240F74 -/* B2149C 80240F5C AE430070 */ sw $v1, 0x70($s2) -/* B214A0 80240F60 24020001 */ addiu $v0, $zero, 1 -/* B214A4 80240F64 1062000C */ beq $v1, $v0, .L80240F98 -/* B214A8 80240F68 2402000A */ addiu $v0, $zero, 0xa -/* B214AC 80240F6C 080903F2 */ j .L80240FC8 -/* B214B0 80240F70 00000000 */ nop -.L80240F74: -/* B214B4 80240F74 3C01431E */ lui $at, 0x431e -/* B214B8 80240F78 44810000 */ mtc1 $at, $f0 -/* B214BC 80240F7C 3C01C248 */ lui $at, 0xc248 -/* B214C0 80240F80 44811000 */ mtc1 $at, $f2 -/* B214C4 80240F84 3C01C218 */ lui $at, 0xc218 -/* B214C8 80240F88 44812000 */ mtc1 $at, $f4 -/* B214CC 80240F8C 2402005A */ addiu $v0, $zero, 0x5a -/* B214D0 80240F90 080903EE */ j .L80240FB8 -/* B214D4 80240F94 AE400078 */ sw $zero, 0x78($s2) -.L80240F98: -/* B214D8 80240F98 3C01C3DD */ lui $at, 0xc3dd -/* B214DC 80240F9C 44810000 */ mtc1 $at, $f0 -/* B214E0 80240FA0 3C01C248 */ lui $at, 0xc248 -/* B214E4 80240FA4 44811000 */ mtc1 $at, $f2 -/* B214E8 80240FA8 3C01C218 */ lui $at, 0xc218 -/* B214EC 80240FAC 44812000 */ mtc1 $at, $f4 -/* B214F0 80240FB0 AE420078 */ sw $v0, 0x78($s2) -/* B214F4 80240FB4 240200C8 */ addiu $v0, $zero, 0xc8 -.L80240FB8: -/* B214F8 80240FB8 AE420074 */ sw $v0, 0x74($s2) -/* B214FC 80240FBC E6200038 */ swc1 $f0, 0x38($s1) -/* B21500 80240FC0 E622003C */ swc1 $f2, 0x3c($s1) -/* B21504 80240FC4 E6240040 */ swc1 $f4, 0x40($s1) -.L80240FC8: -/* B21508 80240FC8 8E430078 */ lw $v1, 0x78($s2) -/* B2150C 80240FCC 24040001 */ addiu $a0, $zero, 1 -/* B21510 80240FD0 10640022 */ beq $v1, $a0, .L8024105C -/* B21514 80240FD4 28620002 */ slti $v0, $v1, 2 -/* B21518 80240FD8 10400005 */ beqz $v0, .L80240FF0 -/* B2151C 80240FDC 24020002 */ addiu $v0, $zero, 2 -/* B21520 80240FE0 10600009 */ beqz $v1, .L80241008 -/* B21524 80240FE4 0000102D */ daddu $v0, $zero, $zero -/* B21528 80240FE8 08090446 */ j .L80241118 -/* B2152C 80240FEC 00000000 */ nop -.L80240FF0: -/* B21530 80240FF0 1062002D */ beq $v1, $v0, .L802410A8 -/* B21534 80240FF4 2402000A */ addiu $v0, $zero, 0xa -/* B21538 80240FF8 10620037 */ beq $v1, $v0, .L802410D8 -/* B2153C 80240FFC 0000102D */ daddu $v0, $zero, $zero -/* B21540 80241000 08090446 */ j .L80241118 -/* B21544 80241004 00000000 */ nop -.L80241008: -/* B21548 80241008 3C0200B6 */ lui $v0, 0xb6 -/* B2154C 8024100C C624000C */ lwc1 $f4, 0xc($s1) -/* B21550 80241010 3C013F80 */ lui $at, 0x3f80 -/* B21554 80241014 44810000 */ mtc1 $at, $f0 -/* B21558 80241018 3C014040 */ lui $at, 0x4040 -/* B2155C 8024101C 44811000 */ mtc1 $at, $f2 -/* B21560 80241020 46002101 */ sub.s $f4, $f4, $f0 -/* B21564 80241024 C6200038 */ lwc1 $f0, 0x38($s1) -/* B21568 80241028 34420001 */ ori $v0, $v0, 1 -/* B2156C 8024102C 46020001 */ sub.s $f0, $f0, $f2 -/* B21570 80241030 AE220028 */ sw $v0, 0x28($s1) -/* B21574 80241034 E624000C */ swc1 $f4, 0xc($s1) -/* B21578 80241038 E6200038 */ swc1 $f0, 0x38($s1) -/* B2157C 8024103C 8E420074 */ lw $v0, 0x74($s2) -/* B21580 80241040 2442FFFF */ addiu $v0, $v0, -1 -/* B21584 80241044 1C400033 */ bgtz $v0, .L80241114 -/* B21588 80241048 AE420074 */ sw $v0, 0x74($s2) -/* B2158C 8024104C 2402005A */ addiu $v0, $zero, 0x5a -/* B21590 80241050 AE440078 */ sw $a0, 0x78($s2) -/* B21594 80241054 08090445 */ j .L80241114 -/* B21598 80241058 AE420074 */ sw $v0, 0x74($s2) -.L8024105C: -/* B2159C 8024105C C624000C */ lwc1 $f4, 0xc($s1) -/* B215A0 80241060 3C013F80 */ lui $at, 0x3f80 -/* B215A4 80241064 44810000 */ mtc1 $at, $f0 -/* B215A8 80241068 3C014040 */ lui $at, 0x4040 -/* B215AC 8024106C 44811000 */ mtc1 $at, $f2 -/* B215B0 80241070 46002101 */ sub.s $f4, $f4, $f0 -/* B215B4 80241074 C6200038 */ lwc1 $f0, 0x38($s1) -/* B215B8 80241078 46020001 */ sub.s $f0, $f0, $f2 -/* B215BC 8024107C E624000C */ swc1 $f4, 0xc($s1) -/* B215C0 80241080 E6200038 */ swc1 $f0, 0x38($s1) -/* B215C4 80241084 8E420074 */ lw $v0, 0x74($s2) -/* B215C8 80241088 2442FFFF */ addiu $v0, $v0, -1 -/* B215CC 8024108C 1C400021 */ bgtz $v0, .L80241114 -/* B215D0 80241090 AE420074 */ sw $v0, 0x74($s2) -/* B215D4 80241094 24020002 */ addiu $v0, $zero, 2 -/* B215D8 80241098 AE420078 */ sw $v0, 0x78($s2) -/* B215DC 8024109C 24020078 */ addiu $v0, $zero, 0x78 -/* B215E0 802410A0 08090445 */ j .L80241114 -/* B215E4 802410A4 AE420074 */ sw $v0, 0x74($s2) -.L802410A8: -/* B215E8 802410A8 C6200038 */ lwc1 $f0, 0x38($s1) -/* B215EC 802410AC 3C014040 */ lui $at, 0x4040 -/* B215F0 802410B0 44811000 */ mtc1 $at, $f2 -/* B215F4 802410B4 00000000 */ nop -/* B215F8 802410B8 46020001 */ sub.s $f0, $f0, $f2 -/* B215FC 802410BC E6200038 */ swc1 $f0, 0x38($s1) -/* B21600 802410C0 8E420074 */ lw $v0, 0x74($s2) -/* B21604 802410C4 2442FFFF */ addiu $v0, $v0, -1 -/* B21608 802410C8 1C400012 */ bgtz $v0, .L80241114 -/* B2160C 802410CC AE420074 */ sw $v0, 0x74($s2) -/* B21610 802410D0 08090446 */ j .L80241118 -/* B21614 802410D4 24020002 */ addiu $v0, $zero, 2 -.L802410D8: -/* B21618 802410D8 C6220038 */ lwc1 $f2, 0x38($s1) -/* B2161C 802410DC 3C014040 */ lui $at, 0x4040 -/* B21620 802410E0 44810000 */ mtc1 $at, $f0 -/* B21624 802410E4 00000000 */ nop -/* B21628 802410E8 46001080 */ add.s $f2, $f2, $f0 -/* B2162C 802410EC 3C0142B4 */ lui $at, 0x42b4 -/* B21630 802410F0 44810000 */ mtc1 $at, $f0 -/* B21634 802410F4 00000000 */ nop -/* B21638 802410F8 E620000C */ swc1 $f0, 0xc($s1) -/* B2163C 802410FC E6220038 */ swc1 $f2, 0x38($s1) -/* B21640 80241100 8E430074 */ lw $v1, 0x74($s2) -/* B21644 80241104 24020002 */ addiu $v0, $zero, 2 -/* B21648 80241108 2463FFFF */ addiu $v1, $v1, -1 -/* B2164C 8024110C 18600002 */ blez $v1, .L80241118 -/* B21650 80241110 AE430074 */ sw $v1, 0x74($s2) -.L80241114: -/* B21654 80241114 0000102D */ daddu $v0, $zero, $zero -.L80241118: -/* B21658 80241118 8FBF0020 */ lw $ra, 0x20($sp) -/* B2165C 8024111C 8FB3001C */ lw $s3, 0x1c($sp) -/* B21660 80241120 8FB20018 */ lw $s2, 0x18($sp) -/* B21664 80241124 8FB10014 */ lw $s1, 0x14($sp) -/* B21668 80241128 8FB00010 */ lw $s0, 0x10($sp) -/* B2166C 8024112C 03E00008 */ jr $ra -/* B21670 80241130 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s new file mode 100644 index 0000000000..045566b0af --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_00/B20540/func_80240F14_B21454.s @@ -0,0 +1,151 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F14_B21454 +/* B21454 80240F14 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B21458 80240F18 AFB20018 */ sw $s2, 0x18($sp) +/* B2145C 80240F1C 0080902D */ daddu $s2, $a0, $zero +/* B21460 80240F20 AFB00010 */ sw $s0, 0x10($sp) +/* B21464 80240F24 00A0802D */ daddu $s0, $a1, $zero +/* B21468 80240F28 AFBF0020 */ sw $ra, 0x20($sp) +/* B2146C 80240F2C AFB3001C */ sw $s3, 0x1c($sp) +/* B21470 80240F30 AFB10014 */ sw $s1, 0x14($sp) +/* B21474 80240F34 8E53000C */ lw $s3, 0xc($s2) +/* B21478 80240F38 0C00EAD2 */ jal get_npc_safe +/* B2147C 80240F3C 0000202D */ daddu $a0, $zero, $zero +/* B21480 80240F40 12000021 */ beqz $s0, .L80240FC8 +/* B21484 80240F44 0040882D */ daddu $s1, $v0, $zero +/* B21488 80240F48 8E650000 */ lw $a1, ($s3) +/* B2148C 80240F4C 0C0B1EAF */ jal get_variable +/* B21490 80240F50 0240202D */ daddu $a0, $s2, $zero +/* B21494 80240F54 0040182D */ daddu $v1, $v0, $zero +/* B21498 80240F58 10600006 */ beqz $v1, .L80240F74 +/* B2149C 80240F5C AE430070 */ sw $v1, 0x70($s2) +/* B214A0 80240F60 24020001 */ addiu $v0, $zero, 1 +/* B214A4 80240F64 1062000C */ beq $v1, $v0, .L80240F98 +/* B214A8 80240F68 2402000A */ addiu $v0, $zero, 0xa +/* B214AC 80240F6C 080903F2 */ j .L80240FC8 +/* B214B0 80240F70 00000000 */ nop +.L80240F74: +/* B214B4 80240F74 3C01431E */ lui $at, 0x431e +/* B214B8 80240F78 44810000 */ mtc1 $at, $f0 +/* B214BC 80240F7C 3C01C248 */ lui $at, 0xc248 +/* B214C0 80240F80 44811000 */ mtc1 $at, $f2 +/* B214C4 80240F84 3C01C218 */ lui $at, 0xc218 +/* B214C8 80240F88 44812000 */ mtc1 $at, $f4 +/* B214CC 80240F8C 2402005A */ addiu $v0, $zero, 0x5a +/* B214D0 80240F90 080903EE */ j .L80240FB8 +/* B214D4 80240F94 AE400078 */ sw $zero, 0x78($s2) +.L80240F98: +/* B214D8 80240F98 3C01C3DD */ lui $at, 0xc3dd +/* B214DC 80240F9C 44810000 */ mtc1 $at, $f0 +/* B214E0 80240FA0 3C01C248 */ lui $at, 0xc248 +/* B214E4 80240FA4 44811000 */ mtc1 $at, $f2 +/* B214E8 80240FA8 3C01C218 */ lui $at, 0xc218 +/* B214EC 80240FAC 44812000 */ mtc1 $at, $f4 +/* B214F0 80240FB0 AE420078 */ sw $v0, 0x78($s2) +/* B214F4 80240FB4 240200C8 */ addiu $v0, $zero, 0xc8 +.L80240FB8: +/* B214F8 80240FB8 AE420074 */ sw $v0, 0x74($s2) +/* B214FC 80240FBC E6200038 */ swc1 $f0, 0x38($s1) +/* B21500 80240FC0 E622003C */ swc1 $f2, 0x3c($s1) +/* B21504 80240FC4 E6240040 */ swc1 $f4, 0x40($s1) +.L80240FC8: +/* B21508 80240FC8 8E430078 */ lw $v1, 0x78($s2) +/* B2150C 80240FCC 24040001 */ addiu $a0, $zero, 1 +/* B21510 80240FD0 10640022 */ beq $v1, $a0, .L8024105C +/* B21514 80240FD4 28620002 */ slti $v0, $v1, 2 +/* B21518 80240FD8 10400005 */ beqz $v0, .L80240FF0 +/* B2151C 80240FDC 24020002 */ addiu $v0, $zero, 2 +/* B21520 80240FE0 10600009 */ beqz $v1, .L80241008 +/* B21524 80240FE4 0000102D */ daddu $v0, $zero, $zero +/* B21528 80240FE8 08090446 */ j .L80241118 +/* B2152C 80240FEC 00000000 */ nop +.L80240FF0: +/* B21530 80240FF0 1062002D */ beq $v1, $v0, .L802410A8 +/* B21534 80240FF4 2402000A */ addiu $v0, $zero, 0xa +/* B21538 80240FF8 10620037 */ beq $v1, $v0, .L802410D8 +/* B2153C 80240FFC 0000102D */ daddu $v0, $zero, $zero +/* B21540 80241000 08090446 */ j .L80241118 +/* B21544 80241004 00000000 */ nop +.L80241008: +/* B21548 80241008 3C0200B6 */ lui $v0, 0xb6 +/* B2154C 8024100C C624000C */ lwc1 $f4, 0xc($s1) +/* B21550 80241010 3C013F80 */ lui $at, 0x3f80 +/* B21554 80241014 44810000 */ mtc1 $at, $f0 +/* B21558 80241018 3C014040 */ lui $at, 0x4040 +/* B2155C 8024101C 44811000 */ mtc1 $at, $f2 +/* B21560 80241020 46002101 */ sub.s $f4, $f4, $f0 +/* B21564 80241024 C6200038 */ lwc1 $f0, 0x38($s1) +/* B21568 80241028 34420001 */ ori $v0, $v0, 1 +/* B2156C 8024102C 46020001 */ sub.s $f0, $f0, $f2 +/* B21570 80241030 AE220028 */ sw $v0, 0x28($s1) +/* B21574 80241034 E624000C */ swc1 $f4, 0xc($s1) +/* B21578 80241038 E6200038 */ swc1 $f0, 0x38($s1) +/* B2157C 8024103C 8E420074 */ lw $v0, 0x74($s2) +/* B21580 80241040 2442FFFF */ addiu $v0, $v0, -1 +/* B21584 80241044 1C400033 */ bgtz $v0, .L80241114 +/* B21588 80241048 AE420074 */ sw $v0, 0x74($s2) +/* B2158C 8024104C 2402005A */ addiu $v0, $zero, 0x5a +/* B21590 80241050 AE440078 */ sw $a0, 0x78($s2) +/* B21594 80241054 08090445 */ j .L80241114 +/* B21598 80241058 AE420074 */ sw $v0, 0x74($s2) +.L8024105C: +/* B2159C 8024105C C624000C */ lwc1 $f4, 0xc($s1) +/* B215A0 80241060 3C013F80 */ lui $at, 0x3f80 +/* B215A4 80241064 44810000 */ mtc1 $at, $f0 +/* B215A8 80241068 3C014040 */ lui $at, 0x4040 +/* B215AC 8024106C 44811000 */ mtc1 $at, $f2 +/* B215B0 80241070 46002101 */ sub.s $f4, $f4, $f0 +/* B215B4 80241074 C6200038 */ lwc1 $f0, 0x38($s1) +/* B215B8 80241078 46020001 */ sub.s $f0, $f0, $f2 +/* B215BC 8024107C E624000C */ swc1 $f4, 0xc($s1) +/* B215C0 80241080 E6200038 */ swc1 $f0, 0x38($s1) +/* B215C4 80241084 8E420074 */ lw $v0, 0x74($s2) +/* B215C8 80241088 2442FFFF */ addiu $v0, $v0, -1 +/* B215CC 8024108C 1C400021 */ bgtz $v0, .L80241114 +/* B215D0 80241090 AE420074 */ sw $v0, 0x74($s2) +/* B215D4 80241094 24020002 */ addiu $v0, $zero, 2 +/* B215D8 80241098 AE420078 */ sw $v0, 0x78($s2) +/* B215DC 8024109C 24020078 */ addiu $v0, $zero, 0x78 +/* B215E0 802410A0 08090445 */ j .L80241114 +/* B215E4 802410A4 AE420074 */ sw $v0, 0x74($s2) +.L802410A8: +/* B215E8 802410A8 C6200038 */ lwc1 $f0, 0x38($s1) +/* B215EC 802410AC 3C014040 */ lui $at, 0x4040 +/* B215F0 802410B0 44811000 */ mtc1 $at, $f2 +/* B215F4 802410B4 00000000 */ nop +/* B215F8 802410B8 46020001 */ sub.s $f0, $f0, $f2 +/* B215FC 802410BC E6200038 */ swc1 $f0, 0x38($s1) +/* B21600 802410C0 8E420074 */ lw $v0, 0x74($s2) +/* B21604 802410C4 2442FFFF */ addiu $v0, $v0, -1 +/* B21608 802410C8 1C400012 */ bgtz $v0, .L80241114 +/* B2160C 802410CC AE420074 */ sw $v0, 0x74($s2) +/* B21610 802410D0 08090446 */ j .L80241118 +/* B21614 802410D4 24020002 */ addiu $v0, $zero, 2 +.L802410D8: +/* B21618 802410D8 C6220038 */ lwc1 $f2, 0x38($s1) +/* B2161C 802410DC 3C014040 */ lui $at, 0x4040 +/* B21620 802410E0 44810000 */ mtc1 $at, $f0 +/* B21624 802410E4 00000000 */ nop +/* B21628 802410E8 46001080 */ add.s $f2, $f2, $f0 +/* B2162C 802410EC 3C0142B4 */ lui $at, 0x42b4 +/* B21630 802410F0 44810000 */ mtc1 $at, $f0 +/* B21634 802410F4 00000000 */ nop +/* B21638 802410F8 E620000C */ swc1 $f0, 0xc($s1) +/* B2163C 802410FC E6220038 */ swc1 $f2, 0x38($s1) +/* B21640 80241100 8E430074 */ lw $v1, 0x74($s2) +/* B21644 80241104 24020002 */ addiu $v0, $zero, 2 +/* B21648 80241108 2463FFFF */ addiu $v1, $v1, -1 +/* B2164C 8024110C 18600002 */ blez $v1, .L80241118 +/* B21650 80241110 AE430074 */ sw $v1, 0x74($s2) +.L80241114: +/* B21654 80241114 0000102D */ daddu $v0, $zero, $zero +.L80241118: +/* B21658 80241118 8FBF0020 */ lw $ra, 0x20($sp) +/* B2165C 8024111C 8FB3001C */ lw $s3, 0x1c($sp) +/* B21660 80241120 8FB20018 */ lw $s2, 0x18($sp) +/* B21664 80241124 8FB10014 */ lw $s1, 0x14($sp) +/* B21668 80241128 8FB00010 */ lw $s0, 0x10($sp) +/* B2166C 8024112C 03E00008 */ jr $ra +/* B21670 80241130 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC.s deleted file mode 100644 index a7c1980e83..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411EC -/* B2172C 802411EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B21730 802411F0 AFB10014 */ sw $s1, 0x14($sp) -/* B21734 802411F4 0080882D */ daddu $s1, $a0, $zero -/* B21738 802411F8 AFBF0024 */ sw $ra, 0x24($sp) -/* B2173C 802411FC AFB40020 */ sw $s4, 0x20($sp) -/* B21740 80241200 AFB3001C */ sw $s3, 0x1c($sp) -/* B21744 80241204 AFB20018 */ sw $s2, 0x18($sp) -/* B21748 80241208 AFB00010 */ sw $s0, 0x10($sp) -/* B2174C 8024120C F7B40028 */ sdc1 $f20, 0x28($sp) -/* B21750 80241210 8E30000C */ lw $s0, 0xc($s1) -/* B21754 80241214 8E050000 */ lw $a1, ($s0) -/* B21758 80241218 0C0B1EAF */ jal get_variable -/* B2175C 8024121C 26100004 */ addiu $s0, $s0, 4 -/* B21760 80241220 8E120000 */ lw $s2, ($s0) -/* B21764 80241224 26100004 */ addiu $s0, $s0, 4 -/* B21768 80241228 0220202D */ daddu $a0, $s1, $zero -/* B2176C 8024122C 8E130000 */ lw $s3, ($s0) -/* B21770 80241230 8E140004 */ lw $s4, 4($s0) -/* B21774 80241234 0C090468 */ jal func_802411A0 -/* B21778 80241238 0040282D */ daddu $a1, $v0, $zero -/* B2177C 8024123C 0040802D */ daddu $s0, $v0, $zero -/* B21780 80241240 12000034 */ beqz $s0, .L80241314 -/* B21784 80241244 24020002 */ addiu $v0, $zero, 2 -/* B21788 80241248 3C038024 */ lui $v1, 0x8024 -/* B2178C 8024124C 24635950 */ addiu $v1, $v1, 0x5950 -/* B21790 80241250 8C640000 */ lw $a0, ($v1) -/* B21794 80241254 24820004 */ addiu $v0, $a0, 4 -/* B21798 80241258 AC620000 */ sw $v0, ($v1) -/* B2179C 8024125C 2C420168 */ sltiu $v0, $v0, 0x168 -/* B217A0 80241260 14400004 */ bnez $v0, .L80241274 -/* B217A4 80241264 3C0200B6 */ lui $v0, 0xb6 -/* B217A8 80241268 2482FE9C */ addiu $v0, $a0, -0x164 -/* B217AC 8024126C AC620000 */ sw $v0, ($v1) -/* B217B0 80241270 3C0200B6 */ lui $v0, 0xb6 -.L80241274: -/* B217B4 80241274 8E030028 */ lw $v1, 0x28($s0) -/* B217B8 80241278 C614003C */ lwc1 $f20, 0x3c($s0) -/* B217BC 8024127C 10620009 */ beq $v1, $v0, .L802412A4 -/* B217C0 80241280 34420004 */ ori $v0, $v0, 4 -/* B217C4 80241284 10620007 */ beq $v1, $v0, .L802412A4 -/* B217C8 80241288 3C0200B6 */ lui $v0, 0xb6 -/* B217CC 8024128C 34420008 */ ori $v0, $v0, 8 -/* B217D0 80241290 10620004 */ beq $v1, $v0, .L802412A4 -/* B217D4 80241294 3C0200B6 */ lui $v0, 0xb6 -/* B217D8 80241298 3442000C */ ori $v0, $v0, 0xc -/* B217DC 8024129C 14620011 */ bne $v1, $v0, .L802412E4 -/* B217E0 802412A0 0220202D */ daddu $a0, $s1, $zero -.L802412A4: -/* B217E4 802412A4 3C028024 */ lui $v0, 0x8024 -/* B217E8 802412A8 8C425950 */ lw $v0, 0x5950($v0) -/* B217EC 802412AC 44826000 */ mtc1 $v0, $f12 -/* B217F0 802412B0 00000000 */ nop -/* B217F4 802412B4 04410006 */ bgez $v0, .L802412D0 -/* B217F8 802412B8 46806321 */ cvt.d.w $f12, $f12 -/* B217FC 802412BC 3C0141F0 */ lui $at, 0x41f0 -/* B21800 802412C0 44810800 */ mtc1 $at, $f1 -/* B21804 802412C4 44800000 */ mtc1 $zero, $f0 -/* B21808 802412C8 00000000 */ nop -/* B2180C 802412CC 46206300 */ add.d $f12, $f12, $f0 -.L802412D0: -/* B21810 802412D0 0C00A8BB */ jal sin_deg -/* B21814 802412D4 46206320 */ cvt.s.d $f12, $f12 -/* B21818 802412D8 46000000 */ add.s $f0, $f0, $f0 -/* B2181C 802412DC 4600A500 */ add.s $f20, $f20, $f0 -/* B21820 802412E0 0220202D */ daddu $a0, $s1, $zero -.L802412E4: -/* B21824 802412E4 8E060038 */ lw $a2, 0x38($s0) -/* B21828 802412E8 0C0B2190 */ jal set_float_variable -/* B2182C 802412EC 0240282D */ daddu $a1, $s2, $zero -/* B21830 802412F0 0220202D */ daddu $a0, $s1, $zero -/* B21834 802412F4 4406A000 */ mfc1 $a2, $f20 -/* B21838 802412F8 0C0B2190 */ jal set_float_variable -/* B2183C 802412FC 0260282D */ daddu $a1, $s3, $zero -/* B21840 80241300 0220202D */ daddu $a0, $s1, $zero -/* B21844 80241304 8E060040 */ lw $a2, 0x40($s0) -/* B21848 80241308 0C0B2190 */ jal set_float_variable -/* B2184C 8024130C 0280282D */ daddu $a1, $s4, $zero -/* B21850 80241310 24020002 */ addiu $v0, $zero, 2 -.L80241314: -/* B21854 80241314 8FBF0024 */ lw $ra, 0x24($sp) -/* B21858 80241318 8FB40020 */ lw $s4, 0x20($sp) -/* B2185C 8024131C 8FB3001C */ lw $s3, 0x1c($sp) -/* B21860 80241320 8FB20018 */ lw $s2, 0x18($sp) -/* B21864 80241324 8FB10014 */ lw $s1, 0x14($sp) -/* B21868 80241328 8FB00010 */ lw $s0, 0x10($sp) -/* B2186C 8024132C D7B40028 */ ldc1 $f20, 0x28($sp) -/* B21870 80241330 03E00008 */ jr $ra -/* B21874 80241334 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s new file mode 100644 index 0000000000..86d2bc0dcb --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802411EC_B2172C.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411EC_B2172C +/* B2172C 802411EC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B21730 802411F0 AFB10014 */ sw $s1, 0x14($sp) +/* B21734 802411F4 0080882D */ daddu $s1, $a0, $zero +/* B21738 802411F8 AFBF0024 */ sw $ra, 0x24($sp) +/* B2173C 802411FC AFB40020 */ sw $s4, 0x20($sp) +/* B21740 80241200 AFB3001C */ sw $s3, 0x1c($sp) +/* B21744 80241204 AFB20018 */ sw $s2, 0x18($sp) +/* B21748 80241208 AFB00010 */ sw $s0, 0x10($sp) +/* B2174C 8024120C F7B40028 */ sdc1 $f20, 0x28($sp) +/* B21750 80241210 8E30000C */ lw $s0, 0xc($s1) +/* B21754 80241214 8E050000 */ lw $a1, ($s0) +/* B21758 80241218 0C0B1EAF */ jal get_variable +/* B2175C 8024121C 26100004 */ addiu $s0, $s0, 4 +/* B21760 80241220 8E120000 */ lw $s2, ($s0) +/* B21764 80241224 26100004 */ addiu $s0, $s0, 4 +/* B21768 80241228 0220202D */ daddu $a0, $s1, $zero +/* B2176C 8024122C 8E130000 */ lw $s3, ($s0) +/* B21770 80241230 8E140004 */ lw $s4, 4($s0) +/* B21774 80241234 0C090468 */ jal func_802411A0_B216E0 +/* B21778 80241238 0040282D */ daddu $a1, $v0, $zero +/* B2177C 8024123C 0040802D */ daddu $s0, $v0, $zero +/* B21780 80241240 12000034 */ beqz $s0, .L80241314 +/* B21784 80241244 24020002 */ addiu $v0, $zero, 2 +/* B21788 80241248 3C038024 */ lui $v1, 0x8024 +/* B2178C 8024124C 24635950 */ addiu $v1, $v1, 0x5950 +/* B21790 80241250 8C640000 */ lw $a0, ($v1) +/* B21794 80241254 24820004 */ addiu $v0, $a0, 4 +/* B21798 80241258 AC620000 */ sw $v0, ($v1) +/* B2179C 8024125C 2C420168 */ sltiu $v0, $v0, 0x168 +/* B217A0 80241260 14400004 */ bnez $v0, .L80241274 +/* B217A4 80241264 3C0200B6 */ lui $v0, 0xb6 +/* B217A8 80241268 2482FE9C */ addiu $v0, $a0, -0x164 +/* B217AC 8024126C AC620000 */ sw $v0, ($v1) +/* B217B0 80241270 3C0200B6 */ lui $v0, 0xb6 +.L80241274: +/* B217B4 80241274 8E030028 */ lw $v1, 0x28($s0) +/* B217B8 80241278 C614003C */ lwc1 $f20, 0x3c($s0) +/* B217BC 8024127C 10620009 */ beq $v1, $v0, .L802412A4 +/* B217C0 80241280 34420004 */ ori $v0, $v0, 4 +/* B217C4 80241284 10620007 */ beq $v1, $v0, .L802412A4 +/* B217C8 80241288 3C0200B6 */ lui $v0, 0xb6 +/* B217CC 8024128C 34420008 */ ori $v0, $v0, 8 +/* B217D0 80241290 10620004 */ beq $v1, $v0, .L802412A4 +/* B217D4 80241294 3C0200B6 */ lui $v0, 0xb6 +/* B217D8 80241298 3442000C */ ori $v0, $v0, 0xc +/* B217DC 8024129C 14620011 */ bne $v1, $v0, .L802412E4 +/* B217E0 802412A0 0220202D */ daddu $a0, $s1, $zero +.L802412A4: +/* B217E4 802412A4 3C028024 */ lui $v0, 0x8024 +/* B217E8 802412A8 8C425950 */ lw $v0, 0x5950($v0) +/* B217EC 802412AC 44826000 */ mtc1 $v0, $f12 +/* B217F0 802412B0 00000000 */ nop +/* B217F4 802412B4 04410006 */ bgez $v0, .L802412D0 +/* B217F8 802412B8 46806321 */ cvt.d.w $f12, $f12 +/* B217FC 802412BC 3C0141F0 */ lui $at, 0x41f0 +/* B21800 802412C0 44810800 */ mtc1 $at, $f1 +/* B21804 802412C4 44800000 */ mtc1 $zero, $f0 +/* B21808 802412C8 00000000 */ nop +/* B2180C 802412CC 46206300 */ add.d $f12, $f12, $f0 +.L802412D0: +/* B21810 802412D0 0C00A8BB */ jal sin_deg +/* B21814 802412D4 46206320 */ cvt.s.d $f12, $f12 +/* B21818 802412D8 46000000 */ add.s $f0, $f0, $f0 +/* B2181C 802412DC 4600A500 */ add.s $f20, $f20, $f0 +/* B21820 802412E0 0220202D */ daddu $a0, $s1, $zero +.L802412E4: +/* B21824 802412E4 8E060038 */ lw $a2, 0x38($s0) +/* B21828 802412E8 0C0B2190 */ jal set_float_variable +/* B2182C 802412EC 0240282D */ daddu $a1, $s2, $zero +/* B21830 802412F0 0220202D */ daddu $a0, $s1, $zero +/* B21834 802412F4 4406A000 */ mfc1 $a2, $f20 +/* B21838 802412F8 0C0B2190 */ jal set_float_variable +/* B2183C 802412FC 0260282D */ daddu $a1, $s3, $zero +/* B21840 80241300 0220202D */ daddu $a0, $s1, $zero +/* B21844 80241304 8E060040 */ lw $a2, 0x40($s0) +/* B21848 80241308 0C0B2190 */ jal set_float_variable +/* B2184C 8024130C 0280282D */ daddu $a1, $s4, $zero +/* B21850 80241310 24020002 */ addiu $v0, $zero, 2 +.L80241314: +/* B21854 80241314 8FBF0024 */ lw $ra, 0x24($sp) +/* B21858 80241318 8FB40020 */ lw $s4, 0x20($sp) +/* B2185C 8024131C 8FB3001C */ lw $s3, 0x1c($sp) +/* B21860 80241320 8FB20018 */ lw $s2, 0x18($sp) +/* B21864 80241324 8FB10014 */ lw $s1, 0x14($sp) +/* B21868 80241328 8FB00010 */ lw $s0, 0x10($sp) +/* B2186C 8024132C D7B40028 */ ldc1 $f20, 0x28($sp) +/* B21870 80241330 03E00008 */ jr $ra +/* B21874 80241334 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338.s deleted file mode 100644 index ea0a650290..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241338 -/* B21878 80241338 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B2187C 8024133C AFB20018 */ sw $s2, 0x18($sp) -/* B21880 80241340 0080902D */ daddu $s2, $a0, $zero -/* B21884 80241344 AFB10014 */ sw $s1, 0x14($sp) -/* B21888 80241348 00A0882D */ daddu $s1, $a1, $zero -/* B2188C 8024134C AFB7002C */ sw $s7, 0x2c($sp) -/* B21890 80241350 00C0B82D */ daddu $s7, $a2, $zero -/* B21894 80241354 AFB00010 */ sw $s0, 0x10($sp) -/* B21898 80241358 00E0802D */ daddu $s0, $a3, $zero -/* B2189C 8024135C AFBF0030 */ sw $ra, 0x30($sp) -/* B218A0 80241360 AFB60028 */ sw $s6, 0x28($sp) -/* B218A4 80241364 AFB50024 */ sw $s5, 0x24($sp) -/* B218A8 80241368 AFB40020 */ sw $s4, 0x20($sp) -/* B218AC 8024136C AFB3001C */ sw $s3, 0x1c($sp) -/* B218B0 80241370 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* B218B4 80241374 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* B218B8 80241378 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* B218BC 8024137C F7B80048 */ sdc1 $f24, 0x48($sp) -/* B218C0 80241380 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B218C4 80241384 F7B40038 */ sdc1 $f20, 0x38($sp) -/* B218C8 80241388 8E160000 */ lw $s6, ($s0) -/* B218CC 8024138C 0C00EAD2 */ jal get_npc_safe -/* B218D0 80241390 0000202D */ daddu $a0, $zero, $zero -/* B218D4 80241394 8C420028 */ lw $v0, 0x28($v0) -/* B218D8 80241398 3C03FF4A */ lui $v1, 0xff4a -/* B218DC 8024139C 00431821 */ addu $v1, $v0, $v1 -/* B218E0 802413A0 2C62000D */ sltiu $v0, $v1, 0xd -/* B218E4 802413A4 1040000B */ beqz $v0, .L802413D4 -/* B218E8 802413A8 00031080 */ sll $v0, $v1, 2 -/* B218EC 802413AC 3C018024 */ lui $at, 0x8024 -/* B218F0 802413B0 00220821 */ addu $at, $at, $v0 -/* B218F4 802413B4 8C227AB8 */ lw $v0, 0x7ab8($at) -/* B218F8 802413B8 00400008 */ jr $v0 -/* B218FC 802413BC 00000000 */ nop -/* B21900 802413C0 8E020000 */ lw $v0, ($s0) -/* B21904 802413C4 04410003 */ bgez $v0, .L802413D4 -/* B21908 802413C8 00000000 */ nop -/* B2190C 802413CC 0000B02D */ daddu $s6, $zero, $zero -/* B21910 802413D0 AE000000 */ sw $zero, ($s0) -.L802413D4: -/* B21914 802413D4 1AE00065 */ blez $s7, .L8024156C -/* B21918 802413D8 0000A02D */ daddu $s4, $zero, $zero -/* B2191C 802413DC 0220982D */ daddu $s3, $s1, $zero -/* B21920 802413E0 3C014220 */ lui $at, 0x4220 -/* B21924 802413E4 4481F000 */ mtc1 $at, $f30 -/* B21928 802413E8 3C014120 */ lui $at, 0x4120 -/* B2192C 802413EC 4481E000 */ mtc1 $at, $f28 -.L802413F0: -/* B21930 802413F0 86440000 */ lh $a0, ($s2) -/* B21934 802413F4 2882001F */ slti $v0, $a0, 0x1f -/* B21938 802413F8 54400058 */ bnel $v0, $zero, .L8024155C -/* B2193C 802413FC 26730010 */ addiu $s3, $s3, 0x10 -/* B21940 80241400 3C026666 */ lui $v0, 0x6666 -/* B21944 80241404 34426667 */ ori $v0, $v0, 0x6667 -/* B21948 80241408 2483FFE2 */ addiu $v1, $a0, -0x1e -/* B2194C 8024140C 00620018 */ mult $v1, $v0 -/* B21950 80241410 4480C000 */ mtc1 $zero, $f24 -/* B21954 80241414 0000802D */ daddu $s0, $zero, $zero -/* B21958 80241418 00031FC3 */ sra $v1, $v1, 0x1f -/* B2195C 8024141C 4600C686 */ mov.s $f26, $f24 -/* B21960 80241420 00004010 */ mfhi $t0 -/* B21964 80241424 00081083 */ sra $v0, $t0, 2 -/* B21968 80241428 00438823 */ subu $s1, $v0, $v1 -/* B2196C 8024142C 00111080 */ sll $v0, $s1, 2 -/* B21970 80241430 00511021 */ addu $v0, $v0, $s1 -/* B21974 80241434 00021040 */ sll $v0, $v0, 1 -/* B21978 80241438 2442001E */ addiu $v0, $v0, 0x1e -/* B2197C 8024143C 1A20001D */ blez $s1, .L802414B4 -/* B21980 80241440 0082A823 */ subu $s5, $a0, $v0 -.L80241444: -/* B21984 80241444 44966000 */ mtc1 $s6, $f12 -/* B21988 80241448 00000000 */ nop -/* B2198C 8024144C 0C00A8BB */ jal sin_deg -/* B21990 80241450 46806320 */ cvt.s.w $f12, $f12 -/* B21994 80241454 44902000 */ mtc1 $s0, $f4 -/* B21998 80241458 00000000 */ nop -/* B2199C 8024145C 46802120 */ cvt.s.w $f4, $f4 -/* B219A0 80241460 461E2083 */ div.s $f2, $f4, $f30 -/* B219A4 80241464 46001082 */ mul.s $f2, $f2, $f0 -/* B219A8 80241468 00000000 */ nop -/* B219AC 8024146C 3C014170 */ lui $at, 0x4170 -/* B219B0 80241470 44813000 */ mtc1 $at, $f6 -/* B219B4 80241474 00000000 */ nop -/* B219B8 80241478 46062103 */ div.s $f4, $f4, $f6 -/* B219BC 8024147C 46022580 */ add.s $f22, $f4, $f2 -/* B219C0 80241480 0C00A874 */ jal cos_rad -/* B219C4 80241484 4600B306 */ mov.s $f12, $f22 -/* B219C8 80241488 461C0002 */ mul.s $f0, $f0, $f28 -/* B219CC 8024148C 00000000 */ nop -/* B219D0 80241490 4600D680 */ add.s $f26, $f26, $f0 -/* B219D4 80241494 0C00A85B */ jal sin_rad -/* B219D8 80241498 4600B306 */ mov.s $f12, $f22 -/* B219DC 8024149C 461C0002 */ mul.s $f0, $f0, $f28 -/* B219E0 802414A0 00000000 */ nop -/* B219E4 802414A4 26100001 */ addiu $s0, $s0, 1 -/* B219E8 802414A8 0211102A */ slt $v0, $s0, $s1 -/* B219EC 802414AC 1440FFE5 */ bnez $v0, .L80241444 -/* B219F0 802414B0 4600C600 */ add.s $f24, $f24, $f0 -.L802414B4: -/* B219F4 802414B4 44966000 */ mtc1 $s6, $f12 -/* B219F8 802414B8 00000000 */ nop -/* B219FC 802414BC 0C00A8BB */ jal sin_deg -/* B21A00 802414C0 46806320 */ cvt.s.w $f12, $f12 -/* B21A04 802414C4 44902000 */ mtc1 $s0, $f4 -/* B21A08 802414C8 00000000 */ nop -/* B21A0C 802414CC 46802120 */ cvt.s.w $f4, $f4 -/* B21A10 802414D0 461E2083 */ div.s $f2, $f4, $f30 -/* B21A14 802414D4 46001082 */ mul.s $f2, $f2, $f0 -/* B21A18 802414D8 00000000 */ nop -/* B21A1C 802414DC 3C014170 */ lui $at, 0x4170 -/* B21A20 802414E0 44813000 */ mtc1 $at, $f6 -/* B21A24 802414E4 00000000 */ nop -/* B21A28 802414E8 46062103 */ div.s $f4, $f4, $f6 -/* B21A2C 802414EC 46022580 */ add.s $f22, $f4, $f2 -/* B21A30 802414F0 0C00A874 */ jal cos_rad -/* B21A34 802414F4 4600B306 */ mov.s $f12, $f22 -/* B21A38 802414F8 4495A000 */ mtc1 $s5, $f20 -/* B21A3C 802414FC 00000000 */ nop -/* B21A40 80241500 4680A520 */ cvt.s.w $f20, $f20 -/* B21A44 80241504 4600A002 */ mul.s $f0, $f20, $f0 -/* B21A48 80241508 00000000 */ nop -/* B21A4C 8024150C 4600D680 */ add.s $f26, $f26, $f0 -/* B21A50 80241510 0C00A85B */ jal sin_rad -/* B21A54 80241514 4600B306 */ mov.s $f12, $f22 -/* B21A58 80241518 4600A502 */ mul.s $f20, $f20, $f0 -/* B21A5C 8024151C 00000000 */ nop -/* B21A60 80241520 4600D18D */ trunc.w.s $f6, $f26 -/* B21A64 80241524 44023000 */ mfc1 $v0, $f6 -/* B21A68 80241528 00000000 */ nop -/* B21A6C 8024152C A6620000 */ sh $v0, ($s3) -/* B21A70 80241530 86420002 */ lh $v0, 2($s2) -/* B21A74 80241534 4614C600 */ add.s $f24, $f24, $f20 -/* B21A78 80241538 44820000 */ mtc1 $v0, $f0 -/* B21A7C 8024153C 00000000 */ nop -/* B21A80 80241540 46800020 */ cvt.s.w $f0, $f0 -/* B21A84 80241544 46180000 */ add.s $f0, $f0, $f24 -/* B21A88 80241548 4600018D */ trunc.w.s $f6, $f0 -/* B21A8C 8024154C 44023000 */ mfc1 $v0, $f6 -/* B21A90 80241550 00000000 */ nop -/* B21A94 80241554 A6620002 */ sh $v0, 2($s3) -/* B21A98 80241558 26730010 */ addiu $s3, $s3, 0x10 -.L8024155C: -/* B21A9C 8024155C 26940001 */ addiu $s4, $s4, 1 -/* B21AA0 80241560 0297102A */ slt $v0, $s4, $s7 -/* B21AA4 80241564 1440FFA2 */ bnez $v0, .L802413F0 -/* B21AA8 80241568 26520010 */ addiu $s2, $s2, 0x10 -.L8024156C: -/* B21AAC 8024156C 8FBF0030 */ lw $ra, 0x30($sp) -/* B21AB0 80241570 8FB7002C */ lw $s7, 0x2c($sp) -/* B21AB4 80241574 8FB60028 */ lw $s6, 0x28($sp) -/* B21AB8 80241578 8FB50024 */ lw $s5, 0x24($sp) -/* B21ABC 8024157C 8FB40020 */ lw $s4, 0x20($sp) -/* B21AC0 80241580 8FB3001C */ lw $s3, 0x1c($sp) -/* B21AC4 80241584 8FB20018 */ lw $s2, 0x18($sp) -/* B21AC8 80241588 8FB10014 */ lw $s1, 0x14($sp) -/* B21ACC 8024158C 8FB00010 */ lw $s0, 0x10($sp) -/* B21AD0 80241590 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* B21AD4 80241594 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* B21AD8 80241598 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* B21ADC 8024159C D7B80048 */ ldc1 $f24, 0x48($sp) -/* B21AE0 802415A0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* B21AE4 802415A4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* B21AE8 802415A8 03E00008 */ jr $ra -/* B21AEC 802415AC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s new file mode 100644 index 0000000000..588261d340 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241338_B21878.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241338_B21878 +/* B21878 80241338 27BDFF98 */ addiu $sp, $sp, -0x68 +/* B2187C 8024133C AFB20018 */ sw $s2, 0x18($sp) +/* B21880 80241340 0080902D */ daddu $s2, $a0, $zero +/* B21884 80241344 AFB10014 */ sw $s1, 0x14($sp) +/* B21888 80241348 00A0882D */ daddu $s1, $a1, $zero +/* B2188C 8024134C AFB7002C */ sw $s7, 0x2c($sp) +/* B21890 80241350 00C0B82D */ daddu $s7, $a2, $zero +/* B21894 80241354 AFB00010 */ sw $s0, 0x10($sp) +/* B21898 80241358 00E0802D */ daddu $s0, $a3, $zero +/* B2189C 8024135C AFBF0030 */ sw $ra, 0x30($sp) +/* B218A0 80241360 AFB60028 */ sw $s6, 0x28($sp) +/* B218A4 80241364 AFB50024 */ sw $s5, 0x24($sp) +/* B218A8 80241368 AFB40020 */ sw $s4, 0x20($sp) +/* B218AC 8024136C AFB3001C */ sw $s3, 0x1c($sp) +/* B218B0 80241370 F7BE0060 */ sdc1 $f30, 0x60($sp) +/* B218B4 80241374 F7BC0058 */ sdc1 $f28, 0x58($sp) +/* B218B8 80241378 F7BA0050 */ sdc1 $f26, 0x50($sp) +/* B218BC 8024137C F7B80048 */ sdc1 $f24, 0x48($sp) +/* B218C0 80241380 F7B60040 */ sdc1 $f22, 0x40($sp) +/* B218C4 80241384 F7B40038 */ sdc1 $f20, 0x38($sp) +/* B218C8 80241388 8E160000 */ lw $s6, ($s0) +/* B218CC 8024138C 0C00EAD2 */ jal get_npc_safe +/* B218D0 80241390 0000202D */ daddu $a0, $zero, $zero +/* B218D4 80241394 8C420028 */ lw $v0, 0x28($v0) +/* B218D8 80241398 3C03FF4A */ lui $v1, 0xff4a +/* B218DC 8024139C 00431821 */ addu $v1, $v0, $v1 +/* B218E0 802413A0 2C62000D */ sltiu $v0, $v1, 0xd +/* B218E4 802413A4 1040000B */ beqz $v0, .L802413D4 +/* B218E8 802413A8 00031080 */ sll $v0, $v1, 2 +/* B218EC 802413AC 3C018024 */ lui $at, 0x8024 +/* B218F0 802413B0 00220821 */ addu $at, $at, $v0 +/* B218F4 802413B4 8C227AB8 */ lw $v0, 0x7ab8($at) +/* B218F8 802413B8 00400008 */ jr $v0 +/* B218FC 802413BC 00000000 */ nop +/* B21900 802413C0 8E020000 */ lw $v0, ($s0) +/* B21904 802413C4 04410003 */ bgez $v0, .L802413D4 +/* B21908 802413C8 00000000 */ nop +/* B2190C 802413CC 0000B02D */ daddu $s6, $zero, $zero +/* B21910 802413D0 AE000000 */ sw $zero, ($s0) +.L802413D4: +/* B21914 802413D4 1AE00065 */ blez $s7, .L8024156C +/* B21918 802413D8 0000A02D */ daddu $s4, $zero, $zero +/* B2191C 802413DC 0220982D */ daddu $s3, $s1, $zero +/* B21920 802413E0 3C014220 */ lui $at, 0x4220 +/* B21924 802413E4 4481F000 */ mtc1 $at, $f30 +/* B21928 802413E8 3C014120 */ lui $at, 0x4120 +/* B2192C 802413EC 4481E000 */ mtc1 $at, $f28 +.L802413F0: +/* B21930 802413F0 86440000 */ lh $a0, ($s2) +/* B21934 802413F4 2882001F */ slti $v0, $a0, 0x1f +/* B21938 802413F8 54400058 */ bnel $v0, $zero, .L8024155C +/* B2193C 802413FC 26730010 */ addiu $s3, $s3, 0x10 +/* B21940 80241400 3C026666 */ lui $v0, 0x6666 +/* B21944 80241404 34426667 */ ori $v0, $v0, 0x6667 +/* B21948 80241408 2483FFE2 */ addiu $v1, $a0, -0x1e +/* B2194C 8024140C 00620018 */ mult $v1, $v0 +/* B21950 80241410 4480C000 */ mtc1 $zero, $f24 +/* B21954 80241414 0000802D */ daddu $s0, $zero, $zero +/* B21958 80241418 00031FC3 */ sra $v1, $v1, 0x1f +/* B2195C 8024141C 4600C686 */ mov.s $f26, $f24 +/* B21960 80241420 00004010 */ mfhi $t0 +/* B21964 80241424 00081083 */ sra $v0, $t0, 2 +/* B21968 80241428 00438823 */ subu $s1, $v0, $v1 +/* B2196C 8024142C 00111080 */ sll $v0, $s1, 2 +/* B21970 80241430 00511021 */ addu $v0, $v0, $s1 +/* B21974 80241434 00021040 */ sll $v0, $v0, 1 +/* B21978 80241438 2442001E */ addiu $v0, $v0, 0x1e +/* B2197C 8024143C 1A20001D */ blez $s1, .L802414B4 +/* B21980 80241440 0082A823 */ subu $s5, $a0, $v0 +.L80241444: +/* B21984 80241444 44966000 */ mtc1 $s6, $f12 +/* B21988 80241448 00000000 */ nop +/* B2198C 8024144C 0C00A8BB */ jal sin_deg +/* B21990 80241450 46806320 */ cvt.s.w $f12, $f12 +/* B21994 80241454 44902000 */ mtc1 $s0, $f4 +/* B21998 80241458 00000000 */ nop +/* B2199C 8024145C 46802120 */ cvt.s.w $f4, $f4 +/* B219A0 80241460 461E2083 */ div.s $f2, $f4, $f30 +/* B219A4 80241464 46001082 */ mul.s $f2, $f2, $f0 +/* B219A8 80241468 00000000 */ nop +/* B219AC 8024146C 3C014170 */ lui $at, 0x4170 +/* B219B0 80241470 44813000 */ mtc1 $at, $f6 +/* B219B4 80241474 00000000 */ nop +/* B219B8 80241478 46062103 */ div.s $f4, $f4, $f6 +/* B219BC 8024147C 46022580 */ add.s $f22, $f4, $f2 +/* B219C0 80241480 0C00A874 */ jal cos_rad +/* B219C4 80241484 4600B306 */ mov.s $f12, $f22 +/* B219C8 80241488 461C0002 */ mul.s $f0, $f0, $f28 +/* B219CC 8024148C 00000000 */ nop +/* B219D0 80241490 4600D680 */ add.s $f26, $f26, $f0 +/* B219D4 80241494 0C00A85B */ jal sin_rad +/* B219D8 80241498 4600B306 */ mov.s $f12, $f22 +/* B219DC 8024149C 461C0002 */ mul.s $f0, $f0, $f28 +/* B219E0 802414A0 00000000 */ nop +/* B219E4 802414A4 26100001 */ addiu $s0, $s0, 1 +/* B219E8 802414A8 0211102A */ slt $v0, $s0, $s1 +/* B219EC 802414AC 1440FFE5 */ bnez $v0, .L80241444 +/* B219F0 802414B0 4600C600 */ add.s $f24, $f24, $f0 +.L802414B4: +/* B219F4 802414B4 44966000 */ mtc1 $s6, $f12 +/* B219F8 802414B8 00000000 */ nop +/* B219FC 802414BC 0C00A8BB */ jal sin_deg +/* B21A00 802414C0 46806320 */ cvt.s.w $f12, $f12 +/* B21A04 802414C4 44902000 */ mtc1 $s0, $f4 +/* B21A08 802414C8 00000000 */ nop +/* B21A0C 802414CC 46802120 */ cvt.s.w $f4, $f4 +/* B21A10 802414D0 461E2083 */ div.s $f2, $f4, $f30 +/* B21A14 802414D4 46001082 */ mul.s $f2, $f2, $f0 +/* B21A18 802414D8 00000000 */ nop +/* B21A1C 802414DC 3C014170 */ lui $at, 0x4170 +/* B21A20 802414E0 44813000 */ mtc1 $at, $f6 +/* B21A24 802414E4 00000000 */ nop +/* B21A28 802414E8 46062103 */ div.s $f4, $f4, $f6 +/* B21A2C 802414EC 46022580 */ add.s $f22, $f4, $f2 +/* B21A30 802414F0 0C00A874 */ jal cos_rad +/* B21A34 802414F4 4600B306 */ mov.s $f12, $f22 +/* B21A38 802414F8 4495A000 */ mtc1 $s5, $f20 +/* B21A3C 802414FC 00000000 */ nop +/* B21A40 80241500 4680A520 */ cvt.s.w $f20, $f20 +/* B21A44 80241504 4600A002 */ mul.s $f0, $f20, $f0 +/* B21A48 80241508 00000000 */ nop +/* B21A4C 8024150C 4600D680 */ add.s $f26, $f26, $f0 +/* B21A50 80241510 0C00A85B */ jal sin_rad +/* B21A54 80241514 4600B306 */ mov.s $f12, $f22 +/* B21A58 80241518 4600A502 */ mul.s $f20, $f20, $f0 +/* B21A5C 8024151C 00000000 */ nop +/* B21A60 80241520 4600D18D */ trunc.w.s $f6, $f26 +/* B21A64 80241524 44023000 */ mfc1 $v0, $f6 +/* B21A68 80241528 00000000 */ nop +/* B21A6C 8024152C A6620000 */ sh $v0, ($s3) +/* B21A70 80241530 86420002 */ lh $v0, 2($s2) +/* B21A74 80241534 4614C600 */ add.s $f24, $f24, $f20 +/* B21A78 80241538 44820000 */ mtc1 $v0, $f0 +/* B21A7C 8024153C 00000000 */ nop +/* B21A80 80241540 46800020 */ cvt.s.w $f0, $f0 +/* B21A84 80241544 46180000 */ add.s $f0, $f0, $f24 +/* B21A88 80241548 4600018D */ trunc.w.s $f6, $f0 +/* B21A8C 8024154C 44023000 */ mfc1 $v0, $f6 +/* B21A90 80241550 00000000 */ nop +/* B21A94 80241554 A6620002 */ sh $v0, 2($s3) +/* B21A98 80241558 26730010 */ addiu $s3, $s3, 0x10 +.L8024155C: +/* B21A9C 8024155C 26940001 */ addiu $s4, $s4, 1 +/* B21AA0 80241560 0297102A */ slt $v0, $s4, $s7 +/* B21AA4 80241564 1440FFA2 */ bnez $v0, .L802413F0 +/* B21AA8 80241568 26520010 */ addiu $s2, $s2, 0x10 +.L8024156C: +/* B21AAC 8024156C 8FBF0030 */ lw $ra, 0x30($sp) +/* B21AB0 80241570 8FB7002C */ lw $s7, 0x2c($sp) +/* B21AB4 80241574 8FB60028 */ lw $s6, 0x28($sp) +/* B21AB8 80241578 8FB50024 */ lw $s5, 0x24($sp) +/* B21ABC 8024157C 8FB40020 */ lw $s4, 0x20($sp) +/* B21AC0 80241580 8FB3001C */ lw $s3, 0x1c($sp) +/* B21AC4 80241584 8FB20018 */ lw $s2, 0x18($sp) +/* B21AC8 80241588 8FB10014 */ lw $s1, 0x14($sp) +/* B21ACC 8024158C 8FB00010 */ lw $s0, 0x10($sp) +/* B21AD0 80241590 D7BE0060 */ ldc1 $f30, 0x60($sp) +/* B21AD4 80241594 D7BC0058 */ ldc1 $f28, 0x58($sp) +/* B21AD8 80241598 D7BA0050 */ ldc1 $f26, 0x50($sp) +/* B21ADC 8024159C D7B80048 */ ldc1 $f24, 0x48($sp) +/* B21AE0 802415A0 D7B60040 */ ldc1 $f22, 0x40($sp) +/* B21AE4 802415A4 D7B40038 */ ldc1 $f20, 0x38($sp) +/* B21AE8 802415A8 03E00008 */ jr $ra +/* B21AEC 802415AC 27BD0068 */ addiu $sp, $sp, 0x68 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 43b0b1a89d..a72717edee 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 @@ -16,7 +16,7 @@ glabel func_802415B0_B21AF0 /* B21B1C 802415DC 8FA40010 */ lw $a0, 0x10($sp) /* B21B20 802415E0 8FA50014 */ lw $a1, 0x14($sp) /* B21B24 802415E4 8FA60018 */ lw $a2, 0x18($sp) -/* B21B28 802415E8 0C0904CE */ jal func_80241338 +/* B21B28 802415E8 0C0904CE */ jal func_80241338_B21878 /* B21B2C 802415EC 0220382D */ daddu $a3, $s1, $zero /* B21B30 802415F0 3C03800A */ lui $v1, 0x800a /* B21B34 802415F4 2463A66C */ addiu $v1, $v1, -0x5994 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 6f4918340d..30b7e184f6 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 @@ -16,7 +16,7 @@ glabel func_80241654_B21B94 /* B21BC0 80241680 8FA40010 */ lw $a0, 0x10($sp) /* B21BC4 80241684 8FA50014 */ lw $a1, 0x14($sp) /* B21BC8 80241688 8FA60018 */ lw $a2, 0x18($sp) -/* B21BCC 8024168C 0C0904CE */ jal func_80241338 +/* B21BCC 8024168C 0C0904CE */ jal func_80241338_B21878 /* B21BD0 80241690 0220382D */ daddu $a3, $s1, $zero /* B21BD4 80241694 3C03800A */ lui $v1, 0x800a /* B21BD8 80241698 2463A66C */ addiu $v1, $v1, -0x5994 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8.s deleted file mode 100644 index 182f8190b4..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416F8 -/* B21C38 802416F8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B21C3C 802416FC AFB20018 */ sw $s2, 0x18($sp) -/* B21C40 80241700 0080902D */ daddu $s2, $a0, $zero -/* B21C44 80241704 AFBF0028 */ sw $ra, 0x28($sp) -/* B21C48 80241708 AFB50024 */ sw $s5, 0x24($sp) -/* B21C4C 8024170C AFB40020 */ sw $s4, 0x20($sp) -/* B21C50 80241710 AFB3001C */ sw $s3, 0x1c($sp) -/* B21C54 80241714 AFB10014 */ sw $s1, 0x14($sp) -/* B21C58 80241718 AFB00010 */ sw $s0, 0x10($sp) -/* B21C5C 8024171C F7B80040 */ sdc1 $f24, 0x40($sp) -/* B21C60 80241720 F7B60038 */ sdc1 $f22, 0x38($sp) -/* B21C64 80241724 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B21C68 80241728 8E50000C */ lw $s0, 0xc($s2) -/* B21C6C 8024172C 8E140000 */ lw $s4, ($s0) -/* B21C70 80241730 26100004 */ addiu $s0, $s0, 4 -/* B21C74 80241734 0C0B1EAF */ jal get_variable -/* B21C78 80241738 0280282D */ daddu $a1, $s4, $zero -/* B21C7C 8024173C 0040982D */ daddu $s3, $v0, $zero -/* B21C80 80241740 8E150000 */ lw $s5, ($s0) -/* B21C84 80241744 26100004 */ addiu $s0, $s0, 4 -/* B21C88 80241748 8E050000 */ lw $a1, ($s0) -/* B21C8C 8024174C 26100004 */ addiu $s0, $s0, 4 -/* B21C90 80241750 0C0B210B */ jal get_float_variable -/* B21C94 80241754 0240202D */ daddu $a0, $s2, $zero -/* B21C98 80241758 8E050000 */ lw $a1, ($s0) -/* B21C9C 8024175C 26100004 */ addiu $s0, $s0, 4 -/* B21CA0 80241760 0240202D */ daddu $a0, $s2, $zero -/* B21CA4 80241764 0C0B210B */ jal get_float_variable -/* B21CA8 80241768 46000606 */ mov.s $f24, $f0 -/* B21CAC 8024176C 8E050000 */ lw $a1, ($s0) -/* B21CB0 80241770 26100004 */ addiu $s0, $s0, 4 -/* B21CB4 80241774 0240202D */ daddu $a0, $s2, $zero -/* B21CB8 80241778 0C0B1EAF */ jal get_variable -/* B21CBC 8024177C 46000506 */ mov.s $f20, $f0 -/* B21CC0 80241780 8E050000 */ lw $a1, ($s0) -/* B21CC4 80241784 26100004 */ addiu $s0, $s0, 4 -/* B21CC8 80241788 0240202D */ daddu $a0, $s2, $zero -/* B21CCC 8024178C 0C0B1EAF */ jal get_variable -/* B21CD0 80241790 0040882D */ daddu $s1, $v0, $zero -/* B21CD4 80241794 0240202D */ daddu $a0, $s2, $zero -/* B21CD8 80241798 8E050000 */ lw $a1, ($s0) -/* B21CDC 8024179C 0C0B210B */ jal get_float_variable -/* B21CE0 802417A0 0040802D */ daddu $s0, $v0, $zero -/* B21CE4 802417A4 4618A501 */ sub.s $f20, $f20, $f24 -/* B21CE8 802417A8 3C013F00 */ lui $at, 0x3f00 -/* B21CEC 802417AC 44811000 */ mtc1 $at, $f2 -/* B21CF0 802417B0 00000000 */ nop -/* B21CF4 802417B4 4602A502 */ mul.s $f20, $f20, $f2 -/* B21CF8 802417B8 00000000 */ nop -/* B21CFC 802417BC 12000008 */ beqz $s0, .L802417E0 -/* B21D00 802417C0 46000586 */ mov.s $f22, $f0 -/* B21D04 802417C4 0233102A */ slt $v0, $s1, $s3 -/* B21D08 802417C8 10400005 */ beqz $v0, .L802417E0 -/* B21D0C 802417CC 0240202D */ daddu $a0, $s2, $zero -/* B21D10 802417D0 0220982D */ daddu $s3, $s1, $zero -/* B21D14 802417D4 0280282D */ daddu $a1, $s4, $zero -/* B21D18 802417D8 0C0B2026 */ jal set_variable -/* B21D1C 802417DC 0220302D */ daddu $a2, $s1, $zero -.L802417E0: -/* B21D20 802417E0 3C014334 */ lui $at, 0x4334 -/* B21D24 802417E4 44810000 */ mtc1 $at, $f0 -/* B21D28 802417E8 44936000 */ mtc1 $s3, $f12 -/* B21D2C 802417EC 00000000 */ nop -/* B21D30 802417F0 46806320 */ cvt.s.w $f12, $f12 -/* B21D34 802417F4 46006302 */ mul.s $f12, $f12, $f0 -/* B21D38 802417F8 00000000 */ nop -/* B21D3C 802417FC 44910000 */ mtc1 $s1, $f0 -/* B21D40 80241800 00000000 */ nop -/* B21D44 80241804 46800020 */ cvt.s.w $f0, $f0 -/* B21D48 80241808 46006303 */ div.s $f12, $f12, $f0 -/* B21D4C 8024180C 0C00A8D4 */ jal cos_deg -/* B21D50 80241810 46166300 */ add.s $f12, $f12, $f22 -/* B21D54 80241814 4600A002 */ mul.s $f0, $f20, $f0 -/* B21D58 80241818 00000000 */ nop -/* B21D5C 8024181C 4614C080 */ add.s $f2, $f24, $f20 -/* B21D60 80241820 46001081 */ sub.s $f2, $f2, $f0 -/* B21D64 80241824 0240202D */ daddu $a0, $s2, $zero -/* B21D68 80241828 44061000 */ mfc1 $a2, $f2 -/* B21D6C 8024182C 0C0B2190 */ jal set_float_variable -/* B21D70 80241830 02A0282D */ daddu $a1, $s5, $zero -/* B21D74 80241834 8FBF0028 */ lw $ra, 0x28($sp) -/* B21D78 80241838 8FB50024 */ lw $s5, 0x24($sp) -/* B21D7C 8024183C 8FB40020 */ lw $s4, 0x20($sp) -/* B21D80 80241840 8FB3001C */ lw $s3, 0x1c($sp) -/* B21D84 80241844 8FB20018 */ lw $s2, 0x18($sp) -/* B21D88 80241848 8FB10014 */ lw $s1, 0x14($sp) -/* B21D8C 8024184C 8FB00010 */ lw $s0, 0x10($sp) -/* B21D90 80241850 D7B80040 */ ldc1 $f24, 0x40($sp) -/* B21D94 80241854 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B21D98 80241858 D7B40030 */ ldc1 $f20, 0x30($sp) -/* B21D9C 8024185C 24020002 */ addiu $v0, $zero, 2 -/* B21DA0 80241860 03E00008 */ jr $ra -/* B21DA4 80241864 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s new file mode 100644 index 0000000000..4f64ad0101 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_802416F8_B21C38.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416F8_B21C38 +/* B21C38 802416F8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B21C3C 802416FC AFB20018 */ sw $s2, 0x18($sp) +/* B21C40 80241700 0080902D */ daddu $s2, $a0, $zero +/* B21C44 80241704 AFBF0028 */ sw $ra, 0x28($sp) +/* B21C48 80241708 AFB50024 */ sw $s5, 0x24($sp) +/* B21C4C 8024170C AFB40020 */ sw $s4, 0x20($sp) +/* B21C50 80241710 AFB3001C */ sw $s3, 0x1c($sp) +/* B21C54 80241714 AFB10014 */ sw $s1, 0x14($sp) +/* B21C58 80241718 AFB00010 */ sw $s0, 0x10($sp) +/* B21C5C 8024171C F7B80040 */ sdc1 $f24, 0x40($sp) +/* B21C60 80241720 F7B60038 */ sdc1 $f22, 0x38($sp) +/* B21C64 80241724 F7B40030 */ sdc1 $f20, 0x30($sp) +/* B21C68 80241728 8E50000C */ lw $s0, 0xc($s2) +/* B21C6C 8024172C 8E140000 */ lw $s4, ($s0) +/* B21C70 80241730 26100004 */ addiu $s0, $s0, 4 +/* B21C74 80241734 0C0B1EAF */ jal get_variable +/* B21C78 80241738 0280282D */ daddu $a1, $s4, $zero +/* B21C7C 8024173C 0040982D */ daddu $s3, $v0, $zero +/* B21C80 80241740 8E150000 */ lw $s5, ($s0) +/* B21C84 80241744 26100004 */ addiu $s0, $s0, 4 +/* B21C88 80241748 8E050000 */ lw $a1, ($s0) +/* B21C8C 8024174C 26100004 */ addiu $s0, $s0, 4 +/* B21C90 80241750 0C0B210B */ jal get_float_variable +/* B21C94 80241754 0240202D */ daddu $a0, $s2, $zero +/* B21C98 80241758 8E050000 */ lw $a1, ($s0) +/* B21C9C 8024175C 26100004 */ addiu $s0, $s0, 4 +/* B21CA0 80241760 0240202D */ daddu $a0, $s2, $zero +/* B21CA4 80241764 0C0B210B */ jal get_float_variable +/* B21CA8 80241768 46000606 */ mov.s $f24, $f0 +/* B21CAC 8024176C 8E050000 */ lw $a1, ($s0) +/* B21CB0 80241770 26100004 */ addiu $s0, $s0, 4 +/* B21CB4 80241774 0240202D */ daddu $a0, $s2, $zero +/* B21CB8 80241778 0C0B1EAF */ jal get_variable +/* B21CBC 8024177C 46000506 */ mov.s $f20, $f0 +/* B21CC0 80241780 8E050000 */ lw $a1, ($s0) +/* B21CC4 80241784 26100004 */ addiu $s0, $s0, 4 +/* B21CC8 80241788 0240202D */ daddu $a0, $s2, $zero +/* B21CCC 8024178C 0C0B1EAF */ jal get_variable +/* B21CD0 80241790 0040882D */ daddu $s1, $v0, $zero +/* B21CD4 80241794 0240202D */ daddu $a0, $s2, $zero +/* B21CD8 80241798 8E050000 */ lw $a1, ($s0) +/* B21CDC 8024179C 0C0B210B */ jal get_float_variable +/* B21CE0 802417A0 0040802D */ daddu $s0, $v0, $zero +/* B21CE4 802417A4 4618A501 */ sub.s $f20, $f20, $f24 +/* B21CE8 802417A8 3C013F00 */ lui $at, 0x3f00 +/* B21CEC 802417AC 44811000 */ mtc1 $at, $f2 +/* B21CF0 802417B0 00000000 */ nop +/* B21CF4 802417B4 4602A502 */ mul.s $f20, $f20, $f2 +/* B21CF8 802417B8 00000000 */ nop +/* B21CFC 802417BC 12000008 */ beqz $s0, .L802417E0 +/* B21D00 802417C0 46000586 */ mov.s $f22, $f0 +/* B21D04 802417C4 0233102A */ slt $v0, $s1, $s3 +/* B21D08 802417C8 10400005 */ beqz $v0, .L802417E0 +/* B21D0C 802417CC 0240202D */ daddu $a0, $s2, $zero +/* B21D10 802417D0 0220982D */ daddu $s3, $s1, $zero +/* B21D14 802417D4 0280282D */ daddu $a1, $s4, $zero +/* B21D18 802417D8 0C0B2026 */ jal set_variable +/* B21D1C 802417DC 0220302D */ daddu $a2, $s1, $zero +.L802417E0: +/* B21D20 802417E0 3C014334 */ lui $at, 0x4334 +/* B21D24 802417E4 44810000 */ mtc1 $at, $f0 +/* B21D28 802417E8 44936000 */ mtc1 $s3, $f12 +/* B21D2C 802417EC 00000000 */ nop +/* B21D30 802417F0 46806320 */ cvt.s.w $f12, $f12 +/* B21D34 802417F4 46006302 */ mul.s $f12, $f12, $f0 +/* B21D38 802417F8 00000000 */ nop +/* B21D3C 802417FC 44910000 */ mtc1 $s1, $f0 +/* B21D40 80241800 00000000 */ nop +/* B21D44 80241804 46800020 */ cvt.s.w $f0, $f0 +/* B21D48 80241808 46006303 */ div.s $f12, $f12, $f0 +/* B21D4C 8024180C 0C00A8D4 */ jal cos_deg +/* B21D50 80241810 46166300 */ add.s $f12, $f12, $f22 +/* B21D54 80241814 4600A002 */ mul.s $f0, $f20, $f0 +/* B21D58 80241818 00000000 */ nop +/* B21D5C 8024181C 4614C080 */ add.s $f2, $f24, $f20 +/* B21D60 80241820 46001081 */ sub.s $f2, $f2, $f0 +/* B21D64 80241824 0240202D */ daddu $a0, $s2, $zero +/* B21D68 80241828 44061000 */ mfc1 $a2, $f2 +/* B21D6C 8024182C 0C0B2190 */ jal set_float_variable +/* B21D70 80241830 02A0282D */ daddu $a1, $s5, $zero +/* B21D74 80241834 8FBF0028 */ lw $ra, 0x28($sp) +/* B21D78 80241838 8FB50024 */ lw $s5, 0x24($sp) +/* B21D7C 8024183C 8FB40020 */ lw $s4, 0x20($sp) +/* B21D80 80241840 8FB3001C */ lw $s3, 0x1c($sp) +/* B21D84 80241844 8FB20018 */ lw $s2, 0x18($sp) +/* B21D88 80241848 8FB10014 */ lw $s1, 0x14($sp) +/* B21D8C 8024184C 8FB00010 */ lw $s0, 0x10($sp) +/* B21D90 80241850 D7B80040 */ ldc1 $f24, 0x40($sp) +/* B21D94 80241854 D7B60038 */ ldc1 $f22, 0x38($sp) +/* B21D98 80241858 D7B40030 */ ldc1 $f20, 0x30($sp) +/* B21D9C 8024185C 24020002 */ addiu $v0, $zero, 2 +/* B21DA0 80241860 03E00008 */ jr $ra +/* B21DA4 80241864 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868.s deleted file mode 100644 index ea3cce7c53..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241868 -/* B21DA8 80241868 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B21DAC 8024186C AFB10014 */ sw $s1, 0x14($sp) -/* B21DB0 80241870 0080882D */ daddu $s1, $a0, $zero -/* B21DB4 80241874 AFBF0018 */ sw $ra, 0x18($sp) -/* B21DB8 80241878 AFB00010 */ sw $s0, 0x10($sp) -/* B21DBC 8024187C F7B80030 */ sdc1 $f24, 0x30($sp) -/* B21DC0 80241880 F7B60028 */ sdc1 $f22, 0x28($sp) -/* B21DC4 80241884 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B21DC8 80241888 0C00EAD2 */ jal get_npc_safe -/* B21DCC 8024188C 0000202D */ daddu $a0, $zero, $zero -/* B21DD0 80241890 0040802D */ daddu $s0, $v0, $zero -/* B21DD4 80241894 C614000C */ lwc1 $f20, 0xc($s0) -/* B21DD8 80241898 3C01432A */ lui $at, 0x432a -/* B21DDC 8024189C 4481C000 */ mtc1 $at, $f24 -/* B21DE0 802418A0 4600A507 */ neg.s $f20, $f20 -/* B21DE4 802418A4 0C00A8BB */ jal sin_deg -/* B21DE8 802418A8 4600A306 */ mov.s $f12, $f20 -/* B21DEC 802418AC 46180002 */ mul.s $f0, $f0, $f24 -/* B21DF0 802418B0 00000000 */ nop -/* B21DF4 802418B4 C6160038 */ lwc1 $f22, 0x38($s0) -/* B21DF8 802418B8 3C0141F0 */ lui $at, 0x41f0 -/* B21DFC 802418BC 44811000 */ mtc1 $at, $f2 -/* B21E00 802418C0 00000000 */ nop -/* B21E04 802418C4 4602B580 */ add.s $f22, $f22, $f2 -/* B21E08 802418C8 4600A306 */ mov.s $f12, $f20 -/* B21E0C 802418CC 0C00A8D4 */ jal cos_deg -/* B21E10 802418D0 4600B580 */ add.s $f22, $f22, $f0 -/* B21E14 802418D4 0220202D */ daddu $a0, $s1, $zero -/* B21E18 802418D8 46180002 */ mul.s $f0, $f0, $f24 -/* B21E1C 802418DC 00000000 */ nop -/* B21E20 802418E0 3C05FE36 */ lui $a1, 0xfe36 -/* B21E24 802418E4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B21E28 802418E8 C6180040 */ lwc1 $f24, 0x40($s0) -/* B21E2C 802418EC C614003C */ lwc1 $f20, 0x3c($s0) -/* B21E30 802418F0 4600C600 */ add.s $f24, $f24, $f0 -/* B21E34 802418F4 3C014248 */ lui $at, 0x4248 -/* B21E38 802418F8 44810000 */ mtc1 $at, $f0 -/* B21E3C 802418FC 4406B000 */ mfc1 $a2, $f22 -/* B21E40 80241900 0C0B2190 */ jal set_float_variable -/* B21E44 80241904 4600A500 */ add.s $f20, $f20, $f0 -/* B21E48 80241908 0220202D */ daddu $a0, $s1, $zero -/* B21E4C 8024190C 3C05FE36 */ lui $a1, 0xfe36 -/* B21E50 80241910 4406A000 */ mfc1 $a2, $f20 -/* B21E54 80241914 0C0B2190 */ jal set_float_variable -/* B21E58 80241918 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B21E5C 8024191C 0220202D */ daddu $a0, $s1, $zero -/* B21E60 80241920 3C05FE36 */ lui $a1, 0xfe36 -/* B21E64 80241924 4406C000 */ mfc1 $a2, $f24 -/* B21E68 80241928 0C0B2190 */ jal set_float_variable -/* B21E6C 8024192C 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B21E70 80241930 8FBF0018 */ lw $ra, 0x18($sp) -/* B21E74 80241934 8FB10014 */ lw $s1, 0x14($sp) -/* B21E78 80241938 8FB00010 */ lw $s0, 0x10($sp) -/* B21E7C 8024193C D7B80030 */ ldc1 $f24, 0x30($sp) -/* B21E80 80241940 D7B60028 */ ldc1 $f22, 0x28($sp) -/* B21E84 80241944 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B21E88 80241948 24020002 */ addiu $v0, $zero, 2 -/* B21E8C 8024194C 03E00008 */ jr $ra -/* B21E90 80241950 27BD0038 */ addiu $sp, $sp, 0x38 -/* B21E94 80241954 00000000 */ nop -/* B21E98 80241958 00000000 */ nop -/* B21E9C 8024195C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s new file mode 100644 index 0000000000..519678798a --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_00/B216E0/func_80241868_B21DA8.s @@ -0,0 +1,66 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241868_B21DA8 +/* B21DA8 80241868 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* B21DAC 8024186C AFB10014 */ sw $s1, 0x14($sp) +/* B21DB0 80241870 0080882D */ daddu $s1, $a0, $zero +/* B21DB4 80241874 AFBF0018 */ sw $ra, 0x18($sp) +/* B21DB8 80241878 AFB00010 */ sw $s0, 0x10($sp) +/* B21DBC 8024187C F7B80030 */ sdc1 $f24, 0x30($sp) +/* B21DC0 80241880 F7B60028 */ sdc1 $f22, 0x28($sp) +/* B21DC4 80241884 F7B40020 */ sdc1 $f20, 0x20($sp) +/* B21DC8 80241888 0C00EAD2 */ jal get_npc_safe +/* B21DCC 8024188C 0000202D */ daddu $a0, $zero, $zero +/* B21DD0 80241890 0040802D */ daddu $s0, $v0, $zero +/* B21DD4 80241894 C614000C */ lwc1 $f20, 0xc($s0) +/* B21DD8 80241898 3C01432A */ lui $at, 0x432a +/* B21DDC 8024189C 4481C000 */ mtc1 $at, $f24 +/* B21DE0 802418A0 4600A507 */ neg.s $f20, $f20 +/* B21DE4 802418A4 0C00A8BB */ jal sin_deg +/* B21DE8 802418A8 4600A306 */ mov.s $f12, $f20 +/* B21DEC 802418AC 46180002 */ mul.s $f0, $f0, $f24 +/* B21DF0 802418B0 00000000 */ nop +/* B21DF4 802418B4 C6160038 */ lwc1 $f22, 0x38($s0) +/* B21DF8 802418B8 3C0141F0 */ lui $at, 0x41f0 +/* B21DFC 802418BC 44811000 */ mtc1 $at, $f2 +/* B21E00 802418C0 00000000 */ nop +/* B21E04 802418C4 4602B580 */ add.s $f22, $f22, $f2 +/* B21E08 802418C8 4600A306 */ mov.s $f12, $f20 +/* B21E0C 802418CC 0C00A8D4 */ jal cos_deg +/* B21E10 802418D0 4600B580 */ add.s $f22, $f22, $f0 +/* B21E14 802418D4 0220202D */ daddu $a0, $s1, $zero +/* B21E18 802418D8 46180002 */ mul.s $f0, $f0, $f24 +/* B21E1C 802418DC 00000000 */ nop +/* B21E20 802418E0 3C05FE36 */ lui $a1, 0xfe36 +/* B21E24 802418E4 34A53C80 */ ori $a1, $a1, 0x3c80 +/* B21E28 802418E8 C6180040 */ lwc1 $f24, 0x40($s0) +/* B21E2C 802418EC C614003C */ lwc1 $f20, 0x3c($s0) +/* B21E30 802418F0 4600C600 */ add.s $f24, $f24, $f0 +/* B21E34 802418F4 3C014248 */ lui $at, 0x4248 +/* B21E38 802418F8 44810000 */ mtc1 $at, $f0 +/* B21E3C 802418FC 4406B000 */ mfc1 $a2, $f22 +/* B21E40 80241900 0C0B2190 */ jal set_float_variable +/* B21E44 80241904 4600A500 */ add.s $f20, $f20, $f0 +/* B21E48 80241908 0220202D */ daddu $a0, $s1, $zero +/* B21E4C 8024190C 3C05FE36 */ lui $a1, 0xfe36 +/* B21E50 80241910 4406A000 */ mfc1 $a2, $f20 +/* B21E54 80241914 0C0B2190 */ jal set_float_variable +/* B21E58 80241918 34A53C81 */ ori $a1, $a1, 0x3c81 +/* B21E5C 8024191C 0220202D */ daddu $a0, $s1, $zero +/* B21E60 80241920 3C05FE36 */ lui $a1, 0xfe36 +/* B21E64 80241924 4406C000 */ mfc1 $a2, $f24 +/* B21E68 80241928 0C0B2190 */ jal set_float_variable +/* B21E6C 8024192C 34A53C82 */ ori $a1, $a1, 0x3c82 +/* B21E70 80241930 8FBF0018 */ lw $ra, 0x18($sp) +/* B21E74 80241934 8FB10014 */ lw $s1, 0x14($sp) +/* B21E78 80241938 8FB00010 */ lw $s0, 0x10($sp) +/* B21E7C 8024193C D7B80030 */ ldc1 $f24, 0x30($sp) +/* B21E80 80241940 D7B60028 */ ldc1 $f22, 0x28($sp) +/* B21E84 80241944 D7B40020 */ ldc1 $f20, 0x20($sp) +/* B21E88 80241948 24020002 */ addiu $v0, $zero, 2 +/* B21E8C 8024194C 03E00008 */ jr $ra +/* B21E90 80241950 27BD0038 */ addiu $sp, $sp, 0x38 +/* B21E94 80241954 00000000 */ nop +/* B21E98 80241958 00000000 */ nop +/* B21E9C 8024195C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_00/B21EA0/func_802419D0_B21F10.s b/asm/nonmatchings/world/area_jan/jan_00/B21EA0/func_802419D0_B21F10.s index 9c473e0b25..1ace4f1cc4 100644 --- a/asm/nonmatchings/world/area_jan/jan_00/B21EA0/func_802419D0_B21F10.s +++ b/asm/nonmatchings/world/area_jan/jan_00/B21EA0/func_802419D0_B21F10.s @@ -55,7 +55,7 @@ glabel func_802419D0_B21F10 /* B21FD8 80241A98 4405E000 */ mfc1 $a1, $f28 /* B21FDC 80241A9C 4406D000 */ mfc1 $a2, $f26 /* B21FE0 80241AA0 4407C000 */ mfc1 $a3, $f24 -/* B21FE4 80241AA4 0C090658 */ jal func_80241960 +/* B21FE4 80241AA4 0C090658 */ jal func_80241960_B21EA0 /* B21FE8 80241AA8 27A40010 */ addiu $a0, $sp, 0x10 /* B21FEC 80241AAC 27A40010 */ addiu $a0, $sp, 0x10 /* B21FF0 80241AB0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802419D0_B21F10 /* B22060 80241B20 4405E000 */ mfc1 $a1, $f28 /* B22064 80241B24 4406D000 */ mfc1 $a2, $f26 /* B22068 80241B28 4407C000 */ mfc1 $a3, $f24 -/* B2206C 80241B2C 0C090658 */ jal func_80241960 +/* B2206C 80241B2C 0C090658 */ jal func_80241960_B21EA0 /* B22070 80241B30 27A40010 */ addiu $a0, $sp, 0x10 /* B22074 80241B34 27A40010 */ addiu $a0, $sp, 0x10 /* B22078 80241B38 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8.s deleted file mode 100644 index 1b33c10ee0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A8 -/* B288D8 802408A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B288DC 802408AC AFB3001C */ sw $s3, 0x1c($sp) -/* B288E0 802408B0 0080982D */ daddu $s3, $a0, $zero -/* B288E4 802408B4 AFBF0020 */ sw $ra, 0x20($sp) -/* B288E8 802408B8 AFB20018 */ sw $s2, 0x18($sp) -/* B288EC 802408BC AFB10014 */ sw $s1, 0x14($sp) -/* B288F0 802408C0 AFB00010 */ sw $s0, 0x10($sp) -/* B288F4 802408C4 8E720148 */ lw $s2, 0x148($s3) -/* B288F8 802408C8 86440008 */ lh $a0, 8($s2) -/* B288FC 802408CC 0C00EABB */ jal get_npc_unsafe -/* B28900 802408D0 00A0882D */ daddu $s1, $a1, $zero -/* B28904 802408D4 8E240008 */ lw $a0, 8($s1) -/* B28908 802408D8 0040802D */ daddu $s0, $v0, $zero -/* B2890C 802408DC 00041FC2 */ srl $v1, $a0, 0x1f -/* B28910 802408E0 00832021 */ addu $a0, $a0, $v1 -/* B28914 802408E4 00042043 */ sra $a0, $a0, 1 -/* B28918 802408E8 0C00A67F */ jal rand_int -/* B2891C 802408EC 24840001 */ addiu $a0, $a0, 1 -/* B28920 802408F0 8E230008 */ lw $v1, 8($s1) -/* B28924 802408F4 240400B4 */ addiu $a0, $zero, 0xb4 -/* B28928 802408F8 00032FC2 */ srl $a1, $v1, 0x1f -/* B2892C 802408FC 00651821 */ addu $v1, $v1, $a1 -/* B28930 80240900 00031843 */ sra $v1, $v1, 1 -/* B28934 80240904 00621821 */ addu $v1, $v1, $v0 -/* B28938 80240908 0C00A67F */ jal rand_int -/* B2893C 8024090C A603008E */ sh $v1, 0x8e($s0) -/* B28940 80240910 C60C000C */ lwc1 $f12, 0xc($s0) -/* B28944 80240914 44820000 */ mtc1 $v0, $f0 -/* B28948 80240918 00000000 */ nop -/* B2894C 8024091C 46800020 */ cvt.s.w $f0, $f0 -/* B28950 80240920 46006300 */ add.s $f12, $f12, $f0 -/* B28954 80240924 3C0142B4 */ lui $at, 0x42b4 -/* B28958 80240928 44810000 */ mtc1 $at, $f0 -/* B2895C 8024092C 0C00A6C9 */ jal clamp_angle -/* B28960 80240930 46006301 */ sub.s $f12, $f12, $f0 -/* B28964 80240934 E600000C */ swc1 $f0, 0xc($s0) -/* B28968 80240938 8E4200CC */ lw $v0, 0xcc($s2) -/* B2896C 8024093C 8C420000 */ lw $v0, ($v0) -/* B28970 80240940 AE020028 */ sw $v0, 0x28($s0) -/* B28974 80240944 24020003 */ addiu $v0, $zero, 3 -/* B28978 80240948 AE620070 */ sw $v0, 0x70($s3) -/* B2897C 8024094C 8FBF0020 */ lw $ra, 0x20($sp) -/* B28980 80240950 8FB3001C */ lw $s3, 0x1c($sp) -/* B28984 80240954 8FB20018 */ lw $s2, 0x18($sp) -/* B28988 80240958 8FB10014 */ lw $s1, 0x14($sp) -/* B2898C 8024095C 8FB00010 */ lw $s0, 0x10($sp) -/* B28990 80240960 03E00008 */ jr $ra -/* B28994 80240964 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s new file mode 100644 index 0000000000..1bd60ee474 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_802408A8_B288D8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408A8_B288D8 +/* B288D8 802408A8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B288DC 802408AC AFB3001C */ sw $s3, 0x1c($sp) +/* B288E0 802408B0 0080982D */ daddu $s3, $a0, $zero +/* B288E4 802408B4 AFBF0020 */ sw $ra, 0x20($sp) +/* B288E8 802408B8 AFB20018 */ sw $s2, 0x18($sp) +/* B288EC 802408BC AFB10014 */ sw $s1, 0x14($sp) +/* B288F0 802408C0 AFB00010 */ sw $s0, 0x10($sp) +/* B288F4 802408C4 8E720148 */ lw $s2, 0x148($s3) +/* B288F8 802408C8 86440008 */ lh $a0, 8($s2) +/* B288FC 802408CC 0C00EABB */ jal get_npc_unsafe +/* B28900 802408D0 00A0882D */ daddu $s1, $a1, $zero +/* B28904 802408D4 8E240008 */ lw $a0, 8($s1) +/* B28908 802408D8 0040802D */ daddu $s0, $v0, $zero +/* B2890C 802408DC 00041FC2 */ srl $v1, $a0, 0x1f +/* B28910 802408E0 00832021 */ addu $a0, $a0, $v1 +/* B28914 802408E4 00042043 */ sra $a0, $a0, 1 +/* B28918 802408E8 0C00A67F */ jal rand_int +/* B2891C 802408EC 24840001 */ addiu $a0, $a0, 1 +/* B28920 802408F0 8E230008 */ lw $v1, 8($s1) +/* B28924 802408F4 240400B4 */ addiu $a0, $zero, 0xb4 +/* B28928 802408F8 00032FC2 */ srl $a1, $v1, 0x1f +/* B2892C 802408FC 00651821 */ addu $v1, $v1, $a1 +/* B28930 80240900 00031843 */ sra $v1, $v1, 1 +/* B28934 80240904 00621821 */ addu $v1, $v1, $v0 +/* B28938 80240908 0C00A67F */ jal rand_int +/* B2893C 8024090C A603008E */ sh $v1, 0x8e($s0) +/* B28940 80240910 C60C000C */ lwc1 $f12, 0xc($s0) +/* B28944 80240914 44820000 */ mtc1 $v0, $f0 +/* B28948 80240918 00000000 */ nop +/* B2894C 8024091C 46800020 */ cvt.s.w $f0, $f0 +/* B28950 80240920 46006300 */ add.s $f12, $f12, $f0 +/* B28954 80240924 3C0142B4 */ lui $at, 0x42b4 +/* B28958 80240928 44810000 */ mtc1 $at, $f0 +/* B2895C 8024092C 0C00A6C9 */ jal clamp_angle +/* B28960 80240930 46006301 */ sub.s $f12, $f12, $f0 +/* B28964 80240934 E600000C */ swc1 $f0, 0xc($s0) +/* B28968 80240938 8E4200CC */ lw $v0, 0xcc($s2) +/* B2896C 8024093C 8C420000 */ lw $v0, ($v0) +/* B28970 80240940 AE020028 */ sw $v0, 0x28($s0) +/* B28974 80240944 24020003 */ addiu $v0, $zero, 3 +/* B28978 80240948 AE620070 */ sw $v0, 0x70($s3) +/* B2897C 8024094C 8FBF0020 */ lw $ra, 0x20($sp) +/* B28980 80240950 8FB3001C */ lw $s3, 0x1c($sp) +/* B28984 80240954 8FB20018 */ lw $s2, 0x18($sp) +/* B28988 80240958 8FB10014 */ lw $s1, 0x14($sp) +/* B2898C 8024095C 8FB00010 */ lw $s0, 0x10($sp) +/* B28990 80240960 03E00008 */ jr $ra +/* B28994 80240964 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968.s deleted file mode 100644 index e5cd431e48..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240968 -/* B28998 80240968 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2899C 8024096C AFB40040 */ sw $s4, 0x40($sp) -/* B289A0 80240970 0080A02D */ daddu $s4, $a0, $zero -/* B289A4 80240974 AFBF0044 */ sw $ra, 0x44($sp) -/* B289A8 80240978 AFB3003C */ sw $s3, 0x3c($sp) -/* B289AC 8024097C AFB20038 */ sw $s2, 0x38($sp) -/* B289B0 80240980 AFB10034 */ sw $s1, 0x34($sp) -/* B289B4 80240984 AFB00030 */ sw $s0, 0x30($sp) -/* B289B8 80240988 8E920148 */ lw $s2, 0x148($s4) -/* B289BC 8024098C 00A0882D */ daddu $s1, $a1, $zero -/* B289C0 80240990 86440008 */ lh $a0, 8($s2) -/* B289C4 80240994 0C00EABB */ jal get_npc_unsafe -/* B289C8 80240998 00C0982D */ daddu $s3, $a2, $zero -/* B289CC 8024099C 8E230014 */ lw $v1, 0x14($s1) -/* B289D0 802409A0 0460002D */ bltz $v1, .L80240A58 -/* B289D4 802409A4 0040802D */ daddu $s0, $v0, $zero -/* B289D8 802409A8 0260202D */ daddu $a0, $s3, $zero -/* B289DC 802409AC AFA00010 */ sw $zero, 0x10($sp) -/* B289E0 802409B0 8E260024 */ lw $a2, 0x24($s1) -/* B289E4 802409B4 8E270028 */ lw $a3, 0x28($s1) -/* B289E8 802409B8 0C01242D */ jal func_800490B4 -/* B289EC 802409BC 0240282D */ daddu $a1, $s2, $zero -/* B289F0 802409C0 10400025 */ beqz $v0, .L80240A58 -/* B289F4 802409C4 0000202D */ daddu $a0, $zero, $zero -/* B289F8 802409C8 0200282D */ daddu $a1, $s0, $zero -/* B289FC 802409CC 0000302D */ daddu $a2, $zero, $zero -/* B28A00 802409D0 860300A8 */ lh $v1, 0xa8($s0) -/* B28A04 802409D4 3C013F80 */ lui $at, 0x3f80 -/* B28A08 802409D8 44810000 */ mtc1 $at, $f0 -/* B28A0C 802409DC 3C014000 */ lui $at, 0x4000 -/* B28A10 802409E0 44811000 */ mtc1 $at, $f2 -/* B28A14 802409E4 3C01C1A0 */ lui $at, 0xc1a0 -/* B28A18 802409E8 44812000 */ mtc1 $at, $f4 -/* B28A1C 802409EC 2402000F */ addiu $v0, $zero, 0xf -/* B28A20 802409F0 AFA2001C */ sw $v0, 0x1c($sp) -/* B28A24 802409F4 44833000 */ mtc1 $v1, $f6 -/* B28A28 802409F8 00000000 */ nop -/* B28A2C 802409FC 468031A0 */ cvt.s.w $f6, $f6 -/* B28A30 80240A00 44073000 */ mfc1 $a3, $f6 -/* B28A34 80240A04 27A20028 */ addiu $v0, $sp, 0x28 -/* B28A38 80240A08 AFA20020 */ sw $v0, 0x20($sp) -/* B28A3C 80240A0C E7A00010 */ swc1 $f0, 0x10($sp) -/* B28A40 80240A10 E7A20014 */ swc1 $f2, 0x14($sp) -/* B28A44 80240A14 0C01BFA4 */ jal fx_emote -/* B28A48 80240A18 E7A40018 */ swc1 $f4, 0x18($sp) -/* B28A4C 80240A1C 0200202D */ daddu $a0, $s0, $zero -/* B28A50 80240A20 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B28A54 80240A24 0C012530 */ jal func_800494C0 -/* B28A58 80240A28 3C060020 */ lui $a2, 0x20 -/* B28A5C 80240A2C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B28A60 80240A30 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B28A64 80240A34 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B28A68 80240A38 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B28A6C 80240A3C 8C460028 */ lw $a2, 0x28($v0) -/* B28A70 80240A40 0C00A720 */ jal atan2 -/* B28A74 80240A44 8C470030 */ lw $a3, 0x30($v0) -/* B28A78 80240A48 2402000C */ addiu $v0, $zero, 0xc -/* B28A7C 80240A4C E600000C */ swc1 $f0, 0xc($s0) -/* B28A80 80240A50 080902BB */ j .L80240AEC -/* B28A84 80240A54 AE820070 */ sw $v0, 0x70($s4) -.L80240A58: -/* B28A88 80240A58 8602008C */ lh $v0, 0x8c($s0) -/* B28A8C 80240A5C 14400023 */ bnez $v0, .L80240AEC -/* B28A90 80240A60 00000000 */ nop -/* B28A94 80240A64 9602008E */ lhu $v0, 0x8e($s0) -/* B28A98 80240A68 2442FFFF */ addiu $v0, $v0, -1 -/* B28A9C 80240A6C A602008E */ sh $v0, 0x8e($s0) -/* B28AA0 80240A70 00021400 */ sll $v0, $v0, 0x10 -/* B28AA4 80240A74 1C40001D */ bgtz $v0, .L80240AEC -/* B28AA8 80240A78 00000000 */ nop -/* B28AAC 80240A7C 8E820074 */ lw $v0, 0x74($s4) -/* B28AB0 80240A80 2442FFFF */ addiu $v0, $v0, -1 -/* B28AB4 80240A84 18400018 */ blez $v0, .L80240AE8 -/* B28AB8 80240A88 AE820074 */ sw $v0, 0x74($s4) -/* B28ABC 80240A8C C600000C */ lwc1 $f0, 0xc($s0) -/* B28AC0 80240A90 3C014334 */ lui $at, 0x4334 -/* B28AC4 80240A94 44816000 */ mtc1 $at, $f12 -/* B28AC8 80240A98 0C00A6C9 */ jal clamp_angle -/* B28ACC 80240A9C 460C0300 */ add.s $f12, $f0, $f12 -/* B28AD0 80240AA0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B28AD4 80240AA4 0C00A67F */ jal rand_int -/* B28AD8 80240AA8 E600000C */ swc1 $f0, 0xc($s0) -/* B28ADC 80240AAC 3C032E8B */ lui $v1, 0x2e8b -/* B28AE0 80240AB0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* B28AE4 80240AB4 00430018 */ mult $v0, $v1 -/* B28AE8 80240AB8 00021FC3 */ sra $v1, $v0, 0x1f -/* B28AEC 80240ABC 00004010 */ mfhi $t0 -/* B28AF0 80240AC0 00082043 */ sra $a0, $t0, 1 -/* B28AF4 80240AC4 00832023 */ subu $a0, $a0, $v1 -/* B28AF8 80240AC8 00041840 */ sll $v1, $a0, 1 -/* B28AFC 80240ACC 00641821 */ addu $v1, $v1, $a0 -/* B28B00 80240AD0 00031880 */ sll $v1, $v1, 2 -/* B28B04 80240AD4 00641823 */ subu $v1, $v1, $a0 -/* B28B08 80240AD8 00431023 */ subu $v0, $v0, $v1 -/* B28B0C 80240ADC 24420005 */ addiu $v0, $v0, 5 -/* B28B10 80240AE0 080902BB */ j .L80240AEC -/* B28B14 80240AE4 A602008E */ sh $v0, 0x8e($s0) -.L80240AE8: -/* B28B18 80240AE8 AE800070 */ sw $zero, 0x70($s4) -.L80240AEC: -/* B28B1C 80240AEC 8FBF0044 */ lw $ra, 0x44($sp) -/* B28B20 80240AF0 8FB40040 */ lw $s4, 0x40($sp) -/* B28B24 80240AF4 8FB3003C */ lw $s3, 0x3c($sp) -/* B28B28 80240AF8 8FB20038 */ lw $s2, 0x38($sp) -/* B28B2C 80240AFC 8FB10034 */ lw $s1, 0x34($sp) -/* B28B30 80240B00 8FB00030 */ lw $s0, 0x30($sp) -/* B28B34 80240B04 03E00008 */ jr $ra -/* B28B38 80240B08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968_B28998.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968_B28998.s new file mode 100644 index 0000000000..4b99f05e6c --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240968_B28998.s @@ -0,0 +1,112 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240968_B28998 +/* B28998 80240968 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B2899C 8024096C AFB40040 */ sw $s4, 0x40($sp) +/* B289A0 80240970 0080A02D */ daddu $s4, $a0, $zero +/* B289A4 80240974 AFBF0044 */ sw $ra, 0x44($sp) +/* B289A8 80240978 AFB3003C */ sw $s3, 0x3c($sp) +/* B289AC 8024097C AFB20038 */ sw $s2, 0x38($sp) +/* B289B0 80240980 AFB10034 */ sw $s1, 0x34($sp) +/* B289B4 80240984 AFB00030 */ sw $s0, 0x30($sp) +/* B289B8 80240988 8E920148 */ lw $s2, 0x148($s4) +/* B289BC 8024098C 00A0882D */ daddu $s1, $a1, $zero +/* B289C0 80240990 86440008 */ lh $a0, 8($s2) +/* B289C4 80240994 0C00EABB */ jal get_npc_unsafe +/* B289C8 80240998 00C0982D */ daddu $s3, $a2, $zero +/* B289CC 8024099C 8E230014 */ lw $v1, 0x14($s1) +/* B289D0 802409A0 0460002D */ bltz $v1, .L80240A58 +/* B289D4 802409A4 0040802D */ daddu $s0, $v0, $zero +/* B289D8 802409A8 0260202D */ daddu $a0, $s3, $zero +/* B289DC 802409AC AFA00010 */ sw $zero, 0x10($sp) +/* B289E0 802409B0 8E260024 */ lw $a2, 0x24($s1) +/* B289E4 802409B4 8E270028 */ lw $a3, 0x28($s1) +/* B289E8 802409B8 0C01242D */ jal func_800490B4 +/* B289EC 802409BC 0240282D */ daddu $a1, $s2, $zero +/* B289F0 802409C0 10400025 */ beqz $v0, .L80240A58 +/* B289F4 802409C4 0000202D */ daddu $a0, $zero, $zero +/* B289F8 802409C8 0200282D */ daddu $a1, $s0, $zero +/* B289FC 802409CC 0000302D */ daddu $a2, $zero, $zero +/* B28A00 802409D0 860300A8 */ lh $v1, 0xa8($s0) +/* B28A04 802409D4 3C013F80 */ lui $at, 0x3f80 +/* B28A08 802409D8 44810000 */ mtc1 $at, $f0 +/* B28A0C 802409DC 3C014000 */ lui $at, 0x4000 +/* B28A10 802409E0 44811000 */ mtc1 $at, $f2 +/* B28A14 802409E4 3C01C1A0 */ lui $at, 0xc1a0 +/* B28A18 802409E8 44812000 */ mtc1 $at, $f4 +/* B28A1C 802409EC 2402000F */ addiu $v0, $zero, 0xf +/* B28A20 802409F0 AFA2001C */ sw $v0, 0x1c($sp) +/* B28A24 802409F4 44833000 */ mtc1 $v1, $f6 +/* B28A28 802409F8 00000000 */ nop +/* B28A2C 802409FC 468031A0 */ cvt.s.w $f6, $f6 +/* B28A30 80240A00 44073000 */ mfc1 $a3, $f6 +/* B28A34 80240A04 27A20028 */ addiu $v0, $sp, 0x28 +/* B28A38 80240A08 AFA20020 */ sw $v0, 0x20($sp) +/* B28A3C 80240A0C E7A00010 */ swc1 $f0, 0x10($sp) +/* B28A40 80240A10 E7A20014 */ swc1 $f2, 0x14($sp) +/* B28A44 80240A14 0C01BFA4 */ jal fx_emote +/* B28A48 80240A18 E7A40018 */ swc1 $f4, 0x18($sp) +/* B28A4C 80240A1C 0200202D */ daddu $a0, $s0, $zero +/* B28A50 80240A20 240502F4 */ addiu $a1, $zero, 0x2f4 +/* B28A54 80240A24 0C012530 */ jal func_800494C0 +/* B28A58 80240A28 3C060020 */ lui $a2, 0x20 +/* B28A5C 80240A2C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B28A60 80240A30 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B28A64 80240A34 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B28A68 80240A38 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B28A6C 80240A3C 8C460028 */ lw $a2, 0x28($v0) +/* B28A70 80240A40 0C00A720 */ jal atan2 +/* B28A74 80240A44 8C470030 */ lw $a3, 0x30($v0) +/* B28A78 80240A48 2402000C */ addiu $v0, $zero, 0xc +/* B28A7C 80240A4C E600000C */ swc1 $f0, 0xc($s0) +/* B28A80 80240A50 080902BB */ j .L80240AEC +/* B28A84 80240A54 AE820070 */ sw $v0, 0x70($s4) +.L80240A58: +/* B28A88 80240A58 8602008C */ lh $v0, 0x8c($s0) +/* B28A8C 80240A5C 14400023 */ bnez $v0, .L80240AEC +/* B28A90 80240A60 00000000 */ nop +/* B28A94 80240A64 9602008E */ lhu $v0, 0x8e($s0) +/* B28A98 80240A68 2442FFFF */ addiu $v0, $v0, -1 +/* B28A9C 80240A6C A602008E */ sh $v0, 0x8e($s0) +/* B28AA0 80240A70 00021400 */ sll $v0, $v0, 0x10 +/* B28AA4 80240A74 1C40001D */ bgtz $v0, .L80240AEC +/* B28AA8 80240A78 00000000 */ nop +/* B28AAC 80240A7C 8E820074 */ lw $v0, 0x74($s4) +/* B28AB0 80240A80 2442FFFF */ addiu $v0, $v0, -1 +/* B28AB4 80240A84 18400018 */ blez $v0, .L80240AE8 +/* B28AB8 80240A88 AE820074 */ sw $v0, 0x74($s4) +/* B28ABC 80240A8C C600000C */ lwc1 $f0, 0xc($s0) +/* B28AC0 80240A90 3C014334 */ lui $at, 0x4334 +/* B28AC4 80240A94 44816000 */ mtc1 $at, $f12 +/* B28AC8 80240A98 0C00A6C9 */ jal clamp_angle +/* B28ACC 80240A9C 460C0300 */ add.s $f12, $f0, $f12 +/* B28AD0 80240AA0 240403E8 */ addiu $a0, $zero, 0x3e8 +/* B28AD4 80240AA4 0C00A67F */ jal rand_int +/* B28AD8 80240AA8 E600000C */ swc1 $f0, 0xc($s0) +/* B28ADC 80240AAC 3C032E8B */ lui $v1, 0x2e8b +/* B28AE0 80240AB0 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* B28AE4 80240AB4 00430018 */ mult $v0, $v1 +/* B28AE8 80240AB8 00021FC3 */ sra $v1, $v0, 0x1f +/* B28AEC 80240ABC 00004010 */ mfhi $t0 +/* B28AF0 80240AC0 00082043 */ sra $a0, $t0, 1 +/* B28AF4 80240AC4 00832023 */ subu $a0, $a0, $v1 +/* B28AF8 80240AC8 00041840 */ sll $v1, $a0, 1 +/* B28AFC 80240ACC 00641821 */ addu $v1, $v1, $a0 +/* B28B00 80240AD0 00031880 */ sll $v1, $v1, 2 +/* B28B04 80240AD4 00641823 */ subu $v1, $v1, $a0 +/* B28B08 80240AD8 00431023 */ subu $v0, $v0, $v1 +/* B28B0C 80240ADC 24420005 */ addiu $v0, $v0, 5 +/* B28B10 80240AE0 080902BB */ j .L80240AEC +/* B28B14 80240AE4 A602008E */ sh $v0, 0x8e($s0) +.L80240AE8: +/* B28B18 80240AE8 AE800070 */ sw $zero, 0x70($s4) +.L80240AEC: +/* B28B1C 80240AEC 8FBF0044 */ lw $ra, 0x44($sp) +/* B28B20 80240AF0 8FB40040 */ lw $s4, 0x40($sp) +/* B28B24 80240AF4 8FB3003C */ lw $s3, 0x3c($sp) +/* B28B28 80240AF8 8FB20038 */ lw $s2, 0x38($sp) +/* B28B2C 80240AFC 8FB10034 */ lw $s1, 0x34($sp) +/* B28B30 80240B00 8FB00030 */ lw $s0, 0x30($sp) +/* B28B34 80240B04 03E00008 */ jr $ra +/* B28B38 80240B08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s index ab922d92fa..e0d78b39c2 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80240F30_B28F60.s @@ -95,17 +95,17 @@ glabel func_80240F30_B28F60 /* B290C0 80241090 00000000 */ nop /* B290C4 80241094 0260202D */ daddu $a0, $s3, $zero /* B290C8 80241098 0280282D */ daddu $a1, $s4, $zero -/* B290CC 8024109C 0C0900D0 */ jal func_80240340 +/* B290CC 8024109C 0C0900D0 */ jal func_80240340_B28370 /* B290D0 802410A0 0200302D */ daddu $a2, $s0, $zero /* B290D4 802410A4 0260202D */ daddu $a0, $s3, $zero /* B290D8 802410A8 0280282D */ daddu $a1, $s4, $zero -/* B290DC 802410AC 0C09015C */ jal func_80240570 +/* B290DC 802410AC 0C09015C */ jal func_80240570_B285A0 /* B290E0 802410B0 0200302D */ daddu $a2, $s0, $zero /* B290E4 802410B4 0809044C */ j .L80241130 /* B290E8 802410B8 0000102D */ daddu $v0, $zero, $zero /* B290EC 802410BC 0260202D */ daddu $a0, $s3, $zero /* B290F0 802410C0 0280282D */ daddu $a1, $s4, $zero -/* B290F4 802410C4 0C09022A */ jal func_802408A8 +/* B290F4 802410C4 0C09022A */ jal func_802408A8_B288D8 /* B290F8 802410C8 0200302D */ daddu $a2, $s0, $zero /* B290FC 802410CC 8E630070 */ lw $v1, 0x70($s3) /* B29100 802410D0 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80240F30_B28F60 /* B29108 802410D8 0000102D */ daddu $v0, $zero, $zero /* B2910C 802410DC 0260202D */ daddu $a0, $s3, $zero /* B29110 802410E0 0280282D */ daddu $a1, $s4, $zero -/* B29114 802410E4 0C09025A */ jal func_80240968 +/* B29114 802410E4 0C09025A */ jal func_80240968_B28998 /* B29118 802410E8 0200302D */ daddu $a2, $s0, $zero /* B2911C 802410EC 0809044C */ j .L80241130 /* B29120 802410F0 0000102D */ daddu $v0, $zero, $zero /* B29124 802410F4 0260202D */ daddu $a0, $s3, $zero /* B29128 802410F8 0280282D */ daddu $a1, $s4, $zero -/* B2912C 802410FC 0C0902C3 */ jal func_80240B0C +/* B2912C 802410FC 0C0902C3 */ jal func_80240B0C_B28B3C /* B29130 80241100 0200302D */ daddu $a2, $s0, $zero /* B29134 80241104 0260202D */ daddu $a0, $s3, $zero /* B29138 80241108 0280282D */ daddu $a1, $s4, $zero -/* B2913C 8024110C 0C0902FB */ jal func_80240BEC +/* B2913C 8024110C 0C0902FB */ jal func_80240BEC_B28C1C /* B29140 80241110 0200302D */ daddu $a2, $s0, $zero /* B29144 80241114 0809044C */ j .L80241130 /* B29148 80241118 0000102D */ daddu $v0, $zero, $zero /* B2914C 8024111C 0260202D */ daddu $a0, $s3, $zero /* B29150 80241120 0280282D */ daddu $a1, $s4, $zero -/* B29154 80241124 0C0903BB */ jal func_80240EEC +/* B29154 80241124 0C0903BB */ jal func_80240EEC_B28F1C /* B29158 80241128 0200302D */ daddu $a2, $s0, $zero .L8024112C: /* B2915C 8024112C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170.s deleted file mode 100644 index 59a4277315..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241170 -/* B291A0 80241170 3C03800B */ lui $v1, %hi(gCameras) -/* B291A4 80241174 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* B291A8 80241178 94620000 */ lhu $v0, ($v1) -/* B291AC 8024117C 3042EFFF */ andi $v0, $v0, 0xefff -/* B291B0 80241180 A4620000 */ sh $v0, ($v1) -/* B291B4 80241184 03E00008 */ jr $ra -/* B291B8 80241188 24020002 */ addiu $v0, $zero, 2 -/* B291BC 8024118C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s new file mode 100644 index 0000000000..6f285db813 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_01/B28030/func_80241170_B291A0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241170_B291A0 +/* B291A0 80241170 3C03800B */ lui $v1, %hi(gCameras) +/* B291A4 80241174 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* B291A8 80241178 94620000 */ lhu $v0, ($v1) +/* B291AC 8024117C 3042EFFF */ andi $v0, $v0, 0xefff +/* B291B0 80241180 A4620000 */ sh $v0, ($v1) +/* B291B4 80241184 03E00008 */ jr $ra +/* B291B8 80241188 24020002 */ addiu $v0, $zero, 2 +/* B291BC 8024118C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_01/B291C0/func_80241200_B29230.s b/asm/nonmatchings/world/area_jan/jan_01/B291C0/func_80241200_B29230.s index 517c004de9..f2ef1f4ed3 100644 --- a/asm/nonmatchings/world/area_jan/jan_01/B291C0/func_80241200_B29230.s +++ b/asm/nonmatchings/world/area_jan/jan_01/B291C0/func_80241200_B29230.s @@ -55,7 +55,7 @@ glabel func_80241200_B29230 /* B292F8 802412C8 4405E000 */ mfc1 $a1, $f28 /* B292FC 802412CC 4406D000 */ mfc1 $a2, $f26 /* B29300 802412D0 4407C000 */ mfc1 $a3, $f24 -/* B29304 802412D4 0C090464 */ jal func_80241190 +/* B29304 802412D4 0C090464 */ jal func_80241190_B291C0 /* B29308 802412D8 27A40010 */ addiu $a0, $sp, 0x10 /* B2930C 802412DC 27A40010 */ addiu $a0, $sp, 0x10 /* B29310 802412E0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80241200_B29230 /* B29380 80241350 4405E000 */ mfc1 $a1, $f28 /* B29384 80241354 4406D000 */ mfc1 $a2, $f26 /* B29388 80241358 4407C000 */ mfc1 $a3, $f24 -/* B2938C 8024135C 0C090464 */ jal func_80241190 +/* B2938C 8024135C 0C090464 */ jal func_80241190_B291C0 /* B29390 80241360 27A40010 */ addiu $a0, $sp, 0x10 /* B29394 80241364 27A40010 */ addiu $a0, $sp, 0x10 /* B29398 80241368 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430.s deleted file mode 100644 index f0475b2b61..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240430 -/* B2C8A0 80240430 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2C8A4 80240434 AFB50024 */ sw $s5, 0x24($sp) -/* B2C8A8 80240438 0080A82D */ daddu $s5, $a0, $zero -/* B2C8AC 8024043C AFBF002C */ sw $ra, 0x2c($sp) -/* B2C8B0 80240440 AFB60028 */ sw $s6, 0x28($sp) -/* B2C8B4 80240444 AFB40020 */ sw $s4, 0x20($sp) -/* B2C8B8 80240448 AFB3001C */ sw $s3, 0x1c($sp) -/* B2C8BC 8024044C AFB20018 */ sw $s2, 0x18($sp) -/* B2C8C0 80240450 AFB10014 */ sw $s1, 0x14($sp) -/* B2C8C4 80240454 AFB00010 */ sw $s0, 0x10($sp) -/* B2C8C8 80240458 F7B80040 */ sdc1 $f24, 0x40($sp) -/* B2C8CC 8024045C F7B60038 */ sdc1 $f22, 0x38($sp) -/* B2C8D0 80240460 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B2C8D4 80240464 8EB30148 */ lw $s3, 0x148($s5) -/* B2C8D8 80240468 86640008 */ lh $a0, 8($s3) -/* B2C8DC 8024046C 0C00EABB */ jal get_npc_unsafe -/* B2C8E0 80240470 00A0B02D */ daddu $s6, $a1, $zero -/* B2C8E4 80240474 0040A02D */ daddu $s4, $v0, $zero -/* B2C8E8 80240478 AEA00074 */ sw $zero, 0x74($s5) -/* B2C8EC 8024047C C6980038 */ lwc1 $f24, 0x38($s4) -/* B2C8F0 80240480 C6960040 */ lwc1 $f22, 0x40($s4) -/* B2C8F4 80240484 0000902D */ daddu $s2, $zero, $zero -/* B2C8F8 80240488 AEA00078 */ sw $zero, 0x78($s5) -/* B2C8FC 8024048C 8E6300D0 */ lw $v1, 0xd0($s3) -/* B2C900 80240490 8C620000 */ lw $v0, ($v1) -/* B2C904 80240494 3C0146FF */ lui $at, 0x46ff -/* B2C908 80240498 3421FE00 */ ori $at, $at, 0xfe00 -/* B2C90C 8024049C 4481A000 */ mtc1 $at, $f20 -/* B2C910 802404A0 18400018 */ blez $v0, .L80240504 -/* B2C914 802404A4 0240802D */ daddu $s0, $s2, $zero -/* B2C918 802404A8 0240882D */ daddu $s1, $s2, $zero -.L802404AC: -/* B2C91C 802404AC 02231021 */ addu $v0, $s1, $v1 -/* B2C920 802404B0 4600C306 */ mov.s $f12, $f24 -/* B2C924 802404B4 C4440004 */ lwc1 $f4, 4($v0) -/* B2C928 802404B8 46802120 */ cvt.s.w $f4, $f4 -/* B2C92C 802404BC 44062000 */ mfc1 $a2, $f4 -/* B2C930 802404C0 C444000C */ lwc1 $f4, 0xc($v0) -/* B2C934 802404C4 46802120 */ cvt.s.w $f4, $f4 -/* B2C938 802404C8 44072000 */ mfc1 $a3, $f4 -/* B2C93C 802404CC 0C00A7B5 */ jal dist2D -/* B2C940 802404D0 4600B386 */ mov.s $f14, $f22 -/* B2C944 802404D4 4614003C */ c.lt.s $f0, $f20 -/* B2C948 802404D8 00000000 */ nop -/* B2C94C 802404DC 45000003 */ bc1f .L802404EC -/* B2C950 802404E0 2631000C */ addiu $s1, $s1, 0xc -/* B2C954 802404E4 46000506 */ mov.s $f20, $f0 -/* B2C958 802404E8 AEB20078 */ sw $s2, 0x78($s5) -.L802404EC: -/* B2C95C 802404EC 8E6300D0 */ lw $v1, 0xd0($s3) -/* B2C960 802404F0 26100001 */ addiu $s0, $s0, 1 -/* B2C964 802404F4 8C620000 */ lw $v0, ($v1) -/* B2C968 802404F8 0202102A */ slt $v0, $s0, $v0 -/* B2C96C 802404FC 1440FFEB */ bnez $v0, .L802404AC -/* B2C970 80240500 26520001 */ addiu $s2, $s2, 1 -.L80240504: -/* B2C974 80240504 8E6200CC */ lw $v0, 0xcc($s3) -/* B2C978 80240508 8C420004 */ lw $v0, 4($v0) -/* B2C97C 8024050C AE820028 */ sw $v0, 0x28($s4) -/* B2C980 80240510 8E6200D0 */ lw $v0, 0xd0($s3) -/* B2C984 80240514 8C42007C */ lw $v0, 0x7c($v0) -/* B2C988 80240518 04410004 */ bgez $v0, .L8024052C -/* B2C98C 8024051C 00000000 */ nop -/* B2C990 80240520 C6C00000 */ lwc1 $f0, ($s6) -/* B2C994 80240524 08090153 */ j .L8024054C -/* B2C998 80240528 E6800018 */ swc1 $f0, 0x18($s4) -.L8024052C: -/* B2C99C 8024052C 3C018025 */ lui $at, 0x8025 -/* B2C9A0 80240530 D42285C0 */ ldc1 $f2, -0x7a40($at) -/* B2C9A4 80240534 44820000 */ mtc1 $v0, $f0 -/* B2C9A8 80240538 00000000 */ nop -/* B2C9AC 8024053C 46800021 */ cvt.d.w $f0, $f0 -/* B2C9B0 80240540 46220003 */ div.d $f0, $f0, $f2 -/* B2C9B4 80240544 46200020 */ cvt.s.d $f0, $f0 -/* B2C9B8 80240548 E6800018 */ swc1 $f0, 0x18($s4) -.L8024054C: -/* B2C9BC 8024054C 24020001 */ addiu $v0, $zero, 1 -/* B2C9C0 80240550 AEA20070 */ sw $v0, 0x70($s5) -/* B2C9C4 80240554 8FBF002C */ lw $ra, 0x2c($sp) -/* B2C9C8 80240558 8FB60028 */ lw $s6, 0x28($sp) -/* B2C9CC 8024055C 8FB50024 */ lw $s5, 0x24($sp) -/* B2C9D0 80240560 8FB40020 */ lw $s4, 0x20($sp) -/* B2C9D4 80240564 8FB3001C */ lw $s3, 0x1c($sp) -/* B2C9D8 80240568 8FB20018 */ lw $s2, 0x18($sp) -/* B2C9DC 8024056C 8FB10014 */ lw $s1, 0x14($sp) -/* B2C9E0 80240570 8FB00010 */ lw $s0, 0x10($sp) -/* B2C9E4 80240574 D7B80040 */ ldc1 $f24, 0x40($sp) -/* B2C9E8 80240578 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B2C9EC 8024057C D7B40030 */ ldc1 $f20, 0x30($sp) -/* B2C9F0 80240580 03E00008 */ jr $ra -/* B2C9F4 80240584 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s new file mode 100644 index 0000000000..37714280b5 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240430_B2C8A0.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240430_B2C8A0 +/* B2C8A0 80240430 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B2C8A4 80240434 AFB50024 */ sw $s5, 0x24($sp) +/* B2C8A8 80240438 0080A82D */ daddu $s5, $a0, $zero +/* B2C8AC 8024043C AFBF002C */ sw $ra, 0x2c($sp) +/* B2C8B0 80240440 AFB60028 */ sw $s6, 0x28($sp) +/* B2C8B4 80240444 AFB40020 */ sw $s4, 0x20($sp) +/* B2C8B8 80240448 AFB3001C */ sw $s3, 0x1c($sp) +/* B2C8BC 8024044C AFB20018 */ sw $s2, 0x18($sp) +/* B2C8C0 80240450 AFB10014 */ sw $s1, 0x14($sp) +/* B2C8C4 80240454 AFB00010 */ sw $s0, 0x10($sp) +/* B2C8C8 80240458 F7B80040 */ sdc1 $f24, 0x40($sp) +/* B2C8CC 8024045C F7B60038 */ sdc1 $f22, 0x38($sp) +/* B2C8D0 80240460 F7B40030 */ sdc1 $f20, 0x30($sp) +/* B2C8D4 80240464 8EB30148 */ lw $s3, 0x148($s5) +/* B2C8D8 80240468 86640008 */ lh $a0, 8($s3) +/* B2C8DC 8024046C 0C00EABB */ jal get_npc_unsafe +/* B2C8E0 80240470 00A0B02D */ daddu $s6, $a1, $zero +/* B2C8E4 80240474 0040A02D */ daddu $s4, $v0, $zero +/* B2C8E8 80240478 AEA00074 */ sw $zero, 0x74($s5) +/* B2C8EC 8024047C C6980038 */ lwc1 $f24, 0x38($s4) +/* B2C8F0 80240480 C6960040 */ lwc1 $f22, 0x40($s4) +/* B2C8F4 80240484 0000902D */ daddu $s2, $zero, $zero +/* B2C8F8 80240488 AEA00078 */ sw $zero, 0x78($s5) +/* B2C8FC 8024048C 8E6300D0 */ lw $v1, 0xd0($s3) +/* B2C900 80240490 8C620000 */ lw $v0, ($v1) +/* B2C904 80240494 3C0146FF */ lui $at, 0x46ff +/* B2C908 80240498 3421FE00 */ ori $at, $at, 0xfe00 +/* B2C90C 8024049C 4481A000 */ mtc1 $at, $f20 +/* B2C910 802404A0 18400018 */ blez $v0, .L80240504 +/* B2C914 802404A4 0240802D */ daddu $s0, $s2, $zero +/* B2C918 802404A8 0240882D */ daddu $s1, $s2, $zero +.L802404AC: +/* B2C91C 802404AC 02231021 */ addu $v0, $s1, $v1 +/* B2C920 802404B0 4600C306 */ mov.s $f12, $f24 +/* B2C924 802404B4 C4440004 */ lwc1 $f4, 4($v0) +/* B2C928 802404B8 46802120 */ cvt.s.w $f4, $f4 +/* B2C92C 802404BC 44062000 */ mfc1 $a2, $f4 +/* B2C930 802404C0 C444000C */ lwc1 $f4, 0xc($v0) +/* B2C934 802404C4 46802120 */ cvt.s.w $f4, $f4 +/* B2C938 802404C8 44072000 */ mfc1 $a3, $f4 +/* B2C93C 802404CC 0C00A7B5 */ jal dist2D +/* B2C940 802404D0 4600B386 */ mov.s $f14, $f22 +/* B2C944 802404D4 4614003C */ c.lt.s $f0, $f20 +/* B2C948 802404D8 00000000 */ nop +/* B2C94C 802404DC 45000003 */ bc1f .L802404EC +/* B2C950 802404E0 2631000C */ addiu $s1, $s1, 0xc +/* B2C954 802404E4 46000506 */ mov.s $f20, $f0 +/* B2C958 802404E8 AEB20078 */ sw $s2, 0x78($s5) +.L802404EC: +/* B2C95C 802404EC 8E6300D0 */ lw $v1, 0xd0($s3) +/* B2C960 802404F0 26100001 */ addiu $s0, $s0, 1 +/* B2C964 802404F4 8C620000 */ lw $v0, ($v1) +/* B2C968 802404F8 0202102A */ slt $v0, $s0, $v0 +/* B2C96C 802404FC 1440FFEB */ bnez $v0, .L802404AC +/* B2C970 80240500 26520001 */ addiu $s2, $s2, 1 +.L80240504: +/* B2C974 80240504 8E6200CC */ lw $v0, 0xcc($s3) +/* B2C978 80240508 8C420004 */ lw $v0, 4($v0) +/* B2C97C 8024050C AE820028 */ sw $v0, 0x28($s4) +/* B2C980 80240510 8E6200D0 */ lw $v0, 0xd0($s3) +/* B2C984 80240514 8C42007C */ lw $v0, 0x7c($v0) +/* B2C988 80240518 04410004 */ bgez $v0, .L8024052C +/* B2C98C 8024051C 00000000 */ nop +/* B2C990 80240520 C6C00000 */ lwc1 $f0, ($s6) +/* B2C994 80240524 08090153 */ j .L8024054C +/* B2C998 80240528 E6800018 */ swc1 $f0, 0x18($s4) +.L8024052C: +/* B2C99C 8024052C 3C018025 */ lui $at, 0x8025 +/* B2C9A0 80240530 D42285C0 */ ldc1 $f2, -0x7a40($at) +/* B2C9A4 80240534 44820000 */ mtc1 $v0, $f0 +/* B2C9A8 80240538 00000000 */ nop +/* B2C9AC 8024053C 46800021 */ cvt.d.w $f0, $f0 +/* B2C9B0 80240540 46220003 */ div.d $f0, $f0, $f2 +/* B2C9B4 80240544 46200020 */ cvt.s.d $f0, $f0 +/* B2C9B8 80240548 E6800018 */ swc1 $f0, 0x18($s4) +.L8024054C: +/* B2C9BC 8024054C 24020001 */ addiu $v0, $zero, 1 +/* B2C9C0 80240550 AEA20070 */ sw $v0, 0x70($s5) +/* B2C9C4 80240554 8FBF002C */ lw $ra, 0x2c($sp) +/* B2C9C8 80240558 8FB60028 */ lw $s6, 0x28($sp) +/* B2C9CC 8024055C 8FB50024 */ lw $s5, 0x24($sp) +/* B2C9D0 80240560 8FB40020 */ lw $s4, 0x20($sp) +/* B2C9D4 80240564 8FB3001C */ lw $s3, 0x1c($sp) +/* B2C9D8 80240568 8FB20018 */ lw $s2, 0x18($sp) +/* B2C9DC 8024056C 8FB10014 */ lw $s1, 0x14($sp) +/* B2C9E0 80240570 8FB00010 */ lw $s0, 0x10($sp) +/* B2C9E4 80240574 D7B80040 */ ldc1 $f24, 0x40($sp) +/* B2C9E8 80240578 D7B60038 */ ldc1 $f22, 0x38($sp) +/* B2C9EC 8024057C D7B40030 */ ldc1 $f20, 0x30($sp) +/* B2C9F0 80240580 03E00008 */ jr $ra +/* B2C9F4 80240584 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588.s deleted file mode 100644 index 34c383cc3d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240588 -/* B2C9F8 80240588 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B2C9FC 8024058C AFB20038 */ sw $s2, 0x38($sp) -/* B2CA00 80240590 0080902D */ daddu $s2, $a0, $zero -/* B2CA04 80240594 AFBF0044 */ sw $ra, 0x44($sp) -/* B2CA08 80240598 AFB40040 */ sw $s4, 0x40($sp) -/* B2CA0C 8024059C AFB3003C */ sw $s3, 0x3c($sp) -/* B2CA10 802405A0 AFB10034 */ sw $s1, 0x34($sp) -/* B2CA14 802405A4 AFB00030 */ sw $s0, 0x30($sp) -/* B2CA18 802405A8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B2CA1C 802405AC F7B40048 */ sdc1 $f20, 0x48($sp) -/* B2CA20 802405B0 8E510148 */ lw $s1, 0x148($s2) -/* B2CA24 802405B4 00A0982D */ daddu $s3, $a1, $zero -/* B2CA28 802405B8 86240008 */ lh $a0, 8($s1) -/* B2CA2C 802405BC 0C00EABB */ jal get_npc_unsafe -/* B2CA30 802405C0 00C0A02D */ daddu $s4, $a2, $zero -/* B2CA34 802405C4 8E630014 */ lw $v1, 0x14($s3) -/* B2CA38 802405C8 04600030 */ bltz $v1, .L8024068C -/* B2CA3C 802405CC 0040802D */ daddu $s0, $v0, $zero -/* B2CA40 802405D0 8E420074 */ lw $v0, 0x74($s2) -/* B2CA44 802405D4 1C40002C */ bgtz $v0, .L80240688 -/* B2CA48 802405D8 2442FFFF */ addiu $v0, $v0, -1 -/* B2CA4C 802405DC 0280202D */ daddu $a0, $s4, $zero -/* B2CA50 802405E0 AE430074 */ sw $v1, 0x74($s2) -/* B2CA54 802405E4 AFA00010 */ sw $zero, 0x10($sp) -/* B2CA58 802405E8 8E66000C */ lw $a2, 0xc($s3) -/* B2CA5C 802405EC 8E670010 */ lw $a3, 0x10($s3) -/* B2CA60 802405F0 0C01242D */ jal func_800490B4 -/* B2CA64 802405F4 0220282D */ daddu $a1, $s1, $zero -/* B2CA68 802405F8 10400021 */ beqz $v0, .L80240680 -/* B2CA6C 802405FC 0000202D */ daddu $a0, $zero, $zero -/* B2CA70 80240600 0200282D */ daddu $a1, $s0, $zero -/* B2CA74 80240604 0000302D */ daddu $a2, $zero, $zero -/* B2CA78 80240608 860300A8 */ lh $v1, 0xa8($s0) -/* B2CA7C 8024060C 3C013F80 */ lui $at, 0x3f80 -/* B2CA80 80240610 44810000 */ mtc1 $at, $f0 -/* B2CA84 80240614 3C014000 */ lui $at, 0x4000 -/* B2CA88 80240618 44811000 */ mtc1 $at, $f2 -/* B2CA8C 8024061C 3C01C1A0 */ lui $at, 0xc1a0 -/* B2CA90 80240620 44812000 */ mtc1 $at, $f4 -/* B2CA94 80240624 2402000F */ addiu $v0, $zero, 0xf -/* B2CA98 80240628 AFA2001C */ sw $v0, 0x1c($sp) -/* B2CA9C 8024062C 44833000 */ mtc1 $v1, $f6 -/* B2CAA0 80240630 00000000 */ nop -/* B2CAA4 80240634 468031A0 */ cvt.s.w $f6, $f6 -/* B2CAA8 80240638 44073000 */ mfc1 $a3, $f6 -/* B2CAAC 8024063C 27A20028 */ addiu $v0, $sp, 0x28 -/* B2CAB0 80240640 AFA20020 */ sw $v0, 0x20($sp) -/* B2CAB4 80240644 E7A00010 */ swc1 $f0, 0x10($sp) -/* B2CAB8 80240648 E7A20014 */ swc1 $f2, 0x14($sp) -/* B2CABC 8024064C 0C01BFA4 */ jal fx_emote -/* B2CAC0 80240650 E7A40018 */ swc1 $f4, 0x18($sp) -/* B2CAC4 80240654 0200202D */ daddu $a0, $s0, $zero -/* B2CAC8 80240658 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B2CACC 8024065C 0C012530 */ jal func_800494C0 -/* B2CAD0 80240660 3C060020 */ lui $a2, 0x20 -/* B2CAD4 80240664 8E220018 */ lw $v0, 0x18($s1) -/* B2CAD8 80240668 9442002A */ lhu $v0, 0x2a($v0) -/* B2CADC 8024066C 30420001 */ andi $v0, $v0, 1 -/* B2CAE0 80240670 14400064 */ bnez $v0, .L80240804 -/* B2CAE4 80240674 2402000A */ addiu $v0, $zero, 0xa -/* B2CAE8 80240678 08090201 */ j .L80240804 -/* B2CAEC 8024067C 2402000C */ addiu $v0, $zero, 0xc -.L80240680: -/* B2CAF0 80240680 8E420074 */ lw $v0, 0x74($s2) -/* B2CAF4 80240684 2442FFFF */ addiu $v0, $v0, -1 -.L80240688: -/* B2CAF8 80240688 AE420074 */ sw $v0, 0x74($s2) -.L8024068C: -/* B2CAFC 8024068C 8602008C */ lh $v0, 0x8c($s0) -/* B2CB00 80240690 1440005D */ bnez $v0, .L80240808 -/* B2CB04 80240694 00000000 */ nop -/* B2CB08 80240698 C6000018 */ lwc1 $f0, 0x18($s0) -/* B2CB0C 8024069C 3C014010 */ lui $at, 0x4010 -/* B2CB10 802406A0 44811800 */ mtc1 $at, $f3 -/* B2CB14 802406A4 44801000 */ mtc1 $zero, $f2 -/* B2CB18 802406A8 46000021 */ cvt.d.s $f0, $f0 -/* B2CB1C 802406AC 4622003C */ c.lt.d $f0, $f2 -/* B2CB20 802406B0 00000000 */ nop -/* B2CB24 802406B4 45000003 */ bc1f .L802406C4 -/* B2CB28 802406B8 0200202D */ daddu $a0, $s0, $zero -/* B2CB2C 802406BC 080901B2 */ j .L802406C8 -/* B2CB30 802406C0 0000282D */ daddu $a1, $zero, $zero -.L802406C4: -/* B2CB34 802406C4 24050001 */ addiu $a1, $zero, 1 -.L802406C8: -/* B2CB38 802406C8 0C00F598 */ jal func_8003D660 -/* B2CB3C 802406CC 00000000 */ nop -/* B2CB40 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B2CB44 802406D4 8E430078 */ lw $v1, 0x78($s2) -/* B2CB48 802406D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B2CB4C 802406DC 00031040 */ sll $v0, $v1, 1 -/* B2CB50 802406E0 00431021 */ addu $v0, $v0, $v1 -/* B2CB54 802406E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B2CB58 802406E8 00021080 */ sll $v0, $v0, 2 -/* B2CB5C 802406EC 00431021 */ addu $v0, $v0, $v1 -/* B2CB60 802406F0 C4560004 */ lwc1 $f22, 4($v0) -/* B2CB64 802406F4 4680B5A0 */ cvt.s.w $f22, $f22 -/* B2CB68 802406F8 C454000C */ lwc1 $f20, 0xc($v0) -/* B2CB6C 802406FC 4680A520 */ cvt.s.w $f20, $f20 -/* B2CB70 80240700 4406B000 */ mfc1 $a2, $f22 -/* B2CB74 80240704 4407A000 */ mfc1 $a3, $f20 -/* B2CB78 80240708 0C00A720 */ jal atan2 -/* B2CB7C 8024070C 00000000 */ nop -/* B2CB80 80240710 8E050018 */ lw $a1, 0x18($s0) -/* B2CB84 80240714 44060000 */ mfc1 $a2, $f0 -/* B2CB88 80240718 0200202D */ daddu $a0, $s0, $zero -/* B2CB8C 8024071C 0C00EA95 */ jal npc_move_heading -/* B2CB90 80240720 AE06000C */ sw $a2, 0xc($s0) -/* B2CB94 80240724 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B2CB98 80240728 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B2CB9C 8024072C 4406B000 */ mfc1 $a2, $f22 -/* B2CBA0 80240730 4407A000 */ mfc1 $a3, $f20 -/* B2CBA4 80240734 0C00A7B5 */ jal dist2D -/* B2CBA8 80240738 00000000 */ nop -/* B2CBAC 8024073C C6020018 */ lwc1 $f2, 0x18($s0) -/* B2CBB0 80240740 4602003E */ c.le.s $f0, $f2 -/* B2CBB4 80240744 00000000 */ nop -/* B2CBB8 80240748 4500002F */ bc1f .L80240808 -/* B2CBBC 8024074C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B2CBC0 80240750 24020002 */ addiu $v0, $zero, 2 -/* B2CBC4 80240754 0C00A67F */ jal rand_int -/* B2CBC8 80240758 AE420070 */ sw $v0, 0x70($s2) -/* B2CBCC 8024075C 3C035555 */ lui $v1, 0x5555 -/* B2CBD0 80240760 34635556 */ ori $v1, $v1, 0x5556 -/* B2CBD4 80240764 00430018 */ mult $v0, $v1 -/* B2CBD8 80240768 000227C3 */ sra $a0, $v0, 0x1f -/* B2CBDC 8024076C 00004010 */ mfhi $t0 -/* B2CBE0 80240770 01042023 */ subu $a0, $t0, $a0 -/* B2CBE4 80240774 00041840 */ sll $v1, $a0, 1 -/* B2CBE8 80240778 00641821 */ addu $v1, $v1, $a0 -/* B2CBEC 8024077C 00431023 */ subu $v0, $v0, $v1 -/* B2CBF0 80240780 24430002 */ addiu $v1, $v0, 2 -/* B2CBF4 80240784 AE430074 */ sw $v1, 0x74($s2) -/* B2CBF8 80240788 8E62002C */ lw $v0, 0x2c($s3) -/* B2CBFC 8024078C 18400009 */ blez $v0, .L802407B4 -/* B2CC00 80240790 24020004 */ addiu $v0, $zero, 4 -/* B2CC04 80240794 8E620004 */ lw $v0, 4($s3) -/* B2CC08 80240798 18400006 */ blez $v0, .L802407B4 -/* B2CC0C 8024079C 24020004 */ addiu $v0, $zero, 4 -/* B2CC10 802407A0 8E620008 */ lw $v0, 8($s3) -/* B2CC14 802407A4 18400003 */ blez $v0, .L802407B4 -/* B2CC18 802407A8 24020004 */ addiu $v0, $zero, 4 -/* B2CC1C 802407AC 14600002 */ bnez $v1, .L802407B8 -/* B2CC20 802407B0 00000000 */ nop -.L802407B4: -/* B2CC24 802407B4 AE420070 */ sw $v0, 0x70($s2) -.L802407B8: -/* B2CC28 802407B8 0C00A67F */ jal rand_int -/* B2CC2C 802407BC 24042710 */ addiu $a0, $zero, 0x2710 -/* B2CC30 802407C0 3C0351EB */ lui $v1, 0x51eb -/* B2CC34 802407C4 3463851F */ ori $v1, $v1, 0x851f -/* B2CC38 802407C8 00430018 */ mult $v0, $v1 -/* B2CC3C 802407CC 00021FC3 */ sra $v1, $v0, 0x1f -/* B2CC40 802407D0 00004010 */ mfhi $t0 -/* B2CC44 802407D4 00082143 */ sra $a0, $t0, 5 -/* B2CC48 802407D8 00832023 */ subu $a0, $a0, $v1 -/* B2CC4C 802407DC 00041840 */ sll $v1, $a0, 1 -/* B2CC50 802407E0 00641821 */ addu $v1, $v1, $a0 -/* B2CC54 802407E4 000318C0 */ sll $v1, $v1, 3 -/* B2CC58 802407E8 00641821 */ addu $v1, $v1, $a0 -/* B2CC5C 802407EC 00031880 */ sll $v1, $v1, 2 -/* B2CC60 802407F0 8E640004 */ lw $a0, 4($s3) -/* B2CC64 802407F4 00431023 */ subu $v0, $v0, $v1 -/* B2CC68 802407F8 0044102A */ slt $v0, $v0, $a0 -/* B2CC6C 802407FC 10400002 */ beqz $v0, .L80240808 -/* B2CC70 80240800 24020004 */ addiu $v0, $zero, 4 -.L80240804: -/* B2CC74 80240804 AE420070 */ sw $v0, 0x70($s2) -.L80240808: -/* B2CC78 80240808 8FBF0044 */ lw $ra, 0x44($sp) -/* B2CC7C 8024080C 8FB40040 */ lw $s4, 0x40($sp) -/* B2CC80 80240810 8FB3003C */ lw $s3, 0x3c($sp) -/* B2CC84 80240814 8FB20038 */ lw $s2, 0x38($sp) -/* B2CC88 80240818 8FB10034 */ lw $s1, 0x34($sp) -/* B2CC8C 8024081C 8FB00030 */ lw $s0, 0x30($sp) -/* B2CC90 80240820 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B2CC94 80240824 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B2CC98 80240828 03E00008 */ jr $ra -/* B2CC9C 8024082C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s new file mode 100644 index 0000000000..965f51d252 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240588_B2C9F8.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240588_B2C9F8 +/* B2C9F8 80240588 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* B2C9FC 8024058C AFB20038 */ sw $s2, 0x38($sp) +/* B2CA00 80240590 0080902D */ daddu $s2, $a0, $zero +/* B2CA04 80240594 AFBF0044 */ sw $ra, 0x44($sp) +/* B2CA08 80240598 AFB40040 */ sw $s4, 0x40($sp) +/* B2CA0C 8024059C AFB3003C */ sw $s3, 0x3c($sp) +/* B2CA10 802405A0 AFB10034 */ sw $s1, 0x34($sp) +/* B2CA14 802405A4 AFB00030 */ sw $s0, 0x30($sp) +/* B2CA18 802405A8 F7B60050 */ sdc1 $f22, 0x50($sp) +/* B2CA1C 802405AC F7B40048 */ sdc1 $f20, 0x48($sp) +/* B2CA20 802405B0 8E510148 */ lw $s1, 0x148($s2) +/* B2CA24 802405B4 00A0982D */ daddu $s3, $a1, $zero +/* B2CA28 802405B8 86240008 */ lh $a0, 8($s1) +/* B2CA2C 802405BC 0C00EABB */ jal get_npc_unsafe +/* B2CA30 802405C0 00C0A02D */ daddu $s4, $a2, $zero +/* B2CA34 802405C4 8E630014 */ lw $v1, 0x14($s3) +/* B2CA38 802405C8 04600030 */ bltz $v1, .L8024068C +/* B2CA3C 802405CC 0040802D */ daddu $s0, $v0, $zero +/* B2CA40 802405D0 8E420074 */ lw $v0, 0x74($s2) +/* B2CA44 802405D4 1C40002C */ bgtz $v0, .L80240688 +/* B2CA48 802405D8 2442FFFF */ addiu $v0, $v0, -1 +/* B2CA4C 802405DC 0280202D */ daddu $a0, $s4, $zero +/* B2CA50 802405E0 AE430074 */ sw $v1, 0x74($s2) +/* B2CA54 802405E4 AFA00010 */ sw $zero, 0x10($sp) +/* B2CA58 802405E8 8E66000C */ lw $a2, 0xc($s3) +/* B2CA5C 802405EC 8E670010 */ lw $a3, 0x10($s3) +/* B2CA60 802405F0 0C01242D */ jal func_800490B4 +/* B2CA64 802405F4 0220282D */ daddu $a1, $s1, $zero +/* B2CA68 802405F8 10400021 */ beqz $v0, .L80240680 +/* B2CA6C 802405FC 0000202D */ daddu $a0, $zero, $zero +/* B2CA70 80240600 0200282D */ daddu $a1, $s0, $zero +/* B2CA74 80240604 0000302D */ daddu $a2, $zero, $zero +/* B2CA78 80240608 860300A8 */ lh $v1, 0xa8($s0) +/* B2CA7C 8024060C 3C013F80 */ lui $at, 0x3f80 +/* B2CA80 80240610 44810000 */ mtc1 $at, $f0 +/* B2CA84 80240614 3C014000 */ lui $at, 0x4000 +/* B2CA88 80240618 44811000 */ mtc1 $at, $f2 +/* B2CA8C 8024061C 3C01C1A0 */ lui $at, 0xc1a0 +/* B2CA90 80240620 44812000 */ mtc1 $at, $f4 +/* B2CA94 80240624 2402000F */ addiu $v0, $zero, 0xf +/* B2CA98 80240628 AFA2001C */ sw $v0, 0x1c($sp) +/* B2CA9C 8024062C 44833000 */ mtc1 $v1, $f6 +/* B2CAA0 80240630 00000000 */ nop +/* B2CAA4 80240634 468031A0 */ cvt.s.w $f6, $f6 +/* B2CAA8 80240638 44073000 */ mfc1 $a3, $f6 +/* B2CAAC 8024063C 27A20028 */ addiu $v0, $sp, 0x28 +/* B2CAB0 80240640 AFA20020 */ sw $v0, 0x20($sp) +/* B2CAB4 80240644 E7A00010 */ swc1 $f0, 0x10($sp) +/* B2CAB8 80240648 E7A20014 */ swc1 $f2, 0x14($sp) +/* B2CABC 8024064C 0C01BFA4 */ jal fx_emote +/* B2CAC0 80240650 E7A40018 */ swc1 $f4, 0x18($sp) +/* B2CAC4 80240654 0200202D */ daddu $a0, $s0, $zero +/* B2CAC8 80240658 240502F4 */ addiu $a1, $zero, 0x2f4 +/* B2CACC 8024065C 0C012530 */ jal func_800494C0 +/* B2CAD0 80240660 3C060020 */ lui $a2, 0x20 +/* B2CAD4 80240664 8E220018 */ lw $v0, 0x18($s1) +/* B2CAD8 80240668 9442002A */ lhu $v0, 0x2a($v0) +/* B2CADC 8024066C 30420001 */ andi $v0, $v0, 1 +/* B2CAE0 80240670 14400064 */ bnez $v0, .L80240804 +/* B2CAE4 80240674 2402000A */ addiu $v0, $zero, 0xa +/* B2CAE8 80240678 08090201 */ j .L80240804 +/* B2CAEC 8024067C 2402000C */ addiu $v0, $zero, 0xc +.L80240680: +/* B2CAF0 80240680 8E420074 */ lw $v0, 0x74($s2) +/* B2CAF4 80240684 2442FFFF */ addiu $v0, $v0, -1 +.L80240688: +/* B2CAF8 80240688 AE420074 */ sw $v0, 0x74($s2) +.L8024068C: +/* B2CAFC 8024068C 8602008C */ lh $v0, 0x8c($s0) +/* B2CB00 80240690 1440005D */ bnez $v0, .L80240808 +/* B2CB04 80240694 00000000 */ nop +/* B2CB08 80240698 C6000018 */ lwc1 $f0, 0x18($s0) +/* B2CB0C 8024069C 3C014010 */ lui $at, 0x4010 +/* B2CB10 802406A0 44811800 */ mtc1 $at, $f3 +/* B2CB14 802406A4 44801000 */ mtc1 $zero, $f2 +/* B2CB18 802406A8 46000021 */ cvt.d.s $f0, $f0 +/* B2CB1C 802406AC 4622003C */ c.lt.d $f0, $f2 +/* B2CB20 802406B0 00000000 */ nop +/* B2CB24 802406B4 45000003 */ bc1f .L802406C4 +/* B2CB28 802406B8 0200202D */ daddu $a0, $s0, $zero +/* B2CB2C 802406BC 080901B2 */ j .L802406C8 +/* B2CB30 802406C0 0000282D */ daddu $a1, $zero, $zero +.L802406C4: +/* B2CB34 802406C4 24050001 */ addiu $a1, $zero, 1 +.L802406C8: +/* B2CB38 802406C8 0C00F598 */ jal func_8003D660 +/* B2CB3C 802406CC 00000000 */ nop +/* B2CB40 802406D0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B2CB44 802406D4 8E430078 */ lw $v1, 0x78($s2) +/* B2CB48 802406D8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B2CB4C 802406DC 00031040 */ sll $v0, $v1, 1 +/* B2CB50 802406E0 00431021 */ addu $v0, $v0, $v1 +/* B2CB54 802406E4 8E2300D0 */ lw $v1, 0xd0($s1) +/* B2CB58 802406E8 00021080 */ sll $v0, $v0, 2 +/* B2CB5C 802406EC 00431021 */ addu $v0, $v0, $v1 +/* B2CB60 802406F0 C4560004 */ lwc1 $f22, 4($v0) +/* B2CB64 802406F4 4680B5A0 */ cvt.s.w $f22, $f22 +/* B2CB68 802406F8 C454000C */ lwc1 $f20, 0xc($v0) +/* B2CB6C 802406FC 4680A520 */ cvt.s.w $f20, $f20 +/* B2CB70 80240700 4406B000 */ mfc1 $a2, $f22 +/* B2CB74 80240704 4407A000 */ mfc1 $a3, $f20 +/* B2CB78 80240708 0C00A720 */ jal atan2 +/* B2CB7C 8024070C 00000000 */ nop +/* B2CB80 80240710 8E050018 */ lw $a1, 0x18($s0) +/* B2CB84 80240714 44060000 */ mfc1 $a2, $f0 +/* B2CB88 80240718 0200202D */ daddu $a0, $s0, $zero +/* B2CB8C 8024071C 0C00EA95 */ jal npc_move_heading +/* B2CB90 80240720 AE06000C */ sw $a2, 0xc($s0) +/* B2CB94 80240724 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B2CB98 80240728 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B2CB9C 8024072C 4406B000 */ mfc1 $a2, $f22 +/* B2CBA0 80240730 4407A000 */ mfc1 $a3, $f20 +/* B2CBA4 80240734 0C00A7B5 */ jal dist2D +/* B2CBA8 80240738 00000000 */ nop +/* B2CBAC 8024073C C6020018 */ lwc1 $f2, 0x18($s0) +/* B2CBB0 80240740 4602003E */ c.le.s $f0, $f2 +/* B2CBB4 80240744 00000000 */ nop +/* B2CBB8 80240748 4500002F */ bc1f .L80240808 +/* B2CBBC 8024074C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* B2CBC0 80240750 24020002 */ addiu $v0, $zero, 2 +/* B2CBC4 80240754 0C00A67F */ jal rand_int +/* B2CBC8 80240758 AE420070 */ sw $v0, 0x70($s2) +/* B2CBCC 8024075C 3C035555 */ lui $v1, 0x5555 +/* B2CBD0 80240760 34635556 */ ori $v1, $v1, 0x5556 +/* B2CBD4 80240764 00430018 */ mult $v0, $v1 +/* B2CBD8 80240768 000227C3 */ sra $a0, $v0, 0x1f +/* B2CBDC 8024076C 00004010 */ mfhi $t0 +/* B2CBE0 80240770 01042023 */ subu $a0, $t0, $a0 +/* B2CBE4 80240774 00041840 */ sll $v1, $a0, 1 +/* B2CBE8 80240778 00641821 */ addu $v1, $v1, $a0 +/* B2CBEC 8024077C 00431023 */ subu $v0, $v0, $v1 +/* B2CBF0 80240780 24430002 */ addiu $v1, $v0, 2 +/* B2CBF4 80240784 AE430074 */ sw $v1, 0x74($s2) +/* B2CBF8 80240788 8E62002C */ lw $v0, 0x2c($s3) +/* B2CBFC 8024078C 18400009 */ blez $v0, .L802407B4 +/* B2CC00 80240790 24020004 */ addiu $v0, $zero, 4 +/* B2CC04 80240794 8E620004 */ lw $v0, 4($s3) +/* B2CC08 80240798 18400006 */ blez $v0, .L802407B4 +/* B2CC0C 8024079C 24020004 */ addiu $v0, $zero, 4 +/* B2CC10 802407A0 8E620008 */ lw $v0, 8($s3) +/* B2CC14 802407A4 18400003 */ blez $v0, .L802407B4 +/* B2CC18 802407A8 24020004 */ addiu $v0, $zero, 4 +/* B2CC1C 802407AC 14600002 */ bnez $v1, .L802407B8 +/* B2CC20 802407B0 00000000 */ nop +.L802407B4: +/* B2CC24 802407B4 AE420070 */ sw $v0, 0x70($s2) +.L802407B8: +/* B2CC28 802407B8 0C00A67F */ jal rand_int +/* B2CC2C 802407BC 24042710 */ addiu $a0, $zero, 0x2710 +/* B2CC30 802407C0 3C0351EB */ lui $v1, 0x51eb +/* B2CC34 802407C4 3463851F */ ori $v1, $v1, 0x851f +/* B2CC38 802407C8 00430018 */ mult $v0, $v1 +/* B2CC3C 802407CC 00021FC3 */ sra $v1, $v0, 0x1f +/* B2CC40 802407D0 00004010 */ mfhi $t0 +/* B2CC44 802407D4 00082143 */ sra $a0, $t0, 5 +/* B2CC48 802407D8 00832023 */ subu $a0, $a0, $v1 +/* B2CC4C 802407DC 00041840 */ sll $v1, $a0, 1 +/* B2CC50 802407E0 00641821 */ addu $v1, $v1, $a0 +/* B2CC54 802407E4 000318C0 */ sll $v1, $v1, 3 +/* B2CC58 802407E8 00641821 */ addu $v1, $v1, $a0 +/* B2CC5C 802407EC 00031880 */ sll $v1, $v1, 2 +/* B2CC60 802407F0 8E640004 */ lw $a0, 4($s3) +/* B2CC64 802407F4 00431023 */ subu $v0, $v0, $v1 +/* B2CC68 802407F8 0044102A */ slt $v0, $v0, $a0 +/* B2CC6C 802407FC 10400002 */ beqz $v0, .L80240808 +/* B2CC70 80240800 24020004 */ addiu $v0, $zero, 4 +.L80240804: +/* B2CC74 80240804 AE420070 */ sw $v0, 0x70($s2) +.L80240808: +/* B2CC78 80240808 8FBF0044 */ lw $ra, 0x44($sp) +/* B2CC7C 8024080C 8FB40040 */ lw $s4, 0x40($sp) +/* B2CC80 80240810 8FB3003C */ lw $s3, 0x3c($sp) +/* B2CC84 80240814 8FB20038 */ lw $s2, 0x38($sp) +/* B2CC88 80240818 8FB10034 */ lw $s1, 0x34($sp) +/* B2CC8C 8024081C 8FB00030 */ lw $s0, 0x30($sp) +/* B2CC90 80240820 D7B60050 */ ldc1 $f22, 0x50($sp) +/* B2CC94 80240824 D7B40048 */ ldc1 $f20, 0x48($sp) +/* B2CC98 80240828 03E00008 */ jr $ra +/* B2CC9C 8024082C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C.s deleted file mode 100644 index d2c58e3d2e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D7C -/* B2D1EC 80240D7C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2D1F0 80240D80 AFB3003C */ sw $s3, 0x3c($sp) -/* B2D1F4 80240D84 0080982D */ daddu $s3, $a0, $zero -/* B2D1F8 80240D88 AFBF0040 */ sw $ra, 0x40($sp) -/* B2D1FC 80240D8C AFB20038 */ sw $s2, 0x38($sp) -/* B2D200 80240D90 AFB10034 */ sw $s1, 0x34($sp) -/* B2D204 80240D94 AFB00030 */ sw $s0, 0x30($sp) -/* B2D208 80240D98 8E720148 */ lw $s2, 0x148($s3) -/* B2D20C 80240D9C 00A0882D */ daddu $s1, $a1, $zero -/* B2D210 80240DA0 86440008 */ lh $a0, 8($s2) -/* B2D214 80240DA4 0C00EABB */ jal get_npc_unsafe -/* B2D218 80240DA8 00C0802D */ daddu $s0, $a2, $zero -/* B2D21C 80240DAC 0200202D */ daddu $a0, $s0, $zero -/* B2D220 80240DB0 0240282D */ daddu $a1, $s2, $zero -/* B2D224 80240DB4 24030001 */ addiu $v1, $zero, 1 -/* B2D228 80240DB8 AFA30010 */ sw $v1, 0x10($sp) -/* B2D22C 80240DBC 8E260024 */ lw $a2, 0x24($s1) -/* B2D230 80240DC0 8E270028 */ lw $a3, 0x28($s1) -/* B2D234 80240DC4 0C01242D */ jal func_800490B4 -/* B2D238 80240DC8 0040802D */ daddu $s0, $v0, $zero -/* B2D23C 80240DCC 1440001E */ bnez $v0, .L80240E48 -/* B2D240 80240DD0 0200202D */ daddu $a0, $s0, $zero -/* B2D244 80240DD4 24040002 */ addiu $a0, $zero, 2 -/* B2D248 80240DD8 0200282D */ daddu $a1, $s0, $zero -/* B2D24C 80240DDC 0000302D */ daddu $a2, $zero, $zero -/* B2D250 80240DE0 860300A8 */ lh $v1, 0xa8($s0) -/* B2D254 80240DE4 3C013F80 */ lui $at, 0x3f80 -/* B2D258 80240DE8 44810000 */ mtc1 $at, $f0 -/* B2D25C 80240DEC 3C014000 */ lui $at, 0x4000 -/* B2D260 80240DF0 44811000 */ mtc1 $at, $f2 -/* B2D264 80240DF4 3C01C1A0 */ lui $at, 0xc1a0 -/* B2D268 80240DF8 44812000 */ mtc1 $at, $f4 -/* B2D26C 80240DFC 2402000F */ addiu $v0, $zero, 0xf -/* B2D270 80240E00 AFA2001C */ sw $v0, 0x1c($sp) -/* B2D274 80240E04 44833000 */ mtc1 $v1, $f6 -/* B2D278 80240E08 00000000 */ nop -/* B2D27C 80240E0C 468031A0 */ cvt.s.w $f6, $f6 -/* B2D280 80240E10 44073000 */ mfc1 $a3, $f6 -/* B2D284 80240E14 27A20028 */ addiu $v0, $sp, 0x28 -/* B2D288 80240E18 AFA20020 */ sw $v0, 0x20($sp) -/* B2D28C 80240E1C E7A00010 */ swc1 $f0, 0x10($sp) -/* B2D290 80240E20 E7A20014 */ swc1 $f2, 0x14($sp) -/* B2D294 80240E24 0C01BFA4 */ jal fx_emote -/* B2D298 80240E28 E7A40018 */ swc1 $f4, 0x18($sp) -/* B2D29C 80240E2C 8E4200CC */ lw $v0, 0xcc($s2) -/* B2D2A0 80240E30 8C430000 */ lw $v1, ($v0) -/* B2D2A4 80240E34 24020019 */ addiu $v0, $zero, 0x19 -/* B2D2A8 80240E38 A602008E */ sh $v0, 0x8e($s0) -/* B2D2AC 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* B2D2B0 80240E40 0809039F */ j .L80240E7C -/* B2D2B4 80240E44 AE030028 */ sw $v1, 0x28($s0) -.L80240E48: -/* B2D2B8 80240E48 0C00F598 */ jal func_8003D660 -/* B2D2BC 80240E4C 24050001 */ addiu $a1, $zero, 1 -/* B2D2C0 80240E50 8E050018 */ lw $a1, 0x18($s0) -/* B2D2C4 80240E54 8E06000C */ lw $a2, 0xc($s0) -/* B2D2C8 80240E58 0C00EA95 */ jal npc_move_heading -/* B2D2CC 80240E5C 0200202D */ daddu $a0, $s0, $zero -/* B2D2D0 80240E60 8602008E */ lh $v0, 0x8e($s0) -/* B2D2D4 80240E64 9603008E */ lhu $v1, 0x8e($s0) -/* B2D2D8 80240E68 18400003 */ blez $v0, .L80240E78 -/* B2D2DC 80240E6C 2462FFFF */ addiu $v0, $v1, -1 -/* B2D2E0 80240E70 080903A0 */ j .L80240E80 -/* B2D2E4 80240E74 A602008E */ sh $v0, 0x8e($s0) -.L80240E78: -/* B2D2E8 80240E78 2402000C */ addiu $v0, $zero, 0xc -.L80240E7C: -/* B2D2EC 80240E7C AE620070 */ sw $v0, 0x70($s3) -.L80240E80: -/* B2D2F0 80240E80 8FBF0040 */ lw $ra, 0x40($sp) -/* B2D2F4 80240E84 8FB3003C */ lw $s3, 0x3c($sp) -/* B2D2F8 80240E88 8FB20038 */ lw $s2, 0x38($sp) -/* B2D2FC 80240E8C 8FB10034 */ lw $s1, 0x34($sp) -/* B2D300 80240E90 8FB00030 */ lw $s0, 0x30($sp) -/* B2D304 80240E94 03E00008 */ jr $ra -/* B2D308 80240E98 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s new file mode 100644 index 0000000000..d3f41ba88d --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240D7C_B2D1EC.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D7C_B2D1EC +/* B2D1EC 80240D7C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B2D1F0 80240D80 AFB3003C */ sw $s3, 0x3c($sp) +/* B2D1F4 80240D84 0080982D */ daddu $s3, $a0, $zero +/* B2D1F8 80240D88 AFBF0040 */ sw $ra, 0x40($sp) +/* B2D1FC 80240D8C AFB20038 */ sw $s2, 0x38($sp) +/* B2D200 80240D90 AFB10034 */ sw $s1, 0x34($sp) +/* B2D204 80240D94 AFB00030 */ sw $s0, 0x30($sp) +/* B2D208 80240D98 8E720148 */ lw $s2, 0x148($s3) +/* B2D20C 80240D9C 00A0882D */ daddu $s1, $a1, $zero +/* B2D210 80240DA0 86440008 */ lh $a0, 8($s2) +/* B2D214 80240DA4 0C00EABB */ jal get_npc_unsafe +/* B2D218 80240DA8 00C0802D */ daddu $s0, $a2, $zero +/* B2D21C 80240DAC 0200202D */ daddu $a0, $s0, $zero +/* B2D220 80240DB0 0240282D */ daddu $a1, $s2, $zero +/* B2D224 80240DB4 24030001 */ addiu $v1, $zero, 1 +/* B2D228 80240DB8 AFA30010 */ sw $v1, 0x10($sp) +/* B2D22C 80240DBC 8E260024 */ lw $a2, 0x24($s1) +/* B2D230 80240DC0 8E270028 */ lw $a3, 0x28($s1) +/* B2D234 80240DC4 0C01242D */ jal func_800490B4 +/* B2D238 80240DC8 0040802D */ daddu $s0, $v0, $zero +/* B2D23C 80240DCC 1440001E */ bnez $v0, .L80240E48 +/* B2D240 80240DD0 0200202D */ daddu $a0, $s0, $zero +/* B2D244 80240DD4 24040002 */ addiu $a0, $zero, 2 +/* B2D248 80240DD8 0200282D */ daddu $a1, $s0, $zero +/* B2D24C 80240DDC 0000302D */ daddu $a2, $zero, $zero +/* B2D250 80240DE0 860300A8 */ lh $v1, 0xa8($s0) +/* B2D254 80240DE4 3C013F80 */ lui $at, 0x3f80 +/* B2D258 80240DE8 44810000 */ mtc1 $at, $f0 +/* B2D25C 80240DEC 3C014000 */ lui $at, 0x4000 +/* B2D260 80240DF0 44811000 */ mtc1 $at, $f2 +/* B2D264 80240DF4 3C01C1A0 */ lui $at, 0xc1a0 +/* B2D268 80240DF8 44812000 */ mtc1 $at, $f4 +/* B2D26C 80240DFC 2402000F */ addiu $v0, $zero, 0xf +/* B2D270 80240E00 AFA2001C */ sw $v0, 0x1c($sp) +/* B2D274 80240E04 44833000 */ mtc1 $v1, $f6 +/* B2D278 80240E08 00000000 */ nop +/* B2D27C 80240E0C 468031A0 */ cvt.s.w $f6, $f6 +/* B2D280 80240E10 44073000 */ mfc1 $a3, $f6 +/* B2D284 80240E14 27A20028 */ addiu $v0, $sp, 0x28 +/* B2D288 80240E18 AFA20020 */ sw $v0, 0x20($sp) +/* B2D28C 80240E1C E7A00010 */ swc1 $f0, 0x10($sp) +/* B2D290 80240E20 E7A20014 */ swc1 $f2, 0x14($sp) +/* B2D294 80240E24 0C01BFA4 */ jal fx_emote +/* B2D298 80240E28 E7A40018 */ swc1 $f4, 0x18($sp) +/* B2D29C 80240E2C 8E4200CC */ lw $v0, 0xcc($s2) +/* B2D2A0 80240E30 8C430000 */ lw $v1, ($v0) +/* B2D2A4 80240E34 24020019 */ addiu $v0, $zero, 0x19 +/* B2D2A8 80240E38 A602008E */ sh $v0, 0x8e($s0) +/* B2D2AC 80240E3C 2402000E */ addiu $v0, $zero, 0xe +/* B2D2B0 80240E40 0809039F */ j .L80240E7C +/* B2D2B4 80240E44 AE030028 */ sw $v1, 0x28($s0) +.L80240E48: +/* B2D2B8 80240E48 0C00F598 */ jal func_8003D660 +/* B2D2BC 80240E4C 24050001 */ addiu $a1, $zero, 1 +/* B2D2C0 80240E50 8E050018 */ lw $a1, 0x18($s0) +/* B2D2C4 80240E54 8E06000C */ lw $a2, 0xc($s0) +/* B2D2C8 80240E58 0C00EA95 */ jal npc_move_heading +/* B2D2CC 80240E5C 0200202D */ daddu $a0, $s0, $zero +/* B2D2D0 80240E60 8602008E */ lh $v0, 0x8e($s0) +/* B2D2D4 80240E64 9603008E */ lhu $v1, 0x8e($s0) +/* B2D2D8 80240E68 18400003 */ blez $v0, .L80240E78 +/* B2D2DC 80240E6C 2462FFFF */ addiu $v0, $v1, -1 +/* B2D2E0 80240E70 080903A0 */ j .L80240E80 +/* B2D2E4 80240E74 A602008E */ sh $v0, 0x8e($s0) +.L80240E78: +/* B2D2E8 80240E78 2402000C */ addiu $v0, $zero, 0xc +.L80240E7C: +/* B2D2EC 80240E7C AE620070 */ sw $v0, 0x70($s3) +.L80240E80: +/* B2D2F0 80240E80 8FBF0040 */ lw $ra, 0x40($sp) +/* B2D2F4 80240E84 8FB3003C */ lw $s3, 0x3c($sp) +/* B2D2F8 80240E88 8FB20038 */ lw $s2, 0x38($sp) +/* B2D2FC 80240E8C 8FB10034 */ lw $s1, 0x34($sp) +/* B2D300 80240E90 8FB00030 */ lw $s0, 0x30($sp) +/* B2D304 80240E94 03E00008 */ jr $ra +/* B2D308 80240E98 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4.s deleted file mode 100644 index fb080a3028..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FC4 -/* B2D434 80240FC4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B2D438 80240FC8 AFB40058 */ sw $s4, 0x58($sp) -/* B2D43C 80240FCC 0080A02D */ daddu $s4, $a0, $zero -/* B2D440 80240FD0 AFBF0060 */ sw $ra, 0x60($sp) -/* B2D444 80240FD4 AFB5005C */ sw $s5, 0x5c($sp) -/* B2D448 80240FD8 AFB30054 */ sw $s3, 0x54($sp) -/* B2D44C 80240FDC AFB20050 */ sw $s2, 0x50($sp) -/* B2D450 80240FE0 AFB1004C */ sw $s1, 0x4c($sp) -/* B2D454 80240FE4 AFB00048 */ sw $s0, 0x48($sp) -/* B2D458 80240FE8 8E910148 */ lw $s1, 0x148($s4) -/* B2D45C 80240FEC 86240008 */ lh $a0, 8($s1) -/* B2D460 80240FF0 0C00EABB */ jal get_npc_unsafe -/* B2D464 80240FF4 00A0802D */ daddu $s0, $a1, $zero -/* B2D468 80240FF8 8E83000C */ lw $v1, 0xc($s4) -/* B2D46C 80240FFC 0280202D */ daddu $a0, $s4, $zero -/* B2D470 80241000 8C650000 */ lw $a1, ($v1) -/* B2D474 80241004 0C0B1EAF */ jal get_variable -/* B2D478 80241008 0040902D */ daddu $s2, $v0, $zero -/* B2D47C 8024100C AFA00018 */ sw $zero, 0x18($sp) -/* B2D480 80241010 8E2300D0 */ lw $v1, 0xd0($s1) -/* B2D484 80241014 8C630094 */ lw $v1, 0x94($v1) -/* B2D488 80241018 AFA3001C */ sw $v1, 0x1c($sp) -/* B2D48C 8024101C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B2D490 80241020 8C630080 */ lw $v1, 0x80($v1) -/* B2D494 80241024 AFA30020 */ sw $v1, 0x20($sp) -/* B2D498 80241028 8E2300D0 */ lw $v1, 0xd0($s1) -/* B2D49C 8024102C 8C630088 */ lw $v1, 0x88($v1) -/* B2D4A0 80241030 AFA30024 */ sw $v1, 0x24($sp) -/* B2D4A4 80241034 8E2300D0 */ lw $v1, 0xd0($s1) -/* B2D4A8 80241038 8C63008C */ lw $v1, 0x8c($v1) -/* B2D4AC 8024103C 27B50018 */ addiu $s5, $sp, 0x18 -/* B2D4B0 80241040 AFA30028 */ sw $v1, 0x28($sp) -/* B2D4B4 80241044 8E2300D0 */ lw $v1, 0xd0($s1) -/* B2D4B8 80241048 3C014282 */ lui $at, 0x4282 -/* B2D4BC 8024104C 44810000 */ mtc1 $at, $f0 -/* B2D4C0 80241050 8C630090 */ lw $v1, 0x90($v1) -/* B2D4C4 80241054 0040982D */ daddu $s3, $v0, $zero -/* B2D4C8 80241058 E7A00030 */ swc1 $f0, 0x30($sp) -/* B2D4CC 8024105C A7A00034 */ sh $zero, 0x34($sp) -/* B2D4D0 80241060 16000005 */ bnez $s0, .L80241078 -/* B2D4D4 80241064 AFA3002C */ sw $v1, 0x2c($sp) -/* B2D4D8 80241068 8E2200B0 */ lw $v0, 0xb0($s1) -/* B2D4DC 8024106C 30420004 */ andi $v0, $v0, 4 -/* B2D4E0 80241070 10400044 */ beqz $v0, .L80241184 -/* B2D4E4 80241074 00000000 */ nop -.L80241078: -/* B2D4E8 80241078 2404F7FF */ addiu $a0, $zero, -0x801 -/* B2D4EC 8024107C AE800070 */ sw $zero, 0x70($s4) -/* B2D4F0 80241080 A640008E */ sh $zero, 0x8e($s2) -/* B2D4F4 80241084 8E2200CC */ lw $v0, 0xcc($s1) -/* B2D4F8 80241088 8E430000 */ lw $v1, ($s2) -/* B2D4FC 8024108C 8C420000 */ lw $v0, ($v0) -/* B2D500 80241090 00641824 */ and $v1, $v1, $a0 -/* B2D504 80241094 AE430000 */ sw $v1, ($s2) -/* B2D508 80241098 AE420028 */ sw $v0, 0x28($s2) -/* B2D50C 8024109C 8E2200D0 */ lw $v0, 0xd0($s1) -/* B2D510 802410A0 8C420098 */ lw $v0, 0x98($v0) -/* B2D514 802410A4 54400005 */ bnel $v0, $zero, .L802410BC -/* B2D518 802410A8 2402FDFF */ addiu $v0, $zero, -0x201 -/* B2D51C 802410AC 34620200 */ ori $v0, $v1, 0x200 -/* B2D520 802410B0 2403FFF7 */ addiu $v1, $zero, -9 -/* B2D524 802410B4 08090431 */ j .L802410C4 -/* B2D528 802410B8 00431024 */ and $v0, $v0, $v1 -.L802410BC: -/* B2D52C 802410BC 00621024 */ and $v0, $v1, $v0 -/* B2D530 802410C0 34420008 */ ori $v0, $v0, 8 -.L802410C4: -/* B2D534 802410C4 AE420000 */ sw $v0, ($s2) -/* B2D538 802410C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* B2D53C 802410CC 30420004 */ andi $v0, $v0, 4 -/* B2D540 802410D0 10400008 */ beqz $v0, .L802410F4 -/* B2D544 802410D4 24020063 */ addiu $v0, $zero, 0x63 -/* B2D548 802410D8 AE820070 */ sw $v0, 0x70($s4) -/* B2D54C 802410DC AE800074 */ sw $zero, 0x74($s4) -/* B2D550 802410E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B2D554 802410E4 2403FFFB */ addiu $v1, $zero, -5 -/* B2D558 802410E8 00431024 */ and $v0, $v0, $v1 -/* B2D55C 802410EC 08090448 */ j .L80241120 -/* B2D560 802410F0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802410F4: -/* B2D564 802410F4 8E220000 */ lw $v0, ($s1) -/* B2D568 802410F8 3C034000 */ lui $v1, 0x4000 -/* B2D56C 802410FC 00431024 */ and $v0, $v0, $v1 -/* B2D570 80241100 10400007 */ beqz $v0, .L80241120 -/* B2D574 80241104 3C03BFFF */ lui $v1, 0xbfff -/* B2D578 80241108 2402000C */ addiu $v0, $zero, 0xc -/* B2D57C 8024110C AE820070 */ sw $v0, 0x70($s4) -/* B2D580 80241110 8E220000 */ lw $v0, ($s1) -/* B2D584 80241114 3463FFFF */ ori $v1, $v1, 0xffff -/* B2D588 80241118 00431024 */ and $v0, $v0, $v1 -/* B2D58C 8024111C AE220000 */ sw $v0, ($s1) -.L80241120: -/* B2D590 80241120 27A50038 */ addiu $a1, $sp, 0x38 -/* B2D594 80241124 27A6003C */ addiu $a2, $sp, 0x3c -/* B2D598 80241128 C6400038 */ lwc1 $f0, 0x38($s2) -/* B2D59C 8024112C 864200A8 */ lh $v0, 0xa8($s2) -/* B2D5A0 80241130 3C0142C8 */ lui $at, 0x42c8 -/* B2D5A4 80241134 44812000 */ mtc1 $at, $f4 -/* B2D5A8 80241138 44823000 */ mtc1 $v0, $f6 -/* B2D5AC 8024113C 00000000 */ nop -/* B2D5B0 80241140 468031A0 */ cvt.s.w $f6, $f6 -/* B2D5B4 80241144 27A20044 */ addiu $v0, $sp, 0x44 -/* B2D5B8 80241148 E7A00038 */ swc1 $f0, 0x38($sp) -/* B2D5BC 8024114C C640003C */ lwc1 $f0, 0x3c($s2) -/* B2D5C0 80241150 C6420040 */ lwc1 $f2, 0x40($s2) -/* B2D5C4 80241154 46060000 */ add.s $f0, $f0, $f6 -/* B2D5C8 80241158 E7A40044 */ swc1 $f4, 0x44($sp) -/* B2D5CC 8024115C E7A20040 */ swc1 $f2, 0x40($sp) -/* B2D5D0 80241160 E7A0003C */ swc1 $f0, 0x3c($sp) -/* B2D5D4 80241164 AFA20010 */ sw $v0, 0x10($sp) -/* B2D5D8 80241168 8E440080 */ lw $a0, 0x80($s2) -/* B2D5DC 8024116C 0C0372DF */ jal func_800DCB7C -/* B2D5E0 80241170 27A70040 */ addiu $a3, $sp, 0x40 -/* B2D5E4 80241174 10400003 */ beqz $v0, .L80241184 -/* B2D5E8 80241178 00000000 */ nop -/* B2D5EC 8024117C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* B2D5F0 80241180 E640003C */ swc1 $f0, 0x3c($s2) -.L80241184: -/* B2D5F4 80241184 8E830070 */ lw $v1, 0x70($s4) -/* B2D5F8 80241188 2C620064 */ sltiu $v0, $v1, 0x64 -/* B2D5FC 8024118C 10400042 */ beqz $v0, .L80241298 -/* B2D600 80241190 00031080 */ sll $v0, $v1, 2 -/* B2D604 80241194 3C018025 */ lui $at, 0x8025 -/* B2D608 80241198 00220821 */ addu $at, $at, $v0 -/* B2D60C 8024119C 8C2285D0 */ lw $v0, -0x7a30($at) -/* B2D610 802411A0 00400008 */ jr $v0 -/* B2D614 802411A4 00000000 */ nop -/* B2D618 802411A8 0280202D */ daddu $a0, $s4, $zero -/* B2D61C 802411AC 0260282D */ daddu $a1, $s3, $zero -/* B2D620 802411B0 0C09010C */ jal func_80240430 -/* B2D624 802411B4 02A0302D */ daddu $a2, $s5, $zero -/* B2D628 802411B8 0280202D */ daddu $a0, $s4, $zero -/* B2D62C 802411BC 0260282D */ daddu $a1, $s3, $zero -/* B2D630 802411C0 0C090162 */ jal func_80240588 -/* B2D634 802411C4 02A0302D */ daddu $a2, $s5, $zero -/* B2D638 802411C8 080904A6 */ j .L80241298 -/* B2D63C 802411CC 00000000 */ nop -/* B2D640 802411D0 0280202D */ daddu $a0, $s4, $zero -/* B2D644 802411D4 0260282D */ daddu $a1, $s3, $zero -/* B2D648 802411D8 0C09020C */ jal func_80240830 -/* B2D64C 802411DC 02A0302D */ daddu $a2, $s5, $zero -/* B2D650 802411E0 0280202D */ daddu $a0, $s4, $zero -/* B2D654 802411E4 0260282D */ daddu $a1, $s3, $zero -/* B2D658 802411E8 0C09023C */ jal func_802408F0 -/* B2D65C 802411EC 02A0302D */ daddu $a2, $s5, $zero -/* B2D660 802411F0 080904A6 */ j .L80241298 -/* B2D664 802411F4 00000000 */ nop -/* B2D668 802411F8 0280202D */ daddu $a0, $s4, $zero -/* B2D66C 802411FC 0260282D */ daddu $a1, $s3, $zero -/* B2D670 80241200 0C0902AB */ jal func_80240AAC -/* B2D674 80241204 02A0302D */ daddu $a2, $s5, $zero -/* B2D678 80241208 080904A6 */ j .L80241298 -/* B2D67C 8024120C 00000000 */ nop -/* B2D680 80241210 0280202D */ daddu $a0, $s4, $zero -/* B2D684 80241214 0260282D */ daddu $a1, $s3, $zero -/* B2D688 80241218 0C0902D8 */ jal func_80240B60 -/* B2D68C 8024121C 02A0302D */ daddu $a2, $s5, $zero -/* B2D690 80241220 0280202D */ daddu $a0, $s4, $zero -/* B2D694 80241224 0260282D */ daddu $a1, $s3, $zero -/* B2D698 80241228 0C0902F5 */ jal func_80240BD4_B2D044 -/* B2D69C 8024122C 02A0302D */ daddu $a2, $s5, $zero -/* B2D6A0 80241230 080904A6 */ j .L80241298 -/* B2D6A4 80241234 00000000 */ nop -/* B2D6A8 80241238 0280202D */ daddu $a0, $s4, $zero -/* B2D6AC 8024123C 0260282D */ daddu $a1, $s3, $zero -/* B2D6B0 80241240 0C090313 */ jal func_80240C4C -/* B2D6B4 80241244 02A0302D */ daddu $a2, $s5, $zero -/* B2D6B8 80241248 0280202D */ daddu $a0, $s4, $zero -/* B2D6BC 8024124C 0260282D */ daddu $a1, $s3, $zero -/* B2D6C0 80241250 0C09035F */ jal func_80240D7C -/* B2D6C4 80241254 02A0302D */ daddu $a2, $s5, $zero -/* B2D6C8 80241258 080904A6 */ j .L80241298 -/* B2D6CC 8024125C 00000000 */ nop -/* B2D6D0 80241260 0280202D */ daddu $a0, $s4, $zero -/* B2D6D4 80241264 0260282D */ daddu $a1, $s3, $zero -/* B2D6D8 80241268 0C0903A7 */ jal func_80240E9C -/* B2D6DC 8024126C 02A0302D */ daddu $a2, $s5, $zero -/* B2D6E0 80241270 080904A6 */ j .L80241298 -/* B2D6E4 80241274 00000000 */ nop -/* B2D6E8 80241278 0280202D */ daddu $a0, $s4, $zero -/* B2D6EC 8024127C 0260282D */ daddu $a1, $s3, $zero -/* B2D6F0 80241280 0C0903C1 */ jal func_80240F04 -/* B2D6F4 80241284 02A0302D */ daddu $a2, $s5, $zero -/* B2D6F8 80241288 080904A6 */ j .L80241298 -/* B2D6FC 8024128C 00000000 */ nop -/* B2D700 80241290 0C0129CF */ jal func_8004A73C -/* B2D704 80241294 0280202D */ daddu $a0, $s4, $zero -.L80241298: -/* B2D708 80241298 8FBF0060 */ lw $ra, 0x60($sp) -/* B2D70C 8024129C 8FB5005C */ lw $s5, 0x5c($sp) -/* B2D710 802412A0 8FB40058 */ lw $s4, 0x58($sp) -/* B2D714 802412A4 8FB30054 */ lw $s3, 0x54($sp) -/* B2D718 802412A8 8FB20050 */ lw $s2, 0x50($sp) -/* B2D71C 802412AC 8FB1004C */ lw $s1, 0x4c($sp) -/* B2D720 802412B0 8FB00048 */ lw $s0, 0x48($sp) -/* B2D724 802412B4 0000102D */ daddu $v0, $zero, $zero -/* B2D728 802412B8 03E00008 */ jr $ra -/* B2D72C 802412BC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s new file mode 100644 index 0000000000..457f621e28 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80240FC4_B2D434.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FC4_B2D434 +/* B2D434 80240FC4 27BDFF98 */ addiu $sp, $sp, -0x68 +/* B2D438 80240FC8 AFB40058 */ sw $s4, 0x58($sp) +/* B2D43C 80240FCC 0080A02D */ daddu $s4, $a0, $zero +/* B2D440 80240FD0 AFBF0060 */ sw $ra, 0x60($sp) +/* B2D444 80240FD4 AFB5005C */ sw $s5, 0x5c($sp) +/* B2D448 80240FD8 AFB30054 */ sw $s3, 0x54($sp) +/* B2D44C 80240FDC AFB20050 */ sw $s2, 0x50($sp) +/* B2D450 80240FE0 AFB1004C */ sw $s1, 0x4c($sp) +/* B2D454 80240FE4 AFB00048 */ sw $s0, 0x48($sp) +/* B2D458 80240FE8 8E910148 */ lw $s1, 0x148($s4) +/* B2D45C 80240FEC 86240008 */ lh $a0, 8($s1) +/* B2D460 80240FF0 0C00EABB */ jal get_npc_unsafe +/* B2D464 80240FF4 00A0802D */ daddu $s0, $a1, $zero +/* B2D468 80240FF8 8E83000C */ lw $v1, 0xc($s4) +/* B2D46C 80240FFC 0280202D */ daddu $a0, $s4, $zero +/* B2D470 80241000 8C650000 */ lw $a1, ($v1) +/* B2D474 80241004 0C0B1EAF */ jal get_variable +/* B2D478 80241008 0040902D */ daddu $s2, $v0, $zero +/* B2D47C 8024100C AFA00018 */ sw $zero, 0x18($sp) +/* B2D480 80241010 8E2300D0 */ lw $v1, 0xd0($s1) +/* B2D484 80241014 8C630094 */ lw $v1, 0x94($v1) +/* B2D488 80241018 AFA3001C */ sw $v1, 0x1c($sp) +/* B2D48C 8024101C 8E2300D0 */ lw $v1, 0xd0($s1) +/* B2D490 80241020 8C630080 */ lw $v1, 0x80($v1) +/* B2D494 80241024 AFA30020 */ sw $v1, 0x20($sp) +/* B2D498 80241028 8E2300D0 */ lw $v1, 0xd0($s1) +/* B2D49C 8024102C 8C630088 */ lw $v1, 0x88($v1) +/* B2D4A0 80241030 AFA30024 */ sw $v1, 0x24($sp) +/* B2D4A4 80241034 8E2300D0 */ lw $v1, 0xd0($s1) +/* B2D4A8 80241038 8C63008C */ lw $v1, 0x8c($v1) +/* B2D4AC 8024103C 27B50018 */ addiu $s5, $sp, 0x18 +/* B2D4B0 80241040 AFA30028 */ sw $v1, 0x28($sp) +/* B2D4B4 80241044 8E2300D0 */ lw $v1, 0xd0($s1) +/* B2D4B8 80241048 3C014282 */ lui $at, 0x4282 +/* B2D4BC 8024104C 44810000 */ mtc1 $at, $f0 +/* B2D4C0 80241050 8C630090 */ lw $v1, 0x90($v1) +/* B2D4C4 80241054 0040982D */ daddu $s3, $v0, $zero +/* B2D4C8 80241058 E7A00030 */ swc1 $f0, 0x30($sp) +/* B2D4CC 8024105C A7A00034 */ sh $zero, 0x34($sp) +/* B2D4D0 80241060 16000005 */ bnez $s0, .L80241078 +/* B2D4D4 80241064 AFA3002C */ sw $v1, 0x2c($sp) +/* B2D4D8 80241068 8E2200B0 */ lw $v0, 0xb0($s1) +/* B2D4DC 8024106C 30420004 */ andi $v0, $v0, 4 +/* B2D4E0 80241070 10400044 */ beqz $v0, .L80241184 +/* B2D4E4 80241074 00000000 */ nop +.L80241078: +/* B2D4E8 80241078 2404F7FF */ addiu $a0, $zero, -0x801 +/* B2D4EC 8024107C AE800070 */ sw $zero, 0x70($s4) +/* B2D4F0 80241080 A640008E */ sh $zero, 0x8e($s2) +/* B2D4F4 80241084 8E2200CC */ lw $v0, 0xcc($s1) +/* B2D4F8 80241088 8E430000 */ lw $v1, ($s2) +/* B2D4FC 8024108C 8C420000 */ lw $v0, ($v0) +/* B2D500 80241090 00641824 */ and $v1, $v1, $a0 +/* B2D504 80241094 AE430000 */ sw $v1, ($s2) +/* B2D508 80241098 AE420028 */ sw $v0, 0x28($s2) +/* B2D50C 8024109C 8E2200D0 */ lw $v0, 0xd0($s1) +/* B2D510 802410A0 8C420098 */ lw $v0, 0x98($v0) +/* B2D514 802410A4 54400005 */ bnel $v0, $zero, .L802410BC +/* B2D518 802410A8 2402FDFF */ addiu $v0, $zero, -0x201 +/* B2D51C 802410AC 34620200 */ ori $v0, $v1, 0x200 +/* B2D520 802410B0 2403FFF7 */ addiu $v1, $zero, -9 +/* B2D524 802410B4 08090431 */ j .L802410C4 +/* B2D528 802410B8 00431024 */ and $v0, $v0, $v1 +.L802410BC: +/* B2D52C 802410BC 00621024 */ and $v0, $v1, $v0 +/* B2D530 802410C0 34420008 */ ori $v0, $v0, 8 +.L802410C4: +/* B2D534 802410C4 AE420000 */ sw $v0, ($s2) +/* B2D538 802410C8 8E2200B0 */ lw $v0, 0xb0($s1) +/* B2D53C 802410CC 30420004 */ andi $v0, $v0, 4 +/* B2D540 802410D0 10400008 */ beqz $v0, .L802410F4 +/* B2D544 802410D4 24020063 */ addiu $v0, $zero, 0x63 +/* B2D548 802410D8 AE820070 */ sw $v0, 0x70($s4) +/* B2D54C 802410DC AE800074 */ sw $zero, 0x74($s4) +/* B2D550 802410E0 8E2200B0 */ lw $v0, 0xb0($s1) +/* B2D554 802410E4 2403FFFB */ addiu $v1, $zero, -5 +/* B2D558 802410E8 00431024 */ and $v0, $v0, $v1 +/* B2D55C 802410EC 08090448 */ j .L80241120 +/* B2D560 802410F0 AE2200B0 */ sw $v0, 0xb0($s1) +.L802410F4: +/* B2D564 802410F4 8E220000 */ lw $v0, ($s1) +/* B2D568 802410F8 3C034000 */ lui $v1, 0x4000 +/* B2D56C 802410FC 00431024 */ and $v0, $v0, $v1 +/* B2D570 80241100 10400007 */ beqz $v0, .L80241120 +/* B2D574 80241104 3C03BFFF */ lui $v1, 0xbfff +/* B2D578 80241108 2402000C */ addiu $v0, $zero, 0xc +/* B2D57C 8024110C AE820070 */ sw $v0, 0x70($s4) +/* B2D580 80241110 8E220000 */ lw $v0, ($s1) +/* B2D584 80241114 3463FFFF */ ori $v1, $v1, 0xffff +/* B2D588 80241118 00431024 */ and $v0, $v0, $v1 +/* B2D58C 8024111C AE220000 */ sw $v0, ($s1) +.L80241120: +/* B2D590 80241120 27A50038 */ addiu $a1, $sp, 0x38 +/* B2D594 80241124 27A6003C */ addiu $a2, $sp, 0x3c +/* B2D598 80241128 C6400038 */ lwc1 $f0, 0x38($s2) +/* B2D59C 8024112C 864200A8 */ lh $v0, 0xa8($s2) +/* B2D5A0 80241130 3C0142C8 */ lui $at, 0x42c8 +/* B2D5A4 80241134 44812000 */ mtc1 $at, $f4 +/* B2D5A8 80241138 44823000 */ mtc1 $v0, $f6 +/* B2D5AC 8024113C 00000000 */ nop +/* B2D5B0 80241140 468031A0 */ cvt.s.w $f6, $f6 +/* B2D5B4 80241144 27A20044 */ addiu $v0, $sp, 0x44 +/* B2D5B8 80241148 E7A00038 */ swc1 $f0, 0x38($sp) +/* B2D5BC 8024114C C640003C */ lwc1 $f0, 0x3c($s2) +/* B2D5C0 80241150 C6420040 */ lwc1 $f2, 0x40($s2) +/* B2D5C4 80241154 46060000 */ add.s $f0, $f0, $f6 +/* B2D5C8 80241158 E7A40044 */ swc1 $f4, 0x44($sp) +/* B2D5CC 8024115C E7A20040 */ swc1 $f2, 0x40($sp) +/* B2D5D0 80241160 E7A0003C */ swc1 $f0, 0x3c($sp) +/* B2D5D4 80241164 AFA20010 */ sw $v0, 0x10($sp) +/* B2D5D8 80241168 8E440080 */ lw $a0, 0x80($s2) +/* B2D5DC 8024116C 0C0372DF */ jal func_800DCB7C +/* B2D5E0 80241170 27A70040 */ addiu $a3, $sp, 0x40 +/* B2D5E4 80241174 10400003 */ beqz $v0, .L80241184 +/* B2D5E8 80241178 00000000 */ nop +/* B2D5EC 8024117C C7A0003C */ lwc1 $f0, 0x3c($sp) +/* B2D5F0 80241180 E640003C */ swc1 $f0, 0x3c($s2) +.L80241184: +/* B2D5F4 80241184 8E830070 */ lw $v1, 0x70($s4) +/* B2D5F8 80241188 2C620064 */ sltiu $v0, $v1, 0x64 +/* B2D5FC 8024118C 10400042 */ beqz $v0, .L80241298 +/* B2D600 80241190 00031080 */ sll $v0, $v1, 2 +/* B2D604 80241194 3C018025 */ lui $at, 0x8025 +/* B2D608 80241198 00220821 */ addu $at, $at, $v0 +/* B2D60C 8024119C 8C2285D0 */ lw $v0, -0x7a30($at) +/* B2D610 802411A0 00400008 */ jr $v0 +/* B2D614 802411A4 00000000 */ nop +/* B2D618 802411A8 0280202D */ daddu $a0, $s4, $zero +/* B2D61C 802411AC 0260282D */ daddu $a1, $s3, $zero +/* B2D620 802411B0 0C09010C */ jal func_80240430_B2C8A0 +/* B2D624 802411B4 02A0302D */ daddu $a2, $s5, $zero +/* B2D628 802411B8 0280202D */ daddu $a0, $s4, $zero +/* B2D62C 802411BC 0260282D */ daddu $a1, $s3, $zero +/* B2D630 802411C0 0C090162 */ jal func_80240588_B2C9F8 +/* B2D634 802411C4 02A0302D */ daddu $a2, $s5, $zero +/* B2D638 802411C8 080904A6 */ j .L80241298 +/* B2D63C 802411CC 00000000 */ nop +/* B2D640 802411D0 0280202D */ daddu $a0, $s4, $zero +/* B2D644 802411D4 0260282D */ daddu $a1, $s3, $zero +/* B2D648 802411D8 0C09020C */ jal func_80240830_B2CCA0 +/* B2D64C 802411DC 02A0302D */ daddu $a2, $s5, $zero +/* B2D650 802411E0 0280202D */ daddu $a0, $s4, $zero +/* B2D654 802411E4 0260282D */ daddu $a1, $s3, $zero +/* B2D658 802411E8 0C09023C */ jal func_802408F0_B2CD60 +/* B2D65C 802411EC 02A0302D */ daddu $a2, $s5, $zero +/* B2D660 802411F0 080904A6 */ j .L80241298 +/* B2D664 802411F4 00000000 */ nop +/* B2D668 802411F8 0280202D */ daddu $a0, $s4, $zero +/* B2D66C 802411FC 0260282D */ daddu $a1, $s3, $zero +/* B2D670 80241200 0C0902AB */ jal func_80240AAC_B2CF1C +/* B2D674 80241204 02A0302D */ daddu $a2, $s5, $zero +/* B2D678 80241208 080904A6 */ j .L80241298 +/* B2D67C 8024120C 00000000 */ nop +/* B2D680 80241210 0280202D */ daddu $a0, $s4, $zero +/* B2D684 80241214 0260282D */ daddu $a1, $s3, $zero +/* B2D688 80241218 0C0902D8 */ jal func_80240B60_B2CFD0 +/* B2D68C 8024121C 02A0302D */ daddu $a2, $s5, $zero +/* B2D690 80241220 0280202D */ daddu $a0, $s4, $zero +/* B2D694 80241224 0260282D */ daddu $a1, $s3, $zero +/* B2D698 80241228 0C0902F5 */ jal func_80240BD4_B2D044 +/* B2D69C 8024122C 02A0302D */ daddu $a2, $s5, $zero +/* B2D6A0 80241230 080904A6 */ j .L80241298 +/* B2D6A4 80241234 00000000 */ nop +/* B2D6A8 80241238 0280202D */ daddu $a0, $s4, $zero +/* B2D6AC 8024123C 0260282D */ daddu $a1, $s3, $zero +/* B2D6B0 80241240 0C090313 */ jal func_80240C4C_B2D0BC +/* B2D6B4 80241244 02A0302D */ daddu $a2, $s5, $zero +/* B2D6B8 80241248 0280202D */ daddu $a0, $s4, $zero +/* B2D6BC 8024124C 0260282D */ daddu $a1, $s3, $zero +/* B2D6C0 80241250 0C09035F */ jal func_80240D7C_B2D1EC +/* B2D6C4 80241254 02A0302D */ daddu $a2, $s5, $zero +/* B2D6C8 80241258 080904A6 */ j .L80241298 +/* B2D6CC 8024125C 00000000 */ nop +/* B2D6D0 80241260 0280202D */ daddu $a0, $s4, $zero +/* B2D6D4 80241264 0260282D */ daddu $a1, $s3, $zero +/* B2D6D8 80241268 0C0903A7 */ jal func_80240E9C_B2D30C +/* B2D6DC 8024126C 02A0302D */ daddu $a2, $s5, $zero +/* B2D6E0 80241270 080904A6 */ j .L80241298 +/* B2D6E4 80241274 00000000 */ nop +/* B2D6E8 80241278 0280202D */ daddu $a0, $s4, $zero +/* B2D6EC 8024127C 0260282D */ daddu $a1, $s3, $zero +/* B2D6F0 80241280 0C0903C1 */ jal func_80240F04_B2D374 +/* B2D6F4 80241284 02A0302D */ daddu $a2, $s5, $zero +/* B2D6F8 80241288 080904A6 */ j .L80241298 +/* B2D6FC 8024128C 00000000 */ nop +/* B2D700 80241290 0C0129CF */ jal func_8004A73C +/* B2D704 80241294 0280202D */ daddu $a0, $s4, $zero +.L80241298: +/* B2D708 80241298 8FBF0060 */ lw $ra, 0x60($sp) +/* B2D70C 8024129C 8FB5005C */ lw $s5, 0x5c($sp) +/* B2D710 802412A0 8FB40058 */ lw $s4, 0x58($sp) +/* B2D714 802412A4 8FB30054 */ lw $s3, 0x54($sp) +/* B2D718 802412A8 8FB20050 */ lw $s2, 0x50($sp) +/* B2D71C 802412AC 8FB1004C */ lw $s1, 0x4c($sp) +/* B2D720 802412B0 8FB00048 */ lw $s0, 0x48($sp) +/* B2D724 802412B4 0000102D */ daddu $v0, $zero, $zero +/* B2D728 802412B8 03E00008 */ jr $ra +/* B2D72C 802412BC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578.s deleted file mode 100644 index c954f8e83f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241578 -/* B2D9E8 80241578 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2D9EC 8024157C AFBF0010 */ sw $ra, 0x10($sp) -/* B2D9F0 80241580 8C82000C */ lw $v0, 0xc($a0) -/* B2D9F4 80241584 0C0B1EAF */ jal get_variable -/* B2D9F8 80241588 8C450000 */ lw $a1, ($v0) -/* B2D9FC 8024158C 0040182D */ daddu $v1, $v0, $zero -/* B2DA00 80241590 10600012 */ beqz $v1, .L802415DC -/* B2DA04 80241594 0000202D */ daddu $a0, $zero, $zero -/* B2DA08 80241598 8C620000 */ lw $v0, ($v1) -/* B2DA0C 8024159C 5040000A */ beql $v0, $zero, .L802415C8 -/* B2DA10 802415A0 00041080 */ sll $v0, $a0, 2 -/* B2DA14 802415A4 3C058025 */ lui $a1, 0x8025 -/* B2DA18 802415A8 24A58760 */ addiu $a1, $a1, -0x78a0 -.L802415AC: -/* B2DA1C 802415AC 24630004 */ addiu $v1, $v1, 4 -/* B2DA20 802415B0 24840001 */ addiu $a0, $a0, 1 -/* B2DA24 802415B4 ACA20000 */ sw $v0, ($a1) -/* B2DA28 802415B8 8C620000 */ lw $v0, ($v1) -/* B2DA2C 802415BC 1440FFFB */ bnez $v0, .L802415AC -/* B2DA30 802415C0 24A50004 */ addiu $a1, $a1, 4 -/* B2DA34 802415C4 00041080 */ sll $v0, $a0, 2 -.L802415C8: -/* B2DA38 802415C8 3C018025 */ lui $at, 0x8025 -/* B2DA3C 802415CC 00220821 */ addu $at, $at, $v0 -/* B2DA40 802415D0 AC208760 */ sw $zero, -0x78a0($at) -/* B2DA44 802415D4 08090581 */ j .L80241604 -/* B2DA48 802415D8 00000000 */ nop -.L802415DC: -/* B2DA4C 802415DC 3C038025 */ lui $v1, 0x8025 -/* B2DA50 802415E0 24638760 */ addiu $v1, $v1, -0x78a0 -/* B2DA54 802415E4 0060282D */ daddu $a1, $v1, $zero -.L802415E8: -/* B2DA58 802415E8 24820010 */ addiu $v0, $a0, 0x10 -/* B2DA5C 802415EC AC620000 */ sw $v0, ($v1) -/* B2DA60 802415F0 24630004 */ addiu $v1, $v1, 4 -/* B2DA64 802415F4 24840001 */ addiu $a0, $a0, 1 -/* B2DA68 802415F8 28820070 */ slti $v0, $a0, 0x70 -/* B2DA6C 802415FC 1440FFFA */ bnez $v0, .L802415E8 -/* B2DA70 80241600 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241604: -/* B2DA74 80241604 8FBF0010 */ lw $ra, 0x10($sp) -/* B2DA78 80241608 24020002 */ addiu $v0, $zero, 2 -/* B2DA7C 8024160C 03E00008 */ jr $ra -/* B2DA80 80241610 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s new file mode 100644 index 0000000000..66a095b1b0 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241578_B2D9E8.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241578_B2D9E8 +/* B2D9E8 80241578 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B2D9EC 8024157C AFBF0010 */ sw $ra, 0x10($sp) +/* B2D9F0 80241580 8C82000C */ lw $v0, 0xc($a0) +/* B2D9F4 80241584 0C0B1EAF */ jal get_variable +/* B2D9F8 80241588 8C450000 */ lw $a1, ($v0) +/* B2D9FC 8024158C 0040182D */ daddu $v1, $v0, $zero +/* B2DA00 80241590 10600012 */ beqz $v1, .L802415DC +/* B2DA04 80241594 0000202D */ daddu $a0, $zero, $zero +/* B2DA08 80241598 8C620000 */ lw $v0, ($v1) +/* B2DA0C 8024159C 5040000A */ beql $v0, $zero, .L802415C8 +/* B2DA10 802415A0 00041080 */ sll $v0, $a0, 2 +/* B2DA14 802415A4 3C058025 */ lui $a1, 0x8025 +/* B2DA18 802415A8 24A58760 */ addiu $a1, $a1, -0x78a0 +.L802415AC: +/* B2DA1C 802415AC 24630004 */ addiu $v1, $v1, 4 +/* B2DA20 802415B0 24840001 */ addiu $a0, $a0, 1 +/* B2DA24 802415B4 ACA20000 */ sw $v0, ($a1) +/* B2DA28 802415B8 8C620000 */ lw $v0, ($v1) +/* B2DA2C 802415BC 1440FFFB */ bnez $v0, .L802415AC +/* B2DA30 802415C0 24A50004 */ addiu $a1, $a1, 4 +/* B2DA34 802415C4 00041080 */ sll $v0, $a0, 2 +.L802415C8: +/* B2DA38 802415C8 3C018025 */ lui $at, 0x8025 +/* B2DA3C 802415CC 00220821 */ addu $at, $at, $v0 +/* B2DA40 802415D0 AC208760 */ sw $zero, -0x78a0($at) +/* B2DA44 802415D4 08090581 */ j .L80241604 +/* B2DA48 802415D8 00000000 */ nop +.L802415DC: +/* B2DA4C 802415DC 3C038025 */ lui $v1, 0x8025 +/* B2DA50 802415E0 24638760 */ addiu $v1, $v1, -0x78a0 +/* B2DA54 802415E4 0060282D */ daddu $a1, $v1, $zero +.L802415E8: +/* B2DA58 802415E8 24820010 */ addiu $v0, $a0, 0x10 +/* B2DA5C 802415EC AC620000 */ sw $v0, ($v1) +/* B2DA60 802415F0 24630004 */ addiu $v1, $v1, 4 +/* B2DA64 802415F4 24840001 */ addiu $a0, $a0, 1 +/* B2DA68 802415F8 28820070 */ slti $v0, $a0, 0x70 +/* B2DA6C 802415FC 1440FFFA */ bnez $v0, .L802415E8 +/* B2DA70 80241600 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80241604: +/* B2DA74 80241604 8FBF0010 */ lw $ra, 0x10($sp) +/* B2DA78 80241608 24020002 */ addiu $v0, $zero, 2 +/* B2DA7C 8024160C 03E00008 */ jr $ra +/* B2DA80 80241610 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C.s deleted file mode 100644 index 4ae7ecfa70..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024172C -/* B2DB9C 8024172C 24020001 */ addiu $v0, $zero, 1 -/* B2DBA0 80241730 3C018015 */ lui $at, %hi(D_80151310) -/* B2DBA4 80241734 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* B2DBA8 80241738 03E00008 */ jr $ra -/* B2DBAC 8024173C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s new file mode 100644 index 0000000000..85143edf50 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024172C_B2DB9C +/* B2DB9C 8024172C 24020001 */ addiu $v0, $zero, 1 +/* B2DBA0 80241730 3C018015 */ lui $at, %hi(D_80151310) +/* B2DBA4 80241734 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* B2DBA8 80241738 03E00008 */ jr $ra +/* B2DBAC 8024173C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740.s deleted file mode 100644 index ed1ff9fc01..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241740 -/* B2DBB0 80241740 3C018015 */ lui $at, %hi(D_80151310) -/* B2DBB4 80241744 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* B2DBB8 80241748 03E00008 */ jr $ra -/* B2DBBC 8024174C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s new file mode 100644 index 0000000000..25e083dfc7 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241740_B2DBB0 +/* B2DBB0 80241740 3C018015 */ lui $at, %hi(D_80151310) +/* B2DBB4 80241744 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* B2DBB8 80241748 03E00008 */ jr $ra +/* B2DBBC 8024174C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750.s deleted file mode 100644 index 094374bf34..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241750 -/* B2DBC0 80241750 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2DBC4 80241754 AFB10024 */ sw $s1, 0x24($sp) -/* B2DBC8 80241758 0080882D */ daddu $s1, $a0, $zero -/* B2DBCC 8024175C 3C05F840 */ lui $a1, 0xf840 -/* B2DBD0 80241760 AFBF0044 */ sw $ra, 0x44($sp) -/* B2DBD4 80241764 AFBE0040 */ sw $fp, 0x40($sp) -/* B2DBD8 80241768 AFB7003C */ sw $s7, 0x3c($sp) -/* B2DBDC 8024176C AFB60038 */ sw $s6, 0x38($sp) -/* B2DBE0 80241770 AFB50034 */ sw $s5, 0x34($sp) -/* B2DBE4 80241774 AFB40030 */ sw $s4, 0x30($sp) -/* B2DBE8 80241778 AFB3002C */ sw $s3, 0x2c($sp) -/* B2DBEC 8024177C AFB20028 */ sw $s2, 0x28($sp) -/* B2DBF0 80241780 AFB00020 */ sw $s0, 0x20($sp) -/* B2DBF4 80241784 8E3E0148 */ lw $fp, 0x148($s1) -/* B2DBF8 80241788 0C0B1EAF */ jal get_variable -/* B2DBFC 8024178C 34A56268 */ ori $a1, $a1, 0x6268 -/* B2DC00 80241790 0040802D */ daddu $s0, $v0, $zero -/* B2DC04 80241794 0220202D */ daddu $a0, $s1, $zero -/* B2DC08 80241798 3C05F840 */ lui $a1, 0xf840 -/* B2DC0C 8024179C 0C0B1EAF */ jal get_variable -/* B2DC10 802417A0 34A56269 */ ori $a1, $a1, 0x6269 -/* B2DC14 802417A4 0040B82D */ daddu $s7, $v0, $zero -/* B2DC18 802417A8 0220202D */ daddu $a0, $s1, $zero -/* B2DC1C 802417AC 3C05F5DE */ lui $a1, 0xf5de -/* B2DC20 802417B0 0C0B1EAF */ jal get_variable -/* B2DC24 802417B4 34A502DE */ ori $a1, $a1, 0x2de -/* B2DC28 802417B8 0040B02D */ daddu $s6, $v0, $zero -/* B2DC2C 802417BC 0220202D */ daddu $a0, $s1, $zero -/* B2DC30 802417C0 3C05F5DE */ lui $a1, 0xf5de -/* B2DC34 802417C4 0C0B1EAF */ jal get_variable -/* B2DC38 802417C8 34A502DF */ ori $a1, $a1, 0x2df -/* B2DC3C 802417CC 0040A82D */ daddu $s5, $v0, $zero -/* B2DC40 802417D0 93D3006D */ lbu $s3, 0x6d($fp) -/* B2DC44 802417D4 32C2FFFF */ andi $v0, $s6, 0xffff -/* B2DC48 802417D8 A7B30010 */ sh $s3, 0x10($sp) -/* B2DC4C 802417DC 93D2006E */ lbu $s2, 0x6e($fp) -/* B2DC50 802417E0 93C7006F */ lbu $a3, 0x6f($fp) -/* B2DC54 802417E4 3274FFFF */ andi $s4, $s3, 0xffff -/* B2DC58 802417E8 12820003 */ beq $s4, $v0, .L802417F8 -/* B2DC5C 802417EC A7A7001E */ sh $a3, 0x1e($sp) -/* B2DC60 802417F0 0000B82D */ daddu $s7, $zero, $zero -/* B2DC64 802417F4 02E0802D */ daddu $s0, $s7, $zero -.L802417F8: -/* B2DC68 802417F8 3202FFFF */ andi $v0, $s0, 0xffff -/* B2DC6C 802417FC 14400016 */ bnez $v0, .L80241858 -/* B2DC70 80241800 0220202D */ daddu $a0, $s1, $zero -/* B2DC74 80241804 0C00A67F */ jal rand_int -/* B2DC78 80241808 24040064 */ addiu $a0, $zero, 0x64 -/* B2DC7C 8024180C 2842001E */ slti $v0, $v0, 0x1e -/* B2DC80 80241810 10400011 */ beqz $v0, .L80241858 -/* B2DC84 80241814 0220202D */ daddu $a0, $s1, $zero -/* B2DC88 80241818 0C00A67F */ jal rand_int -/* B2DC8C 8024181C 2644FFFF */ addiu $a0, $s2, -1 -/* B2DC90 80241820 0040A82D */ daddu $s5, $v0, $zero -/* B2DC94 80241824 0260B02D */ daddu $s6, $s3, $zero -/* B2DC98 80241828 0220202D */ daddu $a0, $s1, $zero -/* B2DC9C 8024182C 3C05F5DE */ lui $a1, 0xf5de -/* B2DCA0 80241830 34A502DE */ ori $a1, $a1, 0x2de -/* B2DCA4 80241834 0C0B2026 */ jal set_variable -/* B2DCA8 80241838 0280302D */ daddu $a2, $s4, $zero -/* B2DCAC 8024183C 0220202D */ daddu $a0, $s1, $zero -/* B2DCB0 80241840 3C05F5DE */ lui $a1, 0xf5de -/* B2DCB4 80241844 34A502DF */ ori $a1, $a1, 0x2df -/* B2DCB8 80241848 0C0B2026 */ jal set_variable -/* B2DCBC 8024184C 32A6FFFF */ andi $a2, $s5, 0xffff -/* B2DCC0 80241850 24100001 */ addiu $s0, $zero, 1 -/* B2DCC4 80241854 0220202D */ daddu $a0, $s1, $zero -.L80241858: -/* B2DCC8 80241858 3C05F840 */ lui $a1, 0xf840 -/* B2DCCC 8024185C 34A56268 */ ori $a1, $a1, 0x6268 -/* B2DCD0 80241860 0C0B2026 */ jal set_variable -/* B2DCD4 80241864 3206FFFF */ andi $a2, $s0, 0xffff -/* B2DCD8 80241868 0220202D */ daddu $a0, $s1, $zero -/* B2DCDC 8024186C 3C05F840 */ lui $a1, 0xf840 -/* B2DCE0 80241870 34A56269 */ ori $a1, $a1, 0x6269 -/* B2DCE4 80241874 0C0B2026 */ jal set_variable -/* B2DCE8 80241878 32E6FFFF */ andi $a2, $s7, 0xffff -/* B2DCEC 8024187C 0000202D */ daddu $a0, $zero, $zero -/* B2DCF0 80241880 3C05F5DE */ lui $a1, 0xf5de -/* B2DCF4 80241884 0C0B1EAF */ jal get_variable -/* B2DCF8 80241888 34A502E0 */ ori $a1, $a1, 0x2e0 -/* B2DCFC 8024188C 0000202D */ daddu $a0, $zero, $zero -/* B2DD00 80241890 3C05F5DE */ lui $a1, 0xf5de -/* B2DD04 80241894 34A50180 */ ori $a1, $a1, 0x180 -/* B2DD08 80241898 0C0B1EAF */ jal get_variable -/* B2DD0C 8024189C 0040802D */ daddu $s0, $v0, $zero -/* B2DD10 802418A0 0040282D */ daddu $a1, $v0, $zero -/* B2DD14 802418A4 0000182D */ daddu $v1, $zero, $zero -/* B2DD18 802418A8 3C068024 */ lui $a2, 0x8024 -/* B2DD1C 802418AC 24C63288 */ addiu $a2, $a2, 0x3288 -/* B2DD20 802418B0 00C0202D */ daddu $a0, $a2, $zero -.L802418B4: -/* B2DD24 802418B4 8C820000 */ lw $v0, ($a0) -/* B2DD28 802418B8 00A2102A */ slt $v0, $a1, $v0 -/* B2DD2C 802418BC 14400006 */ bnez $v0, .L802418D8 -/* B2DD30 802418C0 000310C0 */ sll $v0, $v1, 3 -/* B2DD34 802418C4 24630001 */ addiu $v1, $v1, 1 -/* B2DD38 802418C8 28620008 */ slti $v0, $v1, 8 -/* B2DD3C 802418CC 1440FFF9 */ bnez $v0, .L802418B4 -/* B2DD40 802418D0 24840008 */ addiu $a0, $a0, 8 -/* B2DD44 802418D4 000310C0 */ sll $v0, $v1, 3 -.L802418D8: -/* B2DD48 802418D8 00461021 */ addu $v0, $v0, $a2 -/* B2DD4C 802418DC 8C420004 */ lw $v0, 4($v0) -/* B2DD50 802418E0 97A30010 */ lhu $v1, 0x10($sp) -/* B2DD54 802418E4 0202202A */ slt $a0, $s0, $v0 -/* B2DD58 802418E8 32C2FFFF */ andi $v0, $s6, 0xffff -/* B2DD5C 802418EC 14620008 */ bne $v1, $v0, .L80241910 -/* B2DD60 802418F0 32A2FFFF */ andi $v0, $s5, 0xffff -/* B2DD64 802418F4 97A7001E */ lhu $a3, 0x1e($sp) -/* B2DD68 802418F8 14E20005 */ bne $a3, $v0, .L80241910 -/* B2DD6C 802418FC 32E2FFFF */ andi $v0, $s7, 0xffff -/* B2DD70 80241900 14400003 */ bnez $v0, .L80241910 -/* B2DD74 80241904 00000000 */ nop -/* B2DD78 80241908 14800008 */ bnez $a0, .L8024192C -/* B2DD7C 8024190C 24020001 */ addiu $v0, $zero, 1 -.L80241910: -/* B2DD80 80241910 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B2DD84 80241914 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B2DD88 80241918 80420075 */ lb $v0, 0x75($v0) -/* B2DD8C 8024191C 10400005 */ beqz $v0, .L80241934 -/* B2DD90 80241920 00000000 */ nop -/* B2DD94 80241924 10800003 */ beqz $a0, .L80241934 -/* B2DD98 80241928 24020001 */ addiu $v0, $zero, 1 -.L8024192C: -/* B2DD9C 8024192C 08090650 */ j .L80241940 -/* B2DDA0 80241930 AE220084 */ sw $v0, 0x84($s1) -.L80241934: -/* B2DDA4 80241934 0C00F9EB */ jal kill_enemy -/* B2DDA8 80241938 03C0202D */ daddu $a0, $fp, $zero -/* B2DDAC 8024193C AE200084 */ sw $zero, 0x84($s1) -.L80241940: -/* B2DDB0 80241940 8FBF0044 */ lw $ra, 0x44($sp) -/* B2DDB4 80241944 8FBE0040 */ lw $fp, 0x40($sp) -/* B2DDB8 80241948 8FB7003C */ lw $s7, 0x3c($sp) -/* B2DDBC 8024194C 8FB60038 */ lw $s6, 0x38($sp) -/* B2DDC0 80241950 8FB50034 */ lw $s5, 0x34($sp) -/* B2DDC4 80241954 8FB40030 */ lw $s4, 0x30($sp) -/* B2DDC8 80241958 8FB3002C */ lw $s3, 0x2c($sp) -/* B2DDCC 8024195C 8FB20028 */ lw $s2, 0x28($sp) -/* B2DDD0 80241960 8FB10024 */ lw $s1, 0x24($sp) -/* B2DDD4 80241964 8FB00020 */ lw $s0, 0x20($sp) -/* B2DDD8 80241968 24020002 */ addiu $v0, $zero, 2 -/* B2DDDC 8024196C 03E00008 */ jr $ra -/* B2DDE0 80241970 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s new file mode 100644 index 0000000000..064b690a08 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241750_B2DBC0.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241750_B2DBC0 +/* B2DBC0 80241750 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B2DBC4 80241754 AFB10024 */ sw $s1, 0x24($sp) +/* B2DBC8 80241758 0080882D */ daddu $s1, $a0, $zero +/* B2DBCC 8024175C 3C05F840 */ lui $a1, 0xf840 +/* B2DBD0 80241760 AFBF0044 */ sw $ra, 0x44($sp) +/* B2DBD4 80241764 AFBE0040 */ sw $fp, 0x40($sp) +/* B2DBD8 80241768 AFB7003C */ sw $s7, 0x3c($sp) +/* B2DBDC 8024176C AFB60038 */ sw $s6, 0x38($sp) +/* B2DBE0 80241770 AFB50034 */ sw $s5, 0x34($sp) +/* B2DBE4 80241774 AFB40030 */ sw $s4, 0x30($sp) +/* B2DBE8 80241778 AFB3002C */ sw $s3, 0x2c($sp) +/* B2DBEC 8024177C AFB20028 */ sw $s2, 0x28($sp) +/* B2DBF0 80241780 AFB00020 */ sw $s0, 0x20($sp) +/* B2DBF4 80241784 8E3E0148 */ lw $fp, 0x148($s1) +/* B2DBF8 80241788 0C0B1EAF */ jal get_variable +/* B2DBFC 8024178C 34A56268 */ ori $a1, $a1, 0x6268 +/* B2DC00 80241790 0040802D */ daddu $s0, $v0, $zero +/* B2DC04 80241794 0220202D */ daddu $a0, $s1, $zero +/* B2DC08 80241798 3C05F840 */ lui $a1, 0xf840 +/* B2DC0C 8024179C 0C0B1EAF */ jal get_variable +/* B2DC10 802417A0 34A56269 */ ori $a1, $a1, 0x6269 +/* B2DC14 802417A4 0040B82D */ daddu $s7, $v0, $zero +/* B2DC18 802417A8 0220202D */ daddu $a0, $s1, $zero +/* B2DC1C 802417AC 3C05F5DE */ lui $a1, 0xf5de +/* B2DC20 802417B0 0C0B1EAF */ jal get_variable +/* B2DC24 802417B4 34A502DE */ ori $a1, $a1, 0x2de +/* B2DC28 802417B8 0040B02D */ daddu $s6, $v0, $zero +/* B2DC2C 802417BC 0220202D */ daddu $a0, $s1, $zero +/* B2DC30 802417C0 3C05F5DE */ lui $a1, 0xf5de +/* B2DC34 802417C4 0C0B1EAF */ jal get_variable +/* B2DC38 802417C8 34A502DF */ ori $a1, $a1, 0x2df +/* B2DC3C 802417CC 0040A82D */ daddu $s5, $v0, $zero +/* B2DC40 802417D0 93D3006D */ lbu $s3, 0x6d($fp) +/* B2DC44 802417D4 32C2FFFF */ andi $v0, $s6, 0xffff +/* B2DC48 802417D8 A7B30010 */ sh $s3, 0x10($sp) +/* B2DC4C 802417DC 93D2006E */ lbu $s2, 0x6e($fp) +/* B2DC50 802417E0 93C7006F */ lbu $a3, 0x6f($fp) +/* B2DC54 802417E4 3274FFFF */ andi $s4, $s3, 0xffff +/* B2DC58 802417E8 12820003 */ beq $s4, $v0, .L802417F8 +/* B2DC5C 802417EC A7A7001E */ sh $a3, 0x1e($sp) +/* B2DC60 802417F0 0000B82D */ daddu $s7, $zero, $zero +/* B2DC64 802417F4 02E0802D */ daddu $s0, $s7, $zero +.L802417F8: +/* B2DC68 802417F8 3202FFFF */ andi $v0, $s0, 0xffff +/* B2DC6C 802417FC 14400016 */ bnez $v0, .L80241858 +/* B2DC70 80241800 0220202D */ daddu $a0, $s1, $zero +/* B2DC74 80241804 0C00A67F */ jal rand_int +/* B2DC78 80241808 24040064 */ addiu $a0, $zero, 0x64 +/* B2DC7C 8024180C 2842001E */ slti $v0, $v0, 0x1e +/* B2DC80 80241810 10400011 */ beqz $v0, .L80241858 +/* B2DC84 80241814 0220202D */ daddu $a0, $s1, $zero +/* B2DC88 80241818 0C00A67F */ jal rand_int +/* B2DC8C 8024181C 2644FFFF */ addiu $a0, $s2, -1 +/* B2DC90 80241820 0040A82D */ daddu $s5, $v0, $zero +/* B2DC94 80241824 0260B02D */ daddu $s6, $s3, $zero +/* B2DC98 80241828 0220202D */ daddu $a0, $s1, $zero +/* B2DC9C 8024182C 3C05F5DE */ lui $a1, 0xf5de +/* B2DCA0 80241830 34A502DE */ ori $a1, $a1, 0x2de +/* B2DCA4 80241834 0C0B2026 */ jal set_variable +/* B2DCA8 80241838 0280302D */ daddu $a2, $s4, $zero +/* B2DCAC 8024183C 0220202D */ daddu $a0, $s1, $zero +/* B2DCB0 80241840 3C05F5DE */ lui $a1, 0xf5de +/* B2DCB4 80241844 34A502DF */ ori $a1, $a1, 0x2df +/* B2DCB8 80241848 0C0B2026 */ jal set_variable +/* B2DCBC 8024184C 32A6FFFF */ andi $a2, $s5, 0xffff +/* B2DCC0 80241850 24100001 */ addiu $s0, $zero, 1 +/* B2DCC4 80241854 0220202D */ daddu $a0, $s1, $zero +.L80241858: +/* B2DCC8 80241858 3C05F840 */ lui $a1, 0xf840 +/* B2DCCC 8024185C 34A56268 */ ori $a1, $a1, 0x6268 +/* B2DCD0 80241860 0C0B2026 */ jal set_variable +/* B2DCD4 80241864 3206FFFF */ andi $a2, $s0, 0xffff +/* B2DCD8 80241868 0220202D */ daddu $a0, $s1, $zero +/* B2DCDC 8024186C 3C05F840 */ lui $a1, 0xf840 +/* B2DCE0 80241870 34A56269 */ ori $a1, $a1, 0x6269 +/* B2DCE4 80241874 0C0B2026 */ jal set_variable +/* B2DCE8 80241878 32E6FFFF */ andi $a2, $s7, 0xffff +/* B2DCEC 8024187C 0000202D */ daddu $a0, $zero, $zero +/* B2DCF0 80241880 3C05F5DE */ lui $a1, 0xf5de +/* B2DCF4 80241884 0C0B1EAF */ jal get_variable +/* B2DCF8 80241888 34A502E0 */ ori $a1, $a1, 0x2e0 +/* B2DCFC 8024188C 0000202D */ daddu $a0, $zero, $zero +/* B2DD00 80241890 3C05F5DE */ lui $a1, 0xf5de +/* B2DD04 80241894 34A50180 */ ori $a1, $a1, 0x180 +/* B2DD08 80241898 0C0B1EAF */ jal get_variable +/* B2DD0C 8024189C 0040802D */ daddu $s0, $v0, $zero +/* B2DD10 802418A0 0040282D */ daddu $a1, $v0, $zero +/* B2DD14 802418A4 0000182D */ daddu $v1, $zero, $zero +/* B2DD18 802418A8 3C068024 */ lui $a2, 0x8024 +/* B2DD1C 802418AC 24C63288 */ addiu $a2, $a2, 0x3288 +/* B2DD20 802418B0 00C0202D */ daddu $a0, $a2, $zero +.L802418B4: +/* B2DD24 802418B4 8C820000 */ lw $v0, ($a0) +/* B2DD28 802418B8 00A2102A */ slt $v0, $a1, $v0 +/* B2DD2C 802418BC 14400006 */ bnez $v0, .L802418D8 +/* B2DD30 802418C0 000310C0 */ sll $v0, $v1, 3 +/* B2DD34 802418C4 24630001 */ addiu $v1, $v1, 1 +/* B2DD38 802418C8 28620008 */ slti $v0, $v1, 8 +/* B2DD3C 802418CC 1440FFF9 */ bnez $v0, .L802418B4 +/* B2DD40 802418D0 24840008 */ addiu $a0, $a0, 8 +/* B2DD44 802418D4 000310C0 */ sll $v0, $v1, 3 +.L802418D8: +/* B2DD48 802418D8 00461021 */ addu $v0, $v0, $a2 +/* B2DD4C 802418DC 8C420004 */ lw $v0, 4($v0) +/* B2DD50 802418E0 97A30010 */ lhu $v1, 0x10($sp) +/* B2DD54 802418E4 0202202A */ slt $a0, $s0, $v0 +/* B2DD58 802418E8 32C2FFFF */ andi $v0, $s6, 0xffff +/* B2DD5C 802418EC 14620008 */ bne $v1, $v0, .L80241910 +/* B2DD60 802418F0 32A2FFFF */ andi $v0, $s5, 0xffff +/* B2DD64 802418F4 97A7001E */ lhu $a3, 0x1e($sp) +/* B2DD68 802418F8 14E20005 */ bne $a3, $v0, .L80241910 +/* B2DD6C 802418FC 32E2FFFF */ andi $v0, $s7, 0xffff +/* B2DD70 80241900 14400003 */ bnez $v0, .L80241910 +/* B2DD74 80241904 00000000 */ nop +/* B2DD78 80241908 14800008 */ bnez $a0, .L8024192C +/* B2DD7C 8024190C 24020001 */ addiu $v0, $zero, 1 +.L80241910: +/* B2DD80 80241910 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* B2DD84 80241914 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* B2DD88 80241918 80420075 */ lb $v0, 0x75($v0) +/* B2DD8C 8024191C 10400005 */ beqz $v0, .L80241934 +/* B2DD90 80241920 00000000 */ nop +/* B2DD94 80241924 10800003 */ beqz $a0, .L80241934 +/* B2DD98 80241928 24020001 */ addiu $v0, $zero, 1 +.L8024192C: +/* B2DD9C 8024192C 08090650 */ j .L80241940 +/* B2DDA0 80241930 AE220084 */ sw $v0, 0x84($s1) +.L80241934: +/* B2DDA4 80241934 0C00F9EB */ jal kill_enemy +/* B2DDA8 80241938 03C0202D */ daddu $a0, $fp, $zero +/* B2DDAC 8024193C AE200084 */ sw $zero, 0x84($s1) +.L80241940: +/* B2DDB0 80241940 8FBF0044 */ lw $ra, 0x44($sp) +/* B2DDB4 80241944 8FBE0040 */ lw $fp, 0x40($sp) +/* B2DDB8 80241948 8FB7003C */ lw $s7, 0x3c($sp) +/* B2DDBC 8024194C 8FB60038 */ lw $s6, 0x38($sp) +/* B2DDC0 80241950 8FB50034 */ lw $s5, 0x34($sp) +/* B2DDC4 80241954 8FB40030 */ lw $s4, 0x30($sp) +/* B2DDC8 80241958 8FB3002C */ lw $s3, 0x2c($sp) +/* B2DDCC 8024195C 8FB20028 */ lw $s2, 0x28($sp) +/* B2DDD0 80241960 8FB10024 */ lw $s1, 0x24($sp) +/* B2DDD4 80241964 8FB00020 */ lw $s0, 0x20($sp) +/* B2DDD8 80241968 24020002 */ addiu $v0, $zero, 2 +/* B2DDDC 8024196C 03E00008 */ jr $ra +/* B2DDE0 80241970 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974.s deleted file mode 100644 index 1217b93813..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241974 -/* B2DDE4 80241974 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2DDE8 80241978 AFBF0014 */ sw $ra, 0x14($sp) -/* B2DDEC 8024197C AFB00010 */ sw $s0, 0x10($sp) -/* B2DDF0 80241980 0C00EABB */ jal get_npc_unsafe -/* B2DDF4 80241984 8C84014C */ lw $a0, 0x14c($a0) -/* B2DDF8 80241988 24040008 */ addiu $a0, $zero, 8 -/* B2DDFC 8024198C 0040802D */ daddu $s0, $v0, $zero -/* B2DE00 80241990 3C028024 */ lui $v0, 0x8024 -/* B2DE04 80241994 244219E0 */ addiu $v0, $v0, 0x19e0 -/* B2DE08 80241998 0C00AB39 */ jal heap_malloc -/* B2DE0C 8024199C AE020008 */ sw $v0, 8($s0) -/* B2DE10 802419A0 0040182D */ daddu $v1, $v0, $zero -/* B2DE14 802419A4 AE030020 */ sw $v1, 0x20($s0) -/* B2DE18 802419A8 AC600000 */ sw $zero, ($v1) -/* B2DE1C 802419AC 8FBF0014 */ lw $ra, 0x14($sp) -/* B2DE20 802419B0 8FB00010 */ lw $s0, 0x10($sp) -/* B2DE24 802419B4 24020001 */ addiu $v0, $zero, 1 -/* B2DE28 802419B8 03E00008 */ jr $ra -/* B2DE2C 802419BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s new file mode 100644 index 0000000000..2861460b8a --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241974_B2DDE4.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241974_B2DDE4 +/* B2DDE4 80241974 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B2DDE8 80241978 AFBF0014 */ sw $ra, 0x14($sp) +/* B2DDEC 8024197C AFB00010 */ sw $s0, 0x10($sp) +/* B2DDF0 80241980 0C00EABB */ jal get_npc_unsafe +/* B2DDF4 80241984 8C84014C */ lw $a0, 0x14c($a0) +/* B2DDF8 80241988 24040008 */ addiu $a0, $zero, 8 +/* B2DDFC 8024198C 0040802D */ daddu $s0, $v0, $zero +/* B2DE00 80241990 3C028024 */ lui $v0, 0x8024 +/* B2DE04 80241994 244219E0 */ addiu $v0, $v0, 0x19e0 +/* B2DE08 80241998 0C00AB39 */ jal heap_malloc +/* B2DE0C 8024199C AE020008 */ sw $v0, 8($s0) +/* B2DE10 802419A0 0040182D */ daddu $v1, $v0, $zero +/* B2DE14 802419A4 AE030020 */ sw $v1, 0x20($s0) +/* B2DE18 802419A8 AC600000 */ sw $zero, ($v1) +/* B2DE1C 802419AC 8FBF0014 */ lw $ra, 0x14($sp) +/* B2DE20 802419B0 8FB00010 */ lw $s0, 0x10($sp) +/* B2DE24 802419B4 24020001 */ addiu $v0, $zero, 1 +/* B2DE28 802419B8 03E00008 */ jr $ra +/* B2DE2C 802419BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0.s deleted file mode 100644 index 0084670858..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419E0 -/* B2DE50 802419E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2DE54 802419E4 3C03800A */ lui $v1, 0x800a -/* B2DE58 802419E8 8463A634 */ lh $v1, -0x59cc($v1) -/* B2DE5C 802419EC 3C05800B */ lui $a1, %hi(gCameras) -/* B2DE60 802419F0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* B2DE64 802419F4 AFBF0010 */ sw $ra, 0x10($sp) -/* B2DE68 802419F8 00031080 */ sll $v0, $v1, 2 -/* B2DE6C 802419FC 00431021 */ addu $v0, $v0, $v1 -/* B2DE70 80241A00 00021080 */ sll $v0, $v0, 2 -/* B2DE74 80241A04 00431023 */ subu $v0, $v0, $v1 -/* B2DE78 80241A08 000218C0 */ sll $v1, $v0, 3 -/* B2DE7C 80241A0C 00431021 */ addu $v0, $v0, $v1 -/* B2DE80 80241A10 8C830020 */ lw $v1, 0x20($a0) -/* B2DE84 80241A14 000210C0 */ sll $v0, $v0, 3 -/* B2DE88 80241A18 8C630000 */ lw $v1, ($v1) -/* B2DE8C 80241A1C 30630001 */ andi $v1, $v1, 1 -/* B2DE90 80241A20 10600004 */ beqz $v1, .L80241A34 -/* B2DE94 80241A24 00451021 */ addu $v0, $v0, $a1 -/* B2DE98 80241A28 C44C006C */ lwc1 $f12, 0x6c($v0) -/* B2DE9C 80241A2C 0C00A6C9 */ jal clamp_angle -/* B2DEA0 80241A30 46006307 */ neg.s $f12, $f12 -.L80241A34: -/* B2DEA4 80241A34 8FBF0010 */ lw $ra, 0x10($sp) -/* B2DEA8 80241A38 03E00008 */ jr $ra -/* B2DEAC 80241A3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s new file mode 100644 index 0000000000..87e577d10e --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419E0_B2DE50.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419E0_B2DE50 +/* B2DE50 802419E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B2DE54 802419E4 3C03800A */ lui $v1, 0x800a +/* B2DE58 802419E8 8463A634 */ lh $v1, -0x59cc($v1) +/* B2DE5C 802419EC 3C05800B */ lui $a1, %hi(gCameras) +/* B2DE60 802419F0 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* B2DE64 802419F4 AFBF0010 */ sw $ra, 0x10($sp) +/* B2DE68 802419F8 00031080 */ sll $v0, $v1, 2 +/* B2DE6C 802419FC 00431021 */ addu $v0, $v0, $v1 +/* B2DE70 80241A00 00021080 */ sll $v0, $v0, 2 +/* B2DE74 80241A04 00431023 */ subu $v0, $v0, $v1 +/* B2DE78 80241A08 000218C0 */ sll $v1, $v0, 3 +/* B2DE7C 80241A0C 00431021 */ addu $v0, $v0, $v1 +/* B2DE80 80241A10 8C830020 */ lw $v1, 0x20($a0) +/* B2DE84 80241A14 000210C0 */ sll $v0, $v0, 3 +/* B2DE88 80241A18 8C630000 */ lw $v1, ($v1) +/* B2DE8C 80241A1C 30630001 */ andi $v1, $v1, 1 +/* B2DE90 80241A20 10600004 */ beqz $v1, .L80241A34 +/* B2DE94 80241A24 00451021 */ addu $v0, $v0, $a1 +/* B2DE98 80241A28 C44C006C */ lwc1 $f12, 0x6c($v0) +/* B2DE9C 80241A2C 0C00A6C9 */ jal clamp_angle +/* B2DEA0 80241A30 46006307 */ neg.s $f12, $f12 +.L80241A34: +/* B2DEA4 80241A34 8FBF0010 */ lw $ra, 0x10($sp) +/* B2DEA8 80241A38 03E00008 */ jr $ra +/* B2DEAC 80241A3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40.s deleted file mode 100644 index bd3c129828..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A40 -/* B2DEB0 80241A40 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B2DEB4 80241A44 AFB10014 */ sw $s1, 0x14($sp) -/* B2DEB8 80241A48 0080882D */ daddu $s1, $a0, $zero -/* B2DEBC 80241A4C AFBF0024 */ sw $ra, 0x24($sp) -/* B2DEC0 80241A50 AFB40020 */ sw $s4, 0x20($sp) -/* B2DEC4 80241A54 AFB3001C */ sw $s3, 0x1c($sp) -/* B2DEC8 80241A58 AFB20018 */ sw $s2, 0x18($sp) -/* B2DECC 80241A5C 10A00033 */ beqz $a1, .L80241B2C -/* B2DED0 80241A60 AFB00010 */ sw $s0, 0x10($sp) -/* B2DED4 80241A64 0C04760B */ jal func_8011D82C -/* B2DED8 80241A68 24040001 */ addiu $a0, $zero, 1 -/* B2DEDC 80241A6C 0000202D */ daddu $a0, $zero, $zero -/* B2DEE0 80241A70 0080282D */ daddu $a1, $a0, $zero -/* B2DEE4 80241A74 0080302D */ daddu $a2, $a0, $zero -/* B2DEE8 80241A78 0080382D */ daddu $a3, $a0, $zero -/* B2DEEC 80241A7C 0080802D */ daddu $s0, $a0, $zero -/* B2DEF0 80241A80 2414FFFC */ addiu $s4, $zero, -4 -/* B2DEF4 80241A84 24130005 */ addiu $s3, $zero, 5 -/* B2DEF8 80241A88 3C120080 */ lui $s2, 0x80 -/* B2DEFC 80241A8C 3C038015 */ lui $v1, 0x8015 -/* B2DF00 80241A90 8C6312F0 */ lw $v1, 0x12f0($v1) -/* B2DF04 80241A94 24020001 */ addiu $v0, $zero, 1 -/* B2DF08 80241A98 0C046F97 */ jal set_background_color_blend -/* B2DF0C 80241A9C A0620000 */ sb $v0, ($v1) -.L80241AA0: -/* B2DF10 80241AA0 0C00E2B7 */ jal get_npc_by_index -/* B2DF14 80241AA4 0200202D */ daddu $a0, $s0, $zero -/* B2DF18 80241AA8 0040202D */ daddu $a0, $v0, $zero -/* B2DF1C 80241AAC 5080000B */ beql $a0, $zero, .L80241ADC -/* B2DF20 80241AB0 26100001 */ addiu $s0, $s0, 1 -/* B2DF24 80241AB4 8C820000 */ lw $v0, ($a0) -/* B2DF28 80241AB8 50400008 */ beql $v0, $zero, .L80241ADC -/* B2DF2C 80241ABC 26100001 */ addiu $s0, $s0, 1 -/* B2DF30 80241AC0 808300A4 */ lb $v1, 0xa4($a0) -/* B2DF34 80241AC4 10740005 */ beq $v1, $s4, .L80241ADC -/* B2DF38 80241AC8 26100001 */ addiu $s0, $s0, 1 -/* B2DF3C 80241ACC 10730003 */ beq $v1, $s3, .L80241ADC -/* B2DF40 80241AD0 00000000 */ nop -/* B2DF44 80241AD4 00521025 */ or $v0, $v0, $s2 -/* B2DF48 80241AD8 AC820000 */ sw $v0, ($a0) -.L80241ADC: -/* B2DF4C 80241ADC 2A020040 */ slti $v0, $s0, 0x40 -/* B2DF50 80241AE0 1440FFEF */ bnez $v0, .L80241AA0 -/* B2DF54 80241AE4 00000000 */ nop -/* B2DF58 80241AE8 0000802D */ daddu $s0, $zero, $zero -/* B2DF5C 80241AEC 3C120800 */ lui $s2, 0x800 -.L80241AF0: -/* B2DF60 80241AF0 0C04C3D6 */ jal get_item_entity -/* B2DF64 80241AF4 0200202D */ daddu $a0, $s0, $zero -/* B2DF68 80241AF8 0040182D */ daddu $v1, $v0, $zero -/* B2DF6C 80241AFC 10600007 */ beqz $v1, .L80241B1C -/* B2DF70 80241B00 26100001 */ addiu $s0, $s0, 1 -/* B2DF74 80241B04 8C640000 */ lw $a0, ($v1) -/* B2DF78 80241B08 30820010 */ andi $v0, $a0, 0x10 -/* B2DF7C 80241B0C 10400003 */ beqz $v0, .L80241B1C -/* B2DF80 80241B10 00000000 */ nop -/* B2DF84 80241B14 00921025 */ or $v0, $a0, $s2 -/* B2DF88 80241B18 AC620000 */ sw $v0, ($v1) -.L80241B1C: -/* B2DF8C 80241B1C 2A020100 */ slti $v0, $s0, 0x100 -/* B2DF90 80241B20 1440FFF3 */ bnez $v0, .L80241AF0 -/* B2DF94 80241B24 00000000 */ nop -/* B2DF98 80241B28 AE200070 */ sw $zero, 0x70($s1) -.L80241B2C: -/* B2DF9C 80241B2C 8E220070 */ lw $v0, 0x70($s1) -/* B2DFA0 80241B30 24420008 */ addiu $v0, $v0, 8 -/* B2DFA4 80241B34 AE220070 */ sw $v0, 0x70($s1) -/* B2DFA8 80241B38 28420100 */ slti $v0, $v0, 0x100 -/* B2DFAC 80241B3C 14400003 */ bnez $v0, .L80241B4C -/* B2DFB0 80241B40 0000202D */ daddu $a0, $zero, $zero -/* B2DFB4 80241B44 240200FF */ addiu $v0, $zero, 0xff -/* B2DFB8 80241B48 AE220070 */ sw $v0, 0x70($s1) -.L80241B4C: -/* B2DFBC 80241B4C 0080282D */ daddu $a1, $a0, $zero -/* B2DFC0 80241B50 92270073 */ lbu $a3, 0x73($s1) -/* B2DFC4 80241B54 0C046F97 */ jal set_background_color_blend -/* B2DFC8 80241B58 0080302D */ daddu $a2, $a0, $zero -/* B2DFCC 80241B5C 8E220070 */ lw $v0, 0x70($s1) -/* B2DFD0 80241B60 8FBF0024 */ lw $ra, 0x24($sp) -/* B2DFD4 80241B64 8FB40020 */ lw $s4, 0x20($sp) -/* B2DFD8 80241B68 8FB3001C */ lw $s3, 0x1c($sp) -/* B2DFDC 80241B6C 8FB20018 */ lw $s2, 0x18($sp) -/* B2DFE0 80241B70 8FB10014 */ lw $s1, 0x14($sp) -/* B2DFE4 80241B74 8FB00010 */ lw $s0, 0x10($sp) -/* B2DFE8 80241B78 384200FF */ xori $v0, $v0, 0xff -/* B2DFEC 80241B7C 2C420001 */ sltiu $v0, $v0, 1 -/* B2DFF0 80241B80 00021040 */ sll $v0, $v0, 1 -/* B2DFF4 80241B84 03E00008 */ jr $ra -/* B2DFF8 80241B88 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s new file mode 100644 index 0000000000..0c4e1a8e55 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241A40_B2DEB0.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A40_B2DEB0 +/* B2DEB0 80241A40 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B2DEB4 80241A44 AFB10014 */ sw $s1, 0x14($sp) +/* B2DEB8 80241A48 0080882D */ daddu $s1, $a0, $zero +/* B2DEBC 80241A4C AFBF0024 */ sw $ra, 0x24($sp) +/* B2DEC0 80241A50 AFB40020 */ sw $s4, 0x20($sp) +/* B2DEC4 80241A54 AFB3001C */ sw $s3, 0x1c($sp) +/* B2DEC8 80241A58 AFB20018 */ sw $s2, 0x18($sp) +/* B2DECC 80241A5C 10A00033 */ beqz $a1, .L80241B2C +/* B2DED0 80241A60 AFB00010 */ sw $s0, 0x10($sp) +/* B2DED4 80241A64 0C04760B */ jal func_8011D82C +/* B2DED8 80241A68 24040001 */ addiu $a0, $zero, 1 +/* B2DEDC 80241A6C 0000202D */ daddu $a0, $zero, $zero +/* B2DEE0 80241A70 0080282D */ daddu $a1, $a0, $zero +/* B2DEE4 80241A74 0080302D */ daddu $a2, $a0, $zero +/* B2DEE8 80241A78 0080382D */ daddu $a3, $a0, $zero +/* B2DEEC 80241A7C 0080802D */ daddu $s0, $a0, $zero +/* B2DEF0 80241A80 2414FFFC */ addiu $s4, $zero, -4 +/* B2DEF4 80241A84 24130005 */ addiu $s3, $zero, 5 +/* B2DEF8 80241A88 3C120080 */ lui $s2, 0x80 +/* B2DEFC 80241A8C 3C038015 */ lui $v1, 0x8015 +/* B2DF00 80241A90 8C6312F0 */ lw $v1, 0x12f0($v1) +/* B2DF04 80241A94 24020001 */ addiu $v0, $zero, 1 +/* B2DF08 80241A98 0C046F97 */ jal set_background_color_blend +/* B2DF0C 80241A9C A0620000 */ sb $v0, ($v1) +.L80241AA0: +/* B2DF10 80241AA0 0C00E2B7 */ jal get_npc_by_index +/* B2DF14 80241AA4 0200202D */ daddu $a0, $s0, $zero +/* B2DF18 80241AA8 0040202D */ daddu $a0, $v0, $zero +/* B2DF1C 80241AAC 5080000B */ beql $a0, $zero, .L80241ADC +/* B2DF20 80241AB0 26100001 */ addiu $s0, $s0, 1 +/* B2DF24 80241AB4 8C820000 */ lw $v0, ($a0) +/* B2DF28 80241AB8 50400008 */ beql $v0, $zero, .L80241ADC +/* B2DF2C 80241ABC 26100001 */ addiu $s0, $s0, 1 +/* B2DF30 80241AC0 808300A4 */ lb $v1, 0xa4($a0) +/* B2DF34 80241AC4 10740005 */ beq $v1, $s4, .L80241ADC +/* B2DF38 80241AC8 26100001 */ addiu $s0, $s0, 1 +/* B2DF3C 80241ACC 10730003 */ beq $v1, $s3, .L80241ADC +/* B2DF40 80241AD0 00000000 */ nop +/* B2DF44 80241AD4 00521025 */ or $v0, $v0, $s2 +/* B2DF48 80241AD8 AC820000 */ sw $v0, ($a0) +.L80241ADC: +/* B2DF4C 80241ADC 2A020040 */ slti $v0, $s0, 0x40 +/* B2DF50 80241AE0 1440FFEF */ bnez $v0, .L80241AA0 +/* B2DF54 80241AE4 00000000 */ nop +/* B2DF58 80241AE8 0000802D */ daddu $s0, $zero, $zero +/* B2DF5C 80241AEC 3C120800 */ lui $s2, 0x800 +.L80241AF0: +/* B2DF60 80241AF0 0C04C3D6 */ jal get_item_entity +/* B2DF64 80241AF4 0200202D */ daddu $a0, $s0, $zero +/* B2DF68 80241AF8 0040182D */ daddu $v1, $v0, $zero +/* B2DF6C 80241AFC 10600007 */ beqz $v1, .L80241B1C +/* B2DF70 80241B00 26100001 */ addiu $s0, $s0, 1 +/* B2DF74 80241B04 8C640000 */ lw $a0, ($v1) +/* B2DF78 80241B08 30820010 */ andi $v0, $a0, 0x10 +/* B2DF7C 80241B0C 10400003 */ beqz $v0, .L80241B1C +/* B2DF80 80241B10 00000000 */ nop +/* B2DF84 80241B14 00921025 */ or $v0, $a0, $s2 +/* B2DF88 80241B18 AC620000 */ sw $v0, ($v1) +.L80241B1C: +/* B2DF8C 80241B1C 2A020100 */ slti $v0, $s0, 0x100 +/* B2DF90 80241B20 1440FFF3 */ bnez $v0, .L80241AF0 +/* B2DF94 80241B24 00000000 */ nop +/* B2DF98 80241B28 AE200070 */ sw $zero, 0x70($s1) +.L80241B2C: +/* B2DF9C 80241B2C 8E220070 */ lw $v0, 0x70($s1) +/* B2DFA0 80241B30 24420008 */ addiu $v0, $v0, 8 +/* B2DFA4 80241B34 AE220070 */ sw $v0, 0x70($s1) +/* B2DFA8 80241B38 28420100 */ slti $v0, $v0, 0x100 +/* B2DFAC 80241B3C 14400003 */ bnez $v0, .L80241B4C +/* B2DFB0 80241B40 0000202D */ daddu $a0, $zero, $zero +/* B2DFB4 80241B44 240200FF */ addiu $v0, $zero, 0xff +/* B2DFB8 80241B48 AE220070 */ sw $v0, 0x70($s1) +.L80241B4C: +/* B2DFBC 80241B4C 0080282D */ daddu $a1, $a0, $zero +/* B2DFC0 80241B50 92270073 */ lbu $a3, 0x73($s1) +/* B2DFC4 80241B54 0C046F97 */ jal set_background_color_blend +/* B2DFC8 80241B58 0080302D */ daddu $a2, $a0, $zero +/* B2DFCC 80241B5C 8E220070 */ lw $v0, 0x70($s1) +/* B2DFD0 80241B60 8FBF0024 */ lw $ra, 0x24($sp) +/* B2DFD4 80241B64 8FB40020 */ lw $s4, 0x20($sp) +/* B2DFD8 80241B68 8FB3001C */ lw $s3, 0x1c($sp) +/* B2DFDC 80241B6C 8FB20018 */ lw $s2, 0x18($sp) +/* B2DFE0 80241B70 8FB10014 */ lw $s1, 0x14($sp) +/* B2DFE4 80241B74 8FB00010 */ lw $s0, 0x10($sp) +/* B2DFE8 80241B78 384200FF */ xori $v0, $v0, 0xff +/* B2DFEC 80241B7C 2C420001 */ sltiu $v0, $v0, 1 +/* B2DFF0 80241B80 00021040 */ sll $v0, $v0, 1 +/* B2DFF4 80241B84 03E00008 */ jr $ra +/* B2DFF8 80241B88 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C.s deleted file mode 100644 index 84c2a159d5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F9C -/* B2E40C 80241F9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2E410 80241FA0 10A0000B */ beqz $a1, .L80241FD0 -/* B2E414 80241FA4 AFBF0010 */ sw $ra, 0x10($sp) -/* B2E418 80241FA8 3C038025 */ lui $v1, 0x8025 -/* B2E41C 80241FAC 8C638944 */ lw $v1, -0x76bc($v1) -/* B2E420 80241FB0 8C620000 */ lw $v0, ($v1) -/* B2E424 80241FB4 3C048025 */ lui $a0, 0x8025 -/* B2E428 80241FB8 8C848948 */ lw $a0, -0x76b8($a0) -/* B2E42C 80241FBC 34420010 */ ori $v0, $v0, 0x10 -/* B2E430 80241FC0 AC620000 */ sw $v0, ($v1) -/* B2E434 80241FC4 8C820000 */ lw $v0, ($a0) -/* B2E438 80241FC8 34420010 */ ori $v0, $v0, 0x10 -/* B2E43C 80241FCC AC820000 */ sw $v0, ($a0) -.L80241FD0: -/* B2E440 80241FD0 3C048025 */ lui $a0, 0x8025 -/* B2E444 80241FD4 8C848940 */ lw $a0, -0x76c0($a0) -/* B2E448 80241FD8 8C85000C */ lw $a1, 0xc($a0) -/* B2E44C 80241FDC 8CA20018 */ lw $v0, 0x18($a1) -/* B2E450 80241FE0 8CA30020 */ lw $v1, 0x20($a1) -/* B2E454 80241FE4 2442FFF6 */ addiu $v0, $v0, -0xa -/* B2E458 80241FE8 ACA20018 */ sw $v0, 0x18($a1) -/* B2E45C 80241FEC 8CA20024 */ lw $v0, 0x24($a1) -/* B2E460 80241FF0 2463FFF6 */ addiu $v1, $v1, -0xa -/* B2E464 80241FF4 ACA30020 */ sw $v1, 0x20($a1) -/* B2E468 80241FF8 8CA30028 */ lw $v1, 0x28($a1) -/* B2E46C 80241FFC 2442FFF6 */ addiu $v0, $v0, -0xa -/* B2E470 80242000 ACA20024 */ sw $v0, 0x24($a1) -/* B2E474 80242004 8CA2001C */ lw $v0, 0x1c($a1) -/* B2E478 80242008 2463FFF6 */ addiu $v1, $v1, -0xa -/* B2E47C 8024200C ACA30028 */ sw $v1, 0x28($a1) -/* B2E480 80242010 8CA30018 */ lw $v1, 0x18($a1) -/* B2E484 80242014 2442FFF6 */ addiu $v0, $v0, -0xa -/* B2E488 80242018 18600003 */ blez $v1, .L80242028 -/* B2E48C 8024201C ACA2001C */ sw $v0, 0x1c($a1) -/* B2E490 80242020 08090811 */ j .L80242044 -/* B2E494 80242024 0000102D */ daddu $v0, $zero, $zero -.L80242028: -/* B2E498 80242028 0C016914 */ jal remove_effect -/* B2E49C 8024202C ACA00018 */ sw $zero, 0x18($a1) -/* B2E4A0 80242030 3C048025 */ lui $a0, 0x8025 -/* B2E4A4 80242034 8C848924 */ lw $a0, -0x76dc($a0) -/* B2E4A8 80242038 0C048D70 */ jal func_801235C0 -/* B2E4AC 8024203C 00000000 */ nop -/* B2E4B0 80242040 24020002 */ addiu $v0, $zero, 2 -.L80242044: -/* B2E4B4 80242044 8FBF0010 */ lw $ra, 0x10($sp) -/* B2E4B8 80242048 03E00008 */ jr $ra -/* B2E4BC 8024204C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s new file mode 100644 index 0000000000..9a2dbd2d7c --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241F9C_B2E40C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F9C_B2E40C +/* B2E40C 80241F9C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B2E410 80241FA0 10A0000B */ beqz $a1, .L80241FD0 +/* B2E414 80241FA4 AFBF0010 */ sw $ra, 0x10($sp) +/* B2E418 80241FA8 3C038025 */ lui $v1, 0x8025 +/* B2E41C 80241FAC 8C638944 */ lw $v1, -0x76bc($v1) +/* B2E420 80241FB0 8C620000 */ lw $v0, ($v1) +/* B2E424 80241FB4 3C048025 */ lui $a0, 0x8025 +/* B2E428 80241FB8 8C848948 */ lw $a0, -0x76b8($a0) +/* B2E42C 80241FBC 34420010 */ ori $v0, $v0, 0x10 +/* B2E430 80241FC0 AC620000 */ sw $v0, ($v1) +/* B2E434 80241FC4 8C820000 */ lw $v0, ($a0) +/* B2E438 80241FC8 34420010 */ ori $v0, $v0, 0x10 +/* B2E43C 80241FCC AC820000 */ sw $v0, ($a0) +.L80241FD0: +/* B2E440 80241FD0 3C048025 */ lui $a0, 0x8025 +/* B2E444 80241FD4 8C848940 */ lw $a0, -0x76c0($a0) +/* B2E448 80241FD8 8C85000C */ lw $a1, 0xc($a0) +/* B2E44C 80241FDC 8CA20018 */ lw $v0, 0x18($a1) +/* B2E450 80241FE0 8CA30020 */ lw $v1, 0x20($a1) +/* B2E454 80241FE4 2442FFF6 */ addiu $v0, $v0, -0xa +/* B2E458 80241FE8 ACA20018 */ sw $v0, 0x18($a1) +/* B2E45C 80241FEC 8CA20024 */ lw $v0, 0x24($a1) +/* B2E460 80241FF0 2463FFF6 */ addiu $v1, $v1, -0xa +/* B2E464 80241FF4 ACA30020 */ sw $v1, 0x20($a1) +/* B2E468 80241FF8 8CA30028 */ lw $v1, 0x28($a1) +/* B2E46C 80241FFC 2442FFF6 */ addiu $v0, $v0, -0xa +/* B2E470 80242000 ACA20024 */ sw $v0, 0x24($a1) +/* B2E474 80242004 8CA2001C */ lw $v0, 0x1c($a1) +/* B2E478 80242008 2463FFF6 */ addiu $v1, $v1, -0xa +/* B2E47C 8024200C ACA30028 */ sw $v1, 0x28($a1) +/* B2E480 80242010 8CA30018 */ lw $v1, 0x18($a1) +/* B2E484 80242014 2442FFF6 */ addiu $v0, $v0, -0xa +/* B2E488 80242018 18600003 */ blez $v1, .L80242028 +/* B2E48C 8024201C ACA2001C */ sw $v0, 0x1c($a1) +/* B2E490 80242020 08090811 */ j .L80242044 +/* B2E494 80242024 0000102D */ daddu $v0, $zero, $zero +.L80242028: +/* B2E498 80242028 0C016914 */ jal remove_effect +/* B2E49C 8024202C ACA00018 */ sw $zero, 0x18($a1) +/* B2E4A0 80242030 3C048025 */ lui $a0, 0x8025 +/* B2E4A4 80242034 8C848924 */ lw $a0, -0x76dc($a0) +/* B2E4A8 80242038 0C048D70 */ jal func_801235C0 +/* B2E4AC 8024203C 00000000 */ nop +/* B2E4B0 80242040 24020002 */ addiu $v0, $zero, 2 +.L80242044: +/* B2E4B4 80242044 8FBF0010 */ lw $ra, 0x10($sp) +/* B2E4B8 80242048 03E00008 */ jr $ra +/* B2E4BC 8024204C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C.s deleted file mode 100644 index 91b6cfb565..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024211C -/* B2E58C 8024211C 3C028025 */ lui $v0, 0x8025 -/* B2E590 80242120 8C428948 */ lw $v0, -0x76b8($v0) -/* B2E594 80242124 8C43000C */ lw $v1, 0xc($v0) -/* B2E598 80242128 24020001 */ addiu $v0, $zero, 1 -/* B2E59C 8024212C AC62001C */ sw $v0, 0x1c($v1) -/* B2E5A0 80242130 03E00008 */ jr $ra -/* B2E5A4 80242134 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C_B2E58C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C_B2E58C.s new file mode 100644 index 0000000000..cbb9ea94c6 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024211C_B2E58C.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024211C_B2E58C +/* B2E58C 8024211C 3C028025 */ lui $v0, 0x8025 +/* B2E590 80242120 8C428948 */ lw $v0, -0x76b8($v0) +/* B2E594 80242124 8C43000C */ lw $v1, 0xc($v0) +/* B2E598 80242128 24020001 */ addiu $v0, $zero, 1 +/* B2E59C 8024212C AC62001C */ sw $v0, 0x1c($v1) +/* B2E5A0 80242130 03E00008 */ jr $ra +/* B2E5A4 80242134 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138.s deleted file mode 100644 index 0dc85c4da7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242138 -/* B2E5A8 80242138 3C028025 */ lui $v0, 0x8025 -/* B2E5AC 8024213C 8C428948 */ lw $v0, -0x76b8($v0) -/* B2E5B0 80242140 8C43000C */ lw $v1, 0xc($v0) -/* B2E5B4 80242144 24020002 */ addiu $v0, $zero, 2 -/* B2E5B8 80242148 03E00008 */ jr $ra -/* B2E5BC 8024214C AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138_B2E5A8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138_B2E5A8.s new file mode 100644 index 0000000000..a116209de9 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242138_B2E5A8.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242138_B2E5A8 +/* B2E5A8 80242138 3C028025 */ lui $v0, 0x8025 +/* B2E5AC 8024213C 8C428948 */ lw $v0, -0x76b8($v0) +/* B2E5B0 80242140 8C43000C */ lw $v1, 0xc($v0) +/* B2E5B4 80242144 24020002 */ addiu $v0, $zero, 2 +/* B2E5B8 80242148 03E00008 */ jr $ra +/* B2E5BC 8024214C AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180.s deleted file mode 100644 index 9bf0db013b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242180 -/* B2E5F0 80242180 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2E5F4 80242184 AFB10014 */ sw $s1, 0x14($sp) -/* B2E5F8 80242188 0080882D */ daddu $s1, $a0, $zero -/* B2E5FC 8024218C AFBF0018 */ sw $ra, 0x18($sp) -/* B2E600 80242190 AFB00010 */ sw $s0, 0x10($sp) -/* B2E604 80242194 8E30000C */ lw $s0, 0xc($s1) -/* B2E608 80242198 8E050000 */ lw $a1, ($s0) -/* B2E60C 8024219C 0C0B1EAF */ jal get_variable -/* B2E610 802421A0 26100004 */ addiu $s0, $s0, 4 -/* B2E614 802421A4 0220202D */ daddu $a0, $s1, $zero -/* B2E618 802421A8 8E050000 */ lw $a1, ($s0) -/* B2E61C 802421AC 0C0B210B */ jal get_float_variable -/* B2E620 802421B0 0040802D */ daddu $s0, $v0, $zero -/* B2E624 802421B4 24020002 */ addiu $v0, $zero, 2 -/* B2E628 802421B8 00501804 */ sllv $v1, $s0, $v0 -/* B2E62C 802421BC 00701821 */ addu $v1, $v1, $s0 -/* B2E630 802421C0 00431804 */ sllv $v1, $v1, $v0 -/* B2E634 802421C4 00701823 */ subu $v1, $v1, $s0 -/* B2E638 802421C8 000320C0 */ sll $a0, $v1, 3 -/* B2E63C 802421CC 00641821 */ addu $v1, $v1, $a0 -/* B2E640 802421D0 000318C0 */ sll $v1, $v1, 3 -/* B2E644 802421D4 3C01800B */ lui $at, 0x800b -/* B2E648 802421D8 00230821 */ addu $at, $at, $v1 -/* B2E64C 802421DC E4201D98 */ swc1 $f0, 0x1d98($at) -/* B2E650 802421E0 8FBF0018 */ lw $ra, 0x18($sp) -/* B2E654 802421E4 8FB10014 */ lw $s1, 0x14($sp) -/* B2E658 802421E8 8FB00010 */ lw $s0, 0x10($sp) -/* B2E65C 802421EC 03E00008 */ jr $ra -/* B2E660 802421F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s new file mode 100644 index 0000000000..c74d8c0277 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242180_B2E5F0 +/* B2E5F0 80242180 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B2E5F4 80242184 AFB10014 */ sw $s1, 0x14($sp) +/* B2E5F8 80242188 0080882D */ daddu $s1, $a0, $zero +/* B2E5FC 8024218C AFBF0018 */ sw $ra, 0x18($sp) +/* B2E600 80242190 AFB00010 */ sw $s0, 0x10($sp) +/* B2E604 80242194 8E30000C */ lw $s0, 0xc($s1) +/* B2E608 80242198 8E050000 */ lw $a1, ($s0) +/* B2E60C 8024219C 0C0B1EAF */ jal get_variable +/* B2E610 802421A0 26100004 */ addiu $s0, $s0, 4 +/* B2E614 802421A4 0220202D */ daddu $a0, $s1, $zero +/* B2E618 802421A8 8E050000 */ lw $a1, ($s0) +/* B2E61C 802421AC 0C0B210B */ jal get_float_variable +/* B2E620 802421B0 0040802D */ daddu $s0, $v0, $zero +/* B2E624 802421B4 24020002 */ addiu $v0, $zero, 2 +/* B2E628 802421B8 00501804 */ sllv $v1, $s0, $v0 +/* B2E62C 802421BC 00701821 */ addu $v1, $v1, $s0 +/* B2E630 802421C0 00431804 */ sllv $v1, $v1, $v0 +/* B2E634 802421C4 00701823 */ subu $v1, $v1, $s0 +/* B2E638 802421C8 000320C0 */ sll $a0, $v1, 3 +/* B2E63C 802421CC 00641821 */ addu $v1, $v1, $a0 +/* B2E640 802421D0 000318C0 */ sll $v1, $v1, 3 +/* B2E644 802421D4 3C01800B */ lui $at, 0x800b +/* B2E648 802421D8 00230821 */ addu $at, $at, $v1 +/* B2E64C 802421DC E4201D98 */ swc1 $f0, 0x1d98($at) +/* B2E650 802421E0 8FBF0018 */ lw $ra, 0x18($sp) +/* B2E654 802421E4 8FB10014 */ lw $s1, 0x14($sp) +/* B2E658 802421E8 8FB00010 */ lw $s0, 0x10($sp) +/* B2E65C 802421EC 03E00008 */ jr $ra +/* B2E660 802421F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4.s deleted file mode 100644 index 126d7bac41..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421F4 -/* B2E664 802421F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2E668 802421F8 AFB10014 */ sw $s1, 0x14($sp) -/* B2E66C 802421FC 0080882D */ daddu $s1, $a0, $zero -/* B2E670 80242200 AFBF0018 */ sw $ra, 0x18($sp) -/* B2E674 80242204 AFB00010 */ sw $s0, 0x10($sp) -/* B2E678 80242208 8E30000C */ lw $s0, 0xc($s1) -/* B2E67C 8024220C 8E050000 */ lw $a1, ($s0) -/* B2E680 80242210 0C0B1EAF */ jal get_variable -/* B2E684 80242214 26100004 */ addiu $s0, $s0, 4 -/* B2E688 80242218 00021880 */ sll $v1, $v0, 2 -/* B2E68C 8024221C 00621821 */ addu $v1, $v1, $v0 -/* B2E690 80242220 00031880 */ sll $v1, $v1, 2 -/* B2E694 80242224 00621823 */ subu $v1, $v1, $v0 -/* B2E698 80242228 000310C0 */ sll $v0, $v1, 3 -/* B2E69C 8024222C 00621821 */ addu $v1, $v1, $v0 -/* B2E6A0 80242230 000318C0 */ sll $v1, $v1, 3 -/* B2E6A4 80242234 3C01800B */ lui $at, 0x800b -/* B2E6A8 80242238 00230821 */ addu $at, $at, $v1 -/* B2E6AC 8024223C C4221D98 */ lwc1 $f2, 0x1d98($at) -/* B2E6B0 80242240 3C014480 */ lui $at, 0x4480 -/* B2E6B4 80242244 44810000 */ mtc1 $at, $f0 -/* B2E6B8 80242248 00000000 */ nop -/* B2E6BC 8024224C 46001082 */ mul.s $f2, $f2, $f0 -/* B2E6C0 80242250 00000000 */ nop -/* B2E6C4 80242254 3C01CD5B */ lui $at, 0xcd5b -/* B2E6C8 80242258 34215858 */ ori $at, $at, 0x5858 -/* B2E6CC 8024225C 44810000 */ mtc1 $at, $f0 -/* B2E6D0 80242260 00000000 */ nop -/* B2E6D4 80242264 46001080 */ add.s $f2, $f2, $f0 -/* B2E6D8 80242268 8E050000 */ lw $a1, ($s0) -/* B2E6DC 8024226C 4600110D */ trunc.w.s $f4, $f2 -/* B2E6E0 80242270 44062000 */ mfc1 $a2, $f4 -/* B2E6E4 80242274 0C0B2026 */ jal set_variable -/* B2E6E8 80242278 0220202D */ daddu $a0, $s1, $zero -/* B2E6EC 8024227C 8FBF0018 */ lw $ra, 0x18($sp) -/* B2E6F0 80242280 8FB10014 */ lw $s1, 0x14($sp) -/* B2E6F4 80242284 8FB00010 */ lw $s0, 0x10($sp) -/* B2E6F8 80242288 24020002 */ addiu $v0, $zero, 2 -/* B2E6FC 8024228C 03E00008 */ jr $ra -/* B2E700 80242290 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s new file mode 100644 index 0000000000..cd84825001 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421F4_B2E664 +/* B2E664 802421F4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B2E668 802421F8 AFB10014 */ sw $s1, 0x14($sp) +/* B2E66C 802421FC 0080882D */ daddu $s1, $a0, $zero +/* B2E670 80242200 AFBF0018 */ sw $ra, 0x18($sp) +/* B2E674 80242204 AFB00010 */ sw $s0, 0x10($sp) +/* B2E678 80242208 8E30000C */ lw $s0, 0xc($s1) +/* B2E67C 8024220C 8E050000 */ lw $a1, ($s0) +/* B2E680 80242210 0C0B1EAF */ jal get_variable +/* B2E684 80242214 26100004 */ addiu $s0, $s0, 4 +/* B2E688 80242218 00021880 */ sll $v1, $v0, 2 +/* B2E68C 8024221C 00621821 */ addu $v1, $v1, $v0 +/* B2E690 80242220 00031880 */ sll $v1, $v1, 2 +/* B2E694 80242224 00621823 */ subu $v1, $v1, $v0 +/* B2E698 80242228 000310C0 */ sll $v0, $v1, 3 +/* B2E69C 8024222C 00621821 */ addu $v1, $v1, $v0 +/* B2E6A0 80242230 000318C0 */ sll $v1, $v1, 3 +/* B2E6A4 80242234 3C01800B */ lui $at, 0x800b +/* B2E6A8 80242238 00230821 */ addu $at, $at, $v1 +/* B2E6AC 8024223C C4221D98 */ lwc1 $f2, 0x1d98($at) +/* B2E6B0 80242240 3C014480 */ lui $at, 0x4480 +/* B2E6B4 80242244 44810000 */ mtc1 $at, $f0 +/* B2E6B8 80242248 00000000 */ nop +/* B2E6BC 8024224C 46001082 */ mul.s $f2, $f2, $f0 +/* B2E6C0 80242250 00000000 */ nop +/* B2E6C4 80242254 3C01CD5B */ lui $at, 0xcd5b +/* B2E6C8 80242258 34215858 */ ori $at, $at, 0x5858 +/* B2E6CC 8024225C 44810000 */ mtc1 $at, $f0 +/* B2E6D0 80242260 00000000 */ nop +/* B2E6D4 80242264 46001080 */ add.s $f2, $f2, $f0 +/* B2E6D8 80242268 8E050000 */ lw $a1, ($s0) +/* B2E6DC 8024226C 4600110D */ trunc.w.s $f4, $f2 +/* B2E6E0 80242270 44062000 */ mfc1 $a2, $f4 +/* B2E6E4 80242274 0C0B2026 */ jal set_variable +/* B2E6E8 80242278 0220202D */ daddu $a0, $s1, $zero +/* B2E6EC 8024227C 8FBF0018 */ lw $ra, 0x18($sp) +/* B2E6F0 80242280 8FB10014 */ lw $s1, 0x14($sp) +/* B2E6F4 80242284 8FB00010 */ lw $s0, 0x10($sp) +/* B2E6F8 80242288 24020002 */ addiu $v0, $zero, 2 +/* B2E6FC 8024228C 03E00008 */ jr $ra +/* B2E700 80242290 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294.s deleted file mode 100644 index 3801281ead..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242294 -/* B2E704 80242294 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2E708 80242298 AFB20018 */ sw $s2, 0x18($sp) -/* B2E70C 8024229C 0080902D */ daddu $s2, $a0, $zero -/* B2E710 802422A0 AFBF0030 */ sw $ra, 0x30($sp) -/* B2E714 802422A4 AFB7002C */ sw $s7, 0x2c($sp) -/* B2E718 802422A8 AFB60028 */ sw $s6, 0x28($sp) -/* B2E71C 802422AC AFB50024 */ sw $s5, 0x24($sp) -/* B2E720 802422B0 AFB40020 */ sw $s4, 0x20($sp) -/* B2E724 802422B4 AFB3001C */ sw $s3, 0x1c($sp) -/* B2E728 802422B8 AFB10014 */ sw $s1, 0x14($sp) -/* B2E72C 802422BC AFB00010 */ sw $s0, 0x10($sp) -/* B2E730 802422C0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B2E734 802422C4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* B2E738 802422C8 8E50000C */ lw $s0, 0xc($s2) -/* B2E73C 802422CC 8E050000 */ lw $a1, ($s0) -/* B2E740 802422D0 0C0B1EAF */ jal get_variable -/* B2E744 802422D4 26100004 */ addiu $s0, $s0, 4 -/* B2E748 802422D8 8E050000 */ lw $a1, ($s0) -/* B2E74C 802422DC 26100004 */ addiu $s0, $s0, 4 -/* B2E750 802422E0 0240202D */ daddu $a0, $s2, $zero -/* B2E754 802422E4 0C0B1EAF */ jal get_variable -/* B2E758 802422E8 0040B82D */ daddu $s7, $v0, $zero -/* B2E75C 802422EC 8E050000 */ lw $a1, ($s0) -/* B2E760 802422F0 26100004 */ addiu $s0, $s0, 4 -/* B2E764 802422F4 0240202D */ daddu $a0, $s2, $zero -/* B2E768 802422F8 0C0B1EAF */ jal get_variable -/* B2E76C 802422FC 0040B02D */ daddu $s6, $v0, $zero -/* B2E770 80242300 0240202D */ daddu $a0, $s2, $zero -/* B2E774 80242304 3C05F4AC */ lui $a1, 0xf4ac -/* B2E778 80242308 34A5D481 */ ori $a1, $a1, 0xd481 -/* B2E77C 8024230C 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* B2E780 80242310 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* B2E784 80242314 8E140000 */ lw $s4, ($s0) -/* B2E788 80242318 00061880 */ sll $v1, $a2, 2 -/* B2E78C 8024231C 00661821 */ addu $v1, $v1, $a2 -/* B2E790 80242320 00031880 */ sll $v1, $v1, 2 -/* B2E794 80242324 00661823 */ subu $v1, $v1, $a2 -/* B2E798 80242328 000330C0 */ sll $a2, $v1, 3 -/* B2E79C 8024232C 00661821 */ addu $v1, $v1, $a2 -/* B2E7A0 80242330 000318C0 */ sll $v1, $v1, 3 -/* B2E7A4 80242334 3C01800B */ lui $at, 0x800b -/* B2E7A8 80242338 00230821 */ addu $at, $at, $v1 -/* B2E7AC 8024233C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B2E7B0 80242340 8E150004 */ lw $s5, 4($s0) -/* B2E7B4 80242344 4600010D */ trunc.w.s $f4, $f0 -/* B2E7B8 80242348 44112000 */ mfc1 $s1, $f4 -/* B2E7BC 8024234C 0C0B1EAF */ jal get_variable -/* B2E7C0 80242350 0040982D */ daddu $s3, $v0, $zero -/* B2E7C4 80242354 4491B000 */ mtc1 $s1, $f22 -/* B2E7C8 80242358 00000000 */ nop -/* B2E7CC 8024235C 4680B5A0 */ cvt.s.w $f22, $f22 -/* B2E7D0 80242360 4600B306 */ mov.s $f12, $f22 -/* B2E7D4 80242364 0C00A8D4 */ jal cos_deg -/* B2E7D8 80242368 0040802D */ daddu $s0, $v0, $zero -/* B2E7DC 8024236C 4493A000 */ mtc1 $s3, $f20 -/* B2E7E0 80242370 00000000 */ nop -/* B2E7E4 80242374 4680A520 */ cvt.s.w $f20, $f20 -/* B2E7E8 80242378 4600A002 */ mul.s $f0, $f20, $f0 -/* B2E7EC 8024237C 00000000 */ nop -/* B2E7F0 80242380 0240202D */ daddu $a0, $s2, $zero -/* B2E7F4 80242384 44901000 */ mtc1 $s0, $f2 -/* B2E7F8 80242388 00000000 */ nop -/* B2E7FC 8024238C 468010A0 */ cvt.s.w $f2, $f2 -/* B2E800 80242390 46001081 */ sub.s $f2, $f2, $f0 -/* B2E804 80242394 3C05F4AC */ lui $a1, 0xf4ac -/* B2E808 80242398 4600110D */ trunc.w.s $f4, $f2 -/* B2E80C 8024239C 44102000 */ mfc1 $s0, $f4 -/* B2E810 802423A0 0C0B1EAF */ jal get_variable -/* B2E814 802423A4 34A5D483 */ ori $a1, $a1, 0xd483 -/* B2E818 802423A8 4600B306 */ mov.s $f12, $f22 -/* B2E81C 802423AC 0C00A8BB */ jal sin_deg -/* B2E820 802423B0 0040882D */ daddu $s1, $v0, $zero -/* B2E824 802423B4 4600A502 */ mul.s $f20, $f20, $f0 -/* B2E828 802423B8 00000000 */ nop -/* B2E82C 802423BC 0240202D */ daddu $a0, $s2, $zero -/* B2E830 802423C0 44910000 */ mtc1 $s1, $f0 -/* B2E834 802423C4 00000000 */ nop -/* B2E838 802423C8 46800020 */ cvt.s.w $f0, $f0 -/* B2E83C 802423CC 46140001 */ sub.s $f0, $f0, $f20 -/* B2E840 802423D0 0280282D */ daddu $a1, $s4, $zero -/* B2E844 802423D4 02173023 */ subu $a2, $s0, $s7 -/* B2E848 802423D8 4600010D */ trunc.w.s $f4, $f0 -/* B2E84C 802423DC 44102000 */ mfc1 $s0, $f4 -/* B2E850 802423E0 0C0B2026 */ jal set_variable -/* B2E854 802423E4 02168023 */ subu $s0, $s0, $s6 -/* B2E858 802423E8 0240202D */ daddu $a0, $s2, $zero -/* B2E85C 802423EC 02A0282D */ daddu $a1, $s5, $zero -/* B2E860 802423F0 0C0B2026 */ jal set_variable -/* B2E864 802423F4 0200302D */ daddu $a2, $s0, $zero -/* B2E868 802423F8 8FBF0030 */ lw $ra, 0x30($sp) -/* B2E86C 802423FC 8FB7002C */ lw $s7, 0x2c($sp) -/* B2E870 80242400 8FB60028 */ lw $s6, 0x28($sp) -/* B2E874 80242404 8FB50024 */ lw $s5, 0x24($sp) -/* B2E878 80242408 8FB40020 */ lw $s4, 0x20($sp) -/* B2E87C 8024240C 8FB3001C */ lw $s3, 0x1c($sp) -/* B2E880 80242410 8FB20018 */ lw $s2, 0x18($sp) -/* B2E884 80242414 8FB10014 */ lw $s1, 0x14($sp) -/* B2E888 80242418 8FB00010 */ lw $s0, 0x10($sp) -/* B2E88C 8024241C D7B60040 */ ldc1 $f22, 0x40($sp) -/* B2E890 80242420 D7B40038 */ ldc1 $f20, 0x38($sp) -/* B2E894 80242424 24020002 */ addiu $v0, $zero, 2 -/* B2E898 80242428 03E00008 */ jr $ra -/* B2E89C 8024242C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s new file mode 100644 index 0000000000..9bbecdde90 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242294_B2E704 +/* B2E704 80242294 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B2E708 80242298 AFB20018 */ sw $s2, 0x18($sp) +/* B2E70C 8024229C 0080902D */ daddu $s2, $a0, $zero +/* B2E710 802422A0 AFBF0030 */ sw $ra, 0x30($sp) +/* B2E714 802422A4 AFB7002C */ sw $s7, 0x2c($sp) +/* B2E718 802422A8 AFB60028 */ sw $s6, 0x28($sp) +/* B2E71C 802422AC AFB50024 */ sw $s5, 0x24($sp) +/* B2E720 802422B0 AFB40020 */ sw $s4, 0x20($sp) +/* B2E724 802422B4 AFB3001C */ sw $s3, 0x1c($sp) +/* B2E728 802422B8 AFB10014 */ sw $s1, 0x14($sp) +/* B2E72C 802422BC AFB00010 */ sw $s0, 0x10($sp) +/* B2E730 802422C0 F7B60040 */ sdc1 $f22, 0x40($sp) +/* B2E734 802422C4 F7B40038 */ sdc1 $f20, 0x38($sp) +/* B2E738 802422C8 8E50000C */ lw $s0, 0xc($s2) +/* B2E73C 802422CC 8E050000 */ lw $a1, ($s0) +/* B2E740 802422D0 0C0B1EAF */ jal get_variable +/* B2E744 802422D4 26100004 */ addiu $s0, $s0, 4 +/* B2E748 802422D8 8E050000 */ lw $a1, ($s0) +/* B2E74C 802422DC 26100004 */ addiu $s0, $s0, 4 +/* B2E750 802422E0 0240202D */ daddu $a0, $s2, $zero +/* B2E754 802422E4 0C0B1EAF */ jal get_variable +/* B2E758 802422E8 0040B82D */ daddu $s7, $v0, $zero +/* B2E75C 802422EC 8E050000 */ lw $a1, ($s0) +/* B2E760 802422F0 26100004 */ addiu $s0, $s0, 4 +/* B2E764 802422F4 0240202D */ daddu $a0, $s2, $zero +/* B2E768 802422F8 0C0B1EAF */ jal get_variable +/* B2E76C 802422FC 0040B02D */ daddu $s6, $v0, $zero +/* B2E770 80242300 0240202D */ daddu $a0, $s2, $zero +/* B2E774 80242304 3C05F4AC */ lui $a1, 0xf4ac +/* B2E778 80242308 34A5D481 */ ori $a1, $a1, 0xd481 +/* B2E77C 8024230C 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* B2E780 80242310 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* B2E784 80242314 8E140000 */ lw $s4, ($s0) +/* B2E788 80242318 00061880 */ sll $v1, $a2, 2 +/* B2E78C 8024231C 00661821 */ addu $v1, $v1, $a2 +/* B2E790 80242320 00031880 */ sll $v1, $v1, 2 +/* B2E794 80242324 00661823 */ subu $v1, $v1, $a2 +/* B2E798 80242328 000330C0 */ sll $a2, $v1, 3 +/* B2E79C 8024232C 00661821 */ addu $v1, $v1, $a2 +/* B2E7A0 80242330 000318C0 */ sll $v1, $v1, 3 +/* B2E7A4 80242334 3C01800B */ lui $at, 0x800b +/* B2E7A8 80242338 00230821 */ addu $at, $at, $v1 +/* B2E7AC 8024233C C4201DEC */ lwc1 $f0, 0x1dec($at) +/* B2E7B0 80242340 8E150004 */ lw $s5, 4($s0) +/* B2E7B4 80242344 4600010D */ trunc.w.s $f4, $f0 +/* B2E7B8 80242348 44112000 */ mfc1 $s1, $f4 +/* B2E7BC 8024234C 0C0B1EAF */ jal get_variable +/* B2E7C0 80242350 0040982D */ daddu $s3, $v0, $zero +/* B2E7C4 80242354 4491B000 */ mtc1 $s1, $f22 +/* B2E7C8 80242358 00000000 */ nop +/* B2E7CC 8024235C 4680B5A0 */ cvt.s.w $f22, $f22 +/* B2E7D0 80242360 4600B306 */ mov.s $f12, $f22 +/* B2E7D4 80242364 0C00A8D4 */ jal cos_deg +/* B2E7D8 80242368 0040802D */ daddu $s0, $v0, $zero +/* B2E7DC 8024236C 4493A000 */ mtc1 $s3, $f20 +/* B2E7E0 80242370 00000000 */ nop +/* B2E7E4 80242374 4680A520 */ cvt.s.w $f20, $f20 +/* B2E7E8 80242378 4600A002 */ mul.s $f0, $f20, $f0 +/* B2E7EC 8024237C 00000000 */ nop +/* B2E7F0 80242380 0240202D */ daddu $a0, $s2, $zero +/* B2E7F4 80242384 44901000 */ mtc1 $s0, $f2 +/* B2E7F8 80242388 00000000 */ nop +/* B2E7FC 8024238C 468010A0 */ cvt.s.w $f2, $f2 +/* B2E800 80242390 46001081 */ sub.s $f2, $f2, $f0 +/* B2E804 80242394 3C05F4AC */ lui $a1, 0xf4ac +/* B2E808 80242398 4600110D */ trunc.w.s $f4, $f2 +/* B2E80C 8024239C 44102000 */ mfc1 $s0, $f4 +/* B2E810 802423A0 0C0B1EAF */ jal get_variable +/* B2E814 802423A4 34A5D483 */ ori $a1, $a1, 0xd483 +/* B2E818 802423A8 4600B306 */ mov.s $f12, $f22 +/* B2E81C 802423AC 0C00A8BB */ jal sin_deg +/* B2E820 802423B0 0040882D */ daddu $s1, $v0, $zero +/* B2E824 802423B4 4600A502 */ mul.s $f20, $f20, $f0 +/* B2E828 802423B8 00000000 */ nop +/* B2E82C 802423BC 0240202D */ daddu $a0, $s2, $zero +/* B2E830 802423C0 44910000 */ mtc1 $s1, $f0 +/* B2E834 802423C4 00000000 */ nop +/* B2E838 802423C8 46800020 */ cvt.s.w $f0, $f0 +/* B2E83C 802423CC 46140001 */ sub.s $f0, $f0, $f20 +/* B2E840 802423D0 0280282D */ daddu $a1, $s4, $zero +/* B2E844 802423D4 02173023 */ subu $a2, $s0, $s7 +/* B2E848 802423D8 4600010D */ trunc.w.s $f4, $f0 +/* B2E84C 802423DC 44102000 */ mfc1 $s0, $f4 +/* B2E850 802423E0 0C0B2026 */ jal set_variable +/* B2E854 802423E4 02168023 */ subu $s0, $s0, $s6 +/* B2E858 802423E8 0240202D */ daddu $a0, $s2, $zero +/* B2E85C 802423EC 02A0282D */ daddu $a1, $s5, $zero +/* B2E860 802423F0 0C0B2026 */ jal set_variable +/* B2E864 802423F4 0200302D */ daddu $a2, $s0, $zero +/* B2E868 802423F8 8FBF0030 */ lw $ra, 0x30($sp) +/* B2E86C 802423FC 8FB7002C */ lw $s7, 0x2c($sp) +/* B2E870 80242400 8FB60028 */ lw $s6, 0x28($sp) +/* B2E874 80242404 8FB50024 */ lw $s5, 0x24($sp) +/* B2E878 80242408 8FB40020 */ lw $s4, 0x20($sp) +/* B2E87C 8024240C 8FB3001C */ lw $s3, 0x1c($sp) +/* B2E880 80242410 8FB20018 */ lw $s2, 0x18($sp) +/* B2E884 80242414 8FB10014 */ lw $s1, 0x14($sp) +/* B2E888 80242418 8FB00010 */ lw $s0, 0x10($sp) +/* B2E88C 8024241C D7B60040 */ ldc1 $f22, 0x40($sp) +/* B2E890 80242420 D7B40038 */ ldc1 $f20, 0x38($sp) +/* B2E894 80242424 24020002 */ addiu $v0, $zero, 2 +/* B2E898 80242428 03E00008 */ jr $ra +/* B2E89C 8024242C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430.s deleted file mode 100644 index 33f5b6a0a7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242430 -/* B2E8A0 80242430 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B2E8A4 80242434 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B2E8A8 80242438 10A00002 */ beqz $a1, .L80242444 -/* B2E8AC 8024243C 2402003C */ addiu $v0, $zero, 0x3c -/* B2E8B0 80242440 AC820070 */ sw $v0, 0x70($a0) -.L80242444: -/* B2E8B4 80242444 C4620080 */ lwc1 $f2, 0x80($v1) -/* B2E8B8 80242448 3C0141F0 */ lui $at, 0x41f0 -/* B2E8BC 8024244C 44810000 */ mtc1 $at, $f0 -/* B2E8C0 80242450 00000000 */ nop -/* B2E8C4 80242454 46001000 */ add.s $f0, $f2, $f0 -/* B2E8C8 80242458 3C0143B4 */ lui $at, 0x43b4 -/* B2E8CC 8024245C 44811000 */ mtc1 $at, $f2 -/* B2E8D0 80242460 00000000 */ nop -/* B2E8D4 80242464 4600103E */ c.le.s $f2, $f0 -/* B2E8D8 80242468 00000000 */ nop -/* B2E8DC 8024246C 45000003 */ bc1f .L8024247C -/* B2E8E0 80242470 E4600080 */ swc1 $f0, 0x80($v1) -/* B2E8E4 80242474 46020001 */ sub.s $f0, $f0, $f2 -/* B2E8E8 80242478 E4600080 */ swc1 $f0, 0x80($v1) -.L8024247C: -/* B2E8EC 8024247C 8C820070 */ lw $v0, 0x70($a0) -/* B2E8F0 80242480 2442FFFF */ addiu $v0, $v0, -1 -/* B2E8F4 80242484 AC820070 */ sw $v0, 0x70($a0) -/* B2E8F8 80242488 000217C3 */ sra $v0, $v0, 0x1f -/* B2E8FC 8024248C 03E00008 */ jr $ra -/* B2E900 80242490 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s new file mode 100644 index 0000000000..815c0eddc5 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242430_B2E8A0 +/* B2E8A0 80242430 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* B2E8A4 80242434 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* B2E8A8 80242438 10A00002 */ beqz $a1, .L80242444 +/* B2E8AC 8024243C 2402003C */ addiu $v0, $zero, 0x3c +/* B2E8B0 80242440 AC820070 */ sw $v0, 0x70($a0) +.L80242444: +/* B2E8B4 80242444 C4620080 */ lwc1 $f2, 0x80($v1) +/* B2E8B8 80242448 3C0141F0 */ lui $at, 0x41f0 +/* B2E8BC 8024244C 44810000 */ mtc1 $at, $f0 +/* B2E8C0 80242450 00000000 */ nop +/* B2E8C4 80242454 46001000 */ add.s $f0, $f2, $f0 +/* B2E8C8 80242458 3C0143B4 */ lui $at, 0x43b4 +/* B2E8CC 8024245C 44811000 */ mtc1 $at, $f2 +/* B2E8D0 80242460 00000000 */ nop +/* B2E8D4 80242464 4600103E */ c.le.s $f2, $f0 +/* B2E8D8 80242468 00000000 */ nop +/* B2E8DC 8024246C 45000003 */ bc1f .L8024247C +/* B2E8E0 80242470 E4600080 */ swc1 $f0, 0x80($v1) +/* B2E8E4 80242474 46020001 */ sub.s $f0, $f0, $f2 +/* B2E8E8 80242478 E4600080 */ swc1 $f0, 0x80($v1) +.L8024247C: +/* B2E8EC 8024247C 8C820070 */ lw $v0, 0x70($a0) +/* B2E8F0 80242480 2442FFFF */ addiu $v0, $v0, -1 +/* B2E8F4 80242484 AC820070 */ sw $v0, 0x70($a0) +/* B2E8F8 80242488 000217C3 */ sra $v0, $v0, 0x1f +/* B2E8FC 8024248C 03E00008 */ jr $ra +/* B2E900 80242490 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494.s deleted file mode 100644 index 0827c05169..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242494 -/* B2E904 80242494 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2E908 80242498 AFB10014 */ sw $s1, 0x14($sp) -/* B2E90C 8024249C 0080882D */ daddu $s1, $a0, $zero -/* B2E910 802424A0 AFB00010 */ sw $s0, 0x10($sp) -/* B2E914 802424A4 00A0802D */ daddu $s0, $a1, $zero -/* B2E918 802424A8 AFBF0018 */ sw $ra, 0x18($sp) -/* B2E91C 802424AC 0C00EABB */ jal get_npc_unsafe -/* B2E920 802424B0 2404FFFC */ addiu $a0, $zero, -4 -/* B2E924 802424B4 12000003 */ beqz $s0, .L802424C4 -/* B2E928 802424B8 0040182D */ daddu $v1, $v0, $zero -/* B2E92C 802424BC 2402003C */ addiu $v0, $zero, 0x3c -/* B2E930 802424C0 AE220070 */ sw $v0, 0x70($s1) -.L802424C4: -/* B2E934 802424C4 C462000C */ lwc1 $f2, 0xc($v1) -/* B2E938 802424C8 3C0141F0 */ lui $at, 0x41f0 -/* B2E93C 802424CC 44810000 */ mtc1 $at, $f0 -/* B2E940 802424D0 00000000 */ nop -/* B2E944 802424D4 46001000 */ add.s $f0, $f2, $f0 -/* B2E948 802424D8 3C0143B4 */ lui $at, 0x43b4 -/* B2E94C 802424DC 44811000 */ mtc1 $at, $f2 -/* B2E950 802424E0 00000000 */ nop -/* B2E954 802424E4 4600103E */ c.le.s $f2, $f0 -/* B2E958 802424E8 00000000 */ nop -/* B2E95C 802424EC 45000003 */ bc1f .L802424FC -/* B2E960 802424F0 E460000C */ swc1 $f0, 0xc($v1) -/* B2E964 802424F4 46020001 */ sub.s $f0, $f0, $f2 -/* B2E968 802424F8 E460000C */ swc1 $f0, 0xc($v1) -.L802424FC: -/* B2E96C 802424FC 8E230070 */ lw $v1, 0x70($s1) -/* B2E970 80242500 2463FFFF */ addiu $v1, $v1, -1 -/* B2E974 80242504 000317C3 */ sra $v0, $v1, 0x1f -/* B2E978 80242508 AE230070 */ sw $v1, 0x70($s1) -/* B2E97C 8024250C 8FBF0018 */ lw $ra, 0x18($sp) -/* B2E980 80242510 8FB10014 */ lw $s1, 0x14($sp) -/* B2E984 80242514 8FB00010 */ lw $s0, 0x10($sp) -/* B2E988 80242518 30420002 */ andi $v0, $v0, 2 -/* B2E98C 8024251C 03E00008 */ jr $ra -/* B2E990 80242520 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s new file mode 100644 index 0000000000..da066920cb --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242494_B2E904 +/* B2E904 80242494 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B2E908 80242498 AFB10014 */ sw $s1, 0x14($sp) +/* B2E90C 8024249C 0080882D */ daddu $s1, $a0, $zero +/* B2E910 802424A0 AFB00010 */ sw $s0, 0x10($sp) +/* B2E914 802424A4 00A0802D */ daddu $s0, $a1, $zero +/* B2E918 802424A8 AFBF0018 */ sw $ra, 0x18($sp) +/* B2E91C 802424AC 0C00EABB */ jal get_npc_unsafe +/* B2E920 802424B0 2404FFFC */ addiu $a0, $zero, -4 +/* B2E924 802424B4 12000003 */ beqz $s0, .L802424C4 +/* B2E928 802424B8 0040182D */ daddu $v1, $v0, $zero +/* B2E92C 802424BC 2402003C */ addiu $v0, $zero, 0x3c +/* B2E930 802424C0 AE220070 */ sw $v0, 0x70($s1) +.L802424C4: +/* B2E934 802424C4 C462000C */ lwc1 $f2, 0xc($v1) +/* B2E938 802424C8 3C0141F0 */ lui $at, 0x41f0 +/* B2E93C 802424CC 44810000 */ mtc1 $at, $f0 +/* B2E940 802424D0 00000000 */ nop +/* B2E944 802424D4 46001000 */ add.s $f0, $f2, $f0 +/* B2E948 802424D8 3C0143B4 */ lui $at, 0x43b4 +/* B2E94C 802424DC 44811000 */ mtc1 $at, $f2 +/* B2E950 802424E0 00000000 */ nop +/* B2E954 802424E4 4600103E */ c.le.s $f2, $f0 +/* B2E958 802424E8 00000000 */ nop +/* B2E95C 802424EC 45000003 */ bc1f .L802424FC +/* B2E960 802424F0 E460000C */ swc1 $f0, 0xc($v1) +/* B2E964 802424F4 46020001 */ sub.s $f0, $f0, $f2 +/* B2E968 802424F8 E460000C */ swc1 $f0, 0xc($v1) +.L802424FC: +/* B2E96C 802424FC 8E230070 */ lw $v1, 0x70($s1) +/* B2E970 80242500 2463FFFF */ addiu $v1, $v1, -1 +/* B2E974 80242504 000317C3 */ sra $v0, $v1, 0x1f +/* B2E978 80242508 AE230070 */ sw $v1, 0x70($s1) +/* B2E97C 8024250C 8FBF0018 */ lw $ra, 0x18($sp) +/* B2E980 80242510 8FB10014 */ lw $s1, 0x14($sp) +/* B2E984 80242514 8FB00010 */ lw $s0, 0x10($sp) +/* B2E988 80242518 30420002 */ andi $v0, $v0, 2 +/* B2E98C 8024251C 03E00008 */ jr $ra +/* B2E990 80242520 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524.s deleted file mode 100644 index 07b3c37195..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242524 -/* B2E994 80242524 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B2E998 80242528 AFB10014 */ sw $s1, 0x14($sp) -/* B2E99C 8024252C 0080882D */ daddu $s1, $a0, $zero -/* B2E9A0 80242530 AFB00010 */ sw $s0, 0x10($sp) -/* B2E9A4 80242534 00A0802D */ daddu $s0, $a1, $zero -/* B2E9A8 80242538 AFBF001C */ sw $ra, 0x1c($sp) -/* B2E9AC 8024253C AFB20018 */ sw $s2, 0x18($sp) -/* B2E9B0 80242540 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B2E9B4 80242544 0C00EABB */ jal get_npc_unsafe -/* B2E9B8 80242548 2404FFFC */ addiu $a0, $zero, -4 -/* B2E9BC 8024254C 12000017 */ beqz $s0, .L802425AC -/* B2E9C0 80242550 0040902D */ daddu $s2, $v0, $zero -/* B2E9C4 80242554 0220202D */ daddu $a0, $s1, $zero -/* B2E9C8 80242558 3C05FE36 */ lui $a1, 0xfe36 -/* B2E9CC 8024255C 0C0B210B */ jal get_float_variable -/* B2E9D0 80242560 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B2E9D4 80242564 0220202D */ daddu $a0, $s1, $zero -/* B2E9D8 80242568 3C05FE36 */ lui $a1, 0xfe36 -/* B2E9DC 8024256C 3C014270 */ lui $at, 0x4270 -/* B2E9E0 80242570 4481A000 */ mtc1 $at, $f20 -/* B2E9E4 80242574 34A53C85 */ ori $a1, $a1, 0x3c85 -/* B2E9E8 80242578 46140003 */ div.s $f0, $f0, $f20 -/* B2E9EC 8024257C 0C0B210B */ jal get_float_variable -/* B2E9F0 80242580 E6200074 */ swc1 $f0, 0x74($s1) -/* B2E9F4 80242584 0220202D */ daddu $a0, $s1, $zero -/* B2E9F8 80242588 3C05FE36 */ lui $a1, 0xfe36 -/* B2E9FC 8024258C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B2EA00 80242590 46140003 */ div.s $f0, $f0, $f20 -/* B2EA04 80242594 0C0B210B */ jal get_float_variable -/* B2EA08 80242598 E6200078 */ swc1 $f0, 0x78($s1) -/* B2EA0C 8024259C 46140003 */ div.s $f0, $f0, $f20 -/* B2EA10 802425A0 2402003C */ addiu $v0, $zero, 0x3c -/* B2EA14 802425A4 E620007C */ swc1 $f0, 0x7c($s1) -/* B2EA18 802425A8 AE220070 */ sw $v0, 0x70($s1) -.L802425AC: -/* B2EA1C 802425AC C6400038 */ lwc1 $f0, 0x38($s2) -/* B2EA20 802425B0 C6220074 */ lwc1 $f2, 0x74($s1) -/* B2EA24 802425B4 46020000 */ add.s $f0, $f0, $f2 -/* B2EA28 802425B8 E6400038 */ swc1 $f0, 0x38($s2) -/* B2EA2C 802425BC C640003C */ lwc1 $f0, 0x3c($s2) -/* B2EA30 802425C0 C6220078 */ lwc1 $f2, 0x78($s1) -/* B2EA34 802425C4 46020000 */ add.s $f0, $f0, $f2 -/* B2EA38 802425C8 E640003C */ swc1 $f0, 0x3c($s2) -/* B2EA3C 802425CC C6400040 */ lwc1 $f0, 0x40($s2) -/* B2EA40 802425D0 C622007C */ lwc1 $f2, 0x7c($s1) -/* B2EA44 802425D4 46020000 */ add.s $f0, $f0, $f2 -/* B2EA48 802425D8 E6400040 */ swc1 $f0, 0x40($s2) -/* B2EA4C 802425DC 8E230070 */ lw $v1, 0x70($s1) -/* B2EA50 802425E0 2463FFFF */ addiu $v1, $v1, -1 -/* B2EA54 802425E4 2C620001 */ sltiu $v0, $v1, 1 -/* B2EA58 802425E8 AE230070 */ sw $v1, 0x70($s1) -/* B2EA5C 802425EC 8FBF001C */ lw $ra, 0x1c($sp) -/* B2EA60 802425F0 8FB20018 */ lw $s2, 0x18($sp) -/* B2EA64 802425F4 8FB10014 */ lw $s1, 0x14($sp) -/* B2EA68 802425F8 8FB00010 */ lw $s0, 0x10($sp) -/* B2EA6C 802425FC D7B40020 */ ldc1 $f20, 0x20($sp) -/* B2EA70 80242600 00021040 */ sll $v0, $v0, 1 -/* B2EA74 80242604 03E00008 */ jr $ra -/* B2EA78 80242608 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s new file mode 100644 index 0000000000..2da5e2cd12 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242524_B2E994 +/* B2E994 80242524 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B2E998 80242528 AFB10014 */ sw $s1, 0x14($sp) +/* B2E99C 8024252C 0080882D */ daddu $s1, $a0, $zero +/* B2E9A0 80242530 AFB00010 */ sw $s0, 0x10($sp) +/* B2E9A4 80242534 00A0802D */ daddu $s0, $a1, $zero +/* B2E9A8 80242538 AFBF001C */ sw $ra, 0x1c($sp) +/* B2E9AC 8024253C AFB20018 */ sw $s2, 0x18($sp) +/* B2E9B0 80242540 F7B40020 */ sdc1 $f20, 0x20($sp) +/* B2E9B4 80242544 0C00EABB */ jal get_npc_unsafe +/* B2E9B8 80242548 2404FFFC */ addiu $a0, $zero, -4 +/* B2E9BC 8024254C 12000017 */ beqz $s0, .L802425AC +/* B2E9C0 80242550 0040902D */ daddu $s2, $v0, $zero +/* B2E9C4 80242554 0220202D */ daddu $a0, $s1, $zero +/* B2E9C8 80242558 3C05FE36 */ lui $a1, 0xfe36 +/* B2E9CC 8024255C 0C0B210B */ jal get_float_variable +/* B2E9D0 80242560 34A53C80 */ ori $a1, $a1, 0x3c80 +/* B2E9D4 80242564 0220202D */ daddu $a0, $s1, $zero +/* B2E9D8 80242568 3C05FE36 */ lui $a1, 0xfe36 +/* B2E9DC 8024256C 3C014270 */ lui $at, 0x4270 +/* B2E9E0 80242570 4481A000 */ mtc1 $at, $f20 +/* B2E9E4 80242574 34A53C85 */ ori $a1, $a1, 0x3c85 +/* B2E9E8 80242578 46140003 */ div.s $f0, $f0, $f20 +/* B2E9EC 8024257C 0C0B210B */ jal get_float_variable +/* B2E9F0 80242580 E6200074 */ swc1 $f0, 0x74($s1) +/* B2E9F4 80242584 0220202D */ daddu $a0, $s1, $zero +/* B2E9F8 80242588 3C05FE36 */ lui $a1, 0xfe36 +/* B2E9FC 8024258C 34A53C81 */ ori $a1, $a1, 0x3c81 +/* B2EA00 80242590 46140003 */ div.s $f0, $f0, $f20 +/* B2EA04 80242594 0C0B210B */ jal get_float_variable +/* B2EA08 80242598 E6200078 */ swc1 $f0, 0x78($s1) +/* B2EA0C 8024259C 46140003 */ div.s $f0, $f0, $f20 +/* B2EA10 802425A0 2402003C */ addiu $v0, $zero, 0x3c +/* B2EA14 802425A4 E620007C */ swc1 $f0, 0x7c($s1) +/* B2EA18 802425A8 AE220070 */ sw $v0, 0x70($s1) +.L802425AC: +/* B2EA1C 802425AC C6400038 */ lwc1 $f0, 0x38($s2) +/* B2EA20 802425B0 C6220074 */ lwc1 $f2, 0x74($s1) +/* B2EA24 802425B4 46020000 */ add.s $f0, $f0, $f2 +/* B2EA28 802425B8 E6400038 */ swc1 $f0, 0x38($s2) +/* B2EA2C 802425BC C640003C */ lwc1 $f0, 0x3c($s2) +/* B2EA30 802425C0 C6220078 */ lwc1 $f2, 0x78($s1) +/* B2EA34 802425C4 46020000 */ add.s $f0, $f0, $f2 +/* B2EA38 802425C8 E640003C */ swc1 $f0, 0x3c($s2) +/* B2EA3C 802425CC C6400040 */ lwc1 $f0, 0x40($s2) +/* B2EA40 802425D0 C622007C */ lwc1 $f2, 0x7c($s1) +/* B2EA44 802425D4 46020000 */ add.s $f0, $f0, $f2 +/* B2EA48 802425D8 E6400040 */ swc1 $f0, 0x40($s2) +/* B2EA4C 802425DC 8E230070 */ lw $v1, 0x70($s1) +/* B2EA50 802425E0 2463FFFF */ addiu $v1, $v1, -1 +/* B2EA54 802425E4 2C620001 */ sltiu $v0, $v1, 1 +/* B2EA58 802425E8 AE230070 */ sw $v1, 0x70($s1) +/* B2EA5C 802425EC 8FBF001C */ lw $ra, 0x1c($sp) +/* B2EA60 802425F0 8FB20018 */ lw $s2, 0x18($sp) +/* B2EA64 802425F4 8FB10014 */ lw $s1, 0x14($sp) +/* B2EA68 802425F8 8FB00010 */ lw $s0, 0x10($sp) +/* B2EA6C 802425FC D7B40020 */ ldc1 $f20, 0x20($sp) +/* B2EA70 80242600 00021040 */ sll $v0, $v0, 1 +/* B2EA74 80242604 03E00008 */ jr $ra +/* B2EA78 80242608 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C.s deleted file mode 100644 index 223b4b67fa..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024260C -/* B2EA7C 8024260C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2EA80 80242610 3C058025 */ lui $a1, 0x8025 -/* B2EA84 80242614 8CA58938 */ lw $a1, -0x76c8($a1) -/* B2EA88 80242618 AFBF0010 */ sw $ra, 0x10($sp) -/* B2EA8C 8024261C 0C0B1EAF */ jal get_variable -/* B2EA90 80242620 0000202D */ daddu $a0, $zero, $zero -/* B2EA94 80242624 0040182D */ daddu $v1, $v0, $zero -/* B2EA98 80242628 24020001 */ addiu $v0, $zero, 1 -/* B2EA9C 8024262C 14620006 */ bne $v1, $v0, .L80242648 -/* B2EAA0 80242630 24020002 */ addiu $v0, $zero, 2 -/* B2EAA4 80242634 44800000 */ mtc1 $zero, $f0 -/* B2EAA8 80242638 00000000 */ nop -/* B2EAAC 8024263C 44050000 */ mfc1 $a1, $f0 -/* B2EAB0 80242640 08090998 */ j .L80242660 -/* B2EAB4 80242644 0000202D */ daddu $a0, $zero, $zero -.L80242648: -/* B2EAB8 80242648 14620008 */ bne $v1, $v0, .L8024266C -/* B2EABC 8024264C 24040001 */ addiu $a0, $zero, 1 -/* B2EAC0 80242650 44800000 */ mtc1 $zero, $f0 -/* B2EAC4 80242654 00000000 */ nop -/* B2EAC8 80242658 44050000 */ mfc1 $a1, $f0 -/* B2EACC 8024265C 00000000 */ nop -.L80242660: -/* B2EAD0 80242660 00A0302D */ daddu $a2, $a1, $zero -/* B2EAD4 80242664 0C01C5A4 */ jal func_80071690 -/* B2EAD8 80242668 00A0382D */ daddu $a3, $a1, $zero -.L8024266C: -/* B2EADC 8024266C 8FBF0010 */ lw $ra, 0x10($sp) -/* B2EAE0 80242670 03E00008 */ jr $ra -/* B2EAE4 80242674 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s new file mode 100644 index 0000000000..c135ebcabc --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024260C_B2EA7C.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024260C_B2EA7C +/* B2EA7C 8024260C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B2EA80 80242610 3C058025 */ lui $a1, 0x8025 +/* B2EA84 80242614 8CA58938 */ lw $a1, -0x76c8($a1) +/* B2EA88 80242618 AFBF0010 */ sw $ra, 0x10($sp) +/* B2EA8C 8024261C 0C0B1EAF */ jal get_variable +/* B2EA90 80242620 0000202D */ daddu $a0, $zero, $zero +/* B2EA94 80242624 0040182D */ daddu $v1, $v0, $zero +/* B2EA98 80242628 24020001 */ addiu $v0, $zero, 1 +/* B2EA9C 8024262C 14620006 */ bne $v1, $v0, .L80242648 +/* B2EAA0 80242630 24020002 */ addiu $v0, $zero, 2 +/* B2EAA4 80242634 44800000 */ mtc1 $zero, $f0 +/* B2EAA8 80242638 00000000 */ nop +/* B2EAAC 8024263C 44050000 */ mfc1 $a1, $f0 +/* B2EAB0 80242640 08090998 */ j .L80242660 +/* B2EAB4 80242644 0000202D */ daddu $a0, $zero, $zero +.L80242648: +/* B2EAB8 80242648 14620008 */ bne $v1, $v0, .L8024266C +/* B2EABC 8024264C 24040001 */ addiu $a0, $zero, 1 +/* B2EAC0 80242650 44800000 */ mtc1 $zero, $f0 +/* B2EAC4 80242654 00000000 */ nop +/* B2EAC8 80242658 44050000 */ mfc1 $a1, $f0 +/* B2EACC 8024265C 00000000 */ nop +.L80242660: +/* B2EAD0 80242660 00A0302D */ daddu $a2, $a1, $zero +/* B2EAD4 80242664 0C01C5A4 */ jal func_80071690 +/* B2EAD8 80242668 00A0382D */ daddu $a3, $a1, $zero +.L8024266C: +/* B2EADC 8024266C 8FBF0010 */ lw $ra, 0x10($sp) +/* B2EAE0 80242670 03E00008 */ jr $ra +/* B2EAE4 80242674 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678.s deleted file mode 100644 index d5f875d71e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242678 -/* B2EAE8 80242678 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2EAEC 8024267C 3C058024 */ lui $a1, 0x8024 -/* B2EAF0 80242680 24A5260C */ addiu $a1, $a1, 0x260c -/* B2EAF4 80242684 AFBF0010 */ sw $ra, 0x10($sp) -/* B2EAF8 80242688 0C048C8F */ jal bind_dynamic_entity_7 -/* B2EAFC 8024268C 0000202D */ daddu $a0, $zero, $zero -/* B2EB00 80242690 8FBF0010 */ lw $ra, 0x10($sp) -/* B2EB04 80242694 3C018025 */ lui $at, 0x8025 -/* B2EB08 80242698 AC228924 */ sw $v0, -0x76dc($at) -/* B2EB0C 8024269C 24020002 */ addiu $v0, $zero, 2 -/* B2EB10 802426A0 03E00008 */ jr $ra -/* B2EB14 802426A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s new file mode 100644 index 0000000000..ee4ff90c88 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242678_B2EAE8.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242678_B2EAE8 +/* B2EAE8 80242678 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B2EAEC 8024267C 3C058024 */ lui $a1, 0x8024 +/* B2EAF0 80242680 24A5260C */ addiu $a1, $a1, 0x260c +/* B2EAF4 80242684 AFBF0010 */ sw $ra, 0x10($sp) +/* B2EAF8 80242688 0C048C8F */ jal bind_dynamic_entity_7 +/* B2EAFC 8024268C 0000202D */ daddu $a0, $zero, $zero +/* B2EB00 80242690 8FBF0010 */ lw $ra, 0x10($sp) +/* B2EB04 80242694 3C018025 */ lui $at, 0x8025 +/* B2EB08 80242698 AC228924 */ sw $v0, -0x76dc($at) +/* B2EB0C 8024269C 24020002 */ addiu $v0, $zero, 2 +/* B2EB10 802426A0 03E00008 */ jr $ra +/* B2EB14 802426A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8.s deleted file mode 100644 index 63299b020d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426A8 -/* B2EB18 802426A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2EB1C 802426AC AFBF0010 */ sw $ra, 0x10($sp) -/* B2EB20 802426B0 8C82000C */ lw $v0, 0xc($a0) -/* B2EB24 802426B4 0C0B1EAF */ jal get_variable -/* B2EB28 802426B8 8C450000 */ lw $a1, ($v0) -/* B2EB2C 802426BC 0C03AC5A */ jal func_800EB168 -/* B2EB30 802426C0 0040202D */ daddu $a0, $v0, $zero -/* B2EB34 802426C4 8FBF0010 */ lw $ra, 0x10($sp) -/* B2EB38 802426C8 24020002 */ addiu $v0, $zero, 2 -/* B2EB3C 802426CC 03E00008 */ jr $ra -/* B2EB40 802426D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B2EB44 802426D4 00000000 */ nop -/* B2EB48 802426D8 00000000 */ nop -/* B2EB4C 802426DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s new file mode 100644 index 0000000000..50fdd62874 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802426A8_B2EB18.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426A8_B2EB18 +/* B2EB18 802426A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B2EB1C 802426AC AFBF0010 */ sw $ra, 0x10($sp) +/* B2EB20 802426B0 8C82000C */ lw $v0, 0xc($a0) +/* B2EB24 802426B4 0C0B1EAF */ jal get_variable +/* B2EB28 802426B8 8C450000 */ lw $a1, ($v0) +/* B2EB2C 802426BC 0C03AC5A */ jal func_800EB168 +/* B2EB30 802426C0 0040202D */ daddu $a0, $v0, $zero +/* B2EB34 802426C4 8FBF0010 */ lw $ra, 0x10($sp) +/* B2EB38 802426C8 24020002 */ addiu $v0, $zero, 2 +/* B2EB3C 802426CC 03E00008 */ jr $ra +/* B2EB40 802426D0 27BD0018 */ addiu $sp, $sp, 0x18 +/* B2EB44 802426D4 00000000 */ nop +/* B2EB48 802426D8 00000000 */ nop +/* B2EB4C 802426DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_802426E0.s b/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_802426E0.s deleted file mode 100644 index 4c1ad74a8e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_802426E0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426E0 -/* B2EB50 802426E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B2EB54 802426E4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B2EB58 802426E8 4485A000 */ mtc1 $a1, $f20 -/* B2EB5C 802426EC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B2EB60 802426F0 4486B000 */ mtc1 $a2, $f22 -/* B2EB64 802426F4 AFB00010 */ sw $s0, 0x10($sp) -/* B2EB68 802426F8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B2EB6C 802426FC 4487C000 */ mtc1 $a3, $f24 -/* B2EB70 80242700 AFBF0014 */ sw $ra, 0x14($sp) -/* B2EB74 80242704 0C019D28 */ jal guMtxIdentF -/* B2EB78 80242708 0080802D */ daddu $s0, $a0, $zero -/* B2EB7C 8024270C 4616A582 */ mul.s $f22, $f20, $f22 -/* B2EB80 80242710 00000000 */ nop -/* B2EB84 80242714 4618A502 */ mul.s $f20, $f20, $f24 -/* B2EB88 80242718 00000000 */ nop -/* B2EB8C 8024271C 3C013F80 */ lui $at, 0x3f80 -/* B2EB90 80242720 44810000 */ mtc1 $at, $f0 -/* B2EB94 80242724 00000000 */ nop -/* B2EB98 80242728 E6000014 */ swc1 $f0, 0x14($s0) -/* B2EB9C 8024272C E6160010 */ swc1 $f22, 0x10($s0) -/* B2EBA0 80242730 E6140018 */ swc1 $f20, 0x18($s0) -/* B2EBA4 80242734 8FBF0014 */ lw $ra, 0x14($sp) -/* B2EBA8 80242738 8FB00010 */ lw $s0, 0x10($sp) -/* B2EBAC 8024273C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B2EBB0 80242740 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B2EBB4 80242744 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B2EBB8 80242748 03E00008 */ jr $ra -/* B2EBBC 8024274C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_802426E0_B2EB50.s b/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_802426E0_B2EB50.s new file mode 100644 index 0000000000..55eab0afe8 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_802426E0_B2EB50.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426E0_B2EB50 +/* B2EB50 802426E0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B2EB54 802426E4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B2EB58 802426E8 4485A000 */ mtc1 $a1, $f20 +/* B2EB5C 802426EC F7B60020 */ sdc1 $f22, 0x20($sp) +/* B2EB60 802426F0 4486B000 */ mtc1 $a2, $f22 +/* B2EB64 802426F4 AFB00010 */ sw $s0, 0x10($sp) +/* B2EB68 802426F8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* B2EB6C 802426FC 4487C000 */ mtc1 $a3, $f24 +/* B2EB70 80242700 AFBF0014 */ sw $ra, 0x14($sp) +/* B2EB74 80242704 0C019D28 */ jal guMtxIdentF +/* B2EB78 80242708 0080802D */ daddu $s0, $a0, $zero +/* B2EB7C 8024270C 4616A582 */ mul.s $f22, $f20, $f22 +/* B2EB80 80242710 00000000 */ nop +/* B2EB84 80242714 4618A502 */ mul.s $f20, $f20, $f24 +/* B2EB88 80242718 00000000 */ nop +/* B2EB8C 8024271C 3C013F80 */ lui $at, 0x3f80 +/* B2EB90 80242720 44810000 */ mtc1 $at, $f0 +/* B2EB94 80242724 00000000 */ nop +/* B2EB98 80242728 E6000014 */ swc1 $f0, 0x14($s0) +/* B2EB9C 8024272C E6160010 */ swc1 $f22, 0x10($s0) +/* B2EBA0 80242730 E6140018 */ swc1 $f20, 0x18($s0) +/* B2EBA4 80242734 8FBF0014 */ lw $ra, 0x14($sp) +/* B2EBA8 80242738 8FB00010 */ lw $s0, 0x10($sp) +/* B2EBAC 8024273C D7B80028 */ ldc1 $f24, 0x28($sp) +/* B2EBB0 80242740 D7B60020 */ ldc1 $f22, 0x20($sp) +/* B2EBB4 80242744 D7B40018 */ ldc1 $f20, 0x18($sp) +/* B2EBB8 80242748 03E00008 */ jr $ra +/* B2EBBC 8024274C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_80242750.s b/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_80242750.s deleted file mode 100644 index 939bd09aa8..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_80242750.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242750 -/* B2EBC0 80242750 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B2EBC4 80242754 AFB10054 */ sw $s1, 0x54($sp) -/* B2EBC8 80242758 0080882D */ daddu $s1, $a0, $zero -/* B2EBCC 8024275C AFBF005C */ sw $ra, 0x5c($sp) -/* B2EBD0 80242760 AFB20058 */ sw $s2, 0x58($sp) -/* B2EBD4 80242764 AFB00050 */ sw $s0, 0x50($sp) -/* B2EBD8 80242768 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B2EBDC 8024276C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B2EBE0 80242770 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B2EBE4 80242774 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B2EBE8 80242778 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B2EBEC 8024277C 8E30000C */ lw $s0, 0xc($s1) -/* B2EBF0 80242780 8E050000 */ lw $a1, ($s0) -/* B2EBF4 80242784 0C0B1EAF */ jal get_variable -/* B2EBF8 80242788 26100004 */ addiu $s0, $s0, 4 -/* B2EBFC 8024278C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B2EC00 80242790 0040202D */ daddu $a0, $v0, $zero -/* B2EC04 80242794 8E050000 */ lw $a1, ($s0) -/* B2EC08 80242798 26100004 */ addiu $s0, $s0, 4 -/* B2EC0C 8024279C 0220202D */ daddu $a0, $s1, $zero -/* B2EC10 802427A0 0C0B210B */ jal get_float_variable -/* B2EC14 802427A4 0040902D */ daddu $s2, $v0, $zero -/* B2EC18 802427A8 8E050000 */ lw $a1, ($s0) -/* B2EC1C 802427AC 26100004 */ addiu $s0, $s0, 4 -/* B2EC20 802427B0 0220202D */ daddu $a0, $s1, $zero -/* B2EC24 802427B4 0C0B210B */ jal get_float_variable -/* B2EC28 802427B8 46000706 */ mov.s $f28, $f0 -/* B2EC2C 802427BC 8E050000 */ lw $a1, ($s0) -/* B2EC30 802427C0 26100004 */ addiu $s0, $s0, 4 -/* B2EC34 802427C4 0220202D */ daddu $a0, $s1, $zero -/* B2EC38 802427C8 0C0B210B */ jal get_float_variable -/* B2EC3C 802427CC 46000686 */ mov.s $f26, $f0 -/* B2EC40 802427D0 0220202D */ daddu $a0, $s1, $zero -/* B2EC44 802427D4 8E050000 */ lw $a1, ($s0) -/* B2EC48 802427D8 0C0B210B */ jal get_float_variable -/* B2EC4C 802427DC 46000586 */ mov.s $f22, $f0 -/* B2EC50 802427E0 0240202D */ daddu $a0, $s2, $zero -/* B2EC54 802427E4 0C046B4C */ jal get_model_from_list_index -/* B2EC58 802427E8 46000606 */ mov.s $f24, $f0 -/* B2EC5C 802427EC 0040882D */ daddu $s1, $v0, $zero -/* B2EC60 802427F0 96220000 */ lhu $v0, ($s1) -/* B2EC64 802427F4 30420400 */ andi $v0, $v0, 0x400 -/* B2EC68 802427F8 1440001E */ bnez $v0, .L80242874 -/* B2EC6C 802427FC 26300058 */ addiu $s0, $s1, 0x58 -/* B2EC70 80242800 4480A000 */ mtc1 $zero, $f20 -/* B2EC74 80242804 4406B000 */ mfc1 $a2, $f22 -/* B2EC78 80242808 4405A000 */ mfc1 $a1, $f20 -/* B2EC7C 8024280C 4407A000 */ mfc1 $a3, $f20 -/* B2EC80 80242810 0C019E40 */ jal guTranslateF -/* B2EC84 80242814 0200202D */ daddu $a0, $s0, $zero -/* B2EC88 80242818 4405E000 */ mfc1 $a1, $f28 -/* B2EC8C 8024281C 4406D000 */ mfc1 $a2, $f26 -/* B2EC90 80242820 4407C000 */ mfc1 $a3, $f24 -/* B2EC94 80242824 0C0909B8 */ jal func_802426E0 -/* B2EC98 80242828 27A40010 */ addiu $a0, $sp, 0x10 -/* B2EC9C 8024282C 27A40010 */ addiu $a0, $sp, 0x10 -/* B2ECA0 80242830 0200282D */ daddu $a1, $s0, $zero -/* B2ECA4 80242834 0C019D80 */ jal guMtxCatF -/* B2ECA8 80242838 0200302D */ daddu $a2, $s0, $zero -/* B2ECAC 8024283C 27A40010 */ addiu $a0, $sp, 0x10 -/* B2ECB0 80242840 4600B587 */ neg.s $f22, $f22 -/* B2ECB4 80242844 4405A000 */ mfc1 $a1, $f20 -/* B2ECB8 80242848 4406B000 */ mfc1 $a2, $f22 -/* B2ECBC 8024284C 0C019E40 */ jal guTranslateF -/* B2ECC0 80242850 00A0382D */ daddu $a3, $a1, $zero -/* B2ECC4 80242854 27A40010 */ addiu $a0, $sp, 0x10 -/* B2ECC8 80242858 0200282D */ daddu $a1, $s0, $zero -/* B2ECCC 8024285C 0C019D80 */ jal guMtxCatF -/* B2ECD0 80242860 00A0302D */ daddu $a2, $a1, $zero -/* B2ECD4 80242864 96220000 */ lhu $v0, ($s1) -/* B2ECD8 80242868 34421400 */ ori $v0, $v0, 0x1400 -/* B2ECDC 8024286C 08090A3B */ j .L802428EC -/* B2ECE0 80242870 A6220000 */ sh $v0, ($s1) -.L80242874: -/* B2ECE4 80242874 4480A000 */ mtc1 $zero, $f20 -/* B2ECE8 80242878 4406B000 */ mfc1 $a2, $f22 -/* B2ECEC 8024287C 4405A000 */ mfc1 $a1, $f20 -/* B2ECF0 80242880 4407A000 */ mfc1 $a3, $f20 -/* B2ECF4 80242884 0C019E40 */ jal guTranslateF -/* B2ECF8 80242888 27A40010 */ addiu $a0, $sp, 0x10 -/* B2ECFC 8024288C 27A40010 */ addiu $a0, $sp, 0x10 -/* B2ED00 80242890 26300058 */ addiu $s0, $s1, 0x58 -/* B2ED04 80242894 0200282D */ daddu $a1, $s0, $zero -/* B2ED08 80242898 0C019D80 */ jal guMtxCatF -/* B2ED0C 8024289C 0200302D */ daddu $a2, $s0, $zero -/* B2ED10 802428A0 4405E000 */ mfc1 $a1, $f28 -/* B2ED14 802428A4 4406D000 */ mfc1 $a2, $f26 -/* B2ED18 802428A8 4407C000 */ mfc1 $a3, $f24 -/* B2ED1C 802428AC 0C0909B8 */ jal func_802426E0 -/* B2ED20 802428B0 27A40010 */ addiu $a0, $sp, 0x10 -/* B2ED24 802428B4 27A40010 */ addiu $a0, $sp, 0x10 -/* B2ED28 802428B8 0200282D */ daddu $a1, $s0, $zero -/* B2ED2C 802428BC 0C019D80 */ jal guMtxCatF -/* B2ED30 802428C0 0200302D */ daddu $a2, $s0, $zero -/* B2ED34 802428C4 27A40010 */ addiu $a0, $sp, 0x10 -/* B2ED38 802428C8 4600B587 */ neg.s $f22, $f22 -/* B2ED3C 802428CC 4405A000 */ mfc1 $a1, $f20 -/* B2ED40 802428D0 4406B000 */ mfc1 $a2, $f22 -/* B2ED44 802428D4 0C019E40 */ jal guTranslateF -/* B2ED48 802428D8 00A0382D */ daddu $a3, $a1, $zero -/* B2ED4C 802428DC 27A40010 */ addiu $a0, $sp, 0x10 -/* B2ED50 802428E0 0200282D */ daddu $a1, $s0, $zero -/* B2ED54 802428E4 0C019D80 */ jal guMtxCatF -/* B2ED58 802428E8 00A0302D */ daddu $a2, $a1, $zero -.L802428EC: -/* B2ED5C 802428EC 8FBF005C */ lw $ra, 0x5c($sp) -/* B2ED60 802428F0 8FB20058 */ lw $s2, 0x58($sp) -/* B2ED64 802428F4 8FB10054 */ lw $s1, 0x54($sp) -/* B2ED68 802428F8 8FB00050 */ lw $s0, 0x50($sp) -/* B2ED6C 802428FC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B2ED70 80242900 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B2ED74 80242904 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B2ED78 80242908 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B2ED7C 8024290C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B2ED80 80242910 24020002 */ addiu $v0, $zero, 2 -/* B2ED84 80242914 03E00008 */ jr $ra -/* B2ED88 80242918 27BD0088 */ addiu $sp, $sp, 0x88 -/* B2ED8C 8024291C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_80242750_B2EBC0.s b/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_80242750_B2EBC0.s new file mode 100644 index 0000000000..a305c6310d --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_02/B2EB50/func_80242750_B2EBC0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242750_B2EBC0 +/* B2EBC0 80242750 27BDFF78 */ addiu $sp, $sp, -0x88 +/* B2EBC4 80242754 AFB10054 */ sw $s1, 0x54($sp) +/* B2EBC8 80242758 0080882D */ daddu $s1, $a0, $zero +/* B2EBCC 8024275C AFBF005C */ sw $ra, 0x5c($sp) +/* B2EBD0 80242760 AFB20058 */ sw $s2, 0x58($sp) +/* B2EBD4 80242764 AFB00050 */ sw $s0, 0x50($sp) +/* B2EBD8 80242768 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* B2EBDC 8024276C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* B2EBE0 80242770 F7B80070 */ sdc1 $f24, 0x70($sp) +/* B2EBE4 80242774 F7B60068 */ sdc1 $f22, 0x68($sp) +/* B2EBE8 80242778 F7B40060 */ sdc1 $f20, 0x60($sp) +/* B2EBEC 8024277C 8E30000C */ lw $s0, 0xc($s1) +/* B2EBF0 80242780 8E050000 */ lw $a1, ($s0) +/* B2EBF4 80242784 0C0B1EAF */ jal get_variable +/* B2EBF8 80242788 26100004 */ addiu $s0, $s0, 4 +/* B2EBFC 8024278C 0C046C04 */ jal get_model_list_index_from_tree_index +/* B2EC00 80242790 0040202D */ daddu $a0, $v0, $zero +/* B2EC04 80242794 8E050000 */ lw $a1, ($s0) +/* B2EC08 80242798 26100004 */ addiu $s0, $s0, 4 +/* B2EC0C 8024279C 0220202D */ daddu $a0, $s1, $zero +/* B2EC10 802427A0 0C0B210B */ jal get_float_variable +/* B2EC14 802427A4 0040902D */ daddu $s2, $v0, $zero +/* B2EC18 802427A8 8E050000 */ lw $a1, ($s0) +/* B2EC1C 802427AC 26100004 */ addiu $s0, $s0, 4 +/* B2EC20 802427B0 0220202D */ daddu $a0, $s1, $zero +/* B2EC24 802427B4 0C0B210B */ jal get_float_variable +/* B2EC28 802427B8 46000706 */ mov.s $f28, $f0 +/* B2EC2C 802427BC 8E050000 */ lw $a1, ($s0) +/* B2EC30 802427C0 26100004 */ addiu $s0, $s0, 4 +/* B2EC34 802427C4 0220202D */ daddu $a0, $s1, $zero +/* B2EC38 802427C8 0C0B210B */ jal get_float_variable +/* B2EC3C 802427CC 46000686 */ mov.s $f26, $f0 +/* B2EC40 802427D0 0220202D */ daddu $a0, $s1, $zero +/* B2EC44 802427D4 8E050000 */ lw $a1, ($s0) +/* B2EC48 802427D8 0C0B210B */ jal get_float_variable +/* B2EC4C 802427DC 46000586 */ mov.s $f22, $f0 +/* B2EC50 802427E0 0240202D */ daddu $a0, $s2, $zero +/* B2EC54 802427E4 0C046B4C */ jal get_model_from_list_index +/* B2EC58 802427E8 46000606 */ mov.s $f24, $f0 +/* B2EC5C 802427EC 0040882D */ daddu $s1, $v0, $zero +/* B2EC60 802427F0 96220000 */ lhu $v0, ($s1) +/* B2EC64 802427F4 30420400 */ andi $v0, $v0, 0x400 +/* B2EC68 802427F8 1440001E */ bnez $v0, .L80242874 +/* B2EC6C 802427FC 26300058 */ addiu $s0, $s1, 0x58 +/* B2EC70 80242800 4480A000 */ mtc1 $zero, $f20 +/* B2EC74 80242804 4406B000 */ mfc1 $a2, $f22 +/* B2EC78 80242808 4405A000 */ mfc1 $a1, $f20 +/* B2EC7C 8024280C 4407A000 */ mfc1 $a3, $f20 +/* B2EC80 80242810 0C019E40 */ jal guTranslateF +/* B2EC84 80242814 0200202D */ daddu $a0, $s0, $zero +/* B2EC88 80242818 4405E000 */ mfc1 $a1, $f28 +/* B2EC8C 8024281C 4406D000 */ mfc1 $a2, $f26 +/* B2EC90 80242820 4407C000 */ mfc1 $a3, $f24 +/* B2EC94 80242824 0C0909B8 */ jal func_802426E0_B2EB50 +/* B2EC98 80242828 27A40010 */ addiu $a0, $sp, 0x10 +/* B2EC9C 8024282C 27A40010 */ addiu $a0, $sp, 0x10 +/* B2ECA0 80242830 0200282D */ daddu $a1, $s0, $zero +/* B2ECA4 80242834 0C019D80 */ jal guMtxCatF +/* B2ECA8 80242838 0200302D */ daddu $a2, $s0, $zero +/* B2ECAC 8024283C 27A40010 */ addiu $a0, $sp, 0x10 +/* B2ECB0 80242840 4600B587 */ neg.s $f22, $f22 +/* B2ECB4 80242844 4405A000 */ mfc1 $a1, $f20 +/* B2ECB8 80242848 4406B000 */ mfc1 $a2, $f22 +/* B2ECBC 8024284C 0C019E40 */ jal guTranslateF +/* B2ECC0 80242850 00A0382D */ daddu $a3, $a1, $zero +/* B2ECC4 80242854 27A40010 */ addiu $a0, $sp, 0x10 +/* B2ECC8 80242858 0200282D */ daddu $a1, $s0, $zero +/* B2ECCC 8024285C 0C019D80 */ jal guMtxCatF +/* B2ECD0 80242860 00A0302D */ daddu $a2, $a1, $zero +/* B2ECD4 80242864 96220000 */ lhu $v0, ($s1) +/* B2ECD8 80242868 34421400 */ ori $v0, $v0, 0x1400 +/* B2ECDC 8024286C 08090A3B */ j .L802428EC +/* B2ECE0 80242870 A6220000 */ sh $v0, ($s1) +.L80242874: +/* B2ECE4 80242874 4480A000 */ mtc1 $zero, $f20 +/* B2ECE8 80242878 4406B000 */ mfc1 $a2, $f22 +/* B2ECEC 8024287C 4405A000 */ mfc1 $a1, $f20 +/* B2ECF0 80242880 4407A000 */ mfc1 $a3, $f20 +/* B2ECF4 80242884 0C019E40 */ jal guTranslateF +/* B2ECF8 80242888 27A40010 */ addiu $a0, $sp, 0x10 +/* B2ECFC 8024288C 27A40010 */ addiu $a0, $sp, 0x10 +/* B2ED00 80242890 26300058 */ addiu $s0, $s1, 0x58 +/* B2ED04 80242894 0200282D */ daddu $a1, $s0, $zero +/* B2ED08 80242898 0C019D80 */ jal guMtxCatF +/* B2ED0C 8024289C 0200302D */ daddu $a2, $s0, $zero +/* B2ED10 802428A0 4405E000 */ mfc1 $a1, $f28 +/* B2ED14 802428A4 4406D000 */ mfc1 $a2, $f26 +/* B2ED18 802428A8 4407C000 */ mfc1 $a3, $f24 +/* B2ED1C 802428AC 0C0909B8 */ jal func_802426E0_B2EB50 +/* B2ED20 802428B0 27A40010 */ addiu $a0, $sp, 0x10 +/* B2ED24 802428B4 27A40010 */ addiu $a0, $sp, 0x10 +/* B2ED28 802428B8 0200282D */ daddu $a1, $s0, $zero +/* B2ED2C 802428BC 0C019D80 */ jal guMtxCatF +/* B2ED30 802428C0 0200302D */ daddu $a2, $s0, $zero +/* B2ED34 802428C4 27A40010 */ addiu $a0, $sp, 0x10 +/* B2ED38 802428C8 4600B587 */ neg.s $f22, $f22 +/* B2ED3C 802428CC 4405A000 */ mfc1 $a1, $f20 +/* B2ED40 802428D0 4406B000 */ mfc1 $a2, $f22 +/* B2ED44 802428D4 0C019E40 */ jal guTranslateF +/* B2ED48 802428D8 00A0382D */ daddu $a3, $a1, $zero +/* B2ED4C 802428DC 27A40010 */ addiu $a0, $sp, 0x10 +/* B2ED50 802428E0 0200282D */ daddu $a1, $s0, $zero +/* B2ED54 802428E4 0C019D80 */ jal guMtxCatF +/* B2ED58 802428E8 00A0302D */ daddu $a2, $a1, $zero +.L802428EC: +/* B2ED5C 802428EC 8FBF005C */ lw $ra, 0x5c($sp) +/* B2ED60 802428F0 8FB20058 */ lw $s2, 0x58($sp) +/* B2ED64 802428F4 8FB10054 */ lw $s1, 0x54($sp) +/* B2ED68 802428F8 8FB00050 */ lw $s0, 0x50($sp) +/* B2ED6C 802428FC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* B2ED70 80242900 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* B2ED74 80242904 D7B80070 */ ldc1 $f24, 0x70($sp) +/* B2ED78 80242908 D7B60068 */ ldc1 $f22, 0x68($sp) +/* B2ED7C 8024290C D7B40060 */ ldc1 $f20, 0x60($sp) +/* B2ED80 80242910 24020002 */ addiu $v0, $zero, 2 +/* B2ED84 80242914 03E00008 */ jr $ra +/* B2ED88 80242918 27BD0088 */ addiu $sp, $sp, 0x88 +/* B2ED8C 8024291C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620.s deleted file mode 100644 index 3b4cc9c65d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240620 -/* B351F0 80240620 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B351F4 80240624 AFB50024 */ sw $s5, 0x24($sp) -/* B351F8 80240628 0080A82D */ daddu $s5, $a0, $zero -/* B351FC 8024062C AFBF002C */ sw $ra, 0x2c($sp) -/* B35200 80240630 AFB60028 */ sw $s6, 0x28($sp) -/* B35204 80240634 AFB40020 */ sw $s4, 0x20($sp) -/* B35208 80240638 AFB3001C */ sw $s3, 0x1c($sp) -/* B3520C 8024063C AFB20018 */ sw $s2, 0x18($sp) -/* B35210 80240640 AFB10014 */ sw $s1, 0x14($sp) -/* B35214 80240644 AFB00010 */ sw $s0, 0x10($sp) -/* B35218 80240648 F7B80040 */ sdc1 $f24, 0x40($sp) -/* B3521C 8024064C F7B60038 */ sdc1 $f22, 0x38($sp) -/* B35220 80240650 F7B40030 */ sdc1 $f20, 0x30($sp) -/* B35224 80240654 8EB30148 */ lw $s3, 0x148($s5) -/* B35228 80240658 86640008 */ lh $a0, 8($s3) -/* B3522C 8024065C 0C00EABB */ jal get_npc_unsafe -/* B35230 80240660 00A0B02D */ daddu $s6, $a1, $zero -/* B35234 80240664 0040A02D */ daddu $s4, $v0, $zero -/* B35238 80240668 AEA00074 */ sw $zero, 0x74($s5) -/* B3523C 8024066C C6980038 */ lwc1 $f24, 0x38($s4) -/* B35240 80240670 C6960040 */ lwc1 $f22, 0x40($s4) -/* B35244 80240674 0000902D */ daddu $s2, $zero, $zero -/* B35248 80240678 AEA00078 */ sw $zero, 0x78($s5) -/* B3524C 8024067C 8E6300D0 */ lw $v1, 0xd0($s3) -/* B35250 80240680 8C620000 */ lw $v0, ($v1) -/* B35254 80240684 3C0146FF */ lui $at, 0x46ff -/* B35258 80240688 3421FE00 */ ori $at, $at, 0xfe00 -/* B3525C 8024068C 4481A000 */ mtc1 $at, $f20 -/* B35260 80240690 18400018 */ blez $v0, .L802406F4 -/* B35264 80240694 0240802D */ daddu $s0, $s2, $zero -/* B35268 80240698 0240882D */ daddu $s1, $s2, $zero -.L8024069C: -/* B3526C 8024069C 02231021 */ addu $v0, $s1, $v1 -/* B35270 802406A0 4600C306 */ mov.s $f12, $f24 -/* B35274 802406A4 C4440004 */ lwc1 $f4, 4($v0) -/* B35278 802406A8 46802120 */ cvt.s.w $f4, $f4 -/* B3527C 802406AC 44062000 */ mfc1 $a2, $f4 -/* B35280 802406B0 C444000C */ lwc1 $f4, 0xc($v0) -/* B35284 802406B4 46802120 */ cvt.s.w $f4, $f4 -/* B35288 802406B8 44072000 */ mfc1 $a3, $f4 -/* B3528C 802406BC 0C00A7B5 */ jal dist2D -/* B35290 802406C0 4600B386 */ mov.s $f14, $f22 -/* B35294 802406C4 4614003C */ c.lt.s $f0, $f20 -/* B35298 802406C8 00000000 */ nop -/* B3529C 802406CC 45000003 */ bc1f .L802406DC -/* B352A0 802406D0 2631000C */ addiu $s1, $s1, 0xc -/* B352A4 802406D4 46000506 */ mov.s $f20, $f0 -/* B352A8 802406D8 AEB20078 */ sw $s2, 0x78($s5) -.L802406DC: -/* B352AC 802406DC 8E6300D0 */ lw $v1, 0xd0($s3) -/* B352B0 802406E0 26100001 */ addiu $s0, $s0, 1 -/* B352B4 802406E4 8C620000 */ lw $v0, ($v1) -/* B352B8 802406E8 0202102A */ slt $v0, $s0, $v0 -/* B352BC 802406EC 1440FFEB */ bnez $v0, .L8024069C -/* B352C0 802406F0 26520001 */ addiu $s2, $s2, 1 -.L802406F4: -/* B352C4 802406F4 8E6200CC */ lw $v0, 0xcc($s3) -/* B352C8 802406F8 8C420004 */ lw $v0, 4($v0) -/* B352CC 802406FC AE820028 */ sw $v0, 0x28($s4) -/* B352D0 80240700 8E6200D0 */ lw $v0, 0xd0($s3) -/* B352D4 80240704 8C42007C */ lw $v0, 0x7c($v0) -/* B352D8 80240708 04410004 */ bgez $v0, .L8024071C -/* B352DC 8024070C 00000000 */ nop -/* B352E0 80240710 C6C00000 */ lwc1 $f0, ($s6) -/* B352E4 80240714 080901CF */ j .L8024073C -/* B352E8 80240718 E6800018 */ swc1 $f0, 0x18($s4) -.L8024071C: -/* B352EC 8024071C 3C018025 */ lui $at, 0x8025 -/* B352F0 80240720 D422F9F0 */ ldc1 $f2, -0x610($at) -/* B352F4 80240724 44820000 */ mtc1 $v0, $f0 -/* B352F8 80240728 00000000 */ nop -/* B352FC 8024072C 46800021 */ cvt.d.w $f0, $f0 -/* B35300 80240730 46220003 */ div.d $f0, $f0, $f2 -/* B35304 80240734 46200020 */ cvt.s.d $f0, $f0 -/* B35308 80240738 E6800018 */ swc1 $f0, 0x18($s4) -.L8024073C: -/* B3530C 8024073C 24020001 */ addiu $v0, $zero, 1 -/* B35310 80240740 AEA20070 */ sw $v0, 0x70($s5) -/* B35314 80240744 8FBF002C */ lw $ra, 0x2c($sp) -/* B35318 80240748 8FB60028 */ lw $s6, 0x28($sp) -/* B3531C 8024074C 8FB50024 */ lw $s5, 0x24($sp) -/* B35320 80240750 8FB40020 */ lw $s4, 0x20($sp) -/* B35324 80240754 8FB3001C */ lw $s3, 0x1c($sp) -/* B35328 80240758 8FB20018 */ lw $s2, 0x18($sp) -/* B3532C 8024075C 8FB10014 */ lw $s1, 0x14($sp) -/* B35330 80240760 8FB00010 */ lw $s0, 0x10($sp) -/* B35334 80240764 D7B80040 */ ldc1 $f24, 0x40($sp) -/* B35338 80240768 D7B60038 */ ldc1 $f22, 0x38($sp) -/* B3533C 8024076C D7B40030 */ ldc1 $f20, 0x30($sp) -/* B35340 80240770 03E00008 */ jr $ra -/* B35344 80240774 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s new file mode 100644 index 0000000000..872d251910 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240620_B351F0.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240620_B351F0 +/* B351F0 80240620 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B351F4 80240624 AFB50024 */ sw $s5, 0x24($sp) +/* B351F8 80240628 0080A82D */ daddu $s5, $a0, $zero +/* B351FC 8024062C AFBF002C */ sw $ra, 0x2c($sp) +/* B35200 80240630 AFB60028 */ sw $s6, 0x28($sp) +/* B35204 80240634 AFB40020 */ sw $s4, 0x20($sp) +/* B35208 80240638 AFB3001C */ sw $s3, 0x1c($sp) +/* B3520C 8024063C AFB20018 */ sw $s2, 0x18($sp) +/* B35210 80240640 AFB10014 */ sw $s1, 0x14($sp) +/* B35214 80240644 AFB00010 */ sw $s0, 0x10($sp) +/* B35218 80240648 F7B80040 */ sdc1 $f24, 0x40($sp) +/* B3521C 8024064C F7B60038 */ sdc1 $f22, 0x38($sp) +/* B35220 80240650 F7B40030 */ sdc1 $f20, 0x30($sp) +/* B35224 80240654 8EB30148 */ lw $s3, 0x148($s5) +/* B35228 80240658 86640008 */ lh $a0, 8($s3) +/* B3522C 8024065C 0C00EABB */ jal get_npc_unsafe +/* B35230 80240660 00A0B02D */ daddu $s6, $a1, $zero +/* B35234 80240664 0040A02D */ daddu $s4, $v0, $zero +/* B35238 80240668 AEA00074 */ sw $zero, 0x74($s5) +/* B3523C 8024066C C6980038 */ lwc1 $f24, 0x38($s4) +/* B35240 80240670 C6960040 */ lwc1 $f22, 0x40($s4) +/* B35244 80240674 0000902D */ daddu $s2, $zero, $zero +/* B35248 80240678 AEA00078 */ sw $zero, 0x78($s5) +/* B3524C 8024067C 8E6300D0 */ lw $v1, 0xd0($s3) +/* B35250 80240680 8C620000 */ lw $v0, ($v1) +/* B35254 80240684 3C0146FF */ lui $at, 0x46ff +/* B35258 80240688 3421FE00 */ ori $at, $at, 0xfe00 +/* B3525C 8024068C 4481A000 */ mtc1 $at, $f20 +/* B35260 80240690 18400018 */ blez $v0, .L802406F4 +/* B35264 80240694 0240802D */ daddu $s0, $s2, $zero +/* B35268 80240698 0240882D */ daddu $s1, $s2, $zero +.L8024069C: +/* B3526C 8024069C 02231021 */ addu $v0, $s1, $v1 +/* B35270 802406A0 4600C306 */ mov.s $f12, $f24 +/* B35274 802406A4 C4440004 */ lwc1 $f4, 4($v0) +/* B35278 802406A8 46802120 */ cvt.s.w $f4, $f4 +/* B3527C 802406AC 44062000 */ mfc1 $a2, $f4 +/* B35280 802406B0 C444000C */ lwc1 $f4, 0xc($v0) +/* B35284 802406B4 46802120 */ cvt.s.w $f4, $f4 +/* B35288 802406B8 44072000 */ mfc1 $a3, $f4 +/* B3528C 802406BC 0C00A7B5 */ jal dist2D +/* B35290 802406C0 4600B386 */ mov.s $f14, $f22 +/* B35294 802406C4 4614003C */ c.lt.s $f0, $f20 +/* B35298 802406C8 00000000 */ nop +/* B3529C 802406CC 45000003 */ bc1f .L802406DC +/* B352A0 802406D0 2631000C */ addiu $s1, $s1, 0xc +/* B352A4 802406D4 46000506 */ mov.s $f20, $f0 +/* B352A8 802406D8 AEB20078 */ sw $s2, 0x78($s5) +.L802406DC: +/* B352AC 802406DC 8E6300D0 */ lw $v1, 0xd0($s3) +/* B352B0 802406E0 26100001 */ addiu $s0, $s0, 1 +/* B352B4 802406E4 8C620000 */ lw $v0, ($v1) +/* B352B8 802406E8 0202102A */ slt $v0, $s0, $v0 +/* B352BC 802406EC 1440FFEB */ bnez $v0, .L8024069C +/* B352C0 802406F0 26520001 */ addiu $s2, $s2, 1 +.L802406F4: +/* B352C4 802406F4 8E6200CC */ lw $v0, 0xcc($s3) +/* B352C8 802406F8 8C420004 */ lw $v0, 4($v0) +/* B352CC 802406FC AE820028 */ sw $v0, 0x28($s4) +/* B352D0 80240700 8E6200D0 */ lw $v0, 0xd0($s3) +/* B352D4 80240704 8C42007C */ lw $v0, 0x7c($v0) +/* B352D8 80240708 04410004 */ bgez $v0, .L8024071C +/* B352DC 8024070C 00000000 */ nop +/* B352E0 80240710 C6C00000 */ lwc1 $f0, ($s6) +/* B352E4 80240714 080901CF */ j .L8024073C +/* B352E8 80240718 E6800018 */ swc1 $f0, 0x18($s4) +.L8024071C: +/* B352EC 8024071C 3C018025 */ lui $at, 0x8025 +/* B352F0 80240720 D422F9F0 */ ldc1 $f2, -0x610($at) +/* B352F4 80240724 44820000 */ mtc1 $v0, $f0 +/* B352F8 80240728 00000000 */ nop +/* B352FC 8024072C 46800021 */ cvt.d.w $f0, $f0 +/* B35300 80240730 46220003 */ div.d $f0, $f0, $f2 +/* B35304 80240734 46200020 */ cvt.s.d $f0, $f0 +/* B35308 80240738 E6800018 */ swc1 $f0, 0x18($s4) +.L8024073C: +/* B3530C 8024073C 24020001 */ addiu $v0, $zero, 1 +/* B35310 80240740 AEA20070 */ sw $v0, 0x70($s5) +/* B35314 80240744 8FBF002C */ lw $ra, 0x2c($sp) +/* B35318 80240748 8FB60028 */ lw $s6, 0x28($sp) +/* B3531C 8024074C 8FB50024 */ lw $s5, 0x24($sp) +/* B35320 80240750 8FB40020 */ lw $s4, 0x20($sp) +/* B35324 80240754 8FB3001C */ lw $s3, 0x1c($sp) +/* B35328 80240758 8FB20018 */ lw $s2, 0x18($sp) +/* B3532C 8024075C 8FB10014 */ lw $s1, 0x14($sp) +/* B35330 80240760 8FB00010 */ lw $s0, 0x10($sp) +/* B35334 80240764 D7B80040 */ ldc1 $f24, 0x40($sp) +/* B35338 80240768 D7B60038 */ ldc1 $f22, 0x38($sp) +/* B3533C 8024076C D7B40030 */ ldc1 $f20, 0x30($sp) +/* B35340 80240770 03E00008 */ jr $ra +/* B35344 80240774 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778.s deleted file mode 100644 index a243cc2d2c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240778 -/* B35348 80240778 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B3534C 8024077C AFB20038 */ sw $s2, 0x38($sp) -/* B35350 80240780 0080902D */ daddu $s2, $a0, $zero -/* B35354 80240784 AFBF0044 */ sw $ra, 0x44($sp) -/* B35358 80240788 AFB40040 */ sw $s4, 0x40($sp) -/* B3535C 8024078C AFB3003C */ sw $s3, 0x3c($sp) -/* B35360 80240790 AFB10034 */ sw $s1, 0x34($sp) -/* B35364 80240794 AFB00030 */ sw $s0, 0x30($sp) -/* B35368 80240798 F7B60050 */ sdc1 $f22, 0x50($sp) -/* B3536C 8024079C F7B40048 */ sdc1 $f20, 0x48($sp) -/* B35370 802407A0 8E510148 */ lw $s1, 0x148($s2) -/* B35374 802407A4 00A0982D */ daddu $s3, $a1, $zero -/* B35378 802407A8 86240008 */ lh $a0, 8($s1) -/* B3537C 802407AC 0C00EABB */ jal get_npc_unsafe -/* B35380 802407B0 00C0A02D */ daddu $s4, $a2, $zero -/* B35384 802407B4 8E630014 */ lw $v1, 0x14($s3) -/* B35388 802407B8 04600030 */ bltz $v1, .L8024087C -/* B3538C 802407BC 0040802D */ daddu $s0, $v0, $zero -/* B35390 802407C0 8E420074 */ lw $v0, 0x74($s2) -/* B35394 802407C4 1C40002C */ bgtz $v0, .L80240878 -/* B35398 802407C8 2442FFFF */ addiu $v0, $v0, -1 -/* B3539C 802407CC 0280202D */ daddu $a0, $s4, $zero -/* B353A0 802407D0 AE430074 */ sw $v1, 0x74($s2) -/* B353A4 802407D4 AFA00010 */ sw $zero, 0x10($sp) -/* B353A8 802407D8 8E66000C */ lw $a2, 0xc($s3) -/* B353AC 802407DC 8E670010 */ lw $a3, 0x10($s3) -/* B353B0 802407E0 0C01242D */ jal func_800490B4 -/* B353B4 802407E4 0220282D */ daddu $a1, $s1, $zero -/* B353B8 802407E8 10400021 */ beqz $v0, .L80240870 -/* B353BC 802407EC 0000202D */ daddu $a0, $zero, $zero -/* B353C0 802407F0 0200282D */ daddu $a1, $s0, $zero -/* B353C4 802407F4 0000302D */ daddu $a2, $zero, $zero -/* B353C8 802407F8 860300A8 */ lh $v1, 0xa8($s0) -/* B353CC 802407FC 3C013F80 */ lui $at, 0x3f80 -/* B353D0 80240800 44810000 */ mtc1 $at, $f0 -/* B353D4 80240804 3C014000 */ lui $at, 0x4000 -/* B353D8 80240808 44811000 */ mtc1 $at, $f2 -/* B353DC 8024080C 3C01C1A0 */ lui $at, 0xc1a0 -/* B353E0 80240810 44812000 */ mtc1 $at, $f4 -/* B353E4 80240814 2402000F */ addiu $v0, $zero, 0xf -/* B353E8 80240818 AFA2001C */ sw $v0, 0x1c($sp) -/* B353EC 8024081C 44833000 */ mtc1 $v1, $f6 -/* B353F0 80240820 00000000 */ nop -/* B353F4 80240824 468031A0 */ cvt.s.w $f6, $f6 -/* B353F8 80240828 44073000 */ mfc1 $a3, $f6 -/* B353FC 8024082C 27A20028 */ addiu $v0, $sp, 0x28 -/* B35400 80240830 AFA20020 */ sw $v0, 0x20($sp) -/* B35404 80240834 E7A00010 */ swc1 $f0, 0x10($sp) -/* B35408 80240838 E7A20014 */ swc1 $f2, 0x14($sp) -/* B3540C 8024083C 0C01BFA4 */ jal fx_emote -/* B35410 80240840 E7A40018 */ swc1 $f4, 0x18($sp) -/* B35414 80240844 0200202D */ daddu $a0, $s0, $zero -/* B35418 80240848 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B3541C 8024084C 0C012530 */ jal func_800494C0 -/* B35420 80240850 3C060020 */ lui $a2, 0x20 -/* B35424 80240854 8E220018 */ lw $v0, 0x18($s1) -/* B35428 80240858 9442002A */ lhu $v0, 0x2a($v0) -/* B3542C 8024085C 30420001 */ andi $v0, $v0, 1 -/* B35430 80240860 14400064 */ bnez $v0, .L802409F4 -/* B35434 80240864 2402000A */ addiu $v0, $zero, 0xa -/* B35438 80240868 0809027D */ j .L802409F4 -/* B3543C 8024086C 2402000C */ addiu $v0, $zero, 0xc -.L80240870: -/* B35440 80240870 8E420074 */ lw $v0, 0x74($s2) -/* B35444 80240874 2442FFFF */ addiu $v0, $v0, -1 -.L80240878: -/* B35448 80240878 AE420074 */ sw $v0, 0x74($s2) -.L8024087C: -/* B3544C 8024087C 8602008C */ lh $v0, 0x8c($s0) -/* B35450 80240880 1440005D */ bnez $v0, .L802409F8 -/* B35454 80240884 00000000 */ nop -/* B35458 80240888 C6000018 */ lwc1 $f0, 0x18($s0) -/* B3545C 8024088C 3C014010 */ lui $at, 0x4010 -/* B35460 80240890 44811800 */ mtc1 $at, $f3 -/* B35464 80240894 44801000 */ mtc1 $zero, $f2 -/* B35468 80240898 46000021 */ cvt.d.s $f0, $f0 -/* B3546C 8024089C 4622003C */ c.lt.d $f0, $f2 -/* B35470 802408A0 00000000 */ nop -/* B35474 802408A4 45000003 */ bc1f .L802408B4 -/* B35478 802408A8 0200202D */ daddu $a0, $s0, $zero -/* B3547C 802408AC 0809022E */ j .L802408B8 -/* B35480 802408B0 0000282D */ daddu $a1, $zero, $zero -.L802408B4: -/* B35484 802408B4 24050001 */ addiu $a1, $zero, 1 -.L802408B8: -/* B35488 802408B8 0C00F598 */ jal func_8003D660 -/* B3548C 802408BC 00000000 */ nop -/* B35490 802408C0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B35494 802408C4 8E430078 */ lw $v1, 0x78($s2) -/* B35498 802408C8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B3549C 802408CC 00031040 */ sll $v0, $v1, 1 -/* B354A0 802408D0 00431021 */ addu $v0, $v0, $v1 -/* B354A4 802408D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B354A8 802408D8 00021080 */ sll $v0, $v0, 2 -/* B354AC 802408DC 00431021 */ addu $v0, $v0, $v1 -/* B354B0 802408E0 C4560004 */ lwc1 $f22, 4($v0) -/* B354B4 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* B354B8 802408E8 C454000C */ lwc1 $f20, 0xc($v0) -/* B354BC 802408EC 4680A520 */ cvt.s.w $f20, $f20 -/* B354C0 802408F0 4406B000 */ mfc1 $a2, $f22 -/* B354C4 802408F4 4407A000 */ mfc1 $a3, $f20 -/* B354C8 802408F8 0C00A720 */ jal atan2 -/* B354CC 802408FC 00000000 */ nop -/* B354D0 80240900 8E050018 */ lw $a1, 0x18($s0) -/* B354D4 80240904 44060000 */ mfc1 $a2, $f0 -/* B354D8 80240908 0200202D */ daddu $a0, $s0, $zero -/* B354DC 8024090C 0C00EA95 */ jal npc_move_heading -/* B354E0 80240910 AE06000C */ sw $a2, 0xc($s0) -/* B354E4 80240914 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B354E8 80240918 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B354EC 8024091C 4406B000 */ mfc1 $a2, $f22 -/* B354F0 80240920 4407A000 */ mfc1 $a3, $f20 -/* B354F4 80240924 0C00A7B5 */ jal dist2D -/* B354F8 80240928 00000000 */ nop -/* B354FC 8024092C C6020018 */ lwc1 $f2, 0x18($s0) -/* B35500 80240930 4602003E */ c.le.s $f0, $f2 -/* B35504 80240934 00000000 */ nop -/* B35508 80240938 4500002F */ bc1f .L802409F8 -/* B3550C 8024093C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B35510 80240940 24020002 */ addiu $v0, $zero, 2 -/* B35514 80240944 0C00A67F */ jal rand_int -/* B35518 80240948 AE420070 */ sw $v0, 0x70($s2) -/* B3551C 8024094C 3C035555 */ lui $v1, 0x5555 -/* B35520 80240950 34635556 */ ori $v1, $v1, 0x5556 -/* B35524 80240954 00430018 */ mult $v0, $v1 -/* B35528 80240958 000227C3 */ sra $a0, $v0, 0x1f -/* B3552C 8024095C 00004010 */ mfhi $t0 -/* B35530 80240960 01042023 */ subu $a0, $t0, $a0 -/* B35534 80240964 00041840 */ sll $v1, $a0, 1 -/* B35538 80240968 00641821 */ addu $v1, $v1, $a0 -/* B3553C 8024096C 00431023 */ subu $v0, $v0, $v1 -/* B35540 80240970 24430002 */ addiu $v1, $v0, 2 -/* B35544 80240974 AE430074 */ sw $v1, 0x74($s2) -/* B35548 80240978 8E62002C */ lw $v0, 0x2c($s3) -/* B3554C 8024097C 18400009 */ blez $v0, .L802409A4 -/* B35550 80240980 24020004 */ addiu $v0, $zero, 4 -/* B35554 80240984 8E620004 */ lw $v0, 4($s3) -/* B35558 80240988 18400006 */ blez $v0, .L802409A4 -/* B3555C 8024098C 24020004 */ addiu $v0, $zero, 4 -/* B35560 80240990 8E620008 */ lw $v0, 8($s3) -/* B35564 80240994 18400003 */ blez $v0, .L802409A4 -/* B35568 80240998 24020004 */ addiu $v0, $zero, 4 -/* B3556C 8024099C 14600002 */ bnez $v1, .L802409A8 -/* B35570 802409A0 00000000 */ nop -.L802409A4: -/* B35574 802409A4 AE420070 */ sw $v0, 0x70($s2) -.L802409A8: -/* B35578 802409A8 0C00A67F */ jal rand_int -/* B3557C 802409AC 24042710 */ addiu $a0, $zero, 0x2710 -/* B35580 802409B0 3C0351EB */ lui $v1, 0x51eb -/* B35584 802409B4 3463851F */ ori $v1, $v1, 0x851f -/* B35588 802409B8 00430018 */ mult $v0, $v1 -/* B3558C 802409BC 00021FC3 */ sra $v1, $v0, 0x1f -/* B35590 802409C0 00004010 */ mfhi $t0 -/* B35594 802409C4 00082143 */ sra $a0, $t0, 5 -/* B35598 802409C8 00832023 */ subu $a0, $a0, $v1 -/* B3559C 802409CC 00041840 */ sll $v1, $a0, 1 -/* B355A0 802409D0 00641821 */ addu $v1, $v1, $a0 -/* B355A4 802409D4 000318C0 */ sll $v1, $v1, 3 -/* B355A8 802409D8 00641821 */ addu $v1, $v1, $a0 -/* B355AC 802409DC 00031880 */ sll $v1, $v1, 2 -/* B355B0 802409E0 8E640004 */ lw $a0, 4($s3) -/* B355B4 802409E4 00431023 */ subu $v0, $v0, $v1 -/* B355B8 802409E8 0044102A */ slt $v0, $v0, $a0 -/* B355BC 802409EC 10400002 */ beqz $v0, .L802409F8 -/* B355C0 802409F0 24020004 */ addiu $v0, $zero, 4 -.L802409F4: -/* B355C4 802409F4 AE420070 */ sw $v0, 0x70($s2) -.L802409F8: -/* B355C8 802409F8 8FBF0044 */ lw $ra, 0x44($sp) -/* B355CC 802409FC 8FB40040 */ lw $s4, 0x40($sp) -/* B355D0 80240A00 8FB3003C */ lw $s3, 0x3c($sp) -/* B355D4 80240A04 8FB20038 */ lw $s2, 0x38($sp) -/* B355D8 80240A08 8FB10034 */ lw $s1, 0x34($sp) -/* B355DC 80240A0C 8FB00030 */ lw $s0, 0x30($sp) -/* B355E0 80240A10 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B355E4 80240A14 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B355E8 80240A18 03E00008 */ jr $ra -/* B355EC 80240A1C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s new file mode 100644 index 0000000000..69cbef8f13 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240778_B35348.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240778_B35348 +/* B35348 80240778 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* B3534C 8024077C AFB20038 */ sw $s2, 0x38($sp) +/* B35350 80240780 0080902D */ daddu $s2, $a0, $zero +/* B35354 80240784 AFBF0044 */ sw $ra, 0x44($sp) +/* B35358 80240788 AFB40040 */ sw $s4, 0x40($sp) +/* B3535C 8024078C AFB3003C */ sw $s3, 0x3c($sp) +/* B35360 80240790 AFB10034 */ sw $s1, 0x34($sp) +/* B35364 80240794 AFB00030 */ sw $s0, 0x30($sp) +/* B35368 80240798 F7B60050 */ sdc1 $f22, 0x50($sp) +/* B3536C 8024079C F7B40048 */ sdc1 $f20, 0x48($sp) +/* B35370 802407A0 8E510148 */ lw $s1, 0x148($s2) +/* B35374 802407A4 00A0982D */ daddu $s3, $a1, $zero +/* B35378 802407A8 86240008 */ lh $a0, 8($s1) +/* B3537C 802407AC 0C00EABB */ jal get_npc_unsafe +/* B35380 802407B0 00C0A02D */ daddu $s4, $a2, $zero +/* B35384 802407B4 8E630014 */ lw $v1, 0x14($s3) +/* B35388 802407B8 04600030 */ bltz $v1, .L8024087C +/* B3538C 802407BC 0040802D */ daddu $s0, $v0, $zero +/* B35390 802407C0 8E420074 */ lw $v0, 0x74($s2) +/* B35394 802407C4 1C40002C */ bgtz $v0, .L80240878 +/* B35398 802407C8 2442FFFF */ addiu $v0, $v0, -1 +/* B3539C 802407CC 0280202D */ daddu $a0, $s4, $zero +/* B353A0 802407D0 AE430074 */ sw $v1, 0x74($s2) +/* B353A4 802407D4 AFA00010 */ sw $zero, 0x10($sp) +/* B353A8 802407D8 8E66000C */ lw $a2, 0xc($s3) +/* B353AC 802407DC 8E670010 */ lw $a3, 0x10($s3) +/* B353B0 802407E0 0C01242D */ jal func_800490B4 +/* B353B4 802407E4 0220282D */ daddu $a1, $s1, $zero +/* B353B8 802407E8 10400021 */ beqz $v0, .L80240870 +/* B353BC 802407EC 0000202D */ daddu $a0, $zero, $zero +/* B353C0 802407F0 0200282D */ daddu $a1, $s0, $zero +/* B353C4 802407F4 0000302D */ daddu $a2, $zero, $zero +/* B353C8 802407F8 860300A8 */ lh $v1, 0xa8($s0) +/* B353CC 802407FC 3C013F80 */ lui $at, 0x3f80 +/* B353D0 80240800 44810000 */ mtc1 $at, $f0 +/* B353D4 80240804 3C014000 */ lui $at, 0x4000 +/* B353D8 80240808 44811000 */ mtc1 $at, $f2 +/* B353DC 8024080C 3C01C1A0 */ lui $at, 0xc1a0 +/* B353E0 80240810 44812000 */ mtc1 $at, $f4 +/* B353E4 80240814 2402000F */ addiu $v0, $zero, 0xf +/* B353E8 80240818 AFA2001C */ sw $v0, 0x1c($sp) +/* B353EC 8024081C 44833000 */ mtc1 $v1, $f6 +/* B353F0 80240820 00000000 */ nop +/* B353F4 80240824 468031A0 */ cvt.s.w $f6, $f6 +/* B353F8 80240828 44073000 */ mfc1 $a3, $f6 +/* B353FC 8024082C 27A20028 */ addiu $v0, $sp, 0x28 +/* B35400 80240830 AFA20020 */ sw $v0, 0x20($sp) +/* B35404 80240834 E7A00010 */ swc1 $f0, 0x10($sp) +/* B35408 80240838 E7A20014 */ swc1 $f2, 0x14($sp) +/* B3540C 8024083C 0C01BFA4 */ jal fx_emote +/* B35410 80240840 E7A40018 */ swc1 $f4, 0x18($sp) +/* B35414 80240844 0200202D */ daddu $a0, $s0, $zero +/* B35418 80240848 240502F4 */ addiu $a1, $zero, 0x2f4 +/* B3541C 8024084C 0C012530 */ jal func_800494C0 +/* B35420 80240850 3C060020 */ lui $a2, 0x20 +/* B35424 80240854 8E220018 */ lw $v0, 0x18($s1) +/* B35428 80240858 9442002A */ lhu $v0, 0x2a($v0) +/* B3542C 8024085C 30420001 */ andi $v0, $v0, 1 +/* B35430 80240860 14400064 */ bnez $v0, .L802409F4 +/* B35434 80240864 2402000A */ addiu $v0, $zero, 0xa +/* B35438 80240868 0809027D */ j .L802409F4 +/* B3543C 8024086C 2402000C */ addiu $v0, $zero, 0xc +.L80240870: +/* B35440 80240870 8E420074 */ lw $v0, 0x74($s2) +/* B35444 80240874 2442FFFF */ addiu $v0, $v0, -1 +.L80240878: +/* B35448 80240878 AE420074 */ sw $v0, 0x74($s2) +.L8024087C: +/* B3544C 8024087C 8602008C */ lh $v0, 0x8c($s0) +/* B35450 80240880 1440005D */ bnez $v0, .L802409F8 +/* B35454 80240884 00000000 */ nop +/* B35458 80240888 C6000018 */ lwc1 $f0, 0x18($s0) +/* B3545C 8024088C 3C014010 */ lui $at, 0x4010 +/* B35460 80240890 44811800 */ mtc1 $at, $f3 +/* B35464 80240894 44801000 */ mtc1 $zero, $f2 +/* B35468 80240898 46000021 */ cvt.d.s $f0, $f0 +/* B3546C 8024089C 4622003C */ c.lt.d $f0, $f2 +/* B35470 802408A0 00000000 */ nop +/* B35474 802408A4 45000003 */ bc1f .L802408B4 +/* B35478 802408A8 0200202D */ daddu $a0, $s0, $zero +/* B3547C 802408AC 0809022E */ j .L802408B8 +/* B35480 802408B0 0000282D */ daddu $a1, $zero, $zero +.L802408B4: +/* B35484 802408B4 24050001 */ addiu $a1, $zero, 1 +.L802408B8: +/* B35488 802408B8 0C00F598 */ jal func_8003D660 +/* B3548C 802408BC 00000000 */ nop +/* B35490 802408C0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B35494 802408C4 8E430078 */ lw $v1, 0x78($s2) +/* B35498 802408C8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B3549C 802408CC 00031040 */ sll $v0, $v1, 1 +/* B354A0 802408D0 00431021 */ addu $v0, $v0, $v1 +/* B354A4 802408D4 8E2300D0 */ lw $v1, 0xd0($s1) +/* B354A8 802408D8 00021080 */ sll $v0, $v0, 2 +/* B354AC 802408DC 00431021 */ addu $v0, $v0, $v1 +/* B354B0 802408E0 C4560004 */ lwc1 $f22, 4($v0) +/* B354B4 802408E4 4680B5A0 */ cvt.s.w $f22, $f22 +/* B354B8 802408E8 C454000C */ lwc1 $f20, 0xc($v0) +/* B354BC 802408EC 4680A520 */ cvt.s.w $f20, $f20 +/* B354C0 802408F0 4406B000 */ mfc1 $a2, $f22 +/* B354C4 802408F4 4407A000 */ mfc1 $a3, $f20 +/* B354C8 802408F8 0C00A720 */ jal atan2 +/* B354CC 802408FC 00000000 */ nop +/* B354D0 80240900 8E050018 */ lw $a1, 0x18($s0) +/* B354D4 80240904 44060000 */ mfc1 $a2, $f0 +/* B354D8 80240908 0200202D */ daddu $a0, $s0, $zero +/* B354DC 8024090C 0C00EA95 */ jal npc_move_heading +/* B354E0 80240910 AE06000C */ sw $a2, 0xc($s0) +/* B354E4 80240914 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B354E8 80240918 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B354EC 8024091C 4406B000 */ mfc1 $a2, $f22 +/* B354F0 80240920 4407A000 */ mfc1 $a3, $f20 +/* B354F4 80240924 0C00A7B5 */ jal dist2D +/* B354F8 80240928 00000000 */ nop +/* B354FC 8024092C C6020018 */ lwc1 $f2, 0x18($s0) +/* B35500 80240930 4602003E */ c.le.s $f0, $f2 +/* B35504 80240934 00000000 */ nop +/* B35508 80240938 4500002F */ bc1f .L802409F8 +/* B3550C 8024093C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* B35510 80240940 24020002 */ addiu $v0, $zero, 2 +/* B35514 80240944 0C00A67F */ jal rand_int +/* B35518 80240948 AE420070 */ sw $v0, 0x70($s2) +/* B3551C 8024094C 3C035555 */ lui $v1, 0x5555 +/* B35520 80240950 34635556 */ ori $v1, $v1, 0x5556 +/* B35524 80240954 00430018 */ mult $v0, $v1 +/* B35528 80240958 000227C3 */ sra $a0, $v0, 0x1f +/* B3552C 8024095C 00004010 */ mfhi $t0 +/* B35530 80240960 01042023 */ subu $a0, $t0, $a0 +/* B35534 80240964 00041840 */ sll $v1, $a0, 1 +/* B35538 80240968 00641821 */ addu $v1, $v1, $a0 +/* B3553C 8024096C 00431023 */ subu $v0, $v0, $v1 +/* B35540 80240970 24430002 */ addiu $v1, $v0, 2 +/* B35544 80240974 AE430074 */ sw $v1, 0x74($s2) +/* B35548 80240978 8E62002C */ lw $v0, 0x2c($s3) +/* B3554C 8024097C 18400009 */ blez $v0, .L802409A4 +/* B35550 80240980 24020004 */ addiu $v0, $zero, 4 +/* B35554 80240984 8E620004 */ lw $v0, 4($s3) +/* B35558 80240988 18400006 */ blez $v0, .L802409A4 +/* B3555C 8024098C 24020004 */ addiu $v0, $zero, 4 +/* B35560 80240990 8E620008 */ lw $v0, 8($s3) +/* B35564 80240994 18400003 */ blez $v0, .L802409A4 +/* B35568 80240998 24020004 */ addiu $v0, $zero, 4 +/* B3556C 8024099C 14600002 */ bnez $v1, .L802409A8 +/* B35570 802409A0 00000000 */ nop +.L802409A4: +/* B35574 802409A4 AE420070 */ sw $v0, 0x70($s2) +.L802409A8: +/* B35578 802409A8 0C00A67F */ jal rand_int +/* B3557C 802409AC 24042710 */ addiu $a0, $zero, 0x2710 +/* B35580 802409B0 3C0351EB */ lui $v1, 0x51eb +/* B35584 802409B4 3463851F */ ori $v1, $v1, 0x851f +/* B35588 802409B8 00430018 */ mult $v0, $v1 +/* B3558C 802409BC 00021FC3 */ sra $v1, $v0, 0x1f +/* B35590 802409C0 00004010 */ mfhi $t0 +/* B35594 802409C4 00082143 */ sra $a0, $t0, 5 +/* B35598 802409C8 00832023 */ subu $a0, $a0, $v1 +/* B3559C 802409CC 00041840 */ sll $v1, $a0, 1 +/* B355A0 802409D0 00641821 */ addu $v1, $v1, $a0 +/* B355A4 802409D4 000318C0 */ sll $v1, $v1, 3 +/* B355A8 802409D8 00641821 */ addu $v1, $v1, $a0 +/* B355AC 802409DC 00031880 */ sll $v1, $v1, 2 +/* B355B0 802409E0 8E640004 */ lw $a0, 4($s3) +/* B355B4 802409E4 00431023 */ subu $v0, $v0, $v1 +/* B355B8 802409E8 0044102A */ slt $v0, $v0, $a0 +/* B355BC 802409EC 10400002 */ beqz $v0, .L802409F8 +/* B355C0 802409F0 24020004 */ addiu $v0, $zero, 4 +.L802409F4: +/* B355C4 802409F4 AE420070 */ sw $v0, 0x70($s2) +.L802409F8: +/* B355C8 802409F8 8FBF0044 */ lw $ra, 0x44($sp) +/* B355CC 802409FC 8FB40040 */ lw $s4, 0x40($sp) +/* B355D0 80240A00 8FB3003C */ lw $s3, 0x3c($sp) +/* B355D4 80240A04 8FB20038 */ lw $s2, 0x38($sp) +/* B355D8 80240A08 8FB10034 */ lw $s1, 0x34($sp) +/* B355DC 80240A0C 8FB00030 */ lw $s0, 0x30($sp) +/* B355E0 80240A10 D7B60050 */ ldc1 $f22, 0x50($sp) +/* B355E4 80240A14 D7B40048 */ ldc1 $f20, 0x48($sp) +/* B355E8 80240A18 03E00008 */ jr $ra +/* B355EC 80240A1C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20.s deleted file mode 100644 index a086c926b9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A20 -/* B355F0 80240A20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B355F4 80240A24 AFB3001C */ sw $s3, 0x1c($sp) -/* B355F8 80240A28 0080982D */ daddu $s3, $a0, $zero -/* B355FC 80240A2C AFBF0020 */ sw $ra, 0x20($sp) -/* B35600 80240A30 AFB20018 */ sw $s2, 0x18($sp) -/* B35604 80240A34 AFB10014 */ sw $s1, 0x14($sp) -/* B35608 80240A38 AFB00010 */ sw $s0, 0x10($sp) -/* B3560C 80240A3C 8E720148 */ lw $s2, 0x148($s3) -/* B35610 80240A40 86440008 */ lh $a0, 8($s2) -/* B35614 80240A44 0C00EABB */ jal get_npc_unsafe -/* B35618 80240A48 00A0882D */ daddu $s1, $a1, $zero -/* B3561C 80240A4C 8E240008 */ lw $a0, 8($s1) -/* B35620 80240A50 0040802D */ daddu $s0, $v0, $zero -/* B35624 80240A54 00041FC2 */ srl $v1, $a0, 0x1f -/* B35628 80240A58 00832021 */ addu $a0, $a0, $v1 -/* B3562C 80240A5C 00042043 */ sra $a0, $a0, 1 -/* B35630 80240A60 0C00A67F */ jal rand_int -/* B35634 80240A64 24840001 */ addiu $a0, $a0, 1 -/* B35638 80240A68 8E230008 */ lw $v1, 8($s1) -/* B3563C 80240A6C 240400B4 */ addiu $a0, $zero, 0xb4 -/* B35640 80240A70 00032FC2 */ srl $a1, $v1, 0x1f -/* B35644 80240A74 00651821 */ addu $v1, $v1, $a1 -/* B35648 80240A78 00031843 */ sra $v1, $v1, 1 -/* B3564C 80240A7C 00621821 */ addu $v1, $v1, $v0 -/* B35650 80240A80 0C00A67F */ jal rand_int -/* B35654 80240A84 A603008E */ sh $v1, 0x8e($s0) -/* B35658 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) -/* B3565C 80240A8C 44820000 */ mtc1 $v0, $f0 -/* B35660 80240A90 00000000 */ nop -/* B35664 80240A94 46800020 */ cvt.s.w $f0, $f0 -/* B35668 80240A98 46006300 */ add.s $f12, $f12, $f0 -/* B3566C 80240A9C 3C0142B4 */ lui $at, 0x42b4 -/* B35670 80240AA0 44810000 */ mtc1 $at, $f0 -/* B35674 80240AA4 0C00A6C9 */ jal clamp_angle -/* B35678 80240AA8 46006301 */ sub.s $f12, $f12, $f0 -/* B3567C 80240AAC E600000C */ swc1 $f0, 0xc($s0) -/* B35680 80240AB0 8E4200CC */ lw $v0, 0xcc($s2) -/* B35684 80240AB4 8C420000 */ lw $v0, ($v0) -/* B35688 80240AB8 AE020028 */ sw $v0, 0x28($s0) -/* B3568C 80240ABC 24020003 */ addiu $v0, $zero, 3 -/* B35690 80240AC0 AE620070 */ sw $v0, 0x70($s3) -/* B35694 80240AC4 8FBF0020 */ lw $ra, 0x20($sp) -/* B35698 80240AC8 8FB3001C */ lw $s3, 0x1c($sp) -/* B3569C 80240ACC 8FB20018 */ lw $s2, 0x18($sp) -/* B356A0 80240AD0 8FB10014 */ lw $s1, 0x14($sp) -/* B356A4 80240AD4 8FB00010 */ lw $s0, 0x10($sp) -/* B356A8 80240AD8 03E00008 */ jr $ra -/* B356AC 80240ADC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s new file mode 100644 index 0000000000..ab2ad791e0 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240A20_B355F0.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A20_B355F0 +/* B355F0 80240A20 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B355F4 80240A24 AFB3001C */ sw $s3, 0x1c($sp) +/* B355F8 80240A28 0080982D */ daddu $s3, $a0, $zero +/* B355FC 80240A2C AFBF0020 */ sw $ra, 0x20($sp) +/* B35600 80240A30 AFB20018 */ sw $s2, 0x18($sp) +/* B35604 80240A34 AFB10014 */ sw $s1, 0x14($sp) +/* B35608 80240A38 AFB00010 */ sw $s0, 0x10($sp) +/* B3560C 80240A3C 8E720148 */ lw $s2, 0x148($s3) +/* B35610 80240A40 86440008 */ lh $a0, 8($s2) +/* B35614 80240A44 0C00EABB */ jal get_npc_unsafe +/* B35618 80240A48 00A0882D */ daddu $s1, $a1, $zero +/* B3561C 80240A4C 8E240008 */ lw $a0, 8($s1) +/* B35620 80240A50 0040802D */ daddu $s0, $v0, $zero +/* B35624 80240A54 00041FC2 */ srl $v1, $a0, 0x1f +/* B35628 80240A58 00832021 */ addu $a0, $a0, $v1 +/* B3562C 80240A5C 00042043 */ sra $a0, $a0, 1 +/* B35630 80240A60 0C00A67F */ jal rand_int +/* B35634 80240A64 24840001 */ addiu $a0, $a0, 1 +/* B35638 80240A68 8E230008 */ lw $v1, 8($s1) +/* B3563C 80240A6C 240400B4 */ addiu $a0, $zero, 0xb4 +/* B35640 80240A70 00032FC2 */ srl $a1, $v1, 0x1f +/* B35644 80240A74 00651821 */ addu $v1, $v1, $a1 +/* B35648 80240A78 00031843 */ sra $v1, $v1, 1 +/* B3564C 80240A7C 00621821 */ addu $v1, $v1, $v0 +/* B35650 80240A80 0C00A67F */ jal rand_int +/* B35654 80240A84 A603008E */ sh $v1, 0x8e($s0) +/* B35658 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) +/* B3565C 80240A8C 44820000 */ mtc1 $v0, $f0 +/* B35660 80240A90 00000000 */ nop +/* B35664 80240A94 46800020 */ cvt.s.w $f0, $f0 +/* B35668 80240A98 46006300 */ add.s $f12, $f12, $f0 +/* B3566C 80240A9C 3C0142B4 */ lui $at, 0x42b4 +/* B35670 80240AA0 44810000 */ mtc1 $at, $f0 +/* B35674 80240AA4 0C00A6C9 */ jal clamp_angle +/* B35678 80240AA8 46006301 */ sub.s $f12, $f12, $f0 +/* B3567C 80240AAC E600000C */ swc1 $f0, 0xc($s0) +/* B35680 80240AB0 8E4200CC */ lw $v0, 0xcc($s2) +/* B35684 80240AB4 8C420000 */ lw $v0, ($v0) +/* B35688 80240AB8 AE020028 */ sw $v0, 0x28($s0) +/* B3568C 80240ABC 24020003 */ addiu $v0, $zero, 3 +/* B35690 80240AC0 AE620070 */ sw $v0, 0x70($s3) +/* B35694 80240AC4 8FBF0020 */ lw $ra, 0x20($sp) +/* B35698 80240AC8 8FB3001C */ lw $s3, 0x1c($sp) +/* B3569C 80240ACC 8FB20018 */ lw $s2, 0x18($sp) +/* B356A0 80240AD0 8FB10014 */ lw $s1, 0x14($sp) +/* B356A4 80240AD4 8FB00010 */ lw $s0, 0x10($sp) +/* B356A8 80240AD8 03E00008 */ jr $ra +/* B356AC 80240ADC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C.s deleted file mode 100644 index 12be7fc61a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C9C -/* B3586C 80240C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B35870 80240CA0 AFB10014 */ sw $s1, 0x14($sp) -/* B35874 80240CA4 0080882D */ daddu $s1, $a0, $zero -/* B35878 80240CA8 AFBF001C */ sw $ra, 0x1c($sp) -/* B3587C 80240CAC AFB20018 */ sw $s2, 0x18($sp) -/* B35880 80240CB0 AFB00010 */ sw $s0, 0x10($sp) -/* B35884 80240CB4 8E300148 */ lw $s0, 0x148($s1) -/* B35888 80240CB8 86040008 */ lh $a0, 8($s0) -/* B3588C 80240CBC 0C00EABB */ jal get_npc_unsafe -/* B35890 80240CC0 00A0902D */ daddu $s2, $a1, $zero -/* B35894 80240CC4 8E230078 */ lw $v1, 0x78($s1) -/* B35898 80240CC8 24630001 */ addiu $v1, $v1, 1 -/* B3589C 80240CCC AE230078 */ sw $v1, 0x78($s1) -/* B358A0 80240CD0 8E0400D0 */ lw $a0, 0xd0($s0) -/* B358A4 80240CD4 8C840000 */ lw $a0, ($a0) -/* B358A8 80240CD8 0064182A */ slt $v1, $v1, $a0 -/* B358AC 80240CDC 14600002 */ bnez $v1, .L80240CE8 -/* B358B0 80240CE0 0040282D */ daddu $a1, $v0, $zero -/* B358B4 80240CE4 AE200078 */ sw $zero, 0x78($s1) -.L80240CE8: -/* B358B8 80240CE8 8E0200CC */ lw $v0, 0xcc($s0) -/* B358BC 80240CEC 8C420004 */ lw $v0, 4($v0) -/* B358C0 80240CF0 ACA20028 */ sw $v0, 0x28($a1) -/* B358C4 80240CF4 8E0200D0 */ lw $v0, 0xd0($s0) -/* B358C8 80240CF8 8C42007C */ lw $v0, 0x7c($v0) -/* B358CC 80240CFC 04410004 */ bgez $v0, .L80240D10 -/* B358D0 80240D00 00000000 */ nop -/* B358D4 80240D04 C6400000 */ lwc1 $f0, ($s2) -/* B358D8 80240D08 0809034C */ j .L80240D30 -/* B358DC 80240D0C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240D10: -/* B358E0 80240D10 3C018025 */ lui $at, 0x8025 -/* B358E4 80240D14 D422F9F8 */ ldc1 $f2, -0x608($at) -/* B358E8 80240D18 44820000 */ mtc1 $v0, $f0 -/* B358EC 80240D1C 00000000 */ nop -/* B358F0 80240D20 46800021 */ cvt.d.w $f0, $f0 -/* B358F4 80240D24 46220003 */ div.d $f0, $f0, $f2 -/* B358F8 80240D28 46200020 */ cvt.s.d $f0, $f0 -/* B358FC 80240D2C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240D30: -/* B35900 80240D30 24020001 */ addiu $v0, $zero, 1 -/* B35904 80240D34 AE220070 */ sw $v0, 0x70($s1) -/* B35908 80240D38 8FBF001C */ lw $ra, 0x1c($sp) -/* B3590C 80240D3C 8FB20018 */ lw $s2, 0x18($sp) -/* B35910 80240D40 8FB10014 */ lw $s1, 0x14($sp) -/* B35914 80240D44 8FB00010 */ lw $s0, 0x10($sp) -/* B35918 80240D48 03E00008 */ jr $ra -/* B3591C 80240D4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s new file mode 100644 index 0000000000..6c6d2b8c50 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240C9C_B3586C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C9C_B3586C +/* B3586C 80240C9C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B35870 80240CA0 AFB10014 */ sw $s1, 0x14($sp) +/* B35874 80240CA4 0080882D */ daddu $s1, $a0, $zero +/* B35878 80240CA8 AFBF001C */ sw $ra, 0x1c($sp) +/* B3587C 80240CAC AFB20018 */ sw $s2, 0x18($sp) +/* B35880 80240CB0 AFB00010 */ sw $s0, 0x10($sp) +/* B35884 80240CB4 8E300148 */ lw $s0, 0x148($s1) +/* B35888 80240CB8 86040008 */ lh $a0, 8($s0) +/* B3588C 80240CBC 0C00EABB */ jal get_npc_unsafe +/* B35890 80240CC0 00A0902D */ daddu $s2, $a1, $zero +/* B35894 80240CC4 8E230078 */ lw $v1, 0x78($s1) +/* B35898 80240CC8 24630001 */ addiu $v1, $v1, 1 +/* B3589C 80240CCC AE230078 */ sw $v1, 0x78($s1) +/* B358A0 80240CD0 8E0400D0 */ lw $a0, 0xd0($s0) +/* B358A4 80240CD4 8C840000 */ lw $a0, ($a0) +/* B358A8 80240CD8 0064182A */ slt $v1, $v1, $a0 +/* B358AC 80240CDC 14600002 */ bnez $v1, .L80240CE8 +/* B358B0 80240CE0 0040282D */ daddu $a1, $v0, $zero +/* B358B4 80240CE4 AE200078 */ sw $zero, 0x78($s1) +.L80240CE8: +/* B358B8 80240CE8 8E0200CC */ lw $v0, 0xcc($s0) +/* B358BC 80240CEC 8C420004 */ lw $v0, 4($v0) +/* B358C0 80240CF0 ACA20028 */ sw $v0, 0x28($a1) +/* B358C4 80240CF4 8E0200D0 */ lw $v0, 0xd0($s0) +/* B358C8 80240CF8 8C42007C */ lw $v0, 0x7c($v0) +/* B358CC 80240CFC 04410004 */ bgez $v0, .L80240D10 +/* B358D0 80240D00 00000000 */ nop +/* B358D4 80240D04 C6400000 */ lwc1 $f0, ($s2) +/* B358D8 80240D08 0809034C */ j .L80240D30 +/* B358DC 80240D0C E4A00018 */ swc1 $f0, 0x18($a1) +.L80240D10: +/* B358E0 80240D10 3C018025 */ lui $at, 0x8025 +/* B358E4 80240D14 D422F9F8 */ ldc1 $f2, -0x608($at) +/* B358E8 80240D18 44820000 */ mtc1 $v0, $f0 +/* B358EC 80240D1C 00000000 */ nop +/* B358F0 80240D20 46800021 */ cvt.d.w $f0, $f0 +/* B358F4 80240D24 46220003 */ div.d $f0, $f0, $f2 +/* B358F8 80240D28 46200020 */ cvt.s.d $f0, $f0 +/* B358FC 80240D2C E4A00018 */ swc1 $f0, 0x18($a1) +.L80240D30: +/* B35900 80240D30 24020001 */ addiu $v0, $zero, 1 +/* B35904 80240D34 AE220070 */ sw $v0, 0x70($s1) +/* B35908 80240D38 8FBF001C */ lw $ra, 0x1c($sp) +/* B3590C 80240D3C 8FB20018 */ lw $s2, 0x18($sp) +/* B35910 80240D40 8FB10014 */ lw $s1, 0x14($sp) +/* B35914 80240D44 8FB00010 */ lw $s0, 0x10($sp) +/* B35918 80240D48 03E00008 */ jr $ra +/* B3591C 80240D4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C.s deleted file mode 100644 index e4824dab43..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F6C -/* B35B3C 80240F6C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B35B40 80240F70 AFB3003C */ sw $s3, 0x3c($sp) -/* B35B44 80240F74 0080982D */ daddu $s3, $a0, $zero -/* B35B48 80240F78 AFBF0040 */ sw $ra, 0x40($sp) -/* B35B4C 80240F7C AFB20038 */ sw $s2, 0x38($sp) -/* B35B50 80240F80 AFB10034 */ sw $s1, 0x34($sp) -/* B35B54 80240F84 AFB00030 */ sw $s0, 0x30($sp) -/* B35B58 80240F88 8E720148 */ lw $s2, 0x148($s3) -/* B35B5C 80240F8C 00A0882D */ daddu $s1, $a1, $zero -/* B35B60 80240F90 86440008 */ lh $a0, 8($s2) -/* B35B64 80240F94 0C00EABB */ jal get_npc_unsafe -/* B35B68 80240F98 00C0802D */ daddu $s0, $a2, $zero -/* B35B6C 80240F9C 0200202D */ daddu $a0, $s0, $zero -/* B35B70 80240FA0 0240282D */ daddu $a1, $s2, $zero -/* B35B74 80240FA4 24030001 */ addiu $v1, $zero, 1 -/* B35B78 80240FA8 AFA30010 */ sw $v1, 0x10($sp) -/* B35B7C 80240FAC 8E260024 */ lw $a2, 0x24($s1) -/* B35B80 80240FB0 8E270028 */ lw $a3, 0x28($s1) -/* B35B84 80240FB4 0C01242D */ jal func_800490B4 -/* B35B88 80240FB8 0040802D */ daddu $s0, $v0, $zero -/* B35B8C 80240FBC 1440001E */ bnez $v0, .L80241038 -/* B35B90 80240FC0 0200202D */ daddu $a0, $s0, $zero -/* B35B94 80240FC4 24040002 */ addiu $a0, $zero, 2 -/* B35B98 80240FC8 0200282D */ daddu $a1, $s0, $zero -/* B35B9C 80240FCC 0000302D */ daddu $a2, $zero, $zero -/* B35BA0 80240FD0 860300A8 */ lh $v1, 0xa8($s0) -/* B35BA4 80240FD4 3C013F80 */ lui $at, 0x3f80 -/* B35BA8 80240FD8 44810000 */ mtc1 $at, $f0 -/* B35BAC 80240FDC 3C014000 */ lui $at, 0x4000 -/* B35BB0 80240FE0 44811000 */ mtc1 $at, $f2 -/* B35BB4 80240FE4 3C01C1A0 */ lui $at, 0xc1a0 -/* B35BB8 80240FE8 44812000 */ mtc1 $at, $f4 -/* B35BBC 80240FEC 2402000F */ addiu $v0, $zero, 0xf -/* B35BC0 80240FF0 AFA2001C */ sw $v0, 0x1c($sp) -/* B35BC4 80240FF4 44833000 */ mtc1 $v1, $f6 -/* B35BC8 80240FF8 00000000 */ nop -/* B35BCC 80240FFC 468031A0 */ cvt.s.w $f6, $f6 -/* B35BD0 80241000 44073000 */ mfc1 $a3, $f6 -/* B35BD4 80241004 27A20028 */ addiu $v0, $sp, 0x28 -/* B35BD8 80241008 AFA20020 */ sw $v0, 0x20($sp) -/* B35BDC 8024100C E7A00010 */ swc1 $f0, 0x10($sp) -/* B35BE0 80241010 E7A20014 */ swc1 $f2, 0x14($sp) -/* B35BE4 80241014 0C01BFA4 */ jal fx_emote -/* B35BE8 80241018 E7A40018 */ swc1 $f4, 0x18($sp) -/* B35BEC 8024101C 8E4200CC */ lw $v0, 0xcc($s2) -/* B35BF0 80241020 8C430000 */ lw $v1, ($v0) -/* B35BF4 80241024 24020019 */ addiu $v0, $zero, 0x19 -/* B35BF8 80241028 A602008E */ sh $v0, 0x8e($s0) -/* B35BFC 8024102C 2402000E */ addiu $v0, $zero, 0xe -/* B35C00 80241030 0809041B */ j .L8024106C -/* B35C04 80241034 AE030028 */ sw $v1, 0x28($s0) -.L80241038: -/* B35C08 80241038 0C00F598 */ jal func_8003D660 -/* B35C0C 8024103C 24050001 */ addiu $a1, $zero, 1 -/* B35C10 80241040 8E050018 */ lw $a1, 0x18($s0) -/* B35C14 80241044 8E06000C */ lw $a2, 0xc($s0) -/* B35C18 80241048 0C00EA95 */ jal npc_move_heading -/* B35C1C 8024104C 0200202D */ daddu $a0, $s0, $zero -/* B35C20 80241050 8602008E */ lh $v0, 0x8e($s0) -/* B35C24 80241054 9603008E */ lhu $v1, 0x8e($s0) -/* B35C28 80241058 18400003 */ blez $v0, .L80241068 -/* B35C2C 8024105C 2462FFFF */ addiu $v0, $v1, -1 -/* B35C30 80241060 0809041C */ j .L80241070 -/* B35C34 80241064 A602008E */ sh $v0, 0x8e($s0) -.L80241068: -/* B35C38 80241068 2402000C */ addiu $v0, $zero, 0xc -.L8024106C: -/* B35C3C 8024106C AE620070 */ sw $v0, 0x70($s3) -.L80241070: -/* B35C40 80241070 8FBF0040 */ lw $ra, 0x40($sp) -/* B35C44 80241074 8FB3003C */ lw $s3, 0x3c($sp) -/* B35C48 80241078 8FB20038 */ lw $s2, 0x38($sp) -/* B35C4C 8024107C 8FB10034 */ lw $s1, 0x34($sp) -/* B35C50 80241080 8FB00030 */ lw $s0, 0x30($sp) -/* B35C54 80241084 03E00008 */ jr $ra -/* B35C58 80241088 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s new file mode 100644 index 0000000000..65400da96f --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80240F6C_B35B3C.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F6C_B35B3C +/* B35B3C 80240F6C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B35B40 80240F70 AFB3003C */ sw $s3, 0x3c($sp) +/* B35B44 80240F74 0080982D */ daddu $s3, $a0, $zero +/* B35B48 80240F78 AFBF0040 */ sw $ra, 0x40($sp) +/* B35B4C 80240F7C AFB20038 */ sw $s2, 0x38($sp) +/* B35B50 80240F80 AFB10034 */ sw $s1, 0x34($sp) +/* B35B54 80240F84 AFB00030 */ sw $s0, 0x30($sp) +/* B35B58 80240F88 8E720148 */ lw $s2, 0x148($s3) +/* B35B5C 80240F8C 00A0882D */ daddu $s1, $a1, $zero +/* B35B60 80240F90 86440008 */ lh $a0, 8($s2) +/* B35B64 80240F94 0C00EABB */ jal get_npc_unsafe +/* B35B68 80240F98 00C0802D */ daddu $s0, $a2, $zero +/* B35B6C 80240F9C 0200202D */ daddu $a0, $s0, $zero +/* B35B70 80240FA0 0240282D */ daddu $a1, $s2, $zero +/* B35B74 80240FA4 24030001 */ addiu $v1, $zero, 1 +/* B35B78 80240FA8 AFA30010 */ sw $v1, 0x10($sp) +/* B35B7C 80240FAC 8E260024 */ lw $a2, 0x24($s1) +/* B35B80 80240FB0 8E270028 */ lw $a3, 0x28($s1) +/* B35B84 80240FB4 0C01242D */ jal func_800490B4 +/* B35B88 80240FB8 0040802D */ daddu $s0, $v0, $zero +/* B35B8C 80240FBC 1440001E */ bnez $v0, .L80241038 +/* B35B90 80240FC0 0200202D */ daddu $a0, $s0, $zero +/* B35B94 80240FC4 24040002 */ addiu $a0, $zero, 2 +/* B35B98 80240FC8 0200282D */ daddu $a1, $s0, $zero +/* B35B9C 80240FCC 0000302D */ daddu $a2, $zero, $zero +/* B35BA0 80240FD0 860300A8 */ lh $v1, 0xa8($s0) +/* B35BA4 80240FD4 3C013F80 */ lui $at, 0x3f80 +/* B35BA8 80240FD8 44810000 */ mtc1 $at, $f0 +/* B35BAC 80240FDC 3C014000 */ lui $at, 0x4000 +/* B35BB0 80240FE0 44811000 */ mtc1 $at, $f2 +/* B35BB4 80240FE4 3C01C1A0 */ lui $at, 0xc1a0 +/* B35BB8 80240FE8 44812000 */ mtc1 $at, $f4 +/* B35BBC 80240FEC 2402000F */ addiu $v0, $zero, 0xf +/* B35BC0 80240FF0 AFA2001C */ sw $v0, 0x1c($sp) +/* B35BC4 80240FF4 44833000 */ mtc1 $v1, $f6 +/* B35BC8 80240FF8 00000000 */ nop +/* B35BCC 80240FFC 468031A0 */ cvt.s.w $f6, $f6 +/* B35BD0 80241000 44073000 */ mfc1 $a3, $f6 +/* B35BD4 80241004 27A20028 */ addiu $v0, $sp, 0x28 +/* B35BD8 80241008 AFA20020 */ sw $v0, 0x20($sp) +/* B35BDC 8024100C E7A00010 */ swc1 $f0, 0x10($sp) +/* B35BE0 80241010 E7A20014 */ swc1 $f2, 0x14($sp) +/* B35BE4 80241014 0C01BFA4 */ jal fx_emote +/* B35BE8 80241018 E7A40018 */ swc1 $f4, 0x18($sp) +/* B35BEC 8024101C 8E4200CC */ lw $v0, 0xcc($s2) +/* B35BF0 80241020 8C430000 */ lw $v1, ($v0) +/* B35BF4 80241024 24020019 */ addiu $v0, $zero, 0x19 +/* B35BF8 80241028 A602008E */ sh $v0, 0x8e($s0) +/* B35BFC 8024102C 2402000E */ addiu $v0, $zero, 0xe +/* B35C00 80241030 0809041B */ j .L8024106C +/* B35C04 80241034 AE030028 */ sw $v1, 0x28($s0) +.L80241038: +/* B35C08 80241038 0C00F598 */ jal func_8003D660 +/* B35C0C 8024103C 24050001 */ addiu $a1, $zero, 1 +/* B35C10 80241040 8E050018 */ lw $a1, 0x18($s0) +/* B35C14 80241044 8E06000C */ lw $a2, 0xc($s0) +/* B35C18 80241048 0C00EA95 */ jal npc_move_heading +/* B35C1C 8024104C 0200202D */ daddu $a0, $s0, $zero +/* B35C20 80241050 8602008E */ lh $v0, 0x8e($s0) +/* B35C24 80241054 9603008E */ lhu $v1, 0x8e($s0) +/* B35C28 80241058 18400003 */ blez $v0, .L80241068 +/* B35C2C 8024105C 2462FFFF */ addiu $v0, $v1, -1 +/* B35C30 80241060 0809041C */ j .L80241070 +/* B35C34 80241064 A602008E */ sh $v0, 0x8e($s0) +.L80241068: +/* B35C38 80241068 2402000C */ addiu $v0, $zero, 0xc +.L8024106C: +/* B35C3C 8024106C AE620070 */ sw $v0, 0x70($s3) +.L80241070: +/* B35C40 80241070 8FBF0040 */ lw $ra, 0x40($sp) +/* B35C44 80241074 8FB3003C */ lw $s3, 0x3c($sp) +/* B35C48 80241078 8FB20038 */ lw $s2, 0x38($sp) +/* B35C4C 8024107C 8FB10034 */ lw $s1, 0x34($sp) +/* B35C50 80241080 8FB00030 */ lw $s0, 0x30($sp) +/* B35C54 80241084 03E00008 */ jr $ra +/* B35C58 80241088 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C.s deleted file mode 100644 index 7135b0ccc2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024108C -/* B35C5C 8024108C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B35C60 80241090 AFB10014 */ sw $s1, 0x14($sp) -/* B35C64 80241094 0080882D */ daddu $s1, $a0, $zero -/* B35C68 80241098 AFBF0018 */ sw $ra, 0x18($sp) -/* B35C6C 8024109C AFB00010 */ sw $s0, 0x10($sp) -/* B35C70 802410A0 8E300148 */ lw $s0, 0x148($s1) -/* B35C74 802410A4 0C00EABB */ jal get_npc_unsafe -/* B35C78 802410A8 86040008 */ lh $a0, 8($s0) -/* B35C7C 802410AC 9443008E */ lhu $v1, 0x8e($v0) -/* B35C80 802410B0 2463FFFF */ addiu $v1, $v1, -1 -/* B35C84 802410B4 A443008E */ sh $v1, 0x8e($v0) -/* B35C88 802410B8 00031C00 */ sll $v1, $v1, 0x10 -/* B35C8C 802410BC 14600008 */ bnez $v1, .L802410E0 -/* B35C90 802410C0 00000000 */ nop -/* B35C94 802410C4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B35C98 802410C8 30420080 */ andi $v0, $v0, 0x80 -/* B35C9C 802410CC 10400003 */ beqz $v0, .L802410DC -/* B35CA0 802410D0 2402000F */ addiu $v0, $zero, 0xf -/* B35CA4 802410D4 08090438 */ j .L802410E0 -/* B35CA8 802410D8 AE220070 */ sw $v0, 0x70($s1) -.L802410DC: -/* B35CAC 802410DC AE200070 */ sw $zero, 0x70($s1) -.L802410E0: -/* B35CB0 802410E0 8FBF0018 */ lw $ra, 0x18($sp) -/* B35CB4 802410E4 8FB10014 */ lw $s1, 0x14($sp) -/* B35CB8 802410E8 8FB00010 */ lw $s0, 0x10($sp) -/* B35CBC 802410EC 03E00008 */ jr $ra -/* B35CC0 802410F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s new file mode 100644 index 0000000000..88cedb3afe --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024108C_B35C5C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024108C_B35C5C +/* B35C5C 8024108C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B35C60 80241090 AFB10014 */ sw $s1, 0x14($sp) +/* B35C64 80241094 0080882D */ daddu $s1, $a0, $zero +/* B35C68 80241098 AFBF0018 */ sw $ra, 0x18($sp) +/* B35C6C 8024109C AFB00010 */ sw $s0, 0x10($sp) +/* B35C70 802410A0 8E300148 */ lw $s0, 0x148($s1) +/* B35C74 802410A4 0C00EABB */ jal get_npc_unsafe +/* B35C78 802410A8 86040008 */ lh $a0, 8($s0) +/* B35C7C 802410AC 9443008E */ lhu $v1, 0x8e($v0) +/* B35C80 802410B0 2463FFFF */ addiu $v1, $v1, -1 +/* B35C84 802410B4 A443008E */ sh $v1, 0x8e($v0) +/* B35C88 802410B8 00031C00 */ sll $v1, $v1, 0x10 +/* B35C8C 802410BC 14600008 */ bnez $v1, .L802410E0 +/* B35C90 802410C0 00000000 */ nop +/* B35C94 802410C4 8E0200B0 */ lw $v0, 0xb0($s0) +/* B35C98 802410C8 30420080 */ andi $v0, $v0, 0x80 +/* B35C9C 802410CC 10400003 */ beqz $v0, .L802410DC +/* B35CA0 802410D0 2402000F */ addiu $v0, $zero, 0xf +/* B35CA4 802410D4 08090438 */ j .L802410E0 +/* B35CA8 802410D8 AE220070 */ sw $v0, 0x70($s1) +.L802410DC: +/* B35CAC 802410DC AE200070 */ sw $zero, 0x70($s1) +.L802410E0: +/* B35CB0 802410E0 8FBF0018 */ lw $ra, 0x18($sp) +/* B35CB4 802410E4 8FB10014 */ lw $s1, 0x14($sp) +/* B35CB8 802410E8 8FB00010 */ lw $s0, 0x10($sp) +/* B35CBC 802410EC 03E00008 */ jr $ra +/* B35CC0 802410F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4.s deleted file mode 100644 index e02851e636..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410F4 -/* B35CC4 802410F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B35CC8 802410F8 AFB10014 */ sw $s1, 0x14($sp) -/* B35CCC 802410FC 0080882D */ daddu $s1, $a0, $zero -/* B35CD0 80241100 AFBF001C */ sw $ra, 0x1c($sp) -/* B35CD4 80241104 AFB20018 */ sw $s2, 0x18($sp) -/* B35CD8 80241108 AFB00010 */ sw $s0, 0x10($sp) -/* B35CDC 8024110C 8E300148 */ lw $s0, 0x148($s1) -/* B35CE0 80241110 86040008 */ lh $a0, 8($s0) -/* B35CE4 80241114 0C00EABB */ jal get_npc_unsafe -/* B35CE8 80241118 00A0902D */ daddu $s2, $a1, $zero -/* B35CEC 8024111C 8E0300D0 */ lw $v1, 0xd0($s0) -/* B35CF0 80241120 8E240078 */ lw $a0, 0x78($s1) -/* B35CF4 80241124 8C630000 */ lw $v1, ($v1) -/* B35CF8 80241128 0083182A */ slt $v1, $a0, $v1 -/* B35CFC 8024112C 10600013 */ beqz $v1, .L8024117C -/* B35D00 80241130 0040302D */ daddu $a2, $v0, $zero -/* B35D04 80241134 00041040 */ sll $v0, $a0, 1 -/* B35D08 80241138 00441021 */ addu $v0, $v0, $a0 -/* B35D0C 8024113C 00022880 */ sll $a1, $v0, 2 -.L80241140: -/* B35D10 80241140 8E0300D0 */ lw $v1, 0xd0($s0) -/* B35D14 80241144 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* B35D18 80241148 00A31021 */ addu $v0, $a1, $v1 -/* B35D1C 8024114C C4400008 */ lwc1 $f0, 8($v0) -/* B35D20 80241150 46800020 */ cvt.s.w $f0, $f0 -/* B35D24 80241154 4602003E */ c.le.s $f0, $f2 -/* B35D28 80241158 00000000 */ nop -/* B35D2C 8024115C 45020003 */ bc1fl .L8024116C -/* B35D30 80241160 24840001 */ addiu $a0, $a0, 1 -/* B35D34 80241164 0809045F */ j .L8024117C -/* B35D38 80241168 AE240078 */ sw $a0, 0x78($s1) -.L8024116C: -/* B35D3C 8024116C 8C620000 */ lw $v0, ($v1) -/* B35D40 80241170 0082102A */ slt $v0, $a0, $v0 -/* B35D44 80241174 1440FFF2 */ bnez $v0, .L80241140 -/* B35D48 80241178 24A5000C */ addiu $a1, $a1, 0xc -.L8024117C: -/* B35D4C 8024117C C6400000 */ lwc1 $f0, ($s2) -/* B35D50 80241180 E4C00018 */ swc1 $f0, 0x18($a2) -/* B35D54 80241184 8E0200CC */ lw $v0, 0xcc($s0) -/* B35D58 80241188 8C420004 */ lw $v0, 4($v0) -/* B35D5C 8024118C ACC20028 */ sw $v0, 0x28($a2) -/* B35D60 80241190 24020001 */ addiu $v0, $zero, 1 -/* B35D64 80241194 AE200074 */ sw $zero, 0x74($s1) -/* B35D68 80241198 AE220070 */ sw $v0, 0x70($s1) -/* B35D6C 8024119C 8FBF001C */ lw $ra, 0x1c($sp) -/* B35D70 802411A0 8FB20018 */ lw $s2, 0x18($sp) -/* B35D74 802411A4 8FB10014 */ lw $s1, 0x14($sp) -/* B35D78 802411A8 8FB00010 */ lw $s0, 0x10($sp) -/* B35D7C 802411AC 03E00008 */ jr $ra -/* B35D80 802411B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s new file mode 100644 index 0000000000..8001124717 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802410F4_B35CC4.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410F4_B35CC4 +/* B35CC4 802410F4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B35CC8 802410F8 AFB10014 */ sw $s1, 0x14($sp) +/* B35CCC 802410FC 0080882D */ daddu $s1, $a0, $zero +/* B35CD0 80241100 AFBF001C */ sw $ra, 0x1c($sp) +/* B35CD4 80241104 AFB20018 */ sw $s2, 0x18($sp) +/* B35CD8 80241108 AFB00010 */ sw $s0, 0x10($sp) +/* B35CDC 8024110C 8E300148 */ lw $s0, 0x148($s1) +/* B35CE0 80241110 86040008 */ lh $a0, 8($s0) +/* B35CE4 80241114 0C00EABB */ jal get_npc_unsafe +/* B35CE8 80241118 00A0902D */ daddu $s2, $a1, $zero +/* B35CEC 8024111C 8E0300D0 */ lw $v1, 0xd0($s0) +/* B35CF0 80241120 8E240078 */ lw $a0, 0x78($s1) +/* B35CF4 80241124 8C630000 */ lw $v1, ($v1) +/* B35CF8 80241128 0083182A */ slt $v1, $a0, $v1 +/* B35CFC 8024112C 10600013 */ beqz $v1, .L8024117C +/* B35D00 80241130 0040302D */ daddu $a2, $v0, $zero +/* B35D04 80241134 00041040 */ sll $v0, $a0, 1 +/* B35D08 80241138 00441021 */ addu $v0, $v0, $a0 +/* B35D0C 8024113C 00022880 */ sll $a1, $v0, 2 +.L80241140: +/* B35D10 80241140 8E0300D0 */ lw $v1, 0xd0($s0) +/* B35D14 80241144 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* B35D18 80241148 00A31021 */ addu $v0, $a1, $v1 +/* B35D1C 8024114C C4400008 */ lwc1 $f0, 8($v0) +/* B35D20 80241150 46800020 */ cvt.s.w $f0, $f0 +/* B35D24 80241154 4602003E */ c.le.s $f0, $f2 +/* B35D28 80241158 00000000 */ nop +/* B35D2C 8024115C 45020003 */ bc1fl .L8024116C +/* B35D30 80241160 24840001 */ addiu $a0, $a0, 1 +/* B35D34 80241164 0809045F */ j .L8024117C +/* B35D38 80241168 AE240078 */ sw $a0, 0x78($s1) +.L8024116C: +/* B35D3C 8024116C 8C620000 */ lw $v0, ($v1) +/* B35D40 80241170 0082102A */ slt $v0, $a0, $v0 +/* B35D44 80241174 1440FFF2 */ bnez $v0, .L80241140 +/* B35D48 80241178 24A5000C */ addiu $a1, $a1, 0xc +.L8024117C: +/* B35D4C 8024117C C6400000 */ lwc1 $f0, ($s2) +/* B35D50 80241180 E4C00018 */ swc1 $f0, 0x18($a2) +/* B35D54 80241184 8E0200CC */ lw $v0, 0xcc($s0) +/* B35D58 80241188 8C420004 */ lw $v0, 4($v0) +/* B35D5C 8024118C ACC20028 */ sw $v0, 0x28($a2) +/* B35D60 80241190 24020001 */ addiu $v0, $zero, 1 +/* B35D64 80241194 AE200074 */ sw $zero, 0x74($s1) +/* B35D68 80241198 AE220070 */ sw $v0, 0x70($s1) +/* B35D6C 8024119C 8FBF001C */ lw $ra, 0x1c($sp) +/* B35D70 802411A0 8FB20018 */ lw $s2, 0x18($sp) +/* B35D74 802411A4 8FB10014 */ lw $s1, 0x14($sp) +/* B35D78 802411A8 8FB00010 */ lw $s0, 0x10($sp) +/* B35D7C 802411AC 03E00008 */ jr $ra +/* B35D80 802411B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s index 2c7ac5aa27..53561bc3a1 100644 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802411B4_B35D84.s @@ -131,27 +131,27 @@ glabel func_802411B4_B35D84 /* B35F64 80241394 00000000 */ nop /* B35F68 80241398 0280202D */ daddu $a0, $s4, $zero /* B35F6C 8024139C 0260282D */ daddu $a1, $s3, $zero -/* B35F70 802413A0 0C090188 */ jal func_80240620 +/* B35F70 802413A0 0C090188 */ jal func_80240620_B351F0 /* B35F74 802413A4 02A0302D */ daddu $a2, $s5, $zero /* B35F78 802413A8 0280202D */ daddu $a0, $s4, $zero /* B35F7C 802413AC 0260282D */ daddu $a1, $s3, $zero -/* B35F80 802413B0 0C0901DE */ jal func_80240778 +/* B35F80 802413B0 0C0901DE */ jal func_80240778_B35348 /* B35F84 802413B4 02A0302D */ daddu $a2, $s5, $zero /* B35F88 802413B8 08090522 */ j .L80241488 /* B35F8C 802413BC 00000000 */ nop /* B35F90 802413C0 0280202D */ daddu $a0, $s4, $zero /* B35F94 802413C4 0260282D */ daddu $a1, $s3, $zero -/* B35F98 802413C8 0C090288 */ jal func_80240A20 +/* B35F98 802413C8 0C090288 */ jal func_80240A20_B355F0 /* B35F9C 802413CC 02A0302D */ daddu $a2, $s5, $zero /* B35FA0 802413D0 0280202D */ daddu $a0, $s4, $zero /* B35FA4 802413D4 0260282D */ daddu $a1, $s3, $zero -/* B35FA8 802413D8 0C0902B8 */ jal func_80240AE0 +/* B35FA8 802413D8 0C0902B8 */ jal func_80240AE0_B356B0 /* B35FAC 802413DC 02A0302D */ daddu $a2, $s5, $zero /* B35FB0 802413E0 08090522 */ j .L80241488 /* B35FB4 802413E4 00000000 */ nop /* B35FB8 802413E8 0280202D */ daddu $a0, $s4, $zero /* B35FBC 802413EC 0260282D */ daddu $a1, $s3, $zero -/* B35FC0 802413F0 0C090327 */ jal func_80240C9C +/* B35FC0 802413F0 0C090327 */ jal func_80240C9C_B3586C /* B35FC4 802413F4 02A0302D */ daddu $a2, $s5, $zero /* B35FC8 802413F8 08090522 */ j .L80241488 /* B35FCC 802413FC 00000000 */ nop @@ -161,29 +161,29 @@ glabel func_802411B4_B35D84 /* B35FDC 8024140C 02A0302D */ daddu $a2, $s5, $zero /* B35FE0 80241410 0280202D */ daddu $a0, $s4, $zero /* B35FE4 80241414 0260282D */ daddu $a1, $s3, $zero -/* B35FE8 80241418 0C090371 */ jal func_80240DC4 +/* B35FE8 80241418 0C090371 */ jal func_80240DC4_B35994 /* B35FEC 8024141C 02A0302D */ daddu $a2, $s5, $zero /* B35FF0 80241420 08090522 */ j .L80241488 /* B35FF4 80241424 00000000 */ nop /* B35FF8 80241428 0280202D */ daddu $a0, $s4, $zero /* B35FFC 8024142C 0260282D */ daddu $a1, $s3, $zero -/* B36000 80241430 0C09038F */ jal func_80240E3C +/* B36000 80241430 0C09038F */ jal func_80240E3C_B35A0C /* B36004 80241434 02A0302D */ daddu $a2, $s5, $zero /* B36008 80241438 0280202D */ daddu $a0, $s4, $zero /* B3600C 8024143C 0260282D */ daddu $a1, $s3, $zero -/* B36010 80241440 0C0903DB */ jal func_80240F6C +/* B36010 80241440 0C0903DB */ jal func_80240F6C_B35B3C /* B36014 80241444 02A0302D */ daddu $a2, $s5, $zero /* B36018 80241448 08090522 */ j .L80241488 /* B3601C 8024144C 00000000 */ nop /* B36020 80241450 0280202D */ daddu $a0, $s4, $zero /* B36024 80241454 0260282D */ daddu $a1, $s3, $zero -/* B36028 80241458 0C090423 */ jal func_8024108C +/* B36028 80241458 0C090423 */ jal func_8024108C_B35C5C /* B3602C 8024145C 02A0302D */ daddu $a2, $s5, $zero /* B36030 80241460 08090522 */ j .L80241488 /* B36034 80241464 00000000 */ nop /* B36038 80241468 0280202D */ daddu $a0, $s4, $zero /* B3603C 8024146C 0260282D */ daddu $a1, $s3, $zero -/* B36040 80241470 0C09043D */ jal func_802410F4 +/* B36040 80241470 0C09043D */ jal func_802410F4_B35CC4 /* B36044 80241474 02A0302D */ daddu $a2, $s5, $zero /* B36048 80241478 08090522 */ j .L80241488 /* B3604C 8024147C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0.s deleted file mode 100644 index 7b74b4b353..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414D0 -/* B360A0 802414D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B360A4 802414D4 AFBF0010 */ sw $ra, 0x10($sp) -/* B360A8 802414D8 0C03A631 */ jal func_800E98C4 -/* B360AC 802414DC 00000000 */ nop -/* B360B0 802414E0 0C03A6DB */ jal sync_status_menu -/* B360B4 802414E4 00000000 */ nop -/* B360B8 802414E8 8FBF0010 */ lw $ra, 0x10($sp) -/* B360BC 802414EC 24020002 */ addiu $v0, $zero, 2 -/* B360C0 802414F0 03E00008 */ jr $ra -/* B360C4 802414F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s new file mode 100644 index 0000000000..bc22b1c1ed --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414D0_B360A0 +/* B360A0 802414D0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B360A4 802414D4 AFBF0010 */ sw $ra, 0x10($sp) +/* B360A8 802414D8 0C03A631 */ jal func_800E98C4 +/* B360AC 802414DC 00000000 */ nop +/* B360B0 802414E0 0C03A6DB */ jal sync_status_menu +/* B360B4 802414E4 00000000 */ nop +/* B360B8 802414E8 8FBF0010 */ lw $ra, 0x10($sp) +/* B360BC 802414EC 24020002 */ addiu $v0, $zero, 2 +/* B360C0 802414F0 03E00008 */ jr $ra +/* B360C4 802414F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574.s deleted file mode 100644 index c8d1313a22..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241574 -/* B36144 80241574 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B36148 80241578 AFB10014 */ sw $s1, 0x14($sp) -/* B3614C 8024157C 0080882D */ daddu $s1, $a0, $zero -/* B36150 80241580 AFBF0018 */ sw $ra, 0x18($sp) -/* B36154 80241584 AFB00010 */ sw $s0, 0x10($sp) -/* B36158 80241588 8E30000C */ lw $s0, 0xc($s1) -/* B3615C 8024158C 8E050000 */ lw $a1, ($s0) -/* B36160 80241590 0C0B1EAF */ jal get_variable -/* B36164 80241594 26100004 */ addiu $s0, $s0, 4 -/* B36168 80241598 0220202D */ daddu $a0, $s1, $zero -/* B3616C 8024159C 8E050000 */ lw $a1, ($s0) -/* B36170 802415A0 0C0B1EAF */ jal get_variable -/* B36174 802415A4 0040802D */ daddu $s0, $v0, $zero -/* B36178 802415A8 44820000 */ mtc1 $v0, $f0 -/* B3617C 802415AC 00000000 */ nop -/* B36180 802415B0 46800020 */ cvt.s.w $f0, $f0 -/* B36184 802415B4 24020002 */ addiu $v0, $zero, 2 -/* B36188 802415B8 00501804 */ sllv $v1, $s0, $v0 -/* B3618C 802415BC 00701821 */ addu $v1, $v1, $s0 -/* B36190 802415C0 00431804 */ sllv $v1, $v1, $v0 -/* B36194 802415C4 00701823 */ subu $v1, $v1, $s0 -/* B36198 802415C8 000320C0 */ sll $a0, $v1, 3 -/* B3619C 802415CC 00641821 */ addu $v1, $v1, $a0 -/* B361A0 802415D0 000318C0 */ sll $v1, $v1, 3 -/* B361A4 802415D4 3C01800B */ lui $at, 0x800b -/* B361A8 802415D8 00230821 */ addu $at, $at, $v1 -/* B361AC 802415DC E4201D98 */ swc1 $f0, 0x1d98($at) -/* B361B0 802415E0 8FBF0018 */ lw $ra, 0x18($sp) -/* B361B4 802415E4 8FB10014 */ lw $s1, 0x14($sp) -/* B361B8 802415E8 8FB00010 */ lw $s0, 0x10($sp) -/* B361BC 802415EC 03E00008 */ jr $ra -/* B361C0 802415F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s new file mode 100644 index 0000000000..a70c9e640a --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241574_B36144.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241574_B36144 +/* B36144 80241574 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B36148 80241578 AFB10014 */ sw $s1, 0x14($sp) +/* B3614C 8024157C 0080882D */ daddu $s1, $a0, $zero +/* B36150 80241580 AFBF0018 */ sw $ra, 0x18($sp) +/* B36154 80241584 AFB00010 */ sw $s0, 0x10($sp) +/* B36158 80241588 8E30000C */ lw $s0, 0xc($s1) +/* B3615C 8024158C 8E050000 */ lw $a1, ($s0) +/* B36160 80241590 0C0B1EAF */ jal get_variable +/* B36164 80241594 26100004 */ addiu $s0, $s0, 4 +/* B36168 80241598 0220202D */ daddu $a0, $s1, $zero +/* B3616C 8024159C 8E050000 */ lw $a1, ($s0) +/* B36170 802415A0 0C0B1EAF */ jal get_variable +/* B36174 802415A4 0040802D */ daddu $s0, $v0, $zero +/* B36178 802415A8 44820000 */ mtc1 $v0, $f0 +/* B3617C 802415AC 00000000 */ nop +/* B36180 802415B0 46800020 */ cvt.s.w $f0, $f0 +/* B36184 802415B4 24020002 */ addiu $v0, $zero, 2 +/* B36188 802415B8 00501804 */ sllv $v1, $s0, $v0 +/* B3618C 802415BC 00701821 */ addu $v1, $v1, $s0 +/* B36190 802415C0 00431804 */ sllv $v1, $v1, $v0 +/* B36194 802415C4 00701823 */ subu $v1, $v1, $s0 +/* B36198 802415C8 000320C0 */ sll $a0, $v1, 3 +/* B3619C 802415CC 00641821 */ addu $v1, $v1, $a0 +/* B361A0 802415D0 000318C0 */ sll $v1, $v1, 3 +/* B361A4 802415D4 3C01800B */ lui $at, 0x800b +/* B361A8 802415D8 00230821 */ addu $at, $at, $v1 +/* B361AC 802415DC E4201D98 */ swc1 $f0, 0x1d98($at) +/* B361B0 802415E0 8FBF0018 */ lw $ra, 0x18($sp) +/* B361B4 802415E4 8FB10014 */ lw $s1, 0x14($sp) +/* B361B8 802415E8 8FB00010 */ lw $s0, 0x10($sp) +/* B361BC 802415EC 03E00008 */ jr $ra +/* B361C0 802415F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4.s deleted file mode 100644 index dfb1a4fa58..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415F4 -/* B361C4 802415F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B361C8 802415F8 AFBF0010 */ sw $ra, 0x10($sp) -/* B361CC 802415FC 8C82000C */ lw $v0, 0xc($a0) -/* B361D0 80241600 0C0B1EAF */ jal get_variable -/* B361D4 80241604 8C450000 */ lw $a1, ($v0) -/* B361D8 80241608 0C0B1059 */ jal does_script_exist -/* B361DC 8024160C 0040202D */ daddu $a0, $v0, $zero -/* B361E0 80241610 2C420001 */ sltiu $v0, $v0, 1 -/* B361E4 80241614 8FBF0010 */ lw $ra, 0x10($sp) -/* B361E8 80241618 00021040 */ sll $v0, $v0, 1 -/* B361EC 8024161C 03E00008 */ jr $ra -/* B361F0 80241620 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s new file mode 100644 index 0000000000..c25aeba348 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415F4_B361C4 +/* B361C4 802415F4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B361C8 802415F8 AFBF0010 */ sw $ra, 0x10($sp) +/* B361CC 802415FC 8C82000C */ lw $v0, 0xc($a0) +/* B361D0 80241600 0C0B1EAF */ jal get_variable +/* B361D4 80241604 8C450000 */ lw $a1, ($v0) +/* B361D8 80241608 0C0B1059 */ jal does_script_exist +/* B361DC 8024160C 0040202D */ daddu $a0, $v0, $zero +/* B361E0 80241610 2C420001 */ sltiu $v0, $v0, 1 +/* B361E4 80241614 8FBF0010 */ lw $ra, 0x10($sp) +/* B361E8 80241618 00021040 */ sll $v0, $v0, 1 +/* B361EC 8024161C 03E00008 */ jr $ra +/* B361F0 80241620 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624.s deleted file mode 100644 index 0e7d72ca0f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241624 -/* B361F4 80241624 3C028011 */ lui $v0, 0x8011 -/* B361F8 80241628 8042F2A2 */ lb $v0, -0xd5e($v0) -/* B361FC 8024162C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36200 80241630 10400003 */ beqz $v0, .L80241640 -/* B36204 80241634 AFBF0010 */ sw $ra, 0x10($sp) -/* B36208 80241638 0C03AE06 */ jal partner_suspend_ability_script -/* B3620C 8024163C 00000000 */ nop -.L80241640: -/* B36210 80241640 24020002 */ addiu $v0, $zero, 2 -/* B36214 80241644 8FBF0010 */ lw $ra, 0x10($sp) -/* B36218 80241648 03E00008 */ jr $ra -/* B3621C 8024164C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s new file mode 100644 index 0000000000..26f5f5a757 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241624_B361F4 +/* B361F4 80241624 3C028011 */ lui $v0, 0x8011 +/* B361F8 80241628 8042F2A2 */ lb $v0, -0xd5e($v0) +/* B361FC 8024162C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B36200 80241630 10400003 */ beqz $v0, .L80241640 +/* B36204 80241634 AFBF0010 */ sw $ra, 0x10($sp) +/* B36208 80241638 0C03AE06 */ jal partner_suspend_ability_script +/* B3620C 8024163C 00000000 */ nop +.L80241640: +/* B36210 80241640 24020002 */ addiu $v0, $zero, 2 +/* B36214 80241644 8FBF0010 */ lw $ra, 0x10($sp) +/* B36218 80241648 03E00008 */ jr $ra +/* B3621C 8024164C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670.s deleted file mode 100644 index f6abcf055e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241670 -/* B36240 80241670 3C058011 */ lui $a1, %hi(gPlayerData) -/* B36244 80241674 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* B36248 80241678 AC800088 */ sw $zero, 0x88($a0) -/* B3624C 8024167C 80A30003 */ lb $v1, 3($a1) -/* B36250 80241680 80A20002 */ lb $v0, 2($a1) -/* B36254 80241684 1462000B */ bne $v1, $v0, .L802416B4 -/* B36258 80241688 00A0302D */ daddu $a2, $a1, $zero -/* B3625C 8024168C 80A30006 */ lb $v1, 6($a1) -/* B36260 80241690 80A20005 */ lb $v0, 5($a1) -/* B36264 80241694 14620007 */ bne $v1, $v0, .L802416B4 -/* B36268 80241698 00000000 */ nop -/* B3626C 8024169C 80C2028E */ lb $v0, 0x28e($a2) -/* B36270 802416A0 84C30290 */ lh $v1, 0x290($a2) -/* B36274 802416A4 00021200 */ sll $v0, $v0, 8 -/* B36278 802416A8 14620004 */ bne $v1, $v0, .L802416BC -/* B3627C 802416AC 24020001 */ addiu $v0, $zero, 1 -/* B36280 802416B0 AC820088 */ sw $v0, 0x88($a0) -.L802416B4: -/* B36284 802416B4 03E00008 */ jr $ra -/* B36288 802416B8 24020002 */ addiu $v0, $zero, 2 -.L802416BC: -/* B3628C 802416BC 03E00008 */ jr $ra -/* B36290 802416C0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s new file mode 100644 index 0000000000..e343e3ec3c --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241670_B36240.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241670_B36240 +/* B36240 80241670 3C058011 */ lui $a1, %hi(gPlayerData) +/* B36244 80241674 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* B36248 80241678 AC800088 */ sw $zero, 0x88($a0) +/* B3624C 8024167C 80A30003 */ lb $v1, 3($a1) +/* B36250 80241680 80A20002 */ lb $v0, 2($a1) +/* B36254 80241684 1462000B */ bne $v1, $v0, .L802416B4 +/* B36258 80241688 00A0302D */ daddu $a2, $a1, $zero +/* B3625C 8024168C 80A30006 */ lb $v1, 6($a1) +/* B36260 80241690 80A20005 */ lb $v0, 5($a1) +/* B36264 80241694 14620007 */ bne $v1, $v0, .L802416B4 +/* B36268 80241698 00000000 */ nop +/* B3626C 8024169C 80C2028E */ lb $v0, 0x28e($a2) +/* B36270 802416A0 84C30290 */ lh $v1, 0x290($a2) +/* B36274 802416A4 00021200 */ sll $v0, $v0, 8 +/* B36278 802416A8 14620004 */ bne $v1, $v0, .L802416BC +/* B3627C 802416AC 24020001 */ addiu $v0, $zero, 1 +/* B36280 802416B0 AC820088 */ sw $v0, 0x88($a0) +.L802416B4: +/* B36284 802416B4 03E00008 */ jr $ra +/* B36288 802416B8 24020002 */ addiu $v0, $zero, 2 +.L802416BC: +/* B3628C 802416BC 03E00008 */ jr $ra +/* B36290 802416C0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8.s deleted file mode 100644 index 09a46eda32..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D8 -/* B365A8 802419D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B365AC 802419DC AFBF0010 */ sw $ra, 0x10($sp) -/* B365B0 802419E0 10A00003 */ beqz $a1, .L802419F0 -/* B365B4 802419E4 8C86000C */ lw $a2, 0xc($a0) -/* B365B8 802419E8 3C018024 */ lui $at, 0x8024 -/* B365BC 802419EC AC207444 */ sw $zero, 0x7444($at) -.L802419F0: -/* B365C0 802419F0 3C038024 */ lui $v1, 0x8024 -/* B365C4 802419F4 24637444 */ addiu $v1, $v1, 0x7444 -/* B365C8 802419F8 8C620000 */ lw $v0, ($v1) -/* B365CC 802419FC 54400003 */ bnel $v0, $zero, .L80241A0C -/* B365D0 80241A00 AC600000 */ sw $zero, ($v1) -/* B365D4 80241A04 08090688 */ j .L80241A20 -/* B365D8 80241A08 0000102D */ daddu $v0, $zero, $zero -.L80241A0C: -/* B365DC 80241A0C 8CC50000 */ lw $a1, ($a2) -/* B365E0 80241A10 3C068024 */ lui $a2, 0x8024 -/* B365E4 80241A14 0C0B2026 */ jal set_variable -/* B365E8 80241A18 8CC67448 */ lw $a2, 0x7448($a2) -/* B365EC 80241A1C 24020002 */ addiu $v0, $zero, 2 -.L80241A20: -/* B365F0 80241A20 8FBF0010 */ lw $ra, 0x10($sp) -/* B365F4 80241A24 03E00008 */ jr $ra -/* B365F8 80241A28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s new file mode 100644 index 0000000000..e0eefef0fc --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802419D8_B365A8.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419D8_B365A8 +/* B365A8 802419D8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B365AC 802419DC AFBF0010 */ sw $ra, 0x10($sp) +/* B365B0 802419E0 10A00003 */ beqz $a1, .L802419F0 +/* B365B4 802419E4 8C86000C */ lw $a2, 0xc($a0) +/* B365B8 802419E8 3C018024 */ lui $at, 0x8024 +/* B365BC 802419EC AC207444 */ sw $zero, 0x7444($at) +.L802419F0: +/* B365C0 802419F0 3C038024 */ lui $v1, 0x8024 +/* B365C4 802419F4 24637444 */ addiu $v1, $v1, 0x7444 +/* B365C8 802419F8 8C620000 */ lw $v0, ($v1) +/* B365CC 802419FC 54400003 */ bnel $v0, $zero, .L80241A0C +/* B365D0 80241A00 AC600000 */ sw $zero, ($v1) +/* B365D4 80241A04 08090688 */ j .L80241A20 +/* B365D8 80241A08 0000102D */ daddu $v0, $zero, $zero +.L80241A0C: +/* B365DC 80241A0C 8CC50000 */ lw $a1, ($a2) +/* B365E0 80241A10 3C068024 */ lui $a2, 0x8024 +/* B365E4 80241A14 0C0B2026 */ jal set_variable +/* B365E8 80241A18 8CC67448 */ lw $a2, 0x7448($a2) +/* B365EC 80241A1C 24020002 */ addiu $v0, $zero, 2 +.L80241A20: +/* B365F0 80241A20 8FBF0010 */ lw $ra, 0x10($sp) +/* B365F4 80241A24 03E00008 */ jr $ra +/* B365F8 80241A28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C.s deleted file mode 100644 index ac473d4c72..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A2C -/* B365FC 80241A2C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36600 80241A30 AFBF0010 */ sw $ra, 0x10($sp) -/* B36604 80241A34 8C82000C */ lw $v0, 0xc($a0) -/* B36608 80241A38 0C0B1EAF */ jal get_variable -/* B3660C 80241A3C 8C450000 */ lw $a1, ($v0) -/* B36610 80241A40 3C018024 */ lui $at, 0x8024 -/* B36614 80241A44 AC227448 */ sw $v0, 0x7448($at) -/* B36618 80241A48 24020002 */ addiu $v0, $zero, 2 -/* B3661C 80241A4C 8FBF0010 */ lw $ra, 0x10($sp) -/* B36620 80241A50 24030001 */ addiu $v1, $zero, 1 -/* B36624 80241A54 3C018024 */ lui $at, 0x8024 -/* B36628 80241A58 AC237444 */ sw $v1, 0x7444($at) -/* B3662C 80241A5C 03E00008 */ jr $ra -/* B36630 80241A60 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s new file mode 100644 index 0000000000..2a615299ce --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241A2C_B365FC.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A2C_B365FC +/* B365FC 80241A2C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B36600 80241A30 AFBF0010 */ sw $ra, 0x10($sp) +/* B36604 80241A34 8C82000C */ lw $v0, 0xc($a0) +/* B36608 80241A38 0C0B1EAF */ jal get_variable +/* B3660C 80241A3C 8C450000 */ lw $a1, ($v0) +/* B36610 80241A40 3C018024 */ lui $at, 0x8024 +/* B36614 80241A44 AC227448 */ sw $v0, 0x7448($at) +/* B36618 80241A48 24020002 */ addiu $v0, $zero, 2 +/* B3661C 80241A4C 8FBF0010 */ lw $ra, 0x10($sp) +/* B36620 80241A50 24030001 */ addiu $v1, $zero, 1 +/* B36624 80241A54 3C018024 */ lui $at, 0x8024 +/* B36628 80241A58 AC237444 */ sw $v1, 0x7444($at) +/* B3662C 80241A5C 03E00008 */ jr $ra +/* B36630 80241A60 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00.s deleted file mode 100644 index 044550dca0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B00 -/* B366D0 80241B00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B366D4 80241B04 AFBF0010 */ sw $ra, 0x10($sp) -/* B366D8 80241B08 8C82000C */ lw $v0, 0xc($a0) -/* B366DC 80241B0C 0C0B1EAF */ jal get_variable -/* B366E0 80241B10 8C450000 */ lw $a1, ($v0) -/* B366E4 80241B14 0040182D */ daddu $v1, $v0, $zero -/* B366E8 80241B18 10600012 */ beqz $v1, .L80241B64 -/* B366EC 80241B1C 0000202D */ daddu $a0, $zero, $zero -/* B366F0 80241B20 8C620000 */ lw $v0, ($v1) -/* B366F4 80241B24 5040000A */ beql $v0, $zero, .L80241B50 -/* B366F8 80241B28 00041080 */ sll $v0, $a0, 2 -/* B366FC 80241B2C 3C058025 */ lui $a1, 0x8025 -/* B36700 80241B30 24A5FD68 */ addiu $a1, $a1, -0x298 -.L80241B34: -/* B36704 80241B34 24630004 */ addiu $v1, $v1, 4 -/* B36708 80241B38 24840001 */ addiu $a0, $a0, 1 -/* B3670C 80241B3C ACA20000 */ sw $v0, ($a1) -/* B36710 80241B40 8C620000 */ lw $v0, ($v1) -/* B36714 80241B44 1440FFFB */ bnez $v0, .L80241B34 -/* B36718 80241B48 24A50004 */ addiu $a1, $a1, 4 -/* B3671C 80241B4C 00041080 */ sll $v0, $a0, 2 -.L80241B50: -/* B36720 80241B50 3C018025 */ lui $at, 0x8025 -/* B36724 80241B54 00220821 */ addu $at, $at, $v0 -/* B36728 80241B58 AC20FD68 */ sw $zero, -0x298($at) -/* B3672C 80241B5C 080906E3 */ j .L80241B8C -/* B36730 80241B60 00000000 */ nop -.L80241B64: -/* B36734 80241B64 3C038025 */ lui $v1, 0x8025 -/* B36738 80241B68 2463FD68 */ addiu $v1, $v1, -0x298 -/* B3673C 80241B6C 0060282D */ daddu $a1, $v1, $zero -.L80241B70: -/* B36740 80241B70 24820080 */ addiu $v0, $a0, 0x80 -/* B36744 80241B74 AC620000 */ sw $v0, ($v1) -/* B36748 80241B78 24630004 */ addiu $v1, $v1, 4 -/* B3674C 80241B7C 24840001 */ addiu $a0, $a0, 1 -/* B36750 80241B80 2882005B */ slti $v0, $a0, 0x5b -/* B36754 80241B84 1440FFFA */ bnez $v0, .L80241B70 -/* B36758 80241B88 ACA0016C */ sw $zero, 0x16c($a1) -.L80241B8C: -/* B3675C 80241B8C 8FBF0010 */ lw $ra, 0x10($sp) -/* B36760 80241B90 24020002 */ addiu $v0, $zero, 2 -/* B36764 80241B94 03E00008 */ jr $ra -/* B36768 80241B98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s new file mode 100644 index 0000000000..2f9df6327e --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B00_B366D0.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B00_B366D0 +/* B366D0 80241B00 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B366D4 80241B04 AFBF0010 */ sw $ra, 0x10($sp) +/* B366D8 80241B08 8C82000C */ lw $v0, 0xc($a0) +/* B366DC 80241B0C 0C0B1EAF */ jal get_variable +/* B366E0 80241B10 8C450000 */ lw $a1, ($v0) +/* B366E4 80241B14 0040182D */ daddu $v1, $v0, $zero +/* B366E8 80241B18 10600012 */ beqz $v1, .L80241B64 +/* B366EC 80241B1C 0000202D */ daddu $a0, $zero, $zero +/* B366F0 80241B20 8C620000 */ lw $v0, ($v1) +/* B366F4 80241B24 5040000A */ beql $v0, $zero, .L80241B50 +/* B366F8 80241B28 00041080 */ sll $v0, $a0, 2 +/* B366FC 80241B2C 3C058025 */ lui $a1, 0x8025 +/* B36700 80241B30 24A5FD68 */ addiu $a1, $a1, -0x298 +.L80241B34: +/* B36704 80241B34 24630004 */ addiu $v1, $v1, 4 +/* B36708 80241B38 24840001 */ addiu $a0, $a0, 1 +/* B3670C 80241B3C ACA20000 */ sw $v0, ($a1) +/* B36710 80241B40 8C620000 */ lw $v0, ($v1) +/* B36714 80241B44 1440FFFB */ bnez $v0, .L80241B34 +/* B36718 80241B48 24A50004 */ addiu $a1, $a1, 4 +/* B3671C 80241B4C 00041080 */ sll $v0, $a0, 2 +.L80241B50: +/* B36720 80241B50 3C018025 */ lui $at, 0x8025 +/* B36724 80241B54 00220821 */ addu $at, $at, $v0 +/* B36728 80241B58 AC20FD68 */ sw $zero, -0x298($at) +/* B3672C 80241B5C 080906E3 */ j .L80241B8C +/* B36730 80241B60 00000000 */ nop +.L80241B64: +/* B36734 80241B64 3C038025 */ lui $v1, 0x8025 +/* B36738 80241B68 2463FD68 */ addiu $v1, $v1, -0x298 +/* B3673C 80241B6C 0060282D */ daddu $a1, $v1, $zero +.L80241B70: +/* B36740 80241B70 24820080 */ addiu $v0, $a0, 0x80 +/* B36744 80241B74 AC620000 */ sw $v0, ($v1) +/* B36748 80241B78 24630004 */ addiu $v1, $v1, 4 +/* B3674C 80241B7C 24840001 */ addiu $a0, $a0, 1 +/* B36750 80241B80 2882005B */ slti $v0, $a0, 0x5b +/* B36754 80241B84 1440FFFA */ bnez $v0, .L80241B70 +/* B36758 80241B88 ACA0016C */ sw $zero, 0x16c($a1) +.L80241B8C: +/* B3675C 80241B8C 8FBF0010 */ lw $ra, 0x10($sp) +/* B36760 80241B90 24020002 */ addiu $v0, $zero, 2 +/* B36764 80241B94 03E00008 */ jr $ra +/* B36768 80241B98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C.s deleted file mode 100644 index 68978dd701..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B9C -/* B3676C 80241B9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B36770 80241BA0 AFB00010 */ sw $s0, 0x10($sp) -/* B36774 80241BA4 3C108024 */ lui $s0, 0x8024 -/* B36778 80241BA8 26107764 */ addiu $s0, $s0, 0x7764 -/* B3677C 80241BAC AFBF0018 */ sw $ra, 0x18($sp) -/* B36780 80241BB0 AFB10014 */ sw $s1, 0x14($sp) -/* B36784 80241BB4 8E020000 */ lw $v0, ($s0) -/* B36788 80241BB8 14400010 */ bnez $v0, .L80241BFC -/* B3678C 80241BBC 0080882D */ daddu $s1, $a0, $zero -/* B36790 80241BC0 0C00AB39 */ jal heap_malloc -/* B36794 80241BC4 24040040 */ addiu $a0, $zero, 0x40 -/* B36798 80241BC8 AE020000 */ sw $v0, ($s0) -/* B3679C 80241BCC 0000182D */ daddu $v1, $zero, $zero -/* B367A0 80241BD0 0040282D */ daddu $a1, $v0, $zero -/* B367A4 80241BD4 0220202D */ daddu $a0, $s1, $zero -.L80241BD8: -/* B367A8 80241BD8 8C820084 */ lw $v0, 0x84($a0) -/* B367AC 80241BDC 24840004 */ addiu $a0, $a0, 4 -/* B367B0 80241BE0 24630001 */ addiu $v1, $v1, 1 -/* B367B4 80241BE4 ACA20000 */ sw $v0, ($a1) -/* B367B8 80241BE8 28620010 */ slti $v0, $v1, 0x10 -/* B367BC 80241BEC 1440FFFA */ bnez $v0, .L80241BD8 -/* B367C0 80241BF0 24A50004 */ addiu $a1, $a1, 4 -/* B367C4 80241BF4 0809070E */ j .L80241C38 -/* B367C8 80241BF8 00000000 */ nop -.L80241BFC: -/* B367CC 80241BFC 0000182D */ daddu $v1, $zero, $zero -/* B367D0 80241C00 0040282D */ daddu $a1, $v0, $zero -/* B367D4 80241C04 0220202D */ daddu $a0, $s1, $zero -.L80241C08: -/* B367D8 80241C08 8CA20000 */ lw $v0, ($a1) -/* B367DC 80241C0C 24A50004 */ addiu $a1, $a1, 4 -/* B367E0 80241C10 24630001 */ addiu $v1, $v1, 1 -/* B367E4 80241C14 AC820084 */ sw $v0, 0x84($a0) -/* B367E8 80241C18 28620010 */ slti $v0, $v1, 0x10 -/* B367EC 80241C1C 1440FFFA */ bnez $v0, .L80241C08 -/* B367F0 80241C20 24840004 */ addiu $a0, $a0, 4 -/* B367F4 80241C24 3C108024 */ lui $s0, 0x8024 -/* B367F8 80241C28 26107764 */ addiu $s0, $s0, 0x7764 -/* B367FC 80241C2C 0C00AB4B */ jal heap_free -/* B36800 80241C30 8E040000 */ lw $a0, ($s0) -/* B36804 80241C34 AE000000 */ sw $zero, ($s0) -.L80241C38: -/* B36808 80241C38 8FBF0018 */ lw $ra, 0x18($sp) -/* B3680C 80241C3C 8FB10014 */ lw $s1, 0x14($sp) -/* B36810 80241C40 8FB00010 */ lw $s0, 0x10($sp) -/* B36814 80241C44 24020002 */ addiu $v0, $zero, 2 -/* B36818 80241C48 03E00008 */ jr $ra -/* B3681C 80241C4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s new file mode 100644 index 0000000000..97f86ce28a --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241B9C_B3676C.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B9C_B3676C +/* B3676C 80241B9C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B36770 80241BA0 AFB00010 */ sw $s0, 0x10($sp) +/* B36774 80241BA4 3C108024 */ lui $s0, 0x8024 +/* B36778 80241BA8 26107764 */ addiu $s0, $s0, 0x7764 +/* B3677C 80241BAC AFBF0018 */ sw $ra, 0x18($sp) +/* B36780 80241BB0 AFB10014 */ sw $s1, 0x14($sp) +/* B36784 80241BB4 8E020000 */ lw $v0, ($s0) +/* B36788 80241BB8 14400010 */ bnez $v0, .L80241BFC +/* B3678C 80241BBC 0080882D */ daddu $s1, $a0, $zero +/* B36790 80241BC0 0C00AB39 */ jal heap_malloc +/* B36794 80241BC4 24040040 */ addiu $a0, $zero, 0x40 +/* B36798 80241BC8 AE020000 */ sw $v0, ($s0) +/* B3679C 80241BCC 0000182D */ daddu $v1, $zero, $zero +/* B367A0 80241BD0 0040282D */ daddu $a1, $v0, $zero +/* B367A4 80241BD4 0220202D */ daddu $a0, $s1, $zero +.L80241BD8: +/* B367A8 80241BD8 8C820084 */ lw $v0, 0x84($a0) +/* B367AC 80241BDC 24840004 */ addiu $a0, $a0, 4 +/* B367B0 80241BE0 24630001 */ addiu $v1, $v1, 1 +/* B367B4 80241BE4 ACA20000 */ sw $v0, ($a1) +/* B367B8 80241BE8 28620010 */ slti $v0, $v1, 0x10 +/* B367BC 80241BEC 1440FFFA */ bnez $v0, .L80241BD8 +/* B367C0 80241BF0 24A50004 */ addiu $a1, $a1, 4 +/* B367C4 80241BF4 0809070E */ j .L80241C38 +/* B367C8 80241BF8 00000000 */ nop +.L80241BFC: +/* B367CC 80241BFC 0000182D */ daddu $v1, $zero, $zero +/* B367D0 80241C00 0040282D */ daddu $a1, $v0, $zero +/* B367D4 80241C04 0220202D */ daddu $a0, $s1, $zero +.L80241C08: +/* B367D8 80241C08 8CA20000 */ lw $v0, ($a1) +/* B367DC 80241C0C 24A50004 */ addiu $a1, $a1, 4 +/* B367E0 80241C10 24630001 */ addiu $v1, $v1, 1 +/* B367E4 80241C14 AC820084 */ sw $v0, 0x84($a0) +/* B367E8 80241C18 28620010 */ slti $v0, $v1, 0x10 +/* B367EC 80241C1C 1440FFFA */ bnez $v0, .L80241C08 +/* B367F0 80241C20 24840004 */ addiu $a0, $a0, 4 +/* B367F4 80241C24 3C108024 */ lui $s0, 0x8024 +/* B367F8 80241C28 26107764 */ addiu $s0, $s0, 0x7764 +/* B367FC 80241C2C 0C00AB4B */ jal heap_free +/* B36800 80241C30 8E040000 */ lw $a0, ($s0) +/* B36804 80241C34 AE000000 */ sw $zero, ($s0) +.L80241C38: +/* B36808 80241C38 8FBF0018 */ lw $ra, 0x18($sp) +/* B3680C 80241C3C 8FB10014 */ lw $s1, 0x14($sp) +/* B36810 80241C40 8FB00010 */ lw $s0, 0x10($sp) +/* B36814 80241C44 24020002 */ addiu $v0, $zero, 2 +/* B36818 80241C48 03E00008 */ jr $ra +/* B3681C 80241C4C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4.s deleted file mode 100644 index a9c3efc4d0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CB4 -/* B36884 80241CB4 24020001 */ addiu $v0, $zero, 1 -/* B36888 80241CB8 3C018015 */ lui $at, %hi(D_80151310) -/* B3688C 80241CBC AC221310 */ sw $v0, %lo(D_80151310)($at) -/* B36890 80241CC0 03E00008 */ jr $ra -/* B36894 80241CC4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s new file mode 100644 index 0000000000..09ed36b550 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CB4_B36884 +/* B36884 80241CB4 24020001 */ addiu $v0, $zero, 1 +/* B36888 80241CB8 3C018015 */ lui $at, %hi(D_80151310) +/* B3688C 80241CBC AC221310 */ sw $v0, %lo(D_80151310)($at) +/* B36890 80241CC0 03E00008 */ jr $ra +/* B36894 80241CC4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8.s deleted file mode 100644 index 5a82c6342c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CD8 -/* B368A8 80241CD8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B368AC 80241CDC AFB10024 */ sw $s1, 0x24($sp) -/* B368B0 80241CE0 0080882D */ daddu $s1, $a0, $zero -/* B368B4 80241CE4 3C05F840 */ lui $a1, 0xf840 -/* B368B8 80241CE8 AFBF0044 */ sw $ra, 0x44($sp) -/* B368BC 80241CEC AFBE0040 */ sw $fp, 0x40($sp) -/* B368C0 80241CF0 AFB7003C */ sw $s7, 0x3c($sp) -/* B368C4 80241CF4 AFB60038 */ sw $s6, 0x38($sp) -/* B368C8 80241CF8 AFB50034 */ sw $s5, 0x34($sp) -/* B368CC 80241CFC AFB40030 */ sw $s4, 0x30($sp) -/* B368D0 80241D00 AFB3002C */ sw $s3, 0x2c($sp) -/* B368D4 80241D04 AFB20028 */ sw $s2, 0x28($sp) -/* B368D8 80241D08 AFB00020 */ sw $s0, 0x20($sp) -/* B368DC 80241D0C 8E3E0148 */ lw $fp, 0x148($s1) -/* B368E0 80241D10 0C0B1EAF */ jal get_variable -/* B368E4 80241D14 34A56268 */ ori $a1, $a1, 0x6268 -/* B368E8 80241D18 0040802D */ daddu $s0, $v0, $zero -/* B368EC 80241D1C 0220202D */ daddu $a0, $s1, $zero -/* B368F0 80241D20 3C05F840 */ lui $a1, 0xf840 -/* B368F4 80241D24 0C0B1EAF */ jal get_variable -/* B368F8 80241D28 34A56269 */ ori $a1, $a1, 0x6269 -/* B368FC 80241D2C 0040B82D */ daddu $s7, $v0, $zero -/* B36900 80241D30 0220202D */ daddu $a0, $s1, $zero -/* B36904 80241D34 3C05F5DE */ lui $a1, 0xf5de -/* B36908 80241D38 0C0B1EAF */ jal get_variable -/* B3690C 80241D3C 34A502DE */ ori $a1, $a1, 0x2de -/* B36910 80241D40 0040B02D */ daddu $s6, $v0, $zero -/* B36914 80241D44 0220202D */ daddu $a0, $s1, $zero -/* B36918 80241D48 3C05F5DE */ lui $a1, 0xf5de -/* B3691C 80241D4C 0C0B1EAF */ jal get_variable -/* B36920 80241D50 34A502DF */ ori $a1, $a1, 0x2df -/* B36924 80241D54 0040A82D */ daddu $s5, $v0, $zero -/* B36928 80241D58 93D3006D */ lbu $s3, 0x6d($fp) -/* B3692C 80241D5C 32C2FFFF */ andi $v0, $s6, 0xffff -/* B36930 80241D60 A7B30010 */ sh $s3, 0x10($sp) -/* B36934 80241D64 93D2006E */ lbu $s2, 0x6e($fp) -/* B36938 80241D68 93C7006F */ lbu $a3, 0x6f($fp) -/* B3693C 80241D6C 3274FFFF */ andi $s4, $s3, 0xffff -/* B36940 80241D70 12820003 */ beq $s4, $v0, .L80241D80 -/* B36944 80241D74 A7A7001E */ sh $a3, 0x1e($sp) -/* B36948 80241D78 0000B82D */ daddu $s7, $zero, $zero -/* B3694C 80241D7C 02E0802D */ daddu $s0, $s7, $zero -.L80241D80: -/* B36950 80241D80 3202FFFF */ andi $v0, $s0, 0xffff -/* B36954 80241D84 14400016 */ bnez $v0, .L80241DE0 -/* B36958 80241D88 0220202D */ daddu $a0, $s1, $zero -/* B3695C 80241D8C 0C00A67F */ jal rand_int -/* B36960 80241D90 24040064 */ addiu $a0, $zero, 0x64 -/* B36964 80241D94 2842001E */ slti $v0, $v0, 0x1e -/* B36968 80241D98 10400011 */ beqz $v0, .L80241DE0 -/* B3696C 80241D9C 0220202D */ daddu $a0, $s1, $zero -/* B36970 80241DA0 0C00A67F */ jal rand_int -/* B36974 80241DA4 2644FFFF */ addiu $a0, $s2, -1 -/* B36978 80241DA8 0040A82D */ daddu $s5, $v0, $zero -/* B3697C 80241DAC 0260B02D */ daddu $s6, $s3, $zero -/* B36980 80241DB0 0220202D */ daddu $a0, $s1, $zero -/* B36984 80241DB4 3C05F5DE */ lui $a1, 0xf5de -/* B36988 80241DB8 34A502DE */ ori $a1, $a1, 0x2de -/* B3698C 80241DBC 0C0B2026 */ jal set_variable -/* B36990 80241DC0 0280302D */ daddu $a2, $s4, $zero -/* B36994 80241DC4 0220202D */ daddu $a0, $s1, $zero -/* B36998 80241DC8 3C05F5DE */ lui $a1, 0xf5de -/* B3699C 80241DCC 34A502DF */ ori $a1, $a1, 0x2df -/* B369A0 80241DD0 0C0B2026 */ jal set_variable -/* B369A4 80241DD4 32A6FFFF */ andi $a2, $s5, 0xffff -/* B369A8 80241DD8 24100001 */ addiu $s0, $zero, 1 -/* B369AC 80241DDC 0220202D */ daddu $a0, $s1, $zero -.L80241DE0: -/* B369B0 80241DE0 3C05F840 */ lui $a1, 0xf840 -/* B369B4 80241DE4 34A56268 */ ori $a1, $a1, 0x6268 -/* B369B8 80241DE8 0C0B2026 */ jal set_variable -/* B369BC 80241DEC 3206FFFF */ andi $a2, $s0, 0xffff -/* B369C0 80241DF0 0220202D */ daddu $a0, $s1, $zero -/* B369C4 80241DF4 3C05F840 */ lui $a1, 0xf840 -/* B369C8 80241DF8 34A56269 */ ori $a1, $a1, 0x6269 -/* B369CC 80241DFC 0C0B2026 */ jal set_variable -/* B369D0 80241E00 32E6FFFF */ andi $a2, $s7, 0xffff -/* B369D4 80241E04 0000202D */ daddu $a0, $zero, $zero -/* B369D8 80241E08 3C05F5DE */ lui $a1, 0xf5de -/* B369DC 80241E0C 0C0B1EAF */ jal get_variable -/* B369E0 80241E10 34A502E0 */ ori $a1, $a1, 0x2e0 -/* B369E4 80241E14 0000202D */ daddu $a0, $zero, $zero -/* B369E8 80241E18 3C05F5DE */ lui $a1, 0xf5de -/* B369EC 80241E1C 34A50180 */ ori $a1, $a1, 0x180 -/* B369F0 80241E20 0C0B1EAF */ jal get_variable -/* B369F4 80241E24 0040802D */ daddu $s0, $v0, $zero -/* B369F8 80241E28 0040282D */ daddu $a1, $v0, $zero -/* B369FC 80241E2C 0000182D */ daddu $v1, $zero, $zero -/* B36A00 80241E30 3C068024 */ lui $a2, 0x8024 -/* B36A04 80241E34 24C67808 */ addiu $a2, $a2, 0x7808 -/* B36A08 80241E38 00C0202D */ daddu $a0, $a2, $zero -.L80241E3C: -/* B36A0C 80241E3C 8C820000 */ lw $v0, ($a0) -/* B36A10 80241E40 00A2102A */ slt $v0, $a1, $v0 -/* B36A14 80241E44 14400006 */ bnez $v0, .L80241E60 -/* B36A18 80241E48 000310C0 */ sll $v0, $v1, 3 -/* B36A1C 80241E4C 24630001 */ addiu $v1, $v1, 1 -/* B36A20 80241E50 28620008 */ slti $v0, $v1, 8 -/* B36A24 80241E54 1440FFF9 */ bnez $v0, .L80241E3C -/* B36A28 80241E58 24840008 */ addiu $a0, $a0, 8 -/* B36A2C 80241E5C 000310C0 */ sll $v0, $v1, 3 -.L80241E60: -/* B36A30 80241E60 00461021 */ addu $v0, $v0, $a2 -/* B36A34 80241E64 8C420004 */ lw $v0, 4($v0) -/* B36A38 80241E68 97A30010 */ lhu $v1, 0x10($sp) -/* B36A3C 80241E6C 0202202A */ slt $a0, $s0, $v0 -/* B36A40 80241E70 32C2FFFF */ andi $v0, $s6, 0xffff -/* B36A44 80241E74 14620008 */ bne $v1, $v0, .L80241E98 -/* B36A48 80241E78 32A2FFFF */ andi $v0, $s5, 0xffff -/* B36A4C 80241E7C 97A7001E */ lhu $a3, 0x1e($sp) -/* B36A50 80241E80 14E20005 */ bne $a3, $v0, .L80241E98 -/* B36A54 80241E84 32E2FFFF */ andi $v0, $s7, 0xffff -/* B36A58 80241E88 14400003 */ bnez $v0, .L80241E98 -/* B36A5C 80241E8C 00000000 */ nop -/* B36A60 80241E90 14800008 */ bnez $a0, .L80241EB4 -/* B36A64 80241E94 24020001 */ addiu $v0, $zero, 1 -.L80241E98: -/* B36A68 80241E98 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B36A6C 80241E9C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B36A70 80241EA0 80420075 */ lb $v0, 0x75($v0) -/* B36A74 80241EA4 10400005 */ beqz $v0, .L80241EBC -/* B36A78 80241EA8 00000000 */ nop -/* B36A7C 80241EAC 10800003 */ beqz $a0, .L80241EBC -/* B36A80 80241EB0 24020001 */ addiu $v0, $zero, 1 -.L80241EB4: -/* B36A84 80241EB4 080907B2 */ j .L80241EC8 -/* B36A88 80241EB8 AE220084 */ sw $v0, 0x84($s1) -.L80241EBC: -/* B36A8C 80241EBC 0C00F9EB */ jal kill_enemy -/* B36A90 80241EC0 03C0202D */ daddu $a0, $fp, $zero -/* B36A94 80241EC4 AE200084 */ sw $zero, 0x84($s1) -.L80241EC8: -/* B36A98 80241EC8 8FBF0044 */ lw $ra, 0x44($sp) -/* B36A9C 80241ECC 8FBE0040 */ lw $fp, 0x40($sp) -/* B36AA0 80241ED0 8FB7003C */ lw $s7, 0x3c($sp) -/* B36AA4 80241ED4 8FB60038 */ lw $s6, 0x38($sp) -/* B36AA8 80241ED8 8FB50034 */ lw $s5, 0x34($sp) -/* B36AAC 80241EDC 8FB40030 */ lw $s4, 0x30($sp) -/* B36AB0 80241EE0 8FB3002C */ lw $s3, 0x2c($sp) -/* B36AB4 80241EE4 8FB20028 */ lw $s2, 0x28($sp) -/* B36AB8 80241EE8 8FB10024 */ lw $s1, 0x24($sp) -/* B36ABC 80241EEC 8FB00020 */ lw $s0, 0x20($sp) -/* B36AC0 80241EF0 24020002 */ addiu $v0, $zero, 2 -/* B36AC4 80241EF4 03E00008 */ jr $ra -/* B36AC8 80241EF8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s new file mode 100644 index 0000000000..4b1fe22b9d --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CD8_B368A8.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CD8_B368A8 +/* B368A8 80241CD8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B368AC 80241CDC AFB10024 */ sw $s1, 0x24($sp) +/* B368B0 80241CE0 0080882D */ daddu $s1, $a0, $zero +/* B368B4 80241CE4 3C05F840 */ lui $a1, 0xf840 +/* B368B8 80241CE8 AFBF0044 */ sw $ra, 0x44($sp) +/* B368BC 80241CEC AFBE0040 */ sw $fp, 0x40($sp) +/* B368C0 80241CF0 AFB7003C */ sw $s7, 0x3c($sp) +/* B368C4 80241CF4 AFB60038 */ sw $s6, 0x38($sp) +/* B368C8 80241CF8 AFB50034 */ sw $s5, 0x34($sp) +/* B368CC 80241CFC AFB40030 */ sw $s4, 0x30($sp) +/* B368D0 80241D00 AFB3002C */ sw $s3, 0x2c($sp) +/* B368D4 80241D04 AFB20028 */ sw $s2, 0x28($sp) +/* B368D8 80241D08 AFB00020 */ sw $s0, 0x20($sp) +/* B368DC 80241D0C 8E3E0148 */ lw $fp, 0x148($s1) +/* B368E0 80241D10 0C0B1EAF */ jal get_variable +/* B368E4 80241D14 34A56268 */ ori $a1, $a1, 0x6268 +/* B368E8 80241D18 0040802D */ daddu $s0, $v0, $zero +/* B368EC 80241D1C 0220202D */ daddu $a0, $s1, $zero +/* B368F0 80241D20 3C05F840 */ lui $a1, 0xf840 +/* B368F4 80241D24 0C0B1EAF */ jal get_variable +/* B368F8 80241D28 34A56269 */ ori $a1, $a1, 0x6269 +/* B368FC 80241D2C 0040B82D */ daddu $s7, $v0, $zero +/* B36900 80241D30 0220202D */ daddu $a0, $s1, $zero +/* B36904 80241D34 3C05F5DE */ lui $a1, 0xf5de +/* B36908 80241D38 0C0B1EAF */ jal get_variable +/* B3690C 80241D3C 34A502DE */ ori $a1, $a1, 0x2de +/* B36910 80241D40 0040B02D */ daddu $s6, $v0, $zero +/* B36914 80241D44 0220202D */ daddu $a0, $s1, $zero +/* B36918 80241D48 3C05F5DE */ lui $a1, 0xf5de +/* B3691C 80241D4C 0C0B1EAF */ jal get_variable +/* B36920 80241D50 34A502DF */ ori $a1, $a1, 0x2df +/* B36924 80241D54 0040A82D */ daddu $s5, $v0, $zero +/* B36928 80241D58 93D3006D */ lbu $s3, 0x6d($fp) +/* B3692C 80241D5C 32C2FFFF */ andi $v0, $s6, 0xffff +/* B36930 80241D60 A7B30010 */ sh $s3, 0x10($sp) +/* B36934 80241D64 93D2006E */ lbu $s2, 0x6e($fp) +/* B36938 80241D68 93C7006F */ lbu $a3, 0x6f($fp) +/* B3693C 80241D6C 3274FFFF */ andi $s4, $s3, 0xffff +/* B36940 80241D70 12820003 */ beq $s4, $v0, .L80241D80 +/* B36944 80241D74 A7A7001E */ sh $a3, 0x1e($sp) +/* B36948 80241D78 0000B82D */ daddu $s7, $zero, $zero +/* B3694C 80241D7C 02E0802D */ daddu $s0, $s7, $zero +.L80241D80: +/* B36950 80241D80 3202FFFF */ andi $v0, $s0, 0xffff +/* B36954 80241D84 14400016 */ bnez $v0, .L80241DE0 +/* B36958 80241D88 0220202D */ daddu $a0, $s1, $zero +/* B3695C 80241D8C 0C00A67F */ jal rand_int +/* B36960 80241D90 24040064 */ addiu $a0, $zero, 0x64 +/* B36964 80241D94 2842001E */ slti $v0, $v0, 0x1e +/* B36968 80241D98 10400011 */ beqz $v0, .L80241DE0 +/* B3696C 80241D9C 0220202D */ daddu $a0, $s1, $zero +/* B36970 80241DA0 0C00A67F */ jal rand_int +/* B36974 80241DA4 2644FFFF */ addiu $a0, $s2, -1 +/* B36978 80241DA8 0040A82D */ daddu $s5, $v0, $zero +/* B3697C 80241DAC 0260B02D */ daddu $s6, $s3, $zero +/* B36980 80241DB0 0220202D */ daddu $a0, $s1, $zero +/* B36984 80241DB4 3C05F5DE */ lui $a1, 0xf5de +/* B36988 80241DB8 34A502DE */ ori $a1, $a1, 0x2de +/* B3698C 80241DBC 0C0B2026 */ jal set_variable +/* B36990 80241DC0 0280302D */ daddu $a2, $s4, $zero +/* B36994 80241DC4 0220202D */ daddu $a0, $s1, $zero +/* B36998 80241DC8 3C05F5DE */ lui $a1, 0xf5de +/* B3699C 80241DCC 34A502DF */ ori $a1, $a1, 0x2df +/* B369A0 80241DD0 0C0B2026 */ jal set_variable +/* B369A4 80241DD4 32A6FFFF */ andi $a2, $s5, 0xffff +/* B369A8 80241DD8 24100001 */ addiu $s0, $zero, 1 +/* B369AC 80241DDC 0220202D */ daddu $a0, $s1, $zero +.L80241DE0: +/* B369B0 80241DE0 3C05F840 */ lui $a1, 0xf840 +/* B369B4 80241DE4 34A56268 */ ori $a1, $a1, 0x6268 +/* B369B8 80241DE8 0C0B2026 */ jal set_variable +/* B369BC 80241DEC 3206FFFF */ andi $a2, $s0, 0xffff +/* B369C0 80241DF0 0220202D */ daddu $a0, $s1, $zero +/* B369C4 80241DF4 3C05F840 */ lui $a1, 0xf840 +/* B369C8 80241DF8 34A56269 */ ori $a1, $a1, 0x6269 +/* B369CC 80241DFC 0C0B2026 */ jal set_variable +/* B369D0 80241E00 32E6FFFF */ andi $a2, $s7, 0xffff +/* B369D4 80241E04 0000202D */ daddu $a0, $zero, $zero +/* B369D8 80241E08 3C05F5DE */ lui $a1, 0xf5de +/* B369DC 80241E0C 0C0B1EAF */ jal get_variable +/* B369E0 80241E10 34A502E0 */ ori $a1, $a1, 0x2e0 +/* B369E4 80241E14 0000202D */ daddu $a0, $zero, $zero +/* B369E8 80241E18 3C05F5DE */ lui $a1, 0xf5de +/* B369EC 80241E1C 34A50180 */ ori $a1, $a1, 0x180 +/* B369F0 80241E20 0C0B1EAF */ jal get_variable +/* B369F4 80241E24 0040802D */ daddu $s0, $v0, $zero +/* B369F8 80241E28 0040282D */ daddu $a1, $v0, $zero +/* B369FC 80241E2C 0000182D */ daddu $v1, $zero, $zero +/* B36A00 80241E30 3C068024 */ lui $a2, 0x8024 +/* B36A04 80241E34 24C67808 */ addiu $a2, $a2, 0x7808 +/* B36A08 80241E38 00C0202D */ daddu $a0, $a2, $zero +.L80241E3C: +/* B36A0C 80241E3C 8C820000 */ lw $v0, ($a0) +/* B36A10 80241E40 00A2102A */ slt $v0, $a1, $v0 +/* B36A14 80241E44 14400006 */ bnez $v0, .L80241E60 +/* B36A18 80241E48 000310C0 */ sll $v0, $v1, 3 +/* B36A1C 80241E4C 24630001 */ addiu $v1, $v1, 1 +/* B36A20 80241E50 28620008 */ slti $v0, $v1, 8 +/* B36A24 80241E54 1440FFF9 */ bnez $v0, .L80241E3C +/* B36A28 80241E58 24840008 */ addiu $a0, $a0, 8 +/* B36A2C 80241E5C 000310C0 */ sll $v0, $v1, 3 +.L80241E60: +/* B36A30 80241E60 00461021 */ addu $v0, $v0, $a2 +/* B36A34 80241E64 8C420004 */ lw $v0, 4($v0) +/* B36A38 80241E68 97A30010 */ lhu $v1, 0x10($sp) +/* B36A3C 80241E6C 0202202A */ slt $a0, $s0, $v0 +/* B36A40 80241E70 32C2FFFF */ andi $v0, $s6, 0xffff +/* B36A44 80241E74 14620008 */ bne $v1, $v0, .L80241E98 +/* B36A48 80241E78 32A2FFFF */ andi $v0, $s5, 0xffff +/* B36A4C 80241E7C 97A7001E */ lhu $a3, 0x1e($sp) +/* B36A50 80241E80 14E20005 */ bne $a3, $v0, .L80241E98 +/* B36A54 80241E84 32E2FFFF */ andi $v0, $s7, 0xffff +/* B36A58 80241E88 14400003 */ bnez $v0, .L80241E98 +/* B36A5C 80241E8C 00000000 */ nop +/* B36A60 80241E90 14800008 */ bnez $a0, .L80241EB4 +/* B36A64 80241E94 24020001 */ addiu $v0, $zero, 1 +.L80241E98: +/* B36A68 80241E98 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* B36A6C 80241E9C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* B36A70 80241EA0 80420075 */ lb $v0, 0x75($v0) +/* B36A74 80241EA4 10400005 */ beqz $v0, .L80241EBC +/* B36A78 80241EA8 00000000 */ nop +/* B36A7C 80241EAC 10800003 */ beqz $a0, .L80241EBC +/* B36A80 80241EB0 24020001 */ addiu $v0, $zero, 1 +.L80241EB4: +/* B36A84 80241EB4 080907B2 */ j .L80241EC8 +/* B36A88 80241EB8 AE220084 */ sw $v0, 0x84($s1) +.L80241EBC: +/* B36A8C 80241EBC 0C00F9EB */ jal kill_enemy +/* B36A90 80241EC0 03C0202D */ daddu $a0, $fp, $zero +/* B36A94 80241EC4 AE200084 */ sw $zero, 0x84($s1) +.L80241EC8: +/* B36A98 80241EC8 8FBF0044 */ lw $ra, 0x44($sp) +/* B36A9C 80241ECC 8FBE0040 */ lw $fp, 0x40($sp) +/* B36AA0 80241ED0 8FB7003C */ lw $s7, 0x3c($sp) +/* B36AA4 80241ED4 8FB60038 */ lw $s6, 0x38($sp) +/* B36AA8 80241ED8 8FB50034 */ lw $s5, 0x34($sp) +/* B36AAC 80241EDC 8FB40030 */ lw $s4, 0x30($sp) +/* B36AB0 80241EE0 8FB3002C */ lw $s3, 0x2c($sp) +/* B36AB4 80241EE4 8FB20028 */ lw $s2, 0x28($sp) +/* B36AB8 80241EE8 8FB10024 */ lw $s1, 0x24($sp) +/* B36ABC 80241EEC 8FB00020 */ lw $s0, 0x20($sp) +/* B36AC0 80241EF0 24020002 */ addiu $v0, $zero, 2 +/* B36AC4 80241EF4 03E00008 */ jr $ra +/* B36AC8 80241EF8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC.s deleted file mode 100644 index 661a202c4f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EFC -/* B36ACC 80241EFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36AD0 80241F00 AFBF0014 */ sw $ra, 0x14($sp) -/* B36AD4 80241F04 AFB00010 */ sw $s0, 0x10($sp) -/* B36AD8 80241F08 0C00EABB */ jal get_npc_unsafe -/* B36ADC 80241F0C 8C84014C */ lw $a0, 0x14c($a0) -/* B36AE0 80241F10 24040008 */ addiu $a0, $zero, 8 -/* B36AE4 80241F14 0040802D */ daddu $s0, $v0, $zero -/* B36AE8 80241F18 3C028024 */ lui $v0, 0x8024 -/* B36AEC 80241F1C 24421F68 */ addiu $v0, $v0, 0x1f68 -/* B36AF0 80241F20 0C00AB39 */ jal heap_malloc -/* B36AF4 80241F24 AE020008 */ sw $v0, 8($s0) -/* B36AF8 80241F28 0040182D */ daddu $v1, $v0, $zero -/* B36AFC 80241F2C AE030020 */ sw $v1, 0x20($s0) -/* B36B00 80241F30 AC600000 */ sw $zero, ($v1) -/* B36B04 80241F34 8FBF0014 */ lw $ra, 0x14($sp) -/* B36B08 80241F38 8FB00010 */ lw $s0, 0x10($sp) -/* B36B0C 80241F3C 24020001 */ addiu $v0, $zero, 1 -/* B36B10 80241F40 03E00008 */ jr $ra -/* B36B14 80241F44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s new file mode 100644 index 0000000000..400e0f2c05 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241EFC_B36ACC.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241EFC_B36ACC +/* B36ACC 80241EFC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B36AD0 80241F00 AFBF0014 */ sw $ra, 0x14($sp) +/* B36AD4 80241F04 AFB00010 */ sw $s0, 0x10($sp) +/* B36AD8 80241F08 0C00EABB */ jal get_npc_unsafe +/* B36ADC 80241F0C 8C84014C */ lw $a0, 0x14c($a0) +/* B36AE0 80241F10 24040008 */ addiu $a0, $zero, 8 +/* B36AE4 80241F14 0040802D */ daddu $s0, $v0, $zero +/* B36AE8 80241F18 3C028024 */ lui $v0, 0x8024 +/* B36AEC 80241F1C 24421F68 */ addiu $v0, $v0, 0x1f68 +/* B36AF0 80241F20 0C00AB39 */ jal heap_malloc +/* B36AF4 80241F24 AE020008 */ sw $v0, 8($s0) +/* B36AF8 80241F28 0040182D */ daddu $v1, $v0, $zero +/* B36AFC 80241F2C AE030020 */ sw $v1, 0x20($s0) +/* B36B00 80241F30 AC600000 */ sw $zero, ($v1) +/* B36B04 80241F34 8FBF0014 */ lw $ra, 0x14($sp) +/* B36B08 80241F38 8FB00010 */ lw $s0, 0x10($sp) +/* B36B0C 80241F3C 24020001 */ addiu $v0, $zero, 1 +/* B36B10 80241F40 03E00008 */ jr $ra +/* B36B14 80241F44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48.s deleted file mode 100644 index aa3f93e425..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F48 -/* B36B18 80241F48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36B1C 80241F4C AFBF0010 */ sw $ra, 0x10($sp) -/* B36B20 80241F50 0C00EABB */ jal get_npc_unsafe -/* B36B24 80241F54 8C84014C */ lw $a0, 0x14c($a0) -/* B36B28 80241F58 8FBF0010 */ lw $ra, 0x10($sp) -/* B36B2C 80241F5C 0000102D */ daddu $v0, $zero, $zero -/* B36B30 80241F60 03E00008 */ jr $ra -/* B36B34 80241F64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s new file mode 100644 index 0000000000..8be9f67b52 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F48_B36B18 +/* B36B18 80241F48 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B36B1C 80241F4C AFBF0010 */ sw $ra, 0x10($sp) +/* B36B20 80241F50 0C00EABB */ jal get_npc_unsafe +/* B36B24 80241F54 8C84014C */ lw $a0, 0x14c($a0) +/* B36B28 80241F58 8FBF0010 */ lw $ra, 0x10($sp) +/* B36B2C 80241F5C 0000102D */ daddu $v0, $zero, $zero +/* B36B30 80241F60 03E00008 */ jr $ra +/* B36B34 80241F64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68.s deleted file mode 100644 index 3ee10ed42c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F68 -/* B36B38 80241F68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36B3C 80241F6C 3C03800A */ lui $v1, 0x800a -/* B36B40 80241F70 8463A634 */ lh $v1, -0x59cc($v1) -/* B36B44 80241F74 3C05800B */ lui $a1, %hi(gCameras) -/* B36B48 80241F78 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* B36B4C 80241F7C AFBF0010 */ sw $ra, 0x10($sp) -/* B36B50 80241F80 00031080 */ sll $v0, $v1, 2 -/* B36B54 80241F84 00431021 */ addu $v0, $v0, $v1 -/* B36B58 80241F88 00021080 */ sll $v0, $v0, 2 -/* B36B5C 80241F8C 00431023 */ subu $v0, $v0, $v1 -/* B36B60 80241F90 000218C0 */ sll $v1, $v0, 3 -/* B36B64 80241F94 00431021 */ addu $v0, $v0, $v1 -/* B36B68 80241F98 8C830020 */ lw $v1, 0x20($a0) -/* B36B6C 80241F9C 000210C0 */ sll $v0, $v0, 3 -/* B36B70 80241FA0 8C630000 */ lw $v1, ($v1) -/* B36B74 80241FA4 30630001 */ andi $v1, $v1, 1 -/* B36B78 80241FA8 10600004 */ beqz $v1, .L80241FBC -/* B36B7C 80241FAC 00451021 */ addu $v0, $v0, $a1 -/* B36B80 80241FB0 C44C006C */ lwc1 $f12, 0x6c($v0) -/* B36B84 80241FB4 0C00A6C9 */ jal clamp_angle -/* B36B88 80241FB8 46006307 */ neg.s $f12, $f12 -.L80241FBC: -/* B36B8C 80241FBC 8FBF0010 */ lw $ra, 0x10($sp) -/* B36B90 80241FC0 03E00008 */ jr $ra -/* B36B94 80241FC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s new file mode 100644 index 0000000000..f80a7a8585 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F68_B36B38.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F68_B36B38 +/* B36B38 80241F68 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B36B3C 80241F6C 3C03800A */ lui $v1, 0x800a +/* B36B40 80241F70 8463A634 */ lh $v1, -0x59cc($v1) +/* B36B44 80241F74 3C05800B */ lui $a1, %hi(gCameras) +/* B36B48 80241F78 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* B36B4C 80241F7C AFBF0010 */ sw $ra, 0x10($sp) +/* B36B50 80241F80 00031080 */ sll $v0, $v1, 2 +/* B36B54 80241F84 00431021 */ addu $v0, $v0, $v1 +/* B36B58 80241F88 00021080 */ sll $v0, $v0, 2 +/* B36B5C 80241F8C 00431023 */ subu $v0, $v0, $v1 +/* B36B60 80241F90 000218C0 */ sll $v1, $v0, 3 +/* B36B64 80241F94 00431021 */ addu $v0, $v0, $v1 +/* B36B68 80241F98 8C830020 */ lw $v1, 0x20($a0) +/* B36B6C 80241F9C 000210C0 */ sll $v0, $v0, 3 +/* B36B70 80241FA0 8C630000 */ lw $v1, ($v1) +/* B36B74 80241FA4 30630001 */ andi $v1, $v1, 1 +/* B36B78 80241FA8 10600004 */ beqz $v1, .L80241FBC +/* B36B7C 80241FAC 00451021 */ addu $v0, $v0, $a1 +/* B36B80 80241FB0 C44C006C */ lwc1 $f12, 0x6c($v0) +/* B36B84 80241FB4 0C00A6C9 */ jal clamp_angle +/* B36B88 80241FB8 46006307 */ neg.s $f12, $f12 +.L80241FBC: +/* B36B8C 80241FBC 8FBF0010 */ lw $ra, 0x10($sp) +/* B36B90 80241FC0 03E00008 */ jr $ra +/* B36B94 80241FC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114.s deleted file mode 100644 index 9f50ec1ddd..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242114 -/* B36CE4 80242114 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B36CE8 80242118 AFB00010 */ sw $s0, 0x10($sp) -/* B36CEC 8024211C 0080802D */ daddu $s0, $a0, $zero -/* B36CF0 80242120 AFBF0020 */ sw $ra, 0x20($sp) -/* B36CF4 80242124 AFB3001C */ sw $s3, 0x1c($sp) -/* B36CF8 80242128 AFB20018 */ sw $s2, 0x18($sp) -/* B36CFC 8024212C 10A00009 */ beqz $a1, .L80242154 -/* B36D00 80242130 AFB10014 */ sw $s1, 0x14($sp) -/* B36D04 80242134 0000202D */ daddu $a0, $zero, $zero -/* B36D08 80242138 0080282D */ daddu $a1, $a0, $zero -/* B36D0C 8024213C 0080302D */ daddu $a2, $a0, $zero -/* B36D10 80242140 0C046F97 */ jal set_background_color_blend -/* B36D14 80242144 240700FF */ addiu $a3, $zero, 0xff -/* B36D18 80242148 240200FF */ addiu $v0, $zero, 0xff -/* B36D1C 8024214C AE020070 */ sw $v0, 0x70($s0) -/* B36D20 80242150 AE000074 */ sw $zero, 0x74($s0) -.L80242154: -/* B36D24 80242154 8E020070 */ lw $v0, 0x70($s0) -/* B36D28 80242158 2442FFF8 */ addiu $v0, $v0, -8 -/* B36D2C 8024215C 04410002 */ bgez $v0, .L80242168 -/* B36D30 80242160 AE020070 */ sw $v0, 0x70($s0) -/* B36D34 80242164 AE000070 */ sw $zero, 0x70($s0) -.L80242168: -/* B36D38 80242168 0000202D */ daddu $a0, $zero, $zero -/* B36D3C 8024216C 0080282D */ daddu $a1, $a0, $zero -/* B36D40 80242170 92070073 */ lbu $a3, 0x73($s0) -/* B36D44 80242174 0C046F97 */ jal set_background_color_blend -/* B36D48 80242178 0080302D */ daddu $a2, $a0, $zero -/* B36D4C 8024217C 8E020070 */ lw $v0, 0x70($s0) -/* B36D50 80242180 14400006 */ bnez $v0, .L8024219C -/* B36D54 80242184 00000000 */ nop -/* B36D58 80242188 8E020074 */ lw $v0, 0x74($s0) -/* B36D5C 8024218C 14400003 */ bnez $v0, .L8024219C -/* B36D60 80242190 24020001 */ addiu $v0, $zero, 1 -/* B36D64 80242194 0809089A */ j .L80242268 -/* B36D68 80242198 AE020074 */ sw $v0, 0x74($s0) -.L8024219C: -/* B36D6C 8024219C 8E030074 */ lw $v1, 0x74($s0) -/* B36D70 802421A0 24020001 */ addiu $v0, $zero, 1 -/* B36D74 802421A4 14620031 */ bne $v1, $v0, .L8024226C -/* B36D78 802421A8 0000102D */ daddu $v0, $zero, $zero -/* B36D7C 802421AC 0C04760B */ jal func_8011D82C -/* B36D80 802421B0 0000202D */ daddu $a0, $zero, $zero -/* B36D84 802421B4 0000802D */ daddu $s0, $zero, $zero -/* B36D88 802421B8 2413FFFC */ addiu $s3, $zero, -4 -/* B36D8C 802421BC 24120011 */ addiu $s2, $zero, 0x11 -/* B36D90 802421C0 3C11FF7F */ lui $s1, 0xff7f -/* B36D94 802421C4 3C028015 */ lui $v0, 0x8015 -/* B36D98 802421C8 8C4212F0 */ lw $v0, 0x12f0($v0) -/* B36D9C 802421CC 3631FFFF */ ori $s1, $s1, 0xffff -/* B36DA0 802421D0 A0400000 */ sb $zero, ($v0) -.L802421D4: -/* B36DA4 802421D4 0C00E2B7 */ jal get_npc_by_index -/* B36DA8 802421D8 0200202D */ daddu $a0, $s0, $zero -/* B36DAC 802421DC 0040202D */ daddu $a0, $v0, $zero -/* B36DB0 802421E0 5080000B */ beql $a0, $zero, .L80242210 -/* B36DB4 802421E4 26100001 */ addiu $s0, $s0, 1 -/* B36DB8 802421E8 8C820000 */ lw $v0, ($a0) -/* B36DBC 802421EC 50400008 */ beql $v0, $zero, .L80242210 -/* B36DC0 802421F0 26100001 */ addiu $s0, $s0, 1 -/* B36DC4 802421F4 808300A4 */ lb $v1, 0xa4($a0) -/* B36DC8 802421F8 10730005 */ beq $v1, $s3, .L80242210 -/* B36DCC 802421FC 26100001 */ addiu $s0, $s0, 1 -/* B36DD0 80242200 10720003 */ beq $v1, $s2, .L80242210 -/* B36DD4 80242204 00000000 */ nop -/* B36DD8 80242208 00511024 */ and $v0, $v0, $s1 -/* B36DDC 8024220C AC820000 */ sw $v0, ($a0) -.L80242210: -/* B36DE0 80242210 2A020040 */ slti $v0, $s0, 0x40 -/* B36DE4 80242214 1440FFEF */ bnez $v0, .L802421D4 -/* B36DE8 80242218 00000000 */ nop -/* B36DEC 8024221C 0000802D */ daddu $s0, $zero, $zero -/* B36DF0 80242220 3C11F7FF */ lui $s1, 0xf7ff -/* B36DF4 80242224 3631FFFF */ ori $s1, $s1, 0xffff -.L80242228: -/* B36DF8 80242228 0C04C3D6 */ jal get_item_entity -/* B36DFC 8024222C 0200202D */ daddu $a0, $s0, $zero -/* B36E00 80242230 0040182D */ daddu $v1, $v0, $zero -/* B36E04 80242234 10600007 */ beqz $v1, .L80242254 -/* B36E08 80242238 26100001 */ addiu $s0, $s0, 1 -/* B36E0C 8024223C 8C640000 */ lw $a0, ($v1) -/* B36E10 80242240 30820010 */ andi $v0, $a0, 0x10 -/* B36E14 80242244 10400003 */ beqz $v0, .L80242254 -/* B36E18 80242248 00000000 */ nop -/* B36E1C 8024224C 00911024 */ and $v0, $a0, $s1 -/* B36E20 80242250 AC620000 */ sw $v0, ($v1) -.L80242254: -/* B36E24 80242254 2A020100 */ slti $v0, $s0, 0x100 -/* B36E28 80242258 1440FFF3 */ bnez $v0, .L80242228 -/* B36E2C 8024225C 24020002 */ addiu $v0, $zero, 2 -/* B36E30 80242260 0809089B */ j .L8024226C -/* B36E34 80242264 00000000 */ nop -.L80242268: -/* B36E38 80242268 0000102D */ daddu $v0, $zero, $zero -.L8024226C: -/* B36E3C 8024226C 8FBF0020 */ lw $ra, 0x20($sp) -/* B36E40 80242270 8FB3001C */ lw $s3, 0x1c($sp) -/* B36E44 80242274 8FB20018 */ lw $s2, 0x18($sp) -/* B36E48 80242278 8FB10014 */ lw $s1, 0x14($sp) -/* B36E4C 8024227C 8FB00010 */ lw $s0, 0x10($sp) -/* B36E50 80242280 03E00008 */ jr $ra -/* B36E54 80242284 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s new file mode 100644 index 0000000000..618f30d90d --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242114_B36CE4.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242114_B36CE4 +/* B36CE4 80242114 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B36CE8 80242118 AFB00010 */ sw $s0, 0x10($sp) +/* B36CEC 8024211C 0080802D */ daddu $s0, $a0, $zero +/* B36CF0 80242120 AFBF0020 */ sw $ra, 0x20($sp) +/* B36CF4 80242124 AFB3001C */ sw $s3, 0x1c($sp) +/* B36CF8 80242128 AFB20018 */ sw $s2, 0x18($sp) +/* B36CFC 8024212C 10A00009 */ beqz $a1, .L80242154 +/* B36D00 80242130 AFB10014 */ sw $s1, 0x14($sp) +/* B36D04 80242134 0000202D */ daddu $a0, $zero, $zero +/* B36D08 80242138 0080282D */ daddu $a1, $a0, $zero +/* B36D0C 8024213C 0080302D */ daddu $a2, $a0, $zero +/* B36D10 80242140 0C046F97 */ jal set_background_color_blend +/* B36D14 80242144 240700FF */ addiu $a3, $zero, 0xff +/* B36D18 80242148 240200FF */ addiu $v0, $zero, 0xff +/* B36D1C 8024214C AE020070 */ sw $v0, 0x70($s0) +/* B36D20 80242150 AE000074 */ sw $zero, 0x74($s0) +.L80242154: +/* B36D24 80242154 8E020070 */ lw $v0, 0x70($s0) +/* B36D28 80242158 2442FFF8 */ addiu $v0, $v0, -8 +/* B36D2C 8024215C 04410002 */ bgez $v0, .L80242168 +/* B36D30 80242160 AE020070 */ sw $v0, 0x70($s0) +/* B36D34 80242164 AE000070 */ sw $zero, 0x70($s0) +.L80242168: +/* B36D38 80242168 0000202D */ daddu $a0, $zero, $zero +/* B36D3C 8024216C 0080282D */ daddu $a1, $a0, $zero +/* B36D40 80242170 92070073 */ lbu $a3, 0x73($s0) +/* B36D44 80242174 0C046F97 */ jal set_background_color_blend +/* B36D48 80242178 0080302D */ daddu $a2, $a0, $zero +/* B36D4C 8024217C 8E020070 */ lw $v0, 0x70($s0) +/* B36D50 80242180 14400006 */ bnez $v0, .L8024219C +/* B36D54 80242184 00000000 */ nop +/* B36D58 80242188 8E020074 */ lw $v0, 0x74($s0) +/* B36D5C 8024218C 14400003 */ bnez $v0, .L8024219C +/* B36D60 80242190 24020001 */ addiu $v0, $zero, 1 +/* B36D64 80242194 0809089A */ j .L80242268 +/* B36D68 80242198 AE020074 */ sw $v0, 0x74($s0) +.L8024219C: +/* B36D6C 8024219C 8E030074 */ lw $v1, 0x74($s0) +/* B36D70 802421A0 24020001 */ addiu $v0, $zero, 1 +/* B36D74 802421A4 14620031 */ bne $v1, $v0, .L8024226C +/* B36D78 802421A8 0000102D */ daddu $v0, $zero, $zero +/* B36D7C 802421AC 0C04760B */ jal func_8011D82C +/* B36D80 802421B0 0000202D */ daddu $a0, $zero, $zero +/* B36D84 802421B4 0000802D */ daddu $s0, $zero, $zero +/* B36D88 802421B8 2413FFFC */ addiu $s3, $zero, -4 +/* B36D8C 802421BC 24120011 */ addiu $s2, $zero, 0x11 +/* B36D90 802421C0 3C11FF7F */ lui $s1, 0xff7f +/* B36D94 802421C4 3C028015 */ lui $v0, 0x8015 +/* B36D98 802421C8 8C4212F0 */ lw $v0, 0x12f0($v0) +/* B36D9C 802421CC 3631FFFF */ ori $s1, $s1, 0xffff +/* B36DA0 802421D0 A0400000 */ sb $zero, ($v0) +.L802421D4: +/* B36DA4 802421D4 0C00E2B7 */ jal get_npc_by_index +/* B36DA8 802421D8 0200202D */ daddu $a0, $s0, $zero +/* B36DAC 802421DC 0040202D */ daddu $a0, $v0, $zero +/* B36DB0 802421E0 5080000B */ beql $a0, $zero, .L80242210 +/* B36DB4 802421E4 26100001 */ addiu $s0, $s0, 1 +/* B36DB8 802421E8 8C820000 */ lw $v0, ($a0) +/* B36DBC 802421EC 50400008 */ beql $v0, $zero, .L80242210 +/* B36DC0 802421F0 26100001 */ addiu $s0, $s0, 1 +/* B36DC4 802421F4 808300A4 */ lb $v1, 0xa4($a0) +/* B36DC8 802421F8 10730005 */ beq $v1, $s3, .L80242210 +/* B36DCC 802421FC 26100001 */ addiu $s0, $s0, 1 +/* B36DD0 80242200 10720003 */ beq $v1, $s2, .L80242210 +/* B36DD4 80242204 00000000 */ nop +/* B36DD8 80242208 00511024 */ and $v0, $v0, $s1 +/* B36DDC 8024220C AC820000 */ sw $v0, ($a0) +.L80242210: +/* B36DE0 80242210 2A020040 */ slti $v0, $s0, 0x40 +/* B36DE4 80242214 1440FFEF */ bnez $v0, .L802421D4 +/* B36DE8 80242218 00000000 */ nop +/* B36DEC 8024221C 0000802D */ daddu $s0, $zero, $zero +/* B36DF0 80242220 3C11F7FF */ lui $s1, 0xf7ff +/* B36DF4 80242224 3631FFFF */ ori $s1, $s1, 0xffff +.L80242228: +/* B36DF8 80242228 0C04C3D6 */ jal get_item_entity +/* B36DFC 8024222C 0200202D */ daddu $a0, $s0, $zero +/* B36E00 80242230 0040182D */ daddu $v1, $v0, $zero +/* B36E04 80242234 10600007 */ beqz $v1, .L80242254 +/* B36E08 80242238 26100001 */ addiu $s0, $s0, 1 +/* B36E0C 8024223C 8C640000 */ lw $a0, ($v1) +/* B36E10 80242240 30820010 */ andi $v0, $a0, 0x10 +/* B36E14 80242244 10400003 */ beqz $v0, .L80242254 +/* B36E18 80242248 00000000 */ nop +/* B36E1C 8024224C 00911024 */ and $v0, $a0, $s1 +/* B36E20 80242250 AC620000 */ sw $v0, ($v1) +.L80242254: +/* B36E24 80242254 2A020100 */ slti $v0, $s0, 0x100 +/* B36E28 80242258 1440FFF3 */ bnez $v0, .L80242228 +/* B36E2C 8024225C 24020002 */ addiu $v0, $zero, 2 +/* B36E30 80242260 0809089B */ j .L8024226C +/* B36E34 80242264 00000000 */ nop +.L80242268: +/* B36E38 80242268 0000102D */ daddu $v0, $zero, $zero +.L8024226C: +/* B36E3C 8024226C 8FBF0020 */ lw $ra, 0x20($sp) +/* B36E40 80242270 8FB3001C */ lw $s3, 0x1c($sp) +/* B36E44 80242274 8FB20018 */ lw $s2, 0x18($sp) +/* B36E48 80242278 8FB10014 */ lw $s1, 0x14($sp) +/* B36E4C 8024227C 8FB00010 */ lw $s0, 0x10($sp) +/* B36E50 80242280 03E00008 */ jr $ra +/* B36E54 80242284 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288.s deleted file mode 100644 index e0911d986f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242288 -/* B36E58 80242288 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B36E5C 8024228C AFB00010 */ sw $s0, 0x10($sp) -/* B36E60 80242290 3C108011 */ lui $s0, %hi(gPlayerData) -/* B36E64 80242294 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* B36E68 80242298 AFBF0018 */ sw $ra, 0x18($sp) -/* B36E6C 8024229C AFB10014 */ sw $s1, 0x14($sp) -/* B36E70 802422A0 960302C0 */ lhu $v1, 0x2c0($s0) -/* B36E74 802422A4 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* B36E78 802422A8 10400003 */ beqz $v0, .L802422B8 -/* B36E7C 802422AC 0080882D */ daddu $s1, $a0, $zero -/* B36E80 802422B0 24620001 */ addiu $v0, $v1, 1 -/* B36E84 802422B4 A60202C0 */ sh $v0, 0x2c0($s0) -.L802422B8: -/* B36E88 802422B8 3C05F5DE */ lui $a1, 0xf5de -/* B36E8C 802422BC 34A502E0 */ ori $a1, $a1, 0x2e0 -/* B36E90 802422C0 0C0B1EAF */ jal get_variable -/* B36E94 802422C4 0000202D */ daddu $a0, $zero, $zero -/* B36E98 802422C8 3C038024 */ lui $v1, 0x8024 -/* B36E9C 802422CC 00621821 */ addu $v1, $v1, $v0 -/* B36EA0 802422D0 906377C8 */ lbu $v1, 0x77c8($v1) -/* B36EA4 802422D4 8E220084 */ lw $v0, 0x84($s1) -/* B36EA8 802422D8 54430006 */ bnel $v0, $v1, .L802422F4 -/* B36EAC 802422DC AE200084 */ sw $zero, 0x84($s1) -/* B36EB0 802422E0 24020001 */ addiu $v0, $zero, 1 -/* B36EB4 802422E4 AE220084 */ sw $v0, 0x84($s1) -/* B36EB8 802422E8 960202C2 */ lhu $v0, 0x2c2($s0) -/* B36EBC 802422EC 24420001 */ addiu $v0, $v0, 1 -/* B36EC0 802422F0 A60202C2 */ sh $v0, 0x2c2($s0) -.L802422F4: -/* B36EC4 802422F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B36EC8 802422F8 8FB10014 */ lw $s1, 0x14($sp) -/* B36ECC 802422FC 8FB00010 */ lw $s0, 0x10($sp) -/* B36ED0 80242300 24020002 */ addiu $v0, $zero, 2 -/* B36ED4 80242304 03E00008 */ jr $ra -/* B36ED8 80242308 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288_B36E58.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288_B36E58.s new file mode 100644 index 0000000000..778c392692 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242288_B36E58.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242288_B36E58 +/* B36E58 80242288 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B36E5C 8024228C AFB00010 */ sw $s0, 0x10($sp) +/* B36E60 80242290 3C108011 */ lui $s0, %hi(gPlayerData) +/* B36E64 80242294 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* B36E68 80242298 AFBF0018 */ sw $ra, 0x18($sp) +/* B36E6C 8024229C AFB10014 */ sw $s1, 0x14($sp) +/* B36E70 802422A0 960302C0 */ lhu $v1, 0x2c0($s0) +/* B36E74 802422A4 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* B36E78 802422A8 10400003 */ beqz $v0, .L802422B8 +/* B36E7C 802422AC 0080882D */ daddu $s1, $a0, $zero +/* B36E80 802422B0 24620001 */ addiu $v0, $v1, 1 +/* B36E84 802422B4 A60202C0 */ sh $v0, 0x2c0($s0) +.L802422B8: +/* B36E88 802422B8 3C05F5DE */ lui $a1, 0xf5de +/* B36E8C 802422BC 34A502E0 */ ori $a1, $a1, 0x2e0 +/* B36E90 802422C0 0C0B1EAF */ jal get_variable +/* B36E94 802422C4 0000202D */ daddu $a0, $zero, $zero +/* B36E98 802422C8 3C038024 */ lui $v1, 0x8024 +/* B36E9C 802422CC 00621821 */ addu $v1, $v1, $v0 +/* B36EA0 802422D0 906377C8 */ lbu $v1, 0x77c8($v1) +/* B36EA4 802422D4 8E220084 */ lw $v0, 0x84($s1) +/* B36EA8 802422D8 54430006 */ bnel $v0, $v1, .L802422F4 +/* B36EAC 802422DC AE200084 */ sw $zero, 0x84($s1) +/* B36EB0 802422E0 24020001 */ addiu $v0, $zero, 1 +/* B36EB4 802422E4 AE220084 */ sw $v0, 0x84($s1) +/* B36EB8 802422E8 960202C2 */ lhu $v0, 0x2c2($s0) +/* B36EBC 802422EC 24420001 */ addiu $v0, $v0, 1 +/* B36EC0 802422F0 A60202C2 */ sh $v0, 0x2c2($s0) +.L802422F4: +/* B36EC4 802422F4 8FBF0018 */ lw $ra, 0x18($sp) +/* B36EC8 802422F8 8FB10014 */ lw $s1, 0x14($sp) +/* B36ECC 802422FC 8FB00010 */ lw $s0, 0x10($sp) +/* B36ED0 80242300 24020002 */ addiu $v0, $zero, 2 +/* B36ED4 80242304 03E00008 */ jr $ra +/* B36ED8 80242308 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C.s deleted file mode 100644 index b239a16b67..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024230C -/* B36EDC 8024230C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B36EE0 80242310 AFB1001C */ sw $s1, 0x1c($sp) -/* B36EE4 80242314 AFBF0020 */ sw $ra, 0x20($sp) -/* B36EE8 80242318 AFB00018 */ sw $s0, 0x18($sp) -/* B36EEC 8024231C F7B60030 */ sdc1 $f22, 0x30($sp) -/* B36EF0 80242320 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B36EF4 80242324 10A00060 */ beqz $a1, .L802424A8 -/* B36EF8 80242328 0080882D */ daddu $s1, $a0, $zero -/* B36EFC 8024232C 3C05F4AC */ lui $a1, 0xf4ac -/* B36F00 80242330 0C0B1EAF */ jal get_variable -/* B36F04 80242334 34A5D481 */ ori $a1, $a1, 0xd481 -/* B36F08 80242338 0220202D */ daddu $a0, $s1, $zero -/* B36F0C 8024233C 3C05F4AC */ lui $a1, 0xf4ac -/* B36F10 80242340 4482B000 */ mtc1 $v0, $f22 -/* B36F14 80242344 00000000 */ nop -/* B36F18 80242348 4680B5A0 */ cvt.s.w $f22, $f22 -/* B36F1C 8024234C 0C0B1EAF */ jal get_variable -/* B36F20 80242350 34A5D482 */ ori $a1, $a1, 0xd482 -/* B36F24 80242354 0220202D */ daddu $a0, $s1, $zero -/* B36F28 80242358 3C05F4AC */ lui $a1, 0xf4ac -/* B36F2C 8024235C 4482A000 */ mtc1 $v0, $f20 -/* B36F30 80242360 00000000 */ nop -/* B36F34 80242364 4680A520 */ cvt.s.w $f20, $f20 -/* B36F38 80242368 0C0B1EAF */ jal get_variable -/* B36F3C 8024236C 34A5D483 */ ori $a1, $a1, 0xd483 -/* B36F40 80242370 44821000 */ mtc1 $v0, $f2 -/* B36F44 80242374 00000000 */ nop -/* B36F48 80242378 468010A0 */ cvt.s.w $f2, $f2 -/* B36F4C 8024237C 4405B000 */ mfc1 $a1, $f22 -/* B36F50 80242380 4406A000 */ mfc1 $a2, $f20 -/* B36F54 80242384 44071000 */ mfc1 $a3, $f2 -/* B36F58 80242388 0C01C574 */ jal func_800715D0 -/* B36F5C 8024238C 0000202D */ daddu $a0, $zero, $zero -/* B36F60 80242390 0220202D */ daddu $a0, $s1, $zero -/* B36F64 80242394 3C05F4AC */ lui $a1, 0xf4ac -/* B36F68 80242398 34A5D481 */ ori $a1, $a1, 0xd481 -/* B36F6C 8024239C 3C108025 */ lui $s0, 0x8025 -/* B36F70 802423A0 2610FEF8 */ addiu $s0, $s0, -0x108 -/* B36F74 802423A4 0C0B1EAF */ jal get_variable -/* B36F78 802423A8 AE020000 */ sw $v0, ($s0) -/* B36F7C 802423AC 0220202D */ daddu $a0, $s1, $zero -/* B36F80 802423B0 3C05F4AC */ lui $a1, 0xf4ac -/* B36F84 802423B4 4482B000 */ mtc1 $v0, $f22 -/* B36F88 802423B8 00000000 */ nop -/* B36F8C 802423BC 4680B5A0 */ cvt.s.w $f22, $f22 -/* B36F90 802423C0 0C0B1EAF */ jal get_variable -/* B36F94 802423C4 34A5D482 */ ori $a1, $a1, 0xd482 -/* B36F98 802423C8 0220202D */ daddu $a0, $s1, $zero -/* B36F9C 802423CC 3C05F4AC */ lui $a1, 0xf4ac -/* B36FA0 802423D0 4482A000 */ mtc1 $v0, $f20 -/* B36FA4 802423D4 00000000 */ nop -/* B36FA8 802423D8 4680A520 */ cvt.s.w $f20, $f20 -/* B36FAC 802423DC 0C0B1EAF */ jal get_variable -/* B36FB0 802423E0 34A5D483 */ ori $a1, $a1, 0xd483 -/* B36FB4 802423E4 44821000 */ mtc1 $v0, $f2 -/* B36FB8 802423E8 00000000 */ nop -/* B36FBC 802423EC 468010A0 */ cvt.s.w $f2, $f2 -/* B36FC0 802423F0 4405B000 */ mfc1 $a1, $f22 -/* B36FC4 802423F4 4406A000 */ mfc1 $a2, $f20 -/* B36FC8 802423F8 44071000 */ mfc1 $a3, $f2 -/* B36FCC 802423FC 0C01C604 */ jal func_80071810 -/* B36FD0 80242400 0000202D */ daddu $a0, $zero, $zero -/* B36FD4 80242404 0220202D */ daddu $a0, $s1, $zero -/* B36FD8 80242408 3C05F4AC */ lui $a1, 0xf4ac -/* B36FDC 8024240C 3C018025 */ lui $at, 0x8025 -/* B36FE0 80242410 AC22FEFC */ sw $v0, -0x104($at) -/* B36FE4 80242414 0C0B1EAF */ jal get_variable -/* B36FE8 80242418 34A5D481 */ ori $a1, $a1, 0xd481 -/* B36FEC 8024241C 0220202D */ daddu $a0, $s1, $zero -/* B36FF0 80242420 3C05F4AC */ lui $a1, 0xf4ac -/* B36FF4 80242424 4482B000 */ mtc1 $v0, $f22 -/* B36FF8 80242428 00000000 */ nop -/* B36FFC 8024242C 4680B5A0 */ cvt.s.w $f22, $f22 -/* B37000 80242430 0C0B1EAF */ jal get_variable -/* B37004 80242434 34A5D482 */ ori $a1, $a1, 0xd482 -/* B37008 80242438 0220202D */ daddu $a0, $s1, $zero -/* B3700C 8024243C 3C05F4AC */ lui $a1, 0xf4ac -/* B37010 80242440 4482A000 */ mtc1 $v0, $f20 -/* B37014 80242444 00000000 */ nop -/* B37018 80242448 4680A520 */ cvt.s.w $f20, $f20 -/* B3701C 8024244C 0C0B1EAF */ jal get_variable -/* B37020 80242450 34A5D483 */ ori $a1, $a1, 0xd483 -/* B37024 80242454 44821000 */ mtc1 $v0, $f2 -/* B37028 80242458 00000000 */ nop -/* B3702C 8024245C 468010A0 */ cvt.s.w $f2, $f2 -/* B37030 80242460 4405B000 */ mfc1 $a1, $f22 -/* B37034 80242464 4406A000 */ mfc1 $a2, $f20 -/* B37038 80242468 3C013F80 */ lui $at, 0x3f80 -/* B3703C 8024246C 44810000 */ mtc1 $at, $f0 -/* B37040 80242470 44071000 */ mfc1 $a3, $f2 -/* B37044 80242474 0000202D */ daddu $a0, $zero, $zero -/* B37048 80242478 AFA00014 */ sw $zero, 0x14($sp) -/* B3704C 8024247C 0C01CA24 */ jal func_80072890 -/* B37050 80242480 E7A00010 */ swc1 $f0, 0x10($sp) -/* B37054 80242484 8E030000 */ lw $v1, ($s0) -/* B37058 80242488 8C64000C */ lw $a0, 0xc($v1) -/* B3705C 8024248C 3C018025 */ lui $at, 0x8025 -/* B37060 80242490 AC22FF00 */ sw $v0, -0x100($at) -/* B37064 80242494 AC800018 */ sw $zero, 0x18($a0) -/* B37068 80242498 AC800020 */ sw $zero, 0x20($a0) -/* B3706C 8024249C AC800024 */ sw $zero, 0x24($a0) -/* B37070 802424A0 AC800028 */ sw $zero, 0x28($a0) -/* B37074 802424A4 AC80001C */ sw $zero, 0x1c($a0) -.L802424A8: -/* B37078 802424A8 3C028025 */ lui $v0, 0x8025 -/* B3707C 802424AC 8C42FEF8 */ lw $v0, -0x108($v0) -/* B37080 802424B0 8C44000C */ lw $a0, 0xc($v0) -/* B37084 802424B4 8C820020 */ lw $v0, 0x20($a0) -/* B37088 802424B8 8C830028 */ lw $v1, 0x28($a0) -/* B3708C 802424BC 2442000A */ addiu $v0, $v0, 0xa -/* B37090 802424C0 AC820020 */ sw $v0, 0x20($a0) -/* B37094 802424C4 8C820024 */ lw $v0, 0x24($a0) -/* B37098 802424C8 2463000A */ addiu $v1, $v1, 0xa -/* B3709C 802424CC AC830028 */ sw $v1, 0x28($a0) -/* B370A0 802424D0 8C830018 */ lw $v1, 0x18($a0) -/* B370A4 802424D4 2442000A */ addiu $v0, $v0, 0xa -/* B370A8 802424D8 AC820024 */ sw $v0, 0x24($a0) -/* B370AC 802424DC 8C82001C */ lw $v0, 0x1c($a0) -/* B370B0 802424E0 2463000A */ addiu $v1, $v1, 0xa -/* B370B4 802424E4 AC830018 */ sw $v1, 0x18($a0) -/* B370B8 802424E8 286300FF */ slti $v1, $v1, 0xff -/* B370BC 802424EC 2442000A */ addiu $v0, $v0, 0xa -/* B370C0 802424F0 AC82001C */ sw $v0, 0x1c($a0) -/* B370C4 802424F4 14600004 */ bnez $v1, .L80242508 -/* B370C8 802424F8 0000102D */ daddu $v0, $zero, $zero -/* B370CC 802424FC 240200FF */ addiu $v0, $zero, 0xff -/* B370D0 80242500 AC820018 */ sw $v0, 0x18($a0) -/* B370D4 80242504 24020002 */ addiu $v0, $zero, 2 -.L80242508: -/* B370D8 80242508 8FBF0020 */ lw $ra, 0x20($sp) -/* B370DC 8024250C 8FB1001C */ lw $s1, 0x1c($sp) -/* B370E0 80242510 8FB00018 */ lw $s0, 0x18($sp) -/* B370E4 80242514 D7B60030 */ ldc1 $f22, 0x30($sp) -/* B370E8 80242518 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B370EC 8024251C 03E00008 */ jr $ra -/* B370F0 80242520 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s new file mode 100644 index 0000000000..364b8c17b5 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024230C_B36EDC.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024230C_B36EDC +/* B36EDC 8024230C 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* B36EE0 80242310 AFB1001C */ sw $s1, 0x1c($sp) +/* B36EE4 80242314 AFBF0020 */ sw $ra, 0x20($sp) +/* B36EE8 80242318 AFB00018 */ sw $s0, 0x18($sp) +/* B36EEC 8024231C F7B60030 */ sdc1 $f22, 0x30($sp) +/* B36EF0 80242320 F7B40028 */ sdc1 $f20, 0x28($sp) +/* B36EF4 80242324 10A00060 */ beqz $a1, .L802424A8 +/* B36EF8 80242328 0080882D */ daddu $s1, $a0, $zero +/* B36EFC 8024232C 3C05F4AC */ lui $a1, 0xf4ac +/* B36F00 80242330 0C0B1EAF */ jal get_variable +/* B36F04 80242334 34A5D481 */ ori $a1, $a1, 0xd481 +/* B36F08 80242338 0220202D */ daddu $a0, $s1, $zero +/* B36F0C 8024233C 3C05F4AC */ lui $a1, 0xf4ac +/* B36F10 80242340 4482B000 */ mtc1 $v0, $f22 +/* B36F14 80242344 00000000 */ nop +/* B36F18 80242348 4680B5A0 */ cvt.s.w $f22, $f22 +/* B36F1C 8024234C 0C0B1EAF */ jal get_variable +/* B36F20 80242350 34A5D482 */ ori $a1, $a1, 0xd482 +/* B36F24 80242354 0220202D */ daddu $a0, $s1, $zero +/* B36F28 80242358 3C05F4AC */ lui $a1, 0xf4ac +/* B36F2C 8024235C 4482A000 */ mtc1 $v0, $f20 +/* B36F30 80242360 00000000 */ nop +/* B36F34 80242364 4680A520 */ cvt.s.w $f20, $f20 +/* B36F38 80242368 0C0B1EAF */ jal get_variable +/* B36F3C 8024236C 34A5D483 */ ori $a1, $a1, 0xd483 +/* B36F40 80242370 44821000 */ mtc1 $v0, $f2 +/* B36F44 80242374 00000000 */ nop +/* B36F48 80242378 468010A0 */ cvt.s.w $f2, $f2 +/* B36F4C 8024237C 4405B000 */ mfc1 $a1, $f22 +/* B36F50 80242380 4406A000 */ mfc1 $a2, $f20 +/* B36F54 80242384 44071000 */ mfc1 $a3, $f2 +/* B36F58 80242388 0C01C574 */ jal func_800715D0 +/* B36F5C 8024238C 0000202D */ daddu $a0, $zero, $zero +/* B36F60 80242390 0220202D */ daddu $a0, $s1, $zero +/* B36F64 80242394 3C05F4AC */ lui $a1, 0xf4ac +/* B36F68 80242398 34A5D481 */ ori $a1, $a1, 0xd481 +/* B36F6C 8024239C 3C108025 */ lui $s0, 0x8025 +/* B36F70 802423A0 2610FEF8 */ addiu $s0, $s0, -0x108 +/* B36F74 802423A4 0C0B1EAF */ jal get_variable +/* B36F78 802423A8 AE020000 */ sw $v0, ($s0) +/* B36F7C 802423AC 0220202D */ daddu $a0, $s1, $zero +/* B36F80 802423B0 3C05F4AC */ lui $a1, 0xf4ac +/* B36F84 802423B4 4482B000 */ mtc1 $v0, $f22 +/* B36F88 802423B8 00000000 */ nop +/* B36F8C 802423BC 4680B5A0 */ cvt.s.w $f22, $f22 +/* B36F90 802423C0 0C0B1EAF */ jal get_variable +/* B36F94 802423C4 34A5D482 */ ori $a1, $a1, 0xd482 +/* B36F98 802423C8 0220202D */ daddu $a0, $s1, $zero +/* B36F9C 802423CC 3C05F4AC */ lui $a1, 0xf4ac +/* B36FA0 802423D0 4482A000 */ mtc1 $v0, $f20 +/* B36FA4 802423D4 00000000 */ nop +/* B36FA8 802423D8 4680A520 */ cvt.s.w $f20, $f20 +/* B36FAC 802423DC 0C0B1EAF */ jal get_variable +/* B36FB0 802423E0 34A5D483 */ ori $a1, $a1, 0xd483 +/* B36FB4 802423E4 44821000 */ mtc1 $v0, $f2 +/* B36FB8 802423E8 00000000 */ nop +/* B36FBC 802423EC 468010A0 */ cvt.s.w $f2, $f2 +/* B36FC0 802423F0 4405B000 */ mfc1 $a1, $f22 +/* B36FC4 802423F4 4406A000 */ mfc1 $a2, $f20 +/* B36FC8 802423F8 44071000 */ mfc1 $a3, $f2 +/* B36FCC 802423FC 0C01C604 */ jal func_80071810 +/* B36FD0 80242400 0000202D */ daddu $a0, $zero, $zero +/* B36FD4 80242404 0220202D */ daddu $a0, $s1, $zero +/* B36FD8 80242408 3C05F4AC */ lui $a1, 0xf4ac +/* B36FDC 8024240C 3C018025 */ lui $at, 0x8025 +/* B36FE0 80242410 AC22FEFC */ sw $v0, -0x104($at) +/* B36FE4 80242414 0C0B1EAF */ jal get_variable +/* B36FE8 80242418 34A5D481 */ ori $a1, $a1, 0xd481 +/* B36FEC 8024241C 0220202D */ daddu $a0, $s1, $zero +/* B36FF0 80242420 3C05F4AC */ lui $a1, 0xf4ac +/* B36FF4 80242424 4482B000 */ mtc1 $v0, $f22 +/* B36FF8 80242428 00000000 */ nop +/* B36FFC 8024242C 4680B5A0 */ cvt.s.w $f22, $f22 +/* B37000 80242430 0C0B1EAF */ jal get_variable +/* B37004 80242434 34A5D482 */ ori $a1, $a1, 0xd482 +/* B37008 80242438 0220202D */ daddu $a0, $s1, $zero +/* B3700C 8024243C 3C05F4AC */ lui $a1, 0xf4ac +/* B37010 80242440 4482A000 */ mtc1 $v0, $f20 +/* B37014 80242444 00000000 */ nop +/* B37018 80242448 4680A520 */ cvt.s.w $f20, $f20 +/* B3701C 8024244C 0C0B1EAF */ jal get_variable +/* B37020 80242450 34A5D483 */ ori $a1, $a1, 0xd483 +/* B37024 80242454 44821000 */ mtc1 $v0, $f2 +/* B37028 80242458 00000000 */ nop +/* B3702C 8024245C 468010A0 */ cvt.s.w $f2, $f2 +/* B37030 80242460 4405B000 */ mfc1 $a1, $f22 +/* B37034 80242464 4406A000 */ mfc1 $a2, $f20 +/* B37038 80242468 3C013F80 */ lui $at, 0x3f80 +/* B3703C 8024246C 44810000 */ mtc1 $at, $f0 +/* B37040 80242470 44071000 */ mfc1 $a3, $f2 +/* B37044 80242474 0000202D */ daddu $a0, $zero, $zero +/* B37048 80242478 AFA00014 */ sw $zero, 0x14($sp) +/* B3704C 8024247C 0C01CA24 */ jal func_80072890 +/* B37050 80242480 E7A00010 */ swc1 $f0, 0x10($sp) +/* B37054 80242484 8E030000 */ lw $v1, ($s0) +/* B37058 80242488 8C64000C */ lw $a0, 0xc($v1) +/* B3705C 8024248C 3C018025 */ lui $at, 0x8025 +/* B37060 80242490 AC22FF00 */ sw $v0, -0x100($at) +/* B37064 80242494 AC800018 */ sw $zero, 0x18($a0) +/* B37068 80242498 AC800020 */ sw $zero, 0x20($a0) +/* B3706C 8024249C AC800024 */ sw $zero, 0x24($a0) +/* B37070 802424A0 AC800028 */ sw $zero, 0x28($a0) +/* B37074 802424A4 AC80001C */ sw $zero, 0x1c($a0) +.L802424A8: +/* B37078 802424A8 3C028025 */ lui $v0, 0x8025 +/* B3707C 802424AC 8C42FEF8 */ lw $v0, -0x108($v0) +/* B37080 802424B0 8C44000C */ lw $a0, 0xc($v0) +/* B37084 802424B4 8C820020 */ lw $v0, 0x20($a0) +/* B37088 802424B8 8C830028 */ lw $v1, 0x28($a0) +/* B3708C 802424BC 2442000A */ addiu $v0, $v0, 0xa +/* B37090 802424C0 AC820020 */ sw $v0, 0x20($a0) +/* B37094 802424C4 8C820024 */ lw $v0, 0x24($a0) +/* B37098 802424C8 2463000A */ addiu $v1, $v1, 0xa +/* B3709C 802424CC AC830028 */ sw $v1, 0x28($a0) +/* B370A0 802424D0 8C830018 */ lw $v1, 0x18($a0) +/* B370A4 802424D4 2442000A */ addiu $v0, $v0, 0xa +/* B370A8 802424D8 AC820024 */ sw $v0, 0x24($a0) +/* B370AC 802424DC 8C82001C */ lw $v0, 0x1c($a0) +/* B370B0 802424E0 2463000A */ addiu $v1, $v1, 0xa +/* B370B4 802424E4 AC830018 */ sw $v1, 0x18($a0) +/* B370B8 802424E8 286300FF */ slti $v1, $v1, 0xff +/* B370BC 802424EC 2442000A */ addiu $v0, $v0, 0xa +/* B370C0 802424F0 AC82001C */ sw $v0, 0x1c($a0) +/* B370C4 802424F4 14600004 */ bnez $v1, .L80242508 +/* B370C8 802424F8 0000102D */ daddu $v0, $zero, $zero +/* B370CC 802424FC 240200FF */ addiu $v0, $zero, 0xff +/* B370D0 80242500 AC820018 */ sw $v0, 0x18($a0) +/* B370D4 80242504 24020002 */ addiu $v0, $zero, 2 +.L80242508: +/* B370D8 80242508 8FBF0020 */ lw $ra, 0x20($sp) +/* B370DC 8024250C 8FB1001C */ lw $s1, 0x1c($sp) +/* B370E0 80242510 8FB00018 */ lw $s0, 0x18($sp) +/* B370E4 80242514 D7B60030 */ ldc1 $f22, 0x30($sp) +/* B370E8 80242518 D7B40028 */ ldc1 $f20, 0x28($sp) +/* B370EC 8024251C 03E00008 */ jr $ra +/* B370F0 80242520 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C.s deleted file mode 100644 index 62c77de0c7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024268C -/* B3725C 8024268C 3C028025 */ lui $v0, 0x8025 -/* B37260 80242690 8C42FF00 */ lw $v0, -0x100($v0) -/* B37264 80242694 8C42000C */ lw $v0, 0xc($v0) -/* B37268 80242698 AC40001C */ sw $zero, 0x1c($v0) -/* B3726C 8024269C 03E00008 */ jr $ra -/* B37270 802426A0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C_B3725C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C_B3725C.s new file mode 100644 index 0000000000..a26c5f86fa --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024268C_B3725C.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024268C_B3725C +/* B3725C 8024268C 3C028025 */ lui $v0, 0x8025 +/* B37260 80242690 8C42FF00 */ lw $v0, -0x100($v0) +/* B37264 80242694 8C42000C */ lw $v0, 0xc($v0) +/* B37268 80242698 AC40001C */ sw $zero, 0x1c($v0) +/* B3726C 8024269C 03E00008 */ jr $ra +/* B37270 802426A0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0.s deleted file mode 100644 index fcf5f803ba..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426C0 -/* B37290 802426C0 3C028025 */ lui $v0, 0x8025 -/* B37294 802426C4 8C42FF00 */ lw $v0, -0x100($v0) -/* B37298 802426C8 8C43000C */ lw $v1, 0xc($v0) -/* B3729C 802426CC 24020002 */ addiu $v0, $zero, 2 -/* B372A0 802426D0 03E00008 */ jr $ra -/* B372A4 802426D4 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0_B37290.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0_B37290.s new file mode 100644 index 0000000000..57994a01dd --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426C0_B37290.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426C0_B37290 +/* B37290 802426C0 3C028025 */ lui $v0, 0x8025 +/* B37294 802426C4 8C42FF00 */ lw $v0, -0x100($v0) +/* B37298 802426C8 8C43000C */ lw $v1, 0xc($v0) +/* B3729C 802426CC 24020002 */ addiu $v0, $zero, 2 +/* B372A0 802426D0 03E00008 */ jr $ra +/* B372A4 802426D4 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8.s deleted file mode 100644 index 6b4f227bde..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426D8 -/* B372A8 802426D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B372AC 802426DC 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B372B0 802426E0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B372B4 802426E4 3C05FE36 */ lui $a1, 0xfe36 -/* B372B8 802426E8 AFBF0010 */ sw $ra, 0x10($sp) -/* B372BC 802426EC 80460075 */ lb $a2, 0x75($v0) -/* B372C0 802426F0 0C0B2026 */ jal set_variable -/* B372C4 802426F4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B372C8 802426F8 8FBF0010 */ lw $ra, 0x10($sp) -/* B372CC 802426FC 24020002 */ addiu $v0, $zero, 2 -/* B372D0 80242700 03E00008 */ jr $ra -/* B372D4 80242704 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s new file mode 100644 index 0000000000..764671914f --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426D8_B372A8 +/* B372A8 802426D8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B372AC 802426DC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* B372B0 802426E0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* B372B4 802426E4 3C05FE36 */ lui $a1, 0xfe36 +/* B372B8 802426E8 AFBF0010 */ sw $ra, 0x10($sp) +/* B372BC 802426EC 80460075 */ lb $a2, 0x75($v0) +/* B372C0 802426F0 0C0B2026 */ jal set_variable +/* B372C4 802426F4 34A53C80 */ ori $a1, $a1, 0x3c80 +/* B372C8 802426F8 8FBF0010 */ lw $ra, 0x10($sp) +/* B372CC 802426FC 24020002 */ addiu $v0, $zero, 2 +/* B372D0 80242700 03E00008 */ jr $ra +/* B372D4 80242704 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C.s deleted file mode 100644 index 93537012f5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024277C -/* B3734C 8024277C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B37350 80242780 AFB10014 */ sw $s1, 0x14($sp) -/* B37354 80242784 0080882D */ daddu $s1, $a0, $zero -/* B37358 80242788 AFBF0018 */ sw $ra, 0x18($sp) -/* B3735C 8024278C AFB00010 */ sw $s0, 0x10($sp) -/* B37360 80242790 8E30000C */ lw $s0, 0xc($s1) -/* B37364 80242794 8E050000 */ lw $a1, ($s0) -/* B37368 80242798 0C0B1EAF */ jal get_variable -/* B3736C 8024279C 26100004 */ addiu $s0, $s0, 4 -/* B37370 802427A0 00021880 */ sll $v1, $v0, 2 -/* B37374 802427A4 00621821 */ addu $v1, $v1, $v0 -/* B37378 802427A8 00031880 */ sll $v1, $v1, 2 -/* B3737C 802427AC 00621823 */ subu $v1, $v1, $v0 -/* B37380 802427B0 000310C0 */ sll $v0, $v1, 3 -/* B37384 802427B4 00621821 */ addu $v1, $v1, $v0 -/* B37388 802427B8 000318C0 */ sll $v1, $v1, 3 -/* B3738C 802427BC 3C01800B */ lui $at, 0x800b -/* B37390 802427C0 00230821 */ addu $at, $at, $v1 -/* B37394 802427C4 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* B37398 802427C8 3C014480 */ lui $at, 0x4480 -/* B3739C 802427CC 44810000 */ mtc1 $at, $f0 -/* B373A0 802427D0 00000000 */ nop -/* B373A4 802427D4 46001082 */ mul.s $f2, $f2, $f0 -/* B373A8 802427D8 00000000 */ nop -/* B373AC 802427DC 3C01CD5B */ lui $at, 0xcd5b -/* B373B0 802427E0 34215858 */ ori $at, $at, 0x5858 -/* B373B4 802427E4 44810000 */ mtc1 $at, $f0 -/* B373B8 802427E8 00000000 */ nop -/* B373BC 802427EC 46001080 */ add.s $f2, $f2, $f0 -/* B373C0 802427F0 8E050000 */ lw $a1, ($s0) -/* B373C4 802427F4 4600110D */ trunc.w.s $f4, $f2 -/* B373C8 802427F8 44062000 */ mfc1 $a2, $f4 -/* B373CC 802427FC 0C0B2026 */ jal set_variable -/* B373D0 80242800 0220202D */ daddu $a0, $s1, $zero -/* B373D4 80242804 8FBF0018 */ lw $ra, 0x18($sp) -/* B373D8 80242808 8FB10014 */ lw $s1, 0x14($sp) -/* B373DC 8024280C 8FB00010 */ lw $s0, 0x10($sp) -/* B373E0 80242810 24020002 */ addiu $v0, $zero, 2 -/* B373E4 80242814 03E00008 */ jr $ra -/* B373E8 80242818 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s new file mode 100644 index 0000000000..2e575aa820 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024277C_B3734C +/* B3734C 8024277C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B37350 80242780 AFB10014 */ sw $s1, 0x14($sp) +/* B37354 80242784 0080882D */ daddu $s1, $a0, $zero +/* B37358 80242788 AFBF0018 */ sw $ra, 0x18($sp) +/* B3735C 8024278C AFB00010 */ sw $s0, 0x10($sp) +/* B37360 80242790 8E30000C */ lw $s0, 0xc($s1) +/* B37364 80242794 8E050000 */ lw $a1, ($s0) +/* B37368 80242798 0C0B1EAF */ jal get_variable +/* B3736C 8024279C 26100004 */ addiu $s0, $s0, 4 +/* B37370 802427A0 00021880 */ sll $v1, $v0, 2 +/* B37374 802427A4 00621821 */ addu $v1, $v1, $v0 +/* B37378 802427A8 00031880 */ sll $v1, $v1, 2 +/* B3737C 802427AC 00621823 */ subu $v1, $v1, $v0 +/* B37380 802427B0 000310C0 */ sll $v0, $v1, 3 +/* B37384 802427B4 00621821 */ addu $v1, $v1, $v0 +/* B37388 802427B8 000318C0 */ sll $v1, $v1, 3 +/* B3738C 802427BC 3C01800B */ lui $at, 0x800b +/* B37390 802427C0 00230821 */ addu $at, $at, $v1 +/* B37394 802427C4 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* B37398 802427C8 3C014480 */ lui $at, 0x4480 +/* B3739C 802427CC 44810000 */ mtc1 $at, $f0 +/* B373A0 802427D0 00000000 */ nop +/* B373A4 802427D4 46001082 */ mul.s $f2, $f2, $f0 +/* B373A8 802427D8 00000000 */ nop +/* B373AC 802427DC 3C01CD5B */ lui $at, 0xcd5b +/* B373B0 802427E0 34215858 */ ori $at, $at, 0x5858 +/* B373B4 802427E4 44810000 */ mtc1 $at, $f0 +/* B373B8 802427E8 00000000 */ nop +/* B373BC 802427EC 46001080 */ add.s $f2, $f2, $f0 +/* B373C0 802427F0 8E050000 */ lw $a1, ($s0) +/* B373C4 802427F4 4600110D */ trunc.w.s $f4, $f2 +/* B373C8 802427F8 44062000 */ mfc1 $a2, $f4 +/* B373CC 802427FC 0C0B2026 */ jal set_variable +/* B373D0 80242800 0220202D */ daddu $a0, $s1, $zero +/* B373D4 80242804 8FBF0018 */ lw $ra, 0x18($sp) +/* B373D8 80242808 8FB10014 */ lw $s1, 0x14($sp) +/* B373DC 8024280C 8FB00010 */ lw $s0, 0x10($sp) +/* B373E0 80242810 24020002 */ addiu $v0, $zero, 2 +/* B373E4 80242814 03E00008 */ jr $ra +/* B373E8 80242818 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C.s deleted file mode 100644 index 96333e7e06..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024281C -/* B373EC 8024281C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B373F0 80242820 AFB20018 */ sw $s2, 0x18($sp) -/* B373F4 80242824 0080902D */ daddu $s2, $a0, $zero -/* B373F8 80242828 AFBF0030 */ sw $ra, 0x30($sp) -/* B373FC 8024282C AFB7002C */ sw $s7, 0x2c($sp) -/* B37400 80242830 AFB60028 */ sw $s6, 0x28($sp) -/* B37404 80242834 AFB50024 */ sw $s5, 0x24($sp) -/* B37408 80242838 AFB40020 */ sw $s4, 0x20($sp) -/* B3740C 8024283C AFB3001C */ sw $s3, 0x1c($sp) -/* B37410 80242840 AFB10014 */ sw $s1, 0x14($sp) -/* B37414 80242844 AFB00010 */ sw $s0, 0x10($sp) -/* B37418 80242848 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B3741C 8024284C F7B40038 */ sdc1 $f20, 0x38($sp) -/* B37420 80242850 8E50000C */ lw $s0, 0xc($s2) -/* B37424 80242854 8E050000 */ lw $a1, ($s0) -/* B37428 80242858 0C0B1EAF */ jal get_variable -/* B3742C 8024285C 26100004 */ addiu $s0, $s0, 4 -/* B37430 80242860 8E050000 */ lw $a1, ($s0) -/* B37434 80242864 26100004 */ addiu $s0, $s0, 4 -/* B37438 80242868 0240202D */ daddu $a0, $s2, $zero -/* B3743C 8024286C 0C0B1EAF */ jal get_variable -/* B37440 80242870 0040B82D */ daddu $s7, $v0, $zero -/* B37444 80242874 8E050000 */ lw $a1, ($s0) -/* B37448 80242878 26100004 */ addiu $s0, $s0, 4 -/* B3744C 8024287C 0240202D */ daddu $a0, $s2, $zero -/* B37450 80242880 0C0B1EAF */ jal get_variable -/* B37454 80242884 0040B02D */ daddu $s6, $v0, $zero -/* B37458 80242888 0240202D */ daddu $a0, $s2, $zero -/* B3745C 8024288C 3C05F4AC */ lui $a1, 0xf4ac -/* B37460 80242890 34A5D481 */ ori $a1, $a1, 0xd481 -/* B37464 80242894 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* B37468 80242898 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* B3746C 8024289C 8E140000 */ lw $s4, ($s0) -/* B37470 802428A0 00061880 */ sll $v1, $a2, 2 -/* B37474 802428A4 00661821 */ addu $v1, $v1, $a2 -/* B37478 802428A8 00031880 */ sll $v1, $v1, 2 -/* B3747C 802428AC 00661823 */ subu $v1, $v1, $a2 -/* B37480 802428B0 000330C0 */ sll $a2, $v1, 3 -/* B37484 802428B4 00661821 */ addu $v1, $v1, $a2 -/* B37488 802428B8 000318C0 */ sll $v1, $v1, 3 -/* B3748C 802428BC 3C01800B */ lui $at, 0x800b -/* B37490 802428C0 00230821 */ addu $at, $at, $v1 -/* B37494 802428C4 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B37498 802428C8 8E150004 */ lw $s5, 4($s0) -/* B3749C 802428CC 4600010D */ trunc.w.s $f4, $f0 -/* B374A0 802428D0 44112000 */ mfc1 $s1, $f4 -/* B374A4 802428D4 0C0B1EAF */ jal get_variable -/* B374A8 802428D8 0040982D */ daddu $s3, $v0, $zero -/* B374AC 802428DC 4491B000 */ mtc1 $s1, $f22 -/* B374B0 802428E0 00000000 */ nop -/* B374B4 802428E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* B374B8 802428E8 4600B306 */ mov.s $f12, $f22 -/* B374BC 802428EC 0C00A8D4 */ jal cos_deg -/* B374C0 802428F0 0040802D */ daddu $s0, $v0, $zero -/* B374C4 802428F4 4493A000 */ mtc1 $s3, $f20 -/* B374C8 802428F8 00000000 */ nop -/* B374CC 802428FC 4680A520 */ cvt.s.w $f20, $f20 -/* B374D0 80242900 4600A002 */ mul.s $f0, $f20, $f0 -/* B374D4 80242904 00000000 */ nop -/* B374D8 80242908 0240202D */ daddu $a0, $s2, $zero -/* B374DC 8024290C 44901000 */ mtc1 $s0, $f2 -/* B374E0 80242910 00000000 */ nop -/* B374E4 80242914 468010A0 */ cvt.s.w $f2, $f2 -/* B374E8 80242918 46001081 */ sub.s $f2, $f2, $f0 -/* B374EC 8024291C 3C05F4AC */ lui $a1, 0xf4ac -/* B374F0 80242920 4600110D */ trunc.w.s $f4, $f2 -/* B374F4 80242924 44102000 */ mfc1 $s0, $f4 -/* B374F8 80242928 0C0B1EAF */ jal get_variable -/* B374FC 8024292C 34A5D483 */ ori $a1, $a1, 0xd483 -/* B37500 80242930 4600B306 */ mov.s $f12, $f22 -/* B37504 80242934 0C00A8BB */ jal sin_deg -/* B37508 80242938 0040882D */ daddu $s1, $v0, $zero -/* B3750C 8024293C 4600A502 */ mul.s $f20, $f20, $f0 -/* B37510 80242940 00000000 */ nop -/* B37514 80242944 0240202D */ daddu $a0, $s2, $zero -/* B37518 80242948 44910000 */ mtc1 $s1, $f0 -/* B3751C 8024294C 00000000 */ nop -/* B37520 80242950 46800020 */ cvt.s.w $f0, $f0 -/* B37524 80242954 46140001 */ sub.s $f0, $f0, $f20 -/* B37528 80242958 0280282D */ daddu $a1, $s4, $zero -/* B3752C 8024295C 02173023 */ subu $a2, $s0, $s7 -/* B37530 80242960 4600010D */ trunc.w.s $f4, $f0 -/* B37534 80242964 44102000 */ mfc1 $s0, $f4 -/* B37538 80242968 0C0B2026 */ jal set_variable -/* B3753C 8024296C 02168023 */ subu $s0, $s0, $s6 -/* B37540 80242970 0240202D */ daddu $a0, $s2, $zero -/* B37544 80242974 02A0282D */ daddu $a1, $s5, $zero -/* B37548 80242978 0C0B2026 */ jal set_variable -/* B3754C 8024297C 0200302D */ daddu $a2, $s0, $zero -/* B37550 80242980 8FBF0030 */ lw $ra, 0x30($sp) -/* B37554 80242984 8FB7002C */ lw $s7, 0x2c($sp) -/* B37558 80242988 8FB60028 */ lw $s6, 0x28($sp) -/* B3755C 8024298C 8FB50024 */ lw $s5, 0x24($sp) -/* B37560 80242990 8FB40020 */ lw $s4, 0x20($sp) -/* B37564 80242994 8FB3001C */ lw $s3, 0x1c($sp) -/* B37568 80242998 8FB20018 */ lw $s2, 0x18($sp) -/* B3756C 8024299C 8FB10014 */ lw $s1, 0x14($sp) -/* B37570 802429A0 8FB00010 */ lw $s0, 0x10($sp) -/* B37574 802429A4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* B37578 802429A8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* B3757C 802429AC 24020002 */ addiu $v0, $zero, 2 -/* B37580 802429B0 03E00008 */ jr $ra -/* B37584 802429B4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s new file mode 100644 index 0000000000..02b7b41c13 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024281C_B373EC +/* B373EC 8024281C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B373F0 80242820 AFB20018 */ sw $s2, 0x18($sp) +/* B373F4 80242824 0080902D */ daddu $s2, $a0, $zero +/* B373F8 80242828 AFBF0030 */ sw $ra, 0x30($sp) +/* B373FC 8024282C AFB7002C */ sw $s7, 0x2c($sp) +/* B37400 80242830 AFB60028 */ sw $s6, 0x28($sp) +/* B37404 80242834 AFB50024 */ sw $s5, 0x24($sp) +/* B37408 80242838 AFB40020 */ sw $s4, 0x20($sp) +/* B3740C 8024283C AFB3001C */ sw $s3, 0x1c($sp) +/* B37410 80242840 AFB10014 */ sw $s1, 0x14($sp) +/* B37414 80242844 AFB00010 */ sw $s0, 0x10($sp) +/* B37418 80242848 F7B60040 */ sdc1 $f22, 0x40($sp) +/* B3741C 8024284C F7B40038 */ sdc1 $f20, 0x38($sp) +/* B37420 80242850 8E50000C */ lw $s0, 0xc($s2) +/* B37424 80242854 8E050000 */ lw $a1, ($s0) +/* B37428 80242858 0C0B1EAF */ jal get_variable +/* B3742C 8024285C 26100004 */ addiu $s0, $s0, 4 +/* B37430 80242860 8E050000 */ lw $a1, ($s0) +/* B37434 80242864 26100004 */ addiu $s0, $s0, 4 +/* B37438 80242868 0240202D */ daddu $a0, $s2, $zero +/* B3743C 8024286C 0C0B1EAF */ jal get_variable +/* B37440 80242870 0040B82D */ daddu $s7, $v0, $zero +/* B37444 80242874 8E050000 */ lw $a1, ($s0) +/* B37448 80242878 26100004 */ addiu $s0, $s0, 4 +/* B3744C 8024287C 0240202D */ daddu $a0, $s2, $zero +/* B37450 80242880 0C0B1EAF */ jal get_variable +/* B37454 80242884 0040B02D */ daddu $s6, $v0, $zero +/* B37458 80242888 0240202D */ daddu $a0, $s2, $zero +/* B3745C 8024288C 3C05F4AC */ lui $a1, 0xf4ac +/* B37460 80242890 34A5D481 */ ori $a1, $a1, 0xd481 +/* B37464 80242894 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* B37468 80242898 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* B3746C 8024289C 8E140000 */ lw $s4, ($s0) +/* B37470 802428A0 00061880 */ sll $v1, $a2, 2 +/* B37474 802428A4 00661821 */ addu $v1, $v1, $a2 +/* B37478 802428A8 00031880 */ sll $v1, $v1, 2 +/* B3747C 802428AC 00661823 */ subu $v1, $v1, $a2 +/* B37480 802428B0 000330C0 */ sll $a2, $v1, 3 +/* B37484 802428B4 00661821 */ addu $v1, $v1, $a2 +/* B37488 802428B8 000318C0 */ sll $v1, $v1, 3 +/* B3748C 802428BC 3C01800B */ lui $at, 0x800b +/* B37490 802428C0 00230821 */ addu $at, $at, $v1 +/* B37494 802428C4 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* B37498 802428C8 8E150004 */ lw $s5, 4($s0) +/* B3749C 802428CC 4600010D */ trunc.w.s $f4, $f0 +/* B374A0 802428D0 44112000 */ mfc1 $s1, $f4 +/* B374A4 802428D4 0C0B1EAF */ jal get_variable +/* B374A8 802428D8 0040982D */ daddu $s3, $v0, $zero +/* B374AC 802428DC 4491B000 */ mtc1 $s1, $f22 +/* B374B0 802428E0 00000000 */ nop +/* B374B4 802428E4 4680B5A0 */ cvt.s.w $f22, $f22 +/* B374B8 802428E8 4600B306 */ mov.s $f12, $f22 +/* B374BC 802428EC 0C00A8D4 */ jal cos_deg +/* B374C0 802428F0 0040802D */ daddu $s0, $v0, $zero +/* B374C4 802428F4 4493A000 */ mtc1 $s3, $f20 +/* B374C8 802428F8 00000000 */ nop +/* B374CC 802428FC 4680A520 */ cvt.s.w $f20, $f20 +/* B374D0 80242900 4600A002 */ mul.s $f0, $f20, $f0 +/* B374D4 80242904 00000000 */ nop +/* B374D8 80242908 0240202D */ daddu $a0, $s2, $zero +/* B374DC 8024290C 44901000 */ mtc1 $s0, $f2 +/* B374E0 80242910 00000000 */ nop +/* B374E4 80242914 468010A0 */ cvt.s.w $f2, $f2 +/* B374E8 80242918 46001081 */ sub.s $f2, $f2, $f0 +/* B374EC 8024291C 3C05F4AC */ lui $a1, 0xf4ac +/* B374F0 80242920 4600110D */ trunc.w.s $f4, $f2 +/* B374F4 80242924 44102000 */ mfc1 $s0, $f4 +/* B374F8 80242928 0C0B1EAF */ jal get_variable +/* B374FC 8024292C 34A5D483 */ ori $a1, $a1, 0xd483 +/* B37500 80242930 4600B306 */ mov.s $f12, $f22 +/* B37504 80242934 0C00A8BB */ jal sin_deg +/* B37508 80242938 0040882D */ daddu $s1, $v0, $zero +/* B3750C 8024293C 4600A502 */ mul.s $f20, $f20, $f0 +/* B37510 80242940 00000000 */ nop +/* B37514 80242944 0240202D */ daddu $a0, $s2, $zero +/* B37518 80242948 44910000 */ mtc1 $s1, $f0 +/* B3751C 8024294C 00000000 */ nop +/* B37520 80242950 46800020 */ cvt.s.w $f0, $f0 +/* B37524 80242954 46140001 */ sub.s $f0, $f0, $f20 +/* B37528 80242958 0280282D */ daddu $a1, $s4, $zero +/* B3752C 8024295C 02173023 */ subu $a2, $s0, $s7 +/* B37530 80242960 4600010D */ trunc.w.s $f4, $f0 +/* B37534 80242964 44102000 */ mfc1 $s0, $f4 +/* B37538 80242968 0C0B2026 */ jal set_variable +/* B3753C 8024296C 02168023 */ subu $s0, $s0, $s6 +/* B37540 80242970 0240202D */ daddu $a0, $s2, $zero +/* B37544 80242974 02A0282D */ daddu $a1, $s5, $zero +/* B37548 80242978 0C0B2026 */ jal set_variable +/* B3754C 8024297C 0200302D */ daddu $a2, $s0, $zero +/* B37550 80242980 8FBF0030 */ lw $ra, 0x30($sp) +/* B37554 80242984 8FB7002C */ lw $s7, 0x2c($sp) +/* B37558 80242988 8FB60028 */ lw $s6, 0x28($sp) +/* B3755C 8024298C 8FB50024 */ lw $s5, 0x24($sp) +/* B37560 80242990 8FB40020 */ lw $s4, 0x20($sp) +/* B37564 80242994 8FB3001C */ lw $s3, 0x1c($sp) +/* B37568 80242998 8FB20018 */ lw $s2, 0x18($sp) +/* B3756C 8024299C 8FB10014 */ lw $s1, 0x14($sp) +/* B37570 802429A0 8FB00010 */ lw $s0, 0x10($sp) +/* B37574 802429A4 D7B60040 */ ldc1 $f22, 0x40($sp) +/* B37578 802429A8 D7B40038 */ ldc1 $f20, 0x38($sp) +/* B3757C 802429AC 24020002 */ addiu $v0, $zero, 2 +/* B37580 802429B0 03E00008 */ jr $ra +/* B37584 802429B4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8.s deleted file mode 100644 index a975cf7776..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429B8 -/* B37588 802429B8 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B3758C 802429BC 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B37590 802429C0 10A00002 */ beqz $a1, .L802429CC -/* B37594 802429C4 2402003C */ addiu $v0, $zero, 0x3c -/* B37598 802429C8 AC820070 */ sw $v0, 0x70($a0) -.L802429CC: -/* B3759C 802429CC C4620080 */ lwc1 $f2, 0x80($v1) -/* B375A0 802429D0 3C0141F0 */ lui $at, 0x41f0 -/* B375A4 802429D4 44810000 */ mtc1 $at, $f0 -/* B375A8 802429D8 00000000 */ nop -/* B375AC 802429DC 46001000 */ add.s $f0, $f2, $f0 -/* B375B0 802429E0 3C0143B4 */ lui $at, 0x43b4 -/* B375B4 802429E4 44811000 */ mtc1 $at, $f2 -/* B375B8 802429E8 00000000 */ nop -/* B375BC 802429EC 4600103E */ c.le.s $f2, $f0 -/* B375C0 802429F0 00000000 */ nop -/* B375C4 802429F4 45000003 */ bc1f .L80242A04 -/* B375C8 802429F8 E4600080 */ swc1 $f0, 0x80($v1) -/* B375CC 802429FC 46020001 */ sub.s $f0, $f0, $f2 -/* B375D0 80242A00 E4600080 */ swc1 $f0, 0x80($v1) -.L80242A04: -/* B375D4 80242A04 8C820070 */ lw $v0, 0x70($a0) -/* B375D8 80242A08 2442FFFF */ addiu $v0, $v0, -1 -/* B375DC 80242A0C AC820070 */ sw $v0, 0x70($a0) -/* B375E0 80242A10 000217C3 */ sra $v0, $v0, 0x1f -/* B375E4 80242A14 03E00008 */ jr $ra -/* B375E8 80242A18 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s new file mode 100644 index 0000000000..b6a329e9bc --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429B8_B37588 +/* B37588 802429B8 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* B3758C 802429BC 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* B37590 802429C0 10A00002 */ beqz $a1, .L802429CC +/* B37594 802429C4 2402003C */ addiu $v0, $zero, 0x3c +/* B37598 802429C8 AC820070 */ sw $v0, 0x70($a0) +.L802429CC: +/* B3759C 802429CC C4620080 */ lwc1 $f2, 0x80($v1) +/* B375A0 802429D0 3C0141F0 */ lui $at, 0x41f0 +/* B375A4 802429D4 44810000 */ mtc1 $at, $f0 +/* B375A8 802429D8 00000000 */ nop +/* B375AC 802429DC 46001000 */ add.s $f0, $f2, $f0 +/* B375B0 802429E0 3C0143B4 */ lui $at, 0x43b4 +/* B375B4 802429E4 44811000 */ mtc1 $at, $f2 +/* B375B8 802429E8 00000000 */ nop +/* B375BC 802429EC 4600103E */ c.le.s $f2, $f0 +/* B375C0 802429F0 00000000 */ nop +/* B375C4 802429F4 45000003 */ bc1f .L80242A04 +/* B375C8 802429F8 E4600080 */ swc1 $f0, 0x80($v1) +/* B375CC 802429FC 46020001 */ sub.s $f0, $f0, $f2 +/* B375D0 80242A00 E4600080 */ swc1 $f0, 0x80($v1) +.L80242A04: +/* B375D4 80242A04 8C820070 */ lw $v0, 0x70($a0) +/* B375D8 80242A08 2442FFFF */ addiu $v0, $v0, -1 +/* B375DC 80242A0C AC820070 */ sw $v0, 0x70($a0) +/* B375E0 80242A10 000217C3 */ sra $v0, $v0, 0x1f +/* B375E4 80242A14 03E00008 */ jr $ra +/* B375E8 80242A18 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC.s deleted file mode 100644 index 8eecf63cec..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AAC -/* B3767C 80242AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B37680 80242AB0 AFB10014 */ sw $s1, 0x14($sp) -/* B37684 80242AB4 0080882D */ daddu $s1, $a0, $zero -/* B37688 80242AB8 AFB00010 */ sw $s0, 0x10($sp) -/* B3768C 80242ABC 00A0802D */ daddu $s0, $a1, $zero -/* B37690 80242AC0 AFBF001C */ sw $ra, 0x1c($sp) -/* B37694 80242AC4 AFB20018 */ sw $s2, 0x18($sp) -/* B37698 80242AC8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B3769C 80242ACC 0C00EABB */ jal get_npc_unsafe -/* B376A0 80242AD0 2404FFFC */ addiu $a0, $zero, -4 -/* B376A4 80242AD4 12000017 */ beqz $s0, .L80242B34 -/* B376A8 80242AD8 0040902D */ daddu $s2, $v0, $zero -/* B376AC 80242ADC 0220202D */ daddu $a0, $s1, $zero -/* B376B0 80242AE0 3C05FE36 */ lui $a1, 0xfe36 -/* B376B4 80242AE4 0C0B210B */ jal get_float_variable -/* B376B8 80242AE8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B376BC 80242AEC 0220202D */ daddu $a0, $s1, $zero -/* B376C0 80242AF0 3C05FE36 */ lui $a1, 0xfe36 -/* B376C4 80242AF4 3C014270 */ lui $at, 0x4270 -/* B376C8 80242AF8 4481A000 */ mtc1 $at, $f20 -/* B376CC 80242AFC 34A53C85 */ ori $a1, $a1, 0x3c85 -/* B376D0 80242B00 46140003 */ div.s $f0, $f0, $f20 -/* B376D4 80242B04 0C0B210B */ jal get_float_variable -/* B376D8 80242B08 E6200074 */ swc1 $f0, 0x74($s1) -/* B376DC 80242B0C 0220202D */ daddu $a0, $s1, $zero -/* B376E0 80242B10 3C05FE36 */ lui $a1, 0xfe36 -/* B376E4 80242B14 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B376E8 80242B18 46140003 */ div.s $f0, $f0, $f20 -/* B376EC 80242B1C 0C0B210B */ jal get_float_variable -/* B376F0 80242B20 E6200078 */ swc1 $f0, 0x78($s1) -/* B376F4 80242B24 46140003 */ div.s $f0, $f0, $f20 -/* B376F8 80242B28 2402003C */ addiu $v0, $zero, 0x3c -/* B376FC 80242B2C E620007C */ swc1 $f0, 0x7c($s1) -/* B37700 80242B30 AE220070 */ sw $v0, 0x70($s1) -.L80242B34: -/* B37704 80242B34 C6400038 */ lwc1 $f0, 0x38($s2) -/* B37708 80242B38 C6220074 */ lwc1 $f2, 0x74($s1) -/* B3770C 80242B3C 46020000 */ add.s $f0, $f0, $f2 -/* B37710 80242B40 E6400038 */ swc1 $f0, 0x38($s2) -/* B37714 80242B44 C640003C */ lwc1 $f0, 0x3c($s2) -/* B37718 80242B48 C6220078 */ lwc1 $f2, 0x78($s1) -/* B3771C 80242B4C 46020000 */ add.s $f0, $f0, $f2 -/* B37720 80242B50 E640003C */ swc1 $f0, 0x3c($s2) -/* B37724 80242B54 C6400040 */ lwc1 $f0, 0x40($s2) -/* B37728 80242B58 C622007C */ lwc1 $f2, 0x7c($s1) -/* B3772C 80242B5C 46020000 */ add.s $f0, $f0, $f2 -/* B37730 80242B60 E6400040 */ swc1 $f0, 0x40($s2) -/* B37734 80242B64 8E230070 */ lw $v1, 0x70($s1) -/* B37738 80242B68 2463FFFF */ addiu $v1, $v1, -1 -/* B3773C 80242B6C 2C620001 */ sltiu $v0, $v1, 1 -/* B37740 80242B70 AE230070 */ sw $v1, 0x70($s1) -/* B37744 80242B74 8FBF001C */ lw $ra, 0x1c($sp) -/* B37748 80242B78 8FB20018 */ lw $s2, 0x18($sp) -/* B3774C 80242B7C 8FB10014 */ lw $s1, 0x14($sp) -/* B37750 80242B80 8FB00010 */ lw $s0, 0x10($sp) -/* B37754 80242B84 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B37758 80242B88 00021040 */ sll $v0, $v0, 1 -/* B3775C 80242B8C 03E00008 */ jr $ra -/* B37760 80242B90 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s new file mode 100644 index 0000000000..2378ae9c8f --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242AAC_B3767C +/* B3767C 80242AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B37680 80242AB0 AFB10014 */ sw $s1, 0x14($sp) +/* B37684 80242AB4 0080882D */ daddu $s1, $a0, $zero +/* B37688 80242AB8 AFB00010 */ sw $s0, 0x10($sp) +/* B3768C 80242ABC 00A0802D */ daddu $s0, $a1, $zero +/* B37690 80242AC0 AFBF001C */ sw $ra, 0x1c($sp) +/* B37694 80242AC4 AFB20018 */ sw $s2, 0x18($sp) +/* B37698 80242AC8 F7B40020 */ sdc1 $f20, 0x20($sp) +/* B3769C 80242ACC 0C00EABB */ jal get_npc_unsafe +/* B376A0 80242AD0 2404FFFC */ addiu $a0, $zero, -4 +/* B376A4 80242AD4 12000017 */ beqz $s0, .L80242B34 +/* B376A8 80242AD8 0040902D */ daddu $s2, $v0, $zero +/* B376AC 80242ADC 0220202D */ daddu $a0, $s1, $zero +/* B376B0 80242AE0 3C05FE36 */ lui $a1, 0xfe36 +/* B376B4 80242AE4 0C0B210B */ jal get_float_variable +/* B376B8 80242AE8 34A53C80 */ ori $a1, $a1, 0x3c80 +/* B376BC 80242AEC 0220202D */ daddu $a0, $s1, $zero +/* B376C0 80242AF0 3C05FE36 */ lui $a1, 0xfe36 +/* B376C4 80242AF4 3C014270 */ lui $at, 0x4270 +/* B376C8 80242AF8 4481A000 */ mtc1 $at, $f20 +/* B376CC 80242AFC 34A53C85 */ ori $a1, $a1, 0x3c85 +/* B376D0 80242B00 46140003 */ div.s $f0, $f0, $f20 +/* B376D4 80242B04 0C0B210B */ jal get_float_variable +/* B376D8 80242B08 E6200074 */ swc1 $f0, 0x74($s1) +/* B376DC 80242B0C 0220202D */ daddu $a0, $s1, $zero +/* B376E0 80242B10 3C05FE36 */ lui $a1, 0xfe36 +/* B376E4 80242B14 34A53C81 */ ori $a1, $a1, 0x3c81 +/* B376E8 80242B18 46140003 */ div.s $f0, $f0, $f20 +/* B376EC 80242B1C 0C0B210B */ jal get_float_variable +/* B376F0 80242B20 E6200078 */ swc1 $f0, 0x78($s1) +/* B376F4 80242B24 46140003 */ div.s $f0, $f0, $f20 +/* B376F8 80242B28 2402003C */ addiu $v0, $zero, 0x3c +/* B376FC 80242B2C E620007C */ swc1 $f0, 0x7c($s1) +/* B37700 80242B30 AE220070 */ sw $v0, 0x70($s1) +.L80242B34: +/* B37704 80242B34 C6400038 */ lwc1 $f0, 0x38($s2) +/* B37708 80242B38 C6220074 */ lwc1 $f2, 0x74($s1) +/* B3770C 80242B3C 46020000 */ add.s $f0, $f0, $f2 +/* B37710 80242B40 E6400038 */ swc1 $f0, 0x38($s2) +/* B37714 80242B44 C640003C */ lwc1 $f0, 0x3c($s2) +/* B37718 80242B48 C6220078 */ lwc1 $f2, 0x78($s1) +/* B3771C 80242B4C 46020000 */ add.s $f0, $f0, $f2 +/* B37720 80242B50 E640003C */ swc1 $f0, 0x3c($s2) +/* B37724 80242B54 C6400040 */ lwc1 $f0, 0x40($s2) +/* B37728 80242B58 C622007C */ lwc1 $f2, 0x7c($s1) +/* B3772C 80242B5C 46020000 */ add.s $f0, $f0, $f2 +/* B37730 80242B60 E6400040 */ swc1 $f0, 0x40($s2) +/* B37734 80242B64 8E230070 */ lw $v1, 0x70($s1) +/* B37738 80242B68 2463FFFF */ addiu $v1, $v1, -1 +/* B3773C 80242B6C 2C620001 */ sltiu $v0, $v1, 1 +/* B37740 80242B70 AE230070 */ sw $v1, 0x70($s1) +/* B37744 80242B74 8FBF001C */ lw $ra, 0x1c($sp) +/* B37748 80242B78 8FB20018 */ lw $s2, 0x18($sp) +/* B3774C 80242B7C 8FB10014 */ lw $s1, 0x14($sp) +/* B37750 80242B80 8FB00010 */ lw $s0, 0x10($sp) +/* B37754 80242B84 D7B40020 */ ldc1 $f20, 0x20($sp) +/* B37758 80242B88 00021040 */ sll $v0, $v0, 1 +/* B3775C 80242B8C 03E00008 */ jr $ra +/* B37760 80242B90 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94.s deleted file mode 100644 index b87c78f098..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B94 -/* B37764 80242B94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37768 80242B98 3C058025 */ lui $a1, 0x8025 -/* B3776C 80242B9C 8CA5FEF0 */ lw $a1, -0x110($a1) -/* B37770 80242BA0 AFBF0010 */ sw $ra, 0x10($sp) -/* B37774 80242BA4 0C0B1EAF */ jal get_variable -/* B37778 80242BA8 0000202D */ daddu $a0, $zero, $zero -/* B3777C 80242BAC 0040182D */ daddu $v1, $v0, $zero -/* B37780 80242BB0 24020001 */ addiu $v0, $zero, 1 -/* B37784 80242BB4 14620006 */ bne $v1, $v0, .L80242BD0 -/* B37788 80242BB8 24020002 */ addiu $v0, $zero, 2 -/* B3778C 80242BBC 44800000 */ mtc1 $zero, $f0 -/* B37790 80242BC0 00000000 */ nop -/* B37794 80242BC4 44050000 */ mfc1 $a1, $f0 -/* B37798 80242BC8 08090AFA */ j .L80242BE8 -/* B3779C 80242BCC 0000202D */ daddu $a0, $zero, $zero -.L80242BD0: -/* B377A0 80242BD0 14620008 */ bne $v1, $v0, .L80242BF4 -/* B377A4 80242BD4 24040001 */ addiu $a0, $zero, 1 -/* B377A8 80242BD8 44800000 */ mtc1 $zero, $f0 -/* B377AC 80242BDC 00000000 */ nop -/* B377B0 80242BE0 44050000 */ mfc1 $a1, $f0 -/* B377B4 80242BE4 00000000 */ nop -.L80242BE8: -/* B377B8 80242BE8 00A0302D */ daddu $a2, $a1, $zero -/* B377BC 80242BEC 0C01C5A4 */ jal func_80071690 -/* B377C0 80242BF0 00A0382D */ daddu $a3, $a1, $zero -.L80242BF4: -/* B377C4 80242BF4 8FBF0010 */ lw $ra, 0x10($sp) -/* B377C8 80242BF8 03E00008 */ jr $ra -/* B377CC 80242BFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s new file mode 100644 index 0000000000..d9fd2b4aba --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242B94_B37764.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B94_B37764 +/* B37764 80242B94 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B37768 80242B98 3C058025 */ lui $a1, 0x8025 +/* B3776C 80242B9C 8CA5FEF0 */ lw $a1, -0x110($a1) +/* B37770 80242BA0 AFBF0010 */ sw $ra, 0x10($sp) +/* B37774 80242BA4 0C0B1EAF */ jal get_variable +/* B37778 80242BA8 0000202D */ daddu $a0, $zero, $zero +/* B3777C 80242BAC 0040182D */ daddu $v1, $v0, $zero +/* B37780 80242BB0 24020001 */ addiu $v0, $zero, 1 +/* B37784 80242BB4 14620006 */ bne $v1, $v0, .L80242BD0 +/* B37788 80242BB8 24020002 */ addiu $v0, $zero, 2 +/* B3778C 80242BBC 44800000 */ mtc1 $zero, $f0 +/* B37790 80242BC0 00000000 */ nop +/* B37794 80242BC4 44050000 */ mfc1 $a1, $f0 +/* B37798 80242BC8 08090AFA */ j .L80242BE8 +/* B3779C 80242BCC 0000202D */ daddu $a0, $zero, $zero +.L80242BD0: +/* B377A0 80242BD0 14620008 */ bne $v1, $v0, .L80242BF4 +/* B377A4 80242BD4 24040001 */ addiu $a0, $zero, 1 +/* B377A8 80242BD8 44800000 */ mtc1 $zero, $f0 +/* B377AC 80242BDC 00000000 */ nop +/* B377B0 80242BE0 44050000 */ mfc1 $a1, $f0 +/* B377B4 80242BE4 00000000 */ nop +.L80242BE8: +/* B377B8 80242BE8 00A0302D */ daddu $a2, $a1, $zero +/* B377BC 80242BEC 0C01C5A4 */ jal func_80071690 +/* B377C0 80242BF0 00A0382D */ daddu $a3, $a1, $zero +.L80242BF4: +/* B377C4 80242BF4 8FBF0010 */ lw $ra, 0x10($sp) +/* B377C8 80242BF8 03E00008 */ jr $ra +/* B377CC 80242BFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00.s deleted file mode 100644 index 24a9564a5e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C00 -/* B377D0 80242C00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B377D4 80242C04 3C058024 */ lui $a1, 0x8024 -/* B377D8 80242C08 24A52B94 */ addiu $a1, $a1, 0x2b94 -/* B377DC 80242C0C AFBF0010 */ sw $ra, 0x10($sp) -/* B377E0 80242C10 0C048C8F */ jal bind_dynamic_entity_7 -/* B377E4 80242C14 0000202D */ daddu $a0, $zero, $zero -/* B377E8 80242C18 8FBF0010 */ lw $ra, 0x10($sp) -/* B377EC 80242C1C 3C018025 */ lui $at, 0x8025 -/* B377F0 80242C20 AC22FED8 */ sw $v0, -0x128($at) -/* B377F4 80242C24 24020002 */ addiu $v0, $zero, 2 -/* B377F8 80242C28 03E00008 */ jr $ra -/* B377FC 80242C2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s new file mode 100644 index 0000000000..8af13a7ac1 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C00_B377D0.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C00_B377D0 +/* B377D0 80242C00 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B377D4 80242C04 3C058024 */ lui $a1, 0x8024 +/* B377D8 80242C08 24A52B94 */ addiu $a1, $a1, 0x2b94 +/* B377DC 80242C0C AFBF0010 */ sw $ra, 0x10($sp) +/* B377E0 80242C10 0C048C8F */ jal bind_dynamic_entity_7 +/* B377E4 80242C14 0000202D */ daddu $a0, $zero, $zero +/* B377E8 80242C18 8FBF0010 */ lw $ra, 0x10($sp) +/* B377EC 80242C1C 3C018025 */ lui $at, 0x8025 +/* B377F0 80242C20 AC22FED8 */ sw $v0, -0x128($at) +/* B377F4 80242C24 24020002 */ addiu $v0, $zero, 2 +/* B377F8 80242C28 03E00008 */ jr $ra +/* B377FC 80242C2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C30.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C30.s deleted file mode 100644 index f7d28ca15c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C30.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C30 -/* B37800 80242C30 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B37804 80242C34 AFB10014 */ sw $s1, 0x14($sp) -/* B37808 80242C38 0080882D */ daddu $s1, $a0, $zero -/* B3780C 80242C3C AFBF0018 */ sw $ra, 0x18($sp) -/* B37810 80242C40 AFB00010 */ sw $s0, 0x10($sp) -/* B37814 80242C44 8E30000C */ lw $s0, 0xc($s1) -/* B37818 80242C48 8E050000 */ lw $a1, ($s0) -/* B3781C 80242C4C 0C0B1EAF */ jal get_variable -/* B37820 80242C50 26100004 */ addiu $s0, $s0, 4 -/* B37824 80242C54 AE22008C */ sw $v0, 0x8c($s1) -/* B37828 80242C58 8E050000 */ lw $a1, ($s0) -/* B3782C 80242C5C 26100004 */ addiu $s0, $s0, 4 -/* B37830 80242C60 0C0B1EAF */ jal get_variable -/* B37834 80242C64 0220202D */ daddu $a0, $s1, $zero -/* B37838 80242C68 AE220090 */ sw $v0, 0x90($s1) -/* B3783C 80242C6C 8E050000 */ lw $a1, ($s0) -/* B37840 80242C70 26100004 */ addiu $s0, $s0, 4 -/* B37844 80242C74 0C0B1EAF */ jal get_variable -/* B37848 80242C78 0220202D */ daddu $a0, $s1, $zero -/* B3784C 80242C7C AE220094 */ sw $v0, 0x94($s1) -/* B37850 80242C80 8E050000 */ lw $a1, ($s0) -/* B37854 80242C84 26100004 */ addiu $s0, $s0, 4 -/* B37858 80242C88 0C0B1EAF */ jal get_variable -/* B3785C 80242C8C 0220202D */ daddu $a0, $s1, $zero -/* B37860 80242C90 AE220098 */ sw $v0, 0x98($s1) -/* B37864 80242C94 8E050000 */ lw $a1, ($s0) -/* B37868 80242C98 26100004 */ addiu $s0, $s0, 4 -/* B3786C 80242C9C 0C0B1EAF */ jal get_variable -/* B37870 80242CA0 0220202D */ daddu $a0, $s1, $zero -/* B37874 80242CA4 AE22009C */ sw $v0, 0x9c($s1) -/* B37878 80242CA8 8E050000 */ lw $a1, ($s0) -/* B3787C 80242CAC 26100004 */ addiu $s0, $s0, 4 -/* B37880 80242CB0 0C0B1EAF */ jal get_variable -/* B37884 80242CB4 0220202D */ daddu $a0, $s1, $zero -/* B37888 80242CB8 AE2200A0 */ sw $v0, 0xa0($s1) -/* B3788C 80242CBC 8E050000 */ lw $a1, ($s0) -/* B37890 80242CC0 26100004 */ addiu $s0, $s0, 4 -/* B37894 80242CC4 0C0B1EAF */ jal get_variable -/* B37898 80242CC8 0220202D */ daddu $a0, $s1, $zero -/* B3789C 80242CCC AE2200A4 */ sw $v0, 0xa4($s1) -/* B378A0 80242CD0 8E050000 */ lw $a1, ($s0) -/* B378A4 80242CD4 26100004 */ addiu $s0, $s0, 4 -/* B378A8 80242CD8 0C0B1EAF */ jal get_variable -/* B378AC 80242CDC 0220202D */ daddu $a0, $s1, $zero -/* B378B0 80242CE0 AE2200A8 */ sw $v0, 0xa8($s1) -/* B378B4 80242CE4 8E050000 */ lw $a1, ($s0) -/* B378B8 80242CE8 26100004 */ addiu $s0, $s0, 4 -/* B378BC 80242CEC 0C0B1EAF */ jal get_variable -/* B378C0 80242CF0 0220202D */ daddu $a0, $s1, $zero -/* B378C4 80242CF4 AE2200AC */ sw $v0, 0xac($s1) -/* B378C8 80242CF8 8E050000 */ lw $a1, ($s0) -/* B378CC 80242CFC 0C0B1EAF */ jal get_variable -/* B378D0 80242D00 0220202D */ daddu $a0, $s1, $zero -/* B378D4 80242D04 AE2200B0 */ sw $v0, 0xb0($s1) -/* B378D8 80242D08 8FBF0018 */ lw $ra, 0x18($sp) -/* B378DC 80242D0C 8FB10014 */ lw $s1, 0x14($sp) -/* B378E0 80242D10 8FB00010 */ lw $s0, 0x10($sp) -/* B378E4 80242D14 24020002 */ addiu $v0, $zero, 2 -/* B378E8 80242D18 03E00008 */ jr $ra -/* B378EC 80242D1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C30_B37800.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C30_B37800.s new file mode 100644 index 0000000000..25955915de --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242C30_B37800.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C30_B37800 +/* B37800 80242C30 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B37804 80242C34 AFB10014 */ sw $s1, 0x14($sp) +/* B37808 80242C38 0080882D */ daddu $s1, $a0, $zero +/* B3780C 80242C3C AFBF0018 */ sw $ra, 0x18($sp) +/* B37810 80242C40 AFB00010 */ sw $s0, 0x10($sp) +/* B37814 80242C44 8E30000C */ lw $s0, 0xc($s1) +/* B37818 80242C48 8E050000 */ lw $a1, ($s0) +/* B3781C 80242C4C 0C0B1EAF */ jal get_variable +/* B37820 80242C50 26100004 */ addiu $s0, $s0, 4 +/* B37824 80242C54 AE22008C */ sw $v0, 0x8c($s1) +/* B37828 80242C58 8E050000 */ lw $a1, ($s0) +/* B3782C 80242C5C 26100004 */ addiu $s0, $s0, 4 +/* B37830 80242C60 0C0B1EAF */ jal get_variable +/* B37834 80242C64 0220202D */ daddu $a0, $s1, $zero +/* B37838 80242C68 AE220090 */ sw $v0, 0x90($s1) +/* B3783C 80242C6C 8E050000 */ lw $a1, ($s0) +/* B37840 80242C70 26100004 */ addiu $s0, $s0, 4 +/* B37844 80242C74 0C0B1EAF */ jal get_variable +/* B37848 80242C78 0220202D */ daddu $a0, $s1, $zero +/* B3784C 80242C7C AE220094 */ sw $v0, 0x94($s1) +/* B37850 80242C80 8E050000 */ lw $a1, ($s0) +/* B37854 80242C84 26100004 */ addiu $s0, $s0, 4 +/* B37858 80242C88 0C0B1EAF */ jal get_variable +/* B3785C 80242C8C 0220202D */ daddu $a0, $s1, $zero +/* B37860 80242C90 AE220098 */ sw $v0, 0x98($s1) +/* B37864 80242C94 8E050000 */ lw $a1, ($s0) +/* B37868 80242C98 26100004 */ addiu $s0, $s0, 4 +/* B3786C 80242C9C 0C0B1EAF */ jal get_variable +/* B37870 80242CA0 0220202D */ daddu $a0, $s1, $zero +/* B37874 80242CA4 AE22009C */ sw $v0, 0x9c($s1) +/* B37878 80242CA8 8E050000 */ lw $a1, ($s0) +/* B3787C 80242CAC 26100004 */ addiu $s0, $s0, 4 +/* B37880 80242CB0 0C0B1EAF */ jal get_variable +/* B37884 80242CB4 0220202D */ daddu $a0, $s1, $zero +/* B37888 80242CB8 AE2200A0 */ sw $v0, 0xa0($s1) +/* B3788C 80242CBC 8E050000 */ lw $a1, ($s0) +/* B37890 80242CC0 26100004 */ addiu $s0, $s0, 4 +/* B37894 80242CC4 0C0B1EAF */ jal get_variable +/* B37898 80242CC8 0220202D */ daddu $a0, $s1, $zero +/* B3789C 80242CCC AE2200A4 */ sw $v0, 0xa4($s1) +/* B378A0 80242CD0 8E050000 */ lw $a1, ($s0) +/* B378A4 80242CD4 26100004 */ addiu $s0, $s0, 4 +/* B378A8 80242CD8 0C0B1EAF */ jal get_variable +/* B378AC 80242CDC 0220202D */ daddu $a0, $s1, $zero +/* B378B0 80242CE0 AE2200A8 */ sw $v0, 0xa8($s1) +/* B378B4 80242CE4 8E050000 */ lw $a1, ($s0) +/* B378B8 80242CE8 26100004 */ addiu $s0, $s0, 4 +/* B378BC 80242CEC 0C0B1EAF */ jal get_variable +/* B378C0 80242CF0 0220202D */ daddu $a0, $s1, $zero +/* B378C4 80242CF4 AE2200AC */ sw $v0, 0xac($s1) +/* B378C8 80242CF8 8E050000 */ lw $a1, ($s0) +/* B378CC 80242CFC 0C0B1EAF */ jal get_variable +/* B378D0 80242D00 0220202D */ daddu $a0, $s1, $zero +/* B378D4 80242D04 AE2200B0 */ sw $v0, 0xb0($s1) +/* B378D8 80242D08 8FBF0018 */ lw $ra, 0x18($sp) +/* B378DC 80242D0C 8FB10014 */ lw $s1, 0x14($sp) +/* B378E0 80242D10 8FB00010 */ lw $s0, 0x10($sp) +/* B378E4 80242D14 24020002 */ addiu $v0, $zero, 2 +/* B378E8 80242D18 03E00008 */ jr $ra +/* B378EC 80242D1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20.s deleted file mode 100644 index 6b364ee275..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D20 -/* B378F0 80242D20 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B378F4 80242D24 AFB1001C */ sw $s1, 0x1c($sp) -/* B378F8 80242D28 0080882D */ daddu $s1, $a0, $zero -/* B378FC 80242D2C AFBF0034 */ sw $ra, 0x34($sp) -/* B37900 80242D30 AFB60030 */ sw $s6, 0x30($sp) -/* B37904 80242D34 AFB5002C */ sw $s5, 0x2c($sp) -/* B37908 80242D38 AFB40028 */ sw $s4, 0x28($sp) -/* B3790C 80242D3C AFB30024 */ sw $s3, 0x24($sp) -/* B37910 80242D40 AFB20020 */ sw $s2, 0x20($sp) -/* B37914 80242D44 AFB00018 */ sw $s0, 0x18($sp) -/* B37918 80242D48 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B3791C 80242D4C F7B40038 */ sdc1 $f20, 0x38($sp) -/* B37920 80242D50 8E30000C */ lw $s0, 0xc($s1) -/* B37924 80242D54 8E160000 */ lw $s6, ($s0) -/* B37928 80242D58 26100004 */ addiu $s0, $s0, 4 -/* B3792C 80242D5C 0C0B1EAF */ jal get_variable -/* B37930 80242D60 02C0282D */ daddu $a1, $s6, $zero -/* B37934 80242D64 44820000 */ mtc1 $v0, $f0 -/* B37938 80242D68 00000000 */ nop -/* B3793C 80242D6C 46800020 */ cvt.s.w $f0, $f0 -/* B37940 80242D70 E7A00010 */ swc1 $f0, 0x10($sp) -/* B37944 80242D74 8E140000 */ lw $s4, ($s0) -/* B37948 80242D78 26100004 */ addiu $s0, $s0, 4 -/* B3794C 80242D7C 0220202D */ daddu $a0, $s1, $zero -/* B37950 80242D80 0C0B1EAF */ jal get_variable -/* B37954 80242D84 0280282D */ daddu $a1, $s4, $zero -/* B37958 80242D88 0220202D */ daddu $a0, $s1, $zero -/* B3795C 80242D8C 8E150000 */ lw $s5, ($s0) -/* B37960 80242D90 4482B000 */ mtc1 $v0, $f22 -/* B37964 80242D94 00000000 */ nop -/* B37968 80242D98 4680B5A0 */ cvt.s.w $f22, $f22 -/* B3796C 80242D9C 0C0B1EAF */ jal get_variable -/* B37970 80242DA0 02A0282D */ daddu $a1, $s5, $zero -/* B37974 80242DA4 2404FFFC */ addiu $a0, $zero, -4 -/* B37978 80242DA8 44820000 */ mtc1 $v0, $f0 -/* B3797C 80242DAC 00000000 */ nop -/* B37980 80242DB0 46800020 */ cvt.s.w $f0, $f0 -/* B37984 80242DB4 0C00EABB */ jal get_npc_unsafe -/* B37988 80242DB8 E7A00014 */ swc1 $f0, 0x14($sp) -/* B3798C 80242DBC 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* B37990 80242DC0 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* B37994 80242DC4 3C014334 */ lui $at, 0x4334 -/* B37998 80242DC8 44816000 */ mtc1 $at, $f12 -/* B3799C 80242DCC 00041880 */ sll $v1, $a0, 2 -/* B379A0 80242DD0 00641821 */ addu $v1, $v1, $a0 -/* B379A4 80242DD4 00031880 */ sll $v1, $v1, 2 -/* B379A8 80242DD8 00641823 */ subu $v1, $v1, $a0 -/* B379AC 80242DDC 000320C0 */ sll $a0, $v1, 3 -/* B379B0 80242DE0 00641821 */ addu $v1, $v1, $a0 -/* B379B4 80242DE4 000318C0 */ sll $v1, $v1, 3 -/* B379B8 80242DE8 3C01800B */ lui $at, 0x800b -/* B379BC 80242DEC 00230821 */ addu $at, $at, $v1 -/* B379C0 80242DF0 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B379C4 80242DF4 460C0300 */ add.s $f12, $f0, $f12 -/* B379C8 80242DF8 0C00A6C9 */ jal clamp_angle -/* B379CC 80242DFC 0040982D */ daddu $s3, $v0, $zero -/* B379D0 80242E00 27B00010 */ addiu $s0, $sp, 0x10 -/* B379D4 80242E04 0200202D */ daddu $a0, $s0, $zero -/* B379D8 80242E08 27B20014 */ addiu $s2, $sp, 0x14 -/* B379DC 80242E0C 0240282D */ daddu $a1, $s2, $zero -/* B379E0 80242E10 3C064170 */ lui $a2, 0x4170 -/* B379E4 80242E14 8E67000C */ lw $a3, 0xc($s3) -/* B379E8 80242E18 0C00A7E7 */ jal add_vec2D_polar -/* B379EC 80242E1C 46000506 */ mov.s $f20, $f0 -/* B379F0 80242E20 0200202D */ daddu $a0, $s0, $zero -/* B379F4 80242E24 3C064120 */ lui $a2, 0x4120 -/* B379F8 80242E28 4407A000 */ mfc1 $a3, $f20 -/* B379FC 80242E2C 0C00A7E7 */ jal add_vec2D_polar -/* B37A00 80242E30 0240282D */ daddu $a1, $s2, $zero -/* B37A04 80242E34 0220202D */ daddu $a0, $s1, $zero -/* B37A08 80242E38 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B37A0C 80242E3C 4600008D */ trunc.w.s $f2, $f0 -/* B37A10 80242E40 44061000 */ mfc1 $a2, $f2 -/* B37A14 80242E44 0C0B2026 */ jal set_variable -/* B37A18 80242E48 02C0282D */ daddu $a1, $s6, $zero -/* B37A1C 80242E4C 0220202D */ daddu $a0, $s1, $zero -/* B37A20 80242E50 4600B08D */ trunc.w.s $f2, $f22 -/* B37A24 80242E54 44061000 */ mfc1 $a2, $f2 -/* B37A28 80242E58 0C0B2026 */ jal set_variable -/* B37A2C 80242E5C 0280282D */ daddu $a1, $s4, $zero -/* B37A30 80242E60 0220202D */ daddu $a0, $s1, $zero -/* B37A34 80242E64 C7A00014 */ lwc1 $f0, 0x14($sp) -/* B37A38 80242E68 4600008D */ trunc.w.s $f2, $f0 -/* B37A3C 80242E6C 44061000 */ mfc1 $a2, $f2 -/* B37A40 80242E70 0C0B2026 */ jal set_variable -/* B37A44 80242E74 02A0282D */ daddu $a1, $s5, $zero -/* B37A48 80242E78 8FBF0034 */ lw $ra, 0x34($sp) -/* B37A4C 80242E7C 8FB60030 */ lw $s6, 0x30($sp) -/* B37A50 80242E80 8FB5002C */ lw $s5, 0x2c($sp) -/* B37A54 80242E84 8FB40028 */ lw $s4, 0x28($sp) -/* B37A58 80242E88 8FB30024 */ lw $s3, 0x24($sp) -/* B37A5C 80242E8C 8FB20020 */ lw $s2, 0x20($sp) -/* B37A60 80242E90 8FB1001C */ lw $s1, 0x1c($sp) -/* B37A64 80242E94 8FB00018 */ lw $s0, 0x18($sp) -/* B37A68 80242E98 D7B60040 */ ldc1 $f22, 0x40($sp) -/* B37A6C 80242E9C D7B40038 */ ldc1 $f20, 0x38($sp) -/* B37A70 80242EA0 24020002 */ addiu $v0, $zero, 2 -/* B37A74 80242EA4 03E00008 */ jr $ra -/* B37A78 80242EA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20_B378F0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20_B378F0.s new file mode 100644 index 0000000000..db5df6068f --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242D20_B378F0.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D20_B378F0 +/* B378F0 80242D20 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B378F4 80242D24 AFB1001C */ sw $s1, 0x1c($sp) +/* B378F8 80242D28 0080882D */ daddu $s1, $a0, $zero +/* B378FC 80242D2C AFBF0034 */ sw $ra, 0x34($sp) +/* B37900 80242D30 AFB60030 */ sw $s6, 0x30($sp) +/* B37904 80242D34 AFB5002C */ sw $s5, 0x2c($sp) +/* B37908 80242D38 AFB40028 */ sw $s4, 0x28($sp) +/* B3790C 80242D3C AFB30024 */ sw $s3, 0x24($sp) +/* B37910 80242D40 AFB20020 */ sw $s2, 0x20($sp) +/* B37914 80242D44 AFB00018 */ sw $s0, 0x18($sp) +/* B37918 80242D48 F7B60040 */ sdc1 $f22, 0x40($sp) +/* B3791C 80242D4C F7B40038 */ sdc1 $f20, 0x38($sp) +/* B37920 80242D50 8E30000C */ lw $s0, 0xc($s1) +/* B37924 80242D54 8E160000 */ lw $s6, ($s0) +/* B37928 80242D58 26100004 */ addiu $s0, $s0, 4 +/* B3792C 80242D5C 0C0B1EAF */ jal get_variable +/* B37930 80242D60 02C0282D */ daddu $a1, $s6, $zero +/* B37934 80242D64 44820000 */ mtc1 $v0, $f0 +/* B37938 80242D68 00000000 */ nop +/* B3793C 80242D6C 46800020 */ cvt.s.w $f0, $f0 +/* B37940 80242D70 E7A00010 */ swc1 $f0, 0x10($sp) +/* B37944 80242D74 8E140000 */ lw $s4, ($s0) +/* B37948 80242D78 26100004 */ addiu $s0, $s0, 4 +/* B3794C 80242D7C 0220202D */ daddu $a0, $s1, $zero +/* B37950 80242D80 0C0B1EAF */ jal get_variable +/* B37954 80242D84 0280282D */ daddu $a1, $s4, $zero +/* B37958 80242D88 0220202D */ daddu $a0, $s1, $zero +/* B3795C 80242D8C 8E150000 */ lw $s5, ($s0) +/* B37960 80242D90 4482B000 */ mtc1 $v0, $f22 +/* B37964 80242D94 00000000 */ nop +/* B37968 80242D98 4680B5A0 */ cvt.s.w $f22, $f22 +/* B3796C 80242D9C 0C0B1EAF */ jal get_variable +/* B37970 80242DA0 02A0282D */ daddu $a1, $s5, $zero +/* B37974 80242DA4 2404FFFC */ addiu $a0, $zero, -4 +/* B37978 80242DA8 44820000 */ mtc1 $v0, $f0 +/* B3797C 80242DAC 00000000 */ nop +/* B37980 80242DB0 46800020 */ cvt.s.w $f0, $f0 +/* B37984 80242DB4 0C00EABB */ jal get_npc_unsafe +/* B37988 80242DB8 E7A00014 */ swc1 $f0, 0x14($sp) +/* B3798C 80242DBC 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* B37990 80242DC0 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* B37994 80242DC4 3C014334 */ lui $at, 0x4334 +/* B37998 80242DC8 44816000 */ mtc1 $at, $f12 +/* B3799C 80242DCC 00041880 */ sll $v1, $a0, 2 +/* B379A0 80242DD0 00641821 */ addu $v1, $v1, $a0 +/* B379A4 80242DD4 00031880 */ sll $v1, $v1, 2 +/* B379A8 80242DD8 00641823 */ subu $v1, $v1, $a0 +/* B379AC 80242DDC 000320C0 */ sll $a0, $v1, 3 +/* B379B0 80242DE0 00641821 */ addu $v1, $v1, $a0 +/* B379B4 80242DE4 000318C0 */ sll $v1, $v1, 3 +/* B379B8 80242DE8 3C01800B */ lui $at, 0x800b +/* B379BC 80242DEC 00230821 */ addu $at, $at, $v1 +/* B379C0 80242DF0 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* B379C4 80242DF4 460C0300 */ add.s $f12, $f0, $f12 +/* B379C8 80242DF8 0C00A6C9 */ jal clamp_angle +/* B379CC 80242DFC 0040982D */ daddu $s3, $v0, $zero +/* B379D0 80242E00 27B00010 */ addiu $s0, $sp, 0x10 +/* B379D4 80242E04 0200202D */ daddu $a0, $s0, $zero +/* B379D8 80242E08 27B20014 */ addiu $s2, $sp, 0x14 +/* B379DC 80242E0C 0240282D */ daddu $a1, $s2, $zero +/* B379E0 80242E10 3C064170 */ lui $a2, 0x4170 +/* B379E4 80242E14 8E67000C */ lw $a3, 0xc($s3) +/* B379E8 80242E18 0C00A7E7 */ jal add_vec2D_polar +/* B379EC 80242E1C 46000506 */ mov.s $f20, $f0 +/* B379F0 80242E20 0200202D */ daddu $a0, $s0, $zero +/* B379F4 80242E24 3C064120 */ lui $a2, 0x4120 +/* B379F8 80242E28 4407A000 */ mfc1 $a3, $f20 +/* B379FC 80242E2C 0C00A7E7 */ jal add_vec2D_polar +/* B37A00 80242E30 0240282D */ daddu $a1, $s2, $zero +/* B37A04 80242E34 0220202D */ daddu $a0, $s1, $zero +/* B37A08 80242E38 C7A00010 */ lwc1 $f0, 0x10($sp) +/* B37A0C 80242E3C 4600008D */ trunc.w.s $f2, $f0 +/* B37A10 80242E40 44061000 */ mfc1 $a2, $f2 +/* B37A14 80242E44 0C0B2026 */ jal set_variable +/* B37A18 80242E48 02C0282D */ daddu $a1, $s6, $zero +/* B37A1C 80242E4C 0220202D */ daddu $a0, $s1, $zero +/* B37A20 80242E50 4600B08D */ trunc.w.s $f2, $f22 +/* B37A24 80242E54 44061000 */ mfc1 $a2, $f2 +/* B37A28 80242E58 0C0B2026 */ jal set_variable +/* B37A2C 80242E5C 0280282D */ daddu $a1, $s4, $zero +/* B37A30 80242E60 0220202D */ daddu $a0, $s1, $zero +/* B37A34 80242E64 C7A00014 */ lwc1 $f0, 0x14($sp) +/* B37A38 80242E68 4600008D */ trunc.w.s $f2, $f0 +/* B37A3C 80242E6C 44061000 */ mfc1 $a2, $f2 +/* B37A40 80242E70 0C0B2026 */ jal set_variable +/* B37A44 80242E74 02A0282D */ daddu $a1, $s5, $zero +/* B37A48 80242E78 8FBF0034 */ lw $ra, 0x34($sp) +/* B37A4C 80242E7C 8FB60030 */ lw $s6, 0x30($sp) +/* B37A50 80242E80 8FB5002C */ lw $s5, 0x2c($sp) +/* B37A54 80242E84 8FB40028 */ lw $s4, 0x28($sp) +/* B37A58 80242E88 8FB30024 */ lw $s3, 0x24($sp) +/* B37A5C 80242E8C 8FB20020 */ lw $s2, 0x20($sp) +/* B37A60 80242E90 8FB1001C */ lw $s1, 0x1c($sp) +/* B37A64 80242E94 8FB00018 */ lw $s0, 0x18($sp) +/* B37A68 80242E98 D7B60040 */ ldc1 $f22, 0x40($sp) +/* B37A6C 80242E9C D7B40038 */ ldc1 $f20, 0x38($sp) +/* B37A70 80242EA0 24020002 */ addiu $v0, $zero, 2 +/* B37A74 80242EA4 03E00008 */ jr $ra +/* B37A78 80242EA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0.s deleted file mode 100644 index 6c7ef58840..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EF0 -/* B37AC0 80242EF0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37AC4 80242EF4 AFBF0010 */ sw $ra, 0x10($sp) -/* B37AC8 80242EF8 0C00EABB */ jal get_npc_unsafe -/* B37ACC 80242EFC 8C84008C */ lw $a0, 0x8c($a0) -/* B37AD0 80242F00 3C038025 */ lui $v1, 0x8025 -/* B37AD4 80242F04 8C63FF04 */ lw $v1, -0xfc($v1) -/* B37AD8 80242F08 AC430028 */ sw $v1, 0x28($v0) -/* B37ADC 80242F0C 8FBF0010 */ lw $ra, 0x10($sp) -/* B37AE0 80242F10 24020002 */ addiu $v0, $zero, 2 -/* B37AE4 80242F14 03E00008 */ jr $ra -/* B37AE8 80242F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s new file mode 100644 index 0000000000..84170d0b52 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242EF0_B37AC0.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242EF0_B37AC0 +/* B37AC0 80242EF0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B37AC4 80242EF4 AFBF0010 */ sw $ra, 0x10($sp) +/* B37AC8 80242EF8 0C00EABB */ jal get_npc_unsafe +/* B37ACC 80242EFC 8C84008C */ lw $a0, 0x8c($a0) +/* B37AD0 80242F00 3C038025 */ lui $v1, 0x8025 +/* B37AD4 80242F04 8C63FF04 */ lw $v1, -0xfc($v1) +/* B37AD8 80242F08 AC430028 */ sw $v1, 0x28($v0) +/* B37ADC 80242F0C 8FBF0010 */ lw $ra, 0x10($sp) +/* B37AE0 80242F10 24020002 */ addiu $v0, $zero, 2 +/* B37AE4 80242F14 03E00008 */ jr $ra +/* B37AE8 80242F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C.s deleted file mode 100644 index 6274180910..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F1C -/* B37AEC 80242F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B37AF0 80242F20 0000302D */ daddu $a2, $zero, $zero -/* B37AF4 80242F24 00C0482D */ daddu $t1, $a2, $zero -/* B37AF8 80242F28 AFBF0010 */ sw $ra, 0x10($sp) -/* B37AFC 80242F2C 8C82000C */ lw $v0, 0xc($a0) -/* B37B00 80242F30 3C088011 */ lui $t0, %hi(gPlayerData) -/* B37B04 80242F34 2508F290 */ addiu $t0, $t0, %lo(gPlayerData) -/* B37B08 80242F38 8C450000 */ lw $a1, ($v0) -.L80242F3C: -/* B37B0C 80242F3C 3C038025 */ lui $v1, 0x8025 -/* B37B10 80242F40 2463A5AC */ addiu $v1, $v1, -0x5a54 -/* B37B14 80242F44 8C620000 */ lw $v0, ($v1) -/* B37B18 80242F48 5040000A */ beql $v0, $zero, .L80242F74 -/* B37B1C 80242F4C 25290001 */ addiu $t1, $t1, 1 -/* B37B20 80242F50 850701B4 */ lh $a3, 0x1b4($t0) -.L80242F54: -/* B37B24 80242F54 8C620000 */ lw $v0, ($v1) -/* B37B28 80242F58 14E20002 */ bne $a3, $v0, .L80242F64 -/* B37B2C 80242F5C 24630004 */ addiu $v1, $v1, 4 -/* B37B30 80242F60 24C60001 */ addiu $a2, $a2, 1 -.L80242F64: -/* B37B34 80242F64 8C620000 */ lw $v0, ($v1) -/* B37B38 80242F68 1440FFFA */ bnez $v0, .L80242F54 -/* B37B3C 80242F6C 00000000 */ nop -/* B37B40 80242F70 25290001 */ addiu $t1, $t1, 1 -.L80242F74: -/* B37B44 80242F74 2922000A */ slti $v0, $t1, 0xa -/* B37B48 80242F78 1440FFF0 */ bnez $v0, .L80242F3C -/* B37B4C 80242F7C 25080002 */ addiu $t0, $t0, 2 -/* B37B50 80242F80 0C0B2026 */ jal set_variable -/* B37B54 80242F84 00000000 */ nop -/* B37B58 80242F88 8FBF0010 */ lw $ra, 0x10($sp) -/* B37B5C 80242F8C 24020002 */ addiu $v0, $zero, 2 -/* B37B60 80242F90 03E00008 */ jr $ra -/* B37B64 80242F94 27BD0018 */ addiu $sp, $sp, 0x18 -/* B37B68 80242F98 00000000 */ nop -/* B37B6C 80242F9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s new file mode 100644 index 0000000000..15767e5112 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242F1C_B37AEC.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F1C_B37AEC +/* B37AEC 80242F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B37AF0 80242F20 0000302D */ daddu $a2, $zero, $zero +/* B37AF4 80242F24 00C0482D */ daddu $t1, $a2, $zero +/* B37AF8 80242F28 AFBF0010 */ sw $ra, 0x10($sp) +/* B37AFC 80242F2C 8C82000C */ lw $v0, 0xc($a0) +/* B37B00 80242F30 3C088011 */ lui $t0, %hi(gPlayerData) +/* B37B04 80242F34 2508F290 */ addiu $t0, $t0, %lo(gPlayerData) +/* B37B08 80242F38 8C450000 */ lw $a1, ($v0) +.L80242F3C: +/* B37B0C 80242F3C 3C038025 */ lui $v1, 0x8025 +/* B37B10 80242F40 2463A5AC */ addiu $v1, $v1, -0x5a54 +/* B37B14 80242F44 8C620000 */ lw $v0, ($v1) +/* B37B18 80242F48 5040000A */ beql $v0, $zero, .L80242F74 +/* B37B1C 80242F4C 25290001 */ addiu $t1, $t1, 1 +/* B37B20 80242F50 850701B4 */ lh $a3, 0x1b4($t0) +.L80242F54: +/* B37B24 80242F54 8C620000 */ lw $v0, ($v1) +/* B37B28 80242F58 14E20002 */ bne $a3, $v0, .L80242F64 +/* B37B2C 80242F5C 24630004 */ addiu $v1, $v1, 4 +/* B37B30 80242F60 24C60001 */ addiu $a2, $a2, 1 +.L80242F64: +/* B37B34 80242F64 8C620000 */ lw $v0, ($v1) +/* B37B38 80242F68 1440FFFA */ bnez $v0, .L80242F54 +/* B37B3C 80242F6C 00000000 */ nop +/* B37B40 80242F70 25290001 */ addiu $t1, $t1, 1 +.L80242F74: +/* B37B44 80242F74 2922000A */ slti $v0, $t1, 0xa +/* B37B48 80242F78 1440FFF0 */ bnez $v0, .L80242F3C +/* B37B4C 80242F7C 25080002 */ addiu $t0, $t0, 2 +/* B37B50 80242F80 0C0B2026 */ jal set_variable +/* B37B54 80242F84 00000000 */ nop +/* B37B58 80242F88 8FBF0010 */ lw $ra, 0x10($sp) +/* B37B5C 80242F8C 24020002 */ addiu $v0, $zero, 2 +/* B37B60 80242F90 03E00008 */ jr $ra +/* B37B64 80242F94 27BD0018 */ addiu $sp, $sp, 0x18 +/* B37B68 80242F98 00000000 */ nop +/* B37B6C 80242F9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0.s b/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0.s deleted file mode 100644 index f56ca00d0e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FA0 -/* B37B70 80242FA0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B37B74 80242FA4 AFB00010 */ sw $s0, 0x10($sp) -/* B37B78 80242FA8 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* B37B7C 80242FAC 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* B37B80 80242FB0 AFBF0018 */ sw $ra, 0x18($sp) -/* B37B84 80242FB4 AFB10014 */ sw $s1, 0x14($sp) -/* B37B88 80242FB8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* B37B8C 80242FBC F7B40020 */ sdc1 $f20, 0x20($sp) -/* B37B90 80242FC0 C60C0080 */ lwc1 $f12, 0x80($s0) -/* B37B94 80242FC4 0C00A8BB */ jal sin_deg -/* B37B98 80242FC8 0080882D */ daddu $s1, $a0, $zero -/* B37B9C 80242FCC C6140054 */ lwc1 $f20, 0x54($s0) -/* B37BA0 80242FD0 3C0140A0 */ lui $at, 0x40a0 -/* B37BA4 80242FD4 4481B000 */ mtc1 $at, $f22 -/* B37BA8 80242FD8 00000000 */ nop -/* B37BAC 80242FDC 4616A502 */ mul.s $f20, $f20, $f22 -/* B37BB0 80242FE0 00000000 */ nop -/* B37BB4 80242FE4 C60C0080 */ lwc1 $f12, 0x80($s0) -/* B37BB8 80242FE8 4600A502 */ mul.s $f20, $f20, $f0 -/* B37BBC 80242FEC 0C00A8D4 */ jal cos_deg -/* B37BC0 80242FF0 00000000 */ nop -/* B37BC4 80242FF4 C6040054 */ lwc1 $f4, 0x54($s0) -/* B37BC8 80242FF8 46162102 */ mul.s $f4, $f4, $f22 -/* B37BCC 80242FFC 00000000 */ nop -/* B37BD0 80243000 C6020028 */ lwc1 $f2, 0x28($s0) -/* B37BD4 80243004 46141080 */ add.s $f2, $f2, $f20 -/* B37BD8 80243008 46000007 */ neg.s $f0, $f0 -/* B37BDC 8024300C 46002102 */ mul.s $f4, $f4, $f0 -/* B37BE0 80243010 00000000 */ nop -/* B37BE4 80243014 4600118D */ trunc.w.s $f6, $f2 -/* B37BE8 80243018 E6260084 */ swc1 $f6, 0x84($s1) -/* B37BEC 8024301C C6000030 */ lwc1 $f0, 0x30($s0) -/* B37BF0 80243020 46040000 */ add.s $f0, $f0, $f4 -/* B37BF4 80243024 4600018D */ trunc.w.s $f6, $f0 -/* B37BF8 80243028 E6260088 */ swc1 $f6, 0x88($s1) -/* B37BFC 8024302C 8FBF0018 */ lw $ra, 0x18($sp) -/* B37C00 80243030 8FB10014 */ lw $s1, 0x14($sp) -/* B37C04 80243034 8FB00010 */ lw $s0, 0x10($sp) -/* B37C08 80243038 D7B60028 */ ldc1 $f22, 0x28($sp) -/* B37C0C 8024303C D7B40020 */ ldc1 $f20, 0x20($sp) -/* B37C10 80243040 24020002 */ addiu $v0, $zero, 2 -/* B37C14 80243044 03E00008 */ jr $ra -/* B37C18 80243048 27BD0030 */ addiu $sp, $sp, 0x30 -/* B37C1C 8024304C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s b/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s new file mode 100644 index 0000000000..2f2f0e9e32 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B37B70/func_80242FA0_B37B70.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242FA0_B37B70 +/* B37B70 80242FA0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B37B74 80242FA4 AFB00010 */ sw $s0, 0x10($sp) +/* B37B78 80242FA8 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* B37B7C 80242FAC 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* B37B80 80242FB0 AFBF0018 */ sw $ra, 0x18($sp) +/* B37B84 80242FB4 AFB10014 */ sw $s1, 0x14($sp) +/* B37B88 80242FB8 F7B60028 */ sdc1 $f22, 0x28($sp) +/* B37B8C 80242FBC F7B40020 */ sdc1 $f20, 0x20($sp) +/* B37B90 80242FC0 C60C0080 */ lwc1 $f12, 0x80($s0) +/* B37B94 80242FC4 0C00A8BB */ jal sin_deg +/* B37B98 80242FC8 0080882D */ daddu $s1, $a0, $zero +/* B37B9C 80242FCC C6140054 */ lwc1 $f20, 0x54($s0) +/* B37BA0 80242FD0 3C0140A0 */ lui $at, 0x40a0 +/* B37BA4 80242FD4 4481B000 */ mtc1 $at, $f22 +/* B37BA8 80242FD8 00000000 */ nop +/* B37BAC 80242FDC 4616A502 */ mul.s $f20, $f20, $f22 +/* B37BB0 80242FE0 00000000 */ nop +/* B37BB4 80242FE4 C60C0080 */ lwc1 $f12, 0x80($s0) +/* B37BB8 80242FE8 4600A502 */ mul.s $f20, $f20, $f0 +/* B37BBC 80242FEC 0C00A8D4 */ jal cos_deg +/* B37BC0 80242FF0 00000000 */ nop +/* B37BC4 80242FF4 C6040054 */ lwc1 $f4, 0x54($s0) +/* B37BC8 80242FF8 46162102 */ mul.s $f4, $f4, $f22 +/* B37BCC 80242FFC 00000000 */ nop +/* B37BD0 80243000 C6020028 */ lwc1 $f2, 0x28($s0) +/* B37BD4 80243004 46141080 */ add.s $f2, $f2, $f20 +/* B37BD8 80243008 46000007 */ neg.s $f0, $f0 +/* B37BDC 8024300C 46002102 */ mul.s $f4, $f4, $f0 +/* B37BE0 80243010 00000000 */ nop +/* B37BE4 80243014 4600118D */ trunc.w.s $f6, $f2 +/* B37BE8 80243018 E6260084 */ swc1 $f6, 0x84($s1) +/* B37BEC 8024301C C6000030 */ lwc1 $f0, 0x30($s0) +/* B37BF0 80243020 46040000 */ add.s $f0, $f0, $f4 +/* B37BF4 80243024 4600018D */ trunc.w.s $f6, $f0 +/* B37BF8 80243028 E6260088 */ swc1 $f6, 0x88($s1) +/* B37BFC 8024302C 8FBF0018 */ lw $ra, 0x18($sp) +/* B37C00 80243030 8FB10014 */ lw $s1, 0x14($sp) +/* B37C04 80243034 8FB00010 */ lw $s0, 0x10($sp) +/* B37C08 80243038 D7B60028 */ ldc1 $f22, 0x28($sp) +/* B37C0C 8024303C D7B40020 */ ldc1 $f20, 0x20($sp) +/* B37C10 80243040 24020002 */ addiu $v0, $zero, 2 +/* B37C14 80243044 03E00008 */ jr $ra +/* B37C18 80243048 27BD0030 */ addiu $sp, $sp, 0x30 +/* B37C1C 8024304C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_80243050.s b/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_80243050.s deleted file mode 100644 index cd6beaae37..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_80243050.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243050 -/* B37C20 80243050 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B37C24 80243054 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B37C28 80243058 4485A000 */ mtc1 $a1, $f20 -/* B37C2C 8024305C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B37C30 80243060 4486B000 */ mtc1 $a2, $f22 -/* B37C34 80243064 AFB00010 */ sw $s0, 0x10($sp) -/* B37C38 80243068 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B37C3C 8024306C 4487C000 */ mtc1 $a3, $f24 -/* B37C40 80243070 AFBF0014 */ sw $ra, 0x14($sp) -/* B37C44 80243074 0C019D28 */ jal guMtxIdentF -/* B37C48 80243078 0080802D */ daddu $s0, $a0, $zero -/* B37C4C 8024307C 4616A582 */ mul.s $f22, $f20, $f22 -/* B37C50 80243080 00000000 */ nop -/* B37C54 80243084 4618A502 */ mul.s $f20, $f20, $f24 -/* B37C58 80243088 00000000 */ nop -/* B37C5C 8024308C 3C013F80 */ lui $at, 0x3f80 -/* B37C60 80243090 44810000 */ mtc1 $at, $f0 -/* B37C64 80243094 00000000 */ nop -/* B37C68 80243098 E6000014 */ swc1 $f0, 0x14($s0) -/* B37C6C 8024309C E6160010 */ swc1 $f22, 0x10($s0) -/* B37C70 802430A0 E6140018 */ swc1 $f20, 0x18($s0) -/* B37C74 802430A4 8FBF0014 */ lw $ra, 0x14($sp) -/* B37C78 802430A8 8FB00010 */ lw $s0, 0x10($sp) -/* B37C7C 802430AC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B37C80 802430B0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B37C84 802430B4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B37C88 802430B8 03E00008 */ jr $ra -/* B37C8C 802430BC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_80243050_B37C20.s b/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_80243050_B37C20.s new file mode 100644 index 0000000000..2ec6c07da8 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_80243050_B37C20.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243050_B37C20 +/* B37C20 80243050 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B37C24 80243054 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B37C28 80243058 4485A000 */ mtc1 $a1, $f20 +/* B37C2C 8024305C F7B60020 */ sdc1 $f22, 0x20($sp) +/* B37C30 80243060 4486B000 */ mtc1 $a2, $f22 +/* B37C34 80243064 AFB00010 */ sw $s0, 0x10($sp) +/* B37C38 80243068 F7B80028 */ sdc1 $f24, 0x28($sp) +/* B37C3C 8024306C 4487C000 */ mtc1 $a3, $f24 +/* B37C40 80243070 AFBF0014 */ sw $ra, 0x14($sp) +/* B37C44 80243074 0C019D28 */ jal guMtxIdentF +/* B37C48 80243078 0080802D */ daddu $s0, $a0, $zero +/* B37C4C 8024307C 4616A582 */ mul.s $f22, $f20, $f22 +/* B37C50 80243080 00000000 */ nop +/* B37C54 80243084 4618A502 */ mul.s $f20, $f20, $f24 +/* B37C58 80243088 00000000 */ nop +/* B37C5C 8024308C 3C013F80 */ lui $at, 0x3f80 +/* B37C60 80243090 44810000 */ mtc1 $at, $f0 +/* B37C64 80243094 00000000 */ nop +/* B37C68 80243098 E6000014 */ swc1 $f0, 0x14($s0) +/* B37C6C 8024309C E6160010 */ swc1 $f22, 0x10($s0) +/* B37C70 802430A0 E6140018 */ swc1 $f20, 0x18($s0) +/* B37C74 802430A4 8FBF0014 */ lw $ra, 0x14($sp) +/* B37C78 802430A8 8FB00010 */ lw $s0, 0x10($sp) +/* B37C7C 802430AC D7B80028 */ ldc1 $f24, 0x28($sp) +/* B37C80 802430B0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* B37C84 802430B4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* B37C88 802430B8 03E00008 */ jr $ra +/* B37C8C 802430BC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_802430C0.s b/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_802430C0.s deleted file mode 100644 index cfe5fd9f08..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_802430C0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430C0 -/* B37C90 802430C0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B37C94 802430C4 AFB10054 */ sw $s1, 0x54($sp) -/* B37C98 802430C8 0080882D */ daddu $s1, $a0, $zero -/* B37C9C 802430CC AFBF005C */ sw $ra, 0x5c($sp) -/* B37CA0 802430D0 AFB20058 */ sw $s2, 0x58($sp) -/* B37CA4 802430D4 AFB00050 */ sw $s0, 0x50($sp) -/* B37CA8 802430D8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B37CAC 802430DC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B37CB0 802430E0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B37CB4 802430E4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B37CB8 802430E8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B37CBC 802430EC 8E30000C */ lw $s0, 0xc($s1) -/* B37CC0 802430F0 8E050000 */ lw $a1, ($s0) -/* B37CC4 802430F4 0C0B1EAF */ jal get_variable -/* B37CC8 802430F8 26100004 */ addiu $s0, $s0, 4 -/* B37CCC 802430FC 0C046C04 */ jal get_model_list_index_from_tree_index -/* B37CD0 80243100 0040202D */ daddu $a0, $v0, $zero -/* B37CD4 80243104 8E050000 */ lw $a1, ($s0) -/* B37CD8 80243108 26100004 */ addiu $s0, $s0, 4 -/* B37CDC 8024310C 0220202D */ daddu $a0, $s1, $zero -/* B37CE0 80243110 0C0B210B */ jal get_float_variable -/* B37CE4 80243114 0040902D */ daddu $s2, $v0, $zero -/* B37CE8 80243118 8E050000 */ lw $a1, ($s0) -/* B37CEC 8024311C 26100004 */ addiu $s0, $s0, 4 -/* B37CF0 80243120 0220202D */ daddu $a0, $s1, $zero -/* B37CF4 80243124 0C0B210B */ jal get_float_variable -/* B37CF8 80243128 46000706 */ mov.s $f28, $f0 -/* B37CFC 8024312C 8E050000 */ lw $a1, ($s0) -/* B37D00 80243130 26100004 */ addiu $s0, $s0, 4 -/* B37D04 80243134 0220202D */ daddu $a0, $s1, $zero -/* B37D08 80243138 0C0B210B */ jal get_float_variable -/* B37D0C 8024313C 46000686 */ mov.s $f26, $f0 -/* B37D10 80243140 0220202D */ daddu $a0, $s1, $zero -/* B37D14 80243144 8E050000 */ lw $a1, ($s0) -/* B37D18 80243148 0C0B210B */ jal get_float_variable -/* B37D1C 8024314C 46000586 */ mov.s $f22, $f0 -/* B37D20 80243150 0240202D */ daddu $a0, $s2, $zero -/* B37D24 80243154 0C046B4C */ jal get_model_from_list_index -/* B37D28 80243158 46000606 */ mov.s $f24, $f0 -/* B37D2C 8024315C 0040882D */ daddu $s1, $v0, $zero -/* B37D30 80243160 96220000 */ lhu $v0, ($s1) -/* B37D34 80243164 30420400 */ andi $v0, $v0, 0x400 -/* B37D38 80243168 1440001E */ bnez $v0, .L802431E4 -/* B37D3C 8024316C 26300058 */ addiu $s0, $s1, 0x58 -/* B37D40 80243170 4480A000 */ mtc1 $zero, $f20 -/* B37D44 80243174 4406B000 */ mfc1 $a2, $f22 -/* B37D48 80243178 4405A000 */ mfc1 $a1, $f20 -/* B37D4C 8024317C 4407A000 */ mfc1 $a3, $f20 -/* B37D50 80243180 0C019E40 */ jal guTranslateF -/* B37D54 80243184 0200202D */ daddu $a0, $s0, $zero -/* B37D58 80243188 4405E000 */ mfc1 $a1, $f28 -/* B37D5C 8024318C 4406D000 */ mfc1 $a2, $f26 -/* B37D60 80243190 4407C000 */ mfc1 $a3, $f24 -/* B37D64 80243194 0C090C14 */ jal func_80243050 -/* B37D68 80243198 27A40010 */ addiu $a0, $sp, 0x10 -/* B37D6C 8024319C 27A40010 */ addiu $a0, $sp, 0x10 -/* B37D70 802431A0 0200282D */ daddu $a1, $s0, $zero -/* B37D74 802431A4 0C019D80 */ jal guMtxCatF -/* B37D78 802431A8 0200302D */ daddu $a2, $s0, $zero -/* B37D7C 802431AC 27A40010 */ addiu $a0, $sp, 0x10 -/* B37D80 802431B0 4600B587 */ neg.s $f22, $f22 -/* B37D84 802431B4 4405A000 */ mfc1 $a1, $f20 -/* B37D88 802431B8 4406B000 */ mfc1 $a2, $f22 -/* B37D8C 802431BC 0C019E40 */ jal guTranslateF -/* B37D90 802431C0 00A0382D */ daddu $a3, $a1, $zero -/* B37D94 802431C4 27A40010 */ addiu $a0, $sp, 0x10 -/* B37D98 802431C8 0200282D */ daddu $a1, $s0, $zero -/* B37D9C 802431CC 0C019D80 */ jal guMtxCatF -/* B37DA0 802431D0 00A0302D */ daddu $a2, $a1, $zero -/* B37DA4 802431D4 96220000 */ lhu $v0, ($s1) -/* B37DA8 802431D8 34421400 */ ori $v0, $v0, 0x1400 -/* B37DAC 802431DC 08090C97 */ j .L8024325C -/* B37DB0 802431E0 A6220000 */ sh $v0, ($s1) -.L802431E4: -/* B37DB4 802431E4 4480A000 */ mtc1 $zero, $f20 -/* B37DB8 802431E8 4406B000 */ mfc1 $a2, $f22 -/* B37DBC 802431EC 4405A000 */ mfc1 $a1, $f20 -/* B37DC0 802431F0 4407A000 */ mfc1 $a3, $f20 -/* B37DC4 802431F4 0C019E40 */ jal guTranslateF -/* B37DC8 802431F8 27A40010 */ addiu $a0, $sp, 0x10 -/* B37DCC 802431FC 27A40010 */ addiu $a0, $sp, 0x10 -/* B37DD0 80243200 26300058 */ addiu $s0, $s1, 0x58 -/* B37DD4 80243204 0200282D */ daddu $a1, $s0, $zero -/* B37DD8 80243208 0C019D80 */ jal guMtxCatF -/* B37DDC 8024320C 0200302D */ daddu $a2, $s0, $zero -/* B37DE0 80243210 4405E000 */ mfc1 $a1, $f28 -/* B37DE4 80243214 4406D000 */ mfc1 $a2, $f26 -/* B37DE8 80243218 4407C000 */ mfc1 $a3, $f24 -/* B37DEC 8024321C 0C090C14 */ jal func_80243050 -/* B37DF0 80243220 27A40010 */ addiu $a0, $sp, 0x10 -/* B37DF4 80243224 27A40010 */ addiu $a0, $sp, 0x10 -/* B37DF8 80243228 0200282D */ daddu $a1, $s0, $zero -/* B37DFC 8024322C 0C019D80 */ jal guMtxCatF -/* B37E00 80243230 0200302D */ daddu $a2, $s0, $zero -/* B37E04 80243234 27A40010 */ addiu $a0, $sp, 0x10 -/* B37E08 80243238 4600B587 */ neg.s $f22, $f22 -/* B37E0C 8024323C 4405A000 */ mfc1 $a1, $f20 -/* B37E10 80243240 4406B000 */ mfc1 $a2, $f22 -/* B37E14 80243244 0C019E40 */ jal guTranslateF -/* B37E18 80243248 00A0382D */ daddu $a3, $a1, $zero -/* B37E1C 8024324C 27A40010 */ addiu $a0, $sp, 0x10 -/* B37E20 80243250 0200282D */ daddu $a1, $s0, $zero -/* B37E24 80243254 0C019D80 */ jal guMtxCatF -/* B37E28 80243258 00A0302D */ daddu $a2, $a1, $zero -.L8024325C: -/* B37E2C 8024325C 8FBF005C */ lw $ra, 0x5c($sp) -/* B37E30 80243260 8FB20058 */ lw $s2, 0x58($sp) -/* B37E34 80243264 8FB10054 */ lw $s1, 0x54($sp) -/* B37E38 80243268 8FB00050 */ lw $s0, 0x50($sp) -/* B37E3C 8024326C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B37E40 80243270 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B37E44 80243274 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B37E48 80243278 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B37E4C 8024327C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B37E50 80243280 24020002 */ addiu $v0, $zero, 2 -/* B37E54 80243284 03E00008 */ jr $ra -/* B37E58 80243288 27BD0088 */ addiu $sp, $sp, 0x88 -/* B37E5C 8024328C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_802430C0_B37C90.s b/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_802430C0_B37C90.s new file mode 100644 index 0000000000..799a0b224f --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_03/B37C20/func_802430C0_B37C90.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802430C0_B37C90 +/* B37C90 802430C0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* B37C94 802430C4 AFB10054 */ sw $s1, 0x54($sp) +/* B37C98 802430C8 0080882D */ daddu $s1, $a0, $zero +/* B37C9C 802430CC AFBF005C */ sw $ra, 0x5c($sp) +/* B37CA0 802430D0 AFB20058 */ sw $s2, 0x58($sp) +/* B37CA4 802430D4 AFB00050 */ sw $s0, 0x50($sp) +/* B37CA8 802430D8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* B37CAC 802430DC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* B37CB0 802430E0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* B37CB4 802430E4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* B37CB8 802430E8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* B37CBC 802430EC 8E30000C */ lw $s0, 0xc($s1) +/* B37CC0 802430F0 8E050000 */ lw $a1, ($s0) +/* B37CC4 802430F4 0C0B1EAF */ jal get_variable +/* B37CC8 802430F8 26100004 */ addiu $s0, $s0, 4 +/* B37CCC 802430FC 0C046C04 */ jal get_model_list_index_from_tree_index +/* B37CD0 80243100 0040202D */ daddu $a0, $v0, $zero +/* B37CD4 80243104 8E050000 */ lw $a1, ($s0) +/* B37CD8 80243108 26100004 */ addiu $s0, $s0, 4 +/* B37CDC 8024310C 0220202D */ daddu $a0, $s1, $zero +/* B37CE0 80243110 0C0B210B */ jal get_float_variable +/* B37CE4 80243114 0040902D */ daddu $s2, $v0, $zero +/* B37CE8 80243118 8E050000 */ lw $a1, ($s0) +/* B37CEC 8024311C 26100004 */ addiu $s0, $s0, 4 +/* B37CF0 80243120 0220202D */ daddu $a0, $s1, $zero +/* B37CF4 80243124 0C0B210B */ jal get_float_variable +/* B37CF8 80243128 46000706 */ mov.s $f28, $f0 +/* B37CFC 8024312C 8E050000 */ lw $a1, ($s0) +/* B37D00 80243130 26100004 */ addiu $s0, $s0, 4 +/* B37D04 80243134 0220202D */ daddu $a0, $s1, $zero +/* B37D08 80243138 0C0B210B */ jal get_float_variable +/* B37D0C 8024313C 46000686 */ mov.s $f26, $f0 +/* B37D10 80243140 0220202D */ daddu $a0, $s1, $zero +/* B37D14 80243144 8E050000 */ lw $a1, ($s0) +/* B37D18 80243148 0C0B210B */ jal get_float_variable +/* B37D1C 8024314C 46000586 */ mov.s $f22, $f0 +/* B37D20 80243150 0240202D */ daddu $a0, $s2, $zero +/* B37D24 80243154 0C046B4C */ jal get_model_from_list_index +/* B37D28 80243158 46000606 */ mov.s $f24, $f0 +/* B37D2C 8024315C 0040882D */ daddu $s1, $v0, $zero +/* B37D30 80243160 96220000 */ lhu $v0, ($s1) +/* B37D34 80243164 30420400 */ andi $v0, $v0, 0x400 +/* B37D38 80243168 1440001E */ bnez $v0, .L802431E4 +/* B37D3C 8024316C 26300058 */ addiu $s0, $s1, 0x58 +/* B37D40 80243170 4480A000 */ mtc1 $zero, $f20 +/* B37D44 80243174 4406B000 */ mfc1 $a2, $f22 +/* B37D48 80243178 4405A000 */ mfc1 $a1, $f20 +/* B37D4C 8024317C 4407A000 */ mfc1 $a3, $f20 +/* B37D50 80243180 0C019E40 */ jal guTranslateF +/* B37D54 80243184 0200202D */ daddu $a0, $s0, $zero +/* B37D58 80243188 4405E000 */ mfc1 $a1, $f28 +/* B37D5C 8024318C 4406D000 */ mfc1 $a2, $f26 +/* B37D60 80243190 4407C000 */ mfc1 $a3, $f24 +/* B37D64 80243194 0C090C14 */ jal func_80243050_B37C20 +/* B37D68 80243198 27A40010 */ addiu $a0, $sp, 0x10 +/* B37D6C 8024319C 27A40010 */ addiu $a0, $sp, 0x10 +/* B37D70 802431A0 0200282D */ daddu $a1, $s0, $zero +/* B37D74 802431A4 0C019D80 */ jal guMtxCatF +/* B37D78 802431A8 0200302D */ daddu $a2, $s0, $zero +/* B37D7C 802431AC 27A40010 */ addiu $a0, $sp, 0x10 +/* B37D80 802431B0 4600B587 */ neg.s $f22, $f22 +/* B37D84 802431B4 4405A000 */ mfc1 $a1, $f20 +/* B37D88 802431B8 4406B000 */ mfc1 $a2, $f22 +/* B37D8C 802431BC 0C019E40 */ jal guTranslateF +/* B37D90 802431C0 00A0382D */ daddu $a3, $a1, $zero +/* B37D94 802431C4 27A40010 */ addiu $a0, $sp, 0x10 +/* B37D98 802431C8 0200282D */ daddu $a1, $s0, $zero +/* B37D9C 802431CC 0C019D80 */ jal guMtxCatF +/* B37DA0 802431D0 00A0302D */ daddu $a2, $a1, $zero +/* B37DA4 802431D4 96220000 */ lhu $v0, ($s1) +/* B37DA8 802431D8 34421400 */ ori $v0, $v0, 0x1400 +/* B37DAC 802431DC 08090C97 */ j .L8024325C +/* B37DB0 802431E0 A6220000 */ sh $v0, ($s1) +.L802431E4: +/* B37DB4 802431E4 4480A000 */ mtc1 $zero, $f20 +/* B37DB8 802431E8 4406B000 */ mfc1 $a2, $f22 +/* B37DBC 802431EC 4405A000 */ mfc1 $a1, $f20 +/* B37DC0 802431F0 4407A000 */ mfc1 $a3, $f20 +/* B37DC4 802431F4 0C019E40 */ jal guTranslateF +/* B37DC8 802431F8 27A40010 */ addiu $a0, $sp, 0x10 +/* B37DCC 802431FC 27A40010 */ addiu $a0, $sp, 0x10 +/* B37DD0 80243200 26300058 */ addiu $s0, $s1, 0x58 +/* B37DD4 80243204 0200282D */ daddu $a1, $s0, $zero +/* B37DD8 80243208 0C019D80 */ jal guMtxCatF +/* B37DDC 8024320C 0200302D */ daddu $a2, $s0, $zero +/* B37DE0 80243210 4405E000 */ mfc1 $a1, $f28 +/* B37DE4 80243214 4406D000 */ mfc1 $a2, $f26 +/* B37DE8 80243218 4407C000 */ mfc1 $a3, $f24 +/* B37DEC 8024321C 0C090C14 */ jal func_80243050_B37C20 +/* B37DF0 80243220 27A40010 */ addiu $a0, $sp, 0x10 +/* B37DF4 80243224 27A40010 */ addiu $a0, $sp, 0x10 +/* B37DF8 80243228 0200282D */ daddu $a1, $s0, $zero +/* B37DFC 8024322C 0C019D80 */ jal guMtxCatF +/* B37E00 80243230 0200302D */ daddu $a2, $s0, $zero +/* B37E04 80243234 27A40010 */ addiu $a0, $sp, 0x10 +/* B37E08 80243238 4600B587 */ neg.s $f22, $f22 +/* B37E0C 8024323C 4405A000 */ mfc1 $a1, $f20 +/* B37E10 80243240 4406B000 */ mfc1 $a2, $f22 +/* B37E14 80243244 0C019E40 */ jal guTranslateF +/* B37E18 80243248 00A0382D */ daddu $a3, $a1, $zero +/* B37E1C 8024324C 27A40010 */ addiu $a0, $sp, 0x10 +/* B37E20 80243250 0200282D */ daddu $a1, $s0, $zero +/* B37E24 80243254 0C019D80 */ jal guMtxCatF +/* B37E28 80243258 00A0302D */ daddu $a2, $a1, $zero +.L8024325C: +/* B37E2C 8024325C 8FBF005C */ lw $ra, 0x5c($sp) +/* B37E30 80243260 8FB20058 */ lw $s2, 0x58($sp) +/* B37E34 80243264 8FB10054 */ lw $s1, 0x54($sp) +/* B37E38 80243268 8FB00050 */ lw $s0, 0x50($sp) +/* B37E3C 8024326C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* B37E40 80243270 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* B37E44 80243274 D7B80070 */ ldc1 $f24, 0x70($sp) +/* B37E48 80243278 D7B60068 */ ldc1 $f22, 0x68($sp) +/* B37E4C 8024327C D7B40060 */ ldc1 $f20, 0x60($sp) +/* B37E50 80243280 24020002 */ addiu $v0, $zero, 2 +/* B37E54 80243284 03E00008 */ jr $ra +/* B37E58 80243288 27BD0088 */ addiu $sp, $sp, 0x88 +/* B37E5C 8024328C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468.s deleted file mode 100644 index 7056ca1c8e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240468 -/* B44BD8 80240468 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B44BDC 8024046C AFB10014 */ sw $s1, 0x14($sp) -/* B44BE0 80240470 0080882D */ daddu $s1, $a0, $zero -/* B44BE4 80240474 AFBF001C */ sw $ra, 0x1c($sp) -/* B44BE8 80240478 AFB20018 */ sw $s2, 0x18($sp) -/* B44BEC 8024047C AFB00010 */ sw $s0, 0x10($sp) -/* B44BF0 80240480 8E240084 */ lw $a0, 0x84($s1) -/* B44BF4 80240484 0C04C3D6 */ jal get_item_entity -/* B44BF8 80240488 00A0802D */ daddu $s0, $a1, $zero -/* B44BFC 8024048C 12000005 */ beqz $s0, .L802404A4 -/* B44C00 80240490 0040902D */ daddu $s2, $v0, $zero -/* B44C04 80240494 C640000C */ lwc1 $f0, 0xc($s2) -/* B44C08 80240498 AE200074 */ sw $zero, 0x74($s1) -/* B44C0C 8024049C AE20007C */ sw $zero, 0x7c($s1) -/* B44C10 802404A0 E6200078 */ swc1 $f0, 0x78($s1) -.L802404A4: -/* B44C14 802404A4 8E230074 */ lw $v1, 0x74($s1) -/* B44C18 802404A8 10600005 */ beqz $v1, .L802404C0 -/* B44C1C 802404AC 24020001 */ addiu $v0, $zero, 1 -/* B44C20 802404B0 10620024 */ beq $v1, $v0, .L80240544 -/* B44C24 802404B4 00000000 */ nop -/* B44C28 802404B8 08090167 */ j .L8024059C -/* B44C2C 802404BC 00000000 */ nop -.L802404C0: -/* B44C30 802404C0 3C013FC9 */ lui $at, 0x3fc9 -/* B44C34 802404C4 34210FD8 */ ori $at, $at, 0xfd8 -/* B44C38 802404C8 44810000 */ mtc1 $at, $f0 -/* B44C3C 802404CC C62C007C */ lwc1 $f12, 0x7c($s1) -/* B44C40 802404D0 46806320 */ cvt.s.w $f12, $f12 -/* B44C44 802404D4 46006302 */ mul.s $f12, $f12, $f0 -/* B44C48 802404D8 00000000 */ nop -/* B44C4C 802404DC 3C0141F0 */ lui $at, 0x41f0 -/* B44C50 802404E0 44810000 */ mtc1 $at, $f0 -/* B44C54 802404E4 0C00A874 */ jal cos_rad -/* B44C58 802404E8 46006303 */ div.s $f12, $f12, $f0 -/* B44C5C 802404EC 3C013F80 */ lui $at, 0x3f80 -/* B44C60 802404F0 44811000 */ mtc1 $at, $f2 -/* B44C64 802404F4 00000000 */ nop -/* B44C68 802404F8 46001081 */ sub.s $f2, $f2, $f0 -/* B44C6C 802404FC 3C0141A0 */ lui $at, 0x41a0 -/* B44C70 80240500 44810000 */ mtc1 $at, $f0 -/* B44C74 80240504 00000000 */ nop -/* B44C78 80240508 46001082 */ mul.s $f2, $f2, $f0 -/* B44C7C 8024050C 00000000 */ nop -/* B44C80 80240510 C6200078 */ lwc1 $f0, 0x78($s1) -/* B44C84 80240514 46020000 */ add.s $f0, $f0, $f2 -/* B44C88 80240518 E640000C */ swc1 $f0, 0xc($s2) -/* B44C8C 8024051C 8E23007C */ lw $v1, 0x7c($s1) -/* B44C90 80240520 2402001E */ addiu $v0, $zero, 0x1e -/* B44C94 80240524 14620005 */ bne $v1, $v0, .L8024053C -/* B44C98 80240528 24620001 */ addiu $v0, $v1, 1 -/* B44C9C 8024052C 24020001 */ addiu $v0, $zero, 1 -/* B44CA0 80240530 AE220074 */ sw $v0, 0x74($s1) -/* B44CA4 80240534 08090167 */ j .L8024059C -/* B44CA8 80240538 AE20007C */ sw $zero, 0x7c($s1) -.L8024053C: -/* B44CAC 8024053C 08090167 */ j .L8024059C -/* B44CB0 80240540 AE22007C */ sw $v0, 0x7c($s1) -.L80240544: -/* B44CB4 80240544 C62C007C */ lwc1 $f12, 0x7c($s1) -/* B44CB8 80240548 0C00A8D4 */ jal cos_deg -/* B44CBC 8024054C 46806320 */ cvt.s.w $f12, $f12 -/* B44CC0 80240550 3C014040 */ lui $at, 0x4040 -/* B44CC4 80240554 44811000 */ mtc1 $at, $f2 -/* B44CC8 80240558 00000000 */ nop -/* B44CCC 8024055C 46020002 */ mul.s $f0, $f0, $f2 -/* B44CD0 80240560 00000000 */ nop -/* B44CD4 80240564 3C014188 */ lui $at, 0x4188 -/* B44CD8 80240568 44812000 */ mtc1 $at, $f4 -/* B44CDC 8024056C C6220078 */ lwc1 $f2, 0x78($s1) -/* B44CE0 80240570 46041080 */ add.s $f2, $f2, $f4 -/* B44CE4 80240574 46001080 */ add.s $f2, $f2, $f0 -/* B44CE8 80240578 E642000C */ swc1 $f2, 0xc($s2) -/* B44CEC 8024057C 8E22007C */ lw $v0, 0x7c($s1) -/* B44CF0 80240580 24420009 */ addiu $v0, $v0, 9 -/* B44CF4 80240584 44826000 */ mtc1 $v0, $f12 -/* B44CF8 80240588 00000000 */ nop -/* B44CFC 8024058C 0C00A6C9 */ jal clamp_angle -/* B44D00 80240590 46806320 */ cvt.s.w $f12, $f12 -/* B44D04 80240594 4600018D */ trunc.w.s $f6, $f0 -/* B44D08 80240598 E626007C */ swc1 $f6, 0x7c($s1) -.L8024059C: -/* B44D0C 8024059C 8FBF001C */ lw $ra, 0x1c($sp) -/* B44D10 802405A0 8FB20018 */ lw $s2, 0x18($sp) -/* B44D14 802405A4 8FB10014 */ lw $s1, 0x14($sp) -/* B44D18 802405A8 8FB00010 */ lw $s0, 0x10($sp) -/* B44D1C 802405AC 0000102D */ daddu $v0, $zero, $zero -/* B44D20 802405B0 03E00008 */ jr $ra -/* B44D24 802405B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s new file mode 100644 index 0000000000..725b0403e3 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_04/B44AC0/func_80240468_B44BD8.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240468_B44BD8 +/* B44BD8 80240468 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B44BDC 8024046C AFB10014 */ sw $s1, 0x14($sp) +/* B44BE0 80240470 0080882D */ daddu $s1, $a0, $zero +/* B44BE4 80240474 AFBF001C */ sw $ra, 0x1c($sp) +/* B44BE8 80240478 AFB20018 */ sw $s2, 0x18($sp) +/* B44BEC 8024047C AFB00010 */ sw $s0, 0x10($sp) +/* B44BF0 80240480 8E240084 */ lw $a0, 0x84($s1) +/* B44BF4 80240484 0C04C3D6 */ jal get_item_entity +/* B44BF8 80240488 00A0802D */ daddu $s0, $a1, $zero +/* B44BFC 8024048C 12000005 */ beqz $s0, .L802404A4 +/* B44C00 80240490 0040902D */ daddu $s2, $v0, $zero +/* B44C04 80240494 C640000C */ lwc1 $f0, 0xc($s2) +/* B44C08 80240498 AE200074 */ sw $zero, 0x74($s1) +/* B44C0C 8024049C AE20007C */ sw $zero, 0x7c($s1) +/* B44C10 802404A0 E6200078 */ swc1 $f0, 0x78($s1) +.L802404A4: +/* B44C14 802404A4 8E230074 */ lw $v1, 0x74($s1) +/* B44C18 802404A8 10600005 */ beqz $v1, .L802404C0 +/* B44C1C 802404AC 24020001 */ addiu $v0, $zero, 1 +/* B44C20 802404B0 10620024 */ beq $v1, $v0, .L80240544 +/* B44C24 802404B4 00000000 */ nop +/* B44C28 802404B8 08090167 */ j .L8024059C +/* B44C2C 802404BC 00000000 */ nop +.L802404C0: +/* B44C30 802404C0 3C013FC9 */ lui $at, 0x3fc9 +/* B44C34 802404C4 34210FD8 */ ori $at, $at, 0xfd8 +/* B44C38 802404C8 44810000 */ mtc1 $at, $f0 +/* B44C3C 802404CC C62C007C */ lwc1 $f12, 0x7c($s1) +/* B44C40 802404D0 46806320 */ cvt.s.w $f12, $f12 +/* B44C44 802404D4 46006302 */ mul.s $f12, $f12, $f0 +/* B44C48 802404D8 00000000 */ nop +/* B44C4C 802404DC 3C0141F0 */ lui $at, 0x41f0 +/* B44C50 802404E0 44810000 */ mtc1 $at, $f0 +/* B44C54 802404E4 0C00A874 */ jal cos_rad +/* B44C58 802404E8 46006303 */ div.s $f12, $f12, $f0 +/* B44C5C 802404EC 3C013F80 */ lui $at, 0x3f80 +/* B44C60 802404F0 44811000 */ mtc1 $at, $f2 +/* B44C64 802404F4 00000000 */ nop +/* B44C68 802404F8 46001081 */ sub.s $f2, $f2, $f0 +/* B44C6C 802404FC 3C0141A0 */ lui $at, 0x41a0 +/* B44C70 80240500 44810000 */ mtc1 $at, $f0 +/* B44C74 80240504 00000000 */ nop +/* B44C78 80240508 46001082 */ mul.s $f2, $f2, $f0 +/* B44C7C 8024050C 00000000 */ nop +/* B44C80 80240510 C6200078 */ lwc1 $f0, 0x78($s1) +/* B44C84 80240514 46020000 */ add.s $f0, $f0, $f2 +/* B44C88 80240518 E640000C */ swc1 $f0, 0xc($s2) +/* B44C8C 8024051C 8E23007C */ lw $v1, 0x7c($s1) +/* B44C90 80240520 2402001E */ addiu $v0, $zero, 0x1e +/* B44C94 80240524 14620005 */ bne $v1, $v0, .L8024053C +/* B44C98 80240528 24620001 */ addiu $v0, $v1, 1 +/* B44C9C 8024052C 24020001 */ addiu $v0, $zero, 1 +/* B44CA0 80240530 AE220074 */ sw $v0, 0x74($s1) +/* B44CA4 80240534 08090167 */ j .L8024059C +/* B44CA8 80240538 AE20007C */ sw $zero, 0x7c($s1) +.L8024053C: +/* B44CAC 8024053C 08090167 */ j .L8024059C +/* B44CB0 80240540 AE22007C */ sw $v0, 0x7c($s1) +.L80240544: +/* B44CB4 80240544 C62C007C */ lwc1 $f12, 0x7c($s1) +/* B44CB8 80240548 0C00A8D4 */ jal cos_deg +/* B44CBC 8024054C 46806320 */ cvt.s.w $f12, $f12 +/* B44CC0 80240550 3C014040 */ lui $at, 0x4040 +/* B44CC4 80240554 44811000 */ mtc1 $at, $f2 +/* B44CC8 80240558 00000000 */ nop +/* B44CCC 8024055C 46020002 */ mul.s $f0, $f0, $f2 +/* B44CD0 80240560 00000000 */ nop +/* B44CD4 80240564 3C014188 */ lui $at, 0x4188 +/* B44CD8 80240568 44812000 */ mtc1 $at, $f4 +/* B44CDC 8024056C C6220078 */ lwc1 $f2, 0x78($s1) +/* B44CE0 80240570 46041080 */ add.s $f2, $f2, $f4 +/* B44CE4 80240574 46001080 */ add.s $f2, $f2, $f0 +/* B44CE8 80240578 E642000C */ swc1 $f2, 0xc($s2) +/* B44CEC 8024057C 8E22007C */ lw $v0, 0x7c($s1) +/* B44CF0 80240580 24420009 */ addiu $v0, $v0, 9 +/* B44CF4 80240584 44826000 */ mtc1 $v0, $f12 +/* B44CF8 80240588 00000000 */ nop +/* B44CFC 8024058C 0C00A6C9 */ jal clamp_angle +/* B44D00 80240590 46806320 */ cvt.s.w $f12, $f12 +/* B44D04 80240594 4600018D */ trunc.w.s $f6, $f0 +/* B44D08 80240598 E626007C */ swc1 $f6, 0x7c($s1) +.L8024059C: +/* B44D0C 8024059C 8FBF001C */ lw $ra, 0x1c($sp) +/* B44D10 802405A0 8FB20018 */ lw $s2, 0x18($sp) +/* B44D14 802405A4 8FB10014 */ lw $s1, 0x14($sp) +/* B44D18 802405A8 8FB00010 */ lw $s0, 0x10($sp) +/* B44D1C 802405AC 0000102D */ daddu $v0, $zero, $zero +/* B44D20 802405B0 03E00008 */ jr $ra +/* B44D24 802405B4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B44F10/func_80240810_B44F80.s b/asm/nonmatchings/world/area_jan/jan_04/B44F10/func_80240810_B44F80.s index b11ebc45c8..9e40733b25 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B44F10/func_80240810_B44F80.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B44F10/func_80240810_B44F80.s @@ -55,7 +55,7 @@ glabel func_80240810_B44F80 /* B45048 802408D8 4405E000 */ mfc1 $a1, $f28 /* B4504C 802408DC 4406D000 */ mfc1 $a2, $f26 /* B45050 802408E0 4407C000 */ mfc1 $a3, $f24 -/* B45054 802408E4 0C0901E8 */ jal func_802407A0 +/* B45054 802408E4 0C0901E8 */ jal func_802407A0_B44F10 /* B45058 802408E8 27A40010 */ addiu $a0, $sp, 0x10 /* B4505C 802408EC 27A40010 */ addiu $a0, $sp, 0x10 /* B45060 802408F0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240810_B44F80 /* B450D0 80240960 4405E000 */ mfc1 $a1, $f28 /* B450D4 80240964 4406D000 */ mfc1 $a2, $f26 /* B450D8 80240968 4407C000 */ mfc1 $a3, $f24 -/* B450DC 8024096C 0C0901E8 */ jal func_802407A0 +/* B450DC 8024096C 0C0901E8 */ jal func_802407A0_B44F10 /* B450E0 80240970 27A40010 */ addiu $a0, $sp, 0x10 /* B450E4 80240974 27A40010 */ addiu $a0, $sp, 0x10 /* B450E8 80240978 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D0C.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D0C.s deleted file mode 100644 index f60592db6b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D0C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D0C -/* B4547C 80240D0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B45480 80240D10 AFB10014 */ sw $s1, 0x14($sp) -/* B45484 80240D14 0080882D */ daddu $s1, $a0, $zero -/* B45488 80240D18 AFBF0018 */ sw $ra, 0x18($sp) -/* B4548C 80240D1C AFB00010 */ sw $s0, 0x10($sp) -/* B45490 80240D20 8E2400AC */ lw $a0, 0xac($s1) -/* B45494 80240D24 0C04417A */ jal get_entity_by_index -/* B45498 80240D28 00A0802D */ daddu $s0, $a1, $zero -/* B4549C 80240D2C 12000003 */ beqz $s0, .L80240D3C -/* B454A0 80240D30 0040182D */ daddu $v1, $v0, $zero -/* B454A4 80240D34 2402FFE2 */ addiu $v0, $zero, -0x1e -/* B454A8 80240D38 AE220070 */ sw $v0, 0x70($s1) -.L80240D3C: -/* B454AC 80240D3C C6200070 */ lwc1 $f0, 0x70($s1) -/* B454B0 80240D40 46800020 */ cvt.s.w $f0, $f0 -/* B454B4 80240D44 E4600060 */ swc1 $f0, 0x60($v1) -/* B454B8 80240D48 C6200070 */ lwc1 $f0, 0x70($s1) -/* B454BC 80240D4C 46800020 */ cvt.s.w $f0, $f0 -/* B454C0 80240D50 E4600068 */ swc1 $f0, 0x68($v1) -/* B454C4 80240D54 8E230070 */ lw $v1, 0x70($s1) -/* B454C8 80240D58 24630001 */ addiu $v1, $v1, 1 -/* B454CC 80240D5C 38620001 */ xori $v0, $v1, 1 -/* B454D0 80240D60 2C420001 */ sltiu $v0, $v0, 1 -/* B454D4 80240D64 AE230070 */ sw $v1, 0x70($s1) -/* B454D8 80240D68 8FBF0018 */ lw $ra, 0x18($sp) -/* B454DC 80240D6C 8FB10014 */ lw $s1, 0x14($sp) -/* B454E0 80240D70 8FB00010 */ lw $s0, 0x10($sp) -/* B454E4 80240D74 00021040 */ sll $v0, $v0, 1 -/* B454E8 80240D78 03E00008 */ jr $ra -/* B454EC 80240D7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D0C_B4547C.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D0C_B4547C.s new file mode 100644 index 0000000000..b2125d9ab1 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D0C_B4547C.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D0C_B4547C +/* B4547C 80240D0C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B45480 80240D10 AFB10014 */ sw $s1, 0x14($sp) +/* B45484 80240D14 0080882D */ daddu $s1, $a0, $zero +/* B45488 80240D18 AFBF0018 */ sw $ra, 0x18($sp) +/* B4548C 80240D1C AFB00010 */ sw $s0, 0x10($sp) +/* B45490 80240D20 8E2400AC */ lw $a0, 0xac($s1) +/* B45494 80240D24 0C04417A */ jal get_entity_by_index +/* B45498 80240D28 00A0802D */ daddu $s0, $a1, $zero +/* B4549C 80240D2C 12000003 */ beqz $s0, .L80240D3C +/* B454A0 80240D30 0040182D */ daddu $v1, $v0, $zero +/* B454A4 80240D34 2402FFE2 */ addiu $v0, $zero, -0x1e +/* B454A8 80240D38 AE220070 */ sw $v0, 0x70($s1) +.L80240D3C: +/* B454AC 80240D3C C6200070 */ lwc1 $f0, 0x70($s1) +/* B454B0 80240D40 46800020 */ cvt.s.w $f0, $f0 +/* B454B4 80240D44 E4600060 */ swc1 $f0, 0x60($v1) +/* B454B8 80240D48 C6200070 */ lwc1 $f0, 0x70($s1) +/* B454BC 80240D4C 46800020 */ cvt.s.w $f0, $f0 +/* B454C0 80240D50 E4600068 */ swc1 $f0, 0x68($v1) +/* B454C4 80240D54 8E230070 */ lw $v1, 0x70($s1) +/* B454C8 80240D58 24630001 */ addiu $v1, $v1, 1 +/* B454CC 80240D5C 38620001 */ xori $v0, $v1, 1 +/* B454D0 80240D60 2C420001 */ sltiu $v0, $v0, 1 +/* B454D4 80240D64 AE230070 */ sw $v1, 0x70($s1) +/* B454D8 80240D68 8FBF0018 */ lw $ra, 0x18($sp) +/* B454DC 80240D6C 8FB10014 */ lw $s1, 0x14($sp) +/* B454E0 80240D70 8FB00010 */ lw $s0, 0x10($sp) +/* B454E4 80240D74 00021040 */ sll $v0, $v0, 1 +/* B454E8 80240D78 03E00008 */ jr $ra +/* B454EC 80240D7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D80.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D80.s deleted file mode 100644 index de83f3fa63..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D80.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D80 -/* B454F0 80240D80 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B454F4 80240D84 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B454F8 80240D88 4485A000 */ mtc1 $a1, $f20 -/* B454FC 80240D8C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B45500 80240D90 4486B000 */ mtc1 $a2, $f22 -/* B45504 80240D94 AFB00010 */ sw $s0, 0x10($sp) -/* B45508 80240D98 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B4550C 80240D9C 4487C000 */ mtc1 $a3, $f24 -/* B45510 80240DA0 AFBF0014 */ sw $ra, 0x14($sp) -/* B45514 80240DA4 0C019D28 */ jal guMtxIdentF -/* B45518 80240DA8 0080802D */ daddu $s0, $a0, $zero -/* B4551C 80240DAC 4616A582 */ mul.s $f22, $f20, $f22 -/* B45520 80240DB0 00000000 */ nop -/* B45524 80240DB4 4618A502 */ mul.s $f20, $f20, $f24 -/* B45528 80240DB8 00000000 */ nop -/* B4552C 80240DBC 3C013F80 */ lui $at, 0x3f80 -/* B45530 80240DC0 44810000 */ mtc1 $at, $f0 -/* B45534 80240DC4 00000000 */ nop -/* B45538 80240DC8 E6000014 */ swc1 $f0, 0x14($s0) -/* B4553C 80240DCC E6160010 */ swc1 $f22, 0x10($s0) -/* B45540 80240DD0 E6140018 */ swc1 $f20, 0x18($s0) -/* B45544 80240DD4 8FBF0014 */ lw $ra, 0x14($sp) -/* B45548 80240DD8 8FB00010 */ lw $s0, 0x10($sp) -/* B4554C 80240DDC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B45550 80240DE0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B45554 80240DE4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B45558 80240DE8 03E00008 */ jr $ra -/* B4555C 80240DEC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D80_B454F0.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D80_B454F0.s new file mode 100644 index 0000000000..e7805d7c63 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240D80_B454F0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D80_B454F0 +/* B454F0 80240D80 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B454F4 80240D84 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B454F8 80240D88 4485A000 */ mtc1 $a1, $f20 +/* B454FC 80240D8C F7B60020 */ sdc1 $f22, 0x20($sp) +/* B45500 80240D90 4486B000 */ mtc1 $a2, $f22 +/* B45504 80240D94 AFB00010 */ sw $s0, 0x10($sp) +/* B45508 80240D98 F7B80028 */ sdc1 $f24, 0x28($sp) +/* B4550C 80240D9C 4487C000 */ mtc1 $a3, $f24 +/* B45510 80240DA0 AFBF0014 */ sw $ra, 0x14($sp) +/* B45514 80240DA4 0C019D28 */ jal guMtxIdentF +/* B45518 80240DA8 0080802D */ daddu $s0, $a0, $zero +/* B4551C 80240DAC 4616A582 */ mul.s $f22, $f20, $f22 +/* B45520 80240DB0 00000000 */ nop +/* B45524 80240DB4 4618A502 */ mul.s $f20, $f20, $f24 +/* B45528 80240DB8 00000000 */ nop +/* B4552C 80240DBC 3C013F80 */ lui $at, 0x3f80 +/* B45530 80240DC0 44810000 */ mtc1 $at, $f0 +/* B45534 80240DC4 00000000 */ nop +/* B45538 80240DC8 E6000014 */ swc1 $f0, 0x14($s0) +/* B4553C 80240DCC E6160010 */ swc1 $f22, 0x10($s0) +/* B45540 80240DD0 E6140018 */ swc1 $f20, 0x18($s0) +/* B45544 80240DD4 8FBF0014 */ lw $ra, 0x14($sp) +/* B45548 80240DD8 8FB00010 */ lw $s0, 0x10($sp) +/* B4554C 80240DDC D7B80028 */ ldc1 $f24, 0x28($sp) +/* B45550 80240DE0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* B45554 80240DE4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* B45558 80240DE8 03E00008 */ jr $ra +/* B4555C 80240DEC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240DF0_B45560.s b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240DF0_B45560.s index 7c576c7d10..f1902fe41c 100644 --- a/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240DF0_B45560.s +++ b/asm/nonmatchings/world/area_jan/jan_04/B451F0/func_80240DF0_B45560.s @@ -55,7 +55,7 @@ glabel func_80240DF0_B45560 /* B45628 80240EB8 4405E000 */ mfc1 $a1, $f28 /* B4562C 80240EBC 4406D000 */ mfc1 $a2, $f26 /* B45630 80240EC0 4407C000 */ mfc1 $a3, $f24 -/* B45634 80240EC4 0C090360 */ jal func_80240D80 +/* B45634 80240EC4 0C090360 */ jal func_80240D80_B454F0 /* B45638 80240EC8 27A40010 */ addiu $a0, $sp, 0x10 /* B4563C 80240ECC 27A40010 */ addiu $a0, $sp, 0x10 /* B45640 80240ED0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240DF0_B45560 /* B456B0 80240F40 4405E000 */ mfc1 $a1, $f28 /* B456B4 80240F44 4406D000 */ mfc1 $a2, $f26 /* B456B8 80240F48 4407C000 */ mfc1 $a3, $f24 -/* B456BC 80240F4C 0C090360 */ jal func_80240D80 +/* B456BC 80240F4C 0C090360 */ jal func_80240D80_B454F0 /* B456C0 80240F50 27A40010 */ addiu $a0, $sp, 0x10 /* B456C4 80240F54 27A40010 */ addiu $a0, $sp, 0x10 /* B456C8 80240F58 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0.s b/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0.s deleted file mode 100644 index 4fcdb77460..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FC0 -/* B45730 80240FC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B45734 80240FC4 AFB10014 */ sw $s1, 0x14($sp) -/* B45738 80240FC8 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* B4573C 80240FCC 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* B45740 80240FD0 AFB00010 */ sw $s0, 0x10($sp) -/* B45744 80240FD4 3C108024 */ lui $s0, 0x8024 -/* B45748 80240FD8 2610625C */ addiu $s0, $s0, 0x625c -/* B4574C 80240FDC AFBF0018 */ sw $ra, 0x18($sp) -/* B45750 80240FE0 8E030000 */ lw $v1, ($s0) -/* B45754 80240FE4 28620003 */ slti $v0, $v1, 3 -/* B45758 80240FE8 10400007 */ beqz $v0, .L80241008 -/* B4575C 80240FEC 0220202D */ daddu $a0, $s1, $zero -/* B45760 80240FF0 1C600027 */ bgtz $v1, .L80241090 -/* B45764 80240FF4 24620001 */ addiu $v0, $v1, 1 -/* B45768 80240FF8 10600008 */ beqz $v1, .L8024101C -/* B4576C 80240FFC 0000102D */ daddu $v0, $zero, $zero -/* B45770 80241000 08090437 */ j .L802410DC -/* B45774 80241004 00000000 */ nop -.L80241008: -/* B45778 80241008 24020003 */ addiu $v0, $zero, 3 -/* B4577C 8024100C 10620022 */ beq $v1, $v0, .L80241098 -/* B45780 80241010 0000102D */ daddu $v0, $zero, $zero -/* B45784 80241014 08090437 */ j .L802410DC -/* B45788 80241018 00000000 */ nop -.L8024101C: -/* B4578C 8024101C 0C03AD8E */ jal partner_get_ride_script -/* B45790 80241020 00000000 */ nop -/* B45794 80241024 0040202D */ daddu $a0, $v0, $zero -/* B45798 80241028 1080002B */ beqz $a0, .L802410D8 -/* B4579C 8024102C 0000282D */ daddu $a1, $zero, $zero -/* B457A0 80241030 8E020000 */ lw $v0, ($s0) -/* B457A4 80241034 24060020 */ addiu $a2, $zero, 0x20 -/* B457A8 80241038 24420001 */ addiu $v0, $v0, 1 -/* B457AC 8024103C 0C0B0CF8 */ jal start_script -/* B457B0 80241040 AE020000 */ sw $v0, ($s0) -/* B457B4 80241044 C6200028 */ lwc1 $f0, 0x28($s1) -/* B457B8 80241048 3C014120 */ lui $at, 0x4120 -/* B457BC 8024104C 44811000 */ mtc1 $at, $f2 -/* B457C0 80241050 00000000 */ nop -/* B457C4 80241054 46020001 */ sub.s $f0, $f0, $f2 -/* B457C8 80241058 4600010D */ trunc.w.s $f4, $f0 -/* B457CC 8024105C E4440088 */ swc1 $f4, 0x88($v0) -/* B457D0 80241060 C620002C */ lwc1 $f0, 0x2c($s1) -/* B457D4 80241064 4600010D */ trunc.w.s $f4, $f0 -/* B457D8 80241068 E444008C */ swc1 $f4, 0x8c($v0) -/* B457DC 8024106C C6200030 */ lwc1 $f0, 0x30($s1) -/* B457E0 80241070 24030001 */ addiu $v1, $zero, 1 -/* B457E4 80241074 3C018025 */ lui $at, 0x8025 -/* B457E8 80241078 AC22A290 */ sw $v0, -0x5d70($at) -/* B457EC 8024107C AC4300B4 */ sw $v1, 0xb4($v0) -/* B457F0 80241080 4600010D */ trunc.w.s $f4, $f0 -/* B457F4 80241084 E4440090 */ swc1 $f4, 0x90($v0) -/* B457F8 80241088 08090437 */ j .L802410DC -/* B457FC 8024108C 0000102D */ daddu $v0, $zero, $zero -.L80241090: -/* B45800 80241090 08090436 */ j .L802410D8 -/* B45804 80241094 AE020000 */ sw $v0, ($s0) -.L80241098: -/* B45808 80241098 3C038011 */ lui $v1, 0x8011 -/* B4580C 8024109C 8C63C930 */ lw $v1, -0x36d0($v1) -/* B45810 802410A0 3C014387 */ lui $at, 0x4387 -/* B45814 802410A4 44810000 */ mtc1 $at, $f0 -/* B45818 802410A8 3C014334 */ lui $at, 0x4334 -/* B4581C 802410AC 44811000 */ mtc1 $at, $f2 -/* B45820 802410B0 24020002 */ addiu $v0, $zero, 2 -/* B45824 802410B4 E460000C */ swc1 $f0, 0xc($v1) -/* B45828 802410B8 E4800080 */ swc1 $f0, 0x80($a0) -/* B4582C 802410BC E4800084 */ swc1 $f0, 0x84($a0) -/* B45830 802410C0 E48200A8 */ swc1 $f2, 0xa8($a0) -/* B45834 802410C4 3C048025 */ lui $a0, 0x8025 -/* B45838 802410C8 8C84A290 */ lw $a0, -0x5d70($a0) -/* B4583C 802410CC 24030001 */ addiu $v1, $zero, 1 -/* B45840 802410D0 08090437 */ j .L802410DC -/* B45844 802410D4 AC830074 */ sw $v1, 0x74($a0) -.L802410D8: -/* B45848 802410D8 0000102D */ daddu $v0, $zero, $zero -.L802410DC: -/* B4584C 802410DC 8FBF0018 */ lw $ra, 0x18($sp) -/* B45850 802410E0 8FB10014 */ lw $s1, 0x14($sp) -/* B45854 802410E4 8FB00010 */ lw $s0, 0x10($sp) -/* B45858 802410E8 03E00008 */ jr $ra -/* B4585C 802410EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s b/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s new file mode 100644 index 0000000000..0e42b0dc85 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_04/B45730/func_80240FC0_B45730.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FC0_B45730 +/* B45730 80240FC0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B45734 80240FC4 AFB10014 */ sw $s1, 0x14($sp) +/* B45738 80240FC8 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* B4573C 80240FCC 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* B45740 80240FD0 AFB00010 */ sw $s0, 0x10($sp) +/* B45744 80240FD4 3C108024 */ lui $s0, 0x8024 +/* B45748 80240FD8 2610625C */ addiu $s0, $s0, 0x625c +/* B4574C 80240FDC AFBF0018 */ sw $ra, 0x18($sp) +/* B45750 80240FE0 8E030000 */ lw $v1, ($s0) +/* B45754 80240FE4 28620003 */ slti $v0, $v1, 3 +/* B45758 80240FE8 10400007 */ beqz $v0, .L80241008 +/* B4575C 80240FEC 0220202D */ daddu $a0, $s1, $zero +/* B45760 80240FF0 1C600027 */ bgtz $v1, .L80241090 +/* B45764 80240FF4 24620001 */ addiu $v0, $v1, 1 +/* B45768 80240FF8 10600008 */ beqz $v1, .L8024101C +/* B4576C 80240FFC 0000102D */ daddu $v0, $zero, $zero +/* B45770 80241000 08090437 */ j .L802410DC +/* B45774 80241004 00000000 */ nop +.L80241008: +/* B45778 80241008 24020003 */ addiu $v0, $zero, 3 +/* B4577C 8024100C 10620022 */ beq $v1, $v0, .L80241098 +/* B45780 80241010 0000102D */ daddu $v0, $zero, $zero +/* B45784 80241014 08090437 */ j .L802410DC +/* B45788 80241018 00000000 */ nop +.L8024101C: +/* B4578C 8024101C 0C03AD8E */ jal partner_get_ride_script +/* B45790 80241020 00000000 */ nop +/* B45794 80241024 0040202D */ daddu $a0, $v0, $zero +/* B45798 80241028 1080002B */ beqz $a0, .L802410D8 +/* B4579C 8024102C 0000282D */ daddu $a1, $zero, $zero +/* B457A0 80241030 8E020000 */ lw $v0, ($s0) +/* B457A4 80241034 24060020 */ addiu $a2, $zero, 0x20 +/* B457A8 80241038 24420001 */ addiu $v0, $v0, 1 +/* B457AC 8024103C 0C0B0CF8 */ jal start_script +/* B457B0 80241040 AE020000 */ sw $v0, ($s0) +/* B457B4 80241044 C6200028 */ lwc1 $f0, 0x28($s1) +/* B457B8 80241048 3C014120 */ lui $at, 0x4120 +/* B457BC 8024104C 44811000 */ mtc1 $at, $f2 +/* B457C0 80241050 00000000 */ nop +/* B457C4 80241054 46020001 */ sub.s $f0, $f0, $f2 +/* B457C8 80241058 4600010D */ trunc.w.s $f4, $f0 +/* B457CC 8024105C E4440088 */ swc1 $f4, 0x88($v0) +/* B457D0 80241060 C620002C */ lwc1 $f0, 0x2c($s1) +/* B457D4 80241064 4600010D */ trunc.w.s $f4, $f0 +/* B457D8 80241068 E444008C */ swc1 $f4, 0x8c($v0) +/* B457DC 8024106C C6200030 */ lwc1 $f0, 0x30($s1) +/* B457E0 80241070 24030001 */ addiu $v1, $zero, 1 +/* B457E4 80241074 3C018025 */ lui $at, 0x8025 +/* B457E8 80241078 AC22A290 */ sw $v0, -0x5d70($at) +/* B457EC 8024107C AC4300B4 */ sw $v1, 0xb4($v0) +/* B457F0 80241080 4600010D */ trunc.w.s $f4, $f0 +/* B457F4 80241084 E4440090 */ swc1 $f4, 0x90($v0) +/* B457F8 80241088 08090437 */ j .L802410DC +/* B457FC 8024108C 0000102D */ daddu $v0, $zero, $zero +.L80241090: +/* B45800 80241090 08090436 */ j .L802410D8 +/* B45804 80241094 AE020000 */ sw $v0, ($s0) +.L80241098: +/* B45808 80241098 3C038011 */ lui $v1, 0x8011 +/* B4580C 8024109C 8C63C930 */ lw $v1, -0x36d0($v1) +/* B45810 802410A0 3C014387 */ lui $at, 0x4387 +/* B45814 802410A4 44810000 */ mtc1 $at, $f0 +/* B45818 802410A8 3C014334 */ lui $at, 0x4334 +/* B4581C 802410AC 44811000 */ mtc1 $at, $f2 +/* B45820 802410B0 24020002 */ addiu $v0, $zero, 2 +/* B45824 802410B4 E460000C */ swc1 $f0, 0xc($v1) +/* B45828 802410B8 E4800080 */ swc1 $f0, 0x80($a0) +/* B4582C 802410BC E4800084 */ swc1 $f0, 0x84($a0) +/* B45830 802410C0 E48200A8 */ swc1 $f2, 0xa8($a0) +/* B45834 802410C4 3C048025 */ lui $a0, 0x8025 +/* B45838 802410C8 8C84A290 */ lw $a0, -0x5d70($a0) +/* B4583C 802410CC 24030001 */ addiu $v1, $zero, 1 +/* B45840 802410D0 08090437 */ j .L802410DC +/* B45844 802410D4 AC830074 */ sw $v1, 0x74($a0) +.L802410D8: +/* B45848 802410D8 0000102D */ daddu $v0, $zero, $zero +.L802410DC: +/* B4584C 802410DC 8FBF0018 */ lw $ra, 0x18($sp) +/* B45850 802410E0 8FB10014 */ lw $s1, 0x14($sp) +/* B45854 802410E4 8FB00010 */ lw $s0, 0x10($sp) +/* B45858 802410E8 03E00008 */ jr $ra +/* B4585C 802410EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240510_B4AF80.s b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240510_B4AF80.s index 01d9075d60..4903556566 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240510_B4AF80.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240510_B4AF80.s @@ -55,7 +55,7 @@ glabel func_80240510_B4AF80 /* B4B048 802405D8 4405E000 */ mfc1 $a1, $f28 /* B4B04C 802405DC 4406D000 */ mfc1 $a2, $f26 /* B4B050 802405E0 4407C000 */ mfc1 $a3, $f24 -/* B4B054 802405E4 0C090128 */ jal func_802404A0 +/* B4B054 802405E4 0C090128 */ jal func_802404A0_B4AF10 /* B4B058 802405E8 27A40010 */ addiu $a0, $sp, 0x10 /* B4B05C 802405EC 27A40010 */ addiu $a0, $sp, 0x10 /* B4B060 802405F0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240510_B4AF80 /* B4B0D0 80240660 4405E000 */ mfc1 $a1, $f28 /* B4B0D4 80240664 4406D000 */ mfc1 $a2, $f26 /* B4B0D8 80240668 4407C000 */ mfc1 $a3, $f24 -/* B4B0DC 8024066C 0C090128 */ jal func_802404A0 +/* B4B0DC 8024066C 0C090128 */ jal func_802404A0_B4AF10 /* B4B0E0 80240670 27A40010 */ addiu $a0, $sp, 0x10 /* B4B0E4 80240674 27A40010 */ addiu $a0, $sp, 0x10 /* B4B0E8 80240678 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC.s b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC.s deleted file mode 100644 index e0c774366f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406DC -/* B4B14C 802406DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4B150 802406E0 AFB00010 */ sw $s0, 0x10($sp) -/* B4B154 802406E4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B4B158 802406E8 4485A000 */ mtc1 $a1, $f20 -/* B4B15C 802406EC AFBF0014 */ sw $ra, 0x14($sp) -/* B4B160 802406F0 0C019D28 */ jal guMtxIdentF -/* B4B164 802406F4 0080802D */ daddu $s0, $a0, $zero -/* B4B168 802406F8 3C018024 */ lui $at, 0x8024 -/* B4B16C 802406FC D4207A20 */ ldc1 $f0, 0x7a20($at) -/* B4B170 80240700 4600A521 */ cvt.d.s $f20, $f20 -/* B4B174 80240704 4620A502 */ mul.d $f20, $f20, $f0 -/* B4B178 80240708 00000000 */ nop -/* B4B17C 8024070C 3C013F80 */ lui $at, 0x3f80 -/* B4B180 80240710 44810000 */ mtc1 $at, $f0 -/* B4B184 80240714 AE000018 */ sw $zero, 0x18($s0) -/* B4B188 80240718 E6000014 */ swc1 $f0, 0x14($s0) -/* B4B18C 8024071C 4620A520 */ cvt.s.d $f20, $f20 -/* B4B190 80240720 E6140010 */ swc1 $f20, 0x10($s0) -/* B4B194 80240724 8FBF0014 */ lw $ra, 0x14($sp) -/* B4B198 80240728 8FB00010 */ lw $s0, 0x10($sp) -/* B4B19C 8024072C D7B40018 */ ldc1 $f20, 0x18($sp) -/* B4B1A0 80240730 03E00008 */ jr $ra -/* B4B1A4 80240734 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s new file mode 100644 index 0000000000..8674e54e1e --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_802406DC_B4B14C.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406DC_B4B14C +/* B4B14C 802406DC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B4B150 802406E0 AFB00010 */ sw $s0, 0x10($sp) +/* B4B154 802406E4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B4B158 802406E8 4485A000 */ mtc1 $a1, $f20 +/* B4B15C 802406EC AFBF0014 */ sw $ra, 0x14($sp) +/* B4B160 802406F0 0C019D28 */ jal guMtxIdentF +/* B4B164 802406F4 0080802D */ daddu $s0, $a0, $zero +/* B4B168 802406F8 3C018024 */ lui $at, 0x8024 +/* B4B16C 802406FC D4207A20 */ ldc1 $f0, 0x7a20($at) +/* B4B170 80240700 4600A521 */ cvt.d.s $f20, $f20 +/* B4B174 80240704 4620A502 */ mul.d $f20, $f20, $f0 +/* B4B178 80240708 00000000 */ nop +/* B4B17C 8024070C 3C013F80 */ lui $at, 0x3f80 +/* B4B180 80240710 44810000 */ mtc1 $at, $f0 +/* B4B184 80240714 AE000018 */ sw $zero, 0x18($s0) +/* B4B188 80240718 E6000014 */ swc1 $f0, 0x14($s0) +/* B4B18C 8024071C 4620A520 */ cvt.s.d $f20, $f20 +/* B4B190 80240720 E6140010 */ swc1 $f20, 0x10($s0) +/* B4B194 80240724 8FBF0014 */ lw $ra, 0x14($sp) +/* B4B198 80240728 8FB00010 */ lw $s0, 0x10($sp) +/* B4B19C 8024072C D7B40018 */ ldc1 $f20, 0x18($sp) +/* B4B1A0 80240730 03E00008 */ jr $ra +/* B4B1A4 80240734 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s index 3692f40b12..f70ec26966 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4AF10/func_80240738_B4B1A8.s @@ -27,7 +27,7 @@ glabel func_80240738_B4B1A8 /* B4B200 80240790 14400008 */ bnez $v0, .L802407B4 /* B4B204 80240794 00000000 */ nop /* B4B208 80240798 4405A000 */ mfc1 $a1, $f20 -/* B4B20C 8024079C 0C0901B7 */ jal func_802406DC +/* B4B20C 8024079C 0C0901B7 */ jal func_802406DC_B4B14C /* B4B210 802407A0 26040058 */ addiu $a0, $s0, 0x58 /* B4B214 802407A4 96020000 */ lhu $v0, ($s0) /* B4B218 802407A8 34421400 */ ori $v0, $v0, 0x1400 @@ -35,7 +35,7 @@ glabel func_80240738_B4B1A8 /* B4B220 802407B0 A6020000 */ sh $v0, ($s0) .L802407B4: /* B4B224 802407B4 4405A000 */ mfc1 $a1, $f20 -/* B4B228 802407B8 0C0901B7 */ jal func_802406DC +/* B4B228 802407B8 0C0901B7 */ jal func_802406DC_B4B14C /* B4B22C 802407BC 27A40010 */ addiu $a0, $sp, 0x10 /* B4B230 802407C0 27A40010 */ addiu $a0, $sp, 0x10 /* B4B234 802407C4 26050058 */ addiu $a1, $s0, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C.s deleted file mode 100644 index 80890d6b3a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E0C -/* B4B87C 80240E0C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B4B880 80240E10 AFB3001C */ sw $s3, 0x1c($sp) -/* B4B884 80240E14 0080982D */ daddu $s3, $a0, $zero -/* B4B888 80240E18 AFBF0020 */ sw $ra, 0x20($sp) -/* B4B88C 80240E1C AFB20018 */ sw $s2, 0x18($sp) -/* B4B890 80240E20 AFB10014 */ sw $s1, 0x14($sp) -/* B4B894 80240E24 AFB00010 */ sw $s0, 0x10($sp) -/* B4B898 80240E28 8E720148 */ lw $s2, 0x148($s3) -/* B4B89C 80240E2C 86440008 */ lh $a0, 8($s2) -/* B4B8A0 80240E30 0C00EABB */ jal get_npc_unsafe -/* B4B8A4 80240E34 00A0882D */ daddu $s1, $a1, $zero -/* B4B8A8 80240E38 8E240008 */ lw $a0, 8($s1) -/* B4B8AC 80240E3C 0040802D */ daddu $s0, $v0, $zero -/* B4B8B0 80240E40 00041FC2 */ srl $v1, $a0, 0x1f -/* B4B8B4 80240E44 00832021 */ addu $a0, $a0, $v1 -/* B4B8B8 80240E48 00042043 */ sra $a0, $a0, 1 -/* B4B8BC 80240E4C 0C00A67F */ jal rand_int -/* B4B8C0 80240E50 24840001 */ addiu $a0, $a0, 1 -/* B4B8C4 80240E54 8E230008 */ lw $v1, 8($s1) -/* B4B8C8 80240E58 240400B4 */ addiu $a0, $zero, 0xb4 -/* B4B8CC 80240E5C 00032FC2 */ srl $a1, $v1, 0x1f -/* B4B8D0 80240E60 00651821 */ addu $v1, $v1, $a1 -/* B4B8D4 80240E64 00031843 */ sra $v1, $v1, 1 -/* B4B8D8 80240E68 00621821 */ addu $v1, $v1, $v0 -/* B4B8DC 80240E6C 0C00A67F */ jal rand_int -/* B4B8E0 80240E70 A603008E */ sh $v1, 0x8e($s0) -/* B4B8E4 80240E74 C60C000C */ lwc1 $f12, 0xc($s0) -/* B4B8E8 80240E78 44820000 */ mtc1 $v0, $f0 -/* B4B8EC 80240E7C 00000000 */ nop -/* B4B8F0 80240E80 46800020 */ cvt.s.w $f0, $f0 -/* B4B8F4 80240E84 46006300 */ add.s $f12, $f12, $f0 -/* B4B8F8 80240E88 3C0142B4 */ lui $at, 0x42b4 -/* B4B8FC 80240E8C 44810000 */ mtc1 $at, $f0 -/* B4B900 80240E90 0C00A6C9 */ jal clamp_angle -/* B4B904 80240E94 46006301 */ sub.s $f12, $f12, $f0 -/* B4B908 80240E98 E600000C */ swc1 $f0, 0xc($s0) -/* B4B90C 80240E9C 8E4200CC */ lw $v0, 0xcc($s2) -/* B4B910 80240EA0 8C420000 */ lw $v0, ($v0) -/* B4B914 80240EA4 AE020028 */ sw $v0, 0x28($s0) -/* B4B918 80240EA8 24020003 */ addiu $v0, $zero, 3 -/* B4B91C 80240EAC AE620070 */ sw $v0, 0x70($s3) -/* B4B920 80240EB0 8FBF0020 */ lw $ra, 0x20($sp) -/* B4B924 80240EB4 8FB3001C */ lw $s3, 0x1c($sp) -/* B4B928 80240EB8 8FB20018 */ lw $s2, 0x18($sp) -/* B4B92C 80240EBC 8FB10014 */ lw $s1, 0x14($sp) -/* B4B930 80240EC0 8FB00010 */ lw $s0, 0x10($sp) -/* B4B934 80240EC4 03E00008 */ jr $ra -/* B4B938 80240EC8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s new file mode 100644 index 0000000000..c9e6a57acf --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80240E0C_B4B87C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E0C_B4B87C +/* B4B87C 80240E0C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B4B880 80240E10 AFB3001C */ sw $s3, 0x1c($sp) +/* B4B884 80240E14 0080982D */ daddu $s3, $a0, $zero +/* B4B888 80240E18 AFBF0020 */ sw $ra, 0x20($sp) +/* B4B88C 80240E1C AFB20018 */ sw $s2, 0x18($sp) +/* B4B890 80240E20 AFB10014 */ sw $s1, 0x14($sp) +/* B4B894 80240E24 AFB00010 */ sw $s0, 0x10($sp) +/* B4B898 80240E28 8E720148 */ lw $s2, 0x148($s3) +/* B4B89C 80240E2C 86440008 */ lh $a0, 8($s2) +/* B4B8A0 80240E30 0C00EABB */ jal get_npc_unsafe +/* B4B8A4 80240E34 00A0882D */ daddu $s1, $a1, $zero +/* B4B8A8 80240E38 8E240008 */ lw $a0, 8($s1) +/* B4B8AC 80240E3C 0040802D */ daddu $s0, $v0, $zero +/* B4B8B0 80240E40 00041FC2 */ srl $v1, $a0, 0x1f +/* B4B8B4 80240E44 00832021 */ addu $a0, $a0, $v1 +/* B4B8B8 80240E48 00042043 */ sra $a0, $a0, 1 +/* B4B8BC 80240E4C 0C00A67F */ jal rand_int +/* B4B8C0 80240E50 24840001 */ addiu $a0, $a0, 1 +/* B4B8C4 80240E54 8E230008 */ lw $v1, 8($s1) +/* B4B8C8 80240E58 240400B4 */ addiu $a0, $zero, 0xb4 +/* B4B8CC 80240E5C 00032FC2 */ srl $a1, $v1, 0x1f +/* B4B8D0 80240E60 00651821 */ addu $v1, $v1, $a1 +/* B4B8D4 80240E64 00031843 */ sra $v1, $v1, 1 +/* B4B8D8 80240E68 00621821 */ addu $v1, $v1, $v0 +/* B4B8DC 80240E6C 0C00A67F */ jal rand_int +/* B4B8E0 80240E70 A603008E */ sh $v1, 0x8e($s0) +/* B4B8E4 80240E74 C60C000C */ lwc1 $f12, 0xc($s0) +/* B4B8E8 80240E78 44820000 */ mtc1 $v0, $f0 +/* B4B8EC 80240E7C 00000000 */ nop +/* B4B8F0 80240E80 46800020 */ cvt.s.w $f0, $f0 +/* B4B8F4 80240E84 46006300 */ add.s $f12, $f12, $f0 +/* B4B8F8 80240E88 3C0142B4 */ lui $at, 0x42b4 +/* B4B8FC 80240E8C 44810000 */ mtc1 $at, $f0 +/* B4B900 80240E90 0C00A6C9 */ jal clamp_angle +/* B4B904 80240E94 46006301 */ sub.s $f12, $f12, $f0 +/* B4B908 80240E98 E600000C */ swc1 $f0, 0xc($s0) +/* B4B90C 80240E9C 8E4200CC */ lw $v0, 0xcc($s2) +/* B4B910 80240EA0 8C420000 */ lw $v0, ($v0) +/* B4B914 80240EA4 AE020028 */ sw $v0, 0x28($s0) +/* B4B918 80240EA8 24020003 */ addiu $v0, $zero, 3 +/* B4B91C 80240EAC AE620070 */ sw $v0, 0x70($s3) +/* B4B920 80240EB0 8FBF0020 */ lw $ra, 0x20($sp) +/* B4B924 80240EB4 8FB3001C */ lw $s3, 0x1c($sp) +/* B4B928 80240EB8 8FB20018 */ lw $s2, 0x18($sp) +/* B4B92C 80240EBC 8FB10014 */ lw $s1, 0x14($sp) +/* B4B930 80240EC0 8FB00010 */ lw $s0, 0x10($sp) +/* B4B934 80240EC4 03E00008 */ jr $ra +/* B4B938 80240EC8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070.s deleted file mode 100644 index d827294028..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241070 -/* B4BAE0 80241070 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4BAE4 80241074 AFB10014 */ sw $s1, 0x14($sp) -/* B4BAE8 80241078 0080882D */ daddu $s1, $a0, $zero -/* B4BAEC 8024107C AFBF001C */ sw $ra, 0x1c($sp) -/* B4BAF0 80241080 AFB20018 */ sw $s2, 0x18($sp) -/* B4BAF4 80241084 AFB00010 */ sw $s0, 0x10($sp) -/* B4BAF8 80241088 8E220148 */ lw $v0, 0x148($s1) -/* B4BAFC 8024108C 00A0902D */ daddu $s2, $a1, $zero -/* B4BB00 80241090 84440008 */ lh $a0, 8($v0) -/* B4BB04 80241094 0C00EABB */ jal get_npc_unsafe -/* B4BB08 80241098 00C0802D */ daddu $s0, $a2, $zero -/* B4BB0C 8024109C 0220202D */ daddu $a0, $s1, $zero -/* B4BB10 802410A0 0240282D */ daddu $a1, $s2, $zero -/* B4BB14 802410A4 0200302D */ daddu $a2, $s0, $zero -/* B4BB18 802410A8 0C0127DF */ jal func_80049F7C -/* B4BB1C 802410AC 0040802D */ daddu $s0, $v0, $zero -/* B4BB20 802410B0 8E020000 */ lw $v0, ($s0) -/* B4BB24 802410B4 24040005 */ addiu $a0, $zero, 5 -/* B4BB28 802410B8 34420800 */ ori $v0, $v0, 0x800 -/* B4BB2C 802410BC 0C00A67F */ jal rand_int -/* B4BB30 802410C0 AE020000 */ sw $v0, ($s0) -/* B4BB34 802410C4 44820000 */ mtc1 $v0, $f0 -/* B4BB38 802410C8 00000000 */ nop -/* B4BB3C 802410CC 46800021 */ cvt.d.w $f0, $f0 -/* B4BB40 802410D0 3C014024 */ lui $at, 0x4024 -/* B4BB44 802410D4 44811800 */ mtc1 $at, $f3 -/* B4BB48 802410D8 44801000 */ mtc1 $zero, $f2 -/* B4BB4C 802410DC 3C013FC0 */ lui $at, 0x3fc0 -/* B4BB50 802410E0 44812000 */ mtc1 $at, $f4 -/* B4BB54 802410E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B4BB58 802410E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B4BB5C 802410EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* B4BB60 802410F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B4BB64 802410F4 46220000 */ add.d $f0, $f0, $f2 -/* B4BB68 802410F8 E6040014 */ swc1 $f4, 0x14($s0) -/* B4BB6C 802410FC 46200020 */ cvt.s.d $f0, $f0 -/* B4BB70 80241100 E600001C */ swc1 $f0, 0x1c($s0) -/* B4BB74 80241104 8C460028 */ lw $a2, 0x28($v0) -/* B4BB78 80241108 0C00A720 */ jal atan2 -/* B4BB7C 8024110C 8C470030 */ lw $a3, 0x30($v0) -/* B4BB80 80241110 0200202D */ daddu $a0, $s0, $zero -/* B4BB84 80241114 3C05B000 */ lui $a1, 0xb000 -/* B4BB88 80241118 34A50017 */ ori $a1, $a1, 0x17 -/* B4BB8C 8024111C 0000302D */ daddu $a2, $zero, $zero -/* B4BB90 80241120 E480000C */ swc1 $f0, 0xc($a0) -/* B4BB94 80241124 C6400018 */ lwc1 $f0, 0x18($s2) -/* B4BB98 80241128 2402000D */ addiu $v0, $zero, 0xd -/* B4BB9C 8024112C E4800018 */ swc1 $f0, 0x18($a0) -/* B4BBA0 80241130 0C012530 */ jal func_800494C0 -/* B4BBA4 80241134 AE220070 */ sw $v0, 0x70($s1) -/* B4BBA8 80241138 8FBF001C */ lw $ra, 0x1c($sp) -/* B4BBAC 8024113C 8FB20018 */ lw $s2, 0x18($sp) -/* B4BBB0 80241140 8FB10014 */ lw $s1, 0x14($sp) -/* B4BBB4 80241144 8FB00010 */ lw $s0, 0x10($sp) -/* B4BBB8 80241148 03E00008 */ jr $ra -/* B4BBBC 8024114C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s new file mode 100644 index 0000000000..c1bec817d6 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241070_B4BAE0.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241070_B4BAE0 +/* B4BAE0 80241070 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B4BAE4 80241074 AFB10014 */ sw $s1, 0x14($sp) +/* B4BAE8 80241078 0080882D */ daddu $s1, $a0, $zero +/* B4BAEC 8024107C AFBF001C */ sw $ra, 0x1c($sp) +/* B4BAF0 80241080 AFB20018 */ sw $s2, 0x18($sp) +/* B4BAF4 80241084 AFB00010 */ sw $s0, 0x10($sp) +/* B4BAF8 80241088 8E220148 */ lw $v0, 0x148($s1) +/* B4BAFC 8024108C 00A0902D */ daddu $s2, $a1, $zero +/* B4BB00 80241090 84440008 */ lh $a0, 8($v0) +/* B4BB04 80241094 0C00EABB */ jal get_npc_unsafe +/* B4BB08 80241098 00C0802D */ daddu $s0, $a2, $zero +/* B4BB0C 8024109C 0220202D */ daddu $a0, $s1, $zero +/* B4BB10 802410A0 0240282D */ daddu $a1, $s2, $zero +/* B4BB14 802410A4 0200302D */ daddu $a2, $s0, $zero +/* B4BB18 802410A8 0C0127DF */ jal func_80049F7C +/* B4BB1C 802410AC 0040802D */ daddu $s0, $v0, $zero +/* B4BB20 802410B0 8E020000 */ lw $v0, ($s0) +/* B4BB24 802410B4 24040005 */ addiu $a0, $zero, 5 +/* B4BB28 802410B8 34420800 */ ori $v0, $v0, 0x800 +/* B4BB2C 802410BC 0C00A67F */ jal rand_int +/* B4BB30 802410C0 AE020000 */ sw $v0, ($s0) +/* B4BB34 802410C4 44820000 */ mtc1 $v0, $f0 +/* B4BB38 802410C8 00000000 */ nop +/* B4BB3C 802410CC 46800021 */ cvt.d.w $f0, $f0 +/* B4BB40 802410D0 3C014024 */ lui $at, 0x4024 +/* B4BB44 802410D4 44811800 */ mtc1 $at, $f3 +/* B4BB48 802410D8 44801000 */ mtc1 $zero, $f2 +/* B4BB4C 802410DC 3C013FC0 */ lui $at, 0x3fc0 +/* B4BB50 802410E0 44812000 */ mtc1 $at, $f4 +/* B4BB54 802410E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B4BB58 802410E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B4BB5C 802410EC C60C0038 */ lwc1 $f12, 0x38($s0) +/* B4BB60 802410F0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B4BB64 802410F4 46220000 */ add.d $f0, $f0, $f2 +/* B4BB68 802410F8 E6040014 */ swc1 $f4, 0x14($s0) +/* B4BB6C 802410FC 46200020 */ cvt.s.d $f0, $f0 +/* B4BB70 80241100 E600001C */ swc1 $f0, 0x1c($s0) +/* B4BB74 80241104 8C460028 */ lw $a2, 0x28($v0) +/* B4BB78 80241108 0C00A720 */ jal atan2 +/* B4BB7C 8024110C 8C470030 */ lw $a3, 0x30($v0) +/* B4BB80 80241110 0200202D */ daddu $a0, $s0, $zero +/* B4BB84 80241114 3C05B000 */ lui $a1, 0xb000 +/* B4BB88 80241118 34A50017 */ ori $a1, $a1, 0x17 +/* B4BB8C 8024111C 0000302D */ daddu $a2, $zero, $zero +/* B4BB90 80241120 E480000C */ swc1 $f0, 0xc($a0) +/* B4BB94 80241124 C6400018 */ lwc1 $f0, 0x18($s2) +/* B4BB98 80241128 2402000D */ addiu $v0, $zero, 0xd +/* B4BB9C 8024112C E4800018 */ swc1 $f0, 0x18($a0) +/* B4BBA0 80241130 0C012530 */ jal func_800494C0 +/* B4BBA4 80241134 AE220070 */ sw $v0, 0x70($s1) +/* B4BBA8 80241138 8FBF001C */ lw $ra, 0x1c($sp) +/* B4BBAC 8024113C 8FB20018 */ lw $s2, 0x18($sp) +/* B4BBB0 80241140 8FB10014 */ lw $s1, 0x14($sp) +/* B4BBB4 80241144 8FB00010 */ lw $s0, 0x10($sp) +/* B4BBB8 80241148 03E00008 */ jr $ra +/* B4BBBC 8024114C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150.s deleted file mode 100644 index 45219e6c39..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241150 -/* B4BBC0 80241150 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B4BBC4 80241154 AFB40050 */ sw $s4, 0x50($sp) -/* B4BBC8 80241158 0080A02D */ daddu $s4, $a0, $zero -/* B4BBCC 8024115C AFBF0060 */ sw $ra, 0x60($sp) -/* B4BBD0 80241160 AFB7005C */ sw $s7, 0x5c($sp) -/* B4BBD4 80241164 AFB60058 */ sw $s6, 0x58($sp) -/* B4BBD8 80241168 AFB50054 */ sw $s5, 0x54($sp) -/* B4BBDC 8024116C AFB3004C */ sw $s3, 0x4c($sp) -/* B4BBE0 80241170 AFB20048 */ sw $s2, 0x48($sp) -/* B4BBE4 80241174 AFB10044 */ sw $s1, 0x44($sp) -/* B4BBE8 80241178 AFB00040 */ sw $s0, 0x40($sp) -/* B4BBEC 8024117C F7B40068 */ sdc1 $f20, 0x68($sp) -/* B4BBF0 80241180 8E950148 */ lw $s5, 0x148($s4) -/* B4BBF4 80241184 00A0B02D */ daddu $s6, $a1, $zero -/* B4BBF8 80241188 86A40008 */ lh $a0, 8($s5) -/* B4BBFC 8024118C 0C00EABB */ jal get_npc_unsafe -/* B4BC00 80241190 00C0B82D */ daddu $s7, $a2, $zero -/* B4BC04 80241194 0040982D */ daddu $s3, $v0, $zero -/* B4BC08 80241198 C6600018 */ lwc1 $f0, 0x18($s3) -/* B4BC0C 8024119C 44801000 */ mtc1 $zero, $f2 -/* B4BC10 802411A0 44801800 */ mtc1 $zero, $f3 -/* B4BC14 802411A4 46000021 */ cvt.d.s $f0, $f0 -/* B4BC18 802411A8 4620103C */ c.lt.d $f2, $f0 -/* B4BC1C 802411AC 00000000 */ nop -/* B4BC20 802411B0 45000021 */ bc1f .L80241238 -/* B4BC24 802411B4 27A50028 */ addiu $a1, $sp, 0x28 -/* B4BC28 802411B8 C6600038 */ lwc1 $f0, 0x38($s3) -/* B4BC2C 802411BC C662003C */ lwc1 $f2, 0x3c($s3) -/* B4BC30 802411C0 C6640040 */ lwc1 $f4, 0x40($s3) -/* B4BC34 802411C4 C6660018 */ lwc1 $f6, 0x18($s3) -/* B4BC38 802411C8 E7A00028 */ swc1 $f0, 0x28($sp) -/* B4BC3C 802411CC E7A2002C */ swc1 $f2, 0x2c($sp) -/* B4BC40 802411D0 E7A40030 */ swc1 $f4, 0x30($sp) -/* B4BC44 802411D4 E7A60010 */ swc1 $f6, 0x10($sp) -/* B4BC48 802411D8 C660000C */ lwc1 $f0, 0xc($s3) -/* B4BC4C 802411DC E7A00014 */ swc1 $f0, 0x14($sp) -/* B4BC50 802411E0 866200A8 */ lh $v0, 0xa8($s3) -/* B4BC54 802411E4 44820000 */ mtc1 $v0, $f0 -/* B4BC58 802411E8 00000000 */ nop -/* B4BC5C 802411EC 46800020 */ cvt.s.w $f0, $f0 -/* B4BC60 802411F0 E7A00018 */ swc1 $f0, 0x18($sp) -/* B4BC64 802411F4 866200A6 */ lh $v0, 0xa6($s3) -/* B4BC68 802411F8 27A6002C */ addiu $a2, $sp, 0x2c -/* B4BC6C 802411FC 44820000 */ mtc1 $v0, $f0 -/* B4BC70 80241200 00000000 */ nop -/* B4BC74 80241204 46800020 */ cvt.s.w $f0, $f0 -/* B4BC78 80241208 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B4BC7C 8024120C 8E640080 */ lw $a0, 0x80($s3) -/* B4BC80 80241210 0C037711 */ jal func_800DDC44 -/* B4BC84 80241214 27A70030 */ addiu $a3, $sp, 0x30 -/* B4BC88 80241218 10400003 */ beqz $v0, .L80241228 -/* B4BC8C 8024121C 00000000 */ nop -/* B4BC90 80241220 0809048E */ j .L80241238 -/* B4BC94 80241224 AE600018 */ sw $zero, 0x18($s3) -.L80241228: -/* B4BC98 80241228 8E650018 */ lw $a1, 0x18($s3) -/* B4BC9C 8024122C 8E66000C */ lw $a2, 0xc($s3) -/* B4BCA0 80241230 0C00EA95 */ jal npc_move_heading -/* B4BCA4 80241234 0260202D */ daddu $a0, $s3, $zero -.L80241238: -/* B4BCA8 80241238 C660001C */ lwc1 $f0, 0x1c($s3) -/* B4BCAC 8024123C 44801000 */ mtc1 $zero, $f2 -/* B4BCB0 80241240 44801800 */ mtc1 $zero, $f3 -/* B4BCB4 80241244 46000021 */ cvt.d.s $f0, $f0 -/* B4BCB8 80241248 4622003C */ c.lt.d $f0, $f2 -/* B4BCBC 8024124C 00000000 */ nop -/* B4BCC0 80241250 4500006C */ bc1f .L80241404 -/* B4BCC4 80241254 27B00028 */ addiu $s0, $sp, 0x28 -/* B4BCC8 80241258 0200282D */ daddu $a1, $s0, $zero -/* B4BCCC 8024125C 27A60034 */ addiu $a2, $sp, 0x34 -/* B4BCD0 80241260 27B20038 */ addiu $s2, $sp, 0x38 -/* B4BCD4 80241264 C6600038 */ lwc1 $f0, 0x38($s3) -/* B4BCD8 80241268 3C0142C8 */ lui $at, 0x42c8 -/* B4BCDC 8024126C 44811000 */ mtc1 $at, $f2 -/* B4BCE0 80241270 C6640040 */ lwc1 $f4, 0x40($s3) -/* B4BCE4 80241274 3C01447A */ lui $at, 0x447a -/* B4BCE8 80241278 44813000 */ mtc1 $at, $f6 -/* B4BCEC 8024127C 27B10030 */ addiu $s1, $sp, 0x30 -/* B4BCF0 80241280 E7A00028 */ swc1 $f0, 0x28($sp) -/* B4BCF4 80241284 E7A20034 */ swc1 $f2, 0x34($sp) -/* B4BCF8 80241288 E7A40030 */ swc1 $f4, 0x30($sp) -/* B4BCFC 8024128C E7A60038 */ swc1 $f6, 0x38($sp) -/* B4BD00 80241290 AFB20010 */ sw $s2, 0x10($sp) -/* B4BD04 80241294 8E640080 */ lw $a0, 0x80($s3) -/* B4BD08 80241298 0C0372DF */ jal func_800DCB7C -/* B4BD0C 8024129C 0220382D */ daddu $a3, $s1, $zero -/* B4BD10 802412A0 0200282D */ daddu $a1, $s0, $zero -/* B4BD14 802412A4 27A6002C */ addiu $a2, $sp, 0x2c -/* B4BD18 802412A8 C662003C */ lwc1 $f2, 0x3c($s3) -/* B4BD1C 802412AC C6660038 */ lwc1 $f6, 0x38($s3) -/* B4BD20 802412B0 3C01402A */ lui $at, 0x402a -/* B4BD24 802412B4 4481A800 */ mtc1 $at, $f21 -/* B4BD28 802412B8 4480A000 */ mtc1 $zero, $f20 -/* B4BD2C 802412BC 460010A1 */ cvt.d.s $f2, $f2 -/* B4BD30 802412C0 46341080 */ add.d $f2, $f2, $f20 -/* B4BD34 802412C4 C660001C */ lwc1 $f0, 0x1c($s3) -/* B4BD38 802412C8 C6640040 */ lwc1 $f4, 0x40($s3) -/* B4BD3C 802412CC 46000005 */ abs.s $f0, $f0 -/* B4BD40 802412D0 E7A40030 */ swc1 $f4, 0x30($sp) -/* B4BD44 802412D4 3C014030 */ lui $at, 0x4030 -/* B4BD48 802412D8 44812800 */ mtc1 $at, $f5 -/* B4BD4C 802412DC 44802000 */ mtc1 $zero, $f4 -/* B4BD50 802412E0 46000021 */ cvt.d.s $f0, $f0 -/* B4BD54 802412E4 E7A60028 */ swc1 $f6, 0x28($sp) -/* B4BD58 802412E8 46240000 */ add.d $f0, $f0, $f4 -/* B4BD5C 802412EC 462010A0 */ cvt.s.d $f2, $f2 -/* B4BD60 802412F0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* B4BD64 802412F4 46200020 */ cvt.s.d $f0, $f0 -/* B4BD68 802412F8 E7A00038 */ swc1 $f0, 0x38($sp) -/* B4BD6C 802412FC AFB20010 */ sw $s2, 0x10($sp) -/* B4BD70 80241300 8E640080 */ lw $a0, 0x80($s3) -/* B4BD74 80241304 0C0372DF */ jal func_800DCB7C -/* B4BD78 80241308 0220382D */ daddu $a3, $s1, $zero -/* B4BD7C 8024130C 1040003D */ beqz $v0, .L80241404 -/* B4BD80 80241310 00000000 */ nop -/* B4BD84 80241314 C660001C */ lwc1 $f0, 0x1c($s3) -/* B4BD88 80241318 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B4BD8C 8024131C 46000005 */ abs.s $f0, $f0 -/* B4BD90 80241320 46000021 */ cvt.d.s $f0, $f0 -/* B4BD94 80241324 46340000 */ add.d $f0, $f0, $f20 -/* B4BD98 80241328 460010A1 */ cvt.d.s $f2, $f2 -/* B4BD9C 8024132C 4620103E */ c.le.d $f2, $f0 -/* B4BDA0 80241330 00000000 */ nop -/* B4BDA4 80241334 45000033 */ bc1f .L80241404 -/* B4BDA8 80241338 2403F7FF */ addiu $v1, $zero, -0x801 -/* B4BDAC 8024133C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* B4BDB0 80241340 8E620000 */ lw $v0, ($s3) -/* B4BDB4 80241344 AE60001C */ sw $zero, 0x1c($s3) -/* B4BDB8 80241348 00431024 */ and $v0, $v0, $v1 -/* B4BDBC 8024134C E660003C */ swc1 $f0, 0x3c($s3) -/* B4BDC0 80241350 AE620000 */ sw $v0, ($s3) -/* B4BDC4 80241354 AFA00010 */ sw $zero, 0x10($sp) -/* B4BDC8 80241358 AFA00014 */ sw $zero, 0x14($sp) -/* B4BDCC 8024135C 8E650038 */ lw $a1, 0x38($s3) -/* B4BDD0 80241360 8E66003C */ lw $a2, 0x3c($s3) -/* B4BDD4 80241364 8E670040 */ lw $a3, 0x40($s3) -/* B4BDD8 80241368 0C01BECC */ jal fx_walk_normal -/* B4BDDC 8024136C 24040002 */ addiu $a0, $zero, 2 -/* B4BDE0 80241370 02E0202D */ daddu $a0, $s7, $zero -/* B4BDE4 80241374 2402000C */ addiu $v0, $zero, 0xc -/* B4BDE8 80241378 AE820070 */ sw $v0, 0x70($s4) -/* B4BDEC 8024137C 24020001 */ addiu $v0, $zero, 1 -/* B4BDF0 80241380 AFA20010 */ sw $v0, 0x10($sp) -/* B4BDF4 80241384 8EC60024 */ lw $a2, 0x24($s6) -/* B4BDF8 80241388 8EC70028 */ lw $a3, 0x28($s6) -/* B4BDFC 8024138C 0C01242D */ jal func_800490B4 -/* B4BE00 80241390 02A0282D */ daddu $a1, $s5, $zero -/* B4BE04 80241394 14400022 */ bnez $v0, .L80241420 -/* B4BE08 80241398 24040002 */ addiu $a0, $zero, 2 -/* B4BE0C 8024139C 0260282D */ daddu $a1, $s3, $zero -/* B4BE10 802413A0 0000302D */ daddu $a2, $zero, $zero -/* B4BE14 802413A4 866300A8 */ lh $v1, 0xa8($s3) -/* B4BE18 802413A8 3C013F80 */ lui $at, 0x3f80 -/* B4BE1C 802413AC 44810000 */ mtc1 $at, $f0 -/* B4BE20 802413B0 3C014000 */ lui $at, 0x4000 -/* B4BE24 802413B4 44811000 */ mtc1 $at, $f2 -/* B4BE28 802413B8 3C01C1A0 */ lui $at, 0xc1a0 -/* B4BE2C 802413BC 44812000 */ mtc1 $at, $f4 -/* B4BE30 802413C0 2402000F */ addiu $v0, $zero, 0xf -/* B4BE34 802413C4 AFA2001C */ sw $v0, 0x1c($sp) -/* B4BE38 802413C8 44834000 */ mtc1 $v1, $f8 -/* B4BE3C 802413CC 00000000 */ nop -/* B4BE40 802413D0 46804220 */ cvt.s.w $f8, $f8 -/* B4BE44 802413D4 44074000 */ mfc1 $a3, $f8 -/* B4BE48 802413D8 27A2003C */ addiu $v0, $sp, 0x3c -/* B4BE4C 802413DC AFA20020 */ sw $v0, 0x20($sp) -/* B4BE50 802413E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* B4BE54 802413E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* B4BE58 802413E8 0C01BFA4 */ jal fx_emote -/* B4BE5C 802413EC E7A40018 */ swc1 $f4, 0x18($sp) -/* B4BE60 802413F0 24020019 */ addiu $v0, $zero, 0x19 -/* B4BE64 802413F4 A662008E */ sh $v0, 0x8e($s3) -/* B4BE68 802413F8 2402000E */ addiu $v0, $zero, 0xe -/* B4BE6C 802413FC 08090508 */ j .L80241420 -/* B4BE70 80241400 AE820070 */ sw $v0, 0x70($s4) -.L80241404: -/* B4BE74 80241404 C664003C */ lwc1 $f4, 0x3c($s3) -/* B4BE78 80241408 C660001C */ lwc1 $f0, 0x1c($s3) -/* B4BE7C 8024140C 46002100 */ add.s $f4, $f4, $f0 -/* B4BE80 80241410 C6620014 */ lwc1 $f2, 0x14($s3) -/* B4BE84 80241414 46020001 */ sub.s $f0, $f0, $f2 -/* B4BE88 80241418 E664003C */ swc1 $f4, 0x3c($s3) -/* B4BE8C 8024141C E660001C */ swc1 $f0, 0x1c($s3) -.L80241420: -/* B4BE90 80241420 8FBF0060 */ lw $ra, 0x60($sp) -/* B4BE94 80241424 8FB7005C */ lw $s7, 0x5c($sp) -/* B4BE98 80241428 8FB60058 */ lw $s6, 0x58($sp) -/* B4BE9C 8024142C 8FB50054 */ lw $s5, 0x54($sp) -/* B4BEA0 80241430 8FB40050 */ lw $s4, 0x50($sp) -/* B4BEA4 80241434 8FB3004C */ lw $s3, 0x4c($sp) -/* B4BEA8 80241438 8FB20048 */ lw $s2, 0x48($sp) -/* B4BEAC 8024143C 8FB10044 */ lw $s1, 0x44($sp) -/* B4BEB0 80241440 8FB00040 */ lw $s0, 0x40($sp) -/* B4BEB4 80241444 D7B40068 */ ldc1 $f20, 0x68($sp) -/* B4BEB8 80241448 03E00008 */ jr $ra -/* B4BEBC 8024144C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150_B4BBC0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150_B4BBC0.s new file mode 100644 index 0000000000..88f29bc203 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241150_B4BBC0.s @@ -0,0 +1,200 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241150_B4BBC0 +/* B4BBC0 80241150 27BDFF90 */ addiu $sp, $sp, -0x70 +/* B4BBC4 80241154 AFB40050 */ sw $s4, 0x50($sp) +/* B4BBC8 80241158 0080A02D */ daddu $s4, $a0, $zero +/* B4BBCC 8024115C AFBF0060 */ sw $ra, 0x60($sp) +/* B4BBD0 80241160 AFB7005C */ sw $s7, 0x5c($sp) +/* B4BBD4 80241164 AFB60058 */ sw $s6, 0x58($sp) +/* B4BBD8 80241168 AFB50054 */ sw $s5, 0x54($sp) +/* B4BBDC 8024116C AFB3004C */ sw $s3, 0x4c($sp) +/* B4BBE0 80241170 AFB20048 */ sw $s2, 0x48($sp) +/* B4BBE4 80241174 AFB10044 */ sw $s1, 0x44($sp) +/* B4BBE8 80241178 AFB00040 */ sw $s0, 0x40($sp) +/* B4BBEC 8024117C F7B40068 */ sdc1 $f20, 0x68($sp) +/* B4BBF0 80241180 8E950148 */ lw $s5, 0x148($s4) +/* B4BBF4 80241184 00A0B02D */ daddu $s6, $a1, $zero +/* B4BBF8 80241188 86A40008 */ lh $a0, 8($s5) +/* B4BBFC 8024118C 0C00EABB */ jal get_npc_unsafe +/* B4BC00 80241190 00C0B82D */ daddu $s7, $a2, $zero +/* B4BC04 80241194 0040982D */ daddu $s3, $v0, $zero +/* B4BC08 80241198 C6600018 */ lwc1 $f0, 0x18($s3) +/* B4BC0C 8024119C 44801000 */ mtc1 $zero, $f2 +/* B4BC10 802411A0 44801800 */ mtc1 $zero, $f3 +/* B4BC14 802411A4 46000021 */ cvt.d.s $f0, $f0 +/* B4BC18 802411A8 4620103C */ c.lt.d $f2, $f0 +/* B4BC1C 802411AC 00000000 */ nop +/* B4BC20 802411B0 45000021 */ bc1f .L80241238 +/* B4BC24 802411B4 27A50028 */ addiu $a1, $sp, 0x28 +/* B4BC28 802411B8 C6600038 */ lwc1 $f0, 0x38($s3) +/* B4BC2C 802411BC C662003C */ lwc1 $f2, 0x3c($s3) +/* B4BC30 802411C0 C6640040 */ lwc1 $f4, 0x40($s3) +/* B4BC34 802411C4 C6660018 */ lwc1 $f6, 0x18($s3) +/* B4BC38 802411C8 E7A00028 */ swc1 $f0, 0x28($sp) +/* B4BC3C 802411CC E7A2002C */ swc1 $f2, 0x2c($sp) +/* B4BC40 802411D0 E7A40030 */ swc1 $f4, 0x30($sp) +/* B4BC44 802411D4 E7A60010 */ swc1 $f6, 0x10($sp) +/* B4BC48 802411D8 C660000C */ lwc1 $f0, 0xc($s3) +/* B4BC4C 802411DC E7A00014 */ swc1 $f0, 0x14($sp) +/* B4BC50 802411E0 866200A8 */ lh $v0, 0xa8($s3) +/* B4BC54 802411E4 44820000 */ mtc1 $v0, $f0 +/* B4BC58 802411E8 00000000 */ nop +/* B4BC5C 802411EC 46800020 */ cvt.s.w $f0, $f0 +/* B4BC60 802411F0 E7A00018 */ swc1 $f0, 0x18($sp) +/* B4BC64 802411F4 866200A6 */ lh $v0, 0xa6($s3) +/* B4BC68 802411F8 27A6002C */ addiu $a2, $sp, 0x2c +/* B4BC6C 802411FC 44820000 */ mtc1 $v0, $f0 +/* B4BC70 80241200 00000000 */ nop +/* B4BC74 80241204 46800020 */ cvt.s.w $f0, $f0 +/* B4BC78 80241208 E7A0001C */ swc1 $f0, 0x1c($sp) +/* B4BC7C 8024120C 8E640080 */ lw $a0, 0x80($s3) +/* B4BC80 80241210 0C037711 */ jal func_800DDC44 +/* B4BC84 80241214 27A70030 */ addiu $a3, $sp, 0x30 +/* B4BC88 80241218 10400003 */ beqz $v0, .L80241228 +/* B4BC8C 8024121C 00000000 */ nop +/* B4BC90 80241220 0809048E */ j .L80241238 +/* B4BC94 80241224 AE600018 */ sw $zero, 0x18($s3) +.L80241228: +/* B4BC98 80241228 8E650018 */ lw $a1, 0x18($s3) +/* B4BC9C 8024122C 8E66000C */ lw $a2, 0xc($s3) +/* B4BCA0 80241230 0C00EA95 */ jal npc_move_heading +/* B4BCA4 80241234 0260202D */ daddu $a0, $s3, $zero +.L80241238: +/* B4BCA8 80241238 C660001C */ lwc1 $f0, 0x1c($s3) +/* B4BCAC 8024123C 44801000 */ mtc1 $zero, $f2 +/* B4BCB0 80241240 44801800 */ mtc1 $zero, $f3 +/* B4BCB4 80241244 46000021 */ cvt.d.s $f0, $f0 +/* B4BCB8 80241248 4622003C */ c.lt.d $f0, $f2 +/* B4BCBC 8024124C 00000000 */ nop +/* B4BCC0 80241250 4500006C */ bc1f .L80241404 +/* B4BCC4 80241254 27B00028 */ addiu $s0, $sp, 0x28 +/* B4BCC8 80241258 0200282D */ daddu $a1, $s0, $zero +/* B4BCCC 8024125C 27A60034 */ addiu $a2, $sp, 0x34 +/* B4BCD0 80241260 27B20038 */ addiu $s2, $sp, 0x38 +/* B4BCD4 80241264 C6600038 */ lwc1 $f0, 0x38($s3) +/* B4BCD8 80241268 3C0142C8 */ lui $at, 0x42c8 +/* B4BCDC 8024126C 44811000 */ mtc1 $at, $f2 +/* B4BCE0 80241270 C6640040 */ lwc1 $f4, 0x40($s3) +/* B4BCE4 80241274 3C01447A */ lui $at, 0x447a +/* B4BCE8 80241278 44813000 */ mtc1 $at, $f6 +/* B4BCEC 8024127C 27B10030 */ addiu $s1, $sp, 0x30 +/* B4BCF0 80241280 E7A00028 */ swc1 $f0, 0x28($sp) +/* B4BCF4 80241284 E7A20034 */ swc1 $f2, 0x34($sp) +/* B4BCF8 80241288 E7A40030 */ swc1 $f4, 0x30($sp) +/* B4BCFC 8024128C E7A60038 */ swc1 $f6, 0x38($sp) +/* B4BD00 80241290 AFB20010 */ sw $s2, 0x10($sp) +/* B4BD04 80241294 8E640080 */ lw $a0, 0x80($s3) +/* B4BD08 80241298 0C0372DF */ jal func_800DCB7C +/* B4BD0C 8024129C 0220382D */ daddu $a3, $s1, $zero +/* B4BD10 802412A0 0200282D */ daddu $a1, $s0, $zero +/* B4BD14 802412A4 27A6002C */ addiu $a2, $sp, 0x2c +/* B4BD18 802412A8 C662003C */ lwc1 $f2, 0x3c($s3) +/* B4BD1C 802412AC C6660038 */ lwc1 $f6, 0x38($s3) +/* B4BD20 802412B0 3C01402A */ lui $at, 0x402a +/* B4BD24 802412B4 4481A800 */ mtc1 $at, $f21 +/* B4BD28 802412B8 4480A000 */ mtc1 $zero, $f20 +/* B4BD2C 802412BC 460010A1 */ cvt.d.s $f2, $f2 +/* B4BD30 802412C0 46341080 */ add.d $f2, $f2, $f20 +/* B4BD34 802412C4 C660001C */ lwc1 $f0, 0x1c($s3) +/* B4BD38 802412C8 C6640040 */ lwc1 $f4, 0x40($s3) +/* B4BD3C 802412CC 46000005 */ abs.s $f0, $f0 +/* B4BD40 802412D0 E7A40030 */ swc1 $f4, 0x30($sp) +/* B4BD44 802412D4 3C014030 */ lui $at, 0x4030 +/* B4BD48 802412D8 44812800 */ mtc1 $at, $f5 +/* B4BD4C 802412DC 44802000 */ mtc1 $zero, $f4 +/* B4BD50 802412E0 46000021 */ cvt.d.s $f0, $f0 +/* B4BD54 802412E4 E7A60028 */ swc1 $f6, 0x28($sp) +/* B4BD58 802412E8 46240000 */ add.d $f0, $f0, $f4 +/* B4BD5C 802412EC 462010A0 */ cvt.s.d $f2, $f2 +/* B4BD60 802412F0 E7A2002C */ swc1 $f2, 0x2c($sp) +/* B4BD64 802412F4 46200020 */ cvt.s.d $f0, $f0 +/* B4BD68 802412F8 E7A00038 */ swc1 $f0, 0x38($sp) +/* B4BD6C 802412FC AFB20010 */ sw $s2, 0x10($sp) +/* B4BD70 80241300 8E640080 */ lw $a0, 0x80($s3) +/* B4BD74 80241304 0C0372DF */ jal func_800DCB7C +/* B4BD78 80241308 0220382D */ daddu $a3, $s1, $zero +/* B4BD7C 8024130C 1040003D */ beqz $v0, .L80241404 +/* B4BD80 80241310 00000000 */ nop +/* B4BD84 80241314 C660001C */ lwc1 $f0, 0x1c($s3) +/* B4BD88 80241318 C7A20038 */ lwc1 $f2, 0x38($sp) +/* B4BD8C 8024131C 46000005 */ abs.s $f0, $f0 +/* B4BD90 80241320 46000021 */ cvt.d.s $f0, $f0 +/* B4BD94 80241324 46340000 */ add.d $f0, $f0, $f20 +/* B4BD98 80241328 460010A1 */ cvt.d.s $f2, $f2 +/* B4BD9C 8024132C 4620103E */ c.le.d $f2, $f0 +/* B4BDA0 80241330 00000000 */ nop +/* B4BDA4 80241334 45000033 */ bc1f .L80241404 +/* B4BDA8 80241338 2403F7FF */ addiu $v1, $zero, -0x801 +/* B4BDAC 8024133C C7A0002C */ lwc1 $f0, 0x2c($sp) +/* B4BDB0 80241340 8E620000 */ lw $v0, ($s3) +/* B4BDB4 80241344 AE60001C */ sw $zero, 0x1c($s3) +/* B4BDB8 80241348 00431024 */ and $v0, $v0, $v1 +/* B4BDBC 8024134C E660003C */ swc1 $f0, 0x3c($s3) +/* B4BDC0 80241350 AE620000 */ sw $v0, ($s3) +/* B4BDC4 80241354 AFA00010 */ sw $zero, 0x10($sp) +/* B4BDC8 80241358 AFA00014 */ sw $zero, 0x14($sp) +/* B4BDCC 8024135C 8E650038 */ lw $a1, 0x38($s3) +/* B4BDD0 80241360 8E66003C */ lw $a2, 0x3c($s3) +/* B4BDD4 80241364 8E670040 */ lw $a3, 0x40($s3) +/* B4BDD8 80241368 0C01BECC */ jal fx_walk_normal +/* B4BDDC 8024136C 24040002 */ addiu $a0, $zero, 2 +/* B4BDE0 80241370 02E0202D */ daddu $a0, $s7, $zero +/* B4BDE4 80241374 2402000C */ addiu $v0, $zero, 0xc +/* B4BDE8 80241378 AE820070 */ sw $v0, 0x70($s4) +/* B4BDEC 8024137C 24020001 */ addiu $v0, $zero, 1 +/* B4BDF0 80241380 AFA20010 */ sw $v0, 0x10($sp) +/* B4BDF4 80241384 8EC60024 */ lw $a2, 0x24($s6) +/* B4BDF8 80241388 8EC70028 */ lw $a3, 0x28($s6) +/* B4BDFC 8024138C 0C01242D */ jal func_800490B4 +/* B4BE00 80241390 02A0282D */ daddu $a1, $s5, $zero +/* B4BE04 80241394 14400022 */ bnez $v0, .L80241420 +/* B4BE08 80241398 24040002 */ addiu $a0, $zero, 2 +/* B4BE0C 8024139C 0260282D */ daddu $a1, $s3, $zero +/* B4BE10 802413A0 0000302D */ daddu $a2, $zero, $zero +/* B4BE14 802413A4 866300A8 */ lh $v1, 0xa8($s3) +/* B4BE18 802413A8 3C013F80 */ lui $at, 0x3f80 +/* B4BE1C 802413AC 44810000 */ mtc1 $at, $f0 +/* B4BE20 802413B0 3C014000 */ lui $at, 0x4000 +/* B4BE24 802413B4 44811000 */ mtc1 $at, $f2 +/* B4BE28 802413B8 3C01C1A0 */ lui $at, 0xc1a0 +/* B4BE2C 802413BC 44812000 */ mtc1 $at, $f4 +/* B4BE30 802413C0 2402000F */ addiu $v0, $zero, 0xf +/* B4BE34 802413C4 AFA2001C */ sw $v0, 0x1c($sp) +/* B4BE38 802413C8 44834000 */ mtc1 $v1, $f8 +/* B4BE3C 802413CC 00000000 */ nop +/* B4BE40 802413D0 46804220 */ cvt.s.w $f8, $f8 +/* B4BE44 802413D4 44074000 */ mfc1 $a3, $f8 +/* B4BE48 802413D8 27A2003C */ addiu $v0, $sp, 0x3c +/* B4BE4C 802413DC AFA20020 */ sw $v0, 0x20($sp) +/* B4BE50 802413E0 E7A00010 */ swc1 $f0, 0x10($sp) +/* B4BE54 802413E4 E7A20014 */ swc1 $f2, 0x14($sp) +/* B4BE58 802413E8 0C01BFA4 */ jal fx_emote +/* B4BE5C 802413EC E7A40018 */ swc1 $f4, 0x18($sp) +/* B4BE60 802413F0 24020019 */ addiu $v0, $zero, 0x19 +/* B4BE64 802413F4 A662008E */ sh $v0, 0x8e($s3) +/* B4BE68 802413F8 2402000E */ addiu $v0, $zero, 0xe +/* B4BE6C 802413FC 08090508 */ j .L80241420 +/* B4BE70 80241400 AE820070 */ sw $v0, 0x70($s4) +.L80241404: +/* B4BE74 80241404 C664003C */ lwc1 $f4, 0x3c($s3) +/* B4BE78 80241408 C660001C */ lwc1 $f0, 0x1c($s3) +/* B4BE7C 8024140C 46002100 */ add.s $f4, $f4, $f0 +/* B4BE80 80241410 C6620014 */ lwc1 $f2, 0x14($s3) +/* B4BE84 80241414 46020001 */ sub.s $f0, $f0, $f2 +/* B4BE88 80241418 E664003C */ swc1 $f4, 0x3c($s3) +/* B4BE8C 8024141C E660001C */ swc1 $f0, 0x1c($s3) +.L80241420: +/* B4BE90 80241420 8FBF0060 */ lw $ra, 0x60($sp) +/* B4BE94 80241424 8FB7005C */ lw $s7, 0x5c($sp) +/* B4BE98 80241428 8FB60058 */ lw $s6, 0x58($sp) +/* B4BE9C 8024142C 8FB50054 */ lw $s5, 0x54($sp) +/* B4BEA0 80241430 8FB40050 */ lw $s4, 0x50($sp) +/* B4BEA4 80241434 8FB3004C */ lw $s3, 0x4c($sp) +/* B4BEA8 80241438 8FB20048 */ lw $s2, 0x48($sp) +/* B4BEAC 8024143C 8FB10044 */ lw $s1, 0x44($sp) +/* B4BEB0 80241440 8FB00040 */ lw $s0, 0x40($sp) +/* B4BEB4 80241444 D7B40068 */ ldc1 $f20, 0x68($sp) +/* B4BEB8 80241448 03E00008 */ jr $ra +/* B4BEBC 8024144C 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450.s deleted file mode 100644 index 94473aba2e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241450 -/* B4BEC0 80241450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4BEC4 80241454 AFB00010 */ sw $s0, 0x10($sp) -/* B4BEC8 80241458 0080802D */ daddu $s0, $a0, $zero -/* B4BECC 8024145C AFBF0014 */ sw $ra, 0x14($sp) -/* B4BED0 80241460 8E020148 */ lw $v0, 0x148($s0) -/* B4BED4 80241464 0C00EABB */ jal get_npc_unsafe -/* B4BED8 80241468 84440008 */ lh $a0, 8($v0) -/* B4BEDC 8024146C 9443008E */ lhu $v1, 0x8e($v0) -/* B4BEE0 80241470 2463FFFF */ addiu $v1, $v1, -1 -/* B4BEE4 80241474 A443008E */ sh $v1, 0x8e($v0) -/* B4BEE8 80241478 00031C00 */ sll $v1, $v1, 0x10 -/* B4BEEC 8024147C 58600001 */ blezl $v1, .L80241484 -/* B4BEF0 80241480 AE000070 */ sw $zero, 0x70($s0) -.L80241484: -/* B4BEF4 80241484 8FBF0014 */ lw $ra, 0x14($sp) -/* B4BEF8 80241488 8FB00010 */ lw $s0, 0x10($sp) -/* B4BEFC 8024148C 03E00008 */ jr $ra -/* B4BF00 80241490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s new file mode 100644 index 0000000000..e40c78e661 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241450_B4BEC0.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241450_B4BEC0 +/* B4BEC0 80241450 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B4BEC4 80241454 AFB00010 */ sw $s0, 0x10($sp) +/* B4BEC8 80241458 0080802D */ daddu $s0, $a0, $zero +/* B4BECC 8024145C AFBF0014 */ sw $ra, 0x14($sp) +/* B4BED0 80241460 8E020148 */ lw $v0, 0x148($s0) +/* B4BED4 80241464 0C00EABB */ jal get_npc_unsafe +/* B4BED8 80241468 84440008 */ lh $a0, 8($v0) +/* B4BEDC 8024146C 9443008E */ lhu $v1, 0x8e($v0) +/* B4BEE0 80241470 2463FFFF */ addiu $v1, $v1, -1 +/* B4BEE4 80241474 A443008E */ sh $v1, 0x8e($v0) +/* B4BEE8 80241478 00031C00 */ sll $v1, $v1, 0x10 +/* B4BEEC 8024147C 58600001 */ blezl $v1, .L80241484 +/* B4BEF0 80241480 AE000070 */ sw $zero, 0x70($s0) +.L80241484: +/* B4BEF4 80241484 8FBF0014 */ lw $ra, 0x14($sp) +/* B4BEF8 80241488 8FB00010 */ lw $s0, 0x10($sp) +/* B4BEFC 8024148C 03E00008 */ jr $ra +/* B4BF00 80241490 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s index f7a9e014ba..a5fd4040e2 100644 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241494_B4BF04.s @@ -99,13 +99,13 @@ glabel func_80241494_B4BF04 /* B4C074 80241604 0200302D */ daddu $a2, $s0, $zero /* B4C078 80241608 0260202D */ daddu $a0, $s3, $zero /* B4C07C 8024160C 0280282D */ daddu $a1, $s4, $zero -/* B4C080 80241610 0C0902B5 */ jal func_80240AD4 +/* B4C080 80241610 0C0902B5 */ jal func_80240AD4_B4B544 /* B4C084 80241614 0200302D */ daddu $a2, $s0, $zero /* B4C088 80241618 080905A5 */ j .L80241694 /* B4C08C 8024161C 0000102D */ daddu $v0, $zero, $zero /* B4C090 80241620 0260202D */ daddu $a0, $s3, $zero /* B4C094 80241624 0280282D */ daddu $a1, $s4, $zero -/* B4C098 80241628 0C090383 */ jal func_80240E0C +/* B4C098 80241628 0C090383 */ jal func_80240E0C_B4B87C /* B4C09C 8024162C 0200302D */ daddu $a2, $s0, $zero /* B4C0A0 80241630 8E630070 */ lw $v1, 0x70($s3) /* B4C0A4 80241634 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80241494_B4BF04 /* B4C0AC 8024163C 0000102D */ daddu $v0, $zero, $zero /* B4C0B0 80241640 0260202D */ daddu $a0, $s3, $zero /* B4C0B4 80241644 0280282D */ daddu $a1, $s4, $zero -/* B4C0B8 80241648 0C0903B3 */ jal func_80240ECC +/* B4C0B8 80241648 0C0903B3 */ jal func_80240ECC_B4B93C /* B4C0BC 8024164C 0200302D */ daddu $a2, $s0, $zero /* B4C0C0 80241650 080905A5 */ j .L80241694 /* B4C0C4 80241654 0000102D */ daddu $v0, $zero, $zero /* B4C0C8 80241658 0260202D */ daddu $a0, $s3, $zero /* B4C0CC 8024165C 0280282D */ daddu $a1, $s4, $zero -/* B4C0D0 80241660 0C09041C */ jal func_80241070 +/* B4C0D0 80241660 0C09041C */ jal func_80241070_B4BAE0 /* B4C0D4 80241664 0200302D */ daddu $a2, $s0, $zero /* B4C0D8 80241668 0260202D */ daddu $a0, $s3, $zero /* B4C0DC 8024166C 0280282D */ daddu $a1, $s4, $zero -/* B4C0E0 80241670 0C090454 */ jal func_80241150 +/* B4C0E0 80241670 0C090454 */ jal func_80241150_B4BBC0 /* B4C0E4 80241674 0200302D */ daddu $a2, $s0, $zero /* B4C0E8 80241678 080905A5 */ j .L80241694 /* B4C0EC 8024167C 0000102D */ daddu $v0, $zero, $zero /* B4C0F0 80241680 0260202D */ daddu $a0, $s3, $zero /* B4C0F4 80241684 0280282D */ daddu $a1, $s4, $zero -/* B4C0F8 80241688 0C090514 */ jal func_80241450 +/* B4C0F8 80241688 0C090514 */ jal func_80241450_B4BEC0 /* B4C0FC 8024168C 0200302D */ daddu $a2, $s0, $zero .L80241690: /* B4C100 80241690 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8.s deleted file mode 100644 index 432be03c8c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416B8 -/* B4C128 802416B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4C12C 802416BC AFB10014 */ sw $s1, 0x14($sp) -/* B4C130 802416C0 0080882D */ daddu $s1, $a0, $zero -/* B4C134 802416C4 AFBF0018 */ sw $ra, 0x18($sp) -/* B4C138 802416C8 AFB00010 */ sw $s0, 0x10($sp) -/* B4C13C 802416CC 8E300148 */ lw $s0, 0x148($s1) -/* B4C140 802416D0 0C00EABB */ jal get_npc_unsafe -/* B4C144 802416D4 86040008 */ lh $a0, 8($s0) -/* B4C148 802416D8 3C054387 */ lui $a1, 0x4387 -/* B4C14C 802416DC 0040202D */ daddu $a0, $v0, $zero -/* B4C150 802416E0 0C00ECD0 */ jal set_npc_yaw -/* B4C154 802416E4 A480008E */ sh $zero, 0x8e($a0) -/* B4C158 802416E8 24020003 */ addiu $v0, $zero, 3 -/* B4C15C 802416EC AE00006C */ sw $zero, 0x6c($s0) -/* B4C160 802416F0 AE220070 */ sw $v0, 0x70($s1) -/* B4C164 802416F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B4C168 802416F8 8FB10014 */ lw $s1, 0x14($sp) -/* B4C16C 802416FC 8FB00010 */ lw $s0, 0x10($sp) -/* B4C170 80241700 03E00008 */ jr $ra -/* B4C174 80241704 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8_B4C128.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8_B4C128.s new file mode 100644 index 0000000000..8a8bc80583 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802416B8_B4C128.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416B8_B4C128 +/* B4C128 802416B8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B4C12C 802416BC AFB10014 */ sw $s1, 0x14($sp) +/* B4C130 802416C0 0080882D */ daddu $s1, $a0, $zero +/* B4C134 802416C4 AFBF0018 */ sw $ra, 0x18($sp) +/* B4C138 802416C8 AFB00010 */ sw $s0, 0x10($sp) +/* B4C13C 802416CC 8E300148 */ lw $s0, 0x148($s1) +/* B4C140 802416D0 0C00EABB */ jal get_npc_unsafe +/* B4C144 802416D4 86040008 */ lh $a0, 8($s0) +/* B4C148 802416D8 3C054387 */ lui $a1, 0x4387 +/* B4C14C 802416DC 0040202D */ daddu $a0, $v0, $zero +/* B4C150 802416E0 0C00ECD0 */ jal set_npc_yaw +/* B4C154 802416E4 A480008E */ sh $zero, 0x8e($a0) +/* B4C158 802416E8 24020003 */ addiu $v0, $zero, 3 +/* B4C15C 802416EC AE00006C */ sw $zero, 0x6c($s0) +/* B4C160 802416F0 AE220070 */ sw $v0, 0x70($s1) +/* B4C164 802416F4 8FBF0018 */ lw $ra, 0x18($sp) +/* B4C168 802416F8 8FB10014 */ lw $s1, 0x14($sp) +/* B4C16C 802416FC 8FB00010 */ lw $s0, 0x10($sp) +/* B4C170 80241700 03E00008 */ jr $ra +/* B4C174 80241704 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938.s deleted file mode 100644 index 0e48620903..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241938 -/* B4C3A8 80241938 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4C3AC 8024193C AFB10014 */ sw $s1, 0x14($sp) -/* B4C3B0 80241940 0080882D */ daddu $s1, $a0, $zero -/* B4C3B4 80241944 AFBF0018 */ sw $ra, 0x18($sp) -/* B4C3B8 80241948 AFB00010 */ sw $s0, 0x10($sp) -/* B4C3BC 8024194C 8E300148 */ lw $s0, 0x148($s1) -/* B4C3C0 80241950 0C00EABB */ jal get_npc_unsafe -/* B4C3C4 80241954 86040008 */ lh $a0, 8($s0) -/* B4C3C8 80241958 0040202D */ daddu $a0, $v0, $zero -/* B4C3CC 8024195C 9482008E */ lhu $v0, 0x8e($a0) -/* B4C3D0 80241960 2442FFFF */ addiu $v0, $v0, -1 -/* B4C3D4 80241964 A482008E */ sh $v0, 0x8e($a0) -/* B4C3D8 80241968 00021400 */ sll $v0, $v0, 0x10 -/* B4C3DC 8024196C 1C400009 */ bgtz $v0, .L80241994 -/* B4C3E0 80241970 24020003 */ addiu $v0, $zero, 3 -/* B4C3E4 80241974 96030076 */ lhu $v1, 0x76($s0) -/* B4C3E8 80241978 AE02006C */ sw $v0, 0x6c($s0) -/* B4C3EC 8024197C A483008E */ sh $v1, 0x8e($a0) -/* B4C3F0 80241980 8E0200CC */ lw $v0, 0xcc($s0) -/* B4C3F4 80241984 8C420024 */ lw $v0, 0x24($v0) -/* B4C3F8 80241988 AC820028 */ sw $v0, 0x28($a0) -/* B4C3FC 8024198C 24020020 */ addiu $v0, $zero, 0x20 -/* B4C400 80241990 AE220070 */ sw $v0, 0x70($s1) -.L80241994: -/* B4C404 80241994 8FBF0018 */ lw $ra, 0x18($sp) -/* B4C408 80241998 8FB10014 */ lw $s1, 0x14($sp) -/* B4C40C 8024199C 8FB00010 */ lw $s0, 0x10($sp) -/* B4C410 802419A0 03E00008 */ jr $ra -/* B4C414 802419A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938_B4C3A8.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938_B4C3A8.s new file mode 100644 index 0000000000..0bad0bbdfe --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241938_B4C3A8.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241938_B4C3A8 +/* B4C3A8 80241938 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B4C3AC 8024193C AFB10014 */ sw $s1, 0x14($sp) +/* B4C3B0 80241940 0080882D */ daddu $s1, $a0, $zero +/* B4C3B4 80241944 AFBF0018 */ sw $ra, 0x18($sp) +/* B4C3B8 80241948 AFB00010 */ sw $s0, 0x10($sp) +/* B4C3BC 8024194C 8E300148 */ lw $s0, 0x148($s1) +/* B4C3C0 80241950 0C00EABB */ jal get_npc_unsafe +/* B4C3C4 80241954 86040008 */ lh $a0, 8($s0) +/* B4C3C8 80241958 0040202D */ daddu $a0, $v0, $zero +/* B4C3CC 8024195C 9482008E */ lhu $v0, 0x8e($a0) +/* B4C3D0 80241960 2442FFFF */ addiu $v0, $v0, -1 +/* B4C3D4 80241964 A482008E */ sh $v0, 0x8e($a0) +/* B4C3D8 80241968 00021400 */ sll $v0, $v0, 0x10 +/* B4C3DC 8024196C 1C400009 */ bgtz $v0, .L80241994 +/* B4C3E0 80241970 24020003 */ addiu $v0, $zero, 3 +/* B4C3E4 80241974 96030076 */ lhu $v1, 0x76($s0) +/* B4C3E8 80241978 AE02006C */ sw $v0, 0x6c($s0) +/* B4C3EC 8024197C A483008E */ sh $v1, 0x8e($a0) +/* B4C3F0 80241980 8E0200CC */ lw $v0, 0xcc($s0) +/* B4C3F4 80241984 8C420024 */ lw $v0, 0x24($v0) +/* B4C3F8 80241988 AC820028 */ sw $v0, 0x28($a0) +/* B4C3FC 8024198C 24020020 */ addiu $v0, $zero, 0x20 +/* B4C400 80241990 AE220070 */ sw $v0, 0x70($s1) +.L80241994: +/* B4C404 80241994 8FBF0018 */ lw $ra, 0x18($sp) +/* B4C408 80241998 8FB10014 */ lw $s1, 0x14($sp) +/* B4C40C 8024199C 8FB00010 */ lw $s0, 0x10($sp) +/* B4C410 802419A0 03E00008 */ jr $ra +/* B4C414 802419A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8.s deleted file mode 100644 index a13781f34d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419A8 -/* B4C418 802419A8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B4C41C 802419AC AFB10034 */ sw $s1, 0x34($sp) -/* B4C420 802419B0 0080882D */ daddu $s1, $a0, $zero -/* B4C424 802419B4 AFBF0038 */ sw $ra, 0x38($sp) -/* B4C428 802419B8 AFB00030 */ sw $s0, 0x30($sp) -/* B4C42C 802419BC 8E300148 */ lw $s0, 0x148($s1) -/* B4C430 802419C0 0C00EABB */ jal get_npc_unsafe -/* B4C434 802419C4 86040008 */ lh $a0, 8($s0) -/* B4C438 802419C8 0040282D */ daddu $a1, $v0, $zero -/* B4C43C 802419CC 94A2008E */ lhu $v0, 0x8e($a1) -/* B4C440 802419D0 2442FFFF */ addiu $v0, $v0, -1 -/* B4C444 802419D4 A4A2008E */ sh $v0, 0x8e($a1) -/* B4C448 802419D8 00021400 */ sll $v0, $v0, 0x10 -/* B4C44C 802419DC 1C400023 */ bgtz $v0, .L80241A6C -/* B4C450 802419E0 24020004 */ addiu $v0, $zero, 4 -/* B4C454 802419E4 8E0300CC */ lw $v1, 0xcc($s0) -/* B4C458 802419E8 AE02006C */ sw $v0, 0x6c($s0) -/* B4C45C 802419EC 8C620000 */ lw $v0, ($v1) -/* B4C460 802419F0 ACA20028 */ sw $v0, 0x28($a1) -/* B4C464 802419F4 9602007A */ lhu $v0, 0x7a($s0) -/* B4C468 802419F8 A4A2008E */ sh $v0, 0x8e($a1) -/* B4C46C 802419FC 8E020078 */ lw $v0, 0x78($s0) -/* B4C470 80241A00 28420008 */ slti $v0, $v0, 8 -/* B4C474 80241A04 14400018 */ bnez $v0, .L80241A68 -/* B4C478 80241A08 24020021 */ addiu $v0, $zero, 0x21 -/* B4C47C 80241A0C 24040003 */ addiu $a0, $zero, 3 -/* B4C480 80241A10 27A30028 */ addiu $v1, $sp, 0x28 -/* B4C484 80241A14 84A700A8 */ lh $a3, 0xa8($a1) -/* B4C488 80241A18 3C013F80 */ lui $at, 0x3f80 -/* B4C48C 80241A1C 44810000 */ mtc1 $at, $f0 -/* B4C490 80241A20 3C014000 */ lui $at, 0x4000 -/* B4C494 80241A24 44811000 */ mtc1 $at, $f2 -/* B4C498 80241A28 3C01C1A0 */ lui $at, 0xc1a0 -/* B4C49C 80241A2C 44812000 */ mtc1 $at, $f4 -/* B4C4A0 80241A30 44873000 */ mtc1 $a3, $f6 -/* B4C4A4 80241A34 00000000 */ nop -/* B4C4A8 80241A38 468031A0 */ cvt.s.w $f6, $f6 -/* B4C4AC 80241A3C E7A00010 */ swc1 $f0, 0x10($sp) -/* B4C4B0 80241A40 E7A20014 */ swc1 $f2, 0x14($sp) -/* B4C4B4 80241A44 E7A40018 */ swc1 $f4, 0x18($sp) -/* B4C4B8 80241A48 8E020078 */ lw $v0, 0x78($s0) -/* B4C4BC 80241A4C 44073000 */ mfc1 $a3, $f6 -/* B4C4C0 80241A50 0000302D */ daddu $a2, $zero, $zero -/* B4C4C4 80241A54 AFA30020 */ sw $v1, 0x20($sp) -/* B4C4C8 80241A58 2442FFFF */ addiu $v0, $v0, -1 -/* B4C4CC 80241A5C 0C01BFA4 */ jal fx_emote -/* B4C4D0 80241A60 AFA2001C */ sw $v0, 0x1c($sp) -/* B4C4D4 80241A64 24020021 */ addiu $v0, $zero, 0x21 -.L80241A68: -/* B4C4D8 80241A68 AE220070 */ sw $v0, 0x70($s1) -.L80241A6C: -/* B4C4DC 80241A6C 8FBF0038 */ lw $ra, 0x38($sp) -/* B4C4E0 80241A70 8FB10034 */ lw $s1, 0x34($sp) -/* B4C4E4 80241A74 8FB00030 */ lw $s0, 0x30($sp) -/* B4C4E8 80241A78 03E00008 */ jr $ra -/* B4C4EC 80241A7C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s new file mode 100644 index 0000000000..5a99769aa1 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802419A8_B4C418.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419A8_B4C418 +/* B4C418 802419A8 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* B4C41C 802419AC AFB10034 */ sw $s1, 0x34($sp) +/* B4C420 802419B0 0080882D */ daddu $s1, $a0, $zero +/* B4C424 802419B4 AFBF0038 */ sw $ra, 0x38($sp) +/* B4C428 802419B8 AFB00030 */ sw $s0, 0x30($sp) +/* B4C42C 802419BC 8E300148 */ lw $s0, 0x148($s1) +/* B4C430 802419C0 0C00EABB */ jal get_npc_unsafe +/* B4C434 802419C4 86040008 */ lh $a0, 8($s0) +/* B4C438 802419C8 0040282D */ daddu $a1, $v0, $zero +/* B4C43C 802419CC 94A2008E */ lhu $v0, 0x8e($a1) +/* B4C440 802419D0 2442FFFF */ addiu $v0, $v0, -1 +/* B4C444 802419D4 A4A2008E */ sh $v0, 0x8e($a1) +/* B4C448 802419D8 00021400 */ sll $v0, $v0, 0x10 +/* B4C44C 802419DC 1C400023 */ bgtz $v0, .L80241A6C +/* B4C450 802419E0 24020004 */ addiu $v0, $zero, 4 +/* B4C454 802419E4 8E0300CC */ lw $v1, 0xcc($s0) +/* B4C458 802419E8 AE02006C */ sw $v0, 0x6c($s0) +/* B4C45C 802419EC 8C620000 */ lw $v0, ($v1) +/* B4C460 802419F0 ACA20028 */ sw $v0, 0x28($a1) +/* B4C464 802419F4 9602007A */ lhu $v0, 0x7a($s0) +/* B4C468 802419F8 A4A2008E */ sh $v0, 0x8e($a1) +/* B4C46C 802419FC 8E020078 */ lw $v0, 0x78($s0) +/* B4C470 80241A00 28420008 */ slti $v0, $v0, 8 +/* B4C474 80241A04 14400018 */ bnez $v0, .L80241A68 +/* B4C478 80241A08 24020021 */ addiu $v0, $zero, 0x21 +/* B4C47C 80241A0C 24040003 */ addiu $a0, $zero, 3 +/* B4C480 80241A10 27A30028 */ addiu $v1, $sp, 0x28 +/* B4C484 80241A14 84A700A8 */ lh $a3, 0xa8($a1) +/* B4C488 80241A18 3C013F80 */ lui $at, 0x3f80 +/* B4C48C 80241A1C 44810000 */ mtc1 $at, $f0 +/* B4C490 80241A20 3C014000 */ lui $at, 0x4000 +/* B4C494 80241A24 44811000 */ mtc1 $at, $f2 +/* B4C498 80241A28 3C01C1A0 */ lui $at, 0xc1a0 +/* B4C49C 80241A2C 44812000 */ mtc1 $at, $f4 +/* B4C4A0 80241A30 44873000 */ mtc1 $a3, $f6 +/* B4C4A4 80241A34 00000000 */ nop +/* B4C4A8 80241A38 468031A0 */ cvt.s.w $f6, $f6 +/* B4C4AC 80241A3C E7A00010 */ swc1 $f0, 0x10($sp) +/* B4C4B0 80241A40 E7A20014 */ swc1 $f2, 0x14($sp) +/* B4C4B4 80241A44 E7A40018 */ swc1 $f4, 0x18($sp) +/* B4C4B8 80241A48 8E020078 */ lw $v0, 0x78($s0) +/* B4C4BC 80241A4C 44073000 */ mfc1 $a3, $f6 +/* B4C4C0 80241A50 0000302D */ daddu $a2, $zero, $zero +/* B4C4C4 80241A54 AFA30020 */ sw $v1, 0x20($sp) +/* B4C4C8 80241A58 2442FFFF */ addiu $v0, $v0, -1 +/* B4C4CC 80241A5C 0C01BFA4 */ jal fx_emote +/* B4C4D0 80241A60 AFA2001C */ sw $v0, 0x1c($sp) +/* B4C4D4 80241A64 24020021 */ addiu $v0, $zero, 0x21 +.L80241A68: +/* B4C4D8 80241A68 AE220070 */ sw $v0, 0x70($s1) +.L80241A6C: +/* B4C4DC 80241A6C 8FBF0038 */ lw $ra, 0x38($sp) +/* B4C4E0 80241A70 8FB10034 */ lw $s1, 0x34($sp) +/* B4C4E4 80241A74 8FB00030 */ lw $s0, 0x30($sp) +/* B4C4E8 80241A78 03E00008 */ jr $ra +/* B4C4EC 80241A7C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80.s deleted file mode 100644 index a9585d131d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A80 -/* B4C4F0 80241A80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B4C4F4 80241A84 AFB10014 */ sw $s1, 0x14($sp) -/* B4C4F8 80241A88 0080882D */ daddu $s1, $a0, $zero -/* B4C4FC 80241A8C AFBF0018 */ sw $ra, 0x18($sp) -/* B4C500 80241A90 AFB00010 */ sw $s0, 0x10($sp) -/* B4C504 80241A94 8E300148 */ lw $s0, 0x148($s1) -/* B4C508 80241A98 0C00EABB */ jal get_npc_unsafe -/* B4C50C 80241A9C 86040008 */ lh $a0, 8($s0) -/* B4C510 80241AA0 9443008E */ lhu $v1, 0x8e($v0) -/* B4C514 80241AA4 2463FFFF */ addiu $v1, $v1, -1 -/* B4C518 80241AA8 A443008E */ sh $v1, 0x8e($v0) -/* B4C51C 80241AAC 00031C00 */ sll $v1, $v1, 0x10 -/* B4C520 80241AB0 1C600003 */ bgtz $v1, .L80241AC0 -/* B4C524 80241AB4 2402000C */ addiu $v0, $zero, 0xc -/* B4C528 80241AB8 AE00006C */ sw $zero, 0x6c($s0) -/* B4C52C 80241ABC AE220070 */ sw $v0, 0x70($s1) -.L80241AC0: -/* B4C530 80241AC0 8FBF0018 */ lw $ra, 0x18($sp) -/* B4C534 80241AC4 8FB10014 */ lw $s1, 0x14($sp) -/* B4C538 80241AC8 8FB00010 */ lw $s0, 0x10($sp) -/* B4C53C 80241ACC 03E00008 */ jr $ra -/* B4C540 80241AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s new file mode 100644 index 0000000000..8d02b52beb --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241A80_B4C4F0.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A80_B4C4F0 +/* B4C4F0 80241A80 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B4C4F4 80241A84 AFB10014 */ sw $s1, 0x14($sp) +/* B4C4F8 80241A88 0080882D */ daddu $s1, $a0, $zero +/* B4C4FC 80241A8C AFBF0018 */ sw $ra, 0x18($sp) +/* B4C500 80241A90 AFB00010 */ sw $s0, 0x10($sp) +/* B4C504 80241A94 8E300148 */ lw $s0, 0x148($s1) +/* B4C508 80241A98 0C00EABB */ jal get_npc_unsafe +/* B4C50C 80241A9C 86040008 */ lh $a0, 8($s0) +/* B4C510 80241AA0 9443008E */ lhu $v1, 0x8e($v0) +/* B4C514 80241AA4 2463FFFF */ addiu $v1, $v1, -1 +/* B4C518 80241AA8 A443008E */ sh $v1, 0x8e($v0) +/* B4C51C 80241AAC 00031C00 */ sll $v1, $v1, 0x10 +/* B4C520 80241AB0 1C600003 */ bgtz $v1, .L80241AC0 +/* B4C524 80241AB4 2402000C */ addiu $v0, $zero, 0xc +/* B4C528 80241AB8 AE00006C */ sw $zero, 0x6c($s0) +/* B4C52C 80241ABC AE220070 */ sw $v0, 0x70($s1) +.L80241AC0: +/* B4C530 80241AC0 8FBF0018 */ lw $ra, 0x18($sp) +/* B4C534 80241AC4 8FB10014 */ lw $s1, 0x14($sp) +/* B4C538 80241AC8 8FB00010 */ lw $s0, 0x10($sp) +/* B4C53C 80241ACC 03E00008 */ jr $ra +/* B4C540 80241AD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4.s deleted file mode 100644 index 56d7766d7a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AD4 -/* B4C544 80241AD4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B4C548 80241AD8 AFBF0024 */ sw $ra, 0x24($sp) -/* B4C54C 80241ADC AFB40020 */ sw $s4, 0x20($sp) -/* B4C550 80241AE0 AFB3001C */ sw $s3, 0x1c($sp) -/* B4C554 80241AE4 AFB20018 */ sw $s2, 0x18($sp) -/* B4C558 80241AE8 AFB10014 */ sw $s1, 0x14($sp) -/* B4C55C 80241AEC AFB00010 */ sw $s0, 0x10($sp) -/* B4C560 80241AF0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B4C564 80241AF4 8C900148 */ lw $s0, 0x148($a0) -/* B4C568 80241AF8 86040008 */ lh $a0, 8($s0) -/* B4C56C 80241AFC 0C00EABB */ jal get_npc_unsafe -/* B4C570 80241B00 24110001 */ addiu $s1, $zero, 1 -/* B4C574 80241B04 86040008 */ lh $a0, 8($s0) -/* B4C578 80241B08 0040802D */ daddu $s0, $v0, $zero -/* B4C57C 80241B0C 3C05800B */ lui $a1, %hi(gCameras) -/* B4C580 80241B10 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* B4C584 80241B14 3C03800A */ lui $v1, 0x800a -/* B4C588 80241B18 8463A634 */ lh $v1, -0x59cc($v1) -/* B4C58C 80241B1C 00912021 */ addu $a0, $a0, $s1 -/* B4C590 80241B20 00031080 */ sll $v0, $v1, 2 -/* B4C594 80241B24 00431021 */ addu $v0, $v0, $v1 -/* B4C598 80241B28 00021080 */ sll $v0, $v0, 2 -/* B4C59C 80241B2C 00431023 */ subu $v0, $v0, $v1 -/* B4C5A0 80241B30 000218C0 */ sll $v1, $v0, 3 -/* B4C5A4 80241B34 00431021 */ addu $v0, $v0, $v1 -/* B4C5A8 80241B38 000210C0 */ sll $v0, $v0, 3 -/* B4C5AC 80241B3C 0C00FB3A */ jal get_enemy -/* B4C5B0 80241B40 00459021 */ addu $s2, $v0, $a1 -/* B4C5B4 80241B44 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* B4C5B8 80241B48 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* B4C5BC 80241B4C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B4C5C0 80241B50 8E830000 */ lw $v1, ($s4) -/* B4C5C4 80241B54 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B4C5C8 80241B58 8C660028 */ lw $a2, 0x28($v1) -/* B4C5CC 80241B5C 8C670030 */ lw $a3, 0x30($v1) -/* B4C5D0 80241B60 0C00A7B5 */ jal dist2D -/* B4C5D4 80241B64 0040982D */ daddu $s3, $v0, $zero -/* B4C5D8 80241B68 C6620074 */ lwc1 $f2, 0x74($s3) -/* B4C5DC 80241B6C 468010A0 */ cvt.s.w $f2, $f2 -/* B4C5E0 80241B70 4600103C */ c.lt.s $f2, $f0 -/* B4C5E4 80241B74 00000000 */ nop -/* B4C5E8 80241B78 45030001 */ bc1tl .L80241B80 -/* B4C5EC 80241B7C 0000882D */ daddu $s1, $zero, $zero -.L80241B80: -/* B4C5F0 80241B80 C64C006C */ lwc1 $f12, 0x6c($s2) -/* B4C5F4 80241B84 C60E000C */ lwc1 $f14, 0xc($s0) -/* B4C5F8 80241B88 3C014387 */ lui $at, 0x4387 -/* B4C5FC 80241B8C 4481A000 */ mtc1 $at, $f20 -/* B4C600 80241B90 0C00A70A */ jal get_clamped_angle_diff -/* B4C604 80241B94 00000000 */ nop -/* B4C608 80241B98 0C00A6C9 */ jal clamp_angle -/* B4C60C 80241B9C 46000306 */ mov.s $f12, $f0 -/* B4C610 80241BA0 3C018024 */ lui $at, 0x8024 -/* B4C614 80241BA4 D4227A90 */ ldc1 $f2, 0x7a90($at) -/* B4C618 80241BA8 46000021 */ cvt.d.s $f0, $f0 -/* B4C61C 80241BAC 4622003C */ c.lt.d $f0, $f2 -/* B4C620 80241BB0 00000000 */ nop -/* B4C624 80241BB4 45000003 */ bc1f .L80241BC4 -/* B4C628 80241BB8 00000000 */ nop -/* B4C62C 80241BBC 3C0142B4 */ lui $at, 0x42b4 -/* B4C630 80241BC0 4481A000 */ mtc1 $at, $f20 -.L80241BC4: -/* B4C634 80241BC4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B4C638 80241BC8 8E820000 */ lw $v0, ($s4) -/* B4C63C 80241BCC C60E0040 */ lwc1 $f14, 0x40($s0) -/* B4C640 80241BD0 8C460028 */ lw $a2, 0x28($v0) -/* B4C644 80241BD4 0C00A720 */ jal atan2 -/* B4C648 80241BD8 8C470030 */ lw $a3, 0x30($v0) -/* B4C64C 80241BDC 4600A306 */ mov.s $f12, $f20 -/* B4C650 80241BE0 0C00A70A */ jal get_clamped_angle_diff -/* B4C654 80241BE4 46000386 */ mov.s $f14, $f0 -/* B4C658 80241BE8 C6620078 */ lwc1 $f2, 0x78($s3) -/* B4C65C 80241BEC 468010A0 */ cvt.s.w $f2, $f2 -/* B4C660 80241BF0 46000005 */ abs.s $f0, $f0 -/* B4C664 80241BF4 4600103C */ c.lt.s $f2, $f0 -/* B4C668 80241BF8 00000000 */ nop -/* B4C66C 80241BFC 45030001 */ bc1tl .L80241C04 -/* B4C670 80241C00 0000882D */ daddu $s1, $zero, $zero -.L80241C04: -/* B4C674 80241C04 8E820000 */ lw $v0, ($s4) -/* B4C678 80241C08 C600003C */ lwc1 $f0, 0x3c($s0) -/* B4C67C 80241C0C C442002C */ lwc1 $f2, 0x2c($v0) -/* B4C680 80241C10 860200A8 */ lh $v0, 0xa8($s0) -/* B4C684 80241C14 46020001 */ sub.s $f0, $f0, $f2 -/* B4C688 80241C18 44821000 */ mtc1 $v0, $f2 -/* B4C68C 80241C1C 00000000 */ nop -/* B4C690 80241C20 468010A1 */ cvt.d.w $f2, $f2 -/* B4C694 80241C24 46221080 */ add.d $f2, $f2, $f2 -/* B4C698 80241C28 46000005 */ abs.s $f0, $f0 -/* B4C69C 80241C2C 46000021 */ cvt.d.s $f0, $f0 -/* B4C6A0 80241C30 4620103E */ c.le.d $f2, $f0 -/* B4C6A4 80241C34 00000000 */ nop -/* B4C6A8 80241C38 45030001 */ bc1tl .L80241C40 -/* B4C6AC 80241C3C 0000882D */ daddu $s1, $zero, $zero -.L80241C40: -/* B4C6B0 80241C40 3C038011 */ lui $v1, 0x8011 -/* B4C6B4 80241C44 8063EBB3 */ lb $v1, -0x144d($v1) -/* B4C6B8 80241C48 24020009 */ addiu $v0, $zero, 9 -/* B4C6BC 80241C4C 50620001 */ beql $v1, $v0, .L80241C54 -/* B4C6C0 80241C50 0000882D */ daddu $s1, $zero, $zero -.L80241C54: -/* B4C6C4 80241C54 24020007 */ addiu $v0, $zero, 7 -/* B4C6C8 80241C58 50620001 */ beql $v1, $v0, .L80241C60 -/* B4C6CC 80241C5C 0000882D */ daddu $s1, $zero, $zero -.L80241C60: -/* B4C6D0 80241C60 0220102D */ daddu $v0, $s1, $zero -/* B4C6D4 80241C64 8FBF0024 */ lw $ra, 0x24($sp) -/* B4C6D8 80241C68 8FB40020 */ lw $s4, 0x20($sp) -/* B4C6DC 80241C6C 8FB3001C */ lw $s3, 0x1c($sp) -/* B4C6E0 80241C70 8FB20018 */ lw $s2, 0x18($sp) -/* B4C6E4 80241C74 8FB10014 */ lw $s1, 0x14($sp) -/* B4C6E8 80241C78 8FB00010 */ lw $s0, 0x10($sp) -/* B4C6EC 80241C7C D7B40028 */ ldc1 $f20, 0x28($sp) -/* B4C6F0 80241C80 03E00008 */ jr $ra -/* B4C6F4 80241C84 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s new file mode 100644 index 0000000000..2a2da850ab --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241AD4_B4C544.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AD4_B4C544 +/* B4C544 80241AD4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B4C548 80241AD8 AFBF0024 */ sw $ra, 0x24($sp) +/* B4C54C 80241ADC AFB40020 */ sw $s4, 0x20($sp) +/* B4C550 80241AE0 AFB3001C */ sw $s3, 0x1c($sp) +/* B4C554 80241AE4 AFB20018 */ sw $s2, 0x18($sp) +/* B4C558 80241AE8 AFB10014 */ sw $s1, 0x14($sp) +/* B4C55C 80241AEC AFB00010 */ sw $s0, 0x10($sp) +/* B4C560 80241AF0 F7B40028 */ sdc1 $f20, 0x28($sp) +/* B4C564 80241AF4 8C900148 */ lw $s0, 0x148($a0) +/* B4C568 80241AF8 86040008 */ lh $a0, 8($s0) +/* B4C56C 80241AFC 0C00EABB */ jal get_npc_unsafe +/* B4C570 80241B00 24110001 */ addiu $s1, $zero, 1 +/* B4C574 80241B04 86040008 */ lh $a0, 8($s0) +/* B4C578 80241B08 0040802D */ daddu $s0, $v0, $zero +/* B4C57C 80241B0C 3C05800B */ lui $a1, %hi(gCameras) +/* B4C580 80241B10 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* B4C584 80241B14 3C03800A */ lui $v1, 0x800a +/* B4C588 80241B18 8463A634 */ lh $v1, -0x59cc($v1) +/* B4C58C 80241B1C 00912021 */ addu $a0, $a0, $s1 +/* B4C590 80241B20 00031080 */ sll $v0, $v1, 2 +/* B4C594 80241B24 00431021 */ addu $v0, $v0, $v1 +/* B4C598 80241B28 00021080 */ sll $v0, $v0, 2 +/* B4C59C 80241B2C 00431023 */ subu $v0, $v0, $v1 +/* B4C5A0 80241B30 000218C0 */ sll $v1, $v0, 3 +/* B4C5A4 80241B34 00431021 */ addu $v0, $v0, $v1 +/* B4C5A8 80241B38 000210C0 */ sll $v0, $v0, 3 +/* B4C5AC 80241B3C 0C00FB3A */ jal get_enemy +/* B4C5B0 80241B40 00459021 */ addu $s2, $v0, $a1 +/* B4C5B4 80241B44 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) +/* B4C5B8 80241B48 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) +/* B4C5BC 80241B4C C60C0038 */ lwc1 $f12, 0x38($s0) +/* B4C5C0 80241B50 8E830000 */ lw $v1, ($s4) +/* B4C5C4 80241B54 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B4C5C8 80241B58 8C660028 */ lw $a2, 0x28($v1) +/* B4C5CC 80241B5C 8C670030 */ lw $a3, 0x30($v1) +/* B4C5D0 80241B60 0C00A7B5 */ jal dist2D +/* B4C5D4 80241B64 0040982D */ daddu $s3, $v0, $zero +/* B4C5D8 80241B68 C6620074 */ lwc1 $f2, 0x74($s3) +/* B4C5DC 80241B6C 468010A0 */ cvt.s.w $f2, $f2 +/* B4C5E0 80241B70 4600103C */ c.lt.s $f2, $f0 +/* B4C5E4 80241B74 00000000 */ nop +/* B4C5E8 80241B78 45030001 */ bc1tl .L80241B80 +/* B4C5EC 80241B7C 0000882D */ daddu $s1, $zero, $zero +.L80241B80: +/* B4C5F0 80241B80 C64C006C */ lwc1 $f12, 0x6c($s2) +/* B4C5F4 80241B84 C60E000C */ lwc1 $f14, 0xc($s0) +/* B4C5F8 80241B88 3C014387 */ lui $at, 0x4387 +/* B4C5FC 80241B8C 4481A000 */ mtc1 $at, $f20 +/* B4C600 80241B90 0C00A70A */ jal get_clamped_angle_diff +/* B4C604 80241B94 00000000 */ nop +/* B4C608 80241B98 0C00A6C9 */ jal clamp_angle +/* B4C60C 80241B9C 46000306 */ mov.s $f12, $f0 +/* B4C610 80241BA0 3C018024 */ lui $at, 0x8024 +/* B4C614 80241BA4 D4227A90 */ ldc1 $f2, 0x7a90($at) +/* B4C618 80241BA8 46000021 */ cvt.d.s $f0, $f0 +/* B4C61C 80241BAC 4622003C */ c.lt.d $f0, $f2 +/* B4C620 80241BB0 00000000 */ nop +/* B4C624 80241BB4 45000003 */ bc1f .L80241BC4 +/* B4C628 80241BB8 00000000 */ nop +/* B4C62C 80241BBC 3C0142B4 */ lui $at, 0x42b4 +/* B4C630 80241BC0 4481A000 */ mtc1 $at, $f20 +.L80241BC4: +/* B4C634 80241BC4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B4C638 80241BC8 8E820000 */ lw $v0, ($s4) +/* B4C63C 80241BCC C60E0040 */ lwc1 $f14, 0x40($s0) +/* B4C640 80241BD0 8C460028 */ lw $a2, 0x28($v0) +/* B4C644 80241BD4 0C00A720 */ jal atan2 +/* B4C648 80241BD8 8C470030 */ lw $a3, 0x30($v0) +/* B4C64C 80241BDC 4600A306 */ mov.s $f12, $f20 +/* B4C650 80241BE0 0C00A70A */ jal get_clamped_angle_diff +/* B4C654 80241BE4 46000386 */ mov.s $f14, $f0 +/* B4C658 80241BE8 C6620078 */ lwc1 $f2, 0x78($s3) +/* B4C65C 80241BEC 468010A0 */ cvt.s.w $f2, $f2 +/* B4C660 80241BF0 46000005 */ abs.s $f0, $f0 +/* B4C664 80241BF4 4600103C */ c.lt.s $f2, $f0 +/* B4C668 80241BF8 00000000 */ nop +/* B4C66C 80241BFC 45030001 */ bc1tl .L80241C04 +/* B4C670 80241C00 0000882D */ daddu $s1, $zero, $zero +.L80241C04: +/* B4C674 80241C04 8E820000 */ lw $v0, ($s4) +/* B4C678 80241C08 C600003C */ lwc1 $f0, 0x3c($s0) +/* B4C67C 80241C0C C442002C */ lwc1 $f2, 0x2c($v0) +/* B4C680 80241C10 860200A8 */ lh $v0, 0xa8($s0) +/* B4C684 80241C14 46020001 */ sub.s $f0, $f0, $f2 +/* B4C688 80241C18 44821000 */ mtc1 $v0, $f2 +/* B4C68C 80241C1C 00000000 */ nop +/* B4C690 80241C20 468010A1 */ cvt.d.w $f2, $f2 +/* B4C694 80241C24 46221080 */ add.d $f2, $f2, $f2 +/* B4C698 80241C28 46000005 */ abs.s $f0, $f0 +/* B4C69C 80241C2C 46000021 */ cvt.d.s $f0, $f0 +/* B4C6A0 80241C30 4620103E */ c.le.d $f2, $f0 +/* B4C6A4 80241C34 00000000 */ nop +/* B4C6A8 80241C38 45030001 */ bc1tl .L80241C40 +/* B4C6AC 80241C3C 0000882D */ daddu $s1, $zero, $zero +.L80241C40: +/* B4C6B0 80241C40 3C038011 */ lui $v1, 0x8011 +/* B4C6B4 80241C44 8063EBB3 */ lb $v1, -0x144d($v1) +/* B4C6B8 80241C48 24020009 */ addiu $v0, $zero, 9 +/* B4C6BC 80241C4C 50620001 */ beql $v1, $v0, .L80241C54 +/* B4C6C0 80241C50 0000882D */ daddu $s1, $zero, $zero +.L80241C54: +/* B4C6C4 80241C54 24020007 */ addiu $v0, $zero, 7 +/* B4C6C8 80241C58 50620001 */ beql $v1, $v0, .L80241C60 +/* B4C6CC 80241C5C 0000882D */ daddu $s1, $zero, $zero +.L80241C60: +/* B4C6D0 80241C60 0220102D */ daddu $v0, $s1, $zero +/* B4C6D4 80241C64 8FBF0024 */ lw $ra, 0x24($sp) +/* B4C6D8 80241C68 8FB40020 */ lw $s4, 0x20($sp) +/* B4C6DC 80241C6C 8FB3001C */ lw $s3, 0x1c($sp) +/* B4C6E0 80241C70 8FB20018 */ lw $s2, 0x18($sp) +/* B4C6E4 80241C74 8FB10014 */ lw $s1, 0x14($sp) +/* B4C6E8 80241C78 8FB00010 */ lw $s0, 0x10($sp) +/* B4C6EC 80241C7C D7B40028 */ ldc1 $f20, 0x28($sp) +/* B4C6F0 80241C80 03E00008 */ jr $ra +/* B4C6F4 80241C84 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8.s deleted file mode 100644 index 8e3d46ea97..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EE8 -/* B4C958 80241EE8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B4C95C 80241EEC AFB20038 */ sw $s2, 0x38($sp) -/* B4C960 80241EF0 0080902D */ daddu $s2, $a0, $zero -/* B4C964 80241EF4 AFBF0048 */ sw $ra, 0x48($sp) -/* B4C968 80241EF8 AFB50044 */ sw $s5, 0x44($sp) -/* B4C96C 80241EFC AFB40040 */ sw $s4, 0x40($sp) -/* B4C970 80241F00 AFB3003C */ sw $s3, 0x3c($sp) -/* B4C974 80241F04 AFB10034 */ sw $s1, 0x34($sp) -/* B4C978 80241F08 AFB00030 */ sw $s0, 0x30($sp) -/* B4C97C 80241F0C 8E510148 */ lw $s1, 0x148($s2) -/* B4C980 80241F10 86240008 */ lh $a0, 8($s1) -/* B4C984 80241F14 0C00EABB */ jal get_npc_unsafe -/* B4C988 80241F18 00A0802D */ daddu $s0, $a1, $zero -/* B4C98C 80241F1C 8E43000C */ lw $v1, 0xc($s2) -/* B4C990 80241F20 0240202D */ daddu $a0, $s2, $zero -/* B4C994 80241F24 8C650000 */ lw $a1, ($v1) -/* B4C998 80241F28 0C0B1EAF */ jal get_variable -/* B4C99C 80241F2C 0040A82D */ daddu $s5, $v0, $zero -/* B4C9A0 80241F30 AFA00010 */ sw $zero, 0x10($sp) -/* B4C9A4 80241F34 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4C9A8 80241F38 8C630030 */ lw $v1, 0x30($v1) -/* B4C9AC 80241F3C AFA30014 */ sw $v1, 0x14($sp) -/* B4C9B0 80241F40 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4C9B4 80241F44 8C63001C */ lw $v1, 0x1c($v1) -/* B4C9B8 80241F48 AFA30018 */ sw $v1, 0x18($sp) -/* B4C9BC 80241F4C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4C9C0 80241F50 8C630024 */ lw $v1, 0x24($v1) -/* B4C9C4 80241F54 AFA3001C */ sw $v1, 0x1c($sp) -/* B4C9C8 80241F58 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4C9CC 80241F5C 8C630028 */ lw $v1, 0x28($v1) -/* B4C9D0 80241F60 27B40010 */ addiu $s4, $sp, 0x10 -/* B4C9D4 80241F64 AFA30020 */ sw $v1, 0x20($sp) -/* B4C9D8 80241F68 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4C9DC 80241F6C 3C014282 */ lui $at, 0x4282 -/* B4C9E0 80241F70 44810000 */ mtc1 $at, $f0 -/* B4C9E4 80241F74 8C63002C */ lw $v1, 0x2c($v1) -/* B4C9E8 80241F78 0040982D */ daddu $s3, $v0, $zero -/* B4C9EC 80241F7C E7A00028 */ swc1 $f0, 0x28($sp) -/* B4C9F0 80241F80 A7A0002C */ sh $zero, 0x2c($sp) -/* B4C9F4 80241F84 16000005 */ bnez $s0, .L80241F9C -/* B4C9F8 80241F88 AFA30024 */ sw $v1, 0x24($sp) -/* B4C9FC 80241F8C 8E2200B0 */ lw $v0, 0xb0($s1) -/* B4CA00 80241F90 30420004 */ andi $v0, $v0, 4 -/* B4CA04 80241F94 10400020 */ beqz $v0, .L80242018 -/* B4CA08 80241F98 00000000 */ nop -.L80241F9C: -/* B4CA0C 80241F9C 2404F7FF */ addiu $a0, $zero, -0x801 -/* B4CA10 80241FA0 AE400070 */ sw $zero, 0x70($s2) -/* B4CA14 80241FA4 A6A0008E */ sh $zero, 0x8e($s5) -/* B4CA18 80241FA8 8E2200CC */ lw $v0, 0xcc($s1) -/* B4CA1C 80241FAC 8EA30000 */ lw $v1, ($s5) -/* B4CA20 80241FB0 8C420000 */ lw $v0, ($v0) -/* B4CA24 80241FB4 00641824 */ and $v1, $v1, $a0 -/* B4CA28 80241FB8 AEA30000 */ sw $v1, ($s5) -/* B4CA2C 80241FBC AEA20028 */ sw $v0, 0x28($s5) -/* B4CA30 80241FC0 8E2200D0 */ lw $v0, 0xd0($s1) -/* B4CA34 80241FC4 8C420034 */ lw $v0, 0x34($v0) -/* B4CA38 80241FC8 54400005 */ bnel $v0, $zero, .L80241FE0 -/* B4CA3C 80241FCC 2402FDFF */ addiu $v0, $zero, -0x201 -/* B4CA40 80241FD0 34620200 */ ori $v0, $v1, 0x200 -/* B4CA44 80241FD4 2403FFF7 */ addiu $v1, $zero, -9 -/* B4CA48 80241FD8 080907FA */ j .L80241FE8 -/* B4CA4C 80241FDC 00431024 */ and $v0, $v0, $v1 -.L80241FE0: -/* B4CA50 80241FE0 00621024 */ and $v0, $v1, $v0 -/* B4CA54 80241FE4 34420008 */ ori $v0, $v0, 8 -.L80241FE8: -/* B4CA58 80241FE8 AEA20000 */ sw $v0, ($s5) -/* B4CA5C 80241FEC 8E2200B0 */ lw $v0, 0xb0($s1) -/* B4CA60 80241FF0 30420004 */ andi $v0, $v0, 4 -/* B4CA64 80241FF4 10400007 */ beqz $v0, .L80242014 -/* B4CA68 80241FF8 24020063 */ addiu $v0, $zero, 0x63 -/* B4CA6C 80241FFC AE420070 */ sw $v0, 0x70($s2) -/* B4CA70 80242000 AE400074 */ sw $zero, 0x74($s2) -/* B4CA74 80242004 8E2200B0 */ lw $v0, 0xb0($s1) -/* B4CA78 80242008 2403FFFB */ addiu $v1, $zero, -5 -/* B4CA7C 8024200C 00431024 */ and $v0, $v0, $v1 -/* B4CA80 80242010 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242014: -/* B4CA84 80242014 AE20006C */ sw $zero, 0x6c($s1) -.L80242018: -/* B4CA88 80242018 8E420070 */ lw $v0, 0x70($s2) -/* B4CA8C 8024201C 2842001E */ slti $v0, $v0, 0x1e -/* B4CA90 80242020 10400009 */ beqz $v0, .L80242048 -/* B4CA94 80242024 00000000 */ nop -/* B4CA98 80242028 8E22006C */ lw $v0, 0x6c($s1) -/* B4CA9C 8024202C 14400006 */ bnez $v0, .L80242048 -/* B4CAA0 80242030 00000000 */ nop -/* B4CAA4 80242034 0C0906B5 */ jal func_80241AD4 -/* B4CAA8 80242038 0240202D */ daddu $a0, $s2, $zero -/* B4CAAC 8024203C 10400002 */ beqz $v0, .L80242048 -/* B4CAB0 80242040 2402001E */ addiu $v0, $zero, 0x1e -/* B4CAB4 80242044 AE420070 */ sw $v0, 0x70($s2) -.L80242048: -/* B4CAB8 80242048 8E430070 */ lw $v1, 0x70($s2) -/* B4CABC 8024204C 2C620064 */ sltiu $v0, $v1, 0x64 -/* B4CAC0 80242050 10400048 */ beqz $v0, .L80242174 -/* B4CAC4 80242054 00031080 */ sll $v0, $v1, 2 -/* B4CAC8 80242058 3C018024 */ lui $at, 0x8024 -/* B4CACC 8024205C 00220821 */ addu $at, $at, $v0 -/* B4CAD0 80242060 8C227A98 */ lw $v0, 0x7a98($at) -/* B4CAD4 80242064 00400008 */ jr $v0 -/* B4CAD8 80242068 00000000 */ nop -/* B4CADC 8024206C 0240202D */ daddu $a0, $s2, $zero -/* B4CAE0 80242070 0260282D */ daddu $a1, $s3, $zero -/* B4CAE4 80242074 0C012568 */ jal func_800495A0 -/* B4CAE8 80242078 0280302D */ daddu $a2, $s4, $zero -/* B4CAEC 8024207C 0240202D */ daddu $a0, $s2, $zero -/* B4CAF0 80242080 0260282D */ daddu $a1, $s3, $zero -/* B4CAF4 80242084 0C0125AE */ jal func_800496B8 -/* B4CAF8 80242088 0280302D */ daddu $a2, $s4, $zero -/* B4CAFC 8024208C 0809085D */ j .L80242174 -/* B4CB00 80242090 00000000 */ nop -/* B4CB04 80242094 0240202D */ daddu $a0, $s2, $zero -/* B4CB08 80242098 0260282D */ daddu $a1, $s3, $zero -/* B4CB0C 8024209C 0C0126D1 */ jal func_80049B44 -/* B4CB10 802420A0 0280302D */ daddu $a2, $s4, $zero -/* B4CB14 802420A4 0240202D */ daddu $a0, $s2, $zero -/* B4CB18 802420A8 0260282D */ daddu $a1, $s3, $zero -/* B4CB1C 802420AC 0C012701 */ jal func_80049C04 -/* B4CB20 802420B0 0280302D */ daddu $a2, $s4, $zero -/* B4CB24 802420B4 0809085D */ j .L80242174 -/* B4CB28 802420B8 00000000 */ nop -/* B4CB2C 802420BC 0240202D */ daddu $a0, $s2, $zero -/* B4CB30 802420C0 0260282D */ daddu $a1, $s3, $zero -/* B4CB34 802420C4 0C01278F */ jal func_80049E3C -/* B4CB38 802420C8 0280302D */ daddu $a2, $s4, $zero -/* B4CB3C 802420CC 0240202D */ daddu $a0, $s2, $zero -/* B4CB40 802420D0 0260282D */ daddu $a1, $s3, $zero -/* B4CB44 802420D4 0C0127B3 */ jal func_80049ECC -/* B4CB48 802420D8 0280302D */ daddu $a2, $s4, $zero -/* B4CB4C 802420DC 0809085D */ j .L80242174 -/* B4CB50 802420E0 00000000 */ nop -/* B4CB54 802420E4 0240202D */ daddu $a0, $s2, $zero -/* B4CB58 802420E8 0260282D */ daddu $a1, $s3, $zero -/* B4CB5C 802420EC 0C0127DF */ jal func_80049F7C -/* B4CB60 802420F0 0280302D */ daddu $a2, $s4, $zero -/* B4CB64 802420F4 0240202D */ daddu $a0, $s2, $zero -/* B4CB68 802420F8 0260282D */ daddu $a1, $s3, $zero -/* B4CB6C 802420FC 0C012849 */ jal func_8004A124 -/* B4CB70 80242100 0280302D */ daddu $a2, $s4, $zero -/* B4CB74 80242104 0809085D */ j .L80242174 -/* B4CB78 80242108 00000000 */ nop -/* B4CB7C 8024210C 0240202D */ daddu $a0, $s2, $zero -/* B4CB80 80242110 0260282D */ daddu $a1, $s3, $zero -/* B4CB84 80242114 0C0128FA */ jal func_8004A3E8 -/* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero -/* B4CB8C 8024211C 0809085D */ j .L80242174 -/* B4CB90 80242120 00000000 */ nop -/* B4CB94 80242124 0C090633 */ jal func_802418CC -/* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero -/* B4CB9C 8024212C 0C09064E */ jal func_80241938 -/* B4CBA0 80242130 0240202D */ daddu $a0, $s2, $zero -/* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) -/* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 -/* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 -/* B4CBB0 80242140 00000000 */ nop -/* B4CBB4 80242144 0C09066A */ jal func_802419A8 -/* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero -/* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) -/* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 -/* B4CBC4 80242154 14620007 */ bne $v1, $v0, .L80242174 -/* B4CBC8 80242158 00000000 */ nop -/* B4CBCC 8024215C 0C0906A0 */ jal func_80241A80 -/* B4CBD0 80242160 0240202D */ daddu $a0, $s2, $zero -/* B4CBD4 80242164 0809085D */ j .L80242174 -/* B4CBD8 80242168 00000000 */ nop -/* B4CBDC 8024216C 0C0129CF */ jal func_8004A73C -/* B4CBE0 80242170 0240202D */ daddu $a0, $s2, $zero -.L80242174: -/* B4CBE4 80242174 8FBF0048 */ lw $ra, 0x48($sp) -/* B4CBE8 80242178 8FB50044 */ lw $s5, 0x44($sp) -/* B4CBEC 8024217C 8FB40040 */ lw $s4, 0x40($sp) -/* B4CBF0 80242180 8FB3003C */ lw $s3, 0x3c($sp) -/* B4CBF4 80242184 8FB20038 */ lw $s2, 0x38($sp) -/* B4CBF8 80242188 8FB10034 */ lw $s1, 0x34($sp) -/* B4CBFC 8024218C 8FB00030 */ lw $s0, 0x30($sp) -/* B4CC00 80242190 0000102D */ daddu $v0, $zero, $zero -/* B4CC04 80242194 03E00008 */ jr $ra -/* B4CC08 80242198 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s new file mode 100644 index 0000000000..bf4a112d03 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80241EE8_B4C958.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241EE8_B4C958 +/* B4C958 80241EE8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* B4C95C 80241EEC AFB20038 */ sw $s2, 0x38($sp) +/* B4C960 80241EF0 0080902D */ daddu $s2, $a0, $zero +/* B4C964 80241EF4 AFBF0048 */ sw $ra, 0x48($sp) +/* B4C968 80241EF8 AFB50044 */ sw $s5, 0x44($sp) +/* B4C96C 80241EFC AFB40040 */ sw $s4, 0x40($sp) +/* B4C970 80241F00 AFB3003C */ sw $s3, 0x3c($sp) +/* B4C974 80241F04 AFB10034 */ sw $s1, 0x34($sp) +/* B4C978 80241F08 AFB00030 */ sw $s0, 0x30($sp) +/* B4C97C 80241F0C 8E510148 */ lw $s1, 0x148($s2) +/* B4C980 80241F10 86240008 */ lh $a0, 8($s1) +/* B4C984 80241F14 0C00EABB */ jal get_npc_unsafe +/* B4C988 80241F18 00A0802D */ daddu $s0, $a1, $zero +/* B4C98C 80241F1C 8E43000C */ lw $v1, 0xc($s2) +/* B4C990 80241F20 0240202D */ daddu $a0, $s2, $zero +/* B4C994 80241F24 8C650000 */ lw $a1, ($v1) +/* B4C998 80241F28 0C0B1EAF */ jal get_variable +/* B4C99C 80241F2C 0040A82D */ daddu $s5, $v0, $zero +/* B4C9A0 80241F30 AFA00010 */ sw $zero, 0x10($sp) +/* B4C9A4 80241F34 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4C9A8 80241F38 8C630030 */ lw $v1, 0x30($v1) +/* B4C9AC 80241F3C AFA30014 */ sw $v1, 0x14($sp) +/* B4C9B0 80241F40 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4C9B4 80241F44 8C63001C */ lw $v1, 0x1c($v1) +/* B4C9B8 80241F48 AFA30018 */ sw $v1, 0x18($sp) +/* B4C9BC 80241F4C 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4C9C0 80241F50 8C630024 */ lw $v1, 0x24($v1) +/* B4C9C4 80241F54 AFA3001C */ sw $v1, 0x1c($sp) +/* B4C9C8 80241F58 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4C9CC 80241F5C 8C630028 */ lw $v1, 0x28($v1) +/* B4C9D0 80241F60 27B40010 */ addiu $s4, $sp, 0x10 +/* B4C9D4 80241F64 AFA30020 */ sw $v1, 0x20($sp) +/* B4C9D8 80241F68 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4C9DC 80241F6C 3C014282 */ lui $at, 0x4282 +/* B4C9E0 80241F70 44810000 */ mtc1 $at, $f0 +/* B4C9E4 80241F74 8C63002C */ lw $v1, 0x2c($v1) +/* B4C9E8 80241F78 0040982D */ daddu $s3, $v0, $zero +/* B4C9EC 80241F7C E7A00028 */ swc1 $f0, 0x28($sp) +/* B4C9F0 80241F80 A7A0002C */ sh $zero, 0x2c($sp) +/* B4C9F4 80241F84 16000005 */ bnez $s0, .L80241F9C +/* B4C9F8 80241F88 AFA30024 */ sw $v1, 0x24($sp) +/* B4C9FC 80241F8C 8E2200B0 */ lw $v0, 0xb0($s1) +/* B4CA00 80241F90 30420004 */ andi $v0, $v0, 4 +/* B4CA04 80241F94 10400020 */ beqz $v0, .L80242018 +/* B4CA08 80241F98 00000000 */ nop +.L80241F9C: +/* B4CA0C 80241F9C 2404F7FF */ addiu $a0, $zero, -0x801 +/* B4CA10 80241FA0 AE400070 */ sw $zero, 0x70($s2) +/* B4CA14 80241FA4 A6A0008E */ sh $zero, 0x8e($s5) +/* B4CA18 80241FA8 8E2200CC */ lw $v0, 0xcc($s1) +/* B4CA1C 80241FAC 8EA30000 */ lw $v1, ($s5) +/* B4CA20 80241FB0 8C420000 */ lw $v0, ($v0) +/* B4CA24 80241FB4 00641824 */ and $v1, $v1, $a0 +/* B4CA28 80241FB8 AEA30000 */ sw $v1, ($s5) +/* B4CA2C 80241FBC AEA20028 */ sw $v0, 0x28($s5) +/* B4CA30 80241FC0 8E2200D0 */ lw $v0, 0xd0($s1) +/* B4CA34 80241FC4 8C420034 */ lw $v0, 0x34($v0) +/* B4CA38 80241FC8 54400005 */ bnel $v0, $zero, .L80241FE0 +/* B4CA3C 80241FCC 2402FDFF */ addiu $v0, $zero, -0x201 +/* B4CA40 80241FD0 34620200 */ ori $v0, $v1, 0x200 +/* B4CA44 80241FD4 2403FFF7 */ addiu $v1, $zero, -9 +/* B4CA48 80241FD8 080907FA */ j .L80241FE8 +/* B4CA4C 80241FDC 00431024 */ and $v0, $v0, $v1 +.L80241FE0: +/* B4CA50 80241FE0 00621024 */ and $v0, $v1, $v0 +/* B4CA54 80241FE4 34420008 */ ori $v0, $v0, 8 +.L80241FE8: +/* B4CA58 80241FE8 AEA20000 */ sw $v0, ($s5) +/* B4CA5C 80241FEC 8E2200B0 */ lw $v0, 0xb0($s1) +/* B4CA60 80241FF0 30420004 */ andi $v0, $v0, 4 +/* B4CA64 80241FF4 10400007 */ beqz $v0, .L80242014 +/* B4CA68 80241FF8 24020063 */ addiu $v0, $zero, 0x63 +/* B4CA6C 80241FFC AE420070 */ sw $v0, 0x70($s2) +/* B4CA70 80242000 AE400074 */ sw $zero, 0x74($s2) +/* B4CA74 80242004 8E2200B0 */ lw $v0, 0xb0($s1) +/* B4CA78 80242008 2403FFFB */ addiu $v1, $zero, -5 +/* B4CA7C 8024200C 00431024 */ and $v0, $v0, $v1 +/* B4CA80 80242010 AE2200B0 */ sw $v0, 0xb0($s1) +.L80242014: +/* B4CA84 80242014 AE20006C */ sw $zero, 0x6c($s1) +.L80242018: +/* B4CA88 80242018 8E420070 */ lw $v0, 0x70($s2) +/* B4CA8C 8024201C 2842001E */ slti $v0, $v0, 0x1e +/* B4CA90 80242020 10400009 */ beqz $v0, .L80242048 +/* B4CA94 80242024 00000000 */ nop +/* B4CA98 80242028 8E22006C */ lw $v0, 0x6c($s1) +/* B4CA9C 8024202C 14400006 */ bnez $v0, .L80242048 +/* B4CAA0 80242030 00000000 */ nop +/* B4CAA4 80242034 0C0906B5 */ jal func_80241AD4_B4C544 +/* B4CAA8 80242038 0240202D */ daddu $a0, $s2, $zero +/* B4CAAC 8024203C 10400002 */ beqz $v0, .L80242048 +/* B4CAB0 80242040 2402001E */ addiu $v0, $zero, 0x1e +/* B4CAB4 80242044 AE420070 */ sw $v0, 0x70($s2) +.L80242048: +/* B4CAB8 80242048 8E430070 */ lw $v1, 0x70($s2) +/* B4CABC 8024204C 2C620064 */ sltiu $v0, $v1, 0x64 +/* B4CAC0 80242050 10400048 */ beqz $v0, .L80242174 +/* B4CAC4 80242054 00031080 */ sll $v0, $v1, 2 +/* B4CAC8 80242058 3C018024 */ lui $at, 0x8024 +/* B4CACC 8024205C 00220821 */ addu $at, $at, $v0 +/* B4CAD0 80242060 8C227A98 */ lw $v0, 0x7a98($at) +/* B4CAD4 80242064 00400008 */ jr $v0 +/* B4CAD8 80242068 00000000 */ nop +/* B4CADC 8024206C 0240202D */ daddu $a0, $s2, $zero +/* B4CAE0 80242070 0260282D */ daddu $a1, $s3, $zero +/* B4CAE4 80242074 0C012568 */ jal func_800495A0 +/* B4CAE8 80242078 0280302D */ daddu $a2, $s4, $zero +/* B4CAEC 8024207C 0240202D */ daddu $a0, $s2, $zero +/* B4CAF0 80242080 0260282D */ daddu $a1, $s3, $zero +/* B4CAF4 80242084 0C0125AE */ jal func_800496B8 +/* B4CAF8 80242088 0280302D */ daddu $a2, $s4, $zero +/* B4CAFC 8024208C 0809085D */ j .L80242174 +/* B4CB00 80242090 00000000 */ nop +/* B4CB04 80242094 0240202D */ daddu $a0, $s2, $zero +/* B4CB08 80242098 0260282D */ daddu $a1, $s3, $zero +/* B4CB0C 8024209C 0C0126D1 */ jal func_80049B44 +/* B4CB10 802420A0 0280302D */ daddu $a2, $s4, $zero +/* B4CB14 802420A4 0240202D */ daddu $a0, $s2, $zero +/* B4CB18 802420A8 0260282D */ daddu $a1, $s3, $zero +/* B4CB1C 802420AC 0C012701 */ jal func_80049C04 +/* B4CB20 802420B0 0280302D */ daddu $a2, $s4, $zero +/* B4CB24 802420B4 0809085D */ j .L80242174 +/* B4CB28 802420B8 00000000 */ nop +/* B4CB2C 802420BC 0240202D */ daddu $a0, $s2, $zero +/* B4CB30 802420C0 0260282D */ daddu $a1, $s3, $zero +/* B4CB34 802420C4 0C01278F */ jal func_80049E3C +/* B4CB38 802420C8 0280302D */ daddu $a2, $s4, $zero +/* B4CB3C 802420CC 0240202D */ daddu $a0, $s2, $zero +/* B4CB40 802420D0 0260282D */ daddu $a1, $s3, $zero +/* B4CB44 802420D4 0C0127B3 */ jal func_80049ECC +/* B4CB48 802420D8 0280302D */ daddu $a2, $s4, $zero +/* B4CB4C 802420DC 0809085D */ j .L80242174 +/* B4CB50 802420E0 00000000 */ nop +/* B4CB54 802420E4 0240202D */ daddu $a0, $s2, $zero +/* B4CB58 802420E8 0260282D */ daddu $a1, $s3, $zero +/* B4CB5C 802420EC 0C0127DF */ jal func_80049F7C +/* B4CB60 802420F0 0280302D */ daddu $a2, $s4, $zero +/* B4CB64 802420F4 0240202D */ daddu $a0, $s2, $zero +/* B4CB68 802420F8 0260282D */ daddu $a1, $s3, $zero +/* B4CB6C 802420FC 0C012849 */ jal func_8004A124 +/* B4CB70 80242100 0280302D */ daddu $a2, $s4, $zero +/* B4CB74 80242104 0809085D */ j .L80242174 +/* B4CB78 80242108 00000000 */ nop +/* B4CB7C 8024210C 0240202D */ daddu $a0, $s2, $zero +/* B4CB80 80242110 0260282D */ daddu $a1, $s3, $zero +/* B4CB84 80242114 0C0128FA */ jal func_8004A3E8 +/* B4CB88 80242118 0280302D */ daddu $a2, $s4, $zero +/* B4CB8C 8024211C 0809085D */ j .L80242174 +/* B4CB90 80242120 00000000 */ nop +/* B4CB94 80242124 0C090633 */ jal func_802418CC_B4C33C +/* B4CB98 80242128 0240202D */ daddu $a0, $s2, $zero +/* B4CB9C 8024212C 0C09064E */ jal func_80241938_B4C3A8 +/* B4CBA0 80242130 0240202D */ daddu $a0, $s2, $zero +/* B4CBA4 80242134 8E430070 */ lw $v1, 0x70($s2) +/* B4CBA8 80242138 24020020 */ addiu $v0, $zero, 0x20 +/* B4CBAC 8024213C 1462000D */ bne $v1, $v0, .L80242174 +/* B4CBB0 80242140 00000000 */ nop +/* B4CBB4 80242144 0C09066A */ jal func_802419A8_B4C418 +/* B4CBB8 80242148 0240202D */ daddu $a0, $s2, $zero +/* B4CBBC 8024214C 8E430070 */ lw $v1, 0x70($s2) +/* B4CBC0 80242150 24020021 */ addiu $v0, $zero, 0x21 +/* B4CBC4 80242154 14620007 */ bne $v1, $v0, .L80242174 +/* B4CBC8 80242158 00000000 */ nop +/* B4CBCC 8024215C 0C0906A0 */ jal func_80241A80_B4C4F0 +/* B4CBD0 80242160 0240202D */ daddu $a0, $s2, $zero +/* B4CBD4 80242164 0809085D */ j .L80242174 +/* B4CBD8 80242168 00000000 */ nop +/* B4CBDC 8024216C 0C0129CF */ jal func_8004A73C +/* B4CBE0 80242170 0240202D */ daddu $a0, $s2, $zero +.L80242174: +/* B4CBE4 80242174 8FBF0048 */ lw $ra, 0x48($sp) +/* B4CBE8 80242178 8FB50044 */ lw $s5, 0x44($sp) +/* B4CBEC 8024217C 8FB40040 */ lw $s4, 0x40($sp) +/* B4CBF0 80242180 8FB3003C */ lw $s3, 0x3c($sp) +/* B4CBF4 80242184 8FB20038 */ lw $s2, 0x38($sp) +/* B4CBF8 80242188 8FB10034 */ lw $s1, 0x34($sp) +/* B4CBFC 8024218C 8FB00030 */ lw $s0, 0x30($sp) +/* B4CC00 80242190 0000102D */ daddu $v0, $zero, $zero +/* B4CC04 80242194 03E00008 */ jr $ra +/* B4CC08 80242198 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C.s deleted file mode 100644 index 72c056038e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024219C -/* B4CC0C 8024219C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B4CC10 802421A0 AFB20038 */ sw $s2, 0x38($sp) -/* B4CC14 802421A4 0080902D */ daddu $s2, $a0, $zero -/* B4CC18 802421A8 AFBF0048 */ sw $ra, 0x48($sp) -/* B4CC1C 802421AC AFB50044 */ sw $s5, 0x44($sp) -/* B4CC20 802421B0 AFB40040 */ sw $s4, 0x40($sp) -/* B4CC24 802421B4 AFB3003C */ sw $s3, 0x3c($sp) -/* B4CC28 802421B8 AFB10034 */ sw $s1, 0x34($sp) -/* B4CC2C 802421BC AFB00030 */ sw $s0, 0x30($sp) -/* B4CC30 802421C0 8E510148 */ lw $s1, 0x148($s2) -/* B4CC34 802421C4 86240008 */ lh $a0, 8($s1) -/* B4CC38 802421C8 0C00EABB */ jal get_npc_unsafe -/* B4CC3C 802421CC 00A0802D */ daddu $s0, $a1, $zero -/* B4CC40 802421D0 8E43000C */ lw $v1, 0xc($s2) -/* B4CC44 802421D4 0240202D */ daddu $a0, $s2, $zero -/* B4CC48 802421D8 8C650000 */ lw $a1, ($v1) -/* B4CC4C 802421DC 0C0B1EAF */ jal get_variable -/* B4CC50 802421E0 0040A82D */ daddu $s5, $v0, $zero -/* B4CC54 802421E4 AFA00010 */ sw $zero, 0x10($sp) -/* B4CC58 802421E8 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4CC5C 802421EC 8C630030 */ lw $v1, 0x30($v1) -/* B4CC60 802421F0 AFA30014 */ sw $v1, 0x14($sp) -/* B4CC64 802421F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4CC68 802421F8 8C63001C */ lw $v1, 0x1c($v1) -/* B4CC6C 802421FC AFA30018 */ sw $v1, 0x18($sp) -/* B4CC70 80242200 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4CC74 80242204 8C630024 */ lw $v1, 0x24($v1) -/* B4CC78 80242208 AFA3001C */ sw $v1, 0x1c($sp) -/* B4CC7C 8024220C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4CC80 80242210 8C630028 */ lw $v1, 0x28($v1) -/* B4CC84 80242214 27B40010 */ addiu $s4, $sp, 0x10 -/* B4CC88 80242218 AFA30020 */ sw $v1, 0x20($sp) -/* B4CC8C 8024221C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B4CC90 80242220 3C014282 */ lui $at, 0x4282 -/* B4CC94 80242224 44810000 */ mtc1 $at, $f0 -/* B4CC98 80242228 8C63002C */ lw $v1, 0x2c($v1) -/* B4CC9C 8024222C 0040982D */ daddu $s3, $v0, $zero -/* B4CCA0 80242230 E7A00028 */ swc1 $f0, 0x28($sp) -/* B4CCA4 80242234 A7A0002C */ sh $zero, 0x2c($sp) -/* B4CCA8 80242238 16000005 */ bnez $s0, .L80242250 -/* B4CCAC 8024223C AFA30024 */ sw $v1, 0x24($sp) -/* B4CCB0 80242240 8E2200B0 */ lw $v0, 0xb0($s1) -/* B4CCB4 80242244 30420004 */ andi $v0, $v0, 4 -/* B4CCB8 80242248 10400020 */ beqz $v0, .L802422CC -/* B4CCBC 8024224C 00000000 */ nop -.L80242250: -/* B4CCC0 80242250 2404F7FF */ addiu $a0, $zero, -0x801 -/* B4CCC4 80242254 AE400070 */ sw $zero, 0x70($s2) -/* B4CCC8 80242258 A6A0008E */ sh $zero, 0x8e($s5) -/* B4CCCC 8024225C 8E2200CC */ lw $v0, 0xcc($s1) -/* B4CCD0 80242260 8EA30000 */ lw $v1, ($s5) -/* B4CCD4 80242264 8C420000 */ lw $v0, ($v0) -/* B4CCD8 80242268 00641824 */ and $v1, $v1, $a0 -/* B4CCDC 8024226C AEA30000 */ sw $v1, ($s5) -/* B4CCE0 80242270 AEA20028 */ sw $v0, 0x28($s5) -/* B4CCE4 80242274 8E2200D0 */ lw $v0, 0xd0($s1) -/* B4CCE8 80242278 8C420034 */ lw $v0, 0x34($v0) -/* B4CCEC 8024227C 54400005 */ bnel $v0, $zero, .L80242294 -/* B4CCF0 80242280 2402FDFF */ addiu $v0, $zero, -0x201 -/* B4CCF4 80242284 34620200 */ ori $v0, $v1, 0x200 -/* B4CCF8 80242288 2403FFF7 */ addiu $v1, $zero, -9 -/* B4CCFC 8024228C 080908A7 */ j .L8024229C -/* B4CD00 80242290 00431024 */ and $v0, $v0, $v1 -.L80242294: -/* B4CD04 80242294 00621024 */ and $v0, $v1, $v0 -/* B4CD08 80242298 34420008 */ ori $v0, $v0, 8 -.L8024229C: -/* B4CD0C 8024229C AEA20000 */ sw $v0, ($s5) -/* B4CD10 802422A0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B4CD14 802422A4 30420004 */ andi $v0, $v0, 4 -/* B4CD18 802422A8 10400007 */ beqz $v0, .L802422C8 -/* B4CD1C 802422AC 24020063 */ addiu $v0, $zero, 0x63 -/* B4CD20 802422B0 AE420070 */ sw $v0, 0x70($s2) -/* B4CD24 802422B4 AE400074 */ sw $zero, 0x74($s2) -/* B4CD28 802422B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* B4CD2C 802422BC 2403FFFB */ addiu $v1, $zero, -5 -/* B4CD30 802422C0 00431024 */ and $v0, $v0, $v1 -/* B4CD34 802422C4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802422C8: -/* B4CD38 802422C8 AE20006C */ sw $zero, 0x6c($s1) -.L802422CC: -/* B4CD3C 802422CC 8E420070 */ lw $v0, 0x70($s2) -/* B4CD40 802422D0 2842001E */ slti $v0, $v0, 0x1e -/* B4CD44 802422D4 10400009 */ beqz $v0, .L802422FC -/* B4CD48 802422D8 00000000 */ nop -/* B4CD4C 802422DC 8E22006C */ lw $v0, 0x6c($s1) -/* B4CD50 802422E0 14400006 */ bnez $v0, .L802422FC -/* B4CD54 802422E4 00000000 */ nop -/* B4CD58 802422E8 0C0906B5 */ jal func_80241AD4 -/* B4CD5C 802422EC 0240202D */ daddu $a0, $s2, $zero -/* B4CD60 802422F0 10400002 */ beqz $v0, .L802422FC -/* B4CD64 802422F4 2402001E */ addiu $v0, $zero, 0x1e -/* B4CD68 802422F8 AE420070 */ sw $v0, 0x70($s2) -.L802422FC: -/* B4CD6C 802422FC 8E430070 */ lw $v1, 0x70($s2) -/* B4CD70 80242300 2C620064 */ sltiu $v0, $v1, 0x64 -/* B4CD74 80242304 10400048 */ beqz $v0, .L80242428 -/* B4CD78 80242308 00031080 */ sll $v0, $v1, 2 -/* B4CD7C 8024230C 3C018024 */ lui $at, 0x8024 -/* B4CD80 80242310 00220821 */ addu $at, $at, $v0 -/* B4CD84 80242314 8C227C28 */ lw $v0, 0x7c28($at) -/* B4CD88 80242318 00400008 */ jr $v0 -/* B4CD8C 8024231C 00000000 */ nop -/* B4CD90 80242320 0240202D */ daddu $a0, $s2, $zero -/* B4CD94 80242324 0260282D */ daddu $a1, $s3, $zero -/* B4CD98 80242328 0C012568 */ jal func_800495A0 -/* B4CD9C 8024232C 0280302D */ daddu $a2, $s4, $zero -/* B4CDA0 80242330 0240202D */ daddu $a0, $s2, $zero -/* B4CDA4 80242334 0260282D */ daddu $a1, $s3, $zero -/* B4CDA8 80242338 0C0125AE */ jal func_800496B8 -/* B4CDAC 8024233C 0280302D */ daddu $a2, $s4, $zero -/* B4CDB0 80242340 0809090A */ j .L80242428 -/* B4CDB4 80242344 00000000 */ nop -/* B4CDB8 80242348 0240202D */ daddu $a0, $s2, $zero -/* B4CDBC 8024234C 0260282D */ daddu $a1, $s3, $zero -/* B4CDC0 80242350 0C0905AE */ jal func_802416B8 -/* B4CDC4 80242354 0280302D */ daddu $a2, $s4, $zero -/* B4CDC8 80242358 0240202D */ daddu $a0, $s2, $zero -/* B4CDCC 8024235C 0260282D */ daddu $a1, $s3, $zero -/* B4CDD0 80242360 0C0905C2 */ jal func_80241708 -/* B4CDD4 80242364 0280302D */ daddu $a2, $s4, $zero -/* B4CDD8 80242368 0809090A */ j .L80242428 -/* B4CDDC 8024236C 00000000 */ nop -/* B4CDE0 80242370 0240202D */ daddu $a0, $s2, $zero -/* B4CDE4 80242374 0260282D */ daddu $a1, $s3, $zero -/* B4CDE8 80242378 0C01278F */ jal func_80049E3C -/* B4CDEC 8024237C 0280302D */ daddu $a2, $s4, $zero -/* B4CDF0 80242380 0240202D */ daddu $a0, $s2, $zero -/* B4CDF4 80242384 0260282D */ daddu $a1, $s3, $zero -/* B4CDF8 80242388 0C0127B3 */ jal func_80049ECC -/* B4CDFC 8024238C 0280302D */ daddu $a2, $s4, $zero -/* B4CE00 80242390 0809090A */ j .L80242428 -/* B4CE04 80242394 00000000 */ nop -/* B4CE08 80242398 0240202D */ daddu $a0, $s2, $zero -/* B4CE0C 8024239C 0260282D */ daddu $a1, $s3, $zero -/* B4CE10 802423A0 0C0127DF */ jal func_80049F7C -/* B4CE14 802423A4 0280302D */ daddu $a2, $s4, $zero -/* B4CE18 802423A8 0240202D */ daddu $a0, $s2, $zero -/* B4CE1C 802423AC 0260282D */ daddu $a1, $s3, $zero -/* B4CE20 802423B0 0C012849 */ jal func_8004A124 -/* B4CE24 802423B4 0280302D */ daddu $a2, $s4, $zero -/* B4CE28 802423B8 0809090A */ j .L80242428 -/* B4CE2C 802423BC 00000000 */ nop -/* B4CE30 802423C0 0240202D */ daddu $a0, $s2, $zero -/* B4CE34 802423C4 0260282D */ daddu $a1, $s3, $zero -/* B4CE38 802423C8 0C0128FA */ jal func_8004A3E8 -/* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero -/* B4CE40 802423D0 0809090A */ j .L80242428 -/* B4CE44 802423D4 00000000 */ nop -/* B4CE48 802423D8 0C090633 */ jal func_802418CC -/* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero -/* B4CE50 802423E0 0C09064E */ jal func_80241938 -/* B4CE54 802423E4 0240202D */ daddu $a0, $s2, $zero -/* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2) -/* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 -/* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428 -/* B4CE64 802423F4 00000000 */ nop -/* B4CE68 802423F8 0C09066A */ jal func_802419A8 -/* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero -/* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2) -/* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 -/* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 -/* B4CE7C 8024240C 00000000 */ nop -/* B4CE80 80242410 0C0906A0 */ jal func_80241A80 -/* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero -/* B4CE88 80242418 0809090A */ j .L80242428 -/* B4CE8C 8024241C 00000000 */ nop -/* B4CE90 80242420 0C0129CF */ jal func_8004A73C -/* B4CE94 80242424 0240202D */ daddu $a0, $s2, $zero -.L80242428: -/* B4CE98 80242428 8FBF0048 */ lw $ra, 0x48($sp) -/* B4CE9C 8024242C 8FB50044 */ lw $s5, 0x44($sp) -/* B4CEA0 80242430 8FB40040 */ lw $s4, 0x40($sp) -/* B4CEA4 80242434 8FB3003C */ lw $s3, 0x3c($sp) -/* B4CEA8 80242438 8FB20038 */ lw $s2, 0x38($sp) -/* B4CEAC 8024243C 8FB10034 */ lw $s1, 0x34($sp) -/* B4CEB0 80242440 8FB00030 */ lw $s0, 0x30($sp) -/* B4CEB4 80242444 0000102D */ daddu $v0, $zero, $zero -/* B4CEB8 80242448 03E00008 */ jr $ra -/* B4CEBC 8024244C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s new file mode 100644 index 0000000000..1754a26317 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_8024219C_B4CC0C.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024219C_B4CC0C +/* B4CC0C 8024219C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* B4CC10 802421A0 AFB20038 */ sw $s2, 0x38($sp) +/* B4CC14 802421A4 0080902D */ daddu $s2, $a0, $zero +/* B4CC18 802421A8 AFBF0048 */ sw $ra, 0x48($sp) +/* B4CC1C 802421AC AFB50044 */ sw $s5, 0x44($sp) +/* B4CC20 802421B0 AFB40040 */ sw $s4, 0x40($sp) +/* B4CC24 802421B4 AFB3003C */ sw $s3, 0x3c($sp) +/* B4CC28 802421B8 AFB10034 */ sw $s1, 0x34($sp) +/* B4CC2C 802421BC AFB00030 */ sw $s0, 0x30($sp) +/* B4CC30 802421C0 8E510148 */ lw $s1, 0x148($s2) +/* B4CC34 802421C4 86240008 */ lh $a0, 8($s1) +/* B4CC38 802421C8 0C00EABB */ jal get_npc_unsafe +/* B4CC3C 802421CC 00A0802D */ daddu $s0, $a1, $zero +/* B4CC40 802421D0 8E43000C */ lw $v1, 0xc($s2) +/* B4CC44 802421D4 0240202D */ daddu $a0, $s2, $zero +/* B4CC48 802421D8 8C650000 */ lw $a1, ($v1) +/* B4CC4C 802421DC 0C0B1EAF */ jal get_variable +/* B4CC50 802421E0 0040A82D */ daddu $s5, $v0, $zero +/* B4CC54 802421E4 AFA00010 */ sw $zero, 0x10($sp) +/* B4CC58 802421E8 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4CC5C 802421EC 8C630030 */ lw $v1, 0x30($v1) +/* B4CC60 802421F0 AFA30014 */ sw $v1, 0x14($sp) +/* B4CC64 802421F4 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4CC68 802421F8 8C63001C */ lw $v1, 0x1c($v1) +/* B4CC6C 802421FC AFA30018 */ sw $v1, 0x18($sp) +/* B4CC70 80242200 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4CC74 80242204 8C630024 */ lw $v1, 0x24($v1) +/* B4CC78 80242208 AFA3001C */ sw $v1, 0x1c($sp) +/* B4CC7C 8024220C 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4CC80 80242210 8C630028 */ lw $v1, 0x28($v1) +/* B4CC84 80242214 27B40010 */ addiu $s4, $sp, 0x10 +/* B4CC88 80242218 AFA30020 */ sw $v1, 0x20($sp) +/* B4CC8C 8024221C 8E2300D0 */ lw $v1, 0xd0($s1) +/* B4CC90 80242220 3C014282 */ lui $at, 0x4282 +/* B4CC94 80242224 44810000 */ mtc1 $at, $f0 +/* B4CC98 80242228 8C63002C */ lw $v1, 0x2c($v1) +/* B4CC9C 8024222C 0040982D */ daddu $s3, $v0, $zero +/* B4CCA0 80242230 E7A00028 */ swc1 $f0, 0x28($sp) +/* B4CCA4 80242234 A7A0002C */ sh $zero, 0x2c($sp) +/* B4CCA8 80242238 16000005 */ bnez $s0, .L80242250 +/* B4CCAC 8024223C AFA30024 */ sw $v1, 0x24($sp) +/* B4CCB0 80242240 8E2200B0 */ lw $v0, 0xb0($s1) +/* B4CCB4 80242244 30420004 */ andi $v0, $v0, 4 +/* B4CCB8 80242248 10400020 */ beqz $v0, .L802422CC +/* B4CCBC 8024224C 00000000 */ nop +.L80242250: +/* B4CCC0 80242250 2404F7FF */ addiu $a0, $zero, -0x801 +/* B4CCC4 80242254 AE400070 */ sw $zero, 0x70($s2) +/* B4CCC8 80242258 A6A0008E */ sh $zero, 0x8e($s5) +/* B4CCCC 8024225C 8E2200CC */ lw $v0, 0xcc($s1) +/* B4CCD0 80242260 8EA30000 */ lw $v1, ($s5) +/* B4CCD4 80242264 8C420000 */ lw $v0, ($v0) +/* B4CCD8 80242268 00641824 */ and $v1, $v1, $a0 +/* B4CCDC 8024226C AEA30000 */ sw $v1, ($s5) +/* B4CCE0 80242270 AEA20028 */ sw $v0, 0x28($s5) +/* B4CCE4 80242274 8E2200D0 */ lw $v0, 0xd0($s1) +/* B4CCE8 80242278 8C420034 */ lw $v0, 0x34($v0) +/* B4CCEC 8024227C 54400005 */ bnel $v0, $zero, .L80242294 +/* B4CCF0 80242280 2402FDFF */ addiu $v0, $zero, -0x201 +/* B4CCF4 80242284 34620200 */ ori $v0, $v1, 0x200 +/* B4CCF8 80242288 2403FFF7 */ addiu $v1, $zero, -9 +/* B4CCFC 8024228C 080908A7 */ j .L8024229C +/* B4CD00 80242290 00431024 */ and $v0, $v0, $v1 +.L80242294: +/* B4CD04 80242294 00621024 */ and $v0, $v1, $v0 +/* B4CD08 80242298 34420008 */ ori $v0, $v0, 8 +.L8024229C: +/* B4CD0C 8024229C AEA20000 */ sw $v0, ($s5) +/* B4CD10 802422A0 8E2200B0 */ lw $v0, 0xb0($s1) +/* B4CD14 802422A4 30420004 */ andi $v0, $v0, 4 +/* B4CD18 802422A8 10400007 */ beqz $v0, .L802422C8 +/* B4CD1C 802422AC 24020063 */ addiu $v0, $zero, 0x63 +/* B4CD20 802422B0 AE420070 */ sw $v0, 0x70($s2) +/* B4CD24 802422B4 AE400074 */ sw $zero, 0x74($s2) +/* B4CD28 802422B8 8E2200B0 */ lw $v0, 0xb0($s1) +/* B4CD2C 802422BC 2403FFFB */ addiu $v1, $zero, -5 +/* B4CD30 802422C0 00431024 */ and $v0, $v0, $v1 +/* B4CD34 802422C4 AE2200B0 */ sw $v0, 0xb0($s1) +.L802422C8: +/* B4CD38 802422C8 AE20006C */ sw $zero, 0x6c($s1) +.L802422CC: +/* B4CD3C 802422CC 8E420070 */ lw $v0, 0x70($s2) +/* B4CD40 802422D0 2842001E */ slti $v0, $v0, 0x1e +/* B4CD44 802422D4 10400009 */ beqz $v0, .L802422FC +/* B4CD48 802422D8 00000000 */ nop +/* B4CD4C 802422DC 8E22006C */ lw $v0, 0x6c($s1) +/* B4CD50 802422E0 14400006 */ bnez $v0, .L802422FC +/* B4CD54 802422E4 00000000 */ nop +/* B4CD58 802422E8 0C0906B5 */ jal func_80241AD4_B4C544 +/* B4CD5C 802422EC 0240202D */ daddu $a0, $s2, $zero +/* B4CD60 802422F0 10400002 */ beqz $v0, .L802422FC +/* B4CD64 802422F4 2402001E */ addiu $v0, $zero, 0x1e +/* B4CD68 802422F8 AE420070 */ sw $v0, 0x70($s2) +.L802422FC: +/* B4CD6C 802422FC 8E430070 */ lw $v1, 0x70($s2) +/* B4CD70 80242300 2C620064 */ sltiu $v0, $v1, 0x64 +/* B4CD74 80242304 10400048 */ beqz $v0, .L80242428 +/* B4CD78 80242308 00031080 */ sll $v0, $v1, 2 +/* B4CD7C 8024230C 3C018024 */ lui $at, 0x8024 +/* B4CD80 80242310 00220821 */ addu $at, $at, $v0 +/* B4CD84 80242314 8C227C28 */ lw $v0, 0x7c28($at) +/* B4CD88 80242318 00400008 */ jr $v0 +/* B4CD8C 8024231C 00000000 */ nop +/* B4CD90 80242320 0240202D */ daddu $a0, $s2, $zero +/* B4CD94 80242324 0260282D */ daddu $a1, $s3, $zero +/* B4CD98 80242328 0C012568 */ jal func_800495A0 +/* B4CD9C 8024232C 0280302D */ daddu $a2, $s4, $zero +/* B4CDA0 80242330 0240202D */ daddu $a0, $s2, $zero +/* B4CDA4 80242334 0260282D */ daddu $a1, $s3, $zero +/* B4CDA8 80242338 0C0125AE */ jal func_800496B8 +/* B4CDAC 8024233C 0280302D */ daddu $a2, $s4, $zero +/* B4CDB0 80242340 0809090A */ j .L80242428 +/* B4CDB4 80242344 00000000 */ nop +/* B4CDB8 80242348 0240202D */ daddu $a0, $s2, $zero +/* B4CDBC 8024234C 0260282D */ daddu $a1, $s3, $zero +/* B4CDC0 80242350 0C0905AE */ jal func_802416B8_B4C128 +/* B4CDC4 80242354 0280302D */ daddu $a2, $s4, $zero +/* B4CDC8 80242358 0240202D */ daddu $a0, $s2, $zero +/* B4CDCC 8024235C 0260282D */ daddu $a1, $s3, $zero +/* B4CDD0 80242360 0C0905C2 */ jal func_80241708_B4C178 +/* B4CDD4 80242364 0280302D */ daddu $a2, $s4, $zero +/* B4CDD8 80242368 0809090A */ j .L80242428 +/* B4CDDC 8024236C 00000000 */ nop +/* B4CDE0 80242370 0240202D */ daddu $a0, $s2, $zero +/* B4CDE4 80242374 0260282D */ daddu $a1, $s3, $zero +/* B4CDE8 80242378 0C01278F */ jal func_80049E3C +/* B4CDEC 8024237C 0280302D */ daddu $a2, $s4, $zero +/* B4CDF0 80242380 0240202D */ daddu $a0, $s2, $zero +/* B4CDF4 80242384 0260282D */ daddu $a1, $s3, $zero +/* B4CDF8 80242388 0C0127B3 */ jal func_80049ECC +/* B4CDFC 8024238C 0280302D */ daddu $a2, $s4, $zero +/* B4CE00 80242390 0809090A */ j .L80242428 +/* B4CE04 80242394 00000000 */ nop +/* B4CE08 80242398 0240202D */ daddu $a0, $s2, $zero +/* B4CE0C 8024239C 0260282D */ daddu $a1, $s3, $zero +/* B4CE10 802423A0 0C0127DF */ jal func_80049F7C +/* B4CE14 802423A4 0280302D */ daddu $a2, $s4, $zero +/* B4CE18 802423A8 0240202D */ daddu $a0, $s2, $zero +/* B4CE1C 802423AC 0260282D */ daddu $a1, $s3, $zero +/* B4CE20 802423B0 0C012849 */ jal func_8004A124 +/* B4CE24 802423B4 0280302D */ daddu $a2, $s4, $zero +/* B4CE28 802423B8 0809090A */ j .L80242428 +/* B4CE2C 802423BC 00000000 */ nop +/* B4CE30 802423C0 0240202D */ daddu $a0, $s2, $zero +/* B4CE34 802423C4 0260282D */ daddu $a1, $s3, $zero +/* B4CE38 802423C8 0C0128FA */ jal func_8004A3E8 +/* B4CE3C 802423CC 0280302D */ daddu $a2, $s4, $zero +/* B4CE40 802423D0 0809090A */ j .L80242428 +/* B4CE44 802423D4 00000000 */ nop +/* B4CE48 802423D8 0C090633 */ jal func_802418CC_B4C33C +/* B4CE4C 802423DC 0240202D */ daddu $a0, $s2, $zero +/* B4CE50 802423E0 0C09064E */ jal func_80241938_B4C3A8 +/* B4CE54 802423E4 0240202D */ daddu $a0, $s2, $zero +/* B4CE58 802423E8 8E430070 */ lw $v1, 0x70($s2) +/* B4CE5C 802423EC 24020020 */ addiu $v0, $zero, 0x20 +/* B4CE60 802423F0 1462000D */ bne $v1, $v0, .L80242428 +/* B4CE64 802423F4 00000000 */ nop +/* B4CE68 802423F8 0C09066A */ jal func_802419A8_B4C418 +/* B4CE6C 802423FC 0240202D */ daddu $a0, $s2, $zero +/* B4CE70 80242400 8E430070 */ lw $v1, 0x70($s2) +/* B4CE74 80242404 24020021 */ addiu $v0, $zero, 0x21 +/* B4CE78 80242408 14620007 */ bne $v1, $v0, .L80242428 +/* B4CE7C 8024240C 00000000 */ nop +/* B4CE80 80242410 0C0906A0 */ jal func_80241A80_B4C4F0 +/* B4CE84 80242414 0240202D */ daddu $a0, $s2, $zero +/* B4CE88 80242418 0809090A */ j .L80242428 +/* B4CE8C 8024241C 00000000 */ nop +/* B4CE90 80242420 0C0129CF */ jal func_8004A73C +/* B4CE94 80242424 0240202D */ daddu $a0, $s2, $zero +.L80242428: +/* B4CE98 80242428 8FBF0048 */ lw $ra, 0x48($sp) +/* B4CE9C 8024242C 8FB50044 */ lw $s5, 0x44($sp) +/* B4CEA0 80242430 8FB40040 */ lw $s4, 0x40($sp) +/* B4CEA4 80242434 8FB3003C */ lw $s3, 0x3c($sp) +/* B4CEA8 80242438 8FB20038 */ lw $s2, 0x38($sp) +/* B4CEAC 8024243C 8FB10034 */ lw $s1, 0x34($sp) +/* B4CEB0 80242440 8FB00030 */ lw $s0, 0x30($sp) +/* B4CEB4 80242444 0000102D */ daddu $v0, $zero, $zero +/* B4CEB8 80242448 03E00008 */ jr $ra +/* B4CEBC 8024244C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80242450.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80242450.s deleted file mode 100644 index d8b927492a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80242450.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242450 -/* B4CEC0 80242450 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B4CEC4 80242454 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B4CEC8 80242458 4485A000 */ mtc1 $a1, $f20 -/* B4CECC 8024245C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B4CED0 80242460 4486B000 */ mtc1 $a2, $f22 -/* B4CED4 80242464 AFB00010 */ sw $s0, 0x10($sp) -/* B4CED8 80242468 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B4CEDC 8024246C 4487C000 */ mtc1 $a3, $f24 -/* B4CEE0 80242470 AFBF0014 */ sw $ra, 0x14($sp) -/* B4CEE4 80242474 0C019D28 */ jal guMtxIdentF -/* B4CEE8 80242478 0080802D */ daddu $s0, $a0, $zero -/* B4CEEC 8024247C 4616A582 */ mul.s $f22, $f20, $f22 -/* B4CEF0 80242480 00000000 */ nop -/* B4CEF4 80242484 4618A502 */ mul.s $f20, $f20, $f24 -/* B4CEF8 80242488 00000000 */ nop -/* B4CEFC 8024248C 3C013F80 */ lui $at, 0x3f80 -/* B4CF00 80242490 44810000 */ mtc1 $at, $f0 -/* B4CF04 80242494 00000000 */ nop -/* B4CF08 80242498 E6000014 */ swc1 $f0, 0x14($s0) -/* B4CF0C 8024249C E6160010 */ swc1 $f22, 0x10($s0) -/* B4CF10 802424A0 E6140018 */ swc1 $f20, 0x18($s0) -/* B4CF14 802424A4 8FBF0014 */ lw $ra, 0x14($sp) -/* B4CF18 802424A8 8FB00010 */ lw $s0, 0x10($sp) -/* B4CF1C 802424AC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B4CF20 802424B0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B4CF24 802424B4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B4CF28 802424B8 03E00008 */ jr $ra -/* B4CF2C 802424BC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80242450_B4CEC0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80242450_B4CEC0.s new file mode 100644 index 0000000000..4abd9a3cd9 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_80242450_B4CEC0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242450_B4CEC0 +/* B4CEC0 80242450 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B4CEC4 80242454 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B4CEC8 80242458 4485A000 */ mtc1 $a1, $f20 +/* B4CECC 8024245C F7B60020 */ sdc1 $f22, 0x20($sp) +/* B4CED0 80242460 4486B000 */ mtc1 $a2, $f22 +/* B4CED4 80242464 AFB00010 */ sw $s0, 0x10($sp) +/* B4CED8 80242468 F7B80028 */ sdc1 $f24, 0x28($sp) +/* B4CEDC 8024246C 4487C000 */ mtc1 $a3, $f24 +/* B4CEE0 80242470 AFBF0014 */ sw $ra, 0x14($sp) +/* B4CEE4 80242474 0C019D28 */ jal guMtxIdentF +/* B4CEE8 80242478 0080802D */ daddu $s0, $a0, $zero +/* B4CEEC 8024247C 4616A582 */ mul.s $f22, $f20, $f22 +/* B4CEF0 80242480 00000000 */ nop +/* B4CEF4 80242484 4618A502 */ mul.s $f20, $f20, $f24 +/* B4CEF8 80242488 00000000 */ nop +/* B4CEFC 8024248C 3C013F80 */ lui $at, 0x3f80 +/* B4CF00 80242490 44810000 */ mtc1 $at, $f0 +/* B4CF04 80242494 00000000 */ nop +/* B4CF08 80242498 E6000014 */ swc1 $f0, 0x14($s0) +/* B4CF0C 8024249C E6160010 */ swc1 $f22, 0x10($s0) +/* B4CF10 802424A0 E6140018 */ swc1 $f20, 0x18($s0) +/* B4CF14 802424A4 8FBF0014 */ lw $ra, 0x14($sp) +/* B4CF18 802424A8 8FB00010 */ lw $s0, 0x10($sp) +/* B4CF1C 802424AC D7B80028 */ ldc1 $f24, 0x28($sp) +/* B4CF20 802424B0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* B4CF24 802424B4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* B4CF28 802424B8 03E00008 */ jr $ra +/* B4CF2C 802424BC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802424C0.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802424C0.s deleted file mode 100644 index c9e60e66db..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802424C0.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424C0 -/* B4CF30 802424C0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B4CF34 802424C4 AFB10054 */ sw $s1, 0x54($sp) -/* B4CF38 802424C8 0080882D */ daddu $s1, $a0, $zero -/* B4CF3C 802424CC AFBF005C */ sw $ra, 0x5c($sp) -/* B4CF40 802424D0 AFB20058 */ sw $s2, 0x58($sp) -/* B4CF44 802424D4 AFB00050 */ sw $s0, 0x50($sp) -/* B4CF48 802424D8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B4CF4C 802424DC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B4CF50 802424E0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B4CF54 802424E4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B4CF58 802424E8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B4CF5C 802424EC 8E30000C */ lw $s0, 0xc($s1) -/* B4CF60 802424F0 8E050000 */ lw $a1, ($s0) -/* B4CF64 802424F4 0C0B1EAF */ jal get_variable -/* B4CF68 802424F8 26100004 */ addiu $s0, $s0, 4 -/* B4CF6C 802424FC 0C046C04 */ jal get_model_list_index_from_tree_index -/* B4CF70 80242500 0040202D */ daddu $a0, $v0, $zero -/* B4CF74 80242504 8E050000 */ lw $a1, ($s0) -/* B4CF78 80242508 26100004 */ addiu $s0, $s0, 4 -/* B4CF7C 8024250C 0220202D */ daddu $a0, $s1, $zero -/* B4CF80 80242510 0C0B210B */ jal get_float_variable -/* B4CF84 80242514 0040902D */ daddu $s2, $v0, $zero -/* B4CF88 80242518 8E050000 */ lw $a1, ($s0) -/* B4CF8C 8024251C 26100004 */ addiu $s0, $s0, 4 -/* B4CF90 80242520 0220202D */ daddu $a0, $s1, $zero -/* B4CF94 80242524 0C0B210B */ jal get_float_variable -/* B4CF98 80242528 46000706 */ mov.s $f28, $f0 -/* B4CF9C 8024252C 8E050000 */ lw $a1, ($s0) -/* B4CFA0 80242530 26100004 */ addiu $s0, $s0, 4 -/* B4CFA4 80242534 0220202D */ daddu $a0, $s1, $zero -/* B4CFA8 80242538 0C0B210B */ jal get_float_variable -/* B4CFAC 8024253C 46000686 */ mov.s $f26, $f0 -/* B4CFB0 80242540 0220202D */ daddu $a0, $s1, $zero -/* B4CFB4 80242544 8E050000 */ lw $a1, ($s0) -/* B4CFB8 80242548 0C0B210B */ jal get_float_variable -/* B4CFBC 8024254C 46000586 */ mov.s $f22, $f0 -/* B4CFC0 80242550 0240202D */ daddu $a0, $s2, $zero -/* B4CFC4 80242554 0C046B4C */ jal get_model_from_list_index -/* B4CFC8 80242558 46000606 */ mov.s $f24, $f0 -/* B4CFCC 8024255C 0040882D */ daddu $s1, $v0, $zero -/* B4CFD0 80242560 96220000 */ lhu $v0, ($s1) -/* B4CFD4 80242564 30420400 */ andi $v0, $v0, 0x400 -/* B4CFD8 80242568 1440001E */ bnez $v0, .L802425E4 -/* B4CFDC 8024256C 26300058 */ addiu $s0, $s1, 0x58 -/* B4CFE0 80242570 4480A000 */ mtc1 $zero, $f20 -/* B4CFE4 80242574 4406B000 */ mfc1 $a2, $f22 -/* B4CFE8 80242578 4405A000 */ mfc1 $a1, $f20 -/* B4CFEC 8024257C 4407A000 */ mfc1 $a3, $f20 -/* B4CFF0 80242580 0C019E40 */ jal guTranslateF -/* B4CFF4 80242584 0200202D */ daddu $a0, $s0, $zero -/* B4CFF8 80242588 4405E000 */ mfc1 $a1, $f28 -/* B4CFFC 8024258C 4406D000 */ mfc1 $a2, $f26 -/* B4D000 80242590 4407C000 */ mfc1 $a3, $f24 -/* B4D004 80242594 0C090914 */ jal func_80242450 -/* B4D008 80242598 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D00C 8024259C 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D010 802425A0 0200282D */ daddu $a1, $s0, $zero -/* B4D014 802425A4 0C019D80 */ jal guMtxCatF -/* B4D018 802425A8 0200302D */ daddu $a2, $s0, $zero -/* B4D01C 802425AC 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D020 802425B0 4600B587 */ neg.s $f22, $f22 -/* B4D024 802425B4 4405A000 */ mfc1 $a1, $f20 -/* B4D028 802425B8 4406B000 */ mfc1 $a2, $f22 -/* B4D02C 802425BC 0C019E40 */ jal guTranslateF -/* B4D030 802425C0 00A0382D */ daddu $a3, $a1, $zero -/* B4D034 802425C4 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D038 802425C8 0200282D */ daddu $a1, $s0, $zero -/* B4D03C 802425CC 0C019D80 */ jal guMtxCatF -/* B4D040 802425D0 00A0302D */ daddu $a2, $a1, $zero -/* B4D044 802425D4 96220000 */ lhu $v0, ($s1) -/* B4D048 802425D8 34421400 */ ori $v0, $v0, 0x1400 -/* B4D04C 802425DC 08090997 */ j .L8024265C -/* B4D050 802425E0 A6220000 */ sh $v0, ($s1) -.L802425E4: -/* B4D054 802425E4 4480A000 */ mtc1 $zero, $f20 -/* B4D058 802425E8 4406B000 */ mfc1 $a2, $f22 -/* B4D05C 802425EC 4405A000 */ mfc1 $a1, $f20 -/* B4D060 802425F0 4407A000 */ mfc1 $a3, $f20 -/* B4D064 802425F4 0C019E40 */ jal guTranslateF -/* B4D068 802425F8 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D06C 802425FC 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D070 80242600 26300058 */ addiu $s0, $s1, 0x58 -/* B4D074 80242604 0200282D */ daddu $a1, $s0, $zero -/* B4D078 80242608 0C019D80 */ jal guMtxCatF -/* B4D07C 8024260C 0200302D */ daddu $a2, $s0, $zero -/* B4D080 80242610 4405E000 */ mfc1 $a1, $f28 -/* B4D084 80242614 4406D000 */ mfc1 $a2, $f26 -/* B4D088 80242618 4407C000 */ mfc1 $a3, $f24 -/* B4D08C 8024261C 0C090914 */ jal func_80242450 -/* B4D090 80242620 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D094 80242624 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D098 80242628 0200282D */ daddu $a1, $s0, $zero -/* B4D09C 8024262C 0C019D80 */ jal guMtxCatF -/* B4D0A0 80242630 0200302D */ daddu $a2, $s0, $zero -/* B4D0A4 80242634 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D0A8 80242638 4600B587 */ neg.s $f22, $f22 -/* B4D0AC 8024263C 4405A000 */ mfc1 $a1, $f20 -/* B4D0B0 80242640 4406B000 */ mfc1 $a2, $f22 -/* B4D0B4 80242644 0C019E40 */ jal guTranslateF -/* B4D0B8 80242648 00A0382D */ daddu $a3, $a1, $zero -/* B4D0BC 8024264C 27A40010 */ addiu $a0, $sp, 0x10 -/* B4D0C0 80242650 0200282D */ daddu $a1, $s0, $zero -/* B4D0C4 80242654 0C019D80 */ jal guMtxCatF -/* B4D0C8 80242658 00A0302D */ daddu $a2, $a1, $zero -.L8024265C: -/* B4D0CC 8024265C 8FBF005C */ lw $ra, 0x5c($sp) -/* B4D0D0 80242660 8FB20058 */ lw $s2, 0x58($sp) -/* B4D0D4 80242664 8FB10054 */ lw $s1, 0x54($sp) -/* B4D0D8 80242668 8FB00050 */ lw $s0, 0x50($sp) -/* B4D0DC 8024266C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B4D0E0 80242670 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B4D0E4 80242674 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B4D0E8 80242678 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B4D0EC 8024267C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B4D0F0 80242680 24020002 */ addiu $v0, $zero, 2 -/* B4D0F4 80242684 03E00008 */ jr $ra -/* B4D0F8 80242688 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802424C0_B4CF30.s b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802424C0_B4CF30.s new file mode 100644 index 0000000000..2c19caded1 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_05/B4B260/func_802424C0_B4CF30.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424C0_B4CF30 +/* B4CF30 802424C0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* B4CF34 802424C4 AFB10054 */ sw $s1, 0x54($sp) +/* B4CF38 802424C8 0080882D */ daddu $s1, $a0, $zero +/* B4CF3C 802424CC AFBF005C */ sw $ra, 0x5c($sp) +/* B4CF40 802424D0 AFB20058 */ sw $s2, 0x58($sp) +/* B4CF44 802424D4 AFB00050 */ sw $s0, 0x50($sp) +/* B4CF48 802424D8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* B4CF4C 802424DC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* B4CF50 802424E0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* B4CF54 802424E4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* B4CF58 802424E8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* B4CF5C 802424EC 8E30000C */ lw $s0, 0xc($s1) +/* B4CF60 802424F0 8E050000 */ lw $a1, ($s0) +/* B4CF64 802424F4 0C0B1EAF */ jal get_variable +/* B4CF68 802424F8 26100004 */ addiu $s0, $s0, 4 +/* B4CF6C 802424FC 0C046C04 */ jal get_model_list_index_from_tree_index +/* B4CF70 80242500 0040202D */ daddu $a0, $v0, $zero +/* B4CF74 80242504 8E050000 */ lw $a1, ($s0) +/* B4CF78 80242508 26100004 */ addiu $s0, $s0, 4 +/* B4CF7C 8024250C 0220202D */ daddu $a0, $s1, $zero +/* B4CF80 80242510 0C0B210B */ jal get_float_variable +/* B4CF84 80242514 0040902D */ daddu $s2, $v0, $zero +/* B4CF88 80242518 8E050000 */ lw $a1, ($s0) +/* B4CF8C 8024251C 26100004 */ addiu $s0, $s0, 4 +/* B4CF90 80242520 0220202D */ daddu $a0, $s1, $zero +/* B4CF94 80242524 0C0B210B */ jal get_float_variable +/* B4CF98 80242528 46000706 */ mov.s $f28, $f0 +/* B4CF9C 8024252C 8E050000 */ lw $a1, ($s0) +/* B4CFA0 80242530 26100004 */ addiu $s0, $s0, 4 +/* B4CFA4 80242534 0220202D */ daddu $a0, $s1, $zero +/* B4CFA8 80242538 0C0B210B */ jal get_float_variable +/* B4CFAC 8024253C 46000686 */ mov.s $f26, $f0 +/* B4CFB0 80242540 0220202D */ daddu $a0, $s1, $zero +/* B4CFB4 80242544 8E050000 */ lw $a1, ($s0) +/* B4CFB8 80242548 0C0B210B */ jal get_float_variable +/* B4CFBC 8024254C 46000586 */ mov.s $f22, $f0 +/* B4CFC0 80242550 0240202D */ daddu $a0, $s2, $zero +/* B4CFC4 80242554 0C046B4C */ jal get_model_from_list_index +/* B4CFC8 80242558 46000606 */ mov.s $f24, $f0 +/* B4CFCC 8024255C 0040882D */ daddu $s1, $v0, $zero +/* B4CFD0 80242560 96220000 */ lhu $v0, ($s1) +/* B4CFD4 80242564 30420400 */ andi $v0, $v0, 0x400 +/* B4CFD8 80242568 1440001E */ bnez $v0, .L802425E4 +/* B4CFDC 8024256C 26300058 */ addiu $s0, $s1, 0x58 +/* B4CFE0 80242570 4480A000 */ mtc1 $zero, $f20 +/* B4CFE4 80242574 4406B000 */ mfc1 $a2, $f22 +/* B4CFE8 80242578 4405A000 */ mfc1 $a1, $f20 +/* B4CFEC 8024257C 4407A000 */ mfc1 $a3, $f20 +/* B4CFF0 80242580 0C019E40 */ jal guTranslateF +/* B4CFF4 80242584 0200202D */ daddu $a0, $s0, $zero +/* B4CFF8 80242588 4405E000 */ mfc1 $a1, $f28 +/* B4CFFC 8024258C 4406D000 */ mfc1 $a2, $f26 +/* B4D000 80242590 4407C000 */ mfc1 $a3, $f24 +/* B4D004 80242594 0C090914 */ jal func_80242450_B4CEC0 +/* B4D008 80242598 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D00C 8024259C 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D010 802425A0 0200282D */ daddu $a1, $s0, $zero +/* B4D014 802425A4 0C019D80 */ jal guMtxCatF +/* B4D018 802425A8 0200302D */ daddu $a2, $s0, $zero +/* B4D01C 802425AC 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D020 802425B0 4600B587 */ neg.s $f22, $f22 +/* B4D024 802425B4 4405A000 */ mfc1 $a1, $f20 +/* B4D028 802425B8 4406B000 */ mfc1 $a2, $f22 +/* B4D02C 802425BC 0C019E40 */ jal guTranslateF +/* B4D030 802425C0 00A0382D */ daddu $a3, $a1, $zero +/* B4D034 802425C4 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D038 802425C8 0200282D */ daddu $a1, $s0, $zero +/* B4D03C 802425CC 0C019D80 */ jal guMtxCatF +/* B4D040 802425D0 00A0302D */ daddu $a2, $a1, $zero +/* B4D044 802425D4 96220000 */ lhu $v0, ($s1) +/* B4D048 802425D8 34421400 */ ori $v0, $v0, 0x1400 +/* B4D04C 802425DC 08090997 */ j .L8024265C +/* B4D050 802425E0 A6220000 */ sh $v0, ($s1) +.L802425E4: +/* B4D054 802425E4 4480A000 */ mtc1 $zero, $f20 +/* B4D058 802425E8 4406B000 */ mfc1 $a2, $f22 +/* B4D05C 802425EC 4405A000 */ mfc1 $a1, $f20 +/* B4D060 802425F0 4407A000 */ mfc1 $a3, $f20 +/* B4D064 802425F4 0C019E40 */ jal guTranslateF +/* B4D068 802425F8 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D06C 802425FC 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D070 80242600 26300058 */ addiu $s0, $s1, 0x58 +/* B4D074 80242604 0200282D */ daddu $a1, $s0, $zero +/* B4D078 80242608 0C019D80 */ jal guMtxCatF +/* B4D07C 8024260C 0200302D */ daddu $a2, $s0, $zero +/* B4D080 80242610 4405E000 */ mfc1 $a1, $f28 +/* B4D084 80242614 4406D000 */ mfc1 $a2, $f26 +/* B4D088 80242618 4407C000 */ mfc1 $a3, $f24 +/* B4D08C 8024261C 0C090914 */ jal func_80242450_B4CEC0 +/* B4D090 80242620 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D094 80242624 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D098 80242628 0200282D */ daddu $a1, $s0, $zero +/* B4D09C 8024262C 0C019D80 */ jal guMtxCatF +/* B4D0A0 80242630 0200302D */ daddu $a2, $s0, $zero +/* B4D0A4 80242634 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D0A8 80242638 4600B587 */ neg.s $f22, $f22 +/* B4D0AC 8024263C 4405A000 */ mfc1 $a1, $f20 +/* B4D0B0 80242640 4406B000 */ mfc1 $a2, $f22 +/* B4D0B4 80242644 0C019E40 */ jal guTranslateF +/* B4D0B8 80242648 00A0382D */ daddu $a3, $a1, $zero +/* B4D0BC 8024264C 27A40010 */ addiu $a0, $sp, 0x10 +/* B4D0C0 80242650 0200282D */ daddu $a1, $s0, $zero +/* B4D0C4 80242654 0C019D80 */ jal guMtxCatF +/* B4D0C8 80242658 00A0302D */ daddu $a2, $a1, $zero +.L8024265C: +/* B4D0CC 8024265C 8FBF005C */ lw $ra, 0x5c($sp) +/* B4D0D0 80242660 8FB20058 */ lw $s2, 0x58($sp) +/* B4D0D4 80242664 8FB10054 */ lw $s1, 0x54($sp) +/* B4D0D8 80242668 8FB00050 */ lw $s0, 0x50($sp) +/* B4D0DC 8024266C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* B4D0E0 80242670 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* B4D0E4 80242674 D7B80070 */ ldc1 $f24, 0x70($sp) +/* B4D0E8 80242678 D7B60068 */ ldc1 $f22, 0x68($sp) +/* B4D0EC 8024267C D7B40060 */ ldc1 $f20, 0x60($sp) +/* B4D0F0 80242680 24020002 */ addiu $v0, $zero, 2 +/* B4D0F4 80242684 03E00008 */ jr $ra +/* B4D0F8 80242688 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0.s b/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0.s deleted file mode 100644 index e5aeca7001..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0.s +++ /dev/null @@ -1,91 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B0 -/* B52BE0 802403B0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B52BE4 802403B4 AFB10034 */ sw $s1, 0x34($sp) -/* B52BE8 802403B8 0080882D */ daddu $s1, $a0, $zero -/* B52BEC 802403BC AFBF0038 */ sw $ra, 0x38($sp) -/* B52BF0 802403C0 AFB00030 */ sw $s0, 0x30($sp) -/* B52BF4 802403C4 10A00016 */ beqz $a1, .L80240420 -/* B52BF8 802403C8 8E30000C */ lw $s0, 0xc($s1) -/* B52BFC 802403CC 8E050000 */ lw $a1, ($s0) -/* B52C00 802403D0 0C0B1EAF */ jal get_variable -/* B52C04 802403D4 26100004 */ addiu $s0, $s0, 4 -/* B52C08 802403D8 8E030000 */ lw $v1, ($s0) -/* B52C0C 802403DC 0040202D */ daddu $a0, $v0, $zero -/* B52C10 802403E0 0C046C04 */ jal get_model_list_index_from_tree_index -/* B52C14 802403E4 AE23007C */ sw $v1, 0x7c($s1) -/* B52C18 802403E8 0C046B4C */ jal get_model_from_list_index -/* B52C1C 802403EC 0040202D */ daddu $a0, $v0, $zero -/* B52C20 802403F0 0040802D */ daddu $s0, $v0, $zero -/* B52C24 802403F4 0000202D */ daddu $a0, $zero, $zero -/* B52C28 802403F8 AE300074 */ sw $s0, 0x74($s1) -/* B52C2C 802403FC 8E050098 */ lw $a1, 0x98($s0) -/* B52C30 80240400 8E0700A0 */ lw $a3, 0xa0($s0) -/* B52C34 80240404 0C044898 */ jal create_shadow_type -/* B52C38 80240408 0000302D */ daddu $a2, $zero, $zero -/* B52C3C 8024040C 0220202D */ daddu $a0, $s1, $zero -/* B52C40 80240410 8E25007C */ lw $a1, 0x7c($s1) -/* B52C44 80240414 0000302D */ daddu $a2, $zero, $zero -/* B52C48 80240418 0C0B2026 */ jal set_variable -/* B52C4C 8024041C AE220078 */ sw $v0, 0x78($s1) -.L80240420: -/* B52C50 80240420 8E25007C */ lw $a1, 0x7c($s1) -/* B52C54 80240424 0C0B1EAF */ jal get_variable -/* B52C58 80240428 0220202D */ daddu $a0, $s1, $zero -/* B52C5C 8024042C 1440002A */ bnez $v0, .L802404D8 -/* B52C60 80240430 00000000 */ nop -/* B52C64 80240434 8E240078 */ lw $a0, 0x78($s1) -/* B52C68 80240438 0C044181 */ jal get_shadow_by_index -/* B52C6C 8024043C 8E300074 */ lw $s0, 0x74($s1) -/* B52C70 80240440 27A40018 */ addiu $a0, $sp, 0x18 -/* B52C74 80240444 27A5001C */ addiu $a1, $sp, 0x1c -/* B52C78 80240448 27A60020 */ addiu $a2, $sp, 0x20 -/* B52C7C 8024044C 27A70024 */ addiu $a3, $sp, 0x24 -/* B52C80 80240450 27A30028 */ addiu $v1, $sp, 0x28 -/* B52C84 80240454 C6000098 */ lwc1 $f0, 0x98($s0) -/* B52C88 80240458 C602009C */ lwc1 $f2, 0x9c($s0) -/* B52C8C 8024045C C60400A0 */ lwc1 $f4, 0xa0($s0) -/* B52C90 80240460 0040802D */ daddu $s0, $v0, $zero -/* B52C94 80240464 E7A00018 */ swc1 $f0, 0x18($sp) -/* B52C98 80240468 E7A2001C */ swc1 $f2, 0x1c($sp) -/* B52C9C 8024046C E7A40020 */ swc1 $f4, 0x20($sp) -/* B52CA0 80240470 AFA30010 */ sw $v1, 0x10($sp) -/* B52CA4 80240474 27A3002C */ addiu $v1, $sp, 0x2c -/* B52CA8 80240478 0C04497A */ jal func_801125E8 -/* B52CAC 8024047C AFA30014 */ sw $v1, 0x14($sp) -/* B52CB0 80240480 8FA5002C */ lw $a1, 0x2c($sp) -/* B52CB4 80240484 0C044A17 */ jal set_standard_shadow_scale -/* B52CB8 80240488 0200202D */ daddu $a0, $s0, $zero -/* B52CBC 8024048C C7A00018 */ lwc1 $f0, 0x18($sp) -/* B52CC0 80240490 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B52CC4 80240494 C7A60020 */ lwc1 $f6, 0x20($sp) -/* B52CC8 80240498 C7A80024 */ lwc1 $f8, 0x24($sp) -/* B52CCC 8024049C C604001C */ lwc1 $f4, 0x1c($s0) -/* B52CD0 802404A0 0000102D */ daddu $v0, $zero, $zero -/* B52CD4 802404A4 AE00002C */ sw $zero, 0x2c($s0) -/* B52CD8 802404A8 E6000010 */ swc1 $f0, 0x10($s0) -/* B52CDC 802404AC C6000024 */ lwc1 $f0, 0x24($s0) -/* B52CE0 802404B0 46042100 */ add.s $f4, $f4, $f4 -/* B52CE4 802404B4 E6020014 */ swc1 $f2, 0x14($s0) -/* B52CE8 802404B8 E6060018 */ swc1 $f6, 0x18($s0) -/* B52CEC 802404BC E6080028 */ swc1 $f8, 0x28($s0) -/* B52CF0 802404C0 C7A20028 */ lwc1 $f2, 0x28($sp) -/* B52CF4 802404C4 46000000 */ add.s $f0, $f0, $f0 -/* B52CF8 802404C8 E6020030 */ swc1 $f2, 0x30($s0) -/* B52CFC 802404CC E604001C */ swc1 $f4, 0x1c($s0) -/* B52D00 802404D0 0809013A */ j .L802404E8 -/* B52D04 802404D4 E6000024 */ swc1 $f0, 0x24($s0) -.L802404D8: -/* B52D08 802404D8 8E240078 */ lw $a0, 0x78($s1) -/* B52D0C 802404DC 0C0448CA */ jal func_80112328 -/* B52D10 802404E0 00000000 */ nop -/* B52D14 802404E4 24020002 */ addiu $v0, $zero, 2 -.L802404E8: -/* B52D18 802404E8 8FBF0038 */ lw $ra, 0x38($sp) -/* B52D1C 802404EC 8FB10034 */ lw $s1, 0x34($sp) -/* B52D20 802404F0 8FB00030 */ lw $s0, 0x30($sp) -/* B52D24 802404F4 03E00008 */ jr $ra -/* B52D28 802404F8 27BD0040 */ addiu $sp, $sp, 0x40 -/* B52D2C 802404FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s b/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s new file mode 100644 index 0000000000..25470becb9 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_06/B52BE0/func_802403B0_B52BE0.s @@ -0,0 +1,91 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403B0_B52BE0 +/* B52BE0 802403B0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* B52BE4 802403B4 AFB10034 */ sw $s1, 0x34($sp) +/* B52BE8 802403B8 0080882D */ daddu $s1, $a0, $zero +/* B52BEC 802403BC AFBF0038 */ sw $ra, 0x38($sp) +/* B52BF0 802403C0 AFB00030 */ sw $s0, 0x30($sp) +/* B52BF4 802403C4 10A00016 */ beqz $a1, .L80240420 +/* B52BF8 802403C8 8E30000C */ lw $s0, 0xc($s1) +/* B52BFC 802403CC 8E050000 */ lw $a1, ($s0) +/* B52C00 802403D0 0C0B1EAF */ jal get_variable +/* B52C04 802403D4 26100004 */ addiu $s0, $s0, 4 +/* B52C08 802403D8 8E030000 */ lw $v1, ($s0) +/* B52C0C 802403DC 0040202D */ daddu $a0, $v0, $zero +/* B52C10 802403E0 0C046C04 */ jal get_model_list_index_from_tree_index +/* B52C14 802403E4 AE23007C */ sw $v1, 0x7c($s1) +/* B52C18 802403E8 0C046B4C */ jal get_model_from_list_index +/* B52C1C 802403EC 0040202D */ daddu $a0, $v0, $zero +/* B52C20 802403F0 0040802D */ daddu $s0, $v0, $zero +/* B52C24 802403F4 0000202D */ daddu $a0, $zero, $zero +/* B52C28 802403F8 AE300074 */ sw $s0, 0x74($s1) +/* B52C2C 802403FC 8E050098 */ lw $a1, 0x98($s0) +/* B52C30 80240400 8E0700A0 */ lw $a3, 0xa0($s0) +/* B52C34 80240404 0C044898 */ jal create_shadow_type +/* B52C38 80240408 0000302D */ daddu $a2, $zero, $zero +/* B52C3C 8024040C 0220202D */ daddu $a0, $s1, $zero +/* B52C40 80240410 8E25007C */ lw $a1, 0x7c($s1) +/* B52C44 80240414 0000302D */ daddu $a2, $zero, $zero +/* B52C48 80240418 0C0B2026 */ jal set_variable +/* B52C4C 8024041C AE220078 */ sw $v0, 0x78($s1) +.L80240420: +/* B52C50 80240420 8E25007C */ lw $a1, 0x7c($s1) +/* B52C54 80240424 0C0B1EAF */ jal get_variable +/* B52C58 80240428 0220202D */ daddu $a0, $s1, $zero +/* B52C5C 8024042C 1440002A */ bnez $v0, .L802404D8 +/* B52C60 80240430 00000000 */ nop +/* B52C64 80240434 8E240078 */ lw $a0, 0x78($s1) +/* B52C68 80240438 0C044181 */ jal get_shadow_by_index +/* B52C6C 8024043C 8E300074 */ lw $s0, 0x74($s1) +/* B52C70 80240440 27A40018 */ addiu $a0, $sp, 0x18 +/* B52C74 80240444 27A5001C */ addiu $a1, $sp, 0x1c +/* B52C78 80240448 27A60020 */ addiu $a2, $sp, 0x20 +/* B52C7C 8024044C 27A70024 */ addiu $a3, $sp, 0x24 +/* B52C80 80240450 27A30028 */ addiu $v1, $sp, 0x28 +/* B52C84 80240454 C6000098 */ lwc1 $f0, 0x98($s0) +/* B52C88 80240458 C602009C */ lwc1 $f2, 0x9c($s0) +/* B52C8C 8024045C C60400A0 */ lwc1 $f4, 0xa0($s0) +/* B52C90 80240460 0040802D */ daddu $s0, $v0, $zero +/* B52C94 80240464 E7A00018 */ swc1 $f0, 0x18($sp) +/* B52C98 80240468 E7A2001C */ swc1 $f2, 0x1c($sp) +/* B52C9C 8024046C E7A40020 */ swc1 $f4, 0x20($sp) +/* B52CA0 80240470 AFA30010 */ sw $v1, 0x10($sp) +/* B52CA4 80240474 27A3002C */ addiu $v1, $sp, 0x2c +/* B52CA8 80240478 0C04497A */ jal func_801125E8 +/* B52CAC 8024047C AFA30014 */ sw $v1, 0x14($sp) +/* B52CB0 80240480 8FA5002C */ lw $a1, 0x2c($sp) +/* B52CB4 80240484 0C044A17 */ jal set_standard_shadow_scale +/* B52CB8 80240488 0200202D */ daddu $a0, $s0, $zero +/* B52CBC 8024048C C7A00018 */ lwc1 $f0, 0x18($sp) +/* B52CC0 80240490 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* B52CC4 80240494 C7A60020 */ lwc1 $f6, 0x20($sp) +/* B52CC8 80240498 C7A80024 */ lwc1 $f8, 0x24($sp) +/* B52CCC 8024049C C604001C */ lwc1 $f4, 0x1c($s0) +/* B52CD0 802404A0 0000102D */ daddu $v0, $zero, $zero +/* B52CD4 802404A4 AE00002C */ sw $zero, 0x2c($s0) +/* B52CD8 802404A8 E6000010 */ swc1 $f0, 0x10($s0) +/* B52CDC 802404AC C6000024 */ lwc1 $f0, 0x24($s0) +/* B52CE0 802404B0 46042100 */ add.s $f4, $f4, $f4 +/* B52CE4 802404B4 E6020014 */ swc1 $f2, 0x14($s0) +/* B52CE8 802404B8 E6060018 */ swc1 $f6, 0x18($s0) +/* B52CEC 802404BC E6080028 */ swc1 $f8, 0x28($s0) +/* B52CF0 802404C0 C7A20028 */ lwc1 $f2, 0x28($sp) +/* B52CF4 802404C4 46000000 */ add.s $f0, $f0, $f0 +/* B52CF8 802404C8 E6020030 */ swc1 $f2, 0x30($s0) +/* B52CFC 802404CC E604001C */ swc1 $f4, 0x1c($s0) +/* B52D00 802404D0 0809013A */ j .L802404E8 +/* B52D04 802404D4 E6000024 */ swc1 $f0, 0x24($s0) +.L802404D8: +/* B52D08 802404D8 8E240078 */ lw $a0, 0x78($s1) +/* B52D0C 802404DC 0C0448CA */ jal func_80112328 +/* B52D10 802404E0 00000000 */ nop +/* B52D14 802404E4 24020002 */ addiu $v0, $zero, 2 +.L802404E8: +/* B52D18 802404E8 8FBF0038 */ lw $ra, 0x38($sp) +/* B52D1C 802404EC 8FB10034 */ lw $s1, 0x34($sp) +/* B52D20 802404F0 8FB00030 */ lw $s0, 0x30($sp) +/* B52D24 802404F4 03E00008 */ jr $ra +/* B52D28 802404F8 27BD0040 */ addiu $sp, $sp, 0x40 +/* B52D2C 802404FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52D30/func_80240570_B52DA0.s b/asm/nonmatchings/world/area_jan/jan_06/B52D30/func_80240570_B52DA0.s index 864a5d78db..efc285dacc 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52D30/func_80240570_B52DA0.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52D30/func_80240570_B52DA0.s @@ -55,7 +55,7 @@ glabel func_80240570_B52DA0 /* B52E68 80240638 4405E000 */ mfc1 $a1, $f28 /* B52E6C 8024063C 4406D000 */ mfc1 $a2, $f26 /* B52E70 80240640 4407C000 */ mfc1 $a3, $f24 -/* B52E74 80240644 0C090140 */ jal func_80240500 +/* B52E74 80240644 0C090140 */ jal func_80240500_B52D30 /* B52E78 80240648 27A40010 */ addiu $a0, $sp, 0x10 /* B52E7C 8024064C 27A40010 */ addiu $a0, $sp, 0x10 /* B52E80 80240650 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240570_B52DA0 /* B52EF0 802406C0 4405E000 */ mfc1 $a1, $f28 /* B52EF4 802406C4 4406D000 */ mfc1 $a2, $f26 /* B52EF8 802406C8 4407C000 */ mfc1 $a3, $f24 -/* B52EFC 802406CC 0C090140 */ jal func_80240500 +/* B52EFC 802406CC 0C090140 */ jal func_80240500_B52D30 /* B52F00 802406D0 27A40010 */ addiu $a0, $sp, 0x10 /* B52F04 802406D4 27A40010 */ addiu $a0, $sp, 0x10 /* B52F08 802406D8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740.s deleted file mode 100644 index bcc471a3d6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240740 -/* B52F70 80240740 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B52F74 80240744 AFB00030 */ sw $s0, 0x30($sp) -/* B52F78 80240748 0080802D */ daddu $s0, $a0, $zero -/* B52F7C 8024074C AFBF0040 */ sw $ra, 0x40($sp) -/* B52F80 80240750 AFB3003C */ sw $s3, 0x3c($sp) -/* B52F84 80240754 AFB20038 */ sw $s2, 0x38($sp) -/* B52F88 80240758 AFB10034 */ sw $s1, 0x34($sp) -/* B52F8C 8024075C F7B60050 */ sdc1 $f22, 0x50($sp) -/* B52F90 80240760 F7B40048 */ sdc1 $f20, 0x48($sp) -/* B52F94 80240764 8E130148 */ lw $s3, 0x148($s0) -/* B52F98 80240768 00A0882D */ daddu $s1, $a1, $zero -/* B52F9C 8024076C 86640008 */ lh $a0, 8($s3) -/* B52FA0 80240770 0C00EABB */ jal get_npc_unsafe -/* B52FA4 80240774 00C0902D */ daddu $s2, $a2, $zero -/* B52FA8 80240778 0200202D */ daddu $a0, $s0, $zero -/* B52FAC 8024077C 0220282D */ daddu $a1, $s1, $zero -/* B52FB0 80240780 0240302D */ daddu $a2, $s2, $zero -/* B52FB4 80240784 0C012568 */ jal func_800495A0 -/* B52FB8 80240788 0040802D */ daddu $s0, $v0, $zero -/* B52FBC 8024078C 8E020000 */ lw $v0, ($s0) -/* B52FC0 80240790 2404002D */ addiu $a0, $zero, 0x2d -/* B52FC4 80240794 34420800 */ ori $v0, $v0, 0x800 -/* B52FC8 80240798 0C00A67F */ jal rand_int -/* B52FCC 8024079C AE020000 */ sw $v0, ($s0) -/* B52FD0 802407A0 0200202D */ daddu $a0, $s0, $zero -/* B52FD4 802407A4 3C05B000 */ lui $a1, 0xb000 -/* B52FD8 802407A8 34A50017 */ ori $a1, $a1, 0x17 -/* B52FDC 802407AC 44820000 */ mtc1 $v0, $f0 -/* B52FE0 802407B0 00000000 */ nop -/* B52FE4 802407B4 46800021 */ cvt.d.w $f0, $f0 -/* B52FE8 802407B8 3C014024 */ lui $at, 0x4024 -/* B52FEC 802407BC 44811800 */ mtc1 $at, $f3 -/* B52FF0 802407C0 44801000 */ mtc1 $zero, $f2 -/* B52FF4 802407C4 3C014020 */ lui $at, 0x4020 -/* B52FF8 802407C8 44812800 */ mtc1 $at, $f5 -/* B52FFC 802407CC 44802000 */ mtc1 $zero, $f4 -/* B53000 802407D0 46220003 */ div.d $f0, $f0, $f2 -/* B53004 802407D4 46240000 */ add.d $f0, $f0, $f4 -/* B53008 802407D8 3C013FC0 */ lui $at, 0x3fc0 -/* B5300C 802407DC 44811000 */ mtc1 $at, $f2 -/* B53010 802407E0 0000302D */ daddu $a2, $zero, $zero -/* B53014 802407E4 E6020014 */ swc1 $f2, 0x14($s0) -/* B53018 802407E8 46200020 */ cvt.s.d $f0, $f0 -/* B5301C 802407EC 0C012530 */ jal func_800494C0 -/* B53020 802407F0 E600001C */ swc1 $f0, 0x1c($s0) -/* B53024 802407F4 8E6300D0 */ lw $v1, 0xd0($s3) -/* B53028 802407F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B5302C 802407FC C4620000 */ lwc1 $f2, ($v1) -/* B53030 80240800 468010A0 */ cvt.s.w $f2, $f2 -/* B53034 80240804 C4640008 */ lwc1 $f4, 8($v1) -/* B53038 80240808 46802120 */ cvt.s.w $f4, $f4 -/* B5303C 8024080C E7A00010 */ swc1 $f0, 0x10($sp) -/* B53040 80240810 8E6200D0 */ lw $v0, 0xd0($s3) -/* B53044 80240814 44051000 */ mfc1 $a1, $f2 -/* B53048 80240818 C440000C */ lwc1 $f0, 0xc($v0) -/* B5304C 8024081C 46800020 */ cvt.s.w $f0, $f0 -/* B53050 80240820 E7A00014 */ swc1 $f0, 0x14($sp) -/* B53054 80240824 8E6200D0 */ lw $v0, 0xd0($s3) -/* B53058 80240828 44062000 */ mfc1 $a2, $f4 -/* B5305C 8024082C C4400010 */ lwc1 $f0, 0x10($v0) -/* B53060 80240830 46800020 */ cvt.s.w $f0, $f0 -/* B53064 80240834 E7A00018 */ swc1 $f0, 0x18($sp) -/* B53068 80240838 8C640018 */ lw $a0, 0x18($v1) -/* B5306C 8024083C 0C0123F5 */ jal is_point_within_region -/* B53070 80240840 8E070038 */ lw $a3, 0x38($s0) -/* B53074 80240844 10400035 */ beqz $v0, .L8024091C -/* B53078 80240848 00000000 */ nop -/* B5307C 8024084C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B53080 80240850 3C0141C8 */ lui $at, 0x41c8 -/* B53084 80240854 4481B000 */ mtc1 $at, $f22 -/* B53088 80240858 8E6200D0 */ lw $v0, 0xd0($s3) -/* B5308C 8024085C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B53090 80240860 C4480000 */ lwc1 $f8, ($v0) -/* B53094 80240864 46804220 */ cvt.s.w $f8, $f8 -/* B53098 80240868 44064000 */ mfc1 $a2, $f8 -/* B5309C 8024086C C4480008 */ lwc1 $f8, 8($v0) -/* B530A0 80240870 46804220 */ cvt.s.w $f8, $f8 -/* B530A4 80240874 44074000 */ mfc1 $a3, $f8 -/* B530A8 80240878 3C01403E */ lui $at, 0x403e -/* B530AC 8024087C 4481A800 */ mtc1 $at, $f21 -/* B530B0 80240880 4480A000 */ mtc1 $zero, $f20 -/* B530B4 80240884 0C00A720 */ jal atan2 -/* B530B8 80240888 0000882D */ daddu $s1, $zero, $zero -/* B530BC 8024088C C6020038 */ lwc1 $f2, 0x38($s0) -/* B530C0 80240890 C604003C */ lwc1 $f4, 0x3c($s0) -/* B530C4 80240894 C6060040 */ lwc1 $f6, 0x40($s0) -/* B530C8 80240898 E600000C */ swc1 $f0, 0xc($s0) -/* B530CC 8024089C E7A20020 */ swc1 $f2, 0x20($sp) -/* B530D0 802408A0 E7A40024 */ swc1 $f4, 0x24($sp) -/* B530D4 802408A4 E7A60028 */ swc1 $f6, 0x28($sp) -.L802408A8: -/* B530D8 802408A8 E7B60010 */ swc1 $f22, 0x10($sp) -/* B530DC 802408AC C600000C */ lwc1 $f0, 0xc($s0) -/* B530E0 802408B0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B530E4 802408B4 860200A8 */ lh $v0, 0xa8($s0) -/* B530E8 802408B8 27A50020 */ addiu $a1, $sp, 0x20 -/* B530EC 802408BC 44820000 */ mtc1 $v0, $f0 -/* B530F0 802408C0 00000000 */ nop -/* B530F4 802408C4 46800020 */ cvt.s.w $f0, $f0 -/* B530F8 802408C8 E7A00018 */ swc1 $f0, 0x18($sp) -/* B530FC 802408CC 860200A6 */ lh $v0, 0xa6($s0) -/* B53100 802408D0 27A60024 */ addiu $a2, $sp, 0x24 -/* B53104 802408D4 44820000 */ mtc1 $v0, $f0 -/* B53108 802408D8 00000000 */ nop -/* B5310C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* B53110 802408E0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B53114 802408E4 8E040080 */ lw $a0, 0x80($s0) -/* B53118 802408E8 0C037711 */ jal func_800DDC44 -/* B5311C 802408EC 27A70028 */ addiu $a3, $sp, 0x28 -/* B53120 802408F0 10400016 */ beqz $v0, .L8024094C -/* B53124 802408F4 26310001 */ addiu $s1, $s1, 1 -/* B53128 802408F8 C600000C */ lwc1 $f0, 0xc($s0) -/* B5312C 802408FC 46000021 */ cvt.d.s $f0, $f0 -/* B53130 80240900 46340000 */ add.d $f0, $f0, $f20 -/* B53134 80240904 2A220006 */ slti $v0, $s1, 6 -/* B53138 80240908 46200020 */ cvt.s.d $f0, $f0 -/* B5313C 8024090C 1440FFE6 */ bnez $v0, .L802408A8 -/* B53140 80240910 E600000C */ swc1 $f0, 0xc($s0) -/* B53144 80240914 08090253 */ j .L8024094C -/* B53148 80240918 00000000 */ nop -.L8024091C: -/* B5314C 8024091C 0C00A67F */ jal rand_int -/* B53150 80240920 2404003C */ addiu $a0, $zero, 0x3c -/* B53154 80240924 C60C000C */ lwc1 $f12, 0xc($s0) -/* B53158 80240928 44820000 */ mtc1 $v0, $f0 -/* B5315C 8024092C 00000000 */ nop -/* B53160 80240930 46800020 */ cvt.s.w $f0, $f0 -/* B53164 80240934 46006300 */ add.s $f12, $f12, $f0 -/* B53168 80240938 3C0141F0 */ lui $at, 0x41f0 -/* B5316C 8024093C 44810000 */ mtc1 $at, $f0 -/* B53170 80240940 0C00A6C9 */ jal clamp_angle -/* B53174 80240944 46006301 */ sub.s $f12, $f12, $f0 -/* B53178 80240948 E600000C */ swc1 $f0, 0xc($s0) -.L8024094C: -/* B5317C 8024094C 8FBF0040 */ lw $ra, 0x40($sp) -/* B53180 80240950 8FB3003C */ lw $s3, 0x3c($sp) -/* B53184 80240954 8FB20038 */ lw $s2, 0x38($sp) -/* B53188 80240958 8FB10034 */ lw $s1, 0x34($sp) -/* B5318C 8024095C 8FB00030 */ lw $s0, 0x30($sp) -/* B53190 80240960 D7B60050 */ ldc1 $f22, 0x50($sp) -/* B53194 80240964 D7B40048 */ ldc1 $f20, 0x48($sp) -/* B53198 80240968 03E00008 */ jr $ra -/* B5319C 8024096C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s new file mode 100644 index 0000000000..a8f41bb63b --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80240740_B52F70.s @@ -0,0 +1,147 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240740_B52F70 +/* B52F70 80240740 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* B52F74 80240744 AFB00030 */ sw $s0, 0x30($sp) +/* B52F78 80240748 0080802D */ daddu $s0, $a0, $zero +/* B52F7C 8024074C AFBF0040 */ sw $ra, 0x40($sp) +/* B52F80 80240750 AFB3003C */ sw $s3, 0x3c($sp) +/* B52F84 80240754 AFB20038 */ sw $s2, 0x38($sp) +/* B52F88 80240758 AFB10034 */ sw $s1, 0x34($sp) +/* B52F8C 8024075C F7B60050 */ sdc1 $f22, 0x50($sp) +/* B52F90 80240760 F7B40048 */ sdc1 $f20, 0x48($sp) +/* B52F94 80240764 8E130148 */ lw $s3, 0x148($s0) +/* B52F98 80240768 00A0882D */ daddu $s1, $a1, $zero +/* B52F9C 8024076C 86640008 */ lh $a0, 8($s3) +/* B52FA0 80240770 0C00EABB */ jal get_npc_unsafe +/* B52FA4 80240774 00C0902D */ daddu $s2, $a2, $zero +/* B52FA8 80240778 0200202D */ daddu $a0, $s0, $zero +/* B52FAC 8024077C 0220282D */ daddu $a1, $s1, $zero +/* B52FB0 80240780 0240302D */ daddu $a2, $s2, $zero +/* B52FB4 80240784 0C012568 */ jal func_800495A0 +/* B52FB8 80240788 0040802D */ daddu $s0, $v0, $zero +/* B52FBC 8024078C 8E020000 */ lw $v0, ($s0) +/* B52FC0 80240790 2404002D */ addiu $a0, $zero, 0x2d +/* B52FC4 80240794 34420800 */ ori $v0, $v0, 0x800 +/* B52FC8 80240798 0C00A67F */ jal rand_int +/* B52FCC 8024079C AE020000 */ sw $v0, ($s0) +/* B52FD0 802407A0 0200202D */ daddu $a0, $s0, $zero +/* B52FD4 802407A4 3C05B000 */ lui $a1, 0xb000 +/* B52FD8 802407A8 34A50017 */ ori $a1, $a1, 0x17 +/* B52FDC 802407AC 44820000 */ mtc1 $v0, $f0 +/* B52FE0 802407B0 00000000 */ nop +/* B52FE4 802407B4 46800021 */ cvt.d.w $f0, $f0 +/* B52FE8 802407B8 3C014024 */ lui $at, 0x4024 +/* B52FEC 802407BC 44811800 */ mtc1 $at, $f3 +/* B52FF0 802407C0 44801000 */ mtc1 $zero, $f2 +/* B52FF4 802407C4 3C014020 */ lui $at, 0x4020 +/* B52FF8 802407C8 44812800 */ mtc1 $at, $f5 +/* B52FFC 802407CC 44802000 */ mtc1 $zero, $f4 +/* B53000 802407D0 46220003 */ div.d $f0, $f0, $f2 +/* B53004 802407D4 46240000 */ add.d $f0, $f0, $f4 +/* B53008 802407D8 3C013FC0 */ lui $at, 0x3fc0 +/* B5300C 802407DC 44811000 */ mtc1 $at, $f2 +/* B53010 802407E0 0000302D */ daddu $a2, $zero, $zero +/* B53014 802407E4 E6020014 */ swc1 $f2, 0x14($s0) +/* B53018 802407E8 46200020 */ cvt.s.d $f0, $f0 +/* B5301C 802407EC 0C012530 */ jal func_800494C0 +/* B53020 802407F0 E600001C */ swc1 $f0, 0x1c($s0) +/* B53024 802407F4 8E6300D0 */ lw $v1, 0xd0($s3) +/* B53028 802407F8 C6000040 */ lwc1 $f0, 0x40($s0) +/* B5302C 802407FC C4620000 */ lwc1 $f2, ($v1) +/* B53030 80240800 468010A0 */ cvt.s.w $f2, $f2 +/* B53034 80240804 C4640008 */ lwc1 $f4, 8($v1) +/* B53038 80240808 46802120 */ cvt.s.w $f4, $f4 +/* B5303C 8024080C E7A00010 */ swc1 $f0, 0x10($sp) +/* B53040 80240810 8E6200D0 */ lw $v0, 0xd0($s3) +/* B53044 80240814 44051000 */ mfc1 $a1, $f2 +/* B53048 80240818 C440000C */ lwc1 $f0, 0xc($v0) +/* B5304C 8024081C 46800020 */ cvt.s.w $f0, $f0 +/* B53050 80240820 E7A00014 */ swc1 $f0, 0x14($sp) +/* B53054 80240824 8E6200D0 */ lw $v0, 0xd0($s3) +/* B53058 80240828 44062000 */ mfc1 $a2, $f4 +/* B5305C 8024082C C4400010 */ lwc1 $f0, 0x10($v0) +/* B53060 80240830 46800020 */ cvt.s.w $f0, $f0 +/* B53064 80240834 E7A00018 */ swc1 $f0, 0x18($sp) +/* B53068 80240838 8C640018 */ lw $a0, 0x18($v1) +/* B5306C 8024083C 0C0123F5 */ jal is_point_within_region +/* B53070 80240840 8E070038 */ lw $a3, 0x38($s0) +/* B53074 80240844 10400035 */ beqz $v0, .L8024091C +/* B53078 80240848 00000000 */ nop +/* B5307C 8024084C C60C0038 */ lwc1 $f12, 0x38($s0) +/* B53080 80240850 3C0141C8 */ lui $at, 0x41c8 +/* B53084 80240854 4481B000 */ mtc1 $at, $f22 +/* B53088 80240858 8E6200D0 */ lw $v0, 0xd0($s3) +/* B5308C 8024085C C60E0040 */ lwc1 $f14, 0x40($s0) +/* B53090 80240860 C4480000 */ lwc1 $f8, ($v0) +/* B53094 80240864 46804220 */ cvt.s.w $f8, $f8 +/* B53098 80240868 44064000 */ mfc1 $a2, $f8 +/* B5309C 8024086C C4480008 */ lwc1 $f8, 8($v0) +/* B530A0 80240870 46804220 */ cvt.s.w $f8, $f8 +/* B530A4 80240874 44074000 */ mfc1 $a3, $f8 +/* B530A8 80240878 3C01403E */ lui $at, 0x403e +/* B530AC 8024087C 4481A800 */ mtc1 $at, $f21 +/* B530B0 80240880 4480A000 */ mtc1 $zero, $f20 +/* B530B4 80240884 0C00A720 */ jal atan2 +/* B530B8 80240888 0000882D */ daddu $s1, $zero, $zero +/* B530BC 8024088C C6020038 */ lwc1 $f2, 0x38($s0) +/* B530C0 80240890 C604003C */ lwc1 $f4, 0x3c($s0) +/* B530C4 80240894 C6060040 */ lwc1 $f6, 0x40($s0) +/* B530C8 80240898 E600000C */ swc1 $f0, 0xc($s0) +/* B530CC 8024089C E7A20020 */ swc1 $f2, 0x20($sp) +/* B530D0 802408A0 E7A40024 */ swc1 $f4, 0x24($sp) +/* B530D4 802408A4 E7A60028 */ swc1 $f6, 0x28($sp) +.L802408A8: +/* B530D8 802408A8 E7B60010 */ swc1 $f22, 0x10($sp) +/* B530DC 802408AC C600000C */ lwc1 $f0, 0xc($s0) +/* B530E0 802408B0 E7A00014 */ swc1 $f0, 0x14($sp) +/* B530E4 802408B4 860200A8 */ lh $v0, 0xa8($s0) +/* B530E8 802408B8 27A50020 */ addiu $a1, $sp, 0x20 +/* B530EC 802408BC 44820000 */ mtc1 $v0, $f0 +/* B530F0 802408C0 00000000 */ nop +/* B530F4 802408C4 46800020 */ cvt.s.w $f0, $f0 +/* B530F8 802408C8 E7A00018 */ swc1 $f0, 0x18($sp) +/* B530FC 802408CC 860200A6 */ lh $v0, 0xa6($s0) +/* B53100 802408D0 27A60024 */ addiu $a2, $sp, 0x24 +/* B53104 802408D4 44820000 */ mtc1 $v0, $f0 +/* B53108 802408D8 00000000 */ nop +/* B5310C 802408DC 46800020 */ cvt.s.w $f0, $f0 +/* B53110 802408E0 E7A0001C */ swc1 $f0, 0x1c($sp) +/* B53114 802408E4 8E040080 */ lw $a0, 0x80($s0) +/* B53118 802408E8 0C037711 */ jal func_800DDC44 +/* B5311C 802408EC 27A70028 */ addiu $a3, $sp, 0x28 +/* B53120 802408F0 10400016 */ beqz $v0, .L8024094C +/* B53124 802408F4 26310001 */ addiu $s1, $s1, 1 +/* B53128 802408F8 C600000C */ lwc1 $f0, 0xc($s0) +/* B5312C 802408FC 46000021 */ cvt.d.s $f0, $f0 +/* B53130 80240900 46340000 */ add.d $f0, $f0, $f20 +/* B53134 80240904 2A220006 */ slti $v0, $s1, 6 +/* B53138 80240908 46200020 */ cvt.s.d $f0, $f0 +/* B5313C 8024090C 1440FFE6 */ bnez $v0, .L802408A8 +/* B53140 80240910 E600000C */ swc1 $f0, 0xc($s0) +/* B53144 80240914 08090253 */ j .L8024094C +/* B53148 80240918 00000000 */ nop +.L8024091C: +/* B5314C 8024091C 0C00A67F */ jal rand_int +/* B53150 80240920 2404003C */ addiu $a0, $zero, 0x3c +/* B53154 80240924 C60C000C */ lwc1 $f12, 0xc($s0) +/* B53158 80240928 44820000 */ mtc1 $v0, $f0 +/* B5315C 8024092C 00000000 */ nop +/* B53160 80240930 46800020 */ cvt.s.w $f0, $f0 +/* B53164 80240934 46006300 */ add.s $f12, $f12, $f0 +/* B53168 80240938 3C0141F0 */ lui $at, 0x41f0 +/* B5316C 8024093C 44810000 */ mtc1 $at, $f0 +/* B53170 80240940 0C00A6C9 */ jal clamp_angle +/* B53174 80240944 46006301 */ sub.s $f12, $f12, $f0 +/* B53178 80240948 E600000C */ swc1 $f0, 0xc($s0) +.L8024094C: +/* B5317C 8024094C 8FBF0040 */ lw $ra, 0x40($sp) +/* B53180 80240950 8FB3003C */ lw $s3, 0x3c($sp) +/* B53184 80240954 8FB20038 */ lw $s2, 0x38($sp) +/* B53188 80240958 8FB10034 */ lw $s1, 0x34($sp) +/* B5318C 8024095C 8FB00030 */ lw $s0, 0x30($sp) +/* B53190 80240960 D7B60050 */ ldc1 $f22, 0x50($sp) +/* B53194 80240964 D7B40048 */ ldc1 $f20, 0x48($sp) +/* B53198 80240968 03E00008 */ jr $ra +/* B5319C 8024096C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC.s deleted file mode 100644 index 467c0dfd08..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412EC -/* B53B1C 802412EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B53B20 802412F0 AFB00010 */ sw $s0, 0x10($sp) -/* B53B24 802412F4 0080802D */ daddu $s0, $a0, $zero -/* B53B28 802412F8 AFBF0014 */ sw $ra, 0x14($sp) -/* B53B2C 802412FC 8E020148 */ lw $v0, 0x148($s0) -/* B53B30 80241300 0C00EABB */ jal get_npc_unsafe -/* B53B34 80241304 84440008 */ lh $a0, 8($v0) -/* B53B38 80241308 9443008E */ lhu $v1, 0x8e($v0) -/* B53B3C 8024130C 2463FFFF */ addiu $v1, $v1, -1 -/* B53B40 80241310 A443008E */ sh $v1, 0x8e($v0) -/* B53B44 80241314 00031C00 */ sll $v1, $v1, 0x10 -/* B53B48 80241318 58600001 */ blezl $v1, .L80241320 -/* B53B4C 8024131C AE000070 */ sw $zero, 0x70($s0) -.L80241320: -/* B53B50 80241320 8FBF0014 */ lw $ra, 0x14($sp) -/* B53B54 80241324 8FB00010 */ lw $s0, 0x10($sp) -/* B53B58 80241328 03E00008 */ jr $ra -/* B53B5C 8024132C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s new file mode 100644 index 0000000000..0a7c246729 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802412EC_B53B1C.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412EC_B53B1C +/* B53B1C 802412EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B53B20 802412F0 AFB00010 */ sw $s0, 0x10($sp) +/* B53B24 802412F4 0080802D */ daddu $s0, $a0, $zero +/* B53B28 802412F8 AFBF0014 */ sw $ra, 0x14($sp) +/* B53B2C 802412FC 8E020148 */ lw $v0, 0x148($s0) +/* B53B30 80241300 0C00EABB */ jal get_npc_unsafe +/* B53B34 80241304 84440008 */ lh $a0, 8($v0) +/* B53B38 80241308 9443008E */ lhu $v1, 0x8e($v0) +/* B53B3C 8024130C 2463FFFF */ addiu $v1, $v1, -1 +/* B53B40 80241310 A443008E */ sh $v1, 0x8e($v0) +/* B53B44 80241314 00031C00 */ sll $v1, $v1, 0x10 +/* B53B48 80241318 58600001 */ blezl $v1, .L80241320 +/* B53B4C 8024131C AE000070 */ sw $zero, 0x70($s0) +.L80241320: +/* B53B50 80241320 8FBF0014 */ lw $ra, 0x14($sp) +/* B53B54 80241324 8FB00010 */ lw $s0, 0x10($sp) +/* B53B58 80241328 03E00008 */ jr $ra +/* B53B5C 8024132C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s index 6ded4b1c9e..cdeeae10d7 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241330_B53B60.s @@ -95,17 +95,17 @@ glabel func_80241330_B53B60 /* B53CC0 80241490 00000000 */ nop /* B53CC4 80241494 0260202D */ daddu $a0, $s3, $zero /* B53CC8 80241498 0280282D */ daddu $a1, $s4, $zero -/* B53CCC 8024149C 0C0901D0 */ jal func_80240740 +/* B53CCC 8024149C 0C0901D0 */ jal func_80240740_B52F70 /* B53CD0 802414A0 0200302D */ daddu $a2, $s0, $zero /* B53CD4 802414A4 0260202D */ daddu $a0, $s3, $zero /* B53CD8 802414A8 0280282D */ daddu $a1, $s4, $zero -/* B53CDC 802414AC 0C09025C */ jal func_80240970 +/* B53CDC 802414AC 0C09025C */ jal func_80240970_B531A0 /* B53CE0 802414B0 0200302D */ daddu $a2, $s0, $zero /* B53CE4 802414B4 0809054C */ j .L80241530 /* B53CE8 802414B8 0000102D */ daddu $v0, $zero, $zero /* B53CEC 802414BC 0260202D */ daddu $a0, $s3, $zero /* B53CF0 802414C0 0280282D */ daddu $a1, $s4, $zero -/* B53CF4 802414C4 0C09032A */ jal func_80240CA8 +/* B53CF4 802414C4 0C09032A */ jal func_80240CA8_B534D8 /* B53CF8 802414C8 0200302D */ daddu $a2, $s0, $zero /* B53CFC 802414CC 8E630070 */ lw $v1, 0x70($s3) /* B53D00 802414D0 24020003 */ addiu $v0, $zero, 3 @@ -119,17 +119,17 @@ glabel func_80241330_B53B60 /* B53D20 802414F0 0000102D */ daddu $v0, $zero, $zero /* B53D24 802414F4 0260202D */ daddu $a0, $s3, $zero /* B53D28 802414F8 0280282D */ daddu $a1, $s4, $zero -/* B53D2C 802414FC 0C0903C3 */ jal func_80240F0C +/* B53D2C 802414FC 0C0903C3 */ jal func_80240F0C_B5373C /* B53D30 80241500 0200302D */ daddu $a2, $s0, $zero /* B53D34 80241504 0260202D */ daddu $a0, $s3, $zero /* B53D38 80241508 0280282D */ daddu $a1, $s4, $zero -/* B53D3C 8024150C 0C0903FB */ jal func_80240FEC +/* B53D3C 8024150C 0C0903FB */ jal func_80240FEC_B5381C /* B53D40 80241510 0200302D */ daddu $a2, $s0, $zero /* B53D44 80241514 0809054C */ j .L80241530 /* B53D48 80241518 0000102D */ daddu $v0, $zero, $zero /* B53D4C 8024151C 0260202D */ daddu $a0, $s3, $zero /* B53D50 80241520 0280282D */ daddu $a1, $s4, $zero -/* B53D54 80241524 0C0904BB */ jal func_802412EC +/* B53D54 80241524 0C0904BB */ jal func_802412EC_B53B1C /* B53D58 80241528 0200302D */ daddu $a2, $s0, $zero .L8024152C: /* B53D5C 8024152C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8.s deleted file mode 100644 index c4b5cbf082..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418F8 -/* B54128 802418F8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B5412C 802418FC AFB10034 */ sw $s1, 0x34($sp) -/* B54130 80241900 0080882D */ daddu $s1, $a0, $zero -/* B54134 80241904 AFBF0038 */ sw $ra, 0x38($sp) -/* B54138 80241908 AFB00030 */ sw $s0, 0x30($sp) -/* B5413C 8024190C 8E300148 */ lw $s0, 0x148($s1) -/* B54140 80241910 0C00EABB */ jal get_npc_unsafe -/* B54144 80241914 86040008 */ lh $a0, 8($s0) -/* B54148 80241918 0040282D */ daddu $a1, $v0, $zero -/* B5414C 8024191C 94A2008E */ lhu $v0, 0x8e($a1) -/* B54150 80241920 2442FFFF */ addiu $v0, $v0, -1 -/* B54154 80241924 A4A2008E */ sh $v0, 0x8e($a1) -/* B54158 80241928 00021400 */ sll $v0, $v0, 0x10 -/* B5415C 8024192C 1C400023 */ bgtz $v0, .L802419BC -/* B54160 80241930 24020004 */ addiu $v0, $zero, 4 -/* B54164 80241934 8E0300CC */ lw $v1, 0xcc($s0) -/* B54168 80241938 AE02006C */ sw $v0, 0x6c($s0) -/* B5416C 8024193C 8C620000 */ lw $v0, ($v1) -/* B54170 80241940 ACA20028 */ sw $v0, 0x28($a1) -/* B54174 80241944 9602007A */ lhu $v0, 0x7a($s0) -/* B54178 80241948 A4A2008E */ sh $v0, 0x8e($a1) -/* B5417C 8024194C 8E020078 */ lw $v0, 0x78($s0) -/* B54180 80241950 28420008 */ slti $v0, $v0, 8 -/* B54184 80241954 14400018 */ bnez $v0, .L802419B8 -/* B54188 80241958 24020021 */ addiu $v0, $zero, 0x21 -/* B5418C 8024195C 24040003 */ addiu $a0, $zero, 3 -/* B54190 80241960 27A30028 */ addiu $v1, $sp, 0x28 -/* B54194 80241964 84A700A8 */ lh $a3, 0xa8($a1) -/* B54198 80241968 3C013F80 */ lui $at, 0x3f80 -/* B5419C 8024196C 44810000 */ mtc1 $at, $f0 -/* B541A0 80241970 3C014000 */ lui $at, 0x4000 -/* B541A4 80241974 44811000 */ mtc1 $at, $f2 -/* B541A8 80241978 3C01C1A0 */ lui $at, 0xc1a0 -/* B541AC 8024197C 44812000 */ mtc1 $at, $f4 -/* B541B0 80241980 44873000 */ mtc1 $a3, $f6 -/* B541B4 80241984 00000000 */ nop -/* B541B8 80241988 468031A0 */ cvt.s.w $f6, $f6 -/* B541BC 8024198C E7A00010 */ swc1 $f0, 0x10($sp) -/* B541C0 80241990 E7A20014 */ swc1 $f2, 0x14($sp) -/* B541C4 80241994 E7A40018 */ swc1 $f4, 0x18($sp) -/* B541C8 80241998 8E020078 */ lw $v0, 0x78($s0) -/* B541CC 8024199C 44073000 */ mfc1 $a3, $f6 -/* B541D0 802419A0 0000302D */ daddu $a2, $zero, $zero -/* B541D4 802419A4 AFA30020 */ sw $v1, 0x20($sp) -/* B541D8 802419A8 2442FFFF */ addiu $v0, $v0, -1 -/* B541DC 802419AC 0C01BFA4 */ jal fx_emote -/* B541E0 802419B0 AFA2001C */ sw $v0, 0x1c($sp) -/* B541E4 802419B4 24020021 */ addiu $v0, $zero, 0x21 -.L802419B8: -/* B541E8 802419B8 AE220070 */ sw $v0, 0x70($s1) -.L802419BC: -/* B541EC 802419BC 8FBF0038 */ lw $ra, 0x38($sp) -/* B541F0 802419C0 8FB10034 */ lw $s1, 0x34($sp) -/* B541F4 802419C4 8FB00030 */ lw $s0, 0x30($sp) -/* B541F8 802419C8 03E00008 */ jr $ra -/* B541FC 802419CC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s new file mode 100644 index 0000000000..7a089b3bd7 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802418F8_B54128.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418F8_B54128 +/* B54128 802418F8 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* B5412C 802418FC AFB10034 */ sw $s1, 0x34($sp) +/* B54130 80241900 0080882D */ daddu $s1, $a0, $zero +/* B54134 80241904 AFBF0038 */ sw $ra, 0x38($sp) +/* B54138 80241908 AFB00030 */ sw $s0, 0x30($sp) +/* B5413C 8024190C 8E300148 */ lw $s0, 0x148($s1) +/* B54140 80241910 0C00EABB */ jal get_npc_unsafe +/* B54144 80241914 86040008 */ lh $a0, 8($s0) +/* B54148 80241918 0040282D */ daddu $a1, $v0, $zero +/* B5414C 8024191C 94A2008E */ lhu $v0, 0x8e($a1) +/* B54150 80241920 2442FFFF */ addiu $v0, $v0, -1 +/* B54154 80241924 A4A2008E */ sh $v0, 0x8e($a1) +/* B54158 80241928 00021400 */ sll $v0, $v0, 0x10 +/* B5415C 8024192C 1C400023 */ bgtz $v0, .L802419BC +/* B54160 80241930 24020004 */ addiu $v0, $zero, 4 +/* B54164 80241934 8E0300CC */ lw $v1, 0xcc($s0) +/* B54168 80241938 AE02006C */ sw $v0, 0x6c($s0) +/* B5416C 8024193C 8C620000 */ lw $v0, ($v1) +/* B54170 80241940 ACA20028 */ sw $v0, 0x28($a1) +/* B54174 80241944 9602007A */ lhu $v0, 0x7a($s0) +/* B54178 80241948 A4A2008E */ sh $v0, 0x8e($a1) +/* B5417C 8024194C 8E020078 */ lw $v0, 0x78($s0) +/* B54180 80241950 28420008 */ slti $v0, $v0, 8 +/* B54184 80241954 14400018 */ bnez $v0, .L802419B8 +/* B54188 80241958 24020021 */ addiu $v0, $zero, 0x21 +/* B5418C 8024195C 24040003 */ addiu $a0, $zero, 3 +/* B54190 80241960 27A30028 */ addiu $v1, $sp, 0x28 +/* B54194 80241964 84A700A8 */ lh $a3, 0xa8($a1) +/* B54198 80241968 3C013F80 */ lui $at, 0x3f80 +/* B5419C 8024196C 44810000 */ mtc1 $at, $f0 +/* B541A0 80241970 3C014000 */ lui $at, 0x4000 +/* B541A4 80241974 44811000 */ mtc1 $at, $f2 +/* B541A8 80241978 3C01C1A0 */ lui $at, 0xc1a0 +/* B541AC 8024197C 44812000 */ mtc1 $at, $f4 +/* B541B0 80241980 44873000 */ mtc1 $a3, $f6 +/* B541B4 80241984 00000000 */ nop +/* B541B8 80241988 468031A0 */ cvt.s.w $f6, $f6 +/* B541BC 8024198C E7A00010 */ swc1 $f0, 0x10($sp) +/* B541C0 80241990 E7A20014 */ swc1 $f2, 0x14($sp) +/* B541C4 80241994 E7A40018 */ swc1 $f4, 0x18($sp) +/* B541C8 80241998 8E020078 */ lw $v0, 0x78($s0) +/* B541CC 8024199C 44073000 */ mfc1 $a3, $f6 +/* B541D0 802419A0 0000302D */ daddu $a2, $zero, $zero +/* B541D4 802419A4 AFA30020 */ sw $v1, 0x20($sp) +/* B541D8 802419A8 2442FFFF */ addiu $v0, $v0, -1 +/* B541DC 802419AC 0C01BFA4 */ jal fx_emote +/* B541E0 802419B0 AFA2001C */ sw $v0, 0x1c($sp) +/* B541E4 802419B4 24020021 */ addiu $v0, $zero, 0x21 +.L802419B8: +/* B541E8 802419B8 AE220070 */ sw $v0, 0x70($s1) +.L802419BC: +/* B541EC 802419BC 8FBF0038 */ lw $ra, 0x38($sp) +/* B541F0 802419C0 8FB10034 */ lw $s1, 0x34($sp) +/* B541F4 802419C4 8FB00030 */ lw $s0, 0x30($sp) +/* B541F8 802419C8 03E00008 */ jr $ra +/* B541FC 802419CC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24.s deleted file mode 100644 index 6d50f776b9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A24 -/* B54254 80241A24 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B54258 80241A28 AFBF0024 */ sw $ra, 0x24($sp) -/* B5425C 80241A2C AFB40020 */ sw $s4, 0x20($sp) -/* B54260 80241A30 AFB3001C */ sw $s3, 0x1c($sp) -/* B54264 80241A34 AFB20018 */ sw $s2, 0x18($sp) -/* B54268 80241A38 AFB10014 */ sw $s1, 0x14($sp) -/* B5426C 80241A3C AFB00010 */ sw $s0, 0x10($sp) -/* B54270 80241A40 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B54274 80241A44 8C900148 */ lw $s0, 0x148($a0) -/* B54278 80241A48 86040008 */ lh $a0, 8($s0) -/* B5427C 80241A4C 0C00EABB */ jal get_npc_unsafe -/* B54280 80241A50 24110001 */ addiu $s1, $zero, 1 -/* B54284 80241A54 86040008 */ lh $a0, 8($s0) -/* B54288 80241A58 0040802D */ daddu $s0, $v0, $zero -/* B5428C 80241A5C 3C05800B */ lui $a1, %hi(gCameras) -/* B54290 80241A60 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* B54294 80241A64 3C03800A */ lui $v1, 0x800a -/* B54298 80241A68 8463A634 */ lh $v1, -0x59cc($v1) -/* B5429C 80241A6C 00912021 */ addu $a0, $a0, $s1 -/* B542A0 80241A70 00031080 */ sll $v0, $v1, 2 -/* B542A4 80241A74 00431021 */ addu $v0, $v0, $v1 -/* B542A8 80241A78 00021080 */ sll $v0, $v0, 2 -/* B542AC 80241A7C 00431023 */ subu $v0, $v0, $v1 -/* B542B0 80241A80 000218C0 */ sll $v1, $v0, 3 -/* B542B4 80241A84 00431021 */ addu $v0, $v0, $v1 -/* B542B8 80241A88 000210C0 */ sll $v0, $v0, 3 -/* B542BC 80241A8C 0C00FB3A */ jal get_enemy -/* B542C0 80241A90 00459021 */ addu $s2, $v0, $a1 -/* B542C4 80241A94 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* B542C8 80241A98 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* B542CC 80241A9C C60C0038 */ lwc1 $f12, 0x38($s0) -/* B542D0 80241AA0 8E830000 */ lw $v1, ($s4) -/* B542D4 80241AA4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B542D8 80241AA8 8C660028 */ lw $a2, 0x28($v1) -/* B542DC 80241AAC 8C670030 */ lw $a3, 0x30($v1) -/* B542E0 80241AB0 0C00A7B5 */ jal dist2D -/* B542E4 80241AB4 0040982D */ daddu $s3, $v0, $zero -/* B542E8 80241AB8 C6620074 */ lwc1 $f2, 0x74($s3) -/* B542EC 80241ABC 468010A0 */ cvt.s.w $f2, $f2 -/* B542F0 80241AC0 4600103C */ c.lt.s $f2, $f0 -/* B542F4 80241AC4 00000000 */ nop -/* B542F8 80241AC8 45030001 */ bc1tl .L80241AD0 -/* B542FC 80241ACC 0000882D */ daddu $s1, $zero, $zero -.L80241AD0: -/* B54300 80241AD0 C64C006C */ lwc1 $f12, 0x6c($s2) -/* B54304 80241AD4 C60E000C */ lwc1 $f14, 0xc($s0) -/* B54308 80241AD8 3C014387 */ lui $at, 0x4387 -/* B5430C 80241ADC 4481A000 */ mtc1 $at, $f20 -/* B54310 80241AE0 0C00A70A */ jal get_clamped_angle_diff -/* B54314 80241AE4 00000000 */ nop -/* B54318 80241AE8 0C00A6C9 */ jal clamp_angle -/* B5431C 80241AEC 46000306 */ mov.s $f12, $f0 -/* B54320 80241AF0 3C018024 */ lui $at, 0x8024 -/* B54324 80241AF4 D4226D10 */ ldc1 $f2, 0x6d10($at) -/* B54328 80241AF8 46000021 */ cvt.d.s $f0, $f0 -/* B5432C 80241AFC 4622003C */ c.lt.d $f0, $f2 -/* B54330 80241B00 00000000 */ nop -/* B54334 80241B04 45000003 */ bc1f .L80241B14 -/* B54338 80241B08 00000000 */ nop -/* B5433C 80241B0C 3C0142B4 */ lui $at, 0x42b4 -/* B54340 80241B10 4481A000 */ mtc1 $at, $f20 -.L80241B14: -/* B54344 80241B14 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B54348 80241B18 8E820000 */ lw $v0, ($s4) -/* B5434C 80241B1C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B54350 80241B20 8C460028 */ lw $a2, 0x28($v0) -/* B54354 80241B24 0C00A720 */ jal atan2 -/* B54358 80241B28 8C470030 */ lw $a3, 0x30($v0) -/* B5435C 80241B2C 4600A306 */ mov.s $f12, $f20 -/* B54360 80241B30 0C00A70A */ jal get_clamped_angle_diff -/* B54364 80241B34 46000386 */ mov.s $f14, $f0 -/* B54368 80241B38 C6620078 */ lwc1 $f2, 0x78($s3) -/* B5436C 80241B3C 468010A0 */ cvt.s.w $f2, $f2 -/* B54370 80241B40 46000005 */ abs.s $f0, $f0 -/* B54374 80241B44 4600103C */ c.lt.s $f2, $f0 -/* B54378 80241B48 00000000 */ nop -/* B5437C 80241B4C 45030001 */ bc1tl .L80241B54 -/* B54380 80241B50 0000882D */ daddu $s1, $zero, $zero -.L80241B54: -/* B54384 80241B54 8E820000 */ lw $v0, ($s4) -/* B54388 80241B58 C600003C */ lwc1 $f0, 0x3c($s0) -/* B5438C 80241B5C C442002C */ lwc1 $f2, 0x2c($v0) -/* B54390 80241B60 860200A8 */ lh $v0, 0xa8($s0) -/* B54394 80241B64 46020001 */ sub.s $f0, $f0, $f2 -/* B54398 80241B68 44821000 */ mtc1 $v0, $f2 -/* B5439C 80241B6C 00000000 */ nop -/* B543A0 80241B70 468010A1 */ cvt.d.w $f2, $f2 -/* B543A4 80241B74 46221080 */ add.d $f2, $f2, $f2 -/* B543A8 80241B78 46000005 */ abs.s $f0, $f0 -/* B543AC 80241B7C 46000021 */ cvt.d.s $f0, $f0 -/* B543B0 80241B80 4620103E */ c.le.d $f2, $f0 -/* B543B4 80241B84 00000000 */ nop -/* B543B8 80241B88 45030001 */ bc1tl .L80241B90 -/* B543BC 80241B8C 0000882D */ daddu $s1, $zero, $zero -.L80241B90: -/* B543C0 80241B90 3C038011 */ lui $v1, 0x8011 -/* B543C4 80241B94 8063EBB3 */ lb $v1, -0x144d($v1) -/* B543C8 80241B98 24020009 */ addiu $v0, $zero, 9 -/* B543CC 80241B9C 50620001 */ beql $v1, $v0, .L80241BA4 -/* B543D0 80241BA0 0000882D */ daddu $s1, $zero, $zero -.L80241BA4: -/* B543D4 80241BA4 24020007 */ addiu $v0, $zero, 7 -/* B543D8 80241BA8 50620001 */ beql $v1, $v0, .L80241BB0 -/* B543DC 80241BAC 0000882D */ daddu $s1, $zero, $zero -.L80241BB0: -/* B543E0 80241BB0 0220102D */ daddu $v0, $s1, $zero -/* B543E4 80241BB4 8FBF0024 */ lw $ra, 0x24($sp) -/* B543E8 80241BB8 8FB40020 */ lw $s4, 0x20($sp) -/* B543EC 80241BBC 8FB3001C */ lw $s3, 0x1c($sp) -/* B543F0 80241BC0 8FB20018 */ lw $s2, 0x18($sp) -/* B543F4 80241BC4 8FB10014 */ lw $s1, 0x14($sp) -/* B543F8 80241BC8 8FB00010 */ lw $s0, 0x10($sp) -/* B543FC 80241BCC D7B40028 */ ldc1 $f20, 0x28($sp) -/* B54400 80241BD0 03E00008 */ jr $ra -/* B54404 80241BD4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s new file mode 100644 index 0000000000..ef0f1c8640 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241A24_B54254.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A24_B54254 +/* B54254 80241A24 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B54258 80241A28 AFBF0024 */ sw $ra, 0x24($sp) +/* B5425C 80241A2C AFB40020 */ sw $s4, 0x20($sp) +/* B54260 80241A30 AFB3001C */ sw $s3, 0x1c($sp) +/* B54264 80241A34 AFB20018 */ sw $s2, 0x18($sp) +/* B54268 80241A38 AFB10014 */ sw $s1, 0x14($sp) +/* B5426C 80241A3C AFB00010 */ sw $s0, 0x10($sp) +/* B54270 80241A40 F7B40028 */ sdc1 $f20, 0x28($sp) +/* B54274 80241A44 8C900148 */ lw $s0, 0x148($a0) +/* B54278 80241A48 86040008 */ lh $a0, 8($s0) +/* B5427C 80241A4C 0C00EABB */ jal get_npc_unsafe +/* B54280 80241A50 24110001 */ addiu $s1, $zero, 1 +/* B54284 80241A54 86040008 */ lh $a0, 8($s0) +/* B54288 80241A58 0040802D */ daddu $s0, $v0, $zero +/* B5428C 80241A5C 3C05800B */ lui $a1, %hi(gCameras) +/* B54290 80241A60 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* B54294 80241A64 3C03800A */ lui $v1, 0x800a +/* B54298 80241A68 8463A634 */ lh $v1, -0x59cc($v1) +/* B5429C 80241A6C 00912021 */ addu $a0, $a0, $s1 +/* B542A0 80241A70 00031080 */ sll $v0, $v1, 2 +/* B542A4 80241A74 00431021 */ addu $v0, $v0, $v1 +/* B542A8 80241A78 00021080 */ sll $v0, $v0, 2 +/* B542AC 80241A7C 00431023 */ subu $v0, $v0, $v1 +/* B542B0 80241A80 000218C0 */ sll $v1, $v0, 3 +/* B542B4 80241A84 00431021 */ addu $v0, $v0, $v1 +/* B542B8 80241A88 000210C0 */ sll $v0, $v0, 3 +/* B542BC 80241A8C 0C00FB3A */ jal get_enemy +/* B542C0 80241A90 00459021 */ addu $s2, $v0, $a1 +/* B542C4 80241A94 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) +/* B542C8 80241A98 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) +/* B542CC 80241A9C C60C0038 */ lwc1 $f12, 0x38($s0) +/* B542D0 80241AA0 8E830000 */ lw $v1, ($s4) +/* B542D4 80241AA4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B542D8 80241AA8 8C660028 */ lw $a2, 0x28($v1) +/* B542DC 80241AAC 8C670030 */ lw $a3, 0x30($v1) +/* B542E0 80241AB0 0C00A7B5 */ jal dist2D +/* B542E4 80241AB4 0040982D */ daddu $s3, $v0, $zero +/* B542E8 80241AB8 C6620074 */ lwc1 $f2, 0x74($s3) +/* B542EC 80241ABC 468010A0 */ cvt.s.w $f2, $f2 +/* B542F0 80241AC0 4600103C */ c.lt.s $f2, $f0 +/* B542F4 80241AC4 00000000 */ nop +/* B542F8 80241AC8 45030001 */ bc1tl .L80241AD0 +/* B542FC 80241ACC 0000882D */ daddu $s1, $zero, $zero +.L80241AD0: +/* B54300 80241AD0 C64C006C */ lwc1 $f12, 0x6c($s2) +/* B54304 80241AD4 C60E000C */ lwc1 $f14, 0xc($s0) +/* B54308 80241AD8 3C014387 */ lui $at, 0x4387 +/* B5430C 80241ADC 4481A000 */ mtc1 $at, $f20 +/* B54310 80241AE0 0C00A70A */ jal get_clamped_angle_diff +/* B54314 80241AE4 00000000 */ nop +/* B54318 80241AE8 0C00A6C9 */ jal clamp_angle +/* B5431C 80241AEC 46000306 */ mov.s $f12, $f0 +/* B54320 80241AF0 3C018024 */ lui $at, 0x8024 +/* B54324 80241AF4 D4226D10 */ ldc1 $f2, 0x6d10($at) +/* B54328 80241AF8 46000021 */ cvt.d.s $f0, $f0 +/* B5432C 80241AFC 4622003C */ c.lt.d $f0, $f2 +/* B54330 80241B00 00000000 */ nop +/* B54334 80241B04 45000003 */ bc1f .L80241B14 +/* B54338 80241B08 00000000 */ nop +/* B5433C 80241B0C 3C0142B4 */ lui $at, 0x42b4 +/* B54340 80241B10 4481A000 */ mtc1 $at, $f20 +.L80241B14: +/* B54344 80241B14 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B54348 80241B18 8E820000 */ lw $v0, ($s4) +/* B5434C 80241B1C C60E0040 */ lwc1 $f14, 0x40($s0) +/* B54350 80241B20 8C460028 */ lw $a2, 0x28($v0) +/* B54354 80241B24 0C00A720 */ jal atan2 +/* B54358 80241B28 8C470030 */ lw $a3, 0x30($v0) +/* B5435C 80241B2C 4600A306 */ mov.s $f12, $f20 +/* B54360 80241B30 0C00A70A */ jal get_clamped_angle_diff +/* B54364 80241B34 46000386 */ mov.s $f14, $f0 +/* B54368 80241B38 C6620078 */ lwc1 $f2, 0x78($s3) +/* B5436C 80241B3C 468010A0 */ cvt.s.w $f2, $f2 +/* B54370 80241B40 46000005 */ abs.s $f0, $f0 +/* B54374 80241B44 4600103C */ c.lt.s $f2, $f0 +/* B54378 80241B48 00000000 */ nop +/* B5437C 80241B4C 45030001 */ bc1tl .L80241B54 +/* B54380 80241B50 0000882D */ daddu $s1, $zero, $zero +.L80241B54: +/* B54384 80241B54 8E820000 */ lw $v0, ($s4) +/* B54388 80241B58 C600003C */ lwc1 $f0, 0x3c($s0) +/* B5438C 80241B5C C442002C */ lwc1 $f2, 0x2c($v0) +/* B54390 80241B60 860200A8 */ lh $v0, 0xa8($s0) +/* B54394 80241B64 46020001 */ sub.s $f0, $f0, $f2 +/* B54398 80241B68 44821000 */ mtc1 $v0, $f2 +/* B5439C 80241B6C 00000000 */ nop +/* B543A0 80241B70 468010A1 */ cvt.d.w $f2, $f2 +/* B543A4 80241B74 46221080 */ add.d $f2, $f2, $f2 +/* B543A8 80241B78 46000005 */ abs.s $f0, $f0 +/* B543AC 80241B7C 46000021 */ cvt.d.s $f0, $f0 +/* B543B0 80241B80 4620103E */ c.le.d $f2, $f0 +/* B543B4 80241B84 00000000 */ nop +/* B543B8 80241B88 45030001 */ bc1tl .L80241B90 +/* B543BC 80241B8C 0000882D */ daddu $s1, $zero, $zero +.L80241B90: +/* B543C0 80241B90 3C038011 */ lui $v1, 0x8011 +/* B543C4 80241B94 8063EBB3 */ lb $v1, -0x144d($v1) +/* B543C8 80241B98 24020009 */ addiu $v0, $zero, 9 +/* B543CC 80241B9C 50620001 */ beql $v1, $v0, .L80241BA4 +/* B543D0 80241BA0 0000882D */ daddu $s1, $zero, $zero +.L80241BA4: +/* B543D4 80241BA4 24020007 */ addiu $v0, $zero, 7 +/* B543D8 80241BA8 50620001 */ beql $v1, $v0, .L80241BB0 +/* B543DC 80241BAC 0000882D */ daddu $s1, $zero, $zero +.L80241BB0: +/* B543E0 80241BB0 0220102D */ daddu $v0, $s1, $zero +/* B543E4 80241BB4 8FBF0024 */ lw $ra, 0x24($sp) +/* B543E8 80241BB8 8FB40020 */ lw $s4, 0x20($sp) +/* B543EC 80241BBC 8FB3001C */ lw $s3, 0x1c($sp) +/* B543F0 80241BC0 8FB20018 */ lw $s2, 0x18($sp) +/* B543F4 80241BC4 8FB10014 */ lw $s1, 0x14($sp) +/* B543F8 80241BC8 8FB00010 */ lw $s0, 0x10($sp) +/* B543FC 80241BCC D7B40028 */ ldc1 $f20, 0x28($sp) +/* B54400 80241BD0 03E00008 */ jr $ra +/* B54404 80241BD4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38.s deleted file mode 100644 index 3343b38562..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E38 -/* B54668 80241E38 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B5466C 80241E3C AFB20038 */ sw $s2, 0x38($sp) -/* B54670 80241E40 0080902D */ daddu $s2, $a0, $zero -/* B54674 80241E44 AFBF0048 */ sw $ra, 0x48($sp) -/* B54678 80241E48 AFB50044 */ sw $s5, 0x44($sp) -/* B5467C 80241E4C AFB40040 */ sw $s4, 0x40($sp) -/* B54680 80241E50 AFB3003C */ sw $s3, 0x3c($sp) -/* B54684 80241E54 AFB10034 */ sw $s1, 0x34($sp) -/* B54688 80241E58 AFB00030 */ sw $s0, 0x30($sp) -/* B5468C 80241E5C 8E510148 */ lw $s1, 0x148($s2) -/* B54690 80241E60 86240008 */ lh $a0, 8($s1) -/* B54694 80241E64 0C00EABB */ jal get_npc_unsafe -/* B54698 80241E68 00A0802D */ daddu $s0, $a1, $zero -/* B5469C 80241E6C 8E43000C */ lw $v1, 0xc($s2) -/* B546A0 80241E70 0240202D */ daddu $a0, $s2, $zero -/* B546A4 80241E74 8C650000 */ lw $a1, ($v1) -/* B546A8 80241E78 0C0B1EAF */ jal get_variable -/* B546AC 80241E7C 0040A82D */ daddu $s5, $v0, $zero -/* B546B0 80241E80 AFA00010 */ sw $zero, 0x10($sp) -/* B546B4 80241E84 8E2300D0 */ lw $v1, 0xd0($s1) -/* B546B8 80241E88 8C630030 */ lw $v1, 0x30($v1) -/* B546BC 80241E8C AFA30014 */ sw $v1, 0x14($sp) -/* B546C0 80241E90 8E2300D0 */ lw $v1, 0xd0($s1) -/* B546C4 80241E94 8C63001C */ lw $v1, 0x1c($v1) -/* B546C8 80241E98 AFA30018 */ sw $v1, 0x18($sp) -/* B546CC 80241E9C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B546D0 80241EA0 8C630024 */ lw $v1, 0x24($v1) -/* B546D4 80241EA4 AFA3001C */ sw $v1, 0x1c($sp) -/* B546D8 80241EA8 8E2300D0 */ lw $v1, 0xd0($s1) -/* B546DC 80241EAC 8C630028 */ lw $v1, 0x28($v1) -/* B546E0 80241EB0 27B40010 */ addiu $s4, $sp, 0x10 -/* B546E4 80241EB4 AFA30020 */ sw $v1, 0x20($sp) -/* B546E8 80241EB8 8E2300D0 */ lw $v1, 0xd0($s1) -/* B546EC 80241EBC 3C014282 */ lui $at, 0x4282 -/* B546F0 80241EC0 44810000 */ mtc1 $at, $f0 -/* B546F4 80241EC4 8C63002C */ lw $v1, 0x2c($v1) -/* B546F8 80241EC8 0040982D */ daddu $s3, $v0, $zero -/* B546FC 80241ECC E7A00028 */ swc1 $f0, 0x28($sp) -/* B54700 80241ED0 A7A0002C */ sh $zero, 0x2c($sp) -/* B54704 80241ED4 16000005 */ bnez $s0, .L80241EEC -/* B54708 80241ED8 AFA30024 */ sw $v1, 0x24($sp) -/* B5470C 80241EDC 8E2200B0 */ lw $v0, 0xb0($s1) -/* B54710 80241EE0 30420004 */ andi $v0, $v0, 4 -/* B54714 80241EE4 10400020 */ beqz $v0, .L80241F68 -/* B54718 80241EE8 00000000 */ nop -.L80241EEC: -/* B5471C 80241EEC 2404F7FF */ addiu $a0, $zero, -0x801 -/* B54720 80241EF0 AE400070 */ sw $zero, 0x70($s2) -/* B54724 80241EF4 A6A0008E */ sh $zero, 0x8e($s5) -/* B54728 80241EF8 8E2200CC */ lw $v0, 0xcc($s1) -/* B5472C 80241EFC 8EA30000 */ lw $v1, ($s5) -/* B54730 80241F00 8C420000 */ lw $v0, ($v0) -/* B54734 80241F04 00641824 */ and $v1, $v1, $a0 -/* B54738 80241F08 AEA30000 */ sw $v1, ($s5) -/* B5473C 80241F0C AEA20028 */ sw $v0, 0x28($s5) -/* B54740 80241F10 8E2200D0 */ lw $v0, 0xd0($s1) -/* B54744 80241F14 8C420034 */ lw $v0, 0x34($v0) -/* B54748 80241F18 54400005 */ bnel $v0, $zero, .L80241F30 -/* B5474C 80241F1C 2402FDFF */ addiu $v0, $zero, -0x201 -/* B54750 80241F20 34620200 */ ori $v0, $v1, 0x200 -/* B54754 80241F24 2403FFF7 */ addiu $v1, $zero, -9 -/* B54758 80241F28 080907CE */ j .L80241F38 -/* B5475C 80241F2C 00431024 */ and $v0, $v0, $v1 -.L80241F30: -/* B54760 80241F30 00621024 */ and $v0, $v1, $v0 -/* B54764 80241F34 34420008 */ ori $v0, $v0, 8 -.L80241F38: -/* B54768 80241F38 AEA20000 */ sw $v0, ($s5) -/* B5476C 80241F3C 8E2200B0 */ lw $v0, 0xb0($s1) -/* B54770 80241F40 30420004 */ andi $v0, $v0, 4 -/* B54774 80241F44 10400007 */ beqz $v0, .L80241F64 -/* B54778 80241F48 24020063 */ addiu $v0, $zero, 0x63 -/* B5477C 80241F4C AE420070 */ sw $v0, 0x70($s2) -/* B54780 80241F50 AE400074 */ sw $zero, 0x74($s2) -/* B54784 80241F54 8E2200B0 */ lw $v0, 0xb0($s1) -/* B54788 80241F58 2403FFFB */ addiu $v1, $zero, -5 -/* B5478C 80241F5C 00431024 */ and $v0, $v0, $v1 -/* B54790 80241F60 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241F64: -/* B54794 80241F64 AE20006C */ sw $zero, 0x6c($s1) -.L80241F68: -/* B54798 80241F68 8E420070 */ lw $v0, 0x70($s2) -/* B5479C 80241F6C 2842001E */ slti $v0, $v0, 0x1e -/* B547A0 80241F70 10400009 */ beqz $v0, .L80241F98 -/* B547A4 80241F74 00000000 */ nop -/* B547A8 80241F78 8E22006C */ lw $v0, 0x6c($s1) -/* B547AC 80241F7C 14400006 */ bnez $v0, .L80241F98 -/* B547B0 80241F80 00000000 */ nop -/* B547B4 80241F84 0C090689 */ jal func_80241A24 -/* B547B8 80241F88 0240202D */ daddu $a0, $s2, $zero -/* B547BC 80241F8C 10400002 */ beqz $v0, .L80241F98 -/* B547C0 80241F90 2402001E */ addiu $v0, $zero, 0x1e -/* B547C4 80241F94 AE420070 */ sw $v0, 0x70($s2) -.L80241F98: -/* B547C8 80241F98 8E430070 */ lw $v1, 0x70($s2) -/* B547CC 80241F9C 2C620064 */ sltiu $v0, $v1, 0x64 -/* B547D0 80241FA0 10400048 */ beqz $v0, .L802420C4 -/* B547D4 80241FA4 00031080 */ sll $v0, $v1, 2 -/* B547D8 80241FA8 3C018024 */ lui $at, 0x8024 -/* B547DC 80241FAC 00220821 */ addu $at, $at, $v0 -/* B547E0 80241FB0 8C226D18 */ lw $v0, 0x6d18($at) -/* B547E4 80241FB4 00400008 */ jr $v0 -/* B547E8 80241FB8 00000000 */ nop -/* B547EC 80241FBC 0240202D */ daddu $a0, $s2, $zero -/* B547F0 80241FC0 0260282D */ daddu $a1, $s3, $zero -/* B547F4 80241FC4 0C012568 */ jal func_800495A0 -/* B547F8 80241FC8 0280302D */ daddu $a2, $s4, $zero -/* B547FC 80241FCC 0240202D */ daddu $a0, $s2, $zero -/* B54800 80241FD0 0260282D */ daddu $a1, $s3, $zero -/* B54804 80241FD4 0C0125AE */ jal func_800496B8 -/* B54808 80241FD8 0280302D */ daddu $a2, $s4, $zero -/* B5480C 80241FDC 08090831 */ j .L802420C4 -/* B54810 80241FE0 00000000 */ nop -/* B54814 80241FE4 0240202D */ daddu $a0, $s2, $zero -/* B54818 80241FE8 0260282D */ daddu $a1, $s3, $zero -/* B5481C 80241FEC 0C0126D1 */ jal func_80049B44 -/* B54820 80241FF0 0280302D */ daddu $a2, $s4, $zero -/* B54824 80241FF4 0240202D */ daddu $a0, $s2, $zero -/* B54828 80241FF8 0260282D */ daddu $a1, $s3, $zero -/* B5482C 80241FFC 0C012701 */ jal func_80049C04 -/* B54830 80242000 0280302D */ daddu $a2, $s4, $zero -/* B54834 80242004 08090831 */ j .L802420C4 -/* B54838 80242008 00000000 */ nop -/* B5483C 8024200C 0240202D */ daddu $a0, $s2, $zero -/* B54840 80242010 0260282D */ daddu $a1, $s3, $zero -/* B54844 80242014 0C01278F */ jal func_80049E3C -/* B54848 80242018 0280302D */ daddu $a2, $s4, $zero -/* B5484C 8024201C 0240202D */ daddu $a0, $s2, $zero -/* B54850 80242020 0260282D */ daddu $a1, $s3, $zero -/* B54854 80242024 0C0127B3 */ jal func_80049ECC -/* B54858 80242028 0280302D */ daddu $a2, $s4, $zero -/* B5485C 8024202C 08090831 */ j .L802420C4 -/* B54860 80242030 00000000 */ nop -/* B54864 80242034 0240202D */ daddu $a0, $s2, $zero -/* B54868 80242038 0260282D */ daddu $a1, $s3, $zero -/* B5486C 8024203C 0C0127DF */ jal func_80049F7C -/* B54870 80242040 0280302D */ daddu $a2, $s4, $zero -/* B54874 80242044 0240202D */ daddu $a0, $s2, $zero -/* B54878 80242048 0260282D */ daddu $a1, $s3, $zero -/* B5487C 8024204C 0C012849 */ jal func_8004A124 -/* B54880 80242050 0280302D */ daddu $a2, $s4, $zero -/* B54884 80242054 08090831 */ j .L802420C4 -/* B54888 80242058 00000000 */ nop -/* B5488C 8024205C 0240202D */ daddu $a0, $s2, $zero -/* B54890 80242060 0260282D */ daddu $a1, $s3, $zero -/* B54894 80242064 0C0128FA */ jal func_8004A3E8 -/* B54898 80242068 0280302D */ daddu $a2, $s4, $zero -/* B5489C 8024206C 08090831 */ j .L802420C4 -/* B548A0 80242070 00000000 */ nop -/* B548A4 80242074 0C090607 */ jal func_8024181C -/* B548A8 80242078 0240202D */ daddu $a0, $s2, $zero -/* B548AC 8024207C 0C090622 */ jal func_80241888 -/* B548B0 80242080 0240202D */ daddu $a0, $s2, $zero -/* B548B4 80242084 8E430070 */ lw $v1, 0x70($s2) -/* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 -/* B548BC 8024208C 1462000D */ bne $v1, $v0, .L802420C4 -/* B548C0 80242090 00000000 */ nop -/* B548C4 80242094 0C09063E */ jal func_802418F8 -/* B548C8 80242098 0240202D */ daddu $a0, $s2, $zero -/* B548CC 8024209C 8E430070 */ lw $v1, 0x70($s2) -/* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 -/* B548D4 802420A4 14620007 */ bne $v1, $v0, .L802420C4 -/* B548D8 802420A8 00000000 */ nop -/* B548DC 802420AC 0C090674 */ jal func_802419D0 -/* B548E0 802420B0 0240202D */ daddu $a0, $s2, $zero -/* B548E4 802420B4 08090831 */ j .L802420C4 -/* B548E8 802420B8 00000000 */ nop -/* B548EC 802420BC 0C0129CF */ jal func_8004A73C -/* B548F0 802420C0 0240202D */ daddu $a0, $s2, $zero -.L802420C4: -/* B548F4 802420C4 8FBF0048 */ lw $ra, 0x48($sp) -/* B548F8 802420C8 8FB50044 */ lw $s5, 0x44($sp) -/* B548FC 802420CC 8FB40040 */ lw $s4, 0x40($sp) -/* B54900 802420D0 8FB3003C */ lw $s3, 0x3c($sp) -/* B54904 802420D4 8FB20038 */ lw $s2, 0x38($sp) -/* B54908 802420D8 8FB10034 */ lw $s1, 0x34($sp) -/* B5490C 802420DC 8FB00030 */ lw $s0, 0x30($sp) -/* B54910 802420E0 0000102D */ daddu $v0, $zero, $zero -/* B54914 802420E4 03E00008 */ jr $ra -/* B54918 802420E8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s new file mode 100644 index 0000000000..420b160750 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80241E38_B54668.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E38_B54668 +/* B54668 80241E38 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* B5466C 80241E3C AFB20038 */ sw $s2, 0x38($sp) +/* B54670 80241E40 0080902D */ daddu $s2, $a0, $zero +/* B54674 80241E44 AFBF0048 */ sw $ra, 0x48($sp) +/* B54678 80241E48 AFB50044 */ sw $s5, 0x44($sp) +/* B5467C 80241E4C AFB40040 */ sw $s4, 0x40($sp) +/* B54680 80241E50 AFB3003C */ sw $s3, 0x3c($sp) +/* B54684 80241E54 AFB10034 */ sw $s1, 0x34($sp) +/* B54688 80241E58 AFB00030 */ sw $s0, 0x30($sp) +/* B5468C 80241E5C 8E510148 */ lw $s1, 0x148($s2) +/* B54690 80241E60 86240008 */ lh $a0, 8($s1) +/* B54694 80241E64 0C00EABB */ jal get_npc_unsafe +/* B54698 80241E68 00A0802D */ daddu $s0, $a1, $zero +/* B5469C 80241E6C 8E43000C */ lw $v1, 0xc($s2) +/* B546A0 80241E70 0240202D */ daddu $a0, $s2, $zero +/* B546A4 80241E74 8C650000 */ lw $a1, ($v1) +/* B546A8 80241E78 0C0B1EAF */ jal get_variable +/* B546AC 80241E7C 0040A82D */ daddu $s5, $v0, $zero +/* B546B0 80241E80 AFA00010 */ sw $zero, 0x10($sp) +/* B546B4 80241E84 8E2300D0 */ lw $v1, 0xd0($s1) +/* B546B8 80241E88 8C630030 */ lw $v1, 0x30($v1) +/* B546BC 80241E8C AFA30014 */ sw $v1, 0x14($sp) +/* B546C0 80241E90 8E2300D0 */ lw $v1, 0xd0($s1) +/* B546C4 80241E94 8C63001C */ lw $v1, 0x1c($v1) +/* B546C8 80241E98 AFA30018 */ sw $v1, 0x18($sp) +/* B546CC 80241E9C 8E2300D0 */ lw $v1, 0xd0($s1) +/* B546D0 80241EA0 8C630024 */ lw $v1, 0x24($v1) +/* B546D4 80241EA4 AFA3001C */ sw $v1, 0x1c($sp) +/* B546D8 80241EA8 8E2300D0 */ lw $v1, 0xd0($s1) +/* B546DC 80241EAC 8C630028 */ lw $v1, 0x28($v1) +/* B546E0 80241EB0 27B40010 */ addiu $s4, $sp, 0x10 +/* B546E4 80241EB4 AFA30020 */ sw $v1, 0x20($sp) +/* B546E8 80241EB8 8E2300D0 */ lw $v1, 0xd0($s1) +/* B546EC 80241EBC 3C014282 */ lui $at, 0x4282 +/* B546F0 80241EC0 44810000 */ mtc1 $at, $f0 +/* B546F4 80241EC4 8C63002C */ lw $v1, 0x2c($v1) +/* B546F8 80241EC8 0040982D */ daddu $s3, $v0, $zero +/* B546FC 80241ECC E7A00028 */ swc1 $f0, 0x28($sp) +/* B54700 80241ED0 A7A0002C */ sh $zero, 0x2c($sp) +/* B54704 80241ED4 16000005 */ bnez $s0, .L80241EEC +/* B54708 80241ED8 AFA30024 */ sw $v1, 0x24($sp) +/* B5470C 80241EDC 8E2200B0 */ lw $v0, 0xb0($s1) +/* B54710 80241EE0 30420004 */ andi $v0, $v0, 4 +/* B54714 80241EE4 10400020 */ beqz $v0, .L80241F68 +/* B54718 80241EE8 00000000 */ nop +.L80241EEC: +/* B5471C 80241EEC 2404F7FF */ addiu $a0, $zero, -0x801 +/* B54720 80241EF0 AE400070 */ sw $zero, 0x70($s2) +/* B54724 80241EF4 A6A0008E */ sh $zero, 0x8e($s5) +/* B54728 80241EF8 8E2200CC */ lw $v0, 0xcc($s1) +/* B5472C 80241EFC 8EA30000 */ lw $v1, ($s5) +/* B54730 80241F00 8C420000 */ lw $v0, ($v0) +/* B54734 80241F04 00641824 */ and $v1, $v1, $a0 +/* B54738 80241F08 AEA30000 */ sw $v1, ($s5) +/* B5473C 80241F0C AEA20028 */ sw $v0, 0x28($s5) +/* B54740 80241F10 8E2200D0 */ lw $v0, 0xd0($s1) +/* B54744 80241F14 8C420034 */ lw $v0, 0x34($v0) +/* B54748 80241F18 54400005 */ bnel $v0, $zero, .L80241F30 +/* B5474C 80241F1C 2402FDFF */ addiu $v0, $zero, -0x201 +/* B54750 80241F20 34620200 */ ori $v0, $v1, 0x200 +/* B54754 80241F24 2403FFF7 */ addiu $v1, $zero, -9 +/* B54758 80241F28 080907CE */ j .L80241F38 +/* B5475C 80241F2C 00431024 */ and $v0, $v0, $v1 +.L80241F30: +/* B54760 80241F30 00621024 */ and $v0, $v1, $v0 +/* B54764 80241F34 34420008 */ ori $v0, $v0, 8 +.L80241F38: +/* B54768 80241F38 AEA20000 */ sw $v0, ($s5) +/* B5476C 80241F3C 8E2200B0 */ lw $v0, 0xb0($s1) +/* B54770 80241F40 30420004 */ andi $v0, $v0, 4 +/* B54774 80241F44 10400007 */ beqz $v0, .L80241F64 +/* B54778 80241F48 24020063 */ addiu $v0, $zero, 0x63 +/* B5477C 80241F4C AE420070 */ sw $v0, 0x70($s2) +/* B54780 80241F50 AE400074 */ sw $zero, 0x74($s2) +/* B54784 80241F54 8E2200B0 */ lw $v0, 0xb0($s1) +/* B54788 80241F58 2403FFFB */ addiu $v1, $zero, -5 +/* B5478C 80241F5C 00431024 */ and $v0, $v0, $v1 +/* B54790 80241F60 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241F64: +/* B54794 80241F64 AE20006C */ sw $zero, 0x6c($s1) +.L80241F68: +/* B54798 80241F68 8E420070 */ lw $v0, 0x70($s2) +/* B5479C 80241F6C 2842001E */ slti $v0, $v0, 0x1e +/* B547A0 80241F70 10400009 */ beqz $v0, .L80241F98 +/* B547A4 80241F74 00000000 */ nop +/* B547A8 80241F78 8E22006C */ lw $v0, 0x6c($s1) +/* B547AC 80241F7C 14400006 */ bnez $v0, .L80241F98 +/* B547B0 80241F80 00000000 */ nop +/* B547B4 80241F84 0C090689 */ jal func_80241A24_B54254 +/* B547B8 80241F88 0240202D */ daddu $a0, $s2, $zero +/* B547BC 80241F8C 10400002 */ beqz $v0, .L80241F98 +/* B547C0 80241F90 2402001E */ addiu $v0, $zero, 0x1e +/* B547C4 80241F94 AE420070 */ sw $v0, 0x70($s2) +.L80241F98: +/* B547C8 80241F98 8E430070 */ lw $v1, 0x70($s2) +/* B547CC 80241F9C 2C620064 */ sltiu $v0, $v1, 0x64 +/* B547D0 80241FA0 10400048 */ beqz $v0, .L802420C4 +/* B547D4 80241FA4 00031080 */ sll $v0, $v1, 2 +/* B547D8 80241FA8 3C018024 */ lui $at, 0x8024 +/* B547DC 80241FAC 00220821 */ addu $at, $at, $v0 +/* B547E0 80241FB0 8C226D18 */ lw $v0, 0x6d18($at) +/* B547E4 80241FB4 00400008 */ jr $v0 +/* B547E8 80241FB8 00000000 */ nop +/* B547EC 80241FBC 0240202D */ daddu $a0, $s2, $zero +/* B547F0 80241FC0 0260282D */ daddu $a1, $s3, $zero +/* B547F4 80241FC4 0C012568 */ jal func_800495A0 +/* B547F8 80241FC8 0280302D */ daddu $a2, $s4, $zero +/* B547FC 80241FCC 0240202D */ daddu $a0, $s2, $zero +/* B54800 80241FD0 0260282D */ daddu $a1, $s3, $zero +/* B54804 80241FD4 0C0125AE */ jal func_800496B8 +/* B54808 80241FD8 0280302D */ daddu $a2, $s4, $zero +/* B5480C 80241FDC 08090831 */ j .L802420C4 +/* B54810 80241FE0 00000000 */ nop +/* B54814 80241FE4 0240202D */ daddu $a0, $s2, $zero +/* B54818 80241FE8 0260282D */ daddu $a1, $s3, $zero +/* B5481C 80241FEC 0C0126D1 */ jal func_80049B44 +/* B54820 80241FF0 0280302D */ daddu $a2, $s4, $zero +/* B54824 80241FF4 0240202D */ daddu $a0, $s2, $zero +/* B54828 80241FF8 0260282D */ daddu $a1, $s3, $zero +/* B5482C 80241FFC 0C012701 */ jal func_80049C04 +/* B54830 80242000 0280302D */ daddu $a2, $s4, $zero +/* B54834 80242004 08090831 */ j .L802420C4 +/* B54838 80242008 00000000 */ nop +/* B5483C 8024200C 0240202D */ daddu $a0, $s2, $zero +/* B54840 80242010 0260282D */ daddu $a1, $s3, $zero +/* B54844 80242014 0C01278F */ jal func_80049E3C +/* B54848 80242018 0280302D */ daddu $a2, $s4, $zero +/* B5484C 8024201C 0240202D */ daddu $a0, $s2, $zero +/* B54850 80242020 0260282D */ daddu $a1, $s3, $zero +/* B54854 80242024 0C0127B3 */ jal func_80049ECC +/* B54858 80242028 0280302D */ daddu $a2, $s4, $zero +/* B5485C 8024202C 08090831 */ j .L802420C4 +/* B54860 80242030 00000000 */ nop +/* B54864 80242034 0240202D */ daddu $a0, $s2, $zero +/* B54868 80242038 0260282D */ daddu $a1, $s3, $zero +/* B5486C 8024203C 0C0127DF */ jal func_80049F7C +/* B54870 80242040 0280302D */ daddu $a2, $s4, $zero +/* B54874 80242044 0240202D */ daddu $a0, $s2, $zero +/* B54878 80242048 0260282D */ daddu $a1, $s3, $zero +/* B5487C 8024204C 0C012849 */ jal func_8004A124 +/* B54880 80242050 0280302D */ daddu $a2, $s4, $zero +/* B54884 80242054 08090831 */ j .L802420C4 +/* B54888 80242058 00000000 */ nop +/* B5488C 8024205C 0240202D */ daddu $a0, $s2, $zero +/* B54890 80242060 0260282D */ daddu $a1, $s3, $zero +/* B54894 80242064 0C0128FA */ jal func_8004A3E8 +/* B54898 80242068 0280302D */ daddu $a2, $s4, $zero +/* B5489C 8024206C 08090831 */ j .L802420C4 +/* B548A0 80242070 00000000 */ nop +/* B548A4 80242074 0C090607 */ jal func_8024181C_B5404C +/* B548A8 80242078 0240202D */ daddu $a0, $s2, $zero +/* B548AC 8024207C 0C090622 */ jal func_80241888_B540B8 +/* B548B0 80242080 0240202D */ daddu $a0, $s2, $zero +/* B548B4 80242084 8E430070 */ lw $v1, 0x70($s2) +/* B548B8 80242088 24020020 */ addiu $v0, $zero, 0x20 +/* B548BC 8024208C 1462000D */ bne $v1, $v0, .L802420C4 +/* B548C0 80242090 00000000 */ nop +/* B548C4 80242094 0C09063E */ jal func_802418F8_B54128 +/* B548C8 80242098 0240202D */ daddu $a0, $s2, $zero +/* B548CC 8024209C 8E430070 */ lw $v1, 0x70($s2) +/* B548D0 802420A0 24020021 */ addiu $v0, $zero, 0x21 +/* B548D4 802420A4 14620007 */ bne $v1, $v0, .L802420C4 +/* B548D8 802420A8 00000000 */ nop +/* B548DC 802420AC 0C090674 */ jal func_802419D0_B54200 +/* B548E0 802420B0 0240202D */ daddu $a0, $s2, $zero +/* B548E4 802420B4 08090831 */ j .L802420C4 +/* B548E8 802420B8 00000000 */ nop +/* B548EC 802420BC 0C0129CF */ jal func_8004A73C +/* B548F0 802420C0 0240202D */ daddu $a0, $s2, $zero +.L802420C4: +/* B548F4 802420C4 8FBF0048 */ lw $ra, 0x48($sp) +/* B548F8 802420C8 8FB50044 */ lw $s5, 0x44($sp) +/* B548FC 802420CC 8FB40040 */ lw $s4, 0x40($sp) +/* B54900 802420D0 8FB3003C */ lw $s3, 0x3c($sp) +/* B54904 802420D4 8FB20038 */ lw $s2, 0x38($sp) +/* B54908 802420D8 8FB10034 */ lw $s1, 0x34($sp) +/* B5490C 802420DC 8FB00030 */ lw $s0, 0x30($sp) +/* B54910 802420E0 0000102D */ daddu $v0, $zero, $zero +/* B54914 802420E4 03E00008 */ jr $ra +/* B54918 802420E8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s index e867d4ec30..72ef3bb20e 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_802420EC_B5491C.s @@ -90,7 +90,7 @@ glabel func_802420EC_B5491C /* B54A5C 8024222C 8E22006C */ lw $v0, 0x6c($s1) /* B54A60 80242230 14400006 */ bnez $v0, .L8024224C /* B54A64 80242234 00000000 */ nop -/* B54A68 80242238 0C090689 */ jal func_80241A24 +/* B54A68 80242238 0C090689 */ jal func_80241A24_B54254 /* B54A6C 8024223C 0240202D */ daddu $a0, $s2, $zero /* B54A70 80242240 10400002 */ beqz $v0, .L8024224C /* B54A74 80242244 2402001E */ addiu $v0, $zero, 0x1e @@ -117,11 +117,11 @@ glabel func_802420EC_B5491C /* B54AC4 80242294 00000000 */ nop /* B54AC8 80242298 0240202D */ daddu $a0, $s2, $zero /* B54ACC 8024229C 0260282D */ daddu $a1, $s3, $zero -/* B54AD0 802422A0 0C090582 */ jal func_80241608 +/* B54AD0 802422A0 0C090582 */ jal func_80241608_B53E38 /* B54AD4 802422A4 0280302D */ daddu $a2, $s4, $zero /* B54AD8 802422A8 0240202D */ daddu $a0, $s2, $zero /* B54ADC 802422AC 0260282D */ daddu $a1, $s3, $zero -/* B54AE0 802422B0 0C090596 */ jal func_80241658 +/* B54AE0 802422B0 0C090596 */ jal func_80241658_B53E88 /* B54AE4 802422B4 0280302D */ daddu $a2, $s4, $zero /* B54AE8 802422B8 080908DE */ j .L80242378 /* B54AEC 802422BC 00000000 */ nop @@ -151,21 +151,21 @@ glabel func_802420EC_B5491C /* B54B4C 8024231C 0280302D */ daddu $a2, $s4, $zero /* B54B50 80242320 080908DE */ j .L80242378 /* B54B54 80242324 00000000 */ nop -/* B54B58 80242328 0C090607 */ jal func_8024181C +/* B54B58 80242328 0C090607 */ jal func_8024181C_B5404C /* B54B5C 8024232C 0240202D */ daddu $a0, $s2, $zero -/* B54B60 80242330 0C090622 */ jal func_80241888 +/* B54B60 80242330 0C090622 */ jal func_80241888_B540B8 /* B54B64 80242334 0240202D */ daddu $a0, $s2, $zero /* B54B68 80242338 8E430070 */ lw $v1, 0x70($s2) /* B54B6C 8024233C 24020020 */ addiu $v0, $zero, 0x20 /* B54B70 80242340 1462000D */ bne $v1, $v0, .L80242378 /* B54B74 80242344 00000000 */ nop -/* B54B78 80242348 0C09063E */ jal func_802418F8 +/* B54B78 80242348 0C09063E */ jal func_802418F8_B54128 /* B54B7C 8024234C 0240202D */ daddu $a0, $s2, $zero /* B54B80 80242350 8E430070 */ lw $v1, 0x70($s2) /* B54B84 80242354 24020021 */ addiu $v0, $zero, 0x21 /* B54B88 80242358 14620007 */ bne $v1, $v0, .L80242378 /* B54B8C 8024235C 00000000 */ nop -/* B54B90 80242360 0C090674 */ jal func_802419D0 +/* B54B90 80242360 0C090674 */ jal func_802419D0_B54200 /* B54B94 80242364 0240202D */ daddu $a0, $s2, $zero /* B54B98 80242368 080908DE */ j .L80242378 /* B54B9C 8024236C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80242410_B54C40.s b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80242410_B54C40.s index 86136c61af..6da37bc7b2 100644 --- a/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80242410_B54C40.s +++ b/asm/nonmatchings/world/area_jan/jan_06/B52F70/func_80242410_B54C40.s @@ -55,7 +55,7 @@ glabel func_80242410_B54C40 /* B54D08 802424D8 4405E000 */ mfc1 $a1, $f28 /* B54D0C 802424DC 4406D000 */ mfc1 $a2, $f26 /* B54D10 802424E0 4407C000 */ mfc1 $a3, $f24 -/* B54D14 802424E4 0C0908E8 */ jal func_802423A0 +/* B54D14 802424E4 0C0908E8 */ jal func_802423A0_B54BD0 /* B54D18 802424E8 27A40010 */ addiu $a0, $sp, 0x10 /* B54D1C 802424EC 27A40010 */ addiu $a0, $sp, 0x10 /* B54D20 802424F0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80242410_B54C40 /* B54D90 80242560 4405E000 */ mfc1 $a1, $f28 /* B54D94 80242564 4406D000 */ mfc1 $a2, $f26 /* B54D98 80242568 4407C000 */ mfc1 $a3, $f24 -/* B54D9C 8024256C 0C0908E8 */ jal func_802423A0 +/* B54D9C 8024256C 0C0908E8 */ jal func_802423A0_B54BD0 /* B54DA0 80242570 27A40010 */ addiu $a0, $sp, 0x10 /* B54DA4 80242574 27A40010 */ addiu $a0, $sp, 0x10 /* B54DA8 80242578 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214.s deleted file mode 100644 index 6b80200d08..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240214 -/* B59A84 80240214 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59A88 80240218 AFB10014 */ sw $s1, 0x14($sp) -/* B59A8C 8024021C 0080882D */ daddu $s1, $a0, $zero -/* B59A90 80240220 AFBF0018 */ sw $ra, 0x18($sp) -/* B59A94 80240224 AFB00010 */ sw $s0, 0x10($sp) -/* B59A98 80240228 8E300148 */ lw $s0, 0x148($s1) -/* B59A9C 8024022C 0C00EABB */ jal get_npc_unsafe -/* B59AA0 80240230 86040008 */ lh $a0, 8($s0) -/* B59AA4 80240234 24030001 */ addiu $v1, $zero, 1 -/* B59AA8 80240238 0040202D */ daddu $a0, $v0, $zero -/* B59AAC 8024023C AE03006C */ sw $v1, 0x6c($s0) -/* B59AB0 80240240 8482008C */ lh $v0, 0x8c($a0) -/* B59AB4 80240244 14400009 */ bnez $v0, .L8024026C -/* B59AB8 80240248 24020002 */ addiu $v0, $zero, 2 -/* B59ABC 8024024C 96030072 */ lhu $v1, 0x72($s0) -/* B59AC0 80240250 AE02006C */ sw $v0, 0x6c($s0) -/* B59AC4 80240254 A483008E */ sh $v1, 0x8e($a0) -/* B59AC8 80240258 8E0200CC */ lw $v0, 0xcc($s0) -/* B59ACC 8024025C 8C420020 */ lw $v0, 0x20($v0) -/* B59AD0 80240260 AC820028 */ sw $v0, 0x28($a0) -/* B59AD4 80240264 2402001F */ addiu $v0, $zero, 0x1f -/* B59AD8 80240268 AE220070 */ sw $v0, 0x70($s1) -.L8024026C: -/* B59ADC 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* B59AE0 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* B59AE4 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* B59AE8 80240278 03E00008 */ jr $ra -/* B59AEC 8024027C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214_B59A84.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214_B59A84.s new file mode 100644 index 0000000000..250efc7df5 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240214_B59A84.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240214_B59A84 +/* B59A84 80240214 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B59A88 80240218 AFB10014 */ sw $s1, 0x14($sp) +/* B59A8C 8024021C 0080882D */ daddu $s1, $a0, $zero +/* B59A90 80240220 AFBF0018 */ sw $ra, 0x18($sp) +/* B59A94 80240224 AFB00010 */ sw $s0, 0x10($sp) +/* B59A98 80240228 8E300148 */ lw $s0, 0x148($s1) +/* B59A9C 8024022C 0C00EABB */ jal get_npc_unsafe +/* B59AA0 80240230 86040008 */ lh $a0, 8($s0) +/* B59AA4 80240234 24030001 */ addiu $v1, $zero, 1 +/* B59AA8 80240238 0040202D */ daddu $a0, $v0, $zero +/* B59AAC 8024023C AE03006C */ sw $v1, 0x6c($s0) +/* B59AB0 80240240 8482008C */ lh $v0, 0x8c($a0) +/* B59AB4 80240244 14400009 */ bnez $v0, .L8024026C +/* B59AB8 80240248 24020002 */ addiu $v0, $zero, 2 +/* B59ABC 8024024C 96030072 */ lhu $v1, 0x72($s0) +/* B59AC0 80240250 AE02006C */ sw $v0, 0x6c($s0) +/* B59AC4 80240254 A483008E */ sh $v1, 0x8e($a0) +/* B59AC8 80240258 8E0200CC */ lw $v0, 0xcc($s0) +/* B59ACC 8024025C 8C420020 */ lw $v0, 0x20($v0) +/* B59AD0 80240260 AC820028 */ sw $v0, 0x28($a0) +/* B59AD4 80240264 2402001F */ addiu $v0, $zero, 0x1f +/* B59AD8 80240268 AE220070 */ sw $v0, 0x70($s1) +.L8024026C: +/* B59ADC 8024026C 8FBF0018 */ lw $ra, 0x18($sp) +/* B59AE0 80240270 8FB10014 */ lw $s1, 0x14($sp) +/* B59AE4 80240274 8FB00010 */ lw $s0, 0x10($sp) +/* B59AE8 80240278 03E00008 */ jr $ra +/* B59AEC 8024027C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8.s deleted file mode 100644 index cb8b3fa271..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C8 -/* B59C38 802403C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B59C3C 802403CC AFB10014 */ sw $s1, 0x14($sp) -/* B59C40 802403D0 0080882D */ daddu $s1, $a0, $zero -/* B59C44 802403D4 AFBF0018 */ sw $ra, 0x18($sp) -/* B59C48 802403D8 AFB00010 */ sw $s0, 0x10($sp) -/* B59C4C 802403DC 8E300148 */ lw $s0, 0x148($s1) -/* B59C50 802403E0 0C00EABB */ jal get_npc_unsafe -/* B59C54 802403E4 86040008 */ lh $a0, 8($s0) -/* B59C58 802403E8 9443008E */ lhu $v1, 0x8e($v0) -/* B59C5C 802403EC 2463FFFF */ addiu $v1, $v1, -1 -/* B59C60 802403F0 A443008E */ sh $v1, 0x8e($v0) -/* B59C64 802403F4 00031C00 */ sll $v1, $v1, 0x10 -/* B59C68 802403F8 1C600003 */ bgtz $v1, .L80240408 -/* B59C6C 802403FC 2402000C */ addiu $v0, $zero, 0xc -/* B59C70 80240400 AE00006C */ sw $zero, 0x6c($s0) -/* B59C74 80240404 AE220070 */ sw $v0, 0x70($s1) -.L80240408: -/* B59C78 80240408 8FBF0018 */ lw $ra, 0x18($sp) -/* B59C7C 8024040C 8FB10014 */ lw $s1, 0x14($sp) -/* B59C80 80240410 8FB00010 */ lw $s0, 0x10($sp) -/* B59C84 80240414 03E00008 */ jr $ra -/* B59C88 80240418 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s new file mode 100644 index 0000000000..0adff3f220 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_802403C8_B59C38.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403C8_B59C38 +/* B59C38 802403C8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B59C3C 802403CC AFB10014 */ sw $s1, 0x14($sp) +/* B59C40 802403D0 0080882D */ daddu $s1, $a0, $zero +/* B59C44 802403D4 AFBF0018 */ sw $ra, 0x18($sp) +/* B59C48 802403D8 AFB00010 */ sw $s0, 0x10($sp) +/* B59C4C 802403DC 8E300148 */ lw $s0, 0x148($s1) +/* B59C50 802403E0 0C00EABB */ jal get_npc_unsafe +/* B59C54 802403E4 86040008 */ lh $a0, 8($s0) +/* B59C58 802403E8 9443008E */ lhu $v1, 0x8e($v0) +/* B59C5C 802403EC 2463FFFF */ addiu $v1, $v1, -1 +/* B59C60 802403F0 A443008E */ sh $v1, 0x8e($v0) +/* B59C64 802403F4 00031C00 */ sll $v1, $v1, 0x10 +/* B59C68 802403F8 1C600003 */ bgtz $v1, .L80240408 +/* B59C6C 802403FC 2402000C */ addiu $v0, $zero, 0xc +/* B59C70 80240400 AE00006C */ sw $zero, 0x6c($s0) +/* B59C74 80240404 AE220070 */ sw $v0, 0x70($s1) +.L80240408: +/* B59C78 80240408 8FBF0018 */ lw $ra, 0x18($sp) +/* B59C7C 8024040C 8FB10014 */ lw $s1, 0x14($sp) +/* B59C80 80240410 8FB00010 */ lw $s0, 0x10($sp) +/* B59C84 80240414 03E00008 */ jr $ra +/* B59C88 80240418 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s index c01fedab56..85bc1407bf 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240830_B5A0A0.s @@ -90,7 +90,7 @@ glabel func_80240830_B5A0A0 /* B5A1E0 80240970 8E22006C */ lw $v0, 0x6c($s1) /* B5A1E4 80240974 14400006 */ bnez $v0, .L80240990 /* B5A1E8 80240978 00000000 */ nop -/* B5A1EC 8024097C 0C090107 */ jal func_8024041C +/* B5A1EC 8024097C 0C090107 */ jal func_8024041C_B59C8C /* B5A1F0 80240980 0240202D */ daddu $a0, $s2, $zero /* B5A1F4 80240984 10400002 */ beqz $v0, .L80240990 /* B5A1F8 80240988 2402001E */ addiu $v0, $zero, 0x1e @@ -151,21 +151,21 @@ glabel func_80240830_B5A0A0 /* B5A2D0 80240A60 0280302D */ daddu $a2, $s4, $zero /* B5A2D4 80240A64 080902AF */ j .L80240ABC /* B5A2D8 80240A68 00000000 */ nop -/* B5A2DC 80240A6C 0C090085 */ jal func_80240214 +/* B5A2DC 80240A6C 0C090085 */ jal func_80240214_B59A84 /* B5A2E0 80240A70 0240202D */ daddu $a0, $s2, $zero -/* B5A2E4 80240A74 0C0900A0 */ jal func_80240280 +/* B5A2E4 80240A74 0C0900A0 */ jal func_80240280_B59AF0 /* B5A2E8 80240A78 0240202D */ daddu $a0, $s2, $zero /* B5A2EC 80240A7C 8E430070 */ lw $v1, 0x70($s2) /* B5A2F0 80240A80 24020020 */ addiu $v0, $zero, 0x20 /* B5A2F4 80240A84 1462000D */ bne $v1, $v0, .L80240ABC /* B5A2F8 80240A88 00000000 */ nop -/* B5A2FC 80240A8C 0C0900BC */ jal func_802402F0 +/* B5A2FC 80240A8C 0C0900BC */ jal func_802402F0_B59B60 /* B5A300 80240A90 0240202D */ daddu $a0, $s2, $zero /* B5A304 80240A94 8E430070 */ lw $v1, 0x70($s2) /* B5A308 80240A98 24020021 */ addiu $v0, $zero, 0x21 /* B5A30C 80240A9C 14620007 */ bne $v1, $v0, .L80240ABC /* B5A310 80240AA0 00000000 */ nop -/* B5A314 80240AA4 0C0900F2 */ jal func_802403C8 +/* B5A314 80240AA4 0C0900F2 */ jal func_802403C8_B59C38 /* B5A318 80240AA8 0240202D */ daddu $a0, $s2, $zero /* B5A31C 80240AAC 080902AF */ j .L80240ABC /* B5A320 80240AB0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s index 44db78b2f6..6ab5c14ae2 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B59870/func_80240AE4_B5A354.s @@ -90,7 +90,7 @@ glabel func_80240AE4_B5A354 /* B5A494 80240C24 8E22006C */ lw $v0, 0x6c($s1) /* B5A498 80240C28 14400006 */ bnez $v0, .L80240C44 /* B5A49C 80240C2C 00000000 */ nop -/* B5A4A0 80240C30 0C090107 */ jal func_8024041C +/* B5A4A0 80240C30 0C090107 */ jal func_8024041C_B59C8C /* B5A4A4 80240C34 0240202D */ daddu $a0, $s2, $zero /* B5A4A8 80240C38 10400002 */ beqz $v0, .L80240C44 /* B5A4AC 80240C3C 2402001E */ addiu $v0, $zero, 0x1e @@ -117,11 +117,11 @@ glabel func_80240AE4_B5A354 /* B5A4FC 80240C8C 00000000 */ nop /* B5A500 80240C90 0240202D */ daddu $a0, $s2, $zero /* B5A504 80240C94 0260282D */ daddu $a1, $s3, $zero -/* B5A508 80240C98 0C090000 */ jal func_80240000 +/* B5A508 80240C98 0C090000 */ jal func_80240000_B59870 /* B5A50C 80240C9C 0280302D */ daddu $a2, $s4, $zero /* B5A510 80240CA0 0240202D */ daddu $a0, $s2, $zero /* B5A514 80240CA4 0260282D */ daddu $a1, $s3, $zero -/* B5A518 80240CA8 0C090014 */ jal func_80240050 +/* B5A518 80240CA8 0C090014 */ jal func_80240050_B598C0 /* B5A51C 80240CAC 0280302D */ daddu $a2, $s4, $zero /* B5A520 80240CB0 0809035C */ j .L80240D70 /* B5A524 80240CB4 00000000 */ nop @@ -151,21 +151,21 @@ glabel func_80240AE4_B5A354 /* B5A584 80240D14 0280302D */ daddu $a2, $s4, $zero /* B5A588 80240D18 0809035C */ j .L80240D70 /* B5A58C 80240D1C 00000000 */ nop -/* B5A590 80240D20 0C090085 */ jal func_80240214 +/* B5A590 80240D20 0C090085 */ jal func_80240214_B59A84 /* B5A594 80240D24 0240202D */ daddu $a0, $s2, $zero -/* B5A598 80240D28 0C0900A0 */ jal func_80240280 +/* B5A598 80240D28 0C0900A0 */ jal func_80240280_B59AF0 /* B5A59C 80240D2C 0240202D */ daddu $a0, $s2, $zero /* B5A5A0 80240D30 8E430070 */ lw $v1, 0x70($s2) /* B5A5A4 80240D34 24020020 */ addiu $v0, $zero, 0x20 /* B5A5A8 80240D38 1462000D */ bne $v1, $v0, .L80240D70 /* B5A5AC 80240D3C 00000000 */ nop -/* B5A5B0 80240D40 0C0900BC */ jal func_802402F0 +/* B5A5B0 80240D40 0C0900BC */ jal func_802402F0_B59B60 /* B5A5B4 80240D44 0240202D */ daddu $a0, $s2, $zero /* B5A5B8 80240D48 8E430070 */ lw $v1, 0x70($s2) /* B5A5BC 80240D4C 24020021 */ addiu $v0, $zero, 0x21 /* B5A5C0 80240D50 14620007 */ bne $v1, $v0, .L80240D70 /* B5A5C4 80240D54 00000000 */ nop -/* B5A5C8 80240D58 0C0900F2 */ jal func_802403C8 +/* B5A5C8 80240D58 0C0900F2 */ jal func_802403C8_B59C38 /* B5A5CC 80240D5C 0240202D */ daddu $a0, $s2, $zero /* B5A5D0 80240D60 0809035C */ j .L80240D70 /* B5A5D4 80240D64 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B5A610/func_80240E10.s b/asm/nonmatchings/world/area_jan/jan_07/B5A610/func_80240E10.s deleted file mode 100644 index 70c0436af2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_07/B5A610/func_80240E10.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E10 -/* B5A680 80240E10 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B5A684 80240E14 AFB10054 */ sw $s1, 0x54($sp) -/* B5A688 80240E18 0080882D */ daddu $s1, $a0, $zero -/* B5A68C 80240E1C AFBF005C */ sw $ra, 0x5c($sp) -/* B5A690 80240E20 AFB20058 */ sw $s2, 0x58($sp) -/* B5A694 80240E24 AFB00050 */ sw $s0, 0x50($sp) -/* B5A698 80240E28 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B5A69C 80240E2C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B5A6A0 80240E30 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B5A6A4 80240E34 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B5A6A8 80240E38 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B5A6AC 80240E3C 8E30000C */ lw $s0, 0xc($s1) -/* B5A6B0 80240E40 8E050000 */ lw $a1, ($s0) -/* B5A6B4 80240E44 0C0B1EAF */ jal get_variable -/* B5A6B8 80240E48 26100004 */ addiu $s0, $s0, 4 -/* B5A6BC 80240E4C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B5A6C0 80240E50 0040202D */ daddu $a0, $v0, $zero -/* B5A6C4 80240E54 8E050000 */ lw $a1, ($s0) -/* B5A6C8 80240E58 26100004 */ addiu $s0, $s0, 4 -/* B5A6CC 80240E5C 0220202D */ daddu $a0, $s1, $zero -/* B5A6D0 80240E60 0C0B210B */ jal get_float_variable -/* B5A6D4 80240E64 0040902D */ daddu $s2, $v0, $zero -/* B5A6D8 80240E68 8E050000 */ lw $a1, ($s0) -/* B5A6DC 80240E6C 26100004 */ addiu $s0, $s0, 4 -/* B5A6E0 80240E70 0220202D */ daddu $a0, $s1, $zero -/* B5A6E4 80240E74 0C0B210B */ jal get_float_variable -/* B5A6E8 80240E78 46000706 */ mov.s $f28, $f0 -/* B5A6EC 80240E7C 8E050000 */ lw $a1, ($s0) -/* B5A6F0 80240E80 26100004 */ addiu $s0, $s0, 4 -/* B5A6F4 80240E84 0220202D */ daddu $a0, $s1, $zero -/* B5A6F8 80240E88 0C0B210B */ jal get_float_variable -/* B5A6FC 80240E8C 46000686 */ mov.s $f26, $f0 -/* B5A700 80240E90 0220202D */ daddu $a0, $s1, $zero -/* B5A704 80240E94 8E050000 */ lw $a1, ($s0) -/* B5A708 80240E98 0C0B210B */ jal get_float_variable -/* B5A70C 80240E9C 46000586 */ mov.s $f22, $f0 -/* B5A710 80240EA0 0240202D */ daddu $a0, $s2, $zero -/* B5A714 80240EA4 0C046B4C */ jal get_model_from_list_index -/* B5A718 80240EA8 46000606 */ mov.s $f24, $f0 -/* B5A71C 80240EAC 0040882D */ daddu $s1, $v0, $zero -/* B5A720 80240EB0 96220000 */ lhu $v0, ($s1) -/* B5A724 80240EB4 30420400 */ andi $v0, $v0, 0x400 -/* B5A728 80240EB8 1440001E */ bnez $v0, .L80240F34 -/* B5A72C 80240EBC 26300058 */ addiu $s0, $s1, 0x58 -/* B5A730 80240EC0 4480A000 */ mtc1 $zero, $f20 -/* B5A734 80240EC4 4406B000 */ mfc1 $a2, $f22 -/* B5A738 80240EC8 4405A000 */ mfc1 $a1, $f20 -/* B5A73C 80240ECC 4407A000 */ mfc1 $a3, $f20 -/* B5A740 80240ED0 0C019E40 */ jal guTranslateF -/* B5A744 80240ED4 0200202D */ daddu $a0, $s0, $zero -/* B5A748 80240ED8 4405E000 */ mfc1 $a1, $f28 -/* B5A74C 80240EDC 4406D000 */ mfc1 $a2, $f26 -/* B5A750 80240EE0 4407C000 */ mfc1 $a3, $f24 -/* B5A754 80240EE4 0C090368 */ jal func_80240DA0 -/* B5A758 80240EE8 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A75C 80240EEC 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A760 80240EF0 0200282D */ daddu $a1, $s0, $zero -/* B5A764 80240EF4 0C019D80 */ jal guMtxCatF -/* B5A768 80240EF8 0200302D */ daddu $a2, $s0, $zero -/* B5A76C 80240EFC 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A770 80240F00 4600B587 */ neg.s $f22, $f22 -/* B5A774 80240F04 4405A000 */ mfc1 $a1, $f20 -/* B5A778 80240F08 4406B000 */ mfc1 $a2, $f22 -/* B5A77C 80240F0C 0C019E40 */ jal guTranslateF -/* B5A780 80240F10 00A0382D */ daddu $a3, $a1, $zero -/* B5A784 80240F14 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A788 80240F18 0200282D */ daddu $a1, $s0, $zero -/* B5A78C 80240F1C 0C019D80 */ jal guMtxCatF -/* B5A790 80240F20 00A0302D */ daddu $a2, $a1, $zero -/* B5A794 80240F24 96220000 */ lhu $v0, ($s1) -/* B5A798 80240F28 34421400 */ ori $v0, $v0, 0x1400 -/* B5A79C 80240F2C 080903EB */ j .L80240FAC -/* B5A7A0 80240F30 A6220000 */ sh $v0, ($s1) -.L80240F34: -/* B5A7A4 80240F34 4480A000 */ mtc1 $zero, $f20 -/* B5A7A8 80240F38 4406B000 */ mfc1 $a2, $f22 -/* B5A7AC 80240F3C 4405A000 */ mfc1 $a1, $f20 -/* B5A7B0 80240F40 4407A000 */ mfc1 $a3, $f20 -/* B5A7B4 80240F44 0C019E40 */ jal guTranslateF -/* B5A7B8 80240F48 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A7BC 80240F4C 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A7C0 80240F50 26300058 */ addiu $s0, $s1, 0x58 -/* B5A7C4 80240F54 0200282D */ daddu $a1, $s0, $zero -/* B5A7C8 80240F58 0C019D80 */ jal guMtxCatF -/* B5A7CC 80240F5C 0200302D */ daddu $a2, $s0, $zero -/* B5A7D0 80240F60 4405E000 */ mfc1 $a1, $f28 -/* B5A7D4 80240F64 4406D000 */ mfc1 $a2, $f26 -/* B5A7D8 80240F68 4407C000 */ mfc1 $a3, $f24 -/* B5A7DC 80240F6C 0C090368 */ jal func_80240DA0 -/* B5A7E0 80240F70 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A7E4 80240F74 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A7E8 80240F78 0200282D */ daddu $a1, $s0, $zero -/* B5A7EC 80240F7C 0C019D80 */ jal guMtxCatF -/* B5A7F0 80240F80 0200302D */ daddu $a2, $s0, $zero -/* B5A7F4 80240F84 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A7F8 80240F88 4600B587 */ neg.s $f22, $f22 -/* B5A7FC 80240F8C 4405A000 */ mfc1 $a1, $f20 -/* B5A800 80240F90 4406B000 */ mfc1 $a2, $f22 -/* B5A804 80240F94 0C019E40 */ jal guTranslateF -/* B5A808 80240F98 00A0382D */ daddu $a3, $a1, $zero -/* B5A80C 80240F9C 27A40010 */ addiu $a0, $sp, 0x10 -/* B5A810 80240FA0 0200282D */ daddu $a1, $s0, $zero -/* B5A814 80240FA4 0C019D80 */ jal guMtxCatF -/* B5A818 80240FA8 00A0302D */ daddu $a2, $a1, $zero -.L80240FAC: -/* B5A81C 80240FAC 8FBF005C */ lw $ra, 0x5c($sp) -/* B5A820 80240FB0 8FB20058 */ lw $s2, 0x58($sp) -/* B5A824 80240FB4 8FB10054 */ lw $s1, 0x54($sp) -/* B5A828 80240FB8 8FB00050 */ lw $s0, 0x50($sp) -/* B5A82C 80240FBC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B5A830 80240FC0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B5A834 80240FC4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B5A838 80240FC8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B5A83C 80240FCC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B5A840 80240FD0 24020002 */ addiu $v0, $zero, 2 -/* B5A844 80240FD4 03E00008 */ jr $ra -/* B5A848 80240FD8 27BD0088 */ addiu $sp, $sp, 0x88 -/* B5A84C 80240FDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B5A610/func_80240E10_B5A680.s b/asm/nonmatchings/world/area_jan/jan_07/B5A610/func_80240E10_B5A680.s new file mode 100644 index 0000000000..f1331cab43 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_07/B5A610/func_80240E10_B5A680.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E10_B5A680 +/* B5A680 80240E10 27BDFF78 */ addiu $sp, $sp, -0x88 +/* B5A684 80240E14 AFB10054 */ sw $s1, 0x54($sp) +/* B5A688 80240E18 0080882D */ daddu $s1, $a0, $zero +/* B5A68C 80240E1C AFBF005C */ sw $ra, 0x5c($sp) +/* B5A690 80240E20 AFB20058 */ sw $s2, 0x58($sp) +/* B5A694 80240E24 AFB00050 */ sw $s0, 0x50($sp) +/* B5A698 80240E28 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* B5A69C 80240E2C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* B5A6A0 80240E30 F7B80070 */ sdc1 $f24, 0x70($sp) +/* B5A6A4 80240E34 F7B60068 */ sdc1 $f22, 0x68($sp) +/* B5A6A8 80240E38 F7B40060 */ sdc1 $f20, 0x60($sp) +/* B5A6AC 80240E3C 8E30000C */ lw $s0, 0xc($s1) +/* B5A6B0 80240E40 8E050000 */ lw $a1, ($s0) +/* B5A6B4 80240E44 0C0B1EAF */ jal get_variable +/* B5A6B8 80240E48 26100004 */ addiu $s0, $s0, 4 +/* B5A6BC 80240E4C 0C046C04 */ jal get_model_list_index_from_tree_index +/* B5A6C0 80240E50 0040202D */ daddu $a0, $v0, $zero +/* B5A6C4 80240E54 8E050000 */ lw $a1, ($s0) +/* B5A6C8 80240E58 26100004 */ addiu $s0, $s0, 4 +/* B5A6CC 80240E5C 0220202D */ daddu $a0, $s1, $zero +/* B5A6D0 80240E60 0C0B210B */ jal get_float_variable +/* B5A6D4 80240E64 0040902D */ daddu $s2, $v0, $zero +/* B5A6D8 80240E68 8E050000 */ lw $a1, ($s0) +/* B5A6DC 80240E6C 26100004 */ addiu $s0, $s0, 4 +/* B5A6E0 80240E70 0220202D */ daddu $a0, $s1, $zero +/* B5A6E4 80240E74 0C0B210B */ jal get_float_variable +/* B5A6E8 80240E78 46000706 */ mov.s $f28, $f0 +/* B5A6EC 80240E7C 8E050000 */ lw $a1, ($s0) +/* B5A6F0 80240E80 26100004 */ addiu $s0, $s0, 4 +/* B5A6F4 80240E84 0220202D */ daddu $a0, $s1, $zero +/* B5A6F8 80240E88 0C0B210B */ jal get_float_variable +/* B5A6FC 80240E8C 46000686 */ mov.s $f26, $f0 +/* B5A700 80240E90 0220202D */ daddu $a0, $s1, $zero +/* B5A704 80240E94 8E050000 */ lw $a1, ($s0) +/* B5A708 80240E98 0C0B210B */ jal get_float_variable +/* B5A70C 80240E9C 46000586 */ mov.s $f22, $f0 +/* B5A710 80240EA0 0240202D */ daddu $a0, $s2, $zero +/* B5A714 80240EA4 0C046B4C */ jal get_model_from_list_index +/* B5A718 80240EA8 46000606 */ mov.s $f24, $f0 +/* B5A71C 80240EAC 0040882D */ daddu $s1, $v0, $zero +/* B5A720 80240EB0 96220000 */ lhu $v0, ($s1) +/* B5A724 80240EB4 30420400 */ andi $v0, $v0, 0x400 +/* B5A728 80240EB8 1440001E */ bnez $v0, .L80240F34 +/* B5A72C 80240EBC 26300058 */ addiu $s0, $s1, 0x58 +/* B5A730 80240EC0 4480A000 */ mtc1 $zero, $f20 +/* B5A734 80240EC4 4406B000 */ mfc1 $a2, $f22 +/* B5A738 80240EC8 4405A000 */ mfc1 $a1, $f20 +/* B5A73C 80240ECC 4407A000 */ mfc1 $a3, $f20 +/* B5A740 80240ED0 0C019E40 */ jal guTranslateF +/* B5A744 80240ED4 0200202D */ daddu $a0, $s0, $zero +/* B5A748 80240ED8 4405E000 */ mfc1 $a1, $f28 +/* B5A74C 80240EDC 4406D000 */ mfc1 $a2, $f26 +/* B5A750 80240EE0 4407C000 */ mfc1 $a3, $f24 +/* B5A754 80240EE4 0C090368 */ jal func_80240DA0_B5A610 +/* B5A758 80240EE8 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A75C 80240EEC 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A760 80240EF0 0200282D */ daddu $a1, $s0, $zero +/* B5A764 80240EF4 0C019D80 */ jal guMtxCatF +/* B5A768 80240EF8 0200302D */ daddu $a2, $s0, $zero +/* B5A76C 80240EFC 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A770 80240F00 4600B587 */ neg.s $f22, $f22 +/* B5A774 80240F04 4405A000 */ mfc1 $a1, $f20 +/* B5A778 80240F08 4406B000 */ mfc1 $a2, $f22 +/* B5A77C 80240F0C 0C019E40 */ jal guTranslateF +/* B5A780 80240F10 00A0382D */ daddu $a3, $a1, $zero +/* B5A784 80240F14 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A788 80240F18 0200282D */ daddu $a1, $s0, $zero +/* B5A78C 80240F1C 0C019D80 */ jal guMtxCatF +/* B5A790 80240F20 00A0302D */ daddu $a2, $a1, $zero +/* B5A794 80240F24 96220000 */ lhu $v0, ($s1) +/* B5A798 80240F28 34421400 */ ori $v0, $v0, 0x1400 +/* B5A79C 80240F2C 080903EB */ j .L80240FAC +/* B5A7A0 80240F30 A6220000 */ sh $v0, ($s1) +.L80240F34: +/* B5A7A4 80240F34 4480A000 */ mtc1 $zero, $f20 +/* B5A7A8 80240F38 4406B000 */ mfc1 $a2, $f22 +/* B5A7AC 80240F3C 4405A000 */ mfc1 $a1, $f20 +/* B5A7B0 80240F40 4407A000 */ mfc1 $a3, $f20 +/* B5A7B4 80240F44 0C019E40 */ jal guTranslateF +/* B5A7B8 80240F48 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A7BC 80240F4C 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A7C0 80240F50 26300058 */ addiu $s0, $s1, 0x58 +/* B5A7C4 80240F54 0200282D */ daddu $a1, $s0, $zero +/* B5A7C8 80240F58 0C019D80 */ jal guMtxCatF +/* B5A7CC 80240F5C 0200302D */ daddu $a2, $s0, $zero +/* B5A7D0 80240F60 4405E000 */ mfc1 $a1, $f28 +/* B5A7D4 80240F64 4406D000 */ mfc1 $a2, $f26 +/* B5A7D8 80240F68 4407C000 */ mfc1 $a3, $f24 +/* B5A7DC 80240F6C 0C090368 */ jal func_80240DA0_B5A610 +/* B5A7E0 80240F70 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A7E4 80240F74 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A7E8 80240F78 0200282D */ daddu $a1, $s0, $zero +/* B5A7EC 80240F7C 0C019D80 */ jal guMtxCatF +/* B5A7F0 80240F80 0200302D */ daddu $a2, $s0, $zero +/* B5A7F4 80240F84 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A7F8 80240F88 4600B587 */ neg.s $f22, $f22 +/* B5A7FC 80240F8C 4405A000 */ mfc1 $a1, $f20 +/* B5A800 80240F90 4406B000 */ mfc1 $a2, $f22 +/* B5A804 80240F94 0C019E40 */ jal guTranslateF +/* B5A808 80240F98 00A0382D */ daddu $a3, $a1, $zero +/* B5A80C 80240F9C 27A40010 */ addiu $a0, $sp, 0x10 +/* B5A810 80240FA0 0200282D */ daddu $a1, $s0, $zero +/* B5A814 80240FA4 0C019D80 */ jal guMtxCatF +/* B5A818 80240FA8 00A0302D */ daddu $a2, $a1, $zero +.L80240FAC: +/* B5A81C 80240FAC 8FBF005C */ lw $ra, 0x5c($sp) +/* B5A820 80240FB0 8FB20058 */ lw $s2, 0x58($sp) +/* B5A824 80240FB4 8FB10054 */ lw $s1, 0x54($sp) +/* B5A828 80240FB8 8FB00050 */ lw $s0, 0x50($sp) +/* B5A82C 80240FBC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* B5A830 80240FC0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* B5A834 80240FC4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* B5A838 80240FC8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* B5A83C 80240FCC D7B40060 */ ldc1 $f20, 0x60($sp) +/* B5A840 80240FD0 24020002 */ addiu $v0, $zero, 2 +/* B5A844 80240FD4 03E00008 */ jr $ra +/* B5A848 80240FD8 27BD0088 */ addiu $sp, $sp, 0x88 +/* B5A84C 80240FDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_07/B5A850/func_80241050_B5A8C0.s b/asm/nonmatchings/world/area_jan/jan_07/B5A850/func_80241050_B5A8C0.s index 49b112a6ee..e294740791 100644 --- a/asm/nonmatchings/world/area_jan/jan_07/B5A850/func_80241050_B5A8C0.s +++ b/asm/nonmatchings/world/area_jan/jan_07/B5A850/func_80241050_B5A8C0.s @@ -55,7 +55,7 @@ glabel func_80241050_B5A8C0 /* B5A988 80241118 4405E000 */ mfc1 $a1, $f28 /* B5A98C 8024111C 4406D000 */ mfc1 $a2, $f26 /* B5A990 80241120 4407C000 */ mfc1 $a3, $f24 -/* B5A994 80241124 0C0903F8 */ jal func_80240FE0 +/* B5A994 80241124 0C0903F8 */ jal func_80240FE0_B5A850 /* B5A998 80241128 27A40010 */ addiu $a0, $sp, 0x10 /* B5A99C 8024112C 27A40010 */ addiu $a0, $sp, 0x10 /* B5A9A0 80241130 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80241050_B5A8C0 /* B5AA10 802411A0 4405E000 */ mfc1 $a1, $f28 /* B5AA14 802411A4 4406D000 */ mfc1 $a2, $f26 /* B5AA18 802411A8 4407C000 */ mfc1 $a3, $f24 -/* B5AA1C 802411AC 0C0903F8 */ jal func_80240FE0 +/* B5AA1C 802411AC 0C0903F8 */ jal func_80240FE0_B5A850 /* B5AA20 802411B0 27A40010 */ addiu $a0, $sp, 0x10 /* B5AA24 802411B4 27A40010 */ addiu $a0, $sp, 0x10 /* B5AA28 802411B8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_80240380_B5E630.s b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_80240380_B5E630.s index 35adcc7ed7..9e44999414 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_80240380_B5E630.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_80240380_B5E630.s @@ -55,7 +55,7 @@ glabel func_80240380_B5E630 /* B5E6F8 80240448 4405E000 */ mfc1 $a1, $f28 /* B5E6FC 8024044C 4406D000 */ mfc1 $a2, $f26 /* B5E700 80240450 4407C000 */ mfc1 $a3, $f24 -/* B5E704 80240454 0C0900C4 */ jal func_80240310 +/* B5E704 80240454 0C0900C4 */ jal func_80240310_B5E5C0 /* B5E708 80240458 27A40010 */ addiu $a0, $sp, 0x10 /* B5E70C 8024045C 27A40010 */ addiu $a0, $sp, 0x10 /* B5E710 80240460 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240380_B5E630 /* B5E780 802404D0 4405E000 */ mfc1 $a1, $f28 /* B5E784 802404D4 4406D000 */ mfc1 $a2, $f26 /* B5E788 802404D8 4407C000 */ mfc1 $a3, $f24 -/* B5E78C 802404DC 0C0900C4 */ jal func_80240310 +/* B5E78C 802404DC 0C0900C4 */ jal func_80240310_B5E5C0 /* B5E790 802404E0 27A40010 */ addiu $a0, $sp, 0x10 /* B5E794 802404E4 27A40010 */ addiu $a0, $sp, 0x10 /* B5E798 802404E8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C.s b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C.s deleted file mode 100644 index f1c5b994a5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024054C -/* B5E7FC 8024054C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5E800 80240550 AFB00010 */ sw $s0, 0x10($sp) -/* B5E804 80240554 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B5E808 80240558 4485A000 */ mtc1 $a1, $f20 -/* B5E80C 8024055C AFBF0014 */ sw $ra, 0x14($sp) -/* B5E810 80240560 0C019D28 */ jal guMtxIdentF -/* B5E814 80240564 0080802D */ daddu $s0, $a0, $zero -/* B5E818 80240568 3C018024 */ lui $at, 0x8024 -/* B5E81C 8024056C D42074B0 */ ldc1 $f0, 0x74b0($at) -/* B5E820 80240570 4600A521 */ cvt.d.s $f20, $f20 -/* B5E824 80240574 4620A502 */ mul.d $f20, $f20, $f0 -/* B5E828 80240578 00000000 */ nop -/* B5E82C 8024057C 3C013F80 */ lui $at, 0x3f80 -/* B5E830 80240580 44810000 */ mtc1 $at, $f0 -/* B5E834 80240584 AE000018 */ sw $zero, 0x18($s0) -/* B5E838 80240588 E6000014 */ swc1 $f0, 0x14($s0) -/* B5E83C 8024058C 4620A520 */ cvt.s.d $f20, $f20 -/* B5E840 80240590 E6140010 */ swc1 $f20, 0x10($s0) -/* B5E844 80240594 8FBF0014 */ lw $ra, 0x14($sp) -/* B5E848 80240598 8FB00010 */ lw $s0, 0x10($sp) -/* B5E84C 8024059C D7B40018 */ ldc1 $f20, 0x18($sp) -/* B5E850 802405A0 03E00008 */ jr $ra -/* B5E854 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s new file mode 100644 index 0000000000..00fe64ca5d --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_8024054C_B5E7FC.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024054C_B5E7FC +/* B5E7FC 8024054C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B5E800 80240550 AFB00010 */ sw $s0, 0x10($sp) +/* B5E804 80240554 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B5E808 80240558 4485A000 */ mtc1 $a1, $f20 +/* B5E80C 8024055C AFBF0014 */ sw $ra, 0x14($sp) +/* B5E810 80240560 0C019D28 */ jal guMtxIdentF +/* B5E814 80240564 0080802D */ daddu $s0, $a0, $zero +/* B5E818 80240568 3C018024 */ lui $at, 0x8024 +/* B5E81C 8024056C D42074B0 */ ldc1 $f0, 0x74b0($at) +/* B5E820 80240570 4600A521 */ cvt.d.s $f20, $f20 +/* B5E824 80240574 4620A502 */ mul.d $f20, $f20, $f0 +/* B5E828 80240578 00000000 */ nop +/* B5E82C 8024057C 3C013F80 */ lui $at, 0x3f80 +/* B5E830 80240580 44810000 */ mtc1 $at, $f0 +/* B5E834 80240584 AE000018 */ sw $zero, 0x18($s0) +/* B5E838 80240588 E6000014 */ swc1 $f0, 0x14($s0) +/* B5E83C 8024058C 4620A520 */ cvt.s.d $f20, $f20 +/* B5E840 80240590 E6140010 */ swc1 $f20, 0x10($s0) +/* B5E844 80240594 8FBF0014 */ lw $ra, 0x14($sp) +/* B5E848 80240598 8FB00010 */ lw $s0, 0x10($sp) +/* B5E84C 8024059C D7B40018 */ ldc1 $f20, 0x18($sp) +/* B5E850 802405A0 03E00008 */ jr $ra +/* B5E854 802405A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s index 48eec6a373..0232006cf8 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E5C0/func_802405A8_B5E858.s @@ -27,7 +27,7 @@ glabel func_802405A8_B5E858 /* B5E8B0 80240600 14400008 */ bnez $v0, .L80240624 /* B5E8B4 80240604 00000000 */ nop /* B5E8B8 80240608 4405A000 */ mfc1 $a1, $f20 -/* B5E8BC 8024060C 0C090153 */ jal func_8024054C +/* B5E8BC 8024060C 0C090153 */ jal func_8024054C_B5E7FC /* B5E8C0 80240610 26040058 */ addiu $a0, $s0, 0x58 /* B5E8C4 80240614 96020000 */ lhu $v0, ($s0) /* B5E8C8 80240618 34421400 */ ori $v0, $v0, 0x1400 @@ -35,7 +35,7 @@ glabel func_802405A8_B5E858 /* B5E8D0 80240620 A6020000 */ sh $v0, ($s0) .L80240624: /* B5E8D4 80240624 4405A000 */ mfc1 $a1, $f20 -/* B5E8D8 80240628 0C090153 */ jal func_8024054C +/* B5E8D8 80240628 0C090153 */ jal func_8024054C_B5E7FC /* B5E8DC 8024062C 27A40010 */ addiu $a0, $sp, 0x10 /* B5E8E0 80240630 27A40010 */ addiu $a0, $sp, 0x10 /* B5E8E4 80240634 26050058 */ addiu $a1, $s0, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240B70.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240B70.s deleted file mode 100644 index 60461c7900..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240B70.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B70 -/* B5EE20 80240B70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B5EE24 80240B74 AFBF0010 */ sw $ra, 0x10($sp) -/* B5EE28 80240B78 8C82000C */ lw $v0, 0xc($a0) -/* B5EE2C 80240B7C 0C0B1EAF */ jal get_variable -/* B5EE30 80240B80 8C450000 */ lw $a1, ($v0) -/* B5EE34 80240B84 0040202D */ daddu $a0, $v0, $zero -/* B5EE38 80240B88 8C830000 */ lw $v1, ($a0) -/* B5EE3C 80240B8C 34630010 */ ori $v1, $v1, 0x10 -/* B5EE40 80240B90 AC830000 */ sw $v1, ($a0) -/* B5EE44 80240B94 8FBF0010 */ lw $ra, 0x10($sp) -/* B5EE48 80240B98 24020002 */ addiu $v0, $zero, 2 -/* B5EE4C 80240B9C 03E00008 */ jr $ra -/* B5EE50 80240BA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240B70_B5EE20.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240B70_B5EE20.s new file mode 100644 index 0000000000..d076325d3a --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240B70_B5EE20.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B70_B5EE20 +/* B5EE20 80240B70 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B5EE24 80240B74 AFBF0010 */ sw $ra, 0x10($sp) +/* B5EE28 80240B78 8C82000C */ lw $v0, 0xc($a0) +/* B5EE2C 80240B7C 0C0B1EAF */ jal get_variable +/* B5EE30 80240B80 8C450000 */ lw $a1, ($v0) +/* B5EE34 80240B84 0040202D */ daddu $a0, $v0, $zero +/* B5EE38 80240B88 8C830000 */ lw $v1, ($a0) +/* B5EE3C 80240B8C 34630010 */ ori $v1, $v1, 0x10 +/* B5EE40 80240B90 AC830000 */ sw $v1, ($a0) +/* B5EE44 80240B94 8FBF0010 */ lw $ra, 0x10($sp) +/* B5EE48 80240B98 24020002 */ addiu $v0, $zero, 2 +/* B5EE4C 80240B9C 03E00008 */ jr $ra +/* B5EE50 80240BA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4.s deleted file mode 100644 index f409d3405d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA4 -/* B5EE54 80240BA4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5EE58 80240BA8 AFBF0018 */ sw $ra, 0x18($sp) -/* B5EE5C 80240BAC 8C82000C */ lw $v0, 0xc($a0) -/* B5EE60 80240BB0 0C0B1EAF */ jal get_variable -/* B5EE64 80240BB4 8C450000 */ lw $a1, ($v0) -/* B5EE68 80240BB8 0C04417A */ jal get_entity_by_index -/* B5EE6C 80240BBC 0040202D */ daddu $a0, $v0, $zero -/* B5EE70 80240BC0 3C013F80 */ lui $at, 0x3f80 -/* B5EE74 80240BC4 44810000 */ mtc1 $at, $f0 -/* B5EE78 80240BC8 C442004C */ lwc1 $f2, 0x4c($v0) -/* B5EE7C 80240BCC E7A00010 */ swc1 $f0, 0x10($sp) -/* B5EE80 80240BD0 3C014148 */ lui $at, 0x4148 -/* B5EE84 80240BD4 44810000 */ mtc1 $at, $f0 -/* B5EE88 80240BD8 2403004B */ addiu $v1, $zero, 0x4b -/* B5EE8C 80240BDC AFA30014 */ sw $v1, 0x14($sp) -/* B5EE90 80240BE0 46001080 */ add.s $f2, $f2, $f0 -/* B5EE94 80240BE4 8C450048 */ lw $a1, 0x48($v0) -/* B5EE98 80240BE8 8C470050 */ lw $a3, 0x50($v0) -/* B5EE9C 80240BEC 44061000 */ mfc1 $a2, $f2 -/* B5EEA0 80240BF0 0C01C2EC */ jal func_80070BB0 -/* B5EEA4 80240BF4 24040004 */ addiu $a0, $zero, 4 -/* B5EEA8 80240BF8 8FBF0018 */ lw $ra, 0x18($sp) -/* B5EEAC 80240BFC 24020002 */ addiu $v0, $zero, 2 -/* B5EEB0 80240C00 03E00008 */ jr $ra -/* B5EEB4 80240C04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4_B5EE54.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4_B5EE54.s new file mode 100644 index 0000000000..c981cc2f70 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240BA4_B5EE54.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BA4_B5EE54 +/* B5EE54 80240BA4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B5EE58 80240BA8 AFBF0018 */ sw $ra, 0x18($sp) +/* B5EE5C 80240BAC 8C82000C */ lw $v0, 0xc($a0) +/* B5EE60 80240BB0 0C0B1EAF */ jal get_variable +/* B5EE64 80240BB4 8C450000 */ lw $a1, ($v0) +/* B5EE68 80240BB8 0C04417A */ jal get_entity_by_index +/* B5EE6C 80240BBC 0040202D */ daddu $a0, $v0, $zero +/* B5EE70 80240BC0 3C013F80 */ lui $at, 0x3f80 +/* B5EE74 80240BC4 44810000 */ mtc1 $at, $f0 +/* B5EE78 80240BC8 C442004C */ lwc1 $f2, 0x4c($v0) +/* B5EE7C 80240BCC E7A00010 */ swc1 $f0, 0x10($sp) +/* B5EE80 80240BD0 3C014148 */ lui $at, 0x4148 +/* B5EE84 80240BD4 44810000 */ mtc1 $at, $f0 +/* B5EE88 80240BD8 2403004B */ addiu $v1, $zero, 0x4b +/* B5EE8C 80240BDC AFA30014 */ sw $v1, 0x14($sp) +/* B5EE90 80240BE0 46001080 */ add.s $f2, $f2, $f0 +/* B5EE94 80240BE4 8C450048 */ lw $a1, 0x48($v0) +/* B5EE98 80240BE8 8C470050 */ lw $a3, 0x50($v0) +/* B5EE9C 80240BEC 44061000 */ mfc1 $a2, $f2 +/* B5EEA0 80240BF0 0C01C2EC */ jal func_80070BB0 +/* B5EEA4 80240BF4 24040004 */ addiu $a0, $zero, 4 +/* B5EEA8 80240BF8 8FBF0018 */ lw $ra, 0x18($sp) +/* B5EEAC 80240BFC 24020002 */ addiu $v0, $zero, 2 +/* B5EEB0 80240C00 03E00008 */ jr $ra +/* B5EEB4 80240C04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198.s deleted file mode 100644 index faf783834f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241198 -/* B5F448 80241198 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F44C 8024119C AFB10014 */ sw $s1, 0x14($sp) -/* B5F450 802411A0 0080882D */ daddu $s1, $a0, $zero -/* B5F454 802411A4 AFB20018 */ sw $s2, 0x18($sp) -/* B5F458 802411A8 AFBF001C */ sw $ra, 0x1c($sp) -/* B5F45C 802411AC AFB00010 */ sw $s0, 0x10($sp) -/* B5F460 802411B0 8E30000C */ lw $s0, 0xc($s1) -/* B5F464 802411B4 10A00010 */ beqz $a1, .L802411F8 -/* B5F468 802411B8 0000902D */ daddu $s2, $zero, $zero -/* B5F46C 802411BC 8E050000 */ lw $a1, ($s0) -/* B5F470 802411C0 0C0B1EAF */ jal get_variable -/* B5F474 802411C4 26100004 */ addiu $s0, $s0, 4 -/* B5F478 802411C8 AE220084 */ sw $v0, 0x84($s1) -/* B5F47C 802411CC 8E050000 */ lw $a1, ($s0) -/* B5F480 802411D0 0C0B1EAF */ jal get_variable -/* B5F484 802411D4 0220202D */ daddu $a0, $s1, $zero -/* B5F488 802411D8 0240202D */ daddu $a0, $s2, $zero -/* B5F48C 802411DC 240500D0 */ addiu $a1, $zero, 0xd0 -/* B5F490 802411E0 00A0302D */ daddu $a2, $a1, $zero -/* B5F494 802411E4 00A0382D */ daddu $a3, $a1, $zero -/* B5F498 802411E8 AE220088 */ sw $v0, 0x88($s1) -/* B5F49C 802411EC AE200070 */ sw $zero, 0x70($s1) -/* B5F4A0 802411F0 0C04DF84 */ jal func_80137E10 -/* B5F4A4 802411F4 AE200074 */ sw $zero, 0x74($s1) -.L802411F8: -/* B5F4A8 802411F8 8E230070 */ lw $v1, 0x70($s1) -/* B5F4AC 802411FC 24040001 */ addiu $a0, $zero, 1 -/* B5F4B0 80241200 10640019 */ beq $v1, $a0, .L80241268 -/* B5F4B4 80241204 28620002 */ slti $v0, $v1, 2 -/* B5F4B8 80241208 10400005 */ beqz $v0, .L80241220 -/* B5F4BC 8024120C 24020002 */ addiu $v0, $zero, 2 -/* B5F4C0 80241210 10600007 */ beqz $v1, .L80241230 -/* B5F4C4 80241214 240500FF */ addiu $a1, $zero, 0xff -/* B5F4C8 80241218 080904AA */ j .L802412A8 -/* B5F4CC 8024121C 00000000 */ nop -.L80241220: -/* B5F4D0 80241220 10620019 */ beq $v1, $v0, .L80241288 -/* B5F4D4 80241224 00000000 */ nop -/* B5F4D8 80241228 080904AA */ j .L802412A8 -/* B5F4DC 8024122C 00000000 */ nop -.L80241230: -/* B5F4E0 80241230 8E220074 */ lw $v0, 0x74($s1) -/* B5F4E4 80241234 14450004 */ bne $v0, $a1, .L80241248 -/* B5F4E8 80241238 00000000 */ nop -/* B5F4EC 8024123C AE240070 */ sw $a0, 0x70($s1) -/* B5F4F0 80241240 AE200078 */ sw $zero, 0x78($s1) -/* B5F4F4 80241244 8E220074 */ lw $v0, 0x74($s1) -.L80241248: -/* B5F4F8 80241248 8E230084 */ lw $v1, 0x84($s1) -/* B5F4FC 8024124C 00431021 */ addu $v0, $v0, $v1 -/* B5F500 80241250 AE220074 */ sw $v0, 0x74($s1) -/* B5F504 80241254 28420100 */ slti $v0, $v0, 0x100 -/* B5F508 80241258 50400013 */ beql $v0, $zero, .L802412A8 -/* B5F50C 8024125C AE250074 */ sw $a1, 0x74($s1) -/* B5F510 80241260 080904AA */ j .L802412A8 -/* B5F514 80241264 00000000 */ nop -.L80241268: -/* B5F518 80241268 8E220078 */ lw $v0, 0x78($s1) -/* B5F51C 8024126C 24420001 */ addiu $v0, $v0, 1 -/* B5F520 80241270 AE220078 */ sw $v0, 0x78($s1) -/* B5F524 80241274 28420002 */ slti $v0, $v0, 2 -/* B5F528 80241278 1440000B */ bnez $v0, .L802412A8 -/* B5F52C 8024127C 24020002 */ addiu $v0, $zero, 2 -/* B5F530 80241280 080904AA */ j .L802412A8 -/* B5F534 80241284 AE220070 */ sw $v0, 0x70($s1) -.L80241288: -/* B5F538 80241288 8E230074 */ lw $v1, 0x74($s1) -/* B5F53C 8024128C 50600001 */ beql $v1, $zero, .L80241294 -/* B5F540 80241290 24120001 */ addiu $s2, $zero, 1 -.L80241294: -/* B5F544 80241294 8E220088 */ lw $v0, 0x88($s1) -/* B5F548 80241298 00621023 */ subu $v0, $v1, $v0 -/* B5F54C 8024129C 04410002 */ bgez $v0, .L802412A8 -/* B5F550 802412A0 AE220074 */ sw $v0, 0x74($s1) -/* B5F554 802412A4 AE200074 */ sw $zero, 0x74($s1) -.L802412A8: -/* B5F558 802412A8 C6200074 */ lwc1 $f0, 0x74($s1) -/* B5F55C 802412AC 46800020 */ cvt.s.w $f0, $f0 -/* B5F560 802412B0 44050000 */ mfc1 $a1, $f0 -/* B5F564 802412B4 0C04DF62 */ jal func_80137D88 -/* B5F568 802412B8 24040001 */ addiu $a0, $zero, 1 -/* B5F56C 802412BC 0240102D */ daddu $v0, $s2, $zero -/* B5F570 802412C0 8FBF001C */ lw $ra, 0x1c($sp) -/* B5F574 802412C4 8FB20018 */ lw $s2, 0x18($sp) -/* B5F578 802412C8 8FB10014 */ lw $s1, 0x14($sp) -/* B5F57C 802412CC 8FB00010 */ lw $s0, 0x10($sp) -/* B5F580 802412D0 03E00008 */ jr $ra -/* B5F584 802412D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s new file mode 100644 index 0000000000..8656b490da --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80241198_B5F448.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241198_B5F448 +/* B5F448 80241198 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B5F44C 8024119C AFB10014 */ sw $s1, 0x14($sp) +/* B5F450 802411A0 0080882D */ daddu $s1, $a0, $zero +/* B5F454 802411A4 AFB20018 */ sw $s2, 0x18($sp) +/* B5F458 802411A8 AFBF001C */ sw $ra, 0x1c($sp) +/* B5F45C 802411AC AFB00010 */ sw $s0, 0x10($sp) +/* B5F460 802411B0 8E30000C */ lw $s0, 0xc($s1) +/* B5F464 802411B4 10A00010 */ beqz $a1, .L802411F8 +/* B5F468 802411B8 0000902D */ daddu $s2, $zero, $zero +/* B5F46C 802411BC 8E050000 */ lw $a1, ($s0) +/* B5F470 802411C0 0C0B1EAF */ jal get_variable +/* B5F474 802411C4 26100004 */ addiu $s0, $s0, 4 +/* B5F478 802411C8 AE220084 */ sw $v0, 0x84($s1) +/* B5F47C 802411CC 8E050000 */ lw $a1, ($s0) +/* B5F480 802411D0 0C0B1EAF */ jal get_variable +/* B5F484 802411D4 0220202D */ daddu $a0, $s1, $zero +/* B5F488 802411D8 0240202D */ daddu $a0, $s2, $zero +/* B5F48C 802411DC 240500D0 */ addiu $a1, $zero, 0xd0 +/* B5F490 802411E0 00A0302D */ daddu $a2, $a1, $zero +/* B5F494 802411E4 00A0382D */ daddu $a3, $a1, $zero +/* B5F498 802411E8 AE220088 */ sw $v0, 0x88($s1) +/* B5F49C 802411EC AE200070 */ sw $zero, 0x70($s1) +/* B5F4A0 802411F0 0C04DF84 */ jal func_80137E10 +/* B5F4A4 802411F4 AE200074 */ sw $zero, 0x74($s1) +.L802411F8: +/* B5F4A8 802411F8 8E230070 */ lw $v1, 0x70($s1) +/* B5F4AC 802411FC 24040001 */ addiu $a0, $zero, 1 +/* B5F4B0 80241200 10640019 */ beq $v1, $a0, .L80241268 +/* B5F4B4 80241204 28620002 */ slti $v0, $v1, 2 +/* B5F4B8 80241208 10400005 */ beqz $v0, .L80241220 +/* B5F4BC 8024120C 24020002 */ addiu $v0, $zero, 2 +/* B5F4C0 80241210 10600007 */ beqz $v1, .L80241230 +/* B5F4C4 80241214 240500FF */ addiu $a1, $zero, 0xff +/* B5F4C8 80241218 080904AA */ j .L802412A8 +/* B5F4CC 8024121C 00000000 */ nop +.L80241220: +/* B5F4D0 80241220 10620019 */ beq $v1, $v0, .L80241288 +/* B5F4D4 80241224 00000000 */ nop +/* B5F4D8 80241228 080904AA */ j .L802412A8 +/* B5F4DC 8024122C 00000000 */ nop +.L80241230: +/* B5F4E0 80241230 8E220074 */ lw $v0, 0x74($s1) +/* B5F4E4 80241234 14450004 */ bne $v0, $a1, .L80241248 +/* B5F4E8 80241238 00000000 */ nop +/* B5F4EC 8024123C AE240070 */ sw $a0, 0x70($s1) +/* B5F4F0 80241240 AE200078 */ sw $zero, 0x78($s1) +/* B5F4F4 80241244 8E220074 */ lw $v0, 0x74($s1) +.L80241248: +/* B5F4F8 80241248 8E230084 */ lw $v1, 0x84($s1) +/* B5F4FC 8024124C 00431021 */ addu $v0, $v0, $v1 +/* B5F500 80241250 AE220074 */ sw $v0, 0x74($s1) +/* B5F504 80241254 28420100 */ slti $v0, $v0, 0x100 +/* B5F508 80241258 50400013 */ beql $v0, $zero, .L802412A8 +/* B5F50C 8024125C AE250074 */ sw $a1, 0x74($s1) +/* B5F510 80241260 080904AA */ j .L802412A8 +/* B5F514 80241264 00000000 */ nop +.L80241268: +/* B5F518 80241268 8E220078 */ lw $v0, 0x78($s1) +/* B5F51C 8024126C 24420001 */ addiu $v0, $v0, 1 +/* B5F520 80241270 AE220078 */ sw $v0, 0x78($s1) +/* B5F524 80241274 28420002 */ slti $v0, $v0, 2 +/* B5F528 80241278 1440000B */ bnez $v0, .L802412A8 +/* B5F52C 8024127C 24020002 */ addiu $v0, $zero, 2 +/* B5F530 80241280 080904AA */ j .L802412A8 +/* B5F534 80241284 AE220070 */ sw $v0, 0x70($s1) +.L80241288: +/* B5F538 80241288 8E230074 */ lw $v1, 0x74($s1) +/* B5F53C 8024128C 50600001 */ beql $v1, $zero, .L80241294 +/* B5F540 80241290 24120001 */ addiu $s2, $zero, 1 +.L80241294: +/* B5F544 80241294 8E220088 */ lw $v0, 0x88($s1) +/* B5F548 80241298 00621023 */ subu $v0, $v1, $v0 +/* B5F54C 8024129C 04410002 */ bgez $v0, .L802412A8 +/* B5F550 802412A0 AE220074 */ sw $v0, 0x74($s1) +/* B5F554 802412A4 AE200074 */ sw $zero, 0x74($s1) +.L802412A8: +/* B5F558 802412A8 C6200074 */ lwc1 $f0, 0x74($s1) +/* B5F55C 802412AC 46800020 */ cvt.s.w $f0, $f0 +/* B5F560 802412B0 44050000 */ mfc1 $a1, $f0 +/* B5F564 802412B4 0C04DF62 */ jal func_80137D88 +/* B5F568 802412B8 24040001 */ addiu $a0, $zero, 1 +/* B5F56C 802412BC 0240102D */ daddu $v0, $s2, $zero +/* B5F570 802412C0 8FBF001C */ lw $ra, 0x1c($sp) +/* B5F574 802412C4 8FB20018 */ lw $s2, 0x18($sp) +/* B5F578 802412C8 8FB10014 */ lw $s1, 0x14($sp) +/* B5F57C 802412CC 8FB00010 */ lw $s0, 0x10($sp) +/* B5F580 802412D0 03E00008 */ jr $ra +/* B5F584 802412D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8.s deleted file mode 100644 index 3938b62433..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412D8 -/* B5F588 802412D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B5F58C 802412DC AFBF0018 */ sw $ra, 0x18($sp) -/* B5F590 802412E0 0C00EAD2 */ jal get_npc_safe -/* B5F594 802412E4 2404FFFC */ addiu $a0, $zero, -4 -/* B5F598 802412E8 3C0141F0 */ lui $at, 0x41f0 -/* B5F59C 802412EC 44810000 */ mtc1 $at, $f0 -/* B5F5A0 802412F0 C442003C */ lwc1 $f2, 0x3c($v0) -/* B5F5A4 802412F4 46001080 */ add.s $f2, $f2, $f0 -/* B5F5A8 802412F8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5F5AC 802412FC 8C450038 */ lw $a1, 0x38($v0) -/* B5F5B0 80241300 8C470040 */ lw $a3, 0x40($v0) -/* B5F5B4 80241304 44061000 */ mfc1 $a2, $f2 -/* B5F5B8 80241308 0C01BFBC */ jal func_8006FEF0 -/* B5F5BC 8024130C 24040002 */ addiu $a0, $zero, 2 -/* B5F5C0 80241310 8FBF0018 */ lw $ra, 0x18($sp) -/* B5F5C4 80241314 24020002 */ addiu $v0, $zero, 2 -/* B5F5C8 80241318 03E00008 */ jr $ra -/* B5F5CC 8024131C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8_B5F588.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8_B5F588.s new file mode 100644 index 0000000000..3971802ac8 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_802412D8_B5F588.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412D8_B5F588 +/* B5F588 802412D8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B5F58C 802412DC AFBF0018 */ sw $ra, 0x18($sp) +/* B5F590 802412E0 0C00EAD2 */ jal get_npc_safe +/* B5F594 802412E4 2404FFFC */ addiu $a0, $zero, -4 +/* B5F598 802412E8 3C0141F0 */ lui $at, 0x41f0 +/* B5F59C 802412EC 44810000 */ mtc1 $at, $f0 +/* B5F5A0 802412F0 C442003C */ lwc1 $f2, 0x3c($v0) +/* B5F5A4 802412F4 46001080 */ add.s $f2, $f2, $f0 +/* B5F5A8 802412F8 E7A00010 */ swc1 $f0, 0x10($sp) +/* B5F5AC 802412FC 8C450038 */ lw $a1, 0x38($v0) +/* B5F5B0 80241300 8C470040 */ lw $a3, 0x40($v0) +/* B5F5B4 80241304 44061000 */ mfc1 $a2, $f2 +/* B5F5B8 80241308 0C01BFBC */ jal func_8006FEF0 +/* B5F5BC 8024130C 24040002 */ addiu $a0, $zero, 2 +/* B5F5C0 80241310 8FBF0018 */ lw $ra, 0x18($sp) +/* B5F5C4 80241314 24020002 */ addiu $v0, $zero, 2 +/* B5F5C8 80241318 03E00008 */ jr $ra +/* B5F5CC 8024131C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0.s deleted file mode 100644 index 9db8519805..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413A0 -/* B5F650 802413A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B5F654 802413A4 AFBF0020 */ sw $ra, 0x20($sp) -/* B5F658 802413A8 AFB1001C */ sw $s1, 0x1c($sp) -/* B5F65C 802413AC AFB00018 */ sw $s0, 0x18($sp) -/* B5F660 802413B0 8C910148 */ lw $s1, 0x148($a0) -/* B5F664 802413B4 0C00EABB */ jal get_npc_unsafe -/* B5F668 802413B8 86240008 */ lh $a0, 8($s1) -/* B5F66C 802413BC 8E23006C */ lw $v1, 0x6c($s1) -/* B5F670 802413C0 28630005 */ slti $v1, $v1, 5 -/* B5F674 802413C4 1060001D */ beqz $v1, .L8024143C -/* B5F678 802413C8 0040802D */ daddu $s0, $v0, $zero -/* B5F67C 802413CC 0C00A67F */ jal rand_int -/* B5F680 802413D0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B5F684 802413D4 2842012D */ slti $v0, $v0, 0x12d -/* B5F688 802413D8 14400018 */ bnez $v0, .L8024143C -/* B5F68C 802413DC 24020003 */ addiu $v0, $zero, 3 -/* B5F690 802413E0 860300A8 */ lh $v1, 0xa8($s0) -/* B5F694 802413E4 C604003C */ lwc1 $f4, 0x3c($s0) -/* B5F698 802413E8 C6000040 */ lwc1 $f0, 0x40($s0) -/* B5F69C 802413EC 3C014014 */ lui $at, 0x4014 -/* B5F6A0 802413F0 44811800 */ mtc1 $at, $f3 -/* B5F6A4 802413F4 44801000 */ mtc1 $zero, $f2 -/* B5F6A8 802413F8 AFA20010 */ sw $v0, 0x10($sp) -/* B5F6AC 802413FC 46000021 */ cvt.d.s $f0, $f0 -/* B5F6B0 80241400 46220000 */ add.d $f0, $f0, $f2 -/* B5F6B4 80241404 AFA00014 */ sw $zero, 0x14($sp) -/* B5F6B8 80241408 44831000 */ mtc1 $v1, $f2 -/* B5F6BC 8024140C 00000000 */ nop -/* B5F6C0 80241410 468010A0 */ cvt.s.w $f2, $f2 -/* B5F6C4 80241414 46022100 */ add.s $f4, $f4, $f2 -/* B5F6C8 80241418 8E050038 */ lw $a1, 0x38($s0) -/* B5F6CC 8024141C 46200020 */ cvt.s.d $f0, $f0 -/* B5F6D0 80241420 44062000 */ mfc1 $a2, $f4 -/* B5F6D4 80241424 44070000 */ mfc1 $a3, $f0 -/* B5F6D8 80241428 0C04C6A5 */ jal make_item_entity_nodelay -/* B5F6DC 8024142C 24040156 */ addiu $a0, $zero, 0x156 -/* B5F6E0 80241430 8E22006C */ lw $v0, 0x6c($s1) -/* B5F6E4 80241434 24420001 */ addiu $v0, $v0, 1 -/* B5F6E8 80241438 AE22006C */ sw $v0, 0x6c($s1) -.L8024143C: -/* B5F6EC 8024143C 8FBF0020 */ lw $ra, 0x20($sp) -/* B5F6F0 80241440 8FB1001C */ lw $s1, 0x1c($sp) -/* B5F6F4 80241444 8FB00018 */ lw $s0, 0x18($sp) -/* B5F6F8 80241448 24020002 */ addiu $v0, $zero, 2 -/* B5F6FC 8024144C 03E00008 */ jr $ra -/* B5F700 80241450 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s new file mode 100644 index 0000000000..1e2c6d89fb --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802413A0_B5F650.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413A0_B5F650 +/* B5F650 802413A0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B5F654 802413A4 AFBF0020 */ sw $ra, 0x20($sp) +/* B5F658 802413A8 AFB1001C */ sw $s1, 0x1c($sp) +/* B5F65C 802413AC AFB00018 */ sw $s0, 0x18($sp) +/* B5F660 802413B0 8C910148 */ lw $s1, 0x148($a0) +/* B5F664 802413B4 0C00EABB */ jal get_npc_unsafe +/* B5F668 802413B8 86240008 */ lh $a0, 8($s1) +/* B5F66C 802413BC 8E23006C */ lw $v1, 0x6c($s1) +/* B5F670 802413C0 28630005 */ slti $v1, $v1, 5 +/* B5F674 802413C4 1060001D */ beqz $v1, .L8024143C +/* B5F678 802413C8 0040802D */ daddu $s0, $v0, $zero +/* B5F67C 802413CC 0C00A67F */ jal rand_int +/* B5F680 802413D0 240403E8 */ addiu $a0, $zero, 0x3e8 +/* B5F684 802413D4 2842012D */ slti $v0, $v0, 0x12d +/* B5F688 802413D8 14400018 */ bnez $v0, .L8024143C +/* B5F68C 802413DC 24020003 */ addiu $v0, $zero, 3 +/* B5F690 802413E0 860300A8 */ lh $v1, 0xa8($s0) +/* B5F694 802413E4 C604003C */ lwc1 $f4, 0x3c($s0) +/* B5F698 802413E8 C6000040 */ lwc1 $f0, 0x40($s0) +/* B5F69C 802413EC 3C014014 */ lui $at, 0x4014 +/* B5F6A0 802413F0 44811800 */ mtc1 $at, $f3 +/* B5F6A4 802413F4 44801000 */ mtc1 $zero, $f2 +/* B5F6A8 802413F8 AFA20010 */ sw $v0, 0x10($sp) +/* B5F6AC 802413FC 46000021 */ cvt.d.s $f0, $f0 +/* B5F6B0 80241400 46220000 */ add.d $f0, $f0, $f2 +/* B5F6B4 80241404 AFA00014 */ sw $zero, 0x14($sp) +/* B5F6B8 80241408 44831000 */ mtc1 $v1, $f2 +/* B5F6BC 8024140C 00000000 */ nop +/* B5F6C0 80241410 468010A0 */ cvt.s.w $f2, $f2 +/* B5F6C4 80241414 46022100 */ add.s $f4, $f4, $f2 +/* B5F6C8 80241418 8E050038 */ lw $a1, 0x38($s0) +/* B5F6CC 8024141C 46200020 */ cvt.s.d $f0, $f0 +/* B5F6D0 80241420 44062000 */ mfc1 $a2, $f4 +/* B5F6D4 80241424 44070000 */ mfc1 $a3, $f0 +/* B5F6D8 80241428 0C04C6A5 */ jal make_item_entity_nodelay +/* B5F6DC 8024142C 24040156 */ addiu $a0, $zero, 0x156 +/* B5F6E0 80241430 8E22006C */ lw $v0, 0x6c($s1) +/* B5F6E4 80241434 24420001 */ addiu $v0, $v0, 1 +/* B5F6E8 80241438 AE22006C */ sw $v0, 0x6c($s1) +.L8024143C: +/* B5F6EC 8024143C 8FBF0020 */ lw $ra, 0x20($sp) +/* B5F6F0 80241440 8FB1001C */ lw $s1, 0x1c($sp) +/* B5F6F4 80241444 8FB00018 */ lw $s0, 0x18($sp) +/* B5F6F8 80241448 24020002 */ addiu $v0, $zero, 2 +/* B5F6FC 8024144C 03E00008 */ jr $ra +/* B5F700 80241450 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4.s deleted file mode 100644 index 5f90e9b483..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414A4 -/* B5F754 802414A4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B5F758 802414A8 AFB20028 */ sw $s2, 0x28($sp) -/* B5F75C 802414AC 0080902D */ daddu $s2, $a0, $zero -/* B5F760 802414B0 AFBF002C */ sw $ra, 0x2c($sp) -/* B5F764 802414B4 AFB10024 */ sw $s1, 0x24($sp) -/* B5F768 802414B8 AFB00020 */ sw $s0, 0x20($sp) -/* B5F76C 802414BC 8E500148 */ lw $s0, 0x148($s2) -/* B5F770 802414C0 0C00EABB */ jal get_npc_unsafe -/* B5F774 802414C4 86040008 */ lh $a0, 8($s0) -/* B5F778 802414C8 8E03006C */ lw $v1, 0x6c($s0) -/* B5F77C 802414CC 1460000B */ bnez $v1, .L802414FC -/* B5F780 802414D0 0040882D */ daddu $s1, $v0, $zero -/* B5F784 802414D4 0C00A67F */ jal rand_int -/* B5F788 802414D8 24040064 */ addiu $a0, $zero, 0x64 -/* B5F78C 802414DC 28420032 */ slti $v0, $v0, 0x32 -/* B5F790 802414E0 14400002 */ bnez $v0, .L802414EC -/* B5F794 802414E4 24020001 */ addiu $v0, $zero, 1 -/* B5F798 802414E8 24020003 */ addiu $v0, $zero, 3 -.L802414EC: -/* B5F79C 802414EC AE02006C */ sw $v0, 0x6c($s0) -/* B5F7A0 802414F0 3C054387 */ lui $a1, 0x4387 -/* B5F7A4 802414F4 0C00ECD0 */ jal set_npc_yaw -/* B5F7A8 802414F8 0220202D */ daddu $a0, $s1, $zero -.L802414FC: -/* B5F7AC 802414FC 8E02006C */ lw $v0, 0x6c($s0) -/* B5F7B0 80241500 2443FFFF */ addiu $v1, $v0, -1 -/* B5F7B4 80241504 2C620006 */ sltiu $v0, $v1, 6 -/* B5F7B8 80241508 1040004D */ beqz $v0, .L80241640 -/* B5F7BC 8024150C 00031080 */ sll $v0, $v1, 2 -/* B5F7C0 80241510 3C018024 */ lui $at, 0x8024 -/* B5F7C4 80241514 00220821 */ addu $at, $at, $v0 -/* B5F7C8 80241518 8C2274C0 */ lw $v0, 0x74c0($at) -/* B5F7CC 8024151C 00400008 */ jr $v0 -/* B5F7D0 80241520 00000000 */ nop -/* B5F7D4 80241524 3C030042 */ lui $v1, 0x42 -/* B5F7D8 80241528 3463000F */ ori $v1, $v1, 0xf -/* B5F7DC 8024152C 24020002 */ addiu $v0, $zero, 2 -/* B5F7E0 80241530 AE02006C */ sw $v0, 0x6c($s0) -/* B5F7E4 80241534 AE000070 */ sw $zero, 0x70($s0) -/* B5F7E8 80241538 AE230028 */ sw $v1, 0x28($s1) -/* B5F7EC 8024153C 8E020070 */ lw $v0, 0x70($s0) -/* B5F7F0 80241540 24420001 */ addiu $v0, $v0, 1 -/* B5F7F4 80241544 AE020070 */ sw $v0, 0x70($s0) -/* B5F7F8 80241548 28420033 */ slti $v0, $v0, 0x33 -/* B5F7FC 8024154C 1440003C */ bnez $v0, .L80241640 -/* B5F800 80241550 24020005 */ addiu $v0, $zero, 5 -/* B5F804 80241554 08090590 */ j .L80241640 -/* B5F808 80241558 AE02006C */ sw $v0, 0x6c($s0) -/* B5F80C 8024155C 3C030042 */ lui $v1, 0x42 -/* B5F810 80241560 34630010 */ ori $v1, $v1, 0x10 -/* B5F814 80241564 24020004 */ addiu $v0, $zero, 4 -/* B5F818 80241568 AE02006C */ sw $v0, 0x6c($s0) -/* B5F81C 8024156C AE000070 */ sw $zero, 0x70($s0) -/* B5F820 80241570 AE230028 */ sw $v1, 0x28($s1) -/* B5F824 80241574 8E020070 */ lw $v0, 0x70($s0) -/* B5F828 80241578 24030019 */ addiu $v1, $zero, 0x19 -/* B5F82C 8024157C 24420001 */ addiu $v0, $v0, 1 -/* B5F830 80241580 14430005 */ bne $v0, $v1, .L80241598 -/* B5F834 80241584 AE020070 */ sw $v0, 0x70($s0) -/* B5F838 80241588 3C0142B4 */ lui $at, 0x42b4 -/* B5F83C 8024158C 44810000 */ mtc1 $at, $f0 -/* B5F840 80241590 00000000 */ nop -/* B5F844 80241594 E620000C */ swc1 $f0, 0xc($s1) -.L80241598: -/* B5F848 80241598 8E020070 */ lw $v0, 0x70($s0) -/* B5F84C 8024159C 2842003D */ slti $v0, $v0, 0x3d -/* B5F850 802415A0 14400027 */ bnez $v0, .L80241640 -/* B5F854 802415A4 24020005 */ addiu $v0, $zero, 5 -/* B5F858 802415A8 08090590 */ j .L80241640 -/* B5F85C 802415AC AE02006C */ sw $v0, 0x6c($s0) -/* B5F860 802415B0 3C030042 */ lui $v1, 0x42 -/* B5F864 802415B4 24020006 */ addiu $v0, $zero, 6 -/* B5F868 802415B8 34630003 */ ori $v1, $v1, 3 -/* B5F86C 802415BC AE02006C */ sw $v0, 0x6c($s0) -/* B5F870 802415C0 AE000070 */ sw $zero, 0x70($s0) -/* B5F874 802415C4 862400A8 */ lh $a0, 0xa8($s1) -/* B5F878 802415C8 2402000A */ addiu $v0, $zero, 0xa -/* B5F87C 802415CC AE230028 */ sw $v1, 0x28($s1) -/* B5F880 802415D0 AFA00014 */ sw $zero, 0x14($sp) -/* B5F884 802415D4 AFA20018 */ sw $v0, 0x18($sp) -/* B5F888 802415D8 44840000 */ mtc1 $a0, $f0 -/* B5F88C 802415DC 00000000 */ nop -/* B5F890 802415E0 46800020 */ cvt.s.w $f0, $f0 -/* B5F894 802415E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* B5F898 802415E8 8E250038 */ lw $a1, 0x38($s1) -/* B5F89C 802415EC 8E26003C */ lw $a2, 0x3c($s1) -/* B5F8A0 802415F0 8E270040 */ lw $a3, 0x40($s1) -/* B5F8A4 802415F4 0C01C1E4 */ jal fx_sweat -/* B5F8A8 802415F8 0000202D */ daddu $a0, $zero, $zero -/* B5F8AC 802415FC 8E020070 */ lw $v0, 0x70($s0) -/* B5F8B0 80241600 24420001 */ addiu $v0, $v0, 1 -/* B5F8B4 80241604 AE020070 */ sw $v0, 0x70($s0) -/* B5F8B8 80241608 2842000B */ slti $v0, $v0, 0xb -/* B5F8BC 8024160C 1440000C */ bnez $v0, .L80241640 -/* B5F8C0 80241610 00000000 */ nop -/* B5F8C4 80241614 0C00A67F */ jal rand_int -/* B5F8C8 80241618 24040064 */ addiu $a0, $zero, 0x64 -/* B5F8CC 8024161C 0040182D */ daddu $v1, $v0, $zero -/* B5F8D0 80241620 2862005A */ slti $v0, $v1, 0x5a -/* B5F8D4 80241624 14400005 */ bnez $v0, .L8024163C -/* B5F8D8 80241628 24020007 */ addiu $v0, $zero, 7 -/* B5F8DC 8024162C 2862005F */ slti $v0, $v1, 0x5f -/* B5F8E0 80241630 14400002 */ bnez $v0, .L8024163C -/* B5F8E4 80241634 24020001 */ addiu $v0, $zero, 1 -/* B5F8E8 80241638 24020003 */ addiu $v0, $zero, 3 -.L8024163C: -/* B5F8EC 8024163C AE02006C */ sw $v0, 0x6c($s0) -.L80241640: -/* B5F8F0 80241640 8E03006C */ lw $v1, 0x6c($s0) -/* B5F8F4 80241644 24020007 */ addiu $v0, $zero, 7 -/* B5F8F8 80241648 50620001 */ beql $v1, $v0, .L80241650 -/* B5F8FC 8024164C AE400070 */ sw $zero, 0x70($s2) -.L80241650: -/* B5F900 80241650 8FBF002C */ lw $ra, 0x2c($sp) -/* B5F904 80241654 8FB20028 */ lw $s2, 0x28($sp) -/* B5F908 80241658 8FB10024 */ lw $s1, 0x24($sp) -/* B5F90C 8024165C 8FB00020 */ lw $s0, 0x20($sp) -/* B5F910 80241660 03E00008 */ jr $ra -/* B5F914 80241664 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s new file mode 100644 index 0000000000..e8b641221e --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_802414A4_B5F754.s @@ -0,0 +1,123 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414A4_B5F754 +/* B5F754 802414A4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B5F758 802414A8 AFB20028 */ sw $s2, 0x28($sp) +/* B5F75C 802414AC 0080902D */ daddu $s2, $a0, $zero +/* B5F760 802414B0 AFBF002C */ sw $ra, 0x2c($sp) +/* B5F764 802414B4 AFB10024 */ sw $s1, 0x24($sp) +/* B5F768 802414B8 AFB00020 */ sw $s0, 0x20($sp) +/* B5F76C 802414BC 8E500148 */ lw $s0, 0x148($s2) +/* B5F770 802414C0 0C00EABB */ jal get_npc_unsafe +/* B5F774 802414C4 86040008 */ lh $a0, 8($s0) +/* B5F778 802414C8 8E03006C */ lw $v1, 0x6c($s0) +/* B5F77C 802414CC 1460000B */ bnez $v1, .L802414FC +/* B5F780 802414D0 0040882D */ daddu $s1, $v0, $zero +/* B5F784 802414D4 0C00A67F */ jal rand_int +/* B5F788 802414D8 24040064 */ addiu $a0, $zero, 0x64 +/* B5F78C 802414DC 28420032 */ slti $v0, $v0, 0x32 +/* B5F790 802414E0 14400002 */ bnez $v0, .L802414EC +/* B5F794 802414E4 24020001 */ addiu $v0, $zero, 1 +/* B5F798 802414E8 24020003 */ addiu $v0, $zero, 3 +.L802414EC: +/* B5F79C 802414EC AE02006C */ sw $v0, 0x6c($s0) +/* B5F7A0 802414F0 3C054387 */ lui $a1, 0x4387 +/* B5F7A4 802414F4 0C00ECD0 */ jal set_npc_yaw +/* B5F7A8 802414F8 0220202D */ daddu $a0, $s1, $zero +.L802414FC: +/* B5F7AC 802414FC 8E02006C */ lw $v0, 0x6c($s0) +/* B5F7B0 80241500 2443FFFF */ addiu $v1, $v0, -1 +/* B5F7B4 80241504 2C620006 */ sltiu $v0, $v1, 6 +/* B5F7B8 80241508 1040004D */ beqz $v0, .L80241640 +/* B5F7BC 8024150C 00031080 */ sll $v0, $v1, 2 +/* B5F7C0 80241510 3C018024 */ lui $at, 0x8024 +/* B5F7C4 80241514 00220821 */ addu $at, $at, $v0 +/* B5F7C8 80241518 8C2274C0 */ lw $v0, 0x74c0($at) +/* B5F7CC 8024151C 00400008 */ jr $v0 +/* B5F7D0 80241520 00000000 */ nop +/* B5F7D4 80241524 3C030042 */ lui $v1, 0x42 +/* B5F7D8 80241528 3463000F */ ori $v1, $v1, 0xf +/* B5F7DC 8024152C 24020002 */ addiu $v0, $zero, 2 +/* B5F7E0 80241530 AE02006C */ sw $v0, 0x6c($s0) +/* B5F7E4 80241534 AE000070 */ sw $zero, 0x70($s0) +/* B5F7E8 80241538 AE230028 */ sw $v1, 0x28($s1) +/* B5F7EC 8024153C 8E020070 */ lw $v0, 0x70($s0) +/* B5F7F0 80241540 24420001 */ addiu $v0, $v0, 1 +/* B5F7F4 80241544 AE020070 */ sw $v0, 0x70($s0) +/* B5F7F8 80241548 28420033 */ slti $v0, $v0, 0x33 +/* B5F7FC 8024154C 1440003C */ bnez $v0, .L80241640 +/* B5F800 80241550 24020005 */ addiu $v0, $zero, 5 +/* B5F804 80241554 08090590 */ j .L80241640 +/* B5F808 80241558 AE02006C */ sw $v0, 0x6c($s0) +/* B5F80C 8024155C 3C030042 */ lui $v1, 0x42 +/* B5F810 80241560 34630010 */ ori $v1, $v1, 0x10 +/* B5F814 80241564 24020004 */ addiu $v0, $zero, 4 +/* B5F818 80241568 AE02006C */ sw $v0, 0x6c($s0) +/* B5F81C 8024156C AE000070 */ sw $zero, 0x70($s0) +/* B5F820 80241570 AE230028 */ sw $v1, 0x28($s1) +/* B5F824 80241574 8E020070 */ lw $v0, 0x70($s0) +/* B5F828 80241578 24030019 */ addiu $v1, $zero, 0x19 +/* B5F82C 8024157C 24420001 */ addiu $v0, $v0, 1 +/* B5F830 80241580 14430005 */ bne $v0, $v1, .L80241598 +/* B5F834 80241584 AE020070 */ sw $v0, 0x70($s0) +/* B5F838 80241588 3C0142B4 */ lui $at, 0x42b4 +/* B5F83C 8024158C 44810000 */ mtc1 $at, $f0 +/* B5F840 80241590 00000000 */ nop +/* B5F844 80241594 E620000C */ swc1 $f0, 0xc($s1) +.L80241598: +/* B5F848 80241598 8E020070 */ lw $v0, 0x70($s0) +/* B5F84C 8024159C 2842003D */ slti $v0, $v0, 0x3d +/* B5F850 802415A0 14400027 */ bnez $v0, .L80241640 +/* B5F854 802415A4 24020005 */ addiu $v0, $zero, 5 +/* B5F858 802415A8 08090590 */ j .L80241640 +/* B5F85C 802415AC AE02006C */ sw $v0, 0x6c($s0) +/* B5F860 802415B0 3C030042 */ lui $v1, 0x42 +/* B5F864 802415B4 24020006 */ addiu $v0, $zero, 6 +/* B5F868 802415B8 34630003 */ ori $v1, $v1, 3 +/* B5F86C 802415BC AE02006C */ sw $v0, 0x6c($s0) +/* B5F870 802415C0 AE000070 */ sw $zero, 0x70($s0) +/* B5F874 802415C4 862400A8 */ lh $a0, 0xa8($s1) +/* B5F878 802415C8 2402000A */ addiu $v0, $zero, 0xa +/* B5F87C 802415CC AE230028 */ sw $v1, 0x28($s1) +/* B5F880 802415D0 AFA00014 */ sw $zero, 0x14($sp) +/* B5F884 802415D4 AFA20018 */ sw $v0, 0x18($sp) +/* B5F888 802415D8 44840000 */ mtc1 $a0, $f0 +/* B5F88C 802415DC 00000000 */ nop +/* B5F890 802415E0 46800020 */ cvt.s.w $f0, $f0 +/* B5F894 802415E4 E7A00010 */ swc1 $f0, 0x10($sp) +/* B5F898 802415E8 8E250038 */ lw $a1, 0x38($s1) +/* B5F89C 802415EC 8E26003C */ lw $a2, 0x3c($s1) +/* B5F8A0 802415F0 8E270040 */ lw $a3, 0x40($s1) +/* B5F8A4 802415F4 0C01C1E4 */ jal fx_sweat +/* B5F8A8 802415F8 0000202D */ daddu $a0, $zero, $zero +/* B5F8AC 802415FC 8E020070 */ lw $v0, 0x70($s0) +/* B5F8B0 80241600 24420001 */ addiu $v0, $v0, 1 +/* B5F8B4 80241604 AE020070 */ sw $v0, 0x70($s0) +/* B5F8B8 80241608 2842000B */ slti $v0, $v0, 0xb +/* B5F8BC 8024160C 1440000C */ bnez $v0, .L80241640 +/* B5F8C0 80241610 00000000 */ nop +/* B5F8C4 80241614 0C00A67F */ jal rand_int +/* B5F8C8 80241618 24040064 */ addiu $a0, $zero, 0x64 +/* B5F8CC 8024161C 0040182D */ daddu $v1, $v0, $zero +/* B5F8D0 80241620 2862005A */ slti $v0, $v1, 0x5a +/* B5F8D4 80241624 14400005 */ bnez $v0, .L8024163C +/* B5F8D8 80241628 24020007 */ addiu $v0, $zero, 7 +/* B5F8DC 8024162C 2862005F */ slti $v0, $v1, 0x5f +/* B5F8E0 80241630 14400002 */ bnez $v0, .L8024163C +/* B5F8E4 80241634 24020001 */ addiu $v0, $zero, 1 +/* B5F8E8 80241638 24020003 */ addiu $v0, $zero, 3 +.L8024163C: +/* B5F8EC 8024163C AE02006C */ sw $v0, 0x6c($s0) +.L80241640: +/* B5F8F0 80241640 8E03006C */ lw $v1, 0x6c($s0) +/* B5F8F4 80241644 24020007 */ addiu $v0, $zero, 7 +/* B5F8F8 80241648 50620001 */ beql $v1, $v0, .L80241650 +/* B5F8FC 8024164C AE400070 */ sw $zero, 0x70($s2) +.L80241650: +/* B5F900 80241650 8FBF002C */ lw $ra, 0x2c($sp) +/* B5F904 80241654 8FB20028 */ lw $s2, 0x28($sp) +/* B5F908 80241658 8FB10024 */ lw $s1, 0x24($sp) +/* B5F90C 8024165C 8FB00020 */ lw $s0, 0x20($sp) +/* B5F910 80241660 03E00008 */ jr $ra +/* B5F914 80241664 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84.s deleted file mode 100644 index 578141c20a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C84 -/* B5FF34 80241C84 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B5FF38 80241C88 AFB20038 */ sw $s2, 0x38($sp) -/* B5FF3C 80241C8C 0080902D */ daddu $s2, $a0, $zero -/* B5FF40 80241C90 AFBF0048 */ sw $ra, 0x48($sp) -/* B5FF44 80241C94 AFB50044 */ sw $s5, 0x44($sp) -/* B5FF48 80241C98 AFB40040 */ sw $s4, 0x40($sp) -/* B5FF4C 80241C9C AFB3003C */ sw $s3, 0x3c($sp) -/* B5FF50 80241CA0 AFB10034 */ sw $s1, 0x34($sp) -/* B5FF54 80241CA4 AFB00030 */ sw $s0, 0x30($sp) -/* B5FF58 80241CA8 8E510148 */ lw $s1, 0x148($s2) -/* B5FF5C 80241CAC 86240008 */ lh $a0, 8($s1) -/* B5FF60 80241CB0 0C00EABB */ jal get_npc_unsafe -/* B5FF64 80241CB4 00A0802D */ daddu $s0, $a1, $zero -/* B5FF68 80241CB8 8E43000C */ lw $v1, 0xc($s2) -/* B5FF6C 80241CBC 0240202D */ daddu $a0, $s2, $zero -/* B5FF70 80241CC0 8C650000 */ lw $a1, ($v1) -/* B5FF74 80241CC4 0C0B1EAF */ jal get_variable -/* B5FF78 80241CC8 0040A82D */ daddu $s5, $v0, $zero -/* B5FF7C 80241CCC AFA00010 */ sw $zero, 0x10($sp) -/* B5FF80 80241CD0 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5FF84 80241CD4 8C630030 */ lw $v1, 0x30($v1) -/* B5FF88 80241CD8 AFA30014 */ sw $v1, 0x14($sp) -/* B5FF8C 80241CDC 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5FF90 80241CE0 8C63001C */ lw $v1, 0x1c($v1) -/* B5FF94 80241CE4 AFA30018 */ sw $v1, 0x18($sp) -/* B5FF98 80241CE8 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5FF9C 80241CEC 8C630024 */ lw $v1, 0x24($v1) -/* B5FFA0 80241CF0 AFA3001C */ sw $v1, 0x1c($sp) -/* B5FFA4 80241CF4 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5FFA8 80241CF8 8C630028 */ lw $v1, 0x28($v1) -/* B5FFAC 80241CFC 27B40010 */ addiu $s4, $sp, 0x10 -/* B5FFB0 80241D00 AFA30020 */ sw $v1, 0x20($sp) -/* B5FFB4 80241D04 8E2300D0 */ lw $v1, 0xd0($s1) -/* B5FFB8 80241D08 3C014282 */ lui $at, 0x4282 -/* B5FFBC 80241D0C 44810000 */ mtc1 $at, $f0 -/* B5FFC0 80241D10 8C63002C */ lw $v1, 0x2c($v1) -/* B5FFC4 80241D14 0040982D */ daddu $s3, $v0, $zero -/* B5FFC8 80241D18 E7A00028 */ swc1 $f0, 0x28($sp) -/* B5FFCC 80241D1C A7A0002C */ sh $zero, 0x2c($sp) -/* B5FFD0 80241D20 16000005 */ bnez $s0, .L80241D38 -/* B5FFD4 80241D24 AFA30024 */ sw $v1, 0x24($sp) -/* B5FFD8 80241D28 8E2200B0 */ lw $v0, 0xb0($s1) -/* B5FFDC 80241D2C 30420004 */ andi $v0, $v0, 4 -/* B5FFE0 80241D30 10400020 */ beqz $v0, .L80241DB4 -/* B5FFE4 80241D34 00000000 */ nop -.L80241D38: -/* B5FFE8 80241D38 2404F7FF */ addiu $a0, $zero, -0x801 -/* B5FFEC 80241D3C AE400070 */ sw $zero, 0x70($s2) -/* B5FFF0 80241D40 A6A0008E */ sh $zero, 0x8e($s5) -/* B5FFF4 80241D44 8E2200CC */ lw $v0, 0xcc($s1) -/* B5FFF8 80241D48 8EA30000 */ lw $v1, ($s5) -/* B5FFFC 80241D4C 8C420000 */ lw $v0, ($v0) -/* B60000 80241D50 00641824 */ and $v1, $v1, $a0 -/* B60004 80241D54 AEA30000 */ sw $v1, ($s5) -/* B60008 80241D58 AEA20028 */ sw $v0, 0x28($s5) -/* B6000C 80241D5C 8E2200D0 */ lw $v0, 0xd0($s1) -/* B60010 80241D60 8C420034 */ lw $v0, 0x34($v0) -/* B60014 80241D64 54400005 */ bnel $v0, $zero, .L80241D7C -/* B60018 80241D68 2402FDFF */ addiu $v0, $zero, -0x201 -/* B6001C 80241D6C 34620200 */ ori $v0, $v1, 0x200 -/* B60020 80241D70 2403FFF7 */ addiu $v1, $zero, -9 -/* B60024 80241D74 08090761 */ j .L80241D84 -/* B60028 80241D78 00431024 */ and $v0, $v0, $v1 -.L80241D7C: -/* B6002C 80241D7C 00621024 */ and $v0, $v1, $v0 -/* B60030 80241D80 34420008 */ ori $v0, $v0, 8 -.L80241D84: -/* B60034 80241D84 AEA20000 */ sw $v0, ($s5) -/* B60038 80241D88 8E2200B0 */ lw $v0, 0xb0($s1) -/* B6003C 80241D8C 30420004 */ andi $v0, $v0, 4 -/* B60040 80241D90 10400007 */ beqz $v0, .L80241DB0 -/* B60044 80241D94 24020063 */ addiu $v0, $zero, 0x63 -/* B60048 80241D98 AE420070 */ sw $v0, 0x70($s2) -/* B6004C 80241D9C AE400074 */ sw $zero, 0x74($s2) -/* B60050 80241DA0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B60054 80241DA4 2403FFFB */ addiu $v1, $zero, -5 -/* B60058 80241DA8 00431024 */ and $v0, $v0, $v1 -/* B6005C 80241DAC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241DB0: -/* B60060 80241DB0 AE20006C */ sw $zero, 0x6c($s1) -.L80241DB4: -/* B60064 80241DB4 8E420070 */ lw $v0, 0x70($s2) -/* B60068 80241DB8 2842001E */ slti $v0, $v0, 0x1e -/* B6006C 80241DBC 10400009 */ beqz $v0, .L80241DE4 -/* B60070 80241DC0 00000000 */ nop -/* B60074 80241DC4 8E22006C */ lw $v0, 0x6c($s1) -/* B60078 80241DC8 14400006 */ bnez $v0, .L80241DE4 -/* B6007C 80241DCC 00000000 */ nop -/* B60080 80241DD0 0C09061C */ jal func_80241870 -/* B60084 80241DD4 0240202D */ daddu $a0, $s2, $zero -/* B60088 80241DD8 10400002 */ beqz $v0, .L80241DE4 -/* B6008C 80241DDC 2402001E */ addiu $v0, $zero, 0x1e -/* B60090 80241DE0 AE420070 */ sw $v0, 0x70($s2) -.L80241DE4: -/* B60094 80241DE4 8E430070 */ lw $v1, 0x70($s2) -/* B60098 80241DE8 2C620064 */ sltiu $v0, $v1, 0x64 -/* B6009C 80241DEC 10400048 */ beqz $v0, .L80241F10 -/* B600A0 80241DF0 00031080 */ sll $v0, $v1, 2 -/* B600A4 80241DF4 3C018024 */ lui $at, 0x8024 -/* B600A8 80241DF8 00220821 */ addu $at, $at, $v0 -/* B600AC 80241DFC 8C2274E0 */ lw $v0, 0x74e0($at) -/* B600B0 80241E00 00400008 */ jr $v0 -/* B600B4 80241E04 00000000 */ nop -/* B600B8 80241E08 0240202D */ daddu $a0, $s2, $zero -/* B600BC 80241E0C 0260282D */ daddu $a1, $s3, $zero -/* B600C0 80241E10 0C012568 */ jal func_800495A0 -/* B600C4 80241E14 0280302D */ daddu $a2, $s4, $zero -/* B600C8 80241E18 0240202D */ daddu $a0, $s2, $zero -/* B600CC 80241E1C 0260282D */ daddu $a1, $s3, $zero -/* B600D0 80241E20 0C0125AE */ jal func_800496B8 -/* B600D4 80241E24 0280302D */ daddu $a2, $s4, $zero -/* B600D8 80241E28 080907C4 */ j .L80241F10 -/* B600DC 80241E2C 00000000 */ nop -/* B600E0 80241E30 0240202D */ daddu $a0, $s2, $zero -/* B600E4 80241E34 0260282D */ daddu $a1, $s3, $zero -/* B600E8 80241E38 0C0126D1 */ jal func_80049B44 -/* B600EC 80241E3C 0280302D */ daddu $a2, $s4, $zero -/* B600F0 80241E40 0240202D */ daddu $a0, $s2, $zero -/* B600F4 80241E44 0260282D */ daddu $a1, $s3, $zero -/* B600F8 80241E48 0C012701 */ jal func_80049C04 -/* B600FC 80241E4C 0280302D */ daddu $a2, $s4, $zero -/* B60100 80241E50 080907C4 */ j .L80241F10 -/* B60104 80241E54 00000000 */ nop -/* B60108 80241E58 0240202D */ daddu $a0, $s2, $zero -/* B6010C 80241E5C 0260282D */ daddu $a1, $s3, $zero -/* B60110 80241E60 0C01278F */ jal func_80049E3C -/* B60114 80241E64 0280302D */ daddu $a2, $s4, $zero -/* B60118 80241E68 0240202D */ daddu $a0, $s2, $zero -/* B6011C 80241E6C 0260282D */ daddu $a1, $s3, $zero -/* B60120 80241E70 0C0127B3 */ jal func_80049ECC -/* B60124 80241E74 0280302D */ daddu $a2, $s4, $zero -/* B60128 80241E78 080907C4 */ j .L80241F10 -/* B6012C 80241E7C 00000000 */ nop -/* B60130 80241E80 0240202D */ daddu $a0, $s2, $zero -/* B60134 80241E84 0260282D */ daddu $a1, $s3, $zero -/* B60138 80241E88 0C0127DF */ jal func_80049F7C -/* B6013C 80241E8C 0280302D */ daddu $a2, $s4, $zero -/* B60140 80241E90 0240202D */ daddu $a0, $s2, $zero -/* B60144 80241E94 0260282D */ daddu $a1, $s3, $zero -/* B60148 80241E98 0C012849 */ jal func_8004A124 -/* B6014C 80241E9C 0280302D */ daddu $a2, $s4, $zero -/* B60150 80241EA0 080907C4 */ j .L80241F10 -/* B60154 80241EA4 00000000 */ nop -/* B60158 80241EA8 0240202D */ daddu $a0, $s2, $zero -/* B6015C 80241EAC 0260282D */ daddu $a1, $s3, $zero -/* B60160 80241EB0 0C0128FA */ jal func_8004A3E8 -/* B60164 80241EB4 0280302D */ daddu $a2, $s4, $zero -/* B60168 80241EB8 080907C4 */ j .L80241F10 -/* B6016C 80241EBC 00000000 */ nop -/* B60170 80241EC0 0C09059A */ jal func_80241668 -/* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero -/* B60178 80241EC8 0C0905B5 */ jal func_802416D4_B5F984 -/* B6017C 80241ECC 0240202D */ daddu $a0, $s2, $zero -/* B60180 80241ED0 8E430070 */ lw $v1, 0x70($s2) -/* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 -/* B60188 80241ED8 1462000D */ bne $v1, $v0, .L80241F10 -/* B6018C 80241EDC 00000000 */ nop -/* B60190 80241EE0 0C0905D1 */ jal func_80241744 -/* B60194 80241EE4 0240202D */ daddu $a0, $s2, $zero -/* B60198 80241EE8 8E430070 */ lw $v1, 0x70($s2) -/* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 -/* B601A0 80241EF0 14620007 */ bne $v1, $v0, .L80241F10 -/* B601A4 80241EF4 00000000 */ nop -/* B601A8 80241EF8 0C090607 */ jal func_8024181C -/* B601AC 80241EFC 0240202D */ daddu $a0, $s2, $zero -/* B601B0 80241F00 080907C4 */ j .L80241F10 -/* B601B4 80241F04 00000000 */ nop -/* B601B8 80241F08 0C0129CF */ jal func_8004A73C -/* B601BC 80241F0C 0240202D */ daddu $a0, $s2, $zero -.L80241F10: -/* B601C0 80241F10 8FBF0048 */ lw $ra, 0x48($sp) -/* B601C4 80241F14 8FB50044 */ lw $s5, 0x44($sp) -/* B601C8 80241F18 8FB40040 */ lw $s4, 0x40($sp) -/* B601CC 80241F1C 8FB3003C */ lw $s3, 0x3c($sp) -/* B601D0 80241F20 8FB20038 */ lw $s2, 0x38($sp) -/* B601D4 80241F24 8FB10034 */ lw $s1, 0x34($sp) -/* B601D8 80241F28 8FB00030 */ lw $s0, 0x30($sp) -/* B601DC 80241F2C 0000102D */ daddu $v0, $zero, $zero -/* B601E0 80241F30 03E00008 */ jr $ra -/* B601E4 80241F34 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s new file mode 100644 index 0000000000..c14fef9937 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241C84_B5FF34.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C84_B5FF34 +/* B5FF34 80241C84 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* B5FF38 80241C88 AFB20038 */ sw $s2, 0x38($sp) +/* B5FF3C 80241C8C 0080902D */ daddu $s2, $a0, $zero +/* B5FF40 80241C90 AFBF0048 */ sw $ra, 0x48($sp) +/* B5FF44 80241C94 AFB50044 */ sw $s5, 0x44($sp) +/* B5FF48 80241C98 AFB40040 */ sw $s4, 0x40($sp) +/* B5FF4C 80241C9C AFB3003C */ sw $s3, 0x3c($sp) +/* B5FF50 80241CA0 AFB10034 */ sw $s1, 0x34($sp) +/* B5FF54 80241CA4 AFB00030 */ sw $s0, 0x30($sp) +/* B5FF58 80241CA8 8E510148 */ lw $s1, 0x148($s2) +/* B5FF5C 80241CAC 86240008 */ lh $a0, 8($s1) +/* B5FF60 80241CB0 0C00EABB */ jal get_npc_unsafe +/* B5FF64 80241CB4 00A0802D */ daddu $s0, $a1, $zero +/* B5FF68 80241CB8 8E43000C */ lw $v1, 0xc($s2) +/* B5FF6C 80241CBC 0240202D */ daddu $a0, $s2, $zero +/* B5FF70 80241CC0 8C650000 */ lw $a1, ($v1) +/* B5FF74 80241CC4 0C0B1EAF */ jal get_variable +/* B5FF78 80241CC8 0040A82D */ daddu $s5, $v0, $zero +/* B5FF7C 80241CCC AFA00010 */ sw $zero, 0x10($sp) +/* B5FF80 80241CD0 8E2300D0 */ lw $v1, 0xd0($s1) +/* B5FF84 80241CD4 8C630030 */ lw $v1, 0x30($v1) +/* B5FF88 80241CD8 AFA30014 */ sw $v1, 0x14($sp) +/* B5FF8C 80241CDC 8E2300D0 */ lw $v1, 0xd0($s1) +/* B5FF90 80241CE0 8C63001C */ lw $v1, 0x1c($v1) +/* B5FF94 80241CE4 AFA30018 */ sw $v1, 0x18($sp) +/* B5FF98 80241CE8 8E2300D0 */ lw $v1, 0xd0($s1) +/* B5FF9C 80241CEC 8C630024 */ lw $v1, 0x24($v1) +/* B5FFA0 80241CF0 AFA3001C */ sw $v1, 0x1c($sp) +/* B5FFA4 80241CF4 8E2300D0 */ lw $v1, 0xd0($s1) +/* B5FFA8 80241CF8 8C630028 */ lw $v1, 0x28($v1) +/* B5FFAC 80241CFC 27B40010 */ addiu $s4, $sp, 0x10 +/* B5FFB0 80241D00 AFA30020 */ sw $v1, 0x20($sp) +/* B5FFB4 80241D04 8E2300D0 */ lw $v1, 0xd0($s1) +/* B5FFB8 80241D08 3C014282 */ lui $at, 0x4282 +/* B5FFBC 80241D0C 44810000 */ mtc1 $at, $f0 +/* B5FFC0 80241D10 8C63002C */ lw $v1, 0x2c($v1) +/* B5FFC4 80241D14 0040982D */ daddu $s3, $v0, $zero +/* B5FFC8 80241D18 E7A00028 */ swc1 $f0, 0x28($sp) +/* B5FFCC 80241D1C A7A0002C */ sh $zero, 0x2c($sp) +/* B5FFD0 80241D20 16000005 */ bnez $s0, .L80241D38 +/* B5FFD4 80241D24 AFA30024 */ sw $v1, 0x24($sp) +/* B5FFD8 80241D28 8E2200B0 */ lw $v0, 0xb0($s1) +/* B5FFDC 80241D2C 30420004 */ andi $v0, $v0, 4 +/* B5FFE0 80241D30 10400020 */ beqz $v0, .L80241DB4 +/* B5FFE4 80241D34 00000000 */ nop +.L80241D38: +/* B5FFE8 80241D38 2404F7FF */ addiu $a0, $zero, -0x801 +/* B5FFEC 80241D3C AE400070 */ sw $zero, 0x70($s2) +/* B5FFF0 80241D40 A6A0008E */ sh $zero, 0x8e($s5) +/* B5FFF4 80241D44 8E2200CC */ lw $v0, 0xcc($s1) +/* B5FFF8 80241D48 8EA30000 */ lw $v1, ($s5) +/* B5FFFC 80241D4C 8C420000 */ lw $v0, ($v0) +/* B60000 80241D50 00641824 */ and $v1, $v1, $a0 +/* B60004 80241D54 AEA30000 */ sw $v1, ($s5) +/* B60008 80241D58 AEA20028 */ sw $v0, 0x28($s5) +/* B6000C 80241D5C 8E2200D0 */ lw $v0, 0xd0($s1) +/* B60010 80241D60 8C420034 */ lw $v0, 0x34($v0) +/* B60014 80241D64 54400005 */ bnel $v0, $zero, .L80241D7C +/* B60018 80241D68 2402FDFF */ addiu $v0, $zero, -0x201 +/* B6001C 80241D6C 34620200 */ ori $v0, $v1, 0x200 +/* B60020 80241D70 2403FFF7 */ addiu $v1, $zero, -9 +/* B60024 80241D74 08090761 */ j .L80241D84 +/* B60028 80241D78 00431024 */ and $v0, $v0, $v1 +.L80241D7C: +/* B6002C 80241D7C 00621024 */ and $v0, $v1, $v0 +/* B60030 80241D80 34420008 */ ori $v0, $v0, 8 +.L80241D84: +/* B60034 80241D84 AEA20000 */ sw $v0, ($s5) +/* B60038 80241D88 8E2200B0 */ lw $v0, 0xb0($s1) +/* B6003C 80241D8C 30420004 */ andi $v0, $v0, 4 +/* B60040 80241D90 10400007 */ beqz $v0, .L80241DB0 +/* B60044 80241D94 24020063 */ addiu $v0, $zero, 0x63 +/* B60048 80241D98 AE420070 */ sw $v0, 0x70($s2) +/* B6004C 80241D9C AE400074 */ sw $zero, 0x74($s2) +/* B60050 80241DA0 8E2200B0 */ lw $v0, 0xb0($s1) +/* B60054 80241DA4 2403FFFB */ addiu $v1, $zero, -5 +/* B60058 80241DA8 00431024 */ and $v0, $v0, $v1 +/* B6005C 80241DAC AE2200B0 */ sw $v0, 0xb0($s1) +.L80241DB0: +/* B60060 80241DB0 AE20006C */ sw $zero, 0x6c($s1) +.L80241DB4: +/* B60064 80241DB4 8E420070 */ lw $v0, 0x70($s2) +/* B60068 80241DB8 2842001E */ slti $v0, $v0, 0x1e +/* B6006C 80241DBC 10400009 */ beqz $v0, .L80241DE4 +/* B60070 80241DC0 00000000 */ nop +/* B60074 80241DC4 8E22006C */ lw $v0, 0x6c($s1) +/* B60078 80241DC8 14400006 */ bnez $v0, .L80241DE4 +/* B6007C 80241DCC 00000000 */ nop +/* B60080 80241DD0 0C09061C */ jal func_80241870_B5FB20 +/* B60084 80241DD4 0240202D */ daddu $a0, $s2, $zero +/* B60088 80241DD8 10400002 */ beqz $v0, .L80241DE4 +/* B6008C 80241DDC 2402001E */ addiu $v0, $zero, 0x1e +/* B60090 80241DE0 AE420070 */ sw $v0, 0x70($s2) +.L80241DE4: +/* B60094 80241DE4 8E430070 */ lw $v1, 0x70($s2) +/* B60098 80241DE8 2C620064 */ sltiu $v0, $v1, 0x64 +/* B6009C 80241DEC 10400048 */ beqz $v0, .L80241F10 +/* B600A0 80241DF0 00031080 */ sll $v0, $v1, 2 +/* B600A4 80241DF4 3C018024 */ lui $at, 0x8024 +/* B600A8 80241DF8 00220821 */ addu $at, $at, $v0 +/* B600AC 80241DFC 8C2274E0 */ lw $v0, 0x74e0($at) +/* B600B0 80241E00 00400008 */ jr $v0 +/* B600B4 80241E04 00000000 */ nop +/* B600B8 80241E08 0240202D */ daddu $a0, $s2, $zero +/* B600BC 80241E0C 0260282D */ daddu $a1, $s3, $zero +/* B600C0 80241E10 0C012568 */ jal func_800495A0 +/* B600C4 80241E14 0280302D */ daddu $a2, $s4, $zero +/* B600C8 80241E18 0240202D */ daddu $a0, $s2, $zero +/* B600CC 80241E1C 0260282D */ daddu $a1, $s3, $zero +/* B600D0 80241E20 0C0125AE */ jal func_800496B8 +/* B600D4 80241E24 0280302D */ daddu $a2, $s4, $zero +/* B600D8 80241E28 080907C4 */ j .L80241F10 +/* B600DC 80241E2C 00000000 */ nop +/* B600E0 80241E30 0240202D */ daddu $a0, $s2, $zero +/* B600E4 80241E34 0260282D */ daddu $a1, $s3, $zero +/* B600E8 80241E38 0C0126D1 */ jal func_80049B44 +/* B600EC 80241E3C 0280302D */ daddu $a2, $s4, $zero +/* B600F0 80241E40 0240202D */ daddu $a0, $s2, $zero +/* B600F4 80241E44 0260282D */ daddu $a1, $s3, $zero +/* B600F8 80241E48 0C012701 */ jal func_80049C04 +/* B600FC 80241E4C 0280302D */ daddu $a2, $s4, $zero +/* B60100 80241E50 080907C4 */ j .L80241F10 +/* B60104 80241E54 00000000 */ nop +/* B60108 80241E58 0240202D */ daddu $a0, $s2, $zero +/* B6010C 80241E5C 0260282D */ daddu $a1, $s3, $zero +/* B60110 80241E60 0C01278F */ jal func_80049E3C +/* B60114 80241E64 0280302D */ daddu $a2, $s4, $zero +/* B60118 80241E68 0240202D */ daddu $a0, $s2, $zero +/* B6011C 80241E6C 0260282D */ daddu $a1, $s3, $zero +/* B60120 80241E70 0C0127B3 */ jal func_80049ECC +/* B60124 80241E74 0280302D */ daddu $a2, $s4, $zero +/* B60128 80241E78 080907C4 */ j .L80241F10 +/* B6012C 80241E7C 00000000 */ nop +/* B60130 80241E80 0240202D */ daddu $a0, $s2, $zero +/* B60134 80241E84 0260282D */ daddu $a1, $s3, $zero +/* B60138 80241E88 0C0127DF */ jal func_80049F7C +/* B6013C 80241E8C 0280302D */ daddu $a2, $s4, $zero +/* B60140 80241E90 0240202D */ daddu $a0, $s2, $zero +/* B60144 80241E94 0260282D */ daddu $a1, $s3, $zero +/* B60148 80241E98 0C012849 */ jal func_8004A124 +/* B6014C 80241E9C 0280302D */ daddu $a2, $s4, $zero +/* B60150 80241EA0 080907C4 */ j .L80241F10 +/* B60154 80241EA4 00000000 */ nop +/* B60158 80241EA8 0240202D */ daddu $a0, $s2, $zero +/* B6015C 80241EAC 0260282D */ daddu $a1, $s3, $zero +/* B60160 80241EB0 0C0128FA */ jal func_8004A3E8 +/* B60164 80241EB4 0280302D */ daddu $a2, $s4, $zero +/* B60168 80241EB8 080907C4 */ j .L80241F10 +/* B6016C 80241EBC 00000000 */ nop +/* B60170 80241EC0 0C09059A */ jal func_80241668_B5F918 +/* B60174 80241EC4 0240202D */ daddu $a0, $s2, $zero +/* B60178 80241EC8 0C0905B5 */ jal func_802416D4_B5F984 +/* B6017C 80241ECC 0240202D */ daddu $a0, $s2, $zero +/* B60180 80241ED0 8E430070 */ lw $v1, 0x70($s2) +/* B60184 80241ED4 24020020 */ addiu $v0, $zero, 0x20 +/* B60188 80241ED8 1462000D */ bne $v1, $v0, .L80241F10 +/* B6018C 80241EDC 00000000 */ nop +/* B60190 80241EE0 0C0905D1 */ jal func_80241744_B5F9F4 +/* B60194 80241EE4 0240202D */ daddu $a0, $s2, $zero +/* B60198 80241EE8 8E430070 */ lw $v1, 0x70($s2) +/* B6019C 80241EEC 24020021 */ addiu $v0, $zero, 0x21 +/* B601A0 80241EF0 14620007 */ bne $v1, $v0, .L80241F10 +/* B601A4 80241EF4 00000000 */ nop +/* B601A8 80241EF8 0C090607 */ jal func_8024181C_B5FACC +/* B601AC 80241EFC 0240202D */ daddu $a0, $s2, $zero +/* B601B0 80241F00 080907C4 */ j .L80241F10 +/* B601B4 80241F04 00000000 */ nop +/* B601B8 80241F08 0C0129CF */ jal func_8004A73C +/* B601BC 80241F0C 0240202D */ daddu $a0, $s2, $zero +.L80241F10: +/* B601C0 80241F10 8FBF0048 */ lw $ra, 0x48($sp) +/* B601C4 80241F14 8FB50044 */ lw $s5, 0x44($sp) +/* B601C8 80241F18 8FB40040 */ lw $s4, 0x40($sp) +/* B601CC 80241F1C 8FB3003C */ lw $s3, 0x3c($sp) +/* B601D0 80241F20 8FB20038 */ lw $s2, 0x38($sp) +/* B601D4 80241F24 8FB10034 */ lw $s1, 0x34($sp) +/* B601D8 80241F28 8FB00030 */ lw $s0, 0x30($sp) +/* B601DC 80241F2C 0000102D */ daddu $v0, $zero, $zero +/* B601E0 80241F30 03E00008 */ jr $ra +/* B601E4 80241F34 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38.s deleted file mode 100644 index cd71bb90e9..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F38 -/* B601E8 80241F38 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B601EC 80241F3C AFB20038 */ sw $s2, 0x38($sp) -/* B601F0 80241F40 0080902D */ daddu $s2, $a0, $zero -/* B601F4 80241F44 AFBF0048 */ sw $ra, 0x48($sp) -/* B601F8 80241F48 AFB50044 */ sw $s5, 0x44($sp) -/* B601FC 80241F4C AFB40040 */ sw $s4, 0x40($sp) -/* B60200 80241F50 AFB3003C */ sw $s3, 0x3c($sp) -/* B60204 80241F54 AFB10034 */ sw $s1, 0x34($sp) -/* B60208 80241F58 AFB00030 */ sw $s0, 0x30($sp) -/* B6020C 80241F5C 8E510148 */ lw $s1, 0x148($s2) -/* B60210 80241F60 86240008 */ lh $a0, 8($s1) -/* B60214 80241F64 0C00EABB */ jal get_npc_unsafe -/* B60218 80241F68 00A0802D */ daddu $s0, $a1, $zero -/* B6021C 80241F6C 8E43000C */ lw $v1, 0xc($s2) -/* B60220 80241F70 0240202D */ daddu $a0, $s2, $zero -/* B60224 80241F74 8C650000 */ lw $a1, ($v1) -/* B60228 80241F78 0C0B1EAF */ jal get_variable -/* B6022C 80241F7C 0040A82D */ daddu $s5, $v0, $zero -/* B60230 80241F80 AFA00010 */ sw $zero, 0x10($sp) -/* B60234 80241F84 8E2300D0 */ lw $v1, 0xd0($s1) -/* B60238 80241F88 8C630030 */ lw $v1, 0x30($v1) -/* B6023C 80241F8C AFA30014 */ sw $v1, 0x14($sp) -/* B60240 80241F90 8E2300D0 */ lw $v1, 0xd0($s1) -/* B60244 80241F94 8C63001C */ lw $v1, 0x1c($v1) -/* B60248 80241F98 AFA30018 */ sw $v1, 0x18($sp) -/* B6024C 80241F9C 8E2300D0 */ lw $v1, 0xd0($s1) -/* B60250 80241FA0 8C630024 */ lw $v1, 0x24($v1) -/* B60254 80241FA4 AFA3001C */ sw $v1, 0x1c($sp) -/* B60258 80241FA8 8E2300D0 */ lw $v1, 0xd0($s1) -/* B6025C 80241FAC 8C630028 */ lw $v1, 0x28($v1) -/* B60260 80241FB0 27B40010 */ addiu $s4, $sp, 0x10 -/* B60264 80241FB4 AFA30020 */ sw $v1, 0x20($sp) -/* B60268 80241FB8 8E2300D0 */ lw $v1, 0xd0($s1) -/* B6026C 80241FBC 3C014282 */ lui $at, 0x4282 -/* B60270 80241FC0 44810000 */ mtc1 $at, $f0 -/* B60274 80241FC4 8C63002C */ lw $v1, 0x2c($v1) -/* B60278 80241FC8 0040982D */ daddu $s3, $v0, $zero -/* B6027C 80241FCC E7A00028 */ swc1 $f0, 0x28($sp) -/* B60280 80241FD0 A7A0002C */ sh $zero, 0x2c($sp) -/* B60284 80241FD4 16000005 */ bnez $s0, .L80241FEC -/* B60288 80241FD8 AFA30024 */ sw $v1, 0x24($sp) -/* B6028C 80241FDC 8E2200B0 */ lw $v0, 0xb0($s1) -/* B60290 80241FE0 30420004 */ andi $v0, $v0, 4 -/* B60294 80241FE4 10400020 */ beqz $v0, .L80242068 -/* B60298 80241FE8 00000000 */ nop -.L80241FEC: -/* B6029C 80241FEC 2404F7FF */ addiu $a0, $zero, -0x801 -/* B602A0 80241FF0 AE400070 */ sw $zero, 0x70($s2) -/* B602A4 80241FF4 A6A0008E */ sh $zero, 0x8e($s5) -/* B602A8 80241FF8 8E2200CC */ lw $v0, 0xcc($s1) -/* B602AC 80241FFC 8EA30000 */ lw $v1, ($s5) -/* B602B0 80242000 8C420000 */ lw $v0, ($v0) -/* B602B4 80242004 00641824 */ and $v1, $v1, $a0 -/* B602B8 80242008 AEA30000 */ sw $v1, ($s5) -/* B602BC 8024200C AEA20028 */ sw $v0, 0x28($s5) -/* B602C0 80242010 8E2200D0 */ lw $v0, 0xd0($s1) -/* B602C4 80242014 8C420034 */ lw $v0, 0x34($v0) -/* B602C8 80242018 54400005 */ bnel $v0, $zero, .L80242030 -/* B602CC 8024201C 2402FDFF */ addiu $v0, $zero, -0x201 -/* B602D0 80242020 34620200 */ ori $v0, $v1, 0x200 -/* B602D4 80242024 2403FFF7 */ addiu $v1, $zero, -9 -/* B602D8 80242028 0809080E */ j .L80242038 -/* B602DC 8024202C 00431024 */ and $v0, $v0, $v1 -.L80242030: -/* B602E0 80242030 00621024 */ and $v0, $v1, $v0 -/* B602E4 80242034 34420008 */ ori $v0, $v0, 8 -.L80242038: -/* B602E8 80242038 AEA20000 */ sw $v0, ($s5) -/* B602EC 8024203C 8E2200B0 */ lw $v0, 0xb0($s1) -/* B602F0 80242040 30420004 */ andi $v0, $v0, 4 -/* B602F4 80242044 10400007 */ beqz $v0, .L80242064 -/* B602F8 80242048 24020063 */ addiu $v0, $zero, 0x63 -/* B602FC 8024204C AE420070 */ sw $v0, 0x70($s2) -/* B60300 80242050 AE400074 */ sw $zero, 0x74($s2) -/* B60304 80242054 8E2200B0 */ lw $v0, 0xb0($s1) -/* B60308 80242058 2403FFFB */ addiu $v1, $zero, -5 -/* B6030C 8024205C 00431024 */ and $v0, $v0, $v1 -/* B60310 80242060 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242064: -/* B60314 80242064 AE20006C */ sw $zero, 0x6c($s1) -.L80242068: -/* B60318 80242068 8E420070 */ lw $v0, 0x70($s2) -/* B6031C 8024206C 2842001E */ slti $v0, $v0, 0x1e -/* B60320 80242070 10400009 */ beqz $v0, .L80242098 -/* B60324 80242074 00000000 */ nop -/* B60328 80242078 8E22006C */ lw $v0, 0x6c($s1) -/* B6032C 8024207C 14400006 */ bnez $v0, .L80242098 -/* B60330 80242080 00000000 */ nop -/* B60334 80242084 0C09061C */ jal func_80241870 -/* B60338 80242088 0240202D */ daddu $a0, $s2, $zero -/* B6033C 8024208C 10400002 */ beqz $v0, .L80242098 -/* B60340 80242090 2402001E */ addiu $v0, $zero, 0x1e -/* B60344 80242094 AE420070 */ sw $v0, 0x70($s2) -.L80242098: -/* B60348 80242098 8E430070 */ lw $v1, 0x70($s2) -/* B6034C 8024209C 2C620064 */ sltiu $v0, $v1, 0x64 -/* B60350 802420A0 10400048 */ beqz $v0, .L802421C4 -/* B60354 802420A4 00031080 */ sll $v0, $v1, 2 -/* B60358 802420A8 3C018024 */ lui $at, 0x8024 -/* B6035C 802420AC 00220821 */ addu $at, $at, $v0 -/* B60360 802420B0 8C227670 */ lw $v0, 0x7670($at) -/* B60364 802420B4 00400008 */ jr $v0 -/* B60368 802420B8 00000000 */ nop -/* B6036C 802420BC 0240202D */ daddu $a0, $s2, $zero -/* B60370 802420C0 0260282D */ daddu $a1, $s3, $zero -/* B60374 802420C4 0C012568 */ jal func_800495A0 -/* B60378 802420C8 0280302D */ daddu $a2, $s4, $zero -/* B6037C 802420CC 0240202D */ daddu $a0, $s2, $zero -/* B60380 802420D0 0260282D */ daddu $a1, $s3, $zero -/* B60384 802420D4 0C0125AE */ jal func_800496B8 -/* B60388 802420D8 0280302D */ daddu $a2, $s4, $zero -/* B6038C 802420DC 08090871 */ j .L802421C4 -/* B60390 802420E0 00000000 */ nop -/* B60394 802420E4 0240202D */ daddu $a0, $s2, $zero -/* B60398 802420E8 0260282D */ daddu $a1, $s3, $zero -/* B6039C 802420EC 0C090515 */ jal func_80241454 -/* B603A0 802420F0 0280302D */ daddu $a2, $s4, $zero -/* B603A4 802420F4 0240202D */ daddu $a0, $s2, $zero -/* B603A8 802420F8 0260282D */ daddu $a1, $s3, $zero -/* B603AC 802420FC 0C090529 */ jal func_802414A4 -/* B603B0 80242100 0280302D */ daddu $a2, $s4, $zero -/* B603B4 80242104 08090871 */ j .L802421C4 -/* B603B8 80242108 00000000 */ nop -/* B603BC 8024210C 0240202D */ daddu $a0, $s2, $zero -/* B603C0 80242110 0260282D */ daddu $a1, $s3, $zero -/* B603C4 80242114 0C01278F */ jal func_80049E3C -/* B603C8 80242118 0280302D */ daddu $a2, $s4, $zero -/* B603CC 8024211C 0240202D */ daddu $a0, $s2, $zero -/* B603D0 80242120 0260282D */ daddu $a1, $s3, $zero -/* B603D4 80242124 0C0127B3 */ jal func_80049ECC -/* B603D8 80242128 0280302D */ daddu $a2, $s4, $zero -/* B603DC 8024212C 08090871 */ j .L802421C4 -/* B603E0 80242130 00000000 */ nop -/* B603E4 80242134 0240202D */ daddu $a0, $s2, $zero -/* B603E8 80242138 0260282D */ daddu $a1, $s3, $zero -/* B603EC 8024213C 0C0127DF */ jal func_80049F7C -/* B603F0 80242140 0280302D */ daddu $a2, $s4, $zero -/* B603F4 80242144 0240202D */ daddu $a0, $s2, $zero -/* B603F8 80242148 0260282D */ daddu $a1, $s3, $zero -/* B603FC 8024214C 0C012849 */ jal func_8004A124 -/* B60400 80242150 0280302D */ daddu $a2, $s4, $zero -/* B60404 80242154 08090871 */ j .L802421C4 -/* B60408 80242158 00000000 */ nop -/* B6040C 8024215C 0240202D */ daddu $a0, $s2, $zero -/* B60410 80242160 0260282D */ daddu $a1, $s3, $zero -/* B60414 80242164 0C0128FA */ jal func_8004A3E8 -/* B60418 80242168 0280302D */ daddu $a2, $s4, $zero -/* B6041C 8024216C 08090871 */ j .L802421C4 -/* B60420 80242170 00000000 */ nop -/* B60424 80242174 0C09059A */ jal func_80241668 -/* B60428 80242178 0240202D */ daddu $a0, $s2, $zero -/* B6042C 8024217C 0C0905B5 */ jal func_802416D4_B5F984 -/* B60430 80242180 0240202D */ daddu $a0, $s2, $zero -/* B60434 80242184 8E430070 */ lw $v1, 0x70($s2) -/* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 -/* B6043C 8024218C 1462000D */ bne $v1, $v0, .L802421C4 -/* B60440 80242190 00000000 */ nop -/* B60444 80242194 0C0905D1 */ jal func_80241744 -/* B60448 80242198 0240202D */ daddu $a0, $s2, $zero -/* B6044C 8024219C 8E430070 */ lw $v1, 0x70($s2) -/* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 -/* B60454 802421A4 14620007 */ bne $v1, $v0, .L802421C4 -/* B60458 802421A8 00000000 */ nop -/* B6045C 802421AC 0C090607 */ jal func_8024181C -/* B60460 802421B0 0240202D */ daddu $a0, $s2, $zero -/* B60464 802421B4 08090871 */ j .L802421C4 -/* B60468 802421B8 00000000 */ nop -/* B6046C 802421BC 0C0129CF */ jal func_8004A73C -/* B60470 802421C0 0240202D */ daddu $a0, $s2, $zero -.L802421C4: -/* B60474 802421C4 8FBF0048 */ lw $ra, 0x48($sp) -/* B60478 802421C8 8FB50044 */ lw $s5, 0x44($sp) -/* B6047C 802421CC 8FB40040 */ lw $s4, 0x40($sp) -/* B60480 802421D0 8FB3003C */ lw $s3, 0x3c($sp) -/* B60484 802421D4 8FB20038 */ lw $s2, 0x38($sp) -/* B60488 802421D8 8FB10034 */ lw $s1, 0x34($sp) -/* B6048C 802421DC 8FB00030 */ lw $s0, 0x30($sp) -/* B60490 802421E0 0000102D */ daddu $v0, $zero, $zero -/* B60494 802421E4 03E00008 */ jr $ra -/* B60498 802421E8 27BD0050 */ addiu $sp, $sp, 0x50 -/* B6049C 802421EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s new file mode 100644 index 0000000000..33826a01c1 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B5F650/func_80241F38_B601E8.s @@ -0,0 +1,185 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F38_B601E8 +/* B601E8 80241F38 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* B601EC 80241F3C AFB20038 */ sw $s2, 0x38($sp) +/* B601F0 80241F40 0080902D */ daddu $s2, $a0, $zero +/* B601F4 80241F44 AFBF0048 */ sw $ra, 0x48($sp) +/* B601F8 80241F48 AFB50044 */ sw $s5, 0x44($sp) +/* B601FC 80241F4C AFB40040 */ sw $s4, 0x40($sp) +/* B60200 80241F50 AFB3003C */ sw $s3, 0x3c($sp) +/* B60204 80241F54 AFB10034 */ sw $s1, 0x34($sp) +/* B60208 80241F58 AFB00030 */ sw $s0, 0x30($sp) +/* B6020C 80241F5C 8E510148 */ lw $s1, 0x148($s2) +/* B60210 80241F60 86240008 */ lh $a0, 8($s1) +/* B60214 80241F64 0C00EABB */ jal get_npc_unsafe +/* B60218 80241F68 00A0802D */ daddu $s0, $a1, $zero +/* B6021C 80241F6C 8E43000C */ lw $v1, 0xc($s2) +/* B60220 80241F70 0240202D */ daddu $a0, $s2, $zero +/* B60224 80241F74 8C650000 */ lw $a1, ($v1) +/* B60228 80241F78 0C0B1EAF */ jal get_variable +/* B6022C 80241F7C 0040A82D */ daddu $s5, $v0, $zero +/* B60230 80241F80 AFA00010 */ sw $zero, 0x10($sp) +/* B60234 80241F84 8E2300D0 */ lw $v1, 0xd0($s1) +/* B60238 80241F88 8C630030 */ lw $v1, 0x30($v1) +/* B6023C 80241F8C AFA30014 */ sw $v1, 0x14($sp) +/* B60240 80241F90 8E2300D0 */ lw $v1, 0xd0($s1) +/* B60244 80241F94 8C63001C */ lw $v1, 0x1c($v1) +/* B60248 80241F98 AFA30018 */ sw $v1, 0x18($sp) +/* B6024C 80241F9C 8E2300D0 */ lw $v1, 0xd0($s1) +/* B60250 80241FA0 8C630024 */ lw $v1, 0x24($v1) +/* B60254 80241FA4 AFA3001C */ sw $v1, 0x1c($sp) +/* B60258 80241FA8 8E2300D0 */ lw $v1, 0xd0($s1) +/* B6025C 80241FAC 8C630028 */ lw $v1, 0x28($v1) +/* B60260 80241FB0 27B40010 */ addiu $s4, $sp, 0x10 +/* B60264 80241FB4 AFA30020 */ sw $v1, 0x20($sp) +/* B60268 80241FB8 8E2300D0 */ lw $v1, 0xd0($s1) +/* B6026C 80241FBC 3C014282 */ lui $at, 0x4282 +/* B60270 80241FC0 44810000 */ mtc1 $at, $f0 +/* B60274 80241FC4 8C63002C */ lw $v1, 0x2c($v1) +/* B60278 80241FC8 0040982D */ daddu $s3, $v0, $zero +/* B6027C 80241FCC E7A00028 */ swc1 $f0, 0x28($sp) +/* B60280 80241FD0 A7A0002C */ sh $zero, 0x2c($sp) +/* B60284 80241FD4 16000005 */ bnez $s0, .L80241FEC +/* B60288 80241FD8 AFA30024 */ sw $v1, 0x24($sp) +/* B6028C 80241FDC 8E2200B0 */ lw $v0, 0xb0($s1) +/* B60290 80241FE0 30420004 */ andi $v0, $v0, 4 +/* B60294 80241FE4 10400020 */ beqz $v0, .L80242068 +/* B60298 80241FE8 00000000 */ nop +.L80241FEC: +/* B6029C 80241FEC 2404F7FF */ addiu $a0, $zero, -0x801 +/* B602A0 80241FF0 AE400070 */ sw $zero, 0x70($s2) +/* B602A4 80241FF4 A6A0008E */ sh $zero, 0x8e($s5) +/* B602A8 80241FF8 8E2200CC */ lw $v0, 0xcc($s1) +/* B602AC 80241FFC 8EA30000 */ lw $v1, ($s5) +/* B602B0 80242000 8C420000 */ lw $v0, ($v0) +/* B602B4 80242004 00641824 */ and $v1, $v1, $a0 +/* B602B8 80242008 AEA30000 */ sw $v1, ($s5) +/* B602BC 8024200C AEA20028 */ sw $v0, 0x28($s5) +/* B602C0 80242010 8E2200D0 */ lw $v0, 0xd0($s1) +/* B602C4 80242014 8C420034 */ lw $v0, 0x34($v0) +/* B602C8 80242018 54400005 */ bnel $v0, $zero, .L80242030 +/* B602CC 8024201C 2402FDFF */ addiu $v0, $zero, -0x201 +/* B602D0 80242020 34620200 */ ori $v0, $v1, 0x200 +/* B602D4 80242024 2403FFF7 */ addiu $v1, $zero, -9 +/* B602D8 80242028 0809080E */ j .L80242038 +/* B602DC 8024202C 00431024 */ and $v0, $v0, $v1 +.L80242030: +/* B602E0 80242030 00621024 */ and $v0, $v1, $v0 +/* B602E4 80242034 34420008 */ ori $v0, $v0, 8 +.L80242038: +/* B602E8 80242038 AEA20000 */ sw $v0, ($s5) +/* B602EC 8024203C 8E2200B0 */ lw $v0, 0xb0($s1) +/* B602F0 80242040 30420004 */ andi $v0, $v0, 4 +/* B602F4 80242044 10400007 */ beqz $v0, .L80242064 +/* B602F8 80242048 24020063 */ addiu $v0, $zero, 0x63 +/* B602FC 8024204C AE420070 */ sw $v0, 0x70($s2) +/* B60300 80242050 AE400074 */ sw $zero, 0x74($s2) +/* B60304 80242054 8E2200B0 */ lw $v0, 0xb0($s1) +/* B60308 80242058 2403FFFB */ addiu $v1, $zero, -5 +/* B6030C 8024205C 00431024 */ and $v0, $v0, $v1 +/* B60310 80242060 AE2200B0 */ sw $v0, 0xb0($s1) +.L80242064: +/* B60314 80242064 AE20006C */ sw $zero, 0x6c($s1) +.L80242068: +/* B60318 80242068 8E420070 */ lw $v0, 0x70($s2) +/* B6031C 8024206C 2842001E */ slti $v0, $v0, 0x1e +/* B60320 80242070 10400009 */ beqz $v0, .L80242098 +/* B60324 80242074 00000000 */ nop +/* B60328 80242078 8E22006C */ lw $v0, 0x6c($s1) +/* B6032C 8024207C 14400006 */ bnez $v0, .L80242098 +/* B60330 80242080 00000000 */ nop +/* B60334 80242084 0C09061C */ jal func_80241870_B5FB20 +/* B60338 80242088 0240202D */ daddu $a0, $s2, $zero +/* B6033C 8024208C 10400002 */ beqz $v0, .L80242098 +/* B60340 80242090 2402001E */ addiu $v0, $zero, 0x1e +/* B60344 80242094 AE420070 */ sw $v0, 0x70($s2) +.L80242098: +/* B60348 80242098 8E430070 */ lw $v1, 0x70($s2) +/* B6034C 8024209C 2C620064 */ sltiu $v0, $v1, 0x64 +/* B60350 802420A0 10400048 */ beqz $v0, .L802421C4 +/* B60354 802420A4 00031080 */ sll $v0, $v1, 2 +/* B60358 802420A8 3C018024 */ lui $at, 0x8024 +/* B6035C 802420AC 00220821 */ addu $at, $at, $v0 +/* B60360 802420B0 8C227670 */ lw $v0, 0x7670($at) +/* B60364 802420B4 00400008 */ jr $v0 +/* B60368 802420B8 00000000 */ nop +/* B6036C 802420BC 0240202D */ daddu $a0, $s2, $zero +/* B60370 802420C0 0260282D */ daddu $a1, $s3, $zero +/* B60374 802420C4 0C012568 */ jal func_800495A0 +/* B60378 802420C8 0280302D */ daddu $a2, $s4, $zero +/* B6037C 802420CC 0240202D */ daddu $a0, $s2, $zero +/* B60380 802420D0 0260282D */ daddu $a1, $s3, $zero +/* B60384 802420D4 0C0125AE */ jal func_800496B8 +/* B60388 802420D8 0280302D */ daddu $a2, $s4, $zero +/* B6038C 802420DC 08090871 */ j .L802421C4 +/* B60390 802420E0 00000000 */ nop +/* B60394 802420E4 0240202D */ daddu $a0, $s2, $zero +/* B60398 802420E8 0260282D */ daddu $a1, $s3, $zero +/* B6039C 802420EC 0C090515 */ jal func_80241454_B5F704 +/* B603A0 802420F0 0280302D */ daddu $a2, $s4, $zero +/* B603A4 802420F4 0240202D */ daddu $a0, $s2, $zero +/* B603A8 802420F8 0260282D */ daddu $a1, $s3, $zero +/* B603AC 802420FC 0C090529 */ jal func_802414A4_B5F754 +/* B603B0 80242100 0280302D */ daddu $a2, $s4, $zero +/* B603B4 80242104 08090871 */ j .L802421C4 +/* B603B8 80242108 00000000 */ nop +/* B603BC 8024210C 0240202D */ daddu $a0, $s2, $zero +/* B603C0 80242110 0260282D */ daddu $a1, $s3, $zero +/* B603C4 80242114 0C01278F */ jal func_80049E3C +/* B603C8 80242118 0280302D */ daddu $a2, $s4, $zero +/* B603CC 8024211C 0240202D */ daddu $a0, $s2, $zero +/* B603D0 80242120 0260282D */ daddu $a1, $s3, $zero +/* B603D4 80242124 0C0127B3 */ jal func_80049ECC +/* B603D8 80242128 0280302D */ daddu $a2, $s4, $zero +/* B603DC 8024212C 08090871 */ j .L802421C4 +/* B603E0 80242130 00000000 */ nop +/* B603E4 80242134 0240202D */ daddu $a0, $s2, $zero +/* B603E8 80242138 0260282D */ daddu $a1, $s3, $zero +/* B603EC 8024213C 0C0127DF */ jal func_80049F7C +/* B603F0 80242140 0280302D */ daddu $a2, $s4, $zero +/* B603F4 80242144 0240202D */ daddu $a0, $s2, $zero +/* B603F8 80242148 0260282D */ daddu $a1, $s3, $zero +/* B603FC 8024214C 0C012849 */ jal func_8004A124 +/* B60400 80242150 0280302D */ daddu $a2, $s4, $zero +/* B60404 80242154 08090871 */ j .L802421C4 +/* B60408 80242158 00000000 */ nop +/* B6040C 8024215C 0240202D */ daddu $a0, $s2, $zero +/* B60410 80242160 0260282D */ daddu $a1, $s3, $zero +/* B60414 80242164 0C0128FA */ jal func_8004A3E8 +/* B60418 80242168 0280302D */ daddu $a2, $s4, $zero +/* B6041C 8024216C 08090871 */ j .L802421C4 +/* B60420 80242170 00000000 */ nop +/* B60424 80242174 0C09059A */ jal func_80241668_B5F918 +/* B60428 80242178 0240202D */ daddu $a0, $s2, $zero +/* B6042C 8024217C 0C0905B5 */ jal func_802416D4_B5F984 +/* B60430 80242180 0240202D */ daddu $a0, $s2, $zero +/* B60434 80242184 8E430070 */ lw $v1, 0x70($s2) +/* B60438 80242188 24020020 */ addiu $v0, $zero, 0x20 +/* B6043C 8024218C 1462000D */ bne $v1, $v0, .L802421C4 +/* B60440 80242190 00000000 */ nop +/* B60444 80242194 0C0905D1 */ jal func_80241744_B5F9F4 +/* B60448 80242198 0240202D */ daddu $a0, $s2, $zero +/* B6044C 8024219C 8E430070 */ lw $v1, 0x70($s2) +/* B60450 802421A0 24020021 */ addiu $v0, $zero, 0x21 +/* B60454 802421A4 14620007 */ bne $v1, $v0, .L802421C4 +/* B60458 802421A8 00000000 */ nop +/* B6045C 802421AC 0C090607 */ jal func_8024181C_B5FACC +/* B60460 802421B0 0240202D */ daddu $a0, $s2, $zero +/* B60464 802421B4 08090871 */ j .L802421C4 +/* B60468 802421B8 00000000 */ nop +/* B6046C 802421BC 0C0129CF */ jal func_8004A73C +/* B60470 802421C0 0240202D */ daddu $a0, $s2, $zero +.L802421C4: +/* B60474 802421C4 8FBF0048 */ lw $ra, 0x48($sp) +/* B60478 802421C8 8FB50044 */ lw $s5, 0x44($sp) +/* B6047C 802421CC 8FB40040 */ lw $s4, 0x40($sp) +/* B60480 802421D0 8FB3003C */ lw $s3, 0x3c($sp) +/* B60484 802421D4 8FB20038 */ lw $s2, 0x38($sp) +/* B60488 802421D8 8FB10034 */ lw $s1, 0x34($sp) +/* B6048C 802421DC 8FB00030 */ lw $s0, 0x30($sp) +/* B60490 802421E0 0000102D */ daddu $v0, $zero, $zero +/* B60494 802421E4 03E00008 */ jr $ra +/* B60498 802421E8 27BD0050 */ addiu $sp, $sp, 0x50 +/* B6049C 802421EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B604A0/func_80242260.s b/asm/nonmatchings/world/area_jan/jan_08/B604A0/func_80242260.s deleted file mode 100644 index 3ff07c2144..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_08/B604A0/func_80242260.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242260 -/* B60510 80242260 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B60514 80242264 AFB10054 */ sw $s1, 0x54($sp) -/* B60518 80242268 0080882D */ daddu $s1, $a0, $zero -/* B6051C 8024226C AFBF005C */ sw $ra, 0x5c($sp) -/* B60520 80242270 AFB20058 */ sw $s2, 0x58($sp) -/* B60524 80242274 AFB00050 */ sw $s0, 0x50($sp) -/* B60528 80242278 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B6052C 8024227C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B60530 80242280 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B60534 80242284 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B60538 80242288 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B6053C 8024228C 8E30000C */ lw $s0, 0xc($s1) -/* B60540 80242290 8E050000 */ lw $a1, ($s0) -/* B60544 80242294 0C0B1EAF */ jal get_variable -/* B60548 80242298 26100004 */ addiu $s0, $s0, 4 -/* B6054C 8024229C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B60550 802422A0 0040202D */ daddu $a0, $v0, $zero -/* B60554 802422A4 8E050000 */ lw $a1, ($s0) -/* B60558 802422A8 26100004 */ addiu $s0, $s0, 4 -/* B6055C 802422AC 0220202D */ daddu $a0, $s1, $zero -/* B60560 802422B0 0C0B210B */ jal get_float_variable -/* B60564 802422B4 0040902D */ daddu $s2, $v0, $zero -/* B60568 802422B8 8E050000 */ lw $a1, ($s0) -/* B6056C 802422BC 26100004 */ addiu $s0, $s0, 4 -/* B60570 802422C0 0220202D */ daddu $a0, $s1, $zero -/* B60574 802422C4 0C0B210B */ jal get_float_variable -/* B60578 802422C8 46000706 */ mov.s $f28, $f0 -/* B6057C 802422CC 8E050000 */ lw $a1, ($s0) -/* B60580 802422D0 26100004 */ addiu $s0, $s0, 4 -/* B60584 802422D4 0220202D */ daddu $a0, $s1, $zero -/* B60588 802422D8 0C0B210B */ jal get_float_variable -/* B6058C 802422DC 46000686 */ mov.s $f26, $f0 -/* B60590 802422E0 0220202D */ daddu $a0, $s1, $zero -/* B60594 802422E4 8E050000 */ lw $a1, ($s0) -/* B60598 802422E8 0C0B210B */ jal get_float_variable -/* B6059C 802422EC 46000586 */ mov.s $f22, $f0 -/* B605A0 802422F0 0240202D */ daddu $a0, $s2, $zero -/* B605A4 802422F4 0C046B4C */ jal get_model_from_list_index -/* B605A8 802422F8 46000606 */ mov.s $f24, $f0 -/* B605AC 802422FC 0040882D */ daddu $s1, $v0, $zero -/* B605B0 80242300 96220000 */ lhu $v0, ($s1) -/* B605B4 80242304 30420400 */ andi $v0, $v0, 0x400 -/* B605B8 80242308 1440001E */ bnez $v0, .L80242384 -/* B605BC 8024230C 26300058 */ addiu $s0, $s1, 0x58 -/* B605C0 80242310 4480A000 */ mtc1 $zero, $f20 -/* B605C4 80242314 4406B000 */ mfc1 $a2, $f22 -/* B605C8 80242318 4405A000 */ mfc1 $a1, $f20 -/* B605CC 8024231C 4407A000 */ mfc1 $a3, $f20 -/* B605D0 80242320 0C019E40 */ jal guTranslateF -/* B605D4 80242324 0200202D */ daddu $a0, $s0, $zero -/* B605D8 80242328 4405E000 */ mfc1 $a1, $f28 -/* B605DC 8024232C 4406D000 */ mfc1 $a2, $f26 -/* B605E0 80242330 4407C000 */ mfc1 $a3, $f24 -/* B605E4 80242334 0C09087C */ jal func_802421F0 -/* B605E8 80242338 27A40010 */ addiu $a0, $sp, 0x10 -/* B605EC 8024233C 27A40010 */ addiu $a0, $sp, 0x10 -/* B605F0 80242340 0200282D */ daddu $a1, $s0, $zero -/* B605F4 80242344 0C019D80 */ jal guMtxCatF -/* B605F8 80242348 0200302D */ daddu $a2, $s0, $zero -/* B605FC 8024234C 27A40010 */ addiu $a0, $sp, 0x10 -/* B60600 80242350 4600B587 */ neg.s $f22, $f22 -/* B60604 80242354 4405A000 */ mfc1 $a1, $f20 -/* B60608 80242358 4406B000 */ mfc1 $a2, $f22 -/* B6060C 8024235C 0C019E40 */ jal guTranslateF -/* B60610 80242360 00A0382D */ daddu $a3, $a1, $zero -/* B60614 80242364 27A40010 */ addiu $a0, $sp, 0x10 -/* B60618 80242368 0200282D */ daddu $a1, $s0, $zero -/* B6061C 8024236C 0C019D80 */ jal guMtxCatF -/* B60620 80242370 00A0302D */ daddu $a2, $a1, $zero -/* B60624 80242374 96220000 */ lhu $v0, ($s1) -/* B60628 80242378 34421400 */ ori $v0, $v0, 0x1400 -/* B6062C 8024237C 080908FF */ j .L802423FC -/* B60630 80242380 A6220000 */ sh $v0, ($s1) -.L80242384: -/* B60634 80242384 4480A000 */ mtc1 $zero, $f20 -/* B60638 80242388 4406B000 */ mfc1 $a2, $f22 -/* B6063C 8024238C 4405A000 */ mfc1 $a1, $f20 -/* B60640 80242390 4407A000 */ mfc1 $a3, $f20 -/* B60644 80242394 0C019E40 */ jal guTranslateF -/* B60648 80242398 27A40010 */ addiu $a0, $sp, 0x10 -/* B6064C 8024239C 27A40010 */ addiu $a0, $sp, 0x10 -/* B60650 802423A0 26300058 */ addiu $s0, $s1, 0x58 -/* B60654 802423A4 0200282D */ daddu $a1, $s0, $zero -/* B60658 802423A8 0C019D80 */ jal guMtxCatF -/* B6065C 802423AC 0200302D */ daddu $a2, $s0, $zero -/* B60660 802423B0 4405E000 */ mfc1 $a1, $f28 -/* B60664 802423B4 4406D000 */ mfc1 $a2, $f26 -/* B60668 802423B8 4407C000 */ mfc1 $a3, $f24 -/* B6066C 802423BC 0C09087C */ jal func_802421F0 -/* B60670 802423C0 27A40010 */ addiu $a0, $sp, 0x10 -/* B60674 802423C4 27A40010 */ addiu $a0, $sp, 0x10 -/* B60678 802423C8 0200282D */ daddu $a1, $s0, $zero -/* B6067C 802423CC 0C019D80 */ jal guMtxCatF -/* B60680 802423D0 0200302D */ daddu $a2, $s0, $zero -/* B60684 802423D4 27A40010 */ addiu $a0, $sp, 0x10 -/* B60688 802423D8 4600B587 */ neg.s $f22, $f22 -/* B6068C 802423DC 4405A000 */ mfc1 $a1, $f20 -/* B60690 802423E0 4406B000 */ mfc1 $a2, $f22 -/* B60694 802423E4 0C019E40 */ jal guTranslateF -/* B60698 802423E8 00A0382D */ daddu $a3, $a1, $zero -/* B6069C 802423EC 27A40010 */ addiu $a0, $sp, 0x10 -/* B606A0 802423F0 0200282D */ daddu $a1, $s0, $zero -/* B606A4 802423F4 0C019D80 */ jal guMtxCatF -/* B606A8 802423F8 00A0302D */ daddu $a2, $a1, $zero -.L802423FC: -/* B606AC 802423FC 8FBF005C */ lw $ra, 0x5c($sp) -/* B606B0 80242400 8FB20058 */ lw $s2, 0x58($sp) -/* B606B4 80242404 8FB10054 */ lw $s1, 0x54($sp) -/* B606B8 80242408 8FB00050 */ lw $s0, 0x50($sp) -/* B606BC 8024240C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B606C0 80242410 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B606C4 80242414 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B606C8 80242418 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B606CC 8024241C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B606D0 80242420 24020002 */ addiu $v0, $zero, 2 -/* B606D4 80242424 03E00008 */ jr $ra -/* B606D8 80242428 27BD0088 */ addiu $sp, $sp, 0x88 -/* B606DC 8024242C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_08/B604A0/func_80242260_B60510.s b/asm/nonmatchings/world/area_jan/jan_08/B604A0/func_80242260_B60510.s new file mode 100644 index 0000000000..615525629f --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_08/B604A0/func_80242260_B60510.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242260_B60510 +/* B60510 80242260 27BDFF78 */ addiu $sp, $sp, -0x88 +/* B60514 80242264 AFB10054 */ sw $s1, 0x54($sp) +/* B60518 80242268 0080882D */ daddu $s1, $a0, $zero +/* B6051C 8024226C AFBF005C */ sw $ra, 0x5c($sp) +/* B60520 80242270 AFB20058 */ sw $s2, 0x58($sp) +/* B60524 80242274 AFB00050 */ sw $s0, 0x50($sp) +/* B60528 80242278 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* B6052C 8024227C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* B60530 80242280 F7B80070 */ sdc1 $f24, 0x70($sp) +/* B60534 80242284 F7B60068 */ sdc1 $f22, 0x68($sp) +/* B60538 80242288 F7B40060 */ sdc1 $f20, 0x60($sp) +/* B6053C 8024228C 8E30000C */ lw $s0, 0xc($s1) +/* B60540 80242290 8E050000 */ lw $a1, ($s0) +/* B60544 80242294 0C0B1EAF */ jal get_variable +/* B60548 80242298 26100004 */ addiu $s0, $s0, 4 +/* B6054C 8024229C 0C046C04 */ jal get_model_list_index_from_tree_index +/* B60550 802422A0 0040202D */ daddu $a0, $v0, $zero +/* B60554 802422A4 8E050000 */ lw $a1, ($s0) +/* B60558 802422A8 26100004 */ addiu $s0, $s0, 4 +/* B6055C 802422AC 0220202D */ daddu $a0, $s1, $zero +/* B60560 802422B0 0C0B210B */ jal get_float_variable +/* B60564 802422B4 0040902D */ daddu $s2, $v0, $zero +/* B60568 802422B8 8E050000 */ lw $a1, ($s0) +/* B6056C 802422BC 26100004 */ addiu $s0, $s0, 4 +/* B60570 802422C0 0220202D */ daddu $a0, $s1, $zero +/* B60574 802422C4 0C0B210B */ jal get_float_variable +/* B60578 802422C8 46000706 */ mov.s $f28, $f0 +/* B6057C 802422CC 8E050000 */ lw $a1, ($s0) +/* B60580 802422D0 26100004 */ addiu $s0, $s0, 4 +/* B60584 802422D4 0220202D */ daddu $a0, $s1, $zero +/* B60588 802422D8 0C0B210B */ jal get_float_variable +/* B6058C 802422DC 46000686 */ mov.s $f26, $f0 +/* B60590 802422E0 0220202D */ daddu $a0, $s1, $zero +/* B60594 802422E4 8E050000 */ lw $a1, ($s0) +/* B60598 802422E8 0C0B210B */ jal get_float_variable +/* B6059C 802422EC 46000586 */ mov.s $f22, $f0 +/* B605A0 802422F0 0240202D */ daddu $a0, $s2, $zero +/* B605A4 802422F4 0C046B4C */ jal get_model_from_list_index +/* B605A8 802422F8 46000606 */ mov.s $f24, $f0 +/* B605AC 802422FC 0040882D */ daddu $s1, $v0, $zero +/* B605B0 80242300 96220000 */ lhu $v0, ($s1) +/* B605B4 80242304 30420400 */ andi $v0, $v0, 0x400 +/* B605B8 80242308 1440001E */ bnez $v0, .L80242384 +/* B605BC 8024230C 26300058 */ addiu $s0, $s1, 0x58 +/* B605C0 80242310 4480A000 */ mtc1 $zero, $f20 +/* B605C4 80242314 4406B000 */ mfc1 $a2, $f22 +/* B605C8 80242318 4405A000 */ mfc1 $a1, $f20 +/* B605CC 8024231C 4407A000 */ mfc1 $a3, $f20 +/* B605D0 80242320 0C019E40 */ jal guTranslateF +/* B605D4 80242324 0200202D */ daddu $a0, $s0, $zero +/* B605D8 80242328 4405E000 */ mfc1 $a1, $f28 +/* B605DC 8024232C 4406D000 */ mfc1 $a2, $f26 +/* B605E0 80242330 4407C000 */ mfc1 $a3, $f24 +/* B605E4 80242334 0C09087C */ jal func_802421F0_B604A0 +/* B605E8 80242338 27A40010 */ addiu $a0, $sp, 0x10 +/* B605EC 8024233C 27A40010 */ addiu $a0, $sp, 0x10 +/* B605F0 80242340 0200282D */ daddu $a1, $s0, $zero +/* B605F4 80242344 0C019D80 */ jal guMtxCatF +/* B605F8 80242348 0200302D */ daddu $a2, $s0, $zero +/* B605FC 8024234C 27A40010 */ addiu $a0, $sp, 0x10 +/* B60600 80242350 4600B587 */ neg.s $f22, $f22 +/* B60604 80242354 4405A000 */ mfc1 $a1, $f20 +/* B60608 80242358 4406B000 */ mfc1 $a2, $f22 +/* B6060C 8024235C 0C019E40 */ jal guTranslateF +/* B60610 80242360 00A0382D */ daddu $a3, $a1, $zero +/* B60614 80242364 27A40010 */ addiu $a0, $sp, 0x10 +/* B60618 80242368 0200282D */ daddu $a1, $s0, $zero +/* B6061C 8024236C 0C019D80 */ jal guMtxCatF +/* B60620 80242370 00A0302D */ daddu $a2, $a1, $zero +/* B60624 80242374 96220000 */ lhu $v0, ($s1) +/* B60628 80242378 34421400 */ ori $v0, $v0, 0x1400 +/* B6062C 8024237C 080908FF */ j .L802423FC +/* B60630 80242380 A6220000 */ sh $v0, ($s1) +.L80242384: +/* B60634 80242384 4480A000 */ mtc1 $zero, $f20 +/* B60638 80242388 4406B000 */ mfc1 $a2, $f22 +/* B6063C 8024238C 4405A000 */ mfc1 $a1, $f20 +/* B60640 80242390 4407A000 */ mfc1 $a3, $f20 +/* B60644 80242394 0C019E40 */ jal guTranslateF +/* B60648 80242398 27A40010 */ addiu $a0, $sp, 0x10 +/* B6064C 8024239C 27A40010 */ addiu $a0, $sp, 0x10 +/* B60650 802423A0 26300058 */ addiu $s0, $s1, 0x58 +/* B60654 802423A4 0200282D */ daddu $a1, $s0, $zero +/* B60658 802423A8 0C019D80 */ jal guMtxCatF +/* B6065C 802423AC 0200302D */ daddu $a2, $s0, $zero +/* B60660 802423B0 4405E000 */ mfc1 $a1, $f28 +/* B60664 802423B4 4406D000 */ mfc1 $a2, $f26 +/* B60668 802423B8 4407C000 */ mfc1 $a3, $f24 +/* B6066C 802423BC 0C09087C */ jal func_802421F0_B604A0 +/* B60670 802423C0 27A40010 */ addiu $a0, $sp, 0x10 +/* B60674 802423C4 27A40010 */ addiu $a0, $sp, 0x10 +/* B60678 802423C8 0200282D */ daddu $a1, $s0, $zero +/* B6067C 802423CC 0C019D80 */ jal guMtxCatF +/* B60680 802423D0 0200302D */ daddu $a2, $s0, $zero +/* B60684 802423D4 27A40010 */ addiu $a0, $sp, 0x10 +/* B60688 802423D8 4600B587 */ neg.s $f22, $f22 +/* B6068C 802423DC 4405A000 */ mfc1 $a1, $f20 +/* B60690 802423E0 4406B000 */ mfc1 $a2, $f22 +/* B60694 802423E4 0C019E40 */ jal guTranslateF +/* B60698 802423E8 00A0382D */ daddu $a3, $a1, $zero +/* B6069C 802423EC 27A40010 */ addiu $a0, $sp, 0x10 +/* B606A0 802423F0 0200282D */ daddu $a1, $s0, $zero +/* B606A4 802423F4 0C019D80 */ jal guMtxCatF +/* B606A8 802423F8 00A0302D */ daddu $a2, $a1, $zero +.L802423FC: +/* B606AC 802423FC 8FBF005C */ lw $ra, 0x5c($sp) +/* B606B0 80242400 8FB20058 */ lw $s2, 0x58($sp) +/* B606B4 80242404 8FB10054 */ lw $s1, 0x54($sp) +/* B606B8 80242408 8FB00050 */ lw $s0, 0x50($sp) +/* B606BC 8024240C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* B606C0 80242410 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* B606C4 80242414 D7B80070 */ ldc1 $f24, 0x70($sp) +/* B606C8 80242418 D7B60068 */ ldc1 $f22, 0x68($sp) +/* B606CC 8024241C D7B40060 */ ldc1 $f20, 0x60($sp) +/* B606D0 80242420 24020002 */ addiu $v0, $zero, 2 +/* B606D4 80242424 03E00008 */ jr $ra +/* B606D8 80242428 27BD0088 */ addiu $sp, $sp, 0x88 +/* B606DC 8024242C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240660_B66110.s b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240660_B66110.s index 081225f4dc..da50d71b50 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240660_B66110.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240660_B66110.s @@ -55,7 +55,7 @@ glabel func_80240660_B66110 /* B661D8 80240728 4405E000 */ mfc1 $a1, $f28 /* B661DC 8024072C 4406D000 */ mfc1 $a2, $f26 /* B661E0 80240730 4407C000 */ mfc1 $a3, $f24 -/* B661E4 80240734 0C09017C */ jal func_802405F0 +/* B661E4 80240734 0C09017C */ jal func_802405F0_B660A0 /* B661E8 80240738 27A40010 */ addiu $a0, $sp, 0x10 /* B661EC 8024073C 27A40010 */ addiu $a0, $sp, 0x10 /* B661F0 80240740 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240660_B66110 /* B66260 802407B0 4405E000 */ mfc1 $a1, $f28 /* B66264 802407B4 4406D000 */ mfc1 $a2, $f26 /* B66268 802407B8 4407C000 */ mfc1 $a3, $f24 -/* B6626C 802407BC 0C09017C */ jal func_802405F0 +/* B6626C 802407BC 0C09017C */ jal func_802405F0_B660A0 /* B66270 802407C0 27A40010 */ addiu $a0, $sp, 0x10 /* B66274 802407C4 27A40010 */ addiu $a0, $sp, 0x10 /* B66278 802407C8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s index b355ed1cbc..f17b78b6d8 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B660A0/func_80240888_B66338.s @@ -27,7 +27,7 @@ glabel func_80240888_B66338 /* B66390 802408E0 14400008 */ bnez $v0, .L80240904 /* B66394 802408E4 00000000 */ nop /* B66398 802408E8 4405A000 */ mfc1 $a1, $f20 -/* B6639C 802408EC 0C09020B */ jal func_8024082C +/* B6639C 802408EC 0C09020B */ jal func_8024082C_B662DC /* B663A0 802408F0 26040058 */ addiu $a0, $s0, 0x58 /* B663A4 802408F4 96020000 */ lhu $v0, ($s0) /* B663A8 802408F8 34421400 */ ori $v0, $v0, 0x1400 @@ -35,7 +35,7 @@ glabel func_80240888_B66338 /* B663B0 80240900 A6020000 */ sh $v0, ($s0) .L80240904: /* B663B4 80240904 4405A000 */ mfc1 $a1, $f20 -/* B663B8 80240908 0C09020B */ jal func_8024082C +/* B663B8 80240908 0C09020B */ jal func_8024082C_B662DC /* B663BC 8024090C 27A40010 */ addiu $a0, $sp, 0x10 /* B663C0 80240910 27A40010 */ addiu $a0, $sp, 0x10 /* B663C4 80240914 26050058 */ addiu $a1, $s0, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30.s deleted file mode 100644 index 5c1ba869d5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C30 -/* B666E0 80240C30 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B666E4 80240C34 AFB10034 */ sw $s1, 0x34($sp) -/* B666E8 80240C38 0080882D */ daddu $s1, $a0, $zero -/* B666EC 80240C3C AFBF0038 */ sw $ra, 0x38($sp) -/* B666F0 80240C40 AFB00030 */ sw $s0, 0x30($sp) -/* B666F4 80240C44 8E300148 */ lw $s0, 0x148($s1) -/* B666F8 80240C48 0C00EABB */ jal get_npc_unsafe -/* B666FC 80240C4C 86040008 */ lh $a0, 8($s0) -/* B66700 80240C50 0040282D */ daddu $a1, $v0, $zero -/* B66704 80240C54 94A2008E */ lhu $v0, 0x8e($a1) -/* B66708 80240C58 2442FFFF */ addiu $v0, $v0, -1 -/* B6670C 80240C5C A4A2008E */ sh $v0, 0x8e($a1) -/* B66710 80240C60 00021400 */ sll $v0, $v0, 0x10 -/* B66714 80240C64 1C400023 */ bgtz $v0, .L80240CF4 -/* B66718 80240C68 24020004 */ addiu $v0, $zero, 4 -/* B6671C 80240C6C 8E0300CC */ lw $v1, 0xcc($s0) -/* B66720 80240C70 AE02006C */ sw $v0, 0x6c($s0) -/* B66724 80240C74 8C620000 */ lw $v0, ($v1) -/* B66728 80240C78 ACA20028 */ sw $v0, 0x28($a1) -/* B6672C 80240C7C 9602007A */ lhu $v0, 0x7a($s0) -/* B66730 80240C80 A4A2008E */ sh $v0, 0x8e($a1) -/* B66734 80240C84 8E020078 */ lw $v0, 0x78($s0) -/* B66738 80240C88 28420008 */ slti $v0, $v0, 8 -/* B6673C 80240C8C 14400018 */ bnez $v0, .L80240CF0 -/* B66740 80240C90 24020021 */ addiu $v0, $zero, 0x21 -/* B66744 80240C94 24040003 */ addiu $a0, $zero, 3 -/* B66748 80240C98 27A30028 */ addiu $v1, $sp, 0x28 -/* B6674C 80240C9C 84A700A8 */ lh $a3, 0xa8($a1) -/* B66750 80240CA0 3C013F80 */ lui $at, 0x3f80 -/* B66754 80240CA4 44810000 */ mtc1 $at, $f0 -/* B66758 80240CA8 3C014000 */ lui $at, 0x4000 -/* B6675C 80240CAC 44811000 */ mtc1 $at, $f2 -/* B66760 80240CB0 3C01C1A0 */ lui $at, 0xc1a0 -/* B66764 80240CB4 44812000 */ mtc1 $at, $f4 -/* B66768 80240CB8 44873000 */ mtc1 $a3, $f6 -/* B6676C 80240CBC 00000000 */ nop -/* B66770 80240CC0 468031A0 */ cvt.s.w $f6, $f6 -/* B66774 80240CC4 E7A00010 */ swc1 $f0, 0x10($sp) -/* B66778 80240CC8 E7A20014 */ swc1 $f2, 0x14($sp) -/* B6677C 80240CCC E7A40018 */ swc1 $f4, 0x18($sp) -/* B66780 80240CD0 8E020078 */ lw $v0, 0x78($s0) -/* B66784 80240CD4 44073000 */ mfc1 $a3, $f6 -/* B66788 80240CD8 0000302D */ daddu $a2, $zero, $zero -/* B6678C 80240CDC AFA30020 */ sw $v1, 0x20($sp) -/* B66790 80240CE0 2442FFFF */ addiu $v0, $v0, -1 -/* B66794 80240CE4 0C01BFA4 */ jal fx_emote -/* B66798 80240CE8 AFA2001C */ sw $v0, 0x1c($sp) -/* B6679C 80240CEC 24020021 */ addiu $v0, $zero, 0x21 -.L80240CF0: -/* B667A0 80240CF0 AE220070 */ sw $v0, 0x70($s1) -.L80240CF4: -/* B667A4 80240CF4 8FBF0038 */ lw $ra, 0x38($sp) -/* B667A8 80240CF8 8FB10034 */ lw $s1, 0x34($sp) -/* B667AC 80240CFC 8FB00030 */ lw $s0, 0x30($sp) -/* B667B0 80240D00 03E00008 */ jr $ra -/* B667B4 80240D04 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s new file mode 100644 index 0000000000..6f0daeea78 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80240C30_B666E0.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C30_B666E0 +/* B666E0 80240C30 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* B666E4 80240C34 AFB10034 */ sw $s1, 0x34($sp) +/* B666E8 80240C38 0080882D */ daddu $s1, $a0, $zero +/* B666EC 80240C3C AFBF0038 */ sw $ra, 0x38($sp) +/* B666F0 80240C40 AFB00030 */ sw $s0, 0x30($sp) +/* B666F4 80240C44 8E300148 */ lw $s0, 0x148($s1) +/* B666F8 80240C48 0C00EABB */ jal get_npc_unsafe +/* B666FC 80240C4C 86040008 */ lh $a0, 8($s0) +/* B66700 80240C50 0040282D */ daddu $a1, $v0, $zero +/* B66704 80240C54 94A2008E */ lhu $v0, 0x8e($a1) +/* B66708 80240C58 2442FFFF */ addiu $v0, $v0, -1 +/* B6670C 80240C5C A4A2008E */ sh $v0, 0x8e($a1) +/* B66710 80240C60 00021400 */ sll $v0, $v0, 0x10 +/* B66714 80240C64 1C400023 */ bgtz $v0, .L80240CF4 +/* B66718 80240C68 24020004 */ addiu $v0, $zero, 4 +/* B6671C 80240C6C 8E0300CC */ lw $v1, 0xcc($s0) +/* B66720 80240C70 AE02006C */ sw $v0, 0x6c($s0) +/* B66724 80240C74 8C620000 */ lw $v0, ($v1) +/* B66728 80240C78 ACA20028 */ sw $v0, 0x28($a1) +/* B6672C 80240C7C 9602007A */ lhu $v0, 0x7a($s0) +/* B66730 80240C80 A4A2008E */ sh $v0, 0x8e($a1) +/* B66734 80240C84 8E020078 */ lw $v0, 0x78($s0) +/* B66738 80240C88 28420008 */ slti $v0, $v0, 8 +/* B6673C 80240C8C 14400018 */ bnez $v0, .L80240CF0 +/* B66740 80240C90 24020021 */ addiu $v0, $zero, 0x21 +/* B66744 80240C94 24040003 */ addiu $a0, $zero, 3 +/* B66748 80240C98 27A30028 */ addiu $v1, $sp, 0x28 +/* B6674C 80240C9C 84A700A8 */ lh $a3, 0xa8($a1) +/* B66750 80240CA0 3C013F80 */ lui $at, 0x3f80 +/* B66754 80240CA4 44810000 */ mtc1 $at, $f0 +/* B66758 80240CA8 3C014000 */ lui $at, 0x4000 +/* B6675C 80240CAC 44811000 */ mtc1 $at, $f2 +/* B66760 80240CB0 3C01C1A0 */ lui $at, 0xc1a0 +/* B66764 80240CB4 44812000 */ mtc1 $at, $f4 +/* B66768 80240CB8 44873000 */ mtc1 $a3, $f6 +/* B6676C 80240CBC 00000000 */ nop +/* B66770 80240CC0 468031A0 */ cvt.s.w $f6, $f6 +/* B66774 80240CC4 E7A00010 */ swc1 $f0, 0x10($sp) +/* B66778 80240CC8 E7A20014 */ swc1 $f2, 0x14($sp) +/* B6677C 80240CCC E7A40018 */ swc1 $f4, 0x18($sp) +/* B66780 80240CD0 8E020078 */ lw $v0, 0x78($s0) +/* B66784 80240CD4 44073000 */ mfc1 $a3, $f6 +/* B66788 80240CD8 0000302D */ daddu $a2, $zero, $zero +/* B6678C 80240CDC AFA30020 */ sw $v1, 0x20($sp) +/* B66790 80240CE0 2442FFFF */ addiu $v0, $v0, -1 +/* B66794 80240CE4 0C01BFA4 */ jal fx_emote +/* B66798 80240CE8 AFA2001C */ sw $v0, 0x1c($sp) +/* B6679C 80240CEC 24020021 */ addiu $v0, $zero, 0x21 +.L80240CF0: +/* B667A0 80240CF0 AE220070 */ sw $v0, 0x70($s1) +.L80240CF4: +/* B667A4 80240CF4 8FBF0038 */ lw $ra, 0x38($sp) +/* B667A8 80240CF8 8FB10034 */ lw $s1, 0x34($sp) +/* B667AC 80240CFC 8FB00030 */ lw $s0, 0x30($sp) +/* B667B0 80240D00 03E00008 */ jr $ra +/* B667B4 80240D04 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s index da1fe12421..c0d261ee1a 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241170_B66C20.s @@ -90,7 +90,7 @@ glabel func_80241170_B66C20 /* B66D60 802412B0 8E22006C */ lw $v0, 0x6c($s1) /* B66D64 802412B4 14400006 */ bnez $v0, .L802412D0 /* B66D68 802412B8 00000000 */ nop -/* B66D6C 802412BC 0C090357 */ jal func_80240D5C +/* B66D6C 802412BC 0C090357 */ jal func_80240D5C_B6680C /* B66D70 802412C0 0240202D */ daddu $a0, $s2, $zero /* B66D74 802412C4 10400002 */ beqz $v0, .L802412D0 /* B66D78 802412C8 2402001E */ addiu $v0, $zero, 0x1e @@ -151,21 +151,21 @@ glabel func_80241170_B66C20 /* B66E50 802413A0 0280302D */ daddu $a2, $s4, $zero /* B66E54 802413A4 080904FF */ j .L802413FC /* B66E58 802413A8 00000000 */ nop -/* B66E5C 802413AC 0C0902D5 */ jal func_80240B54 +/* B66E5C 802413AC 0C0902D5 */ jal func_80240B54_B66604 /* B66E60 802413B0 0240202D */ daddu $a0, $s2, $zero -/* B66E64 802413B4 0C0902F0 */ jal func_80240BC0 +/* B66E64 802413B4 0C0902F0 */ jal func_80240BC0_B66670 /* B66E68 802413B8 0240202D */ daddu $a0, $s2, $zero /* B66E6C 802413BC 8E430070 */ lw $v1, 0x70($s2) /* B66E70 802413C0 24020020 */ addiu $v0, $zero, 0x20 /* B66E74 802413C4 1462000D */ bne $v1, $v0, .L802413FC /* B66E78 802413C8 00000000 */ nop -/* B66E7C 802413CC 0C09030C */ jal func_80240C30 +/* B66E7C 802413CC 0C09030C */ jal func_80240C30_B666E0 /* B66E80 802413D0 0240202D */ daddu $a0, $s2, $zero /* B66E84 802413D4 8E430070 */ lw $v1, 0x70($s2) /* B66E88 802413D8 24020021 */ addiu $v0, $zero, 0x21 /* B66E8C 802413DC 14620007 */ bne $v1, $v0, .L802413FC /* B66E90 802413E0 00000000 */ nop -/* B66E94 802413E4 0C090342 */ jal func_80240D08 +/* B66E94 802413E4 0C090342 */ jal func_80240D08_B667B8 /* B66E98 802413E8 0240202D */ daddu $a0, $s2, $zero /* B66E9C 802413EC 080904FF */ j .L802413FC /* B66EA0 802413F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s index 7878a2be72..9541807d90 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B663F0/func_80241424_B66ED4.s @@ -90,7 +90,7 @@ glabel func_80241424_B66ED4 /* B67014 80241564 8E22006C */ lw $v0, 0x6c($s1) /* B67018 80241568 14400006 */ bnez $v0, .L80241584 /* B6701C 8024156C 00000000 */ nop -/* B67020 80241570 0C090357 */ jal func_80240D5C +/* B67020 80241570 0C090357 */ jal func_80240D5C_B6680C /* B67024 80241574 0240202D */ daddu $a0, $s2, $zero /* B67028 80241578 10400002 */ beqz $v0, .L80241584 /* B6702C 8024157C 2402001E */ addiu $v0, $zero, 0x1e @@ -117,11 +117,11 @@ glabel func_80241424_B66ED4 /* B6707C 802415CC 00000000 */ nop /* B67080 802415D0 0240202D */ daddu $a0, $s2, $zero /* B67084 802415D4 0260282D */ daddu $a1, $s3, $zero -/* B67088 802415D8 0C090250 */ jal func_80240940 +/* B67088 802415D8 0C090250 */ jal func_80240940_B663F0 /* B6708C 802415DC 0280302D */ daddu $a2, $s4, $zero /* B67090 802415E0 0240202D */ daddu $a0, $s2, $zero /* B67094 802415E4 0260282D */ daddu $a1, $s3, $zero -/* B67098 802415E8 0C090264 */ jal func_80240990 +/* B67098 802415E8 0C090264 */ jal func_80240990_B66440 /* B6709C 802415EC 0280302D */ daddu $a2, $s4, $zero /* B670A0 802415F0 080905AC */ j .L802416B0 /* B670A4 802415F4 00000000 */ nop @@ -151,21 +151,21 @@ glabel func_80241424_B66ED4 /* B67104 80241654 0280302D */ daddu $a2, $s4, $zero /* B67108 80241658 080905AC */ j .L802416B0 /* B6710C 8024165C 00000000 */ nop -/* B67110 80241660 0C0902D5 */ jal func_80240B54 +/* B67110 80241660 0C0902D5 */ jal func_80240B54_B66604 /* B67114 80241664 0240202D */ daddu $a0, $s2, $zero -/* B67118 80241668 0C0902F0 */ jal func_80240BC0 +/* B67118 80241668 0C0902F0 */ jal func_80240BC0_B66670 /* B6711C 8024166C 0240202D */ daddu $a0, $s2, $zero /* B67120 80241670 8E430070 */ lw $v1, 0x70($s2) /* B67124 80241674 24020020 */ addiu $v0, $zero, 0x20 /* B67128 80241678 1462000D */ bne $v1, $v0, .L802416B0 /* B6712C 8024167C 00000000 */ nop -/* B67130 80241680 0C09030C */ jal func_80240C30 +/* B67130 80241680 0C09030C */ jal func_80240C30_B666E0 /* B67134 80241684 0240202D */ daddu $a0, $s2, $zero /* B67138 80241688 8E430070 */ lw $v1, 0x70($s2) /* B6713C 8024168C 24020021 */ addiu $v0, $zero, 0x21 /* B67140 80241690 14620007 */ bne $v1, $v0, .L802416B0 /* B67144 80241694 00000000 */ nop -/* B67148 80241698 0C090342 */ jal func_80240D08 +/* B67148 80241698 0C090342 */ jal func_80240D08_B667B8 /* B6714C 8024169C 0240202D */ daddu $a0, $s2, $zero /* B67150 802416A0 080905AC */ j .L802416B0 /* B67154 802416A4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_09/B67190/func_802416E0.s b/asm/nonmatchings/world/area_jan/jan_09/B67190/func_802416E0.s deleted file mode 100644 index ccdac330d7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_09/B67190/func_802416E0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416E0 -/* B67190 802416E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B67194 802416E4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B67198 802416E8 4485A000 */ mtc1 $a1, $f20 -/* B6719C 802416EC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B671A0 802416F0 4486B000 */ mtc1 $a2, $f22 -/* B671A4 802416F4 AFB00010 */ sw $s0, 0x10($sp) -/* B671A8 802416F8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B671AC 802416FC 4487C000 */ mtc1 $a3, $f24 -/* B671B0 80241700 AFBF0014 */ sw $ra, 0x14($sp) -/* B671B4 80241704 0C019D28 */ jal guMtxIdentF -/* B671B8 80241708 0080802D */ daddu $s0, $a0, $zero -/* B671BC 8024170C 4616A582 */ mul.s $f22, $f20, $f22 -/* B671C0 80241710 00000000 */ nop -/* B671C4 80241714 4618A502 */ mul.s $f20, $f20, $f24 -/* B671C8 80241718 00000000 */ nop -/* B671CC 8024171C 3C013F80 */ lui $at, 0x3f80 -/* B671D0 80241720 44810000 */ mtc1 $at, $f0 -/* B671D4 80241724 00000000 */ nop -/* B671D8 80241728 E6000014 */ swc1 $f0, 0x14($s0) -/* B671DC 8024172C E6160010 */ swc1 $f22, 0x10($s0) -/* B671E0 80241730 E6140018 */ swc1 $f20, 0x18($s0) -/* B671E4 80241734 8FBF0014 */ lw $ra, 0x14($sp) -/* B671E8 80241738 8FB00010 */ lw $s0, 0x10($sp) -/* B671EC 8024173C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B671F0 80241740 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B671F4 80241744 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B671F8 80241748 03E00008 */ jr $ra -/* B671FC 8024174C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B67190/func_802416E0_B67190.s b/asm/nonmatchings/world/area_jan/jan_09/B67190/func_802416E0_B67190.s new file mode 100644 index 0000000000..aa3802c92e --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_09/B67190/func_802416E0_B67190.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416E0_B67190 +/* B67190 802416E0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B67194 802416E4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B67198 802416E8 4485A000 */ mtc1 $a1, $f20 +/* B6719C 802416EC F7B60020 */ sdc1 $f22, 0x20($sp) +/* B671A0 802416F0 4486B000 */ mtc1 $a2, $f22 +/* B671A4 802416F4 AFB00010 */ sw $s0, 0x10($sp) +/* B671A8 802416F8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* B671AC 802416FC 4487C000 */ mtc1 $a3, $f24 +/* B671B0 80241700 AFBF0014 */ sw $ra, 0x14($sp) +/* B671B4 80241704 0C019D28 */ jal guMtxIdentF +/* B671B8 80241708 0080802D */ daddu $s0, $a0, $zero +/* B671BC 8024170C 4616A582 */ mul.s $f22, $f20, $f22 +/* B671C0 80241710 00000000 */ nop +/* B671C4 80241714 4618A502 */ mul.s $f20, $f20, $f24 +/* B671C8 80241718 00000000 */ nop +/* B671CC 8024171C 3C013F80 */ lui $at, 0x3f80 +/* B671D0 80241720 44810000 */ mtc1 $at, $f0 +/* B671D4 80241724 00000000 */ nop +/* B671D8 80241728 E6000014 */ swc1 $f0, 0x14($s0) +/* B671DC 8024172C E6160010 */ swc1 $f22, 0x10($s0) +/* B671E0 80241730 E6140018 */ swc1 $f20, 0x18($s0) +/* B671E4 80241734 8FBF0014 */ lw $ra, 0x14($sp) +/* B671E8 80241738 8FB00010 */ lw $s0, 0x10($sp) +/* B671EC 8024173C D7B80028 */ ldc1 $f24, 0x28($sp) +/* B671F0 80241740 D7B60020 */ ldc1 $f22, 0x20($sp) +/* B671F4 80241744 D7B40018 */ ldc1 $f20, 0x18($sp) +/* B671F8 80241748 03E00008 */ jr $ra +/* B671FC 8024174C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_09/B67190/func_80241750_B67200.s b/asm/nonmatchings/world/area_jan/jan_09/B67190/func_80241750_B67200.s index bc18c00ea1..976fb43029 100644 --- a/asm/nonmatchings/world/area_jan/jan_09/B67190/func_80241750_B67200.s +++ b/asm/nonmatchings/world/area_jan/jan_09/B67190/func_80241750_B67200.s @@ -55,7 +55,7 @@ glabel func_80241750_B67200 /* B672C8 80241818 4405E000 */ mfc1 $a1, $f28 /* B672CC 8024181C 4406D000 */ mfc1 $a2, $f26 /* B672D0 80241820 4407C000 */ mfc1 $a3, $f24 -/* B672D4 80241824 0C0905B8 */ jal func_802416E0 +/* B672D4 80241824 0C0905B8 */ jal func_802416E0_B67190 /* B672D8 80241828 27A40010 */ addiu $a0, $sp, 0x10 /* B672DC 8024182C 27A40010 */ addiu $a0, $sp, 0x10 /* B672E0 80241830 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80241750_B67200 /* B67350 802418A0 4405E000 */ mfc1 $a1, $f28 /* B67354 802418A4 4406D000 */ mfc1 $a2, $f26 /* B67358 802418A8 4407C000 */ mfc1 $a3, $f24 -/* B6735C 802418AC 0C0905B8 */ jal func_802416E0 +/* B6735C 802418AC 0C0905B8 */ jal func_802416E0_B67190 /* B67360 802418B0 27A40010 */ addiu $a0, $sp, 0x10 /* B67364 802418B4 27A40010 */ addiu $a0, $sp, 0x10 /* B67368 802418B8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938.s deleted file mode 100644 index bf356cb9cd..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240938 -/* B6CCC8 80240938 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B6CCCC 8024093C AFB40040 */ sw $s4, 0x40($sp) -/* B6CCD0 80240940 0080A02D */ daddu $s4, $a0, $zero -/* B6CCD4 80240944 AFBF0044 */ sw $ra, 0x44($sp) -/* B6CCD8 80240948 AFB3003C */ sw $s3, 0x3c($sp) -/* B6CCDC 8024094C AFB20038 */ sw $s2, 0x38($sp) -/* B6CCE0 80240950 AFB10034 */ sw $s1, 0x34($sp) -/* B6CCE4 80240954 AFB00030 */ sw $s0, 0x30($sp) -/* B6CCE8 80240958 8E920148 */ lw $s2, 0x148($s4) -/* B6CCEC 8024095C 00A0882D */ daddu $s1, $a1, $zero -/* B6CCF0 80240960 86440008 */ lh $a0, 8($s2) -/* B6CCF4 80240964 0C00EABB */ jal get_npc_unsafe -/* B6CCF8 80240968 00C0982D */ daddu $s3, $a2, $zero -/* B6CCFC 8024096C 8E230014 */ lw $v1, 0x14($s1) -/* B6CD00 80240970 0460002D */ bltz $v1, .L80240A28 -/* B6CD04 80240974 0040802D */ daddu $s0, $v0, $zero -/* B6CD08 80240978 0260202D */ daddu $a0, $s3, $zero -/* B6CD0C 8024097C AFA00010 */ sw $zero, 0x10($sp) -/* B6CD10 80240980 8E260024 */ lw $a2, 0x24($s1) -/* B6CD14 80240984 8E270028 */ lw $a3, 0x28($s1) -/* B6CD18 80240988 0C01242D */ jal func_800490B4 -/* B6CD1C 8024098C 0240282D */ daddu $a1, $s2, $zero -/* B6CD20 80240990 10400025 */ beqz $v0, .L80240A28 -/* B6CD24 80240994 0000202D */ daddu $a0, $zero, $zero -/* B6CD28 80240998 0200282D */ daddu $a1, $s0, $zero -/* B6CD2C 8024099C 0000302D */ daddu $a2, $zero, $zero -/* B6CD30 802409A0 860300A8 */ lh $v1, 0xa8($s0) -/* B6CD34 802409A4 3C013F80 */ lui $at, 0x3f80 -/* B6CD38 802409A8 44810000 */ mtc1 $at, $f0 -/* B6CD3C 802409AC 3C014000 */ lui $at, 0x4000 -/* B6CD40 802409B0 44811000 */ mtc1 $at, $f2 -/* B6CD44 802409B4 3C01C1A0 */ lui $at, 0xc1a0 -/* B6CD48 802409B8 44812000 */ mtc1 $at, $f4 -/* B6CD4C 802409BC 2402000F */ addiu $v0, $zero, 0xf -/* B6CD50 802409C0 AFA2001C */ sw $v0, 0x1c($sp) -/* B6CD54 802409C4 44833000 */ mtc1 $v1, $f6 -/* B6CD58 802409C8 00000000 */ nop -/* B6CD5C 802409CC 468031A0 */ cvt.s.w $f6, $f6 -/* B6CD60 802409D0 44073000 */ mfc1 $a3, $f6 -/* B6CD64 802409D4 27A20028 */ addiu $v0, $sp, 0x28 -/* B6CD68 802409D8 AFA20020 */ sw $v0, 0x20($sp) -/* B6CD6C 802409DC E7A00010 */ swc1 $f0, 0x10($sp) -/* B6CD70 802409E0 E7A20014 */ swc1 $f2, 0x14($sp) -/* B6CD74 802409E4 0C01BFA4 */ jal fx_emote -/* B6CD78 802409E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* B6CD7C 802409EC 0200202D */ daddu $a0, $s0, $zero -/* B6CD80 802409F0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B6CD84 802409F4 0C012530 */ jal func_800494C0 -/* B6CD88 802409F8 3C060020 */ lui $a2, 0x20 -/* B6CD8C 802409FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B6CD90 80240A00 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B6CD94 80240A04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B6CD98 80240A08 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B6CD9C 80240A0C 8C460028 */ lw $a2, 0x28($v0) -/* B6CDA0 80240A10 0C00A720 */ jal atan2 -/* B6CDA4 80240A14 8C470030 */ lw $a3, 0x30($v0) -/* B6CDA8 80240A18 2402000C */ addiu $v0, $zero, 0xc -/* B6CDAC 80240A1C E600000C */ swc1 $f0, 0xc($s0) -/* B6CDB0 80240A20 080902AF */ j .L80240ABC -/* B6CDB4 80240A24 AE820070 */ sw $v0, 0x70($s4) -.L80240A28: -/* B6CDB8 80240A28 8602008C */ lh $v0, 0x8c($s0) -/* B6CDBC 80240A2C 14400023 */ bnez $v0, .L80240ABC -/* B6CDC0 80240A30 00000000 */ nop -/* B6CDC4 80240A34 9602008E */ lhu $v0, 0x8e($s0) -/* B6CDC8 80240A38 2442FFFF */ addiu $v0, $v0, -1 -/* B6CDCC 80240A3C A602008E */ sh $v0, 0x8e($s0) -/* B6CDD0 80240A40 00021400 */ sll $v0, $v0, 0x10 -/* B6CDD4 80240A44 1C40001D */ bgtz $v0, .L80240ABC -/* B6CDD8 80240A48 00000000 */ nop -/* B6CDDC 80240A4C 8E820074 */ lw $v0, 0x74($s4) -/* B6CDE0 80240A50 2442FFFF */ addiu $v0, $v0, -1 -/* B6CDE4 80240A54 18400018 */ blez $v0, .L80240AB8 -/* B6CDE8 80240A58 AE820074 */ sw $v0, 0x74($s4) -/* B6CDEC 80240A5C C600000C */ lwc1 $f0, 0xc($s0) -/* B6CDF0 80240A60 3C014334 */ lui $at, 0x4334 -/* B6CDF4 80240A64 44816000 */ mtc1 $at, $f12 -/* B6CDF8 80240A68 0C00A6C9 */ jal clamp_angle -/* B6CDFC 80240A6C 460C0300 */ add.s $f12, $f0, $f12 -/* B6CE00 80240A70 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B6CE04 80240A74 0C00A67F */ jal rand_int -/* B6CE08 80240A78 E600000C */ swc1 $f0, 0xc($s0) -/* B6CE0C 80240A7C 3C032E8B */ lui $v1, 0x2e8b -/* B6CE10 80240A80 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* B6CE14 80240A84 00430018 */ mult $v0, $v1 -/* B6CE18 80240A88 00021FC3 */ sra $v1, $v0, 0x1f -/* B6CE1C 80240A8C 00004010 */ mfhi $t0 -/* B6CE20 80240A90 00082043 */ sra $a0, $t0, 1 -/* B6CE24 80240A94 00832023 */ subu $a0, $a0, $v1 -/* B6CE28 80240A98 00041840 */ sll $v1, $a0, 1 -/* B6CE2C 80240A9C 00641821 */ addu $v1, $v1, $a0 -/* B6CE30 80240AA0 00031880 */ sll $v1, $v1, 2 -/* B6CE34 80240AA4 00641823 */ subu $v1, $v1, $a0 -/* B6CE38 80240AA8 00431023 */ subu $v0, $v0, $v1 -/* B6CE3C 80240AAC 24420005 */ addiu $v0, $v0, 5 -/* B6CE40 80240AB0 080902AF */ j .L80240ABC -/* B6CE44 80240AB4 A602008E */ sh $v0, 0x8e($s0) -.L80240AB8: -/* B6CE48 80240AB8 AE800070 */ sw $zero, 0x70($s4) -.L80240ABC: -/* B6CE4C 80240ABC 8FBF0044 */ lw $ra, 0x44($sp) -/* B6CE50 80240AC0 8FB40040 */ lw $s4, 0x40($sp) -/* B6CE54 80240AC4 8FB3003C */ lw $s3, 0x3c($sp) -/* B6CE58 80240AC8 8FB20038 */ lw $s2, 0x38($sp) -/* B6CE5C 80240ACC 8FB10034 */ lw $s1, 0x34($sp) -/* B6CE60 80240AD0 8FB00030 */ lw $s0, 0x30($sp) -/* B6CE64 80240AD4 03E00008 */ jr $ra -/* B6CE68 80240AD8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938_B6CCC8.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938_B6CCC8.s new file mode 100644 index 0000000000..37bd218be6 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240938_B6CCC8.s @@ -0,0 +1,112 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240938_B6CCC8 +/* B6CCC8 80240938 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B6CCCC 8024093C AFB40040 */ sw $s4, 0x40($sp) +/* B6CCD0 80240940 0080A02D */ daddu $s4, $a0, $zero +/* B6CCD4 80240944 AFBF0044 */ sw $ra, 0x44($sp) +/* B6CCD8 80240948 AFB3003C */ sw $s3, 0x3c($sp) +/* B6CCDC 8024094C AFB20038 */ sw $s2, 0x38($sp) +/* B6CCE0 80240950 AFB10034 */ sw $s1, 0x34($sp) +/* B6CCE4 80240954 AFB00030 */ sw $s0, 0x30($sp) +/* B6CCE8 80240958 8E920148 */ lw $s2, 0x148($s4) +/* B6CCEC 8024095C 00A0882D */ daddu $s1, $a1, $zero +/* B6CCF0 80240960 86440008 */ lh $a0, 8($s2) +/* B6CCF4 80240964 0C00EABB */ jal get_npc_unsafe +/* B6CCF8 80240968 00C0982D */ daddu $s3, $a2, $zero +/* B6CCFC 8024096C 8E230014 */ lw $v1, 0x14($s1) +/* B6CD00 80240970 0460002D */ bltz $v1, .L80240A28 +/* B6CD04 80240974 0040802D */ daddu $s0, $v0, $zero +/* B6CD08 80240978 0260202D */ daddu $a0, $s3, $zero +/* B6CD0C 8024097C AFA00010 */ sw $zero, 0x10($sp) +/* B6CD10 80240980 8E260024 */ lw $a2, 0x24($s1) +/* B6CD14 80240984 8E270028 */ lw $a3, 0x28($s1) +/* B6CD18 80240988 0C01242D */ jal func_800490B4 +/* B6CD1C 8024098C 0240282D */ daddu $a1, $s2, $zero +/* B6CD20 80240990 10400025 */ beqz $v0, .L80240A28 +/* B6CD24 80240994 0000202D */ daddu $a0, $zero, $zero +/* B6CD28 80240998 0200282D */ daddu $a1, $s0, $zero +/* B6CD2C 8024099C 0000302D */ daddu $a2, $zero, $zero +/* B6CD30 802409A0 860300A8 */ lh $v1, 0xa8($s0) +/* B6CD34 802409A4 3C013F80 */ lui $at, 0x3f80 +/* B6CD38 802409A8 44810000 */ mtc1 $at, $f0 +/* B6CD3C 802409AC 3C014000 */ lui $at, 0x4000 +/* B6CD40 802409B0 44811000 */ mtc1 $at, $f2 +/* B6CD44 802409B4 3C01C1A0 */ lui $at, 0xc1a0 +/* B6CD48 802409B8 44812000 */ mtc1 $at, $f4 +/* B6CD4C 802409BC 2402000F */ addiu $v0, $zero, 0xf +/* B6CD50 802409C0 AFA2001C */ sw $v0, 0x1c($sp) +/* B6CD54 802409C4 44833000 */ mtc1 $v1, $f6 +/* B6CD58 802409C8 00000000 */ nop +/* B6CD5C 802409CC 468031A0 */ cvt.s.w $f6, $f6 +/* B6CD60 802409D0 44073000 */ mfc1 $a3, $f6 +/* B6CD64 802409D4 27A20028 */ addiu $v0, $sp, 0x28 +/* B6CD68 802409D8 AFA20020 */ sw $v0, 0x20($sp) +/* B6CD6C 802409DC E7A00010 */ swc1 $f0, 0x10($sp) +/* B6CD70 802409E0 E7A20014 */ swc1 $f2, 0x14($sp) +/* B6CD74 802409E4 0C01BFA4 */ jal fx_emote +/* B6CD78 802409E8 E7A40018 */ swc1 $f4, 0x18($sp) +/* B6CD7C 802409EC 0200202D */ daddu $a0, $s0, $zero +/* B6CD80 802409F0 240502F4 */ addiu $a1, $zero, 0x2f4 +/* B6CD84 802409F4 0C012530 */ jal func_800494C0 +/* B6CD88 802409F8 3C060020 */ lui $a2, 0x20 +/* B6CD8C 802409FC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B6CD90 80240A00 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B6CD94 80240A04 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B6CD98 80240A08 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B6CD9C 80240A0C 8C460028 */ lw $a2, 0x28($v0) +/* B6CDA0 80240A10 0C00A720 */ jal atan2 +/* B6CDA4 80240A14 8C470030 */ lw $a3, 0x30($v0) +/* B6CDA8 80240A18 2402000C */ addiu $v0, $zero, 0xc +/* B6CDAC 80240A1C E600000C */ swc1 $f0, 0xc($s0) +/* B6CDB0 80240A20 080902AF */ j .L80240ABC +/* B6CDB4 80240A24 AE820070 */ sw $v0, 0x70($s4) +.L80240A28: +/* B6CDB8 80240A28 8602008C */ lh $v0, 0x8c($s0) +/* B6CDBC 80240A2C 14400023 */ bnez $v0, .L80240ABC +/* B6CDC0 80240A30 00000000 */ nop +/* B6CDC4 80240A34 9602008E */ lhu $v0, 0x8e($s0) +/* B6CDC8 80240A38 2442FFFF */ addiu $v0, $v0, -1 +/* B6CDCC 80240A3C A602008E */ sh $v0, 0x8e($s0) +/* B6CDD0 80240A40 00021400 */ sll $v0, $v0, 0x10 +/* B6CDD4 80240A44 1C40001D */ bgtz $v0, .L80240ABC +/* B6CDD8 80240A48 00000000 */ nop +/* B6CDDC 80240A4C 8E820074 */ lw $v0, 0x74($s4) +/* B6CDE0 80240A50 2442FFFF */ addiu $v0, $v0, -1 +/* B6CDE4 80240A54 18400018 */ blez $v0, .L80240AB8 +/* B6CDE8 80240A58 AE820074 */ sw $v0, 0x74($s4) +/* B6CDEC 80240A5C C600000C */ lwc1 $f0, 0xc($s0) +/* B6CDF0 80240A60 3C014334 */ lui $at, 0x4334 +/* B6CDF4 80240A64 44816000 */ mtc1 $at, $f12 +/* B6CDF8 80240A68 0C00A6C9 */ jal clamp_angle +/* B6CDFC 80240A6C 460C0300 */ add.s $f12, $f0, $f12 +/* B6CE00 80240A70 240403E8 */ addiu $a0, $zero, 0x3e8 +/* B6CE04 80240A74 0C00A67F */ jal rand_int +/* B6CE08 80240A78 E600000C */ swc1 $f0, 0xc($s0) +/* B6CE0C 80240A7C 3C032E8B */ lui $v1, 0x2e8b +/* B6CE10 80240A80 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* B6CE14 80240A84 00430018 */ mult $v0, $v1 +/* B6CE18 80240A88 00021FC3 */ sra $v1, $v0, 0x1f +/* B6CE1C 80240A8C 00004010 */ mfhi $t0 +/* B6CE20 80240A90 00082043 */ sra $a0, $t0, 1 +/* B6CE24 80240A94 00832023 */ subu $a0, $a0, $v1 +/* B6CE28 80240A98 00041840 */ sll $v1, $a0, 1 +/* B6CE2C 80240A9C 00641821 */ addu $v1, $v1, $a0 +/* B6CE30 80240AA0 00031880 */ sll $v1, $v1, 2 +/* B6CE34 80240AA4 00641823 */ subu $v1, $v1, $a0 +/* B6CE38 80240AA8 00431023 */ subu $v0, $v0, $v1 +/* B6CE3C 80240AAC 24420005 */ addiu $v0, $v0, 5 +/* B6CE40 80240AB0 080902AF */ j .L80240ABC +/* B6CE44 80240AB4 A602008E */ sh $v0, 0x8e($s0) +.L80240AB8: +/* B6CE48 80240AB8 AE800070 */ sw $zero, 0x70($s4) +.L80240ABC: +/* B6CE4C 80240ABC 8FBF0044 */ lw $ra, 0x44($sp) +/* B6CE50 80240AC0 8FB40040 */ lw $s4, 0x40($sp) +/* B6CE54 80240AC4 8FB3003C */ lw $s3, 0x3c($sp) +/* B6CE58 80240AC8 8FB20038 */ lw $s2, 0x38($sp) +/* B6CE5C 80240ACC 8FB10034 */ lw $s1, 0x34($sp) +/* B6CE60 80240AD0 8FB00030 */ lw $s0, 0x30($sp) +/* B6CE64 80240AD4 03E00008 */ jr $ra +/* B6CE68 80240AD8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC.s deleted file mode 100644 index 9b65c12b66..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EBC -/* B6D24C 80240EBC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6D250 80240EC0 AFB00010 */ sw $s0, 0x10($sp) -/* B6D254 80240EC4 0080802D */ daddu $s0, $a0, $zero -/* B6D258 80240EC8 AFBF0014 */ sw $ra, 0x14($sp) -/* B6D25C 80240ECC 8E020148 */ lw $v0, 0x148($s0) -/* B6D260 80240ED0 0C00EABB */ jal get_npc_unsafe -/* B6D264 80240ED4 84440008 */ lh $a0, 8($v0) -/* B6D268 80240ED8 9443008E */ lhu $v1, 0x8e($v0) -/* B6D26C 80240EDC 2463FFFF */ addiu $v1, $v1, -1 -/* B6D270 80240EE0 A443008E */ sh $v1, 0x8e($v0) -/* B6D274 80240EE4 00031C00 */ sll $v1, $v1, 0x10 -/* B6D278 80240EE8 58600001 */ blezl $v1, .L80240EF0 -/* B6D27C 80240EEC AE000070 */ sw $zero, 0x70($s0) -.L80240EF0: -/* B6D280 80240EF0 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D284 80240EF4 8FB00010 */ lw $s0, 0x10($sp) -/* B6D288 80240EF8 03E00008 */ jr $ra -/* B6D28C 80240EFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s new file mode 100644 index 0000000000..23b618bfd6 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240EBC_B6D24C.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EBC_B6D24C +/* B6D24C 80240EBC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B6D250 80240EC0 AFB00010 */ sw $s0, 0x10($sp) +/* B6D254 80240EC4 0080802D */ daddu $s0, $a0, $zero +/* B6D258 80240EC8 AFBF0014 */ sw $ra, 0x14($sp) +/* B6D25C 80240ECC 8E020148 */ lw $v0, 0x148($s0) +/* B6D260 80240ED0 0C00EABB */ jal get_npc_unsafe +/* B6D264 80240ED4 84440008 */ lh $a0, 8($v0) +/* B6D268 80240ED8 9443008E */ lhu $v1, 0x8e($v0) +/* B6D26C 80240EDC 2463FFFF */ addiu $v1, $v1, -1 +/* B6D270 80240EE0 A443008E */ sh $v1, 0x8e($v0) +/* B6D274 80240EE4 00031C00 */ sll $v1, $v1, 0x10 +/* B6D278 80240EE8 58600001 */ blezl $v1, .L80240EF0 +/* B6D27C 80240EEC AE000070 */ sw $zero, 0x70($s0) +.L80240EF0: +/* B6D280 80240EF0 8FBF0014 */ lw $ra, 0x14($sp) +/* B6D284 80240EF4 8FB00010 */ lw $s0, 0x10($sp) +/* B6D288 80240EF8 03E00008 */ jr $ra +/* B6D28C 80240EFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00.s deleted file mode 100644 index 635180ed75..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00.s +++ /dev/null @@ -1,148 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F00 -/* B6D290 80240F00 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B6D294 80240F04 AFB3003C */ sw $s3, 0x3c($sp) -/* B6D298 80240F08 0080982D */ daddu $s3, $a0, $zero -/* B6D29C 80240F0C AFBF0048 */ sw $ra, 0x48($sp) -/* B6D2A0 80240F10 AFB50044 */ sw $s5, 0x44($sp) -/* B6D2A4 80240F14 AFB40040 */ sw $s4, 0x40($sp) -/* B6D2A8 80240F18 AFB20038 */ sw $s2, 0x38($sp) -/* B6D2AC 80240F1C AFB10034 */ sw $s1, 0x34($sp) -/* B6D2B0 80240F20 AFB00030 */ sw $s0, 0x30($sp) -/* B6D2B4 80240F24 8E720148 */ lw $s2, 0x148($s3) -/* B6D2B8 80240F28 86440008 */ lh $a0, 8($s2) -/* B6D2BC 80240F2C 8E70000C */ lw $s0, 0xc($s3) -/* B6D2C0 80240F30 0C00EABB */ jal get_npc_unsafe -/* B6D2C4 80240F34 00A0882D */ daddu $s1, $a1, $zero -/* B6D2C8 80240F38 8E050000 */ lw $a1, ($s0) -/* B6D2CC 80240F3C 26100004 */ addiu $s0, $s0, 4 -/* B6D2D0 80240F40 0260202D */ daddu $a0, $s3, $zero -/* B6D2D4 80240F44 0C0B1EAF */ jal get_variable -/* B6D2D8 80240F48 0040A82D */ daddu $s5, $v0, $zero -/* B6D2DC 80240F4C 0260202D */ daddu $a0, $s3, $zero -/* B6D2E0 80240F50 8E050000 */ lw $a1, ($s0) -/* B6D2E4 80240F54 0C0B1EAF */ jal get_variable -/* B6D2E8 80240F58 0040A02D */ daddu $s4, $v0, $zero -/* B6D2EC 80240F5C AE420094 */ sw $v0, 0x94($s2) -/* B6D2F0 80240F60 AFA00010 */ sw $zero, 0x10($sp) -/* B6D2F4 80240F64 8E4200D0 */ lw $v0, 0xd0($s2) -/* B6D2F8 80240F68 8C420030 */ lw $v0, 0x30($v0) -/* B6D2FC 80240F6C AFA20014 */ sw $v0, 0x14($sp) -/* B6D300 80240F70 8E4200D0 */ lw $v0, 0xd0($s2) -/* B6D304 80240F74 8C42001C */ lw $v0, 0x1c($v0) -/* B6D308 80240F78 AFA20018 */ sw $v0, 0x18($sp) -/* B6D30C 80240F7C 8E4200D0 */ lw $v0, 0xd0($s2) -/* B6D310 80240F80 8C420024 */ lw $v0, 0x24($v0) -/* B6D314 80240F84 AFA2001C */ sw $v0, 0x1c($sp) -/* B6D318 80240F88 8E4200D0 */ lw $v0, 0xd0($s2) -/* B6D31C 80240F8C 8C420028 */ lw $v0, 0x28($v0) -/* B6D320 80240F90 AFA20020 */ sw $v0, 0x20($sp) -/* B6D324 80240F94 8E4200D0 */ lw $v0, 0xd0($s2) -/* B6D328 80240F98 3C0142C8 */ lui $at, 0x42c8 -/* B6D32C 80240F9C 44810000 */ mtc1 $at, $f0 -/* B6D330 80240FA0 8C42002C */ lw $v0, 0x2c($v0) -/* B6D334 80240FA4 27B00010 */ addiu $s0, $sp, 0x10 -/* B6D338 80240FA8 E7A00028 */ swc1 $f0, 0x28($sp) -/* B6D33C 80240FAC A7A0002C */ sh $zero, 0x2c($sp) -/* B6D340 80240FB0 12200019 */ beqz $s1, .L80241018 -/* B6D344 80240FB4 AFA20024 */ sw $v0, 0x24($sp) -/* B6D348 80240FB8 AE600070 */ sw $zero, 0x70($s3) -/* B6D34C 80240FBC A6A0008E */ sh $zero, 0x8e($s5) -/* B6D350 80240FC0 AE600074 */ sw $zero, 0x74($s3) -/* B6D354 80240FC4 8EA20000 */ lw $v0, ($s5) -/* B6D358 80240FC8 2403F7FF */ addiu $v1, $zero, -0x801 -/* B6D35C 80240FCC 00431024 */ and $v0, $v0, $v1 -/* B6D360 80240FD0 2403FDFF */ addiu $v1, $zero, -0x201 -/* B6D364 80240FD4 00431024 */ and $v0, $v0, $v1 -/* B6D368 80240FD8 34420008 */ ori $v0, $v0, 8 -/* B6D36C 80240FDC AEA20000 */ sw $v0, ($s5) -/* B6D370 80240FE0 8E4200B0 */ lw $v0, 0xb0($s2) -/* B6D374 80240FE4 34420018 */ ori $v0, $v0, 0x18 -/* B6D378 80240FE8 AE4200B0 */ sw $v0, 0xb0($s2) -/* B6D37C 80240FEC 8E420000 */ lw $v0, ($s2) -/* B6D380 80240FF0 3C034000 */ lui $v1, 0x4000 -/* B6D384 80240FF4 00431024 */ and $v0, $v0, $v1 -/* B6D388 80240FF8 10400007 */ beqz $v0, .L80241018 -/* B6D38C 80240FFC 3C03BFFF */ lui $v1, 0xbfff -/* B6D390 80241000 2402000C */ addiu $v0, $zero, 0xc -/* B6D394 80241004 AE620070 */ sw $v0, 0x70($s3) -/* B6D398 80241008 8E420000 */ lw $v0, ($s2) -/* B6D39C 8024100C 3463FFFF */ ori $v1, $v1, 0xffff -/* B6D3A0 80241010 00431024 */ and $v0, $v0, $v1 -/* B6D3A4 80241014 AE420000 */ sw $v0, ($s2) -.L80241018: -/* B6D3A8 80241018 8E4300B0 */ lw $v1, 0xb0($s2) -/* B6D3AC 8024101C 30620004 */ andi $v0, $v1, 4 -/* B6D3B0 80241020 10400007 */ beqz $v0, .L80241040 -/* B6D3B4 80241024 00000000 */ nop -/* B6D3B8 80241028 824200B4 */ lb $v0, 0xb4($s2) -/* B6D3BC 8024102C 14400034 */ bnez $v0, .L80241100 -/* B6D3C0 80241030 0000102D */ daddu $v0, $zero, $zero -/* B6D3C4 80241034 2402FFFB */ addiu $v0, $zero, -5 -/* B6D3C8 80241038 00621024 */ and $v0, $v1, $v0 -/* B6D3CC 8024103C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241040: -/* B6D3D0 80241040 8E630070 */ lw $v1, 0x70($s3) -/* B6D3D4 80241044 2C62000F */ sltiu $v0, $v1, 0xf -/* B6D3D8 80241048 1040002C */ beqz $v0, .L802410FC -/* B6D3DC 8024104C 00031080 */ sll $v0, $v1, 2 -/* B6D3E0 80241050 3C018024 */ lui $at, 0x8024 -/* B6D3E4 80241054 00220821 */ addu $at, $at, $v0 -/* B6D3E8 80241058 8C224488 */ lw $v0, 0x4488($at) -/* B6D3EC 8024105C 00400008 */ jr $v0 -/* B6D3F0 80241060 00000000 */ nop -/* B6D3F4 80241064 0260202D */ daddu $a0, $s3, $zero -/* B6D3F8 80241068 0280282D */ daddu $a1, $s4, $zero -/* B6D3FC 8024106C 0C0900C4 */ jal func_80240310 -/* B6D400 80241070 0200302D */ daddu $a2, $s0, $zero -/* B6D404 80241074 0260202D */ daddu $a0, $s3, $zero -/* B6D408 80241078 0280282D */ daddu $a1, $s4, $zero -/* B6D40C 8024107C 0C090150 */ jal func_80240540 -/* B6D410 80241080 0200302D */ daddu $a2, $s0, $zero -/* B6D414 80241084 08090440 */ j .L80241100 -/* B6D418 80241088 0000102D */ daddu $v0, $zero, $zero -/* B6D41C 8024108C 0260202D */ daddu $a0, $s3, $zero -/* B6D420 80241090 0280282D */ daddu $a1, $s4, $zero -/* B6D424 80241094 0C09021E */ jal func_80240878 -/* B6D428 80241098 0200302D */ daddu $a2, $s0, $zero -/* B6D42C 8024109C 8E630070 */ lw $v1, 0x70($s3) -/* B6D430 802410A0 24020003 */ addiu $v0, $zero, 3 -/* B6D434 802410A4 14620016 */ bne $v1, $v0, .L80241100 -/* B6D438 802410A8 0000102D */ daddu $v0, $zero, $zero -/* B6D43C 802410AC 0260202D */ daddu $a0, $s3, $zero -/* B6D440 802410B0 0280282D */ daddu $a1, $s4, $zero -/* B6D444 802410B4 0C09024E */ jal func_80240938 -/* B6D448 802410B8 0200302D */ daddu $a2, $s0, $zero -/* B6D44C 802410BC 08090440 */ j .L80241100 -/* B6D450 802410C0 0000102D */ daddu $v0, $zero, $zero -/* B6D454 802410C4 0260202D */ daddu $a0, $s3, $zero -/* B6D458 802410C8 0280282D */ daddu $a1, $s4, $zero -/* B6D45C 802410CC 0C0902B7 */ jal func_80240ADC -/* B6D460 802410D0 0200302D */ daddu $a2, $s0, $zero -/* B6D464 802410D4 0260202D */ daddu $a0, $s3, $zero -/* B6D468 802410D8 0280282D */ daddu $a1, $s4, $zero -/* B6D46C 802410DC 0C0902EF */ jal delete_actor -/* B6D470 802410E0 0200302D */ daddu $a2, $s0, $zero -/* B6D474 802410E4 08090440 */ j .L80241100 -/* B6D478 802410E8 0000102D */ daddu $v0, $zero, $zero -/* B6D47C 802410EC 0260202D */ daddu $a0, $s3, $zero -/* B6D480 802410F0 0280282D */ daddu $a1, $s4, $zero -/* B6D484 802410F4 0C0903AF */ jal func_80240EBC -/* B6D488 802410F8 0200302D */ daddu $a2, $s0, $zero -.L802410FC: -/* B6D48C 802410FC 0000102D */ daddu $v0, $zero, $zero -.L80241100: -/* B6D490 80241100 8FBF0048 */ lw $ra, 0x48($sp) -/* B6D494 80241104 8FB50044 */ lw $s5, 0x44($sp) -/* B6D498 80241108 8FB40040 */ lw $s4, 0x40($sp) -/* B6D49C 8024110C 8FB3003C */ lw $s3, 0x3c($sp) -/* B6D4A0 80241110 8FB20038 */ lw $s2, 0x38($sp) -/* B6D4A4 80241114 8FB10034 */ lw $s1, 0x34($sp) -/* B6D4A8 80241118 8FB00030 */ lw $s0, 0x30($sp) -/* B6D4AC 8024111C 03E00008 */ jr $ra -/* B6D4B0 80241120 27BD0050 */ addiu $sp, $sp, 0x50 -/* B6D4B4 80241124 00000000 */ nop -/* B6D4B8 80241128 00000000 */ nop -/* B6D4BC 8024112C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s new file mode 100644 index 0000000000..736160206b --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_10/B6C6A0/func_80240F00_B6D290.s @@ -0,0 +1,148 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F00_B6D290 +/* B6D290 80240F00 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* B6D294 80240F04 AFB3003C */ sw $s3, 0x3c($sp) +/* B6D298 80240F08 0080982D */ daddu $s3, $a0, $zero +/* B6D29C 80240F0C AFBF0048 */ sw $ra, 0x48($sp) +/* B6D2A0 80240F10 AFB50044 */ sw $s5, 0x44($sp) +/* B6D2A4 80240F14 AFB40040 */ sw $s4, 0x40($sp) +/* B6D2A8 80240F18 AFB20038 */ sw $s2, 0x38($sp) +/* B6D2AC 80240F1C AFB10034 */ sw $s1, 0x34($sp) +/* B6D2B0 80240F20 AFB00030 */ sw $s0, 0x30($sp) +/* B6D2B4 80240F24 8E720148 */ lw $s2, 0x148($s3) +/* B6D2B8 80240F28 86440008 */ lh $a0, 8($s2) +/* B6D2BC 80240F2C 8E70000C */ lw $s0, 0xc($s3) +/* B6D2C0 80240F30 0C00EABB */ jal get_npc_unsafe +/* B6D2C4 80240F34 00A0882D */ daddu $s1, $a1, $zero +/* B6D2C8 80240F38 8E050000 */ lw $a1, ($s0) +/* B6D2CC 80240F3C 26100004 */ addiu $s0, $s0, 4 +/* B6D2D0 80240F40 0260202D */ daddu $a0, $s3, $zero +/* B6D2D4 80240F44 0C0B1EAF */ jal get_variable +/* B6D2D8 80240F48 0040A82D */ daddu $s5, $v0, $zero +/* B6D2DC 80240F4C 0260202D */ daddu $a0, $s3, $zero +/* B6D2E0 80240F50 8E050000 */ lw $a1, ($s0) +/* B6D2E4 80240F54 0C0B1EAF */ jal get_variable +/* B6D2E8 80240F58 0040A02D */ daddu $s4, $v0, $zero +/* B6D2EC 80240F5C AE420094 */ sw $v0, 0x94($s2) +/* B6D2F0 80240F60 AFA00010 */ sw $zero, 0x10($sp) +/* B6D2F4 80240F64 8E4200D0 */ lw $v0, 0xd0($s2) +/* B6D2F8 80240F68 8C420030 */ lw $v0, 0x30($v0) +/* B6D2FC 80240F6C AFA20014 */ sw $v0, 0x14($sp) +/* B6D300 80240F70 8E4200D0 */ lw $v0, 0xd0($s2) +/* B6D304 80240F74 8C42001C */ lw $v0, 0x1c($v0) +/* B6D308 80240F78 AFA20018 */ sw $v0, 0x18($sp) +/* B6D30C 80240F7C 8E4200D0 */ lw $v0, 0xd0($s2) +/* B6D310 80240F80 8C420024 */ lw $v0, 0x24($v0) +/* B6D314 80240F84 AFA2001C */ sw $v0, 0x1c($sp) +/* B6D318 80240F88 8E4200D0 */ lw $v0, 0xd0($s2) +/* B6D31C 80240F8C 8C420028 */ lw $v0, 0x28($v0) +/* B6D320 80240F90 AFA20020 */ sw $v0, 0x20($sp) +/* B6D324 80240F94 8E4200D0 */ lw $v0, 0xd0($s2) +/* B6D328 80240F98 3C0142C8 */ lui $at, 0x42c8 +/* B6D32C 80240F9C 44810000 */ mtc1 $at, $f0 +/* B6D330 80240FA0 8C42002C */ lw $v0, 0x2c($v0) +/* B6D334 80240FA4 27B00010 */ addiu $s0, $sp, 0x10 +/* B6D338 80240FA8 E7A00028 */ swc1 $f0, 0x28($sp) +/* B6D33C 80240FAC A7A0002C */ sh $zero, 0x2c($sp) +/* B6D340 80240FB0 12200019 */ beqz $s1, .L80241018 +/* B6D344 80240FB4 AFA20024 */ sw $v0, 0x24($sp) +/* B6D348 80240FB8 AE600070 */ sw $zero, 0x70($s3) +/* B6D34C 80240FBC A6A0008E */ sh $zero, 0x8e($s5) +/* B6D350 80240FC0 AE600074 */ sw $zero, 0x74($s3) +/* B6D354 80240FC4 8EA20000 */ lw $v0, ($s5) +/* B6D358 80240FC8 2403F7FF */ addiu $v1, $zero, -0x801 +/* B6D35C 80240FCC 00431024 */ and $v0, $v0, $v1 +/* B6D360 80240FD0 2403FDFF */ addiu $v1, $zero, -0x201 +/* B6D364 80240FD4 00431024 */ and $v0, $v0, $v1 +/* B6D368 80240FD8 34420008 */ ori $v0, $v0, 8 +/* B6D36C 80240FDC AEA20000 */ sw $v0, ($s5) +/* B6D370 80240FE0 8E4200B0 */ lw $v0, 0xb0($s2) +/* B6D374 80240FE4 34420018 */ ori $v0, $v0, 0x18 +/* B6D378 80240FE8 AE4200B0 */ sw $v0, 0xb0($s2) +/* B6D37C 80240FEC 8E420000 */ lw $v0, ($s2) +/* B6D380 80240FF0 3C034000 */ lui $v1, 0x4000 +/* B6D384 80240FF4 00431024 */ and $v0, $v0, $v1 +/* B6D388 80240FF8 10400007 */ beqz $v0, .L80241018 +/* B6D38C 80240FFC 3C03BFFF */ lui $v1, 0xbfff +/* B6D390 80241000 2402000C */ addiu $v0, $zero, 0xc +/* B6D394 80241004 AE620070 */ sw $v0, 0x70($s3) +/* B6D398 80241008 8E420000 */ lw $v0, ($s2) +/* B6D39C 8024100C 3463FFFF */ ori $v1, $v1, 0xffff +/* B6D3A0 80241010 00431024 */ and $v0, $v0, $v1 +/* B6D3A4 80241014 AE420000 */ sw $v0, ($s2) +.L80241018: +/* B6D3A8 80241018 8E4300B0 */ lw $v1, 0xb0($s2) +/* B6D3AC 8024101C 30620004 */ andi $v0, $v1, 4 +/* B6D3B0 80241020 10400007 */ beqz $v0, .L80241040 +/* B6D3B4 80241024 00000000 */ nop +/* B6D3B8 80241028 824200B4 */ lb $v0, 0xb4($s2) +/* B6D3BC 8024102C 14400034 */ bnez $v0, .L80241100 +/* B6D3C0 80241030 0000102D */ daddu $v0, $zero, $zero +/* B6D3C4 80241034 2402FFFB */ addiu $v0, $zero, -5 +/* B6D3C8 80241038 00621024 */ and $v0, $v1, $v0 +/* B6D3CC 8024103C AE4200B0 */ sw $v0, 0xb0($s2) +.L80241040: +/* B6D3D0 80241040 8E630070 */ lw $v1, 0x70($s3) +/* B6D3D4 80241044 2C62000F */ sltiu $v0, $v1, 0xf +/* B6D3D8 80241048 1040002C */ beqz $v0, .L802410FC +/* B6D3DC 8024104C 00031080 */ sll $v0, $v1, 2 +/* B6D3E0 80241050 3C018024 */ lui $at, 0x8024 +/* B6D3E4 80241054 00220821 */ addu $at, $at, $v0 +/* B6D3E8 80241058 8C224488 */ lw $v0, 0x4488($at) +/* B6D3EC 8024105C 00400008 */ jr $v0 +/* B6D3F0 80241060 00000000 */ nop +/* B6D3F4 80241064 0260202D */ daddu $a0, $s3, $zero +/* B6D3F8 80241068 0280282D */ daddu $a1, $s4, $zero +/* B6D3FC 8024106C 0C0900C4 */ jal func_80240310_B6C6A0 +/* B6D400 80241070 0200302D */ daddu $a2, $s0, $zero +/* B6D404 80241074 0260202D */ daddu $a0, $s3, $zero +/* B6D408 80241078 0280282D */ daddu $a1, $s4, $zero +/* B6D40C 8024107C 0C090150 */ jal func_80240540_B6C8D0 +/* B6D410 80241080 0200302D */ daddu $a2, $s0, $zero +/* B6D414 80241084 08090440 */ j .L80241100 +/* B6D418 80241088 0000102D */ daddu $v0, $zero, $zero +/* B6D41C 8024108C 0260202D */ daddu $a0, $s3, $zero +/* B6D420 80241090 0280282D */ daddu $a1, $s4, $zero +/* B6D424 80241094 0C09021E */ jal func_80240878_B6CC08 +/* B6D428 80241098 0200302D */ daddu $a2, $s0, $zero +/* B6D42C 8024109C 8E630070 */ lw $v1, 0x70($s3) +/* B6D430 802410A0 24020003 */ addiu $v0, $zero, 3 +/* B6D434 802410A4 14620016 */ bne $v1, $v0, .L80241100 +/* B6D438 802410A8 0000102D */ daddu $v0, $zero, $zero +/* B6D43C 802410AC 0260202D */ daddu $a0, $s3, $zero +/* B6D440 802410B0 0280282D */ daddu $a1, $s4, $zero +/* B6D444 802410B4 0C09024E */ jal func_80240938_B6CCC8 +/* B6D448 802410B8 0200302D */ daddu $a2, $s0, $zero +/* B6D44C 802410BC 08090440 */ j .L80241100 +/* B6D450 802410C0 0000102D */ daddu $v0, $zero, $zero +/* B6D454 802410C4 0260202D */ daddu $a0, $s3, $zero +/* B6D458 802410C8 0280282D */ daddu $a1, $s4, $zero +/* B6D45C 802410CC 0C0902B7 */ jal func_80240ADC_B6CE6C +/* B6D460 802410D0 0200302D */ daddu $a2, $s0, $zero +/* B6D464 802410D4 0260202D */ daddu $a0, $s3, $zero +/* B6D468 802410D8 0280282D */ daddu $a1, $s4, $zero +/* B6D46C 802410DC 0C0902EF */ jal delete_actor +/* B6D470 802410E0 0200302D */ daddu $a2, $s0, $zero +/* B6D474 802410E4 08090440 */ j .L80241100 +/* B6D478 802410E8 0000102D */ daddu $v0, $zero, $zero +/* B6D47C 802410EC 0260202D */ daddu $a0, $s3, $zero +/* B6D480 802410F0 0280282D */ daddu $a1, $s4, $zero +/* B6D484 802410F4 0C0903AF */ jal func_80240EBC_B6D24C +/* B6D488 802410F8 0200302D */ daddu $a2, $s0, $zero +.L802410FC: +/* B6D48C 802410FC 0000102D */ daddu $v0, $zero, $zero +.L80241100: +/* B6D490 80241100 8FBF0048 */ lw $ra, 0x48($sp) +/* B6D494 80241104 8FB50044 */ lw $s5, 0x44($sp) +/* B6D498 80241108 8FB40040 */ lw $s4, 0x40($sp) +/* B6D49C 8024110C 8FB3003C */ lw $s3, 0x3c($sp) +/* B6D4A0 80241110 8FB20038 */ lw $s2, 0x38($sp) +/* B6D4A4 80241114 8FB10034 */ lw $s1, 0x34($sp) +/* B6D4A8 80241118 8FB00030 */ lw $s0, 0x30($sp) +/* B6D4AC 8024111C 03E00008 */ jr $ra +/* B6D4B0 80241120 27BD0050 */ addiu $sp, $sp, 0x50 +/* B6D4B4 80241124 00000000 */ nop +/* B6D4B8 80241128 00000000 */ nop +/* B6D4BC 8024112C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_80241280.s b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_80241280.s deleted file mode 100644 index 894b11705d..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_80241280.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241280 -/* B6D610 80241280 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B6D614 80241284 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B6D618 80241288 4485A000 */ mtc1 $a1, $f20 -/* B6D61C 8024128C F7B60020 */ sdc1 $f22, 0x20($sp) -/* B6D620 80241290 4486B000 */ mtc1 $a2, $f22 -/* B6D624 80241294 AFB00010 */ sw $s0, 0x10($sp) -/* B6D628 80241298 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B6D62C 8024129C 4487C000 */ mtc1 $a3, $f24 -/* B6D630 802412A0 AFBF0014 */ sw $ra, 0x14($sp) -/* B6D634 802412A4 0C019D28 */ jal guMtxIdentF -/* B6D638 802412A8 0080802D */ daddu $s0, $a0, $zero -/* B6D63C 802412AC 4616A582 */ mul.s $f22, $f20, $f22 -/* B6D640 802412B0 00000000 */ nop -/* B6D644 802412B4 4618A502 */ mul.s $f20, $f20, $f24 -/* B6D648 802412B8 00000000 */ nop -/* B6D64C 802412BC 3C013F80 */ lui $at, 0x3f80 -/* B6D650 802412C0 44810000 */ mtc1 $at, $f0 -/* B6D654 802412C4 00000000 */ nop -/* B6D658 802412C8 E6000014 */ swc1 $f0, 0x14($s0) -/* B6D65C 802412CC E6160010 */ swc1 $f22, 0x10($s0) -/* B6D660 802412D0 E6140018 */ swc1 $f20, 0x18($s0) -/* B6D664 802412D4 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D668 802412D8 8FB00010 */ lw $s0, 0x10($sp) -/* B6D66C 802412DC D7B80028 */ ldc1 $f24, 0x28($sp) -/* B6D670 802412E0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B6D674 802412E4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B6D678 802412E8 03E00008 */ jr $ra -/* B6D67C 802412EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_80241280_B6D610.s b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_80241280_B6D610.s new file mode 100644 index 0000000000..80242d84cc --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_80241280_B6D610.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241280_B6D610 +/* B6D610 80241280 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B6D614 80241284 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B6D618 80241288 4485A000 */ mtc1 $a1, $f20 +/* B6D61C 8024128C F7B60020 */ sdc1 $f22, 0x20($sp) +/* B6D620 80241290 4486B000 */ mtc1 $a2, $f22 +/* B6D624 80241294 AFB00010 */ sw $s0, 0x10($sp) +/* B6D628 80241298 F7B80028 */ sdc1 $f24, 0x28($sp) +/* B6D62C 8024129C 4487C000 */ mtc1 $a3, $f24 +/* B6D630 802412A0 AFBF0014 */ sw $ra, 0x14($sp) +/* B6D634 802412A4 0C019D28 */ jal guMtxIdentF +/* B6D638 802412A8 0080802D */ daddu $s0, $a0, $zero +/* B6D63C 802412AC 4616A582 */ mul.s $f22, $f20, $f22 +/* B6D640 802412B0 00000000 */ nop +/* B6D644 802412B4 4618A502 */ mul.s $f20, $f20, $f24 +/* B6D648 802412B8 00000000 */ nop +/* B6D64C 802412BC 3C013F80 */ lui $at, 0x3f80 +/* B6D650 802412C0 44810000 */ mtc1 $at, $f0 +/* B6D654 802412C4 00000000 */ nop +/* B6D658 802412C8 E6000014 */ swc1 $f0, 0x14($s0) +/* B6D65C 802412CC E6160010 */ swc1 $f22, 0x10($s0) +/* B6D660 802412D0 E6140018 */ swc1 $f20, 0x18($s0) +/* B6D664 802412D4 8FBF0014 */ lw $ra, 0x14($sp) +/* B6D668 802412D8 8FB00010 */ lw $s0, 0x10($sp) +/* B6D66C 802412DC D7B80028 */ ldc1 $f24, 0x28($sp) +/* B6D670 802412E0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* B6D674 802412E4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* B6D678 802412E8 03E00008 */ jr $ra +/* B6D67C 802412EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802412F0.s b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802412F0.s deleted file mode 100644 index 5e7b4cd6b4..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802412F0.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412F0 -/* B6D680 802412F0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B6D684 802412F4 AFB10054 */ sw $s1, 0x54($sp) -/* B6D688 802412F8 0080882D */ daddu $s1, $a0, $zero -/* B6D68C 802412FC AFBF005C */ sw $ra, 0x5c($sp) -/* B6D690 80241300 AFB20058 */ sw $s2, 0x58($sp) -/* B6D694 80241304 AFB00050 */ sw $s0, 0x50($sp) -/* B6D698 80241308 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B6D69C 8024130C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B6D6A0 80241310 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B6D6A4 80241314 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B6D6A8 80241318 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B6D6AC 8024131C 8E30000C */ lw $s0, 0xc($s1) -/* B6D6B0 80241320 8E050000 */ lw $a1, ($s0) -/* B6D6B4 80241324 0C0B1EAF */ jal get_variable -/* B6D6B8 80241328 26100004 */ addiu $s0, $s0, 4 -/* B6D6BC 8024132C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B6D6C0 80241330 0040202D */ daddu $a0, $v0, $zero -/* B6D6C4 80241334 8E050000 */ lw $a1, ($s0) -/* B6D6C8 80241338 26100004 */ addiu $s0, $s0, 4 -/* B6D6CC 8024133C 0220202D */ daddu $a0, $s1, $zero -/* B6D6D0 80241340 0C0B210B */ jal get_float_variable -/* B6D6D4 80241344 0040902D */ daddu $s2, $v0, $zero -/* B6D6D8 80241348 8E050000 */ lw $a1, ($s0) -/* B6D6DC 8024134C 26100004 */ addiu $s0, $s0, 4 -/* B6D6E0 80241350 0220202D */ daddu $a0, $s1, $zero -/* B6D6E4 80241354 0C0B210B */ jal get_float_variable -/* B6D6E8 80241358 46000706 */ mov.s $f28, $f0 -/* B6D6EC 8024135C 8E050000 */ lw $a1, ($s0) -/* B6D6F0 80241360 26100004 */ addiu $s0, $s0, 4 -/* B6D6F4 80241364 0220202D */ daddu $a0, $s1, $zero -/* B6D6F8 80241368 0C0B210B */ jal get_float_variable -/* B6D6FC 8024136C 46000686 */ mov.s $f26, $f0 -/* B6D700 80241370 0220202D */ daddu $a0, $s1, $zero -/* B6D704 80241374 8E050000 */ lw $a1, ($s0) -/* B6D708 80241378 0C0B210B */ jal get_float_variable -/* B6D70C 8024137C 46000586 */ mov.s $f22, $f0 -/* B6D710 80241380 0240202D */ daddu $a0, $s2, $zero -/* B6D714 80241384 0C046B4C */ jal get_model_from_list_index -/* B6D718 80241388 46000606 */ mov.s $f24, $f0 -/* B6D71C 8024138C 0040882D */ daddu $s1, $v0, $zero -/* B6D720 80241390 96220000 */ lhu $v0, ($s1) -/* B6D724 80241394 30420400 */ andi $v0, $v0, 0x400 -/* B6D728 80241398 1440001E */ bnez $v0, .L80241414 -/* B6D72C 8024139C 26300058 */ addiu $s0, $s1, 0x58 -/* B6D730 802413A0 4480A000 */ mtc1 $zero, $f20 -/* B6D734 802413A4 4406B000 */ mfc1 $a2, $f22 -/* B6D738 802413A8 4405A000 */ mfc1 $a1, $f20 -/* B6D73C 802413AC 4407A000 */ mfc1 $a3, $f20 -/* B6D740 802413B0 0C019E40 */ jal guTranslateF -/* B6D744 802413B4 0200202D */ daddu $a0, $s0, $zero -/* B6D748 802413B8 4405E000 */ mfc1 $a1, $f28 -/* B6D74C 802413BC 4406D000 */ mfc1 $a2, $f26 -/* B6D750 802413C0 4407C000 */ mfc1 $a3, $f24 -/* B6D754 802413C4 0C0904A0 */ jal func_80241280 -/* B6D758 802413C8 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D75C 802413CC 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D760 802413D0 0200282D */ daddu $a1, $s0, $zero -/* B6D764 802413D4 0C019D80 */ jal guMtxCatF -/* B6D768 802413D8 0200302D */ daddu $a2, $s0, $zero -/* B6D76C 802413DC 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D770 802413E0 4600B587 */ neg.s $f22, $f22 -/* B6D774 802413E4 4405A000 */ mfc1 $a1, $f20 -/* B6D778 802413E8 4406B000 */ mfc1 $a2, $f22 -/* B6D77C 802413EC 0C019E40 */ jal guTranslateF -/* B6D780 802413F0 00A0382D */ daddu $a3, $a1, $zero -/* B6D784 802413F4 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D788 802413F8 0200282D */ daddu $a1, $s0, $zero -/* B6D78C 802413FC 0C019D80 */ jal guMtxCatF -/* B6D790 80241400 00A0302D */ daddu $a2, $a1, $zero -/* B6D794 80241404 96220000 */ lhu $v0, ($s1) -/* B6D798 80241408 34421400 */ ori $v0, $v0, 0x1400 -/* B6D79C 8024140C 08090523 */ j .L8024148C -/* B6D7A0 80241410 A6220000 */ sh $v0, ($s1) -.L80241414: -/* B6D7A4 80241414 4480A000 */ mtc1 $zero, $f20 -/* B6D7A8 80241418 4406B000 */ mfc1 $a2, $f22 -/* B6D7AC 8024141C 4405A000 */ mfc1 $a1, $f20 -/* B6D7B0 80241420 4407A000 */ mfc1 $a3, $f20 -/* B6D7B4 80241424 0C019E40 */ jal guTranslateF -/* B6D7B8 80241428 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D7BC 8024142C 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D7C0 80241430 26300058 */ addiu $s0, $s1, 0x58 -/* B6D7C4 80241434 0200282D */ daddu $a1, $s0, $zero -/* B6D7C8 80241438 0C019D80 */ jal guMtxCatF -/* B6D7CC 8024143C 0200302D */ daddu $a2, $s0, $zero -/* B6D7D0 80241440 4405E000 */ mfc1 $a1, $f28 -/* B6D7D4 80241444 4406D000 */ mfc1 $a2, $f26 -/* B6D7D8 80241448 4407C000 */ mfc1 $a3, $f24 -/* B6D7DC 8024144C 0C0904A0 */ jal func_80241280 -/* B6D7E0 80241450 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D7E4 80241454 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D7E8 80241458 0200282D */ daddu $a1, $s0, $zero -/* B6D7EC 8024145C 0C019D80 */ jal guMtxCatF -/* B6D7F0 80241460 0200302D */ daddu $a2, $s0, $zero -/* B6D7F4 80241464 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D7F8 80241468 4600B587 */ neg.s $f22, $f22 -/* B6D7FC 8024146C 4405A000 */ mfc1 $a1, $f20 -/* B6D800 80241470 4406B000 */ mfc1 $a2, $f22 -/* B6D804 80241474 0C019E40 */ jal guTranslateF -/* B6D808 80241478 00A0382D */ daddu $a3, $a1, $zero -/* B6D80C 8024147C 27A40010 */ addiu $a0, $sp, 0x10 -/* B6D810 80241480 0200282D */ daddu $a1, $s0, $zero -/* B6D814 80241484 0C019D80 */ jal guMtxCatF -/* B6D818 80241488 00A0302D */ daddu $a2, $a1, $zero -.L8024148C: -/* B6D81C 8024148C 8FBF005C */ lw $ra, 0x5c($sp) -/* B6D820 80241490 8FB20058 */ lw $s2, 0x58($sp) -/* B6D824 80241494 8FB10054 */ lw $s1, 0x54($sp) -/* B6D828 80241498 8FB00050 */ lw $s0, 0x50($sp) -/* B6D82C 8024149C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B6D830 802414A0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B6D834 802414A4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B6D838 802414A8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B6D83C 802414AC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B6D840 802414B0 24020002 */ addiu $v0, $zero, 2 -/* B6D844 802414B4 03E00008 */ jr $ra -/* B6D848 802414B8 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802412F0_B6D680.s b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802412F0_B6D680.s new file mode 100644 index 0000000000..d6e69fc416 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802412F0_B6D680.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412F0_B6D680 +/* B6D680 802412F0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* B6D684 802412F4 AFB10054 */ sw $s1, 0x54($sp) +/* B6D688 802412F8 0080882D */ daddu $s1, $a0, $zero +/* B6D68C 802412FC AFBF005C */ sw $ra, 0x5c($sp) +/* B6D690 80241300 AFB20058 */ sw $s2, 0x58($sp) +/* B6D694 80241304 AFB00050 */ sw $s0, 0x50($sp) +/* B6D698 80241308 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* B6D69C 8024130C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* B6D6A0 80241310 F7B80070 */ sdc1 $f24, 0x70($sp) +/* B6D6A4 80241314 F7B60068 */ sdc1 $f22, 0x68($sp) +/* B6D6A8 80241318 F7B40060 */ sdc1 $f20, 0x60($sp) +/* B6D6AC 8024131C 8E30000C */ lw $s0, 0xc($s1) +/* B6D6B0 80241320 8E050000 */ lw $a1, ($s0) +/* B6D6B4 80241324 0C0B1EAF */ jal get_variable +/* B6D6B8 80241328 26100004 */ addiu $s0, $s0, 4 +/* B6D6BC 8024132C 0C046C04 */ jal get_model_list_index_from_tree_index +/* B6D6C0 80241330 0040202D */ daddu $a0, $v0, $zero +/* B6D6C4 80241334 8E050000 */ lw $a1, ($s0) +/* B6D6C8 80241338 26100004 */ addiu $s0, $s0, 4 +/* B6D6CC 8024133C 0220202D */ daddu $a0, $s1, $zero +/* B6D6D0 80241340 0C0B210B */ jal get_float_variable +/* B6D6D4 80241344 0040902D */ daddu $s2, $v0, $zero +/* B6D6D8 80241348 8E050000 */ lw $a1, ($s0) +/* B6D6DC 8024134C 26100004 */ addiu $s0, $s0, 4 +/* B6D6E0 80241350 0220202D */ daddu $a0, $s1, $zero +/* B6D6E4 80241354 0C0B210B */ jal get_float_variable +/* B6D6E8 80241358 46000706 */ mov.s $f28, $f0 +/* B6D6EC 8024135C 8E050000 */ lw $a1, ($s0) +/* B6D6F0 80241360 26100004 */ addiu $s0, $s0, 4 +/* B6D6F4 80241364 0220202D */ daddu $a0, $s1, $zero +/* B6D6F8 80241368 0C0B210B */ jal get_float_variable +/* B6D6FC 8024136C 46000686 */ mov.s $f26, $f0 +/* B6D700 80241370 0220202D */ daddu $a0, $s1, $zero +/* B6D704 80241374 8E050000 */ lw $a1, ($s0) +/* B6D708 80241378 0C0B210B */ jal get_float_variable +/* B6D70C 8024137C 46000586 */ mov.s $f22, $f0 +/* B6D710 80241380 0240202D */ daddu $a0, $s2, $zero +/* B6D714 80241384 0C046B4C */ jal get_model_from_list_index +/* B6D718 80241388 46000606 */ mov.s $f24, $f0 +/* B6D71C 8024138C 0040882D */ daddu $s1, $v0, $zero +/* B6D720 80241390 96220000 */ lhu $v0, ($s1) +/* B6D724 80241394 30420400 */ andi $v0, $v0, 0x400 +/* B6D728 80241398 1440001E */ bnez $v0, .L80241414 +/* B6D72C 8024139C 26300058 */ addiu $s0, $s1, 0x58 +/* B6D730 802413A0 4480A000 */ mtc1 $zero, $f20 +/* B6D734 802413A4 4406B000 */ mfc1 $a2, $f22 +/* B6D738 802413A8 4405A000 */ mfc1 $a1, $f20 +/* B6D73C 802413AC 4407A000 */ mfc1 $a3, $f20 +/* B6D740 802413B0 0C019E40 */ jal guTranslateF +/* B6D744 802413B4 0200202D */ daddu $a0, $s0, $zero +/* B6D748 802413B8 4405E000 */ mfc1 $a1, $f28 +/* B6D74C 802413BC 4406D000 */ mfc1 $a2, $f26 +/* B6D750 802413C0 4407C000 */ mfc1 $a3, $f24 +/* B6D754 802413C4 0C0904A0 */ jal func_80241280_B6D610 +/* B6D758 802413C8 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D75C 802413CC 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D760 802413D0 0200282D */ daddu $a1, $s0, $zero +/* B6D764 802413D4 0C019D80 */ jal guMtxCatF +/* B6D768 802413D8 0200302D */ daddu $a2, $s0, $zero +/* B6D76C 802413DC 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D770 802413E0 4600B587 */ neg.s $f22, $f22 +/* B6D774 802413E4 4405A000 */ mfc1 $a1, $f20 +/* B6D778 802413E8 4406B000 */ mfc1 $a2, $f22 +/* B6D77C 802413EC 0C019E40 */ jal guTranslateF +/* B6D780 802413F0 00A0382D */ daddu $a3, $a1, $zero +/* B6D784 802413F4 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D788 802413F8 0200282D */ daddu $a1, $s0, $zero +/* B6D78C 802413FC 0C019D80 */ jal guMtxCatF +/* B6D790 80241400 00A0302D */ daddu $a2, $a1, $zero +/* B6D794 80241404 96220000 */ lhu $v0, ($s1) +/* B6D798 80241408 34421400 */ ori $v0, $v0, 0x1400 +/* B6D79C 8024140C 08090523 */ j .L8024148C +/* B6D7A0 80241410 A6220000 */ sh $v0, ($s1) +.L80241414: +/* B6D7A4 80241414 4480A000 */ mtc1 $zero, $f20 +/* B6D7A8 80241418 4406B000 */ mfc1 $a2, $f22 +/* B6D7AC 8024141C 4405A000 */ mfc1 $a1, $f20 +/* B6D7B0 80241420 4407A000 */ mfc1 $a3, $f20 +/* B6D7B4 80241424 0C019E40 */ jal guTranslateF +/* B6D7B8 80241428 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D7BC 8024142C 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D7C0 80241430 26300058 */ addiu $s0, $s1, 0x58 +/* B6D7C4 80241434 0200282D */ daddu $a1, $s0, $zero +/* B6D7C8 80241438 0C019D80 */ jal guMtxCatF +/* B6D7CC 8024143C 0200302D */ daddu $a2, $s0, $zero +/* B6D7D0 80241440 4405E000 */ mfc1 $a1, $f28 +/* B6D7D4 80241444 4406D000 */ mfc1 $a2, $f26 +/* B6D7D8 80241448 4407C000 */ mfc1 $a3, $f24 +/* B6D7DC 8024144C 0C0904A0 */ jal func_80241280_B6D610 +/* B6D7E0 80241450 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D7E4 80241454 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D7E8 80241458 0200282D */ daddu $a1, $s0, $zero +/* B6D7EC 8024145C 0C019D80 */ jal guMtxCatF +/* B6D7F0 80241460 0200302D */ daddu $a2, $s0, $zero +/* B6D7F4 80241464 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D7F8 80241468 4600B587 */ neg.s $f22, $f22 +/* B6D7FC 8024146C 4405A000 */ mfc1 $a1, $f20 +/* B6D800 80241470 4406B000 */ mfc1 $a2, $f22 +/* B6D804 80241474 0C019E40 */ jal guTranslateF +/* B6D808 80241478 00A0382D */ daddu $a3, $a1, $zero +/* B6D80C 8024147C 27A40010 */ addiu $a0, $sp, 0x10 +/* B6D810 80241480 0200282D */ daddu $a1, $s0, $zero +/* B6D814 80241484 0C019D80 */ jal guMtxCatF +/* B6D818 80241488 00A0302D */ daddu $a2, $a1, $zero +.L8024148C: +/* B6D81C 8024148C 8FBF005C */ lw $ra, 0x5c($sp) +/* B6D820 80241490 8FB20058 */ lw $s2, 0x58($sp) +/* B6D824 80241494 8FB10054 */ lw $s1, 0x54($sp) +/* B6D828 80241498 8FB00050 */ lw $s0, 0x50($sp) +/* B6D82C 8024149C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* B6D830 802414A0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* B6D834 802414A4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* B6D838 802414A8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* B6D83C 802414AC D7B40060 */ ldc1 $f20, 0x60($sp) +/* B6D840 802414B0 24020002 */ addiu $v0, $zero, 2 +/* B6D844 802414B4 03E00008 */ jr $ra +/* B6D848 802414B8 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC.s b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC.s deleted file mode 100644 index ac670a2ebe..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414BC -/* B6D84C 802414BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6D850 802414C0 AFB00010 */ sw $s0, 0x10($sp) -/* B6D854 802414C4 0080802D */ daddu $s0, $a0, $zero -/* B6D858 802414C8 AFBF0014 */ sw $ra, 0x14($sp) -/* B6D85C 802414CC 0C00FB5A */ jal get_enemy_safe -/* B6D860 802414D0 24040001 */ addiu $a0, $zero, 1 -/* B6D864 802414D4 14400003 */ bnez $v0, .L802414E4 -/* B6D868 802414D8 24020001 */ addiu $v0, $zero, 1 -/* B6D86C 802414DC 0809053A */ j .L802414E8 -/* B6D870 802414E0 AE000084 */ sw $zero, 0x84($s0) -.L802414E4: -/* B6D874 802414E4 AE020084 */ sw $v0, 0x84($s0) -.L802414E8: -/* B6D878 802414E8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6D87C 802414EC 8FB00010 */ lw $s0, 0x10($sp) -/* B6D880 802414F0 24020002 */ addiu $v0, $zero, 2 -/* B6D884 802414F4 03E00008 */ jr $ra -/* B6D888 802414F8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6D88C 802414FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC_B6D84C.s b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC_B6D84C.s new file mode 100644 index 0000000000..afb24c9da6 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_10/B6D610/func_802414BC_B6D84C.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414BC_B6D84C +/* B6D84C 802414BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B6D850 802414C0 AFB00010 */ sw $s0, 0x10($sp) +/* B6D854 802414C4 0080802D */ daddu $s0, $a0, $zero +/* B6D858 802414C8 AFBF0014 */ sw $ra, 0x14($sp) +/* B6D85C 802414CC 0C00FB5A */ jal get_enemy_safe +/* B6D860 802414D0 24040001 */ addiu $a0, $zero, 1 +/* B6D864 802414D4 14400003 */ bnez $v0, .L802414E4 +/* B6D868 802414D8 24020001 */ addiu $v0, $zero, 1 +/* B6D86C 802414DC 0809053A */ j .L802414E8 +/* B6D870 802414E0 AE000084 */ sw $zero, 0x84($s0) +.L802414E4: +/* B6D874 802414E4 AE020084 */ sw $v0, 0x84($s0) +.L802414E8: +/* B6D878 802414E8 8FBF0014 */ lw $ra, 0x14($sp) +/* B6D87C 802414EC 8FB00010 */ lw $s0, 0x10($sp) +/* B6D880 802414F0 24020002 */ addiu $v0, $zero, 2 +/* B6D884 802414F4 03E00008 */ jr $ra +/* B6D888 802414F8 27BD0018 */ addiu $sp, $sp, 0x18 +/* B6D88C 802414FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_10/B6D890/func_80241570_B6D900.s b/asm/nonmatchings/world/area_jan/jan_10/B6D890/func_80241570_B6D900.s index 507c088916..b2c8171e4f 100644 --- a/asm/nonmatchings/world/area_jan/jan_10/B6D890/func_80241570_B6D900.s +++ b/asm/nonmatchings/world/area_jan/jan_10/B6D890/func_80241570_B6D900.s @@ -55,7 +55,7 @@ glabel func_80241570_B6D900 /* B6D9C8 80241638 4405E000 */ mfc1 $a1, $f28 /* B6D9CC 8024163C 4406D000 */ mfc1 $a2, $f26 /* B6D9D0 80241640 4407C000 */ mfc1 $a3, $f24 -/* B6D9D4 80241644 0C090540 */ jal func_80241500 +/* B6D9D4 80241644 0C090540 */ jal func_80241500_B6D890 /* B6D9D8 80241648 27A40010 */ addiu $a0, $sp, 0x10 /* B6D9DC 8024164C 27A40010 */ addiu $a0, $sp, 0x10 /* B6D9E0 80241650 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80241570_B6D900 /* B6DA50 802416C0 4405E000 */ mfc1 $a1, $f28 /* B6DA54 802416C4 4406D000 */ mfc1 $a2, $f26 /* B6DA58 802416C8 4407C000 */ mfc1 $a3, $f24 -/* B6DA5C 802416CC 0C090540 */ jal func_80241500 +/* B6DA5C 802416CC 0C090540 */ jal func_80241500_B6D890 /* B6DA60 802416D0 27A40010 */ addiu $a0, $sp, 0x10 /* B6DA64 802416D4 27A40010 */ addiu $a0, $sp, 0x10 /* B6DA68 802416D8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C.s deleted file mode 100644 index 318686bea0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024018C -/* B709EC 8024018C 3C038016 */ lui $v1, 0x8016 -/* B709F0 80240190 8463A552 */ lh $v1, -0x5aae($v1) -/* B709F4 80240194 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B709F8 80240198 AFB00010 */ sw $s0, 0x10($sp) -/* B709FC 8024019C 0080802D */ daddu $s0, $a0, $zero -/* B70A00 802401A0 AFBF0014 */ sw $ra, 0x14($sp) -/* B70A04 802401A4 8E0200B0 */ lw $v0, 0xb0($s0) -/* B70A08 802401A8 10620003 */ beq $v1, $v0, .L802401B8 -/* B70A0C 802401AC 24020002 */ addiu $v0, $zero, 2 -/* B70A10 802401B0 0809008E */ j .L80240238 -/* B70A14 802401B4 AE000084 */ sw $zero, 0x84($s0) -.L802401B8: -/* B70A18 802401B8 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* B70A1C 802401BC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* B70A20 802401C0 80620040 */ lb $v0, 0x40($v1) -/* B70A24 802401C4 80670044 */ lb $a3, 0x44($v1) -/* B70A28 802401C8 04420001 */ bltzl $v0, .L802401D0 -/* B70A2C 802401CC 00021023 */ negu $v0, $v0 -.L802401D0: -/* B70A30 802401D0 14400003 */ bnez $v0, .L802401E0 -/* B70A34 802401D4 00000000 */ nop -/* B70A38 802401D8 50E00017 */ beql $a3, $zero, .L80240238 -/* B70A3C 802401DC 0000102D */ daddu $v0, $zero, $zero -.L802401E0: -/* B70A40 802401E0 44822000 */ mtc1 $v0, $f4 -/* B70A44 802401E4 00000000 */ nop -/* B70A48 802401E8 46802120 */ cvt.s.w $f4, $f4 -/* B70A4C 802401EC 44062000 */ mfc1 $a2, $f4 -/* B70A50 802401F0 44872000 */ mtc1 $a3, $f4 -/* B70A54 802401F4 00000000 */ nop -/* B70A58 802401F8 46802120 */ cvt.s.w $f4, $f4 -/* B70A5C 802401FC 44806000 */ mtc1 $zero, $f12 -/* B70A60 80240200 44072000 */ mfc1 $a3, $f4 -/* B70A64 80240204 0C00A720 */ jal atan2 -/* B70A68 80240208 46006386 */ mov.s $f14, $f12 -/* B70A6C 8024020C 3C014270 */ lui $at, 0x4270 -/* B70A70 80240210 44811000 */ mtc1 $at, $f2 -/* B70A74 80240214 00000000 */ nop -/* B70A78 80240218 4602003C */ c.lt.s $f0, $f2 -/* B70A7C 8024021C 00000000 */ nop -/* B70A80 80240220 45000004 */ bc1f .L80240234 -/* B70A84 80240224 24020001 */ addiu $v0, $zero, 1 -/* B70A88 80240228 AE020084 */ sw $v0, 0x84($s0) -/* B70A8C 8024022C 0809008E */ j .L80240238 -/* B70A90 80240230 24020002 */ addiu $v0, $zero, 2 -.L80240234: -/* B70A94 80240234 0000102D */ daddu $v0, $zero, $zero -.L80240238: -/* B70A98 80240238 8FBF0014 */ lw $ra, 0x14($sp) -/* B70A9C 8024023C 8FB00010 */ lw $s0, 0x10($sp) -/* B70AA0 80240240 03E00008 */ jr $ra -/* B70AA4 80240244 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s new file mode 100644 index 0000000000..0bbaf199ae --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_8024018C_B709EC.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024018C_B709EC +/* B709EC 8024018C 3C038016 */ lui $v1, 0x8016 +/* B709F0 80240190 8463A552 */ lh $v1, -0x5aae($v1) +/* B709F4 80240194 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B709F8 80240198 AFB00010 */ sw $s0, 0x10($sp) +/* B709FC 8024019C 0080802D */ daddu $s0, $a0, $zero +/* B70A00 802401A0 AFBF0014 */ sw $ra, 0x14($sp) +/* B70A04 802401A4 8E0200B0 */ lw $v0, 0xb0($s0) +/* B70A08 802401A8 10620003 */ beq $v1, $v0, .L802401B8 +/* B70A0C 802401AC 24020002 */ addiu $v0, $zero, 2 +/* B70A10 802401B0 0809008E */ j .L80240238 +/* B70A14 802401B4 AE000084 */ sw $zero, 0x84($s0) +.L802401B8: +/* B70A18 802401B8 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* B70A1C 802401BC 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* B70A20 802401C0 80620040 */ lb $v0, 0x40($v1) +/* B70A24 802401C4 80670044 */ lb $a3, 0x44($v1) +/* B70A28 802401C8 04420001 */ bltzl $v0, .L802401D0 +/* B70A2C 802401CC 00021023 */ negu $v0, $v0 +.L802401D0: +/* B70A30 802401D0 14400003 */ bnez $v0, .L802401E0 +/* B70A34 802401D4 00000000 */ nop +/* B70A38 802401D8 50E00017 */ beql $a3, $zero, .L80240238 +/* B70A3C 802401DC 0000102D */ daddu $v0, $zero, $zero +.L802401E0: +/* B70A40 802401E0 44822000 */ mtc1 $v0, $f4 +/* B70A44 802401E4 00000000 */ nop +/* B70A48 802401E8 46802120 */ cvt.s.w $f4, $f4 +/* B70A4C 802401EC 44062000 */ mfc1 $a2, $f4 +/* B70A50 802401F0 44872000 */ mtc1 $a3, $f4 +/* B70A54 802401F4 00000000 */ nop +/* B70A58 802401F8 46802120 */ cvt.s.w $f4, $f4 +/* B70A5C 802401FC 44806000 */ mtc1 $zero, $f12 +/* B70A60 80240200 44072000 */ mfc1 $a3, $f4 +/* B70A64 80240204 0C00A720 */ jal atan2 +/* B70A68 80240208 46006386 */ mov.s $f14, $f12 +/* B70A6C 8024020C 3C014270 */ lui $at, 0x4270 +/* B70A70 80240210 44811000 */ mtc1 $at, $f2 +/* B70A74 80240214 00000000 */ nop +/* B70A78 80240218 4602003C */ c.lt.s $f0, $f2 +/* B70A7C 8024021C 00000000 */ nop +/* B70A80 80240220 45000004 */ bc1f .L80240234 +/* B70A84 80240224 24020001 */ addiu $v0, $zero, 1 +/* B70A88 80240228 AE020084 */ sw $v0, 0x84($s0) +/* B70A8C 8024022C 0809008E */ j .L80240238 +/* B70A90 80240230 24020002 */ addiu $v0, $zero, 2 +.L80240234: +/* B70A94 80240234 0000102D */ daddu $v0, $zero, $zero +.L80240238: +/* B70A98 80240238 8FBF0014 */ lw $ra, 0x14($sp) +/* B70A9C 8024023C 8FB00010 */ lw $s0, 0x10($sp) +/* B70AA0 80240240 03E00008 */ jr $ra +/* B70AA4 80240244 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248.s deleted file mode 100644 index 0ec4cb53f1..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240248 -/* B70AA8 80240248 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B70AAC 8024024C AFB10014 */ sw $s1, 0x14($sp) -/* B70AB0 80240250 0080882D */ daddu $s1, $a0, $zero -/* B70AB4 80240254 AFBF001C */ sw $ra, 0x1c($sp) -/* B70AB8 80240258 AFB20018 */ sw $s2, 0x18($sp) -/* B70ABC 8024025C 0C016AFA */ jal get_current_map_header -/* B70AC0 80240260 AFB00010 */ sw $s0, 0x10($sp) -/* B70AC4 80240264 0220202D */ daddu $a0, $s1, $zero -/* B70AC8 80240268 3C05FE36 */ lui $a1, 0xfe36 -/* B70ACC 8024026C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B70AD0 80240270 0C0B1EAF */ jal get_variable -/* B70AD4 80240274 0040902D */ daddu $s2, $v0, $zero -/* B70AD8 80240278 0220202D */ daddu $a0, $s1, $zero -/* B70ADC 8024027C 3C05FE36 */ lui $a1, 0xfe36 -/* B70AE0 80240280 8E430014 */ lw $v1, 0x14($s2) -/* B70AE4 80240284 00028100 */ sll $s0, $v0, 4 -/* B70AE8 80240288 02031821 */ addu $v1, $s0, $v1 -/* B70AEC 8024028C C4600000 */ lwc1 $f0, ($v1) -/* B70AF0 80240290 4600008D */ trunc.w.s $f2, $f0 -/* B70AF4 80240294 44061000 */ mfc1 $a2, $f2 -/* B70AF8 80240298 0C0B2026 */ jal set_variable -/* B70AFC 8024029C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B70B00 802402A0 0220202D */ daddu $a0, $s1, $zero -/* B70B04 802402A4 8E420014 */ lw $v0, 0x14($s2) -/* B70B08 802402A8 3C05FE36 */ lui $a1, 0xfe36 -/* B70B0C 802402AC 02021021 */ addu $v0, $s0, $v0 -/* B70B10 802402B0 C4400004 */ lwc1 $f0, 4($v0) -/* B70B14 802402B4 4600008D */ trunc.w.s $f2, $f0 -/* B70B18 802402B8 44061000 */ mfc1 $a2, $f2 -/* B70B1C 802402BC 0C0B2026 */ jal set_variable -/* B70B20 802402C0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* B70B24 802402C4 0220202D */ daddu $a0, $s1, $zero -/* B70B28 802402C8 8E420014 */ lw $v0, 0x14($s2) -/* B70B2C 802402CC 3C05FE36 */ lui $a1, 0xfe36 -/* B70B30 802402D0 02021021 */ addu $v0, $s0, $v0 -/* B70B34 802402D4 C4400008 */ lwc1 $f0, 8($v0) -/* B70B38 802402D8 4600008D */ trunc.w.s $f2, $f0 -/* B70B3C 802402DC 44061000 */ mfc1 $a2, $f2 -/* B70B40 802402E0 0C0B2026 */ jal set_variable -/* B70B44 802402E4 34A53C83 */ ori $a1, $a1, 0x3c83 -/* B70B48 802402E8 0220202D */ daddu $a0, $s1, $zero -/* B70B4C 802402EC 8E420014 */ lw $v0, 0x14($s2) -/* B70B50 802402F0 3C05FE36 */ lui $a1, 0xfe36 -/* B70B54 802402F4 02028021 */ addu $s0, $s0, $v0 -/* B70B58 802402F8 C600000C */ lwc1 $f0, 0xc($s0) -/* B70B5C 802402FC 4600008D */ trunc.w.s $f2, $f0 -/* B70B60 80240300 44061000 */ mfc1 $a2, $f2 -/* B70B64 80240304 0C0B2026 */ jal set_variable -/* B70B68 80240308 34A53C84 */ ori $a1, $a1, 0x3c84 -/* B70B6C 8024030C 8FBF001C */ lw $ra, 0x1c($sp) -/* B70B70 80240310 8FB20018 */ lw $s2, 0x18($sp) -/* B70B74 80240314 8FB10014 */ lw $s1, 0x14($sp) -/* B70B78 80240318 8FB00010 */ lw $s0, 0x10($sp) -/* B70B7C 8024031C 24020002 */ addiu $v0, $zero, 2 -/* B70B80 80240320 03E00008 */ jr $ra -/* B70B84 80240324 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s new file mode 100644 index 0000000000..f683ce8b8c --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240248_B70AA8.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240248_B70AA8 +/* B70AA8 80240248 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B70AAC 8024024C AFB10014 */ sw $s1, 0x14($sp) +/* B70AB0 80240250 0080882D */ daddu $s1, $a0, $zero +/* B70AB4 80240254 AFBF001C */ sw $ra, 0x1c($sp) +/* B70AB8 80240258 AFB20018 */ sw $s2, 0x18($sp) +/* B70ABC 8024025C 0C016AFA */ jal get_current_map_header +/* B70AC0 80240260 AFB00010 */ sw $s0, 0x10($sp) +/* B70AC4 80240264 0220202D */ daddu $a0, $s1, $zero +/* B70AC8 80240268 3C05FE36 */ lui $a1, 0xfe36 +/* B70ACC 8024026C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* B70AD0 80240270 0C0B1EAF */ jal get_variable +/* B70AD4 80240274 0040902D */ daddu $s2, $v0, $zero +/* B70AD8 80240278 0220202D */ daddu $a0, $s1, $zero +/* B70ADC 8024027C 3C05FE36 */ lui $a1, 0xfe36 +/* B70AE0 80240280 8E430014 */ lw $v1, 0x14($s2) +/* B70AE4 80240284 00028100 */ sll $s0, $v0, 4 +/* B70AE8 80240288 02031821 */ addu $v1, $s0, $v1 +/* B70AEC 8024028C C4600000 */ lwc1 $f0, ($v1) +/* B70AF0 80240290 4600008D */ trunc.w.s $f2, $f0 +/* B70AF4 80240294 44061000 */ mfc1 $a2, $f2 +/* B70AF8 80240298 0C0B2026 */ jal set_variable +/* B70AFC 8024029C 34A53C81 */ ori $a1, $a1, 0x3c81 +/* B70B00 802402A0 0220202D */ daddu $a0, $s1, $zero +/* B70B04 802402A4 8E420014 */ lw $v0, 0x14($s2) +/* B70B08 802402A8 3C05FE36 */ lui $a1, 0xfe36 +/* B70B0C 802402AC 02021021 */ addu $v0, $s0, $v0 +/* B70B10 802402B0 C4400004 */ lwc1 $f0, 4($v0) +/* B70B14 802402B4 4600008D */ trunc.w.s $f2, $f0 +/* B70B18 802402B8 44061000 */ mfc1 $a2, $f2 +/* B70B1C 802402BC 0C0B2026 */ jal set_variable +/* B70B20 802402C0 34A53C82 */ ori $a1, $a1, 0x3c82 +/* B70B24 802402C4 0220202D */ daddu $a0, $s1, $zero +/* B70B28 802402C8 8E420014 */ lw $v0, 0x14($s2) +/* B70B2C 802402CC 3C05FE36 */ lui $a1, 0xfe36 +/* B70B30 802402D0 02021021 */ addu $v0, $s0, $v0 +/* B70B34 802402D4 C4400008 */ lwc1 $f0, 8($v0) +/* B70B38 802402D8 4600008D */ trunc.w.s $f2, $f0 +/* B70B3C 802402DC 44061000 */ mfc1 $a2, $f2 +/* B70B40 802402E0 0C0B2026 */ jal set_variable +/* B70B44 802402E4 34A53C83 */ ori $a1, $a1, 0x3c83 +/* B70B48 802402E8 0220202D */ daddu $a0, $s1, $zero +/* B70B4C 802402EC 8E420014 */ lw $v0, 0x14($s2) +/* B70B50 802402F0 3C05FE36 */ lui $a1, 0xfe36 +/* B70B54 802402F4 02028021 */ addu $s0, $s0, $v0 +/* B70B58 802402F8 C600000C */ lwc1 $f0, 0xc($s0) +/* B70B5C 802402FC 4600008D */ trunc.w.s $f2, $f0 +/* B70B60 80240300 44061000 */ mfc1 $a2, $f2 +/* B70B64 80240304 0C0B2026 */ jal set_variable +/* B70B68 80240308 34A53C84 */ ori $a1, $a1, 0x3c84 +/* B70B6C 8024030C 8FBF001C */ lw $ra, 0x1c($sp) +/* B70B70 80240310 8FB20018 */ lw $s2, 0x18($sp) +/* B70B74 80240314 8FB10014 */ lw $s1, 0x14($sp) +/* B70B78 80240318 8FB00010 */ lw $s0, 0x10($sp) +/* B70B7C 8024031C 24020002 */ addiu $v0, $zero, 2 +/* B70B80 80240320 03E00008 */ jr $ra +/* B70B84 80240324 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328.s deleted file mode 100644 index 5730930524..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240328 -/* B70B88 80240328 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B70B8C 8024032C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B70B90 80240330 3C014334 */ lui $at, 0x4334 -/* B70B94 80240334 44816000 */ mtc1 $at, $f12 -/* B70B98 80240338 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B70B9C 8024033C AFBF0014 */ sw $ra, 0x14($sp) -/* B70BA0 80240340 AFB00010 */ sw $s0, 0x10($sp) -/* B70BA4 80240344 00031080 */ sll $v0, $v1, 2 -/* B70BA8 80240348 00431021 */ addu $v0, $v0, $v1 -/* B70BAC 8024034C 00021080 */ sll $v0, $v0, 2 -/* B70BB0 80240350 00431023 */ subu $v0, $v0, $v1 -/* B70BB4 80240354 000218C0 */ sll $v1, $v0, 3 -/* B70BB8 80240358 00431021 */ addu $v0, $v0, $v1 -/* B70BBC 8024035C 000210C0 */ sll $v0, $v0, 3 -/* B70BC0 80240360 3C01800B */ lui $at, 0x800b -/* B70BC4 80240364 00220821 */ addu $at, $at, $v0 -/* B70BC8 80240368 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B70BCC 8024036C 460C0300 */ add.s $f12, $f0, $f12 -/* B70BD0 80240370 0C00A6C9 */ jal clamp_angle -/* B70BD4 80240374 0080802D */ daddu $s0, $a0, $zero -/* B70BD8 80240378 4600008D */ trunc.w.s $f2, $f0 -/* B70BDC 8024037C E6020084 */ swc1 $f2, 0x84($s0) -/* B70BE0 80240380 8FBF0014 */ lw $ra, 0x14($sp) -/* B70BE4 80240384 8FB00010 */ lw $s0, 0x10($sp) -/* B70BE8 80240388 24020002 */ addiu $v0, $zero, 2 -/* B70BEC 8024038C 03E00008 */ jr $ra -/* B70BF0 80240390 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328_B70B88.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328_B70B88.s new file mode 100644 index 0000000000..61d743cb47 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240328_B70B88.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240328_B70B88 +/* B70B88 80240328 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* B70B8C 8024032C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* B70B90 80240330 3C014334 */ lui $at, 0x4334 +/* B70B94 80240334 44816000 */ mtc1 $at, $f12 +/* B70B98 80240338 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B70B9C 8024033C AFBF0014 */ sw $ra, 0x14($sp) +/* B70BA0 80240340 AFB00010 */ sw $s0, 0x10($sp) +/* B70BA4 80240344 00031080 */ sll $v0, $v1, 2 +/* B70BA8 80240348 00431021 */ addu $v0, $v0, $v1 +/* B70BAC 8024034C 00021080 */ sll $v0, $v0, 2 +/* B70BB0 80240350 00431023 */ subu $v0, $v0, $v1 +/* B70BB4 80240354 000218C0 */ sll $v1, $v0, 3 +/* B70BB8 80240358 00431021 */ addu $v0, $v0, $v1 +/* B70BBC 8024035C 000210C0 */ sll $v0, $v0, 3 +/* B70BC0 80240360 3C01800B */ lui $at, 0x800b +/* B70BC4 80240364 00220821 */ addu $at, $at, $v0 +/* B70BC8 80240368 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* B70BCC 8024036C 460C0300 */ add.s $f12, $f0, $f12 +/* B70BD0 80240370 0C00A6C9 */ jal clamp_angle +/* B70BD4 80240374 0080802D */ daddu $s0, $a0, $zero +/* B70BD8 80240378 4600008D */ trunc.w.s $f2, $f0 +/* B70BDC 8024037C E6020084 */ swc1 $f2, 0x84($s0) +/* B70BE0 80240380 8FBF0014 */ lw $ra, 0x14($sp) +/* B70BE4 80240384 8FB00010 */ lw $s0, 0x10($sp) +/* B70BE8 80240388 24020002 */ addiu $v0, $zero, 2 +/* B70BEC 8024038C 03E00008 */ jr $ra +/* B70BF0 80240390 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438.s deleted file mode 100644 index e2a6644c81..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438.s +++ /dev/null @@ -1,236 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240438 -/* B70C98 80240438 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B70C9C 8024043C AFB3001C */ sw $s3, 0x1c($sp) -/* B70CA0 80240440 0080982D */ daddu $s3, $a0, $zero -/* B70CA4 80240444 AFBF0020 */ sw $ra, 0x20($sp) -/* B70CA8 80240448 AFB20018 */ sw $s2, 0x18($sp) -/* B70CAC 8024044C AFB10014 */ sw $s1, 0x14($sp) -/* B70CB0 80240450 AFB00010 */ sw $s0, 0x10($sp) -/* B70CB4 80240454 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* B70CB8 80240458 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B70CBC 8024045C F7B60030 */ sdc1 $f22, 0x30($sp) -/* B70CC0 80240460 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B70CC4 80240464 8E62000C */ lw $v0, 0xc($s3) -/* B70CC8 80240468 0C0B1EAF */ jal get_variable -/* B70CCC 8024046C 8C450000 */ lw $a1, ($v0) -/* B70CD0 80240470 2404FFFC */ addiu $a0, $zero, -4 -/* B70CD4 80240474 0C00EABB */ jal get_npc_unsafe -/* B70CD8 80240478 0040802D */ daddu $s0, $v0, $zero -/* B70CDC 8024047C 0200202D */ daddu $a0, $s0, $zero -/* B70CE0 80240480 0C046C04 */ jal get_model_list_index_from_tree_index -/* B70CE4 80240484 0040802D */ daddu $s0, $v0, $zero -/* B70CE8 80240488 0C046B4C */ jal get_model_from_list_index -/* B70CEC 8024048C 0040202D */ daddu $a0, $v0, $zero -/* B70CF0 80240490 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B70CF4 80240494 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B70CF8 80240498 0040902D */ daddu $s2, $v0, $zero -/* B70CFC 8024049C AE60008C */ sw $zero, 0x8c($s3) -/* B70D00 802404A0 C4620028 */ lwc1 $f2, 0x28($v1) -/* B70D04 802404A4 C6400098 */ lwc1 $f0, 0x98($s2) -/* B70D08 802404A8 46001081 */ sub.s $f2, $f2, $f0 -/* B70D0C 802404AC 46021182 */ mul.s $f6, $f2, $f2 -/* B70D10 802404B0 00000000 */ nop -/* B70D14 802404B4 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* B70D18 802404B8 C4620030 */ lwc1 $f2, 0x30($v1) -/* B70D1C 802404BC 46001081 */ sub.s $f2, $f2, $f0 -/* B70D20 802404C0 46021102 */ mul.s $f4, $f2, $f2 -/* B70D24 802404C4 00000000 */ nop -/* B70D28 802404C8 846200B0 */ lh $v0, 0xb0($v1) -/* B70D2C 802404CC C462002C */ lwc1 $f2, 0x2c($v1) -/* B70D30 802404D0 44820000 */ mtc1 $v0, $f0 -/* B70D34 802404D4 00000000 */ nop -/* B70D38 802404D8 46800020 */ cvt.s.w $f0, $f0 -/* B70D3C 802404DC 46001080 */ add.s $f2, $f2, $f0 -/* B70D40 802404E0 3C013FC0 */ lui $at, 0x3fc0 -/* B70D44 802404E4 44810000 */ mtc1 $at, $f0 -/* B70D48 802404E8 00000000 */ nop -/* B70D4C 802404EC 46001081 */ sub.s $f2, $f2, $f0 -/* B70D50 802404F0 46043300 */ add.s $f12, $f6, $f4 -/* B70D54 802404F4 C640009C */ lwc1 $f0, 0x9c($s2) -/* B70D58 802404F8 46001501 */ sub.s $f20, $f2, $f0 -/* B70D5C 802404FC 46006084 */ sqrt.s $f2, $f12 -/* B70D60 80240500 46021032 */ c.eq.s $f2, $f2 -/* B70D64 80240504 00000000 */ nop -/* B70D68 80240508 45010004 */ bc1t .L8024051C -/* B70D6C 8024050C 0060882D */ daddu $s1, $v1, $zero -/* B70D70 80240510 0C0187BC */ jal sqrtf -/* B70D74 80240514 00000000 */ nop -/* B70D78 80240518 46000086 */ mov.s $f2, $f0 -.L8024051C: -/* B70D7C 8024051C 44800000 */ mtc1 $zero, $f0 -/* B70D80 80240520 00000000 */ nop -/* B70D84 80240524 4614003C */ c.lt.s $f0, $f20 -/* B70D88 80240528 00000000 */ nop -/* B70D8C 8024052C 45000016 */ bc1f .L80240588 -/* B70D90 80240530 46001106 */ mov.s $f4, $f2 -/* B70D94 80240534 862200B0 */ lh $v0, 0xb0($s1) -/* B70D98 80240538 44820000 */ mtc1 $v0, $f0 -/* B70D9C 8024053C 00000000 */ nop -/* B70DA0 80240540 46800020 */ cvt.s.w $f0, $f0 -/* B70DA4 80240544 4600A03C */ c.lt.s $f20, $f0 -/* B70DA8 80240548 00000000 */ nop -/* B70DAC 8024054C 4500000E */ bc1f .L80240588 -/* B70DB0 80240550 00000000 */ nop -/* B70DB4 80240554 862200B2 */ lh $v0, 0xb2($s1) -/* B70DB8 80240558 3C013F00 */ lui $at, 0x3f00 -/* B70DBC 8024055C 44811000 */ mtc1 $at, $f2 -/* B70DC0 80240560 44820000 */ mtc1 $v0, $f0 -/* B70DC4 80240564 00000000 */ nop -/* B70DC8 80240568 46800020 */ cvt.s.w $f0, $f0 -/* B70DCC 8024056C 46020002 */ mul.s $f0, $f0, $f2 -/* B70DD0 80240570 00000000 */ nop -/* B70DD4 80240574 4600203C */ c.lt.s $f4, $f0 -/* B70DD8 80240578 00000000 */ nop -/* B70DDC 8024057C 45000002 */ bc1f .L80240588 -/* B70DE0 80240580 24020001 */ addiu $v0, $zero, 1 -/* B70DE4 80240584 AE62008C */ sw $v0, 0x8c($s3) -.L80240588: -/* B70DE8 80240588 C6020038 */ lwc1 $f2, 0x38($s0) -/* B70DEC 8024058C C6400098 */ lwc1 $f0, 0x98($s2) -/* B70DF0 80240590 46001081 */ sub.s $f2, $f2, $f0 -/* B70DF4 80240594 46021182 */ mul.s $f6, $f2, $f2 -/* B70DF8 80240598 00000000 */ nop -/* B70DFC 8024059C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* B70E00 802405A0 C6020040 */ lwc1 $f2, 0x40($s0) -/* B70E04 802405A4 46001081 */ sub.s $f2, $f2, $f0 -/* B70E08 802405A8 46021102 */ mul.s $f4, $f2, $f2 -/* B70E0C 802405AC 00000000 */ nop -/* B70E10 802405B0 860200A8 */ lh $v0, 0xa8($s0) -/* B70E14 802405B4 C602003C */ lwc1 $f2, 0x3c($s0) -/* B70E18 802405B8 44820000 */ mtc1 $v0, $f0 -/* B70E1C 802405BC 00000000 */ nop -/* B70E20 802405C0 46800020 */ cvt.s.w $f0, $f0 -/* B70E24 802405C4 46001080 */ add.s $f2, $f2, $f0 -/* B70E28 802405C8 3C013FC0 */ lui $at, 0x3fc0 -/* B70E2C 802405CC 44810000 */ mtc1 $at, $f0 -/* B70E30 802405D0 00000000 */ nop -/* B70E34 802405D4 46001081 */ sub.s $f2, $f2, $f0 -/* B70E38 802405D8 46043300 */ add.s $f12, $f6, $f4 -/* B70E3C 802405DC C640009C */ lwc1 $f0, 0x9c($s2) -/* B70E40 802405E0 46001501 */ sub.s $f20, $f2, $f0 -/* B70E44 802405E4 46006084 */ sqrt.s $f2, $f12 -/* B70E48 802405E8 46021032 */ c.eq.s $f2, $f2 -/* B70E4C 802405EC 00000000 */ nop -/* B70E50 802405F0 45010004 */ bc1t .L80240604 -/* B70E54 802405F4 00000000 */ nop -/* B70E58 802405F8 0C0187BC */ jal sqrtf -/* B70E5C 802405FC 00000000 */ nop -/* B70E60 80240600 46000086 */ mov.s $f2, $f0 -.L80240604: -/* B70E64 80240604 44800000 */ mtc1 $zero, $f0 -/* B70E68 80240608 00000000 */ nop -/* B70E6C 8024060C 4614003C */ c.lt.s $f0, $f20 -/* B70E70 80240610 00000000 */ nop -/* B70E74 80240614 45000016 */ bc1f .L80240670 -/* B70E78 80240618 46001106 */ mov.s $f4, $f2 -/* B70E7C 8024061C 860200A8 */ lh $v0, 0xa8($s0) -/* B70E80 80240620 44820000 */ mtc1 $v0, $f0 -/* B70E84 80240624 00000000 */ nop -/* B70E88 80240628 46800020 */ cvt.s.w $f0, $f0 -/* B70E8C 8024062C 4600A03C */ c.lt.s $f20, $f0 -/* B70E90 80240630 00000000 */ nop -/* B70E94 80240634 4500000F */ bc1f .L80240674 -/* B70E98 80240638 0000882D */ daddu $s1, $zero, $zero -/* B70E9C 8024063C 860200A6 */ lh $v0, 0xa6($s0) -/* B70EA0 80240640 3C013F00 */ lui $at, 0x3f00 -/* B70EA4 80240644 44811000 */ mtc1 $at, $f2 -/* B70EA8 80240648 44820000 */ mtc1 $v0, $f0 -/* B70EAC 8024064C 00000000 */ nop -/* B70EB0 80240650 46800020 */ cvt.s.w $f0, $f0 -/* B70EB4 80240654 46020002 */ mul.s $f0, $f0, $f2 -/* B70EB8 80240658 00000000 */ nop -/* B70EBC 8024065C 4600203C */ c.lt.s $f4, $f0 -/* B70EC0 80240660 00000000 */ nop -/* B70EC4 80240664 45000003 */ bc1f .L80240674 -/* B70EC8 80240668 24020001 */ addiu $v0, $zero, 1 -/* B70ECC 8024066C AE62008C */ sw $v0, 0x8c($s3) -.L80240670: -/* B70ED0 80240670 0000882D */ daddu $s1, $zero, $zero -.L80240674: -/* B70ED4 80240674 3C013FC0 */ lui $at, 0x3fc0 -/* B70ED8 80240678 4481D000 */ mtc1 $at, $f26 -/* B70EDC 8024067C 4480C000 */ mtc1 $zero, $f24 -/* B70EE0 80240680 3C013F00 */ lui $at, 0x3f00 -/* B70EE4 80240684 4481B000 */ mtc1 $at, $f22 -.L80240688: -/* B70EE8 80240688 0C00EAD2 */ jal get_npc_safe -/* B70EEC 8024068C 0220202D */ daddu $a0, $s1, $zero -/* B70EF0 80240690 0040802D */ daddu $s0, $v0, $zero -/* B70EF4 80240694 52000035 */ beql $s0, $zero, .L8024076C -/* B70EF8 80240698 26310001 */ addiu $s1, $s1, 1 -/* B70EFC 8024069C C6020038 */ lwc1 $f2, 0x38($s0) -/* B70F00 802406A0 C6400098 */ lwc1 $f0, 0x98($s2) -/* B70F04 802406A4 46001081 */ sub.s $f2, $f2, $f0 -/* B70F08 802406A8 46021182 */ mul.s $f6, $f2, $f2 -/* B70F0C 802406AC 00000000 */ nop -/* B70F10 802406B0 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* B70F14 802406B4 C6020040 */ lwc1 $f2, 0x40($s0) -/* B70F18 802406B8 46001081 */ sub.s $f2, $f2, $f0 -/* B70F1C 802406BC 46021102 */ mul.s $f4, $f2, $f2 -/* B70F20 802406C0 00000000 */ nop -/* B70F24 802406C4 860200A8 */ lh $v0, 0xa8($s0) -/* B70F28 802406C8 C602003C */ lwc1 $f2, 0x3c($s0) -/* B70F2C 802406CC 44820000 */ mtc1 $v0, $f0 -/* B70F30 802406D0 00000000 */ nop -/* B70F34 802406D4 46800020 */ cvt.s.w $f0, $f0 -/* B70F38 802406D8 46001080 */ add.s $f2, $f2, $f0 -/* B70F3C 802406DC 461A1081 */ sub.s $f2, $f2, $f26 -/* B70F40 802406E0 46043300 */ add.s $f12, $f6, $f4 -/* B70F44 802406E4 C640009C */ lwc1 $f0, 0x9c($s2) -/* B70F48 802406E8 46001501 */ sub.s $f20, $f2, $f0 -/* B70F4C 802406EC 46006004 */ sqrt.s $f0, $f12 -/* B70F50 802406F0 46000032 */ c.eq.s $f0, $f0 -/* B70F54 802406F4 00000000 */ nop -/* B70F58 802406F8 45010003 */ bc1t .L80240708 -/* B70F5C 802406FC 00000000 */ nop -/* B70F60 80240700 0C0187BC */ jal sqrtf -/* B70F64 80240704 00000000 */ nop -.L80240708: -/* B70F68 80240708 4614C03C */ c.lt.s $f24, $f20 -/* B70F6C 8024070C 00000000 */ nop -/* B70F70 80240710 45000015 */ bc1f .L80240768 -/* B70F74 80240714 46000106 */ mov.s $f4, $f0 -/* B70F78 80240718 860200A8 */ lh $v0, 0xa8($s0) -/* B70F7C 8024071C 44820000 */ mtc1 $v0, $f0 -/* B70F80 80240720 00000000 */ nop -/* B70F84 80240724 46800020 */ cvt.s.w $f0, $f0 -/* B70F88 80240728 4600A03C */ c.lt.s $f20, $f0 -/* B70F8C 8024072C 00000000 */ nop -/* B70F90 80240730 4500000E */ bc1f .L8024076C -/* B70F94 80240734 26310001 */ addiu $s1, $s1, 1 -/* B70F98 80240738 860200A6 */ lh $v0, 0xa6($s0) -/* B70F9C 8024073C 44820000 */ mtc1 $v0, $f0 -/* B70FA0 80240740 00000000 */ nop -/* B70FA4 80240744 46800020 */ cvt.s.w $f0, $f0 -/* B70FA8 80240748 46160002 */ mul.s $f0, $f0, $f22 -/* B70FAC 8024074C 00000000 */ nop -/* B70FB0 80240750 4600203C */ c.lt.s $f4, $f0 -/* B70FB4 80240754 00000000 */ nop -/* B70FB8 80240758 45000004 */ bc1f .L8024076C -/* B70FBC 8024075C 24020001 */ addiu $v0, $zero, 1 -/* B70FC0 80240760 080901DE */ j .L80240778 -/* B70FC4 80240764 AE62008C */ sw $v0, 0x8c($s3) -.L80240768: -/* B70FC8 80240768 26310001 */ addiu $s1, $s1, 1 -.L8024076C: -/* B70FCC 8024076C 2A220040 */ slti $v0, $s1, 0x40 -/* B70FD0 80240770 1440FFC5 */ bnez $v0, .L80240688 -/* B70FD4 80240774 00000000 */ nop -.L80240778: -/* B70FD8 80240778 8FBF0020 */ lw $ra, 0x20($sp) -/* B70FDC 8024077C 8FB3001C */ lw $s3, 0x1c($sp) -/* B70FE0 80240780 8FB20018 */ lw $s2, 0x18($sp) -/* B70FE4 80240784 8FB10014 */ lw $s1, 0x14($sp) -/* B70FE8 80240788 8FB00010 */ lw $s0, 0x10($sp) -/* B70FEC 8024078C D7BA0040 */ ldc1 $f26, 0x40($sp) -/* B70FF0 80240790 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B70FF4 80240794 D7B60030 */ ldc1 $f22, 0x30($sp) -/* B70FF8 80240798 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B70FFC 8024079C 24020002 */ addiu $v0, $zero, 2 -/* B71000 802407A0 03E00008 */ jr $ra -/* B71004 802407A4 27BD0048 */ addiu $sp, $sp, 0x48 -/* B71008 802407A8 00000000 */ nop -/* B7100C 802407AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s new file mode 100644 index 0000000000..7add07fba2 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_11/B70860/func_80240438_B70C98.s @@ -0,0 +1,236 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240438_B70C98 +/* B70C98 80240438 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B70C9C 8024043C AFB3001C */ sw $s3, 0x1c($sp) +/* B70CA0 80240440 0080982D */ daddu $s3, $a0, $zero +/* B70CA4 80240444 AFBF0020 */ sw $ra, 0x20($sp) +/* B70CA8 80240448 AFB20018 */ sw $s2, 0x18($sp) +/* B70CAC 8024044C AFB10014 */ sw $s1, 0x14($sp) +/* B70CB0 80240450 AFB00010 */ sw $s0, 0x10($sp) +/* B70CB4 80240454 F7BA0040 */ sdc1 $f26, 0x40($sp) +/* B70CB8 80240458 F7B80038 */ sdc1 $f24, 0x38($sp) +/* B70CBC 8024045C F7B60030 */ sdc1 $f22, 0x30($sp) +/* B70CC0 80240460 F7B40028 */ sdc1 $f20, 0x28($sp) +/* B70CC4 80240464 8E62000C */ lw $v0, 0xc($s3) +/* B70CC8 80240468 0C0B1EAF */ jal get_variable +/* B70CCC 8024046C 8C450000 */ lw $a1, ($v0) +/* B70CD0 80240470 2404FFFC */ addiu $a0, $zero, -4 +/* B70CD4 80240474 0C00EABB */ jal get_npc_unsafe +/* B70CD8 80240478 0040802D */ daddu $s0, $v0, $zero +/* B70CDC 8024047C 0200202D */ daddu $a0, $s0, $zero +/* B70CE0 80240480 0C046C04 */ jal get_model_list_index_from_tree_index +/* B70CE4 80240484 0040802D */ daddu $s0, $v0, $zero +/* B70CE8 80240488 0C046B4C */ jal get_model_from_list_index +/* B70CEC 8024048C 0040202D */ daddu $a0, $v0, $zero +/* B70CF0 80240490 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* B70CF4 80240494 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* B70CF8 80240498 0040902D */ daddu $s2, $v0, $zero +/* B70CFC 8024049C AE60008C */ sw $zero, 0x8c($s3) +/* B70D00 802404A0 C4620028 */ lwc1 $f2, 0x28($v1) +/* B70D04 802404A4 C6400098 */ lwc1 $f0, 0x98($s2) +/* B70D08 802404A8 46001081 */ sub.s $f2, $f2, $f0 +/* B70D0C 802404AC 46021182 */ mul.s $f6, $f2, $f2 +/* B70D10 802404B0 00000000 */ nop +/* B70D14 802404B4 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* B70D18 802404B8 C4620030 */ lwc1 $f2, 0x30($v1) +/* B70D1C 802404BC 46001081 */ sub.s $f2, $f2, $f0 +/* B70D20 802404C0 46021102 */ mul.s $f4, $f2, $f2 +/* B70D24 802404C4 00000000 */ nop +/* B70D28 802404C8 846200B0 */ lh $v0, 0xb0($v1) +/* B70D2C 802404CC C462002C */ lwc1 $f2, 0x2c($v1) +/* B70D30 802404D0 44820000 */ mtc1 $v0, $f0 +/* B70D34 802404D4 00000000 */ nop +/* B70D38 802404D8 46800020 */ cvt.s.w $f0, $f0 +/* B70D3C 802404DC 46001080 */ add.s $f2, $f2, $f0 +/* B70D40 802404E0 3C013FC0 */ lui $at, 0x3fc0 +/* B70D44 802404E4 44810000 */ mtc1 $at, $f0 +/* B70D48 802404E8 00000000 */ nop +/* B70D4C 802404EC 46001081 */ sub.s $f2, $f2, $f0 +/* B70D50 802404F0 46043300 */ add.s $f12, $f6, $f4 +/* B70D54 802404F4 C640009C */ lwc1 $f0, 0x9c($s2) +/* B70D58 802404F8 46001501 */ sub.s $f20, $f2, $f0 +/* B70D5C 802404FC 46006084 */ sqrt.s $f2, $f12 +/* B70D60 80240500 46021032 */ c.eq.s $f2, $f2 +/* B70D64 80240504 00000000 */ nop +/* B70D68 80240508 45010004 */ bc1t .L8024051C +/* B70D6C 8024050C 0060882D */ daddu $s1, $v1, $zero +/* B70D70 80240510 0C0187BC */ jal sqrtf +/* B70D74 80240514 00000000 */ nop +/* B70D78 80240518 46000086 */ mov.s $f2, $f0 +.L8024051C: +/* B70D7C 8024051C 44800000 */ mtc1 $zero, $f0 +/* B70D80 80240520 00000000 */ nop +/* B70D84 80240524 4614003C */ c.lt.s $f0, $f20 +/* B70D88 80240528 00000000 */ nop +/* B70D8C 8024052C 45000016 */ bc1f .L80240588 +/* B70D90 80240530 46001106 */ mov.s $f4, $f2 +/* B70D94 80240534 862200B0 */ lh $v0, 0xb0($s1) +/* B70D98 80240538 44820000 */ mtc1 $v0, $f0 +/* B70D9C 8024053C 00000000 */ nop +/* B70DA0 80240540 46800020 */ cvt.s.w $f0, $f0 +/* B70DA4 80240544 4600A03C */ c.lt.s $f20, $f0 +/* B70DA8 80240548 00000000 */ nop +/* B70DAC 8024054C 4500000E */ bc1f .L80240588 +/* B70DB0 80240550 00000000 */ nop +/* B70DB4 80240554 862200B2 */ lh $v0, 0xb2($s1) +/* B70DB8 80240558 3C013F00 */ lui $at, 0x3f00 +/* B70DBC 8024055C 44811000 */ mtc1 $at, $f2 +/* B70DC0 80240560 44820000 */ mtc1 $v0, $f0 +/* B70DC4 80240564 00000000 */ nop +/* B70DC8 80240568 46800020 */ cvt.s.w $f0, $f0 +/* B70DCC 8024056C 46020002 */ mul.s $f0, $f0, $f2 +/* B70DD0 80240570 00000000 */ nop +/* B70DD4 80240574 4600203C */ c.lt.s $f4, $f0 +/* B70DD8 80240578 00000000 */ nop +/* B70DDC 8024057C 45000002 */ bc1f .L80240588 +/* B70DE0 80240580 24020001 */ addiu $v0, $zero, 1 +/* B70DE4 80240584 AE62008C */ sw $v0, 0x8c($s3) +.L80240588: +/* B70DE8 80240588 C6020038 */ lwc1 $f2, 0x38($s0) +/* B70DEC 8024058C C6400098 */ lwc1 $f0, 0x98($s2) +/* B70DF0 80240590 46001081 */ sub.s $f2, $f2, $f0 +/* B70DF4 80240594 46021182 */ mul.s $f6, $f2, $f2 +/* B70DF8 80240598 00000000 */ nop +/* B70DFC 8024059C C64000A0 */ lwc1 $f0, 0xa0($s2) +/* B70E00 802405A0 C6020040 */ lwc1 $f2, 0x40($s0) +/* B70E04 802405A4 46001081 */ sub.s $f2, $f2, $f0 +/* B70E08 802405A8 46021102 */ mul.s $f4, $f2, $f2 +/* B70E0C 802405AC 00000000 */ nop +/* B70E10 802405B0 860200A8 */ lh $v0, 0xa8($s0) +/* B70E14 802405B4 C602003C */ lwc1 $f2, 0x3c($s0) +/* B70E18 802405B8 44820000 */ mtc1 $v0, $f0 +/* B70E1C 802405BC 00000000 */ nop +/* B70E20 802405C0 46800020 */ cvt.s.w $f0, $f0 +/* B70E24 802405C4 46001080 */ add.s $f2, $f2, $f0 +/* B70E28 802405C8 3C013FC0 */ lui $at, 0x3fc0 +/* B70E2C 802405CC 44810000 */ mtc1 $at, $f0 +/* B70E30 802405D0 00000000 */ nop +/* B70E34 802405D4 46001081 */ sub.s $f2, $f2, $f0 +/* B70E38 802405D8 46043300 */ add.s $f12, $f6, $f4 +/* B70E3C 802405DC C640009C */ lwc1 $f0, 0x9c($s2) +/* B70E40 802405E0 46001501 */ sub.s $f20, $f2, $f0 +/* B70E44 802405E4 46006084 */ sqrt.s $f2, $f12 +/* B70E48 802405E8 46021032 */ c.eq.s $f2, $f2 +/* B70E4C 802405EC 00000000 */ nop +/* B70E50 802405F0 45010004 */ bc1t .L80240604 +/* B70E54 802405F4 00000000 */ nop +/* B70E58 802405F8 0C0187BC */ jal sqrtf +/* B70E5C 802405FC 00000000 */ nop +/* B70E60 80240600 46000086 */ mov.s $f2, $f0 +.L80240604: +/* B70E64 80240604 44800000 */ mtc1 $zero, $f0 +/* B70E68 80240608 00000000 */ nop +/* B70E6C 8024060C 4614003C */ c.lt.s $f0, $f20 +/* B70E70 80240610 00000000 */ nop +/* B70E74 80240614 45000016 */ bc1f .L80240670 +/* B70E78 80240618 46001106 */ mov.s $f4, $f2 +/* B70E7C 8024061C 860200A8 */ lh $v0, 0xa8($s0) +/* B70E80 80240620 44820000 */ mtc1 $v0, $f0 +/* B70E84 80240624 00000000 */ nop +/* B70E88 80240628 46800020 */ cvt.s.w $f0, $f0 +/* B70E8C 8024062C 4600A03C */ c.lt.s $f20, $f0 +/* B70E90 80240630 00000000 */ nop +/* B70E94 80240634 4500000F */ bc1f .L80240674 +/* B70E98 80240638 0000882D */ daddu $s1, $zero, $zero +/* B70E9C 8024063C 860200A6 */ lh $v0, 0xa6($s0) +/* B70EA0 80240640 3C013F00 */ lui $at, 0x3f00 +/* B70EA4 80240644 44811000 */ mtc1 $at, $f2 +/* B70EA8 80240648 44820000 */ mtc1 $v0, $f0 +/* B70EAC 8024064C 00000000 */ nop +/* B70EB0 80240650 46800020 */ cvt.s.w $f0, $f0 +/* B70EB4 80240654 46020002 */ mul.s $f0, $f0, $f2 +/* B70EB8 80240658 00000000 */ nop +/* B70EBC 8024065C 4600203C */ c.lt.s $f4, $f0 +/* B70EC0 80240660 00000000 */ nop +/* B70EC4 80240664 45000003 */ bc1f .L80240674 +/* B70EC8 80240668 24020001 */ addiu $v0, $zero, 1 +/* B70ECC 8024066C AE62008C */ sw $v0, 0x8c($s3) +.L80240670: +/* B70ED0 80240670 0000882D */ daddu $s1, $zero, $zero +.L80240674: +/* B70ED4 80240674 3C013FC0 */ lui $at, 0x3fc0 +/* B70ED8 80240678 4481D000 */ mtc1 $at, $f26 +/* B70EDC 8024067C 4480C000 */ mtc1 $zero, $f24 +/* B70EE0 80240680 3C013F00 */ lui $at, 0x3f00 +/* B70EE4 80240684 4481B000 */ mtc1 $at, $f22 +.L80240688: +/* B70EE8 80240688 0C00EAD2 */ jal get_npc_safe +/* B70EEC 8024068C 0220202D */ daddu $a0, $s1, $zero +/* B70EF0 80240690 0040802D */ daddu $s0, $v0, $zero +/* B70EF4 80240694 52000035 */ beql $s0, $zero, .L8024076C +/* B70EF8 80240698 26310001 */ addiu $s1, $s1, 1 +/* B70EFC 8024069C C6020038 */ lwc1 $f2, 0x38($s0) +/* B70F00 802406A0 C6400098 */ lwc1 $f0, 0x98($s2) +/* B70F04 802406A4 46001081 */ sub.s $f2, $f2, $f0 +/* B70F08 802406A8 46021182 */ mul.s $f6, $f2, $f2 +/* B70F0C 802406AC 00000000 */ nop +/* B70F10 802406B0 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* B70F14 802406B4 C6020040 */ lwc1 $f2, 0x40($s0) +/* B70F18 802406B8 46001081 */ sub.s $f2, $f2, $f0 +/* B70F1C 802406BC 46021102 */ mul.s $f4, $f2, $f2 +/* B70F20 802406C0 00000000 */ nop +/* B70F24 802406C4 860200A8 */ lh $v0, 0xa8($s0) +/* B70F28 802406C8 C602003C */ lwc1 $f2, 0x3c($s0) +/* B70F2C 802406CC 44820000 */ mtc1 $v0, $f0 +/* B70F30 802406D0 00000000 */ nop +/* B70F34 802406D4 46800020 */ cvt.s.w $f0, $f0 +/* B70F38 802406D8 46001080 */ add.s $f2, $f2, $f0 +/* B70F3C 802406DC 461A1081 */ sub.s $f2, $f2, $f26 +/* B70F40 802406E0 46043300 */ add.s $f12, $f6, $f4 +/* B70F44 802406E4 C640009C */ lwc1 $f0, 0x9c($s2) +/* B70F48 802406E8 46001501 */ sub.s $f20, $f2, $f0 +/* B70F4C 802406EC 46006004 */ sqrt.s $f0, $f12 +/* B70F50 802406F0 46000032 */ c.eq.s $f0, $f0 +/* B70F54 802406F4 00000000 */ nop +/* B70F58 802406F8 45010003 */ bc1t .L80240708 +/* B70F5C 802406FC 00000000 */ nop +/* B70F60 80240700 0C0187BC */ jal sqrtf +/* B70F64 80240704 00000000 */ nop +.L80240708: +/* B70F68 80240708 4614C03C */ c.lt.s $f24, $f20 +/* B70F6C 8024070C 00000000 */ nop +/* B70F70 80240710 45000015 */ bc1f .L80240768 +/* B70F74 80240714 46000106 */ mov.s $f4, $f0 +/* B70F78 80240718 860200A8 */ lh $v0, 0xa8($s0) +/* B70F7C 8024071C 44820000 */ mtc1 $v0, $f0 +/* B70F80 80240720 00000000 */ nop +/* B70F84 80240724 46800020 */ cvt.s.w $f0, $f0 +/* B70F88 80240728 4600A03C */ c.lt.s $f20, $f0 +/* B70F8C 8024072C 00000000 */ nop +/* B70F90 80240730 4500000E */ bc1f .L8024076C +/* B70F94 80240734 26310001 */ addiu $s1, $s1, 1 +/* B70F98 80240738 860200A6 */ lh $v0, 0xa6($s0) +/* B70F9C 8024073C 44820000 */ mtc1 $v0, $f0 +/* B70FA0 80240740 00000000 */ nop +/* B70FA4 80240744 46800020 */ cvt.s.w $f0, $f0 +/* B70FA8 80240748 46160002 */ mul.s $f0, $f0, $f22 +/* B70FAC 8024074C 00000000 */ nop +/* B70FB0 80240750 4600203C */ c.lt.s $f4, $f0 +/* B70FB4 80240754 00000000 */ nop +/* B70FB8 80240758 45000004 */ bc1f .L8024076C +/* B70FBC 8024075C 24020001 */ addiu $v0, $zero, 1 +/* B70FC0 80240760 080901DE */ j .L80240778 +/* B70FC4 80240764 AE62008C */ sw $v0, 0x8c($s3) +.L80240768: +/* B70FC8 80240768 26310001 */ addiu $s1, $s1, 1 +.L8024076C: +/* B70FCC 8024076C 2A220040 */ slti $v0, $s1, 0x40 +/* B70FD0 80240770 1440FFC5 */ bnez $v0, .L80240688 +/* B70FD4 80240774 00000000 */ nop +.L80240778: +/* B70FD8 80240778 8FBF0020 */ lw $ra, 0x20($sp) +/* B70FDC 8024077C 8FB3001C */ lw $s3, 0x1c($sp) +/* B70FE0 80240780 8FB20018 */ lw $s2, 0x18($sp) +/* B70FE4 80240784 8FB10014 */ lw $s1, 0x14($sp) +/* B70FE8 80240788 8FB00010 */ lw $s0, 0x10($sp) +/* B70FEC 8024078C D7BA0040 */ ldc1 $f26, 0x40($sp) +/* B70FF0 80240790 D7B80038 */ ldc1 $f24, 0x38($sp) +/* B70FF4 80240794 D7B60030 */ ldc1 $f22, 0x30($sp) +/* B70FF8 80240798 D7B40028 */ ldc1 $f20, 0x28($sp) +/* B70FFC 8024079C 24020002 */ addiu $v0, $zero, 2 +/* B71000 802407A0 03E00008 */ jr $ra +/* B71004 802407A4 27BD0048 */ addiu $sp, $sp, 0x48 +/* B71008 802407A8 00000000 */ nop +/* B7100C 802407AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407B0.s b/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407B0.s deleted file mode 100644 index a78f1d1f4c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407B0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407B0 -/* B71010 802407B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B71014 802407B4 AFBF0010 */ sw $ra, 0x10($sp) -/* B71018 802407B8 8C82000C */ lw $v0, 0xc($a0) -/* B7101C 802407BC 3C068016 */ lui $a2, 0x8016 -/* B71020 802407C0 84C6A552 */ lh $a2, -0x5aae($a2) -/* B71024 802407C4 0C0B2026 */ jal set_variable -/* B71028 802407C8 8C450000 */ lw $a1, ($v0) -/* B7102C 802407CC 8FBF0010 */ lw $ra, 0x10($sp) -/* B71030 802407D0 24020002 */ addiu $v0, $zero, 2 -/* B71034 802407D4 03E00008 */ jr $ra -/* B71038 802407D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407B0_B71010.s b/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407B0_B71010.s new file mode 100644 index 0000000000..680cc22941 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407B0_B71010.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407B0_B71010 +/* B71010 802407B0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B71014 802407B4 AFBF0010 */ sw $ra, 0x10($sp) +/* B71018 802407B8 8C82000C */ lw $v0, 0xc($a0) +/* B7101C 802407BC 3C068016 */ lui $a2, 0x8016 +/* B71020 802407C0 84C6A552 */ lh $a2, -0x5aae($a2) +/* B71024 802407C4 0C0B2026 */ jal set_variable +/* B71028 802407C8 8C450000 */ lw $a1, ($v0) +/* B7102C 802407CC 8FBF0010 */ lw $ra, 0x10($sp) +/* B71030 802407D0 24020002 */ addiu $v0, $zero, 2 +/* B71034 802407D4 03E00008 */ jr $ra +/* B71038 802407D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC.s b/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC.s deleted file mode 100644 index cd4dcf9ef3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407DC -/* B7103C 802407DC 3C038011 */ lui $v1, 0x8011 -/* B71040 802407E0 8063EBB3 */ lb $v1, -0x144d($v1) -/* B71044 802407E4 24020006 */ addiu $v0, $zero, 6 -/* B71048 802407E8 54620003 */ bnel $v1, $v0, .L802407F8 -/* B7104C 802407EC AC8000A8 */ sw $zero, 0xa8($a0) -/* B71050 802407F0 24020001 */ addiu $v0, $zero, 1 -/* B71054 802407F4 AC8200A8 */ sw $v0, 0xa8($a0) -.L802407F8: -/* B71058 802407F8 03E00008 */ jr $ra -/* B7105C 802407FC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s b/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s new file mode 100644 index 0000000000..332765c51a --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_11/B71010/func_802407DC_B7103C.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407DC_B7103C +/* B7103C 802407DC 3C038011 */ lui $v1, 0x8011 +/* B71040 802407E0 8063EBB3 */ lb $v1, -0x144d($v1) +/* B71044 802407E4 24020006 */ addiu $v0, $zero, 6 +/* B71048 802407E8 54620003 */ bnel $v1, $v0, .L802407F8 +/* B7104C 802407EC AC8000A8 */ sw $zero, 0xa8($a0) +/* B71050 802407F0 24020001 */ addiu $v0, $zero, 1 +/* B71054 802407F4 AC8200A8 */ sw $v0, 0xa8($a0) +.L802407F8: +/* B71058 802407F8 03E00008 */ jr $ra +/* B7105C 802407FC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8.s b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8.s deleted file mode 100644 index 7b2962ff9c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F8 -/* B731A8 802400F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B731AC 802400FC AFB10014 */ sw $s1, 0x14($sp) -/* B731B0 80240100 0080882D */ daddu $s1, $a0, $zero -/* B731B4 80240104 AFBF0018 */ sw $ra, 0x18($sp) -/* B731B8 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* B731BC 8024010C F7B40020 */ sdc1 $f20, 0x20($sp) -/* B731C0 80240110 8E30000C */ lw $s0, 0xc($s1) -/* B731C4 80240114 8E050000 */ lw $a1, ($s0) -/* B731C8 80240118 0C0B210B */ jal get_float_variable -/* B731CC 8024011C 26100004 */ addiu $s0, $s0, 4 -/* B731D0 80240120 8E050000 */ lw $a1, ($s0) -/* B731D4 80240124 26100004 */ addiu $s0, $s0, 4 -/* B731D8 80240128 0220202D */ daddu $a0, $s1, $zero -/* B731DC 8024012C 0C0B210B */ jal get_float_variable -/* B731E0 80240130 46000506 */ mov.s $f20, $f0 -/* B731E4 80240134 46140001 */ sub.s $f0, $f0, $f20 -/* B731E8 80240138 3C014120 */ lui $at, 0x4120 -/* B731EC 8024013C 44811000 */ mtc1 $at, $f2 -/* B731F0 80240140 8E050000 */ lw $a1, ($s0) -/* B731F4 80240144 46020003 */ div.s $f0, $f0, $f2 -/* B731F8 80240148 44060000 */ mfc1 $a2, $f0 -/* B731FC 8024014C 0C0B2190 */ jal set_float_variable -/* B73200 80240150 0220202D */ daddu $a0, $s1, $zero -/* B73204 80240154 8FBF0018 */ lw $ra, 0x18($sp) -/* B73208 80240158 8FB10014 */ lw $s1, 0x14($sp) -/* B7320C 8024015C 8FB00010 */ lw $s0, 0x10($sp) -/* B73210 80240160 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B73214 80240164 24020002 */ addiu $v0, $zero, 2 -/* B73218 80240168 03E00008 */ jr $ra -/* B7321C 8024016C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s new file mode 100644 index 0000000000..fc6349ddcc --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802400F8_B731A8.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400F8_B731A8 +/* B731A8 802400F8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B731AC 802400FC AFB10014 */ sw $s1, 0x14($sp) +/* B731B0 80240100 0080882D */ daddu $s1, $a0, $zero +/* B731B4 80240104 AFBF0018 */ sw $ra, 0x18($sp) +/* B731B8 80240108 AFB00010 */ sw $s0, 0x10($sp) +/* B731BC 8024010C F7B40020 */ sdc1 $f20, 0x20($sp) +/* B731C0 80240110 8E30000C */ lw $s0, 0xc($s1) +/* B731C4 80240114 8E050000 */ lw $a1, ($s0) +/* B731C8 80240118 0C0B210B */ jal get_float_variable +/* B731CC 8024011C 26100004 */ addiu $s0, $s0, 4 +/* B731D0 80240120 8E050000 */ lw $a1, ($s0) +/* B731D4 80240124 26100004 */ addiu $s0, $s0, 4 +/* B731D8 80240128 0220202D */ daddu $a0, $s1, $zero +/* B731DC 8024012C 0C0B210B */ jal get_float_variable +/* B731E0 80240130 46000506 */ mov.s $f20, $f0 +/* B731E4 80240134 46140001 */ sub.s $f0, $f0, $f20 +/* B731E8 80240138 3C014120 */ lui $at, 0x4120 +/* B731EC 8024013C 44811000 */ mtc1 $at, $f2 +/* B731F0 80240140 8E050000 */ lw $a1, ($s0) +/* B731F4 80240144 46020003 */ div.s $f0, $f0, $f2 +/* B731F8 80240148 44060000 */ mfc1 $a2, $f0 +/* B731FC 8024014C 0C0B2190 */ jal set_float_variable +/* B73200 80240150 0220202D */ daddu $a0, $s1, $zero +/* B73204 80240154 8FBF0018 */ lw $ra, 0x18($sp) +/* B73208 80240158 8FB10014 */ lw $s1, 0x14($sp) +/* B7320C 8024015C 8FB00010 */ lw $s0, 0x10($sp) +/* B73210 80240160 D7B40020 */ ldc1 $f20, 0x20($sp) +/* B73214 80240164 24020002 */ addiu $v0, $zero, 2 +/* B73218 80240168 03E00008 */ jr $ra +/* B7321C 8024016C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s index 211ee62865..6121e83094 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802401CC_B7327C.s @@ -27,7 +27,7 @@ glabel func_802401CC_B7327C /* B732D4 80240224 14400008 */ bnez $v0, .L80240248 /* B732D8 80240228 00000000 */ nop /* B732DC 8024022C 4405A000 */ mfc1 $a1, $f20 -/* B732E0 80240230 0C09005C */ jal func_80240170 +/* B732E0 80240230 0C09005C */ jal func_80240170_B73220 /* B732E4 80240234 26040058 */ addiu $a0, $s0, 0x58 /* B732E8 80240238 96020000 */ lhu $v0, ($s0) /* B732EC 8024023C 34421400 */ ori $v0, $v0, 0x1400 @@ -35,7 +35,7 @@ glabel func_802401CC_B7327C /* B732F4 80240244 A6020000 */ sh $v0, ($s0) .L80240248: /* B732F8 80240248 4405A000 */ mfc1 $a1, $f20 -/* B732FC 8024024C 0C09005C */ jal func_80240170 +/* B732FC 8024024C 0C09005C */ jal func_80240170_B73220 /* B73300 80240250 27A40010 */ addiu $a0, $sp, 0x10 /* B73304 80240254 27A40010 */ addiu $a0, $sp, 0x10 /* B73308 80240258 26050058 */ addiu $a1, $s0, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802402F0_B733A0.s b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802402F0_B733A0.s index 3f40f3effa..725235323c 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802402F0_B733A0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B730B0/func_802402F0_B733A0.s @@ -55,7 +55,7 @@ glabel func_802402F0_B733A0 /* B73468 802403B8 4405E000 */ mfc1 $a1, $f28 /* B7346C 802403BC 4406D000 */ mfc1 $a2, $f26 /* B73470 802403C0 4407C000 */ mfc1 $a3, $f24 -/* B73474 802403C4 0C0900A0 */ jal func_80240280 +/* B73474 802403C4 0C0900A0 */ jal func_80240280_B73330 /* B73478 802403C8 27A40010 */ addiu $a0, $sp, 0x10 /* B7347C 802403CC 27A40010 */ addiu $a0, $sp, 0x10 /* B73480 802403D0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802402F0_B733A0 /* B734F0 80240440 4405E000 */ mfc1 $a1, $f28 /* B734F4 80240444 4406D000 */ mfc1 $a2, $f26 /* B734F8 80240448 4407C000 */ mfc1 $a3, $f24 -/* B734FC 8024044C 0C0900A0 */ jal func_80240280 +/* B734FC 8024044C 0C0900A0 */ jal func_80240280_B73330 /* B73500 80240450 27A40010 */ addiu $a0, $sp, 0x10 /* B73504 80240454 27A40010 */ addiu $a0, $sp, 0x10 /* B73508 80240458 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90.s deleted file mode 100644 index 46156b111a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A90 -/* B73B40 80240A90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B73B44 80240A94 AFB40028 */ sw $s4, 0x28($sp) -/* B73B48 80240A98 0080A02D */ daddu $s4, $a0, $zero -/* B73B4C 80240A9C AFBF002C */ sw $ra, 0x2c($sp) -/* B73B50 80240AA0 AFB30024 */ sw $s3, 0x24($sp) -/* B73B54 80240AA4 AFB20020 */ sw $s2, 0x20($sp) -/* B73B58 80240AA8 AFB1001C */ sw $s1, 0x1c($sp) -/* B73B5C 80240AAC AFB00018 */ sw $s0, 0x18($sp) -/* B73B60 80240AB0 8E910148 */ lw $s1, 0x148($s4) -/* B73B64 80240AB4 86240008 */ lh $a0, 8($s1) -/* B73B68 80240AB8 0C00EABB */ jal get_npc_unsafe -/* B73B6C 80240ABC 00A0802D */ daddu $s0, $a1, $zero -/* B73B70 80240AC0 16000005 */ bnez $s0, .L80240AD8 -/* B73B74 80240AC4 0040902D */ daddu $s2, $v0, $zero -/* B73B78 80240AC8 8E2200B0 */ lw $v0, 0xb0($s1) -/* B73B7C 80240ACC 30420004 */ andi $v0, $v0, 4 -/* B73B80 80240AD0 10400015 */ beqz $v0, .L80240B28 -/* B73B84 80240AD4 00000000 */ nop -.L80240AD8: -/* B73B88 80240AD8 AE800070 */ sw $zero, 0x70($s4) -/* B73B8C 80240ADC 8E420000 */ lw $v0, ($s2) -/* B73B90 80240AE0 3C031F30 */ lui $v1, 0x1f30 -/* B73B94 80240AE4 A640008E */ sh $zero, 0x8e($s2) -/* B73B98 80240AE8 34420102 */ ori $v0, $v0, 0x102 -/* B73B9C 80240AEC AE420000 */ sw $v0, ($s2) -/* B73BA0 80240AF0 8E220000 */ lw $v0, ($s1) -/* B73BA4 80240AF4 3C01C47A */ lui $at, 0xc47a -/* B73BA8 80240AF8 44810000 */ mtc1 $at, $f0 -/* B73BAC 80240AFC 00431025 */ or $v0, $v0, $v1 -/* B73BB0 80240B00 AE220000 */ sw $v0, ($s1) -/* B73BB4 80240B04 AE400038 */ sw $zero, 0x38($s2) -/* B73BB8 80240B08 E640003C */ swc1 $f0, 0x3c($s2) -/* B73BBC 80240B0C AE400040 */ sw $zero, 0x40($s2) -/* B73BC0 80240B10 8E2300B0 */ lw $v1, 0xb0($s1) -/* B73BC4 80240B14 30620004 */ andi $v0, $v1, 4 -/* B73BC8 80240B18 10400003 */ beqz $v0, .L80240B28 -/* B73BCC 80240B1C 2402FFFB */ addiu $v0, $zero, -5 -/* B73BD0 80240B20 00621024 */ and $v0, $v1, $v0 -/* B73BD4 80240B24 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240B28: -/* B73BD8 80240B28 8E930070 */ lw $s3, 0x70($s4) -/* B73BDC 80240B2C 12600005 */ beqz $s3, .L80240B44 -/* B73BE0 80240B30 24020001 */ addiu $v0, $zero, 1 -/* B73BE4 80240B34 12620048 */ beq $s3, $v0, .L80240C58 -/* B73BE8 80240B38 00000000 */ nop -/* B73BEC 80240B3C 08090333 */ j .L80240CCC -/* B73BF0 80240B40 00000000 */ nop -.L80240B44: -/* B73BF4 80240B44 86240008 */ lh $a0, 8($s1) -/* B73BF8 80240B48 0C00FB3A */ jal get_enemy -/* B73BFC 80240B4C 2484FFFF */ addiu $a0, $a0, -1 -/* B73C00 80240B50 0040802D */ daddu $s0, $v0, $zero -/* B73C04 80240B54 0C00EABB */ jal get_npc_unsafe -/* B73C08 80240B58 86040008 */ lh $a0, 8($s0) -/* B73C0C 80240B5C 24030001 */ addiu $v1, $zero, 1 -/* B73C10 80240B60 0040982D */ daddu $s3, $v0, $zero -/* B73C14 80240B64 A2230007 */ sb $v1, 7($s1) -/* B73C18 80240B68 8E03006C */ lw $v1, 0x6c($s0) -/* B73C1C 80240B6C 24020003 */ addiu $v0, $zero, 3 -/* B73C20 80240B70 14620056 */ bne $v1, $v0, .L80240CCC -/* B73C24 80240B74 00000000 */ nop -/* B73C28 80240B78 8E2500A8 */ lw $a1, 0xa8($s1) -/* B73C2C 80240B7C 10A00003 */ beqz $a1, .L80240B8C -/* B73C30 80240B80 0260202D */ daddu $a0, $s3, $zero -/* B73C34 80240B84 0C012530 */ jal func_800494C0 -/* B73C38 80240B88 0000302D */ daddu $a2, $zero, $zero -.L80240B8C: -/* B73C3C 80240B8C 27A40010 */ addiu $a0, $sp, 0x10 -/* B73C40 80240B90 C6280070 */ lwc1 $f8, 0x70($s1) -/* B73C44 80240B94 46804220 */ cvt.s.w $f8, $f8 -/* B73C48 80240B98 C6620034 */ lwc1 $f2, 0x34($s3) -/* B73C4C 80240B9C 3C014387 */ lui $at, 0x4387 -/* B73C50 80240BA0 44810000 */ mtc1 $at, $f0 -/* B73C54 80240BA4 44064000 */ mfc1 $a2, $f8 -/* B73C58 80240BA8 46020001 */ sub.s $f0, $f0, $f2 -/* B73C5C 80240BAC C6660038 */ lwc1 $f6, 0x38($s3) -/* B73C60 80240BB0 C6640040 */ lwc1 $f4, 0x40($s3) -/* B73C64 80240BB4 44070000 */ mfc1 $a3, $f0 -/* B73C68 80240BB8 27A50014 */ addiu $a1, $sp, 0x14 -/* B73C6C 80240BBC E7A60010 */ swc1 $f6, 0x10($sp) -/* B73C70 80240BC0 0C00A7E7 */ jal add_vec2D_polar -/* B73C74 80240BC4 E7A40014 */ swc1 $f4, 0x14($sp) -/* B73C78 80240BC8 C7A00010 */ lwc1 $f0, 0x10($sp) -/* B73C7C 80240BCC 4600020D */ trunc.w.s $f8, $f0 -/* B73C80 80240BD0 44024000 */ mfc1 $v0, $f8 -/* B73C84 80240BD4 E6400038 */ swc1 $f0, 0x38($s2) -/* B73C88 80240BD8 A6220010 */ sh $v0, 0x10($s1) -/* B73C8C 80240BDC C660003C */ lwc1 $f0, 0x3c($s3) -/* B73C90 80240BE0 C622006C */ lwc1 $f2, 0x6c($s1) -/* B73C94 80240BE4 468010A0 */ cvt.s.w $f2, $f2 -/* B73C98 80240BE8 46020000 */ add.s $f0, $f0, $f2 -/* B73C9C 80240BEC 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* B73CA0 80240BF0 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* B73CA4 80240BF4 E640003C */ swc1 $f0, 0x3c($s2) -/* B73CA8 80240BF8 C7A20014 */ lwc1 $f2, 0x14($sp) -/* B73CAC 80240BFC 4600020D */ trunc.w.s $f8, $f0 -/* B73CB0 80240C00 44024000 */ mfc1 $v0, $f8 -/* B73CB4 80240C04 00000000 */ nop -/* B73CB8 80240C08 A6220012 */ sh $v0, 0x12($s1) -/* B73CBC 80240C0C 4600120D */ trunc.w.s $f8, $f2 -/* B73CC0 80240C10 44024000 */ mfc1 $v0, $f8 -/* B73CC4 80240C14 E6420040 */ swc1 $f2, 0x40($s2) -/* B73CC8 80240C18 A6220014 */ sh $v0, 0x14($s1) -/* B73CCC 80240C1C 8C660028 */ lw $a2, 0x28($v1) -/* B73CD0 80240C20 8C670030 */ lw $a3, 0x30($v1) -/* B73CD4 80240C24 C64C0038 */ lwc1 $f12, 0x38($s2) -/* B73CD8 80240C28 0C00A720 */ jal atan2 -/* B73CDC 80240C2C C64E0040 */ lwc1 $f14, 0x40($s2) -/* B73CE0 80240C30 3C03E0EF */ lui $v1, 0xe0ef -/* B73CE4 80240C34 E640000C */ swc1 $f0, 0xc($s2) -/* B73CE8 80240C38 8E220000 */ lw $v0, ($s1) -/* B73CEC 80240C3C 3463FFFF */ ori $v1, $v1, 0xffff -/* B73CF0 80240C40 00431024 */ and $v0, $v0, $v1 -/* B73CF4 80240C44 AE220000 */ sw $v0, ($s1) -/* B73CF8 80240C48 24020001 */ addiu $v0, $zero, 1 -/* B73CFC 80240C4C A640008E */ sh $zero, 0x8e($s2) -/* B73D00 80240C50 08090333 */ j .L80240CCC -/* B73D04 80240C54 AE820070 */ sw $v0, 0x70($s4) -.L80240C58: -/* B73D08 80240C58 86240008 */ lh $a0, 8($s1) -/* B73D0C 80240C5C 0C00FB3A */ jal get_enemy -/* B73D10 80240C60 2484FFFF */ addiu $a0, $a0, -1 -/* B73D14 80240C64 0040802D */ daddu $s0, $v0, $zero -/* B73D18 80240C68 0C00EABB */ jal get_npc_unsafe -/* B73D1C 80240C6C 86040008 */ lh $a0, 8($s0) -/* B73D20 80240C70 9642008E */ lhu $v0, 0x8e($s2) -/* B73D24 80240C74 24420001 */ addiu $v0, $v0, 1 -/* B73D28 80240C78 A642008E */ sh $v0, 0x8e($s2) -/* B73D2C 80240C7C 00021400 */ sll $v0, $v0, 0x10 -/* B73D30 80240C80 8E23007C */ lw $v1, 0x7c($s1) -/* B73D34 80240C84 00021403 */ sra $v0, $v0, 0x10 -/* B73D38 80240C88 0043102A */ slt $v0, $v0, $v1 -/* B73D3C 80240C8C 50400001 */ beql $v0, $zero, .L80240C94 -/* B73D40 80240C90 A2200007 */ sb $zero, 7($s1) -.L80240C94: -/* B73D44 80240C94 8E03006C */ lw $v1, 0x6c($s0) -/* B73D48 80240C98 24020004 */ addiu $v0, $zero, 4 -/* B73D4C 80240C9C 1462000B */ bne $v1, $v0, .L80240CCC -/* B73D50 80240CA0 3C021F10 */ lui $v0, 0x1f10 -/* B73D54 80240CA4 8E230000 */ lw $v1, ($s1) -/* B73D58 80240CA8 3C01C47A */ lui $at, 0xc47a -/* B73D5C 80240CAC 44810000 */ mtc1 $at, $f0 -/* B73D60 80240CB0 00621825 */ or $v1, $v1, $v0 -/* B73D64 80240CB4 AE230000 */ sw $v1, ($s1) -/* B73D68 80240CB8 AE400038 */ sw $zero, 0x38($s2) -/* B73D6C 80240CBC E640003C */ swc1 $f0, 0x3c($s2) -/* B73D70 80240CC0 AE400040 */ sw $zero, 0x40($s2) -/* B73D74 80240CC4 A2330007 */ sb $s3, 7($s1) -/* B73D78 80240CC8 AE800070 */ sw $zero, 0x70($s4) -.L80240CCC: -/* B73D7C 80240CCC 8FBF002C */ lw $ra, 0x2c($sp) -/* B73D80 80240CD0 8FB40028 */ lw $s4, 0x28($sp) -/* B73D84 80240CD4 8FB30024 */ lw $s3, 0x24($sp) -/* B73D88 80240CD8 8FB20020 */ lw $s2, 0x20($sp) -/* B73D8C 80240CDC 8FB1001C */ lw $s1, 0x1c($sp) -/* B73D90 80240CE0 8FB00018 */ lw $s0, 0x18($sp) -/* B73D94 80240CE4 0000102D */ daddu $v0, $zero, $zero -/* B73D98 80240CE8 03E00008 */ jr $ra -/* B73D9C 80240CEC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s new file mode 100644 index 0000000000..87960cbe58 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240A90_B73B40.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A90_B73B40 +/* B73B40 80240A90 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B73B44 80240A94 AFB40028 */ sw $s4, 0x28($sp) +/* B73B48 80240A98 0080A02D */ daddu $s4, $a0, $zero +/* B73B4C 80240A9C AFBF002C */ sw $ra, 0x2c($sp) +/* B73B50 80240AA0 AFB30024 */ sw $s3, 0x24($sp) +/* B73B54 80240AA4 AFB20020 */ sw $s2, 0x20($sp) +/* B73B58 80240AA8 AFB1001C */ sw $s1, 0x1c($sp) +/* B73B5C 80240AAC AFB00018 */ sw $s0, 0x18($sp) +/* B73B60 80240AB0 8E910148 */ lw $s1, 0x148($s4) +/* B73B64 80240AB4 86240008 */ lh $a0, 8($s1) +/* B73B68 80240AB8 0C00EABB */ jal get_npc_unsafe +/* B73B6C 80240ABC 00A0802D */ daddu $s0, $a1, $zero +/* B73B70 80240AC0 16000005 */ bnez $s0, .L80240AD8 +/* B73B74 80240AC4 0040902D */ daddu $s2, $v0, $zero +/* B73B78 80240AC8 8E2200B0 */ lw $v0, 0xb0($s1) +/* B73B7C 80240ACC 30420004 */ andi $v0, $v0, 4 +/* B73B80 80240AD0 10400015 */ beqz $v0, .L80240B28 +/* B73B84 80240AD4 00000000 */ nop +.L80240AD8: +/* B73B88 80240AD8 AE800070 */ sw $zero, 0x70($s4) +/* B73B8C 80240ADC 8E420000 */ lw $v0, ($s2) +/* B73B90 80240AE0 3C031F30 */ lui $v1, 0x1f30 +/* B73B94 80240AE4 A640008E */ sh $zero, 0x8e($s2) +/* B73B98 80240AE8 34420102 */ ori $v0, $v0, 0x102 +/* B73B9C 80240AEC AE420000 */ sw $v0, ($s2) +/* B73BA0 80240AF0 8E220000 */ lw $v0, ($s1) +/* B73BA4 80240AF4 3C01C47A */ lui $at, 0xc47a +/* B73BA8 80240AF8 44810000 */ mtc1 $at, $f0 +/* B73BAC 80240AFC 00431025 */ or $v0, $v0, $v1 +/* B73BB0 80240B00 AE220000 */ sw $v0, ($s1) +/* B73BB4 80240B04 AE400038 */ sw $zero, 0x38($s2) +/* B73BB8 80240B08 E640003C */ swc1 $f0, 0x3c($s2) +/* B73BBC 80240B0C AE400040 */ sw $zero, 0x40($s2) +/* B73BC0 80240B10 8E2300B0 */ lw $v1, 0xb0($s1) +/* B73BC4 80240B14 30620004 */ andi $v0, $v1, 4 +/* B73BC8 80240B18 10400003 */ beqz $v0, .L80240B28 +/* B73BCC 80240B1C 2402FFFB */ addiu $v0, $zero, -5 +/* B73BD0 80240B20 00621024 */ and $v0, $v1, $v0 +/* B73BD4 80240B24 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240B28: +/* B73BD8 80240B28 8E930070 */ lw $s3, 0x70($s4) +/* B73BDC 80240B2C 12600005 */ beqz $s3, .L80240B44 +/* B73BE0 80240B30 24020001 */ addiu $v0, $zero, 1 +/* B73BE4 80240B34 12620048 */ beq $s3, $v0, .L80240C58 +/* B73BE8 80240B38 00000000 */ nop +/* B73BEC 80240B3C 08090333 */ j .L80240CCC +/* B73BF0 80240B40 00000000 */ nop +.L80240B44: +/* B73BF4 80240B44 86240008 */ lh $a0, 8($s1) +/* B73BF8 80240B48 0C00FB3A */ jal get_enemy +/* B73BFC 80240B4C 2484FFFF */ addiu $a0, $a0, -1 +/* B73C00 80240B50 0040802D */ daddu $s0, $v0, $zero +/* B73C04 80240B54 0C00EABB */ jal get_npc_unsafe +/* B73C08 80240B58 86040008 */ lh $a0, 8($s0) +/* B73C0C 80240B5C 24030001 */ addiu $v1, $zero, 1 +/* B73C10 80240B60 0040982D */ daddu $s3, $v0, $zero +/* B73C14 80240B64 A2230007 */ sb $v1, 7($s1) +/* B73C18 80240B68 8E03006C */ lw $v1, 0x6c($s0) +/* B73C1C 80240B6C 24020003 */ addiu $v0, $zero, 3 +/* B73C20 80240B70 14620056 */ bne $v1, $v0, .L80240CCC +/* B73C24 80240B74 00000000 */ nop +/* B73C28 80240B78 8E2500A8 */ lw $a1, 0xa8($s1) +/* B73C2C 80240B7C 10A00003 */ beqz $a1, .L80240B8C +/* B73C30 80240B80 0260202D */ daddu $a0, $s3, $zero +/* B73C34 80240B84 0C012530 */ jal func_800494C0 +/* B73C38 80240B88 0000302D */ daddu $a2, $zero, $zero +.L80240B8C: +/* B73C3C 80240B8C 27A40010 */ addiu $a0, $sp, 0x10 +/* B73C40 80240B90 C6280070 */ lwc1 $f8, 0x70($s1) +/* B73C44 80240B94 46804220 */ cvt.s.w $f8, $f8 +/* B73C48 80240B98 C6620034 */ lwc1 $f2, 0x34($s3) +/* B73C4C 80240B9C 3C014387 */ lui $at, 0x4387 +/* B73C50 80240BA0 44810000 */ mtc1 $at, $f0 +/* B73C54 80240BA4 44064000 */ mfc1 $a2, $f8 +/* B73C58 80240BA8 46020001 */ sub.s $f0, $f0, $f2 +/* B73C5C 80240BAC C6660038 */ lwc1 $f6, 0x38($s3) +/* B73C60 80240BB0 C6640040 */ lwc1 $f4, 0x40($s3) +/* B73C64 80240BB4 44070000 */ mfc1 $a3, $f0 +/* B73C68 80240BB8 27A50014 */ addiu $a1, $sp, 0x14 +/* B73C6C 80240BBC E7A60010 */ swc1 $f6, 0x10($sp) +/* B73C70 80240BC0 0C00A7E7 */ jal add_vec2D_polar +/* B73C74 80240BC4 E7A40014 */ swc1 $f4, 0x14($sp) +/* B73C78 80240BC8 C7A00010 */ lwc1 $f0, 0x10($sp) +/* B73C7C 80240BCC 4600020D */ trunc.w.s $f8, $f0 +/* B73C80 80240BD0 44024000 */ mfc1 $v0, $f8 +/* B73C84 80240BD4 E6400038 */ swc1 $f0, 0x38($s2) +/* B73C88 80240BD8 A6220010 */ sh $v0, 0x10($s1) +/* B73C8C 80240BDC C660003C */ lwc1 $f0, 0x3c($s3) +/* B73C90 80240BE0 C622006C */ lwc1 $f2, 0x6c($s1) +/* B73C94 80240BE4 468010A0 */ cvt.s.w $f2, $f2 +/* B73C98 80240BE8 46020000 */ add.s $f0, $f0, $f2 +/* B73C9C 80240BEC 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) +/* B73CA0 80240BF0 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) +/* B73CA4 80240BF4 E640003C */ swc1 $f0, 0x3c($s2) +/* B73CA8 80240BF8 C7A20014 */ lwc1 $f2, 0x14($sp) +/* B73CAC 80240BFC 4600020D */ trunc.w.s $f8, $f0 +/* B73CB0 80240C00 44024000 */ mfc1 $v0, $f8 +/* B73CB4 80240C04 00000000 */ nop +/* B73CB8 80240C08 A6220012 */ sh $v0, 0x12($s1) +/* B73CBC 80240C0C 4600120D */ trunc.w.s $f8, $f2 +/* B73CC0 80240C10 44024000 */ mfc1 $v0, $f8 +/* B73CC4 80240C14 E6420040 */ swc1 $f2, 0x40($s2) +/* B73CC8 80240C18 A6220014 */ sh $v0, 0x14($s1) +/* B73CCC 80240C1C 8C660028 */ lw $a2, 0x28($v1) +/* B73CD0 80240C20 8C670030 */ lw $a3, 0x30($v1) +/* B73CD4 80240C24 C64C0038 */ lwc1 $f12, 0x38($s2) +/* B73CD8 80240C28 0C00A720 */ jal atan2 +/* B73CDC 80240C2C C64E0040 */ lwc1 $f14, 0x40($s2) +/* B73CE0 80240C30 3C03E0EF */ lui $v1, 0xe0ef +/* B73CE4 80240C34 E640000C */ swc1 $f0, 0xc($s2) +/* B73CE8 80240C38 8E220000 */ lw $v0, ($s1) +/* B73CEC 80240C3C 3463FFFF */ ori $v1, $v1, 0xffff +/* B73CF0 80240C40 00431024 */ and $v0, $v0, $v1 +/* B73CF4 80240C44 AE220000 */ sw $v0, ($s1) +/* B73CF8 80240C48 24020001 */ addiu $v0, $zero, 1 +/* B73CFC 80240C4C A640008E */ sh $zero, 0x8e($s2) +/* B73D00 80240C50 08090333 */ j .L80240CCC +/* B73D04 80240C54 AE820070 */ sw $v0, 0x70($s4) +.L80240C58: +/* B73D08 80240C58 86240008 */ lh $a0, 8($s1) +/* B73D0C 80240C5C 0C00FB3A */ jal get_enemy +/* B73D10 80240C60 2484FFFF */ addiu $a0, $a0, -1 +/* B73D14 80240C64 0040802D */ daddu $s0, $v0, $zero +/* B73D18 80240C68 0C00EABB */ jal get_npc_unsafe +/* B73D1C 80240C6C 86040008 */ lh $a0, 8($s0) +/* B73D20 80240C70 9642008E */ lhu $v0, 0x8e($s2) +/* B73D24 80240C74 24420001 */ addiu $v0, $v0, 1 +/* B73D28 80240C78 A642008E */ sh $v0, 0x8e($s2) +/* B73D2C 80240C7C 00021400 */ sll $v0, $v0, 0x10 +/* B73D30 80240C80 8E23007C */ lw $v1, 0x7c($s1) +/* B73D34 80240C84 00021403 */ sra $v0, $v0, 0x10 +/* B73D38 80240C88 0043102A */ slt $v0, $v0, $v1 +/* B73D3C 80240C8C 50400001 */ beql $v0, $zero, .L80240C94 +/* B73D40 80240C90 A2200007 */ sb $zero, 7($s1) +.L80240C94: +/* B73D44 80240C94 8E03006C */ lw $v1, 0x6c($s0) +/* B73D48 80240C98 24020004 */ addiu $v0, $zero, 4 +/* B73D4C 80240C9C 1462000B */ bne $v1, $v0, .L80240CCC +/* B73D50 80240CA0 3C021F10 */ lui $v0, 0x1f10 +/* B73D54 80240CA4 8E230000 */ lw $v1, ($s1) +/* B73D58 80240CA8 3C01C47A */ lui $at, 0xc47a +/* B73D5C 80240CAC 44810000 */ mtc1 $at, $f0 +/* B73D60 80240CB0 00621825 */ or $v1, $v1, $v0 +/* B73D64 80240CB4 AE230000 */ sw $v1, ($s1) +/* B73D68 80240CB8 AE400038 */ sw $zero, 0x38($s2) +/* B73D6C 80240CBC E640003C */ swc1 $f0, 0x3c($s2) +/* B73D70 80240CC0 AE400040 */ sw $zero, 0x40($s2) +/* B73D74 80240CC4 A2330007 */ sb $s3, 7($s1) +/* B73D78 80240CC8 AE800070 */ sw $zero, 0x70($s4) +.L80240CCC: +/* B73D7C 80240CCC 8FBF002C */ lw $ra, 0x2c($sp) +/* B73D80 80240CD0 8FB40028 */ lw $s4, 0x28($sp) +/* B73D84 80240CD4 8FB30024 */ lw $s3, 0x24($sp) +/* B73D88 80240CD8 8FB20020 */ lw $s2, 0x20($sp) +/* B73D8C 80240CDC 8FB1001C */ lw $s1, 0x1c($sp) +/* B73D90 80240CE0 8FB00018 */ lw $s0, 0x18($sp) +/* B73D94 80240CE4 0000102D */ daddu $v0, $zero, $zero +/* B73D98 80240CE8 03E00008 */ jr $ra +/* B73D9C 80240CEC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s index 1f9c03ae56..c54db8822d 100644 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240CF0_B73DA0.s @@ -90,7 +90,7 @@ glabel func_80240CF0_B73DA0 /* B73EE0 80240E30 8E22006C */ lw $v0, 0x6c($s1) /* B73EE4 80240E34 14400006 */ bnez $v0, .L80240E50 /* B73EE8 80240E38 00000000 */ nop -/* B73EEC 80240E3C 0C090237 */ jal func_802408DC +/* B73EEC 80240E3C 0C090237 */ jal func_802408DC_B7398C /* B73EF0 80240E40 0240202D */ daddu $a0, $s2, $zero /* B73EF4 80240E44 10400002 */ beqz $v0, .L80240E50 /* B73EF8 80240E48 2402001E */ addiu $v0, $zero, 0x1e @@ -151,21 +151,21 @@ glabel func_80240CF0_B73DA0 /* B73FD0 80240F20 0280302D */ daddu $a2, $s4, $zero /* B73FD4 80240F24 080903DF */ j .L80240F7C /* B73FD8 80240F28 00000000 */ nop -/* B73FDC 80240F2C 0C0901B5 */ jal func_802406D4 +/* B73FDC 80240F2C 0C0901B5 */ jal func_802406D4_B73784 /* B73FE0 80240F30 0240202D */ daddu $a0, $s2, $zero -/* B73FE4 80240F34 0C0901D0 */ jal func_80240740 +/* B73FE4 80240F34 0C0901D0 */ jal func_80240740_B737F0 /* B73FE8 80240F38 0240202D */ daddu $a0, $s2, $zero /* B73FEC 80240F3C 8E430070 */ lw $v1, 0x70($s2) /* B73FF0 80240F40 24020020 */ addiu $v0, $zero, 0x20 /* B73FF4 80240F44 1462000D */ bne $v1, $v0, .L80240F7C /* B73FF8 80240F48 00000000 */ nop -/* B73FFC 80240F4C 0C0901EC */ jal func_802407B0 +/* B73FFC 80240F4C 0C0901EC */ jal func_802407B0_B73860 /* B74000 80240F50 0240202D */ daddu $a0, $s2, $zero /* B74004 80240F54 8E430070 */ lw $v1, 0x70($s2) /* B74008 80240F58 24020021 */ addiu $v0, $zero, 0x21 /* B7400C 80240F5C 14620007 */ bne $v1, $v0, .L80240F7C /* B74010 80240F60 00000000 */ nop -/* B74014 80240F64 0C090222 */ jal func_80240888 +/* B74014 80240F64 0C090222 */ jal func_80240888_B73938 /* B74018 80240F68 0240202D */ daddu $a0, $s2, $zero /* B7401C 80240F6C 080903DF */ j .L80240F7C /* B74020 80240F70 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4.s deleted file mode 100644 index 3fc24f2059..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4.s +++ /dev/null @@ -1,186 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FA4 -/* B74054 80240FA4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B74058 80240FA8 AFB20038 */ sw $s2, 0x38($sp) -/* B7405C 80240FAC 0080902D */ daddu $s2, $a0, $zero -/* B74060 80240FB0 AFBF0048 */ sw $ra, 0x48($sp) -/* B74064 80240FB4 AFB50044 */ sw $s5, 0x44($sp) -/* B74068 80240FB8 AFB40040 */ sw $s4, 0x40($sp) -/* B7406C 80240FBC AFB3003C */ sw $s3, 0x3c($sp) -/* B74070 80240FC0 AFB10034 */ sw $s1, 0x34($sp) -/* B74074 80240FC4 AFB00030 */ sw $s0, 0x30($sp) -/* B74078 80240FC8 8E510148 */ lw $s1, 0x148($s2) -/* B7407C 80240FCC 86240008 */ lh $a0, 8($s1) -/* B74080 80240FD0 0C00EABB */ jal get_npc_unsafe -/* B74084 80240FD4 00A0802D */ daddu $s0, $a1, $zero -/* B74088 80240FD8 8E43000C */ lw $v1, 0xc($s2) -/* B7408C 80240FDC 0240202D */ daddu $a0, $s2, $zero -/* B74090 80240FE0 8C650000 */ lw $a1, ($v1) -/* B74094 80240FE4 0C0B1EAF */ jal get_variable -/* B74098 80240FE8 0040A82D */ daddu $s5, $v0, $zero -/* B7409C 80240FEC AFA00010 */ sw $zero, 0x10($sp) -/* B740A0 80240FF0 8E2300D0 */ lw $v1, 0xd0($s1) -/* B740A4 80240FF4 8C630030 */ lw $v1, 0x30($v1) -/* B740A8 80240FF8 AFA30014 */ sw $v1, 0x14($sp) -/* B740AC 80240FFC 8E2300D0 */ lw $v1, 0xd0($s1) -/* B740B0 80241000 8C63001C */ lw $v1, 0x1c($v1) -/* B740B4 80241004 AFA30018 */ sw $v1, 0x18($sp) -/* B740B8 80241008 8E2300D0 */ lw $v1, 0xd0($s1) -/* B740BC 8024100C 8C630024 */ lw $v1, 0x24($v1) -/* B740C0 80241010 AFA3001C */ sw $v1, 0x1c($sp) -/* B740C4 80241014 8E2300D0 */ lw $v1, 0xd0($s1) -/* B740C8 80241018 8C630028 */ lw $v1, 0x28($v1) -/* B740CC 8024101C 27B40010 */ addiu $s4, $sp, 0x10 -/* B740D0 80241020 AFA30020 */ sw $v1, 0x20($sp) -/* B740D4 80241024 8E2300D0 */ lw $v1, 0xd0($s1) -/* B740D8 80241028 3C014282 */ lui $at, 0x4282 -/* B740DC 8024102C 44810000 */ mtc1 $at, $f0 -/* B740E0 80241030 8C63002C */ lw $v1, 0x2c($v1) -/* B740E4 80241034 0040982D */ daddu $s3, $v0, $zero -/* B740E8 80241038 E7A00028 */ swc1 $f0, 0x28($sp) -/* B740EC 8024103C A7A0002C */ sh $zero, 0x2c($sp) -/* B740F0 80241040 16000005 */ bnez $s0, .L80241058 -/* B740F4 80241044 AFA30024 */ sw $v1, 0x24($sp) -/* B740F8 80241048 8E2200B0 */ lw $v0, 0xb0($s1) -/* B740FC 8024104C 30420004 */ andi $v0, $v0, 4 -/* B74100 80241050 10400020 */ beqz $v0, .L802410D4 -/* B74104 80241054 00000000 */ nop -.L80241058: -/* B74108 80241058 2404F7FF */ addiu $a0, $zero, -0x801 -/* B7410C 8024105C AE400070 */ sw $zero, 0x70($s2) -/* B74110 80241060 A6A0008E */ sh $zero, 0x8e($s5) -/* B74114 80241064 8E2200CC */ lw $v0, 0xcc($s1) -/* B74118 80241068 8EA30000 */ lw $v1, ($s5) -/* B7411C 8024106C 8C420000 */ lw $v0, ($v0) -/* B74120 80241070 00641824 */ and $v1, $v1, $a0 -/* B74124 80241074 AEA30000 */ sw $v1, ($s5) -/* B74128 80241078 AEA20028 */ sw $v0, 0x28($s5) -/* B7412C 8024107C 8E2200D0 */ lw $v0, 0xd0($s1) -/* B74130 80241080 8C420034 */ lw $v0, 0x34($v0) -/* B74134 80241084 54400005 */ bnel $v0, $zero, .L8024109C -/* B74138 80241088 2402FDFF */ addiu $v0, $zero, -0x201 -/* B7413C 8024108C 34620200 */ ori $v0, $v1, 0x200 -/* B74140 80241090 2403FFF7 */ addiu $v1, $zero, -9 -/* B74144 80241094 08090429 */ j .L802410A4 -/* B74148 80241098 00431024 */ and $v0, $v0, $v1 -.L8024109C: -/* B7414C 8024109C 00621024 */ and $v0, $v1, $v0 -/* B74150 802410A0 34420008 */ ori $v0, $v0, 8 -.L802410A4: -/* B74154 802410A4 AEA20000 */ sw $v0, ($s5) -/* B74158 802410A8 8E2200B0 */ lw $v0, 0xb0($s1) -/* B7415C 802410AC 30420004 */ andi $v0, $v0, 4 -/* B74160 802410B0 10400007 */ beqz $v0, .L802410D0 -/* B74164 802410B4 24020063 */ addiu $v0, $zero, 0x63 -/* B74168 802410B8 AE420070 */ sw $v0, 0x70($s2) -/* B7416C 802410BC AE400074 */ sw $zero, 0x74($s2) -/* B74170 802410C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* B74174 802410C4 2403FFFB */ addiu $v1, $zero, -5 -/* B74178 802410C8 00431024 */ and $v0, $v0, $v1 -/* B7417C 802410CC AE2200B0 */ sw $v0, 0xb0($s1) -.L802410D0: -/* B74180 802410D0 AE20006C */ sw $zero, 0x6c($s1) -.L802410D4: -/* B74184 802410D4 8E420070 */ lw $v0, 0x70($s2) -/* B74188 802410D8 2842001E */ slti $v0, $v0, 0x1e -/* B7418C 802410DC 10400009 */ beqz $v0, .L80241104 -/* B74190 802410E0 00000000 */ nop -/* B74194 802410E4 8E22006C */ lw $v0, 0x6c($s1) -/* B74198 802410E8 14400006 */ bnez $v0, .L80241104 -/* B7419C 802410EC 00000000 */ nop -/* B741A0 802410F0 0C090237 */ jal func_802408DC -/* B741A4 802410F4 0240202D */ daddu $a0, $s2, $zero -/* B741A8 802410F8 10400002 */ beqz $v0, .L80241104 -/* B741AC 802410FC 2402001E */ addiu $v0, $zero, 0x1e -/* B741B0 80241100 AE420070 */ sw $v0, 0x70($s2) -.L80241104: -/* B741B4 80241104 8E430070 */ lw $v1, 0x70($s2) -/* B741B8 80241108 2C620064 */ sltiu $v0, $v1, 0x64 -/* B741BC 8024110C 10400048 */ beqz $v0, .L80241230 -/* B741C0 80241110 00031080 */ sll $v0, $v1, 2 -/* B741C4 80241114 3C018024 */ lui $at, 0x8024 -/* B741C8 80241118 00220821 */ addu $at, $at, $v0 -/* B741CC 8024111C 8C223570 */ lw $v0, 0x3570($at) -/* B741D0 80241120 00400008 */ jr $v0 -/* B741D4 80241124 00000000 */ nop -/* B741D8 80241128 0240202D */ daddu $a0, $s2, $zero -/* B741DC 8024112C 0260282D */ daddu $a1, $s3, $zero -/* B741E0 80241130 0C012568 */ jal func_800495A0 -/* B741E4 80241134 0280302D */ daddu $a2, $s4, $zero -/* B741E8 80241138 0240202D */ daddu $a0, $s2, $zero -/* B741EC 8024113C 0260282D */ daddu $a1, $s3, $zero -/* B741F0 80241140 0C0125AE */ jal func_800496B8 -/* B741F4 80241144 0280302D */ daddu $a2, $s4, $zero -/* B741F8 80241148 0809048C */ j .L80241230 -/* B741FC 8024114C 00000000 */ nop -/* B74200 80241150 0240202D */ daddu $a0, $s2, $zero -/* B74204 80241154 0260282D */ daddu $a1, $s3, $zero -/* B74208 80241158 0C090130 */ jal func_802404C0 -/* B7420C 8024115C 0280302D */ daddu $a2, $s4, $zero -/* B74210 80241160 0240202D */ daddu $a0, $s2, $zero -/* B74214 80241164 0260282D */ daddu $a1, $s3, $zero -/* B74218 80241168 0C090144 */ jal func_80240510 -/* B7421C 8024116C 0280302D */ daddu $a2, $s4, $zero -/* B74220 80241170 0809048C */ j .L80241230 -/* B74224 80241174 00000000 */ nop -/* B74228 80241178 0240202D */ daddu $a0, $s2, $zero -/* B7422C 8024117C 0260282D */ daddu $a1, $s3, $zero -/* B74230 80241180 0C01278F */ jal func_80049E3C -/* B74234 80241184 0280302D */ daddu $a2, $s4, $zero -/* B74238 80241188 0240202D */ daddu $a0, $s2, $zero -/* B7423C 8024118C 0260282D */ daddu $a1, $s3, $zero -/* B74240 80241190 0C0127B3 */ jal func_80049ECC -/* B74244 80241194 0280302D */ daddu $a2, $s4, $zero -/* B74248 80241198 0809048C */ j .L80241230 -/* B7424C 8024119C 00000000 */ nop -/* B74250 802411A0 0240202D */ daddu $a0, $s2, $zero -/* B74254 802411A4 0260282D */ daddu $a1, $s3, $zero -/* B74258 802411A8 0C0127DF */ jal func_80049F7C -/* B7425C 802411AC 0280302D */ daddu $a2, $s4, $zero -/* B74260 802411B0 0240202D */ daddu $a0, $s2, $zero -/* B74264 802411B4 0260282D */ daddu $a1, $s3, $zero -/* B74268 802411B8 0C012849 */ jal func_8004A124 -/* B7426C 802411BC 0280302D */ daddu $a2, $s4, $zero -/* B74270 802411C0 0809048C */ j .L80241230 -/* B74274 802411C4 00000000 */ nop -/* B74278 802411C8 0240202D */ daddu $a0, $s2, $zero -/* B7427C 802411CC 0260282D */ daddu $a1, $s3, $zero -/* B74280 802411D0 0C0128FA */ jal func_8004A3E8 -/* B74284 802411D4 0280302D */ daddu $a2, $s4, $zero -/* B74288 802411D8 0809048C */ j .L80241230 -/* B7428C 802411DC 00000000 */ nop -/* B74290 802411E0 0C0901B5 */ jal func_802406D4 -/* B74294 802411E4 0240202D */ daddu $a0, $s2, $zero -/* B74298 802411E8 0C0901D0 */ jal func_80240740 -/* B7429C 802411EC 0240202D */ daddu $a0, $s2, $zero -/* B742A0 802411F0 8E430070 */ lw $v1, 0x70($s2) -/* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 -/* B742A8 802411F8 1462000D */ bne $v1, $v0, .L80241230 -/* B742AC 802411FC 00000000 */ nop -/* B742B0 80241200 0C0901EC */ jal func_802407B0 -/* B742B4 80241204 0240202D */ daddu $a0, $s2, $zero -/* B742B8 80241208 8E430070 */ lw $v1, 0x70($s2) -/* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 -/* B742C0 80241210 14620007 */ bne $v1, $v0, .L80241230 -/* B742C4 80241214 00000000 */ nop -/* B742C8 80241218 0C090222 */ jal func_80240888 -/* B742CC 8024121C 0240202D */ daddu $a0, $s2, $zero -/* B742D0 80241220 0809048C */ j .L80241230 -/* B742D4 80241224 00000000 */ nop -/* B742D8 80241228 0C0129CF */ jal func_8004A73C -/* B742DC 8024122C 0240202D */ daddu $a0, $s2, $zero -.L80241230: -/* B742E0 80241230 8FBF0048 */ lw $ra, 0x48($sp) -/* B742E4 80241234 8FB50044 */ lw $s5, 0x44($sp) -/* B742E8 80241238 8FB40040 */ lw $s4, 0x40($sp) -/* B742EC 8024123C 8FB3003C */ lw $s3, 0x3c($sp) -/* B742F0 80241240 8FB20038 */ lw $s2, 0x38($sp) -/* B742F4 80241244 8FB10034 */ lw $s1, 0x34($sp) -/* B742F8 80241248 8FB00030 */ lw $s0, 0x30($sp) -/* B742FC 8024124C 0000102D */ daddu $v0, $zero, $zero -/* B74300 80241250 03E00008 */ jr $ra -/* B74304 80241254 27BD0050 */ addiu $sp, $sp, 0x50 -/* B74308 80241258 00000000 */ nop -/* B7430C 8024125C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s new file mode 100644 index 0000000000..613e42884f --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_12/B73570/func_80240FA4_B74054.s @@ -0,0 +1,186 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FA4_B74054 +/* B74054 80240FA4 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* B74058 80240FA8 AFB20038 */ sw $s2, 0x38($sp) +/* B7405C 80240FAC 0080902D */ daddu $s2, $a0, $zero +/* B74060 80240FB0 AFBF0048 */ sw $ra, 0x48($sp) +/* B74064 80240FB4 AFB50044 */ sw $s5, 0x44($sp) +/* B74068 80240FB8 AFB40040 */ sw $s4, 0x40($sp) +/* B7406C 80240FBC AFB3003C */ sw $s3, 0x3c($sp) +/* B74070 80240FC0 AFB10034 */ sw $s1, 0x34($sp) +/* B74074 80240FC4 AFB00030 */ sw $s0, 0x30($sp) +/* B74078 80240FC8 8E510148 */ lw $s1, 0x148($s2) +/* B7407C 80240FCC 86240008 */ lh $a0, 8($s1) +/* B74080 80240FD0 0C00EABB */ jal get_npc_unsafe +/* B74084 80240FD4 00A0802D */ daddu $s0, $a1, $zero +/* B74088 80240FD8 8E43000C */ lw $v1, 0xc($s2) +/* B7408C 80240FDC 0240202D */ daddu $a0, $s2, $zero +/* B74090 80240FE0 8C650000 */ lw $a1, ($v1) +/* B74094 80240FE4 0C0B1EAF */ jal get_variable +/* B74098 80240FE8 0040A82D */ daddu $s5, $v0, $zero +/* B7409C 80240FEC AFA00010 */ sw $zero, 0x10($sp) +/* B740A0 80240FF0 8E2300D0 */ lw $v1, 0xd0($s1) +/* B740A4 80240FF4 8C630030 */ lw $v1, 0x30($v1) +/* B740A8 80240FF8 AFA30014 */ sw $v1, 0x14($sp) +/* B740AC 80240FFC 8E2300D0 */ lw $v1, 0xd0($s1) +/* B740B0 80241000 8C63001C */ lw $v1, 0x1c($v1) +/* B740B4 80241004 AFA30018 */ sw $v1, 0x18($sp) +/* B740B8 80241008 8E2300D0 */ lw $v1, 0xd0($s1) +/* B740BC 8024100C 8C630024 */ lw $v1, 0x24($v1) +/* B740C0 80241010 AFA3001C */ sw $v1, 0x1c($sp) +/* B740C4 80241014 8E2300D0 */ lw $v1, 0xd0($s1) +/* B740C8 80241018 8C630028 */ lw $v1, 0x28($v1) +/* B740CC 8024101C 27B40010 */ addiu $s4, $sp, 0x10 +/* B740D0 80241020 AFA30020 */ sw $v1, 0x20($sp) +/* B740D4 80241024 8E2300D0 */ lw $v1, 0xd0($s1) +/* B740D8 80241028 3C014282 */ lui $at, 0x4282 +/* B740DC 8024102C 44810000 */ mtc1 $at, $f0 +/* B740E0 80241030 8C63002C */ lw $v1, 0x2c($v1) +/* B740E4 80241034 0040982D */ daddu $s3, $v0, $zero +/* B740E8 80241038 E7A00028 */ swc1 $f0, 0x28($sp) +/* B740EC 8024103C A7A0002C */ sh $zero, 0x2c($sp) +/* B740F0 80241040 16000005 */ bnez $s0, .L80241058 +/* B740F4 80241044 AFA30024 */ sw $v1, 0x24($sp) +/* B740F8 80241048 8E2200B0 */ lw $v0, 0xb0($s1) +/* B740FC 8024104C 30420004 */ andi $v0, $v0, 4 +/* B74100 80241050 10400020 */ beqz $v0, .L802410D4 +/* B74104 80241054 00000000 */ nop +.L80241058: +/* B74108 80241058 2404F7FF */ addiu $a0, $zero, -0x801 +/* B7410C 8024105C AE400070 */ sw $zero, 0x70($s2) +/* B74110 80241060 A6A0008E */ sh $zero, 0x8e($s5) +/* B74114 80241064 8E2200CC */ lw $v0, 0xcc($s1) +/* B74118 80241068 8EA30000 */ lw $v1, ($s5) +/* B7411C 8024106C 8C420000 */ lw $v0, ($v0) +/* B74120 80241070 00641824 */ and $v1, $v1, $a0 +/* B74124 80241074 AEA30000 */ sw $v1, ($s5) +/* B74128 80241078 AEA20028 */ sw $v0, 0x28($s5) +/* B7412C 8024107C 8E2200D0 */ lw $v0, 0xd0($s1) +/* B74130 80241080 8C420034 */ lw $v0, 0x34($v0) +/* B74134 80241084 54400005 */ bnel $v0, $zero, .L8024109C +/* B74138 80241088 2402FDFF */ addiu $v0, $zero, -0x201 +/* B7413C 8024108C 34620200 */ ori $v0, $v1, 0x200 +/* B74140 80241090 2403FFF7 */ addiu $v1, $zero, -9 +/* B74144 80241094 08090429 */ j .L802410A4 +/* B74148 80241098 00431024 */ and $v0, $v0, $v1 +.L8024109C: +/* B7414C 8024109C 00621024 */ and $v0, $v1, $v0 +/* B74150 802410A0 34420008 */ ori $v0, $v0, 8 +.L802410A4: +/* B74154 802410A4 AEA20000 */ sw $v0, ($s5) +/* B74158 802410A8 8E2200B0 */ lw $v0, 0xb0($s1) +/* B7415C 802410AC 30420004 */ andi $v0, $v0, 4 +/* B74160 802410B0 10400007 */ beqz $v0, .L802410D0 +/* B74164 802410B4 24020063 */ addiu $v0, $zero, 0x63 +/* B74168 802410B8 AE420070 */ sw $v0, 0x70($s2) +/* B7416C 802410BC AE400074 */ sw $zero, 0x74($s2) +/* B74170 802410C0 8E2200B0 */ lw $v0, 0xb0($s1) +/* B74174 802410C4 2403FFFB */ addiu $v1, $zero, -5 +/* B74178 802410C8 00431024 */ and $v0, $v0, $v1 +/* B7417C 802410CC AE2200B0 */ sw $v0, 0xb0($s1) +.L802410D0: +/* B74180 802410D0 AE20006C */ sw $zero, 0x6c($s1) +.L802410D4: +/* B74184 802410D4 8E420070 */ lw $v0, 0x70($s2) +/* B74188 802410D8 2842001E */ slti $v0, $v0, 0x1e +/* B7418C 802410DC 10400009 */ beqz $v0, .L80241104 +/* B74190 802410E0 00000000 */ nop +/* B74194 802410E4 8E22006C */ lw $v0, 0x6c($s1) +/* B74198 802410E8 14400006 */ bnez $v0, .L80241104 +/* B7419C 802410EC 00000000 */ nop +/* B741A0 802410F0 0C090237 */ jal func_802408DC_B7398C +/* B741A4 802410F4 0240202D */ daddu $a0, $s2, $zero +/* B741A8 802410F8 10400002 */ beqz $v0, .L80241104 +/* B741AC 802410FC 2402001E */ addiu $v0, $zero, 0x1e +/* B741B0 80241100 AE420070 */ sw $v0, 0x70($s2) +.L80241104: +/* B741B4 80241104 8E430070 */ lw $v1, 0x70($s2) +/* B741B8 80241108 2C620064 */ sltiu $v0, $v1, 0x64 +/* B741BC 8024110C 10400048 */ beqz $v0, .L80241230 +/* B741C0 80241110 00031080 */ sll $v0, $v1, 2 +/* B741C4 80241114 3C018024 */ lui $at, 0x8024 +/* B741C8 80241118 00220821 */ addu $at, $at, $v0 +/* B741CC 8024111C 8C223570 */ lw $v0, 0x3570($at) +/* B741D0 80241120 00400008 */ jr $v0 +/* B741D4 80241124 00000000 */ nop +/* B741D8 80241128 0240202D */ daddu $a0, $s2, $zero +/* B741DC 8024112C 0260282D */ daddu $a1, $s3, $zero +/* B741E0 80241130 0C012568 */ jal func_800495A0 +/* B741E4 80241134 0280302D */ daddu $a2, $s4, $zero +/* B741E8 80241138 0240202D */ daddu $a0, $s2, $zero +/* B741EC 8024113C 0260282D */ daddu $a1, $s3, $zero +/* B741F0 80241140 0C0125AE */ jal func_800496B8 +/* B741F4 80241144 0280302D */ daddu $a2, $s4, $zero +/* B741F8 80241148 0809048C */ j .L80241230 +/* B741FC 8024114C 00000000 */ nop +/* B74200 80241150 0240202D */ daddu $a0, $s2, $zero +/* B74204 80241154 0260282D */ daddu $a1, $s3, $zero +/* B74208 80241158 0C090130 */ jal func_802404C0_B73570 +/* B7420C 8024115C 0280302D */ daddu $a2, $s4, $zero +/* B74210 80241160 0240202D */ daddu $a0, $s2, $zero +/* B74214 80241164 0260282D */ daddu $a1, $s3, $zero +/* B74218 80241168 0C090144 */ jal func_80240510_B735C0 +/* B7421C 8024116C 0280302D */ daddu $a2, $s4, $zero +/* B74220 80241170 0809048C */ j .L80241230 +/* B74224 80241174 00000000 */ nop +/* B74228 80241178 0240202D */ daddu $a0, $s2, $zero +/* B7422C 8024117C 0260282D */ daddu $a1, $s3, $zero +/* B74230 80241180 0C01278F */ jal func_80049E3C +/* B74234 80241184 0280302D */ daddu $a2, $s4, $zero +/* B74238 80241188 0240202D */ daddu $a0, $s2, $zero +/* B7423C 8024118C 0260282D */ daddu $a1, $s3, $zero +/* B74240 80241190 0C0127B3 */ jal func_80049ECC +/* B74244 80241194 0280302D */ daddu $a2, $s4, $zero +/* B74248 80241198 0809048C */ j .L80241230 +/* B7424C 8024119C 00000000 */ nop +/* B74250 802411A0 0240202D */ daddu $a0, $s2, $zero +/* B74254 802411A4 0260282D */ daddu $a1, $s3, $zero +/* B74258 802411A8 0C0127DF */ jal func_80049F7C +/* B7425C 802411AC 0280302D */ daddu $a2, $s4, $zero +/* B74260 802411B0 0240202D */ daddu $a0, $s2, $zero +/* B74264 802411B4 0260282D */ daddu $a1, $s3, $zero +/* B74268 802411B8 0C012849 */ jal func_8004A124 +/* B7426C 802411BC 0280302D */ daddu $a2, $s4, $zero +/* B74270 802411C0 0809048C */ j .L80241230 +/* B74274 802411C4 00000000 */ nop +/* B74278 802411C8 0240202D */ daddu $a0, $s2, $zero +/* B7427C 802411CC 0260282D */ daddu $a1, $s3, $zero +/* B74280 802411D0 0C0128FA */ jal func_8004A3E8 +/* B74284 802411D4 0280302D */ daddu $a2, $s4, $zero +/* B74288 802411D8 0809048C */ j .L80241230 +/* B7428C 802411DC 00000000 */ nop +/* B74290 802411E0 0C0901B5 */ jal func_802406D4_B73784 +/* B74294 802411E4 0240202D */ daddu $a0, $s2, $zero +/* B74298 802411E8 0C0901D0 */ jal func_80240740_B737F0 +/* B7429C 802411EC 0240202D */ daddu $a0, $s2, $zero +/* B742A0 802411F0 8E430070 */ lw $v1, 0x70($s2) +/* B742A4 802411F4 24020020 */ addiu $v0, $zero, 0x20 +/* B742A8 802411F8 1462000D */ bne $v1, $v0, .L80241230 +/* B742AC 802411FC 00000000 */ nop +/* B742B0 80241200 0C0901EC */ jal func_802407B0_B73860 +/* B742B4 80241204 0240202D */ daddu $a0, $s2, $zero +/* B742B8 80241208 8E430070 */ lw $v1, 0x70($s2) +/* B742BC 8024120C 24020021 */ addiu $v0, $zero, 0x21 +/* B742C0 80241210 14620007 */ bne $v1, $v0, .L80241230 +/* B742C4 80241214 00000000 */ nop +/* B742C8 80241218 0C090222 */ jal func_80240888_B73938 +/* B742CC 8024121C 0240202D */ daddu $a0, $s2, $zero +/* B742D0 80241220 0809048C */ j .L80241230 +/* B742D4 80241224 00000000 */ nop +/* B742D8 80241228 0C0129CF */ jal func_8004A73C +/* B742DC 8024122C 0240202D */ daddu $a0, $s2, $zero +.L80241230: +/* B742E0 80241230 8FBF0048 */ lw $ra, 0x48($sp) +/* B742E4 80241234 8FB50044 */ lw $s5, 0x44($sp) +/* B742E8 80241238 8FB40040 */ lw $s4, 0x40($sp) +/* B742EC 8024123C 8FB3003C */ lw $s3, 0x3c($sp) +/* B742F0 80241240 8FB20038 */ lw $s2, 0x38($sp) +/* B742F4 80241244 8FB10034 */ lw $s1, 0x34($sp) +/* B742F8 80241248 8FB00030 */ lw $s0, 0x30($sp) +/* B742FC 8024124C 0000102D */ daddu $v0, $zero, $zero +/* B74300 80241250 03E00008 */ jr $ra +/* B74304 80241254 27BD0050 */ addiu $sp, $sp, 0x50 +/* B74308 80241258 00000000 */ nop +/* B7430C 8024125C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240400_B76BB0.s b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240400_B76BB0.s index b2553ce395..19926ca76d 100644 --- a/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240400_B76BB0.s +++ b/asm/nonmatchings/world/area_jan/jan_13/B767B0/func_80240400_B76BB0.s @@ -55,7 +55,7 @@ glabel func_80240400_B76BB0 /* B76C78 802404C8 4405E000 */ mfc1 $a1, $f28 /* B76C7C 802404CC 4406D000 */ mfc1 $a2, $f26 /* B76C80 802404D0 4407C000 */ mfc1 $a3, $f24 -/* B76C84 802404D4 0C0900E4 */ jal func_80240390 +/* B76C84 802404D4 0C0900E4 */ jal func_80240390_B76B40 /* B76C88 802404D8 27A40010 */ addiu $a0, $sp, 0x10 /* B76C8C 802404DC 27A40010 */ addiu $a0, $sp, 0x10 /* B76C90 802404E0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240400_B76BB0 /* B76D00 80240550 4405E000 */ mfc1 $a1, $f28 /* B76D04 80240554 4406D000 */ mfc1 $a2, $f26 /* B76D08 80240558 4407C000 */ mfc1 $a3, $f24 -/* B76D0C 8024055C 0C0900E4 */ jal func_80240390 +/* B76D0C 8024055C 0C0900E4 */ jal func_80240390_B76B40 /* B76D10 80240560 27A40010 */ addiu $a0, $sp, 0x10 /* B76D14 80240564 27A40010 */ addiu $a0, $sp, 0x10 /* B76D18 80240568 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s index 03c922a1c7..b733404a7f 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802401CC_B7A21C.s @@ -27,7 +27,7 @@ glabel func_802401CC_B7A21C /* B7A274 80240224 14400008 */ bnez $v0, .L80240248 /* B7A278 80240228 00000000 */ nop /* B7A27C 8024022C 4405A000 */ mfc1 $a1, $f20 -/* B7A280 80240230 0C09005C */ jal func_80240170 +/* B7A280 80240230 0C09005C */ jal func_80240170_B7A1C0 /* B7A284 80240234 26040058 */ addiu $a0, $s0, 0x58 /* B7A288 80240238 96020000 */ lhu $v0, ($s0) /* B7A28C 8024023C 34421400 */ ori $v0, $v0, 0x1400 @@ -35,7 +35,7 @@ glabel func_802401CC_B7A21C /* B7A294 80240244 A6020000 */ sh $v0, ($s0) .L80240248: /* B7A298 80240248 4405A000 */ mfc1 $a1, $f20 -/* B7A29C 8024024C 0C09005C */ jal func_80240170 +/* B7A29C 8024024C 0C09005C */ jal func_80240170_B7A1C0 /* B7A2A0 80240250 27A40010 */ addiu $a0, $sp, 0x10 /* B7A2A4 80240254 27A40010 */ addiu $a0, $sp, 0x10 /* B7A2A8 80240258 26050058 */ addiu $a1, $s0, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802402F0_B7A340.s b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802402F0_B7A340.s index a418e1b421..570d65aefe 100644 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802402F0_B7A340.s +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A050/func_802402F0_B7A340.s @@ -55,7 +55,7 @@ glabel func_802402F0_B7A340 /* B7A408 802403B8 4405E000 */ mfc1 $a1, $f28 /* B7A40C 802403BC 4406D000 */ mfc1 $a2, $f26 /* B7A410 802403C0 4407C000 */ mfc1 $a3, $f24 -/* B7A414 802403C4 0C0900A0 */ jal func_80240280 +/* B7A414 802403C4 0C0900A0 */ jal func_80240280_B7A2D0 /* B7A418 802403C8 27A40010 */ addiu $a0, $sp, 0x10 /* B7A41C 802403CC 27A40010 */ addiu $a0, $sp, 0x10 /* B7A420 802403D0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802402F0_B7A340 /* B7A490 80240440 4405E000 */ mfc1 $a1, $f28 /* B7A494 80240444 4406D000 */ mfc1 $a2, $f26 /* B7A498 80240448 4407C000 */ mfc1 $a3, $f24 -/* B7A49C 8024044C 0C0900A0 */ jal func_80240280 +/* B7A49C 8024044C 0C0900A0 */ jal func_80240280_B7A2D0 /* B7A4A0 80240450 27A40010 */ addiu $a0, $sp, 0x10 /* B7A4A4 80240454 27A40010 */ addiu $a0, $sp, 0x10 /* B7A4A8 80240458 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8.s deleted file mode 100644 index 593288225a..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE8 -/* B7AB38 80240AE8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B7AB3C 80240AEC AFB40040 */ sw $s4, 0x40($sp) -/* B7AB40 80240AF0 0080A02D */ daddu $s4, $a0, $zero -/* B7AB44 80240AF4 AFBF0044 */ sw $ra, 0x44($sp) -/* B7AB48 80240AF8 AFB3003C */ sw $s3, 0x3c($sp) -/* B7AB4C 80240AFC AFB20038 */ sw $s2, 0x38($sp) -/* B7AB50 80240B00 AFB10034 */ sw $s1, 0x34($sp) -/* B7AB54 80240B04 AFB00030 */ sw $s0, 0x30($sp) -/* B7AB58 80240B08 8E920148 */ lw $s2, 0x148($s4) -/* B7AB5C 80240B0C 00A0882D */ daddu $s1, $a1, $zero -/* B7AB60 80240B10 86440008 */ lh $a0, 8($s2) -/* B7AB64 80240B14 0C00EABB */ jal get_npc_unsafe -/* B7AB68 80240B18 00C0982D */ daddu $s3, $a2, $zero -/* B7AB6C 80240B1C 8E230014 */ lw $v1, 0x14($s1) -/* B7AB70 80240B20 0460002D */ bltz $v1, .L80240BD8 -/* B7AB74 80240B24 0040802D */ daddu $s0, $v0, $zero -/* B7AB78 80240B28 0260202D */ daddu $a0, $s3, $zero -/* B7AB7C 80240B2C AFA00010 */ sw $zero, 0x10($sp) -/* B7AB80 80240B30 8E260024 */ lw $a2, 0x24($s1) -/* B7AB84 80240B34 8E270028 */ lw $a3, 0x28($s1) -/* B7AB88 80240B38 0C01242D */ jal func_800490B4 -/* B7AB8C 80240B3C 0240282D */ daddu $a1, $s2, $zero -/* B7AB90 80240B40 10400025 */ beqz $v0, .L80240BD8 -/* B7AB94 80240B44 0000202D */ daddu $a0, $zero, $zero -/* B7AB98 80240B48 0200282D */ daddu $a1, $s0, $zero -/* B7AB9C 80240B4C 0000302D */ daddu $a2, $zero, $zero -/* B7ABA0 80240B50 860300A8 */ lh $v1, 0xa8($s0) -/* B7ABA4 80240B54 3C013F80 */ lui $at, 0x3f80 -/* B7ABA8 80240B58 44810000 */ mtc1 $at, $f0 -/* B7ABAC 80240B5C 3C014000 */ lui $at, 0x4000 -/* B7ABB0 80240B60 44811000 */ mtc1 $at, $f2 -/* B7ABB4 80240B64 3C01C1A0 */ lui $at, 0xc1a0 -/* B7ABB8 80240B68 44812000 */ mtc1 $at, $f4 -/* B7ABBC 80240B6C 2402000F */ addiu $v0, $zero, 0xf -/* B7ABC0 80240B70 AFA2001C */ sw $v0, 0x1c($sp) -/* B7ABC4 80240B74 44833000 */ mtc1 $v1, $f6 -/* B7ABC8 80240B78 00000000 */ nop -/* B7ABCC 80240B7C 468031A0 */ cvt.s.w $f6, $f6 -/* B7ABD0 80240B80 44073000 */ mfc1 $a3, $f6 -/* B7ABD4 80240B84 27A20028 */ addiu $v0, $sp, 0x28 -/* B7ABD8 80240B88 AFA20020 */ sw $v0, 0x20($sp) -/* B7ABDC 80240B8C E7A00010 */ swc1 $f0, 0x10($sp) -/* B7ABE0 80240B90 E7A20014 */ swc1 $f2, 0x14($sp) -/* B7ABE4 80240B94 0C01BFA4 */ jal fx_emote -/* B7ABE8 80240B98 E7A40018 */ swc1 $f4, 0x18($sp) -/* B7ABEC 80240B9C 0200202D */ daddu $a0, $s0, $zero -/* B7ABF0 80240BA0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B7ABF4 80240BA4 0C012530 */ jal func_800494C0 -/* B7ABF8 80240BA8 3C060020 */ lui $a2, 0x20 -/* B7ABFC 80240BAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B7AC00 80240BB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B7AC04 80240BB4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B7AC08 80240BB8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B7AC0C 80240BBC 8C460028 */ lw $a2, 0x28($v0) -/* B7AC10 80240BC0 0C00A720 */ jal atan2 -/* B7AC14 80240BC4 8C470030 */ lw $a3, 0x30($v0) -/* B7AC18 80240BC8 2402000C */ addiu $v0, $zero, 0xc -/* B7AC1C 80240BCC E600000C */ swc1 $f0, 0xc($s0) -/* B7AC20 80240BD0 0809031B */ j .L80240C6C -/* B7AC24 80240BD4 AE820070 */ sw $v0, 0x70($s4) -.L80240BD8: -/* B7AC28 80240BD8 8602008C */ lh $v0, 0x8c($s0) -/* B7AC2C 80240BDC 14400023 */ bnez $v0, .L80240C6C -/* B7AC30 80240BE0 00000000 */ nop -/* B7AC34 80240BE4 9602008E */ lhu $v0, 0x8e($s0) -/* B7AC38 80240BE8 2442FFFF */ addiu $v0, $v0, -1 -/* B7AC3C 80240BEC A602008E */ sh $v0, 0x8e($s0) -/* B7AC40 80240BF0 00021400 */ sll $v0, $v0, 0x10 -/* B7AC44 80240BF4 1C40001D */ bgtz $v0, .L80240C6C -/* B7AC48 80240BF8 00000000 */ nop -/* B7AC4C 80240BFC 8E820074 */ lw $v0, 0x74($s4) -/* B7AC50 80240C00 2442FFFF */ addiu $v0, $v0, -1 -/* B7AC54 80240C04 18400018 */ blez $v0, .L80240C68 -/* B7AC58 80240C08 AE820074 */ sw $v0, 0x74($s4) -/* B7AC5C 80240C0C C600000C */ lwc1 $f0, 0xc($s0) -/* B7AC60 80240C10 3C014334 */ lui $at, 0x4334 -/* B7AC64 80240C14 44816000 */ mtc1 $at, $f12 -/* B7AC68 80240C18 0C00A6C9 */ jal clamp_angle -/* B7AC6C 80240C1C 460C0300 */ add.s $f12, $f0, $f12 -/* B7AC70 80240C20 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B7AC74 80240C24 0C00A67F */ jal rand_int -/* B7AC78 80240C28 E600000C */ swc1 $f0, 0xc($s0) -/* B7AC7C 80240C2C 3C032E8B */ lui $v1, 0x2e8b -/* B7AC80 80240C30 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* B7AC84 80240C34 00430018 */ mult $v0, $v1 -/* B7AC88 80240C38 00021FC3 */ sra $v1, $v0, 0x1f -/* B7AC8C 80240C3C 00004010 */ mfhi $t0 -/* B7AC90 80240C40 00082043 */ sra $a0, $t0, 1 -/* B7AC94 80240C44 00832023 */ subu $a0, $a0, $v1 -/* B7AC98 80240C48 00041840 */ sll $v1, $a0, 1 -/* B7AC9C 80240C4C 00641821 */ addu $v1, $v1, $a0 -/* B7ACA0 80240C50 00031880 */ sll $v1, $v1, 2 -/* B7ACA4 80240C54 00641823 */ subu $v1, $v1, $a0 -/* B7ACA8 80240C58 00431023 */ subu $v0, $v0, $v1 -/* B7ACAC 80240C5C 24420005 */ addiu $v0, $v0, 5 -/* B7ACB0 80240C60 0809031B */ j .L80240C6C -/* B7ACB4 80240C64 A602008E */ sh $v0, 0x8e($s0) -.L80240C68: -/* B7ACB8 80240C68 AE800070 */ sw $zero, 0x70($s4) -.L80240C6C: -/* B7ACBC 80240C6C 8FBF0044 */ lw $ra, 0x44($sp) -/* B7ACC0 80240C70 8FB40040 */ lw $s4, 0x40($sp) -/* B7ACC4 80240C74 8FB3003C */ lw $s3, 0x3c($sp) -/* B7ACC8 80240C78 8FB20038 */ lw $s2, 0x38($sp) -/* B7ACCC 80240C7C 8FB10034 */ lw $s1, 0x34($sp) -/* B7ACD0 80240C80 8FB00030 */ lw $s0, 0x30($sp) -/* B7ACD4 80240C84 03E00008 */ jr $ra -/* B7ACD8 80240C88 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8_B7AB38.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8_B7AB38.s new file mode 100644 index 0000000000..29c0fd4dba --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240AE8_B7AB38.s @@ -0,0 +1,112 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AE8_B7AB38 +/* B7AB38 80240AE8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B7AB3C 80240AEC AFB40040 */ sw $s4, 0x40($sp) +/* B7AB40 80240AF0 0080A02D */ daddu $s4, $a0, $zero +/* B7AB44 80240AF4 AFBF0044 */ sw $ra, 0x44($sp) +/* B7AB48 80240AF8 AFB3003C */ sw $s3, 0x3c($sp) +/* B7AB4C 80240AFC AFB20038 */ sw $s2, 0x38($sp) +/* B7AB50 80240B00 AFB10034 */ sw $s1, 0x34($sp) +/* B7AB54 80240B04 AFB00030 */ sw $s0, 0x30($sp) +/* B7AB58 80240B08 8E920148 */ lw $s2, 0x148($s4) +/* B7AB5C 80240B0C 00A0882D */ daddu $s1, $a1, $zero +/* B7AB60 80240B10 86440008 */ lh $a0, 8($s2) +/* B7AB64 80240B14 0C00EABB */ jal get_npc_unsafe +/* B7AB68 80240B18 00C0982D */ daddu $s3, $a2, $zero +/* B7AB6C 80240B1C 8E230014 */ lw $v1, 0x14($s1) +/* B7AB70 80240B20 0460002D */ bltz $v1, .L80240BD8 +/* B7AB74 80240B24 0040802D */ daddu $s0, $v0, $zero +/* B7AB78 80240B28 0260202D */ daddu $a0, $s3, $zero +/* B7AB7C 80240B2C AFA00010 */ sw $zero, 0x10($sp) +/* B7AB80 80240B30 8E260024 */ lw $a2, 0x24($s1) +/* B7AB84 80240B34 8E270028 */ lw $a3, 0x28($s1) +/* B7AB88 80240B38 0C01242D */ jal func_800490B4 +/* B7AB8C 80240B3C 0240282D */ daddu $a1, $s2, $zero +/* B7AB90 80240B40 10400025 */ beqz $v0, .L80240BD8 +/* B7AB94 80240B44 0000202D */ daddu $a0, $zero, $zero +/* B7AB98 80240B48 0200282D */ daddu $a1, $s0, $zero +/* B7AB9C 80240B4C 0000302D */ daddu $a2, $zero, $zero +/* B7ABA0 80240B50 860300A8 */ lh $v1, 0xa8($s0) +/* B7ABA4 80240B54 3C013F80 */ lui $at, 0x3f80 +/* B7ABA8 80240B58 44810000 */ mtc1 $at, $f0 +/* B7ABAC 80240B5C 3C014000 */ lui $at, 0x4000 +/* B7ABB0 80240B60 44811000 */ mtc1 $at, $f2 +/* B7ABB4 80240B64 3C01C1A0 */ lui $at, 0xc1a0 +/* B7ABB8 80240B68 44812000 */ mtc1 $at, $f4 +/* B7ABBC 80240B6C 2402000F */ addiu $v0, $zero, 0xf +/* B7ABC0 80240B70 AFA2001C */ sw $v0, 0x1c($sp) +/* B7ABC4 80240B74 44833000 */ mtc1 $v1, $f6 +/* B7ABC8 80240B78 00000000 */ nop +/* B7ABCC 80240B7C 468031A0 */ cvt.s.w $f6, $f6 +/* B7ABD0 80240B80 44073000 */ mfc1 $a3, $f6 +/* B7ABD4 80240B84 27A20028 */ addiu $v0, $sp, 0x28 +/* B7ABD8 80240B88 AFA20020 */ sw $v0, 0x20($sp) +/* B7ABDC 80240B8C E7A00010 */ swc1 $f0, 0x10($sp) +/* B7ABE0 80240B90 E7A20014 */ swc1 $f2, 0x14($sp) +/* B7ABE4 80240B94 0C01BFA4 */ jal fx_emote +/* B7ABE8 80240B98 E7A40018 */ swc1 $f4, 0x18($sp) +/* B7ABEC 80240B9C 0200202D */ daddu $a0, $s0, $zero +/* B7ABF0 80240BA0 240502F4 */ addiu $a1, $zero, 0x2f4 +/* B7ABF4 80240BA4 0C012530 */ jal func_800494C0 +/* B7ABF8 80240BA8 3C060020 */ lui $a2, 0x20 +/* B7ABFC 80240BAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B7AC00 80240BB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B7AC04 80240BB4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B7AC08 80240BB8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B7AC0C 80240BBC 8C460028 */ lw $a2, 0x28($v0) +/* B7AC10 80240BC0 0C00A720 */ jal atan2 +/* B7AC14 80240BC4 8C470030 */ lw $a3, 0x30($v0) +/* B7AC18 80240BC8 2402000C */ addiu $v0, $zero, 0xc +/* B7AC1C 80240BCC E600000C */ swc1 $f0, 0xc($s0) +/* B7AC20 80240BD0 0809031B */ j .L80240C6C +/* B7AC24 80240BD4 AE820070 */ sw $v0, 0x70($s4) +.L80240BD8: +/* B7AC28 80240BD8 8602008C */ lh $v0, 0x8c($s0) +/* B7AC2C 80240BDC 14400023 */ bnez $v0, .L80240C6C +/* B7AC30 80240BE0 00000000 */ nop +/* B7AC34 80240BE4 9602008E */ lhu $v0, 0x8e($s0) +/* B7AC38 80240BE8 2442FFFF */ addiu $v0, $v0, -1 +/* B7AC3C 80240BEC A602008E */ sh $v0, 0x8e($s0) +/* B7AC40 80240BF0 00021400 */ sll $v0, $v0, 0x10 +/* B7AC44 80240BF4 1C40001D */ bgtz $v0, .L80240C6C +/* B7AC48 80240BF8 00000000 */ nop +/* B7AC4C 80240BFC 8E820074 */ lw $v0, 0x74($s4) +/* B7AC50 80240C00 2442FFFF */ addiu $v0, $v0, -1 +/* B7AC54 80240C04 18400018 */ blez $v0, .L80240C68 +/* B7AC58 80240C08 AE820074 */ sw $v0, 0x74($s4) +/* B7AC5C 80240C0C C600000C */ lwc1 $f0, 0xc($s0) +/* B7AC60 80240C10 3C014334 */ lui $at, 0x4334 +/* B7AC64 80240C14 44816000 */ mtc1 $at, $f12 +/* B7AC68 80240C18 0C00A6C9 */ jal clamp_angle +/* B7AC6C 80240C1C 460C0300 */ add.s $f12, $f0, $f12 +/* B7AC70 80240C20 240403E8 */ addiu $a0, $zero, 0x3e8 +/* B7AC74 80240C24 0C00A67F */ jal rand_int +/* B7AC78 80240C28 E600000C */ swc1 $f0, 0xc($s0) +/* B7AC7C 80240C2C 3C032E8B */ lui $v1, 0x2e8b +/* B7AC80 80240C30 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* B7AC84 80240C34 00430018 */ mult $v0, $v1 +/* B7AC88 80240C38 00021FC3 */ sra $v1, $v0, 0x1f +/* B7AC8C 80240C3C 00004010 */ mfhi $t0 +/* B7AC90 80240C40 00082043 */ sra $a0, $t0, 1 +/* B7AC94 80240C44 00832023 */ subu $a0, $a0, $v1 +/* B7AC98 80240C48 00041840 */ sll $v1, $a0, 1 +/* B7AC9C 80240C4C 00641821 */ addu $v1, $v1, $a0 +/* B7ACA0 80240C50 00031880 */ sll $v1, $v1, 2 +/* B7ACA4 80240C54 00641823 */ subu $v1, $v1, $a0 +/* B7ACA8 80240C58 00431023 */ subu $v0, $v0, $v1 +/* B7ACAC 80240C5C 24420005 */ addiu $v0, $v0, 5 +/* B7ACB0 80240C60 0809031B */ j .L80240C6C +/* B7ACB4 80240C64 A602008E */ sh $v0, 0x8e($s0) +.L80240C68: +/* B7ACB8 80240C68 AE800070 */ sw $zero, 0x70($s4) +.L80240C6C: +/* B7ACBC 80240C6C 8FBF0044 */ lw $ra, 0x44($sp) +/* B7ACC0 80240C70 8FB40040 */ lw $s4, 0x40($sp) +/* B7ACC4 80240C74 8FB3003C */ lw $s3, 0x3c($sp) +/* B7ACC8 80240C78 8FB20038 */ lw $s2, 0x38($sp) +/* B7ACCC 80240C7C 8FB10034 */ lw $s1, 0x34($sp) +/* B7ACD0 80240C80 8FB00030 */ lw $s0, 0x30($sp) +/* B7ACD4 80240C84 03E00008 */ jr $ra +/* B7ACD8 80240C88 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C.s deleted file mode 100644 index 7b8743fc6b..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C8C -/* B7ACDC 80240C8C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B7ACE0 80240C90 AFB10014 */ sw $s1, 0x14($sp) -/* B7ACE4 80240C94 0080882D */ daddu $s1, $a0, $zero -/* B7ACE8 80240C98 AFBF001C */ sw $ra, 0x1c($sp) -/* B7ACEC 80240C9C AFB20018 */ sw $s2, 0x18($sp) -/* B7ACF0 80240CA0 AFB00010 */ sw $s0, 0x10($sp) -/* B7ACF4 80240CA4 8E220148 */ lw $v0, 0x148($s1) -/* B7ACF8 80240CA8 00A0902D */ daddu $s2, $a1, $zero -/* B7ACFC 80240CAC 84440008 */ lh $a0, 8($v0) -/* B7AD00 80240CB0 0C00EABB */ jal get_npc_unsafe -/* B7AD04 80240CB4 00C0802D */ daddu $s0, $a2, $zero -/* B7AD08 80240CB8 0220202D */ daddu $a0, $s1, $zero -/* B7AD0C 80240CBC 0240282D */ daddu $a1, $s2, $zero -/* B7AD10 80240CC0 0200302D */ daddu $a2, $s0, $zero -/* B7AD14 80240CC4 0C0127DF */ jal func_80049F7C -/* B7AD18 80240CC8 0040802D */ daddu $s0, $v0, $zero -/* B7AD1C 80240CCC 8E020000 */ lw $v0, ($s0) -/* B7AD20 80240CD0 24040005 */ addiu $a0, $zero, 5 -/* B7AD24 80240CD4 34420800 */ ori $v0, $v0, 0x800 -/* B7AD28 80240CD8 0C00A67F */ jal rand_int -/* B7AD2C 80240CDC AE020000 */ sw $v0, ($s0) -/* B7AD30 80240CE0 44820000 */ mtc1 $v0, $f0 -/* B7AD34 80240CE4 00000000 */ nop -/* B7AD38 80240CE8 46800021 */ cvt.d.w $f0, $f0 -/* B7AD3C 80240CEC 3C014024 */ lui $at, 0x4024 -/* B7AD40 80240CF0 44811800 */ mtc1 $at, $f3 -/* B7AD44 80240CF4 44801000 */ mtc1 $zero, $f2 -/* B7AD48 80240CF8 3C013FC0 */ lui $at, 0x3fc0 -/* B7AD4C 80240CFC 44812000 */ mtc1 $at, $f4 -/* B7AD50 80240D00 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B7AD54 80240D04 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B7AD58 80240D08 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B7AD5C 80240D0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* B7AD60 80240D10 46220000 */ add.d $f0, $f0, $f2 -/* B7AD64 80240D14 E6040014 */ swc1 $f4, 0x14($s0) -/* B7AD68 80240D18 46200020 */ cvt.s.d $f0, $f0 -/* B7AD6C 80240D1C E600001C */ swc1 $f0, 0x1c($s0) -/* B7AD70 80240D20 8C460028 */ lw $a2, 0x28($v0) -/* B7AD74 80240D24 0C00A720 */ jal atan2 -/* B7AD78 80240D28 8C470030 */ lw $a3, 0x30($v0) -/* B7AD7C 80240D2C 0200202D */ daddu $a0, $s0, $zero -/* B7AD80 80240D30 3C05B000 */ lui $a1, 0xb000 -/* B7AD84 80240D34 34A50017 */ ori $a1, $a1, 0x17 -/* B7AD88 80240D38 0000302D */ daddu $a2, $zero, $zero -/* B7AD8C 80240D3C E480000C */ swc1 $f0, 0xc($a0) -/* B7AD90 80240D40 C6400018 */ lwc1 $f0, 0x18($s2) -/* B7AD94 80240D44 2402000D */ addiu $v0, $zero, 0xd -/* B7AD98 80240D48 E4800018 */ swc1 $f0, 0x18($a0) -/* B7AD9C 80240D4C 0C012530 */ jal func_800494C0 -/* B7ADA0 80240D50 AE220070 */ sw $v0, 0x70($s1) -/* B7ADA4 80240D54 8FBF001C */ lw $ra, 0x1c($sp) -/* B7ADA8 80240D58 8FB20018 */ lw $s2, 0x18($sp) -/* B7ADAC 80240D5C 8FB10014 */ lw $s1, 0x14($sp) -/* B7ADB0 80240D60 8FB00010 */ lw $s0, 0x10($sp) -/* B7ADB4 80240D64 03E00008 */ jr $ra -/* B7ADB8 80240D68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s new file mode 100644 index 0000000000..68363bb544 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240C8C_B7ACDC.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C8C_B7ACDC +/* B7ACDC 80240C8C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B7ACE0 80240C90 AFB10014 */ sw $s1, 0x14($sp) +/* B7ACE4 80240C94 0080882D */ daddu $s1, $a0, $zero +/* B7ACE8 80240C98 AFBF001C */ sw $ra, 0x1c($sp) +/* B7ACEC 80240C9C AFB20018 */ sw $s2, 0x18($sp) +/* B7ACF0 80240CA0 AFB00010 */ sw $s0, 0x10($sp) +/* B7ACF4 80240CA4 8E220148 */ lw $v0, 0x148($s1) +/* B7ACF8 80240CA8 00A0902D */ daddu $s2, $a1, $zero +/* B7ACFC 80240CAC 84440008 */ lh $a0, 8($v0) +/* B7AD00 80240CB0 0C00EABB */ jal get_npc_unsafe +/* B7AD04 80240CB4 00C0802D */ daddu $s0, $a2, $zero +/* B7AD08 80240CB8 0220202D */ daddu $a0, $s1, $zero +/* B7AD0C 80240CBC 0240282D */ daddu $a1, $s2, $zero +/* B7AD10 80240CC0 0200302D */ daddu $a2, $s0, $zero +/* B7AD14 80240CC4 0C0127DF */ jal func_80049F7C +/* B7AD18 80240CC8 0040802D */ daddu $s0, $v0, $zero +/* B7AD1C 80240CCC 8E020000 */ lw $v0, ($s0) +/* B7AD20 80240CD0 24040005 */ addiu $a0, $zero, 5 +/* B7AD24 80240CD4 34420800 */ ori $v0, $v0, 0x800 +/* B7AD28 80240CD8 0C00A67F */ jal rand_int +/* B7AD2C 80240CDC AE020000 */ sw $v0, ($s0) +/* B7AD30 80240CE0 44820000 */ mtc1 $v0, $f0 +/* B7AD34 80240CE4 00000000 */ nop +/* B7AD38 80240CE8 46800021 */ cvt.d.w $f0, $f0 +/* B7AD3C 80240CEC 3C014024 */ lui $at, 0x4024 +/* B7AD40 80240CF0 44811800 */ mtc1 $at, $f3 +/* B7AD44 80240CF4 44801000 */ mtc1 $zero, $f2 +/* B7AD48 80240CF8 3C013FC0 */ lui $at, 0x3fc0 +/* B7AD4C 80240CFC 44812000 */ mtc1 $at, $f4 +/* B7AD50 80240D00 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B7AD54 80240D04 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B7AD58 80240D08 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B7AD5C 80240D0C C60E0040 */ lwc1 $f14, 0x40($s0) +/* B7AD60 80240D10 46220000 */ add.d $f0, $f0, $f2 +/* B7AD64 80240D14 E6040014 */ swc1 $f4, 0x14($s0) +/* B7AD68 80240D18 46200020 */ cvt.s.d $f0, $f0 +/* B7AD6C 80240D1C E600001C */ swc1 $f0, 0x1c($s0) +/* B7AD70 80240D20 8C460028 */ lw $a2, 0x28($v0) +/* B7AD74 80240D24 0C00A720 */ jal atan2 +/* B7AD78 80240D28 8C470030 */ lw $a3, 0x30($v0) +/* B7AD7C 80240D2C 0200202D */ daddu $a0, $s0, $zero +/* B7AD80 80240D30 3C05B000 */ lui $a1, 0xb000 +/* B7AD84 80240D34 34A50017 */ ori $a1, $a1, 0x17 +/* B7AD88 80240D38 0000302D */ daddu $a2, $zero, $zero +/* B7AD8C 80240D3C E480000C */ swc1 $f0, 0xc($a0) +/* B7AD90 80240D40 C6400018 */ lwc1 $f0, 0x18($s2) +/* B7AD94 80240D44 2402000D */ addiu $v0, $zero, 0xd +/* B7AD98 80240D48 E4800018 */ swc1 $f0, 0x18($a0) +/* B7AD9C 80240D4C 0C012530 */ jal func_800494C0 +/* B7ADA0 80240D50 AE220070 */ sw $v0, 0x70($s1) +/* B7ADA4 80240D54 8FBF001C */ lw $ra, 0x1c($sp) +/* B7ADA8 80240D58 8FB20018 */ lw $s2, 0x18($sp) +/* B7ADAC 80240D5C 8FB10014 */ lw $s1, 0x14($sp) +/* B7ADB0 80240D60 8FB00010 */ lw $s0, 0x10($sp) +/* B7ADB4 80240D64 03E00008 */ jr $ra +/* B7ADB8 80240D68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C.s deleted file mode 100644 index 6ba7851d68..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C.s +++ /dev/null @@ -1,200 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D6C -/* B7ADBC 80240D6C 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B7ADC0 80240D70 AFB40050 */ sw $s4, 0x50($sp) -/* B7ADC4 80240D74 0080A02D */ daddu $s4, $a0, $zero -/* B7ADC8 80240D78 AFBF0060 */ sw $ra, 0x60($sp) -/* B7ADCC 80240D7C AFB7005C */ sw $s7, 0x5c($sp) -/* B7ADD0 80240D80 AFB60058 */ sw $s6, 0x58($sp) -/* B7ADD4 80240D84 AFB50054 */ sw $s5, 0x54($sp) -/* B7ADD8 80240D88 AFB3004C */ sw $s3, 0x4c($sp) -/* B7ADDC 80240D8C AFB20048 */ sw $s2, 0x48($sp) -/* B7ADE0 80240D90 AFB10044 */ sw $s1, 0x44($sp) -/* B7ADE4 80240D94 AFB00040 */ sw $s0, 0x40($sp) -/* B7ADE8 80240D98 F7B40068 */ sdc1 $f20, 0x68($sp) -/* B7ADEC 80240D9C 8E950148 */ lw $s5, 0x148($s4) -/* B7ADF0 80240DA0 00A0B02D */ daddu $s6, $a1, $zero -/* B7ADF4 80240DA4 86A40008 */ lh $a0, 8($s5) -/* B7ADF8 80240DA8 0C00EABB */ jal get_npc_unsafe -/* B7ADFC 80240DAC 00C0B82D */ daddu $s7, $a2, $zero -/* B7AE00 80240DB0 0040982D */ daddu $s3, $v0, $zero -/* B7AE04 80240DB4 C6600018 */ lwc1 $f0, 0x18($s3) -/* B7AE08 80240DB8 44801000 */ mtc1 $zero, $f2 -/* B7AE0C 80240DBC 44801800 */ mtc1 $zero, $f3 -/* B7AE10 80240DC0 46000021 */ cvt.d.s $f0, $f0 -/* B7AE14 80240DC4 4620103C */ c.lt.d $f2, $f0 -/* B7AE18 80240DC8 00000000 */ nop -/* B7AE1C 80240DCC 45000021 */ bc1f .L80240E54 -/* B7AE20 80240DD0 27A50028 */ addiu $a1, $sp, 0x28 -/* B7AE24 80240DD4 C6600038 */ lwc1 $f0, 0x38($s3) -/* B7AE28 80240DD8 C662003C */ lwc1 $f2, 0x3c($s3) -/* B7AE2C 80240DDC C6640040 */ lwc1 $f4, 0x40($s3) -/* B7AE30 80240DE0 C6660018 */ lwc1 $f6, 0x18($s3) -/* B7AE34 80240DE4 E7A00028 */ swc1 $f0, 0x28($sp) -/* B7AE38 80240DE8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* B7AE3C 80240DEC E7A40030 */ swc1 $f4, 0x30($sp) -/* B7AE40 80240DF0 E7A60010 */ swc1 $f6, 0x10($sp) -/* B7AE44 80240DF4 C660000C */ lwc1 $f0, 0xc($s3) -/* B7AE48 80240DF8 E7A00014 */ swc1 $f0, 0x14($sp) -/* B7AE4C 80240DFC 866200A8 */ lh $v0, 0xa8($s3) -/* B7AE50 80240E00 44820000 */ mtc1 $v0, $f0 -/* B7AE54 80240E04 00000000 */ nop -/* B7AE58 80240E08 46800020 */ cvt.s.w $f0, $f0 -/* B7AE5C 80240E0C E7A00018 */ swc1 $f0, 0x18($sp) -/* B7AE60 80240E10 866200A6 */ lh $v0, 0xa6($s3) -/* B7AE64 80240E14 27A6002C */ addiu $a2, $sp, 0x2c -/* B7AE68 80240E18 44820000 */ mtc1 $v0, $f0 -/* B7AE6C 80240E1C 00000000 */ nop -/* B7AE70 80240E20 46800020 */ cvt.s.w $f0, $f0 -/* B7AE74 80240E24 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B7AE78 80240E28 8E640080 */ lw $a0, 0x80($s3) -/* B7AE7C 80240E2C 0C037711 */ jal func_800DDC44 -/* B7AE80 80240E30 27A70030 */ addiu $a3, $sp, 0x30 -/* B7AE84 80240E34 10400003 */ beqz $v0, .L80240E44 -/* B7AE88 80240E38 00000000 */ nop -/* B7AE8C 80240E3C 08090395 */ j .L80240E54 -/* B7AE90 80240E40 AE600018 */ sw $zero, 0x18($s3) -.L80240E44: -/* B7AE94 80240E44 8E650018 */ lw $a1, 0x18($s3) -/* B7AE98 80240E48 8E66000C */ lw $a2, 0xc($s3) -/* B7AE9C 80240E4C 0C00EA95 */ jal npc_move_heading -/* B7AEA0 80240E50 0260202D */ daddu $a0, $s3, $zero -.L80240E54: -/* B7AEA4 80240E54 C660001C */ lwc1 $f0, 0x1c($s3) -/* B7AEA8 80240E58 44801000 */ mtc1 $zero, $f2 -/* B7AEAC 80240E5C 44801800 */ mtc1 $zero, $f3 -/* B7AEB0 80240E60 46000021 */ cvt.d.s $f0, $f0 -/* B7AEB4 80240E64 4622003C */ c.lt.d $f0, $f2 -/* B7AEB8 80240E68 00000000 */ nop -/* B7AEBC 80240E6C 4500006C */ bc1f .L80241020 -/* B7AEC0 80240E70 27B00028 */ addiu $s0, $sp, 0x28 -/* B7AEC4 80240E74 0200282D */ daddu $a1, $s0, $zero -/* B7AEC8 80240E78 27A60034 */ addiu $a2, $sp, 0x34 -/* B7AECC 80240E7C 27B20038 */ addiu $s2, $sp, 0x38 -/* B7AED0 80240E80 C6600038 */ lwc1 $f0, 0x38($s3) -/* B7AED4 80240E84 3C0142C8 */ lui $at, 0x42c8 -/* B7AED8 80240E88 44811000 */ mtc1 $at, $f2 -/* B7AEDC 80240E8C C6640040 */ lwc1 $f4, 0x40($s3) -/* B7AEE0 80240E90 3C01447A */ lui $at, 0x447a -/* B7AEE4 80240E94 44813000 */ mtc1 $at, $f6 -/* B7AEE8 80240E98 27B10030 */ addiu $s1, $sp, 0x30 -/* B7AEEC 80240E9C E7A00028 */ swc1 $f0, 0x28($sp) -/* B7AEF0 80240EA0 E7A20034 */ swc1 $f2, 0x34($sp) -/* B7AEF4 80240EA4 E7A40030 */ swc1 $f4, 0x30($sp) -/* B7AEF8 80240EA8 E7A60038 */ swc1 $f6, 0x38($sp) -/* B7AEFC 80240EAC AFB20010 */ sw $s2, 0x10($sp) -/* B7AF00 80240EB0 8E640080 */ lw $a0, 0x80($s3) -/* B7AF04 80240EB4 0C0372DF */ jal func_800DCB7C -/* B7AF08 80240EB8 0220382D */ daddu $a3, $s1, $zero -/* B7AF0C 80240EBC 0200282D */ daddu $a1, $s0, $zero -/* B7AF10 80240EC0 27A6002C */ addiu $a2, $sp, 0x2c -/* B7AF14 80240EC4 C662003C */ lwc1 $f2, 0x3c($s3) -/* B7AF18 80240EC8 C6660038 */ lwc1 $f6, 0x38($s3) -/* B7AF1C 80240ECC 3C01402A */ lui $at, 0x402a -/* B7AF20 80240ED0 4481A800 */ mtc1 $at, $f21 -/* B7AF24 80240ED4 4480A000 */ mtc1 $zero, $f20 -/* B7AF28 80240ED8 460010A1 */ cvt.d.s $f2, $f2 -/* B7AF2C 80240EDC 46341080 */ add.d $f2, $f2, $f20 -/* B7AF30 80240EE0 C660001C */ lwc1 $f0, 0x1c($s3) -/* B7AF34 80240EE4 C6640040 */ lwc1 $f4, 0x40($s3) -/* B7AF38 80240EE8 46000005 */ abs.s $f0, $f0 -/* B7AF3C 80240EEC E7A40030 */ swc1 $f4, 0x30($sp) -/* B7AF40 80240EF0 3C014030 */ lui $at, 0x4030 -/* B7AF44 80240EF4 44812800 */ mtc1 $at, $f5 -/* B7AF48 80240EF8 44802000 */ mtc1 $zero, $f4 -/* B7AF4C 80240EFC 46000021 */ cvt.d.s $f0, $f0 -/* B7AF50 80240F00 E7A60028 */ swc1 $f6, 0x28($sp) -/* B7AF54 80240F04 46240000 */ add.d $f0, $f0, $f4 -/* B7AF58 80240F08 462010A0 */ cvt.s.d $f2, $f2 -/* B7AF5C 80240F0C E7A2002C */ swc1 $f2, 0x2c($sp) -/* B7AF60 80240F10 46200020 */ cvt.s.d $f0, $f0 -/* B7AF64 80240F14 E7A00038 */ swc1 $f0, 0x38($sp) -/* B7AF68 80240F18 AFB20010 */ sw $s2, 0x10($sp) -/* B7AF6C 80240F1C 8E640080 */ lw $a0, 0x80($s3) -/* B7AF70 80240F20 0C0372DF */ jal func_800DCB7C -/* B7AF74 80240F24 0220382D */ daddu $a3, $s1, $zero -/* B7AF78 80240F28 1040003D */ beqz $v0, .L80241020 -/* B7AF7C 80240F2C 00000000 */ nop -/* B7AF80 80240F30 C660001C */ lwc1 $f0, 0x1c($s3) -/* B7AF84 80240F34 C7A20038 */ lwc1 $f2, 0x38($sp) -/* B7AF88 80240F38 46000005 */ abs.s $f0, $f0 -/* B7AF8C 80240F3C 46000021 */ cvt.d.s $f0, $f0 -/* B7AF90 80240F40 46340000 */ add.d $f0, $f0, $f20 -/* B7AF94 80240F44 460010A1 */ cvt.d.s $f2, $f2 -/* B7AF98 80240F48 4620103E */ c.le.d $f2, $f0 -/* B7AF9C 80240F4C 00000000 */ nop -/* B7AFA0 80240F50 45000033 */ bc1f .L80241020 -/* B7AFA4 80240F54 2403F7FF */ addiu $v1, $zero, -0x801 -/* B7AFA8 80240F58 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* B7AFAC 80240F5C 8E620000 */ lw $v0, ($s3) -/* B7AFB0 80240F60 AE60001C */ sw $zero, 0x1c($s3) -/* B7AFB4 80240F64 00431024 */ and $v0, $v0, $v1 -/* B7AFB8 80240F68 E660003C */ swc1 $f0, 0x3c($s3) -/* B7AFBC 80240F6C AE620000 */ sw $v0, ($s3) -/* B7AFC0 80240F70 AFA00010 */ sw $zero, 0x10($sp) -/* B7AFC4 80240F74 AFA00014 */ sw $zero, 0x14($sp) -/* B7AFC8 80240F78 8E650038 */ lw $a1, 0x38($s3) -/* B7AFCC 80240F7C 8E66003C */ lw $a2, 0x3c($s3) -/* B7AFD0 80240F80 8E670040 */ lw $a3, 0x40($s3) -/* B7AFD4 80240F84 0C01BECC */ jal fx_walk_normal -/* B7AFD8 80240F88 24040002 */ addiu $a0, $zero, 2 -/* B7AFDC 80240F8C 02E0202D */ daddu $a0, $s7, $zero -/* B7AFE0 80240F90 2402000C */ addiu $v0, $zero, 0xc -/* B7AFE4 80240F94 AE820070 */ sw $v0, 0x70($s4) -/* B7AFE8 80240F98 24020001 */ addiu $v0, $zero, 1 -/* B7AFEC 80240F9C AFA20010 */ sw $v0, 0x10($sp) -/* B7AFF0 80240FA0 8EC60024 */ lw $a2, 0x24($s6) -/* B7AFF4 80240FA4 8EC70028 */ lw $a3, 0x28($s6) -/* B7AFF8 80240FA8 0C01242D */ jal func_800490B4 -/* B7AFFC 80240FAC 02A0282D */ daddu $a1, $s5, $zero -/* B7B000 80240FB0 14400022 */ bnez $v0, .L8024103C -/* B7B004 80240FB4 24040002 */ addiu $a0, $zero, 2 -/* B7B008 80240FB8 0260282D */ daddu $a1, $s3, $zero -/* B7B00C 80240FBC 0000302D */ daddu $a2, $zero, $zero -/* B7B010 80240FC0 866300A8 */ lh $v1, 0xa8($s3) -/* B7B014 80240FC4 3C013F80 */ lui $at, 0x3f80 -/* B7B018 80240FC8 44810000 */ mtc1 $at, $f0 -/* B7B01C 80240FCC 3C014000 */ lui $at, 0x4000 -/* B7B020 80240FD0 44811000 */ mtc1 $at, $f2 -/* B7B024 80240FD4 3C01C1A0 */ lui $at, 0xc1a0 -/* B7B028 80240FD8 44812000 */ mtc1 $at, $f4 -/* B7B02C 80240FDC 2402000F */ addiu $v0, $zero, 0xf -/* B7B030 80240FE0 AFA2001C */ sw $v0, 0x1c($sp) -/* B7B034 80240FE4 44834000 */ mtc1 $v1, $f8 -/* B7B038 80240FE8 00000000 */ nop -/* B7B03C 80240FEC 46804220 */ cvt.s.w $f8, $f8 -/* B7B040 80240FF0 44074000 */ mfc1 $a3, $f8 -/* B7B044 80240FF4 27A2003C */ addiu $v0, $sp, 0x3c -/* B7B048 80240FF8 AFA20020 */ sw $v0, 0x20($sp) -/* B7B04C 80240FFC E7A00010 */ swc1 $f0, 0x10($sp) -/* B7B050 80241000 E7A20014 */ swc1 $f2, 0x14($sp) -/* B7B054 80241004 0C01BFA4 */ jal fx_emote -/* B7B058 80241008 E7A40018 */ swc1 $f4, 0x18($sp) -/* B7B05C 8024100C 24020019 */ addiu $v0, $zero, 0x19 -/* B7B060 80241010 A662008E */ sh $v0, 0x8e($s3) -/* B7B064 80241014 2402000E */ addiu $v0, $zero, 0xe -/* B7B068 80241018 0809040F */ j .L8024103C -/* B7B06C 8024101C AE820070 */ sw $v0, 0x70($s4) -.L80241020: -/* B7B070 80241020 C664003C */ lwc1 $f4, 0x3c($s3) -/* B7B074 80241024 C660001C */ lwc1 $f0, 0x1c($s3) -/* B7B078 80241028 46002100 */ add.s $f4, $f4, $f0 -/* B7B07C 8024102C C6620014 */ lwc1 $f2, 0x14($s3) -/* B7B080 80241030 46020001 */ sub.s $f0, $f0, $f2 -/* B7B084 80241034 E664003C */ swc1 $f4, 0x3c($s3) -/* B7B088 80241038 E660001C */ swc1 $f0, 0x1c($s3) -.L8024103C: -/* B7B08C 8024103C 8FBF0060 */ lw $ra, 0x60($sp) -/* B7B090 80241040 8FB7005C */ lw $s7, 0x5c($sp) -/* B7B094 80241044 8FB60058 */ lw $s6, 0x58($sp) -/* B7B098 80241048 8FB50054 */ lw $s5, 0x54($sp) -/* B7B09C 8024104C 8FB40050 */ lw $s4, 0x50($sp) -/* B7B0A0 80241050 8FB3004C */ lw $s3, 0x4c($sp) -/* B7B0A4 80241054 8FB20048 */ lw $s2, 0x48($sp) -/* B7B0A8 80241058 8FB10044 */ lw $s1, 0x44($sp) -/* B7B0AC 8024105C 8FB00040 */ lw $s0, 0x40($sp) -/* B7B0B0 80241060 D7B40068 */ ldc1 $f20, 0x68($sp) -/* B7B0B4 80241064 03E00008 */ jr $ra -/* B7B0B8 80241068 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C_B7ADBC.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C_B7ADBC.s new file mode 100644 index 0000000000..023daa0350 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_80240D6C_B7ADBC.s @@ -0,0 +1,200 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D6C_B7ADBC +/* B7ADBC 80240D6C 27BDFF90 */ addiu $sp, $sp, -0x70 +/* B7ADC0 80240D70 AFB40050 */ sw $s4, 0x50($sp) +/* B7ADC4 80240D74 0080A02D */ daddu $s4, $a0, $zero +/* B7ADC8 80240D78 AFBF0060 */ sw $ra, 0x60($sp) +/* B7ADCC 80240D7C AFB7005C */ sw $s7, 0x5c($sp) +/* B7ADD0 80240D80 AFB60058 */ sw $s6, 0x58($sp) +/* B7ADD4 80240D84 AFB50054 */ sw $s5, 0x54($sp) +/* B7ADD8 80240D88 AFB3004C */ sw $s3, 0x4c($sp) +/* B7ADDC 80240D8C AFB20048 */ sw $s2, 0x48($sp) +/* B7ADE0 80240D90 AFB10044 */ sw $s1, 0x44($sp) +/* B7ADE4 80240D94 AFB00040 */ sw $s0, 0x40($sp) +/* B7ADE8 80240D98 F7B40068 */ sdc1 $f20, 0x68($sp) +/* B7ADEC 80240D9C 8E950148 */ lw $s5, 0x148($s4) +/* B7ADF0 80240DA0 00A0B02D */ daddu $s6, $a1, $zero +/* B7ADF4 80240DA4 86A40008 */ lh $a0, 8($s5) +/* B7ADF8 80240DA8 0C00EABB */ jal get_npc_unsafe +/* B7ADFC 80240DAC 00C0B82D */ daddu $s7, $a2, $zero +/* B7AE00 80240DB0 0040982D */ daddu $s3, $v0, $zero +/* B7AE04 80240DB4 C6600018 */ lwc1 $f0, 0x18($s3) +/* B7AE08 80240DB8 44801000 */ mtc1 $zero, $f2 +/* B7AE0C 80240DBC 44801800 */ mtc1 $zero, $f3 +/* B7AE10 80240DC0 46000021 */ cvt.d.s $f0, $f0 +/* B7AE14 80240DC4 4620103C */ c.lt.d $f2, $f0 +/* B7AE18 80240DC8 00000000 */ nop +/* B7AE1C 80240DCC 45000021 */ bc1f .L80240E54 +/* B7AE20 80240DD0 27A50028 */ addiu $a1, $sp, 0x28 +/* B7AE24 80240DD4 C6600038 */ lwc1 $f0, 0x38($s3) +/* B7AE28 80240DD8 C662003C */ lwc1 $f2, 0x3c($s3) +/* B7AE2C 80240DDC C6640040 */ lwc1 $f4, 0x40($s3) +/* B7AE30 80240DE0 C6660018 */ lwc1 $f6, 0x18($s3) +/* B7AE34 80240DE4 E7A00028 */ swc1 $f0, 0x28($sp) +/* B7AE38 80240DE8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* B7AE3C 80240DEC E7A40030 */ swc1 $f4, 0x30($sp) +/* B7AE40 80240DF0 E7A60010 */ swc1 $f6, 0x10($sp) +/* B7AE44 80240DF4 C660000C */ lwc1 $f0, 0xc($s3) +/* B7AE48 80240DF8 E7A00014 */ swc1 $f0, 0x14($sp) +/* B7AE4C 80240DFC 866200A8 */ lh $v0, 0xa8($s3) +/* B7AE50 80240E00 44820000 */ mtc1 $v0, $f0 +/* B7AE54 80240E04 00000000 */ nop +/* B7AE58 80240E08 46800020 */ cvt.s.w $f0, $f0 +/* B7AE5C 80240E0C E7A00018 */ swc1 $f0, 0x18($sp) +/* B7AE60 80240E10 866200A6 */ lh $v0, 0xa6($s3) +/* B7AE64 80240E14 27A6002C */ addiu $a2, $sp, 0x2c +/* B7AE68 80240E18 44820000 */ mtc1 $v0, $f0 +/* B7AE6C 80240E1C 00000000 */ nop +/* B7AE70 80240E20 46800020 */ cvt.s.w $f0, $f0 +/* B7AE74 80240E24 E7A0001C */ swc1 $f0, 0x1c($sp) +/* B7AE78 80240E28 8E640080 */ lw $a0, 0x80($s3) +/* B7AE7C 80240E2C 0C037711 */ jal func_800DDC44 +/* B7AE80 80240E30 27A70030 */ addiu $a3, $sp, 0x30 +/* B7AE84 80240E34 10400003 */ beqz $v0, .L80240E44 +/* B7AE88 80240E38 00000000 */ nop +/* B7AE8C 80240E3C 08090395 */ j .L80240E54 +/* B7AE90 80240E40 AE600018 */ sw $zero, 0x18($s3) +.L80240E44: +/* B7AE94 80240E44 8E650018 */ lw $a1, 0x18($s3) +/* B7AE98 80240E48 8E66000C */ lw $a2, 0xc($s3) +/* B7AE9C 80240E4C 0C00EA95 */ jal npc_move_heading +/* B7AEA0 80240E50 0260202D */ daddu $a0, $s3, $zero +.L80240E54: +/* B7AEA4 80240E54 C660001C */ lwc1 $f0, 0x1c($s3) +/* B7AEA8 80240E58 44801000 */ mtc1 $zero, $f2 +/* B7AEAC 80240E5C 44801800 */ mtc1 $zero, $f3 +/* B7AEB0 80240E60 46000021 */ cvt.d.s $f0, $f0 +/* B7AEB4 80240E64 4622003C */ c.lt.d $f0, $f2 +/* B7AEB8 80240E68 00000000 */ nop +/* B7AEBC 80240E6C 4500006C */ bc1f .L80241020 +/* B7AEC0 80240E70 27B00028 */ addiu $s0, $sp, 0x28 +/* B7AEC4 80240E74 0200282D */ daddu $a1, $s0, $zero +/* B7AEC8 80240E78 27A60034 */ addiu $a2, $sp, 0x34 +/* B7AECC 80240E7C 27B20038 */ addiu $s2, $sp, 0x38 +/* B7AED0 80240E80 C6600038 */ lwc1 $f0, 0x38($s3) +/* B7AED4 80240E84 3C0142C8 */ lui $at, 0x42c8 +/* B7AED8 80240E88 44811000 */ mtc1 $at, $f2 +/* B7AEDC 80240E8C C6640040 */ lwc1 $f4, 0x40($s3) +/* B7AEE0 80240E90 3C01447A */ lui $at, 0x447a +/* B7AEE4 80240E94 44813000 */ mtc1 $at, $f6 +/* B7AEE8 80240E98 27B10030 */ addiu $s1, $sp, 0x30 +/* B7AEEC 80240E9C E7A00028 */ swc1 $f0, 0x28($sp) +/* B7AEF0 80240EA0 E7A20034 */ swc1 $f2, 0x34($sp) +/* B7AEF4 80240EA4 E7A40030 */ swc1 $f4, 0x30($sp) +/* B7AEF8 80240EA8 E7A60038 */ swc1 $f6, 0x38($sp) +/* B7AEFC 80240EAC AFB20010 */ sw $s2, 0x10($sp) +/* B7AF00 80240EB0 8E640080 */ lw $a0, 0x80($s3) +/* B7AF04 80240EB4 0C0372DF */ jal func_800DCB7C +/* B7AF08 80240EB8 0220382D */ daddu $a3, $s1, $zero +/* B7AF0C 80240EBC 0200282D */ daddu $a1, $s0, $zero +/* B7AF10 80240EC0 27A6002C */ addiu $a2, $sp, 0x2c +/* B7AF14 80240EC4 C662003C */ lwc1 $f2, 0x3c($s3) +/* B7AF18 80240EC8 C6660038 */ lwc1 $f6, 0x38($s3) +/* B7AF1C 80240ECC 3C01402A */ lui $at, 0x402a +/* B7AF20 80240ED0 4481A800 */ mtc1 $at, $f21 +/* B7AF24 80240ED4 4480A000 */ mtc1 $zero, $f20 +/* B7AF28 80240ED8 460010A1 */ cvt.d.s $f2, $f2 +/* B7AF2C 80240EDC 46341080 */ add.d $f2, $f2, $f20 +/* B7AF30 80240EE0 C660001C */ lwc1 $f0, 0x1c($s3) +/* B7AF34 80240EE4 C6640040 */ lwc1 $f4, 0x40($s3) +/* B7AF38 80240EE8 46000005 */ abs.s $f0, $f0 +/* B7AF3C 80240EEC E7A40030 */ swc1 $f4, 0x30($sp) +/* B7AF40 80240EF0 3C014030 */ lui $at, 0x4030 +/* B7AF44 80240EF4 44812800 */ mtc1 $at, $f5 +/* B7AF48 80240EF8 44802000 */ mtc1 $zero, $f4 +/* B7AF4C 80240EFC 46000021 */ cvt.d.s $f0, $f0 +/* B7AF50 80240F00 E7A60028 */ swc1 $f6, 0x28($sp) +/* B7AF54 80240F04 46240000 */ add.d $f0, $f0, $f4 +/* B7AF58 80240F08 462010A0 */ cvt.s.d $f2, $f2 +/* B7AF5C 80240F0C E7A2002C */ swc1 $f2, 0x2c($sp) +/* B7AF60 80240F10 46200020 */ cvt.s.d $f0, $f0 +/* B7AF64 80240F14 E7A00038 */ swc1 $f0, 0x38($sp) +/* B7AF68 80240F18 AFB20010 */ sw $s2, 0x10($sp) +/* B7AF6C 80240F1C 8E640080 */ lw $a0, 0x80($s3) +/* B7AF70 80240F20 0C0372DF */ jal func_800DCB7C +/* B7AF74 80240F24 0220382D */ daddu $a3, $s1, $zero +/* B7AF78 80240F28 1040003D */ beqz $v0, .L80241020 +/* B7AF7C 80240F2C 00000000 */ nop +/* B7AF80 80240F30 C660001C */ lwc1 $f0, 0x1c($s3) +/* B7AF84 80240F34 C7A20038 */ lwc1 $f2, 0x38($sp) +/* B7AF88 80240F38 46000005 */ abs.s $f0, $f0 +/* B7AF8C 80240F3C 46000021 */ cvt.d.s $f0, $f0 +/* B7AF90 80240F40 46340000 */ add.d $f0, $f0, $f20 +/* B7AF94 80240F44 460010A1 */ cvt.d.s $f2, $f2 +/* B7AF98 80240F48 4620103E */ c.le.d $f2, $f0 +/* B7AF9C 80240F4C 00000000 */ nop +/* B7AFA0 80240F50 45000033 */ bc1f .L80241020 +/* B7AFA4 80240F54 2403F7FF */ addiu $v1, $zero, -0x801 +/* B7AFA8 80240F58 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* B7AFAC 80240F5C 8E620000 */ lw $v0, ($s3) +/* B7AFB0 80240F60 AE60001C */ sw $zero, 0x1c($s3) +/* B7AFB4 80240F64 00431024 */ and $v0, $v0, $v1 +/* B7AFB8 80240F68 E660003C */ swc1 $f0, 0x3c($s3) +/* B7AFBC 80240F6C AE620000 */ sw $v0, ($s3) +/* B7AFC0 80240F70 AFA00010 */ sw $zero, 0x10($sp) +/* B7AFC4 80240F74 AFA00014 */ sw $zero, 0x14($sp) +/* B7AFC8 80240F78 8E650038 */ lw $a1, 0x38($s3) +/* B7AFCC 80240F7C 8E66003C */ lw $a2, 0x3c($s3) +/* B7AFD0 80240F80 8E670040 */ lw $a3, 0x40($s3) +/* B7AFD4 80240F84 0C01BECC */ jal fx_walk_normal +/* B7AFD8 80240F88 24040002 */ addiu $a0, $zero, 2 +/* B7AFDC 80240F8C 02E0202D */ daddu $a0, $s7, $zero +/* B7AFE0 80240F90 2402000C */ addiu $v0, $zero, 0xc +/* B7AFE4 80240F94 AE820070 */ sw $v0, 0x70($s4) +/* B7AFE8 80240F98 24020001 */ addiu $v0, $zero, 1 +/* B7AFEC 80240F9C AFA20010 */ sw $v0, 0x10($sp) +/* B7AFF0 80240FA0 8EC60024 */ lw $a2, 0x24($s6) +/* B7AFF4 80240FA4 8EC70028 */ lw $a3, 0x28($s6) +/* B7AFF8 80240FA8 0C01242D */ jal func_800490B4 +/* B7AFFC 80240FAC 02A0282D */ daddu $a1, $s5, $zero +/* B7B000 80240FB0 14400022 */ bnez $v0, .L8024103C +/* B7B004 80240FB4 24040002 */ addiu $a0, $zero, 2 +/* B7B008 80240FB8 0260282D */ daddu $a1, $s3, $zero +/* B7B00C 80240FBC 0000302D */ daddu $a2, $zero, $zero +/* B7B010 80240FC0 866300A8 */ lh $v1, 0xa8($s3) +/* B7B014 80240FC4 3C013F80 */ lui $at, 0x3f80 +/* B7B018 80240FC8 44810000 */ mtc1 $at, $f0 +/* B7B01C 80240FCC 3C014000 */ lui $at, 0x4000 +/* B7B020 80240FD0 44811000 */ mtc1 $at, $f2 +/* B7B024 80240FD4 3C01C1A0 */ lui $at, 0xc1a0 +/* B7B028 80240FD8 44812000 */ mtc1 $at, $f4 +/* B7B02C 80240FDC 2402000F */ addiu $v0, $zero, 0xf +/* B7B030 80240FE0 AFA2001C */ sw $v0, 0x1c($sp) +/* B7B034 80240FE4 44834000 */ mtc1 $v1, $f8 +/* B7B038 80240FE8 00000000 */ nop +/* B7B03C 80240FEC 46804220 */ cvt.s.w $f8, $f8 +/* B7B040 80240FF0 44074000 */ mfc1 $a3, $f8 +/* B7B044 80240FF4 27A2003C */ addiu $v0, $sp, 0x3c +/* B7B048 80240FF8 AFA20020 */ sw $v0, 0x20($sp) +/* B7B04C 80240FFC E7A00010 */ swc1 $f0, 0x10($sp) +/* B7B050 80241000 E7A20014 */ swc1 $f2, 0x14($sp) +/* B7B054 80241004 0C01BFA4 */ jal fx_emote +/* B7B058 80241008 E7A40018 */ swc1 $f4, 0x18($sp) +/* B7B05C 8024100C 24020019 */ addiu $v0, $zero, 0x19 +/* B7B060 80241010 A662008E */ sh $v0, 0x8e($s3) +/* B7B064 80241014 2402000E */ addiu $v0, $zero, 0xe +/* B7B068 80241018 0809040F */ j .L8024103C +/* B7B06C 8024101C AE820070 */ sw $v0, 0x70($s4) +.L80241020: +/* B7B070 80241020 C664003C */ lwc1 $f4, 0x3c($s3) +/* B7B074 80241024 C660001C */ lwc1 $f0, 0x1c($s3) +/* B7B078 80241028 46002100 */ add.s $f4, $f4, $f0 +/* B7B07C 8024102C C6620014 */ lwc1 $f2, 0x14($s3) +/* B7B080 80241030 46020001 */ sub.s $f0, $f0, $f2 +/* B7B084 80241034 E664003C */ swc1 $f4, 0x3c($s3) +/* B7B088 80241038 E660001C */ swc1 $f0, 0x1c($s3) +.L8024103C: +/* B7B08C 8024103C 8FBF0060 */ lw $ra, 0x60($sp) +/* B7B090 80241040 8FB7005C */ lw $s7, 0x5c($sp) +/* B7B094 80241044 8FB60058 */ lw $s6, 0x58($sp) +/* B7B098 80241048 8FB50054 */ lw $s5, 0x54($sp) +/* B7B09C 8024104C 8FB40050 */ lw $s4, 0x50($sp) +/* B7B0A0 80241050 8FB3004C */ lw $s3, 0x4c($sp) +/* B7B0A4 80241054 8FB20048 */ lw $s2, 0x48($sp) +/* B7B0A8 80241058 8FB10044 */ lw $s1, 0x44($sp) +/* B7B0AC 8024105C 8FB00040 */ lw $s0, 0x40($sp) +/* B7B0B0 80241060 D7B40068 */ ldc1 $f20, 0x68($sp) +/* B7B0B4 80241064 03E00008 */ jr $ra +/* B7B0B8 80241068 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0.s deleted file mode 100644 index 23e684df30..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0.s +++ /dev/null @@ -1,148 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B0 -/* B7B100 802410B0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B7B104 802410B4 AFB3003C */ sw $s3, 0x3c($sp) -/* B7B108 802410B8 0080982D */ daddu $s3, $a0, $zero -/* B7B10C 802410BC AFBF0048 */ sw $ra, 0x48($sp) -/* B7B110 802410C0 AFB50044 */ sw $s5, 0x44($sp) -/* B7B114 802410C4 AFB40040 */ sw $s4, 0x40($sp) -/* B7B118 802410C8 AFB20038 */ sw $s2, 0x38($sp) -/* B7B11C 802410CC AFB10034 */ sw $s1, 0x34($sp) -/* B7B120 802410D0 AFB00030 */ sw $s0, 0x30($sp) -/* B7B124 802410D4 8E720148 */ lw $s2, 0x148($s3) -/* B7B128 802410D8 86440008 */ lh $a0, 8($s2) -/* B7B12C 802410DC 8E70000C */ lw $s0, 0xc($s3) -/* B7B130 802410E0 0C00EABB */ jal get_npc_unsafe -/* B7B134 802410E4 00A0882D */ daddu $s1, $a1, $zero -/* B7B138 802410E8 8E050000 */ lw $a1, ($s0) -/* B7B13C 802410EC 26100004 */ addiu $s0, $s0, 4 -/* B7B140 802410F0 0260202D */ daddu $a0, $s3, $zero -/* B7B144 802410F4 0C0B1EAF */ jal get_variable -/* B7B148 802410F8 0040A82D */ daddu $s5, $v0, $zero -/* B7B14C 802410FC 0260202D */ daddu $a0, $s3, $zero -/* B7B150 80241100 8E050000 */ lw $a1, ($s0) -/* B7B154 80241104 0C0B1EAF */ jal get_variable -/* B7B158 80241108 0040A02D */ daddu $s4, $v0, $zero -/* B7B15C 8024110C AE420094 */ sw $v0, 0x94($s2) -/* B7B160 80241110 AFA00010 */ sw $zero, 0x10($sp) -/* B7B164 80241114 8E4200D0 */ lw $v0, 0xd0($s2) -/* B7B168 80241118 8C420030 */ lw $v0, 0x30($v0) -/* B7B16C 8024111C AFA20014 */ sw $v0, 0x14($sp) -/* B7B170 80241120 8E4200D0 */ lw $v0, 0xd0($s2) -/* B7B174 80241124 8C42001C */ lw $v0, 0x1c($v0) -/* B7B178 80241128 AFA20018 */ sw $v0, 0x18($sp) -/* B7B17C 8024112C 8E4200D0 */ lw $v0, 0xd0($s2) -/* B7B180 80241130 8C420024 */ lw $v0, 0x24($v0) -/* B7B184 80241134 AFA2001C */ sw $v0, 0x1c($sp) -/* B7B188 80241138 8E4200D0 */ lw $v0, 0xd0($s2) -/* B7B18C 8024113C 8C420028 */ lw $v0, 0x28($v0) -/* B7B190 80241140 AFA20020 */ sw $v0, 0x20($sp) -/* B7B194 80241144 8E4200D0 */ lw $v0, 0xd0($s2) -/* B7B198 80241148 3C0142C8 */ lui $at, 0x42c8 -/* B7B19C 8024114C 44810000 */ mtc1 $at, $f0 -/* B7B1A0 80241150 8C42002C */ lw $v0, 0x2c($v0) -/* B7B1A4 80241154 27B00010 */ addiu $s0, $sp, 0x10 -/* B7B1A8 80241158 E7A00028 */ swc1 $f0, 0x28($sp) -/* B7B1AC 8024115C A7A0002C */ sh $zero, 0x2c($sp) -/* B7B1B0 80241160 12200019 */ beqz $s1, .L802411C8 -/* B7B1B4 80241164 AFA20024 */ sw $v0, 0x24($sp) -/* B7B1B8 80241168 AE600070 */ sw $zero, 0x70($s3) -/* B7B1BC 8024116C A6A0008E */ sh $zero, 0x8e($s5) -/* B7B1C0 80241170 AE600074 */ sw $zero, 0x74($s3) -/* B7B1C4 80241174 8EA20000 */ lw $v0, ($s5) -/* B7B1C8 80241178 2403F7FF */ addiu $v1, $zero, -0x801 -/* B7B1CC 8024117C 00431024 */ and $v0, $v0, $v1 -/* B7B1D0 80241180 2403FDFF */ addiu $v1, $zero, -0x201 -/* B7B1D4 80241184 00431024 */ and $v0, $v0, $v1 -/* B7B1D8 80241188 34420008 */ ori $v0, $v0, 8 -/* B7B1DC 8024118C AEA20000 */ sw $v0, ($s5) -/* B7B1E0 80241190 8E4200B0 */ lw $v0, 0xb0($s2) -/* B7B1E4 80241194 34420018 */ ori $v0, $v0, 0x18 -/* B7B1E8 80241198 AE4200B0 */ sw $v0, 0xb0($s2) -/* B7B1EC 8024119C 8E420000 */ lw $v0, ($s2) -/* B7B1F0 802411A0 3C034000 */ lui $v1, 0x4000 -/* B7B1F4 802411A4 00431024 */ and $v0, $v0, $v1 -/* B7B1F8 802411A8 10400007 */ beqz $v0, .L802411C8 -/* B7B1FC 802411AC 3C03BFFF */ lui $v1, 0xbfff -/* B7B200 802411B0 2402000C */ addiu $v0, $zero, 0xc -/* B7B204 802411B4 AE620070 */ sw $v0, 0x70($s3) -/* B7B208 802411B8 8E420000 */ lw $v0, ($s2) -/* B7B20C 802411BC 3463FFFF */ ori $v1, $v1, 0xffff -/* B7B210 802411C0 00431024 */ and $v0, $v0, $v1 -/* B7B214 802411C4 AE420000 */ sw $v0, ($s2) -.L802411C8: -/* B7B218 802411C8 8E4300B0 */ lw $v1, 0xb0($s2) -/* B7B21C 802411CC 30620004 */ andi $v0, $v1, 4 -/* B7B220 802411D0 10400007 */ beqz $v0, .L802411F0 -/* B7B224 802411D4 00000000 */ nop -/* B7B228 802411D8 824200B4 */ lb $v0, 0xb4($s2) -/* B7B22C 802411DC 14400034 */ bnez $v0, .L802412B0 -/* B7B230 802411E0 0000102D */ daddu $v0, $zero, $zero -/* B7B234 802411E4 2402FFFB */ addiu $v0, $zero, -5 -/* B7B238 802411E8 00621024 */ and $v0, $v1, $v0 -/* B7B23C 802411EC AE4200B0 */ sw $v0, 0xb0($s2) -.L802411F0: -/* B7B240 802411F0 8E630070 */ lw $v1, 0x70($s3) -/* B7B244 802411F4 2C62000F */ sltiu $v0, $v1, 0xf -/* B7B248 802411F8 1040002C */ beqz $v0, .L802412AC -/* B7B24C 802411FC 00031080 */ sll $v0, $v1, 2 -/* B7B250 80241200 3C018024 */ lui $at, 0x8024 -/* B7B254 80241204 00220821 */ addu $at, $at, $v0 -/* B7B258 80241208 8C223888 */ lw $v0, 0x3888($at) -/* B7B25C 8024120C 00400008 */ jr $v0 -/* B7B260 80241210 00000000 */ nop -/* B7B264 80241214 0260202D */ daddu $a0, $s3, $zero -/* B7B268 80241218 0280282D */ daddu $a1, $s4, $zero -/* B7B26C 8024121C 0C090130 */ jal func_802404C0 -/* B7B270 80241220 0200302D */ daddu $a2, $s0, $zero -/* B7B274 80241224 0260202D */ daddu $a0, $s3, $zero -/* B7B278 80241228 0280282D */ daddu $a1, $s4, $zero -/* B7B27C 8024122C 0C0901BC */ jal func_802406F0 -/* B7B280 80241230 0200302D */ daddu $a2, $s0, $zero -/* B7B284 80241234 080904AC */ j .L802412B0 -/* B7B288 80241238 0000102D */ daddu $v0, $zero, $zero -/* B7B28C 8024123C 0260202D */ daddu $a0, $s3, $zero -/* B7B290 80241240 0280282D */ daddu $a1, $s4, $zero -/* B7B294 80241244 0C09028A */ jal func_80240A28 -/* B7B298 80241248 0200302D */ daddu $a2, $s0, $zero -/* B7B29C 8024124C 8E630070 */ lw $v1, 0x70($s3) -/* B7B2A0 80241250 24020003 */ addiu $v0, $zero, 3 -/* B7B2A4 80241254 14620016 */ bne $v1, $v0, .L802412B0 -/* B7B2A8 80241258 0000102D */ daddu $v0, $zero, $zero -/* B7B2AC 8024125C 0260202D */ daddu $a0, $s3, $zero -/* B7B2B0 80241260 0280282D */ daddu $a1, $s4, $zero -/* B7B2B4 80241264 0C0902BA */ jal func_80240AE8 -/* B7B2B8 80241268 0200302D */ daddu $a2, $s0, $zero -/* B7B2BC 8024126C 080904AC */ j .L802412B0 -/* B7B2C0 80241270 0000102D */ daddu $v0, $zero, $zero -/* B7B2C4 80241274 0260202D */ daddu $a0, $s3, $zero -/* B7B2C8 80241278 0280282D */ daddu $a1, $s4, $zero -/* B7B2CC 8024127C 0C090323 */ jal func_80240C8C -/* B7B2D0 80241280 0200302D */ daddu $a2, $s0, $zero -/* B7B2D4 80241284 0260202D */ daddu $a0, $s3, $zero -/* B7B2D8 80241288 0280282D */ daddu $a1, $s4, $zero -/* B7B2DC 8024128C 0C09035B */ jal func_80240D6C -/* B7B2E0 80241290 0200302D */ daddu $a2, $s0, $zero -/* B7B2E4 80241294 080904AC */ j .L802412B0 -/* B7B2E8 80241298 0000102D */ daddu $v0, $zero, $zero -/* B7B2EC 8024129C 0260202D */ daddu $a0, $s3, $zero -/* B7B2F0 802412A0 0280282D */ daddu $a1, $s4, $zero -/* B7B2F4 802412A4 0C09041B */ jal func_8024106C -/* B7B2F8 802412A8 0200302D */ daddu $a2, $s0, $zero -.L802412AC: -/* B7B2FC 802412AC 0000102D */ daddu $v0, $zero, $zero -.L802412B0: -/* B7B300 802412B0 8FBF0048 */ lw $ra, 0x48($sp) -/* B7B304 802412B4 8FB50044 */ lw $s5, 0x44($sp) -/* B7B308 802412B8 8FB40040 */ lw $s4, 0x40($sp) -/* B7B30C 802412BC 8FB3003C */ lw $s3, 0x3c($sp) -/* B7B310 802412C0 8FB20038 */ lw $s2, 0x38($sp) -/* B7B314 802412C4 8FB10034 */ lw $s1, 0x34($sp) -/* B7B318 802412C8 8FB00030 */ lw $s0, 0x30($sp) -/* B7B31C 802412CC 03E00008 */ jr $ra -/* B7B320 802412D0 27BD0050 */ addiu $sp, $sp, 0x50 -/* B7B324 802412D4 00000000 */ nop -/* B7B328 802412D8 00000000 */ nop -/* B7B32C 802412DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s new file mode 100644 index 0000000000..6a0f253321 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_14/B7A510/func_802410B0_B7B100.s @@ -0,0 +1,148 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410B0_B7B100 +/* B7B100 802410B0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* B7B104 802410B4 AFB3003C */ sw $s3, 0x3c($sp) +/* B7B108 802410B8 0080982D */ daddu $s3, $a0, $zero +/* B7B10C 802410BC AFBF0048 */ sw $ra, 0x48($sp) +/* B7B110 802410C0 AFB50044 */ sw $s5, 0x44($sp) +/* B7B114 802410C4 AFB40040 */ sw $s4, 0x40($sp) +/* B7B118 802410C8 AFB20038 */ sw $s2, 0x38($sp) +/* B7B11C 802410CC AFB10034 */ sw $s1, 0x34($sp) +/* B7B120 802410D0 AFB00030 */ sw $s0, 0x30($sp) +/* B7B124 802410D4 8E720148 */ lw $s2, 0x148($s3) +/* B7B128 802410D8 86440008 */ lh $a0, 8($s2) +/* B7B12C 802410DC 8E70000C */ lw $s0, 0xc($s3) +/* B7B130 802410E0 0C00EABB */ jal get_npc_unsafe +/* B7B134 802410E4 00A0882D */ daddu $s1, $a1, $zero +/* B7B138 802410E8 8E050000 */ lw $a1, ($s0) +/* B7B13C 802410EC 26100004 */ addiu $s0, $s0, 4 +/* B7B140 802410F0 0260202D */ daddu $a0, $s3, $zero +/* B7B144 802410F4 0C0B1EAF */ jal get_variable +/* B7B148 802410F8 0040A82D */ daddu $s5, $v0, $zero +/* B7B14C 802410FC 0260202D */ daddu $a0, $s3, $zero +/* B7B150 80241100 8E050000 */ lw $a1, ($s0) +/* B7B154 80241104 0C0B1EAF */ jal get_variable +/* B7B158 80241108 0040A02D */ daddu $s4, $v0, $zero +/* B7B15C 8024110C AE420094 */ sw $v0, 0x94($s2) +/* B7B160 80241110 AFA00010 */ sw $zero, 0x10($sp) +/* B7B164 80241114 8E4200D0 */ lw $v0, 0xd0($s2) +/* B7B168 80241118 8C420030 */ lw $v0, 0x30($v0) +/* B7B16C 8024111C AFA20014 */ sw $v0, 0x14($sp) +/* B7B170 80241120 8E4200D0 */ lw $v0, 0xd0($s2) +/* B7B174 80241124 8C42001C */ lw $v0, 0x1c($v0) +/* B7B178 80241128 AFA20018 */ sw $v0, 0x18($sp) +/* B7B17C 8024112C 8E4200D0 */ lw $v0, 0xd0($s2) +/* B7B180 80241130 8C420024 */ lw $v0, 0x24($v0) +/* B7B184 80241134 AFA2001C */ sw $v0, 0x1c($sp) +/* B7B188 80241138 8E4200D0 */ lw $v0, 0xd0($s2) +/* B7B18C 8024113C 8C420028 */ lw $v0, 0x28($v0) +/* B7B190 80241140 AFA20020 */ sw $v0, 0x20($sp) +/* B7B194 80241144 8E4200D0 */ lw $v0, 0xd0($s2) +/* B7B198 80241148 3C0142C8 */ lui $at, 0x42c8 +/* B7B19C 8024114C 44810000 */ mtc1 $at, $f0 +/* B7B1A0 80241150 8C42002C */ lw $v0, 0x2c($v0) +/* B7B1A4 80241154 27B00010 */ addiu $s0, $sp, 0x10 +/* B7B1A8 80241158 E7A00028 */ swc1 $f0, 0x28($sp) +/* B7B1AC 8024115C A7A0002C */ sh $zero, 0x2c($sp) +/* B7B1B0 80241160 12200019 */ beqz $s1, .L802411C8 +/* B7B1B4 80241164 AFA20024 */ sw $v0, 0x24($sp) +/* B7B1B8 80241168 AE600070 */ sw $zero, 0x70($s3) +/* B7B1BC 8024116C A6A0008E */ sh $zero, 0x8e($s5) +/* B7B1C0 80241170 AE600074 */ sw $zero, 0x74($s3) +/* B7B1C4 80241174 8EA20000 */ lw $v0, ($s5) +/* B7B1C8 80241178 2403F7FF */ addiu $v1, $zero, -0x801 +/* B7B1CC 8024117C 00431024 */ and $v0, $v0, $v1 +/* B7B1D0 80241180 2403FDFF */ addiu $v1, $zero, -0x201 +/* B7B1D4 80241184 00431024 */ and $v0, $v0, $v1 +/* B7B1D8 80241188 34420008 */ ori $v0, $v0, 8 +/* B7B1DC 8024118C AEA20000 */ sw $v0, ($s5) +/* B7B1E0 80241190 8E4200B0 */ lw $v0, 0xb0($s2) +/* B7B1E4 80241194 34420018 */ ori $v0, $v0, 0x18 +/* B7B1E8 80241198 AE4200B0 */ sw $v0, 0xb0($s2) +/* B7B1EC 8024119C 8E420000 */ lw $v0, ($s2) +/* B7B1F0 802411A0 3C034000 */ lui $v1, 0x4000 +/* B7B1F4 802411A4 00431024 */ and $v0, $v0, $v1 +/* B7B1F8 802411A8 10400007 */ beqz $v0, .L802411C8 +/* B7B1FC 802411AC 3C03BFFF */ lui $v1, 0xbfff +/* B7B200 802411B0 2402000C */ addiu $v0, $zero, 0xc +/* B7B204 802411B4 AE620070 */ sw $v0, 0x70($s3) +/* B7B208 802411B8 8E420000 */ lw $v0, ($s2) +/* B7B20C 802411BC 3463FFFF */ ori $v1, $v1, 0xffff +/* B7B210 802411C0 00431024 */ and $v0, $v0, $v1 +/* B7B214 802411C4 AE420000 */ sw $v0, ($s2) +.L802411C8: +/* B7B218 802411C8 8E4300B0 */ lw $v1, 0xb0($s2) +/* B7B21C 802411CC 30620004 */ andi $v0, $v1, 4 +/* B7B220 802411D0 10400007 */ beqz $v0, .L802411F0 +/* B7B224 802411D4 00000000 */ nop +/* B7B228 802411D8 824200B4 */ lb $v0, 0xb4($s2) +/* B7B22C 802411DC 14400034 */ bnez $v0, .L802412B0 +/* B7B230 802411E0 0000102D */ daddu $v0, $zero, $zero +/* B7B234 802411E4 2402FFFB */ addiu $v0, $zero, -5 +/* B7B238 802411E8 00621024 */ and $v0, $v1, $v0 +/* B7B23C 802411EC AE4200B0 */ sw $v0, 0xb0($s2) +.L802411F0: +/* B7B240 802411F0 8E630070 */ lw $v1, 0x70($s3) +/* B7B244 802411F4 2C62000F */ sltiu $v0, $v1, 0xf +/* B7B248 802411F8 1040002C */ beqz $v0, .L802412AC +/* B7B24C 802411FC 00031080 */ sll $v0, $v1, 2 +/* B7B250 80241200 3C018024 */ lui $at, 0x8024 +/* B7B254 80241204 00220821 */ addu $at, $at, $v0 +/* B7B258 80241208 8C223888 */ lw $v0, 0x3888($at) +/* B7B25C 8024120C 00400008 */ jr $v0 +/* B7B260 80241210 00000000 */ nop +/* B7B264 80241214 0260202D */ daddu $a0, $s3, $zero +/* B7B268 80241218 0280282D */ daddu $a1, $s4, $zero +/* B7B26C 8024121C 0C090130 */ jal func_802404C0_B7A510 +/* B7B270 80241220 0200302D */ daddu $a2, $s0, $zero +/* B7B274 80241224 0260202D */ daddu $a0, $s3, $zero +/* B7B278 80241228 0280282D */ daddu $a1, $s4, $zero +/* B7B27C 8024122C 0C0901BC */ jal func_802406F0_B7A740 +/* B7B280 80241230 0200302D */ daddu $a2, $s0, $zero +/* B7B284 80241234 080904AC */ j .L802412B0 +/* B7B288 80241238 0000102D */ daddu $v0, $zero, $zero +/* B7B28C 8024123C 0260202D */ daddu $a0, $s3, $zero +/* B7B290 80241240 0280282D */ daddu $a1, $s4, $zero +/* B7B294 80241244 0C09028A */ jal func_80240A28_B7AA78 +/* B7B298 80241248 0200302D */ daddu $a2, $s0, $zero +/* B7B29C 8024124C 8E630070 */ lw $v1, 0x70($s3) +/* B7B2A0 80241250 24020003 */ addiu $v0, $zero, 3 +/* B7B2A4 80241254 14620016 */ bne $v1, $v0, .L802412B0 +/* B7B2A8 80241258 0000102D */ daddu $v0, $zero, $zero +/* B7B2AC 8024125C 0260202D */ daddu $a0, $s3, $zero +/* B7B2B0 80241260 0280282D */ daddu $a1, $s4, $zero +/* B7B2B4 80241264 0C0902BA */ jal func_80240AE8_B7AB38 +/* B7B2B8 80241268 0200302D */ daddu $a2, $s0, $zero +/* B7B2BC 8024126C 080904AC */ j .L802412B0 +/* B7B2C0 80241270 0000102D */ daddu $v0, $zero, $zero +/* B7B2C4 80241274 0260202D */ daddu $a0, $s3, $zero +/* B7B2C8 80241278 0280282D */ daddu $a1, $s4, $zero +/* B7B2CC 8024127C 0C090323 */ jal func_80240C8C_B7ACDC +/* B7B2D0 80241280 0200302D */ daddu $a2, $s0, $zero +/* B7B2D4 80241284 0260202D */ daddu $a0, $s3, $zero +/* B7B2D8 80241288 0280282D */ daddu $a1, $s4, $zero +/* B7B2DC 8024128C 0C09035B */ jal func_80240D6C_B7ADBC +/* B7B2E0 80241290 0200302D */ daddu $a2, $s0, $zero +/* B7B2E4 80241294 080904AC */ j .L802412B0 +/* B7B2E8 80241298 0000102D */ daddu $v0, $zero, $zero +/* B7B2EC 8024129C 0260202D */ daddu $a0, $s3, $zero +/* B7B2F0 802412A0 0280282D */ daddu $a1, $s4, $zero +/* B7B2F4 802412A4 0C09041B */ jal func_8024106C_B7B0BC +/* B7B2F8 802412A8 0200302D */ daddu $a2, $s0, $zero +.L802412AC: +/* B7B2FC 802412AC 0000102D */ daddu $v0, $zero, $zero +.L802412B0: +/* B7B300 802412B0 8FBF0048 */ lw $ra, 0x48($sp) +/* B7B304 802412B4 8FB50044 */ lw $s5, 0x44($sp) +/* B7B308 802412B8 8FB40040 */ lw $s4, 0x40($sp) +/* B7B30C 802412BC 8FB3003C */ lw $s3, 0x3c($sp) +/* B7B310 802412C0 8FB20038 */ lw $s2, 0x38($sp) +/* B7B314 802412C4 8FB10034 */ lw $s1, 0x34($sp) +/* B7B318 802412C8 8FB00030 */ lw $s0, 0x30($sp) +/* B7B31C 802412CC 03E00008 */ jr $ra +/* B7B320 802412D0 27BD0050 */ addiu $sp, $sp, 0x50 +/* B7B324 802412D4 00000000 */ nop +/* B7B328 802412D8 00000000 */ nop +/* B7B32C 802412DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_15/B7D9E0/func_80240130.s b/asm/nonmatchings/world/area_jan/jan_15/B7D9E0/func_80240130.s deleted file mode 100644 index cd0925256c..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_15/B7D9E0/func_80240130.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240130 -/* B7DA50 80240130 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B7DA54 80240134 AFB10054 */ sw $s1, 0x54($sp) -/* B7DA58 80240138 0080882D */ daddu $s1, $a0, $zero -/* B7DA5C 8024013C AFBF005C */ sw $ra, 0x5c($sp) -/* B7DA60 80240140 AFB20058 */ sw $s2, 0x58($sp) -/* B7DA64 80240144 AFB00050 */ sw $s0, 0x50($sp) -/* B7DA68 80240148 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B7DA6C 8024014C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B7DA70 80240150 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B7DA74 80240154 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B7DA78 80240158 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B7DA7C 8024015C 8E30000C */ lw $s0, 0xc($s1) -/* B7DA80 80240160 8E050000 */ lw $a1, ($s0) -/* B7DA84 80240164 0C0B1EAF */ jal get_variable -/* B7DA88 80240168 26100004 */ addiu $s0, $s0, 4 -/* B7DA8C 8024016C 0C046C04 */ jal get_model_list_index_from_tree_index -/* B7DA90 80240170 0040202D */ daddu $a0, $v0, $zero -/* B7DA94 80240174 8E050000 */ lw $a1, ($s0) -/* B7DA98 80240178 26100004 */ addiu $s0, $s0, 4 -/* B7DA9C 8024017C 0220202D */ daddu $a0, $s1, $zero -/* B7DAA0 80240180 0C0B210B */ jal get_float_variable -/* B7DAA4 80240184 0040902D */ daddu $s2, $v0, $zero -/* B7DAA8 80240188 8E050000 */ lw $a1, ($s0) -/* B7DAAC 8024018C 26100004 */ addiu $s0, $s0, 4 -/* B7DAB0 80240190 0220202D */ daddu $a0, $s1, $zero -/* B7DAB4 80240194 0C0B210B */ jal get_float_variable -/* B7DAB8 80240198 46000706 */ mov.s $f28, $f0 -/* B7DABC 8024019C 8E050000 */ lw $a1, ($s0) -/* B7DAC0 802401A0 26100004 */ addiu $s0, $s0, 4 -/* B7DAC4 802401A4 0220202D */ daddu $a0, $s1, $zero -/* B7DAC8 802401A8 0C0B210B */ jal get_float_variable -/* B7DACC 802401AC 46000686 */ mov.s $f26, $f0 -/* B7DAD0 802401B0 0220202D */ daddu $a0, $s1, $zero -/* B7DAD4 802401B4 8E050000 */ lw $a1, ($s0) -/* B7DAD8 802401B8 0C0B210B */ jal get_float_variable -/* B7DADC 802401BC 46000586 */ mov.s $f22, $f0 -/* B7DAE0 802401C0 0240202D */ daddu $a0, $s2, $zero -/* B7DAE4 802401C4 0C046B4C */ jal get_model_from_list_index -/* B7DAE8 802401C8 46000606 */ mov.s $f24, $f0 -/* B7DAEC 802401CC 0040882D */ daddu $s1, $v0, $zero -/* B7DAF0 802401D0 96220000 */ lhu $v0, ($s1) -/* B7DAF4 802401D4 30420400 */ andi $v0, $v0, 0x400 -/* B7DAF8 802401D8 1440001E */ bnez $v0, .L80240254 -/* B7DAFC 802401DC 26300058 */ addiu $s0, $s1, 0x58 -/* B7DB00 802401E0 4480A000 */ mtc1 $zero, $f20 -/* B7DB04 802401E4 4406B000 */ mfc1 $a2, $f22 -/* B7DB08 802401E8 4405A000 */ mfc1 $a1, $f20 -/* B7DB0C 802401EC 4407A000 */ mfc1 $a3, $f20 -/* B7DB10 802401F0 0C019E40 */ jal guTranslateF -/* B7DB14 802401F4 0200202D */ daddu $a0, $s0, $zero -/* B7DB18 802401F8 4405E000 */ mfc1 $a1, $f28 -/* B7DB1C 802401FC 4406D000 */ mfc1 $a2, $f26 -/* B7DB20 80240200 4407C000 */ mfc1 $a3, $f24 -/* B7DB24 80240204 0C090030 */ jal func_802400C0 -/* B7DB28 80240208 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DB2C 8024020C 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DB30 80240210 0200282D */ daddu $a1, $s0, $zero -/* B7DB34 80240214 0C019D80 */ jal guMtxCatF -/* B7DB38 80240218 0200302D */ daddu $a2, $s0, $zero -/* B7DB3C 8024021C 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DB40 80240220 4600B587 */ neg.s $f22, $f22 -/* B7DB44 80240224 4405A000 */ mfc1 $a1, $f20 -/* B7DB48 80240228 4406B000 */ mfc1 $a2, $f22 -/* B7DB4C 8024022C 0C019E40 */ jal guTranslateF -/* B7DB50 80240230 00A0382D */ daddu $a3, $a1, $zero -/* B7DB54 80240234 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DB58 80240238 0200282D */ daddu $a1, $s0, $zero -/* B7DB5C 8024023C 0C019D80 */ jal guMtxCatF -/* B7DB60 80240240 00A0302D */ daddu $a2, $a1, $zero -/* B7DB64 80240244 96220000 */ lhu $v0, ($s1) -/* B7DB68 80240248 34421400 */ ori $v0, $v0, 0x1400 -/* B7DB6C 8024024C 080900B3 */ j .L802402CC -/* B7DB70 80240250 A6220000 */ sh $v0, ($s1) -.L80240254: -/* B7DB74 80240254 4480A000 */ mtc1 $zero, $f20 -/* B7DB78 80240258 4406B000 */ mfc1 $a2, $f22 -/* B7DB7C 8024025C 4405A000 */ mfc1 $a1, $f20 -/* B7DB80 80240260 4407A000 */ mfc1 $a3, $f20 -/* B7DB84 80240264 0C019E40 */ jal guTranslateF -/* B7DB88 80240268 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DB8C 8024026C 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DB90 80240270 26300058 */ addiu $s0, $s1, 0x58 -/* B7DB94 80240274 0200282D */ daddu $a1, $s0, $zero -/* B7DB98 80240278 0C019D80 */ jal guMtxCatF -/* B7DB9C 8024027C 0200302D */ daddu $a2, $s0, $zero -/* B7DBA0 80240280 4405E000 */ mfc1 $a1, $f28 -/* B7DBA4 80240284 4406D000 */ mfc1 $a2, $f26 -/* B7DBA8 80240288 4407C000 */ mfc1 $a3, $f24 -/* B7DBAC 8024028C 0C090030 */ jal func_802400C0 -/* B7DBB0 80240290 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DBB4 80240294 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DBB8 80240298 0200282D */ daddu $a1, $s0, $zero -/* B7DBBC 8024029C 0C019D80 */ jal guMtxCatF -/* B7DBC0 802402A0 0200302D */ daddu $a2, $s0, $zero -/* B7DBC4 802402A4 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DBC8 802402A8 4600B587 */ neg.s $f22, $f22 -/* B7DBCC 802402AC 4405A000 */ mfc1 $a1, $f20 -/* B7DBD0 802402B0 4406B000 */ mfc1 $a2, $f22 -/* B7DBD4 802402B4 0C019E40 */ jal guTranslateF -/* B7DBD8 802402B8 00A0382D */ daddu $a3, $a1, $zero -/* B7DBDC 802402BC 27A40010 */ addiu $a0, $sp, 0x10 -/* B7DBE0 802402C0 0200282D */ daddu $a1, $s0, $zero -/* B7DBE4 802402C4 0C019D80 */ jal guMtxCatF -/* B7DBE8 802402C8 00A0302D */ daddu $a2, $a1, $zero -.L802402CC: -/* B7DBEC 802402CC 8FBF005C */ lw $ra, 0x5c($sp) -/* B7DBF0 802402D0 8FB20058 */ lw $s2, 0x58($sp) -/* B7DBF4 802402D4 8FB10054 */ lw $s1, 0x54($sp) -/* B7DBF8 802402D8 8FB00050 */ lw $s0, 0x50($sp) -/* B7DBFC 802402DC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B7DC00 802402E0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B7DC04 802402E4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B7DC08 802402E8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B7DC0C 802402EC D7B40060 */ ldc1 $f20, 0x60($sp) -/* B7DC10 802402F0 24020002 */ addiu $v0, $zero, 2 -/* B7DC14 802402F4 03E00008 */ jr $ra -/* B7DC18 802402F8 27BD0088 */ addiu $sp, $sp, 0x88 -/* B7DC1C 802402FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_15/B7D9E0/func_80240130_B7DA50.s b/asm/nonmatchings/world/area_jan/jan_15/B7D9E0/func_80240130_B7DA50.s new file mode 100644 index 0000000000..626223f536 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_15/B7D9E0/func_80240130_B7DA50.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240130_B7DA50 +/* B7DA50 80240130 27BDFF78 */ addiu $sp, $sp, -0x88 +/* B7DA54 80240134 AFB10054 */ sw $s1, 0x54($sp) +/* B7DA58 80240138 0080882D */ daddu $s1, $a0, $zero +/* B7DA5C 8024013C AFBF005C */ sw $ra, 0x5c($sp) +/* B7DA60 80240140 AFB20058 */ sw $s2, 0x58($sp) +/* B7DA64 80240144 AFB00050 */ sw $s0, 0x50($sp) +/* B7DA68 80240148 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* B7DA6C 8024014C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* B7DA70 80240150 F7B80070 */ sdc1 $f24, 0x70($sp) +/* B7DA74 80240154 F7B60068 */ sdc1 $f22, 0x68($sp) +/* B7DA78 80240158 F7B40060 */ sdc1 $f20, 0x60($sp) +/* B7DA7C 8024015C 8E30000C */ lw $s0, 0xc($s1) +/* B7DA80 80240160 8E050000 */ lw $a1, ($s0) +/* B7DA84 80240164 0C0B1EAF */ jal get_variable +/* B7DA88 80240168 26100004 */ addiu $s0, $s0, 4 +/* B7DA8C 8024016C 0C046C04 */ jal get_model_list_index_from_tree_index +/* B7DA90 80240170 0040202D */ daddu $a0, $v0, $zero +/* B7DA94 80240174 8E050000 */ lw $a1, ($s0) +/* B7DA98 80240178 26100004 */ addiu $s0, $s0, 4 +/* B7DA9C 8024017C 0220202D */ daddu $a0, $s1, $zero +/* B7DAA0 80240180 0C0B210B */ jal get_float_variable +/* B7DAA4 80240184 0040902D */ daddu $s2, $v0, $zero +/* B7DAA8 80240188 8E050000 */ lw $a1, ($s0) +/* B7DAAC 8024018C 26100004 */ addiu $s0, $s0, 4 +/* B7DAB0 80240190 0220202D */ daddu $a0, $s1, $zero +/* B7DAB4 80240194 0C0B210B */ jal get_float_variable +/* B7DAB8 80240198 46000706 */ mov.s $f28, $f0 +/* B7DABC 8024019C 8E050000 */ lw $a1, ($s0) +/* B7DAC0 802401A0 26100004 */ addiu $s0, $s0, 4 +/* B7DAC4 802401A4 0220202D */ daddu $a0, $s1, $zero +/* B7DAC8 802401A8 0C0B210B */ jal get_float_variable +/* B7DACC 802401AC 46000686 */ mov.s $f26, $f0 +/* B7DAD0 802401B0 0220202D */ daddu $a0, $s1, $zero +/* B7DAD4 802401B4 8E050000 */ lw $a1, ($s0) +/* B7DAD8 802401B8 0C0B210B */ jal get_float_variable +/* B7DADC 802401BC 46000586 */ mov.s $f22, $f0 +/* B7DAE0 802401C0 0240202D */ daddu $a0, $s2, $zero +/* B7DAE4 802401C4 0C046B4C */ jal get_model_from_list_index +/* B7DAE8 802401C8 46000606 */ mov.s $f24, $f0 +/* B7DAEC 802401CC 0040882D */ daddu $s1, $v0, $zero +/* B7DAF0 802401D0 96220000 */ lhu $v0, ($s1) +/* B7DAF4 802401D4 30420400 */ andi $v0, $v0, 0x400 +/* B7DAF8 802401D8 1440001E */ bnez $v0, .L80240254 +/* B7DAFC 802401DC 26300058 */ addiu $s0, $s1, 0x58 +/* B7DB00 802401E0 4480A000 */ mtc1 $zero, $f20 +/* B7DB04 802401E4 4406B000 */ mfc1 $a2, $f22 +/* B7DB08 802401E8 4405A000 */ mfc1 $a1, $f20 +/* B7DB0C 802401EC 4407A000 */ mfc1 $a3, $f20 +/* B7DB10 802401F0 0C019E40 */ jal guTranslateF +/* B7DB14 802401F4 0200202D */ daddu $a0, $s0, $zero +/* B7DB18 802401F8 4405E000 */ mfc1 $a1, $f28 +/* B7DB1C 802401FC 4406D000 */ mfc1 $a2, $f26 +/* B7DB20 80240200 4407C000 */ mfc1 $a3, $f24 +/* B7DB24 80240204 0C090030 */ jal func_802400C0_B7D9E0 +/* B7DB28 80240208 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DB2C 8024020C 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DB30 80240210 0200282D */ daddu $a1, $s0, $zero +/* B7DB34 80240214 0C019D80 */ jal guMtxCatF +/* B7DB38 80240218 0200302D */ daddu $a2, $s0, $zero +/* B7DB3C 8024021C 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DB40 80240220 4600B587 */ neg.s $f22, $f22 +/* B7DB44 80240224 4405A000 */ mfc1 $a1, $f20 +/* B7DB48 80240228 4406B000 */ mfc1 $a2, $f22 +/* B7DB4C 8024022C 0C019E40 */ jal guTranslateF +/* B7DB50 80240230 00A0382D */ daddu $a3, $a1, $zero +/* B7DB54 80240234 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DB58 80240238 0200282D */ daddu $a1, $s0, $zero +/* B7DB5C 8024023C 0C019D80 */ jal guMtxCatF +/* B7DB60 80240240 00A0302D */ daddu $a2, $a1, $zero +/* B7DB64 80240244 96220000 */ lhu $v0, ($s1) +/* B7DB68 80240248 34421400 */ ori $v0, $v0, 0x1400 +/* B7DB6C 8024024C 080900B3 */ j .L802402CC +/* B7DB70 80240250 A6220000 */ sh $v0, ($s1) +.L80240254: +/* B7DB74 80240254 4480A000 */ mtc1 $zero, $f20 +/* B7DB78 80240258 4406B000 */ mfc1 $a2, $f22 +/* B7DB7C 8024025C 4405A000 */ mfc1 $a1, $f20 +/* B7DB80 80240260 4407A000 */ mfc1 $a3, $f20 +/* B7DB84 80240264 0C019E40 */ jal guTranslateF +/* B7DB88 80240268 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DB8C 8024026C 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DB90 80240270 26300058 */ addiu $s0, $s1, 0x58 +/* B7DB94 80240274 0200282D */ daddu $a1, $s0, $zero +/* B7DB98 80240278 0C019D80 */ jal guMtxCatF +/* B7DB9C 8024027C 0200302D */ daddu $a2, $s0, $zero +/* B7DBA0 80240280 4405E000 */ mfc1 $a1, $f28 +/* B7DBA4 80240284 4406D000 */ mfc1 $a2, $f26 +/* B7DBA8 80240288 4407C000 */ mfc1 $a3, $f24 +/* B7DBAC 8024028C 0C090030 */ jal func_802400C0_B7D9E0 +/* B7DBB0 80240290 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DBB4 80240294 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DBB8 80240298 0200282D */ daddu $a1, $s0, $zero +/* B7DBBC 8024029C 0C019D80 */ jal guMtxCatF +/* B7DBC0 802402A0 0200302D */ daddu $a2, $s0, $zero +/* B7DBC4 802402A4 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DBC8 802402A8 4600B587 */ neg.s $f22, $f22 +/* B7DBCC 802402AC 4405A000 */ mfc1 $a1, $f20 +/* B7DBD0 802402B0 4406B000 */ mfc1 $a2, $f22 +/* B7DBD4 802402B4 0C019E40 */ jal guTranslateF +/* B7DBD8 802402B8 00A0382D */ daddu $a3, $a1, $zero +/* B7DBDC 802402BC 27A40010 */ addiu $a0, $sp, 0x10 +/* B7DBE0 802402C0 0200282D */ daddu $a1, $s0, $zero +/* B7DBE4 802402C4 0C019D80 */ jal guMtxCatF +/* B7DBE8 802402C8 00A0302D */ daddu $a2, $a1, $zero +.L802402CC: +/* B7DBEC 802402CC 8FBF005C */ lw $ra, 0x5c($sp) +/* B7DBF0 802402D0 8FB20058 */ lw $s2, 0x58($sp) +/* B7DBF4 802402D4 8FB10054 */ lw $s1, 0x54($sp) +/* B7DBF8 802402D8 8FB00050 */ lw $s0, 0x50($sp) +/* B7DBFC 802402DC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* B7DC00 802402E0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* B7DC04 802402E4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* B7DC08 802402E8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* B7DC0C 802402EC D7B40060 */ ldc1 $f20, 0x60($sp) +/* B7DC10 802402F0 24020002 */ addiu $v0, $zero, 2 +/* B7DC14 802402F4 03E00008 */ jr $ra +/* B7DC18 802402F8 27BD0088 */ addiu $sp, $sp, 0x88 +/* B7DC1C 802402FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_16/B80300/func_80240370_B80370.s b/asm/nonmatchings/world/area_jan/jan_16/B80300/func_80240370_B80370.s index 4bd1684c52..b7807d2817 100644 --- a/asm/nonmatchings/world/area_jan/jan_16/B80300/func_80240370_B80370.s +++ b/asm/nonmatchings/world/area_jan/jan_16/B80300/func_80240370_B80370.s @@ -55,7 +55,7 @@ glabel func_80240370_B80370 /* B80438 80240438 4405E000 */ mfc1 $a1, $f28 /* B8043C 8024043C 4406D000 */ mfc1 $a2, $f26 /* B80440 80240440 4407C000 */ mfc1 $a3, $f24 -/* B80444 80240444 0C0900C0 */ jal func_80240300 +/* B80444 80240444 0C0900C0 */ jal func_80240300_B80300 /* B80448 80240448 27A40010 */ addiu $a0, $sp, 0x10 /* B8044C 8024044C 27A40010 */ addiu $a0, $sp, 0x10 /* B80450 80240450 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240370_B80370 /* B804C0 802404C0 4405E000 */ mfc1 $a1, $f28 /* B804C4 802404C4 4406D000 */ mfc1 $a2, $f26 /* B804C8 802404C8 4407C000 */ mfc1 $a3, $f24 -/* B804CC 802404CC 0C0900C0 */ jal func_80240300 +/* B804CC 802404CC 0C0900C0 */ jal func_80240300_B80300 /* B804D0 802404D0 27A40010 */ addiu $a0, $sp, 0x10 /* B804D4 802404D4 27A40010 */ addiu $a0, $sp, 0x10 /* B804D8 802404D8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s index f46b5c7fe3..e43c0183e3 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240B94_B84D14.s @@ -131,7 +131,7 @@ glabel func_80240B94_B84D14 /* B84EF4 80240D74 00000000 */ nop /* B84EF8 80240D78 0280202D */ daddu $a0, $s4, $zero /* B84EFC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* B84F00 80240D80 0C090000 */ jal func_80240000 +/* B84F00 80240D80 0C090000 */ jal func_80240000_B84180 /* B84F04 80240D84 02A0302D */ daddu $a2, $s5, $zero /* B84F08 80240D88 0280202D */ daddu $a0, $s4, $zero /* B84F0C 80240D8C 0260282D */ daddu $a1, $s3, $zero @@ -141,27 +141,27 @@ glabel func_80240B94_B84D14 /* B84F1C 80240D9C 00000000 */ nop /* B84F20 80240DA0 0280202D */ daddu $a0, $s4, $zero /* B84F24 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* B84F28 80240DA8 0C090100 */ jal func_80240400 +/* B84F28 80240DA8 0C090100 */ jal func_80240400_B84580 /* B84F2C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* B84F30 80240DB0 0280202D */ daddu $a0, $s4, $zero /* B84F34 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* B84F38 80240DB8 0C090130 */ jal func_802404C0 +/* B84F38 80240DB8 0C090130 */ jal func_802404C0_B84640 /* B84F3C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* B84F40 80240DC0 0809039A */ j .L80240E68 /* B84F44 80240DC4 00000000 */ nop /* B84F48 80240DC8 0280202D */ daddu $a0, $s4, $zero /* B84F4C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* B84F50 80240DD0 0C09019F */ jal func_8024067C +/* B84F50 80240DD0 0C09019F */ jal func_8024067C_B847FC /* B84F54 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* B84F58 80240DD8 0809039A */ j .L80240E68 /* B84F5C 80240DDC 00000000 */ nop /* B84F60 80240DE0 0280202D */ daddu $a0, $s4, $zero /* B84F64 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* B84F68 80240DE8 0C0901CC */ jal func_80240730 +/* B84F68 80240DE8 0C0901CC */ jal func_80240730_B848B0 /* B84F6C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* B84F70 80240DF0 0280202D */ daddu $a0, $s4, $zero /* B84F74 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* B84F78 80240DF8 0C0901E9 */ jal func_802407A4 +/* B84F78 80240DF8 0C0901E9 */ jal func_802407A4_B84924 /* B84F7C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* B84F80 80240E00 0809039A */ j .L80240E68 /* B84F84 80240E04 00000000 */ nop @@ -171,19 +171,19 @@ glabel func_80240B94_B84D14 /* B84F94 80240E14 02A0302D */ daddu $a2, $s5, $zero /* B84F98 80240E18 0280202D */ daddu $a0, $s4, $zero /* B84F9C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* B84FA0 80240E20 0C090253 */ jal func_8024094C +/* B84FA0 80240E20 0C090253 */ jal func_8024094C_B84ACC /* B84FA4 80240E24 02A0302D */ daddu $a2, $s5, $zero /* B84FA8 80240E28 0809039A */ j .L80240E68 /* B84FAC 80240E2C 00000000 */ nop /* B84FB0 80240E30 0280202D */ daddu $a0, $s4, $zero /* B84FB4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* B84FB8 80240E38 0C09029B */ jal func_80240A6C +/* B84FB8 80240E38 0C09029B */ jal func_80240A6C_B84BEC /* B84FBC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* B84FC0 80240E40 0809039A */ j .L80240E68 /* B84FC4 80240E44 00000000 */ nop /* B84FC8 80240E48 0280202D */ daddu $a0, $s4, $zero /* B84FCC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* B84FD0 80240E50 0C0902B5 */ jal func_80240AD4 +/* B84FD0 80240E50 0C0902B5 */ jal func_80240AD4_B84C54 /* B84FD4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* B84FD8 80240E58 0809039A */ j .L80240E68 /* B84FDC 80240E5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FA8.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FA8.s deleted file mode 100644 index d23ca7f4da..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FA8.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FA8 -/* B85128 80240FA8 3C03800B */ lui $v1, %hi(gCameras) -/* B8512C 80240FAC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* B85130 80240FB0 94620000 */ lhu $v0, ($v1) -/* B85134 80240FB4 34421000 */ ori $v0, $v0, 0x1000 -/* B85138 80240FB8 A4620000 */ sh $v0, ($v1) -/* B8513C 80240FBC 03E00008 */ jr $ra -/* B85140 80240FC0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FA8_B85128.s b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FA8_B85128.s new file mode 100644 index 0000000000..815c47b043 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_22/B84180/func_80240FA8_B85128.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FA8_B85128 +/* B85128 80240FA8 3C03800B */ lui $v1, %hi(gCameras) +/* B8512C 80240FAC 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* B85130 80240FB0 94620000 */ lhu $v0, ($v1) +/* B85134 80240FB4 34421000 */ ori $v0, $v0, 0x1000 +/* B85138 80240FB8 A4620000 */ sh $v0, ($v1) +/* B8513C 80240FBC 03E00008 */ jr $ra +/* B85140 80240FC0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4.s deleted file mode 100644 index fc9263cbb0..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410C4 -/* B85244 802410C4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B85248 802410C8 AFB1001C */ sw $s1, 0x1c($sp) -/* B8524C 802410CC 0080882D */ daddu $s1, $a0, $zero -/* B85250 802410D0 AFBF0020 */ sw $ra, 0x20($sp) -/* B85254 802410D4 AFB00018 */ sw $s0, 0x18($sp) -/* B85258 802410D8 8E30000C */ lw $s0, 0xc($s1) -/* B8525C 802410DC 8E020000 */ lw $v0, ($s0) -/* B85260 802410E0 1040001B */ beqz $v0, .L80241150 -/* B85264 802410E4 26100004 */ addiu $s0, $s0, 4 -/* B85268 802410E8 8E050000 */ lw $a1, ($s0) -/* B8526C 802410EC 0C0B1EAF */ jal get_variable -/* B85270 802410F0 26100004 */ addiu $s0, $s0, 4 -/* B85274 802410F4 AE220070 */ sw $v0, 0x70($s1) -/* B85278 802410F8 8E050000 */ lw $a1, ($s0) -/* B8527C 802410FC 26100004 */ addiu $s0, $s0, 4 -/* B85280 80241100 0C0B1EAF */ jal get_variable -/* B85284 80241104 0220202D */ daddu $a0, $s1, $zero -/* B85288 80241108 AE220074 */ sw $v0, 0x74($s1) -/* B8528C 8024110C 8E050000 */ lw $a1, ($s0) -/* B85290 80241110 0C0B1EAF */ jal get_variable -/* B85294 80241114 0220202D */ daddu $a0, $s1, $zero -/* B85298 80241118 24040185 */ addiu $a0, $zero, 0x185 -/* B8529C 8024111C 0000282D */ daddu $a1, $zero, $zero -/* B852A0 80241120 C6200070 */ lwc1 $f0, 0x70($s1) -/* B852A4 80241124 46800020 */ cvt.s.w $f0, $f0 -/* B852A8 80241128 C6220074 */ lwc1 $f2, 0x74($s1) -/* B852AC 8024112C 468010A0 */ cvt.s.w $f2, $f2 -/* B852B0 80241130 44060000 */ mfc1 $a2, $f0 -/* B852B4 80241134 44071000 */ mfc1 $a3, $f2 -/* B852B8 80241138 44820000 */ mtc1 $v0, $f0 -/* B852BC 8024113C 00000000 */ nop -/* B852C0 80241140 46800020 */ cvt.s.w $f0, $f0 -/* B852C4 80241144 AE220078 */ sw $v0, 0x78($s1) -/* B852C8 80241148 0C05267B */ jal func_801499EC -/* B852CC 8024114C E7A00010 */ swc1 $f0, 0x10($sp) -.L80241150: -/* B852D0 80241150 8FBF0020 */ lw $ra, 0x20($sp) -/* B852D4 80241154 8FB1001C */ lw $s1, 0x1c($sp) -/* B852D8 80241158 8FB00018 */ lw $s0, 0x18($sp) -/* B852DC 8024115C 24020002 */ addiu $v0, $zero, 2 -/* B852E0 80241160 03E00008 */ jr $ra -/* B852E4 80241164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s new file mode 100644 index 0000000000..880360f1f4 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802410C4_B85244.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410C4_B85244 +/* B85244 802410C4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B85248 802410C8 AFB1001C */ sw $s1, 0x1c($sp) +/* B8524C 802410CC 0080882D */ daddu $s1, $a0, $zero +/* B85250 802410D0 AFBF0020 */ sw $ra, 0x20($sp) +/* B85254 802410D4 AFB00018 */ sw $s0, 0x18($sp) +/* B85258 802410D8 8E30000C */ lw $s0, 0xc($s1) +/* B8525C 802410DC 8E020000 */ lw $v0, ($s0) +/* B85260 802410E0 1040001B */ beqz $v0, .L80241150 +/* B85264 802410E4 26100004 */ addiu $s0, $s0, 4 +/* B85268 802410E8 8E050000 */ lw $a1, ($s0) +/* B8526C 802410EC 0C0B1EAF */ jal get_variable +/* B85270 802410F0 26100004 */ addiu $s0, $s0, 4 +/* B85274 802410F4 AE220070 */ sw $v0, 0x70($s1) +/* B85278 802410F8 8E050000 */ lw $a1, ($s0) +/* B8527C 802410FC 26100004 */ addiu $s0, $s0, 4 +/* B85280 80241100 0C0B1EAF */ jal get_variable +/* B85284 80241104 0220202D */ daddu $a0, $s1, $zero +/* B85288 80241108 AE220074 */ sw $v0, 0x74($s1) +/* B8528C 8024110C 8E050000 */ lw $a1, ($s0) +/* B85290 80241110 0C0B1EAF */ jal get_variable +/* B85294 80241114 0220202D */ daddu $a0, $s1, $zero +/* B85298 80241118 24040185 */ addiu $a0, $zero, 0x185 +/* B8529C 8024111C 0000282D */ daddu $a1, $zero, $zero +/* B852A0 80241120 C6200070 */ lwc1 $f0, 0x70($s1) +/* B852A4 80241124 46800020 */ cvt.s.w $f0, $f0 +/* B852A8 80241128 C6220074 */ lwc1 $f2, 0x74($s1) +/* B852AC 8024112C 468010A0 */ cvt.s.w $f2, $f2 +/* B852B0 80241130 44060000 */ mfc1 $a2, $f0 +/* B852B4 80241134 44071000 */ mfc1 $a3, $f2 +/* B852B8 80241138 44820000 */ mtc1 $v0, $f0 +/* B852BC 8024113C 00000000 */ nop +/* B852C0 80241140 46800020 */ cvt.s.w $f0, $f0 +/* B852C4 80241144 AE220078 */ sw $v0, 0x78($s1) +/* B852C8 80241148 0C05267B */ jal func_801499EC +/* B852CC 8024114C E7A00010 */ swc1 $f0, 0x10($sp) +.L80241150: +/* B852D0 80241150 8FBF0020 */ lw $ra, 0x20($sp) +/* B852D4 80241154 8FB1001C */ lw $s1, 0x1c($sp) +/* B852D8 80241158 8FB00018 */ lw $s0, 0x18($sp) +/* B852DC 8024115C 24020002 */ addiu $v0, $zero, 2 +/* B852E0 80241160 03E00008 */ jr $ra +/* B852E4 80241164 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168.s deleted file mode 100644 index 42517d1926..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168.s +++ /dev/null @@ -1,99 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241168 -/* B852E8 80241168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B852EC 8024116C AFB10014 */ sw $s1, 0x14($sp) -/* B852F0 80241170 0080882D */ daddu $s1, $a0, $zero -/* B852F4 80241174 AFBF001C */ sw $ra, 0x1c($sp) -/* B852F8 80241178 AFB20018 */ sw $s2, 0x18($sp) -/* B852FC 8024117C AFB00010 */ sw $s0, 0x10($sp) -/* B85300 80241180 8E22000C */ lw $v0, 0xc($s1) -/* B85304 80241184 0C0B1EAF */ jal get_variable -/* B85308 80241188 8C450000 */ lw $a1, ($v0) -/* B8530C 8024118C 8E23013C */ lw $v1, 0x13c($s1) -/* B85310 80241190 8C720000 */ lw $s2, ($v1) -/* B85314 80241194 C646000C */ lwc1 $f6, 0xc($s2) -/* B85318 80241198 C6400000 */ lwc1 $f0, ($s2) -/* B8531C 8024119C 46003181 */ sub.s $f6, $f6, $f0 -/* B85320 802411A0 3C01447A */ lui $at, 0x447a -/* B85324 802411A4 44814000 */ mtc1 $at, $f8 -/* B85328 802411A8 C6200084 */ lwc1 $f0, 0x84($s1) -/* B8532C 802411AC 46800020 */ cvt.s.w $f0, $f0 -/* B85330 802411B0 46083183 */ div.s $f6, $f6, $f8 -/* B85334 802411B4 46003182 */ mul.s $f6, $f6, $f0 -/* B85338 802411B8 00000000 */ nop -/* B8533C 802411BC C6440010 */ lwc1 $f4, 0x10($s2) -/* B85340 802411C0 C6420004 */ lwc1 $f2, 4($s2) -/* B85344 802411C4 46022101 */ sub.s $f4, $f4, $f2 -/* B85348 802411C8 C6420008 */ lwc1 $f2, 8($s2) -/* B8534C 802411CC C6400014 */ lwc1 $f0, 0x14($s2) -/* B85350 802411D0 46020001 */ sub.s $f0, $f0, $f2 -/* B85354 802411D4 46082103 */ div.s $f4, $f4, $f8 -/* B85358 802411D8 C6220084 */ lwc1 $f2, 0x84($s1) -/* B8535C 802411DC 468010A0 */ cvt.s.w $f2, $f2 -/* B85360 802411E0 46022102 */ mul.s $f4, $f4, $f2 -/* B85364 802411E4 00000000 */ nop -/* B85368 802411E8 46080003 */ div.s $f0, $f0, $f8 -/* B8536C 802411EC 46020002 */ mul.s $f0, $f0, $f2 -/* B85370 802411F0 00000000 */ nop -/* B85374 802411F4 4600328D */ trunc.w.s $f10, $f6 -/* B85378 802411F8 E62A0098 */ swc1 $f10, 0x98($s1) -/* B8537C 802411FC 4600228D */ trunc.w.s $f10, $f4 -/* B85380 80241200 E62A009C */ swc1 $f10, 0x9c($s1) -/* B85384 80241204 4600028D */ trunc.w.s $f10, $f0 -/* B85388 80241208 1440002E */ bnez $v0, .L802412C4 -/* B8538C 8024120C E62A00A0 */ swc1 $f10, 0xa0($s1) -/* B85390 80241210 0C00EAD2 */ jal get_npc_safe -/* B85394 80241214 2404FFFC */ addiu $a0, $zero, -4 -/* B85398 80241218 8E23008C */ lw $v1, 0x8c($s1) -/* B8539C 8024121C 8E240098 */ lw $a0, 0x98($s1) -/* B853A0 80241220 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* B853A4 80241224 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* B853A8 80241228 00641821 */ addu $v1, $v1, $a0 -/* B853AC 8024122C 44830000 */ mtc1 $v1, $f0 -/* B853B0 80241230 00000000 */ nop -/* B853B4 80241234 46800020 */ cvt.s.w $f0, $f0 -/* B853B8 80241238 E6000028 */ swc1 $f0, 0x28($s0) -/* B853BC 8024123C 8E230090 */ lw $v1, 0x90($s1) -/* B853C0 80241240 8E24009C */ lw $a0, 0x9c($s1) -/* B853C4 80241244 00641821 */ addu $v1, $v1, $a0 -/* B853C8 80241248 44830000 */ mtc1 $v1, $f0 -/* B853CC 8024124C 00000000 */ nop -/* B853D0 80241250 46800020 */ cvt.s.w $f0, $f0 -/* B853D4 80241254 E600002C */ swc1 $f0, 0x2c($s0) -/* B853D8 80241258 8E230094 */ lw $v1, 0x94($s1) -/* B853DC 8024125C 8E2400A0 */ lw $a0, 0xa0($s1) -/* B853E0 80241260 00641821 */ addu $v1, $v1, $a0 -/* B853E4 80241264 44830000 */ mtc1 $v1, $f0 -/* B853E8 80241268 00000000 */ nop -/* B853EC 8024126C 46800020 */ cvt.s.w $f0, $f0 -/* B853F0 80241270 E6000030 */ swc1 $f0, 0x30($s0) -/* B853F4 80241274 C64C0000 */ lwc1 $f12, ($s2) -/* B853F8 80241278 C64E0008 */ lwc1 $f14, 8($s2) -/* B853FC 8024127C 8E46000C */ lw $a2, 0xc($s2) -/* B85400 80241280 8E470014 */ lw $a3, 0x14($s2) -/* B85404 80241284 0C00A720 */ jal atan2 -/* B85408 80241288 0040882D */ daddu $s1, $v0, $zero -/* B8540C 8024128C C6020028 */ lwc1 $f2, 0x28($s0) -/* B85410 80241290 E6000080 */ swc1 $f0, 0x80($s0) -/* B85414 80241294 E6220038 */ swc1 $f2, 0x38($s1) -/* B85418 80241298 C600002C */ lwc1 $f0, 0x2c($s0) -/* B8541C 8024129C 3C014120 */ lui $at, 0x4120 -/* B85420 802412A0 44811000 */ mtc1 $at, $f2 -/* B85424 802412A4 00000000 */ nop -/* B85428 802412A8 46020001 */ sub.s $f0, $f0, $f2 -/* B8542C 802412AC 3C0140A0 */ lui $at, 0x40a0 -/* B85430 802412B0 44811000 */ mtc1 $at, $f2 -/* B85434 802412B4 E620003C */ swc1 $f0, 0x3c($s1) -/* B85438 802412B8 C6000030 */ lwc1 $f0, 0x30($s0) -/* B8543C 802412BC 46020001 */ sub.s $f0, $f0, $f2 -/* B85440 802412C0 E6200040 */ swc1 $f0, 0x40($s1) -.L802412C4: -/* B85444 802412C4 8FBF001C */ lw $ra, 0x1c($sp) -/* B85448 802412C8 8FB20018 */ lw $s2, 0x18($sp) -/* B8544C 802412CC 8FB10014 */ lw $s1, 0x14($sp) -/* B85450 802412D0 8FB00010 */ lw $s0, 0x10($sp) -/* B85454 802412D4 24020002 */ addiu $v0, $zero, 2 -/* B85458 802412D8 03E00008 */ jr $ra -/* B8545C 802412DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168_B852E8.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168_B852E8.s new file mode 100644 index 0000000000..254ea04c94 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241168_B852E8.s @@ -0,0 +1,99 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241168_B852E8 +/* B852E8 80241168 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B852EC 8024116C AFB10014 */ sw $s1, 0x14($sp) +/* B852F0 80241170 0080882D */ daddu $s1, $a0, $zero +/* B852F4 80241174 AFBF001C */ sw $ra, 0x1c($sp) +/* B852F8 80241178 AFB20018 */ sw $s2, 0x18($sp) +/* B852FC 8024117C AFB00010 */ sw $s0, 0x10($sp) +/* B85300 80241180 8E22000C */ lw $v0, 0xc($s1) +/* B85304 80241184 0C0B1EAF */ jal get_variable +/* B85308 80241188 8C450000 */ lw $a1, ($v0) +/* B8530C 8024118C 8E23013C */ lw $v1, 0x13c($s1) +/* B85310 80241190 8C720000 */ lw $s2, ($v1) +/* B85314 80241194 C646000C */ lwc1 $f6, 0xc($s2) +/* B85318 80241198 C6400000 */ lwc1 $f0, ($s2) +/* B8531C 8024119C 46003181 */ sub.s $f6, $f6, $f0 +/* B85320 802411A0 3C01447A */ lui $at, 0x447a +/* B85324 802411A4 44814000 */ mtc1 $at, $f8 +/* B85328 802411A8 C6200084 */ lwc1 $f0, 0x84($s1) +/* B8532C 802411AC 46800020 */ cvt.s.w $f0, $f0 +/* B85330 802411B0 46083183 */ div.s $f6, $f6, $f8 +/* B85334 802411B4 46003182 */ mul.s $f6, $f6, $f0 +/* B85338 802411B8 00000000 */ nop +/* B8533C 802411BC C6440010 */ lwc1 $f4, 0x10($s2) +/* B85340 802411C0 C6420004 */ lwc1 $f2, 4($s2) +/* B85344 802411C4 46022101 */ sub.s $f4, $f4, $f2 +/* B85348 802411C8 C6420008 */ lwc1 $f2, 8($s2) +/* B8534C 802411CC C6400014 */ lwc1 $f0, 0x14($s2) +/* B85350 802411D0 46020001 */ sub.s $f0, $f0, $f2 +/* B85354 802411D4 46082103 */ div.s $f4, $f4, $f8 +/* B85358 802411D8 C6220084 */ lwc1 $f2, 0x84($s1) +/* B8535C 802411DC 468010A0 */ cvt.s.w $f2, $f2 +/* B85360 802411E0 46022102 */ mul.s $f4, $f4, $f2 +/* B85364 802411E4 00000000 */ nop +/* B85368 802411E8 46080003 */ div.s $f0, $f0, $f8 +/* B8536C 802411EC 46020002 */ mul.s $f0, $f0, $f2 +/* B85370 802411F0 00000000 */ nop +/* B85374 802411F4 4600328D */ trunc.w.s $f10, $f6 +/* B85378 802411F8 E62A0098 */ swc1 $f10, 0x98($s1) +/* B8537C 802411FC 4600228D */ trunc.w.s $f10, $f4 +/* B85380 80241200 E62A009C */ swc1 $f10, 0x9c($s1) +/* B85384 80241204 4600028D */ trunc.w.s $f10, $f0 +/* B85388 80241208 1440002E */ bnez $v0, .L802412C4 +/* B8538C 8024120C E62A00A0 */ swc1 $f10, 0xa0($s1) +/* B85390 80241210 0C00EAD2 */ jal get_npc_safe +/* B85394 80241214 2404FFFC */ addiu $a0, $zero, -4 +/* B85398 80241218 8E23008C */ lw $v1, 0x8c($s1) +/* B8539C 8024121C 8E240098 */ lw $a0, 0x98($s1) +/* B853A0 80241220 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* B853A4 80241224 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* B853A8 80241228 00641821 */ addu $v1, $v1, $a0 +/* B853AC 8024122C 44830000 */ mtc1 $v1, $f0 +/* B853B0 80241230 00000000 */ nop +/* B853B4 80241234 46800020 */ cvt.s.w $f0, $f0 +/* B853B8 80241238 E6000028 */ swc1 $f0, 0x28($s0) +/* B853BC 8024123C 8E230090 */ lw $v1, 0x90($s1) +/* B853C0 80241240 8E24009C */ lw $a0, 0x9c($s1) +/* B853C4 80241244 00641821 */ addu $v1, $v1, $a0 +/* B853C8 80241248 44830000 */ mtc1 $v1, $f0 +/* B853CC 8024124C 00000000 */ nop +/* B853D0 80241250 46800020 */ cvt.s.w $f0, $f0 +/* B853D4 80241254 E600002C */ swc1 $f0, 0x2c($s0) +/* B853D8 80241258 8E230094 */ lw $v1, 0x94($s1) +/* B853DC 8024125C 8E2400A0 */ lw $a0, 0xa0($s1) +/* B853E0 80241260 00641821 */ addu $v1, $v1, $a0 +/* B853E4 80241264 44830000 */ mtc1 $v1, $f0 +/* B853E8 80241268 00000000 */ nop +/* B853EC 8024126C 46800020 */ cvt.s.w $f0, $f0 +/* B853F0 80241270 E6000030 */ swc1 $f0, 0x30($s0) +/* B853F4 80241274 C64C0000 */ lwc1 $f12, ($s2) +/* B853F8 80241278 C64E0008 */ lwc1 $f14, 8($s2) +/* B853FC 8024127C 8E46000C */ lw $a2, 0xc($s2) +/* B85400 80241280 8E470014 */ lw $a3, 0x14($s2) +/* B85404 80241284 0C00A720 */ jal atan2 +/* B85408 80241288 0040882D */ daddu $s1, $v0, $zero +/* B8540C 8024128C C6020028 */ lwc1 $f2, 0x28($s0) +/* B85410 80241290 E6000080 */ swc1 $f0, 0x80($s0) +/* B85414 80241294 E6220038 */ swc1 $f2, 0x38($s1) +/* B85418 80241298 C600002C */ lwc1 $f0, 0x2c($s0) +/* B8541C 8024129C 3C014120 */ lui $at, 0x4120 +/* B85420 802412A0 44811000 */ mtc1 $at, $f2 +/* B85424 802412A4 00000000 */ nop +/* B85428 802412A8 46020001 */ sub.s $f0, $f0, $f2 +/* B8542C 802412AC 3C0140A0 */ lui $at, 0x40a0 +/* B85430 802412B0 44811000 */ mtc1 $at, $f2 +/* B85434 802412B4 E620003C */ swc1 $f0, 0x3c($s1) +/* B85438 802412B8 C6000030 */ lwc1 $f0, 0x30($s0) +/* B8543C 802412BC 46020001 */ sub.s $f0, $f0, $f2 +/* B85440 802412C0 E6200040 */ swc1 $f0, 0x40($s1) +.L802412C4: +/* B85444 802412C4 8FBF001C */ lw $ra, 0x1c($sp) +/* B85448 802412C8 8FB20018 */ lw $s2, 0x18($sp) +/* B8544C 802412CC 8FB10014 */ lw $s1, 0x14($sp) +/* B85450 802412D0 8FB00010 */ lw $s0, 0x10($sp) +/* B85454 802412D4 24020002 */ addiu $v0, $zero, 2 +/* B85458 802412D8 03E00008 */ jr $ra +/* B8545C 802412DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802413D0.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802413D0.s deleted file mode 100644 index fe6982555f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802413D0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D0 -/* B85550 802413D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B85554 802413D4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B85558 802413D8 4485A000 */ mtc1 $a1, $f20 -/* B8555C 802413DC F7B60020 */ sdc1 $f22, 0x20($sp) -/* B85560 802413E0 4486B000 */ mtc1 $a2, $f22 -/* B85564 802413E4 AFB00010 */ sw $s0, 0x10($sp) -/* B85568 802413E8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B8556C 802413EC 4487C000 */ mtc1 $a3, $f24 -/* B85570 802413F0 AFBF0014 */ sw $ra, 0x14($sp) -/* B85574 802413F4 0C019D28 */ jal guMtxIdentF -/* B85578 802413F8 0080802D */ daddu $s0, $a0, $zero -/* B8557C 802413FC 4616A582 */ mul.s $f22, $f20, $f22 -/* B85580 80241400 00000000 */ nop -/* B85584 80241404 4618A502 */ mul.s $f20, $f20, $f24 -/* B85588 80241408 00000000 */ nop -/* B8558C 8024140C 3C013F80 */ lui $at, 0x3f80 -/* B85590 80241410 44810000 */ mtc1 $at, $f0 -/* B85594 80241414 00000000 */ nop -/* B85598 80241418 E6000014 */ swc1 $f0, 0x14($s0) -/* B8559C 8024141C E6160010 */ swc1 $f22, 0x10($s0) -/* B855A0 80241420 E6140018 */ swc1 $f20, 0x18($s0) -/* B855A4 80241424 8FBF0014 */ lw $ra, 0x14($sp) -/* B855A8 80241428 8FB00010 */ lw $s0, 0x10($sp) -/* B855AC 8024142C D7B80028 */ ldc1 $f24, 0x28($sp) -/* B855B0 80241430 D7B60020 */ ldc1 $f22, 0x20($sp) -/* B855B4 80241434 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B855B8 80241438 03E00008 */ jr $ra -/* B855BC 8024143C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802413D0_B85550.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802413D0_B85550.s new file mode 100644 index 0000000000..b38574216a --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_802413D0_B85550.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413D0_B85550 +/* B85550 802413D0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B85554 802413D4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B85558 802413D8 4485A000 */ mtc1 $a1, $f20 +/* B8555C 802413DC F7B60020 */ sdc1 $f22, 0x20($sp) +/* B85560 802413E0 4486B000 */ mtc1 $a2, $f22 +/* B85564 802413E4 AFB00010 */ sw $s0, 0x10($sp) +/* B85568 802413E8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* B8556C 802413EC 4487C000 */ mtc1 $a3, $f24 +/* B85570 802413F0 AFBF0014 */ sw $ra, 0x14($sp) +/* B85574 802413F4 0C019D28 */ jal guMtxIdentF +/* B85578 802413F8 0080802D */ daddu $s0, $a0, $zero +/* B8557C 802413FC 4616A582 */ mul.s $f22, $f20, $f22 +/* B85580 80241400 00000000 */ nop +/* B85584 80241404 4618A502 */ mul.s $f20, $f20, $f24 +/* B85588 80241408 00000000 */ nop +/* B8558C 8024140C 3C013F80 */ lui $at, 0x3f80 +/* B85590 80241410 44810000 */ mtc1 $at, $f0 +/* B85594 80241414 00000000 */ nop +/* B85598 80241418 E6000014 */ swc1 $f0, 0x14($s0) +/* B8559C 8024141C E6160010 */ swc1 $f22, 0x10($s0) +/* B855A0 80241420 E6140018 */ swc1 $f20, 0x18($s0) +/* B855A4 80241424 8FBF0014 */ lw $ra, 0x14($sp) +/* B855A8 80241428 8FB00010 */ lw $s0, 0x10($sp) +/* B855AC 8024142C D7B80028 */ ldc1 $f24, 0x28($sp) +/* B855B0 80241430 D7B60020 */ ldc1 $f22, 0x20($sp) +/* B855B4 80241434 D7B40018 */ ldc1 $f20, 0x18($sp) +/* B855B8 80241438 03E00008 */ jr $ra +/* B855BC 8024143C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241440_B855C0.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241440_B855C0.s index eb069469b6..b529e0bb9e 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241440_B855C0.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241440_B855C0.s @@ -55,7 +55,7 @@ glabel func_80241440_B855C0 /* B85688 80241508 4405E000 */ mfc1 $a1, $f28 /* B8568C 8024150C 4406D000 */ mfc1 $a2, $f26 /* B85690 80241510 4407C000 */ mfc1 $a3, $f24 -/* B85694 80241514 0C0904F4 */ jal func_802413D0 +/* B85694 80241514 0C0904F4 */ jal func_802413D0_B85550 /* B85698 80241518 27A40010 */ addiu $a0, $sp, 0x10 /* B8569C 8024151C 27A40010 */ addiu $a0, $sp, 0x10 /* B856A0 80241520 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80241440_B855C0 /* B85710 80241590 4405E000 */ mfc1 $a1, $f28 /* B85714 80241594 4406D000 */ mfc1 $a2, $f26 /* B85718 80241598 4407C000 */ mfc1 $a3, $f24 -/* B8571C 8024159C 0C0904F4 */ jal func_802413D0 +/* B8571C 8024159C 0C0904F4 */ jal func_802413D0_B85550 /* B85720 802415A0 27A40010 */ addiu $a0, $sp, 0x10 /* B85724 802415A4 27A40010 */ addiu $a0, $sp, 0x10 /* B85728 802415A8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C.s deleted file mode 100644 index 2bdc36e895..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024160C -/* B8578C 8024160C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B85790 80241610 AFB00010 */ sw $s0, 0x10($sp) -/* B85794 80241614 F7B40018 */ sdc1 $f20, 0x18($sp) -/* B85798 80241618 4485A000 */ mtc1 $a1, $f20 -/* B8579C 8024161C AFBF0014 */ sw $ra, 0x14($sp) -/* B857A0 80241620 0C019D28 */ jal guMtxIdentF -/* B857A4 80241624 0080802D */ daddu $s0, $a0, $zero -/* B857A8 80241628 3C018025 */ lui $at, 0x8025 -/* B857AC 8024162C D420BB40 */ ldc1 $f0, -0x44c0($at) -/* B857B0 80241630 4600A521 */ cvt.d.s $f20, $f20 -/* B857B4 80241634 4620A502 */ mul.d $f20, $f20, $f0 -/* B857B8 80241638 00000000 */ nop -/* B857BC 8024163C 3C013F80 */ lui $at, 0x3f80 -/* B857C0 80241640 44810000 */ mtc1 $at, $f0 -/* B857C4 80241644 AE000018 */ sw $zero, 0x18($s0) -/* B857C8 80241648 E6000014 */ swc1 $f0, 0x14($s0) -/* B857CC 8024164C 4620A520 */ cvt.s.d $f20, $f20 -/* B857D0 80241650 E6140010 */ swc1 $f20, 0x10($s0) -/* B857D4 80241654 8FBF0014 */ lw $ra, 0x14($sp) -/* B857D8 80241658 8FB00010 */ lw $s0, 0x10($sp) -/* B857DC 8024165C D7B40018 */ ldc1 $f20, 0x18($sp) -/* B857E0 80241660 03E00008 */ jr $ra -/* B857E4 80241664 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s new file mode 100644 index 0000000000..36fa84465a --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_8024160C_B8578C.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024160C_B8578C +/* B8578C 8024160C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B85790 80241610 AFB00010 */ sw $s0, 0x10($sp) +/* B85794 80241614 F7B40018 */ sdc1 $f20, 0x18($sp) +/* B85798 80241618 4485A000 */ mtc1 $a1, $f20 +/* B8579C 8024161C AFBF0014 */ sw $ra, 0x14($sp) +/* B857A0 80241620 0C019D28 */ jal guMtxIdentF +/* B857A4 80241624 0080802D */ daddu $s0, $a0, $zero +/* B857A8 80241628 3C018025 */ lui $at, 0x8025 +/* B857AC 8024162C D420BB40 */ ldc1 $f0, -0x44c0($at) +/* B857B0 80241630 4600A521 */ cvt.d.s $f20, $f20 +/* B857B4 80241634 4620A502 */ mul.d $f20, $f20, $f0 +/* B857B8 80241638 00000000 */ nop +/* B857BC 8024163C 3C013F80 */ lui $at, 0x3f80 +/* B857C0 80241640 44810000 */ mtc1 $at, $f0 +/* B857C4 80241644 AE000018 */ sw $zero, 0x18($s0) +/* B857C8 80241648 E6000014 */ swc1 $f0, 0x14($s0) +/* B857CC 8024164C 4620A520 */ cvt.s.d $f20, $f20 +/* B857D0 80241650 E6140010 */ swc1 $f20, 0x10($s0) +/* B857D4 80241654 8FBF0014 */ lw $ra, 0x14($sp) +/* B857D8 80241658 8FB00010 */ lw $s0, 0x10($sp) +/* B857DC 8024165C D7B40018 */ ldc1 $f20, 0x18($sp) +/* B857E0 80241660 03E00008 */ jr $ra +/* B857E4 80241664 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s index 88e5a4b7ef..6e5b32db27 100644 --- a/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s +++ b/asm/nonmatchings/world/area_jan/jan_22/B851A0/func_80241668_B857E8.s @@ -27,7 +27,7 @@ glabel func_80241668_B857E8 /* B85840 802416C0 14400008 */ bnez $v0, .L802416E4 /* B85844 802416C4 00000000 */ nop /* B85848 802416C8 4405A000 */ mfc1 $a1, $f20 -/* B8584C 802416CC 0C090583 */ jal func_8024160C +/* B8584C 802416CC 0C090583 */ jal func_8024160C_B8578C /* B85850 802416D0 26040058 */ addiu $a0, $s0, 0x58 /* B85854 802416D4 96020000 */ lhu $v0, ($s0) /* B85858 802416D8 34421400 */ ori $v0, $v0, 0x1400 @@ -35,7 +35,7 @@ glabel func_80241668_B857E8 /* B85860 802416E0 A6020000 */ sh $v0, ($s0) .L802416E4: /* B85864 802416E4 4405A000 */ mfc1 $a1, $f20 -/* B85868 802416E8 0C090583 */ jal func_8024160C +/* B85868 802416E8 0C090583 */ jal func_8024160C_B8578C /* B8586C 802416EC 27A40010 */ addiu $a0, $sp, 0x10 /* B85870 802416F0 27A40010 */ addiu $a0, $sp, 0x10 /* B85874 802416F4 26050058 */ addiu $a1, $s0, 0x58 diff --git a/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790.s b/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790.s deleted file mode 100644 index 31b03ac525..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241790 -/* B85910 80241790 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B85914 80241794 AFB10054 */ sw $s1, 0x54($sp) -/* B85918 80241798 0080882D */ daddu $s1, $a0, $zero -/* B8591C 8024179C AFBF005C */ sw $ra, 0x5c($sp) -/* B85920 802417A0 AFB20058 */ sw $s2, 0x58($sp) -/* B85924 802417A4 AFB00050 */ sw $s0, 0x50($sp) -/* B85928 802417A8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* B8592C 802417AC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* B85930 802417B0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* B85934 802417B4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* B85938 802417B8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* B8593C 802417BC 8E30000C */ lw $s0, 0xc($s1) -/* B85940 802417C0 8E050000 */ lw $a1, ($s0) -/* B85944 802417C4 0C0B1EAF */ jal get_variable -/* B85948 802417C8 26100004 */ addiu $s0, $s0, 4 -/* B8594C 802417CC 0C046C04 */ jal get_model_list_index_from_tree_index -/* B85950 802417D0 0040202D */ daddu $a0, $v0, $zero -/* B85954 802417D4 8E050000 */ lw $a1, ($s0) -/* B85958 802417D8 26100004 */ addiu $s0, $s0, 4 -/* B8595C 802417DC 0220202D */ daddu $a0, $s1, $zero -/* B85960 802417E0 0C0B210B */ jal get_float_variable -/* B85964 802417E4 0040902D */ daddu $s2, $v0, $zero -/* B85968 802417E8 8E050000 */ lw $a1, ($s0) -/* B8596C 802417EC 26100004 */ addiu $s0, $s0, 4 -/* B85970 802417F0 0220202D */ daddu $a0, $s1, $zero -/* B85974 802417F4 0C0B210B */ jal get_float_variable -/* B85978 802417F8 46000706 */ mov.s $f28, $f0 -/* B8597C 802417FC 8E050000 */ lw $a1, ($s0) -/* B85980 80241800 26100004 */ addiu $s0, $s0, 4 -/* B85984 80241804 0220202D */ daddu $a0, $s1, $zero -/* B85988 80241808 0C0B210B */ jal get_float_variable -/* B8598C 8024180C 46000686 */ mov.s $f26, $f0 -/* B85990 80241810 0220202D */ daddu $a0, $s1, $zero -/* B85994 80241814 8E050000 */ lw $a1, ($s0) -/* B85998 80241818 0C0B210B */ jal get_float_variable -/* B8599C 8024181C 46000586 */ mov.s $f22, $f0 -/* B859A0 80241820 0240202D */ daddu $a0, $s2, $zero -/* B859A4 80241824 0C046B4C */ jal get_model_from_list_index -/* B859A8 80241828 46000606 */ mov.s $f24, $f0 -/* B859AC 8024182C 0040882D */ daddu $s1, $v0, $zero -/* B859B0 80241830 96220000 */ lhu $v0, ($s1) -/* B859B4 80241834 30420400 */ andi $v0, $v0, 0x400 -/* B859B8 80241838 1440001E */ bnez $v0, .L802418B4 -/* B859BC 8024183C 26300058 */ addiu $s0, $s1, 0x58 -/* B859C0 80241840 4480A000 */ mtc1 $zero, $f20 -/* B859C4 80241844 4406B000 */ mfc1 $a2, $f22 -/* B859C8 80241848 4405A000 */ mfc1 $a1, $f20 -/* B859CC 8024184C 4407A000 */ mfc1 $a3, $f20 -/* B859D0 80241850 0C019E40 */ jal guTranslateF -/* B859D4 80241854 0200202D */ daddu $a0, $s0, $zero -/* B859D8 80241858 4405E000 */ mfc1 $a1, $f28 -/* B859DC 8024185C 4406D000 */ mfc1 $a2, $f26 -/* B859E0 80241860 4407C000 */ mfc1 $a3, $f24 -/* B859E4 80241864 0C0905C8 */ jal func_80241720_B858A0 -/* B859E8 80241868 27A40010 */ addiu $a0, $sp, 0x10 -/* B859EC 8024186C 27A40010 */ addiu $a0, $sp, 0x10 -/* B859F0 80241870 0200282D */ daddu $a1, $s0, $zero -/* B859F4 80241874 0C019D80 */ jal guMtxCatF -/* B859F8 80241878 0200302D */ daddu $a2, $s0, $zero -/* B859FC 8024187C 27A40010 */ addiu $a0, $sp, 0x10 -/* B85A00 80241880 4600B587 */ neg.s $f22, $f22 -/* B85A04 80241884 4405A000 */ mfc1 $a1, $f20 -/* B85A08 80241888 4406B000 */ mfc1 $a2, $f22 -/* B85A0C 8024188C 0C019E40 */ jal guTranslateF -/* B85A10 80241890 00A0382D */ daddu $a3, $a1, $zero -/* B85A14 80241894 27A40010 */ addiu $a0, $sp, 0x10 -/* B85A18 80241898 0200282D */ daddu $a1, $s0, $zero -/* B85A1C 8024189C 0C019D80 */ jal guMtxCatF -/* B85A20 802418A0 00A0302D */ daddu $a2, $a1, $zero -/* B85A24 802418A4 96220000 */ lhu $v0, ($s1) -/* B85A28 802418A8 34421400 */ ori $v0, $v0, 0x1400 -/* B85A2C 802418AC 0809064B */ j .L8024192C -/* B85A30 802418B0 A6220000 */ sh $v0, ($s1) -.L802418B4: -/* B85A34 802418B4 4480A000 */ mtc1 $zero, $f20 -/* B85A38 802418B8 4406B000 */ mfc1 $a2, $f22 -/* B85A3C 802418BC 4405A000 */ mfc1 $a1, $f20 -/* B85A40 802418C0 4407A000 */ mfc1 $a3, $f20 -/* B85A44 802418C4 0C019E40 */ jal guTranslateF -/* B85A48 802418C8 27A40010 */ addiu $a0, $sp, 0x10 -/* B85A4C 802418CC 27A40010 */ addiu $a0, $sp, 0x10 -/* B85A50 802418D0 26300058 */ addiu $s0, $s1, 0x58 -/* B85A54 802418D4 0200282D */ daddu $a1, $s0, $zero -/* B85A58 802418D8 0C019D80 */ jal guMtxCatF -/* B85A5C 802418DC 0200302D */ daddu $a2, $s0, $zero -/* B85A60 802418E0 4405E000 */ mfc1 $a1, $f28 -/* B85A64 802418E4 4406D000 */ mfc1 $a2, $f26 -/* B85A68 802418E8 4407C000 */ mfc1 $a3, $f24 -/* B85A6C 802418EC 0C0905C8 */ jal func_80241720_B858A0 -/* B85A70 802418F0 27A40010 */ addiu $a0, $sp, 0x10 -/* B85A74 802418F4 27A40010 */ addiu $a0, $sp, 0x10 -/* B85A78 802418F8 0200282D */ daddu $a1, $s0, $zero -/* B85A7C 802418FC 0C019D80 */ jal guMtxCatF -/* B85A80 80241900 0200302D */ daddu $a2, $s0, $zero -/* B85A84 80241904 27A40010 */ addiu $a0, $sp, 0x10 -/* B85A88 80241908 4600B587 */ neg.s $f22, $f22 -/* B85A8C 8024190C 4405A000 */ mfc1 $a1, $f20 -/* B85A90 80241910 4406B000 */ mfc1 $a2, $f22 -/* B85A94 80241914 0C019E40 */ jal guTranslateF -/* B85A98 80241918 00A0382D */ daddu $a3, $a1, $zero -/* B85A9C 8024191C 27A40010 */ addiu $a0, $sp, 0x10 -/* B85AA0 80241920 0200282D */ daddu $a1, $s0, $zero -/* B85AA4 80241924 0C019D80 */ jal guMtxCatF -/* B85AA8 80241928 00A0302D */ daddu $a2, $a1, $zero -.L8024192C: -/* B85AAC 8024192C 8FBF005C */ lw $ra, 0x5c($sp) -/* B85AB0 80241930 8FB20058 */ lw $s2, 0x58($sp) -/* B85AB4 80241934 8FB10054 */ lw $s1, 0x54($sp) -/* B85AB8 80241938 8FB00050 */ lw $s0, 0x50($sp) -/* B85ABC 8024193C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* B85AC0 80241940 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* B85AC4 80241944 D7B80070 */ ldc1 $f24, 0x70($sp) -/* B85AC8 80241948 D7B60068 */ ldc1 $f22, 0x68($sp) -/* B85ACC 8024194C D7B40060 */ ldc1 $f20, 0x60($sp) -/* B85AD0 80241950 24020002 */ addiu $v0, $zero, 2 -/* B85AD4 80241954 03E00008 */ jr $ra -/* B85AD8 80241958 27BD0088 */ addiu $sp, $sp, 0x88 -/* B85ADC 8024195C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790_B85910.s b/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790_B85910.s new file mode 100644 index 0000000000..2927b53ca3 --- /dev/null +++ b/asm/nonmatchings/world/area_jan/jan_22/B858A0/func_80241790_B85910.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241790_B85910 +/* B85910 80241790 27BDFF78 */ addiu $sp, $sp, -0x88 +/* B85914 80241794 AFB10054 */ sw $s1, 0x54($sp) +/* B85918 80241798 0080882D */ daddu $s1, $a0, $zero +/* B8591C 8024179C AFBF005C */ sw $ra, 0x5c($sp) +/* B85920 802417A0 AFB20058 */ sw $s2, 0x58($sp) +/* B85924 802417A4 AFB00050 */ sw $s0, 0x50($sp) +/* B85928 802417A8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* B8592C 802417AC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* B85930 802417B0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* B85934 802417B4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* B85938 802417B8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* B8593C 802417BC 8E30000C */ lw $s0, 0xc($s1) +/* B85940 802417C0 8E050000 */ lw $a1, ($s0) +/* B85944 802417C4 0C0B1EAF */ jal get_variable +/* B85948 802417C8 26100004 */ addiu $s0, $s0, 4 +/* B8594C 802417CC 0C046C04 */ jal get_model_list_index_from_tree_index +/* B85950 802417D0 0040202D */ daddu $a0, $v0, $zero +/* B85954 802417D4 8E050000 */ lw $a1, ($s0) +/* B85958 802417D8 26100004 */ addiu $s0, $s0, 4 +/* B8595C 802417DC 0220202D */ daddu $a0, $s1, $zero +/* B85960 802417E0 0C0B210B */ jal get_float_variable +/* B85964 802417E4 0040902D */ daddu $s2, $v0, $zero +/* B85968 802417E8 8E050000 */ lw $a1, ($s0) +/* B8596C 802417EC 26100004 */ addiu $s0, $s0, 4 +/* B85970 802417F0 0220202D */ daddu $a0, $s1, $zero +/* B85974 802417F4 0C0B210B */ jal get_float_variable +/* B85978 802417F8 46000706 */ mov.s $f28, $f0 +/* B8597C 802417FC 8E050000 */ lw $a1, ($s0) +/* B85980 80241800 26100004 */ addiu $s0, $s0, 4 +/* B85984 80241804 0220202D */ daddu $a0, $s1, $zero +/* B85988 80241808 0C0B210B */ jal get_float_variable +/* B8598C 8024180C 46000686 */ mov.s $f26, $f0 +/* B85990 80241810 0220202D */ daddu $a0, $s1, $zero +/* B85994 80241814 8E050000 */ lw $a1, ($s0) +/* B85998 80241818 0C0B210B */ jal get_float_variable +/* B8599C 8024181C 46000586 */ mov.s $f22, $f0 +/* B859A0 80241820 0240202D */ daddu $a0, $s2, $zero +/* B859A4 80241824 0C046B4C */ jal get_model_from_list_index +/* B859A8 80241828 46000606 */ mov.s $f24, $f0 +/* B859AC 8024182C 0040882D */ daddu $s1, $v0, $zero +/* B859B0 80241830 96220000 */ lhu $v0, ($s1) +/* B859B4 80241834 30420400 */ andi $v0, $v0, 0x400 +/* B859B8 80241838 1440001E */ bnez $v0, .L802418B4 +/* B859BC 8024183C 26300058 */ addiu $s0, $s1, 0x58 +/* B859C0 80241840 4480A000 */ mtc1 $zero, $f20 +/* B859C4 80241844 4406B000 */ mfc1 $a2, $f22 +/* B859C8 80241848 4405A000 */ mfc1 $a1, $f20 +/* B859CC 8024184C 4407A000 */ mfc1 $a3, $f20 +/* B859D0 80241850 0C019E40 */ jal guTranslateF +/* B859D4 80241854 0200202D */ daddu $a0, $s0, $zero +/* B859D8 80241858 4405E000 */ mfc1 $a1, $f28 +/* B859DC 8024185C 4406D000 */ mfc1 $a2, $f26 +/* B859E0 80241860 4407C000 */ mfc1 $a3, $f24 +/* B859E4 80241864 0C0905C8 */ jal func_80241720_B858A0 +/* B859E8 80241868 27A40010 */ addiu $a0, $sp, 0x10 +/* B859EC 8024186C 27A40010 */ addiu $a0, $sp, 0x10 +/* B859F0 80241870 0200282D */ daddu $a1, $s0, $zero +/* B859F4 80241874 0C019D80 */ jal guMtxCatF +/* B859F8 80241878 0200302D */ daddu $a2, $s0, $zero +/* B859FC 8024187C 27A40010 */ addiu $a0, $sp, 0x10 +/* B85A00 80241880 4600B587 */ neg.s $f22, $f22 +/* B85A04 80241884 4405A000 */ mfc1 $a1, $f20 +/* B85A08 80241888 4406B000 */ mfc1 $a2, $f22 +/* B85A0C 8024188C 0C019E40 */ jal guTranslateF +/* B85A10 80241890 00A0382D */ daddu $a3, $a1, $zero +/* B85A14 80241894 27A40010 */ addiu $a0, $sp, 0x10 +/* B85A18 80241898 0200282D */ daddu $a1, $s0, $zero +/* B85A1C 8024189C 0C019D80 */ jal guMtxCatF +/* B85A20 802418A0 00A0302D */ daddu $a2, $a1, $zero +/* B85A24 802418A4 96220000 */ lhu $v0, ($s1) +/* B85A28 802418A8 34421400 */ ori $v0, $v0, 0x1400 +/* B85A2C 802418AC 0809064B */ j .L8024192C +/* B85A30 802418B0 A6220000 */ sh $v0, ($s1) +.L802418B4: +/* B85A34 802418B4 4480A000 */ mtc1 $zero, $f20 +/* B85A38 802418B8 4406B000 */ mfc1 $a2, $f22 +/* B85A3C 802418BC 4405A000 */ mfc1 $a1, $f20 +/* B85A40 802418C0 4407A000 */ mfc1 $a3, $f20 +/* B85A44 802418C4 0C019E40 */ jal guTranslateF +/* B85A48 802418C8 27A40010 */ addiu $a0, $sp, 0x10 +/* B85A4C 802418CC 27A40010 */ addiu $a0, $sp, 0x10 +/* B85A50 802418D0 26300058 */ addiu $s0, $s1, 0x58 +/* B85A54 802418D4 0200282D */ daddu $a1, $s0, $zero +/* B85A58 802418D8 0C019D80 */ jal guMtxCatF +/* B85A5C 802418DC 0200302D */ daddu $a2, $s0, $zero +/* B85A60 802418E0 4405E000 */ mfc1 $a1, $f28 +/* B85A64 802418E4 4406D000 */ mfc1 $a2, $f26 +/* B85A68 802418E8 4407C000 */ mfc1 $a3, $f24 +/* B85A6C 802418EC 0C0905C8 */ jal func_80241720_B858A0 +/* B85A70 802418F0 27A40010 */ addiu $a0, $sp, 0x10 +/* B85A74 802418F4 27A40010 */ addiu $a0, $sp, 0x10 +/* B85A78 802418F8 0200282D */ daddu $a1, $s0, $zero +/* B85A7C 802418FC 0C019D80 */ jal guMtxCatF +/* B85A80 80241900 0200302D */ daddu $a2, $s0, $zero +/* B85A84 80241904 27A40010 */ addiu $a0, $sp, 0x10 +/* B85A88 80241908 4600B587 */ neg.s $f22, $f22 +/* B85A8C 8024190C 4405A000 */ mfc1 $a1, $f20 +/* B85A90 80241910 4406B000 */ mfc1 $a2, $f22 +/* B85A94 80241914 0C019E40 */ jal guTranslateF +/* B85A98 80241918 00A0382D */ daddu $a3, $a1, $zero +/* B85A9C 8024191C 27A40010 */ addiu $a0, $sp, 0x10 +/* B85AA0 80241920 0200282D */ daddu $a1, $s0, $zero +/* B85AA4 80241924 0C019D80 */ jal guMtxCatF +/* B85AA8 80241928 00A0302D */ daddu $a2, $a1, $zero +.L8024192C: +/* B85AAC 8024192C 8FBF005C */ lw $ra, 0x5c($sp) +/* B85AB0 80241930 8FB20058 */ lw $s2, 0x58($sp) +/* B85AB4 80241934 8FB10054 */ lw $s1, 0x54($sp) +/* B85AB8 80241938 8FB00050 */ lw $s0, 0x50($sp) +/* B85ABC 8024193C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* B85AC0 80241940 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* B85AC4 80241944 D7B80070 */ ldc1 $f24, 0x70($sp) +/* B85AC8 80241948 D7B60068 */ ldc1 $f22, 0x68($sp) +/* B85ACC 8024194C D7B40060 */ ldc1 $f20, 0x60($sp) +/* B85AD0 80241950 24020002 */ addiu $v0, $zero, 2 +/* B85AD4 80241954 03E00008 */ jr $ra +/* B85AD8 80241958 27BD0088 */ addiu $sp, $sp, 0x88 +/* B85ADC 8024195C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160.s deleted file mode 100644 index 64fff389e9..0000000000 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240160 -/* 8A9B70 80240160 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8A9B74 80240164 AFB60028 */ sw $s6, 0x28($sp) -/* 8A9B78 80240168 00C0B02D */ daddu $s6, $a2, $zero -/* 8A9B7C 8024016C AFB7002C */ sw $s7, 0x2c($sp) -/* 8A9B80 80240170 00E0B82D */ daddu $s7, $a3, $zero -/* 8A9B84 80240174 AFB20018 */ sw $s2, 0x18($sp) -/* 8A9B88 80240178 0000902D */ daddu $s2, $zero, $zero -/* 8A9B8C 8024017C AFB50024 */ sw $s5, 0x24($sp) -/* 8A9B90 80240180 3C158011 */ lui $s5, %hi(gPlayerStatus) -/* 8A9B94 80240184 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) -/* 8A9B98 80240188 AFBF0030 */ sw $ra, 0x30($sp) -/* 8A9B9C 8024018C AFB40020 */ sw $s4, 0x20($sp) -/* 8A9BA0 80240190 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A9BA4 80240194 AFB10014 */ sw $s1, 0x14($sp) -/* 8A9BA8 80240198 1AC00063 */ blez $s6, .L80240328 -/* 8A9BAC 8024019C AFB00010 */ sw $s0, 0x10($sp) -/* 8A9BB0 802401A0 3C1451EB */ lui $s4, 0x51eb -/* 8A9BB4 802401A4 3694851F */ ori $s4, $s4, 0x851f -/* 8A9BB8 802401A8 00A0882D */ daddu $s1, $a1, $zero -/* 8A9BBC 802401AC 0080982D */ daddu $s3, $a0, $zero -.L802401B0: -/* 8A9BC0 802401B0 86220000 */ lh $v0, ($s1) -/* 8A9BC4 802401B4 C6A00028 */ lwc1 $f0, 0x28($s5) -/* 8A9BC8 802401B8 44826000 */ mtc1 $v0, $f12 -/* 8A9BCC 802401BC 00000000 */ nop -/* 8A9BD0 802401C0 46806320 */ cvt.s.w $f12, $f12 -/* 8A9BD4 802401C4 46006001 */ sub.s $f0, $f12, $f0 -/* 8A9BD8 802401C8 4600018D */ trunc.w.s $f6, $f0 -/* 8A9BDC 802401CC 44023000 */ mfc1 $v0, $f6 -/* 8A9BE0 802401D0 00000000 */ nop -/* 8A9BE4 802401D4 00420018 */ mult $v0, $v0 -/* 8A9BE8 802401D8 86220004 */ lh $v0, 4($s1) -/* 8A9BEC 802401DC C6A00030 */ lwc1 $f0, 0x30($s5) -/* 8A9BF0 802401E0 44821000 */ mtc1 $v0, $f2 -/* 8A9BF4 802401E4 00000000 */ nop -/* 8A9BF8 802401E8 468010A0 */ cvt.s.w $f2, $f2 -/* 8A9BFC 802401EC 46001001 */ sub.s $f0, $f2, $f0 -/* 8A9C00 802401F0 00001812 */ mflo $v1 -/* 8A9C04 802401F4 4600018D */ trunc.w.s $f6, $f0 -/* 8A9C08 802401F8 44023000 */ mfc1 $v0, $f6 -/* 8A9C0C 802401FC 00000000 */ nop -/* 8A9C10 80240200 00420018 */ mult $v0, $v0 -/* 8A9C14 80240204 00001012 */ mflo $v0 -/* 8A9C18 80240208 00621021 */ addu $v0, $v1, $v0 -/* 8A9C1C 8024020C 00000000 */ nop -/* 8A9C20 80240210 00540018 */ mult $v0, $s4 -/* 8A9C24 80240214 000217C3 */ sra $v0, $v0, 0x1f -/* 8A9C28 80240218 00001810 */ mfhi $v1 -/* 8A9C2C 8024021C 00031943 */ sra $v1, $v1, 5 -/* 8A9C30 80240220 00628023 */ subu $s0, $v1, $v0 -/* 8A9C34 80240224 2A02000B */ slti $v0, $s0, 0xb -/* 8A9C38 80240228 50400001 */ beql $v0, $zero, .L80240230 -/* 8A9C3C 8024022C 2410000A */ addiu $s0, $zero, 0xa -.L80240230: -/* 8A9C40 80240230 3C018024 */ lui $at, 0x8024 -/* 8A9C44 80240234 D4200A30 */ ldc1 $f0, 0xa30($at) -/* 8A9C48 80240238 46006321 */ cvt.d.s $f12, $f12 -/* 8A9C4C 8024023C 46206302 */ mul.d $f12, $f12, $f0 -/* 8A9C50 80240240 00000000 */ nop -/* 8A9C54 80240244 3C013CF5 */ lui $at, 0x3cf5 -/* 8A9C58 80240248 3421C28F */ ori $at, $at, 0xc28f -/* 8A9C5C 8024024C 44810000 */ mtc1 $at, $f0 -/* 8A9C60 80240250 00000000 */ nop -/* 8A9C64 80240254 46001002 */ mul.s $f0, $f2, $f0 -/* 8A9C68 80240258 00000000 */ nop -/* 8A9C6C 8024025C 3C013C23 */ lui $at, 0x3c23 -/* 8A9C70 80240260 3421D70A */ ori $at, $at, 0xd70a -/* 8A9C74 80240264 44812000 */ mtc1 $at, $f4 -/* 8A9C78 80240268 44971000 */ mtc1 $s7, $f2 -/* 8A9C7C 8024026C 00000000 */ nop -/* 8A9C80 80240270 468010A0 */ cvt.s.w $f2, $f2 -/* 8A9C84 80240274 46041082 */ mul.s $f2, $f2, $f4 -/* 8A9C88 80240278 00000000 */ nop -/* 8A9C8C 8024027C 46000021 */ cvt.d.s $f0, $f0 -/* 8A9C90 80240280 46206300 */ add.d $f12, $f12, $f0 -/* 8A9C94 80240284 001017C2 */ srl $v0, $s0, 0x1f -/* 8A9C98 80240288 460010A1 */ cvt.d.s $f2, $f2 -/* 8A9C9C 8024028C 46226300 */ add.d $f12, $f12, $f2 -/* 8A9CA0 80240290 02021021 */ addu $v0, $s0, $v0 -/* 8A9CA4 80240294 00028043 */ sra $s0, $v0, 1 -/* 8A9CA8 80240298 0C00A85B */ jal sin_rad -/* 8A9CAC 8024029C 46206320 */ cvt.s.d $f12, $f12 -/* 8A9CB0 802402A0 46000000 */ add.s $f0, $f0, $f0 -/* 8A9CB4 802402A4 3C014000 */ lui $at, 0x4000 -/* 8A9CB8 802402A8 44811000 */ mtc1 $at, $f2 -/* 8A9CBC 802402AC 00000000 */ nop -/* 8A9CC0 802402B0 46020000 */ add.s $f0, $f0, $f2 -/* 8A9CC4 802402B4 4600018D */ trunc.w.s $f6, $f0 -/* 8A9CC8 802402B8 44033000 */ mfc1 $v1, $f6 -/* 8A9CCC 802402BC 00000000 */ nop -/* 8A9CD0 802402C0 02038021 */ addu $s0, $s0, $v1 -/* 8A9CD4 802402C4 86230000 */ lh $v1, ($s1) -/* 8A9CD8 802402C8 240200C8 */ addiu $v0, $zero, 0xc8 -/* 8A9CDC 802402CC 00431823 */ subu $v1, $v0, $v1 -/* 8A9CE0 802402D0 04620001 */ bltzl $v1, .L802402D8 -/* 8A9CE4 802402D4 0000182D */ daddu $v1, $zero, $zero -.L802402D8: -/* 8A9CE8 802402D8 28620065 */ slti $v0, $v1, 0x65 -/* 8A9CEC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 8A9CF0 802402E0 24030064 */ addiu $v1, $zero, 0x64 -.L802402E4: -/* 8A9CF4 802402E4 02030018 */ mult $s0, $v1 -/* 8A9CF8 802402E8 00001012 */ mflo $v0 -/* 8A9CFC 802402EC 00000000 */ nop -/* 8A9D00 802402F0 00000000 */ nop -/* 8A9D04 802402F4 00540018 */ mult $v0, $s4 -/* 8A9D08 802402F8 96640002 */ lhu $a0, 2($s3) -/* 8A9D0C 802402FC 26730010 */ addiu $s3, $s3, 0x10 -/* 8A9D10 80240300 26520001 */ addiu $s2, $s2, 1 -/* 8A9D14 80240304 000217C3 */ sra $v0, $v0, 0x1f -/* 8A9D18 80240308 00001810 */ mfhi $v1 -/* 8A9D1C 8024030C 00031943 */ sra $v1, $v1, 5 -/* 8A9D20 80240310 00628023 */ subu $s0, $v1, $v0 -/* 8A9D24 80240314 00902021 */ addu $a0, $a0, $s0 -/* 8A9D28 80240318 A6240002 */ sh $a0, 2($s1) -/* 8A9D2C 8024031C 0256102A */ slt $v0, $s2, $s6 -/* 8A9D30 80240320 1440FFA3 */ bnez $v0, .L802401B0 -/* 8A9D34 80240324 26310010 */ addiu $s1, $s1, 0x10 -.L80240328: -/* 8A9D38 80240328 8FBF0030 */ lw $ra, 0x30($sp) -/* 8A9D3C 8024032C 8FB7002C */ lw $s7, 0x2c($sp) -/* 8A9D40 80240330 8FB60028 */ lw $s6, 0x28($sp) -/* 8A9D44 80240334 8FB50024 */ lw $s5, 0x24($sp) -/* 8A9D48 80240338 8FB40020 */ lw $s4, 0x20($sp) -/* 8A9D4C 8024033C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A9D50 80240340 8FB20018 */ lw $s2, 0x18($sp) -/* 8A9D54 80240344 8FB10014 */ lw $s1, 0x14($sp) -/* 8A9D58 80240348 8FB00010 */ lw $s0, 0x10($sp) -/* 8A9D5C 8024034C 03E00008 */ jr $ra -/* 8A9D60 80240350 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s new file mode 100644 index 0000000000..f1a5e70b40 --- /dev/null +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240160_8A9B70.s @@ -0,0 +1,134 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240160_8A9B70 +/* 8A9B70 80240160 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8A9B74 80240164 AFB60028 */ sw $s6, 0x28($sp) +/* 8A9B78 80240168 00C0B02D */ daddu $s6, $a2, $zero +/* 8A9B7C 8024016C AFB7002C */ sw $s7, 0x2c($sp) +/* 8A9B80 80240170 00E0B82D */ daddu $s7, $a3, $zero +/* 8A9B84 80240174 AFB20018 */ sw $s2, 0x18($sp) +/* 8A9B88 80240178 0000902D */ daddu $s2, $zero, $zero +/* 8A9B8C 8024017C AFB50024 */ sw $s5, 0x24($sp) +/* 8A9B90 80240180 3C158011 */ lui $s5, %hi(gPlayerStatus) +/* 8A9B94 80240184 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) +/* 8A9B98 80240188 AFBF0030 */ sw $ra, 0x30($sp) +/* 8A9B9C 8024018C AFB40020 */ sw $s4, 0x20($sp) +/* 8A9BA0 80240190 AFB3001C */ sw $s3, 0x1c($sp) +/* 8A9BA4 80240194 AFB10014 */ sw $s1, 0x14($sp) +/* 8A9BA8 80240198 1AC00063 */ blez $s6, .L80240328 +/* 8A9BAC 8024019C AFB00010 */ sw $s0, 0x10($sp) +/* 8A9BB0 802401A0 3C1451EB */ lui $s4, 0x51eb +/* 8A9BB4 802401A4 3694851F */ ori $s4, $s4, 0x851f +/* 8A9BB8 802401A8 00A0882D */ daddu $s1, $a1, $zero +/* 8A9BBC 802401AC 0080982D */ daddu $s3, $a0, $zero +.L802401B0: +/* 8A9BC0 802401B0 86220000 */ lh $v0, ($s1) +/* 8A9BC4 802401B4 C6A00028 */ lwc1 $f0, 0x28($s5) +/* 8A9BC8 802401B8 44826000 */ mtc1 $v0, $f12 +/* 8A9BCC 802401BC 00000000 */ nop +/* 8A9BD0 802401C0 46806320 */ cvt.s.w $f12, $f12 +/* 8A9BD4 802401C4 46006001 */ sub.s $f0, $f12, $f0 +/* 8A9BD8 802401C8 4600018D */ trunc.w.s $f6, $f0 +/* 8A9BDC 802401CC 44023000 */ mfc1 $v0, $f6 +/* 8A9BE0 802401D0 00000000 */ nop +/* 8A9BE4 802401D4 00420018 */ mult $v0, $v0 +/* 8A9BE8 802401D8 86220004 */ lh $v0, 4($s1) +/* 8A9BEC 802401DC C6A00030 */ lwc1 $f0, 0x30($s5) +/* 8A9BF0 802401E0 44821000 */ mtc1 $v0, $f2 +/* 8A9BF4 802401E4 00000000 */ nop +/* 8A9BF8 802401E8 468010A0 */ cvt.s.w $f2, $f2 +/* 8A9BFC 802401EC 46001001 */ sub.s $f0, $f2, $f0 +/* 8A9C00 802401F0 00001812 */ mflo $v1 +/* 8A9C04 802401F4 4600018D */ trunc.w.s $f6, $f0 +/* 8A9C08 802401F8 44023000 */ mfc1 $v0, $f6 +/* 8A9C0C 802401FC 00000000 */ nop +/* 8A9C10 80240200 00420018 */ mult $v0, $v0 +/* 8A9C14 80240204 00001012 */ mflo $v0 +/* 8A9C18 80240208 00621021 */ addu $v0, $v1, $v0 +/* 8A9C1C 8024020C 00000000 */ nop +/* 8A9C20 80240210 00540018 */ mult $v0, $s4 +/* 8A9C24 80240214 000217C3 */ sra $v0, $v0, 0x1f +/* 8A9C28 80240218 00001810 */ mfhi $v1 +/* 8A9C2C 8024021C 00031943 */ sra $v1, $v1, 5 +/* 8A9C30 80240220 00628023 */ subu $s0, $v1, $v0 +/* 8A9C34 80240224 2A02000B */ slti $v0, $s0, 0xb +/* 8A9C38 80240228 50400001 */ beql $v0, $zero, .L80240230 +/* 8A9C3C 8024022C 2410000A */ addiu $s0, $zero, 0xa +.L80240230: +/* 8A9C40 80240230 3C018024 */ lui $at, 0x8024 +/* 8A9C44 80240234 D4200A30 */ ldc1 $f0, 0xa30($at) +/* 8A9C48 80240238 46006321 */ cvt.d.s $f12, $f12 +/* 8A9C4C 8024023C 46206302 */ mul.d $f12, $f12, $f0 +/* 8A9C50 80240240 00000000 */ nop +/* 8A9C54 80240244 3C013CF5 */ lui $at, 0x3cf5 +/* 8A9C58 80240248 3421C28F */ ori $at, $at, 0xc28f +/* 8A9C5C 8024024C 44810000 */ mtc1 $at, $f0 +/* 8A9C60 80240250 00000000 */ nop +/* 8A9C64 80240254 46001002 */ mul.s $f0, $f2, $f0 +/* 8A9C68 80240258 00000000 */ nop +/* 8A9C6C 8024025C 3C013C23 */ lui $at, 0x3c23 +/* 8A9C70 80240260 3421D70A */ ori $at, $at, 0xd70a +/* 8A9C74 80240264 44812000 */ mtc1 $at, $f4 +/* 8A9C78 80240268 44971000 */ mtc1 $s7, $f2 +/* 8A9C7C 8024026C 00000000 */ nop +/* 8A9C80 80240270 468010A0 */ cvt.s.w $f2, $f2 +/* 8A9C84 80240274 46041082 */ mul.s $f2, $f2, $f4 +/* 8A9C88 80240278 00000000 */ nop +/* 8A9C8C 8024027C 46000021 */ cvt.d.s $f0, $f0 +/* 8A9C90 80240280 46206300 */ add.d $f12, $f12, $f0 +/* 8A9C94 80240284 001017C2 */ srl $v0, $s0, 0x1f +/* 8A9C98 80240288 460010A1 */ cvt.d.s $f2, $f2 +/* 8A9C9C 8024028C 46226300 */ add.d $f12, $f12, $f2 +/* 8A9CA0 80240290 02021021 */ addu $v0, $s0, $v0 +/* 8A9CA4 80240294 00028043 */ sra $s0, $v0, 1 +/* 8A9CA8 80240298 0C00A85B */ jal sin_rad +/* 8A9CAC 8024029C 46206320 */ cvt.s.d $f12, $f12 +/* 8A9CB0 802402A0 46000000 */ add.s $f0, $f0, $f0 +/* 8A9CB4 802402A4 3C014000 */ lui $at, 0x4000 +/* 8A9CB8 802402A8 44811000 */ mtc1 $at, $f2 +/* 8A9CBC 802402AC 00000000 */ nop +/* 8A9CC0 802402B0 46020000 */ add.s $f0, $f0, $f2 +/* 8A9CC4 802402B4 4600018D */ trunc.w.s $f6, $f0 +/* 8A9CC8 802402B8 44033000 */ mfc1 $v1, $f6 +/* 8A9CCC 802402BC 00000000 */ nop +/* 8A9CD0 802402C0 02038021 */ addu $s0, $s0, $v1 +/* 8A9CD4 802402C4 86230000 */ lh $v1, ($s1) +/* 8A9CD8 802402C8 240200C8 */ addiu $v0, $zero, 0xc8 +/* 8A9CDC 802402CC 00431823 */ subu $v1, $v0, $v1 +/* 8A9CE0 802402D0 04620001 */ bltzl $v1, .L802402D8 +/* 8A9CE4 802402D4 0000182D */ daddu $v1, $zero, $zero +.L802402D8: +/* 8A9CE8 802402D8 28620065 */ slti $v0, $v1, 0x65 +/* 8A9CEC 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* 8A9CF0 802402E0 24030064 */ addiu $v1, $zero, 0x64 +.L802402E4: +/* 8A9CF4 802402E4 02030018 */ mult $s0, $v1 +/* 8A9CF8 802402E8 00001012 */ mflo $v0 +/* 8A9CFC 802402EC 00000000 */ nop +/* 8A9D00 802402F0 00000000 */ nop +/* 8A9D04 802402F4 00540018 */ mult $v0, $s4 +/* 8A9D08 802402F8 96640002 */ lhu $a0, 2($s3) +/* 8A9D0C 802402FC 26730010 */ addiu $s3, $s3, 0x10 +/* 8A9D10 80240300 26520001 */ addiu $s2, $s2, 1 +/* 8A9D14 80240304 000217C3 */ sra $v0, $v0, 0x1f +/* 8A9D18 80240308 00001810 */ mfhi $v1 +/* 8A9D1C 8024030C 00031943 */ sra $v1, $v1, 5 +/* 8A9D20 80240310 00628023 */ subu $s0, $v1, $v0 +/* 8A9D24 80240314 00902021 */ addu $a0, $a0, $s0 +/* 8A9D28 80240318 A6240002 */ sh $a0, 2($s1) +/* 8A9D2C 8024031C 0256102A */ slt $v0, $s2, $s6 +/* 8A9D30 80240320 1440FFA3 */ bnez $v0, .L802401B0 +/* 8A9D34 80240324 26310010 */ addiu $s1, $s1, 0x10 +.L80240328: +/* 8A9D38 80240328 8FBF0030 */ lw $ra, 0x30($sp) +/* 8A9D3C 8024032C 8FB7002C */ lw $s7, 0x2c($sp) +/* 8A9D40 80240330 8FB60028 */ lw $s6, 0x28($sp) +/* 8A9D44 80240334 8FB50024 */ lw $s5, 0x24($sp) +/* 8A9D48 80240338 8FB40020 */ lw $s4, 0x20($sp) +/* 8A9D4C 8024033C 8FB3001C */ lw $s3, 0x1c($sp) +/* 8A9D50 80240340 8FB20018 */ lw $s2, 0x18($sp) +/* 8A9D54 80240344 8FB10014 */ lw $s1, 0x14($sp) +/* 8A9D58 80240348 8FB00010 */ lw $s0, 0x10($sp) +/* 8A9D5C 8024034C 03E00008 */ jr $ra +/* 8A9D60 80240350 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354.s deleted file mode 100644 index a5f33f9e3b..0000000000 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240354 -/* 8A9D64 80240354 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8A9D68 80240358 24040001 */ addiu $a0, $zero, 1 -/* 8A9D6C 8024035C 27A50010 */ addiu $a1, $sp, 0x10 -/* 8A9D70 80240360 27A60014 */ addiu $a2, $sp, 0x14 -/* 8A9D74 80240364 27A70018 */ addiu $a3, $sp, 0x18 -/* 8A9D78 80240368 AFBF0028 */ sw $ra, 0x28($sp) -/* 8A9D7C 8024036C AFB10024 */ sw $s1, 0x24($sp) -/* 8A9D80 80240370 0C0470AC */ jal func_8011C2B0 -/* 8A9D84 80240374 AFB00020 */ sw $s0, 0x20($sp) -/* 8A9D88 80240378 3C108024 */ lui $s0, 0x8024 -/* 8A9D8C 8024037C 261007C0 */ addiu $s0, $s0, 0x7c0 -/* 8A9D90 80240380 8FA40010 */ lw $a0, 0x10($sp) -/* 8A9D94 80240384 8FA50014 */ lw $a1, 0x14($sp) -/* 8A9D98 80240388 8FA60018 */ lw $a2, 0x18($sp) -/* 8A9D9C 8024038C 0C090058 */ jal func_80240160 -/* 8A9DA0 80240390 96070000 */ lhu $a3, ($s0) -/* 8A9DA4 80240394 3C03800A */ lui $v1, 0x800a -/* 8A9DA8 80240398 2463A66C */ addiu $v1, $v1, -0x5994 -/* 8A9DAC 8024039C 8C620000 */ lw $v0, ($v1) -/* 8A9DB0 802403A0 24040001 */ addiu $a0, $zero, 1 -/* 8A9DB4 802403A4 0040882D */ daddu $s1, $v0, $zero -/* 8A9DB8 802403A8 24420008 */ addiu $v0, $v0, 8 -/* 8A9DBC 802403AC AC620000 */ sw $v0, ($v1) -/* 8A9DC0 802403B0 3C02DE00 */ lui $v0, 0xde00 -/* 8A9DC4 802403B4 0C0470BB */ jal func_8011C2EC -/* 8A9DC8 802403B8 AE220000 */ sw $v0, ($s1) -/* 8A9DCC 802403BC 96030000 */ lhu $v1, ($s0) -/* 8A9DD0 802403C0 AE220004 */ sw $v0, 4($s1) -/* 8A9DD4 802403C4 2463000A */ addiu $v1, $v1, 0xa -/* 8A9DD8 802403C8 A6030000 */ sh $v1, ($s0) -/* 8A9DDC 802403CC 8FBF0028 */ lw $ra, 0x28($sp) -/* 8A9DE0 802403D0 8FB10024 */ lw $s1, 0x24($sp) -/* 8A9DE4 802403D4 8FB00020 */ lw $s0, 0x20($sp) -/* 8A9DE8 802403D8 03E00008 */ jr $ra -/* 8A9DEC 802403DC 27BD0030 */ addiu $sp, $sp, 0x30 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 new file mode 100644 index 0000000000..cf341e024e --- /dev/null +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240354_8A9D64.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240354_8A9D64 +/* 8A9D64 80240354 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8A9D68 80240358 24040001 */ addiu $a0, $zero, 1 +/* 8A9D6C 8024035C 27A50010 */ addiu $a1, $sp, 0x10 +/* 8A9D70 80240360 27A60014 */ addiu $a2, $sp, 0x14 +/* 8A9D74 80240364 27A70018 */ addiu $a3, $sp, 0x18 +/* 8A9D78 80240368 AFBF0028 */ sw $ra, 0x28($sp) +/* 8A9D7C 8024036C AFB10024 */ sw $s1, 0x24($sp) +/* 8A9D80 80240370 0C0470AC */ jal func_8011C2B0 +/* 8A9D84 80240374 AFB00020 */ sw $s0, 0x20($sp) +/* 8A9D88 80240378 3C108024 */ lui $s0, 0x8024 +/* 8A9D8C 8024037C 261007C0 */ addiu $s0, $s0, 0x7c0 +/* 8A9D90 80240380 8FA40010 */ lw $a0, 0x10($sp) +/* 8A9D94 80240384 8FA50014 */ lw $a1, 0x14($sp) +/* 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, 0x800a +/* 8A9DA8 80240398 2463A66C */ addiu $v1, $v1, -0x5994 +/* 8A9DAC 8024039C 8C620000 */ lw $v0, ($v1) +/* 8A9DB0 802403A0 24040001 */ addiu $a0, $zero, 1 +/* 8A9DB4 802403A4 0040882D */ daddu $s1, $v0, $zero +/* 8A9DB8 802403A8 24420008 */ addiu $v0, $v0, 8 +/* 8A9DBC 802403AC AC620000 */ sw $v0, ($v1) +/* 8A9DC0 802403B0 3C02DE00 */ lui $v0, 0xde00 +/* 8A9DC4 802403B4 0C0470BB */ jal func_8011C2EC +/* 8A9DC8 802403B8 AE220000 */ sw $v0, ($s1) +/* 8A9DCC 802403BC 96030000 */ lhu $v1, ($s0) +/* 8A9DD0 802403C0 AE220004 */ sw $v0, 4($s1) +/* 8A9DD4 802403C4 2463000A */ addiu $v1, $v1, 0xa +/* 8A9DD8 802403C8 A6030000 */ sh $v1, ($s0) +/* 8A9DDC 802403CC 8FBF0028 */ lw $ra, 0x28($sp) +/* 8A9DE0 802403D0 8FB10024 */ lw $s1, 0x24($sp) +/* 8A9DE4 802403D4 8FB00020 */ lw $s0, 0x20($sp) +/* 8A9DE8 802403D8 03E00008 */ jr $ra +/* 8A9DEC 802403DC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0.s deleted file mode 100644 index b3770d4b56..0000000000 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403E0 -/* 8A9DF0 802403E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A9DF4 802403E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A9DF8 802403E8 0080802D */ daddu $s0, $a0, $zero -/* 8A9DFC 802403EC AFBF0014 */ sw $ra, 0x14($sp) -/* 8A9E00 802403F0 C60C0084 */ lwc1 $f12, 0x84($s0) -/* 8A9E04 802403F4 46806320 */ cvt.s.w $f12, $f12 -/* 8A9E08 802403F8 3C018024 */ lui $at, 0x8024 -/* 8A9E0C 802403FC D4200A38 */ ldc1 $f0, 0xa38($at) -/* 8A9E10 80240400 46006321 */ cvt.d.s $f12, $f12 -/* 8A9E14 80240404 46206302 */ mul.d $f12, $f12, $f0 -/* 8A9E18 80240408 00000000 */ nop -/* 8A9E1C 8024040C 3C013CF5 */ lui $at, 0x3cf5 -/* 8A9E20 80240410 3421C28F */ ori $at, $at, 0xc28f -/* 8A9E24 80240414 44810000 */ mtc1 $at, $f0 -/* 8A9E28 80240418 C602008C */ lwc1 $f2, 0x8c($s0) -/* 8A9E2C 8024041C 468010A0 */ cvt.s.w $f2, $f2 -/* 8A9E30 80240420 46001082 */ mul.s $f2, $f2, $f0 -/* 8A9E34 80240424 00000000 */ nop -/* 8A9E38 80240428 3C028024 */ lui $v0, 0x8024 -/* 8A9E3C 8024042C 944207C0 */ lhu $v0, 0x7c0($v0) -/* 8A9E40 80240430 3C013C23 */ lui $at, 0x3c23 -/* 8A9E44 80240434 3421D70A */ ori $at, $at, 0xd70a -/* 8A9E48 80240438 44812000 */ mtc1 $at, $f4 -/* 8A9E4C 8024043C 44820000 */ mtc1 $v0, $f0 -/* 8A9E50 80240440 00000000 */ nop -/* 8A9E54 80240444 46800020 */ cvt.s.w $f0, $f0 -/* 8A9E58 80240448 46040002 */ mul.s $f0, $f0, $f4 -/* 8A9E5C 8024044C 00000000 */ nop -/* 8A9E60 80240450 460010A1 */ cvt.d.s $f2, $f2 -/* 8A9E64 80240454 46226300 */ add.d $f12, $f12, $f2 -/* 8A9E68 80240458 46000021 */ cvt.d.s $f0, $f0 -/* 8A9E6C 8024045C 46206300 */ add.d $f12, $f12, $f0 -/* 8A9E70 80240460 0C00A85B */ jal sin_rad -/* 8A9E74 80240464 46206320 */ cvt.s.d $f12, $f12 -/* 8A9E78 80240468 46000180 */ add.s $f6, $f0, $f0 -/* 8A9E7C 8024046C 3C014348 */ lui $at, 0x4348 -/* 8A9E80 80240470 44811000 */ mtc1 $at, $f2 -/* 8A9E84 80240474 C6000084 */ lwc1 $f0, 0x84($s0) -/* 8A9E88 80240478 46800020 */ cvt.s.w $f0, $f0 -/* 8A9E8C 8024047C 46001081 */ sub.s $f2, $f2, $f0 -/* 8A9E90 80240480 44800000 */ mtc1 $zero, $f0 -/* 8A9E94 80240484 00000000 */ nop -/* 8A9E98 80240488 4600103C */ c.lt.s $f2, $f0 -/* 8A9E9C 8024048C 00000000 */ nop -/* 8A9EA0 80240490 45030001 */ bc1tl .L80240498 -/* 8A9EA4 80240494 46000086 */ mov.s $f2, $f0 -.L80240498: -/* 8A9EA8 80240498 3C0142C8 */ lui $at, 0x42c8 -/* 8A9EAC 8024049C 44812000 */ mtc1 $at, $f4 -/* 8A9EB0 802404A0 00000000 */ nop -/* 8A9EB4 802404A4 4602203C */ c.lt.s $f4, $f2 -/* 8A9EB8 802404A8 00000000 */ nop -/* 8A9EBC 802404AC 45030001 */ bc1tl .L802404B4 -/* 8A9EC0 802404B0 46002086 */ mov.s $f2, $f4 -.L802404B4: -/* 8A9EC4 802404B4 46023082 */ mul.s $f2, $f6, $f2 -/* 8A9EC8 802404B8 00000000 */ nop -/* 8A9ECC 802404BC 3C014480 */ lui $at, 0x4480 -/* 8A9ED0 802404C0 44810000 */ mtc1 $at, $f0 -/* 8A9ED4 802404C4 46041183 */ div.s $f6, $f2, $f4 -/* 8A9ED8 802404C8 46003002 */ mul.s $f0, $f6, $f0 -/* 8A9EDC 802404CC 00000000 */ nop -/* 8A9EE0 802404D0 3C01CD5B */ lui $at, 0xcd5b -/* 8A9EE4 802404D4 34215858 */ ori $at, $at, 0x5858 -/* 8A9EE8 802404D8 44811000 */ mtc1 $at, $f2 -/* 8A9EEC 802404DC 00000000 */ nop -/* 8A9EF0 802404E0 46020000 */ add.s $f0, $f0, $f2 -/* 8A9EF4 802404E4 4600020D */ trunc.w.s $f8, $f0 -/* 8A9EF8 802404E8 E6080084 */ swc1 $f8, 0x84($s0) -/* 8A9EFC 802404EC 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A9F00 802404F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8A9F04 802404F4 24020002 */ addiu $v0, $zero, 2 -/* 8A9F08 802404F8 03E00008 */ jr $ra -/* 8A9F0C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s new file mode 100644 index 0000000000..5abc5012b3 --- /dev/null +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_802403E0_8A9DF0.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403E0_8A9DF0 +/* 8A9DF0 802403E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8A9DF4 802403E4 AFB00010 */ sw $s0, 0x10($sp) +/* 8A9DF8 802403E8 0080802D */ daddu $s0, $a0, $zero +/* 8A9DFC 802403EC AFBF0014 */ sw $ra, 0x14($sp) +/* 8A9E00 802403F0 C60C0084 */ lwc1 $f12, 0x84($s0) +/* 8A9E04 802403F4 46806320 */ cvt.s.w $f12, $f12 +/* 8A9E08 802403F8 3C018024 */ lui $at, 0x8024 +/* 8A9E0C 802403FC D4200A38 */ ldc1 $f0, 0xa38($at) +/* 8A9E10 80240400 46006321 */ cvt.d.s $f12, $f12 +/* 8A9E14 80240404 46206302 */ mul.d $f12, $f12, $f0 +/* 8A9E18 80240408 00000000 */ nop +/* 8A9E1C 8024040C 3C013CF5 */ lui $at, 0x3cf5 +/* 8A9E20 80240410 3421C28F */ ori $at, $at, 0xc28f +/* 8A9E24 80240414 44810000 */ mtc1 $at, $f0 +/* 8A9E28 80240418 C602008C */ lwc1 $f2, 0x8c($s0) +/* 8A9E2C 8024041C 468010A0 */ cvt.s.w $f2, $f2 +/* 8A9E30 80240420 46001082 */ mul.s $f2, $f2, $f0 +/* 8A9E34 80240424 00000000 */ nop +/* 8A9E38 80240428 3C028024 */ lui $v0, 0x8024 +/* 8A9E3C 8024042C 944207C0 */ lhu $v0, 0x7c0($v0) +/* 8A9E40 80240430 3C013C23 */ lui $at, 0x3c23 +/* 8A9E44 80240434 3421D70A */ ori $at, $at, 0xd70a +/* 8A9E48 80240438 44812000 */ mtc1 $at, $f4 +/* 8A9E4C 8024043C 44820000 */ mtc1 $v0, $f0 +/* 8A9E50 80240440 00000000 */ nop +/* 8A9E54 80240444 46800020 */ cvt.s.w $f0, $f0 +/* 8A9E58 80240448 46040002 */ mul.s $f0, $f0, $f4 +/* 8A9E5C 8024044C 00000000 */ nop +/* 8A9E60 80240450 460010A1 */ cvt.d.s $f2, $f2 +/* 8A9E64 80240454 46226300 */ add.d $f12, $f12, $f2 +/* 8A9E68 80240458 46000021 */ cvt.d.s $f0, $f0 +/* 8A9E6C 8024045C 46206300 */ add.d $f12, $f12, $f0 +/* 8A9E70 80240460 0C00A85B */ jal sin_rad +/* 8A9E74 80240464 46206320 */ cvt.s.d $f12, $f12 +/* 8A9E78 80240468 46000180 */ add.s $f6, $f0, $f0 +/* 8A9E7C 8024046C 3C014348 */ lui $at, 0x4348 +/* 8A9E80 80240470 44811000 */ mtc1 $at, $f2 +/* 8A9E84 80240474 C6000084 */ lwc1 $f0, 0x84($s0) +/* 8A9E88 80240478 46800020 */ cvt.s.w $f0, $f0 +/* 8A9E8C 8024047C 46001081 */ sub.s $f2, $f2, $f0 +/* 8A9E90 80240480 44800000 */ mtc1 $zero, $f0 +/* 8A9E94 80240484 00000000 */ nop +/* 8A9E98 80240488 4600103C */ c.lt.s $f2, $f0 +/* 8A9E9C 8024048C 00000000 */ nop +/* 8A9EA0 80240490 45030001 */ bc1tl .L80240498 +/* 8A9EA4 80240494 46000086 */ mov.s $f2, $f0 +.L80240498: +/* 8A9EA8 80240498 3C0142C8 */ lui $at, 0x42c8 +/* 8A9EAC 8024049C 44812000 */ mtc1 $at, $f4 +/* 8A9EB0 802404A0 00000000 */ nop +/* 8A9EB4 802404A4 4602203C */ c.lt.s $f4, $f2 +/* 8A9EB8 802404A8 00000000 */ nop +/* 8A9EBC 802404AC 45030001 */ bc1tl .L802404B4 +/* 8A9EC0 802404B0 46002086 */ mov.s $f2, $f4 +.L802404B4: +/* 8A9EC4 802404B4 46023082 */ mul.s $f2, $f6, $f2 +/* 8A9EC8 802404B8 00000000 */ nop +/* 8A9ECC 802404BC 3C014480 */ lui $at, 0x4480 +/* 8A9ED0 802404C0 44810000 */ mtc1 $at, $f0 +/* 8A9ED4 802404C4 46041183 */ div.s $f6, $f2, $f4 +/* 8A9ED8 802404C8 46003002 */ mul.s $f0, $f6, $f0 +/* 8A9EDC 802404CC 00000000 */ nop +/* 8A9EE0 802404D0 3C01CD5B */ lui $at, 0xcd5b +/* 8A9EE4 802404D4 34215858 */ ori $at, $at, 0x5858 +/* 8A9EE8 802404D8 44811000 */ mtc1 $at, $f2 +/* 8A9EEC 802404DC 00000000 */ nop +/* 8A9EF0 802404E0 46020000 */ add.s $f0, $f0, $f2 +/* 8A9EF4 802404E4 4600020D */ trunc.w.s $f8, $f0 +/* 8A9EF8 802404E8 E6080084 */ swc1 $f8, 0x84($s0) +/* 8A9EFC 802404EC 8FBF0014 */ lw $ra, 0x14($sp) +/* 8A9F00 802404F0 8FB00010 */ lw $s0, 0x10($sp) +/* 8A9F04 802404F4 24020002 */ addiu $v0, $zero, 2 +/* 8A9F08 802404F8 03E00008 */ jr $ra +/* 8A9F0C 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500.s deleted file mode 100644 index c9572b94b2..0000000000 --- a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240500 -/* 8A9F10 80240500 3C028016 */ lui $v0, 0x8016 -/* 8A9F14 80240504 8442A568 */ lh $v0, -0x5a98($v0) -/* 8A9F18 80240508 04400002 */ bltz $v0, .L80240514 -/* 8A9F1C 8024050C 24020001 */ addiu $v0, $zero, 1 -/* 8A9F20 80240510 AC820088 */ sw $v0, 0x88($a0) -.L80240514: -/* 8A9F24 80240514 03E00008 */ jr $ra -/* 8A9F28 80240518 24020002 */ addiu $v0, $zero, 2 -/* 8A9F2C 8024051C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s new file mode 100644 index 0000000000..7539df4300 --- /dev/null +++ b/asm/nonmatchings/world/area_kgr/kgr_01/8A9B70/func_80240500_8A9F10.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240500_8A9F10 +/* 8A9F10 80240500 3C028016 */ lui $v0, 0x8016 +/* 8A9F14 80240504 8442A568 */ lh $v0, -0x5a98($v0) +/* 8A9F18 80240508 04400002 */ bltz $v0, .L80240514 +/* 8A9F1C 8024050C 24020001 */ addiu $v0, $zero, 1 +/* 8A9F20 80240510 AC820088 */ sw $v0, 0x88($a0) +.L80240514: +/* 8A9F24 80240514 03E00008 */ jr $ra +/* 8A9F28 80240518 24020002 */ addiu $v0, $zero, 2 +/* 8A9F2C 8024051C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730.s b/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730.s deleted file mode 100644 index eb8f63d2f5..0000000000 --- a/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240730 -/* 8AAB80 80240730 3C028011 */ lui $v0, 0x8011 -/* 8AAB84 80240734 8042EBB3 */ lb $v0, -0x144d($v0) -/* 8AAB88 80240738 38420006 */ xori $v0, $v0, 6 -/* 8AAB8C 8024073C 2C420001 */ sltiu $v0, $v0, 1 -/* 8AAB90 80240740 03E00008 */ jr $ra -/* 8AAB94 80240744 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s b/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s new file mode 100644 index 0000000000..2efc1d65cd --- /dev/null +++ b/asm/nonmatchings/world/area_kgr/kgr_02/8AAB80/func_80240730_8AAB80.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240730_8AAB80 +/* 8AAB80 80240730 3C028011 */ lui $v0, 0x8011 +/* 8AAB84 80240734 8042EBB3 */ lb $v0, -0x144d($v0) +/* 8AAB88 80240738 38420006 */ xori $v0, $v0, 6 +/* 8AAB8C 8024073C 2C420001 */ sltiu $v0, $v0, 1 +/* 8AAB90 80240740 03E00008 */ jr $ra +/* 8AAB94 80240744 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0.s deleted file mode 100644 index 3f469292ab..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407E0 -/* ABBA70 802407E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ABBA74 802407E4 AFB10014 */ sw $s1, 0x14($sp) -/* ABBA78 802407E8 0080882D */ daddu $s1, $a0, $zero -/* ABBA7C 802407EC AFBF0018 */ sw $ra, 0x18($sp) -/* ABBA80 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* ABBA84 802407F4 8E300148 */ lw $s0, 0x148($s1) -/* ABBA88 802407F8 0C00EABB */ jal get_npc_unsafe -/* ABBA8C 802407FC 86040008 */ lh $a0, 8($s0) -/* ABBA90 80240800 8E0300CC */ lw $v1, 0xcc($s0) -/* ABBA94 80240804 3C014120 */ lui $at, 0x4120 -/* ABBA98 80240808 44812000 */ mtc1 $at, $f4 -/* ABBA9C 8024080C 3C014000 */ lui $at, 0x4000 -/* ABBAA0 80240810 44810000 */ mtc1 $at, $f0 -/* ABBAA4 80240814 C442003C */ lwc1 $f2, 0x3c($v0) -/* ABBAA8 80240818 8C640010 */ lw $a0, 0x10($v1) -/* ABBAAC 8024081C 8C430000 */ lw $v1, ($v0) -/* ABBAB0 80240820 E444001C */ swc1 $f4, 0x1c($v0) -/* ABBAB4 80240824 E4400014 */ swc1 $f0, 0x14($v0) -/* ABBAB8 80240828 E4420064 */ swc1 $f2, 0x64($v0) -/* ABBABC 8024082C 34630800 */ ori $v1, $v1, 0x800 -/* ABBAC0 80240830 AC430000 */ sw $v1, ($v0) -/* ABBAC4 80240834 AC440028 */ sw $a0, 0x28($v0) -/* ABBAC8 80240838 2402000B */ addiu $v0, $zero, 0xb -/* ABBACC 8024083C AE220070 */ sw $v0, 0x70($s1) -/* ABBAD0 80240840 8FBF0018 */ lw $ra, 0x18($sp) -/* ABBAD4 80240844 8FB10014 */ lw $s1, 0x14($sp) -/* ABBAD8 80240848 8FB00010 */ lw $s0, 0x10($sp) -/* ABBADC 8024084C 03E00008 */ jr $ra -/* ABBAE0 80240850 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0_ABBA70.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0_ABBA70.s new file mode 100644 index 0000000000..553059a511 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802407E0_ABBA70.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407E0_ABBA70 +/* ABBA70 802407E0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ABBA74 802407E4 AFB10014 */ sw $s1, 0x14($sp) +/* ABBA78 802407E8 0080882D */ daddu $s1, $a0, $zero +/* ABBA7C 802407EC AFBF0018 */ sw $ra, 0x18($sp) +/* ABBA80 802407F0 AFB00010 */ sw $s0, 0x10($sp) +/* ABBA84 802407F4 8E300148 */ lw $s0, 0x148($s1) +/* ABBA88 802407F8 0C00EABB */ jal get_npc_unsafe +/* ABBA8C 802407FC 86040008 */ lh $a0, 8($s0) +/* ABBA90 80240800 8E0300CC */ lw $v1, 0xcc($s0) +/* ABBA94 80240804 3C014120 */ lui $at, 0x4120 +/* ABBA98 80240808 44812000 */ mtc1 $at, $f4 +/* ABBA9C 8024080C 3C014000 */ lui $at, 0x4000 +/* ABBAA0 80240810 44810000 */ mtc1 $at, $f0 +/* ABBAA4 80240814 C442003C */ lwc1 $f2, 0x3c($v0) +/* ABBAA8 80240818 8C640010 */ lw $a0, 0x10($v1) +/* ABBAAC 8024081C 8C430000 */ lw $v1, ($v0) +/* ABBAB0 80240820 E444001C */ swc1 $f4, 0x1c($v0) +/* ABBAB4 80240824 E4400014 */ swc1 $f0, 0x14($v0) +/* ABBAB8 80240828 E4420064 */ swc1 $f2, 0x64($v0) +/* ABBABC 8024082C 34630800 */ ori $v1, $v1, 0x800 +/* ABBAC0 80240830 AC430000 */ sw $v1, ($v0) +/* ABBAC4 80240834 AC440028 */ sw $a0, 0x28($v0) +/* ABBAC8 80240838 2402000B */ addiu $v0, $zero, 0xb +/* ABBACC 8024083C AE220070 */ sw $v0, 0x70($s1) +/* ABBAD0 80240840 8FBF0018 */ lw $ra, 0x18($sp) +/* ABBAD4 80240844 8FB10014 */ lw $s1, 0x14($sp) +/* ABBAD8 80240848 8FB00010 */ lw $s0, 0x10($sp) +/* ABBADC 8024084C 03E00008 */ jr $ra +/* ABBAE0 80240850 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC.s deleted file mode 100644 index 4671bfe367..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408CC -/* ABBB5C 802408CC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* ABBB60 802408D0 AFB3001C */ sw $s3, 0x1c($sp) -/* ABBB64 802408D4 0080982D */ daddu $s3, $a0, $zero -/* ABBB68 802408D8 AFBF0020 */ sw $ra, 0x20($sp) -/* ABBB6C 802408DC AFB20018 */ sw $s2, 0x18($sp) -/* ABBB70 802408E0 AFB10014 */ sw $s1, 0x14($sp) -/* ABBB74 802408E4 AFB00010 */ sw $s0, 0x10($sp) -/* ABBB78 802408E8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* ABBB7C 802408EC 8E710148 */ lw $s1, 0x148($s3) -/* ABBB80 802408F0 86240008 */ lh $a0, 8($s1) -/* ABBB84 802408F4 0C00EABB */ jal get_npc_unsafe -/* ABBB88 802408F8 00A0802D */ daddu $s0, $a1, $zero -/* ABBB8C 802408FC 8E040020 */ lw $a0, 0x20($s0) -/* ABBB90 80240900 0040902D */ daddu $s2, $v0, $zero -/* ABBB94 80240904 00041FC2 */ srl $v1, $a0, 0x1f -/* ABBB98 80240908 00832021 */ addu $a0, $a0, $v1 -/* ABBB9C 8024090C 00042043 */ sra $a0, $a0, 1 -/* ABBBA0 80240910 0C00A67F */ jal rand_int -/* ABBBA4 80240914 24840001 */ addiu $a0, $a0, 1 -/* ABBBA8 80240918 8E030020 */ lw $v1, 0x20($s0) -/* ABBBAC 8024091C C64C0038 */ lwc1 $f12, 0x38($s2) -/* ABBBB0 80240920 000327C2 */ srl $a0, $v1, 0x1f -/* ABBBB4 80240924 00641821 */ addu $v1, $v1, $a0 -/* ABBBB8 80240928 00031843 */ sra $v1, $v1, 1 -/* ABBBBC 8024092C 00621821 */ addu $v1, $v1, $v0 -/* ABBBC0 80240930 A643008E */ sh $v1, 0x8e($s2) -/* ABBBC4 80240934 8E2200CC */ lw $v0, 0xcc($s1) -/* ABBBC8 80240938 C64E0040 */ lwc1 $f14, 0x40($s2) -/* ABBBCC 8024093C 8C42000C */ lw $v0, 0xc($v0) -/* ABBBD0 80240940 AE420028 */ sw $v0, 0x28($s2) -/* ABBBD4 80240944 C6000018 */ lwc1 $f0, 0x18($s0) -/* ABBBD8 80240948 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* ABBBDC 8024094C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* ABBBE0 80240950 E6400018 */ swc1 $f0, 0x18($s2) -/* ABBBE4 80240954 8C460028 */ lw $a2, 0x28($v0) -/* ABBBE8 80240958 0C00A720 */ jal atan2 -/* ABBBEC 8024095C 8C470030 */ lw $a3, 0x30($v0) -/* ABBBF0 80240960 46000506 */ mov.s $f20, $f0 -/* ABBBF4 80240964 C64C000C */ lwc1 $f12, 0xc($s2) -/* ABBBF8 80240968 0C00A70A */ jal get_clamped_angle_diff -/* ABBBFC 8024096C 4600A386 */ mov.s $f14, $f20 -/* ABBC00 80240970 46000086 */ mov.s $f2, $f0 -/* ABBC04 80240974 8E02001C */ lw $v0, 0x1c($s0) -/* ABBC08 80240978 46001005 */ abs.s $f0, $f2 -/* ABBC0C 8024097C 44822000 */ mtc1 $v0, $f4 -/* ABBC10 80240980 00000000 */ nop -/* ABBC14 80240984 46802120 */ cvt.s.w $f4, $f4 -/* ABBC18 80240988 4600203C */ c.lt.s $f4, $f0 -/* ABBC1C 8024098C 00000000 */ nop -/* ABBC20 80240990 4500000D */ bc1f .L802409C8 -/* ABBC24 80240994 00000000 */ nop -/* ABBC28 80240998 44800000 */ mtc1 $zero, $f0 -/* ABBC2C 8024099C C654000C */ lwc1 $f20, 0xc($s2) -/* ABBC30 802409A0 4600103C */ c.lt.s $f2, $f0 -/* ABBC34 802409A4 00000000 */ nop -/* ABBC38 802409A8 45000006 */ bc1f .L802409C4 -/* ABBC3C 802409AC 00021023 */ negu $v0, $v0 -/* ABBC40 802409B0 44820000 */ mtc1 $v0, $f0 -/* ABBC44 802409B4 00000000 */ nop -/* ABBC48 802409B8 46800020 */ cvt.s.w $f0, $f0 -/* ABBC4C 802409BC 08090272 */ j .L802409C8 -/* ABBC50 802409C0 4600A500 */ add.s $f20, $f20, $f0 -.L802409C4: -/* ABBC54 802409C4 4604A500 */ add.s $f20, $f20, $f4 -.L802409C8: -/* ABBC58 802409C8 0C00A6C9 */ jal clamp_angle -/* ABBC5C 802409CC 4600A306 */ mov.s $f12, $f20 -/* ABBC60 802409D0 2402000D */ addiu $v0, $zero, 0xd -/* ABBC64 802409D4 E640000C */ swc1 $f0, 0xc($s2) -/* ABBC68 802409D8 AE620070 */ sw $v0, 0x70($s3) -/* ABBC6C 802409DC 8FBF0020 */ lw $ra, 0x20($sp) -/* ABBC70 802409E0 8FB3001C */ lw $s3, 0x1c($sp) -/* ABBC74 802409E4 8FB20018 */ lw $s2, 0x18($sp) -/* ABBC78 802409E8 8FB10014 */ lw $s1, 0x14($sp) -/* ABBC7C 802409EC 8FB00010 */ lw $s0, 0x10($sp) -/* ABBC80 802409F0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* ABBC84 802409F4 03E00008 */ jr $ra -/* ABBC88 802409F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC_ABBB5C.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC_ABBB5C.s new file mode 100644 index 0000000000..98c6ff3d2b --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_802408CC_ABBB5C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408CC_ABBB5C +/* ABBB5C 802408CC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* ABBB60 802408D0 AFB3001C */ sw $s3, 0x1c($sp) +/* ABBB64 802408D4 0080982D */ daddu $s3, $a0, $zero +/* ABBB68 802408D8 AFBF0020 */ sw $ra, 0x20($sp) +/* ABBB6C 802408DC AFB20018 */ sw $s2, 0x18($sp) +/* ABBB70 802408E0 AFB10014 */ sw $s1, 0x14($sp) +/* ABBB74 802408E4 AFB00010 */ sw $s0, 0x10($sp) +/* ABBB78 802408E8 F7B40028 */ sdc1 $f20, 0x28($sp) +/* ABBB7C 802408EC 8E710148 */ lw $s1, 0x148($s3) +/* ABBB80 802408F0 86240008 */ lh $a0, 8($s1) +/* ABBB84 802408F4 0C00EABB */ jal get_npc_unsafe +/* ABBB88 802408F8 00A0802D */ daddu $s0, $a1, $zero +/* ABBB8C 802408FC 8E040020 */ lw $a0, 0x20($s0) +/* ABBB90 80240900 0040902D */ daddu $s2, $v0, $zero +/* ABBB94 80240904 00041FC2 */ srl $v1, $a0, 0x1f +/* ABBB98 80240908 00832021 */ addu $a0, $a0, $v1 +/* ABBB9C 8024090C 00042043 */ sra $a0, $a0, 1 +/* ABBBA0 80240910 0C00A67F */ jal rand_int +/* ABBBA4 80240914 24840001 */ addiu $a0, $a0, 1 +/* ABBBA8 80240918 8E030020 */ lw $v1, 0x20($s0) +/* ABBBAC 8024091C C64C0038 */ lwc1 $f12, 0x38($s2) +/* ABBBB0 80240920 000327C2 */ srl $a0, $v1, 0x1f +/* ABBBB4 80240924 00641821 */ addu $v1, $v1, $a0 +/* ABBBB8 80240928 00031843 */ sra $v1, $v1, 1 +/* ABBBBC 8024092C 00621821 */ addu $v1, $v1, $v0 +/* ABBBC0 80240930 A643008E */ sh $v1, 0x8e($s2) +/* ABBBC4 80240934 8E2200CC */ lw $v0, 0xcc($s1) +/* ABBBC8 80240938 C64E0040 */ lwc1 $f14, 0x40($s2) +/* ABBBCC 8024093C 8C42000C */ lw $v0, 0xc($v0) +/* ABBBD0 80240940 AE420028 */ sw $v0, 0x28($s2) +/* ABBBD4 80240944 C6000018 */ lwc1 $f0, 0x18($s0) +/* ABBBD8 80240948 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* ABBBDC 8024094C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* ABBBE0 80240950 E6400018 */ swc1 $f0, 0x18($s2) +/* ABBBE4 80240954 8C460028 */ lw $a2, 0x28($v0) +/* ABBBE8 80240958 0C00A720 */ jal atan2 +/* ABBBEC 8024095C 8C470030 */ lw $a3, 0x30($v0) +/* ABBBF0 80240960 46000506 */ mov.s $f20, $f0 +/* ABBBF4 80240964 C64C000C */ lwc1 $f12, 0xc($s2) +/* ABBBF8 80240968 0C00A70A */ jal get_clamped_angle_diff +/* ABBBFC 8024096C 4600A386 */ mov.s $f14, $f20 +/* ABBC00 80240970 46000086 */ mov.s $f2, $f0 +/* ABBC04 80240974 8E02001C */ lw $v0, 0x1c($s0) +/* ABBC08 80240978 46001005 */ abs.s $f0, $f2 +/* ABBC0C 8024097C 44822000 */ mtc1 $v0, $f4 +/* ABBC10 80240980 00000000 */ nop +/* ABBC14 80240984 46802120 */ cvt.s.w $f4, $f4 +/* ABBC18 80240988 4600203C */ c.lt.s $f4, $f0 +/* ABBC1C 8024098C 00000000 */ nop +/* ABBC20 80240990 4500000D */ bc1f .L802409C8 +/* ABBC24 80240994 00000000 */ nop +/* ABBC28 80240998 44800000 */ mtc1 $zero, $f0 +/* ABBC2C 8024099C C654000C */ lwc1 $f20, 0xc($s2) +/* ABBC30 802409A0 4600103C */ c.lt.s $f2, $f0 +/* ABBC34 802409A4 00000000 */ nop +/* ABBC38 802409A8 45000006 */ bc1f .L802409C4 +/* ABBC3C 802409AC 00021023 */ negu $v0, $v0 +/* ABBC40 802409B0 44820000 */ mtc1 $v0, $f0 +/* ABBC44 802409B4 00000000 */ nop +/* ABBC48 802409B8 46800020 */ cvt.s.w $f0, $f0 +/* ABBC4C 802409BC 08090272 */ j .L802409C8 +/* ABBC50 802409C0 4600A500 */ add.s $f20, $f20, $f0 +.L802409C4: +/* ABBC54 802409C4 4604A500 */ add.s $f20, $f20, $f4 +.L802409C8: +/* ABBC58 802409C8 0C00A6C9 */ jal clamp_angle +/* ABBC5C 802409CC 4600A306 */ mov.s $f12, $f20 +/* ABBC60 802409D0 2402000D */ addiu $v0, $zero, 0xd +/* ABBC64 802409D4 E640000C */ swc1 $f0, 0xc($s2) +/* ABBC68 802409D8 AE620070 */ sw $v0, 0x70($s3) +/* ABBC6C 802409DC 8FBF0020 */ lw $ra, 0x20($sp) +/* ABBC70 802409E0 8FB3001C */ lw $s3, 0x1c($sp) +/* ABBC74 802409E4 8FB20018 */ lw $s2, 0x18($sp) +/* ABBC78 802409E8 8FB10014 */ lw $s1, 0x14($sp) +/* ABBC7C 802409EC 8FB00010 */ lw $s0, 0x10($sp) +/* ABBC80 802409F0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* ABBC84 802409F4 03E00008 */ jr $ra +/* ABBC88 802409F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C.s deleted file mode 100644 index c8fe3ded13..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B1C -/* ABBDAC 80240B1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ABBDB0 80240B20 AFB10014 */ sw $s1, 0x14($sp) -/* ABBDB4 80240B24 0080882D */ daddu $s1, $a0, $zero -/* ABBDB8 80240B28 AFBF0018 */ sw $ra, 0x18($sp) -/* ABBDBC 80240B2C AFB00010 */ sw $s0, 0x10($sp) -/* ABBDC0 80240B30 8E300148 */ lw $s0, 0x148($s1) -/* ABBDC4 80240B34 0C00EABB */ jal get_npc_unsafe -/* ABBDC8 80240B38 86040008 */ lh $a0, 8($s0) -/* ABBDCC 80240B3C 9443008E */ lhu $v1, 0x8e($v0) -/* ABBDD0 80240B40 2463FFFF */ addiu $v1, $v1, -1 -/* ABBDD4 80240B44 A443008E */ sh $v1, 0x8e($v0) -/* ABBDD8 80240B48 00031C00 */ sll $v1, $v1, 0x10 -/* ABBDDC 80240B4C 14600008 */ bnez $v1, .L80240B70 -/* ABBDE0 80240B50 00000000 */ nop -/* ABBDE4 80240B54 8E0200B0 */ lw $v0, 0xb0($s0) -/* ABBDE8 80240B58 30420080 */ andi $v0, $v0, 0x80 -/* ABBDEC 80240B5C 10400003 */ beqz $v0, .L80240B6C -/* ABBDF0 80240B60 2402000F */ addiu $v0, $zero, 0xf -/* ABBDF4 80240B64 080902DC */ j .L80240B70 -/* ABBDF8 80240B68 AE220070 */ sw $v0, 0x70($s1) -.L80240B6C: -/* ABBDFC 80240B6C AE200070 */ sw $zero, 0x70($s1) -.L80240B70: -/* ABBE00 80240B70 8FBF0018 */ lw $ra, 0x18($sp) -/* ABBE04 80240B74 8FB10014 */ lw $s1, 0x14($sp) -/* ABBE08 80240B78 8FB00010 */ lw $s0, 0x10($sp) -/* ABBE0C 80240B7C 03E00008 */ jr $ra -/* ABBE10 80240B80 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s new file mode 100644 index 0000000000..121f358aa2 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B1C_ABBDAC.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B1C_ABBDAC +/* ABBDAC 80240B1C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ABBDB0 80240B20 AFB10014 */ sw $s1, 0x14($sp) +/* ABBDB4 80240B24 0080882D */ daddu $s1, $a0, $zero +/* ABBDB8 80240B28 AFBF0018 */ sw $ra, 0x18($sp) +/* ABBDBC 80240B2C AFB00010 */ sw $s0, 0x10($sp) +/* ABBDC0 80240B30 8E300148 */ lw $s0, 0x148($s1) +/* ABBDC4 80240B34 0C00EABB */ jal get_npc_unsafe +/* ABBDC8 80240B38 86040008 */ lh $a0, 8($s0) +/* ABBDCC 80240B3C 9443008E */ lhu $v1, 0x8e($v0) +/* ABBDD0 80240B40 2463FFFF */ addiu $v1, $v1, -1 +/* ABBDD4 80240B44 A443008E */ sh $v1, 0x8e($v0) +/* ABBDD8 80240B48 00031C00 */ sll $v1, $v1, 0x10 +/* ABBDDC 80240B4C 14600008 */ bnez $v1, .L80240B70 +/* ABBDE0 80240B50 00000000 */ nop +/* ABBDE4 80240B54 8E0200B0 */ lw $v0, 0xb0($s0) +/* ABBDE8 80240B58 30420080 */ andi $v0, $v0, 0x80 +/* ABBDEC 80240B5C 10400003 */ beqz $v0, .L80240B6C +/* ABBDF0 80240B60 2402000F */ addiu $v0, $zero, 0xf +/* ABBDF4 80240B64 080902DC */ j .L80240B70 +/* ABBDF8 80240B68 AE220070 */ sw $v0, 0x70($s1) +.L80240B6C: +/* ABBDFC 80240B6C AE200070 */ sw $zero, 0x70($s1) +.L80240B70: +/* ABBE00 80240B70 8FBF0018 */ lw $ra, 0x18($sp) +/* ABBE04 80240B74 8FB10014 */ lw $s1, 0x14($sp) +/* ABBE08 80240B78 8FB00010 */ lw $s0, 0x10($sp) +/* ABBE0C 80240B7C 03E00008 */ jr $ra +/* ABBE10 80240B80 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84.s deleted file mode 100644 index 0e12f22f49..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B84 -/* ABBE14 80240B84 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* ABBE18 80240B88 AFB10014 */ sw $s1, 0x14($sp) -/* ABBE1C 80240B8C 0080882D */ daddu $s1, $a0, $zero -/* ABBE20 80240B90 AFBF001C */ sw $ra, 0x1c($sp) -/* ABBE24 80240B94 AFB20018 */ sw $s2, 0x18($sp) -/* ABBE28 80240B98 AFB00010 */ sw $s0, 0x10($sp) -/* ABBE2C 80240B9C 8E300148 */ lw $s0, 0x148($s1) -/* ABBE30 80240BA0 86040008 */ lh $a0, 8($s0) -/* ABBE34 80240BA4 0C00EABB */ jal get_npc_unsafe -/* ABBE38 80240BA8 00A0902D */ daddu $s2, $a1, $zero -/* ABBE3C 80240BAC 8E0300D0 */ lw $v1, 0xd0($s0) -/* ABBE40 80240BB0 8E240078 */ lw $a0, 0x78($s1) -/* ABBE44 80240BB4 8C630000 */ lw $v1, ($v1) -/* ABBE48 80240BB8 0083182A */ slt $v1, $a0, $v1 -/* ABBE4C 80240BBC 10600013 */ beqz $v1, .L80240C0C -/* ABBE50 80240BC0 0040302D */ daddu $a2, $v0, $zero -/* ABBE54 80240BC4 00041040 */ sll $v0, $a0, 1 -/* ABBE58 80240BC8 00441021 */ addu $v0, $v0, $a0 -/* ABBE5C 80240BCC 00022880 */ sll $a1, $v0, 2 -.L80240BD0: -/* ABBE60 80240BD0 8E0300D0 */ lw $v1, 0xd0($s0) -/* ABBE64 80240BD4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* ABBE68 80240BD8 00A31021 */ addu $v0, $a1, $v1 -/* ABBE6C 80240BDC C4400008 */ lwc1 $f0, 8($v0) -/* ABBE70 80240BE0 46800020 */ cvt.s.w $f0, $f0 -/* ABBE74 80240BE4 4602003E */ c.le.s $f0, $f2 -/* ABBE78 80240BE8 00000000 */ nop -/* ABBE7C 80240BEC 45020003 */ bc1fl .L80240BFC -/* ABBE80 80240BF0 24840001 */ addiu $a0, $a0, 1 -/* ABBE84 80240BF4 08090303 */ j .L80240C0C -/* ABBE88 80240BF8 AE240078 */ sw $a0, 0x78($s1) -.L80240BFC: -/* ABBE8C 80240BFC 8C620000 */ lw $v0, ($v1) -/* ABBE90 80240C00 0082102A */ slt $v0, $a0, $v0 -/* ABBE94 80240C04 1440FFF2 */ bnez $v0, .L80240BD0 -/* ABBE98 80240C08 24A5000C */ addiu $a1, $a1, 0xc -.L80240C0C: -/* ABBE9C 80240C0C C6400000 */ lwc1 $f0, ($s2) -/* ABBEA0 80240C10 E4C00018 */ swc1 $f0, 0x18($a2) -/* ABBEA4 80240C14 8E0200CC */ lw $v0, 0xcc($s0) -/* ABBEA8 80240C18 8C420004 */ lw $v0, 4($v0) -/* ABBEAC 80240C1C ACC20028 */ sw $v0, 0x28($a2) -/* ABBEB0 80240C20 24020001 */ addiu $v0, $zero, 1 -/* ABBEB4 80240C24 AE200074 */ sw $zero, 0x74($s1) -/* ABBEB8 80240C28 AE220070 */ sw $v0, 0x70($s1) -/* ABBEBC 80240C2C 8FBF001C */ lw $ra, 0x1c($sp) -/* ABBEC0 80240C30 8FB20018 */ lw $s2, 0x18($sp) -/* ABBEC4 80240C34 8FB10014 */ lw $s1, 0x14($sp) -/* ABBEC8 80240C38 8FB00010 */ lw $s0, 0x10($sp) -/* ABBECC 80240C3C 03E00008 */ jr $ra -/* ABBED0 80240C40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s new file mode 100644 index 0000000000..792d61d263 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240B84_ABBE14.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B84_ABBE14 +/* ABBE14 80240B84 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* ABBE18 80240B88 AFB10014 */ sw $s1, 0x14($sp) +/* ABBE1C 80240B8C 0080882D */ daddu $s1, $a0, $zero +/* ABBE20 80240B90 AFBF001C */ sw $ra, 0x1c($sp) +/* ABBE24 80240B94 AFB20018 */ sw $s2, 0x18($sp) +/* ABBE28 80240B98 AFB00010 */ sw $s0, 0x10($sp) +/* ABBE2C 80240B9C 8E300148 */ lw $s0, 0x148($s1) +/* ABBE30 80240BA0 86040008 */ lh $a0, 8($s0) +/* ABBE34 80240BA4 0C00EABB */ jal get_npc_unsafe +/* ABBE38 80240BA8 00A0902D */ daddu $s2, $a1, $zero +/* ABBE3C 80240BAC 8E0300D0 */ lw $v1, 0xd0($s0) +/* ABBE40 80240BB0 8E240078 */ lw $a0, 0x78($s1) +/* ABBE44 80240BB4 8C630000 */ lw $v1, ($v1) +/* ABBE48 80240BB8 0083182A */ slt $v1, $a0, $v1 +/* ABBE4C 80240BBC 10600013 */ beqz $v1, .L80240C0C +/* ABBE50 80240BC0 0040302D */ daddu $a2, $v0, $zero +/* ABBE54 80240BC4 00041040 */ sll $v0, $a0, 1 +/* ABBE58 80240BC8 00441021 */ addu $v0, $v0, $a0 +/* ABBE5C 80240BCC 00022880 */ sll $a1, $v0, 2 +.L80240BD0: +/* ABBE60 80240BD0 8E0300D0 */ lw $v1, 0xd0($s0) +/* ABBE64 80240BD4 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* ABBE68 80240BD8 00A31021 */ addu $v0, $a1, $v1 +/* ABBE6C 80240BDC C4400008 */ lwc1 $f0, 8($v0) +/* ABBE70 80240BE0 46800020 */ cvt.s.w $f0, $f0 +/* ABBE74 80240BE4 4602003E */ c.le.s $f0, $f2 +/* ABBE78 80240BE8 00000000 */ nop +/* ABBE7C 80240BEC 45020003 */ bc1fl .L80240BFC +/* ABBE80 80240BF0 24840001 */ addiu $a0, $a0, 1 +/* ABBE84 80240BF4 08090303 */ j .L80240C0C +/* ABBE88 80240BF8 AE240078 */ sw $a0, 0x78($s1) +.L80240BFC: +/* ABBE8C 80240BFC 8C620000 */ lw $v0, ($v1) +/* ABBE90 80240C00 0082102A */ slt $v0, $a0, $v0 +/* ABBE94 80240C04 1440FFF2 */ bnez $v0, .L80240BD0 +/* ABBE98 80240C08 24A5000C */ addiu $a1, $a1, 0xc +.L80240C0C: +/* ABBE9C 80240C0C C6400000 */ lwc1 $f0, ($s2) +/* ABBEA0 80240C10 E4C00018 */ swc1 $f0, 0x18($a2) +/* ABBEA4 80240C14 8E0200CC */ lw $v0, 0xcc($s0) +/* ABBEA8 80240C18 8C420004 */ lw $v0, 4($v0) +/* ABBEAC 80240C1C ACC20028 */ sw $v0, 0x28($a2) +/* ABBEB0 80240C20 24020001 */ addiu $v0, $zero, 1 +/* ABBEB4 80240C24 AE200074 */ sw $zero, 0x74($s1) +/* ABBEB8 80240C28 AE220070 */ sw $v0, 0x70($s1) +/* ABBEBC 80240C2C 8FBF001C */ lw $ra, 0x1c($sp) +/* ABBEC0 80240C30 8FB20018 */ lw $s2, 0x18($sp) +/* ABBEC4 80240C34 8FB10014 */ lw $s1, 0x14($sp) +/* ABBEC8 80240C38 8FB00010 */ lw $s0, 0x10($sp) +/* ABBECC 80240C3C 03E00008 */ jr $ra +/* ABBED0 80240C40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44.s deleted file mode 100644 index 4618e46c41..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C44 -/* ABBED4 80240C44 27BDFF98 */ addiu $sp, $sp, -0x68 -/* ABBED8 80240C48 AFB40058 */ sw $s4, 0x58($sp) -/* ABBEDC 80240C4C 0080A02D */ daddu $s4, $a0, $zero -/* ABBEE0 80240C50 AFBF0060 */ sw $ra, 0x60($sp) -/* ABBEE4 80240C54 AFB5005C */ sw $s5, 0x5c($sp) -/* ABBEE8 80240C58 AFB30054 */ sw $s3, 0x54($sp) -/* ABBEEC 80240C5C AFB20050 */ sw $s2, 0x50($sp) -/* ABBEF0 80240C60 AFB1004C */ sw $s1, 0x4c($sp) -/* ABBEF4 80240C64 AFB00048 */ sw $s0, 0x48($sp) -/* ABBEF8 80240C68 8E910148 */ lw $s1, 0x148($s4) -/* ABBEFC 80240C6C 86240008 */ lh $a0, 8($s1) -/* ABBF00 80240C70 0C00EABB */ jal get_npc_unsafe -/* ABBF04 80240C74 00A0802D */ daddu $s0, $a1, $zero -/* ABBF08 80240C78 8E83000C */ lw $v1, 0xc($s4) -/* ABBF0C 80240C7C 0280202D */ daddu $a0, $s4, $zero -/* ABBF10 80240C80 8C650000 */ lw $a1, ($v1) -/* ABBF14 80240C84 0C0B1EAF */ jal get_variable -/* ABBF18 80240C88 0040902D */ daddu $s2, $v0, $zero -/* ABBF1C 80240C8C AFA00018 */ sw $zero, 0x18($sp) -/* ABBF20 80240C90 8E2300D0 */ lw $v1, 0xd0($s1) -/* ABBF24 80240C94 8C630094 */ lw $v1, 0x94($v1) -/* ABBF28 80240C98 AFA3001C */ sw $v1, 0x1c($sp) -/* ABBF2C 80240C9C 8E2300D0 */ lw $v1, 0xd0($s1) -/* ABBF30 80240CA0 8C630080 */ lw $v1, 0x80($v1) -/* ABBF34 80240CA4 AFA30020 */ sw $v1, 0x20($sp) -/* ABBF38 80240CA8 8E2300D0 */ lw $v1, 0xd0($s1) -/* ABBF3C 80240CAC 8C630088 */ lw $v1, 0x88($v1) -/* ABBF40 80240CB0 AFA30024 */ sw $v1, 0x24($sp) -/* ABBF44 80240CB4 8E2300D0 */ lw $v1, 0xd0($s1) -/* ABBF48 80240CB8 8C63008C */ lw $v1, 0x8c($v1) -/* ABBF4C 80240CBC 27B50018 */ addiu $s5, $sp, 0x18 -/* ABBF50 80240CC0 AFA30028 */ sw $v1, 0x28($sp) -/* ABBF54 80240CC4 8E2300D0 */ lw $v1, 0xd0($s1) -/* ABBF58 80240CC8 3C014282 */ lui $at, 0x4282 -/* ABBF5C 80240CCC 44810000 */ mtc1 $at, $f0 -/* ABBF60 80240CD0 8C630090 */ lw $v1, 0x90($v1) -/* ABBF64 80240CD4 0040982D */ daddu $s3, $v0, $zero -/* ABBF68 80240CD8 E7A00030 */ swc1 $f0, 0x30($sp) -/* ABBF6C 80240CDC A7A00034 */ sh $zero, 0x34($sp) -/* ABBF70 80240CE0 16000005 */ bnez $s0, .L80240CF8 -/* ABBF74 80240CE4 AFA3002C */ sw $v1, 0x2c($sp) -/* ABBF78 80240CE8 8E2200B0 */ lw $v0, 0xb0($s1) -/* ABBF7C 80240CEC 30420004 */ andi $v0, $v0, 4 -/* ABBF80 80240CF0 10400044 */ beqz $v0, .L80240E04 -/* ABBF84 80240CF4 00000000 */ nop -.L80240CF8: -/* ABBF88 80240CF8 2404F7FF */ addiu $a0, $zero, -0x801 -/* ABBF8C 80240CFC AE800070 */ sw $zero, 0x70($s4) -/* ABBF90 80240D00 A640008E */ sh $zero, 0x8e($s2) -/* ABBF94 80240D04 8E2200CC */ lw $v0, 0xcc($s1) -/* ABBF98 80240D08 8E430000 */ lw $v1, ($s2) -/* ABBF9C 80240D0C 8C420000 */ lw $v0, ($v0) -/* ABBFA0 80240D10 00641824 */ and $v1, $v1, $a0 -/* ABBFA4 80240D14 AE430000 */ sw $v1, ($s2) -/* ABBFA8 80240D18 AE420028 */ sw $v0, 0x28($s2) -/* ABBFAC 80240D1C 8E2200D0 */ lw $v0, 0xd0($s1) -/* ABBFB0 80240D20 8C420098 */ lw $v0, 0x98($v0) -/* ABBFB4 80240D24 54400005 */ bnel $v0, $zero, .L80240D3C -/* ABBFB8 80240D28 2402FDFF */ addiu $v0, $zero, -0x201 -/* ABBFBC 80240D2C 34620200 */ ori $v0, $v1, 0x200 -/* ABBFC0 80240D30 2403FFF7 */ addiu $v1, $zero, -9 -/* ABBFC4 80240D34 08090351 */ j .L80240D44 -/* ABBFC8 80240D38 00431024 */ and $v0, $v0, $v1 -.L80240D3C: -/* ABBFCC 80240D3C 00621024 */ and $v0, $v1, $v0 -/* ABBFD0 80240D40 34420008 */ ori $v0, $v0, 8 -.L80240D44: -/* ABBFD4 80240D44 AE420000 */ sw $v0, ($s2) -/* ABBFD8 80240D48 8E2200B0 */ lw $v0, 0xb0($s1) -/* ABBFDC 80240D4C 30420004 */ andi $v0, $v0, 4 -/* ABBFE0 80240D50 10400008 */ beqz $v0, .L80240D74 -/* ABBFE4 80240D54 24020063 */ addiu $v0, $zero, 0x63 -/* ABBFE8 80240D58 AE820070 */ sw $v0, 0x70($s4) -/* ABBFEC 80240D5C AE800074 */ sw $zero, 0x74($s4) -/* ABBFF0 80240D60 8E2200B0 */ lw $v0, 0xb0($s1) -/* ABBFF4 80240D64 2403FFFB */ addiu $v1, $zero, -5 -/* ABBFF8 80240D68 00431024 */ and $v0, $v0, $v1 -/* ABBFFC 80240D6C 08090368 */ j .L80240DA0 -/* ABC000 80240D70 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240D74: -/* ABC004 80240D74 8E220000 */ lw $v0, ($s1) -/* ABC008 80240D78 3C034000 */ lui $v1, 0x4000 -/* ABC00C 80240D7C 00431024 */ and $v0, $v0, $v1 -/* ABC010 80240D80 10400007 */ beqz $v0, .L80240DA0 -/* ABC014 80240D84 3C03BFFF */ lui $v1, 0xbfff -/* ABC018 80240D88 2402000C */ addiu $v0, $zero, 0xc -/* ABC01C 80240D8C AE820070 */ sw $v0, 0x70($s4) -/* ABC020 80240D90 8E220000 */ lw $v0, ($s1) -/* ABC024 80240D94 3463FFFF */ ori $v1, $v1, 0xffff -/* ABC028 80240D98 00431024 */ and $v0, $v0, $v1 -/* ABC02C 80240D9C AE220000 */ sw $v0, ($s1) -.L80240DA0: -/* ABC030 80240DA0 27A50038 */ addiu $a1, $sp, 0x38 -/* ABC034 80240DA4 27A6003C */ addiu $a2, $sp, 0x3c -/* ABC038 80240DA8 C6400038 */ lwc1 $f0, 0x38($s2) -/* ABC03C 80240DAC 864200A8 */ lh $v0, 0xa8($s2) -/* ABC040 80240DB0 3C0142C8 */ lui $at, 0x42c8 -/* ABC044 80240DB4 44812000 */ mtc1 $at, $f4 -/* ABC048 80240DB8 44823000 */ mtc1 $v0, $f6 -/* ABC04C 80240DBC 00000000 */ nop -/* ABC050 80240DC0 468031A0 */ cvt.s.w $f6, $f6 -/* ABC054 80240DC4 27A20044 */ addiu $v0, $sp, 0x44 -/* ABC058 80240DC8 E7A00038 */ swc1 $f0, 0x38($sp) -/* ABC05C 80240DCC C640003C */ lwc1 $f0, 0x3c($s2) -/* ABC060 80240DD0 C6420040 */ lwc1 $f2, 0x40($s2) -/* ABC064 80240DD4 46060000 */ add.s $f0, $f0, $f6 -/* ABC068 80240DD8 E7A40044 */ swc1 $f4, 0x44($sp) -/* ABC06C 80240DDC E7A20040 */ swc1 $f2, 0x40($sp) -/* ABC070 80240DE0 E7A0003C */ swc1 $f0, 0x3c($sp) -/* ABC074 80240DE4 AFA20010 */ sw $v0, 0x10($sp) -/* ABC078 80240DE8 8E440080 */ lw $a0, 0x80($s2) -/* ABC07C 80240DEC 0C0372DF */ jal func_800DCB7C -/* ABC080 80240DF0 27A70040 */ addiu $a3, $sp, 0x40 -/* ABC084 80240DF4 10400003 */ beqz $v0, .L80240E04 -/* ABC088 80240DF8 00000000 */ nop -/* ABC08C 80240DFC C7A0003C */ lwc1 $f0, 0x3c($sp) -/* ABC090 80240E00 E640003C */ swc1 $f0, 0x3c($s2) -.L80240E04: -/* ABC094 80240E04 8E830070 */ lw $v1, 0x70($s4) -/* ABC098 80240E08 2C620064 */ sltiu $v0, $v1, 0x64 -/* ABC09C 80240E0C 10400042 */ beqz $v0, .L80240F18 -/* ABC0A0 80240E10 00031080 */ sll $v0, $v1, 2 -/* ABC0A4 80240E14 3C018025 */ lui $at, 0x8025 -/* ABC0A8 80240E18 00220821 */ addu $at, $at, $v0 -/* ABC0AC 80240E1C 8C229D40 */ lw $v0, -0x62c0($at) -/* ABC0B0 80240E20 00400008 */ jr $v0 -/* ABC0B4 80240E24 00000000 */ nop -/* ABC0B8 80240E28 0280202D */ daddu $a0, $s4, $zero -/* ABC0BC 80240E2C 0260282D */ daddu $a1, $s3, $zero -/* ABC0C0 80240E30 0C09002C */ jal func_802400B0 -/* ABC0C4 80240E34 02A0302D */ daddu $a2, $s5, $zero -/* ABC0C8 80240E38 0280202D */ daddu $a0, $s4, $zero -/* ABC0CC 80240E3C 0260282D */ daddu $a1, $s3, $zero -/* ABC0D0 80240E40 0C090082 */ jal func_80240208 -/* ABC0D4 80240E44 02A0302D */ daddu $a2, $s5, $zero -/* ABC0D8 80240E48 080903C6 */ j .L80240F18 -/* ABC0DC 80240E4C 00000000 */ nop -/* ABC0E0 80240E50 0280202D */ daddu $a0, $s4, $zero -/* ABC0E4 80240E54 0260282D */ daddu $a1, $s3, $zero -/* ABC0E8 80240E58 0C09012C */ jal func_802404B0 -/* ABC0EC 80240E5C 02A0302D */ daddu $a2, $s5, $zero -/* ABC0F0 80240E60 0280202D */ daddu $a0, $s4, $zero -/* ABC0F4 80240E64 0260282D */ daddu $a1, $s3, $zero -/* ABC0F8 80240E68 0C09015C */ jal func_80240570 -/* ABC0FC 80240E6C 02A0302D */ daddu $a2, $s5, $zero -/* ABC100 80240E70 080903C6 */ j .L80240F18 -/* ABC104 80240E74 00000000 */ nop -/* ABC108 80240E78 0280202D */ daddu $a0, $s4, $zero -/* ABC10C 80240E7C 0260282D */ daddu $a1, $s3, $zero -/* ABC110 80240E80 0C0901CB */ jal func_8024072C -/* ABC114 80240E84 02A0302D */ daddu $a2, $s5, $zero -/* ABC118 80240E88 080903C6 */ j .L80240F18 -/* ABC11C 80240E8C 00000000 */ nop -/* ABC120 80240E90 0280202D */ daddu $a0, $s4, $zero -/* ABC124 80240E94 0260282D */ daddu $a1, $s3, $zero -/* ABC128 80240E98 0C0901F8 */ jal func_802407E0 -/* ABC12C 80240E9C 02A0302D */ daddu $a2, $s5, $zero -/* ABC130 80240EA0 0280202D */ daddu $a0, $s4, $zero -/* ABC134 80240EA4 0260282D */ daddu $a1, $s3, $zero -/* ABC138 80240EA8 0C090215 */ jal func_80240854 -/* ABC13C 80240EAC 02A0302D */ daddu $a2, $s5, $zero -/* ABC140 80240EB0 080903C6 */ j .L80240F18 -/* ABC144 80240EB4 00000000 */ nop -/* ABC148 80240EB8 0280202D */ daddu $a0, $s4, $zero -/* ABC14C 80240EBC 0260282D */ daddu $a1, $s3, $zero -/* ABC150 80240EC0 0C090233 */ jal func_802408CC -/* ABC154 80240EC4 02A0302D */ daddu $a2, $s5, $zero -/* ABC158 80240EC8 0280202D */ daddu $a0, $s4, $zero -/* ABC15C 80240ECC 0260282D */ daddu $a1, $s3, $zero -/* ABC160 80240ED0 0C09027F */ jal func_802409FC -/* ABC164 80240ED4 02A0302D */ daddu $a2, $s5, $zero -/* ABC168 80240ED8 080903C6 */ j .L80240F18 -/* ABC16C 80240EDC 00000000 */ nop -/* ABC170 80240EE0 0280202D */ daddu $a0, $s4, $zero -/* ABC174 80240EE4 0260282D */ daddu $a1, $s3, $zero -/* ABC178 80240EE8 0C0902C7 */ jal func_80240B1C -/* ABC17C 80240EEC 02A0302D */ daddu $a2, $s5, $zero -/* ABC180 80240EF0 080903C6 */ j .L80240F18 -/* ABC184 80240EF4 00000000 */ nop -/* ABC188 80240EF8 0280202D */ daddu $a0, $s4, $zero -/* ABC18C 80240EFC 0260282D */ daddu $a1, $s3, $zero -/* ABC190 80240F00 0C0902E1 */ jal func_80240B84 -/* ABC194 80240F04 02A0302D */ daddu $a2, $s5, $zero -/* ABC198 80240F08 080903C6 */ j .L80240F18 -/* ABC19C 80240F0C 00000000 */ nop -/* ABC1A0 80240F10 0C0129CF */ jal func_8004A73C -/* ABC1A4 80240F14 0280202D */ daddu $a0, $s4, $zero -.L80240F18: -/* ABC1A8 80240F18 8FBF0060 */ lw $ra, 0x60($sp) -/* ABC1AC 80240F1C 8FB5005C */ lw $s5, 0x5c($sp) -/* ABC1B0 80240F20 8FB40058 */ lw $s4, 0x58($sp) -/* ABC1B4 80240F24 8FB30054 */ lw $s3, 0x54($sp) -/* ABC1B8 80240F28 8FB20050 */ lw $s2, 0x50($sp) -/* ABC1BC 80240F2C 8FB1004C */ lw $s1, 0x4c($sp) -/* ABC1C0 80240F30 8FB00048 */ lw $s0, 0x48($sp) -/* ABC1C4 80240F34 0000102D */ daddu $v0, $zero, $zero -/* ABC1C8 80240F38 03E00008 */ jr $ra -/* ABC1CC 80240F3C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s new file mode 100644 index 0000000000..c6d4f1dcfa --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_00/ABB340/func_80240C44_ABBED4.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C44_ABBED4 +/* ABBED4 80240C44 27BDFF98 */ addiu $sp, $sp, -0x68 +/* ABBED8 80240C48 AFB40058 */ sw $s4, 0x58($sp) +/* ABBEDC 80240C4C 0080A02D */ daddu $s4, $a0, $zero +/* ABBEE0 80240C50 AFBF0060 */ sw $ra, 0x60($sp) +/* ABBEE4 80240C54 AFB5005C */ sw $s5, 0x5c($sp) +/* ABBEE8 80240C58 AFB30054 */ sw $s3, 0x54($sp) +/* ABBEEC 80240C5C AFB20050 */ sw $s2, 0x50($sp) +/* ABBEF0 80240C60 AFB1004C */ sw $s1, 0x4c($sp) +/* ABBEF4 80240C64 AFB00048 */ sw $s0, 0x48($sp) +/* ABBEF8 80240C68 8E910148 */ lw $s1, 0x148($s4) +/* ABBEFC 80240C6C 86240008 */ lh $a0, 8($s1) +/* ABBF00 80240C70 0C00EABB */ jal get_npc_unsafe +/* ABBF04 80240C74 00A0802D */ daddu $s0, $a1, $zero +/* ABBF08 80240C78 8E83000C */ lw $v1, 0xc($s4) +/* ABBF0C 80240C7C 0280202D */ daddu $a0, $s4, $zero +/* ABBF10 80240C80 8C650000 */ lw $a1, ($v1) +/* ABBF14 80240C84 0C0B1EAF */ jal get_variable +/* ABBF18 80240C88 0040902D */ daddu $s2, $v0, $zero +/* ABBF1C 80240C8C AFA00018 */ sw $zero, 0x18($sp) +/* ABBF20 80240C90 8E2300D0 */ lw $v1, 0xd0($s1) +/* ABBF24 80240C94 8C630094 */ lw $v1, 0x94($v1) +/* ABBF28 80240C98 AFA3001C */ sw $v1, 0x1c($sp) +/* ABBF2C 80240C9C 8E2300D0 */ lw $v1, 0xd0($s1) +/* ABBF30 80240CA0 8C630080 */ lw $v1, 0x80($v1) +/* ABBF34 80240CA4 AFA30020 */ sw $v1, 0x20($sp) +/* ABBF38 80240CA8 8E2300D0 */ lw $v1, 0xd0($s1) +/* ABBF3C 80240CAC 8C630088 */ lw $v1, 0x88($v1) +/* ABBF40 80240CB0 AFA30024 */ sw $v1, 0x24($sp) +/* ABBF44 80240CB4 8E2300D0 */ lw $v1, 0xd0($s1) +/* ABBF48 80240CB8 8C63008C */ lw $v1, 0x8c($v1) +/* ABBF4C 80240CBC 27B50018 */ addiu $s5, $sp, 0x18 +/* ABBF50 80240CC0 AFA30028 */ sw $v1, 0x28($sp) +/* ABBF54 80240CC4 8E2300D0 */ lw $v1, 0xd0($s1) +/* ABBF58 80240CC8 3C014282 */ lui $at, 0x4282 +/* ABBF5C 80240CCC 44810000 */ mtc1 $at, $f0 +/* ABBF60 80240CD0 8C630090 */ lw $v1, 0x90($v1) +/* ABBF64 80240CD4 0040982D */ daddu $s3, $v0, $zero +/* ABBF68 80240CD8 E7A00030 */ swc1 $f0, 0x30($sp) +/* ABBF6C 80240CDC A7A00034 */ sh $zero, 0x34($sp) +/* ABBF70 80240CE0 16000005 */ bnez $s0, .L80240CF8 +/* ABBF74 80240CE4 AFA3002C */ sw $v1, 0x2c($sp) +/* ABBF78 80240CE8 8E2200B0 */ lw $v0, 0xb0($s1) +/* ABBF7C 80240CEC 30420004 */ andi $v0, $v0, 4 +/* ABBF80 80240CF0 10400044 */ beqz $v0, .L80240E04 +/* ABBF84 80240CF4 00000000 */ nop +.L80240CF8: +/* ABBF88 80240CF8 2404F7FF */ addiu $a0, $zero, -0x801 +/* ABBF8C 80240CFC AE800070 */ sw $zero, 0x70($s4) +/* ABBF90 80240D00 A640008E */ sh $zero, 0x8e($s2) +/* ABBF94 80240D04 8E2200CC */ lw $v0, 0xcc($s1) +/* ABBF98 80240D08 8E430000 */ lw $v1, ($s2) +/* ABBF9C 80240D0C 8C420000 */ lw $v0, ($v0) +/* ABBFA0 80240D10 00641824 */ and $v1, $v1, $a0 +/* ABBFA4 80240D14 AE430000 */ sw $v1, ($s2) +/* ABBFA8 80240D18 AE420028 */ sw $v0, 0x28($s2) +/* ABBFAC 80240D1C 8E2200D0 */ lw $v0, 0xd0($s1) +/* ABBFB0 80240D20 8C420098 */ lw $v0, 0x98($v0) +/* ABBFB4 80240D24 54400005 */ bnel $v0, $zero, .L80240D3C +/* ABBFB8 80240D28 2402FDFF */ addiu $v0, $zero, -0x201 +/* ABBFBC 80240D2C 34620200 */ ori $v0, $v1, 0x200 +/* ABBFC0 80240D30 2403FFF7 */ addiu $v1, $zero, -9 +/* ABBFC4 80240D34 08090351 */ j .L80240D44 +/* ABBFC8 80240D38 00431024 */ and $v0, $v0, $v1 +.L80240D3C: +/* ABBFCC 80240D3C 00621024 */ and $v0, $v1, $v0 +/* ABBFD0 80240D40 34420008 */ ori $v0, $v0, 8 +.L80240D44: +/* ABBFD4 80240D44 AE420000 */ sw $v0, ($s2) +/* ABBFD8 80240D48 8E2200B0 */ lw $v0, 0xb0($s1) +/* ABBFDC 80240D4C 30420004 */ andi $v0, $v0, 4 +/* ABBFE0 80240D50 10400008 */ beqz $v0, .L80240D74 +/* ABBFE4 80240D54 24020063 */ addiu $v0, $zero, 0x63 +/* ABBFE8 80240D58 AE820070 */ sw $v0, 0x70($s4) +/* ABBFEC 80240D5C AE800074 */ sw $zero, 0x74($s4) +/* ABBFF0 80240D60 8E2200B0 */ lw $v0, 0xb0($s1) +/* ABBFF4 80240D64 2403FFFB */ addiu $v1, $zero, -5 +/* ABBFF8 80240D68 00431024 */ and $v0, $v0, $v1 +/* ABBFFC 80240D6C 08090368 */ j .L80240DA0 +/* ABC000 80240D70 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240D74: +/* ABC004 80240D74 8E220000 */ lw $v0, ($s1) +/* ABC008 80240D78 3C034000 */ lui $v1, 0x4000 +/* ABC00C 80240D7C 00431024 */ and $v0, $v0, $v1 +/* ABC010 80240D80 10400007 */ beqz $v0, .L80240DA0 +/* ABC014 80240D84 3C03BFFF */ lui $v1, 0xbfff +/* ABC018 80240D88 2402000C */ addiu $v0, $zero, 0xc +/* ABC01C 80240D8C AE820070 */ sw $v0, 0x70($s4) +/* ABC020 80240D90 8E220000 */ lw $v0, ($s1) +/* ABC024 80240D94 3463FFFF */ ori $v1, $v1, 0xffff +/* ABC028 80240D98 00431024 */ and $v0, $v0, $v1 +/* ABC02C 80240D9C AE220000 */ sw $v0, ($s1) +.L80240DA0: +/* ABC030 80240DA0 27A50038 */ addiu $a1, $sp, 0x38 +/* ABC034 80240DA4 27A6003C */ addiu $a2, $sp, 0x3c +/* ABC038 80240DA8 C6400038 */ lwc1 $f0, 0x38($s2) +/* ABC03C 80240DAC 864200A8 */ lh $v0, 0xa8($s2) +/* ABC040 80240DB0 3C0142C8 */ lui $at, 0x42c8 +/* ABC044 80240DB4 44812000 */ mtc1 $at, $f4 +/* ABC048 80240DB8 44823000 */ mtc1 $v0, $f6 +/* ABC04C 80240DBC 00000000 */ nop +/* ABC050 80240DC0 468031A0 */ cvt.s.w $f6, $f6 +/* ABC054 80240DC4 27A20044 */ addiu $v0, $sp, 0x44 +/* ABC058 80240DC8 E7A00038 */ swc1 $f0, 0x38($sp) +/* ABC05C 80240DCC C640003C */ lwc1 $f0, 0x3c($s2) +/* ABC060 80240DD0 C6420040 */ lwc1 $f2, 0x40($s2) +/* ABC064 80240DD4 46060000 */ add.s $f0, $f0, $f6 +/* ABC068 80240DD8 E7A40044 */ swc1 $f4, 0x44($sp) +/* ABC06C 80240DDC E7A20040 */ swc1 $f2, 0x40($sp) +/* ABC070 80240DE0 E7A0003C */ swc1 $f0, 0x3c($sp) +/* ABC074 80240DE4 AFA20010 */ sw $v0, 0x10($sp) +/* ABC078 80240DE8 8E440080 */ lw $a0, 0x80($s2) +/* ABC07C 80240DEC 0C0372DF */ jal func_800DCB7C +/* ABC080 80240DF0 27A70040 */ addiu $a3, $sp, 0x40 +/* ABC084 80240DF4 10400003 */ beqz $v0, .L80240E04 +/* ABC088 80240DF8 00000000 */ nop +/* ABC08C 80240DFC C7A0003C */ lwc1 $f0, 0x3c($sp) +/* ABC090 80240E00 E640003C */ swc1 $f0, 0x3c($s2) +.L80240E04: +/* ABC094 80240E04 8E830070 */ lw $v1, 0x70($s4) +/* ABC098 80240E08 2C620064 */ sltiu $v0, $v1, 0x64 +/* ABC09C 80240E0C 10400042 */ beqz $v0, .L80240F18 +/* ABC0A0 80240E10 00031080 */ sll $v0, $v1, 2 +/* ABC0A4 80240E14 3C018025 */ lui $at, 0x8025 +/* ABC0A8 80240E18 00220821 */ addu $at, $at, $v0 +/* ABC0AC 80240E1C 8C229D40 */ lw $v0, -0x62c0($at) +/* ABC0B0 80240E20 00400008 */ jr $v0 +/* ABC0B4 80240E24 00000000 */ nop +/* ABC0B8 80240E28 0280202D */ daddu $a0, $s4, $zero +/* ABC0BC 80240E2C 0260282D */ daddu $a1, $s3, $zero +/* ABC0C0 80240E30 0C09002C */ jal func_802400B0_ABB340 +/* ABC0C4 80240E34 02A0302D */ daddu $a2, $s5, $zero +/* ABC0C8 80240E38 0280202D */ daddu $a0, $s4, $zero +/* ABC0CC 80240E3C 0260282D */ daddu $a1, $s3, $zero +/* ABC0D0 80240E40 0C090082 */ jal func_80240208_ABB498 +/* ABC0D4 80240E44 02A0302D */ daddu $a2, $s5, $zero +/* ABC0D8 80240E48 080903C6 */ j .L80240F18 +/* ABC0DC 80240E4C 00000000 */ nop +/* ABC0E0 80240E50 0280202D */ daddu $a0, $s4, $zero +/* ABC0E4 80240E54 0260282D */ daddu $a1, $s3, $zero +/* ABC0E8 80240E58 0C09012C */ jal func_802404B0_ABB740 +/* ABC0EC 80240E5C 02A0302D */ daddu $a2, $s5, $zero +/* ABC0F0 80240E60 0280202D */ daddu $a0, $s4, $zero +/* ABC0F4 80240E64 0260282D */ daddu $a1, $s3, $zero +/* ABC0F8 80240E68 0C09015C */ jal func_80240570_ABB800 +/* ABC0FC 80240E6C 02A0302D */ daddu $a2, $s5, $zero +/* ABC100 80240E70 080903C6 */ j .L80240F18 +/* ABC104 80240E74 00000000 */ nop +/* ABC108 80240E78 0280202D */ daddu $a0, $s4, $zero +/* ABC10C 80240E7C 0260282D */ daddu $a1, $s3, $zero +/* ABC110 80240E80 0C0901CB */ jal func_8024072C_ABB9BC +/* ABC114 80240E84 02A0302D */ daddu $a2, $s5, $zero +/* ABC118 80240E88 080903C6 */ j .L80240F18 +/* ABC11C 80240E8C 00000000 */ nop +/* ABC120 80240E90 0280202D */ daddu $a0, $s4, $zero +/* ABC124 80240E94 0260282D */ daddu $a1, $s3, $zero +/* ABC128 80240E98 0C0901F8 */ jal func_802407E0_ABBA70 +/* ABC12C 80240E9C 02A0302D */ daddu $a2, $s5, $zero +/* ABC130 80240EA0 0280202D */ daddu $a0, $s4, $zero +/* ABC134 80240EA4 0260282D */ daddu $a1, $s3, $zero +/* ABC138 80240EA8 0C090215 */ jal func_80240854_ABBAE4 +/* ABC13C 80240EAC 02A0302D */ daddu $a2, $s5, $zero +/* ABC140 80240EB0 080903C6 */ j .L80240F18 +/* ABC144 80240EB4 00000000 */ nop +/* ABC148 80240EB8 0280202D */ daddu $a0, $s4, $zero +/* ABC14C 80240EBC 0260282D */ daddu $a1, $s3, $zero +/* ABC150 80240EC0 0C090233 */ jal func_802408CC_ABBB5C +/* ABC154 80240EC4 02A0302D */ daddu $a2, $s5, $zero +/* ABC158 80240EC8 0280202D */ daddu $a0, $s4, $zero +/* ABC15C 80240ECC 0260282D */ daddu $a1, $s3, $zero +/* ABC160 80240ED0 0C09027F */ jal func_802409FC_ABBC8C +/* ABC164 80240ED4 02A0302D */ daddu $a2, $s5, $zero +/* ABC168 80240ED8 080903C6 */ j .L80240F18 +/* ABC16C 80240EDC 00000000 */ nop +/* ABC170 80240EE0 0280202D */ daddu $a0, $s4, $zero +/* ABC174 80240EE4 0260282D */ daddu $a1, $s3, $zero +/* ABC178 80240EE8 0C0902C7 */ jal func_80240B1C_ABBDAC +/* ABC17C 80240EEC 02A0302D */ daddu $a2, $s5, $zero +/* ABC180 80240EF0 080903C6 */ j .L80240F18 +/* ABC184 80240EF4 00000000 */ nop +/* ABC188 80240EF8 0280202D */ daddu $a0, $s4, $zero +/* ABC18C 80240EFC 0260282D */ daddu $a1, $s3, $zero +/* ABC190 80240F00 0C0902E1 */ jal func_80240B84_ABBE14 +/* ABC194 80240F04 02A0302D */ daddu $a2, $s5, $zero +/* ABC198 80240F08 080903C6 */ j .L80240F18 +/* ABC19C 80240F0C 00000000 */ nop +/* ABC1A0 80240F10 0C0129CF */ jal func_8004A73C +/* ABC1A4 80240F14 0280202D */ daddu $a0, $s4, $zero +.L80240F18: +/* ABC1A8 80240F18 8FBF0060 */ lw $ra, 0x60($sp) +/* ABC1AC 80240F1C 8FB5005C */ lw $s5, 0x5c($sp) +/* ABC1B0 80240F20 8FB40058 */ lw $s4, 0x58($sp) +/* ABC1B4 80240F24 8FB30054 */ lw $s3, 0x54($sp) +/* ABC1B8 80240F28 8FB20050 */ lw $s2, 0x50($sp) +/* ABC1BC 80240F2C 8FB1004C */ lw $s1, 0x4c($sp) +/* ABC1C0 80240F30 8FB00048 */ lw $s0, 0x48($sp) +/* ABC1C4 80240F34 0000102D */ daddu $v0, $zero, $zero +/* ABC1C8 80240F38 03E00008 */ jr $ra +/* ABC1CC 80240F3C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s index 9d2a06038c..a1579ae11e 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s +++ b/asm/nonmatchings/world/area_kkj/kkj_01/AC5170/func_80240B94_AC5D04.s @@ -131,7 +131,7 @@ glabel func_80240B94_AC5D04 /* AC5EE4 80240D74 00000000 */ nop /* AC5EE8 80240D78 0280202D */ daddu $a0, $s4, $zero /* AC5EEC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* AC5EF0 80240D80 0C090000 */ jal func_80240000 +/* AC5EF0 80240D80 0C090000 */ jal func_80240000_AC5170 /* AC5EF4 80240D84 02A0302D */ daddu $a2, $s5, $zero /* AC5EF8 80240D88 0280202D */ daddu $a0, $s4, $zero /* AC5EFC 80240D8C 0260282D */ daddu $a1, $s3, $zero @@ -141,27 +141,27 @@ glabel func_80240B94_AC5D04 /* AC5F0C 80240D9C 00000000 */ nop /* AC5F10 80240DA0 0280202D */ daddu $a0, $s4, $zero /* AC5F14 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* AC5F18 80240DA8 0C090100 */ jal func_80240400 +/* AC5F18 80240DA8 0C090100 */ jal func_80240400_AC5570 /* AC5F1C 80240DAC 02A0302D */ daddu $a2, $s5, $zero /* AC5F20 80240DB0 0280202D */ daddu $a0, $s4, $zero /* AC5F24 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* AC5F28 80240DB8 0C090130 */ jal func_802404C0 +/* AC5F28 80240DB8 0C090130 */ jal func_802404C0_AC5630 /* AC5F2C 80240DBC 02A0302D */ daddu $a2, $s5, $zero /* AC5F30 80240DC0 0809039A */ j .L80240E68 /* AC5F34 80240DC4 00000000 */ nop /* AC5F38 80240DC8 0280202D */ daddu $a0, $s4, $zero /* AC5F3C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* AC5F40 80240DD0 0C09019F */ jal func_8024067C +/* AC5F40 80240DD0 0C09019F */ jal func_8024067C_AC57EC /* AC5F44 80240DD4 02A0302D */ daddu $a2, $s5, $zero /* AC5F48 80240DD8 0809039A */ j .L80240E68 /* AC5F4C 80240DDC 00000000 */ nop /* AC5F50 80240DE0 0280202D */ daddu $a0, $s4, $zero /* AC5F54 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* AC5F58 80240DE8 0C0901CC */ jal func_80240730 +/* AC5F58 80240DE8 0C0901CC */ jal func_80240730_AC58A0 /* AC5F5C 80240DEC 02A0302D */ daddu $a2, $s5, $zero /* AC5F60 80240DF0 0280202D */ daddu $a0, $s4, $zero /* AC5F64 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* AC5F68 80240DF8 0C0901E9 */ jal func_802407A4 +/* AC5F68 80240DF8 0C0901E9 */ jal func_802407A4_AC5914 /* AC5F6C 80240DFC 02A0302D */ daddu $a2, $s5, $zero /* AC5F70 80240E00 0809039A */ j .L80240E68 /* AC5F74 80240E04 00000000 */ nop @@ -171,19 +171,19 @@ glabel func_80240B94_AC5D04 /* AC5F84 80240E14 02A0302D */ daddu $a2, $s5, $zero /* AC5F88 80240E18 0280202D */ daddu $a0, $s4, $zero /* AC5F8C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* AC5F90 80240E20 0C090253 */ jal func_8024094C +/* AC5F90 80240E20 0C090253 */ jal func_8024094C_AC5ABC /* AC5F94 80240E24 02A0302D */ daddu $a2, $s5, $zero /* AC5F98 80240E28 0809039A */ j .L80240E68 /* AC5F9C 80240E2C 00000000 */ nop /* AC5FA0 80240E30 0280202D */ daddu $a0, $s4, $zero /* AC5FA4 80240E34 0260282D */ daddu $a1, $s3, $zero -/* AC5FA8 80240E38 0C09029B */ jal func_80240A6C +/* AC5FA8 80240E38 0C09029B */ jal func_80240A6C_AC5BDC /* AC5FAC 80240E3C 02A0302D */ daddu $a2, $s5, $zero /* AC5FB0 80240E40 0809039A */ j .L80240E68 /* AC5FB4 80240E44 00000000 */ nop /* AC5FB8 80240E48 0280202D */ daddu $a0, $s4, $zero /* AC5FBC 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* AC5FC0 80240E50 0C0902B5 */ jal func_80240AD4 +/* AC5FC0 80240E50 0C0902B5 */ jal func_80240AD4_AC5C44 /* AC5FC4 80240E54 02A0302D */ daddu $a2, $s5, $zero /* AC5FC8 80240E58 0809039A */ j .L80240E68 /* AC5FCC 80240E5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802402C0.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802402C0.s deleted file mode 100644 index 810478957e..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802402C0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C0 -/* ACADE0 802402C0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* ACADE4 802402C4 F7B40060 */ sdc1 $f20, 0x60($sp) -/* ACADE8 802402C8 4485A000 */ mtc1 $a1, $f20 -/* ACADEC 802402CC F7B60068 */ sdc1 $f22, 0x68($sp) -/* ACADF0 802402D0 4486B000 */ mtc1 $a2, $f22 -/* ACADF4 802402D4 F7B80070 */ sdc1 $f24, 0x70($sp) -/* ACADF8 802402D8 4487C000 */ mtc1 $a3, $f24 -/* ACADFC 802402DC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* ACAE00 802402E0 C7BA0090 */ lwc1 $f26, 0x90($sp) -/* ACAE04 802402E4 AFBF0058 */ sw $ra, 0x58($sp) -/* ACAE08 802402E8 AFB10054 */ sw $s1, 0x54($sp) -/* ACAE0C 802402EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* ACAE10 802402F0 AFB00050 */ sw $s0, 0x50($sp) -/* ACAE14 802402F4 0C046B4C */ jal get_model_from_list_index -/* ACAE18 802402F8 0040202D */ daddu $a0, $v0, $zero -/* ACAE1C 802402FC 0040802D */ daddu $s0, $v0, $zero -/* ACAE20 80240300 26110058 */ addiu $s1, $s0, 0x58 -/* ACAE24 80240304 4405A000 */ mfc1 $a1, $f20 -/* ACAE28 80240308 4406B000 */ mfc1 $a2, $f22 -/* ACAE2C 8024030C 4407C000 */ mfc1 $a3, $f24 -/* ACAE30 80240310 0C019E40 */ jal guTranslateF -/* ACAE34 80240314 0220202D */ daddu $a0, $s1, $zero -/* ACAE38 80240318 27A40010 */ addiu $a0, $sp, 0x10 -/* ACAE3C 8024031C 4405D000 */ mfc1 $a1, $f26 -/* ACAE40 80240320 3C063F80 */ lui $a2, 0x3f80 -/* ACAE44 80240324 0C019DF0 */ jal guScaleF -/* ACAE48 80240328 00A0382D */ daddu $a3, $a1, $zero -/* ACAE4C 8024032C 27A40010 */ addiu $a0, $sp, 0x10 -/* ACAE50 80240330 0220282D */ daddu $a1, $s1, $zero -/* ACAE54 80240334 0C019D80 */ jal guMtxCatF -/* ACAE58 80240338 00A0302D */ daddu $a2, $a1, $zero -/* ACAE5C 8024033C 96020000 */ lhu $v0, ($s0) -/* ACAE60 80240340 34421400 */ ori $v0, $v0, 0x1400 -/* ACAE64 80240344 A6020000 */ sh $v0, ($s0) -/* ACAE68 80240348 8FBF0058 */ lw $ra, 0x58($sp) -/* ACAE6C 8024034C 8FB10054 */ lw $s1, 0x54($sp) -/* ACAE70 80240350 8FB00050 */ lw $s0, 0x50($sp) -/* ACAE74 80240354 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* ACAE78 80240358 D7B80070 */ ldc1 $f24, 0x70($sp) -/* ACAE7C 8024035C D7B60068 */ ldc1 $f22, 0x68($sp) -/* ACAE80 80240360 D7B40060 */ ldc1 $f20, 0x60($sp) -/* ACAE84 80240364 03E00008 */ jr $ra -/* ACAE88 80240368 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802402C0_ACADE0.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802402C0_ACADE0.s new file mode 100644 index 0000000000..569f92a8cd --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_802402C0_ACADE0.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402C0_ACADE0 +/* ACADE0 802402C0 27BDFF80 */ addiu $sp, $sp, -0x80 +/* ACADE4 802402C4 F7B40060 */ sdc1 $f20, 0x60($sp) +/* ACADE8 802402C8 4485A000 */ mtc1 $a1, $f20 +/* ACADEC 802402CC F7B60068 */ sdc1 $f22, 0x68($sp) +/* ACADF0 802402D0 4486B000 */ mtc1 $a2, $f22 +/* ACADF4 802402D4 F7B80070 */ sdc1 $f24, 0x70($sp) +/* ACADF8 802402D8 4487C000 */ mtc1 $a3, $f24 +/* ACADFC 802402DC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* ACAE00 802402E0 C7BA0090 */ lwc1 $f26, 0x90($sp) +/* ACAE04 802402E4 AFBF0058 */ sw $ra, 0x58($sp) +/* ACAE08 802402E8 AFB10054 */ sw $s1, 0x54($sp) +/* ACAE0C 802402EC 0C046C04 */ jal get_model_list_index_from_tree_index +/* ACAE10 802402F0 AFB00050 */ sw $s0, 0x50($sp) +/* ACAE14 802402F4 0C046B4C */ jal get_model_from_list_index +/* ACAE18 802402F8 0040202D */ daddu $a0, $v0, $zero +/* ACAE1C 802402FC 0040802D */ daddu $s0, $v0, $zero +/* ACAE20 80240300 26110058 */ addiu $s1, $s0, 0x58 +/* ACAE24 80240304 4405A000 */ mfc1 $a1, $f20 +/* ACAE28 80240308 4406B000 */ mfc1 $a2, $f22 +/* ACAE2C 8024030C 4407C000 */ mfc1 $a3, $f24 +/* ACAE30 80240310 0C019E40 */ jal guTranslateF +/* ACAE34 80240314 0220202D */ daddu $a0, $s1, $zero +/* ACAE38 80240318 27A40010 */ addiu $a0, $sp, 0x10 +/* ACAE3C 8024031C 4405D000 */ mfc1 $a1, $f26 +/* ACAE40 80240320 3C063F80 */ lui $a2, 0x3f80 +/* ACAE44 80240324 0C019DF0 */ jal guScaleF +/* ACAE48 80240328 00A0382D */ daddu $a3, $a1, $zero +/* ACAE4C 8024032C 27A40010 */ addiu $a0, $sp, 0x10 +/* ACAE50 80240330 0220282D */ daddu $a1, $s1, $zero +/* ACAE54 80240334 0C019D80 */ jal guMtxCatF +/* ACAE58 80240338 00A0302D */ daddu $a2, $a1, $zero +/* ACAE5C 8024033C 96020000 */ lhu $v0, ($s0) +/* ACAE60 80240340 34421400 */ ori $v0, $v0, 0x1400 +/* ACAE64 80240344 A6020000 */ sh $v0, ($s0) +/* ACAE68 80240348 8FBF0058 */ lw $ra, 0x58($sp) +/* ACAE6C 8024034C 8FB10054 */ lw $s1, 0x54($sp) +/* ACAE70 80240350 8FB00050 */ lw $s0, 0x50($sp) +/* ACAE74 80240354 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* ACAE78 80240358 D7B80070 */ ldc1 $f24, 0x70($sp) +/* ACAE7C 8024035C D7B60068 */ ldc1 $f22, 0x68($sp) +/* ACAE80 80240360 D7B40060 */ ldc1 $f20, 0x60($sp) +/* ACAE84 80240364 03E00008 */ jr $ra +/* ACAE88 80240368 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s index d1897c23a8..d0f0433058 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACABD0/func_8024036C_ACAE8C.s @@ -105,7 +105,7 @@ glabel func_8024036C_ACAE8C /* ACB018 802404F8 46200020 */ cvt.s.d $f0, $f0 /* ACB01C 802404FC E7A00010 */ swc1 $f0, 0x10($sp) /* ACB020 80240500 8E26003C */ lw $a2, 0x3c($s1) -/* ACB024 80240504 0C0900B0 */ jal func_802402C0 +/* ACB024 80240504 0C0900B0 */ jal func_802402C0_ACADE0 /* ACB028 80240508 02C0202D */ daddu $a0, $s6, $zero /* ACB02C 8024050C 02A0202D */ daddu $a0, $s5, $zero /* ACB030 80240510 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0.s deleted file mode 100644 index 533135a54f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408A0 -/* ACB3C0 802408A0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* ACB3C4 802408A4 AFB3003C */ sw $s3, 0x3c($sp) -/* ACB3C8 802408A8 0080982D */ daddu $s3, $a0, $zero -/* ACB3CC 802408AC AFBF0044 */ sw $ra, 0x44($sp) -/* ACB3D0 802408B0 AFB40040 */ sw $s4, 0x40($sp) -/* ACB3D4 802408B4 AFB20038 */ sw $s2, 0x38($sp) -/* ACB3D8 802408B8 AFB10034 */ sw $s1, 0x34($sp) -/* ACB3DC 802408BC AFB00030 */ sw $s0, 0x30($sp) -/* ACB3E0 802408C0 F7B80058 */ sdc1 $f24, 0x58($sp) -/* ACB3E4 802408C4 F7B60050 */ sdc1 $f22, 0x50($sp) -/* ACB3E8 802408C8 F7B40048 */ sdc1 $f20, 0x48($sp) -/* ACB3EC 802408CC 8E620148 */ lw $v0, 0x148($s3) -/* ACB3F0 802408D0 0C00EABB */ jal get_npc_unsafe -/* ACB3F4 802408D4 84440008 */ lh $a0, 8($v0) -/* ACB3F8 802408D8 27A40020 */ addiu $a0, $sp, 0x20 -/* ACB3FC 802408DC 27A50024 */ addiu $a1, $sp, 0x24 -/* ACB400 802408E0 0040802D */ daddu $s0, $v0, $zero -/* ACB404 802408E4 8E63000C */ lw $v1, 0xc($s3) -/* ACB408 802408E8 8E07000C */ lw $a3, 0xc($s0) -/* ACB40C 802408EC C6000038 */ lwc1 $f0, 0x38($s0) -/* ACB410 802408F0 C6020040 */ lwc1 $f2, 0x40($s0) -/* ACB414 802408F4 8C740000 */ lw $s4, ($v1) -/* ACB418 802408F8 24630004 */ addiu $v1, $v1, 4 -/* ACB41C 802408FC C4780000 */ lwc1 $f24, ($v1) -/* ACB420 80240900 4680C620 */ cvt.s.w $f24, $f24 -/* ACB424 80240904 24630004 */ addiu $v1, $v1, 4 -/* ACB428 80240908 C4740000 */ lwc1 $f20, ($v1) -/* ACB42C 8024090C 4680A520 */ cvt.s.w $f20, $f20 -/* ACB430 80240910 4406A000 */ mfc1 $a2, $f20 -/* ACB434 80240914 C4760004 */ lwc1 $f22, 4($v1) -/* ACB438 80240918 4680B5A0 */ cvt.s.w $f22, $f22 -/* ACB43C 8024091C E7A00020 */ swc1 $f0, 0x20($sp) -/* ACB440 80240920 0C00A7E7 */ jal add_vec2D_polar -/* ACB444 80240924 E7A20024 */ swc1 $f2, 0x24($sp) -/* ACB448 80240928 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* ACB44C 8024092C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* ACB450 80240930 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* ACB454 80240934 4480A000 */ mtc1 $zero, $f20 -/* ACB458 80240938 8E460028 */ lw $a2, 0x28($s2) -/* ACB45C 8024093C 4407A000 */ mfc1 $a3, $f20 -/* ACB460 80240940 0C00A7B5 */ jal dist2D -/* ACB464 80240944 4600A386 */ mov.s $f14, $f20 -/* ACB468 80240948 4600A306 */ mov.s $f12, $f20 -/* ACB46C 8024094C C7AE0024 */ lwc1 $f14, 0x24($sp) -/* ACB470 80240950 44066000 */ mfc1 $a2, $f12 -/* ACB474 80240954 8E470030 */ lw $a3, 0x30($s2) -/* ACB478 80240958 0C00A7B5 */ jal dist2D -/* ACB47C 8024095C 46000506 */ mov.s $f20, $f0 -/* ACB480 80240960 C604000C */ lwc1 $f4, 0xc($s0) -/* ACB484 80240964 3C018024 */ lui $at, 0x8024 -/* ACB488 80240968 D4223600 */ ldc1 $f2, 0x3600($at) -/* ACB48C 8024096C 46002121 */ cvt.d.s $f4, $f4 -/* ACB490 80240970 46222032 */ c.eq.d $f4, $f2 -/* ACB494 80240974 00000000 */ nop -/* ACB498 80240978 45010007 */ bc1t .L80240998 -/* ACB49C 8024097C 46000086 */ mov.s $f2, $f0 -/* ACB4A0 80240980 3C018024 */ lui $at, 0x8024 -/* ACB4A4 80240984 D4203608 */ ldc1 $f0, 0x3608($at) -/* ACB4A8 80240988 46202032 */ c.eq.d $f4, $f0 -/* ACB4AC 8024098C 00000000 */ nop -/* ACB4B0 80240990 45000008 */ bc1f .L802409B4 -/* ACB4B4 80240994 00000000 */ nop -.L80240998: -/* ACB4B8 80240998 4618A03E */ c.le.s $f20, $f24 -/* ACB4BC 8024099C 00000000 */ nop -/* ACB4C0 802409A0 4500000C */ bc1f .L802409D4 -/* ACB4C4 802409A4 0000882D */ daddu $s1, $zero, $zero -/* ACB4C8 802409A8 4616103E */ c.le.s $f2, $f22 -/* ACB4CC 802409AC 08090273 */ j .L802409CC -/* ACB4D0 802409B0 00000000 */ nop -.L802409B4: -/* ACB4D4 802409B4 4618103E */ c.le.s $f2, $f24 -/* ACB4D8 802409B8 00000000 */ nop -/* ACB4DC 802409BC 45000005 */ bc1f .L802409D4 -/* ACB4E0 802409C0 0000882D */ daddu $s1, $zero, $zero -/* ACB4E4 802409C4 4616A03E */ c.le.s $f20, $f22 -/* ACB4E8 802409C8 00000000 */ nop -.L802409CC: -/* ACB4EC 802409CC 45030001 */ bc1tl .L802409D4 -/* ACB4F0 802409D0 24110001 */ addiu $s1, $zero, 1 -.L802409D4: -/* ACB4F4 802409D4 12200027 */ beqz $s1, .L80240A74 -/* ACB4F8 802409D8 0260202D */ daddu $a0, $s3, $zero -/* ACB4FC 802409DC C60C0038 */ lwc1 $f12, 0x38($s0) -/* ACB500 802409E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* ACB504 802409E4 8E460028 */ lw $a2, 0x28($s2) -/* ACB508 802409E8 8E470030 */ lw $a3, 0x30($s2) -/* ACB50C 802409EC C602003C */ lwc1 $f2, 0x3c($s0) -/* ACB510 802409F0 46006006 */ mov.s $f0, $f12 -/* ACB514 802409F4 46007106 */ mov.s $f4, $f14 -/* ACB518 802409F8 E7A00020 */ swc1 $f0, 0x20($sp) -/* ACB51C 802409FC E7A20028 */ swc1 $f2, 0x28($sp) -/* ACB520 80240A00 0C00A7B5 */ jal dist2D -/* ACB524 80240A04 E7A40024 */ swc1 $f4, 0x24($sp) -/* ACB528 80240A08 C60C0038 */ lwc1 $f12, 0x38($s0) -/* ACB52C 80240A0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* ACB530 80240A10 8E460028 */ lw $a2, 0x28($s2) -/* ACB534 80240A14 8E470030 */ lw $a3, 0x30($s2) -/* ACB538 80240A18 0C00A720 */ jal atan2 -/* ACB53C 80240A1C 46000506 */ mov.s $f20, $f0 -/* ACB540 80240A20 3C040007 */ lui $a0, 7 -/* ACB544 80240A24 34848000 */ ori $a0, $a0, 0x8000 -/* ACB548 80240A28 27A50020 */ addiu $a1, $sp, 0x20 -/* ACB54C 80240A2C E7B40010 */ swc1 $f20, 0x10($sp) -/* ACB550 80240A30 E7A00014 */ swc1 $f0, 0x14($sp) -/* ACB554 80240A34 860200A6 */ lh $v0, 0xa6($s0) -/* ACB558 80240A38 27A60028 */ addiu $a2, $sp, 0x28 -/* ACB55C 80240A3C 44820000 */ mtc1 $v0, $f0 -/* ACB560 80240A40 00000000 */ nop -/* ACB564 80240A44 46800020 */ cvt.s.w $f0, $f0 -/* ACB568 80240A48 E7A00018 */ swc1 $f0, 0x18($sp) -/* ACB56C 80240A4C 860200A8 */ lh $v0, 0xa8($s0) -/* ACB570 80240A50 27A70024 */ addiu $a3, $sp, 0x24 -/* ACB574 80240A54 44820000 */ mtc1 $v0, $f0 -/* ACB578 80240A58 00000000 */ nop -/* ACB57C 80240A5C 46800020 */ cvt.s.w $f0, $f0 -/* ACB580 80240A60 0C0376B9 */ jal func_800DDAE4 -/* ACB584 80240A64 E7A0001C */ swc1 $f0, 0x1c($sp) -/* ACB588 80240A68 54400001 */ bnel $v0, $zero, .L80240A70 -/* ACB58C 80240A6C 0000882D */ daddu $s1, $zero, $zero -.L80240A70: -/* ACB590 80240A70 0260202D */ daddu $a0, $s3, $zero -.L80240A74: -/* ACB594 80240A74 0280282D */ daddu $a1, $s4, $zero -/* ACB598 80240A78 0C0B2026 */ jal set_variable -/* ACB59C 80240A7C 0220302D */ daddu $a2, $s1, $zero -/* ACB5A0 80240A80 8FBF0044 */ lw $ra, 0x44($sp) -/* ACB5A4 80240A84 8FB40040 */ lw $s4, 0x40($sp) -/* ACB5A8 80240A88 8FB3003C */ lw $s3, 0x3c($sp) -/* ACB5AC 80240A8C 8FB20038 */ lw $s2, 0x38($sp) -/* ACB5B0 80240A90 8FB10034 */ lw $s1, 0x34($sp) -/* ACB5B4 80240A94 8FB00030 */ lw $s0, 0x30($sp) -/* ACB5B8 80240A98 D7B80058 */ ldc1 $f24, 0x58($sp) -/* ACB5BC 80240A9C D7B60050 */ ldc1 $f22, 0x50($sp) -/* ACB5C0 80240AA0 D7B40048 */ ldc1 $f20, 0x48($sp) -/* ACB5C4 80240AA4 24020002 */ addiu $v0, $zero, 2 -/* ACB5C8 80240AA8 03E00008 */ jr $ra -/* ACB5CC 80240AAC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s new file mode 100644 index 0000000000..62dbdf88dd --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_802408A0_ACB3C0.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408A0_ACB3C0 +/* ACB3C0 802408A0 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* ACB3C4 802408A4 AFB3003C */ sw $s3, 0x3c($sp) +/* ACB3C8 802408A8 0080982D */ daddu $s3, $a0, $zero +/* ACB3CC 802408AC AFBF0044 */ sw $ra, 0x44($sp) +/* ACB3D0 802408B0 AFB40040 */ sw $s4, 0x40($sp) +/* ACB3D4 802408B4 AFB20038 */ sw $s2, 0x38($sp) +/* ACB3D8 802408B8 AFB10034 */ sw $s1, 0x34($sp) +/* ACB3DC 802408BC AFB00030 */ sw $s0, 0x30($sp) +/* ACB3E0 802408C0 F7B80058 */ sdc1 $f24, 0x58($sp) +/* ACB3E4 802408C4 F7B60050 */ sdc1 $f22, 0x50($sp) +/* ACB3E8 802408C8 F7B40048 */ sdc1 $f20, 0x48($sp) +/* ACB3EC 802408CC 8E620148 */ lw $v0, 0x148($s3) +/* ACB3F0 802408D0 0C00EABB */ jal get_npc_unsafe +/* ACB3F4 802408D4 84440008 */ lh $a0, 8($v0) +/* ACB3F8 802408D8 27A40020 */ addiu $a0, $sp, 0x20 +/* ACB3FC 802408DC 27A50024 */ addiu $a1, $sp, 0x24 +/* ACB400 802408E0 0040802D */ daddu $s0, $v0, $zero +/* ACB404 802408E4 8E63000C */ lw $v1, 0xc($s3) +/* ACB408 802408E8 8E07000C */ lw $a3, 0xc($s0) +/* ACB40C 802408EC C6000038 */ lwc1 $f0, 0x38($s0) +/* ACB410 802408F0 C6020040 */ lwc1 $f2, 0x40($s0) +/* ACB414 802408F4 8C740000 */ lw $s4, ($v1) +/* ACB418 802408F8 24630004 */ addiu $v1, $v1, 4 +/* ACB41C 802408FC C4780000 */ lwc1 $f24, ($v1) +/* ACB420 80240900 4680C620 */ cvt.s.w $f24, $f24 +/* ACB424 80240904 24630004 */ addiu $v1, $v1, 4 +/* ACB428 80240908 C4740000 */ lwc1 $f20, ($v1) +/* ACB42C 8024090C 4680A520 */ cvt.s.w $f20, $f20 +/* ACB430 80240910 4406A000 */ mfc1 $a2, $f20 +/* ACB434 80240914 C4760004 */ lwc1 $f22, 4($v1) +/* ACB438 80240918 4680B5A0 */ cvt.s.w $f22, $f22 +/* ACB43C 8024091C E7A00020 */ swc1 $f0, 0x20($sp) +/* ACB440 80240920 0C00A7E7 */ jal add_vec2D_polar +/* ACB444 80240924 E7A20024 */ swc1 $f2, 0x24($sp) +/* ACB448 80240928 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* ACB44C 8024092C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* ACB450 80240930 C7AC0020 */ lwc1 $f12, 0x20($sp) +/* ACB454 80240934 4480A000 */ mtc1 $zero, $f20 +/* ACB458 80240938 8E460028 */ lw $a2, 0x28($s2) +/* ACB45C 8024093C 4407A000 */ mfc1 $a3, $f20 +/* ACB460 80240940 0C00A7B5 */ jal dist2D +/* ACB464 80240944 4600A386 */ mov.s $f14, $f20 +/* ACB468 80240948 4600A306 */ mov.s $f12, $f20 +/* ACB46C 8024094C C7AE0024 */ lwc1 $f14, 0x24($sp) +/* ACB470 80240950 44066000 */ mfc1 $a2, $f12 +/* ACB474 80240954 8E470030 */ lw $a3, 0x30($s2) +/* ACB478 80240958 0C00A7B5 */ jal dist2D +/* ACB47C 8024095C 46000506 */ mov.s $f20, $f0 +/* ACB480 80240960 C604000C */ lwc1 $f4, 0xc($s0) +/* ACB484 80240964 3C018024 */ lui $at, 0x8024 +/* ACB488 80240968 D4223600 */ ldc1 $f2, 0x3600($at) +/* ACB48C 8024096C 46002121 */ cvt.d.s $f4, $f4 +/* ACB490 80240970 46222032 */ c.eq.d $f4, $f2 +/* ACB494 80240974 00000000 */ nop +/* ACB498 80240978 45010007 */ bc1t .L80240998 +/* ACB49C 8024097C 46000086 */ mov.s $f2, $f0 +/* ACB4A0 80240980 3C018024 */ lui $at, 0x8024 +/* ACB4A4 80240984 D4203608 */ ldc1 $f0, 0x3608($at) +/* ACB4A8 80240988 46202032 */ c.eq.d $f4, $f0 +/* ACB4AC 8024098C 00000000 */ nop +/* ACB4B0 80240990 45000008 */ bc1f .L802409B4 +/* ACB4B4 80240994 00000000 */ nop +.L80240998: +/* ACB4B8 80240998 4618A03E */ c.le.s $f20, $f24 +/* ACB4BC 8024099C 00000000 */ nop +/* ACB4C0 802409A0 4500000C */ bc1f .L802409D4 +/* ACB4C4 802409A4 0000882D */ daddu $s1, $zero, $zero +/* ACB4C8 802409A8 4616103E */ c.le.s $f2, $f22 +/* ACB4CC 802409AC 08090273 */ j .L802409CC +/* ACB4D0 802409B0 00000000 */ nop +.L802409B4: +/* ACB4D4 802409B4 4618103E */ c.le.s $f2, $f24 +/* ACB4D8 802409B8 00000000 */ nop +/* ACB4DC 802409BC 45000005 */ bc1f .L802409D4 +/* ACB4E0 802409C0 0000882D */ daddu $s1, $zero, $zero +/* ACB4E4 802409C4 4616A03E */ c.le.s $f20, $f22 +/* ACB4E8 802409C8 00000000 */ nop +.L802409CC: +/* ACB4EC 802409CC 45030001 */ bc1tl .L802409D4 +/* ACB4F0 802409D0 24110001 */ addiu $s1, $zero, 1 +.L802409D4: +/* ACB4F4 802409D4 12200027 */ beqz $s1, .L80240A74 +/* ACB4F8 802409D8 0260202D */ daddu $a0, $s3, $zero +/* ACB4FC 802409DC C60C0038 */ lwc1 $f12, 0x38($s0) +/* ACB500 802409E0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* ACB504 802409E4 8E460028 */ lw $a2, 0x28($s2) +/* ACB508 802409E8 8E470030 */ lw $a3, 0x30($s2) +/* ACB50C 802409EC C602003C */ lwc1 $f2, 0x3c($s0) +/* ACB510 802409F0 46006006 */ mov.s $f0, $f12 +/* ACB514 802409F4 46007106 */ mov.s $f4, $f14 +/* ACB518 802409F8 E7A00020 */ swc1 $f0, 0x20($sp) +/* ACB51C 802409FC E7A20028 */ swc1 $f2, 0x28($sp) +/* ACB520 80240A00 0C00A7B5 */ jal dist2D +/* ACB524 80240A04 E7A40024 */ swc1 $f4, 0x24($sp) +/* ACB528 80240A08 C60C0038 */ lwc1 $f12, 0x38($s0) +/* ACB52C 80240A0C C60E0040 */ lwc1 $f14, 0x40($s0) +/* ACB530 80240A10 8E460028 */ lw $a2, 0x28($s2) +/* ACB534 80240A14 8E470030 */ lw $a3, 0x30($s2) +/* ACB538 80240A18 0C00A720 */ jal atan2 +/* ACB53C 80240A1C 46000506 */ mov.s $f20, $f0 +/* ACB540 80240A20 3C040007 */ lui $a0, 7 +/* ACB544 80240A24 34848000 */ ori $a0, $a0, 0x8000 +/* ACB548 80240A28 27A50020 */ addiu $a1, $sp, 0x20 +/* ACB54C 80240A2C E7B40010 */ swc1 $f20, 0x10($sp) +/* ACB550 80240A30 E7A00014 */ swc1 $f0, 0x14($sp) +/* ACB554 80240A34 860200A6 */ lh $v0, 0xa6($s0) +/* ACB558 80240A38 27A60028 */ addiu $a2, $sp, 0x28 +/* ACB55C 80240A3C 44820000 */ mtc1 $v0, $f0 +/* ACB560 80240A40 00000000 */ nop +/* ACB564 80240A44 46800020 */ cvt.s.w $f0, $f0 +/* ACB568 80240A48 E7A00018 */ swc1 $f0, 0x18($sp) +/* ACB56C 80240A4C 860200A8 */ lh $v0, 0xa8($s0) +/* ACB570 80240A50 27A70024 */ addiu $a3, $sp, 0x24 +/* ACB574 80240A54 44820000 */ mtc1 $v0, $f0 +/* ACB578 80240A58 00000000 */ nop +/* ACB57C 80240A5C 46800020 */ cvt.s.w $f0, $f0 +/* ACB580 80240A60 0C0376B9 */ jal func_800DDAE4 +/* ACB584 80240A64 E7A0001C */ swc1 $f0, 0x1c($sp) +/* ACB588 80240A68 54400001 */ bnel $v0, $zero, .L80240A70 +/* ACB58C 80240A6C 0000882D */ daddu $s1, $zero, $zero +.L80240A70: +/* ACB590 80240A70 0260202D */ daddu $a0, $s3, $zero +.L80240A74: +/* ACB594 80240A74 0280282D */ daddu $a1, $s4, $zero +/* ACB598 80240A78 0C0B2026 */ jal set_variable +/* ACB59C 80240A7C 0220302D */ daddu $a2, $s1, $zero +/* ACB5A0 80240A80 8FBF0044 */ lw $ra, 0x44($sp) +/* ACB5A4 80240A84 8FB40040 */ lw $s4, 0x40($sp) +/* ACB5A8 80240A88 8FB3003C */ lw $s3, 0x3c($sp) +/* ACB5AC 80240A8C 8FB20038 */ lw $s2, 0x38($sp) +/* ACB5B0 80240A90 8FB10034 */ lw $s1, 0x34($sp) +/* ACB5B4 80240A94 8FB00030 */ lw $s0, 0x30($sp) +/* ACB5B8 80240A98 D7B80058 */ ldc1 $f24, 0x58($sp) +/* ACB5BC 80240A9C D7B60050 */ ldc1 $f22, 0x50($sp) +/* ACB5C0 80240AA0 D7B40048 */ ldc1 $f20, 0x48($sp) +/* ACB5C4 80240AA4 24020002 */ addiu $v0, $zero, 2 +/* ACB5C8 80240AA8 03E00008 */ jr $ra +/* ACB5CC 80240AAC 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s index 3f189e02b8..3626685983 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240B5C_ACB67C.s @@ -105,7 +105,7 @@ glabel func_80240B5C_ACB67C /* ACB808 80240CE8 46200020 */ cvt.s.d $f0, $f0 /* ACB80C 80240CEC E7A00010 */ swc1 $f0, 0x10($sp) /* ACB810 80240CF0 8E26003C */ lw $a2, 0x3c($s1) -/* ACB814 80240CF4 0C0902AC */ jal func_80240AB0 +/* ACB814 80240CF4 0C0902AC */ jal func_80240AB0_ACB5D0 /* ACB818 80240CF8 02C0202D */ daddu $a0, $s6, $zero /* ACB81C 80240CFC 02A0202D */ daddu $a0, $s5, $zero /* ACB820 80240D00 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34.s deleted file mode 100644 index 6ab68b4e18..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E34 -/* ACB954 80240E34 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* ACB958 80240E38 AFB10014 */ sw $s1, 0x14($sp) -/* ACB95C 80240E3C 0080882D */ daddu $s1, $a0, $zero -/* ACB960 80240E40 AFBF0024 */ sw $ra, 0x24($sp) -/* ACB964 80240E44 AFB40020 */ sw $s4, 0x20($sp) -/* ACB968 80240E48 AFB3001C */ sw $s3, 0x1c($sp) -/* ACB96C 80240E4C AFB20018 */ sw $s2, 0x18($sp) -/* ACB970 80240E50 AFB00010 */ sw $s0, 0x10($sp) -/* ACB974 80240E54 8E30000C */ lw $s0, 0xc($s1) -/* ACB978 80240E58 8E140000 */ lw $s4, ($s0) -/* ACB97C 80240E5C 26100004 */ addiu $s0, $s0, 4 -/* ACB980 80240E60 8E050000 */ lw $a1, ($s0) -/* ACB984 80240E64 0C0B1EAF */ jal get_variable -/* ACB988 80240E68 26100004 */ addiu $s0, $s0, 4 -/* ACB98C 80240E6C 8E050000 */ lw $a1, ($s0) -/* ACB990 80240E70 26100004 */ addiu $s0, $s0, 4 -/* ACB994 80240E74 0220202D */ daddu $a0, $s1, $zero -/* ACB998 80240E78 0C0B1EAF */ jal get_variable -/* ACB99C 80240E7C 0040982D */ daddu $s3, $v0, $zero -/* ACB9A0 80240E80 8E050000 */ lw $a1, ($s0) -/* ACB9A4 80240E84 26100004 */ addiu $s0, $s0, 4 -/* ACB9A8 80240E88 0220202D */ daddu $a0, $s1, $zero -/* ACB9AC 80240E8C 0C0B1EAF */ jal get_variable -/* ACB9B0 80240E90 0040902D */ daddu $s2, $v0, $zero -/* ACB9B4 80240E94 0220202D */ daddu $a0, $s1, $zero -/* ACB9B8 80240E98 8E050000 */ lw $a1, ($s0) -/* ACB9BC 80240E9C 0C0B1EAF */ jal get_variable -/* ACB9C0 80240EA0 0040802D */ daddu $s0, $v0, $zero -/* ACB9C4 80240EA4 44901000 */ mtc1 $s0, $f2 -/* ACB9C8 80240EA8 00000000 */ nop -/* ACB9CC 80240EAC 468010A0 */ cvt.s.w $f2, $f2 -/* ACB9D0 80240EB0 44936000 */ mtc1 $s3, $f12 -/* ACB9D4 80240EB4 00000000 */ nop -/* ACB9D8 80240EB8 46806320 */ cvt.s.w $f12, $f12 -/* ACB9DC 80240EBC 44061000 */ mfc1 $a2, $f2 -/* ACB9E0 80240EC0 44821000 */ mtc1 $v0, $f2 -/* ACB9E4 80240EC4 00000000 */ nop -/* ACB9E8 80240EC8 468010A0 */ cvt.s.w $f2, $f2 -/* ACB9EC 80240ECC 44071000 */ mfc1 $a3, $f2 -/* ACB9F0 80240ED0 44927000 */ mtc1 $s2, $f14 -/* ACB9F4 80240ED4 00000000 */ nop -/* ACB9F8 80240ED8 0C00A720 */ jal atan2 -/* ACB9FC 80240EDC 468073A0 */ cvt.s.w $f14, $f14 -/* ACBA00 80240EE0 0220202D */ daddu $a0, $s1, $zero -/* ACBA04 80240EE4 4600008D */ trunc.w.s $f2, $f0 -/* ACBA08 80240EE8 44061000 */ mfc1 $a2, $f2 -/* ACBA0C 80240EEC 0C0B2026 */ jal set_variable -/* ACBA10 80240EF0 0280282D */ daddu $a1, $s4, $zero -/* ACBA14 80240EF4 8FBF0024 */ lw $ra, 0x24($sp) -/* ACBA18 80240EF8 8FB40020 */ lw $s4, 0x20($sp) -/* ACBA1C 80240EFC 8FB3001C */ lw $s3, 0x1c($sp) -/* ACBA20 80240F00 8FB20018 */ lw $s2, 0x18($sp) -/* ACBA24 80240F04 8FB10014 */ lw $s1, 0x14($sp) -/* ACBA28 80240F08 8FB00010 */ lw $s0, 0x10($sp) -/* ACBA2C 80240F0C 24020002 */ addiu $v0, $zero, 2 -/* ACBA30 80240F10 03E00008 */ jr $ra -/* ACBA34 80240F14 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s new file mode 100644 index 0000000000..4b40b203e4 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240E34_ACB954.s @@ -0,0 +1,61 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E34_ACB954 +/* ACB954 80240E34 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* ACB958 80240E38 AFB10014 */ sw $s1, 0x14($sp) +/* ACB95C 80240E3C 0080882D */ daddu $s1, $a0, $zero +/* ACB960 80240E40 AFBF0024 */ sw $ra, 0x24($sp) +/* ACB964 80240E44 AFB40020 */ sw $s4, 0x20($sp) +/* ACB968 80240E48 AFB3001C */ sw $s3, 0x1c($sp) +/* ACB96C 80240E4C AFB20018 */ sw $s2, 0x18($sp) +/* ACB970 80240E50 AFB00010 */ sw $s0, 0x10($sp) +/* ACB974 80240E54 8E30000C */ lw $s0, 0xc($s1) +/* ACB978 80240E58 8E140000 */ lw $s4, ($s0) +/* ACB97C 80240E5C 26100004 */ addiu $s0, $s0, 4 +/* ACB980 80240E60 8E050000 */ lw $a1, ($s0) +/* ACB984 80240E64 0C0B1EAF */ jal get_variable +/* ACB988 80240E68 26100004 */ addiu $s0, $s0, 4 +/* ACB98C 80240E6C 8E050000 */ lw $a1, ($s0) +/* ACB990 80240E70 26100004 */ addiu $s0, $s0, 4 +/* ACB994 80240E74 0220202D */ daddu $a0, $s1, $zero +/* ACB998 80240E78 0C0B1EAF */ jal get_variable +/* ACB99C 80240E7C 0040982D */ daddu $s3, $v0, $zero +/* ACB9A0 80240E80 8E050000 */ lw $a1, ($s0) +/* ACB9A4 80240E84 26100004 */ addiu $s0, $s0, 4 +/* ACB9A8 80240E88 0220202D */ daddu $a0, $s1, $zero +/* ACB9AC 80240E8C 0C0B1EAF */ jal get_variable +/* ACB9B0 80240E90 0040902D */ daddu $s2, $v0, $zero +/* ACB9B4 80240E94 0220202D */ daddu $a0, $s1, $zero +/* ACB9B8 80240E98 8E050000 */ lw $a1, ($s0) +/* ACB9BC 80240E9C 0C0B1EAF */ jal get_variable +/* ACB9C0 80240EA0 0040802D */ daddu $s0, $v0, $zero +/* ACB9C4 80240EA4 44901000 */ mtc1 $s0, $f2 +/* ACB9C8 80240EA8 00000000 */ nop +/* ACB9CC 80240EAC 468010A0 */ cvt.s.w $f2, $f2 +/* ACB9D0 80240EB0 44936000 */ mtc1 $s3, $f12 +/* ACB9D4 80240EB4 00000000 */ nop +/* ACB9D8 80240EB8 46806320 */ cvt.s.w $f12, $f12 +/* ACB9DC 80240EBC 44061000 */ mfc1 $a2, $f2 +/* ACB9E0 80240EC0 44821000 */ mtc1 $v0, $f2 +/* ACB9E4 80240EC4 00000000 */ nop +/* ACB9E8 80240EC8 468010A0 */ cvt.s.w $f2, $f2 +/* ACB9EC 80240ECC 44071000 */ mfc1 $a3, $f2 +/* ACB9F0 80240ED0 44927000 */ mtc1 $s2, $f14 +/* ACB9F4 80240ED4 00000000 */ nop +/* ACB9F8 80240ED8 0C00A720 */ jal atan2 +/* ACB9FC 80240EDC 468073A0 */ cvt.s.w $f14, $f14 +/* ACBA00 80240EE0 0220202D */ daddu $a0, $s1, $zero +/* ACBA04 80240EE4 4600008D */ trunc.w.s $f2, $f0 +/* ACBA08 80240EE8 44061000 */ mfc1 $a2, $f2 +/* ACBA0C 80240EEC 0C0B2026 */ jal set_variable +/* ACBA10 80240EF0 0280282D */ daddu $a1, $s4, $zero +/* ACBA14 80240EF4 8FBF0024 */ lw $ra, 0x24($sp) +/* ACBA18 80240EF8 8FB40020 */ lw $s4, 0x20($sp) +/* ACBA1C 80240EFC 8FB3001C */ lw $s3, 0x1c($sp) +/* ACBA20 80240F00 8FB20018 */ lw $s2, 0x18($sp) +/* ACBA24 80240F04 8FB10014 */ lw $s1, 0x14($sp) +/* ACBA28 80240F08 8FB00010 */ lw $s0, 0x10($sp) +/* ACBA2C 80240F0C 24020002 */ addiu $v0, $zero, 2 +/* ACBA30 80240F10 03E00008 */ jr $ra +/* ACBA34 80240F14 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18.s deleted file mode 100644 index 00a95b6620..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F18 -/* ACBA38 80240F18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ACBA3C 80240F1C AFBF0010 */ sw $ra, 0x10($sp) -/* ACBA40 80240F20 8C82000C */ lw $v0, 0xc($a0) -/* ACBA44 80240F24 3C068011 */ lui $a2, 0x8011 -/* ACBA48 80240F28 80C6EFD4 */ lb $a2, -0x102c($a2) -/* ACBA4C 80240F2C 0C0B2026 */ jal set_variable -/* ACBA50 80240F30 8C450000 */ lw $a1, ($v0) -/* ACBA54 80240F34 8FBF0010 */ lw $ra, 0x10($sp) -/* ACBA58 80240F38 24020002 */ addiu $v0, $zero, 2 -/* ACBA5C 80240F3C 03E00008 */ jr $ra -/* ACBA60 80240F40 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s new file mode 100644 index 0000000000..9d39c1729e --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F18_ACBA38 +/* ACBA38 80240F18 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* ACBA3C 80240F1C AFBF0010 */ sw $ra, 0x10($sp) +/* ACBA40 80240F20 8C82000C */ lw $v0, 0xc($a0) +/* ACBA44 80240F24 3C068011 */ lui $a2, 0x8011 +/* ACBA48 80240F28 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ACBA4C 80240F2C 0C0B2026 */ jal set_variable +/* ACBA50 80240F30 8C450000 */ lw $a1, ($v0) +/* ACBA54 80240F34 8FBF0010 */ lw $ra, 0x10($sp) +/* ACBA58 80240F38 24020002 */ addiu $v0, $zero, 2 +/* ACBA5C 80240F3C 03E00008 */ jr $ra +/* ACBA60 80240F40 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F44.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F44.s deleted file mode 100644 index 3373e83e52..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F44.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F44 -/* ACBA64 80240F44 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* ACBA68 80240F48 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* ACBA6C 80240F4C 9062007E */ lbu $v0, 0x7e($v1) -/* ACBA70 80240F50 34420008 */ ori $v0, $v0, 8 -/* ACBA74 80240F54 A062007E */ sb $v0, 0x7e($v1) -/* ACBA78 80240F58 03E00008 */ jr $ra -/* ACBA7C 80240F5C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F44_ACBA64.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F44_ACBA64.s new file mode 100644 index 0000000000..58fe721ed9 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F44_ACBA64.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F44_ACBA64 +/* ACBA64 80240F44 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* ACBA68 80240F48 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* ACBA6C 80240F4C 9062007E */ lbu $v0, 0x7e($v1) +/* ACBA70 80240F50 34420008 */ ori $v0, $v0, 8 +/* ACBA74 80240F54 A062007E */ sb $v0, 0x7e($v1) +/* ACBA78 80240F58 03E00008 */ jr $ra +/* ACBA7C 80240F5C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60.s deleted file mode 100644 index 66b8dbd8c9..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F60 -/* ACBA80 80240F60 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* ACBA84 80240F64 AFB3001C */ sw $s3, 0x1c($sp) -/* ACBA88 80240F68 0080982D */ daddu $s3, $a0, $zero -/* ACBA8C 80240F6C AFBF0030 */ sw $ra, 0x30($sp) -/* ACBA90 80240F70 AFB7002C */ sw $s7, 0x2c($sp) -/* ACBA94 80240F74 AFB60028 */ sw $s6, 0x28($sp) -/* ACBA98 80240F78 AFB50024 */ sw $s5, 0x24($sp) -/* ACBA9C 80240F7C AFB40020 */ sw $s4, 0x20($sp) -/* ACBAA0 80240F80 AFB20018 */ sw $s2, 0x18($sp) -/* ACBAA4 80240F84 AFB10014 */ sw $s1, 0x14($sp) -/* ACBAA8 80240F88 AFB00010 */ sw $s0, 0x10($sp) -/* ACBAAC 80240F8C F7B80048 */ sdc1 $f24, 0x48($sp) -/* ACBAB0 80240F90 F7B60040 */ sdc1 $f22, 0x40($sp) -/* ACBAB4 80240F94 F7B40038 */ sdc1 $f20, 0x38($sp) -/* ACBAB8 80240F98 8E70000C */ lw $s0, 0xc($s3) -/* ACBABC 80240F9C 8E050000 */ lw $a1, ($s0) -/* ACBAC0 80240FA0 0C0B1EAF */ jal get_variable -/* ACBAC4 80240FA4 26100004 */ addiu $s0, $s0, 4 -/* ACBAC8 80240FA8 8E150000 */ lw $s5, ($s0) -/* ACBACC 80240FAC 26100004 */ addiu $s0, $s0, 4 -/* ACBAD0 80240FB0 0260202D */ daddu $a0, $s3, $zero -/* ACBAD4 80240FB4 8E160000 */ lw $s6, ($s0) -/* ACBAD8 80240FB8 8E170004 */ lw $s7, 4($s0) -/* ACBADC 80240FBC 0C0B36B0 */ jal resolve_npc -/* ACBAE0 80240FC0 0040282D */ daddu $a1, $v0, $zero -/* ACBAE4 80240FC4 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* ACBAE8 80240FC8 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* ACBAEC 80240FCC 0040802D */ daddu $s0, $v0, $zero -/* ACBAF0 80240FD0 1200002F */ beqz $s0, .L80241090 -/* ACBAF4 80240FD4 0220902D */ daddu $s2, $s1, $zero -/* ACBAF8 80240FD8 C62C0028 */ lwc1 $f12, 0x28($s1) -/* ACBAFC 80240FDC C62E0030 */ lwc1 $f14, 0x30($s1) -/* ACBB00 80240FE0 8E060038 */ lw $a2, 0x38($s0) -/* ACBB04 80240FE4 8E070040 */ lw $a3, 0x40($s0) -/* ACBB08 80240FE8 3C0142C8 */ lui $at, 0x42c8 -/* ACBB0C 80240FEC 4481C000 */ mtc1 $at, $f24 -/* ACBB10 80240FF0 0C00A7B5 */ jal dist2D -/* ACBB14 80240FF4 24140001 */ addiu $s4, $zero, 1 -/* ACBB18 80240FF8 4618003C */ c.lt.s $f0, $f24 -/* ACBB1C 80240FFC 00000000 */ nop -/* ACBB20 80241000 45030001 */ bc1tl .L80241008 -/* ACBB24 80241004 0000A02D */ daddu $s4, $zero, $zero -.L80241008: -/* ACBB28 80241008 C64C0028 */ lwc1 $f12, 0x28($s2) -/* ACBB2C 8024100C C64E0030 */ lwc1 $f14, 0x30($s2) -/* ACBB30 80241010 8E060038 */ lw $a2, 0x38($s0) -/* ACBB34 80241014 0C00A720 */ jal atan2 -/* ACBB38 80241018 8E070040 */ lw $a3, 0x40($s0) -/* ACBB3C 8024101C 0C00A6C9 */ jal clamp_angle -/* ACBB40 80241020 46000306 */ mov.s $f12, $f0 -/* ACBB44 80241024 46000506 */ mov.s $f20, $f0 -/* ACBB48 80241028 0C00A8BB */ jal sin_deg -/* ACBB4C 8024102C 4600A306 */ mov.s $f12, $f20 -/* ACBB50 80241030 46180002 */ mul.s $f0, $f0, $f24 -/* ACBB54 80241034 00000000 */ nop -/* ACBB58 80241038 C6560028 */ lwc1 $f22, 0x28($s2) -/* ACBB5C 8024103C 4600B580 */ add.s $f22, $f22, $f0 -/* ACBB60 80241040 0C00A8D4 */ jal cos_deg -/* ACBB64 80241044 4600A306 */ mov.s $f12, $f20 -/* ACBB68 80241048 46180002 */ mul.s $f0, $f0, $f24 -/* ACBB6C 8024104C 00000000 */ nop -/* ACBB70 80241050 0260202D */ daddu $a0, $s3, $zero -/* ACBB74 80241054 02A0282D */ daddu $a1, $s5, $zero -/* ACBB78 80241058 C6540030 */ lwc1 $f20, 0x30($s2) -/* ACBB7C 8024105C 0280302D */ daddu $a2, $s4, $zero -/* ACBB80 80241060 0C0B2026 */ jal set_variable -/* ACBB84 80241064 4600A501 */ sub.s $f20, $f20, $f0 -/* ACBB88 80241068 0260202D */ daddu $a0, $s3, $zero -/* ACBB8C 8024106C 4600B08D */ trunc.w.s $f2, $f22 -/* ACBB90 80241070 44061000 */ mfc1 $a2, $f2 -/* ACBB94 80241074 0C0B2026 */ jal set_variable -/* ACBB98 80241078 02C0282D */ daddu $a1, $s6, $zero -/* ACBB9C 8024107C 0260202D */ daddu $a0, $s3, $zero -/* ACBBA0 80241080 4600A08D */ trunc.w.s $f2, $f20 -/* ACBBA4 80241084 44061000 */ mfc1 $a2, $f2 -/* ACBBA8 80241088 0C0B2026 */ jal set_variable -/* ACBBAC 8024108C 02E0282D */ daddu $a1, $s7, $zero -.L80241090: -/* ACBBB0 80241090 24020002 */ addiu $v0, $zero, 2 -/* ACBBB4 80241094 8FBF0030 */ lw $ra, 0x30($sp) -/* ACBBB8 80241098 8FB7002C */ lw $s7, 0x2c($sp) -/* ACBBBC 8024109C 8FB60028 */ lw $s6, 0x28($sp) -/* ACBBC0 802410A0 8FB50024 */ lw $s5, 0x24($sp) -/* ACBBC4 802410A4 8FB40020 */ lw $s4, 0x20($sp) -/* ACBBC8 802410A8 8FB3001C */ lw $s3, 0x1c($sp) -/* ACBBCC 802410AC 8FB20018 */ lw $s2, 0x18($sp) -/* ACBBD0 802410B0 8FB10014 */ lw $s1, 0x14($sp) -/* ACBBD4 802410B4 8FB00010 */ lw $s0, 0x10($sp) -/* ACBBD8 802410B8 D7B80048 */ ldc1 $f24, 0x48($sp) -/* ACBBDC 802410BC D7B60040 */ ldc1 $f22, 0x40($sp) -/* ACBBE0 802410C0 D7B40038 */ ldc1 $f20, 0x38($sp) -/* ACBBE4 802410C4 03E00008 */ jr $ra -/* ACBBE8 802410C8 27BD0050 */ addiu $sp, $sp, 0x50 -/* ACBBEC 802410CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s new file mode 100644 index 0000000000..7cb5b425c4 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F60_ACBA80.s @@ -0,0 +1,98 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F60_ACBA80 +/* ACBA80 80240F60 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* ACBA84 80240F64 AFB3001C */ sw $s3, 0x1c($sp) +/* ACBA88 80240F68 0080982D */ daddu $s3, $a0, $zero +/* ACBA8C 80240F6C AFBF0030 */ sw $ra, 0x30($sp) +/* ACBA90 80240F70 AFB7002C */ sw $s7, 0x2c($sp) +/* ACBA94 80240F74 AFB60028 */ sw $s6, 0x28($sp) +/* ACBA98 80240F78 AFB50024 */ sw $s5, 0x24($sp) +/* ACBA9C 80240F7C AFB40020 */ sw $s4, 0x20($sp) +/* ACBAA0 80240F80 AFB20018 */ sw $s2, 0x18($sp) +/* ACBAA4 80240F84 AFB10014 */ sw $s1, 0x14($sp) +/* ACBAA8 80240F88 AFB00010 */ sw $s0, 0x10($sp) +/* ACBAAC 80240F8C F7B80048 */ sdc1 $f24, 0x48($sp) +/* ACBAB0 80240F90 F7B60040 */ sdc1 $f22, 0x40($sp) +/* ACBAB4 80240F94 F7B40038 */ sdc1 $f20, 0x38($sp) +/* ACBAB8 80240F98 8E70000C */ lw $s0, 0xc($s3) +/* ACBABC 80240F9C 8E050000 */ lw $a1, ($s0) +/* ACBAC0 80240FA0 0C0B1EAF */ jal get_variable +/* ACBAC4 80240FA4 26100004 */ addiu $s0, $s0, 4 +/* ACBAC8 80240FA8 8E150000 */ lw $s5, ($s0) +/* ACBACC 80240FAC 26100004 */ addiu $s0, $s0, 4 +/* ACBAD0 80240FB0 0260202D */ daddu $a0, $s3, $zero +/* ACBAD4 80240FB4 8E160000 */ lw $s6, ($s0) +/* ACBAD8 80240FB8 8E170004 */ lw $s7, 4($s0) +/* ACBADC 80240FBC 0C0B36B0 */ jal resolve_npc +/* ACBAE0 80240FC0 0040282D */ daddu $a1, $v0, $zero +/* ACBAE4 80240FC4 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* ACBAE8 80240FC8 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* ACBAEC 80240FCC 0040802D */ daddu $s0, $v0, $zero +/* ACBAF0 80240FD0 1200002F */ beqz $s0, .L80241090 +/* ACBAF4 80240FD4 0220902D */ daddu $s2, $s1, $zero +/* ACBAF8 80240FD8 C62C0028 */ lwc1 $f12, 0x28($s1) +/* ACBAFC 80240FDC C62E0030 */ lwc1 $f14, 0x30($s1) +/* ACBB00 80240FE0 8E060038 */ lw $a2, 0x38($s0) +/* ACBB04 80240FE4 8E070040 */ lw $a3, 0x40($s0) +/* ACBB08 80240FE8 3C0142C8 */ lui $at, 0x42c8 +/* ACBB0C 80240FEC 4481C000 */ mtc1 $at, $f24 +/* ACBB10 80240FF0 0C00A7B5 */ jal dist2D +/* ACBB14 80240FF4 24140001 */ addiu $s4, $zero, 1 +/* ACBB18 80240FF8 4618003C */ c.lt.s $f0, $f24 +/* ACBB1C 80240FFC 00000000 */ nop +/* ACBB20 80241000 45030001 */ bc1tl .L80241008 +/* ACBB24 80241004 0000A02D */ daddu $s4, $zero, $zero +.L80241008: +/* ACBB28 80241008 C64C0028 */ lwc1 $f12, 0x28($s2) +/* ACBB2C 8024100C C64E0030 */ lwc1 $f14, 0x30($s2) +/* ACBB30 80241010 8E060038 */ lw $a2, 0x38($s0) +/* ACBB34 80241014 0C00A720 */ jal atan2 +/* ACBB38 80241018 8E070040 */ lw $a3, 0x40($s0) +/* ACBB3C 8024101C 0C00A6C9 */ jal clamp_angle +/* ACBB40 80241020 46000306 */ mov.s $f12, $f0 +/* ACBB44 80241024 46000506 */ mov.s $f20, $f0 +/* ACBB48 80241028 0C00A8BB */ jal sin_deg +/* ACBB4C 8024102C 4600A306 */ mov.s $f12, $f20 +/* ACBB50 80241030 46180002 */ mul.s $f0, $f0, $f24 +/* ACBB54 80241034 00000000 */ nop +/* ACBB58 80241038 C6560028 */ lwc1 $f22, 0x28($s2) +/* ACBB5C 8024103C 4600B580 */ add.s $f22, $f22, $f0 +/* ACBB60 80241040 0C00A8D4 */ jal cos_deg +/* ACBB64 80241044 4600A306 */ mov.s $f12, $f20 +/* ACBB68 80241048 46180002 */ mul.s $f0, $f0, $f24 +/* ACBB6C 8024104C 00000000 */ nop +/* ACBB70 80241050 0260202D */ daddu $a0, $s3, $zero +/* ACBB74 80241054 02A0282D */ daddu $a1, $s5, $zero +/* ACBB78 80241058 C6540030 */ lwc1 $f20, 0x30($s2) +/* ACBB7C 8024105C 0280302D */ daddu $a2, $s4, $zero +/* ACBB80 80241060 0C0B2026 */ jal set_variable +/* ACBB84 80241064 4600A501 */ sub.s $f20, $f20, $f0 +/* ACBB88 80241068 0260202D */ daddu $a0, $s3, $zero +/* ACBB8C 8024106C 4600B08D */ trunc.w.s $f2, $f22 +/* ACBB90 80241070 44061000 */ mfc1 $a2, $f2 +/* ACBB94 80241074 0C0B2026 */ jal set_variable +/* ACBB98 80241078 02C0282D */ daddu $a1, $s6, $zero +/* ACBB9C 8024107C 0260202D */ daddu $a0, $s3, $zero +/* ACBBA0 80241080 4600A08D */ trunc.w.s $f2, $f20 +/* ACBBA4 80241084 44061000 */ mfc1 $a2, $f2 +/* ACBBA8 80241088 0C0B2026 */ jal set_variable +/* ACBBAC 8024108C 02E0282D */ daddu $a1, $s7, $zero +.L80241090: +/* ACBBB0 80241090 24020002 */ addiu $v0, $zero, 2 +/* ACBBB4 80241094 8FBF0030 */ lw $ra, 0x30($sp) +/* ACBBB8 80241098 8FB7002C */ lw $s7, 0x2c($sp) +/* ACBBBC 8024109C 8FB60028 */ lw $s6, 0x28($sp) +/* ACBBC0 802410A0 8FB50024 */ lw $s5, 0x24($sp) +/* ACBBC4 802410A4 8FB40020 */ lw $s4, 0x20($sp) +/* ACBBC8 802410A8 8FB3001C */ lw $s3, 0x1c($sp) +/* ACBBCC 802410AC 8FB20018 */ lw $s2, 0x18($sp) +/* ACBBD0 802410B0 8FB10014 */ lw $s1, 0x14($sp) +/* ACBBD4 802410B4 8FB00010 */ lw $s0, 0x10($sp) +/* ACBBD8 802410B8 D7B80048 */ ldc1 $f24, 0x48($sp) +/* ACBBDC 802410BC D7B60040 */ ldc1 $f22, 0x40($sp) +/* ACBBE0 802410C0 D7B40038 */ ldc1 $f20, 0x38($sp) +/* ACBBE4 802410C4 03E00008 */ jr $ra +/* ACBBE8 802410C8 27BD0050 */ addiu $sp, $sp, 0x50 +/* ACBBEC 802410CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s index f5a6010f7e..296eb00a34 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE1F0/func_8024036C_ACE4AC.s @@ -105,7 +105,7 @@ glabel func_8024036C_ACE4AC /* ACE638 802404F8 46200020 */ cvt.s.d $f0, $f0 /* ACE63C 802404FC E7A00010 */ swc1 $f0, 0x10($sp) /* ACE640 80240500 8E26003C */ lw $a2, 0x3c($s1) -/* ACE644 80240504 0C0900B0 */ jal func_802402C0 +/* ACE644 80240504 0C0900B0 */ jal func_802402C0_ACE400 /* ACE648 80240508 02C0202D */ daddu $a0, $s6, $zero /* ACE64C 8024050C 02A0202D */ daddu $a0, $s5, $zero /* ACE650 80240510 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s index 614e5747ca..0669df4af7 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240B5C_ACEC9C.s @@ -105,7 +105,7 @@ glabel func_80240B5C_ACEC9C /* ACEE28 80240CE8 46200020 */ cvt.s.d $f0, $f0 /* ACEE2C 80240CEC E7A00010 */ swc1 $f0, 0x10($sp) /* ACEE30 80240CF0 8E26003C */ lw $a2, 0x3c($s1) -/* ACEE34 80240CF4 0C0902AC */ jal func_80240AB0 +/* ACEE34 80240CF4 0C0902AC */ jal func_80240AB0_ACEBF0 /* ACEE38 80240CF8 02C0202D */ daddu $a0, $s6, $zero /* ACEE3C 80240CFC 02A0202D */ daddu $a0, $s5, $zero /* ACEE40 80240D00 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s index 3dd298650d..34e4f436b5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024032C_AD43BC.s @@ -105,7 +105,7 @@ glabel func_8024032C_AD43BC /* AD4548 802404B8 46200020 */ cvt.s.d $f0, $f0 /* AD454C 802404BC E7A00010 */ swc1 $f0, 0x10($sp) /* AD4550 802404C0 8E26003C */ lw $a2, 0x3c($s1) -/* AD4554 802404C4 0C0900A0 */ jal func_80240280 +/* AD4554 802404C4 0C0900A0 */ jal func_80240280_AD4310 /* AD4558 802404C8 02C0202D */ daddu $a0, $s6, $zero /* AD455C 802404CC 02A0202D */ daddu $a0, $s5, $zero /* AD4560 802404D0 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024089C.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024089C.s deleted file mode 100644 index 1adc2ffd6f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024089C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024089C -/* AD492C 8024089C 3C028015 */ lui $v0, %hi(D_80151328) -/* AD4930 802408A0 8C421328 */ lw $v0, %lo(D_80151328)($v0) -/* AD4934 802408A4 A040001C */ sb $zero, 0x1c($v0) -/* AD4938 802408A8 03E00008 */ jr $ra -/* AD493C 802408AC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024089C_AD492C.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024089C_AD492C.s new file mode 100644 index 0000000000..bc332fa039 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_8024089C_AD492C.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024089C_AD492C +/* AD492C 8024089C 3C028015 */ lui $v0, %hi(D_80151328) +/* AD4930 802408A0 8C421328 */ lw $v0, %lo(D_80151328)($v0) +/* AD4934 802408A4 A040001C */ sb $zero, 0x1c($v0) +/* AD4938 802408A8 03E00008 */ jr $ra +/* AD493C 802408AC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028.s deleted file mode 100644 index 9826776f6a..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240028 -/* AED438 80240028 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AED43C 8024002C AFBF0010 */ sw $ra, 0x10($sp) -/* AED440 80240030 8C82000C */ lw $v0, 0xc($a0) -/* AED444 80240034 0C0B210B */ jal get_float_variable -/* AED448 80240038 8C450000 */ lw $a1, ($v0) -/* AED44C 8024003C 8FBF0010 */ lw $ra, 0x10($sp) -/* AED450 80240040 4600008D */ trunc.w.s $f2, $f0 -/* AED454 80240044 44021000 */ mfc1 $v0, $f2 -/* AED458 80240048 00000000 */ nop -/* AED45C 8024004C 3C018011 */ lui $at, 0x8011 -/* AED460 80240050 A022EFD5 */ sb $v0, -0x102b($at) -/* AED464 80240054 24020002 */ addiu $v0, $zero, 2 -/* AED468 80240058 03E00008 */ jr $ra -/* AED46C 8024005C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s new file mode 100644 index 0000000000..7b606c7ce4 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240028_AED438 +/* AED438 80240028 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* AED43C 8024002C AFBF0010 */ sw $ra, 0x10($sp) +/* AED440 80240030 8C82000C */ lw $v0, 0xc($a0) +/* AED444 80240034 0C0B210B */ jal get_float_variable +/* AED448 80240038 8C450000 */ lw $a1, ($v0) +/* AED44C 8024003C 8FBF0010 */ lw $ra, 0x10($sp) +/* AED450 80240040 4600008D */ trunc.w.s $f2, $f0 +/* AED454 80240044 44021000 */ mfc1 $v0, $f2 +/* AED458 80240048 00000000 */ nop +/* AED45C 8024004C 3C018011 */ lui $at, 0x8011 +/* AED460 80240050 A022EFD5 */ sb $v0, -0x102b($at) +/* AED464 80240054 24020002 */ addiu $v0, $zero, 2 +/* AED468 80240058 03E00008 */ jr $ra +/* AED46C 8024005C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s index 108fb45edb..8a9cd0d335 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_8024031C_AED72C.s @@ -105,7 +105,7 @@ glabel func_8024031C_AED72C /* AED8B8 802404A8 46200020 */ cvt.s.d $f0, $f0 /* AED8BC 802404AC E7A00010 */ swc1 $f0, 0x10($sp) /* AED8C0 802404B0 8E26003C */ lw $a2, 0x3c($s1) -/* AED8C4 802404B4 0C09009C */ jal func_80240270 +/* AED8C4 802404B4 0C09009C */ jal func_80240270_AED680 /* AED8C8 802404B8 02C0202D */ daddu $a0, $s6, $zero /* AED8CC 802404BC 02A0202D */ daddu $a0, $s5, $zero /* AED8D0 802404C0 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8.s deleted file mode 100644 index 05e6f3d9e1..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406D8 -/* AEDAE8 802406D8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AEDAEC 802406DC AFB3001C */ sw $s3, 0x1c($sp) -/* AEDAF0 802406E0 0080982D */ daddu $s3, $a0, $zero -/* AEDAF4 802406E4 AFBF0030 */ sw $ra, 0x30($sp) -/* AEDAF8 802406E8 AFB7002C */ sw $s7, 0x2c($sp) -/* AEDAFC 802406EC AFB60028 */ sw $s6, 0x28($sp) -/* AEDB00 802406F0 AFB50024 */ sw $s5, 0x24($sp) -/* AEDB04 802406F4 AFB40020 */ sw $s4, 0x20($sp) -/* AEDB08 802406F8 AFB20018 */ sw $s2, 0x18($sp) -/* AEDB0C 802406FC AFB10014 */ sw $s1, 0x14($sp) -/* AEDB10 80240700 AFB00010 */ sw $s0, 0x10($sp) -/* AEDB14 80240704 F7B80048 */ sdc1 $f24, 0x48($sp) -/* AEDB18 80240708 F7B60040 */ sdc1 $f22, 0x40($sp) -/* AEDB1C 8024070C F7B40038 */ sdc1 $f20, 0x38($sp) -/* AEDB20 80240710 8E70000C */ lw $s0, 0xc($s3) -/* AEDB24 80240714 8E050000 */ lw $a1, ($s0) -/* AEDB28 80240718 0C0B1EAF */ jal get_variable -/* AEDB2C 8024071C 26100004 */ addiu $s0, $s0, 4 -/* AEDB30 80240720 8E150000 */ lw $s5, ($s0) -/* AEDB34 80240724 26100004 */ addiu $s0, $s0, 4 -/* AEDB38 80240728 0260202D */ daddu $a0, $s3, $zero -/* AEDB3C 8024072C 8E160000 */ lw $s6, ($s0) -/* AEDB40 80240730 8E170004 */ lw $s7, 4($s0) -/* AEDB44 80240734 0C0B36B0 */ jal resolve_npc -/* AEDB48 80240738 0040282D */ daddu $a1, $v0, $zero -/* AEDB4C 8024073C 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* AEDB50 80240740 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* AEDB54 80240744 0040802D */ daddu $s0, $v0, $zero -/* AEDB58 80240748 1200002F */ beqz $s0, .L80240808 -/* AEDB5C 8024074C 0220902D */ daddu $s2, $s1, $zero -/* AEDB60 80240750 C62C0028 */ lwc1 $f12, 0x28($s1) -/* AEDB64 80240754 C62E0030 */ lwc1 $f14, 0x30($s1) -/* AEDB68 80240758 8E060038 */ lw $a2, 0x38($s0) -/* AEDB6C 8024075C 8E070040 */ lw $a3, 0x40($s0) -/* AEDB70 80240760 3C014248 */ lui $at, 0x4248 -/* AEDB74 80240764 4481C000 */ mtc1 $at, $f24 -/* AEDB78 80240768 0C00A7B5 */ jal dist2D -/* AEDB7C 8024076C 24140001 */ addiu $s4, $zero, 1 -/* AEDB80 80240770 4618003C */ c.lt.s $f0, $f24 -/* AEDB84 80240774 00000000 */ nop -/* AEDB88 80240778 45030001 */ bc1tl .L80240780 -/* AEDB8C 8024077C 0000A02D */ daddu $s4, $zero, $zero -.L80240780: -/* AEDB90 80240780 C64C0028 */ lwc1 $f12, 0x28($s2) -/* AEDB94 80240784 C64E0030 */ lwc1 $f14, 0x30($s2) -/* AEDB98 80240788 8E060038 */ lw $a2, 0x38($s0) -/* AEDB9C 8024078C 0C00A720 */ jal atan2 -/* AEDBA0 80240790 8E070040 */ lw $a3, 0x40($s0) -/* AEDBA4 80240794 0C00A6C9 */ jal clamp_angle -/* AEDBA8 80240798 46000306 */ mov.s $f12, $f0 -/* AEDBAC 8024079C 46000506 */ mov.s $f20, $f0 -/* AEDBB0 802407A0 0C00A8BB */ jal sin_deg -/* AEDBB4 802407A4 4600A306 */ mov.s $f12, $f20 -/* AEDBB8 802407A8 46180002 */ mul.s $f0, $f0, $f24 -/* AEDBBC 802407AC 00000000 */ nop -/* AEDBC0 802407B0 C6560028 */ lwc1 $f22, 0x28($s2) -/* AEDBC4 802407B4 4600B580 */ add.s $f22, $f22, $f0 -/* AEDBC8 802407B8 0C00A8D4 */ jal cos_deg -/* AEDBCC 802407BC 4600A306 */ mov.s $f12, $f20 -/* AEDBD0 802407C0 46180002 */ mul.s $f0, $f0, $f24 -/* AEDBD4 802407C4 00000000 */ nop -/* AEDBD8 802407C8 0260202D */ daddu $a0, $s3, $zero -/* AEDBDC 802407CC 02A0282D */ daddu $a1, $s5, $zero -/* AEDBE0 802407D0 C6540030 */ lwc1 $f20, 0x30($s2) -/* AEDBE4 802407D4 0280302D */ daddu $a2, $s4, $zero -/* AEDBE8 802407D8 0C0B2026 */ jal set_variable -/* AEDBEC 802407DC 4600A501 */ sub.s $f20, $f20, $f0 -/* AEDBF0 802407E0 0260202D */ daddu $a0, $s3, $zero -/* AEDBF4 802407E4 4600B08D */ trunc.w.s $f2, $f22 -/* AEDBF8 802407E8 44061000 */ mfc1 $a2, $f2 -/* AEDBFC 802407EC 0C0B2026 */ jal set_variable -/* AEDC00 802407F0 02C0282D */ daddu $a1, $s6, $zero -/* AEDC04 802407F4 0260202D */ daddu $a0, $s3, $zero -/* AEDC08 802407F8 4600A08D */ trunc.w.s $f2, $f20 -/* AEDC0C 802407FC 44061000 */ mfc1 $a2, $f2 -/* AEDC10 80240800 0C0B2026 */ jal set_variable -/* AEDC14 80240804 02E0282D */ daddu $a1, $s7, $zero -.L80240808: -/* AEDC18 80240808 24020002 */ addiu $v0, $zero, 2 -/* AEDC1C 8024080C 8FBF0030 */ lw $ra, 0x30($sp) -/* AEDC20 80240810 8FB7002C */ lw $s7, 0x2c($sp) -/* AEDC24 80240814 8FB60028 */ lw $s6, 0x28($sp) -/* AEDC28 80240818 8FB50024 */ lw $s5, 0x24($sp) -/* AEDC2C 8024081C 8FB40020 */ lw $s4, 0x20($sp) -/* AEDC30 80240820 8FB3001C */ lw $s3, 0x1c($sp) -/* AEDC34 80240824 8FB20018 */ lw $s2, 0x18($sp) -/* AEDC38 80240828 8FB10014 */ lw $s1, 0x14($sp) -/* AEDC3C 8024082C 8FB00010 */ lw $s0, 0x10($sp) -/* AEDC40 80240830 D7B80048 */ ldc1 $f24, 0x48($sp) -/* AEDC44 80240834 D7B60040 */ ldc1 $f22, 0x40($sp) -/* AEDC48 80240838 D7B40038 */ ldc1 $f20, 0x38($sp) -/* AEDC4C 8024083C 03E00008 */ jr $ra -/* AEDC50 80240840 27BD0050 */ addiu $sp, $sp, 0x50 -/* AEDC54 80240844 00000000 */ nop -/* AEDC58 80240848 00000000 */ nop -/* AEDC5C 8024084C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s new file mode 100644 index 0000000000..5613b551ad --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_802406D8_AEDAE8.s @@ -0,0 +1,100 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406D8_AEDAE8 +/* AEDAE8 802406D8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* AEDAEC 802406DC AFB3001C */ sw $s3, 0x1c($sp) +/* AEDAF0 802406E0 0080982D */ daddu $s3, $a0, $zero +/* AEDAF4 802406E4 AFBF0030 */ sw $ra, 0x30($sp) +/* AEDAF8 802406E8 AFB7002C */ sw $s7, 0x2c($sp) +/* AEDAFC 802406EC AFB60028 */ sw $s6, 0x28($sp) +/* AEDB00 802406F0 AFB50024 */ sw $s5, 0x24($sp) +/* AEDB04 802406F4 AFB40020 */ sw $s4, 0x20($sp) +/* AEDB08 802406F8 AFB20018 */ sw $s2, 0x18($sp) +/* AEDB0C 802406FC AFB10014 */ sw $s1, 0x14($sp) +/* AEDB10 80240700 AFB00010 */ sw $s0, 0x10($sp) +/* AEDB14 80240704 F7B80048 */ sdc1 $f24, 0x48($sp) +/* AEDB18 80240708 F7B60040 */ sdc1 $f22, 0x40($sp) +/* AEDB1C 8024070C F7B40038 */ sdc1 $f20, 0x38($sp) +/* AEDB20 80240710 8E70000C */ lw $s0, 0xc($s3) +/* AEDB24 80240714 8E050000 */ lw $a1, ($s0) +/* AEDB28 80240718 0C0B1EAF */ jal get_variable +/* AEDB2C 8024071C 26100004 */ addiu $s0, $s0, 4 +/* AEDB30 80240720 8E150000 */ lw $s5, ($s0) +/* AEDB34 80240724 26100004 */ addiu $s0, $s0, 4 +/* AEDB38 80240728 0260202D */ daddu $a0, $s3, $zero +/* AEDB3C 8024072C 8E160000 */ lw $s6, ($s0) +/* AEDB40 80240730 8E170004 */ lw $s7, 4($s0) +/* AEDB44 80240734 0C0B36B0 */ jal resolve_npc +/* AEDB48 80240738 0040282D */ daddu $a1, $v0, $zero +/* AEDB4C 8024073C 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* AEDB50 80240740 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* AEDB54 80240744 0040802D */ daddu $s0, $v0, $zero +/* AEDB58 80240748 1200002F */ beqz $s0, .L80240808 +/* AEDB5C 8024074C 0220902D */ daddu $s2, $s1, $zero +/* AEDB60 80240750 C62C0028 */ lwc1 $f12, 0x28($s1) +/* AEDB64 80240754 C62E0030 */ lwc1 $f14, 0x30($s1) +/* AEDB68 80240758 8E060038 */ lw $a2, 0x38($s0) +/* AEDB6C 8024075C 8E070040 */ lw $a3, 0x40($s0) +/* AEDB70 80240760 3C014248 */ lui $at, 0x4248 +/* AEDB74 80240764 4481C000 */ mtc1 $at, $f24 +/* AEDB78 80240768 0C00A7B5 */ jal dist2D +/* AEDB7C 8024076C 24140001 */ addiu $s4, $zero, 1 +/* AEDB80 80240770 4618003C */ c.lt.s $f0, $f24 +/* AEDB84 80240774 00000000 */ nop +/* AEDB88 80240778 45030001 */ bc1tl .L80240780 +/* AEDB8C 8024077C 0000A02D */ daddu $s4, $zero, $zero +.L80240780: +/* AEDB90 80240780 C64C0028 */ lwc1 $f12, 0x28($s2) +/* AEDB94 80240784 C64E0030 */ lwc1 $f14, 0x30($s2) +/* AEDB98 80240788 8E060038 */ lw $a2, 0x38($s0) +/* AEDB9C 8024078C 0C00A720 */ jal atan2 +/* AEDBA0 80240790 8E070040 */ lw $a3, 0x40($s0) +/* AEDBA4 80240794 0C00A6C9 */ jal clamp_angle +/* AEDBA8 80240798 46000306 */ mov.s $f12, $f0 +/* AEDBAC 8024079C 46000506 */ mov.s $f20, $f0 +/* AEDBB0 802407A0 0C00A8BB */ jal sin_deg +/* AEDBB4 802407A4 4600A306 */ mov.s $f12, $f20 +/* AEDBB8 802407A8 46180002 */ mul.s $f0, $f0, $f24 +/* AEDBBC 802407AC 00000000 */ nop +/* AEDBC0 802407B0 C6560028 */ lwc1 $f22, 0x28($s2) +/* AEDBC4 802407B4 4600B580 */ add.s $f22, $f22, $f0 +/* AEDBC8 802407B8 0C00A8D4 */ jal cos_deg +/* AEDBCC 802407BC 4600A306 */ mov.s $f12, $f20 +/* AEDBD0 802407C0 46180002 */ mul.s $f0, $f0, $f24 +/* AEDBD4 802407C4 00000000 */ nop +/* AEDBD8 802407C8 0260202D */ daddu $a0, $s3, $zero +/* AEDBDC 802407CC 02A0282D */ daddu $a1, $s5, $zero +/* AEDBE0 802407D0 C6540030 */ lwc1 $f20, 0x30($s2) +/* AEDBE4 802407D4 0280302D */ daddu $a2, $s4, $zero +/* AEDBE8 802407D8 0C0B2026 */ jal set_variable +/* AEDBEC 802407DC 4600A501 */ sub.s $f20, $f20, $f0 +/* AEDBF0 802407E0 0260202D */ daddu $a0, $s3, $zero +/* AEDBF4 802407E4 4600B08D */ trunc.w.s $f2, $f22 +/* AEDBF8 802407E8 44061000 */ mfc1 $a2, $f2 +/* AEDBFC 802407EC 0C0B2026 */ jal set_variable +/* AEDC00 802407F0 02C0282D */ daddu $a1, $s6, $zero +/* AEDC04 802407F4 0260202D */ daddu $a0, $s3, $zero +/* AEDC08 802407F8 4600A08D */ trunc.w.s $f2, $f20 +/* AEDC0C 802407FC 44061000 */ mfc1 $a2, $f2 +/* AEDC10 80240800 0C0B2026 */ jal set_variable +/* AEDC14 80240804 02E0282D */ daddu $a1, $s7, $zero +.L80240808: +/* AEDC18 80240808 24020002 */ addiu $v0, $zero, 2 +/* AEDC1C 8024080C 8FBF0030 */ lw $ra, 0x30($sp) +/* AEDC20 80240810 8FB7002C */ lw $s7, 0x2c($sp) +/* AEDC24 80240814 8FB60028 */ lw $s6, 0x28($sp) +/* AEDC28 80240818 8FB50024 */ lw $s5, 0x24($sp) +/* AEDC2C 8024081C 8FB40020 */ lw $s4, 0x20($sp) +/* AEDC30 80240820 8FB3001C */ lw $s3, 0x1c($sp) +/* AEDC34 80240824 8FB20018 */ lw $s2, 0x18($sp) +/* AEDC38 80240828 8FB10014 */ lw $s1, 0x14($sp) +/* AEDC3C 8024082C 8FB00010 */ lw $s0, 0x10($sp) +/* AEDC40 80240830 D7B80048 */ ldc1 $f24, 0x48($sp) +/* AEDC44 80240834 D7B60040 */ ldc1 $f22, 0x40($sp) +/* AEDC48 80240838 D7B40038 */ ldc1 $f20, 0x38($sp) +/* AEDC4C 8024083C 03E00008 */ jr $ra +/* AEDC50 80240840 27BD0050 */ addiu $sp, $sp, 0x50 +/* AEDC54 80240844 00000000 */ nop +/* AEDC58 80240848 00000000 */ nop +/* AEDC5C 8024084C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850.s deleted file mode 100644 index 500d295d09..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240850 -/* AEDC60 80240850 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* AEDC64 80240854 AFB3003C */ sw $s3, 0x3c($sp) -/* AEDC68 80240858 0080982D */ daddu $s3, $a0, $zero -/* AEDC6C 8024085C AFBF0044 */ sw $ra, 0x44($sp) -/* AEDC70 80240860 AFB40040 */ sw $s4, 0x40($sp) -/* AEDC74 80240864 AFB20038 */ sw $s2, 0x38($sp) -/* AEDC78 80240868 AFB10034 */ sw $s1, 0x34($sp) -/* AEDC7C 8024086C AFB00030 */ sw $s0, 0x30($sp) -/* AEDC80 80240870 F7B80058 */ sdc1 $f24, 0x58($sp) -/* AEDC84 80240874 F7B60050 */ sdc1 $f22, 0x50($sp) -/* AEDC88 80240878 F7B40048 */ sdc1 $f20, 0x48($sp) -/* AEDC8C 8024087C 8E620148 */ lw $v0, 0x148($s3) -/* AEDC90 80240880 0C00EABB */ jal get_npc_unsafe -/* AEDC94 80240884 84440008 */ lh $a0, 8($v0) -/* AEDC98 80240888 27A40020 */ addiu $a0, $sp, 0x20 -/* AEDC9C 8024088C 27A50024 */ addiu $a1, $sp, 0x24 -/* AEDCA0 80240890 0040802D */ daddu $s0, $v0, $zero -/* AEDCA4 80240894 8E63000C */ lw $v1, 0xc($s3) -/* AEDCA8 80240898 8E07000C */ lw $a3, 0xc($s0) -/* AEDCAC 8024089C C6000038 */ lwc1 $f0, 0x38($s0) -/* AEDCB0 802408A0 C6020040 */ lwc1 $f2, 0x40($s0) -/* AEDCB4 802408A4 8C740000 */ lw $s4, ($v1) -/* AEDCB8 802408A8 24630004 */ addiu $v1, $v1, 4 -/* AEDCBC 802408AC C4780000 */ lwc1 $f24, ($v1) -/* AEDCC0 802408B0 4680C620 */ cvt.s.w $f24, $f24 -/* AEDCC4 802408B4 24630004 */ addiu $v1, $v1, 4 -/* AEDCC8 802408B8 C4740000 */ lwc1 $f20, ($v1) -/* AEDCCC 802408BC 4680A520 */ cvt.s.w $f20, $f20 -/* AEDCD0 802408C0 4406A000 */ mfc1 $a2, $f20 -/* AEDCD4 802408C4 C4760004 */ lwc1 $f22, 4($v1) -/* AEDCD8 802408C8 4680B5A0 */ cvt.s.w $f22, $f22 -/* AEDCDC 802408CC E7A00020 */ swc1 $f0, 0x20($sp) -/* AEDCE0 802408D0 0C00A7E7 */ jal add_vec2D_polar -/* AEDCE4 802408D4 E7A20024 */ swc1 $f2, 0x24($sp) -/* AEDCE8 802408D8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* AEDCEC 802408DC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* AEDCF0 802408E0 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* AEDCF4 802408E4 4480A000 */ mtc1 $zero, $f20 -/* AEDCF8 802408E8 8E460028 */ lw $a2, 0x28($s2) -/* AEDCFC 802408EC 4407A000 */ mfc1 $a3, $f20 -/* AEDD00 802408F0 0C00A7B5 */ jal dist2D -/* AEDD04 802408F4 4600A386 */ mov.s $f14, $f20 -/* AEDD08 802408F8 4600A306 */ mov.s $f12, $f20 -/* AEDD0C 802408FC C7AE0024 */ lwc1 $f14, 0x24($sp) -/* AEDD10 80240900 44066000 */ mfc1 $a2, $f12 -/* AEDD14 80240904 8E470030 */ lw $a3, 0x30($s2) -/* AEDD18 80240908 0C00A7B5 */ jal dist2D -/* AEDD1C 8024090C 46000506 */ mov.s $f20, $f0 -/* AEDD20 80240910 C604000C */ lwc1 $f4, 0xc($s0) -/* AEDD24 80240914 3C018024 */ lui $at, 0x8024 -/* AEDD28 80240918 D4224830 */ ldc1 $f2, 0x4830($at) -/* AEDD2C 8024091C 46002121 */ cvt.d.s $f4, $f4 -/* AEDD30 80240920 46222032 */ c.eq.d $f4, $f2 -/* AEDD34 80240924 00000000 */ nop -/* AEDD38 80240928 45010007 */ bc1t .L80240948 -/* AEDD3C 8024092C 46000086 */ mov.s $f2, $f0 -/* AEDD40 80240930 3C018024 */ lui $at, 0x8024 -/* AEDD44 80240934 D4204838 */ ldc1 $f0, 0x4838($at) -/* AEDD48 80240938 46202032 */ c.eq.d $f4, $f0 -/* AEDD4C 8024093C 00000000 */ nop -/* AEDD50 80240940 45000008 */ bc1f .L80240964 -/* AEDD54 80240944 00000000 */ nop -.L80240948: -/* AEDD58 80240948 4618A03E */ c.le.s $f20, $f24 -/* AEDD5C 8024094C 00000000 */ nop -/* AEDD60 80240950 4500000C */ bc1f .L80240984 -/* AEDD64 80240954 0000882D */ daddu $s1, $zero, $zero -/* AEDD68 80240958 4616103E */ c.le.s $f2, $f22 -/* AEDD6C 8024095C 0809025F */ j .L8024097C -/* AEDD70 80240960 00000000 */ nop -.L80240964: -/* AEDD74 80240964 4618103E */ c.le.s $f2, $f24 -/* AEDD78 80240968 00000000 */ nop -/* AEDD7C 8024096C 45000005 */ bc1f .L80240984 -/* AEDD80 80240970 0000882D */ daddu $s1, $zero, $zero -/* AEDD84 80240974 4616A03E */ c.le.s $f20, $f22 -/* AEDD88 80240978 00000000 */ nop -.L8024097C: -/* AEDD8C 8024097C 45030001 */ bc1tl .L80240984 -/* AEDD90 80240980 24110001 */ addiu $s1, $zero, 1 -.L80240984: -/* AEDD94 80240984 12200027 */ beqz $s1, .L80240A24 -/* AEDD98 80240988 0260202D */ daddu $a0, $s3, $zero -/* AEDD9C 8024098C C60C0038 */ lwc1 $f12, 0x38($s0) -/* AEDDA0 80240990 C60E0040 */ lwc1 $f14, 0x40($s0) -/* AEDDA4 80240994 8E460028 */ lw $a2, 0x28($s2) -/* AEDDA8 80240998 8E470030 */ lw $a3, 0x30($s2) -/* AEDDAC 8024099C C602003C */ lwc1 $f2, 0x3c($s0) -/* AEDDB0 802409A0 46006006 */ mov.s $f0, $f12 -/* AEDDB4 802409A4 46007106 */ mov.s $f4, $f14 -/* AEDDB8 802409A8 E7A00020 */ swc1 $f0, 0x20($sp) -/* AEDDBC 802409AC E7A20028 */ swc1 $f2, 0x28($sp) -/* AEDDC0 802409B0 0C00A7B5 */ jal dist2D -/* AEDDC4 802409B4 E7A40024 */ swc1 $f4, 0x24($sp) -/* AEDDC8 802409B8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* AEDDCC 802409BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* AEDDD0 802409C0 8E460028 */ lw $a2, 0x28($s2) -/* AEDDD4 802409C4 8E470030 */ lw $a3, 0x30($s2) -/* AEDDD8 802409C8 0C00A720 */ jal atan2 -/* AEDDDC 802409CC 46000506 */ mov.s $f20, $f0 -/* AEDDE0 802409D0 3C040007 */ lui $a0, 7 -/* AEDDE4 802409D4 34848000 */ ori $a0, $a0, 0x8000 -/* AEDDE8 802409D8 27A50020 */ addiu $a1, $sp, 0x20 -/* AEDDEC 802409DC E7B40010 */ swc1 $f20, 0x10($sp) -/* AEDDF0 802409E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* AEDDF4 802409E4 860200A6 */ lh $v0, 0xa6($s0) -/* AEDDF8 802409E8 27A60028 */ addiu $a2, $sp, 0x28 -/* AEDDFC 802409EC 44820000 */ mtc1 $v0, $f0 -/* AEDE00 802409F0 00000000 */ nop -/* AEDE04 802409F4 46800020 */ cvt.s.w $f0, $f0 -/* AEDE08 802409F8 E7A00018 */ swc1 $f0, 0x18($sp) -/* AEDE0C 802409FC 860200A8 */ lh $v0, 0xa8($s0) -/* AEDE10 80240A00 27A70024 */ addiu $a3, $sp, 0x24 -/* AEDE14 80240A04 44820000 */ mtc1 $v0, $f0 -/* AEDE18 80240A08 00000000 */ nop -/* AEDE1C 80240A0C 46800020 */ cvt.s.w $f0, $f0 -/* AEDE20 80240A10 0C0376B9 */ jal func_800DDAE4 -/* AEDE24 80240A14 E7A0001C */ swc1 $f0, 0x1c($sp) -/* AEDE28 80240A18 54400001 */ bnel $v0, $zero, .L80240A20 -/* AEDE2C 80240A1C 0000882D */ daddu $s1, $zero, $zero -.L80240A20: -/* AEDE30 80240A20 0260202D */ daddu $a0, $s3, $zero -.L80240A24: -/* AEDE34 80240A24 0280282D */ daddu $a1, $s4, $zero -/* AEDE38 80240A28 0C0B2026 */ jal set_variable -/* AEDE3C 80240A2C 0220302D */ daddu $a2, $s1, $zero -/* AEDE40 80240A30 8FBF0044 */ lw $ra, 0x44($sp) -/* AEDE44 80240A34 8FB40040 */ lw $s4, 0x40($sp) -/* AEDE48 80240A38 8FB3003C */ lw $s3, 0x3c($sp) -/* AEDE4C 80240A3C 8FB20038 */ lw $s2, 0x38($sp) -/* AEDE50 80240A40 8FB10034 */ lw $s1, 0x34($sp) -/* AEDE54 80240A44 8FB00030 */ lw $s0, 0x30($sp) -/* AEDE58 80240A48 D7B80058 */ ldc1 $f24, 0x58($sp) -/* AEDE5C 80240A4C D7B60050 */ ldc1 $f22, 0x50($sp) -/* AEDE60 80240A50 D7B40048 */ ldc1 $f20, 0x48($sp) -/* AEDE64 80240A54 24020002 */ addiu $v0, $zero, 2 -/* AEDE68 80240A58 03E00008 */ jr $ra -/* AEDE6C 80240A5C 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s new file mode 100644 index 0000000000..0069c9a26d --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240850_AEDC60.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240850_AEDC60 +/* AEDC60 80240850 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* AEDC64 80240854 AFB3003C */ sw $s3, 0x3c($sp) +/* AEDC68 80240858 0080982D */ daddu $s3, $a0, $zero +/* AEDC6C 8024085C AFBF0044 */ sw $ra, 0x44($sp) +/* AEDC70 80240860 AFB40040 */ sw $s4, 0x40($sp) +/* AEDC74 80240864 AFB20038 */ sw $s2, 0x38($sp) +/* AEDC78 80240868 AFB10034 */ sw $s1, 0x34($sp) +/* AEDC7C 8024086C AFB00030 */ sw $s0, 0x30($sp) +/* AEDC80 80240870 F7B80058 */ sdc1 $f24, 0x58($sp) +/* AEDC84 80240874 F7B60050 */ sdc1 $f22, 0x50($sp) +/* AEDC88 80240878 F7B40048 */ sdc1 $f20, 0x48($sp) +/* AEDC8C 8024087C 8E620148 */ lw $v0, 0x148($s3) +/* AEDC90 80240880 0C00EABB */ jal get_npc_unsafe +/* AEDC94 80240884 84440008 */ lh $a0, 8($v0) +/* AEDC98 80240888 27A40020 */ addiu $a0, $sp, 0x20 +/* AEDC9C 8024088C 27A50024 */ addiu $a1, $sp, 0x24 +/* AEDCA0 80240890 0040802D */ daddu $s0, $v0, $zero +/* AEDCA4 80240894 8E63000C */ lw $v1, 0xc($s3) +/* AEDCA8 80240898 8E07000C */ lw $a3, 0xc($s0) +/* AEDCAC 8024089C C6000038 */ lwc1 $f0, 0x38($s0) +/* AEDCB0 802408A0 C6020040 */ lwc1 $f2, 0x40($s0) +/* AEDCB4 802408A4 8C740000 */ lw $s4, ($v1) +/* AEDCB8 802408A8 24630004 */ addiu $v1, $v1, 4 +/* AEDCBC 802408AC C4780000 */ lwc1 $f24, ($v1) +/* AEDCC0 802408B0 4680C620 */ cvt.s.w $f24, $f24 +/* AEDCC4 802408B4 24630004 */ addiu $v1, $v1, 4 +/* AEDCC8 802408B8 C4740000 */ lwc1 $f20, ($v1) +/* AEDCCC 802408BC 4680A520 */ cvt.s.w $f20, $f20 +/* AEDCD0 802408C0 4406A000 */ mfc1 $a2, $f20 +/* AEDCD4 802408C4 C4760004 */ lwc1 $f22, 4($v1) +/* AEDCD8 802408C8 4680B5A0 */ cvt.s.w $f22, $f22 +/* AEDCDC 802408CC E7A00020 */ swc1 $f0, 0x20($sp) +/* AEDCE0 802408D0 0C00A7E7 */ jal add_vec2D_polar +/* AEDCE4 802408D4 E7A20024 */ swc1 $f2, 0x24($sp) +/* AEDCE8 802408D8 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* AEDCEC 802408DC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* AEDCF0 802408E0 C7AC0020 */ lwc1 $f12, 0x20($sp) +/* AEDCF4 802408E4 4480A000 */ mtc1 $zero, $f20 +/* AEDCF8 802408E8 8E460028 */ lw $a2, 0x28($s2) +/* AEDCFC 802408EC 4407A000 */ mfc1 $a3, $f20 +/* AEDD00 802408F0 0C00A7B5 */ jal dist2D +/* AEDD04 802408F4 4600A386 */ mov.s $f14, $f20 +/* AEDD08 802408F8 4600A306 */ mov.s $f12, $f20 +/* AEDD0C 802408FC C7AE0024 */ lwc1 $f14, 0x24($sp) +/* AEDD10 80240900 44066000 */ mfc1 $a2, $f12 +/* AEDD14 80240904 8E470030 */ lw $a3, 0x30($s2) +/* AEDD18 80240908 0C00A7B5 */ jal dist2D +/* AEDD1C 8024090C 46000506 */ mov.s $f20, $f0 +/* AEDD20 80240910 C604000C */ lwc1 $f4, 0xc($s0) +/* AEDD24 80240914 3C018024 */ lui $at, 0x8024 +/* AEDD28 80240918 D4224830 */ ldc1 $f2, 0x4830($at) +/* AEDD2C 8024091C 46002121 */ cvt.d.s $f4, $f4 +/* AEDD30 80240920 46222032 */ c.eq.d $f4, $f2 +/* AEDD34 80240924 00000000 */ nop +/* AEDD38 80240928 45010007 */ bc1t .L80240948 +/* AEDD3C 8024092C 46000086 */ mov.s $f2, $f0 +/* AEDD40 80240930 3C018024 */ lui $at, 0x8024 +/* AEDD44 80240934 D4204838 */ ldc1 $f0, 0x4838($at) +/* AEDD48 80240938 46202032 */ c.eq.d $f4, $f0 +/* AEDD4C 8024093C 00000000 */ nop +/* AEDD50 80240940 45000008 */ bc1f .L80240964 +/* AEDD54 80240944 00000000 */ nop +.L80240948: +/* AEDD58 80240948 4618A03E */ c.le.s $f20, $f24 +/* AEDD5C 8024094C 00000000 */ nop +/* AEDD60 80240950 4500000C */ bc1f .L80240984 +/* AEDD64 80240954 0000882D */ daddu $s1, $zero, $zero +/* AEDD68 80240958 4616103E */ c.le.s $f2, $f22 +/* AEDD6C 8024095C 0809025F */ j .L8024097C +/* AEDD70 80240960 00000000 */ nop +.L80240964: +/* AEDD74 80240964 4618103E */ c.le.s $f2, $f24 +/* AEDD78 80240968 00000000 */ nop +/* AEDD7C 8024096C 45000005 */ bc1f .L80240984 +/* AEDD80 80240970 0000882D */ daddu $s1, $zero, $zero +/* AEDD84 80240974 4616A03E */ c.le.s $f20, $f22 +/* AEDD88 80240978 00000000 */ nop +.L8024097C: +/* AEDD8C 8024097C 45030001 */ bc1tl .L80240984 +/* AEDD90 80240980 24110001 */ addiu $s1, $zero, 1 +.L80240984: +/* AEDD94 80240984 12200027 */ beqz $s1, .L80240A24 +/* AEDD98 80240988 0260202D */ daddu $a0, $s3, $zero +/* AEDD9C 8024098C C60C0038 */ lwc1 $f12, 0x38($s0) +/* AEDDA0 80240990 C60E0040 */ lwc1 $f14, 0x40($s0) +/* AEDDA4 80240994 8E460028 */ lw $a2, 0x28($s2) +/* AEDDA8 80240998 8E470030 */ lw $a3, 0x30($s2) +/* AEDDAC 8024099C C602003C */ lwc1 $f2, 0x3c($s0) +/* AEDDB0 802409A0 46006006 */ mov.s $f0, $f12 +/* AEDDB4 802409A4 46007106 */ mov.s $f4, $f14 +/* AEDDB8 802409A8 E7A00020 */ swc1 $f0, 0x20($sp) +/* AEDDBC 802409AC E7A20028 */ swc1 $f2, 0x28($sp) +/* AEDDC0 802409B0 0C00A7B5 */ jal dist2D +/* AEDDC4 802409B4 E7A40024 */ swc1 $f4, 0x24($sp) +/* AEDDC8 802409B8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* AEDDCC 802409BC C60E0040 */ lwc1 $f14, 0x40($s0) +/* AEDDD0 802409C0 8E460028 */ lw $a2, 0x28($s2) +/* AEDDD4 802409C4 8E470030 */ lw $a3, 0x30($s2) +/* AEDDD8 802409C8 0C00A720 */ jal atan2 +/* AEDDDC 802409CC 46000506 */ mov.s $f20, $f0 +/* AEDDE0 802409D0 3C040007 */ lui $a0, 7 +/* AEDDE4 802409D4 34848000 */ ori $a0, $a0, 0x8000 +/* AEDDE8 802409D8 27A50020 */ addiu $a1, $sp, 0x20 +/* AEDDEC 802409DC E7B40010 */ swc1 $f20, 0x10($sp) +/* AEDDF0 802409E0 E7A00014 */ swc1 $f0, 0x14($sp) +/* AEDDF4 802409E4 860200A6 */ lh $v0, 0xa6($s0) +/* AEDDF8 802409E8 27A60028 */ addiu $a2, $sp, 0x28 +/* AEDDFC 802409EC 44820000 */ mtc1 $v0, $f0 +/* AEDE00 802409F0 00000000 */ nop +/* AEDE04 802409F4 46800020 */ cvt.s.w $f0, $f0 +/* AEDE08 802409F8 E7A00018 */ swc1 $f0, 0x18($sp) +/* AEDE0C 802409FC 860200A8 */ lh $v0, 0xa8($s0) +/* AEDE10 80240A00 27A70024 */ addiu $a3, $sp, 0x24 +/* AEDE14 80240A04 44820000 */ mtc1 $v0, $f0 +/* AEDE18 80240A08 00000000 */ nop +/* AEDE1C 80240A0C 46800020 */ cvt.s.w $f0, $f0 +/* AEDE20 80240A10 0C0376B9 */ jal func_800DDAE4 +/* AEDE24 80240A14 E7A0001C */ swc1 $f0, 0x1c($sp) +/* AEDE28 80240A18 54400001 */ bnel $v0, $zero, .L80240A20 +/* AEDE2C 80240A1C 0000882D */ daddu $s1, $zero, $zero +.L80240A20: +/* AEDE30 80240A20 0260202D */ daddu $a0, $s3, $zero +.L80240A24: +/* AEDE34 80240A24 0280282D */ daddu $a1, $s4, $zero +/* AEDE38 80240A28 0C0B2026 */ jal set_variable +/* AEDE3C 80240A2C 0220302D */ daddu $a2, $s1, $zero +/* AEDE40 80240A30 8FBF0044 */ lw $ra, 0x44($sp) +/* AEDE44 80240A34 8FB40040 */ lw $s4, 0x40($sp) +/* AEDE48 80240A38 8FB3003C */ lw $s3, 0x3c($sp) +/* AEDE4C 80240A3C 8FB20038 */ lw $s2, 0x38($sp) +/* AEDE50 80240A40 8FB10034 */ lw $s1, 0x34($sp) +/* AEDE54 80240A44 8FB00030 */ lw $s0, 0x30($sp) +/* AEDE58 80240A48 D7B80058 */ ldc1 $f24, 0x58($sp) +/* AEDE5C 80240A4C D7B60050 */ ldc1 $f22, 0x50($sp) +/* AEDE60 80240A50 D7B40048 */ ldc1 $f20, 0x48($sp) +/* AEDE64 80240A54 24020002 */ addiu $v0, $zero, 2 +/* AEDE68 80240A58 03E00008 */ jr $ra +/* AEDE6C 80240A5C 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240A60.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240A60.s deleted file mode 100644 index d778cdc21c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240A60.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A60 -/* AEDE70 80240A60 27BDFF80 */ addiu $sp, $sp, -0x80 -/* AEDE74 80240A64 F7B40060 */ sdc1 $f20, 0x60($sp) -/* AEDE78 80240A68 4485A000 */ mtc1 $a1, $f20 -/* AEDE7C 80240A6C F7B60068 */ sdc1 $f22, 0x68($sp) -/* AEDE80 80240A70 4486B000 */ mtc1 $a2, $f22 -/* AEDE84 80240A74 F7B80070 */ sdc1 $f24, 0x70($sp) -/* AEDE88 80240A78 4487C000 */ mtc1 $a3, $f24 -/* AEDE8C 80240A7C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* AEDE90 80240A80 C7BA0090 */ lwc1 $f26, 0x90($sp) -/* AEDE94 80240A84 AFBF0058 */ sw $ra, 0x58($sp) -/* AEDE98 80240A88 AFB10054 */ sw $s1, 0x54($sp) -/* AEDE9C 80240A8C 0C046C04 */ jal get_model_list_index_from_tree_index -/* AEDEA0 80240A90 AFB00050 */ sw $s0, 0x50($sp) -/* AEDEA4 80240A94 0C046B4C */ jal get_model_from_list_index -/* AEDEA8 80240A98 0040202D */ daddu $a0, $v0, $zero -/* AEDEAC 80240A9C 0040802D */ daddu $s0, $v0, $zero -/* AEDEB0 80240AA0 26110058 */ addiu $s1, $s0, 0x58 -/* AEDEB4 80240AA4 4405A000 */ mfc1 $a1, $f20 -/* AEDEB8 80240AA8 4406B000 */ mfc1 $a2, $f22 -/* AEDEBC 80240AAC 4407C000 */ mfc1 $a3, $f24 -/* AEDEC0 80240AB0 0C019E40 */ jal guTranslateF -/* AEDEC4 80240AB4 0220202D */ daddu $a0, $s1, $zero -/* AEDEC8 80240AB8 27A40010 */ addiu $a0, $sp, 0x10 -/* AEDECC 80240ABC 4405D000 */ mfc1 $a1, $f26 -/* AEDED0 80240AC0 3C063F80 */ lui $a2, 0x3f80 -/* AEDED4 80240AC4 0C019DF0 */ jal guScaleF -/* AEDED8 80240AC8 00A0382D */ daddu $a3, $a1, $zero -/* AEDEDC 80240ACC 27A40010 */ addiu $a0, $sp, 0x10 -/* AEDEE0 80240AD0 0220282D */ daddu $a1, $s1, $zero -/* AEDEE4 80240AD4 0C019D80 */ jal guMtxCatF -/* AEDEE8 80240AD8 00A0302D */ daddu $a2, $a1, $zero -/* AEDEEC 80240ADC 96020000 */ lhu $v0, ($s0) -/* AEDEF0 80240AE0 34421400 */ ori $v0, $v0, 0x1400 -/* AEDEF4 80240AE4 A6020000 */ sh $v0, ($s0) -/* AEDEF8 80240AE8 8FBF0058 */ lw $ra, 0x58($sp) -/* AEDEFC 80240AEC 8FB10054 */ lw $s1, 0x54($sp) -/* AEDF00 80240AF0 8FB00050 */ lw $s0, 0x50($sp) -/* AEDF04 80240AF4 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* AEDF08 80240AF8 D7B80070 */ ldc1 $f24, 0x70($sp) -/* AEDF0C 80240AFC D7B60068 */ ldc1 $f22, 0x68($sp) -/* AEDF10 80240B00 D7B40060 */ ldc1 $f20, 0x60($sp) -/* AEDF14 80240B04 03E00008 */ jr $ra -/* AEDF18 80240B08 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240A60_AEDE70.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240A60_AEDE70.s new file mode 100644 index 0000000000..107a537e7d --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240A60_AEDE70.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A60_AEDE70 +/* AEDE70 80240A60 27BDFF80 */ addiu $sp, $sp, -0x80 +/* AEDE74 80240A64 F7B40060 */ sdc1 $f20, 0x60($sp) +/* AEDE78 80240A68 4485A000 */ mtc1 $a1, $f20 +/* AEDE7C 80240A6C F7B60068 */ sdc1 $f22, 0x68($sp) +/* AEDE80 80240A70 4486B000 */ mtc1 $a2, $f22 +/* AEDE84 80240A74 F7B80070 */ sdc1 $f24, 0x70($sp) +/* AEDE88 80240A78 4487C000 */ mtc1 $a3, $f24 +/* AEDE8C 80240A7C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* AEDE90 80240A80 C7BA0090 */ lwc1 $f26, 0x90($sp) +/* AEDE94 80240A84 AFBF0058 */ sw $ra, 0x58($sp) +/* AEDE98 80240A88 AFB10054 */ sw $s1, 0x54($sp) +/* AEDE9C 80240A8C 0C046C04 */ jal get_model_list_index_from_tree_index +/* AEDEA0 80240A90 AFB00050 */ sw $s0, 0x50($sp) +/* AEDEA4 80240A94 0C046B4C */ jal get_model_from_list_index +/* AEDEA8 80240A98 0040202D */ daddu $a0, $v0, $zero +/* AEDEAC 80240A9C 0040802D */ daddu $s0, $v0, $zero +/* AEDEB0 80240AA0 26110058 */ addiu $s1, $s0, 0x58 +/* AEDEB4 80240AA4 4405A000 */ mfc1 $a1, $f20 +/* AEDEB8 80240AA8 4406B000 */ mfc1 $a2, $f22 +/* AEDEBC 80240AAC 4407C000 */ mfc1 $a3, $f24 +/* AEDEC0 80240AB0 0C019E40 */ jal guTranslateF +/* AEDEC4 80240AB4 0220202D */ daddu $a0, $s1, $zero +/* AEDEC8 80240AB8 27A40010 */ addiu $a0, $sp, 0x10 +/* AEDECC 80240ABC 4405D000 */ mfc1 $a1, $f26 +/* AEDED0 80240AC0 3C063F80 */ lui $a2, 0x3f80 +/* AEDED4 80240AC4 0C019DF0 */ jal guScaleF +/* AEDED8 80240AC8 00A0382D */ daddu $a3, $a1, $zero +/* AEDEDC 80240ACC 27A40010 */ addiu $a0, $sp, 0x10 +/* AEDEE0 80240AD0 0220282D */ daddu $a1, $s1, $zero +/* AEDEE4 80240AD4 0C019D80 */ jal guMtxCatF +/* AEDEE8 80240AD8 00A0302D */ daddu $a2, $a1, $zero +/* AEDEEC 80240ADC 96020000 */ lhu $v0, ($s0) +/* AEDEF0 80240AE0 34421400 */ ori $v0, $v0, 0x1400 +/* AEDEF4 80240AE4 A6020000 */ sh $v0, ($s0) +/* AEDEF8 80240AE8 8FBF0058 */ lw $ra, 0x58($sp) +/* AEDEFC 80240AEC 8FB10054 */ lw $s1, 0x54($sp) +/* AEDF00 80240AF0 8FB00050 */ lw $s0, 0x50($sp) +/* AEDF04 80240AF4 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* AEDF08 80240AF8 D7B80070 */ ldc1 $f24, 0x70($sp) +/* AEDF0C 80240AFC D7B60068 */ ldc1 $f22, 0x68($sp) +/* AEDF10 80240B00 D7B40060 */ ldc1 $f20, 0x60($sp) +/* AEDF14 80240B04 03E00008 */ jr $ra +/* AEDF18 80240B08 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s index e9559c8020..a85269d194 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240B0C_AEDF1C.s @@ -105,7 +105,7 @@ glabel func_80240B0C_AEDF1C /* AEE0A8 80240C98 46200020 */ cvt.s.d $f0, $f0 /* AEE0AC 80240C9C E7A00010 */ swc1 $f0, 0x10($sp) /* AEE0B0 80240CA0 8E26003C */ lw $a2, 0x3c($s1) -/* AEE0B4 80240CA4 0C090298 */ jal func_80240A60 +/* AEE0B4 80240CA4 0C090298 */ jal func_80240A60_AEDE70 /* AEE0B8 80240CA8 02C0202D */ daddu $a0, $s6, $zero /* AEE0BC 80240CAC 02A0202D */ daddu $a0, $s5, $zero /* AEE0C0 80240CB0 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4.s deleted file mode 100644 index ff1e37a4ef..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE4 -/* AEE1F4 80240DE4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AEE1F8 80240DE8 AFB10014 */ sw $s1, 0x14($sp) -/* AEE1FC 80240DEC 0080882D */ daddu $s1, $a0, $zero -/* AEE200 80240DF0 AFBF0024 */ sw $ra, 0x24($sp) -/* AEE204 80240DF4 AFB40020 */ sw $s4, 0x20($sp) -/* AEE208 80240DF8 AFB3001C */ sw $s3, 0x1c($sp) -/* AEE20C 80240DFC AFB20018 */ sw $s2, 0x18($sp) -/* AEE210 80240E00 AFB00010 */ sw $s0, 0x10($sp) -/* AEE214 80240E04 8E30000C */ lw $s0, 0xc($s1) -/* AEE218 80240E08 8E140000 */ lw $s4, ($s0) -/* AEE21C 80240E0C 26100004 */ addiu $s0, $s0, 4 -/* AEE220 80240E10 8E050000 */ lw $a1, ($s0) -/* AEE224 80240E14 0C0B1EAF */ jal get_variable -/* AEE228 80240E18 26100004 */ addiu $s0, $s0, 4 -/* AEE22C 80240E1C 8E050000 */ lw $a1, ($s0) -/* AEE230 80240E20 26100004 */ addiu $s0, $s0, 4 -/* AEE234 80240E24 0220202D */ daddu $a0, $s1, $zero -/* AEE238 80240E28 0C0B1EAF */ jal get_variable -/* AEE23C 80240E2C 0040982D */ daddu $s3, $v0, $zero -/* AEE240 80240E30 8E050000 */ lw $a1, ($s0) -/* AEE244 80240E34 26100004 */ addiu $s0, $s0, 4 -/* AEE248 80240E38 0220202D */ daddu $a0, $s1, $zero -/* AEE24C 80240E3C 0C0B1EAF */ jal get_variable -/* AEE250 80240E40 0040902D */ daddu $s2, $v0, $zero -/* AEE254 80240E44 0220202D */ daddu $a0, $s1, $zero -/* AEE258 80240E48 8E050000 */ lw $a1, ($s0) -/* AEE25C 80240E4C 0C0B1EAF */ jal get_variable -/* AEE260 80240E50 0040802D */ daddu $s0, $v0, $zero -/* AEE264 80240E54 44901000 */ mtc1 $s0, $f2 -/* AEE268 80240E58 00000000 */ nop -/* AEE26C 80240E5C 468010A0 */ cvt.s.w $f2, $f2 -/* AEE270 80240E60 44936000 */ mtc1 $s3, $f12 -/* AEE274 80240E64 00000000 */ nop -/* AEE278 80240E68 46806320 */ cvt.s.w $f12, $f12 -/* AEE27C 80240E6C 44061000 */ mfc1 $a2, $f2 -/* AEE280 80240E70 44821000 */ mtc1 $v0, $f2 -/* AEE284 80240E74 00000000 */ nop -/* AEE288 80240E78 468010A0 */ cvt.s.w $f2, $f2 -/* AEE28C 80240E7C 44071000 */ mfc1 $a3, $f2 -/* AEE290 80240E80 44927000 */ mtc1 $s2, $f14 -/* AEE294 80240E84 00000000 */ nop -/* AEE298 80240E88 0C00A720 */ jal atan2 -/* AEE29C 80240E8C 468073A0 */ cvt.s.w $f14, $f14 -/* AEE2A0 80240E90 0220202D */ daddu $a0, $s1, $zero -/* AEE2A4 80240E94 4600008D */ trunc.w.s $f2, $f0 -/* AEE2A8 80240E98 44061000 */ mfc1 $a2, $f2 -/* AEE2AC 80240E9C 0C0B2026 */ jal set_variable -/* AEE2B0 80240EA0 0280282D */ daddu $a1, $s4, $zero -/* AEE2B4 80240EA4 8FBF0024 */ lw $ra, 0x24($sp) -/* AEE2B8 80240EA8 8FB40020 */ lw $s4, 0x20($sp) -/* AEE2BC 80240EAC 8FB3001C */ lw $s3, 0x1c($sp) -/* AEE2C0 80240EB0 8FB20018 */ lw $s2, 0x18($sp) -/* AEE2C4 80240EB4 8FB10014 */ lw $s1, 0x14($sp) -/* AEE2C8 80240EB8 8FB00010 */ lw $s0, 0x10($sp) -/* AEE2CC 80240EBC 24020002 */ addiu $v0, $zero, 2 -/* AEE2D0 80240EC0 03E00008 */ jr $ra -/* AEE2D4 80240EC4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s new file mode 100644 index 0000000000..a5e2335781 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240DE4_AEE1F4.s @@ -0,0 +1,61 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DE4_AEE1F4 +/* AEE1F4 80240DE4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* AEE1F8 80240DE8 AFB10014 */ sw $s1, 0x14($sp) +/* AEE1FC 80240DEC 0080882D */ daddu $s1, $a0, $zero +/* AEE200 80240DF0 AFBF0024 */ sw $ra, 0x24($sp) +/* AEE204 80240DF4 AFB40020 */ sw $s4, 0x20($sp) +/* AEE208 80240DF8 AFB3001C */ sw $s3, 0x1c($sp) +/* AEE20C 80240DFC AFB20018 */ sw $s2, 0x18($sp) +/* AEE210 80240E00 AFB00010 */ sw $s0, 0x10($sp) +/* AEE214 80240E04 8E30000C */ lw $s0, 0xc($s1) +/* AEE218 80240E08 8E140000 */ lw $s4, ($s0) +/* AEE21C 80240E0C 26100004 */ addiu $s0, $s0, 4 +/* AEE220 80240E10 8E050000 */ lw $a1, ($s0) +/* AEE224 80240E14 0C0B1EAF */ jal get_variable +/* AEE228 80240E18 26100004 */ addiu $s0, $s0, 4 +/* AEE22C 80240E1C 8E050000 */ lw $a1, ($s0) +/* AEE230 80240E20 26100004 */ addiu $s0, $s0, 4 +/* AEE234 80240E24 0220202D */ daddu $a0, $s1, $zero +/* AEE238 80240E28 0C0B1EAF */ jal get_variable +/* AEE23C 80240E2C 0040982D */ daddu $s3, $v0, $zero +/* AEE240 80240E30 8E050000 */ lw $a1, ($s0) +/* AEE244 80240E34 26100004 */ addiu $s0, $s0, 4 +/* AEE248 80240E38 0220202D */ daddu $a0, $s1, $zero +/* AEE24C 80240E3C 0C0B1EAF */ jal get_variable +/* AEE250 80240E40 0040902D */ daddu $s2, $v0, $zero +/* AEE254 80240E44 0220202D */ daddu $a0, $s1, $zero +/* AEE258 80240E48 8E050000 */ lw $a1, ($s0) +/* AEE25C 80240E4C 0C0B1EAF */ jal get_variable +/* AEE260 80240E50 0040802D */ daddu $s0, $v0, $zero +/* AEE264 80240E54 44901000 */ mtc1 $s0, $f2 +/* AEE268 80240E58 00000000 */ nop +/* AEE26C 80240E5C 468010A0 */ cvt.s.w $f2, $f2 +/* AEE270 80240E60 44936000 */ mtc1 $s3, $f12 +/* AEE274 80240E64 00000000 */ nop +/* AEE278 80240E68 46806320 */ cvt.s.w $f12, $f12 +/* AEE27C 80240E6C 44061000 */ mfc1 $a2, $f2 +/* AEE280 80240E70 44821000 */ mtc1 $v0, $f2 +/* AEE284 80240E74 00000000 */ nop +/* AEE288 80240E78 468010A0 */ cvt.s.w $f2, $f2 +/* AEE28C 80240E7C 44071000 */ mfc1 $a3, $f2 +/* AEE290 80240E80 44927000 */ mtc1 $s2, $f14 +/* AEE294 80240E84 00000000 */ nop +/* AEE298 80240E88 0C00A720 */ jal atan2 +/* AEE29C 80240E8C 468073A0 */ cvt.s.w $f14, $f14 +/* AEE2A0 80240E90 0220202D */ daddu $a0, $s1, $zero +/* AEE2A4 80240E94 4600008D */ trunc.w.s $f2, $f0 +/* AEE2A8 80240E98 44061000 */ mfc1 $a2, $f2 +/* AEE2AC 80240E9C 0C0B2026 */ jal set_variable +/* AEE2B0 80240EA0 0280282D */ daddu $a1, $s4, $zero +/* AEE2B4 80240EA4 8FBF0024 */ lw $ra, 0x24($sp) +/* AEE2B8 80240EA8 8FB40020 */ lw $s4, 0x20($sp) +/* AEE2BC 80240EAC 8FB3001C */ lw $s3, 0x1c($sp) +/* AEE2C0 80240EB0 8FB20018 */ lw $s2, 0x18($sp) +/* AEE2C4 80240EB4 8FB10014 */ lw $s1, 0x14($sp) +/* AEE2C8 80240EB8 8FB00010 */ lw $s0, 0x10($sp) +/* AEE2CC 80240EBC 24020002 */ addiu $v0, $zero, 2 +/* AEE2D0 80240EC0 03E00008 */ jr $ra +/* AEE2D4 80240EC4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8.s deleted file mode 100644 index 2f8046a66b..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EC8 -/* AEE2D8 80240EC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AEE2DC 80240ECC AFBF0010 */ sw $ra, 0x10($sp) -/* AEE2E0 80240ED0 8C82000C */ lw $v0, 0xc($a0) -/* AEE2E4 80240ED4 3C068011 */ lui $a2, 0x8011 -/* AEE2E8 80240ED8 80C6EFD4 */ lb $a2, -0x102c($a2) -/* AEE2EC 80240EDC 0C0B2026 */ jal set_variable -/* AEE2F0 80240EE0 8C450000 */ lw $a1, ($v0) -/* AEE2F4 80240EE4 8FBF0010 */ lw $ra, 0x10($sp) -/* AEE2F8 80240EE8 24020002 */ addiu $v0, $zero, 2 -/* AEE2FC 80240EEC 03E00008 */ jr $ra -/* AEE300 80240EF0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s new file mode 100644 index 0000000000..2a22d7bf22 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EC8_AEE2D8 +/* AEE2D8 80240EC8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* AEE2DC 80240ECC AFBF0010 */ sw $ra, 0x10($sp) +/* AEE2E0 80240ED0 8C82000C */ lw $v0, 0xc($a0) +/* AEE2E4 80240ED4 3C068011 */ lui $a2, 0x8011 +/* AEE2E8 80240ED8 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AEE2EC 80240EDC 0C0B2026 */ jal set_variable +/* AEE2F0 80240EE0 8C450000 */ lw $a1, ($v0) +/* AEE2F4 80240EE4 8FBF0010 */ lw $ra, 0x10($sp) +/* AEE2F8 80240EE8 24020002 */ addiu $v0, $zero, 2 +/* AEE2FC 80240EEC 03E00008 */ jr $ra +/* AEE300 80240EF0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10.s deleted file mode 100644 index be5ec989fe..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10.s +++ /dev/null @@ -1,98 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F10 -/* AEE320 80240F10 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* AEE324 80240F14 AFB3001C */ sw $s3, 0x1c($sp) -/* AEE328 80240F18 0080982D */ daddu $s3, $a0, $zero -/* AEE32C 80240F1C AFBF0030 */ sw $ra, 0x30($sp) -/* AEE330 80240F20 AFB7002C */ sw $s7, 0x2c($sp) -/* AEE334 80240F24 AFB60028 */ sw $s6, 0x28($sp) -/* AEE338 80240F28 AFB50024 */ sw $s5, 0x24($sp) -/* AEE33C 80240F2C AFB40020 */ sw $s4, 0x20($sp) -/* AEE340 80240F30 AFB20018 */ sw $s2, 0x18($sp) -/* AEE344 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* AEE348 80240F38 AFB00010 */ sw $s0, 0x10($sp) -/* AEE34C 80240F3C F7B80048 */ sdc1 $f24, 0x48($sp) -/* AEE350 80240F40 F7B60040 */ sdc1 $f22, 0x40($sp) -/* AEE354 80240F44 F7B40038 */ sdc1 $f20, 0x38($sp) -/* AEE358 80240F48 8E70000C */ lw $s0, 0xc($s3) -/* AEE35C 80240F4C 8E050000 */ lw $a1, ($s0) -/* AEE360 80240F50 0C0B1EAF */ jal get_variable -/* AEE364 80240F54 26100004 */ addiu $s0, $s0, 4 -/* AEE368 80240F58 8E150000 */ lw $s5, ($s0) -/* AEE36C 80240F5C 26100004 */ addiu $s0, $s0, 4 -/* AEE370 80240F60 0260202D */ daddu $a0, $s3, $zero -/* AEE374 80240F64 8E160000 */ lw $s6, ($s0) -/* AEE378 80240F68 8E170004 */ lw $s7, 4($s0) -/* AEE37C 80240F6C 0C0B36B0 */ jal resolve_npc -/* AEE380 80240F70 0040282D */ daddu $a1, $v0, $zero -/* AEE384 80240F74 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* AEE388 80240F78 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* AEE38C 80240F7C 0040802D */ daddu $s0, $v0, $zero -/* AEE390 80240F80 1200002F */ beqz $s0, .L80241040 -/* AEE394 80240F84 0220902D */ daddu $s2, $s1, $zero -/* AEE398 80240F88 C62C0028 */ lwc1 $f12, 0x28($s1) -/* AEE39C 80240F8C C62E0030 */ lwc1 $f14, 0x30($s1) -/* AEE3A0 80240F90 8E060038 */ lw $a2, 0x38($s0) -/* AEE3A4 80240F94 8E070040 */ lw $a3, 0x40($s0) -/* AEE3A8 80240F98 3C014248 */ lui $at, 0x4248 -/* AEE3AC 80240F9C 4481C000 */ mtc1 $at, $f24 -/* AEE3B0 80240FA0 0C00A7B5 */ jal dist2D -/* AEE3B4 80240FA4 24140001 */ addiu $s4, $zero, 1 -/* AEE3B8 80240FA8 4618003C */ c.lt.s $f0, $f24 -/* AEE3BC 80240FAC 00000000 */ nop -/* AEE3C0 80240FB0 45030001 */ bc1tl .L80240FB8 -/* AEE3C4 80240FB4 0000A02D */ daddu $s4, $zero, $zero -.L80240FB8: -/* AEE3C8 80240FB8 C64C0028 */ lwc1 $f12, 0x28($s2) -/* AEE3CC 80240FBC C64E0030 */ lwc1 $f14, 0x30($s2) -/* AEE3D0 80240FC0 8E060038 */ lw $a2, 0x38($s0) -/* AEE3D4 80240FC4 0C00A720 */ jal atan2 -/* AEE3D8 80240FC8 8E070040 */ lw $a3, 0x40($s0) -/* AEE3DC 80240FCC 0C00A6C9 */ jal clamp_angle -/* AEE3E0 80240FD0 46000306 */ mov.s $f12, $f0 -/* AEE3E4 80240FD4 46000506 */ mov.s $f20, $f0 -/* AEE3E8 80240FD8 0C00A8BB */ jal sin_deg -/* AEE3EC 80240FDC 4600A306 */ mov.s $f12, $f20 -/* AEE3F0 80240FE0 46180002 */ mul.s $f0, $f0, $f24 -/* AEE3F4 80240FE4 00000000 */ nop -/* AEE3F8 80240FE8 C6560028 */ lwc1 $f22, 0x28($s2) -/* AEE3FC 80240FEC 4600B580 */ add.s $f22, $f22, $f0 -/* AEE400 80240FF0 0C00A8D4 */ jal cos_deg -/* AEE404 80240FF4 4600A306 */ mov.s $f12, $f20 -/* AEE408 80240FF8 46180002 */ mul.s $f0, $f0, $f24 -/* AEE40C 80240FFC 00000000 */ nop -/* AEE410 80241000 0260202D */ daddu $a0, $s3, $zero -/* AEE414 80241004 02A0282D */ daddu $a1, $s5, $zero -/* AEE418 80241008 C6540030 */ lwc1 $f20, 0x30($s2) -/* AEE41C 8024100C 0280302D */ daddu $a2, $s4, $zero -/* AEE420 80241010 0C0B2026 */ jal set_variable -/* AEE424 80241014 4600A501 */ sub.s $f20, $f20, $f0 -/* AEE428 80241018 0260202D */ daddu $a0, $s3, $zero -/* AEE42C 8024101C 4600B08D */ trunc.w.s $f2, $f22 -/* AEE430 80241020 44061000 */ mfc1 $a2, $f2 -/* AEE434 80241024 0C0B2026 */ jal set_variable -/* AEE438 80241028 02C0282D */ daddu $a1, $s6, $zero -/* AEE43C 8024102C 0260202D */ daddu $a0, $s3, $zero -/* AEE440 80241030 4600A08D */ trunc.w.s $f2, $f20 -/* AEE444 80241034 44061000 */ mfc1 $a2, $f2 -/* AEE448 80241038 0C0B2026 */ jal set_variable -/* AEE44C 8024103C 02E0282D */ daddu $a1, $s7, $zero -.L80241040: -/* AEE450 80241040 24020002 */ addiu $v0, $zero, 2 -/* AEE454 80241044 8FBF0030 */ lw $ra, 0x30($sp) -/* AEE458 80241048 8FB7002C */ lw $s7, 0x2c($sp) -/* AEE45C 8024104C 8FB60028 */ lw $s6, 0x28($sp) -/* AEE460 80241050 8FB50024 */ lw $s5, 0x24($sp) -/* AEE464 80241054 8FB40020 */ lw $s4, 0x20($sp) -/* AEE468 80241058 8FB3001C */ lw $s3, 0x1c($sp) -/* AEE46C 8024105C 8FB20018 */ lw $s2, 0x18($sp) -/* AEE470 80241060 8FB10014 */ lw $s1, 0x14($sp) -/* AEE474 80241064 8FB00010 */ lw $s0, 0x10($sp) -/* AEE478 80241068 D7B80048 */ ldc1 $f24, 0x48($sp) -/* AEE47C 8024106C D7B60040 */ ldc1 $f22, 0x40($sp) -/* AEE480 80241070 D7B40038 */ ldc1 $f20, 0x38($sp) -/* AEE484 80241074 03E00008 */ jr $ra -/* AEE488 80241078 27BD0050 */ addiu $sp, $sp, 0x50 -/* AEE48C 8024107C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s new file mode 100644 index 0000000000..56a1856f28 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240F10_AEE320.s @@ -0,0 +1,98 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F10_AEE320 +/* AEE320 80240F10 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* AEE324 80240F14 AFB3001C */ sw $s3, 0x1c($sp) +/* AEE328 80240F18 0080982D */ daddu $s3, $a0, $zero +/* AEE32C 80240F1C AFBF0030 */ sw $ra, 0x30($sp) +/* AEE330 80240F20 AFB7002C */ sw $s7, 0x2c($sp) +/* AEE334 80240F24 AFB60028 */ sw $s6, 0x28($sp) +/* AEE338 80240F28 AFB50024 */ sw $s5, 0x24($sp) +/* AEE33C 80240F2C AFB40020 */ sw $s4, 0x20($sp) +/* AEE340 80240F30 AFB20018 */ sw $s2, 0x18($sp) +/* AEE344 80240F34 AFB10014 */ sw $s1, 0x14($sp) +/* AEE348 80240F38 AFB00010 */ sw $s0, 0x10($sp) +/* AEE34C 80240F3C F7B80048 */ sdc1 $f24, 0x48($sp) +/* AEE350 80240F40 F7B60040 */ sdc1 $f22, 0x40($sp) +/* AEE354 80240F44 F7B40038 */ sdc1 $f20, 0x38($sp) +/* AEE358 80240F48 8E70000C */ lw $s0, 0xc($s3) +/* AEE35C 80240F4C 8E050000 */ lw $a1, ($s0) +/* AEE360 80240F50 0C0B1EAF */ jal get_variable +/* AEE364 80240F54 26100004 */ addiu $s0, $s0, 4 +/* AEE368 80240F58 8E150000 */ lw $s5, ($s0) +/* AEE36C 80240F5C 26100004 */ addiu $s0, $s0, 4 +/* AEE370 80240F60 0260202D */ daddu $a0, $s3, $zero +/* AEE374 80240F64 8E160000 */ lw $s6, ($s0) +/* AEE378 80240F68 8E170004 */ lw $s7, 4($s0) +/* AEE37C 80240F6C 0C0B36B0 */ jal resolve_npc +/* AEE380 80240F70 0040282D */ daddu $a1, $v0, $zero +/* AEE384 80240F74 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* AEE388 80240F78 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* AEE38C 80240F7C 0040802D */ daddu $s0, $v0, $zero +/* AEE390 80240F80 1200002F */ beqz $s0, .L80241040 +/* AEE394 80240F84 0220902D */ daddu $s2, $s1, $zero +/* AEE398 80240F88 C62C0028 */ lwc1 $f12, 0x28($s1) +/* AEE39C 80240F8C C62E0030 */ lwc1 $f14, 0x30($s1) +/* AEE3A0 80240F90 8E060038 */ lw $a2, 0x38($s0) +/* AEE3A4 80240F94 8E070040 */ lw $a3, 0x40($s0) +/* AEE3A8 80240F98 3C014248 */ lui $at, 0x4248 +/* AEE3AC 80240F9C 4481C000 */ mtc1 $at, $f24 +/* AEE3B0 80240FA0 0C00A7B5 */ jal dist2D +/* AEE3B4 80240FA4 24140001 */ addiu $s4, $zero, 1 +/* AEE3B8 80240FA8 4618003C */ c.lt.s $f0, $f24 +/* AEE3BC 80240FAC 00000000 */ nop +/* AEE3C0 80240FB0 45030001 */ bc1tl .L80240FB8 +/* AEE3C4 80240FB4 0000A02D */ daddu $s4, $zero, $zero +.L80240FB8: +/* AEE3C8 80240FB8 C64C0028 */ lwc1 $f12, 0x28($s2) +/* AEE3CC 80240FBC C64E0030 */ lwc1 $f14, 0x30($s2) +/* AEE3D0 80240FC0 8E060038 */ lw $a2, 0x38($s0) +/* AEE3D4 80240FC4 0C00A720 */ jal atan2 +/* AEE3D8 80240FC8 8E070040 */ lw $a3, 0x40($s0) +/* AEE3DC 80240FCC 0C00A6C9 */ jal clamp_angle +/* AEE3E0 80240FD0 46000306 */ mov.s $f12, $f0 +/* AEE3E4 80240FD4 46000506 */ mov.s $f20, $f0 +/* AEE3E8 80240FD8 0C00A8BB */ jal sin_deg +/* AEE3EC 80240FDC 4600A306 */ mov.s $f12, $f20 +/* AEE3F0 80240FE0 46180002 */ mul.s $f0, $f0, $f24 +/* AEE3F4 80240FE4 00000000 */ nop +/* AEE3F8 80240FE8 C6560028 */ lwc1 $f22, 0x28($s2) +/* AEE3FC 80240FEC 4600B580 */ add.s $f22, $f22, $f0 +/* AEE400 80240FF0 0C00A8D4 */ jal cos_deg +/* AEE404 80240FF4 4600A306 */ mov.s $f12, $f20 +/* AEE408 80240FF8 46180002 */ mul.s $f0, $f0, $f24 +/* AEE40C 80240FFC 00000000 */ nop +/* AEE410 80241000 0260202D */ daddu $a0, $s3, $zero +/* AEE414 80241004 02A0282D */ daddu $a1, $s5, $zero +/* AEE418 80241008 C6540030 */ lwc1 $f20, 0x30($s2) +/* AEE41C 8024100C 0280302D */ daddu $a2, $s4, $zero +/* AEE420 80241010 0C0B2026 */ jal set_variable +/* AEE424 80241014 4600A501 */ sub.s $f20, $f20, $f0 +/* AEE428 80241018 0260202D */ daddu $a0, $s3, $zero +/* AEE42C 8024101C 4600B08D */ trunc.w.s $f2, $f22 +/* AEE430 80241020 44061000 */ mfc1 $a2, $f2 +/* AEE434 80241024 0C0B2026 */ jal set_variable +/* AEE438 80241028 02C0282D */ daddu $a1, $s6, $zero +/* AEE43C 8024102C 0260202D */ daddu $a0, $s3, $zero +/* AEE440 80241030 4600A08D */ trunc.w.s $f2, $f20 +/* AEE444 80241034 44061000 */ mfc1 $a2, $f2 +/* AEE448 80241038 0C0B2026 */ jal set_variable +/* AEE44C 8024103C 02E0282D */ daddu $a1, $s7, $zero +.L80241040: +/* AEE450 80241040 24020002 */ addiu $v0, $zero, 2 +/* AEE454 80241044 8FBF0030 */ lw $ra, 0x30($sp) +/* AEE458 80241048 8FB7002C */ lw $s7, 0x2c($sp) +/* AEE45C 8024104C 8FB60028 */ lw $s6, 0x28($sp) +/* AEE460 80241050 8FB50024 */ lw $s5, 0x24($sp) +/* AEE464 80241054 8FB40020 */ lw $s4, 0x20($sp) +/* AEE468 80241058 8FB3001C */ lw $s3, 0x1c($sp) +/* AEE46C 8024105C 8FB20018 */ lw $s2, 0x18($sp) +/* AEE470 80241060 8FB10014 */ lw $s1, 0x14($sp) +/* AEE474 80241064 8FB00010 */ lw $s0, 0x10($sp) +/* AEE478 80241068 D7B80048 */ ldc1 $f24, 0x48($sp) +/* AEE47C 8024106C D7B60040 */ ldc1 $f22, 0x40($sp) +/* AEE480 80241070 D7B40038 */ ldc1 $f20, 0x38($sp) +/* AEE484 80241074 03E00008 */ jr $ra +/* AEE488 80241078 27BD0050 */ addiu $sp, $sp, 0x50 +/* AEE48C 8024107C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774.s deleted file mode 100644 index dd26a285a4..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240774 -/* AF3414 80240774 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF3418 80240778 AFB00018 */ sw $s0, 0x18($sp) -/* AF341C 8024077C 0080802D */ daddu $s0, $a0, $zero -/* AF3420 80240780 3C03800B */ lui $v1, %hi(gCameras) -/* AF3424 80240784 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* AF3428 80240788 0060202D */ daddu $a0, $v1, $zero -/* AF342C 8024078C 10A00005 */ beqz $a1, .L802407A4 -/* AF3430 80240790 AFBF001C */ sw $ra, 0x1c($sp) -/* AF3434 80240794 94620000 */ lhu $v0, ($v1) -/* AF3438 80240798 34420008 */ ori $v0, $v0, 8 -/* AF343C 8024079C A4620000 */ sh $v0, ($v1) -/* AF3440 802407A0 AE000070 */ sw $zero, 0x70($s0) -.L802407A4: -/* AF3444 802407A4 C6000070 */ lwc1 $f0, 0x70($s0) -/* AF3448 802407A8 3C014120 */ lui $at, 0x4120 -/* AF344C 802407AC 44811000 */ mtc1 $at, $f2 -/* AF3450 802407B0 00000000 */ nop -/* AF3454 802407B4 46020000 */ add.s $f0, $f0, $f2 -/* AF3458 802407B8 3C01BF80 */ lui $at, 0xbf80 -/* AF345C 802407BC 44811000 */ mtc1 $at, $f2 -/* AF3460 802407C0 E6000070 */ swc1 $f0, 0x70($s0) -/* AF3464 802407C4 44800000 */ mtc1 $zero, $f0 -/* AF3468 802407C8 24840194 */ addiu $a0, $a0, 0x194 -/* AF346C 802407CC E7A20010 */ swc1 $f2, 0x10($sp) -/* AF3470 802407D0 44060000 */ mfc1 $a2, $f0 -/* AF3474 802407D4 8E050070 */ lw $a1, 0x70($s0) -/* AF3478 802407D8 0C019EC8 */ jal guRotateF -/* AF347C 802407DC 00C0382D */ daddu $a3, $a2, $zero -/* AF3480 802407E0 C6000070 */ lwc1 $f0, 0x70($s0) -/* AF3484 802407E4 3C018024 */ lui $at, 0x8024 -/* AF3488 802407E8 D4224CA0 */ ldc1 $f2, 0x4ca0($at) -/* AF348C 802407EC 46000021 */ cvt.d.s $f0, $f0 -/* AF3490 802407F0 4620103E */ c.le.d $f2, $f0 -/* AF3494 802407F4 00000000 */ nop -/* AF3498 802407F8 45010002 */ bc1t .L80240804 -/* AF349C 802407FC 24020002 */ addiu $v0, $zero, 2 -/* AF34A0 80240800 0000102D */ daddu $v0, $zero, $zero -.L80240804: -/* AF34A4 80240804 8FBF001C */ lw $ra, 0x1c($sp) -/* AF34A8 80240808 8FB00018 */ lw $s0, 0x18($sp) -/* AF34AC 8024080C 03E00008 */ jr $ra -/* AF34B0 80240810 27BD0020 */ addiu $sp, $sp, 0x20 -/* AF34B4 80240814 00000000 */ nop -/* AF34B8 80240818 00000000 */ nop -/* AF34BC 8024081C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s new file mode 100644 index 0000000000..279ecef40f --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240774_AF3414.s @@ -0,0 +1,49 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240774_AF3414 +/* AF3414 80240774 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* AF3418 80240778 AFB00018 */ sw $s0, 0x18($sp) +/* AF341C 8024077C 0080802D */ daddu $s0, $a0, $zero +/* AF3420 80240780 3C03800B */ lui $v1, %hi(gCameras) +/* AF3424 80240784 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* AF3428 80240788 0060202D */ daddu $a0, $v1, $zero +/* AF342C 8024078C 10A00005 */ beqz $a1, .L802407A4 +/* AF3430 80240790 AFBF001C */ sw $ra, 0x1c($sp) +/* AF3434 80240794 94620000 */ lhu $v0, ($v1) +/* AF3438 80240798 34420008 */ ori $v0, $v0, 8 +/* AF343C 8024079C A4620000 */ sh $v0, ($v1) +/* AF3440 802407A0 AE000070 */ sw $zero, 0x70($s0) +.L802407A4: +/* AF3444 802407A4 C6000070 */ lwc1 $f0, 0x70($s0) +/* AF3448 802407A8 3C014120 */ lui $at, 0x4120 +/* AF344C 802407AC 44811000 */ mtc1 $at, $f2 +/* AF3450 802407B0 00000000 */ nop +/* AF3454 802407B4 46020000 */ add.s $f0, $f0, $f2 +/* AF3458 802407B8 3C01BF80 */ lui $at, 0xbf80 +/* AF345C 802407BC 44811000 */ mtc1 $at, $f2 +/* AF3460 802407C0 E6000070 */ swc1 $f0, 0x70($s0) +/* AF3464 802407C4 44800000 */ mtc1 $zero, $f0 +/* AF3468 802407C8 24840194 */ addiu $a0, $a0, 0x194 +/* AF346C 802407CC E7A20010 */ swc1 $f2, 0x10($sp) +/* AF3470 802407D0 44060000 */ mfc1 $a2, $f0 +/* AF3474 802407D4 8E050070 */ lw $a1, 0x70($s0) +/* AF3478 802407D8 0C019EC8 */ jal guRotateF +/* AF347C 802407DC 00C0382D */ daddu $a3, $a2, $zero +/* AF3480 802407E0 C6000070 */ lwc1 $f0, 0x70($s0) +/* AF3484 802407E4 3C018024 */ lui $at, 0x8024 +/* AF3488 802407E8 D4224CA0 */ ldc1 $f2, 0x4ca0($at) +/* AF348C 802407EC 46000021 */ cvt.d.s $f0, $f0 +/* AF3490 802407F0 4620103E */ c.le.d $f2, $f0 +/* AF3494 802407F4 00000000 */ nop +/* AF3498 802407F8 45010002 */ bc1t .L80240804 +/* AF349C 802407FC 24020002 */ addiu $v0, $zero, 2 +/* AF34A0 80240800 0000102D */ daddu $v0, $zero, $zero +.L80240804: +/* AF34A4 80240804 8FBF001C */ lw $ra, 0x1c($sp) +/* AF34A8 80240808 8FB00018 */ lw $s0, 0x18($sp) +/* AF34AC 8024080C 03E00008 */ jr $ra +/* AF34B0 80240810 27BD0020 */ addiu $sp, $sp, 0x20 +/* AF34B4 80240814 00000000 */ nop +/* AF34B8 80240818 00000000 */ nop +/* AF34BC 8024081C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4.s deleted file mode 100644 index cded537fac..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E4 -/* AF7A34 802400E4 3C038024 */ lui $v1, 0x8024 -/* AF7A38 802400E8 8C630E90 */ lw $v1, 0xe90($v1) -/* AF7A3C 802400EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AF7A40 802400F0 AFB1001C */ sw $s1, 0x1c($sp) -/* AF7A44 802400F4 00A0882D */ daddu $s1, $a1, $zero -/* AF7A48 802400F8 AFB20020 */ sw $s2, 0x20($sp) -/* AF7A4C 802400FC 00C0902D */ daddu $s2, $a2, $zero -/* AF7A50 80240100 AFBF0024 */ sw $ra, 0x24($sp) -/* AF7A54 80240104 AFB00018 */ sw $s0, 0x18($sp) -/* AF7A58 80240108 00031040 */ sll $v0, $v1, 1 -/* AF7A5C 8024010C 00431021 */ addu $v0, $v0, $v1 -/* AF7A60 80240110 00021080 */ sll $v0, $v0, 2 -/* AF7A64 80240114 3C108024 */ lui $s0, 0x8024 -/* AF7A68 80240118 02028021 */ addu $s0, $s0, $v0 -/* AF7A6C 8024011C 8E100E10 */ lw $s0, 0xe10($s0) -/* AF7A70 80240120 3C028008 */ lui $v0, %hi(gItemTable) -/* AF7A74 80240124 244278E0 */ addiu $v0, $v0, %lo(gItemTable) -/* AF7A78 80240128 00108140 */ sll $s0, $s0, 5 -/* AF7A7C 8024012C 02028021 */ addu $s0, $s0, $v0 -/* AF7A80 80240130 8E040000 */ lw $a0, ($s0) -/* AF7A84 80240134 0C04991D */ jal get_string_width -/* AF7A88 80240138 0000282D */ daddu $a1, $zero, $zero -/* AF7A8C 8024013C 00021043 */ sra $v0, $v0, 1 -/* AF7A90 80240140 2442FFC4 */ addiu $v0, $v0, -0x3c -/* AF7A94 80240144 02222823 */ subu $a1, $s1, $v0 -/* AF7A98 80240148 26460006 */ addiu $a2, $s2, 6 -/* AF7A9C 8024014C AFA00010 */ sw $zero, 0x10($sp) -/* AF7AA0 80240150 AFA00014 */ sw $zero, 0x14($sp) -/* AF7AA4 80240154 8E040000 */ lw $a0, ($s0) -/* AF7AA8 80240158 0C04993B */ jal draw_string -/* AF7AAC 8024015C 240700FF */ addiu $a3, $zero, 0xff -/* AF7AB0 80240160 8FBF0024 */ lw $ra, 0x24($sp) -/* AF7AB4 80240164 8FB20020 */ lw $s2, 0x20($sp) -/* AF7AB8 80240168 8FB1001C */ lw $s1, 0x1c($sp) -/* AF7ABC 8024016C 8FB00018 */ lw $s0, 0x18($sp) -/* AF7AC0 80240170 03E00008 */ jr $ra -/* AF7AC4 80240174 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s new file mode 100644 index 0000000000..ae3d19fe31 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_802400E4_AF7A34.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400E4_AF7A34 +/* AF7A34 802400E4 3C038024 */ lui $v1, 0x8024 +/* AF7A38 802400E8 8C630E90 */ lw $v1, 0xe90($v1) +/* AF7A3C 802400EC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* AF7A40 802400F0 AFB1001C */ sw $s1, 0x1c($sp) +/* AF7A44 802400F4 00A0882D */ daddu $s1, $a1, $zero +/* AF7A48 802400F8 AFB20020 */ sw $s2, 0x20($sp) +/* AF7A4C 802400FC 00C0902D */ daddu $s2, $a2, $zero +/* AF7A50 80240100 AFBF0024 */ sw $ra, 0x24($sp) +/* AF7A54 80240104 AFB00018 */ sw $s0, 0x18($sp) +/* AF7A58 80240108 00031040 */ sll $v0, $v1, 1 +/* AF7A5C 8024010C 00431021 */ addu $v0, $v0, $v1 +/* AF7A60 80240110 00021080 */ sll $v0, $v0, 2 +/* AF7A64 80240114 3C108024 */ lui $s0, 0x8024 +/* AF7A68 80240118 02028021 */ addu $s0, $s0, $v0 +/* AF7A6C 8024011C 8E100E10 */ lw $s0, 0xe10($s0) +/* AF7A70 80240120 3C028008 */ lui $v0, %hi(gItemTable) +/* AF7A74 80240124 244278E0 */ addiu $v0, $v0, %lo(gItemTable) +/* AF7A78 80240128 00108140 */ sll $s0, $s0, 5 +/* AF7A7C 8024012C 02028021 */ addu $s0, $s0, $v0 +/* AF7A80 80240130 8E040000 */ lw $a0, ($s0) +/* AF7A84 80240134 0C04991D */ jal get_string_width +/* AF7A88 80240138 0000282D */ daddu $a1, $zero, $zero +/* AF7A8C 8024013C 00021043 */ sra $v0, $v0, 1 +/* AF7A90 80240140 2442FFC4 */ addiu $v0, $v0, -0x3c +/* AF7A94 80240144 02222823 */ subu $a1, $s1, $v0 +/* AF7A98 80240148 26460006 */ addiu $a2, $s2, 6 +/* AF7A9C 8024014C AFA00010 */ sw $zero, 0x10($sp) +/* AF7AA0 80240150 AFA00014 */ sw $zero, 0x14($sp) +/* AF7AA4 80240154 8E040000 */ lw $a0, ($s0) +/* AF7AA8 80240158 0C04993B */ jal draw_string +/* AF7AAC 8024015C 240700FF */ addiu $a3, $zero, 0xff +/* AF7AB0 80240160 8FBF0024 */ lw $ra, 0x24($sp) +/* AF7AB4 80240164 8FB20020 */ lw $s2, 0x20($sp) +/* AF7AB8 80240168 8FB1001C */ lw $s1, 0x1c($sp) +/* AF7ABC 8024016C 8FB00018 */ lw $s0, 0x18($sp) +/* AF7AC0 80240170 03E00008 */ jr $ra +/* AF7AC4 80240174 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178.s deleted file mode 100644 index c6bdd5e1a4..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240178 -/* AF7AC8 80240178 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF7ACC 8024017C 3C038024 */ lui $v1, 0x8024 -/* AF7AD0 80240180 8C630E90 */ lw $v1, 0xe90($v1) -/* AF7AD4 80240184 3C048024 */ lui $a0, 0x8024 -/* AF7AD8 80240188 24840E10 */ addiu $a0, $a0, 0xe10 -/* AF7ADC 8024018C AFBF0018 */ sw $ra, 0x18($sp) -/* AF7AE0 80240190 00031040 */ sll $v0, $v1, 1 -/* AF7AE4 80240194 00431021 */ addu $v0, $v0, $v1 -/* AF7AE8 80240198 00021080 */ sll $v0, $v0, 2 -/* AF7AEC 8024019C 00443821 */ addu $a3, $v0, $a0 -/* AF7AF0 802401A0 3C048008 */ lui $a0, %hi(gItemTable) -/* AF7AF4 802401A4 248478E0 */ addiu $a0, $a0, %lo(gItemTable) -/* AF7AF8 802401A8 8CE20000 */ lw $v0, ($a3) -/* AF7AFC 802401AC 8CE30008 */ lw $v1, 8($a3) -/* AF7B00 802401B0 00021140 */ sll $v0, $v0, 5 -/* AF7B04 802401B4 10600007 */ beqz $v1, .L802401D4 -/* AF7B08 802401B8 00442021 */ addu $a0, $v0, $a0 -/* AF7B0C 802401BC 2402000A */ addiu $v0, $zero, 0xa -/* AF7B10 802401C0 AFA20010 */ sw $v0, 0x10($sp) -/* AF7B14 802401C4 AFA00014 */ sw $zero, 0x14($sp) -/* AF7B18 802401C8 8CE40008 */ lw $a0, 8($a3) -/* AF7B1C 802401CC 0809007A */ j .L802401E8 -/* AF7B20 802401D0 24A50008 */ addiu $a1, $a1, 8 -.L802401D4: -/* AF7B24 802401D4 24A50008 */ addiu $a1, $a1, 8 -/* AF7B28 802401D8 2402000A */ addiu $v0, $zero, 0xa -/* AF7B2C 802401DC AFA20010 */ sw $v0, 0x10($sp) -/* AF7B30 802401E0 AFA00014 */ sw $zero, 0x14($sp) -/* AF7B34 802401E4 8C840014 */ lw $a0, 0x14($a0) -.L802401E8: -/* AF7B38 802401E8 0C04993B */ jal draw_string -/* AF7B3C 802401EC 240700FF */ addiu $a3, $zero, 0xff -/* AF7B40 802401F0 8FBF0018 */ lw $ra, 0x18($sp) -/* AF7B44 802401F4 03E00008 */ jr $ra -/* AF7B48 802401F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s new file mode 100644 index 0000000000..7b7ab18ccb --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7950/func_80240178_AF7AC8.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240178_AF7AC8 +/* AF7AC8 80240178 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* AF7ACC 8024017C 3C038024 */ lui $v1, 0x8024 +/* AF7AD0 80240180 8C630E90 */ lw $v1, 0xe90($v1) +/* AF7AD4 80240184 3C048024 */ lui $a0, 0x8024 +/* AF7AD8 80240188 24840E10 */ addiu $a0, $a0, 0xe10 +/* AF7ADC 8024018C AFBF0018 */ sw $ra, 0x18($sp) +/* AF7AE0 80240190 00031040 */ sll $v0, $v1, 1 +/* AF7AE4 80240194 00431021 */ addu $v0, $v0, $v1 +/* AF7AE8 80240198 00021080 */ sll $v0, $v0, 2 +/* AF7AEC 8024019C 00443821 */ addu $a3, $v0, $a0 +/* AF7AF0 802401A0 3C048008 */ lui $a0, %hi(gItemTable) +/* AF7AF4 802401A4 248478E0 */ addiu $a0, $a0, %lo(gItemTable) +/* AF7AF8 802401A8 8CE20000 */ lw $v0, ($a3) +/* AF7AFC 802401AC 8CE30008 */ lw $v1, 8($a3) +/* AF7B00 802401B0 00021140 */ sll $v0, $v0, 5 +/* AF7B04 802401B4 10600007 */ beqz $v1, .L802401D4 +/* AF7B08 802401B8 00442021 */ addu $a0, $v0, $a0 +/* AF7B0C 802401BC 2402000A */ addiu $v0, $zero, 0xa +/* AF7B10 802401C0 AFA20010 */ sw $v0, 0x10($sp) +/* AF7B14 802401C4 AFA00014 */ sw $zero, 0x14($sp) +/* AF7B18 802401C8 8CE40008 */ lw $a0, 8($a3) +/* AF7B1C 802401CC 0809007A */ j .L802401E8 +/* AF7B20 802401D0 24A50008 */ addiu $a1, $a1, 8 +.L802401D4: +/* AF7B24 802401D4 24A50008 */ addiu $a1, $a1, 8 +/* AF7B28 802401D8 2402000A */ addiu $v0, $zero, 0xa +/* AF7B2C 802401DC AFA20010 */ sw $v0, 0x10($sp) +/* AF7B30 802401E0 AFA00014 */ sw $zero, 0x14($sp) +/* AF7B34 802401E4 8C840014 */ lw $a0, 0x14($a0) +.L802401E8: +/* AF7B38 802401E8 0C04993B */ jal draw_string +/* AF7B3C 802401EC 240700FF */ addiu $a3, $zero, 0xff +/* AF7B40 802401F0 8FBF0018 */ lw $ra, 0x18($sp) +/* AF7B44 802401F4 03E00008 */ jr $ra +/* AF7B48 802401F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0.s deleted file mode 100644 index 82cca9aa2c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A0 -/* AF7FF0 802406A0 3C048024 */ lui $a0, 0x8024 -/* AF7FF4 802406A4 8C846568 */ lw $a0, 0x6568($a0) -/* AF7FF8 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF7FFC 802406AC AFBF0010 */ sw $ra, 0x10($sp) -/* AF8000 802406B0 0C0511EA */ jal draw_icon_0 -/* AF8004 802406B4 00000000 */ nop -/* AF8008 802406B8 8FBF0010 */ lw $ra, 0x10($sp) -/* AF800C 802406BC 03E00008 */ jr $ra -/* AF8010 802406C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s new file mode 100644 index 0000000000..a74a38c985 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_802406A0_AF7FF0.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406A0_AF7FF0 +/* AF7FF0 802406A0 3C048024 */ lui $a0, 0x8024 +/* AF7FF4 802406A4 8C846568 */ lw $a0, 0x6568($a0) +/* AF7FF8 802406A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* AF7FFC 802406AC AFBF0010 */ sw $ra, 0x10($sp) +/* AF8000 802406B0 0C0511EA */ jal draw_icon_0 +/* AF8004 802406B4 00000000 */ nop +/* AF8008 802406B8 8FBF0010 */ lw $ra, 0x10($sp) +/* AF800C 802406BC 03E00008 */ jr $ra +/* AF8010 802406C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C.s deleted file mode 100644 index b89bb24032..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B8C -/* AF84DC 80240B8C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AF84E0 80240B90 AFB00010 */ sw $s0, 0x10($sp) -/* AF84E4 80240B94 0080802D */ daddu $s0, $a0, $zero -/* AF84E8 80240B98 AFBF0018 */ sw $ra, 0x18($sp) -/* AF84EC 80240B9C AFB10014 */ sw $s1, 0x14($sp) -/* AF84F0 80240BA0 8E02000C */ lw $v0, 0xc($s0) -/* AF84F4 80240BA4 8C510000 */ lw $s1, ($v0) -/* AF84F8 80240BA8 0C0B1EAF */ jal get_variable -/* AF84FC 80240BAC 0220282D */ daddu $a1, $s1, $zero -/* AF8500 80240BB0 0200202D */ daddu $a0, $s0, $zero -/* AF8504 80240BB4 00021140 */ sll $v0, $v0, 5 -/* AF8508 80240BB8 3C068008 */ lui $a2, %hi(gItemTable) -/* AF850C 80240BBC 00C23021 */ addu $a2, $a2, $v0 -/* AF8510 80240BC0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) -/* AF8514 80240BC4 0C0B2026 */ jal set_variable -/* AF8518 80240BC8 0220282D */ daddu $a1, $s1, $zero -/* AF851C 80240BCC 8FBF0018 */ lw $ra, 0x18($sp) -/* AF8520 80240BD0 8FB10014 */ lw $s1, 0x14($sp) -/* AF8524 80240BD4 8FB00010 */ lw $s0, 0x10($sp) -/* AF8528 80240BD8 24020002 */ addiu $v0, $zero, 2 -/* AF852C 80240BDC 03E00008 */ jr $ra -/* AF8530 80240BE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s new file mode 100644 index 0000000000..d2001ce36d --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240B8C_AF84DC.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B8C_AF84DC +/* AF84DC 80240B8C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* AF84E0 80240B90 AFB00010 */ sw $s0, 0x10($sp) +/* AF84E4 80240B94 0080802D */ daddu $s0, $a0, $zero +/* AF84E8 80240B98 AFBF0018 */ sw $ra, 0x18($sp) +/* AF84EC 80240B9C AFB10014 */ sw $s1, 0x14($sp) +/* AF84F0 80240BA0 8E02000C */ lw $v0, 0xc($s0) +/* AF84F4 80240BA4 8C510000 */ lw $s1, ($v0) +/* AF84F8 80240BA8 0C0B1EAF */ jal get_variable +/* AF84FC 80240BAC 0220282D */ daddu $a1, $s1, $zero +/* AF8500 80240BB0 0200202D */ daddu $a0, $s0, $zero +/* AF8504 80240BB4 00021140 */ sll $v0, $v0, 5 +/* AF8508 80240BB8 3C068008 */ lui $a2, %hi(gItemTable) +/* AF850C 80240BBC 00C23021 */ addu $a2, $a2, $v0 +/* AF8510 80240BC0 8CC678E0 */ lw $a2, %lo(gItemTable)($a2) +/* AF8514 80240BC4 0C0B2026 */ jal set_variable +/* AF8518 80240BC8 0220282D */ daddu $a1, $s1, $zero +/* AF851C 80240BCC 8FBF0018 */ lw $ra, 0x18($sp) +/* AF8520 80240BD0 8FB10014 */ lw $s1, 0x14($sp) +/* AF8524 80240BD4 8FB00010 */ lw $s0, 0x10($sp) +/* AF8528 80240BD8 24020002 */ addiu $v0, $zero, 2 +/* AF852C 80240BDC 03E00008 */ jr $ra +/* AF8530 80240BE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10.s deleted file mode 100644 index 5f6a244915..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C10 -/* AF8560 80240C10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AF8564 80240C14 AFBF0010 */ sw $ra, 0x10($sp) -/* AF8568 80240C18 8C82000C */ lw $v0, 0xc($a0) -/* AF856C 80240C1C 0C0B1EAF */ jal get_variable -/* AF8570 80240C20 8C450000 */ lw $a1, ($v0) -/* AF8574 80240C24 3C048007 */ lui $a0, %hi(gGameStatusPtr) -/* AF8578 80240C28 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) -/* AF857C 80240C2C 0040182D */ daddu $v1, $v0, $zero -/* AF8580 80240C30 3C018011 */ lui $at, 0x8011 -/* AF8584 80240C34 A023F08C */ sb $v1, -0xf74($at) -/* AF8588 80240C38 A0830080 */ sb $v1, 0x80($a0) -/* AF858C 80240C3C 8FBF0010 */ lw $ra, 0x10($sp) -/* AF8590 80240C40 24020002 */ addiu $v0, $zero, 2 -/* AF8594 80240C44 03E00008 */ jr $ra -/* AF8598 80240C48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s new file mode 100644 index 0000000000..0256e6abbd --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C10_AF8560 +/* AF8560 80240C10 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* AF8564 80240C14 AFBF0010 */ sw $ra, 0x10($sp) +/* AF8568 80240C18 8C82000C */ lw $v0, 0xc($a0) +/* AF856C 80240C1C 0C0B1EAF */ jal get_variable +/* AF8570 80240C20 8C450000 */ lw $a1, ($v0) +/* AF8574 80240C24 3C048007 */ lui $a0, %hi(gGameStatusPtr) +/* AF8578 80240C28 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) +/* AF857C 80240C2C 0040182D */ daddu $v1, $v0, $zero +/* AF8580 80240C30 3C018011 */ lui $at, 0x8011 +/* AF8584 80240C34 A023F08C */ sb $v1, -0xf74($at) +/* AF8588 80240C38 A0830080 */ sb $v1, 0x80($a0) +/* AF858C 80240C3C 8FBF0010 */ lw $ra, 0x10($sp) +/* AF8590 80240C40 24020002 */ addiu $v0, $zero, 2 +/* AF8594 80240C44 03E00008 */ jr $ra +/* AF8598 80240C48 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405B4.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405B4.s deleted file mode 100644 index 3e337c152c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405B4.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B4 -/* AFE0F4 802405B4 03E00008 */ jr $ra -/* AFE0F8 802405B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405B4_AFE0F4.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405B4_AFE0F4.s new file mode 100644 index 0000000000..6351afee78 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405B4_AFE0F4.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405B4_AFE0F4 +/* AFE0F4 802405B4 03E00008 */ jr $ra +/* AFE0F8 802405B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s index e57aa77b55..b61e2e306a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_8024039C_B02C1C.s @@ -105,7 +105,7 @@ glabel func_8024039C_B02C1C /* B02DA8 80240528 46200020 */ cvt.s.d $f0, $f0 /* B02DAC 8024052C E7A00010 */ swc1 $f0, 0x10($sp) /* B02DB0 80240530 8E26003C */ lw $a2, 0x3c($s1) -/* B02DB4 80240534 0C0900BC */ jal func_802402F0 +/* B02DB4 80240534 0C0900BC */ jal func_802402F0_B02B70 /* B02DB8 80240538 02C0202D */ daddu $a0, $s6, $zero /* B02DBC 8024053C 02A0202D */ daddu $a0, $s5, $zero /* B02DC0 80240540 4406C000 */ mfc1 $a2, $f24 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758.s deleted file mode 100644 index 469552c677..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240758 -/* B02FD8 80240758 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B02FDC 8024075C AFBF0010 */ sw $ra, 0x10($sp) -/* B02FE0 80240760 8C82000C */ lw $v0, 0xc($a0) -/* B02FE4 80240764 3C068011 */ lui $a2, 0x8011 -/* B02FE8 80240768 80C6EFD4 */ lb $a2, -0x102c($a2) -/* B02FEC 8024076C 0C0B2026 */ jal set_variable -/* B02FF0 80240770 8C450000 */ lw $a1, ($v0) -/* B02FF4 80240774 8FBF0010 */ lw $ra, 0x10($sp) -/* B02FF8 80240778 24020002 */ addiu $v0, $zero, 2 -/* B02FFC 8024077C 03E00008 */ jr $ra -/* B03000 80240780 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s new file mode 100644 index 0000000000..3669829815 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240758_B02FD8 +/* B02FD8 80240758 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B02FDC 8024075C AFBF0010 */ sw $ra, 0x10($sp) +/* B02FE0 80240760 8C82000C */ lw $v0, 0xc($a0) +/* B02FE4 80240764 3C068011 */ lui $a2, 0x8011 +/* B02FE8 80240768 80C6EFD4 */ lb $a2, -0x102c($a2) +/* B02FEC 8024076C 0C0B2026 */ jal set_variable +/* B02FF0 80240770 8C450000 */ lw $a1, ($v0) +/* B02FF4 80240774 8FBF0010 */ lw $ra, 0x10($sp) +/* B02FF8 80240778 24020002 */ addiu $v0, $zero, 2 +/* B02FFC 8024077C 03E00008 */ jr $ra +/* B03000 80240780 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_80240910.s b/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_80240910.s deleted file mode 100644 index de379f748c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_80240910.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240910 -/* B03190 80240910 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B03194 80240914 AFB10014 */ sw $s1, 0x14($sp) -/* B03198 80240918 0080882D */ daddu $s1, $a0, $zero -/* B0319C 8024091C AFBF0020 */ sw $ra, 0x20($sp) -/* B031A0 80240920 AFB3001C */ sw $s3, 0x1c($sp) -/* B031A4 80240924 AFB20018 */ sw $s2, 0x18($sp) -/* B031A8 80240928 AFB00010 */ sw $s0, 0x10($sp) -/* B031AC 8024092C 8E30000C */ lw $s0, 0xc($s1) -/* B031B0 80240930 8E050000 */ lw $a1, ($s0) -/* B031B4 80240934 0C0B1EAF */ jal get_variable -/* B031B8 80240938 26100004 */ addiu $s0, $s0, 4 -/* B031BC 8024093C 8E050000 */ lw $a1, ($s0) -/* B031C0 80240940 26100004 */ addiu $s0, $s0, 4 -/* B031C4 80240944 0220202D */ daddu $a0, $s1, $zero -/* B031C8 80240948 0C0B1EAF */ jal get_variable -/* B031CC 8024094C 0040902D */ daddu $s2, $v0, $zero -/* B031D0 80240950 8E050000 */ lw $a1, ($s0) -/* B031D4 80240954 26100004 */ addiu $s0, $s0, 4 -/* B031D8 80240958 0220202D */ daddu $a0, $s1, $zero -/* B031DC 8024095C 0C0B1EAF */ jal get_variable -/* B031E0 80240960 0040982D */ daddu $s3, $v0, $zero -/* B031E4 80240964 0220202D */ daddu $a0, $s1, $zero -/* B031E8 80240968 8E050000 */ lw $a1, ($s0) -/* B031EC 8024096C 0C0B1EAF */ jal get_variable -/* B031F0 80240970 0040802D */ daddu $s0, $v0, $zero -/* B031F4 80240974 8E43000C */ lw $v1, 0xc($s2) -/* B031F8 80240978 AC730030 */ sw $s3, 0x30($v1) -/* B031FC 8024097C 8E43000C */ lw $v1, 0xc($s2) -/* B03200 80240980 AC700034 */ sw $s0, 0x34($v1) -/* B03204 80240984 8E43000C */ lw $v1, 0xc($s2) -/* B03208 80240988 AC620038 */ sw $v0, 0x38($v1) -/* B0320C 8024098C 8FBF0020 */ lw $ra, 0x20($sp) -/* B03210 80240990 8FB3001C */ lw $s3, 0x1c($sp) -/* B03214 80240994 8FB20018 */ lw $s2, 0x18($sp) -/* B03218 80240998 8FB10014 */ lw $s1, 0x14($sp) -/* B0321C 8024099C 8FB00010 */ lw $s0, 0x10($sp) -/* B03220 802409A0 24020002 */ addiu $v0, $zero, 2 -/* B03224 802409A4 03E00008 */ jr $ra -/* B03228 802409A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_80240910_B03190.s b/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_80240910_B03190.s new file mode 100644 index 0000000000..2ddc86a97f --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_80240910_B03190.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240910_B03190 +/* B03190 80240910 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B03194 80240914 AFB10014 */ sw $s1, 0x14($sp) +/* B03198 80240918 0080882D */ daddu $s1, $a0, $zero +/* B0319C 8024091C AFBF0020 */ sw $ra, 0x20($sp) +/* B031A0 80240920 AFB3001C */ sw $s3, 0x1c($sp) +/* B031A4 80240924 AFB20018 */ sw $s2, 0x18($sp) +/* B031A8 80240928 AFB00010 */ sw $s0, 0x10($sp) +/* B031AC 8024092C 8E30000C */ lw $s0, 0xc($s1) +/* B031B0 80240930 8E050000 */ lw $a1, ($s0) +/* B031B4 80240934 0C0B1EAF */ jal get_variable +/* B031B8 80240938 26100004 */ addiu $s0, $s0, 4 +/* B031BC 8024093C 8E050000 */ lw $a1, ($s0) +/* B031C0 80240940 26100004 */ addiu $s0, $s0, 4 +/* B031C4 80240944 0220202D */ daddu $a0, $s1, $zero +/* B031C8 80240948 0C0B1EAF */ jal get_variable +/* B031CC 8024094C 0040902D */ daddu $s2, $v0, $zero +/* B031D0 80240950 8E050000 */ lw $a1, ($s0) +/* B031D4 80240954 26100004 */ addiu $s0, $s0, 4 +/* B031D8 80240958 0220202D */ daddu $a0, $s1, $zero +/* B031DC 8024095C 0C0B1EAF */ jal get_variable +/* B031E0 80240960 0040982D */ daddu $s3, $v0, $zero +/* B031E4 80240964 0220202D */ daddu $a0, $s1, $zero +/* B031E8 80240968 8E050000 */ lw $a1, ($s0) +/* B031EC 8024096C 0C0B1EAF */ jal get_variable +/* B031F0 80240970 0040802D */ daddu $s0, $v0, $zero +/* B031F4 80240974 8E43000C */ lw $v1, 0xc($s2) +/* B031F8 80240978 AC730030 */ sw $s3, 0x30($v1) +/* B031FC 8024097C 8E43000C */ lw $v1, 0xc($s2) +/* B03200 80240980 AC700034 */ sw $s0, 0x34($v1) +/* B03204 80240984 8E43000C */ lw $v1, 0xc($s2) +/* B03208 80240988 AC620038 */ sw $v0, 0x38($v1) +/* B0320C 8024098C 8FBF0020 */ lw $ra, 0x20($sp) +/* B03210 80240990 8FB3001C */ lw $s3, 0x1c($sp) +/* B03214 80240994 8FB20018 */ lw $s2, 0x18($sp) +/* B03218 80240998 8FB10014 */ lw $s1, 0x14($sp) +/* B0321C 8024099C 8FB00010 */ lw $s0, 0x10($sp) +/* B03220 802409A0 24020002 */ addiu $v0, $zero, 2 +/* B03224 802409A4 03E00008 */ jr $ra +/* B03228 802409A8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC.s b/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC.s deleted file mode 100644 index 3c29ff29ea..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409AC -/* B0322C 802409AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B03230 802409B0 AFBF0010 */ sw $ra, 0x10($sp) -/* B03234 802409B4 0C0398E9 */ jal func_800E63A4 -/* B03238 802409B8 0000202D */ daddu $a0, $zero, $zero -/* B0323C 802409BC 8FBF0010 */ lw $ra, 0x10($sp) -/* B03240 802409C0 24020002 */ addiu $v0, $zero, 2 -/* B03244 802409C4 03E00008 */ jr $ra -/* B03248 802409C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0324C 802409CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC_B0322C.s b/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC_B0322C.s new file mode 100644 index 0000000000..68092da911 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B03190/func_802409AC_B0322C.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409AC_B0322C +/* B0322C 802409AC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B03230 802409B0 AFBF0010 */ sw $ra, 0x10($sp) +/* B03234 802409B4 0C0398E9 */ jal func_800E63A4 +/* B03238 802409B8 0000202D */ daddu $a0, $zero, $zero +/* B0323C 802409BC 8FBF0010 */ lw $ra, 0x10($sp) +/* B03240 802409C0 24020002 */ addiu $v0, $zero, 2 +/* B03244 802409C4 03E00008 */ jr $ra +/* B03248 802409C8 27BD0018 */ addiu $sp, $sp, 0x18 +/* B0324C 802409CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4.s deleted file mode 100644 index 086eecd249..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401C4 -/* B06BC4 802401C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B06BC8 802401C8 AFB20018 */ sw $s2, 0x18($sp) -/* B06BCC 802401CC 0080902D */ daddu $s2, $a0, $zero -/* B06BD0 802401D0 AFBF001C */ sw $ra, 0x1c($sp) -/* B06BD4 802401D4 AFB10014 */ sw $s1, 0x14($sp) -/* B06BD8 802401D8 AFB00010 */ sw $s0, 0x10($sp) -/* B06BDC 802401DC 8E50000C */ lw $s0, 0xc($s2) -/* B06BE0 802401E0 8E050000 */ lw $a1, ($s0) -/* B06BE4 802401E4 0C0B1EAF */ jal get_variable -/* B06BE8 802401E8 26100004 */ addiu $s0, $s0, 4 -/* B06BEC 802401EC 0C04417A */ jal get_entity_by_index -/* B06BF0 802401F0 0040202D */ daddu $a0, $v0, $zero -/* B06BF4 802401F4 8E050000 */ lw $a1, ($s0) -/* B06BF8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* B06BFC 802401FC 0040882D */ daddu $s1, $v0, $zero -/* B06C00 80240200 C6200048 */ lwc1 $f0, 0x48($s1) -/* B06C04 80240204 4600008D */ trunc.w.s $f2, $f0 -/* B06C08 80240208 44061000 */ mfc1 $a2, $f2 -/* B06C0C 8024020C 0C0B2026 */ jal set_variable -/* B06C10 80240210 0240202D */ daddu $a0, $s2, $zero -/* B06C14 80240214 8E050000 */ lw $a1, ($s0) -/* B06C18 80240218 26100004 */ addiu $s0, $s0, 4 -/* B06C1C 8024021C C620004C */ lwc1 $f0, 0x4c($s1) -/* B06C20 80240220 4600008D */ trunc.w.s $f2, $f0 -/* B06C24 80240224 44061000 */ mfc1 $a2, $f2 -/* B06C28 80240228 0C0B2026 */ jal set_variable -/* B06C2C 8024022C 0240202D */ daddu $a0, $s2, $zero -/* B06C30 80240230 C6200050 */ lwc1 $f0, 0x50($s1) -/* B06C34 80240234 8E050000 */ lw $a1, ($s0) -/* B06C38 80240238 4600008D */ trunc.w.s $f2, $f0 -/* B06C3C 8024023C 44061000 */ mfc1 $a2, $f2 -/* B06C40 80240240 0C0B2026 */ jal set_variable -/* B06C44 80240244 0240202D */ daddu $a0, $s2, $zero -/* B06C48 80240248 8FBF001C */ lw $ra, 0x1c($sp) -/* B06C4C 8024024C 8FB20018 */ lw $s2, 0x18($sp) -/* B06C50 80240250 8FB10014 */ lw $s1, 0x14($sp) -/* B06C54 80240254 8FB00010 */ lw $s0, 0x10($sp) -/* B06C58 80240258 24020002 */ addiu $v0, $zero, 2 -/* B06C5C 8024025C 03E00008 */ jr $ra -/* B06C60 80240260 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s new file mode 100644 index 0000000000..c5a54ed2a0 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_802401C4_B06BC4.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401C4_B06BC4 +/* B06BC4 802401C4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B06BC8 802401C8 AFB20018 */ sw $s2, 0x18($sp) +/* B06BCC 802401CC 0080902D */ daddu $s2, $a0, $zero +/* B06BD0 802401D0 AFBF001C */ sw $ra, 0x1c($sp) +/* B06BD4 802401D4 AFB10014 */ sw $s1, 0x14($sp) +/* B06BD8 802401D8 AFB00010 */ sw $s0, 0x10($sp) +/* B06BDC 802401DC 8E50000C */ lw $s0, 0xc($s2) +/* B06BE0 802401E0 8E050000 */ lw $a1, ($s0) +/* B06BE4 802401E4 0C0B1EAF */ jal get_variable +/* B06BE8 802401E8 26100004 */ addiu $s0, $s0, 4 +/* B06BEC 802401EC 0C04417A */ jal get_entity_by_index +/* B06BF0 802401F0 0040202D */ daddu $a0, $v0, $zero +/* B06BF4 802401F4 8E050000 */ lw $a1, ($s0) +/* B06BF8 802401F8 26100004 */ addiu $s0, $s0, 4 +/* B06BFC 802401FC 0040882D */ daddu $s1, $v0, $zero +/* B06C00 80240200 C6200048 */ lwc1 $f0, 0x48($s1) +/* B06C04 80240204 4600008D */ trunc.w.s $f2, $f0 +/* B06C08 80240208 44061000 */ mfc1 $a2, $f2 +/* B06C0C 8024020C 0C0B2026 */ jal set_variable +/* B06C10 80240210 0240202D */ daddu $a0, $s2, $zero +/* B06C14 80240214 8E050000 */ lw $a1, ($s0) +/* B06C18 80240218 26100004 */ addiu $s0, $s0, 4 +/* B06C1C 8024021C C620004C */ lwc1 $f0, 0x4c($s1) +/* B06C20 80240220 4600008D */ trunc.w.s $f2, $f0 +/* B06C24 80240224 44061000 */ mfc1 $a2, $f2 +/* B06C28 80240228 0C0B2026 */ jal set_variable +/* B06C2C 8024022C 0240202D */ daddu $a0, $s2, $zero +/* B06C30 80240230 C6200050 */ lwc1 $f0, 0x50($s1) +/* B06C34 80240234 8E050000 */ lw $a1, ($s0) +/* B06C38 80240238 4600008D */ trunc.w.s $f2, $f0 +/* B06C3C 8024023C 44061000 */ mfc1 $a2, $f2 +/* B06C40 80240240 0C0B2026 */ jal set_variable +/* B06C44 80240244 0240202D */ daddu $a0, $s2, $zero +/* B06C48 80240248 8FBF001C */ lw $ra, 0x1c($sp) +/* B06C4C 8024024C 8FB20018 */ lw $s2, 0x18($sp) +/* B06C50 80240250 8FB10014 */ lw $s1, 0x14($sp) +/* B06C54 80240254 8FB00010 */ lw $s0, 0x10($sp) +/* B06C58 80240258 24020002 */ addiu $v0, $zero, 2 +/* B06C5C 8024025C 03E00008 */ jr $ra +/* B06C60 80240260 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264.s deleted file mode 100644 index ed80bc9f14..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240264 -/* B06C64 80240264 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B06C68 80240268 AFB1001C */ sw $s1, 0x1c($sp) -/* B06C6C 8024026C 0080882D */ daddu $s1, $a0, $zero -/* B06C70 80240270 AFBF0020 */ sw $ra, 0x20($sp) -/* B06C74 80240274 AFB00018 */ sw $s0, 0x18($sp) -/* B06C78 80240278 F7B80038 */ sdc1 $f24, 0x38($sp) -/* B06C7C 8024027C F7B60030 */ sdc1 $f22, 0x30($sp) -/* B06C80 80240280 F7B40028 */ sdc1 $f20, 0x28($sp) -/* B06C84 80240284 8E30000C */ lw $s0, 0xc($s1) -/* B06C88 80240288 8E050000 */ lw $a1, ($s0) -/* B06C8C 8024028C 0C0B210B */ jal get_float_variable -/* B06C90 80240290 26100004 */ addiu $s0, $s0, 4 -/* B06C94 80240294 8E050000 */ lw $a1, ($s0) -/* B06C98 80240298 26100004 */ addiu $s0, $s0, 4 -/* B06C9C 8024029C 0220202D */ daddu $a0, $s1, $zero -/* B06CA0 802402A0 0C0B210B */ jal get_float_variable -/* B06CA4 802402A4 46000606 */ mov.s $f24, $f0 -/* B06CA8 802402A8 8E050000 */ lw $a1, ($s0) -/* B06CAC 802402AC 26100004 */ addiu $s0, $s0, 4 -/* B06CB0 802402B0 0220202D */ daddu $a0, $s1, $zero -/* B06CB4 802402B4 0C0B210B */ jal get_float_variable -/* B06CB8 802402B8 46000586 */ mov.s $f22, $f0 -/* B06CBC 802402BC 0220202D */ daddu $a0, $s1, $zero -/* B06CC0 802402C0 8E050000 */ lw $a1, ($s0) -/* B06CC4 802402C4 0C0B1EAF */ jal get_variable -/* B06CC8 802402C8 46000506 */ mov.s $f20, $f0 -/* B06CCC 802402CC 4405C000 */ mfc1 $a1, $f24 -/* B06CD0 802402D0 4406B000 */ mfc1 $a2, $f22 -/* B06CD4 802402D4 4407A000 */ mfc1 $a3, $f20 -/* B06CD8 802402D8 0000202D */ daddu $a0, $zero, $zero -/* B06CDC 802402DC 0C01C094 */ jal func_80070250 -/* B06CE0 802402E0 AFA20010 */ sw $v0, 0x10($sp) -/* B06CE4 802402E4 8FBF0020 */ lw $ra, 0x20($sp) -/* B06CE8 802402E8 8FB1001C */ lw $s1, 0x1c($sp) -/* B06CEC 802402EC 8FB00018 */ lw $s0, 0x18($sp) -/* B06CF0 802402F0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* B06CF4 802402F4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* B06CF8 802402F8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* B06CFC 802402FC 24020002 */ addiu $v0, $zero, 2 -/* B06D00 80240300 03E00008 */ jr $ra -/* B06D04 80240304 27BD0040 */ addiu $sp, $sp, 0x40 -/* B06D08 80240308 00000000 */ nop -/* B06D0C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s new file mode 100644 index 0000000000..494bbbac8a --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06A80/func_80240264_B06C64.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240264_B06C64 +/* B06C64 80240264 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* B06C68 80240268 AFB1001C */ sw $s1, 0x1c($sp) +/* B06C6C 8024026C 0080882D */ daddu $s1, $a0, $zero +/* B06C70 80240270 AFBF0020 */ sw $ra, 0x20($sp) +/* B06C74 80240274 AFB00018 */ sw $s0, 0x18($sp) +/* B06C78 80240278 F7B80038 */ sdc1 $f24, 0x38($sp) +/* B06C7C 8024027C F7B60030 */ sdc1 $f22, 0x30($sp) +/* B06C80 80240280 F7B40028 */ sdc1 $f20, 0x28($sp) +/* B06C84 80240284 8E30000C */ lw $s0, 0xc($s1) +/* B06C88 80240288 8E050000 */ lw $a1, ($s0) +/* B06C8C 8024028C 0C0B210B */ jal get_float_variable +/* B06C90 80240290 26100004 */ addiu $s0, $s0, 4 +/* B06C94 80240294 8E050000 */ lw $a1, ($s0) +/* B06C98 80240298 26100004 */ addiu $s0, $s0, 4 +/* B06C9C 8024029C 0220202D */ daddu $a0, $s1, $zero +/* B06CA0 802402A0 0C0B210B */ jal get_float_variable +/* B06CA4 802402A4 46000606 */ mov.s $f24, $f0 +/* B06CA8 802402A8 8E050000 */ lw $a1, ($s0) +/* B06CAC 802402AC 26100004 */ addiu $s0, $s0, 4 +/* B06CB0 802402B0 0220202D */ daddu $a0, $s1, $zero +/* B06CB4 802402B4 0C0B210B */ jal get_float_variable +/* B06CB8 802402B8 46000586 */ mov.s $f22, $f0 +/* B06CBC 802402BC 0220202D */ daddu $a0, $s1, $zero +/* B06CC0 802402C0 8E050000 */ lw $a1, ($s0) +/* B06CC4 802402C4 0C0B1EAF */ jal get_variable +/* B06CC8 802402C8 46000506 */ mov.s $f20, $f0 +/* B06CCC 802402CC 4405C000 */ mfc1 $a1, $f24 +/* B06CD0 802402D0 4406B000 */ mfc1 $a2, $f22 +/* B06CD4 802402D4 4407A000 */ mfc1 $a3, $f20 +/* B06CD8 802402D8 0000202D */ daddu $a0, $zero, $zero +/* B06CDC 802402DC 0C01C094 */ jal func_80070250 +/* B06CE0 802402E0 AFA20010 */ sw $v0, 0x10($sp) +/* B06CE4 802402E4 8FBF0020 */ lw $ra, 0x20($sp) +/* B06CE8 802402E8 8FB1001C */ lw $s1, 0x1c($sp) +/* B06CEC 802402EC 8FB00018 */ lw $s0, 0x18($sp) +/* B06CF0 802402F0 D7B80038 */ ldc1 $f24, 0x38($sp) +/* B06CF4 802402F4 D7B60030 */ ldc1 $f22, 0x30($sp) +/* B06CF8 802402F8 D7B40028 */ ldc1 $f20, 0x28($sp) +/* B06CFC 802402FC 24020002 */ addiu $v0, $zero, 2 +/* B06D00 80240300 03E00008 */ jr $ra +/* B06D04 80240304 27BD0040 */ addiu $sp, $sp, 0x40 +/* B06D08 80240308 00000000 */ nop +/* B06D0C 8024030C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC.s deleted file mode 100644 index 86a97ab1b0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC.s +++ /dev/null @@ -1,73 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406EC -/* B070EC 802406EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B070F0 802406F0 AFB3001C */ sw $s3, 0x1c($sp) -/* B070F4 802406F4 0080982D */ daddu $s3, $a0, $zero -/* B070F8 802406F8 AFBF0020 */ sw $ra, 0x20($sp) -/* B070FC 802406FC AFB20018 */ sw $s2, 0x18($sp) -/* B07100 80240700 AFB10014 */ sw $s1, 0x14($sp) -/* B07104 80240704 AFB00010 */ sw $s0, 0x10($sp) -/* B07108 80240708 8E70000C */ lw $s0, 0xc($s3) -/* B0710C 8024070C 8E050000 */ lw $a1, ($s0) -/* B07110 80240710 0C0B1EAF */ jal get_variable -/* B07114 80240714 26100004 */ addiu $s0, $s0, 4 -/* B07118 80240718 0260202D */ daddu $a0, $s3, $zero -/* B0711C 8024071C 8E050000 */ lw $a1, ($s0) -/* B07120 80240720 0C0B1EAF */ jal get_variable -/* B07124 80240724 0040902D */ daddu $s2, $v0, $zero -/* B07128 80240728 2404003C */ addiu $a0, $zero, 0x3c -/* B0712C 8024072C 0C00AB39 */ jal heap_malloc -/* B07130 80240730 0040882D */ daddu $s1, $v0, $zero -/* B07134 80240734 0040802D */ daddu $s0, $v0, $zero -/* B07138 80240738 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B0713C 8024073C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B07140 80240740 AE120008 */ sw $s2, 8($s0) -/* B07144 80240744 AE11000C */ sw $s1, 0xc($s0) -/* B07148 80240748 846200B0 */ lh $v0, 0xb0($v1) -/* B0714C 8024074C 44820000 */ mtc1 $v0, $f0 -/* B07150 80240750 00000000 */ nop -/* B07154 80240754 46800020 */ cvt.s.w $f0, $f0 -/* B07158 80240758 E6000034 */ swc1 $f0, 0x34($s0) -/* B0715C 8024075C 846200B2 */ lh $v0, 0xb2($v1) -/* B07160 80240760 44820000 */ mtc1 $v0, $f0 -/* B07164 80240764 00000000 */ nop -/* B07168 80240768 46800020 */ cvt.s.w $f0, $f0 -/* B0716C 8024076C E6000038 */ swc1 $f0, 0x38($s0) -/* B07170 80240770 C4600028 */ lwc1 $f0, 0x28($v1) -/* B07174 80240774 E6000010 */ swc1 $f0, 0x10($s0) -/* B07178 80240778 C460002C */ lwc1 $f0, 0x2c($v1) -/* B0717C 8024077C E6000014 */ swc1 $f0, 0x14($s0) -/* B07180 80240780 C4620030 */ lwc1 $f2, 0x30($v1) -/* B07184 80240784 3C013F36 */ lui $at, 0x3f36 -/* B07188 80240788 3421DB6E */ ori $at, $at, 0xdb6e -/* B0718C 8024078C 44810000 */ mtc1 $at, $f0 -/* B07190 80240790 24040001 */ addiu $a0, $zero, 1 -/* B07194 80240794 AE00001C */ sw $zero, 0x1c($s0) -/* B07198 80240798 AE000020 */ sw $zero, 0x20($s0) -/* B0719C 8024079C AE000024 */ sw $zero, 0x24($s0) -/* B071A0 802407A0 E6000028 */ swc1 $f0, 0x28($s0) -/* B071A4 802407A4 E600002C */ swc1 $f0, 0x2c($s0) -/* B071A8 802407A8 E6000030 */ swc1 $f0, 0x30($s0) -/* B071AC 802407AC 0C04E9C1 */ jal func_8013A704 -/* B071B0 802407B0 E6020018 */ swc1 $f2, 0x18($s0) -/* B071B4 802407B4 0000202D */ daddu $a0, $zero, $zero -/* B071B8 802407B8 3C058024 */ lui $a1, 0x8024 -/* B071BC 802407BC 24A50310 */ addiu $a1, $a1, 0x310 -/* B071C0 802407C0 0C048C56 */ jal bind_dynamic_entity_3 -/* B071C4 802407C4 AE020000 */ sw $v0, ($s0) -/* B071C8 802407C8 0260202D */ daddu $a0, $s3, $zero -/* B071CC 802407CC 3C05FD05 */ lui $a1, 0xfd05 -/* B071D0 802407D0 34A50F8A */ ori $a1, $a1, 0xf8a -/* B071D4 802407D4 0200302D */ daddu $a2, $s0, $zero -/* B071D8 802407D8 0C0B2026 */ jal set_variable -/* B071DC 802407DC AE020004 */ sw $v0, 4($s0) -/* B071E0 802407E0 8FBF0020 */ lw $ra, 0x20($sp) -/* B071E4 802407E4 8FB3001C */ lw $s3, 0x1c($sp) -/* B071E8 802407E8 8FB20018 */ lw $s2, 0x18($sp) -/* B071EC 802407EC 8FB10014 */ lw $s1, 0x14($sp) -/* B071F0 802407F0 8FB00010 */ lw $s0, 0x10($sp) -/* B071F4 802407F4 24020002 */ addiu $v0, $zero, 2 -/* B071F8 802407F8 03E00008 */ jr $ra -/* B071FC 802407FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s new file mode 100644 index 0000000000..44da0b56cc --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_802406EC_B070EC.s @@ -0,0 +1,73 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406EC_B070EC +/* B070EC 802406EC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B070F0 802406F0 AFB3001C */ sw $s3, 0x1c($sp) +/* B070F4 802406F4 0080982D */ daddu $s3, $a0, $zero +/* B070F8 802406F8 AFBF0020 */ sw $ra, 0x20($sp) +/* B070FC 802406FC AFB20018 */ sw $s2, 0x18($sp) +/* B07100 80240700 AFB10014 */ sw $s1, 0x14($sp) +/* B07104 80240704 AFB00010 */ sw $s0, 0x10($sp) +/* B07108 80240708 8E70000C */ lw $s0, 0xc($s3) +/* B0710C 8024070C 8E050000 */ lw $a1, ($s0) +/* B07110 80240710 0C0B1EAF */ jal get_variable +/* B07114 80240714 26100004 */ addiu $s0, $s0, 4 +/* B07118 80240718 0260202D */ daddu $a0, $s3, $zero +/* B0711C 8024071C 8E050000 */ lw $a1, ($s0) +/* B07120 80240720 0C0B1EAF */ jal get_variable +/* B07124 80240724 0040902D */ daddu $s2, $v0, $zero +/* B07128 80240728 2404003C */ addiu $a0, $zero, 0x3c +/* B0712C 8024072C 0C00AB39 */ jal heap_malloc +/* B07130 80240730 0040882D */ daddu $s1, $v0, $zero +/* B07134 80240734 0040802D */ daddu $s0, $v0, $zero +/* B07138 80240738 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* B0713C 8024073C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* B07140 80240740 AE120008 */ sw $s2, 8($s0) +/* B07144 80240744 AE11000C */ sw $s1, 0xc($s0) +/* B07148 80240748 846200B0 */ lh $v0, 0xb0($v1) +/* B0714C 8024074C 44820000 */ mtc1 $v0, $f0 +/* B07150 80240750 00000000 */ nop +/* B07154 80240754 46800020 */ cvt.s.w $f0, $f0 +/* B07158 80240758 E6000034 */ swc1 $f0, 0x34($s0) +/* B0715C 8024075C 846200B2 */ lh $v0, 0xb2($v1) +/* B07160 80240760 44820000 */ mtc1 $v0, $f0 +/* B07164 80240764 00000000 */ nop +/* B07168 80240768 46800020 */ cvt.s.w $f0, $f0 +/* B0716C 8024076C E6000038 */ swc1 $f0, 0x38($s0) +/* B07170 80240770 C4600028 */ lwc1 $f0, 0x28($v1) +/* B07174 80240774 E6000010 */ swc1 $f0, 0x10($s0) +/* B07178 80240778 C460002C */ lwc1 $f0, 0x2c($v1) +/* B0717C 8024077C E6000014 */ swc1 $f0, 0x14($s0) +/* B07180 80240780 C4620030 */ lwc1 $f2, 0x30($v1) +/* B07184 80240784 3C013F36 */ lui $at, 0x3f36 +/* B07188 80240788 3421DB6E */ ori $at, $at, 0xdb6e +/* B0718C 8024078C 44810000 */ mtc1 $at, $f0 +/* B07190 80240790 24040001 */ addiu $a0, $zero, 1 +/* B07194 80240794 AE00001C */ sw $zero, 0x1c($s0) +/* B07198 80240798 AE000020 */ sw $zero, 0x20($s0) +/* B0719C 8024079C AE000024 */ sw $zero, 0x24($s0) +/* B071A0 802407A0 E6000028 */ swc1 $f0, 0x28($s0) +/* B071A4 802407A4 E600002C */ swc1 $f0, 0x2c($s0) +/* B071A8 802407A8 E6000030 */ swc1 $f0, 0x30($s0) +/* B071AC 802407AC 0C04E9C1 */ jal func_8013A704 +/* B071B0 802407B0 E6020018 */ swc1 $f2, 0x18($s0) +/* B071B4 802407B4 0000202D */ daddu $a0, $zero, $zero +/* B071B8 802407B8 3C058024 */ lui $a1, 0x8024 +/* B071BC 802407BC 24A50310 */ addiu $a1, $a1, 0x310 +/* B071C0 802407C0 0C048C56 */ jal bind_dynamic_entity_3 +/* B071C4 802407C4 AE020000 */ sw $v0, ($s0) +/* B071C8 802407C8 0260202D */ daddu $a0, $s3, $zero +/* B071CC 802407CC 3C05FD05 */ lui $a1, 0xfd05 +/* B071D0 802407D0 34A50F8A */ ori $a1, $a1, 0xf8a +/* B071D4 802407D4 0200302D */ daddu $a2, $s0, $zero +/* B071D8 802407D8 0C0B2026 */ jal set_variable +/* B071DC 802407DC AE020004 */ sw $v0, 4($s0) +/* B071E0 802407E0 8FBF0020 */ lw $ra, 0x20($sp) +/* B071E4 802407E4 8FB3001C */ lw $s3, 0x1c($sp) +/* B071E8 802407E8 8FB20018 */ lw $s2, 0x18($sp) +/* B071EC 802407EC 8FB10014 */ lw $s1, 0x14($sp) +/* B071F0 802407F0 8FB00010 */ lw $s0, 0x10($sp) +/* B071F4 802407F4 24020002 */ addiu $v0, $zero, 2 +/* B071F8 802407F8 03E00008 */ jr $ra +/* B071FC 802407FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C.s deleted file mode 100644 index 00ca1d0b17..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024092C -/* B0732C 8024092C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B07330 80240930 AFB10014 */ sw $s1, 0x14($sp) -/* B07334 80240934 0080882D */ daddu $s1, $a0, $zero -/* B07338 80240938 AFBF001C */ sw $ra, 0x1c($sp) -/* B0733C 8024093C AFB20018 */ sw $s2, 0x18($sp) -/* B07340 80240940 AFB00010 */ sw $s0, 0x10($sp) -/* B07344 80240944 8E30000C */ lw $s0, 0xc($s1) -/* B07348 80240948 8E050000 */ lw $a1, ($s0) -/* B0734C 8024094C 0C0B210B */ jal get_float_variable -/* B07350 80240950 26100004 */ addiu $s0, $s0, 4 -/* B07354 80240954 8E050000 */ lw $a1, ($s0) -/* B07358 80240958 26100004 */ addiu $s0, $s0, 4 -/* B0735C 8024095C 4600008D */ trunc.w.s $f2, $f0 -/* B07360 80240960 44121000 */ mfc1 $s2, $f2 -/* B07364 80240964 0C0B210B */ jal get_float_variable -/* B07368 80240968 0220202D */ daddu $a0, $s1, $zero -/* B0736C 8024096C 0220202D */ daddu $a0, $s1, $zero -/* B07370 80240970 8E050000 */ lw $a1, ($s0) -/* B07374 80240974 4600008D */ trunc.w.s $f2, $f0 -/* B07378 80240978 44111000 */ mfc1 $s1, $f2 -/* B0737C 8024097C 0C0B210B */ jal get_float_variable -/* B07380 80240980 00000000 */ nop -/* B07384 80240984 0000202D */ daddu $a0, $zero, $zero -/* B07388 80240988 3C05FD05 */ lui $a1, 0xfd05 -/* B0738C 8024098C 4600008D */ trunc.w.s $f2, $f0 -/* B07390 80240990 44101000 */ mfc1 $s0, $f2 -/* B07394 80240994 0C0B1EAF */ jal get_variable -/* B07398 80240998 34A50F8A */ ori $a1, $a1, 0xf8a -/* B0739C 8024099C 0040182D */ daddu $v1, $v0, $zero -/* B073A0 802409A0 44920000 */ mtc1 $s2, $f0 -/* B073A4 802409A4 00000000 */ nop -/* B073A8 802409A8 46800020 */ cvt.s.w $f0, $f0 -/* B073AC 802409AC E460001C */ swc1 $f0, 0x1c($v1) -/* B073B0 802409B0 44910000 */ mtc1 $s1, $f0 -/* B073B4 802409B4 00000000 */ nop -/* B073B8 802409B8 46800020 */ cvt.s.w $f0, $f0 -/* B073BC 802409BC E4600020 */ swc1 $f0, 0x20($v1) -/* B073C0 802409C0 44900000 */ mtc1 $s0, $f0 -/* B073C4 802409C4 00000000 */ nop -/* B073C8 802409C8 46800020 */ cvt.s.w $f0, $f0 -/* B073CC 802409CC E4600024 */ swc1 $f0, 0x24($v1) -/* B073D0 802409D0 8FBF001C */ lw $ra, 0x1c($sp) -/* B073D4 802409D4 8FB20018 */ lw $s2, 0x18($sp) -/* B073D8 802409D8 8FB10014 */ lw $s1, 0x14($sp) -/* B073DC 802409DC 8FB00010 */ lw $s0, 0x10($sp) -/* B073E0 802409E0 24020002 */ addiu $v0, $zero, 2 -/* B073E4 802409E4 03E00008 */ jr $ra -/* B073E8 802409E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s new file mode 100644 index 0000000000..492e118b5c --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_8024092C_B0732C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024092C_B0732C +/* B0732C 8024092C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B07330 80240930 AFB10014 */ sw $s1, 0x14($sp) +/* B07334 80240934 0080882D */ daddu $s1, $a0, $zero +/* B07338 80240938 AFBF001C */ sw $ra, 0x1c($sp) +/* B0733C 8024093C AFB20018 */ sw $s2, 0x18($sp) +/* B07340 80240940 AFB00010 */ sw $s0, 0x10($sp) +/* B07344 80240944 8E30000C */ lw $s0, 0xc($s1) +/* B07348 80240948 8E050000 */ lw $a1, ($s0) +/* B0734C 8024094C 0C0B210B */ jal get_float_variable +/* B07350 80240950 26100004 */ addiu $s0, $s0, 4 +/* B07354 80240954 8E050000 */ lw $a1, ($s0) +/* B07358 80240958 26100004 */ addiu $s0, $s0, 4 +/* B0735C 8024095C 4600008D */ trunc.w.s $f2, $f0 +/* B07360 80240960 44121000 */ mfc1 $s2, $f2 +/* B07364 80240964 0C0B210B */ jal get_float_variable +/* B07368 80240968 0220202D */ daddu $a0, $s1, $zero +/* B0736C 8024096C 0220202D */ daddu $a0, $s1, $zero +/* B07370 80240970 8E050000 */ lw $a1, ($s0) +/* B07374 80240974 4600008D */ trunc.w.s $f2, $f0 +/* B07378 80240978 44111000 */ mfc1 $s1, $f2 +/* B0737C 8024097C 0C0B210B */ jal get_float_variable +/* B07380 80240980 00000000 */ nop +/* B07384 80240984 0000202D */ daddu $a0, $zero, $zero +/* B07388 80240988 3C05FD05 */ lui $a1, 0xfd05 +/* B0738C 8024098C 4600008D */ trunc.w.s $f2, $f0 +/* B07390 80240990 44101000 */ mfc1 $s0, $f2 +/* B07394 80240994 0C0B1EAF */ jal get_variable +/* B07398 80240998 34A50F8A */ ori $a1, $a1, 0xf8a +/* B0739C 8024099C 0040182D */ daddu $v1, $v0, $zero +/* B073A0 802409A0 44920000 */ mtc1 $s2, $f0 +/* B073A4 802409A4 00000000 */ nop +/* B073A8 802409A8 46800020 */ cvt.s.w $f0, $f0 +/* B073AC 802409AC E460001C */ swc1 $f0, 0x1c($v1) +/* B073B0 802409B0 44910000 */ mtc1 $s1, $f0 +/* B073B4 802409B4 00000000 */ nop +/* B073B8 802409B8 46800020 */ cvt.s.w $f0, $f0 +/* B073BC 802409BC E4600020 */ swc1 $f0, 0x20($v1) +/* B073C0 802409C0 44900000 */ mtc1 $s0, $f0 +/* B073C4 802409C4 00000000 */ nop +/* B073C8 802409C8 46800020 */ cvt.s.w $f0, $f0 +/* B073CC 802409CC E4600024 */ swc1 $f0, 0x24($v1) +/* B073D0 802409D0 8FBF001C */ lw $ra, 0x1c($sp) +/* B073D4 802409D4 8FB20018 */ lw $s2, 0x18($sp) +/* B073D8 802409D8 8FB10014 */ lw $s1, 0x14($sp) +/* B073DC 802409DC 8FB00010 */ lw $s0, 0x10($sp) +/* B073E0 802409E0 24020002 */ addiu $v0, $zero, 2 +/* B073E4 802409E4 03E00008 */ jr $ra +/* B073E8 802409E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18.s deleted file mode 100644 index fd4e86a9f2..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B18 -/* B07518 80240B18 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B0751C 80240B1C AFB00028 */ sw $s0, 0x28($sp) -/* B07520 80240B20 0080802D */ daddu $s0, $a0, $zero -/* B07524 80240B24 AFBF002C */ sw $ra, 0x2c($sp) -/* B07528 80240B28 C6020084 */ lwc1 $f2, 0x84($s0) -/* B0752C 80240B2C 468010A0 */ cvt.s.w $f2, $f2 -/* B07530 80240B30 C6040088 */ lwc1 $f4, 0x88($s0) -/* B07534 80240B34 46802120 */ cvt.s.w $f4, $f4 -/* B07538 80240B38 C606008C */ lwc1 $f6, 0x8c($s0) -/* B0753C 80240B3C 468031A0 */ cvt.s.w $f6, $f6 -/* B07540 80240B40 C6000090 */ lwc1 $f0, 0x90($s0) -/* B07544 80240B44 46800020 */ cvt.s.w $f0, $f0 -/* B07548 80240B48 27A20020 */ addiu $v0, $sp, 0x20 -/* B0754C 80240B4C E7A00010 */ swc1 $f0, 0x10($sp) -/* B07550 80240B50 8E030094 */ lw $v1, 0x94($s0) -/* B07554 80240B54 44051000 */ mfc1 $a1, $f2 -/* B07558 80240B58 44062000 */ mfc1 $a2, $f4 -/* B0755C 80240B5C 44073000 */ mfc1 $a3, $f6 -/* B07560 80240B60 0000202D */ daddu $a0, $zero, $zero -/* B07564 80240B64 AFA20018 */ sw $v0, 0x18($sp) -/* B07568 80240B68 0C01C28C */ jal func_80070A30 -/* B0756C 80240B6C AFA30014 */ sw $v1, 0x14($sp) -/* B07570 80240B70 8FA20020 */ lw $v0, 0x20($sp) -/* B07574 80240B74 AE020084 */ sw $v0, 0x84($s0) -/* B07578 80240B78 8FBF002C */ lw $ra, 0x2c($sp) -/* B0757C 80240B7C 8FB00028 */ lw $s0, 0x28($sp) -/* B07580 80240B80 24020002 */ addiu $v0, $zero, 2 -/* B07584 80240B84 03E00008 */ jr $ra -/* B07588 80240B88 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18_B07518.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18_B07518.s new file mode 100644 index 0000000000..40e9037345 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240B18_B07518.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B18_B07518 +/* B07518 80240B18 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B0751C 80240B1C AFB00028 */ sw $s0, 0x28($sp) +/* B07520 80240B20 0080802D */ daddu $s0, $a0, $zero +/* B07524 80240B24 AFBF002C */ sw $ra, 0x2c($sp) +/* B07528 80240B28 C6020084 */ lwc1 $f2, 0x84($s0) +/* B0752C 80240B2C 468010A0 */ cvt.s.w $f2, $f2 +/* B07530 80240B30 C6040088 */ lwc1 $f4, 0x88($s0) +/* B07534 80240B34 46802120 */ cvt.s.w $f4, $f4 +/* B07538 80240B38 C606008C */ lwc1 $f6, 0x8c($s0) +/* B0753C 80240B3C 468031A0 */ cvt.s.w $f6, $f6 +/* B07540 80240B40 C6000090 */ lwc1 $f0, 0x90($s0) +/* B07544 80240B44 46800020 */ cvt.s.w $f0, $f0 +/* B07548 80240B48 27A20020 */ addiu $v0, $sp, 0x20 +/* B0754C 80240B4C E7A00010 */ swc1 $f0, 0x10($sp) +/* B07550 80240B50 8E030094 */ lw $v1, 0x94($s0) +/* B07554 80240B54 44051000 */ mfc1 $a1, $f2 +/* B07558 80240B58 44062000 */ mfc1 $a2, $f4 +/* B0755C 80240B5C 44073000 */ mfc1 $a3, $f6 +/* B07560 80240B60 0000202D */ daddu $a0, $zero, $zero +/* B07564 80240B64 AFA20018 */ sw $v0, 0x18($sp) +/* B07568 80240B68 0C01C28C */ jal func_80070A30 +/* B0756C 80240B6C AFA30014 */ sw $v1, 0x14($sp) +/* B07570 80240B70 8FA20020 */ lw $v0, 0x20($sp) +/* B07574 80240B74 AE020084 */ sw $v0, 0x84($s0) +/* B07578 80240B78 8FBF002C */ lw $ra, 0x2c($sp) +/* B0757C 80240B7C 8FB00028 */ lw $s0, 0x28($sp) +/* B07580 80240B80 24020002 */ addiu $v0, $zero, 2 +/* B07584 80240B84 03E00008 */ jr $ra +/* B07588 80240B88 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0.s deleted file mode 100644 index c09d6ebc64..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA0 -/* B075A0 80240BA0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B075A4 80240BA4 AFB10014 */ sw $s1, 0x14($sp) -/* B075A8 80240BA8 0080882D */ daddu $s1, $a0, $zero -/* B075AC 80240BAC AFBF0020 */ sw $ra, 0x20($sp) -/* B075B0 80240BB0 AFB3001C */ sw $s3, 0x1c($sp) -/* B075B4 80240BB4 AFB20018 */ sw $s2, 0x18($sp) -/* B075B8 80240BB8 AFB00010 */ sw $s0, 0x10($sp) -/* B075BC 80240BBC 8E30000C */ lw $s0, 0xc($s1) -/* B075C0 80240BC0 8E050000 */ lw $a1, ($s0) -/* B075C4 80240BC4 0C0B1EAF */ jal get_variable -/* B075C8 80240BC8 26100004 */ addiu $s0, $s0, 4 -/* B075CC 80240BCC 8E050000 */ lw $a1, ($s0) -/* B075D0 80240BD0 26100004 */ addiu $s0, $s0, 4 -/* B075D4 80240BD4 0220202D */ daddu $a0, $s1, $zero -/* B075D8 80240BD8 0C0B1EAF */ jal get_variable -/* B075DC 80240BDC 0040902D */ daddu $s2, $v0, $zero -/* B075E0 80240BE0 8E050000 */ lw $a1, ($s0) -/* B075E4 80240BE4 26100004 */ addiu $s0, $s0, 4 -/* B075E8 80240BE8 0220202D */ daddu $a0, $s1, $zero -/* B075EC 80240BEC 0C0B1EAF */ jal get_variable -/* B075F0 80240BF0 0040982D */ daddu $s3, $v0, $zero -/* B075F4 80240BF4 0220202D */ daddu $a0, $s1, $zero -/* B075F8 80240BF8 8E050000 */ lw $a1, ($s0) -/* B075FC 80240BFC 0C0B1EAF */ jal get_variable -/* B07600 80240C00 0040802D */ daddu $s0, $v0, $zero -/* B07604 80240C04 8E43000C */ lw $v1, 0xc($s2) -/* B07608 80240C08 44930000 */ mtc1 $s3, $f0 -/* B0760C 80240C0C 00000000 */ nop -/* B07610 80240C10 46800020 */ cvt.s.w $f0, $f0 -/* B07614 80240C14 E4600004 */ swc1 $f0, 4($v1) -/* B07618 80240C18 8E43000C */ lw $v1, 0xc($s2) -/* B0761C 80240C1C 44900000 */ mtc1 $s0, $f0 -/* B07620 80240C20 00000000 */ nop -/* B07624 80240C24 46800020 */ cvt.s.w $f0, $f0 -/* B07628 80240C28 E4600008 */ swc1 $f0, 8($v1) -/* B0762C 80240C2C 8E43000C */ lw $v1, 0xc($s2) -/* B07630 80240C30 44820000 */ mtc1 $v0, $f0 -/* B07634 80240C34 00000000 */ nop -/* B07638 80240C38 46800020 */ cvt.s.w $f0, $f0 -/* B0763C 80240C3C E460000C */ swc1 $f0, 0xc($v1) -/* B07640 80240C40 8FBF0020 */ lw $ra, 0x20($sp) -/* B07644 80240C44 8FB3001C */ lw $s3, 0x1c($sp) -/* B07648 80240C48 8FB20018 */ lw $s2, 0x18($sp) -/* B0764C 80240C4C 8FB10014 */ lw $s1, 0x14($sp) -/* B07650 80240C50 8FB00010 */ lw $s0, 0x10($sp) -/* B07654 80240C54 24020002 */ addiu $v0, $zero, 2 -/* B07658 80240C58 03E00008 */ jr $ra -/* B0765C 80240C5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0_B075A0.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0_B075A0.s new file mode 100644 index 0000000000..369e452920 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240BA0_B075A0.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BA0_B075A0 +/* B075A0 80240BA0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* B075A4 80240BA4 AFB10014 */ sw $s1, 0x14($sp) +/* B075A8 80240BA8 0080882D */ daddu $s1, $a0, $zero +/* B075AC 80240BAC AFBF0020 */ sw $ra, 0x20($sp) +/* B075B0 80240BB0 AFB3001C */ sw $s3, 0x1c($sp) +/* B075B4 80240BB4 AFB20018 */ sw $s2, 0x18($sp) +/* B075B8 80240BB8 AFB00010 */ sw $s0, 0x10($sp) +/* B075BC 80240BBC 8E30000C */ lw $s0, 0xc($s1) +/* B075C0 80240BC0 8E050000 */ lw $a1, ($s0) +/* B075C4 80240BC4 0C0B1EAF */ jal get_variable +/* B075C8 80240BC8 26100004 */ addiu $s0, $s0, 4 +/* B075CC 80240BCC 8E050000 */ lw $a1, ($s0) +/* B075D0 80240BD0 26100004 */ addiu $s0, $s0, 4 +/* B075D4 80240BD4 0220202D */ daddu $a0, $s1, $zero +/* B075D8 80240BD8 0C0B1EAF */ jal get_variable +/* B075DC 80240BDC 0040902D */ daddu $s2, $v0, $zero +/* B075E0 80240BE0 8E050000 */ lw $a1, ($s0) +/* B075E4 80240BE4 26100004 */ addiu $s0, $s0, 4 +/* B075E8 80240BE8 0220202D */ daddu $a0, $s1, $zero +/* B075EC 80240BEC 0C0B1EAF */ jal get_variable +/* B075F0 80240BF0 0040982D */ daddu $s3, $v0, $zero +/* B075F4 80240BF4 0220202D */ daddu $a0, $s1, $zero +/* B075F8 80240BF8 8E050000 */ lw $a1, ($s0) +/* B075FC 80240BFC 0C0B1EAF */ jal get_variable +/* B07600 80240C00 0040802D */ daddu $s0, $v0, $zero +/* B07604 80240C04 8E43000C */ lw $v1, 0xc($s2) +/* B07608 80240C08 44930000 */ mtc1 $s3, $f0 +/* B0760C 80240C0C 00000000 */ nop +/* B07610 80240C10 46800020 */ cvt.s.w $f0, $f0 +/* B07614 80240C14 E4600004 */ swc1 $f0, 4($v1) +/* B07618 80240C18 8E43000C */ lw $v1, 0xc($s2) +/* B0761C 80240C1C 44900000 */ mtc1 $s0, $f0 +/* B07620 80240C20 00000000 */ nop +/* B07624 80240C24 46800020 */ cvt.s.w $f0, $f0 +/* B07628 80240C28 E4600008 */ swc1 $f0, 8($v1) +/* B0762C 80240C2C 8E43000C */ lw $v1, 0xc($s2) +/* B07630 80240C30 44820000 */ mtc1 $v0, $f0 +/* B07634 80240C34 00000000 */ nop +/* B07638 80240C38 46800020 */ cvt.s.w $f0, $f0 +/* B0763C 80240C3C E460000C */ swc1 $f0, 0xc($v1) +/* B07640 80240C40 8FBF0020 */ lw $ra, 0x20($sp) +/* B07644 80240C44 8FB3001C */ lw $s3, 0x1c($sp) +/* B07648 80240C48 8FB20018 */ lw $s2, 0x18($sp) +/* B0764C 80240C4C 8FB10014 */ lw $s1, 0x14($sp) +/* B07650 80240C50 8FB00010 */ lw $s0, 0x10($sp) +/* B07654 80240C54 24020002 */ addiu $v0, $zero, 2 +/* B07658 80240C58 03E00008 */ jr $ra +/* B0765C 80240C5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60.s deleted file mode 100644 index 66dfdf3e83..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C60 -/* B07660 80240C60 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B07664 80240C64 AFB00028 */ sw $s0, 0x28($sp) -/* B07668 80240C68 0080802D */ daddu $s0, $a0, $zero -/* B0766C 80240C6C AFBF002C */ sw $ra, 0x2c($sp) -/* B07670 80240C70 C6020084 */ lwc1 $f2, 0x84($s0) -/* B07674 80240C74 468010A0 */ cvt.s.w $f2, $f2 -/* B07678 80240C78 C6040088 */ lwc1 $f4, 0x88($s0) -/* B0767C 80240C7C 46802120 */ cvt.s.w $f4, $f4 -/* B07680 80240C80 C606008C */ lwc1 $f6, 0x8c($s0) -/* B07684 80240C84 468031A0 */ cvt.s.w $f6, $f6 -/* B07688 80240C88 C6000090 */ lwc1 $f0, 0x90($s0) -/* B0768C 80240C8C 46800020 */ cvt.s.w $f0, $f0 -/* B07690 80240C90 27A20020 */ addiu $v0, $sp, 0x20 -/* B07694 80240C94 E7A00010 */ swc1 $f0, 0x10($sp) -/* B07698 80240C98 8E030094 */ lw $v1, 0x94($s0) -/* B0769C 80240C9C 44051000 */ mfc1 $a1, $f2 -/* B076A0 80240CA0 44062000 */ mfc1 $a2, $f4 -/* B076A4 80240CA4 44073000 */ mfc1 $a3, $f6 -/* B076A8 80240CA8 0000202D */ daddu $a0, $zero, $zero -/* B076AC 80240CAC AFA20018 */ sw $v0, 0x18($sp) -/* B076B0 80240CB0 0C01C28C */ jal func_80070A30 -/* B076B4 80240CB4 AFA30014 */ sw $v1, 0x14($sp) -/* B076B8 80240CB8 8FA20020 */ lw $v0, 0x20($sp) -/* B076BC 80240CBC AE020084 */ sw $v0, 0x84($s0) -/* B076C0 80240CC0 8FBF002C */ lw $ra, 0x2c($sp) -/* B076C4 80240CC4 8FB00028 */ lw $s0, 0x28($sp) -/* B076C8 80240CC8 24020002 */ addiu $v0, $zero, 2 -/* B076CC 80240CCC 03E00008 */ jr $ra -/* B076D0 80240CD0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60_B07660.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60_B07660.s new file mode 100644 index 0000000000..27a90977dc --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240C60_B07660.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C60_B07660 +/* B07660 80240C60 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B07664 80240C64 AFB00028 */ sw $s0, 0x28($sp) +/* B07668 80240C68 0080802D */ daddu $s0, $a0, $zero +/* B0766C 80240C6C AFBF002C */ sw $ra, 0x2c($sp) +/* B07670 80240C70 C6020084 */ lwc1 $f2, 0x84($s0) +/* B07674 80240C74 468010A0 */ cvt.s.w $f2, $f2 +/* B07678 80240C78 C6040088 */ lwc1 $f4, 0x88($s0) +/* B0767C 80240C7C 46802120 */ cvt.s.w $f4, $f4 +/* B07680 80240C80 C606008C */ lwc1 $f6, 0x8c($s0) +/* B07684 80240C84 468031A0 */ cvt.s.w $f6, $f6 +/* B07688 80240C88 C6000090 */ lwc1 $f0, 0x90($s0) +/* B0768C 80240C8C 46800020 */ cvt.s.w $f0, $f0 +/* B07690 80240C90 27A20020 */ addiu $v0, $sp, 0x20 +/* B07694 80240C94 E7A00010 */ swc1 $f0, 0x10($sp) +/* B07698 80240C98 8E030094 */ lw $v1, 0x94($s0) +/* B0769C 80240C9C 44051000 */ mfc1 $a1, $f2 +/* B076A0 80240CA0 44062000 */ mfc1 $a2, $f4 +/* B076A4 80240CA4 44073000 */ mfc1 $a3, $f6 +/* B076A8 80240CA8 0000202D */ daddu $a0, $zero, $zero +/* B076AC 80240CAC AFA20018 */ sw $v0, 0x18($sp) +/* B076B0 80240CB0 0C01C28C */ jal func_80070A30 +/* B076B4 80240CB4 AFA30014 */ sw $v1, 0x14($sp) +/* B076B8 80240CB8 8FA20020 */ lw $v0, 0x20($sp) +/* B076BC 80240CBC AE020084 */ sw $v0, 0x84($s0) +/* B076C0 80240CC0 8FBF002C */ lw $ra, 0x2c($sp) +/* B076C4 80240CC4 8FB00028 */ lw $s0, 0x28($sp) +/* B076C8 80240CC8 24020002 */ addiu $v0, $zero, 2 +/* B076CC 80240CCC 03E00008 */ jr $ra +/* B076D0 80240CD0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CD4.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CD4.s deleted file mode 100644 index 97545c49c7..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CD4.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD4 -/* B076D4 80240CD4 8C820084 */ lw $v0, 0x84($a0) -/* B076D8 80240CD8 8C42000C */ lw $v0, 0xc($v0) -/* B076DC 80240CDC AC400028 */ sw $zero, 0x28($v0) -/* B076E0 80240CE0 03E00008 */ jr $ra -/* B076E4 80240CE4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CD4_B076D4.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CD4_B076D4.s new file mode 100644 index 0000000000..c9e1aff700 --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CD4_B076D4.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CD4_B076D4 +/* B076D4 80240CD4 8C820084 */ lw $v0, 0x84($a0) +/* B076D8 80240CD8 8C42000C */ lw $v0, 0xc($v0) +/* B076DC 80240CDC AC400028 */ sw $zero, 0x28($v0) +/* B076E0 80240CE0 03E00008 */ jr $ra +/* B076E4 80240CE4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CE8.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CE8.s deleted file mode 100644 index 92e7c81c92..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CE8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CE8 -/* B076E8 80240CE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B076EC 80240CEC 3C028011 */ lui $v0, %hi(gPlayerData) -/* B076F0 80240CF0 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* B076F4 80240CF4 AFBF0010 */ sw $ra, 0x10($sp) -/* B076F8 80240CF8 90450003 */ lbu $a1, 3($v0) -/* B076FC 80240CFC 90460006 */ lbu $a2, 6($v0) -/* B07700 80240D00 8044028E */ lb $a0, 0x28e($v0) -/* B07704 80240D04 24030002 */ addiu $v1, $zero, 2 -/* B07708 80240D08 A0430292 */ sb $v1, 0x292($v0) -/* B0770C 80240D0C 00042200 */ sll $a0, $a0, 8 -/* B07710 80240D10 A0450002 */ sb $a1, 2($v0) -/* B07714 80240D14 A0460005 */ sb $a2, 5($v0) -/* B07718 80240D18 0C03A6DB */ jal sync_status_menu -/* B0771C 80240D1C A4440290 */ sh $a0, 0x290($v0) -/* B07720 80240D20 8FBF0010 */ lw $ra, 0x10($sp) -/* B07724 80240D24 24020002 */ addiu $v0, $zero, 2 -/* B07728 80240D28 03E00008 */ jr $ra -/* B0772C 80240D2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CE8_B076E8.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CE8_B076E8.s new file mode 100644 index 0000000000..5b3e6c1bea --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240CE8_B076E8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CE8_B076E8 +/* B076E8 80240CE8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B076EC 80240CEC 3C028011 */ lui $v0, %hi(gPlayerData) +/* B076F0 80240CF0 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* B076F4 80240CF4 AFBF0010 */ sw $ra, 0x10($sp) +/* B076F8 80240CF8 90450003 */ lbu $a1, 3($v0) +/* B076FC 80240CFC 90460006 */ lbu $a2, 6($v0) +/* B07700 80240D00 8044028E */ lb $a0, 0x28e($v0) +/* B07704 80240D04 24030002 */ addiu $v1, $zero, 2 +/* B07708 80240D08 A0430292 */ sb $v1, 0x292($v0) +/* B0770C 80240D0C 00042200 */ sll $a0, $a0, 8 +/* B07710 80240D10 A0450002 */ sb $a1, 2($v0) +/* B07714 80240D14 A0460005 */ sb $a2, 5($v0) +/* B07718 80240D18 0C03A6DB */ jal sync_status_menu +/* B0771C 80240D1C A4440290 */ sh $a0, 0x290($v0) +/* B07720 80240D20 8FBF0010 */ lw $ra, 0x10($sp) +/* B07724 80240D24 24020002 */ addiu $v0, $zero, 2 +/* B07728 80240D28 03E00008 */ jr $ra +/* B0772C 80240D2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54.s deleted file mode 100644 index e06876156c..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E54 -/* B07854 80240E54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B07858 80240E58 AFB00010 */ sw $s0, 0x10($sp) -/* B0785C 80240E5C 0080802D */ daddu $s0, $a0, $zero -/* B07860 80240E60 10A00003 */ beqz $a1, .L80240E70 -/* B07864 80240E64 AFBF0014 */ sw $ra, 0x14($sp) -/* B07868 80240E68 240200FF */ addiu $v0, $zero, 0xff -/* B0786C 80240E6C AE020074 */ sw $v0, 0x74($s0) -.L80240E70: -/* B07870 80240E70 C6000074 */ lwc1 $f0, 0x74($s0) -/* B07874 80240E74 46800020 */ cvt.s.w $f0, $f0 -/* B07878 80240E78 44050000 */ mfc1 $a1, $f0 -/* B0787C 80240E7C 0C04DF62 */ jal func_80137D88 -/* B07880 80240E80 24040001 */ addiu $a0, $zero, 1 -/* B07884 80240E84 8E020074 */ lw $v0, 0x74($s0) -/* B07888 80240E88 14400003 */ bnez $v0, .L80240E98 -/* B0788C 80240E8C 2442FFF0 */ addiu $v0, $v0, -0x10 -/* B07890 80240E90 080903AA */ j .L80240EA8 -/* B07894 80240E94 24020002 */ addiu $v0, $zero, 2 -.L80240E98: -/* B07898 80240E98 1C400002 */ bgtz $v0, .L80240EA4 -/* B0789C 80240E9C AE020074 */ sw $v0, 0x74($s0) -/* B078A0 80240EA0 AE000074 */ sw $zero, 0x74($s0) -.L80240EA4: -/* B078A4 80240EA4 0000102D */ daddu $v0, $zero, $zero -.L80240EA8: -/* B078A8 80240EA8 8FBF0014 */ lw $ra, 0x14($sp) -/* B078AC 80240EAC 8FB00010 */ lw $s0, 0x10($sp) -/* B078B0 80240EB0 03E00008 */ jr $ra -/* B078B4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54_B07854.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54_B07854.s new file mode 100644 index 0000000000..2dbe7c00ec --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240E54_B07854.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E54_B07854 +/* B07854 80240E54 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B07858 80240E58 AFB00010 */ sw $s0, 0x10($sp) +/* B0785C 80240E5C 0080802D */ daddu $s0, $a0, $zero +/* B07860 80240E60 10A00003 */ beqz $a1, .L80240E70 +/* B07864 80240E64 AFBF0014 */ sw $ra, 0x14($sp) +/* B07868 80240E68 240200FF */ addiu $v0, $zero, 0xff +/* B0786C 80240E6C AE020074 */ sw $v0, 0x74($s0) +.L80240E70: +/* B07870 80240E70 C6000074 */ lwc1 $f0, 0x74($s0) +/* B07874 80240E74 46800020 */ cvt.s.w $f0, $f0 +/* B07878 80240E78 44050000 */ mfc1 $a1, $f0 +/* B0787C 80240E7C 0C04DF62 */ jal func_80137D88 +/* B07880 80240E80 24040001 */ addiu $a0, $zero, 1 +/* B07884 80240E84 8E020074 */ lw $v0, 0x74($s0) +/* B07888 80240E88 14400003 */ bnez $v0, .L80240E98 +/* B0788C 80240E8C 2442FFF0 */ addiu $v0, $v0, -0x10 +/* B07890 80240E90 080903AA */ j .L80240EA8 +/* B07894 80240E94 24020002 */ addiu $v0, $zero, 2 +.L80240E98: +/* B07898 80240E98 1C400002 */ bgtz $v0, .L80240EA4 +/* B0789C 80240E9C AE020074 */ sw $v0, 0x74($s0) +/* B078A0 80240EA0 AE000074 */ sw $zero, 0x74($s0) +.L80240EA4: +/* B078A4 80240EA4 0000102D */ daddu $v0, $zero, $zero +.L80240EA8: +/* B078A8 80240EA8 8FBF0014 */ lw $ra, 0x14($sp) +/* B078AC 80240EAC 8FB00010 */ lw $s0, 0x10($sp) +/* B078B0 80240EB0 03E00008 */ jr $ra +/* B078B4 80240EB4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8.s deleted file mode 100644 index 2a007e1f52..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8 -/* B078B8 80240EB8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B078BC 80240EBC AFB00028 */ sw $s0, 0x28($sp) -/* B078C0 80240EC0 0080802D */ daddu $s0, $a0, $zero -/* B078C4 80240EC4 AFBF002C */ sw $ra, 0x2c($sp) -/* B078C8 80240EC8 C6020084 */ lwc1 $f2, 0x84($s0) -/* B078CC 80240ECC 468010A0 */ cvt.s.w $f2, $f2 -/* B078D0 80240ED0 C6040088 */ lwc1 $f4, 0x88($s0) -/* B078D4 80240ED4 46802120 */ cvt.s.w $f4, $f4 -/* B078D8 80240ED8 C606008C */ lwc1 $f6, 0x8c($s0) -/* B078DC 80240EDC 468031A0 */ cvt.s.w $f6, $f6 -/* B078E0 80240EE0 C6000090 */ lwc1 $f0, 0x90($s0) -/* B078E4 80240EE4 46800020 */ cvt.s.w $f0, $f0 -/* B078E8 80240EE8 27A20020 */ addiu $v0, $sp, 0x20 -/* B078EC 80240EEC E7A00010 */ swc1 $f0, 0x10($sp) -/* B078F0 80240EF0 8E030094 */ lw $v1, 0x94($s0) -/* B078F4 80240EF4 44051000 */ mfc1 $a1, $f2 -/* B078F8 80240EF8 44062000 */ mfc1 $a2, $f4 -/* B078FC 80240EFC 44073000 */ mfc1 $a3, $f6 -/* B07900 80240F00 0000202D */ daddu $a0, $zero, $zero -/* B07904 80240F04 AFA20018 */ sw $v0, 0x18($sp) -/* B07908 80240F08 0C01C28C */ jal func_80070A30 -/* B0790C 80240F0C AFA30014 */ sw $v1, 0x14($sp) -/* B07910 80240F10 8FA20020 */ lw $v0, 0x20($sp) -/* B07914 80240F14 AE020084 */ sw $v0, 0x84($s0) -/* B07918 80240F18 8FBF002C */ lw $ra, 0x2c($sp) -/* B0791C 80240F1C 8FB00028 */ lw $s0, 0x28($sp) -/* B07920 80240F20 24020002 */ addiu $v0, $zero, 2 -/* B07924 80240F24 03E00008 */ jr $ra -/* B07928 80240F28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8_B078B8.s b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8_B078B8.s new file mode 100644 index 0000000000..af713e923f --- /dev/null +++ b/asm/nonmatchings/world/area_kkj/kkj_25/B06D10/func_80240EB8_B078B8.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EB8_B078B8 +/* B078B8 80240EB8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* B078BC 80240EBC AFB00028 */ sw $s0, 0x28($sp) +/* B078C0 80240EC0 0080802D */ daddu $s0, $a0, $zero +/* B078C4 80240EC4 AFBF002C */ sw $ra, 0x2c($sp) +/* B078C8 80240EC8 C6020084 */ lwc1 $f2, 0x84($s0) +/* B078CC 80240ECC 468010A0 */ cvt.s.w $f2, $f2 +/* B078D0 80240ED0 C6040088 */ lwc1 $f4, 0x88($s0) +/* B078D4 80240ED4 46802120 */ cvt.s.w $f4, $f4 +/* B078D8 80240ED8 C606008C */ lwc1 $f6, 0x8c($s0) +/* B078DC 80240EDC 468031A0 */ cvt.s.w $f6, $f6 +/* B078E0 80240EE0 C6000090 */ lwc1 $f0, 0x90($s0) +/* B078E4 80240EE4 46800020 */ cvt.s.w $f0, $f0 +/* B078E8 80240EE8 27A20020 */ addiu $v0, $sp, 0x20 +/* B078EC 80240EEC E7A00010 */ swc1 $f0, 0x10($sp) +/* B078F0 80240EF0 8E030094 */ lw $v1, 0x94($s0) +/* B078F4 80240EF4 44051000 */ mfc1 $a1, $f2 +/* B078F8 80240EF8 44062000 */ mfc1 $a2, $f4 +/* B078FC 80240EFC 44073000 */ mfc1 $a3, $f6 +/* B07900 80240F00 0000202D */ daddu $a0, $zero, $zero +/* B07904 80240F04 AFA20018 */ sw $v0, 0x18($sp) +/* B07908 80240F08 0C01C28C */ jal func_80070A30 +/* B0790C 80240F0C AFA30014 */ sw $v1, 0x14($sp) +/* B07910 80240F10 8FA20020 */ lw $v0, 0x20($sp) +/* B07914 80240F14 AE020084 */ sw $v0, 0x84($s0) +/* B07918 80240F18 8FBF002C */ lw $ra, 0x2c($sp) +/* B0791C 80240F1C 8FB00028 */ lw $s0, 0x28($sp) +/* B07920 80240F20 24020002 */ addiu $v0, $zero, 2 +/* B07924 80240F24 03E00008 */ jr $ra +/* B07928 80240F28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388.s deleted file mode 100644 index 28f5750331..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240388 -/* 8AC318 80240388 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8AC31C 8024038C AFBF0010 */ sw $ra, 0x10($sp) -/* 8AC320 80240390 0C04760B */ jal func_8011D82C -/* 8AC324 80240394 24040003 */ addiu $a0, $zero, 3 -/* 8AC328 80240398 3C038015 */ lui $v1, 0x8015 -/* 8AC32C 8024039C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 8AC330 802403A0 24020003 */ addiu $v0, $zero, 3 -/* 8AC334 802403A4 A0620000 */ sb $v0, ($v1) -/* 8AC338 802403A8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8AC33C 802403AC 24020002 */ addiu $v0, $zero, 2 -/* 8AC340 802403B0 03E00008 */ jr $ra -/* 8AC344 802403B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388_8AC318.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388_8AC318.s new file mode 100644 index 0000000000..1777077b1a --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240388_8AC318.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240388_8AC318 +/* 8AC318 80240388 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8AC31C 8024038C AFBF0010 */ sw $ra, 0x10($sp) +/* 8AC320 80240390 0C04760B */ jal func_8011D82C +/* 8AC324 80240394 24040003 */ addiu $a0, $zero, 3 +/* 8AC328 80240398 3C038015 */ lui $v1, 0x8015 +/* 8AC32C 8024039C 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 8AC330 802403A0 24020003 */ addiu $v0, $zero, 3 +/* 8AC334 802403A4 A0620000 */ sb $v0, ($v1) +/* 8AC338 802403A8 8FBF0010 */ lw $ra, 0x10($sp) +/* 8AC33C 802403AC 24020002 */ addiu $v0, $zero, 2 +/* 8AC340 802403B0 03E00008 */ jr $ra +/* 8AC344 802403B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8.s deleted file mode 100644 index 30bf2aa048..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8.s +++ /dev/null @@ -1,62 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B8 -/* 8AC348 802403B8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8AC34C 802403BC AFB1001C */ sw $s1, 0x1c($sp) -/* 8AC350 802403C0 0080882D */ daddu $s1, $a0, $zero -/* 8AC354 802403C4 AFBF002C */ sw $ra, 0x2c($sp) -/* 8AC358 802403C8 AFB40028 */ sw $s4, 0x28($sp) -/* 8AC35C 802403CC AFB30024 */ sw $s3, 0x24($sp) -/* 8AC360 802403D0 AFB20020 */ sw $s2, 0x20($sp) -/* 8AC364 802403D4 AFB00018 */ sw $s0, 0x18($sp) -/* 8AC368 802403D8 8E30000C */ lw $s0, 0xc($s1) -/* 8AC36C 802403DC 8E050000 */ lw $a1, ($s0) -/* 8AC370 802403E0 0C0B1EAF */ jal get_variable -/* 8AC374 802403E4 26100004 */ addiu $s0, $s0, 4 -/* 8AC378 802403E8 8E050000 */ lw $a1, ($s0) -/* 8AC37C 802403EC 26100004 */ addiu $s0, $s0, 4 -/* 8AC380 802403F0 0220202D */ daddu $a0, $s1, $zero -/* 8AC384 802403F4 0C0B1EAF */ jal get_variable -/* 8AC388 802403F8 0040A02D */ daddu $s4, $v0, $zero -/* 8AC38C 802403FC 8E050000 */ lw $a1, ($s0) -/* 8AC390 80240400 26100004 */ addiu $s0, $s0, 4 -/* 8AC394 80240404 0220202D */ daddu $a0, $s1, $zero -/* 8AC398 80240408 0C0B1EAF */ jal get_variable -/* 8AC39C 8024040C 0040982D */ daddu $s3, $v0, $zero -/* 8AC3A0 80240410 8E050000 */ lw $a1, ($s0) -/* 8AC3A4 80240414 26100004 */ addiu $s0, $s0, 4 -/* 8AC3A8 80240418 0220202D */ daddu $a0, $s1, $zero -/* 8AC3AC 8024041C 0C0B1EAF */ jal get_variable -/* 8AC3B0 80240420 0040902D */ daddu $s2, $v0, $zero -/* 8AC3B4 80240424 0220202D */ daddu $a0, $s1, $zero -/* 8AC3B8 80240428 8E050000 */ lw $a1, ($s0) -/* 8AC3BC 8024042C 0C0B1EAF */ jal get_variable -/* 8AC3C0 80240430 0040802D */ daddu $s0, $v0, $zero -/* 8AC3C4 80240434 0280202D */ daddu $a0, $s4, $zero -/* 8AC3C8 80240438 44931000 */ mtc1 $s3, $f2 -/* 8AC3CC 8024043C 00000000 */ nop -/* 8AC3D0 80240440 468010A0 */ cvt.s.w $f2, $f2 -/* 8AC3D4 80240444 44051000 */ mfc1 $a1, $f2 -/* 8AC3D8 80240448 44921000 */ mtc1 $s2, $f2 -/* 8AC3DC 8024044C 00000000 */ nop -/* 8AC3E0 80240450 468010A0 */ cvt.s.w $f2, $f2 -/* 8AC3E4 80240454 44061000 */ mfc1 $a2, $f2 -/* 8AC3E8 80240458 44901000 */ mtc1 $s0, $f2 -/* 8AC3EC 8024045C 00000000 */ nop -/* 8AC3F0 80240460 468010A0 */ cvt.s.w $f2, $f2 -/* 8AC3F4 80240464 44071000 */ mfc1 $a3, $f2 -/* 8AC3F8 80240468 44820000 */ mtc1 $v0, $f0 -/* 8AC3FC 8024046C 00000000 */ nop -/* 8AC400 80240470 46800020 */ cvt.s.w $f0, $f0 -/* 8AC404 80240474 0C01BFBC */ jal func_8006FEF0 -/* 8AC408 80240478 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC40C 8024047C 8FBF002C */ lw $ra, 0x2c($sp) -/* 8AC410 80240480 8FB40028 */ lw $s4, 0x28($sp) -/* 8AC414 80240484 8FB30024 */ lw $s3, 0x24($sp) -/* 8AC418 80240488 8FB20020 */ lw $s2, 0x20($sp) -/* 8AC41C 8024048C 8FB1001C */ lw $s1, 0x1c($sp) -/* 8AC420 80240490 8FB00018 */ lw $s0, 0x18($sp) -/* 8AC424 80240494 24020002 */ addiu $v0, $zero, 2 -/* 8AC428 80240498 03E00008 */ jr $ra -/* 8AC42C 8024049C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s new file mode 100644 index 0000000000..0c8d88a05b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802403B8_8AC348.s @@ -0,0 +1,62 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403B8_8AC348 +/* 8AC348 802403B8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8AC34C 802403BC AFB1001C */ sw $s1, 0x1c($sp) +/* 8AC350 802403C0 0080882D */ daddu $s1, $a0, $zero +/* 8AC354 802403C4 AFBF002C */ sw $ra, 0x2c($sp) +/* 8AC358 802403C8 AFB40028 */ sw $s4, 0x28($sp) +/* 8AC35C 802403CC AFB30024 */ sw $s3, 0x24($sp) +/* 8AC360 802403D0 AFB20020 */ sw $s2, 0x20($sp) +/* 8AC364 802403D4 AFB00018 */ sw $s0, 0x18($sp) +/* 8AC368 802403D8 8E30000C */ lw $s0, 0xc($s1) +/* 8AC36C 802403DC 8E050000 */ lw $a1, ($s0) +/* 8AC370 802403E0 0C0B1EAF */ jal get_variable +/* 8AC374 802403E4 26100004 */ addiu $s0, $s0, 4 +/* 8AC378 802403E8 8E050000 */ lw $a1, ($s0) +/* 8AC37C 802403EC 26100004 */ addiu $s0, $s0, 4 +/* 8AC380 802403F0 0220202D */ daddu $a0, $s1, $zero +/* 8AC384 802403F4 0C0B1EAF */ jal get_variable +/* 8AC388 802403F8 0040A02D */ daddu $s4, $v0, $zero +/* 8AC38C 802403FC 8E050000 */ lw $a1, ($s0) +/* 8AC390 80240400 26100004 */ addiu $s0, $s0, 4 +/* 8AC394 80240404 0220202D */ daddu $a0, $s1, $zero +/* 8AC398 80240408 0C0B1EAF */ jal get_variable +/* 8AC39C 8024040C 0040982D */ daddu $s3, $v0, $zero +/* 8AC3A0 80240410 8E050000 */ lw $a1, ($s0) +/* 8AC3A4 80240414 26100004 */ addiu $s0, $s0, 4 +/* 8AC3A8 80240418 0220202D */ daddu $a0, $s1, $zero +/* 8AC3AC 8024041C 0C0B1EAF */ jal get_variable +/* 8AC3B0 80240420 0040902D */ daddu $s2, $v0, $zero +/* 8AC3B4 80240424 0220202D */ daddu $a0, $s1, $zero +/* 8AC3B8 80240428 8E050000 */ lw $a1, ($s0) +/* 8AC3BC 8024042C 0C0B1EAF */ jal get_variable +/* 8AC3C0 80240430 0040802D */ daddu $s0, $v0, $zero +/* 8AC3C4 80240434 0280202D */ daddu $a0, $s4, $zero +/* 8AC3C8 80240438 44931000 */ mtc1 $s3, $f2 +/* 8AC3CC 8024043C 00000000 */ nop +/* 8AC3D0 80240440 468010A0 */ cvt.s.w $f2, $f2 +/* 8AC3D4 80240444 44051000 */ mfc1 $a1, $f2 +/* 8AC3D8 80240448 44921000 */ mtc1 $s2, $f2 +/* 8AC3DC 8024044C 00000000 */ nop +/* 8AC3E0 80240450 468010A0 */ cvt.s.w $f2, $f2 +/* 8AC3E4 80240454 44061000 */ mfc1 $a2, $f2 +/* 8AC3E8 80240458 44901000 */ mtc1 $s0, $f2 +/* 8AC3EC 8024045C 00000000 */ nop +/* 8AC3F0 80240460 468010A0 */ cvt.s.w $f2, $f2 +/* 8AC3F4 80240464 44071000 */ mfc1 $a3, $f2 +/* 8AC3F8 80240468 44820000 */ mtc1 $v0, $f0 +/* 8AC3FC 8024046C 00000000 */ nop +/* 8AC400 80240470 46800020 */ cvt.s.w $f0, $f0 +/* 8AC404 80240474 0C01BFBC */ jal func_8006FEF0 +/* 8AC408 80240478 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8AC40C 8024047C 8FBF002C */ lw $ra, 0x2c($sp) +/* 8AC410 80240480 8FB40028 */ lw $s4, 0x28($sp) +/* 8AC414 80240484 8FB30024 */ lw $s3, 0x24($sp) +/* 8AC418 80240488 8FB20020 */ lw $s2, 0x20($sp) +/* 8AC41C 8024048C 8FB1001C */ lw $s1, 0x1c($sp) +/* 8AC420 80240490 8FB00018 */ lw $s0, 0x18($sp) +/* 8AC424 80240494 24020002 */ addiu $v0, $zero, 2 +/* 8AC428 80240498 03E00008 */ jr $ra +/* 8AC42C 8024049C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0.s deleted file mode 100644 index 97f2e54677..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A0 -/* 8AC430 802404A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8AC434 802404A4 2402001E */ addiu $v0, $zero, 0x1e -/* 8AC438 802404A8 44801000 */ mtc1 $zero, $f2 -/* 8AC43C 802404AC 3C013E99 */ lui $at, 0x3e99 -/* 8AC440 802404B0 3421999A */ ori $at, $at, 0x999a -/* 8AC444 802404B4 44810000 */ mtc1 $at, $f0 -/* 8AC448 802404B8 44051000 */ mfc1 $a1, $f2 -/* 8AC44C 802404BC 24040004 */ addiu $a0, $zero, 4 -/* 8AC450 802404C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8AC454 802404C4 AFA20014 */ sw $v0, 0x14($sp) -/* 8AC458 802404C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC45C 802404CC 00A0302D */ daddu $a2, $a1, $zero -/* 8AC460 802404D0 0C01C5D4 */ jal func_80071750 -/* 8AC464 802404D4 00A0382D */ daddu $a3, $a1, $zero -/* 8AC468 802404D8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8AC46C 802404DC 24020002 */ addiu $v0, $zero, 2 -/* 8AC470 802404E0 03E00008 */ jr $ra -/* 8AC474 802404E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s new file mode 100644 index 0000000000..5f6d59ef52 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404A0_8AC430.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404A0_8AC430 +/* 8AC430 802404A0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8AC434 802404A4 2402001E */ addiu $v0, $zero, 0x1e +/* 8AC438 802404A8 44801000 */ mtc1 $zero, $f2 +/* 8AC43C 802404AC 3C013E99 */ lui $at, 0x3e99 +/* 8AC440 802404B0 3421999A */ ori $at, $at, 0x999a +/* 8AC444 802404B4 44810000 */ mtc1 $at, $f0 +/* 8AC448 802404B8 44051000 */ mfc1 $a1, $f2 +/* 8AC44C 802404BC 24040004 */ addiu $a0, $zero, 4 +/* 8AC450 802404C0 AFBF0018 */ sw $ra, 0x18($sp) +/* 8AC454 802404C4 AFA20014 */ sw $v0, 0x14($sp) +/* 8AC458 802404C8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8AC45C 802404CC 00A0302D */ daddu $a2, $a1, $zero +/* 8AC460 802404D0 0C01C5D4 */ jal func_80071750 +/* 8AC464 802404D4 00A0382D */ daddu $a3, $a1, $zero +/* 8AC468 802404D8 8FBF0018 */ lw $ra, 0x18($sp) +/* 8AC46C 802404DC 24020002 */ addiu $v0, $zero, 2 +/* 8AC470 802404E0 03E00008 */ jr $ra +/* 8AC474 802404E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8.s deleted file mode 100644 index 579ac85448..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404E8 -/* 8AC478 802404E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8AC47C 802404EC AFBF0010 */ sw $ra, 0x10($sp) -/* 8AC480 802404F0 0C0B1EAF */ jal get_variable -/* 8AC484 802404F4 8C850084 */ lw $a1, 0x84($a0) -/* 8AC488 802404F8 3C013A83 */ lui $at, 0x3a83 -/* 8AC48C 802404FC 3421126F */ ori $at, $at, 0x126f -/* 8AC490 80240500 44811000 */ mtc1 $at, $f2 -/* 8AC494 80240504 44820000 */ mtc1 $v0, $f0 -/* 8AC498 80240508 00000000 */ nop -/* 8AC49C 8024050C 46800020 */ cvt.s.w $f0, $f0 -/* 8AC4A0 80240510 46020002 */ mul.s $f0, $f0, $f2 -/* 8AC4A4 80240514 00000000 */ nop -/* 8AC4A8 80240518 8FBF0010 */ lw $ra, 0x10($sp) -/* 8AC4AC 8024051C 24020002 */ addiu $v0, $zero, 2 -/* 8AC4B0 80240520 3C01800B */ lui $at, 0x800b -/* 8AC4B4 80240524 E4202260 */ swc1 $f0, 0x2260($at) -/* 8AC4B8 80240528 03E00008 */ jr $ra -/* 8AC4BC 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s new file mode 100644 index 0000000000..81003dc90a --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802404E8_8AC478.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404E8_8AC478 +/* 8AC478 802404E8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8AC47C 802404EC AFBF0010 */ sw $ra, 0x10($sp) +/* 8AC480 802404F0 0C0B1EAF */ jal get_variable +/* 8AC484 802404F4 8C850084 */ lw $a1, 0x84($a0) +/* 8AC488 802404F8 3C013A83 */ lui $at, 0x3a83 +/* 8AC48C 802404FC 3421126F */ ori $at, $at, 0x126f +/* 8AC490 80240500 44811000 */ mtc1 $at, $f2 +/* 8AC494 80240504 44820000 */ mtc1 $v0, $f0 +/* 8AC498 80240508 00000000 */ nop +/* 8AC49C 8024050C 46800020 */ cvt.s.w $f0, $f0 +/* 8AC4A0 80240510 46020002 */ mul.s $f0, $f0, $f2 +/* 8AC4A4 80240514 00000000 */ nop +/* 8AC4A8 80240518 8FBF0010 */ lw $ra, 0x10($sp) +/* 8AC4AC 8024051C 24020002 */ addiu $v0, $zero, 2 +/* 8AC4B0 80240520 3C01800B */ lui $at, 0x800b +/* 8AC4B4 80240524 E4202260 */ swc1 $f0, 0x2260($at) +/* 8AC4B8 80240528 03E00008 */ jr $ra +/* 8AC4BC 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530.s deleted file mode 100644 index 26e17c49a0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240530 -/* 8AC4C0 80240530 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8AC4C4 80240534 AFBF0018 */ sw $ra, 0x18($sp) -/* 8AC4C8 80240538 8C82000C */ lw $v0, 0xc($a0) -/* 8AC4CC 8024053C 0C0B1EAF */ jal get_variable -/* 8AC4D0 80240540 8C450000 */ lw $a1, ($v0) -/* 8AC4D4 80240544 0C00EABB */ jal get_npc_unsafe -/* 8AC4D8 80240548 0040202D */ daddu $a0, $v0, $zero -/* 8AC4DC 8024054C 3C014120 */ lui $at, 0x4120 -/* 8AC4E0 80240550 44810000 */ mtc1 $at, $f0 -/* 8AC4E4 80240554 C442003C */ lwc1 $f2, 0x3c($v0) -/* 8AC4E8 80240558 46001080 */ add.s $f2, $f2, $f0 -/* 8AC4EC 8024055C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8AC4F0 80240560 8C450038 */ lw $a1, 0x38($v0) -/* 8AC4F4 80240564 8C470040 */ lw $a3, 0x40($v0) -/* 8AC4F8 80240568 44061000 */ mfc1 $a2, $f2 -/* 8AC4FC 8024056C 0C01BFBC */ jal func_8006FEF0 -/* 8AC500 80240570 24040003 */ addiu $a0, $zero, 3 -/* 8AC504 80240574 8FBF0018 */ lw $ra, 0x18($sp) -/* 8AC508 80240578 24020002 */ addiu $v0, $zero, 2 -/* 8AC50C 8024057C 03E00008 */ jr $ra -/* 8AC510 80240580 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s new file mode 100644 index 0000000000..2ec6fc2697 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240530_8AC4C0.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240530_8AC4C0 +/* 8AC4C0 80240530 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8AC4C4 80240534 AFBF0018 */ sw $ra, 0x18($sp) +/* 8AC4C8 80240538 8C82000C */ lw $v0, 0xc($a0) +/* 8AC4CC 8024053C 0C0B1EAF */ jal get_variable +/* 8AC4D0 80240540 8C450000 */ lw $a1, ($v0) +/* 8AC4D4 80240544 0C00EABB */ jal get_npc_unsafe +/* 8AC4D8 80240548 0040202D */ daddu $a0, $v0, $zero +/* 8AC4DC 8024054C 3C014120 */ lui $at, 0x4120 +/* 8AC4E0 80240550 44810000 */ mtc1 $at, $f0 +/* 8AC4E4 80240554 C442003C */ lwc1 $f2, 0x3c($v0) +/* 8AC4E8 80240558 46001080 */ add.s $f2, $f2, $f0 +/* 8AC4EC 8024055C E7A00010 */ swc1 $f0, 0x10($sp) +/* 8AC4F0 80240560 8C450038 */ lw $a1, 0x38($v0) +/* 8AC4F4 80240564 8C470040 */ lw $a3, 0x40($v0) +/* 8AC4F8 80240568 44061000 */ mfc1 $a2, $f2 +/* 8AC4FC 8024056C 0C01BFBC */ jal func_8006FEF0 +/* 8AC500 80240570 24040003 */ addiu $a0, $zero, 3 +/* 8AC504 80240574 8FBF0018 */ lw $ra, 0x18($sp) +/* 8AC508 80240578 24020002 */ addiu $v0, $zero, 2 +/* 8AC50C 8024057C 03E00008 */ jr $ra +/* 8AC510 80240580 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584.s deleted file mode 100644 index 8c4bb4b860..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584 -/* 8AC514 80240584 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8AC518 80240588 0000202D */ daddu $a0, $zero, $zero -/* 8AC51C 8024058C AFBF0010 */ sw $ra, 0x10($sp) -/* 8AC520 80240590 0C01554F */ jal func_8005553C -/* 8AC524 80240594 240507D0 */ addiu $a1, $zero, 0x7d0 -/* 8AC528 80240598 8FBF0010 */ lw $ra, 0x10($sp) -/* 8AC52C 8024059C 24020002 */ addiu $v0, $zero, 2 -/* 8AC530 802405A0 03E00008 */ jr $ra -/* 8AC534 802405A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s new file mode 100644 index 0000000000..6118f6f058 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240584_8AC514.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240584_8AC514 +/* 8AC514 80240584 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8AC518 80240588 0000202D */ daddu $a0, $zero, $zero +/* 8AC51C 8024058C AFBF0010 */ sw $ra, 0x10($sp) +/* 8AC520 80240590 0C01554F */ jal func_8005553C +/* 8AC524 80240594 240507D0 */ addiu $a1, $zero, 0x7d0 +/* 8AC528 80240598 8FBF0010 */ lw $ra, 0x10($sp) +/* 8AC52C 8024059C 24020002 */ addiu $v0, $zero, 2 +/* 8AC530 802405A0 03E00008 */ jr $ra +/* 8AC534 802405A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8.s deleted file mode 100644 index dcf98ccca6..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A8 -/* 8AC538 802405A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8AC53C 802405AC 0000202D */ daddu $a0, $zero, $zero -/* 8AC540 802405B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8AC544 802405B4 0C015564 */ jal func_80055590 -/* 8AC548 802405B8 240507D0 */ addiu $a1, $zero, 0x7d0 -/* 8AC54C 802405BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8AC550 802405C0 24020002 */ addiu $v0, $zero, 2 -/* 8AC554 802405C4 03E00008 */ jr $ra -/* 8AC558 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s new file mode 100644 index 0000000000..c88ac530ac --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405A8_8AC538.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405A8_8AC538 +/* 8AC538 802405A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8AC53C 802405AC 0000202D */ daddu $a0, $zero, $zero +/* 8AC540 802405B0 AFBF0010 */ sw $ra, 0x10($sp) +/* 8AC544 802405B4 0C015564 */ jal func_80055590 +/* 8AC548 802405B8 240507D0 */ addiu $a1, $zero, 0x7d0 +/* 8AC54C 802405BC 8FBF0010 */ lw $ra, 0x10($sp) +/* 8AC550 802405C0 24020002 */ addiu $v0, $zero, 2 +/* 8AC554 802405C4 03E00008 */ jr $ra +/* 8AC558 802405C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC.s deleted file mode 100644 index 3133dfa2df..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405CC -/* 8AC55C 802405CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8AC560 802405D0 0000202D */ daddu $a0, $zero, $zero -/* 8AC564 802405D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8AC568 802405D8 0C01553A */ jal func_800554E8 -/* 8AC56C 802405DC 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8AC570 802405E0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8AC574 802405E4 24020002 */ addiu $v0, $zero, 2 -/* 8AC578 802405E8 03E00008 */ jr $ra -/* 8AC57C 802405EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s new file mode 100644 index 0000000000..e16eb9d325 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_802405CC_8AC55C.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405CC_8AC55C +/* 8AC55C 802405CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8AC560 802405D0 0000202D */ daddu $a0, $zero, $zero +/* 8AC564 802405D4 AFBF0010 */ sw $ra, 0x10($sp) +/* 8AC568 802405D8 0C01553A */ jal func_800554E8 +/* 8AC56C 802405DC 240503E8 */ addiu $a1, $zero, 0x3e8 +/* 8AC570 802405E0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8AC574 802405E4 24020002 */ addiu $v0, $zero, 2 +/* 8AC578 802405E8 03E00008 */ jr $ra +/* 8AC57C 802405EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8.s deleted file mode 100644 index 9bd587c999..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD8 -/* 8ACB68 80240BD8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8ACB6C 80240BDC AFB1001C */ sw $s1, 0x1c($sp) -/* 8ACB70 80240BE0 0080882D */ daddu $s1, $a0, $zero -/* 8ACB74 80240BE4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8ACB78 80240BE8 AFB00018 */ sw $s0, 0x18($sp) -/* 8ACB7C 80240BEC 10A0001D */ beqz $a1, .L80240C64 -/* 8ACB80 80240BF0 8E22000C */ lw $v0, 0xc($s1) -/* 8ACB84 80240BF4 0C0B1EAF */ jal get_variable -/* 8ACB88 80240BF8 8C450000 */ lw $a1, ($v0) -/* 8ACB8C 80240BFC 0040202D */ daddu $a0, $v0, $zero -/* 8ACB90 80240C00 0C00EABB */ jal get_npc_unsafe -/* 8ACB94 80240C04 AE240074 */ sw $a0, 0x74($s1) -/* 8ACB98 80240C08 0040802D */ daddu $s0, $v0, $zero -/* 8ACB9C 80240C0C 3C04B000 */ lui $a0, 0xb000 -/* 8ACBA0 80240C10 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8ACBA4 80240C14 3484001E */ ori $a0, $a0, 0x1e -/* 8ACBA8 80240C18 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8ACBAC 80240C1C 8E060038 */ lw $a2, 0x38($s0) -/* 8ACBB0 80240C20 8E07003C */ lw $a3, 0x3c($s0) -/* 8ACBB4 80240C24 0C052757 */ jal play_sound_at_position -/* 8ACBB8 80240C28 0000282D */ daddu $a1, $zero, $zero -/* 8ACBBC 80240C2C C604003C */ lwc1 $f4, 0x3c($s0) -/* 8ACBC0 80240C30 3C0141A0 */ lui $at, 0x41a0 -/* 8ACBC4 80240C34 44810000 */ mtc1 $at, $f0 -/* 8ACBC8 80240C38 3C014120 */ lui $at, 0x4120 -/* 8ACBCC 80240C3C 44811000 */ mtc1 $at, $f2 -/* 8ACBD0 80240C40 46002100 */ add.s $f4, $f4, $f0 -/* 8ACBD4 80240C44 E7A20010 */ swc1 $f2, 0x10($sp) -/* 8ACBD8 80240C48 8E050038 */ lw $a1, 0x38($s0) -/* 8ACBDC 80240C4C 8E070040 */ lw $a3, 0x40($s0) -/* 8ACBE0 80240C50 44062000 */ mfc1 $a2, $f4 -/* 8ACBE4 80240C54 0C01BFBC */ jal func_8006FEF0 -/* 8ACBE8 80240C58 0000202D */ daddu $a0, $zero, $zero -/* 8ACBEC 80240C5C 24020003 */ addiu $v0, $zero, 3 -/* 8ACBF0 80240C60 AE220070 */ sw $v0, 0x70($s1) -.L80240C64: -/* 8ACBF4 80240C64 0C00EABB */ jal get_npc_unsafe -/* 8ACBF8 80240C68 8E240074 */ lw $a0, 0x74($s1) -/* 8ACBFC 80240C6C 0040802D */ daddu $s0, $v0, $zero -/* 8ACC00 80240C70 8E230070 */ lw $v1, 0x70($s1) -/* 8ACC04 80240C74 2402FFFF */ addiu $v0, $zero, -1 -/* 8ACC08 80240C78 2463FFFF */ addiu $v1, $v1, -1 -/* 8ACC0C 80240C7C 10620003 */ beq $v1, $v0, .L80240C8C -/* 8ACC10 80240C80 AE230070 */ sw $v1, 0x70($s1) -/* 8ACC14 80240C84 08090327 */ j .L80240C9C -/* 8ACC18 80240C88 0000102D */ daddu $v0, $zero, $zero -.L80240C8C: -/* 8ACC1C 80240C8C 3C01C47A */ lui $at, 0xc47a -/* 8ACC20 80240C90 44810000 */ mtc1 $at, $f0 -/* 8ACC24 80240C94 24020002 */ addiu $v0, $zero, 2 -/* 8ACC28 80240C98 E600003C */ swc1 $f0, 0x3c($s0) -.L80240C9C: -/* 8ACC2C 80240C9C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8ACC30 80240CA0 8FB1001C */ lw $s1, 0x1c($sp) -/* 8ACC34 80240CA4 8FB00018 */ lw $s0, 0x18($sp) -/* 8ACC38 80240CA8 03E00008 */ jr $ra -/* 8ACC3C 80240CAC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s new file mode 100644 index 0000000000..7d41d5f9ba --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240BD8_8ACB68.s @@ -0,0 +1,61 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BD8_8ACB68 +/* 8ACB68 80240BD8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8ACB6C 80240BDC AFB1001C */ sw $s1, 0x1c($sp) +/* 8ACB70 80240BE0 0080882D */ daddu $s1, $a0, $zero +/* 8ACB74 80240BE4 AFBF0020 */ sw $ra, 0x20($sp) +/* 8ACB78 80240BE8 AFB00018 */ sw $s0, 0x18($sp) +/* 8ACB7C 80240BEC 10A0001D */ beqz $a1, .L80240C64 +/* 8ACB80 80240BF0 8E22000C */ lw $v0, 0xc($s1) +/* 8ACB84 80240BF4 0C0B1EAF */ jal get_variable +/* 8ACB88 80240BF8 8C450000 */ lw $a1, ($v0) +/* 8ACB8C 80240BFC 0040202D */ daddu $a0, $v0, $zero +/* 8ACB90 80240C00 0C00EABB */ jal get_npc_unsafe +/* 8ACB94 80240C04 AE240074 */ sw $a0, 0x74($s1) +/* 8ACB98 80240C08 0040802D */ daddu $s0, $v0, $zero +/* 8ACB9C 80240C0C 3C04B000 */ lui $a0, 0xb000 +/* 8ACBA0 80240C10 C6000040 */ lwc1 $f0, 0x40($s0) +/* 8ACBA4 80240C14 3484001E */ ori $a0, $a0, 0x1e +/* 8ACBA8 80240C18 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8ACBAC 80240C1C 8E060038 */ lw $a2, 0x38($s0) +/* 8ACBB0 80240C20 8E07003C */ lw $a3, 0x3c($s0) +/* 8ACBB4 80240C24 0C052757 */ jal play_sound_at_position +/* 8ACBB8 80240C28 0000282D */ daddu $a1, $zero, $zero +/* 8ACBBC 80240C2C C604003C */ lwc1 $f4, 0x3c($s0) +/* 8ACBC0 80240C30 3C0141A0 */ lui $at, 0x41a0 +/* 8ACBC4 80240C34 44810000 */ mtc1 $at, $f0 +/* 8ACBC8 80240C38 3C014120 */ lui $at, 0x4120 +/* 8ACBCC 80240C3C 44811000 */ mtc1 $at, $f2 +/* 8ACBD0 80240C40 46002100 */ add.s $f4, $f4, $f0 +/* 8ACBD4 80240C44 E7A20010 */ swc1 $f2, 0x10($sp) +/* 8ACBD8 80240C48 8E050038 */ lw $a1, 0x38($s0) +/* 8ACBDC 80240C4C 8E070040 */ lw $a3, 0x40($s0) +/* 8ACBE0 80240C50 44062000 */ mfc1 $a2, $f4 +/* 8ACBE4 80240C54 0C01BFBC */ jal func_8006FEF0 +/* 8ACBE8 80240C58 0000202D */ daddu $a0, $zero, $zero +/* 8ACBEC 80240C5C 24020003 */ addiu $v0, $zero, 3 +/* 8ACBF0 80240C60 AE220070 */ sw $v0, 0x70($s1) +.L80240C64: +/* 8ACBF4 80240C64 0C00EABB */ jal get_npc_unsafe +/* 8ACBF8 80240C68 8E240074 */ lw $a0, 0x74($s1) +/* 8ACBFC 80240C6C 0040802D */ daddu $s0, $v0, $zero +/* 8ACC00 80240C70 8E230070 */ lw $v1, 0x70($s1) +/* 8ACC04 80240C74 2402FFFF */ addiu $v0, $zero, -1 +/* 8ACC08 80240C78 2463FFFF */ addiu $v1, $v1, -1 +/* 8ACC0C 80240C7C 10620003 */ beq $v1, $v0, .L80240C8C +/* 8ACC10 80240C80 AE230070 */ sw $v1, 0x70($s1) +/* 8ACC14 80240C84 08090327 */ j .L80240C9C +/* 8ACC18 80240C88 0000102D */ daddu $v0, $zero, $zero +.L80240C8C: +/* 8ACC1C 80240C8C 3C01C47A */ lui $at, 0xc47a +/* 8ACC20 80240C90 44810000 */ mtc1 $at, $f0 +/* 8ACC24 80240C94 24020002 */ addiu $v0, $zero, 2 +/* 8ACC28 80240C98 E600003C */ swc1 $f0, 0x3c($s0) +.L80240C9C: +/* 8ACC2C 80240C9C 8FBF0020 */ lw $ra, 0x20($sp) +/* 8ACC30 80240CA0 8FB1001C */ lw $s1, 0x1c($sp) +/* 8ACC34 80240CA4 8FB00018 */ lw $s0, 0x18($sp) +/* 8ACC38 80240CA8 03E00008 */ jr $ra +/* 8ACC3C 80240CAC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0.s deleted file mode 100644 index 19531de2fd..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB0 -/* 8ACC40 80240CB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ACC44 80240CB4 AFB10014 */ sw $s1, 0x14($sp) -/* 8ACC48 80240CB8 0080882D */ daddu $s1, $a0, $zero -/* 8ACC4C 80240CBC AFBF0018 */ sw $ra, 0x18($sp) -/* 8ACC50 80240CC0 10A0000C */ beqz $a1, .L80240CF4 -/* 8ACC54 80240CC4 AFB00010 */ sw $s0, 0x10($sp) -/* 8ACC58 80240CC8 8E24014C */ lw $a0, 0x14c($s1) -/* 8ACC5C 80240CCC 0C00EAD2 */ jal get_npc_safe -/* 8ACC60 80240CD0 AE200074 */ sw $zero, 0x74($s1) -/* 8ACC64 80240CD4 8E23014C */ lw $v1, 0x14c($s1) -/* 8ACC68 80240CD8 AE220078 */ sw $v0, 0x78($s1) -/* 8ACC6C 80240CDC 2463FFFF */ addiu $v1, $v1, -1 -/* 8ACC70 80240CE0 00031840 */ sll $v1, $v1, 1 -/* 8ACC74 80240CE4 3C028024 */ lui $v0, 0x8024 -/* 8ACC78 80240CE8 00431021 */ addu $v0, $v0, $v1 -/* 8ACC7C 80240CEC 84422D60 */ lh $v0, 0x2d60($v0) -/* 8ACC80 80240CF0 AE22007C */ sw $v0, 0x7c($s1) -.L80240CF4: -/* 8ACC84 80240CF4 8E22007C */ lw $v0, 0x7c($s1) -/* 8ACC88 80240CF8 14400015 */ bnez $v0, .L80240D50 -/* 8ACC8C 80240CFC 2442FFFF */ addiu $v0, $v0, -1 -/* 8ACC90 80240D00 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8ACC94 80240D04 0C00A8BB */ jal sin_deg -/* 8ACC98 80240D08 8E300078 */ lw $s0, 0x78($s1) -/* 8ACC9C 80240D0C 3C013FC0 */ lui $at, 0x3fc0 -/* 8ACCA0 80240D10 44811000 */ mtc1 $at, $f2 -/* 8ACCA4 80240D14 00000000 */ nop -/* 8ACCA8 80240D18 46020002 */ mul.s $f0, $f0, $f2 -/* 8ACCAC 80240D1C 00000000 */ nop -/* 8ACCB0 80240D20 3C014190 */ lui $at, 0x4190 -/* 8ACCB4 80240D24 44816000 */ mtc1 $at, $f12 -/* 8ACCB8 80240D28 4600010D */ trunc.w.s $f4, $f0 -/* 8ACCBC 80240D2C 44022000 */ mfc1 $v0, $f4 -/* 8ACCC0 80240D30 00000000 */ nop -/* 8ACCC4 80240D34 A20200AB */ sb $v0, 0xab($s0) -/* 8ACCC8 80240D38 C6200074 */ lwc1 $f0, 0x74($s1) -/* 8ACCCC 80240D3C 0C00A6C9 */ jal clamp_angle -/* 8ACCD0 80240D40 460C0300 */ add.s $f12, $f0, $f12 -/* 8ACCD4 80240D44 0000102D */ daddu $v0, $zero, $zero -/* 8ACCD8 80240D48 08090356 */ j .L80240D58 -/* 8ACCDC 80240D4C E6200074 */ swc1 $f0, 0x74($s1) -.L80240D50: -/* 8ACCE0 80240D50 AE22007C */ sw $v0, 0x7c($s1) -/* 8ACCE4 80240D54 0000102D */ daddu $v0, $zero, $zero -.L80240D58: -/* 8ACCE8 80240D58 8FBF0018 */ lw $ra, 0x18($sp) -/* 8ACCEC 80240D5C 8FB10014 */ lw $s1, 0x14($sp) -/* 8ACCF0 80240D60 8FB00010 */ lw $s0, 0x10($sp) -/* 8ACCF4 80240D64 03E00008 */ jr $ra -/* 8ACCF8 80240D68 27BD0020 */ addiu $sp, $sp, 0x20 -/* 8ACCFC 80240D6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s new file mode 100644 index 0000000000..03a2cc7b28 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_00/8ABF90/func_80240CB0_8ACC40.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CB0_8ACC40 +/* 8ACC40 80240CB0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8ACC44 80240CB4 AFB10014 */ sw $s1, 0x14($sp) +/* 8ACC48 80240CB8 0080882D */ daddu $s1, $a0, $zero +/* 8ACC4C 80240CBC AFBF0018 */ sw $ra, 0x18($sp) +/* 8ACC50 80240CC0 10A0000C */ beqz $a1, .L80240CF4 +/* 8ACC54 80240CC4 AFB00010 */ sw $s0, 0x10($sp) +/* 8ACC58 80240CC8 8E24014C */ lw $a0, 0x14c($s1) +/* 8ACC5C 80240CCC 0C00EAD2 */ jal get_npc_safe +/* 8ACC60 80240CD0 AE200074 */ sw $zero, 0x74($s1) +/* 8ACC64 80240CD4 8E23014C */ lw $v1, 0x14c($s1) +/* 8ACC68 80240CD8 AE220078 */ sw $v0, 0x78($s1) +/* 8ACC6C 80240CDC 2463FFFF */ addiu $v1, $v1, -1 +/* 8ACC70 80240CE0 00031840 */ sll $v1, $v1, 1 +/* 8ACC74 80240CE4 3C028024 */ lui $v0, 0x8024 +/* 8ACC78 80240CE8 00431021 */ addu $v0, $v0, $v1 +/* 8ACC7C 80240CEC 84422D60 */ lh $v0, 0x2d60($v0) +/* 8ACC80 80240CF0 AE22007C */ sw $v0, 0x7c($s1) +.L80240CF4: +/* 8ACC84 80240CF4 8E22007C */ lw $v0, 0x7c($s1) +/* 8ACC88 80240CF8 14400015 */ bnez $v0, .L80240D50 +/* 8ACC8C 80240CFC 2442FFFF */ addiu $v0, $v0, -1 +/* 8ACC90 80240D00 C62C0074 */ lwc1 $f12, 0x74($s1) +/* 8ACC94 80240D04 0C00A8BB */ jal sin_deg +/* 8ACC98 80240D08 8E300078 */ lw $s0, 0x78($s1) +/* 8ACC9C 80240D0C 3C013FC0 */ lui $at, 0x3fc0 +/* 8ACCA0 80240D10 44811000 */ mtc1 $at, $f2 +/* 8ACCA4 80240D14 00000000 */ nop +/* 8ACCA8 80240D18 46020002 */ mul.s $f0, $f0, $f2 +/* 8ACCAC 80240D1C 00000000 */ nop +/* 8ACCB0 80240D20 3C014190 */ lui $at, 0x4190 +/* 8ACCB4 80240D24 44816000 */ mtc1 $at, $f12 +/* 8ACCB8 80240D28 4600010D */ trunc.w.s $f4, $f0 +/* 8ACCBC 80240D2C 44022000 */ mfc1 $v0, $f4 +/* 8ACCC0 80240D30 00000000 */ nop +/* 8ACCC4 80240D34 A20200AB */ sb $v0, 0xab($s0) +/* 8ACCC8 80240D38 C6200074 */ lwc1 $f0, 0x74($s1) +/* 8ACCCC 80240D3C 0C00A6C9 */ jal clamp_angle +/* 8ACCD0 80240D40 460C0300 */ add.s $f12, $f0, $f12 +/* 8ACCD4 80240D44 0000102D */ daddu $v0, $zero, $zero +/* 8ACCD8 80240D48 08090356 */ j .L80240D58 +/* 8ACCDC 80240D4C E6200074 */ swc1 $f0, 0x74($s1) +.L80240D50: +/* 8ACCE0 80240D50 AE22007C */ sw $v0, 0x7c($s1) +/* 8ACCE4 80240D54 0000102D */ daddu $v0, $zero, $zero +.L80240D58: +/* 8ACCE8 80240D58 8FBF0018 */ lw $ra, 0x18($sp) +/* 8ACCEC 80240D5C 8FB10014 */ lw $s1, 0x14($sp) +/* 8ACCF0 80240D60 8FB00010 */ lw $s0, 0x10($sp) +/* 8ACCF4 80240D64 03E00008 */ jr $ra +/* 8ACCF8 80240D68 27BD0020 */ addiu $sp, $sp, 0x20 +/* 8ACCFC 80240D6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390.s deleted file mode 100644 index 634d511b6a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240390 -/* 8B0400 80240390 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0404 80240394 AFB00010 */ sw $s0, 0x10($sp) -/* 8B0408 80240398 3C108024 */ lui $s0, 0x8024 -/* 8B040C 8024039C 261055D0 */ addiu $s0, $s0, 0x55d0 -/* 8B0410 802403A0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B0414 802403A4 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0418 802403A8 8E020000 */ lw $v0, ($s0) -/* 8B041C 802403AC 14400010 */ bnez $v0, .L802403F0 -/* 8B0420 802403B0 0080882D */ daddu $s1, $a0, $zero -/* 8B0424 802403B4 0C00AB39 */ jal heap_malloc -/* 8B0428 802403B8 24040040 */ addiu $a0, $zero, 0x40 -/* 8B042C 802403BC AE020000 */ sw $v0, ($s0) -/* 8B0430 802403C0 0000182D */ daddu $v1, $zero, $zero -/* 8B0434 802403C4 0040282D */ daddu $a1, $v0, $zero -/* 8B0438 802403C8 0220202D */ daddu $a0, $s1, $zero -.L802403CC: -/* 8B043C 802403CC 8C820084 */ lw $v0, 0x84($a0) -/* 8B0440 802403D0 24840004 */ addiu $a0, $a0, 4 -/* 8B0444 802403D4 24630001 */ addiu $v1, $v1, 1 -/* 8B0448 802403D8 ACA20000 */ sw $v0, ($a1) -/* 8B044C 802403DC 28620010 */ slti $v0, $v1, 0x10 -/* 8B0450 802403E0 1440FFFA */ bnez $v0, .L802403CC -/* 8B0454 802403E4 24A50004 */ addiu $a1, $a1, 4 -/* 8B0458 802403E8 0809010B */ j .L8024042C -/* 8B045C 802403EC 00000000 */ nop -.L802403F0: -/* 8B0460 802403F0 0000182D */ daddu $v1, $zero, $zero -/* 8B0464 802403F4 0040282D */ daddu $a1, $v0, $zero -/* 8B0468 802403F8 0220202D */ daddu $a0, $s1, $zero -.L802403FC: -/* 8B046C 802403FC 8CA20000 */ lw $v0, ($a1) -/* 8B0470 80240400 24A50004 */ addiu $a1, $a1, 4 -/* 8B0474 80240404 24630001 */ addiu $v1, $v1, 1 -/* 8B0478 80240408 AC820084 */ sw $v0, 0x84($a0) -/* 8B047C 8024040C 28620010 */ slti $v0, $v1, 0x10 -/* 8B0480 80240410 1440FFFA */ bnez $v0, .L802403FC -/* 8B0484 80240414 24840004 */ addiu $a0, $a0, 4 -/* 8B0488 80240418 3C108024 */ lui $s0, 0x8024 -/* 8B048C 8024041C 261055D0 */ addiu $s0, $s0, 0x55d0 -/* 8B0490 80240420 0C00AB4B */ jal heap_free -/* 8B0494 80240424 8E040000 */ lw $a0, ($s0) -/* 8B0498 80240428 AE000000 */ sw $zero, ($s0) -.L8024042C: -/* 8B049C 8024042C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B04A0 80240430 8FB10014 */ lw $s1, 0x14($sp) -/* 8B04A4 80240434 8FB00010 */ lw $s0, 0x10($sp) -/* 8B04A8 80240438 24020002 */ addiu $v0, $zero, 2 -/* 8B04AC 8024043C 03E00008 */ jr $ra -/* 8B04B0 80240440 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s new file mode 100644 index 0000000000..981c3424ce --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240390_8B0400.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240390_8B0400 +/* 8B0400 80240390 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B0404 80240394 AFB00010 */ sw $s0, 0x10($sp) +/* 8B0408 80240398 3C108024 */ lui $s0, 0x8024 +/* 8B040C 8024039C 261055D0 */ addiu $s0, $s0, 0x55d0 +/* 8B0410 802403A0 AFBF0018 */ sw $ra, 0x18($sp) +/* 8B0414 802403A4 AFB10014 */ sw $s1, 0x14($sp) +/* 8B0418 802403A8 8E020000 */ lw $v0, ($s0) +/* 8B041C 802403AC 14400010 */ bnez $v0, .L802403F0 +/* 8B0420 802403B0 0080882D */ daddu $s1, $a0, $zero +/* 8B0424 802403B4 0C00AB39 */ jal heap_malloc +/* 8B0428 802403B8 24040040 */ addiu $a0, $zero, 0x40 +/* 8B042C 802403BC AE020000 */ sw $v0, ($s0) +/* 8B0430 802403C0 0000182D */ daddu $v1, $zero, $zero +/* 8B0434 802403C4 0040282D */ daddu $a1, $v0, $zero +/* 8B0438 802403C8 0220202D */ daddu $a0, $s1, $zero +.L802403CC: +/* 8B043C 802403CC 8C820084 */ lw $v0, 0x84($a0) +/* 8B0440 802403D0 24840004 */ addiu $a0, $a0, 4 +/* 8B0444 802403D4 24630001 */ addiu $v1, $v1, 1 +/* 8B0448 802403D8 ACA20000 */ sw $v0, ($a1) +/* 8B044C 802403DC 28620010 */ slti $v0, $v1, 0x10 +/* 8B0450 802403E0 1440FFFA */ bnez $v0, .L802403CC +/* 8B0454 802403E4 24A50004 */ addiu $a1, $a1, 4 +/* 8B0458 802403E8 0809010B */ j .L8024042C +/* 8B045C 802403EC 00000000 */ nop +.L802403F0: +/* 8B0460 802403F0 0000182D */ daddu $v1, $zero, $zero +/* 8B0464 802403F4 0040282D */ daddu $a1, $v0, $zero +/* 8B0468 802403F8 0220202D */ daddu $a0, $s1, $zero +.L802403FC: +/* 8B046C 802403FC 8CA20000 */ lw $v0, ($a1) +/* 8B0470 80240400 24A50004 */ addiu $a1, $a1, 4 +/* 8B0474 80240404 24630001 */ addiu $v1, $v1, 1 +/* 8B0478 80240408 AC820084 */ sw $v0, 0x84($a0) +/* 8B047C 8024040C 28620010 */ slti $v0, $v1, 0x10 +/* 8B0480 80240410 1440FFFA */ bnez $v0, .L802403FC +/* 8B0484 80240414 24840004 */ addiu $a0, $a0, 4 +/* 8B0488 80240418 3C108024 */ lui $s0, 0x8024 +/* 8B048C 8024041C 261055D0 */ addiu $s0, $s0, 0x55d0 +/* 8B0490 80240420 0C00AB4B */ jal heap_free +/* 8B0494 80240424 8E040000 */ lw $a0, ($s0) +/* 8B0498 80240428 AE000000 */ sw $zero, ($s0) +.L8024042C: +/* 8B049C 8024042C 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B04A0 80240430 8FB10014 */ lw $s1, 0x14($sp) +/* 8B04A4 80240434 8FB00010 */ lw $s0, 0x10($sp) +/* 8B04A8 80240438 24020002 */ addiu $v0, $zero, 2 +/* 8B04AC 8024043C 03E00008 */ jr $ra +/* 8B04B0 80240440 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8.s deleted file mode 100644 index eaec2a8eea..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A8 -/* 8B0518 802404A8 24020001 */ addiu $v0, $zero, 1 -/* 8B051C 802404AC 3C018015 */ lui $at, %hi(D_80151310) -/* 8B0520 802404B0 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 8B0524 802404B4 03E00008 */ jr $ra -/* 8B0528 802404B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s new file mode 100644 index 0000000000..9b149d8e42 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404A8_8B0518 +/* 8B0518 802404A8 24020001 */ addiu $v0, $zero, 1 +/* 8B051C 802404AC 3C018015 */ lui $at, %hi(D_80151310) +/* 8B0520 802404B0 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* 8B0524 802404B4 03E00008 */ jr $ra +/* 8B0528 802404B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC.s deleted file mode 100644 index 2292d38343..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404BC -/* 8B052C 802404BC 3C018015 */ lui $at, %hi(D_80151310) -/* 8B0530 802404C0 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 8B0534 802404C4 03E00008 */ jr $ra -/* 8B0538 802404C8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s new file mode 100644 index 0000000000..1d8f1385f5 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404BC_8B052C +/* 8B052C 802404BC 3C018015 */ lui $at, %hi(D_80151310) +/* 8B0530 802404C0 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* 8B0534 802404C4 03E00008 */ jr $ra +/* 8B0538 802404C8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC.s deleted file mode 100644 index 87c640bf80..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404CC -/* 8B053C 802404CC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B0540 802404D0 AFB10024 */ sw $s1, 0x24($sp) -/* 8B0544 802404D4 0080882D */ daddu $s1, $a0, $zero -/* 8B0548 802404D8 3C05F840 */ lui $a1, 0xf840 -/* 8B054C 802404DC AFBF0044 */ sw $ra, 0x44($sp) -/* 8B0550 802404E0 AFBE0040 */ sw $fp, 0x40($sp) -/* 8B0554 802404E4 AFB7003C */ sw $s7, 0x3c($sp) -/* 8B0558 802404E8 AFB60038 */ sw $s6, 0x38($sp) -/* 8B055C 802404EC AFB50034 */ sw $s5, 0x34($sp) -/* 8B0560 802404F0 AFB40030 */ sw $s4, 0x30($sp) -/* 8B0564 802404F4 AFB3002C */ sw $s3, 0x2c($sp) -/* 8B0568 802404F8 AFB20028 */ sw $s2, 0x28($sp) -/* 8B056C 802404FC AFB00020 */ sw $s0, 0x20($sp) -/* 8B0570 80240500 8E3E0148 */ lw $fp, 0x148($s1) -/* 8B0574 80240504 0C0B1EAF */ jal get_variable -/* 8B0578 80240508 34A56268 */ ori $a1, $a1, 0x6268 -/* 8B057C 8024050C 0040802D */ daddu $s0, $v0, $zero -/* 8B0580 80240510 0220202D */ daddu $a0, $s1, $zero -/* 8B0584 80240514 3C05F840 */ lui $a1, 0xf840 -/* 8B0588 80240518 0C0B1EAF */ jal get_variable -/* 8B058C 8024051C 34A56269 */ ori $a1, $a1, 0x6269 -/* 8B0590 80240520 0040B82D */ daddu $s7, $v0, $zero -/* 8B0594 80240524 0220202D */ daddu $a0, $s1, $zero -/* 8B0598 80240528 3C05F5DE */ lui $a1, 0xf5de -/* 8B059C 8024052C 0C0B1EAF */ jal get_variable -/* 8B05A0 80240530 34A502DE */ ori $a1, $a1, 0x2de -/* 8B05A4 80240534 0040B02D */ daddu $s6, $v0, $zero -/* 8B05A8 80240538 0220202D */ daddu $a0, $s1, $zero -/* 8B05AC 8024053C 3C05F5DE */ lui $a1, 0xf5de -/* 8B05B0 80240540 0C0B1EAF */ jal get_variable -/* 8B05B4 80240544 34A502DF */ ori $a1, $a1, 0x2df -/* 8B05B8 80240548 0040A82D */ daddu $s5, $v0, $zero -/* 8B05BC 8024054C 93D3006D */ lbu $s3, 0x6d($fp) -/* 8B05C0 80240550 32C2FFFF */ andi $v0, $s6, 0xffff -/* 8B05C4 80240554 A7B30010 */ sh $s3, 0x10($sp) -/* 8B05C8 80240558 93D2006E */ lbu $s2, 0x6e($fp) -/* 8B05CC 8024055C 93C7006F */ lbu $a3, 0x6f($fp) -/* 8B05D0 80240560 3274FFFF */ andi $s4, $s3, 0xffff -/* 8B05D4 80240564 12820003 */ beq $s4, $v0, .L80240574 -/* 8B05D8 80240568 A7A7001E */ sh $a3, 0x1e($sp) -/* 8B05DC 8024056C 0000B82D */ daddu $s7, $zero, $zero -/* 8B05E0 80240570 02E0802D */ daddu $s0, $s7, $zero -.L80240574: -/* 8B05E4 80240574 3202FFFF */ andi $v0, $s0, 0xffff -/* 8B05E8 80240578 14400016 */ bnez $v0, .L802405D4 -/* 8B05EC 8024057C 0220202D */ daddu $a0, $s1, $zero -/* 8B05F0 80240580 0C00A67F */ jal rand_int -/* 8B05F4 80240584 24040064 */ addiu $a0, $zero, 0x64 -/* 8B05F8 80240588 2842001E */ slti $v0, $v0, 0x1e -/* 8B05FC 8024058C 10400011 */ beqz $v0, .L802405D4 -/* 8B0600 80240590 0220202D */ daddu $a0, $s1, $zero -/* 8B0604 80240594 0C00A67F */ jal rand_int -/* 8B0608 80240598 2644FFFF */ addiu $a0, $s2, -1 -/* 8B060C 8024059C 0040A82D */ daddu $s5, $v0, $zero -/* 8B0610 802405A0 0260B02D */ daddu $s6, $s3, $zero -/* 8B0614 802405A4 0220202D */ daddu $a0, $s1, $zero -/* 8B0618 802405A8 3C05F5DE */ lui $a1, 0xf5de -/* 8B061C 802405AC 34A502DE */ ori $a1, $a1, 0x2de -/* 8B0620 802405B0 0C0B2026 */ jal set_variable -/* 8B0624 802405B4 0280302D */ daddu $a2, $s4, $zero -/* 8B0628 802405B8 0220202D */ daddu $a0, $s1, $zero -/* 8B062C 802405BC 3C05F5DE */ lui $a1, 0xf5de -/* 8B0630 802405C0 34A502DF */ ori $a1, $a1, 0x2df -/* 8B0634 802405C4 0C0B2026 */ jal set_variable -/* 8B0638 802405C8 32A6FFFF */ andi $a2, $s5, 0xffff -/* 8B063C 802405CC 24100001 */ addiu $s0, $zero, 1 -/* 8B0640 802405D0 0220202D */ daddu $a0, $s1, $zero -.L802405D4: -/* 8B0644 802405D4 3C05F840 */ lui $a1, 0xf840 -/* 8B0648 802405D8 34A56268 */ ori $a1, $a1, 0x6268 -/* 8B064C 802405DC 0C0B2026 */ jal set_variable -/* 8B0650 802405E0 3206FFFF */ andi $a2, $s0, 0xffff -/* 8B0654 802405E4 0220202D */ daddu $a0, $s1, $zero -/* 8B0658 802405E8 3C05F840 */ lui $a1, 0xf840 -/* 8B065C 802405EC 34A56269 */ ori $a1, $a1, 0x6269 -/* 8B0660 802405F0 0C0B2026 */ jal set_variable -/* 8B0664 802405F4 32E6FFFF */ andi $a2, $s7, 0xffff -/* 8B0668 802405F8 0000202D */ daddu $a0, $zero, $zero -/* 8B066C 802405FC 3C05F5DE */ lui $a1, 0xf5de -/* 8B0670 80240600 0C0B1EAF */ jal get_variable -/* 8B0674 80240604 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 8B0678 80240608 0000202D */ daddu $a0, $zero, $zero -/* 8B067C 8024060C 3C05F5DE */ lui $a1, 0xf5de -/* 8B0680 80240610 34A50180 */ ori $a1, $a1, 0x180 -/* 8B0684 80240614 0C0B1EAF */ jal get_variable -/* 8B0688 80240618 0040802D */ daddu $s0, $v0, $zero -/* 8B068C 8024061C 0040282D */ daddu $a1, $v0, $zero -/* 8B0690 80240620 0000182D */ daddu $v1, $zero, $zero -/* 8B0694 80240624 3C068024 */ lui $a2, 0x8024 -/* 8B0698 80240628 24C65674 */ addiu $a2, $a2, 0x5674 -/* 8B069C 8024062C 00C0202D */ daddu $a0, $a2, $zero -.L80240630: -/* 8B06A0 80240630 8C820000 */ lw $v0, ($a0) -/* 8B06A4 80240634 00A2102A */ slt $v0, $a1, $v0 -/* 8B06A8 80240638 14400006 */ bnez $v0, .L80240654 -/* 8B06AC 8024063C 000310C0 */ sll $v0, $v1, 3 -/* 8B06B0 80240640 24630001 */ addiu $v1, $v1, 1 -/* 8B06B4 80240644 28620008 */ slti $v0, $v1, 8 -/* 8B06B8 80240648 1440FFF9 */ bnez $v0, .L80240630 -/* 8B06BC 8024064C 24840008 */ addiu $a0, $a0, 8 -/* 8B06C0 80240650 000310C0 */ sll $v0, $v1, 3 -.L80240654: -/* 8B06C4 80240654 00461021 */ addu $v0, $v0, $a2 -/* 8B06C8 80240658 8C420004 */ lw $v0, 4($v0) -/* 8B06CC 8024065C 97A30010 */ lhu $v1, 0x10($sp) -/* 8B06D0 80240660 0202202A */ slt $a0, $s0, $v0 -/* 8B06D4 80240664 32C2FFFF */ andi $v0, $s6, 0xffff -/* 8B06D8 80240668 14620008 */ bne $v1, $v0, .L8024068C -/* 8B06DC 8024066C 32A2FFFF */ andi $v0, $s5, 0xffff -/* 8B06E0 80240670 97A7001E */ lhu $a3, 0x1e($sp) -/* 8B06E4 80240674 14E20005 */ bne $a3, $v0, .L8024068C -/* 8B06E8 80240678 32E2FFFF */ andi $v0, $s7, 0xffff -/* 8B06EC 8024067C 14400003 */ bnez $v0, .L8024068C -/* 8B06F0 80240680 00000000 */ nop -/* 8B06F4 80240684 14800008 */ bnez $a0, .L802406A8 -/* 8B06F8 80240688 24020001 */ addiu $v0, $zero, 1 -.L8024068C: -/* 8B06FC 8024068C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8B0700 80240690 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8B0704 80240694 80420075 */ lb $v0, 0x75($v0) -/* 8B0708 80240698 10400005 */ beqz $v0, .L802406B0 -/* 8B070C 8024069C 00000000 */ nop -/* 8B0710 802406A0 10800003 */ beqz $a0, .L802406B0 -/* 8B0714 802406A4 24020001 */ addiu $v0, $zero, 1 -.L802406A8: -/* 8B0718 802406A8 080901AF */ j .L802406BC -/* 8B071C 802406AC AE220084 */ sw $v0, 0x84($s1) -.L802406B0: -/* 8B0720 802406B0 0C00F9EB */ jal kill_enemy -/* 8B0724 802406B4 03C0202D */ daddu $a0, $fp, $zero -/* 8B0728 802406B8 AE200084 */ sw $zero, 0x84($s1) -.L802406BC: -/* 8B072C 802406BC 8FBF0044 */ lw $ra, 0x44($sp) -/* 8B0730 802406C0 8FBE0040 */ lw $fp, 0x40($sp) -/* 8B0734 802406C4 8FB7003C */ lw $s7, 0x3c($sp) -/* 8B0738 802406C8 8FB60038 */ lw $s6, 0x38($sp) -/* 8B073C 802406CC 8FB50034 */ lw $s5, 0x34($sp) -/* 8B0740 802406D0 8FB40030 */ lw $s4, 0x30($sp) -/* 8B0744 802406D4 8FB3002C */ lw $s3, 0x2c($sp) -/* 8B0748 802406D8 8FB20028 */ lw $s2, 0x28($sp) -/* 8B074C 802406DC 8FB10024 */ lw $s1, 0x24($sp) -/* 8B0750 802406E0 8FB00020 */ lw $s0, 0x20($sp) -/* 8B0754 802406E4 24020002 */ addiu $v0, $zero, 2 -/* 8B0758 802406E8 03E00008 */ jr $ra -/* 8B075C 802406EC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s new file mode 100644 index 0000000000..b66321aa0e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404CC_8B053C.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404CC_8B053C +/* 8B053C 802404CC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8B0540 802404D0 AFB10024 */ sw $s1, 0x24($sp) +/* 8B0544 802404D4 0080882D */ daddu $s1, $a0, $zero +/* 8B0548 802404D8 3C05F840 */ lui $a1, 0xf840 +/* 8B054C 802404DC AFBF0044 */ sw $ra, 0x44($sp) +/* 8B0550 802404E0 AFBE0040 */ sw $fp, 0x40($sp) +/* 8B0554 802404E4 AFB7003C */ sw $s7, 0x3c($sp) +/* 8B0558 802404E8 AFB60038 */ sw $s6, 0x38($sp) +/* 8B055C 802404EC AFB50034 */ sw $s5, 0x34($sp) +/* 8B0560 802404F0 AFB40030 */ sw $s4, 0x30($sp) +/* 8B0564 802404F4 AFB3002C */ sw $s3, 0x2c($sp) +/* 8B0568 802404F8 AFB20028 */ sw $s2, 0x28($sp) +/* 8B056C 802404FC AFB00020 */ sw $s0, 0x20($sp) +/* 8B0570 80240500 8E3E0148 */ lw $fp, 0x148($s1) +/* 8B0574 80240504 0C0B1EAF */ jal get_variable +/* 8B0578 80240508 34A56268 */ ori $a1, $a1, 0x6268 +/* 8B057C 8024050C 0040802D */ daddu $s0, $v0, $zero +/* 8B0580 80240510 0220202D */ daddu $a0, $s1, $zero +/* 8B0584 80240514 3C05F840 */ lui $a1, 0xf840 +/* 8B0588 80240518 0C0B1EAF */ jal get_variable +/* 8B058C 8024051C 34A56269 */ ori $a1, $a1, 0x6269 +/* 8B0590 80240520 0040B82D */ daddu $s7, $v0, $zero +/* 8B0594 80240524 0220202D */ daddu $a0, $s1, $zero +/* 8B0598 80240528 3C05F5DE */ lui $a1, 0xf5de +/* 8B059C 8024052C 0C0B1EAF */ jal get_variable +/* 8B05A0 80240530 34A502DE */ ori $a1, $a1, 0x2de +/* 8B05A4 80240534 0040B02D */ daddu $s6, $v0, $zero +/* 8B05A8 80240538 0220202D */ daddu $a0, $s1, $zero +/* 8B05AC 8024053C 3C05F5DE */ lui $a1, 0xf5de +/* 8B05B0 80240540 0C0B1EAF */ jal get_variable +/* 8B05B4 80240544 34A502DF */ ori $a1, $a1, 0x2df +/* 8B05B8 80240548 0040A82D */ daddu $s5, $v0, $zero +/* 8B05BC 8024054C 93D3006D */ lbu $s3, 0x6d($fp) +/* 8B05C0 80240550 32C2FFFF */ andi $v0, $s6, 0xffff +/* 8B05C4 80240554 A7B30010 */ sh $s3, 0x10($sp) +/* 8B05C8 80240558 93D2006E */ lbu $s2, 0x6e($fp) +/* 8B05CC 8024055C 93C7006F */ lbu $a3, 0x6f($fp) +/* 8B05D0 80240560 3274FFFF */ andi $s4, $s3, 0xffff +/* 8B05D4 80240564 12820003 */ beq $s4, $v0, .L80240574 +/* 8B05D8 80240568 A7A7001E */ sh $a3, 0x1e($sp) +/* 8B05DC 8024056C 0000B82D */ daddu $s7, $zero, $zero +/* 8B05E0 80240570 02E0802D */ daddu $s0, $s7, $zero +.L80240574: +/* 8B05E4 80240574 3202FFFF */ andi $v0, $s0, 0xffff +/* 8B05E8 80240578 14400016 */ bnez $v0, .L802405D4 +/* 8B05EC 8024057C 0220202D */ daddu $a0, $s1, $zero +/* 8B05F0 80240580 0C00A67F */ jal rand_int +/* 8B05F4 80240584 24040064 */ addiu $a0, $zero, 0x64 +/* 8B05F8 80240588 2842001E */ slti $v0, $v0, 0x1e +/* 8B05FC 8024058C 10400011 */ beqz $v0, .L802405D4 +/* 8B0600 80240590 0220202D */ daddu $a0, $s1, $zero +/* 8B0604 80240594 0C00A67F */ jal rand_int +/* 8B0608 80240598 2644FFFF */ addiu $a0, $s2, -1 +/* 8B060C 8024059C 0040A82D */ daddu $s5, $v0, $zero +/* 8B0610 802405A0 0260B02D */ daddu $s6, $s3, $zero +/* 8B0614 802405A4 0220202D */ daddu $a0, $s1, $zero +/* 8B0618 802405A8 3C05F5DE */ lui $a1, 0xf5de +/* 8B061C 802405AC 34A502DE */ ori $a1, $a1, 0x2de +/* 8B0620 802405B0 0C0B2026 */ jal set_variable +/* 8B0624 802405B4 0280302D */ daddu $a2, $s4, $zero +/* 8B0628 802405B8 0220202D */ daddu $a0, $s1, $zero +/* 8B062C 802405BC 3C05F5DE */ lui $a1, 0xf5de +/* 8B0630 802405C0 34A502DF */ ori $a1, $a1, 0x2df +/* 8B0634 802405C4 0C0B2026 */ jal set_variable +/* 8B0638 802405C8 32A6FFFF */ andi $a2, $s5, 0xffff +/* 8B063C 802405CC 24100001 */ addiu $s0, $zero, 1 +/* 8B0640 802405D0 0220202D */ daddu $a0, $s1, $zero +.L802405D4: +/* 8B0644 802405D4 3C05F840 */ lui $a1, 0xf840 +/* 8B0648 802405D8 34A56268 */ ori $a1, $a1, 0x6268 +/* 8B064C 802405DC 0C0B2026 */ jal set_variable +/* 8B0650 802405E0 3206FFFF */ andi $a2, $s0, 0xffff +/* 8B0654 802405E4 0220202D */ daddu $a0, $s1, $zero +/* 8B0658 802405E8 3C05F840 */ lui $a1, 0xf840 +/* 8B065C 802405EC 34A56269 */ ori $a1, $a1, 0x6269 +/* 8B0660 802405F0 0C0B2026 */ jal set_variable +/* 8B0664 802405F4 32E6FFFF */ andi $a2, $s7, 0xffff +/* 8B0668 802405F8 0000202D */ daddu $a0, $zero, $zero +/* 8B066C 802405FC 3C05F5DE */ lui $a1, 0xf5de +/* 8B0670 80240600 0C0B1EAF */ jal get_variable +/* 8B0674 80240604 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 8B0678 80240608 0000202D */ daddu $a0, $zero, $zero +/* 8B067C 8024060C 3C05F5DE */ lui $a1, 0xf5de +/* 8B0680 80240610 34A50180 */ ori $a1, $a1, 0x180 +/* 8B0684 80240614 0C0B1EAF */ jal get_variable +/* 8B0688 80240618 0040802D */ daddu $s0, $v0, $zero +/* 8B068C 8024061C 0040282D */ daddu $a1, $v0, $zero +/* 8B0690 80240620 0000182D */ daddu $v1, $zero, $zero +/* 8B0694 80240624 3C068024 */ lui $a2, 0x8024 +/* 8B0698 80240628 24C65674 */ addiu $a2, $a2, 0x5674 +/* 8B069C 8024062C 00C0202D */ daddu $a0, $a2, $zero +.L80240630: +/* 8B06A0 80240630 8C820000 */ lw $v0, ($a0) +/* 8B06A4 80240634 00A2102A */ slt $v0, $a1, $v0 +/* 8B06A8 80240638 14400006 */ bnez $v0, .L80240654 +/* 8B06AC 8024063C 000310C0 */ sll $v0, $v1, 3 +/* 8B06B0 80240640 24630001 */ addiu $v1, $v1, 1 +/* 8B06B4 80240644 28620008 */ slti $v0, $v1, 8 +/* 8B06B8 80240648 1440FFF9 */ bnez $v0, .L80240630 +/* 8B06BC 8024064C 24840008 */ addiu $a0, $a0, 8 +/* 8B06C0 80240650 000310C0 */ sll $v0, $v1, 3 +.L80240654: +/* 8B06C4 80240654 00461021 */ addu $v0, $v0, $a2 +/* 8B06C8 80240658 8C420004 */ lw $v0, 4($v0) +/* 8B06CC 8024065C 97A30010 */ lhu $v1, 0x10($sp) +/* 8B06D0 80240660 0202202A */ slt $a0, $s0, $v0 +/* 8B06D4 80240664 32C2FFFF */ andi $v0, $s6, 0xffff +/* 8B06D8 80240668 14620008 */ bne $v1, $v0, .L8024068C +/* 8B06DC 8024066C 32A2FFFF */ andi $v0, $s5, 0xffff +/* 8B06E0 80240670 97A7001E */ lhu $a3, 0x1e($sp) +/* 8B06E4 80240674 14E20005 */ bne $a3, $v0, .L8024068C +/* 8B06E8 80240678 32E2FFFF */ andi $v0, $s7, 0xffff +/* 8B06EC 8024067C 14400003 */ bnez $v0, .L8024068C +/* 8B06F0 80240680 00000000 */ nop +/* 8B06F4 80240684 14800008 */ bnez $a0, .L802406A8 +/* 8B06F8 80240688 24020001 */ addiu $v0, $zero, 1 +.L8024068C: +/* 8B06FC 8024068C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 8B0700 80240690 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 8B0704 80240694 80420075 */ lb $v0, 0x75($v0) +/* 8B0708 80240698 10400005 */ beqz $v0, .L802406B0 +/* 8B070C 8024069C 00000000 */ nop +/* 8B0710 802406A0 10800003 */ beqz $a0, .L802406B0 +/* 8B0714 802406A4 24020001 */ addiu $v0, $zero, 1 +.L802406A8: +/* 8B0718 802406A8 080901AF */ j .L802406BC +/* 8B071C 802406AC AE220084 */ sw $v0, 0x84($s1) +.L802406B0: +/* 8B0720 802406B0 0C00F9EB */ jal kill_enemy +/* 8B0724 802406B4 03C0202D */ daddu $a0, $fp, $zero +/* 8B0728 802406B8 AE200084 */ sw $zero, 0x84($s1) +.L802406BC: +/* 8B072C 802406BC 8FBF0044 */ lw $ra, 0x44($sp) +/* 8B0730 802406C0 8FBE0040 */ lw $fp, 0x40($sp) +/* 8B0734 802406C4 8FB7003C */ lw $s7, 0x3c($sp) +/* 8B0738 802406C8 8FB60038 */ lw $s6, 0x38($sp) +/* 8B073C 802406CC 8FB50034 */ lw $s5, 0x34($sp) +/* 8B0740 802406D0 8FB40030 */ lw $s4, 0x30($sp) +/* 8B0744 802406D4 8FB3002C */ lw $s3, 0x2c($sp) +/* 8B0748 802406D8 8FB20028 */ lw $s2, 0x28($sp) +/* 8B074C 802406DC 8FB10024 */ lw $s1, 0x24($sp) +/* 8B0750 802406E0 8FB00020 */ lw $s0, 0x20($sp) +/* 8B0754 802406E4 24020002 */ addiu $v0, $zero, 2 +/* 8B0758 802406E8 03E00008 */ jr $ra +/* 8B075C 802406EC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0.s deleted file mode 100644 index 9558c21f2a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406F0 -/* 8B0760 802406F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B0764 802406F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B0768 802406F8 AFB00010 */ sw $s0, 0x10($sp) -/* 8B076C 802406FC 0C00EABB */ jal get_npc_unsafe -/* 8B0770 80240700 8C84014C */ lw $a0, 0x14c($a0) -/* 8B0774 80240704 24040008 */ addiu $a0, $zero, 8 -/* 8B0778 80240708 0040802D */ daddu $s0, $v0, $zero -/* 8B077C 8024070C 3C028024 */ lui $v0, 0x8024 -/* 8B0780 80240710 2442075C */ addiu $v0, $v0, 0x75c -/* 8B0784 80240714 0C00AB39 */ jal heap_malloc -/* 8B0788 80240718 AE020008 */ sw $v0, 8($s0) -/* 8B078C 8024071C 0040182D */ daddu $v1, $v0, $zero -/* 8B0790 80240720 AE030020 */ sw $v1, 0x20($s0) -/* 8B0794 80240724 AC600000 */ sw $zero, ($v1) -/* 8B0798 80240728 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B079C 8024072C 8FB00010 */ lw $s0, 0x10($sp) -/* 8B07A0 80240730 24020001 */ addiu $v0, $zero, 1 -/* 8B07A4 80240734 03E00008 */ jr $ra -/* 8B07A8 80240738 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s new file mode 100644 index 0000000000..d6706adf3e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802406F0_8B0760.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406F0_8B0760 +/* 8B0760 802406F0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B0764 802406F4 AFBF0014 */ sw $ra, 0x14($sp) +/* 8B0768 802406F8 AFB00010 */ sw $s0, 0x10($sp) +/* 8B076C 802406FC 0C00EABB */ jal get_npc_unsafe +/* 8B0770 80240700 8C84014C */ lw $a0, 0x14c($a0) +/* 8B0774 80240704 24040008 */ addiu $a0, $zero, 8 +/* 8B0778 80240708 0040802D */ daddu $s0, $v0, $zero +/* 8B077C 8024070C 3C028024 */ lui $v0, 0x8024 +/* 8B0780 80240710 2442075C */ addiu $v0, $v0, 0x75c +/* 8B0784 80240714 0C00AB39 */ jal heap_malloc +/* 8B0788 80240718 AE020008 */ sw $v0, 8($s0) +/* 8B078C 8024071C 0040182D */ daddu $v1, $v0, $zero +/* 8B0790 80240720 AE030020 */ sw $v1, 0x20($s0) +/* 8B0794 80240724 AC600000 */ sw $zero, ($v1) +/* 8B0798 80240728 8FBF0014 */ lw $ra, 0x14($sp) +/* 8B079C 8024072C 8FB00010 */ lw $s0, 0x10($sp) +/* 8B07A0 80240730 24020001 */ addiu $v0, $zero, 1 +/* 8B07A4 80240734 03E00008 */ jr $ra +/* 8B07A8 80240738 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C.s deleted file mode 100644 index cc5490be9c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024073C -/* 8B07AC 8024073C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B07B0 80240740 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B07B4 80240744 0C00EABB */ jal get_npc_unsafe -/* 8B07B8 80240748 8C84014C */ lw $a0, 0x14c($a0) -/* 8B07BC 8024074C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B07C0 80240750 0000102D */ daddu $v0, $zero, $zero -/* 8B07C4 80240754 03E00008 */ jr $ra -/* 8B07C8 80240758 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s new file mode 100644 index 0000000000..1dad685eca --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024073C_8B07AC +/* 8B07AC 8024073C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B07B0 80240740 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B07B4 80240744 0C00EABB */ jal get_npc_unsafe +/* 8B07B8 80240748 8C84014C */ lw $a0, 0x14c($a0) +/* 8B07BC 8024074C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B07C0 80240750 0000102D */ daddu $v0, $zero, $zero +/* 8B07C4 80240754 03E00008 */ jr $ra +/* 8B07C8 80240758 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908.s deleted file mode 100644 index 2c4b819ee9..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240908 -/* 8B0978 80240908 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8B097C 8024090C AFB00010 */ sw $s0, 0x10($sp) -/* 8B0980 80240910 0080802D */ daddu $s0, $a0, $zero -/* 8B0984 80240914 AFBF0020 */ sw $ra, 0x20($sp) -/* 8B0988 80240918 AFB3001C */ sw $s3, 0x1c($sp) -/* 8B098C 8024091C AFB20018 */ sw $s2, 0x18($sp) -/* 8B0990 80240920 10A00009 */ beqz $a1, .L80240948 -/* 8B0994 80240924 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0998 80240928 0000202D */ daddu $a0, $zero, $zero -/* 8B099C 8024092C 0080282D */ daddu $a1, $a0, $zero -/* 8B09A0 80240930 0080302D */ daddu $a2, $a0, $zero -/* 8B09A4 80240934 0C046F97 */ jal set_background_color_blend -/* 8B09A8 80240938 240700FF */ addiu $a3, $zero, 0xff -/* 8B09AC 8024093C 240200FF */ addiu $v0, $zero, 0xff -/* 8B09B0 80240940 AE020070 */ sw $v0, 0x70($s0) -/* 8B09B4 80240944 AE000074 */ sw $zero, 0x74($s0) -.L80240948: -/* 8B09B8 80240948 8E020070 */ lw $v0, 0x70($s0) -/* 8B09BC 8024094C 2442FFF8 */ addiu $v0, $v0, -8 -/* 8B09C0 80240950 04410002 */ bgez $v0, .L8024095C -/* 8B09C4 80240954 AE020070 */ sw $v0, 0x70($s0) -/* 8B09C8 80240958 AE000070 */ sw $zero, 0x70($s0) -.L8024095C: -/* 8B09CC 8024095C 0000202D */ daddu $a0, $zero, $zero -/* 8B09D0 80240960 0080282D */ daddu $a1, $a0, $zero -/* 8B09D4 80240964 92070073 */ lbu $a3, 0x73($s0) -/* 8B09D8 80240968 0C046F97 */ jal set_background_color_blend -/* 8B09DC 8024096C 0080302D */ daddu $a2, $a0, $zero -/* 8B09E0 80240970 8E020070 */ lw $v0, 0x70($s0) -/* 8B09E4 80240974 14400006 */ bnez $v0, .L80240990 -/* 8B09E8 80240978 00000000 */ nop -/* 8B09EC 8024097C 8E020074 */ lw $v0, 0x74($s0) -/* 8B09F0 80240980 14400003 */ bnez $v0, .L80240990 -/* 8B09F4 80240984 24020001 */ addiu $v0, $zero, 1 -/* 8B09F8 80240988 08090297 */ j .L80240A5C -/* 8B09FC 8024098C AE020074 */ sw $v0, 0x74($s0) -.L80240990: -/* 8B0A00 80240990 8E030074 */ lw $v1, 0x74($s0) -/* 8B0A04 80240994 24020001 */ addiu $v0, $zero, 1 -/* 8B0A08 80240998 14620031 */ bne $v1, $v0, .L80240A60 -/* 8B0A0C 8024099C 0000102D */ daddu $v0, $zero, $zero -/* 8B0A10 802409A0 0C04760B */ jal func_8011D82C -/* 8B0A14 802409A4 0000202D */ daddu $a0, $zero, $zero -/* 8B0A18 802409A8 0000802D */ daddu $s0, $zero, $zero -/* 8B0A1C 802409AC 2413FFFC */ addiu $s3, $zero, -4 -/* 8B0A20 802409B0 24120008 */ addiu $s2, $zero, 8 -/* 8B0A24 802409B4 3C11FF7F */ lui $s1, 0xff7f -/* 8B0A28 802409B8 3C028015 */ lui $v0, 0x8015 -/* 8B0A2C 802409BC 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 8B0A30 802409C0 3631FFFF */ ori $s1, $s1, 0xffff -/* 8B0A34 802409C4 A0400000 */ sb $zero, ($v0) -.L802409C8: -/* 8B0A38 802409C8 0C00E2B7 */ jal get_npc_by_index -/* 8B0A3C 802409CC 0200202D */ daddu $a0, $s0, $zero -/* 8B0A40 802409D0 0040202D */ daddu $a0, $v0, $zero -/* 8B0A44 802409D4 5080000B */ beql $a0, $zero, .L80240A04 -/* 8B0A48 802409D8 26100001 */ addiu $s0, $s0, 1 -/* 8B0A4C 802409DC 8C820000 */ lw $v0, ($a0) -/* 8B0A50 802409E0 50400008 */ beql $v0, $zero, .L80240A04 -/* 8B0A54 802409E4 26100001 */ addiu $s0, $s0, 1 -/* 8B0A58 802409E8 808300A4 */ lb $v1, 0xa4($a0) -/* 8B0A5C 802409EC 10730005 */ beq $v1, $s3, .L80240A04 -/* 8B0A60 802409F0 26100001 */ addiu $s0, $s0, 1 -/* 8B0A64 802409F4 10720003 */ beq $v1, $s2, .L80240A04 -/* 8B0A68 802409F8 00000000 */ nop -/* 8B0A6C 802409FC 00511024 */ and $v0, $v0, $s1 -/* 8B0A70 80240A00 AC820000 */ sw $v0, ($a0) -.L80240A04: -/* 8B0A74 80240A04 2A020040 */ slti $v0, $s0, 0x40 -/* 8B0A78 80240A08 1440FFEF */ bnez $v0, .L802409C8 -/* 8B0A7C 80240A0C 00000000 */ nop -/* 8B0A80 80240A10 0000802D */ daddu $s0, $zero, $zero -/* 8B0A84 80240A14 3C11F7FF */ lui $s1, 0xf7ff -/* 8B0A88 80240A18 3631FFFF */ ori $s1, $s1, 0xffff -.L80240A1C: -/* 8B0A8C 80240A1C 0C04C3D6 */ jal get_item_entity -/* 8B0A90 80240A20 0200202D */ daddu $a0, $s0, $zero -/* 8B0A94 80240A24 0040182D */ daddu $v1, $v0, $zero -/* 8B0A98 80240A28 10600007 */ beqz $v1, .L80240A48 -/* 8B0A9C 80240A2C 26100001 */ addiu $s0, $s0, 1 -/* 8B0AA0 80240A30 8C640000 */ lw $a0, ($v1) -/* 8B0AA4 80240A34 30820010 */ andi $v0, $a0, 0x10 -/* 8B0AA8 80240A38 10400003 */ beqz $v0, .L80240A48 -/* 8B0AAC 80240A3C 00000000 */ nop -/* 8B0AB0 80240A40 00911024 */ and $v0, $a0, $s1 -/* 8B0AB4 80240A44 AC620000 */ sw $v0, ($v1) -.L80240A48: -/* 8B0AB8 80240A48 2A020100 */ slti $v0, $s0, 0x100 -/* 8B0ABC 80240A4C 1440FFF3 */ bnez $v0, .L80240A1C -/* 8B0AC0 80240A50 24020002 */ addiu $v0, $zero, 2 -/* 8B0AC4 80240A54 08090298 */ j .L80240A60 -/* 8B0AC8 80240A58 00000000 */ nop -.L80240A5C: -/* 8B0ACC 80240A5C 0000102D */ daddu $v0, $zero, $zero -.L80240A60: -/* 8B0AD0 80240A60 8FBF0020 */ lw $ra, 0x20($sp) -/* 8B0AD4 80240A64 8FB3001C */ lw $s3, 0x1c($sp) -/* 8B0AD8 80240A68 8FB20018 */ lw $s2, 0x18($sp) -/* 8B0ADC 80240A6C 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0AE0 80240A70 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0AE4 80240A74 03E00008 */ jr $ra -/* 8B0AE8 80240A78 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s new file mode 100644 index 0000000000..1a8a235e83 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240908_8B0978.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240908_8B0978 +/* 8B0978 80240908 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8B097C 8024090C AFB00010 */ sw $s0, 0x10($sp) +/* 8B0980 80240910 0080802D */ daddu $s0, $a0, $zero +/* 8B0984 80240914 AFBF0020 */ sw $ra, 0x20($sp) +/* 8B0988 80240918 AFB3001C */ sw $s3, 0x1c($sp) +/* 8B098C 8024091C AFB20018 */ sw $s2, 0x18($sp) +/* 8B0990 80240920 10A00009 */ beqz $a1, .L80240948 +/* 8B0994 80240924 AFB10014 */ sw $s1, 0x14($sp) +/* 8B0998 80240928 0000202D */ daddu $a0, $zero, $zero +/* 8B099C 8024092C 0080282D */ daddu $a1, $a0, $zero +/* 8B09A0 80240930 0080302D */ daddu $a2, $a0, $zero +/* 8B09A4 80240934 0C046F97 */ jal set_background_color_blend +/* 8B09A8 80240938 240700FF */ addiu $a3, $zero, 0xff +/* 8B09AC 8024093C 240200FF */ addiu $v0, $zero, 0xff +/* 8B09B0 80240940 AE020070 */ sw $v0, 0x70($s0) +/* 8B09B4 80240944 AE000074 */ sw $zero, 0x74($s0) +.L80240948: +/* 8B09B8 80240948 8E020070 */ lw $v0, 0x70($s0) +/* 8B09BC 8024094C 2442FFF8 */ addiu $v0, $v0, -8 +/* 8B09C0 80240950 04410002 */ bgez $v0, .L8024095C +/* 8B09C4 80240954 AE020070 */ sw $v0, 0x70($s0) +/* 8B09C8 80240958 AE000070 */ sw $zero, 0x70($s0) +.L8024095C: +/* 8B09CC 8024095C 0000202D */ daddu $a0, $zero, $zero +/* 8B09D0 80240960 0080282D */ daddu $a1, $a0, $zero +/* 8B09D4 80240964 92070073 */ lbu $a3, 0x73($s0) +/* 8B09D8 80240968 0C046F97 */ jal set_background_color_blend +/* 8B09DC 8024096C 0080302D */ daddu $a2, $a0, $zero +/* 8B09E0 80240970 8E020070 */ lw $v0, 0x70($s0) +/* 8B09E4 80240974 14400006 */ bnez $v0, .L80240990 +/* 8B09E8 80240978 00000000 */ nop +/* 8B09EC 8024097C 8E020074 */ lw $v0, 0x74($s0) +/* 8B09F0 80240980 14400003 */ bnez $v0, .L80240990 +/* 8B09F4 80240984 24020001 */ addiu $v0, $zero, 1 +/* 8B09F8 80240988 08090297 */ j .L80240A5C +/* 8B09FC 8024098C AE020074 */ sw $v0, 0x74($s0) +.L80240990: +/* 8B0A00 80240990 8E030074 */ lw $v1, 0x74($s0) +/* 8B0A04 80240994 24020001 */ addiu $v0, $zero, 1 +/* 8B0A08 80240998 14620031 */ bne $v1, $v0, .L80240A60 +/* 8B0A0C 8024099C 0000102D */ daddu $v0, $zero, $zero +/* 8B0A10 802409A0 0C04760B */ jal func_8011D82C +/* 8B0A14 802409A4 0000202D */ daddu $a0, $zero, $zero +/* 8B0A18 802409A8 0000802D */ daddu $s0, $zero, $zero +/* 8B0A1C 802409AC 2413FFFC */ addiu $s3, $zero, -4 +/* 8B0A20 802409B0 24120008 */ addiu $s2, $zero, 8 +/* 8B0A24 802409B4 3C11FF7F */ lui $s1, 0xff7f +/* 8B0A28 802409B8 3C028015 */ lui $v0, 0x8015 +/* 8B0A2C 802409BC 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 8B0A30 802409C0 3631FFFF */ ori $s1, $s1, 0xffff +/* 8B0A34 802409C4 A0400000 */ sb $zero, ($v0) +.L802409C8: +/* 8B0A38 802409C8 0C00E2B7 */ jal get_npc_by_index +/* 8B0A3C 802409CC 0200202D */ daddu $a0, $s0, $zero +/* 8B0A40 802409D0 0040202D */ daddu $a0, $v0, $zero +/* 8B0A44 802409D4 5080000B */ beql $a0, $zero, .L80240A04 +/* 8B0A48 802409D8 26100001 */ addiu $s0, $s0, 1 +/* 8B0A4C 802409DC 8C820000 */ lw $v0, ($a0) +/* 8B0A50 802409E0 50400008 */ beql $v0, $zero, .L80240A04 +/* 8B0A54 802409E4 26100001 */ addiu $s0, $s0, 1 +/* 8B0A58 802409E8 808300A4 */ lb $v1, 0xa4($a0) +/* 8B0A5C 802409EC 10730005 */ beq $v1, $s3, .L80240A04 +/* 8B0A60 802409F0 26100001 */ addiu $s0, $s0, 1 +/* 8B0A64 802409F4 10720003 */ beq $v1, $s2, .L80240A04 +/* 8B0A68 802409F8 00000000 */ nop +/* 8B0A6C 802409FC 00511024 */ and $v0, $v0, $s1 +/* 8B0A70 80240A00 AC820000 */ sw $v0, ($a0) +.L80240A04: +/* 8B0A74 80240A04 2A020040 */ slti $v0, $s0, 0x40 +/* 8B0A78 80240A08 1440FFEF */ bnez $v0, .L802409C8 +/* 8B0A7C 80240A0C 00000000 */ nop +/* 8B0A80 80240A10 0000802D */ daddu $s0, $zero, $zero +/* 8B0A84 80240A14 3C11F7FF */ lui $s1, 0xf7ff +/* 8B0A88 80240A18 3631FFFF */ ori $s1, $s1, 0xffff +.L80240A1C: +/* 8B0A8C 80240A1C 0C04C3D6 */ jal get_item_entity +/* 8B0A90 80240A20 0200202D */ daddu $a0, $s0, $zero +/* 8B0A94 80240A24 0040182D */ daddu $v1, $v0, $zero +/* 8B0A98 80240A28 10600007 */ beqz $v1, .L80240A48 +/* 8B0A9C 80240A2C 26100001 */ addiu $s0, $s0, 1 +/* 8B0AA0 80240A30 8C640000 */ lw $a0, ($v1) +/* 8B0AA4 80240A34 30820010 */ andi $v0, $a0, 0x10 +/* 8B0AA8 80240A38 10400003 */ beqz $v0, .L80240A48 +/* 8B0AAC 80240A3C 00000000 */ nop +/* 8B0AB0 80240A40 00911024 */ and $v0, $a0, $s1 +/* 8B0AB4 80240A44 AC620000 */ sw $v0, ($v1) +.L80240A48: +/* 8B0AB8 80240A48 2A020100 */ slti $v0, $s0, 0x100 +/* 8B0ABC 80240A4C 1440FFF3 */ bnez $v0, .L80240A1C +/* 8B0AC0 80240A50 24020002 */ addiu $v0, $zero, 2 +/* 8B0AC4 80240A54 08090298 */ j .L80240A60 +/* 8B0AC8 80240A58 00000000 */ nop +.L80240A5C: +/* 8B0ACC 80240A5C 0000102D */ daddu $v0, $zero, $zero +.L80240A60: +/* 8B0AD0 80240A60 8FBF0020 */ lw $ra, 0x20($sp) +/* 8B0AD4 80240A64 8FB3001C */ lw $s3, 0x1c($sp) +/* 8B0AD8 80240A68 8FB20018 */ lw $s2, 0x18($sp) +/* 8B0ADC 80240A6C 8FB10014 */ lw $s1, 0x14($sp) +/* 8B0AE0 80240A70 8FB00010 */ lw $s0, 0x10($sp) +/* 8B0AE4 80240A74 03E00008 */ jr $ra +/* 8B0AE8 80240A78 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C.s deleted file mode 100644 index 2489471b61..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A7C -/* 8B0AEC 80240A7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0AF0 80240A80 AFB00010 */ sw $s0, 0x10($sp) -/* 8B0AF4 80240A84 3C108011 */ lui $s0, %hi(gPlayerData) -/* 8B0AF8 80240A88 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 8B0AFC 80240A8C AFBF0018 */ sw $ra, 0x18($sp) -/* 8B0B00 80240A90 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0B04 80240A94 960302C0 */ lhu $v1, 0x2c0($s0) -/* 8B0B08 80240A98 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 8B0B0C 80240A9C 10400003 */ beqz $v0, .L80240AAC -/* 8B0B10 80240AA0 0080882D */ daddu $s1, $a0, $zero -/* 8B0B14 80240AA4 24620001 */ addiu $v0, $v1, 1 -/* 8B0B18 80240AA8 A60202C0 */ sh $v0, 0x2c0($s0) -.L80240AAC: -/* 8B0B1C 80240AAC 3C05F5DE */ lui $a1, 0xf5de -/* 8B0B20 80240AB0 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 8B0B24 80240AB4 0C0B1EAF */ jal get_variable -/* 8B0B28 80240AB8 0000202D */ daddu $a0, $zero, $zero -/* 8B0B2C 80240ABC 3C038024 */ lui $v1, 0x8024 -/* 8B0B30 80240AC0 00621821 */ addu $v1, $v1, $v0 -/* 8B0B34 80240AC4 90635634 */ lbu $v1, 0x5634($v1) -/* 8B0B38 80240AC8 8E220084 */ lw $v0, 0x84($s1) -/* 8B0B3C 80240ACC 54430006 */ bnel $v0, $v1, .L80240AE8 -/* 8B0B40 80240AD0 AE200084 */ sw $zero, 0x84($s1) -/* 8B0B44 80240AD4 24020001 */ addiu $v0, $zero, 1 -/* 8B0B48 80240AD8 AE220084 */ sw $v0, 0x84($s1) -/* 8B0B4C 80240ADC 960202C2 */ lhu $v0, 0x2c2($s0) -/* 8B0B50 80240AE0 24420001 */ addiu $v0, $v0, 1 -/* 8B0B54 80240AE4 A60202C2 */ sh $v0, 0x2c2($s0) -.L80240AE8: -/* 8B0B58 80240AE8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B0B5C 80240AEC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0B60 80240AF0 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0B64 80240AF4 24020002 */ addiu $v0, $zero, 2 -/* 8B0B68 80240AF8 03E00008 */ jr $ra -/* 8B0B6C 80240AFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C_8B0AEC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C_8B0AEC.s new file mode 100644 index 0000000000..59b8405a16 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240A7C_8B0AEC.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A7C_8B0AEC +/* 8B0AEC 80240A7C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B0AF0 80240A80 AFB00010 */ sw $s0, 0x10($sp) +/* 8B0AF4 80240A84 3C108011 */ lui $s0, %hi(gPlayerData) +/* 8B0AF8 80240A88 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 8B0AFC 80240A8C AFBF0018 */ sw $ra, 0x18($sp) +/* 8B0B00 80240A90 AFB10014 */ sw $s1, 0x14($sp) +/* 8B0B04 80240A94 960302C0 */ lhu $v1, 0x2c0($s0) +/* 8B0B08 80240A98 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 8B0B0C 80240A9C 10400003 */ beqz $v0, .L80240AAC +/* 8B0B10 80240AA0 0080882D */ daddu $s1, $a0, $zero +/* 8B0B14 80240AA4 24620001 */ addiu $v0, $v1, 1 +/* 8B0B18 80240AA8 A60202C0 */ sh $v0, 0x2c0($s0) +.L80240AAC: +/* 8B0B1C 80240AAC 3C05F5DE */ lui $a1, 0xf5de +/* 8B0B20 80240AB0 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 8B0B24 80240AB4 0C0B1EAF */ jal get_variable +/* 8B0B28 80240AB8 0000202D */ daddu $a0, $zero, $zero +/* 8B0B2C 80240ABC 3C038024 */ lui $v1, 0x8024 +/* 8B0B30 80240AC0 00621821 */ addu $v1, $v1, $v0 +/* 8B0B34 80240AC4 90635634 */ lbu $v1, 0x5634($v1) +/* 8B0B38 80240AC8 8E220084 */ lw $v0, 0x84($s1) +/* 8B0B3C 80240ACC 54430006 */ bnel $v0, $v1, .L80240AE8 +/* 8B0B40 80240AD0 AE200084 */ sw $zero, 0x84($s1) +/* 8B0B44 80240AD4 24020001 */ addiu $v0, $zero, 1 +/* 8B0B48 80240AD8 AE220084 */ sw $v0, 0x84($s1) +/* 8B0B4C 80240ADC 960202C2 */ lhu $v0, 0x2c2($s0) +/* 8B0B50 80240AE0 24420001 */ addiu $v0, $v0, 1 +/* 8B0B54 80240AE4 A60202C2 */ sh $v0, 0x2c2($s0) +.L80240AE8: +/* 8B0B58 80240AE8 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B0B5C 80240AEC 8FB10014 */ lw $s1, 0x14($sp) +/* 8B0B60 80240AF0 8FB00010 */ lw $s0, 0x10($sp) +/* 8B0B64 80240AF4 24020002 */ addiu $v0, $zero, 2 +/* 8B0B68 80240AF8 03E00008 */ jr $ra +/* 8B0B6C 80240AFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18.s deleted file mode 100644 index 6244cdfbe8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D18 -/* 8B0D88 80240D18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B0D8C 80240D1C 10A0000B */ beqz $a1, .L80240D4C -/* 8B0D90 80240D20 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B0D94 80240D24 3C038025 */ lui $v1, 0x8025 -/* 8B0D98 80240D28 8C637F4C */ lw $v1, 0x7f4c($v1) -/* 8B0D9C 80240D2C 8C620000 */ lw $v0, ($v1) -/* 8B0DA0 80240D30 3C048025 */ lui $a0, 0x8025 -/* 8B0DA4 80240D34 8C847F50 */ lw $a0, 0x7f50($a0) -/* 8B0DA8 80240D38 34420010 */ ori $v0, $v0, 0x10 -/* 8B0DAC 80240D3C AC620000 */ sw $v0, ($v1) -/* 8B0DB0 80240D40 8C820000 */ lw $v0, ($a0) -/* 8B0DB4 80240D44 34420010 */ ori $v0, $v0, 0x10 -/* 8B0DB8 80240D48 AC820000 */ sw $v0, ($a0) -.L80240D4C: -/* 8B0DBC 80240D4C 3C048025 */ lui $a0, 0x8025 -/* 8B0DC0 80240D50 8C847F48 */ lw $a0, 0x7f48($a0) -/* 8B0DC4 80240D54 8C85000C */ lw $a1, 0xc($a0) -/* 8B0DC8 80240D58 8CA20018 */ lw $v0, 0x18($a1) -/* 8B0DCC 80240D5C 8CA30020 */ lw $v1, 0x20($a1) -/* 8B0DD0 80240D60 2442FFF6 */ addiu $v0, $v0, -0xa -/* 8B0DD4 80240D64 ACA20018 */ sw $v0, 0x18($a1) -/* 8B0DD8 80240D68 8CA20024 */ lw $v0, 0x24($a1) -/* 8B0DDC 80240D6C 2463FFF6 */ addiu $v1, $v1, -0xa -/* 8B0DE0 80240D70 ACA30020 */ sw $v1, 0x20($a1) -/* 8B0DE4 80240D74 8CA30028 */ lw $v1, 0x28($a1) -/* 8B0DE8 80240D78 2442FFF6 */ addiu $v0, $v0, -0xa -/* 8B0DEC 80240D7C ACA20024 */ sw $v0, 0x24($a1) -/* 8B0DF0 80240D80 8CA2001C */ lw $v0, 0x1c($a1) -/* 8B0DF4 80240D84 2463FFF6 */ addiu $v1, $v1, -0xa -/* 8B0DF8 80240D88 ACA30028 */ sw $v1, 0x28($a1) -/* 8B0DFC 80240D8C 8CA30018 */ lw $v1, 0x18($a1) -/* 8B0E00 80240D90 2442FFF6 */ addiu $v0, $v0, -0xa -/* 8B0E04 80240D94 18600003 */ blez $v1, .L80240DA4 -/* 8B0E08 80240D98 ACA2001C */ sw $v0, 0x1c($a1) -/* 8B0E0C 80240D9C 08090370 */ j .L80240DC0 -/* 8B0E10 80240DA0 0000102D */ daddu $v0, $zero, $zero -.L80240DA4: -/* 8B0E14 80240DA4 0C016914 */ jal remove_effect -/* 8B0E18 80240DA8 ACA00018 */ sw $zero, 0x18($a1) -/* 8B0E1C 80240DAC 3C048025 */ lui $a0, 0x8025 -/* 8B0E20 80240DB0 8C847F2C */ lw $a0, 0x7f2c($a0) -/* 8B0E24 80240DB4 0C048D70 */ jal func_801235C0 -/* 8B0E28 80240DB8 00000000 */ nop -/* 8B0E2C 80240DBC 24020002 */ addiu $v0, $zero, 2 -.L80240DC0: -/* 8B0E30 80240DC0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B0E34 80240DC4 03E00008 */ jr $ra -/* 8B0E38 80240DC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s new file mode 100644 index 0000000000..1184de1d8f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240D18_8B0D88.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D18_8B0D88 +/* 8B0D88 80240D18 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B0D8C 80240D1C 10A0000B */ beqz $a1, .L80240D4C +/* 8B0D90 80240D20 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B0D94 80240D24 3C038025 */ lui $v1, 0x8025 +/* 8B0D98 80240D28 8C637F4C */ lw $v1, 0x7f4c($v1) +/* 8B0D9C 80240D2C 8C620000 */ lw $v0, ($v1) +/* 8B0DA0 80240D30 3C048025 */ lui $a0, 0x8025 +/* 8B0DA4 80240D34 8C847F50 */ lw $a0, 0x7f50($a0) +/* 8B0DA8 80240D38 34420010 */ ori $v0, $v0, 0x10 +/* 8B0DAC 80240D3C AC620000 */ sw $v0, ($v1) +/* 8B0DB0 80240D40 8C820000 */ lw $v0, ($a0) +/* 8B0DB4 80240D44 34420010 */ ori $v0, $v0, 0x10 +/* 8B0DB8 80240D48 AC820000 */ sw $v0, ($a0) +.L80240D4C: +/* 8B0DBC 80240D4C 3C048025 */ lui $a0, 0x8025 +/* 8B0DC0 80240D50 8C847F48 */ lw $a0, 0x7f48($a0) +/* 8B0DC4 80240D54 8C85000C */ lw $a1, 0xc($a0) +/* 8B0DC8 80240D58 8CA20018 */ lw $v0, 0x18($a1) +/* 8B0DCC 80240D5C 8CA30020 */ lw $v1, 0x20($a1) +/* 8B0DD0 80240D60 2442FFF6 */ addiu $v0, $v0, -0xa +/* 8B0DD4 80240D64 ACA20018 */ sw $v0, 0x18($a1) +/* 8B0DD8 80240D68 8CA20024 */ lw $v0, 0x24($a1) +/* 8B0DDC 80240D6C 2463FFF6 */ addiu $v1, $v1, -0xa +/* 8B0DE0 80240D70 ACA30020 */ sw $v1, 0x20($a1) +/* 8B0DE4 80240D74 8CA30028 */ lw $v1, 0x28($a1) +/* 8B0DE8 80240D78 2442FFF6 */ addiu $v0, $v0, -0xa +/* 8B0DEC 80240D7C ACA20024 */ sw $v0, 0x24($a1) +/* 8B0DF0 80240D80 8CA2001C */ lw $v0, 0x1c($a1) +/* 8B0DF4 80240D84 2463FFF6 */ addiu $v1, $v1, -0xa +/* 8B0DF8 80240D88 ACA30028 */ sw $v1, 0x28($a1) +/* 8B0DFC 80240D8C 8CA30018 */ lw $v1, 0x18($a1) +/* 8B0E00 80240D90 2442FFF6 */ addiu $v0, $v0, -0xa +/* 8B0E04 80240D94 18600003 */ blez $v1, .L80240DA4 +/* 8B0E08 80240D98 ACA2001C */ sw $v0, 0x1c($a1) +/* 8B0E0C 80240D9C 08090370 */ j .L80240DC0 +/* 8B0E10 80240DA0 0000102D */ daddu $v0, $zero, $zero +.L80240DA4: +/* 8B0E14 80240DA4 0C016914 */ jal remove_effect +/* 8B0E18 80240DA8 ACA00018 */ sw $zero, 0x18($a1) +/* 8B0E1C 80240DAC 3C048025 */ lui $a0, 0x8025 +/* 8B0E20 80240DB0 8C847F2C */ lw $a0, 0x7f2c($a0) +/* 8B0E24 80240DB4 0C048D70 */ jal func_801235C0 +/* 8B0E28 80240DB8 00000000 */ nop +/* 8B0E2C 80240DBC 24020002 */ addiu $v0, $zero, 2 +.L80240DC0: +/* 8B0E30 80240DC0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B0E34 80240DC4 03E00008 */ jr $ra +/* 8B0E38 80240DC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC.s deleted file mode 100644 index 39795c3c79..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DCC -/* 8B0E3C 80240DCC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B0E40 80240DD0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B0E44 80240DD4 8C82000C */ lw $v0, 0xc($a0) -/* 8B0E48 80240DD8 0C0B1EAF */ jal get_variable -/* 8B0E4C 80240DDC 8C450000 */ lw $a1, ($v0) -/* 8B0E50 80240DE0 3C038025 */ lui $v1, 0x8025 -/* 8B0E54 80240DE4 8C637F48 */ lw $v1, 0x7f48($v1) -/* 8B0E58 80240DE8 8C63000C */ lw $v1, 0xc($v1) -/* 8B0E5C 80240DEC AC620034 */ sw $v0, 0x34($v1) -/* 8B0E60 80240DF0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B0E64 80240DF4 24020002 */ addiu $v0, $zero, 2 -/* 8B0E68 80240DF8 03E00008 */ jr $ra -/* 8B0E6C 80240DFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC_8B0E3C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC_8B0E3C.s new file mode 100644 index 0000000000..1874a7eb3e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240DCC_8B0E3C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DCC_8B0E3C +/* 8B0E3C 80240DCC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B0E40 80240DD0 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B0E44 80240DD4 8C82000C */ lw $v0, 0xc($a0) +/* 8B0E48 80240DD8 0C0B1EAF */ jal get_variable +/* 8B0E4C 80240DDC 8C450000 */ lw $a1, ($v0) +/* 8B0E50 80240DE0 3C038025 */ lui $v1, 0x8025 +/* 8B0E54 80240DE4 8C637F48 */ lw $v1, 0x7f48($v1) +/* 8B0E58 80240DE8 8C63000C */ lw $v1, 0xc($v1) +/* 8B0E5C 80240DEC AC620034 */ sw $v0, 0x34($v1) +/* 8B0E60 80240DF0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B0E64 80240DF4 24020002 */ addiu $v0, $zero, 2 +/* 8B0E68 80240DF8 03E00008 */ jr $ra +/* 8B0E6C 80240DFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00.s deleted file mode 100644 index 40763f98a3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E00 -/* 8B0E70 80240E00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B0E74 80240E04 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B0E78 80240E08 8C82000C */ lw $v0, 0xc($a0) -/* 8B0E7C 80240E0C 0C0B1EAF */ jal get_variable -/* 8B0E80 80240E10 8C450000 */ lw $a1, ($v0) -/* 8B0E84 80240E14 0040202D */ daddu $a0, $v0, $zero -/* 8B0E88 80240E18 3C028025 */ lui $v0, 0x8025 -/* 8B0E8C 80240E1C 8C427F48 */ lw $v0, 0x7f48($v0) -/* 8B0E90 80240E20 24030001 */ addiu $v1, $zero, 1 -/* 8B0E94 80240E24 8C45000C */ lw $a1, 0xc($v0) -/* 8B0E98 80240E28 1083000D */ beq $a0, $v1, .L80240E60 -/* 8B0E9C 80240E2C 28820002 */ slti $v0, $a0, 2 -/* 8B0EA0 80240E30 10400005 */ beqz $v0, .L80240E48 -/* 8B0EA4 80240E34 24020002 */ addiu $v0, $zero, 2 -/* 8B0EA8 80240E38 10800007 */ beqz $a0, .L80240E58 -/* 8B0EAC 80240E3C 240200C0 */ addiu $v0, $zero, 0xc0 -/* 8B0EB0 80240E40 0809039C */ j .L80240E70 -/* 8B0EB4 80240E44 ACA00038 */ sw $zero, 0x38($a1) -.L80240E48: -/* 8B0EB8 80240E48 10820008 */ beq $a0, $v0, .L80240E6C -/* 8B0EBC 80240E4C 24020040 */ addiu $v0, $zero, 0x40 -/* 8B0EC0 80240E50 0809039C */ j .L80240E70 -/* 8B0EC4 80240E54 ACA00038 */ sw $zero, 0x38($a1) -.L80240E58: -/* 8B0EC8 80240E58 0809039C */ j .L80240E70 -/* 8B0ECC 80240E5C ACA20038 */ sw $v0, 0x38($a1) -.L80240E60: -/* 8B0ED0 80240E60 24020080 */ addiu $v0, $zero, 0x80 -/* 8B0ED4 80240E64 0809039C */ j .L80240E70 -/* 8B0ED8 80240E68 ACA20038 */ sw $v0, 0x38($a1) -.L80240E6C: -/* 8B0EDC 80240E6C ACA20038 */ sw $v0, 0x38($a1) -.L80240E70: -/* 8B0EE0 80240E70 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B0EE4 80240E74 24020002 */ addiu $v0, $zero, 2 -/* 8B0EE8 80240E78 03E00008 */ jr $ra -/* 8B0EEC 80240E7C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00_8B0E70.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00_8B0E70.s new file mode 100644 index 0000000000..a2587b98ec --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E00_8B0E70.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E00_8B0E70 +/* 8B0E70 80240E00 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B0E74 80240E04 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B0E78 80240E08 8C82000C */ lw $v0, 0xc($a0) +/* 8B0E7C 80240E0C 0C0B1EAF */ jal get_variable +/* 8B0E80 80240E10 8C450000 */ lw $a1, ($v0) +/* 8B0E84 80240E14 0040202D */ daddu $a0, $v0, $zero +/* 8B0E88 80240E18 3C028025 */ lui $v0, 0x8025 +/* 8B0E8C 80240E1C 8C427F48 */ lw $v0, 0x7f48($v0) +/* 8B0E90 80240E20 24030001 */ addiu $v1, $zero, 1 +/* 8B0E94 80240E24 8C45000C */ lw $a1, 0xc($v0) +/* 8B0E98 80240E28 1083000D */ beq $a0, $v1, .L80240E60 +/* 8B0E9C 80240E2C 28820002 */ slti $v0, $a0, 2 +/* 8B0EA0 80240E30 10400005 */ beqz $v0, .L80240E48 +/* 8B0EA4 80240E34 24020002 */ addiu $v0, $zero, 2 +/* 8B0EA8 80240E38 10800007 */ beqz $a0, .L80240E58 +/* 8B0EAC 80240E3C 240200C0 */ addiu $v0, $zero, 0xc0 +/* 8B0EB0 80240E40 0809039C */ j .L80240E70 +/* 8B0EB4 80240E44 ACA00038 */ sw $zero, 0x38($a1) +.L80240E48: +/* 8B0EB8 80240E48 10820008 */ beq $a0, $v0, .L80240E6C +/* 8B0EBC 80240E4C 24020040 */ addiu $v0, $zero, 0x40 +/* 8B0EC0 80240E50 0809039C */ j .L80240E70 +/* 8B0EC4 80240E54 ACA00038 */ sw $zero, 0x38($a1) +.L80240E58: +/* 8B0EC8 80240E58 0809039C */ j .L80240E70 +/* 8B0ECC 80240E5C ACA20038 */ sw $v0, 0x38($a1) +.L80240E60: +/* 8B0ED0 80240E60 24020080 */ addiu $v0, $zero, 0x80 +/* 8B0ED4 80240E64 0809039C */ j .L80240E70 +/* 8B0ED8 80240E68 ACA20038 */ sw $v0, 0x38($a1) +.L80240E6C: +/* 8B0EDC 80240E6C ACA20038 */ sw $v0, 0x38($a1) +.L80240E70: +/* 8B0EE0 80240E70 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B0EE4 80240E74 24020002 */ addiu $v0, $zero, 2 +/* 8B0EE8 80240E78 03E00008 */ jr $ra +/* 8B0EEC 80240E7C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98.s deleted file mode 100644 index 41089c8cd0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E98 -/* 8B0F08 80240E98 3C028025 */ lui $v0, 0x8025 -/* 8B0F0C 80240E9C 8C427F50 */ lw $v0, 0x7f50($v0) -/* 8B0F10 80240EA0 8C43000C */ lw $v1, 0xc($v0) -/* 8B0F14 80240EA4 24020001 */ addiu $v0, $zero, 1 -/* 8B0F18 80240EA8 AC62001C */ sw $v0, 0x1c($v1) -/* 8B0F1C 80240EAC 03E00008 */ jr $ra -/* 8B0F20 80240EB0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98_8B0F08.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98_8B0F08.s new file mode 100644 index 0000000000..7fcc029f45 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240E98_8B0F08.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E98_8B0F08 +/* 8B0F08 80240E98 3C028025 */ lui $v0, 0x8025 +/* 8B0F0C 80240E9C 8C427F50 */ lw $v0, 0x7f50($v0) +/* 8B0F10 80240EA0 8C43000C */ lw $v1, 0xc($v0) +/* 8B0F14 80240EA4 24020001 */ addiu $v0, $zero, 1 +/* 8B0F18 80240EA8 AC62001C */ sw $v0, 0x1c($v1) +/* 8B0F1C 80240EAC 03E00008 */ jr $ra +/* 8B0F20 80240EB0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4.s deleted file mode 100644 index cff32a5022..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB4 -/* 8B0F24 80240EB4 3C028025 */ lui $v0, 0x8025 -/* 8B0F28 80240EB8 8C427F50 */ lw $v0, 0x7f50($v0) -/* 8B0F2C 80240EBC 8C43000C */ lw $v1, 0xc($v0) -/* 8B0F30 80240EC0 24020002 */ addiu $v0, $zero, 2 -/* 8B0F34 80240EC4 03E00008 */ jr $ra -/* 8B0F38 80240EC8 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4_8B0F24.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4_8B0F24.s new file mode 100644 index 0000000000..8838e4e415 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EB4_8B0F24.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EB4_8B0F24 +/* 8B0F24 80240EB4 3C028025 */ lui $v0, 0x8025 +/* 8B0F28 80240EB8 8C427F50 */ lw $v0, 0x7f50($v0) +/* 8B0F2C 80240EBC 8C43000C */ lw $v1, 0xc($v0) +/* 8B0F30 80240EC0 24020002 */ addiu $v0, $zero, 2 +/* 8B0F34 80240EC4 03E00008 */ jr $ra +/* 8B0F38 80240EC8 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC.s deleted file mode 100644 index 9d0fea68a8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ECC -/* 8B0F3C 80240ECC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B0F40 80240ED0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8B0F44 80240ED4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8B0F48 80240ED8 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0F4C 80240EDC AFBF0010 */ sw $ra, 0x10($sp) -/* 8B0F50 80240EE0 80460075 */ lb $a2, 0x75($v0) -/* 8B0F54 80240EE4 0C0B2026 */ jal set_variable -/* 8B0F58 80240EE8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8B0F5C 80240EEC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B0F60 80240EF0 24020002 */ addiu $v0, $zero, 2 -/* 8B0F64 80240EF4 03E00008 */ jr $ra -/* 8B0F68 80240EF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s new file mode 100644 index 0000000000..c12dac7408 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240ECC_8B0F3C +/* 8B0F3C 80240ECC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B0F40 80240ED0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 8B0F44 80240ED4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 8B0F48 80240ED8 3C05FE36 */ lui $a1, 0xfe36 +/* 8B0F4C 80240EDC AFBF0010 */ sw $ra, 0x10($sp) +/* 8B0F50 80240EE0 80460075 */ lb $a2, 0x75($v0) +/* 8B0F54 80240EE4 0C0B2026 */ jal set_variable +/* 8B0F58 80240EE8 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8B0F5C 80240EEC 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B0F60 80240EF0 24020002 */ addiu $v0, $zero, 2 +/* 8B0F64 80240EF4 03E00008 */ jr $ra +/* 8B0F68 80240EF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70.s deleted file mode 100644 index 0567eb15b5..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F70 -/* 8B0FE0 80240F70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0FE4 80240F74 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0FE8 80240F78 0080882D */ daddu $s1, $a0, $zero -/* 8B0FEC 80240F7C AFBF0018 */ sw $ra, 0x18($sp) -/* 8B0FF0 80240F80 AFB00010 */ sw $s0, 0x10($sp) -/* 8B0FF4 80240F84 8E30000C */ lw $s0, 0xc($s1) -/* 8B0FF8 80240F88 8E050000 */ lw $a1, ($s0) -/* 8B0FFC 80240F8C 0C0B1EAF */ jal get_variable -/* 8B1000 80240F90 26100004 */ addiu $s0, $s0, 4 -/* 8B1004 80240F94 00021880 */ sll $v1, $v0, 2 -/* 8B1008 80240F98 00621821 */ addu $v1, $v1, $v0 -/* 8B100C 80240F9C 00031880 */ sll $v1, $v1, 2 -/* 8B1010 80240FA0 00621823 */ subu $v1, $v1, $v0 -/* 8B1014 80240FA4 000310C0 */ sll $v0, $v1, 3 -/* 8B1018 80240FA8 00621821 */ addu $v1, $v1, $v0 -/* 8B101C 80240FAC 000318C0 */ sll $v1, $v1, 3 -/* 8B1020 80240FB0 3C01800B */ lui $at, 0x800b -/* 8B1024 80240FB4 00230821 */ addu $at, $at, $v1 -/* 8B1028 80240FB8 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8B102C 80240FBC 3C014480 */ lui $at, 0x4480 -/* 8B1030 80240FC0 44810000 */ mtc1 $at, $f0 -/* 8B1034 80240FC4 00000000 */ nop -/* 8B1038 80240FC8 46001082 */ mul.s $f2, $f2, $f0 -/* 8B103C 80240FCC 00000000 */ nop -/* 8B1040 80240FD0 3C01CD5B */ lui $at, 0xcd5b -/* 8B1044 80240FD4 34215858 */ ori $at, $at, 0x5858 -/* 8B1048 80240FD8 44810000 */ mtc1 $at, $f0 -/* 8B104C 80240FDC 00000000 */ nop -/* 8B1050 80240FE0 46001080 */ add.s $f2, $f2, $f0 -/* 8B1054 80240FE4 8E050000 */ lw $a1, ($s0) -/* 8B1058 80240FE8 4600110D */ trunc.w.s $f4, $f2 -/* 8B105C 80240FEC 44062000 */ mfc1 $a2, $f4 -/* 8B1060 80240FF0 0C0B2026 */ jal set_variable -/* 8B1064 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* 8B1068 80240FF8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B106C 80240FFC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B1070 80241000 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1074 80241004 24020002 */ addiu $v0, $zero, 2 -/* 8B1078 80241008 03E00008 */ jr $ra -/* 8B107C 8024100C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s new file mode 100644 index 0000000000..c991f90716 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F70_8B0FE0 +/* 8B0FE0 80240F70 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B0FE4 80240F74 AFB10014 */ sw $s1, 0x14($sp) +/* 8B0FE8 80240F78 0080882D */ daddu $s1, $a0, $zero +/* 8B0FEC 80240F7C AFBF0018 */ sw $ra, 0x18($sp) +/* 8B0FF0 80240F80 AFB00010 */ sw $s0, 0x10($sp) +/* 8B0FF4 80240F84 8E30000C */ lw $s0, 0xc($s1) +/* 8B0FF8 80240F88 8E050000 */ lw $a1, ($s0) +/* 8B0FFC 80240F8C 0C0B1EAF */ jal get_variable +/* 8B1000 80240F90 26100004 */ addiu $s0, $s0, 4 +/* 8B1004 80240F94 00021880 */ sll $v1, $v0, 2 +/* 8B1008 80240F98 00621821 */ addu $v1, $v1, $v0 +/* 8B100C 80240F9C 00031880 */ sll $v1, $v1, 2 +/* 8B1010 80240FA0 00621823 */ subu $v1, $v1, $v0 +/* 8B1014 80240FA4 000310C0 */ sll $v0, $v1, 3 +/* 8B1018 80240FA8 00621821 */ addu $v1, $v1, $v0 +/* 8B101C 80240FAC 000318C0 */ sll $v1, $v1, 3 +/* 8B1020 80240FB0 3C01800B */ lui $at, 0x800b +/* 8B1024 80240FB4 00230821 */ addu $at, $at, $v1 +/* 8B1028 80240FB8 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 8B102C 80240FBC 3C014480 */ lui $at, 0x4480 +/* 8B1030 80240FC0 44810000 */ mtc1 $at, $f0 +/* 8B1034 80240FC4 00000000 */ nop +/* 8B1038 80240FC8 46001082 */ mul.s $f2, $f2, $f0 +/* 8B103C 80240FCC 00000000 */ nop +/* 8B1040 80240FD0 3C01CD5B */ lui $at, 0xcd5b +/* 8B1044 80240FD4 34215858 */ ori $at, $at, 0x5858 +/* 8B1048 80240FD8 44810000 */ mtc1 $at, $f0 +/* 8B104C 80240FDC 00000000 */ nop +/* 8B1050 80240FE0 46001080 */ add.s $f2, $f2, $f0 +/* 8B1054 80240FE4 8E050000 */ lw $a1, ($s0) +/* 8B1058 80240FE8 4600110D */ trunc.w.s $f4, $f2 +/* 8B105C 80240FEC 44062000 */ mfc1 $a2, $f4 +/* 8B1060 80240FF0 0C0B2026 */ jal set_variable +/* 8B1064 80240FF4 0220202D */ daddu $a0, $s1, $zero +/* 8B1068 80240FF8 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B106C 80240FFC 8FB10014 */ lw $s1, 0x14($sp) +/* 8B1070 80241000 8FB00010 */ lw $s0, 0x10($sp) +/* 8B1074 80241004 24020002 */ addiu $v0, $zero, 2 +/* 8B1078 80241008 03E00008 */ jr $ra +/* 8B107C 8024100C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010.s deleted file mode 100644 index 22487522dd..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241010 -/* 8B1080 80241010 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B1084 80241014 AFB20018 */ sw $s2, 0x18($sp) -/* 8B1088 80241018 0080902D */ daddu $s2, $a0, $zero -/* 8B108C 8024101C AFBF0030 */ sw $ra, 0x30($sp) -/* 8B1090 80241020 AFB7002C */ sw $s7, 0x2c($sp) -/* 8B1094 80241024 AFB60028 */ sw $s6, 0x28($sp) -/* 8B1098 80241028 AFB50024 */ sw $s5, 0x24($sp) -/* 8B109C 8024102C AFB40020 */ sw $s4, 0x20($sp) -/* 8B10A0 80241030 AFB3001C */ sw $s3, 0x1c($sp) -/* 8B10A4 80241034 AFB10014 */ sw $s1, 0x14($sp) -/* 8B10A8 80241038 AFB00010 */ sw $s0, 0x10($sp) -/* 8B10AC 8024103C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8B10B0 80241040 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8B10B4 80241044 8E50000C */ lw $s0, 0xc($s2) -/* 8B10B8 80241048 8E050000 */ lw $a1, ($s0) -/* 8B10BC 8024104C 0C0B1EAF */ jal get_variable -/* 8B10C0 80241050 26100004 */ addiu $s0, $s0, 4 -/* 8B10C4 80241054 8E050000 */ lw $a1, ($s0) -/* 8B10C8 80241058 26100004 */ addiu $s0, $s0, 4 -/* 8B10CC 8024105C 0240202D */ daddu $a0, $s2, $zero -/* 8B10D0 80241060 0C0B1EAF */ jal get_variable -/* 8B10D4 80241064 0040B82D */ daddu $s7, $v0, $zero -/* 8B10D8 80241068 8E050000 */ lw $a1, ($s0) -/* 8B10DC 8024106C 26100004 */ addiu $s0, $s0, 4 -/* 8B10E0 80241070 0240202D */ daddu $a0, $s2, $zero -/* 8B10E4 80241074 0C0B1EAF */ jal get_variable -/* 8B10E8 80241078 0040B02D */ daddu $s6, $v0, $zero -/* 8B10EC 8024107C 0240202D */ daddu $a0, $s2, $zero -/* 8B10F0 80241080 3C05F4AC */ lui $a1, 0xf4ac -/* 8B10F4 80241084 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8B10F8 80241088 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 8B10FC 8024108C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 8B1100 80241090 8E140000 */ lw $s4, ($s0) -/* 8B1104 80241094 00061880 */ sll $v1, $a2, 2 -/* 8B1108 80241098 00661821 */ addu $v1, $v1, $a2 -/* 8B110C 8024109C 00031880 */ sll $v1, $v1, 2 -/* 8B1110 802410A0 00661823 */ subu $v1, $v1, $a2 -/* 8B1114 802410A4 000330C0 */ sll $a2, $v1, 3 -/* 8B1118 802410A8 00661821 */ addu $v1, $v1, $a2 -/* 8B111C 802410AC 000318C0 */ sll $v1, $v1, 3 -/* 8B1120 802410B0 3C01800B */ lui $at, 0x800b -/* 8B1124 802410B4 00230821 */ addu $at, $at, $v1 -/* 8B1128 802410B8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8B112C 802410BC 8E150004 */ lw $s5, 4($s0) -/* 8B1130 802410C0 4600010D */ trunc.w.s $f4, $f0 -/* 8B1134 802410C4 44112000 */ mfc1 $s1, $f4 -/* 8B1138 802410C8 0C0B1EAF */ jal get_variable -/* 8B113C 802410CC 0040982D */ daddu $s3, $v0, $zero -/* 8B1140 802410D0 4491B000 */ mtc1 $s1, $f22 -/* 8B1144 802410D4 00000000 */ nop -/* 8B1148 802410D8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8B114C 802410DC 4600B306 */ mov.s $f12, $f22 -/* 8B1150 802410E0 0C00A8D4 */ jal cos_deg -/* 8B1154 802410E4 0040802D */ daddu $s0, $v0, $zero -/* 8B1158 802410E8 4493A000 */ mtc1 $s3, $f20 -/* 8B115C 802410EC 00000000 */ nop -/* 8B1160 802410F0 4680A520 */ cvt.s.w $f20, $f20 -/* 8B1164 802410F4 4600A002 */ mul.s $f0, $f20, $f0 -/* 8B1168 802410F8 00000000 */ nop -/* 8B116C 802410FC 0240202D */ daddu $a0, $s2, $zero -/* 8B1170 80241100 44901000 */ mtc1 $s0, $f2 -/* 8B1174 80241104 00000000 */ nop -/* 8B1178 80241108 468010A0 */ cvt.s.w $f2, $f2 -/* 8B117C 8024110C 46001081 */ sub.s $f2, $f2, $f0 -/* 8B1180 80241110 3C05F4AC */ lui $a1, 0xf4ac -/* 8B1184 80241114 4600110D */ trunc.w.s $f4, $f2 -/* 8B1188 80241118 44102000 */ mfc1 $s0, $f4 -/* 8B118C 8024111C 0C0B1EAF */ jal get_variable -/* 8B1190 80241120 34A5D483 */ ori $a1, $a1, 0xd483 -/* 8B1194 80241124 4600B306 */ mov.s $f12, $f22 -/* 8B1198 80241128 0C00A8BB */ jal sin_deg -/* 8B119C 8024112C 0040882D */ daddu $s1, $v0, $zero -/* 8B11A0 80241130 4600A502 */ mul.s $f20, $f20, $f0 -/* 8B11A4 80241134 00000000 */ nop -/* 8B11A8 80241138 0240202D */ daddu $a0, $s2, $zero -/* 8B11AC 8024113C 44910000 */ mtc1 $s1, $f0 -/* 8B11B0 80241140 00000000 */ nop -/* 8B11B4 80241144 46800020 */ cvt.s.w $f0, $f0 -/* 8B11B8 80241148 46140001 */ sub.s $f0, $f0, $f20 -/* 8B11BC 8024114C 0280282D */ daddu $a1, $s4, $zero -/* 8B11C0 80241150 02173023 */ subu $a2, $s0, $s7 -/* 8B11C4 80241154 4600010D */ trunc.w.s $f4, $f0 -/* 8B11C8 80241158 44102000 */ mfc1 $s0, $f4 -/* 8B11CC 8024115C 0C0B2026 */ jal set_variable -/* 8B11D0 80241160 02168023 */ subu $s0, $s0, $s6 -/* 8B11D4 80241164 0240202D */ daddu $a0, $s2, $zero -/* 8B11D8 80241168 02A0282D */ daddu $a1, $s5, $zero -/* 8B11DC 8024116C 0C0B2026 */ jal set_variable -/* 8B11E0 80241170 0200302D */ daddu $a2, $s0, $zero -/* 8B11E4 80241174 8FBF0030 */ lw $ra, 0x30($sp) -/* 8B11E8 80241178 8FB7002C */ lw $s7, 0x2c($sp) -/* 8B11EC 8024117C 8FB60028 */ lw $s6, 0x28($sp) -/* 8B11F0 80241180 8FB50024 */ lw $s5, 0x24($sp) -/* 8B11F4 80241184 8FB40020 */ lw $s4, 0x20($sp) -/* 8B11F8 80241188 8FB3001C */ lw $s3, 0x1c($sp) -/* 8B11FC 8024118C 8FB20018 */ lw $s2, 0x18($sp) -/* 8B1200 80241190 8FB10014 */ lw $s1, 0x14($sp) -/* 8B1204 80241194 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1208 80241198 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 8B120C 8024119C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8B1210 802411A0 24020002 */ addiu $v0, $zero, 2 -/* 8B1214 802411A4 03E00008 */ jr $ra -/* 8B1218 802411A8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s new file mode 100644 index 0000000000..92e2eb8a40 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241010_8B1080 +/* 8B1080 80241010 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8B1084 80241014 AFB20018 */ sw $s2, 0x18($sp) +/* 8B1088 80241018 0080902D */ daddu $s2, $a0, $zero +/* 8B108C 8024101C AFBF0030 */ sw $ra, 0x30($sp) +/* 8B1090 80241020 AFB7002C */ sw $s7, 0x2c($sp) +/* 8B1094 80241024 AFB60028 */ sw $s6, 0x28($sp) +/* 8B1098 80241028 AFB50024 */ sw $s5, 0x24($sp) +/* 8B109C 8024102C AFB40020 */ sw $s4, 0x20($sp) +/* 8B10A0 80241030 AFB3001C */ sw $s3, 0x1c($sp) +/* 8B10A4 80241034 AFB10014 */ sw $s1, 0x14($sp) +/* 8B10A8 80241038 AFB00010 */ sw $s0, 0x10($sp) +/* 8B10AC 8024103C F7B60040 */ sdc1 $f22, 0x40($sp) +/* 8B10B0 80241040 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 8B10B4 80241044 8E50000C */ lw $s0, 0xc($s2) +/* 8B10B8 80241048 8E050000 */ lw $a1, ($s0) +/* 8B10BC 8024104C 0C0B1EAF */ jal get_variable +/* 8B10C0 80241050 26100004 */ addiu $s0, $s0, 4 +/* 8B10C4 80241054 8E050000 */ lw $a1, ($s0) +/* 8B10C8 80241058 26100004 */ addiu $s0, $s0, 4 +/* 8B10CC 8024105C 0240202D */ daddu $a0, $s2, $zero +/* 8B10D0 80241060 0C0B1EAF */ jal get_variable +/* 8B10D4 80241064 0040B82D */ daddu $s7, $v0, $zero +/* 8B10D8 80241068 8E050000 */ lw $a1, ($s0) +/* 8B10DC 8024106C 26100004 */ addiu $s0, $s0, 4 +/* 8B10E0 80241070 0240202D */ daddu $a0, $s2, $zero +/* 8B10E4 80241074 0C0B1EAF */ jal get_variable +/* 8B10E8 80241078 0040B02D */ daddu $s6, $v0, $zero +/* 8B10EC 8024107C 0240202D */ daddu $a0, $s2, $zero +/* 8B10F0 80241080 3C05F4AC */ lui $a1, 0xf4ac +/* 8B10F4 80241084 34A5D481 */ ori $a1, $a1, 0xd481 +/* 8B10F8 80241088 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* 8B10FC 8024108C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* 8B1100 80241090 8E140000 */ lw $s4, ($s0) +/* 8B1104 80241094 00061880 */ sll $v1, $a2, 2 +/* 8B1108 80241098 00661821 */ addu $v1, $v1, $a2 +/* 8B110C 8024109C 00031880 */ sll $v1, $v1, 2 +/* 8B1110 802410A0 00661823 */ subu $v1, $v1, $a2 +/* 8B1114 802410A4 000330C0 */ sll $a2, $v1, 3 +/* 8B1118 802410A8 00661821 */ addu $v1, $v1, $a2 +/* 8B111C 802410AC 000318C0 */ sll $v1, $v1, 3 +/* 8B1120 802410B0 3C01800B */ lui $at, 0x800b +/* 8B1124 802410B4 00230821 */ addu $at, $at, $v1 +/* 8B1128 802410B8 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 8B112C 802410BC 8E150004 */ lw $s5, 4($s0) +/* 8B1130 802410C0 4600010D */ trunc.w.s $f4, $f0 +/* 8B1134 802410C4 44112000 */ mfc1 $s1, $f4 +/* 8B1138 802410C8 0C0B1EAF */ jal get_variable +/* 8B113C 802410CC 0040982D */ daddu $s3, $v0, $zero +/* 8B1140 802410D0 4491B000 */ mtc1 $s1, $f22 +/* 8B1144 802410D4 00000000 */ nop +/* 8B1148 802410D8 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8B114C 802410DC 4600B306 */ mov.s $f12, $f22 +/* 8B1150 802410E0 0C00A8D4 */ jal cos_deg +/* 8B1154 802410E4 0040802D */ daddu $s0, $v0, $zero +/* 8B1158 802410E8 4493A000 */ mtc1 $s3, $f20 +/* 8B115C 802410EC 00000000 */ nop +/* 8B1160 802410F0 4680A520 */ cvt.s.w $f20, $f20 +/* 8B1164 802410F4 4600A002 */ mul.s $f0, $f20, $f0 +/* 8B1168 802410F8 00000000 */ nop +/* 8B116C 802410FC 0240202D */ daddu $a0, $s2, $zero +/* 8B1170 80241100 44901000 */ mtc1 $s0, $f2 +/* 8B1174 80241104 00000000 */ nop +/* 8B1178 80241108 468010A0 */ cvt.s.w $f2, $f2 +/* 8B117C 8024110C 46001081 */ sub.s $f2, $f2, $f0 +/* 8B1180 80241110 3C05F4AC */ lui $a1, 0xf4ac +/* 8B1184 80241114 4600110D */ trunc.w.s $f4, $f2 +/* 8B1188 80241118 44102000 */ mfc1 $s0, $f4 +/* 8B118C 8024111C 0C0B1EAF */ jal get_variable +/* 8B1190 80241120 34A5D483 */ ori $a1, $a1, 0xd483 +/* 8B1194 80241124 4600B306 */ mov.s $f12, $f22 +/* 8B1198 80241128 0C00A8BB */ jal sin_deg +/* 8B119C 8024112C 0040882D */ daddu $s1, $v0, $zero +/* 8B11A0 80241130 4600A502 */ mul.s $f20, $f20, $f0 +/* 8B11A4 80241134 00000000 */ nop +/* 8B11A8 80241138 0240202D */ daddu $a0, $s2, $zero +/* 8B11AC 8024113C 44910000 */ mtc1 $s1, $f0 +/* 8B11B0 80241140 00000000 */ nop +/* 8B11B4 80241144 46800020 */ cvt.s.w $f0, $f0 +/* 8B11B8 80241148 46140001 */ sub.s $f0, $f0, $f20 +/* 8B11BC 8024114C 0280282D */ daddu $a1, $s4, $zero +/* 8B11C0 80241150 02173023 */ subu $a2, $s0, $s7 +/* 8B11C4 80241154 4600010D */ trunc.w.s $f4, $f0 +/* 8B11C8 80241158 44102000 */ mfc1 $s0, $f4 +/* 8B11CC 8024115C 0C0B2026 */ jal set_variable +/* 8B11D0 80241160 02168023 */ subu $s0, $s0, $s6 +/* 8B11D4 80241164 0240202D */ daddu $a0, $s2, $zero +/* 8B11D8 80241168 02A0282D */ daddu $a1, $s5, $zero +/* 8B11DC 8024116C 0C0B2026 */ jal set_variable +/* 8B11E0 80241170 0200302D */ daddu $a2, $s0, $zero +/* 8B11E4 80241174 8FBF0030 */ lw $ra, 0x30($sp) +/* 8B11E8 80241178 8FB7002C */ lw $s7, 0x2c($sp) +/* 8B11EC 8024117C 8FB60028 */ lw $s6, 0x28($sp) +/* 8B11F0 80241180 8FB50024 */ lw $s5, 0x24($sp) +/* 8B11F4 80241184 8FB40020 */ lw $s4, 0x20($sp) +/* 8B11F8 80241188 8FB3001C */ lw $s3, 0x1c($sp) +/* 8B11FC 8024118C 8FB20018 */ lw $s2, 0x18($sp) +/* 8B1200 80241190 8FB10014 */ lw $s1, 0x14($sp) +/* 8B1204 80241194 8FB00010 */ lw $s0, 0x10($sp) +/* 8B1208 80241198 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 8B120C 8024119C D7B40038 */ ldc1 $f20, 0x38($sp) +/* 8B1210 802411A0 24020002 */ addiu $v0, $zero, 2 +/* 8B1214 802411A4 03E00008 */ jr $ra +/* 8B1218 802411A8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC.s deleted file mode 100644 index 45518218c0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411AC -/* 8B121C 802411AC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8B1220 802411B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8B1224 802411B4 10A00002 */ beqz $a1, .L802411C0 -/* 8B1228 802411B8 2402003C */ addiu $v0, $zero, 0x3c -/* 8B122C 802411BC AC820070 */ sw $v0, 0x70($a0) -.L802411C0: -/* 8B1230 802411C0 C4620080 */ lwc1 $f2, 0x80($v1) -/* 8B1234 802411C4 3C0141F0 */ lui $at, 0x41f0 -/* 8B1238 802411C8 44810000 */ mtc1 $at, $f0 -/* 8B123C 802411CC 00000000 */ nop -/* 8B1240 802411D0 46001000 */ add.s $f0, $f2, $f0 -/* 8B1244 802411D4 3C0143B4 */ lui $at, 0x43b4 -/* 8B1248 802411D8 44811000 */ mtc1 $at, $f2 -/* 8B124C 802411DC 00000000 */ nop -/* 8B1250 802411E0 4600103E */ c.le.s $f2, $f0 -/* 8B1254 802411E4 00000000 */ nop -/* 8B1258 802411E8 45000003 */ bc1f .L802411F8 -/* 8B125C 802411EC E4600080 */ swc1 $f0, 0x80($v1) -/* 8B1260 802411F0 46020001 */ sub.s $f0, $f0, $f2 -/* 8B1264 802411F4 E4600080 */ swc1 $f0, 0x80($v1) -.L802411F8: -/* 8B1268 802411F8 8C820070 */ lw $v0, 0x70($a0) -/* 8B126C 802411FC 2442FFFF */ addiu $v0, $v0, -1 -/* 8B1270 80241200 AC820070 */ sw $v0, 0x70($a0) -/* 8B1274 80241204 000217C3 */ sra $v0, $v0, 0x1f -/* 8B1278 80241208 03E00008 */ jr $ra -/* 8B127C 8024120C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s new file mode 100644 index 0000000000..19895d4bc0 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411AC_8B121C +/* 8B121C 802411AC 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 8B1220 802411B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 8B1224 802411B4 10A00002 */ beqz $a1, .L802411C0 +/* 8B1228 802411B8 2402003C */ addiu $v0, $zero, 0x3c +/* 8B122C 802411BC AC820070 */ sw $v0, 0x70($a0) +.L802411C0: +/* 8B1230 802411C0 C4620080 */ lwc1 $f2, 0x80($v1) +/* 8B1234 802411C4 3C0141F0 */ lui $at, 0x41f0 +/* 8B1238 802411C8 44810000 */ mtc1 $at, $f0 +/* 8B123C 802411CC 00000000 */ nop +/* 8B1240 802411D0 46001000 */ add.s $f0, $f2, $f0 +/* 8B1244 802411D4 3C0143B4 */ lui $at, 0x43b4 +/* 8B1248 802411D8 44811000 */ mtc1 $at, $f2 +/* 8B124C 802411DC 00000000 */ nop +/* 8B1250 802411E0 4600103E */ c.le.s $f2, $f0 +/* 8B1254 802411E4 00000000 */ nop +/* 8B1258 802411E8 45000003 */ bc1f .L802411F8 +/* 8B125C 802411EC E4600080 */ swc1 $f0, 0x80($v1) +/* 8B1260 802411F0 46020001 */ sub.s $f0, $f0, $f2 +/* 8B1264 802411F4 E4600080 */ swc1 $f0, 0x80($v1) +.L802411F8: +/* 8B1268 802411F8 8C820070 */ lw $v0, 0x70($a0) +/* 8B126C 802411FC 2442FFFF */ addiu $v0, $v0, -1 +/* 8B1270 80241200 AC820070 */ sw $v0, 0x70($a0) +/* 8B1274 80241204 000217C3 */ sra $v0, $v0, 0x1f +/* 8B1278 80241208 03E00008 */ jr $ra +/* 8B127C 8024120C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0.s deleted file mode 100644 index 4fd88b25c8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412A0 -/* 8B1310 802412A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8B1314 802412A4 AFB10014 */ sw $s1, 0x14($sp) -/* 8B1318 802412A8 0080882D */ daddu $s1, $a0, $zero -/* 8B131C 802412AC AFB00010 */ sw $s0, 0x10($sp) -/* 8B1320 802412B0 00A0802D */ daddu $s0, $a1, $zero -/* 8B1324 802412B4 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B1328 802412B8 AFB20018 */ sw $s2, 0x18($sp) -/* 8B132C 802412BC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8B1330 802412C0 0C00EABB */ jal get_npc_unsafe -/* 8B1334 802412C4 2404FFFC */ addiu $a0, $zero, -4 -/* 8B1338 802412C8 12000017 */ beqz $s0, .L80241328 -/* 8B133C 802412CC 0040902D */ daddu $s2, $v0, $zero -/* 8B1340 802412D0 0220202D */ daddu $a0, $s1, $zero -/* 8B1344 802412D4 3C05FE36 */ lui $a1, 0xfe36 -/* 8B1348 802412D8 0C0B210B */ jal get_float_variable -/* 8B134C 802412DC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8B1350 802412E0 0220202D */ daddu $a0, $s1, $zero -/* 8B1354 802412E4 3C05FE36 */ lui $a1, 0xfe36 -/* 8B1358 802412E8 3C014270 */ lui $at, 0x4270 -/* 8B135C 802412EC 4481A000 */ mtc1 $at, $f20 -/* 8B1360 802412F0 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 8B1364 802412F4 46140003 */ div.s $f0, $f0, $f20 -/* 8B1368 802412F8 0C0B210B */ jal get_float_variable -/* 8B136C 802412FC E6200074 */ swc1 $f0, 0x74($s1) -/* 8B1370 80241300 0220202D */ daddu $a0, $s1, $zero -/* 8B1374 80241304 3C05FE36 */ lui $a1, 0xfe36 -/* 8B1378 80241308 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8B137C 8024130C 46140003 */ div.s $f0, $f0, $f20 -/* 8B1380 80241310 0C0B210B */ jal get_float_variable -/* 8B1384 80241314 E6200078 */ swc1 $f0, 0x78($s1) -/* 8B1388 80241318 46140003 */ div.s $f0, $f0, $f20 -/* 8B138C 8024131C 2402003C */ addiu $v0, $zero, 0x3c -/* 8B1390 80241320 E620007C */ swc1 $f0, 0x7c($s1) -/* 8B1394 80241324 AE220070 */ sw $v0, 0x70($s1) -.L80241328: -/* 8B1398 80241328 C6400038 */ lwc1 $f0, 0x38($s2) -/* 8B139C 8024132C C6220074 */ lwc1 $f2, 0x74($s1) -/* 8B13A0 80241330 46020000 */ add.s $f0, $f0, $f2 -/* 8B13A4 80241334 E6400038 */ swc1 $f0, 0x38($s2) -/* 8B13A8 80241338 C640003C */ lwc1 $f0, 0x3c($s2) -/* 8B13AC 8024133C C6220078 */ lwc1 $f2, 0x78($s1) -/* 8B13B0 80241340 46020000 */ add.s $f0, $f0, $f2 -/* 8B13B4 80241344 E640003C */ swc1 $f0, 0x3c($s2) -/* 8B13B8 80241348 C6400040 */ lwc1 $f0, 0x40($s2) -/* 8B13BC 8024134C C622007C */ lwc1 $f2, 0x7c($s1) -/* 8B13C0 80241350 46020000 */ add.s $f0, $f0, $f2 -/* 8B13C4 80241354 E6400040 */ swc1 $f0, 0x40($s2) -/* 8B13C8 80241358 8E230070 */ lw $v1, 0x70($s1) -/* 8B13CC 8024135C 2463FFFF */ addiu $v1, $v1, -1 -/* 8B13D0 80241360 2C620001 */ sltiu $v0, $v1, 1 -/* 8B13D4 80241364 AE230070 */ sw $v1, 0x70($s1) -/* 8B13D8 80241368 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B13DC 8024136C 8FB20018 */ lw $s2, 0x18($sp) -/* 8B13E0 80241370 8FB10014 */ lw $s1, 0x14($sp) -/* 8B13E4 80241374 8FB00010 */ lw $s0, 0x10($sp) -/* 8B13E8 80241378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8B13EC 8024137C 00021040 */ sll $v0, $v0, 1 -/* 8B13F0 80241380 03E00008 */ jr $ra -/* 8B13F4 80241384 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s new file mode 100644 index 0000000000..a5efd31cb6 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412A0_8B1310 +/* 8B1310 802412A0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8B1314 802412A4 AFB10014 */ sw $s1, 0x14($sp) +/* 8B1318 802412A8 0080882D */ daddu $s1, $a0, $zero +/* 8B131C 802412AC AFB00010 */ sw $s0, 0x10($sp) +/* 8B1320 802412B0 00A0802D */ daddu $s0, $a1, $zero +/* 8B1324 802412B4 AFBF001C */ sw $ra, 0x1c($sp) +/* 8B1328 802412B8 AFB20018 */ sw $s2, 0x18($sp) +/* 8B132C 802412BC F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8B1330 802412C0 0C00EABB */ jal get_npc_unsafe +/* 8B1334 802412C4 2404FFFC */ addiu $a0, $zero, -4 +/* 8B1338 802412C8 12000017 */ beqz $s0, .L80241328 +/* 8B133C 802412CC 0040902D */ daddu $s2, $v0, $zero +/* 8B1340 802412D0 0220202D */ daddu $a0, $s1, $zero +/* 8B1344 802412D4 3C05FE36 */ lui $a1, 0xfe36 +/* 8B1348 802412D8 0C0B210B */ jal get_float_variable +/* 8B134C 802412DC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8B1350 802412E0 0220202D */ daddu $a0, $s1, $zero +/* 8B1354 802412E4 3C05FE36 */ lui $a1, 0xfe36 +/* 8B1358 802412E8 3C014270 */ lui $at, 0x4270 +/* 8B135C 802412EC 4481A000 */ mtc1 $at, $f20 +/* 8B1360 802412F0 34A53C85 */ ori $a1, $a1, 0x3c85 +/* 8B1364 802412F4 46140003 */ div.s $f0, $f0, $f20 +/* 8B1368 802412F8 0C0B210B */ jal get_float_variable +/* 8B136C 802412FC E6200074 */ swc1 $f0, 0x74($s1) +/* 8B1370 80241300 0220202D */ daddu $a0, $s1, $zero +/* 8B1374 80241304 3C05FE36 */ lui $a1, 0xfe36 +/* 8B1378 80241308 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8B137C 8024130C 46140003 */ div.s $f0, $f0, $f20 +/* 8B1380 80241310 0C0B210B */ jal get_float_variable +/* 8B1384 80241314 E6200078 */ swc1 $f0, 0x78($s1) +/* 8B1388 80241318 46140003 */ div.s $f0, $f0, $f20 +/* 8B138C 8024131C 2402003C */ addiu $v0, $zero, 0x3c +/* 8B1390 80241320 E620007C */ swc1 $f0, 0x7c($s1) +/* 8B1394 80241324 AE220070 */ sw $v0, 0x70($s1) +.L80241328: +/* 8B1398 80241328 C6400038 */ lwc1 $f0, 0x38($s2) +/* 8B139C 8024132C C6220074 */ lwc1 $f2, 0x74($s1) +/* 8B13A0 80241330 46020000 */ add.s $f0, $f0, $f2 +/* 8B13A4 80241334 E6400038 */ swc1 $f0, 0x38($s2) +/* 8B13A8 80241338 C640003C */ lwc1 $f0, 0x3c($s2) +/* 8B13AC 8024133C C6220078 */ lwc1 $f2, 0x78($s1) +/* 8B13B0 80241340 46020000 */ add.s $f0, $f0, $f2 +/* 8B13B4 80241344 E640003C */ swc1 $f0, 0x3c($s2) +/* 8B13B8 80241348 C6400040 */ lwc1 $f0, 0x40($s2) +/* 8B13BC 8024134C C622007C */ lwc1 $f2, 0x7c($s1) +/* 8B13C0 80241350 46020000 */ add.s $f0, $f0, $f2 +/* 8B13C4 80241354 E6400040 */ swc1 $f0, 0x40($s2) +/* 8B13C8 80241358 8E230070 */ lw $v1, 0x70($s1) +/* 8B13CC 8024135C 2463FFFF */ addiu $v1, $v1, -1 +/* 8B13D0 80241360 2C620001 */ sltiu $v0, $v1, 1 +/* 8B13D4 80241364 AE230070 */ sw $v1, 0x70($s1) +/* 8B13D8 80241368 8FBF001C */ lw $ra, 0x1c($sp) +/* 8B13DC 8024136C 8FB20018 */ lw $s2, 0x18($sp) +/* 8B13E0 80241370 8FB10014 */ lw $s1, 0x14($sp) +/* 8B13E4 80241374 8FB00010 */ lw $s0, 0x10($sp) +/* 8B13E8 80241378 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8B13EC 8024137C 00021040 */ sll $v0, $v0, 1 +/* 8B13F0 80241380 03E00008 */ jr $ra +/* 8B13F4 80241384 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4.s deleted file mode 100644 index 977c979807..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413F4 -/* 8B1464 802413F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B1468 802413F8 3C058024 */ lui $a1, 0x8024 -/* 8B146C 802413FC 24A51388 */ addiu $a1, $a1, 0x1388 -/* 8B1470 80241400 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B1474 80241404 0C048C8F */ jal bind_dynamic_entity_7 -/* 8B1478 80241408 0000202D */ daddu $a0, $zero, $zero -/* 8B147C 8024140C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B1480 80241410 3C018025 */ lui $at, 0x8025 -/* 8B1484 80241414 AC227F2C */ sw $v0, 0x7f2c($at) -/* 8B1488 80241418 24020002 */ addiu $v0, $zero, 2 -/* 8B148C 8024141C 03E00008 */ jr $ra -/* 8B1490 80241420 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s new file mode 100644 index 0000000000..638f14ce97 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802413F4_8B1464.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413F4_8B1464 +/* 8B1464 802413F4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B1468 802413F8 3C058024 */ lui $a1, 0x8024 +/* 8B146C 802413FC 24A51388 */ addiu $a1, $a1, 0x1388 +/* 8B1470 80241400 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B1474 80241404 0C048C8F */ jal bind_dynamic_entity_7 +/* 8B1478 80241408 0000202D */ daddu $a0, $zero, $zero +/* 8B147C 8024140C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B1480 80241410 3C018025 */ lui $at, 0x8025 +/* 8B1484 80241414 AC227F2C */ sw $v0, 0x7f2c($at) +/* 8B1488 80241418 24020002 */ addiu $v0, $zero, 2 +/* 8B148C 8024141C 03E00008 */ jr $ra +/* 8B1490 80241420 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424.s deleted file mode 100644 index 4014dbcd50..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241424 -/* 8B1494 80241424 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B1498 80241428 AFB00010 */ sw $s0, 0x10($sp) -/* 8B149C 8024142C 0080802D */ daddu $s0, $a0, $zero -/* 8B14A0 80241430 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B14A4 80241434 AFB20018 */ sw $s2, 0x18($sp) -/* 8B14A8 80241438 AFB10014 */ sw $s1, 0x14($sp) -/* 8B14AC 8024143C 8E110148 */ lw $s1, 0x148($s0) -/* 8B14B0 80241440 86240008 */ lh $a0, 8($s1) -/* 8B14B4 80241444 0C00EABB */ jal get_npc_unsafe -/* 8B14B8 80241448 00A0902D */ daddu $s2, $a1, $zero -/* 8B14BC 8024144C 8E2300CC */ lw $v1, 0xcc($s1) -/* 8B14C0 80241450 0040202D */ daddu $a0, $v0, $zero -/* 8B14C4 80241454 8C630000 */ lw $v1, ($v1) -/* 8B14C8 80241458 24020001 */ addiu $v0, $zero, 1 -/* 8B14CC 8024145C AC830028 */ sw $v1, 0x28($a0) -/* 8B14D0 80241460 AE020070 */ sw $v0, 0x70($s0) -/* 8B14D4 80241464 8E220000 */ lw $v0, ($s1) -/* 8B14D8 80241468 3C030010 */ lui $v1, 0x10 -/* 8B14DC 8024146C 00431024 */ and $v0, $v0, $v1 -/* 8B14E0 80241470 10400004 */ beqz $v0, .L80241484 -/* 8B14E4 80241474 00000000 */ nop -/* 8B14E8 80241478 C620006C */ lwc1 $f0, 0x6c($s1) -/* 8B14EC 8024147C 46800020 */ cvt.s.w $f0, $f0 -/* 8B14F0 80241480 E480000C */ swc1 $f0, 0xc($a0) -.L80241484: -/* 8B14F4 80241484 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B14F8 80241488 8C420014 */ lw $v0, 0x14($v0) -/* 8B14FC 8024148C 1C400004 */ bgtz $v0, .L802414A0 -/* 8B1500 80241490 00000000 */ nop -/* 8B1504 80241494 C640000C */ lwc1 $f0, 0xc($s2) -/* 8B1508 80241498 08090530 */ j .L802414C0 -/* 8B150C 8024149C E4800018 */ swc1 $f0, 0x18($a0) -.L802414A0: -/* 8B1510 802414A0 3C018025 */ lui $at, 0x8025 -/* 8B1514 802414A4 D4227D40 */ ldc1 $f2, 0x7d40($at) -/* 8B1518 802414A8 44820000 */ mtc1 $v0, $f0 -/* 8B151C 802414AC 00000000 */ nop -/* 8B1520 802414B0 46800021 */ cvt.d.w $f0, $f0 -/* 8B1524 802414B4 46220003 */ div.d $f0, $f0, $f2 -/* 8B1528 802414B8 46200020 */ cvt.s.d $f0, $f0 -/* 8B152C 802414BC E4800018 */ swc1 $f0, 0x18($a0) -.L802414C0: -/* 8B1530 802414C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B1534 802414C4 8FB20018 */ lw $s2, 0x18($sp) -/* 8B1538 802414C8 8FB10014 */ lw $s1, 0x14($sp) -/* 8B153C 802414CC 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1540 802414D0 03E00008 */ jr $ra -/* 8B1544 802414D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s new file mode 100644 index 0000000000..f5c6854041 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241424_8B1494.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241424_8B1494 +/* 8B1494 80241424 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B1498 80241428 AFB00010 */ sw $s0, 0x10($sp) +/* 8B149C 8024142C 0080802D */ daddu $s0, $a0, $zero +/* 8B14A0 80241430 AFBF001C */ sw $ra, 0x1c($sp) +/* 8B14A4 80241434 AFB20018 */ sw $s2, 0x18($sp) +/* 8B14A8 80241438 AFB10014 */ sw $s1, 0x14($sp) +/* 8B14AC 8024143C 8E110148 */ lw $s1, 0x148($s0) +/* 8B14B0 80241440 86240008 */ lh $a0, 8($s1) +/* 8B14B4 80241444 0C00EABB */ jal get_npc_unsafe +/* 8B14B8 80241448 00A0902D */ daddu $s2, $a1, $zero +/* 8B14BC 8024144C 8E2300CC */ lw $v1, 0xcc($s1) +/* 8B14C0 80241450 0040202D */ daddu $a0, $v0, $zero +/* 8B14C4 80241454 8C630000 */ lw $v1, ($v1) +/* 8B14C8 80241458 24020001 */ addiu $v0, $zero, 1 +/* 8B14CC 8024145C AC830028 */ sw $v1, 0x28($a0) +/* 8B14D0 80241460 AE020070 */ sw $v0, 0x70($s0) +/* 8B14D4 80241464 8E220000 */ lw $v0, ($s1) +/* 8B14D8 80241468 3C030010 */ lui $v1, 0x10 +/* 8B14DC 8024146C 00431024 */ and $v0, $v0, $v1 +/* 8B14E0 80241470 10400004 */ beqz $v0, .L80241484 +/* 8B14E4 80241474 00000000 */ nop +/* 8B14E8 80241478 C620006C */ lwc1 $f0, 0x6c($s1) +/* 8B14EC 8024147C 46800020 */ cvt.s.w $f0, $f0 +/* 8B14F0 80241480 E480000C */ swc1 $f0, 0xc($a0) +.L80241484: +/* 8B14F4 80241484 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8B14F8 80241488 8C420014 */ lw $v0, 0x14($v0) +/* 8B14FC 8024148C 1C400004 */ bgtz $v0, .L802414A0 +/* 8B1500 80241490 00000000 */ nop +/* 8B1504 80241494 C640000C */ lwc1 $f0, 0xc($s2) +/* 8B1508 80241498 08090530 */ j .L802414C0 +/* 8B150C 8024149C E4800018 */ swc1 $f0, 0x18($a0) +.L802414A0: +/* 8B1510 802414A0 3C018025 */ lui $at, 0x8025 +/* 8B1514 802414A4 D4227D40 */ ldc1 $f2, 0x7d40($at) +/* 8B1518 802414A8 44820000 */ mtc1 $v0, $f0 +/* 8B151C 802414AC 00000000 */ nop +/* 8B1520 802414B0 46800021 */ cvt.d.w $f0, $f0 +/* 8B1524 802414B4 46220003 */ div.d $f0, $f0, $f2 +/* 8B1528 802414B8 46200020 */ cvt.s.d $f0, $f0 +/* 8B152C 802414BC E4800018 */ swc1 $f0, 0x18($a0) +.L802414C0: +/* 8B1530 802414C0 8FBF001C */ lw $ra, 0x1c($sp) +/* 8B1534 802414C4 8FB20018 */ lw $s2, 0x18($sp) +/* 8B1538 802414C8 8FB10014 */ lw $s1, 0x14($sp) +/* 8B153C 802414CC 8FB00010 */ lw $s0, 0x10($sp) +/* 8B1540 802414D0 03E00008 */ jr $ra +/* 8B1544 802414D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8.s deleted file mode 100644 index b195b107a9..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414D8 -/* 8B1548 802414D8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B154C 802414DC AFB40040 */ sw $s4, 0x40($sp) -/* 8B1550 802414E0 0080A02D */ daddu $s4, $a0, $zero -/* 8B1554 802414E4 AFBF0044 */ sw $ra, 0x44($sp) -/* 8B1558 802414E8 AFB3003C */ sw $s3, 0x3c($sp) -/* 8B155C 802414EC AFB20038 */ sw $s2, 0x38($sp) -/* 8B1560 802414F0 AFB10034 */ sw $s1, 0x34($sp) -/* 8B1564 802414F4 AFB00030 */ sw $s0, 0x30($sp) -/* 8B1568 802414F8 8E920148 */ lw $s2, 0x148($s4) -/* 8B156C 802414FC 00A0802D */ daddu $s0, $a1, $zero -/* 8B1570 80241500 86440008 */ lh $a0, 8($s2) -/* 8B1574 80241504 0C00EABB */ jal get_npc_unsafe -/* 8B1578 80241508 00C0982D */ daddu $s3, $a2, $zero -/* 8B157C 8024150C 8E030008 */ lw $v1, 8($s0) -/* 8B1580 80241510 04600031 */ bltz $v1, .L802415D8 -/* 8B1584 80241514 0040882D */ daddu $s1, $v0, $zero -/* 8B1588 80241518 0260202D */ daddu $a0, $s3, $zero -/* 8B158C 8024151C AFA00010 */ sw $zero, 0x10($sp) -/* 8B1590 80241520 8E060018 */ lw $a2, 0x18($s0) -/* 8B1594 80241524 8E07001C */ lw $a3, 0x1c($s0) -/* 8B1598 80241528 0C01242D */ jal func_800490B4 -/* 8B159C 8024152C 0240282D */ daddu $a1, $s2, $zero -/* 8B15A0 80241530 10400029 */ beqz $v0, .L802415D8 -/* 8B15A4 80241534 0000202D */ daddu $a0, $zero, $zero -/* 8B15A8 80241538 0220282D */ daddu $a1, $s1, $zero -/* 8B15AC 8024153C 0000302D */ daddu $a2, $zero, $zero -/* 8B15B0 80241540 862300A8 */ lh $v1, 0xa8($s1) -/* 8B15B4 80241544 3C013F80 */ lui $at, 0x3f80 -/* 8B15B8 80241548 44810000 */ mtc1 $at, $f0 -/* 8B15BC 8024154C 3C014000 */ lui $at, 0x4000 -/* 8B15C0 80241550 44811000 */ mtc1 $at, $f2 -/* 8B15C4 80241554 3C01C1A0 */ lui $at, 0xc1a0 -/* 8B15C8 80241558 44812000 */ mtc1 $at, $f4 -/* 8B15CC 8024155C 2402000F */ addiu $v0, $zero, 0xf -/* 8B15D0 80241560 AFA2001C */ sw $v0, 0x1c($sp) -/* 8B15D4 80241564 44833000 */ mtc1 $v1, $f6 -/* 8B15D8 80241568 00000000 */ nop -/* 8B15DC 8024156C 468031A0 */ cvt.s.w $f6, $f6 -/* 8B15E0 80241570 44073000 */ mfc1 $a3, $f6 -/* 8B15E4 80241574 27A20028 */ addiu $v0, $sp, 0x28 -/* 8B15E8 80241578 AFA20020 */ sw $v0, 0x20($sp) -/* 8B15EC 8024157C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B15F0 80241580 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8B15F4 80241584 0C01BFA4 */ jal fx_emote -/* 8B15F8 80241588 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8B15FC 8024158C 0220202D */ daddu $a0, $s1, $zero -/* 8B1600 80241590 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8B1604 80241594 0C012530 */ jal func_800494C0 -/* 8B1608 80241598 3C060020 */ lui $a2, 0x20 -/* 8B160C 8024159C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8B1610 802415A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8B1614 802415A4 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8B1618 802415A8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8B161C 802415AC 8C460028 */ lw $a2, 0x28($v0) -/* 8B1620 802415B0 0C00A720 */ jal atan2 -/* 8B1624 802415B4 8C470030 */ lw $a3, 0x30($v0) -/* 8B1628 802415B8 E620000C */ swc1 $f0, 0xc($s1) -/* 8B162C 802415BC 8E420018 */ lw $v0, 0x18($s2) -/* 8B1630 802415C0 9442002A */ lhu $v0, 0x2a($v0) -/* 8B1634 802415C4 30420001 */ andi $v0, $v0, 1 -/* 8B1638 802415C8 14400002 */ bnez $v0, .L802415D4 -/* 8B163C 802415CC 2402000A */ addiu $v0, $zero, 0xa -/* 8B1640 802415D0 2402000C */ addiu $v0, $zero, 0xc -.L802415D4: -/* 8B1644 802415D4 AE820070 */ sw $v0, 0x70($s4) -.L802415D8: -/* 8B1648 802415D8 8FBF0044 */ lw $ra, 0x44($sp) -/* 8B164C 802415DC 8FB40040 */ lw $s4, 0x40($sp) -/* 8B1650 802415E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8B1654 802415E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8B1658 802415E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8B165C 802415EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8B1660 802415F0 03E00008 */ jr $ra -/* 8B1664 802415F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s new file mode 100644 index 0000000000..2bf7a3b9e4 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802414D8_8B1548.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414D8_8B1548 +/* 8B1548 802414D8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8B154C 802414DC AFB40040 */ sw $s4, 0x40($sp) +/* 8B1550 802414E0 0080A02D */ daddu $s4, $a0, $zero +/* 8B1554 802414E4 AFBF0044 */ sw $ra, 0x44($sp) +/* 8B1558 802414E8 AFB3003C */ sw $s3, 0x3c($sp) +/* 8B155C 802414EC AFB20038 */ sw $s2, 0x38($sp) +/* 8B1560 802414F0 AFB10034 */ sw $s1, 0x34($sp) +/* 8B1564 802414F4 AFB00030 */ sw $s0, 0x30($sp) +/* 8B1568 802414F8 8E920148 */ lw $s2, 0x148($s4) +/* 8B156C 802414FC 00A0802D */ daddu $s0, $a1, $zero +/* 8B1570 80241500 86440008 */ lh $a0, 8($s2) +/* 8B1574 80241504 0C00EABB */ jal get_npc_unsafe +/* 8B1578 80241508 00C0982D */ daddu $s3, $a2, $zero +/* 8B157C 8024150C 8E030008 */ lw $v1, 8($s0) +/* 8B1580 80241510 04600031 */ bltz $v1, .L802415D8 +/* 8B1584 80241514 0040882D */ daddu $s1, $v0, $zero +/* 8B1588 80241518 0260202D */ daddu $a0, $s3, $zero +/* 8B158C 8024151C AFA00010 */ sw $zero, 0x10($sp) +/* 8B1590 80241520 8E060018 */ lw $a2, 0x18($s0) +/* 8B1594 80241524 8E07001C */ lw $a3, 0x1c($s0) +/* 8B1598 80241528 0C01242D */ jal func_800490B4 +/* 8B159C 8024152C 0240282D */ daddu $a1, $s2, $zero +/* 8B15A0 80241530 10400029 */ beqz $v0, .L802415D8 +/* 8B15A4 80241534 0000202D */ daddu $a0, $zero, $zero +/* 8B15A8 80241538 0220282D */ daddu $a1, $s1, $zero +/* 8B15AC 8024153C 0000302D */ daddu $a2, $zero, $zero +/* 8B15B0 80241540 862300A8 */ lh $v1, 0xa8($s1) +/* 8B15B4 80241544 3C013F80 */ lui $at, 0x3f80 +/* 8B15B8 80241548 44810000 */ mtc1 $at, $f0 +/* 8B15BC 8024154C 3C014000 */ lui $at, 0x4000 +/* 8B15C0 80241550 44811000 */ mtc1 $at, $f2 +/* 8B15C4 80241554 3C01C1A0 */ lui $at, 0xc1a0 +/* 8B15C8 80241558 44812000 */ mtc1 $at, $f4 +/* 8B15CC 8024155C 2402000F */ addiu $v0, $zero, 0xf +/* 8B15D0 80241560 AFA2001C */ sw $v0, 0x1c($sp) +/* 8B15D4 80241564 44833000 */ mtc1 $v1, $f6 +/* 8B15D8 80241568 00000000 */ nop +/* 8B15DC 8024156C 468031A0 */ cvt.s.w $f6, $f6 +/* 8B15E0 80241570 44073000 */ mfc1 $a3, $f6 +/* 8B15E4 80241574 27A20028 */ addiu $v0, $sp, 0x28 +/* 8B15E8 80241578 AFA20020 */ sw $v0, 0x20($sp) +/* 8B15EC 8024157C E7A00010 */ swc1 $f0, 0x10($sp) +/* 8B15F0 80241580 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8B15F4 80241584 0C01BFA4 */ jal fx_emote +/* 8B15F8 80241588 E7A40018 */ swc1 $f4, 0x18($sp) +/* 8B15FC 8024158C 0220202D */ daddu $a0, $s1, $zero +/* 8B1600 80241590 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 8B1604 80241594 0C012530 */ jal func_800494C0 +/* 8B1608 80241598 3C060020 */ lui $a2, 0x20 +/* 8B160C 8024159C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8B1610 802415A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8B1614 802415A4 C62C0038 */ lwc1 $f12, 0x38($s1) +/* 8B1618 802415A8 C62E0040 */ lwc1 $f14, 0x40($s1) +/* 8B161C 802415AC 8C460028 */ lw $a2, 0x28($v0) +/* 8B1620 802415B0 0C00A720 */ jal atan2 +/* 8B1624 802415B4 8C470030 */ lw $a3, 0x30($v0) +/* 8B1628 802415B8 E620000C */ swc1 $f0, 0xc($s1) +/* 8B162C 802415BC 8E420018 */ lw $v0, 0x18($s2) +/* 8B1630 802415C0 9442002A */ lhu $v0, 0x2a($v0) +/* 8B1634 802415C4 30420001 */ andi $v0, $v0, 1 +/* 8B1638 802415C8 14400002 */ bnez $v0, .L802415D4 +/* 8B163C 802415CC 2402000A */ addiu $v0, $zero, 0xa +/* 8B1640 802415D0 2402000C */ addiu $v0, $zero, 0xc +.L802415D4: +/* 8B1644 802415D4 AE820070 */ sw $v0, 0x70($s4) +.L802415D8: +/* 8B1648 802415D8 8FBF0044 */ lw $ra, 0x44($sp) +/* 8B164C 802415DC 8FB40040 */ lw $s4, 0x40($sp) +/* 8B1650 802415E0 8FB3003C */ lw $s3, 0x3c($sp) +/* 8B1654 802415E4 8FB20038 */ lw $s2, 0x38($sp) +/* 8B1658 802415E8 8FB10034 */ lw $s1, 0x34($sp) +/* 8B165C 802415EC 8FB00030 */ lw $s0, 0x30($sp) +/* 8B1660 802415F0 03E00008 */ jr $ra +/* 8B1664 802415F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8.s deleted file mode 100644 index bca907536b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415F8 -/* 8B1668 802415F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B166C 802415FC AFB00010 */ sw $s0, 0x10($sp) -/* 8B1670 80241600 0080802D */ daddu $s0, $a0, $zero -/* 8B1674 80241604 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B1678 80241608 8E020148 */ lw $v0, 0x148($s0) -/* 8B167C 8024160C 0C00EABB */ jal get_npc_unsafe -/* 8B1680 80241610 84440008 */ lh $a0, 8($v0) -/* 8B1684 80241614 3C014120 */ lui $at, 0x4120 -/* 8B1688 80241618 44810000 */ mtc1 $at, $f0 -/* 8B168C 8024161C 3C014000 */ lui $at, 0x4000 -/* 8B1690 80241620 44811000 */ mtc1 $at, $f2 -/* 8B1694 80241624 8C430000 */ lw $v1, ($v0) -/* 8B1698 80241628 C444003C */ lwc1 $f4, 0x3c($v0) -/* 8B169C 8024162C 34630800 */ ori $v1, $v1, 0x800 -/* 8B16A0 80241630 E440001C */ swc1 $f0, 0x1c($v0) -/* 8B16A4 80241634 E4420014 */ swc1 $f2, 0x14($v0) -/* 8B16A8 80241638 E4440064 */ swc1 $f4, 0x64($v0) -/* 8B16AC 8024163C AC430000 */ sw $v1, ($v0) -/* 8B16B0 80241640 2402000B */ addiu $v0, $zero, 0xb -/* 8B16B4 80241644 AE020070 */ sw $v0, 0x70($s0) -/* 8B16B8 80241648 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B16BC 8024164C 8FB00010 */ lw $s0, 0x10($sp) -/* 8B16C0 80241650 03E00008 */ jr $ra -/* 8B16C4 80241654 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8_8B1668.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8_8B1668.s new file mode 100644 index 0000000000..17d3f9b755 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802415F8_8B1668.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415F8_8B1668 +/* 8B1668 802415F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B166C 802415FC AFB00010 */ sw $s0, 0x10($sp) +/* 8B1670 80241600 0080802D */ daddu $s0, $a0, $zero +/* 8B1674 80241604 AFBF0014 */ sw $ra, 0x14($sp) +/* 8B1678 80241608 8E020148 */ lw $v0, 0x148($s0) +/* 8B167C 8024160C 0C00EABB */ jal get_npc_unsafe +/* 8B1680 80241610 84440008 */ lh $a0, 8($v0) +/* 8B1684 80241614 3C014120 */ lui $at, 0x4120 +/* 8B1688 80241618 44810000 */ mtc1 $at, $f0 +/* 8B168C 8024161C 3C014000 */ lui $at, 0x4000 +/* 8B1690 80241620 44811000 */ mtc1 $at, $f2 +/* 8B1694 80241624 8C430000 */ lw $v1, ($v0) +/* 8B1698 80241628 C444003C */ lwc1 $f4, 0x3c($v0) +/* 8B169C 8024162C 34630800 */ ori $v1, $v1, 0x800 +/* 8B16A0 80241630 E440001C */ swc1 $f0, 0x1c($v0) +/* 8B16A4 80241634 E4420014 */ swc1 $f2, 0x14($v0) +/* 8B16A8 80241638 E4440064 */ swc1 $f4, 0x64($v0) +/* 8B16AC 8024163C AC430000 */ sw $v1, ($v0) +/* 8B16B0 80241640 2402000B */ addiu $v0, $zero, 0xb +/* 8B16B4 80241644 AE020070 */ sw $v0, 0x70($s0) +/* 8B16B8 80241648 8FBF0014 */ lw $ra, 0x14($sp) +/* 8B16BC 8024164C 8FB00010 */ lw $s0, 0x10($sp) +/* 8B16C0 80241650 03E00008 */ jr $ra +/* 8B16C4 80241654 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658.s deleted file mode 100644 index 2c8261c705..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241658 -/* 8B16C8 80241658 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B16CC 8024165C AFB00010 */ sw $s0, 0x10($sp) -/* 8B16D0 80241660 0080802D */ daddu $s0, $a0, $zero -/* 8B16D4 80241664 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B16D8 80241668 8E020148 */ lw $v0, 0x148($s0) -/* 8B16DC 8024166C 0C00EABB */ jal get_npc_unsafe -/* 8B16E0 80241670 84440008 */ lh $a0, 8($v0) -/* 8B16E4 80241674 0040202D */ daddu $a0, $v0, $zero -/* 8B16E8 80241678 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8B16EC 8024167C C480001C */ lwc1 $f0, 0x1c($a0) -/* 8B16F0 80241680 46001080 */ add.s $f2, $f2, $f0 -/* 8B16F4 80241684 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8B16F8 80241688 46040001 */ sub.s $f0, $f0, $f4 -/* 8B16FC 8024168C C4840064 */ lwc1 $f4, 0x64($a0) -/* 8B1700 80241690 4602203C */ c.lt.s $f4, $f2 -/* 8B1704 80241694 E482003C */ swc1 $f2, 0x3c($a0) -/* 8B1708 80241698 45010009 */ bc1t .L802416C0 -/* 8B170C 8024169C E480001C */ swc1 $f0, 0x1c($a0) -/* 8B1710 802416A0 8C820000 */ lw $v0, ($a0) -/* 8B1714 802416A4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8B1718 802416A8 E484003C */ swc1 $f4, 0x3c($a0) -/* 8B171C 802416AC AC80001C */ sw $zero, 0x1c($a0) -/* 8B1720 802416B0 00431024 */ and $v0, $v0, $v1 -/* 8B1724 802416B4 AC820000 */ sw $v0, ($a0) -/* 8B1728 802416B8 2402000C */ addiu $v0, $zero, 0xc -/* 8B172C 802416BC AE020070 */ sw $v0, 0x70($s0) -.L802416C0: -/* 8B1730 802416C0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B1734 802416C4 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1738 802416C8 03E00008 */ jr $ra -/* 8B173C 802416CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658_8B16C8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658_8B16C8.s new file mode 100644 index 0000000000..8c655535db --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241658_8B16C8.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241658_8B16C8 +/* 8B16C8 80241658 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B16CC 8024165C AFB00010 */ sw $s0, 0x10($sp) +/* 8B16D0 80241660 0080802D */ daddu $s0, $a0, $zero +/* 8B16D4 80241664 AFBF0014 */ sw $ra, 0x14($sp) +/* 8B16D8 80241668 8E020148 */ lw $v0, 0x148($s0) +/* 8B16DC 8024166C 0C00EABB */ jal get_npc_unsafe +/* 8B16E0 80241670 84440008 */ lh $a0, 8($v0) +/* 8B16E4 80241674 0040202D */ daddu $a0, $v0, $zero +/* 8B16E8 80241678 C482003C */ lwc1 $f2, 0x3c($a0) +/* 8B16EC 8024167C C480001C */ lwc1 $f0, 0x1c($a0) +/* 8B16F0 80241680 46001080 */ add.s $f2, $f2, $f0 +/* 8B16F4 80241684 C4840014 */ lwc1 $f4, 0x14($a0) +/* 8B16F8 80241688 46040001 */ sub.s $f0, $f0, $f4 +/* 8B16FC 8024168C C4840064 */ lwc1 $f4, 0x64($a0) +/* 8B1700 80241690 4602203C */ c.lt.s $f4, $f2 +/* 8B1704 80241694 E482003C */ swc1 $f2, 0x3c($a0) +/* 8B1708 80241698 45010009 */ bc1t .L802416C0 +/* 8B170C 8024169C E480001C */ swc1 $f0, 0x1c($a0) +/* 8B1710 802416A0 8C820000 */ lw $v0, ($a0) +/* 8B1714 802416A4 2403F7FF */ addiu $v1, $zero, -0x801 +/* 8B1718 802416A8 E484003C */ swc1 $f4, 0x3c($a0) +/* 8B171C 802416AC AC80001C */ sw $zero, 0x1c($a0) +/* 8B1720 802416B0 00431024 */ and $v0, $v0, $v1 +/* 8B1724 802416B4 AC820000 */ sw $v0, ($a0) +/* 8B1728 802416B8 2402000C */ addiu $v0, $zero, 0xc +/* 8B172C 802416BC AE020070 */ sw $v0, 0x70($s0) +.L802416C0: +/* 8B1730 802416C0 8FBF0014 */ lw $ra, 0x14($sp) +/* 8B1734 802416C4 8FB00010 */ lw $s0, 0x10($sp) +/* 8B1738 802416C8 03E00008 */ jr $ra +/* 8B173C 802416CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0.s deleted file mode 100644 index 08b403ac3c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416D0 -/* 8B1740 802416D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8B1744 802416D4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8B1748 802416D8 0080982D */ daddu $s3, $a0, $zero -/* 8B174C 802416DC AFBF0020 */ sw $ra, 0x20($sp) -/* 8B1750 802416E0 AFB20018 */ sw $s2, 0x18($sp) -/* 8B1754 802416E4 AFB10014 */ sw $s1, 0x14($sp) -/* 8B1758 802416E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8B175C 802416EC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8B1760 802416F0 8E710148 */ lw $s1, 0x148($s3) -/* 8B1764 802416F4 86240008 */ lh $a0, 8($s1) -/* 8B1768 802416F8 0C00EABB */ jal get_npc_unsafe -/* 8B176C 802416FC 00A0802D */ daddu $s0, $a1, $zero -/* 8B1770 80241700 8E040014 */ lw $a0, 0x14($s0) -/* 8B1774 80241704 0040902D */ daddu $s2, $v0, $zero -/* 8B1778 80241708 00041FC2 */ srl $v1, $a0, 0x1f -/* 8B177C 8024170C 00832021 */ addu $a0, $a0, $v1 -/* 8B1780 80241710 00042043 */ sra $a0, $a0, 1 -/* 8B1784 80241714 0C00A67F */ jal rand_int -/* 8B1788 80241718 24840001 */ addiu $a0, $a0, 1 -/* 8B178C 8024171C 8E030014 */ lw $v1, 0x14($s0) -/* 8B1790 80241720 C64C0038 */ lwc1 $f12, 0x38($s2) -/* 8B1794 80241724 000327C2 */ srl $a0, $v1, 0x1f -/* 8B1798 80241728 00641821 */ addu $v1, $v1, $a0 -/* 8B179C 8024172C 00031843 */ sra $v1, $v1, 1 -/* 8B17A0 80241730 00621821 */ addu $v1, $v1, $v0 -/* 8B17A4 80241734 A643008E */ sh $v1, 0x8e($s2) -/* 8B17A8 80241738 8E2200CC */ lw $v0, 0xcc($s1) -/* 8B17AC 8024173C C64E0040 */ lwc1 $f14, 0x40($s2) -/* 8B17B0 80241740 8C42000C */ lw $v0, 0xc($v0) -/* 8B17B4 80241744 AE420028 */ sw $v0, 0x28($s2) -/* 8B17B8 80241748 C600000C */ lwc1 $f0, 0xc($s0) -/* 8B17BC 8024174C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8B17C0 80241750 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8B17C4 80241754 E6400018 */ swc1 $f0, 0x18($s2) -/* 8B17C8 80241758 8C460028 */ lw $a2, 0x28($v0) -/* 8B17CC 8024175C 0C00A720 */ jal atan2 -/* 8B17D0 80241760 8C470030 */ lw $a3, 0x30($v0) -/* 8B17D4 80241764 46000506 */ mov.s $f20, $f0 -/* 8B17D8 80241768 C64C000C */ lwc1 $f12, 0xc($s2) -/* 8B17DC 8024176C 0C00A70A */ jal get_clamped_angle_diff -/* 8B17E0 80241770 4600A386 */ mov.s $f14, $f20 -/* 8B17E4 80241774 46000086 */ mov.s $f2, $f0 -/* 8B17E8 80241778 8E020010 */ lw $v0, 0x10($s0) -/* 8B17EC 8024177C 46001005 */ abs.s $f0, $f2 -/* 8B17F0 80241780 44822000 */ mtc1 $v0, $f4 -/* 8B17F4 80241784 00000000 */ nop -/* 8B17F8 80241788 46802120 */ cvt.s.w $f4, $f4 -/* 8B17FC 8024178C 4600203C */ c.lt.s $f4, $f0 -/* 8B1800 80241790 00000000 */ nop -/* 8B1804 80241794 4500000D */ bc1f .L802417CC -/* 8B1808 80241798 00000000 */ nop -/* 8B180C 8024179C 44800000 */ mtc1 $zero, $f0 -/* 8B1810 802417A0 C654000C */ lwc1 $f20, 0xc($s2) -/* 8B1814 802417A4 4600103C */ c.lt.s $f2, $f0 -/* 8B1818 802417A8 00000000 */ nop -/* 8B181C 802417AC 45000006 */ bc1f .L802417C8 -/* 8B1820 802417B0 00021023 */ negu $v0, $v0 -/* 8B1824 802417B4 44820000 */ mtc1 $v0, $f0 -/* 8B1828 802417B8 00000000 */ nop -/* 8B182C 802417BC 46800020 */ cvt.s.w $f0, $f0 -/* 8B1830 802417C0 080905F3 */ j .L802417CC -/* 8B1834 802417C4 4600A500 */ add.s $f20, $f20, $f0 -.L802417C8: -/* 8B1838 802417C8 4604A500 */ add.s $f20, $f20, $f4 -.L802417CC: -/* 8B183C 802417CC 0C00A6C9 */ jal clamp_angle -/* 8B1840 802417D0 4600A306 */ mov.s $f12, $f20 -/* 8B1844 802417D4 2402000D */ addiu $v0, $zero, 0xd -/* 8B1848 802417D8 E640000C */ swc1 $f0, 0xc($s2) -/* 8B184C 802417DC AE620070 */ sw $v0, 0x70($s3) -/* 8B1850 802417E0 8FBF0020 */ lw $ra, 0x20($sp) -/* 8B1854 802417E4 8FB3001C */ lw $s3, 0x1c($sp) -/* 8B1858 802417E8 8FB20018 */ lw $s2, 0x18($sp) -/* 8B185C 802417EC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B1860 802417F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1864 802417F4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8B1868 802417F8 03E00008 */ jr $ra -/* 8B186C 802417FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0_8B1740.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0_8B1740.s new file mode 100644 index 0000000000..0e17fbb93f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802416D0_8B1740.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416D0_8B1740 +/* 8B1740 802416D0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8B1744 802416D4 AFB3001C */ sw $s3, 0x1c($sp) +/* 8B1748 802416D8 0080982D */ daddu $s3, $a0, $zero +/* 8B174C 802416DC AFBF0020 */ sw $ra, 0x20($sp) +/* 8B1750 802416E0 AFB20018 */ sw $s2, 0x18($sp) +/* 8B1754 802416E4 AFB10014 */ sw $s1, 0x14($sp) +/* 8B1758 802416E8 AFB00010 */ sw $s0, 0x10($sp) +/* 8B175C 802416EC F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8B1760 802416F0 8E710148 */ lw $s1, 0x148($s3) +/* 8B1764 802416F4 86240008 */ lh $a0, 8($s1) +/* 8B1768 802416F8 0C00EABB */ jal get_npc_unsafe +/* 8B176C 802416FC 00A0802D */ daddu $s0, $a1, $zero +/* 8B1770 80241700 8E040014 */ lw $a0, 0x14($s0) +/* 8B1774 80241704 0040902D */ daddu $s2, $v0, $zero +/* 8B1778 80241708 00041FC2 */ srl $v1, $a0, 0x1f +/* 8B177C 8024170C 00832021 */ addu $a0, $a0, $v1 +/* 8B1780 80241710 00042043 */ sra $a0, $a0, 1 +/* 8B1784 80241714 0C00A67F */ jal rand_int +/* 8B1788 80241718 24840001 */ addiu $a0, $a0, 1 +/* 8B178C 8024171C 8E030014 */ lw $v1, 0x14($s0) +/* 8B1790 80241720 C64C0038 */ lwc1 $f12, 0x38($s2) +/* 8B1794 80241724 000327C2 */ srl $a0, $v1, 0x1f +/* 8B1798 80241728 00641821 */ addu $v1, $v1, $a0 +/* 8B179C 8024172C 00031843 */ sra $v1, $v1, 1 +/* 8B17A0 80241730 00621821 */ addu $v1, $v1, $v0 +/* 8B17A4 80241734 A643008E */ sh $v1, 0x8e($s2) +/* 8B17A8 80241738 8E2200CC */ lw $v0, 0xcc($s1) +/* 8B17AC 8024173C C64E0040 */ lwc1 $f14, 0x40($s2) +/* 8B17B0 80241740 8C42000C */ lw $v0, 0xc($v0) +/* 8B17B4 80241744 AE420028 */ sw $v0, 0x28($s2) +/* 8B17B8 80241748 C600000C */ lwc1 $f0, 0xc($s0) +/* 8B17BC 8024174C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8B17C0 80241750 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8B17C4 80241754 E6400018 */ swc1 $f0, 0x18($s2) +/* 8B17C8 80241758 8C460028 */ lw $a2, 0x28($v0) +/* 8B17CC 8024175C 0C00A720 */ jal atan2 +/* 8B17D0 80241760 8C470030 */ lw $a3, 0x30($v0) +/* 8B17D4 80241764 46000506 */ mov.s $f20, $f0 +/* 8B17D8 80241768 C64C000C */ lwc1 $f12, 0xc($s2) +/* 8B17DC 8024176C 0C00A70A */ jal get_clamped_angle_diff +/* 8B17E0 80241770 4600A386 */ mov.s $f14, $f20 +/* 8B17E4 80241774 46000086 */ mov.s $f2, $f0 +/* 8B17E8 80241778 8E020010 */ lw $v0, 0x10($s0) +/* 8B17EC 8024177C 46001005 */ abs.s $f0, $f2 +/* 8B17F0 80241780 44822000 */ mtc1 $v0, $f4 +/* 8B17F4 80241784 00000000 */ nop +/* 8B17F8 80241788 46802120 */ cvt.s.w $f4, $f4 +/* 8B17FC 8024178C 4600203C */ c.lt.s $f4, $f0 +/* 8B1800 80241790 00000000 */ nop +/* 8B1804 80241794 4500000D */ bc1f .L802417CC +/* 8B1808 80241798 00000000 */ nop +/* 8B180C 8024179C 44800000 */ mtc1 $zero, $f0 +/* 8B1810 802417A0 C654000C */ lwc1 $f20, 0xc($s2) +/* 8B1814 802417A4 4600103C */ c.lt.s $f2, $f0 +/* 8B1818 802417A8 00000000 */ nop +/* 8B181C 802417AC 45000006 */ bc1f .L802417C8 +/* 8B1820 802417B0 00021023 */ negu $v0, $v0 +/* 8B1824 802417B4 44820000 */ mtc1 $v0, $f0 +/* 8B1828 802417B8 00000000 */ nop +/* 8B182C 802417BC 46800020 */ cvt.s.w $f0, $f0 +/* 8B1830 802417C0 080905F3 */ j .L802417CC +/* 8B1834 802417C4 4600A500 */ add.s $f20, $f20, $f0 +.L802417C8: +/* 8B1838 802417C8 4604A500 */ add.s $f20, $f20, $f4 +.L802417CC: +/* 8B183C 802417CC 0C00A6C9 */ jal clamp_angle +/* 8B1840 802417D0 4600A306 */ mov.s $f12, $f20 +/* 8B1844 802417D4 2402000D */ addiu $v0, $zero, 0xd +/* 8B1848 802417D8 E640000C */ swc1 $f0, 0xc($s2) +/* 8B184C 802417DC AE620070 */ sw $v0, 0x70($s3) +/* 8B1850 802417E0 8FBF0020 */ lw $ra, 0x20($sp) +/* 8B1854 802417E4 8FB3001C */ lw $s3, 0x1c($sp) +/* 8B1858 802417E8 8FB20018 */ lw $s2, 0x18($sp) +/* 8B185C 802417EC 8FB10014 */ lw $s1, 0x14($sp) +/* 8B1860 802417F0 8FB00010 */ lw $s0, 0x10($sp) +/* 8B1864 802417F4 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8B1868 802417F8 03E00008 */ jr $ra +/* 8B186C 802417FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800.s deleted file mode 100644 index 03ac518b69..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241800 -/* 8B1870 80241800 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B1874 80241804 AFB3003C */ sw $s3, 0x3c($sp) -/* 8B1878 80241808 0080982D */ daddu $s3, $a0, $zero -/* 8B187C 8024180C AFBF0040 */ sw $ra, 0x40($sp) -/* 8B1880 80241810 AFB20038 */ sw $s2, 0x38($sp) -/* 8B1884 80241814 AFB10034 */ sw $s1, 0x34($sp) -/* 8B1888 80241818 AFB00030 */ sw $s0, 0x30($sp) -/* 8B188C 8024181C 8E720148 */ lw $s2, 0x148($s3) -/* 8B1890 80241820 00A0882D */ daddu $s1, $a1, $zero -/* 8B1894 80241824 86440008 */ lh $a0, 8($s2) -/* 8B1898 80241828 0C00EABB */ jal get_npc_unsafe -/* 8B189C 8024182C 00C0802D */ daddu $s0, $a2, $zero -/* 8B18A0 80241830 0200202D */ daddu $a0, $s0, $zero -/* 8B18A4 80241834 0240282D */ daddu $a1, $s2, $zero -/* 8B18A8 80241838 24030001 */ addiu $v1, $zero, 1 -/* 8B18AC 8024183C AFA30010 */ sw $v1, 0x10($sp) -/* 8B18B0 80241840 8E260018 */ lw $a2, 0x18($s1) -/* 8B18B4 80241844 8E27001C */ lw $a3, 0x1c($s1) -/* 8B18B8 80241848 0C01242D */ jal func_800490B4 -/* 8B18BC 8024184C 0040802D */ daddu $s0, $v0, $zero -/* 8B18C0 80241850 1440001D */ bnez $v0, .L802418C8 -/* 8B18C4 80241854 24040002 */ addiu $a0, $zero, 2 -/* 8B18C8 80241858 0200282D */ daddu $a1, $s0, $zero -/* 8B18CC 8024185C 0000302D */ daddu $a2, $zero, $zero -/* 8B18D0 80241860 860300A8 */ lh $v1, 0xa8($s0) -/* 8B18D4 80241864 3C013F80 */ lui $at, 0x3f80 -/* 8B18D8 80241868 44810000 */ mtc1 $at, $f0 -/* 8B18DC 8024186C 3C014000 */ lui $at, 0x4000 -/* 8B18E0 80241870 44811000 */ mtc1 $at, $f2 -/* 8B18E4 80241874 3C01C1A0 */ lui $at, 0xc1a0 -/* 8B18E8 80241878 44812000 */ mtc1 $at, $f4 -/* 8B18EC 8024187C 2402000F */ addiu $v0, $zero, 0xf -/* 8B18F0 80241880 AFA2001C */ sw $v0, 0x1c($sp) -/* 8B18F4 80241884 44833000 */ mtc1 $v1, $f6 -/* 8B18F8 80241888 00000000 */ nop -/* 8B18FC 8024188C 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1900 80241890 44073000 */ mfc1 $a3, $f6 -/* 8B1904 80241894 27A20028 */ addiu $v0, $sp, 0x28 -/* 8B1908 80241898 AFA20020 */ sw $v0, 0x20($sp) -/* 8B190C 8024189C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B1910 802418A0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8B1914 802418A4 0C01BFA4 */ jal fx_emote -/* 8B1918 802418A8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8B191C 802418AC 8E4200CC */ lw $v0, 0xcc($s2) -/* 8B1920 802418B0 8C430000 */ lw $v1, ($v0) -/* 8B1924 802418B4 24020019 */ addiu $v0, $zero, 0x19 -/* 8B1928 802418B8 A602008E */ sh $v0, 0x8e($s0) -/* 8B192C 802418BC 2402000E */ addiu $v0, $zero, 0xe -/* 8B1930 802418C0 0809063F */ j .L802418FC -/* 8B1934 802418C4 AE030028 */ sw $v1, 0x28($s0) -.L802418C8: -/* 8B1938 802418C8 8E050018 */ lw $a1, 0x18($s0) -/* 8B193C 802418CC 8E06000C */ lw $a2, 0xc($s0) -/* 8B1940 802418D0 0C00EA95 */ jal npc_move_heading -/* 8B1944 802418D4 0200202D */ daddu $a0, $s0, $zero -/* 8B1948 802418D8 0200202D */ daddu $a0, $s0, $zero -/* 8B194C 802418DC 0C00F598 */ jal func_8003D660 -/* 8B1950 802418E0 24050001 */ addiu $a1, $zero, 1 -/* 8B1954 802418E4 9602008E */ lhu $v0, 0x8e($s0) -/* 8B1958 802418E8 2442FFFF */ addiu $v0, $v0, -1 -/* 8B195C 802418EC A602008E */ sh $v0, 0x8e($s0) -/* 8B1960 802418F0 00021400 */ sll $v0, $v0, 0x10 -/* 8B1964 802418F4 14400002 */ bnez $v0, .L80241900 -/* 8B1968 802418F8 2402000C */ addiu $v0, $zero, 0xc -.L802418FC: -/* 8B196C 802418FC AE620070 */ sw $v0, 0x70($s3) -.L80241900: -/* 8B1970 80241900 8FBF0040 */ lw $ra, 0x40($sp) -/* 8B1974 80241904 8FB3003C */ lw $s3, 0x3c($sp) -/* 8B1978 80241908 8FB20038 */ lw $s2, 0x38($sp) -/* 8B197C 8024190C 8FB10034 */ lw $s1, 0x34($sp) -/* 8B1980 80241910 8FB00030 */ lw $s0, 0x30($sp) -/* 8B1984 80241914 03E00008 */ jr $ra -/* 8B1988 80241918 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s new file mode 100644 index 0000000000..c5ffcb1770 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241800_8B1870.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241800_8B1870 +/* 8B1870 80241800 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8B1874 80241804 AFB3003C */ sw $s3, 0x3c($sp) +/* 8B1878 80241808 0080982D */ daddu $s3, $a0, $zero +/* 8B187C 8024180C AFBF0040 */ sw $ra, 0x40($sp) +/* 8B1880 80241810 AFB20038 */ sw $s2, 0x38($sp) +/* 8B1884 80241814 AFB10034 */ sw $s1, 0x34($sp) +/* 8B1888 80241818 AFB00030 */ sw $s0, 0x30($sp) +/* 8B188C 8024181C 8E720148 */ lw $s2, 0x148($s3) +/* 8B1890 80241820 00A0882D */ daddu $s1, $a1, $zero +/* 8B1894 80241824 86440008 */ lh $a0, 8($s2) +/* 8B1898 80241828 0C00EABB */ jal get_npc_unsafe +/* 8B189C 8024182C 00C0802D */ daddu $s0, $a2, $zero +/* 8B18A0 80241830 0200202D */ daddu $a0, $s0, $zero +/* 8B18A4 80241834 0240282D */ daddu $a1, $s2, $zero +/* 8B18A8 80241838 24030001 */ addiu $v1, $zero, 1 +/* 8B18AC 8024183C AFA30010 */ sw $v1, 0x10($sp) +/* 8B18B0 80241840 8E260018 */ lw $a2, 0x18($s1) +/* 8B18B4 80241844 8E27001C */ lw $a3, 0x1c($s1) +/* 8B18B8 80241848 0C01242D */ jal func_800490B4 +/* 8B18BC 8024184C 0040802D */ daddu $s0, $v0, $zero +/* 8B18C0 80241850 1440001D */ bnez $v0, .L802418C8 +/* 8B18C4 80241854 24040002 */ addiu $a0, $zero, 2 +/* 8B18C8 80241858 0200282D */ daddu $a1, $s0, $zero +/* 8B18CC 8024185C 0000302D */ daddu $a2, $zero, $zero +/* 8B18D0 80241860 860300A8 */ lh $v1, 0xa8($s0) +/* 8B18D4 80241864 3C013F80 */ lui $at, 0x3f80 +/* 8B18D8 80241868 44810000 */ mtc1 $at, $f0 +/* 8B18DC 8024186C 3C014000 */ lui $at, 0x4000 +/* 8B18E0 80241870 44811000 */ mtc1 $at, $f2 +/* 8B18E4 80241874 3C01C1A0 */ lui $at, 0xc1a0 +/* 8B18E8 80241878 44812000 */ mtc1 $at, $f4 +/* 8B18EC 8024187C 2402000F */ addiu $v0, $zero, 0xf +/* 8B18F0 80241880 AFA2001C */ sw $v0, 0x1c($sp) +/* 8B18F4 80241884 44833000 */ mtc1 $v1, $f6 +/* 8B18F8 80241888 00000000 */ nop +/* 8B18FC 8024188C 468031A0 */ cvt.s.w $f6, $f6 +/* 8B1900 80241890 44073000 */ mfc1 $a3, $f6 +/* 8B1904 80241894 27A20028 */ addiu $v0, $sp, 0x28 +/* 8B1908 80241898 AFA20020 */ sw $v0, 0x20($sp) +/* 8B190C 8024189C E7A00010 */ swc1 $f0, 0x10($sp) +/* 8B1910 802418A0 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8B1914 802418A4 0C01BFA4 */ jal fx_emote +/* 8B1918 802418A8 E7A40018 */ swc1 $f4, 0x18($sp) +/* 8B191C 802418AC 8E4200CC */ lw $v0, 0xcc($s2) +/* 8B1920 802418B0 8C430000 */ lw $v1, ($v0) +/* 8B1924 802418B4 24020019 */ addiu $v0, $zero, 0x19 +/* 8B1928 802418B8 A602008E */ sh $v0, 0x8e($s0) +/* 8B192C 802418BC 2402000E */ addiu $v0, $zero, 0xe +/* 8B1930 802418C0 0809063F */ j .L802418FC +/* 8B1934 802418C4 AE030028 */ sw $v1, 0x28($s0) +.L802418C8: +/* 8B1938 802418C8 8E050018 */ lw $a1, 0x18($s0) +/* 8B193C 802418CC 8E06000C */ lw $a2, 0xc($s0) +/* 8B1940 802418D0 0C00EA95 */ jal npc_move_heading +/* 8B1944 802418D4 0200202D */ daddu $a0, $s0, $zero +/* 8B1948 802418D8 0200202D */ daddu $a0, $s0, $zero +/* 8B194C 802418DC 0C00F598 */ jal func_8003D660 +/* 8B1950 802418E0 24050001 */ addiu $a1, $zero, 1 +/* 8B1954 802418E4 9602008E */ lhu $v0, 0x8e($s0) +/* 8B1958 802418E8 2442FFFF */ addiu $v0, $v0, -1 +/* 8B195C 802418EC A602008E */ sh $v0, 0x8e($s0) +/* 8B1960 802418F0 00021400 */ sll $v0, $v0, 0x10 +/* 8B1964 802418F4 14400002 */ bnez $v0, .L80241900 +/* 8B1968 802418F8 2402000C */ addiu $v0, $zero, 0xc +.L802418FC: +/* 8B196C 802418FC AE620070 */ sw $v0, 0x70($s3) +.L80241900: +/* 8B1970 80241900 8FBF0040 */ lw $ra, 0x40($sp) +/* 8B1974 80241904 8FB3003C */ lw $s3, 0x3c($sp) +/* 8B1978 80241908 8FB20038 */ lw $s2, 0x38($sp) +/* 8B197C 8024190C 8FB10034 */ lw $s1, 0x34($sp) +/* 8B1980 80241910 8FB00030 */ lw $s0, 0x30($sp) +/* 8B1984 80241914 03E00008 */ jr $ra +/* 8B1988 80241918 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C.s deleted file mode 100644 index abf978438e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024191C -/* 8B198C 8024191C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B1990 80241920 AFB00010 */ sw $s0, 0x10($sp) -/* 8B1994 80241924 0080802D */ daddu $s0, $a0, $zero -/* 8B1998 80241928 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B199C 8024192C 8E020148 */ lw $v0, 0x148($s0) -/* 8B19A0 80241930 0C00EABB */ jal get_npc_unsafe -/* 8B19A4 80241934 84440008 */ lh $a0, 8($v0) -/* 8B19A8 80241938 9443008E */ lhu $v1, 0x8e($v0) -/* 8B19AC 8024193C 2463FFFF */ addiu $v1, $v1, -1 -/* 8B19B0 80241940 A443008E */ sh $v1, 0x8e($v0) -/* 8B19B4 80241944 00031C00 */ sll $v1, $v1, 0x10 -/* 8B19B8 80241948 14600002 */ bnez $v1, .L80241954 -/* 8B19BC 8024194C 2402000F */ addiu $v0, $zero, 0xf -/* 8B19C0 80241950 AE020070 */ sw $v0, 0x70($s0) -.L80241954: -/* 8B19C4 80241954 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B19C8 80241958 8FB00010 */ lw $s0, 0x10($sp) -/* 8B19CC 8024195C 03E00008 */ jr $ra -/* 8B19D0 80241960 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C_8B198C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C_8B198C.s new file mode 100644 index 0000000000..e470e2790a --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024191C_8B198C.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024191C_8B198C +/* 8B198C 8024191C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B1990 80241920 AFB00010 */ sw $s0, 0x10($sp) +/* 8B1994 80241924 0080802D */ daddu $s0, $a0, $zero +/* 8B1998 80241928 AFBF0014 */ sw $ra, 0x14($sp) +/* 8B199C 8024192C 8E020148 */ lw $v0, 0x148($s0) +/* 8B19A0 80241930 0C00EABB */ jal get_npc_unsafe +/* 8B19A4 80241934 84440008 */ lh $a0, 8($v0) +/* 8B19A8 80241938 9443008E */ lhu $v1, 0x8e($v0) +/* 8B19AC 8024193C 2463FFFF */ addiu $v1, $v1, -1 +/* 8B19B0 80241940 A443008E */ sh $v1, 0x8e($v0) +/* 8B19B4 80241944 00031C00 */ sll $v1, $v1, 0x10 +/* 8B19B8 80241948 14600002 */ bnez $v1, .L80241954 +/* 8B19BC 8024194C 2402000F */ addiu $v0, $zero, 0xf +/* 8B19C0 80241950 AE020070 */ sw $v0, 0x70($s0) +.L80241954: +/* 8B19C4 80241954 8FBF0014 */ lw $ra, 0x14($sp) +/* 8B19C8 80241958 8FB00010 */ lw $s0, 0x10($sp) +/* 8B19CC 8024195C 03E00008 */ jr $ra +/* 8B19D0 80241960 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964.s deleted file mode 100644 index c99c15841b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241964 -/* 8B19D4 80241964 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B19D8 80241968 AFB10014 */ sw $s1, 0x14($sp) -/* 8B19DC 8024196C 0080882D */ daddu $s1, $a0, $zero -/* 8B19E0 80241970 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B19E4 80241974 AFB20018 */ sw $s2, 0x18($sp) -/* 8B19E8 80241978 AFB00010 */ sw $s0, 0x10($sp) -/* 8B19EC 8024197C 8E300148 */ lw $s0, 0x148($s1) -/* 8B19F0 80241980 86040008 */ lh $a0, 8($s0) -/* 8B19F4 80241984 0C00EABB */ jal get_npc_unsafe -/* 8B19F8 80241988 00A0902D */ daddu $s2, $a1, $zero -/* 8B19FC 8024198C 8E0300CC */ lw $v1, 0xcc($s0) -/* 8B1A00 80241990 8C630004 */ lw $v1, 4($v1) -/* 8B1A04 80241994 0040202D */ daddu $a0, $v0, $zero -/* 8B1A08 80241998 AC830028 */ sw $v1, 0x28($a0) -/* 8B1A0C 8024199C 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8B1A10 802419A0 8C420014 */ lw $v0, 0x14($v0) -/* 8B1A14 802419A4 04410009 */ bgez $v0, .L802419CC -/* 8B1A18 802419A8 00000000 */ nop -/* 8B1A1C 802419AC C640000C */ lwc1 $f0, 0xc($s2) -/* 8B1A20 802419B0 3C018025 */ lui $at, 0x8025 -/* 8B1A24 802419B4 D4227D48 */ ldc1 $f2, 0x7d48($at) -/* 8B1A28 802419B8 46000021 */ cvt.d.s $f0, $f0 -/* 8B1A2C 802419BC 46220002 */ mul.d $f0, $f0, $f2 -/* 8B1A30 802419C0 00000000 */ nop -/* 8B1A34 802419C4 0809067A */ j .L802419E8 -/* 8B1A38 802419C8 46200020 */ cvt.s.d $f0, $f0 -.L802419CC: -/* 8B1A3C 802419CC 3C018025 */ lui $at, 0x8025 -/* 8B1A40 802419D0 D4227D50 */ ldc1 $f2, 0x7d50($at) -/* 8B1A44 802419D4 44820000 */ mtc1 $v0, $f0 -/* 8B1A48 802419D8 00000000 */ nop -/* 8B1A4C 802419DC 46800021 */ cvt.d.w $f0, $f0 -/* 8B1A50 802419E0 46220003 */ div.d $f0, $f0, $f2 -/* 8B1A54 802419E4 46200020 */ cvt.s.d $f0, $f0 -.L802419E8: -/* 8B1A58 802419E8 E4800018 */ swc1 $f0, 0x18($a0) -/* 8B1A5C 802419EC 24020010 */ addiu $v0, $zero, 0x10 -/* 8B1A60 802419F0 AE200074 */ sw $zero, 0x74($s1) -/* 8B1A64 802419F4 AE220070 */ sw $v0, 0x70($s1) -/* 8B1A68 802419F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B1A6C 802419FC 8FB20018 */ lw $s2, 0x18($sp) -/* 8B1A70 80241A00 8FB10014 */ lw $s1, 0x14($sp) -/* 8B1A74 80241A04 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1A78 80241A08 03E00008 */ jr $ra -/* 8B1A7C 80241A0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s new file mode 100644 index 0000000000..50debe542f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241964_8B19D4.s @@ -0,0 +1,49 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241964_8B19D4 +/* 8B19D4 80241964 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B19D8 80241968 AFB10014 */ sw $s1, 0x14($sp) +/* 8B19DC 8024196C 0080882D */ daddu $s1, $a0, $zero +/* 8B19E0 80241970 AFBF001C */ sw $ra, 0x1c($sp) +/* 8B19E4 80241974 AFB20018 */ sw $s2, 0x18($sp) +/* 8B19E8 80241978 AFB00010 */ sw $s0, 0x10($sp) +/* 8B19EC 8024197C 8E300148 */ lw $s0, 0x148($s1) +/* 8B19F0 80241980 86040008 */ lh $a0, 8($s0) +/* 8B19F4 80241984 0C00EABB */ jal get_npc_unsafe +/* 8B19F8 80241988 00A0902D */ daddu $s2, $a1, $zero +/* 8B19FC 8024198C 8E0300CC */ lw $v1, 0xcc($s0) +/* 8B1A00 80241990 8C630004 */ lw $v1, 4($v1) +/* 8B1A04 80241994 0040202D */ daddu $a0, $v0, $zero +/* 8B1A08 80241998 AC830028 */ sw $v1, 0x28($a0) +/* 8B1A0C 8024199C 8E0200D0 */ lw $v0, 0xd0($s0) +/* 8B1A10 802419A0 8C420014 */ lw $v0, 0x14($v0) +/* 8B1A14 802419A4 04410009 */ bgez $v0, .L802419CC +/* 8B1A18 802419A8 00000000 */ nop +/* 8B1A1C 802419AC C640000C */ lwc1 $f0, 0xc($s2) +/* 8B1A20 802419B0 3C018025 */ lui $at, 0x8025 +/* 8B1A24 802419B4 D4227D48 */ ldc1 $f2, 0x7d48($at) +/* 8B1A28 802419B8 46000021 */ cvt.d.s $f0, $f0 +/* 8B1A2C 802419BC 46220002 */ mul.d $f0, $f0, $f2 +/* 8B1A30 802419C0 00000000 */ nop +/* 8B1A34 802419C4 0809067A */ j .L802419E8 +/* 8B1A38 802419C8 46200020 */ cvt.s.d $f0, $f0 +.L802419CC: +/* 8B1A3C 802419CC 3C018025 */ lui $at, 0x8025 +/* 8B1A40 802419D0 D4227D50 */ ldc1 $f2, 0x7d50($at) +/* 8B1A44 802419D4 44820000 */ mtc1 $v0, $f0 +/* 8B1A48 802419D8 00000000 */ nop +/* 8B1A4C 802419DC 46800021 */ cvt.d.w $f0, $f0 +/* 8B1A50 802419E0 46220003 */ div.d $f0, $f0, $f2 +/* 8B1A54 802419E4 46200020 */ cvt.s.d $f0, $f0 +.L802419E8: +/* 8B1A58 802419E8 E4800018 */ swc1 $f0, 0x18($a0) +/* 8B1A5C 802419EC 24020010 */ addiu $v0, $zero, 0x10 +/* 8B1A60 802419F0 AE200074 */ sw $zero, 0x74($s1) +/* 8B1A64 802419F4 AE220070 */ sw $v0, 0x70($s1) +/* 8B1A68 802419F8 8FBF001C */ lw $ra, 0x1c($sp) +/* 8B1A6C 802419FC 8FB20018 */ lw $s2, 0x18($sp) +/* 8B1A70 80241A00 8FB10014 */ lw $s1, 0x14($sp) +/* 8B1A74 80241A04 8FB00010 */ lw $s0, 0x10($sp) +/* 8B1A78 80241A08 03E00008 */ jr $ra +/* 8B1A7C 80241A0C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10.s deleted file mode 100644 index cc1ce12d83..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A10 -/* 8B1A80 80241A10 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B1A84 80241A14 AFB3003C */ sw $s3, 0x3c($sp) -/* 8B1A88 80241A18 0080982D */ daddu $s3, $a0, $zero -/* 8B1A8C 80241A1C AFBF0044 */ sw $ra, 0x44($sp) -/* 8B1A90 80241A20 AFB40040 */ sw $s4, 0x40($sp) -/* 8B1A94 80241A24 AFB20038 */ sw $s2, 0x38($sp) -/* 8B1A98 80241A28 AFB10034 */ sw $s1, 0x34($sp) -/* 8B1A9C 80241A2C AFB00030 */ sw $s0, 0x30($sp) -/* 8B1AA0 80241A30 8E710148 */ lw $s1, 0x148($s3) -/* 8B1AA4 80241A34 00A0902D */ daddu $s2, $a1, $zero -/* 8B1AA8 80241A38 86240008 */ lh $a0, 8($s1) -/* 8B1AAC 80241A3C 0C00EABB */ jal get_npc_unsafe -/* 8B1AB0 80241A40 00C0A02D */ daddu $s4, $a2, $zero -/* 8B1AB4 80241A44 8E430008 */ lw $v1, 8($s2) -/* 8B1AB8 80241A48 0460003B */ bltz $v1, .L80241B38 -/* 8B1ABC 80241A4C 0040802D */ daddu $s0, $v0, $zero -/* 8B1AC0 80241A50 8E620074 */ lw $v0, 0x74($s3) -/* 8B1AC4 80241A54 1C400037 */ bgtz $v0, .L80241B34 -/* 8B1AC8 80241A58 2442FFFF */ addiu $v0, $v0, -1 -/* 8B1ACC 80241A5C 0280202D */ daddu $a0, $s4, $zero -/* 8B1AD0 80241A60 AE630074 */ sw $v1, 0x74($s3) -/* 8B1AD4 80241A64 AFA00010 */ sw $zero, 0x10($sp) -/* 8B1AD8 80241A68 8E460018 */ lw $a2, 0x18($s2) -/* 8B1ADC 80241A6C 8E47001C */ lw $a3, 0x1c($s2) -/* 8B1AE0 80241A70 0C01242D */ jal func_800490B4 -/* 8B1AE4 80241A74 0220282D */ daddu $a1, $s1, $zero -/* 8B1AE8 80241A78 1040002C */ beqz $v0, .L80241B2C -/* 8B1AEC 80241A7C 0000202D */ daddu $a0, $zero, $zero -/* 8B1AF0 80241A80 0200282D */ daddu $a1, $s0, $zero -/* 8B1AF4 80241A84 0000302D */ daddu $a2, $zero, $zero -/* 8B1AF8 80241A88 860300A8 */ lh $v1, 0xa8($s0) -/* 8B1AFC 80241A8C 3C013F80 */ lui $at, 0x3f80 -/* 8B1B00 80241A90 44810000 */ mtc1 $at, $f0 -/* 8B1B04 80241A94 3C014000 */ lui $at, 0x4000 -/* 8B1B08 80241A98 44811000 */ mtc1 $at, $f2 -/* 8B1B0C 80241A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8B1B10 80241AA0 44812000 */ mtc1 $at, $f4 -/* 8B1B14 80241AA4 2402000F */ addiu $v0, $zero, 0xf -/* 8B1B18 80241AA8 AFA2001C */ sw $v0, 0x1c($sp) -/* 8B1B1C 80241AAC 44833000 */ mtc1 $v1, $f6 -/* 8B1B20 80241AB0 00000000 */ nop -/* 8B1B24 80241AB4 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1B28 80241AB8 44073000 */ mfc1 $a3, $f6 -/* 8B1B2C 80241ABC 27A20028 */ addiu $v0, $sp, 0x28 -/* 8B1B30 80241AC0 AFA20020 */ sw $v0, 0x20($sp) -/* 8B1B34 80241AC4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B1B38 80241AC8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8B1B3C 80241ACC 0C01BFA4 */ jal fx_emote -/* 8B1B40 80241AD0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8B1B44 80241AD4 0200202D */ daddu $a0, $s0, $zero -/* 8B1B48 80241AD8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8B1B4C 80241ADC 0C012530 */ jal func_800494C0 -/* 8B1B50 80241AE0 3C060020 */ lui $a2, 0x20 -/* 8B1B54 80241AE4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8B1B58 80241AE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8B1B5C 80241AEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8B1B60 80241AF0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8B1B64 80241AF4 8C460028 */ lw $a2, 0x28($v0) -/* 8B1B68 80241AF8 0C00A720 */ jal atan2 -/* 8B1B6C 80241AFC 8C470030 */ lw $a3, 0x30($v0) -/* 8B1B70 80241B00 E600000C */ swc1 $f0, 0xc($s0) -/* 8B1B74 80241B04 8E220018 */ lw $v0, 0x18($s1) -/* 8B1B78 80241B08 9442002A */ lhu $v0, 0x2a($v0) -/* 8B1B7C 80241B0C 30420001 */ andi $v0, $v0, 1 -/* 8B1B80 80241B10 10400003 */ beqz $v0, .L80241B20 -/* 8B1B84 80241B14 2402000A */ addiu $v0, $zero, 0xa -/* 8B1B88 80241B18 080906FE */ j .L80241BF8 -/* 8B1B8C 80241B1C AE620070 */ sw $v0, 0x70($s3) -.L80241B20: -/* 8B1B90 80241B20 2402000C */ addiu $v0, $zero, 0xc -/* 8B1B94 80241B24 080906FE */ j .L80241BF8 -/* 8B1B98 80241B28 AE620070 */ sw $v0, 0x70($s3) -.L80241B2C: -/* 8B1B9C 80241B2C 8E620074 */ lw $v0, 0x74($s3) -/* 8B1BA0 80241B30 2442FFFF */ addiu $v0, $v0, -1 -.L80241B34: -/* 8B1BA4 80241B34 AE620074 */ sw $v0, 0x74($s3) -.L80241B38: -/* 8B1BA8 80241B38 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8B1BAC 80241B3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1BB0 80241B40 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8B1BB4 80241B44 C4460000 */ lwc1 $f6, ($v0) -/* 8B1BB8 80241B48 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1BBC 80241B4C 44063000 */ mfc1 $a2, $f6 -/* 8B1BC0 80241B50 C4460008 */ lwc1 $f6, 8($v0) -/* 8B1BC4 80241B54 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1BC8 80241B58 44073000 */ mfc1 $a3, $f6 -/* 8B1BCC 80241B5C 0C00A7B5 */ jal dist2D -/* 8B1BD0 80241B60 00000000 */ nop -/* 8B1BD4 80241B64 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8B1BD8 80241B68 4602003C */ c.lt.s $f0, $f2 -/* 8B1BDC 80241B6C 00000000 */ nop -/* 8B1BE0 80241B70 4500000E */ bc1f .L80241BAC -/* 8B1BE4 80241B74 00000000 */ nop -/* 8B1BE8 80241B78 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1BEC 80241B7C C4400000 */ lwc1 $f0, ($v0) -/* 8B1BF0 80241B80 46800020 */ cvt.s.w $f0, $f0 -/* 8B1BF4 80241B84 E6000038 */ swc1 $f0, 0x38($s0) -/* 8B1BF8 80241B88 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1BFC 80241B8C C4400008 */ lwc1 $f0, 8($v0) -/* 8B1C00 80241B90 46800020 */ cvt.s.w $f0, $f0 -/* 8B1C04 80241B94 E6000040 */ swc1 $f0, 0x40($s0) -/* 8B1C08 80241B98 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1C0C 80241B9C C440000C */ lwc1 $f0, 0xc($v0) -/* 8B1C10 80241BA0 46800020 */ cvt.s.w $f0, $f0 -/* 8B1C14 80241BA4 E600000C */ swc1 $f0, 0xc($s0) -/* 8B1C18 80241BA8 AE600070 */ sw $zero, 0x70($s3) -.L80241BAC: -/* 8B1C1C 80241BAC 8602008C */ lh $v0, 0x8c($s0) -/* 8B1C20 80241BB0 14400011 */ bnez $v0, .L80241BF8 -/* 8B1C24 80241BB4 00000000 */ nop -/* 8B1C28 80241BB8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8B1C2C 80241BBC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8B1C30 80241BC0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8B1C34 80241BC4 C4460000 */ lwc1 $f6, ($v0) -/* 8B1C38 80241BC8 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1C3C 80241BCC 44063000 */ mfc1 $a2, $f6 -/* 8B1C40 80241BD0 C4460008 */ lwc1 $f6, 8($v0) -/* 8B1C44 80241BD4 468031A0 */ cvt.s.w $f6, $f6 -/* 8B1C48 80241BD8 44073000 */ mfc1 $a3, $f6 -/* 8B1C4C 80241BDC 0C00A720 */ jal atan2 -/* 8B1C50 80241BE0 00000000 */ nop -/* 8B1C54 80241BE4 8E050018 */ lw $a1, 0x18($s0) -/* 8B1C58 80241BE8 44060000 */ mfc1 $a2, $f0 -/* 8B1C5C 80241BEC 0200202D */ daddu $a0, $s0, $zero -/* 8B1C60 80241BF0 0C00EA95 */ jal npc_move_heading -/* 8B1C64 80241BF4 AC86000C */ sw $a2, 0xc($a0) -.L80241BF8: -/* 8B1C68 80241BF8 8FBF0044 */ lw $ra, 0x44($sp) -/* 8B1C6C 80241BFC 8FB40040 */ lw $s4, 0x40($sp) -/* 8B1C70 80241C00 8FB3003C */ lw $s3, 0x3c($sp) -/* 8B1C74 80241C04 8FB20038 */ lw $s2, 0x38($sp) -/* 8B1C78 80241C08 8FB10034 */ lw $s1, 0x34($sp) -/* 8B1C7C 80241C0C 8FB00030 */ lw $s0, 0x30($sp) -/* 8B1C80 80241C10 03E00008 */ jr $ra -/* 8B1C84 80241C14 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s new file mode 100644 index 0000000000..55fb614bee --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241A10_8B1A80.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A10_8B1A80 +/* 8B1A80 80241A10 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8B1A84 80241A14 AFB3003C */ sw $s3, 0x3c($sp) +/* 8B1A88 80241A18 0080982D */ daddu $s3, $a0, $zero +/* 8B1A8C 80241A1C AFBF0044 */ sw $ra, 0x44($sp) +/* 8B1A90 80241A20 AFB40040 */ sw $s4, 0x40($sp) +/* 8B1A94 80241A24 AFB20038 */ sw $s2, 0x38($sp) +/* 8B1A98 80241A28 AFB10034 */ sw $s1, 0x34($sp) +/* 8B1A9C 80241A2C AFB00030 */ sw $s0, 0x30($sp) +/* 8B1AA0 80241A30 8E710148 */ lw $s1, 0x148($s3) +/* 8B1AA4 80241A34 00A0902D */ daddu $s2, $a1, $zero +/* 8B1AA8 80241A38 86240008 */ lh $a0, 8($s1) +/* 8B1AAC 80241A3C 0C00EABB */ jal get_npc_unsafe +/* 8B1AB0 80241A40 00C0A02D */ daddu $s4, $a2, $zero +/* 8B1AB4 80241A44 8E430008 */ lw $v1, 8($s2) +/* 8B1AB8 80241A48 0460003B */ bltz $v1, .L80241B38 +/* 8B1ABC 80241A4C 0040802D */ daddu $s0, $v0, $zero +/* 8B1AC0 80241A50 8E620074 */ lw $v0, 0x74($s3) +/* 8B1AC4 80241A54 1C400037 */ bgtz $v0, .L80241B34 +/* 8B1AC8 80241A58 2442FFFF */ addiu $v0, $v0, -1 +/* 8B1ACC 80241A5C 0280202D */ daddu $a0, $s4, $zero +/* 8B1AD0 80241A60 AE630074 */ sw $v1, 0x74($s3) +/* 8B1AD4 80241A64 AFA00010 */ sw $zero, 0x10($sp) +/* 8B1AD8 80241A68 8E460018 */ lw $a2, 0x18($s2) +/* 8B1ADC 80241A6C 8E47001C */ lw $a3, 0x1c($s2) +/* 8B1AE0 80241A70 0C01242D */ jal func_800490B4 +/* 8B1AE4 80241A74 0220282D */ daddu $a1, $s1, $zero +/* 8B1AE8 80241A78 1040002C */ beqz $v0, .L80241B2C +/* 8B1AEC 80241A7C 0000202D */ daddu $a0, $zero, $zero +/* 8B1AF0 80241A80 0200282D */ daddu $a1, $s0, $zero +/* 8B1AF4 80241A84 0000302D */ daddu $a2, $zero, $zero +/* 8B1AF8 80241A88 860300A8 */ lh $v1, 0xa8($s0) +/* 8B1AFC 80241A8C 3C013F80 */ lui $at, 0x3f80 +/* 8B1B00 80241A90 44810000 */ mtc1 $at, $f0 +/* 8B1B04 80241A94 3C014000 */ lui $at, 0x4000 +/* 8B1B08 80241A98 44811000 */ mtc1 $at, $f2 +/* 8B1B0C 80241A9C 3C01C1A0 */ lui $at, 0xc1a0 +/* 8B1B10 80241AA0 44812000 */ mtc1 $at, $f4 +/* 8B1B14 80241AA4 2402000F */ addiu $v0, $zero, 0xf +/* 8B1B18 80241AA8 AFA2001C */ sw $v0, 0x1c($sp) +/* 8B1B1C 80241AAC 44833000 */ mtc1 $v1, $f6 +/* 8B1B20 80241AB0 00000000 */ nop +/* 8B1B24 80241AB4 468031A0 */ cvt.s.w $f6, $f6 +/* 8B1B28 80241AB8 44073000 */ mfc1 $a3, $f6 +/* 8B1B2C 80241ABC 27A20028 */ addiu $v0, $sp, 0x28 +/* 8B1B30 80241AC0 AFA20020 */ sw $v0, 0x20($sp) +/* 8B1B34 80241AC4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8B1B38 80241AC8 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8B1B3C 80241ACC 0C01BFA4 */ jal fx_emote +/* 8B1B40 80241AD0 E7A40018 */ swc1 $f4, 0x18($sp) +/* 8B1B44 80241AD4 0200202D */ daddu $a0, $s0, $zero +/* 8B1B48 80241AD8 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 8B1B4C 80241ADC 0C012530 */ jal func_800494C0 +/* 8B1B50 80241AE0 3C060020 */ lui $a2, 0x20 +/* 8B1B54 80241AE4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8B1B58 80241AE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8B1B5C 80241AEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8B1B60 80241AF0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8B1B64 80241AF4 8C460028 */ lw $a2, 0x28($v0) +/* 8B1B68 80241AF8 0C00A720 */ jal atan2 +/* 8B1B6C 80241AFC 8C470030 */ lw $a3, 0x30($v0) +/* 8B1B70 80241B00 E600000C */ swc1 $f0, 0xc($s0) +/* 8B1B74 80241B04 8E220018 */ lw $v0, 0x18($s1) +/* 8B1B78 80241B08 9442002A */ lhu $v0, 0x2a($v0) +/* 8B1B7C 80241B0C 30420001 */ andi $v0, $v0, 1 +/* 8B1B80 80241B10 10400003 */ beqz $v0, .L80241B20 +/* 8B1B84 80241B14 2402000A */ addiu $v0, $zero, 0xa +/* 8B1B88 80241B18 080906FE */ j .L80241BF8 +/* 8B1B8C 80241B1C AE620070 */ sw $v0, 0x70($s3) +.L80241B20: +/* 8B1B90 80241B20 2402000C */ addiu $v0, $zero, 0xc +/* 8B1B94 80241B24 080906FE */ j .L80241BF8 +/* 8B1B98 80241B28 AE620070 */ sw $v0, 0x70($s3) +.L80241B2C: +/* 8B1B9C 80241B2C 8E620074 */ lw $v0, 0x74($s3) +/* 8B1BA0 80241B30 2442FFFF */ addiu $v0, $v0, -1 +.L80241B34: +/* 8B1BA4 80241B34 AE620074 */ sw $v0, 0x74($s3) +.L80241B38: +/* 8B1BA8 80241B38 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8B1BAC 80241B3C 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8B1BB0 80241B40 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8B1BB4 80241B44 C4460000 */ lwc1 $f6, ($v0) +/* 8B1BB8 80241B48 468031A0 */ cvt.s.w $f6, $f6 +/* 8B1BBC 80241B4C 44063000 */ mfc1 $a2, $f6 +/* 8B1BC0 80241B50 C4460008 */ lwc1 $f6, 8($v0) +/* 8B1BC4 80241B54 468031A0 */ cvt.s.w $f6, $f6 +/* 8B1BC8 80241B58 44073000 */ mfc1 $a3, $f6 +/* 8B1BCC 80241B5C 0C00A7B5 */ jal dist2D +/* 8B1BD0 80241B60 00000000 */ nop +/* 8B1BD4 80241B64 C6020018 */ lwc1 $f2, 0x18($s0) +/* 8B1BD8 80241B68 4602003C */ c.lt.s $f0, $f2 +/* 8B1BDC 80241B6C 00000000 */ nop +/* 8B1BE0 80241B70 4500000E */ bc1f .L80241BAC +/* 8B1BE4 80241B74 00000000 */ nop +/* 8B1BE8 80241B78 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8B1BEC 80241B7C C4400000 */ lwc1 $f0, ($v0) +/* 8B1BF0 80241B80 46800020 */ cvt.s.w $f0, $f0 +/* 8B1BF4 80241B84 E6000038 */ swc1 $f0, 0x38($s0) +/* 8B1BF8 80241B88 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8B1BFC 80241B8C C4400008 */ lwc1 $f0, 8($v0) +/* 8B1C00 80241B90 46800020 */ cvt.s.w $f0, $f0 +/* 8B1C04 80241B94 E6000040 */ swc1 $f0, 0x40($s0) +/* 8B1C08 80241B98 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8B1C0C 80241B9C C440000C */ lwc1 $f0, 0xc($v0) +/* 8B1C10 80241BA0 46800020 */ cvt.s.w $f0, $f0 +/* 8B1C14 80241BA4 E600000C */ swc1 $f0, 0xc($s0) +/* 8B1C18 80241BA8 AE600070 */ sw $zero, 0x70($s3) +.L80241BAC: +/* 8B1C1C 80241BAC 8602008C */ lh $v0, 0x8c($s0) +/* 8B1C20 80241BB0 14400011 */ bnez $v0, .L80241BF8 +/* 8B1C24 80241BB4 00000000 */ nop +/* 8B1C28 80241BB8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8B1C2C 80241BBC 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8B1C30 80241BC0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8B1C34 80241BC4 C4460000 */ lwc1 $f6, ($v0) +/* 8B1C38 80241BC8 468031A0 */ cvt.s.w $f6, $f6 +/* 8B1C3C 80241BCC 44063000 */ mfc1 $a2, $f6 +/* 8B1C40 80241BD0 C4460008 */ lwc1 $f6, 8($v0) +/* 8B1C44 80241BD4 468031A0 */ cvt.s.w $f6, $f6 +/* 8B1C48 80241BD8 44073000 */ mfc1 $a3, $f6 +/* 8B1C4C 80241BDC 0C00A720 */ jal atan2 +/* 8B1C50 80241BE0 00000000 */ nop +/* 8B1C54 80241BE4 8E050018 */ lw $a1, 0x18($s0) +/* 8B1C58 80241BE8 44060000 */ mfc1 $a2, $f0 +/* 8B1C5C 80241BEC 0200202D */ daddu $a0, $s0, $zero +/* 8B1C60 80241BF0 0C00EA95 */ jal npc_move_heading +/* 8B1C64 80241BF4 AC86000C */ sw $a2, 0xc($a0) +.L80241BF8: +/* 8B1C68 80241BF8 8FBF0044 */ lw $ra, 0x44($sp) +/* 8B1C6C 80241BFC 8FB40040 */ lw $s4, 0x40($sp) +/* 8B1C70 80241C00 8FB3003C */ lw $s3, 0x3c($sp) +/* 8B1C74 80241C04 8FB20038 */ lw $s2, 0x38($sp) +/* 8B1C78 80241C08 8FB10034 */ lw $s1, 0x34($sp) +/* 8B1C7C 80241C0C 8FB00030 */ lw $s0, 0x30($sp) +/* 8B1C80 80241C10 03E00008 */ jr $ra +/* 8B1C84 80241C14 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18.s deleted file mode 100644 index be6df11cad..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C18 -/* 8B1C88 80241C18 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8B1C8C 80241C1C AFB40040 */ sw $s4, 0x40($sp) -/* 8B1C90 80241C20 0080A02D */ daddu $s4, $a0, $zero -/* 8B1C94 80241C24 AFBF0048 */ sw $ra, 0x48($sp) -/* 8B1C98 80241C28 AFB50044 */ sw $s5, 0x44($sp) -/* 8B1C9C 80241C2C AFB3003C */ sw $s3, 0x3c($sp) -/* 8B1CA0 80241C30 AFB20038 */ sw $s2, 0x38($sp) -/* 8B1CA4 80241C34 AFB10034 */ sw $s1, 0x34($sp) -/* 8B1CA8 80241C38 AFB00030 */ sw $s0, 0x30($sp) -/* 8B1CAC 80241C3C 8E920148 */ lw $s2, 0x148($s4) -/* 8B1CB0 80241C40 86440008 */ lh $a0, 8($s2) -/* 8B1CB4 80241C44 8E90000C */ lw $s0, 0xc($s4) -/* 8B1CB8 80241C48 0C00EABB */ jal get_npc_unsafe -/* 8B1CBC 80241C4C 00A0882D */ daddu $s1, $a1, $zero -/* 8B1CC0 80241C50 0280202D */ daddu $a0, $s4, $zero -/* 8B1CC4 80241C54 8E050000 */ lw $a1, ($s0) -/* 8B1CC8 80241C58 0C0B1EAF */ jal get_variable -/* 8B1CCC 80241C5C 0040802D */ daddu $s0, $v0, $zero -/* 8B1CD0 80241C60 AFA00010 */ sw $zero, 0x10($sp) -/* 8B1CD4 80241C64 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1CD8 80241C68 8C630030 */ lw $v1, 0x30($v1) -/* 8B1CDC 80241C6C AFA30014 */ sw $v1, 0x14($sp) -/* 8B1CE0 80241C70 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1CE4 80241C74 8C63001C */ lw $v1, 0x1c($v1) -/* 8B1CE8 80241C78 AFA30018 */ sw $v1, 0x18($sp) -/* 8B1CEC 80241C7C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1CF0 80241C80 8C630024 */ lw $v1, 0x24($v1) -/* 8B1CF4 80241C84 AFA3001C */ sw $v1, 0x1c($sp) -/* 8B1CF8 80241C88 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1CFC 80241C8C 8C630028 */ lw $v1, 0x28($v1) -/* 8B1D00 80241C90 27B50010 */ addiu $s5, $sp, 0x10 -/* 8B1D04 80241C94 AFA30020 */ sw $v1, 0x20($sp) -/* 8B1D08 80241C98 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8B1D0C 80241C9C 3C014282 */ lui $at, 0x4282 -/* 8B1D10 80241CA0 44810000 */ mtc1 $at, $f0 -/* 8B1D14 80241CA4 8C63002C */ lw $v1, 0x2c($v1) -/* 8B1D18 80241CA8 0040982D */ daddu $s3, $v0, $zero -/* 8B1D1C 80241CAC E7A00028 */ swc1 $f0, 0x28($sp) -/* 8B1D20 80241CB0 A7A0002C */ sh $zero, 0x2c($sp) -/* 8B1D24 80241CB4 16200005 */ bnez $s1, .L80241CCC -/* 8B1D28 80241CB8 AFA30024 */ sw $v1, 0x24($sp) -/* 8B1D2C 80241CBC 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8B1D30 80241CC0 30420004 */ andi $v0, $v0, 4 -/* 8B1D34 80241CC4 1040002F */ beqz $v0, .L80241D84 -/* 8B1D38 80241CC8 00000000 */ nop -.L80241CCC: -/* 8B1D3C 80241CCC AE800070 */ sw $zero, 0x70($s4) -/* 8B1D40 80241CD0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8B1D44 80241CD4 A600008E */ sh $zero, 0x8e($s0) -/* 8B1D48 80241CD8 8E4200CC */ lw $v0, 0xcc($s2) -/* 8B1D4C 80241CDC 4600008D */ trunc.w.s $f2, $f0 -/* 8B1D50 80241CE0 E642006C */ swc1 $f2, 0x6c($s2) -/* 8B1D54 80241CE4 8C420000 */ lw $v0, ($v0) -/* 8B1D58 80241CE8 8E030000 */ lw $v1, ($s0) -/* 8B1D5C 80241CEC AE020028 */ sw $v0, 0x28($s0) -/* 8B1D60 80241CF0 2402F7FF */ addiu $v0, $zero, -0x801 -/* 8B1D64 80241CF4 00621824 */ and $v1, $v1, $v0 -/* 8B1D68 80241CF8 AE030000 */ sw $v1, ($s0) -/* 8B1D6C 80241CFC 8E4200D0 */ lw $v0, 0xd0($s2) -/* 8B1D70 80241D00 8C420034 */ lw $v0, 0x34($v0) -/* 8B1D74 80241D04 54400005 */ bnel $v0, $zero, .L80241D1C -/* 8B1D78 80241D08 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8B1D7C 80241D0C 34620200 */ ori $v0, $v1, 0x200 -/* 8B1D80 80241D10 2403FFF7 */ addiu $v1, $zero, -9 -/* 8B1D84 80241D14 08090749 */ j .L80241D24 -/* 8B1D88 80241D18 00431024 */ and $v0, $v0, $v1 -.L80241D1C: -/* 8B1D8C 80241D1C 00621024 */ and $v0, $v1, $v0 -/* 8B1D90 80241D20 34420008 */ ori $v0, $v0, 8 -.L80241D24: -/* 8B1D94 80241D24 AE020000 */ sw $v0, ($s0) -/* 8B1D98 80241D28 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8B1D9C 80241D2C 30420004 */ andi $v0, $v0, 4 -/* 8B1DA0 80241D30 10400009 */ beqz $v0, .L80241D58 -/* 8B1DA4 80241D34 24020063 */ addiu $v0, $zero, 0x63 -/* 8B1DA8 80241D38 AE820070 */ sw $v0, 0x70($s4) -/* 8B1DAC 80241D3C 2402000F */ addiu $v0, $zero, 0xf -/* 8B1DB0 80241D40 AE820074 */ sw $v0, 0x74($s4) -/* 8B1DB4 80241D44 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8B1DB8 80241D48 2403FFFB */ addiu $v1, $zero, -5 -/* 8B1DBC 80241D4C 00431024 */ and $v0, $v0, $v1 -/* 8B1DC0 80241D50 08090761 */ j .L80241D84 -/* 8B1DC4 80241D54 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241D58: -/* 8B1DC8 80241D58 8E420000 */ lw $v0, ($s2) -/* 8B1DCC 80241D5C 3C034000 */ lui $v1, 0x4000 -/* 8B1DD0 80241D60 00431024 */ and $v0, $v0, $v1 -/* 8B1DD4 80241D64 10400007 */ beqz $v0, .L80241D84 -/* 8B1DD8 80241D68 3C03BFFF */ lui $v1, 0xbfff -/* 8B1DDC 80241D6C 2402000C */ addiu $v0, $zero, 0xc -/* 8B1DE0 80241D70 AE820070 */ sw $v0, 0x70($s4) -/* 8B1DE4 80241D74 8E420000 */ lw $v0, ($s2) -/* 8B1DE8 80241D78 3463FFFF */ ori $v1, $v1, 0xffff -/* 8B1DEC 80241D7C 00431024 */ and $v0, $v0, $v1 -/* 8B1DF0 80241D80 AE420000 */ sw $v0, ($s2) -.L80241D84: -/* 8B1DF4 80241D84 8E830070 */ lw $v1, 0x70($s4) -/* 8B1DF8 80241D88 2C620064 */ sltiu $v0, $v1, 0x64 -/* 8B1DFC 80241D8C 10400036 */ beqz $v0, .L80241E68 -/* 8B1E00 80241D90 00031080 */ sll $v0, $v1, 2 -/* 8B1E04 80241D94 3C018025 */ lui $at, 0x8025 -/* 8B1E08 80241D98 00220821 */ addu $at, $at, $v0 -/* 8B1E0C 80241D9C 8C227D58 */ lw $v0, 0x7d58($at) -/* 8B1E10 80241DA0 00400008 */ jr $v0 -/* 8B1E14 80241DA4 00000000 */ nop -/* 8B1E18 80241DA8 0280202D */ daddu $a0, $s4, $zero -/* 8B1E1C 80241DAC 0260282D */ daddu $a1, $s3, $zero -/* 8B1E20 80241DB0 0C090509 */ jal func_80241424 -/* 8B1E24 80241DB4 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E28 80241DB8 0280202D */ daddu $a0, $s4, $zero -/* 8B1E2C 80241DBC 0260282D */ daddu $a1, $s3, $zero -/* 8B1E30 80241DC0 0C090536 */ jal func_802414D8 -/* 8B1E34 80241DC4 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E38 80241DC8 0809079A */ j .L80241E68 -/* 8B1E3C 80241DCC 00000000 */ nop -/* 8B1E40 80241DD0 0280202D */ daddu $a0, $s4, $zero -/* 8B1E44 80241DD4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E48 80241DD8 0C09057E */ jal func_802415F8 -/* 8B1E4C 80241DDC 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E50 80241DE0 0280202D */ daddu $a0, $s4, $zero -/* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero -/* 8B1E58 80241DE8 0C090596 */ jal func_80241658 -/* 8B1E5C 80241DEC 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E60 80241DF0 0809079A */ j .L80241E68 -/* 8B1E64 80241DF4 00000000 */ nop -/* 8B1E68 80241DF8 0280202D */ daddu $a0, $s4, $zero -/* 8B1E6C 80241DFC 0260282D */ daddu $a1, $s3, $zero -/* 8B1E70 80241E00 0C0905B4 */ jal func_802416D0 -/* 8B1E74 80241E04 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E78 80241E08 0280202D */ daddu $a0, $s4, $zero -/* 8B1E7C 80241E0C 0260282D */ daddu $a1, $s3, $zero -/* 8B1E80 80241E10 0C090600 */ jal func_80241800 -/* 8B1E84 80241E14 02A0302D */ daddu $a2, $s5, $zero -/* 8B1E88 80241E18 0809079A */ j .L80241E68 -/* 8B1E8C 80241E1C 00000000 */ nop -/* 8B1E90 80241E20 0280202D */ daddu $a0, $s4, $zero -/* 8B1E94 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8B1E98 80241E28 0C090647 */ jal func_8024191C -/* 8B1E9C 80241E2C 02A0302D */ daddu $a2, $s5, $zero -/* 8B1EA0 80241E30 0809079A */ j .L80241E68 -/* 8B1EA4 80241E34 00000000 */ nop -/* 8B1EA8 80241E38 0280202D */ daddu $a0, $s4, $zero -/* 8B1EAC 80241E3C 0260282D */ daddu $a1, $s3, $zero -/* 8B1EB0 80241E40 0C090659 */ jal func_80241964 -/* 8B1EB4 80241E44 02A0302D */ daddu $a2, $s5, $zero -/* 8B1EB8 80241E48 0280202D */ daddu $a0, $s4, $zero -/* 8B1EBC 80241E4C 0260282D */ daddu $a1, $s3, $zero -/* 8B1EC0 80241E50 0C090684 */ jal func_80241A10 -/* 8B1EC4 80241E54 02A0302D */ daddu $a2, $s5, $zero -/* 8B1EC8 80241E58 0809079A */ j .L80241E68 -/* 8B1ECC 80241E5C 00000000 */ nop -/* 8B1ED0 80241E60 0C0129CF */ jal func_8004A73C -/* 8B1ED4 80241E64 0280202D */ daddu $a0, $s4, $zero -.L80241E68: -/* 8B1ED8 80241E68 8FBF0048 */ lw $ra, 0x48($sp) -/* 8B1EDC 80241E6C 8FB50044 */ lw $s5, 0x44($sp) -/* 8B1EE0 80241E70 8FB40040 */ lw $s4, 0x40($sp) -/* 8B1EE4 80241E74 8FB3003C */ lw $s3, 0x3c($sp) -/* 8B1EE8 80241E78 8FB20038 */ lw $s2, 0x38($sp) -/* 8B1EEC 80241E7C 8FB10034 */ lw $s1, 0x34($sp) -/* 8B1EF0 80241E80 8FB00030 */ lw $s0, 0x30($sp) -/* 8B1EF4 80241E84 0000102D */ daddu $v0, $zero, $zero -/* 8B1EF8 80241E88 03E00008 */ jr $ra -/* 8B1EFC 80241E8C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s new file mode 100644 index 0000000000..270f27cac6 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241C18_8B1C88.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C18_8B1C88 +/* 8B1C88 80241C18 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 8B1C8C 80241C1C AFB40040 */ sw $s4, 0x40($sp) +/* 8B1C90 80241C20 0080A02D */ daddu $s4, $a0, $zero +/* 8B1C94 80241C24 AFBF0048 */ sw $ra, 0x48($sp) +/* 8B1C98 80241C28 AFB50044 */ sw $s5, 0x44($sp) +/* 8B1C9C 80241C2C AFB3003C */ sw $s3, 0x3c($sp) +/* 8B1CA0 80241C30 AFB20038 */ sw $s2, 0x38($sp) +/* 8B1CA4 80241C34 AFB10034 */ sw $s1, 0x34($sp) +/* 8B1CA8 80241C38 AFB00030 */ sw $s0, 0x30($sp) +/* 8B1CAC 80241C3C 8E920148 */ lw $s2, 0x148($s4) +/* 8B1CB0 80241C40 86440008 */ lh $a0, 8($s2) +/* 8B1CB4 80241C44 8E90000C */ lw $s0, 0xc($s4) +/* 8B1CB8 80241C48 0C00EABB */ jal get_npc_unsafe +/* 8B1CBC 80241C4C 00A0882D */ daddu $s1, $a1, $zero +/* 8B1CC0 80241C50 0280202D */ daddu $a0, $s4, $zero +/* 8B1CC4 80241C54 8E050000 */ lw $a1, ($s0) +/* 8B1CC8 80241C58 0C0B1EAF */ jal get_variable +/* 8B1CCC 80241C5C 0040802D */ daddu $s0, $v0, $zero +/* 8B1CD0 80241C60 AFA00010 */ sw $zero, 0x10($sp) +/* 8B1CD4 80241C64 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8B1CD8 80241C68 8C630030 */ lw $v1, 0x30($v1) +/* 8B1CDC 80241C6C AFA30014 */ sw $v1, 0x14($sp) +/* 8B1CE0 80241C70 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8B1CE4 80241C74 8C63001C */ lw $v1, 0x1c($v1) +/* 8B1CE8 80241C78 AFA30018 */ sw $v1, 0x18($sp) +/* 8B1CEC 80241C7C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8B1CF0 80241C80 8C630024 */ lw $v1, 0x24($v1) +/* 8B1CF4 80241C84 AFA3001C */ sw $v1, 0x1c($sp) +/* 8B1CF8 80241C88 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8B1CFC 80241C8C 8C630028 */ lw $v1, 0x28($v1) +/* 8B1D00 80241C90 27B50010 */ addiu $s5, $sp, 0x10 +/* 8B1D04 80241C94 AFA30020 */ sw $v1, 0x20($sp) +/* 8B1D08 80241C98 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8B1D0C 80241C9C 3C014282 */ lui $at, 0x4282 +/* 8B1D10 80241CA0 44810000 */ mtc1 $at, $f0 +/* 8B1D14 80241CA4 8C63002C */ lw $v1, 0x2c($v1) +/* 8B1D18 80241CA8 0040982D */ daddu $s3, $v0, $zero +/* 8B1D1C 80241CAC E7A00028 */ swc1 $f0, 0x28($sp) +/* 8B1D20 80241CB0 A7A0002C */ sh $zero, 0x2c($sp) +/* 8B1D24 80241CB4 16200005 */ bnez $s1, .L80241CCC +/* 8B1D28 80241CB8 AFA30024 */ sw $v1, 0x24($sp) +/* 8B1D2C 80241CBC 8E4200B0 */ lw $v0, 0xb0($s2) +/* 8B1D30 80241CC0 30420004 */ andi $v0, $v0, 4 +/* 8B1D34 80241CC4 1040002F */ beqz $v0, .L80241D84 +/* 8B1D38 80241CC8 00000000 */ nop +.L80241CCC: +/* 8B1D3C 80241CCC AE800070 */ sw $zero, 0x70($s4) +/* 8B1D40 80241CD0 C600000C */ lwc1 $f0, 0xc($s0) +/* 8B1D44 80241CD4 A600008E */ sh $zero, 0x8e($s0) +/* 8B1D48 80241CD8 8E4200CC */ lw $v0, 0xcc($s2) +/* 8B1D4C 80241CDC 4600008D */ trunc.w.s $f2, $f0 +/* 8B1D50 80241CE0 E642006C */ swc1 $f2, 0x6c($s2) +/* 8B1D54 80241CE4 8C420000 */ lw $v0, ($v0) +/* 8B1D58 80241CE8 8E030000 */ lw $v1, ($s0) +/* 8B1D5C 80241CEC AE020028 */ sw $v0, 0x28($s0) +/* 8B1D60 80241CF0 2402F7FF */ addiu $v0, $zero, -0x801 +/* 8B1D64 80241CF4 00621824 */ and $v1, $v1, $v0 +/* 8B1D68 80241CF8 AE030000 */ sw $v1, ($s0) +/* 8B1D6C 80241CFC 8E4200D0 */ lw $v0, 0xd0($s2) +/* 8B1D70 80241D00 8C420034 */ lw $v0, 0x34($v0) +/* 8B1D74 80241D04 54400005 */ bnel $v0, $zero, .L80241D1C +/* 8B1D78 80241D08 2402FDFF */ addiu $v0, $zero, -0x201 +/* 8B1D7C 80241D0C 34620200 */ ori $v0, $v1, 0x200 +/* 8B1D80 80241D10 2403FFF7 */ addiu $v1, $zero, -9 +/* 8B1D84 80241D14 08090749 */ j .L80241D24 +/* 8B1D88 80241D18 00431024 */ and $v0, $v0, $v1 +.L80241D1C: +/* 8B1D8C 80241D1C 00621024 */ and $v0, $v1, $v0 +/* 8B1D90 80241D20 34420008 */ ori $v0, $v0, 8 +.L80241D24: +/* 8B1D94 80241D24 AE020000 */ sw $v0, ($s0) +/* 8B1D98 80241D28 8E4200B0 */ lw $v0, 0xb0($s2) +/* 8B1D9C 80241D2C 30420004 */ andi $v0, $v0, 4 +/* 8B1DA0 80241D30 10400009 */ beqz $v0, .L80241D58 +/* 8B1DA4 80241D34 24020063 */ addiu $v0, $zero, 0x63 +/* 8B1DA8 80241D38 AE820070 */ sw $v0, 0x70($s4) +/* 8B1DAC 80241D3C 2402000F */ addiu $v0, $zero, 0xf +/* 8B1DB0 80241D40 AE820074 */ sw $v0, 0x74($s4) +/* 8B1DB4 80241D44 8E4200B0 */ lw $v0, 0xb0($s2) +/* 8B1DB8 80241D48 2403FFFB */ addiu $v1, $zero, -5 +/* 8B1DBC 80241D4C 00431024 */ and $v0, $v0, $v1 +/* 8B1DC0 80241D50 08090761 */ j .L80241D84 +/* 8B1DC4 80241D54 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241D58: +/* 8B1DC8 80241D58 8E420000 */ lw $v0, ($s2) +/* 8B1DCC 80241D5C 3C034000 */ lui $v1, 0x4000 +/* 8B1DD0 80241D60 00431024 */ and $v0, $v0, $v1 +/* 8B1DD4 80241D64 10400007 */ beqz $v0, .L80241D84 +/* 8B1DD8 80241D68 3C03BFFF */ lui $v1, 0xbfff +/* 8B1DDC 80241D6C 2402000C */ addiu $v0, $zero, 0xc +/* 8B1DE0 80241D70 AE820070 */ sw $v0, 0x70($s4) +/* 8B1DE4 80241D74 8E420000 */ lw $v0, ($s2) +/* 8B1DE8 80241D78 3463FFFF */ ori $v1, $v1, 0xffff +/* 8B1DEC 80241D7C 00431024 */ and $v0, $v0, $v1 +/* 8B1DF0 80241D80 AE420000 */ sw $v0, ($s2) +.L80241D84: +/* 8B1DF4 80241D84 8E830070 */ lw $v1, 0x70($s4) +/* 8B1DF8 80241D88 2C620064 */ sltiu $v0, $v1, 0x64 +/* 8B1DFC 80241D8C 10400036 */ beqz $v0, .L80241E68 +/* 8B1E00 80241D90 00031080 */ sll $v0, $v1, 2 +/* 8B1E04 80241D94 3C018025 */ lui $at, 0x8025 +/* 8B1E08 80241D98 00220821 */ addu $at, $at, $v0 +/* 8B1E0C 80241D9C 8C227D58 */ lw $v0, 0x7d58($at) +/* 8B1E10 80241DA0 00400008 */ jr $v0 +/* 8B1E14 80241DA4 00000000 */ nop +/* 8B1E18 80241DA8 0280202D */ daddu $a0, $s4, $zero +/* 8B1E1C 80241DAC 0260282D */ daddu $a1, $s3, $zero +/* 8B1E20 80241DB0 0C090509 */ jal func_80241424_8B1494 +/* 8B1E24 80241DB4 02A0302D */ daddu $a2, $s5, $zero +/* 8B1E28 80241DB8 0280202D */ daddu $a0, $s4, $zero +/* 8B1E2C 80241DBC 0260282D */ daddu $a1, $s3, $zero +/* 8B1E30 80241DC0 0C090536 */ jal func_802414D8_8B1548 +/* 8B1E34 80241DC4 02A0302D */ daddu $a2, $s5, $zero +/* 8B1E38 80241DC8 0809079A */ j .L80241E68 +/* 8B1E3C 80241DCC 00000000 */ nop +/* 8B1E40 80241DD0 0280202D */ daddu $a0, $s4, $zero +/* 8B1E44 80241DD4 0260282D */ daddu $a1, $s3, $zero +/* 8B1E48 80241DD8 0C09057E */ jal func_802415F8_8B1668 +/* 8B1E4C 80241DDC 02A0302D */ daddu $a2, $s5, $zero +/* 8B1E50 80241DE0 0280202D */ daddu $a0, $s4, $zero +/* 8B1E54 80241DE4 0260282D */ daddu $a1, $s3, $zero +/* 8B1E58 80241DE8 0C090596 */ jal func_80241658_8B16C8 +/* 8B1E5C 80241DEC 02A0302D */ daddu $a2, $s5, $zero +/* 8B1E60 80241DF0 0809079A */ j .L80241E68 +/* 8B1E64 80241DF4 00000000 */ nop +/* 8B1E68 80241DF8 0280202D */ daddu $a0, $s4, $zero +/* 8B1E6C 80241DFC 0260282D */ daddu $a1, $s3, $zero +/* 8B1E70 80241E00 0C0905B4 */ jal func_802416D0_8B1740 +/* 8B1E74 80241E04 02A0302D */ daddu $a2, $s5, $zero +/* 8B1E78 80241E08 0280202D */ daddu $a0, $s4, $zero +/* 8B1E7C 80241E0C 0260282D */ daddu $a1, $s3, $zero +/* 8B1E80 80241E10 0C090600 */ jal func_80241800_8B1870 +/* 8B1E84 80241E14 02A0302D */ daddu $a2, $s5, $zero +/* 8B1E88 80241E18 0809079A */ j .L80241E68 +/* 8B1E8C 80241E1C 00000000 */ nop +/* 8B1E90 80241E20 0280202D */ daddu $a0, $s4, $zero +/* 8B1E94 80241E24 0260282D */ daddu $a1, $s3, $zero +/* 8B1E98 80241E28 0C090647 */ jal func_8024191C_8B198C +/* 8B1E9C 80241E2C 02A0302D */ daddu $a2, $s5, $zero +/* 8B1EA0 80241E30 0809079A */ j .L80241E68 +/* 8B1EA4 80241E34 00000000 */ nop +/* 8B1EA8 80241E38 0280202D */ daddu $a0, $s4, $zero +/* 8B1EAC 80241E3C 0260282D */ daddu $a1, $s3, $zero +/* 8B1EB0 80241E40 0C090659 */ jal func_80241964_8B19D4 +/* 8B1EB4 80241E44 02A0302D */ daddu $a2, $s5, $zero +/* 8B1EB8 80241E48 0280202D */ daddu $a0, $s4, $zero +/* 8B1EBC 80241E4C 0260282D */ daddu $a1, $s3, $zero +/* 8B1EC0 80241E50 0C090684 */ jal func_80241A10_8B1A80 +/* 8B1EC4 80241E54 02A0302D */ daddu $a2, $s5, $zero +/* 8B1EC8 80241E58 0809079A */ j .L80241E68 +/* 8B1ECC 80241E5C 00000000 */ nop +/* 8B1ED0 80241E60 0C0129CF */ jal func_8004A73C +/* 8B1ED4 80241E64 0280202D */ daddu $a0, $s4, $zero +.L80241E68: +/* 8B1ED8 80241E68 8FBF0048 */ lw $ra, 0x48($sp) +/* 8B1EDC 80241E6C 8FB50044 */ lw $s5, 0x44($sp) +/* 8B1EE0 80241E70 8FB40040 */ lw $s4, 0x40($sp) +/* 8B1EE4 80241E74 8FB3003C */ lw $s3, 0x3c($sp) +/* 8B1EE8 80241E78 8FB20038 */ lw $s2, 0x38($sp) +/* 8B1EEC 80241E7C 8FB10034 */ lw $s1, 0x34($sp) +/* 8B1EF0 80241E80 8FB00030 */ lw $s0, 0x30($sp) +/* 8B1EF4 80241E84 0000102D */ daddu $v0, $zero, $zero +/* 8B1EF8 80241E88 03E00008 */ jr $ra +/* 8B1EFC 80241E8C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90.s deleted file mode 100644 index 5147cceb08..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E90 -/* 8B1F00 80241E90 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8B1F04 80241E94 AFB20018 */ sw $s2, 0x18($sp) -/* 8B1F08 80241E98 0080902D */ daddu $s2, $a0, $zero -/* 8B1F0C 80241E9C AFB10014 */ sw $s1, 0x14($sp) -/* 8B1F10 80241EA0 00A0882D */ daddu $s1, $a1, $zero -/* 8B1F14 80241EA4 AFBF0024 */ sw $ra, 0x24($sp) -/* 8B1F18 80241EA8 AFB40020 */ sw $s4, 0x20($sp) -/* 8B1F1C 80241EAC AFB3001C */ sw $s3, 0x1c($sp) -/* 8B1F20 80241EB0 AFB00010 */ sw $s0, 0x10($sp) -/* 8B1F24 80241EB4 8E50000C */ lw $s0, 0xc($s2) -/* 8B1F28 80241EB8 8E050000 */ lw $a1, ($s0) -/* 8B1F2C 80241EBC 0C0B1EAF */ jal get_variable -/* 8B1F30 80241EC0 26100004 */ addiu $s0, $s0, 4 -/* 8B1F34 80241EC4 0240202D */ daddu $a0, $s2, $zero -/* 8B1F38 80241EC8 8E050000 */ lw $a1, ($s0) -/* 8B1F3C 80241ECC 0C0B1EAF */ jal get_variable -/* 8B1F40 80241ED0 0040802D */ daddu $s0, $v0, $zero -/* 8B1F44 80241ED4 0200202D */ daddu $a0, $s0, $zero -/* 8B1F48 80241ED8 0C00EAD2 */ jal get_npc_safe -/* 8B1F4C 80241EDC 0040A02D */ daddu $s4, $v0, $zero -/* 8B1F50 80241EE0 3C138011 */ lui $s3, %hi(gPlayerData) -/* 8B1F54 80241EE4 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) -/* 8B1F58 80241EE8 12200006 */ beqz $s1, .L80241F04 -/* 8B1F5C 80241EEC 0040802D */ daddu $s0, $v0, $zero -/* 8B1F60 80241EF0 82620012 */ lb $v0, 0x12($s3) -/* 8B1F64 80241EF4 54400003 */ bnel $v0, $zero, .L80241F04 -/* 8B1F68 80241EF8 AE400070 */ sw $zero, 0x70($s2) -/* 8B1F6C 80241EFC 24020002 */ addiu $v0, $zero, 2 -/* 8B1F70 80241F00 AE420070 */ sw $v0, 0x70($s2) -.L80241F04: -/* 8B1F74 80241F04 8E430070 */ lw $v1, 0x70($s2) -/* 8B1F78 80241F08 24110001 */ addiu $s1, $zero, 1 -/* 8B1F7C 80241F0C 10710013 */ beq $v1, $s1, .L80241F5C -/* 8B1F80 80241F10 28620002 */ slti $v0, $v1, 2 -/* 8B1F84 80241F14 10400005 */ beqz $v0, .L80241F2C -/* 8B1F88 80241F18 24020002 */ addiu $v0, $zero, 2 -/* 8B1F8C 80241F1C 10600009 */ beqz $v1, .L80241F44 -/* 8B1F90 80241F20 0000102D */ daddu $v0, $zero, $zero -/* 8B1F94 80241F24 080907FD */ j .L80241FF4 -/* 8B1F98 80241F28 00000000 */ nop -.L80241F2C: -/* 8B1F9C 80241F2C 10620013 */ beq $v1, $v0, .L80241F7C -/* 8B1FA0 80241F30 24020003 */ addiu $v0, $zero, 3 -/* 8B1FA4 80241F34 1062001E */ beq $v1, $v0, .L80241FB0 -/* 8B1FA8 80241F38 0000102D */ daddu $v0, $zero, $zero -/* 8B1FAC 80241F3C 080907FD */ j .L80241FF4 -/* 8B1FB0 80241F40 00000000 */ nop -.L80241F44: -/* 8B1FB4 80241F44 0C03AC5A */ jal func_800EB168 -/* 8B1FB8 80241F48 0000202D */ daddu $a0, $zero, $zero -/* 8B1FBC 80241F4C 2402001E */ addiu $v0, $zero, 0x1e -/* 8B1FC0 80241F50 AE420074 */ sw $v0, 0x74($s2) -/* 8B1FC4 80241F54 080907FC */ j .L80241FF0 -/* 8B1FC8 80241F58 AE510070 */ sw $s1, 0x70($s2) -.L80241F5C: -/* 8B1FCC 80241F5C 8E420074 */ lw $v0, 0x74($s2) -/* 8B1FD0 80241F60 2403FFFF */ addiu $v1, $zero, -1 -/* 8B1FD4 80241F64 2442FFFF */ addiu $v0, $v0, -1 -/* 8B1FD8 80241F68 14430021 */ bne $v0, $v1, .L80241FF0 -/* 8B1FDC 80241F6C AE420074 */ sw $v0, 0x74($s2) -/* 8B1FE0 80241F70 24020002 */ addiu $v0, $zero, 2 -/* 8B1FE4 80241F74 080907FC */ j .L80241FF0 -/* 8B1FE8 80241F78 AE420070 */ sw $v0, 0x70($s2) -.L80241F7C: -/* 8B1FEC 80241F7C 0200202D */ daddu $a0, $s0, $zero -/* 8B1FF0 80241F80 00141600 */ sll $v0, $s4, 0x18 -/* 8B1FF4 80241F84 00021543 */ sra $v0, $v0, 0x15 -/* 8B1FF8 80241F88 02621021 */ addu $v0, $s3, $v0 -/* 8B1FFC 80241F8C A2740012 */ sb $s4, 0x12($s3) -/* 8B2000 80241F90 0C03BD17 */ jal clear_partner_move_history -/* 8B2004 80241F94 A0510014 */ sb $s1, 0x14($v0) -/* 8B2008 80241F98 82640012 */ lb $a0, 0x12($s3) -/* 8B200C 80241F9C 0C03ACA9 */ jal func_800EB2A4 -/* 8B2010 80241FA0 00000000 */ nop -/* 8B2014 80241FA4 24020003 */ addiu $v0, $zero, 3 -/* 8B2018 80241FA8 080907FC */ j .L80241FF0 -/* 8B201C 80241FAC AE420070 */ sw $v0, 0x70($s2) -.L80241FB0: -/* 8B2020 80241FB0 0C00EAD2 */ jal get_npc_safe -/* 8B2024 80241FB4 2404FFFC */ addiu $a0, $zero, -4 -/* 8B2028 80241FB8 8E05000C */ lw $a1, 0xc($s0) -/* 8B202C 80241FBC 0C00ECD0 */ jal set_npc_yaw -/* 8B2030 80241FC0 0040202D */ daddu $a0, $v0, $zero -/* 8B2034 80241FC4 0200202D */ daddu $a0, $s0, $zero -/* 8B2038 80241FC8 8E020000 */ lw $v0, ($s0) -/* 8B203C 80241FCC 2403FFFB */ addiu $v1, $zero, -5 -/* 8B2040 80241FD0 00431024 */ and $v0, $v0, $v1 -/* 8B2044 80241FD4 0C00EAFF */ jal disable_npc_shadow -/* 8B2048 80241FD8 AE020000 */ sw $v0, ($s0) -/* 8B204C 80241FDC 3C01C47A */ lui $at, 0xc47a -/* 8B2050 80241FE0 44810000 */ mtc1 $at, $f0 -/* 8B2054 80241FE4 24020002 */ addiu $v0, $zero, 2 -/* 8B2058 80241FE8 080907FD */ j .L80241FF4 -/* 8B205C 80241FEC E600003C */ swc1 $f0, 0x3c($s0) -.L80241FF0: -/* 8B2060 80241FF0 0000102D */ daddu $v0, $zero, $zero -.L80241FF4: -/* 8B2064 80241FF4 8FBF0024 */ lw $ra, 0x24($sp) -/* 8B2068 80241FF8 8FB40020 */ lw $s4, 0x20($sp) -/* 8B206C 80241FFC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8B2070 80242000 8FB20018 */ lw $s2, 0x18($sp) -/* 8B2074 80242004 8FB10014 */ lw $s1, 0x14($sp) -/* 8B2078 80242008 8FB00010 */ lw $s0, 0x10($sp) -/* 8B207C 8024200C 03E00008 */ jr $ra -/* 8B2080 80242010 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s new file mode 100644 index 0000000000..633c3f4510 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241E90_8B1F00.s @@ -0,0 +1,109 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E90_8B1F00 +/* 8B1F00 80241E90 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8B1F04 80241E94 AFB20018 */ sw $s2, 0x18($sp) +/* 8B1F08 80241E98 0080902D */ daddu $s2, $a0, $zero +/* 8B1F0C 80241E9C AFB10014 */ sw $s1, 0x14($sp) +/* 8B1F10 80241EA0 00A0882D */ daddu $s1, $a1, $zero +/* 8B1F14 80241EA4 AFBF0024 */ sw $ra, 0x24($sp) +/* 8B1F18 80241EA8 AFB40020 */ sw $s4, 0x20($sp) +/* 8B1F1C 80241EAC AFB3001C */ sw $s3, 0x1c($sp) +/* 8B1F20 80241EB0 AFB00010 */ sw $s0, 0x10($sp) +/* 8B1F24 80241EB4 8E50000C */ lw $s0, 0xc($s2) +/* 8B1F28 80241EB8 8E050000 */ lw $a1, ($s0) +/* 8B1F2C 80241EBC 0C0B1EAF */ jal get_variable +/* 8B1F30 80241EC0 26100004 */ addiu $s0, $s0, 4 +/* 8B1F34 80241EC4 0240202D */ daddu $a0, $s2, $zero +/* 8B1F38 80241EC8 8E050000 */ lw $a1, ($s0) +/* 8B1F3C 80241ECC 0C0B1EAF */ jal get_variable +/* 8B1F40 80241ED0 0040802D */ daddu $s0, $v0, $zero +/* 8B1F44 80241ED4 0200202D */ daddu $a0, $s0, $zero +/* 8B1F48 80241ED8 0C00EAD2 */ jal get_npc_safe +/* 8B1F4C 80241EDC 0040A02D */ daddu $s4, $v0, $zero +/* 8B1F50 80241EE0 3C138011 */ lui $s3, %hi(gPlayerData) +/* 8B1F54 80241EE4 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) +/* 8B1F58 80241EE8 12200006 */ beqz $s1, .L80241F04 +/* 8B1F5C 80241EEC 0040802D */ daddu $s0, $v0, $zero +/* 8B1F60 80241EF0 82620012 */ lb $v0, 0x12($s3) +/* 8B1F64 80241EF4 54400003 */ bnel $v0, $zero, .L80241F04 +/* 8B1F68 80241EF8 AE400070 */ sw $zero, 0x70($s2) +/* 8B1F6C 80241EFC 24020002 */ addiu $v0, $zero, 2 +/* 8B1F70 80241F00 AE420070 */ sw $v0, 0x70($s2) +.L80241F04: +/* 8B1F74 80241F04 8E430070 */ lw $v1, 0x70($s2) +/* 8B1F78 80241F08 24110001 */ addiu $s1, $zero, 1 +/* 8B1F7C 80241F0C 10710013 */ beq $v1, $s1, .L80241F5C +/* 8B1F80 80241F10 28620002 */ slti $v0, $v1, 2 +/* 8B1F84 80241F14 10400005 */ beqz $v0, .L80241F2C +/* 8B1F88 80241F18 24020002 */ addiu $v0, $zero, 2 +/* 8B1F8C 80241F1C 10600009 */ beqz $v1, .L80241F44 +/* 8B1F90 80241F20 0000102D */ daddu $v0, $zero, $zero +/* 8B1F94 80241F24 080907FD */ j .L80241FF4 +/* 8B1F98 80241F28 00000000 */ nop +.L80241F2C: +/* 8B1F9C 80241F2C 10620013 */ beq $v1, $v0, .L80241F7C +/* 8B1FA0 80241F30 24020003 */ addiu $v0, $zero, 3 +/* 8B1FA4 80241F34 1062001E */ beq $v1, $v0, .L80241FB0 +/* 8B1FA8 80241F38 0000102D */ daddu $v0, $zero, $zero +/* 8B1FAC 80241F3C 080907FD */ j .L80241FF4 +/* 8B1FB0 80241F40 00000000 */ nop +.L80241F44: +/* 8B1FB4 80241F44 0C03AC5A */ jal func_800EB168 +/* 8B1FB8 80241F48 0000202D */ daddu $a0, $zero, $zero +/* 8B1FBC 80241F4C 2402001E */ addiu $v0, $zero, 0x1e +/* 8B1FC0 80241F50 AE420074 */ sw $v0, 0x74($s2) +/* 8B1FC4 80241F54 080907FC */ j .L80241FF0 +/* 8B1FC8 80241F58 AE510070 */ sw $s1, 0x70($s2) +.L80241F5C: +/* 8B1FCC 80241F5C 8E420074 */ lw $v0, 0x74($s2) +/* 8B1FD0 80241F60 2403FFFF */ addiu $v1, $zero, -1 +/* 8B1FD4 80241F64 2442FFFF */ addiu $v0, $v0, -1 +/* 8B1FD8 80241F68 14430021 */ bne $v0, $v1, .L80241FF0 +/* 8B1FDC 80241F6C AE420074 */ sw $v0, 0x74($s2) +/* 8B1FE0 80241F70 24020002 */ addiu $v0, $zero, 2 +/* 8B1FE4 80241F74 080907FC */ j .L80241FF0 +/* 8B1FE8 80241F78 AE420070 */ sw $v0, 0x70($s2) +.L80241F7C: +/* 8B1FEC 80241F7C 0200202D */ daddu $a0, $s0, $zero +/* 8B1FF0 80241F80 00141600 */ sll $v0, $s4, 0x18 +/* 8B1FF4 80241F84 00021543 */ sra $v0, $v0, 0x15 +/* 8B1FF8 80241F88 02621021 */ addu $v0, $s3, $v0 +/* 8B1FFC 80241F8C A2740012 */ sb $s4, 0x12($s3) +/* 8B2000 80241F90 0C03BD17 */ jal clear_partner_move_history +/* 8B2004 80241F94 A0510014 */ sb $s1, 0x14($v0) +/* 8B2008 80241F98 82640012 */ lb $a0, 0x12($s3) +/* 8B200C 80241F9C 0C03ACA9 */ jal func_800EB2A4 +/* 8B2010 80241FA0 00000000 */ nop +/* 8B2014 80241FA4 24020003 */ addiu $v0, $zero, 3 +/* 8B2018 80241FA8 080907FC */ j .L80241FF0 +/* 8B201C 80241FAC AE420070 */ sw $v0, 0x70($s2) +.L80241FB0: +/* 8B2020 80241FB0 0C00EAD2 */ jal get_npc_safe +/* 8B2024 80241FB4 2404FFFC */ addiu $a0, $zero, -4 +/* 8B2028 80241FB8 8E05000C */ lw $a1, 0xc($s0) +/* 8B202C 80241FBC 0C00ECD0 */ jal set_npc_yaw +/* 8B2030 80241FC0 0040202D */ daddu $a0, $v0, $zero +/* 8B2034 80241FC4 0200202D */ daddu $a0, $s0, $zero +/* 8B2038 80241FC8 8E020000 */ lw $v0, ($s0) +/* 8B203C 80241FCC 2403FFFB */ addiu $v1, $zero, -5 +/* 8B2040 80241FD0 00431024 */ and $v0, $v0, $v1 +/* 8B2044 80241FD4 0C00EAFF */ jal disable_npc_shadow +/* 8B2048 80241FD8 AE020000 */ sw $v0, ($s0) +/* 8B204C 80241FDC 3C01C47A */ lui $at, 0xc47a +/* 8B2050 80241FE0 44810000 */ mtc1 $at, $f0 +/* 8B2054 80241FE4 24020002 */ addiu $v0, $zero, 2 +/* 8B2058 80241FE8 080907FD */ j .L80241FF4 +/* 8B205C 80241FEC E600003C */ swc1 $f0, 0x3c($s0) +.L80241FF0: +/* 8B2060 80241FF0 0000102D */ daddu $v0, $zero, $zero +.L80241FF4: +/* 8B2064 80241FF4 8FBF0024 */ lw $ra, 0x24($sp) +/* 8B2068 80241FF8 8FB40020 */ lw $s4, 0x20($sp) +/* 8B206C 80241FFC 8FB3001C */ lw $s3, 0x1c($sp) +/* 8B2070 80242000 8FB20018 */ lw $s2, 0x18($sp) +/* 8B2074 80242004 8FB10014 */ lw $s1, 0x14($sp) +/* 8B2078 80242008 8FB00010 */ lw $s0, 0x10($sp) +/* 8B207C 8024200C 03E00008 */ jr $ra +/* 8B2080 80242010 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242014.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242014.s deleted file mode 100644 index c6ba3eb3f9..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242014.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242014 -/* 8B2084 80242014 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2088 80242018 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B208C 8024201C 0C00EABB */ jal get_npc_unsafe -/* 8B2090 80242020 2404FFFC */ addiu $a0, $zero, -4 -/* 8B2094 80242024 8C420000 */ lw $v0, ($v0) -/* 8B2098 80242028 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B209C 8024202C 30421000 */ andi $v0, $v0, 0x1000 -/* 8B20A0 80242030 0002102B */ sltu $v0, $zero, $v0 -/* 8B20A4 80242034 00021040 */ sll $v0, $v0, 1 -/* 8B20A8 80242038 03E00008 */ jr $ra -/* 8B20AC 8024203C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242014_8B2084.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242014_8B2084.s new file mode 100644 index 0000000000..8c496e3365 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242014_8B2084.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242014_8B2084 +/* 8B2084 80242014 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B2088 80242018 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B208C 8024201C 0C00EABB */ jal get_npc_unsafe +/* 8B2090 80242020 2404FFFC */ addiu $a0, $zero, -4 +/* 8B2094 80242024 8C420000 */ lw $v0, ($v0) +/* 8B2098 80242028 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B209C 8024202C 30421000 */ andi $v0, $v0, 0x1000 +/* 8B20A0 80242030 0002102B */ sltu $v0, $zero, $v0 +/* 8B20A4 80242034 00021040 */ sll $v0, $v0, 1 +/* 8B20A8 80242038 03E00008 */ jr $ra +/* 8B20AC 8024203C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C.s deleted file mode 100644 index a5da4b7f81..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024226C -/* 8B22DC 8024226C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B22E0 80242270 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B22E4 80242274 10A00003 */ beqz $a1, .L80242284 -/* 8B22E8 80242278 8C86000C */ lw $a2, 0xc($a0) -/* 8B22EC 8024227C 3C018024 */ lui $at, 0x8024 -/* 8B22F0 80242280 AC207E30 */ sw $zero, 0x7e30($at) -.L80242284: -/* 8B22F4 80242284 3C038024 */ lui $v1, 0x8024 -/* 8B22F8 80242288 24637E30 */ addiu $v1, $v1, 0x7e30 -/* 8B22FC 8024228C 8C620000 */ lw $v0, ($v1) -/* 8B2300 80242290 54400003 */ bnel $v0, $zero, .L802422A0 -/* 8B2304 80242294 AC600000 */ sw $zero, ($v1) -/* 8B2308 80242298 080908AD */ j .L802422B4 -/* 8B230C 8024229C 0000102D */ daddu $v0, $zero, $zero -.L802422A0: -/* 8B2310 802422A0 8CC50000 */ lw $a1, ($a2) -/* 8B2314 802422A4 3C068024 */ lui $a2, 0x8024 -/* 8B2318 802422A8 0C0B2026 */ jal set_variable -/* 8B231C 802422AC 8CC67E34 */ lw $a2, 0x7e34($a2) -/* 8B2320 802422B0 24020002 */ addiu $v0, $zero, 2 -.L802422B4: -/* 8B2324 802422B4 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2328 802422B8 03E00008 */ jr $ra -/* 8B232C 802422BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s new file mode 100644 index 0000000000..5cbe7d8783 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024226C_8B22DC.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024226C_8B22DC +/* 8B22DC 8024226C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B22E0 80242270 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B22E4 80242274 10A00003 */ beqz $a1, .L80242284 +/* 8B22E8 80242278 8C86000C */ lw $a2, 0xc($a0) +/* 8B22EC 8024227C 3C018024 */ lui $at, 0x8024 +/* 8B22F0 80242280 AC207E30 */ sw $zero, 0x7e30($at) +.L80242284: +/* 8B22F4 80242284 3C038024 */ lui $v1, 0x8024 +/* 8B22F8 80242288 24637E30 */ addiu $v1, $v1, 0x7e30 +/* 8B22FC 8024228C 8C620000 */ lw $v0, ($v1) +/* 8B2300 80242290 54400003 */ bnel $v0, $zero, .L802422A0 +/* 8B2304 80242294 AC600000 */ sw $zero, ($v1) +/* 8B2308 80242298 080908AD */ j .L802422B4 +/* 8B230C 8024229C 0000102D */ daddu $v0, $zero, $zero +.L802422A0: +/* 8B2310 802422A0 8CC50000 */ lw $a1, ($a2) +/* 8B2314 802422A4 3C068024 */ lui $a2, 0x8024 +/* 8B2318 802422A8 0C0B2026 */ jal set_variable +/* 8B231C 802422AC 8CC67E34 */ lw $a2, 0x7e34($a2) +/* 8B2320 802422B0 24020002 */ addiu $v0, $zero, 2 +.L802422B4: +/* 8B2324 802422B4 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B2328 802422B8 03E00008 */ jr $ra +/* 8B232C 802422BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8.s deleted file mode 100644 index 03a9f73e4d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F8 -/* 8B2368 802422F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B236C 802422FC AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2370 80242300 8C82000C */ lw $v0, 0xc($a0) -/* 8B2374 80242304 0C0B1EAF */ jal get_variable -/* 8B2378 80242308 8C450000 */ lw $a1, ($v0) -/* 8B237C 8024230C 0040182D */ daddu $v1, $v0, $zero -/* 8B2380 80242310 10600012 */ beqz $v1, .L8024235C -/* 8B2384 80242314 0000202D */ daddu $a0, $zero, $zero -/* 8B2388 80242318 8C620000 */ lw $v0, ($v1) -/* 8B238C 8024231C 5040000A */ beql $v0, $zero, .L80242348 -/* 8B2390 80242320 00041080 */ sll $v0, $a0, 2 -/* 8B2394 80242324 3C058025 */ lui $a1, 0x8025 -/* 8B2398 80242328 24A57F58 */ addiu $a1, $a1, 0x7f58 -.L8024232C: -/* 8B239C 8024232C 24630004 */ addiu $v1, $v1, 4 -/* 8B23A0 80242330 24840001 */ addiu $a0, $a0, 1 -/* 8B23A4 80242334 ACA20000 */ sw $v0, ($a1) -/* 8B23A8 80242338 8C620000 */ lw $v0, ($v1) -/* 8B23AC 8024233C 1440FFFB */ bnez $v0, .L8024232C -/* 8B23B0 80242340 24A50004 */ addiu $a1, $a1, 4 -/* 8B23B4 80242344 00041080 */ sll $v0, $a0, 2 -.L80242348: -/* 8B23B8 80242348 3C018025 */ lui $at, 0x8025 -/* 8B23BC 8024234C 00220821 */ addu $at, $at, $v0 -/* 8B23C0 80242350 AC207F58 */ sw $zero, 0x7f58($at) -/* 8B23C4 80242354 080908E1 */ j .L80242384 -/* 8B23C8 80242358 00000000 */ nop -.L8024235C: -/* 8B23CC 8024235C 3C038025 */ lui $v1, 0x8025 -/* 8B23D0 80242360 24637F58 */ addiu $v1, $v1, 0x7f58 -/* 8B23D4 80242364 0060282D */ daddu $a1, $v1, $zero -.L80242368: -/* 8B23D8 80242368 24820010 */ addiu $v0, $a0, 0x10 -/* 8B23DC 8024236C AC620000 */ sw $v0, ($v1) -/* 8B23E0 80242370 24630004 */ addiu $v1, $v1, 4 -/* 8B23E4 80242374 24840001 */ addiu $a0, $a0, 1 -/* 8B23E8 80242378 28820070 */ slti $v0, $a0, 0x70 -/* 8B23EC 8024237C 1440FFFA */ bnez $v0, .L80242368 -/* 8B23F0 80242380 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242384: -/* 8B23F4 80242384 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B23F8 80242388 24020002 */ addiu $v0, $zero, 2 -/* 8B23FC 8024238C 03E00008 */ jr $ra -/* 8B2400 80242390 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s new file mode 100644 index 0000000000..fd66987151 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802422F8_8B2368.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422F8_8B2368 +/* 8B2368 802422F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B236C 802422FC AFBF0010 */ sw $ra, 0x10($sp) +/* 8B2370 80242300 8C82000C */ lw $v0, 0xc($a0) +/* 8B2374 80242304 0C0B1EAF */ jal get_variable +/* 8B2378 80242308 8C450000 */ lw $a1, ($v0) +/* 8B237C 8024230C 0040182D */ daddu $v1, $v0, $zero +/* 8B2380 80242310 10600012 */ beqz $v1, .L8024235C +/* 8B2384 80242314 0000202D */ daddu $a0, $zero, $zero +/* 8B2388 80242318 8C620000 */ lw $v0, ($v1) +/* 8B238C 8024231C 5040000A */ beql $v0, $zero, .L80242348 +/* 8B2390 80242320 00041080 */ sll $v0, $a0, 2 +/* 8B2394 80242324 3C058025 */ lui $a1, 0x8025 +/* 8B2398 80242328 24A57F58 */ addiu $a1, $a1, 0x7f58 +.L8024232C: +/* 8B239C 8024232C 24630004 */ addiu $v1, $v1, 4 +/* 8B23A0 80242330 24840001 */ addiu $a0, $a0, 1 +/* 8B23A4 80242334 ACA20000 */ sw $v0, ($a1) +/* 8B23A8 80242338 8C620000 */ lw $v0, ($v1) +/* 8B23AC 8024233C 1440FFFB */ bnez $v0, .L8024232C +/* 8B23B0 80242340 24A50004 */ addiu $a1, $a1, 4 +/* 8B23B4 80242344 00041080 */ sll $v0, $a0, 2 +.L80242348: +/* 8B23B8 80242348 3C018025 */ lui $at, 0x8025 +/* 8B23BC 8024234C 00220821 */ addu $at, $at, $v0 +/* 8B23C0 80242350 AC207F58 */ sw $zero, 0x7f58($at) +/* 8B23C4 80242354 080908E1 */ j .L80242384 +/* 8B23C8 80242358 00000000 */ nop +.L8024235C: +/* 8B23CC 8024235C 3C038025 */ lui $v1, 0x8025 +/* 8B23D0 80242360 24637F58 */ addiu $v1, $v1, 0x7f58 +/* 8B23D4 80242364 0060282D */ daddu $a1, $v1, $zero +.L80242368: +/* 8B23D8 80242368 24820010 */ addiu $v0, $a0, 0x10 +/* 8B23DC 8024236C AC620000 */ sw $v0, ($v1) +/* 8B23E0 80242370 24630004 */ addiu $v1, $v1, 4 +/* 8B23E4 80242374 24840001 */ addiu $a0, $a0, 1 +/* 8B23E8 80242378 28820070 */ slti $v0, $a0, 0x70 +/* 8B23EC 8024237C 1440FFFA */ bnez $v0, .L80242368 +/* 8B23F0 80242380 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80242384: +/* 8B23F4 80242384 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B23F8 80242388 24020002 */ addiu $v0, $zero, 2 +/* 8B23FC 8024238C 03E00008 */ jr $ra +/* 8B2400 80242390 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394.s deleted file mode 100644 index 17123fc4e0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242394 -/* 8B2404 80242394 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B2408 80242398 AFB10014 */ sw $s1, 0x14($sp) -/* 8B240C 8024239C 0080882D */ daddu $s1, $a0, $zero -/* 8B2410 802423A0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B2414 802423A4 AFB00010 */ sw $s0, 0x10($sp) -/* 8B2418 802423A8 8E30000C */ lw $s0, 0xc($s1) -/* 8B241C 802423AC 8E050000 */ lw $a1, ($s0) -/* 8B2420 802423B0 0C0B1EAF */ jal get_variable -/* 8B2424 802423B4 26100004 */ addiu $s0, $s0, 4 -/* 8B2428 802423B8 0220202D */ daddu $a0, $s1, $zero -/* 8B242C 802423BC 8E050000 */ lw $a1, ($s0) -/* 8B2430 802423C0 0C0B1EAF */ jal get_variable -/* 8B2434 802423C4 0040802D */ daddu $s0, $v0, $zero -/* 8B2438 802423C8 0200202D */ daddu $a0, $s0, $zero -/* 8B243C 802423CC 00021080 */ sll $v0, $v0, 2 -/* 8B2440 802423D0 3C108025 */ lui $s0, 0x8025 -/* 8B2444 802423D4 02028021 */ addu $s0, $s0, $v0 -/* 8B2448 802423D8 0C00FB3A */ jal get_enemy -/* 8B244C 802423DC 8E1080AC */ lw $s0, -0x7f54($s0) -/* 8B2450 802423E0 0040302D */ daddu $a2, $v0, $zero -/* 8B2454 802423E4 0000282D */ daddu $a1, $zero, $zero -.L802423E8: -/* 8B2458 802423E8 8E040000 */ lw $a0, ($s0) -/* 8B245C 802423EC 00051080 */ sll $v0, $a1, 2 -/* 8B2460 802423F0 8CC300D0 */ lw $v1, 0xd0($a2) -/* 8B2464 802423F4 24A50001 */ addiu $a1, $a1, 1 -/* 8B2468 802423F8 00431021 */ addu $v0, $v0, $v1 -/* 8B246C 802423FC AC440000 */ sw $a0, ($v0) -/* 8B2470 80242400 28A2000E */ slti $v0, $a1, 0xe -/* 8B2474 80242404 1440FFF8 */ bnez $v0, .L802423E8 -/* 8B2478 80242408 26100004 */ addiu $s0, $s0, 4 -/* 8B247C 8024240C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B2480 80242410 8FB10014 */ lw $s1, 0x14($sp) -/* 8B2484 80242414 8FB00010 */ lw $s0, 0x10($sp) -/* 8B2488 80242418 24020002 */ addiu $v0, $zero, 2 -/* 8B248C 8024241C 03E00008 */ jr $ra -/* 8B2490 80242420 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394_8B2404.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394_8B2404.s new file mode 100644 index 0000000000..918a0fb956 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242394_8B2404.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242394_8B2404 +/* 8B2404 80242394 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B2408 80242398 AFB10014 */ sw $s1, 0x14($sp) +/* 8B240C 8024239C 0080882D */ daddu $s1, $a0, $zero +/* 8B2410 802423A0 AFBF0018 */ sw $ra, 0x18($sp) +/* 8B2414 802423A4 AFB00010 */ sw $s0, 0x10($sp) +/* 8B2418 802423A8 8E30000C */ lw $s0, 0xc($s1) +/* 8B241C 802423AC 8E050000 */ lw $a1, ($s0) +/* 8B2420 802423B0 0C0B1EAF */ jal get_variable +/* 8B2424 802423B4 26100004 */ addiu $s0, $s0, 4 +/* 8B2428 802423B8 0220202D */ daddu $a0, $s1, $zero +/* 8B242C 802423BC 8E050000 */ lw $a1, ($s0) +/* 8B2430 802423C0 0C0B1EAF */ jal get_variable +/* 8B2434 802423C4 0040802D */ daddu $s0, $v0, $zero +/* 8B2438 802423C8 0200202D */ daddu $a0, $s0, $zero +/* 8B243C 802423CC 00021080 */ sll $v0, $v0, 2 +/* 8B2440 802423D0 3C108025 */ lui $s0, 0x8025 +/* 8B2444 802423D4 02028021 */ addu $s0, $s0, $v0 +/* 8B2448 802423D8 0C00FB3A */ jal get_enemy +/* 8B244C 802423DC 8E1080AC */ lw $s0, -0x7f54($s0) +/* 8B2450 802423E0 0040302D */ daddu $a2, $v0, $zero +/* 8B2454 802423E4 0000282D */ daddu $a1, $zero, $zero +.L802423E8: +/* 8B2458 802423E8 8E040000 */ lw $a0, ($s0) +/* 8B245C 802423EC 00051080 */ sll $v0, $a1, 2 +/* 8B2460 802423F0 8CC300D0 */ lw $v1, 0xd0($a2) +/* 8B2464 802423F4 24A50001 */ addiu $a1, $a1, 1 +/* 8B2468 802423F8 00431021 */ addu $v0, $v0, $v1 +/* 8B246C 802423FC AC440000 */ sw $a0, ($v0) +/* 8B2470 80242400 28A2000E */ slti $v0, $a1, 0xe +/* 8B2474 80242404 1440FFF8 */ bnez $v0, .L802423E8 +/* 8B2478 80242408 26100004 */ addiu $s0, $s0, 4 +/* 8B247C 8024240C 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B2480 80242410 8FB10014 */ lw $s1, 0x14($sp) +/* 8B2484 80242414 8FB00010 */ lw $s0, 0x10($sp) +/* 8B2488 80242418 24020002 */ addiu $v0, $zero, 2 +/* 8B248C 8024241C 03E00008 */ jr $ra +/* 8B2490 80242420 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242424.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242424.s deleted file mode 100644 index f277560f88..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242424.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242424 -/* 8B2494 80242424 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B2498 80242428 AFB10014 */ sw $s1, 0x14($sp) -/* 8B249C 8024242C 0080882D */ daddu $s1, $a0, $zero -/* 8B24A0 80242430 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B24A4 80242434 AFB00010 */ sw $s0, 0x10($sp) -/* 8B24A8 80242438 8E30000C */ lw $s0, 0xc($s1) -/* 8B24AC 8024243C 8E050000 */ lw $a1, ($s0) -/* 8B24B0 80242440 0C0B1EAF */ jal get_variable -/* 8B24B4 80242444 26100004 */ addiu $s0, $s0, 4 -/* 8B24B8 80242448 AE22008C */ sw $v0, 0x8c($s1) -/* 8B24BC 8024244C 8E050000 */ lw $a1, ($s0) -/* 8B24C0 80242450 26100004 */ addiu $s0, $s0, 4 -/* 8B24C4 80242454 0C0B1EAF */ jal get_variable -/* 8B24C8 80242458 0220202D */ daddu $a0, $s1, $zero -/* 8B24CC 8024245C AE220090 */ sw $v0, 0x90($s1) -/* 8B24D0 80242460 8E050000 */ lw $a1, ($s0) -/* 8B24D4 80242464 26100004 */ addiu $s0, $s0, 4 -/* 8B24D8 80242468 0C0B1EAF */ jal get_variable -/* 8B24DC 8024246C 0220202D */ daddu $a0, $s1, $zero -/* 8B24E0 80242470 AE220094 */ sw $v0, 0x94($s1) -/* 8B24E4 80242474 8E050000 */ lw $a1, ($s0) -/* 8B24E8 80242478 26100004 */ addiu $s0, $s0, 4 -/* 8B24EC 8024247C 0C0B1EAF */ jal get_variable -/* 8B24F0 80242480 0220202D */ daddu $a0, $s1, $zero -/* 8B24F4 80242484 AE220098 */ sw $v0, 0x98($s1) -/* 8B24F8 80242488 8E050000 */ lw $a1, ($s0) -/* 8B24FC 8024248C 26100004 */ addiu $s0, $s0, 4 -/* 8B2500 80242490 0C0B1EAF */ jal get_variable -/* 8B2504 80242494 0220202D */ daddu $a0, $s1, $zero -/* 8B2508 80242498 AE22009C */ sw $v0, 0x9c($s1) -/* 8B250C 8024249C 8E050000 */ lw $a1, ($s0) -/* 8B2510 802424A0 26100004 */ addiu $s0, $s0, 4 -/* 8B2514 802424A4 0C0B1EAF */ jal get_variable -/* 8B2518 802424A8 0220202D */ daddu $a0, $s1, $zero -/* 8B251C 802424AC AE2200A0 */ sw $v0, 0xa0($s1) -/* 8B2520 802424B0 8E050000 */ lw $a1, ($s0) -/* 8B2524 802424B4 26100004 */ addiu $s0, $s0, 4 -/* 8B2528 802424B8 0C0B1EAF */ jal get_variable -/* 8B252C 802424BC 0220202D */ daddu $a0, $s1, $zero -/* 8B2530 802424C0 AE2200A4 */ sw $v0, 0xa4($s1) -/* 8B2534 802424C4 8E050000 */ lw $a1, ($s0) -/* 8B2538 802424C8 26100004 */ addiu $s0, $s0, 4 -/* 8B253C 802424CC 0C0B1EAF */ jal get_variable -/* 8B2540 802424D0 0220202D */ daddu $a0, $s1, $zero -/* 8B2544 802424D4 AE2200A8 */ sw $v0, 0xa8($s1) -/* 8B2548 802424D8 8E050000 */ lw $a1, ($s0) -/* 8B254C 802424DC 26100004 */ addiu $s0, $s0, 4 -/* 8B2550 802424E0 0C0B1EAF */ jal get_variable -/* 8B2554 802424E4 0220202D */ daddu $a0, $s1, $zero -/* 8B2558 802424E8 AE2200AC */ sw $v0, 0xac($s1) -/* 8B255C 802424EC 8E050000 */ lw $a1, ($s0) -/* 8B2560 802424F0 0C0B1EAF */ jal get_variable -/* 8B2564 802424F4 0220202D */ daddu $a0, $s1, $zero -/* 8B2568 802424F8 AE2200B0 */ sw $v0, 0xb0($s1) -/* 8B256C 802424FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B2570 80242500 8FB10014 */ lw $s1, 0x14($sp) -/* 8B2574 80242504 8FB00010 */ lw $s0, 0x10($sp) -/* 8B2578 80242508 24020002 */ addiu $v0, $zero, 2 -/* 8B257C 8024250C 03E00008 */ jr $ra -/* 8B2580 80242510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242424_8B2494.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242424_8B2494.s new file mode 100644 index 0000000000..2ae1dc3a25 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242424_8B2494.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242424_8B2494 +/* 8B2494 80242424 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B2498 80242428 AFB10014 */ sw $s1, 0x14($sp) +/* 8B249C 8024242C 0080882D */ daddu $s1, $a0, $zero +/* 8B24A0 80242430 AFBF0018 */ sw $ra, 0x18($sp) +/* 8B24A4 80242434 AFB00010 */ sw $s0, 0x10($sp) +/* 8B24A8 80242438 8E30000C */ lw $s0, 0xc($s1) +/* 8B24AC 8024243C 8E050000 */ lw $a1, ($s0) +/* 8B24B0 80242440 0C0B1EAF */ jal get_variable +/* 8B24B4 80242444 26100004 */ addiu $s0, $s0, 4 +/* 8B24B8 80242448 AE22008C */ sw $v0, 0x8c($s1) +/* 8B24BC 8024244C 8E050000 */ lw $a1, ($s0) +/* 8B24C0 80242450 26100004 */ addiu $s0, $s0, 4 +/* 8B24C4 80242454 0C0B1EAF */ jal get_variable +/* 8B24C8 80242458 0220202D */ daddu $a0, $s1, $zero +/* 8B24CC 8024245C AE220090 */ sw $v0, 0x90($s1) +/* 8B24D0 80242460 8E050000 */ lw $a1, ($s0) +/* 8B24D4 80242464 26100004 */ addiu $s0, $s0, 4 +/* 8B24D8 80242468 0C0B1EAF */ jal get_variable +/* 8B24DC 8024246C 0220202D */ daddu $a0, $s1, $zero +/* 8B24E0 80242470 AE220094 */ sw $v0, 0x94($s1) +/* 8B24E4 80242474 8E050000 */ lw $a1, ($s0) +/* 8B24E8 80242478 26100004 */ addiu $s0, $s0, 4 +/* 8B24EC 8024247C 0C0B1EAF */ jal get_variable +/* 8B24F0 80242480 0220202D */ daddu $a0, $s1, $zero +/* 8B24F4 80242484 AE220098 */ sw $v0, 0x98($s1) +/* 8B24F8 80242488 8E050000 */ lw $a1, ($s0) +/* 8B24FC 8024248C 26100004 */ addiu $s0, $s0, 4 +/* 8B2500 80242490 0C0B1EAF */ jal get_variable +/* 8B2504 80242494 0220202D */ daddu $a0, $s1, $zero +/* 8B2508 80242498 AE22009C */ sw $v0, 0x9c($s1) +/* 8B250C 8024249C 8E050000 */ lw $a1, ($s0) +/* 8B2510 802424A0 26100004 */ addiu $s0, $s0, 4 +/* 8B2514 802424A4 0C0B1EAF */ jal get_variable +/* 8B2518 802424A8 0220202D */ daddu $a0, $s1, $zero +/* 8B251C 802424AC AE2200A0 */ sw $v0, 0xa0($s1) +/* 8B2520 802424B0 8E050000 */ lw $a1, ($s0) +/* 8B2524 802424B4 26100004 */ addiu $s0, $s0, 4 +/* 8B2528 802424B8 0C0B1EAF */ jal get_variable +/* 8B252C 802424BC 0220202D */ daddu $a0, $s1, $zero +/* 8B2530 802424C0 AE2200A4 */ sw $v0, 0xa4($s1) +/* 8B2534 802424C4 8E050000 */ lw $a1, ($s0) +/* 8B2538 802424C8 26100004 */ addiu $s0, $s0, 4 +/* 8B253C 802424CC 0C0B1EAF */ jal get_variable +/* 8B2540 802424D0 0220202D */ daddu $a0, $s1, $zero +/* 8B2544 802424D4 AE2200A8 */ sw $v0, 0xa8($s1) +/* 8B2548 802424D8 8E050000 */ lw $a1, ($s0) +/* 8B254C 802424DC 26100004 */ addiu $s0, $s0, 4 +/* 8B2550 802424E0 0C0B1EAF */ jal get_variable +/* 8B2554 802424E4 0220202D */ daddu $a0, $s1, $zero +/* 8B2558 802424E8 AE2200AC */ sw $v0, 0xac($s1) +/* 8B255C 802424EC 8E050000 */ lw $a1, ($s0) +/* 8B2560 802424F0 0C0B1EAF */ jal get_variable +/* 8B2564 802424F4 0220202D */ daddu $a0, $s1, $zero +/* 8B2568 802424F8 AE2200B0 */ sw $v0, 0xb0($s1) +/* 8B256C 802424FC 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B2570 80242500 8FB10014 */ lw $s1, 0x14($sp) +/* 8B2574 80242504 8FB00010 */ lw $s0, 0x10($sp) +/* 8B2578 80242508 24020002 */ addiu $v0, $zero, 2 +/* 8B257C 8024250C 03E00008 */ jr $ra +/* 8B2580 80242510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514.s deleted file mode 100644 index 841fb16848..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242514 -/* 8B2584 80242514 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B2588 80242518 AFB1001C */ sw $s1, 0x1c($sp) -/* 8B258C 8024251C 0080882D */ daddu $s1, $a0, $zero -/* 8B2590 80242520 AFBF0034 */ sw $ra, 0x34($sp) -/* 8B2594 80242524 AFB60030 */ sw $s6, 0x30($sp) -/* 8B2598 80242528 AFB5002C */ sw $s5, 0x2c($sp) -/* 8B259C 8024252C AFB40028 */ sw $s4, 0x28($sp) -/* 8B25A0 80242530 AFB30024 */ sw $s3, 0x24($sp) -/* 8B25A4 80242534 AFB20020 */ sw $s2, 0x20($sp) -/* 8B25A8 80242538 AFB00018 */ sw $s0, 0x18($sp) -/* 8B25AC 8024253C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8B25B0 80242540 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8B25B4 80242544 8E30000C */ lw $s0, 0xc($s1) -/* 8B25B8 80242548 8E160000 */ lw $s6, ($s0) -/* 8B25BC 8024254C 26100004 */ addiu $s0, $s0, 4 -/* 8B25C0 80242550 0C0B1EAF */ jal get_variable -/* 8B25C4 80242554 02C0282D */ daddu $a1, $s6, $zero -/* 8B25C8 80242558 44820000 */ mtc1 $v0, $f0 -/* 8B25CC 8024255C 00000000 */ nop -/* 8B25D0 80242560 46800020 */ cvt.s.w $f0, $f0 -/* 8B25D4 80242564 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8B25D8 80242568 8E140000 */ lw $s4, ($s0) -/* 8B25DC 8024256C 26100004 */ addiu $s0, $s0, 4 -/* 8B25E0 80242570 0220202D */ daddu $a0, $s1, $zero -/* 8B25E4 80242574 0C0B1EAF */ jal get_variable -/* 8B25E8 80242578 0280282D */ daddu $a1, $s4, $zero -/* 8B25EC 8024257C 0220202D */ daddu $a0, $s1, $zero -/* 8B25F0 80242580 8E150000 */ lw $s5, ($s0) -/* 8B25F4 80242584 4482B000 */ mtc1 $v0, $f22 -/* 8B25F8 80242588 00000000 */ nop -/* 8B25FC 8024258C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8B2600 80242590 0C0B1EAF */ jal get_variable -/* 8B2604 80242594 02A0282D */ daddu $a1, $s5, $zero -/* 8B2608 80242598 2404FFFC */ addiu $a0, $zero, -4 -/* 8B260C 8024259C 44820000 */ mtc1 $v0, $f0 -/* 8B2610 802425A0 00000000 */ nop -/* 8B2614 802425A4 46800020 */ cvt.s.w $f0, $f0 -/* 8B2618 802425A8 0C00EABB */ jal get_npc_unsafe -/* 8B261C 802425AC E7A00014 */ swc1 $f0, 0x14($sp) -/* 8B2620 802425B0 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 8B2624 802425B4 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 8B2628 802425B8 3C014334 */ lui $at, 0x4334 -/* 8B262C 802425BC 44816000 */ mtc1 $at, $f12 -/* 8B2630 802425C0 00041880 */ sll $v1, $a0, 2 -/* 8B2634 802425C4 00641821 */ addu $v1, $v1, $a0 -/* 8B2638 802425C8 00031880 */ sll $v1, $v1, 2 -/* 8B263C 802425CC 00641823 */ subu $v1, $v1, $a0 -/* 8B2640 802425D0 000320C0 */ sll $a0, $v1, 3 -/* 8B2644 802425D4 00641821 */ addu $v1, $v1, $a0 -/* 8B2648 802425D8 000318C0 */ sll $v1, $v1, 3 -/* 8B264C 802425DC 3C01800B */ lui $at, 0x800b -/* 8B2650 802425E0 00230821 */ addu $at, $at, $v1 -/* 8B2654 802425E4 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8B2658 802425E8 460C0300 */ add.s $f12, $f0, $f12 -/* 8B265C 802425EC 0C00A6C9 */ jal clamp_angle -/* 8B2660 802425F0 0040982D */ daddu $s3, $v0, $zero -/* 8B2664 802425F4 27B00010 */ addiu $s0, $sp, 0x10 -/* 8B2668 802425F8 0200202D */ daddu $a0, $s0, $zero -/* 8B266C 802425FC 27B20014 */ addiu $s2, $sp, 0x14 -/* 8B2670 80242600 0240282D */ daddu $a1, $s2, $zero -/* 8B2674 80242604 3C064170 */ lui $a2, 0x4170 -/* 8B2678 80242608 8E67000C */ lw $a3, 0xc($s3) -/* 8B267C 8024260C 0C00A7E7 */ jal add_vec2D_polar -/* 8B2680 80242610 46000506 */ mov.s $f20, $f0 -/* 8B2684 80242614 0200202D */ daddu $a0, $s0, $zero -/* 8B2688 80242618 3C064120 */ lui $a2, 0x4120 -/* 8B268C 8024261C 4407A000 */ mfc1 $a3, $f20 -/* 8B2690 80242620 0C00A7E7 */ jal add_vec2D_polar -/* 8B2694 80242624 0240282D */ daddu $a1, $s2, $zero -/* 8B2698 80242628 0220202D */ daddu $a0, $s1, $zero -/* 8B269C 8024262C C7A00010 */ lwc1 $f0, 0x10($sp) -/* 8B26A0 80242630 4600008D */ trunc.w.s $f2, $f0 -/* 8B26A4 80242634 44061000 */ mfc1 $a2, $f2 -/* 8B26A8 80242638 0C0B2026 */ jal set_variable -/* 8B26AC 8024263C 02C0282D */ daddu $a1, $s6, $zero -/* 8B26B0 80242640 0220202D */ daddu $a0, $s1, $zero -/* 8B26B4 80242644 4600B08D */ trunc.w.s $f2, $f22 -/* 8B26B8 80242648 44061000 */ mfc1 $a2, $f2 -/* 8B26BC 8024264C 0C0B2026 */ jal set_variable -/* 8B26C0 80242650 0280282D */ daddu $a1, $s4, $zero -/* 8B26C4 80242654 0220202D */ daddu $a0, $s1, $zero -/* 8B26C8 80242658 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 8B26CC 8024265C 4600008D */ trunc.w.s $f2, $f0 -/* 8B26D0 80242660 44061000 */ mfc1 $a2, $f2 -/* 8B26D4 80242664 0C0B2026 */ jal set_variable -/* 8B26D8 80242668 02A0282D */ daddu $a1, $s5, $zero -/* 8B26DC 8024266C 8FBF0034 */ lw $ra, 0x34($sp) -/* 8B26E0 80242670 8FB60030 */ lw $s6, 0x30($sp) -/* 8B26E4 80242674 8FB5002C */ lw $s5, 0x2c($sp) -/* 8B26E8 80242678 8FB40028 */ lw $s4, 0x28($sp) -/* 8B26EC 8024267C 8FB30024 */ lw $s3, 0x24($sp) -/* 8B26F0 80242680 8FB20020 */ lw $s2, 0x20($sp) -/* 8B26F4 80242684 8FB1001C */ lw $s1, 0x1c($sp) -/* 8B26F8 80242688 8FB00018 */ lw $s0, 0x18($sp) -/* 8B26FC 8024268C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 8B2700 80242690 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8B2704 80242694 24020002 */ addiu $v0, $zero, 2 -/* 8B2708 80242698 03E00008 */ jr $ra -/* 8B270C 8024269C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514_8B2584.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514_8B2584.s new file mode 100644 index 0000000000..d65b0dcdfd --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242514_8B2584.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242514_8B2584 +/* 8B2584 80242514 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8B2588 80242518 AFB1001C */ sw $s1, 0x1c($sp) +/* 8B258C 8024251C 0080882D */ daddu $s1, $a0, $zero +/* 8B2590 80242520 AFBF0034 */ sw $ra, 0x34($sp) +/* 8B2594 80242524 AFB60030 */ sw $s6, 0x30($sp) +/* 8B2598 80242528 AFB5002C */ sw $s5, 0x2c($sp) +/* 8B259C 8024252C AFB40028 */ sw $s4, 0x28($sp) +/* 8B25A0 80242530 AFB30024 */ sw $s3, 0x24($sp) +/* 8B25A4 80242534 AFB20020 */ sw $s2, 0x20($sp) +/* 8B25A8 80242538 AFB00018 */ sw $s0, 0x18($sp) +/* 8B25AC 8024253C F7B60040 */ sdc1 $f22, 0x40($sp) +/* 8B25B0 80242540 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 8B25B4 80242544 8E30000C */ lw $s0, 0xc($s1) +/* 8B25B8 80242548 8E160000 */ lw $s6, ($s0) +/* 8B25BC 8024254C 26100004 */ addiu $s0, $s0, 4 +/* 8B25C0 80242550 0C0B1EAF */ jal get_variable +/* 8B25C4 80242554 02C0282D */ daddu $a1, $s6, $zero +/* 8B25C8 80242558 44820000 */ mtc1 $v0, $f0 +/* 8B25CC 8024255C 00000000 */ nop +/* 8B25D0 80242560 46800020 */ cvt.s.w $f0, $f0 +/* 8B25D4 80242564 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8B25D8 80242568 8E140000 */ lw $s4, ($s0) +/* 8B25DC 8024256C 26100004 */ addiu $s0, $s0, 4 +/* 8B25E0 80242570 0220202D */ daddu $a0, $s1, $zero +/* 8B25E4 80242574 0C0B1EAF */ jal get_variable +/* 8B25E8 80242578 0280282D */ daddu $a1, $s4, $zero +/* 8B25EC 8024257C 0220202D */ daddu $a0, $s1, $zero +/* 8B25F0 80242580 8E150000 */ lw $s5, ($s0) +/* 8B25F4 80242584 4482B000 */ mtc1 $v0, $f22 +/* 8B25F8 80242588 00000000 */ nop +/* 8B25FC 8024258C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8B2600 80242590 0C0B1EAF */ jal get_variable +/* 8B2604 80242594 02A0282D */ daddu $a1, $s5, $zero +/* 8B2608 80242598 2404FFFC */ addiu $a0, $zero, -4 +/* 8B260C 8024259C 44820000 */ mtc1 $v0, $f0 +/* 8B2610 802425A0 00000000 */ nop +/* 8B2614 802425A4 46800020 */ cvt.s.w $f0, $f0 +/* 8B2618 802425A8 0C00EABB */ jal get_npc_unsafe +/* 8B261C 802425AC E7A00014 */ swc1 $f0, 0x14($sp) +/* 8B2620 802425B0 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 8B2624 802425B4 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 8B2628 802425B8 3C014334 */ lui $at, 0x4334 +/* 8B262C 802425BC 44816000 */ mtc1 $at, $f12 +/* 8B2630 802425C0 00041880 */ sll $v1, $a0, 2 +/* 8B2634 802425C4 00641821 */ addu $v1, $v1, $a0 +/* 8B2638 802425C8 00031880 */ sll $v1, $v1, 2 +/* 8B263C 802425CC 00641823 */ subu $v1, $v1, $a0 +/* 8B2640 802425D0 000320C0 */ sll $a0, $v1, 3 +/* 8B2644 802425D4 00641821 */ addu $v1, $v1, $a0 +/* 8B2648 802425D8 000318C0 */ sll $v1, $v1, 3 +/* 8B264C 802425DC 3C01800B */ lui $at, 0x800b +/* 8B2650 802425E0 00230821 */ addu $at, $at, $v1 +/* 8B2654 802425E4 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 8B2658 802425E8 460C0300 */ add.s $f12, $f0, $f12 +/* 8B265C 802425EC 0C00A6C9 */ jal clamp_angle +/* 8B2660 802425F0 0040982D */ daddu $s3, $v0, $zero +/* 8B2664 802425F4 27B00010 */ addiu $s0, $sp, 0x10 +/* 8B2668 802425F8 0200202D */ daddu $a0, $s0, $zero +/* 8B266C 802425FC 27B20014 */ addiu $s2, $sp, 0x14 +/* 8B2670 80242600 0240282D */ daddu $a1, $s2, $zero +/* 8B2674 80242604 3C064170 */ lui $a2, 0x4170 +/* 8B2678 80242608 8E67000C */ lw $a3, 0xc($s3) +/* 8B267C 8024260C 0C00A7E7 */ jal add_vec2D_polar +/* 8B2680 80242610 46000506 */ mov.s $f20, $f0 +/* 8B2684 80242614 0200202D */ daddu $a0, $s0, $zero +/* 8B2688 80242618 3C064120 */ lui $a2, 0x4120 +/* 8B268C 8024261C 4407A000 */ mfc1 $a3, $f20 +/* 8B2690 80242620 0C00A7E7 */ jal add_vec2D_polar +/* 8B2694 80242624 0240282D */ daddu $a1, $s2, $zero +/* 8B2698 80242628 0220202D */ daddu $a0, $s1, $zero +/* 8B269C 8024262C C7A00010 */ lwc1 $f0, 0x10($sp) +/* 8B26A0 80242630 4600008D */ trunc.w.s $f2, $f0 +/* 8B26A4 80242634 44061000 */ mfc1 $a2, $f2 +/* 8B26A8 80242638 0C0B2026 */ jal set_variable +/* 8B26AC 8024263C 02C0282D */ daddu $a1, $s6, $zero +/* 8B26B0 80242640 0220202D */ daddu $a0, $s1, $zero +/* 8B26B4 80242644 4600B08D */ trunc.w.s $f2, $f22 +/* 8B26B8 80242648 44061000 */ mfc1 $a2, $f2 +/* 8B26BC 8024264C 0C0B2026 */ jal set_variable +/* 8B26C0 80242650 0280282D */ daddu $a1, $s4, $zero +/* 8B26C4 80242654 0220202D */ daddu $a0, $s1, $zero +/* 8B26C8 80242658 C7A00014 */ lwc1 $f0, 0x14($sp) +/* 8B26CC 8024265C 4600008D */ trunc.w.s $f2, $f0 +/* 8B26D0 80242660 44061000 */ mfc1 $a2, $f2 +/* 8B26D4 80242664 0C0B2026 */ jal set_variable +/* 8B26D8 80242668 02A0282D */ daddu $a1, $s5, $zero +/* 8B26DC 8024266C 8FBF0034 */ lw $ra, 0x34($sp) +/* 8B26E0 80242670 8FB60030 */ lw $s6, 0x30($sp) +/* 8B26E4 80242674 8FB5002C */ lw $s5, 0x2c($sp) +/* 8B26E8 80242678 8FB40028 */ lw $s4, 0x28($sp) +/* 8B26EC 8024267C 8FB30024 */ lw $s3, 0x24($sp) +/* 8B26F0 80242680 8FB20020 */ lw $s2, 0x20($sp) +/* 8B26F4 80242684 8FB1001C */ lw $s1, 0x1c($sp) +/* 8B26F8 80242688 8FB00018 */ lw $s0, 0x18($sp) +/* 8B26FC 8024268C D7B60040 */ ldc1 $f22, 0x40($sp) +/* 8B2700 80242690 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 8B2704 80242694 24020002 */ addiu $v0, $zero, 2 +/* 8B2708 80242698 03E00008 */ jr $ra +/* 8B270C 8024269C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0.s deleted file mode 100644 index ea0187a6e2..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426A0 -/* 8B2710 802426A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2714 802426A4 AFB00010 */ sw $s0, 0x10($sp) -/* 8B2718 802426A8 0080802D */ daddu $s0, $a0, $zero -/* 8B271C 802426AC AFBF0014 */ sw $ra, 0x14($sp) -/* 8B2720 802426B0 0C00EABB */ jal get_npc_unsafe -/* 8B2724 802426B4 8E04008C */ lw $a0, 0x8c($s0) -/* 8B2728 802426B8 0040282D */ daddu $a1, $v0, $zero -/* 8B272C 802426BC 8E040094 */ lw $a0, 0x94($s0) -/* 8B2730 802426C0 8CA30028 */ lw $v1, 0x28($a1) -/* 8B2734 802426C4 ACA40028 */ sw $a0, 0x28($a1) -/* 8B2738 802426C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B273C 802426CC 8FB00010 */ lw $s0, 0x10($sp) -/* 8B2740 802426D0 24020002 */ addiu $v0, $zero, 2 -/* 8B2744 802426D4 3C018026 */ lui $at, 0x8026 -/* 8B2748 802426D8 AC23811C */ sw $v1, -0x7ee4($at) -/* 8B274C 802426DC 03E00008 */ jr $ra -/* 8B2750 802426E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s new file mode 100644 index 0000000000..099096301d --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426A0_8B2710.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426A0_8B2710 +/* 8B2710 802426A0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B2714 802426A4 AFB00010 */ sw $s0, 0x10($sp) +/* 8B2718 802426A8 0080802D */ daddu $s0, $a0, $zero +/* 8B271C 802426AC AFBF0014 */ sw $ra, 0x14($sp) +/* 8B2720 802426B0 0C00EABB */ jal get_npc_unsafe +/* 8B2724 802426B4 8E04008C */ lw $a0, 0x8c($s0) +/* 8B2728 802426B8 0040282D */ daddu $a1, $v0, $zero +/* 8B272C 802426BC 8E040094 */ lw $a0, 0x94($s0) +/* 8B2730 802426C0 8CA30028 */ lw $v1, 0x28($a1) +/* 8B2734 802426C4 ACA40028 */ sw $a0, 0x28($a1) +/* 8B2738 802426C8 8FBF0014 */ lw $ra, 0x14($sp) +/* 8B273C 802426CC 8FB00010 */ lw $s0, 0x10($sp) +/* 8B2740 802426D0 24020002 */ addiu $v0, $zero, 2 +/* 8B2744 802426D4 3C018026 */ lui $at, 0x8026 +/* 8B2748 802426D8 AC23811C */ sw $v1, -0x7ee4($at) +/* 8B274C 802426DC 03E00008 */ jr $ra +/* 8B2750 802426E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4.s deleted file mode 100644 index 8bb2d48d11..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426E4 -/* 8B2754 802426E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2758 802426E8 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B275C 802426EC 0C00EABB */ jal get_npc_unsafe -/* 8B2760 802426F0 8C84008C */ lw $a0, 0x8c($a0) -/* 8B2764 802426F4 3C038026 */ lui $v1, 0x8026 -/* 8B2768 802426F8 8C63811C */ lw $v1, -0x7ee4($v1) -/* 8B276C 802426FC AC430028 */ sw $v1, 0x28($v0) -/* 8B2770 80242700 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2774 80242704 24020002 */ addiu $v0, $zero, 2 -/* 8B2778 80242708 03E00008 */ jr $ra -/* 8B277C 8024270C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s new file mode 100644 index 0000000000..a98eaf9032 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802426E4_8B2754.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426E4_8B2754 +/* 8B2754 802426E4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B2758 802426E8 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B275C 802426EC 0C00EABB */ jal get_npc_unsafe +/* 8B2760 802426F0 8C84008C */ lw $a0, 0x8c($a0) +/* 8B2764 802426F4 3C038026 */ lui $v1, 0x8026 +/* 8B2768 802426F8 8C63811C */ lw $v1, -0x7ee4($v1) +/* 8B276C 802426FC AC430028 */ sw $v1, 0x28($v0) +/* 8B2770 80242700 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B2774 80242704 24020002 */ addiu $v0, $zero, 2 +/* 8B2778 80242708 03E00008 */ jr $ra +/* 8B277C 8024270C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242710.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242710.s deleted file mode 100644 index 144ad4a3d8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242710.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242710 -/* 8B2780 80242710 3C028011 */ lui $v0, %hi(gPlayerData) -/* 8B2784 80242714 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 8B2788 80242718 80430002 */ lb $v1, 2($v0) -/* 8B278C 8024271C 80420003 */ lb $v0, 3($v0) -/* 8B2790 80242720 00621826 */ xor $v1, $v1, $v0 -/* 8B2794 80242724 2C630001 */ sltiu $v1, $v1, 1 -/* 8B2798 80242728 24020002 */ addiu $v0, $zero, 2 -/* 8B279C 8024272C 03E00008 */ jr $ra -/* 8B27A0 80242730 AC830084 */ sw $v1, 0x84($a0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242710_8B2780.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242710_8B2780.s new file mode 100644 index 0000000000..c2df682adb --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242710_8B2780.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242710_8B2780 +/* 8B2780 80242710 3C028011 */ lui $v0, %hi(gPlayerData) +/* 8B2784 80242714 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 8B2788 80242718 80430002 */ lb $v1, 2($v0) +/* 8B278C 8024271C 80420003 */ lb $v0, 3($v0) +/* 8B2790 80242720 00621826 */ xor $v1, $v1, $v0 +/* 8B2794 80242724 2C630001 */ sltiu $v1, $v1, 1 +/* 8B2798 80242728 24020002 */ addiu $v0, $zero, 2 +/* 8B279C 8024272C 03E00008 */ jr $ra +/* 8B27A0 80242730 AC830084 */ sw $v1, 0x84($a0) diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734.s deleted file mode 100644 index 200809b69f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242734 -/* 8B27A4 80242734 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B27A8 80242738 3C048026 */ lui $a0, 0x8026 -/* 8B27AC 8024273C 24848120 */ addiu $a0, $a0, -0x7ee0 -/* 8B27B0 80242740 3C028025 */ lui $v0, 0x8025 -/* 8B27B4 80242744 24427B00 */ addiu $v0, $v0, 0x7b00 -/* 8B27B8 80242748 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B27BC 8024274C AC820000 */ sw $v0, ($a0) -/* 8B27C0 80242750 3C028025 */ lui $v0, 0x8025 -/* 8B27C4 80242754 24427D00 */ addiu $v0, $v0, 0x7d00 -/* 8B27C8 80242758 AC820004 */ sw $v0, 4($a0) -/* 8B27CC 8024275C 24020020 */ addiu $v0, $zero, 0x20 -/* 8B27D0 80242760 A4820008 */ sh $v0, 8($a0) -/* 8B27D4 80242764 A482000A */ sh $v0, 0xa($a0) -/* 8B27D8 80242768 24020002 */ addiu $v0, $zero, 2 -/* 8B27DC 8024276C AC82000C */ sw $v0, 0xc($a0) -/* 8B27E0 80242770 0C0496CB */ jal set_message_images -/* 8B27E4 80242774 AC800010 */ sw $zero, 0x10($a0) -/* 8B27E8 80242778 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B27EC 8024277C 24020001 */ addiu $v0, $zero, 1 -/* 8B27F0 80242780 03E00008 */ jr $ra -/* 8B27F4 80242784 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s new file mode 100644 index 0000000000..86e850cebd --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242734_8B27A4.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242734_8B27A4 +/* 8B27A4 80242734 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B27A8 80242738 3C048026 */ lui $a0, 0x8026 +/* 8B27AC 8024273C 24848120 */ addiu $a0, $a0, -0x7ee0 +/* 8B27B0 80242740 3C028025 */ lui $v0, 0x8025 +/* 8B27B4 80242744 24427B00 */ addiu $v0, $v0, 0x7b00 +/* 8B27B8 80242748 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B27BC 8024274C AC820000 */ sw $v0, ($a0) +/* 8B27C0 80242750 3C028025 */ lui $v0, 0x8025 +/* 8B27C4 80242754 24427D00 */ addiu $v0, $v0, 0x7d00 +/* 8B27C8 80242758 AC820004 */ sw $v0, 4($a0) +/* 8B27CC 8024275C 24020020 */ addiu $v0, $zero, 0x20 +/* 8B27D0 80242760 A4820008 */ sh $v0, 8($a0) +/* 8B27D4 80242764 A482000A */ sh $v0, 0xa($a0) +/* 8B27D8 80242768 24020002 */ addiu $v0, $zero, 2 +/* 8B27DC 8024276C AC82000C */ sw $v0, 0xc($a0) +/* 8B27E0 80242770 0C0496CB */ jal set_message_images +/* 8B27E4 80242774 AC800010 */ sw $zero, 0x10($a0) +/* 8B27E8 80242778 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B27EC 8024277C 24020001 */ addiu $v0, $zero, 1 +/* 8B27F0 80242780 03E00008 */ jr $ra +/* 8B27F4 80242784 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788.s deleted file mode 100644 index 9f53ce7961..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242788 -/* 8B27F8 80242788 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B27FC 8024278C AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2800 80242790 3C018011 */ lui $at, 0x8011 -/* 8B2804 80242794 A020F2CC */ sb $zero, -0xd34($at) -/* 8B2808 80242798 0C03ACA9 */ jal func_800EB2A4 -/* 8B280C 8024279C 0000202D */ daddu $a0, $zero, $zero -/* 8B2810 802427A0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2814 802427A4 24020001 */ addiu $v0, $zero, 1 -/* 8B2818 802427A8 03E00008 */ jr $ra -/* 8B281C 802427AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s new file mode 100644 index 0000000000..28e2cc6a96 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242788_8B27F8 +/* 8B27F8 80242788 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B27FC 8024278C AFBF0010 */ sw $ra, 0x10($sp) +/* 8B2800 80242790 3C018011 */ lui $at, 0x8011 +/* 8B2804 80242794 A020F2CC */ sb $zero, -0xd34($at) +/* 8B2808 80242798 0C03ACA9 */ jal func_800EB2A4 +/* 8B280C 8024279C 0000202D */ daddu $a0, $zero, $zero +/* 8B2810 802427A0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B2814 802427A4 24020001 */ addiu $v0, $zero, 1 +/* 8B2818 802427A8 03E00008 */ jr $ra +/* 8B281C 802427AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427B0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427B0.s deleted file mode 100644 index 0aa776bc0c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427B0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427B0 -/* 8B2820 802427B0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8B2824 802427B4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8B2828 802427B8 8C420010 */ lw $v0, 0x10($v0) -/* 8B282C 802427BC 30421000 */ andi $v0, $v0, 0x1000 -/* 8B2830 802427C0 0002102B */ sltu $v0, $zero, $v0 -/* 8B2834 802427C4 03E00008 */ jr $ra -/* 8B2838 802427C8 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427B0_8B2820.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427B0_8B2820.s new file mode 100644 index 0000000000..68957ea675 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427B0_8B2820.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427B0_8B2820 +/* 8B2820 802427B0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 8B2824 802427B4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 8B2828 802427B8 8C420010 */ lw $v0, 0x10($v0) +/* 8B282C 802427BC 30421000 */ andi $v0, $v0, 0x1000 +/* 8B2830 802427C0 0002102B */ sltu $v0, $zero, $v0 +/* 8B2834 802427C4 03E00008 */ jr $ra +/* 8B2838 802427C8 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427CC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427CC.s deleted file mode 100644 index dce59264a5..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427CC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427CC -/* 8B283C 802427CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2840 802427D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2844 802427D4 0C00CD3C */ jal set_game_mode -/* 8B2848 802427D8 2404000A */ addiu $a0, $zero, 0xa -/* 8B284C 802427DC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2850 802427E0 24020001 */ addiu $v0, $zero, 1 -/* 8B2854 802427E4 03E00008 */ jr $ra -/* 8B2858 802427E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427CC_8B283C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427CC_8B283C.s new file mode 100644 index 0000000000..960a993c98 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427CC_8B283C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427CC_8B283C +/* 8B283C 802427CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B2840 802427D0 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B2844 802427D4 0C00CD3C */ jal set_game_mode +/* 8B2848 802427D8 2404000A */ addiu $a0, $zero, 0xa +/* 8B284C 802427DC 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B2850 802427E0 24020001 */ addiu $v0, $zero, 1 +/* 8B2854 802427E4 03E00008 */ jr $ra +/* 8B2858 802427E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC.s deleted file mode 100644 index ed0959e044..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427EC -/* 8B285C 802427EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2860 802427F0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2864 802427F4 0C03A5EE */ jal func_800E97B8 -/* 8B2868 802427F8 00000000 */ nop -/* 8B286C 802427FC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2870 80242800 24020002 */ addiu $v0, $zero, 2 -/* 8B2874 80242804 03E00008 */ jr $ra -/* 8B2878 80242808 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s new file mode 100644 index 0000000000..cda965bc68 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802427EC_8B285C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427EC_8B285C +/* 8B285C 802427EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B2860 802427F0 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B2864 802427F4 0C03A5EE */ jal func_800E97B8 +/* 8B2868 802427F8 00000000 */ nop +/* 8B286C 802427FC 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B2870 80242800 24020002 */ addiu $v0, $zero, 2 +/* 8B2874 80242804 03E00008 */ jr $ra +/* 8B2878 80242808 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C.s deleted file mode 100644 index 756407f493..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024280C -/* 8B287C 8024280C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B2880 80242810 AFB00010 */ sw $s0, 0x10($sp) -/* 8B2884 80242814 0080802D */ daddu $s0, $a0, $zero -/* 8B2888 80242818 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B288C 8024281C AFB10014 */ sw $s1, 0x14($sp) -/* 8B2890 80242820 8E11000C */ lw $s1, 0xc($s0) -/* 8B2894 80242824 0C0B36B0 */ jal resolve_npc -/* 8B2898 80242828 0000282D */ daddu $a1, $zero, $zero -/* 8B289C 8024282C 0200202D */ daddu $a0, $s0, $zero -/* 8B28A0 80242830 8E250000 */ lw $a1, ($s1) -/* 8B28A4 80242834 0C0B210B */ jal get_float_variable -/* 8B28A8 80242838 0040802D */ daddu $s0, $v0, $zero -/* 8B28AC 8024283C C6020034 */ lwc1 $f2, 0x34($s0) -/* 8B28B0 80242840 46001080 */ add.s $f2, $f2, $f0 -/* 8B28B4 80242844 E6020034 */ swc1 $f2, 0x34($s0) -/* 8B28B8 80242848 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B28BC 8024284C 8FB10014 */ lw $s1, 0x14($sp) -/* 8B28C0 80242850 8FB00010 */ lw $s0, 0x10($sp) -/* 8B28C4 80242854 24020002 */ addiu $v0, $zero, 2 -/* 8B28C8 80242858 03E00008 */ jr $ra -/* 8B28CC 8024285C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s new file mode 100644 index 0000000000..9b72d1b647 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024280C_8B287C.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024280C_8B287C +/* 8B287C 8024280C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B2880 80242810 AFB00010 */ sw $s0, 0x10($sp) +/* 8B2884 80242814 0080802D */ daddu $s0, $a0, $zero +/* 8B2888 80242818 AFBF0018 */ sw $ra, 0x18($sp) +/* 8B288C 8024281C AFB10014 */ sw $s1, 0x14($sp) +/* 8B2890 80242820 8E11000C */ lw $s1, 0xc($s0) +/* 8B2894 80242824 0C0B36B0 */ jal resolve_npc +/* 8B2898 80242828 0000282D */ daddu $a1, $zero, $zero +/* 8B289C 8024282C 0200202D */ daddu $a0, $s0, $zero +/* 8B28A0 80242830 8E250000 */ lw $a1, ($s1) +/* 8B28A4 80242834 0C0B210B */ jal get_float_variable +/* 8B28A8 80242838 0040802D */ daddu $s0, $v0, $zero +/* 8B28AC 8024283C C6020034 */ lwc1 $f2, 0x34($s0) +/* 8B28B0 80242840 46001080 */ add.s $f2, $f2, $f0 +/* 8B28B4 80242844 E6020034 */ swc1 $f2, 0x34($s0) +/* 8B28B8 80242848 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B28BC 8024284C 8FB10014 */ lw $s1, 0x14($sp) +/* 8B28C0 80242850 8FB00010 */ lw $s0, 0x10($sp) +/* 8B28C4 80242854 24020002 */ addiu $v0, $zero, 2 +/* 8B28C8 80242858 03E00008 */ jr $ra +/* 8B28CC 8024285C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860.s deleted file mode 100644 index eab6a3b689..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242860 -/* 8B28D0 80242860 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8B28D4 80242864 AFB10014 */ sw $s1, 0x14($sp) -/* 8B28D8 80242868 0080882D */ daddu $s1, $a0, $zero -/* 8B28DC 8024286C AFBF001C */ sw $ra, 0x1c($sp) -/* 8B28E0 80242870 AFB20018 */ sw $s2, 0x18($sp) -/* 8B28E4 80242874 AFB00010 */ sw $s0, 0x10($sp) -/* 8B28E8 80242878 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8B28EC 8024287C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8B28F0 80242880 0C00EABB */ jal get_npc_unsafe -/* 8B28F4 80242884 24040007 */ addiu $a0, $zero, 7 -/* 8B28F8 80242888 0040802D */ daddu $s0, $v0, $zero -/* 8B28FC 8024288C 3C12800B */ lui $s2, %hi(gCameras) -/* 8B2900 80242890 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* 8B2904 80242894 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8B2908 80242898 C640006C */ lwc1 $f0, 0x6c($s2) -/* 8B290C 8024289C 46006300 */ add.s $f12, $f12, $f0 -/* 8B2910 802428A0 3C014334 */ lui $at, 0x4334 -/* 8B2914 802428A4 4481A000 */ mtc1 $at, $f20 -/* 8B2918 802428A8 3C014220 */ lui $at, 0x4220 -/* 8B291C 802428AC 4481B000 */ mtc1 $at, $f22 -/* 8B2920 802428B0 0C00A8BB */ jal sin_deg -/* 8B2924 802428B4 46146300 */ add.s $f12, $f12, $f20 -/* 8B2928 802428B8 46160002 */ mul.s $f0, $f0, $f22 -/* 8B292C 802428BC 00000000 */ nop -/* 8B2930 802428C0 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8B2934 802428C4 46001080 */ add.s $f2, $f2, $f0 -/* 8B2938 802428C8 4600110D */ trunc.w.s $f4, $f2 -/* 8B293C 802428CC E6240084 */ swc1 $f4, 0x84($s1) -/* 8B2940 802428D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8B2944 802428D4 3C014100 */ lui $at, 0x4100 -/* 8B2948 802428D8 44811000 */ mtc1 $at, $f2 -/* 8B294C 802428DC 00000000 */ nop -/* 8B2950 802428E0 46020000 */ add.s $f0, $f0, $f2 -/* 8B2954 802428E4 4600010D */ trunc.w.s $f4, $f0 -/* 8B2958 802428E8 E6240088 */ swc1 $f4, 0x88($s1) -/* 8B295C 802428EC C60C000C */ lwc1 $f12, 0xc($s0) -/* 8B2960 802428F0 C640006C */ lwc1 $f0, 0x6c($s2) -/* 8B2964 802428F4 46006300 */ add.s $f12, $f12, $f0 -/* 8B2968 802428F8 0C00A8D4 */ jal cos_deg -/* 8B296C 802428FC 46146300 */ add.s $f12, $f12, $f20 -/* 8B2970 80242900 46160002 */ mul.s $f0, $f0, $f22 -/* 8B2974 80242904 00000000 */ nop -/* 8B2978 80242908 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8B297C 8024290C 46001081 */ sub.s $f2, $f2, $f0 -/* 8B2980 80242910 4600110D */ trunc.w.s $f4, $f2 -/* 8B2984 80242914 E624008C */ swc1 $f4, 0x8c($s1) -/* 8B2988 80242918 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B298C 8024291C 8FB20018 */ lw $s2, 0x18($sp) -/* 8B2990 80242920 8FB10014 */ lw $s1, 0x14($sp) -/* 8B2994 80242924 8FB00010 */ lw $s0, 0x10($sp) -/* 8B2998 80242928 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8B299C 8024292C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8B29A0 80242930 24020002 */ addiu $v0, $zero, 2 -/* 8B29A4 80242934 03E00008 */ jr $ra -/* 8B29A8 80242938 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s new file mode 100644 index 0000000000..b44c29e7c0 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242860_8B28D0.s @@ -0,0 +1,59 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242860_8B28D0 +/* 8B28D0 80242860 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8B28D4 80242864 AFB10014 */ sw $s1, 0x14($sp) +/* 8B28D8 80242868 0080882D */ daddu $s1, $a0, $zero +/* 8B28DC 8024286C AFBF001C */ sw $ra, 0x1c($sp) +/* 8B28E0 80242870 AFB20018 */ sw $s2, 0x18($sp) +/* 8B28E4 80242874 AFB00010 */ sw $s0, 0x10($sp) +/* 8B28E8 80242878 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 8B28EC 8024287C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8B28F0 80242880 0C00EABB */ jal get_npc_unsafe +/* 8B28F4 80242884 24040007 */ addiu $a0, $zero, 7 +/* 8B28F8 80242888 0040802D */ daddu $s0, $v0, $zero +/* 8B28FC 8024288C 3C12800B */ lui $s2, %hi(gCameras) +/* 8B2900 80242890 26521D80 */ addiu $s2, $s2, %lo(gCameras) +/* 8B2904 80242894 C60C000C */ lwc1 $f12, 0xc($s0) +/* 8B2908 80242898 C640006C */ lwc1 $f0, 0x6c($s2) +/* 8B290C 8024289C 46006300 */ add.s $f12, $f12, $f0 +/* 8B2910 802428A0 3C014334 */ lui $at, 0x4334 +/* 8B2914 802428A4 4481A000 */ mtc1 $at, $f20 +/* 8B2918 802428A8 3C014220 */ lui $at, 0x4220 +/* 8B291C 802428AC 4481B000 */ mtc1 $at, $f22 +/* 8B2920 802428B0 0C00A8BB */ jal sin_deg +/* 8B2924 802428B4 46146300 */ add.s $f12, $f12, $f20 +/* 8B2928 802428B8 46160002 */ mul.s $f0, $f0, $f22 +/* 8B292C 802428BC 00000000 */ nop +/* 8B2930 802428C0 C6020038 */ lwc1 $f2, 0x38($s0) +/* 8B2934 802428C4 46001080 */ add.s $f2, $f2, $f0 +/* 8B2938 802428C8 4600110D */ trunc.w.s $f4, $f2 +/* 8B293C 802428CC E6240084 */ swc1 $f4, 0x84($s1) +/* 8B2940 802428D0 C600003C */ lwc1 $f0, 0x3c($s0) +/* 8B2944 802428D4 3C014100 */ lui $at, 0x4100 +/* 8B2948 802428D8 44811000 */ mtc1 $at, $f2 +/* 8B294C 802428DC 00000000 */ nop +/* 8B2950 802428E0 46020000 */ add.s $f0, $f0, $f2 +/* 8B2954 802428E4 4600010D */ trunc.w.s $f4, $f0 +/* 8B2958 802428E8 E6240088 */ swc1 $f4, 0x88($s1) +/* 8B295C 802428EC C60C000C */ lwc1 $f12, 0xc($s0) +/* 8B2960 802428F0 C640006C */ lwc1 $f0, 0x6c($s2) +/* 8B2964 802428F4 46006300 */ add.s $f12, $f12, $f0 +/* 8B2968 802428F8 0C00A8D4 */ jal cos_deg +/* 8B296C 802428FC 46146300 */ add.s $f12, $f12, $f20 +/* 8B2970 80242900 46160002 */ mul.s $f0, $f0, $f22 +/* 8B2974 80242904 00000000 */ nop +/* 8B2978 80242908 C6020040 */ lwc1 $f2, 0x40($s0) +/* 8B297C 8024290C 46001081 */ sub.s $f2, $f2, $f0 +/* 8B2980 80242910 4600110D */ trunc.w.s $f4, $f2 +/* 8B2984 80242914 E624008C */ swc1 $f4, 0x8c($s1) +/* 8B2988 80242918 8FBF001C */ lw $ra, 0x1c($sp) +/* 8B298C 8024291C 8FB20018 */ lw $s2, 0x18($sp) +/* 8B2990 80242920 8FB10014 */ lw $s1, 0x14($sp) +/* 8B2994 80242924 8FB00010 */ lw $s0, 0x10($sp) +/* 8B2998 80242928 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8B299C 8024292C D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8B29A0 80242930 24020002 */ addiu $v0, $zero, 2 +/* 8B29A4 80242934 03E00008 */ jr $ra +/* 8B29A8 80242938 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C.s deleted file mode 100644 index b57b3f5e4b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024293C -/* 8B29AC 8024293C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B29B0 80242940 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B29B4 80242944 0C03A6DB */ jal sync_status_menu -/* 8B29B8 80242948 00000000 */ nop -/* 8B29BC 8024294C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B29C0 80242950 24020002 */ addiu $v0, $zero, 2 -/* 8B29C4 80242954 03E00008 */ jr $ra -/* 8B29C8 80242958 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s new file mode 100644 index 0000000000..3978689a5f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024293C_8B29AC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024293C_8B29AC +/* 8B29AC 8024293C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B29B0 80242940 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B29B4 80242944 0C03A6DB */ jal sync_status_menu +/* 8B29B8 80242948 00000000 */ nop +/* 8B29BC 8024294C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B29C0 80242950 24020002 */ addiu $v0, $zero, 2 +/* 8B29C4 80242954 03E00008 */ jr $ra +/* 8B29C8 80242958 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C.s deleted file mode 100644 index 25078acb38..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024295C -/* 8B29CC 8024295C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8B29D0 80242960 AFB20018 */ sw $s2, 0x18($sp) -/* 8B29D4 80242964 0080902D */ daddu $s2, $a0, $zero -/* 8B29D8 80242968 AFB10014 */ sw $s1, 0x14($sp) -/* 8B29DC 8024296C 00A0882D */ daddu $s1, $a1, $zero -/* 8B29E0 80242970 AFBF002C */ sw $ra, 0x2c($sp) -/* 8B29E4 80242974 AFB60028 */ sw $s6, 0x28($sp) -/* 8B29E8 80242978 AFB50024 */ sw $s5, 0x24($sp) -/* 8B29EC 8024297C AFB40020 */ sw $s4, 0x20($sp) -/* 8B29F0 80242980 AFB3001C */ sw $s3, 0x1c($sp) -/* 8B29F4 80242984 AFB00010 */ sw $s0, 0x10($sp) -/* 8B29F8 80242988 8E50000C */ lw $s0, 0xc($s2) -/* 8B29FC 8024298C 8E050000 */ lw $a1, ($s0) -/* 8B2A00 80242990 0C0B1EAF */ jal get_variable -/* 8B2A04 80242994 26100004 */ addiu $s0, $s0, 4 -/* 8B2A08 80242998 8E050000 */ lw $a1, ($s0) -/* 8B2A0C 8024299C 26100004 */ addiu $s0, $s0, 4 -/* 8B2A10 802429A0 0240202D */ daddu $a0, $s2, $zero -/* 8B2A14 802429A4 0C0B1EAF */ jal get_variable -/* 8B2A18 802429A8 0040B02D */ daddu $s6, $v0, $zero -/* 8B2A1C 802429AC 8E050000 */ lw $a1, ($s0) -/* 8B2A20 802429B0 26100004 */ addiu $s0, $s0, 4 -/* 8B2A24 802429B4 0240202D */ daddu $a0, $s2, $zero -/* 8B2A28 802429B8 0C0B1EAF */ jal get_variable -/* 8B2A2C 802429BC 0040A02D */ daddu $s4, $v0, $zero -/* 8B2A30 802429C0 8E050000 */ lw $a1, ($s0) -/* 8B2A34 802429C4 26100004 */ addiu $s0, $s0, 4 -/* 8B2A38 802429C8 0240202D */ daddu $a0, $s2, $zero -/* 8B2A3C 802429CC 0C0B1EAF */ jal get_variable -/* 8B2A40 802429D0 0040982D */ daddu $s3, $v0, $zero -/* 8B2A44 802429D4 0240202D */ daddu $a0, $s2, $zero -/* 8B2A48 802429D8 8E050000 */ lw $a1, ($s0) -/* 8B2A4C 802429DC 0C0B1EAF */ jal get_variable -/* 8B2A50 802429E0 0040A82D */ daddu $s5, $v0, $zero -/* 8B2A54 802429E4 1220000B */ beqz $s1, .L80242A14 -/* 8B2A58 802429E8 0040802D */ daddu $s0, $v0, $zero -/* 8B2A5C 802429EC 3C048025 */ lui $a0, 0x8025 -/* 8B2A60 802429F0 24847F20 */ addiu $a0, $a0, 0x7f20 -/* 8B2A64 802429F4 3C058025 */ lui $a1, 0x8025 -/* 8B2A68 802429F8 24A57F21 */ addiu $a1, $a1, 0x7f21 -/* 8B2A6C 802429FC 3C068025 */ lui $a2, 0x8025 -/* 8B2A70 80242A00 24C67F22 */ addiu $a2, $a2, 0x7f22 -/* 8B2A74 80242A04 3C078025 */ lui $a3, 0x8025 -/* 8B2A78 80242A08 0C046FA0 */ jal get_background_color_blend -/* 8B2A7C 80242A0C 24E77F23 */ addiu $a3, $a3, 0x7f23 -/* 8B2A80 80242A10 AE400070 */ sw $zero, 0x70($s2) -.L80242A14: -/* 8B2A84 80242A14 1A000053 */ blez $s0, .L80242B64 -/* 8B2A88 80242A18 32C400FF */ andi $a0, $s6, 0xff -/* 8B2A8C 80242A1C 3C048025 */ lui $a0, 0x8025 -/* 8B2A90 80242A20 90847F20 */ lbu $a0, 0x7f20($a0) -/* 8B2A94 80242A24 8E430070 */ lw $v1, 0x70($s2) -/* 8B2A98 80242A28 02C41023 */ subu $v0, $s6, $a0 -/* 8B2A9C 80242A2C 00430018 */ mult $v0, $v1 -/* 8B2AA0 80242A30 00004012 */ mflo $t0 -/* 8B2AA4 80242A34 00000000 */ nop -/* 8B2AA8 80242A38 16000002 */ bnez $s0, .L80242A44 -/* 8B2AAC 80242A3C 0110001A */ div $zero, $t0, $s0 -/* 8B2AB0 80242A40 0007000D */ break 7 -.L80242A44: -/* 8B2AB4 80242A44 2401FFFF */ addiu $at, $zero, -1 -/* 8B2AB8 80242A48 16010004 */ bne $s0, $at, .L80242A5C -/* 8B2ABC 80242A4C 3C018000 */ lui $at, 0x8000 -/* 8B2AC0 80242A50 15010002 */ bne $t0, $at, .L80242A5C -/* 8B2AC4 80242A54 00000000 */ nop -/* 8B2AC8 80242A58 0006000D */ break 6 -.L80242A5C: -/* 8B2ACC 80242A5C 00005012 */ mflo $t2 -/* 8B2AD0 80242A60 3C058025 */ lui $a1, 0x8025 -/* 8B2AD4 80242A64 90A57F21 */ lbu $a1, 0x7f21($a1) -/* 8B2AD8 80242A68 02851023 */ subu $v0, $s4, $a1 -/* 8B2ADC 80242A6C 00430018 */ mult $v0, $v1 -/* 8B2AE0 80242A70 00004012 */ mflo $t0 -/* 8B2AE4 80242A74 00000000 */ nop -/* 8B2AE8 80242A78 16000002 */ bnez $s0, .L80242A84 -/* 8B2AEC 80242A7C 0110001A */ div $zero, $t0, $s0 -/* 8B2AF0 80242A80 0007000D */ break 7 -.L80242A84: -/* 8B2AF4 80242A84 2401FFFF */ addiu $at, $zero, -1 -/* 8B2AF8 80242A88 16010004 */ bne $s0, $at, .L80242A9C -/* 8B2AFC 80242A8C 3C018000 */ lui $at, 0x8000 -/* 8B2B00 80242A90 15010002 */ bne $t0, $at, .L80242A9C -/* 8B2B04 80242A94 00000000 */ nop -/* 8B2B08 80242A98 0006000D */ break 6 -.L80242A9C: -/* 8B2B0C 80242A9C 00004812 */ mflo $t1 -/* 8B2B10 80242AA0 3C068025 */ lui $a2, 0x8025 -/* 8B2B14 80242AA4 90C67F22 */ lbu $a2, 0x7f22($a2) -/* 8B2B18 80242AA8 02661023 */ subu $v0, $s3, $a2 -/* 8B2B1C 80242AAC 00430018 */ mult $v0, $v1 -/* 8B2B20 80242AB0 00004012 */ mflo $t0 -/* 8B2B24 80242AB4 00000000 */ nop -/* 8B2B28 80242AB8 16000002 */ bnez $s0, .L80242AC4 -/* 8B2B2C 80242ABC 0110001A */ div $zero, $t0, $s0 -/* 8B2B30 80242AC0 0007000D */ break 7 -.L80242AC4: -/* 8B2B34 80242AC4 2401FFFF */ addiu $at, $zero, -1 -/* 8B2B38 80242AC8 16010004 */ bne $s0, $at, .L80242ADC -/* 8B2B3C 80242ACC 3C018000 */ lui $at, 0x8000 -/* 8B2B40 80242AD0 15010002 */ bne $t0, $at, .L80242ADC -/* 8B2B44 80242AD4 00000000 */ nop -/* 8B2B48 80242AD8 0006000D */ break 6 -.L80242ADC: -/* 8B2B4C 80242ADC 00004012 */ mflo $t0 -/* 8B2B50 80242AE0 3C078025 */ lui $a3, 0x8025 -/* 8B2B54 80242AE4 90E77F23 */ lbu $a3, 0x7f23($a3) -/* 8B2B58 80242AE8 02A71023 */ subu $v0, $s5, $a3 -/* 8B2B5C 80242AEC 00430018 */ mult $v0, $v1 -/* 8B2B60 80242AF0 00001812 */ mflo $v1 -/* 8B2B64 80242AF4 00000000 */ nop -/* 8B2B68 80242AF8 16000002 */ bnez $s0, .L80242B04 -/* 8B2B6C 80242AFC 0070001A */ div $zero, $v1, $s0 -/* 8B2B70 80242B00 0007000D */ break 7 -.L80242B04: -/* 8B2B74 80242B04 2401FFFF */ addiu $at, $zero, -1 -/* 8B2B78 80242B08 16010004 */ bne $s0, $at, .L80242B1C -/* 8B2B7C 80242B0C 3C018000 */ lui $at, 0x8000 -/* 8B2B80 80242B10 14610002 */ bne $v1, $at, .L80242B1C -/* 8B2B84 80242B14 00000000 */ nop -/* 8B2B88 80242B18 0006000D */ break 6 -.L80242B1C: -/* 8B2B8C 80242B1C 00001012 */ mflo $v0 -/* 8B2B90 80242B20 008A2021 */ addu $a0, $a0, $t2 -/* 8B2B94 80242B24 308400FF */ andi $a0, $a0, 0xff -/* 8B2B98 80242B28 00A92821 */ addu $a1, $a1, $t1 -/* 8B2B9C 80242B2C 30A500FF */ andi $a1, $a1, 0xff -/* 8B2BA0 80242B30 00C83021 */ addu $a2, $a2, $t0 -/* 8B2BA4 80242B34 30C600FF */ andi $a2, $a2, 0xff -/* 8B2BA8 80242B38 00E23821 */ addu $a3, $a3, $v0 -/* 8B2BAC 80242B3C 0C046F97 */ jal set_background_color_blend -/* 8B2BB0 80242B40 30E700FF */ andi $a3, $a3, 0xff -/* 8B2BB4 80242B44 8E420070 */ lw $v0, 0x70($s2) -/* 8B2BB8 80242B48 24420001 */ addiu $v0, $v0, 1 -/* 8B2BBC 80242B4C AE420070 */ sw $v0, 0x70($s2) -/* 8B2BC0 80242B50 0202102A */ slt $v0, $s0, $v0 -/* 8B2BC4 80242B54 10400009 */ beqz $v0, .L80242B7C -/* 8B2BC8 80242B58 24020002 */ addiu $v0, $zero, 2 -/* 8B2BCC 80242B5C 08090AE0 */ j .L80242B80 -/* 8B2BD0 80242B60 00000000 */ nop -.L80242B64: -/* 8B2BD4 80242B64 328500FF */ andi $a1, $s4, 0xff -/* 8B2BD8 80242B68 326600FF */ andi $a2, $s3, 0xff -/* 8B2BDC 80242B6C 0C046F97 */ jal set_background_color_blend -/* 8B2BE0 80242B70 32A700FF */ andi $a3, $s5, 0xff -/* 8B2BE4 80242B74 08090AE0 */ j .L80242B80 -/* 8B2BE8 80242B78 24020002 */ addiu $v0, $zero, 2 -.L80242B7C: -/* 8B2BEC 80242B7C 0000102D */ daddu $v0, $zero, $zero -.L80242B80: -/* 8B2BF0 80242B80 8FBF002C */ lw $ra, 0x2c($sp) -/* 8B2BF4 80242B84 8FB60028 */ lw $s6, 0x28($sp) -/* 8B2BF8 80242B88 8FB50024 */ lw $s5, 0x24($sp) -/* 8B2BFC 80242B8C 8FB40020 */ lw $s4, 0x20($sp) -/* 8B2C00 80242B90 8FB3001C */ lw $s3, 0x1c($sp) -/* 8B2C04 80242B94 8FB20018 */ lw $s2, 0x18($sp) -/* 8B2C08 80242B98 8FB10014 */ lw $s1, 0x14($sp) -/* 8B2C0C 80242B9C 8FB00010 */ lw $s0, 0x10($sp) -/* 8B2C10 80242BA0 03E00008 */ jr $ra -/* 8B2C14 80242BA4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s new file mode 100644 index 0000000000..83765e8988 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024295C_8B29CC.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024295C_8B29CC +/* 8B29CC 8024295C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8B29D0 80242960 AFB20018 */ sw $s2, 0x18($sp) +/* 8B29D4 80242964 0080902D */ daddu $s2, $a0, $zero +/* 8B29D8 80242968 AFB10014 */ sw $s1, 0x14($sp) +/* 8B29DC 8024296C 00A0882D */ daddu $s1, $a1, $zero +/* 8B29E0 80242970 AFBF002C */ sw $ra, 0x2c($sp) +/* 8B29E4 80242974 AFB60028 */ sw $s6, 0x28($sp) +/* 8B29E8 80242978 AFB50024 */ sw $s5, 0x24($sp) +/* 8B29EC 8024297C AFB40020 */ sw $s4, 0x20($sp) +/* 8B29F0 80242980 AFB3001C */ sw $s3, 0x1c($sp) +/* 8B29F4 80242984 AFB00010 */ sw $s0, 0x10($sp) +/* 8B29F8 80242988 8E50000C */ lw $s0, 0xc($s2) +/* 8B29FC 8024298C 8E050000 */ lw $a1, ($s0) +/* 8B2A00 80242990 0C0B1EAF */ jal get_variable +/* 8B2A04 80242994 26100004 */ addiu $s0, $s0, 4 +/* 8B2A08 80242998 8E050000 */ lw $a1, ($s0) +/* 8B2A0C 8024299C 26100004 */ addiu $s0, $s0, 4 +/* 8B2A10 802429A0 0240202D */ daddu $a0, $s2, $zero +/* 8B2A14 802429A4 0C0B1EAF */ jal get_variable +/* 8B2A18 802429A8 0040B02D */ daddu $s6, $v0, $zero +/* 8B2A1C 802429AC 8E050000 */ lw $a1, ($s0) +/* 8B2A20 802429B0 26100004 */ addiu $s0, $s0, 4 +/* 8B2A24 802429B4 0240202D */ daddu $a0, $s2, $zero +/* 8B2A28 802429B8 0C0B1EAF */ jal get_variable +/* 8B2A2C 802429BC 0040A02D */ daddu $s4, $v0, $zero +/* 8B2A30 802429C0 8E050000 */ lw $a1, ($s0) +/* 8B2A34 802429C4 26100004 */ addiu $s0, $s0, 4 +/* 8B2A38 802429C8 0240202D */ daddu $a0, $s2, $zero +/* 8B2A3C 802429CC 0C0B1EAF */ jal get_variable +/* 8B2A40 802429D0 0040982D */ daddu $s3, $v0, $zero +/* 8B2A44 802429D4 0240202D */ daddu $a0, $s2, $zero +/* 8B2A48 802429D8 8E050000 */ lw $a1, ($s0) +/* 8B2A4C 802429DC 0C0B1EAF */ jal get_variable +/* 8B2A50 802429E0 0040A82D */ daddu $s5, $v0, $zero +/* 8B2A54 802429E4 1220000B */ beqz $s1, .L80242A14 +/* 8B2A58 802429E8 0040802D */ daddu $s0, $v0, $zero +/* 8B2A5C 802429EC 3C048025 */ lui $a0, 0x8025 +/* 8B2A60 802429F0 24847F20 */ addiu $a0, $a0, 0x7f20 +/* 8B2A64 802429F4 3C058025 */ lui $a1, 0x8025 +/* 8B2A68 802429F8 24A57F21 */ addiu $a1, $a1, 0x7f21 +/* 8B2A6C 802429FC 3C068025 */ lui $a2, 0x8025 +/* 8B2A70 80242A00 24C67F22 */ addiu $a2, $a2, 0x7f22 +/* 8B2A74 80242A04 3C078025 */ lui $a3, 0x8025 +/* 8B2A78 80242A08 0C046FA0 */ jal get_background_color_blend +/* 8B2A7C 80242A0C 24E77F23 */ addiu $a3, $a3, 0x7f23 +/* 8B2A80 80242A10 AE400070 */ sw $zero, 0x70($s2) +.L80242A14: +/* 8B2A84 80242A14 1A000053 */ blez $s0, .L80242B64 +/* 8B2A88 80242A18 32C400FF */ andi $a0, $s6, 0xff +/* 8B2A8C 80242A1C 3C048025 */ lui $a0, 0x8025 +/* 8B2A90 80242A20 90847F20 */ lbu $a0, 0x7f20($a0) +/* 8B2A94 80242A24 8E430070 */ lw $v1, 0x70($s2) +/* 8B2A98 80242A28 02C41023 */ subu $v0, $s6, $a0 +/* 8B2A9C 80242A2C 00430018 */ mult $v0, $v1 +/* 8B2AA0 80242A30 00004012 */ mflo $t0 +/* 8B2AA4 80242A34 00000000 */ nop +/* 8B2AA8 80242A38 16000002 */ bnez $s0, .L80242A44 +/* 8B2AAC 80242A3C 0110001A */ div $zero, $t0, $s0 +/* 8B2AB0 80242A40 0007000D */ break 7 +.L80242A44: +/* 8B2AB4 80242A44 2401FFFF */ addiu $at, $zero, -1 +/* 8B2AB8 80242A48 16010004 */ bne $s0, $at, .L80242A5C +/* 8B2ABC 80242A4C 3C018000 */ lui $at, 0x8000 +/* 8B2AC0 80242A50 15010002 */ bne $t0, $at, .L80242A5C +/* 8B2AC4 80242A54 00000000 */ nop +/* 8B2AC8 80242A58 0006000D */ break 6 +.L80242A5C: +/* 8B2ACC 80242A5C 00005012 */ mflo $t2 +/* 8B2AD0 80242A60 3C058025 */ lui $a1, 0x8025 +/* 8B2AD4 80242A64 90A57F21 */ lbu $a1, 0x7f21($a1) +/* 8B2AD8 80242A68 02851023 */ subu $v0, $s4, $a1 +/* 8B2ADC 80242A6C 00430018 */ mult $v0, $v1 +/* 8B2AE0 80242A70 00004012 */ mflo $t0 +/* 8B2AE4 80242A74 00000000 */ nop +/* 8B2AE8 80242A78 16000002 */ bnez $s0, .L80242A84 +/* 8B2AEC 80242A7C 0110001A */ div $zero, $t0, $s0 +/* 8B2AF0 80242A80 0007000D */ break 7 +.L80242A84: +/* 8B2AF4 80242A84 2401FFFF */ addiu $at, $zero, -1 +/* 8B2AF8 80242A88 16010004 */ bne $s0, $at, .L80242A9C +/* 8B2AFC 80242A8C 3C018000 */ lui $at, 0x8000 +/* 8B2B00 80242A90 15010002 */ bne $t0, $at, .L80242A9C +/* 8B2B04 80242A94 00000000 */ nop +/* 8B2B08 80242A98 0006000D */ break 6 +.L80242A9C: +/* 8B2B0C 80242A9C 00004812 */ mflo $t1 +/* 8B2B10 80242AA0 3C068025 */ lui $a2, 0x8025 +/* 8B2B14 80242AA4 90C67F22 */ lbu $a2, 0x7f22($a2) +/* 8B2B18 80242AA8 02661023 */ subu $v0, $s3, $a2 +/* 8B2B1C 80242AAC 00430018 */ mult $v0, $v1 +/* 8B2B20 80242AB0 00004012 */ mflo $t0 +/* 8B2B24 80242AB4 00000000 */ nop +/* 8B2B28 80242AB8 16000002 */ bnez $s0, .L80242AC4 +/* 8B2B2C 80242ABC 0110001A */ div $zero, $t0, $s0 +/* 8B2B30 80242AC0 0007000D */ break 7 +.L80242AC4: +/* 8B2B34 80242AC4 2401FFFF */ addiu $at, $zero, -1 +/* 8B2B38 80242AC8 16010004 */ bne $s0, $at, .L80242ADC +/* 8B2B3C 80242ACC 3C018000 */ lui $at, 0x8000 +/* 8B2B40 80242AD0 15010002 */ bne $t0, $at, .L80242ADC +/* 8B2B44 80242AD4 00000000 */ nop +/* 8B2B48 80242AD8 0006000D */ break 6 +.L80242ADC: +/* 8B2B4C 80242ADC 00004012 */ mflo $t0 +/* 8B2B50 80242AE0 3C078025 */ lui $a3, 0x8025 +/* 8B2B54 80242AE4 90E77F23 */ lbu $a3, 0x7f23($a3) +/* 8B2B58 80242AE8 02A71023 */ subu $v0, $s5, $a3 +/* 8B2B5C 80242AEC 00430018 */ mult $v0, $v1 +/* 8B2B60 80242AF0 00001812 */ mflo $v1 +/* 8B2B64 80242AF4 00000000 */ nop +/* 8B2B68 80242AF8 16000002 */ bnez $s0, .L80242B04 +/* 8B2B6C 80242AFC 0070001A */ div $zero, $v1, $s0 +/* 8B2B70 80242B00 0007000D */ break 7 +.L80242B04: +/* 8B2B74 80242B04 2401FFFF */ addiu $at, $zero, -1 +/* 8B2B78 80242B08 16010004 */ bne $s0, $at, .L80242B1C +/* 8B2B7C 80242B0C 3C018000 */ lui $at, 0x8000 +/* 8B2B80 80242B10 14610002 */ bne $v1, $at, .L80242B1C +/* 8B2B84 80242B14 00000000 */ nop +/* 8B2B88 80242B18 0006000D */ break 6 +.L80242B1C: +/* 8B2B8C 80242B1C 00001012 */ mflo $v0 +/* 8B2B90 80242B20 008A2021 */ addu $a0, $a0, $t2 +/* 8B2B94 80242B24 308400FF */ andi $a0, $a0, 0xff +/* 8B2B98 80242B28 00A92821 */ addu $a1, $a1, $t1 +/* 8B2B9C 80242B2C 30A500FF */ andi $a1, $a1, 0xff +/* 8B2BA0 80242B30 00C83021 */ addu $a2, $a2, $t0 +/* 8B2BA4 80242B34 30C600FF */ andi $a2, $a2, 0xff +/* 8B2BA8 80242B38 00E23821 */ addu $a3, $a3, $v0 +/* 8B2BAC 80242B3C 0C046F97 */ jal set_background_color_blend +/* 8B2BB0 80242B40 30E700FF */ andi $a3, $a3, 0xff +/* 8B2BB4 80242B44 8E420070 */ lw $v0, 0x70($s2) +/* 8B2BB8 80242B48 24420001 */ addiu $v0, $v0, 1 +/* 8B2BBC 80242B4C AE420070 */ sw $v0, 0x70($s2) +/* 8B2BC0 80242B50 0202102A */ slt $v0, $s0, $v0 +/* 8B2BC4 80242B54 10400009 */ beqz $v0, .L80242B7C +/* 8B2BC8 80242B58 24020002 */ addiu $v0, $zero, 2 +/* 8B2BCC 80242B5C 08090AE0 */ j .L80242B80 +/* 8B2BD0 80242B60 00000000 */ nop +.L80242B64: +/* 8B2BD4 80242B64 328500FF */ andi $a1, $s4, 0xff +/* 8B2BD8 80242B68 326600FF */ andi $a2, $s3, 0xff +/* 8B2BDC 80242B6C 0C046F97 */ jal set_background_color_blend +/* 8B2BE0 80242B70 32A700FF */ andi $a3, $s5, 0xff +/* 8B2BE4 80242B74 08090AE0 */ j .L80242B80 +/* 8B2BE8 80242B78 24020002 */ addiu $v0, $zero, 2 +.L80242B7C: +/* 8B2BEC 80242B7C 0000102D */ daddu $v0, $zero, $zero +.L80242B80: +/* 8B2BF0 80242B80 8FBF002C */ lw $ra, 0x2c($sp) +/* 8B2BF4 80242B84 8FB60028 */ lw $s6, 0x28($sp) +/* 8B2BF8 80242B88 8FB50024 */ lw $s5, 0x24($sp) +/* 8B2BFC 80242B8C 8FB40020 */ lw $s4, 0x20($sp) +/* 8B2C00 80242B90 8FB3001C */ lw $s3, 0x1c($sp) +/* 8B2C04 80242B94 8FB20018 */ lw $s2, 0x18($sp) +/* 8B2C08 80242B98 8FB10014 */ lw $s1, 0x14($sp) +/* 8B2C0C 80242B9C 8FB00010 */ lw $s0, 0x10($sp) +/* 8B2C10 80242BA0 03E00008 */ jr $ra +/* 8B2C14 80242BA4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0.s deleted file mode 100644 index 6e2fec49cc..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0.s +++ /dev/null @@ -1,230 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BC0 -/* 8B2C30 80242BC0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8B2C34 80242BC4 AFB20020 */ sw $s2, 0x20($sp) -/* 8B2C38 80242BC8 0080902D */ daddu $s2, $a0, $zero -/* 8B2C3C 80242BCC AFB1001C */ sw $s1, 0x1c($sp) -/* 8B2C40 80242BD0 00A0882D */ daddu $s1, $a1, $zero -/* 8B2C44 80242BD4 AFBF003C */ sw $ra, 0x3c($sp) -/* 8B2C48 80242BD8 AFBE0038 */ sw $fp, 0x38($sp) -/* 8B2C4C 80242BDC AFB70034 */ sw $s7, 0x34($sp) -/* 8B2C50 80242BE0 AFB60030 */ sw $s6, 0x30($sp) -/* 8B2C54 80242BE4 AFB5002C */ sw $s5, 0x2c($sp) -/* 8B2C58 80242BE8 AFB40028 */ sw $s4, 0x28($sp) -/* 8B2C5C 80242BEC AFB30024 */ sw $s3, 0x24($sp) -/* 8B2C60 80242BF0 AFB00018 */ sw $s0, 0x18($sp) -/* 8B2C64 80242BF4 8E50000C */ lw $s0, 0xc($s2) -/* 8B2C68 80242BF8 8E050000 */ lw $a1, ($s0) -/* 8B2C6C 80242BFC 0C0B1EAF */ jal get_variable -/* 8B2C70 80242C00 26100004 */ addiu $s0, $s0, 4 -/* 8B2C74 80242C04 8E050000 */ lw $a1, ($s0) -/* 8B2C78 80242C08 26100004 */ addiu $s0, $s0, 4 -/* 8B2C7C 80242C0C 0240202D */ daddu $a0, $s2, $zero -/* 8B2C80 80242C10 0C0B1EAF */ jal get_variable -/* 8B2C84 80242C14 0040B02D */ daddu $s6, $v0, $zero -/* 8B2C88 80242C18 8E050000 */ lw $a1, ($s0) -/* 8B2C8C 80242C1C 26100004 */ addiu $s0, $s0, 4 -/* 8B2C90 80242C20 0240202D */ daddu $a0, $s2, $zero -/* 8B2C94 80242C24 0C0B1EAF */ jal get_variable -/* 8B2C98 80242C28 0040A82D */ daddu $s5, $v0, $zero -/* 8B2C9C 80242C2C 8E050000 */ lw $a1, ($s0) -/* 8B2CA0 80242C30 26100004 */ addiu $s0, $s0, 4 -/* 8B2CA4 80242C34 0240202D */ daddu $a0, $s2, $zero -/* 8B2CA8 80242C38 0C0B1EAF */ jal get_variable -/* 8B2CAC 80242C3C 0040A02D */ daddu $s4, $v0, $zero -/* 8B2CB0 80242C40 8E050000 */ lw $a1, ($s0) -/* 8B2CB4 80242C44 26100004 */ addiu $s0, $s0, 4 -/* 8B2CB8 80242C48 0240202D */ daddu $a0, $s2, $zero -/* 8B2CBC 80242C4C 0C0B1EAF */ jal get_variable -/* 8B2CC0 80242C50 0040B82D */ daddu $s7, $v0, $zero -/* 8B2CC4 80242C54 8E050000 */ lw $a1, ($s0) -/* 8B2CC8 80242C58 26100004 */ addiu $s0, $s0, 4 -/* 8B2CCC 80242C5C 0240202D */ daddu $a0, $s2, $zero -/* 8B2CD0 80242C60 0C0B1EAF */ jal get_variable -/* 8B2CD4 80242C64 0040982D */ daddu $s3, $v0, $zero -/* 8B2CD8 80242C68 0240202D */ daddu $a0, $s2, $zero -/* 8B2CDC 80242C6C 8E050000 */ lw $a1, ($s0) -/* 8B2CE0 80242C70 0C0B1EAF */ jal get_variable -/* 8B2CE4 80242C74 0040F02D */ daddu $fp, $v0, $zero -/* 8B2CE8 80242C78 12200011 */ beqz $s1, .L80242CC0 -/* 8B2CEC 80242C7C 0040802D */ daddu $s0, $v0, $zero -/* 8B2CF0 80242C80 3C048025 */ lui $a0, 0x8025 -/* 8B2CF4 80242C84 24847F24 */ addiu $a0, $a0, 0x7f24 -/* 8B2CF8 80242C88 3C058025 */ lui $a1, 0x8025 -/* 8B2CFC 80242C8C 24A57F25 */ addiu $a1, $a1, 0x7f25 -/* 8B2D00 80242C90 3C068025 */ lui $a2, 0x8025 -/* 8B2D04 80242C94 24C67F26 */ addiu $a2, $a2, 0x7f26 -/* 8B2D08 80242C98 3C078025 */ lui $a3, 0x8025 -/* 8B2D0C 80242C9C 24E77F27 */ addiu $a3, $a3, 0x7f27 -/* 8B2D10 80242CA0 3C028025 */ lui $v0, 0x8025 -/* 8B2D14 80242CA4 24427F28 */ addiu $v0, $v0, 0x7f28 -/* 8B2D18 80242CA8 AFA20010 */ sw $v0, 0x10($sp) -/* 8B2D1C 80242CAC 3C028025 */ lui $v0, 0x8025 -/* 8B2D20 80242CB0 24427F29 */ addiu $v0, $v0, 0x7f29 -/* 8B2D24 80242CB4 0C046FF5 */ jal func_8011BFD4 -/* 8B2D28 80242CB8 AFA20014 */ sw $v0, 0x14($sp) -/* 8B2D2C 80242CBC AE400070 */ sw $zero, 0x70($s2) -.L80242CC0: -/* 8B2D30 80242CC0 1A00007A */ blez $s0, .L80242EAC -/* 8B2D34 80242CC4 32C400FF */ andi $a0, $s6, 0xff -/* 8B2D38 80242CC8 3C048025 */ lui $a0, 0x8025 -/* 8B2D3C 80242CCC 90847F24 */ lbu $a0, 0x7f24($a0) -/* 8B2D40 80242CD0 8E480070 */ lw $t0, 0x70($s2) -/* 8B2D44 80242CD4 02C41023 */ subu $v0, $s6, $a0 -/* 8B2D48 80242CD8 00480018 */ mult $v0, $t0 -/* 8B2D4C 80242CDC 00001812 */ mflo $v1 -/* 8B2D50 80242CE0 00000000 */ nop -/* 8B2D54 80242CE4 16000002 */ bnez $s0, .L80242CF0 -/* 8B2D58 80242CE8 0070001A */ div $zero, $v1, $s0 -/* 8B2D5C 80242CEC 0007000D */ break 7 -.L80242CF0: -/* 8B2D60 80242CF0 2401FFFF */ addiu $at, $zero, -1 -/* 8B2D64 80242CF4 16010004 */ bne $s0, $at, .L80242D08 -/* 8B2D68 80242CF8 3C018000 */ lui $at, 0x8000 -/* 8B2D6C 80242CFC 14610002 */ bne $v1, $at, .L80242D08 -/* 8B2D70 80242D00 00000000 */ nop -/* 8B2D74 80242D04 0006000D */ break 6 -.L80242D08: -/* 8B2D78 80242D08 00006812 */ mflo $t5 -/* 8B2D7C 80242D0C 3C058025 */ lui $a1, 0x8025 -/* 8B2D80 80242D10 90A57F25 */ lbu $a1, 0x7f25($a1) -/* 8B2D84 80242D14 02A51023 */ subu $v0, $s5, $a1 -/* 8B2D88 80242D18 00480018 */ mult $v0, $t0 -/* 8B2D8C 80242D1C 00001812 */ mflo $v1 -/* 8B2D90 80242D20 00000000 */ nop -/* 8B2D94 80242D24 16000002 */ bnez $s0, .L80242D30 -/* 8B2D98 80242D28 0070001A */ div $zero, $v1, $s0 -/* 8B2D9C 80242D2C 0007000D */ break 7 -.L80242D30: -/* 8B2DA0 80242D30 2401FFFF */ addiu $at, $zero, -1 -/* 8B2DA4 80242D34 16010004 */ bne $s0, $at, .L80242D48 -/* 8B2DA8 80242D38 3C018000 */ lui $at, 0x8000 -/* 8B2DAC 80242D3C 14610002 */ bne $v1, $at, .L80242D48 -/* 8B2DB0 80242D40 00000000 */ nop -/* 8B2DB4 80242D44 0006000D */ break 6 -.L80242D48: -/* 8B2DB8 80242D48 00006012 */ mflo $t4 -/* 8B2DBC 80242D4C 3C068025 */ lui $a2, 0x8025 -/* 8B2DC0 80242D50 90C67F26 */ lbu $a2, 0x7f26($a2) -/* 8B2DC4 80242D54 02861023 */ subu $v0, $s4, $a2 -/* 8B2DC8 80242D58 00480018 */ mult $v0, $t0 -/* 8B2DCC 80242D5C 00001812 */ mflo $v1 -/* 8B2DD0 80242D60 00000000 */ nop -/* 8B2DD4 80242D64 16000002 */ bnez $s0, .L80242D70 -/* 8B2DD8 80242D68 0070001A */ div $zero, $v1, $s0 -/* 8B2DDC 80242D6C 0007000D */ break 7 -.L80242D70: -/* 8B2DE0 80242D70 2401FFFF */ addiu $at, $zero, -1 -/* 8B2DE4 80242D74 16010004 */ bne $s0, $at, .L80242D88 -/* 8B2DE8 80242D78 3C018000 */ lui $at, 0x8000 -/* 8B2DEC 80242D7C 14610002 */ bne $v1, $at, .L80242D88 -/* 8B2DF0 80242D80 00000000 */ nop -/* 8B2DF4 80242D84 0006000D */ break 6 -.L80242D88: -/* 8B2DF8 80242D88 00005812 */ mflo $t3 -/* 8B2DFC 80242D8C 3C038025 */ lui $v1, 0x8025 -/* 8B2E00 80242D90 90637F28 */ lbu $v1, 0x7f28($v1) -/* 8B2E04 80242D94 02631023 */ subu $v0, $s3, $v1 -/* 8B2E08 80242D98 00480018 */ mult $v0, $t0 -/* 8B2E0C 80242D9C 00004812 */ mflo $t1 -/* 8B2E10 80242DA0 00000000 */ nop -/* 8B2E14 80242DA4 16000002 */ bnez $s0, .L80242DB0 -/* 8B2E18 80242DA8 0130001A */ div $zero, $t1, $s0 -/* 8B2E1C 80242DAC 0007000D */ break 7 -.L80242DB0: -/* 8B2E20 80242DB0 2401FFFF */ addiu $at, $zero, -1 -/* 8B2E24 80242DB4 16010004 */ bne $s0, $at, .L80242DC8 -/* 8B2E28 80242DB8 3C018000 */ lui $at, 0x8000 -/* 8B2E2C 80242DBC 15210002 */ bne $t1, $at, .L80242DC8 -/* 8B2E30 80242DC0 00000000 */ nop -/* 8B2E34 80242DC4 0006000D */ break 6 -.L80242DC8: -/* 8B2E38 80242DC8 00004812 */ mflo $t1 -/* 8B2E3C 80242DCC 3C078025 */ lui $a3, 0x8025 -/* 8B2E40 80242DD0 90E77F27 */ lbu $a3, 0x7f27($a3) -/* 8B2E44 80242DD4 02E71023 */ subu $v0, $s7, $a3 -/* 8B2E48 80242DD8 00480018 */ mult $v0, $t0 -/* 8B2E4C 80242DDC 00004012 */ mflo $t0 -/* 8B2E50 80242DE0 00000000 */ nop -/* 8B2E54 80242DE4 16000002 */ bnez $s0, .L80242DF0 -/* 8B2E58 80242DE8 0110001A */ div $zero, $t0, $s0 -/* 8B2E5C 80242DEC 0007000D */ break 7 -.L80242DF0: -/* 8B2E60 80242DF0 2401FFFF */ addiu $at, $zero, -1 -/* 8B2E64 80242DF4 16010004 */ bne $s0, $at, .L80242E08 -/* 8B2E68 80242DF8 3C018000 */ lui $at, 0x8000 -/* 8B2E6C 80242DFC 15010002 */ bne $t0, $at, .L80242E08 -/* 8B2E70 80242E00 00000000 */ nop -/* 8B2E74 80242E04 0006000D */ break 6 -.L80242E08: -/* 8B2E78 80242E08 00005012 */ mflo $t2 -/* 8B2E7C 80242E0C 3C088025 */ lui $t0, 0x8025 -/* 8B2E80 80242E10 91087F29 */ lbu $t0, 0x7f29($t0) -/* 8B2E84 80242E14 00691821 */ addu $v1, $v1, $t1 -/* 8B2E88 80242E18 306300FF */ andi $v1, $v1, 0xff -/* 8B2E8C 80242E1C AFA30010 */ sw $v1, 0x10($sp) -/* 8B2E90 80242E20 8E430070 */ lw $v1, 0x70($s2) -/* 8B2E94 80242E24 03C81023 */ subu $v0, $fp, $t0 -/* 8B2E98 80242E28 00430018 */ mult $v0, $v1 -/* 8B2E9C 80242E2C 00001812 */ mflo $v1 -/* 8B2EA0 80242E30 00000000 */ nop -/* 8B2EA4 80242E34 16000002 */ bnez $s0, .L80242E40 -/* 8B2EA8 80242E38 0070001A */ div $zero, $v1, $s0 -/* 8B2EAC 80242E3C 0007000D */ break 7 -.L80242E40: -/* 8B2EB0 80242E40 2401FFFF */ addiu $at, $zero, -1 -/* 8B2EB4 80242E44 16010004 */ bne $s0, $at, .L80242E58 -/* 8B2EB8 80242E48 3C018000 */ lui $at, 0x8000 -/* 8B2EBC 80242E4C 14610002 */ bne $v1, $at, .L80242E58 -/* 8B2EC0 80242E50 00000000 */ nop -/* 8B2EC4 80242E54 0006000D */ break 6 -.L80242E58: -/* 8B2EC8 80242E58 00001012 */ mflo $v0 -/* 8B2ECC 80242E5C 008D2021 */ addu $a0, $a0, $t5 -/* 8B2ED0 80242E60 308400FF */ andi $a0, $a0, 0xff -/* 8B2ED4 80242E64 00AC2821 */ addu $a1, $a1, $t4 -/* 8B2ED8 80242E68 30A500FF */ andi $a1, $a1, 0xff -/* 8B2EDC 80242E6C 00CB3021 */ addu $a2, $a2, $t3 -/* 8B2EE0 80242E70 30C600FF */ andi $a2, $a2, 0xff -/* 8B2EE4 80242E74 00EA3821 */ addu $a3, $a3, $t2 -/* 8B2EE8 80242E78 30E700FF */ andi $a3, $a3, 0xff -/* 8B2EEC 80242E7C 01024021 */ addu $t0, $t0, $v0 -/* 8B2EF0 80242E80 310800FF */ andi $t0, $t0, 0xff -/* 8B2EF4 80242E84 0C046FE6 */ jal func_8011BF98 -/* 8B2EF8 80242E88 AFA80014 */ sw $t0, 0x14($sp) -/* 8B2EFC 80242E8C 8E420070 */ lw $v0, 0x70($s2) -/* 8B2F00 80242E90 24420001 */ addiu $v0, $v0, 1 -/* 8B2F04 80242E94 AE420070 */ sw $v0, 0x70($s2) -/* 8B2F08 80242E98 0202102A */ slt $v0, $s0, $v0 -/* 8B2F0C 80242E9C 1040000D */ beqz $v0, .L80242ED4 -/* 8B2F10 80242EA0 24020002 */ addiu $v0, $zero, 2 -/* 8B2F14 80242EA4 08090BB6 */ j .L80242ED8 -/* 8B2F18 80242EA8 00000000 */ nop -.L80242EAC: -/* 8B2F1C 80242EAC 32A500FF */ andi $a1, $s5, 0xff -/* 8B2F20 80242EB0 328600FF */ andi $a2, $s4, 0xff -/* 8B2F24 80242EB4 32E700FF */ andi $a3, $s7, 0xff -/* 8B2F28 80242EB8 326200FF */ andi $v0, $s3, 0xff -/* 8B2F2C 80242EBC AFA20010 */ sw $v0, 0x10($sp) -/* 8B2F30 80242EC0 33C200FF */ andi $v0, $fp, 0xff -/* 8B2F34 80242EC4 0C046FE6 */ jal func_8011BF98 -/* 8B2F38 80242EC8 AFA20014 */ sw $v0, 0x14($sp) -/* 8B2F3C 80242ECC 08090BB6 */ j .L80242ED8 -/* 8B2F40 80242ED0 24020002 */ addiu $v0, $zero, 2 -.L80242ED4: -/* 8B2F44 80242ED4 0000102D */ daddu $v0, $zero, $zero -.L80242ED8: -/* 8B2F48 80242ED8 8FBF003C */ lw $ra, 0x3c($sp) -/* 8B2F4C 80242EDC 8FBE0038 */ lw $fp, 0x38($sp) -/* 8B2F50 80242EE0 8FB70034 */ lw $s7, 0x34($sp) -/* 8B2F54 80242EE4 8FB60030 */ lw $s6, 0x30($sp) -/* 8B2F58 80242EE8 8FB5002C */ lw $s5, 0x2c($sp) -/* 8B2F5C 80242EEC 8FB40028 */ lw $s4, 0x28($sp) -/* 8B2F60 80242EF0 8FB30024 */ lw $s3, 0x24($sp) -/* 8B2F64 80242EF4 8FB20020 */ lw $s2, 0x20($sp) -/* 8B2F68 80242EF8 8FB1001C */ lw $s1, 0x1c($sp) -/* 8B2F6C 80242EFC 8FB00018 */ lw $s0, 0x18($sp) -/* 8B2F70 80242F00 03E00008 */ jr $ra -/* 8B2F74 80242F04 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s new file mode 100644 index 0000000000..50a7e42deb --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242BC0_8B2C30.s @@ -0,0 +1,230 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242BC0_8B2C30 +/* 8B2C30 80242BC0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 8B2C34 80242BC4 AFB20020 */ sw $s2, 0x20($sp) +/* 8B2C38 80242BC8 0080902D */ daddu $s2, $a0, $zero +/* 8B2C3C 80242BCC AFB1001C */ sw $s1, 0x1c($sp) +/* 8B2C40 80242BD0 00A0882D */ daddu $s1, $a1, $zero +/* 8B2C44 80242BD4 AFBF003C */ sw $ra, 0x3c($sp) +/* 8B2C48 80242BD8 AFBE0038 */ sw $fp, 0x38($sp) +/* 8B2C4C 80242BDC AFB70034 */ sw $s7, 0x34($sp) +/* 8B2C50 80242BE0 AFB60030 */ sw $s6, 0x30($sp) +/* 8B2C54 80242BE4 AFB5002C */ sw $s5, 0x2c($sp) +/* 8B2C58 80242BE8 AFB40028 */ sw $s4, 0x28($sp) +/* 8B2C5C 80242BEC AFB30024 */ sw $s3, 0x24($sp) +/* 8B2C60 80242BF0 AFB00018 */ sw $s0, 0x18($sp) +/* 8B2C64 80242BF4 8E50000C */ lw $s0, 0xc($s2) +/* 8B2C68 80242BF8 8E050000 */ lw $a1, ($s0) +/* 8B2C6C 80242BFC 0C0B1EAF */ jal get_variable +/* 8B2C70 80242C00 26100004 */ addiu $s0, $s0, 4 +/* 8B2C74 80242C04 8E050000 */ lw $a1, ($s0) +/* 8B2C78 80242C08 26100004 */ addiu $s0, $s0, 4 +/* 8B2C7C 80242C0C 0240202D */ daddu $a0, $s2, $zero +/* 8B2C80 80242C10 0C0B1EAF */ jal get_variable +/* 8B2C84 80242C14 0040B02D */ daddu $s6, $v0, $zero +/* 8B2C88 80242C18 8E050000 */ lw $a1, ($s0) +/* 8B2C8C 80242C1C 26100004 */ addiu $s0, $s0, 4 +/* 8B2C90 80242C20 0240202D */ daddu $a0, $s2, $zero +/* 8B2C94 80242C24 0C0B1EAF */ jal get_variable +/* 8B2C98 80242C28 0040A82D */ daddu $s5, $v0, $zero +/* 8B2C9C 80242C2C 8E050000 */ lw $a1, ($s0) +/* 8B2CA0 80242C30 26100004 */ addiu $s0, $s0, 4 +/* 8B2CA4 80242C34 0240202D */ daddu $a0, $s2, $zero +/* 8B2CA8 80242C38 0C0B1EAF */ jal get_variable +/* 8B2CAC 80242C3C 0040A02D */ daddu $s4, $v0, $zero +/* 8B2CB0 80242C40 8E050000 */ lw $a1, ($s0) +/* 8B2CB4 80242C44 26100004 */ addiu $s0, $s0, 4 +/* 8B2CB8 80242C48 0240202D */ daddu $a0, $s2, $zero +/* 8B2CBC 80242C4C 0C0B1EAF */ jal get_variable +/* 8B2CC0 80242C50 0040B82D */ daddu $s7, $v0, $zero +/* 8B2CC4 80242C54 8E050000 */ lw $a1, ($s0) +/* 8B2CC8 80242C58 26100004 */ addiu $s0, $s0, 4 +/* 8B2CCC 80242C5C 0240202D */ daddu $a0, $s2, $zero +/* 8B2CD0 80242C60 0C0B1EAF */ jal get_variable +/* 8B2CD4 80242C64 0040982D */ daddu $s3, $v0, $zero +/* 8B2CD8 80242C68 0240202D */ daddu $a0, $s2, $zero +/* 8B2CDC 80242C6C 8E050000 */ lw $a1, ($s0) +/* 8B2CE0 80242C70 0C0B1EAF */ jal get_variable +/* 8B2CE4 80242C74 0040F02D */ daddu $fp, $v0, $zero +/* 8B2CE8 80242C78 12200011 */ beqz $s1, .L80242CC0 +/* 8B2CEC 80242C7C 0040802D */ daddu $s0, $v0, $zero +/* 8B2CF0 80242C80 3C048025 */ lui $a0, 0x8025 +/* 8B2CF4 80242C84 24847F24 */ addiu $a0, $a0, 0x7f24 +/* 8B2CF8 80242C88 3C058025 */ lui $a1, 0x8025 +/* 8B2CFC 80242C8C 24A57F25 */ addiu $a1, $a1, 0x7f25 +/* 8B2D00 80242C90 3C068025 */ lui $a2, 0x8025 +/* 8B2D04 80242C94 24C67F26 */ addiu $a2, $a2, 0x7f26 +/* 8B2D08 80242C98 3C078025 */ lui $a3, 0x8025 +/* 8B2D0C 80242C9C 24E77F27 */ addiu $a3, $a3, 0x7f27 +/* 8B2D10 80242CA0 3C028025 */ lui $v0, 0x8025 +/* 8B2D14 80242CA4 24427F28 */ addiu $v0, $v0, 0x7f28 +/* 8B2D18 80242CA8 AFA20010 */ sw $v0, 0x10($sp) +/* 8B2D1C 80242CAC 3C028025 */ lui $v0, 0x8025 +/* 8B2D20 80242CB0 24427F29 */ addiu $v0, $v0, 0x7f29 +/* 8B2D24 80242CB4 0C046FF5 */ jal func_8011BFD4 +/* 8B2D28 80242CB8 AFA20014 */ sw $v0, 0x14($sp) +/* 8B2D2C 80242CBC AE400070 */ sw $zero, 0x70($s2) +.L80242CC0: +/* 8B2D30 80242CC0 1A00007A */ blez $s0, .L80242EAC +/* 8B2D34 80242CC4 32C400FF */ andi $a0, $s6, 0xff +/* 8B2D38 80242CC8 3C048025 */ lui $a0, 0x8025 +/* 8B2D3C 80242CCC 90847F24 */ lbu $a0, 0x7f24($a0) +/* 8B2D40 80242CD0 8E480070 */ lw $t0, 0x70($s2) +/* 8B2D44 80242CD4 02C41023 */ subu $v0, $s6, $a0 +/* 8B2D48 80242CD8 00480018 */ mult $v0, $t0 +/* 8B2D4C 80242CDC 00001812 */ mflo $v1 +/* 8B2D50 80242CE0 00000000 */ nop +/* 8B2D54 80242CE4 16000002 */ bnez $s0, .L80242CF0 +/* 8B2D58 80242CE8 0070001A */ div $zero, $v1, $s0 +/* 8B2D5C 80242CEC 0007000D */ break 7 +.L80242CF0: +/* 8B2D60 80242CF0 2401FFFF */ addiu $at, $zero, -1 +/* 8B2D64 80242CF4 16010004 */ bne $s0, $at, .L80242D08 +/* 8B2D68 80242CF8 3C018000 */ lui $at, 0x8000 +/* 8B2D6C 80242CFC 14610002 */ bne $v1, $at, .L80242D08 +/* 8B2D70 80242D00 00000000 */ nop +/* 8B2D74 80242D04 0006000D */ break 6 +.L80242D08: +/* 8B2D78 80242D08 00006812 */ mflo $t5 +/* 8B2D7C 80242D0C 3C058025 */ lui $a1, 0x8025 +/* 8B2D80 80242D10 90A57F25 */ lbu $a1, 0x7f25($a1) +/* 8B2D84 80242D14 02A51023 */ subu $v0, $s5, $a1 +/* 8B2D88 80242D18 00480018 */ mult $v0, $t0 +/* 8B2D8C 80242D1C 00001812 */ mflo $v1 +/* 8B2D90 80242D20 00000000 */ nop +/* 8B2D94 80242D24 16000002 */ bnez $s0, .L80242D30 +/* 8B2D98 80242D28 0070001A */ div $zero, $v1, $s0 +/* 8B2D9C 80242D2C 0007000D */ break 7 +.L80242D30: +/* 8B2DA0 80242D30 2401FFFF */ addiu $at, $zero, -1 +/* 8B2DA4 80242D34 16010004 */ bne $s0, $at, .L80242D48 +/* 8B2DA8 80242D38 3C018000 */ lui $at, 0x8000 +/* 8B2DAC 80242D3C 14610002 */ bne $v1, $at, .L80242D48 +/* 8B2DB0 80242D40 00000000 */ nop +/* 8B2DB4 80242D44 0006000D */ break 6 +.L80242D48: +/* 8B2DB8 80242D48 00006012 */ mflo $t4 +/* 8B2DBC 80242D4C 3C068025 */ lui $a2, 0x8025 +/* 8B2DC0 80242D50 90C67F26 */ lbu $a2, 0x7f26($a2) +/* 8B2DC4 80242D54 02861023 */ subu $v0, $s4, $a2 +/* 8B2DC8 80242D58 00480018 */ mult $v0, $t0 +/* 8B2DCC 80242D5C 00001812 */ mflo $v1 +/* 8B2DD0 80242D60 00000000 */ nop +/* 8B2DD4 80242D64 16000002 */ bnez $s0, .L80242D70 +/* 8B2DD8 80242D68 0070001A */ div $zero, $v1, $s0 +/* 8B2DDC 80242D6C 0007000D */ break 7 +.L80242D70: +/* 8B2DE0 80242D70 2401FFFF */ addiu $at, $zero, -1 +/* 8B2DE4 80242D74 16010004 */ bne $s0, $at, .L80242D88 +/* 8B2DE8 80242D78 3C018000 */ lui $at, 0x8000 +/* 8B2DEC 80242D7C 14610002 */ bne $v1, $at, .L80242D88 +/* 8B2DF0 80242D80 00000000 */ nop +/* 8B2DF4 80242D84 0006000D */ break 6 +.L80242D88: +/* 8B2DF8 80242D88 00005812 */ mflo $t3 +/* 8B2DFC 80242D8C 3C038025 */ lui $v1, 0x8025 +/* 8B2E00 80242D90 90637F28 */ lbu $v1, 0x7f28($v1) +/* 8B2E04 80242D94 02631023 */ subu $v0, $s3, $v1 +/* 8B2E08 80242D98 00480018 */ mult $v0, $t0 +/* 8B2E0C 80242D9C 00004812 */ mflo $t1 +/* 8B2E10 80242DA0 00000000 */ nop +/* 8B2E14 80242DA4 16000002 */ bnez $s0, .L80242DB0 +/* 8B2E18 80242DA8 0130001A */ div $zero, $t1, $s0 +/* 8B2E1C 80242DAC 0007000D */ break 7 +.L80242DB0: +/* 8B2E20 80242DB0 2401FFFF */ addiu $at, $zero, -1 +/* 8B2E24 80242DB4 16010004 */ bne $s0, $at, .L80242DC8 +/* 8B2E28 80242DB8 3C018000 */ lui $at, 0x8000 +/* 8B2E2C 80242DBC 15210002 */ bne $t1, $at, .L80242DC8 +/* 8B2E30 80242DC0 00000000 */ nop +/* 8B2E34 80242DC4 0006000D */ break 6 +.L80242DC8: +/* 8B2E38 80242DC8 00004812 */ mflo $t1 +/* 8B2E3C 80242DCC 3C078025 */ lui $a3, 0x8025 +/* 8B2E40 80242DD0 90E77F27 */ lbu $a3, 0x7f27($a3) +/* 8B2E44 80242DD4 02E71023 */ subu $v0, $s7, $a3 +/* 8B2E48 80242DD8 00480018 */ mult $v0, $t0 +/* 8B2E4C 80242DDC 00004012 */ mflo $t0 +/* 8B2E50 80242DE0 00000000 */ nop +/* 8B2E54 80242DE4 16000002 */ bnez $s0, .L80242DF0 +/* 8B2E58 80242DE8 0110001A */ div $zero, $t0, $s0 +/* 8B2E5C 80242DEC 0007000D */ break 7 +.L80242DF0: +/* 8B2E60 80242DF0 2401FFFF */ addiu $at, $zero, -1 +/* 8B2E64 80242DF4 16010004 */ bne $s0, $at, .L80242E08 +/* 8B2E68 80242DF8 3C018000 */ lui $at, 0x8000 +/* 8B2E6C 80242DFC 15010002 */ bne $t0, $at, .L80242E08 +/* 8B2E70 80242E00 00000000 */ nop +/* 8B2E74 80242E04 0006000D */ break 6 +.L80242E08: +/* 8B2E78 80242E08 00005012 */ mflo $t2 +/* 8B2E7C 80242E0C 3C088025 */ lui $t0, 0x8025 +/* 8B2E80 80242E10 91087F29 */ lbu $t0, 0x7f29($t0) +/* 8B2E84 80242E14 00691821 */ addu $v1, $v1, $t1 +/* 8B2E88 80242E18 306300FF */ andi $v1, $v1, 0xff +/* 8B2E8C 80242E1C AFA30010 */ sw $v1, 0x10($sp) +/* 8B2E90 80242E20 8E430070 */ lw $v1, 0x70($s2) +/* 8B2E94 80242E24 03C81023 */ subu $v0, $fp, $t0 +/* 8B2E98 80242E28 00430018 */ mult $v0, $v1 +/* 8B2E9C 80242E2C 00001812 */ mflo $v1 +/* 8B2EA0 80242E30 00000000 */ nop +/* 8B2EA4 80242E34 16000002 */ bnez $s0, .L80242E40 +/* 8B2EA8 80242E38 0070001A */ div $zero, $v1, $s0 +/* 8B2EAC 80242E3C 0007000D */ break 7 +.L80242E40: +/* 8B2EB0 80242E40 2401FFFF */ addiu $at, $zero, -1 +/* 8B2EB4 80242E44 16010004 */ bne $s0, $at, .L80242E58 +/* 8B2EB8 80242E48 3C018000 */ lui $at, 0x8000 +/* 8B2EBC 80242E4C 14610002 */ bne $v1, $at, .L80242E58 +/* 8B2EC0 80242E50 00000000 */ nop +/* 8B2EC4 80242E54 0006000D */ break 6 +.L80242E58: +/* 8B2EC8 80242E58 00001012 */ mflo $v0 +/* 8B2ECC 80242E5C 008D2021 */ addu $a0, $a0, $t5 +/* 8B2ED0 80242E60 308400FF */ andi $a0, $a0, 0xff +/* 8B2ED4 80242E64 00AC2821 */ addu $a1, $a1, $t4 +/* 8B2ED8 80242E68 30A500FF */ andi $a1, $a1, 0xff +/* 8B2EDC 80242E6C 00CB3021 */ addu $a2, $a2, $t3 +/* 8B2EE0 80242E70 30C600FF */ andi $a2, $a2, 0xff +/* 8B2EE4 80242E74 00EA3821 */ addu $a3, $a3, $t2 +/* 8B2EE8 80242E78 30E700FF */ andi $a3, $a3, 0xff +/* 8B2EEC 80242E7C 01024021 */ addu $t0, $t0, $v0 +/* 8B2EF0 80242E80 310800FF */ andi $t0, $t0, 0xff +/* 8B2EF4 80242E84 0C046FE6 */ jal func_8011BF98 +/* 8B2EF8 80242E88 AFA80014 */ sw $t0, 0x14($sp) +/* 8B2EFC 80242E8C 8E420070 */ lw $v0, 0x70($s2) +/* 8B2F00 80242E90 24420001 */ addiu $v0, $v0, 1 +/* 8B2F04 80242E94 AE420070 */ sw $v0, 0x70($s2) +/* 8B2F08 80242E98 0202102A */ slt $v0, $s0, $v0 +/* 8B2F0C 80242E9C 1040000D */ beqz $v0, .L80242ED4 +/* 8B2F10 80242EA0 24020002 */ addiu $v0, $zero, 2 +/* 8B2F14 80242EA4 08090BB6 */ j .L80242ED8 +/* 8B2F18 80242EA8 00000000 */ nop +.L80242EAC: +/* 8B2F1C 80242EAC 32A500FF */ andi $a1, $s5, 0xff +/* 8B2F20 80242EB0 328600FF */ andi $a2, $s4, 0xff +/* 8B2F24 80242EB4 32E700FF */ andi $a3, $s7, 0xff +/* 8B2F28 80242EB8 326200FF */ andi $v0, $s3, 0xff +/* 8B2F2C 80242EBC AFA20010 */ sw $v0, 0x10($sp) +/* 8B2F30 80242EC0 33C200FF */ andi $v0, $fp, 0xff +/* 8B2F34 80242EC4 0C046FE6 */ jal func_8011BF98 +/* 8B2F38 80242EC8 AFA20014 */ sw $v0, 0x14($sp) +/* 8B2F3C 80242ECC 08090BB6 */ j .L80242ED8 +/* 8B2F40 80242ED0 24020002 */ addiu $v0, $zero, 2 +.L80242ED4: +/* 8B2F44 80242ED4 0000102D */ daddu $v0, $zero, $zero +.L80242ED8: +/* 8B2F48 80242ED8 8FBF003C */ lw $ra, 0x3c($sp) +/* 8B2F4C 80242EDC 8FBE0038 */ lw $fp, 0x38($sp) +/* 8B2F50 80242EE0 8FB70034 */ lw $s7, 0x34($sp) +/* 8B2F54 80242EE4 8FB60030 */ lw $s6, 0x30($sp) +/* 8B2F58 80242EE8 8FB5002C */ lw $s5, 0x2c($sp) +/* 8B2F5C 80242EEC 8FB40028 */ lw $s4, 0x28($sp) +/* 8B2F60 80242EF0 8FB30024 */ lw $s3, 0x24($sp) +/* 8B2F64 80242EF4 8FB20020 */ lw $s2, 0x20($sp) +/* 8B2F68 80242EF8 8FB1001C */ lw $s1, 0x1c($sp) +/* 8B2F6C 80242EFC 8FB00018 */ lw $s0, 0x18($sp) +/* 8B2F70 80242F00 03E00008 */ jr $ra +/* 8B2F74 80242F04 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F28.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F28.s deleted file mode 100644 index dbc0d367fd..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F28.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F28 -/* 8B2F98 80242F28 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B2F9C 80242F2C 2404009C */ addiu $a0, $zero, 0x9c -/* 8B2FA0 80242F30 2405FFFF */ addiu $a1, $zero, -1 -/* 8B2FA4 80242F34 24060001 */ addiu $a2, $zero, 1 -/* 8B2FA8 80242F38 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2FAC 80242F3C 0C046E54 */ jal func_8011B950 -/* 8B2FB0 80242F40 00C0382D */ daddu $a3, $a2, $zero -/* 8B2FB4 80242F44 0000202D */ daddu $a0, $zero, $zero -/* 8B2FB8 80242F48 0080282D */ daddu $a1, $a0, $zero -/* 8B2FBC 80242F4C 0080302D */ daddu $a2, $a0, $zero -/* 8B2FC0 80242F50 0C046F97 */ jal set_background_color_blend -/* 8B2FC4 80242F54 240700FF */ addiu $a3, $zero, 0xff -/* 8B2FC8 80242F58 3C02800B */ lui $v0, %hi(gCameras) -/* 8B2FCC 80242F5C 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 8B2FD0 80242F60 A440002C */ sh $zero, 0x2c($v0) -/* 8B2FD4 80242F64 A440002E */ sh $zero, 0x2e($v0) -/* 8B2FD8 80242F68 A4400030 */ sh $zero, 0x30($v0) -/* 8B2FDC 80242F6C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B2FE0 80242F70 24020002 */ addiu $v0, $zero, 2 -/* 8B2FE4 80242F74 03E00008 */ jr $ra -/* 8B2FE8 80242F78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F28_8B2F98.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F28_8B2F98.s new file mode 100644 index 0000000000..981e4b35cc --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F28_8B2F98.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F28_8B2F98 +/* 8B2F98 80242F28 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B2F9C 80242F2C 2404009C */ addiu $a0, $zero, 0x9c +/* 8B2FA0 80242F30 2405FFFF */ addiu $a1, $zero, -1 +/* 8B2FA4 80242F34 24060001 */ addiu $a2, $zero, 1 +/* 8B2FA8 80242F38 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B2FAC 80242F3C 0C046E54 */ jal func_8011B950 +/* 8B2FB0 80242F40 00C0382D */ daddu $a3, $a2, $zero +/* 8B2FB4 80242F44 0000202D */ daddu $a0, $zero, $zero +/* 8B2FB8 80242F48 0080282D */ daddu $a1, $a0, $zero +/* 8B2FBC 80242F4C 0080302D */ daddu $a2, $a0, $zero +/* 8B2FC0 80242F50 0C046F97 */ jal set_background_color_blend +/* 8B2FC4 80242F54 240700FF */ addiu $a3, $zero, 0xff +/* 8B2FC8 80242F58 3C02800B */ lui $v0, %hi(gCameras) +/* 8B2FCC 80242F5C 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* 8B2FD0 80242F60 A440002C */ sh $zero, 0x2c($v0) +/* 8B2FD4 80242F64 A440002E */ sh $zero, 0x2e($v0) +/* 8B2FD8 80242F68 A4400030 */ sh $zero, 0x30($v0) +/* 8B2FDC 80242F6C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B2FE0 80242F70 24020002 */ addiu $v0, $zero, 2 +/* 8B2FE4 80242F74 03E00008 */ jr $ra +/* 8B2FE8 80242F78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C.s deleted file mode 100644 index f704376566..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F7C -/* 8B2FEC 80242F7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B2FF0 80242F80 AFB10014 */ sw $s1, 0x14($sp) -/* 8B2FF4 80242F84 0080882D */ daddu $s1, $a0, $zero -/* 8B2FF8 80242F88 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B2FFC 80242F8C 10A0000B */ beqz $a1, .L80242FBC -/* 8B3000 80242F90 AFB00010 */ sw $s0, 0x10($sp) -/* 8B3004 80242F94 8E24014C */ lw $a0, 0x14c($s1) -/* 8B3008 80242F98 0C00EAD2 */ jal get_npc_safe -/* 8B300C 80242F9C AE200074 */ sw $zero, 0x74($s1) -/* 8B3010 80242FA0 8E23014C */ lw $v1, 0x14c($s1) -/* 8B3014 80242FA4 AE220078 */ sw $v0, 0x78($s1) -/* 8B3018 80242FA8 00031840 */ sll $v1, $v1, 1 -/* 8B301C 80242FAC 3C028025 */ lui $v0, 0x8025 -/* 8B3020 80242FB0 00431021 */ addu $v0, $v0, $v1 -/* 8B3024 80242FB4 8442E538 */ lh $v0, -0x1ac8($v0) -/* 8B3028 80242FB8 AE22007C */ sw $v0, 0x7c($s1) -.L80242FBC: -/* 8B302C 80242FBC 8E22007C */ lw $v0, 0x7c($s1) -/* 8B3030 80242FC0 14400015 */ bnez $v0, .L80243018 -/* 8B3034 80242FC4 2442FFFF */ addiu $v0, $v0, -1 -/* 8B3038 80242FC8 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8B303C 80242FCC 0C00A8BB */ jal sin_deg -/* 8B3040 80242FD0 8E300078 */ lw $s0, 0x78($s1) -/* 8B3044 80242FD4 3C013FC0 */ lui $at, 0x3fc0 -/* 8B3048 80242FD8 44811000 */ mtc1 $at, $f2 -/* 8B304C 80242FDC 00000000 */ nop -/* 8B3050 80242FE0 46020002 */ mul.s $f0, $f0, $f2 -/* 8B3054 80242FE4 00000000 */ nop -/* 8B3058 80242FE8 3C014190 */ lui $at, 0x4190 -/* 8B305C 80242FEC 44816000 */ mtc1 $at, $f12 -/* 8B3060 80242FF0 4600010D */ trunc.w.s $f4, $f0 -/* 8B3064 80242FF4 44022000 */ mfc1 $v0, $f4 -/* 8B3068 80242FF8 00000000 */ nop -/* 8B306C 80242FFC A20200AB */ sb $v0, 0xab($s0) -/* 8B3070 80243000 C6200074 */ lwc1 $f0, 0x74($s1) -/* 8B3074 80243004 0C00A6C9 */ jal clamp_angle -/* 8B3078 80243008 460C0300 */ add.s $f12, $f0, $f12 -/* 8B307C 8024300C 0000102D */ daddu $v0, $zero, $zero -/* 8B3080 80243010 08090C08 */ j .L80243020 -/* 8B3084 80243014 E6200074 */ swc1 $f0, 0x74($s1) -.L80243018: -/* 8B3088 80243018 AE22007C */ sw $v0, 0x7c($s1) -/* 8B308C 8024301C 0000102D */ daddu $v0, $zero, $zero -.L80243020: -/* 8B3090 80243020 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B3094 80243024 8FB10014 */ lw $s1, 0x14($sp) -/* 8B3098 80243028 8FB00010 */ lw $s0, 0x10($sp) -/* 8B309C 8024302C 03E00008 */ jr $ra -/* 8B30A0 80243030 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s new file mode 100644 index 0000000000..8e13b3b310 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242F7C_8B2FEC.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F7C_8B2FEC +/* 8B2FEC 80242F7C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B2FF0 80242F80 AFB10014 */ sw $s1, 0x14($sp) +/* 8B2FF4 80242F84 0080882D */ daddu $s1, $a0, $zero +/* 8B2FF8 80242F88 AFBF0018 */ sw $ra, 0x18($sp) +/* 8B2FFC 80242F8C 10A0000B */ beqz $a1, .L80242FBC +/* 8B3000 80242F90 AFB00010 */ sw $s0, 0x10($sp) +/* 8B3004 80242F94 8E24014C */ lw $a0, 0x14c($s1) +/* 8B3008 80242F98 0C00EAD2 */ jal get_npc_safe +/* 8B300C 80242F9C AE200074 */ sw $zero, 0x74($s1) +/* 8B3010 80242FA0 8E23014C */ lw $v1, 0x14c($s1) +/* 8B3014 80242FA4 AE220078 */ sw $v0, 0x78($s1) +/* 8B3018 80242FA8 00031840 */ sll $v1, $v1, 1 +/* 8B301C 80242FAC 3C028025 */ lui $v0, 0x8025 +/* 8B3020 80242FB0 00431021 */ addu $v0, $v0, $v1 +/* 8B3024 80242FB4 8442E538 */ lh $v0, -0x1ac8($v0) +/* 8B3028 80242FB8 AE22007C */ sw $v0, 0x7c($s1) +.L80242FBC: +/* 8B302C 80242FBC 8E22007C */ lw $v0, 0x7c($s1) +/* 8B3030 80242FC0 14400015 */ bnez $v0, .L80243018 +/* 8B3034 80242FC4 2442FFFF */ addiu $v0, $v0, -1 +/* 8B3038 80242FC8 C62C0074 */ lwc1 $f12, 0x74($s1) +/* 8B303C 80242FCC 0C00A8BB */ jal sin_deg +/* 8B3040 80242FD0 8E300078 */ lw $s0, 0x78($s1) +/* 8B3044 80242FD4 3C013FC0 */ lui $at, 0x3fc0 +/* 8B3048 80242FD8 44811000 */ mtc1 $at, $f2 +/* 8B304C 80242FDC 00000000 */ nop +/* 8B3050 80242FE0 46020002 */ mul.s $f0, $f0, $f2 +/* 8B3054 80242FE4 00000000 */ nop +/* 8B3058 80242FE8 3C014190 */ lui $at, 0x4190 +/* 8B305C 80242FEC 44816000 */ mtc1 $at, $f12 +/* 8B3060 80242FF0 4600010D */ trunc.w.s $f4, $f0 +/* 8B3064 80242FF4 44022000 */ mfc1 $v0, $f4 +/* 8B3068 80242FF8 00000000 */ nop +/* 8B306C 80242FFC A20200AB */ sb $v0, 0xab($s0) +/* 8B3070 80243000 C6200074 */ lwc1 $f0, 0x74($s1) +/* 8B3074 80243004 0C00A6C9 */ jal clamp_angle +/* 8B3078 80243008 460C0300 */ add.s $f12, $f0, $f12 +/* 8B307C 8024300C 0000102D */ daddu $v0, $zero, $zero +/* 8B3080 80243010 08090C08 */ j .L80243020 +/* 8B3084 80243014 E6200074 */ swc1 $f0, 0x74($s1) +.L80243018: +/* 8B3088 80243018 AE22007C */ sw $v0, 0x7c($s1) +/* 8B308C 8024301C 0000102D */ daddu $v0, $zero, $zero +.L80243020: +/* 8B3090 80243020 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B3094 80243024 8FB10014 */ lw $s1, 0x14($sp) +/* 8B3098 80243028 8FB00010 */ lw $s0, 0x10($sp) +/* 8B309C 8024302C 03E00008 */ jr $ra +/* 8B30A0 80243030 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034.s deleted file mode 100644 index 9b06da7ff0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243034 -/* 8B30A4 80243034 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B30A8 80243038 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B30AC 8024303C 0C04C3D6 */ jal get_item_entity -/* 8B30B0 80243040 8C840084 */ lw $a0, 0x84($a0) -/* 8B30B4 80243044 3C013F19 */ lui $at, 0x3f19 -/* 8B30B8 80243048 3421999A */ ori $at, $at, 0x999a -/* 8B30BC 8024304C 44810000 */ mtc1 $at, $f0 -/* 8B30C0 80243050 00000000 */ nop -/* 8B30C4 80243054 E4400030 */ swc1 $f0, 0x30($v0) -/* 8B30C8 80243058 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B30CC 8024305C 24020002 */ addiu $v0, $zero, 2 -/* 8B30D0 80243060 03E00008 */ jr $ra -/* 8B30D4 80243064 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8B30D8 80243068 00000000 */ nop -/* 8B30DC 8024306C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s new file mode 100644 index 0000000000..89910eec8a --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80243034_8B30A4.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243034_8B30A4 +/* 8B30A4 80243034 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B30A8 80243038 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B30AC 8024303C 0C04C3D6 */ jal get_item_entity +/* 8B30B0 80243040 8C840084 */ lw $a0, 0x84($a0) +/* 8B30B4 80243044 3C013F19 */ lui $at, 0x3f19 +/* 8B30B8 80243048 3421999A */ ori $at, $at, 0x999a +/* 8B30BC 8024304C 44810000 */ mtc1 $at, $f0 +/* 8B30C0 80243050 00000000 */ nop +/* 8B30C4 80243054 E4400030 */ swc1 $f0, 0x30($v0) +/* 8B30C8 80243058 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B30CC 8024305C 24020002 */ addiu $v0, $zero, 2 +/* 8B30D0 80243060 03E00008 */ jr $ra +/* 8B30D4 80243064 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8B30D8 80243068 00000000 */ nop +/* 8B30DC 8024306C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070.s deleted file mode 100644 index 4c7545d6f2..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243070 -/* 8B30E0 80243070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B30E4 80243074 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B30E8 80243078 0C03A625 */ jal func_800E9894 -/* 8B30EC 8024307C 00000000 */ nop -/* 8B30F0 80243080 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B30F4 80243084 24020002 */ addiu $v0, $zero, 2 -/* 8B30F8 80243088 03E00008 */ jr $ra -/* 8B30FC 8024308C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s new file mode 100644 index 0000000000..0618959d77 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243070_8B30E0 +/* 8B30E0 80243070 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B30E4 80243074 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B30E8 80243078 0C03A625 */ jal func_800E9894 +/* 8B30EC 8024307C 00000000 */ nop +/* 8B30F0 80243080 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B30F4 80243084 24020002 */ addiu $v0, $zero, 2 +/* 8B30F8 80243088 03E00008 */ jr $ra +/* 8B30FC 8024308C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8.s deleted file mode 100644 index c8ee637448..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430B8 -/* 8B3128 802430B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B312C 802430BC AFB10014 */ sw $s1, 0x14($sp) -/* 8B3130 802430C0 0080882D */ daddu $s1, $a0, $zero -/* 8B3134 802430C4 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B3138 802430C8 AFB00010 */ sw $s0, 0x10($sp) -/* 8B313C 802430CC 8E30000C */ lw $s0, 0xc($s1) -/* 8B3140 802430D0 8E050000 */ lw $a1, ($s0) -/* 8B3144 802430D4 0C0B1EAF */ jal get_variable -/* 8B3148 802430D8 26100004 */ addiu $s0, $s0, 4 -/* 8B314C 802430DC 0220202D */ daddu $a0, $s1, $zero -/* 8B3150 802430E0 8E050000 */ lw $a1, ($s0) -/* 8B3154 802430E4 0C0B1EAF */ jal get_variable -/* 8B3158 802430E8 0040882D */ daddu $s1, $v0, $zero -/* 8B315C 802430EC 0000202D */ daddu $a0, $zero, $zero -/* 8B3160 802430F0 0080282D */ daddu $a1, $a0, $zero -/* 8B3164 802430F4 0040802D */ daddu $s0, $v0, $zero -/* 8B3168 802430F8 240600BE */ addiu $a2, $zero, 0xbe -/* 8B316C 802430FC 0C04DF93 */ jal func_80137E4C -/* 8B3170 80243100 24070091 */ addiu $a3, $zero, 0x91 -/* 8B3174 80243104 44900000 */ mtc1 $s0, $f0 -/* 8B3178 80243108 00000000 */ nop -/* 8B317C 8024310C 46800020 */ cvt.s.w $f0, $f0 -/* 8B3180 80243110 44050000 */ mfc1 $a1, $f0 -/* 8B3184 80243114 0C04DF62 */ jal func_80137D88 -/* 8B3188 80243118 322400FF */ andi $a0, $s1, 0xff -/* 8B318C 8024311C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B3190 80243120 8FB10014 */ lw $s1, 0x14($sp) -/* 8B3194 80243124 8FB00010 */ lw $s0, 0x10($sp) -/* 8B3198 80243128 24020002 */ addiu $v0, $zero, 2 -/* 8B319C 8024312C 03E00008 */ jr $ra -/* 8B31A0 80243130 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s new file mode 100644 index 0000000000..b99a2847dd --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802430B8_8B3128.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802430B8_8B3128 +/* 8B3128 802430B8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B312C 802430BC AFB10014 */ sw $s1, 0x14($sp) +/* 8B3130 802430C0 0080882D */ daddu $s1, $a0, $zero +/* 8B3134 802430C4 AFBF0018 */ sw $ra, 0x18($sp) +/* 8B3138 802430C8 AFB00010 */ sw $s0, 0x10($sp) +/* 8B313C 802430CC 8E30000C */ lw $s0, 0xc($s1) +/* 8B3140 802430D0 8E050000 */ lw $a1, ($s0) +/* 8B3144 802430D4 0C0B1EAF */ jal get_variable +/* 8B3148 802430D8 26100004 */ addiu $s0, $s0, 4 +/* 8B314C 802430DC 0220202D */ daddu $a0, $s1, $zero +/* 8B3150 802430E0 8E050000 */ lw $a1, ($s0) +/* 8B3154 802430E4 0C0B1EAF */ jal get_variable +/* 8B3158 802430E8 0040882D */ daddu $s1, $v0, $zero +/* 8B315C 802430EC 0000202D */ daddu $a0, $zero, $zero +/* 8B3160 802430F0 0080282D */ daddu $a1, $a0, $zero +/* 8B3164 802430F4 0040802D */ daddu $s0, $v0, $zero +/* 8B3168 802430F8 240600BE */ addiu $a2, $zero, 0xbe +/* 8B316C 802430FC 0C04DF93 */ jal func_80137E4C +/* 8B3170 80243100 24070091 */ addiu $a3, $zero, 0x91 +/* 8B3174 80243104 44900000 */ mtc1 $s0, $f0 +/* 8B3178 80243108 00000000 */ nop +/* 8B317C 8024310C 46800020 */ cvt.s.w $f0, $f0 +/* 8B3180 80243110 44050000 */ mfc1 $a1, $f0 +/* 8B3184 80243114 0C04DF62 */ jal func_80137D88 +/* 8B3188 80243118 322400FF */ andi $a0, $s1, 0xff +/* 8B318C 8024311C 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B3190 80243120 8FB10014 */ lw $s1, 0x14($sp) +/* 8B3194 80243124 8FB00010 */ lw $s0, 0x10($sp) +/* 8B3198 80243128 24020002 */ addiu $v0, $zero, 2 +/* 8B319C 8024312C 03E00008 */ jr $ra +/* 8B31A0 80243130 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134.s deleted file mode 100644 index f8a2155970..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243134 -/* 8B31A4 80243134 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B31A8 80243138 AFB10014 */ sw $s1, 0x14($sp) -/* 8B31AC 8024313C 0080882D */ daddu $s1, $a0, $zero -/* 8B31B0 80243140 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B31B4 80243144 AFB00010 */ sw $s0, 0x10($sp) -/* 8B31B8 80243148 8E30000C */ lw $s0, 0xc($s1) -/* 8B31BC 8024314C 8E050000 */ lw $a1, ($s0) -/* 8B31C0 80243150 0C0B1EAF */ jal get_variable -/* 8B31C4 80243154 26100004 */ addiu $s0, $s0, 4 -/* 8B31C8 80243158 0220202D */ daddu $a0, $s1, $zero -/* 8B31CC 8024315C 8E050000 */ lw $a1, ($s0) -/* 8B31D0 80243160 0C0B1EAF */ jal get_variable -/* 8B31D4 80243164 0040802D */ daddu $s0, $v0, $zero -/* 8B31D8 80243168 44820000 */ mtc1 $v0, $f0 -/* 8B31DC 8024316C 00000000 */ nop -/* 8B31E0 80243170 46800020 */ cvt.s.w $f0, $f0 -/* 8B31E4 80243174 24020002 */ addiu $v0, $zero, 2 -/* 8B31E8 80243178 00501804 */ sllv $v1, $s0, $v0 -/* 8B31EC 8024317C 00701821 */ addu $v1, $v1, $s0 -/* 8B31F0 80243180 00431804 */ sllv $v1, $v1, $v0 -/* 8B31F4 80243184 00701823 */ subu $v1, $v1, $s0 -/* 8B31F8 80243188 000320C0 */ sll $a0, $v1, 3 -/* 8B31FC 8024318C 00641821 */ addu $v1, $v1, $a0 -/* 8B3200 80243190 000318C0 */ sll $v1, $v1, 3 -/* 8B3204 80243194 3C01800B */ lui $at, 0x800b -/* 8B3208 80243198 00230821 */ addu $at, $at, $v1 -/* 8B320C 8024319C E4201D98 */ swc1 $f0, 0x1d98($at) -/* 8B3210 802431A0 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B3214 802431A4 8FB10014 */ lw $s1, 0x14($sp) -/* 8B3218 802431A8 8FB00010 */ lw $s0, 0x10($sp) -/* 8B321C 802431AC 03E00008 */ jr $ra -/* 8B3220 802431B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s new file mode 100644 index 0000000000..dc1dd907dc --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243134_8B31A4.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243134_8B31A4 +/* 8B31A4 80243134 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B31A8 80243138 AFB10014 */ sw $s1, 0x14($sp) +/* 8B31AC 8024313C 0080882D */ daddu $s1, $a0, $zero +/* 8B31B0 80243140 AFBF0018 */ sw $ra, 0x18($sp) +/* 8B31B4 80243144 AFB00010 */ sw $s0, 0x10($sp) +/* 8B31B8 80243148 8E30000C */ lw $s0, 0xc($s1) +/* 8B31BC 8024314C 8E050000 */ lw $a1, ($s0) +/* 8B31C0 80243150 0C0B1EAF */ jal get_variable +/* 8B31C4 80243154 26100004 */ addiu $s0, $s0, 4 +/* 8B31C8 80243158 0220202D */ daddu $a0, $s1, $zero +/* 8B31CC 8024315C 8E050000 */ lw $a1, ($s0) +/* 8B31D0 80243160 0C0B1EAF */ jal get_variable +/* 8B31D4 80243164 0040802D */ daddu $s0, $v0, $zero +/* 8B31D8 80243168 44820000 */ mtc1 $v0, $f0 +/* 8B31DC 8024316C 00000000 */ nop +/* 8B31E0 80243170 46800020 */ cvt.s.w $f0, $f0 +/* 8B31E4 80243174 24020002 */ addiu $v0, $zero, 2 +/* 8B31E8 80243178 00501804 */ sllv $v1, $s0, $v0 +/* 8B31EC 8024317C 00701821 */ addu $v1, $v1, $s0 +/* 8B31F0 80243180 00431804 */ sllv $v1, $v1, $v0 +/* 8B31F4 80243184 00701823 */ subu $v1, $v1, $s0 +/* 8B31F8 80243188 000320C0 */ sll $a0, $v1, 3 +/* 8B31FC 8024318C 00641821 */ addu $v1, $v1, $a0 +/* 8B3200 80243190 000318C0 */ sll $v1, $v1, 3 +/* 8B3204 80243194 3C01800B */ lui $at, 0x800b +/* 8B3208 80243198 00230821 */ addu $at, $at, $v1 +/* 8B320C 8024319C E4201D98 */ swc1 $f0, 0x1d98($at) +/* 8B3210 802431A0 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B3214 802431A4 8FB10014 */ lw $s1, 0x14($sp) +/* 8B3218 802431A8 8FB00010 */ lw $s0, 0x10($sp) +/* 8B321C 802431AC 03E00008 */ jr $ra +/* 8B3220 802431B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4.s deleted file mode 100644 index 4c466fffcc..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431B4 -/* 8B3224 802431B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3228 802431B8 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B322C 802431BC 8C82000C */ lw $v0, 0xc($a0) -/* 8B3230 802431C0 0C0B1EAF */ jal get_variable -/* 8B3234 802431C4 8C450000 */ lw $a1, ($v0) -/* 8B3238 802431C8 0C0B1059 */ jal does_script_exist -/* 8B323C 802431CC 0040202D */ daddu $a0, $v0, $zero -/* 8B3240 802431D0 2C420001 */ sltiu $v0, $v0, 1 -/* 8B3244 802431D4 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B3248 802431D8 00021040 */ sll $v0, $v0, 1 -/* 8B324C 802431DC 03E00008 */ jr $ra -/* 8B3250 802431E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s new file mode 100644 index 0000000000..d21815dd5f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802431B4_8B3224 +/* 8B3224 802431B4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B3228 802431B8 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B322C 802431BC 8C82000C */ lw $v0, 0xc($a0) +/* 8B3230 802431C0 0C0B1EAF */ jal get_variable +/* 8B3234 802431C4 8C450000 */ lw $a1, ($v0) +/* 8B3238 802431C8 0C0B1059 */ jal does_script_exist +/* 8B323C 802431CC 0040202D */ daddu $a0, $v0, $zero +/* 8B3240 802431D0 2C420001 */ sltiu $v0, $v0, 1 +/* 8B3244 802431D4 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B3248 802431D8 00021040 */ sll $v0, $v0, 1 +/* 8B324C 802431DC 03E00008 */ jr $ra +/* 8B3250 802431E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4.s deleted file mode 100644 index c477edda03..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431E4 -/* 8B3254 802431E4 3C028011 */ lui $v0, 0x8011 -/* 8B3258 802431E8 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 8B325C 802431EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3260 802431F0 10400003 */ beqz $v0, .L80243200 -/* 8B3264 802431F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B3268 802431F8 0C03AE06 */ jal partner_suspend_ability_script -/* 8B326C 802431FC 00000000 */ nop -.L80243200: -/* 8B3270 80243200 24020002 */ addiu $v0, $zero, 2 -/* 8B3274 80243204 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B3278 80243208 03E00008 */ jr $ra -/* 8B327C 8024320C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s new file mode 100644 index 0000000000..a1ad5c51b5 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802431E4_8B3254 +/* 8B3254 802431E4 3C028011 */ lui $v0, 0x8011 +/* 8B3258 802431E8 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 8B325C 802431EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B3260 802431F0 10400003 */ beqz $v0, .L80243200 +/* 8B3264 802431F4 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B3268 802431F8 0C03AE06 */ jal partner_suspend_ability_script +/* 8B326C 802431FC 00000000 */ nop +.L80243200: +/* 8B3270 80243200 24020002 */ addiu $v0, $zero, 2 +/* 8B3274 80243204 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B3278 80243208 03E00008 */ jr $ra +/* 8B327C 8024320C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210.s deleted file mode 100644 index f86ab517bf..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243210 -/* 8B3280 80243210 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3284 80243214 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B3288 80243218 0C03AE18 */ jal partner_resume_ability_script -/* 8B328C 8024321C 00000000 */ nop -/* 8B3290 80243220 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B3294 80243224 24020002 */ addiu $v0, $zero, 2 -/* 8B3298 80243228 03E00008 */ jr $ra -/* 8B329C 8024322C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s new file mode 100644 index 0000000000..31b714dbf7 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243210_8B3280 +/* 8B3280 80243210 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B3284 80243214 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B3288 80243218 0C03AE18 */ jal partner_resume_ability_script +/* 8B328C 8024321C 00000000 */ nop +/* 8B3290 80243220 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B3294 80243224 24020002 */ addiu $v0, $zero, 2 +/* 8B3298 80243228 03E00008 */ jr $ra +/* 8B329C 8024322C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230.s deleted file mode 100644 index 5b074811e8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243230 -/* 8B32A0 80243230 3C058011 */ lui $a1, %hi(gPlayerData) -/* 8B32A4 80243234 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 8B32A8 80243238 AC800088 */ sw $zero, 0x88($a0) -/* 8B32AC 8024323C 80A30003 */ lb $v1, 3($a1) -/* 8B32B0 80243240 80A20002 */ lb $v0, 2($a1) -/* 8B32B4 80243244 1462000B */ bne $v1, $v0, .L80243274 -/* 8B32B8 80243248 00A0302D */ daddu $a2, $a1, $zero -/* 8B32BC 8024324C 80A30006 */ lb $v1, 6($a1) -/* 8B32C0 80243250 80A20005 */ lb $v0, 5($a1) -/* 8B32C4 80243254 14620007 */ bne $v1, $v0, .L80243274 -/* 8B32C8 80243258 00000000 */ nop -/* 8B32CC 8024325C 80C2028E */ lb $v0, 0x28e($a2) -/* 8B32D0 80243260 84C30290 */ lh $v1, 0x290($a2) -/* 8B32D4 80243264 00021200 */ sll $v0, $v0, 8 -/* 8B32D8 80243268 14620004 */ bne $v1, $v0, .L8024327C -/* 8B32DC 8024326C 24020001 */ addiu $v0, $zero, 1 -/* 8B32E0 80243270 AC820088 */ sw $v0, 0x88($a0) -.L80243274: -/* 8B32E4 80243274 03E00008 */ jr $ra -/* 8B32E8 80243278 24020002 */ addiu $v0, $zero, 2 -.L8024327C: -/* 8B32EC 8024327C 03E00008 */ jr $ra -/* 8B32F0 80243280 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s new file mode 100644 index 0000000000..fc229bb204 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243230_8B32A0.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243230_8B32A0 +/* 8B32A0 80243230 3C058011 */ lui $a1, %hi(gPlayerData) +/* 8B32A4 80243234 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* 8B32A8 80243238 AC800088 */ sw $zero, 0x88($a0) +/* 8B32AC 8024323C 80A30003 */ lb $v1, 3($a1) +/* 8B32B0 80243240 80A20002 */ lb $v0, 2($a1) +/* 8B32B4 80243244 1462000B */ bne $v1, $v0, .L80243274 +/* 8B32B8 80243248 00A0302D */ daddu $a2, $a1, $zero +/* 8B32BC 8024324C 80A30006 */ lb $v1, 6($a1) +/* 8B32C0 80243250 80A20005 */ lb $v0, 5($a1) +/* 8B32C4 80243254 14620007 */ bne $v1, $v0, .L80243274 +/* 8B32C8 80243258 00000000 */ nop +/* 8B32CC 8024325C 80C2028E */ lb $v0, 0x28e($a2) +/* 8B32D0 80243260 84C30290 */ lh $v1, 0x290($a2) +/* 8B32D4 80243264 00021200 */ sll $v0, $v0, 8 +/* 8B32D8 80243268 14620004 */ bne $v1, $v0, .L8024327C +/* 8B32DC 8024326C 24020001 */ addiu $v0, $zero, 1 +/* 8B32E0 80243270 AC820088 */ sw $v0, 0x88($a0) +.L80243274: +/* 8B32E4 80243274 03E00008 */ jr $ra +/* 8B32E8 80243278 24020002 */ addiu $v0, $zero, 2 +.L8024327C: +/* 8B32EC 8024327C 03E00008 */ jr $ra +/* 8B32F0 80243280 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284.s deleted file mode 100644 index c480d46ef1..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243284 -/* 8B32F4 80243284 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B32F8 80243288 AFB10014 */ sw $s1, 0x14($sp) -/* 8B32FC 8024328C 0080882D */ daddu $s1, $a0, $zero -/* 8B3300 80243290 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B3304 80243294 AFB20018 */ sw $s2, 0x18($sp) -/* 8B3308 80243298 AFB00010 */ sw $s0, 0x10($sp) -/* 8B330C 8024329C 8E30000C */ lw $s0, 0xc($s1) -/* 8B3310 802432A0 8E050000 */ lw $a1, ($s0) -/* 8B3314 802432A4 0C0B1EAF */ jal get_variable -/* 8B3318 802432A8 26100004 */ addiu $s0, $s0, 4 -/* 8B331C 802432AC 8E050000 */ lw $a1, ($s0) -/* 8B3320 802432B0 26100004 */ addiu $s0, $s0, 4 -/* 8B3324 802432B4 0220202D */ daddu $a0, $s1, $zero -/* 8B3328 802432B8 0C0B1EAF */ jal get_variable -/* 8B332C 802432BC 0040902D */ daddu $s2, $v0, $zero -/* 8B3330 802432C0 0220202D */ daddu $a0, $s1, $zero -/* 8B3334 802432C4 8E050000 */ lw $a1, ($s0) -/* 8B3338 802432C8 0C0B1EAF */ jal get_variable -/* 8B333C 802432CC 0040802D */ daddu $s0, $v0, $zero -/* 8B3340 802432D0 0000202D */ daddu $a0, $zero, $zero -/* 8B3344 802432D4 324500FF */ andi $a1, $s2, 0xff -/* 8B3348 802432D8 320600FF */ andi $a2, $s0, 0xff -/* 8B334C 802432DC 0C04DF84 */ jal func_80137E10 -/* 8B3350 802432E0 304700FF */ andi $a3, $v0, 0xff -/* 8B3354 802432E4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B3358 802432E8 8FB20018 */ lw $s2, 0x18($sp) -/* 8B335C 802432EC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B3360 802432F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8B3364 802432F4 24020002 */ addiu $v0, $zero, 2 -/* 8B3368 802432F8 03E00008 */ jr $ra -/* 8B336C 802432FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s new file mode 100644 index 0000000000..c445cf8bd6 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243284_8B32F4.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243284_8B32F4 +/* 8B32F4 80243284 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B32F8 80243288 AFB10014 */ sw $s1, 0x14($sp) +/* 8B32FC 8024328C 0080882D */ daddu $s1, $a0, $zero +/* 8B3300 80243290 AFBF001C */ sw $ra, 0x1c($sp) +/* 8B3304 80243294 AFB20018 */ sw $s2, 0x18($sp) +/* 8B3308 80243298 AFB00010 */ sw $s0, 0x10($sp) +/* 8B330C 8024329C 8E30000C */ lw $s0, 0xc($s1) +/* 8B3310 802432A0 8E050000 */ lw $a1, ($s0) +/* 8B3314 802432A4 0C0B1EAF */ jal get_variable +/* 8B3318 802432A8 26100004 */ addiu $s0, $s0, 4 +/* 8B331C 802432AC 8E050000 */ lw $a1, ($s0) +/* 8B3320 802432B0 26100004 */ addiu $s0, $s0, 4 +/* 8B3324 802432B4 0220202D */ daddu $a0, $s1, $zero +/* 8B3328 802432B8 0C0B1EAF */ jal get_variable +/* 8B332C 802432BC 0040902D */ daddu $s2, $v0, $zero +/* 8B3330 802432C0 0220202D */ daddu $a0, $s1, $zero +/* 8B3334 802432C4 8E050000 */ lw $a1, ($s0) +/* 8B3338 802432C8 0C0B1EAF */ jal get_variable +/* 8B333C 802432CC 0040802D */ daddu $s0, $v0, $zero +/* 8B3340 802432D0 0000202D */ daddu $a0, $zero, $zero +/* 8B3344 802432D4 324500FF */ andi $a1, $s2, 0xff +/* 8B3348 802432D8 320600FF */ andi $a2, $s0, 0xff +/* 8B334C 802432DC 0C04DF84 */ jal func_80137E10 +/* 8B3350 802432E0 304700FF */ andi $a3, $v0, 0xff +/* 8B3354 802432E4 8FBF001C */ lw $ra, 0x1c($sp) +/* 8B3358 802432E8 8FB20018 */ lw $s2, 0x18($sp) +/* 8B335C 802432EC 8FB10014 */ lw $s1, 0x14($sp) +/* 8B3360 802432F0 8FB00010 */ lw $s0, 0x10($sp) +/* 8B3364 802432F4 24020002 */ addiu $v0, $zero, 2 +/* 8B3368 802432F8 03E00008 */ jr $ra +/* 8B336C 802432FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300.s deleted file mode 100644 index e06f331610..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243300 -/* 8B3370 80243300 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3374 80243304 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B3378 80243308 8C82000C */ lw $v0, 0xc($a0) -/* 8B337C 8024330C 3C068011 */ lui $a2, 0x8011 -/* 8B3380 80243310 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 8B3384 80243314 0C0B2026 */ jal set_variable -/* 8B3388 80243318 8C450000 */ lw $a1, ($v0) -/* 8B338C 8024331C 0C03AC5A */ jal func_800EB168 -/* 8B3390 80243320 0000202D */ daddu $a0, $zero, $zero -/* 8B3394 80243324 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B3398 80243328 24020002 */ addiu $v0, $zero, 2 -/* 8B339C 8024332C 03E00008 */ jr $ra -/* 8B33A0 80243330 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s new file mode 100644 index 0000000000..ccad403851 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243300_8B3370 +/* 8B3370 80243300 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B3374 80243304 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B3378 80243308 8C82000C */ lw $v0, 0xc($a0) +/* 8B337C 8024330C 3C068011 */ lui $a2, 0x8011 +/* 8B3380 80243310 80C6F2A2 */ lb $a2, -0xd5e($a2) +/* 8B3384 80243314 0C0B2026 */ jal set_variable +/* 8B3388 80243318 8C450000 */ lw $a1, ($v0) +/* 8B338C 8024331C 0C03AC5A */ jal func_800EB168 +/* 8B3390 80243320 0000202D */ daddu $a0, $zero, $zero +/* 8B3394 80243324 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B3398 80243328 24020002 */ addiu $v0, $zero, 2 +/* 8B339C 8024332C 03E00008 */ jr $ra +/* 8B33A0 80243330 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334.s deleted file mode 100644 index abc8e84e9d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243334 -/* 8B33A4 80243334 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B33A8 80243338 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B33AC 8024333C 8C82000C */ lw $v0, 0xc($a0) -/* 8B33B0 80243340 0C0B1EAF */ jal get_variable -/* 8B33B4 80243344 8C450000 */ lw $a1, ($v0) -/* 8B33B8 80243348 00021600 */ sll $v0, $v0, 0x18 -/* 8B33BC 8024334C 0C03AC5A */ jal func_800EB168 -/* 8B33C0 80243350 00022603 */ sra $a0, $v0, 0x18 -/* 8B33C4 80243354 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B33C8 80243358 24020002 */ addiu $v0, $zero, 2 -/* 8B33CC 8024335C 03E00008 */ jr $ra -/* 8B33D0 80243360 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s new file mode 100644 index 0000000000..6bd5963e90 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243334_8B33A4 +/* 8B33A4 80243334 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B33A8 80243338 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B33AC 8024333C 8C82000C */ lw $v0, 0xc($a0) +/* 8B33B0 80243340 0C0B1EAF */ jal get_variable +/* 8B33B4 80243344 8C450000 */ lw $a1, ($v0) +/* 8B33B8 80243348 00021600 */ sll $v0, $v0, 0x18 +/* 8B33BC 8024334C 0C03AC5A */ jal func_800EB168 +/* 8B33C0 80243350 00022603 */ sra $a0, $v0, 0x18 +/* 8B33C4 80243354 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B33C8 80243358 24020002 */ addiu $v0, $zero, 2 +/* 8B33CC 8024335C 03E00008 */ jr $ra +/* 8B33D0 80243360 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364.s deleted file mode 100644 index b6bc11f8e9..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243364 -/* 8B33D4 80243364 03E00008 */ jr $ra -/* 8B33D8 80243368 24020002 */ addiu $v0, $zero, 2 -/* 8B33DC 8024336C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s new file mode 100644 index 0000000000..2b63052fa7 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243364_8B33D4.s @@ -0,0 +1,7 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243364_8B33D4 +/* 8B33D4 80243364 03E00008 */ jr $ra +/* 8B33D8 80243368 24020002 */ addiu $v0, $zero, 2 +/* 8B33DC 8024336C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243370.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243370.s deleted file mode 100644 index 8f0a4cfde6..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243370.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243370 -/* 8B33E0 80243370 0000302D */ daddu $a2, $zero, $zero -/* 8B33E4 80243374 00C0282D */ daddu $a1, $a2, $zero -/* 8B33E8 80243378 3C038011 */ lui $v1, %hi(gPlayerData) -/* 8B33EC 8024337C 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -.L80243380: -/* 8B33F0 80243380 84620208 */ lh $v0, 0x208($v1) -/* 8B33F4 80243384 10400003 */ beqz $v0, .L80243394 -/* 8B33F8 80243388 24A50001 */ addiu $a1, $a1, 1 -/* 8B33FC 8024338C 08090CE8 */ j .L802433A0 -/* 8B3400 80243390 24060001 */ addiu $a2, $zero, 1 -.L80243394: -/* 8B3404 80243394 28A20040 */ slti $v0, $a1, 0x40 -/* 8B3408 80243398 1440FFF9 */ bnez $v0, .L80243380 -/* 8B340C 8024339C 24630002 */ addiu $v1, $v1, 2 -.L802433A0: -/* 8B3410 802433A0 AC860084 */ sw $a2, 0x84($a0) -/* 8B3414 802433A4 03E00008 */ jr $ra -/* 8B3418 802433A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243370_8B33E0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243370_8B33E0.s new file mode 100644 index 0000000000..b8f4d31493 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243370_8B33E0.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243370_8B33E0 +/* 8B33E0 80243370 0000302D */ daddu $a2, $zero, $zero +/* 8B33E4 80243374 00C0282D */ daddu $a1, $a2, $zero +/* 8B33E8 80243378 3C038011 */ lui $v1, %hi(gPlayerData) +/* 8B33EC 8024337C 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +.L80243380: +/* 8B33F0 80243380 84620208 */ lh $v0, 0x208($v1) +/* 8B33F4 80243384 10400003 */ beqz $v0, .L80243394 +/* 8B33F8 80243388 24A50001 */ addiu $a1, $a1, 1 +/* 8B33FC 8024338C 08090CE8 */ j .L802433A0 +/* 8B3400 80243390 24060001 */ addiu $a2, $zero, 1 +.L80243394: +/* 8B3404 80243394 28A20040 */ slti $v0, $a1, 0x40 +/* 8B3408 80243398 1440FFF9 */ bnez $v0, .L80243380 +/* 8B340C 8024339C 24630002 */ addiu $v1, $v1, 2 +.L802433A0: +/* 8B3410 802433A0 AC860084 */ sw $a2, 0x84($a0) +/* 8B3414 802433A4 03E00008 */ jr $ra +/* 8B3418 802433A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC.s deleted file mode 100644 index 3bf5030372..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433AC -/* 8B341C 802433AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8B3420 802433B0 AFB10014 */ sw $s1, 0x14($sp) -/* 8B3424 802433B4 0080882D */ daddu $s1, $a0, $zero -/* 8B3428 802433B8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B342C 802433BC AFB20018 */ sw $s2, 0x18($sp) -/* 8B3430 802433C0 AFB00010 */ sw $s0, 0x10($sp) -/* 8B3434 802433C4 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 8B3438 802433C8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8B343C 802433CC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8B3440 802433D0 8E30000C */ lw $s0, 0xc($s1) -/* 8B3444 802433D4 8E050000 */ lw $a1, ($s0) -/* 8B3448 802433D8 0C0B1EAF */ jal get_variable -/* 8B344C 802433DC 26100004 */ addiu $s0, $s0, 4 -/* 8B3450 802433E0 8E050000 */ lw $a1, ($s0) -/* 8B3454 802433E4 26100004 */ addiu $s0, $s0, 4 -/* 8B3458 802433E8 0220202D */ daddu $a0, $s1, $zero -/* 8B345C 802433EC 0C0B1EAF */ jal get_variable -/* 8B3460 802433F0 0040902D */ daddu $s2, $v0, $zero -/* 8B3464 802433F4 8E050000 */ lw $a1, ($s0) -/* 8B3468 802433F8 26100004 */ addiu $s0, $s0, 4 -/* 8B346C 802433FC 4482C000 */ mtc1 $v0, $f24 -/* 8B3470 80243400 00000000 */ nop -/* 8B3474 80243404 4680C620 */ cvt.s.w $f24, $f24 -/* 8B3478 80243408 0C0B1EAF */ jal get_variable -/* 8B347C 8024340C 0220202D */ daddu $a0, $s1, $zero -/* 8B3480 80243410 8E050000 */ lw $a1, ($s0) -/* 8B3484 80243414 4482B000 */ mtc1 $v0, $f22 -/* 8B3488 80243418 00000000 */ nop -/* 8B348C 8024341C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8B3490 80243420 0C0B1EAF */ jal get_variable -/* 8B3494 80243424 0220202D */ daddu $a0, $s1, $zero -/* 8B3498 80243428 4482A000 */ mtc1 $v0, $f20 -/* 8B349C 8024342C 00000000 */ nop -/* 8B34A0 80243430 4680A520 */ cvt.s.w $f20, $f20 -/* 8B34A4 80243434 0C04417A */ jal get_entity_by_index -/* 8B34A8 80243438 0240202D */ daddu $a0, $s2, $zero -/* 8B34AC 8024343C 0040182D */ daddu $v1, $v0, $zero -/* 8B34B0 80243440 E4780048 */ swc1 $f24, 0x48($v1) -/* 8B34B4 80243444 E476004C */ swc1 $f22, 0x4c($v1) -/* 8B34B8 80243448 E4740050 */ swc1 $f20, 0x50($v1) -/* 8B34BC 8024344C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B34C0 80243450 8FB20018 */ lw $s2, 0x18($sp) -/* 8B34C4 80243454 8FB10014 */ lw $s1, 0x14($sp) -/* 8B34C8 80243458 8FB00010 */ lw $s0, 0x10($sp) -/* 8B34CC 8024345C D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8B34D0 80243460 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8B34D4 80243464 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8B34D8 80243468 24020002 */ addiu $v0, $zero, 2 -/* 8B34DC 8024346C 03E00008 */ jr $ra -/* 8B34E0 80243470 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC_8B341C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC_8B341C.s new file mode 100644 index 0000000000..c386991911 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802433AC_8B341C.s @@ -0,0 +1,54 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802433AC_8B341C +/* 8B341C 802433AC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8B3420 802433B0 AFB10014 */ sw $s1, 0x14($sp) +/* 8B3424 802433B4 0080882D */ daddu $s1, $a0, $zero +/* 8B3428 802433B8 AFBF001C */ sw $ra, 0x1c($sp) +/* 8B342C 802433BC AFB20018 */ sw $s2, 0x18($sp) +/* 8B3430 802433C0 AFB00010 */ sw $s0, 0x10($sp) +/* 8B3434 802433C4 F7B80030 */ sdc1 $f24, 0x30($sp) +/* 8B3438 802433C8 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 8B343C 802433CC F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8B3440 802433D0 8E30000C */ lw $s0, 0xc($s1) +/* 8B3444 802433D4 8E050000 */ lw $a1, ($s0) +/* 8B3448 802433D8 0C0B1EAF */ jal get_variable +/* 8B344C 802433DC 26100004 */ addiu $s0, $s0, 4 +/* 8B3450 802433E0 8E050000 */ lw $a1, ($s0) +/* 8B3454 802433E4 26100004 */ addiu $s0, $s0, 4 +/* 8B3458 802433E8 0220202D */ daddu $a0, $s1, $zero +/* 8B345C 802433EC 0C0B1EAF */ jal get_variable +/* 8B3460 802433F0 0040902D */ daddu $s2, $v0, $zero +/* 8B3464 802433F4 8E050000 */ lw $a1, ($s0) +/* 8B3468 802433F8 26100004 */ addiu $s0, $s0, 4 +/* 8B346C 802433FC 4482C000 */ mtc1 $v0, $f24 +/* 8B3470 80243400 00000000 */ nop +/* 8B3474 80243404 4680C620 */ cvt.s.w $f24, $f24 +/* 8B3478 80243408 0C0B1EAF */ jal get_variable +/* 8B347C 8024340C 0220202D */ daddu $a0, $s1, $zero +/* 8B3480 80243410 8E050000 */ lw $a1, ($s0) +/* 8B3484 80243414 4482B000 */ mtc1 $v0, $f22 +/* 8B3488 80243418 00000000 */ nop +/* 8B348C 8024341C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8B3490 80243420 0C0B1EAF */ jal get_variable +/* 8B3494 80243424 0220202D */ daddu $a0, $s1, $zero +/* 8B3498 80243428 4482A000 */ mtc1 $v0, $f20 +/* 8B349C 8024342C 00000000 */ nop +/* 8B34A0 80243430 4680A520 */ cvt.s.w $f20, $f20 +/* 8B34A4 80243434 0C04417A */ jal get_entity_by_index +/* 8B34A8 80243438 0240202D */ daddu $a0, $s2, $zero +/* 8B34AC 8024343C 0040182D */ daddu $v1, $v0, $zero +/* 8B34B0 80243440 E4780048 */ swc1 $f24, 0x48($v1) +/* 8B34B4 80243444 E476004C */ swc1 $f22, 0x4c($v1) +/* 8B34B8 80243448 E4740050 */ swc1 $f20, 0x50($v1) +/* 8B34BC 8024344C 8FBF001C */ lw $ra, 0x1c($sp) +/* 8B34C0 80243450 8FB20018 */ lw $s2, 0x18($sp) +/* 8B34C4 80243454 8FB10014 */ lw $s1, 0x14($sp) +/* 8B34C8 80243458 8FB00010 */ lw $s0, 0x10($sp) +/* 8B34CC 8024345C D7B80030 */ ldc1 $f24, 0x30($sp) +/* 8B34D0 80243460 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8B34D4 80243464 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8B34D8 80243468 24020002 */ addiu $v0, $zero, 2 +/* 8B34DC 8024346C 03E00008 */ jr $ra +/* 8B34E0 80243470 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474.s deleted file mode 100644 index 46058dee7a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243474 -/* 8B34E4 80243474 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B34E8 80243478 AFB20018 */ sw $s2, 0x18($sp) -/* 8B34EC 8024347C 0080902D */ daddu $s2, $a0, $zero -/* 8B34F0 80243480 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B34F4 80243484 AFB10014 */ sw $s1, 0x14($sp) -/* 8B34F8 80243488 AFB00010 */ sw $s0, 0x10($sp) -/* 8B34FC 8024348C 8E50000C */ lw $s0, 0xc($s2) -/* 8B3500 80243490 8E050000 */ lw $a1, ($s0) -/* 8B3504 80243494 0C0B1EAF */ jal get_variable -/* 8B3508 80243498 26100004 */ addiu $s0, $s0, 4 -/* 8B350C 8024349C 0C04417A */ jal get_entity_by_index -/* 8B3510 802434A0 0040202D */ daddu $a0, $v0, $zero -/* 8B3514 802434A4 8E050000 */ lw $a1, ($s0) -/* 8B3518 802434A8 26100004 */ addiu $s0, $s0, 4 -/* 8B351C 802434AC 0040882D */ daddu $s1, $v0, $zero -/* 8B3520 802434B0 C6200048 */ lwc1 $f0, 0x48($s1) -/* 8B3524 802434B4 4600008D */ trunc.w.s $f2, $f0 -/* 8B3528 802434B8 44061000 */ mfc1 $a2, $f2 -/* 8B352C 802434BC 0C0B2026 */ jal set_variable -/* 8B3530 802434C0 0240202D */ daddu $a0, $s2, $zero -/* 8B3534 802434C4 8E050000 */ lw $a1, ($s0) -/* 8B3538 802434C8 26100004 */ addiu $s0, $s0, 4 -/* 8B353C 802434CC C620004C */ lwc1 $f0, 0x4c($s1) -/* 8B3540 802434D0 4600008D */ trunc.w.s $f2, $f0 -/* 8B3544 802434D4 44061000 */ mfc1 $a2, $f2 -/* 8B3548 802434D8 0C0B2026 */ jal set_variable -/* 8B354C 802434DC 0240202D */ daddu $a0, $s2, $zero -/* 8B3550 802434E0 C6200050 */ lwc1 $f0, 0x50($s1) -/* 8B3554 802434E4 8E050000 */ lw $a1, ($s0) -/* 8B3558 802434E8 4600008D */ trunc.w.s $f2, $f0 -/* 8B355C 802434EC 44061000 */ mfc1 $a2, $f2 -/* 8B3560 802434F0 0C0B2026 */ jal set_variable -/* 8B3564 802434F4 0240202D */ daddu $a0, $s2, $zero -/* 8B3568 802434F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B356C 802434FC 8FB20018 */ lw $s2, 0x18($sp) -/* 8B3570 80243500 8FB10014 */ lw $s1, 0x14($sp) -/* 8B3574 80243504 8FB00010 */ lw $s0, 0x10($sp) -/* 8B3578 80243508 24020002 */ addiu $v0, $zero, 2 -/* 8B357C 8024350C 03E00008 */ jr $ra -/* 8B3580 80243510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s new file mode 100644 index 0000000000..4318c44cde --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243474_8B34E4.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243474_8B34E4 +/* 8B34E4 80243474 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B34E8 80243478 AFB20018 */ sw $s2, 0x18($sp) +/* 8B34EC 8024347C 0080902D */ daddu $s2, $a0, $zero +/* 8B34F0 80243480 AFBF001C */ sw $ra, 0x1c($sp) +/* 8B34F4 80243484 AFB10014 */ sw $s1, 0x14($sp) +/* 8B34F8 80243488 AFB00010 */ sw $s0, 0x10($sp) +/* 8B34FC 8024348C 8E50000C */ lw $s0, 0xc($s2) +/* 8B3500 80243490 8E050000 */ lw $a1, ($s0) +/* 8B3504 80243494 0C0B1EAF */ jal get_variable +/* 8B3508 80243498 26100004 */ addiu $s0, $s0, 4 +/* 8B350C 8024349C 0C04417A */ jal get_entity_by_index +/* 8B3510 802434A0 0040202D */ daddu $a0, $v0, $zero +/* 8B3514 802434A4 8E050000 */ lw $a1, ($s0) +/* 8B3518 802434A8 26100004 */ addiu $s0, $s0, 4 +/* 8B351C 802434AC 0040882D */ daddu $s1, $v0, $zero +/* 8B3520 802434B0 C6200048 */ lwc1 $f0, 0x48($s1) +/* 8B3524 802434B4 4600008D */ trunc.w.s $f2, $f0 +/* 8B3528 802434B8 44061000 */ mfc1 $a2, $f2 +/* 8B352C 802434BC 0C0B2026 */ jal set_variable +/* 8B3530 802434C0 0240202D */ daddu $a0, $s2, $zero +/* 8B3534 802434C4 8E050000 */ lw $a1, ($s0) +/* 8B3538 802434C8 26100004 */ addiu $s0, $s0, 4 +/* 8B353C 802434CC C620004C */ lwc1 $f0, 0x4c($s1) +/* 8B3540 802434D0 4600008D */ trunc.w.s $f2, $f0 +/* 8B3544 802434D4 44061000 */ mfc1 $a2, $f2 +/* 8B3548 802434D8 0C0B2026 */ jal set_variable +/* 8B354C 802434DC 0240202D */ daddu $a0, $s2, $zero +/* 8B3550 802434E0 C6200050 */ lwc1 $f0, 0x50($s1) +/* 8B3554 802434E4 8E050000 */ lw $a1, ($s0) +/* 8B3558 802434E8 4600008D */ trunc.w.s $f2, $f0 +/* 8B355C 802434EC 44061000 */ mfc1 $a2, $f2 +/* 8B3560 802434F0 0C0B2026 */ jal set_variable +/* 8B3564 802434F4 0240202D */ daddu $a0, $s2, $zero +/* 8B3568 802434F8 8FBF001C */ lw $ra, 0x1c($sp) +/* 8B356C 802434FC 8FB20018 */ lw $s2, 0x18($sp) +/* 8B3570 80243500 8FB10014 */ lw $s1, 0x14($sp) +/* 8B3574 80243504 8FB00010 */ lw $s0, 0x10($sp) +/* 8B3578 80243508 24020002 */ addiu $v0, $zero, 2 +/* 8B357C 8024350C 03E00008 */ jr $ra +/* 8B3580 80243510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514.s deleted file mode 100644 index ad574fb4c3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243514 -/* 8B3584 80243514 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B3588 80243518 AFB20018 */ sw $s2, 0x18($sp) -/* 8B358C 8024351C 0080902D */ daddu $s2, $a0, $zero -/* 8B3590 80243520 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B3594 80243524 AFB10014 */ sw $s1, 0x14($sp) -/* 8B3598 80243528 AFB00010 */ sw $s0, 0x10($sp) -/* 8B359C 8024352C 8E4400AC */ lw $a0, 0xac($s2) -/* 8B35A0 80243530 0C04417A */ jal get_entity_by_index -/* 8B35A4 80243534 00A0802D */ daddu $s0, $a1, $zero -/* 8B35A8 80243538 12000004 */ beqz $s0, .L8024354C -/* 8B35AC 8024353C 0040882D */ daddu $s1, $v0, $zero -/* 8B35B0 80243540 2402003C */ addiu $v0, $zero, 0x3c -/* 8B35B4 80243544 AE400070 */ sw $zero, 0x70($s2) -/* 8B35B8 80243548 AE420074 */ sw $v0, 0x74($s2) -.L8024354C: -/* 8B35BC 8024354C 2403003C */ addiu $v1, $zero, 0x3c -/* 8B35C0 80243550 8E420074 */ lw $v0, 0x74($s2) -/* 8B35C4 80243554 3C014270 */ lui $at, 0x4270 -/* 8B35C8 80243558 44811000 */ mtc1 $at, $f2 -/* 8B35CC 8024355C 00621023 */ subu $v0, $v1, $v0 -/* 8B35D0 80243560 44820000 */ mtc1 $v0, $f0 -/* 8B35D4 80243564 00000000 */ nop -/* 8B35D8 80243568 46800020 */ cvt.s.w $f0, $f0 -/* 8B35DC 8024356C 46020003 */ div.s $f0, $f0, $f2 -/* 8B35E0 80243570 E6200054 */ swc1 $f0, 0x54($s1) -/* 8B35E4 80243574 8E420074 */ lw $v0, 0x74($s2) -/* 8B35E8 80243578 3C014049 */ lui $at, 0x4049 -/* 8B35EC 8024357C 34210FD8 */ ori $at, $at, 0xfd8 -/* 8B35F0 80243580 44816000 */ mtc1 $at, $f12 -/* 8B35F4 80243584 00621023 */ subu $v0, $v1, $v0 -/* 8B35F8 80243588 44820000 */ mtc1 $v0, $f0 -/* 8B35FC 8024358C 00000000 */ nop -/* 8B3600 80243590 46800020 */ cvt.s.w $f0, $f0 -/* 8B3604 80243594 46020003 */ div.s $f0, $f0, $f2 -/* 8B3608 80243598 E6200058 */ swc1 $f0, 0x58($s1) -/* 8B360C 8024359C 8E420074 */ lw $v0, 0x74($s2) -/* 8B3610 802435A0 460C0302 */ mul.s $f12, $f0, $f12 -/* 8B3614 802435A4 00000000 */ nop -/* 8B3618 802435A8 00621823 */ subu $v1, $v1, $v0 -/* 8B361C 802435AC 44830000 */ mtc1 $v1, $f0 -/* 8B3620 802435B0 00000000 */ nop -/* 8B3624 802435B4 46800020 */ cvt.s.w $f0, $f0 -/* 8B3628 802435B8 46020003 */ div.s $f0, $f0, $f2 -/* 8B362C 802435BC 0C00A874 */ jal cos_rad -/* 8B3630 802435C0 E620005C */ swc1 $f0, 0x5c($s1) -/* 8B3634 802435C4 3C013F80 */ lui $at, 0x3f80 -/* 8B3638 802435C8 44811000 */ mtc1 $at, $f2 -/* 8B363C 802435CC 00000000 */ nop -/* 8B3640 802435D0 46001081 */ sub.s $f2, $f2, $f0 -/* 8B3644 802435D4 3C018025 */ lui $at, 0x8025 -/* 8B3648 802435D8 D4207F08 */ ldc1 $f0, 0x7f08($at) -/* 8B364C 802435DC 460010A1 */ cvt.d.s $f2, $f2 -/* 8B3650 802435E0 46201082 */ mul.d $f2, $f2, $f0 -/* 8B3654 802435E4 00000000 */ nop -/* 8B3658 802435E8 3C013FE0 */ lui $at, 0x3fe0 -/* 8B365C 802435EC 44810800 */ mtc1 $at, $f1 -/* 8B3660 802435F0 44800000 */ mtc1 $zero, $f0 -/* 8B3664 802435F4 00000000 */ nop -/* 8B3668 802435F8 46201082 */ mul.d $f2, $f2, $f0 -/* 8B366C 802435FC 00000000 */ nop -/* 8B3670 80243600 462010A0 */ cvt.s.d $f2, $f2 -/* 8B3674 80243604 E6220064 */ swc1 $f2, 0x64($s1) -/* 8B3678 80243608 8E430074 */ lw $v1, 0x74($s2) -/* 8B367C 8024360C 2463FFFF */ addiu $v1, $v1, -1 -/* 8B3680 80243610 00031027 */ nor $v0, $zero, $v1 -/* 8B3684 80243614 2C420001 */ sltiu $v0, $v0, 1 -/* 8B3688 80243618 AE430074 */ sw $v1, 0x74($s2) -/* 8B368C 8024361C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B3690 80243620 8FB20018 */ lw $s2, 0x18($sp) -/* 8B3694 80243624 8FB10014 */ lw $s1, 0x14($sp) -/* 8B3698 80243628 8FB00010 */ lw $s0, 0x10($sp) -/* 8B369C 8024362C 00021040 */ sll $v0, $v0, 1 -/* 8B36A0 80243630 03E00008 */ jr $ra -/* 8B36A4 80243634 27BD0020 */ addiu $sp, $sp, 0x20 -/* 8B36A8 80243638 00000000 */ nop -/* 8B36AC 8024363C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s new file mode 100644 index 0000000000..036e198e12 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243514_8B3584.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243514_8B3584 +/* 8B3584 80243514 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B3588 80243518 AFB20018 */ sw $s2, 0x18($sp) +/* 8B358C 8024351C 0080902D */ daddu $s2, $a0, $zero +/* 8B3590 80243520 AFBF001C */ sw $ra, 0x1c($sp) +/* 8B3594 80243524 AFB10014 */ sw $s1, 0x14($sp) +/* 8B3598 80243528 AFB00010 */ sw $s0, 0x10($sp) +/* 8B359C 8024352C 8E4400AC */ lw $a0, 0xac($s2) +/* 8B35A0 80243530 0C04417A */ jal get_entity_by_index +/* 8B35A4 80243534 00A0802D */ daddu $s0, $a1, $zero +/* 8B35A8 80243538 12000004 */ beqz $s0, .L8024354C +/* 8B35AC 8024353C 0040882D */ daddu $s1, $v0, $zero +/* 8B35B0 80243540 2402003C */ addiu $v0, $zero, 0x3c +/* 8B35B4 80243544 AE400070 */ sw $zero, 0x70($s2) +/* 8B35B8 80243548 AE420074 */ sw $v0, 0x74($s2) +.L8024354C: +/* 8B35BC 8024354C 2403003C */ addiu $v1, $zero, 0x3c +/* 8B35C0 80243550 8E420074 */ lw $v0, 0x74($s2) +/* 8B35C4 80243554 3C014270 */ lui $at, 0x4270 +/* 8B35C8 80243558 44811000 */ mtc1 $at, $f2 +/* 8B35CC 8024355C 00621023 */ subu $v0, $v1, $v0 +/* 8B35D0 80243560 44820000 */ mtc1 $v0, $f0 +/* 8B35D4 80243564 00000000 */ nop +/* 8B35D8 80243568 46800020 */ cvt.s.w $f0, $f0 +/* 8B35DC 8024356C 46020003 */ div.s $f0, $f0, $f2 +/* 8B35E0 80243570 E6200054 */ swc1 $f0, 0x54($s1) +/* 8B35E4 80243574 8E420074 */ lw $v0, 0x74($s2) +/* 8B35E8 80243578 3C014049 */ lui $at, 0x4049 +/* 8B35EC 8024357C 34210FD8 */ ori $at, $at, 0xfd8 +/* 8B35F0 80243580 44816000 */ mtc1 $at, $f12 +/* 8B35F4 80243584 00621023 */ subu $v0, $v1, $v0 +/* 8B35F8 80243588 44820000 */ mtc1 $v0, $f0 +/* 8B35FC 8024358C 00000000 */ nop +/* 8B3600 80243590 46800020 */ cvt.s.w $f0, $f0 +/* 8B3604 80243594 46020003 */ div.s $f0, $f0, $f2 +/* 8B3608 80243598 E6200058 */ swc1 $f0, 0x58($s1) +/* 8B360C 8024359C 8E420074 */ lw $v0, 0x74($s2) +/* 8B3610 802435A0 460C0302 */ mul.s $f12, $f0, $f12 +/* 8B3614 802435A4 00000000 */ nop +/* 8B3618 802435A8 00621823 */ subu $v1, $v1, $v0 +/* 8B361C 802435AC 44830000 */ mtc1 $v1, $f0 +/* 8B3620 802435B0 00000000 */ nop +/* 8B3624 802435B4 46800020 */ cvt.s.w $f0, $f0 +/* 8B3628 802435B8 46020003 */ div.s $f0, $f0, $f2 +/* 8B362C 802435BC 0C00A874 */ jal cos_rad +/* 8B3630 802435C0 E620005C */ swc1 $f0, 0x5c($s1) +/* 8B3634 802435C4 3C013F80 */ lui $at, 0x3f80 +/* 8B3638 802435C8 44811000 */ mtc1 $at, $f2 +/* 8B363C 802435CC 00000000 */ nop +/* 8B3640 802435D0 46001081 */ sub.s $f2, $f2, $f0 +/* 8B3644 802435D4 3C018025 */ lui $at, 0x8025 +/* 8B3648 802435D8 D4207F08 */ ldc1 $f0, 0x7f08($at) +/* 8B364C 802435DC 460010A1 */ cvt.d.s $f2, $f2 +/* 8B3650 802435E0 46201082 */ mul.d $f2, $f2, $f0 +/* 8B3654 802435E4 00000000 */ nop +/* 8B3658 802435E8 3C013FE0 */ lui $at, 0x3fe0 +/* 8B365C 802435EC 44810800 */ mtc1 $at, $f1 +/* 8B3660 802435F0 44800000 */ mtc1 $zero, $f0 +/* 8B3664 802435F4 00000000 */ nop +/* 8B3668 802435F8 46201082 */ mul.d $f2, $f2, $f0 +/* 8B366C 802435FC 00000000 */ nop +/* 8B3670 80243600 462010A0 */ cvt.s.d $f2, $f2 +/* 8B3674 80243604 E6220064 */ swc1 $f2, 0x64($s1) +/* 8B3678 80243608 8E430074 */ lw $v1, 0x74($s2) +/* 8B367C 8024360C 2463FFFF */ addiu $v1, $v1, -1 +/* 8B3680 80243610 00031027 */ nor $v0, $zero, $v1 +/* 8B3684 80243614 2C420001 */ sltiu $v0, $v0, 1 +/* 8B3688 80243618 AE430074 */ sw $v1, 0x74($s2) +/* 8B368C 8024361C 8FBF001C */ lw $ra, 0x1c($sp) +/* 8B3690 80243620 8FB20018 */ lw $s2, 0x18($sp) +/* 8B3694 80243624 8FB10014 */ lw $s1, 0x14($sp) +/* 8B3698 80243628 8FB00010 */ lw $s0, 0x10($sp) +/* 8B369C 8024362C 00021040 */ sll $v0, $v0, 1 +/* 8B36A0 80243630 03E00008 */ jr $ra +/* 8B36A4 80243634 27BD0020 */ addiu $sp, $sp, 0x20 +/* 8B36A8 80243638 00000000 */ nop +/* 8B36AC 8024363C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640.s deleted file mode 100644 index e449b333ba..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243640 -/* 8B36B0 80243640 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B36B4 80243644 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B36B8 80243648 0C00EABB */ jal get_npc_unsafe -/* 8B36BC 8024364C 2404FFFC */ addiu $a0, $zero, -4 -/* 8B36C0 80243650 8C420000 */ lw $v0, ($v0) -/* 8B36C4 80243654 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B36C8 80243658 30421000 */ andi $v0, $v0, 0x1000 -/* 8B36CC 8024365C 0002102B */ sltu $v0, $zero, $v0 -/* 8B36D0 80243660 00021040 */ sll $v0, $v0, 1 -/* 8B36D4 80243664 03E00008 */ jr $ra -/* 8B36D8 80243668 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s new file mode 100644 index 0000000000..53d1d0587e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243640_8B36B0 +/* 8B36B0 80243640 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B36B4 80243644 AFBF0010 */ sw $ra, 0x10($sp) +/* 8B36B8 80243648 0C00EABB */ jal get_npc_unsafe +/* 8B36BC 8024364C 2404FFFC */ addiu $a0, $zero, -4 +/* 8B36C0 80243650 8C420000 */ lw $v0, ($v0) +/* 8B36C4 80243654 8FBF0010 */ lw $ra, 0x10($sp) +/* 8B36C8 80243658 30421000 */ andi $v0, $v0, 0x1000 +/* 8B36CC 8024365C 0002102B */ sltu $v0, $zero, $v0 +/* 8B36D0 80243660 00021040 */ sll $v0, $v0, 1 +/* 8B36D4 80243664 03E00008 */ jr $ra +/* 8B36D8 80243668 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C.s deleted file mode 100644 index 7598213e29..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024366C -/* 8B36DC 8024366C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B36E0 80243670 AFB10014 */ sw $s1, 0x14($sp) -/* 8B36E4 80243674 0080882D */ daddu $s1, $a0, $zero -/* 8B36E8 80243678 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B36EC 8024367C AFB00010 */ sw $s0, 0x10($sp) -/* 8B36F0 80243680 8E30000C */ lw $s0, 0xc($s1) -/* 8B36F4 80243684 8E050000 */ lw $a1, ($s0) -/* 8B36F8 80243688 0C0B1EAF */ jal get_variable -/* 8B36FC 8024368C 26100004 */ addiu $s0, $s0, 4 -/* 8B3700 80243690 0220202D */ daddu $a0, $s1, $zero -/* 8B3704 80243694 8E050000 */ lw $a1, ($s0) -/* 8B3708 80243698 0C0B1EAF */ jal get_variable -/* 8B370C 8024369C 0040802D */ daddu $s0, $v0, $zero -/* 8B3710 802436A0 0200202D */ daddu $a0, $s0, $zero -/* 8B3714 802436A4 00021080 */ sll $v0, $v0, 2 -/* 8B3718 802436A8 3C108025 */ lui $s0, 0x8025 -/* 8B371C 802436AC 02028021 */ addu $s0, $s0, $v0 -/* 8B3720 802436B0 0C00FB3A */ jal get_enemy -/* 8B3724 802436B4 8E10578C */ lw $s0, 0x578c($s0) -/* 8B3728 802436B8 0040302D */ daddu $a2, $v0, $zero -/* 8B372C 802436BC 0000282D */ daddu $a1, $zero, $zero -.L802436C0: -/* 8B3730 802436C0 8E040000 */ lw $a0, ($s0) -/* 8B3734 802436C4 00051080 */ sll $v0, $a1, 2 -/* 8B3738 802436C8 8CC300D0 */ lw $v1, 0xd0($a2) -/* 8B373C 802436CC 24A50001 */ addiu $a1, $a1, 1 -/* 8B3740 802436D0 00431021 */ addu $v0, $v0, $v1 -/* 8B3744 802436D4 AC440000 */ sw $a0, ($v0) -/* 8B3748 802436D8 28A2000E */ slti $v0, $a1, 0xe -/* 8B374C 802436DC 1440FFF8 */ bnez $v0, .L802436C0 -/* 8B3750 802436E0 26100004 */ addiu $s0, $s0, 4 -/* 8B3754 802436E4 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B3758 802436E8 8FB10014 */ lw $s1, 0x14($sp) -/* 8B375C 802436EC 8FB00010 */ lw $s0, 0x10($sp) -/* 8B3760 802436F0 24020002 */ addiu $v0, $zero, 2 -/* 8B3764 802436F4 03E00008 */ jr $ra -/* 8B3768 802436F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C_8B36DC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C_8B36DC.s new file mode 100644 index 0000000000..990d57dc19 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_8024366C_8B36DC.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024366C_8B36DC +/* 8B36DC 8024366C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8B36E0 80243670 AFB10014 */ sw $s1, 0x14($sp) +/* 8B36E4 80243674 0080882D */ daddu $s1, $a0, $zero +/* 8B36E8 80243678 AFBF0018 */ sw $ra, 0x18($sp) +/* 8B36EC 8024367C AFB00010 */ sw $s0, 0x10($sp) +/* 8B36F0 80243680 8E30000C */ lw $s0, 0xc($s1) +/* 8B36F4 80243684 8E050000 */ lw $a1, ($s0) +/* 8B36F8 80243688 0C0B1EAF */ jal get_variable +/* 8B36FC 8024368C 26100004 */ addiu $s0, $s0, 4 +/* 8B3700 80243690 0220202D */ daddu $a0, $s1, $zero +/* 8B3704 80243694 8E050000 */ lw $a1, ($s0) +/* 8B3708 80243698 0C0B1EAF */ jal get_variable +/* 8B370C 8024369C 0040802D */ daddu $s0, $v0, $zero +/* 8B3710 802436A0 0200202D */ daddu $a0, $s0, $zero +/* 8B3714 802436A4 00021080 */ sll $v0, $v0, 2 +/* 8B3718 802436A8 3C108025 */ lui $s0, 0x8025 +/* 8B371C 802436AC 02028021 */ addu $s0, $s0, $v0 +/* 8B3720 802436B0 0C00FB3A */ jal get_enemy +/* 8B3724 802436B4 8E10578C */ lw $s0, 0x578c($s0) +/* 8B3728 802436B8 0040302D */ daddu $a2, $v0, $zero +/* 8B372C 802436BC 0000282D */ daddu $a1, $zero, $zero +.L802436C0: +/* 8B3730 802436C0 8E040000 */ lw $a0, ($s0) +/* 8B3734 802436C4 00051080 */ sll $v0, $a1, 2 +/* 8B3738 802436C8 8CC300D0 */ lw $v1, 0xd0($a2) +/* 8B373C 802436CC 24A50001 */ addiu $a1, $a1, 1 +/* 8B3740 802436D0 00431021 */ addu $v0, $v0, $v1 +/* 8B3744 802436D4 AC440000 */ sw $a0, ($v0) +/* 8B3748 802436D8 28A2000E */ slti $v0, $a1, 0xe +/* 8B374C 802436DC 1440FFF8 */ bnez $v0, .L802436C0 +/* 8B3750 802436E0 26100004 */ addiu $s0, $s0, 4 +/* 8B3754 802436E4 8FBF0018 */ lw $ra, 0x18($sp) +/* 8B3758 802436E8 8FB10014 */ lw $s1, 0x14($sp) +/* 8B375C 802436EC 8FB00010 */ lw $s0, 0x10($sp) +/* 8B3760 802436F0 24020002 */ addiu $v0, $zero, 2 +/* 8B3764 802436F4 03E00008 */ jr $ra +/* 8B3768 802436F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC.s deleted file mode 100644 index 3d369c4134..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802436FC -/* 8B376C 802436FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3770 80243700 AFB00010 */ sw $s0, 0x10($sp) -/* 8B3774 80243704 0080802D */ daddu $s0, $a0, $zero -/* 8B3778 80243708 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B377C 8024370C C60C0084 */ lwc1 $f12, 0x84($s0) -/* 8B3780 80243710 46806320 */ cvt.s.w $f12, $f12 -/* 8B3784 80243714 C6020090 */ lwc1 $f2, 0x90($s0) -/* 8B3788 80243718 468010A0 */ cvt.s.w $f2, $f2 -/* 8B378C 8024371C 44061000 */ mfc1 $a2, $f2 -/* 8B3790 80243720 C6020098 */ lwc1 $f2, 0x98($s0) -/* 8B3794 80243724 468010A0 */ cvt.s.w $f2, $f2 -/* 8B3798 80243728 44071000 */ mfc1 $a3, $f2 -/* 8B379C 8024372C C60E008C */ lwc1 $f14, 0x8c($s0) -/* 8B37A0 80243730 0C00A720 */ jal atan2 -/* 8B37A4 80243734 468073A0 */ cvt.s.w $f14, $f14 -/* 8B37A8 80243738 4600008D */ trunc.w.s $f2, $f0 -/* 8B37AC 8024373C E60200AC */ swc1 $f2, 0xac($s0) -/* 8B37B0 80243740 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B37B4 80243744 8FB00010 */ lw $s0, 0x10($sp) -/* 8B37B8 80243748 24020002 */ addiu $v0, $zero, 2 -/* 8B37BC 8024374C 03E00008 */ jr $ra -/* 8B37C0 80243750 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8B37C4 80243754 00000000 */ nop -/* 8B37C8 80243758 00000000 */ nop -/* 8B37CC 8024375C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s new file mode 100644 index 0000000000..20f05e64ce --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_802436FC_8B376C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802436FC_8B376C +/* 8B376C 802436FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8B3770 80243700 AFB00010 */ sw $s0, 0x10($sp) +/* 8B3774 80243704 0080802D */ daddu $s0, $a0, $zero +/* 8B3778 80243708 AFBF0014 */ sw $ra, 0x14($sp) +/* 8B377C 8024370C C60C0084 */ lwc1 $f12, 0x84($s0) +/* 8B3780 80243710 46806320 */ cvt.s.w $f12, $f12 +/* 8B3784 80243714 C6020090 */ lwc1 $f2, 0x90($s0) +/* 8B3788 80243718 468010A0 */ cvt.s.w $f2, $f2 +/* 8B378C 8024371C 44061000 */ mfc1 $a2, $f2 +/* 8B3790 80243720 C6020098 */ lwc1 $f2, 0x98($s0) +/* 8B3794 80243724 468010A0 */ cvt.s.w $f2, $f2 +/* 8B3798 80243728 44071000 */ mfc1 $a3, $f2 +/* 8B379C 8024372C C60E008C */ lwc1 $f14, 0x8c($s0) +/* 8B37A0 80243730 0C00A720 */ jal atan2 +/* 8B37A4 80243734 468073A0 */ cvt.s.w $f14, $f14 +/* 8B37A8 80243738 4600008D */ trunc.w.s $f2, $f0 +/* 8B37AC 8024373C E60200AC */ swc1 $f2, 0xac($s0) +/* 8B37B0 80243740 8FBF0014 */ lw $ra, 0x14($sp) +/* 8B37B4 80243744 8FB00010 */ lw $s0, 0x10($sp) +/* 8B37B8 80243748 24020002 */ addiu $v0, $zero, 2 +/* 8B37BC 8024374C 03E00008 */ jr $ra +/* 8B37C0 80243750 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8B37C4 80243754 00000000 */ nop +/* 8B37C8 80243758 00000000 */ nop +/* 8B37CC 8024375C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_80243760.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_80243760.s deleted file mode 100644 index 2cb6c1a3d2..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_80243760.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243760 -/* 8B37D0 80243760 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8B37D4 80243764 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8B37D8 80243768 4485A000 */ mtc1 $a1, $f20 -/* 8B37DC 8024376C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8B37E0 80243770 4486B000 */ mtc1 $a2, $f22 -/* 8B37E4 80243774 AFB00010 */ sw $s0, 0x10($sp) -/* 8B37E8 80243778 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 8B37EC 8024377C 4487C000 */ mtc1 $a3, $f24 -/* 8B37F0 80243780 AFBF0014 */ sw $ra, 0x14($sp) -/* 8B37F4 80243784 0C019D28 */ jal guMtxIdentF -/* 8B37F8 80243788 0080802D */ daddu $s0, $a0, $zero -/* 8B37FC 8024378C 4616A582 */ mul.s $f22, $f20, $f22 -/* 8B3800 80243790 00000000 */ nop -/* 8B3804 80243794 4618A502 */ mul.s $f20, $f20, $f24 -/* 8B3808 80243798 00000000 */ nop -/* 8B380C 8024379C 3C013F80 */ lui $at, 0x3f80 -/* 8B3810 802437A0 44810000 */ mtc1 $at, $f0 -/* 8B3814 802437A4 00000000 */ nop -/* 8B3818 802437A8 E6000014 */ swc1 $f0, 0x14($s0) -/* 8B381C 802437AC E6160010 */ swc1 $f22, 0x10($s0) -/* 8B3820 802437B0 E6140018 */ swc1 $f20, 0x18($s0) -/* 8B3824 802437B4 8FBF0014 */ lw $ra, 0x14($sp) -/* 8B3828 802437B8 8FB00010 */ lw $s0, 0x10($sp) -/* 8B382C 802437BC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8B3830 802437C0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8B3834 802437C4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8B3838 802437C8 03E00008 */ jr $ra -/* 8B383C 802437CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_80243760_8B37D0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_80243760_8B37D0.s new file mode 100644 index 0000000000..600ba68d48 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_80243760_8B37D0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243760_8B37D0 +/* 8B37D0 80243760 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8B37D4 80243764 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 8B37D8 80243768 4485A000 */ mtc1 $a1, $f20 +/* 8B37DC 8024376C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 8B37E0 80243770 4486B000 */ mtc1 $a2, $f22 +/* 8B37E4 80243774 AFB00010 */ sw $s0, 0x10($sp) +/* 8B37E8 80243778 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 8B37EC 8024377C 4487C000 */ mtc1 $a3, $f24 +/* 8B37F0 80243780 AFBF0014 */ sw $ra, 0x14($sp) +/* 8B37F4 80243784 0C019D28 */ jal guMtxIdentF +/* 8B37F8 80243788 0080802D */ daddu $s0, $a0, $zero +/* 8B37FC 8024378C 4616A582 */ mul.s $f22, $f20, $f22 +/* 8B3800 80243790 00000000 */ nop +/* 8B3804 80243794 4618A502 */ mul.s $f20, $f20, $f24 +/* 8B3808 80243798 00000000 */ nop +/* 8B380C 8024379C 3C013F80 */ lui $at, 0x3f80 +/* 8B3810 802437A0 44810000 */ mtc1 $at, $f0 +/* 8B3814 802437A4 00000000 */ nop +/* 8B3818 802437A8 E6000014 */ swc1 $f0, 0x14($s0) +/* 8B381C 802437AC E6160010 */ swc1 $f22, 0x10($s0) +/* 8B3820 802437B0 E6140018 */ swc1 $f20, 0x18($s0) +/* 8B3824 802437B4 8FBF0014 */ lw $ra, 0x14($sp) +/* 8B3828 802437B8 8FB00010 */ lw $s0, 0x10($sp) +/* 8B382C 802437BC D7B80028 */ ldc1 $f24, 0x28($sp) +/* 8B3830 802437C0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 8B3834 802437C4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 8B3838 802437C8 03E00008 */ jr $ra +/* 8B383C 802437CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_802437D0_8B3840.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_802437D0_8B3840.s index 340a33f9d3..54142d10fb 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_802437D0_8B3840.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B37D0/func_802437D0_8B3840.s @@ -55,7 +55,7 @@ glabel func_802437D0_8B3840 /* 8B3908 80243898 4405E000 */ mfc1 $a1, $f28 /* 8B390C 8024389C 4406D000 */ mfc1 $a2, $f26 /* 8B3910 802438A0 4407C000 */ mfc1 $a3, $f24 -/* 8B3914 802438A4 0C090DD8 */ jal func_80243760 +/* 8B3914 802438A4 0C090DD8 */ jal func_80243760_8B37D0 /* 8B3918 802438A8 27A40010 */ addiu $a0, $sp, 0x10 /* 8B391C 802438AC 27A40010 */ addiu $a0, $sp, 0x10 /* 8B3920 802438B0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802437D0_8B3840 /* 8B3990 80243920 4405E000 */ mfc1 $a1, $f28 /* 8B3994 80243924 4406D000 */ mfc1 $a2, $f26 /* 8B3998 80243928 4407C000 */ mfc1 $a3, $f24 -/* 8B399C 8024392C 0C090DD8 */ jal func_80243760 +/* 8B399C 8024392C 0C090DD8 */ jal func_80243760_8B37D0 /* 8B39A0 80243930 27A40010 */ addiu $a0, $sp, 0x10 /* 8B39A4 80243934 27A40010 */ addiu $a0, $sp, 0x10 /* 8B39A8 80243938 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0.s deleted file mode 100644 index 9f0668e921..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802439A0 -/* 8B3A10 802439A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8B3A14 802439A4 3C048025 */ lui $a0, 0x8025 -/* 8B3A18 802439A8 24847F10 */ addiu $a0, $a0, 0x7f10 -/* 8B3A1C 802439AC 27A50010 */ addiu $a1, $sp, 0x10 -/* 8B3A20 802439B0 AFBF0020 */ sw $ra, 0x20($sp) -/* 8B3A24 802439B4 AFB1001C */ sw $s1, 0x1c($sp) -/* 8B3A28 802439B8 0C016B3A */ jal load_asset_by_name -/* 8B3A2C 802439BC AFB00018 */ sw $s0, 0x18($sp) -/* 8B3A30 802439C0 0040802D */ daddu $s0, $v0, $zero -/* 8B3A34 802439C4 0200202D */ daddu $a0, $s0, $zero -/* 8B3A38 802439C8 3C118026 */ lui $s1, 0x8026 -/* 8B3A3C 802439CC 26318140 */ addiu $s1, $s1, -0x7ec0 -/* 8B3A40 802439D0 0C01BB7C */ jal decode_yay0 -/* 8B3A44 802439D4 0220282D */ daddu $a1, $s1, $zero -/* 8B3A48 802439D8 0C00AB1E */ jal general_heap_free -/* 8B3A4C 802439DC 0200202D */ daddu $a0, $s0, $zero -/* 8B3A50 802439E0 3C048026 */ lui $a0, 0x8026 -/* 8B3A54 802439E4 2484C0D0 */ addiu $a0, $a0, -0x3f30 -/* 8B3A58 802439E8 3C028026 */ lui $v0, 0x8026 -/* 8B3A5C 802439EC 24428340 */ addiu $v0, $v0, -0x7cc0 -/* 8B3A60 802439F0 AC820000 */ sw $v0, ($a0) -/* 8B3A64 802439F4 24020096 */ addiu $v0, $zero, 0x96 -/* 8B3A68 802439F8 A4820008 */ sh $v0, 8($a0) -/* 8B3A6C 802439FC 24020069 */ addiu $v0, $zero, 0x69 -/* 8B3A70 80243A00 A482000A */ sh $v0, 0xa($a0) -/* 8B3A74 80243A04 24020002 */ addiu $v0, $zero, 2 -/* 8B3A78 80243A08 AC82000C */ sw $v0, 0xc($a0) -/* 8B3A7C 80243A0C 24020001 */ addiu $v0, $zero, 1 -/* 8B3A80 80243A10 AC910004 */ sw $s1, 4($a0) -/* 8B3A84 80243A14 0C0496CB */ jal set_message_images -/* 8B3A88 80243A18 AC820010 */ sw $v0, 0x10($a0) -/* 8B3A8C 80243A1C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8B3A90 80243A20 8FB1001C */ lw $s1, 0x1c($sp) -/* 8B3A94 80243A24 8FB00018 */ lw $s0, 0x18($sp) -/* 8B3A98 80243A28 24020002 */ addiu $v0, $zero, 2 -/* 8B3A9C 80243A2C 03E00008 */ jr $ra -/* 8B3AA0 80243A30 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8B3AA4 80243A34 00000000 */ nop -/* 8B3AA8 80243A38 00000000 */ nop -/* 8B3AAC 80243A3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s new file mode 100644 index 0000000000..a0aa881904 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B3A10/func_802439A0_8B3A10.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802439A0_8B3A10 +/* 8B3A10 802439A0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8B3A14 802439A4 3C048025 */ lui $a0, 0x8025 +/* 8B3A18 802439A8 24847F10 */ addiu $a0, $a0, 0x7f10 +/* 8B3A1C 802439AC 27A50010 */ addiu $a1, $sp, 0x10 +/* 8B3A20 802439B0 AFBF0020 */ sw $ra, 0x20($sp) +/* 8B3A24 802439B4 AFB1001C */ sw $s1, 0x1c($sp) +/* 8B3A28 802439B8 0C016B3A */ jal load_asset_by_name +/* 8B3A2C 802439BC AFB00018 */ sw $s0, 0x18($sp) +/* 8B3A30 802439C0 0040802D */ daddu $s0, $v0, $zero +/* 8B3A34 802439C4 0200202D */ daddu $a0, $s0, $zero +/* 8B3A38 802439C8 3C118026 */ lui $s1, 0x8026 +/* 8B3A3C 802439CC 26318140 */ addiu $s1, $s1, -0x7ec0 +/* 8B3A40 802439D0 0C01BB7C */ jal decode_yay0 +/* 8B3A44 802439D4 0220282D */ daddu $a1, $s1, $zero +/* 8B3A48 802439D8 0C00AB1E */ jal general_heap_free +/* 8B3A4C 802439DC 0200202D */ daddu $a0, $s0, $zero +/* 8B3A50 802439E0 3C048026 */ lui $a0, 0x8026 +/* 8B3A54 802439E4 2484C0D0 */ addiu $a0, $a0, -0x3f30 +/* 8B3A58 802439E8 3C028026 */ lui $v0, 0x8026 +/* 8B3A5C 802439EC 24428340 */ addiu $v0, $v0, -0x7cc0 +/* 8B3A60 802439F0 AC820000 */ sw $v0, ($a0) +/* 8B3A64 802439F4 24020096 */ addiu $v0, $zero, 0x96 +/* 8B3A68 802439F8 A4820008 */ sh $v0, 8($a0) +/* 8B3A6C 802439FC 24020069 */ addiu $v0, $zero, 0x69 +/* 8B3A70 80243A00 A482000A */ sh $v0, 0xa($a0) +/* 8B3A74 80243A04 24020002 */ addiu $v0, $zero, 2 +/* 8B3A78 80243A08 AC82000C */ sw $v0, 0xc($a0) +/* 8B3A7C 80243A0C 24020001 */ addiu $v0, $zero, 1 +/* 8B3A80 80243A10 AC910004 */ sw $s1, 4($a0) +/* 8B3A84 80243A14 0C0496CB */ jal set_message_images +/* 8B3A88 80243A18 AC820010 */ sw $v0, 0x10($a0) +/* 8B3A8C 80243A1C 8FBF0020 */ lw $ra, 0x20($sp) +/* 8B3A90 80243A20 8FB1001C */ lw $s1, 0x1c($sp) +/* 8B3A94 80243A24 8FB00018 */ lw $s0, 0x18($sp) +/* 8B3A98 80243A28 24020002 */ addiu $v0, $zero, 2 +/* 8B3A9C 80243A2C 03E00008 */ jr $ra +/* 8B3AA0 80243A30 27BD0028 */ addiu $sp, $sp, 0x28 +/* 8B3AA4 80243A34 00000000 */ nop +/* 8B3AA8 80243A38 00000000 */ nop +/* 8B3AAC 80243A3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184.s deleted file mode 100644 index bcb1e1dde5..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240184 -/* 8C8114 80240184 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8C8118 80240188 AFBF0010 */ sw $ra, 0x10($sp) -/* 8C811C 8024018C 0C00EABB */ jal get_npc_unsafe -/* 8C8120 80240190 2404FFFC */ addiu $a0, $zero, -4 -/* 8C8124 80240194 8C420000 */ lw $v0, ($v0) -/* 8C8128 80240198 8FBF0010 */ lw $ra, 0x10($sp) -/* 8C812C 8024019C 30421000 */ andi $v0, $v0, 0x1000 -/* 8C8130 802401A0 0002102B */ sltu $v0, $zero, $v0 -/* 8C8134 802401A4 00021040 */ sll $v0, $v0, 1 -/* 8C8138 802401A8 03E00008 */ jr $ra -/* 8C813C 802401AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s new file mode 100644 index 0000000000..5b71f3006b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240184_8C8114 +/* 8C8114 80240184 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8C8118 80240188 AFBF0010 */ sw $ra, 0x10($sp) +/* 8C811C 8024018C 0C00EABB */ jal get_npc_unsafe +/* 8C8120 80240190 2404FFFC */ addiu $a0, $zero, -4 +/* 8C8124 80240194 8C420000 */ lw $v0, ($v0) +/* 8C8128 80240198 8FBF0010 */ lw $ra, 0x10($sp) +/* 8C812C 8024019C 30421000 */ andi $v0, $v0, 0x1000 +/* 8C8130 802401A0 0002102B */ sltu $v0, $zero, $v0 +/* 8C8134 802401A4 00021040 */ sll $v0, $v0, 1 +/* 8C8138 802401A8 03E00008 */ jr $ra +/* 8C813C 802401AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218.s deleted file mode 100644 index e224be9acb..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240218 -/* 8C81A8 80240218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8C81AC 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* 8C81B0 80240220 0080882D */ daddu $s1, $a0, $zero -/* 8C81B4 80240224 AFBF0018 */ sw $ra, 0x18($sp) -/* 8C81B8 80240228 AFB00010 */ sw $s0, 0x10($sp) -/* 8C81BC 8024022C F7B80030 */ sdc1 $f24, 0x30($sp) -/* 8C81C0 80240230 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8C81C4 80240234 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8C81C8 80240238 8E30000C */ lw $s0, 0xc($s1) -/* 8C81CC 8024023C 8E050000 */ lw $a1, ($s0) -/* 8C81D0 80240240 0C0B1EAF */ jal get_variable -/* 8C81D4 80240244 26100004 */ addiu $s0, $s0, 4 -/* 8C81D8 80240248 8E050000 */ lw $a1, ($s0) -/* 8C81DC 8024024C 26100004 */ addiu $s0, $s0, 4 -/* 8C81E0 80240250 4482C000 */ mtc1 $v0, $f24 -/* 8C81E4 80240254 00000000 */ nop -/* 8C81E8 80240258 4680C620 */ cvt.s.w $f24, $f24 -/* 8C81EC 8024025C 0C0B1EAF */ jal get_variable -/* 8C81F0 80240260 0220202D */ daddu $a0, $s1, $zero -/* 8C81F4 80240264 8E050000 */ lw $a1, ($s0) -/* 8C81F8 80240268 26100004 */ addiu $s0, $s0, 4 -/* 8C81FC 8024026C 4482B000 */ mtc1 $v0, $f22 -/* 8C8200 80240270 00000000 */ nop -/* 8C8204 80240274 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8C8208 80240278 0C0B1EAF */ jal get_variable -/* 8C820C 8024027C 0220202D */ daddu $a0, $s1, $zero -/* 8C8210 80240280 8E050000 */ lw $a1, ($s0) -/* 8C8214 80240284 4482A000 */ mtc1 $v0, $f20 -/* 8C8218 80240288 00000000 */ nop -/* 8C821C 8024028C 4680A520 */ cvt.s.w $f20, $f20 -/* 8C8220 80240290 0C0B1EAF */ jal get_variable -/* 8C8224 80240294 0220202D */ daddu $a0, $s1, $zero -/* 8C8228 80240298 44820000 */ mtc1 $v0, $f0 -/* 8C822C 8024029C 00000000 */ nop -/* 8C8230 802402A0 46800020 */ cvt.s.w $f0, $f0 -/* 8C8234 802402A4 46160001 */ sub.s $f0, $f0, $f22 -/* 8C8238 802402A8 4618A501 */ sub.s $f20, $f20, $f24 -/* 8C823C 802402AC 46140003 */ div.s $f0, $f0, $f20 -/* 8C8240 802402B0 46180602 */ mul.s $f24, $f0, $f24 -/* 8C8244 802402B4 00000000 */ nop -/* 8C8248 802402B8 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8C824C 802402BC 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8C8250 802402C0 C4420028 */ lwc1 $f2, 0x28($v0) -/* 8C8254 802402C4 46020002 */ mul.s $f0, $f0, $f2 -/* 8C8258 802402C8 00000000 */ nop -/* 8C825C 802402CC 4618B581 */ sub.s $f22, $f22, $f24 -/* 8C8260 802402D0 46160000 */ add.s $f0, $f0, $f22 -/* 8C8264 802402D4 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8C8268 802402D8 4600103C */ c.lt.s $f2, $f0 -/* 8C826C 802402DC 00000000 */ nop -/* 8C8270 802402E0 45000003 */ bc1f .L802402F0 -/* 8C8274 802402E4 24020001 */ addiu $v0, $zero, 1 -/* 8C8278 802402E8 080900BD */ j .L802402F4 -/* 8C827C 802402EC AE200084 */ sw $zero, 0x84($s1) -.L802402F0: -/* 8C8280 802402F0 AE220084 */ sw $v0, 0x84($s1) -.L802402F4: -/* 8C8284 802402F4 8FBF0018 */ lw $ra, 0x18($sp) -/* 8C8288 802402F8 8FB10014 */ lw $s1, 0x14($sp) -/* 8C828C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8C8290 80240300 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8C8294 80240304 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8C8298 80240308 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8C829C 8024030C 24020002 */ addiu $v0, $zero, 2 -/* 8C82A0 80240310 03E00008 */ jr $ra -/* 8C82A4 80240314 27BD0038 */ addiu $sp, $sp, 0x38 -/* 8C82A8 80240318 00000000 */ nop -/* 8C82AC 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s new file mode 100644 index 0000000000..9f3aeef417 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s @@ -0,0 +1,72 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240218_8C81A8 +/* 8C81A8 80240218 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8C81AC 8024021C AFB10014 */ sw $s1, 0x14($sp) +/* 8C81B0 80240220 0080882D */ daddu $s1, $a0, $zero +/* 8C81B4 80240224 AFBF0018 */ sw $ra, 0x18($sp) +/* 8C81B8 80240228 AFB00010 */ sw $s0, 0x10($sp) +/* 8C81BC 8024022C F7B80030 */ sdc1 $f24, 0x30($sp) +/* 8C81C0 80240230 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 8C81C4 80240234 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8C81C8 80240238 8E30000C */ lw $s0, 0xc($s1) +/* 8C81CC 8024023C 8E050000 */ lw $a1, ($s0) +/* 8C81D0 80240240 0C0B1EAF */ jal get_variable +/* 8C81D4 80240244 26100004 */ addiu $s0, $s0, 4 +/* 8C81D8 80240248 8E050000 */ lw $a1, ($s0) +/* 8C81DC 8024024C 26100004 */ addiu $s0, $s0, 4 +/* 8C81E0 80240250 4482C000 */ mtc1 $v0, $f24 +/* 8C81E4 80240254 00000000 */ nop +/* 8C81E8 80240258 4680C620 */ cvt.s.w $f24, $f24 +/* 8C81EC 8024025C 0C0B1EAF */ jal get_variable +/* 8C81F0 80240260 0220202D */ daddu $a0, $s1, $zero +/* 8C81F4 80240264 8E050000 */ lw $a1, ($s0) +/* 8C81F8 80240268 26100004 */ addiu $s0, $s0, 4 +/* 8C81FC 8024026C 4482B000 */ mtc1 $v0, $f22 +/* 8C8200 80240270 00000000 */ nop +/* 8C8204 80240274 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8C8208 80240278 0C0B1EAF */ jal get_variable +/* 8C820C 8024027C 0220202D */ daddu $a0, $s1, $zero +/* 8C8210 80240280 8E050000 */ lw $a1, ($s0) +/* 8C8214 80240284 4482A000 */ mtc1 $v0, $f20 +/* 8C8218 80240288 00000000 */ nop +/* 8C821C 8024028C 4680A520 */ cvt.s.w $f20, $f20 +/* 8C8220 80240290 0C0B1EAF */ jal get_variable +/* 8C8224 80240294 0220202D */ daddu $a0, $s1, $zero +/* 8C8228 80240298 44820000 */ mtc1 $v0, $f0 +/* 8C822C 8024029C 00000000 */ nop +/* 8C8230 802402A0 46800020 */ cvt.s.w $f0, $f0 +/* 8C8234 802402A4 46160001 */ sub.s $f0, $f0, $f22 +/* 8C8238 802402A8 4618A501 */ sub.s $f20, $f20, $f24 +/* 8C823C 802402AC 46140003 */ div.s $f0, $f0, $f20 +/* 8C8240 802402B0 46180602 */ mul.s $f24, $f0, $f24 +/* 8C8244 802402B4 00000000 */ nop +/* 8C8248 802402B8 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 8C824C 802402BC 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 8C8250 802402C0 C4420028 */ lwc1 $f2, 0x28($v0) +/* 8C8254 802402C4 46020002 */ mul.s $f0, $f0, $f2 +/* 8C8258 802402C8 00000000 */ nop +/* 8C825C 802402CC 4618B581 */ sub.s $f22, $f22, $f24 +/* 8C8260 802402D0 46160000 */ add.s $f0, $f0, $f22 +/* 8C8264 802402D4 C4420030 */ lwc1 $f2, 0x30($v0) +/* 8C8268 802402D8 4600103C */ c.lt.s $f2, $f0 +/* 8C826C 802402DC 00000000 */ nop +/* 8C8270 802402E0 45000003 */ bc1f .L802402F0 +/* 8C8274 802402E4 24020001 */ addiu $v0, $zero, 1 +/* 8C8278 802402E8 080900BD */ j .L802402F4 +/* 8C827C 802402EC AE200084 */ sw $zero, 0x84($s1) +.L802402F0: +/* 8C8280 802402F0 AE220084 */ sw $v0, 0x84($s1) +.L802402F4: +/* 8C8284 802402F4 8FBF0018 */ lw $ra, 0x18($sp) +/* 8C8288 802402F8 8FB10014 */ lw $s1, 0x14($sp) +/* 8C828C 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* 8C8290 80240300 D7B80030 */ ldc1 $f24, 0x30($sp) +/* 8C8294 80240304 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8C8298 80240308 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8C829C 8024030C 24020002 */ addiu $v0, $zero, 2 +/* 8C82A0 80240310 03E00008 */ jr $ra +/* 8C82A4 80240314 27BD0038 */ addiu $sp, $sp, 0x38 +/* 8C82A8 80240318 00000000 */ nop +/* 8C82AC 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358.s deleted file mode 100644 index df5a85621d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240358 -/* 8C82E8 80240358 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8C82EC 8024035C AFB00010 */ sw $s0, 0x10($sp) -/* 8C82F0 80240360 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 8C82F4 80240364 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 8C82F8 80240368 AFBF0018 */ sw $ra, 0x18($sp) -/* 8C82FC 8024036C AFB10014 */ sw $s1, 0x14($sp) -/* 8C8300 80240370 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8C8304 80240374 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8C8308 80240378 C60C0080 */ lwc1 $f12, 0x80($s0) -/* 8C830C 8024037C 0C00A8BB */ jal sin_deg -/* 8C8310 80240380 0080882D */ daddu $s1, $a0, $zero -/* 8C8314 80240384 C6140054 */ lwc1 $f20, 0x54($s0) -/* 8C8318 80240388 3C0140A0 */ lui $at, 0x40a0 -/* 8C831C 8024038C 4481B000 */ mtc1 $at, $f22 -/* 8C8320 80240390 00000000 */ nop -/* 8C8324 80240394 4616A502 */ mul.s $f20, $f20, $f22 -/* 8C8328 80240398 00000000 */ nop -/* 8C832C 8024039C C60C0080 */ lwc1 $f12, 0x80($s0) -/* 8C8330 802403A0 4600A502 */ mul.s $f20, $f20, $f0 -/* 8C8334 802403A4 0C00A8D4 */ jal cos_deg -/* 8C8338 802403A8 00000000 */ nop -/* 8C833C 802403AC C6040054 */ lwc1 $f4, 0x54($s0) -/* 8C8340 802403B0 46162102 */ mul.s $f4, $f4, $f22 -/* 8C8344 802403B4 00000000 */ nop -/* 8C8348 802403B8 C6020028 */ lwc1 $f2, 0x28($s0) -/* 8C834C 802403BC 46141080 */ add.s $f2, $f2, $f20 -/* 8C8350 802403C0 46000007 */ neg.s $f0, $f0 -/* 8C8354 802403C4 46002102 */ mul.s $f4, $f4, $f0 -/* 8C8358 802403C8 00000000 */ nop -/* 8C835C 802403CC 4600118D */ trunc.w.s $f6, $f2 -/* 8C8360 802403D0 E6260084 */ swc1 $f6, 0x84($s1) -/* 8C8364 802403D4 C6000030 */ lwc1 $f0, 0x30($s0) -/* 8C8368 802403D8 46040000 */ add.s $f0, $f0, $f4 -/* 8C836C 802403DC 4600018D */ trunc.w.s $f6, $f0 -/* 8C8370 802403E0 E6260088 */ swc1 $f6, 0x88($s1) -/* 8C8374 802403E4 8FBF0018 */ lw $ra, 0x18($sp) -/* 8C8378 802403E8 8FB10014 */ lw $s1, 0x14($sp) -/* 8C837C 802403EC 8FB00010 */ lw $s0, 0x10($sp) -/* 8C8380 802403F0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8C8384 802403F4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8C8388 802403F8 24020002 */ addiu $v0, $zero, 2 -/* 8C838C 802403FC 03E00008 */ jr $ra -/* 8C8390 80240400 27BD0030 */ addiu $sp, $sp, 0x30 -/* 8C8394 80240404 00000000 */ nop -/* 8C8398 80240408 00000000 */ nop -/* 8C839C 8024040C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s new file mode 100644 index 0000000000..effece0d26 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240358_8C82E8 +/* 8C82E8 80240358 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8C82EC 8024035C AFB00010 */ sw $s0, 0x10($sp) +/* 8C82F0 80240360 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* 8C82F4 80240364 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* 8C82F8 80240368 AFBF0018 */ sw $ra, 0x18($sp) +/* 8C82FC 8024036C AFB10014 */ sw $s1, 0x14($sp) +/* 8C8300 80240370 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 8C8304 80240374 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8C8308 80240378 C60C0080 */ lwc1 $f12, 0x80($s0) +/* 8C830C 8024037C 0C00A8BB */ jal sin_deg +/* 8C8310 80240380 0080882D */ daddu $s1, $a0, $zero +/* 8C8314 80240384 C6140054 */ lwc1 $f20, 0x54($s0) +/* 8C8318 80240388 3C0140A0 */ lui $at, 0x40a0 +/* 8C831C 8024038C 4481B000 */ mtc1 $at, $f22 +/* 8C8320 80240390 00000000 */ nop +/* 8C8324 80240394 4616A502 */ mul.s $f20, $f20, $f22 +/* 8C8328 80240398 00000000 */ nop +/* 8C832C 8024039C C60C0080 */ lwc1 $f12, 0x80($s0) +/* 8C8330 802403A0 4600A502 */ mul.s $f20, $f20, $f0 +/* 8C8334 802403A4 0C00A8D4 */ jal cos_deg +/* 8C8338 802403A8 00000000 */ nop +/* 8C833C 802403AC C6040054 */ lwc1 $f4, 0x54($s0) +/* 8C8340 802403B0 46162102 */ mul.s $f4, $f4, $f22 +/* 8C8344 802403B4 00000000 */ nop +/* 8C8348 802403B8 C6020028 */ lwc1 $f2, 0x28($s0) +/* 8C834C 802403BC 46141080 */ add.s $f2, $f2, $f20 +/* 8C8350 802403C0 46000007 */ neg.s $f0, $f0 +/* 8C8354 802403C4 46002102 */ mul.s $f4, $f4, $f0 +/* 8C8358 802403C8 00000000 */ nop +/* 8C835C 802403CC 4600118D */ trunc.w.s $f6, $f2 +/* 8C8360 802403D0 E6260084 */ swc1 $f6, 0x84($s1) +/* 8C8364 802403D4 C6000030 */ lwc1 $f0, 0x30($s0) +/* 8C8368 802403D8 46040000 */ add.s $f0, $f0, $f4 +/* 8C836C 802403DC 4600018D */ trunc.w.s $f6, $f0 +/* 8C8370 802403E0 E6260088 */ swc1 $f6, 0x88($s1) +/* 8C8374 802403E4 8FBF0018 */ lw $ra, 0x18($sp) +/* 8C8378 802403E8 8FB10014 */ lw $s1, 0x14($sp) +/* 8C837C 802403EC 8FB00010 */ lw $s0, 0x10($sp) +/* 8C8380 802403F0 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8C8384 802403F4 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8C8388 802403F8 24020002 */ addiu $v0, $zero, 2 +/* 8C838C 802403FC 03E00008 */ jr $ra +/* 8C8390 80240400 27BD0030 */ addiu $sp, $sp, 0x30 +/* 8C8394 80240404 00000000 */ nop +/* 8C8398 80240408 00000000 */ nop +/* 8C839C 8024040C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C83A0/func_80240480.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C83A0/func_80240480.s deleted file mode 100644 index 3759dbddaa..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C83A0/func_80240480.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240480 -/* 8C8410 80240480 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8C8414 80240484 AFB10054 */ sw $s1, 0x54($sp) -/* 8C8418 80240488 0080882D */ daddu $s1, $a0, $zero -/* 8C841C 8024048C AFBF005C */ sw $ra, 0x5c($sp) -/* 8C8420 80240490 AFB20058 */ sw $s2, 0x58($sp) -/* 8C8424 80240494 AFB00050 */ sw $s0, 0x50($sp) -/* 8C8428 80240498 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8C842C 8024049C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8C8430 802404A0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8C8434 802404A4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8C8438 802404A8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8C843C 802404AC 8E30000C */ lw $s0, 0xc($s1) -/* 8C8440 802404B0 8E050000 */ lw $a1, ($s0) -/* 8C8444 802404B4 0C0B1EAF */ jal get_variable -/* 8C8448 802404B8 26100004 */ addiu $s0, $s0, 4 -/* 8C844C 802404BC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8C8450 802404C0 0040202D */ daddu $a0, $v0, $zero -/* 8C8454 802404C4 8E050000 */ lw $a1, ($s0) -/* 8C8458 802404C8 26100004 */ addiu $s0, $s0, 4 -/* 8C845C 802404CC 0220202D */ daddu $a0, $s1, $zero -/* 8C8460 802404D0 0C0B210B */ jal get_float_variable -/* 8C8464 802404D4 0040902D */ daddu $s2, $v0, $zero -/* 8C8468 802404D8 8E050000 */ lw $a1, ($s0) -/* 8C846C 802404DC 26100004 */ addiu $s0, $s0, 4 -/* 8C8470 802404E0 0220202D */ daddu $a0, $s1, $zero -/* 8C8474 802404E4 0C0B210B */ jal get_float_variable -/* 8C8478 802404E8 46000706 */ mov.s $f28, $f0 -/* 8C847C 802404EC 8E050000 */ lw $a1, ($s0) -/* 8C8480 802404F0 26100004 */ addiu $s0, $s0, 4 -/* 8C8484 802404F4 0220202D */ daddu $a0, $s1, $zero -/* 8C8488 802404F8 0C0B210B */ jal get_float_variable -/* 8C848C 802404FC 46000686 */ mov.s $f26, $f0 -/* 8C8490 80240500 0220202D */ daddu $a0, $s1, $zero -/* 8C8494 80240504 8E050000 */ lw $a1, ($s0) -/* 8C8498 80240508 0C0B210B */ jal get_float_variable -/* 8C849C 8024050C 46000586 */ mov.s $f22, $f0 -/* 8C84A0 80240510 0240202D */ daddu $a0, $s2, $zero -/* 8C84A4 80240514 0C046B4C */ jal get_model_from_list_index -/* 8C84A8 80240518 46000606 */ mov.s $f24, $f0 -/* 8C84AC 8024051C 0040882D */ daddu $s1, $v0, $zero -/* 8C84B0 80240520 96220000 */ lhu $v0, ($s1) -/* 8C84B4 80240524 30420400 */ andi $v0, $v0, 0x400 -/* 8C84B8 80240528 1440001E */ bnez $v0, .L802405A4 -/* 8C84BC 8024052C 26300058 */ addiu $s0, $s1, 0x58 -/* 8C84C0 80240530 4480A000 */ mtc1 $zero, $f20 -/* 8C84C4 80240534 4406B000 */ mfc1 $a2, $f22 -/* 8C84C8 80240538 4405A000 */ mfc1 $a1, $f20 -/* 8C84CC 8024053C 4407A000 */ mfc1 $a3, $f20 -/* 8C84D0 80240540 0C019E40 */ jal guTranslateF -/* 8C84D4 80240544 0200202D */ daddu $a0, $s0, $zero -/* 8C84D8 80240548 4405E000 */ mfc1 $a1, $f28 -/* 8C84DC 8024054C 4406D000 */ mfc1 $a2, $f26 -/* 8C84E0 80240550 4407C000 */ mfc1 $a3, $f24 -/* 8C84E4 80240554 0C090104 */ jal func_80240410 -/* 8C84E8 80240558 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C84EC 8024055C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C84F0 80240560 0200282D */ daddu $a1, $s0, $zero -/* 8C84F4 80240564 0C019D80 */ jal guMtxCatF -/* 8C84F8 80240568 0200302D */ daddu $a2, $s0, $zero -/* 8C84FC 8024056C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C8500 80240570 4600B587 */ neg.s $f22, $f22 -/* 8C8504 80240574 4405A000 */ mfc1 $a1, $f20 -/* 8C8508 80240578 4406B000 */ mfc1 $a2, $f22 -/* 8C850C 8024057C 0C019E40 */ jal guTranslateF -/* 8C8510 80240580 00A0382D */ daddu $a3, $a1, $zero -/* 8C8514 80240584 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C8518 80240588 0200282D */ daddu $a1, $s0, $zero -/* 8C851C 8024058C 0C019D80 */ jal guMtxCatF -/* 8C8520 80240590 00A0302D */ daddu $a2, $a1, $zero -/* 8C8524 80240594 96220000 */ lhu $v0, ($s1) -/* 8C8528 80240598 34421400 */ ori $v0, $v0, 0x1400 -/* 8C852C 8024059C 08090187 */ j .L8024061C -/* 8C8530 802405A0 A6220000 */ sh $v0, ($s1) -.L802405A4: -/* 8C8534 802405A4 4480A000 */ mtc1 $zero, $f20 -/* 8C8538 802405A8 4406B000 */ mfc1 $a2, $f22 -/* 8C853C 802405AC 4405A000 */ mfc1 $a1, $f20 -/* 8C8540 802405B0 4407A000 */ mfc1 $a3, $f20 -/* 8C8544 802405B4 0C019E40 */ jal guTranslateF -/* 8C8548 802405B8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C854C 802405BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C8550 802405C0 26300058 */ addiu $s0, $s1, 0x58 -/* 8C8554 802405C4 0200282D */ daddu $a1, $s0, $zero -/* 8C8558 802405C8 0C019D80 */ jal guMtxCatF -/* 8C855C 802405CC 0200302D */ daddu $a2, $s0, $zero -/* 8C8560 802405D0 4405E000 */ mfc1 $a1, $f28 -/* 8C8564 802405D4 4406D000 */ mfc1 $a2, $f26 -/* 8C8568 802405D8 4407C000 */ mfc1 $a3, $f24 -/* 8C856C 802405DC 0C090104 */ jal func_80240410 -/* 8C8570 802405E0 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C8574 802405E4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C8578 802405E8 0200282D */ daddu $a1, $s0, $zero -/* 8C857C 802405EC 0C019D80 */ jal guMtxCatF -/* 8C8580 802405F0 0200302D */ daddu $a2, $s0, $zero -/* 8C8584 802405F4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C8588 802405F8 4600B587 */ neg.s $f22, $f22 -/* 8C858C 802405FC 4405A000 */ mfc1 $a1, $f20 -/* 8C8590 80240600 4406B000 */ mfc1 $a2, $f22 -/* 8C8594 80240604 0C019E40 */ jal guTranslateF -/* 8C8598 80240608 00A0382D */ daddu $a3, $a1, $zero -/* 8C859C 8024060C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8C85A0 80240610 0200282D */ daddu $a1, $s0, $zero -/* 8C85A4 80240614 0C019D80 */ jal guMtxCatF -/* 8C85A8 80240618 00A0302D */ daddu $a2, $a1, $zero -.L8024061C: -/* 8C85AC 8024061C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8C85B0 80240620 8FB20058 */ lw $s2, 0x58($sp) -/* 8C85B4 80240624 8FB10054 */ lw $s1, 0x54($sp) -/* 8C85B8 80240628 8FB00050 */ lw $s0, 0x50($sp) -/* 8C85BC 8024062C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8C85C0 80240630 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8C85C4 80240634 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8C85C8 80240638 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8C85CC 8024063C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8C85D0 80240640 24020002 */ addiu $v0, $zero, 2 -/* 8C85D4 80240644 03E00008 */ jr $ra -/* 8C85D8 80240648 27BD0088 */ addiu $sp, $sp, 0x88 -/* 8C85DC 8024064C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C83A0/func_80240480_8C8410.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C83A0/func_80240480_8C8410.s new file mode 100644 index 0000000000..67cf17d4ec --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_03/8C83A0/func_80240480_8C8410.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240480_8C8410 +/* 8C8410 80240480 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8C8414 80240484 AFB10054 */ sw $s1, 0x54($sp) +/* 8C8418 80240488 0080882D */ daddu $s1, $a0, $zero +/* 8C841C 8024048C AFBF005C */ sw $ra, 0x5c($sp) +/* 8C8420 80240490 AFB20058 */ sw $s2, 0x58($sp) +/* 8C8424 80240494 AFB00050 */ sw $s0, 0x50($sp) +/* 8C8428 80240498 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8C842C 8024049C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8C8430 802404A0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8C8434 802404A4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8C8438 802404A8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8C843C 802404AC 8E30000C */ lw $s0, 0xc($s1) +/* 8C8440 802404B0 8E050000 */ lw $a1, ($s0) +/* 8C8444 802404B4 0C0B1EAF */ jal get_variable +/* 8C8448 802404B8 26100004 */ addiu $s0, $s0, 4 +/* 8C844C 802404BC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8C8450 802404C0 0040202D */ daddu $a0, $v0, $zero +/* 8C8454 802404C4 8E050000 */ lw $a1, ($s0) +/* 8C8458 802404C8 26100004 */ addiu $s0, $s0, 4 +/* 8C845C 802404CC 0220202D */ daddu $a0, $s1, $zero +/* 8C8460 802404D0 0C0B210B */ jal get_float_variable +/* 8C8464 802404D4 0040902D */ daddu $s2, $v0, $zero +/* 8C8468 802404D8 8E050000 */ lw $a1, ($s0) +/* 8C846C 802404DC 26100004 */ addiu $s0, $s0, 4 +/* 8C8470 802404E0 0220202D */ daddu $a0, $s1, $zero +/* 8C8474 802404E4 0C0B210B */ jal get_float_variable +/* 8C8478 802404E8 46000706 */ mov.s $f28, $f0 +/* 8C847C 802404EC 8E050000 */ lw $a1, ($s0) +/* 8C8480 802404F0 26100004 */ addiu $s0, $s0, 4 +/* 8C8484 802404F4 0220202D */ daddu $a0, $s1, $zero +/* 8C8488 802404F8 0C0B210B */ jal get_float_variable +/* 8C848C 802404FC 46000686 */ mov.s $f26, $f0 +/* 8C8490 80240500 0220202D */ daddu $a0, $s1, $zero +/* 8C8494 80240504 8E050000 */ lw $a1, ($s0) +/* 8C8498 80240508 0C0B210B */ jal get_float_variable +/* 8C849C 8024050C 46000586 */ mov.s $f22, $f0 +/* 8C84A0 80240510 0240202D */ daddu $a0, $s2, $zero +/* 8C84A4 80240514 0C046B4C */ jal get_model_from_list_index +/* 8C84A8 80240518 46000606 */ mov.s $f24, $f0 +/* 8C84AC 8024051C 0040882D */ daddu $s1, $v0, $zero +/* 8C84B0 80240520 96220000 */ lhu $v0, ($s1) +/* 8C84B4 80240524 30420400 */ andi $v0, $v0, 0x400 +/* 8C84B8 80240528 1440001E */ bnez $v0, .L802405A4 +/* 8C84BC 8024052C 26300058 */ addiu $s0, $s1, 0x58 +/* 8C84C0 80240530 4480A000 */ mtc1 $zero, $f20 +/* 8C84C4 80240534 4406B000 */ mfc1 $a2, $f22 +/* 8C84C8 80240538 4405A000 */ mfc1 $a1, $f20 +/* 8C84CC 8024053C 4407A000 */ mfc1 $a3, $f20 +/* 8C84D0 80240540 0C019E40 */ jal guTranslateF +/* 8C84D4 80240544 0200202D */ daddu $a0, $s0, $zero +/* 8C84D8 80240548 4405E000 */ mfc1 $a1, $f28 +/* 8C84DC 8024054C 4406D000 */ mfc1 $a2, $f26 +/* 8C84E0 80240550 4407C000 */ mfc1 $a3, $f24 +/* 8C84E4 80240554 0C090104 */ jal func_80240410_8C83A0 +/* 8C84E8 80240558 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C84EC 8024055C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C84F0 80240560 0200282D */ daddu $a1, $s0, $zero +/* 8C84F4 80240564 0C019D80 */ jal guMtxCatF +/* 8C84F8 80240568 0200302D */ daddu $a2, $s0, $zero +/* 8C84FC 8024056C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8500 80240570 4600B587 */ neg.s $f22, $f22 +/* 8C8504 80240574 4405A000 */ mfc1 $a1, $f20 +/* 8C8508 80240578 4406B000 */ mfc1 $a2, $f22 +/* 8C850C 8024057C 0C019E40 */ jal guTranslateF +/* 8C8510 80240580 00A0382D */ daddu $a3, $a1, $zero +/* 8C8514 80240584 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8518 80240588 0200282D */ daddu $a1, $s0, $zero +/* 8C851C 8024058C 0C019D80 */ jal guMtxCatF +/* 8C8520 80240590 00A0302D */ daddu $a2, $a1, $zero +/* 8C8524 80240594 96220000 */ lhu $v0, ($s1) +/* 8C8528 80240598 34421400 */ ori $v0, $v0, 0x1400 +/* 8C852C 8024059C 08090187 */ j .L8024061C +/* 8C8530 802405A0 A6220000 */ sh $v0, ($s1) +.L802405A4: +/* 8C8534 802405A4 4480A000 */ mtc1 $zero, $f20 +/* 8C8538 802405A8 4406B000 */ mfc1 $a2, $f22 +/* 8C853C 802405AC 4405A000 */ mfc1 $a1, $f20 +/* 8C8540 802405B0 4407A000 */ mfc1 $a3, $f20 +/* 8C8544 802405B4 0C019E40 */ jal guTranslateF +/* 8C8548 802405B8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C854C 802405BC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8550 802405C0 26300058 */ addiu $s0, $s1, 0x58 +/* 8C8554 802405C4 0200282D */ daddu $a1, $s0, $zero +/* 8C8558 802405C8 0C019D80 */ jal guMtxCatF +/* 8C855C 802405CC 0200302D */ daddu $a2, $s0, $zero +/* 8C8560 802405D0 4405E000 */ mfc1 $a1, $f28 +/* 8C8564 802405D4 4406D000 */ mfc1 $a2, $f26 +/* 8C8568 802405D8 4407C000 */ mfc1 $a3, $f24 +/* 8C856C 802405DC 0C090104 */ jal func_80240410_8C83A0 +/* 8C8570 802405E0 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8574 802405E4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8578 802405E8 0200282D */ daddu $a1, $s0, $zero +/* 8C857C 802405EC 0C019D80 */ jal guMtxCatF +/* 8C8580 802405F0 0200302D */ daddu $a2, $s0, $zero +/* 8C8584 802405F4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C8588 802405F8 4600B587 */ neg.s $f22, $f22 +/* 8C858C 802405FC 4405A000 */ mfc1 $a1, $f20 +/* 8C8590 80240600 4406B000 */ mfc1 $a2, $f22 +/* 8C8594 80240604 0C019E40 */ jal guTranslateF +/* 8C8598 80240608 00A0382D */ daddu $a3, $a1, $zero +/* 8C859C 8024060C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8C85A0 80240610 0200282D */ daddu $a1, $s0, $zero +/* 8C85A4 80240614 0C019D80 */ jal guMtxCatF +/* 8C85A8 80240618 00A0302D */ daddu $a2, $a1, $zero +.L8024061C: +/* 8C85AC 8024061C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8C85B0 80240620 8FB20058 */ lw $s2, 0x58($sp) +/* 8C85B4 80240624 8FB10054 */ lw $s1, 0x54($sp) +/* 8C85B8 80240628 8FB00050 */ lw $s0, 0x50($sp) +/* 8C85BC 8024062C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8C85C0 80240630 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8C85C4 80240634 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8C85C8 80240638 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8C85CC 8024063C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8C85D0 80240640 24020002 */ addiu $v0, $zero, 2 +/* 8C85D4 80240644 03E00008 */ jr $ra +/* 8C85D8 80240648 27BD0088 */ addiu $sp, $sp, 0x88 +/* 8C85DC 8024064C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C.s deleted file mode 100644 index 04a00a75a3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024002C -/* 8CA92C 8024002C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CA930 80240030 AFB00010 */ sw $s0, 0x10($sp) -/* 8CA934 80240034 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CA938 80240038 0C039D59 */ jal get_player_data -/* 8CA93C 8024003C 0080802D */ daddu $s0, $a0, $zero -/* 8CA940 80240040 80430002 */ lb $v1, 2($v0) -/* 8CA944 80240044 AE030084 */ sw $v1, 0x84($s0) -/* 8CA948 80240048 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CA94C 8024004C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CA950 80240050 24020002 */ addiu $v0, $zero, 2 -/* 8CA954 80240054 03E00008 */ jr $ra -/* 8CA958 80240058 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8CA95C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s new file mode 100644 index 0000000000..1e621e0276 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_8024002C_8CA92C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024002C_8CA92C +/* 8CA92C 8024002C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8CA930 80240030 AFB00010 */ sw $s0, 0x10($sp) +/* 8CA934 80240034 AFBF0014 */ sw $ra, 0x14($sp) +/* 8CA938 80240038 0C039D59 */ jal get_player_data +/* 8CA93C 8024003C 0080802D */ daddu $s0, $a0, $zero +/* 8CA940 80240040 80430002 */ lb $v1, 2($v0) +/* 8CA944 80240044 AE030084 */ sw $v1, 0x84($s0) +/* 8CA948 80240048 8FBF0014 */ lw $ra, 0x14($sp) +/* 8CA94C 8024004C 8FB00010 */ lw $s0, 0x10($sp) +/* 8CA950 80240050 24020002 */ addiu $v0, $zero, 2 +/* 8CA954 80240054 03E00008 */ jr $ra +/* 8CA958 80240058 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8CA95C 8024005C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240060.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240060.s deleted file mode 100644 index 7e0de16e69..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240060.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240060 -/* 8CA960 80240060 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8CA964 80240064 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8CA968 80240068 4485A000 */ mtc1 $a1, $f20 -/* 8CA96C 8024006C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8CA970 80240070 4486B000 */ mtc1 $a2, $f22 -/* 8CA974 80240074 AFB00010 */ sw $s0, 0x10($sp) -/* 8CA978 80240078 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 8CA97C 8024007C 4487C000 */ mtc1 $a3, $f24 -/* 8CA980 80240080 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CA984 80240084 0C019D28 */ jal guMtxIdentF -/* 8CA988 80240088 0080802D */ daddu $s0, $a0, $zero -/* 8CA98C 8024008C 4616A582 */ mul.s $f22, $f20, $f22 -/* 8CA990 80240090 00000000 */ nop -/* 8CA994 80240094 4618A502 */ mul.s $f20, $f20, $f24 -/* 8CA998 80240098 00000000 */ nop -/* 8CA99C 8024009C 3C013F80 */ lui $at, 0x3f80 -/* 8CA9A0 802400A0 44810000 */ mtc1 $at, $f0 -/* 8CA9A4 802400A4 00000000 */ nop -/* 8CA9A8 802400A8 E6000014 */ swc1 $f0, 0x14($s0) -/* 8CA9AC 802400AC E6160010 */ swc1 $f22, 0x10($s0) -/* 8CA9B0 802400B0 E6140018 */ swc1 $f20, 0x18($s0) -/* 8CA9B4 802400B4 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CA9B8 802400B8 8FB00010 */ lw $s0, 0x10($sp) -/* 8CA9BC 802400BC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8CA9C0 802400C0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8CA9C4 802400C4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8CA9C8 802400C8 03E00008 */ jr $ra -/* 8CA9CC 802400CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240060_8CA960.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240060_8CA960.s new file mode 100644 index 0000000000..d780327135 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240060_8CA960.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240060_8CA960 +/* 8CA960 80240060 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8CA964 80240064 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 8CA968 80240068 4485A000 */ mtc1 $a1, $f20 +/* 8CA96C 8024006C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 8CA970 80240070 4486B000 */ mtc1 $a2, $f22 +/* 8CA974 80240074 AFB00010 */ sw $s0, 0x10($sp) +/* 8CA978 80240078 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 8CA97C 8024007C 4487C000 */ mtc1 $a3, $f24 +/* 8CA980 80240080 AFBF0014 */ sw $ra, 0x14($sp) +/* 8CA984 80240084 0C019D28 */ jal guMtxIdentF +/* 8CA988 80240088 0080802D */ daddu $s0, $a0, $zero +/* 8CA98C 8024008C 4616A582 */ mul.s $f22, $f20, $f22 +/* 8CA990 80240090 00000000 */ nop +/* 8CA994 80240094 4618A502 */ mul.s $f20, $f20, $f24 +/* 8CA998 80240098 00000000 */ nop +/* 8CA99C 8024009C 3C013F80 */ lui $at, 0x3f80 +/* 8CA9A0 802400A0 44810000 */ mtc1 $at, $f0 +/* 8CA9A4 802400A4 00000000 */ nop +/* 8CA9A8 802400A8 E6000014 */ swc1 $f0, 0x14($s0) +/* 8CA9AC 802400AC E6160010 */ swc1 $f22, 0x10($s0) +/* 8CA9B0 802400B0 E6140018 */ swc1 $f20, 0x18($s0) +/* 8CA9B4 802400B4 8FBF0014 */ lw $ra, 0x14($sp) +/* 8CA9B8 802400B8 8FB00010 */ lw $s0, 0x10($sp) +/* 8CA9BC 802400BC D7B80028 */ ldc1 $f24, 0x28($sp) +/* 8CA9C0 802400C0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 8CA9C4 802400C4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 8CA9C8 802400C8 03E00008 */ jr $ra +/* 8CA9CC 802400CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802400D0.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802400D0.s deleted file mode 100644 index 5d38133242..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802400D0.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400D0 -/* 8CA9D0 802400D0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8CA9D4 802400D4 AFB10054 */ sw $s1, 0x54($sp) -/* 8CA9D8 802400D8 0080882D */ daddu $s1, $a0, $zero -/* 8CA9DC 802400DC AFBF005C */ sw $ra, 0x5c($sp) -/* 8CA9E0 802400E0 AFB20058 */ sw $s2, 0x58($sp) -/* 8CA9E4 802400E4 AFB00050 */ sw $s0, 0x50($sp) -/* 8CA9E8 802400E8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8CA9EC 802400EC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8CA9F0 802400F0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8CA9F4 802400F4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8CA9F8 802400F8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8CA9FC 802400FC 8E30000C */ lw $s0, 0xc($s1) -/* 8CAA00 80240100 8E050000 */ lw $a1, ($s0) -/* 8CAA04 80240104 0C0B1EAF */ jal get_variable -/* 8CAA08 80240108 26100004 */ addiu $s0, $s0, 4 -/* 8CAA0C 8024010C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8CAA10 80240110 0040202D */ daddu $a0, $v0, $zero -/* 8CAA14 80240114 8E050000 */ lw $a1, ($s0) -/* 8CAA18 80240118 26100004 */ addiu $s0, $s0, 4 -/* 8CAA1C 8024011C 0220202D */ daddu $a0, $s1, $zero -/* 8CAA20 80240120 0C0B210B */ jal get_float_variable -/* 8CAA24 80240124 0040902D */ daddu $s2, $v0, $zero -/* 8CAA28 80240128 8E050000 */ lw $a1, ($s0) -/* 8CAA2C 8024012C 26100004 */ addiu $s0, $s0, 4 -/* 8CAA30 80240130 0220202D */ daddu $a0, $s1, $zero -/* 8CAA34 80240134 0C0B210B */ jal get_float_variable -/* 8CAA38 80240138 46000706 */ mov.s $f28, $f0 -/* 8CAA3C 8024013C 8E050000 */ lw $a1, ($s0) -/* 8CAA40 80240140 26100004 */ addiu $s0, $s0, 4 -/* 8CAA44 80240144 0220202D */ daddu $a0, $s1, $zero -/* 8CAA48 80240148 0C0B210B */ jal get_float_variable -/* 8CAA4C 8024014C 46000686 */ mov.s $f26, $f0 -/* 8CAA50 80240150 0220202D */ daddu $a0, $s1, $zero -/* 8CAA54 80240154 8E050000 */ lw $a1, ($s0) -/* 8CAA58 80240158 0C0B210B */ jal get_float_variable -/* 8CAA5C 8024015C 46000586 */ mov.s $f22, $f0 -/* 8CAA60 80240160 0240202D */ daddu $a0, $s2, $zero -/* 8CAA64 80240164 0C046B4C */ jal get_model_from_list_index -/* 8CAA68 80240168 46000606 */ mov.s $f24, $f0 -/* 8CAA6C 8024016C 0040882D */ daddu $s1, $v0, $zero -/* 8CAA70 80240170 96220000 */ lhu $v0, ($s1) -/* 8CAA74 80240174 30420400 */ andi $v0, $v0, 0x400 -/* 8CAA78 80240178 1440001E */ bnez $v0, .L802401F4 -/* 8CAA7C 8024017C 26300058 */ addiu $s0, $s1, 0x58 -/* 8CAA80 80240180 4480A000 */ mtc1 $zero, $f20 -/* 8CAA84 80240184 4406B000 */ mfc1 $a2, $f22 -/* 8CAA88 80240188 4405A000 */ mfc1 $a1, $f20 -/* 8CAA8C 8024018C 4407A000 */ mfc1 $a3, $f20 -/* 8CAA90 80240190 0C019E40 */ jal guTranslateF -/* 8CAA94 80240194 0200202D */ daddu $a0, $s0, $zero -/* 8CAA98 80240198 4405E000 */ mfc1 $a1, $f28 -/* 8CAA9C 8024019C 4406D000 */ mfc1 $a2, $f26 -/* 8CAAA0 802401A0 4407C000 */ mfc1 $a3, $f24 -/* 8CAAA4 802401A4 0C090018 */ jal func_80240060 -/* 8CAAA8 802401A8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAAAC 802401AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAAB0 802401B0 0200282D */ daddu $a1, $s0, $zero -/* 8CAAB4 802401B4 0C019D80 */ jal guMtxCatF -/* 8CAAB8 802401B8 0200302D */ daddu $a2, $s0, $zero -/* 8CAABC 802401BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAAC0 802401C0 4600B587 */ neg.s $f22, $f22 -/* 8CAAC4 802401C4 4405A000 */ mfc1 $a1, $f20 -/* 8CAAC8 802401C8 4406B000 */ mfc1 $a2, $f22 -/* 8CAACC 802401CC 0C019E40 */ jal guTranslateF -/* 8CAAD0 802401D0 00A0382D */ daddu $a3, $a1, $zero -/* 8CAAD4 802401D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAAD8 802401D8 0200282D */ daddu $a1, $s0, $zero -/* 8CAADC 802401DC 0C019D80 */ jal guMtxCatF -/* 8CAAE0 802401E0 00A0302D */ daddu $a2, $a1, $zero -/* 8CAAE4 802401E4 96220000 */ lhu $v0, ($s1) -/* 8CAAE8 802401E8 34421400 */ ori $v0, $v0, 0x1400 -/* 8CAAEC 802401EC 0809009B */ j .L8024026C -/* 8CAAF0 802401F0 A6220000 */ sh $v0, ($s1) -.L802401F4: -/* 8CAAF4 802401F4 4480A000 */ mtc1 $zero, $f20 -/* 8CAAF8 802401F8 4406B000 */ mfc1 $a2, $f22 -/* 8CAAFC 802401FC 4405A000 */ mfc1 $a1, $f20 -/* 8CAB00 80240200 4407A000 */ mfc1 $a3, $f20 -/* 8CAB04 80240204 0C019E40 */ jal guTranslateF -/* 8CAB08 80240208 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAB0C 8024020C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAB10 80240210 26300058 */ addiu $s0, $s1, 0x58 -/* 8CAB14 80240214 0200282D */ daddu $a1, $s0, $zero -/* 8CAB18 80240218 0C019D80 */ jal guMtxCatF -/* 8CAB1C 8024021C 0200302D */ daddu $a2, $s0, $zero -/* 8CAB20 80240220 4405E000 */ mfc1 $a1, $f28 -/* 8CAB24 80240224 4406D000 */ mfc1 $a2, $f26 -/* 8CAB28 80240228 4407C000 */ mfc1 $a3, $f24 -/* 8CAB2C 8024022C 0C090018 */ jal func_80240060 -/* 8CAB30 80240230 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAB34 80240234 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAB38 80240238 0200282D */ daddu $a1, $s0, $zero -/* 8CAB3C 8024023C 0C019D80 */ jal guMtxCatF -/* 8CAB40 80240240 0200302D */ daddu $a2, $s0, $zero -/* 8CAB44 80240244 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAB48 80240248 4600B587 */ neg.s $f22, $f22 -/* 8CAB4C 8024024C 4405A000 */ mfc1 $a1, $f20 -/* 8CAB50 80240250 4406B000 */ mfc1 $a2, $f22 -/* 8CAB54 80240254 0C019E40 */ jal guTranslateF -/* 8CAB58 80240258 00A0382D */ daddu $a3, $a1, $zero -/* 8CAB5C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CAB60 80240260 0200282D */ daddu $a1, $s0, $zero -/* 8CAB64 80240264 0C019D80 */ jal guMtxCatF -/* 8CAB68 80240268 00A0302D */ daddu $a2, $a1, $zero -.L8024026C: -/* 8CAB6C 8024026C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8CAB70 80240270 8FB20058 */ lw $s2, 0x58($sp) -/* 8CAB74 80240274 8FB10054 */ lw $s1, 0x54($sp) -/* 8CAB78 80240278 8FB00050 */ lw $s0, 0x50($sp) -/* 8CAB7C 8024027C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8CAB80 80240280 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8CAB84 80240284 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8CAB88 80240288 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8CAB8C 8024028C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8CAB90 80240290 24020002 */ addiu $v0, $zero, 2 -/* 8CAB94 80240294 03E00008 */ jr $ra -/* 8CAB98 80240298 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802400D0_8CA9D0.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802400D0_8CA9D0.s new file mode 100644 index 0000000000..5bf6a47c19 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802400D0_8CA9D0.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400D0_8CA9D0 +/* 8CA9D0 802400D0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8CA9D4 802400D4 AFB10054 */ sw $s1, 0x54($sp) +/* 8CA9D8 802400D8 0080882D */ daddu $s1, $a0, $zero +/* 8CA9DC 802400DC AFBF005C */ sw $ra, 0x5c($sp) +/* 8CA9E0 802400E0 AFB20058 */ sw $s2, 0x58($sp) +/* 8CA9E4 802400E4 AFB00050 */ sw $s0, 0x50($sp) +/* 8CA9E8 802400E8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8CA9EC 802400EC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8CA9F0 802400F0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8CA9F4 802400F4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8CA9F8 802400F8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8CA9FC 802400FC 8E30000C */ lw $s0, 0xc($s1) +/* 8CAA00 80240100 8E050000 */ lw $a1, ($s0) +/* 8CAA04 80240104 0C0B1EAF */ jal get_variable +/* 8CAA08 80240108 26100004 */ addiu $s0, $s0, 4 +/* 8CAA0C 8024010C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8CAA10 80240110 0040202D */ daddu $a0, $v0, $zero +/* 8CAA14 80240114 8E050000 */ lw $a1, ($s0) +/* 8CAA18 80240118 26100004 */ addiu $s0, $s0, 4 +/* 8CAA1C 8024011C 0220202D */ daddu $a0, $s1, $zero +/* 8CAA20 80240120 0C0B210B */ jal get_float_variable +/* 8CAA24 80240124 0040902D */ daddu $s2, $v0, $zero +/* 8CAA28 80240128 8E050000 */ lw $a1, ($s0) +/* 8CAA2C 8024012C 26100004 */ addiu $s0, $s0, 4 +/* 8CAA30 80240130 0220202D */ daddu $a0, $s1, $zero +/* 8CAA34 80240134 0C0B210B */ jal get_float_variable +/* 8CAA38 80240138 46000706 */ mov.s $f28, $f0 +/* 8CAA3C 8024013C 8E050000 */ lw $a1, ($s0) +/* 8CAA40 80240140 26100004 */ addiu $s0, $s0, 4 +/* 8CAA44 80240144 0220202D */ daddu $a0, $s1, $zero +/* 8CAA48 80240148 0C0B210B */ jal get_float_variable +/* 8CAA4C 8024014C 46000686 */ mov.s $f26, $f0 +/* 8CAA50 80240150 0220202D */ daddu $a0, $s1, $zero +/* 8CAA54 80240154 8E050000 */ lw $a1, ($s0) +/* 8CAA58 80240158 0C0B210B */ jal get_float_variable +/* 8CAA5C 8024015C 46000586 */ mov.s $f22, $f0 +/* 8CAA60 80240160 0240202D */ daddu $a0, $s2, $zero +/* 8CAA64 80240164 0C046B4C */ jal get_model_from_list_index +/* 8CAA68 80240168 46000606 */ mov.s $f24, $f0 +/* 8CAA6C 8024016C 0040882D */ daddu $s1, $v0, $zero +/* 8CAA70 80240170 96220000 */ lhu $v0, ($s1) +/* 8CAA74 80240174 30420400 */ andi $v0, $v0, 0x400 +/* 8CAA78 80240178 1440001E */ bnez $v0, .L802401F4 +/* 8CAA7C 8024017C 26300058 */ addiu $s0, $s1, 0x58 +/* 8CAA80 80240180 4480A000 */ mtc1 $zero, $f20 +/* 8CAA84 80240184 4406B000 */ mfc1 $a2, $f22 +/* 8CAA88 80240188 4405A000 */ mfc1 $a1, $f20 +/* 8CAA8C 8024018C 4407A000 */ mfc1 $a3, $f20 +/* 8CAA90 80240190 0C019E40 */ jal guTranslateF +/* 8CAA94 80240194 0200202D */ daddu $a0, $s0, $zero +/* 8CAA98 80240198 4405E000 */ mfc1 $a1, $f28 +/* 8CAA9C 8024019C 4406D000 */ mfc1 $a2, $f26 +/* 8CAAA0 802401A0 4407C000 */ mfc1 $a3, $f24 +/* 8CAAA4 802401A4 0C090018 */ jal func_80240060_8CA960 +/* 8CAAA8 802401A8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAAAC 802401AC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAAB0 802401B0 0200282D */ daddu $a1, $s0, $zero +/* 8CAAB4 802401B4 0C019D80 */ jal guMtxCatF +/* 8CAAB8 802401B8 0200302D */ daddu $a2, $s0, $zero +/* 8CAABC 802401BC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAAC0 802401C0 4600B587 */ neg.s $f22, $f22 +/* 8CAAC4 802401C4 4405A000 */ mfc1 $a1, $f20 +/* 8CAAC8 802401C8 4406B000 */ mfc1 $a2, $f22 +/* 8CAACC 802401CC 0C019E40 */ jal guTranslateF +/* 8CAAD0 802401D0 00A0382D */ daddu $a3, $a1, $zero +/* 8CAAD4 802401D4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAAD8 802401D8 0200282D */ daddu $a1, $s0, $zero +/* 8CAADC 802401DC 0C019D80 */ jal guMtxCatF +/* 8CAAE0 802401E0 00A0302D */ daddu $a2, $a1, $zero +/* 8CAAE4 802401E4 96220000 */ lhu $v0, ($s1) +/* 8CAAE8 802401E8 34421400 */ ori $v0, $v0, 0x1400 +/* 8CAAEC 802401EC 0809009B */ j .L8024026C +/* 8CAAF0 802401F0 A6220000 */ sh $v0, ($s1) +.L802401F4: +/* 8CAAF4 802401F4 4480A000 */ mtc1 $zero, $f20 +/* 8CAAF8 802401F8 4406B000 */ mfc1 $a2, $f22 +/* 8CAAFC 802401FC 4405A000 */ mfc1 $a1, $f20 +/* 8CAB00 80240200 4407A000 */ mfc1 $a3, $f20 +/* 8CAB04 80240204 0C019E40 */ jal guTranslateF +/* 8CAB08 80240208 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAB0C 8024020C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAB10 80240210 26300058 */ addiu $s0, $s1, 0x58 +/* 8CAB14 80240214 0200282D */ daddu $a1, $s0, $zero +/* 8CAB18 80240218 0C019D80 */ jal guMtxCatF +/* 8CAB1C 8024021C 0200302D */ daddu $a2, $s0, $zero +/* 8CAB20 80240220 4405E000 */ mfc1 $a1, $f28 +/* 8CAB24 80240224 4406D000 */ mfc1 $a2, $f26 +/* 8CAB28 80240228 4407C000 */ mfc1 $a3, $f24 +/* 8CAB2C 8024022C 0C090018 */ jal func_80240060_8CA960 +/* 8CAB30 80240230 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAB34 80240234 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAB38 80240238 0200282D */ daddu $a1, $s0, $zero +/* 8CAB3C 8024023C 0C019D80 */ jal guMtxCatF +/* 8CAB40 80240240 0200302D */ daddu $a2, $s0, $zero +/* 8CAB44 80240244 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAB48 80240248 4600B587 */ neg.s $f22, $f22 +/* 8CAB4C 8024024C 4405A000 */ mfc1 $a1, $f20 +/* 8CAB50 80240250 4406B000 */ mfc1 $a2, $f22 +/* 8CAB54 80240254 0C019E40 */ jal guTranslateF +/* 8CAB58 80240258 00A0382D */ daddu $a3, $a1, $zero +/* 8CAB5C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CAB60 80240260 0200282D */ daddu $a1, $s0, $zero +/* 8CAB64 80240264 0C019D80 */ jal guMtxCatF +/* 8CAB68 80240268 00A0302D */ daddu $a2, $a1, $zero +.L8024026C: +/* 8CAB6C 8024026C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8CAB70 80240270 8FB20058 */ lw $s2, 0x58($sp) +/* 8CAB74 80240274 8FB10054 */ lw $s1, 0x54($sp) +/* 8CAB78 80240278 8FB00050 */ lw $s0, 0x50($sp) +/* 8CAB7C 8024027C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8CAB80 80240280 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8CAB84 80240284 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8CAB88 80240288 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8CAB8C 8024028C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8CAB90 80240290 24020002 */ addiu $v0, $zero, 2 +/* 8CAB94 80240294 03E00008 */ jr $ra +/* 8CAB98 80240298 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C.s deleted file mode 100644 index 81c8f50ae4..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024029C -/* 8CAB9C 8024029C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CABA0 802402A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8CABA4 802402A4 0C00EABB */ jal get_npc_unsafe -/* 8CABA8 802402A8 2404FFFC */ addiu $a0, $zero, -4 -/* 8CABAC 802402AC 8C420000 */ lw $v0, ($v0) -/* 8CABB0 802402B0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8CABB4 802402B4 30421000 */ andi $v0, $v0, 0x1000 -/* 8CABB8 802402B8 0002102B */ sltu $v0, $zero, $v0 -/* 8CABBC 802402BC 00021040 */ sll $v0, $v0, 1 -/* 8CABC0 802402C0 03E00008 */ jr $ra -/* 8CABC4 802402C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s new file mode 100644 index 0000000000..c594351fac --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024029C_8CAB9C +/* 8CAB9C 8024029C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8CABA0 802402A0 AFBF0010 */ sw $ra, 0x10($sp) +/* 8CABA4 802402A4 0C00EABB */ jal get_npc_unsafe +/* 8CABA8 802402A8 2404FFFC */ addiu $a0, $zero, -4 +/* 8CABAC 802402AC 8C420000 */ lw $v0, ($v0) +/* 8CABB0 802402B0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8CABB4 802402B4 30421000 */ andi $v0, $v0, 0x1000 +/* 8CABB8 802402B8 0002102B */ sltu $v0, $zero, $v0 +/* 8CABBC 802402BC 00021040 */ sll $v0, $v0, 1 +/* 8CABC0 802402C0 03E00008 */ jr $ra +/* 8CABC4 802402C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8.s deleted file mode 100644 index f2b8797233..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C8 -/* 8CABC8 802402C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8CABCC 802402CC AFB00010 */ sw $s0, 0x10($sp) -/* 8CABD0 802402D0 3C108024 */ lui $s0, 0x8024 -/* 8CABD4 802402D4 261029F4 */ addiu $s0, $s0, 0x29f4 -/* 8CABD8 802402D8 AFBF0018 */ sw $ra, 0x18($sp) -/* 8CABDC 802402DC AFB10014 */ sw $s1, 0x14($sp) -/* 8CABE0 802402E0 8E020000 */ lw $v0, ($s0) -/* 8CABE4 802402E4 14400010 */ bnez $v0, .L80240328 -/* 8CABE8 802402E8 0080882D */ daddu $s1, $a0, $zero -/* 8CABEC 802402EC 0C00AB39 */ jal heap_malloc -/* 8CABF0 802402F0 24040040 */ addiu $a0, $zero, 0x40 -/* 8CABF4 802402F4 AE020000 */ sw $v0, ($s0) -/* 8CABF8 802402F8 0000182D */ daddu $v1, $zero, $zero -/* 8CABFC 802402FC 0040282D */ daddu $a1, $v0, $zero -/* 8CAC00 80240300 0220202D */ daddu $a0, $s1, $zero -.L80240304: -/* 8CAC04 80240304 8C820084 */ lw $v0, 0x84($a0) -/* 8CAC08 80240308 24840004 */ addiu $a0, $a0, 4 -/* 8CAC0C 8024030C 24630001 */ addiu $v1, $v1, 1 -/* 8CAC10 80240310 ACA20000 */ sw $v0, ($a1) -/* 8CAC14 80240314 28620010 */ slti $v0, $v1, 0x10 -/* 8CAC18 80240318 1440FFFA */ bnez $v0, .L80240304 -/* 8CAC1C 8024031C 24A50004 */ addiu $a1, $a1, 4 -/* 8CAC20 80240320 080900D9 */ j .L80240364 -/* 8CAC24 80240324 00000000 */ nop -.L80240328: -/* 8CAC28 80240328 0000182D */ daddu $v1, $zero, $zero -/* 8CAC2C 8024032C 0040282D */ daddu $a1, $v0, $zero -/* 8CAC30 80240330 0220202D */ daddu $a0, $s1, $zero -.L80240334: -/* 8CAC34 80240334 8CA20000 */ lw $v0, ($a1) -/* 8CAC38 80240338 24A50004 */ addiu $a1, $a1, 4 -/* 8CAC3C 8024033C 24630001 */ addiu $v1, $v1, 1 -/* 8CAC40 80240340 AC820084 */ sw $v0, 0x84($a0) -/* 8CAC44 80240344 28620010 */ slti $v0, $v1, 0x10 -/* 8CAC48 80240348 1440FFFA */ bnez $v0, .L80240334 -/* 8CAC4C 8024034C 24840004 */ addiu $a0, $a0, 4 -/* 8CAC50 80240350 3C108024 */ lui $s0, 0x8024 -/* 8CAC54 80240354 261029F4 */ addiu $s0, $s0, 0x29f4 -/* 8CAC58 80240358 0C00AB4B */ jal heap_free -/* 8CAC5C 8024035C 8E040000 */ lw $a0, ($s0) -/* 8CAC60 80240360 AE000000 */ sw $zero, ($s0) -.L80240364: -/* 8CAC64 80240364 8FBF0018 */ lw $ra, 0x18($sp) -/* 8CAC68 80240368 8FB10014 */ lw $s1, 0x14($sp) -/* 8CAC6C 8024036C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CAC70 80240370 24020002 */ addiu $v0, $zero, 2 -/* 8CAC74 80240374 03E00008 */ jr $ra -/* 8CAC78 80240378 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s new file mode 100644 index 0000000000..86b25a34dc --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_802402C8_8CABC8.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402C8_8CABC8 +/* 8CABC8 802402C8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8CABCC 802402CC AFB00010 */ sw $s0, 0x10($sp) +/* 8CABD0 802402D0 3C108024 */ lui $s0, 0x8024 +/* 8CABD4 802402D4 261029F4 */ addiu $s0, $s0, 0x29f4 +/* 8CABD8 802402D8 AFBF0018 */ sw $ra, 0x18($sp) +/* 8CABDC 802402DC AFB10014 */ sw $s1, 0x14($sp) +/* 8CABE0 802402E0 8E020000 */ lw $v0, ($s0) +/* 8CABE4 802402E4 14400010 */ bnez $v0, .L80240328 +/* 8CABE8 802402E8 0080882D */ daddu $s1, $a0, $zero +/* 8CABEC 802402EC 0C00AB39 */ jal heap_malloc +/* 8CABF0 802402F0 24040040 */ addiu $a0, $zero, 0x40 +/* 8CABF4 802402F4 AE020000 */ sw $v0, ($s0) +/* 8CABF8 802402F8 0000182D */ daddu $v1, $zero, $zero +/* 8CABFC 802402FC 0040282D */ daddu $a1, $v0, $zero +/* 8CAC00 80240300 0220202D */ daddu $a0, $s1, $zero +.L80240304: +/* 8CAC04 80240304 8C820084 */ lw $v0, 0x84($a0) +/* 8CAC08 80240308 24840004 */ addiu $a0, $a0, 4 +/* 8CAC0C 8024030C 24630001 */ addiu $v1, $v1, 1 +/* 8CAC10 80240310 ACA20000 */ sw $v0, ($a1) +/* 8CAC14 80240314 28620010 */ slti $v0, $v1, 0x10 +/* 8CAC18 80240318 1440FFFA */ bnez $v0, .L80240304 +/* 8CAC1C 8024031C 24A50004 */ addiu $a1, $a1, 4 +/* 8CAC20 80240320 080900D9 */ j .L80240364 +/* 8CAC24 80240324 00000000 */ nop +.L80240328: +/* 8CAC28 80240328 0000182D */ daddu $v1, $zero, $zero +/* 8CAC2C 8024032C 0040282D */ daddu $a1, $v0, $zero +/* 8CAC30 80240330 0220202D */ daddu $a0, $s1, $zero +.L80240334: +/* 8CAC34 80240334 8CA20000 */ lw $v0, ($a1) +/* 8CAC38 80240338 24A50004 */ addiu $a1, $a1, 4 +/* 8CAC3C 8024033C 24630001 */ addiu $v1, $v1, 1 +/* 8CAC40 80240340 AC820084 */ sw $v0, 0x84($a0) +/* 8CAC44 80240344 28620010 */ slti $v0, $v1, 0x10 +/* 8CAC48 80240348 1440FFFA */ bnez $v0, .L80240334 +/* 8CAC4C 8024034C 24840004 */ addiu $a0, $a0, 4 +/* 8CAC50 80240350 3C108024 */ lui $s0, 0x8024 +/* 8CAC54 80240354 261029F4 */ addiu $s0, $s0, 0x29f4 +/* 8CAC58 80240358 0C00AB4B */ jal heap_free +/* 8CAC5C 8024035C 8E040000 */ lw $a0, ($s0) +/* 8CAC60 80240360 AE000000 */ sw $zero, ($s0) +.L80240364: +/* 8CAC64 80240364 8FBF0018 */ lw $ra, 0x18($sp) +/* 8CAC68 80240368 8FB10014 */ lw $s1, 0x14($sp) +/* 8CAC6C 8024036C 8FB00010 */ lw $s0, 0x10($sp) +/* 8CAC70 80240370 24020002 */ addiu $v0, $zero, 2 +/* 8CAC74 80240374 03E00008 */ jr $ra +/* 8CAC78 80240378 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434.s deleted file mode 100644 index 2383aec6d5..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434 -/* 8CAD34 80240434 3C018011 */ lui $at, 0x8011 -/* 8CAD38 80240438 A020F291 */ sb $zero, -0xd6f($at) -/* 8CAD3C 8024043C 03E00008 */ jr $ra -/* 8CAD40 80240440 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s new file mode 100644 index 0000000000..8096c27b8f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240434_8CAD34 +/* 8CAD34 80240434 3C018011 */ lui $at, 0x8011 +/* 8CAD38 80240438 A020F291 */ sb $zero, -0xd6f($at) +/* 8CAD3C 8024043C 03E00008 */ jr $ra +/* 8CAD40 80240440 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8.s deleted file mode 100644 index 686c38265f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D8 -/* 8CE848 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8CE84C 802407DC AFB3001C */ sw $s3, 0x1c($sp) -/* 8CE850 802407E0 0080982D */ daddu $s3, $a0, $zero -/* 8CE854 802407E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8CE858 802407E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8CE85C 802407EC AFB10014 */ sw $s1, 0x14($sp) -/* 8CE860 802407F0 AFB00010 */ sw $s0, 0x10($sp) -/* 8CE864 802407F4 8E720148 */ lw $s2, 0x148($s3) -/* 8CE868 802407F8 86440008 */ lh $a0, 8($s2) -/* 8CE86C 802407FC 0C00EABB */ jal get_npc_unsafe -/* 8CE870 80240800 00A0882D */ daddu $s1, $a1, $zero -/* 8CE874 80240804 8E240008 */ lw $a0, 8($s1) -/* 8CE878 80240808 0040802D */ daddu $s0, $v0, $zero -/* 8CE87C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f -/* 8CE880 80240810 00832021 */ addu $a0, $a0, $v1 -/* 8CE884 80240814 00042043 */ sra $a0, $a0, 1 -/* 8CE888 80240818 0C00A67F */ jal rand_int -/* 8CE88C 8024081C 24840001 */ addiu $a0, $a0, 1 -/* 8CE890 80240820 8E230008 */ lw $v1, 8($s1) -/* 8CE894 80240824 240400B4 */ addiu $a0, $zero, 0xb4 -/* 8CE898 80240828 00032FC2 */ srl $a1, $v1, 0x1f -/* 8CE89C 8024082C 00651821 */ addu $v1, $v1, $a1 -/* 8CE8A0 80240830 00031843 */ sra $v1, $v1, 1 -/* 8CE8A4 80240834 00621821 */ addu $v1, $v1, $v0 -/* 8CE8A8 80240838 0C00A67F */ jal rand_int -/* 8CE8AC 8024083C A603008E */ sh $v1, 0x8e($s0) -/* 8CE8B0 80240840 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8CE8B4 80240844 44820000 */ mtc1 $v0, $f0 -/* 8CE8B8 80240848 00000000 */ nop -/* 8CE8BC 8024084C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE8C0 80240850 46006300 */ add.s $f12, $f12, $f0 -/* 8CE8C4 80240854 3C0142B4 */ lui $at, 0x42b4 -/* 8CE8C8 80240858 44810000 */ mtc1 $at, $f0 -/* 8CE8CC 8024085C 0C00A6C9 */ jal clamp_angle -/* 8CE8D0 80240860 46006301 */ sub.s $f12, $f12, $f0 -/* 8CE8D4 80240864 E600000C */ swc1 $f0, 0xc($s0) -/* 8CE8D8 80240868 8E4200CC */ lw $v0, 0xcc($s2) -/* 8CE8DC 8024086C 8C420000 */ lw $v0, ($v0) -/* 8CE8E0 80240870 AE020028 */ sw $v0, 0x28($s0) -/* 8CE8E4 80240874 24020003 */ addiu $v0, $zero, 3 -/* 8CE8E8 80240878 AE620070 */ sw $v0, 0x70($s3) -/* 8CE8EC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8CE8F0 80240880 8FB3001C */ lw $s3, 0x1c($sp) -/* 8CE8F4 80240884 8FB20018 */ lw $s2, 0x18($sp) -/* 8CE8F8 80240888 8FB10014 */ lw $s1, 0x14($sp) -/* 8CE8FC 8024088C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CE900 80240890 03E00008 */ jr $ra -/* 8CE904 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s new file mode 100644 index 0000000000..ad2e909059 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802407D8_8CE848.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407D8_8CE848 +/* 8CE848 802407D8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8CE84C 802407DC AFB3001C */ sw $s3, 0x1c($sp) +/* 8CE850 802407E0 0080982D */ daddu $s3, $a0, $zero +/* 8CE854 802407E4 AFBF0020 */ sw $ra, 0x20($sp) +/* 8CE858 802407E8 AFB20018 */ sw $s2, 0x18($sp) +/* 8CE85C 802407EC AFB10014 */ sw $s1, 0x14($sp) +/* 8CE860 802407F0 AFB00010 */ sw $s0, 0x10($sp) +/* 8CE864 802407F4 8E720148 */ lw $s2, 0x148($s3) +/* 8CE868 802407F8 86440008 */ lh $a0, 8($s2) +/* 8CE86C 802407FC 0C00EABB */ jal get_npc_unsafe +/* 8CE870 80240800 00A0882D */ daddu $s1, $a1, $zero +/* 8CE874 80240804 8E240008 */ lw $a0, 8($s1) +/* 8CE878 80240808 0040802D */ daddu $s0, $v0, $zero +/* 8CE87C 8024080C 00041FC2 */ srl $v1, $a0, 0x1f +/* 8CE880 80240810 00832021 */ addu $a0, $a0, $v1 +/* 8CE884 80240814 00042043 */ sra $a0, $a0, 1 +/* 8CE888 80240818 0C00A67F */ jal rand_int +/* 8CE88C 8024081C 24840001 */ addiu $a0, $a0, 1 +/* 8CE890 80240820 8E230008 */ lw $v1, 8($s1) +/* 8CE894 80240824 240400B4 */ addiu $a0, $zero, 0xb4 +/* 8CE898 80240828 00032FC2 */ srl $a1, $v1, 0x1f +/* 8CE89C 8024082C 00651821 */ addu $v1, $v1, $a1 +/* 8CE8A0 80240830 00031843 */ sra $v1, $v1, 1 +/* 8CE8A4 80240834 00621821 */ addu $v1, $v1, $v0 +/* 8CE8A8 80240838 0C00A67F */ jal rand_int +/* 8CE8AC 8024083C A603008E */ sh $v1, 0x8e($s0) +/* 8CE8B0 80240840 C60C000C */ lwc1 $f12, 0xc($s0) +/* 8CE8B4 80240844 44820000 */ mtc1 $v0, $f0 +/* 8CE8B8 80240848 00000000 */ nop +/* 8CE8BC 8024084C 46800020 */ cvt.s.w $f0, $f0 +/* 8CE8C0 80240850 46006300 */ add.s $f12, $f12, $f0 +/* 8CE8C4 80240854 3C0142B4 */ lui $at, 0x42b4 +/* 8CE8C8 80240858 44810000 */ mtc1 $at, $f0 +/* 8CE8CC 8024085C 0C00A6C9 */ jal clamp_angle +/* 8CE8D0 80240860 46006301 */ sub.s $f12, $f12, $f0 +/* 8CE8D4 80240864 E600000C */ swc1 $f0, 0xc($s0) +/* 8CE8D8 80240868 8E4200CC */ lw $v0, 0xcc($s2) +/* 8CE8DC 8024086C 8C420000 */ lw $v0, ($v0) +/* 8CE8E0 80240870 AE020028 */ sw $v0, 0x28($s0) +/* 8CE8E4 80240874 24020003 */ addiu $v0, $zero, 3 +/* 8CE8E8 80240878 AE620070 */ sw $v0, 0x70($s3) +/* 8CE8EC 8024087C 8FBF0020 */ lw $ra, 0x20($sp) +/* 8CE8F0 80240880 8FB3001C */ lw $s3, 0x1c($sp) +/* 8CE8F4 80240884 8FB20018 */ lw $s2, 0x18($sp) +/* 8CE8F8 80240888 8FB10014 */ lw $s1, 0x14($sp) +/* 8CE8FC 8024088C 8FB00010 */ lw $s0, 0x10($sp) +/* 8CE900 80240890 03E00008 */ jr $ra +/* 8CE904 80240894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898.s deleted file mode 100644 index f87b7eac8e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240898 -/* 8CE908 80240898 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 8CE90C 8024089C AFB3004C */ sw $s3, 0x4c($sp) -/* 8CE910 802408A0 0080982D */ daddu $s3, $a0, $zero -/* 8CE914 802408A4 AFBF0054 */ sw $ra, 0x54($sp) -/* 8CE918 802408A8 AFB40050 */ sw $s4, 0x50($sp) -/* 8CE91C 802408AC AFB20048 */ sw $s2, 0x48($sp) -/* 8CE920 802408B0 AFB10044 */ sw $s1, 0x44($sp) -/* 8CE924 802408B4 AFB00040 */ sw $s0, 0x40($sp) -/* 8CE928 802408B8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 8CE92C 802408BC F7B80068 */ sdc1 $f24, 0x68($sp) -/* 8CE930 802408C0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 8CE934 802408C4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 8CE938 802408C8 8E710148 */ lw $s1, 0x148($s3) -/* 8CE93C 802408CC 00A0902D */ daddu $s2, $a1, $zero -/* 8CE940 802408D0 86240008 */ lh $a0, 8($s1) -/* 8CE944 802408D4 0C00EABB */ jal get_npc_unsafe -/* 8CE948 802408D8 00C0A02D */ daddu $s4, $a2, $zero -/* 8CE94C 802408DC 0040802D */ daddu $s0, $v0, $zero -/* 8CE950 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8CE954 802408E4 46800020 */ cvt.s.w $f0, $f0 -/* 8CE958 802408E8 46000021 */ cvt.d.s $f0, $f0 -/* 8CE95C 802408EC 3C014059 */ lui $at, 0x4059 -/* 8CE960 802408F0 44811800 */ mtc1 $at, $f3 -/* 8CE964 802408F4 44801000 */ mtc1 $zero, $f2 -/* 8CE968 802408F8 8602008E */ lh $v0, 0x8e($s0) -/* 8CE96C 802408FC 9603008E */ lhu $v1, 0x8e($s0) -/* 8CE970 80240900 46220003 */ div.d $f0, $f0, $f2 -/* 8CE974 80240904 46200620 */ cvt.s.d $f24, $f0 -/* 8CE978 80240908 C6200088 */ lwc1 $f0, 0x88($s1) -/* 8CE97C 8024090C 46800020 */ cvt.s.w $f0, $f0 -/* 8CE980 80240910 46000021 */ cvt.d.s $f0, $f0 -/* 8CE984 80240914 46220003 */ div.d $f0, $f0, $f2 -/* 8CE988 80240918 46200020 */ cvt.s.d $f0, $f0 -/* 8CE98C 8024091C 18400003 */ blez $v0, .L8024092C -/* 8CE990 80240920 4600C680 */ add.s $f26, $f24, $f0 -/* 8CE994 80240924 2462FFFF */ addiu $v0, $v1, -1 -/* 8CE998 80240928 A602008E */ sh $v0, 0x8e($s0) -.L8024092C: -/* 8CE99C 8024092C 8E220070 */ lw $v0, 0x70($s1) -/* 8CE9A0 80240930 18400034 */ blez $v0, .L80240A04 -/* 8CE9A4 80240934 00000000 */ nop -/* 8CE9A8 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 8CE9AC 8024093C 46806320 */ cvt.s.w $f12, $f12 -/* 8CE9B0 80240940 44820000 */ mtc1 $v0, $f0 -/* 8CE9B4 80240944 00000000 */ nop -/* 8CE9B8 80240948 46800020 */ cvt.s.w $f0, $f0 -/* 8CE9BC 8024094C 46000021 */ cvt.d.s $f0, $f0 -/* 8CE9C0 80240950 46220003 */ div.d $f0, $f0, $f2 -/* 8CE9C4 80240954 0C00A8BB */ jal sin_deg -/* 8CE9C8 80240958 462005A0 */ cvt.s.d $f22, $f0 -/* 8CE9CC 8024095C 8E020000 */ lw $v0, ($s0) -/* 8CE9D0 80240960 30420008 */ andi $v0, $v0, 8 -/* 8CE9D4 80240964 10400003 */ beqz $v0, .L80240974 -/* 8CE9D8 80240968 46000506 */ mov.s $f20, $f0 -/* 8CE9DC 8024096C 0809026D */ j .L802409B4 -/* 8CE9E0 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* 8CE9E4 80240974 27A50028 */ addiu $a1, $sp, 0x28 -/* 8CE9E8 80240978 27A6002C */ addiu $a2, $sp, 0x2c -/* 8CE9EC 8024097C C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CE9F0 80240980 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CE9F4 80240984 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8CE9F8 80240988 3C01447A */ lui $at, 0x447a -/* 8CE9FC 8024098C 44813000 */ mtc1 $at, $f6 -/* 8CEA00 80240990 27A20034 */ addiu $v0, $sp, 0x34 -/* 8CEA04 80240994 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CEA08 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 8CEA0C 8024099C E7A40030 */ swc1 $f4, 0x30($sp) -/* 8CEA10 802409A0 E7A60034 */ swc1 $f6, 0x34($sp) -/* 8CEA14 802409A4 AFA20010 */ sw $v0, 0x10($sp) -/* 8CEA18 802409A8 8E040080 */ lw $a0, 0x80($s0) -/* 8CEA1C 802409AC 0C0372DF */ jal func_800DCB7C -/* 8CEA20 802409B0 27A70030 */ addiu $a3, $sp, 0x30 -.L802409B4: -/* 8CEA24 802409B4 10400007 */ beqz $v0, .L802409D4 -/* 8CEA28 802409B8 00000000 */ nop -/* 8CEA2C 802409BC 4616A082 */ mul.s $f2, $f20, $f22 -/* 8CEA30 802409C0 00000000 */ nop -/* 8CEA34 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8CEA38 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* 8CEA3C 802409CC 08090278 */ j .L802409E0 -/* 8CEA40 802409D0 46020000 */ add.s $f0, $f0, $f2 -.L802409D4: -/* 8CEA44 802409D4 4616A002 */ mul.s $f0, $f20, $f22 -/* 8CEA48 802409D8 00000000 */ nop -/* 8CEA4C 802409DC 4600D000 */ add.s $f0, $f26, $f0 -.L802409E0: -/* 8CEA50 802409E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 8CEA54 802409E4 8E220074 */ lw $v0, 0x74($s1) -/* 8CEA58 802409E8 2442000A */ addiu $v0, $v0, 0xa -/* 8CEA5C 802409EC 44826000 */ mtc1 $v0, $f12 -/* 8CEA60 802409F0 00000000 */ nop -/* 8CEA64 802409F4 0C00A6C9 */ jal clamp_angle -/* 8CEA68 802409F8 46806320 */ cvt.s.w $f12, $f12 -/* 8CEA6C 802409FC 4600020D */ trunc.w.s $f8, $f0 -/* 8CEA70 80240A00 E6280074 */ swc1 $f8, 0x74($s1) -.L80240A04: -/* 8CEA74 80240A04 8E220090 */ lw $v0, 0x90($s1) -/* 8CEA78 80240A08 1C400040 */ bgtz $v0, .L80240B0C -/* 8CEA7C 80240A0C 2442FFFF */ addiu $v0, $v0, -1 -/* 8CEA80 80240A10 860200A8 */ lh $v0, 0xa8($s0) -/* 8CEA84 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CEA88 80240A18 44821000 */ mtc1 $v0, $f2 -/* 8CEA8C 80240A1C 00000000 */ nop -/* 8CEA90 80240A20 468010A0 */ cvt.s.w $f2, $f2 -/* 8CEA94 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CEA98 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CEA9C 80240A2C 46020000 */ add.s $f0, $f0, $f2 -/* 8CEAA0 80240A30 3C014024 */ lui $at, 0x4024 -/* 8CEAA4 80240A34 44812800 */ mtc1 $at, $f5 -/* 8CEAA8 80240A38 44802000 */ mtc1 $zero, $f4 -/* 8CEAAC 80240A3C C442002C */ lwc1 $f2, 0x2c($v0) -/* 8CEAB0 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* 8CEAB4 80240A44 46240000 */ add.d $f0, $f0, $f4 -/* 8CEAB8 80240A48 460010A1 */ cvt.d.s $f2, $f2 -/* 8CEABC 80240A4C 4620103C */ c.lt.d $f2, $f0 -/* 8CEAC0 80240A50 00000000 */ nop -/* 8CEAC4 80240A54 4500002E */ bc1f .L80240B10 -/* 8CEAC8 80240A58 0280202D */ daddu $a0, $s4, $zero -/* 8CEACC 80240A5C 24020001 */ addiu $v0, $zero, 1 -/* 8CEAD0 80240A60 AFA20010 */ sw $v0, 0x10($sp) -/* 8CEAD4 80240A64 8E460024 */ lw $a2, 0x24($s2) -/* 8CEAD8 80240A68 8E470028 */ lw $a3, 0x28($s2) -/* 8CEADC 80240A6C 0C01242D */ jal func_800490B4 -/* 8CEAE0 80240A70 0220282D */ daddu $a1, $s1, $zero -/* 8CEAE4 80240A74 10400026 */ beqz $v0, .L80240B10 -/* 8CEAE8 80240A78 0000202D */ daddu $a0, $zero, $zero -/* 8CEAEC 80240A7C 0200282D */ daddu $a1, $s0, $zero -/* 8CEAF0 80240A80 0000302D */ daddu $a2, $zero, $zero -/* 8CEAF4 80240A84 2412000C */ addiu $s2, $zero, 0xc -/* 8CEAF8 80240A88 860300A8 */ lh $v1, 0xa8($s0) -/* 8CEAFC 80240A8C 3C013F80 */ lui $at, 0x3f80 -/* 8CEB00 80240A90 44810000 */ mtc1 $at, $f0 -/* 8CEB04 80240A94 3C014000 */ lui $at, 0x4000 -/* 8CEB08 80240A98 44811000 */ mtc1 $at, $f2 -/* 8CEB0C 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 -/* 8CEB10 80240AA0 44812000 */ mtc1 $at, $f4 -/* 8CEB14 80240AA4 44834000 */ mtc1 $v1, $f8 -/* 8CEB18 80240AA8 00000000 */ nop -/* 8CEB1C 80240AAC 46804220 */ cvt.s.w $f8, $f8 -/* 8CEB20 80240AB0 44074000 */ mfc1 $a3, $f8 -/* 8CEB24 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 -/* 8CEB28 80240AB8 AFB2001C */ sw $s2, 0x1c($sp) -/* 8CEB2C 80240ABC AFA20020 */ sw $v0, 0x20($sp) -/* 8CEB30 80240AC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8CEB34 80240AC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8CEB38 80240AC8 0C01BFA4 */ jal fx_emote -/* 8CEB3C 80240ACC E7A40018 */ swc1 $f4, 0x18($sp) -/* 8CEB40 80240AD0 0200202D */ daddu $a0, $s0, $zero -/* 8CEB44 80240AD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8CEB48 80240AD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 8CEB4C 80240ADC 3C060020 */ lui $a2, 0x20 -/* 8CEB50 80240AE0 0C012530 */ jal func_800494C0 -/* 8CEB54 80240AE4 E4800064 */ swc1 $f0, 0x64($a0) -/* 8CEB58 80240AE8 8E220018 */ lw $v0, 0x18($s1) -/* 8CEB5C 80240AEC 9442002A */ lhu $v0, 0x2a($v0) -/* 8CEB60 80240AF0 30420001 */ andi $v0, $v0, 1 -/* 8CEB64 80240AF4 10400003 */ beqz $v0, .L80240B04 -/* 8CEB68 80240AF8 2402000A */ addiu $v0, $zero, 0xa -/* 8CEB6C 80240AFC 080902EB */ j .L80240BAC -/* 8CEB70 80240B00 AE620070 */ sw $v0, 0x70($s3) -.L80240B04: -/* 8CEB74 80240B04 080902EB */ j .L80240BAC -/* 8CEB78 80240B08 AE720070 */ sw $s2, 0x70($s3) -.L80240B0C: -/* 8CEB7C 80240B0C AE220090 */ sw $v0, 0x90($s1) -.L80240B10: -/* 8CEB80 80240B10 8602008C */ lh $v0, 0x8c($s0) -/* 8CEB84 80240B14 14400025 */ bnez $v0, .L80240BAC -/* 8CEB88 80240B18 00000000 */ nop -/* 8CEB8C 80240B1C 8602008E */ lh $v0, 0x8e($s0) -/* 8CEB90 80240B20 1C400022 */ bgtz $v0, .L80240BAC -/* 8CEB94 80240B24 00000000 */ nop -/* 8CEB98 80240B28 8E620074 */ lw $v0, 0x74($s3) -/* 8CEB9C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 -/* 8CEBA0 80240B30 1840001D */ blez $v0, .L80240BA8 -/* 8CEBA4 80240B34 AE620074 */ sw $v0, 0x74($s3) -/* 8CEBA8 80240B38 8E220018 */ lw $v0, 0x18($s1) -/* 8CEBAC 80240B3C 9442002A */ lhu $v0, 0x2a($v0) -/* 8CEBB0 80240B40 30420010 */ andi $v0, $v0, 0x10 -/* 8CEBB4 80240B44 14400007 */ bnez $v0, .L80240B64 -/* 8CEBB8 80240B48 00000000 */ nop -/* 8CEBBC 80240B4C C600000C */ lwc1 $f0, 0xc($s0) -/* 8CEBC0 80240B50 3C014334 */ lui $at, 0x4334 -/* 8CEBC4 80240B54 44816000 */ mtc1 $at, $f12 -/* 8CEBC8 80240B58 0C00A6C9 */ jal clamp_angle -/* 8CEBCC 80240B5C 460C0300 */ add.s $f12, $f0, $f12 -/* 8CEBD0 80240B60 E600000C */ swc1 $f0, 0xc($s0) -.L80240B64: -/* 8CEBD4 80240B64 0C00A67F */ jal rand_int -/* 8CEBD8 80240B68 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8CEBDC 80240B6C 3C032E8B */ lui $v1, 0x2e8b -/* 8CEBE0 80240B70 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 8CEBE4 80240B74 00430018 */ mult $v0, $v1 -/* 8CEBE8 80240B78 00021FC3 */ sra $v1, $v0, 0x1f -/* 8CEBEC 80240B7C 00004010 */ mfhi $t0 -/* 8CEBF0 80240B80 00082043 */ sra $a0, $t0, 1 -/* 8CEBF4 80240B84 00832023 */ subu $a0, $a0, $v1 -/* 8CEBF8 80240B88 00041840 */ sll $v1, $a0, 1 -/* 8CEBFC 80240B8C 00641821 */ addu $v1, $v1, $a0 -/* 8CEC00 80240B90 00031880 */ sll $v1, $v1, 2 -/* 8CEC04 80240B94 00641823 */ subu $v1, $v1, $a0 -/* 8CEC08 80240B98 00431023 */ subu $v0, $v0, $v1 -/* 8CEC0C 80240B9C 24420005 */ addiu $v0, $v0, 5 -/* 8CEC10 80240BA0 080902EB */ j .L80240BAC -/* 8CEC14 80240BA4 A602008E */ sh $v0, 0x8e($s0) -.L80240BA8: -/* 8CEC18 80240BA8 AE600070 */ sw $zero, 0x70($s3) -.L80240BAC: -/* 8CEC1C 80240BAC 8FBF0054 */ lw $ra, 0x54($sp) -/* 8CEC20 80240BB0 8FB40050 */ lw $s4, 0x50($sp) -/* 8CEC24 80240BB4 8FB3004C */ lw $s3, 0x4c($sp) -/* 8CEC28 80240BB8 8FB20048 */ lw $s2, 0x48($sp) -/* 8CEC2C 80240BBC 8FB10044 */ lw $s1, 0x44($sp) -/* 8CEC30 80240BC0 8FB00040 */ lw $s0, 0x40($sp) -/* 8CEC34 80240BC4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 8CEC38 80240BC8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 8CEC3C 80240BCC D7B60060 */ ldc1 $f22, 0x60($sp) -/* 8CEC40 80240BD0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 8CEC44 80240BD4 03E00008 */ jr $ra -/* 8CEC48 80240BD8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s new file mode 100644 index 0000000000..f3dad3d451 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240898_8CE908.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240898_8CE908 +/* 8CE908 80240898 27BDFF88 */ addiu $sp, $sp, -0x78 +/* 8CE90C 8024089C AFB3004C */ sw $s3, 0x4c($sp) +/* 8CE910 802408A0 0080982D */ daddu $s3, $a0, $zero +/* 8CE914 802408A4 AFBF0054 */ sw $ra, 0x54($sp) +/* 8CE918 802408A8 AFB40050 */ sw $s4, 0x50($sp) +/* 8CE91C 802408AC AFB20048 */ sw $s2, 0x48($sp) +/* 8CE920 802408B0 AFB10044 */ sw $s1, 0x44($sp) +/* 8CE924 802408B4 AFB00040 */ sw $s0, 0x40($sp) +/* 8CE928 802408B8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* 8CE92C 802408BC F7B80068 */ sdc1 $f24, 0x68($sp) +/* 8CE930 802408C0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* 8CE934 802408C4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* 8CE938 802408C8 8E710148 */ lw $s1, 0x148($s3) +/* 8CE93C 802408CC 00A0902D */ daddu $s2, $a1, $zero +/* 8CE940 802408D0 86240008 */ lh $a0, 8($s1) +/* 8CE944 802408D4 0C00EABB */ jal get_npc_unsafe +/* 8CE948 802408D8 00C0A02D */ daddu $s4, $a2, $zero +/* 8CE94C 802408DC 0040802D */ daddu $s0, $v0, $zero +/* 8CE950 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) +/* 8CE954 802408E4 46800020 */ cvt.s.w $f0, $f0 +/* 8CE958 802408E8 46000021 */ cvt.d.s $f0, $f0 +/* 8CE95C 802408EC 3C014059 */ lui $at, 0x4059 +/* 8CE960 802408F0 44811800 */ mtc1 $at, $f3 +/* 8CE964 802408F4 44801000 */ mtc1 $zero, $f2 +/* 8CE968 802408F8 8602008E */ lh $v0, 0x8e($s0) +/* 8CE96C 802408FC 9603008E */ lhu $v1, 0x8e($s0) +/* 8CE970 80240900 46220003 */ div.d $f0, $f0, $f2 +/* 8CE974 80240904 46200620 */ cvt.s.d $f24, $f0 +/* 8CE978 80240908 C6200088 */ lwc1 $f0, 0x88($s1) +/* 8CE97C 8024090C 46800020 */ cvt.s.w $f0, $f0 +/* 8CE980 80240910 46000021 */ cvt.d.s $f0, $f0 +/* 8CE984 80240914 46220003 */ div.d $f0, $f0, $f2 +/* 8CE988 80240918 46200020 */ cvt.s.d $f0, $f0 +/* 8CE98C 8024091C 18400003 */ blez $v0, .L8024092C +/* 8CE990 80240920 4600C680 */ add.s $f26, $f24, $f0 +/* 8CE994 80240924 2462FFFF */ addiu $v0, $v1, -1 +/* 8CE998 80240928 A602008E */ sh $v0, 0x8e($s0) +.L8024092C: +/* 8CE99C 8024092C 8E220070 */ lw $v0, 0x70($s1) +/* 8CE9A0 80240930 18400034 */ blez $v0, .L80240A04 +/* 8CE9A4 80240934 00000000 */ nop +/* 8CE9A8 80240938 C62C0074 */ lwc1 $f12, 0x74($s1) +/* 8CE9AC 8024093C 46806320 */ cvt.s.w $f12, $f12 +/* 8CE9B0 80240940 44820000 */ mtc1 $v0, $f0 +/* 8CE9B4 80240944 00000000 */ nop +/* 8CE9B8 80240948 46800020 */ cvt.s.w $f0, $f0 +/* 8CE9BC 8024094C 46000021 */ cvt.d.s $f0, $f0 +/* 8CE9C0 80240950 46220003 */ div.d $f0, $f0, $f2 +/* 8CE9C4 80240954 0C00A8BB */ jal sin_deg +/* 8CE9C8 80240958 462005A0 */ cvt.s.d $f22, $f0 +/* 8CE9CC 8024095C 8E020000 */ lw $v0, ($s0) +/* 8CE9D0 80240960 30420008 */ andi $v0, $v0, 8 +/* 8CE9D4 80240964 10400003 */ beqz $v0, .L80240974 +/* 8CE9D8 80240968 46000506 */ mov.s $f20, $f0 +/* 8CE9DC 8024096C 0809026D */ j .L802409B4 +/* 8CE9E0 80240970 0000102D */ daddu $v0, $zero, $zero +.L80240974: +/* 8CE9E4 80240974 27A50028 */ addiu $a1, $sp, 0x28 +/* 8CE9E8 80240978 27A6002C */ addiu $a2, $sp, 0x2c +/* 8CE9EC 8024097C C6000038 */ lwc1 $f0, 0x38($s0) +/* 8CE9F0 80240980 C602003C */ lwc1 $f2, 0x3c($s0) +/* 8CE9F4 80240984 C6040040 */ lwc1 $f4, 0x40($s0) +/* 8CE9F8 80240988 3C01447A */ lui $at, 0x447a +/* 8CE9FC 8024098C 44813000 */ mtc1 $at, $f6 +/* 8CEA00 80240990 27A20034 */ addiu $v0, $sp, 0x34 +/* 8CEA04 80240994 E7A00028 */ swc1 $f0, 0x28($sp) +/* 8CEA08 80240998 E7A2002C */ swc1 $f2, 0x2c($sp) +/* 8CEA0C 8024099C E7A40030 */ swc1 $f4, 0x30($sp) +/* 8CEA10 802409A0 E7A60034 */ swc1 $f6, 0x34($sp) +/* 8CEA14 802409A4 AFA20010 */ sw $v0, 0x10($sp) +/* 8CEA18 802409A8 8E040080 */ lw $a0, 0x80($s0) +/* 8CEA1C 802409AC 0C0372DF */ jal func_800DCB7C +/* 8CEA20 802409B0 27A70030 */ addiu $a3, $sp, 0x30 +.L802409B4: +/* 8CEA24 802409B4 10400007 */ beqz $v0, .L802409D4 +/* 8CEA28 802409B8 00000000 */ nop +/* 8CEA2C 802409BC 4616A082 */ mul.s $f2, $f20, $f22 +/* 8CEA30 802409C0 00000000 */ nop +/* 8CEA34 802409C4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* 8CEA38 802409C8 46180000 */ add.s $f0, $f0, $f24 +/* 8CEA3C 802409CC 08090278 */ j .L802409E0 +/* 8CEA40 802409D0 46020000 */ add.s $f0, $f0, $f2 +.L802409D4: +/* 8CEA44 802409D4 4616A002 */ mul.s $f0, $f20, $f22 +/* 8CEA48 802409D8 00000000 */ nop +/* 8CEA4C 802409DC 4600D000 */ add.s $f0, $f26, $f0 +.L802409E0: +/* 8CEA50 802409E0 E600003C */ swc1 $f0, 0x3c($s0) +/* 8CEA54 802409E4 8E220074 */ lw $v0, 0x74($s1) +/* 8CEA58 802409E8 2442000A */ addiu $v0, $v0, 0xa +/* 8CEA5C 802409EC 44826000 */ mtc1 $v0, $f12 +/* 8CEA60 802409F0 00000000 */ nop +/* 8CEA64 802409F4 0C00A6C9 */ jal clamp_angle +/* 8CEA68 802409F8 46806320 */ cvt.s.w $f12, $f12 +/* 8CEA6C 802409FC 4600020D */ trunc.w.s $f8, $f0 +/* 8CEA70 80240A00 E6280074 */ swc1 $f8, 0x74($s1) +.L80240A04: +/* 8CEA74 80240A04 8E220090 */ lw $v0, 0x90($s1) +/* 8CEA78 80240A08 1C400040 */ bgtz $v0, .L80240B0C +/* 8CEA7C 80240A0C 2442FFFF */ addiu $v0, $v0, -1 +/* 8CEA80 80240A10 860200A8 */ lh $v0, 0xa8($s0) +/* 8CEA84 80240A14 C600003C */ lwc1 $f0, 0x3c($s0) +/* 8CEA88 80240A18 44821000 */ mtc1 $v0, $f2 +/* 8CEA8C 80240A1C 00000000 */ nop +/* 8CEA90 80240A20 468010A0 */ cvt.s.w $f2, $f2 +/* 8CEA94 80240A24 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8CEA98 80240A28 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8CEA9C 80240A2C 46020000 */ add.s $f0, $f0, $f2 +/* 8CEAA0 80240A30 3C014024 */ lui $at, 0x4024 +/* 8CEAA4 80240A34 44812800 */ mtc1 $at, $f5 +/* 8CEAA8 80240A38 44802000 */ mtc1 $zero, $f4 +/* 8CEAAC 80240A3C C442002C */ lwc1 $f2, 0x2c($v0) +/* 8CEAB0 80240A40 46000021 */ cvt.d.s $f0, $f0 +/* 8CEAB4 80240A44 46240000 */ add.d $f0, $f0, $f4 +/* 8CEAB8 80240A48 460010A1 */ cvt.d.s $f2, $f2 +/* 8CEABC 80240A4C 4620103C */ c.lt.d $f2, $f0 +/* 8CEAC0 80240A50 00000000 */ nop +/* 8CEAC4 80240A54 4500002E */ bc1f .L80240B10 +/* 8CEAC8 80240A58 0280202D */ daddu $a0, $s4, $zero +/* 8CEACC 80240A5C 24020001 */ addiu $v0, $zero, 1 +/* 8CEAD0 80240A60 AFA20010 */ sw $v0, 0x10($sp) +/* 8CEAD4 80240A64 8E460024 */ lw $a2, 0x24($s2) +/* 8CEAD8 80240A68 8E470028 */ lw $a3, 0x28($s2) +/* 8CEADC 80240A6C 0C01242D */ jal func_800490B4 +/* 8CEAE0 80240A70 0220282D */ daddu $a1, $s1, $zero +/* 8CEAE4 80240A74 10400026 */ beqz $v0, .L80240B10 +/* 8CEAE8 80240A78 0000202D */ daddu $a0, $zero, $zero +/* 8CEAEC 80240A7C 0200282D */ daddu $a1, $s0, $zero +/* 8CEAF0 80240A80 0000302D */ daddu $a2, $zero, $zero +/* 8CEAF4 80240A84 2412000C */ addiu $s2, $zero, 0xc +/* 8CEAF8 80240A88 860300A8 */ lh $v1, 0xa8($s0) +/* 8CEAFC 80240A8C 3C013F80 */ lui $at, 0x3f80 +/* 8CEB00 80240A90 44810000 */ mtc1 $at, $f0 +/* 8CEB04 80240A94 3C014000 */ lui $at, 0x4000 +/* 8CEB08 80240A98 44811000 */ mtc1 $at, $f2 +/* 8CEB0C 80240A9C 3C01C1A0 */ lui $at, 0xc1a0 +/* 8CEB10 80240AA0 44812000 */ mtc1 $at, $f4 +/* 8CEB14 80240AA4 44834000 */ mtc1 $v1, $f8 +/* 8CEB18 80240AA8 00000000 */ nop +/* 8CEB1C 80240AAC 46804220 */ cvt.s.w $f8, $f8 +/* 8CEB20 80240AB0 44074000 */ mfc1 $a3, $f8 +/* 8CEB24 80240AB4 27A20038 */ addiu $v0, $sp, 0x38 +/* 8CEB28 80240AB8 AFB2001C */ sw $s2, 0x1c($sp) +/* 8CEB2C 80240ABC AFA20020 */ sw $v0, 0x20($sp) +/* 8CEB30 80240AC0 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8CEB34 80240AC4 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8CEB38 80240AC8 0C01BFA4 */ jal fx_emote +/* 8CEB3C 80240ACC E7A40018 */ swc1 $f4, 0x18($sp) +/* 8CEB40 80240AD0 0200202D */ daddu $a0, $s0, $zero +/* 8CEB44 80240AD4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 8CEB48 80240AD8 C480003C */ lwc1 $f0, 0x3c($a0) +/* 8CEB4C 80240ADC 3C060020 */ lui $a2, 0x20 +/* 8CEB50 80240AE0 0C012530 */ jal func_800494C0 +/* 8CEB54 80240AE4 E4800064 */ swc1 $f0, 0x64($a0) +/* 8CEB58 80240AE8 8E220018 */ lw $v0, 0x18($s1) +/* 8CEB5C 80240AEC 9442002A */ lhu $v0, 0x2a($v0) +/* 8CEB60 80240AF0 30420001 */ andi $v0, $v0, 1 +/* 8CEB64 80240AF4 10400003 */ beqz $v0, .L80240B04 +/* 8CEB68 80240AF8 2402000A */ addiu $v0, $zero, 0xa +/* 8CEB6C 80240AFC 080902EB */ j .L80240BAC +/* 8CEB70 80240B00 AE620070 */ sw $v0, 0x70($s3) +.L80240B04: +/* 8CEB74 80240B04 080902EB */ j .L80240BAC +/* 8CEB78 80240B08 AE720070 */ sw $s2, 0x70($s3) +.L80240B0C: +/* 8CEB7C 80240B0C AE220090 */ sw $v0, 0x90($s1) +.L80240B10: +/* 8CEB80 80240B10 8602008C */ lh $v0, 0x8c($s0) +/* 8CEB84 80240B14 14400025 */ bnez $v0, .L80240BAC +/* 8CEB88 80240B18 00000000 */ nop +/* 8CEB8C 80240B1C 8602008E */ lh $v0, 0x8e($s0) +/* 8CEB90 80240B20 1C400022 */ bgtz $v0, .L80240BAC +/* 8CEB94 80240B24 00000000 */ nop +/* 8CEB98 80240B28 8E620074 */ lw $v0, 0x74($s3) +/* 8CEB9C 80240B2C 2442FFFF */ addiu $v0, $v0, -1 +/* 8CEBA0 80240B30 1840001D */ blez $v0, .L80240BA8 +/* 8CEBA4 80240B34 AE620074 */ sw $v0, 0x74($s3) +/* 8CEBA8 80240B38 8E220018 */ lw $v0, 0x18($s1) +/* 8CEBAC 80240B3C 9442002A */ lhu $v0, 0x2a($v0) +/* 8CEBB0 80240B40 30420010 */ andi $v0, $v0, 0x10 +/* 8CEBB4 80240B44 14400007 */ bnez $v0, .L80240B64 +/* 8CEBB8 80240B48 00000000 */ nop +/* 8CEBBC 80240B4C C600000C */ lwc1 $f0, 0xc($s0) +/* 8CEBC0 80240B50 3C014334 */ lui $at, 0x4334 +/* 8CEBC4 80240B54 44816000 */ mtc1 $at, $f12 +/* 8CEBC8 80240B58 0C00A6C9 */ jal clamp_angle +/* 8CEBCC 80240B5C 460C0300 */ add.s $f12, $f0, $f12 +/* 8CEBD0 80240B60 E600000C */ swc1 $f0, 0xc($s0) +.L80240B64: +/* 8CEBD4 80240B64 0C00A67F */ jal rand_int +/* 8CEBD8 80240B68 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 8CEBDC 80240B6C 3C032E8B */ lui $v1, 0x2e8b +/* 8CEBE0 80240B70 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* 8CEBE4 80240B74 00430018 */ mult $v0, $v1 +/* 8CEBE8 80240B78 00021FC3 */ sra $v1, $v0, 0x1f +/* 8CEBEC 80240B7C 00004010 */ mfhi $t0 +/* 8CEBF0 80240B80 00082043 */ sra $a0, $t0, 1 +/* 8CEBF4 80240B84 00832023 */ subu $a0, $a0, $v1 +/* 8CEBF8 80240B88 00041840 */ sll $v1, $a0, 1 +/* 8CEBFC 80240B8C 00641821 */ addu $v1, $v1, $a0 +/* 8CEC00 80240B90 00031880 */ sll $v1, $v1, 2 +/* 8CEC04 80240B94 00641823 */ subu $v1, $v1, $a0 +/* 8CEC08 80240B98 00431023 */ subu $v0, $v0, $v1 +/* 8CEC0C 80240B9C 24420005 */ addiu $v0, $v0, 5 +/* 8CEC10 80240BA0 080902EB */ j .L80240BAC +/* 8CEC14 80240BA4 A602008E */ sh $v0, 0x8e($s0) +.L80240BA8: +/* 8CEC18 80240BA8 AE600070 */ sw $zero, 0x70($s3) +.L80240BAC: +/* 8CEC1C 80240BAC 8FBF0054 */ lw $ra, 0x54($sp) +/* 8CEC20 80240BB0 8FB40050 */ lw $s4, 0x50($sp) +/* 8CEC24 80240BB4 8FB3004C */ lw $s3, 0x4c($sp) +/* 8CEC28 80240BB8 8FB20048 */ lw $s2, 0x48($sp) +/* 8CEC2C 80240BBC 8FB10044 */ lw $s1, 0x44($sp) +/* 8CEC30 80240BC0 8FB00040 */ lw $s0, 0x40($sp) +/* 8CEC34 80240BC4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* 8CEC38 80240BC8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* 8CEC3C 80240BCC D7B60060 */ ldc1 $f22, 0x60($sp) +/* 8CEC40 80240BD0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* 8CEC44 80240BD4 03E00008 */ jr $ra +/* 8CEC48 80240BD8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC.s deleted file mode 100644 index 4c9e1d9e25..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BDC -/* 8CEC4C 80240BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8CEC50 80240BE0 AFB20018 */ sw $s2, 0x18($sp) -/* 8CEC54 80240BE4 0080902D */ daddu $s2, $a0, $zero -/* 8CEC58 80240BE8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8CEC5C 80240BEC AFB10014 */ sw $s1, 0x14($sp) -/* 8CEC60 80240BF0 AFB00010 */ sw $s0, 0x10($sp) -/* 8CEC64 80240BF4 8E510148 */ lw $s1, 0x148($s2) -/* 8CEC68 80240BF8 0C00EABB */ jal get_npc_unsafe -/* 8CEC6C 80240BFC 86240008 */ lh $a0, 8($s1) -/* 8CEC70 80240C00 0040802D */ daddu $s0, $v0, $zero -/* 8CEC74 80240C04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CEC78 80240C08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CEC7C 80240C0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8CEC80 80240C10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8CEC84 80240C14 A600008E */ sh $zero, 0x8e($s0) -/* 8CEC88 80240C18 8C460028 */ lw $a2, 0x28($v0) -/* 8CEC8C 80240C1C 0C00A720 */ jal atan2 -/* 8CEC90 80240C20 8C470030 */ lw $a3, 0x30($v0) -/* 8CEC94 80240C24 E600000C */ swc1 $f0, 0xc($s0) -/* 8CEC98 80240C28 8E2200CC */ lw $v0, 0xcc($s1) -/* 8CEC9C 80240C2C 8C420020 */ lw $v0, 0x20($v0) -/* 8CECA0 80240C30 AE020028 */ sw $v0, 0x28($s0) -/* 8CECA4 80240C34 2402000B */ addiu $v0, $zero, 0xb -/* 8CECA8 80240C38 AE420070 */ sw $v0, 0x70($s2) -/* 8CECAC 80240C3C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8CECB0 80240C40 8FB20018 */ lw $s2, 0x18($sp) -/* 8CECB4 80240C44 8FB10014 */ lw $s1, 0x14($sp) -/* 8CECB8 80240C48 8FB00010 */ lw $s0, 0x10($sp) -/* 8CECBC 80240C4C 03E00008 */ jr $ra -/* 8CECC0 80240C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC_8CEC4C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC_8CEC4C.s new file mode 100644 index 0000000000..d73fdd0d9e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240BDC_8CEC4C.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BDC_8CEC4C +/* 8CEC4C 80240BDC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8CEC50 80240BE0 AFB20018 */ sw $s2, 0x18($sp) +/* 8CEC54 80240BE4 0080902D */ daddu $s2, $a0, $zero +/* 8CEC58 80240BE8 AFBF001C */ sw $ra, 0x1c($sp) +/* 8CEC5C 80240BEC AFB10014 */ sw $s1, 0x14($sp) +/* 8CEC60 80240BF0 AFB00010 */ sw $s0, 0x10($sp) +/* 8CEC64 80240BF4 8E510148 */ lw $s1, 0x148($s2) +/* 8CEC68 80240BF8 0C00EABB */ jal get_npc_unsafe +/* 8CEC6C 80240BFC 86240008 */ lh $a0, 8($s1) +/* 8CEC70 80240C00 0040802D */ daddu $s0, $v0, $zero +/* 8CEC74 80240C04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8CEC78 80240C08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8CEC7C 80240C0C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8CEC80 80240C10 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8CEC84 80240C14 A600008E */ sh $zero, 0x8e($s0) +/* 8CEC88 80240C18 8C460028 */ lw $a2, 0x28($v0) +/* 8CEC8C 80240C1C 0C00A720 */ jal atan2 +/* 8CEC90 80240C20 8C470030 */ lw $a3, 0x30($v0) +/* 8CEC94 80240C24 E600000C */ swc1 $f0, 0xc($s0) +/* 8CEC98 80240C28 8E2200CC */ lw $v0, 0xcc($s1) +/* 8CEC9C 80240C2C 8C420020 */ lw $v0, 0x20($v0) +/* 8CECA0 80240C30 AE020028 */ sw $v0, 0x28($s0) +/* 8CECA4 80240C34 2402000B */ addiu $v0, $zero, 0xb +/* 8CECA8 80240C38 AE420070 */ sw $v0, 0x70($s2) +/* 8CECAC 80240C3C 8FBF001C */ lw $ra, 0x1c($sp) +/* 8CECB0 80240C40 8FB20018 */ lw $s2, 0x18($sp) +/* 8CECB4 80240C44 8FB10014 */ lw $s1, 0x14($sp) +/* 8CECB8 80240C48 8FB00010 */ lw $s0, 0x10($sp) +/* 8CECBC 80240C4C 03E00008 */ jr $ra +/* 8CECC0 80240C50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54.s deleted file mode 100644 index 4a4da4152a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C54 -/* 8CECC4 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CECC8 80240C58 AFB00010 */ sw $s0, 0x10($sp) -/* 8CECCC 80240C5C 0080802D */ daddu $s0, $a0, $zero -/* 8CECD0 80240C60 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CECD4 80240C64 8E020148 */ lw $v0, 0x148($s0) -/* 8CECD8 80240C68 0C00EABB */ jal get_npc_unsafe -/* 8CECDC 80240C6C 84440008 */ lh $a0, 8($v0) -/* 8CECE0 80240C70 9443008E */ lhu $v1, 0x8e($v0) -/* 8CECE4 80240C74 C440003C */ lwc1 $f0, 0x3c($v0) -/* 8CECE8 80240C78 24640001 */ addiu $a0, $v1, 1 -/* 8CECEC 80240C7C 00031C00 */ sll $v1, $v1, 0x10 -/* 8CECF0 80240C80 00031B83 */ sra $v1, $v1, 0xe -/* 8CECF4 80240C84 A444008E */ sh $a0, 0x8e($v0) -/* 8CECF8 80240C88 3C018024 */ lui $at, 0x8024 -/* 8CECFC 80240C8C 00230821 */ addu $at, $at, $v1 -/* 8CED00 80240C90 C4221B2C */ lwc1 $f2, 0x1b2c($at) -/* 8CED04 80240C94 8443008E */ lh $v1, 0x8e($v0) -/* 8CED08 80240C98 46020000 */ add.s $f0, $f0, $f2 -/* 8CED0C 80240C9C 28630005 */ slti $v1, $v1, 5 -/* 8CED10 80240CA0 14600003 */ bnez $v1, .L80240CB0 -/* 8CED14 80240CA4 E440003C */ swc1 $f0, 0x3c($v0) -/* 8CED18 80240CA8 2402000C */ addiu $v0, $zero, 0xc -/* 8CED1C 80240CAC AE020070 */ sw $v0, 0x70($s0) -.L80240CB0: -/* 8CED20 80240CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CED24 80240CB4 8FB00010 */ lw $s0, 0x10($sp) -/* 8CED28 80240CB8 03E00008 */ jr $ra -/* 8CED2C 80240CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s new file mode 100644 index 0000000000..c3d8b4b540 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240C54_8CECC4.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C54_8CECC4 +/* 8CECC4 80240C54 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8CECC8 80240C58 AFB00010 */ sw $s0, 0x10($sp) +/* 8CECCC 80240C5C 0080802D */ daddu $s0, $a0, $zero +/* 8CECD0 80240C60 AFBF0014 */ sw $ra, 0x14($sp) +/* 8CECD4 80240C64 8E020148 */ lw $v0, 0x148($s0) +/* 8CECD8 80240C68 0C00EABB */ jal get_npc_unsafe +/* 8CECDC 80240C6C 84440008 */ lh $a0, 8($v0) +/* 8CECE0 80240C70 9443008E */ lhu $v1, 0x8e($v0) +/* 8CECE4 80240C74 C440003C */ lwc1 $f0, 0x3c($v0) +/* 8CECE8 80240C78 24640001 */ addiu $a0, $v1, 1 +/* 8CECEC 80240C7C 00031C00 */ sll $v1, $v1, 0x10 +/* 8CECF0 80240C80 00031B83 */ sra $v1, $v1, 0xe +/* 8CECF4 80240C84 A444008E */ sh $a0, 0x8e($v0) +/* 8CECF8 80240C88 3C018024 */ lui $at, 0x8024 +/* 8CECFC 80240C8C 00230821 */ addu $at, $at, $v1 +/* 8CED00 80240C90 C4221B2C */ lwc1 $f2, 0x1b2c($at) +/* 8CED04 80240C94 8443008E */ lh $v1, 0x8e($v0) +/* 8CED08 80240C98 46020000 */ add.s $f0, $f0, $f2 +/* 8CED0C 80240C9C 28630005 */ slti $v1, $v1, 5 +/* 8CED10 80240CA0 14600003 */ bnez $v1, .L80240CB0 +/* 8CED14 80240CA4 E440003C */ swc1 $f0, 0x3c($v0) +/* 8CED18 80240CA8 2402000C */ addiu $v0, $zero, 0xc +/* 8CED1C 80240CAC AE020070 */ sw $v0, 0x70($s0) +.L80240CB0: +/* 8CED20 80240CB0 8FBF0014 */ lw $ra, 0x14($sp) +/* 8CED24 80240CB4 8FB00010 */ lw $s0, 0x10($sp) +/* 8CED28 80240CB8 03E00008 */ jr $ra +/* 8CED2C 80240CBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0.s deleted file mode 100644 index c799236916..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CC0 -/* 8CED30 80240CC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8CED34 80240CC4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8CED38 80240CC8 0080982D */ daddu $s3, $a0, $zero -/* 8CED3C 80240CCC AFBF0020 */ sw $ra, 0x20($sp) -/* 8CED40 80240CD0 AFB20018 */ sw $s2, 0x18($sp) -/* 8CED44 80240CD4 AFB10014 */ sw $s1, 0x14($sp) -/* 8CED48 80240CD8 AFB00010 */ sw $s0, 0x10($sp) -/* 8CED4C 80240CDC 8E720148 */ lw $s2, 0x148($s3) -/* 8CED50 80240CE0 86440008 */ lh $a0, 8($s2) -/* 8CED54 80240CE4 0C00EABB */ jal get_npc_unsafe -/* 8CED58 80240CE8 00A0802D */ daddu $s0, $a1, $zero -/* 8CED5C 80240CEC 0040882D */ daddu $s1, $v0, $zero -/* 8CED60 80240CF0 C6420080 */ lwc1 $f2, 0x80($s2) -/* 8CED64 80240CF4 468010A0 */ cvt.s.w $f2, $f2 -/* 8CED68 80240CF8 460010A1 */ cvt.d.s $f2, $f2 -/* 8CED6C 80240CFC C6400084 */ lwc1 $f0, 0x84($s2) -/* 8CED70 80240D00 46800020 */ cvt.s.w $f0, $f0 -/* 8CED74 80240D04 46000021 */ cvt.d.s $f0, $f0 -/* 8CED78 80240D08 3C014059 */ lui $at, 0x4059 -/* 8CED7C 80240D0C 44812800 */ mtc1 $at, $f5 -/* 8CED80 80240D10 44802000 */ mtc1 $zero, $f4 -/* 8CED84 80240D14 8E4200CC */ lw $v0, 0xcc($s2) -/* 8CED88 80240D18 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8CED8C 80240D1C C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8CED90 80240D20 46241083 */ div.d $f2, $f2, $f4 -/* 8CED94 80240D24 462010A0 */ cvt.s.d $f2, $f2 -/* 8CED98 80240D28 46240003 */ div.d $f0, $f0, $f4 -/* 8CED9C 80240D2C 8C420020 */ lw $v0, 0x20($v0) -/* 8CEDA0 80240D30 46200020 */ cvt.s.d $f0, $f0 -/* 8CEDA4 80240D34 E622001C */ swc1 $f2, 0x1c($s1) -/* 8CEDA8 80240D38 E6200014 */ swc1 $f0, 0x14($s1) -/* 8CEDAC 80240D3C AE220028 */ sw $v0, 0x28($s1) -/* 8CEDB0 80240D40 C6000018 */ lwc1 $f0, 0x18($s0) -/* 8CEDB4 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CEDB8 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CEDBC 80240D4C E6200018 */ swc1 $f0, 0x18($s1) -/* 8CEDC0 80240D50 8C460028 */ lw $a2, 0x28($v0) -/* 8CEDC4 80240D54 0C00A720 */ jal atan2 -/* 8CEDC8 80240D58 8C470030 */ lw $a3, 0x30($v0) -/* 8CEDCC 80240D5C E620000C */ swc1 $f0, 0xc($s1) -/* 8CEDD0 80240D60 8E420018 */ lw $v0, 0x18($s2) -/* 8CEDD4 80240D64 AE400074 */ sw $zero, 0x74($s2) -/* 8CEDD8 80240D68 9442002A */ lhu $v0, 0x2a($v0) -/* 8CEDDC 80240D6C 30420002 */ andi $v0, $v0, 2 -/* 8CEDE0 80240D70 10400005 */ beqz $v0, .L80240D88 -/* 8CEDE4 80240D74 24020003 */ addiu $v0, $zero, 3 -/* 8CEDE8 80240D78 A622008E */ sh $v0, 0x8e($s1) -/* 8CEDEC 80240D7C 2402000D */ addiu $v0, $zero, 0xd -/* 8CEDF0 80240D80 08090376 */ j .L80240DD8 -/* 8CEDF4 80240D84 AE620070 */ sw $v0, 0x70($s3) -.L80240D88: -/* 8CEDF8 80240D88 24030001 */ addiu $v1, $zero, 1 -/* 8CEDFC 80240D8C 2402000E */ addiu $v0, $zero, 0xe -/* 8CEE00 80240D90 A623008E */ sh $v1, 0x8e($s1) -/* 8CEE04 80240D94 AE620070 */ sw $v0, 0x70($s3) -/* 8CEE08 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) -/* 8CEE0C 80240D9C 4600018D */ trunc.w.s $f6, $f0 -/* 8CEE10 80240DA0 44023000 */ mfc1 $v0, $f6 -/* 8CEE14 80240DA4 00000000 */ nop -/* 8CEE18 80240DA8 A6420010 */ sh $v0, 0x10($s2) -/* 8CEE1C 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) -/* 8CEE20 80240DB0 4600018D */ trunc.w.s $f6, $f0 -/* 8CEE24 80240DB4 44023000 */ mfc1 $v0, $f6 -/* 8CEE28 80240DB8 00000000 */ nop -/* 8CEE2C 80240DBC A6420012 */ sh $v0, 0x12($s2) -/* 8CEE30 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8CEE34 80240DC4 A2430007 */ sb $v1, 7($s2) -/* 8CEE38 80240DC8 4600018D */ trunc.w.s $f6, $f0 -/* 8CEE3C 80240DCC 44023000 */ mfc1 $v0, $f6 -/* 8CEE40 80240DD0 00000000 */ nop -/* 8CEE44 80240DD4 A6420014 */ sh $v0, 0x14($s2) -.L80240DD8: -/* 8CEE48 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8CEE4C 80240DDC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8CEE50 80240DE0 8FB20018 */ lw $s2, 0x18($sp) -/* 8CEE54 80240DE4 8FB10014 */ lw $s1, 0x14($sp) -/* 8CEE58 80240DE8 8FB00010 */ lw $s0, 0x10($sp) -/* 8CEE5C 80240DEC 03E00008 */ jr $ra -/* 8CEE60 80240DF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s new file mode 100644 index 0000000000..0a943fc2e7 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240CC0_8CED30.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CC0_8CED30 +/* 8CED30 80240CC0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8CED34 80240CC4 AFB3001C */ sw $s3, 0x1c($sp) +/* 8CED38 80240CC8 0080982D */ daddu $s3, $a0, $zero +/* 8CED3C 80240CCC AFBF0020 */ sw $ra, 0x20($sp) +/* 8CED40 80240CD0 AFB20018 */ sw $s2, 0x18($sp) +/* 8CED44 80240CD4 AFB10014 */ sw $s1, 0x14($sp) +/* 8CED48 80240CD8 AFB00010 */ sw $s0, 0x10($sp) +/* 8CED4C 80240CDC 8E720148 */ lw $s2, 0x148($s3) +/* 8CED50 80240CE0 86440008 */ lh $a0, 8($s2) +/* 8CED54 80240CE4 0C00EABB */ jal get_npc_unsafe +/* 8CED58 80240CE8 00A0802D */ daddu $s0, $a1, $zero +/* 8CED5C 80240CEC 0040882D */ daddu $s1, $v0, $zero +/* 8CED60 80240CF0 C6420080 */ lwc1 $f2, 0x80($s2) +/* 8CED64 80240CF4 468010A0 */ cvt.s.w $f2, $f2 +/* 8CED68 80240CF8 460010A1 */ cvt.d.s $f2, $f2 +/* 8CED6C 80240CFC C6400084 */ lwc1 $f0, 0x84($s2) +/* 8CED70 80240D00 46800020 */ cvt.s.w $f0, $f0 +/* 8CED74 80240D04 46000021 */ cvt.d.s $f0, $f0 +/* 8CED78 80240D08 3C014059 */ lui $at, 0x4059 +/* 8CED7C 80240D0C 44812800 */ mtc1 $at, $f5 +/* 8CED80 80240D10 44802000 */ mtc1 $zero, $f4 +/* 8CED84 80240D14 8E4200CC */ lw $v0, 0xcc($s2) +/* 8CED88 80240D18 C62C0038 */ lwc1 $f12, 0x38($s1) +/* 8CED8C 80240D1C C62E0040 */ lwc1 $f14, 0x40($s1) +/* 8CED90 80240D20 46241083 */ div.d $f2, $f2, $f4 +/* 8CED94 80240D24 462010A0 */ cvt.s.d $f2, $f2 +/* 8CED98 80240D28 46240003 */ div.d $f0, $f0, $f4 +/* 8CED9C 80240D2C 8C420020 */ lw $v0, 0x20($v0) +/* 8CEDA0 80240D30 46200020 */ cvt.s.d $f0, $f0 +/* 8CEDA4 80240D34 E622001C */ swc1 $f2, 0x1c($s1) +/* 8CEDA8 80240D38 E6200014 */ swc1 $f0, 0x14($s1) +/* 8CEDAC 80240D3C AE220028 */ sw $v0, 0x28($s1) +/* 8CEDB0 80240D40 C6000018 */ lwc1 $f0, 0x18($s0) +/* 8CEDB4 80240D44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8CEDB8 80240D48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8CEDBC 80240D4C E6200018 */ swc1 $f0, 0x18($s1) +/* 8CEDC0 80240D50 8C460028 */ lw $a2, 0x28($v0) +/* 8CEDC4 80240D54 0C00A720 */ jal atan2 +/* 8CEDC8 80240D58 8C470030 */ lw $a3, 0x30($v0) +/* 8CEDCC 80240D5C E620000C */ swc1 $f0, 0xc($s1) +/* 8CEDD0 80240D60 8E420018 */ lw $v0, 0x18($s2) +/* 8CEDD4 80240D64 AE400074 */ sw $zero, 0x74($s2) +/* 8CEDD8 80240D68 9442002A */ lhu $v0, 0x2a($v0) +/* 8CEDDC 80240D6C 30420002 */ andi $v0, $v0, 2 +/* 8CEDE0 80240D70 10400005 */ beqz $v0, .L80240D88 +/* 8CEDE4 80240D74 24020003 */ addiu $v0, $zero, 3 +/* 8CEDE8 80240D78 A622008E */ sh $v0, 0x8e($s1) +/* 8CEDEC 80240D7C 2402000D */ addiu $v0, $zero, 0xd +/* 8CEDF0 80240D80 08090376 */ j .L80240DD8 +/* 8CEDF4 80240D84 AE620070 */ sw $v0, 0x70($s3) +.L80240D88: +/* 8CEDF8 80240D88 24030001 */ addiu $v1, $zero, 1 +/* 8CEDFC 80240D8C 2402000E */ addiu $v0, $zero, 0xe +/* 8CEE00 80240D90 A623008E */ sh $v1, 0x8e($s1) +/* 8CEE04 80240D94 AE620070 */ sw $v0, 0x70($s3) +/* 8CEE08 80240D98 C6200038 */ lwc1 $f0, 0x38($s1) +/* 8CEE0C 80240D9C 4600018D */ trunc.w.s $f6, $f0 +/* 8CEE10 80240DA0 44023000 */ mfc1 $v0, $f6 +/* 8CEE14 80240DA4 00000000 */ nop +/* 8CEE18 80240DA8 A6420010 */ sh $v0, 0x10($s2) +/* 8CEE1C 80240DAC C620003C */ lwc1 $f0, 0x3c($s1) +/* 8CEE20 80240DB0 4600018D */ trunc.w.s $f6, $f0 +/* 8CEE24 80240DB4 44023000 */ mfc1 $v0, $f6 +/* 8CEE28 80240DB8 00000000 */ nop +/* 8CEE2C 80240DBC A6420012 */ sh $v0, 0x12($s2) +/* 8CEE30 80240DC0 C6200040 */ lwc1 $f0, 0x40($s1) +/* 8CEE34 80240DC4 A2430007 */ sb $v1, 7($s2) +/* 8CEE38 80240DC8 4600018D */ trunc.w.s $f6, $f0 +/* 8CEE3C 80240DCC 44023000 */ mfc1 $v0, $f6 +/* 8CEE40 80240DD0 00000000 */ nop +/* 8CEE44 80240DD4 A6420014 */ sh $v0, 0x14($s2) +.L80240DD8: +/* 8CEE48 80240DD8 8FBF0020 */ lw $ra, 0x20($sp) +/* 8CEE4C 80240DDC 8FB3001C */ lw $s3, 0x1c($sp) +/* 8CEE50 80240DE0 8FB20018 */ lw $s2, 0x18($sp) +/* 8CEE54 80240DE4 8FB10014 */ lw $s1, 0x14($sp) +/* 8CEE58 80240DE8 8FB00010 */ lw $s0, 0x10($sp) +/* 8CEE5C 80240DEC 03E00008 */ jr $ra +/* 8CEE60 80240DF0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4.s deleted file mode 100644 index d6029a516d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF4 -/* 8CEE64 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CEE68 80240DF8 AFB00010 */ sw $s0, 0x10($sp) -/* 8CEE6C 80240DFC 0080802D */ daddu $s0, $a0, $zero -/* 8CEE70 80240E00 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CEE74 80240E04 8E020148 */ lw $v0, 0x148($s0) -/* 8CEE78 80240E08 0C00EABB */ jal get_npc_unsafe -/* 8CEE7C 80240E0C 84440008 */ lh $a0, 8($v0) -/* 8CEE80 80240E10 0040202D */ daddu $a0, $v0, $zero -/* 8CEE84 80240E14 8482008E */ lh $v0, 0x8e($a0) -/* 8CEE88 80240E18 9483008E */ lhu $v1, 0x8e($a0) -/* 8CEE8C 80240E1C 18400005 */ blez $v0, .L80240E34 -/* 8CEE90 80240E20 2462FFFF */ addiu $v0, $v1, -1 -/* 8CEE94 80240E24 A482008E */ sh $v0, 0x8e($a0) -/* 8CEE98 80240E28 00021400 */ sll $v0, $v0, 0x10 -/* 8CEE9C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 -/* 8CEEA0 80240E30 00000000 */ nop -.L80240E34: -/* 8CEEA4 80240E34 8482008C */ lh $v0, 0x8c($a0) -/* 8CEEA8 80240E38 14400003 */ bnez $v0, .L80240E48 -/* 8CEEAC 80240E3C 2402000E */ addiu $v0, $zero, 0xe -/* 8CEEB0 80240E40 A480008E */ sh $zero, 0x8e($a0) -/* 8CEEB4 80240E44 AE020070 */ sw $v0, 0x70($s0) -.L80240E48: -/* 8CEEB8 80240E48 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CEEBC 80240E4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CEEC0 80240E50 03E00008 */ jr $ra -/* 8CEEC4 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s new file mode 100644 index 0000000000..0e1ef73a9e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240DF4_8CEE64.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DF4_8CEE64 +/* 8CEE64 80240DF4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8CEE68 80240DF8 AFB00010 */ sw $s0, 0x10($sp) +/* 8CEE6C 80240DFC 0080802D */ daddu $s0, $a0, $zero +/* 8CEE70 80240E00 AFBF0014 */ sw $ra, 0x14($sp) +/* 8CEE74 80240E04 8E020148 */ lw $v0, 0x148($s0) +/* 8CEE78 80240E08 0C00EABB */ jal get_npc_unsafe +/* 8CEE7C 80240E0C 84440008 */ lh $a0, 8($v0) +/* 8CEE80 80240E10 0040202D */ daddu $a0, $v0, $zero +/* 8CEE84 80240E14 8482008E */ lh $v0, 0x8e($a0) +/* 8CEE88 80240E18 9483008E */ lhu $v1, 0x8e($a0) +/* 8CEE8C 80240E1C 18400005 */ blez $v0, .L80240E34 +/* 8CEE90 80240E20 2462FFFF */ addiu $v0, $v1, -1 +/* 8CEE94 80240E24 A482008E */ sh $v0, 0x8e($a0) +/* 8CEE98 80240E28 00021400 */ sll $v0, $v0, 0x10 +/* 8CEE9C 80240E2C 1C400006 */ bgtz $v0, .L80240E48 +/* 8CEEA0 80240E30 00000000 */ nop +.L80240E34: +/* 8CEEA4 80240E34 8482008C */ lh $v0, 0x8c($a0) +/* 8CEEA8 80240E38 14400003 */ bnez $v0, .L80240E48 +/* 8CEEAC 80240E3C 2402000E */ addiu $v0, $zero, 0xe +/* 8CEEB0 80240E40 A480008E */ sh $zero, 0x8e($a0) +/* 8CEEB4 80240E44 AE020070 */ sw $v0, 0x70($s0) +.L80240E48: +/* 8CEEB8 80240E48 8FBF0014 */ lw $ra, 0x14($sp) +/* 8CEEBC 80240E4C 8FB00010 */ lw $s0, 0x10($sp) +/* 8CEEC0 80240E50 03E00008 */ jr $ra +/* 8CEEC4 80240E54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58.s deleted file mode 100644 index 1842e2d29a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E58 -/* 8CEEC8 80240E58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8CEECC 80240E5C AFB20030 */ sw $s2, 0x30($sp) -/* 8CEED0 80240E60 0080902D */ daddu $s2, $a0, $zero -/* 8CEED4 80240E64 AFBF0038 */ sw $ra, 0x38($sp) -/* 8CEED8 80240E68 AFB30034 */ sw $s3, 0x34($sp) -/* 8CEEDC 80240E6C AFB1002C */ sw $s1, 0x2c($sp) -/* 8CEEE0 80240E70 AFB00028 */ sw $s0, 0x28($sp) -/* 8CEEE4 80240E74 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 8CEEE8 80240E78 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 8CEEEC 80240E7C 8E510148 */ lw $s1, 0x148($s2) -/* 8CEEF0 80240E80 86240008 */ lh $a0, 8($s1) -/* 8CEEF4 80240E84 0C00EABB */ jal get_npc_unsafe -/* 8CEEF8 80240E88 00A0982D */ daddu $s3, $a1, $zero -/* 8CEEFC 80240E8C 0040802D */ daddu $s0, $v0, $zero -/* 8CEF00 80240E90 0200202D */ daddu $a0, $s0, $zero -/* 8CEF04 80240E94 C6220088 */ lwc1 $f2, 0x88($s1) -/* 8CEF08 80240E98 468010A0 */ cvt.s.w $f2, $f2 -/* 8CEF0C 80240E9C 460010A1 */ cvt.d.s $f2, $f2 -/* 8CEF10 80240EA0 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8CEF14 80240EA4 C6000014 */ lwc1 $f0, 0x14($s0) -/* 8CEF18 80240EA8 8E050018 */ lw $a1, 0x18($s0) -/* 8CEF1C 80240EAC 46002100 */ add.s $f4, $f4, $f0 -/* 8CEF20 80240EB0 8E06000C */ lw $a2, 0xc($s0) -/* 8CEF24 80240EB4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8CEF28 80240EB8 46800020 */ cvt.s.w $f0, $f0 -/* 8CEF2C 80240EBC E604001C */ swc1 $f4, 0x1c($s0) -/* 8CEF30 80240EC0 3C014059 */ lui $at, 0x4059 -/* 8CEF34 80240EC4 44812800 */ mtc1 $at, $f5 -/* 8CEF38 80240EC8 44802000 */ mtc1 $zero, $f4 -/* 8CEF3C 80240ECC 46000021 */ cvt.d.s $f0, $f0 -/* 8CEF40 80240ED0 46240003 */ div.d $f0, $f0, $f4 -/* 8CEF44 80240ED4 46200520 */ cvt.s.d $f20, $f0 -/* 8CEF48 80240ED8 46241083 */ div.d $f2, $f2, $f4 -/* 8CEF4C 80240EDC 0C00EA95 */ jal npc_move_heading -/* 8CEF50 80240EE0 462015A0 */ cvt.s.d $f22, $f2 -/* 8CEF54 80240EE4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8CEF58 80240EE8 44801000 */ mtc1 $zero, $f2 -/* 8CEF5C 80240EEC 44801800 */ mtc1 $zero, $f3 -/* 8CEF60 80240EF0 46002021 */ cvt.d.s $f0, $f4 -/* 8CEF64 80240EF4 4620103E */ c.le.d $f2, $f0 -/* 8CEF68 80240EF8 00000000 */ nop -/* 8CEF6C 80240EFC 45000030 */ bc1f .L80240FC0 -/* 8CEF70 80240F00 00000000 */ nop -/* 8CEF74 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CEF78 80240F08 46040000 */ add.s $f0, $f0, $f4 -/* 8CEF7C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) -/* 8CEF80 80240F10 8E2200CC */ lw $v0, 0xcc($s1) -/* 8CEF84 80240F14 8C420024 */ lw $v0, 0x24($v0) -/* 8CEF88 80240F18 AE020028 */ sw $v0, 0x28($s0) -/* 8CEF8C 80240F1C A2200007 */ sb $zero, 7($s1) -/* 8CEF90 80240F20 8E020000 */ lw $v0, ($s0) -/* 8CEF94 80240F24 30420008 */ andi $v0, $v0, 8 -/* 8CEF98 80240F28 14400011 */ bnez $v0, .L80240F70 -/* 8CEF9C 80240F2C 0000102D */ daddu $v0, $zero, $zero -/* 8CEFA0 80240F30 27A50018 */ addiu $a1, $sp, 0x18 -/* 8CEFA4 80240F34 27A6001C */ addiu $a2, $sp, 0x1c -/* 8CEFA8 80240F38 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CEFAC 80240F3C C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CEFB0 80240F40 C6040040 */ lwc1 $f4, 0x40($s0) -/* 8CEFB4 80240F44 3C01447A */ lui $at, 0x447a -/* 8CEFB8 80240F48 44813000 */ mtc1 $at, $f6 -/* 8CEFBC 80240F4C 27A20024 */ addiu $v0, $sp, 0x24 -/* 8CEFC0 80240F50 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8CEFC4 80240F54 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8CEFC8 80240F58 E7A40020 */ swc1 $f4, 0x20($sp) -/* 8CEFCC 80240F5C E7A60024 */ swc1 $f6, 0x24($sp) -/* 8CEFD0 80240F60 AFA20010 */ sw $v0, 0x10($sp) -/* 8CEFD4 80240F64 8E040080 */ lw $a0, 0x80($s0) -/* 8CEFD8 80240F68 0C0372DF */ jal func_800DCB7C -/* 8CEFDC 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 -.L80240F70: -/* 8CEFE0 80240F70 1040000B */ beqz $v0, .L80240FA0 -/* 8CEFE4 80240F74 00000000 */ nop -/* 8CEFE8 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8CEFEC 80240F7C 46140080 */ add.s $f2, $f0, $f20 -/* 8CEFF0 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CEFF4 80240F84 4600103E */ c.le.s $f2, $f0 -/* 8CEFF8 80240F88 00000000 */ nop -/* 8CEFFC 80240F8C 4500008D */ bc1f .L802411C4 -/* 8CF000 80240F90 00000000 */ nop -/* 8CF004 80240F94 E602003C */ swc1 $f2, 0x3c($s0) -/* 8CF008 80240F98 08090471 */ j .L802411C4 -/* 8CF00C 80240F9C AE400070 */ sw $zero, 0x70($s2) -.L80240FA0: -/* 8CF010 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CF014 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) -/* 8CF018 80240FA8 4602003E */ c.le.s $f0, $f2 -/* 8CF01C 80240FAC 00000000 */ nop -/* 8CF020 80240FB0 45030084 */ bc1tl .L802411C4 -/* 8CF024 80240FB4 AE400070 */ sw $zero, 0x70($s2) -/* 8CF028 80240FB8 08090471 */ j .L802411C4 -/* 8CF02C 80240FBC 00000000 */ nop -.L80240FC0: -/* 8CF030 80240FC0 4622003C */ c.lt.d $f0, $f2 -/* 8CF034 80240FC4 00000000 */ nop -/* 8CF038 80240FC8 4500007E */ bc1f .L802411C4 -/* 8CF03C 80240FCC 00000000 */ nop -/* 8CF040 80240FD0 9602008E */ lhu $v0, 0x8e($s0) -/* 8CF044 80240FD4 24420001 */ addiu $v0, $v0, 1 -/* 8CF048 80240FD8 A602008E */ sh $v0, 0x8e($s0) -/* 8CF04C 80240FDC 00021400 */ sll $v0, $v0, 0x10 -/* 8CF050 80240FE0 8E630020 */ lw $v1, 0x20($s3) -/* 8CF054 80240FE4 00021403 */ sra $v0, $v0, 0x10 -/* 8CF058 80240FE8 0043102A */ slt $v0, $v0, $v1 -/* 8CF05C 80240FEC 14400026 */ bnez $v0, .L80241088 -/* 8CF060 80240FF0 00000000 */ nop -/* 8CF064 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8CF068 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8CF06C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8CF070 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8CF074 80241004 A600008E */ sh $zero, 0x8e($s0) -/* 8CF078 80241008 8C460028 */ lw $a2, 0x28($v0) -/* 8CF07C 8024100C 0C00A720 */ jal atan2 -/* 8CF080 80241010 8C470030 */ lw $a3, 0x30($v0) -/* 8CF084 80241014 46000506 */ mov.s $f20, $f0 -/* 8CF088 80241018 C60C000C */ lwc1 $f12, 0xc($s0) -/* 8CF08C 8024101C 0C00A70A */ jal get_clamped_angle_diff -/* 8CF090 80241020 4600A386 */ mov.s $f14, $f20 -/* 8CF094 80241024 46000086 */ mov.s $f2, $f0 -/* 8CF098 80241028 8E62001C */ lw $v0, 0x1c($s3) -/* 8CF09C 8024102C 46001005 */ abs.s $f0, $f2 -/* 8CF0A0 80241030 44822000 */ mtc1 $v0, $f4 -/* 8CF0A4 80241034 00000000 */ nop -/* 8CF0A8 80241038 46802120 */ cvt.s.w $f4, $f4 -/* 8CF0AC 8024103C 4600203C */ c.lt.s $f4, $f0 -/* 8CF0B0 80241040 00000000 */ nop -/* 8CF0B4 80241044 4500000D */ bc1f .L8024107C -/* 8CF0B8 80241048 00000000 */ nop -/* 8CF0BC 8024104C 44800000 */ mtc1 $zero, $f0 -/* 8CF0C0 80241050 C614000C */ lwc1 $f20, 0xc($s0) -/* 8CF0C4 80241054 4600103C */ c.lt.s $f2, $f0 -/* 8CF0C8 80241058 00000000 */ nop -/* 8CF0CC 8024105C 45000006 */ bc1f .L80241078 -/* 8CF0D0 80241060 00021023 */ negu $v0, $v0 -/* 8CF0D4 80241064 44820000 */ mtc1 $v0, $f0 -/* 8CF0D8 80241068 00000000 */ nop -/* 8CF0DC 8024106C 46800020 */ cvt.s.w $f0, $f0 -/* 8CF0E0 80241070 0809041F */ j .L8024107C -/* 8CF0E4 80241074 4600A500 */ add.s $f20, $f20, $f0 -.L80241078: -/* 8CF0E8 80241078 4604A500 */ add.s $f20, $f20, $f4 -.L8024107C: -/* 8CF0EC 8024107C 0C00A6C9 */ jal clamp_angle -/* 8CF0F0 80241080 4600A306 */ mov.s $f12, $f20 -/* 8CF0F4 80241084 E600000C */ swc1 $f0, 0xc($s0) -.L80241088: -/* 8CF0F8 80241088 8E020000 */ lw $v0, ($s0) -/* 8CF0FC 8024108C 30420008 */ andi $v0, $v0, 8 -/* 8CF100 80241090 1040000A */ beqz $v0, .L802410BC -/* 8CF104 80241094 27A50018 */ addiu $a1, $sp, 0x18 -/* 8CF108 80241098 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8CF10C 8024109C C600001C */ lwc1 $f0, 0x1c($s0) -/* 8CF110 802410A0 46001080 */ add.s $f2, $f2, $f0 -/* 8CF114 802410A4 4616103C */ c.lt.s $f2, $f22 -/* 8CF118 802410A8 00000000 */ nop -/* 8CF11C 802410AC 45020045 */ bc1fl .L802411C4 -/* 8CF120 802410B0 E602003C */ swc1 $f2, 0x3c($s0) -/* 8CF124 802410B4 08090470 */ j .L802411C0 -/* 8CF128 802410B8 E616003C */ swc1 $f22, 0x3c($s0) -.L802410BC: -/* 8CF12C 802410BC C6000038 */ lwc1 $f0, 0x38($s0) -/* 8CF130 802410C0 27A6001C */ addiu $a2, $sp, 0x1c -/* 8CF134 802410C4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8CF138 802410C8 860200A8 */ lh $v0, 0xa8($s0) -/* 8CF13C 802410CC C600001C */ lwc1 $f0, 0x1c($s0) -/* 8CF140 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* 8CF144 802410D4 44821000 */ mtc1 $v0, $f2 -/* 8CF148 802410D8 00000000 */ nop -/* 8CF14C 802410DC 468010A0 */ cvt.s.w $f2, $f2 -/* 8CF150 802410E0 46000005 */ abs.s $f0, $f0 -/* 8CF154 802410E4 46020000 */ add.s $f0, $f0, $f2 -/* 8CF158 802410E8 C6060040 */ lwc1 $f6, 0x40($s0) -/* 8CF15C 802410EC 27A20024 */ addiu $v0, $sp, 0x24 -/* 8CF160 802410F0 46022100 */ add.s $f4, $f4, $f2 -/* 8CF164 802410F4 3C014024 */ lui $at, 0x4024 -/* 8CF168 802410F8 44811800 */ mtc1 $at, $f3 -/* 8CF16C 802410FC 44801000 */ mtc1 $zero, $f2 -/* 8CF170 80241100 46000021 */ cvt.d.s $f0, $f0 -/* 8CF174 80241104 46220000 */ add.d $f0, $f0, $f2 -/* 8CF178 80241108 E7A60020 */ swc1 $f6, 0x20($sp) -/* 8CF17C 8024110C E7A4001C */ swc1 $f4, 0x1c($sp) -/* 8CF180 80241110 46200020 */ cvt.s.d $f0, $f0 -/* 8CF184 80241114 E7A00024 */ swc1 $f0, 0x24($sp) -/* 8CF188 80241118 AFA20010 */ sw $v0, 0x10($sp) -/* 8CF18C 8024111C 8E040080 */ lw $a0, 0x80($s0) -/* 8CF190 80241120 0C0372DF */ jal func_800DCB7C -/* 8CF194 80241124 27A70020 */ addiu $a3, $sp, 0x20 -/* 8CF198 80241128 10400015 */ beqz $v0, .L80241180 -/* 8CF19C 8024112C 00000000 */ nop -/* 8CF1A0 80241130 860200A8 */ lh $v0, 0xa8($s0) -/* 8CF1A4 80241134 C604001C */ lwc1 $f4, 0x1c($s0) -/* 8CF1A8 80241138 44820000 */ mtc1 $v0, $f0 -/* 8CF1AC 8024113C 00000000 */ nop -/* 8CF1B0 80241140 46800020 */ cvt.s.w $f0, $f0 -/* 8CF1B4 80241144 46002085 */ abs.s $f2, $f4 -/* 8CF1B8 80241148 46020000 */ add.s $f0, $f0, $f2 -/* 8CF1BC 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8CF1C0 80241150 4600103E */ c.le.s $f2, $f0 -/* 8CF1C4 80241154 00000000 */ nop -/* 8CF1C8 80241158 45000005 */ bc1f .L80241170 -/* 8CF1CC 8024115C 00000000 */ nop -/* 8CF1D0 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8CF1D4 80241164 AE00001C */ sw $zero, 0x1c($s0) -/* 8CF1D8 80241168 08090471 */ j .L802411C4 -/* 8CF1DC 8024116C E600003C */ swc1 $f0, 0x3c($s0) -.L80241170: -/* 8CF1E0 80241170 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8CF1E4 80241174 46040000 */ add.s $f0, $f0, $f4 -/* 8CF1E8 80241178 08090471 */ j .L802411C4 -/* 8CF1EC 8024117C E600003C */ swc1 $f0, 0x3c($s0) -.L80241180: -/* 8CF1F0 80241180 C606003C */ lwc1 $f6, 0x3c($s0) -/* 8CF1F4 80241184 860200A8 */ lh $v0, 0xa8($s0) -/* 8CF1F8 80241188 46163081 */ sub.s $f2, $f6, $f22 -/* 8CF1FC 8024118C 44820000 */ mtc1 $v0, $f0 -/* 8CF200 80241190 00000000 */ nop -/* 8CF204 80241194 46800020 */ cvt.s.w $f0, $f0 -/* 8CF208 80241198 46001080 */ add.s $f2, $f2, $f0 -/* 8CF20C 8024119C C604001C */ lwc1 $f4, 0x1c($s0) -/* 8CF210 802411A0 46002005 */ abs.s $f0, $f4 -/* 8CF214 802411A4 4602003C */ c.lt.s $f0, $f2 -/* 8CF218 802411A8 00000000 */ nop -/* 8CF21C 802411AC 45020005 */ bc1fl .L802411C4 -/* 8CF220 802411B0 AE00001C */ sw $zero, 0x1c($s0) -/* 8CF224 802411B4 46043000 */ add.s $f0, $f6, $f4 -/* 8CF228 802411B8 08090471 */ j .L802411C4 -/* 8CF22C 802411BC E600003C */ swc1 $f0, 0x3c($s0) -.L802411C0: -/* 8CF230 802411C0 AE00001C */ sw $zero, 0x1c($s0) -.L802411C4: -/* 8CF234 802411C4 8FBF0038 */ lw $ra, 0x38($sp) -/* 8CF238 802411C8 8FB30034 */ lw $s3, 0x34($sp) -/* 8CF23C 802411CC 8FB20030 */ lw $s2, 0x30($sp) -/* 8CF240 802411D0 8FB1002C */ lw $s1, 0x2c($sp) -/* 8CF244 802411D4 8FB00028 */ lw $s0, 0x28($sp) -/* 8CF248 802411D8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 8CF24C 802411DC D7B40040 */ ldc1 $f20, 0x40($sp) -/* 8CF250 802411E0 03E00008 */ jr $ra -/* 8CF254 802411E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s new file mode 100644 index 0000000000..46369ac64f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_80240E58_8CEEC8.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E58_8CEEC8 +/* 8CEEC8 80240E58 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 8CEECC 80240E5C AFB20030 */ sw $s2, 0x30($sp) +/* 8CEED0 80240E60 0080902D */ daddu $s2, $a0, $zero +/* 8CEED4 80240E64 AFBF0038 */ sw $ra, 0x38($sp) +/* 8CEED8 80240E68 AFB30034 */ sw $s3, 0x34($sp) +/* 8CEEDC 80240E6C AFB1002C */ sw $s1, 0x2c($sp) +/* 8CEEE0 80240E70 AFB00028 */ sw $s0, 0x28($sp) +/* 8CEEE4 80240E74 F7B60048 */ sdc1 $f22, 0x48($sp) +/* 8CEEE8 80240E78 F7B40040 */ sdc1 $f20, 0x40($sp) +/* 8CEEEC 80240E7C 8E510148 */ lw $s1, 0x148($s2) +/* 8CEEF0 80240E80 86240008 */ lh $a0, 8($s1) +/* 8CEEF4 80240E84 0C00EABB */ jal get_npc_unsafe +/* 8CEEF8 80240E88 00A0982D */ daddu $s3, $a1, $zero +/* 8CEEFC 80240E8C 0040802D */ daddu $s0, $v0, $zero +/* 8CEF00 80240E90 0200202D */ daddu $a0, $s0, $zero +/* 8CEF04 80240E94 C6220088 */ lwc1 $f2, 0x88($s1) +/* 8CEF08 80240E98 468010A0 */ cvt.s.w $f2, $f2 +/* 8CEF0C 80240E9C 460010A1 */ cvt.d.s $f2, $f2 +/* 8CEF10 80240EA0 C604001C */ lwc1 $f4, 0x1c($s0) +/* 8CEF14 80240EA4 C6000014 */ lwc1 $f0, 0x14($s0) +/* 8CEF18 80240EA8 8E050018 */ lw $a1, 0x18($s0) +/* 8CEF1C 80240EAC 46002100 */ add.s $f4, $f4, $f0 +/* 8CEF20 80240EB0 8E06000C */ lw $a2, 0xc($s0) +/* 8CEF24 80240EB4 C6200078 */ lwc1 $f0, 0x78($s1) +/* 8CEF28 80240EB8 46800020 */ cvt.s.w $f0, $f0 +/* 8CEF2C 80240EBC E604001C */ swc1 $f4, 0x1c($s0) +/* 8CEF30 80240EC0 3C014059 */ lui $at, 0x4059 +/* 8CEF34 80240EC4 44812800 */ mtc1 $at, $f5 +/* 8CEF38 80240EC8 44802000 */ mtc1 $zero, $f4 +/* 8CEF3C 80240ECC 46000021 */ cvt.d.s $f0, $f0 +/* 8CEF40 80240ED0 46240003 */ div.d $f0, $f0, $f4 +/* 8CEF44 80240ED4 46200520 */ cvt.s.d $f20, $f0 +/* 8CEF48 80240ED8 46241083 */ div.d $f2, $f2, $f4 +/* 8CEF4C 80240EDC 0C00EA95 */ jal npc_move_heading +/* 8CEF50 80240EE0 462015A0 */ cvt.s.d $f22, $f2 +/* 8CEF54 80240EE4 C604001C */ lwc1 $f4, 0x1c($s0) +/* 8CEF58 80240EE8 44801000 */ mtc1 $zero, $f2 +/* 8CEF5C 80240EEC 44801800 */ mtc1 $zero, $f3 +/* 8CEF60 80240EF0 46002021 */ cvt.d.s $f0, $f4 +/* 8CEF64 80240EF4 4620103E */ c.le.d $f2, $f0 +/* 8CEF68 80240EF8 00000000 */ nop +/* 8CEF6C 80240EFC 45000030 */ bc1f .L80240FC0 +/* 8CEF70 80240F00 00000000 */ nop +/* 8CEF74 80240F04 C600003C */ lwc1 $f0, 0x3c($s0) +/* 8CEF78 80240F08 46040000 */ add.s $f0, $f0, $f4 +/* 8CEF7C 80240F0C E600003C */ swc1 $f0, 0x3c($s0) +/* 8CEF80 80240F10 8E2200CC */ lw $v0, 0xcc($s1) +/* 8CEF84 80240F14 8C420024 */ lw $v0, 0x24($v0) +/* 8CEF88 80240F18 AE020028 */ sw $v0, 0x28($s0) +/* 8CEF8C 80240F1C A2200007 */ sb $zero, 7($s1) +/* 8CEF90 80240F20 8E020000 */ lw $v0, ($s0) +/* 8CEF94 80240F24 30420008 */ andi $v0, $v0, 8 +/* 8CEF98 80240F28 14400011 */ bnez $v0, .L80240F70 +/* 8CEF9C 80240F2C 0000102D */ daddu $v0, $zero, $zero +/* 8CEFA0 80240F30 27A50018 */ addiu $a1, $sp, 0x18 +/* 8CEFA4 80240F34 27A6001C */ addiu $a2, $sp, 0x1c +/* 8CEFA8 80240F38 C6000038 */ lwc1 $f0, 0x38($s0) +/* 8CEFAC 80240F3C C602003C */ lwc1 $f2, 0x3c($s0) +/* 8CEFB0 80240F40 C6040040 */ lwc1 $f4, 0x40($s0) +/* 8CEFB4 80240F44 3C01447A */ lui $at, 0x447a +/* 8CEFB8 80240F48 44813000 */ mtc1 $at, $f6 +/* 8CEFBC 80240F4C 27A20024 */ addiu $v0, $sp, 0x24 +/* 8CEFC0 80240F50 E7A00018 */ swc1 $f0, 0x18($sp) +/* 8CEFC4 80240F54 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 8CEFC8 80240F58 E7A40020 */ swc1 $f4, 0x20($sp) +/* 8CEFCC 80240F5C E7A60024 */ swc1 $f6, 0x24($sp) +/* 8CEFD0 80240F60 AFA20010 */ sw $v0, 0x10($sp) +/* 8CEFD4 80240F64 8E040080 */ lw $a0, 0x80($s0) +/* 8CEFD8 80240F68 0C0372DF */ jal func_800DCB7C +/* 8CEFDC 80240F6C 27A70020 */ addiu $a3, $sp, 0x20 +.L80240F70: +/* 8CEFE0 80240F70 1040000B */ beqz $v0, .L80240FA0 +/* 8CEFE4 80240F74 00000000 */ nop +/* 8CEFE8 80240F78 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 8CEFEC 80240F7C 46140080 */ add.s $f2, $f0, $f20 +/* 8CEFF0 80240F80 C600003C */ lwc1 $f0, 0x3c($s0) +/* 8CEFF4 80240F84 4600103E */ c.le.s $f2, $f0 +/* 8CEFF8 80240F88 00000000 */ nop +/* 8CEFFC 80240F8C 4500008D */ bc1f .L802411C4 +/* 8CF000 80240F90 00000000 */ nop +/* 8CF004 80240F94 E602003C */ swc1 $f2, 0x3c($s0) +/* 8CF008 80240F98 08090471 */ j .L802411C4 +/* 8CF00C 80240F9C AE400070 */ sw $zero, 0x70($s2) +.L80240FA0: +/* 8CF010 80240FA0 C602003C */ lwc1 $f2, 0x3c($s0) +/* 8CF014 80240FA4 C6000064 */ lwc1 $f0, 0x64($s0) +/* 8CF018 80240FA8 4602003E */ c.le.s $f0, $f2 +/* 8CF01C 80240FAC 00000000 */ nop +/* 8CF020 80240FB0 45030084 */ bc1tl .L802411C4 +/* 8CF024 80240FB4 AE400070 */ sw $zero, 0x70($s2) +/* 8CF028 80240FB8 08090471 */ j .L802411C4 +/* 8CF02C 80240FBC 00000000 */ nop +.L80240FC0: +/* 8CF030 80240FC0 4622003C */ c.lt.d $f0, $f2 +/* 8CF034 80240FC4 00000000 */ nop +/* 8CF038 80240FC8 4500007E */ bc1f .L802411C4 +/* 8CF03C 80240FCC 00000000 */ nop +/* 8CF040 80240FD0 9602008E */ lhu $v0, 0x8e($s0) +/* 8CF044 80240FD4 24420001 */ addiu $v0, $v0, 1 +/* 8CF048 80240FD8 A602008E */ sh $v0, 0x8e($s0) +/* 8CF04C 80240FDC 00021400 */ sll $v0, $v0, 0x10 +/* 8CF050 80240FE0 8E630020 */ lw $v1, 0x20($s3) +/* 8CF054 80240FE4 00021403 */ sra $v0, $v0, 0x10 +/* 8CF058 80240FE8 0043102A */ slt $v0, $v0, $v1 +/* 8CF05C 80240FEC 14400026 */ bnez $v0, .L80241088 +/* 8CF060 80240FF0 00000000 */ nop +/* 8CF064 80240FF4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8CF068 80240FF8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8CF06C 80240FFC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8CF070 80241000 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8CF074 80241004 A600008E */ sh $zero, 0x8e($s0) +/* 8CF078 80241008 8C460028 */ lw $a2, 0x28($v0) +/* 8CF07C 8024100C 0C00A720 */ jal atan2 +/* 8CF080 80241010 8C470030 */ lw $a3, 0x30($v0) +/* 8CF084 80241014 46000506 */ mov.s $f20, $f0 +/* 8CF088 80241018 C60C000C */ lwc1 $f12, 0xc($s0) +/* 8CF08C 8024101C 0C00A70A */ jal get_clamped_angle_diff +/* 8CF090 80241020 4600A386 */ mov.s $f14, $f20 +/* 8CF094 80241024 46000086 */ mov.s $f2, $f0 +/* 8CF098 80241028 8E62001C */ lw $v0, 0x1c($s3) +/* 8CF09C 8024102C 46001005 */ abs.s $f0, $f2 +/* 8CF0A0 80241030 44822000 */ mtc1 $v0, $f4 +/* 8CF0A4 80241034 00000000 */ nop +/* 8CF0A8 80241038 46802120 */ cvt.s.w $f4, $f4 +/* 8CF0AC 8024103C 4600203C */ c.lt.s $f4, $f0 +/* 8CF0B0 80241040 00000000 */ nop +/* 8CF0B4 80241044 4500000D */ bc1f .L8024107C +/* 8CF0B8 80241048 00000000 */ nop +/* 8CF0BC 8024104C 44800000 */ mtc1 $zero, $f0 +/* 8CF0C0 80241050 C614000C */ lwc1 $f20, 0xc($s0) +/* 8CF0C4 80241054 4600103C */ c.lt.s $f2, $f0 +/* 8CF0C8 80241058 00000000 */ nop +/* 8CF0CC 8024105C 45000006 */ bc1f .L80241078 +/* 8CF0D0 80241060 00021023 */ negu $v0, $v0 +/* 8CF0D4 80241064 44820000 */ mtc1 $v0, $f0 +/* 8CF0D8 80241068 00000000 */ nop +/* 8CF0DC 8024106C 46800020 */ cvt.s.w $f0, $f0 +/* 8CF0E0 80241070 0809041F */ j .L8024107C +/* 8CF0E4 80241074 4600A500 */ add.s $f20, $f20, $f0 +.L80241078: +/* 8CF0E8 80241078 4604A500 */ add.s $f20, $f20, $f4 +.L8024107C: +/* 8CF0EC 8024107C 0C00A6C9 */ jal clamp_angle +/* 8CF0F0 80241080 4600A306 */ mov.s $f12, $f20 +/* 8CF0F4 80241084 E600000C */ swc1 $f0, 0xc($s0) +.L80241088: +/* 8CF0F8 80241088 8E020000 */ lw $v0, ($s0) +/* 8CF0FC 8024108C 30420008 */ andi $v0, $v0, 8 +/* 8CF100 80241090 1040000A */ beqz $v0, .L802410BC +/* 8CF104 80241094 27A50018 */ addiu $a1, $sp, 0x18 +/* 8CF108 80241098 C602003C */ lwc1 $f2, 0x3c($s0) +/* 8CF10C 8024109C C600001C */ lwc1 $f0, 0x1c($s0) +/* 8CF110 802410A0 46001080 */ add.s $f2, $f2, $f0 +/* 8CF114 802410A4 4616103C */ c.lt.s $f2, $f22 +/* 8CF118 802410A8 00000000 */ nop +/* 8CF11C 802410AC 45020045 */ bc1fl .L802411C4 +/* 8CF120 802410B0 E602003C */ swc1 $f2, 0x3c($s0) +/* 8CF124 802410B4 08090470 */ j .L802411C0 +/* 8CF128 802410B8 E616003C */ swc1 $f22, 0x3c($s0) +.L802410BC: +/* 8CF12C 802410BC C6000038 */ lwc1 $f0, 0x38($s0) +/* 8CF130 802410C0 27A6001C */ addiu $a2, $sp, 0x1c +/* 8CF134 802410C4 E7A00018 */ swc1 $f0, 0x18($sp) +/* 8CF138 802410C8 860200A8 */ lh $v0, 0xa8($s0) +/* 8CF13C 802410CC C600001C */ lwc1 $f0, 0x1c($s0) +/* 8CF140 802410D0 C604003C */ lwc1 $f4, 0x3c($s0) +/* 8CF144 802410D4 44821000 */ mtc1 $v0, $f2 +/* 8CF148 802410D8 00000000 */ nop +/* 8CF14C 802410DC 468010A0 */ cvt.s.w $f2, $f2 +/* 8CF150 802410E0 46000005 */ abs.s $f0, $f0 +/* 8CF154 802410E4 46020000 */ add.s $f0, $f0, $f2 +/* 8CF158 802410E8 C6060040 */ lwc1 $f6, 0x40($s0) +/* 8CF15C 802410EC 27A20024 */ addiu $v0, $sp, 0x24 +/* 8CF160 802410F0 46022100 */ add.s $f4, $f4, $f2 +/* 8CF164 802410F4 3C014024 */ lui $at, 0x4024 +/* 8CF168 802410F8 44811800 */ mtc1 $at, $f3 +/* 8CF16C 802410FC 44801000 */ mtc1 $zero, $f2 +/* 8CF170 80241100 46000021 */ cvt.d.s $f0, $f0 +/* 8CF174 80241104 46220000 */ add.d $f0, $f0, $f2 +/* 8CF178 80241108 E7A60020 */ swc1 $f6, 0x20($sp) +/* 8CF17C 8024110C E7A4001C */ swc1 $f4, 0x1c($sp) +/* 8CF180 80241110 46200020 */ cvt.s.d $f0, $f0 +/* 8CF184 80241114 E7A00024 */ swc1 $f0, 0x24($sp) +/* 8CF188 80241118 AFA20010 */ sw $v0, 0x10($sp) +/* 8CF18C 8024111C 8E040080 */ lw $a0, 0x80($s0) +/* 8CF190 80241120 0C0372DF */ jal func_800DCB7C +/* 8CF194 80241124 27A70020 */ addiu $a3, $sp, 0x20 +/* 8CF198 80241128 10400015 */ beqz $v0, .L80241180 +/* 8CF19C 8024112C 00000000 */ nop +/* 8CF1A0 80241130 860200A8 */ lh $v0, 0xa8($s0) +/* 8CF1A4 80241134 C604001C */ lwc1 $f4, 0x1c($s0) +/* 8CF1A8 80241138 44820000 */ mtc1 $v0, $f0 +/* 8CF1AC 8024113C 00000000 */ nop +/* 8CF1B0 80241140 46800020 */ cvt.s.w $f0, $f0 +/* 8CF1B4 80241144 46002085 */ abs.s $f2, $f4 +/* 8CF1B8 80241148 46020000 */ add.s $f0, $f0, $f2 +/* 8CF1BC 8024114C C7A20024 */ lwc1 $f2, 0x24($sp) +/* 8CF1C0 80241150 4600103E */ c.le.s $f2, $f0 +/* 8CF1C4 80241154 00000000 */ nop +/* 8CF1C8 80241158 45000005 */ bc1f .L80241170 +/* 8CF1CC 8024115C 00000000 */ nop +/* 8CF1D0 80241160 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 8CF1D4 80241164 AE00001C */ sw $zero, 0x1c($s0) +/* 8CF1D8 80241168 08090471 */ j .L802411C4 +/* 8CF1DC 8024116C E600003C */ swc1 $f0, 0x3c($s0) +.L80241170: +/* 8CF1E0 80241170 C600003C */ lwc1 $f0, 0x3c($s0) +/* 8CF1E4 80241174 46040000 */ add.s $f0, $f0, $f4 +/* 8CF1E8 80241178 08090471 */ j .L802411C4 +/* 8CF1EC 8024117C E600003C */ swc1 $f0, 0x3c($s0) +.L80241180: +/* 8CF1F0 80241180 C606003C */ lwc1 $f6, 0x3c($s0) +/* 8CF1F4 80241184 860200A8 */ lh $v0, 0xa8($s0) +/* 8CF1F8 80241188 46163081 */ sub.s $f2, $f6, $f22 +/* 8CF1FC 8024118C 44820000 */ mtc1 $v0, $f0 +/* 8CF200 80241190 00000000 */ nop +/* 8CF204 80241194 46800020 */ cvt.s.w $f0, $f0 +/* 8CF208 80241198 46001080 */ add.s $f2, $f2, $f0 +/* 8CF20C 8024119C C604001C */ lwc1 $f4, 0x1c($s0) +/* 8CF210 802411A0 46002005 */ abs.s $f0, $f4 +/* 8CF214 802411A4 4602003C */ c.lt.s $f0, $f2 +/* 8CF218 802411A8 00000000 */ nop +/* 8CF21C 802411AC 45020005 */ bc1fl .L802411C4 +/* 8CF220 802411B0 AE00001C */ sw $zero, 0x1c($s0) +/* 8CF224 802411B4 46043000 */ add.s $f0, $f6, $f4 +/* 8CF228 802411B8 08090471 */ j .L802411C4 +/* 8CF22C 802411BC E600003C */ swc1 $f0, 0x3c($s0) +.L802411C0: +/* 8CF230 802411C0 AE00001C */ sw $zero, 0x1c($s0) +.L802411C4: +/* 8CF234 802411C4 8FBF0038 */ lw $ra, 0x38($sp) +/* 8CF238 802411C8 8FB30034 */ lw $s3, 0x34($sp) +/* 8CF23C 802411CC 8FB20030 */ lw $s2, 0x30($sp) +/* 8CF240 802411D0 8FB1002C */ lw $s1, 0x2c($sp) +/* 8CF244 802411D4 8FB00028 */ lw $s0, 0x28($sp) +/* 8CF248 802411D8 D7B60048 */ ldc1 $f22, 0x48($sp) +/* 8CF24C 802411DC D7B40040 */ ldc1 $f20, 0x40($sp) +/* 8CF250 802411E0 03E00008 */ jr $ra +/* 8CF254 802411E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8.s deleted file mode 100644 index 7520a4ac8c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E8 -/* 8CF258 802411E8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8CF25C 802411EC AFB00028 */ sw $s0, 0x28($sp) -/* 8CF260 802411F0 00A0802D */ daddu $s0, $a1, $zero -/* 8CF264 802411F4 AFB1002C */ sw $s1, 0x2c($sp) -/* 8CF268 802411F8 00C0882D */ daddu $s1, $a2, $zero -/* 8CF26C 802411FC AFBF0034 */ sw $ra, 0x34($sp) -/* 8CF270 80241200 AFB20030 */ sw $s2, 0x30($sp) -/* 8CF274 80241204 AE200070 */ sw $zero, 0x70($s1) -/* 8CF278 80241208 8C830000 */ lw $v1, ($a0) -/* 8CF27C 8024120C 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8CF280 80241210 A480008E */ sh $zero, 0x8e($a0) -/* 8CF284 80241214 00621824 */ and $v1, $v1, $v0 -/* 8CF288 80241218 34650800 */ ori $a1, $v1, 0x800 -/* 8CF28C 8024121C AC850000 */ sw $a1, ($a0) -/* 8CF290 80241220 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8CF294 80241224 8C420034 */ lw $v0, 0x34($v0) -/* 8CF298 80241228 10400003 */ beqz $v0, .L80241238 -/* 8CF29C 8024122C 00E0902D */ daddu $s2, $a3, $zero -/* 8CF2A0 80241230 08090490 */ j .L80241240 -/* 8CF2A4 80241234 34620808 */ ori $v0, $v1, 0x808 -.L80241238: -/* 8CF2A8 80241238 2402FFF7 */ addiu $v0, $zero, -9 -/* 8CF2AC 8024123C 00A21024 */ and $v0, $a1, $v0 -.L80241240: -/* 8CF2B0 80241240 AC820000 */ sw $v0, ($a0) -/* 8CF2B4 80241244 27A20024 */ addiu $v0, $sp, 0x24 -/* 8CF2B8 80241248 27A50018 */ addiu $a1, $sp, 0x18 -/* 8CF2BC 8024124C C4800038 */ lwc1 $f0, 0x38($a0) -/* 8CF2C0 80241250 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8CF2C4 80241254 C4840040 */ lwc1 $f4, 0x40($a0) -/* 8CF2C8 80241258 3C01447A */ lui $at, 0x447a -/* 8CF2CC 8024125C 44813000 */ mtc1 $at, $f6 -/* 8CF2D0 80241260 27A6001C */ addiu $a2, $sp, 0x1c -/* 8CF2D4 80241264 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8CF2D8 80241268 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8CF2DC 8024126C E7A40020 */ swc1 $f4, 0x20($sp) -/* 8CF2E0 80241270 E7A60024 */ swc1 $f6, 0x24($sp) -/* 8CF2E4 80241274 AFA20010 */ sw $v0, 0x10($sp) -/* 8CF2E8 80241278 8C840080 */ lw $a0, 0x80($a0) -/* 8CF2EC 8024127C 0C0372DF */ jal func_800DCB7C -/* 8CF2F0 80241280 27A70020 */ addiu $a3, $sp, 0x20 -/* 8CF2F4 80241284 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 8CF2F8 80241288 3C014059 */ lui $at, 0x4059 -/* 8CF2FC 8024128C 44812800 */ mtc1 $at, $f5 -/* 8CF300 80241290 44802000 */ mtc1 $zero, $f4 -/* 8CF304 80241294 460010A1 */ cvt.d.s $f2, $f2 -/* 8CF308 80241298 46241082 */ mul.d $f2, $f2, $f4 -/* 8CF30C 8024129C 00000000 */ nop -/* 8CF310 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 8CF314 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* 8CF318 802412A8 46240002 */ mul.d $f0, $f0, $f4 -/* 8CF31C 802412AC 00000000 */ nop -/* 8CF320 802412B0 3C013FE0 */ lui $at, 0x3fe0 -/* 8CF324 802412B4 44812800 */ mtc1 $at, $f5 -/* 8CF328 802412B8 44802000 */ mtc1 $zero, $f4 -/* 8CF32C 802412BC 00000000 */ nop -/* 8CF330 802412C0 46241080 */ add.d $f2, $f2, $f4 -/* 8CF334 802412C4 AE000074 */ sw $zero, 0x74($s0) -/* 8CF338 802412C8 46240000 */ add.d $f0, $f0, $f4 -/* 8CF33C 802412CC AE000090 */ sw $zero, 0x90($s0) -/* 8CF340 802412D0 4620120D */ trunc.w.d $f8, $f2 -/* 8CF344 802412D4 E6080078 */ swc1 $f8, 0x78($s0) -/* 8CF348 802412D8 4620020D */ trunc.w.d $f8, $f0 -/* 8CF34C 802412DC E6080088 */ swc1 $f8, 0x88($s0) -/* 8CF350 802412E0 8E420014 */ lw $v0, 0x14($s2) -/* 8CF354 802412E4 AE220074 */ sw $v0, 0x74($s1) -/* 8CF358 802412E8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8CF35C 802412EC 34420010 */ ori $v0, $v0, 0x10 -/* 8CF360 802412F0 AE0200B0 */ sw $v0, 0xb0($s0) -/* 8CF364 802412F4 8FBF0034 */ lw $ra, 0x34($sp) -/* 8CF368 802412F8 8FB20030 */ lw $s2, 0x30($sp) -/* 8CF36C 802412FC 8FB1002C */ lw $s1, 0x2c($sp) -/* 8CF370 80241300 8FB00028 */ lw $s0, 0x28($sp) -/* 8CF374 80241304 03E00008 */ jr $ra -/* 8CF378 80241308 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s new file mode 100644 index 0000000000..8ad7075e40 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_802411E8_8CF258.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411E8_8CF258 +/* 8CF258 802411E8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8CF25C 802411EC AFB00028 */ sw $s0, 0x28($sp) +/* 8CF260 802411F0 00A0802D */ daddu $s0, $a1, $zero +/* 8CF264 802411F4 AFB1002C */ sw $s1, 0x2c($sp) +/* 8CF268 802411F8 00C0882D */ daddu $s1, $a2, $zero +/* 8CF26C 802411FC AFBF0034 */ sw $ra, 0x34($sp) +/* 8CF270 80241200 AFB20030 */ sw $s2, 0x30($sp) +/* 8CF274 80241204 AE200070 */ sw $zero, 0x70($s1) +/* 8CF278 80241208 8C830000 */ lw $v1, ($a0) +/* 8CF27C 8024120C 2402FDFF */ addiu $v0, $zero, -0x201 +/* 8CF280 80241210 A480008E */ sh $zero, 0x8e($a0) +/* 8CF284 80241214 00621824 */ and $v1, $v1, $v0 +/* 8CF288 80241218 34650800 */ ori $a1, $v1, 0x800 +/* 8CF28C 8024121C AC850000 */ sw $a1, ($a0) +/* 8CF290 80241220 8E0200D0 */ lw $v0, 0xd0($s0) +/* 8CF294 80241224 8C420034 */ lw $v0, 0x34($v0) +/* 8CF298 80241228 10400003 */ beqz $v0, .L80241238 +/* 8CF29C 8024122C 00E0902D */ daddu $s2, $a3, $zero +/* 8CF2A0 80241230 08090490 */ j .L80241240 +/* 8CF2A4 80241234 34620808 */ ori $v0, $v1, 0x808 +.L80241238: +/* 8CF2A8 80241238 2402FFF7 */ addiu $v0, $zero, -9 +/* 8CF2AC 8024123C 00A21024 */ and $v0, $a1, $v0 +.L80241240: +/* 8CF2B0 80241240 AC820000 */ sw $v0, ($a0) +/* 8CF2B4 80241244 27A20024 */ addiu $v0, $sp, 0x24 +/* 8CF2B8 80241248 27A50018 */ addiu $a1, $sp, 0x18 +/* 8CF2BC 8024124C C4800038 */ lwc1 $f0, 0x38($a0) +/* 8CF2C0 80241250 C482003C */ lwc1 $f2, 0x3c($a0) +/* 8CF2C4 80241254 C4840040 */ lwc1 $f4, 0x40($a0) +/* 8CF2C8 80241258 3C01447A */ lui $at, 0x447a +/* 8CF2CC 8024125C 44813000 */ mtc1 $at, $f6 +/* 8CF2D0 80241260 27A6001C */ addiu $a2, $sp, 0x1c +/* 8CF2D4 80241264 E7A00018 */ swc1 $f0, 0x18($sp) +/* 8CF2D8 80241268 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 8CF2DC 8024126C E7A40020 */ swc1 $f4, 0x20($sp) +/* 8CF2E0 80241270 E7A60024 */ swc1 $f6, 0x24($sp) +/* 8CF2E4 80241274 AFA20010 */ sw $v0, 0x10($sp) +/* 8CF2E8 80241278 8C840080 */ lw $a0, 0x80($a0) +/* 8CF2EC 8024127C 0C0372DF */ jal func_800DCB7C +/* 8CF2F0 80241280 27A70020 */ addiu $a3, $sp, 0x20 +/* 8CF2F4 80241284 C7A20024 */ lwc1 $f2, 0x24($sp) +/* 8CF2F8 80241288 3C014059 */ lui $at, 0x4059 +/* 8CF2FC 8024128C 44812800 */ mtc1 $at, $f5 +/* 8CF300 80241290 44802000 */ mtc1 $zero, $f4 +/* 8CF304 80241294 460010A1 */ cvt.d.s $f2, $f2 +/* 8CF308 80241298 46241082 */ mul.d $f2, $f2, $f4 +/* 8CF30C 8024129C 00000000 */ nop +/* 8CF310 802412A0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 8CF314 802412A4 46000021 */ cvt.d.s $f0, $f0 +/* 8CF318 802412A8 46240002 */ mul.d $f0, $f0, $f4 +/* 8CF31C 802412AC 00000000 */ nop +/* 8CF320 802412B0 3C013FE0 */ lui $at, 0x3fe0 +/* 8CF324 802412B4 44812800 */ mtc1 $at, $f5 +/* 8CF328 802412B8 44802000 */ mtc1 $zero, $f4 +/* 8CF32C 802412BC 00000000 */ nop +/* 8CF330 802412C0 46241080 */ add.d $f2, $f2, $f4 +/* 8CF334 802412C4 AE000074 */ sw $zero, 0x74($s0) +/* 8CF338 802412C8 46240000 */ add.d $f0, $f0, $f4 +/* 8CF33C 802412CC AE000090 */ sw $zero, 0x90($s0) +/* 8CF340 802412D0 4620120D */ trunc.w.d $f8, $f2 +/* 8CF344 802412D4 E6080078 */ swc1 $f8, 0x78($s0) +/* 8CF348 802412D8 4620020D */ trunc.w.d $f8, $f0 +/* 8CF34C 802412DC E6080088 */ swc1 $f8, 0x88($s0) +/* 8CF350 802412E0 8E420014 */ lw $v0, 0x14($s2) +/* 8CF354 802412E4 AE220074 */ sw $v0, 0x74($s1) +/* 8CF358 802412E8 8E0200B0 */ lw $v0, 0xb0($s0) +/* 8CF35C 802412EC 34420010 */ ori $v0, $v0, 0x10 +/* 8CF360 802412F0 AE0200B0 */ sw $v0, 0xb0($s0) +/* 8CF364 802412F4 8FBF0034 */ lw $ra, 0x34($sp) +/* 8CF368 802412F8 8FB20030 */ lw $s2, 0x30($sp) +/* 8CF36C 802412FC 8FB1002C */ lw $s1, 0x2c($sp) +/* 8CF370 80241300 8FB00028 */ lw $s0, 0x28($sp) +/* 8CF374 80241304 03E00008 */ jr $ra +/* 8CF378 80241308 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C.s deleted file mode 100644 index 4a6547acbb..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C.s +++ /dev/null @@ -1,133 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C -/* 8CF37C 8024130C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8CF380 80241310 AFB40040 */ sw $s4, 0x40($sp) -/* 8CF384 80241314 0080A02D */ daddu $s4, $a0, $zero -/* 8CF388 80241318 AFBF0048 */ sw $ra, 0x48($sp) -/* 8CF38C 8024131C AFB50044 */ sw $s5, 0x44($sp) -/* 8CF390 80241320 AFB3003C */ sw $s3, 0x3c($sp) -/* 8CF394 80241324 AFB20038 */ sw $s2, 0x38($sp) -/* 8CF398 80241328 AFB10034 */ sw $s1, 0x34($sp) -/* 8CF39C 8024132C AFB00030 */ sw $s0, 0x30($sp) -/* 8CF3A0 80241330 8E920148 */ lw $s2, 0x148($s4) -/* 8CF3A4 80241334 86440008 */ lh $a0, 8($s2) -/* 8CF3A8 80241338 8E90000C */ lw $s0, 0xc($s4) -/* 8CF3AC 8024133C 0C00EABB */ jal get_npc_unsafe -/* 8CF3B0 80241340 00A0882D */ daddu $s1, $a1, $zero -/* 8CF3B4 80241344 0280202D */ daddu $a0, $s4, $zero -/* 8CF3B8 80241348 8E050000 */ lw $a1, ($s0) -/* 8CF3BC 8024134C 0C0B1EAF */ jal get_variable -/* 8CF3C0 80241350 0040A82D */ daddu $s5, $v0, $zero -/* 8CF3C4 80241354 AFA00010 */ sw $zero, 0x10($sp) -/* 8CF3C8 80241358 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF3CC 8024135C 8C630030 */ lw $v1, 0x30($v1) -/* 8CF3D0 80241360 AFA30014 */ sw $v1, 0x14($sp) -/* 8CF3D4 80241364 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF3D8 80241368 8C63001C */ lw $v1, 0x1c($v1) -/* 8CF3DC 8024136C AFA30018 */ sw $v1, 0x18($sp) -/* 8CF3E0 80241370 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF3E4 80241374 8C630024 */ lw $v1, 0x24($v1) -/* 8CF3E8 80241378 AFA3001C */ sw $v1, 0x1c($sp) -/* 8CF3EC 8024137C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF3F0 80241380 8C630028 */ lw $v1, 0x28($v1) -/* 8CF3F4 80241384 27B30010 */ addiu $s3, $sp, 0x10 -/* 8CF3F8 80241388 AFA30020 */ sw $v1, 0x20($sp) -/* 8CF3FC 8024138C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8CF400 80241390 3C0142F0 */ lui $at, 0x42f0 -/* 8CF404 80241394 44810000 */ mtc1 $at, $f0 -/* 8CF408 80241398 8C63002C */ lw $v1, 0x2c($v1) -/* 8CF40C 8024139C 0040802D */ daddu $s0, $v0, $zero -/* 8CF410 802413A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8CF414 802413A4 A7A0002C */ sh $zero, 0x2c($sp) -/* 8CF418 802413A8 12200006 */ beqz $s1, .L802413C4 -/* 8CF41C 802413AC AFA30024 */ sw $v1, 0x24($sp) -/* 8CF420 802413B0 02A0202D */ daddu $a0, $s5, $zero -/* 8CF424 802413B4 0240282D */ daddu $a1, $s2, $zero -/* 8CF428 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8CF42C 802413BC 0C09047A */ jal func_802411E8 -/* 8CF430 802413C0 0200382D */ daddu $a3, $s0, $zero -.L802413C4: -/* 8CF434 802413C4 2402FFFE */ addiu $v0, $zero, -2 -/* 8CF438 802413C8 A2A200AB */ sb $v0, 0xab($s5) -/* 8CF43C 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 8CF440 802413D0 30620004 */ andi $v0, $v1, 4 -/* 8CF444 802413D4 10400007 */ beqz $v0, .L802413F4 -/* 8CF448 802413D8 00000000 */ nop -/* 8CF44C 802413DC 824200B4 */ lb $v0, 0xb4($s2) -/* 8CF450 802413E0 1440003C */ bnez $v0, .L802414D4 -/* 8CF454 802413E4 0000102D */ daddu $v0, $zero, $zero -/* 8CF458 802413E8 2402FFFB */ addiu $v0, $zero, -5 -/* 8CF45C 802413EC 00621024 */ and $v0, $v1, $v0 -/* 8CF460 802413F0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802413F4: -/* 8CF464 802413F4 8E830070 */ lw $v1, 0x70($s4) -/* 8CF468 802413F8 2C62000F */ sltiu $v0, $v1, 0xf -/* 8CF46C 802413FC 10400034 */ beqz $v0, .L802414D0 -/* 8CF470 80241400 00031080 */ sll $v0, $v1, 2 -/* 8CF474 80241404 3C018024 */ lui $at, 0x8024 -/* 8CF478 80241408 00220821 */ addu $at, $at, $v0 -/* 8CF47C 8024140C 8C223458 */ lw $v0, 0x3458($at) -/* 8CF480 80241410 00400008 */ jr $v0 -/* 8CF484 80241414 00000000 */ nop -/* 8CF488 80241418 0280202D */ daddu $a0, $s4, $zero -/* 8CF48C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8CF490 80241420 0C090000 */ jal func_80240000 -/* 8CF494 80241424 0260302D */ daddu $a2, $s3, $zero -/* 8CF498 80241428 0280202D */ daddu $a0, $s4, $zero -/* 8CF49C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4A0 80241430 0C09006C */ jal func_802401B0 -/* 8CF4A4 80241434 0260302D */ daddu $a2, $s3, $zero -/* 8CF4A8 80241438 08090535 */ j .L802414D4 -/* 8CF4AC 8024143C 0000102D */ daddu $v0, $zero, $zero -/* 8CF4B0 80241440 0280202D */ daddu $a0, $s4, $zero -/* 8CF4B4 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8CF4B8 80241448 0C0901F6 */ jal func_802407D8 -/* 8CF4BC 8024144C 0260302D */ daddu $a2, $s3, $zero -/* 8CF4C0 80241450 0280202D */ daddu $a0, $s4, $zero -/* 8CF4C4 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8CF4C8 80241458 0C090226 */ jal func_80240898 -/* 8CF4CC 8024145C 0260302D */ daddu $a2, $s3, $zero -/* 8CF4D0 80241460 08090535 */ j .L802414D4 -/* 8CF4D4 80241464 0000102D */ daddu $v0, $zero, $zero -/* 8CF4D8 80241468 0280202D */ daddu $a0, $s4, $zero -/* 8CF4DC 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4E0 80241470 0C0902F7 */ jal func_80240BDC -/* 8CF4E4 80241474 0260302D */ daddu $a2, $s3, $zero -/* 8CF4E8 80241478 0280202D */ daddu $a0, $s4, $zero -/* 8CF4EC 8024147C 0200282D */ daddu $a1, $s0, $zero -/* 8CF4F0 80241480 0C090315 */ jal func_80240C54 -/* 8CF4F4 80241484 0260302D */ daddu $a2, $s3, $zero -/* 8CF4F8 80241488 08090535 */ j .L802414D4 -/* 8CF4FC 8024148C 0000102D */ daddu $v0, $zero, $zero -/* 8CF500 80241490 0280202D */ daddu $a0, $s4, $zero -/* 8CF504 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8CF508 80241498 0C090330 */ jal func_80240CC0 -/* 8CF50C 8024149C 0260302D */ daddu $a2, $s3, $zero -/* 8CF510 802414A0 08090535 */ j .L802414D4 -/* 8CF514 802414A4 0000102D */ daddu $v0, $zero, $zero -/* 8CF518 802414A8 0280202D */ daddu $a0, $s4, $zero -/* 8CF51C 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8CF520 802414B0 0C09037D */ jal func_80240DF4 -/* 8CF524 802414B4 0260302D */ daddu $a2, $s3, $zero -/* 8CF528 802414B8 08090535 */ j .L802414D4 -/* 8CF52C 802414BC 0000102D */ daddu $v0, $zero, $zero -/* 8CF530 802414C0 0280202D */ daddu $a0, $s4, $zero -/* 8CF534 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8CF538 802414C8 0C090396 */ jal func_80240E58 -/* 8CF53C 802414CC 0260302D */ daddu $a2, $s3, $zero -.L802414D0: -/* 8CF540 802414D0 0000102D */ daddu $v0, $zero, $zero -.L802414D4: -/* 8CF544 802414D4 8FBF0048 */ lw $ra, 0x48($sp) -/* 8CF548 802414D8 8FB50044 */ lw $s5, 0x44($sp) -/* 8CF54C 802414DC 8FB40040 */ lw $s4, 0x40($sp) -/* 8CF550 802414E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8CF554 802414E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8CF558 802414E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8CF55C 802414EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8CF560 802414F0 03E00008 */ jr $ra -/* 8CF564 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 8CF568 802414F8 00000000 */ nop -/* 8CF56C 802414FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s new file mode 100644 index 0000000000..c00da65e95 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CE070/func_8024130C_8CF37C.s @@ -0,0 +1,133 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024130C_8CF37C +/* 8CF37C 8024130C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 8CF380 80241310 AFB40040 */ sw $s4, 0x40($sp) +/* 8CF384 80241314 0080A02D */ daddu $s4, $a0, $zero +/* 8CF388 80241318 AFBF0048 */ sw $ra, 0x48($sp) +/* 8CF38C 8024131C AFB50044 */ sw $s5, 0x44($sp) +/* 8CF390 80241320 AFB3003C */ sw $s3, 0x3c($sp) +/* 8CF394 80241324 AFB20038 */ sw $s2, 0x38($sp) +/* 8CF398 80241328 AFB10034 */ sw $s1, 0x34($sp) +/* 8CF39C 8024132C AFB00030 */ sw $s0, 0x30($sp) +/* 8CF3A0 80241330 8E920148 */ lw $s2, 0x148($s4) +/* 8CF3A4 80241334 86440008 */ lh $a0, 8($s2) +/* 8CF3A8 80241338 8E90000C */ lw $s0, 0xc($s4) +/* 8CF3AC 8024133C 0C00EABB */ jal get_npc_unsafe +/* 8CF3B0 80241340 00A0882D */ daddu $s1, $a1, $zero +/* 8CF3B4 80241344 0280202D */ daddu $a0, $s4, $zero +/* 8CF3B8 80241348 8E050000 */ lw $a1, ($s0) +/* 8CF3BC 8024134C 0C0B1EAF */ jal get_variable +/* 8CF3C0 80241350 0040A82D */ daddu $s5, $v0, $zero +/* 8CF3C4 80241354 AFA00010 */ sw $zero, 0x10($sp) +/* 8CF3C8 80241358 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8CF3CC 8024135C 8C630030 */ lw $v1, 0x30($v1) +/* 8CF3D0 80241360 AFA30014 */ sw $v1, 0x14($sp) +/* 8CF3D4 80241364 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8CF3D8 80241368 8C63001C */ lw $v1, 0x1c($v1) +/* 8CF3DC 8024136C AFA30018 */ sw $v1, 0x18($sp) +/* 8CF3E0 80241370 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8CF3E4 80241374 8C630024 */ lw $v1, 0x24($v1) +/* 8CF3E8 80241378 AFA3001C */ sw $v1, 0x1c($sp) +/* 8CF3EC 8024137C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8CF3F0 80241380 8C630028 */ lw $v1, 0x28($v1) +/* 8CF3F4 80241384 27B30010 */ addiu $s3, $sp, 0x10 +/* 8CF3F8 80241388 AFA30020 */ sw $v1, 0x20($sp) +/* 8CF3FC 8024138C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8CF400 80241390 3C0142F0 */ lui $at, 0x42f0 +/* 8CF404 80241394 44810000 */ mtc1 $at, $f0 +/* 8CF408 80241398 8C63002C */ lw $v1, 0x2c($v1) +/* 8CF40C 8024139C 0040802D */ daddu $s0, $v0, $zero +/* 8CF410 802413A0 E7A00028 */ swc1 $f0, 0x28($sp) +/* 8CF414 802413A4 A7A0002C */ sh $zero, 0x2c($sp) +/* 8CF418 802413A8 12200006 */ beqz $s1, .L802413C4 +/* 8CF41C 802413AC AFA30024 */ sw $v1, 0x24($sp) +/* 8CF420 802413B0 02A0202D */ daddu $a0, $s5, $zero +/* 8CF424 802413B4 0240282D */ daddu $a1, $s2, $zero +/* 8CF428 802413B8 0280302D */ daddu $a2, $s4, $zero +/* 8CF42C 802413BC 0C09047A */ jal func_802411E8_8CF258 +/* 8CF430 802413C0 0200382D */ daddu $a3, $s0, $zero +.L802413C4: +/* 8CF434 802413C4 2402FFFE */ addiu $v0, $zero, -2 +/* 8CF438 802413C8 A2A200AB */ sb $v0, 0xab($s5) +/* 8CF43C 802413CC 8E4300B0 */ lw $v1, 0xb0($s2) +/* 8CF440 802413D0 30620004 */ andi $v0, $v1, 4 +/* 8CF444 802413D4 10400007 */ beqz $v0, .L802413F4 +/* 8CF448 802413D8 00000000 */ nop +/* 8CF44C 802413DC 824200B4 */ lb $v0, 0xb4($s2) +/* 8CF450 802413E0 1440003C */ bnez $v0, .L802414D4 +/* 8CF454 802413E4 0000102D */ daddu $v0, $zero, $zero +/* 8CF458 802413E8 2402FFFB */ addiu $v0, $zero, -5 +/* 8CF45C 802413EC 00621024 */ and $v0, $v1, $v0 +/* 8CF460 802413F0 AE4200B0 */ sw $v0, 0xb0($s2) +.L802413F4: +/* 8CF464 802413F4 8E830070 */ lw $v1, 0x70($s4) +/* 8CF468 802413F8 2C62000F */ sltiu $v0, $v1, 0xf +/* 8CF46C 802413FC 10400034 */ beqz $v0, .L802414D0 +/* 8CF470 80241400 00031080 */ sll $v0, $v1, 2 +/* 8CF474 80241404 3C018024 */ lui $at, 0x8024 +/* 8CF478 80241408 00220821 */ addu $at, $at, $v0 +/* 8CF47C 8024140C 8C223458 */ lw $v0, 0x3458($at) +/* 8CF480 80241410 00400008 */ jr $v0 +/* 8CF484 80241414 00000000 */ nop +/* 8CF488 80241418 0280202D */ daddu $a0, $s4, $zero +/* 8CF48C 8024141C 0200282D */ daddu $a1, $s0, $zero +/* 8CF490 80241420 0C090000 */ jal func_80240000_8CE070 +/* 8CF494 80241424 0260302D */ daddu $a2, $s3, $zero +/* 8CF498 80241428 0280202D */ daddu $a0, $s4, $zero +/* 8CF49C 8024142C 0200282D */ daddu $a1, $s0, $zero +/* 8CF4A0 80241430 0C09006C */ jal func_802401B0_8CE220 +/* 8CF4A4 80241434 0260302D */ daddu $a2, $s3, $zero +/* 8CF4A8 80241438 08090535 */ j .L802414D4 +/* 8CF4AC 8024143C 0000102D */ daddu $v0, $zero, $zero +/* 8CF4B0 80241440 0280202D */ daddu $a0, $s4, $zero +/* 8CF4B4 80241444 0200282D */ daddu $a1, $s0, $zero +/* 8CF4B8 80241448 0C0901F6 */ jal func_802407D8_8CE848 +/* 8CF4BC 8024144C 0260302D */ daddu $a2, $s3, $zero +/* 8CF4C0 80241450 0280202D */ daddu $a0, $s4, $zero +/* 8CF4C4 80241454 0200282D */ daddu $a1, $s0, $zero +/* 8CF4C8 80241458 0C090226 */ jal func_80240898_8CE908 +/* 8CF4CC 8024145C 0260302D */ daddu $a2, $s3, $zero +/* 8CF4D0 80241460 08090535 */ j .L802414D4 +/* 8CF4D4 80241464 0000102D */ daddu $v0, $zero, $zero +/* 8CF4D8 80241468 0280202D */ daddu $a0, $s4, $zero +/* 8CF4DC 8024146C 0200282D */ daddu $a1, $s0, $zero +/* 8CF4E0 80241470 0C0902F7 */ jal func_80240BDC_8CEC4C +/* 8CF4E4 80241474 0260302D */ daddu $a2, $s3, $zero +/* 8CF4E8 80241478 0280202D */ daddu $a0, $s4, $zero +/* 8CF4EC 8024147C 0200282D */ daddu $a1, $s0, $zero +/* 8CF4F0 80241480 0C090315 */ jal func_80240C54_8CECC4 +/* 8CF4F4 80241484 0260302D */ daddu $a2, $s3, $zero +/* 8CF4F8 80241488 08090535 */ j .L802414D4 +/* 8CF4FC 8024148C 0000102D */ daddu $v0, $zero, $zero +/* 8CF500 80241490 0280202D */ daddu $a0, $s4, $zero +/* 8CF504 80241494 0200282D */ daddu $a1, $s0, $zero +/* 8CF508 80241498 0C090330 */ jal func_80240CC0_8CED30 +/* 8CF50C 8024149C 0260302D */ daddu $a2, $s3, $zero +/* 8CF510 802414A0 08090535 */ j .L802414D4 +/* 8CF514 802414A4 0000102D */ daddu $v0, $zero, $zero +/* 8CF518 802414A8 0280202D */ daddu $a0, $s4, $zero +/* 8CF51C 802414AC 0200282D */ daddu $a1, $s0, $zero +/* 8CF520 802414B0 0C09037D */ jal func_80240DF4_8CEE64 +/* 8CF524 802414B4 0260302D */ daddu $a2, $s3, $zero +/* 8CF528 802414B8 08090535 */ j .L802414D4 +/* 8CF52C 802414BC 0000102D */ daddu $v0, $zero, $zero +/* 8CF530 802414C0 0280202D */ daddu $a0, $s4, $zero +/* 8CF534 802414C4 0200282D */ daddu $a1, $s0, $zero +/* 8CF538 802414C8 0C090396 */ jal func_80240E58_8CEEC8 +/* 8CF53C 802414CC 0260302D */ daddu $a2, $s3, $zero +.L802414D0: +/* 8CF540 802414D0 0000102D */ daddu $v0, $zero, $zero +.L802414D4: +/* 8CF544 802414D4 8FBF0048 */ lw $ra, 0x48($sp) +/* 8CF548 802414D8 8FB50044 */ lw $s5, 0x44($sp) +/* 8CF54C 802414DC 8FB40040 */ lw $s4, 0x40($sp) +/* 8CF550 802414E0 8FB3003C */ lw $s3, 0x3c($sp) +/* 8CF554 802414E4 8FB20038 */ lw $s2, 0x38($sp) +/* 8CF558 802414E8 8FB10034 */ lw $s1, 0x34($sp) +/* 8CF55C 802414EC 8FB00030 */ lw $s0, 0x30($sp) +/* 8CF560 802414F0 03E00008 */ jr $ra +/* 8CF564 802414F4 27BD0050 */ addiu $sp, $sp, 0x50 +/* 8CF568 802414F8 00000000 */ nop +/* 8CF56C 802414FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241500.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241500.s deleted file mode 100644 index 84e970b8be..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241500.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241500 -/* 8CF570 80241500 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8CF574 80241504 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8CF578 80241508 4485A000 */ mtc1 $a1, $f20 -/* 8CF57C 8024150C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8CF580 80241510 4486B000 */ mtc1 $a2, $f22 -/* 8CF584 80241514 AFB00010 */ sw $s0, 0x10($sp) -/* 8CF588 80241518 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 8CF58C 8024151C 4487C000 */ mtc1 $a3, $f24 -/* 8CF590 80241520 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CF594 80241524 0C019D28 */ jal guMtxIdentF -/* 8CF598 80241528 0080802D */ daddu $s0, $a0, $zero -/* 8CF59C 8024152C 4616A582 */ mul.s $f22, $f20, $f22 -/* 8CF5A0 80241530 00000000 */ nop -/* 8CF5A4 80241534 4618A502 */ mul.s $f20, $f20, $f24 -/* 8CF5A8 80241538 00000000 */ nop -/* 8CF5AC 8024153C 3C013F80 */ lui $at, 0x3f80 -/* 8CF5B0 80241540 44810000 */ mtc1 $at, $f0 -/* 8CF5B4 80241544 00000000 */ nop -/* 8CF5B8 80241548 E6000014 */ swc1 $f0, 0x14($s0) -/* 8CF5BC 8024154C E6160010 */ swc1 $f22, 0x10($s0) -/* 8CF5C0 80241550 E6140018 */ swc1 $f20, 0x18($s0) -/* 8CF5C4 80241554 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CF5C8 80241558 8FB00010 */ lw $s0, 0x10($sp) -/* 8CF5CC 8024155C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8CF5D0 80241560 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8CF5D4 80241564 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8CF5D8 80241568 03E00008 */ jr $ra -/* 8CF5DC 8024156C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241500_8CF570.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241500_8CF570.s new file mode 100644 index 0000000000..91171b9a21 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241500_8CF570.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241500_8CF570 +/* 8CF570 80241500 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8CF574 80241504 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 8CF578 80241508 4485A000 */ mtc1 $a1, $f20 +/* 8CF57C 8024150C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 8CF580 80241510 4486B000 */ mtc1 $a2, $f22 +/* 8CF584 80241514 AFB00010 */ sw $s0, 0x10($sp) +/* 8CF588 80241518 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 8CF58C 8024151C 4487C000 */ mtc1 $a3, $f24 +/* 8CF590 80241520 AFBF0014 */ sw $ra, 0x14($sp) +/* 8CF594 80241524 0C019D28 */ jal guMtxIdentF +/* 8CF598 80241528 0080802D */ daddu $s0, $a0, $zero +/* 8CF59C 8024152C 4616A582 */ mul.s $f22, $f20, $f22 +/* 8CF5A0 80241530 00000000 */ nop +/* 8CF5A4 80241534 4618A502 */ mul.s $f20, $f20, $f24 +/* 8CF5A8 80241538 00000000 */ nop +/* 8CF5AC 8024153C 3C013F80 */ lui $at, 0x3f80 +/* 8CF5B0 80241540 44810000 */ mtc1 $at, $f0 +/* 8CF5B4 80241544 00000000 */ nop +/* 8CF5B8 80241548 E6000014 */ swc1 $f0, 0x14($s0) +/* 8CF5BC 8024154C E6160010 */ swc1 $f22, 0x10($s0) +/* 8CF5C0 80241550 E6140018 */ swc1 $f20, 0x18($s0) +/* 8CF5C4 80241554 8FBF0014 */ lw $ra, 0x14($sp) +/* 8CF5C8 80241558 8FB00010 */ lw $s0, 0x10($sp) +/* 8CF5CC 8024155C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 8CF5D0 80241560 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 8CF5D4 80241564 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 8CF5D8 80241568 03E00008 */ jr $ra +/* 8CF5DC 8024156C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241570.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241570.s deleted file mode 100644 index 4644480199..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241570.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241570 -/* 8CF5E0 80241570 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8CF5E4 80241574 AFB10054 */ sw $s1, 0x54($sp) -/* 8CF5E8 80241578 0080882D */ daddu $s1, $a0, $zero -/* 8CF5EC 8024157C AFBF005C */ sw $ra, 0x5c($sp) -/* 8CF5F0 80241580 AFB20058 */ sw $s2, 0x58($sp) -/* 8CF5F4 80241584 AFB00050 */ sw $s0, 0x50($sp) -/* 8CF5F8 80241588 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8CF5FC 8024158C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8CF600 80241590 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8CF604 80241594 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8CF608 80241598 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8CF60C 8024159C 8E30000C */ lw $s0, 0xc($s1) -/* 8CF610 802415A0 8E050000 */ lw $a1, ($s0) -/* 8CF614 802415A4 0C0B1EAF */ jal get_variable -/* 8CF618 802415A8 26100004 */ addiu $s0, $s0, 4 -/* 8CF61C 802415AC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8CF620 802415B0 0040202D */ daddu $a0, $v0, $zero -/* 8CF624 802415B4 8E050000 */ lw $a1, ($s0) -/* 8CF628 802415B8 26100004 */ addiu $s0, $s0, 4 -/* 8CF62C 802415BC 0220202D */ daddu $a0, $s1, $zero -/* 8CF630 802415C0 0C0B210B */ jal get_float_variable -/* 8CF634 802415C4 0040902D */ daddu $s2, $v0, $zero -/* 8CF638 802415C8 8E050000 */ lw $a1, ($s0) -/* 8CF63C 802415CC 26100004 */ addiu $s0, $s0, 4 -/* 8CF640 802415D0 0220202D */ daddu $a0, $s1, $zero -/* 8CF644 802415D4 0C0B210B */ jal get_float_variable -/* 8CF648 802415D8 46000706 */ mov.s $f28, $f0 -/* 8CF64C 802415DC 8E050000 */ lw $a1, ($s0) -/* 8CF650 802415E0 26100004 */ addiu $s0, $s0, 4 -/* 8CF654 802415E4 0220202D */ daddu $a0, $s1, $zero -/* 8CF658 802415E8 0C0B210B */ jal get_float_variable -/* 8CF65C 802415EC 46000686 */ mov.s $f26, $f0 -/* 8CF660 802415F0 0220202D */ daddu $a0, $s1, $zero -/* 8CF664 802415F4 8E050000 */ lw $a1, ($s0) -/* 8CF668 802415F8 0C0B210B */ jal get_float_variable -/* 8CF66C 802415FC 46000586 */ mov.s $f22, $f0 -/* 8CF670 80241600 0240202D */ daddu $a0, $s2, $zero -/* 8CF674 80241604 0C046B4C */ jal get_model_from_list_index -/* 8CF678 80241608 46000606 */ mov.s $f24, $f0 -/* 8CF67C 8024160C 0040882D */ daddu $s1, $v0, $zero -/* 8CF680 80241610 96220000 */ lhu $v0, ($s1) -/* 8CF684 80241614 30420400 */ andi $v0, $v0, 0x400 -/* 8CF688 80241618 1440001E */ bnez $v0, .L80241694 -/* 8CF68C 8024161C 26300058 */ addiu $s0, $s1, 0x58 -/* 8CF690 80241620 4480A000 */ mtc1 $zero, $f20 -/* 8CF694 80241624 4406B000 */ mfc1 $a2, $f22 -/* 8CF698 80241628 4405A000 */ mfc1 $a1, $f20 -/* 8CF69C 8024162C 4407A000 */ mfc1 $a3, $f20 -/* 8CF6A0 80241630 0C019E40 */ jal guTranslateF -/* 8CF6A4 80241634 0200202D */ daddu $a0, $s0, $zero -/* 8CF6A8 80241638 4405E000 */ mfc1 $a1, $f28 -/* 8CF6AC 8024163C 4406D000 */ mfc1 $a2, $f26 -/* 8CF6B0 80241640 4407C000 */ mfc1 $a3, $f24 -/* 8CF6B4 80241644 0C090540 */ jal func_80241500 -/* 8CF6B8 80241648 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF6BC 8024164C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF6C0 80241650 0200282D */ daddu $a1, $s0, $zero -/* 8CF6C4 80241654 0C019D80 */ jal guMtxCatF -/* 8CF6C8 80241658 0200302D */ daddu $a2, $s0, $zero -/* 8CF6CC 8024165C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF6D0 80241660 4600B587 */ neg.s $f22, $f22 -/* 8CF6D4 80241664 4405A000 */ mfc1 $a1, $f20 -/* 8CF6D8 80241668 4406B000 */ mfc1 $a2, $f22 -/* 8CF6DC 8024166C 0C019E40 */ jal guTranslateF -/* 8CF6E0 80241670 00A0382D */ daddu $a3, $a1, $zero -/* 8CF6E4 80241674 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF6E8 80241678 0200282D */ daddu $a1, $s0, $zero -/* 8CF6EC 8024167C 0C019D80 */ jal guMtxCatF -/* 8CF6F0 80241680 00A0302D */ daddu $a2, $a1, $zero -/* 8CF6F4 80241684 96220000 */ lhu $v0, ($s1) -/* 8CF6F8 80241688 34421400 */ ori $v0, $v0, 0x1400 -/* 8CF6FC 8024168C 080905C3 */ j .L8024170C -/* 8CF700 80241690 A6220000 */ sh $v0, ($s1) -.L80241694: -/* 8CF704 80241694 4480A000 */ mtc1 $zero, $f20 -/* 8CF708 80241698 4406B000 */ mfc1 $a2, $f22 -/* 8CF70C 8024169C 4405A000 */ mfc1 $a1, $f20 -/* 8CF710 802416A0 4407A000 */ mfc1 $a3, $f20 -/* 8CF714 802416A4 0C019E40 */ jal guTranslateF -/* 8CF718 802416A8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF71C 802416AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF720 802416B0 26300058 */ addiu $s0, $s1, 0x58 -/* 8CF724 802416B4 0200282D */ daddu $a1, $s0, $zero -/* 8CF728 802416B8 0C019D80 */ jal guMtxCatF -/* 8CF72C 802416BC 0200302D */ daddu $a2, $s0, $zero -/* 8CF730 802416C0 4405E000 */ mfc1 $a1, $f28 -/* 8CF734 802416C4 4406D000 */ mfc1 $a2, $f26 -/* 8CF738 802416C8 4407C000 */ mfc1 $a3, $f24 -/* 8CF73C 802416CC 0C090540 */ jal func_80241500 -/* 8CF740 802416D0 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF744 802416D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF748 802416D8 0200282D */ daddu $a1, $s0, $zero -/* 8CF74C 802416DC 0C019D80 */ jal guMtxCatF -/* 8CF750 802416E0 0200302D */ daddu $a2, $s0, $zero -/* 8CF754 802416E4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF758 802416E8 4600B587 */ neg.s $f22, $f22 -/* 8CF75C 802416EC 4405A000 */ mfc1 $a1, $f20 -/* 8CF760 802416F0 4406B000 */ mfc1 $a2, $f22 -/* 8CF764 802416F4 0C019E40 */ jal guTranslateF -/* 8CF768 802416F8 00A0382D */ daddu $a3, $a1, $zero -/* 8CF76C 802416FC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8CF770 80241700 0200282D */ daddu $a1, $s0, $zero -/* 8CF774 80241704 0C019D80 */ jal guMtxCatF -/* 8CF778 80241708 00A0302D */ daddu $a2, $a1, $zero -.L8024170C: -/* 8CF77C 8024170C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8CF780 80241710 8FB20058 */ lw $s2, 0x58($sp) -/* 8CF784 80241714 8FB10054 */ lw $s1, 0x54($sp) -/* 8CF788 80241718 8FB00050 */ lw $s0, 0x50($sp) -/* 8CF78C 8024171C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8CF790 80241720 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8CF794 80241724 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8CF798 80241728 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8CF79C 8024172C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8CF7A0 80241730 24020002 */ addiu $v0, $zero, 2 -/* 8CF7A4 80241734 03E00008 */ jr $ra -/* 8CF7A8 80241738 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241570_8CF5E0.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241570_8CF5E0.s new file mode 100644 index 0000000000..fc236ef3cd --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_80241570_8CF5E0.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241570_8CF5E0 +/* 8CF5E0 80241570 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8CF5E4 80241574 AFB10054 */ sw $s1, 0x54($sp) +/* 8CF5E8 80241578 0080882D */ daddu $s1, $a0, $zero +/* 8CF5EC 8024157C AFBF005C */ sw $ra, 0x5c($sp) +/* 8CF5F0 80241580 AFB20058 */ sw $s2, 0x58($sp) +/* 8CF5F4 80241584 AFB00050 */ sw $s0, 0x50($sp) +/* 8CF5F8 80241588 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8CF5FC 8024158C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8CF600 80241590 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8CF604 80241594 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8CF608 80241598 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8CF60C 8024159C 8E30000C */ lw $s0, 0xc($s1) +/* 8CF610 802415A0 8E050000 */ lw $a1, ($s0) +/* 8CF614 802415A4 0C0B1EAF */ jal get_variable +/* 8CF618 802415A8 26100004 */ addiu $s0, $s0, 4 +/* 8CF61C 802415AC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8CF620 802415B0 0040202D */ daddu $a0, $v0, $zero +/* 8CF624 802415B4 8E050000 */ lw $a1, ($s0) +/* 8CF628 802415B8 26100004 */ addiu $s0, $s0, 4 +/* 8CF62C 802415BC 0220202D */ daddu $a0, $s1, $zero +/* 8CF630 802415C0 0C0B210B */ jal get_float_variable +/* 8CF634 802415C4 0040902D */ daddu $s2, $v0, $zero +/* 8CF638 802415C8 8E050000 */ lw $a1, ($s0) +/* 8CF63C 802415CC 26100004 */ addiu $s0, $s0, 4 +/* 8CF640 802415D0 0220202D */ daddu $a0, $s1, $zero +/* 8CF644 802415D4 0C0B210B */ jal get_float_variable +/* 8CF648 802415D8 46000706 */ mov.s $f28, $f0 +/* 8CF64C 802415DC 8E050000 */ lw $a1, ($s0) +/* 8CF650 802415E0 26100004 */ addiu $s0, $s0, 4 +/* 8CF654 802415E4 0220202D */ daddu $a0, $s1, $zero +/* 8CF658 802415E8 0C0B210B */ jal get_float_variable +/* 8CF65C 802415EC 46000686 */ mov.s $f26, $f0 +/* 8CF660 802415F0 0220202D */ daddu $a0, $s1, $zero +/* 8CF664 802415F4 8E050000 */ lw $a1, ($s0) +/* 8CF668 802415F8 0C0B210B */ jal get_float_variable +/* 8CF66C 802415FC 46000586 */ mov.s $f22, $f0 +/* 8CF670 80241600 0240202D */ daddu $a0, $s2, $zero +/* 8CF674 80241604 0C046B4C */ jal get_model_from_list_index +/* 8CF678 80241608 46000606 */ mov.s $f24, $f0 +/* 8CF67C 8024160C 0040882D */ daddu $s1, $v0, $zero +/* 8CF680 80241610 96220000 */ lhu $v0, ($s1) +/* 8CF684 80241614 30420400 */ andi $v0, $v0, 0x400 +/* 8CF688 80241618 1440001E */ bnez $v0, .L80241694 +/* 8CF68C 8024161C 26300058 */ addiu $s0, $s1, 0x58 +/* 8CF690 80241620 4480A000 */ mtc1 $zero, $f20 +/* 8CF694 80241624 4406B000 */ mfc1 $a2, $f22 +/* 8CF698 80241628 4405A000 */ mfc1 $a1, $f20 +/* 8CF69C 8024162C 4407A000 */ mfc1 $a3, $f20 +/* 8CF6A0 80241630 0C019E40 */ jal guTranslateF +/* 8CF6A4 80241634 0200202D */ daddu $a0, $s0, $zero +/* 8CF6A8 80241638 4405E000 */ mfc1 $a1, $f28 +/* 8CF6AC 8024163C 4406D000 */ mfc1 $a2, $f26 +/* 8CF6B0 80241640 4407C000 */ mfc1 $a3, $f24 +/* 8CF6B4 80241644 0C090540 */ jal func_80241500_8CF570 +/* 8CF6B8 80241648 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF6BC 8024164C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF6C0 80241650 0200282D */ daddu $a1, $s0, $zero +/* 8CF6C4 80241654 0C019D80 */ jal guMtxCatF +/* 8CF6C8 80241658 0200302D */ daddu $a2, $s0, $zero +/* 8CF6CC 8024165C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF6D0 80241660 4600B587 */ neg.s $f22, $f22 +/* 8CF6D4 80241664 4405A000 */ mfc1 $a1, $f20 +/* 8CF6D8 80241668 4406B000 */ mfc1 $a2, $f22 +/* 8CF6DC 8024166C 0C019E40 */ jal guTranslateF +/* 8CF6E0 80241670 00A0382D */ daddu $a3, $a1, $zero +/* 8CF6E4 80241674 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF6E8 80241678 0200282D */ daddu $a1, $s0, $zero +/* 8CF6EC 8024167C 0C019D80 */ jal guMtxCatF +/* 8CF6F0 80241680 00A0302D */ daddu $a2, $a1, $zero +/* 8CF6F4 80241684 96220000 */ lhu $v0, ($s1) +/* 8CF6F8 80241688 34421400 */ ori $v0, $v0, 0x1400 +/* 8CF6FC 8024168C 080905C3 */ j .L8024170C +/* 8CF700 80241690 A6220000 */ sh $v0, ($s1) +.L80241694: +/* 8CF704 80241694 4480A000 */ mtc1 $zero, $f20 +/* 8CF708 80241698 4406B000 */ mfc1 $a2, $f22 +/* 8CF70C 8024169C 4405A000 */ mfc1 $a1, $f20 +/* 8CF710 802416A0 4407A000 */ mfc1 $a3, $f20 +/* 8CF714 802416A4 0C019E40 */ jal guTranslateF +/* 8CF718 802416A8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF71C 802416AC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF720 802416B0 26300058 */ addiu $s0, $s1, 0x58 +/* 8CF724 802416B4 0200282D */ daddu $a1, $s0, $zero +/* 8CF728 802416B8 0C019D80 */ jal guMtxCatF +/* 8CF72C 802416BC 0200302D */ daddu $a2, $s0, $zero +/* 8CF730 802416C0 4405E000 */ mfc1 $a1, $f28 +/* 8CF734 802416C4 4406D000 */ mfc1 $a2, $f26 +/* 8CF738 802416C8 4407C000 */ mfc1 $a3, $f24 +/* 8CF73C 802416CC 0C090540 */ jal func_80241500_8CF570 +/* 8CF740 802416D0 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF744 802416D4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF748 802416D8 0200282D */ daddu $a1, $s0, $zero +/* 8CF74C 802416DC 0C019D80 */ jal guMtxCatF +/* 8CF750 802416E0 0200302D */ daddu $a2, $s0, $zero +/* 8CF754 802416E4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF758 802416E8 4600B587 */ neg.s $f22, $f22 +/* 8CF75C 802416EC 4405A000 */ mfc1 $a1, $f20 +/* 8CF760 802416F0 4406B000 */ mfc1 $a2, $f22 +/* 8CF764 802416F4 0C019E40 */ jal guTranslateF +/* 8CF768 802416F8 00A0382D */ daddu $a3, $a1, $zero +/* 8CF76C 802416FC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8CF770 80241700 0200282D */ daddu $a1, $s0, $zero +/* 8CF774 80241704 0C019D80 */ jal guMtxCatF +/* 8CF778 80241708 00A0302D */ daddu $a2, $a1, $zero +.L8024170C: +/* 8CF77C 8024170C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8CF780 80241710 8FB20058 */ lw $s2, 0x58($sp) +/* 8CF784 80241714 8FB10054 */ lw $s1, 0x54($sp) +/* 8CF788 80241718 8FB00050 */ lw $s0, 0x50($sp) +/* 8CF78C 8024171C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8CF790 80241720 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8CF794 80241724 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8CF798 80241728 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8CF79C 8024172C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8CF7A0 80241730 24020002 */ addiu $v0, $zero, 2 +/* 8CF7A4 80241734 03E00008 */ jr $ra +/* 8CF7A8 80241738 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C.s deleted file mode 100644 index c0f890bafb..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024173C -/* 8CF7AC 8024173C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CF7B0 80241740 AFB00010 */ sw $s0, 0x10($sp) -/* 8CF7B4 80241744 0080802D */ daddu $s0, $a0, $zero -/* 8CF7B8 80241748 AFBF0014 */ sw $ra, 0x14($sp) -/* 8CF7BC 8024174C 0C00FB5A */ jal get_enemy_safe -/* 8CF7C0 80241750 24040006 */ addiu $a0, $zero, 6 -/* 8CF7C4 80241754 14400003 */ bnez $v0, .L80241764 -/* 8CF7C8 80241758 24020001 */ addiu $v0, $zero, 1 -/* 8CF7CC 8024175C 080905DA */ j .L80241768 -/* 8CF7D0 80241760 AE000084 */ sw $zero, 0x84($s0) -.L80241764: -/* 8CF7D4 80241764 AE020084 */ sw $v0, 0x84($s0) -.L80241768: -/* 8CF7D8 80241768 8FBF0014 */ lw $ra, 0x14($sp) -/* 8CF7DC 8024176C 8FB00010 */ lw $s0, 0x10($sp) -/* 8CF7E0 80241770 24020002 */ addiu $v0, $zero, 2 -/* 8CF7E4 80241774 03E00008 */ jr $ra -/* 8CF7E8 80241778 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8CF7EC 8024177C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s new file mode 100644 index 0000000000..4a2b86ff84 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_05/8CF570/func_8024173C_8CF7AC.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024173C_8CF7AC +/* 8CF7AC 8024173C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8CF7B0 80241740 AFB00010 */ sw $s0, 0x10($sp) +/* 8CF7B4 80241744 0080802D */ daddu $s0, $a0, $zero +/* 8CF7B8 80241748 AFBF0014 */ sw $ra, 0x14($sp) +/* 8CF7BC 8024174C 0C00FB5A */ jal get_enemy_safe +/* 8CF7C0 80241750 24040006 */ addiu $a0, $zero, 6 +/* 8CF7C4 80241754 14400003 */ bnez $v0, .L80241764 +/* 8CF7C8 80241758 24020001 */ addiu $v0, $zero, 1 +/* 8CF7CC 8024175C 080905DA */ j .L80241768 +/* 8CF7D0 80241760 AE000084 */ sw $zero, 0x84($s0) +.L80241764: +/* 8CF7D4 80241764 AE020084 */ sw $v0, 0x84($s0) +.L80241768: +/* 8CF7D8 80241768 8FBF0014 */ lw $ra, 0x14($sp) +/* 8CF7DC 8024176C 8FB00010 */ lw $s0, 0x10($sp) +/* 8CF7E0 80241770 24020002 */ addiu $v0, $zero, 2 +/* 8CF7E4 80241774 03E00008 */ jr $ra +/* 8CF7E8 80241778 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8CF7EC 8024177C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s index c456880737..ab694b7555 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D1510/func_8024130C_8D281C.s @@ -46,7 +46,7 @@ glabel func_8024130C_8D281C /* 8D28C0 802413B0 02A0202D */ daddu $a0, $s5, $zero /* 8D28C4 802413B4 0240282D */ daddu $a1, $s2, $zero /* 8D28C8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8D28CC 802413BC 0C09047A */ jal func_802411E8 +/* 8D28CC 802413BC 0C09047A */ jal func_802411E8_8D26F8 /* 8D28D0 802413C0 0200382D */ daddu $a3, $s0, $zero .L802413C4: /* 8D28D4 802413C4 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_8024130C_8D281C /* 8D2924 80241414 00000000 */ nop /* 8D2928 80241418 0280202D */ daddu $a0, $s4, $zero /* 8D292C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8D2930 80241420 0C090000 */ jal func_80240000 +/* 8D2930 80241420 0C090000 */ jal func_80240000_8D1510 /* 8D2934 80241424 0260302D */ daddu $a2, $s3, $zero /* 8D2938 80241428 0280202D */ daddu $a0, $s4, $zero /* 8D293C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8D2940 80241430 0C09006C */ jal func_802401B0 +/* 8D2940 80241430 0C09006C */ jal func_802401B0_8D16C0 /* 8D2944 80241434 0260302D */ daddu $a2, $s3, $zero /* 8D2948 80241438 08090535 */ j .L802414D4 /* 8D294C 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8D2950 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D2954 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D2958 80241448 0C0901F6 */ jal func_802407D8 +/* 8D2958 80241448 0C0901F6 */ jal func_802407D8_8D1CE8 /* 8D295C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D2960 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D2964 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8D2968 80241458 0C090226 */ jal func_80240898 +/* 8D2968 80241458 0C090226 */ jal func_80240898_8D1DA8 /* 8D296C 8024145C 0260302D */ daddu $a2, $s3, $zero /* 8D2970 80241460 08090535 */ j .L802414D4 /* 8D2974 80241464 0000102D */ daddu $v0, $zero, $zero /* 8D2978 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D297C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D2980 80241470 0C0902F7 */ jal func_80240BDC +/* 8D2980 80241470 0C0902F7 */ jal func_80240BDC_8D20EC /* 8D2984 80241474 0260302D */ daddu $a2, $s3, $zero /* 8D2988 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D298C 8024147C 0200282D */ daddu $a1, $s0, $zero -/* 8D2990 80241480 0C090315 */ jal func_80240C54 +/* 8D2990 80241480 0C090315 */ jal func_80240C54_8D2164 /* 8D2994 80241484 0260302D */ daddu $a2, $s3, $zero /* 8D2998 80241488 08090535 */ j .L802414D4 /* 8D299C 8024148C 0000102D */ daddu $v0, $zero, $zero /* 8D29A0 80241490 0280202D */ daddu $a0, $s4, $zero /* 8D29A4 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8D29A8 80241498 0C090330 */ jal func_80240CC0 +/* 8D29A8 80241498 0C090330 */ jal func_80240CC0_8D21D0 /* 8D29AC 8024149C 0260302D */ daddu $a2, $s3, $zero /* 8D29B0 802414A0 08090535 */ j .L802414D4 /* 8D29B4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D29B8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D29BC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D29C0 802414B0 0C09037D */ jal func_80240DF4 +/* 8D29C0 802414B0 0C09037D */ jal func_80240DF4_8D2304 /* 8D29C4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D29C8 802414B8 08090535 */ j .L802414D4 /* 8D29CC 802414BC 0000102D */ daddu $v0, $zero, $zero /* 8D29D0 802414C0 0280202D */ daddu $a0, $s4, $zero /* 8D29D4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8D29D8 802414C8 0C090396 */ jal func_80240E58 +/* 8D29D8 802414C8 0C090396 */ jal func_80240E58_8D2368 /* 8D29DC 802414CC 0260302D */ daddu $a2, $s3, $zero .L802414D0: /* 8D29E0 802414D0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8.s deleted file mode 100644 index 9336c8c641..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A8 -/* 8D2CB8 802417A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D2CBC 802417AC 2402000D */ addiu $v0, $zero, 0xd -/* 8D2CC0 802417B0 AFA20010 */ sw $v0, 0x10($sp) -/* 8D2CC4 802417B4 3C028024 */ lui $v0, 0x8024 -/* 8D2CC8 802417B8 24421500 */ addiu $v0, $v0, 0x1500 -/* 8D2CCC 802417BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D2CD0 802417C0 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D2CD4 802417C4 AFA00018 */ sw $zero, 0x18($sp) -/* 8D2CD8 802417C8 AFA2001C */ sw $v0, 0x1c($sp) -/* 8D2CDC 802417CC 0C047644 */ jal queue_render_task -/* 8D2CE0 802417D0 AFA00014 */ sw $zero, 0x14($sp) -/* 8D2CE4 802417D4 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D2CE8 802417D8 03E00008 */ jr $ra -/* 8D2CEC 802417DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s new file mode 100644 index 0000000000..a656f5f01e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417A8_8D2CB8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417A8_8D2CB8 +/* 8D2CB8 802417A8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8D2CBC 802417AC 2402000D */ addiu $v0, $zero, 0xd +/* 8D2CC0 802417B0 AFA20010 */ sw $v0, 0x10($sp) +/* 8D2CC4 802417B4 3C028024 */ lui $v0, 0x8024 +/* 8D2CC8 802417B8 24421500 */ addiu $v0, $v0, 0x1500 +/* 8D2CCC 802417BC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D2CD0 802417C0 AFBF0020 */ sw $ra, 0x20($sp) +/* 8D2CD4 802417C4 AFA00018 */ sw $zero, 0x18($sp) +/* 8D2CD8 802417C8 AFA2001C */ sw $v0, 0x1c($sp) +/* 8D2CDC 802417CC 0C047644 */ jal queue_render_task +/* 8D2CE0 802417D0 AFA00014 */ sw $zero, 0x14($sp) +/* 8D2CE4 802417D4 8FBF0020 */ lw $ra, 0x20($sp) +/* 8D2CE8 802417D8 03E00008 */ jr $ra +/* 8D2CEC 802417DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0.s deleted file mode 100644 index 3271b9b6ef..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0.s +++ /dev/null @@ -1,96 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417E0 -/* 8D2CF0 802417E0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8D2CF4 802417E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D2CF8 802417E8 0080982D */ daddu $s3, $a0, $zero -/* 8D2CFC 802417EC AFBF0028 */ sw $ra, 0x28($sp) -/* 8D2D00 802417F0 AFB50024 */ sw $s5, 0x24($sp) -/* 8D2D04 802417F4 AFB40020 */ sw $s4, 0x20($sp) -/* 8D2D08 802417F8 AFB20018 */ sw $s2, 0x18($sp) -/* 8D2D0C 802417FC AFB10014 */ sw $s1, 0x14($sp) -/* 8D2D10 80241800 AFB00010 */ sw $s0, 0x10($sp) -/* 8D2D14 80241804 8E62000C */ lw $v0, 0xc($s3) -/* 8D2D18 80241808 0C0B1EAF */ jal get_variable -/* 8D2D1C 8024180C 8C450000 */ lw $a1, ($v0) -/* 8D2D20 80241810 24040048 */ addiu $a0, $zero, 0x48 -/* 8D2D24 80241814 0C00AB39 */ jal heap_malloc -/* 8D2D28 80241818 0040902D */ daddu $s2, $v0, $zero -/* 8D2D2C 8024181C 24040200 */ addiu $a0, $zero, 0x200 -/* 8D2D30 80241820 0C00AB39 */ jal heap_malloc -/* 8D2D34 80241824 0040802D */ daddu $s0, $v0, $zero -/* 8D2D38 80241828 24040020 */ addiu $a0, $zero, 0x20 -/* 8D2D3C 8024182C 0C00AB39 */ jal heap_malloc -/* 8D2D40 80241830 0040A82D */ daddu $s5, $v0, $zero -/* 8D2D44 80241834 02A0302D */ daddu $a2, $s5, $zero -/* 8D2D48 80241838 00129080 */ sll $s2, $s2, 2 -/* 8D2D4C 8024183C 3C11001D */ lui $s1, 0x1d -/* 8D2D50 80241840 2631C310 */ addiu $s1, $s1, -0x3cf0 -/* 8D2D54 80241844 3C013F80 */ lui $at, 0x3f80 -/* 8D2D58 80241848 44810000 */ mtc1 $at, $f0 -/* 8D2D5C 8024184C 26250200 */ addiu $a1, $s1, 0x200 -/* 8D2D60 80241850 AE000008 */ sw $zero, 8($s0) -/* 8D2D64 80241854 AE00000C */ sw $zero, 0xc($s0) -/* 8D2D68 80241858 AE000010 */ sw $zero, 0x10($s0) -/* 8D2D6C 8024185C AE000014 */ sw $zero, 0x14($s0) -/* 8D2D70 80241860 AE000018 */ sw $zero, 0x18($s0) -/* 8D2D74 80241864 AE000028 */ sw $zero, 0x28($s0) -/* 8D2D78 80241868 AE00002C */ sw $zero, 0x2c($s0) -/* 8D2D7C 8024186C AE000030 */ sw $zero, 0x30($s0) -/* 8D2D80 80241870 AE000034 */ sw $zero, 0x34($s0) -/* 8D2D84 80241874 AE000038 */ sw $zero, 0x38($s0) -/* 8D2D88 80241878 AE00003C */ sw $zero, 0x3c($s0) -/* 8D2D8C 8024187C AE000040 */ sw $zero, 0x40($s0) -/* 8D2D90 80241880 AE000044 */ sw $zero, 0x44($s0) -/* 8D2D94 80241884 E600001C */ swc1 $f0, 0x1c($s0) -/* 8D2D98 80241888 E6000020 */ swc1 $f0, 0x20($s0) -/* 8D2D9C 8024188C E6000024 */ swc1 $f0, 0x24($s0) -/* 8D2DA0 80241890 3C038009 */ lui $v1, 0x8009 -/* 8D2DA4 80241894 00721821 */ addu $v1, $v1, $s2 -/* 8D2DA8 80241898 8C63E3D8 */ lw $v1, -0x1c28($v1) -/* 8D2DAC 8024189C 0040A02D */ daddu $s4, $v0, $zero -/* 8D2DB0 802418A0 00712021 */ addu $a0, $v1, $s1 -/* 8D2DB4 802418A4 0C00A5CF */ jal dma_copy -/* 8D2DB8 802418A8 00652821 */ addu $a1, $v1, $a1 -/* 8D2DBC 802418AC 3C058009 */ lui $a1, 0x8009 -/* 8D2DC0 802418B0 00B22821 */ addu $a1, $a1, $s2 -/* 8D2DC4 802418B4 8CA5E94C */ lw $a1, -0x16b4($a1) -/* 8D2DC8 802418B8 0280302D */ daddu $a2, $s4, $zero -/* 8D2DCC 802418BC 00B12021 */ addu $a0, $a1, $s1 -/* 8D2DD0 802418C0 26310020 */ addiu $s1, $s1, 0x20 -/* 8D2DD4 802418C4 0C00A5CF */ jal dma_copy -/* 8D2DD8 802418C8 00B12821 */ addu $a1, $a1, $s1 -/* 8D2DDC 802418CC 0C04E9C1 */ jal func_8013A704 -/* 8D2DE0 802418D0 24040001 */ addiu $a0, $zero, 1 -/* 8D2DE4 802418D4 0000202D */ daddu $a0, $zero, $zero -/* 8D2DE8 802418D8 3C058024 */ lui $a1, 0x8024 -/* 8D2DEC 802418DC 24A517A8 */ addiu $a1, $a1, 0x17a8 -/* 8D2DF0 802418E0 0C048C56 */ jal bind_dynamic_entity_3 -/* 8D2DF4 802418E4 AE020000 */ sw $v0, ($s0) -/* 8D2DF8 802418E8 0260202D */ daddu $a0, $s3, $zero -/* 8D2DFC 802418EC 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2E00 802418F0 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2E04 802418F4 0200302D */ daddu $a2, $s0, $zero -/* 8D2E08 802418F8 0C0B2026 */ jal set_variable -/* 8D2E0C 802418FC ACC20004 */ sw $v0, 4($a2) -/* 8D2E10 80241900 0260202D */ daddu $a0, $s3, $zero -/* 8D2E14 80241904 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2E18 80241908 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8D2E1C 8024190C 0C0B2026 */ jal set_variable -/* 8D2E20 80241910 02A0302D */ daddu $a2, $s5, $zero -/* 8D2E24 80241914 0260202D */ daddu $a0, $s3, $zero -/* 8D2E28 80241918 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2E2C 8024191C 34A50F8C */ ori $a1, $a1, 0xf8c -/* 8D2E30 80241920 0C0B2026 */ jal set_variable -/* 8D2E34 80241924 0280302D */ daddu $a2, $s4, $zero -/* 8D2E38 80241928 8FBF0028 */ lw $ra, 0x28($sp) -/* 8D2E3C 8024192C 8FB50024 */ lw $s5, 0x24($sp) -/* 8D2E40 80241930 8FB40020 */ lw $s4, 0x20($sp) -/* 8D2E44 80241934 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D2E48 80241938 8FB20018 */ lw $s2, 0x18($sp) -/* 8D2E4C 8024193C 8FB10014 */ lw $s1, 0x14($sp) -/* 8D2E50 80241940 8FB00010 */ lw $s0, 0x10($sp) -/* 8D2E54 80241944 24020002 */ addiu $v0, $zero, 2 -/* 8D2E58 80241948 03E00008 */ jr $ra -/* 8D2E5C 8024194C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s new file mode 100644 index 0000000000..c3a82c1f18 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802417E0_8D2CF0.s @@ -0,0 +1,96 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417E0_8D2CF0 +/* 8D2CF0 802417E0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8D2CF4 802417E4 AFB3001C */ sw $s3, 0x1c($sp) +/* 8D2CF8 802417E8 0080982D */ daddu $s3, $a0, $zero +/* 8D2CFC 802417EC AFBF0028 */ sw $ra, 0x28($sp) +/* 8D2D00 802417F0 AFB50024 */ sw $s5, 0x24($sp) +/* 8D2D04 802417F4 AFB40020 */ sw $s4, 0x20($sp) +/* 8D2D08 802417F8 AFB20018 */ sw $s2, 0x18($sp) +/* 8D2D0C 802417FC AFB10014 */ sw $s1, 0x14($sp) +/* 8D2D10 80241800 AFB00010 */ sw $s0, 0x10($sp) +/* 8D2D14 80241804 8E62000C */ lw $v0, 0xc($s3) +/* 8D2D18 80241808 0C0B1EAF */ jal get_variable +/* 8D2D1C 8024180C 8C450000 */ lw $a1, ($v0) +/* 8D2D20 80241810 24040048 */ addiu $a0, $zero, 0x48 +/* 8D2D24 80241814 0C00AB39 */ jal heap_malloc +/* 8D2D28 80241818 0040902D */ daddu $s2, $v0, $zero +/* 8D2D2C 8024181C 24040200 */ addiu $a0, $zero, 0x200 +/* 8D2D30 80241820 0C00AB39 */ jal heap_malloc +/* 8D2D34 80241824 0040802D */ daddu $s0, $v0, $zero +/* 8D2D38 80241828 24040020 */ addiu $a0, $zero, 0x20 +/* 8D2D3C 8024182C 0C00AB39 */ jal heap_malloc +/* 8D2D40 80241830 0040A82D */ daddu $s5, $v0, $zero +/* 8D2D44 80241834 02A0302D */ daddu $a2, $s5, $zero +/* 8D2D48 80241838 00129080 */ sll $s2, $s2, 2 +/* 8D2D4C 8024183C 3C11001D */ lui $s1, 0x1d +/* 8D2D50 80241840 2631C310 */ addiu $s1, $s1, -0x3cf0 +/* 8D2D54 80241844 3C013F80 */ lui $at, 0x3f80 +/* 8D2D58 80241848 44810000 */ mtc1 $at, $f0 +/* 8D2D5C 8024184C 26250200 */ addiu $a1, $s1, 0x200 +/* 8D2D60 80241850 AE000008 */ sw $zero, 8($s0) +/* 8D2D64 80241854 AE00000C */ sw $zero, 0xc($s0) +/* 8D2D68 80241858 AE000010 */ sw $zero, 0x10($s0) +/* 8D2D6C 8024185C AE000014 */ sw $zero, 0x14($s0) +/* 8D2D70 80241860 AE000018 */ sw $zero, 0x18($s0) +/* 8D2D74 80241864 AE000028 */ sw $zero, 0x28($s0) +/* 8D2D78 80241868 AE00002C */ sw $zero, 0x2c($s0) +/* 8D2D7C 8024186C AE000030 */ sw $zero, 0x30($s0) +/* 8D2D80 80241870 AE000034 */ sw $zero, 0x34($s0) +/* 8D2D84 80241874 AE000038 */ sw $zero, 0x38($s0) +/* 8D2D88 80241878 AE00003C */ sw $zero, 0x3c($s0) +/* 8D2D8C 8024187C AE000040 */ sw $zero, 0x40($s0) +/* 8D2D90 80241880 AE000044 */ sw $zero, 0x44($s0) +/* 8D2D94 80241884 E600001C */ swc1 $f0, 0x1c($s0) +/* 8D2D98 80241888 E6000020 */ swc1 $f0, 0x20($s0) +/* 8D2D9C 8024188C E6000024 */ swc1 $f0, 0x24($s0) +/* 8D2DA0 80241890 3C038009 */ lui $v1, 0x8009 +/* 8D2DA4 80241894 00721821 */ addu $v1, $v1, $s2 +/* 8D2DA8 80241898 8C63E3D8 */ lw $v1, -0x1c28($v1) +/* 8D2DAC 8024189C 0040A02D */ daddu $s4, $v0, $zero +/* 8D2DB0 802418A0 00712021 */ addu $a0, $v1, $s1 +/* 8D2DB4 802418A4 0C00A5CF */ jal dma_copy +/* 8D2DB8 802418A8 00652821 */ addu $a1, $v1, $a1 +/* 8D2DBC 802418AC 3C058009 */ lui $a1, 0x8009 +/* 8D2DC0 802418B0 00B22821 */ addu $a1, $a1, $s2 +/* 8D2DC4 802418B4 8CA5E94C */ lw $a1, -0x16b4($a1) +/* 8D2DC8 802418B8 0280302D */ daddu $a2, $s4, $zero +/* 8D2DCC 802418BC 00B12021 */ addu $a0, $a1, $s1 +/* 8D2DD0 802418C0 26310020 */ addiu $s1, $s1, 0x20 +/* 8D2DD4 802418C4 0C00A5CF */ jal dma_copy +/* 8D2DD8 802418C8 00B12821 */ addu $a1, $a1, $s1 +/* 8D2DDC 802418CC 0C04E9C1 */ jal func_8013A704 +/* 8D2DE0 802418D0 24040001 */ addiu $a0, $zero, 1 +/* 8D2DE4 802418D4 0000202D */ daddu $a0, $zero, $zero +/* 8D2DE8 802418D8 3C058024 */ lui $a1, 0x8024 +/* 8D2DEC 802418DC 24A517A8 */ addiu $a1, $a1, 0x17a8 +/* 8D2DF0 802418E0 0C048C56 */ jal bind_dynamic_entity_3 +/* 8D2DF4 802418E4 AE020000 */ sw $v0, ($s0) +/* 8D2DF8 802418E8 0260202D */ daddu $a0, $s3, $zero +/* 8D2DFC 802418EC 3C05FD05 */ lui $a1, 0xfd05 +/* 8D2E00 802418F0 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8D2E04 802418F4 0200302D */ daddu $a2, $s0, $zero +/* 8D2E08 802418F8 0C0B2026 */ jal set_variable +/* 8D2E0C 802418FC ACC20004 */ sw $v0, 4($a2) +/* 8D2E10 80241900 0260202D */ daddu $a0, $s3, $zero +/* 8D2E14 80241904 3C05FD05 */ lui $a1, 0xfd05 +/* 8D2E18 80241908 34A50F8B */ ori $a1, $a1, 0xf8b +/* 8D2E1C 8024190C 0C0B2026 */ jal set_variable +/* 8D2E20 80241910 02A0302D */ daddu $a2, $s5, $zero +/* 8D2E24 80241914 0260202D */ daddu $a0, $s3, $zero +/* 8D2E28 80241918 3C05FD05 */ lui $a1, 0xfd05 +/* 8D2E2C 8024191C 34A50F8C */ ori $a1, $a1, 0xf8c +/* 8D2E30 80241920 0C0B2026 */ jal set_variable +/* 8D2E34 80241924 0280302D */ daddu $a2, $s4, $zero +/* 8D2E38 80241928 8FBF0028 */ lw $ra, 0x28($sp) +/* 8D2E3C 8024192C 8FB50024 */ lw $s5, 0x24($sp) +/* 8D2E40 80241930 8FB40020 */ lw $s4, 0x20($sp) +/* 8D2E44 80241934 8FB3001C */ lw $s3, 0x1c($sp) +/* 8D2E48 80241938 8FB20018 */ lw $s2, 0x18($sp) +/* 8D2E4C 8024193C 8FB10014 */ lw $s1, 0x14($sp) +/* 8D2E50 80241940 8FB00010 */ lw $s0, 0x10($sp) +/* 8D2E54 80241944 24020002 */ addiu $v0, $zero, 2 +/* 8D2E58 80241948 03E00008 */ jr $ra +/* 8D2E5C 8024194C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950.s deleted file mode 100644 index a06d35095e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241950 -/* 8D2E60 80241950 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D2E64 80241954 AFB10014 */ sw $s1, 0x14($sp) -/* 8D2E68 80241958 0080882D */ daddu $s1, $a0, $zero -/* 8D2E6C 8024195C AFBF0018 */ sw $ra, 0x18($sp) -/* 8D2E70 80241960 AFB00010 */ sw $s0, 0x10($sp) -/* 8D2E74 80241964 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 8D2E78 80241968 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8D2E7C 8024196C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8D2E80 80241970 8E30000C */ lw $s0, 0xc($s1) -/* 8D2E84 80241974 8E050000 */ lw $a1, ($s0) -/* 8D2E88 80241978 0C0B210B */ jal get_float_variable -/* 8D2E8C 8024197C 26100004 */ addiu $s0, $s0, 4 -/* 8D2E90 80241980 8E050000 */ lw $a1, ($s0) -/* 8D2E94 80241984 26100004 */ addiu $s0, $s0, 4 -/* 8D2E98 80241988 0220202D */ daddu $a0, $s1, $zero -/* 8D2E9C 8024198C 0C0B210B */ jal get_float_variable -/* 8D2EA0 80241990 46000606 */ mov.s $f24, $f0 -/* 8D2EA4 80241994 0220202D */ daddu $a0, $s1, $zero -/* 8D2EA8 80241998 8E050000 */ lw $a1, ($s0) -/* 8D2EAC 8024199C 0C0B210B */ jal get_float_variable -/* 8D2EB0 802419A0 46000586 */ mov.s $f22, $f0 -/* 8D2EB4 802419A4 0220202D */ daddu $a0, $s1, $zero -/* 8D2EB8 802419A8 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2EBC 802419AC 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2EC0 802419B0 0C0B1EAF */ jal get_variable -/* 8D2EC4 802419B4 46000506 */ mov.s $f20, $f0 -/* 8D2EC8 802419B8 0040182D */ daddu $v1, $v0, $zero -/* 8D2ECC 802419BC E4780008 */ swc1 $f24, 8($v1) -/* 8D2ED0 802419C0 E476000C */ swc1 $f22, 0xc($v1) -/* 8D2ED4 802419C4 E4740010 */ swc1 $f20, 0x10($v1) -/* 8D2ED8 802419C8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8D2EDC 802419CC 8FB10014 */ lw $s1, 0x14($sp) -/* 8D2EE0 802419D0 8FB00010 */ lw $s0, 0x10($sp) -/* 8D2EE4 802419D4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8D2EE8 802419D8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8D2EEC 802419DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8D2EF0 802419E0 24020002 */ addiu $v0, $zero, 2 -/* 8D2EF4 802419E4 03E00008 */ jr $ra -/* 8D2EF8 802419E8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s new file mode 100644 index 0000000000..f015a63b62 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241950_8D2E60.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241950_8D2E60 +/* 8D2E60 80241950 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8D2E64 80241954 AFB10014 */ sw $s1, 0x14($sp) +/* 8D2E68 80241958 0080882D */ daddu $s1, $a0, $zero +/* 8D2E6C 8024195C AFBF0018 */ sw $ra, 0x18($sp) +/* 8D2E70 80241960 AFB00010 */ sw $s0, 0x10($sp) +/* 8D2E74 80241964 F7B80030 */ sdc1 $f24, 0x30($sp) +/* 8D2E78 80241968 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 8D2E7C 8024196C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8D2E80 80241970 8E30000C */ lw $s0, 0xc($s1) +/* 8D2E84 80241974 8E050000 */ lw $a1, ($s0) +/* 8D2E88 80241978 0C0B210B */ jal get_float_variable +/* 8D2E8C 8024197C 26100004 */ addiu $s0, $s0, 4 +/* 8D2E90 80241980 8E050000 */ lw $a1, ($s0) +/* 8D2E94 80241984 26100004 */ addiu $s0, $s0, 4 +/* 8D2E98 80241988 0220202D */ daddu $a0, $s1, $zero +/* 8D2E9C 8024198C 0C0B210B */ jal get_float_variable +/* 8D2EA0 80241990 46000606 */ mov.s $f24, $f0 +/* 8D2EA4 80241994 0220202D */ daddu $a0, $s1, $zero +/* 8D2EA8 80241998 8E050000 */ lw $a1, ($s0) +/* 8D2EAC 8024199C 0C0B210B */ jal get_float_variable +/* 8D2EB0 802419A0 46000586 */ mov.s $f22, $f0 +/* 8D2EB4 802419A4 0220202D */ daddu $a0, $s1, $zero +/* 8D2EB8 802419A8 3C05FD05 */ lui $a1, 0xfd05 +/* 8D2EBC 802419AC 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8D2EC0 802419B0 0C0B1EAF */ jal get_variable +/* 8D2EC4 802419B4 46000506 */ mov.s $f20, $f0 +/* 8D2EC8 802419B8 0040182D */ daddu $v1, $v0, $zero +/* 8D2ECC 802419BC E4780008 */ swc1 $f24, 8($v1) +/* 8D2ED0 802419C0 E476000C */ swc1 $f22, 0xc($v1) +/* 8D2ED4 802419C4 E4740010 */ swc1 $f20, 0x10($v1) +/* 8D2ED8 802419C8 8FBF0018 */ lw $ra, 0x18($sp) +/* 8D2EDC 802419CC 8FB10014 */ lw $s1, 0x14($sp) +/* 8D2EE0 802419D0 8FB00010 */ lw $s0, 0x10($sp) +/* 8D2EE4 802419D4 D7B80030 */ ldc1 $f24, 0x30($sp) +/* 8D2EE8 802419D8 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8D2EEC 802419DC D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8D2EF0 802419E0 24020002 */ addiu $v0, $zero, 2 +/* 8D2EF4 802419E4 03E00008 */ jr $ra +/* 8D2EF8 802419E8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC.s deleted file mode 100644 index 87165da557..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419EC -/* 8D2EFC 802419EC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8D2F00 802419F0 AFB10014 */ sw $s1, 0x14($sp) -/* 8D2F04 802419F4 0080882D */ daddu $s1, $a0, $zero -/* 8D2F08 802419F8 AFBF0018 */ sw $ra, 0x18($sp) -/* 8D2F0C 802419FC AFB00010 */ sw $s0, 0x10($sp) -/* 8D2F10 80241A00 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8D2F14 80241A04 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8D2F18 80241A08 8E30000C */ lw $s0, 0xc($s1) -/* 8D2F1C 80241A0C 8E050000 */ lw $a1, ($s0) -/* 8D2F20 80241A10 0C0B210B */ jal get_float_variable -/* 8D2F24 80241A14 26100004 */ addiu $s0, $s0, 4 -/* 8D2F28 80241A18 0220202D */ daddu $a0, $s1, $zero -/* 8D2F2C 80241A1C 8E050000 */ lw $a1, ($s0) -/* 8D2F30 80241A20 0C0B210B */ jal get_float_variable -/* 8D2F34 80241A24 46000586 */ mov.s $f22, $f0 -/* 8D2F38 80241A28 0220202D */ daddu $a0, $s1, $zero -/* 8D2F3C 80241A2C 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2F40 80241A30 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2F44 80241A34 0C0B1EAF */ jal get_variable -/* 8D2F48 80241A38 46000506 */ mov.s $f20, $f0 -/* 8D2F4C 80241A3C 0040182D */ daddu $v1, $v0, $zero -/* 8D2F50 80241A40 E4760014 */ swc1 $f22, 0x14($v1) -/* 8D2F54 80241A44 E4740018 */ swc1 $f20, 0x18($v1) -/* 8D2F58 80241A48 8FBF0018 */ lw $ra, 0x18($sp) -/* 8D2F5C 80241A4C 8FB10014 */ lw $s1, 0x14($sp) -/* 8D2F60 80241A50 8FB00010 */ lw $s0, 0x10($sp) -/* 8D2F64 80241A54 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8D2F68 80241A58 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8D2F6C 80241A5C 24020002 */ addiu $v0, $zero, 2 -/* 8D2F70 80241A60 03E00008 */ jr $ra -/* 8D2F74 80241A64 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s new file mode 100644 index 0000000000..83e471f750 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_802419EC_8D2EFC.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419EC_8D2EFC +/* 8D2EFC 802419EC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8D2F00 802419F0 AFB10014 */ sw $s1, 0x14($sp) +/* 8D2F04 802419F4 0080882D */ daddu $s1, $a0, $zero +/* 8D2F08 802419F8 AFBF0018 */ sw $ra, 0x18($sp) +/* 8D2F0C 802419FC AFB00010 */ sw $s0, 0x10($sp) +/* 8D2F10 80241A00 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 8D2F14 80241A04 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8D2F18 80241A08 8E30000C */ lw $s0, 0xc($s1) +/* 8D2F1C 80241A0C 8E050000 */ lw $a1, ($s0) +/* 8D2F20 80241A10 0C0B210B */ jal get_float_variable +/* 8D2F24 80241A14 26100004 */ addiu $s0, $s0, 4 +/* 8D2F28 80241A18 0220202D */ daddu $a0, $s1, $zero +/* 8D2F2C 80241A1C 8E050000 */ lw $a1, ($s0) +/* 8D2F30 80241A20 0C0B210B */ jal get_float_variable +/* 8D2F34 80241A24 46000586 */ mov.s $f22, $f0 +/* 8D2F38 80241A28 0220202D */ daddu $a0, $s1, $zero +/* 8D2F3C 80241A2C 3C05FD05 */ lui $a1, 0xfd05 +/* 8D2F40 80241A30 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8D2F44 80241A34 0C0B1EAF */ jal get_variable +/* 8D2F48 80241A38 46000506 */ mov.s $f20, $f0 +/* 8D2F4C 80241A3C 0040182D */ daddu $v1, $v0, $zero +/* 8D2F50 80241A40 E4760014 */ swc1 $f22, 0x14($v1) +/* 8D2F54 80241A44 E4740018 */ swc1 $f20, 0x18($v1) +/* 8D2F58 80241A48 8FBF0018 */ lw $ra, 0x18($sp) +/* 8D2F5C 80241A4C 8FB10014 */ lw $s1, 0x14($sp) +/* 8D2F60 80241A50 8FB00010 */ lw $s0, 0x10($sp) +/* 8D2F64 80241A54 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8D2F68 80241A58 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8D2F6C 80241A5C 24020002 */ addiu $v0, $zero, 2 +/* 8D2F70 80241A60 03E00008 */ jr $ra +/* 8D2F74 80241A64 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68.s deleted file mode 100644 index 70c9239370..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A68 -/* 8D2F78 80241A68 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8D2F7C 80241A6C AFB3001C */ sw $s3, 0x1c($sp) -/* 8D2F80 80241A70 0080982D */ daddu $s3, $a0, $zero -/* 8D2F84 80241A74 AFB00010 */ sw $s0, 0x10($sp) -/* 8D2F88 80241A78 00A0802D */ daddu $s0, $a1, $zero -/* 8D2F8C 80241A7C 3C05FD05 */ lui $a1, 0xfd05 -/* 8D2F90 80241A80 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D2F94 80241A84 AFB20018 */ sw $s2, 0x18($sp) -/* 8D2F98 80241A88 AFB10014 */ sw $s1, 0x14($sp) -/* 8D2F9C 80241A8C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8D2FA0 80241A90 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8D2FA4 80241A94 8E72000C */ lw $s2, 0xc($s3) -/* 8D2FA8 80241A98 0C0B1EAF */ jal get_variable -/* 8D2FAC 80241A9C 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D2FB0 80241AA0 12000002 */ beqz $s0, .L80241AAC -/* 8D2FB4 80241AA4 0040882D */ daddu $s1, $v0, $zero -/* 8D2FB8 80241AA8 AE600070 */ sw $zero, 0x70($s3) -.L80241AAC: -/* 8D2FBC 80241AAC 8E620070 */ lw $v0, 0x70($s3) -/* 8D2FC0 80241AB0 14400042 */ bnez $v0, .L80241BBC -/* 8D2FC4 80241AB4 00000000 */ nop -/* 8D2FC8 80241AB8 8E450000 */ lw $a1, ($s2) -/* 8D2FCC 80241ABC 26520004 */ addiu $s2, $s2, 4 -/* 8D2FD0 80241AC0 0C0B210B */ jal get_float_variable -/* 8D2FD4 80241AC4 0260202D */ daddu $a0, $s3, $zero -/* 8D2FD8 80241AC8 8E450000 */ lw $a1, ($s2) -/* 8D2FDC 80241ACC 26520004 */ addiu $s2, $s2, 4 -/* 8D2FE0 80241AD0 0260202D */ daddu $a0, $s3, $zero -/* 8D2FE4 80241AD4 0C0B210B */ jal get_float_variable -/* 8D2FE8 80241AD8 46000506 */ mov.s $f20, $f0 -/* 8D2FEC 80241ADC 8E450000 */ lw $a1, ($s2) -/* 8D2FF0 80241AE0 26520004 */ addiu $s2, $s2, 4 -/* 8D2FF4 80241AE4 3C014140 */ lui $at, 0x4140 -/* 8D2FF8 80241AE8 44811000 */ mtc1 $at, $f2 -/* 8D2FFC 80241AEC 0260202D */ daddu $a0, $s3, $zero -/* 8D3000 80241AF0 0C0B210B */ jal get_float_variable -/* 8D3004 80241AF4 46020580 */ add.s $f22, $f0, $f2 -/* 8D3008 80241AF8 E6340028 */ swc1 $f20, 0x28($s1) -/* 8D300C 80241AFC E6200030 */ swc1 $f0, 0x30($s1) -/* 8D3010 80241B00 E636002C */ swc1 $f22, 0x2c($s1) -/* 8D3014 80241B04 8E450000 */ lw $a1, ($s2) -/* 8D3018 80241B08 0C0B1EAF */ jal get_variable -/* 8D301C 80241B0C 0260202D */ daddu $a0, $s3, $zero -/* 8D3020 80241B10 C62C0008 */ lwc1 $f12, 8($s1) -/* 8D3024 80241B14 C62E0010 */ lwc1 $f14, 0x10($s1) -/* 8D3028 80241B18 8E260028 */ lw $a2, 0x28($s1) -/* 8D302C 80241B1C 8E270030 */ lw $a3, 0x30($s1) -/* 8D3030 80241B20 0C00A7B5 */ jal dist2D -/* 8D3034 80241B24 AE220044 */ sw $v0, 0x44($s1) -/* 8D3038 80241B28 C62C0008 */ lwc1 $f12, 8($s1) -/* 8D303C 80241B2C C62E0010 */ lwc1 $f14, 0x10($s1) -/* 8D3040 80241B30 8E260028 */ lw $a2, 0x28($s1) -/* 8D3044 80241B34 8E270030 */ lw $a3, 0x30($s1) -/* 8D3048 80241B38 0C00A720 */ jal atan2 -/* 8D304C 80241B3C 46000506 */ mov.s $f20, $f0 -/* 8D3050 80241B40 C622002C */ lwc1 $f2, 0x2c($s1) -/* 8D3054 80241B44 E6200034 */ swc1 $f0, 0x34($s1) -/* 8D3058 80241B48 C620000C */ lwc1 $f0, 0xc($s1) -/* 8D305C 80241B4C 8E220044 */ lw $v0, 0x44($s1) -/* 8D3060 80241B50 14400006 */ bnez $v0, .L80241B6C -/* 8D3064 80241B54 46001581 */ sub.s $f22, $f2, $f0 -/* 8D3068 80241B58 C6200038 */ lwc1 $f0, 0x38($s1) -/* 8D306C 80241B5C 4600A003 */ div.s $f0, $f20, $f0 -/* 8D3070 80241B60 4600020D */ trunc.w.s $f8, $f0 -/* 8D3074 80241B64 080906E0 */ j .L80241B80 -/* 8D3078 80241B68 E6280044 */ swc1 $f8, 0x44($s1) -.L80241B6C: -/* 8D307C 80241B6C 44820000 */ mtc1 $v0, $f0 -/* 8D3080 80241B70 00000000 */ nop -/* 8D3084 80241B74 46800020 */ cvt.s.w $f0, $f0 -/* 8D3088 80241B78 4600A003 */ div.s $f0, $f20, $f0 -/* 8D308C 80241B7C E6200038 */ swc1 $f0, 0x38($s1) -.L80241B80: -/* 8D3090 80241B80 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8D3094 80241B84 C6220044 */ lwc1 $f2, 0x44($s1) -/* 8D3098 80241B88 468010A0 */ cvt.s.w $f2, $f2 -/* 8D309C 80241B8C 46020002 */ mul.s $f0, $f0, $f2 -/* 8D30A0 80241B90 00000000 */ nop -/* 8D30A4 80241B94 3C013F00 */ lui $at, 0x3f00 -/* 8D30A8 80241B98 44812000 */ mtc1 $at, $f4 -/* 8D30AC 80241B9C 00000000 */ nop -/* 8D30B0 80241BA0 46040002 */ mul.s $f0, $f0, $f4 -/* 8D30B4 80241BA4 00000000 */ nop -/* 8D30B8 80241BA8 4602B083 */ div.s $f2, $f22, $f2 -/* 8D30BC 80241BAC 46020000 */ add.s $f0, $f0, $f2 -/* 8D30C0 80241BB0 24020001 */ addiu $v0, $zero, 1 -/* 8D30C4 80241BB4 E620003C */ swc1 $f0, 0x3c($s1) -/* 8D30C8 80241BB8 AE620070 */ sw $v0, 0x70($s3) -.L80241BBC: -/* 8D30CC 80241BBC 0C00A8BB */ jal sin_deg -/* 8D30D0 80241BC0 C62C0034 */ lwc1 $f12, 0x34($s1) -/* 8D30D4 80241BC4 C6220038 */ lwc1 $f2, 0x38($s1) -/* 8D30D8 80241BC8 46001082 */ mul.s $f2, $f2, $f0 -/* 8D30DC 80241BCC 00000000 */ nop -/* 8D30E0 80241BD0 C6200008 */ lwc1 $f0, 8($s1) -/* 8D30E4 80241BD4 46020000 */ add.s $f0, $f0, $f2 -/* 8D30E8 80241BD8 C62C0034 */ lwc1 $f12, 0x34($s1) -/* 8D30EC 80241BDC 0C00A8D4 */ jal cos_deg -/* 8D30F0 80241BE0 E6200008 */ swc1 $f0, 8($s1) -/* 8D30F4 80241BE4 C6260038 */ lwc1 $f6, 0x38($s1) -/* 8D30F8 80241BE8 46003182 */ mul.s $f6, $f6, $f0 -/* 8D30FC 80241BEC 00000000 */ nop -/* 8D3100 80241BF0 C620003C */ lwc1 $f0, 0x3c($s1) -/* 8D3104 80241BF4 C624000C */ lwc1 $f4, 0xc($s1) -/* 8D3108 80241BF8 46000086 */ mov.s $f2, $f0 -/* 8D310C 80241BFC 46002100 */ add.s $f4, $f4, $f0 -/* 8D3110 80241C00 C6200040 */ lwc1 $f0, 0x40($s1) -/* 8D3114 80241C04 8E220044 */ lw $v0, 0x44($s1) -/* 8D3118 80241C08 46001081 */ sub.s $f2, $f2, $f0 -/* 8D311C 80241C0C C6200010 */ lwc1 $f0, 0x10($s1) -/* 8D3120 80241C10 2442FFFF */ addiu $v0, $v0, -1 -/* 8D3124 80241C14 AE220044 */ sw $v0, 0x44($s1) -/* 8D3128 80241C18 46060001 */ sub.s $f0, $f0, $f6 -/* 8D312C 80241C1C E624000C */ swc1 $f4, 0xc($s1) -/* 8D3130 80241C20 E622003C */ swc1 $f2, 0x3c($s1) -/* 8D3134 80241C24 04400003 */ bltz $v0, .L80241C34 -/* 8D3138 80241C28 E6200010 */ swc1 $f0, 0x10($s1) -/* 8D313C 80241C2C 08090715 */ j .L80241C54 -/* 8D3140 80241C30 0000102D */ daddu $v0, $zero, $zero -.L80241C34: -/* 8D3144 80241C34 C6200028 */ lwc1 $f0, 0x28($s1) -/* 8D3148 80241C38 C622002C */ lwc1 $f2, 0x2c($s1) -/* 8D314C 80241C3C C6240030 */ lwc1 $f4, 0x30($s1) -/* 8D3150 80241C40 24020001 */ addiu $v0, $zero, 1 -/* 8D3154 80241C44 AE20003C */ sw $zero, 0x3c($s1) -/* 8D3158 80241C48 E6200008 */ swc1 $f0, 8($s1) -/* 8D315C 80241C4C E622000C */ swc1 $f2, 0xc($s1) -/* 8D3160 80241C50 E6240010 */ swc1 $f4, 0x10($s1) -.L80241C54: -/* 8D3164 80241C54 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D3168 80241C58 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D316C 80241C5C 8FB20018 */ lw $s2, 0x18($sp) -/* 8D3170 80241C60 8FB10014 */ lw $s1, 0x14($sp) -/* 8D3174 80241C64 8FB00010 */ lw $s0, 0x10($sp) -/* 8D3178 80241C68 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8D317C 80241C6C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8D3180 80241C70 03E00008 */ jr $ra -/* 8D3184 80241C74 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s new file mode 100644 index 0000000000..6e36e850ce --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241A68_8D2F78.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A68_8D2F78 +/* 8D2F78 80241A68 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8D2F7C 80241A6C AFB3001C */ sw $s3, 0x1c($sp) +/* 8D2F80 80241A70 0080982D */ daddu $s3, $a0, $zero +/* 8D2F84 80241A74 AFB00010 */ sw $s0, 0x10($sp) +/* 8D2F88 80241A78 00A0802D */ daddu $s0, $a1, $zero +/* 8D2F8C 80241A7C 3C05FD05 */ lui $a1, 0xfd05 +/* 8D2F90 80241A80 AFBF0020 */ sw $ra, 0x20($sp) +/* 8D2F94 80241A84 AFB20018 */ sw $s2, 0x18($sp) +/* 8D2F98 80241A88 AFB10014 */ sw $s1, 0x14($sp) +/* 8D2F9C 80241A8C F7B60030 */ sdc1 $f22, 0x30($sp) +/* 8D2FA0 80241A90 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8D2FA4 80241A94 8E72000C */ lw $s2, 0xc($s3) +/* 8D2FA8 80241A98 0C0B1EAF */ jal get_variable +/* 8D2FAC 80241A9C 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8D2FB0 80241AA0 12000002 */ beqz $s0, .L80241AAC +/* 8D2FB4 80241AA4 0040882D */ daddu $s1, $v0, $zero +/* 8D2FB8 80241AA8 AE600070 */ sw $zero, 0x70($s3) +.L80241AAC: +/* 8D2FBC 80241AAC 8E620070 */ lw $v0, 0x70($s3) +/* 8D2FC0 80241AB0 14400042 */ bnez $v0, .L80241BBC +/* 8D2FC4 80241AB4 00000000 */ nop +/* 8D2FC8 80241AB8 8E450000 */ lw $a1, ($s2) +/* 8D2FCC 80241ABC 26520004 */ addiu $s2, $s2, 4 +/* 8D2FD0 80241AC0 0C0B210B */ jal get_float_variable +/* 8D2FD4 80241AC4 0260202D */ daddu $a0, $s3, $zero +/* 8D2FD8 80241AC8 8E450000 */ lw $a1, ($s2) +/* 8D2FDC 80241ACC 26520004 */ addiu $s2, $s2, 4 +/* 8D2FE0 80241AD0 0260202D */ daddu $a0, $s3, $zero +/* 8D2FE4 80241AD4 0C0B210B */ jal get_float_variable +/* 8D2FE8 80241AD8 46000506 */ mov.s $f20, $f0 +/* 8D2FEC 80241ADC 8E450000 */ lw $a1, ($s2) +/* 8D2FF0 80241AE0 26520004 */ addiu $s2, $s2, 4 +/* 8D2FF4 80241AE4 3C014140 */ lui $at, 0x4140 +/* 8D2FF8 80241AE8 44811000 */ mtc1 $at, $f2 +/* 8D2FFC 80241AEC 0260202D */ daddu $a0, $s3, $zero +/* 8D3000 80241AF0 0C0B210B */ jal get_float_variable +/* 8D3004 80241AF4 46020580 */ add.s $f22, $f0, $f2 +/* 8D3008 80241AF8 E6340028 */ swc1 $f20, 0x28($s1) +/* 8D300C 80241AFC E6200030 */ swc1 $f0, 0x30($s1) +/* 8D3010 80241B00 E636002C */ swc1 $f22, 0x2c($s1) +/* 8D3014 80241B04 8E450000 */ lw $a1, ($s2) +/* 8D3018 80241B08 0C0B1EAF */ jal get_variable +/* 8D301C 80241B0C 0260202D */ daddu $a0, $s3, $zero +/* 8D3020 80241B10 C62C0008 */ lwc1 $f12, 8($s1) +/* 8D3024 80241B14 C62E0010 */ lwc1 $f14, 0x10($s1) +/* 8D3028 80241B18 8E260028 */ lw $a2, 0x28($s1) +/* 8D302C 80241B1C 8E270030 */ lw $a3, 0x30($s1) +/* 8D3030 80241B20 0C00A7B5 */ jal dist2D +/* 8D3034 80241B24 AE220044 */ sw $v0, 0x44($s1) +/* 8D3038 80241B28 C62C0008 */ lwc1 $f12, 8($s1) +/* 8D303C 80241B2C C62E0010 */ lwc1 $f14, 0x10($s1) +/* 8D3040 80241B30 8E260028 */ lw $a2, 0x28($s1) +/* 8D3044 80241B34 8E270030 */ lw $a3, 0x30($s1) +/* 8D3048 80241B38 0C00A720 */ jal atan2 +/* 8D304C 80241B3C 46000506 */ mov.s $f20, $f0 +/* 8D3050 80241B40 C622002C */ lwc1 $f2, 0x2c($s1) +/* 8D3054 80241B44 E6200034 */ swc1 $f0, 0x34($s1) +/* 8D3058 80241B48 C620000C */ lwc1 $f0, 0xc($s1) +/* 8D305C 80241B4C 8E220044 */ lw $v0, 0x44($s1) +/* 8D3060 80241B50 14400006 */ bnez $v0, .L80241B6C +/* 8D3064 80241B54 46001581 */ sub.s $f22, $f2, $f0 +/* 8D3068 80241B58 C6200038 */ lwc1 $f0, 0x38($s1) +/* 8D306C 80241B5C 4600A003 */ div.s $f0, $f20, $f0 +/* 8D3070 80241B60 4600020D */ trunc.w.s $f8, $f0 +/* 8D3074 80241B64 080906E0 */ j .L80241B80 +/* 8D3078 80241B68 E6280044 */ swc1 $f8, 0x44($s1) +.L80241B6C: +/* 8D307C 80241B6C 44820000 */ mtc1 $v0, $f0 +/* 8D3080 80241B70 00000000 */ nop +/* 8D3084 80241B74 46800020 */ cvt.s.w $f0, $f0 +/* 8D3088 80241B78 4600A003 */ div.s $f0, $f20, $f0 +/* 8D308C 80241B7C E6200038 */ swc1 $f0, 0x38($s1) +.L80241B80: +/* 8D3090 80241B80 C6200040 */ lwc1 $f0, 0x40($s1) +/* 8D3094 80241B84 C6220044 */ lwc1 $f2, 0x44($s1) +/* 8D3098 80241B88 468010A0 */ cvt.s.w $f2, $f2 +/* 8D309C 80241B8C 46020002 */ mul.s $f0, $f0, $f2 +/* 8D30A0 80241B90 00000000 */ nop +/* 8D30A4 80241B94 3C013F00 */ lui $at, 0x3f00 +/* 8D30A8 80241B98 44812000 */ mtc1 $at, $f4 +/* 8D30AC 80241B9C 00000000 */ nop +/* 8D30B0 80241BA0 46040002 */ mul.s $f0, $f0, $f4 +/* 8D30B4 80241BA4 00000000 */ nop +/* 8D30B8 80241BA8 4602B083 */ div.s $f2, $f22, $f2 +/* 8D30BC 80241BAC 46020000 */ add.s $f0, $f0, $f2 +/* 8D30C0 80241BB0 24020001 */ addiu $v0, $zero, 1 +/* 8D30C4 80241BB4 E620003C */ swc1 $f0, 0x3c($s1) +/* 8D30C8 80241BB8 AE620070 */ sw $v0, 0x70($s3) +.L80241BBC: +/* 8D30CC 80241BBC 0C00A8BB */ jal sin_deg +/* 8D30D0 80241BC0 C62C0034 */ lwc1 $f12, 0x34($s1) +/* 8D30D4 80241BC4 C6220038 */ lwc1 $f2, 0x38($s1) +/* 8D30D8 80241BC8 46001082 */ mul.s $f2, $f2, $f0 +/* 8D30DC 80241BCC 00000000 */ nop +/* 8D30E0 80241BD0 C6200008 */ lwc1 $f0, 8($s1) +/* 8D30E4 80241BD4 46020000 */ add.s $f0, $f0, $f2 +/* 8D30E8 80241BD8 C62C0034 */ lwc1 $f12, 0x34($s1) +/* 8D30EC 80241BDC 0C00A8D4 */ jal cos_deg +/* 8D30F0 80241BE0 E6200008 */ swc1 $f0, 8($s1) +/* 8D30F4 80241BE4 C6260038 */ lwc1 $f6, 0x38($s1) +/* 8D30F8 80241BE8 46003182 */ mul.s $f6, $f6, $f0 +/* 8D30FC 80241BEC 00000000 */ nop +/* 8D3100 80241BF0 C620003C */ lwc1 $f0, 0x3c($s1) +/* 8D3104 80241BF4 C624000C */ lwc1 $f4, 0xc($s1) +/* 8D3108 80241BF8 46000086 */ mov.s $f2, $f0 +/* 8D310C 80241BFC 46002100 */ add.s $f4, $f4, $f0 +/* 8D3110 80241C00 C6200040 */ lwc1 $f0, 0x40($s1) +/* 8D3114 80241C04 8E220044 */ lw $v0, 0x44($s1) +/* 8D3118 80241C08 46001081 */ sub.s $f2, $f2, $f0 +/* 8D311C 80241C0C C6200010 */ lwc1 $f0, 0x10($s1) +/* 8D3120 80241C10 2442FFFF */ addiu $v0, $v0, -1 +/* 8D3124 80241C14 AE220044 */ sw $v0, 0x44($s1) +/* 8D3128 80241C18 46060001 */ sub.s $f0, $f0, $f6 +/* 8D312C 80241C1C E624000C */ swc1 $f4, 0xc($s1) +/* 8D3130 80241C20 E622003C */ swc1 $f2, 0x3c($s1) +/* 8D3134 80241C24 04400003 */ bltz $v0, .L80241C34 +/* 8D3138 80241C28 E6200010 */ swc1 $f0, 0x10($s1) +/* 8D313C 80241C2C 08090715 */ j .L80241C54 +/* 8D3140 80241C30 0000102D */ daddu $v0, $zero, $zero +.L80241C34: +/* 8D3144 80241C34 C6200028 */ lwc1 $f0, 0x28($s1) +/* 8D3148 80241C38 C622002C */ lwc1 $f2, 0x2c($s1) +/* 8D314C 80241C3C C6240030 */ lwc1 $f4, 0x30($s1) +/* 8D3150 80241C40 24020001 */ addiu $v0, $zero, 1 +/* 8D3154 80241C44 AE20003C */ sw $zero, 0x3c($s1) +/* 8D3158 80241C48 E6200008 */ swc1 $f0, 8($s1) +/* 8D315C 80241C4C E622000C */ swc1 $f2, 0xc($s1) +/* 8D3160 80241C50 E6240010 */ swc1 $f4, 0x10($s1) +.L80241C54: +/* 8D3164 80241C54 8FBF0020 */ lw $ra, 0x20($sp) +/* 8D3168 80241C58 8FB3001C */ lw $s3, 0x1c($sp) +/* 8D316C 80241C5C 8FB20018 */ lw $s2, 0x18($sp) +/* 8D3170 80241C60 8FB10014 */ lw $s1, 0x14($sp) +/* 8D3174 80241C64 8FB00010 */ lw $s0, 0x10($sp) +/* 8D3178 80241C68 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 8D317C 80241C6C D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8D3180 80241C70 03E00008 */ jr $ra +/* 8D3184 80241C74 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78.s deleted file mode 100644 index 833512d0f1..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C78 -/* 8D3188 80241C78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D318C 80241C7C AFB00010 */ sw $s0, 0x10($sp) -/* 8D3190 80241C80 0080802D */ daddu $s0, $a0, $zero -/* 8D3194 80241C84 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D3198 80241C88 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8D319C 80241C8C 8E02000C */ lw $v0, 0xc($s0) -/* 8D31A0 80241C90 0C0B210B */ jal get_float_variable -/* 8D31A4 80241C94 8C450000 */ lw $a1, ($v0) -/* 8D31A8 80241C98 0200202D */ daddu $a0, $s0, $zero -/* 8D31AC 80241C9C 3C05FD05 */ lui $a1, 0xfd05 -/* 8D31B0 80241CA0 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D31B4 80241CA4 0C0B1EAF */ jal get_variable -/* 8D31B8 80241CA8 46000506 */ mov.s $f20, $f0 -/* 8D31BC 80241CAC E4540040 */ swc1 $f20, 0x40($v0) -/* 8D31C0 80241CB0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D31C4 80241CB4 8FB00010 */ lw $s0, 0x10($sp) -/* 8D31C8 80241CB8 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8D31CC 80241CBC 24020002 */ addiu $v0, $zero, 2 -/* 8D31D0 80241CC0 03E00008 */ jr $ra -/* 8D31D4 80241CC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s new file mode 100644 index 0000000000..950a526db8 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241C78_8D3188.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C78_8D3188 +/* 8D3188 80241C78 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8D318C 80241C7C AFB00010 */ sw $s0, 0x10($sp) +/* 8D3190 80241C80 0080802D */ daddu $s0, $a0, $zero +/* 8D3194 80241C84 AFBF0014 */ sw $ra, 0x14($sp) +/* 8D3198 80241C88 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 8D319C 80241C8C 8E02000C */ lw $v0, 0xc($s0) +/* 8D31A0 80241C90 0C0B210B */ jal get_float_variable +/* 8D31A4 80241C94 8C450000 */ lw $a1, ($v0) +/* 8D31A8 80241C98 0200202D */ daddu $a0, $s0, $zero +/* 8D31AC 80241C9C 3C05FD05 */ lui $a1, 0xfd05 +/* 8D31B0 80241CA0 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8D31B4 80241CA4 0C0B1EAF */ jal get_variable +/* 8D31B8 80241CA8 46000506 */ mov.s $f20, $f0 +/* 8D31BC 80241CAC E4540040 */ swc1 $f20, 0x40($v0) +/* 8D31C0 80241CB0 8FBF0014 */ lw $ra, 0x14($sp) +/* 8D31C4 80241CB4 8FB00010 */ lw $s0, 0x10($sp) +/* 8D31C8 80241CB8 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 8D31CC 80241CBC 24020002 */ addiu $v0, $zero, 2 +/* 8D31D0 80241CC0 03E00008 */ jr $ra +/* 8D31D4 80241CC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8.s deleted file mode 100644 index 2c084ee7d0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CC8 -/* 8D31D8 80241CC8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D31DC 80241CCC AFB00010 */ sw $s0, 0x10($sp) -/* 8D31E0 80241CD0 0080802D */ daddu $s0, $a0, $zero -/* 8D31E4 80241CD4 3C05FD05 */ lui $a1, 0xfd05 -/* 8D31E8 80241CD8 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D31EC 80241CDC AFBF0020 */ sw $ra, 0x20($sp) -/* 8D31F0 80241CE0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D31F4 80241CE4 AFB20018 */ sw $s2, 0x18($sp) -/* 8D31F8 80241CE8 0C0B1EAF */ jal get_variable -/* 8D31FC 80241CEC AFB10014 */ sw $s1, 0x14($sp) -/* 8D3200 80241CF0 0200202D */ daddu $a0, $s0, $zero -/* 8D3204 80241CF4 3C05FD05 */ lui $a1, 0xfd05 -/* 8D3208 80241CF8 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8D320C 80241CFC 0C0B1EAF */ jal get_variable -/* 8D3210 80241D00 0040902D */ daddu $s2, $v0, $zero -/* 8D3214 80241D04 0200202D */ daddu $a0, $s0, $zero -/* 8D3218 80241D08 3C05FD05 */ lui $a1, 0xfd05 -/* 8D321C 80241D0C 34A50F8C */ ori $a1, $a1, 0xf8c -/* 8D3220 80241D10 0C0B1EAF */ jal get_variable -/* 8D3224 80241D14 0040982D */ daddu $s3, $v0, $zero -/* 8D3228 80241D18 8E440004 */ lw $a0, 4($s2) -/* 8D322C 80241D1C 0C048D70 */ jal func_801235C0 -/* 8D3230 80241D20 0040882D */ daddu $s1, $v0, $zero -/* 8D3234 80241D24 0C00AB4B */ jal heap_free -/* 8D3238 80241D28 0240202D */ daddu $a0, $s2, $zero -/* 8D323C 80241D2C 0C00AB4B */ jal heap_free -/* 8D3240 80241D30 0260202D */ daddu $a0, $s3, $zero -/* 8D3244 80241D34 0C00AB4B */ jal heap_free -/* 8D3248 80241D38 0220202D */ daddu $a0, $s1, $zero -/* 8D324C 80241D3C 0200202D */ daddu $a0, $s0, $zero -/* 8D3250 80241D40 3C05FD05 */ lui $a1, 0xfd05 -/* 8D3254 80241D44 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8D3258 80241D48 0C0B2026 */ jal set_variable -/* 8D325C 80241D4C 0000302D */ daddu $a2, $zero, $zero -/* 8D3260 80241D50 0200202D */ daddu $a0, $s0, $zero -/* 8D3264 80241D54 3C05FD05 */ lui $a1, 0xfd05 -/* 8D3268 80241D58 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8D326C 80241D5C 0C0B2026 */ jal set_variable -/* 8D3270 80241D60 0000302D */ daddu $a2, $zero, $zero -/* 8D3274 80241D64 0200202D */ daddu $a0, $s0, $zero -/* 8D3278 80241D68 3C05FD05 */ lui $a1, 0xfd05 -/* 8D327C 80241D6C 34A50F8C */ ori $a1, $a1, 0xf8c -/* 8D3280 80241D70 0C0B2026 */ jal set_variable -/* 8D3284 80241D74 0000302D */ daddu $a2, $zero, $zero -/* 8D3288 80241D78 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D328C 80241D7C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D3290 80241D80 8FB20018 */ lw $s2, 0x18($sp) -/* 8D3294 80241D84 8FB10014 */ lw $s1, 0x14($sp) -/* 8D3298 80241D88 8FB00010 */ lw $s0, 0x10($sp) -/* 8D329C 80241D8C 24020002 */ addiu $v0, $zero, 2 -/* 8D32A0 80241D90 03E00008 */ jr $ra -/* 8D32A4 80241D94 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8D32A8 80241D98 00000000 */ nop -/* 8D32AC 80241D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s new file mode 100644 index 0000000000..c522a017fc --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_06/8D2A10/func_80241CC8_8D31D8.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CC8_8D31D8 +/* 8D31D8 80241CC8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8D31DC 80241CCC AFB00010 */ sw $s0, 0x10($sp) +/* 8D31E0 80241CD0 0080802D */ daddu $s0, $a0, $zero +/* 8D31E4 80241CD4 3C05FD05 */ lui $a1, 0xfd05 +/* 8D31E8 80241CD8 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8D31EC 80241CDC AFBF0020 */ sw $ra, 0x20($sp) +/* 8D31F0 80241CE0 AFB3001C */ sw $s3, 0x1c($sp) +/* 8D31F4 80241CE4 AFB20018 */ sw $s2, 0x18($sp) +/* 8D31F8 80241CE8 0C0B1EAF */ jal get_variable +/* 8D31FC 80241CEC AFB10014 */ sw $s1, 0x14($sp) +/* 8D3200 80241CF0 0200202D */ daddu $a0, $s0, $zero +/* 8D3204 80241CF4 3C05FD05 */ lui $a1, 0xfd05 +/* 8D3208 80241CF8 34A50F8B */ ori $a1, $a1, 0xf8b +/* 8D320C 80241CFC 0C0B1EAF */ jal get_variable +/* 8D3210 80241D00 0040902D */ daddu $s2, $v0, $zero +/* 8D3214 80241D04 0200202D */ daddu $a0, $s0, $zero +/* 8D3218 80241D08 3C05FD05 */ lui $a1, 0xfd05 +/* 8D321C 80241D0C 34A50F8C */ ori $a1, $a1, 0xf8c +/* 8D3220 80241D10 0C0B1EAF */ jal get_variable +/* 8D3224 80241D14 0040982D */ daddu $s3, $v0, $zero +/* 8D3228 80241D18 8E440004 */ lw $a0, 4($s2) +/* 8D322C 80241D1C 0C048D70 */ jal func_801235C0 +/* 8D3230 80241D20 0040882D */ daddu $s1, $v0, $zero +/* 8D3234 80241D24 0C00AB4B */ jal heap_free +/* 8D3238 80241D28 0240202D */ daddu $a0, $s2, $zero +/* 8D323C 80241D2C 0C00AB4B */ jal heap_free +/* 8D3240 80241D30 0260202D */ daddu $a0, $s3, $zero +/* 8D3244 80241D34 0C00AB4B */ jal heap_free +/* 8D3248 80241D38 0220202D */ daddu $a0, $s1, $zero +/* 8D324C 80241D3C 0200202D */ daddu $a0, $s0, $zero +/* 8D3250 80241D40 3C05FD05 */ lui $a1, 0xfd05 +/* 8D3254 80241D44 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8D3258 80241D48 0C0B2026 */ jal set_variable +/* 8D325C 80241D4C 0000302D */ daddu $a2, $zero, $zero +/* 8D3260 80241D50 0200202D */ daddu $a0, $s0, $zero +/* 8D3264 80241D54 3C05FD05 */ lui $a1, 0xfd05 +/* 8D3268 80241D58 34A50F8B */ ori $a1, $a1, 0xf8b +/* 8D326C 80241D5C 0C0B2026 */ jal set_variable +/* 8D3270 80241D60 0000302D */ daddu $a2, $zero, $zero +/* 8D3274 80241D64 0200202D */ daddu $a0, $s0, $zero +/* 8D3278 80241D68 3C05FD05 */ lui $a1, 0xfd05 +/* 8D327C 80241D6C 34A50F8C */ ori $a1, $a1, 0xf8c +/* 8D3280 80241D70 0C0B2026 */ jal set_variable +/* 8D3284 80241D74 0000302D */ daddu $a2, $zero, $zero +/* 8D3288 80241D78 8FBF0020 */ lw $ra, 0x20($sp) +/* 8D328C 80241D7C 8FB3001C */ lw $s3, 0x1c($sp) +/* 8D3290 80241D80 8FB20018 */ lw $s2, 0x18($sp) +/* 8D3294 80241D84 8FB10014 */ lw $s1, 0x14($sp) +/* 8D3298 80241D88 8FB00010 */ lw $s0, 0x10($sp) +/* 8D329C 80241D8C 24020002 */ addiu $v0, $zero, 2 +/* 8D32A0 80241D90 03E00008 */ jr $ra +/* 8D32A4 80241D94 27BD0028 */ addiu $sp, $sp, 0x28 +/* 8D32A8 80241D98 00000000 */ nop +/* 8D32AC 80241D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4.s deleted file mode 100644 index b5e3be359a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B4 -/* 8D3E74 802400B4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8D3E78 802400B8 AFB40040 */ sw $s4, 0x40($sp) -/* 8D3E7C 802400BC 0080A02D */ daddu $s4, $a0, $zero -/* 8D3E80 802400C0 AFBF0044 */ sw $ra, 0x44($sp) -/* 8D3E84 802400C4 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D3E88 802400C8 AFB20038 */ sw $s2, 0x38($sp) -/* 8D3E8C 802400CC AFB10034 */ sw $s1, 0x34($sp) -/* 8D3E90 802400D0 AFB00030 */ sw $s0, 0x30($sp) -/* 8D3E94 802400D4 8E920148 */ lw $s2, 0x148($s4) -/* 8D3E98 802400D8 00A0802D */ daddu $s0, $a1, $zero -/* 8D3E9C 802400DC 86440008 */ lh $a0, 8($s2) -/* 8D3EA0 802400E0 0C00EABB */ jal get_npc_unsafe -/* 8D3EA4 802400E4 00C0982D */ daddu $s3, $a2, $zero -/* 8D3EA8 802400E8 8E030008 */ lw $v1, 8($s0) -/* 8D3EAC 802400EC 04600031 */ bltz $v1, .L802401B4 -/* 8D3EB0 802400F0 0040882D */ daddu $s1, $v0, $zero -/* 8D3EB4 802400F4 0260202D */ daddu $a0, $s3, $zero -/* 8D3EB8 802400F8 AFA00010 */ sw $zero, 0x10($sp) -/* 8D3EBC 802400FC 8E060018 */ lw $a2, 0x18($s0) -/* 8D3EC0 80240100 8E07001C */ lw $a3, 0x1c($s0) -/* 8D3EC4 80240104 0C01242D */ jal func_800490B4 -/* 8D3EC8 80240108 0240282D */ daddu $a1, $s2, $zero -/* 8D3ECC 8024010C 10400029 */ beqz $v0, .L802401B4 -/* 8D3ED0 80240110 0000202D */ daddu $a0, $zero, $zero -/* 8D3ED4 80240114 0220282D */ daddu $a1, $s1, $zero -/* 8D3ED8 80240118 0000302D */ daddu $a2, $zero, $zero -/* 8D3EDC 8024011C 862300A8 */ lh $v1, 0xa8($s1) -/* 8D3EE0 80240120 3C013F80 */ lui $at, 0x3f80 -/* 8D3EE4 80240124 44810000 */ mtc1 $at, $f0 -/* 8D3EE8 80240128 3C014000 */ lui $at, 0x4000 -/* 8D3EEC 8024012C 44811000 */ mtc1 $at, $f2 -/* 8D3EF0 80240130 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D3EF4 80240134 44812000 */ mtc1 $at, $f4 -/* 8D3EF8 80240138 2402000F */ addiu $v0, $zero, 0xf -/* 8D3EFC 8024013C AFA2001C */ sw $v0, 0x1c($sp) -/* 8D3F00 80240140 44833000 */ mtc1 $v1, $f6 -/* 8D3F04 80240144 00000000 */ nop -/* 8D3F08 80240148 468031A0 */ cvt.s.w $f6, $f6 -/* 8D3F0C 8024014C 44073000 */ mfc1 $a3, $f6 -/* 8D3F10 80240150 27A20028 */ addiu $v0, $sp, 0x28 -/* 8D3F14 80240154 AFA20020 */ sw $v0, 0x20($sp) -/* 8D3F18 80240158 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D3F1C 8024015C E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D3F20 80240160 0C01BFA4 */ jal fx_emote -/* 8D3F24 80240164 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D3F28 80240168 0220202D */ daddu $a0, $s1, $zero -/* 8D3F2C 8024016C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8D3F30 80240170 0C012530 */ jal func_800494C0 -/* 8D3F34 80240174 3C060020 */ lui $a2, 0x20 -/* 8D3F38 80240178 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D3F3C 8024017C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D3F40 80240180 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8D3F44 80240184 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8D3F48 80240188 8C460028 */ lw $a2, 0x28($v0) -/* 8D3F4C 8024018C 0C00A720 */ jal atan2 -/* 8D3F50 80240190 8C470030 */ lw $a3, 0x30($v0) -/* 8D3F54 80240194 E620000C */ swc1 $f0, 0xc($s1) -/* 8D3F58 80240198 8E420018 */ lw $v0, 0x18($s2) -/* 8D3F5C 8024019C 9442002A */ lhu $v0, 0x2a($v0) -/* 8D3F60 802401A0 30420001 */ andi $v0, $v0, 1 -/* 8D3F64 802401A4 14400002 */ bnez $v0, .L802401B0 -/* 8D3F68 802401A8 2402000A */ addiu $v0, $zero, 0xa -/* 8D3F6C 802401AC 2402000C */ addiu $v0, $zero, 0xc -.L802401B0: -/* 8D3F70 802401B0 AE820070 */ sw $v0, 0x70($s4) -.L802401B4: -/* 8D3F74 802401B4 8FBF0044 */ lw $ra, 0x44($sp) -/* 8D3F78 802401B8 8FB40040 */ lw $s4, 0x40($sp) -/* 8D3F7C 802401BC 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D3F80 802401C0 8FB20038 */ lw $s2, 0x38($sp) -/* 8D3F84 802401C4 8FB10034 */ lw $s1, 0x34($sp) -/* 8D3F88 802401C8 8FB00030 */ lw $s0, 0x30($sp) -/* 8D3F8C 802401CC 03E00008 */ jr $ra -/* 8D3F90 802401D0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s new file mode 100644 index 0000000000..351a49b383 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802400B4_8D3E74.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400B4_8D3E74 +/* 8D3E74 802400B4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8D3E78 802400B8 AFB40040 */ sw $s4, 0x40($sp) +/* 8D3E7C 802400BC 0080A02D */ daddu $s4, $a0, $zero +/* 8D3E80 802400C0 AFBF0044 */ sw $ra, 0x44($sp) +/* 8D3E84 802400C4 AFB3003C */ sw $s3, 0x3c($sp) +/* 8D3E88 802400C8 AFB20038 */ sw $s2, 0x38($sp) +/* 8D3E8C 802400CC AFB10034 */ sw $s1, 0x34($sp) +/* 8D3E90 802400D0 AFB00030 */ sw $s0, 0x30($sp) +/* 8D3E94 802400D4 8E920148 */ lw $s2, 0x148($s4) +/* 8D3E98 802400D8 00A0802D */ daddu $s0, $a1, $zero +/* 8D3E9C 802400DC 86440008 */ lh $a0, 8($s2) +/* 8D3EA0 802400E0 0C00EABB */ jal get_npc_unsafe +/* 8D3EA4 802400E4 00C0982D */ daddu $s3, $a2, $zero +/* 8D3EA8 802400E8 8E030008 */ lw $v1, 8($s0) +/* 8D3EAC 802400EC 04600031 */ bltz $v1, .L802401B4 +/* 8D3EB0 802400F0 0040882D */ daddu $s1, $v0, $zero +/* 8D3EB4 802400F4 0260202D */ daddu $a0, $s3, $zero +/* 8D3EB8 802400F8 AFA00010 */ sw $zero, 0x10($sp) +/* 8D3EBC 802400FC 8E060018 */ lw $a2, 0x18($s0) +/* 8D3EC0 80240100 8E07001C */ lw $a3, 0x1c($s0) +/* 8D3EC4 80240104 0C01242D */ jal func_800490B4 +/* 8D3EC8 80240108 0240282D */ daddu $a1, $s2, $zero +/* 8D3ECC 8024010C 10400029 */ beqz $v0, .L802401B4 +/* 8D3ED0 80240110 0000202D */ daddu $a0, $zero, $zero +/* 8D3ED4 80240114 0220282D */ daddu $a1, $s1, $zero +/* 8D3ED8 80240118 0000302D */ daddu $a2, $zero, $zero +/* 8D3EDC 8024011C 862300A8 */ lh $v1, 0xa8($s1) +/* 8D3EE0 80240120 3C013F80 */ lui $at, 0x3f80 +/* 8D3EE4 80240124 44810000 */ mtc1 $at, $f0 +/* 8D3EE8 80240128 3C014000 */ lui $at, 0x4000 +/* 8D3EEC 8024012C 44811000 */ mtc1 $at, $f2 +/* 8D3EF0 80240130 3C01C1A0 */ lui $at, 0xc1a0 +/* 8D3EF4 80240134 44812000 */ mtc1 $at, $f4 +/* 8D3EF8 80240138 2402000F */ addiu $v0, $zero, 0xf +/* 8D3EFC 8024013C AFA2001C */ sw $v0, 0x1c($sp) +/* 8D3F00 80240140 44833000 */ mtc1 $v1, $f6 +/* 8D3F04 80240144 00000000 */ nop +/* 8D3F08 80240148 468031A0 */ cvt.s.w $f6, $f6 +/* 8D3F0C 8024014C 44073000 */ mfc1 $a3, $f6 +/* 8D3F10 80240150 27A20028 */ addiu $v0, $sp, 0x28 +/* 8D3F14 80240154 AFA20020 */ sw $v0, 0x20($sp) +/* 8D3F18 80240158 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8D3F1C 8024015C E7A20014 */ swc1 $f2, 0x14($sp) +/* 8D3F20 80240160 0C01BFA4 */ jal fx_emote +/* 8D3F24 80240164 E7A40018 */ swc1 $f4, 0x18($sp) +/* 8D3F28 80240168 0220202D */ daddu $a0, $s1, $zero +/* 8D3F2C 8024016C 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 8D3F30 80240170 0C012530 */ jal func_800494C0 +/* 8D3F34 80240174 3C060020 */ lui $a2, 0x20 +/* 8D3F38 80240178 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8D3F3C 8024017C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8D3F40 80240180 C62C0038 */ lwc1 $f12, 0x38($s1) +/* 8D3F44 80240184 C62E0040 */ lwc1 $f14, 0x40($s1) +/* 8D3F48 80240188 8C460028 */ lw $a2, 0x28($v0) +/* 8D3F4C 8024018C 0C00A720 */ jal atan2 +/* 8D3F50 80240190 8C470030 */ lw $a3, 0x30($v0) +/* 8D3F54 80240194 E620000C */ swc1 $f0, 0xc($s1) +/* 8D3F58 80240198 8E420018 */ lw $v0, 0x18($s2) +/* 8D3F5C 8024019C 9442002A */ lhu $v0, 0x2a($v0) +/* 8D3F60 802401A0 30420001 */ andi $v0, $v0, 1 +/* 8D3F64 802401A4 14400002 */ bnez $v0, .L802401B0 +/* 8D3F68 802401A8 2402000A */ addiu $v0, $zero, 0xa +/* 8D3F6C 802401AC 2402000C */ addiu $v0, $zero, 0xc +.L802401B0: +/* 8D3F70 802401B0 AE820070 */ sw $v0, 0x70($s4) +.L802401B4: +/* 8D3F74 802401B4 8FBF0044 */ lw $ra, 0x44($sp) +/* 8D3F78 802401B8 8FB40040 */ lw $s4, 0x40($sp) +/* 8D3F7C 802401BC 8FB3003C */ lw $s3, 0x3c($sp) +/* 8D3F80 802401C0 8FB20038 */ lw $s2, 0x38($sp) +/* 8D3F84 802401C4 8FB10034 */ lw $s1, 0x34($sp) +/* 8D3F88 802401C8 8FB00030 */ lw $s0, 0x30($sp) +/* 8D3F8C 802401CC 03E00008 */ jr $ra +/* 8D3F90 802401D0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4.s deleted file mode 100644 index 474810bf9f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D4 -/* 8D3F94 802401D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D3F98 802401D8 AFB00010 */ sw $s0, 0x10($sp) -/* 8D3F9C 802401DC 0080802D */ daddu $s0, $a0, $zero -/* 8D3FA0 802401E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D3FA4 802401E4 8E020148 */ lw $v0, 0x148($s0) -/* 8D3FA8 802401E8 0C00EABB */ jal get_npc_unsafe -/* 8D3FAC 802401EC 84440008 */ lh $a0, 8($v0) -/* 8D3FB0 802401F0 3C014120 */ lui $at, 0x4120 -/* 8D3FB4 802401F4 44810000 */ mtc1 $at, $f0 -/* 8D3FB8 802401F8 3C014000 */ lui $at, 0x4000 -/* 8D3FBC 802401FC 44811000 */ mtc1 $at, $f2 -/* 8D3FC0 80240200 8C430000 */ lw $v1, ($v0) -/* 8D3FC4 80240204 C444003C */ lwc1 $f4, 0x3c($v0) -/* 8D3FC8 80240208 34630800 */ ori $v1, $v1, 0x800 -/* 8D3FCC 8024020C E440001C */ swc1 $f0, 0x1c($v0) -/* 8D3FD0 80240210 E4420014 */ swc1 $f2, 0x14($v0) -/* 8D3FD4 80240214 E4440064 */ swc1 $f4, 0x64($v0) -/* 8D3FD8 80240218 AC430000 */ sw $v1, ($v0) -/* 8D3FDC 8024021C 2402000B */ addiu $v0, $zero, 0xb -/* 8D3FE0 80240220 AE020070 */ sw $v0, 0x70($s0) -/* 8D3FE4 80240224 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D3FE8 80240228 8FB00010 */ lw $s0, 0x10($sp) -/* 8D3FEC 8024022C 03E00008 */ jr $ra -/* 8D3FF0 80240230 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4_8D3F94.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4_8D3F94.s new file mode 100644 index 0000000000..6bece0da47 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802401D4_8D3F94.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401D4_8D3F94 +/* 8D3F94 802401D4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8D3F98 802401D8 AFB00010 */ sw $s0, 0x10($sp) +/* 8D3F9C 802401DC 0080802D */ daddu $s0, $a0, $zero +/* 8D3FA0 802401E0 AFBF0014 */ sw $ra, 0x14($sp) +/* 8D3FA4 802401E4 8E020148 */ lw $v0, 0x148($s0) +/* 8D3FA8 802401E8 0C00EABB */ jal get_npc_unsafe +/* 8D3FAC 802401EC 84440008 */ lh $a0, 8($v0) +/* 8D3FB0 802401F0 3C014120 */ lui $at, 0x4120 +/* 8D3FB4 802401F4 44810000 */ mtc1 $at, $f0 +/* 8D3FB8 802401F8 3C014000 */ lui $at, 0x4000 +/* 8D3FBC 802401FC 44811000 */ mtc1 $at, $f2 +/* 8D3FC0 80240200 8C430000 */ lw $v1, ($v0) +/* 8D3FC4 80240204 C444003C */ lwc1 $f4, 0x3c($v0) +/* 8D3FC8 80240208 34630800 */ ori $v1, $v1, 0x800 +/* 8D3FCC 8024020C E440001C */ swc1 $f0, 0x1c($v0) +/* 8D3FD0 80240210 E4420014 */ swc1 $f2, 0x14($v0) +/* 8D3FD4 80240214 E4440064 */ swc1 $f4, 0x64($v0) +/* 8D3FD8 80240218 AC430000 */ sw $v1, ($v0) +/* 8D3FDC 8024021C 2402000B */ addiu $v0, $zero, 0xb +/* 8D3FE0 80240220 AE020070 */ sw $v0, 0x70($s0) +/* 8D3FE4 80240224 8FBF0014 */ lw $ra, 0x14($sp) +/* 8D3FE8 80240228 8FB00010 */ lw $s0, 0x10($sp) +/* 8D3FEC 8024022C 03E00008 */ jr $ra +/* 8D3FF0 80240230 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234.s deleted file mode 100644 index 72a97337ec..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240234 -/* 8D3FF4 80240234 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D3FF8 80240238 AFB00010 */ sw $s0, 0x10($sp) -/* 8D3FFC 8024023C 0080802D */ daddu $s0, $a0, $zero -/* 8D4000 80240240 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D4004 80240244 8E020148 */ lw $v0, 0x148($s0) -/* 8D4008 80240248 0C00EABB */ jal get_npc_unsafe -/* 8D400C 8024024C 84440008 */ lh $a0, 8($v0) -/* 8D4010 80240250 0040202D */ daddu $a0, $v0, $zero -/* 8D4014 80240254 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8D4018 80240258 C480001C */ lwc1 $f0, 0x1c($a0) -/* 8D401C 8024025C 46001080 */ add.s $f2, $f2, $f0 -/* 8D4020 80240260 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8D4024 80240264 46040001 */ sub.s $f0, $f0, $f4 -/* 8D4028 80240268 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8D402C 8024026C 4602203C */ c.lt.s $f4, $f2 -/* 8D4030 80240270 E482003C */ swc1 $f2, 0x3c($a0) -/* 8D4034 80240274 45010009 */ bc1t .L8024029C -/* 8D4038 80240278 E480001C */ swc1 $f0, 0x1c($a0) -/* 8D403C 8024027C 8C820000 */ lw $v0, ($a0) -/* 8D4040 80240280 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8D4044 80240284 E484003C */ swc1 $f4, 0x3c($a0) -/* 8D4048 80240288 AC80001C */ sw $zero, 0x1c($a0) -/* 8D404C 8024028C 00431024 */ and $v0, $v0, $v1 -/* 8D4050 80240290 AC820000 */ sw $v0, ($a0) -/* 8D4054 80240294 2402000C */ addiu $v0, $zero, 0xc -/* 8D4058 80240298 AE020070 */ sw $v0, 0x70($s0) -.L8024029C: -/* 8D405C 8024029C 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D4060 802402A0 8FB00010 */ lw $s0, 0x10($sp) -/* 8D4064 802402A4 03E00008 */ jr $ra -/* 8D4068 802402A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234_8D3FF4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234_8D3FF4.s new file mode 100644 index 0000000000..8ab8df6d82 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240234_8D3FF4.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240234_8D3FF4 +/* 8D3FF4 80240234 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8D3FF8 80240238 AFB00010 */ sw $s0, 0x10($sp) +/* 8D3FFC 8024023C 0080802D */ daddu $s0, $a0, $zero +/* 8D4000 80240240 AFBF0014 */ sw $ra, 0x14($sp) +/* 8D4004 80240244 8E020148 */ lw $v0, 0x148($s0) +/* 8D4008 80240248 0C00EABB */ jal get_npc_unsafe +/* 8D400C 8024024C 84440008 */ lh $a0, 8($v0) +/* 8D4010 80240250 0040202D */ daddu $a0, $v0, $zero +/* 8D4014 80240254 C482003C */ lwc1 $f2, 0x3c($a0) +/* 8D4018 80240258 C480001C */ lwc1 $f0, 0x1c($a0) +/* 8D401C 8024025C 46001080 */ add.s $f2, $f2, $f0 +/* 8D4020 80240260 C4840014 */ lwc1 $f4, 0x14($a0) +/* 8D4024 80240264 46040001 */ sub.s $f0, $f0, $f4 +/* 8D4028 80240268 C4840064 */ lwc1 $f4, 0x64($a0) +/* 8D402C 8024026C 4602203C */ c.lt.s $f4, $f2 +/* 8D4030 80240270 E482003C */ swc1 $f2, 0x3c($a0) +/* 8D4034 80240274 45010009 */ bc1t .L8024029C +/* 8D4038 80240278 E480001C */ swc1 $f0, 0x1c($a0) +/* 8D403C 8024027C 8C820000 */ lw $v0, ($a0) +/* 8D4040 80240280 2403F7FF */ addiu $v1, $zero, -0x801 +/* 8D4044 80240284 E484003C */ swc1 $f4, 0x3c($a0) +/* 8D4048 80240288 AC80001C */ sw $zero, 0x1c($a0) +/* 8D404C 8024028C 00431024 */ and $v0, $v0, $v1 +/* 8D4050 80240290 AC820000 */ sw $v0, ($a0) +/* 8D4054 80240294 2402000C */ addiu $v0, $zero, 0xc +/* 8D4058 80240298 AE020070 */ sw $v0, 0x70($s0) +.L8024029C: +/* 8D405C 8024029C 8FBF0014 */ lw $ra, 0x14($sp) +/* 8D4060 802402A0 8FB00010 */ lw $s0, 0x10($sp) +/* 8D4064 802402A4 03E00008 */ jr $ra +/* 8D4068 802402A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC.s deleted file mode 100644 index f1a7b52324..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402AC -/* 8D406C 802402AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8D4070 802402B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D4074 802402B4 0080982D */ daddu $s3, $a0, $zero -/* 8D4078 802402B8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D407C 802402BC AFB20018 */ sw $s2, 0x18($sp) -/* 8D4080 802402C0 AFB10014 */ sw $s1, 0x14($sp) -/* 8D4084 802402C4 AFB00010 */ sw $s0, 0x10($sp) -/* 8D4088 802402C8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8D408C 802402CC 8E710148 */ lw $s1, 0x148($s3) -/* 8D4090 802402D0 86240008 */ lh $a0, 8($s1) -/* 8D4094 802402D4 0C00EABB */ jal get_npc_unsafe -/* 8D4098 802402D8 00A0802D */ daddu $s0, $a1, $zero -/* 8D409C 802402DC 8E040014 */ lw $a0, 0x14($s0) -/* 8D40A0 802402E0 0040902D */ daddu $s2, $v0, $zero -/* 8D40A4 802402E4 00041FC2 */ srl $v1, $a0, 0x1f -/* 8D40A8 802402E8 00832021 */ addu $a0, $a0, $v1 -/* 8D40AC 802402EC 00042043 */ sra $a0, $a0, 1 -/* 8D40B0 802402F0 0C00A67F */ jal rand_int -/* 8D40B4 802402F4 24840001 */ addiu $a0, $a0, 1 -/* 8D40B8 802402F8 8E030014 */ lw $v1, 0x14($s0) -/* 8D40BC 802402FC C64C0038 */ lwc1 $f12, 0x38($s2) -/* 8D40C0 80240300 000327C2 */ srl $a0, $v1, 0x1f -/* 8D40C4 80240304 00641821 */ addu $v1, $v1, $a0 -/* 8D40C8 80240308 00031843 */ sra $v1, $v1, 1 -/* 8D40CC 8024030C 00621821 */ addu $v1, $v1, $v0 -/* 8D40D0 80240310 A643008E */ sh $v1, 0x8e($s2) -/* 8D40D4 80240314 8E2200CC */ lw $v0, 0xcc($s1) -/* 8D40D8 80240318 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 8D40DC 8024031C 8C42000C */ lw $v0, 0xc($v0) -/* 8D40E0 80240320 AE420028 */ sw $v0, 0x28($s2) -/* 8D40E4 80240324 C600000C */ lwc1 $f0, 0xc($s0) -/* 8D40E8 80240328 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8D40EC 8024032C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8D40F0 80240330 E6400018 */ swc1 $f0, 0x18($s2) -/* 8D40F4 80240334 8C460028 */ lw $a2, 0x28($v0) -/* 8D40F8 80240338 0C00A720 */ jal atan2 -/* 8D40FC 8024033C 8C470030 */ lw $a3, 0x30($v0) -/* 8D4100 80240340 46000506 */ mov.s $f20, $f0 -/* 8D4104 80240344 C64C000C */ lwc1 $f12, 0xc($s2) -/* 8D4108 80240348 0C00A70A */ jal get_clamped_angle_diff -/* 8D410C 8024034C 4600A386 */ mov.s $f14, $f20 -/* 8D4110 80240350 46000086 */ mov.s $f2, $f0 -/* 8D4114 80240354 8E020010 */ lw $v0, 0x10($s0) -/* 8D4118 80240358 46001005 */ abs.s $f0, $f2 -/* 8D411C 8024035C 44822000 */ mtc1 $v0, $f4 -/* 8D4120 80240360 00000000 */ nop -/* 8D4124 80240364 46802120 */ cvt.s.w $f4, $f4 -/* 8D4128 80240368 4600203C */ c.lt.s $f4, $f0 -/* 8D412C 8024036C 00000000 */ nop -/* 8D4130 80240370 4500000D */ bc1f .L802403A8 -/* 8D4134 80240374 00000000 */ nop -/* 8D4138 80240378 44800000 */ mtc1 $zero, $f0 -/* 8D413C 8024037C C654000C */ lwc1 $f20, 0xc($s2) -/* 8D4140 80240380 4600103C */ c.lt.s $f2, $f0 -/* 8D4144 80240384 00000000 */ nop -/* 8D4148 80240388 45000006 */ bc1f .L802403A4 -/* 8D414C 8024038C 00021023 */ negu $v0, $v0 -/* 8D4150 80240390 44820000 */ mtc1 $v0, $f0 -/* 8D4154 80240394 00000000 */ nop -/* 8D4158 80240398 46800020 */ cvt.s.w $f0, $f0 -/* 8D415C 8024039C 080900EA */ j .L802403A8 -/* 8D4160 802403A0 4600A500 */ add.s $f20, $f20, $f0 -.L802403A4: -/* 8D4164 802403A4 4604A500 */ add.s $f20, $f20, $f4 -.L802403A8: -/* 8D4168 802403A8 0C00A6C9 */ jal clamp_angle -/* 8D416C 802403AC 4600A306 */ mov.s $f12, $f20 -/* 8D4170 802403B0 2402000D */ addiu $v0, $zero, 0xd -/* 8D4174 802403B4 E640000C */ swc1 $f0, 0xc($s2) -/* 8D4178 802403B8 AE620070 */ sw $v0, 0x70($s3) -/* 8D417C 802403BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D4180 802403C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D4184 802403C4 8FB20018 */ lw $s2, 0x18($sp) -/* 8D4188 802403C8 8FB10014 */ lw $s1, 0x14($sp) -/* 8D418C 802403CC 8FB00010 */ lw $s0, 0x10($sp) -/* 8D4190 802403D0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8D4194 802403D4 03E00008 */ jr $ra -/* 8D4198 802403D8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC_8D406C.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC_8D406C.s new file mode 100644 index 0000000000..3bd1c44a39 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802402AC_8D406C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402AC_8D406C +/* 8D406C 802402AC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8D4070 802402B0 AFB3001C */ sw $s3, 0x1c($sp) +/* 8D4074 802402B4 0080982D */ daddu $s3, $a0, $zero +/* 8D4078 802402B8 AFBF0020 */ sw $ra, 0x20($sp) +/* 8D407C 802402BC AFB20018 */ sw $s2, 0x18($sp) +/* 8D4080 802402C0 AFB10014 */ sw $s1, 0x14($sp) +/* 8D4084 802402C4 AFB00010 */ sw $s0, 0x10($sp) +/* 8D4088 802402C8 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8D408C 802402CC 8E710148 */ lw $s1, 0x148($s3) +/* 8D4090 802402D0 86240008 */ lh $a0, 8($s1) +/* 8D4094 802402D4 0C00EABB */ jal get_npc_unsafe +/* 8D4098 802402D8 00A0802D */ daddu $s0, $a1, $zero +/* 8D409C 802402DC 8E040014 */ lw $a0, 0x14($s0) +/* 8D40A0 802402E0 0040902D */ daddu $s2, $v0, $zero +/* 8D40A4 802402E4 00041FC2 */ srl $v1, $a0, 0x1f +/* 8D40A8 802402E8 00832021 */ addu $a0, $a0, $v1 +/* 8D40AC 802402EC 00042043 */ sra $a0, $a0, 1 +/* 8D40B0 802402F0 0C00A67F */ jal rand_int +/* 8D40B4 802402F4 24840001 */ addiu $a0, $a0, 1 +/* 8D40B8 802402F8 8E030014 */ lw $v1, 0x14($s0) +/* 8D40BC 802402FC C64C0038 */ lwc1 $f12, 0x38($s2) +/* 8D40C0 80240300 000327C2 */ srl $a0, $v1, 0x1f +/* 8D40C4 80240304 00641821 */ addu $v1, $v1, $a0 +/* 8D40C8 80240308 00031843 */ sra $v1, $v1, 1 +/* 8D40CC 8024030C 00621821 */ addu $v1, $v1, $v0 +/* 8D40D0 80240310 A643008E */ sh $v1, 0x8e($s2) +/* 8D40D4 80240314 8E2200CC */ lw $v0, 0xcc($s1) +/* 8D40D8 80240318 C64E0040 */ lwc1 $f14, 0x40($s2) +/* 8D40DC 8024031C 8C42000C */ lw $v0, 0xc($v0) +/* 8D40E0 80240320 AE420028 */ sw $v0, 0x28($s2) +/* 8D40E4 80240324 C600000C */ lwc1 $f0, 0xc($s0) +/* 8D40E8 80240328 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8D40EC 8024032C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8D40F0 80240330 E6400018 */ swc1 $f0, 0x18($s2) +/* 8D40F4 80240334 8C460028 */ lw $a2, 0x28($v0) +/* 8D40F8 80240338 0C00A720 */ jal atan2 +/* 8D40FC 8024033C 8C470030 */ lw $a3, 0x30($v0) +/* 8D4100 80240340 46000506 */ mov.s $f20, $f0 +/* 8D4104 80240344 C64C000C */ lwc1 $f12, 0xc($s2) +/* 8D4108 80240348 0C00A70A */ jal get_clamped_angle_diff +/* 8D410C 8024034C 4600A386 */ mov.s $f14, $f20 +/* 8D4110 80240350 46000086 */ mov.s $f2, $f0 +/* 8D4114 80240354 8E020010 */ lw $v0, 0x10($s0) +/* 8D4118 80240358 46001005 */ abs.s $f0, $f2 +/* 8D411C 8024035C 44822000 */ mtc1 $v0, $f4 +/* 8D4120 80240360 00000000 */ nop +/* 8D4124 80240364 46802120 */ cvt.s.w $f4, $f4 +/* 8D4128 80240368 4600203C */ c.lt.s $f4, $f0 +/* 8D412C 8024036C 00000000 */ nop +/* 8D4130 80240370 4500000D */ bc1f .L802403A8 +/* 8D4134 80240374 00000000 */ nop +/* 8D4138 80240378 44800000 */ mtc1 $zero, $f0 +/* 8D413C 8024037C C654000C */ lwc1 $f20, 0xc($s2) +/* 8D4140 80240380 4600103C */ c.lt.s $f2, $f0 +/* 8D4144 80240384 00000000 */ nop +/* 8D4148 80240388 45000006 */ bc1f .L802403A4 +/* 8D414C 8024038C 00021023 */ negu $v0, $v0 +/* 8D4150 80240390 44820000 */ mtc1 $v0, $f0 +/* 8D4154 80240394 00000000 */ nop +/* 8D4158 80240398 46800020 */ cvt.s.w $f0, $f0 +/* 8D415C 8024039C 080900EA */ j .L802403A8 +/* 8D4160 802403A0 4600A500 */ add.s $f20, $f20, $f0 +.L802403A4: +/* 8D4164 802403A4 4604A500 */ add.s $f20, $f20, $f4 +.L802403A8: +/* 8D4168 802403A8 0C00A6C9 */ jal clamp_angle +/* 8D416C 802403AC 4600A306 */ mov.s $f12, $f20 +/* 8D4170 802403B0 2402000D */ addiu $v0, $zero, 0xd +/* 8D4174 802403B4 E640000C */ swc1 $f0, 0xc($s2) +/* 8D4178 802403B8 AE620070 */ sw $v0, 0x70($s3) +/* 8D417C 802403BC 8FBF0020 */ lw $ra, 0x20($sp) +/* 8D4180 802403C0 8FB3001C */ lw $s3, 0x1c($sp) +/* 8D4184 802403C4 8FB20018 */ lw $s2, 0x18($sp) +/* 8D4188 802403C8 8FB10014 */ lw $s1, 0x14($sp) +/* 8D418C 802403CC 8FB00010 */ lw $s0, 0x10($sp) +/* 8D4190 802403D0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8D4194 802403D4 03E00008 */ jr $ra +/* 8D4198 802403D8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC.s deleted file mode 100644 index d059e39103..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403DC -/* 8D419C 802403DC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8D41A0 802403E0 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D41A4 802403E4 0080982D */ daddu $s3, $a0, $zero -/* 8D41A8 802403E8 AFBF0040 */ sw $ra, 0x40($sp) -/* 8D41AC 802403EC AFB20038 */ sw $s2, 0x38($sp) -/* 8D41B0 802403F0 AFB10034 */ sw $s1, 0x34($sp) -/* 8D41B4 802403F4 AFB00030 */ sw $s0, 0x30($sp) -/* 8D41B8 802403F8 8E720148 */ lw $s2, 0x148($s3) -/* 8D41BC 802403FC 00A0882D */ daddu $s1, $a1, $zero -/* 8D41C0 80240400 86440008 */ lh $a0, 8($s2) -/* 8D41C4 80240404 0C00EABB */ jal get_npc_unsafe -/* 8D41C8 80240408 00C0802D */ daddu $s0, $a2, $zero -/* 8D41CC 8024040C 0200202D */ daddu $a0, $s0, $zero -/* 8D41D0 80240410 0240282D */ daddu $a1, $s2, $zero -/* 8D41D4 80240414 24030001 */ addiu $v1, $zero, 1 -/* 8D41D8 80240418 AFA30010 */ sw $v1, 0x10($sp) -/* 8D41DC 8024041C 8E260018 */ lw $a2, 0x18($s1) -/* 8D41E0 80240420 8E27001C */ lw $a3, 0x1c($s1) -/* 8D41E4 80240424 0C01242D */ jal func_800490B4 -/* 8D41E8 80240428 0040802D */ daddu $s0, $v0, $zero -/* 8D41EC 8024042C 1440001D */ bnez $v0, .L802404A4 -/* 8D41F0 80240430 24040002 */ addiu $a0, $zero, 2 -/* 8D41F4 80240434 0200282D */ daddu $a1, $s0, $zero -/* 8D41F8 80240438 0000302D */ daddu $a2, $zero, $zero -/* 8D41FC 8024043C 860300A8 */ lh $v1, 0xa8($s0) -/* 8D4200 80240440 3C013F80 */ lui $at, 0x3f80 -/* 8D4204 80240444 44810000 */ mtc1 $at, $f0 -/* 8D4208 80240448 3C014000 */ lui $at, 0x4000 -/* 8D420C 8024044C 44811000 */ mtc1 $at, $f2 -/* 8D4210 80240450 3C01C1A0 */ lui $at, 0xc1a0 -/* 8D4214 80240454 44812000 */ mtc1 $at, $f4 -/* 8D4218 80240458 2402000F */ addiu $v0, $zero, 0xf -/* 8D421C 8024045C AFA2001C */ sw $v0, 0x1c($sp) -/* 8D4220 80240460 44833000 */ mtc1 $v1, $f6 -/* 8D4224 80240464 00000000 */ nop -/* 8D4228 80240468 468031A0 */ cvt.s.w $f6, $f6 -/* 8D422C 8024046C 44073000 */ mfc1 $a3, $f6 -/* 8D4230 80240470 27A20028 */ addiu $v0, $sp, 0x28 -/* 8D4234 80240474 AFA20020 */ sw $v0, 0x20($sp) -/* 8D4238 80240478 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8D423C 8024047C E7A20014 */ swc1 $f2, 0x14($sp) -/* 8D4240 80240480 0C01BFA4 */ jal fx_emote -/* 8D4244 80240484 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8D4248 80240488 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D424C 8024048C 8C430000 */ lw $v1, ($v0) -/* 8D4250 80240490 24020019 */ addiu $v0, $zero, 0x19 -/* 8D4254 80240494 A602008E */ sh $v0, 0x8e($s0) -/* 8D4258 80240498 2402000E */ addiu $v0, $zero, 0xe -/* 8D425C 8024049C 08090136 */ j .L802404D8 -/* 8D4260 802404A0 AE030028 */ sw $v1, 0x28($s0) -.L802404A4: -/* 8D4264 802404A4 8E050018 */ lw $a1, 0x18($s0) -/* 8D4268 802404A8 8E06000C */ lw $a2, 0xc($s0) -/* 8D426C 802404AC 0C00EA95 */ jal npc_move_heading -/* 8D4270 802404B0 0200202D */ daddu $a0, $s0, $zero -/* 8D4274 802404B4 0200202D */ daddu $a0, $s0, $zero -/* 8D4278 802404B8 0C00F598 */ jal func_8003D660 -/* 8D427C 802404BC 24050001 */ addiu $a1, $zero, 1 -/* 8D4280 802404C0 9602008E */ lhu $v0, 0x8e($s0) -/* 8D4284 802404C4 2442FFFF */ addiu $v0, $v0, -1 -/* 8D4288 802404C8 A602008E */ sh $v0, 0x8e($s0) -/* 8D428C 802404CC 00021400 */ sll $v0, $v0, 0x10 -/* 8D4290 802404D0 14400002 */ bnez $v0, .L802404DC -/* 8D4294 802404D4 2402000C */ addiu $v0, $zero, 0xc -.L802404D8: -/* 8D4298 802404D8 AE620070 */ sw $v0, 0x70($s3) -.L802404DC: -/* 8D429C 802404DC 8FBF0040 */ lw $ra, 0x40($sp) -/* 8D42A0 802404E0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D42A4 802404E4 8FB20038 */ lw $s2, 0x38($sp) -/* 8D42A8 802404E8 8FB10034 */ lw $s1, 0x34($sp) -/* 8D42AC 802404EC 8FB00030 */ lw $s0, 0x30($sp) -/* 8D42B0 802404F0 03E00008 */ jr $ra -/* 8D42B4 802404F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s new file mode 100644 index 0000000000..0f8c8f4647 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802403DC_8D419C.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403DC_8D419C +/* 8D419C 802403DC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8D41A0 802403E0 AFB3003C */ sw $s3, 0x3c($sp) +/* 8D41A4 802403E4 0080982D */ daddu $s3, $a0, $zero +/* 8D41A8 802403E8 AFBF0040 */ sw $ra, 0x40($sp) +/* 8D41AC 802403EC AFB20038 */ sw $s2, 0x38($sp) +/* 8D41B0 802403F0 AFB10034 */ sw $s1, 0x34($sp) +/* 8D41B4 802403F4 AFB00030 */ sw $s0, 0x30($sp) +/* 8D41B8 802403F8 8E720148 */ lw $s2, 0x148($s3) +/* 8D41BC 802403FC 00A0882D */ daddu $s1, $a1, $zero +/* 8D41C0 80240400 86440008 */ lh $a0, 8($s2) +/* 8D41C4 80240404 0C00EABB */ jal get_npc_unsafe +/* 8D41C8 80240408 00C0802D */ daddu $s0, $a2, $zero +/* 8D41CC 8024040C 0200202D */ daddu $a0, $s0, $zero +/* 8D41D0 80240410 0240282D */ daddu $a1, $s2, $zero +/* 8D41D4 80240414 24030001 */ addiu $v1, $zero, 1 +/* 8D41D8 80240418 AFA30010 */ sw $v1, 0x10($sp) +/* 8D41DC 8024041C 8E260018 */ lw $a2, 0x18($s1) +/* 8D41E0 80240420 8E27001C */ lw $a3, 0x1c($s1) +/* 8D41E4 80240424 0C01242D */ jal func_800490B4 +/* 8D41E8 80240428 0040802D */ daddu $s0, $v0, $zero +/* 8D41EC 8024042C 1440001D */ bnez $v0, .L802404A4 +/* 8D41F0 80240430 24040002 */ addiu $a0, $zero, 2 +/* 8D41F4 80240434 0200282D */ daddu $a1, $s0, $zero +/* 8D41F8 80240438 0000302D */ daddu $a2, $zero, $zero +/* 8D41FC 8024043C 860300A8 */ lh $v1, 0xa8($s0) +/* 8D4200 80240440 3C013F80 */ lui $at, 0x3f80 +/* 8D4204 80240444 44810000 */ mtc1 $at, $f0 +/* 8D4208 80240448 3C014000 */ lui $at, 0x4000 +/* 8D420C 8024044C 44811000 */ mtc1 $at, $f2 +/* 8D4210 80240450 3C01C1A0 */ lui $at, 0xc1a0 +/* 8D4214 80240454 44812000 */ mtc1 $at, $f4 +/* 8D4218 80240458 2402000F */ addiu $v0, $zero, 0xf +/* 8D421C 8024045C AFA2001C */ sw $v0, 0x1c($sp) +/* 8D4220 80240460 44833000 */ mtc1 $v1, $f6 +/* 8D4224 80240464 00000000 */ nop +/* 8D4228 80240468 468031A0 */ cvt.s.w $f6, $f6 +/* 8D422C 8024046C 44073000 */ mfc1 $a3, $f6 +/* 8D4230 80240470 27A20028 */ addiu $v0, $sp, 0x28 +/* 8D4234 80240474 AFA20020 */ sw $v0, 0x20($sp) +/* 8D4238 80240478 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8D423C 8024047C E7A20014 */ swc1 $f2, 0x14($sp) +/* 8D4240 80240480 0C01BFA4 */ jal fx_emote +/* 8D4244 80240484 E7A40018 */ swc1 $f4, 0x18($sp) +/* 8D4248 80240488 8E4200CC */ lw $v0, 0xcc($s2) +/* 8D424C 8024048C 8C430000 */ lw $v1, ($v0) +/* 8D4250 80240490 24020019 */ addiu $v0, $zero, 0x19 +/* 8D4254 80240494 A602008E */ sh $v0, 0x8e($s0) +/* 8D4258 80240498 2402000E */ addiu $v0, $zero, 0xe +/* 8D425C 8024049C 08090136 */ j .L802404D8 +/* 8D4260 802404A0 AE030028 */ sw $v1, 0x28($s0) +.L802404A4: +/* 8D4264 802404A4 8E050018 */ lw $a1, 0x18($s0) +/* 8D4268 802404A8 8E06000C */ lw $a2, 0xc($s0) +/* 8D426C 802404AC 0C00EA95 */ jal npc_move_heading +/* 8D4270 802404B0 0200202D */ daddu $a0, $s0, $zero +/* 8D4274 802404B4 0200202D */ daddu $a0, $s0, $zero +/* 8D4278 802404B8 0C00F598 */ jal func_8003D660 +/* 8D427C 802404BC 24050001 */ addiu $a1, $zero, 1 +/* 8D4280 802404C0 9602008E */ lhu $v0, 0x8e($s0) +/* 8D4284 802404C4 2442FFFF */ addiu $v0, $v0, -1 +/* 8D4288 802404C8 A602008E */ sh $v0, 0x8e($s0) +/* 8D428C 802404CC 00021400 */ sll $v0, $v0, 0x10 +/* 8D4290 802404D0 14400002 */ bnez $v0, .L802404DC +/* 8D4294 802404D4 2402000C */ addiu $v0, $zero, 0xc +.L802404D8: +/* 8D4298 802404D8 AE620070 */ sw $v0, 0x70($s3) +.L802404DC: +/* 8D429C 802404DC 8FBF0040 */ lw $ra, 0x40($sp) +/* 8D42A0 802404E0 8FB3003C */ lw $s3, 0x3c($sp) +/* 8D42A4 802404E4 8FB20038 */ lw $s2, 0x38($sp) +/* 8D42A8 802404E8 8FB10034 */ lw $s1, 0x34($sp) +/* 8D42AC 802404EC 8FB00030 */ lw $s0, 0x30($sp) +/* 8D42B0 802404F0 03E00008 */ jr $ra +/* 8D42B4 802404F4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8.s deleted file mode 100644 index 164f594ca8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404F8 -/* 8D42B8 802404F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D42BC 802404FC AFB00010 */ sw $s0, 0x10($sp) -/* 8D42C0 80240500 0080802D */ daddu $s0, $a0, $zero -/* 8D42C4 80240504 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D42C8 80240508 8E020148 */ lw $v0, 0x148($s0) -/* 8D42CC 8024050C 0C00EABB */ jal get_npc_unsafe -/* 8D42D0 80240510 84440008 */ lh $a0, 8($v0) -/* 8D42D4 80240514 9443008E */ lhu $v1, 0x8e($v0) -/* 8D42D8 80240518 2463FFFF */ addiu $v1, $v1, -1 -/* 8D42DC 8024051C A443008E */ sh $v1, 0x8e($v0) -/* 8D42E0 80240520 00031C00 */ sll $v1, $v1, 0x10 -/* 8D42E4 80240524 14600002 */ bnez $v1, .L80240530 -/* 8D42E8 80240528 2402000F */ addiu $v0, $zero, 0xf -/* 8D42EC 8024052C AE020070 */ sw $v0, 0x70($s0) -.L80240530: -/* 8D42F0 80240530 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D42F4 80240534 8FB00010 */ lw $s0, 0x10($sp) -/* 8D42F8 80240538 03E00008 */ jr $ra -/* 8D42FC 8024053C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8_8D42B8.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8_8D42B8.s new file mode 100644 index 0000000000..cae7b2f981 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802404F8_8D42B8.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404F8_8D42B8 +/* 8D42B8 802404F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8D42BC 802404FC AFB00010 */ sw $s0, 0x10($sp) +/* 8D42C0 80240500 0080802D */ daddu $s0, $a0, $zero +/* 8D42C4 80240504 AFBF0014 */ sw $ra, 0x14($sp) +/* 8D42C8 80240508 8E020148 */ lw $v0, 0x148($s0) +/* 8D42CC 8024050C 0C00EABB */ jal get_npc_unsafe +/* 8D42D0 80240510 84440008 */ lh $a0, 8($v0) +/* 8D42D4 80240514 9443008E */ lhu $v1, 0x8e($v0) +/* 8D42D8 80240518 2463FFFF */ addiu $v1, $v1, -1 +/* 8D42DC 8024051C A443008E */ sh $v1, 0x8e($v0) +/* 8D42E0 80240520 00031C00 */ sll $v1, $v1, 0x10 +/* 8D42E4 80240524 14600002 */ bnez $v1, .L80240530 +/* 8D42E8 80240528 2402000F */ addiu $v0, $zero, 0xf +/* 8D42EC 8024052C AE020070 */ sw $v0, 0x70($s0) +.L80240530: +/* 8D42F0 80240530 8FBF0014 */ lw $ra, 0x14($sp) +/* 8D42F4 80240534 8FB00010 */ lw $s0, 0x10($sp) +/* 8D42F8 80240538 03E00008 */ jr $ra +/* 8D42FC 8024053C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4.s deleted file mode 100644 index 09b5c48467..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F4 -/* 8D45B4 802407F4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8D45B8 802407F8 AFB40040 */ sw $s4, 0x40($sp) -/* 8D45BC 802407FC 0080A02D */ daddu $s4, $a0, $zero -/* 8D45C0 80240800 AFBF0048 */ sw $ra, 0x48($sp) -/* 8D45C4 80240804 AFB50044 */ sw $s5, 0x44($sp) -/* 8D45C8 80240808 AFB3003C */ sw $s3, 0x3c($sp) -/* 8D45CC 8024080C AFB20038 */ sw $s2, 0x38($sp) -/* 8D45D0 80240810 AFB10034 */ sw $s1, 0x34($sp) -/* 8D45D4 80240814 AFB00030 */ sw $s0, 0x30($sp) -/* 8D45D8 80240818 8E920148 */ lw $s2, 0x148($s4) -/* 8D45DC 8024081C 86440008 */ lh $a0, 8($s2) -/* 8D45E0 80240820 8E90000C */ lw $s0, 0xc($s4) -/* 8D45E4 80240824 0C00EABB */ jal get_npc_unsafe -/* 8D45E8 80240828 00A0882D */ daddu $s1, $a1, $zero -/* 8D45EC 8024082C 0280202D */ daddu $a0, $s4, $zero -/* 8D45F0 80240830 8E050000 */ lw $a1, ($s0) -/* 8D45F4 80240834 0C0B1EAF */ jal get_variable -/* 8D45F8 80240838 0040802D */ daddu $s0, $v0, $zero -/* 8D45FC 8024083C AFA00010 */ sw $zero, 0x10($sp) -/* 8D4600 80240840 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D4604 80240844 8C630030 */ lw $v1, 0x30($v1) -/* 8D4608 80240848 AFA30014 */ sw $v1, 0x14($sp) -/* 8D460C 8024084C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D4610 80240850 8C63001C */ lw $v1, 0x1c($v1) -/* 8D4614 80240854 AFA30018 */ sw $v1, 0x18($sp) -/* 8D4618 80240858 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D461C 8024085C 8C630024 */ lw $v1, 0x24($v1) -/* 8D4620 80240860 AFA3001C */ sw $v1, 0x1c($sp) -/* 8D4624 80240864 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D4628 80240868 8C630028 */ lw $v1, 0x28($v1) -/* 8D462C 8024086C 27B50010 */ addiu $s5, $sp, 0x10 -/* 8D4630 80240870 AFA30020 */ sw $v1, 0x20($sp) -/* 8D4634 80240874 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8D4638 80240878 3C014282 */ lui $at, 0x4282 -/* 8D463C 8024087C 44810000 */ mtc1 $at, $f0 -/* 8D4640 80240880 8C63002C */ lw $v1, 0x2c($v1) -/* 8D4644 80240884 0040982D */ daddu $s3, $v0, $zero -/* 8D4648 80240888 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8D464C 8024088C A7A0002C */ sh $zero, 0x2c($sp) -/* 8D4650 80240890 16200005 */ bnez $s1, .L802408A8 -/* 8D4654 80240894 AFA30024 */ sw $v1, 0x24($sp) -/* 8D4658 80240898 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8D465C 8024089C 30420004 */ andi $v0, $v0, 4 -/* 8D4660 802408A0 1040002F */ beqz $v0, .L80240960 -/* 8D4664 802408A4 00000000 */ nop -.L802408A8: -/* 8D4668 802408A8 AE800070 */ sw $zero, 0x70($s4) -/* 8D466C 802408AC C600000C */ lwc1 $f0, 0xc($s0) -/* 8D4670 802408B0 A600008E */ sh $zero, 0x8e($s0) -/* 8D4674 802408B4 8E4200CC */ lw $v0, 0xcc($s2) -/* 8D4678 802408B8 4600008D */ trunc.w.s $f2, $f0 -/* 8D467C 802408BC E642006C */ swc1 $f2, 0x6c($s2) -/* 8D4680 802408C0 8C420000 */ lw $v0, ($v0) -/* 8D4684 802408C4 8E030000 */ lw $v1, ($s0) -/* 8D4688 802408C8 AE020028 */ sw $v0, 0x28($s0) -/* 8D468C 802408CC 2402F7FF */ addiu $v0, $zero, -0x801 -/* 8D4690 802408D0 00621824 */ and $v1, $v1, $v0 -/* 8D4694 802408D4 AE030000 */ sw $v1, ($s0) -/* 8D4698 802408D8 8E4200D0 */ lw $v0, 0xd0($s2) -/* 8D469C 802408DC 8C420034 */ lw $v0, 0x34($v0) -/* 8D46A0 802408E0 54400005 */ bnel $v0, $zero, .L802408F8 -/* 8D46A4 802408E4 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8D46A8 802408E8 34620200 */ ori $v0, $v1, 0x200 -/* 8D46AC 802408EC 2403FFF7 */ addiu $v1, $zero, -9 -/* 8D46B0 802408F0 08090240 */ j .L80240900 -/* 8D46B4 802408F4 00431024 */ and $v0, $v0, $v1 -.L802408F8: -/* 8D46B8 802408F8 00621024 */ and $v0, $v1, $v0 -/* 8D46BC 802408FC 34420008 */ ori $v0, $v0, 8 -.L80240900: -/* 8D46C0 80240900 AE020000 */ sw $v0, ($s0) -/* 8D46C4 80240904 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8D46C8 80240908 30420004 */ andi $v0, $v0, 4 -/* 8D46CC 8024090C 10400009 */ beqz $v0, .L80240934 -/* 8D46D0 80240910 24020063 */ addiu $v0, $zero, 0x63 -/* 8D46D4 80240914 AE820070 */ sw $v0, 0x70($s4) -/* 8D46D8 80240918 2402000F */ addiu $v0, $zero, 0xf -/* 8D46DC 8024091C AE820074 */ sw $v0, 0x74($s4) -/* 8D46E0 80240920 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8D46E4 80240924 2403FFFB */ addiu $v1, $zero, -5 -/* 8D46E8 80240928 00431024 */ and $v0, $v0, $v1 -/* 8D46EC 8024092C 08090258 */ j .L80240960 -/* 8D46F0 80240930 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240934: -/* 8D46F4 80240934 8E420000 */ lw $v0, ($s2) -/* 8D46F8 80240938 3C034000 */ lui $v1, 0x4000 -/* 8D46FC 8024093C 00431024 */ and $v0, $v0, $v1 -/* 8D4700 80240940 10400007 */ beqz $v0, .L80240960 -/* 8D4704 80240944 3C03BFFF */ lui $v1, 0xbfff -/* 8D4708 80240948 2402000C */ addiu $v0, $zero, 0xc -/* 8D470C 8024094C AE820070 */ sw $v0, 0x70($s4) -/* 8D4710 80240950 8E420000 */ lw $v0, ($s2) -/* 8D4714 80240954 3463FFFF */ ori $v1, $v1, 0xffff -/* 8D4718 80240958 00431024 */ and $v0, $v0, $v1 -/* 8D471C 8024095C AE420000 */ sw $v0, ($s2) -.L80240960: -/* 8D4720 80240960 8E830070 */ lw $v1, 0x70($s4) -/* 8D4724 80240964 2C620064 */ sltiu $v0, $v1, 0x64 -/* 8D4728 80240968 10400036 */ beqz $v0, .L80240A44 -/* 8D472C 8024096C 00031080 */ sll $v0, $v1, 2 -/* 8D4730 80240970 3C018024 */ lui $at, 0x8024 -/* 8D4734 80240974 00220821 */ addu $at, $at, $v0 -/* 8D4738 80240978 8C221EA8 */ lw $v0, 0x1ea8($at) -/* 8D473C 8024097C 00400008 */ jr $v0 -/* 8D4740 80240980 00000000 */ nop -/* 8D4744 80240984 0280202D */ daddu $a0, $s4, $zero -/* 8D4748 80240988 0260282D */ daddu $a1, $s3, $zero -/* 8D474C 8024098C 0C090000 */ jal func_80240000 -/* 8D4750 80240990 02A0302D */ daddu $a2, $s5, $zero -/* 8D4754 80240994 0280202D */ daddu $a0, $s4, $zero -/* 8D4758 80240998 0260282D */ daddu $a1, $s3, $zero -/* 8D475C 8024099C 0C09002D */ jal func_802400B4 -/* 8D4760 802409A0 02A0302D */ daddu $a2, $s5, $zero -/* 8D4764 802409A4 08090291 */ j .L80240A44 -/* 8D4768 802409A8 00000000 */ nop -/* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero -/* 8D4770 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 8D4774 802409B4 0C090075 */ jal func_802401D4 -/* 8D4778 802409B8 02A0302D */ daddu $a2, $s5, $zero -/* 8D477C 802409BC 0280202D */ daddu $a0, $s4, $zero -/* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 8D4784 802409C4 0C09008D */ jal func_80240234 -/* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero -/* 8D478C 802409CC 08090291 */ j .L80240A44 -/* 8D4790 802409D0 00000000 */ nop -/* 8D4794 802409D4 0280202D */ daddu $a0, $s4, $zero -/* 8D4798 802409D8 0260282D */ daddu $a1, $s3, $zero -/* 8D479C 802409DC 0C0900AB */ jal func_802402AC -/* 8D47A0 802409E0 02A0302D */ daddu $a2, $s5, $zero -/* 8D47A4 802409E4 0280202D */ daddu $a0, $s4, $zero -/* 8D47A8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 8D47AC 802409EC 0C0900F7 */ jal func_802403DC -/* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero -/* 8D47B4 802409F4 08090291 */ j .L80240A44 -/* 8D47B8 802409F8 00000000 */ nop -/* 8D47BC 802409FC 0280202D */ daddu $a0, $s4, $zero -/* 8D47C0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 8D47C4 80240A04 0C09013E */ jal func_802404F8 -/* 8D47C8 80240A08 02A0302D */ daddu $a2, $s5, $zero -/* 8D47CC 80240A0C 08090291 */ j .L80240A44 -/* 8D47D0 80240A10 00000000 */ nop -/* 8D47D4 80240A14 0280202D */ daddu $a0, $s4, $zero -/* 8D47D8 80240A18 0260282D */ daddu $a1, $s3, $zero -/* 8D47DC 80240A1C 0C090150 */ jal func_80240540 -/* 8D47E0 80240A20 02A0302D */ daddu $a2, $s5, $zero -/* 8D47E4 80240A24 0280202D */ daddu $a0, $s4, $zero -/* 8D47E8 80240A28 0260282D */ daddu $a1, $s3, $zero -/* 8D47EC 80240A2C 0C09017B */ jal func_802405EC -/* 8D47F0 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* 8D47F4 80240A34 08090291 */ j .L80240A44 -/* 8D47F8 80240A38 00000000 */ nop -/* 8D47FC 80240A3C 0C0129CF */ jal func_8004A73C -/* 8D4800 80240A40 0280202D */ daddu $a0, $s4, $zero -.L80240A44: -/* 8D4804 80240A44 8FBF0048 */ lw $ra, 0x48($sp) -/* 8D4808 80240A48 8FB50044 */ lw $s5, 0x44($sp) -/* 8D480C 80240A4C 8FB40040 */ lw $s4, 0x40($sp) -/* 8D4810 80240A50 8FB3003C */ lw $s3, 0x3c($sp) -/* 8D4814 80240A54 8FB20038 */ lw $s2, 0x38($sp) -/* 8D4818 80240A58 8FB10034 */ lw $s1, 0x34($sp) -/* 8D481C 80240A5C 8FB00030 */ lw $s0, 0x30($sp) -/* 8D4820 80240A60 0000102D */ daddu $v0, $zero, $zero -/* 8D4824 80240A64 03E00008 */ jr $ra -/* 8D4828 80240A68 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s new file mode 100644 index 0000000000..53243bfcd2 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_802407F4_8D45B4.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407F4_8D45B4 +/* 8D45B4 802407F4 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 8D45B8 802407F8 AFB40040 */ sw $s4, 0x40($sp) +/* 8D45BC 802407FC 0080A02D */ daddu $s4, $a0, $zero +/* 8D45C0 80240800 AFBF0048 */ sw $ra, 0x48($sp) +/* 8D45C4 80240804 AFB50044 */ sw $s5, 0x44($sp) +/* 8D45C8 80240808 AFB3003C */ sw $s3, 0x3c($sp) +/* 8D45CC 8024080C AFB20038 */ sw $s2, 0x38($sp) +/* 8D45D0 80240810 AFB10034 */ sw $s1, 0x34($sp) +/* 8D45D4 80240814 AFB00030 */ sw $s0, 0x30($sp) +/* 8D45D8 80240818 8E920148 */ lw $s2, 0x148($s4) +/* 8D45DC 8024081C 86440008 */ lh $a0, 8($s2) +/* 8D45E0 80240820 8E90000C */ lw $s0, 0xc($s4) +/* 8D45E4 80240824 0C00EABB */ jal get_npc_unsafe +/* 8D45E8 80240828 00A0882D */ daddu $s1, $a1, $zero +/* 8D45EC 8024082C 0280202D */ daddu $a0, $s4, $zero +/* 8D45F0 80240830 8E050000 */ lw $a1, ($s0) +/* 8D45F4 80240834 0C0B1EAF */ jal get_variable +/* 8D45F8 80240838 0040802D */ daddu $s0, $v0, $zero +/* 8D45FC 8024083C AFA00010 */ sw $zero, 0x10($sp) +/* 8D4600 80240840 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8D4604 80240844 8C630030 */ lw $v1, 0x30($v1) +/* 8D4608 80240848 AFA30014 */ sw $v1, 0x14($sp) +/* 8D460C 8024084C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8D4610 80240850 8C63001C */ lw $v1, 0x1c($v1) +/* 8D4614 80240854 AFA30018 */ sw $v1, 0x18($sp) +/* 8D4618 80240858 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8D461C 8024085C 8C630024 */ lw $v1, 0x24($v1) +/* 8D4620 80240860 AFA3001C */ sw $v1, 0x1c($sp) +/* 8D4624 80240864 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8D4628 80240868 8C630028 */ lw $v1, 0x28($v1) +/* 8D462C 8024086C 27B50010 */ addiu $s5, $sp, 0x10 +/* 8D4630 80240870 AFA30020 */ sw $v1, 0x20($sp) +/* 8D4634 80240874 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8D4638 80240878 3C014282 */ lui $at, 0x4282 +/* 8D463C 8024087C 44810000 */ mtc1 $at, $f0 +/* 8D4640 80240880 8C63002C */ lw $v1, 0x2c($v1) +/* 8D4644 80240884 0040982D */ daddu $s3, $v0, $zero +/* 8D4648 80240888 E7A00028 */ swc1 $f0, 0x28($sp) +/* 8D464C 8024088C A7A0002C */ sh $zero, 0x2c($sp) +/* 8D4650 80240890 16200005 */ bnez $s1, .L802408A8 +/* 8D4654 80240894 AFA30024 */ sw $v1, 0x24($sp) +/* 8D4658 80240898 8E4200B0 */ lw $v0, 0xb0($s2) +/* 8D465C 8024089C 30420004 */ andi $v0, $v0, 4 +/* 8D4660 802408A0 1040002F */ beqz $v0, .L80240960 +/* 8D4664 802408A4 00000000 */ nop +.L802408A8: +/* 8D4668 802408A8 AE800070 */ sw $zero, 0x70($s4) +/* 8D466C 802408AC C600000C */ lwc1 $f0, 0xc($s0) +/* 8D4670 802408B0 A600008E */ sh $zero, 0x8e($s0) +/* 8D4674 802408B4 8E4200CC */ lw $v0, 0xcc($s2) +/* 8D4678 802408B8 4600008D */ trunc.w.s $f2, $f0 +/* 8D467C 802408BC E642006C */ swc1 $f2, 0x6c($s2) +/* 8D4680 802408C0 8C420000 */ lw $v0, ($v0) +/* 8D4684 802408C4 8E030000 */ lw $v1, ($s0) +/* 8D4688 802408C8 AE020028 */ sw $v0, 0x28($s0) +/* 8D468C 802408CC 2402F7FF */ addiu $v0, $zero, -0x801 +/* 8D4690 802408D0 00621824 */ and $v1, $v1, $v0 +/* 8D4694 802408D4 AE030000 */ sw $v1, ($s0) +/* 8D4698 802408D8 8E4200D0 */ lw $v0, 0xd0($s2) +/* 8D469C 802408DC 8C420034 */ lw $v0, 0x34($v0) +/* 8D46A0 802408E0 54400005 */ bnel $v0, $zero, .L802408F8 +/* 8D46A4 802408E4 2402FDFF */ addiu $v0, $zero, -0x201 +/* 8D46A8 802408E8 34620200 */ ori $v0, $v1, 0x200 +/* 8D46AC 802408EC 2403FFF7 */ addiu $v1, $zero, -9 +/* 8D46B0 802408F0 08090240 */ j .L80240900 +/* 8D46B4 802408F4 00431024 */ and $v0, $v0, $v1 +.L802408F8: +/* 8D46B8 802408F8 00621024 */ and $v0, $v1, $v0 +/* 8D46BC 802408FC 34420008 */ ori $v0, $v0, 8 +.L80240900: +/* 8D46C0 80240900 AE020000 */ sw $v0, ($s0) +/* 8D46C4 80240904 8E4200B0 */ lw $v0, 0xb0($s2) +/* 8D46C8 80240908 30420004 */ andi $v0, $v0, 4 +/* 8D46CC 8024090C 10400009 */ beqz $v0, .L80240934 +/* 8D46D0 80240910 24020063 */ addiu $v0, $zero, 0x63 +/* 8D46D4 80240914 AE820070 */ sw $v0, 0x70($s4) +/* 8D46D8 80240918 2402000F */ addiu $v0, $zero, 0xf +/* 8D46DC 8024091C AE820074 */ sw $v0, 0x74($s4) +/* 8D46E0 80240920 8E4200B0 */ lw $v0, 0xb0($s2) +/* 8D46E4 80240924 2403FFFB */ addiu $v1, $zero, -5 +/* 8D46E8 80240928 00431024 */ and $v0, $v0, $v1 +/* 8D46EC 8024092C 08090258 */ j .L80240960 +/* 8D46F0 80240930 AE4200B0 */ sw $v0, 0xb0($s2) +.L80240934: +/* 8D46F4 80240934 8E420000 */ lw $v0, ($s2) +/* 8D46F8 80240938 3C034000 */ lui $v1, 0x4000 +/* 8D46FC 8024093C 00431024 */ and $v0, $v0, $v1 +/* 8D4700 80240940 10400007 */ beqz $v0, .L80240960 +/* 8D4704 80240944 3C03BFFF */ lui $v1, 0xbfff +/* 8D4708 80240948 2402000C */ addiu $v0, $zero, 0xc +/* 8D470C 8024094C AE820070 */ sw $v0, 0x70($s4) +/* 8D4710 80240950 8E420000 */ lw $v0, ($s2) +/* 8D4714 80240954 3463FFFF */ ori $v1, $v1, 0xffff +/* 8D4718 80240958 00431024 */ and $v0, $v0, $v1 +/* 8D471C 8024095C AE420000 */ sw $v0, ($s2) +.L80240960: +/* 8D4720 80240960 8E830070 */ lw $v1, 0x70($s4) +/* 8D4724 80240964 2C620064 */ sltiu $v0, $v1, 0x64 +/* 8D4728 80240968 10400036 */ beqz $v0, .L80240A44 +/* 8D472C 8024096C 00031080 */ sll $v0, $v1, 2 +/* 8D4730 80240970 3C018024 */ lui $at, 0x8024 +/* 8D4734 80240974 00220821 */ addu $at, $at, $v0 +/* 8D4738 80240978 8C221EA8 */ lw $v0, 0x1ea8($at) +/* 8D473C 8024097C 00400008 */ jr $v0 +/* 8D4740 80240980 00000000 */ nop +/* 8D4744 80240984 0280202D */ daddu $a0, $s4, $zero +/* 8D4748 80240988 0260282D */ daddu $a1, $s3, $zero +/* 8D474C 8024098C 0C090000 */ jal func_80240000_8D3DC0 +/* 8D4750 80240990 02A0302D */ daddu $a2, $s5, $zero +/* 8D4754 80240994 0280202D */ daddu $a0, $s4, $zero +/* 8D4758 80240998 0260282D */ daddu $a1, $s3, $zero +/* 8D475C 8024099C 0C09002D */ jal func_802400B4_8D3E74 +/* 8D4760 802409A0 02A0302D */ daddu $a2, $s5, $zero +/* 8D4764 802409A4 08090291 */ j .L80240A44 +/* 8D4768 802409A8 00000000 */ nop +/* 8D476C 802409AC 0280202D */ daddu $a0, $s4, $zero +/* 8D4770 802409B0 0260282D */ daddu $a1, $s3, $zero +/* 8D4774 802409B4 0C090075 */ jal func_802401D4_8D3F94 +/* 8D4778 802409B8 02A0302D */ daddu $a2, $s5, $zero +/* 8D477C 802409BC 0280202D */ daddu $a0, $s4, $zero +/* 8D4780 802409C0 0260282D */ daddu $a1, $s3, $zero +/* 8D4784 802409C4 0C09008D */ jal func_80240234_8D3FF4 +/* 8D4788 802409C8 02A0302D */ daddu $a2, $s5, $zero +/* 8D478C 802409CC 08090291 */ j .L80240A44 +/* 8D4790 802409D0 00000000 */ nop +/* 8D4794 802409D4 0280202D */ daddu $a0, $s4, $zero +/* 8D4798 802409D8 0260282D */ daddu $a1, $s3, $zero +/* 8D479C 802409DC 0C0900AB */ jal func_802402AC_8D406C +/* 8D47A0 802409E0 02A0302D */ daddu $a2, $s5, $zero +/* 8D47A4 802409E4 0280202D */ daddu $a0, $s4, $zero +/* 8D47A8 802409E8 0260282D */ daddu $a1, $s3, $zero +/* 8D47AC 802409EC 0C0900F7 */ jal func_802403DC_8D419C +/* 8D47B0 802409F0 02A0302D */ daddu $a2, $s5, $zero +/* 8D47B4 802409F4 08090291 */ j .L80240A44 +/* 8D47B8 802409F8 00000000 */ nop +/* 8D47BC 802409FC 0280202D */ daddu $a0, $s4, $zero +/* 8D47C0 80240A00 0260282D */ daddu $a1, $s3, $zero +/* 8D47C4 80240A04 0C09013E */ jal func_802404F8_8D42B8 +/* 8D47C8 80240A08 02A0302D */ daddu $a2, $s5, $zero +/* 8D47CC 80240A0C 08090291 */ j .L80240A44 +/* 8D47D0 80240A10 00000000 */ nop +/* 8D47D4 80240A14 0280202D */ daddu $a0, $s4, $zero +/* 8D47D8 80240A18 0260282D */ daddu $a1, $s3, $zero +/* 8D47DC 80240A1C 0C090150 */ jal func_80240540_8D4300 +/* 8D47E0 80240A20 02A0302D */ daddu $a2, $s5, $zero +/* 8D47E4 80240A24 0280202D */ daddu $a0, $s4, $zero +/* 8D47E8 80240A28 0260282D */ daddu $a1, $s3, $zero +/* 8D47EC 80240A2C 0C09017B */ jal func_802405EC_8D43AC +/* 8D47F0 80240A30 02A0302D */ daddu $a2, $s5, $zero +/* 8D47F4 80240A34 08090291 */ j .L80240A44 +/* 8D47F8 80240A38 00000000 */ nop +/* 8D47FC 80240A3C 0C0129CF */ jal func_8004A73C +/* 8D4800 80240A40 0280202D */ daddu $a0, $s4, $zero +.L80240A44: +/* 8D4804 80240A44 8FBF0048 */ lw $ra, 0x48($sp) +/* 8D4808 80240A48 8FB50044 */ lw $s5, 0x44($sp) +/* 8D480C 80240A4C 8FB40040 */ lw $s4, 0x40($sp) +/* 8D4810 80240A50 8FB3003C */ lw $s3, 0x3c($sp) +/* 8D4814 80240A54 8FB20038 */ lw $s2, 0x38($sp) +/* 8D4818 80240A58 8FB10034 */ lw $s1, 0x34($sp) +/* 8D481C 80240A5C 8FB00030 */ lw $s0, 0x30($sp) +/* 8D4820 80240A60 0000102D */ daddu $v0, $zero, $zero +/* 8D4824 80240A64 03E00008 */ jr $ra +/* 8D4828 80240A68 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240A6C.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240A6C.s deleted file mode 100644 index 25b8a181cb..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240A6C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C -/* 8D482C 80240A6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D4830 80240A70 AFBF0010 */ sw $ra, 0x10($sp) -/* 8D4834 80240A74 0000202D */ daddu $a0, $zero, $zero -/* 8D4838 80240A78 3C05FD05 */ lui $a1, 0xfd05 -/* 8D483C 80240A7C 0C0B1EAF */ jal get_variable -/* 8D4840 80240A80 34A50F80 */ ori $a1, $a1, 0xf80 -/* 8D4844 80240A84 0C04417A */ jal get_entity_by_index -/* 8D4848 80240A88 0040202D */ daddu $a0, $v0, $zero -/* 8D484C 80240A8C 50400007 */ beql $v0, $zero, .L80240AAC -/* 8D4850 80240A90 0000102D */ daddu $v0, $zero, $zero -/* 8D4854 80240A94 84440014 */ lh $a0, 0x14($v0) -/* 8D4858 80240A98 3C050000 */ lui $a1, 0 -/* 8D485C 80240A9C 24A501E4 */ addiu $a1, $a1, 0x1e4 -/* 8D4860 80240AA0 0C048052 */ jal play_model_animation -/* 8D4864 80240AA4 00000000 */ nop -/* 8D4868 80240AA8 24020002 */ addiu $v0, $zero, 2 -.L80240AAC: -/* 8D486C 80240AAC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8D4870 80240AB0 03E00008 */ jr $ra -/* 8D4874 80240AB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8D4878 80240AB8 00000000 */ nop -/* 8D487C 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240A6C_8D482C.s b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240A6C_8D482C.s new file mode 100644 index 0000000000..a9f7e992c8 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_07/8D3DC0/func_80240A6C_8D482C.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A6C_8D482C +/* 8D482C 80240A6C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8D4830 80240A70 AFBF0010 */ sw $ra, 0x10($sp) +/* 8D4834 80240A74 0000202D */ daddu $a0, $zero, $zero +/* 8D4838 80240A78 3C05FD05 */ lui $a1, 0xfd05 +/* 8D483C 80240A7C 0C0B1EAF */ jal get_variable +/* 8D4840 80240A80 34A50F80 */ ori $a1, $a1, 0xf80 +/* 8D4844 80240A84 0C04417A */ jal get_entity_by_index +/* 8D4848 80240A88 0040202D */ daddu $a0, $v0, $zero +/* 8D484C 80240A8C 50400007 */ beql $v0, $zero, .L80240AAC +/* 8D4850 80240A90 0000102D */ daddu $v0, $zero, $zero +/* 8D4854 80240A94 84440014 */ lh $a0, 0x14($v0) +/* 8D4858 80240A98 3C050000 */ lui $a1, 0 +/* 8D485C 80240A9C 24A501E4 */ addiu $a1, $a1, 0x1e4 +/* 8D4860 80240AA0 0C048052 */ jal play_model_animation +/* 8D4864 80240AA4 00000000 */ nop +/* 8D4868 80240AA8 24020002 */ addiu $v0, $zero, 2 +.L80240AAC: +/* 8D486C 80240AAC 8FBF0010 */ lw $ra, 0x10($sp) +/* 8D4870 80240AB0 03E00008 */ jr $ra +/* 8D4874 80240AB4 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8D4878 80240AB8 00000000 */ nop +/* 8D487C 80240ABC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s index 81206eb756..870ac969d5 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_8024130C_8D710C.s @@ -46,7 +46,7 @@ glabel func_8024130C_8D710C /* 8D71B0 802413B0 02A0202D */ daddu $a0, $s5, $zero /* 8D71B4 802413B4 0240282D */ daddu $a1, $s2, $zero /* 8D71B8 802413B8 0280302D */ daddu $a2, $s4, $zero -/* 8D71BC 802413BC 0C09047A */ jal func_802411E8 +/* 8D71BC 802413BC 0C09047A */ jal func_802411E8_8D6FE8 /* 8D71C0 802413C0 0200382D */ daddu $a3, $s0, $zero .L802413C4: /* 8D71C4 802413C4 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_8024130C_8D710C /* 8D7214 80241414 00000000 */ nop /* 8D7218 80241418 0280202D */ daddu $a0, $s4, $zero /* 8D721C 8024141C 0200282D */ daddu $a1, $s0, $zero -/* 8D7220 80241420 0C090000 */ jal func_80240000 +/* 8D7220 80241420 0C090000 */ jal func_80240000_8D5E00 /* 8D7224 80241424 0260302D */ daddu $a2, $s3, $zero /* 8D7228 80241428 0280202D */ daddu $a0, $s4, $zero /* 8D722C 8024142C 0200282D */ daddu $a1, $s0, $zero -/* 8D7230 80241430 0C09006C */ jal func_802401B0 +/* 8D7230 80241430 0C09006C */ jal func_802401B0_8D5FB0 /* 8D7234 80241434 0260302D */ daddu $a2, $s3, $zero /* 8D7238 80241438 08090535 */ j .L802414D4 /* 8D723C 8024143C 0000102D */ daddu $v0, $zero, $zero /* 8D7240 80241440 0280202D */ daddu $a0, $s4, $zero /* 8D7244 80241444 0200282D */ daddu $a1, $s0, $zero -/* 8D7248 80241448 0C0901F6 */ jal func_802407D8 +/* 8D7248 80241448 0C0901F6 */ jal func_802407D8_8D65D8 /* 8D724C 8024144C 0260302D */ daddu $a2, $s3, $zero /* 8D7250 80241450 0280202D */ daddu $a0, $s4, $zero /* 8D7254 80241454 0200282D */ daddu $a1, $s0, $zero -/* 8D7258 80241458 0C090226 */ jal func_80240898 +/* 8D7258 80241458 0C090226 */ jal func_80240898_8D6698 /* 8D725C 8024145C 0260302D */ daddu $a2, $s3, $zero /* 8D7260 80241460 08090535 */ j .L802414D4 /* 8D7264 80241464 0000102D */ daddu $v0, $zero, $zero /* 8D7268 80241468 0280202D */ daddu $a0, $s4, $zero /* 8D726C 8024146C 0200282D */ daddu $a1, $s0, $zero -/* 8D7270 80241470 0C0902F7 */ jal func_80240BDC +/* 8D7270 80241470 0C0902F7 */ jal func_80240BDC_8D69DC /* 8D7274 80241474 0260302D */ daddu $a2, $s3, $zero /* 8D7278 80241478 0280202D */ daddu $a0, $s4, $zero /* 8D727C 8024147C 0200282D */ daddu $a1, $s0, $zero -/* 8D7280 80241480 0C090315 */ jal func_80240C54 +/* 8D7280 80241480 0C090315 */ jal func_80240C54_8D6A54 /* 8D7284 80241484 0260302D */ daddu $a2, $s3, $zero /* 8D7288 80241488 08090535 */ j .L802414D4 /* 8D728C 8024148C 0000102D */ daddu $v0, $zero, $zero /* 8D7290 80241490 0280202D */ daddu $a0, $s4, $zero /* 8D7294 80241494 0200282D */ daddu $a1, $s0, $zero -/* 8D7298 80241498 0C090330 */ jal func_80240CC0 +/* 8D7298 80241498 0C090330 */ jal func_80240CC0_8D6AC0 /* 8D729C 8024149C 0260302D */ daddu $a2, $s3, $zero /* 8D72A0 802414A0 08090535 */ j .L802414D4 /* 8D72A4 802414A4 0000102D */ daddu $v0, $zero, $zero /* 8D72A8 802414A8 0280202D */ daddu $a0, $s4, $zero /* 8D72AC 802414AC 0200282D */ daddu $a1, $s0, $zero -/* 8D72B0 802414B0 0C09037D */ jal func_80240DF4 +/* 8D72B0 802414B0 0C09037D */ jal func_80240DF4_8D6BF4 /* 8D72B4 802414B4 0260302D */ daddu $a2, $s3, $zero /* 8D72B8 802414B8 08090535 */ j .L802414D4 /* 8D72BC 802414BC 0000102D */ daddu $v0, $zero, $zero /* 8D72C0 802414C0 0280202D */ daddu $a0, $s4, $zero /* 8D72C4 802414C4 0200282D */ daddu $a1, $s0, $zero -/* 8D72C8 802414C8 0C090396 */ jal func_80240E58 +/* 8D72C8 802414C8 0C090396 */ jal func_80240E58_8D6C58 /* 8D72CC 802414CC 0260302D */ daddu $a2, $s3, $zero .L802414D0: /* 8D72D0 802414D0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8.s deleted file mode 100644 index 6bc20fbee1..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414F8 -/* 8D72F8 802414F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D72FC 802414FC AFB00010 */ sw $s0, 0x10($sp) -/* 8D7300 80241500 0080802D */ daddu $s0, $a0, $zero -/* 8D7304 80241504 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D7308 80241508 0C00FB5A */ jal get_enemy_safe -/* 8D730C 8024150C 24040002 */ addiu $a0, $zero, 2 -/* 8D7310 80241510 AE020084 */ sw $v0, 0x84($s0) -/* 8D7314 80241514 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D7318 80241518 8FB00010 */ lw $s0, 0x10($sp) -/* 8D731C 8024151C 24020002 */ addiu $v0, $zero, 2 -/* 8D7320 80241520 03E00008 */ jr $ra -/* 8D7324 80241524 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8D7328 80241528 00000000 */ nop -/* 8D732C 8024152C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s new file mode 100644 index 0000000000..e3d954ccfb --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_09/8D5E00/func_802414F8_8D72F8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414F8_8D72F8 +/* 8D72F8 802414F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8D72FC 802414FC AFB00010 */ sw $s0, 0x10($sp) +/* 8D7300 80241500 0080802D */ daddu $s0, $a0, $zero +/* 8D7304 80241504 AFBF0014 */ sw $ra, 0x14($sp) +/* 8D7308 80241508 0C00FB5A */ jal get_enemy_safe +/* 8D730C 8024150C 24040002 */ addiu $a0, $zero, 2 +/* 8D7310 80241510 AE020084 */ sw $v0, 0x84($s0) +/* 8D7314 80241514 8FBF0014 */ lw $ra, 0x14($sp) +/* 8D7318 80241518 8FB00010 */ lw $s0, 0x10($sp) +/* 8D731C 8024151C 24020002 */ addiu $v0, $zero, 2 +/* 8D7320 80241520 03E00008 */ jr $ra +/* 8D7324 80241524 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8D7328 80241528 00000000 */ nop +/* 8D732C 8024152C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118.s deleted file mode 100644 index 15b76168fa..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240118 -/* 8D85E8 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8D85EC 8024011C AFB10014 */ sw $s1, 0x14($sp) -/* 8D85F0 80240120 0080882D */ daddu $s1, $a0, $zero -/* 8D85F4 80240124 AFBF001C */ sw $ra, 0x1c($sp) -/* 8D85F8 80240128 AFB20018 */ sw $s2, 0x18($sp) -/* 8D85FC 8024012C AFB00010 */ sw $s0, 0x10($sp) -/* 8D8600 80240130 8E240084 */ lw $a0, 0x84($s1) -/* 8D8604 80240134 0C04C3D6 */ jal get_item_entity -/* 8D8608 80240138 00A0802D */ daddu $s0, $a1, $zero -/* 8D860C 8024013C 12000005 */ beqz $s0, .L80240154 -/* 8D8610 80240140 0040902D */ daddu $s2, $v0, $zero -/* 8D8614 80240144 C640000C */ lwc1 $f0, 0xc($s2) -/* 8D8618 80240148 AE200074 */ sw $zero, 0x74($s1) -/* 8D861C 8024014C AE20007C */ sw $zero, 0x7c($s1) -/* 8D8620 80240150 E6200078 */ swc1 $f0, 0x78($s1) -.L80240154: -/* 8D8624 80240154 8E230074 */ lw $v1, 0x74($s1) -/* 8D8628 80240158 10600005 */ beqz $v1, .L80240170 -/* 8D862C 8024015C 24020001 */ addiu $v0, $zero, 1 -/* 8D8630 80240160 10620024 */ beq $v1, $v0, .L802401F4 -/* 8D8634 80240164 00000000 */ nop -/* 8D8638 80240168 08090093 */ j .L8024024C -/* 8D863C 8024016C 00000000 */ nop -.L80240170: -/* 8D8640 80240170 3C013FC9 */ lui $at, 0x3fc9 -/* 8D8644 80240174 34210FD8 */ ori $at, $at, 0xfd8 -/* 8D8648 80240178 44810000 */ mtc1 $at, $f0 -/* 8D864C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8D8650 80240180 46806320 */ cvt.s.w $f12, $f12 -/* 8D8654 80240184 46006302 */ mul.s $f12, $f12, $f0 -/* 8D8658 80240188 00000000 */ nop -/* 8D865C 8024018C 3C0141F0 */ lui $at, 0x41f0 -/* 8D8660 80240190 44810000 */ mtc1 $at, $f0 -/* 8D8664 80240194 0C00A874 */ jal cos_rad -/* 8D8668 80240198 46006303 */ div.s $f12, $f12, $f0 -/* 8D866C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* 8D8670 802401A0 44811000 */ mtc1 $at, $f2 -/* 8D8674 802401A4 00000000 */ nop -/* 8D8678 802401A8 46001081 */ sub.s $f2, $f2, $f0 -/* 8D867C 802401AC 3C0141A0 */ lui $at, 0x41a0 -/* 8D8680 802401B0 44810000 */ mtc1 $at, $f0 -/* 8D8684 802401B4 00000000 */ nop -/* 8D8688 802401B8 46001082 */ mul.s $f2, $f2, $f0 -/* 8D868C 802401BC 00000000 */ nop -/* 8D8690 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8D8694 802401C4 46020000 */ add.s $f0, $f0, $f2 -/* 8D8698 802401C8 E640000C */ swc1 $f0, 0xc($s2) -/* 8D869C 802401CC 8E23007C */ lw $v1, 0x7c($s1) -/* 8D86A0 802401D0 2402001E */ addiu $v0, $zero, 0x1e -/* 8D86A4 802401D4 14620005 */ bne $v1, $v0, .L802401EC -/* 8D86A8 802401D8 24620001 */ addiu $v0, $v1, 1 -/* 8D86AC 802401DC 24020001 */ addiu $v0, $zero, 1 -/* 8D86B0 802401E0 AE220074 */ sw $v0, 0x74($s1) -/* 8D86B4 802401E4 08090093 */ j .L8024024C -/* 8D86B8 802401E8 AE20007C */ sw $zero, 0x7c($s1) -.L802401EC: -/* 8D86BC 802401EC 08090093 */ j .L8024024C -/* 8D86C0 802401F0 AE22007C */ sw $v0, 0x7c($s1) -.L802401F4: -/* 8D86C4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8D86C8 802401F8 0C00A8D4 */ jal cos_deg -/* 8D86CC 802401FC 46806320 */ cvt.s.w $f12, $f12 -/* 8D86D0 80240200 3C014040 */ lui $at, 0x4040 -/* 8D86D4 80240204 44811000 */ mtc1 $at, $f2 -/* 8D86D8 80240208 00000000 */ nop -/* 8D86DC 8024020C 46020002 */ mul.s $f0, $f0, $f2 -/* 8D86E0 80240210 00000000 */ nop -/* 8D86E4 80240214 3C014188 */ lui $at, 0x4188 -/* 8D86E8 80240218 44812000 */ mtc1 $at, $f4 -/* 8D86EC 8024021C C6220078 */ lwc1 $f2, 0x78($s1) -/* 8D86F0 80240220 46041080 */ add.s $f2, $f2, $f4 -/* 8D86F4 80240224 46001080 */ add.s $f2, $f2, $f0 -/* 8D86F8 80240228 E642000C */ swc1 $f2, 0xc($s2) -/* 8D86FC 8024022C 8E22007C */ lw $v0, 0x7c($s1) -/* 8D8700 80240230 24420009 */ addiu $v0, $v0, 9 -/* 8D8704 80240234 44826000 */ mtc1 $v0, $f12 -/* 8D8708 80240238 00000000 */ nop -/* 8D870C 8024023C 0C00A6C9 */ jal clamp_angle -/* 8D8710 80240240 46806320 */ cvt.s.w $f12, $f12 -/* 8D8714 80240244 4600018D */ trunc.w.s $f6, $f0 -/* 8D8718 80240248 E626007C */ swc1 $f6, 0x7c($s1) -.L8024024C: -/* 8D871C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) -/* 8D8720 80240250 8FB20018 */ lw $s2, 0x18($sp) -/* 8D8724 80240254 8FB10014 */ lw $s1, 0x14($sp) -/* 8D8728 80240258 8FB00010 */ lw $s0, 0x10($sp) -/* 8D872C 8024025C 0000102D */ daddu $v0, $zero, $zero -/* 8D8730 80240260 03E00008 */ jr $ra -/* 8D8734 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s new file mode 100644 index 0000000000..4dff088b72 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240118_8D85E8.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240118_8D85E8 +/* 8D85E8 80240118 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8D85EC 8024011C AFB10014 */ sw $s1, 0x14($sp) +/* 8D85F0 80240120 0080882D */ daddu $s1, $a0, $zero +/* 8D85F4 80240124 AFBF001C */ sw $ra, 0x1c($sp) +/* 8D85F8 80240128 AFB20018 */ sw $s2, 0x18($sp) +/* 8D85FC 8024012C AFB00010 */ sw $s0, 0x10($sp) +/* 8D8600 80240130 8E240084 */ lw $a0, 0x84($s1) +/* 8D8604 80240134 0C04C3D6 */ jal get_item_entity +/* 8D8608 80240138 00A0802D */ daddu $s0, $a1, $zero +/* 8D860C 8024013C 12000005 */ beqz $s0, .L80240154 +/* 8D8610 80240140 0040902D */ daddu $s2, $v0, $zero +/* 8D8614 80240144 C640000C */ lwc1 $f0, 0xc($s2) +/* 8D8618 80240148 AE200074 */ sw $zero, 0x74($s1) +/* 8D861C 8024014C AE20007C */ sw $zero, 0x7c($s1) +/* 8D8620 80240150 E6200078 */ swc1 $f0, 0x78($s1) +.L80240154: +/* 8D8624 80240154 8E230074 */ lw $v1, 0x74($s1) +/* 8D8628 80240158 10600005 */ beqz $v1, .L80240170 +/* 8D862C 8024015C 24020001 */ addiu $v0, $zero, 1 +/* 8D8630 80240160 10620024 */ beq $v1, $v0, .L802401F4 +/* 8D8634 80240164 00000000 */ nop +/* 8D8638 80240168 08090093 */ j .L8024024C +/* 8D863C 8024016C 00000000 */ nop +.L80240170: +/* 8D8640 80240170 3C013FC9 */ lui $at, 0x3fc9 +/* 8D8644 80240174 34210FD8 */ ori $at, $at, 0xfd8 +/* 8D8648 80240178 44810000 */ mtc1 $at, $f0 +/* 8D864C 8024017C C62C007C */ lwc1 $f12, 0x7c($s1) +/* 8D8650 80240180 46806320 */ cvt.s.w $f12, $f12 +/* 8D8654 80240184 46006302 */ mul.s $f12, $f12, $f0 +/* 8D8658 80240188 00000000 */ nop +/* 8D865C 8024018C 3C0141F0 */ lui $at, 0x41f0 +/* 8D8660 80240190 44810000 */ mtc1 $at, $f0 +/* 8D8664 80240194 0C00A874 */ jal cos_rad +/* 8D8668 80240198 46006303 */ div.s $f12, $f12, $f0 +/* 8D866C 8024019C 3C013F80 */ lui $at, 0x3f80 +/* 8D8670 802401A0 44811000 */ mtc1 $at, $f2 +/* 8D8674 802401A4 00000000 */ nop +/* 8D8678 802401A8 46001081 */ sub.s $f2, $f2, $f0 +/* 8D867C 802401AC 3C0141A0 */ lui $at, 0x41a0 +/* 8D8680 802401B0 44810000 */ mtc1 $at, $f0 +/* 8D8684 802401B4 00000000 */ nop +/* 8D8688 802401B8 46001082 */ mul.s $f2, $f2, $f0 +/* 8D868C 802401BC 00000000 */ nop +/* 8D8690 802401C0 C6200078 */ lwc1 $f0, 0x78($s1) +/* 8D8694 802401C4 46020000 */ add.s $f0, $f0, $f2 +/* 8D8698 802401C8 E640000C */ swc1 $f0, 0xc($s2) +/* 8D869C 802401CC 8E23007C */ lw $v1, 0x7c($s1) +/* 8D86A0 802401D0 2402001E */ addiu $v0, $zero, 0x1e +/* 8D86A4 802401D4 14620005 */ bne $v1, $v0, .L802401EC +/* 8D86A8 802401D8 24620001 */ addiu $v0, $v1, 1 +/* 8D86AC 802401DC 24020001 */ addiu $v0, $zero, 1 +/* 8D86B0 802401E0 AE220074 */ sw $v0, 0x74($s1) +/* 8D86B4 802401E4 08090093 */ j .L8024024C +/* 8D86B8 802401E8 AE20007C */ sw $zero, 0x7c($s1) +.L802401EC: +/* 8D86BC 802401EC 08090093 */ j .L8024024C +/* 8D86C0 802401F0 AE22007C */ sw $v0, 0x7c($s1) +.L802401F4: +/* 8D86C4 802401F4 C62C007C */ lwc1 $f12, 0x7c($s1) +/* 8D86C8 802401F8 0C00A8D4 */ jal cos_deg +/* 8D86CC 802401FC 46806320 */ cvt.s.w $f12, $f12 +/* 8D86D0 80240200 3C014040 */ lui $at, 0x4040 +/* 8D86D4 80240204 44811000 */ mtc1 $at, $f2 +/* 8D86D8 80240208 00000000 */ nop +/* 8D86DC 8024020C 46020002 */ mul.s $f0, $f0, $f2 +/* 8D86E0 80240210 00000000 */ nop +/* 8D86E4 80240214 3C014188 */ lui $at, 0x4188 +/* 8D86E8 80240218 44812000 */ mtc1 $at, $f4 +/* 8D86EC 8024021C C6220078 */ lwc1 $f2, 0x78($s1) +/* 8D86F0 80240220 46041080 */ add.s $f2, $f2, $f4 +/* 8D86F4 80240224 46001080 */ add.s $f2, $f2, $f0 +/* 8D86F8 80240228 E642000C */ swc1 $f2, 0xc($s2) +/* 8D86FC 8024022C 8E22007C */ lw $v0, 0x7c($s1) +/* 8D8700 80240230 24420009 */ addiu $v0, $v0, 9 +/* 8D8704 80240234 44826000 */ mtc1 $v0, $f12 +/* 8D8708 80240238 00000000 */ nop +/* 8D870C 8024023C 0C00A6C9 */ jal clamp_angle +/* 8D8710 80240240 46806320 */ cvt.s.w $f12, $f12 +/* 8D8714 80240244 4600018D */ trunc.w.s $f6, $f0 +/* 8D8718 80240248 E626007C */ swc1 $f6, 0x7c($s1) +.L8024024C: +/* 8D871C 8024024C 8FBF001C */ lw $ra, 0x1c($sp) +/* 8D8720 80240250 8FB20018 */ lw $s2, 0x18($sp) +/* 8D8724 80240254 8FB10014 */ lw $s1, 0x14($sp) +/* 8D8728 80240258 8FB00010 */ lw $s0, 0x10($sp) +/* 8D872C 8024025C 0000102D */ daddu $v0, $zero, $zero +/* 8D8730 80240260 03E00008 */ jr $ra +/* 8D8734 80240264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268.s deleted file mode 100644 index d097073a7e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240268 -/* 8D8738 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D873C 8024026C AFB00010 */ sw $s0, 0x10($sp) -/* 8D8740 80240270 0080802D */ daddu $s0, $a0, $zero -/* 8D8744 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D8748 80240278 8E02000C */ lw $v0, 0xc($s0) -/* 8D874C 8024027C 0C0B1EAF */ jal get_variable -/* 8D8750 80240280 8C450000 */ lw $a1, ($v0) -/* 8D8754 80240284 00021140 */ sll $v0, $v0, 5 -/* 8D8758 80240288 AE000084 */ sw $zero, 0x84($s0) -/* 8D875C 8024028C 3C018008 */ lui $at, 0x8008 -/* 8D8760 80240290 00220821 */ addu $at, $at, $v0 -/* 8D8764 80240294 942278F8 */ lhu $v0, 0x78f8($at) -/* 8D8768 80240298 30420040 */ andi $v0, $v0, 0x40 -/* 8D876C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* 8D8770 802402A0 24020001 */ addiu $v0, $zero, 1 -/* 8D8774 802402A4 AE020084 */ sw $v0, 0x84($s0) -.L802402A8: -/* 8D8778 802402A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D877C 802402AC 8FB00010 */ lw $s0, 0x10($sp) -/* 8D8780 802402B0 24020002 */ addiu $v0, $zero, 2 -/* 8D8784 802402B4 03E00008 */ jr $ra -/* 8D8788 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s new file mode 100644 index 0000000000..8ca1886817 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240268_8D8738.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240268_8D8738 +/* 8D8738 80240268 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8D873C 8024026C AFB00010 */ sw $s0, 0x10($sp) +/* 8D8740 80240270 0080802D */ daddu $s0, $a0, $zero +/* 8D8744 80240274 AFBF0014 */ sw $ra, 0x14($sp) +/* 8D8748 80240278 8E02000C */ lw $v0, 0xc($s0) +/* 8D874C 8024027C 0C0B1EAF */ jal get_variable +/* 8D8750 80240280 8C450000 */ lw $a1, ($v0) +/* 8D8754 80240284 00021140 */ sll $v0, $v0, 5 +/* 8D8758 80240288 AE000084 */ sw $zero, 0x84($s0) +/* 8D875C 8024028C 3C018008 */ lui $at, 0x8008 +/* 8D8760 80240290 00220821 */ addu $at, $at, $v0 +/* 8D8764 80240294 942278F8 */ lhu $v0, 0x78f8($at) +/* 8D8768 80240298 30420040 */ andi $v0, $v0, 0x40 +/* 8D876C 8024029C 10400002 */ beqz $v0, .L802402A8 +/* 8D8770 802402A0 24020001 */ addiu $v0, $zero, 1 +/* 8D8774 802402A4 AE020084 */ sw $v0, 0x84($s0) +.L802402A8: +/* 8D8778 802402A8 8FBF0014 */ lw $ra, 0x14($sp) +/* 8D877C 802402AC 8FB00010 */ lw $s0, 0x10($sp) +/* 8D8780 802402B0 24020002 */ addiu $v0, $zero, 2 +/* 8D8784 802402B4 03E00008 */ jr $ra +/* 8D8788 802402B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_802402BC.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_802402BC.s deleted file mode 100644 index c74b61c437..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_802402BC.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC -/* 8D878C 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8D8790 802402C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8D8794 802402C4 8C82000C */ lw $v0, 0xc($a0) -/* 8D8798 802402C8 0C0B1EAF */ jal get_variable -/* 8D879C 802402CC 8C450000 */ lw $a1, ($v0) -/* 8D87A0 802402D0 0C04417A */ jal get_entity_by_index -/* 8D87A4 802402D4 0040202D */ daddu $a0, $v0, $zero -/* 8D87A8 802402D8 50400007 */ beql $v0, $zero, .L802402F8 -/* 8D87AC 802402DC 0000102D */ daddu $v0, $zero, $zero -/* 8D87B0 802402E0 84440014 */ lh $a0, 0x14($v0) -/* 8D87B4 802402E4 3C050000 */ lui $a1, 0 -/* 8D87B8 802402E8 24A501E4 */ addiu $a1, $a1, 0x1e4 -/* 8D87BC 802402EC 0C048052 */ jal play_model_animation -/* 8D87C0 802402F0 00000000 */ nop -/* 8D87C4 802402F4 24020002 */ addiu $v0, $zero, 2 -.L802402F8: -/* 8D87C8 802402F8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8D87CC 802402FC 03E00008 */ jr $ra -/* 8D87D0 80240300 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_802402BC_8D878C.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_802402BC_8D878C.s new file mode 100644 index 0000000000..b35e76035e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_802402BC_8D878C.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402BC_8D878C +/* 8D878C 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8D8790 802402C0 AFBF0010 */ sw $ra, 0x10($sp) +/* 8D8794 802402C4 8C82000C */ lw $v0, 0xc($a0) +/* 8D8798 802402C8 0C0B1EAF */ jal get_variable +/* 8D879C 802402CC 8C450000 */ lw $a1, ($v0) +/* 8D87A0 802402D0 0C04417A */ jal get_entity_by_index +/* 8D87A4 802402D4 0040202D */ daddu $a0, $v0, $zero +/* 8D87A8 802402D8 50400007 */ beql $v0, $zero, .L802402F8 +/* 8D87AC 802402DC 0000102D */ daddu $v0, $zero, $zero +/* 8D87B0 802402E0 84440014 */ lh $a0, 0x14($v0) +/* 8D87B4 802402E4 3C050000 */ lui $a1, 0 +/* 8D87B8 802402E8 24A501E4 */ addiu $a1, $a1, 0x1e4 +/* 8D87BC 802402EC 0C048052 */ jal play_model_animation +/* 8D87C0 802402F0 00000000 */ nop +/* 8D87C4 802402F4 24020002 */ addiu $v0, $zero, 2 +.L802402F8: +/* 8D87C8 802402F8 8FBF0010 */ lw $ra, 0x10($sp) +/* 8D87CC 802402FC 03E00008 */ jr $ra +/* 8D87D0 80240300 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304.s deleted file mode 100644 index 6fe8365799..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240304 -/* 8D87D4 80240304 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8D87D8 80240308 AFB10014 */ sw $s1, 0x14($sp) -/* 8D87DC 8024030C 0080882D */ daddu $s1, $a0, $zero -/* 8D87E0 80240310 AFBF0020 */ sw $ra, 0x20($sp) -/* 8D87E4 80240314 AFB3001C */ sw $s3, 0x1c($sp) -/* 8D87E8 80240318 AFB20018 */ sw $s2, 0x18($sp) -/* 8D87EC 8024031C AFB00010 */ sw $s0, 0x10($sp) -/* 8D87F0 80240320 8E30000C */ lw $s0, 0xc($s1) -/* 8D87F4 80240324 8E050000 */ lw $a1, ($s0) -/* 8D87F8 80240328 0C0B1EAF */ jal get_variable -/* 8D87FC 8024032C 26100004 */ addiu $s0, $s0, 4 -/* 8D8800 80240330 8E050000 */ lw $a1, ($s0) -/* 8D8804 80240334 26100004 */ addiu $s0, $s0, 4 -/* 8D8808 80240338 0220202D */ daddu $a0, $s1, $zero -/* 8D880C 8024033C 0C0B1EAF */ jal get_variable -/* 8D8810 80240340 0040982D */ daddu $s3, $v0, $zero -/* 8D8814 80240344 8E050000 */ lw $a1, ($s0) -/* 8D8818 80240348 26100004 */ addiu $s0, $s0, 4 -/* 8D881C 8024034C 0220202D */ daddu $a0, $s1, $zero -/* 8D8820 80240350 0C0B1EAF */ jal get_variable -/* 8D8824 80240354 0040902D */ daddu $s2, $v0, $zero -/* 8D8828 80240358 0220202D */ daddu $a0, $s1, $zero -/* 8D882C 8024035C 8E050000 */ lw $a1, ($s0) -/* 8D8830 80240360 0C0B1EAF */ jal get_variable -/* 8D8834 80240364 0040882D */ daddu $s1, $v0, $zero -/* 8D8838 80240368 0260202D */ daddu $a0, $s3, $zero -/* 8D883C 8024036C 0C04417A */ jal get_entity_by_index -/* 8D8840 80240370 0040802D */ daddu $s0, $v0, $zero -/* 8D8844 80240374 0040182D */ daddu $v1, $v0, $zero -/* 8D8848 80240378 44920000 */ mtc1 $s2, $f0 -/* 8D884C 8024037C 00000000 */ nop -/* 8D8850 80240380 46800020 */ cvt.s.w $f0, $f0 -/* 8D8854 80240384 E4600048 */ swc1 $f0, 0x48($v1) -/* 8D8858 80240388 44910000 */ mtc1 $s1, $f0 -/* 8D885C 8024038C 00000000 */ nop -/* 8D8860 80240390 46800020 */ cvt.s.w $f0, $f0 -/* 8D8864 80240394 E460004C */ swc1 $f0, 0x4c($v1) -/* 8D8868 80240398 44900000 */ mtc1 $s0, $f0 -/* 8D886C 8024039C 00000000 */ nop -/* 8D8870 802403A0 46800020 */ cvt.s.w $f0, $f0 -/* 8D8874 802403A4 E4600050 */ swc1 $f0, 0x50($v1) -/* 8D8878 802403A8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8D887C 802403AC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8D8880 802403B0 8FB20018 */ lw $s2, 0x18($sp) -/* 8D8884 802403B4 8FB10014 */ lw $s1, 0x14($sp) -/* 8D8888 802403B8 8FB00010 */ lw $s0, 0x10($sp) -/* 8D888C 802403BC 24020002 */ addiu $v0, $zero, 2 -/* 8D8890 802403C0 03E00008 */ jr $ra -/* 8D8894 802403C4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 8D8898 802403C8 00000000 */ nop -/* 8D889C 802403CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s new file mode 100644 index 0000000000..e6a170ae27 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D84D0/func_80240304_8D87D4.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240304_8D87D4 +/* 8D87D4 80240304 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8D87D8 80240308 AFB10014 */ sw $s1, 0x14($sp) +/* 8D87DC 8024030C 0080882D */ daddu $s1, $a0, $zero +/* 8D87E0 80240310 AFBF0020 */ sw $ra, 0x20($sp) +/* 8D87E4 80240314 AFB3001C */ sw $s3, 0x1c($sp) +/* 8D87E8 80240318 AFB20018 */ sw $s2, 0x18($sp) +/* 8D87EC 8024031C AFB00010 */ sw $s0, 0x10($sp) +/* 8D87F0 80240320 8E30000C */ lw $s0, 0xc($s1) +/* 8D87F4 80240324 8E050000 */ lw $a1, ($s0) +/* 8D87F8 80240328 0C0B1EAF */ jal get_variable +/* 8D87FC 8024032C 26100004 */ addiu $s0, $s0, 4 +/* 8D8800 80240330 8E050000 */ lw $a1, ($s0) +/* 8D8804 80240334 26100004 */ addiu $s0, $s0, 4 +/* 8D8808 80240338 0220202D */ daddu $a0, $s1, $zero +/* 8D880C 8024033C 0C0B1EAF */ jal get_variable +/* 8D8810 80240340 0040982D */ daddu $s3, $v0, $zero +/* 8D8814 80240344 8E050000 */ lw $a1, ($s0) +/* 8D8818 80240348 26100004 */ addiu $s0, $s0, 4 +/* 8D881C 8024034C 0220202D */ daddu $a0, $s1, $zero +/* 8D8820 80240350 0C0B1EAF */ jal get_variable +/* 8D8824 80240354 0040902D */ daddu $s2, $v0, $zero +/* 8D8828 80240358 0220202D */ daddu $a0, $s1, $zero +/* 8D882C 8024035C 8E050000 */ lw $a1, ($s0) +/* 8D8830 80240360 0C0B1EAF */ jal get_variable +/* 8D8834 80240364 0040882D */ daddu $s1, $v0, $zero +/* 8D8838 80240368 0260202D */ daddu $a0, $s3, $zero +/* 8D883C 8024036C 0C04417A */ jal get_entity_by_index +/* 8D8840 80240370 0040802D */ daddu $s0, $v0, $zero +/* 8D8844 80240374 0040182D */ daddu $v1, $v0, $zero +/* 8D8848 80240378 44920000 */ mtc1 $s2, $f0 +/* 8D884C 8024037C 00000000 */ nop +/* 8D8850 80240380 46800020 */ cvt.s.w $f0, $f0 +/* 8D8854 80240384 E4600048 */ swc1 $f0, 0x48($v1) +/* 8D8858 80240388 44910000 */ mtc1 $s1, $f0 +/* 8D885C 8024038C 00000000 */ nop +/* 8D8860 80240390 46800020 */ cvt.s.w $f0, $f0 +/* 8D8864 80240394 E460004C */ swc1 $f0, 0x4c($v1) +/* 8D8868 80240398 44900000 */ mtc1 $s0, $f0 +/* 8D886C 8024039C 00000000 */ nop +/* 8D8870 802403A0 46800020 */ cvt.s.w $f0, $f0 +/* 8D8874 802403A4 E4600050 */ swc1 $f0, 0x50($v1) +/* 8D8878 802403A8 8FBF0020 */ lw $ra, 0x20($sp) +/* 8D887C 802403AC 8FB3001C */ lw $s3, 0x1c($sp) +/* 8D8880 802403B0 8FB20018 */ lw $s2, 0x18($sp) +/* 8D8884 802403B4 8FB10014 */ lw $s1, 0x14($sp) +/* 8D8888 802403B8 8FB00010 */ lw $s0, 0x10($sp) +/* 8D888C 802403BC 24020002 */ addiu $v0, $zero, 2 +/* 8D8890 802403C0 03E00008 */ jr $ra +/* 8D8894 802403C4 27BD0028 */ addiu $sp, $sp, 0x28 +/* 8D8898 802403C8 00000000 */ nop +/* 8D889C 802403CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_802403D0.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_802403D0.s deleted file mode 100644 index 60aef42d02..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_802403D0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D0 -/* 8D88A0 802403D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8D88A4 802403D4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8D88A8 802403D8 4485A000 */ mtc1 $a1, $f20 -/* 8D88AC 802403DC F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8D88B0 802403E0 4486B000 */ mtc1 $a2, $f22 -/* 8D88B4 802403E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8D88B8 802403E8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 8D88BC 802403EC 4487C000 */ mtc1 $a3, $f24 -/* 8D88C0 802403F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8D88C4 802403F4 0C019D28 */ jal guMtxIdentF -/* 8D88C8 802403F8 0080802D */ daddu $s0, $a0, $zero -/* 8D88CC 802403FC 4616A582 */ mul.s $f22, $f20, $f22 -/* 8D88D0 80240400 00000000 */ nop -/* 8D88D4 80240404 4618A502 */ mul.s $f20, $f20, $f24 -/* 8D88D8 80240408 00000000 */ nop -/* 8D88DC 8024040C 3C013F80 */ lui $at, 0x3f80 -/* 8D88E0 80240410 44810000 */ mtc1 $at, $f0 -/* 8D88E4 80240414 00000000 */ nop -/* 8D88E8 80240418 E6000014 */ swc1 $f0, 0x14($s0) -/* 8D88EC 8024041C E6160010 */ swc1 $f22, 0x10($s0) -/* 8D88F0 80240420 E6140018 */ swc1 $f20, 0x18($s0) -/* 8D88F4 80240424 8FBF0014 */ lw $ra, 0x14($sp) -/* 8D88F8 80240428 8FB00010 */ lw $s0, 0x10($sp) -/* 8D88FC 8024042C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8D8900 80240430 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8D8904 80240434 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8D8908 80240438 03E00008 */ jr $ra -/* 8D890C 8024043C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_802403D0_8D88A0.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_802403D0_8D88A0.s new file mode 100644 index 0000000000..a8547abb99 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_802403D0_8D88A0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403D0_8D88A0 +/* 8D88A0 802403D0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8D88A4 802403D4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 8D88A8 802403D8 4485A000 */ mtc1 $a1, $f20 +/* 8D88AC 802403DC F7B60020 */ sdc1 $f22, 0x20($sp) +/* 8D88B0 802403E0 4486B000 */ mtc1 $a2, $f22 +/* 8D88B4 802403E4 AFB00010 */ sw $s0, 0x10($sp) +/* 8D88B8 802403E8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 8D88BC 802403EC 4487C000 */ mtc1 $a3, $f24 +/* 8D88C0 802403F0 AFBF0014 */ sw $ra, 0x14($sp) +/* 8D88C4 802403F4 0C019D28 */ jal guMtxIdentF +/* 8D88C8 802403F8 0080802D */ daddu $s0, $a0, $zero +/* 8D88CC 802403FC 4616A582 */ mul.s $f22, $f20, $f22 +/* 8D88D0 80240400 00000000 */ nop +/* 8D88D4 80240404 4618A502 */ mul.s $f20, $f20, $f24 +/* 8D88D8 80240408 00000000 */ nop +/* 8D88DC 8024040C 3C013F80 */ lui $at, 0x3f80 +/* 8D88E0 80240410 44810000 */ mtc1 $at, $f0 +/* 8D88E4 80240414 00000000 */ nop +/* 8D88E8 80240418 E6000014 */ swc1 $f0, 0x14($s0) +/* 8D88EC 8024041C E6160010 */ swc1 $f22, 0x10($s0) +/* 8D88F0 80240420 E6140018 */ swc1 $f20, 0x18($s0) +/* 8D88F4 80240424 8FBF0014 */ lw $ra, 0x14($sp) +/* 8D88F8 80240428 8FB00010 */ lw $s0, 0x10($sp) +/* 8D88FC 8024042C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 8D8900 80240430 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 8D8904 80240434 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 8D8908 80240438 03E00008 */ jr $ra +/* 8D890C 8024043C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_80240440.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_80240440.s deleted file mode 100644 index 0952a7272f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_80240440.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240440 -/* 8D8910 80240440 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8D8914 80240444 AFB10054 */ sw $s1, 0x54($sp) -/* 8D8918 80240448 0080882D */ daddu $s1, $a0, $zero -/* 8D891C 8024044C AFBF005C */ sw $ra, 0x5c($sp) -/* 8D8920 80240450 AFB20058 */ sw $s2, 0x58($sp) -/* 8D8924 80240454 AFB00050 */ sw $s0, 0x50($sp) -/* 8D8928 80240458 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8D892C 8024045C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8D8930 80240460 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8D8934 80240464 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8D8938 80240468 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8D893C 8024046C 8E30000C */ lw $s0, 0xc($s1) -/* 8D8940 80240470 8E050000 */ lw $a1, ($s0) -/* 8D8944 80240474 0C0B1EAF */ jal get_variable -/* 8D8948 80240478 26100004 */ addiu $s0, $s0, 4 -/* 8D894C 8024047C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8D8950 80240480 0040202D */ daddu $a0, $v0, $zero -/* 8D8954 80240484 8E050000 */ lw $a1, ($s0) -/* 8D8958 80240488 26100004 */ addiu $s0, $s0, 4 -/* 8D895C 8024048C 0220202D */ daddu $a0, $s1, $zero -/* 8D8960 80240490 0C0B210B */ jal get_float_variable -/* 8D8964 80240494 0040902D */ daddu $s2, $v0, $zero -/* 8D8968 80240498 8E050000 */ lw $a1, ($s0) -/* 8D896C 8024049C 26100004 */ addiu $s0, $s0, 4 -/* 8D8970 802404A0 0220202D */ daddu $a0, $s1, $zero -/* 8D8974 802404A4 0C0B210B */ jal get_float_variable -/* 8D8978 802404A8 46000706 */ mov.s $f28, $f0 -/* 8D897C 802404AC 8E050000 */ lw $a1, ($s0) -/* 8D8980 802404B0 26100004 */ addiu $s0, $s0, 4 -/* 8D8984 802404B4 0220202D */ daddu $a0, $s1, $zero -/* 8D8988 802404B8 0C0B210B */ jal get_float_variable -/* 8D898C 802404BC 46000686 */ mov.s $f26, $f0 -/* 8D8990 802404C0 0220202D */ daddu $a0, $s1, $zero -/* 8D8994 802404C4 8E050000 */ lw $a1, ($s0) -/* 8D8998 802404C8 0C0B210B */ jal get_float_variable -/* 8D899C 802404CC 46000586 */ mov.s $f22, $f0 -/* 8D89A0 802404D0 0240202D */ daddu $a0, $s2, $zero -/* 8D89A4 802404D4 0C046B4C */ jal get_model_from_list_index -/* 8D89A8 802404D8 46000606 */ mov.s $f24, $f0 -/* 8D89AC 802404DC 0040882D */ daddu $s1, $v0, $zero -/* 8D89B0 802404E0 96220000 */ lhu $v0, ($s1) -/* 8D89B4 802404E4 30420400 */ andi $v0, $v0, 0x400 -/* 8D89B8 802404E8 1440001E */ bnez $v0, .L80240564 -/* 8D89BC 802404EC 26300058 */ addiu $s0, $s1, 0x58 -/* 8D89C0 802404F0 4480A000 */ mtc1 $zero, $f20 -/* 8D89C4 802404F4 4406B000 */ mfc1 $a2, $f22 -/* 8D89C8 802404F8 4405A000 */ mfc1 $a1, $f20 -/* 8D89CC 802404FC 4407A000 */ mfc1 $a3, $f20 -/* 8D89D0 80240500 0C019E40 */ jal guTranslateF -/* 8D89D4 80240504 0200202D */ daddu $a0, $s0, $zero -/* 8D89D8 80240508 4405E000 */ mfc1 $a1, $f28 -/* 8D89DC 8024050C 4406D000 */ mfc1 $a2, $f26 -/* 8D89E0 80240510 4407C000 */ mfc1 $a3, $f24 -/* 8D89E4 80240514 0C0900F4 */ jal func_802403D0 -/* 8D89E8 80240518 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D89EC 8024051C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D89F0 80240520 0200282D */ daddu $a1, $s0, $zero -/* 8D89F4 80240524 0C019D80 */ jal guMtxCatF -/* 8D89F8 80240528 0200302D */ daddu $a2, $s0, $zero -/* 8D89FC 8024052C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D8A00 80240530 4600B587 */ neg.s $f22, $f22 -/* 8D8A04 80240534 4405A000 */ mfc1 $a1, $f20 -/* 8D8A08 80240538 4406B000 */ mfc1 $a2, $f22 -/* 8D8A0C 8024053C 0C019E40 */ jal guTranslateF -/* 8D8A10 80240540 00A0382D */ daddu $a3, $a1, $zero -/* 8D8A14 80240544 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D8A18 80240548 0200282D */ daddu $a1, $s0, $zero -/* 8D8A1C 8024054C 0C019D80 */ jal guMtxCatF -/* 8D8A20 80240550 00A0302D */ daddu $a2, $a1, $zero -/* 8D8A24 80240554 96220000 */ lhu $v0, ($s1) -/* 8D8A28 80240558 34421400 */ ori $v0, $v0, 0x1400 -/* 8D8A2C 8024055C 08090177 */ j .L802405DC -/* 8D8A30 80240560 A6220000 */ sh $v0, ($s1) -.L80240564: -/* 8D8A34 80240564 4480A000 */ mtc1 $zero, $f20 -/* 8D8A38 80240568 4406B000 */ mfc1 $a2, $f22 -/* 8D8A3C 8024056C 4405A000 */ mfc1 $a1, $f20 -/* 8D8A40 80240570 4407A000 */ mfc1 $a3, $f20 -/* 8D8A44 80240574 0C019E40 */ jal guTranslateF -/* 8D8A48 80240578 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D8A4C 8024057C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D8A50 80240580 26300058 */ addiu $s0, $s1, 0x58 -/* 8D8A54 80240584 0200282D */ daddu $a1, $s0, $zero -/* 8D8A58 80240588 0C019D80 */ jal guMtxCatF -/* 8D8A5C 8024058C 0200302D */ daddu $a2, $s0, $zero -/* 8D8A60 80240590 4405E000 */ mfc1 $a1, $f28 -/* 8D8A64 80240594 4406D000 */ mfc1 $a2, $f26 -/* 8D8A68 80240598 4407C000 */ mfc1 $a3, $f24 -/* 8D8A6C 8024059C 0C0900F4 */ jal func_802403D0 -/* 8D8A70 802405A0 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D8A74 802405A4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D8A78 802405A8 0200282D */ daddu $a1, $s0, $zero -/* 8D8A7C 802405AC 0C019D80 */ jal guMtxCatF -/* 8D8A80 802405B0 0200302D */ daddu $a2, $s0, $zero -/* 8D8A84 802405B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D8A88 802405B8 4600B587 */ neg.s $f22, $f22 -/* 8D8A8C 802405BC 4405A000 */ mfc1 $a1, $f20 -/* 8D8A90 802405C0 4406B000 */ mfc1 $a2, $f22 -/* 8D8A94 802405C4 0C019E40 */ jal guTranslateF -/* 8D8A98 802405C8 00A0382D */ daddu $a3, $a1, $zero -/* 8D8A9C 802405CC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8D8AA0 802405D0 0200282D */ daddu $a1, $s0, $zero -/* 8D8AA4 802405D4 0C019D80 */ jal guMtxCatF -/* 8D8AA8 802405D8 00A0302D */ daddu $a2, $a1, $zero -.L802405DC: -/* 8D8AAC 802405DC 8FBF005C */ lw $ra, 0x5c($sp) -/* 8D8AB0 802405E0 8FB20058 */ lw $s2, 0x58($sp) -/* 8D8AB4 802405E4 8FB10054 */ lw $s1, 0x54($sp) -/* 8D8AB8 802405E8 8FB00050 */ lw $s0, 0x50($sp) -/* 8D8ABC 802405EC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8D8AC0 802405F0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8D8AC4 802405F4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8D8AC8 802405F8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8D8ACC 802405FC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8D8AD0 80240600 24020002 */ addiu $v0, $zero, 2 -/* 8D8AD4 80240604 03E00008 */ jr $ra -/* 8D8AD8 80240608 27BD0088 */ addiu $sp, $sp, 0x88 -/* 8D8ADC 8024060C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_80240440_8D8910.s b/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_80240440_8D8910.s new file mode 100644 index 0000000000..ddf2dc4ff2 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_10/8D88A0/func_80240440_8D8910.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240440_8D8910 +/* 8D8910 80240440 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8D8914 80240444 AFB10054 */ sw $s1, 0x54($sp) +/* 8D8918 80240448 0080882D */ daddu $s1, $a0, $zero +/* 8D891C 8024044C AFBF005C */ sw $ra, 0x5c($sp) +/* 8D8920 80240450 AFB20058 */ sw $s2, 0x58($sp) +/* 8D8924 80240454 AFB00050 */ sw $s0, 0x50($sp) +/* 8D8928 80240458 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8D892C 8024045C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8D8930 80240460 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8D8934 80240464 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8D8938 80240468 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8D893C 8024046C 8E30000C */ lw $s0, 0xc($s1) +/* 8D8940 80240470 8E050000 */ lw $a1, ($s0) +/* 8D8944 80240474 0C0B1EAF */ jal get_variable +/* 8D8948 80240478 26100004 */ addiu $s0, $s0, 4 +/* 8D894C 8024047C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8D8950 80240480 0040202D */ daddu $a0, $v0, $zero +/* 8D8954 80240484 8E050000 */ lw $a1, ($s0) +/* 8D8958 80240488 26100004 */ addiu $s0, $s0, 4 +/* 8D895C 8024048C 0220202D */ daddu $a0, $s1, $zero +/* 8D8960 80240490 0C0B210B */ jal get_float_variable +/* 8D8964 80240494 0040902D */ daddu $s2, $v0, $zero +/* 8D8968 80240498 8E050000 */ lw $a1, ($s0) +/* 8D896C 8024049C 26100004 */ addiu $s0, $s0, 4 +/* 8D8970 802404A0 0220202D */ daddu $a0, $s1, $zero +/* 8D8974 802404A4 0C0B210B */ jal get_float_variable +/* 8D8978 802404A8 46000706 */ mov.s $f28, $f0 +/* 8D897C 802404AC 8E050000 */ lw $a1, ($s0) +/* 8D8980 802404B0 26100004 */ addiu $s0, $s0, 4 +/* 8D8984 802404B4 0220202D */ daddu $a0, $s1, $zero +/* 8D8988 802404B8 0C0B210B */ jal get_float_variable +/* 8D898C 802404BC 46000686 */ mov.s $f26, $f0 +/* 8D8990 802404C0 0220202D */ daddu $a0, $s1, $zero +/* 8D8994 802404C4 8E050000 */ lw $a1, ($s0) +/* 8D8998 802404C8 0C0B210B */ jal get_float_variable +/* 8D899C 802404CC 46000586 */ mov.s $f22, $f0 +/* 8D89A0 802404D0 0240202D */ daddu $a0, $s2, $zero +/* 8D89A4 802404D4 0C046B4C */ jal get_model_from_list_index +/* 8D89A8 802404D8 46000606 */ mov.s $f24, $f0 +/* 8D89AC 802404DC 0040882D */ daddu $s1, $v0, $zero +/* 8D89B0 802404E0 96220000 */ lhu $v0, ($s1) +/* 8D89B4 802404E4 30420400 */ andi $v0, $v0, 0x400 +/* 8D89B8 802404E8 1440001E */ bnez $v0, .L80240564 +/* 8D89BC 802404EC 26300058 */ addiu $s0, $s1, 0x58 +/* 8D89C0 802404F0 4480A000 */ mtc1 $zero, $f20 +/* 8D89C4 802404F4 4406B000 */ mfc1 $a2, $f22 +/* 8D89C8 802404F8 4405A000 */ mfc1 $a1, $f20 +/* 8D89CC 802404FC 4407A000 */ mfc1 $a3, $f20 +/* 8D89D0 80240500 0C019E40 */ jal guTranslateF +/* 8D89D4 80240504 0200202D */ daddu $a0, $s0, $zero +/* 8D89D8 80240508 4405E000 */ mfc1 $a1, $f28 +/* 8D89DC 8024050C 4406D000 */ mfc1 $a2, $f26 +/* 8D89E0 80240510 4407C000 */ mfc1 $a3, $f24 +/* 8D89E4 80240514 0C0900F4 */ jal func_802403D0_8D88A0 +/* 8D89E8 80240518 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D89EC 8024051C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D89F0 80240520 0200282D */ daddu $a1, $s0, $zero +/* 8D89F4 80240524 0C019D80 */ jal guMtxCatF +/* 8D89F8 80240528 0200302D */ daddu $a2, $s0, $zero +/* 8D89FC 8024052C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D8A00 80240530 4600B587 */ neg.s $f22, $f22 +/* 8D8A04 80240534 4405A000 */ mfc1 $a1, $f20 +/* 8D8A08 80240538 4406B000 */ mfc1 $a2, $f22 +/* 8D8A0C 8024053C 0C019E40 */ jal guTranslateF +/* 8D8A10 80240540 00A0382D */ daddu $a3, $a1, $zero +/* 8D8A14 80240544 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D8A18 80240548 0200282D */ daddu $a1, $s0, $zero +/* 8D8A1C 8024054C 0C019D80 */ jal guMtxCatF +/* 8D8A20 80240550 00A0302D */ daddu $a2, $a1, $zero +/* 8D8A24 80240554 96220000 */ lhu $v0, ($s1) +/* 8D8A28 80240558 34421400 */ ori $v0, $v0, 0x1400 +/* 8D8A2C 8024055C 08090177 */ j .L802405DC +/* 8D8A30 80240560 A6220000 */ sh $v0, ($s1) +.L80240564: +/* 8D8A34 80240564 4480A000 */ mtc1 $zero, $f20 +/* 8D8A38 80240568 4406B000 */ mfc1 $a2, $f22 +/* 8D8A3C 8024056C 4405A000 */ mfc1 $a1, $f20 +/* 8D8A40 80240570 4407A000 */ mfc1 $a3, $f20 +/* 8D8A44 80240574 0C019E40 */ jal guTranslateF +/* 8D8A48 80240578 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D8A4C 8024057C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D8A50 80240580 26300058 */ addiu $s0, $s1, 0x58 +/* 8D8A54 80240584 0200282D */ daddu $a1, $s0, $zero +/* 8D8A58 80240588 0C019D80 */ jal guMtxCatF +/* 8D8A5C 8024058C 0200302D */ daddu $a2, $s0, $zero +/* 8D8A60 80240590 4405E000 */ mfc1 $a1, $f28 +/* 8D8A64 80240594 4406D000 */ mfc1 $a2, $f26 +/* 8D8A68 80240598 4407C000 */ mfc1 $a3, $f24 +/* 8D8A6C 8024059C 0C0900F4 */ jal func_802403D0_8D88A0 +/* 8D8A70 802405A0 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D8A74 802405A4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D8A78 802405A8 0200282D */ daddu $a1, $s0, $zero +/* 8D8A7C 802405AC 0C019D80 */ jal guMtxCatF +/* 8D8A80 802405B0 0200302D */ daddu $a2, $s0, $zero +/* 8D8A84 802405B4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D8A88 802405B8 4600B587 */ neg.s $f22, $f22 +/* 8D8A8C 802405BC 4405A000 */ mfc1 $a1, $f20 +/* 8D8A90 802405C0 4406B000 */ mfc1 $a2, $f22 +/* 8D8A94 802405C4 0C019E40 */ jal guTranslateF +/* 8D8A98 802405C8 00A0382D */ daddu $a3, $a1, $zero +/* 8D8A9C 802405CC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8D8AA0 802405D0 0200282D */ daddu $a1, $s0, $zero +/* 8D8AA4 802405D4 0C019D80 */ jal guMtxCatF +/* 8D8AA8 802405D8 00A0302D */ daddu $a2, $a1, $zero +.L802405DC: +/* 8D8AAC 802405DC 8FBF005C */ lw $ra, 0x5c($sp) +/* 8D8AB0 802405E0 8FB20058 */ lw $s2, 0x58($sp) +/* 8D8AB4 802405E4 8FB10054 */ lw $s1, 0x54($sp) +/* 8D8AB8 802405E8 8FB00050 */ lw $s0, 0x50($sp) +/* 8D8ABC 802405EC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8D8AC0 802405F0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8D8AC4 802405F4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8D8AC8 802405F8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8D8ACC 802405FC D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8D8AD0 80240600 24020002 */ addiu $v0, $zero, 2 +/* 8D8AD4 80240604 03E00008 */ jr $ra +/* 8D8AD8 80240608 27BD0088 */ addiu $sp, $sp, 0x88 +/* 8D8ADC 8024060C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_80240070.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_80240070.s deleted file mode 100644 index 6e80a4eda1..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_80240070.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240070 -/* 8DA170 80240070 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8DA174 80240074 AFB10054 */ sw $s1, 0x54($sp) -/* 8DA178 80240078 0080882D */ daddu $s1, $a0, $zero -/* 8DA17C 8024007C AFBF005C */ sw $ra, 0x5c($sp) -/* 8DA180 80240080 AFB20058 */ sw $s2, 0x58($sp) -/* 8DA184 80240084 AFB00050 */ sw $s0, 0x50($sp) -/* 8DA188 80240088 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8DA18C 8024008C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8DA190 80240090 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8DA194 80240094 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8DA198 80240098 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8DA19C 8024009C 8E30000C */ lw $s0, 0xc($s1) -/* 8DA1A0 802400A0 8E050000 */ lw $a1, ($s0) -/* 8DA1A4 802400A4 0C0B1EAF */ jal get_variable -/* 8DA1A8 802400A8 26100004 */ addiu $s0, $s0, 4 -/* 8DA1AC 802400AC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8DA1B0 802400B0 0040202D */ daddu $a0, $v0, $zero -/* 8DA1B4 802400B4 8E050000 */ lw $a1, ($s0) -/* 8DA1B8 802400B8 26100004 */ addiu $s0, $s0, 4 -/* 8DA1BC 802400BC 0220202D */ daddu $a0, $s1, $zero -/* 8DA1C0 802400C0 0C0B210B */ jal get_float_variable -/* 8DA1C4 802400C4 0040902D */ daddu $s2, $v0, $zero -/* 8DA1C8 802400C8 8E050000 */ lw $a1, ($s0) -/* 8DA1CC 802400CC 26100004 */ addiu $s0, $s0, 4 -/* 8DA1D0 802400D0 0220202D */ daddu $a0, $s1, $zero -/* 8DA1D4 802400D4 0C0B210B */ jal get_float_variable -/* 8DA1D8 802400D8 46000706 */ mov.s $f28, $f0 -/* 8DA1DC 802400DC 8E050000 */ lw $a1, ($s0) -/* 8DA1E0 802400E0 26100004 */ addiu $s0, $s0, 4 -/* 8DA1E4 802400E4 0220202D */ daddu $a0, $s1, $zero -/* 8DA1E8 802400E8 0C0B210B */ jal get_float_variable -/* 8DA1EC 802400EC 46000686 */ mov.s $f26, $f0 -/* 8DA1F0 802400F0 0220202D */ daddu $a0, $s1, $zero -/* 8DA1F4 802400F4 8E050000 */ lw $a1, ($s0) -/* 8DA1F8 802400F8 0C0B210B */ jal get_float_variable -/* 8DA1FC 802400FC 46000586 */ mov.s $f22, $f0 -/* 8DA200 80240100 0240202D */ daddu $a0, $s2, $zero -/* 8DA204 80240104 0C046B4C */ jal get_model_from_list_index -/* 8DA208 80240108 46000606 */ mov.s $f24, $f0 -/* 8DA20C 8024010C 0040882D */ daddu $s1, $v0, $zero -/* 8DA210 80240110 96220000 */ lhu $v0, ($s1) -/* 8DA214 80240114 30420400 */ andi $v0, $v0, 0x400 -/* 8DA218 80240118 1440001E */ bnez $v0, .L80240194 -/* 8DA21C 8024011C 26300058 */ addiu $s0, $s1, 0x58 -/* 8DA220 80240120 4480A000 */ mtc1 $zero, $f20 -/* 8DA224 80240124 4406B000 */ mfc1 $a2, $f22 -/* 8DA228 80240128 4405A000 */ mfc1 $a1, $f20 -/* 8DA22C 8024012C 4407A000 */ mfc1 $a3, $f20 -/* 8DA230 80240130 0C019E40 */ jal guTranslateF -/* 8DA234 80240134 0200202D */ daddu $a0, $s0, $zero -/* 8DA238 80240138 4405E000 */ mfc1 $a1, $f28 -/* 8DA23C 8024013C 4406D000 */ mfc1 $a2, $f26 -/* 8DA240 80240140 4407C000 */ mfc1 $a3, $f24 -/* 8DA244 80240144 0C090000 */ jal func_80240000 -/* 8DA248 80240148 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA24C 8024014C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA250 80240150 0200282D */ daddu $a1, $s0, $zero -/* 8DA254 80240154 0C019D80 */ jal guMtxCatF -/* 8DA258 80240158 0200302D */ daddu $a2, $s0, $zero -/* 8DA25C 8024015C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA260 80240160 4600B587 */ neg.s $f22, $f22 -/* 8DA264 80240164 4405A000 */ mfc1 $a1, $f20 -/* 8DA268 80240168 4406B000 */ mfc1 $a2, $f22 -/* 8DA26C 8024016C 0C019E40 */ jal guTranslateF -/* 8DA270 80240170 00A0382D */ daddu $a3, $a1, $zero -/* 8DA274 80240174 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA278 80240178 0200282D */ daddu $a1, $s0, $zero -/* 8DA27C 8024017C 0C019D80 */ jal guMtxCatF -/* 8DA280 80240180 00A0302D */ daddu $a2, $a1, $zero -/* 8DA284 80240184 96220000 */ lhu $v0, ($s1) -/* 8DA288 80240188 34421400 */ ori $v0, $v0, 0x1400 -/* 8DA28C 8024018C 08090083 */ j .L8024020C -/* 8DA290 80240190 A6220000 */ sh $v0, ($s1) -.L80240194: -/* 8DA294 80240194 4480A000 */ mtc1 $zero, $f20 -/* 8DA298 80240198 4406B000 */ mfc1 $a2, $f22 -/* 8DA29C 8024019C 4405A000 */ mfc1 $a1, $f20 -/* 8DA2A0 802401A0 4407A000 */ mfc1 $a3, $f20 -/* 8DA2A4 802401A4 0C019E40 */ jal guTranslateF -/* 8DA2A8 802401A8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA2AC 802401AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA2B0 802401B0 26300058 */ addiu $s0, $s1, 0x58 -/* 8DA2B4 802401B4 0200282D */ daddu $a1, $s0, $zero -/* 8DA2B8 802401B8 0C019D80 */ jal guMtxCatF -/* 8DA2BC 802401BC 0200302D */ daddu $a2, $s0, $zero -/* 8DA2C0 802401C0 4405E000 */ mfc1 $a1, $f28 -/* 8DA2C4 802401C4 4406D000 */ mfc1 $a2, $f26 -/* 8DA2C8 802401C8 4407C000 */ mfc1 $a3, $f24 -/* 8DA2CC 802401CC 0C090000 */ jal func_80240000 -/* 8DA2D0 802401D0 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA2D4 802401D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA2D8 802401D8 0200282D */ daddu $a1, $s0, $zero -/* 8DA2DC 802401DC 0C019D80 */ jal guMtxCatF -/* 8DA2E0 802401E0 0200302D */ daddu $a2, $s0, $zero -/* 8DA2E4 802401E4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA2E8 802401E8 4600B587 */ neg.s $f22, $f22 -/* 8DA2EC 802401EC 4405A000 */ mfc1 $a1, $f20 -/* 8DA2F0 802401F0 4406B000 */ mfc1 $a2, $f22 -/* 8DA2F4 802401F4 0C019E40 */ jal guTranslateF -/* 8DA2F8 802401F8 00A0382D */ daddu $a3, $a1, $zero -/* 8DA2FC 802401FC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DA300 80240200 0200282D */ daddu $a1, $s0, $zero -/* 8DA304 80240204 0C019D80 */ jal guMtxCatF -/* 8DA308 80240208 00A0302D */ daddu $a2, $a1, $zero -.L8024020C: -/* 8DA30C 8024020C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8DA310 80240210 8FB20058 */ lw $s2, 0x58($sp) -/* 8DA314 80240214 8FB10054 */ lw $s1, 0x54($sp) -/* 8DA318 80240218 8FB00050 */ lw $s0, 0x50($sp) -/* 8DA31C 8024021C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8DA320 80240220 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8DA324 80240224 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8DA328 80240228 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8DA32C 8024022C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8DA330 80240230 24020002 */ addiu $v0, $zero, 2 -/* 8DA334 80240234 03E00008 */ jr $ra -/* 8DA338 80240238 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_80240070_8DA170.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_80240070_8DA170.s new file mode 100644 index 0000000000..727e78b344 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_80240070_8DA170.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240070_8DA170 +/* 8DA170 80240070 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8DA174 80240074 AFB10054 */ sw $s1, 0x54($sp) +/* 8DA178 80240078 0080882D */ daddu $s1, $a0, $zero +/* 8DA17C 8024007C AFBF005C */ sw $ra, 0x5c($sp) +/* 8DA180 80240080 AFB20058 */ sw $s2, 0x58($sp) +/* 8DA184 80240084 AFB00050 */ sw $s0, 0x50($sp) +/* 8DA188 80240088 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8DA18C 8024008C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8DA190 80240090 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8DA194 80240094 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8DA198 80240098 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8DA19C 8024009C 8E30000C */ lw $s0, 0xc($s1) +/* 8DA1A0 802400A0 8E050000 */ lw $a1, ($s0) +/* 8DA1A4 802400A4 0C0B1EAF */ jal get_variable +/* 8DA1A8 802400A8 26100004 */ addiu $s0, $s0, 4 +/* 8DA1AC 802400AC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8DA1B0 802400B0 0040202D */ daddu $a0, $v0, $zero +/* 8DA1B4 802400B4 8E050000 */ lw $a1, ($s0) +/* 8DA1B8 802400B8 26100004 */ addiu $s0, $s0, 4 +/* 8DA1BC 802400BC 0220202D */ daddu $a0, $s1, $zero +/* 8DA1C0 802400C0 0C0B210B */ jal get_float_variable +/* 8DA1C4 802400C4 0040902D */ daddu $s2, $v0, $zero +/* 8DA1C8 802400C8 8E050000 */ lw $a1, ($s0) +/* 8DA1CC 802400CC 26100004 */ addiu $s0, $s0, 4 +/* 8DA1D0 802400D0 0220202D */ daddu $a0, $s1, $zero +/* 8DA1D4 802400D4 0C0B210B */ jal get_float_variable +/* 8DA1D8 802400D8 46000706 */ mov.s $f28, $f0 +/* 8DA1DC 802400DC 8E050000 */ lw $a1, ($s0) +/* 8DA1E0 802400E0 26100004 */ addiu $s0, $s0, 4 +/* 8DA1E4 802400E4 0220202D */ daddu $a0, $s1, $zero +/* 8DA1E8 802400E8 0C0B210B */ jal get_float_variable +/* 8DA1EC 802400EC 46000686 */ mov.s $f26, $f0 +/* 8DA1F0 802400F0 0220202D */ daddu $a0, $s1, $zero +/* 8DA1F4 802400F4 8E050000 */ lw $a1, ($s0) +/* 8DA1F8 802400F8 0C0B210B */ jal get_float_variable +/* 8DA1FC 802400FC 46000586 */ mov.s $f22, $f0 +/* 8DA200 80240100 0240202D */ daddu $a0, $s2, $zero +/* 8DA204 80240104 0C046B4C */ jal get_model_from_list_index +/* 8DA208 80240108 46000606 */ mov.s $f24, $f0 +/* 8DA20C 8024010C 0040882D */ daddu $s1, $v0, $zero +/* 8DA210 80240110 96220000 */ lhu $v0, ($s1) +/* 8DA214 80240114 30420400 */ andi $v0, $v0, 0x400 +/* 8DA218 80240118 1440001E */ bnez $v0, .L80240194 +/* 8DA21C 8024011C 26300058 */ addiu $s0, $s1, 0x58 +/* 8DA220 80240120 4480A000 */ mtc1 $zero, $f20 +/* 8DA224 80240124 4406B000 */ mfc1 $a2, $f22 +/* 8DA228 80240128 4405A000 */ mfc1 $a1, $f20 +/* 8DA22C 8024012C 4407A000 */ mfc1 $a3, $f20 +/* 8DA230 80240130 0C019E40 */ jal guTranslateF +/* 8DA234 80240134 0200202D */ daddu $a0, $s0, $zero +/* 8DA238 80240138 4405E000 */ mfc1 $a1, $f28 +/* 8DA23C 8024013C 4406D000 */ mfc1 $a2, $f26 +/* 8DA240 80240140 4407C000 */ mfc1 $a3, $f24 +/* 8DA244 80240144 0C090000 */ jal func_80240000_8DA100 +/* 8DA248 80240148 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA24C 8024014C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA250 80240150 0200282D */ daddu $a1, $s0, $zero +/* 8DA254 80240154 0C019D80 */ jal guMtxCatF +/* 8DA258 80240158 0200302D */ daddu $a2, $s0, $zero +/* 8DA25C 8024015C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA260 80240160 4600B587 */ neg.s $f22, $f22 +/* 8DA264 80240164 4405A000 */ mfc1 $a1, $f20 +/* 8DA268 80240168 4406B000 */ mfc1 $a2, $f22 +/* 8DA26C 8024016C 0C019E40 */ jal guTranslateF +/* 8DA270 80240170 00A0382D */ daddu $a3, $a1, $zero +/* 8DA274 80240174 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA278 80240178 0200282D */ daddu $a1, $s0, $zero +/* 8DA27C 8024017C 0C019D80 */ jal guMtxCatF +/* 8DA280 80240180 00A0302D */ daddu $a2, $a1, $zero +/* 8DA284 80240184 96220000 */ lhu $v0, ($s1) +/* 8DA288 80240188 34421400 */ ori $v0, $v0, 0x1400 +/* 8DA28C 8024018C 08090083 */ j .L8024020C +/* 8DA290 80240190 A6220000 */ sh $v0, ($s1) +.L80240194: +/* 8DA294 80240194 4480A000 */ mtc1 $zero, $f20 +/* 8DA298 80240198 4406B000 */ mfc1 $a2, $f22 +/* 8DA29C 8024019C 4405A000 */ mfc1 $a1, $f20 +/* 8DA2A0 802401A0 4407A000 */ mfc1 $a3, $f20 +/* 8DA2A4 802401A4 0C019E40 */ jal guTranslateF +/* 8DA2A8 802401A8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA2AC 802401AC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA2B0 802401B0 26300058 */ addiu $s0, $s1, 0x58 +/* 8DA2B4 802401B4 0200282D */ daddu $a1, $s0, $zero +/* 8DA2B8 802401B8 0C019D80 */ jal guMtxCatF +/* 8DA2BC 802401BC 0200302D */ daddu $a2, $s0, $zero +/* 8DA2C0 802401C0 4405E000 */ mfc1 $a1, $f28 +/* 8DA2C4 802401C4 4406D000 */ mfc1 $a2, $f26 +/* 8DA2C8 802401C8 4407C000 */ mfc1 $a3, $f24 +/* 8DA2CC 802401CC 0C090000 */ jal func_80240000_8DA100 +/* 8DA2D0 802401D0 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA2D4 802401D4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA2D8 802401D8 0200282D */ daddu $a1, $s0, $zero +/* 8DA2DC 802401DC 0C019D80 */ jal guMtxCatF +/* 8DA2E0 802401E0 0200302D */ daddu $a2, $s0, $zero +/* 8DA2E4 802401E4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA2E8 802401E8 4600B587 */ neg.s $f22, $f22 +/* 8DA2EC 802401EC 4405A000 */ mfc1 $a1, $f20 +/* 8DA2F0 802401F0 4406B000 */ mfc1 $a2, $f22 +/* 8DA2F4 802401F4 0C019E40 */ jal guTranslateF +/* 8DA2F8 802401F8 00A0382D */ daddu $a3, $a1, $zero +/* 8DA2FC 802401FC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DA300 80240200 0200282D */ daddu $a1, $s0, $zero +/* 8DA304 80240204 0C019D80 */ jal guMtxCatF +/* 8DA308 80240208 00A0302D */ daddu $a2, $a1, $zero +.L8024020C: +/* 8DA30C 8024020C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8DA310 80240210 8FB20058 */ lw $s2, 0x58($sp) +/* 8DA314 80240214 8FB10054 */ lw $s1, 0x54($sp) +/* 8DA318 80240218 8FB00050 */ lw $s0, 0x50($sp) +/* 8DA31C 8024021C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8DA320 80240220 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8DA324 80240224 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8DA328 80240228 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8DA32C 8024022C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8DA330 80240230 24020002 */ addiu $v0, $zero, 2 +/* 8DA334 80240234 03E00008 */ jr $ra +/* 8DA338 80240238 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C.s deleted file mode 100644 index d29b9bf84d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024027C -/* 8DA37C 8024027C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DA380 80240280 AFBF0010 */ sw $ra, 0x10($sp) -/* 8DA384 80240284 0C00D77C */ jal func_80035DF0 -/* 8DA388 80240288 2404000A */ addiu $a0, $zero, 0xa -/* 8DA38C 8024028C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8DA390 80240290 24020002 */ addiu $v0, $zero, 2 -/* 8DA394 80240294 03E00008 */ jr $ra -/* 8DA398 80240298 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8DA39C 8024029C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s new file mode 100644 index 0000000000..898d2cd2b0 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA100/func_8024027C_8DA37C.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024027C_8DA37C +/* 8DA37C 8024027C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8DA380 80240280 AFBF0010 */ sw $ra, 0x10($sp) +/* 8DA384 80240284 0C00D77C */ jal func_80035DF0 +/* 8DA388 80240288 2404000A */ addiu $a0, $zero, 0xa +/* 8DA38C 8024028C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8DA390 80240290 24020002 */ addiu $v0, $zero, 2 +/* 8DA394 80240294 03E00008 */ jr $ra +/* 8DA398 80240298 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8DA39C 8024029C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0.s deleted file mode 100644 index 36a6f70f15..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402A0 -/* 8DA3A0 802402A0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8DA3A4 802402A4 AFB1001C */ sw $s1, 0x1c($sp) -/* 8DA3A8 802402A8 0080882D */ daddu $s1, $a0, $zero -/* 8DA3AC 802402AC AFBF0020 */ sw $ra, 0x20($sp) -/* 8DA3B0 802402B0 AFB00018 */ sw $s0, 0x18($sp) -/* 8DA3B4 802402B4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8DA3B8 802402B8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8DA3BC 802402BC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8DA3C0 802402C0 8E30000C */ lw $s0, 0xc($s1) -/* 8DA3C4 802402C4 8E050000 */ lw $a1, ($s0) -/* 8DA3C8 802402C8 0C0B210B */ jal get_float_variable -/* 8DA3CC 802402CC 26100004 */ addiu $s0, $s0, 4 -/* 8DA3D0 802402D0 8E050000 */ lw $a1, ($s0) -/* 8DA3D4 802402D4 26100004 */ addiu $s0, $s0, 4 -/* 8DA3D8 802402D8 0220202D */ daddu $a0, $s1, $zero -/* 8DA3DC 802402DC 0C0B210B */ jal get_float_variable -/* 8DA3E0 802402E0 46000606 */ mov.s $f24, $f0 -/* 8DA3E4 802402E4 8E050000 */ lw $a1, ($s0) -/* 8DA3E8 802402E8 26100004 */ addiu $s0, $s0, 4 -/* 8DA3EC 802402EC 0220202D */ daddu $a0, $s1, $zero -/* 8DA3F0 802402F0 0C0B210B */ jal get_float_variable -/* 8DA3F4 802402F4 46000586 */ mov.s $f22, $f0 -/* 8DA3F8 802402F8 0220202D */ daddu $a0, $s1, $zero -/* 8DA3FC 802402FC 8E050000 */ lw $a1, ($s0) -/* 8DA400 80240300 0C0B1EAF */ jal get_variable -/* 8DA404 80240304 46000506 */ mov.s $f20, $f0 -/* 8DA408 80240308 4405C000 */ mfc1 $a1, $f24 -/* 8DA40C 8024030C 4406B000 */ mfc1 $a2, $f22 -/* 8DA410 80240310 4407A000 */ mfc1 $a3, $f20 -/* 8DA414 80240314 0000202D */ daddu $a0, $zero, $zero -/* 8DA418 80240318 0C01C094 */ jal func_80070250 -/* 8DA41C 8024031C AFA20010 */ sw $v0, 0x10($sp) -/* 8DA420 80240320 8FBF0020 */ lw $ra, 0x20($sp) -/* 8DA424 80240324 8FB1001C */ lw $s1, 0x1c($sp) -/* 8DA428 80240328 8FB00018 */ lw $s0, 0x18($sp) -/* 8DA42C 8024032C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8DA430 80240330 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8DA434 80240334 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8DA438 80240338 24020002 */ addiu $v0, $zero, 2 -/* 8DA43C 8024033C 03E00008 */ jr $ra -/* 8DA440 80240340 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s new file mode 100644 index 0000000000..5b136bb05a --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802402A0_8DA3A0.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402A0_8DA3A0 +/* 8DA3A0 802402A0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 8DA3A4 802402A4 AFB1001C */ sw $s1, 0x1c($sp) +/* 8DA3A8 802402A8 0080882D */ daddu $s1, $a0, $zero +/* 8DA3AC 802402AC AFBF0020 */ sw $ra, 0x20($sp) +/* 8DA3B0 802402B0 AFB00018 */ sw $s0, 0x18($sp) +/* 8DA3B4 802402B4 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 8DA3B8 802402B8 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 8DA3BC 802402BC F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8DA3C0 802402C0 8E30000C */ lw $s0, 0xc($s1) +/* 8DA3C4 802402C4 8E050000 */ lw $a1, ($s0) +/* 8DA3C8 802402C8 0C0B210B */ jal get_float_variable +/* 8DA3CC 802402CC 26100004 */ addiu $s0, $s0, 4 +/* 8DA3D0 802402D0 8E050000 */ lw $a1, ($s0) +/* 8DA3D4 802402D4 26100004 */ addiu $s0, $s0, 4 +/* 8DA3D8 802402D8 0220202D */ daddu $a0, $s1, $zero +/* 8DA3DC 802402DC 0C0B210B */ jal get_float_variable +/* 8DA3E0 802402E0 46000606 */ mov.s $f24, $f0 +/* 8DA3E4 802402E4 8E050000 */ lw $a1, ($s0) +/* 8DA3E8 802402E8 26100004 */ addiu $s0, $s0, 4 +/* 8DA3EC 802402EC 0220202D */ daddu $a0, $s1, $zero +/* 8DA3F0 802402F0 0C0B210B */ jal get_float_variable +/* 8DA3F4 802402F4 46000586 */ mov.s $f22, $f0 +/* 8DA3F8 802402F8 0220202D */ daddu $a0, $s1, $zero +/* 8DA3FC 802402FC 8E050000 */ lw $a1, ($s0) +/* 8DA400 80240300 0C0B1EAF */ jal get_variable +/* 8DA404 80240304 46000506 */ mov.s $f20, $f0 +/* 8DA408 80240308 4405C000 */ mfc1 $a1, $f24 +/* 8DA40C 8024030C 4406B000 */ mfc1 $a2, $f22 +/* 8DA410 80240310 4407A000 */ mfc1 $a3, $f20 +/* 8DA414 80240314 0000202D */ daddu $a0, $zero, $zero +/* 8DA418 80240318 0C01C094 */ jal func_80070250 +/* 8DA41C 8024031C AFA20010 */ sw $v0, 0x10($sp) +/* 8DA420 80240320 8FBF0020 */ lw $ra, 0x20($sp) +/* 8DA424 80240324 8FB1001C */ lw $s1, 0x1c($sp) +/* 8DA428 80240328 8FB00018 */ lw $s0, 0x18($sp) +/* 8DA42C 8024032C D7B80038 */ ldc1 $f24, 0x38($sp) +/* 8DA430 80240330 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 8DA434 80240334 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8DA438 80240338 24020002 */ addiu $v0, $zero, 2 +/* 8DA43C 8024033C 03E00008 */ jr $ra +/* 8DA440 80240340 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424.s deleted file mode 100644 index d8a0561394..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240424 -/* 8DA524 80240424 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8DA528 80240428 AFB40040 */ sw $s4, 0x40($sp) -/* 8DA52C 8024042C 0080A02D */ daddu $s4, $a0, $zero -/* 8DA530 80240430 AFBF0044 */ sw $ra, 0x44($sp) -/* 8DA534 80240434 AFB3003C */ sw $s3, 0x3c($sp) -/* 8DA538 80240438 AFB20038 */ sw $s2, 0x38($sp) -/* 8DA53C 8024043C AFB10034 */ sw $s1, 0x34($sp) -/* 8DA540 80240440 AFB00030 */ sw $s0, 0x30($sp) -/* 8DA544 80240444 8E920148 */ lw $s2, 0x148($s4) -/* 8DA548 80240448 00A0802D */ daddu $s0, $a1, $zero -/* 8DA54C 8024044C 86440008 */ lh $a0, 8($s2) -/* 8DA550 80240450 0C00EABB */ jal get_npc_unsafe -/* 8DA554 80240454 00C0982D */ daddu $s3, $a2, $zero -/* 8DA558 80240458 8E030008 */ lw $v1, 8($s0) -/* 8DA55C 8024045C 04600031 */ bltz $v1, .L80240524 -/* 8DA560 80240460 0040882D */ daddu $s1, $v0, $zero -/* 8DA564 80240464 0260202D */ daddu $a0, $s3, $zero -/* 8DA568 80240468 AFA00010 */ sw $zero, 0x10($sp) -/* 8DA56C 8024046C 8E060018 */ lw $a2, 0x18($s0) -/* 8DA570 80240470 8E07001C */ lw $a3, 0x1c($s0) -/* 8DA574 80240474 0C01242D */ jal func_800490B4 -/* 8DA578 80240478 0240282D */ daddu $a1, $s2, $zero -/* 8DA57C 8024047C 10400029 */ beqz $v0, .L80240524 -/* 8DA580 80240480 0000202D */ daddu $a0, $zero, $zero -/* 8DA584 80240484 0220282D */ daddu $a1, $s1, $zero -/* 8DA588 80240488 0000302D */ daddu $a2, $zero, $zero -/* 8DA58C 8024048C 862300A8 */ lh $v1, 0xa8($s1) -/* 8DA590 80240490 3C013F80 */ lui $at, 0x3f80 -/* 8DA594 80240494 44810000 */ mtc1 $at, $f0 -/* 8DA598 80240498 3C014000 */ lui $at, 0x4000 -/* 8DA59C 8024049C 44811000 */ mtc1 $at, $f2 -/* 8DA5A0 802404A0 3C01C1A0 */ lui $at, 0xc1a0 -/* 8DA5A4 802404A4 44812000 */ mtc1 $at, $f4 -/* 8DA5A8 802404A8 2402000F */ addiu $v0, $zero, 0xf -/* 8DA5AC 802404AC AFA2001C */ sw $v0, 0x1c($sp) -/* 8DA5B0 802404B0 44833000 */ mtc1 $v1, $f6 -/* 8DA5B4 802404B4 00000000 */ nop -/* 8DA5B8 802404B8 468031A0 */ cvt.s.w $f6, $f6 -/* 8DA5BC 802404BC 44073000 */ mfc1 $a3, $f6 -/* 8DA5C0 802404C0 27A20028 */ addiu $v0, $sp, 0x28 -/* 8DA5C4 802404C4 AFA20020 */ sw $v0, 0x20($sp) -/* 8DA5C8 802404C8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8DA5CC 802404CC E7A20014 */ swc1 $f2, 0x14($sp) -/* 8DA5D0 802404D0 0C01BFA4 */ jal fx_emote -/* 8DA5D4 802404D4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8DA5D8 802404D8 0220202D */ daddu $a0, $s1, $zero -/* 8DA5DC 802404DC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8DA5E0 802404E0 0C012530 */ jal func_800494C0 -/* 8DA5E4 802404E4 3C060020 */ lui $a2, 0x20 -/* 8DA5E8 802404E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8DA5EC 802404EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8DA5F0 802404F0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 8DA5F4 802404F4 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 8DA5F8 802404F8 8C460028 */ lw $a2, 0x28($v0) -/* 8DA5FC 802404FC 0C00A720 */ jal atan2 -/* 8DA600 80240500 8C470030 */ lw $a3, 0x30($v0) -/* 8DA604 80240504 E620000C */ swc1 $f0, 0xc($s1) -/* 8DA608 80240508 8E420018 */ lw $v0, 0x18($s2) -/* 8DA60C 8024050C 9442002A */ lhu $v0, 0x2a($v0) -/* 8DA610 80240510 30420001 */ andi $v0, $v0, 1 -/* 8DA614 80240514 14400002 */ bnez $v0, .L80240520 -/* 8DA618 80240518 2402000A */ addiu $v0, $zero, 0xa -/* 8DA61C 8024051C 2402000C */ addiu $v0, $zero, 0xc -.L80240520: -/* 8DA620 80240520 AE820070 */ sw $v0, 0x70($s4) -.L80240524: -/* 8DA624 80240524 8FBF0044 */ lw $ra, 0x44($sp) -/* 8DA628 80240528 8FB40040 */ lw $s4, 0x40($sp) -/* 8DA62C 8024052C 8FB3003C */ lw $s3, 0x3c($sp) -/* 8DA630 80240530 8FB20038 */ lw $s2, 0x38($sp) -/* 8DA634 80240534 8FB10034 */ lw $s1, 0x34($sp) -/* 8DA638 80240538 8FB00030 */ lw $s0, 0x30($sp) -/* 8DA63C 8024053C 03E00008 */ jr $ra -/* 8DA640 80240540 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s new file mode 100644 index 0000000000..3c57b6a3dc --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240424_8DA524.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240424_8DA524 +/* 8DA524 80240424 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8DA528 80240428 AFB40040 */ sw $s4, 0x40($sp) +/* 8DA52C 8024042C 0080A02D */ daddu $s4, $a0, $zero +/* 8DA530 80240430 AFBF0044 */ sw $ra, 0x44($sp) +/* 8DA534 80240434 AFB3003C */ sw $s3, 0x3c($sp) +/* 8DA538 80240438 AFB20038 */ sw $s2, 0x38($sp) +/* 8DA53C 8024043C AFB10034 */ sw $s1, 0x34($sp) +/* 8DA540 80240440 AFB00030 */ sw $s0, 0x30($sp) +/* 8DA544 80240444 8E920148 */ lw $s2, 0x148($s4) +/* 8DA548 80240448 00A0802D */ daddu $s0, $a1, $zero +/* 8DA54C 8024044C 86440008 */ lh $a0, 8($s2) +/* 8DA550 80240450 0C00EABB */ jal get_npc_unsafe +/* 8DA554 80240454 00C0982D */ daddu $s3, $a2, $zero +/* 8DA558 80240458 8E030008 */ lw $v1, 8($s0) +/* 8DA55C 8024045C 04600031 */ bltz $v1, .L80240524 +/* 8DA560 80240460 0040882D */ daddu $s1, $v0, $zero +/* 8DA564 80240464 0260202D */ daddu $a0, $s3, $zero +/* 8DA568 80240468 AFA00010 */ sw $zero, 0x10($sp) +/* 8DA56C 8024046C 8E060018 */ lw $a2, 0x18($s0) +/* 8DA570 80240470 8E07001C */ lw $a3, 0x1c($s0) +/* 8DA574 80240474 0C01242D */ jal func_800490B4 +/* 8DA578 80240478 0240282D */ daddu $a1, $s2, $zero +/* 8DA57C 8024047C 10400029 */ beqz $v0, .L80240524 +/* 8DA580 80240480 0000202D */ daddu $a0, $zero, $zero +/* 8DA584 80240484 0220282D */ daddu $a1, $s1, $zero +/* 8DA588 80240488 0000302D */ daddu $a2, $zero, $zero +/* 8DA58C 8024048C 862300A8 */ lh $v1, 0xa8($s1) +/* 8DA590 80240490 3C013F80 */ lui $at, 0x3f80 +/* 8DA594 80240494 44810000 */ mtc1 $at, $f0 +/* 8DA598 80240498 3C014000 */ lui $at, 0x4000 +/* 8DA59C 8024049C 44811000 */ mtc1 $at, $f2 +/* 8DA5A0 802404A0 3C01C1A0 */ lui $at, 0xc1a0 +/* 8DA5A4 802404A4 44812000 */ mtc1 $at, $f4 +/* 8DA5A8 802404A8 2402000F */ addiu $v0, $zero, 0xf +/* 8DA5AC 802404AC AFA2001C */ sw $v0, 0x1c($sp) +/* 8DA5B0 802404B0 44833000 */ mtc1 $v1, $f6 +/* 8DA5B4 802404B4 00000000 */ nop +/* 8DA5B8 802404B8 468031A0 */ cvt.s.w $f6, $f6 +/* 8DA5BC 802404BC 44073000 */ mfc1 $a3, $f6 +/* 8DA5C0 802404C0 27A20028 */ addiu $v0, $sp, 0x28 +/* 8DA5C4 802404C4 AFA20020 */ sw $v0, 0x20($sp) +/* 8DA5C8 802404C8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8DA5CC 802404CC E7A20014 */ swc1 $f2, 0x14($sp) +/* 8DA5D0 802404D0 0C01BFA4 */ jal fx_emote +/* 8DA5D4 802404D4 E7A40018 */ swc1 $f4, 0x18($sp) +/* 8DA5D8 802404D8 0220202D */ daddu $a0, $s1, $zero +/* 8DA5DC 802404DC 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 8DA5E0 802404E0 0C012530 */ jal func_800494C0 +/* 8DA5E4 802404E4 3C060020 */ lui $a2, 0x20 +/* 8DA5E8 802404E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8DA5EC 802404EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8DA5F0 802404F0 C62C0038 */ lwc1 $f12, 0x38($s1) +/* 8DA5F4 802404F4 C62E0040 */ lwc1 $f14, 0x40($s1) +/* 8DA5F8 802404F8 8C460028 */ lw $a2, 0x28($v0) +/* 8DA5FC 802404FC 0C00A720 */ jal atan2 +/* 8DA600 80240500 8C470030 */ lw $a3, 0x30($v0) +/* 8DA604 80240504 E620000C */ swc1 $f0, 0xc($s1) +/* 8DA608 80240508 8E420018 */ lw $v0, 0x18($s2) +/* 8DA60C 8024050C 9442002A */ lhu $v0, 0x2a($v0) +/* 8DA610 80240510 30420001 */ andi $v0, $v0, 1 +/* 8DA614 80240514 14400002 */ bnez $v0, .L80240520 +/* 8DA618 80240518 2402000A */ addiu $v0, $zero, 0xa +/* 8DA61C 8024051C 2402000C */ addiu $v0, $zero, 0xc +.L80240520: +/* 8DA620 80240520 AE820070 */ sw $v0, 0x70($s4) +.L80240524: +/* 8DA624 80240524 8FBF0044 */ lw $ra, 0x44($sp) +/* 8DA628 80240528 8FB40040 */ lw $s4, 0x40($sp) +/* 8DA62C 8024052C 8FB3003C */ lw $s3, 0x3c($sp) +/* 8DA630 80240530 8FB20038 */ lw $s2, 0x38($sp) +/* 8DA634 80240534 8FB10034 */ lw $s1, 0x34($sp) +/* 8DA638 80240538 8FB00030 */ lw $s0, 0x30($sp) +/* 8DA63C 8024053C 03E00008 */ jr $ra +/* 8DA640 80240540 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544.s deleted file mode 100644 index 4635cd2f1c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240544 -/* 8DA644 80240544 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DA648 80240548 AFB00010 */ sw $s0, 0x10($sp) -/* 8DA64C 8024054C 0080802D */ daddu $s0, $a0, $zero -/* 8DA650 80240550 AFBF0014 */ sw $ra, 0x14($sp) -/* 8DA654 80240554 8E020148 */ lw $v0, 0x148($s0) -/* 8DA658 80240558 0C00EABB */ jal get_npc_unsafe -/* 8DA65C 8024055C 84440008 */ lh $a0, 8($v0) -/* 8DA660 80240560 3C014120 */ lui $at, 0x4120 -/* 8DA664 80240564 44810000 */ mtc1 $at, $f0 -/* 8DA668 80240568 3C014000 */ lui $at, 0x4000 -/* 8DA66C 8024056C 44811000 */ mtc1 $at, $f2 -/* 8DA670 80240570 8C430000 */ lw $v1, ($v0) -/* 8DA674 80240574 C444003C */ lwc1 $f4, 0x3c($v0) -/* 8DA678 80240578 34630800 */ ori $v1, $v1, 0x800 -/* 8DA67C 8024057C E440001C */ swc1 $f0, 0x1c($v0) -/* 8DA680 80240580 E4420014 */ swc1 $f2, 0x14($v0) -/* 8DA684 80240584 E4440064 */ swc1 $f4, 0x64($v0) -/* 8DA688 80240588 AC430000 */ sw $v1, ($v0) -/* 8DA68C 8024058C 2402000B */ addiu $v0, $zero, 0xb -/* 8DA690 80240590 AE020070 */ sw $v0, 0x70($s0) -/* 8DA694 80240594 8FBF0014 */ lw $ra, 0x14($sp) -/* 8DA698 80240598 8FB00010 */ lw $s0, 0x10($sp) -/* 8DA69C 8024059C 03E00008 */ jr $ra -/* 8DA6A0 802405A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544_8DA644.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544_8DA644.s new file mode 100644 index 0000000000..eabefa8e18 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240544_8DA644.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240544_8DA644 +/* 8DA644 80240544 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8DA648 80240548 AFB00010 */ sw $s0, 0x10($sp) +/* 8DA64C 8024054C 0080802D */ daddu $s0, $a0, $zero +/* 8DA650 80240550 AFBF0014 */ sw $ra, 0x14($sp) +/* 8DA654 80240554 8E020148 */ lw $v0, 0x148($s0) +/* 8DA658 80240558 0C00EABB */ jal get_npc_unsafe +/* 8DA65C 8024055C 84440008 */ lh $a0, 8($v0) +/* 8DA660 80240560 3C014120 */ lui $at, 0x4120 +/* 8DA664 80240564 44810000 */ mtc1 $at, $f0 +/* 8DA668 80240568 3C014000 */ lui $at, 0x4000 +/* 8DA66C 8024056C 44811000 */ mtc1 $at, $f2 +/* 8DA670 80240570 8C430000 */ lw $v1, ($v0) +/* 8DA674 80240574 C444003C */ lwc1 $f4, 0x3c($v0) +/* 8DA678 80240578 34630800 */ ori $v1, $v1, 0x800 +/* 8DA67C 8024057C E440001C */ swc1 $f0, 0x1c($v0) +/* 8DA680 80240580 E4420014 */ swc1 $f2, 0x14($v0) +/* 8DA684 80240584 E4440064 */ swc1 $f4, 0x64($v0) +/* 8DA688 80240588 AC430000 */ sw $v1, ($v0) +/* 8DA68C 8024058C 2402000B */ addiu $v0, $zero, 0xb +/* 8DA690 80240590 AE020070 */ sw $v0, 0x70($s0) +/* 8DA694 80240594 8FBF0014 */ lw $ra, 0x14($sp) +/* 8DA698 80240598 8FB00010 */ lw $s0, 0x10($sp) +/* 8DA69C 8024059C 03E00008 */ jr $ra +/* 8DA6A0 802405A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4.s deleted file mode 100644 index 68e45c5c48..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A4 -/* 8DA6A4 802405A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DA6A8 802405A8 AFB00010 */ sw $s0, 0x10($sp) -/* 8DA6AC 802405AC 0080802D */ daddu $s0, $a0, $zero -/* 8DA6B0 802405B0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8DA6B4 802405B4 8E020148 */ lw $v0, 0x148($s0) -/* 8DA6B8 802405B8 0C00EABB */ jal get_npc_unsafe -/* 8DA6BC 802405BC 84440008 */ lh $a0, 8($v0) -/* 8DA6C0 802405C0 0040202D */ daddu $a0, $v0, $zero -/* 8DA6C4 802405C4 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8DA6C8 802405C8 C480001C */ lwc1 $f0, 0x1c($a0) -/* 8DA6CC 802405CC 46001080 */ add.s $f2, $f2, $f0 -/* 8DA6D0 802405D0 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8DA6D4 802405D4 46040001 */ sub.s $f0, $f0, $f4 -/* 8DA6D8 802405D8 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8DA6DC 802405DC 4602203C */ c.lt.s $f4, $f2 -/* 8DA6E0 802405E0 E482003C */ swc1 $f2, 0x3c($a0) -/* 8DA6E4 802405E4 45010009 */ bc1t .L8024060C -/* 8DA6E8 802405E8 E480001C */ swc1 $f0, 0x1c($a0) -/* 8DA6EC 802405EC 8C820000 */ lw $v0, ($a0) -/* 8DA6F0 802405F0 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8DA6F4 802405F4 E484003C */ swc1 $f4, 0x3c($a0) -/* 8DA6F8 802405F8 AC80001C */ sw $zero, 0x1c($a0) -/* 8DA6FC 802405FC 00431024 */ and $v0, $v0, $v1 -/* 8DA700 80240600 AC820000 */ sw $v0, ($a0) -/* 8DA704 80240604 2402000C */ addiu $v0, $zero, 0xc -/* 8DA708 80240608 AE020070 */ sw $v0, 0x70($s0) -.L8024060C: -/* 8DA70C 8024060C 8FBF0014 */ lw $ra, 0x14($sp) -/* 8DA710 80240610 8FB00010 */ lw $s0, 0x10($sp) -/* 8DA714 80240614 03E00008 */ jr $ra -/* 8DA718 80240618 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4_8DA6A4.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4_8DA6A4.s new file mode 100644 index 0000000000..6ce79668d7 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802405A4_8DA6A4.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405A4_8DA6A4 +/* 8DA6A4 802405A4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8DA6A8 802405A8 AFB00010 */ sw $s0, 0x10($sp) +/* 8DA6AC 802405AC 0080802D */ daddu $s0, $a0, $zero +/* 8DA6B0 802405B0 AFBF0014 */ sw $ra, 0x14($sp) +/* 8DA6B4 802405B4 8E020148 */ lw $v0, 0x148($s0) +/* 8DA6B8 802405B8 0C00EABB */ jal get_npc_unsafe +/* 8DA6BC 802405BC 84440008 */ lh $a0, 8($v0) +/* 8DA6C0 802405C0 0040202D */ daddu $a0, $v0, $zero +/* 8DA6C4 802405C4 C482003C */ lwc1 $f2, 0x3c($a0) +/* 8DA6C8 802405C8 C480001C */ lwc1 $f0, 0x1c($a0) +/* 8DA6CC 802405CC 46001080 */ add.s $f2, $f2, $f0 +/* 8DA6D0 802405D0 C4840014 */ lwc1 $f4, 0x14($a0) +/* 8DA6D4 802405D4 46040001 */ sub.s $f0, $f0, $f4 +/* 8DA6D8 802405D8 C4840064 */ lwc1 $f4, 0x64($a0) +/* 8DA6DC 802405DC 4602203C */ c.lt.s $f4, $f2 +/* 8DA6E0 802405E0 E482003C */ swc1 $f2, 0x3c($a0) +/* 8DA6E4 802405E4 45010009 */ bc1t .L8024060C +/* 8DA6E8 802405E8 E480001C */ swc1 $f0, 0x1c($a0) +/* 8DA6EC 802405EC 8C820000 */ lw $v0, ($a0) +/* 8DA6F0 802405F0 2403F7FF */ addiu $v1, $zero, -0x801 +/* 8DA6F4 802405F4 E484003C */ swc1 $f4, 0x3c($a0) +/* 8DA6F8 802405F8 AC80001C */ sw $zero, 0x1c($a0) +/* 8DA6FC 802405FC 00431024 */ and $v0, $v0, $v1 +/* 8DA700 80240600 AC820000 */ sw $v0, ($a0) +/* 8DA704 80240604 2402000C */ addiu $v0, $zero, 0xc +/* 8DA708 80240608 AE020070 */ sw $v0, 0x70($s0) +.L8024060C: +/* 8DA70C 8024060C 8FBF0014 */ lw $ra, 0x14($sp) +/* 8DA710 80240610 8FB00010 */ lw $s0, 0x10($sp) +/* 8DA714 80240614 03E00008 */ jr $ra +/* 8DA718 80240618 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868.s deleted file mode 100644 index 5c4159c95b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240868 -/* 8DA968 80240868 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DA96C 8024086C AFB00010 */ sw $s0, 0x10($sp) -/* 8DA970 80240870 0080802D */ daddu $s0, $a0, $zero -/* 8DA974 80240874 AFBF0014 */ sw $ra, 0x14($sp) -/* 8DA978 80240878 8E020148 */ lw $v0, 0x148($s0) -/* 8DA97C 8024087C 0C00EABB */ jal get_npc_unsafe -/* 8DA980 80240880 84440008 */ lh $a0, 8($v0) -/* 8DA984 80240884 9443008E */ lhu $v1, 0x8e($v0) -/* 8DA988 80240888 2463FFFF */ addiu $v1, $v1, -1 -/* 8DA98C 8024088C A443008E */ sh $v1, 0x8e($v0) -/* 8DA990 80240890 00031C00 */ sll $v1, $v1, 0x10 -/* 8DA994 80240894 14600002 */ bnez $v1, .L802408A0 -/* 8DA998 80240898 2402000F */ addiu $v0, $zero, 0xf -/* 8DA99C 8024089C AE020070 */ sw $v0, 0x70($s0) -.L802408A0: -/* 8DA9A0 802408A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8DA9A4 802408A4 8FB00010 */ lw $s0, 0x10($sp) -/* 8DA9A8 802408A8 03E00008 */ jr $ra -/* 8DA9AC 802408AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868_8DA968.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868_8DA968.s new file mode 100644 index 0000000000..c374315403 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240868_8DA968.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240868_8DA968 +/* 8DA968 80240868 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8DA96C 8024086C AFB00010 */ sw $s0, 0x10($sp) +/* 8DA970 80240870 0080802D */ daddu $s0, $a0, $zero +/* 8DA974 80240874 AFBF0014 */ sw $ra, 0x14($sp) +/* 8DA978 80240878 8E020148 */ lw $v0, 0x148($s0) +/* 8DA97C 8024087C 0C00EABB */ jal get_npc_unsafe +/* 8DA980 80240880 84440008 */ lh $a0, 8($v0) +/* 8DA984 80240884 9443008E */ lhu $v1, 0x8e($v0) +/* 8DA988 80240888 2463FFFF */ addiu $v1, $v1, -1 +/* 8DA98C 8024088C A443008E */ sh $v1, 0x8e($v0) +/* 8DA990 80240890 00031C00 */ sll $v1, $v1, 0x10 +/* 8DA994 80240894 14600002 */ bnez $v1, .L802408A0 +/* 8DA998 80240898 2402000F */ addiu $v0, $zero, 0xf +/* 8DA99C 8024089C AE020070 */ sw $v0, 0x70($s0) +.L802408A0: +/* 8DA9A0 802408A0 8FBF0014 */ lw $ra, 0x14($sp) +/* 8DA9A4 802408A4 8FB00010 */ lw $s0, 0x10($sp) +/* 8DA9A8 802408A8 03E00008 */ jr $ra +/* 8DA9AC 802408AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0.s deleted file mode 100644 index a934189912..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408B0 -/* 8DA9B0 802408B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8DA9B4 802408B4 AFB10014 */ sw $s1, 0x14($sp) -/* 8DA9B8 802408B8 0080882D */ daddu $s1, $a0, $zero -/* 8DA9BC 802408BC AFBF001C */ sw $ra, 0x1c($sp) -/* 8DA9C0 802408C0 AFB20018 */ sw $s2, 0x18($sp) -/* 8DA9C4 802408C4 AFB00010 */ sw $s0, 0x10($sp) -/* 8DA9C8 802408C8 8E300148 */ lw $s0, 0x148($s1) -/* 8DA9CC 802408CC 86040008 */ lh $a0, 8($s0) -/* 8DA9D0 802408D0 0C00EABB */ jal get_npc_unsafe -/* 8DA9D4 802408D4 00A0902D */ daddu $s2, $a1, $zero -/* 8DA9D8 802408D8 8E0300CC */ lw $v1, 0xcc($s0) -/* 8DA9DC 802408DC 8C630004 */ lw $v1, 4($v1) -/* 8DA9E0 802408E0 0040202D */ daddu $a0, $v0, $zero -/* 8DA9E4 802408E4 AC830028 */ sw $v1, 0x28($a0) -/* 8DA9E8 802408E8 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8DA9EC 802408EC 8C420014 */ lw $v0, 0x14($v0) -/* 8DA9F0 802408F0 04410009 */ bgez $v0, .L80240918 -/* 8DA9F4 802408F4 00000000 */ nop -/* 8DA9F8 802408F8 C640000C */ lwc1 $f0, 0xc($s2) -/* 8DA9FC 802408FC 3C018025 */ lui $at, 0x8025 -/* 8DAA00 80240900 D42210B8 */ ldc1 $f2, 0x10b8($at) -/* 8DAA04 80240904 46000021 */ cvt.d.s $f0, $f0 -/* 8DAA08 80240908 46220002 */ mul.d $f0, $f0, $f2 -/* 8DAA0C 8024090C 00000000 */ nop -/* 8DAA10 80240910 0809024D */ j .L80240934 -/* 8DAA14 80240914 46200020 */ cvt.s.d $f0, $f0 -.L80240918: -/* 8DAA18 80240918 3C018025 */ lui $at, 0x8025 -/* 8DAA1C 8024091C D42210C0 */ ldc1 $f2, 0x10c0($at) -/* 8DAA20 80240920 44820000 */ mtc1 $v0, $f0 -/* 8DAA24 80240924 00000000 */ nop -/* 8DAA28 80240928 46800021 */ cvt.d.w $f0, $f0 -/* 8DAA2C 8024092C 46220003 */ div.d $f0, $f0, $f2 -/* 8DAA30 80240930 46200020 */ cvt.s.d $f0, $f0 -.L80240934: -/* 8DAA34 80240934 E4800018 */ swc1 $f0, 0x18($a0) -/* 8DAA38 80240938 24020010 */ addiu $v0, $zero, 0x10 -/* 8DAA3C 8024093C AE200074 */ sw $zero, 0x74($s1) -/* 8DAA40 80240940 AE220070 */ sw $v0, 0x70($s1) -/* 8DAA44 80240944 8FBF001C */ lw $ra, 0x1c($sp) -/* 8DAA48 80240948 8FB20018 */ lw $s2, 0x18($sp) -/* 8DAA4C 8024094C 8FB10014 */ lw $s1, 0x14($sp) -/* 8DAA50 80240950 8FB00010 */ lw $s0, 0x10($sp) -/* 8DAA54 80240954 03E00008 */ jr $ra -/* 8DAA58 80240958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s new file mode 100644 index 0000000000..a8a8e8ce92 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_802408B0_8DA9B0.s @@ -0,0 +1,49 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408B0_8DA9B0 +/* 8DA9B0 802408B0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8DA9B4 802408B4 AFB10014 */ sw $s1, 0x14($sp) +/* 8DA9B8 802408B8 0080882D */ daddu $s1, $a0, $zero +/* 8DA9BC 802408BC AFBF001C */ sw $ra, 0x1c($sp) +/* 8DA9C0 802408C0 AFB20018 */ sw $s2, 0x18($sp) +/* 8DA9C4 802408C4 AFB00010 */ sw $s0, 0x10($sp) +/* 8DA9C8 802408C8 8E300148 */ lw $s0, 0x148($s1) +/* 8DA9CC 802408CC 86040008 */ lh $a0, 8($s0) +/* 8DA9D0 802408D0 0C00EABB */ jal get_npc_unsafe +/* 8DA9D4 802408D4 00A0902D */ daddu $s2, $a1, $zero +/* 8DA9D8 802408D8 8E0300CC */ lw $v1, 0xcc($s0) +/* 8DA9DC 802408DC 8C630004 */ lw $v1, 4($v1) +/* 8DA9E0 802408E0 0040202D */ daddu $a0, $v0, $zero +/* 8DA9E4 802408E4 AC830028 */ sw $v1, 0x28($a0) +/* 8DA9E8 802408E8 8E0200D0 */ lw $v0, 0xd0($s0) +/* 8DA9EC 802408EC 8C420014 */ lw $v0, 0x14($v0) +/* 8DA9F0 802408F0 04410009 */ bgez $v0, .L80240918 +/* 8DA9F4 802408F4 00000000 */ nop +/* 8DA9F8 802408F8 C640000C */ lwc1 $f0, 0xc($s2) +/* 8DA9FC 802408FC 3C018025 */ lui $at, 0x8025 +/* 8DAA00 80240900 D42210B8 */ ldc1 $f2, 0x10b8($at) +/* 8DAA04 80240904 46000021 */ cvt.d.s $f0, $f0 +/* 8DAA08 80240908 46220002 */ mul.d $f0, $f0, $f2 +/* 8DAA0C 8024090C 00000000 */ nop +/* 8DAA10 80240910 0809024D */ j .L80240934 +/* 8DAA14 80240914 46200020 */ cvt.s.d $f0, $f0 +.L80240918: +/* 8DAA18 80240918 3C018025 */ lui $at, 0x8025 +/* 8DAA1C 8024091C D42210C0 */ ldc1 $f2, 0x10c0($at) +/* 8DAA20 80240920 44820000 */ mtc1 $v0, $f0 +/* 8DAA24 80240924 00000000 */ nop +/* 8DAA28 80240928 46800021 */ cvt.d.w $f0, $f0 +/* 8DAA2C 8024092C 46220003 */ div.d $f0, $f0, $f2 +/* 8DAA30 80240930 46200020 */ cvt.s.d $f0, $f0 +.L80240934: +/* 8DAA34 80240934 E4800018 */ swc1 $f0, 0x18($a0) +/* 8DAA38 80240938 24020010 */ addiu $v0, $zero, 0x10 +/* 8DAA3C 8024093C AE200074 */ sw $zero, 0x74($s1) +/* 8DAA40 80240940 AE220070 */ sw $v0, 0x70($s1) +/* 8DAA44 80240944 8FBF001C */ lw $ra, 0x1c($sp) +/* 8DAA48 80240948 8FB20018 */ lw $s2, 0x18($sp) +/* 8DAA4C 8024094C 8FB10014 */ lw $s1, 0x14($sp) +/* 8DAA50 80240950 8FB00010 */ lw $s0, 0x10($sp) +/* 8DAA54 80240954 03E00008 */ jr $ra +/* 8DAA58 80240958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C.s deleted file mode 100644 index aebb910885..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024095C -/* 8DAA5C 8024095C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8DAA60 80240960 AFB3003C */ sw $s3, 0x3c($sp) -/* 8DAA64 80240964 0080982D */ daddu $s3, $a0, $zero -/* 8DAA68 80240968 AFBF0044 */ sw $ra, 0x44($sp) -/* 8DAA6C 8024096C AFB40040 */ sw $s4, 0x40($sp) -/* 8DAA70 80240970 AFB20038 */ sw $s2, 0x38($sp) -/* 8DAA74 80240974 AFB10034 */ sw $s1, 0x34($sp) -/* 8DAA78 80240978 AFB00030 */ sw $s0, 0x30($sp) -/* 8DAA7C 8024097C 8E710148 */ lw $s1, 0x148($s3) -/* 8DAA80 80240980 00A0902D */ daddu $s2, $a1, $zero -/* 8DAA84 80240984 86240008 */ lh $a0, 8($s1) -/* 8DAA88 80240988 0C00EABB */ jal get_npc_unsafe -/* 8DAA8C 8024098C 00C0A02D */ daddu $s4, $a2, $zero -/* 8DAA90 80240990 8E430008 */ lw $v1, 8($s2) -/* 8DAA94 80240994 0460003B */ bltz $v1, .L80240A84 -/* 8DAA98 80240998 0040802D */ daddu $s0, $v0, $zero -/* 8DAA9C 8024099C 8E620074 */ lw $v0, 0x74($s3) -/* 8DAAA0 802409A0 1C400037 */ bgtz $v0, .L80240A80 -/* 8DAAA4 802409A4 2442FFFF */ addiu $v0, $v0, -1 -/* 8DAAA8 802409A8 0280202D */ daddu $a0, $s4, $zero -/* 8DAAAC 802409AC AE630074 */ sw $v1, 0x74($s3) -/* 8DAAB0 802409B0 AFA00010 */ sw $zero, 0x10($sp) -/* 8DAAB4 802409B4 8E460018 */ lw $a2, 0x18($s2) -/* 8DAAB8 802409B8 8E47001C */ lw $a3, 0x1c($s2) -/* 8DAABC 802409BC 0C01242D */ jal func_800490B4 -/* 8DAAC0 802409C0 0220282D */ daddu $a1, $s1, $zero -/* 8DAAC4 802409C4 1040002C */ beqz $v0, .L80240A78 -/* 8DAAC8 802409C8 0000202D */ daddu $a0, $zero, $zero -/* 8DAACC 802409CC 0200282D */ daddu $a1, $s0, $zero -/* 8DAAD0 802409D0 0000302D */ daddu $a2, $zero, $zero -/* 8DAAD4 802409D4 860300A8 */ lh $v1, 0xa8($s0) -/* 8DAAD8 802409D8 3C013F80 */ lui $at, 0x3f80 -/* 8DAADC 802409DC 44810000 */ mtc1 $at, $f0 -/* 8DAAE0 802409E0 3C014000 */ lui $at, 0x4000 -/* 8DAAE4 802409E4 44811000 */ mtc1 $at, $f2 -/* 8DAAE8 802409E8 3C01C1A0 */ lui $at, 0xc1a0 -/* 8DAAEC 802409EC 44812000 */ mtc1 $at, $f4 -/* 8DAAF0 802409F0 2402000F */ addiu $v0, $zero, 0xf -/* 8DAAF4 802409F4 AFA2001C */ sw $v0, 0x1c($sp) -/* 8DAAF8 802409F8 44833000 */ mtc1 $v1, $f6 -/* 8DAAFC 802409FC 00000000 */ nop -/* 8DAB00 80240A00 468031A0 */ cvt.s.w $f6, $f6 -/* 8DAB04 80240A04 44073000 */ mfc1 $a3, $f6 -/* 8DAB08 80240A08 27A20028 */ addiu $v0, $sp, 0x28 -/* 8DAB0C 80240A0C AFA20020 */ sw $v0, 0x20($sp) -/* 8DAB10 80240A10 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8DAB14 80240A14 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8DAB18 80240A18 0C01BFA4 */ jal fx_emote -/* 8DAB1C 80240A1C E7A40018 */ swc1 $f4, 0x18($sp) -/* 8DAB20 80240A20 0200202D */ daddu $a0, $s0, $zero -/* 8DAB24 80240A24 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 8DAB28 80240A28 0C012530 */ jal func_800494C0 -/* 8DAB2C 80240A2C 3C060020 */ lui $a2, 0x20 -/* 8DAB30 80240A30 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8DAB34 80240A34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8DAB38 80240A38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8DAB3C 80240A3C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8DAB40 80240A40 8C460028 */ lw $a2, 0x28($v0) -/* 8DAB44 80240A44 0C00A720 */ jal atan2 -/* 8DAB48 80240A48 8C470030 */ lw $a3, 0x30($v0) -/* 8DAB4C 80240A4C E600000C */ swc1 $f0, 0xc($s0) -/* 8DAB50 80240A50 8E220018 */ lw $v0, 0x18($s1) -/* 8DAB54 80240A54 9442002A */ lhu $v0, 0x2a($v0) -/* 8DAB58 80240A58 30420001 */ andi $v0, $v0, 1 -/* 8DAB5C 80240A5C 10400003 */ beqz $v0, .L80240A6C -/* 8DAB60 80240A60 2402000A */ addiu $v0, $zero, 0xa -/* 8DAB64 80240A64 080902D1 */ j .L80240B44 -/* 8DAB68 80240A68 AE620070 */ sw $v0, 0x70($s3) -.L80240A6C: -/* 8DAB6C 80240A6C 2402000C */ addiu $v0, $zero, 0xc -/* 8DAB70 80240A70 080902D1 */ j .L80240B44 -/* 8DAB74 80240A74 AE620070 */ sw $v0, 0x70($s3) -.L80240A78: -/* 8DAB78 80240A78 8E620074 */ lw $v0, 0x74($s3) -/* 8DAB7C 80240A7C 2442FFFF */ addiu $v0, $v0, -1 -.L80240A80: -/* 8DAB80 80240A80 AE620074 */ sw $v0, 0x74($s3) -.L80240A84: -/* 8DAB84 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8DAB88 80240A88 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DAB8C 80240A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8DAB90 80240A90 C4460000 */ lwc1 $f6, ($v0) -/* 8DAB94 80240A94 468031A0 */ cvt.s.w $f6, $f6 -/* 8DAB98 80240A98 44063000 */ mfc1 $a2, $f6 -/* 8DAB9C 80240A9C C4460008 */ lwc1 $f6, 8($v0) -/* 8DABA0 80240AA0 468031A0 */ cvt.s.w $f6, $f6 -/* 8DABA4 80240AA4 44073000 */ mfc1 $a3, $f6 -/* 8DABA8 80240AA8 0C00A7B5 */ jal dist2D -/* 8DABAC 80240AAC 00000000 */ nop -/* 8DABB0 80240AB0 C6020018 */ lwc1 $f2, 0x18($s0) -/* 8DABB4 80240AB4 4602003C */ c.lt.s $f0, $f2 -/* 8DABB8 80240AB8 00000000 */ nop -/* 8DABBC 80240ABC 4500000E */ bc1f .L80240AF8 -/* 8DABC0 80240AC0 00000000 */ nop -/* 8DABC4 80240AC4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DABC8 80240AC8 C4400000 */ lwc1 $f0, ($v0) -/* 8DABCC 80240ACC 46800020 */ cvt.s.w $f0, $f0 -/* 8DABD0 80240AD0 E6000038 */ swc1 $f0, 0x38($s0) -/* 8DABD4 80240AD4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DABD8 80240AD8 C4400008 */ lwc1 $f0, 8($v0) -/* 8DABDC 80240ADC 46800020 */ cvt.s.w $f0, $f0 -/* 8DABE0 80240AE0 E6000040 */ swc1 $f0, 0x40($s0) -/* 8DABE4 80240AE4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DABE8 80240AE8 C440000C */ lwc1 $f0, 0xc($v0) -/* 8DABEC 80240AEC 46800020 */ cvt.s.w $f0, $f0 -/* 8DABF0 80240AF0 E600000C */ swc1 $f0, 0xc($s0) -/* 8DABF4 80240AF4 AE600070 */ sw $zero, 0x70($s3) -.L80240AF8: -/* 8DABF8 80240AF8 8602008C */ lh $v0, 0x8c($s0) -/* 8DABFC 80240AFC 14400011 */ bnez $v0, .L80240B44 -/* 8DAC00 80240B00 00000000 */ nop -/* 8DAC04 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8DAC08 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8DAC0C 80240B0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8DAC10 80240B10 C4460000 */ lwc1 $f6, ($v0) -/* 8DAC14 80240B14 468031A0 */ cvt.s.w $f6, $f6 -/* 8DAC18 80240B18 44063000 */ mfc1 $a2, $f6 -/* 8DAC1C 80240B1C C4460008 */ lwc1 $f6, 8($v0) -/* 8DAC20 80240B20 468031A0 */ cvt.s.w $f6, $f6 -/* 8DAC24 80240B24 44073000 */ mfc1 $a3, $f6 -/* 8DAC28 80240B28 0C00A720 */ jal atan2 -/* 8DAC2C 80240B2C 00000000 */ nop -/* 8DAC30 80240B30 8E050018 */ lw $a1, 0x18($s0) -/* 8DAC34 80240B34 44060000 */ mfc1 $a2, $f0 -/* 8DAC38 80240B38 0200202D */ daddu $a0, $s0, $zero -/* 8DAC3C 80240B3C 0C00EA95 */ jal npc_move_heading -/* 8DAC40 80240B40 AC86000C */ sw $a2, 0xc($a0) -.L80240B44: -/* 8DAC44 80240B44 8FBF0044 */ lw $ra, 0x44($sp) -/* 8DAC48 80240B48 8FB40040 */ lw $s4, 0x40($sp) -/* 8DAC4C 80240B4C 8FB3003C */ lw $s3, 0x3c($sp) -/* 8DAC50 80240B50 8FB20038 */ lw $s2, 0x38($sp) -/* 8DAC54 80240B54 8FB10034 */ lw $s1, 0x34($sp) -/* 8DAC58 80240B58 8FB00030 */ lw $s0, 0x30($sp) -/* 8DAC5C 80240B5C 03E00008 */ jr $ra -/* 8DAC60 80240B60 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s new file mode 100644 index 0000000000..b11135d52b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_8024095C_8DAA5C.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024095C_8DAA5C +/* 8DAA5C 8024095C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8DAA60 80240960 AFB3003C */ sw $s3, 0x3c($sp) +/* 8DAA64 80240964 0080982D */ daddu $s3, $a0, $zero +/* 8DAA68 80240968 AFBF0044 */ sw $ra, 0x44($sp) +/* 8DAA6C 8024096C AFB40040 */ sw $s4, 0x40($sp) +/* 8DAA70 80240970 AFB20038 */ sw $s2, 0x38($sp) +/* 8DAA74 80240974 AFB10034 */ sw $s1, 0x34($sp) +/* 8DAA78 80240978 AFB00030 */ sw $s0, 0x30($sp) +/* 8DAA7C 8024097C 8E710148 */ lw $s1, 0x148($s3) +/* 8DAA80 80240980 00A0902D */ daddu $s2, $a1, $zero +/* 8DAA84 80240984 86240008 */ lh $a0, 8($s1) +/* 8DAA88 80240988 0C00EABB */ jal get_npc_unsafe +/* 8DAA8C 8024098C 00C0A02D */ daddu $s4, $a2, $zero +/* 8DAA90 80240990 8E430008 */ lw $v1, 8($s2) +/* 8DAA94 80240994 0460003B */ bltz $v1, .L80240A84 +/* 8DAA98 80240998 0040802D */ daddu $s0, $v0, $zero +/* 8DAA9C 8024099C 8E620074 */ lw $v0, 0x74($s3) +/* 8DAAA0 802409A0 1C400037 */ bgtz $v0, .L80240A80 +/* 8DAAA4 802409A4 2442FFFF */ addiu $v0, $v0, -1 +/* 8DAAA8 802409A8 0280202D */ daddu $a0, $s4, $zero +/* 8DAAAC 802409AC AE630074 */ sw $v1, 0x74($s3) +/* 8DAAB0 802409B0 AFA00010 */ sw $zero, 0x10($sp) +/* 8DAAB4 802409B4 8E460018 */ lw $a2, 0x18($s2) +/* 8DAAB8 802409B8 8E47001C */ lw $a3, 0x1c($s2) +/* 8DAABC 802409BC 0C01242D */ jal func_800490B4 +/* 8DAAC0 802409C0 0220282D */ daddu $a1, $s1, $zero +/* 8DAAC4 802409C4 1040002C */ beqz $v0, .L80240A78 +/* 8DAAC8 802409C8 0000202D */ daddu $a0, $zero, $zero +/* 8DAACC 802409CC 0200282D */ daddu $a1, $s0, $zero +/* 8DAAD0 802409D0 0000302D */ daddu $a2, $zero, $zero +/* 8DAAD4 802409D4 860300A8 */ lh $v1, 0xa8($s0) +/* 8DAAD8 802409D8 3C013F80 */ lui $at, 0x3f80 +/* 8DAADC 802409DC 44810000 */ mtc1 $at, $f0 +/* 8DAAE0 802409E0 3C014000 */ lui $at, 0x4000 +/* 8DAAE4 802409E4 44811000 */ mtc1 $at, $f2 +/* 8DAAE8 802409E8 3C01C1A0 */ lui $at, 0xc1a0 +/* 8DAAEC 802409EC 44812000 */ mtc1 $at, $f4 +/* 8DAAF0 802409F0 2402000F */ addiu $v0, $zero, 0xf +/* 8DAAF4 802409F4 AFA2001C */ sw $v0, 0x1c($sp) +/* 8DAAF8 802409F8 44833000 */ mtc1 $v1, $f6 +/* 8DAAFC 802409FC 00000000 */ nop +/* 8DAB00 80240A00 468031A0 */ cvt.s.w $f6, $f6 +/* 8DAB04 80240A04 44073000 */ mfc1 $a3, $f6 +/* 8DAB08 80240A08 27A20028 */ addiu $v0, $sp, 0x28 +/* 8DAB0C 80240A0C AFA20020 */ sw $v0, 0x20($sp) +/* 8DAB10 80240A10 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8DAB14 80240A14 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8DAB18 80240A18 0C01BFA4 */ jal fx_emote +/* 8DAB1C 80240A1C E7A40018 */ swc1 $f4, 0x18($sp) +/* 8DAB20 80240A20 0200202D */ daddu $a0, $s0, $zero +/* 8DAB24 80240A24 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 8DAB28 80240A28 0C012530 */ jal func_800494C0 +/* 8DAB2C 80240A2C 3C060020 */ lui $a2, 0x20 +/* 8DAB30 80240A30 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8DAB34 80240A34 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8DAB38 80240A38 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8DAB3C 80240A3C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8DAB40 80240A40 8C460028 */ lw $a2, 0x28($v0) +/* 8DAB44 80240A44 0C00A720 */ jal atan2 +/* 8DAB48 80240A48 8C470030 */ lw $a3, 0x30($v0) +/* 8DAB4C 80240A4C E600000C */ swc1 $f0, 0xc($s0) +/* 8DAB50 80240A50 8E220018 */ lw $v0, 0x18($s1) +/* 8DAB54 80240A54 9442002A */ lhu $v0, 0x2a($v0) +/* 8DAB58 80240A58 30420001 */ andi $v0, $v0, 1 +/* 8DAB5C 80240A5C 10400003 */ beqz $v0, .L80240A6C +/* 8DAB60 80240A60 2402000A */ addiu $v0, $zero, 0xa +/* 8DAB64 80240A64 080902D1 */ j .L80240B44 +/* 8DAB68 80240A68 AE620070 */ sw $v0, 0x70($s3) +.L80240A6C: +/* 8DAB6C 80240A6C 2402000C */ addiu $v0, $zero, 0xc +/* 8DAB70 80240A70 080902D1 */ j .L80240B44 +/* 8DAB74 80240A74 AE620070 */ sw $v0, 0x70($s3) +.L80240A78: +/* 8DAB78 80240A78 8E620074 */ lw $v0, 0x74($s3) +/* 8DAB7C 80240A7C 2442FFFF */ addiu $v0, $v0, -1 +.L80240A80: +/* 8DAB80 80240A80 AE620074 */ sw $v0, 0x74($s3) +.L80240A84: +/* 8DAB84 80240A84 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8DAB88 80240A88 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8DAB8C 80240A8C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8DAB90 80240A90 C4460000 */ lwc1 $f6, ($v0) +/* 8DAB94 80240A94 468031A0 */ cvt.s.w $f6, $f6 +/* 8DAB98 80240A98 44063000 */ mfc1 $a2, $f6 +/* 8DAB9C 80240A9C C4460008 */ lwc1 $f6, 8($v0) +/* 8DABA0 80240AA0 468031A0 */ cvt.s.w $f6, $f6 +/* 8DABA4 80240AA4 44073000 */ mfc1 $a3, $f6 +/* 8DABA8 80240AA8 0C00A7B5 */ jal dist2D +/* 8DABAC 80240AAC 00000000 */ nop +/* 8DABB0 80240AB0 C6020018 */ lwc1 $f2, 0x18($s0) +/* 8DABB4 80240AB4 4602003C */ c.lt.s $f0, $f2 +/* 8DABB8 80240AB8 00000000 */ nop +/* 8DABBC 80240ABC 4500000E */ bc1f .L80240AF8 +/* 8DABC0 80240AC0 00000000 */ nop +/* 8DABC4 80240AC4 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8DABC8 80240AC8 C4400000 */ lwc1 $f0, ($v0) +/* 8DABCC 80240ACC 46800020 */ cvt.s.w $f0, $f0 +/* 8DABD0 80240AD0 E6000038 */ swc1 $f0, 0x38($s0) +/* 8DABD4 80240AD4 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8DABD8 80240AD8 C4400008 */ lwc1 $f0, 8($v0) +/* 8DABDC 80240ADC 46800020 */ cvt.s.w $f0, $f0 +/* 8DABE0 80240AE0 E6000040 */ swc1 $f0, 0x40($s0) +/* 8DABE4 80240AE4 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8DABE8 80240AE8 C440000C */ lwc1 $f0, 0xc($v0) +/* 8DABEC 80240AEC 46800020 */ cvt.s.w $f0, $f0 +/* 8DABF0 80240AF0 E600000C */ swc1 $f0, 0xc($s0) +/* 8DABF4 80240AF4 AE600070 */ sw $zero, 0x70($s3) +.L80240AF8: +/* 8DABF8 80240AF8 8602008C */ lh $v0, 0x8c($s0) +/* 8DABFC 80240AFC 14400011 */ bnez $v0, .L80240B44 +/* 8DAC00 80240B00 00000000 */ nop +/* 8DAC04 80240B04 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8DAC08 80240B08 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8DAC0C 80240B0C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8DAC10 80240B10 C4460000 */ lwc1 $f6, ($v0) +/* 8DAC14 80240B14 468031A0 */ cvt.s.w $f6, $f6 +/* 8DAC18 80240B18 44063000 */ mfc1 $a2, $f6 +/* 8DAC1C 80240B1C C4460008 */ lwc1 $f6, 8($v0) +/* 8DAC20 80240B20 468031A0 */ cvt.s.w $f6, $f6 +/* 8DAC24 80240B24 44073000 */ mfc1 $a3, $f6 +/* 8DAC28 80240B28 0C00A720 */ jal atan2 +/* 8DAC2C 80240B2C 00000000 */ nop +/* 8DAC30 80240B30 8E050018 */ lw $a1, 0x18($s0) +/* 8DAC34 80240B34 44060000 */ mfc1 $a2, $f0 +/* 8DAC38 80240B38 0200202D */ daddu $a0, $s0, $zero +/* 8DAC3C 80240B3C 0C00EA95 */ jal npc_move_heading +/* 8DAC40 80240B40 AC86000C */ sw $a2, 0xc($a0) +.L80240B44: +/* 8DAC44 80240B44 8FBF0044 */ lw $ra, 0x44($sp) +/* 8DAC48 80240B48 8FB40040 */ lw $s4, 0x40($sp) +/* 8DAC4C 80240B4C 8FB3003C */ lw $s3, 0x3c($sp) +/* 8DAC50 80240B50 8FB20038 */ lw $s2, 0x38($sp) +/* 8DAC54 80240B54 8FB10034 */ lw $s1, 0x34($sp) +/* 8DAC58 80240B58 8FB00030 */ lw $s0, 0x30($sp) +/* 8DAC5C 80240B5C 03E00008 */ jr $ra +/* 8DAC60 80240B60 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64.s deleted file mode 100644 index 6ad111bc73..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B64 -/* 8DAC64 80240B64 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8DAC68 80240B68 AFB40040 */ sw $s4, 0x40($sp) -/* 8DAC6C 80240B6C 0080A02D */ daddu $s4, $a0, $zero -/* 8DAC70 80240B70 AFBF0048 */ sw $ra, 0x48($sp) -/* 8DAC74 80240B74 AFB50044 */ sw $s5, 0x44($sp) -/* 8DAC78 80240B78 AFB3003C */ sw $s3, 0x3c($sp) -/* 8DAC7C 80240B7C AFB20038 */ sw $s2, 0x38($sp) -/* 8DAC80 80240B80 AFB10034 */ sw $s1, 0x34($sp) -/* 8DAC84 80240B84 AFB00030 */ sw $s0, 0x30($sp) -/* 8DAC88 80240B88 8E920148 */ lw $s2, 0x148($s4) -/* 8DAC8C 80240B8C 86440008 */ lh $a0, 8($s2) -/* 8DAC90 80240B90 8E90000C */ lw $s0, 0xc($s4) -/* 8DAC94 80240B94 0C00EABB */ jal get_npc_unsafe -/* 8DAC98 80240B98 00A0882D */ daddu $s1, $a1, $zero -/* 8DAC9C 80240B9C 0280202D */ daddu $a0, $s4, $zero -/* 8DACA0 80240BA0 8E050000 */ lw $a1, ($s0) -/* 8DACA4 80240BA4 0C0B1EAF */ jal get_variable -/* 8DACA8 80240BA8 0040802D */ daddu $s0, $v0, $zero -/* 8DACAC 80240BAC AFA00010 */ sw $zero, 0x10($sp) -/* 8DACB0 80240BB0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACB4 80240BB4 8C630030 */ lw $v1, 0x30($v1) -/* 8DACB8 80240BB8 AFA30014 */ sw $v1, 0x14($sp) -/* 8DACBC 80240BBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACC0 80240BC0 8C63001C */ lw $v1, 0x1c($v1) -/* 8DACC4 80240BC4 AFA30018 */ sw $v1, 0x18($sp) -/* 8DACC8 80240BC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACCC 80240BCC 8C630024 */ lw $v1, 0x24($v1) -/* 8DACD0 80240BD0 AFA3001C */ sw $v1, 0x1c($sp) -/* 8DACD4 80240BD4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACD8 80240BD8 8C630028 */ lw $v1, 0x28($v1) -/* 8DACDC 80240BDC 27B50010 */ addiu $s5, $sp, 0x10 -/* 8DACE0 80240BE0 AFA30020 */ sw $v1, 0x20($sp) -/* 8DACE4 80240BE4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 8DACE8 80240BE8 3C014282 */ lui $at, 0x4282 -/* 8DACEC 80240BEC 44810000 */ mtc1 $at, $f0 -/* 8DACF0 80240BF0 8C63002C */ lw $v1, 0x2c($v1) -/* 8DACF4 80240BF4 0040982D */ daddu $s3, $v0, $zero -/* 8DACF8 80240BF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 8DACFC 80240BFC A7A0002C */ sh $zero, 0x2c($sp) -/* 8DAD00 80240C00 16200005 */ bnez $s1, .L80240C18 -/* 8DAD04 80240C04 AFA30024 */ sw $v1, 0x24($sp) -/* 8DAD08 80240C08 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8DAD0C 80240C0C 30420004 */ andi $v0, $v0, 4 -/* 8DAD10 80240C10 1040002F */ beqz $v0, .L80240CD0 -/* 8DAD14 80240C14 00000000 */ nop -.L80240C18: -/* 8DAD18 80240C18 AE800070 */ sw $zero, 0x70($s4) -/* 8DAD1C 80240C1C C600000C */ lwc1 $f0, 0xc($s0) -/* 8DAD20 80240C20 A600008E */ sh $zero, 0x8e($s0) -/* 8DAD24 80240C24 8E4200CC */ lw $v0, 0xcc($s2) -/* 8DAD28 80240C28 4600008D */ trunc.w.s $f2, $f0 -/* 8DAD2C 80240C2C E642006C */ swc1 $f2, 0x6c($s2) -/* 8DAD30 80240C30 8C420000 */ lw $v0, ($v0) -/* 8DAD34 80240C34 8E030000 */ lw $v1, ($s0) -/* 8DAD38 80240C38 AE020028 */ sw $v0, 0x28($s0) -/* 8DAD3C 80240C3C 2402F7FF */ addiu $v0, $zero, -0x801 -/* 8DAD40 80240C40 00621824 */ and $v1, $v1, $v0 -/* 8DAD44 80240C44 AE030000 */ sw $v1, ($s0) -/* 8DAD48 80240C48 8E4200D0 */ lw $v0, 0xd0($s2) -/* 8DAD4C 80240C4C 8C420034 */ lw $v0, 0x34($v0) -/* 8DAD50 80240C50 54400005 */ bnel $v0, $zero, .L80240C68 -/* 8DAD54 80240C54 2402FDFF */ addiu $v0, $zero, -0x201 -/* 8DAD58 80240C58 34620200 */ ori $v0, $v1, 0x200 -/* 8DAD5C 80240C5C 2403FFF7 */ addiu $v1, $zero, -9 -/* 8DAD60 80240C60 0809031C */ j .L80240C70 -/* 8DAD64 80240C64 00431024 */ and $v0, $v0, $v1 -.L80240C68: -/* 8DAD68 80240C68 00621024 */ and $v0, $v1, $v0 -/* 8DAD6C 80240C6C 34420008 */ ori $v0, $v0, 8 -.L80240C70: -/* 8DAD70 80240C70 AE020000 */ sw $v0, ($s0) -/* 8DAD74 80240C74 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8DAD78 80240C78 30420004 */ andi $v0, $v0, 4 -/* 8DAD7C 80240C7C 10400009 */ beqz $v0, .L80240CA4 -/* 8DAD80 80240C80 24020063 */ addiu $v0, $zero, 0x63 -/* 8DAD84 80240C84 AE820070 */ sw $v0, 0x70($s4) -/* 8DAD88 80240C88 2402000F */ addiu $v0, $zero, 0xf -/* 8DAD8C 80240C8C AE820074 */ sw $v0, 0x74($s4) -/* 8DAD90 80240C90 8E4200B0 */ lw $v0, 0xb0($s2) -/* 8DAD94 80240C94 2403FFFB */ addiu $v1, $zero, -5 -/* 8DAD98 80240C98 00431024 */ and $v0, $v0, $v1 -/* 8DAD9C 80240C9C 08090334 */ j .L80240CD0 -/* 8DADA0 80240CA0 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240CA4: -/* 8DADA4 80240CA4 8E420000 */ lw $v0, ($s2) -/* 8DADA8 80240CA8 3C034000 */ lui $v1, 0x4000 -/* 8DADAC 80240CAC 00431024 */ and $v0, $v0, $v1 -/* 8DADB0 80240CB0 10400007 */ beqz $v0, .L80240CD0 -/* 8DADB4 80240CB4 3C03BFFF */ lui $v1, 0xbfff -/* 8DADB8 80240CB8 2402000C */ addiu $v0, $zero, 0xc -/* 8DADBC 80240CBC AE820070 */ sw $v0, 0x70($s4) -/* 8DADC0 80240CC0 8E420000 */ lw $v0, ($s2) -/* 8DADC4 80240CC4 3463FFFF */ ori $v1, $v1, 0xffff -/* 8DADC8 80240CC8 00431024 */ and $v0, $v0, $v1 -/* 8DADCC 80240CCC AE420000 */ sw $v0, ($s2) -.L80240CD0: -/* 8DADD0 80240CD0 8E830070 */ lw $v1, 0x70($s4) -/* 8DADD4 80240CD4 2C620064 */ sltiu $v0, $v1, 0x64 -/* 8DADD8 80240CD8 10400036 */ beqz $v0, .L80240DB4 -/* 8DADDC 80240CDC 00031080 */ sll $v0, $v1, 2 -/* 8DADE0 80240CE0 3C018025 */ lui $at, 0x8025 -/* 8DADE4 80240CE4 00220821 */ addu $at, $at, $v0 -/* 8DADE8 80240CE8 8C2210C8 */ lw $v0, 0x10c8($at) -/* 8DADEC 80240CEC 00400008 */ jr $v0 -/* 8DADF0 80240CF0 00000000 */ nop -/* 8DADF4 80240CF4 0280202D */ daddu $a0, $s4, $zero -/* 8DADF8 80240CF8 0260282D */ daddu $a1, $s3, $zero -/* 8DADFC 80240CFC 0C0900DC */ jal func_80240370 -/* 8DAE00 80240D00 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE04 80240D04 0280202D */ daddu $a0, $s4, $zero -/* 8DAE08 80240D08 0260282D */ daddu $a1, $s3, $zero -/* 8DAE0C 80240D0C 0C090109 */ jal func_80240424 -/* 8DAE10 80240D10 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE14 80240D14 0809036D */ j .L80240DB4 -/* 8DAE18 80240D18 00000000 */ nop -/* 8DAE1C 80240D1C 0280202D */ daddu $a0, $s4, $zero -/* 8DAE20 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 8DAE24 80240D24 0C090151 */ jal func_80240544 -/* 8DAE28 80240D28 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE2C 80240D2C 0280202D */ daddu $a0, $s4, $zero -/* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 8DAE34 80240D34 0C090169 */ jal func_802405A4 -/* 8DAE38 80240D38 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE3C 80240D3C 0809036D */ j .L80240DB4 -/* 8DAE40 80240D40 00000000 */ nop -/* 8DAE44 80240D44 0280202D */ daddu $a0, $s4, $zero -/* 8DAE48 80240D48 0260282D */ daddu $a1, $s3, $zero -/* 8DAE4C 80240D4C 0C090187 */ jal func_8024061C -/* 8DAE50 80240D50 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE54 80240D54 0280202D */ daddu $a0, $s4, $zero -/* 8DAE58 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 8DAE5C 80240D5C 0C0901D3 */ jal func_8024074C -/* 8DAE60 80240D60 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE64 80240D64 0809036D */ j .L80240DB4 -/* 8DAE68 80240D68 00000000 */ nop -/* 8DAE6C 80240D6C 0280202D */ daddu $a0, $s4, $zero -/* 8DAE70 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 8DAE74 80240D74 0C09021A */ jal func_80240868 -/* 8DAE78 80240D78 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE7C 80240D7C 0809036D */ j .L80240DB4 -/* 8DAE80 80240D80 00000000 */ nop -/* 8DAE84 80240D84 0280202D */ daddu $a0, $s4, $zero -/* 8DAE88 80240D88 0260282D */ daddu $a1, $s3, $zero -/* 8DAE8C 80240D8C 0C09022C */ jal func_802408B0 -/* 8DAE90 80240D90 02A0302D */ daddu $a2, $s5, $zero -/* 8DAE94 80240D94 0280202D */ daddu $a0, $s4, $zero -/* 8DAE98 80240D98 0260282D */ daddu $a1, $s3, $zero -/* 8DAE9C 80240D9C 0C090257 */ jal func_8024095C -/* 8DAEA0 80240DA0 02A0302D */ daddu $a2, $s5, $zero -/* 8DAEA4 80240DA4 0809036D */ j .L80240DB4 -/* 8DAEA8 80240DA8 00000000 */ nop -/* 8DAEAC 80240DAC 0C0129CF */ jal func_8004A73C -/* 8DAEB0 80240DB0 0280202D */ daddu $a0, $s4, $zero -.L80240DB4: -/* 8DAEB4 80240DB4 8FBF0048 */ lw $ra, 0x48($sp) -/* 8DAEB8 80240DB8 8FB50044 */ lw $s5, 0x44($sp) -/* 8DAEBC 80240DBC 8FB40040 */ lw $s4, 0x40($sp) -/* 8DAEC0 80240DC0 8FB3003C */ lw $s3, 0x3c($sp) -/* 8DAEC4 80240DC4 8FB20038 */ lw $s2, 0x38($sp) -/* 8DAEC8 80240DC8 8FB10034 */ lw $s1, 0x34($sp) -/* 8DAECC 80240DCC 8FB00030 */ lw $s0, 0x30($sp) -/* 8DAED0 80240DD0 0000102D */ daddu $v0, $zero, $zero -/* 8DAED4 80240DD4 03E00008 */ jr $ra -/* 8DAED8 80240DD8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s new file mode 100644 index 0000000000..f8195752b0 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DA3A0/func_80240B64_8DAC64.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B64_8DAC64 +/* 8DAC64 80240B64 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 8DAC68 80240B68 AFB40040 */ sw $s4, 0x40($sp) +/* 8DAC6C 80240B6C 0080A02D */ daddu $s4, $a0, $zero +/* 8DAC70 80240B70 AFBF0048 */ sw $ra, 0x48($sp) +/* 8DAC74 80240B74 AFB50044 */ sw $s5, 0x44($sp) +/* 8DAC78 80240B78 AFB3003C */ sw $s3, 0x3c($sp) +/* 8DAC7C 80240B7C AFB20038 */ sw $s2, 0x38($sp) +/* 8DAC80 80240B80 AFB10034 */ sw $s1, 0x34($sp) +/* 8DAC84 80240B84 AFB00030 */ sw $s0, 0x30($sp) +/* 8DAC88 80240B88 8E920148 */ lw $s2, 0x148($s4) +/* 8DAC8C 80240B8C 86440008 */ lh $a0, 8($s2) +/* 8DAC90 80240B90 8E90000C */ lw $s0, 0xc($s4) +/* 8DAC94 80240B94 0C00EABB */ jal get_npc_unsafe +/* 8DAC98 80240B98 00A0882D */ daddu $s1, $a1, $zero +/* 8DAC9C 80240B9C 0280202D */ daddu $a0, $s4, $zero +/* 8DACA0 80240BA0 8E050000 */ lw $a1, ($s0) +/* 8DACA4 80240BA4 0C0B1EAF */ jal get_variable +/* 8DACA8 80240BA8 0040802D */ daddu $s0, $v0, $zero +/* 8DACAC 80240BAC AFA00010 */ sw $zero, 0x10($sp) +/* 8DACB0 80240BB0 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8DACB4 80240BB4 8C630030 */ lw $v1, 0x30($v1) +/* 8DACB8 80240BB8 AFA30014 */ sw $v1, 0x14($sp) +/* 8DACBC 80240BBC 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8DACC0 80240BC0 8C63001C */ lw $v1, 0x1c($v1) +/* 8DACC4 80240BC4 AFA30018 */ sw $v1, 0x18($sp) +/* 8DACC8 80240BC8 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8DACCC 80240BCC 8C630024 */ lw $v1, 0x24($v1) +/* 8DACD0 80240BD0 AFA3001C */ sw $v1, 0x1c($sp) +/* 8DACD4 80240BD4 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8DACD8 80240BD8 8C630028 */ lw $v1, 0x28($v1) +/* 8DACDC 80240BDC 27B50010 */ addiu $s5, $sp, 0x10 +/* 8DACE0 80240BE0 AFA30020 */ sw $v1, 0x20($sp) +/* 8DACE4 80240BE4 8E4300D0 */ lw $v1, 0xd0($s2) +/* 8DACE8 80240BE8 3C014282 */ lui $at, 0x4282 +/* 8DACEC 80240BEC 44810000 */ mtc1 $at, $f0 +/* 8DACF0 80240BF0 8C63002C */ lw $v1, 0x2c($v1) +/* 8DACF4 80240BF4 0040982D */ daddu $s3, $v0, $zero +/* 8DACF8 80240BF8 E7A00028 */ swc1 $f0, 0x28($sp) +/* 8DACFC 80240BFC A7A0002C */ sh $zero, 0x2c($sp) +/* 8DAD00 80240C00 16200005 */ bnez $s1, .L80240C18 +/* 8DAD04 80240C04 AFA30024 */ sw $v1, 0x24($sp) +/* 8DAD08 80240C08 8E4200B0 */ lw $v0, 0xb0($s2) +/* 8DAD0C 80240C0C 30420004 */ andi $v0, $v0, 4 +/* 8DAD10 80240C10 1040002F */ beqz $v0, .L80240CD0 +/* 8DAD14 80240C14 00000000 */ nop +.L80240C18: +/* 8DAD18 80240C18 AE800070 */ sw $zero, 0x70($s4) +/* 8DAD1C 80240C1C C600000C */ lwc1 $f0, 0xc($s0) +/* 8DAD20 80240C20 A600008E */ sh $zero, 0x8e($s0) +/* 8DAD24 80240C24 8E4200CC */ lw $v0, 0xcc($s2) +/* 8DAD28 80240C28 4600008D */ trunc.w.s $f2, $f0 +/* 8DAD2C 80240C2C E642006C */ swc1 $f2, 0x6c($s2) +/* 8DAD30 80240C30 8C420000 */ lw $v0, ($v0) +/* 8DAD34 80240C34 8E030000 */ lw $v1, ($s0) +/* 8DAD38 80240C38 AE020028 */ sw $v0, 0x28($s0) +/* 8DAD3C 80240C3C 2402F7FF */ addiu $v0, $zero, -0x801 +/* 8DAD40 80240C40 00621824 */ and $v1, $v1, $v0 +/* 8DAD44 80240C44 AE030000 */ sw $v1, ($s0) +/* 8DAD48 80240C48 8E4200D0 */ lw $v0, 0xd0($s2) +/* 8DAD4C 80240C4C 8C420034 */ lw $v0, 0x34($v0) +/* 8DAD50 80240C50 54400005 */ bnel $v0, $zero, .L80240C68 +/* 8DAD54 80240C54 2402FDFF */ addiu $v0, $zero, -0x201 +/* 8DAD58 80240C58 34620200 */ ori $v0, $v1, 0x200 +/* 8DAD5C 80240C5C 2403FFF7 */ addiu $v1, $zero, -9 +/* 8DAD60 80240C60 0809031C */ j .L80240C70 +/* 8DAD64 80240C64 00431024 */ and $v0, $v0, $v1 +.L80240C68: +/* 8DAD68 80240C68 00621024 */ and $v0, $v1, $v0 +/* 8DAD6C 80240C6C 34420008 */ ori $v0, $v0, 8 +.L80240C70: +/* 8DAD70 80240C70 AE020000 */ sw $v0, ($s0) +/* 8DAD74 80240C74 8E4200B0 */ lw $v0, 0xb0($s2) +/* 8DAD78 80240C78 30420004 */ andi $v0, $v0, 4 +/* 8DAD7C 80240C7C 10400009 */ beqz $v0, .L80240CA4 +/* 8DAD80 80240C80 24020063 */ addiu $v0, $zero, 0x63 +/* 8DAD84 80240C84 AE820070 */ sw $v0, 0x70($s4) +/* 8DAD88 80240C88 2402000F */ addiu $v0, $zero, 0xf +/* 8DAD8C 80240C8C AE820074 */ sw $v0, 0x74($s4) +/* 8DAD90 80240C90 8E4200B0 */ lw $v0, 0xb0($s2) +/* 8DAD94 80240C94 2403FFFB */ addiu $v1, $zero, -5 +/* 8DAD98 80240C98 00431024 */ and $v0, $v0, $v1 +/* 8DAD9C 80240C9C 08090334 */ j .L80240CD0 +/* 8DADA0 80240CA0 AE4200B0 */ sw $v0, 0xb0($s2) +.L80240CA4: +/* 8DADA4 80240CA4 8E420000 */ lw $v0, ($s2) +/* 8DADA8 80240CA8 3C034000 */ lui $v1, 0x4000 +/* 8DADAC 80240CAC 00431024 */ and $v0, $v0, $v1 +/* 8DADB0 80240CB0 10400007 */ beqz $v0, .L80240CD0 +/* 8DADB4 80240CB4 3C03BFFF */ lui $v1, 0xbfff +/* 8DADB8 80240CB8 2402000C */ addiu $v0, $zero, 0xc +/* 8DADBC 80240CBC AE820070 */ sw $v0, 0x70($s4) +/* 8DADC0 80240CC0 8E420000 */ lw $v0, ($s2) +/* 8DADC4 80240CC4 3463FFFF */ ori $v1, $v1, 0xffff +/* 8DADC8 80240CC8 00431024 */ and $v0, $v0, $v1 +/* 8DADCC 80240CCC AE420000 */ sw $v0, ($s2) +.L80240CD0: +/* 8DADD0 80240CD0 8E830070 */ lw $v1, 0x70($s4) +/* 8DADD4 80240CD4 2C620064 */ sltiu $v0, $v1, 0x64 +/* 8DADD8 80240CD8 10400036 */ beqz $v0, .L80240DB4 +/* 8DADDC 80240CDC 00031080 */ sll $v0, $v1, 2 +/* 8DADE0 80240CE0 3C018025 */ lui $at, 0x8025 +/* 8DADE4 80240CE4 00220821 */ addu $at, $at, $v0 +/* 8DADE8 80240CE8 8C2210C8 */ lw $v0, 0x10c8($at) +/* 8DADEC 80240CEC 00400008 */ jr $v0 +/* 8DADF0 80240CF0 00000000 */ nop +/* 8DADF4 80240CF4 0280202D */ daddu $a0, $s4, $zero +/* 8DADF8 80240CF8 0260282D */ daddu $a1, $s3, $zero +/* 8DADFC 80240CFC 0C0900DC */ jal func_80240370_8DA470 +/* 8DAE00 80240D00 02A0302D */ daddu $a2, $s5, $zero +/* 8DAE04 80240D04 0280202D */ daddu $a0, $s4, $zero +/* 8DAE08 80240D08 0260282D */ daddu $a1, $s3, $zero +/* 8DAE0C 80240D0C 0C090109 */ jal func_80240424_8DA524 +/* 8DAE10 80240D10 02A0302D */ daddu $a2, $s5, $zero +/* 8DAE14 80240D14 0809036D */ j .L80240DB4 +/* 8DAE18 80240D18 00000000 */ nop +/* 8DAE1C 80240D1C 0280202D */ daddu $a0, $s4, $zero +/* 8DAE20 80240D20 0260282D */ daddu $a1, $s3, $zero +/* 8DAE24 80240D24 0C090151 */ jal func_80240544_8DA644 +/* 8DAE28 80240D28 02A0302D */ daddu $a2, $s5, $zero +/* 8DAE2C 80240D2C 0280202D */ daddu $a0, $s4, $zero +/* 8DAE30 80240D30 0260282D */ daddu $a1, $s3, $zero +/* 8DAE34 80240D34 0C090169 */ jal func_802405A4_8DA6A4 +/* 8DAE38 80240D38 02A0302D */ daddu $a2, $s5, $zero +/* 8DAE3C 80240D3C 0809036D */ j .L80240DB4 +/* 8DAE40 80240D40 00000000 */ nop +/* 8DAE44 80240D44 0280202D */ daddu $a0, $s4, $zero +/* 8DAE48 80240D48 0260282D */ daddu $a1, $s3, $zero +/* 8DAE4C 80240D4C 0C090187 */ jal func_8024061C_8DA71C +/* 8DAE50 80240D50 02A0302D */ daddu $a2, $s5, $zero +/* 8DAE54 80240D54 0280202D */ daddu $a0, $s4, $zero +/* 8DAE58 80240D58 0260282D */ daddu $a1, $s3, $zero +/* 8DAE5C 80240D5C 0C0901D3 */ jal func_8024074C_8DA84C +/* 8DAE60 80240D60 02A0302D */ daddu $a2, $s5, $zero +/* 8DAE64 80240D64 0809036D */ j .L80240DB4 +/* 8DAE68 80240D68 00000000 */ nop +/* 8DAE6C 80240D6C 0280202D */ daddu $a0, $s4, $zero +/* 8DAE70 80240D70 0260282D */ daddu $a1, $s3, $zero +/* 8DAE74 80240D74 0C09021A */ jal func_80240868_8DA968 +/* 8DAE78 80240D78 02A0302D */ daddu $a2, $s5, $zero +/* 8DAE7C 80240D7C 0809036D */ j .L80240DB4 +/* 8DAE80 80240D80 00000000 */ nop +/* 8DAE84 80240D84 0280202D */ daddu $a0, $s4, $zero +/* 8DAE88 80240D88 0260282D */ daddu $a1, $s3, $zero +/* 8DAE8C 80240D8C 0C09022C */ jal func_802408B0_8DA9B0 +/* 8DAE90 80240D90 02A0302D */ daddu $a2, $s5, $zero +/* 8DAE94 80240D94 0280202D */ daddu $a0, $s4, $zero +/* 8DAE98 80240D98 0260282D */ daddu $a1, $s3, $zero +/* 8DAE9C 80240D9C 0C090257 */ jal func_8024095C_8DAA5C +/* 8DAEA0 80240DA0 02A0302D */ daddu $a2, $s5, $zero +/* 8DAEA4 80240DA4 0809036D */ j .L80240DB4 +/* 8DAEA8 80240DA8 00000000 */ nop +/* 8DAEAC 80240DAC 0C0129CF */ jal func_8004A73C +/* 8DAEB0 80240DB0 0280202D */ daddu $a0, $s4, $zero +.L80240DB4: +/* 8DAEB4 80240DB4 8FBF0048 */ lw $ra, 0x48($sp) +/* 8DAEB8 80240DB8 8FB50044 */ lw $s5, 0x44($sp) +/* 8DAEBC 80240DBC 8FB40040 */ lw $s4, 0x40($sp) +/* 8DAEC0 80240DC0 8FB3003C */ lw $s3, 0x3c($sp) +/* 8DAEC4 80240DC4 8FB20038 */ lw $s2, 0x38($sp) +/* 8DAEC8 80240DC8 8FB10034 */ lw $s1, 0x34($sp) +/* 8DAECC 80240DCC 8FB00030 */ lw $s0, 0x30($sp) +/* 8DAED0 80240DD0 0000102D */ daddu $v0, $zero, $zero +/* 8DAED4 80240DD4 03E00008 */ jr $ra +/* 8DAED8 80240DD8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0.s deleted file mode 100644 index a5ce792081..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EC0 -/* 8DAFC0 80240EC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8DAFC4 80240EC4 AFB00010 */ sw $s0, 0x10($sp) -/* 8DAFC8 80240EC8 0080802D */ daddu $s0, $a0, $zero -/* 8DAFCC 80240ECC AFBF0014 */ sw $ra, 0x14($sp) -/* 8DAFD0 80240ED0 0C04417A */ jal get_entity_by_index -/* 8DAFD4 80240ED4 8E0400AC */ lw $a0, 0xac($s0) -/* 8DAFD8 80240ED8 0040182D */ daddu $v1, $v0, $zero -/* 8DAFDC 80240EDC C6000084 */ lwc1 $f0, 0x84($s0) -/* 8DAFE0 80240EE0 46800020 */ cvt.s.w $f0, $f0 -/* 8DAFE4 80240EE4 E4600048 */ swc1 $f0, 0x48($v1) -/* 8DAFE8 80240EE8 C6000088 */ lwc1 $f0, 0x88($s0) -/* 8DAFEC 80240EEC 46800020 */ cvt.s.w $f0, $f0 -/* 8DAFF0 80240EF0 E460004C */ swc1 $f0, 0x4c($v1) -/* 8DAFF4 80240EF4 C600008C */ lwc1 $f0, 0x8c($s0) -/* 8DAFF8 80240EF8 46800020 */ cvt.s.w $f0, $f0 -/* 8DAFFC 80240EFC E4600050 */ swc1 $f0, 0x50($v1) -/* 8DB000 80240F00 8FBF0014 */ lw $ra, 0x14($sp) -/* 8DB004 80240F04 8FB00010 */ lw $s0, 0x10($sp) -/* 8DB008 80240F08 24020002 */ addiu $v0, $zero, 2 -/* 8DB00C 80240F0C 03E00008 */ jr $ra -/* 8DB010 80240F10 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8DB014 80240F14 00000000 */ nop -/* 8DB018 80240F18 00000000 */ nop -/* 8DB01C 80240F1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s new file mode 100644 index 0000000000..500303fb66 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DAFC0/func_80240EC0_8DAFC0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EC0_8DAFC0 +/* 8DAFC0 80240EC0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8DAFC4 80240EC4 AFB00010 */ sw $s0, 0x10($sp) +/* 8DAFC8 80240EC8 0080802D */ daddu $s0, $a0, $zero +/* 8DAFCC 80240ECC AFBF0014 */ sw $ra, 0x14($sp) +/* 8DAFD0 80240ED0 0C04417A */ jal get_entity_by_index +/* 8DAFD4 80240ED4 8E0400AC */ lw $a0, 0xac($s0) +/* 8DAFD8 80240ED8 0040182D */ daddu $v1, $v0, $zero +/* 8DAFDC 80240EDC C6000084 */ lwc1 $f0, 0x84($s0) +/* 8DAFE0 80240EE0 46800020 */ cvt.s.w $f0, $f0 +/* 8DAFE4 80240EE4 E4600048 */ swc1 $f0, 0x48($v1) +/* 8DAFE8 80240EE8 C6000088 */ lwc1 $f0, 0x88($s0) +/* 8DAFEC 80240EEC 46800020 */ cvt.s.w $f0, $f0 +/* 8DAFF0 80240EF0 E460004C */ swc1 $f0, 0x4c($v1) +/* 8DAFF4 80240EF4 C600008C */ lwc1 $f0, 0x8c($s0) +/* 8DAFF8 80240EF8 46800020 */ cvt.s.w $f0, $f0 +/* 8DAFFC 80240EFC E4600050 */ swc1 $f0, 0x50($v1) +/* 8DB000 80240F00 8FBF0014 */ lw $ra, 0x14($sp) +/* 8DB004 80240F04 8FB00010 */ lw $s0, 0x10($sp) +/* 8DB008 80240F08 24020002 */ addiu $v0, $zero, 2 +/* 8DB00C 80240F0C 03E00008 */ jr $ra +/* 8DB010 80240F10 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8DB014 80240F14 00000000 */ nop +/* 8DB018 80240F18 00000000 */ nop +/* 8DB01C 80240F1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DB020/func_80240F90.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DB020/func_80240F90.s deleted file mode 100644 index acf4f03471..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_11/8DB020/func_80240F90.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F90 -/* 8DB090 80240F90 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8DB094 80240F94 AFB10054 */ sw $s1, 0x54($sp) -/* 8DB098 80240F98 0080882D */ daddu $s1, $a0, $zero -/* 8DB09C 80240F9C AFBF005C */ sw $ra, 0x5c($sp) -/* 8DB0A0 80240FA0 AFB20058 */ sw $s2, 0x58($sp) -/* 8DB0A4 80240FA4 AFB00050 */ sw $s0, 0x50($sp) -/* 8DB0A8 80240FA8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8DB0AC 80240FAC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8DB0B0 80240FB0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8DB0B4 80240FB4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8DB0B8 80240FB8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8DB0BC 80240FBC 8E30000C */ lw $s0, 0xc($s1) -/* 8DB0C0 80240FC0 8E050000 */ lw $a1, ($s0) -/* 8DB0C4 80240FC4 0C0B1EAF */ jal get_variable -/* 8DB0C8 80240FC8 26100004 */ addiu $s0, $s0, 4 -/* 8DB0CC 80240FCC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8DB0D0 80240FD0 0040202D */ daddu $a0, $v0, $zero -/* 8DB0D4 80240FD4 8E050000 */ lw $a1, ($s0) -/* 8DB0D8 80240FD8 26100004 */ addiu $s0, $s0, 4 -/* 8DB0DC 80240FDC 0220202D */ daddu $a0, $s1, $zero -/* 8DB0E0 80240FE0 0C0B210B */ jal get_float_variable -/* 8DB0E4 80240FE4 0040902D */ daddu $s2, $v0, $zero -/* 8DB0E8 80240FE8 8E050000 */ lw $a1, ($s0) -/* 8DB0EC 80240FEC 26100004 */ addiu $s0, $s0, 4 -/* 8DB0F0 80240FF0 0220202D */ daddu $a0, $s1, $zero -/* 8DB0F4 80240FF4 0C0B210B */ jal get_float_variable -/* 8DB0F8 80240FF8 46000706 */ mov.s $f28, $f0 -/* 8DB0FC 80240FFC 8E050000 */ lw $a1, ($s0) -/* 8DB100 80241000 26100004 */ addiu $s0, $s0, 4 -/* 8DB104 80241004 0220202D */ daddu $a0, $s1, $zero -/* 8DB108 80241008 0C0B210B */ jal get_float_variable -/* 8DB10C 8024100C 46000686 */ mov.s $f26, $f0 -/* 8DB110 80241010 0220202D */ daddu $a0, $s1, $zero -/* 8DB114 80241014 8E050000 */ lw $a1, ($s0) -/* 8DB118 80241018 0C0B210B */ jal get_float_variable -/* 8DB11C 8024101C 46000586 */ mov.s $f22, $f0 -/* 8DB120 80241020 0240202D */ daddu $a0, $s2, $zero -/* 8DB124 80241024 0C046B4C */ jal get_model_from_list_index -/* 8DB128 80241028 46000606 */ mov.s $f24, $f0 -/* 8DB12C 8024102C 0040882D */ daddu $s1, $v0, $zero -/* 8DB130 80241030 96220000 */ lhu $v0, ($s1) -/* 8DB134 80241034 30420400 */ andi $v0, $v0, 0x400 -/* 8DB138 80241038 1440001E */ bnez $v0, .L802410B4 -/* 8DB13C 8024103C 26300058 */ addiu $s0, $s1, 0x58 -/* 8DB140 80241040 4480A000 */ mtc1 $zero, $f20 -/* 8DB144 80241044 4406B000 */ mfc1 $a2, $f22 -/* 8DB148 80241048 4405A000 */ mfc1 $a1, $f20 -/* 8DB14C 8024104C 4407A000 */ mfc1 $a3, $f20 -/* 8DB150 80241050 0C019E40 */ jal guTranslateF -/* 8DB154 80241054 0200202D */ daddu $a0, $s0, $zero -/* 8DB158 80241058 4405E000 */ mfc1 $a1, $f28 -/* 8DB15C 8024105C 4406D000 */ mfc1 $a2, $f26 -/* 8DB160 80241060 4407C000 */ mfc1 $a3, $f24 -/* 8DB164 80241064 0C0903C8 */ jal func_80240F20 -/* 8DB168 80241068 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB16C 8024106C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB170 80241070 0200282D */ daddu $a1, $s0, $zero -/* 8DB174 80241074 0C019D80 */ jal guMtxCatF -/* 8DB178 80241078 0200302D */ daddu $a2, $s0, $zero -/* 8DB17C 8024107C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB180 80241080 4600B587 */ neg.s $f22, $f22 -/* 8DB184 80241084 4405A000 */ mfc1 $a1, $f20 -/* 8DB188 80241088 4406B000 */ mfc1 $a2, $f22 -/* 8DB18C 8024108C 0C019E40 */ jal guTranslateF -/* 8DB190 80241090 00A0382D */ daddu $a3, $a1, $zero -/* 8DB194 80241094 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB198 80241098 0200282D */ daddu $a1, $s0, $zero -/* 8DB19C 8024109C 0C019D80 */ jal guMtxCatF -/* 8DB1A0 802410A0 00A0302D */ daddu $a2, $a1, $zero -/* 8DB1A4 802410A4 96220000 */ lhu $v0, ($s1) -/* 8DB1A8 802410A8 34421400 */ ori $v0, $v0, 0x1400 -/* 8DB1AC 802410AC 0809044B */ j .L8024112C -/* 8DB1B0 802410B0 A6220000 */ sh $v0, ($s1) -.L802410B4: -/* 8DB1B4 802410B4 4480A000 */ mtc1 $zero, $f20 -/* 8DB1B8 802410B8 4406B000 */ mfc1 $a2, $f22 -/* 8DB1BC 802410BC 4405A000 */ mfc1 $a1, $f20 -/* 8DB1C0 802410C0 4407A000 */ mfc1 $a3, $f20 -/* 8DB1C4 802410C4 0C019E40 */ jal guTranslateF -/* 8DB1C8 802410C8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB1CC 802410CC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB1D0 802410D0 26300058 */ addiu $s0, $s1, 0x58 -/* 8DB1D4 802410D4 0200282D */ daddu $a1, $s0, $zero -/* 8DB1D8 802410D8 0C019D80 */ jal guMtxCatF -/* 8DB1DC 802410DC 0200302D */ daddu $a2, $s0, $zero -/* 8DB1E0 802410E0 4405E000 */ mfc1 $a1, $f28 -/* 8DB1E4 802410E4 4406D000 */ mfc1 $a2, $f26 -/* 8DB1E8 802410E8 4407C000 */ mfc1 $a3, $f24 -/* 8DB1EC 802410EC 0C0903C8 */ jal func_80240F20 -/* 8DB1F0 802410F0 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB1F4 802410F4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB1F8 802410F8 0200282D */ daddu $a1, $s0, $zero -/* 8DB1FC 802410FC 0C019D80 */ jal guMtxCatF -/* 8DB200 80241100 0200302D */ daddu $a2, $s0, $zero -/* 8DB204 80241104 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB208 80241108 4600B587 */ neg.s $f22, $f22 -/* 8DB20C 8024110C 4405A000 */ mfc1 $a1, $f20 -/* 8DB210 80241110 4406B000 */ mfc1 $a2, $f22 -/* 8DB214 80241114 0C019E40 */ jal guTranslateF -/* 8DB218 80241118 00A0382D */ daddu $a3, $a1, $zero -/* 8DB21C 8024111C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8DB220 80241120 0200282D */ daddu $a1, $s0, $zero -/* 8DB224 80241124 0C019D80 */ jal guMtxCatF -/* 8DB228 80241128 00A0302D */ daddu $a2, $a1, $zero -.L8024112C: -/* 8DB22C 8024112C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8DB230 80241130 8FB20058 */ lw $s2, 0x58($sp) -/* 8DB234 80241134 8FB10054 */ lw $s1, 0x54($sp) -/* 8DB238 80241138 8FB00050 */ lw $s0, 0x50($sp) -/* 8DB23C 8024113C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8DB240 80241140 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8DB244 80241144 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8DB248 80241148 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8DB24C 8024114C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8DB250 80241150 24020002 */ addiu $v0, $zero, 2 -/* 8DB254 80241154 03E00008 */ jr $ra -/* 8DB258 80241158 27BD0088 */ addiu $sp, $sp, 0x88 -/* 8DB25C 8024115C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_11/8DB020/func_80240F90_8DB090.s b/asm/nonmatchings/world/area_kmr/kmr_11/8DB020/func_80240F90_8DB090.s new file mode 100644 index 0000000000..d6d42e208e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_11/8DB020/func_80240F90_8DB090.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F90_8DB090 +/* 8DB090 80240F90 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8DB094 80240F94 AFB10054 */ sw $s1, 0x54($sp) +/* 8DB098 80240F98 0080882D */ daddu $s1, $a0, $zero +/* 8DB09C 80240F9C AFBF005C */ sw $ra, 0x5c($sp) +/* 8DB0A0 80240FA0 AFB20058 */ sw $s2, 0x58($sp) +/* 8DB0A4 80240FA4 AFB00050 */ sw $s0, 0x50($sp) +/* 8DB0A8 80240FA8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8DB0AC 80240FAC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8DB0B0 80240FB0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8DB0B4 80240FB4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8DB0B8 80240FB8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8DB0BC 80240FBC 8E30000C */ lw $s0, 0xc($s1) +/* 8DB0C0 80240FC0 8E050000 */ lw $a1, ($s0) +/* 8DB0C4 80240FC4 0C0B1EAF */ jal get_variable +/* 8DB0C8 80240FC8 26100004 */ addiu $s0, $s0, 4 +/* 8DB0CC 80240FCC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8DB0D0 80240FD0 0040202D */ daddu $a0, $v0, $zero +/* 8DB0D4 80240FD4 8E050000 */ lw $a1, ($s0) +/* 8DB0D8 80240FD8 26100004 */ addiu $s0, $s0, 4 +/* 8DB0DC 80240FDC 0220202D */ daddu $a0, $s1, $zero +/* 8DB0E0 80240FE0 0C0B210B */ jal get_float_variable +/* 8DB0E4 80240FE4 0040902D */ daddu $s2, $v0, $zero +/* 8DB0E8 80240FE8 8E050000 */ lw $a1, ($s0) +/* 8DB0EC 80240FEC 26100004 */ addiu $s0, $s0, 4 +/* 8DB0F0 80240FF0 0220202D */ daddu $a0, $s1, $zero +/* 8DB0F4 80240FF4 0C0B210B */ jal get_float_variable +/* 8DB0F8 80240FF8 46000706 */ mov.s $f28, $f0 +/* 8DB0FC 80240FFC 8E050000 */ lw $a1, ($s0) +/* 8DB100 80241000 26100004 */ addiu $s0, $s0, 4 +/* 8DB104 80241004 0220202D */ daddu $a0, $s1, $zero +/* 8DB108 80241008 0C0B210B */ jal get_float_variable +/* 8DB10C 8024100C 46000686 */ mov.s $f26, $f0 +/* 8DB110 80241010 0220202D */ daddu $a0, $s1, $zero +/* 8DB114 80241014 8E050000 */ lw $a1, ($s0) +/* 8DB118 80241018 0C0B210B */ jal get_float_variable +/* 8DB11C 8024101C 46000586 */ mov.s $f22, $f0 +/* 8DB120 80241020 0240202D */ daddu $a0, $s2, $zero +/* 8DB124 80241024 0C046B4C */ jal get_model_from_list_index +/* 8DB128 80241028 46000606 */ mov.s $f24, $f0 +/* 8DB12C 8024102C 0040882D */ daddu $s1, $v0, $zero +/* 8DB130 80241030 96220000 */ lhu $v0, ($s1) +/* 8DB134 80241034 30420400 */ andi $v0, $v0, 0x400 +/* 8DB138 80241038 1440001E */ bnez $v0, .L802410B4 +/* 8DB13C 8024103C 26300058 */ addiu $s0, $s1, 0x58 +/* 8DB140 80241040 4480A000 */ mtc1 $zero, $f20 +/* 8DB144 80241044 4406B000 */ mfc1 $a2, $f22 +/* 8DB148 80241048 4405A000 */ mfc1 $a1, $f20 +/* 8DB14C 8024104C 4407A000 */ mfc1 $a3, $f20 +/* 8DB150 80241050 0C019E40 */ jal guTranslateF +/* 8DB154 80241054 0200202D */ daddu $a0, $s0, $zero +/* 8DB158 80241058 4405E000 */ mfc1 $a1, $f28 +/* 8DB15C 8024105C 4406D000 */ mfc1 $a2, $f26 +/* 8DB160 80241060 4407C000 */ mfc1 $a3, $f24 +/* 8DB164 80241064 0C0903C8 */ jal func_80240F20_8DB020 +/* 8DB168 80241068 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB16C 8024106C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB170 80241070 0200282D */ daddu $a1, $s0, $zero +/* 8DB174 80241074 0C019D80 */ jal guMtxCatF +/* 8DB178 80241078 0200302D */ daddu $a2, $s0, $zero +/* 8DB17C 8024107C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB180 80241080 4600B587 */ neg.s $f22, $f22 +/* 8DB184 80241084 4405A000 */ mfc1 $a1, $f20 +/* 8DB188 80241088 4406B000 */ mfc1 $a2, $f22 +/* 8DB18C 8024108C 0C019E40 */ jal guTranslateF +/* 8DB190 80241090 00A0382D */ daddu $a3, $a1, $zero +/* 8DB194 80241094 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB198 80241098 0200282D */ daddu $a1, $s0, $zero +/* 8DB19C 8024109C 0C019D80 */ jal guMtxCatF +/* 8DB1A0 802410A0 00A0302D */ daddu $a2, $a1, $zero +/* 8DB1A4 802410A4 96220000 */ lhu $v0, ($s1) +/* 8DB1A8 802410A8 34421400 */ ori $v0, $v0, 0x1400 +/* 8DB1AC 802410AC 0809044B */ j .L8024112C +/* 8DB1B0 802410B0 A6220000 */ sh $v0, ($s1) +.L802410B4: +/* 8DB1B4 802410B4 4480A000 */ mtc1 $zero, $f20 +/* 8DB1B8 802410B8 4406B000 */ mfc1 $a2, $f22 +/* 8DB1BC 802410BC 4405A000 */ mfc1 $a1, $f20 +/* 8DB1C0 802410C0 4407A000 */ mfc1 $a3, $f20 +/* 8DB1C4 802410C4 0C019E40 */ jal guTranslateF +/* 8DB1C8 802410C8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB1CC 802410CC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB1D0 802410D0 26300058 */ addiu $s0, $s1, 0x58 +/* 8DB1D4 802410D4 0200282D */ daddu $a1, $s0, $zero +/* 8DB1D8 802410D8 0C019D80 */ jal guMtxCatF +/* 8DB1DC 802410DC 0200302D */ daddu $a2, $s0, $zero +/* 8DB1E0 802410E0 4405E000 */ mfc1 $a1, $f28 +/* 8DB1E4 802410E4 4406D000 */ mfc1 $a2, $f26 +/* 8DB1E8 802410E8 4407C000 */ mfc1 $a3, $f24 +/* 8DB1EC 802410EC 0C0903C8 */ jal func_80240F20_8DB020 +/* 8DB1F0 802410F0 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB1F4 802410F4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB1F8 802410F8 0200282D */ daddu $a1, $s0, $zero +/* 8DB1FC 802410FC 0C019D80 */ jal guMtxCatF +/* 8DB200 80241100 0200302D */ daddu $a2, $s0, $zero +/* 8DB204 80241104 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB208 80241108 4600B587 */ neg.s $f22, $f22 +/* 8DB20C 8024110C 4405A000 */ mfc1 $a1, $f20 +/* 8DB210 80241110 4406B000 */ mfc1 $a2, $f22 +/* 8DB214 80241114 0C019E40 */ jal guTranslateF +/* 8DB218 80241118 00A0382D */ daddu $a3, $a1, $zero +/* 8DB21C 8024111C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8DB220 80241120 0200282D */ daddu $a1, $s0, $zero +/* 8DB224 80241124 0C019D80 */ jal guMtxCatF +/* 8DB228 80241128 00A0302D */ daddu $a2, $a1, $zero +.L8024112C: +/* 8DB22C 8024112C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8DB230 80241130 8FB20058 */ lw $s2, 0x58($sp) +/* 8DB234 80241134 8FB10054 */ lw $s1, 0x54($sp) +/* 8DB238 80241138 8FB00050 */ lw $s0, 0x50($sp) +/* 8DB23C 8024113C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8DB240 80241140 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8DB244 80241144 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8DB248 80241148 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8DB24C 8024114C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8DB250 80241150 24020002 */ addiu $v0, $zero, 2 +/* 8DB254 80241154 03E00008 */ jr $ra +/* 8DB258 80241158 27BD0088 */ addiu $sp, $sp, 0x88 +/* 8DB25C 8024115C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064.s deleted file mode 100644 index 04e1de9a41..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240064 -/* 8EBE84 80240064 3C038016 */ lui $v1, 0x8016 -/* 8EBE88 80240068 8463A552 */ lh $v1, -0x5aae($v1) -/* 8EBE8C 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EBE90 80240070 AFB00010 */ sw $s0, 0x10($sp) -/* 8EBE94 80240074 0080802D */ daddu $s0, $a0, $zero -/* 8EBE98 80240078 AFBF0014 */ sw $ra, 0x14($sp) -/* 8EBE9C 8024007C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8EBEA0 80240080 10620003 */ beq $v1, $v0, .L80240090 -/* 8EBEA4 80240084 24020002 */ addiu $v0, $zero, 2 -/* 8EBEA8 80240088 08090044 */ j .L80240110 -/* 8EBEAC 8024008C AE000084 */ sw $zero, 0x84($s0) -.L80240090: -/* 8EBEB0 80240090 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8EBEB4 80240094 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8EBEB8 80240098 80620040 */ lb $v0, 0x40($v1) -/* 8EBEBC 8024009C 80670044 */ lb $a3, 0x44($v1) -/* 8EBEC0 802400A0 04420001 */ bltzl $v0, .L802400A8 -/* 8EBEC4 802400A4 00021023 */ negu $v0, $v0 -.L802400A8: -/* 8EBEC8 802400A8 14400003 */ bnez $v0, .L802400B8 -/* 8EBECC 802400AC 00000000 */ nop -/* 8EBED0 802400B0 50E00017 */ beql $a3, $zero, .L80240110 -/* 8EBED4 802400B4 0000102D */ daddu $v0, $zero, $zero -.L802400B8: -/* 8EBED8 802400B8 44822000 */ mtc1 $v0, $f4 -/* 8EBEDC 802400BC 00000000 */ nop -/* 8EBEE0 802400C0 46802120 */ cvt.s.w $f4, $f4 -/* 8EBEE4 802400C4 44062000 */ mfc1 $a2, $f4 -/* 8EBEE8 802400C8 44872000 */ mtc1 $a3, $f4 -/* 8EBEEC 802400CC 00000000 */ nop -/* 8EBEF0 802400D0 46802120 */ cvt.s.w $f4, $f4 -/* 8EBEF4 802400D4 44806000 */ mtc1 $zero, $f12 -/* 8EBEF8 802400D8 44072000 */ mfc1 $a3, $f4 -/* 8EBEFC 802400DC 0C00A720 */ jal atan2 -/* 8EBF00 802400E0 46006386 */ mov.s $f14, $f12 -/* 8EBF04 802400E4 3C014270 */ lui $at, 0x4270 -/* 8EBF08 802400E8 44811000 */ mtc1 $at, $f2 -/* 8EBF0C 802400EC 00000000 */ nop -/* 8EBF10 802400F0 4602003C */ c.lt.s $f0, $f2 -/* 8EBF14 802400F4 00000000 */ nop -/* 8EBF18 802400F8 45000004 */ bc1f .L8024010C -/* 8EBF1C 802400FC 24020001 */ addiu $v0, $zero, 1 -/* 8EBF20 80240100 AE020084 */ sw $v0, 0x84($s0) -/* 8EBF24 80240104 08090044 */ j .L80240110 -/* 8EBF28 80240108 24020002 */ addiu $v0, $zero, 2 -.L8024010C: -/* 8EBF2C 8024010C 0000102D */ daddu $v0, $zero, $zero -.L80240110: -/* 8EBF30 80240110 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EBF34 80240114 8FB00010 */ lw $s0, 0x10($sp) -/* 8EBF38 80240118 03E00008 */ jr $ra -/* 8EBF3C 8024011C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s new file mode 100644 index 0000000000..45088228d3 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240064_8EBE84.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240064_8EBE84 +/* 8EBE84 80240064 3C038016 */ lui $v1, 0x8016 +/* 8EBE88 80240068 8463A552 */ lh $v1, -0x5aae($v1) +/* 8EBE8C 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EBE90 80240070 AFB00010 */ sw $s0, 0x10($sp) +/* 8EBE94 80240074 0080802D */ daddu $s0, $a0, $zero +/* 8EBE98 80240078 AFBF0014 */ sw $ra, 0x14($sp) +/* 8EBE9C 8024007C 8E0200B0 */ lw $v0, 0xb0($s0) +/* 8EBEA0 80240080 10620003 */ beq $v1, $v0, .L80240090 +/* 8EBEA4 80240084 24020002 */ addiu $v0, $zero, 2 +/* 8EBEA8 80240088 08090044 */ j .L80240110 +/* 8EBEAC 8024008C AE000084 */ sw $zero, 0x84($s0) +.L80240090: +/* 8EBEB0 80240090 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 8EBEB4 80240094 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 8EBEB8 80240098 80620040 */ lb $v0, 0x40($v1) +/* 8EBEBC 8024009C 80670044 */ lb $a3, 0x44($v1) +/* 8EBEC0 802400A0 04420001 */ bltzl $v0, .L802400A8 +/* 8EBEC4 802400A4 00021023 */ negu $v0, $v0 +.L802400A8: +/* 8EBEC8 802400A8 14400003 */ bnez $v0, .L802400B8 +/* 8EBECC 802400AC 00000000 */ nop +/* 8EBED0 802400B0 50E00017 */ beql $a3, $zero, .L80240110 +/* 8EBED4 802400B4 0000102D */ daddu $v0, $zero, $zero +.L802400B8: +/* 8EBED8 802400B8 44822000 */ mtc1 $v0, $f4 +/* 8EBEDC 802400BC 00000000 */ nop +/* 8EBEE0 802400C0 46802120 */ cvt.s.w $f4, $f4 +/* 8EBEE4 802400C4 44062000 */ mfc1 $a2, $f4 +/* 8EBEE8 802400C8 44872000 */ mtc1 $a3, $f4 +/* 8EBEEC 802400CC 00000000 */ nop +/* 8EBEF0 802400D0 46802120 */ cvt.s.w $f4, $f4 +/* 8EBEF4 802400D4 44806000 */ mtc1 $zero, $f12 +/* 8EBEF8 802400D8 44072000 */ mfc1 $a3, $f4 +/* 8EBEFC 802400DC 0C00A720 */ jal atan2 +/* 8EBF00 802400E0 46006386 */ mov.s $f14, $f12 +/* 8EBF04 802400E4 3C014270 */ lui $at, 0x4270 +/* 8EBF08 802400E8 44811000 */ mtc1 $at, $f2 +/* 8EBF0C 802400EC 00000000 */ nop +/* 8EBF10 802400F0 4602003C */ c.lt.s $f0, $f2 +/* 8EBF14 802400F4 00000000 */ nop +/* 8EBF18 802400F8 45000004 */ bc1f .L8024010C +/* 8EBF1C 802400FC 24020001 */ addiu $v0, $zero, 1 +/* 8EBF20 80240100 AE020084 */ sw $v0, 0x84($s0) +/* 8EBF24 80240104 08090044 */ j .L80240110 +/* 8EBF28 80240108 24020002 */ addiu $v0, $zero, 2 +.L8024010C: +/* 8EBF2C 8024010C 0000102D */ daddu $v0, $zero, $zero +.L80240110: +/* 8EBF30 80240110 8FBF0014 */ lw $ra, 0x14($sp) +/* 8EBF34 80240114 8FB00010 */ lw $s0, 0x10($sp) +/* 8EBF38 80240118 03E00008 */ jr $ra +/* 8EBF3C 8024011C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120.s deleted file mode 100644 index 6d7f159d83..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240120 -/* 8EBF40 80240120 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8EBF44 80240124 AFB10014 */ sw $s1, 0x14($sp) -/* 8EBF48 80240128 0080882D */ daddu $s1, $a0, $zero -/* 8EBF4C 8024012C AFBF001C */ sw $ra, 0x1c($sp) -/* 8EBF50 80240130 AFB20018 */ sw $s2, 0x18($sp) -/* 8EBF54 80240134 0C016AFA */ jal get_current_map_header -/* 8EBF58 80240138 AFB00010 */ sw $s0, 0x10($sp) -/* 8EBF5C 8024013C 0220202D */ daddu $a0, $s1, $zero -/* 8EBF60 80240140 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBF64 80240144 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EBF68 80240148 0C0B1EAF */ jal get_variable -/* 8EBF6C 8024014C 0040902D */ daddu $s2, $v0, $zero -/* 8EBF70 80240150 0220202D */ daddu $a0, $s1, $zero -/* 8EBF74 80240154 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBF78 80240158 8E430014 */ lw $v1, 0x14($s2) -/* 8EBF7C 8024015C 00028100 */ sll $s0, $v0, 4 -/* 8EBF80 80240160 02031821 */ addu $v1, $s0, $v1 -/* 8EBF84 80240164 C4600000 */ lwc1 $f0, ($v1) -/* 8EBF88 80240168 4600008D */ trunc.w.s $f2, $f0 -/* 8EBF8C 8024016C 44061000 */ mfc1 $a2, $f2 -/* 8EBF90 80240170 0C0B2026 */ jal set_variable -/* 8EBF94 80240174 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EBF98 80240178 0220202D */ daddu $a0, $s1, $zero -/* 8EBF9C 8024017C 8E420014 */ lw $v0, 0x14($s2) -/* 8EBFA0 80240180 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBFA4 80240184 02021021 */ addu $v0, $s0, $v0 -/* 8EBFA8 80240188 C4400004 */ lwc1 $f0, 4($v0) -/* 8EBFAC 8024018C 4600008D */ trunc.w.s $f2, $f0 -/* 8EBFB0 80240190 44061000 */ mfc1 $a2, $f2 -/* 8EBFB4 80240194 0C0B2026 */ jal set_variable -/* 8EBFB8 80240198 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EBFBC 8024019C 0220202D */ daddu $a0, $s1, $zero -/* 8EBFC0 802401A0 8E420014 */ lw $v0, 0x14($s2) -/* 8EBFC4 802401A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBFC8 802401A8 02021021 */ addu $v0, $s0, $v0 -/* 8EBFCC 802401AC C4400008 */ lwc1 $f0, 8($v0) -/* 8EBFD0 802401B0 4600008D */ trunc.w.s $f2, $f0 -/* 8EBFD4 802401B4 44061000 */ mfc1 $a2, $f2 -/* 8EBFD8 802401B8 0C0B2026 */ jal set_variable -/* 8EBFDC 802401BC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8EBFE0 802401C0 0220202D */ daddu $a0, $s1, $zero -/* 8EBFE4 802401C4 8E420014 */ lw $v0, 0x14($s2) -/* 8EBFE8 802401C8 3C05FE36 */ lui $a1, 0xfe36 -/* 8EBFEC 802401CC 02028021 */ addu $s0, $s0, $v0 -/* 8EBFF0 802401D0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8EBFF4 802401D4 4600008D */ trunc.w.s $f2, $f0 -/* 8EBFF8 802401D8 44061000 */ mfc1 $a2, $f2 -/* 8EBFFC 802401DC 0C0B2026 */ jal set_variable -/* 8EC000 802401E0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8EC004 802401E4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EC008 802401E8 8FB20018 */ lw $s2, 0x18($sp) -/* 8EC00C 802401EC 8FB10014 */ lw $s1, 0x14($sp) -/* 8EC010 802401F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8EC014 802401F4 24020002 */ addiu $v0, $zero, 2 -/* 8EC018 802401F8 03E00008 */ jr $ra -/* 8EC01C 802401FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s new file mode 100644 index 0000000000..d78aa60188 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240120_8EBF40.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240120_8EBF40 +/* 8EBF40 80240120 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8EBF44 80240124 AFB10014 */ sw $s1, 0x14($sp) +/* 8EBF48 80240128 0080882D */ daddu $s1, $a0, $zero +/* 8EBF4C 8024012C AFBF001C */ sw $ra, 0x1c($sp) +/* 8EBF50 80240130 AFB20018 */ sw $s2, 0x18($sp) +/* 8EBF54 80240134 0C016AFA */ jal get_current_map_header +/* 8EBF58 80240138 AFB00010 */ sw $s0, 0x10($sp) +/* 8EBF5C 8024013C 0220202D */ daddu $a0, $s1, $zero +/* 8EBF60 80240140 3C05FE36 */ lui $a1, 0xfe36 +/* 8EBF64 80240144 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8EBF68 80240148 0C0B1EAF */ jal get_variable +/* 8EBF6C 8024014C 0040902D */ daddu $s2, $v0, $zero +/* 8EBF70 80240150 0220202D */ daddu $a0, $s1, $zero +/* 8EBF74 80240154 3C05FE36 */ lui $a1, 0xfe36 +/* 8EBF78 80240158 8E430014 */ lw $v1, 0x14($s2) +/* 8EBF7C 8024015C 00028100 */ sll $s0, $v0, 4 +/* 8EBF80 80240160 02031821 */ addu $v1, $s0, $v1 +/* 8EBF84 80240164 C4600000 */ lwc1 $f0, ($v1) +/* 8EBF88 80240168 4600008D */ trunc.w.s $f2, $f0 +/* 8EBF8C 8024016C 44061000 */ mfc1 $a2, $f2 +/* 8EBF90 80240170 0C0B2026 */ jal set_variable +/* 8EBF94 80240174 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8EBF98 80240178 0220202D */ daddu $a0, $s1, $zero +/* 8EBF9C 8024017C 8E420014 */ lw $v0, 0x14($s2) +/* 8EBFA0 80240180 3C05FE36 */ lui $a1, 0xfe36 +/* 8EBFA4 80240184 02021021 */ addu $v0, $s0, $v0 +/* 8EBFA8 80240188 C4400004 */ lwc1 $f0, 4($v0) +/* 8EBFAC 8024018C 4600008D */ trunc.w.s $f2, $f0 +/* 8EBFB0 80240190 44061000 */ mfc1 $a2, $f2 +/* 8EBFB4 80240194 0C0B2026 */ jal set_variable +/* 8EBFB8 80240198 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 8EBFBC 8024019C 0220202D */ daddu $a0, $s1, $zero +/* 8EBFC0 802401A0 8E420014 */ lw $v0, 0x14($s2) +/* 8EBFC4 802401A4 3C05FE36 */ lui $a1, 0xfe36 +/* 8EBFC8 802401A8 02021021 */ addu $v0, $s0, $v0 +/* 8EBFCC 802401AC C4400008 */ lwc1 $f0, 8($v0) +/* 8EBFD0 802401B0 4600008D */ trunc.w.s $f2, $f0 +/* 8EBFD4 802401B4 44061000 */ mfc1 $a2, $f2 +/* 8EBFD8 802401B8 0C0B2026 */ jal set_variable +/* 8EBFDC 802401BC 34A53C83 */ ori $a1, $a1, 0x3c83 +/* 8EBFE0 802401C0 0220202D */ daddu $a0, $s1, $zero +/* 8EBFE4 802401C4 8E420014 */ lw $v0, 0x14($s2) +/* 8EBFE8 802401C8 3C05FE36 */ lui $a1, 0xfe36 +/* 8EBFEC 802401CC 02028021 */ addu $s0, $s0, $v0 +/* 8EBFF0 802401D0 C600000C */ lwc1 $f0, 0xc($s0) +/* 8EBFF4 802401D4 4600008D */ trunc.w.s $f2, $f0 +/* 8EBFF8 802401D8 44061000 */ mfc1 $a2, $f2 +/* 8EBFFC 802401DC 0C0B2026 */ jal set_variable +/* 8EC000 802401E0 34A53C84 */ ori $a1, $a1, 0x3c84 +/* 8EC004 802401E4 8FBF001C */ lw $ra, 0x1c($sp) +/* 8EC008 802401E8 8FB20018 */ lw $s2, 0x18($sp) +/* 8EC00C 802401EC 8FB10014 */ lw $s1, 0x14($sp) +/* 8EC010 802401F0 8FB00010 */ lw $s0, 0x10($sp) +/* 8EC014 802401F4 24020002 */ addiu $v0, $zero, 2 +/* 8EC018 802401F8 03E00008 */ jr $ra +/* 8EC01C 802401FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200.s deleted file mode 100644 index 04d9188c46..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240200 -/* 8EC020 80240200 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8EC024 80240204 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8EC028 80240208 3C014334 */ lui $at, 0x4334 -/* 8EC02C 8024020C 44816000 */ mtc1 $at, $f12 -/* 8EC030 80240210 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EC034 80240214 AFBF0014 */ sw $ra, 0x14($sp) -/* 8EC038 80240218 AFB00010 */ sw $s0, 0x10($sp) -/* 8EC03C 8024021C 00031080 */ sll $v0, $v1, 2 -/* 8EC040 80240220 00431021 */ addu $v0, $v0, $v1 -/* 8EC044 80240224 00021080 */ sll $v0, $v0, 2 -/* 8EC048 80240228 00431023 */ subu $v0, $v0, $v1 -/* 8EC04C 8024022C 000218C0 */ sll $v1, $v0, 3 -/* 8EC050 80240230 00431021 */ addu $v0, $v0, $v1 -/* 8EC054 80240234 000210C0 */ sll $v0, $v0, 3 -/* 8EC058 80240238 3C01800B */ lui $at, 0x800b -/* 8EC05C 8024023C 00220821 */ addu $at, $at, $v0 -/* 8EC060 80240240 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8EC064 80240244 460C0300 */ add.s $f12, $f0, $f12 -/* 8EC068 80240248 0C00A6C9 */ jal clamp_angle -/* 8EC06C 8024024C 0080802D */ daddu $s0, $a0, $zero -/* 8EC070 80240250 4600008D */ trunc.w.s $f2, $f0 -/* 8EC074 80240254 E6020084 */ swc1 $f2, 0x84($s0) -/* 8EC078 80240258 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EC07C 8024025C 8FB00010 */ lw $s0, 0x10($sp) -/* 8EC080 80240260 24020002 */ addiu $v0, $zero, 2 -/* 8EC084 80240264 03E00008 */ jr $ra -/* 8EC088 80240268 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200_8EC020.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200_8EC020.s new file mode 100644 index 0000000000..10a46b0f0a --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240200_8EC020.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240200_8EC020 +/* 8EC020 80240200 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 8EC024 80240204 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 8EC028 80240208 3C014334 */ lui $at, 0x4334 +/* 8EC02C 8024020C 44816000 */ mtc1 $at, $f12 +/* 8EC030 80240210 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EC034 80240214 AFBF0014 */ sw $ra, 0x14($sp) +/* 8EC038 80240218 AFB00010 */ sw $s0, 0x10($sp) +/* 8EC03C 8024021C 00031080 */ sll $v0, $v1, 2 +/* 8EC040 80240220 00431021 */ addu $v0, $v0, $v1 +/* 8EC044 80240224 00021080 */ sll $v0, $v0, 2 +/* 8EC048 80240228 00431023 */ subu $v0, $v0, $v1 +/* 8EC04C 8024022C 000218C0 */ sll $v1, $v0, 3 +/* 8EC050 80240230 00431021 */ addu $v0, $v0, $v1 +/* 8EC054 80240234 000210C0 */ sll $v0, $v0, 3 +/* 8EC058 80240238 3C01800B */ lui $at, 0x800b +/* 8EC05C 8024023C 00220821 */ addu $at, $at, $v0 +/* 8EC060 80240240 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 8EC064 80240244 460C0300 */ add.s $f12, $f0, $f12 +/* 8EC068 80240248 0C00A6C9 */ jal clamp_angle +/* 8EC06C 8024024C 0080802D */ daddu $s0, $a0, $zero +/* 8EC070 80240250 4600008D */ trunc.w.s $f2, $f0 +/* 8EC074 80240254 E6020084 */ swc1 $f2, 0x84($s0) +/* 8EC078 80240258 8FBF0014 */ lw $ra, 0x14($sp) +/* 8EC07C 8024025C 8FB00010 */ lw $s0, 0x10($sp) +/* 8EC080 80240260 24020002 */ addiu $v0, $zero, 2 +/* 8EC084 80240264 03E00008 */ jr $ra +/* 8EC088 80240268 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_8024026C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_8024026C.s deleted file mode 100644 index 4323b0c56b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_8024026C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024026C -/* 8EC08C 8024026C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8EC090 80240270 AFB00018 */ sw $s0, 0x18($sp) -/* 8EC094 80240274 0080802D */ daddu $s0, $a0, $zero -/* 8EC098 80240278 AFBF001C */ sw $ra, 0x1c($sp) -/* 8EC09C 8024027C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8EC0A0 80240280 8E02000C */ lw $v0, 0xc($s0) -/* 8EC0A4 80240284 0C0B210B */ jal get_float_variable -/* 8EC0A8 80240288 8C450000 */ lw $a1, ($v0) -/* 8EC0AC 8024028C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC0B0 80240290 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8EC0B4 80240294 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8EC0B8 80240298 44060000 */ mfc1 $a2, $f0 -/* 8EC0BC 8024029C C4400028 */ lwc1 $f0, 0x28($v0) -/* 8EC0C0 802402A0 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8EC0C4 802402A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8EC0C8 802402A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8EC0CC 802402AC 8C470080 */ lw $a3, 0x80($v0) -/* 8EC0D0 802402B0 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8EC0D4 802402B4 0C00A7E7 */ jal add_vec2D_polar -/* 8EC0D8 802402B8 27A50014 */ addiu $a1, $sp, 0x14 -/* 8EC0DC 802402BC 0200202D */ daddu $a0, $s0, $zero -/* 8EC0E0 802402C0 3C05FE36 */ lui $a1, 0xfe36 -/* 8EC0E4 802402C4 8FA60010 */ lw $a2, 0x10($sp) -/* 8EC0E8 802402C8 0C0B2190 */ jal set_float_variable -/* 8EC0EC 802402CC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EC0F0 802402D0 0200202D */ daddu $a0, $s0, $zero -/* 8EC0F4 802402D4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EC0F8 802402D8 4406A000 */ mfc1 $a2, $f20 -/* 8EC0FC 802402DC 0C0B2190 */ jal set_float_variable -/* 8EC100 802402E0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EC104 802402E4 0200202D */ daddu $a0, $s0, $zero -/* 8EC108 802402E8 3C05FE36 */ lui $a1, 0xfe36 -/* 8EC10C 802402EC 8FA60014 */ lw $a2, 0x14($sp) -/* 8EC110 802402F0 0C0B2190 */ jal set_float_variable -/* 8EC114 802402F4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EC118 802402F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EC11C 802402FC 8FB00018 */ lw $s0, 0x18($sp) -/* 8EC120 80240300 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8EC124 80240304 24020002 */ addiu $v0, $zero, 2 -/* 8EC128 80240308 03E00008 */ jr $ra -/* 8EC12C 8024030C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_8024026C_8EC08C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_8024026C_8EC08C.s new file mode 100644 index 0000000000..fc7e1d5d6a --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_8024026C_8EC08C.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024026C_8EC08C +/* 8EC08C 8024026C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8EC090 80240270 AFB00018 */ sw $s0, 0x18($sp) +/* 8EC094 80240274 0080802D */ daddu $s0, $a0, $zero +/* 8EC098 80240278 AFBF001C */ sw $ra, 0x1c($sp) +/* 8EC09C 8024027C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8EC0A0 80240280 8E02000C */ lw $v0, 0xc($s0) +/* 8EC0A4 80240284 0C0B210B */ jal get_float_variable +/* 8EC0A8 80240288 8C450000 */ lw $a1, ($v0) +/* 8EC0AC 8024028C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC0B0 80240290 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 8EC0B4 80240294 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 8EC0B8 80240298 44060000 */ mfc1 $a2, $f0 +/* 8EC0BC 8024029C C4400028 */ lwc1 $f0, 0x28($v0) +/* 8EC0C0 802402A0 C4420030 */ lwc1 $f2, 0x30($v0) +/* 8EC0C4 802402A4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8EC0C8 802402A8 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8EC0CC 802402AC 8C470080 */ lw $a3, 0x80($v0) +/* 8EC0D0 802402B0 C454002C */ lwc1 $f20, 0x2c($v0) +/* 8EC0D4 802402B4 0C00A7E7 */ jal add_vec2D_polar +/* 8EC0D8 802402B8 27A50014 */ addiu $a1, $sp, 0x14 +/* 8EC0DC 802402BC 0200202D */ daddu $a0, $s0, $zero +/* 8EC0E0 802402C0 3C05FE36 */ lui $a1, 0xfe36 +/* 8EC0E4 802402C4 8FA60010 */ lw $a2, 0x10($sp) +/* 8EC0E8 802402C8 0C0B2190 */ jal set_float_variable +/* 8EC0EC 802402CC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8EC0F0 802402D0 0200202D */ daddu $a0, $s0, $zero +/* 8EC0F4 802402D4 3C05FE36 */ lui $a1, 0xfe36 +/* 8EC0F8 802402D8 4406A000 */ mfc1 $a2, $f20 +/* 8EC0FC 802402DC 0C0B2190 */ jal set_float_variable +/* 8EC100 802402E0 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8EC104 802402E4 0200202D */ daddu $a0, $s0, $zero +/* 8EC108 802402E8 3C05FE36 */ lui $a1, 0xfe36 +/* 8EC10C 802402EC 8FA60014 */ lw $a2, 0x14($sp) +/* 8EC110 802402F0 0C0B2190 */ jal set_float_variable +/* 8EC114 802402F4 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 8EC118 802402F8 8FBF001C */ lw $ra, 0x1c($sp) +/* 8EC11C 802402FC 8FB00018 */ lw $s0, 0x18($sp) +/* 8EC120 80240300 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8EC124 80240304 24020002 */ addiu $v0, $zero, 2 +/* 8EC128 80240308 03E00008 */ jr $ra +/* 8EC12C 8024030C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240330.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240330.s deleted file mode 100644 index 3f3aca6287..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240330.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240330 -/* 8EC150 80240330 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EC154 80240334 0000202D */ daddu $a0, $zero, $zero -/* 8EC158 80240338 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8EC15C 8024033C AFBF0010 */ sw $ra, 0x10($sp) -/* 8EC160 80240340 0C01559B */ jal func_8005566C -/* 8EC164 80240344 2406003F */ addiu $a2, $zero, 0x3f -/* 8EC168 80240348 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EC16C 8024034C 24020002 */ addiu $v0, $zero, 2 -/* 8EC170 80240350 03E00008 */ jr $ra -/* 8EC174 80240354 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240330_8EC150.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240330_8EC150.s new file mode 100644 index 0000000000..c822864004 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240330_8EC150.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240330_8EC150 +/* 8EC150 80240330 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EC154 80240334 0000202D */ daddu $a0, $zero, $zero +/* 8EC158 80240338 240503E8 */ addiu $a1, $zero, 0x3e8 +/* 8EC15C 8024033C AFBF0010 */ sw $ra, 0x10($sp) +/* 8EC160 80240340 0C01559B */ jal func_8005566C +/* 8EC164 80240344 2406003F */ addiu $a2, $zero, 0x3f +/* 8EC168 80240348 8FBF0010 */ lw $ra, 0x10($sp) +/* 8EC16C 8024034C 24020002 */ addiu $v0, $zero, 2 +/* 8EC170 80240350 03E00008 */ jr $ra +/* 8EC174 80240354 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240380.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240380.s deleted file mode 100644 index 00fe3d79b3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240380.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240380 -/* 8EC1A0 80240380 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8EC1A4 80240384 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8EC1A8 80240388 4485A000 */ mtc1 $a1, $f20 -/* 8EC1AC 8024038C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8EC1B0 80240390 4486B000 */ mtc1 $a2, $f22 -/* 8EC1B4 80240394 AFB00010 */ sw $s0, 0x10($sp) -/* 8EC1B8 80240398 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 8EC1BC 8024039C 4487C000 */ mtc1 $a3, $f24 -/* 8EC1C0 802403A0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8EC1C4 802403A4 0C019D28 */ jal guMtxIdentF -/* 8EC1C8 802403A8 0080802D */ daddu $s0, $a0, $zero -/* 8EC1CC 802403AC 4616A582 */ mul.s $f22, $f20, $f22 -/* 8EC1D0 802403B0 00000000 */ nop -/* 8EC1D4 802403B4 4618A502 */ mul.s $f20, $f20, $f24 -/* 8EC1D8 802403B8 00000000 */ nop -/* 8EC1DC 802403BC 3C013F80 */ lui $at, 0x3f80 -/* 8EC1E0 802403C0 44810000 */ mtc1 $at, $f0 -/* 8EC1E4 802403C4 00000000 */ nop -/* 8EC1E8 802403C8 E6000014 */ swc1 $f0, 0x14($s0) -/* 8EC1EC 802403CC E6160010 */ swc1 $f22, 0x10($s0) -/* 8EC1F0 802403D0 E6140018 */ swc1 $f20, 0x18($s0) -/* 8EC1F4 802403D4 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EC1F8 802403D8 8FB00010 */ lw $s0, 0x10($sp) -/* 8EC1FC 802403DC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8EC200 802403E0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8EC204 802403E4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8EC208 802403E8 03E00008 */ jr $ra -/* 8EC20C 802403EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240380_8EC1A0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240380_8EC1A0.s new file mode 100644 index 0000000000..384bcaa0e7 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240380_8EC1A0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240380_8EC1A0 +/* 8EC1A0 80240380 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8EC1A4 80240384 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 8EC1A8 80240388 4485A000 */ mtc1 $a1, $f20 +/* 8EC1AC 8024038C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 8EC1B0 80240390 4486B000 */ mtc1 $a2, $f22 +/* 8EC1B4 80240394 AFB00010 */ sw $s0, 0x10($sp) +/* 8EC1B8 80240398 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 8EC1BC 8024039C 4487C000 */ mtc1 $a3, $f24 +/* 8EC1C0 802403A0 AFBF0014 */ sw $ra, 0x14($sp) +/* 8EC1C4 802403A4 0C019D28 */ jal guMtxIdentF +/* 8EC1C8 802403A8 0080802D */ daddu $s0, $a0, $zero +/* 8EC1CC 802403AC 4616A582 */ mul.s $f22, $f20, $f22 +/* 8EC1D0 802403B0 00000000 */ nop +/* 8EC1D4 802403B4 4618A502 */ mul.s $f20, $f20, $f24 +/* 8EC1D8 802403B8 00000000 */ nop +/* 8EC1DC 802403BC 3C013F80 */ lui $at, 0x3f80 +/* 8EC1E0 802403C0 44810000 */ mtc1 $at, $f0 +/* 8EC1E4 802403C4 00000000 */ nop +/* 8EC1E8 802403C8 E6000014 */ swc1 $f0, 0x14($s0) +/* 8EC1EC 802403CC E6160010 */ swc1 $f22, 0x10($s0) +/* 8EC1F0 802403D0 E6140018 */ swc1 $f20, 0x18($s0) +/* 8EC1F4 802403D4 8FBF0014 */ lw $ra, 0x14($sp) +/* 8EC1F8 802403D8 8FB00010 */ lw $s0, 0x10($sp) +/* 8EC1FC 802403DC D7B80028 */ ldc1 $f24, 0x28($sp) +/* 8EC200 802403E0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 8EC204 802403E4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 8EC208 802403E8 03E00008 */ jr $ra +/* 8EC20C 802403EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802403F0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802403F0.s deleted file mode 100644 index 745a71ab0a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802403F0.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F0 -/* 8EC210 802403F0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8EC214 802403F4 AFB10054 */ sw $s1, 0x54($sp) -/* 8EC218 802403F8 0080882D */ daddu $s1, $a0, $zero -/* 8EC21C 802403FC AFBF005C */ sw $ra, 0x5c($sp) -/* 8EC220 80240400 AFB20058 */ sw $s2, 0x58($sp) -/* 8EC224 80240404 AFB00050 */ sw $s0, 0x50($sp) -/* 8EC228 80240408 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8EC22C 8024040C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8EC230 80240410 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8EC234 80240414 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8EC238 80240418 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8EC23C 8024041C 8E30000C */ lw $s0, 0xc($s1) -/* 8EC240 80240420 8E050000 */ lw $a1, ($s0) -/* 8EC244 80240424 0C0B1EAF */ jal get_variable -/* 8EC248 80240428 26100004 */ addiu $s0, $s0, 4 -/* 8EC24C 8024042C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8EC250 80240430 0040202D */ daddu $a0, $v0, $zero -/* 8EC254 80240434 8E050000 */ lw $a1, ($s0) -/* 8EC258 80240438 26100004 */ addiu $s0, $s0, 4 -/* 8EC25C 8024043C 0220202D */ daddu $a0, $s1, $zero -/* 8EC260 80240440 0C0B210B */ jal get_float_variable -/* 8EC264 80240444 0040902D */ daddu $s2, $v0, $zero -/* 8EC268 80240448 8E050000 */ lw $a1, ($s0) -/* 8EC26C 8024044C 26100004 */ addiu $s0, $s0, 4 -/* 8EC270 80240450 0220202D */ daddu $a0, $s1, $zero -/* 8EC274 80240454 0C0B210B */ jal get_float_variable -/* 8EC278 80240458 46000706 */ mov.s $f28, $f0 -/* 8EC27C 8024045C 8E050000 */ lw $a1, ($s0) -/* 8EC280 80240460 26100004 */ addiu $s0, $s0, 4 -/* 8EC284 80240464 0220202D */ daddu $a0, $s1, $zero -/* 8EC288 80240468 0C0B210B */ jal get_float_variable -/* 8EC28C 8024046C 46000686 */ mov.s $f26, $f0 -/* 8EC290 80240470 0220202D */ daddu $a0, $s1, $zero -/* 8EC294 80240474 8E050000 */ lw $a1, ($s0) -/* 8EC298 80240478 0C0B210B */ jal get_float_variable -/* 8EC29C 8024047C 46000586 */ mov.s $f22, $f0 -/* 8EC2A0 80240480 0240202D */ daddu $a0, $s2, $zero -/* 8EC2A4 80240484 0C046B4C */ jal get_model_from_list_index -/* 8EC2A8 80240488 46000606 */ mov.s $f24, $f0 -/* 8EC2AC 8024048C 0040882D */ daddu $s1, $v0, $zero -/* 8EC2B0 80240490 96220000 */ lhu $v0, ($s1) -/* 8EC2B4 80240494 30420400 */ andi $v0, $v0, 0x400 -/* 8EC2B8 80240498 1440001E */ bnez $v0, .L80240514 -/* 8EC2BC 8024049C 26300058 */ addiu $s0, $s1, 0x58 -/* 8EC2C0 802404A0 4480A000 */ mtc1 $zero, $f20 -/* 8EC2C4 802404A4 4406B000 */ mfc1 $a2, $f22 -/* 8EC2C8 802404A8 4405A000 */ mfc1 $a1, $f20 -/* 8EC2CC 802404AC 4407A000 */ mfc1 $a3, $f20 -/* 8EC2D0 802404B0 0C019E40 */ jal guTranslateF -/* 8EC2D4 802404B4 0200202D */ daddu $a0, $s0, $zero -/* 8EC2D8 802404B8 4405E000 */ mfc1 $a1, $f28 -/* 8EC2DC 802404BC 4406D000 */ mfc1 $a2, $f26 -/* 8EC2E0 802404C0 4407C000 */ mfc1 $a3, $f24 -/* 8EC2E4 802404C4 0C0900E0 */ jal func_80240380 -/* 8EC2E8 802404C8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC2EC 802404CC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC2F0 802404D0 0200282D */ daddu $a1, $s0, $zero -/* 8EC2F4 802404D4 0C019D80 */ jal guMtxCatF -/* 8EC2F8 802404D8 0200302D */ daddu $a2, $s0, $zero -/* 8EC2FC 802404DC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC300 802404E0 4600B587 */ neg.s $f22, $f22 -/* 8EC304 802404E4 4405A000 */ mfc1 $a1, $f20 -/* 8EC308 802404E8 4406B000 */ mfc1 $a2, $f22 -/* 8EC30C 802404EC 0C019E40 */ jal guTranslateF -/* 8EC310 802404F0 00A0382D */ daddu $a3, $a1, $zero -/* 8EC314 802404F4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC318 802404F8 0200282D */ daddu $a1, $s0, $zero -/* 8EC31C 802404FC 0C019D80 */ jal guMtxCatF -/* 8EC320 80240500 00A0302D */ daddu $a2, $a1, $zero -/* 8EC324 80240504 96220000 */ lhu $v0, ($s1) -/* 8EC328 80240508 34421400 */ ori $v0, $v0, 0x1400 -/* 8EC32C 8024050C 08090163 */ j .L8024058C -/* 8EC330 80240510 A6220000 */ sh $v0, ($s1) -.L80240514: -/* 8EC334 80240514 4480A000 */ mtc1 $zero, $f20 -/* 8EC338 80240518 4406B000 */ mfc1 $a2, $f22 -/* 8EC33C 8024051C 4405A000 */ mfc1 $a1, $f20 -/* 8EC340 80240520 4407A000 */ mfc1 $a3, $f20 -/* 8EC344 80240524 0C019E40 */ jal guTranslateF -/* 8EC348 80240528 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC34C 8024052C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC350 80240530 26300058 */ addiu $s0, $s1, 0x58 -/* 8EC354 80240534 0200282D */ daddu $a1, $s0, $zero -/* 8EC358 80240538 0C019D80 */ jal guMtxCatF -/* 8EC35C 8024053C 0200302D */ daddu $a2, $s0, $zero -/* 8EC360 80240540 4405E000 */ mfc1 $a1, $f28 -/* 8EC364 80240544 4406D000 */ mfc1 $a2, $f26 -/* 8EC368 80240548 4407C000 */ mfc1 $a3, $f24 -/* 8EC36C 8024054C 0C0900E0 */ jal func_80240380 -/* 8EC370 80240550 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC374 80240554 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC378 80240558 0200282D */ daddu $a1, $s0, $zero -/* 8EC37C 8024055C 0C019D80 */ jal guMtxCatF -/* 8EC380 80240560 0200302D */ daddu $a2, $s0, $zero -/* 8EC384 80240564 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC388 80240568 4600B587 */ neg.s $f22, $f22 -/* 8EC38C 8024056C 4405A000 */ mfc1 $a1, $f20 -/* 8EC390 80240570 4406B000 */ mfc1 $a2, $f22 -/* 8EC394 80240574 0C019E40 */ jal guTranslateF -/* 8EC398 80240578 00A0382D */ daddu $a3, $a1, $zero -/* 8EC39C 8024057C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EC3A0 80240580 0200282D */ daddu $a1, $s0, $zero -/* 8EC3A4 80240584 0C019D80 */ jal guMtxCatF -/* 8EC3A8 80240588 00A0302D */ daddu $a2, $a1, $zero -.L8024058C: -/* 8EC3AC 8024058C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8EC3B0 80240590 8FB20058 */ lw $s2, 0x58($sp) -/* 8EC3B4 80240594 8FB10054 */ lw $s1, 0x54($sp) -/* 8EC3B8 80240598 8FB00050 */ lw $s0, 0x50($sp) -/* 8EC3BC 8024059C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8EC3C0 802405A0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8EC3C4 802405A4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8EC3C8 802405A8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8EC3CC 802405AC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8EC3D0 802405B0 24020002 */ addiu $v0, $zero, 2 -/* 8EC3D4 802405B4 03E00008 */ jr $ra -/* 8EC3D8 802405B8 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802403F0_8EC210.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802403F0_8EC210.s new file mode 100644 index 0000000000..f58ae7013b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802403F0_8EC210.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403F0_8EC210 +/* 8EC210 802403F0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8EC214 802403F4 AFB10054 */ sw $s1, 0x54($sp) +/* 8EC218 802403F8 0080882D */ daddu $s1, $a0, $zero +/* 8EC21C 802403FC AFBF005C */ sw $ra, 0x5c($sp) +/* 8EC220 80240400 AFB20058 */ sw $s2, 0x58($sp) +/* 8EC224 80240404 AFB00050 */ sw $s0, 0x50($sp) +/* 8EC228 80240408 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8EC22C 8024040C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8EC230 80240410 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8EC234 80240414 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8EC238 80240418 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8EC23C 8024041C 8E30000C */ lw $s0, 0xc($s1) +/* 8EC240 80240420 8E050000 */ lw $a1, ($s0) +/* 8EC244 80240424 0C0B1EAF */ jal get_variable +/* 8EC248 80240428 26100004 */ addiu $s0, $s0, 4 +/* 8EC24C 8024042C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8EC250 80240430 0040202D */ daddu $a0, $v0, $zero +/* 8EC254 80240434 8E050000 */ lw $a1, ($s0) +/* 8EC258 80240438 26100004 */ addiu $s0, $s0, 4 +/* 8EC25C 8024043C 0220202D */ daddu $a0, $s1, $zero +/* 8EC260 80240440 0C0B210B */ jal get_float_variable +/* 8EC264 80240444 0040902D */ daddu $s2, $v0, $zero +/* 8EC268 80240448 8E050000 */ lw $a1, ($s0) +/* 8EC26C 8024044C 26100004 */ addiu $s0, $s0, 4 +/* 8EC270 80240450 0220202D */ daddu $a0, $s1, $zero +/* 8EC274 80240454 0C0B210B */ jal get_float_variable +/* 8EC278 80240458 46000706 */ mov.s $f28, $f0 +/* 8EC27C 8024045C 8E050000 */ lw $a1, ($s0) +/* 8EC280 80240460 26100004 */ addiu $s0, $s0, 4 +/* 8EC284 80240464 0220202D */ daddu $a0, $s1, $zero +/* 8EC288 80240468 0C0B210B */ jal get_float_variable +/* 8EC28C 8024046C 46000686 */ mov.s $f26, $f0 +/* 8EC290 80240470 0220202D */ daddu $a0, $s1, $zero +/* 8EC294 80240474 8E050000 */ lw $a1, ($s0) +/* 8EC298 80240478 0C0B210B */ jal get_float_variable +/* 8EC29C 8024047C 46000586 */ mov.s $f22, $f0 +/* 8EC2A0 80240480 0240202D */ daddu $a0, $s2, $zero +/* 8EC2A4 80240484 0C046B4C */ jal get_model_from_list_index +/* 8EC2A8 80240488 46000606 */ mov.s $f24, $f0 +/* 8EC2AC 8024048C 0040882D */ daddu $s1, $v0, $zero +/* 8EC2B0 80240490 96220000 */ lhu $v0, ($s1) +/* 8EC2B4 80240494 30420400 */ andi $v0, $v0, 0x400 +/* 8EC2B8 80240498 1440001E */ bnez $v0, .L80240514 +/* 8EC2BC 8024049C 26300058 */ addiu $s0, $s1, 0x58 +/* 8EC2C0 802404A0 4480A000 */ mtc1 $zero, $f20 +/* 8EC2C4 802404A4 4406B000 */ mfc1 $a2, $f22 +/* 8EC2C8 802404A8 4405A000 */ mfc1 $a1, $f20 +/* 8EC2CC 802404AC 4407A000 */ mfc1 $a3, $f20 +/* 8EC2D0 802404B0 0C019E40 */ jal guTranslateF +/* 8EC2D4 802404B4 0200202D */ daddu $a0, $s0, $zero +/* 8EC2D8 802404B8 4405E000 */ mfc1 $a1, $f28 +/* 8EC2DC 802404BC 4406D000 */ mfc1 $a2, $f26 +/* 8EC2E0 802404C0 4407C000 */ mfc1 $a3, $f24 +/* 8EC2E4 802404C4 0C0900E0 */ jal func_80240380_8EC1A0 +/* 8EC2E8 802404C8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC2EC 802404CC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC2F0 802404D0 0200282D */ daddu $a1, $s0, $zero +/* 8EC2F4 802404D4 0C019D80 */ jal guMtxCatF +/* 8EC2F8 802404D8 0200302D */ daddu $a2, $s0, $zero +/* 8EC2FC 802404DC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC300 802404E0 4600B587 */ neg.s $f22, $f22 +/* 8EC304 802404E4 4405A000 */ mfc1 $a1, $f20 +/* 8EC308 802404E8 4406B000 */ mfc1 $a2, $f22 +/* 8EC30C 802404EC 0C019E40 */ jal guTranslateF +/* 8EC310 802404F0 00A0382D */ daddu $a3, $a1, $zero +/* 8EC314 802404F4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC318 802404F8 0200282D */ daddu $a1, $s0, $zero +/* 8EC31C 802404FC 0C019D80 */ jal guMtxCatF +/* 8EC320 80240500 00A0302D */ daddu $a2, $a1, $zero +/* 8EC324 80240504 96220000 */ lhu $v0, ($s1) +/* 8EC328 80240508 34421400 */ ori $v0, $v0, 0x1400 +/* 8EC32C 8024050C 08090163 */ j .L8024058C +/* 8EC330 80240510 A6220000 */ sh $v0, ($s1) +.L80240514: +/* 8EC334 80240514 4480A000 */ mtc1 $zero, $f20 +/* 8EC338 80240518 4406B000 */ mfc1 $a2, $f22 +/* 8EC33C 8024051C 4405A000 */ mfc1 $a1, $f20 +/* 8EC340 80240520 4407A000 */ mfc1 $a3, $f20 +/* 8EC344 80240524 0C019E40 */ jal guTranslateF +/* 8EC348 80240528 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC34C 8024052C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC350 80240530 26300058 */ addiu $s0, $s1, 0x58 +/* 8EC354 80240534 0200282D */ daddu $a1, $s0, $zero +/* 8EC358 80240538 0C019D80 */ jal guMtxCatF +/* 8EC35C 8024053C 0200302D */ daddu $a2, $s0, $zero +/* 8EC360 80240540 4405E000 */ mfc1 $a1, $f28 +/* 8EC364 80240544 4406D000 */ mfc1 $a2, $f26 +/* 8EC368 80240548 4407C000 */ mfc1 $a3, $f24 +/* 8EC36C 8024054C 0C0900E0 */ jal func_80240380_8EC1A0 +/* 8EC370 80240550 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC374 80240554 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC378 80240558 0200282D */ daddu $a1, $s0, $zero +/* 8EC37C 8024055C 0C019D80 */ jal guMtxCatF +/* 8EC380 80240560 0200302D */ daddu $a2, $s0, $zero +/* 8EC384 80240564 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC388 80240568 4600B587 */ neg.s $f22, $f22 +/* 8EC38C 8024056C 4405A000 */ mfc1 $a1, $f20 +/* 8EC390 80240570 4406B000 */ mfc1 $a2, $f22 +/* 8EC394 80240574 0C019E40 */ jal guTranslateF +/* 8EC398 80240578 00A0382D */ daddu $a3, $a1, $zero +/* 8EC39C 8024057C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EC3A0 80240580 0200282D */ daddu $a1, $s0, $zero +/* 8EC3A4 80240584 0C019D80 */ jal guMtxCatF +/* 8EC3A8 80240588 00A0302D */ daddu $a2, $a1, $zero +.L8024058C: +/* 8EC3AC 8024058C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8EC3B0 80240590 8FB20058 */ lw $s2, 0x58($sp) +/* 8EC3B4 80240594 8FB10054 */ lw $s1, 0x54($sp) +/* 8EC3B8 80240598 8FB00050 */ lw $s0, 0x50($sp) +/* 8EC3BC 8024059C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8EC3C0 802405A0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8EC3C4 802405A4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8EC3C8 802405A8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8EC3CC 802405AC D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8EC3D0 802405B0 24020002 */ addiu $v0, $zero, 2 +/* 8EC3D4 802405B4 03E00008 */ jr $ra +/* 8EC3D8 802405B8 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC.s deleted file mode 100644 index 77d95cdbe8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405BC -/* 8EC3DC 802405BC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 8EC3E0 802405C0 AFB30044 */ sw $s3, 0x44($sp) -/* 8EC3E4 802405C4 3C138026 */ lui $s3, 0x8026 -/* 8EC3E8 802405C8 2673B2AC */ addiu $s3, $s3, -0x4d54 -/* 8EC3EC 802405CC AFBF0048 */ sw $ra, 0x48($sp) -/* 8EC3F0 802405D0 AFB20040 */ sw $s2, 0x40($sp) -/* 8EC3F4 802405D4 AFB1003C */ sw $s1, 0x3c($sp) -/* 8EC3F8 802405D8 AFB00038 */ sw $s0, 0x38($sp) -/* 8EC3FC 802405DC 8E620000 */ lw $v0, ($s3) -/* 8EC400 802405E0 24420014 */ addiu $v0, $v0, 0x14 -/* 8EC404 802405E4 AE620000 */ sw $v0, ($s3) -/* 8EC408 802405E8 28420100 */ slti $v0, $v0, 0x100 -/* 8EC40C 802405EC 14400002 */ bnez $v0, .L802405F8 -/* 8EC410 802405F0 240200FF */ addiu $v0, $zero, 0xff -/* 8EC414 802405F4 AE620000 */ sw $v0, ($s3) -.L802405F8: -/* 8EC418 802405F8 3C108026 */ lui $s0, 0x8026 -/* 8EC41C 802405FC 2610B2B0 */ addiu $s0, $s0, -0x4d50 -/* 8EC420 80240600 8E040000 */ lw $a0, ($s0) -/* 8EC424 80240604 8E07000C */ lw $a3, 0xc($s0) -/* 8EC428 80240608 24020055 */ addiu $v0, $zero, 0x55 -/* 8EC42C 8024060C AFA20018 */ sw $v0, 0x18($sp) -/* 8EC430 80240610 24020061 */ addiu $v0, $zero, 0x61 -/* 8EC434 80240614 24120140 */ addiu $s2, $zero, 0x140 -/* 8EC438 80240618 AFA2001C */ sw $v0, 0x1c($sp) -/* 8EC43C 8024061C AFA00020 */ sw $zero, 0x20($sp) -/* 8EC440 80240620 AFA00024 */ sw $zero, 0x24($sp) -/* 8EC444 80240624 AFB20028 */ sw $s2, 0x28($sp) -/* 8EC448 80240628 96050008 */ lhu $a1, 8($s0) -/* 8EC44C 8024062C 241100F0 */ addiu $s1, $zero, 0xf0 -/* 8EC450 80240630 AFB1002C */ sw $s1, 0x2c($sp) -/* 8EC454 80240634 8E020010 */ lw $v0, 0x10($s0) -/* 8EC458 80240638 9606000A */ lhu $a2, 0xa($s0) -/* 8EC45C 8024063C 8E030004 */ lw $v1, 4($s0) -/* 8EC460 80240640 92680003 */ lbu $t0, 3($s3) -/* 8EC464 80240644 AFA20010 */ sw $v0, 0x10($sp) -/* 8EC468 80240648 AFA30014 */ sw $v1, 0x14($sp) -/* 8EC46C 8024064C 0C04BA68 */ jal func_8012E9A0 -/* 8EC470 80240650 AFA80030 */ sw $t0, 0x30($sp) -/* 8EC474 80240654 8E040014 */ lw $a0, 0x14($s0) -/* 8EC478 80240658 8E070020 */ lw $a3, 0x20($s0) -/* 8EC47C 8024065C 240200A0 */ addiu $v0, $zero, 0xa0 -/* 8EC480 80240660 AFA20018 */ sw $v0, 0x18($sp) -/* 8EC484 80240664 9605001C */ lhu $a1, 0x1c($s0) -/* 8EC488 80240668 24020066 */ addiu $v0, $zero, 0x66 -/* 8EC48C 8024066C AFA2001C */ sw $v0, 0x1c($sp) -/* 8EC490 80240670 AFA00020 */ sw $zero, 0x20($sp) -/* 8EC494 80240674 AFA00024 */ sw $zero, 0x24($sp) -/* 8EC498 80240678 AFB20028 */ sw $s2, 0x28($sp) -/* 8EC49C 8024067C AFB1002C */ sw $s1, 0x2c($sp) -/* 8EC4A0 80240680 8E020024 */ lw $v0, 0x24($s0) -/* 8EC4A4 80240684 9606001E */ lhu $a2, 0x1e($s0) -/* 8EC4A8 80240688 8E030018 */ lw $v1, 0x18($s0) -/* 8EC4AC 8024068C 92680003 */ lbu $t0, 3($s3) -/* 8EC4B0 80240690 AFA20010 */ sw $v0, 0x10($sp) -/* 8EC4B4 80240694 AFA30014 */ sw $v1, 0x14($sp) -/* 8EC4B8 80240698 0C04BA68 */ jal func_8012E9A0 -/* 8EC4BC 8024069C AFA80030 */ sw $t0, 0x30($sp) -/* 8EC4C0 802406A0 8FBF0048 */ lw $ra, 0x48($sp) -/* 8EC4C4 802406A4 8FB30044 */ lw $s3, 0x44($sp) -/* 8EC4C8 802406A8 8FB20040 */ lw $s2, 0x40($sp) -/* 8EC4CC 802406AC 8FB1003C */ lw $s1, 0x3c($sp) -/* 8EC4D0 802406B0 8FB00038 */ lw $s0, 0x38($sp) -/* 8EC4D4 802406B4 03E00008 */ jr $ra -/* 8EC4D8 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC_8EC3DC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC_8EC3DC.s new file mode 100644 index 0000000000..8462df87a1 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802405BC_8EC3DC.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405BC_8EC3DC +/* 8EC3DC 802405BC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 8EC3E0 802405C0 AFB30044 */ sw $s3, 0x44($sp) +/* 8EC3E4 802405C4 3C138026 */ lui $s3, 0x8026 +/* 8EC3E8 802405C8 2673B2AC */ addiu $s3, $s3, -0x4d54 +/* 8EC3EC 802405CC AFBF0048 */ sw $ra, 0x48($sp) +/* 8EC3F0 802405D0 AFB20040 */ sw $s2, 0x40($sp) +/* 8EC3F4 802405D4 AFB1003C */ sw $s1, 0x3c($sp) +/* 8EC3F8 802405D8 AFB00038 */ sw $s0, 0x38($sp) +/* 8EC3FC 802405DC 8E620000 */ lw $v0, ($s3) +/* 8EC400 802405E0 24420014 */ addiu $v0, $v0, 0x14 +/* 8EC404 802405E4 AE620000 */ sw $v0, ($s3) +/* 8EC408 802405E8 28420100 */ slti $v0, $v0, 0x100 +/* 8EC40C 802405EC 14400002 */ bnez $v0, .L802405F8 +/* 8EC410 802405F0 240200FF */ addiu $v0, $zero, 0xff +/* 8EC414 802405F4 AE620000 */ sw $v0, ($s3) +.L802405F8: +/* 8EC418 802405F8 3C108026 */ lui $s0, 0x8026 +/* 8EC41C 802405FC 2610B2B0 */ addiu $s0, $s0, -0x4d50 +/* 8EC420 80240600 8E040000 */ lw $a0, ($s0) +/* 8EC424 80240604 8E07000C */ lw $a3, 0xc($s0) +/* 8EC428 80240608 24020055 */ addiu $v0, $zero, 0x55 +/* 8EC42C 8024060C AFA20018 */ sw $v0, 0x18($sp) +/* 8EC430 80240610 24020061 */ addiu $v0, $zero, 0x61 +/* 8EC434 80240614 24120140 */ addiu $s2, $zero, 0x140 +/* 8EC438 80240618 AFA2001C */ sw $v0, 0x1c($sp) +/* 8EC43C 8024061C AFA00020 */ sw $zero, 0x20($sp) +/* 8EC440 80240620 AFA00024 */ sw $zero, 0x24($sp) +/* 8EC444 80240624 AFB20028 */ sw $s2, 0x28($sp) +/* 8EC448 80240628 96050008 */ lhu $a1, 8($s0) +/* 8EC44C 8024062C 241100F0 */ addiu $s1, $zero, 0xf0 +/* 8EC450 80240630 AFB1002C */ sw $s1, 0x2c($sp) +/* 8EC454 80240634 8E020010 */ lw $v0, 0x10($s0) +/* 8EC458 80240638 9606000A */ lhu $a2, 0xa($s0) +/* 8EC45C 8024063C 8E030004 */ lw $v1, 4($s0) +/* 8EC460 80240640 92680003 */ lbu $t0, 3($s3) +/* 8EC464 80240644 AFA20010 */ sw $v0, 0x10($sp) +/* 8EC468 80240648 AFA30014 */ sw $v1, 0x14($sp) +/* 8EC46C 8024064C 0C04BA68 */ jal func_8012E9A0 +/* 8EC470 80240650 AFA80030 */ sw $t0, 0x30($sp) +/* 8EC474 80240654 8E040014 */ lw $a0, 0x14($s0) +/* 8EC478 80240658 8E070020 */ lw $a3, 0x20($s0) +/* 8EC47C 8024065C 240200A0 */ addiu $v0, $zero, 0xa0 +/* 8EC480 80240660 AFA20018 */ sw $v0, 0x18($sp) +/* 8EC484 80240664 9605001C */ lhu $a1, 0x1c($s0) +/* 8EC488 80240668 24020066 */ addiu $v0, $zero, 0x66 +/* 8EC48C 8024066C AFA2001C */ sw $v0, 0x1c($sp) +/* 8EC490 80240670 AFA00020 */ sw $zero, 0x20($sp) +/* 8EC494 80240674 AFA00024 */ sw $zero, 0x24($sp) +/* 8EC498 80240678 AFB20028 */ sw $s2, 0x28($sp) +/* 8EC49C 8024067C AFB1002C */ sw $s1, 0x2c($sp) +/* 8EC4A0 80240680 8E020024 */ lw $v0, 0x24($s0) +/* 8EC4A4 80240684 9606001E */ lhu $a2, 0x1e($s0) +/* 8EC4A8 80240688 8E030018 */ lw $v1, 0x18($s0) +/* 8EC4AC 8024068C 92680003 */ lbu $t0, 3($s3) +/* 8EC4B0 80240690 AFA20010 */ sw $v0, 0x10($sp) +/* 8EC4B4 80240694 AFA30014 */ sw $v1, 0x14($sp) +/* 8EC4B8 80240698 0C04BA68 */ jal func_8012E9A0 +/* 8EC4BC 8024069C AFA80030 */ sw $t0, 0x30($sp) +/* 8EC4C0 802406A0 8FBF0048 */ lw $ra, 0x48($sp) +/* 8EC4C4 802406A4 8FB30044 */ lw $s3, 0x44($sp) +/* 8EC4C8 802406A8 8FB20040 */ lw $s2, 0x40($sp) +/* 8EC4CC 802406AC 8FB1003C */ lw $s1, 0x3c($sp) +/* 8EC4D0 802406B0 8FB00038 */ lw $s0, 0x38($sp) +/* 8EC4D4 802406B4 03E00008 */ jr $ra +/* 8EC4D8 802406B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8.s deleted file mode 100644 index 3da4af728f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8.s +++ /dev/null @@ -1,303 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C8 -/* 8EC4E8 802406C8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8EC4EC 802406CC AFB40028 */ sw $s4, 0x28($sp) -/* 8EC4F0 802406D0 0080A02D */ daddu $s4, $a0, $zero -/* 8EC4F4 802406D4 AFBF003C */ sw $ra, 0x3c($sp) -/* 8EC4F8 802406D8 AFBE0038 */ sw $fp, 0x38($sp) -/* 8EC4FC 802406DC AFB70034 */ sw $s7, 0x34($sp) -/* 8EC500 802406E0 AFB60030 */ sw $s6, 0x30($sp) -/* 8EC504 802406E4 AFB5002C */ sw $s5, 0x2c($sp) -/* 8EC508 802406E8 AFB30024 */ sw $s3, 0x24($sp) -/* 8EC50C 802406EC AFB20020 */ sw $s2, 0x20($sp) -/* 8EC510 802406F0 AFB1001C */ sw $s1, 0x1c($sp) -/* 8EC514 802406F4 10A00002 */ beqz $a1, .L80240700 -/* 8EC518 802406F8 AFB00018 */ sw $s0, 0x18($sp) -/* 8EC51C 802406FC AE800070 */ sw $zero, 0x70($s4) -.L80240700: -/* 8EC520 80240700 8E870070 */ lw $a3, 0x70($s4) -/* 8EC524 80240704 10E00006 */ beqz $a3, .L80240720 -/* 8EC528 80240708 AFA70010 */ sw $a3, 0x10($sp) -/* 8EC52C 8024070C 24020001 */ addiu $v0, $zero, 1 -/* 8EC530 80240710 10E20074 */ beq $a3, $v0, .L802408E4 -/* 8EC534 80240714 0000102D */ daddu $v0, $zero, $zero -/* 8EC538 80240718 080902BC */ j .L80240AF0 -/* 8EC53C 8024071C 00000000 */ nop -.L80240720: -/* 8EC540 80240720 0000B82D */ daddu $s7, $zero, $zero -/* 8EC544 80240724 02E0902D */ daddu $s2, $s7, $zero -/* 8EC548 80240728 241E0001 */ addiu $fp, $zero, 1 -/* 8EC54C 8024072C 3C168024 */ lui $s6, 0x8024 -/* 8EC550 80240730 26D64D54 */ addiu $s6, $s6, 0x4d54 -/* 8EC554 80240734 3C158024 */ lui $s5, 0x8024 -/* 8EC558 80240738 26B54D24 */ addiu $s5, $s5, 0x4d24 -/* 8EC55C 8024073C 3C118025 */ lui $s1, 0x8025 -/* 8EC560 80240740 26313060 */ addiu $s1, $s1, 0x3060 -.L80240744: -/* 8EC564 80240744 8EB00000 */ lw $s0, ($s5) -/* 8EC568 80240748 2402FFFE */ addiu $v0, $zero, -2 -/* 8EC56C 8024074C 12020011 */ beq $s0, $v0, .L80240794 -/* 8EC570 80240750 0000982D */ daddu $s3, $zero, $zero -/* 8EC574 80240754 2A02FFFF */ slti $v0, $s0, -1 -/* 8EC578 80240758 10400005 */ beqz $v0, .L80240770 -/* 8EC57C 8024075C 2402FFFD */ addiu $v0, $zero, -3 -/* 8EC580 80240760 12020014 */ beq $s0, $v0, .L802407B4 -/* 8EC584 80240764 0000202D */ daddu $a0, $zero, $zero -/* 8EC588 80240768 080901FE */ j .L802407F8 -/* 8EC58C 8024076C 3C05F5DE */ lui $a1, 0xf5de -.L80240770: -/* 8EC590 80240770 2402FFFF */ addiu $v0, $zero, -1 -/* 8EC594 80240774 1602001F */ bne $s0, $v0, .L802407F4 -/* 8EC598 80240778 0000202D */ daddu $a0, $zero, $zero -/* 8EC59C 8024077C 3C028011 */ lui $v0, 0x8011 -/* 8EC5A0 80240780 9442F552 */ lhu $v0, -0xaae($v0) -/* 8EC5A4 80240784 10400021 */ beqz $v0, .L8024080C -/* 8EC5A8 80240788 00000000 */ nop -/* 8EC5AC 8024078C 08090203 */ j .L8024080C -/* 8EC5B0 80240790 24130001 */ addiu $s3, $zero, 1 -.L80240794: -/* 8EC5B4 80240794 0000202D */ daddu $a0, $zero, $zero -/* 8EC5B8 80240798 3C05F840 */ lui $a1, 0xf840 -/* 8EC5BC 8024079C 0C0B1EAF */ jal get_variable -/* 8EC5C0 802407A0 34A55C9A */ ori $a1, $a1, 0x5c9a -/* 8EC5C4 802407A4 10400019 */ beqz $v0, .L8024080C -/* 8EC5C8 802407A8 00000000 */ nop -/* 8EC5CC 802407AC 08090203 */ j .L8024080C -/* 8EC5D0 802407B0 24130001 */ addiu $s3, $zero, 1 -.L802407B4: -/* 8EC5D4 802407B4 0000802D */ daddu $s0, $zero, $zero -/* 8EC5D8 802407B8 0200202D */ daddu $a0, $s0, $zero -/* 8EC5DC 802407BC 3C05F5DE */ lui $a1, 0xf5de -/* 8EC5E0 802407C0 0C0B1EAF */ jal get_variable -/* 8EC5E4 802407C4 34A50180 */ ori $a1, $a1, 0x180 -/* 8EC5E8 802407C8 28420006 */ slti $v0, $v0, 6 -/* 8EC5EC 802407CC 14400005 */ bnez $v0, .L802407E4 -/* 8EC5F0 802407D0 0200202D */ daddu $a0, $s0, $zero -/* 8EC5F4 802407D4 3C05F840 */ lui $a1, 0xf840 -/* 8EC5F8 802407D8 0C0B1EAF */ jal get_variable -/* 8EC5FC 802407DC 34A55CF0 */ ori $a1, $a1, 0x5cf0 -/* 8EC600 802407E0 0002802B */ sltu $s0, $zero, $v0 -.L802407E4: -/* 8EC604 802407E4 12000009 */ beqz $s0, .L8024080C -/* 8EC608 802407E8 00000000 */ nop -/* 8EC60C 802407EC 08090203 */ j .L8024080C -/* 8EC610 802407F0 24130001 */ addiu $s3, $zero, 1 -.L802407F4: -/* 8EC614 802407F4 3C05F5DE */ lui $a1, 0xf5de -.L802407F8: -/* 8EC618 802407F8 0C0B1EAF */ jal get_variable -/* 8EC61C 802407FC 34A50180 */ ori $a1, $a1, 0x180 -/* 8EC620 80240800 0050102A */ slt $v0, $v0, $s0 -/* 8EC624 80240804 50400001 */ beql $v0, $zero, .L8024080C -/* 8EC628 80240808 24130001 */ addiu $s3, $zero, 1 -.L8024080C: -/* 8EC62C 8024080C 1260001A */ beqz $s3, .L80240878 -/* 8EC630 80240810 0240802D */ daddu $s0, $s2, $zero -/* 8EC634 80240814 3C028008 */ lui $v0, 0x8008 -/* 8EC638 80240818 244222F8 */ addiu $v0, $v0, 0x22f8 -/* 8EC63C 8024081C AE220000 */ sw $v0, ($s1) -/* 8EC640 80240820 AE320108 */ sw $s2, 0x108($s1) -/* 8EC644 80240824 AE3E018C */ sw $fp, 0x18c($s1) -/* 8EC648 80240828 8EC20000 */ lw $v0, ($s6) -/* 8EC64C 8024082C AE200294 */ sw $zero, 0x294($s1) -/* 8EC650 80240830 06410002 */ bgez $s2, .L8024083C -/* 8EC654 80240834 AE220084 */ sw $v0, 0x84($s1) -/* 8EC658 80240838 26500007 */ addiu $s0, $s2, 7 -.L8024083C: -/* 8EC65C 8024083C 001080C3 */ sra $s0, $s0, 3 -/* 8EC660 80240840 0C05154E */ jal get_global_byte -/* 8EC664 80240844 2604000E */ addiu $a0, $s0, 0xe -/* 8EC668 80240848 001080C0 */ sll $s0, $s0, 3 -/* 8EC66C 8024084C 02508023 */ subu $s0, $s2, $s0 -/* 8EC670 80240850 021E8004 */ sllv $s0, $fp, $s0 -/* 8EC674 80240854 00508024 */ and $s0, $v0, $s0 -/* 8EC678 80240858 12000005 */ beqz $s0, .L80240870 -/* 8EC67C 8024085C AE200210 */ sw $zero, 0x210($s1) -/* 8EC680 80240860 3C028008 */ lui $v0, 0x8008 -/* 8EC684 80240864 24422328 */ addiu $v0, $v0, 0x2328 -/* 8EC688 80240868 AE3E0210 */ sw $fp, 0x210($s1) -/* 8EC68C 8024086C AE220000 */ sw $v0, ($s1) -.L80240870: -/* 8EC690 80240870 26310004 */ addiu $s1, $s1, 4 -/* 8EC694 80240874 26F70001 */ addiu $s7, $s7, 1 -.L80240878: -/* 8EC698 80240878 26D60004 */ addiu $s6, $s6, 4 -/* 8EC69C 8024087C 26520001 */ addiu $s2, $s2, 1 -/* 8EC6A0 80240880 2A42000C */ slti $v0, $s2, 0xc -/* 8EC6A4 80240884 1440FFAF */ bnez $v0, .L80240744 -/* 8EC6A8 80240888 26B50004 */ addiu $s5, $s5, 4 -/* 8EC6AC 8024088C 16E00004 */ bnez $s7, .L802408A0 -/* 8EC6B0 80240890 2402000B */ addiu $v0, $zero, 0xb -/* 8EC6B4 80240894 AE800084 */ sw $zero, 0x84($s4) -/* 8EC6B8 80240898 080902BC */ j .L80240AF0 -/* 8EC6BC 8024089C 24020002 */ addiu $v0, $zero, 2 -.L802408A0: -/* 8EC6C0 802408A0 3C018025 */ lui $at, 0x8025 -/* 8EC6C4 802408A4 AC223378 */ sw $v0, 0x3378($at) -/* 8EC6C8 802408A8 3C018025 */ lui $at, 0x8025 -/* 8EC6CC 802408AC AC373384 */ sw $s7, 0x3384($at) -/* 8EC6D0 802408B0 8E82007C */ lw $v0, 0x7c($s4) -/* 8EC6D4 802408B4 3C048025 */ lui $a0, 0x8025 -/* 8EC6D8 802408B8 24843060 */ addiu $a0, $a0, 0x3060 -/* 8EC6DC 802408BC 0C03D390 */ jal func_800F4E40 -/* 8EC6E0 802408C0 AC820328 */ sw $v0, 0x328($a0) -/* 8EC6E4 802408C4 0C03A631 */ jal func_800E98C4 -/* 8EC6E8 802408C8 00000000 */ nop -/* 8EC6EC 802408CC 0C03A5EE */ jal func_800E97B8 -/* 8EC6F0 802408D0 00000000 */ nop -/* 8EC6F4 802408D4 24020001 */ addiu $v0, $zero, 1 -/* 8EC6F8 802408D8 AE800074 */ sw $zero, 0x74($s4) -/* 8EC6FC 802408DC 080902BB */ j .L80240AEC -/* 8EC700 802408E0 AE820070 */ sw $v0, 0x70($s4) -.L802408E4: -/* 8EC704 802408E4 8E820074 */ lw $v0, 0x74($s4) -/* 8EC708 802408E8 14400009 */ bnez $v0, .L80240910 -/* 8EC70C 802408EC 24420001 */ addiu $v0, $v0, 1 -/* 8EC710 802408F0 3C028025 */ lui $v0, 0x8025 -/* 8EC714 802408F4 8442338C */ lh $v0, 0x338c($v0) -/* 8EC718 802408F8 1040007C */ beqz $v0, .L80240AEC -/* 8EC71C 802408FC AE820078 */ sw $v0, 0x78($s4) -/* 8EC720 80240900 0C03C4EC */ jal func_800F13B0 -/* 8EC724 80240904 00000000 */ nop -/* 8EC728 80240908 8E820074 */ lw $v0, 0x74($s4) -/* 8EC72C 8024090C 24420001 */ addiu $v0, $v0, 1 -.L80240910: -/* 8EC730 80240910 AE820074 */ sw $v0, 0x74($s4) -/* 8EC734 80240914 2842000F */ slti $v0, $v0, 0xf -/* 8EC738 80240918 14400075 */ bnez $v0, .L80240AF0 -/* 8EC73C 8024091C 0000102D */ daddu $v0, $zero, $zero -/* 8EC740 80240920 0C03C54E */ jal func_800F1538 -/* 8EC744 80240924 00000000 */ nop -/* 8EC748 80240928 8E830078 */ lw $v1, 0x78($s4) -/* 8EC74C 8024092C 240200FF */ addiu $v0, $zero, 0xff -/* 8EC750 80240930 14620005 */ bne $v1, $v0, .L80240948 -/* 8EC754 80240934 2463FFFF */ addiu $v1, $v1, -1 -/* 8EC758 80240938 2402FFFF */ addiu $v0, $zero, -1 -/* 8EC75C 8024093C AE820084 */ sw $v0, 0x84($s4) -/* 8EC760 80240940 080902BC */ j .L80240AF0 -/* 8EC764 80240944 24020002 */ addiu $v0, $zero, 2 -.L80240948: -/* 8EC768 80240948 8E820078 */ lw $v0, 0x78($s4) -/* 8EC76C 8024094C 3C078025 */ lui $a3, 0x8025 -/* 8EC770 80240950 24E73060 */ addiu $a3, $a3, 0x3060 -/* 8EC774 80240954 AE83007C */ sw $v1, 0x7c($s4) -/* 8EC778 80240958 2442FFFF */ addiu $v0, $v0, -1 -/* 8EC77C 8024095C 00021080 */ sll $v0, $v0, 2 -/* 8EC780 80240960 00471021 */ addu $v0, $v0, $a3 -/* 8EC784 80240964 8C5E0108 */ lw $fp, 0x108($v0) -/* 8EC788 80240968 001E1080 */ sll $v0, $fp, 2 -/* 8EC78C 8024096C 3C018024 */ lui $at, 0x8024 -/* 8EC790 80240970 00220821 */ addu $at, $at, $v0 -/* 8EC794 80240974 8C224D84 */ lw $v0, 0x4d84($at) -/* 8EC798 80240978 03C0802D */ daddu $s0, $fp, $zero -/* 8EC79C 8024097C 07C10002 */ bgez $fp, .L80240988 -/* 8EC7A0 80240980 AE820084 */ sw $v0, 0x84($s4) -/* 8EC7A4 80240984 27D00007 */ addiu $s0, $fp, 7 -.L80240988: -/* 8EC7A8 80240988 001080C3 */ sra $s0, $s0, 3 -/* 8EC7AC 8024098C 2611000E */ addiu $s1, $s0, 0xe -/* 8EC7B0 80240990 0C05154E */ jal get_global_byte -/* 8EC7B4 80240994 0220202D */ daddu $a0, $s1, $zero -/* 8EC7B8 80240998 0220202D */ daddu $a0, $s1, $zero -/* 8EC7BC 8024099C 001080C0 */ sll $s0, $s0, 3 -/* 8EC7C0 802409A0 8FA70010 */ lw $a3, 0x10($sp) -/* 8EC7C4 802409A4 03D08023 */ subu $s0, $fp, $s0 -/* 8EC7C8 802409A8 02078004 */ sllv $s0, $a3, $s0 -/* 8EC7CC 802409AC 0C051548 */ jal set_global_byte -/* 8EC7D0 802409B0 00502825 */ or $a1, $v0, $s0 -/* 8EC7D4 802409B4 24020003 */ addiu $v0, $zero, 3 -/* 8EC7D8 802409B8 17C20005 */ bne $fp, $v0, .L802409D0 -/* 8EC7DC 802409BC 0000202D */ daddu $a0, $zero, $zero -/* 8EC7E0 802409C0 3C05F840 */ lui $a1, 0xf840 -/* 8EC7E4 802409C4 34A55BE7 */ ori $a1, $a1, 0x5be7 -/* 8EC7E8 802409C8 0C0B2026 */ jal set_variable -/* 8EC7EC 802409CC 24060001 */ addiu $a2, $zero, 1 -.L802409D0: -/* 8EC7F0 802409D0 3C148025 */ lui $s4, 0x8025 -/* 8EC7F4 802409D4 26943390 */ addiu $s4, $s4, 0x3390 -/* 8EC7F8 802409D8 0280302D */ daddu $a2, $s4, $zero -/* 8EC7FC 802409DC 3C138024 */ lui $s3, 0x8024 -/* 8EC800 802409E0 26734DB4 */ addiu $s3, $s3, 0x4db4 -/* 8EC804 802409E4 3C120011 */ lui $s2, 0x11 -/* 8EC808 802409E8 2652F1B0 */ addiu $s2, $s2, -0xe50 -/* 8EC80C 802409EC 8E650000 */ lw $a1, ($s3) -/* 8EC810 802409F0 26553D86 */ addiu $s5, $s2, 0x3d86 -/* 8EC814 802409F4 00B22021 */ addu $a0, $a1, $s2 -/* 8EC818 802409F8 0C00A5CF */ jal dma_copy -/* 8EC81C 802409FC 00B52821 */ addu $a1, $a1, $s5 -/* 8EC820 80240A00 3C108025 */ lui $s0, 0x8025 -/* 8EC824 80240A04 26107118 */ addiu $s0, $s0, 0x7118 -/* 8EC828 80240A08 0200302D */ daddu $a2, $s0, $zero -/* 8EC82C 80240A0C 8E650004 */ lw $a1, 4($s3) -/* 8EC830 80240A10 26560200 */ addiu $s6, $s2, 0x200 -/* 8EC834 80240A14 00B22021 */ addu $a0, $a1, $s2 -/* 8EC838 80240A18 0C00A5CF */ jal dma_copy -/* 8EC83C 80240A1C 00B62821 */ addu $a1, $a1, $s6 -/* 8EC840 80240A20 3C118026 */ lui $s1, 0x8026 -/* 8EC844 80240A24 2631B2B0 */ addiu $s1, $s1, -0x4d50 -/* 8EC848 80240A28 24020096 */ addiu $v0, $zero, 0x96 -/* 8EC84C 80240A2C A6220008 */ sh $v0, 8($s1) -/* 8EC850 80240A30 24020069 */ addiu $v0, $zero, 0x69 -/* 8EC854 80240A34 24170002 */ addiu $s7, $zero, 2 -/* 8EC858 80240A38 AE300004 */ sw $s0, 4($s1) -/* 8EC85C 80240A3C 001E8040 */ sll $s0, $fp, 1 -/* 8EC860 80240A40 A622000A */ sh $v0, 0xa($s1) -/* 8EC864 80240A44 02171021 */ addu $v0, $s0, $s7 -/* 8EC868 80240A48 02E21004 */ sllv $v0, $v0, $s7 -/* 8EC86C 80240A4C 00531021 */ addu $v0, $v0, $s3 -/* 8EC870 80240A50 AE340000 */ sw $s4, ($s1) -/* 8EC874 80240A54 3C148025 */ lui $s4, 0x8025 -/* 8EC878 80240A58 26947320 */ addiu $s4, $s4, 0x7320 -/* 8EC87C 80240A5C AE37000C */ sw $s7, 0xc($s1) -/* 8EC880 80240A60 AE200010 */ sw $zero, 0x10($s1) -/* 8EC884 80240A64 8C450000 */ lw $a1, ($v0) -/* 8EC888 80240A68 0280302D */ daddu $a2, $s4, $zero -/* 8EC88C 80240A6C 00B22021 */ addu $a0, $a1, $s2 -/* 8EC890 80240A70 0C00A5CF */ jal dma_copy -/* 8EC894 80240A74 00B52821 */ addu $a1, $a1, $s5 -/* 8EC898 80240A78 26100003 */ addiu $s0, $s0, 3 -/* 8EC89C 80240A7C 02F08004 */ sllv $s0, $s0, $s7 -/* 8EC8A0 80240A80 02138021 */ addu $s0, $s0, $s3 -/* 8EC8A4 80240A84 3C138026 */ lui $s3, 0x8026 -/* 8EC8A8 80240A88 2673B0A8 */ addiu $s3, $s3, -0x4f58 -/* 8EC8AC 80240A8C 8E050000 */ lw $a1, ($s0) -/* 8EC8B0 80240A90 0260302D */ daddu $a2, $s3, $zero -/* 8EC8B4 80240A94 00B22021 */ addu $a0, $a1, $s2 -/* 8EC8B8 80240A98 0C00A5CF */ jal dma_copy -/* 8EC8BC 80240A9C 00B62821 */ addu $a1, $a1, $s6 -/* 8EC8C0 80240AA0 0000202D */ daddu $a0, $zero, $zero -/* 8EC8C4 80240AA4 24020046 */ addiu $v0, $zero, 0x46 -/* 8EC8C8 80240AA8 A622001C */ sh $v0, 0x1c($s1) -/* 8EC8CC 80240AAC 2402005F */ addiu $v0, $zero, 0x5f -/* 8EC8D0 80240AB0 AE340014 */ sw $s4, 0x14($s1) -/* 8EC8D4 80240AB4 AE330018 */ sw $s3, 0x18($s1) -/* 8EC8D8 80240AB8 A622001E */ sh $v0, 0x1e($s1) -/* 8EC8DC 80240ABC AE370020 */ sw $s7, 0x20($s1) -/* 8EC8E0 80240AC0 8FA70010 */ lw $a3, 0x10($sp) -/* 8EC8E4 80240AC4 3C058024 */ lui $a1, 0x8024 -/* 8EC8E8 80240AC8 24A505BC */ addiu $a1, $a1, 0x5bc -/* 8EC8EC 80240ACC 0C048C8F */ jal bind_dynamic_entity_7 -/* 8EC8F0 80240AD0 AE270024 */ sw $a3, 0x24($s1) -/* 8EC8F4 80240AD4 3C018026 */ lui $at, 0x8026 -/* 8EC8F8 80240AD8 AC22B2A8 */ sw $v0, -0x4d58($at) -/* 8EC8FC 80240ADC 3C018026 */ lui $at, 0x8026 -/* 8EC900 80240AE0 AC20B2AC */ sw $zero, -0x4d54($at) -/* 8EC904 80240AE4 080902BC */ j .L80240AF0 -/* 8EC908 80240AE8 02E0102D */ daddu $v0, $s7, $zero -.L80240AEC: -/* 8EC90C 80240AEC 0000102D */ daddu $v0, $zero, $zero -.L80240AF0: -/* 8EC910 80240AF0 8FBF003C */ lw $ra, 0x3c($sp) -/* 8EC914 80240AF4 8FBE0038 */ lw $fp, 0x38($sp) -/* 8EC918 80240AF8 8FB70034 */ lw $s7, 0x34($sp) -/* 8EC91C 80240AFC 8FB60030 */ lw $s6, 0x30($sp) -/* 8EC920 80240B00 8FB5002C */ lw $s5, 0x2c($sp) -/* 8EC924 80240B04 8FB40028 */ lw $s4, 0x28($sp) -/* 8EC928 80240B08 8FB30024 */ lw $s3, 0x24($sp) -/* 8EC92C 80240B0C 8FB20020 */ lw $s2, 0x20($sp) -/* 8EC930 80240B10 8FB1001C */ lw $s1, 0x1c($sp) -/* 8EC934 80240B14 8FB00018 */ lw $s0, 0x18($sp) -/* 8EC938 80240B18 03E00008 */ jr $ra -/* 8EC93C 80240B1C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s new file mode 100644 index 0000000000..49b7180b4b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -0,0 +1,303 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406C8_8EC4E8 +/* 8EC4E8 802406C8 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 8EC4EC 802406CC AFB40028 */ sw $s4, 0x28($sp) +/* 8EC4F0 802406D0 0080A02D */ daddu $s4, $a0, $zero +/* 8EC4F4 802406D4 AFBF003C */ sw $ra, 0x3c($sp) +/* 8EC4F8 802406D8 AFBE0038 */ sw $fp, 0x38($sp) +/* 8EC4FC 802406DC AFB70034 */ sw $s7, 0x34($sp) +/* 8EC500 802406E0 AFB60030 */ sw $s6, 0x30($sp) +/* 8EC504 802406E4 AFB5002C */ sw $s5, 0x2c($sp) +/* 8EC508 802406E8 AFB30024 */ sw $s3, 0x24($sp) +/* 8EC50C 802406EC AFB20020 */ sw $s2, 0x20($sp) +/* 8EC510 802406F0 AFB1001C */ sw $s1, 0x1c($sp) +/* 8EC514 802406F4 10A00002 */ beqz $a1, .L80240700 +/* 8EC518 802406F8 AFB00018 */ sw $s0, 0x18($sp) +/* 8EC51C 802406FC AE800070 */ sw $zero, 0x70($s4) +.L80240700: +/* 8EC520 80240700 8E870070 */ lw $a3, 0x70($s4) +/* 8EC524 80240704 10E00006 */ beqz $a3, .L80240720 +/* 8EC528 80240708 AFA70010 */ sw $a3, 0x10($sp) +/* 8EC52C 8024070C 24020001 */ addiu $v0, $zero, 1 +/* 8EC530 80240710 10E20074 */ beq $a3, $v0, .L802408E4 +/* 8EC534 80240714 0000102D */ daddu $v0, $zero, $zero +/* 8EC538 80240718 080902BC */ j .L80240AF0 +/* 8EC53C 8024071C 00000000 */ nop +.L80240720: +/* 8EC540 80240720 0000B82D */ daddu $s7, $zero, $zero +/* 8EC544 80240724 02E0902D */ daddu $s2, $s7, $zero +/* 8EC548 80240728 241E0001 */ addiu $fp, $zero, 1 +/* 8EC54C 8024072C 3C168024 */ lui $s6, 0x8024 +/* 8EC550 80240730 26D64D54 */ addiu $s6, $s6, 0x4d54 +/* 8EC554 80240734 3C158024 */ lui $s5, 0x8024 +/* 8EC558 80240738 26B54D24 */ addiu $s5, $s5, 0x4d24 +/* 8EC55C 8024073C 3C118025 */ lui $s1, 0x8025 +/* 8EC560 80240740 26313060 */ addiu $s1, $s1, 0x3060 +.L80240744: +/* 8EC564 80240744 8EB00000 */ lw $s0, ($s5) +/* 8EC568 80240748 2402FFFE */ addiu $v0, $zero, -2 +/* 8EC56C 8024074C 12020011 */ beq $s0, $v0, .L80240794 +/* 8EC570 80240750 0000982D */ daddu $s3, $zero, $zero +/* 8EC574 80240754 2A02FFFF */ slti $v0, $s0, -1 +/* 8EC578 80240758 10400005 */ beqz $v0, .L80240770 +/* 8EC57C 8024075C 2402FFFD */ addiu $v0, $zero, -3 +/* 8EC580 80240760 12020014 */ beq $s0, $v0, .L802407B4 +/* 8EC584 80240764 0000202D */ daddu $a0, $zero, $zero +/* 8EC588 80240768 080901FE */ j .L802407F8 +/* 8EC58C 8024076C 3C05F5DE */ lui $a1, 0xf5de +.L80240770: +/* 8EC590 80240770 2402FFFF */ addiu $v0, $zero, -1 +/* 8EC594 80240774 1602001F */ bne $s0, $v0, .L802407F4 +/* 8EC598 80240778 0000202D */ daddu $a0, $zero, $zero +/* 8EC59C 8024077C 3C028011 */ lui $v0, 0x8011 +/* 8EC5A0 80240780 9442F552 */ lhu $v0, -0xaae($v0) +/* 8EC5A4 80240784 10400021 */ beqz $v0, .L8024080C +/* 8EC5A8 80240788 00000000 */ nop +/* 8EC5AC 8024078C 08090203 */ j .L8024080C +/* 8EC5B0 80240790 24130001 */ addiu $s3, $zero, 1 +.L80240794: +/* 8EC5B4 80240794 0000202D */ daddu $a0, $zero, $zero +/* 8EC5B8 80240798 3C05F840 */ lui $a1, 0xf840 +/* 8EC5BC 8024079C 0C0B1EAF */ jal get_variable +/* 8EC5C0 802407A0 34A55C9A */ ori $a1, $a1, 0x5c9a +/* 8EC5C4 802407A4 10400019 */ beqz $v0, .L8024080C +/* 8EC5C8 802407A8 00000000 */ nop +/* 8EC5CC 802407AC 08090203 */ j .L8024080C +/* 8EC5D0 802407B0 24130001 */ addiu $s3, $zero, 1 +.L802407B4: +/* 8EC5D4 802407B4 0000802D */ daddu $s0, $zero, $zero +/* 8EC5D8 802407B8 0200202D */ daddu $a0, $s0, $zero +/* 8EC5DC 802407BC 3C05F5DE */ lui $a1, 0xf5de +/* 8EC5E0 802407C0 0C0B1EAF */ jal get_variable +/* 8EC5E4 802407C4 34A50180 */ ori $a1, $a1, 0x180 +/* 8EC5E8 802407C8 28420006 */ slti $v0, $v0, 6 +/* 8EC5EC 802407CC 14400005 */ bnez $v0, .L802407E4 +/* 8EC5F0 802407D0 0200202D */ daddu $a0, $s0, $zero +/* 8EC5F4 802407D4 3C05F840 */ lui $a1, 0xf840 +/* 8EC5F8 802407D8 0C0B1EAF */ jal get_variable +/* 8EC5FC 802407DC 34A55CF0 */ ori $a1, $a1, 0x5cf0 +/* 8EC600 802407E0 0002802B */ sltu $s0, $zero, $v0 +.L802407E4: +/* 8EC604 802407E4 12000009 */ beqz $s0, .L8024080C +/* 8EC608 802407E8 00000000 */ nop +/* 8EC60C 802407EC 08090203 */ j .L8024080C +/* 8EC610 802407F0 24130001 */ addiu $s3, $zero, 1 +.L802407F4: +/* 8EC614 802407F4 3C05F5DE */ lui $a1, 0xf5de +.L802407F8: +/* 8EC618 802407F8 0C0B1EAF */ jal get_variable +/* 8EC61C 802407FC 34A50180 */ ori $a1, $a1, 0x180 +/* 8EC620 80240800 0050102A */ slt $v0, $v0, $s0 +/* 8EC624 80240804 50400001 */ beql $v0, $zero, .L8024080C +/* 8EC628 80240808 24130001 */ addiu $s3, $zero, 1 +.L8024080C: +/* 8EC62C 8024080C 1260001A */ beqz $s3, .L80240878 +/* 8EC630 80240810 0240802D */ daddu $s0, $s2, $zero +/* 8EC634 80240814 3C028008 */ lui $v0, 0x8008 +/* 8EC638 80240818 244222F8 */ addiu $v0, $v0, 0x22f8 +/* 8EC63C 8024081C AE220000 */ sw $v0, ($s1) +/* 8EC640 80240820 AE320108 */ sw $s2, 0x108($s1) +/* 8EC644 80240824 AE3E018C */ sw $fp, 0x18c($s1) +/* 8EC648 80240828 8EC20000 */ lw $v0, ($s6) +/* 8EC64C 8024082C AE200294 */ sw $zero, 0x294($s1) +/* 8EC650 80240830 06410002 */ bgez $s2, .L8024083C +/* 8EC654 80240834 AE220084 */ sw $v0, 0x84($s1) +/* 8EC658 80240838 26500007 */ addiu $s0, $s2, 7 +.L8024083C: +/* 8EC65C 8024083C 001080C3 */ sra $s0, $s0, 3 +/* 8EC660 80240840 0C05154E */ jal get_global_byte +/* 8EC664 80240844 2604000E */ addiu $a0, $s0, 0xe +/* 8EC668 80240848 001080C0 */ sll $s0, $s0, 3 +/* 8EC66C 8024084C 02508023 */ subu $s0, $s2, $s0 +/* 8EC670 80240850 021E8004 */ sllv $s0, $fp, $s0 +/* 8EC674 80240854 00508024 */ and $s0, $v0, $s0 +/* 8EC678 80240858 12000005 */ beqz $s0, .L80240870 +/* 8EC67C 8024085C AE200210 */ sw $zero, 0x210($s1) +/* 8EC680 80240860 3C028008 */ lui $v0, 0x8008 +/* 8EC684 80240864 24422328 */ addiu $v0, $v0, 0x2328 +/* 8EC688 80240868 AE3E0210 */ sw $fp, 0x210($s1) +/* 8EC68C 8024086C AE220000 */ sw $v0, ($s1) +.L80240870: +/* 8EC690 80240870 26310004 */ addiu $s1, $s1, 4 +/* 8EC694 80240874 26F70001 */ addiu $s7, $s7, 1 +.L80240878: +/* 8EC698 80240878 26D60004 */ addiu $s6, $s6, 4 +/* 8EC69C 8024087C 26520001 */ addiu $s2, $s2, 1 +/* 8EC6A0 80240880 2A42000C */ slti $v0, $s2, 0xc +/* 8EC6A4 80240884 1440FFAF */ bnez $v0, .L80240744 +/* 8EC6A8 80240888 26B50004 */ addiu $s5, $s5, 4 +/* 8EC6AC 8024088C 16E00004 */ bnez $s7, .L802408A0 +/* 8EC6B0 80240890 2402000B */ addiu $v0, $zero, 0xb +/* 8EC6B4 80240894 AE800084 */ sw $zero, 0x84($s4) +/* 8EC6B8 80240898 080902BC */ j .L80240AF0 +/* 8EC6BC 8024089C 24020002 */ addiu $v0, $zero, 2 +.L802408A0: +/* 8EC6C0 802408A0 3C018025 */ lui $at, 0x8025 +/* 8EC6C4 802408A4 AC223378 */ sw $v0, 0x3378($at) +/* 8EC6C8 802408A8 3C018025 */ lui $at, 0x8025 +/* 8EC6CC 802408AC AC373384 */ sw $s7, 0x3384($at) +/* 8EC6D0 802408B0 8E82007C */ lw $v0, 0x7c($s4) +/* 8EC6D4 802408B4 3C048025 */ lui $a0, 0x8025 +/* 8EC6D8 802408B8 24843060 */ addiu $a0, $a0, 0x3060 +/* 8EC6DC 802408BC 0C03D390 */ jal func_800F4E40 +/* 8EC6E0 802408C0 AC820328 */ sw $v0, 0x328($a0) +/* 8EC6E4 802408C4 0C03A631 */ jal func_800E98C4 +/* 8EC6E8 802408C8 00000000 */ nop +/* 8EC6EC 802408CC 0C03A5EE */ jal func_800E97B8 +/* 8EC6F0 802408D0 00000000 */ nop +/* 8EC6F4 802408D4 24020001 */ addiu $v0, $zero, 1 +/* 8EC6F8 802408D8 AE800074 */ sw $zero, 0x74($s4) +/* 8EC6FC 802408DC 080902BB */ j .L80240AEC +/* 8EC700 802408E0 AE820070 */ sw $v0, 0x70($s4) +.L802408E4: +/* 8EC704 802408E4 8E820074 */ lw $v0, 0x74($s4) +/* 8EC708 802408E8 14400009 */ bnez $v0, .L80240910 +/* 8EC70C 802408EC 24420001 */ addiu $v0, $v0, 1 +/* 8EC710 802408F0 3C028025 */ lui $v0, 0x8025 +/* 8EC714 802408F4 8442338C */ lh $v0, 0x338c($v0) +/* 8EC718 802408F8 1040007C */ beqz $v0, .L80240AEC +/* 8EC71C 802408FC AE820078 */ sw $v0, 0x78($s4) +/* 8EC720 80240900 0C03C4EC */ jal func_800F13B0 +/* 8EC724 80240904 00000000 */ nop +/* 8EC728 80240908 8E820074 */ lw $v0, 0x74($s4) +/* 8EC72C 8024090C 24420001 */ addiu $v0, $v0, 1 +.L80240910: +/* 8EC730 80240910 AE820074 */ sw $v0, 0x74($s4) +/* 8EC734 80240914 2842000F */ slti $v0, $v0, 0xf +/* 8EC738 80240918 14400075 */ bnez $v0, .L80240AF0 +/* 8EC73C 8024091C 0000102D */ daddu $v0, $zero, $zero +/* 8EC740 80240920 0C03C54E */ jal func_800F1538 +/* 8EC744 80240924 00000000 */ nop +/* 8EC748 80240928 8E830078 */ lw $v1, 0x78($s4) +/* 8EC74C 8024092C 240200FF */ addiu $v0, $zero, 0xff +/* 8EC750 80240930 14620005 */ bne $v1, $v0, .L80240948 +/* 8EC754 80240934 2463FFFF */ addiu $v1, $v1, -1 +/* 8EC758 80240938 2402FFFF */ addiu $v0, $zero, -1 +/* 8EC75C 8024093C AE820084 */ sw $v0, 0x84($s4) +/* 8EC760 80240940 080902BC */ j .L80240AF0 +/* 8EC764 80240944 24020002 */ addiu $v0, $zero, 2 +.L80240948: +/* 8EC768 80240948 8E820078 */ lw $v0, 0x78($s4) +/* 8EC76C 8024094C 3C078025 */ lui $a3, 0x8025 +/* 8EC770 80240950 24E73060 */ addiu $a3, $a3, 0x3060 +/* 8EC774 80240954 AE83007C */ sw $v1, 0x7c($s4) +/* 8EC778 80240958 2442FFFF */ addiu $v0, $v0, -1 +/* 8EC77C 8024095C 00021080 */ sll $v0, $v0, 2 +/* 8EC780 80240960 00471021 */ addu $v0, $v0, $a3 +/* 8EC784 80240964 8C5E0108 */ lw $fp, 0x108($v0) +/* 8EC788 80240968 001E1080 */ sll $v0, $fp, 2 +/* 8EC78C 8024096C 3C018024 */ lui $at, 0x8024 +/* 8EC790 80240970 00220821 */ addu $at, $at, $v0 +/* 8EC794 80240974 8C224D84 */ lw $v0, 0x4d84($at) +/* 8EC798 80240978 03C0802D */ daddu $s0, $fp, $zero +/* 8EC79C 8024097C 07C10002 */ bgez $fp, .L80240988 +/* 8EC7A0 80240980 AE820084 */ sw $v0, 0x84($s4) +/* 8EC7A4 80240984 27D00007 */ addiu $s0, $fp, 7 +.L80240988: +/* 8EC7A8 80240988 001080C3 */ sra $s0, $s0, 3 +/* 8EC7AC 8024098C 2611000E */ addiu $s1, $s0, 0xe +/* 8EC7B0 80240990 0C05154E */ jal get_global_byte +/* 8EC7B4 80240994 0220202D */ daddu $a0, $s1, $zero +/* 8EC7B8 80240998 0220202D */ daddu $a0, $s1, $zero +/* 8EC7BC 8024099C 001080C0 */ sll $s0, $s0, 3 +/* 8EC7C0 802409A0 8FA70010 */ lw $a3, 0x10($sp) +/* 8EC7C4 802409A4 03D08023 */ subu $s0, $fp, $s0 +/* 8EC7C8 802409A8 02078004 */ sllv $s0, $a3, $s0 +/* 8EC7CC 802409AC 0C051548 */ jal set_global_byte +/* 8EC7D0 802409B0 00502825 */ or $a1, $v0, $s0 +/* 8EC7D4 802409B4 24020003 */ addiu $v0, $zero, 3 +/* 8EC7D8 802409B8 17C20005 */ bne $fp, $v0, .L802409D0 +/* 8EC7DC 802409BC 0000202D */ daddu $a0, $zero, $zero +/* 8EC7E0 802409C0 3C05F840 */ lui $a1, 0xf840 +/* 8EC7E4 802409C4 34A55BE7 */ ori $a1, $a1, 0x5be7 +/* 8EC7E8 802409C8 0C0B2026 */ jal set_variable +/* 8EC7EC 802409CC 24060001 */ addiu $a2, $zero, 1 +.L802409D0: +/* 8EC7F0 802409D0 3C148025 */ lui $s4, 0x8025 +/* 8EC7F4 802409D4 26943390 */ addiu $s4, $s4, 0x3390 +/* 8EC7F8 802409D8 0280302D */ daddu $a2, $s4, $zero +/* 8EC7FC 802409DC 3C138024 */ lui $s3, 0x8024 +/* 8EC800 802409E0 26734DB4 */ addiu $s3, $s3, 0x4db4 +/* 8EC804 802409E4 3C120011 */ lui $s2, 0x11 +/* 8EC808 802409E8 2652F1B0 */ addiu $s2, $s2, -0xe50 +/* 8EC80C 802409EC 8E650000 */ lw $a1, ($s3) +/* 8EC810 802409F0 26553D86 */ addiu $s5, $s2, 0x3d86 +/* 8EC814 802409F4 00B22021 */ addu $a0, $a1, $s2 +/* 8EC818 802409F8 0C00A5CF */ jal dma_copy +/* 8EC81C 802409FC 00B52821 */ addu $a1, $a1, $s5 +/* 8EC820 80240A00 3C108025 */ lui $s0, 0x8025 +/* 8EC824 80240A04 26107118 */ addiu $s0, $s0, 0x7118 +/* 8EC828 80240A08 0200302D */ daddu $a2, $s0, $zero +/* 8EC82C 80240A0C 8E650004 */ lw $a1, 4($s3) +/* 8EC830 80240A10 26560200 */ addiu $s6, $s2, 0x200 +/* 8EC834 80240A14 00B22021 */ addu $a0, $a1, $s2 +/* 8EC838 80240A18 0C00A5CF */ jal dma_copy +/* 8EC83C 80240A1C 00B62821 */ addu $a1, $a1, $s6 +/* 8EC840 80240A20 3C118026 */ lui $s1, 0x8026 +/* 8EC844 80240A24 2631B2B0 */ addiu $s1, $s1, -0x4d50 +/* 8EC848 80240A28 24020096 */ addiu $v0, $zero, 0x96 +/* 8EC84C 80240A2C A6220008 */ sh $v0, 8($s1) +/* 8EC850 80240A30 24020069 */ addiu $v0, $zero, 0x69 +/* 8EC854 80240A34 24170002 */ addiu $s7, $zero, 2 +/* 8EC858 80240A38 AE300004 */ sw $s0, 4($s1) +/* 8EC85C 80240A3C 001E8040 */ sll $s0, $fp, 1 +/* 8EC860 80240A40 A622000A */ sh $v0, 0xa($s1) +/* 8EC864 80240A44 02171021 */ addu $v0, $s0, $s7 +/* 8EC868 80240A48 02E21004 */ sllv $v0, $v0, $s7 +/* 8EC86C 80240A4C 00531021 */ addu $v0, $v0, $s3 +/* 8EC870 80240A50 AE340000 */ sw $s4, ($s1) +/* 8EC874 80240A54 3C148025 */ lui $s4, 0x8025 +/* 8EC878 80240A58 26947320 */ addiu $s4, $s4, 0x7320 +/* 8EC87C 80240A5C AE37000C */ sw $s7, 0xc($s1) +/* 8EC880 80240A60 AE200010 */ sw $zero, 0x10($s1) +/* 8EC884 80240A64 8C450000 */ lw $a1, ($v0) +/* 8EC888 80240A68 0280302D */ daddu $a2, $s4, $zero +/* 8EC88C 80240A6C 00B22021 */ addu $a0, $a1, $s2 +/* 8EC890 80240A70 0C00A5CF */ jal dma_copy +/* 8EC894 80240A74 00B52821 */ addu $a1, $a1, $s5 +/* 8EC898 80240A78 26100003 */ addiu $s0, $s0, 3 +/* 8EC89C 80240A7C 02F08004 */ sllv $s0, $s0, $s7 +/* 8EC8A0 80240A80 02138021 */ addu $s0, $s0, $s3 +/* 8EC8A4 80240A84 3C138026 */ lui $s3, 0x8026 +/* 8EC8A8 80240A88 2673B0A8 */ addiu $s3, $s3, -0x4f58 +/* 8EC8AC 80240A8C 8E050000 */ lw $a1, ($s0) +/* 8EC8B0 80240A90 0260302D */ daddu $a2, $s3, $zero +/* 8EC8B4 80240A94 00B22021 */ addu $a0, $a1, $s2 +/* 8EC8B8 80240A98 0C00A5CF */ jal dma_copy +/* 8EC8BC 80240A9C 00B62821 */ addu $a1, $a1, $s6 +/* 8EC8C0 80240AA0 0000202D */ daddu $a0, $zero, $zero +/* 8EC8C4 80240AA4 24020046 */ addiu $v0, $zero, 0x46 +/* 8EC8C8 80240AA8 A622001C */ sh $v0, 0x1c($s1) +/* 8EC8CC 80240AAC 2402005F */ addiu $v0, $zero, 0x5f +/* 8EC8D0 80240AB0 AE340014 */ sw $s4, 0x14($s1) +/* 8EC8D4 80240AB4 AE330018 */ sw $s3, 0x18($s1) +/* 8EC8D8 80240AB8 A622001E */ sh $v0, 0x1e($s1) +/* 8EC8DC 80240ABC AE370020 */ sw $s7, 0x20($s1) +/* 8EC8E0 80240AC0 8FA70010 */ lw $a3, 0x10($sp) +/* 8EC8E4 80240AC4 3C058024 */ lui $a1, 0x8024 +/* 8EC8E8 80240AC8 24A505BC */ addiu $a1, $a1, 0x5bc +/* 8EC8EC 80240ACC 0C048C8F */ jal bind_dynamic_entity_7 +/* 8EC8F0 80240AD0 AE270024 */ sw $a3, 0x24($s1) +/* 8EC8F4 80240AD4 3C018026 */ lui $at, 0x8026 +/* 8EC8F8 80240AD8 AC22B2A8 */ sw $v0, -0x4d58($at) +/* 8EC8FC 80240ADC 3C018026 */ lui $at, 0x8026 +/* 8EC900 80240AE0 AC20B2AC */ sw $zero, -0x4d54($at) +/* 8EC904 80240AE4 080902BC */ j .L80240AF0 +/* 8EC908 80240AE8 02E0102D */ daddu $v0, $s7, $zero +.L80240AEC: +/* 8EC90C 80240AEC 0000102D */ daddu $v0, $zero, $zero +.L80240AF0: +/* 8EC910 80240AF0 8FBF003C */ lw $ra, 0x3c($sp) +/* 8EC914 80240AF4 8FBE0038 */ lw $fp, 0x38($sp) +/* 8EC918 80240AF8 8FB70034 */ lw $s7, 0x34($sp) +/* 8EC91C 80240AFC 8FB60030 */ lw $s6, 0x30($sp) +/* 8EC920 80240B00 8FB5002C */ lw $s5, 0x2c($sp) +/* 8EC924 80240B04 8FB40028 */ lw $s4, 0x28($sp) +/* 8EC928 80240B08 8FB30024 */ lw $s3, 0x24($sp) +/* 8EC92C 80240B0C 8FB20020 */ lw $s2, 0x20($sp) +/* 8EC930 80240B10 8FB1001C */ lw $s1, 0x1c($sp) +/* 8EC934 80240B14 8FB00018 */ lw $s0, 0x18($sp) +/* 8EC938 80240B18 03E00008 */ jr $ra +/* 8EC93C 80240B1C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20.s deleted file mode 100644 index 0e848bdee9..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B20 -/* 8EC940 80240B20 3C048026 */ lui $a0, 0x8026 -/* 8EC944 80240B24 8C84B2A8 */ lw $a0, -0x4d58($a0) -/* 8EC948 80240B28 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EC94C 80240B2C AFBF0010 */ sw $ra, 0x10($sp) -/* 8EC950 80240B30 0C048D70 */ jal func_801235C0 -/* 8EC954 80240B34 00000000 */ nop -/* 8EC958 80240B38 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EC95C 80240B3C 24020002 */ addiu $v0, $zero, 2 -/* 8EC960 80240B40 03E00008 */ jr $ra -/* 8EC964 80240B44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s new file mode 100644 index 0000000000..421d47ec14 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B20_8EC940.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B20_8EC940 +/* 8EC940 80240B20 3C048026 */ lui $a0, 0x8026 +/* 8EC944 80240B24 8C84B2A8 */ lw $a0, -0x4d58($a0) +/* 8EC948 80240B28 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EC94C 80240B2C AFBF0010 */ sw $ra, 0x10($sp) +/* 8EC950 80240B30 0C048D70 */ jal func_801235C0 +/* 8EC954 80240B34 00000000 */ nop +/* 8EC958 80240B38 8FBF0010 */ lw $ra, 0x10($sp) +/* 8EC95C 80240B3C 24020002 */ addiu $v0, $zero, 2 +/* 8EC960 80240B40 03E00008 */ jr $ra +/* 8EC964 80240B44 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B48.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B48.s deleted file mode 100644 index 6985db23ae..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B48.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B48 -/* 8EC968 80240B48 AC80007C */ sw $zero, 0x7c($a0) -/* 8EC96C 80240B4C 03E00008 */ jr $ra -/* 8EC970 80240B50 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B48_8EC968.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B48_8EC968.s new file mode 100644 index 0000000000..e660bcd938 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B48_8EC968.s @@ -0,0 +1,7 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B48_8EC968 +/* 8EC968 80240B48 AC80007C */ sw $zero, 0x7c($a0) +/* 8EC96C 80240B4C 03E00008 */ jr $ra +/* 8EC970 80240B50 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54.s deleted file mode 100644 index 85c32040ae..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B54 -/* 8EC974 80240B54 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8EC978 80240B58 AFB40020 */ sw $s4, 0x20($sp) -/* 8EC97C 80240B5C 0080A02D */ daddu $s4, $a0, $zero -/* 8EC980 80240B60 AFB7002C */ sw $s7, 0x2c($sp) -/* 8EC984 80240B64 3C178025 */ lui $s7, 0x8025 -/* 8EC988 80240B68 26F73060 */ addiu $s7, $s7, 0x3060 -/* 8EC98C 80240B6C AFBF0034 */ sw $ra, 0x34($sp) -/* 8EC990 80240B70 AFBE0030 */ sw $fp, 0x30($sp) -/* 8EC994 80240B74 AFB60028 */ sw $s6, 0x28($sp) -/* 8EC998 80240B78 AFB50024 */ sw $s5, 0x24($sp) -/* 8EC99C 80240B7C AFB3001C */ sw $s3, 0x1c($sp) -/* 8EC9A0 80240B80 AFB20018 */ sw $s2, 0x18($sp) -/* 8EC9A4 80240B84 AFB10014 */ sw $s1, 0x14($sp) -/* 8EC9A8 80240B88 10A00002 */ beqz $a1, .L80240B94 -/* 8EC9AC 80240B8C AFB00010 */ sw $s0, 0x10($sp) -/* 8EC9B0 80240B90 AE800070 */ sw $zero, 0x70($s4) -.L80240B94: -/* 8EC9B4 80240B94 8E930070 */ lw $s3, 0x70($s4) -/* 8EC9B8 80240B98 12600005 */ beqz $s3, .L80240BB0 -/* 8EC9BC 80240B9C 24020001 */ addiu $v0, $zero, 1 -/* 8EC9C0 80240BA0 12620041 */ beq $s3, $v0, .L80240CA8 -/* 8EC9C4 80240BA4 0000102D */ daddu $v0, $zero, $zero -/* 8EC9C8 80240BA8 0809035D */ j .L80240D74 -/* 8EC9CC 80240BAC 00000000 */ nop -.L80240BB0: -/* 8EC9D0 80240BB0 0000A82D */ daddu $s5, $zero, $zero -/* 8EC9D4 80240BB4 02A0902D */ daddu $s2, $s5, $zero -/* 8EC9D8 80240BB8 24160001 */ addiu $s6, $zero, 1 -/* 8EC9DC 80240BBC 3C1E8008 */ lui $fp, 0x8008 -/* 8EC9E0 80240BC0 27DE2388 */ addiu $fp, $fp, 0x2388 -/* 8EC9E4 80240BC4 3C138024 */ lui $s3, 0x8024 -/* 8EC9E8 80240BC8 26734FA0 */ addiu $s3, $s3, 0x4fa0 -/* 8EC9EC 80240BCC 02E0882D */ daddu $s1, $s7, $zero -.L80240BD0: -/* 8EC9F0 80240BD0 0000202D */ daddu $a0, $zero, $zero -/* 8EC9F4 80240BD4 3C05F5DE */ lui $a1, 0xf5de -/* 8EC9F8 80240BD8 0C0B1EAF */ jal get_variable -/* 8EC9FC 80240BDC 34A50180 */ ori $a1, $a1, 0x180 -/* 8ECA00 80240BE0 8E630000 */ lw $v1, ($s3) -/* 8ECA04 80240BE4 0043102A */ slt $v0, $v0, $v1 -/* 8ECA08 80240BE8 54400019 */ bnel $v0, $zero, .L80240C50 -/* 8ECA0C 80240BEC 26520001 */ addiu $s2, $s2, 1 -/* 8ECA10 80240BF0 0240802D */ daddu $s0, $s2, $zero -/* 8ECA14 80240BF4 3C068008 */ lui $a2, 0x8008 -/* 8ECA18 80240BF8 24C62358 */ addiu $a2, $a2, 0x2358 -/* 8ECA1C 80240BFC AE260000 */ sw $a2, ($s1) -/* 8ECA20 80240C00 AE320108 */ sw $s2, 0x108($s1) -/* 8ECA24 80240C04 AE36018C */ sw $s6, 0x18c($s1) -/* 8ECA28 80240C08 AE200084 */ sw $zero, 0x84($s1) -/* 8ECA2C 80240C0C 06410002 */ bgez $s2, .L80240C18 -/* 8ECA30 80240C10 AE200294 */ sw $zero, 0x294($s1) -/* 8ECA34 80240C14 26500007 */ addiu $s0, $s2, 7 -.L80240C18: -/* 8ECA38 80240C18 001080C3 */ sra $s0, $s0, 3 -/* 8ECA3C 80240C1C 0C05154E */ jal get_global_byte -/* 8ECA40 80240C20 2604000C */ addiu $a0, $s0, 0xc -/* 8ECA44 80240C24 001080C0 */ sll $s0, $s0, 3 -/* 8ECA48 80240C28 02508023 */ subu $s0, $s2, $s0 -/* 8ECA4C 80240C2C 02168004 */ sllv $s0, $s6, $s0 -/* 8ECA50 80240C30 00502824 */ and $a1, $v0, $s0 -/* 8ECA54 80240C34 10A00003 */ beqz $a1, .L80240C44 -/* 8ECA58 80240C38 AE200210 */ sw $zero, 0x210($s1) -/* 8ECA5C 80240C3C AE360210 */ sw $s6, 0x210($s1) -/* 8ECA60 80240C40 AE3E0000 */ sw $fp, ($s1) -.L80240C44: -/* 8ECA64 80240C44 26310004 */ addiu $s1, $s1, 4 -/* 8ECA68 80240C48 26B50001 */ addiu $s5, $s5, 1 -/* 8ECA6C 80240C4C 26520001 */ addiu $s2, $s2, 1 -.L80240C50: -/* 8ECA70 80240C50 2A42000C */ slti $v0, $s2, 0xc -/* 8ECA74 80240C54 1440FFDE */ bnez $v0, .L80240BD0 -/* 8ECA78 80240C58 26730004 */ addiu $s3, $s3, 4 -/* 8ECA7C 80240C5C 16A00004 */ bnez $s5, .L80240C70 -/* 8ECA80 80240C60 2402000A */ addiu $v0, $zero, 0xa -/* 8ECA84 80240C64 AE800084 */ sw $zero, 0x84($s4) -/* 8ECA88 80240C68 0809035D */ j .L80240D74 -/* 8ECA8C 80240C6C 24020002 */ addiu $v0, $zero, 2 -.L80240C70: -/* 8ECA90 80240C70 AEE20318 */ sw $v0, 0x318($s7) -/* 8ECA94 80240C74 AEF50324 */ sw $s5, 0x324($s7) -/* 8ECA98 80240C78 8E82007C */ lw $v0, 0x7c($s4) -/* 8ECA9C 80240C7C 02E0202D */ daddu $a0, $s7, $zero -/* 8ECAA0 80240C80 0C03D390 */ jal func_800F4E40 -/* 8ECAA4 80240C84 AC820328 */ sw $v0, 0x328($a0) -/* 8ECAA8 80240C88 0C03A631 */ jal func_800E98C4 -/* 8ECAAC 80240C8C 00000000 */ nop -/* 8ECAB0 80240C90 0C03A5EE */ jal func_800E97B8 -/* 8ECAB4 80240C94 00000000 */ nop -/* 8ECAB8 80240C98 24020001 */ addiu $v0, $zero, 1 -/* 8ECABC 80240C9C AE800074 */ sw $zero, 0x74($s4) -/* 8ECAC0 80240CA0 0809035C */ j .L80240D70 -/* 8ECAC4 80240CA4 AE820070 */ sw $v0, 0x70($s4) -.L80240CA8: -/* 8ECAC8 80240CA8 8E820074 */ lw $v0, 0x74($s4) -/* 8ECACC 80240CAC 14400008 */ bnez $v0, .L80240CD0 -/* 8ECAD0 80240CB0 24420001 */ addiu $v0, $v0, 1 -/* 8ECAD4 80240CB4 86E2032C */ lh $v0, 0x32c($s7) -/* 8ECAD8 80240CB8 1040002D */ beqz $v0, .L80240D70 -/* 8ECADC 80240CBC AE820078 */ sw $v0, 0x78($s4) -/* 8ECAE0 80240CC0 0C03C4EC */ jal func_800F13B0 -/* 8ECAE4 80240CC4 00000000 */ nop -/* 8ECAE8 80240CC8 8E820074 */ lw $v0, 0x74($s4) -/* 8ECAEC 80240CCC 24420001 */ addiu $v0, $v0, 1 -.L80240CD0: -/* 8ECAF0 80240CD0 AE820074 */ sw $v0, 0x74($s4) -/* 8ECAF4 80240CD4 2842000F */ slti $v0, $v0, 0xf -/* 8ECAF8 80240CD8 14400026 */ bnez $v0, .L80240D74 -/* 8ECAFC 80240CDC 0000102D */ daddu $v0, $zero, $zero -/* 8ECB00 80240CE0 0C03C54E */ jal func_800F1538 -/* 8ECB04 80240CE4 00000000 */ nop -/* 8ECB08 80240CE8 8E830078 */ lw $v1, 0x78($s4) -/* 8ECB0C 80240CEC 240200FF */ addiu $v0, $zero, 0xff -/* 8ECB10 80240CF0 14620005 */ bne $v1, $v0, .L80240D08 -/* 8ECB14 80240CF4 2463FFFF */ addiu $v1, $v1, -1 -/* 8ECB18 80240CF8 2402FFFF */ addiu $v0, $zero, -1 -/* 8ECB1C 80240CFC AE820084 */ sw $v0, 0x84($s4) -/* 8ECB20 80240D00 0809035D */ j .L80240D74 -/* 8ECB24 80240D04 24020002 */ addiu $v0, $zero, 2 -.L80240D08: -/* 8ECB28 80240D08 8E820078 */ lw $v0, 0x78($s4) -/* 8ECB2C 80240D0C AE83007C */ sw $v1, 0x7c($s4) -/* 8ECB30 80240D10 2442FFFF */ addiu $v0, $v0, -1 -/* 8ECB34 80240D14 00021080 */ sll $v0, $v0, 2 -/* 8ECB38 80240D18 00571021 */ addu $v0, $v0, $s7 -/* 8ECB3C 80240D1C 8C510108 */ lw $s1, 0x108($v0) -/* 8ECB40 80240D20 00111080 */ sll $v0, $s1, 2 -/* 8ECB44 80240D24 3C018024 */ lui $at, 0x8024 -/* 8ECB48 80240D28 00220821 */ addu $at, $at, $v0 -/* 8ECB4C 80240D2C 8C224FD0 */ lw $v0, 0x4fd0($at) -/* 8ECB50 80240D30 0220802D */ daddu $s0, $s1, $zero -/* 8ECB54 80240D34 06210002 */ bgez $s1, .L80240D40 -/* 8ECB58 80240D38 AE820084 */ sw $v0, 0x84($s4) -/* 8ECB5C 80240D3C 26300007 */ addiu $s0, $s1, 7 -.L80240D40: -/* 8ECB60 80240D40 001080C3 */ sra $s0, $s0, 3 -/* 8ECB64 80240D44 2612000C */ addiu $s2, $s0, 0xc -/* 8ECB68 80240D48 0C05154E */ jal get_global_byte -/* 8ECB6C 80240D4C 0240202D */ daddu $a0, $s2, $zero -/* 8ECB70 80240D50 001080C0 */ sll $s0, $s0, 3 -/* 8ECB74 80240D54 02308023 */ subu $s0, $s1, $s0 -/* 8ECB78 80240D58 02138004 */ sllv $s0, $s3, $s0 -/* 8ECB7C 80240D5C 00502825 */ or $a1, $v0, $s0 -/* 8ECB80 80240D60 0C051548 */ jal set_global_byte -/* 8ECB84 80240D64 0240202D */ daddu $a0, $s2, $zero -/* 8ECB88 80240D68 0809035D */ j .L80240D74 -/* 8ECB8C 80240D6C 24020002 */ addiu $v0, $zero, 2 -.L80240D70: -/* 8ECB90 80240D70 0000102D */ daddu $v0, $zero, $zero -.L80240D74: -/* 8ECB94 80240D74 8FBF0034 */ lw $ra, 0x34($sp) -/* 8ECB98 80240D78 8FBE0030 */ lw $fp, 0x30($sp) -/* 8ECB9C 80240D7C 8FB7002C */ lw $s7, 0x2c($sp) -/* 8ECBA0 80240D80 8FB60028 */ lw $s6, 0x28($sp) -/* 8ECBA4 80240D84 8FB50024 */ lw $s5, 0x24($sp) -/* 8ECBA8 80240D88 8FB40020 */ lw $s4, 0x20($sp) -/* 8ECBAC 80240D8C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8ECBB0 80240D90 8FB20018 */ lw $s2, 0x18($sp) -/* 8ECBB4 80240D94 8FB10014 */ lw $s1, 0x14($sp) -/* 8ECBB8 80240D98 8FB00010 */ lw $s0, 0x10($sp) -/* 8ECBBC 80240D9C 03E00008 */ jr $ra -/* 8ECBC0 80240DA0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s new file mode 100644 index 0000000000..e8a4343f1e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_80240B54_8EC974.s @@ -0,0 +1,165 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B54_8EC974 +/* 8EC974 80240B54 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8EC978 80240B58 AFB40020 */ sw $s4, 0x20($sp) +/* 8EC97C 80240B5C 0080A02D */ daddu $s4, $a0, $zero +/* 8EC980 80240B60 AFB7002C */ sw $s7, 0x2c($sp) +/* 8EC984 80240B64 3C178025 */ lui $s7, 0x8025 +/* 8EC988 80240B68 26F73060 */ addiu $s7, $s7, 0x3060 +/* 8EC98C 80240B6C AFBF0034 */ sw $ra, 0x34($sp) +/* 8EC990 80240B70 AFBE0030 */ sw $fp, 0x30($sp) +/* 8EC994 80240B74 AFB60028 */ sw $s6, 0x28($sp) +/* 8EC998 80240B78 AFB50024 */ sw $s5, 0x24($sp) +/* 8EC99C 80240B7C AFB3001C */ sw $s3, 0x1c($sp) +/* 8EC9A0 80240B80 AFB20018 */ sw $s2, 0x18($sp) +/* 8EC9A4 80240B84 AFB10014 */ sw $s1, 0x14($sp) +/* 8EC9A8 80240B88 10A00002 */ beqz $a1, .L80240B94 +/* 8EC9AC 80240B8C AFB00010 */ sw $s0, 0x10($sp) +/* 8EC9B0 80240B90 AE800070 */ sw $zero, 0x70($s4) +.L80240B94: +/* 8EC9B4 80240B94 8E930070 */ lw $s3, 0x70($s4) +/* 8EC9B8 80240B98 12600005 */ beqz $s3, .L80240BB0 +/* 8EC9BC 80240B9C 24020001 */ addiu $v0, $zero, 1 +/* 8EC9C0 80240BA0 12620041 */ beq $s3, $v0, .L80240CA8 +/* 8EC9C4 80240BA4 0000102D */ daddu $v0, $zero, $zero +/* 8EC9C8 80240BA8 0809035D */ j .L80240D74 +/* 8EC9CC 80240BAC 00000000 */ nop +.L80240BB0: +/* 8EC9D0 80240BB0 0000A82D */ daddu $s5, $zero, $zero +/* 8EC9D4 80240BB4 02A0902D */ daddu $s2, $s5, $zero +/* 8EC9D8 80240BB8 24160001 */ addiu $s6, $zero, 1 +/* 8EC9DC 80240BBC 3C1E8008 */ lui $fp, 0x8008 +/* 8EC9E0 80240BC0 27DE2388 */ addiu $fp, $fp, 0x2388 +/* 8EC9E4 80240BC4 3C138024 */ lui $s3, 0x8024 +/* 8EC9E8 80240BC8 26734FA0 */ addiu $s3, $s3, 0x4fa0 +/* 8EC9EC 80240BCC 02E0882D */ daddu $s1, $s7, $zero +.L80240BD0: +/* 8EC9F0 80240BD0 0000202D */ daddu $a0, $zero, $zero +/* 8EC9F4 80240BD4 3C05F5DE */ lui $a1, 0xf5de +/* 8EC9F8 80240BD8 0C0B1EAF */ jal get_variable +/* 8EC9FC 80240BDC 34A50180 */ ori $a1, $a1, 0x180 +/* 8ECA00 80240BE0 8E630000 */ lw $v1, ($s3) +/* 8ECA04 80240BE4 0043102A */ slt $v0, $v0, $v1 +/* 8ECA08 80240BE8 54400019 */ bnel $v0, $zero, .L80240C50 +/* 8ECA0C 80240BEC 26520001 */ addiu $s2, $s2, 1 +/* 8ECA10 80240BF0 0240802D */ daddu $s0, $s2, $zero +/* 8ECA14 80240BF4 3C068008 */ lui $a2, 0x8008 +/* 8ECA18 80240BF8 24C62358 */ addiu $a2, $a2, 0x2358 +/* 8ECA1C 80240BFC AE260000 */ sw $a2, ($s1) +/* 8ECA20 80240C00 AE320108 */ sw $s2, 0x108($s1) +/* 8ECA24 80240C04 AE36018C */ sw $s6, 0x18c($s1) +/* 8ECA28 80240C08 AE200084 */ sw $zero, 0x84($s1) +/* 8ECA2C 80240C0C 06410002 */ bgez $s2, .L80240C18 +/* 8ECA30 80240C10 AE200294 */ sw $zero, 0x294($s1) +/* 8ECA34 80240C14 26500007 */ addiu $s0, $s2, 7 +.L80240C18: +/* 8ECA38 80240C18 001080C3 */ sra $s0, $s0, 3 +/* 8ECA3C 80240C1C 0C05154E */ jal get_global_byte +/* 8ECA40 80240C20 2604000C */ addiu $a0, $s0, 0xc +/* 8ECA44 80240C24 001080C0 */ sll $s0, $s0, 3 +/* 8ECA48 80240C28 02508023 */ subu $s0, $s2, $s0 +/* 8ECA4C 80240C2C 02168004 */ sllv $s0, $s6, $s0 +/* 8ECA50 80240C30 00502824 */ and $a1, $v0, $s0 +/* 8ECA54 80240C34 10A00003 */ beqz $a1, .L80240C44 +/* 8ECA58 80240C38 AE200210 */ sw $zero, 0x210($s1) +/* 8ECA5C 80240C3C AE360210 */ sw $s6, 0x210($s1) +/* 8ECA60 80240C40 AE3E0000 */ sw $fp, ($s1) +.L80240C44: +/* 8ECA64 80240C44 26310004 */ addiu $s1, $s1, 4 +/* 8ECA68 80240C48 26B50001 */ addiu $s5, $s5, 1 +/* 8ECA6C 80240C4C 26520001 */ addiu $s2, $s2, 1 +.L80240C50: +/* 8ECA70 80240C50 2A42000C */ slti $v0, $s2, 0xc +/* 8ECA74 80240C54 1440FFDE */ bnez $v0, .L80240BD0 +/* 8ECA78 80240C58 26730004 */ addiu $s3, $s3, 4 +/* 8ECA7C 80240C5C 16A00004 */ bnez $s5, .L80240C70 +/* 8ECA80 80240C60 2402000A */ addiu $v0, $zero, 0xa +/* 8ECA84 80240C64 AE800084 */ sw $zero, 0x84($s4) +/* 8ECA88 80240C68 0809035D */ j .L80240D74 +/* 8ECA8C 80240C6C 24020002 */ addiu $v0, $zero, 2 +.L80240C70: +/* 8ECA90 80240C70 AEE20318 */ sw $v0, 0x318($s7) +/* 8ECA94 80240C74 AEF50324 */ sw $s5, 0x324($s7) +/* 8ECA98 80240C78 8E82007C */ lw $v0, 0x7c($s4) +/* 8ECA9C 80240C7C 02E0202D */ daddu $a0, $s7, $zero +/* 8ECAA0 80240C80 0C03D390 */ jal func_800F4E40 +/* 8ECAA4 80240C84 AC820328 */ sw $v0, 0x328($a0) +/* 8ECAA8 80240C88 0C03A631 */ jal func_800E98C4 +/* 8ECAAC 80240C8C 00000000 */ nop +/* 8ECAB0 80240C90 0C03A5EE */ jal func_800E97B8 +/* 8ECAB4 80240C94 00000000 */ nop +/* 8ECAB8 80240C98 24020001 */ addiu $v0, $zero, 1 +/* 8ECABC 80240C9C AE800074 */ sw $zero, 0x74($s4) +/* 8ECAC0 80240CA0 0809035C */ j .L80240D70 +/* 8ECAC4 80240CA4 AE820070 */ sw $v0, 0x70($s4) +.L80240CA8: +/* 8ECAC8 80240CA8 8E820074 */ lw $v0, 0x74($s4) +/* 8ECACC 80240CAC 14400008 */ bnez $v0, .L80240CD0 +/* 8ECAD0 80240CB0 24420001 */ addiu $v0, $v0, 1 +/* 8ECAD4 80240CB4 86E2032C */ lh $v0, 0x32c($s7) +/* 8ECAD8 80240CB8 1040002D */ beqz $v0, .L80240D70 +/* 8ECADC 80240CBC AE820078 */ sw $v0, 0x78($s4) +/* 8ECAE0 80240CC0 0C03C4EC */ jal func_800F13B0 +/* 8ECAE4 80240CC4 00000000 */ nop +/* 8ECAE8 80240CC8 8E820074 */ lw $v0, 0x74($s4) +/* 8ECAEC 80240CCC 24420001 */ addiu $v0, $v0, 1 +.L80240CD0: +/* 8ECAF0 80240CD0 AE820074 */ sw $v0, 0x74($s4) +/* 8ECAF4 80240CD4 2842000F */ slti $v0, $v0, 0xf +/* 8ECAF8 80240CD8 14400026 */ bnez $v0, .L80240D74 +/* 8ECAFC 80240CDC 0000102D */ daddu $v0, $zero, $zero +/* 8ECB00 80240CE0 0C03C54E */ jal func_800F1538 +/* 8ECB04 80240CE4 00000000 */ nop +/* 8ECB08 80240CE8 8E830078 */ lw $v1, 0x78($s4) +/* 8ECB0C 80240CEC 240200FF */ addiu $v0, $zero, 0xff +/* 8ECB10 80240CF0 14620005 */ bne $v1, $v0, .L80240D08 +/* 8ECB14 80240CF4 2463FFFF */ addiu $v1, $v1, -1 +/* 8ECB18 80240CF8 2402FFFF */ addiu $v0, $zero, -1 +/* 8ECB1C 80240CFC AE820084 */ sw $v0, 0x84($s4) +/* 8ECB20 80240D00 0809035D */ j .L80240D74 +/* 8ECB24 80240D04 24020002 */ addiu $v0, $zero, 2 +.L80240D08: +/* 8ECB28 80240D08 8E820078 */ lw $v0, 0x78($s4) +/* 8ECB2C 80240D0C AE83007C */ sw $v1, 0x7c($s4) +/* 8ECB30 80240D10 2442FFFF */ addiu $v0, $v0, -1 +/* 8ECB34 80240D14 00021080 */ sll $v0, $v0, 2 +/* 8ECB38 80240D18 00571021 */ addu $v0, $v0, $s7 +/* 8ECB3C 80240D1C 8C510108 */ lw $s1, 0x108($v0) +/* 8ECB40 80240D20 00111080 */ sll $v0, $s1, 2 +/* 8ECB44 80240D24 3C018024 */ lui $at, 0x8024 +/* 8ECB48 80240D28 00220821 */ addu $at, $at, $v0 +/* 8ECB4C 80240D2C 8C224FD0 */ lw $v0, 0x4fd0($at) +/* 8ECB50 80240D30 0220802D */ daddu $s0, $s1, $zero +/* 8ECB54 80240D34 06210002 */ bgez $s1, .L80240D40 +/* 8ECB58 80240D38 AE820084 */ sw $v0, 0x84($s4) +/* 8ECB5C 80240D3C 26300007 */ addiu $s0, $s1, 7 +.L80240D40: +/* 8ECB60 80240D40 001080C3 */ sra $s0, $s0, 3 +/* 8ECB64 80240D44 2612000C */ addiu $s2, $s0, 0xc +/* 8ECB68 80240D48 0C05154E */ jal get_global_byte +/* 8ECB6C 80240D4C 0240202D */ daddu $a0, $s2, $zero +/* 8ECB70 80240D50 001080C0 */ sll $s0, $s0, 3 +/* 8ECB74 80240D54 02308023 */ subu $s0, $s1, $s0 +/* 8ECB78 80240D58 02138004 */ sllv $s0, $s3, $s0 +/* 8ECB7C 80240D5C 00502825 */ or $a1, $v0, $s0 +/* 8ECB80 80240D60 0C051548 */ jal set_global_byte +/* 8ECB84 80240D64 0240202D */ daddu $a0, $s2, $zero +/* 8ECB88 80240D68 0809035D */ j .L80240D74 +/* 8ECB8C 80240D6C 24020002 */ addiu $v0, $zero, 2 +.L80240D70: +/* 8ECB90 80240D70 0000102D */ daddu $v0, $zero, $zero +.L80240D74: +/* 8ECB94 80240D74 8FBF0034 */ lw $ra, 0x34($sp) +/* 8ECB98 80240D78 8FBE0030 */ lw $fp, 0x30($sp) +/* 8ECB9C 80240D7C 8FB7002C */ lw $s7, 0x2c($sp) +/* 8ECBA0 80240D80 8FB60028 */ lw $s6, 0x28($sp) +/* 8ECBA4 80240D84 8FB50024 */ lw $s5, 0x24($sp) +/* 8ECBA8 80240D88 8FB40020 */ lw $s4, 0x20($sp) +/* 8ECBAC 80240D8C 8FB3001C */ lw $s3, 0x1c($sp) +/* 8ECBB0 80240D90 8FB20018 */ lw $s2, 0x18($sp) +/* 8ECBB4 80240D94 8FB10014 */ lw $s1, 0x14($sp) +/* 8ECBB8 80240D98 8FB00010 */ lw $s0, 0x10($sp) +/* 8ECBBC 80240D9C 03E00008 */ jr $ra +/* 8ECBC0 80240DA0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DD0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DD0.s deleted file mode 100644 index ad47a89bf1..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DD0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DD0 -/* 8ECBF0 80240DD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ECBF4 80240DD4 0000202D */ daddu $a0, $zero, $zero -/* 8ECBF8 80240DD8 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8ECBFC 80240DDC AFBF0010 */ sw $ra, 0x10($sp) -/* 8ECC00 80240DE0 0C01559B */ jal func_8005566C -/* 8ECC04 80240DE4 2406003F */ addiu $a2, $zero, 0x3f -/* 8ECC08 80240DE8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ECC0C 80240DEC 24020002 */ addiu $v0, $zero, 2 -/* 8ECC10 80240DF0 03E00008 */ jr $ra -/* 8ECC14 80240DF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DD0_8ECBF0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DD0_8ECBF0.s new file mode 100644 index 0000000000..45ca13651b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DD0_8ECBF0.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DD0_8ECBF0 +/* 8ECBF0 80240DD0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ECBF4 80240DD4 0000202D */ daddu $a0, $zero, $zero +/* 8ECBF8 80240DD8 240503E8 */ addiu $a1, $zero, 0x3e8 +/* 8ECBFC 80240DDC AFBF0010 */ sw $ra, 0x10($sp) +/* 8ECC00 80240DE0 0C01559B */ jal func_8005566C +/* 8ECC04 80240DE4 2406003F */ addiu $a2, $zero, 0x3f +/* 8ECC08 80240DE8 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ECC0C 80240DEC 24020002 */ addiu $v0, $zero, 2 +/* 8ECC10 80240DF0 03E00008 */ jr $ra +/* 8ECC14 80240DF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8.s deleted file mode 100644 index 89cca70583..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF8 -/* 8ECC18 80240DF8 3C03800B */ lui $v1, %hi(gCameras) -/* 8ECC1C 80240DFC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 8ECC20 80240E00 94620002 */ lhu $v0, 2($v1) -/* 8ECC24 80240E04 3042FFFE */ andi $v0, $v0, 0xfffe -/* 8ECC28 80240E08 A4620002 */ sh $v0, 2($v1) -/* 8ECC2C 80240E0C 03E00008 */ jr $ra -/* 8ECC30 80240E10 24020002 */ addiu $v0, $zero, 2 -/* 8ECC34 80240E14 00000000 */ nop -/* 8ECC38 80240E18 00000000 */ nop -/* 8ECC3C 80240E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8_8ECC18.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8_8ECC18.s new file mode 100644 index 0000000000..9520caa0f0 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ECBF0/func_80240DF8_8ECC18.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DF8_8ECC18 +/* 8ECC18 80240DF8 3C03800B */ lui $v1, %hi(gCameras) +/* 8ECC1C 80240DFC 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* 8ECC20 80240E00 94620002 */ lhu $v0, 2($v1) +/* 8ECC24 80240E04 3042FFFE */ andi $v0, $v0, 0xfffe +/* 8ECC28 80240E08 A4620002 */ sh $v0, 2($v1) +/* 8ECC2C 80240E0C 03E00008 */ jr $ra +/* 8ECC30 80240E10 24020002 */ addiu $v0, $zero, 2 +/* 8ECC34 80240E14 00000000 */ nop +/* 8ECC38 80240E18 00000000 */ nop +/* 8ECC3C 80240E1C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E20.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E20.s deleted file mode 100644 index 195384fee6..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E20.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E20 -/* 8ECC40 80240E20 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8ECC44 80240E24 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8ECC48 80240E28 4485A000 */ mtc1 $a1, $f20 -/* 8ECC4C 80240E2C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8ECC50 80240E30 4486B000 */ mtc1 $a2, $f22 -/* 8ECC54 80240E34 AFB00010 */ sw $s0, 0x10($sp) -/* 8ECC58 80240E38 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 8ECC5C 80240E3C 4487C000 */ mtc1 $a3, $f24 -/* 8ECC60 80240E40 AFBF0014 */ sw $ra, 0x14($sp) -/* 8ECC64 80240E44 0C019D28 */ jal guMtxIdentF -/* 8ECC68 80240E48 0080802D */ daddu $s0, $a0, $zero -/* 8ECC6C 80240E4C 4616A582 */ mul.s $f22, $f20, $f22 -/* 8ECC70 80240E50 00000000 */ nop -/* 8ECC74 80240E54 4618A502 */ mul.s $f20, $f20, $f24 -/* 8ECC78 80240E58 00000000 */ nop -/* 8ECC7C 80240E5C 3C013F80 */ lui $at, 0x3f80 -/* 8ECC80 80240E60 44810000 */ mtc1 $at, $f0 -/* 8ECC84 80240E64 00000000 */ nop -/* 8ECC88 80240E68 E6000014 */ swc1 $f0, 0x14($s0) -/* 8ECC8C 80240E6C E6160010 */ swc1 $f22, 0x10($s0) -/* 8ECC90 80240E70 E6140018 */ swc1 $f20, 0x18($s0) -/* 8ECC94 80240E74 8FBF0014 */ lw $ra, 0x14($sp) -/* 8ECC98 80240E78 8FB00010 */ lw $s0, 0x10($sp) -/* 8ECC9C 80240E7C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8ECCA0 80240E80 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8ECCA4 80240E84 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8ECCA8 80240E88 03E00008 */ jr $ra -/* 8ECCAC 80240E8C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E20_8ECC40.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E20_8ECC40.s new file mode 100644 index 0000000000..f0e9d76ace --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E20_8ECC40.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E20_8ECC40 +/* 8ECC40 80240E20 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8ECC44 80240E24 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 8ECC48 80240E28 4485A000 */ mtc1 $a1, $f20 +/* 8ECC4C 80240E2C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 8ECC50 80240E30 4486B000 */ mtc1 $a2, $f22 +/* 8ECC54 80240E34 AFB00010 */ sw $s0, 0x10($sp) +/* 8ECC58 80240E38 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 8ECC5C 80240E3C 4487C000 */ mtc1 $a3, $f24 +/* 8ECC60 80240E40 AFBF0014 */ sw $ra, 0x14($sp) +/* 8ECC64 80240E44 0C019D28 */ jal guMtxIdentF +/* 8ECC68 80240E48 0080802D */ daddu $s0, $a0, $zero +/* 8ECC6C 80240E4C 4616A582 */ mul.s $f22, $f20, $f22 +/* 8ECC70 80240E50 00000000 */ nop +/* 8ECC74 80240E54 4618A502 */ mul.s $f20, $f20, $f24 +/* 8ECC78 80240E58 00000000 */ nop +/* 8ECC7C 80240E5C 3C013F80 */ lui $at, 0x3f80 +/* 8ECC80 80240E60 44810000 */ mtc1 $at, $f0 +/* 8ECC84 80240E64 00000000 */ nop +/* 8ECC88 80240E68 E6000014 */ swc1 $f0, 0x14($s0) +/* 8ECC8C 80240E6C E6160010 */ swc1 $f22, 0x10($s0) +/* 8ECC90 80240E70 E6140018 */ swc1 $f20, 0x18($s0) +/* 8ECC94 80240E74 8FBF0014 */ lw $ra, 0x14($sp) +/* 8ECC98 80240E78 8FB00010 */ lw $s0, 0x10($sp) +/* 8ECC9C 80240E7C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 8ECCA0 80240E80 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 8ECCA4 80240E84 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 8ECCA8 80240E88 03E00008 */ jr $ra +/* 8ECCAC 80240E8C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E90.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E90.s deleted file mode 100644 index a56f088303..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E90.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E90 -/* 8ECCB0 80240E90 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8ECCB4 80240E94 AFB10054 */ sw $s1, 0x54($sp) -/* 8ECCB8 80240E98 0080882D */ daddu $s1, $a0, $zero -/* 8ECCBC 80240E9C AFBF005C */ sw $ra, 0x5c($sp) -/* 8ECCC0 80240EA0 AFB20058 */ sw $s2, 0x58($sp) -/* 8ECCC4 80240EA4 AFB00050 */ sw $s0, 0x50($sp) -/* 8ECCC8 80240EA8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8ECCCC 80240EAC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8ECCD0 80240EB0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8ECCD4 80240EB4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8ECCD8 80240EB8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8ECCDC 80240EBC 8E30000C */ lw $s0, 0xc($s1) -/* 8ECCE0 80240EC0 8E050000 */ lw $a1, ($s0) -/* 8ECCE4 80240EC4 0C0B1EAF */ jal get_variable -/* 8ECCE8 80240EC8 26100004 */ addiu $s0, $s0, 4 -/* 8ECCEC 80240ECC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8ECCF0 80240ED0 0040202D */ daddu $a0, $v0, $zero -/* 8ECCF4 80240ED4 8E050000 */ lw $a1, ($s0) -/* 8ECCF8 80240ED8 26100004 */ addiu $s0, $s0, 4 -/* 8ECCFC 80240EDC 0220202D */ daddu $a0, $s1, $zero -/* 8ECD00 80240EE0 0C0B210B */ jal get_float_variable -/* 8ECD04 80240EE4 0040902D */ daddu $s2, $v0, $zero -/* 8ECD08 80240EE8 8E050000 */ lw $a1, ($s0) -/* 8ECD0C 80240EEC 26100004 */ addiu $s0, $s0, 4 -/* 8ECD10 80240EF0 0220202D */ daddu $a0, $s1, $zero -/* 8ECD14 80240EF4 0C0B210B */ jal get_float_variable -/* 8ECD18 80240EF8 46000706 */ mov.s $f28, $f0 -/* 8ECD1C 80240EFC 8E050000 */ lw $a1, ($s0) -/* 8ECD20 80240F00 26100004 */ addiu $s0, $s0, 4 -/* 8ECD24 80240F04 0220202D */ daddu $a0, $s1, $zero -/* 8ECD28 80240F08 0C0B210B */ jal get_float_variable -/* 8ECD2C 80240F0C 46000686 */ mov.s $f26, $f0 -/* 8ECD30 80240F10 0220202D */ daddu $a0, $s1, $zero -/* 8ECD34 80240F14 8E050000 */ lw $a1, ($s0) -/* 8ECD38 80240F18 0C0B210B */ jal get_float_variable -/* 8ECD3C 80240F1C 46000586 */ mov.s $f22, $f0 -/* 8ECD40 80240F20 0240202D */ daddu $a0, $s2, $zero -/* 8ECD44 80240F24 0C046B4C */ jal get_model_from_list_index -/* 8ECD48 80240F28 46000606 */ mov.s $f24, $f0 -/* 8ECD4C 80240F2C 0040882D */ daddu $s1, $v0, $zero -/* 8ECD50 80240F30 96220000 */ lhu $v0, ($s1) -/* 8ECD54 80240F34 30420400 */ andi $v0, $v0, 0x400 -/* 8ECD58 80240F38 1440001E */ bnez $v0, .L80240FB4 -/* 8ECD5C 80240F3C 26300058 */ addiu $s0, $s1, 0x58 -/* 8ECD60 80240F40 4480A000 */ mtc1 $zero, $f20 -/* 8ECD64 80240F44 4406B000 */ mfc1 $a2, $f22 -/* 8ECD68 80240F48 4405A000 */ mfc1 $a1, $f20 -/* 8ECD6C 80240F4C 4407A000 */ mfc1 $a3, $f20 -/* 8ECD70 80240F50 0C019E40 */ jal guTranslateF -/* 8ECD74 80240F54 0200202D */ daddu $a0, $s0, $zero -/* 8ECD78 80240F58 4405E000 */ mfc1 $a1, $f28 -/* 8ECD7C 80240F5C 4406D000 */ mfc1 $a2, $f26 -/* 8ECD80 80240F60 4407C000 */ mfc1 $a3, $f24 -/* 8ECD84 80240F64 0C090388 */ jal func_80240E20 -/* 8ECD88 80240F68 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECD8C 80240F6C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECD90 80240F70 0200282D */ daddu $a1, $s0, $zero -/* 8ECD94 80240F74 0C019D80 */ jal guMtxCatF -/* 8ECD98 80240F78 0200302D */ daddu $a2, $s0, $zero -/* 8ECD9C 80240F7C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECDA0 80240F80 4600B587 */ neg.s $f22, $f22 -/* 8ECDA4 80240F84 4405A000 */ mfc1 $a1, $f20 -/* 8ECDA8 80240F88 4406B000 */ mfc1 $a2, $f22 -/* 8ECDAC 80240F8C 0C019E40 */ jal guTranslateF -/* 8ECDB0 80240F90 00A0382D */ daddu $a3, $a1, $zero -/* 8ECDB4 80240F94 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECDB8 80240F98 0200282D */ daddu $a1, $s0, $zero -/* 8ECDBC 80240F9C 0C019D80 */ jal guMtxCatF -/* 8ECDC0 80240FA0 00A0302D */ daddu $a2, $a1, $zero -/* 8ECDC4 80240FA4 96220000 */ lhu $v0, ($s1) -/* 8ECDC8 80240FA8 34421400 */ ori $v0, $v0, 0x1400 -/* 8ECDCC 80240FAC 0809040B */ j .L8024102C -/* 8ECDD0 80240FB0 A6220000 */ sh $v0, ($s1) -.L80240FB4: -/* 8ECDD4 80240FB4 4480A000 */ mtc1 $zero, $f20 -/* 8ECDD8 80240FB8 4406B000 */ mfc1 $a2, $f22 -/* 8ECDDC 80240FBC 4405A000 */ mfc1 $a1, $f20 -/* 8ECDE0 80240FC0 4407A000 */ mfc1 $a3, $f20 -/* 8ECDE4 80240FC4 0C019E40 */ jal guTranslateF -/* 8ECDE8 80240FC8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECDEC 80240FCC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECDF0 80240FD0 26300058 */ addiu $s0, $s1, 0x58 -/* 8ECDF4 80240FD4 0200282D */ daddu $a1, $s0, $zero -/* 8ECDF8 80240FD8 0C019D80 */ jal guMtxCatF -/* 8ECDFC 80240FDC 0200302D */ daddu $a2, $s0, $zero -/* 8ECE00 80240FE0 4405E000 */ mfc1 $a1, $f28 -/* 8ECE04 80240FE4 4406D000 */ mfc1 $a2, $f26 -/* 8ECE08 80240FE8 4407C000 */ mfc1 $a3, $f24 -/* 8ECE0C 80240FEC 0C090388 */ jal func_80240E20 -/* 8ECE10 80240FF0 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECE14 80240FF4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECE18 80240FF8 0200282D */ daddu $a1, $s0, $zero -/* 8ECE1C 80240FFC 0C019D80 */ jal guMtxCatF -/* 8ECE20 80241000 0200302D */ daddu $a2, $s0, $zero -/* 8ECE24 80241004 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECE28 80241008 4600B587 */ neg.s $f22, $f22 -/* 8ECE2C 8024100C 4405A000 */ mfc1 $a1, $f20 -/* 8ECE30 80241010 4406B000 */ mfc1 $a2, $f22 -/* 8ECE34 80241014 0C019E40 */ jal guTranslateF -/* 8ECE38 80241018 00A0382D */ daddu $a3, $a1, $zero -/* 8ECE3C 8024101C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECE40 80241020 0200282D */ daddu $a1, $s0, $zero -/* 8ECE44 80241024 0C019D80 */ jal guMtxCatF -/* 8ECE48 80241028 00A0302D */ daddu $a2, $a1, $zero -.L8024102C: -/* 8ECE4C 8024102C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8ECE50 80241030 8FB20058 */ lw $s2, 0x58($sp) -/* 8ECE54 80241034 8FB10054 */ lw $s1, 0x54($sp) -/* 8ECE58 80241038 8FB00050 */ lw $s0, 0x50($sp) -/* 8ECE5C 8024103C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8ECE60 80241040 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8ECE64 80241044 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8ECE68 80241048 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8ECE6C 8024104C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8ECE70 80241050 24020002 */ addiu $v0, $zero, 2 -/* 8ECE74 80241054 03E00008 */ jr $ra -/* 8ECE78 80241058 27BD0088 */ addiu $sp, $sp, 0x88 -/* 8ECE7C 8024105C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E90_8ECCB0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E90_8ECCB0.s new file mode 100644 index 0000000000..9537fbd801 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ECC40/func_80240E90_8ECCB0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E90_8ECCB0 +/* 8ECCB0 80240E90 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8ECCB4 80240E94 AFB10054 */ sw $s1, 0x54($sp) +/* 8ECCB8 80240E98 0080882D */ daddu $s1, $a0, $zero +/* 8ECCBC 80240E9C AFBF005C */ sw $ra, 0x5c($sp) +/* 8ECCC0 80240EA0 AFB20058 */ sw $s2, 0x58($sp) +/* 8ECCC4 80240EA4 AFB00050 */ sw $s0, 0x50($sp) +/* 8ECCC8 80240EA8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8ECCCC 80240EAC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8ECCD0 80240EB0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8ECCD4 80240EB4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8ECCD8 80240EB8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8ECCDC 80240EBC 8E30000C */ lw $s0, 0xc($s1) +/* 8ECCE0 80240EC0 8E050000 */ lw $a1, ($s0) +/* 8ECCE4 80240EC4 0C0B1EAF */ jal get_variable +/* 8ECCE8 80240EC8 26100004 */ addiu $s0, $s0, 4 +/* 8ECCEC 80240ECC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8ECCF0 80240ED0 0040202D */ daddu $a0, $v0, $zero +/* 8ECCF4 80240ED4 8E050000 */ lw $a1, ($s0) +/* 8ECCF8 80240ED8 26100004 */ addiu $s0, $s0, 4 +/* 8ECCFC 80240EDC 0220202D */ daddu $a0, $s1, $zero +/* 8ECD00 80240EE0 0C0B210B */ jal get_float_variable +/* 8ECD04 80240EE4 0040902D */ daddu $s2, $v0, $zero +/* 8ECD08 80240EE8 8E050000 */ lw $a1, ($s0) +/* 8ECD0C 80240EEC 26100004 */ addiu $s0, $s0, 4 +/* 8ECD10 80240EF0 0220202D */ daddu $a0, $s1, $zero +/* 8ECD14 80240EF4 0C0B210B */ jal get_float_variable +/* 8ECD18 80240EF8 46000706 */ mov.s $f28, $f0 +/* 8ECD1C 80240EFC 8E050000 */ lw $a1, ($s0) +/* 8ECD20 80240F00 26100004 */ addiu $s0, $s0, 4 +/* 8ECD24 80240F04 0220202D */ daddu $a0, $s1, $zero +/* 8ECD28 80240F08 0C0B210B */ jal get_float_variable +/* 8ECD2C 80240F0C 46000686 */ mov.s $f26, $f0 +/* 8ECD30 80240F10 0220202D */ daddu $a0, $s1, $zero +/* 8ECD34 80240F14 8E050000 */ lw $a1, ($s0) +/* 8ECD38 80240F18 0C0B210B */ jal get_float_variable +/* 8ECD3C 80240F1C 46000586 */ mov.s $f22, $f0 +/* 8ECD40 80240F20 0240202D */ daddu $a0, $s2, $zero +/* 8ECD44 80240F24 0C046B4C */ jal get_model_from_list_index +/* 8ECD48 80240F28 46000606 */ mov.s $f24, $f0 +/* 8ECD4C 80240F2C 0040882D */ daddu $s1, $v0, $zero +/* 8ECD50 80240F30 96220000 */ lhu $v0, ($s1) +/* 8ECD54 80240F34 30420400 */ andi $v0, $v0, 0x400 +/* 8ECD58 80240F38 1440001E */ bnez $v0, .L80240FB4 +/* 8ECD5C 80240F3C 26300058 */ addiu $s0, $s1, 0x58 +/* 8ECD60 80240F40 4480A000 */ mtc1 $zero, $f20 +/* 8ECD64 80240F44 4406B000 */ mfc1 $a2, $f22 +/* 8ECD68 80240F48 4405A000 */ mfc1 $a1, $f20 +/* 8ECD6C 80240F4C 4407A000 */ mfc1 $a3, $f20 +/* 8ECD70 80240F50 0C019E40 */ jal guTranslateF +/* 8ECD74 80240F54 0200202D */ daddu $a0, $s0, $zero +/* 8ECD78 80240F58 4405E000 */ mfc1 $a1, $f28 +/* 8ECD7C 80240F5C 4406D000 */ mfc1 $a2, $f26 +/* 8ECD80 80240F60 4407C000 */ mfc1 $a3, $f24 +/* 8ECD84 80240F64 0C090388 */ jal func_80240E20_8ECC40 +/* 8ECD88 80240F68 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECD8C 80240F6C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECD90 80240F70 0200282D */ daddu $a1, $s0, $zero +/* 8ECD94 80240F74 0C019D80 */ jal guMtxCatF +/* 8ECD98 80240F78 0200302D */ daddu $a2, $s0, $zero +/* 8ECD9C 80240F7C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECDA0 80240F80 4600B587 */ neg.s $f22, $f22 +/* 8ECDA4 80240F84 4405A000 */ mfc1 $a1, $f20 +/* 8ECDA8 80240F88 4406B000 */ mfc1 $a2, $f22 +/* 8ECDAC 80240F8C 0C019E40 */ jal guTranslateF +/* 8ECDB0 80240F90 00A0382D */ daddu $a3, $a1, $zero +/* 8ECDB4 80240F94 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECDB8 80240F98 0200282D */ daddu $a1, $s0, $zero +/* 8ECDBC 80240F9C 0C019D80 */ jal guMtxCatF +/* 8ECDC0 80240FA0 00A0302D */ daddu $a2, $a1, $zero +/* 8ECDC4 80240FA4 96220000 */ lhu $v0, ($s1) +/* 8ECDC8 80240FA8 34421400 */ ori $v0, $v0, 0x1400 +/* 8ECDCC 80240FAC 0809040B */ j .L8024102C +/* 8ECDD0 80240FB0 A6220000 */ sh $v0, ($s1) +.L80240FB4: +/* 8ECDD4 80240FB4 4480A000 */ mtc1 $zero, $f20 +/* 8ECDD8 80240FB8 4406B000 */ mfc1 $a2, $f22 +/* 8ECDDC 80240FBC 4405A000 */ mfc1 $a1, $f20 +/* 8ECDE0 80240FC0 4407A000 */ mfc1 $a3, $f20 +/* 8ECDE4 80240FC4 0C019E40 */ jal guTranslateF +/* 8ECDE8 80240FC8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECDEC 80240FCC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECDF0 80240FD0 26300058 */ addiu $s0, $s1, 0x58 +/* 8ECDF4 80240FD4 0200282D */ daddu $a1, $s0, $zero +/* 8ECDF8 80240FD8 0C019D80 */ jal guMtxCatF +/* 8ECDFC 80240FDC 0200302D */ daddu $a2, $s0, $zero +/* 8ECE00 80240FE0 4405E000 */ mfc1 $a1, $f28 +/* 8ECE04 80240FE4 4406D000 */ mfc1 $a2, $f26 +/* 8ECE08 80240FE8 4407C000 */ mfc1 $a3, $f24 +/* 8ECE0C 80240FEC 0C090388 */ jal func_80240E20_8ECC40 +/* 8ECE10 80240FF0 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECE14 80240FF4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECE18 80240FF8 0200282D */ daddu $a1, $s0, $zero +/* 8ECE1C 80240FFC 0C019D80 */ jal guMtxCatF +/* 8ECE20 80241000 0200302D */ daddu $a2, $s0, $zero +/* 8ECE24 80241004 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECE28 80241008 4600B587 */ neg.s $f22, $f22 +/* 8ECE2C 8024100C 4405A000 */ mfc1 $a1, $f20 +/* 8ECE30 80241010 4406B000 */ mfc1 $a2, $f22 +/* 8ECE34 80241014 0C019E40 */ jal guTranslateF +/* 8ECE38 80241018 00A0382D */ daddu $a3, $a1, $zero +/* 8ECE3C 8024101C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECE40 80241020 0200282D */ daddu $a1, $s0, $zero +/* 8ECE44 80241024 0C019D80 */ jal guMtxCatF +/* 8ECE48 80241028 00A0302D */ daddu $a2, $a1, $zero +.L8024102C: +/* 8ECE4C 8024102C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8ECE50 80241030 8FB20058 */ lw $s2, 0x58($sp) +/* 8ECE54 80241034 8FB10054 */ lw $s1, 0x54($sp) +/* 8ECE58 80241038 8FB00050 */ lw $s0, 0x50($sp) +/* 8ECE5C 8024103C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8ECE60 80241040 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8ECE64 80241044 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8ECE68 80241048 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8ECE6C 8024104C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8ECE70 80241050 24020002 */ addiu $v0, $zero, 2 +/* 8ECE74 80241054 03E00008 */ jr $ra +/* 8ECE78 80241058 27BD0088 */ addiu $sp, $sp, 0x88 +/* 8ECE7C 8024105C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECE80/func_802410D0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECE80/func_802410D0.s deleted file mode 100644 index 4a0431ddd6..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ECE80/func_802410D0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410D0 -/* 8ECEF0 802410D0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8ECEF4 802410D4 AFB10054 */ sw $s1, 0x54($sp) -/* 8ECEF8 802410D8 0080882D */ daddu $s1, $a0, $zero -/* 8ECEFC 802410DC AFBF005C */ sw $ra, 0x5c($sp) -/* 8ECF00 802410E0 AFB20058 */ sw $s2, 0x58($sp) -/* 8ECF04 802410E4 AFB00050 */ sw $s0, 0x50($sp) -/* 8ECF08 802410E8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8ECF0C 802410EC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8ECF10 802410F0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8ECF14 802410F4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8ECF18 802410F8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8ECF1C 802410FC 8E30000C */ lw $s0, 0xc($s1) -/* 8ECF20 80241100 8E050000 */ lw $a1, ($s0) -/* 8ECF24 80241104 0C0B1EAF */ jal get_variable -/* 8ECF28 80241108 26100004 */ addiu $s0, $s0, 4 -/* 8ECF2C 8024110C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8ECF30 80241110 0040202D */ daddu $a0, $v0, $zero -/* 8ECF34 80241114 8E050000 */ lw $a1, ($s0) -/* 8ECF38 80241118 26100004 */ addiu $s0, $s0, 4 -/* 8ECF3C 8024111C 0220202D */ daddu $a0, $s1, $zero -/* 8ECF40 80241120 0C0B210B */ jal get_float_variable -/* 8ECF44 80241124 0040902D */ daddu $s2, $v0, $zero -/* 8ECF48 80241128 8E050000 */ lw $a1, ($s0) -/* 8ECF4C 8024112C 26100004 */ addiu $s0, $s0, 4 -/* 8ECF50 80241130 0220202D */ daddu $a0, $s1, $zero -/* 8ECF54 80241134 0C0B210B */ jal get_float_variable -/* 8ECF58 80241138 46000706 */ mov.s $f28, $f0 -/* 8ECF5C 8024113C 8E050000 */ lw $a1, ($s0) -/* 8ECF60 80241140 26100004 */ addiu $s0, $s0, 4 -/* 8ECF64 80241144 0220202D */ daddu $a0, $s1, $zero -/* 8ECF68 80241148 0C0B210B */ jal get_float_variable -/* 8ECF6C 8024114C 46000686 */ mov.s $f26, $f0 -/* 8ECF70 80241150 0220202D */ daddu $a0, $s1, $zero -/* 8ECF74 80241154 8E050000 */ lw $a1, ($s0) -/* 8ECF78 80241158 0C0B210B */ jal get_float_variable -/* 8ECF7C 8024115C 46000586 */ mov.s $f22, $f0 -/* 8ECF80 80241160 0240202D */ daddu $a0, $s2, $zero -/* 8ECF84 80241164 0C046B4C */ jal get_model_from_list_index -/* 8ECF88 80241168 46000606 */ mov.s $f24, $f0 -/* 8ECF8C 8024116C 0040882D */ daddu $s1, $v0, $zero -/* 8ECF90 80241170 96220000 */ lhu $v0, ($s1) -/* 8ECF94 80241174 30420400 */ andi $v0, $v0, 0x400 -/* 8ECF98 80241178 1440001E */ bnez $v0, .L802411F4 -/* 8ECF9C 8024117C 26300058 */ addiu $s0, $s1, 0x58 -/* 8ECFA0 80241180 4480A000 */ mtc1 $zero, $f20 -/* 8ECFA4 80241184 4406B000 */ mfc1 $a2, $f22 -/* 8ECFA8 80241188 4405A000 */ mfc1 $a1, $f20 -/* 8ECFAC 8024118C 4407A000 */ mfc1 $a3, $f20 -/* 8ECFB0 80241190 0C019E40 */ jal guTranslateF -/* 8ECFB4 80241194 0200202D */ daddu $a0, $s0, $zero -/* 8ECFB8 80241198 4405E000 */ mfc1 $a1, $f28 -/* 8ECFBC 8024119C 4406D000 */ mfc1 $a2, $f26 -/* 8ECFC0 802411A0 4407C000 */ mfc1 $a3, $f24 -/* 8ECFC4 802411A4 0C090418 */ jal func_80241060 -/* 8ECFC8 802411A8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECFCC 802411AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECFD0 802411B0 0200282D */ daddu $a1, $s0, $zero -/* 8ECFD4 802411B4 0C019D80 */ jal guMtxCatF -/* 8ECFD8 802411B8 0200302D */ daddu $a2, $s0, $zero -/* 8ECFDC 802411BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECFE0 802411C0 4600B587 */ neg.s $f22, $f22 -/* 8ECFE4 802411C4 4405A000 */ mfc1 $a1, $f20 -/* 8ECFE8 802411C8 4406B000 */ mfc1 $a2, $f22 -/* 8ECFEC 802411CC 0C019E40 */ jal guTranslateF -/* 8ECFF0 802411D0 00A0382D */ daddu $a3, $a1, $zero -/* 8ECFF4 802411D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ECFF8 802411D8 0200282D */ daddu $a1, $s0, $zero -/* 8ECFFC 802411DC 0C019D80 */ jal guMtxCatF -/* 8ED000 802411E0 00A0302D */ daddu $a2, $a1, $zero -/* 8ED004 802411E4 96220000 */ lhu $v0, ($s1) -/* 8ED008 802411E8 34421400 */ ori $v0, $v0, 0x1400 -/* 8ED00C 802411EC 0809049B */ j .L8024126C -/* 8ED010 802411F0 A6220000 */ sh $v0, ($s1) -.L802411F4: -/* 8ED014 802411F4 4480A000 */ mtc1 $zero, $f20 -/* 8ED018 802411F8 4406B000 */ mfc1 $a2, $f22 -/* 8ED01C 802411FC 4405A000 */ mfc1 $a1, $f20 -/* 8ED020 80241200 4407A000 */ mfc1 $a3, $f20 -/* 8ED024 80241204 0C019E40 */ jal guTranslateF -/* 8ED028 80241208 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED02C 8024120C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED030 80241210 26300058 */ addiu $s0, $s1, 0x58 -/* 8ED034 80241214 0200282D */ daddu $a1, $s0, $zero -/* 8ED038 80241218 0C019D80 */ jal guMtxCatF -/* 8ED03C 8024121C 0200302D */ daddu $a2, $s0, $zero -/* 8ED040 80241220 4405E000 */ mfc1 $a1, $f28 -/* 8ED044 80241224 4406D000 */ mfc1 $a2, $f26 -/* 8ED048 80241228 4407C000 */ mfc1 $a3, $f24 -/* 8ED04C 8024122C 0C090418 */ jal func_80241060 -/* 8ED050 80241230 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED054 80241234 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED058 80241238 0200282D */ daddu $a1, $s0, $zero -/* 8ED05C 8024123C 0C019D80 */ jal guMtxCatF -/* 8ED060 80241240 0200302D */ daddu $a2, $s0, $zero -/* 8ED064 80241244 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED068 80241248 4600B587 */ neg.s $f22, $f22 -/* 8ED06C 8024124C 4405A000 */ mfc1 $a1, $f20 -/* 8ED070 80241250 4406B000 */ mfc1 $a2, $f22 -/* 8ED074 80241254 0C019E40 */ jal guTranslateF -/* 8ED078 80241258 00A0382D */ daddu $a3, $a1, $zero -/* 8ED07C 8024125C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED080 80241260 0200282D */ daddu $a1, $s0, $zero -/* 8ED084 80241264 0C019D80 */ jal guMtxCatF -/* 8ED088 80241268 00A0302D */ daddu $a2, $a1, $zero -.L8024126C: -/* 8ED08C 8024126C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8ED090 80241270 8FB20058 */ lw $s2, 0x58($sp) -/* 8ED094 80241274 8FB10054 */ lw $s1, 0x54($sp) -/* 8ED098 80241278 8FB00050 */ lw $s0, 0x50($sp) -/* 8ED09C 8024127C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8ED0A0 80241280 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8ED0A4 80241284 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8ED0A8 80241288 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8ED0AC 8024128C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8ED0B0 80241290 24020002 */ addiu $v0, $zero, 2 -/* 8ED0B4 80241294 03E00008 */ jr $ra -/* 8ED0B8 80241298 27BD0088 */ addiu $sp, $sp, 0x88 -/* 8ED0BC 8024129C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ECE80/func_802410D0_8ECEF0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ECE80/func_802410D0_8ECEF0.s new file mode 100644 index 0000000000..13fd98855c --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ECE80/func_802410D0_8ECEF0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410D0_8ECEF0 +/* 8ECEF0 802410D0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8ECEF4 802410D4 AFB10054 */ sw $s1, 0x54($sp) +/* 8ECEF8 802410D8 0080882D */ daddu $s1, $a0, $zero +/* 8ECEFC 802410DC AFBF005C */ sw $ra, 0x5c($sp) +/* 8ECF00 802410E0 AFB20058 */ sw $s2, 0x58($sp) +/* 8ECF04 802410E4 AFB00050 */ sw $s0, 0x50($sp) +/* 8ECF08 802410E8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8ECF0C 802410EC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8ECF10 802410F0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8ECF14 802410F4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8ECF18 802410F8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8ECF1C 802410FC 8E30000C */ lw $s0, 0xc($s1) +/* 8ECF20 80241100 8E050000 */ lw $a1, ($s0) +/* 8ECF24 80241104 0C0B1EAF */ jal get_variable +/* 8ECF28 80241108 26100004 */ addiu $s0, $s0, 4 +/* 8ECF2C 8024110C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8ECF30 80241110 0040202D */ daddu $a0, $v0, $zero +/* 8ECF34 80241114 8E050000 */ lw $a1, ($s0) +/* 8ECF38 80241118 26100004 */ addiu $s0, $s0, 4 +/* 8ECF3C 8024111C 0220202D */ daddu $a0, $s1, $zero +/* 8ECF40 80241120 0C0B210B */ jal get_float_variable +/* 8ECF44 80241124 0040902D */ daddu $s2, $v0, $zero +/* 8ECF48 80241128 8E050000 */ lw $a1, ($s0) +/* 8ECF4C 8024112C 26100004 */ addiu $s0, $s0, 4 +/* 8ECF50 80241130 0220202D */ daddu $a0, $s1, $zero +/* 8ECF54 80241134 0C0B210B */ jal get_float_variable +/* 8ECF58 80241138 46000706 */ mov.s $f28, $f0 +/* 8ECF5C 8024113C 8E050000 */ lw $a1, ($s0) +/* 8ECF60 80241140 26100004 */ addiu $s0, $s0, 4 +/* 8ECF64 80241144 0220202D */ daddu $a0, $s1, $zero +/* 8ECF68 80241148 0C0B210B */ jal get_float_variable +/* 8ECF6C 8024114C 46000686 */ mov.s $f26, $f0 +/* 8ECF70 80241150 0220202D */ daddu $a0, $s1, $zero +/* 8ECF74 80241154 8E050000 */ lw $a1, ($s0) +/* 8ECF78 80241158 0C0B210B */ jal get_float_variable +/* 8ECF7C 8024115C 46000586 */ mov.s $f22, $f0 +/* 8ECF80 80241160 0240202D */ daddu $a0, $s2, $zero +/* 8ECF84 80241164 0C046B4C */ jal get_model_from_list_index +/* 8ECF88 80241168 46000606 */ mov.s $f24, $f0 +/* 8ECF8C 8024116C 0040882D */ daddu $s1, $v0, $zero +/* 8ECF90 80241170 96220000 */ lhu $v0, ($s1) +/* 8ECF94 80241174 30420400 */ andi $v0, $v0, 0x400 +/* 8ECF98 80241178 1440001E */ bnez $v0, .L802411F4 +/* 8ECF9C 8024117C 26300058 */ addiu $s0, $s1, 0x58 +/* 8ECFA0 80241180 4480A000 */ mtc1 $zero, $f20 +/* 8ECFA4 80241184 4406B000 */ mfc1 $a2, $f22 +/* 8ECFA8 80241188 4405A000 */ mfc1 $a1, $f20 +/* 8ECFAC 8024118C 4407A000 */ mfc1 $a3, $f20 +/* 8ECFB0 80241190 0C019E40 */ jal guTranslateF +/* 8ECFB4 80241194 0200202D */ daddu $a0, $s0, $zero +/* 8ECFB8 80241198 4405E000 */ mfc1 $a1, $f28 +/* 8ECFBC 8024119C 4406D000 */ mfc1 $a2, $f26 +/* 8ECFC0 802411A0 4407C000 */ mfc1 $a3, $f24 +/* 8ECFC4 802411A4 0C090418 */ jal func_80241060_8ECE80 +/* 8ECFC8 802411A8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECFCC 802411AC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECFD0 802411B0 0200282D */ daddu $a1, $s0, $zero +/* 8ECFD4 802411B4 0C019D80 */ jal guMtxCatF +/* 8ECFD8 802411B8 0200302D */ daddu $a2, $s0, $zero +/* 8ECFDC 802411BC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECFE0 802411C0 4600B587 */ neg.s $f22, $f22 +/* 8ECFE4 802411C4 4405A000 */ mfc1 $a1, $f20 +/* 8ECFE8 802411C8 4406B000 */ mfc1 $a2, $f22 +/* 8ECFEC 802411CC 0C019E40 */ jal guTranslateF +/* 8ECFF0 802411D0 00A0382D */ daddu $a3, $a1, $zero +/* 8ECFF4 802411D4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ECFF8 802411D8 0200282D */ daddu $a1, $s0, $zero +/* 8ECFFC 802411DC 0C019D80 */ jal guMtxCatF +/* 8ED000 802411E0 00A0302D */ daddu $a2, $a1, $zero +/* 8ED004 802411E4 96220000 */ lhu $v0, ($s1) +/* 8ED008 802411E8 34421400 */ ori $v0, $v0, 0x1400 +/* 8ED00C 802411EC 0809049B */ j .L8024126C +/* 8ED010 802411F0 A6220000 */ sh $v0, ($s1) +.L802411F4: +/* 8ED014 802411F4 4480A000 */ mtc1 $zero, $f20 +/* 8ED018 802411F8 4406B000 */ mfc1 $a2, $f22 +/* 8ED01C 802411FC 4405A000 */ mfc1 $a1, $f20 +/* 8ED020 80241200 4407A000 */ mfc1 $a3, $f20 +/* 8ED024 80241204 0C019E40 */ jal guTranslateF +/* 8ED028 80241208 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED02C 8024120C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED030 80241210 26300058 */ addiu $s0, $s1, 0x58 +/* 8ED034 80241214 0200282D */ daddu $a1, $s0, $zero +/* 8ED038 80241218 0C019D80 */ jal guMtxCatF +/* 8ED03C 8024121C 0200302D */ daddu $a2, $s0, $zero +/* 8ED040 80241220 4405E000 */ mfc1 $a1, $f28 +/* 8ED044 80241224 4406D000 */ mfc1 $a2, $f26 +/* 8ED048 80241228 4407C000 */ mfc1 $a3, $f24 +/* 8ED04C 8024122C 0C090418 */ jal func_80241060_8ECE80 +/* 8ED050 80241230 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED054 80241234 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED058 80241238 0200282D */ daddu $a1, $s0, $zero +/* 8ED05C 8024123C 0C019D80 */ jal guMtxCatF +/* 8ED060 80241240 0200302D */ daddu $a2, $s0, $zero +/* 8ED064 80241244 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED068 80241248 4600B587 */ neg.s $f22, $f22 +/* 8ED06C 8024124C 4405A000 */ mfc1 $a1, $f20 +/* 8ED070 80241250 4406B000 */ mfc1 $a2, $f22 +/* 8ED074 80241254 0C019E40 */ jal guTranslateF +/* 8ED078 80241258 00A0382D */ daddu $a3, $a1, $zero +/* 8ED07C 8024125C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED080 80241260 0200282D */ daddu $a1, $s0, $zero +/* 8ED084 80241264 0C019D80 */ jal guMtxCatF +/* 8ED088 80241268 00A0302D */ daddu $a2, $a1, $zero +.L8024126C: +/* 8ED08C 8024126C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8ED090 80241270 8FB20058 */ lw $s2, 0x58($sp) +/* 8ED094 80241274 8FB10054 */ lw $s1, 0x54($sp) +/* 8ED098 80241278 8FB00050 */ lw $s0, 0x50($sp) +/* 8ED09C 8024127C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8ED0A0 80241280 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8ED0A4 80241284 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8ED0A8 80241288 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8ED0AC 8024128C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8ED0B0 80241290 24020002 */ addiu $v0, $zero, 2 +/* 8ED0B4 80241294 03E00008 */ jr $ra +/* 8ED0B8 80241298 27BD0088 */ addiu $sp, $sp, 0x88 +/* 8ED0BC 8024129C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0.s deleted file mode 100644 index cdcd9ab48e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C0 -/* 8ED0E0 802412C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED0E4 802412C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED0E8 802412C8 0C03A631 */ jal func_800E98C4 -/* 8ED0EC 802412CC 00000000 */ nop -/* 8ED0F0 802412D0 0C03A6DB */ jal sync_status_menu -/* 8ED0F4 802412D4 00000000 */ nop -/* 8ED0F8 802412D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED0FC 802412DC 24020002 */ addiu $v0, $zero, 2 -/* 8ED100 802412E0 03E00008 */ jr $ra -/* 8ED104 802412E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s new file mode 100644 index 0000000000..f55916e467 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412C0_8ED0E0 +/* 8ED0E0 802412C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED0E4 802412C4 AFBF0010 */ sw $ra, 0x10($sp) +/* 8ED0E8 802412C8 0C03A631 */ jal func_800E98C4 +/* 8ED0EC 802412CC 00000000 */ nop +/* 8ED0F0 802412D0 0C03A6DB */ jal sync_status_menu +/* 8ED0F4 802412D4 00000000 */ nop +/* 8ED0F8 802412D8 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ED0FC 802412DC 24020002 */ addiu $v0, $zero, 2 +/* 8ED100 802412E0 03E00008 */ jr $ra +/* 8ED104 802412E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8.s deleted file mode 100644 index f27b4e02d2..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E8 -/* 8ED108 802412E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ED10C 802412EC AFB10014 */ sw $s1, 0x14($sp) -/* 8ED110 802412F0 0080882D */ daddu $s1, $a0, $zero -/* 8ED114 802412F4 AFBF0018 */ sw $ra, 0x18($sp) -/* 8ED118 802412F8 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED11C 802412FC 8E30000C */ lw $s0, 0xc($s1) -/* 8ED120 80241300 8E050000 */ lw $a1, ($s0) -/* 8ED124 80241304 0C0B1EAF */ jal get_variable -/* 8ED128 80241308 26100004 */ addiu $s0, $s0, 4 -/* 8ED12C 8024130C 0220202D */ daddu $a0, $s1, $zero -/* 8ED130 80241310 8E050000 */ lw $a1, ($s0) -/* 8ED134 80241314 0C0B1EAF */ jal get_variable -/* 8ED138 80241318 0040882D */ daddu $s1, $v0, $zero -/* 8ED13C 8024131C 0000202D */ daddu $a0, $zero, $zero -/* 8ED140 80241320 0080282D */ daddu $a1, $a0, $zero -/* 8ED144 80241324 0040802D */ daddu $s0, $v0, $zero -/* 8ED148 80241328 240600BE */ addiu $a2, $zero, 0xbe -/* 8ED14C 8024132C 0C04DF93 */ jal func_80137E4C -/* 8ED150 80241330 24070091 */ addiu $a3, $zero, 0x91 -/* 8ED154 80241334 44900000 */ mtc1 $s0, $f0 -/* 8ED158 80241338 00000000 */ nop -/* 8ED15C 8024133C 46800020 */ cvt.s.w $f0, $f0 -/* 8ED160 80241340 44050000 */ mfc1 $a1, $f0 -/* 8ED164 80241344 0C04DF62 */ jal func_80137D88 -/* 8ED168 80241348 322400FF */ andi $a0, $s1, 0xff -/* 8ED16C 8024134C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8ED170 80241350 8FB10014 */ lw $s1, 0x14($sp) -/* 8ED174 80241354 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED178 80241358 24020002 */ addiu $v0, $zero, 2 -/* 8ED17C 8024135C 03E00008 */ jr $ra -/* 8ED180 80241360 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s new file mode 100644 index 0000000000..c1e6b2123b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412E8_8ED108.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412E8_8ED108 +/* 8ED108 802412E8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8ED10C 802412EC AFB10014 */ sw $s1, 0x14($sp) +/* 8ED110 802412F0 0080882D */ daddu $s1, $a0, $zero +/* 8ED114 802412F4 AFBF0018 */ sw $ra, 0x18($sp) +/* 8ED118 802412F8 AFB00010 */ sw $s0, 0x10($sp) +/* 8ED11C 802412FC 8E30000C */ lw $s0, 0xc($s1) +/* 8ED120 80241300 8E050000 */ lw $a1, ($s0) +/* 8ED124 80241304 0C0B1EAF */ jal get_variable +/* 8ED128 80241308 26100004 */ addiu $s0, $s0, 4 +/* 8ED12C 8024130C 0220202D */ daddu $a0, $s1, $zero +/* 8ED130 80241310 8E050000 */ lw $a1, ($s0) +/* 8ED134 80241314 0C0B1EAF */ jal get_variable +/* 8ED138 80241318 0040882D */ daddu $s1, $v0, $zero +/* 8ED13C 8024131C 0000202D */ daddu $a0, $zero, $zero +/* 8ED140 80241320 0080282D */ daddu $a1, $a0, $zero +/* 8ED144 80241324 0040802D */ daddu $s0, $v0, $zero +/* 8ED148 80241328 240600BE */ addiu $a2, $zero, 0xbe +/* 8ED14C 8024132C 0C04DF93 */ jal func_80137E4C +/* 8ED150 80241330 24070091 */ addiu $a3, $zero, 0x91 +/* 8ED154 80241334 44900000 */ mtc1 $s0, $f0 +/* 8ED158 80241338 00000000 */ nop +/* 8ED15C 8024133C 46800020 */ cvt.s.w $f0, $f0 +/* 8ED160 80241340 44050000 */ mfc1 $a1, $f0 +/* 8ED164 80241344 0C04DF62 */ jal func_80137D88 +/* 8ED168 80241348 322400FF */ andi $a0, $s1, 0xff +/* 8ED16C 8024134C 8FBF0018 */ lw $ra, 0x18($sp) +/* 8ED170 80241350 8FB10014 */ lw $s1, 0x14($sp) +/* 8ED174 80241354 8FB00010 */ lw $s0, 0x10($sp) +/* 8ED178 80241358 24020002 */ addiu $v0, $zero, 2 +/* 8ED17C 8024135C 03E00008 */ jr $ra +/* 8ED180 80241360 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364.s deleted file mode 100644 index 84996f78d5..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241364 -/* 8ED184 80241364 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ED188 80241368 AFB10014 */ sw $s1, 0x14($sp) -/* 8ED18C 8024136C 0080882D */ daddu $s1, $a0, $zero -/* 8ED190 80241370 AFBF0018 */ sw $ra, 0x18($sp) -/* 8ED194 80241374 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED198 80241378 8E30000C */ lw $s0, 0xc($s1) -/* 8ED19C 8024137C 8E050000 */ lw $a1, ($s0) -/* 8ED1A0 80241380 0C0B1EAF */ jal get_variable -/* 8ED1A4 80241384 26100004 */ addiu $s0, $s0, 4 -/* 8ED1A8 80241388 0220202D */ daddu $a0, $s1, $zero -/* 8ED1AC 8024138C 8E050000 */ lw $a1, ($s0) -/* 8ED1B0 80241390 0C0B1EAF */ jal get_variable -/* 8ED1B4 80241394 0040802D */ daddu $s0, $v0, $zero -/* 8ED1B8 80241398 44820000 */ mtc1 $v0, $f0 -/* 8ED1BC 8024139C 00000000 */ nop -/* 8ED1C0 802413A0 46800020 */ cvt.s.w $f0, $f0 -/* 8ED1C4 802413A4 24020002 */ addiu $v0, $zero, 2 -/* 8ED1C8 802413A8 00501804 */ sllv $v1, $s0, $v0 -/* 8ED1CC 802413AC 00701821 */ addu $v1, $v1, $s0 -/* 8ED1D0 802413B0 00431804 */ sllv $v1, $v1, $v0 -/* 8ED1D4 802413B4 00701823 */ subu $v1, $v1, $s0 -/* 8ED1D8 802413B8 000320C0 */ sll $a0, $v1, 3 -/* 8ED1DC 802413BC 00641821 */ addu $v1, $v1, $a0 -/* 8ED1E0 802413C0 000318C0 */ sll $v1, $v1, 3 -/* 8ED1E4 802413C4 3C01800B */ lui $at, 0x800b -/* 8ED1E8 802413C8 00230821 */ addu $at, $at, $v1 -/* 8ED1EC 802413CC E4201D98 */ swc1 $f0, 0x1d98($at) -/* 8ED1F0 802413D0 8FBF0018 */ lw $ra, 0x18($sp) -/* 8ED1F4 802413D4 8FB10014 */ lw $s1, 0x14($sp) -/* 8ED1F8 802413D8 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED1FC 802413DC 03E00008 */ jr $ra -/* 8ED200 802413E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s new file mode 100644 index 0000000000..939320055f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241364_8ED184.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241364_8ED184 +/* 8ED184 80241364 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8ED188 80241368 AFB10014 */ sw $s1, 0x14($sp) +/* 8ED18C 8024136C 0080882D */ daddu $s1, $a0, $zero +/* 8ED190 80241370 AFBF0018 */ sw $ra, 0x18($sp) +/* 8ED194 80241374 AFB00010 */ sw $s0, 0x10($sp) +/* 8ED198 80241378 8E30000C */ lw $s0, 0xc($s1) +/* 8ED19C 8024137C 8E050000 */ lw $a1, ($s0) +/* 8ED1A0 80241380 0C0B1EAF */ jal get_variable +/* 8ED1A4 80241384 26100004 */ addiu $s0, $s0, 4 +/* 8ED1A8 80241388 0220202D */ daddu $a0, $s1, $zero +/* 8ED1AC 8024138C 8E050000 */ lw $a1, ($s0) +/* 8ED1B0 80241390 0C0B1EAF */ jal get_variable +/* 8ED1B4 80241394 0040802D */ daddu $s0, $v0, $zero +/* 8ED1B8 80241398 44820000 */ mtc1 $v0, $f0 +/* 8ED1BC 8024139C 00000000 */ nop +/* 8ED1C0 802413A0 46800020 */ cvt.s.w $f0, $f0 +/* 8ED1C4 802413A4 24020002 */ addiu $v0, $zero, 2 +/* 8ED1C8 802413A8 00501804 */ sllv $v1, $s0, $v0 +/* 8ED1CC 802413AC 00701821 */ addu $v1, $v1, $s0 +/* 8ED1D0 802413B0 00431804 */ sllv $v1, $v1, $v0 +/* 8ED1D4 802413B4 00701823 */ subu $v1, $v1, $s0 +/* 8ED1D8 802413B8 000320C0 */ sll $a0, $v1, 3 +/* 8ED1DC 802413BC 00641821 */ addu $v1, $v1, $a0 +/* 8ED1E0 802413C0 000318C0 */ sll $v1, $v1, 3 +/* 8ED1E4 802413C4 3C01800B */ lui $at, 0x800b +/* 8ED1E8 802413C8 00230821 */ addu $at, $at, $v1 +/* 8ED1EC 802413CC E4201D98 */ swc1 $f0, 0x1d98($at) +/* 8ED1F0 802413D0 8FBF0018 */ lw $ra, 0x18($sp) +/* 8ED1F4 802413D4 8FB10014 */ lw $s1, 0x14($sp) +/* 8ED1F8 802413D8 8FB00010 */ lw $s0, 0x10($sp) +/* 8ED1FC 802413DC 03E00008 */ jr $ra +/* 8ED200 802413E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4.s deleted file mode 100644 index 809ae86872..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413E4 -/* 8ED204 802413E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED208 802413E8 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED20C 802413EC 8C82000C */ lw $v0, 0xc($a0) -/* 8ED210 802413F0 0C0B1EAF */ jal get_variable -/* 8ED214 802413F4 8C450000 */ lw $a1, ($v0) -/* 8ED218 802413F8 0C0B1059 */ jal does_script_exist -/* 8ED21C 802413FC 0040202D */ daddu $a0, $v0, $zero -/* 8ED220 80241400 2C420001 */ sltiu $v0, $v0, 1 -/* 8ED224 80241404 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED228 80241408 00021040 */ sll $v0, $v0, 1 -/* 8ED22C 8024140C 03E00008 */ jr $ra -/* 8ED230 80241410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s new file mode 100644 index 0000000000..67794efeef --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413E4_8ED204 +/* 8ED204 802413E4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED208 802413E8 AFBF0010 */ sw $ra, 0x10($sp) +/* 8ED20C 802413EC 8C82000C */ lw $v0, 0xc($a0) +/* 8ED210 802413F0 0C0B1EAF */ jal get_variable +/* 8ED214 802413F4 8C450000 */ lw $a1, ($v0) +/* 8ED218 802413F8 0C0B1059 */ jal does_script_exist +/* 8ED21C 802413FC 0040202D */ daddu $a0, $v0, $zero +/* 8ED220 80241400 2C420001 */ sltiu $v0, $v0, 1 +/* 8ED224 80241404 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ED228 80241408 00021040 */ sll $v0, $v0, 1 +/* 8ED22C 8024140C 03E00008 */ jr $ra +/* 8ED230 80241410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414.s deleted file mode 100644 index 45a140118f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241414 -/* 8ED234 80241414 3C028011 */ lui $v0, 0x8011 -/* 8ED238 80241418 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 8ED23C 8024141C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED240 80241420 10400003 */ beqz $v0, .L80241430 -/* 8ED244 80241424 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED248 80241428 0C03AE06 */ jal partner_suspend_ability_script -/* 8ED24C 8024142C 00000000 */ nop -.L80241430: -/* 8ED250 80241430 24020002 */ addiu $v0, $zero, 2 -/* 8ED254 80241434 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED258 80241438 03E00008 */ jr $ra -/* 8ED25C 8024143C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s new file mode 100644 index 0000000000..633f211abf --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241414_8ED234 +/* 8ED234 80241414 3C028011 */ lui $v0, 0x8011 +/* 8ED238 80241418 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 8ED23C 8024141C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED240 80241420 10400003 */ beqz $v0, .L80241430 +/* 8ED244 80241424 AFBF0010 */ sw $ra, 0x10($sp) +/* 8ED248 80241428 0C03AE06 */ jal partner_suspend_ability_script +/* 8ED24C 8024142C 00000000 */ nop +.L80241430: +/* 8ED250 80241430 24020002 */ addiu $v0, $zero, 2 +/* 8ED254 80241434 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ED258 80241438 03E00008 */ jr $ra +/* 8ED25C 8024143C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440.s deleted file mode 100644 index 25c23acff9..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241440 -/* 8ED260 80241440 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED264 80241444 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED268 80241448 0C03AE18 */ jal partner_resume_ability_script -/* 8ED26C 8024144C 00000000 */ nop -/* 8ED270 80241450 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED274 80241454 24020002 */ addiu $v0, $zero, 2 -/* 8ED278 80241458 03E00008 */ jr $ra -/* 8ED27C 8024145C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s new file mode 100644 index 0000000000..1b754b3e3b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241440_8ED260 +/* 8ED260 80241440 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED264 80241444 AFBF0010 */ sw $ra, 0x10($sp) +/* 8ED268 80241448 0C03AE18 */ jal partner_resume_ability_script +/* 8ED26C 8024144C 00000000 */ nop +/* 8ED270 80241450 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ED274 80241454 24020002 */ addiu $v0, $zero, 2 +/* 8ED278 80241458 03E00008 */ jr $ra +/* 8ED27C 8024145C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460.s deleted file mode 100644 index 77f2c40a18..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241460 -/* 8ED280 80241460 3C058011 */ lui $a1, %hi(gPlayerData) -/* 8ED284 80241464 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 8ED288 80241468 AC800088 */ sw $zero, 0x88($a0) -/* 8ED28C 8024146C 80A30003 */ lb $v1, 3($a1) -/* 8ED290 80241470 80A20002 */ lb $v0, 2($a1) -/* 8ED294 80241474 1462000B */ bne $v1, $v0, .L802414A4 -/* 8ED298 80241478 00A0302D */ daddu $a2, $a1, $zero -/* 8ED29C 8024147C 80A30006 */ lb $v1, 6($a1) -/* 8ED2A0 80241480 80A20005 */ lb $v0, 5($a1) -/* 8ED2A4 80241484 14620007 */ bne $v1, $v0, .L802414A4 -/* 8ED2A8 80241488 00000000 */ nop -/* 8ED2AC 8024148C 80C2028E */ lb $v0, 0x28e($a2) -/* 8ED2B0 80241490 84C30290 */ lh $v1, 0x290($a2) -/* 8ED2B4 80241494 00021200 */ sll $v0, $v0, 8 -/* 8ED2B8 80241498 14620004 */ bne $v1, $v0, .L802414AC -/* 8ED2BC 8024149C 24020001 */ addiu $v0, $zero, 1 -/* 8ED2C0 802414A0 AC820088 */ sw $v0, 0x88($a0) -.L802414A4: -/* 8ED2C4 802414A4 03E00008 */ jr $ra -/* 8ED2C8 802414A8 24020002 */ addiu $v0, $zero, 2 -.L802414AC: -/* 8ED2CC 802414AC 03E00008 */ jr $ra -/* 8ED2D0 802414B0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s new file mode 100644 index 0000000000..42143b52b2 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241460_8ED280.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241460_8ED280 +/* 8ED280 80241460 3C058011 */ lui $a1, %hi(gPlayerData) +/* 8ED284 80241464 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* 8ED288 80241468 AC800088 */ sw $zero, 0x88($a0) +/* 8ED28C 8024146C 80A30003 */ lb $v1, 3($a1) +/* 8ED290 80241470 80A20002 */ lb $v0, 2($a1) +/* 8ED294 80241474 1462000B */ bne $v1, $v0, .L802414A4 +/* 8ED298 80241478 00A0302D */ daddu $a2, $a1, $zero +/* 8ED29C 8024147C 80A30006 */ lb $v1, 6($a1) +/* 8ED2A0 80241480 80A20005 */ lb $v0, 5($a1) +/* 8ED2A4 80241484 14620007 */ bne $v1, $v0, .L802414A4 +/* 8ED2A8 80241488 00000000 */ nop +/* 8ED2AC 8024148C 80C2028E */ lb $v0, 0x28e($a2) +/* 8ED2B0 80241490 84C30290 */ lh $v1, 0x290($a2) +/* 8ED2B4 80241494 00021200 */ sll $v0, $v0, 8 +/* 8ED2B8 80241498 14620004 */ bne $v1, $v0, .L802414AC +/* 8ED2BC 8024149C 24020001 */ addiu $v0, $zero, 1 +/* 8ED2C0 802414A0 AC820088 */ sw $v0, 0x88($a0) +.L802414A4: +/* 8ED2C4 802414A4 03E00008 */ jr $ra +/* 8ED2C8 802414A8 24020002 */ addiu $v0, $zero, 2 +.L802414AC: +/* 8ED2CC 802414AC 03E00008 */ jr $ra +/* 8ED2D0 802414B0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4.s deleted file mode 100644 index fa3086dc5a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414B4 -/* 8ED2D4 802414B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ED2D8 802414B8 AFB10014 */ sw $s1, 0x14($sp) -/* 8ED2DC 802414BC 0080882D */ daddu $s1, $a0, $zero -/* 8ED2E0 802414C0 AFBF001C */ sw $ra, 0x1c($sp) -/* 8ED2E4 802414C4 AFB20018 */ sw $s2, 0x18($sp) -/* 8ED2E8 802414C8 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED2EC 802414CC 8E30000C */ lw $s0, 0xc($s1) -/* 8ED2F0 802414D0 8E050000 */ lw $a1, ($s0) -/* 8ED2F4 802414D4 0C0B1EAF */ jal get_variable -/* 8ED2F8 802414D8 26100004 */ addiu $s0, $s0, 4 -/* 8ED2FC 802414DC 8E050000 */ lw $a1, ($s0) -/* 8ED300 802414E0 26100004 */ addiu $s0, $s0, 4 -/* 8ED304 802414E4 0220202D */ daddu $a0, $s1, $zero -/* 8ED308 802414E8 0C0B1EAF */ jal get_variable -/* 8ED30C 802414EC 0040902D */ daddu $s2, $v0, $zero -/* 8ED310 802414F0 0220202D */ daddu $a0, $s1, $zero -/* 8ED314 802414F4 8E050000 */ lw $a1, ($s0) -/* 8ED318 802414F8 0C0B1EAF */ jal get_variable -/* 8ED31C 802414FC 0040802D */ daddu $s0, $v0, $zero -/* 8ED320 80241500 0000202D */ daddu $a0, $zero, $zero -/* 8ED324 80241504 324500FF */ andi $a1, $s2, 0xff -/* 8ED328 80241508 320600FF */ andi $a2, $s0, 0xff -/* 8ED32C 8024150C 0C04DF84 */ jal func_80137E10 -/* 8ED330 80241510 304700FF */ andi $a3, $v0, 0xff -/* 8ED334 80241514 8FBF001C */ lw $ra, 0x1c($sp) -/* 8ED338 80241518 8FB20018 */ lw $s2, 0x18($sp) -/* 8ED33C 8024151C 8FB10014 */ lw $s1, 0x14($sp) -/* 8ED340 80241520 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED344 80241524 24020002 */ addiu $v0, $zero, 2 -/* 8ED348 80241528 03E00008 */ jr $ra -/* 8ED34C 8024152C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s new file mode 100644 index 0000000000..66a6d94837 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802414B4_8ED2D4.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414B4_8ED2D4 +/* 8ED2D4 802414B4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8ED2D8 802414B8 AFB10014 */ sw $s1, 0x14($sp) +/* 8ED2DC 802414BC 0080882D */ daddu $s1, $a0, $zero +/* 8ED2E0 802414C0 AFBF001C */ sw $ra, 0x1c($sp) +/* 8ED2E4 802414C4 AFB20018 */ sw $s2, 0x18($sp) +/* 8ED2E8 802414C8 AFB00010 */ sw $s0, 0x10($sp) +/* 8ED2EC 802414CC 8E30000C */ lw $s0, 0xc($s1) +/* 8ED2F0 802414D0 8E050000 */ lw $a1, ($s0) +/* 8ED2F4 802414D4 0C0B1EAF */ jal get_variable +/* 8ED2F8 802414D8 26100004 */ addiu $s0, $s0, 4 +/* 8ED2FC 802414DC 8E050000 */ lw $a1, ($s0) +/* 8ED300 802414E0 26100004 */ addiu $s0, $s0, 4 +/* 8ED304 802414E4 0220202D */ daddu $a0, $s1, $zero +/* 8ED308 802414E8 0C0B1EAF */ jal get_variable +/* 8ED30C 802414EC 0040902D */ daddu $s2, $v0, $zero +/* 8ED310 802414F0 0220202D */ daddu $a0, $s1, $zero +/* 8ED314 802414F4 8E050000 */ lw $a1, ($s0) +/* 8ED318 802414F8 0C0B1EAF */ jal get_variable +/* 8ED31C 802414FC 0040802D */ daddu $s0, $v0, $zero +/* 8ED320 80241500 0000202D */ daddu $a0, $zero, $zero +/* 8ED324 80241504 324500FF */ andi $a1, $s2, 0xff +/* 8ED328 80241508 320600FF */ andi $a2, $s0, 0xff +/* 8ED32C 8024150C 0C04DF84 */ jal func_80137E10 +/* 8ED330 80241510 304700FF */ andi $a3, $v0, 0xff +/* 8ED334 80241514 8FBF001C */ lw $ra, 0x1c($sp) +/* 8ED338 80241518 8FB20018 */ lw $s2, 0x18($sp) +/* 8ED33C 8024151C 8FB10014 */ lw $s1, 0x14($sp) +/* 8ED340 80241520 8FB00010 */ lw $s0, 0x10($sp) +/* 8ED344 80241524 24020002 */ addiu $v0, $zero, 2 +/* 8ED348 80241528 03E00008 */ jr $ra +/* 8ED34C 8024152C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530.s deleted file mode 100644 index 0c90a923fa..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241530 -/* 8ED350 80241530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED354 80241534 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED358 80241538 8C82000C */ lw $v0, 0xc($a0) -/* 8ED35C 8024153C 3C068011 */ lui $a2, 0x8011 -/* 8ED360 80241540 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 8ED364 80241544 0C0B2026 */ jal set_variable -/* 8ED368 80241548 8C450000 */ lw $a1, ($v0) -/* 8ED36C 8024154C 0C03AC5A */ jal func_800EB168 -/* 8ED370 80241550 0000202D */ daddu $a0, $zero, $zero -/* 8ED374 80241554 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED378 80241558 24020002 */ addiu $v0, $zero, 2 -/* 8ED37C 8024155C 03E00008 */ jr $ra -/* 8ED380 80241560 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s new file mode 100644 index 0000000000..19cf43f203 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241530_8ED350 +/* 8ED350 80241530 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED354 80241534 AFBF0010 */ sw $ra, 0x10($sp) +/* 8ED358 80241538 8C82000C */ lw $v0, 0xc($a0) +/* 8ED35C 8024153C 3C068011 */ lui $a2, 0x8011 +/* 8ED360 80241540 80C6F2A2 */ lb $a2, -0xd5e($a2) +/* 8ED364 80241544 0C0B2026 */ jal set_variable +/* 8ED368 80241548 8C450000 */ lw $a1, ($v0) +/* 8ED36C 8024154C 0C03AC5A */ jal func_800EB168 +/* 8ED370 80241550 0000202D */ daddu $a0, $zero, $zero +/* 8ED374 80241554 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ED378 80241558 24020002 */ addiu $v0, $zero, 2 +/* 8ED37C 8024155C 03E00008 */ jr $ra +/* 8ED380 80241560 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564.s deleted file mode 100644 index b3f70f67c3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241564 -/* 8ED384 80241564 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED388 80241568 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED38C 8024156C 8C82000C */ lw $v0, 0xc($a0) -/* 8ED390 80241570 0C0B1EAF */ jal get_variable -/* 8ED394 80241574 8C450000 */ lw $a1, ($v0) -/* 8ED398 80241578 00021600 */ sll $v0, $v0, 0x18 -/* 8ED39C 8024157C 0C03AC5A */ jal func_800EB168 -/* 8ED3A0 80241580 00022603 */ sra $a0, $v0, 0x18 -/* 8ED3A4 80241584 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED3A8 80241588 24020002 */ addiu $v0, $zero, 2 -/* 8ED3AC 8024158C 03E00008 */ jr $ra -/* 8ED3B0 80241590 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s new file mode 100644 index 0000000000..3f8a50f883 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241564_8ED384 +/* 8ED384 80241564 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED388 80241568 AFBF0010 */ sw $ra, 0x10($sp) +/* 8ED38C 8024156C 8C82000C */ lw $v0, 0xc($a0) +/* 8ED390 80241570 0C0B1EAF */ jal get_variable +/* 8ED394 80241574 8C450000 */ lw $a1, ($v0) +/* 8ED398 80241578 00021600 */ sll $v0, $v0, 0x18 +/* 8ED39C 8024157C 0C03AC5A */ jal func_800EB168 +/* 8ED3A0 80241580 00022603 */ sra $a0, $v0, 0x18 +/* 8ED3A4 80241584 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ED3A8 80241588 24020002 */ addiu $v0, $zero, 2 +/* 8ED3AC 8024158C 03E00008 */ jr $ra +/* 8ED3B0 80241590 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241594.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241594.s deleted file mode 100644 index 251b7d7e9a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241594.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241594 -/* 8ED3B4 80241594 03E00008 */ jr $ra -/* 8ED3B8 80241598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241594_8ED3B4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241594_8ED3B4.s new file mode 100644 index 0000000000..db4c2294e5 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241594_8ED3B4.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241594_8ED3B4 +/* 8ED3B4 80241594 03E00008 */ jr $ra +/* 8ED3B8 80241598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_8024159C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_8024159C.s deleted file mode 100644 index f06392957b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_8024159C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024159C -/* 8ED3BC 8024159C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED3C0 802415A0 0000202D */ daddu $a0, $zero, $zero -/* 8ED3C4 802415A4 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8ED3C8 802415A8 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED3CC 802415AC 0C01559B */ jal func_8005566C -/* 8ED3D0 802415B0 24060001 */ addiu $a2, $zero, 1 -/* 8ED3D4 802415B4 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED3D8 802415B8 24020002 */ addiu $v0, $zero, 2 -/* 8ED3DC 802415BC 03E00008 */ jr $ra -/* 8ED3E0 802415C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_8024159C_8ED3BC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_8024159C_8ED3BC.s new file mode 100644 index 0000000000..c8086f6bde --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_8024159C_8ED3BC.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024159C_8ED3BC +/* 8ED3BC 8024159C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED3C0 802415A0 0000202D */ daddu $a0, $zero, $zero +/* 8ED3C4 802415A4 240503E8 */ addiu $a1, $zero, 0x3e8 +/* 8ED3C8 802415A8 AFBF0010 */ sw $ra, 0x10($sp) +/* 8ED3CC 802415AC 0C01559B */ jal func_8005566C +/* 8ED3D0 802415B0 24060001 */ addiu $a2, $zero, 1 +/* 8ED3D4 802415B4 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ED3D8 802415B8 24020002 */ addiu $v0, $zero, 2 +/* 8ED3DC 802415BC 03E00008 */ jr $ra +/* 8ED3E0 802415C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415C4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415C4.s deleted file mode 100644 index b72627bb24..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415C4.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415C4 -/* 8ED3E4 802415C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED3E8 802415C8 0000202D */ daddu $a0, $zero, $zero -/* 8ED3EC 802415CC 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8ED3F0 802415D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED3F4 802415D4 0C01559B */ jal func_8005566C -/* 8ED3F8 802415D8 2406003F */ addiu $a2, $zero, 0x3f -/* 8ED3FC 802415DC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED400 802415E0 24020002 */ addiu $v0, $zero, 2 -/* 8ED404 802415E4 03E00008 */ jr $ra -/* 8ED408 802415E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415C4_8ED3E4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415C4_8ED3E4.s new file mode 100644 index 0000000000..4b51da71b7 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415C4_8ED3E4.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415C4_8ED3E4 +/* 8ED3E4 802415C4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED3E8 802415C8 0000202D */ daddu $a0, $zero, $zero +/* 8ED3EC 802415CC 240503E8 */ addiu $a1, $zero, 0x3e8 +/* 8ED3F0 802415D0 AFBF0010 */ sw $ra, 0x10($sp) +/* 8ED3F4 802415D4 0C01559B */ jal func_8005566C +/* 8ED3F8 802415D8 2406003F */ addiu $a2, $zero, 0x3f +/* 8ED3FC 802415DC 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ED400 802415E0 24020002 */ addiu $v0, $zero, 2 +/* 8ED404 802415E4 03E00008 */ jr $ra +/* 8ED408 802415E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC.s deleted file mode 100644 index 7d39e4d61a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415EC -/* 8ED40C 802415EC 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 8ED410 802415F0 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 8ED414 802415F4 AC800084 */ sw $zero, 0x84($a0) -/* 8ED418 802415F8 80620000 */ lb $v0, ($v1) -/* 8ED41C 802415FC 10400005 */ beqz $v0, .L80241614 -/* 8ED420 80241600 24020003 */ addiu $v0, $zero, 3 -/* 8ED424 80241604 80630003 */ lb $v1, 3($v1) -/* 8ED428 80241608 14620002 */ bne $v1, $v0, .L80241614 -/* 8ED42C 8024160C 24020001 */ addiu $v0, $zero, 1 -/* 8ED430 80241610 AC820084 */ sw $v0, 0x84($a0) -.L80241614: -/* 8ED434 80241614 03E00008 */ jr $ra -/* 8ED438 80241618 24020002 */ addiu $v0, $zero, 2 -/* 8ED43C 8024161C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s new file mode 100644 index 0000000000..1cd724db1a --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802415EC_8ED40C.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415EC_8ED40C +/* 8ED40C 802415EC 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* 8ED410 802415F0 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 8ED414 802415F4 AC800084 */ sw $zero, 0x84($a0) +/* 8ED418 802415F8 80620000 */ lb $v0, ($v1) +/* 8ED41C 802415FC 10400005 */ beqz $v0, .L80241614 +/* 8ED420 80241600 24020003 */ addiu $v0, $zero, 3 +/* 8ED424 80241604 80630003 */ lb $v1, 3($v1) +/* 8ED428 80241608 14620002 */ bne $v1, $v0, .L80241614 +/* 8ED42C 8024160C 24020001 */ addiu $v0, $zero, 1 +/* 8ED430 80241610 AC820084 */ sw $v0, 0x84($a0) +.L80241614: +/* 8ED434 80241614 03E00008 */ jr $ra +/* 8ED438 80241618 24020002 */ addiu $v0, $zero, 2 +/* 8ED43C 8024161C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620.s deleted file mode 100644 index 84bfd7534d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241620 -/* 8ED440 80241620 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ED444 80241624 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED448 80241628 3C108025 */ lui $s0, 0x8025 -/* 8ED44C 8024162C 2610A908 */ addiu $s0, $s0, -0x56f8 -/* 8ED450 80241630 AFBF0018 */ sw $ra, 0x18($sp) -/* 8ED454 80241634 AFB10014 */ sw $s1, 0x14($sp) -/* 8ED458 80241638 8E020000 */ lw $v0, ($s0) -/* 8ED45C 8024163C 14400010 */ bnez $v0, .L80241680 -/* 8ED460 80241640 0080882D */ daddu $s1, $a0, $zero -/* 8ED464 80241644 0C00AB39 */ jal heap_malloc -/* 8ED468 80241648 24040040 */ addiu $a0, $zero, 0x40 -/* 8ED46C 8024164C AE020000 */ sw $v0, ($s0) -/* 8ED470 80241650 0000182D */ daddu $v1, $zero, $zero -/* 8ED474 80241654 0040282D */ daddu $a1, $v0, $zero -/* 8ED478 80241658 0220202D */ daddu $a0, $s1, $zero -.L8024165C: -/* 8ED47C 8024165C 8C820084 */ lw $v0, 0x84($a0) -/* 8ED480 80241660 24840004 */ addiu $a0, $a0, 4 -/* 8ED484 80241664 24630001 */ addiu $v1, $v1, 1 -/* 8ED488 80241668 ACA20000 */ sw $v0, ($a1) -/* 8ED48C 8024166C 28620010 */ slti $v0, $v1, 0x10 -/* 8ED490 80241670 1440FFFA */ bnez $v0, .L8024165C -/* 8ED494 80241674 24A50004 */ addiu $a1, $a1, 4 -/* 8ED498 80241678 080905AF */ j .L802416BC -/* 8ED49C 8024167C 00000000 */ nop -.L80241680: -/* 8ED4A0 80241680 0000182D */ daddu $v1, $zero, $zero -/* 8ED4A4 80241684 0040282D */ daddu $a1, $v0, $zero -/* 8ED4A8 80241688 0220202D */ daddu $a0, $s1, $zero -.L8024168C: -/* 8ED4AC 8024168C 8CA20000 */ lw $v0, ($a1) -/* 8ED4B0 80241690 24A50004 */ addiu $a1, $a1, 4 -/* 8ED4B4 80241694 24630001 */ addiu $v1, $v1, 1 -/* 8ED4B8 80241698 AC820084 */ sw $v0, 0x84($a0) -/* 8ED4BC 8024169C 28620010 */ slti $v0, $v1, 0x10 -/* 8ED4C0 802416A0 1440FFFA */ bnez $v0, .L8024168C -/* 8ED4C4 802416A4 24840004 */ addiu $a0, $a0, 4 -/* 8ED4C8 802416A8 3C108025 */ lui $s0, 0x8025 -/* 8ED4CC 802416AC 2610A908 */ addiu $s0, $s0, -0x56f8 -/* 8ED4D0 802416B0 0C00AB4B */ jal heap_free -/* 8ED4D4 802416B4 8E040000 */ lw $a0, ($s0) -/* 8ED4D8 802416B8 AE000000 */ sw $zero, ($s0) -.L802416BC: -/* 8ED4DC 802416BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8ED4E0 802416C0 8FB10014 */ lw $s1, 0x14($sp) -/* 8ED4E4 802416C4 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED4E8 802416C8 24020002 */ addiu $v0, $zero, 2 -/* 8ED4EC 802416CC 03E00008 */ jr $ra -/* 8ED4F0 802416D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s new file mode 100644 index 0000000000..5d45de7e62 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241620_8ED440.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241620_8ED440 +/* 8ED440 80241620 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8ED444 80241624 AFB00010 */ sw $s0, 0x10($sp) +/* 8ED448 80241628 3C108025 */ lui $s0, 0x8025 +/* 8ED44C 8024162C 2610A908 */ addiu $s0, $s0, -0x56f8 +/* 8ED450 80241630 AFBF0018 */ sw $ra, 0x18($sp) +/* 8ED454 80241634 AFB10014 */ sw $s1, 0x14($sp) +/* 8ED458 80241638 8E020000 */ lw $v0, ($s0) +/* 8ED45C 8024163C 14400010 */ bnez $v0, .L80241680 +/* 8ED460 80241640 0080882D */ daddu $s1, $a0, $zero +/* 8ED464 80241644 0C00AB39 */ jal heap_malloc +/* 8ED468 80241648 24040040 */ addiu $a0, $zero, 0x40 +/* 8ED46C 8024164C AE020000 */ sw $v0, ($s0) +/* 8ED470 80241650 0000182D */ daddu $v1, $zero, $zero +/* 8ED474 80241654 0040282D */ daddu $a1, $v0, $zero +/* 8ED478 80241658 0220202D */ daddu $a0, $s1, $zero +.L8024165C: +/* 8ED47C 8024165C 8C820084 */ lw $v0, 0x84($a0) +/* 8ED480 80241660 24840004 */ addiu $a0, $a0, 4 +/* 8ED484 80241664 24630001 */ addiu $v1, $v1, 1 +/* 8ED488 80241668 ACA20000 */ sw $v0, ($a1) +/* 8ED48C 8024166C 28620010 */ slti $v0, $v1, 0x10 +/* 8ED490 80241670 1440FFFA */ bnez $v0, .L8024165C +/* 8ED494 80241674 24A50004 */ addiu $a1, $a1, 4 +/* 8ED498 80241678 080905AF */ j .L802416BC +/* 8ED49C 8024167C 00000000 */ nop +.L80241680: +/* 8ED4A0 80241680 0000182D */ daddu $v1, $zero, $zero +/* 8ED4A4 80241684 0040282D */ daddu $a1, $v0, $zero +/* 8ED4A8 80241688 0220202D */ daddu $a0, $s1, $zero +.L8024168C: +/* 8ED4AC 8024168C 8CA20000 */ lw $v0, ($a1) +/* 8ED4B0 80241690 24A50004 */ addiu $a1, $a1, 4 +/* 8ED4B4 80241694 24630001 */ addiu $v1, $v1, 1 +/* 8ED4B8 80241698 AC820084 */ sw $v0, 0x84($a0) +/* 8ED4BC 8024169C 28620010 */ slti $v0, $v1, 0x10 +/* 8ED4C0 802416A0 1440FFFA */ bnez $v0, .L8024168C +/* 8ED4C4 802416A4 24840004 */ addiu $a0, $a0, 4 +/* 8ED4C8 802416A8 3C108025 */ lui $s0, 0x8025 +/* 8ED4CC 802416AC 2610A908 */ addiu $s0, $s0, -0x56f8 +/* 8ED4D0 802416B0 0C00AB4B */ jal heap_free +/* 8ED4D4 802416B4 8E040000 */ lw $a0, ($s0) +/* 8ED4D8 802416B8 AE000000 */ sw $zero, ($s0) +.L802416BC: +/* 8ED4DC 802416BC 8FBF0018 */ lw $ra, 0x18($sp) +/* 8ED4E0 802416C0 8FB10014 */ lw $s1, 0x14($sp) +/* 8ED4E4 802416C4 8FB00010 */ lw $s0, 0x10($sp) +/* 8ED4E8 802416C8 24020002 */ addiu $v0, $zero, 2 +/* 8ED4EC 802416CC 03E00008 */ jr $ra +/* 8ED4F0 802416D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738.s deleted file mode 100644 index a5b275d841..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241738 -/* 8ED558 80241738 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED55C 8024173C AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED560 80241740 0C04417A */ jal get_entity_by_index -/* 8ED564 80241744 0000202D */ daddu $a0, $zero, $zero -/* 8ED568 80241748 50400007 */ beql $v0, $zero, .L80241768 -/* 8ED56C 8024174C 0000102D */ daddu $v0, $zero, $zero -/* 8ED570 80241750 84440014 */ lh $a0, 0x14($v0) -/* 8ED574 80241754 3C050000 */ lui $a1, 0 -/* 8ED578 80241758 24A501E4 */ addiu $a1, $a1, 0x1e4 -/* 8ED57C 8024175C 0C048052 */ jal play_model_animation -/* 8ED580 80241760 00000000 */ nop -/* 8ED584 80241764 24020002 */ addiu $v0, $zero, 2 -.L80241768: -/* 8ED588 80241768 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED58C 8024176C 03E00008 */ jr $ra -/* 8ED590 80241770 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8ED594 80241774 00000000 */ nop -/* 8ED598 80241778 00000000 */ nop -/* 8ED59C 8024177C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s new file mode 100644 index 0000000000..12fadf1e6d --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED440/func_80241738_8ED558.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241738_8ED558 +/* 8ED558 80241738 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED55C 8024173C AFBF0010 */ sw $ra, 0x10($sp) +/* 8ED560 80241740 0C04417A */ jal get_entity_by_index +/* 8ED564 80241744 0000202D */ daddu $a0, $zero, $zero +/* 8ED568 80241748 50400007 */ beql $v0, $zero, .L80241768 +/* 8ED56C 8024174C 0000102D */ daddu $v0, $zero, $zero +/* 8ED570 80241750 84440014 */ lh $a0, 0x14($v0) +/* 8ED574 80241754 3C050000 */ lui $a1, 0 +/* 8ED578 80241758 24A501E4 */ addiu $a1, $a1, 0x1e4 +/* 8ED57C 8024175C 0C048052 */ jal play_model_animation +/* 8ED580 80241760 00000000 */ nop +/* 8ED584 80241764 24020002 */ addiu $v0, $zero, 2 +.L80241768: +/* 8ED588 80241768 8FBF0010 */ lw $ra, 0x10($sp) +/* 8ED58C 8024176C 03E00008 */ jr $ra +/* 8ED590 80241770 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8ED594 80241774 00000000 */ nop +/* 8ED598 80241778 00000000 */ nop +/* 8ED59C 8024177C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780.s deleted file mode 100644 index fda02dce32..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241780 -/* 8ED5A0 80241780 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8ED5A4 80241784 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8ED5A8 80241788 8C430004 */ lw $v1, 4($v0) -/* 8ED5AC 8024178C 3C040010 */ lui $a0, 0x10 -/* 8ED5B0 80241790 00641825 */ or $v1, $v1, $a0 -/* 8ED5B4 80241794 AC430004 */ sw $v1, 4($v0) -/* 8ED5B8 80241798 03E00008 */ jr $ra -/* 8ED5BC 8024179C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780_8ED5A0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780_8ED5A0.s new file mode 100644 index 0000000000..2a96068b49 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241780_8ED5A0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241780_8ED5A0 +/* 8ED5A0 80241780 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8ED5A4 80241784 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8ED5A8 80241788 8C430004 */ lw $v1, 4($v0) +/* 8ED5AC 8024178C 3C040010 */ lui $a0, 0x10 +/* 8ED5B0 80241790 00641825 */ or $v1, $v1, $a0 +/* 8ED5B4 80241794 AC430004 */ sw $v1, 4($v0) +/* 8ED5B8 80241798 03E00008 */ jr $ra +/* 8ED5BC 8024179C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0.s deleted file mode 100644 index d09ff232ca..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A0 -/* 8ED5C0 802417A0 3C028016 */ lui $v0, 0x8016 -/* 8ED5C4 802417A4 8442A552 */ lh $v0, -0x5aae($v0) -/* 8ED5C8 802417A8 AC820084 */ sw $v0, 0x84($a0) -/* 8ED5CC 802417AC 03E00008 */ jr $ra -/* 8ED5D0 802417B0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0_8ED5C0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0_8ED5C0.s new file mode 100644 index 0000000000..8699cbb252 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417A0_8ED5C0.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417A0_8ED5C0 +/* 8ED5C0 802417A0 3C028016 */ lui $v0, 0x8016 +/* 8ED5C4 802417A4 8442A552 */ lh $v0, -0x5aae($v0) +/* 8ED5C8 802417A8 AC820084 */ sw $v0, 0x84($a0) +/* 8ED5CC 802417AC 03E00008 */ jr $ra +/* 8ED5D0 802417B0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4.s deleted file mode 100644 index 24c15e111c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417B4 -/* 8ED5D4 802417B4 3C038016 */ lui $v1, 0x8016 -/* 8ED5D8 802417B8 8463A552 */ lh $v1, -0x5aae($v1) -/* 8ED5DC 802417BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED5E0 802417C0 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED5E4 802417C4 0080802D */ daddu $s0, $a0, $zero -/* 8ED5E8 802417C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 8ED5EC 802417CC 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8ED5F0 802417D0 10620003 */ beq $v1, $v0, .L802417E0 -/* 8ED5F4 802417D4 24020002 */ addiu $v0, $zero, 2 -/* 8ED5F8 802417D8 08090618 */ j .L80241860 -/* 8ED5FC 802417DC AE000084 */ sw $zero, 0x84($s0) -.L802417E0: -/* 8ED600 802417E0 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8ED604 802417E4 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8ED608 802417E8 80620040 */ lb $v0, 0x40($v1) -/* 8ED60C 802417EC 80670044 */ lb $a3, 0x44($v1) -/* 8ED610 802417F0 04420001 */ bltzl $v0, .L802417F8 -/* 8ED614 802417F4 00021023 */ negu $v0, $v0 -.L802417F8: -/* 8ED618 802417F8 14400003 */ bnez $v0, .L80241808 -/* 8ED61C 802417FC 00000000 */ nop -/* 8ED620 80241800 50E00017 */ beql $a3, $zero, .L80241860 -/* 8ED624 80241804 0000102D */ daddu $v0, $zero, $zero -.L80241808: -/* 8ED628 80241808 44822000 */ mtc1 $v0, $f4 -/* 8ED62C 8024180C 00000000 */ nop -/* 8ED630 80241810 46802120 */ cvt.s.w $f4, $f4 -/* 8ED634 80241814 44062000 */ mfc1 $a2, $f4 -/* 8ED638 80241818 44872000 */ mtc1 $a3, $f4 -/* 8ED63C 8024181C 00000000 */ nop -/* 8ED640 80241820 46802120 */ cvt.s.w $f4, $f4 -/* 8ED644 80241824 44806000 */ mtc1 $zero, $f12 -/* 8ED648 80241828 44072000 */ mfc1 $a3, $f4 -/* 8ED64C 8024182C 0C00A720 */ jal atan2 -/* 8ED650 80241830 46006386 */ mov.s $f14, $f12 -/* 8ED654 80241834 3C014270 */ lui $at, 0x4270 -/* 8ED658 80241838 44811000 */ mtc1 $at, $f2 -/* 8ED65C 8024183C 00000000 */ nop -/* 8ED660 80241840 4602003C */ c.lt.s $f0, $f2 -/* 8ED664 80241844 00000000 */ nop -/* 8ED668 80241848 45000004 */ bc1f .L8024185C -/* 8ED66C 8024184C 24020001 */ addiu $v0, $zero, 1 -/* 8ED670 80241850 AE020084 */ sw $v0, 0x84($s0) -/* 8ED674 80241854 08090618 */ j .L80241860 -/* 8ED678 80241858 24020002 */ addiu $v0, $zero, 2 -.L8024185C: -/* 8ED67C 8024185C 0000102D */ daddu $v0, $zero, $zero -.L80241860: -/* 8ED680 80241860 8FBF0014 */ lw $ra, 0x14($sp) -/* 8ED684 80241864 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED688 80241868 03E00008 */ jr $ra -/* 8ED68C 8024186C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s new file mode 100644 index 0000000000..c89076e21f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802417B4_8ED5D4.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417B4_8ED5D4 +/* 8ED5D4 802417B4 3C038016 */ lui $v1, 0x8016 +/* 8ED5D8 802417B8 8463A552 */ lh $v1, -0x5aae($v1) +/* 8ED5DC 802417BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8ED5E0 802417C0 AFB00010 */ sw $s0, 0x10($sp) +/* 8ED5E4 802417C4 0080802D */ daddu $s0, $a0, $zero +/* 8ED5E8 802417C8 AFBF0014 */ sw $ra, 0x14($sp) +/* 8ED5EC 802417CC 8E0200B0 */ lw $v0, 0xb0($s0) +/* 8ED5F0 802417D0 10620003 */ beq $v1, $v0, .L802417E0 +/* 8ED5F4 802417D4 24020002 */ addiu $v0, $zero, 2 +/* 8ED5F8 802417D8 08090618 */ j .L80241860 +/* 8ED5FC 802417DC AE000084 */ sw $zero, 0x84($s0) +.L802417E0: +/* 8ED600 802417E0 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 8ED604 802417E4 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 8ED608 802417E8 80620040 */ lb $v0, 0x40($v1) +/* 8ED60C 802417EC 80670044 */ lb $a3, 0x44($v1) +/* 8ED610 802417F0 04420001 */ bltzl $v0, .L802417F8 +/* 8ED614 802417F4 00021023 */ negu $v0, $v0 +.L802417F8: +/* 8ED618 802417F8 14400003 */ bnez $v0, .L80241808 +/* 8ED61C 802417FC 00000000 */ nop +/* 8ED620 80241800 50E00017 */ beql $a3, $zero, .L80241860 +/* 8ED624 80241804 0000102D */ daddu $v0, $zero, $zero +.L80241808: +/* 8ED628 80241808 44822000 */ mtc1 $v0, $f4 +/* 8ED62C 8024180C 00000000 */ nop +/* 8ED630 80241810 46802120 */ cvt.s.w $f4, $f4 +/* 8ED634 80241814 44062000 */ mfc1 $a2, $f4 +/* 8ED638 80241818 44872000 */ mtc1 $a3, $f4 +/* 8ED63C 8024181C 00000000 */ nop +/* 8ED640 80241820 46802120 */ cvt.s.w $f4, $f4 +/* 8ED644 80241824 44806000 */ mtc1 $zero, $f12 +/* 8ED648 80241828 44072000 */ mfc1 $a3, $f4 +/* 8ED64C 8024182C 0C00A720 */ jal atan2 +/* 8ED650 80241830 46006386 */ mov.s $f14, $f12 +/* 8ED654 80241834 3C014270 */ lui $at, 0x4270 +/* 8ED658 80241838 44811000 */ mtc1 $at, $f2 +/* 8ED65C 8024183C 00000000 */ nop +/* 8ED660 80241840 4602003C */ c.lt.s $f0, $f2 +/* 8ED664 80241844 00000000 */ nop +/* 8ED668 80241848 45000004 */ bc1f .L8024185C +/* 8ED66C 8024184C 24020001 */ addiu $v0, $zero, 1 +/* 8ED670 80241850 AE020084 */ sw $v0, 0x84($s0) +/* 8ED674 80241854 08090618 */ j .L80241860 +/* 8ED678 80241858 24020002 */ addiu $v0, $zero, 2 +.L8024185C: +/* 8ED67C 8024185C 0000102D */ daddu $v0, $zero, $zero +.L80241860: +/* 8ED680 80241860 8FBF0014 */ lw $ra, 0x14($sp) +/* 8ED684 80241864 8FB00010 */ lw $s0, 0x10($sp) +/* 8ED688 80241868 03E00008 */ jr $ra +/* 8ED68C 8024186C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870.s deleted file mode 100644 index 8f12c9f739..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241870 -/* 8ED690 80241870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8ED694 80241874 AFB10014 */ sw $s1, 0x14($sp) -/* 8ED698 80241878 0080882D */ daddu $s1, $a0, $zero -/* 8ED69C 8024187C AFBF001C */ sw $ra, 0x1c($sp) -/* 8ED6A0 80241880 AFB20018 */ sw $s2, 0x18($sp) -/* 8ED6A4 80241884 0C016AFA */ jal get_current_map_header -/* 8ED6A8 80241888 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED6AC 8024188C 0220202D */ daddu $a0, $s1, $zero -/* 8ED6B0 80241890 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED6B4 80241894 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8ED6B8 80241898 0C0B1EAF */ jal get_variable -/* 8ED6BC 8024189C 0040902D */ daddu $s2, $v0, $zero -/* 8ED6C0 802418A0 0220202D */ daddu $a0, $s1, $zero -/* 8ED6C4 802418A4 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED6C8 802418A8 8E430014 */ lw $v1, 0x14($s2) -/* 8ED6CC 802418AC 00028100 */ sll $s0, $v0, 4 -/* 8ED6D0 802418B0 02031821 */ addu $v1, $s0, $v1 -/* 8ED6D4 802418B4 C4600000 */ lwc1 $f0, ($v1) -/* 8ED6D8 802418B8 4600008D */ trunc.w.s $f2, $f0 -/* 8ED6DC 802418BC 44061000 */ mfc1 $a2, $f2 -/* 8ED6E0 802418C0 0C0B2026 */ jal set_variable -/* 8ED6E4 802418C4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8ED6E8 802418C8 0220202D */ daddu $a0, $s1, $zero -/* 8ED6EC 802418CC 8E420014 */ lw $v0, 0x14($s2) -/* 8ED6F0 802418D0 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED6F4 802418D4 02021021 */ addu $v0, $s0, $v0 -/* 8ED6F8 802418D8 C4400004 */ lwc1 $f0, 4($v0) -/* 8ED6FC 802418DC 4600008D */ trunc.w.s $f2, $f0 -/* 8ED700 802418E0 44061000 */ mfc1 $a2, $f2 -/* 8ED704 802418E4 0C0B2026 */ jal set_variable -/* 8ED708 802418E8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8ED70C 802418EC 0220202D */ daddu $a0, $s1, $zero -/* 8ED710 802418F0 8E420014 */ lw $v0, 0x14($s2) -/* 8ED714 802418F4 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED718 802418F8 02021021 */ addu $v0, $s0, $v0 -/* 8ED71C 802418FC C4400008 */ lwc1 $f0, 8($v0) -/* 8ED720 80241900 4600008D */ trunc.w.s $f2, $f0 -/* 8ED724 80241904 44061000 */ mfc1 $a2, $f2 -/* 8ED728 80241908 0C0B2026 */ jal set_variable -/* 8ED72C 8024190C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8ED730 80241910 0220202D */ daddu $a0, $s1, $zero -/* 8ED734 80241914 8E420014 */ lw $v0, 0x14($s2) -/* 8ED738 80241918 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED73C 8024191C 02028021 */ addu $s0, $s0, $v0 -/* 8ED740 80241920 C600000C */ lwc1 $f0, 0xc($s0) -/* 8ED744 80241924 4600008D */ trunc.w.s $f2, $f0 -/* 8ED748 80241928 44061000 */ mfc1 $a2, $f2 -/* 8ED74C 8024192C 0C0B2026 */ jal set_variable -/* 8ED750 80241930 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8ED754 80241934 8FBF001C */ lw $ra, 0x1c($sp) -/* 8ED758 80241938 8FB20018 */ lw $s2, 0x18($sp) -/* 8ED75C 8024193C 8FB10014 */ lw $s1, 0x14($sp) -/* 8ED760 80241940 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED764 80241944 24020002 */ addiu $v0, $zero, 2 -/* 8ED768 80241948 03E00008 */ jr $ra -/* 8ED76C 8024194C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s new file mode 100644 index 0000000000..27f610e135 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241870_8ED690.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241870_8ED690 +/* 8ED690 80241870 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8ED694 80241874 AFB10014 */ sw $s1, 0x14($sp) +/* 8ED698 80241878 0080882D */ daddu $s1, $a0, $zero +/* 8ED69C 8024187C AFBF001C */ sw $ra, 0x1c($sp) +/* 8ED6A0 80241880 AFB20018 */ sw $s2, 0x18($sp) +/* 8ED6A4 80241884 0C016AFA */ jal get_current_map_header +/* 8ED6A8 80241888 AFB00010 */ sw $s0, 0x10($sp) +/* 8ED6AC 8024188C 0220202D */ daddu $a0, $s1, $zero +/* 8ED6B0 80241890 3C05FE36 */ lui $a1, 0xfe36 +/* 8ED6B4 80241894 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8ED6B8 80241898 0C0B1EAF */ jal get_variable +/* 8ED6BC 8024189C 0040902D */ daddu $s2, $v0, $zero +/* 8ED6C0 802418A0 0220202D */ daddu $a0, $s1, $zero +/* 8ED6C4 802418A4 3C05FE36 */ lui $a1, 0xfe36 +/* 8ED6C8 802418A8 8E430014 */ lw $v1, 0x14($s2) +/* 8ED6CC 802418AC 00028100 */ sll $s0, $v0, 4 +/* 8ED6D0 802418B0 02031821 */ addu $v1, $s0, $v1 +/* 8ED6D4 802418B4 C4600000 */ lwc1 $f0, ($v1) +/* 8ED6D8 802418B8 4600008D */ trunc.w.s $f2, $f0 +/* 8ED6DC 802418BC 44061000 */ mfc1 $a2, $f2 +/* 8ED6E0 802418C0 0C0B2026 */ jal set_variable +/* 8ED6E4 802418C4 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8ED6E8 802418C8 0220202D */ daddu $a0, $s1, $zero +/* 8ED6EC 802418CC 8E420014 */ lw $v0, 0x14($s2) +/* 8ED6F0 802418D0 3C05FE36 */ lui $a1, 0xfe36 +/* 8ED6F4 802418D4 02021021 */ addu $v0, $s0, $v0 +/* 8ED6F8 802418D8 C4400004 */ lwc1 $f0, 4($v0) +/* 8ED6FC 802418DC 4600008D */ trunc.w.s $f2, $f0 +/* 8ED700 802418E0 44061000 */ mfc1 $a2, $f2 +/* 8ED704 802418E4 0C0B2026 */ jal set_variable +/* 8ED708 802418E8 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 8ED70C 802418EC 0220202D */ daddu $a0, $s1, $zero +/* 8ED710 802418F0 8E420014 */ lw $v0, 0x14($s2) +/* 8ED714 802418F4 3C05FE36 */ lui $a1, 0xfe36 +/* 8ED718 802418F8 02021021 */ addu $v0, $s0, $v0 +/* 8ED71C 802418FC C4400008 */ lwc1 $f0, 8($v0) +/* 8ED720 80241900 4600008D */ trunc.w.s $f2, $f0 +/* 8ED724 80241904 44061000 */ mfc1 $a2, $f2 +/* 8ED728 80241908 0C0B2026 */ jal set_variable +/* 8ED72C 8024190C 34A53C83 */ ori $a1, $a1, 0x3c83 +/* 8ED730 80241910 0220202D */ daddu $a0, $s1, $zero +/* 8ED734 80241914 8E420014 */ lw $v0, 0x14($s2) +/* 8ED738 80241918 3C05FE36 */ lui $a1, 0xfe36 +/* 8ED73C 8024191C 02028021 */ addu $s0, $s0, $v0 +/* 8ED740 80241920 C600000C */ lwc1 $f0, 0xc($s0) +/* 8ED744 80241924 4600008D */ trunc.w.s $f2, $f0 +/* 8ED748 80241928 44061000 */ mfc1 $a2, $f2 +/* 8ED74C 8024192C 0C0B2026 */ jal set_variable +/* 8ED750 80241930 34A53C84 */ ori $a1, $a1, 0x3c84 +/* 8ED754 80241934 8FBF001C */ lw $ra, 0x1c($sp) +/* 8ED758 80241938 8FB20018 */ lw $s2, 0x18($sp) +/* 8ED75C 8024193C 8FB10014 */ lw $s1, 0x14($sp) +/* 8ED760 80241940 8FB00010 */ lw $s0, 0x10($sp) +/* 8ED764 80241944 24020002 */ addiu $v0, $zero, 2 +/* 8ED768 80241948 03E00008 */ jr $ra +/* 8ED76C 8024194C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802419BC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802419BC.s deleted file mode 100644 index e31742e78b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802419BC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419BC -/* 8ED7DC 802419BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8ED7E0 802419C0 AFB00018 */ sw $s0, 0x18($sp) -/* 8ED7E4 802419C4 0080802D */ daddu $s0, $a0, $zero -/* 8ED7E8 802419C8 AFBF001C */ sw $ra, 0x1c($sp) -/* 8ED7EC 802419CC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8ED7F0 802419D0 8E02000C */ lw $v0, 0xc($s0) -/* 8ED7F4 802419D4 0C0B210B */ jal get_float_variable -/* 8ED7F8 802419D8 8C450000 */ lw $a1, ($v0) -/* 8ED7FC 802419DC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED800 802419E0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8ED804 802419E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8ED808 802419E8 44060000 */ mfc1 $a2, $f0 -/* 8ED80C 802419EC C4400028 */ lwc1 $f0, 0x28($v0) -/* 8ED810 802419F0 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8ED814 802419F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8ED818 802419F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8ED81C 802419FC 8C470080 */ lw $a3, 0x80($v0) -/* 8ED820 80241A00 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8ED824 80241A04 0C00A7E7 */ jal add_vec2D_polar -/* 8ED828 80241A08 27A50014 */ addiu $a1, $sp, 0x14 -/* 8ED82C 80241A0C 0200202D */ daddu $a0, $s0, $zero -/* 8ED830 80241A10 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED834 80241A14 8FA60010 */ lw $a2, 0x10($sp) -/* 8ED838 80241A18 0C0B2190 */ jal set_float_variable -/* 8ED83C 80241A1C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8ED840 80241A20 0200202D */ daddu $a0, $s0, $zero -/* 8ED844 80241A24 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED848 80241A28 4406A000 */ mfc1 $a2, $f20 -/* 8ED84C 80241A2C 0C0B2190 */ jal set_float_variable -/* 8ED850 80241A30 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8ED854 80241A34 0200202D */ daddu $a0, $s0, $zero -/* 8ED858 80241A38 3C05FE36 */ lui $a1, 0xfe36 -/* 8ED85C 80241A3C 8FA60014 */ lw $a2, 0x14($sp) -/* 8ED860 80241A40 0C0B2190 */ jal set_float_variable -/* 8ED864 80241A44 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8ED868 80241A48 8FBF001C */ lw $ra, 0x1c($sp) -/* 8ED86C 80241A4C 8FB00018 */ lw $s0, 0x18($sp) -/* 8ED870 80241A50 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8ED874 80241A54 24020002 */ addiu $v0, $zero, 2 -/* 8ED878 80241A58 03E00008 */ jr $ra -/* 8ED87C 80241A5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802419BC_8ED7DC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802419BC_8ED7DC.s new file mode 100644 index 0000000000..ff3437a0df --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_802419BC_8ED7DC.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419BC_8ED7DC +/* 8ED7DC 802419BC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8ED7E0 802419C0 AFB00018 */ sw $s0, 0x18($sp) +/* 8ED7E4 802419C4 0080802D */ daddu $s0, $a0, $zero +/* 8ED7E8 802419C8 AFBF001C */ sw $ra, 0x1c($sp) +/* 8ED7EC 802419CC F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8ED7F0 802419D0 8E02000C */ lw $v0, 0xc($s0) +/* 8ED7F4 802419D4 0C0B210B */ jal get_float_variable +/* 8ED7F8 802419D8 8C450000 */ lw $a1, ($v0) +/* 8ED7FC 802419DC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED800 802419E0 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 8ED804 802419E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 8ED808 802419E8 44060000 */ mfc1 $a2, $f0 +/* 8ED80C 802419EC C4400028 */ lwc1 $f0, 0x28($v0) +/* 8ED810 802419F0 C4420030 */ lwc1 $f2, 0x30($v0) +/* 8ED814 802419F4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8ED818 802419F8 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8ED81C 802419FC 8C470080 */ lw $a3, 0x80($v0) +/* 8ED820 80241A00 C454002C */ lwc1 $f20, 0x2c($v0) +/* 8ED824 80241A04 0C00A7E7 */ jal add_vec2D_polar +/* 8ED828 80241A08 27A50014 */ addiu $a1, $sp, 0x14 +/* 8ED82C 80241A0C 0200202D */ daddu $a0, $s0, $zero +/* 8ED830 80241A10 3C05FE36 */ lui $a1, 0xfe36 +/* 8ED834 80241A14 8FA60010 */ lw $a2, 0x10($sp) +/* 8ED838 80241A18 0C0B2190 */ jal set_float_variable +/* 8ED83C 80241A1C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8ED840 80241A20 0200202D */ daddu $a0, $s0, $zero +/* 8ED844 80241A24 3C05FE36 */ lui $a1, 0xfe36 +/* 8ED848 80241A28 4406A000 */ mfc1 $a2, $f20 +/* 8ED84C 80241A2C 0C0B2190 */ jal set_float_variable +/* 8ED850 80241A30 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8ED854 80241A34 0200202D */ daddu $a0, $s0, $zero +/* 8ED858 80241A38 3C05FE36 */ lui $a1, 0xfe36 +/* 8ED85C 80241A3C 8FA60014 */ lw $a2, 0x14($sp) +/* 8ED860 80241A40 0C0B2190 */ jal set_float_variable +/* 8ED864 80241A44 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 8ED868 80241A48 8FBF001C */ lw $ra, 0x1c($sp) +/* 8ED86C 80241A4C 8FB00018 */ lw $s0, 0x18($sp) +/* 8ED870 80241A50 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8ED874 80241A54 24020002 */ addiu $v0, $zero, 2 +/* 8ED878 80241A58 03E00008 */ jr $ra +/* 8ED87C 80241A5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241A60.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241A60.s deleted file mode 100644 index a2b49ef27a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241A60.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A60 -/* 8ED880 80241A60 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8ED884 80241A64 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8ED888 80241A68 4485A000 */ mtc1 $a1, $f20 -/* 8ED88C 80241A6C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8ED890 80241A70 4486B000 */ mtc1 $a2, $f22 -/* 8ED894 80241A74 AFB00010 */ sw $s0, 0x10($sp) -/* 8ED898 80241A78 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 8ED89C 80241A7C 4487C000 */ mtc1 $a3, $f24 -/* 8ED8A0 80241A80 AFBF0014 */ sw $ra, 0x14($sp) -/* 8ED8A4 80241A84 0C019D28 */ jal guMtxIdentF -/* 8ED8A8 80241A88 0080802D */ daddu $s0, $a0, $zero -/* 8ED8AC 80241A8C 4616A582 */ mul.s $f22, $f20, $f22 -/* 8ED8B0 80241A90 00000000 */ nop -/* 8ED8B4 80241A94 4618A502 */ mul.s $f20, $f20, $f24 -/* 8ED8B8 80241A98 00000000 */ nop -/* 8ED8BC 80241A9C 3C013F80 */ lui $at, 0x3f80 -/* 8ED8C0 80241AA0 44810000 */ mtc1 $at, $f0 -/* 8ED8C4 80241AA4 00000000 */ nop -/* 8ED8C8 80241AA8 E6000014 */ swc1 $f0, 0x14($s0) -/* 8ED8CC 80241AAC E6160010 */ swc1 $f22, 0x10($s0) -/* 8ED8D0 80241AB0 E6140018 */ swc1 $f20, 0x18($s0) -/* 8ED8D4 80241AB4 8FBF0014 */ lw $ra, 0x14($sp) -/* 8ED8D8 80241AB8 8FB00010 */ lw $s0, 0x10($sp) -/* 8ED8DC 80241ABC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8ED8E0 80241AC0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8ED8E4 80241AC4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8ED8E8 80241AC8 03E00008 */ jr $ra -/* 8ED8EC 80241ACC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241A60_8ED880.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241A60_8ED880.s new file mode 100644 index 0000000000..3d0ca1ef8b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241A60_8ED880.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A60_8ED880 +/* 8ED880 80241A60 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8ED884 80241A64 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 8ED888 80241A68 4485A000 */ mtc1 $a1, $f20 +/* 8ED88C 80241A6C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 8ED890 80241A70 4486B000 */ mtc1 $a2, $f22 +/* 8ED894 80241A74 AFB00010 */ sw $s0, 0x10($sp) +/* 8ED898 80241A78 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 8ED89C 80241A7C 4487C000 */ mtc1 $a3, $f24 +/* 8ED8A0 80241A80 AFBF0014 */ sw $ra, 0x14($sp) +/* 8ED8A4 80241A84 0C019D28 */ jal guMtxIdentF +/* 8ED8A8 80241A88 0080802D */ daddu $s0, $a0, $zero +/* 8ED8AC 80241A8C 4616A582 */ mul.s $f22, $f20, $f22 +/* 8ED8B0 80241A90 00000000 */ nop +/* 8ED8B4 80241A94 4618A502 */ mul.s $f20, $f20, $f24 +/* 8ED8B8 80241A98 00000000 */ nop +/* 8ED8BC 80241A9C 3C013F80 */ lui $at, 0x3f80 +/* 8ED8C0 80241AA0 44810000 */ mtc1 $at, $f0 +/* 8ED8C4 80241AA4 00000000 */ nop +/* 8ED8C8 80241AA8 E6000014 */ swc1 $f0, 0x14($s0) +/* 8ED8CC 80241AAC E6160010 */ swc1 $f22, 0x10($s0) +/* 8ED8D0 80241AB0 E6140018 */ swc1 $f20, 0x18($s0) +/* 8ED8D4 80241AB4 8FBF0014 */ lw $ra, 0x14($sp) +/* 8ED8D8 80241AB8 8FB00010 */ lw $s0, 0x10($sp) +/* 8ED8DC 80241ABC D7B80028 */ ldc1 $f24, 0x28($sp) +/* 8ED8E0 80241AC0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 8ED8E4 80241AC4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 8ED8E8 80241AC8 03E00008 */ jr $ra +/* 8ED8EC 80241ACC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241AD0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241AD0.s deleted file mode 100644 index 9cc5b40961..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241AD0.s +++ /dev/null @@ -1,121 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AD0 -/* 8ED8F0 80241AD0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8ED8F4 80241AD4 AFB10054 */ sw $s1, 0x54($sp) -/* 8ED8F8 80241AD8 0080882D */ daddu $s1, $a0, $zero -/* 8ED8FC 80241ADC AFBF005C */ sw $ra, 0x5c($sp) -/* 8ED900 80241AE0 AFB20058 */ sw $s2, 0x58($sp) -/* 8ED904 80241AE4 AFB00050 */ sw $s0, 0x50($sp) -/* 8ED908 80241AE8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8ED90C 80241AEC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8ED910 80241AF0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8ED914 80241AF4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8ED918 80241AF8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8ED91C 80241AFC 8E30000C */ lw $s0, 0xc($s1) -/* 8ED920 80241B00 8E050000 */ lw $a1, ($s0) -/* 8ED924 80241B04 0C0B1EAF */ jal get_variable -/* 8ED928 80241B08 26100004 */ addiu $s0, $s0, 4 -/* 8ED92C 80241B0C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8ED930 80241B10 0040202D */ daddu $a0, $v0, $zero -/* 8ED934 80241B14 8E050000 */ lw $a1, ($s0) -/* 8ED938 80241B18 26100004 */ addiu $s0, $s0, 4 -/* 8ED93C 80241B1C 0220202D */ daddu $a0, $s1, $zero -/* 8ED940 80241B20 0C0B210B */ jal get_float_variable -/* 8ED944 80241B24 0040902D */ daddu $s2, $v0, $zero -/* 8ED948 80241B28 8E050000 */ lw $a1, ($s0) -/* 8ED94C 80241B2C 26100004 */ addiu $s0, $s0, 4 -/* 8ED950 80241B30 0220202D */ daddu $a0, $s1, $zero -/* 8ED954 80241B34 0C0B210B */ jal get_float_variable -/* 8ED958 80241B38 46000706 */ mov.s $f28, $f0 -/* 8ED95C 80241B3C 8E050000 */ lw $a1, ($s0) -/* 8ED960 80241B40 26100004 */ addiu $s0, $s0, 4 -/* 8ED964 80241B44 0220202D */ daddu $a0, $s1, $zero -/* 8ED968 80241B48 0C0B210B */ jal get_float_variable -/* 8ED96C 80241B4C 46000686 */ mov.s $f26, $f0 -/* 8ED970 80241B50 0220202D */ daddu $a0, $s1, $zero -/* 8ED974 80241B54 8E050000 */ lw $a1, ($s0) -/* 8ED978 80241B58 0C0B210B */ jal get_float_variable -/* 8ED97C 80241B5C 46000586 */ mov.s $f22, $f0 -/* 8ED980 80241B60 0240202D */ daddu $a0, $s2, $zero -/* 8ED984 80241B64 0C046B4C */ jal get_model_from_list_index -/* 8ED988 80241B68 46000606 */ mov.s $f24, $f0 -/* 8ED98C 80241B6C 0040882D */ daddu $s1, $v0, $zero -/* 8ED990 80241B70 96220000 */ lhu $v0, ($s1) -/* 8ED994 80241B74 30420400 */ andi $v0, $v0, 0x400 -/* 8ED998 80241B78 1440001E */ bnez $v0, .L80241BF4 -/* 8ED99C 80241B7C 26300058 */ addiu $s0, $s1, 0x58 -/* 8ED9A0 80241B80 4480A000 */ mtc1 $zero, $f20 -/* 8ED9A4 80241B84 4406B000 */ mfc1 $a2, $f22 -/* 8ED9A8 80241B88 4405A000 */ mfc1 $a1, $f20 -/* 8ED9AC 80241B8C 4407A000 */ mfc1 $a3, $f20 -/* 8ED9B0 80241B90 0C019E40 */ jal guTranslateF -/* 8ED9B4 80241B94 0200202D */ daddu $a0, $s0, $zero -/* 8ED9B8 80241B98 4405E000 */ mfc1 $a1, $f28 -/* 8ED9BC 80241B9C 4406D000 */ mfc1 $a2, $f26 -/* 8ED9C0 80241BA0 4407C000 */ mfc1 $a3, $f24 -/* 8ED9C4 80241BA4 0C090698 */ jal func_80241A60 -/* 8ED9C8 80241BA8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED9CC 80241BAC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED9D0 80241BB0 0200282D */ daddu $a1, $s0, $zero -/* 8ED9D4 80241BB4 0C019D80 */ jal guMtxCatF -/* 8ED9D8 80241BB8 0200302D */ daddu $a2, $s0, $zero -/* 8ED9DC 80241BBC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED9E0 80241BC0 4600B587 */ neg.s $f22, $f22 -/* 8ED9E4 80241BC4 4405A000 */ mfc1 $a1, $f20 -/* 8ED9E8 80241BC8 4406B000 */ mfc1 $a2, $f22 -/* 8ED9EC 80241BCC 0C019E40 */ jal guTranslateF -/* 8ED9F0 80241BD0 00A0382D */ daddu $a3, $a1, $zero -/* 8ED9F4 80241BD4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8ED9F8 80241BD8 0200282D */ daddu $a1, $s0, $zero -/* 8ED9FC 80241BDC 0C019D80 */ jal guMtxCatF -/* 8EDA00 80241BE0 00A0302D */ daddu $a2, $a1, $zero -/* 8EDA04 80241BE4 96220000 */ lhu $v0, ($s1) -/* 8EDA08 80241BE8 34421400 */ ori $v0, $v0, 0x1400 -/* 8EDA0C 80241BEC 0809071B */ j .L80241C6C -/* 8EDA10 80241BF0 A6220000 */ sh $v0, ($s1) -.L80241BF4: -/* 8EDA14 80241BF4 4480A000 */ mtc1 $zero, $f20 -/* 8EDA18 80241BF8 4406B000 */ mfc1 $a2, $f22 -/* 8EDA1C 80241BFC 4405A000 */ mfc1 $a1, $f20 -/* 8EDA20 80241C00 4407A000 */ mfc1 $a3, $f20 -/* 8EDA24 80241C04 0C019E40 */ jal guTranslateF -/* 8EDA28 80241C08 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EDA2C 80241C0C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EDA30 80241C10 26300058 */ addiu $s0, $s1, 0x58 -/* 8EDA34 80241C14 0200282D */ daddu $a1, $s0, $zero -/* 8EDA38 80241C18 0C019D80 */ jal guMtxCatF -/* 8EDA3C 80241C1C 0200302D */ daddu $a2, $s0, $zero -/* 8EDA40 80241C20 4405E000 */ mfc1 $a1, $f28 -/* 8EDA44 80241C24 4406D000 */ mfc1 $a2, $f26 -/* 8EDA48 80241C28 4407C000 */ mfc1 $a3, $f24 -/* 8EDA4C 80241C2C 0C090698 */ jal func_80241A60 -/* 8EDA50 80241C30 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EDA54 80241C34 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EDA58 80241C38 0200282D */ daddu $a1, $s0, $zero -/* 8EDA5C 80241C3C 0C019D80 */ jal guMtxCatF -/* 8EDA60 80241C40 0200302D */ daddu $a2, $s0, $zero -/* 8EDA64 80241C44 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EDA68 80241C48 4600B587 */ neg.s $f22, $f22 -/* 8EDA6C 80241C4C 4405A000 */ mfc1 $a1, $f20 -/* 8EDA70 80241C50 4406B000 */ mfc1 $a2, $f22 -/* 8EDA74 80241C54 0C019E40 */ jal guTranslateF -/* 8EDA78 80241C58 00A0382D */ daddu $a3, $a1, $zero -/* 8EDA7C 80241C5C 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EDA80 80241C60 0200282D */ daddu $a1, $s0, $zero -/* 8EDA84 80241C64 0C019D80 */ jal guMtxCatF -/* 8EDA88 80241C68 00A0302D */ daddu $a2, $a1, $zero -.L80241C6C: -/* 8EDA8C 80241C6C 8FBF005C */ lw $ra, 0x5c($sp) -/* 8EDA90 80241C70 8FB20058 */ lw $s2, 0x58($sp) -/* 8EDA94 80241C74 8FB10054 */ lw $s1, 0x54($sp) -/* 8EDA98 80241C78 8FB00050 */ lw $s0, 0x50($sp) -/* 8EDA9C 80241C7C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 8EDAA0 80241C80 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 8EDAA4 80241C84 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 8EDAA8 80241C88 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 8EDAAC 80241C8C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 8EDAB0 80241C90 24020002 */ addiu $v0, $zero, 2 -/* 8EDAB4 80241C94 03E00008 */ jr $ra -/* 8EDAB8 80241C98 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241AD0_8ED8F0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241AD0_8ED8F0.s new file mode 100644 index 0000000000..9d195e1573 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241AD0_8ED8F0.s @@ -0,0 +1,121 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AD0_8ED8F0 +/* 8ED8F0 80241AD0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8ED8F4 80241AD4 AFB10054 */ sw $s1, 0x54($sp) +/* 8ED8F8 80241AD8 0080882D */ daddu $s1, $a0, $zero +/* 8ED8FC 80241ADC AFBF005C */ sw $ra, 0x5c($sp) +/* 8ED900 80241AE0 AFB20058 */ sw $s2, 0x58($sp) +/* 8ED904 80241AE4 AFB00050 */ sw $s0, 0x50($sp) +/* 8ED908 80241AE8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8ED90C 80241AEC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8ED910 80241AF0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8ED914 80241AF4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8ED918 80241AF8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8ED91C 80241AFC 8E30000C */ lw $s0, 0xc($s1) +/* 8ED920 80241B00 8E050000 */ lw $a1, ($s0) +/* 8ED924 80241B04 0C0B1EAF */ jal get_variable +/* 8ED928 80241B08 26100004 */ addiu $s0, $s0, 4 +/* 8ED92C 80241B0C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8ED930 80241B10 0040202D */ daddu $a0, $v0, $zero +/* 8ED934 80241B14 8E050000 */ lw $a1, ($s0) +/* 8ED938 80241B18 26100004 */ addiu $s0, $s0, 4 +/* 8ED93C 80241B1C 0220202D */ daddu $a0, $s1, $zero +/* 8ED940 80241B20 0C0B210B */ jal get_float_variable +/* 8ED944 80241B24 0040902D */ daddu $s2, $v0, $zero +/* 8ED948 80241B28 8E050000 */ lw $a1, ($s0) +/* 8ED94C 80241B2C 26100004 */ addiu $s0, $s0, 4 +/* 8ED950 80241B30 0220202D */ daddu $a0, $s1, $zero +/* 8ED954 80241B34 0C0B210B */ jal get_float_variable +/* 8ED958 80241B38 46000706 */ mov.s $f28, $f0 +/* 8ED95C 80241B3C 8E050000 */ lw $a1, ($s0) +/* 8ED960 80241B40 26100004 */ addiu $s0, $s0, 4 +/* 8ED964 80241B44 0220202D */ daddu $a0, $s1, $zero +/* 8ED968 80241B48 0C0B210B */ jal get_float_variable +/* 8ED96C 80241B4C 46000686 */ mov.s $f26, $f0 +/* 8ED970 80241B50 0220202D */ daddu $a0, $s1, $zero +/* 8ED974 80241B54 8E050000 */ lw $a1, ($s0) +/* 8ED978 80241B58 0C0B210B */ jal get_float_variable +/* 8ED97C 80241B5C 46000586 */ mov.s $f22, $f0 +/* 8ED980 80241B60 0240202D */ daddu $a0, $s2, $zero +/* 8ED984 80241B64 0C046B4C */ jal get_model_from_list_index +/* 8ED988 80241B68 46000606 */ mov.s $f24, $f0 +/* 8ED98C 80241B6C 0040882D */ daddu $s1, $v0, $zero +/* 8ED990 80241B70 96220000 */ lhu $v0, ($s1) +/* 8ED994 80241B74 30420400 */ andi $v0, $v0, 0x400 +/* 8ED998 80241B78 1440001E */ bnez $v0, .L80241BF4 +/* 8ED99C 80241B7C 26300058 */ addiu $s0, $s1, 0x58 +/* 8ED9A0 80241B80 4480A000 */ mtc1 $zero, $f20 +/* 8ED9A4 80241B84 4406B000 */ mfc1 $a2, $f22 +/* 8ED9A8 80241B88 4405A000 */ mfc1 $a1, $f20 +/* 8ED9AC 80241B8C 4407A000 */ mfc1 $a3, $f20 +/* 8ED9B0 80241B90 0C019E40 */ jal guTranslateF +/* 8ED9B4 80241B94 0200202D */ daddu $a0, $s0, $zero +/* 8ED9B8 80241B98 4405E000 */ mfc1 $a1, $f28 +/* 8ED9BC 80241B9C 4406D000 */ mfc1 $a2, $f26 +/* 8ED9C0 80241BA0 4407C000 */ mfc1 $a3, $f24 +/* 8ED9C4 80241BA4 0C090698 */ jal func_80241A60_8ED880 +/* 8ED9C8 80241BA8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED9CC 80241BAC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED9D0 80241BB0 0200282D */ daddu $a1, $s0, $zero +/* 8ED9D4 80241BB4 0C019D80 */ jal guMtxCatF +/* 8ED9D8 80241BB8 0200302D */ daddu $a2, $s0, $zero +/* 8ED9DC 80241BBC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED9E0 80241BC0 4600B587 */ neg.s $f22, $f22 +/* 8ED9E4 80241BC4 4405A000 */ mfc1 $a1, $f20 +/* 8ED9E8 80241BC8 4406B000 */ mfc1 $a2, $f22 +/* 8ED9EC 80241BCC 0C019E40 */ jal guTranslateF +/* 8ED9F0 80241BD0 00A0382D */ daddu $a3, $a1, $zero +/* 8ED9F4 80241BD4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8ED9F8 80241BD8 0200282D */ daddu $a1, $s0, $zero +/* 8ED9FC 80241BDC 0C019D80 */ jal guMtxCatF +/* 8EDA00 80241BE0 00A0302D */ daddu $a2, $a1, $zero +/* 8EDA04 80241BE4 96220000 */ lhu $v0, ($s1) +/* 8EDA08 80241BE8 34421400 */ ori $v0, $v0, 0x1400 +/* 8EDA0C 80241BEC 0809071B */ j .L80241C6C +/* 8EDA10 80241BF0 A6220000 */ sh $v0, ($s1) +.L80241BF4: +/* 8EDA14 80241BF4 4480A000 */ mtc1 $zero, $f20 +/* 8EDA18 80241BF8 4406B000 */ mfc1 $a2, $f22 +/* 8EDA1C 80241BFC 4405A000 */ mfc1 $a1, $f20 +/* 8EDA20 80241C00 4407A000 */ mfc1 $a3, $f20 +/* 8EDA24 80241C04 0C019E40 */ jal guTranslateF +/* 8EDA28 80241C08 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EDA2C 80241C0C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EDA30 80241C10 26300058 */ addiu $s0, $s1, 0x58 +/* 8EDA34 80241C14 0200282D */ daddu $a1, $s0, $zero +/* 8EDA38 80241C18 0C019D80 */ jal guMtxCatF +/* 8EDA3C 80241C1C 0200302D */ daddu $a2, $s0, $zero +/* 8EDA40 80241C20 4405E000 */ mfc1 $a1, $f28 +/* 8EDA44 80241C24 4406D000 */ mfc1 $a2, $f26 +/* 8EDA48 80241C28 4407C000 */ mfc1 $a3, $f24 +/* 8EDA4C 80241C2C 0C090698 */ jal func_80241A60_8ED880 +/* 8EDA50 80241C30 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EDA54 80241C34 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EDA58 80241C38 0200282D */ daddu $a1, $s0, $zero +/* 8EDA5C 80241C3C 0C019D80 */ jal guMtxCatF +/* 8EDA60 80241C40 0200302D */ daddu $a2, $s0, $zero +/* 8EDA64 80241C44 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EDA68 80241C48 4600B587 */ neg.s $f22, $f22 +/* 8EDA6C 80241C4C 4405A000 */ mfc1 $a1, $f20 +/* 8EDA70 80241C50 4406B000 */ mfc1 $a2, $f22 +/* 8EDA74 80241C54 0C019E40 */ jal guTranslateF +/* 8EDA78 80241C58 00A0382D */ daddu $a3, $a1, $zero +/* 8EDA7C 80241C5C 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EDA80 80241C60 0200282D */ daddu $a1, $s0, $zero +/* 8EDA84 80241C64 0C019D80 */ jal guMtxCatF +/* 8EDA88 80241C68 00A0302D */ daddu $a2, $a1, $zero +.L80241C6C: +/* 8EDA8C 80241C6C 8FBF005C */ lw $ra, 0x5c($sp) +/* 8EDA90 80241C70 8FB20058 */ lw $s2, 0x58($sp) +/* 8EDA94 80241C74 8FB10054 */ lw $s1, 0x54($sp) +/* 8EDA98 80241C78 8FB00050 */ lw $s0, 0x50($sp) +/* 8EDA9C 80241C7C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 8EDAA0 80241C80 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 8EDAA4 80241C84 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 8EDAA8 80241C88 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 8EDAAC 80241C8C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 8EDAB0 80241C90 24020002 */ addiu $v0, $zero, 2 +/* 8EDAB4 80241C94 03E00008 */ jr $ra +/* 8EDAB8 80241C98 27BD0088 */ addiu $sp, $sp, 0x88 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241C9C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241C9C.s deleted file mode 100644 index a3a048e58a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241C9C.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C9C -/* 8EDABC 80241C9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDAC0 80241CA0 2404010D */ addiu $a0, $zero, 0x10d -/* 8EDAC4 80241CA4 2405FFFF */ addiu $a1, $zero, -1 -/* 8EDAC8 80241CA8 24060001 */ addiu $a2, $zero, 1 -/* 8EDACC 80241CAC AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDAD0 80241CB0 0C046E54 */ jal func_8011B950 -/* 8EDAD4 80241CB4 00C0382D */ daddu $a3, $a2, $zero -/* 8EDAD8 80241CB8 0000202D */ daddu $a0, $zero, $zero -/* 8EDADC 80241CBC 0080282D */ daddu $a1, $a0, $zero -/* 8EDAE0 80241CC0 0080302D */ daddu $a2, $a0, $zero -/* 8EDAE4 80241CC4 0C046F97 */ jal set_background_color_blend -/* 8EDAE8 80241CC8 240700FF */ addiu $a3, $zero, 0xff -/* 8EDAEC 80241CCC 3C02800B */ lui $v0, %hi(gCameras) -/* 8EDAF0 80241CD0 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 8EDAF4 80241CD4 A440002C */ sh $zero, 0x2c($v0) -/* 8EDAF8 80241CD8 A440002E */ sh $zero, 0x2e($v0) -/* 8EDAFC 80241CDC A4400030 */ sh $zero, 0x30($v0) -/* 8EDB00 80241CE0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDB04 80241CE4 24020002 */ addiu $v0, $zero, 2 -/* 8EDB08 80241CE8 03E00008 */ jr $ra -/* 8EDB0C 80241CEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241C9C_8EDABC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241C9C_8EDABC.s new file mode 100644 index 0000000000..20f4d90a41 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241C9C_8EDABC.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C9C_8EDABC +/* 8EDABC 80241C9C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDAC0 80241CA0 2404010D */ addiu $a0, $zero, 0x10d +/* 8EDAC4 80241CA4 2405FFFF */ addiu $a1, $zero, -1 +/* 8EDAC8 80241CA8 24060001 */ addiu $a2, $zero, 1 +/* 8EDACC 80241CAC AFBF0010 */ sw $ra, 0x10($sp) +/* 8EDAD0 80241CB0 0C046E54 */ jal func_8011B950 +/* 8EDAD4 80241CB4 00C0382D */ daddu $a3, $a2, $zero +/* 8EDAD8 80241CB8 0000202D */ daddu $a0, $zero, $zero +/* 8EDADC 80241CBC 0080282D */ daddu $a1, $a0, $zero +/* 8EDAE0 80241CC0 0080302D */ daddu $a2, $a0, $zero +/* 8EDAE4 80241CC4 0C046F97 */ jal set_background_color_blend +/* 8EDAE8 80241CC8 240700FF */ addiu $a3, $zero, 0xff +/* 8EDAEC 80241CCC 3C02800B */ lui $v0, %hi(gCameras) +/* 8EDAF0 80241CD0 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* 8EDAF4 80241CD4 A440002C */ sh $zero, 0x2c($v0) +/* 8EDAF8 80241CD8 A440002E */ sh $zero, 0x2e($v0) +/* 8EDAFC 80241CDC A4400030 */ sh $zero, 0x30($v0) +/* 8EDB00 80241CE0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8EDB04 80241CE4 24020002 */ addiu $v0, $zero, 2 +/* 8EDB08 80241CE8 03E00008 */ jr $ra +/* 8EDB0C 80241CEC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0.s deleted file mode 100644 index 44e5ccd908..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CF0 -/* 8EDB10 80241CF0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDB14 80241CF4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDB18 80241CF8 8C82000C */ lw $v0, 0xc($a0) -/* 8EDB1C 80241CFC 0C0B210B */ jal get_float_variable -/* 8EDB20 80241D00 8C450000 */ lw $a1, ($v0) -/* 8EDB24 80241D04 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDB28 80241D08 24020002 */ addiu $v0, $zero, 2 -/* 8EDB2C 80241D0C 3C01800B */ lui $at, 0x800b -/* 8EDB30 80241D10 E4202210 */ swc1 $f0, 0x2210($at) -/* 8EDB34 80241D14 03E00008 */ jr $ra -/* 8EDB38 80241D18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s new file mode 100644 index 0000000000..744086861d --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241CF0_8EDB10.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CF0_8EDB10 +/* 8EDB10 80241CF0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDB14 80241CF4 AFBF0010 */ sw $ra, 0x10($sp) +/* 8EDB18 80241CF8 8C82000C */ lw $v0, 0xc($a0) +/* 8EDB1C 80241CFC 0C0B210B */ jal get_float_variable +/* 8EDB20 80241D00 8C450000 */ lw $a1, ($v0) +/* 8EDB24 80241D04 8FBF0010 */ lw $ra, 0x10($sp) +/* 8EDB28 80241D08 24020002 */ addiu $v0, $zero, 2 +/* 8EDB2C 80241D0C 3C01800B */ lui $at, 0x800b +/* 8EDB30 80241D10 E4202210 */ swc1 $f0, 0x2210($at) +/* 8EDB34 80241D14 03E00008 */ jr $ra +/* 8EDB38 80241D18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C.s deleted file mode 100644 index 923f01f37b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D1C -/* 8EDB3C 80241D1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDB40 80241D20 0000202D */ daddu $a0, $zero, $zero -/* 8EDB44 80241D24 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8EDB48 80241D28 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDB4C 80241D2C 0C01559B */ jal func_8005566C -/* 8EDB50 80241D30 2406003F */ addiu $a2, $zero, 0x3f -/* 8EDB54 80241D34 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDB58 80241D38 24020002 */ addiu $v0, $zero, 2 -/* 8EDB5C 80241D3C 03E00008 */ jr $ra -/* 8EDB60 80241D40 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8EDB64 80241D44 00000000 */ nop -/* 8EDB68 80241D48 00000000 */ nop -/* 8EDB6C 80241D4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C_8EDB3C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C_8EDB3C.s new file mode 100644 index 0000000000..7dcccf4530 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8ED5A0/func_80241D1C_8EDB3C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D1C_8EDB3C +/* 8EDB3C 80241D1C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDB40 80241D20 0000202D */ daddu $a0, $zero, $zero +/* 8EDB44 80241D24 240503E8 */ addiu $a1, $zero, 0x3e8 +/* 8EDB48 80241D28 AFBF0010 */ sw $ra, 0x10($sp) +/* 8EDB4C 80241D2C 0C01559B */ jal func_8005566C +/* 8EDB50 80241D30 2406003F */ addiu $a2, $zero, 0x3f +/* 8EDB54 80241D34 8FBF0010 */ lw $ra, 0x10($sp) +/* 8EDB58 80241D38 24020002 */ addiu $v0, $zero, 2 +/* 8EDB5C 80241D3C 03E00008 */ jr $ra +/* 8EDB60 80241D40 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8EDB64 80241D44 00000000 */ nop +/* 8EDB68 80241D48 00000000 */ nop +/* 8EDB6C 80241D4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50.s deleted file mode 100644 index 66b90c0653..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D50 -/* 8EDB70 80241D50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8EDB74 80241D54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8EDB78 80241D58 8C430004 */ lw $v1, 4($v0) -/* 8EDB7C 80241D5C 3C040010 */ lui $a0, 0x10 -/* 8EDB80 80241D60 00641825 */ or $v1, $v1, $a0 -/* 8EDB84 80241D64 AC430004 */ sw $v1, 4($v0) -/* 8EDB88 80241D68 03E00008 */ jr $ra -/* 8EDB8C 80241D6C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50_8EDB70.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50_8EDB70.s new file mode 100644 index 0000000000..b31d1fd08f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D50_8EDB70.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D50_8EDB70 +/* 8EDB70 80241D50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8EDB74 80241D54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8EDB78 80241D58 8C430004 */ lw $v1, 4($v0) +/* 8EDB7C 80241D5C 3C040010 */ lui $a0, 0x10 +/* 8EDB80 80241D60 00641825 */ or $v1, $v1, $a0 +/* 8EDB84 80241D64 AC430004 */ sw $v1, 4($v0) +/* 8EDB88 80241D68 03E00008 */ jr $ra +/* 8EDB8C 80241D6C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84.s deleted file mode 100644 index ef2f629046..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D84 -/* 8EDBA4 80241D84 3C038016 */ lui $v1, 0x8016 -/* 8EDBA8 80241D88 8463A552 */ lh $v1, -0x5aae($v1) -/* 8EDBAC 80241D8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDBB0 80241D90 AFB00010 */ sw $s0, 0x10($sp) -/* 8EDBB4 80241D94 0080802D */ daddu $s0, $a0, $zero -/* 8EDBB8 80241D98 AFBF0014 */ sw $ra, 0x14($sp) -/* 8EDBBC 80241D9C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8EDBC0 80241DA0 10620003 */ beq $v1, $v0, .L80241DB0 -/* 8EDBC4 80241DA4 24020002 */ addiu $v0, $zero, 2 -/* 8EDBC8 80241DA8 0809078C */ j .L80241E30 -/* 8EDBCC 80241DAC AE000084 */ sw $zero, 0x84($s0) -.L80241DB0: -/* 8EDBD0 80241DB0 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8EDBD4 80241DB4 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8EDBD8 80241DB8 80620040 */ lb $v0, 0x40($v1) -/* 8EDBDC 80241DBC 80670044 */ lb $a3, 0x44($v1) -/* 8EDBE0 80241DC0 04420001 */ bltzl $v0, .L80241DC8 -/* 8EDBE4 80241DC4 00021023 */ negu $v0, $v0 -.L80241DC8: -/* 8EDBE8 80241DC8 14400003 */ bnez $v0, .L80241DD8 -/* 8EDBEC 80241DCC 00000000 */ nop -/* 8EDBF0 80241DD0 50E00017 */ beql $a3, $zero, .L80241E30 -/* 8EDBF4 80241DD4 0000102D */ daddu $v0, $zero, $zero -.L80241DD8: -/* 8EDBF8 80241DD8 44822000 */ mtc1 $v0, $f4 -/* 8EDBFC 80241DDC 00000000 */ nop -/* 8EDC00 80241DE0 46802120 */ cvt.s.w $f4, $f4 -/* 8EDC04 80241DE4 44062000 */ mfc1 $a2, $f4 -/* 8EDC08 80241DE8 44872000 */ mtc1 $a3, $f4 -/* 8EDC0C 80241DEC 00000000 */ nop -/* 8EDC10 80241DF0 46802120 */ cvt.s.w $f4, $f4 -/* 8EDC14 80241DF4 44806000 */ mtc1 $zero, $f12 -/* 8EDC18 80241DF8 44072000 */ mfc1 $a3, $f4 -/* 8EDC1C 80241DFC 0C00A720 */ jal atan2 -/* 8EDC20 80241E00 46006386 */ mov.s $f14, $f12 -/* 8EDC24 80241E04 3C014270 */ lui $at, 0x4270 -/* 8EDC28 80241E08 44811000 */ mtc1 $at, $f2 -/* 8EDC2C 80241E0C 00000000 */ nop -/* 8EDC30 80241E10 4602003C */ c.lt.s $f0, $f2 -/* 8EDC34 80241E14 00000000 */ nop -/* 8EDC38 80241E18 45000004 */ bc1f .L80241E2C -/* 8EDC3C 80241E1C 24020001 */ addiu $v0, $zero, 1 -/* 8EDC40 80241E20 AE020084 */ sw $v0, 0x84($s0) -/* 8EDC44 80241E24 0809078C */ j .L80241E30 -/* 8EDC48 80241E28 24020002 */ addiu $v0, $zero, 2 -.L80241E2C: -/* 8EDC4C 80241E2C 0000102D */ daddu $v0, $zero, $zero -.L80241E30: -/* 8EDC50 80241E30 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EDC54 80241E34 8FB00010 */ lw $s0, 0x10($sp) -/* 8EDC58 80241E38 03E00008 */ jr $ra -/* 8EDC5C 80241E3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s new file mode 100644 index 0000000000..4ffb03bd19 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241D84_8EDBA4.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D84_8EDBA4 +/* 8EDBA4 80241D84 3C038016 */ lui $v1, 0x8016 +/* 8EDBA8 80241D88 8463A552 */ lh $v1, -0x5aae($v1) +/* 8EDBAC 80241D8C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDBB0 80241D90 AFB00010 */ sw $s0, 0x10($sp) +/* 8EDBB4 80241D94 0080802D */ daddu $s0, $a0, $zero +/* 8EDBB8 80241D98 AFBF0014 */ sw $ra, 0x14($sp) +/* 8EDBBC 80241D9C 8E0200B0 */ lw $v0, 0xb0($s0) +/* 8EDBC0 80241DA0 10620003 */ beq $v1, $v0, .L80241DB0 +/* 8EDBC4 80241DA4 24020002 */ addiu $v0, $zero, 2 +/* 8EDBC8 80241DA8 0809078C */ j .L80241E30 +/* 8EDBCC 80241DAC AE000084 */ sw $zero, 0x84($s0) +.L80241DB0: +/* 8EDBD0 80241DB0 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 8EDBD4 80241DB4 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 8EDBD8 80241DB8 80620040 */ lb $v0, 0x40($v1) +/* 8EDBDC 80241DBC 80670044 */ lb $a3, 0x44($v1) +/* 8EDBE0 80241DC0 04420001 */ bltzl $v0, .L80241DC8 +/* 8EDBE4 80241DC4 00021023 */ negu $v0, $v0 +.L80241DC8: +/* 8EDBE8 80241DC8 14400003 */ bnez $v0, .L80241DD8 +/* 8EDBEC 80241DCC 00000000 */ nop +/* 8EDBF0 80241DD0 50E00017 */ beql $a3, $zero, .L80241E30 +/* 8EDBF4 80241DD4 0000102D */ daddu $v0, $zero, $zero +.L80241DD8: +/* 8EDBF8 80241DD8 44822000 */ mtc1 $v0, $f4 +/* 8EDBFC 80241DDC 00000000 */ nop +/* 8EDC00 80241DE0 46802120 */ cvt.s.w $f4, $f4 +/* 8EDC04 80241DE4 44062000 */ mfc1 $a2, $f4 +/* 8EDC08 80241DE8 44872000 */ mtc1 $a3, $f4 +/* 8EDC0C 80241DEC 00000000 */ nop +/* 8EDC10 80241DF0 46802120 */ cvt.s.w $f4, $f4 +/* 8EDC14 80241DF4 44806000 */ mtc1 $zero, $f12 +/* 8EDC18 80241DF8 44072000 */ mfc1 $a3, $f4 +/* 8EDC1C 80241DFC 0C00A720 */ jal atan2 +/* 8EDC20 80241E00 46006386 */ mov.s $f14, $f12 +/* 8EDC24 80241E04 3C014270 */ lui $at, 0x4270 +/* 8EDC28 80241E08 44811000 */ mtc1 $at, $f2 +/* 8EDC2C 80241E0C 00000000 */ nop +/* 8EDC30 80241E10 4602003C */ c.lt.s $f0, $f2 +/* 8EDC34 80241E14 00000000 */ nop +/* 8EDC38 80241E18 45000004 */ bc1f .L80241E2C +/* 8EDC3C 80241E1C 24020001 */ addiu $v0, $zero, 1 +/* 8EDC40 80241E20 AE020084 */ sw $v0, 0x84($s0) +/* 8EDC44 80241E24 0809078C */ j .L80241E30 +/* 8EDC48 80241E28 24020002 */ addiu $v0, $zero, 2 +.L80241E2C: +/* 8EDC4C 80241E2C 0000102D */ daddu $v0, $zero, $zero +.L80241E30: +/* 8EDC50 80241E30 8FBF0014 */ lw $ra, 0x14($sp) +/* 8EDC54 80241E34 8FB00010 */ lw $s0, 0x10($sp) +/* 8EDC58 80241E38 03E00008 */ jr $ra +/* 8EDC5C 80241E3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40.s deleted file mode 100644 index 93b9a8ce8b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E40 -/* 8EDC60 80241E40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8EDC64 80241E44 AFB10014 */ sw $s1, 0x14($sp) -/* 8EDC68 80241E48 0080882D */ daddu $s1, $a0, $zero -/* 8EDC6C 80241E4C AFBF001C */ sw $ra, 0x1c($sp) -/* 8EDC70 80241E50 AFB20018 */ sw $s2, 0x18($sp) -/* 8EDC74 80241E54 0C016AFA */ jal get_current_map_header -/* 8EDC78 80241E58 AFB00010 */ sw $s0, 0x10($sp) -/* 8EDC7C 80241E5C 0220202D */ daddu $a0, $s1, $zero -/* 8EDC80 80241E60 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDC84 80241E64 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EDC88 80241E68 0C0B1EAF */ jal get_variable -/* 8EDC8C 80241E6C 0040902D */ daddu $s2, $v0, $zero -/* 8EDC90 80241E70 0220202D */ daddu $a0, $s1, $zero -/* 8EDC94 80241E74 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDC98 80241E78 8E430014 */ lw $v1, 0x14($s2) -/* 8EDC9C 80241E7C 00028100 */ sll $s0, $v0, 4 -/* 8EDCA0 80241E80 02031821 */ addu $v1, $s0, $v1 -/* 8EDCA4 80241E84 C4600000 */ lwc1 $f0, ($v1) -/* 8EDCA8 80241E88 4600008D */ trunc.w.s $f2, $f0 -/* 8EDCAC 80241E8C 44061000 */ mfc1 $a2, $f2 -/* 8EDCB0 80241E90 0C0B2026 */ jal set_variable -/* 8EDCB4 80241E94 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EDCB8 80241E98 0220202D */ daddu $a0, $s1, $zero -/* 8EDCBC 80241E9C 8E420014 */ lw $v0, 0x14($s2) -/* 8EDCC0 80241EA0 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDCC4 80241EA4 02021021 */ addu $v0, $s0, $v0 -/* 8EDCC8 80241EA8 C4400004 */ lwc1 $f0, 4($v0) -/* 8EDCCC 80241EAC 4600008D */ trunc.w.s $f2, $f0 -/* 8EDCD0 80241EB0 44061000 */ mfc1 $a2, $f2 -/* 8EDCD4 80241EB4 0C0B2026 */ jal set_variable -/* 8EDCD8 80241EB8 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EDCDC 80241EBC 0220202D */ daddu $a0, $s1, $zero -/* 8EDCE0 80241EC0 8E420014 */ lw $v0, 0x14($s2) -/* 8EDCE4 80241EC4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDCE8 80241EC8 02021021 */ addu $v0, $s0, $v0 -/* 8EDCEC 80241ECC C4400008 */ lwc1 $f0, 8($v0) -/* 8EDCF0 80241ED0 4600008D */ trunc.w.s $f2, $f0 -/* 8EDCF4 80241ED4 44061000 */ mfc1 $a2, $f2 -/* 8EDCF8 80241ED8 0C0B2026 */ jal set_variable -/* 8EDCFC 80241EDC 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8EDD00 80241EE0 0220202D */ daddu $a0, $s1, $zero -/* 8EDD04 80241EE4 8E420014 */ lw $v0, 0x14($s2) -/* 8EDD08 80241EE8 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDD0C 80241EEC 02028021 */ addu $s0, $s0, $v0 -/* 8EDD10 80241EF0 C600000C */ lwc1 $f0, 0xc($s0) -/* 8EDD14 80241EF4 4600008D */ trunc.w.s $f2, $f0 -/* 8EDD18 80241EF8 44061000 */ mfc1 $a2, $f2 -/* 8EDD1C 80241EFC 0C0B2026 */ jal set_variable -/* 8EDD20 80241F00 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8EDD24 80241F04 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EDD28 80241F08 8FB20018 */ lw $s2, 0x18($sp) -/* 8EDD2C 80241F0C 8FB10014 */ lw $s1, 0x14($sp) -/* 8EDD30 80241F10 8FB00010 */ lw $s0, 0x10($sp) -/* 8EDD34 80241F14 24020002 */ addiu $v0, $zero, 2 -/* 8EDD38 80241F18 03E00008 */ jr $ra -/* 8EDD3C 80241F1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s new file mode 100644 index 0000000000..5eaeeac063 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241E40_8EDC60.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E40_8EDC60 +/* 8EDC60 80241E40 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8EDC64 80241E44 AFB10014 */ sw $s1, 0x14($sp) +/* 8EDC68 80241E48 0080882D */ daddu $s1, $a0, $zero +/* 8EDC6C 80241E4C AFBF001C */ sw $ra, 0x1c($sp) +/* 8EDC70 80241E50 AFB20018 */ sw $s2, 0x18($sp) +/* 8EDC74 80241E54 0C016AFA */ jal get_current_map_header +/* 8EDC78 80241E58 AFB00010 */ sw $s0, 0x10($sp) +/* 8EDC7C 80241E5C 0220202D */ daddu $a0, $s1, $zero +/* 8EDC80 80241E60 3C05FE36 */ lui $a1, 0xfe36 +/* 8EDC84 80241E64 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8EDC88 80241E68 0C0B1EAF */ jal get_variable +/* 8EDC8C 80241E6C 0040902D */ daddu $s2, $v0, $zero +/* 8EDC90 80241E70 0220202D */ daddu $a0, $s1, $zero +/* 8EDC94 80241E74 3C05FE36 */ lui $a1, 0xfe36 +/* 8EDC98 80241E78 8E430014 */ lw $v1, 0x14($s2) +/* 8EDC9C 80241E7C 00028100 */ sll $s0, $v0, 4 +/* 8EDCA0 80241E80 02031821 */ addu $v1, $s0, $v1 +/* 8EDCA4 80241E84 C4600000 */ lwc1 $f0, ($v1) +/* 8EDCA8 80241E88 4600008D */ trunc.w.s $f2, $f0 +/* 8EDCAC 80241E8C 44061000 */ mfc1 $a2, $f2 +/* 8EDCB0 80241E90 0C0B2026 */ jal set_variable +/* 8EDCB4 80241E94 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8EDCB8 80241E98 0220202D */ daddu $a0, $s1, $zero +/* 8EDCBC 80241E9C 8E420014 */ lw $v0, 0x14($s2) +/* 8EDCC0 80241EA0 3C05FE36 */ lui $a1, 0xfe36 +/* 8EDCC4 80241EA4 02021021 */ addu $v0, $s0, $v0 +/* 8EDCC8 80241EA8 C4400004 */ lwc1 $f0, 4($v0) +/* 8EDCCC 80241EAC 4600008D */ trunc.w.s $f2, $f0 +/* 8EDCD0 80241EB0 44061000 */ mfc1 $a2, $f2 +/* 8EDCD4 80241EB4 0C0B2026 */ jal set_variable +/* 8EDCD8 80241EB8 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 8EDCDC 80241EBC 0220202D */ daddu $a0, $s1, $zero +/* 8EDCE0 80241EC0 8E420014 */ lw $v0, 0x14($s2) +/* 8EDCE4 80241EC4 3C05FE36 */ lui $a1, 0xfe36 +/* 8EDCE8 80241EC8 02021021 */ addu $v0, $s0, $v0 +/* 8EDCEC 80241ECC C4400008 */ lwc1 $f0, 8($v0) +/* 8EDCF0 80241ED0 4600008D */ trunc.w.s $f2, $f0 +/* 8EDCF4 80241ED4 44061000 */ mfc1 $a2, $f2 +/* 8EDCF8 80241ED8 0C0B2026 */ jal set_variable +/* 8EDCFC 80241EDC 34A53C83 */ ori $a1, $a1, 0x3c83 +/* 8EDD00 80241EE0 0220202D */ daddu $a0, $s1, $zero +/* 8EDD04 80241EE4 8E420014 */ lw $v0, 0x14($s2) +/* 8EDD08 80241EE8 3C05FE36 */ lui $a1, 0xfe36 +/* 8EDD0C 80241EEC 02028021 */ addu $s0, $s0, $v0 +/* 8EDD10 80241EF0 C600000C */ lwc1 $f0, 0xc($s0) +/* 8EDD14 80241EF4 4600008D */ trunc.w.s $f2, $f0 +/* 8EDD18 80241EF8 44061000 */ mfc1 $a2, $f2 +/* 8EDD1C 80241EFC 0C0B2026 */ jal set_variable +/* 8EDD20 80241F00 34A53C84 */ ori $a1, $a1, 0x3c84 +/* 8EDD24 80241F04 8FBF001C */ lw $ra, 0x1c($sp) +/* 8EDD28 80241F08 8FB20018 */ lw $s2, 0x18($sp) +/* 8EDD2C 80241F0C 8FB10014 */ lw $s1, 0x14($sp) +/* 8EDD30 80241F10 8FB00010 */ lw $s0, 0x10($sp) +/* 8EDD34 80241F14 24020002 */ addiu $v0, $zero, 2 +/* 8EDD38 80241F18 03E00008 */ jr $ra +/* 8EDD3C 80241F1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20.s deleted file mode 100644 index b7931a1f2f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F20 -/* 8EDD40 80241F20 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 8EDD44 80241F24 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 8EDD48 80241F28 3C014334 */ lui $at, 0x4334 -/* 8EDD4C 80241F2C 44816000 */ mtc1 $at, $f12 -/* 8EDD50 80241F30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDD54 80241F34 AFBF0014 */ sw $ra, 0x14($sp) -/* 8EDD58 80241F38 AFB00010 */ sw $s0, 0x10($sp) -/* 8EDD5C 80241F3C 00031080 */ sll $v0, $v1, 2 -/* 8EDD60 80241F40 00431021 */ addu $v0, $v0, $v1 -/* 8EDD64 80241F44 00021080 */ sll $v0, $v0, 2 -/* 8EDD68 80241F48 00431023 */ subu $v0, $v0, $v1 -/* 8EDD6C 80241F4C 000218C0 */ sll $v1, $v0, 3 -/* 8EDD70 80241F50 00431021 */ addu $v0, $v0, $v1 -/* 8EDD74 80241F54 000210C0 */ sll $v0, $v0, 3 -/* 8EDD78 80241F58 3C01800B */ lui $at, 0x800b -/* 8EDD7C 80241F5C 00220821 */ addu $at, $at, $v0 -/* 8EDD80 80241F60 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8EDD84 80241F64 460C0300 */ add.s $f12, $f0, $f12 -/* 8EDD88 80241F68 0C00A6C9 */ jal clamp_angle -/* 8EDD8C 80241F6C 0080802D */ daddu $s0, $a0, $zero -/* 8EDD90 80241F70 4600008D */ trunc.w.s $f2, $f0 -/* 8EDD94 80241F74 E6020084 */ swc1 $f2, 0x84($s0) -/* 8EDD98 80241F78 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EDD9C 80241F7C 8FB00010 */ lw $s0, 0x10($sp) -/* 8EDDA0 80241F80 24020002 */ addiu $v0, $zero, 2 -/* 8EDDA4 80241F84 03E00008 */ jr $ra -/* 8EDDA8 80241F88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20_8EDD40.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20_8EDD40.s new file mode 100644 index 0000000000..ee346562c8 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F20_8EDD40.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F20_8EDD40 +/* 8EDD40 80241F20 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 8EDD44 80241F24 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 8EDD48 80241F28 3C014334 */ lui $at, 0x4334 +/* 8EDD4C 80241F2C 44816000 */ mtc1 $at, $f12 +/* 8EDD50 80241F30 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDD54 80241F34 AFBF0014 */ sw $ra, 0x14($sp) +/* 8EDD58 80241F38 AFB00010 */ sw $s0, 0x10($sp) +/* 8EDD5C 80241F3C 00031080 */ sll $v0, $v1, 2 +/* 8EDD60 80241F40 00431021 */ addu $v0, $v0, $v1 +/* 8EDD64 80241F44 00021080 */ sll $v0, $v0, 2 +/* 8EDD68 80241F48 00431023 */ subu $v0, $v0, $v1 +/* 8EDD6C 80241F4C 000218C0 */ sll $v1, $v0, 3 +/* 8EDD70 80241F50 00431021 */ addu $v0, $v0, $v1 +/* 8EDD74 80241F54 000210C0 */ sll $v0, $v0, 3 +/* 8EDD78 80241F58 3C01800B */ lui $at, 0x800b +/* 8EDD7C 80241F5C 00220821 */ addu $at, $at, $v0 +/* 8EDD80 80241F60 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 8EDD84 80241F64 460C0300 */ add.s $f12, $f0, $f12 +/* 8EDD88 80241F68 0C00A6C9 */ jal clamp_angle +/* 8EDD8C 80241F6C 0080802D */ daddu $s0, $a0, $zero +/* 8EDD90 80241F70 4600008D */ trunc.w.s $f2, $f0 +/* 8EDD94 80241F74 E6020084 */ swc1 $f2, 0x84($s0) +/* 8EDD98 80241F78 8FBF0014 */ lw $ra, 0x14($sp) +/* 8EDD9C 80241F7C 8FB00010 */ lw $s0, 0x10($sp) +/* 8EDDA0 80241F80 24020002 */ addiu $v0, $zero, 2 +/* 8EDDA4 80241F84 03E00008 */ jr $ra +/* 8EDDA8 80241F88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F8C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F8C.s deleted file mode 100644 index 7182b2c141..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F8C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F8C -/* 8EDDAC 80241F8C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8EDDB0 80241F90 AFB00018 */ sw $s0, 0x18($sp) -/* 8EDDB4 80241F94 0080802D */ daddu $s0, $a0, $zero -/* 8EDDB8 80241F98 AFBF001C */ sw $ra, 0x1c($sp) -/* 8EDDBC 80241F9C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8EDDC0 80241FA0 8E02000C */ lw $v0, 0xc($s0) -/* 8EDDC4 80241FA4 0C0B210B */ jal get_float_variable -/* 8EDDC8 80241FA8 8C450000 */ lw $a1, ($v0) -/* 8EDDCC 80241FAC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EDDD0 80241FB0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8EDDD4 80241FB4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8EDDD8 80241FB8 44060000 */ mfc1 $a2, $f0 -/* 8EDDDC 80241FBC C4400028 */ lwc1 $f0, 0x28($v0) -/* 8EDDE0 80241FC0 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8EDDE4 80241FC4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8EDDE8 80241FC8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8EDDEC 80241FCC 8C470080 */ lw $a3, 0x80($v0) -/* 8EDDF0 80241FD0 C454002C */ lwc1 $f20, 0x2c($v0) -/* 8EDDF4 80241FD4 0C00A7E7 */ jal add_vec2D_polar -/* 8EDDF8 80241FD8 27A50014 */ addiu $a1, $sp, 0x14 -/* 8EDDFC 80241FDC 0200202D */ daddu $a0, $s0, $zero -/* 8EDE00 80241FE0 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDE04 80241FE4 8FA60010 */ lw $a2, 0x10($sp) -/* 8EDE08 80241FE8 0C0B2190 */ jal set_float_variable -/* 8EDE0C 80241FEC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8EDE10 80241FF0 0200202D */ daddu $a0, $s0, $zero -/* 8EDE14 80241FF4 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDE18 80241FF8 4406A000 */ mfc1 $a2, $f20 -/* 8EDE1C 80241FFC 0C0B2190 */ jal set_float_variable -/* 8EDE20 80242000 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8EDE24 80242004 0200202D */ daddu $a0, $s0, $zero -/* 8EDE28 80242008 3C05FE36 */ lui $a1, 0xfe36 -/* 8EDE2C 8024200C 8FA60014 */ lw $a2, 0x14($sp) -/* 8EDE30 80242010 0C0B2190 */ jal set_float_variable -/* 8EDE34 80242014 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8EDE38 80242018 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EDE3C 8024201C 8FB00018 */ lw $s0, 0x18($sp) -/* 8EDE40 80242020 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8EDE44 80242024 24020002 */ addiu $v0, $zero, 2 -/* 8EDE48 80242028 03E00008 */ jr $ra -/* 8EDE4C 8024202C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F8C_8EDDAC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F8C_8EDDAC.s new file mode 100644 index 0000000000..fe15208e9d --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80241F8C_8EDDAC.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F8C_8EDDAC +/* 8EDDAC 80241F8C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8EDDB0 80241F90 AFB00018 */ sw $s0, 0x18($sp) +/* 8EDDB4 80241F94 0080802D */ daddu $s0, $a0, $zero +/* 8EDDB8 80241F98 AFBF001C */ sw $ra, 0x1c($sp) +/* 8EDDBC 80241F9C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8EDDC0 80241FA0 8E02000C */ lw $v0, 0xc($s0) +/* 8EDDC4 80241FA4 0C0B210B */ jal get_float_variable +/* 8EDDC8 80241FA8 8C450000 */ lw $a1, ($v0) +/* 8EDDCC 80241FAC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EDDD0 80241FB0 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 8EDDD4 80241FB4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 8EDDD8 80241FB8 44060000 */ mfc1 $a2, $f0 +/* 8EDDDC 80241FBC C4400028 */ lwc1 $f0, 0x28($v0) +/* 8EDDE0 80241FC0 C4420030 */ lwc1 $f2, 0x30($v0) +/* 8EDDE4 80241FC4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8EDDE8 80241FC8 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8EDDEC 80241FCC 8C470080 */ lw $a3, 0x80($v0) +/* 8EDDF0 80241FD0 C454002C */ lwc1 $f20, 0x2c($v0) +/* 8EDDF4 80241FD4 0C00A7E7 */ jal add_vec2D_polar +/* 8EDDF8 80241FD8 27A50014 */ addiu $a1, $sp, 0x14 +/* 8EDDFC 80241FDC 0200202D */ daddu $a0, $s0, $zero +/* 8EDE00 80241FE0 3C05FE36 */ lui $a1, 0xfe36 +/* 8EDE04 80241FE4 8FA60010 */ lw $a2, 0x10($sp) +/* 8EDE08 80241FE8 0C0B2190 */ jal set_float_variable +/* 8EDE0C 80241FEC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8EDE10 80241FF0 0200202D */ daddu $a0, $s0, $zero +/* 8EDE14 80241FF4 3C05FE36 */ lui $a1, 0xfe36 +/* 8EDE18 80241FF8 4406A000 */ mfc1 $a2, $f20 +/* 8EDE1C 80241FFC 0C0B2190 */ jal set_float_variable +/* 8EDE20 80242000 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8EDE24 80242004 0200202D */ daddu $a0, $s0, $zero +/* 8EDE28 80242008 3C05FE36 */ lui $a1, 0xfe36 +/* 8EDE2C 8024200C 8FA60014 */ lw $a2, 0x14($sp) +/* 8EDE30 80242010 0C0B2190 */ jal set_float_variable +/* 8EDE34 80242014 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 8EDE38 80242018 8FBF001C */ lw $ra, 0x1c($sp) +/* 8EDE3C 8024201C 8FB00018 */ lw $s0, 0x18($sp) +/* 8EDE40 80242020 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8EDE44 80242024 24020002 */ addiu $v0, $zero, 2 +/* 8EDE48 80242028 03E00008 */ jr $ra +/* 8EDE4C 8024202C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242030.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242030.s deleted file mode 100644 index 79f585ae1b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242030.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242030 -/* 8EDE50 80242030 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDE54 80242034 2404010D */ addiu $a0, $zero, 0x10d -/* 8EDE58 80242038 2405FFFF */ addiu $a1, $zero, -1 -/* 8EDE5C 8024203C 0000302D */ daddu $a2, $zero, $zero -/* 8EDE60 80242040 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDE64 80242044 0C046E54 */ jal func_8011B950 -/* 8EDE68 80242048 24070001 */ addiu $a3, $zero, 1 -/* 8EDE6C 8024204C 0000202D */ daddu $a0, $zero, $zero -/* 8EDE70 80242050 0080282D */ daddu $a1, $a0, $zero -/* 8EDE74 80242054 0080302D */ daddu $a2, $a0, $zero -/* 8EDE78 80242058 0C046F97 */ jal set_background_color_blend -/* 8EDE7C 8024205C 0080382D */ daddu $a3, $a0, $zero -/* 8EDE80 80242060 3C02800B */ lui $v0, %hi(gCameras) -/* 8EDE84 80242064 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 8EDE88 80242068 A440002C */ sh $zero, 0x2c($v0) -/* 8EDE8C 8024206C A440002E */ sh $zero, 0x2e($v0) -/* 8EDE90 80242070 A4400030 */ sh $zero, 0x30($v0) -/* 8EDE94 80242074 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDE98 80242078 24020002 */ addiu $v0, $zero, 2 -/* 8EDE9C 8024207C 03E00008 */ jr $ra -/* 8EDEA0 80242080 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242030_8EDE50.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242030_8EDE50.s new file mode 100644 index 0000000000..0c9b2749a7 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242030_8EDE50.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242030_8EDE50 +/* 8EDE50 80242030 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDE54 80242034 2404010D */ addiu $a0, $zero, 0x10d +/* 8EDE58 80242038 2405FFFF */ addiu $a1, $zero, -1 +/* 8EDE5C 8024203C 0000302D */ daddu $a2, $zero, $zero +/* 8EDE60 80242040 AFBF0010 */ sw $ra, 0x10($sp) +/* 8EDE64 80242044 0C046E54 */ jal func_8011B950 +/* 8EDE68 80242048 24070001 */ addiu $a3, $zero, 1 +/* 8EDE6C 8024204C 0000202D */ daddu $a0, $zero, $zero +/* 8EDE70 80242050 0080282D */ daddu $a1, $a0, $zero +/* 8EDE74 80242054 0080302D */ daddu $a2, $a0, $zero +/* 8EDE78 80242058 0C046F97 */ jal set_background_color_blend +/* 8EDE7C 8024205C 0080382D */ daddu $a3, $a0, $zero +/* 8EDE80 80242060 3C02800B */ lui $v0, %hi(gCameras) +/* 8EDE84 80242064 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* 8EDE88 80242068 A440002C */ sh $zero, 0x2c($v0) +/* 8EDE8C 8024206C A440002E */ sh $zero, 0x2e($v0) +/* 8EDE90 80242070 A4400030 */ sh $zero, 0x30($v0) +/* 8EDE94 80242074 8FBF0010 */ lw $ra, 0x10($sp) +/* 8EDE98 80242078 24020002 */ addiu $v0, $zero, 2 +/* 8EDE9C 8024207C 03E00008 */ jr $ra +/* 8EDEA0 80242080 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084.s deleted file mode 100644 index 19f9b1d2b0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242084 -/* 8EDEA4 80242084 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDEA8 80242088 AFB00010 */ sw $s0, 0x10($sp) -/* 8EDEAC 8024208C 0080802D */ daddu $s0, $a0, $zero -/* 8EDEB0 80242090 10A00002 */ beqz $a1, .L8024209C -/* 8EDEB4 80242094 AFBF0014 */ sw $ra, 0x14($sp) -/* 8EDEB8 80242098 AE000074 */ sw $zero, 0x74($s0) -.L8024209C: -/* 8EDEBC 8024209C 8E020074 */ lw $v0, 0x74($s0) -/* 8EDEC0 802420A0 24420010 */ addiu $v0, $v0, 0x10 -/* 8EDEC4 802420A4 AE020074 */ sw $v0, 0x74($s0) -/* 8EDEC8 802420A8 28420100 */ slti $v0, $v0, 0x100 -/* 8EDECC 802420AC 14400002 */ bnez $v0, .L802420B8 -/* 8EDED0 802420B0 240200FF */ addiu $v0, $zero, 0xff -/* 8EDED4 802420B4 AE020074 */ sw $v0, 0x74($s0) -.L802420B8: -/* 8EDED8 802420B8 C6000074 */ lwc1 $f0, 0x74($s0) -/* 8EDEDC 802420BC 46800020 */ cvt.s.w $f0, $f0 -/* 8EDEE0 802420C0 44050000 */ mfc1 $a1, $f0 -/* 8EDEE4 802420C4 0C04DF62 */ jal func_80137D88 -/* 8EDEE8 802420C8 0000202D */ daddu $a0, $zero, $zero -/* 8EDEEC 802420CC 8E020074 */ lw $v0, 0x74($s0) -/* 8EDEF0 802420D0 8FBF0014 */ lw $ra, 0x14($sp) -/* 8EDEF4 802420D4 8FB00010 */ lw $s0, 0x10($sp) -/* 8EDEF8 802420D8 384200FF */ xori $v0, $v0, 0xff -/* 8EDEFC 802420DC 2C420001 */ sltiu $v0, $v0, 1 -/* 8EDF00 802420E0 00021040 */ sll $v0, $v0, 1 -/* 8EDF04 802420E4 03E00008 */ jr $ra -/* 8EDF08 802420E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s new file mode 100644 index 0000000000..d1e5f2b321 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242084_8EDEA4.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242084_8EDEA4 +/* 8EDEA4 80242084 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDEA8 80242088 AFB00010 */ sw $s0, 0x10($sp) +/* 8EDEAC 8024208C 0080802D */ daddu $s0, $a0, $zero +/* 8EDEB0 80242090 10A00002 */ beqz $a1, .L8024209C +/* 8EDEB4 80242094 AFBF0014 */ sw $ra, 0x14($sp) +/* 8EDEB8 80242098 AE000074 */ sw $zero, 0x74($s0) +.L8024209C: +/* 8EDEBC 8024209C 8E020074 */ lw $v0, 0x74($s0) +/* 8EDEC0 802420A0 24420010 */ addiu $v0, $v0, 0x10 +/* 8EDEC4 802420A4 AE020074 */ sw $v0, 0x74($s0) +/* 8EDEC8 802420A8 28420100 */ slti $v0, $v0, 0x100 +/* 8EDECC 802420AC 14400002 */ bnez $v0, .L802420B8 +/* 8EDED0 802420B0 240200FF */ addiu $v0, $zero, 0xff +/* 8EDED4 802420B4 AE020074 */ sw $v0, 0x74($s0) +.L802420B8: +/* 8EDED8 802420B8 C6000074 */ lwc1 $f0, 0x74($s0) +/* 8EDEDC 802420BC 46800020 */ cvt.s.w $f0, $f0 +/* 8EDEE0 802420C0 44050000 */ mfc1 $a1, $f0 +/* 8EDEE4 802420C4 0C04DF62 */ jal func_80137D88 +/* 8EDEE8 802420C8 0000202D */ daddu $a0, $zero, $zero +/* 8EDEEC 802420CC 8E020074 */ lw $v0, 0x74($s0) +/* 8EDEF0 802420D0 8FBF0014 */ lw $ra, 0x14($sp) +/* 8EDEF4 802420D4 8FB00010 */ lw $s0, 0x10($sp) +/* 8EDEF8 802420D8 384200FF */ xori $v0, $v0, 0xff +/* 8EDEFC 802420DC 2C420001 */ sltiu $v0, $v0, 1 +/* 8EDF00 802420E0 00021040 */ sll $v0, $v0, 1 +/* 8EDF04 802420E4 03E00008 */ jr $ra +/* 8EDF08 802420E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC.s deleted file mode 100644 index 1a4a3e0921..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420EC -/* 8EDF0C 802420EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDF10 802420F0 10A00003 */ beqz $a1, .L80242100 -/* 8EDF14 802420F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDF18 802420F8 240200FF */ addiu $v0, $zero, 0xff -/* 8EDF1C 802420FC AC820074 */ sw $v0, 0x74($a0) -.L80242100: -/* 8EDF20 80242100 8C820074 */ lw $v0, 0x74($a0) -/* 8EDF24 80242104 2442FFF0 */ addiu $v0, $v0, -0x10 -/* 8EDF28 80242108 18400009 */ blez $v0, .L80242130 -/* 8EDF2C 8024210C AC820074 */ sw $v0, 0x74($a0) -/* 8EDF30 80242110 44820000 */ mtc1 $v0, $f0 -/* 8EDF34 80242114 00000000 */ nop -/* 8EDF38 80242118 46800020 */ cvt.s.w $f0, $f0 -/* 8EDF3C 8024211C 44050000 */ mfc1 $a1, $f0 -/* 8EDF40 80242120 0C04DF62 */ jal func_80137D88 -/* 8EDF44 80242124 0000202D */ daddu $a0, $zero, $zero -/* 8EDF48 80242128 0809084E */ j .L80242138 -/* 8EDF4C 8024212C 0000102D */ daddu $v0, $zero, $zero -.L80242130: -/* 8EDF50 80242130 AC800074 */ sw $zero, 0x74($a0) -/* 8EDF54 80242134 24020002 */ addiu $v0, $zero, 2 -.L80242138: -/* 8EDF58 80242138 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDF5C 8024213C 03E00008 */ jr $ra -/* 8EDF60 80242140 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s new file mode 100644 index 0000000000..ff8dc90e8d --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_802420EC_8EDF0C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420EC_8EDF0C +/* 8EDF0C 802420EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDF10 802420F0 10A00003 */ beqz $a1, .L80242100 +/* 8EDF14 802420F4 AFBF0010 */ sw $ra, 0x10($sp) +/* 8EDF18 802420F8 240200FF */ addiu $v0, $zero, 0xff +/* 8EDF1C 802420FC AC820074 */ sw $v0, 0x74($a0) +.L80242100: +/* 8EDF20 80242100 8C820074 */ lw $v0, 0x74($a0) +/* 8EDF24 80242104 2442FFF0 */ addiu $v0, $v0, -0x10 +/* 8EDF28 80242108 18400009 */ blez $v0, .L80242130 +/* 8EDF2C 8024210C AC820074 */ sw $v0, 0x74($a0) +/* 8EDF30 80242110 44820000 */ mtc1 $v0, $f0 +/* 8EDF34 80242114 00000000 */ nop +/* 8EDF38 80242118 46800020 */ cvt.s.w $f0, $f0 +/* 8EDF3C 8024211C 44050000 */ mfc1 $a1, $f0 +/* 8EDF40 80242120 0C04DF62 */ jal func_80137D88 +/* 8EDF44 80242124 0000202D */ daddu $a0, $zero, $zero +/* 8EDF48 80242128 0809084E */ j .L80242138 +/* 8EDF4C 8024212C 0000102D */ daddu $v0, $zero, $zero +.L80242130: +/* 8EDF50 80242130 AC800074 */ sw $zero, 0x74($a0) +/* 8EDF54 80242134 24020002 */ addiu $v0, $zero, 2 +.L80242138: +/* 8EDF58 80242138 8FBF0010 */ lw $ra, 0x10($sp) +/* 8EDF5C 8024213C 03E00008 */ jr $ra +/* 8EDF60 80242140 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242144.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242144.s deleted file mode 100644 index e1481a62e8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242144.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242144 -/* 8EDF64 80242144 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDF68 80242148 0000202D */ daddu $a0, $zero, $zero -/* 8EDF6C 8024214C 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8EDF70 80242150 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDF74 80242154 0C01559B */ jal func_8005566C -/* 8EDF78 80242158 2406003F */ addiu $a2, $zero, 0x3f -/* 8EDF7C 8024215C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDF80 80242160 24020002 */ addiu $v0, $zero, 2 -/* 8EDF84 80242164 03E00008 */ jr $ra -/* 8EDF88 80242168 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242144_8EDF64.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242144_8EDF64.s new file mode 100644 index 0000000000..65f60e5d17 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_80242144_8EDF64.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242144_8EDF64 +/* 8EDF64 80242144 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDF68 80242148 0000202D */ daddu $a0, $zero, $zero +/* 8EDF6C 8024214C 240503E8 */ addiu $a1, $zero, 0x3e8 +/* 8EDF70 80242150 AFBF0010 */ sw $ra, 0x10($sp) +/* 8EDF74 80242154 0C01559B */ jal func_8005566C +/* 8EDF78 80242158 2406003F */ addiu $a2, $zero, 0x3f +/* 8EDF7C 8024215C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8EDF80 80242160 24020002 */ addiu $v0, $zero, 2 +/* 8EDF84 80242164 03E00008 */ jr $ra +/* 8EDF88 80242168 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C.s deleted file mode 100644 index 60e133dd60..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024216C -/* 8EDF8C 8024216C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8EDF90 80242170 0000202D */ daddu $a0, $zero, $zero -/* 8EDF94 80242174 240503E8 */ addiu $a1, $zero, 0x3e8 -/* 8EDF98 80242178 AFBF0010 */ sw $ra, 0x10($sp) -/* 8EDF9C 8024217C 0C01559B */ jal func_8005566C -/* 8EDFA0 80242180 2406007F */ addiu $a2, $zero, 0x7f -/* 8EDFA4 80242184 8FBF0010 */ lw $ra, 0x10($sp) -/* 8EDFA8 80242188 24020002 */ addiu $v0, $zero, 2 -/* 8EDFAC 8024218C 03E00008 */ jr $ra -/* 8EDFB0 80242190 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8EDFB4 80242194 00000000 */ nop -/* 8EDFB8 80242198 00000000 */ nop -/* 8EDFBC 8024219C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C_8EDF8C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C_8EDF8C.s new file mode 100644 index 0000000000..028dd848d0 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDB70/func_8024216C_8EDF8C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024216C_8EDF8C +/* 8EDF8C 8024216C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8EDF90 80242170 0000202D */ daddu $a0, $zero, $zero +/* 8EDF94 80242174 240503E8 */ addiu $a1, $zero, 0x3e8 +/* 8EDF98 80242178 AFBF0010 */ sw $ra, 0x10($sp) +/* 8EDF9C 8024217C 0C01559B */ jal func_8005566C +/* 8EDFA0 80242180 2406007F */ addiu $a2, $zero, 0x7f +/* 8EDFA4 80242184 8FBF0010 */ lw $ra, 0x10($sp) +/* 8EDFA8 80242188 24020002 */ addiu $v0, $zero, 2 +/* 8EDFAC 8024218C 03E00008 */ jr $ra +/* 8EDFB0 80242190 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8EDFB4 80242194 00000000 */ nop +/* 8EDFB8 80242198 00000000 */ nop +/* 8EDFBC 8024219C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870.s deleted file mode 100644 index dd64581a1b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242870 -/* 8EE690 80242870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8EE694 80242874 0000202D */ daddu $a0, $zero, $zero -/* 8EE698 80242878 3C05FD05 */ lui $a1, 0xfd05 -/* 8EE69C 8024287C 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8EE6A0 80242880 AFBF001C */ sw $ra, 0x1c($sp) -/* 8EE6A4 80242884 0C0B1EAF */ jal get_variable -/* 8EE6A8 80242888 AFB00018 */ sw $s0, 0x18($sp) -/* 8EE6AC 8024288C 0040802D */ daddu $s0, $v0, $zero -/* 8EE6B0 80242890 96030000 */ lhu $v1, ($s0) -/* 8EE6B4 80242894 2C620005 */ sltiu $v0, $v1, 5 -/* 8EE6B8 80242898 10400053 */ beqz $v0, .L802429E8 -/* 8EE6BC 8024289C 00031080 */ sll $v0, $v1, 2 -/* 8EE6C0 802428A0 3C018025 */ lui $at, 0x8025 -/* 8EE6C4 802428A4 00220821 */ addu $at, $at, $v0 -/* 8EE6C8 802428A8 8C223040 */ lw $v0, 0x3040($at) -/* 8EE6CC 802428AC 00400008 */ jr $v0 -/* 8EE6D0 802428B0 00000000 */ nop -/* 8EE6D4 802428B4 2404021C */ addiu $a0, $zero, 0x21c -/* 8EE6D8 802428B8 0000282D */ daddu $a1, $zero, $zero -/* 8EE6DC 802428BC 00A0302D */ daddu $a2, $a1, $zero -/* 8EE6E0 802428C0 24020001 */ addiu $v0, $zero, 1 -/* 8EE6E4 802428C4 A6000018 */ sh $zero, 0x18($s0) -/* 8EE6E8 802428C8 A6000008 */ sh $zero, 8($s0) -/* 8EE6EC 802428CC A600000A */ sh $zero, 0xa($s0) -/* 8EE6F0 802428D0 AE000004 */ sw $zero, 4($s0) -/* 8EE6F4 802428D4 0C015478 */ jal func_800551E0 -/* 8EE6F8 802428D8 A6020000 */ sh $v0, ($s0) -/* 8EE6FC 802428DC 3C054200 */ lui $a1, 0x4200 -/* 8EE700 802428E0 8E020004 */ lw $v0, 4($s0) -/* 8EE704 802428E4 3C06437F */ lui $a2, 0x437f -/* 8EE708 802428E8 24420001 */ addiu $v0, $v0, 1 -/* 8EE70C 802428EC AE020004 */ sw $v0, 4($s0) -/* 8EE710 802428F0 24020003 */ addiu $v0, $zero, 3 -/* 8EE714 802428F4 AFA20010 */ sw $v0, 0x10($sp) -/* 8EE718 802428F8 8E070004 */ lw $a3, 4($s0) -/* 8EE71C 802428FC 0C00A8ED */ jal update_lerp -/* 8EE720 80242900 0000202D */ daddu $a0, $zero, $zero -/* 8EE724 80242904 8E020004 */ lw $v0, 4($s0) -/* 8EE728 80242908 4600008D */ trunc.w.s $f2, $f0 -/* 8EE72C 8024290C 44031000 */ mfc1 $v1, $f2 -/* 8EE730 80242910 00000000 */ nop -/* 8EE734 80242914 A603001A */ sh $v1, 0x1a($s0) -/* 8EE738 80242918 28420003 */ slti $v0, $v0, 3 -/* 8EE73C 8024291C 14400032 */ bnez $v0, .L802429E8 -/* 8EE740 80242920 A603001C */ sh $v1, 0x1c($s0) -/* 8EE744 80242924 24020002 */ addiu $v0, $zero, 2 -/* 8EE748 80242928 A6020000 */ sh $v0, ($s0) -/* 8EE74C 8024292C 240200FF */ addiu $v0, $zero, 0xff -/* 8EE750 80242930 A602001A */ sh $v0, 0x1a($s0) -/* 8EE754 80242934 08090A7A */ j .L802429E8 -/* 8EE758 80242938 A602001C */ sh $v0, 0x1c($s0) -/* 8EE75C 8024293C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8EE760 80242940 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8EE764 80242944 240200FF */ addiu $v0, $zero, 0xff -/* 8EE768 80242948 A602001A */ sh $v0, 0x1a($s0) -/* 8EE76C 8024294C A602001C */ sh $v0, 0x1c($s0) -/* 8EE770 80242950 8C620000 */ lw $v0, ($v1) -/* 8EE774 80242954 3042C000 */ andi $v0, $v0, 0xc000 -/* 8EE778 80242958 10400002 */ beqz $v0, .L80242964 -/* 8EE77C 8024295C 24020003 */ addiu $v0, $zero, 3 -/* 8EE780 80242960 A6020000 */ sh $v0, ($s0) -.L80242964: -/* 8EE784 80242964 96030000 */ lhu $v1, ($s0) -/* 8EE788 80242968 24020003 */ addiu $v0, $zero, 3 -/* 8EE78C 8024296C 1462001E */ bne $v1, $v0, .L802429E8 -/* 8EE790 80242970 00000000 */ nop -/* 8EE794 80242974 240400CA */ addiu $a0, $zero, 0xca -/* 8EE798 80242978 0000282D */ daddu $a1, $zero, $zero -/* 8EE79C 8024297C 00A0302D */ daddu $a2, $a1, $zero -/* 8EE7A0 80242980 24020004 */ addiu $v0, $zero, 4 -/* 8EE7A4 80242984 AE000004 */ sw $zero, 4($s0) -/* 8EE7A8 80242988 0C015478 */ jal func_800551E0 -/* 8EE7AC 8024298C A6020000 */ sh $v0, ($s0) -/* 8EE7B0 80242990 0000202D */ daddu $a0, $zero, $zero -/* 8EE7B4 80242994 8E020004 */ lw $v0, 4($s0) -/* 8EE7B8 80242998 8603001C */ lh $v1, 0x1c($s0) -/* 8EE7BC 8024299C 24420001 */ addiu $v0, $v0, 1 -/* 8EE7C0 802429A0 AE020004 */ sw $v0, 4($s0) -/* 8EE7C4 802429A4 24020003 */ addiu $v0, $zero, 3 -/* 8EE7C8 802429A8 44831000 */ mtc1 $v1, $f2 -/* 8EE7CC 802429AC 00000000 */ nop -/* 8EE7D0 802429B0 468010A0 */ cvt.s.w $f2, $f2 -/* 8EE7D4 802429B4 AFA20010 */ sw $v0, 0x10($sp) -/* 8EE7D8 802429B8 8E070004 */ lw $a3, 4($s0) -/* 8EE7DC 802429BC 44051000 */ mfc1 $a1, $f2 -/* 8EE7E0 802429C0 0C00A8ED */ jal update_lerp -/* 8EE7E4 802429C4 0000302D */ daddu $a2, $zero, $zero -/* 8EE7E8 802429C8 8E020004 */ lw $v0, 4($s0) -/* 8EE7EC 802429CC 4600008D */ trunc.w.s $f2, $f0 -/* 8EE7F0 802429D0 44031000 */ mfc1 $v1, $f2 -/* 8EE7F4 802429D4 28420003 */ slti $v0, $v0, 3 -/* 8EE7F8 802429D8 14400003 */ bnez $v0, .L802429E8 -/* 8EE7FC 802429DC A603001A */ sh $v1, 0x1a($s0) -/* 8EE800 802429E0 24020005 */ addiu $v0, $zero, 5 -/* 8EE804 802429E4 A6020000 */ sh $v0, ($s0) -.L802429E8: -/* 8EE808 802429E8 8605001A */ lh $a1, 0x1a($s0) -/* 8EE80C 802429EC 0C090868 */ jal func_802421A0 -/* 8EE810 802429F0 0200202D */ daddu $a0, $s0, $zero -/* 8EE814 802429F4 8FBF001C */ lw $ra, 0x1c($sp) -/* 8EE818 802429F8 8FB00018 */ lw $s0, 0x18($sp) -/* 8EE81C 802429FC 03E00008 */ jr $ra -/* 8EE820 80242A00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s new file mode 100644 index 0000000000..8b753b194e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242870_8EE690.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242870_8EE690 +/* 8EE690 80242870 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8EE694 80242874 0000202D */ daddu $a0, $zero, $zero +/* 8EE698 80242878 3C05FD05 */ lui $a1, 0xfd05 +/* 8EE69C 8024287C 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8EE6A0 80242880 AFBF001C */ sw $ra, 0x1c($sp) +/* 8EE6A4 80242884 0C0B1EAF */ jal get_variable +/* 8EE6A8 80242888 AFB00018 */ sw $s0, 0x18($sp) +/* 8EE6AC 8024288C 0040802D */ daddu $s0, $v0, $zero +/* 8EE6B0 80242890 96030000 */ lhu $v1, ($s0) +/* 8EE6B4 80242894 2C620005 */ sltiu $v0, $v1, 5 +/* 8EE6B8 80242898 10400053 */ beqz $v0, .L802429E8 +/* 8EE6BC 8024289C 00031080 */ sll $v0, $v1, 2 +/* 8EE6C0 802428A0 3C018025 */ lui $at, 0x8025 +/* 8EE6C4 802428A4 00220821 */ addu $at, $at, $v0 +/* 8EE6C8 802428A8 8C223040 */ lw $v0, 0x3040($at) +/* 8EE6CC 802428AC 00400008 */ jr $v0 +/* 8EE6D0 802428B0 00000000 */ nop +/* 8EE6D4 802428B4 2404021C */ addiu $a0, $zero, 0x21c +/* 8EE6D8 802428B8 0000282D */ daddu $a1, $zero, $zero +/* 8EE6DC 802428BC 00A0302D */ daddu $a2, $a1, $zero +/* 8EE6E0 802428C0 24020001 */ addiu $v0, $zero, 1 +/* 8EE6E4 802428C4 A6000018 */ sh $zero, 0x18($s0) +/* 8EE6E8 802428C8 A6000008 */ sh $zero, 8($s0) +/* 8EE6EC 802428CC A600000A */ sh $zero, 0xa($s0) +/* 8EE6F0 802428D0 AE000004 */ sw $zero, 4($s0) +/* 8EE6F4 802428D4 0C015478 */ jal func_800551E0 +/* 8EE6F8 802428D8 A6020000 */ sh $v0, ($s0) +/* 8EE6FC 802428DC 3C054200 */ lui $a1, 0x4200 +/* 8EE700 802428E0 8E020004 */ lw $v0, 4($s0) +/* 8EE704 802428E4 3C06437F */ lui $a2, 0x437f +/* 8EE708 802428E8 24420001 */ addiu $v0, $v0, 1 +/* 8EE70C 802428EC AE020004 */ sw $v0, 4($s0) +/* 8EE710 802428F0 24020003 */ addiu $v0, $zero, 3 +/* 8EE714 802428F4 AFA20010 */ sw $v0, 0x10($sp) +/* 8EE718 802428F8 8E070004 */ lw $a3, 4($s0) +/* 8EE71C 802428FC 0C00A8ED */ jal update_lerp +/* 8EE720 80242900 0000202D */ daddu $a0, $zero, $zero +/* 8EE724 80242904 8E020004 */ lw $v0, 4($s0) +/* 8EE728 80242908 4600008D */ trunc.w.s $f2, $f0 +/* 8EE72C 8024290C 44031000 */ mfc1 $v1, $f2 +/* 8EE730 80242910 00000000 */ nop +/* 8EE734 80242914 A603001A */ sh $v1, 0x1a($s0) +/* 8EE738 80242918 28420003 */ slti $v0, $v0, 3 +/* 8EE73C 8024291C 14400032 */ bnez $v0, .L802429E8 +/* 8EE740 80242920 A603001C */ sh $v1, 0x1c($s0) +/* 8EE744 80242924 24020002 */ addiu $v0, $zero, 2 +/* 8EE748 80242928 A6020000 */ sh $v0, ($s0) +/* 8EE74C 8024292C 240200FF */ addiu $v0, $zero, 0xff +/* 8EE750 80242930 A602001A */ sh $v0, 0x1a($s0) +/* 8EE754 80242934 08090A7A */ j .L802429E8 +/* 8EE758 80242938 A602001C */ sh $v0, 0x1c($s0) +/* 8EE75C 8024293C 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 8EE760 80242940 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 8EE764 80242944 240200FF */ addiu $v0, $zero, 0xff +/* 8EE768 80242948 A602001A */ sh $v0, 0x1a($s0) +/* 8EE76C 8024294C A602001C */ sh $v0, 0x1c($s0) +/* 8EE770 80242950 8C620000 */ lw $v0, ($v1) +/* 8EE774 80242954 3042C000 */ andi $v0, $v0, 0xc000 +/* 8EE778 80242958 10400002 */ beqz $v0, .L80242964 +/* 8EE77C 8024295C 24020003 */ addiu $v0, $zero, 3 +/* 8EE780 80242960 A6020000 */ sh $v0, ($s0) +.L80242964: +/* 8EE784 80242964 96030000 */ lhu $v1, ($s0) +/* 8EE788 80242968 24020003 */ addiu $v0, $zero, 3 +/* 8EE78C 8024296C 1462001E */ bne $v1, $v0, .L802429E8 +/* 8EE790 80242970 00000000 */ nop +/* 8EE794 80242974 240400CA */ addiu $a0, $zero, 0xca +/* 8EE798 80242978 0000282D */ daddu $a1, $zero, $zero +/* 8EE79C 8024297C 00A0302D */ daddu $a2, $a1, $zero +/* 8EE7A0 80242980 24020004 */ addiu $v0, $zero, 4 +/* 8EE7A4 80242984 AE000004 */ sw $zero, 4($s0) +/* 8EE7A8 80242988 0C015478 */ jal func_800551E0 +/* 8EE7AC 8024298C A6020000 */ sh $v0, ($s0) +/* 8EE7B0 80242990 0000202D */ daddu $a0, $zero, $zero +/* 8EE7B4 80242994 8E020004 */ lw $v0, 4($s0) +/* 8EE7B8 80242998 8603001C */ lh $v1, 0x1c($s0) +/* 8EE7BC 8024299C 24420001 */ addiu $v0, $v0, 1 +/* 8EE7C0 802429A0 AE020004 */ sw $v0, 4($s0) +/* 8EE7C4 802429A4 24020003 */ addiu $v0, $zero, 3 +/* 8EE7C8 802429A8 44831000 */ mtc1 $v1, $f2 +/* 8EE7CC 802429AC 00000000 */ nop +/* 8EE7D0 802429B0 468010A0 */ cvt.s.w $f2, $f2 +/* 8EE7D4 802429B4 AFA20010 */ sw $v0, 0x10($sp) +/* 8EE7D8 802429B8 8E070004 */ lw $a3, 4($s0) +/* 8EE7DC 802429BC 44051000 */ mfc1 $a1, $f2 +/* 8EE7E0 802429C0 0C00A8ED */ jal update_lerp +/* 8EE7E4 802429C4 0000302D */ daddu $a2, $zero, $zero +/* 8EE7E8 802429C8 8E020004 */ lw $v0, 4($s0) +/* 8EE7EC 802429CC 4600008D */ trunc.w.s $f2, $f0 +/* 8EE7F0 802429D0 44031000 */ mfc1 $v1, $f2 +/* 8EE7F4 802429D4 28420003 */ slti $v0, $v0, 3 +/* 8EE7F8 802429D8 14400003 */ bnez $v0, .L802429E8 +/* 8EE7FC 802429DC A603001A */ sh $v1, 0x1a($s0) +/* 8EE800 802429E0 24020005 */ addiu $v0, $zero, 5 +/* 8EE804 802429E4 A6020000 */ sh $v0, ($s0) +.L802429E8: +/* 8EE808 802429E8 8605001A */ lh $a1, 0x1a($s0) +/* 8EE80C 802429EC 0C090868 */ jal func_802421A0_8EDFC0 +/* 8EE810 802429F0 0200202D */ daddu $a0, $s0, $zero +/* 8EE814 802429F4 8FBF001C */ lw $ra, 0x1c($sp) +/* 8EE818 802429F8 8FB00018 */ lw $s0, 0x18($sp) +/* 8EE81C 802429FC 03E00008 */ jr $ra +/* 8EE820 80242A00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04.s deleted file mode 100644 index 263ec6bae3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A04 -/* 8EE824 80242A04 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8EE828 80242A08 2402002D */ addiu $v0, $zero, 0x2d -/* 8EE82C 80242A0C AFA20010 */ sw $v0, 0x10($sp) -/* 8EE830 80242A10 3C028024 */ lui $v0, 0x8024 -/* 8EE834 80242A14 24422870 */ addiu $v0, $v0, 0x2870 -/* 8EE838 80242A18 27A40010 */ addiu $a0, $sp, 0x10 -/* 8EE83C 80242A1C AFBF0020 */ sw $ra, 0x20($sp) -/* 8EE840 80242A20 AFA00018 */ sw $zero, 0x18($sp) -/* 8EE844 80242A24 AFA2001C */ sw $v0, 0x1c($sp) -/* 8EE848 80242A28 0C047644 */ jal queue_render_task -/* 8EE84C 80242A2C AFA00014 */ sw $zero, 0x14($sp) -/* 8EE850 80242A30 8FBF0020 */ lw $ra, 0x20($sp) -/* 8EE854 80242A34 03E00008 */ jr $ra -/* 8EE858 80242A38 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s new file mode 100644 index 0000000000..4f0cb431ff --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A04_8EE824.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A04_8EE824 +/* 8EE824 80242A04 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8EE828 80242A08 2402002D */ addiu $v0, $zero, 0x2d +/* 8EE82C 80242A0C AFA20010 */ sw $v0, 0x10($sp) +/* 8EE830 80242A10 3C028024 */ lui $v0, 0x8024 +/* 8EE834 80242A14 24422870 */ addiu $v0, $v0, 0x2870 +/* 8EE838 80242A18 27A40010 */ addiu $a0, $sp, 0x10 +/* 8EE83C 80242A1C AFBF0020 */ sw $ra, 0x20($sp) +/* 8EE840 80242A20 AFA00018 */ sw $zero, 0x18($sp) +/* 8EE844 80242A24 AFA2001C */ sw $v0, 0x1c($sp) +/* 8EE848 80242A28 0C047644 */ jal queue_render_task +/* 8EE84C 80242A2C AFA00014 */ sw $zero, 0x14($sp) +/* 8EE850 80242A30 8FBF0020 */ lw $ra, 0x20($sp) +/* 8EE854 80242A34 03E00008 */ jr $ra +/* 8EE858 80242A38 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C.s deleted file mode 100644 index 78f85dc674..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A3C -/* 8EE85C 80242A3C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8EE860 80242A40 AFB3001C */ sw $s3, 0x1c($sp) -/* 8EE864 80242A44 0080982D */ daddu $s3, $a0, $zero -/* 8EE868 80242A48 AFB10014 */ sw $s1, 0x14($sp) -/* 8EE86C 80242A4C 0000882D */ daddu $s1, $zero, $zero -/* 8EE870 80242A50 AFB00010 */ sw $s0, 0x10($sp) -/* 8EE874 80242A54 0220802D */ daddu $s0, $s1, $zero -/* 8EE878 80242A58 3C038011 */ lui $v1, %hi(gPlayerData) -/* 8EE87C 80242A5C 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 8EE880 80242A60 AFBF0020 */ sw $ra, 0x20($sp) -/* 8EE884 80242A64 AFB20018 */ sw $s2, 0x18($sp) -.L80242A68: -/* 8EE888 80242A68 846200B4 */ lh $v0, 0xb4($v1) -/* 8EE88C 80242A6C 54400001 */ bnel $v0, $zero, .L80242A74 -/* 8EE890 80242A70 26310001 */ addiu $s1, $s1, 1 -.L80242A74: -/* 8EE894 80242A74 26100001 */ addiu $s0, $s0, 1 -/* 8EE898 80242A78 2A020080 */ slti $v0, $s0, 0x80 -/* 8EE89C 80242A7C 1440FFFA */ bnez $v0, .L80242A68 -/* 8EE8A0 80242A80 24630002 */ addiu $v1, $v1, 2 -/* 8EE8A4 80242A84 A6710024 */ sh $s1, 0x24($s3) -/* 8EE8A8 80242A88 0000882D */ daddu $s1, $zero, $zero -/* 8EE8AC 80242A8C 0220802D */ daddu $s0, $s1, $zero -/* 8EE8B0 80242A90 3C128025 */ lui $s2, 0x8025 -/* 8EE8B4 80242A94 26522DC0 */ addiu $s2, $s2, 0x2dc0 -.L80242A98: -/* 8EE8B8 80242A98 8E450000 */ lw $a1, ($s2) -/* 8EE8BC 80242A9C 10A00008 */ beqz $a1, .L80242AC0 -/* 8EE8C0 80242AA0 00111400 */ sll $v0, $s1, 0x10 -/* 8EE8C4 80242AA4 0C0B1EAF */ jal get_variable -/* 8EE8C8 80242AA8 0000202D */ daddu $a0, $zero, $zero -/* 8EE8CC 80242AAC 54400001 */ bnel $v0, $zero, .L80242AB4 -/* 8EE8D0 80242AB0 26310001 */ addiu $s1, $s1, 1 -.L80242AB4: -/* 8EE8D4 80242AB4 26520004 */ addiu $s2, $s2, 4 -/* 8EE8D8 80242AB8 08090AA6 */ j .L80242A98 -/* 8EE8DC 80242ABC 26100001 */ addiu $s0, $s0, 1 -.L80242AC0: -/* 8EE8E0 80242AC0 A6700028 */ sh $s0, 0x28($s3) -/* 8EE8E4 80242AC4 14400008 */ bnez $v0, .L80242AE8 -/* 8EE8E8 80242AC8 A6710026 */ sh $s1, 0x26($s3) -/* 8EE8EC 80242ACC 0000202D */ daddu $a0, $zero, $zero -/* 8EE8F0 80242AD0 3C05F840 */ lui $a1, 0xf840 -/* 8EE8F4 80242AD4 0C0B1EAF */ jal get_variable -/* 8EE8F8 80242AD8 34A55CC8 */ ori $a1, $a1, 0x5cc8 -/* 8EE8FC 80242ADC 10400002 */ beqz $v0, .L80242AE8 -/* 8EE900 80242AE0 2402FFFF */ addiu $v0, $zero, -1 -/* 8EE904 80242AE4 A6620026 */ sh $v0, 0x26($s3) -.L80242AE8: -/* 8EE908 80242AE8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8EE90C 80242AEC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8EE910 80242AF0 8FB20018 */ lw $s2, 0x18($sp) -/* 8EE914 80242AF4 8FB10014 */ lw $s1, 0x14($sp) -/* 8EE918 80242AF8 8FB00010 */ lw $s0, 0x10($sp) -/* 8EE91C 80242AFC 03E00008 */ jr $ra -/* 8EE920 80242B00 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C_8EE85C.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C_8EE85C.s new file mode 100644 index 0000000000..84d454f1bb --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242A3C_8EE85C.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A3C_8EE85C +/* 8EE85C 80242A3C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8EE860 80242A40 AFB3001C */ sw $s3, 0x1c($sp) +/* 8EE864 80242A44 0080982D */ daddu $s3, $a0, $zero +/* 8EE868 80242A48 AFB10014 */ sw $s1, 0x14($sp) +/* 8EE86C 80242A4C 0000882D */ daddu $s1, $zero, $zero +/* 8EE870 80242A50 AFB00010 */ sw $s0, 0x10($sp) +/* 8EE874 80242A54 0220802D */ daddu $s0, $s1, $zero +/* 8EE878 80242A58 3C038011 */ lui $v1, %hi(gPlayerData) +/* 8EE87C 80242A5C 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 8EE880 80242A60 AFBF0020 */ sw $ra, 0x20($sp) +/* 8EE884 80242A64 AFB20018 */ sw $s2, 0x18($sp) +.L80242A68: +/* 8EE888 80242A68 846200B4 */ lh $v0, 0xb4($v1) +/* 8EE88C 80242A6C 54400001 */ bnel $v0, $zero, .L80242A74 +/* 8EE890 80242A70 26310001 */ addiu $s1, $s1, 1 +.L80242A74: +/* 8EE894 80242A74 26100001 */ addiu $s0, $s0, 1 +/* 8EE898 80242A78 2A020080 */ slti $v0, $s0, 0x80 +/* 8EE89C 80242A7C 1440FFFA */ bnez $v0, .L80242A68 +/* 8EE8A0 80242A80 24630002 */ addiu $v1, $v1, 2 +/* 8EE8A4 80242A84 A6710024 */ sh $s1, 0x24($s3) +/* 8EE8A8 80242A88 0000882D */ daddu $s1, $zero, $zero +/* 8EE8AC 80242A8C 0220802D */ daddu $s0, $s1, $zero +/* 8EE8B0 80242A90 3C128025 */ lui $s2, 0x8025 +/* 8EE8B4 80242A94 26522DC0 */ addiu $s2, $s2, 0x2dc0 +.L80242A98: +/* 8EE8B8 80242A98 8E450000 */ lw $a1, ($s2) +/* 8EE8BC 80242A9C 10A00008 */ beqz $a1, .L80242AC0 +/* 8EE8C0 80242AA0 00111400 */ sll $v0, $s1, 0x10 +/* 8EE8C4 80242AA4 0C0B1EAF */ jal get_variable +/* 8EE8C8 80242AA8 0000202D */ daddu $a0, $zero, $zero +/* 8EE8CC 80242AAC 54400001 */ bnel $v0, $zero, .L80242AB4 +/* 8EE8D0 80242AB0 26310001 */ addiu $s1, $s1, 1 +.L80242AB4: +/* 8EE8D4 80242AB4 26520004 */ addiu $s2, $s2, 4 +/* 8EE8D8 80242AB8 08090AA6 */ j .L80242A98 +/* 8EE8DC 80242ABC 26100001 */ addiu $s0, $s0, 1 +.L80242AC0: +/* 8EE8E0 80242AC0 A6700028 */ sh $s0, 0x28($s3) +/* 8EE8E4 80242AC4 14400008 */ bnez $v0, .L80242AE8 +/* 8EE8E8 80242AC8 A6710026 */ sh $s1, 0x26($s3) +/* 8EE8EC 80242ACC 0000202D */ daddu $a0, $zero, $zero +/* 8EE8F0 80242AD0 3C05F840 */ lui $a1, 0xf840 +/* 8EE8F4 80242AD4 0C0B1EAF */ jal get_variable +/* 8EE8F8 80242AD8 34A55CC8 */ ori $a1, $a1, 0x5cc8 +/* 8EE8FC 80242ADC 10400002 */ beqz $v0, .L80242AE8 +/* 8EE900 80242AE0 2402FFFF */ addiu $v0, $zero, -1 +/* 8EE904 80242AE4 A6620026 */ sh $v0, 0x26($s3) +.L80242AE8: +/* 8EE908 80242AE8 8FBF0020 */ lw $ra, 0x20($sp) +/* 8EE90C 80242AEC 8FB3001C */ lw $s3, 0x1c($sp) +/* 8EE910 80242AF0 8FB20018 */ lw $s2, 0x18($sp) +/* 8EE914 80242AF4 8FB10014 */ lw $s1, 0x14($sp) +/* 8EE918 80242AF8 8FB00010 */ lw $s0, 0x10($sp) +/* 8EE91C 80242AFC 03E00008 */ jr $ra +/* 8EE920 80242B00 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04.s deleted file mode 100644 index 5d2d7b5cb3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B04 -/* 8EE924 80242B04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8EE928 80242B08 AFB10014 */ sw $s1, 0x14($sp) -/* 8EE92C 80242B0C 0080882D */ daddu $s1, $a0, $zero -/* 8EE930 80242B10 AFBF0018 */ sw $ra, 0x18($sp) -/* 8EE934 80242B14 10A00014 */ beqz $a1, .L80242B68 -/* 8EE938 80242B18 AFB00010 */ sw $s0, 0x10($sp) -/* 8EE93C 80242B1C 0C00AB39 */ jal heap_malloc -/* 8EE940 80242B20 2404002C */ addiu $a0, $zero, 0x2c -/* 8EE944 80242B24 0040802D */ daddu $s0, $v0, $zero -/* 8EE948 80242B28 0000202D */ daddu $a0, $zero, $zero -/* 8EE94C 80242B2C 3C058024 */ lui $a1, 0x8024 -/* 8EE950 80242B30 24A52A04 */ addiu $a1, $a1, 0x2a04 -/* 8EE954 80242B34 240200FF */ addiu $v0, $zero, 0xff -/* 8EE958 80242B38 AE300070 */ sw $s0, 0x70($s1) -/* 8EE95C 80242B3C A6000000 */ sh $zero, ($s0) -/* 8EE960 80242B40 0C048C56 */ jal bind_dynamic_entity_3 -/* 8EE964 80242B44 A602001A */ sh $v0, 0x1a($s0) -/* 8EE968 80242B48 0220202D */ daddu $a0, $s1, $zero -/* 8EE96C 80242B4C 3C05FD05 */ lui $a1, 0xfd05 -/* 8EE970 80242B50 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8EE974 80242B54 0200302D */ daddu $a2, $s0, $zero -/* 8EE978 80242B58 0C0B2026 */ jal set_variable -/* 8EE97C 80242B5C AE020020 */ sw $v0, 0x20($s0) -/* 8EE980 80242B60 0C090A8F */ jal func_80242A3C -/* 8EE984 80242B64 0200202D */ daddu $a0, $s0, $zero -.L80242B68: -/* 8EE988 80242B68 8E300070 */ lw $s0, 0x70($s1) -/* 8EE98C 80242B6C 96030000 */ lhu $v1, ($s0) -/* 8EE990 80242B70 24020005 */ addiu $v0, $zero, 5 -/* 8EE994 80242B74 14620007 */ bne $v1, $v0, .L80242B94 -/* 8EE998 80242B78 0000102D */ daddu $v0, $zero, $zero -/* 8EE99C 80242B7C 8E040020 */ lw $a0, 0x20($s0) -/* 8EE9A0 80242B80 0C048D70 */ jal func_801235C0 -/* 8EE9A4 80242B84 00000000 */ nop -/* 8EE9A8 80242B88 0C00AB4B */ jal heap_free -/* 8EE9AC 80242B8C 0200202D */ daddu $a0, $s0, $zero -/* 8EE9B0 80242B90 24020001 */ addiu $v0, $zero, 1 -.L80242B94: -/* 8EE9B4 80242B94 8FBF0018 */ lw $ra, 0x18($sp) -/* 8EE9B8 80242B98 8FB10014 */ lw $s1, 0x14($sp) -/* 8EE9BC 80242B9C 8FB00010 */ lw $s0, 0x10($sp) -/* 8EE9C0 80242BA0 03E00008 */ jr $ra -/* 8EE9C4 80242BA4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 8EE9C8 80242BA8 00000000 */ nop -/* 8EE9CC 80242BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s new file mode 100644 index 0000000000..35a3f9be15 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EDFC0/func_80242B04_8EE924.s @@ -0,0 +1,49 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B04_8EE924 +/* 8EE924 80242B04 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8EE928 80242B08 AFB10014 */ sw $s1, 0x14($sp) +/* 8EE92C 80242B0C 0080882D */ daddu $s1, $a0, $zero +/* 8EE930 80242B10 AFBF0018 */ sw $ra, 0x18($sp) +/* 8EE934 80242B14 10A00014 */ beqz $a1, .L80242B68 +/* 8EE938 80242B18 AFB00010 */ sw $s0, 0x10($sp) +/* 8EE93C 80242B1C 0C00AB39 */ jal heap_malloc +/* 8EE940 80242B20 2404002C */ addiu $a0, $zero, 0x2c +/* 8EE944 80242B24 0040802D */ daddu $s0, $v0, $zero +/* 8EE948 80242B28 0000202D */ daddu $a0, $zero, $zero +/* 8EE94C 80242B2C 3C058024 */ lui $a1, 0x8024 +/* 8EE950 80242B30 24A52A04 */ addiu $a1, $a1, 0x2a04 +/* 8EE954 80242B34 240200FF */ addiu $v0, $zero, 0xff +/* 8EE958 80242B38 AE300070 */ sw $s0, 0x70($s1) +/* 8EE95C 80242B3C A6000000 */ sh $zero, ($s0) +/* 8EE960 80242B40 0C048C56 */ jal bind_dynamic_entity_3 +/* 8EE964 80242B44 A602001A */ sh $v0, 0x1a($s0) +/* 8EE968 80242B48 0220202D */ daddu $a0, $s1, $zero +/* 8EE96C 80242B4C 3C05FD05 */ lui $a1, 0xfd05 +/* 8EE970 80242B50 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8EE974 80242B54 0200302D */ daddu $a2, $s0, $zero +/* 8EE978 80242B58 0C0B2026 */ jal set_variable +/* 8EE97C 80242B5C AE020020 */ sw $v0, 0x20($s0) +/* 8EE980 80242B60 0C090A8F */ jal func_80242A3C_8EE85C +/* 8EE984 80242B64 0200202D */ daddu $a0, $s0, $zero +.L80242B68: +/* 8EE988 80242B68 8E300070 */ lw $s0, 0x70($s1) +/* 8EE98C 80242B6C 96030000 */ lhu $v1, ($s0) +/* 8EE990 80242B70 24020005 */ addiu $v0, $zero, 5 +/* 8EE994 80242B74 14620007 */ bne $v1, $v0, .L80242B94 +/* 8EE998 80242B78 0000102D */ daddu $v0, $zero, $zero +/* 8EE99C 80242B7C 8E040020 */ lw $a0, 0x20($s0) +/* 8EE9A0 80242B80 0C048D70 */ jal func_801235C0 +/* 8EE9A4 80242B84 00000000 */ nop +/* 8EE9A8 80242B88 0C00AB4B */ jal heap_free +/* 8EE9AC 80242B8C 0200202D */ daddu $a0, $s0, $zero +/* 8EE9B0 80242B90 24020001 */ addiu $v0, $zero, 1 +.L80242B94: +/* 8EE9B4 80242B94 8FBF0018 */ lw $ra, 0x18($sp) +/* 8EE9B8 80242B98 8FB10014 */ lw $s1, 0x14($sp) +/* 8EE9BC 80242B9C 8FB00010 */ lw $s0, 0x10($sp) +/* 8EE9C0 80242BA0 03E00008 */ jr $ra +/* 8EE9C4 80242BA4 27BD0020 */ addiu $sp, $sp, 0x20 +/* 8EE9C8 80242BA8 00000000 */ nop +/* 8EE9CC 80242BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010.s deleted file mode 100644 index 82e088b04d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010.s +++ /dev/null @@ -1,133 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240010 -/* 8FEE90 80240010 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* 8FEE94 80240014 0000482D */ daddu $t1, $zero, $zero -/* 8FEE98 80240018 3C02800A */ lui $v0, 0x800a -/* 8FEE9C 8024001C 2442A66C */ addiu $v0, $v0, -0x5994 -/* 8FEEA0 80240020 0040402D */ daddu $t0, $v0, $zero -/* 8FEEA4 80240024 3C0EFD18 */ lui $t6, 0xfd18 -/* 8FEEA8 80240028 35CE00C7 */ ori $t6, $t6, 0xc7 -/* 8FEEAC 8024002C AFB3000C */ sw $s3, 0xc($sp) -/* 8FEEB0 80240030 3C138024 */ lui $s3, 0x8024 -/* 8FEEB4 80240034 267307F4 */ addiu $s3, $s3, 0x7f4 -/* 8FEEB8 80240038 3C0BF518 */ lui $t3, 0xf518 -/* 8FEEBC 8024003C 356B6400 */ ori $t3, $t3, 0x6400 -/* 8FEEC0 80240040 AFB20008 */ sw $s2, 8($sp) -/* 8FEEC4 80240044 3C120700 */ lui $s2, 0x700 -/* 8FEEC8 80240048 AFB10004 */ sw $s1, 4($sp) -/* 8FEECC 8024004C 3C11E600 */ lui $s1, 0xe600 -/* 8FEED0 80240050 AFB00000 */ sw $s0, ($sp) -/* 8FEED4 80240054 3C10F400 */ lui $s0, 0xf400 -/* 8FEED8 80240058 3C0D0731 */ lui $t5, 0x731 -/* 8FEEDC 8024005C 35ADC004 */ ori $t5, $t5, 0xc004 -/* 8FEEE0 80240060 3C19E700 */ lui $t9, 0xe700 -/* 8FEEE4 80240064 3C18F200 */ lui $t8, 0xf200 -/* 8FEEE8 80240068 3C0C0031 */ lui $t4, 0x31 -/* 8FEEEC 8024006C 358CC004 */ ori $t4, $t4, 0xc004 -/* 8FEEF0 80240070 3C0F8024 */ lui $t7, 0x8024 -/* 8FEEF4 80240074 25EF0334 */ addiu $t7, $t7, 0x334 -/* 8FEEF8 80240078 0120502D */ daddu $t2, $t1, $zero -/* 8FEEFC 8024007C 8D030000 */ lw $v1, ($t0) -/* 8FEF00 80240080 3C02DE00 */ lui $v0, 0xde00 -/* 8FEF04 80240084 0060202D */ daddu $a0, $v1, $zero -/* 8FEF08 80240088 24630008 */ addiu $v1, $v1, 8 -/* 8FEF0C 8024008C AD030000 */ sw $v1, ($t0) -/* 8FEF10 80240090 AC820000 */ sw $v0, ($a0) -/* 8FEF14 80240094 3C028024 */ lui $v0, 0x8024 -/* 8FEF18 80240098 24420338 */ addiu $v0, $v0, 0x338 -/* 8FEF1C 8024009C AC820004 */ sw $v0, 4($a0) -/* 8FEF20 802400A0 24620008 */ addiu $v0, $v1, 8 -/* 8FEF24 802400A4 AD020000 */ sw $v0, ($t0) -/* 8FEF28 802400A8 3C048024 */ lui $a0, 0x8024 -/* 8FEF2C 802400AC 90840333 */ lbu $a0, 0x333($a0) -/* 8FEF30 802400B0 3C02FA00 */ lui $v0, 0xfa00 -/* 8FEF34 802400B4 AC620000 */ sw $v0, ($v1) -/* 8FEF38 802400B8 24620010 */ addiu $v0, $v1, 0x10 -/* 8FEF3C 802400BC AC640004 */ sw $a0, 4($v1) -/* 8FEF40 802400C0 AD020000 */ sw $v0, ($t0) -/* 8FEF44 802400C4 0320102D */ daddu $v0, $t9, $zero -/* 8FEF48 802400C8 AC620008 */ sw $v0, 8($v1) -/* 8FEF4C 802400CC AC60000C */ sw $zero, 0xc($v1) -.L802400D0: -/* 8FEF50 802400D0 3C070400 */ lui $a3, 0x400 -/* 8FEF54 802400D4 34E70400 */ ori $a3, $a3, 0x400 -/* 8FEF58 802400D8 00092840 */ sll $a1, $t1, 1 -/* 8FEF5C 802400DC 25290001 */ addiu $t1, $t1, 1 -/* 8FEF60 802400E0 8D040000 */ lw $a0, ($t0) -/* 8FEF64 802400E4 8E620000 */ lw $v0, ($s3) -/* 8FEF68 802400E8 0080182D */ daddu $v1, $a0, $zero -/* 8FEF6C 802400EC 24840008 */ addiu $a0, $a0, 8 -/* 8FEF70 802400F0 004A1021 */ addu $v0, $v0, $t2 -/* 8FEF74 802400F4 254A0640 */ addiu $t2, $t2, 0x640 -/* 8FEF78 802400F8 AD040000 */ sw $a0, ($t0) -/* 8FEF7C 802400FC AC620004 */ sw $v0, 4($v1) -/* 8FEF80 80240100 24820008 */ addiu $v0, $a0, 8 -/* 8FEF84 80240104 AC6E0000 */ sw $t6, ($v1) -/* 8FEF88 80240108 AD020000 */ sw $v0, ($t0) -/* 8FEF8C 8024010C 24820010 */ addiu $v0, $a0, 0x10 -/* 8FEF90 80240110 AC8B0000 */ sw $t3, ($a0) -/* 8FEF94 80240114 AC920004 */ sw $s2, 4($a0) -/* 8FEF98 80240118 AD020000 */ sw $v0, ($t0) -/* 8FEF9C 8024011C 24820018 */ addiu $v0, $a0, 0x18 -/* 8FEFA0 80240120 AC910008 */ sw $s1, 8($a0) -/* 8FEFA4 80240124 AC80000C */ sw $zero, 0xc($a0) -/* 8FEFA8 80240128 AD020000 */ sw $v0, ($t0) -/* 8FEFAC 8024012C 24820020 */ addiu $v0, $a0, 0x20 -/* 8FEFB0 80240130 AC900010 */ sw $s0, 0x10($a0) -/* 8FEFB4 80240134 AC8D0014 */ sw $t5, 0x14($a0) -/* 8FEFB8 80240138 AD020000 */ sw $v0, ($t0) -/* 8FEFBC 8024013C 24820028 */ addiu $v0, $a0, 0x28 -/* 8FEFC0 80240140 AC990018 */ sw $t9, 0x18($a0) -/* 8FEFC4 80240144 AC80001C */ sw $zero, 0x1c($a0) -/* 8FEFC8 80240148 AD020000 */ sw $v0, ($t0) -/* 8FEFCC 8024014C 24820030 */ addiu $v0, $a0, 0x30 -/* 8FEFD0 80240150 AC8B0020 */ sw $t3, 0x20($a0) -/* 8FEFD4 80240154 AC800024 */ sw $zero, 0x24($a0) -/* 8FEFD8 80240158 AD020000 */ sw $v0, ($t0) -/* 8FEFDC 8024015C 24820038 */ addiu $v0, $a0, 0x38 -/* 8FEFE0 80240160 AC980028 */ sw $t8, 0x28($a0) -/* 8FEFE4 80240164 AC8C002C */ sw $t4, 0x2c($a0) -/* 8FEFE8 80240168 8DE60000 */ lw $a2, ($t7) -/* 8FEFEC 8024016C 3C03E441 */ lui $v1, 0xe441 -/* 8FEFF0 80240170 AD020000 */ sw $v0, ($t0) -/* 8FEFF4 80240174 24C20002 */ addiu $v0, $a2, 2 -/* 8FEFF8 80240178 00A21021 */ addu $v0, $a1, $v0 -/* 8FEFFC 8024017C 00021080 */ sll $v0, $v0, 2 -/* 8FF000 80240180 30420FFF */ andi $v0, $v0, 0xfff -/* 8FF004 80240184 00431025 */ or $v0, $v0, $v1 -/* 8FF008 80240188 00A62821 */ addu $a1, $a1, $a2 -/* 8FF00C 8024018C 00052880 */ sll $a1, $a1, 2 -/* 8FF010 80240190 30A50FFF */ andi $a1, $a1, 0xfff -/* 8FF014 80240194 AC820030 */ sw $v0, 0x30($a0) -/* 8FF018 80240198 3C02000F */ lui $v0, 0xf -/* 8FF01C 8024019C 00A22825 */ or $a1, $a1, $v0 -/* 8FF020 802401A0 24820040 */ addiu $v0, $a0, 0x40 -/* 8FF024 802401A4 AC850034 */ sw $a1, 0x34($a0) -/* 8FF028 802401A8 AD020000 */ sw $v0, ($t0) -/* 8FF02C 802401AC 3C02E100 */ lui $v0, 0xe100 -/* 8FF030 802401B0 AC820038 */ sw $v0, 0x38($a0) -/* 8FF034 802401B4 24820048 */ addiu $v0, $a0, 0x48 -/* 8FF038 802401B8 AC80003C */ sw $zero, 0x3c($a0) -/* 8FF03C 802401BC AD020000 */ sw $v0, ($t0) -/* 8FF040 802401C0 3C02F100 */ lui $v0, 0xf100 -/* 8FF044 802401C4 AC820040 */ sw $v0, 0x40($a0) -/* 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, 0x800a -/* 8FF058 802401D8 2463A66C */ addiu $v1, $v1, -0x5994 -/* 8FF05C 802401DC 8C620000 */ lw $v0, ($v1) -/* 8FF060 802401E0 0040202D */ daddu $a0, $v0, $zero -/* 8FF064 802401E4 24420008 */ addiu $v0, $v0, 8 -/* 8FF068 802401E8 AC620000 */ sw $v0, ($v1) -/* 8FF06C 802401EC 3C02E700 */ lui $v0, 0xe700 -/* 8FF070 802401F0 AC820000 */ sw $v0, ($a0) -/* 8FF074 802401F4 AC800004 */ sw $zero, 4($a0) -/* 8FF078 802401F8 8FB3000C */ lw $s3, 0xc($sp) -/* 8FF07C 802401FC 8FB20008 */ lw $s2, 8($sp) -/* 8FF080 80240200 8FB10004 */ lw $s1, 4($sp) -/* 8FF084 80240204 8FB00000 */ lw $s0, ($sp) -/* 8FF088 80240208 03E00008 */ jr $ra -/* 8FF08C 8024020C 27BD0010 */ addiu $sp, $sp, 0x10 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 new file mode 100644 index 0000000000..371009bd9b --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240010_8FEE90.s @@ -0,0 +1,133 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240010_8FEE90 +/* 8FEE90 80240010 27BDFFF0 */ addiu $sp, $sp, -0x10 +/* 8FEE94 80240014 0000482D */ daddu $t1, $zero, $zero +/* 8FEE98 80240018 3C02800A */ lui $v0, 0x800a +/* 8FEE9C 8024001C 2442A66C */ addiu $v0, $v0, -0x5994 +/* 8FEEA0 80240020 0040402D */ daddu $t0, $v0, $zero +/* 8FEEA4 80240024 3C0EFD18 */ lui $t6, 0xfd18 +/* 8FEEA8 80240028 35CE00C7 */ ori $t6, $t6, 0xc7 +/* 8FEEAC 8024002C AFB3000C */ sw $s3, 0xc($sp) +/* 8FEEB0 80240030 3C138024 */ lui $s3, 0x8024 +/* 8FEEB4 80240034 267307F4 */ addiu $s3, $s3, 0x7f4 +/* 8FEEB8 80240038 3C0BF518 */ lui $t3, 0xf518 +/* 8FEEBC 8024003C 356B6400 */ ori $t3, $t3, 0x6400 +/* 8FEEC0 80240040 AFB20008 */ sw $s2, 8($sp) +/* 8FEEC4 80240044 3C120700 */ lui $s2, 0x700 +/* 8FEEC8 80240048 AFB10004 */ sw $s1, 4($sp) +/* 8FEECC 8024004C 3C11E600 */ lui $s1, 0xe600 +/* 8FEED0 80240050 AFB00000 */ sw $s0, ($sp) +/* 8FEED4 80240054 3C10F400 */ lui $s0, 0xf400 +/* 8FEED8 80240058 3C0D0731 */ lui $t5, 0x731 +/* 8FEEDC 8024005C 35ADC004 */ ori $t5, $t5, 0xc004 +/* 8FEEE0 80240060 3C19E700 */ lui $t9, 0xe700 +/* 8FEEE4 80240064 3C18F200 */ lui $t8, 0xf200 +/* 8FEEE8 80240068 3C0C0031 */ lui $t4, 0x31 +/* 8FEEEC 8024006C 358CC004 */ ori $t4, $t4, 0xc004 +/* 8FEEF0 80240070 3C0F8024 */ lui $t7, 0x8024 +/* 8FEEF4 80240074 25EF0334 */ addiu $t7, $t7, 0x334 +/* 8FEEF8 80240078 0120502D */ daddu $t2, $t1, $zero +/* 8FEEFC 8024007C 8D030000 */ lw $v1, ($t0) +/* 8FEF00 80240080 3C02DE00 */ lui $v0, 0xde00 +/* 8FEF04 80240084 0060202D */ daddu $a0, $v1, $zero +/* 8FEF08 80240088 24630008 */ addiu $v1, $v1, 8 +/* 8FEF0C 8024008C AD030000 */ sw $v1, ($t0) +/* 8FEF10 80240090 AC820000 */ sw $v0, ($a0) +/* 8FEF14 80240094 3C028024 */ lui $v0, 0x8024 +/* 8FEF18 80240098 24420338 */ addiu $v0, $v0, 0x338 +/* 8FEF1C 8024009C AC820004 */ sw $v0, 4($a0) +/* 8FEF20 802400A0 24620008 */ addiu $v0, $v1, 8 +/* 8FEF24 802400A4 AD020000 */ sw $v0, ($t0) +/* 8FEF28 802400A8 3C048024 */ lui $a0, 0x8024 +/* 8FEF2C 802400AC 90840333 */ lbu $a0, 0x333($a0) +/* 8FEF30 802400B0 3C02FA00 */ lui $v0, 0xfa00 +/* 8FEF34 802400B4 AC620000 */ sw $v0, ($v1) +/* 8FEF38 802400B8 24620010 */ addiu $v0, $v1, 0x10 +/* 8FEF3C 802400BC AC640004 */ sw $a0, 4($v1) +/* 8FEF40 802400C0 AD020000 */ sw $v0, ($t0) +/* 8FEF44 802400C4 0320102D */ daddu $v0, $t9, $zero +/* 8FEF48 802400C8 AC620008 */ sw $v0, 8($v1) +/* 8FEF4C 802400CC AC60000C */ sw $zero, 0xc($v1) +.L802400D0: +/* 8FEF50 802400D0 3C070400 */ lui $a3, 0x400 +/* 8FEF54 802400D4 34E70400 */ ori $a3, $a3, 0x400 +/* 8FEF58 802400D8 00092840 */ sll $a1, $t1, 1 +/* 8FEF5C 802400DC 25290001 */ addiu $t1, $t1, 1 +/* 8FEF60 802400E0 8D040000 */ lw $a0, ($t0) +/* 8FEF64 802400E4 8E620000 */ lw $v0, ($s3) +/* 8FEF68 802400E8 0080182D */ daddu $v1, $a0, $zero +/* 8FEF6C 802400EC 24840008 */ addiu $a0, $a0, 8 +/* 8FEF70 802400F0 004A1021 */ addu $v0, $v0, $t2 +/* 8FEF74 802400F4 254A0640 */ addiu $t2, $t2, 0x640 +/* 8FEF78 802400F8 AD040000 */ sw $a0, ($t0) +/* 8FEF7C 802400FC AC620004 */ sw $v0, 4($v1) +/* 8FEF80 80240100 24820008 */ addiu $v0, $a0, 8 +/* 8FEF84 80240104 AC6E0000 */ sw $t6, ($v1) +/* 8FEF88 80240108 AD020000 */ sw $v0, ($t0) +/* 8FEF8C 8024010C 24820010 */ addiu $v0, $a0, 0x10 +/* 8FEF90 80240110 AC8B0000 */ sw $t3, ($a0) +/* 8FEF94 80240114 AC920004 */ sw $s2, 4($a0) +/* 8FEF98 80240118 AD020000 */ sw $v0, ($t0) +/* 8FEF9C 8024011C 24820018 */ addiu $v0, $a0, 0x18 +/* 8FEFA0 80240120 AC910008 */ sw $s1, 8($a0) +/* 8FEFA4 80240124 AC80000C */ sw $zero, 0xc($a0) +/* 8FEFA8 80240128 AD020000 */ sw $v0, ($t0) +/* 8FEFAC 8024012C 24820020 */ addiu $v0, $a0, 0x20 +/* 8FEFB0 80240130 AC900010 */ sw $s0, 0x10($a0) +/* 8FEFB4 80240134 AC8D0014 */ sw $t5, 0x14($a0) +/* 8FEFB8 80240138 AD020000 */ sw $v0, ($t0) +/* 8FEFBC 8024013C 24820028 */ addiu $v0, $a0, 0x28 +/* 8FEFC0 80240140 AC990018 */ sw $t9, 0x18($a0) +/* 8FEFC4 80240144 AC80001C */ sw $zero, 0x1c($a0) +/* 8FEFC8 80240148 AD020000 */ sw $v0, ($t0) +/* 8FEFCC 8024014C 24820030 */ addiu $v0, $a0, 0x30 +/* 8FEFD0 80240150 AC8B0020 */ sw $t3, 0x20($a0) +/* 8FEFD4 80240154 AC800024 */ sw $zero, 0x24($a0) +/* 8FEFD8 80240158 AD020000 */ sw $v0, ($t0) +/* 8FEFDC 8024015C 24820038 */ addiu $v0, $a0, 0x38 +/* 8FEFE0 80240160 AC980028 */ sw $t8, 0x28($a0) +/* 8FEFE4 80240164 AC8C002C */ sw $t4, 0x2c($a0) +/* 8FEFE8 80240168 8DE60000 */ lw $a2, ($t7) +/* 8FEFEC 8024016C 3C03E441 */ lui $v1, 0xe441 +/* 8FEFF0 80240170 AD020000 */ sw $v0, ($t0) +/* 8FEFF4 80240174 24C20002 */ addiu $v0, $a2, 2 +/* 8FEFF8 80240178 00A21021 */ addu $v0, $a1, $v0 +/* 8FEFFC 8024017C 00021080 */ sll $v0, $v0, 2 +/* 8FF000 80240180 30420FFF */ andi $v0, $v0, 0xfff +/* 8FF004 80240184 00431025 */ or $v0, $v0, $v1 +/* 8FF008 80240188 00A62821 */ addu $a1, $a1, $a2 +/* 8FF00C 8024018C 00052880 */ sll $a1, $a1, 2 +/* 8FF010 80240190 30A50FFF */ andi $a1, $a1, 0xfff +/* 8FF014 80240194 AC820030 */ sw $v0, 0x30($a0) +/* 8FF018 80240198 3C02000F */ lui $v0, 0xf +/* 8FF01C 8024019C 00A22825 */ or $a1, $a1, $v0 +/* 8FF020 802401A0 24820040 */ addiu $v0, $a0, 0x40 +/* 8FF024 802401A4 AC850034 */ sw $a1, 0x34($a0) +/* 8FF028 802401A8 AD020000 */ sw $v0, ($t0) +/* 8FF02C 802401AC 3C02E100 */ lui $v0, 0xe100 +/* 8FF030 802401B0 AC820038 */ sw $v0, 0x38($a0) +/* 8FF034 802401B4 24820048 */ addiu $v0, $a0, 0x48 +/* 8FF038 802401B8 AC80003C */ sw $zero, 0x3c($a0) +/* 8FF03C 802401BC AD020000 */ sw $v0, ($t0) +/* 8FF040 802401C0 3C02F100 */ lui $v0, 0xf100 +/* 8FF044 802401C4 AC820040 */ sw $v0, 0x40($a0) +/* 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, 0x800a +/* 8FF058 802401D8 2463A66C */ addiu $v1, $v1, -0x5994 +/* 8FF05C 802401DC 8C620000 */ lw $v0, ($v1) +/* 8FF060 802401E0 0040202D */ daddu $a0, $v0, $zero +/* 8FF064 802401E4 24420008 */ addiu $v0, $v0, 8 +/* 8FF068 802401E8 AC620000 */ sw $v0, ($v1) +/* 8FF06C 802401EC 3C02E700 */ lui $v0, 0xe700 +/* 8FF070 802401F0 AC820000 */ sw $v0, ($a0) +/* 8FF074 802401F4 AC800004 */ sw $zero, 4($a0) +/* 8FF078 802401F8 8FB3000C */ lw $s3, 0xc($sp) +/* 8FF07C 802401FC 8FB20008 */ lw $s2, 8($sp) +/* 8FF080 80240200 8FB10004 */ lw $s1, 4($sp) +/* 8FF084 80240204 8FB00000 */ lw $s0, ($sp) +/* 8FF088 80240208 03E00008 */ jr $ra +/* 8FF08C 8024020C 27BD0010 */ addiu $sp, $sp, 0x10 diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210.s deleted file mode 100644 index 76b13d6c3a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240210 -/* 8FF090 80240210 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8FF094 80240214 3C048024 */ lui $a0, 0x8024 -/* 8FF098 80240218 248407D0 */ addiu $a0, $a0, 0x7d0 -/* 8FF09C 8024021C 27A50010 */ addiu $a1, $sp, 0x10 -/* 8FF0A0 80240220 AFBF0020 */ sw $ra, 0x20($sp) -/* 8FF0A4 80240224 AFB1001C */ sw $s1, 0x1c($sp) -/* 8FF0A8 80240228 0C016B3A */ jal load_asset_by_name -/* 8FF0AC 8024022C AFB00018 */ sw $s0, 0x18($sp) -/* 8FF0B0 80240230 8FA40010 */ lw $a0, 0x10($sp) -/* 8FF0B4 80240234 0C00AB39 */ jal heap_malloc -/* 8FF0B8 80240238 0040882D */ daddu $s1, $v0, $zero -/* 8FF0BC 8024023C 0220202D */ daddu $a0, $s1, $zero -/* 8FF0C0 80240240 0040282D */ daddu $a1, $v0, $zero -/* 8FF0C4 80240244 3C108024 */ lui $s0, 0x8024 -/* 8FF0C8 80240248 261007F0 */ addiu $s0, $s0, 0x7f0 -/* 8FF0CC 8024024C 0C01BB7C */ jal decode_yay0 -/* 8FF0D0 80240250 AE050000 */ sw $a1, ($s0) -/* 8FF0D4 80240254 0C00AB1E */ jal general_heap_free -/* 8FF0D8 80240258 0220202D */ daddu $a0, $s1, $zero -/* 8FF0DC 8024025C 8E030000 */ lw $v1, ($s0) -/* 8FF0E0 80240260 8C620000 */ lw $v0, ($v1) -/* 8FF0E4 80240264 3C058024 */ lui $a1, 0x8024 -/* 8FF0E8 80240268 24A50010 */ addiu $a1, $a1, 0x10 -/* 8FF0EC 8024026C 00431021 */ addu $v0, $v0, $v1 -/* 8FF0F0 80240270 3C018024 */ lui $at, 0x8024 -/* 8FF0F4 80240274 AC2207F4 */ sw $v0, 0x7f4($at) -/* 8FF0F8 80240278 0C048C8F */ jal bind_dynamic_entity_7 -/* 8FF0FC 8024027C 0000202D */ daddu $a0, $zero, $zero -/* 8FF100 80240280 8FBF0020 */ lw $ra, 0x20($sp) -/* 8FF104 80240284 8FB1001C */ lw $s1, 0x1c($sp) -/* 8FF108 80240288 8FB00018 */ lw $s0, 0x18($sp) -/* 8FF10C 8024028C 24020002 */ addiu $v0, $zero, 2 -/* 8FF110 80240290 03E00008 */ jr $ra -/* 8FF114 80240294 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s new file mode 100644 index 0000000000..7b7f9f32bd --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240210_8FF090.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240210_8FF090 +/* 8FF090 80240210 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8FF094 80240214 3C048024 */ lui $a0, 0x8024 +/* 8FF098 80240218 248407D0 */ addiu $a0, $a0, 0x7d0 +/* 8FF09C 8024021C 27A50010 */ addiu $a1, $sp, 0x10 +/* 8FF0A0 80240220 AFBF0020 */ sw $ra, 0x20($sp) +/* 8FF0A4 80240224 AFB1001C */ sw $s1, 0x1c($sp) +/* 8FF0A8 80240228 0C016B3A */ jal load_asset_by_name +/* 8FF0AC 8024022C AFB00018 */ sw $s0, 0x18($sp) +/* 8FF0B0 80240230 8FA40010 */ lw $a0, 0x10($sp) +/* 8FF0B4 80240234 0C00AB39 */ jal heap_malloc +/* 8FF0B8 80240238 0040882D */ daddu $s1, $v0, $zero +/* 8FF0BC 8024023C 0220202D */ daddu $a0, $s1, $zero +/* 8FF0C0 80240240 0040282D */ daddu $a1, $v0, $zero +/* 8FF0C4 80240244 3C108024 */ lui $s0, 0x8024 +/* 8FF0C8 80240248 261007F0 */ addiu $s0, $s0, 0x7f0 +/* 8FF0CC 8024024C 0C01BB7C */ jal decode_yay0 +/* 8FF0D0 80240250 AE050000 */ sw $a1, ($s0) +/* 8FF0D4 80240254 0C00AB1E */ jal general_heap_free +/* 8FF0D8 80240258 0220202D */ daddu $a0, $s1, $zero +/* 8FF0DC 8024025C 8E030000 */ lw $v1, ($s0) +/* 8FF0E0 80240260 8C620000 */ lw $v0, ($v1) +/* 8FF0E4 80240264 3C058024 */ lui $a1, 0x8024 +/* 8FF0E8 80240268 24A50010 */ addiu $a1, $a1, 0x10 +/* 8FF0EC 8024026C 00431021 */ addu $v0, $v0, $v1 +/* 8FF0F0 80240270 3C018024 */ lui $at, 0x8024 +/* 8FF0F4 80240274 AC2207F4 */ sw $v0, 0x7f4($at) +/* 8FF0F8 80240278 0C048C8F */ jal bind_dynamic_entity_7 +/* 8FF0FC 8024027C 0000202D */ daddu $a0, $zero, $zero +/* 8FF100 80240280 8FBF0020 */ lw $ra, 0x20($sp) +/* 8FF104 80240284 8FB1001C */ lw $s1, 0x1c($sp) +/* 8FF108 80240288 8FB00018 */ lw $s0, 0x18($sp) +/* 8FF10C 8024028C 24020002 */ addiu $v0, $zero, 2 +/* 8FF110 80240290 03E00008 */ jr $ra +/* 8FF114 80240294 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240298.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240298.s deleted file mode 100644 index a063d35025..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240298.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240298 -/* 8FF118 80240298 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8FF11C 8024029C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8FF120 802402A0 8C420010 */ lw $v0, 0x10($v0) -/* 8FF124 802402A4 30429000 */ andi $v0, $v0, 0x9000 -/* 8FF128 802402A8 0002102B */ sltu $v0, $zero, $v0 -/* 8FF12C 802402AC 03E00008 */ jr $ra -/* 8FF130 802402B0 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240298_8FF118.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240298_8FF118.s new file mode 100644 index 0000000000..66963fd794 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_80240298_8FF118.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240298_8FF118 +/* 8FF118 80240298 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 8FF11C 8024029C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 8FF120 802402A0 8C420010 */ lw $v0, 0x10($v0) +/* 8FF124 802402A4 30429000 */ andi $v0, $v0, 0x9000 +/* 8FF128 802402A8 0002102B */ sltu $v0, $zero, $v0 +/* 8FF12C 802402AC 03E00008 */ jr $ra +/* 8FF130 802402B0 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4.s deleted file mode 100644 index f1437841d3..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B4 -/* 8FF134 802402B4 8C820084 */ lw $v0, 0x84($a0) -/* 8FF138 802402B8 3C018024 */ lui $at, 0x8024 -/* 8FF13C 802402BC AC220330 */ sw $v0, 0x330($at) -/* 8FF140 802402C0 03E00008 */ jr $ra -/* 8FF144 802402C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s new file mode 100644 index 0000000000..db4027da30 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_21/8FEE90/func_802402B4_8FF134.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402B4_8FF134 +/* 8FF134 802402B4 8C820084 */ lw $v0, 0x84($a0) +/* 8FF138 802402B8 3C018024 */ lui $at, 0x8024 +/* 8FF13C 802402BC AC220330 */ sw $v0, 0x330($at) +/* 8FF140 802402C0 03E00008 */ jr $ra +/* 8FF144 802402C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0.s deleted file mode 100644 index b9ae65e9d2..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401E0 -/* 8FF850 802401E0 3C014000 */ lui $at, 0x4000 -/* 8FF854 802401E4 44816000 */ mtc1 $at, $f12 -/* 8FF858 802401E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8FF85C 802401EC AFBF0010 */ sw $ra, 0x10($sp) -/* 8FF860 802401F0 0C00AFB7 */ jal set_curtain_scale_goal -/* 8FF864 802401F4 00000000 */ nop -/* 8FF868 802401F8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8FF86C 802401FC 24020002 */ addiu $v0, $zero, 2 -/* 8FF870 80240200 03E00008 */ jr $ra -/* 8FF874 80240204 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s new file mode 100644 index 0000000000..e02246c876 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_802401E0_8FF850.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401E0_8FF850 +/* 8FF850 802401E0 3C014000 */ lui $at, 0x4000 +/* 8FF854 802401E4 44816000 */ mtc1 $at, $f12 +/* 8FF858 802401E8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8FF85C 802401EC AFBF0010 */ sw $ra, 0x10($sp) +/* 8FF860 802401F0 0C00AFB7 */ jal set_curtain_scale_goal +/* 8FF864 802401F4 00000000 */ nop +/* 8FF868 802401F8 8FBF0010 */ lw $ra, 0x10($sp) +/* 8FF86C 802401FC 24020002 */ addiu $v0, $zero, 2 +/* 8FF870 80240200 03E00008 */ jr $ra +/* 8FF874 80240204 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208.s deleted file mode 100644 index 479cd2ee27..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240208 -/* 8FF878 80240208 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8FF87C 8024020C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8FF880 80240210 8C430010 */ lw $v1, 0x10($v0) -/* 8FF884 80240214 30621000 */ andi $v0, $v1, 0x1000 -/* 8FF888 80240218 0002102B */ sltu $v0, $zero, $v0 -/* 8FF88C 8024021C 30638000 */ andi $v1, $v1, 0x8000 -/* 8FF890 80240220 10600004 */ beqz $v1, .L80240234 -/* 8FF894 80240224 00022840 */ sll $a1, $v0, 1 -/* 8FF898 80240228 24050002 */ addiu $a1, $zero, 2 -/* 8FF89C 8024022C 2402FFFF */ addiu $v0, $zero, -1 -/* 8FF8A0 80240230 AC820084 */ sw $v0, 0x84($a0) -.L80240234: -/* 8FF8A4 80240234 03E00008 */ jr $ra -/* 8FF8A8 80240238 00A0102D */ daddu $v0, $a1, $zero -/* 8FF8AC 8024023C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s new file mode 100644 index 0000000000..eb7375c07d --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF680/func_80240208_8FF878.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240208_8FF878 +/* 8FF878 80240208 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 8FF87C 8024020C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 8FF880 80240210 8C430010 */ lw $v1, 0x10($v0) +/* 8FF884 80240214 30621000 */ andi $v0, $v1, 0x1000 +/* 8FF888 80240218 0002102B */ sltu $v0, $zero, $v0 +/* 8FF88C 8024021C 30638000 */ andi $v1, $v1, 0x8000 +/* 8FF890 80240220 10600004 */ beqz $v1, .L80240234 +/* 8FF894 80240224 00022840 */ sll $a1, $v0, 1 +/* 8FF898 80240228 24050002 */ addiu $a1, $zero, 2 +/* 8FF89C 8024022C 2402FFFF */ addiu $v0, $zero, -1 +/* 8FF8A0 80240230 AC820084 */ sw $v0, 0x84($a0) +.L80240234: +/* 8FF8A4 80240234 03E00008 */ jr $ra +/* 8FF8A8 80240238 00A0102D */ daddu $v0, $a1, $zero +/* 8FF8AC 8024023C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240.s deleted file mode 100644 index 9d0870629a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240240 -/* 8FF8B0 80240240 27BDFE60 */ addiu $sp, $sp, -0x1a0 -/* 8FF8B4 80240244 AFB30194 */ sw $s3, 0x194($sp) -/* 8FF8B8 80240248 0080982D */ daddu $s3, $a0, $zero -/* 8FF8BC 8024024C AFB1018C */ sw $s1, 0x18c($sp) -/* 8FF8C0 80240250 27B10010 */ addiu $s1, $sp, 0x10 -/* 8FF8C4 80240254 0220202D */ daddu $a0, $s1, $zero -/* 8FF8C8 80240258 24050001 */ addiu $a1, $zero, 1 -/* 8FF8CC 8024025C AFBF0198 */ sw $ra, 0x198($sp) -/* 8FF8D0 80240260 AFB20190 */ sw $s2, 0x190($sp) -/* 8FF8D4 80240264 AFB00188 */ sw $s0, 0x188($sp) -/* 8FF8D8 80240268 8E630090 */ lw $v1, 0x90($s3) -/* 8FF8DC 8024026C 0000902D */ daddu $s2, $zero, $zero -/* 8FF8E0 80240270 AFB3017C */ sw $s3, 0x17c($sp) -/* 8FF8E4 80240274 00A31004 */ sllv $v0, $v1, $a1 -/* 8FF8E8 80240278 00431021 */ addu $v0, $v0, $v1 -/* 8FF8EC 8024027C AFA20178 */ sw $v0, 0x178($sp) -/* 8FF8F0 80240280 8E630090 */ lw $v1, 0x90($s3) -/* 8FF8F4 80240284 27A20178 */ addiu $v0, $sp, 0x178 -/* 8FF8F8 80240288 AFA00184 */ sw $zero, 0x184($sp) -/* 8FF8FC 8024028C AFA2001C */ sw $v0, 0x1c($sp) -/* 8FF900 80240290 0C0B550C */ jal LoadPath -/* 8FF904 80240294 AFA30180 */ sw $v1, 0x180($sp) -/* 8FF908 80240298 0260802D */ daddu $s0, $s3, $zero -.L8024029C: -/* 8FF90C 8024029C 0220202D */ daddu $a0, $s1, $zero -/* 8FF910 802402A0 0C0B5549 */ jal GetNextPathPos -/* 8FF914 802402A4 24050001 */ addiu $a1, $zero, 1 -/* 8FF918 802402A8 0220202D */ daddu $a0, $s1, $zero -/* 8FF91C 802402AC 3C05FE36 */ lui $a1, 0xfe36 -/* 8FF920 802402B0 0C0B210B */ jal get_float_variable -/* 8FF924 802402B4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8FF928 802402B8 0220202D */ daddu $a0, $s1, $zero -/* 8FF92C 802402BC 3C05FE36 */ lui $a1, 0xfe36 -/* 8FF930 802402C0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8FF934 802402C4 0C0B210B */ jal get_float_variable -/* 8FF938 802402C8 E6000098 */ swc1 $f0, 0x98($s0) -/* 8FF93C 802402CC 0220202D */ daddu $a0, $s1, $zero -/* 8FF940 802402D0 3C05FE36 */ lui $a1, 0xfe36 -/* 8FF944 802402D4 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8FF948 802402D8 0C0B210B */ jal get_float_variable -/* 8FF94C 802402DC E600009C */ swc1 $f0, 0x9c($s0) -/* 8FF950 802402E0 E60000A0 */ swc1 $f0, 0xa0($s0) -/* 8FF954 802402E4 2610000C */ addiu $s0, $s0, 0xc -/* 8FF958 802402E8 8E220084 */ lw $v0, 0x84($s1) -/* 8FF95C 802402EC 1440FFEB */ bnez $v0, .L8024029C -/* 8FF960 802402F0 26520001 */ addiu $s2, $s2, 1 -/* 8FF964 802402F4 AE7201DC */ sw $s2, 0x1dc($s3) -/* 8FF968 802402F8 8FBF0198 */ lw $ra, 0x198($sp) -/* 8FF96C 802402FC 8FB30194 */ lw $s3, 0x194($sp) -/* 8FF970 80240300 8FB20190 */ lw $s2, 0x190($sp) -/* 8FF974 80240304 8FB1018C */ lw $s1, 0x18c($sp) -/* 8FF978 80240308 8FB00188 */ lw $s0, 0x188($sp) -/* 8FF97C 8024030C 03E00008 */ jr $ra -/* 8FF980 80240310 27BD01A0 */ addiu $sp, $sp, 0x1a0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240_8FF8B0.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240_8FF8B0.s new file mode 100644 index 0000000000..f8abfca6eb --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240240_8FF8B0.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240240_8FF8B0 +/* 8FF8B0 80240240 27BDFE60 */ addiu $sp, $sp, -0x1a0 +/* 8FF8B4 80240244 AFB30194 */ sw $s3, 0x194($sp) +/* 8FF8B8 80240248 0080982D */ daddu $s3, $a0, $zero +/* 8FF8BC 8024024C AFB1018C */ sw $s1, 0x18c($sp) +/* 8FF8C0 80240250 27B10010 */ addiu $s1, $sp, 0x10 +/* 8FF8C4 80240254 0220202D */ daddu $a0, $s1, $zero +/* 8FF8C8 80240258 24050001 */ addiu $a1, $zero, 1 +/* 8FF8CC 8024025C AFBF0198 */ sw $ra, 0x198($sp) +/* 8FF8D0 80240260 AFB20190 */ sw $s2, 0x190($sp) +/* 8FF8D4 80240264 AFB00188 */ sw $s0, 0x188($sp) +/* 8FF8D8 80240268 8E630090 */ lw $v1, 0x90($s3) +/* 8FF8DC 8024026C 0000902D */ daddu $s2, $zero, $zero +/* 8FF8E0 80240270 AFB3017C */ sw $s3, 0x17c($sp) +/* 8FF8E4 80240274 00A31004 */ sllv $v0, $v1, $a1 +/* 8FF8E8 80240278 00431021 */ addu $v0, $v0, $v1 +/* 8FF8EC 8024027C AFA20178 */ sw $v0, 0x178($sp) +/* 8FF8F0 80240280 8E630090 */ lw $v1, 0x90($s3) +/* 8FF8F4 80240284 27A20178 */ addiu $v0, $sp, 0x178 +/* 8FF8F8 80240288 AFA00184 */ sw $zero, 0x184($sp) +/* 8FF8FC 8024028C AFA2001C */ sw $v0, 0x1c($sp) +/* 8FF900 80240290 0C0B550C */ jal LoadPath +/* 8FF904 80240294 AFA30180 */ sw $v1, 0x180($sp) +/* 8FF908 80240298 0260802D */ daddu $s0, $s3, $zero +.L8024029C: +/* 8FF90C 8024029C 0220202D */ daddu $a0, $s1, $zero +/* 8FF910 802402A0 0C0B5549 */ jal GetNextPathPos +/* 8FF914 802402A4 24050001 */ addiu $a1, $zero, 1 +/* 8FF918 802402A8 0220202D */ daddu $a0, $s1, $zero +/* 8FF91C 802402AC 3C05FE36 */ lui $a1, 0xfe36 +/* 8FF920 802402B0 0C0B210B */ jal get_float_variable +/* 8FF924 802402B4 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8FF928 802402B8 0220202D */ daddu $a0, $s1, $zero +/* 8FF92C 802402BC 3C05FE36 */ lui $a1, 0xfe36 +/* 8FF930 802402C0 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 8FF934 802402C4 0C0B210B */ jal get_float_variable +/* 8FF938 802402C8 E6000098 */ swc1 $f0, 0x98($s0) +/* 8FF93C 802402CC 0220202D */ daddu $a0, $s1, $zero +/* 8FF940 802402D0 3C05FE36 */ lui $a1, 0xfe36 +/* 8FF944 802402D4 34A53C83 */ ori $a1, $a1, 0x3c83 +/* 8FF948 802402D8 0C0B210B */ jal get_float_variable +/* 8FF94C 802402DC E600009C */ swc1 $f0, 0x9c($s0) +/* 8FF950 802402E0 E60000A0 */ swc1 $f0, 0xa0($s0) +/* 8FF954 802402E4 2610000C */ addiu $s0, $s0, 0xc +/* 8FF958 802402E8 8E220084 */ lw $v0, 0x84($s1) +/* 8FF95C 802402EC 1440FFEB */ bnez $v0, .L8024029C +/* 8FF960 802402F0 26520001 */ addiu $s2, $s2, 1 +/* 8FF964 802402F4 AE7201DC */ sw $s2, 0x1dc($s3) +/* 8FF968 802402F8 8FBF0198 */ lw $ra, 0x198($sp) +/* 8FF96C 802402FC 8FB30194 */ lw $s3, 0x194($sp) +/* 8FF970 80240300 8FB20190 */ lw $s2, 0x190($sp) +/* 8FF974 80240304 8FB1018C */ lw $s1, 0x18c($sp) +/* 8FF978 80240308 8FB00188 */ lw $s0, 0x188($sp) +/* 8FF97C 8024030C 03E00008 */ jr $ra +/* 8FF980 80240310 27BD01A0 */ addiu $sp, $sp, 0x1a0 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314.s deleted file mode 100644 index e43161cce9..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240314 -/* 8FF984 80240314 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8FF988 80240318 AFB10014 */ sw $s1, 0x14($sp) -/* 8FF98C 8024031C 0080882D */ daddu $s1, $a0, $zero -/* 8FF990 80240320 AFBF0024 */ sw $ra, 0x24($sp) -/* 8FF994 80240324 AFB40020 */ sw $s4, 0x20($sp) -/* 8FF998 80240328 AFB3001C */ sw $s3, 0x1c($sp) -/* 8FF99C 8024032C AFB20018 */ sw $s2, 0x18($sp) -/* 8FF9A0 80240330 AFB00010 */ sw $s0, 0x10($sp) -/* 8FF9A4 80240334 8E30000C */ lw $s0, 0xc($s1) -/* 8FF9A8 80240338 8E050000 */ lw $a1, ($s0) -/* 8FF9AC 8024033C 0C0B1EAF */ jal get_variable -/* 8FF9B0 80240340 26100004 */ addiu $s0, $s0, 4 -/* 8FF9B4 80240344 8E050000 */ lw $a1, ($s0) -/* 8FF9B8 80240348 26100004 */ addiu $s0, $s0, 4 -/* 8FF9BC 8024034C 0220202D */ daddu $a0, $s1, $zero -/* 8FF9C0 80240350 0C0B1EAF */ jal get_variable -/* 8FF9C4 80240354 0040982D */ daddu $s3, $v0, $zero -/* 8FF9C8 80240358 8E050000 */ lw $a1, ($s0) -/* 8FF9CC 8024035C 26100004 */ addiu $s0, $s0, 4 -/* 8FF9D0 80240360 0220202D */ daddu $a0, $s1, $zero -/* 8FF9D4 80240364 0C0B1EAF */ jal get_variable -/* 8FF9D8 80240368 0040902D */ daddu $s2, $v0, $zero -/* 8FF9DC 8024036C 8E050000 */ lw $a1, ($s0) -/* 8FF9E0 80240370 26100004 */ addiu $s0, $s0, 4 -/* 8FF9E4 80240374 0220202D */ daddu $a0, $s1, $zero -/* 8FF9E8 80240378 0C0B1EAF */ jal get_variable -/* 8FF9EC 8024037C 0040A02D */ daddu $s4, $v0, $zero -/* 8FF9F0 80240380 0220202D */ daddu $a0, $s1, $zero -/* 8FF9F4 80240384 8E050000 */ lw $a1, ($s0) -/* 8FF9F8 80240388 0C0B1EAF */ jal get_variable -/* 8FF9FC 8024038C 0040882D */ daddu $s1, $v0, $zero -/* 8FFA00 80240390 0000202D */ daddu $a0, $zero, $zero -/* 8FFA04 80240394 3C05FD05 */ lui $a1, 0xfd05 -/* 8FFA08 80240398 34A50F80 */ ori $a1, $a1, 0xf80 -/* 8FFA0C 8024039C 0C0B1EAF */ jal get_variable -/* 8FFA10 802403A0 0040802D */ daddu $s0, $v0, $zero -/* 8FFA14 802403A4 00131900 */ sll $v1, $s3, 4 -/* 8FFA18 802403A8 00731823 */ subu $v1, $v1, $s3 -/* 8FFA1C 802403AC 00031940 */ sll $v1, $v1, 5 -/* 8FFA20 802403B0 00432021 */ addu $a0, $v0, $v1 -/* 8FFA24 802403B4 24020002 */ addiu $v0, $zero, 2 -/* 8FFA28 802403B8 00121840 */ sll $v1, $s2, 1 -/* 8FFA2C 802403BC 00721821 */ addu $v1, $v1, $s2 -/* 8FFA30 802403C0 00431804 */ sllv $v1, $v1, $v0 -/* 8FFA34 802403C4 00832021 */ addu $a0, $a0, $v1 -/* 8FFA38 802403C8 44940000 */ mtc1 $s4, $f0 -/* 8FFA3C 802403CC 00000000 */ nop -/* 8FFA40 802403D0 46800020 */ cvt.s.w $f0, $f0 -/* 8FFA44 802403D4 E4800000 */ swc1 $f0, ($a0) -/* 8FFA48 802403D8 44910000 */ mtc1 $s1, $f0 -/* 8FFA4C 802403DC 00000000 */ nop -/* 8FFA50 802403E0 46800020 */ cvt.s.w $f0, $f0 -/* 8FFA54 802403E4 E4800004 */ swc1 $f0, 4($a0) -/* 8FFA58 802403E8 44900000 */ mtc1 $s0, $f0 -/* 8FFA5C 802403EC 00000000 */ nop -/* 8FFA60 802403F0 46800020 */ cvt.s.w $f0, $f0 -/* 8FFA64 802403F4 E4800008 */ swc1 $f0, 8($a0) -/* 8FFA68 802403F8 8FBF0024 */ lw $ra, 0x24($sp) -/* 8FFA6C 802403FC 8FB40020 */ lw $s4, 0x20($sp) -/* 8FFA70 80240400 8FB3001C */ lw $s3, 0x1c($sp) -/* 8FFA74 80240404 8FB20018 */ lw $s2, 0x18($sp) -/* 8FFA78 80240408 8FB10014 */ lw $s1, 0x14($sp) -/* 8FFA7C 8024040C 8FB00010 */ lw $s0, 0x10($sp) -/* 8FFA80 80240410 03E00008 */ jr $ra -/* 8FFA84 80240414 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314_8FF984.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314_8FF984.s new file mode 100644 index 0000000000..176c6348b8 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240314_8FF984.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240314_8FF984 +/* 8FF984 80240314 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8FF988 80240318 AFB10014 */ sw $s1, 0x14($sp) +/* 8FF98C 8024031C 0080882D */ daddu $s1, $a0, $zero +/* 8FF990 80240320 AFBF0024 */ sw $ra, 0x24($sp) +/* 8FF994 80240324 AFB40020 */ sw $s4, 0x20($sp) +/* 8FF998 80240328 AFB3001C */ sw $s3, 0x1c($sp) +/* 8FF99C 8024032C AFB20018 */ sw $s2, 0x18($sp) +/* 8FF9A0 80240330 AFB00010 */ sw $s0, 0x10($sp) +/* 8FF9A4 80240334 8E30000C */ lw $s0, 0xc($s1) +/* 8FF9A8 80240338 8E050000 */ lw $a1, ($s0) +/* 8FF9AC 8024033C 0C0B1EAF */ jal get_variable +/* 8FF9B0 80240340 26100004 */ addiu $s0, $s0, 4 +/* 8FF9B4 80240344 8E050000 */ lw $a1, ($s0) +/* 8FF9B8 80240348 26100004 */ addiu $s0, $s0, 4 +/* 8FF9BC 8024034C 0220202D */ daddu $a0, $s1, $zero +/* 8FF9C0 80240350 0C0B1EAF */ jal get_variable +/* 8FF9C4 80240354 0040982D */ daddu $s3, $v0, $zero +/* 8FF9C8 80240358 8E050000 */ lw $a1, ($s0) +/* 8FF9CC 8024035C 26100004 */ addiu $s0, $s0, 4 +/* 8FF9D0 80240360 0220202D */ daddu $a0, $s1, $zero +/* 8FF9D4 80240364 0C0B1EAF */ jal get_variable +/* 8FF9D8 80240368 0040902D */ daddu $s2, $v0, $zero +/* 8FF9DC 8024036C 8E050000 */ lw $a1, ($s0) +/* 8FF9E0 80240370 26100004 */ addiu $s0, $s0, 4 +/* 8FF9E4 80240374 0220202D */ daddu $a0, $s1, $zero +/* 8FF9E8 80240378 0C0B1EAF */ jal get_variable +/* 8FF9EC 8024037C 0040A02D */ daddu $s4, $v0, $zero +/* 8FF9F0 80240380 0220202D */ daddu $a0, $s1, $zero +/* 8FF9F4 80240384 8E050000 */ lw $a1, ($s0) +/* 8FF9F8 80240388 0C0B1EAF */ jal get_variable +/* 8FF9FC 8024038C 0040882D */ daddu $s1, $v0, $zero +/* 8FFA00 80240390 0000202D */ daddu $a0, $zero, $zero +/* 8FFA04 80240394 3C05FD05 */ lui $a1, 0xfd05 +/* 8FFA08 80240398 34A50F80 */ ori $a1, $a1, 0xf80 +/* 8FFA0C 8024039C 0C0B1EAF */ jal get_variable +/* 8FFA10 802403A0 0040802D */ daddu $s0, $v0, $zero +/* 8FFA14 802403A4 00131900 */ sll $v1, $s3, 4 +/* 8FFA18 802403A8 00731823 */ subu $v1, $v1, $s3 +/* 8FFA1C 802403AC 00031940 */ sll $v1, $v1, 5 +/* 8FFA20 802403B0 00432021 */ addu $a0, $v0, $v1 +/* 8FFA24 802403B4 24020002 */ addiu $v0, $zero, 2 +/* 8FFA28 802403B8 00121840 */ sll $v1, $s2, 1 +/* 8FFA2C 802403BC 00721821 */ addu $v1, $v1, $s2 +/* 8FFA30 802403C0 00431804 */ sllv $v1, $v1, $v0 +/* 8FFA34 802403C4 00832021 */ addu $a0, $a0, $v1 +/* 8FFA38 802403C8 44940000 */ mtc1 $s4, $f0 +/* 8FFA3C 802403CC 00000000 */ nop +/* 8FFA40 802403D0 46800020 */ cvt.s.w $f0, $f0 +/* 8FFA44 802403D4 E4800000 */ swc1 $f0, ($a0) +/* 8FFA48 802403D8 44910000 */ mtc1 $s1, $f0 +/* 8FFA4C 802403DC 00000000 */ nop +/* 8FFA50 802403E0 46800020 */ cvt.s.w $f0, $f0 +/* 8FFA54 802403E4 E4800004 */ swc1 $f0, 4($a0) +/* 8FFA58 802403E8 44900000 */ mtc1 $s0, $f0 +/* 8FFA5C 802403EC 00000000 */ nop +/* 8FFA60 802403F0 46800020 */ cvt.s.w $f0, $f0 +/* 8FFA64 802403F4 E4800008 */ swc1 $f0, 8($a0) +/* 8FFA68 802403F8 8FBF0024 */ lw $ra, 0x24($sp) +/* 8FFA6C 802403FC 8FB40020 */ lw $s4, 0x20($sp) +/* 8FFA70 80240400 8FB3001C */ lw $s3, 0x1c($sp) +/* 8FFA74 80240404 8FB20018 */ lw $s2, 0x18($sp) +/* 8FFA78 80240408 8FB10014 */ lw $s1, 0x14($sp) +/* 8FFA7C 8024040C 8FB00010 */ lw $s0, 0x10($sp) +/* 8FFA80 80240410 03E00008 */ jr $ra +/* 8FFA84 80240414 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418.s deleted file mode 100644 index f9a182602a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240418 -/* 8FFA88 80240418 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8FFA8C 8024041C AFB10014 */ sw $s1, 0x14($sp) -/* 8FFA90 80240420 0080882D */ daddu $s1, $a0, $zero -/* 8FFA94 80240424 AFBF0020 */ sw $ra, 0x20($sp) -/* 8FFA98 80240428 AFB3001C */ sw $s3, 0x1c($sp) -/* 8FFA9C 8024042C AFB20018 */ sw $s2, 0x18($sp) -/* 8FFAA0 80240430 AFB00010 */ sw $s0, 0x10($sp) -/* 8FFAA4 80240434 8E30000C */ lw $s0, 0xc($s1) -/* 8FFAA8 80240438 8E050000 */ lw $a1, ($s0) -/* 8FFAAC 8024043C 0C0B1EAF */ jal get_variable -/* 8FFAB0 80240440 26100004 */ addiu $s0, $s0, 4 -/* 8FFAB4 80240444 8E050000 */ lw $a1, ($s0) -/* 8FFAB8 80240448 26100004 */ addiu $s0, $s0, 4 -/* 8FFABC 8024044C 0220202D */ daddu $a0, $s1, $zero -/* 8FFAC0 80240450 0C0B1EAF */ jal get_variable -/* 8FFAC4 80240454 0040982D */ daddu $s3, $v0, $zero -/* 8FFAC8 80240458 8E050000 */ lw $a1, ($s0) -/* 8FFACC 8024045C 26100004 */ addiu $s0, $s0, 4 -/* 8FFAD0 80240460 0220202D */ daddu $a0, $s1, $zero -/* 8FFAD4 80240464 0C0B1EAF */ jal get_variable -/* 8FFAD8 80240468 0040902D */ daddu $s2, $v0, $zero -/* 8FFADC 8024046C 8E050000 */ lw $a1, ($s0) -/* 8FFAE0 80240470 26100004 */ addiu $s0, $s0, 4 -/* 8FFAE4 80240474 0C0B1EAF */ jal get_variable -/* 8FFAE8 80240478 0220202D */ daddu $a0, $s1, $zero -/* 8FFAEC 8024047C 8E050000 */ lw $a1, ($s0) -/* 8FFAF0 80240480 0C0B1EAF */ jal get_variable -/* 8FFAF4 80240484 0220202D */ daddu $a0, $s1, $zero -/* 8FFAF8 80240488 0000202D */ daddu $a0, $zero, $zero -/* 8FFAFC 8024048C 3C05FD05 */ lui $a1, 0xfd05 -/* 8FFB00 80240490 34A50F80 */ ori $a1, $a1, 0xf80 -/* 8FFB04 80240494 0C0B1EAF */ jal get_variable -/* 8FFB08 80240498 0040802D */ daddu $s0, $v0, $zero -/* 8FFB0C 8024049C 00131900 */ sll $v1, $s3, 4 -/* 8FFB10 802404A0 00731823 */ subu $v1, $v1, $s3 -/* 8FFB14 802404A4 00031940 */ sll $v1, $v1, 5 -/* 8FFB18 802404A8 00431821 */ addu $v1, $v0, $v1 -/* 8FFB1C 802404AC 24020002 */ addiu $v0, $zero, 2 -/* 8FFB20 802404B0 00529004 */ sllv $s2, $s2, $v0 -/* 8FFB24 802404B4 00721821 */ addu $v1, $v1, $s2 -/* 8FFB28 802404B8 44900000 */ mtc1 $s0, $f0 -/* 8FFB2C 802404BC 00000000 */ nop -/* 8FFB30 802404C0 46800020 */ cvt.s.w $f0, $f0 -/* 8FFB34 802404C4 E460006C */ swc1 $f0, 0x6c($v1) -/* 8FFB38 802404C8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8FFB3C 802404CC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8FFB40 802404D0 8FB20018 */ lw $s2, 0x18($sp) -/* 8FFB44 802404D4 8FB10014 */ lw $s1, 0x14($sp) -/* 8FFB48 802404D8 8FB00010 */ lw $s0, 0x10($sp) -/* 8FFB4C 802404DC 03E00008 */ jr $ra -/* 8FFB50 802404E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418_8FFA88.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418_8FFA88.s new file mode 100644 index 0000000000..92db2f0328 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240418_8FFA88.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240418_8FFA88 +/* 8FFA88 80240418 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8FFA8C 8024041C AFB10014 */ sw $s1, 0x14($sp) +/* 8FFA90 80240420 0080882D */ daddu $s1, $a0, $zero +/* 8FFA94 80240424 AFBF0020 */ sw $ra, 0x20($sp) +/* 8FFA98 80240428 AFB3001C */ sw $s3, 0x1c($sp) +/* 8FFA9C 8024042C AFB20018 */ sw $s2, 0x18($sp) +/* 8FFAA0 80240430 AFB00010 */ sw $s0, 0x10($sp) +/* 8FFAA4 80240434 8E30000C */ lw $s0, 0xc($s1) +/* 8FFAA8 80240438 8E050000 */ lw $a1, ($s0) +/* 8FFAAC 8024043C 0C0B1EAF */ jal get_variable +/* 8FFAB0 80240440 26100004 */ addiu $s0, $s0, 4 +/* 8FFAB4 80240444 8E050000 */ lw $a1, ($s0) +/* 8FFAB8 80240448 26100004 */ addiu $s0, $s0, 4 +/* 8FFABC 8024044C 0220202D */ daddu $a0, $s1, $zero +/* 8FFAC0 80240450 0C0B1EAF */ jal get_variable +/* 8FFAC4 80240454 0040982D */ daddu $s3, $v0, $zero +/* 8FFAC8 80240458 8E050000 */ lw $a1, ($s0) +/* 8FFACC 8024045C 26100004 */ addiu $s0, $s0, 4 +/* 8FFAD0 80240460 0220202D */ daddu $a0, $s1, $zero +/* 8FFAD4 80240464 0C0B1EAF */ jal get_variable +/* 8FFAD8 80240468 0040902D */ daddu $s2, $v0, $zero +/* 8FFADC 8024046C 8E050000 */ lw $a1, ($s0) +/* 8FFAE0 80240470 26100004 */ addiu $s0, $s0, 4 +/* 8FFAE4 80240474 0C0B1EAF */ jal get_variable +/* 8FFAE8 80240478 0220202D */ daddu $a0, $s1, $zero +/* 8FFAEC 8024047C 8E050000 */ lw $a1, ($s0) +/* 8FFAF0 80240480 0C0B1EAF */ jal get_variable +/* 8FFAF4 80240484 0220202D */ daddu $a0, $s1, $zero +/* 8FFAF8 80240488 0000202D */ daddu $a0, $zero, $zero +/* 8FFAFC 8024048C 3C05FD05 */ lui $a1, 0xfd05 +/* 8FFB00 80240490 34A50F80 */ ori $a1, $a1, 0xf80 +/* 8FFB04 80240494 0C0B1EAF */ jal get_variable +/* 8FFB08 80240498 0040802D */ daddu $s0, $v0, $zero +/* 8FFB0C 8024049C 00131900 */ sll $v1, $s3, 4 +/* 8FFB10 802404A0 00731823 */ subu $v1, $v1, $s3 +/* 8FFB14 802404A4 00031940 */ sll $v1, $v1, 5 +/* 8FFB18 802404A8 00431821 */ addu $v1, $v0, $v1 +/* 8FFB1C 802404AC 24020002 */ addiu $v0, $zero, 2 +/* 8FFB20 802404B0 00529004 */ sllv $s2, $s2, $v0 +/* 8FFB24 802404B4 00721821 */ addu $v1, $v1, $s2 +/* 8FFB28 802404B8 44900000 */ mtc1 $s0, $f0 +/* 8FFB2C 802404BC 00000000 */ nop +/* 8FFB30 802404C0 46800020 */ cvt.s.w $f0, $f0 +/* 8FFB34 802404C4 E460006C */ swc1 $f0, 0x6c($v1) +/* 8FFB38 802404C8 8FBF0020 */ lw $ra, 0x20($sp) +/* 8FFB3C 802404CC 8FB3001C */ lw $s3, 0x1c($sp) +/* 8FFB40 802404D0 8FB20018 */ lw $s2, 0x18($sp) +/* 8FFB44 802404D4 8FB10014 */ lw $s1, 0x14($sp) +/* 8FFB48 802404D8 8FB00010 */ lw $s0, 0x10($sp) +/* 8FFB4C 802404DC 03E00008 */ jr $ra +/* 8FFB50 802404E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_802404E4.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_802404E4.s deleted file mode 100644 index 7285fac7ba..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_802404E4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404E4 -/* 8FFB54 802404E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8FFB58 802404E8 AFB10014 */ sw $s1, 0x14($sp) -/* 8FFB5C 802404EC 0080882D */ daddu $s1, $a0, $zero -/* 8FFB60 802404F0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8FFB64 802404F4 AFB00010 */ sw $s0, 0x10($sp) -/* 8FFB68 802404F8 8E30000C */ lw $s0, 0xc($s1) -/* 8FFB6C 802404FC 8E050000 */ lw $a1, ($s0) -/* 8FFB70 80240500 0C0B1EAF */ jal get_variable -/* 8FFB74 80240504 26100004 */ addiu $s0, $s0, 4 -/* 8FFB78 80240508 8E050000 */ lw $a1, ($s0) -/* 8FFB7C 8024050C 26100004 */ addiu $s0, $s0, 4 -/* 8FFB80 80240510 0C0B1EAF */ jal get_variable -/* 8FFB84 80240514 0220202D */ daddu $a0, $s1, $zero -/* 8FFB88 80240518 8E050000 */ lw $a1, ($s0) -/* 8FFB8C 8024051C 26100004 */ addiu $s0, $s0, 4 -/* 8FFB90 80240520 0C0B1EAF */ jal get_variable -/* 8FFB94 80240524 0220202D */ daddu $a0, $s1, $zero -/* 8FFB98 80240528 8E050000 */ lw $a1, ($s0) -/* 8FFB9C 8024052C 26100004 */ addiu $s0, $s0, 4 -/* 8FFBA0 80240530 0C0B1EAF */ jal get_variable -/* 8FFBA4 80240534 0220202D */ daddu $a0, $s1, $zero -/* 8FFBA8 80240538 8E050000 */ lw $a1, ($s0) -/* 8FFBAC 8024053C 0C0B1EAF */ jal get_variable -/* 8FFBB0 80240540 0220202D */ daddu $a0, $s1, $zero -/* 8FFBB4 80240544 0000202D */ daddu $a0, $zero, $zero -/* 8FFBB8 80240548 3C05FD05 */ lui $a1, 0xfd05 -/* 8FFBBC 8024054C 0C0B1EAF */ jal get_variable -/* 8FFBC0 80240550 34A50F80 */ ori $a1, $a1, 0xf80 -/* 8FFBC4 80240554 8FBF0018 */ lw $ra, 0x18($sp) -/* 8FFBC8 80240558 8FB10014 */ lw $s1, 0x14($sp) -/* 8FFBCC 8024055C 8FB00010 */ lw $s0, 0x10($sp) -/* 8FFBD0 80240560 24020002 */ addiu $v0, $zero, 2 -/* 8FFBD4 80240564 03E00008 */ jr $ra -/* 8FFBD8 80240568 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_802404E4_8FFB54.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_802404E4_8FFB54.s new file mode 100644 index 0000000000..412cd53e7e --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_802404E4_8FFB54.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404E4_8FFB54 +/* 8FFB54 802404E4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8FFB58 802404E8 AFB10014 */ sw $s1, 0x14($sp) +/* 8FFB5C 802404EC 0080882D */ daddu $s1, $a0, $zero +/* 8FFB60 802404F0 AFBF0018 */ sw $ra, 0x18($sp) +/* 8FFB64 802404F4 AFB00010 */ sw $s0, 0x10($sp) +/* 8FFB68 802404F8 8E30000C */ lw $s0, 0xc($s1) +/* 8FFB6C 802404FC 8E050000 */ lw $a1, ($s0) +/* 8FFB70 80240500 0C0B1EAF */ jal get_variable +/* 8FFB74 80240504 26100004 */ addiu $s0, $s0, 4 +/* 8FFB78 80240508 8E050000 */ lw $a1, ($s0) +/* 8FFB7C 8024050C 26100004 */ addiu $s0, $s0, 4 +/* 8FFB80 80240510 0C0B1EAF */ jal get_variable +/* 8FFB84 80240514 0220202D */ daddu $a0, $s1, $zero +/* 8FFB88 80240518 8E050000 */ lw $a1, ($s0) +/* 8FFB8C 8024051C 26100004 */ addiu $s0, $s0, 4 +/* 8FFB90 80240520 0C0B1EAF */ jal get_variable +/* 8FFB94 80240524 0220202D */ daddu $a0, $s1, $zero +/* 8FFB98 80240528 8E050000 */ lw $a1, ($s0) +/* 8FFB9C 8024052C 26100004 */ addiu $s0, $s0, 4 +/* 8FFBA0 80240530 0C0B1EAF */ jal get_variable +/* 8FFBA4 80240534 0220202D */ daddu $a0, $s1, $zero +/* 8FFBA8 80240538 8E050000 */ lw $a1, ($s0) +/* 8FFBAC 8024053C 0C0B1EAF */ jal get_variable +/* 8FFBB0 80240540 0220202D */ daddu $a0, $s1, $zero +/* 8FFBB4 80240544 0000202D */ daddu $a0, $zero, $zero +/* 8FFBB8 80240548 3C05FD05 */ lui $a1, 0xfd05 +/* 8FFBBC 8024054C 0C0B1EAF */ jal get_variable +/* 8FFBC0 80240550 34A50F80 */ ori $a1, $a1, 0xf80 +/* 8FFBC4 80240554 8FBF0018 */ lw $ra, 0x18($sp) +/* 8FFBC8 80240558 8FB10014 */ lw $s1, 0x14($sp) +/* 8FFBCC 8024055C 8FB00010 */ lw $s0, 0x10($sp) +/* 8FFBD0 80240560 24020002 */ addiu $v0, $zero, 2 +/* 8FFBD4 80240564 03E00008 */ jr $ra +/* 8FFBD8 80240568 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C.s deleted file mode 100644 index a9d5d05079..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C.s +++ /dev/null @@ -1,385 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024056C -/* 8FFBDC 8024056C 27BDFF70 */ addiu $sp, $sp, -0x90 -/* 8FFBE0 80240570 3C038025 */ lui $v1, 0x8025 -/* 8FFBE4 80240574 8C6383D0 */ lw $v1, -0x7c30($v1) -/* 8FFBE8 80240578 2402FFFF */ addiu $v0, $zero, -1 -/* 8FFBEC 8024057C AFBF005C */ sw $ra, 0x5c($sp) -/* 8FFBF0 80240580 AFBE0058 */ sw $fp, 0x58($sp) -/* 8FFBF4 80240584 AFB70054 */ sw $s7, 0x54($sp) -/* 8FFBF8 80240588 AFB60050 */ sw $s6, 0x50($sp) -/* 8FFBFC 8024058C AFB5004C */ sw $s5, 0x4c($sp) -/* 8FFC00 80240590 AFB40048 */ sw $s4, 0x48($sp) -/* 8FFC04 80240594 AFB30044 */ sw $s3, 0x44($sp) -/* 8FFC08 80240598 AFB20040 */ sw $s2, 0x40($sp) -/* 8FFC0C 8024059C AFB1003C */ sw $s1, 0x3c($sp) -/* 8FFC10 802405A0 AFB00038 */ sw $s0, 0x38($sp) -/* 8FFC14 802405A4 F7BE0088 */ sdc1 $f30, 0x88($sp) -/* 8FFC18 802405A8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8FFC1C 802405AC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 8FFC20 802405B0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 8FFC24 802405B4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 8FFC28 802405B8 1062013F */ beq $v1, $v0, .L80240AB8 -/* 8FFC2C 802405BC F7B40060 */ sdc1 $f20, 0x60($sp) -/* 8FFC30 802405C0 1460005E */ bnez $v1, .L8024073C -/* 8FFC34 802405C4 0000382D */ daddu $a3, $zero, $zero -/* 8FFC38 802405C8 00E0802D */ daddu $s0, $a3, $zero -/* 8FFC3C 802405CC 3C0142B4 */ lui $at, 0x42b4 -/* 8FFC40 802405D0 4481E000 */ mtc1 $at, $f28 -/* 8FFC44 802405D4 3C014334 */ lui $at, 0x4334 -/* 8FFC48 802405D8 4481D000 */ mtc1 $at, $f26 -/* 8FFC4C 802405DC 3C0143B4 */ lui $at, 0x43b4 -/* 8FFC50 802405E0 4481A000 */ mtc1 $at, $f20 -/* 8FFC54 802405E4 3C01C334 */ lui $at, 0xc334 -/* 8FFC58 802405E8 4481B000 */ mtc1 $at, $f22 -.L802405EC: -/* 8FFC5C 802405EC 0000202D */ daddu $a0, $zero, $zero -/* 8FFC60 802405F0 3C05FD05 */ lui $a1, 0xfd05 -/* 8FFC64 802405F4 34A50F80 */ ori $a1, $a1, 0xf80 -/* 8FFC68 802405F8 0C0B1EAF */ jal get_variable -/* 8FFC6C 802405FC AFA70030 */ sw $a3, 0x30($sp) -/* 8FFC70 80240600 00502021 */ addu $a0, $v0, $s0 -/* 8FFC74 80240604 8FA70030 */ lw $a3, 0x30($sp) -/* 8FFC78 80240608 24020001 */ addiu $v0, $zero, 1 -/* 8FFC7C 8024060C 10E20011 */ beq $a3, $v0, .L80240654 -/* 8FFC80 80240610 28E20002 */ slti $v0, $a3, 2 -/* 8FFC84 80240614 50400005 */ beql $v0, $zero, .L8024062C -/* 8FFC88 80240618 24020002 */ addiu $v0, $zero, 2 -/* 8FFC8C 8024061C 10E00009 */ beqz $a3, .L80240644 -/* 8FFC90 80240620 00000000 */ nop -/* 8FFC94 80240624 080902AE */ j .L80240AB8 -/* 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 -.L80240644: -/* 8FFCB4 80240644 3C014120 */ lui $at, 0x4120 -/* 8FFCB8 80240648 4481C000 */ mtc1 $at, $f24 -/* 8FFCBC 8024064C 0809019A */ j .L80240668 -/* 8FFCC0 80240650 24140009 */ addiu $s4, $zero, 9 -.L80240654: -/* 8FFCC4 80240654 08090198 */ j .L80240660 -/* 8FFCC8 80240658 24140007 */ addiu $s4, $zero, 7 -.L8024065C: -/* 8FFCCC 8024065C 24140007 */ addiu $s4, $zero, 7 -.L80240660: -/* 8FFCD0 80240660 3C014100 */ lui $at, 0x4100 -/* 8FFCD4 80240664 4481C000 */ mtc1 $at, $f24 -.L80240668: -/* 8FFCD8 80240668 0000882D */ daddu $s1, $zero, $zero -/* 8FFCDC 8024066C AC940090 */ sw $s4, 0x90($a0) -/* 8FFCE0 80240670 1A800027 */ blez $s4, .L80240710 -/* 8FFCE4 80240674 E4980094 */ swc1 $f24, 0x94($a0) -/* 8FFCE8 80240678 2686FFFF */ addiu $a2, $s4, -1 -/* 8FFCEC 8024067C 0080182D */ daddu $v1, $a0, $zero -/* 8FFCF0 80240680 24050004 */ addiu $a1, $zero, 4 -/* 8FFCF4 80240684 3C013FE0 */ lui $at, 0x3fe0 -/* 8FFCF8 80240688 44814800 */ mtc1 $at, $f9 -/* 8FFCFC 8024068C 44804000 */ mtc1 $zero, $f8 -/* 8FFD00 80240690 3C018025 */ lui $at, 0x8025 -/* 8FFD04 80240694 D42683B0 */ ldc1 $f6, -0x7c50($at) -.L80240698: -/* 8FFD08 80240698 16260004 */ bne $s1, $a2, .L802406AC -/* 8FFD0C 8024069C 00851021 */ addu $v0, $a0, $a1 -/* 8FFD10 802406A0 C460006C */ lwc1 $f0, 0x6c($v1) -/* 8FFD14 802406A4 080901BE */ j .L802406F8 -/* 8FFD18 802406A8 461C0000 */ add.s $f0, $f0, $f28 -.L802406AC: -/* 8FFD1C 802406AC C460006C */ lwc1 $f0, 0x6c($v1) -/* 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 -/* 8FFD30 802406C0 45000003 */ bc1f .L802406D0 -/* 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 -/* 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 -/* 8FFD60 802406F0 46260000 */ add.d $f0, $f0, $f6 -/* 8FFD64 802406F4 46200020 */ cvt.s.d $f0, $f0 -.L802406F8: -/* 8FFD68 802406F8 E460006C */ swc1 $f0, 0x6c($v1) -/* 8FFD6C 802406FC 24630004 */ addiu $v1, $v1, 4 -/* 8FFD70 80240700 26310001 */ addiu $s1, $s1, 1 -/* 8FFD74 80240704 0234102A */ slt $v0, $s1, $s4 -/* 8FFD78 80240708 1440FFE3 */ bnez $v0, .L80240698 -/* 8FFD7C 8024070C 24A50004 */ addiu $a1, $a1, 4 -.L80240710: -/* 8FFD80 80240710 0C090090 */ jal func_80240240 -/* 8FFD84 80240714 AFA70030 */ sw $a3, 0x30($sp) -/* 8FFD88 80240718 8FA70030 */ lw $a3, 0x30($sp) -/* 8FFD8C 8024071C 24E70001 */ addiu $a3, $a3, 1 -/* 8FFD90 80240720 28E20004 */ slti $v0, $a3, 4 -/* 8FFD94 80240724 1440FFB1 */ bnez $v0, .L802405EC -/* 8FFD98 80240728 261001E0 */ addiu $s0, $s0, 0x1e0 -/* 8FFD9C 8024072C 24020001 */ addiu $v0, $zero, 1 -/* 8FFDA0 80240730 3C018025 */ lui $at, 0x8025 -/* 8FFDA4 80240734 AC2283D0 */ sw $v0, -0x7c30($at) -/* 8FFDA8 80240738 0000382D */ daddu $a3, $zero, $zero -.L8024073C: -/* 8FFDAC 8024073C 3C02800A */ lui $v0, 0x800a -/* 8FFDB0 80240740 2442A66C */ addiu $v0, $v0, -0x5994 -/* 8FFDB4 80240744 0040402D */ daddu $t0, $v0, $zero -/* 8FFDB8 80240748 3C090100 */ lui $t1, 0x100 -/* 8FFDBC 8024074C 35294008 */ ori $t1, $t1, 0x4008 -/* 8FFDC0 80240750 AFA90018 */ sw $t1, 0x18($sp) -/* 8FFDC4 80240754 3C090602 */ lui $t1, 0x602 -/* 8FFDC8 80240758 35290004 */ ori $t1, $t1, 4 -/* 8FFDCC 8024075C AFA9001C */ sw $t1, 0x1c($sp) -/* 8FFDD0 80240760 AFA00020 */ sw $zero, 0x20($sp) -/* 8FFDD4 80240764 8D030000 */ lw $v1, ($t0) -/* 8FFDD8 80240768 3C02E700 */ lui $v0, 0xe700 -/* 8FFDDC 8024076C 0060202D */ daddu $a0, $v1, $zero -/* 8FFDE0 80240770 24630008 */ addiu $v1, $v1, 8 -/* 8FFDE4 80240774 AD030000 */ sw $v1, ($t0) -/* 8FFDE8 80240778 AC820000 */ sw $v0, ($a0) -/* 8FFDEC 8024077C 24620008 */ addiu $v0, $v1, 8 -/* 8FFDF0 80240780 AC800004 */ sw $zero, 4($a0) -/* 8FFDF4 80240784 AD020000 */ sw $v0, ($t0) -/* 8FFDF8 80240788 3C02DE00 */ lui $v0, 0xde00 -/* 8FFDFC 8024078C AC620000 */ sw $v0, ($v1) -/* 8FFE00 80240790 3C028024 */ lui $v0, 0x8024 -/* 8FFE04 80240794 24421F00 */ addiu $v0, $v0, 0x1f00 -/* 8FFE08 80240798 AC620004 */ sw $v0, 4($v1) -.L8024079C: -/* 8FFE0C 8024079C 0000202D */ daddu $a0, $zero, $zero -/* 8FFE10 802407A0 3C05FD05 */ lui $a1, 0xfd05 -/* 8FFE14 802407A4 34A50F80 */ ori $a1, $a1, 0xf80 -/* 8FFE18 802407A8 AFA70030 */ sw $a3, 0x30($sp) -/* 8FFE1C 802407AC 0C0B1EAF */ jal get_variable -/* 8FFE20 802407B0 AFA80034 */ sw $t0, 0x34($sp) -/* 8FFE24 802407B4 0000882D */ daddu $s1, $zero, $zero -/* 8FFE28 802407B8 8FA90020 */ lw $t1, 0x20($sp) -/* 8FFE2C 802407BC 8FA80034 */ lw $t0, 0x34($sp) -/* 8FFE30 802407C0 0049A821 */ addu $s5, $v0, $t1 -/* 8FFE34 802407C4 3C02DE01 */ lui $v0, 0xde01 -/* 8FFE38 802407C8 C6B80094 */ lwc1 $f24, 0x94($s5) -/* 8FFE3C 802407CC 8D040000 */ lw $a0, ($t0) -/* 8FFE40 802407D0 8EB40090 */ lw $s4, 0x90($s5) -/* 8FFE44 802407D4 24890008 */ addiu $t1, $a0, 8 -/* 8FFE48 802407D8 AFA90010 */ sw $t1, 0x10($sp) -/* 8FFE4C 802407DC 8EA601DC */ lw $a2, 0x1dc($s5) -/* 8FFE50 802407E0 AC820000 */ sw $v0, ($a0) -/* 8FFE54 802407E4 00061940 */ sll $v1, $a2, 5 -/* 8FFE58 802407E8 24620008 */ addiu $v0, $v1, 8 -/* 8FFE5C 802407EC 00821021 */ addu $v0, $a0, $v0 -/* 8FFE60 802407F0 01231821 */ addu $v1, $t1, $v1 -/* 8FFE64 802407F4 AC820004 */ sw $v0, 4($a0) -/* 8FFE68 802407F8 AD030000 */ sw $v1, ($t0) -/* 8FFE6C 802407FC 8FA70030 */ lw $a3, 0x30($sp) -/* 8FFE70 80240800 18C00088 */ blez $a2, .L80240A24 -/* 8FFE74 80240804 0120982D */ daddu $s3, $t1, $zero -/* 8FFE78 80240808 2682FFFF */ addiu $v0, $s4, -1 -/* 8FFE7C 8024080C 00021080 */ sll $v0, $v0, 2 -/* 8FFE80 80240810 02A21021 */ addu $v0, $s5, $v0 -/* 8FFE84 80240814 AFA20014 */ sw $v0, 0x14($sp) -/* 8FFE88 80240818 0220282D */ daddu $a1, $s1, $zero -/* 8FFE8C 8024081C 0220F02D */ daddu $fp, $s1, $zero -/* 8FFE90 80240820 0220B82D */ daddu $s7, $s1, $zero -/* 8FFE94 80240824 0220B02D */ daddu $s6, $s1, $zero -/* 8FFE98 80240828 02A0902D */ daddu $s2, $s5, $zero -/* 8FFE9C 8024082C 24900016 */ addiu $s0, $a0, 0x16 -.L80240830: -/* 8FFEA0 80240830 44911000 */ mtc1 $s1, $f2 -/* 8FFEA4 80240834 00000000 */ nop -/* 8FFEA8 80240838 468010A0 */ cvt.s.w $f2, $f2 -/* 8FFEAC 8024083C 44940000 */ mtc1 $s4, $f0 -/* 8FFEB0 80240840 00000000 */ nop -/* 8FFEB4 80240844 46800020 */ cvt.s.w $f0, $f0 -/* 8FFEB8 80240848 46001082 */ mul.s $f2, $f2, $f0 -/* 8FFEBC 8024084C 00000000 */ nop -/* 8FFEC0 80240850 44860000 */ mtc1 $a2, $f0 -/* 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) -/* 8FFED4 80240864 C65E00A0 */ lwc1 $f30, 0xa0($s2) -/* 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 -/* 8FFEE8 80240878 44840000 */ mtc1 $a0, $f0 -/* 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 -/* 8FFEFC 8024088C 14400005 */ bnez $v0, .L802408A4 -/* 8FFF00 80240890 46001181 */ sub.s $f6, $f2, $f0 -/* 8FFF04 80240894 8FA90014 */ lw $t1, 0x14($sp) -/* 8FFF08 80240898 C536006C */ lwc1 $f22, 0x6c($t1) -/* 8FFF0C 8024089C 0809024C */ j .L80240930 -/* 8FFF10 802408A0 4600B306 */ mov.s $f12, $f22 -.L802408A4: -/* 8FFF14 802408A4 00031080 */ sll $v0, $v1, 2 -/* 8FFF18 802408A8 02A21021 */ addu $v0, $s5, $v0 -/* 8FFF1C 802408AC C444006C */ lwc1 $f4, 0x6c($v0) -/* 8FFF20 802408B0 00041080 */ sll $v0, $a0, 2 -/* 8FFF24 802408B4 02A21021 */ addu $v0, $s5, $v0 -/* 8FFF28 802408B8 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 8FFF2C 802408BC 460C2081 */ sub.s $f2, $f4, $f12 -/* 8FFF30 802408C0 3C014334 */ lui $at, 0x4334 -/* 8FFF34 802408C4 44810000 */ mtc1 $at, $f0 -/* 8FFF38 802408C8 00000000 */ nop -/* 8FFF3C 802408CC 4602003C */ c.lt.s $f0, $f2 -/* 8FFF40 802408D0 00000000 */ nop -/* 8FFF44 802408D4 45000006 */ bc1f .L802408F0 -/* 8FFF48 802408D8 00000000 */ nop -/* 8FFF4C 802408DC 3C0143B4 */ lui $at, 0x43b4 -/* 8FFF50 802408E0 44815000 */ mtc1 $at, $f10 -/* 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 -/* 8FFF6C 802408FC 4600103C */ c.lt.s $f2, $f0 -/* 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 -/* 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 -/* 8FFF98 80240928 460C0580 */ add.s $f22, $f0, $f12 -/* 8FFF9C 8024092C 4600B306 */ mov.s $f12, $f22 -.L80240930: -/* 8FFFA0 80240930 AFA50028 */ sw $a1, 0x28($sp) -/* 8FFFA4 80240934 AFA6002C */ sw $a2, 0x2c($sp) -/* 8FFFA8 80240938 AFA70030 */ sw $a3, 0x30($sp) -/* 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 -/* 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 -/* 8FFFD0 80240960 4614D100 */ add.s $f4, $f26, $f20 -/* 8FFFD4 80240964 4600E080 */ add.s $f2, $f28, $f0 -/* 8FFFD8 80240968 4614D501 */ sub.s $f20, $f26, $f20 -/* 8FFFDC 8024096C 2652000C */ addiu $s2, $s2, 0xc -/* 8FFFE0 80240970 26310001 */ addiu $s1, $s1, 1 -/* 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 -/* 8FFFF4 80240984 A6620000 */ sh $v0, ($s3) -/* 8FFFF8 80240988 4600128D */ trunc.w.s $f10, $f2 -/* 8FFFFC 8024098C 44025000 */ mfc1 $v0, $f10 -/* 900000 80240990 4600F28D */ trunc.w.s $f10, $f30 -/* 900004 80240994 44035000 */ mfc1 $v1, $f10 -/* 900008 80240998 26730010 */ addiu $s3, $s3, 0x10 -/* 90000C 8024099C A602FFF4 */ sh $v0, -0xc($s0) -/* 900010 802409A0 A603FFF6 */ sh $v1, -0xa($s0) -/* 900014 802409A4 A616FFFA */ sh $s6, -6($s0) -/* 900018 802409A8 A600FFFC */ sh $zero, -4($s0) -/* 90001C 802409AC A217FFFE */ sb $s7, -2($s0) -/* 900020 802409B0 A21EFFFF */ sb $fp, -1($s0) -/* 900024 802409B4 8FA50028 */ lw $a1, 0x28($sp) -/* 900028 802409B8 4600A28D */ trunc.w.s $f10, $f20 -/* 90002C 802409BC 44025000 */ mfc1 $v0, $f10 -/* 900030 802409C0 A2050000 */ sb $a1, ($s0) -/* 900034 802409C4 26100010 */ addiu $s0, $s0, 0x10 -/* 900038 802409C8 A6620000 */ sh $v0, ($s3) -/* 90003C 802409CC 4600028D */ trunc.w.s $f10, $f0 -/* 900040 802409D0 44025000 */ mfc1 $v0, $f10 -/* 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) -/* 900054 802409E4 A616FFFA */ sh $s6, -6($s0) -/* 900058 802409E8 A602FFFC */ sh $v0, -4($s0) -/* 90005C 802409EC A217FFFE */ sb $s7, -2($s0) -/* 900060 802409F0 A21EFFFF */ sb $fp, -1($s0) -/* 900064 802409F4 A2050000 */ sb $a1, ($s0) -/* 900068 802409F8 26100010 */ addiu $s0, $s0, 0x10 -/* 90006C 802409FC 26730010 */ addiu $s3, $s3, 0x10 -/* 900070 80240A00 24A5001E */ addiu $a1, $a1, 0x1e -/* 900074 80240A04 27DE0078 */ addiu $fp, $fp, 0x78 -/* 900078 80240A08 26F70032 */ addiu $s7, $s7, 0x32 -/* 90007C 80240A0C 8FA6002C */ lw $a2, 0x2c($sp) -/* 900080 80240A10 8FA70030 */ lw $a3, 0x30($sp) -/* 900084 80240A14 8FA80034 */ lw $t0, 0x34($sp) -/* 900088 80240A18 0226102A */ slt $v0, $s1, $a2 -/* 90008C 80240A1C 1440FF84 */ bnez $v0, .L80240830 -/* 900090 80240A20 26D60140 */ addiu $s6, $s6, 0x140 -.L80240A24: -/* 900094 80240A24 24C5FFFF */ addiu $a1, $a2, -1 -/* 900098 80240A28 18A00014 */ blez $a1, .L80240A7C -/* 90009C 80240A2C 0000882D */ daddu $s1, $zero, $zero -/* 9000A0 80240A30 3C060002 */ lui $a2, 2 -/* 9000A4 80240A34 34C60406 */ ori $a2, $a2, 0x406 -/* 9000A8 80240A38 8FA40010 */ lw $a0, 0x10($sp) -.L80240A3C: -/* 9000AC 80240A3C 8D030000 */ lw $v1, ($t0) -/* 9000B0 80240A40 26310001 */ addiu $s1, $s1, 1 -/* 9000B4 80240A44 0060102D */ daddu $v0, $v1, $zero -/* 9000B8 80240A48 24630008 */ addiu $v1, $v1, 8 -/* 9000BC 80240A4C AC440004 */ sw $a0, 4($v0) -/* 9000C0 80240A50 AD030000 */ sw $v1, ($t0) -/* 9000C4 80240A54 8FA90018 */ lw $t1, 0x18($sp) -/* 9000C8 80240A58 24840020 */ addiu $a0, $a0, 0x20 -/* 9000CC 80240A5C AC490000 */ sw $t1, ($v0) -/* 9000D0 80240A60 24620008 */ addiu $v0, $v1, 8 -/* 9000D4 80240A64 AD020000 */ sw $v0, ($t0) -/* 9000D8 80240A68 8FA9001C */ lw $t1, 0x1c($sp) -/* 9000DC 80240A6C 0225102A */ slt $v0, $s1, $a1 -/* 9000E0 80240A70 AC660004 */ sw $a2, 4($v1) -/* 9000E4 80240A74 1440FFF1 */ bnez $v0, .L80240A3C -/* 9000E8 80240A78 AC690000 */ sw $t1, ($v1) -.L80240A7C: -/* 9000EC 80240A7C 24E70001 */ addiu $a3, $a3, 1 -/* 9000F0 80240A80 8FA90020 */ lw $t1, 0x20($sp) -/* 9000F4 80240A84 28E20004 */ slti $v0, $a3, 4 -/* 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, 0x800a -/* 900108 80240A98 2463A66C */ addiu $v1, $v1, -0x5994 -/* 90010C 80240A9C 8C620000 */ lw $v0, ($v1) -/* 900110 80240AA0 0040202D */ daddu $a0, $v0, $zero -/* 900114 80240AA4 24420008 */ addiu $v0, $v0, 8 -/* 900118 80240AA8 AC620000 */ sw $v0, ($v1) -/* 90011C 80240AAC 3C02E700 */ lui $v0, 0xe700 -/* 900120 80240AB0 AC820000 */ sw $v0, ($a0) -/* 900124 80240AB4 AC800004 */ sw $zero, 4($a0) -.L80240AB8: -/* 900128 80240AB8 8FBF005C */ lw $ra, 0x5c($sp) -/* 90012C 80240ABC 8FBE0058 */ lw $fp, 0x58($sp) -/* 900130 80240AC0 8FB70054 */ lw $s7, 0x54($sp) -/* 900134 80240AC4 8FB60050 */ lw $s6, 0x50($sp) -/* 900138 80240AC8 8FB5004C */ lw $s5, 0x4c($sp) -/* 90013C 80240ACC 8FB40048 */ lw $s4, 0x48($sp) -/* 900140 80240AD0 8FB30044 */ lw $s3, 0x44($sp) -/* 900144 80240AD4 8FB20040 */ lw $s2, 0x40($sp) -/* 900148 80240AD8 8FB1003C */ lw $s1, 0x3c($sp) -/* 90014C 80240ADC 8FB00038 */ lw $s0, 0x38($sp) -/* 900150 80240AE0 D7BE0088 */ ldc1 $f30, 0x88($sp) -/* 900154 80240AE4 D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 900158 80240AE8 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 90015C 80240AEC D7B80070 */ ldc1 $f24, 0x70($sp) -/* 900160 80240AF0 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 900164 80240AF4 D7B40060 */ ldc1 $f20, 0x60($sp) -/* 900168 80240AF8 03E00008 */ jr $ra -/* 90016C 80240AFC 27BD0090 */ addiu $sp, $sp, 0x90 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 new file mode 100644 index 0000000000..4ca89db914 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_8024056C_8FFBDC.s @@ -0,0 +1,385 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024056C_8FFBDC +/* 8FFBDC 8024056C 27BDFF70 */ addiu $sp, $sp, -0x90 +/* 8FFBE0 80240570 3C038025 */ lui $v1, 0x8025 +/* 8FFBE4 80240574 8C6383D0 */ lw $v1, -0x7c30($v1) +/* 8FFBE8 80240578 2402FFFF */ addiu $v0, $zero, -1 +/* 8FFBEC 8024057C AFBF005C */ sw $ra, 0x5c($sp) +/* 8FFBF0 80240580 AFBE0058 */ sw $fp, 0x58($sp) +/* 8FFBF4 80240584 AFB70054 */ sw $s7, 0x54($sp) +/* 8FFBF8 80240588 AFB60050 */ sw $s6, 0x50($sp) +/* 8FFBFC 8024058C AFB5004C */ sw $s5, 0x4c($sp) +/* 8FFC00 80240590 AFB40048 */ sw $s4, 0x48($sp) +/* 8FFC04 80240594 AFB30044 */ sw $s3, 0x44($sp) +/* 8FFC08 80240598 AFB20040 */ sw $s2, 0x40($sp) +/* 8FFC0C 8024059C AFB1003C */ sw $s1, 0x3c($sp) +/* 8FFC10 802405A0 AFB00038 */ sw $s0, 0x38($sp) +/* 8FFC14 802405A4 F7BE0088 */ sdc1 $f30, 0x88($sp) +/* 8FFC18 802405A8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8FFC1C 802405AC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 8FFC20 802405B0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 8FFC24 802405B4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 8FFC28 802405B8 1062013F */ beq $v1, $v0, .L80240AB8 +/* 8FFC2C 802405BC F7B40060 */ sdc1 $f20, 0x60($sp) +/* 8FFC30 802405C0 1460005E */ bnez $v1, .L8024073C +/* 8FFC34 802405C4 0000382D */ daddu $a3, $zero, $zero +/* 8FFC38 802405C8 00E0802D */ daddu $s0, $a3, $zero +/* 8FFC3C 802405CC 3C0142B4 */ lui $at, 0x42b4 +/* 8FFC40 802405D0 4481E000 */ mtc1 $at, $f28 +/* 8FFC44 802405D4 3C014334 */ lui $at, 0x4334 +/* 8FFC48 802405D8 4481D000 */ mtc1 $at, $f26 +/* 8FFC4C 802405DC 3C0143B4 */ lui $at, 0x43b4 +/* 8FFC50 802405E0 4481A000 */ mtc1 $at, $f20 +/* 8FFC54 802405E4 3C01C334 */ lui $at, 0xc334 +/* 8FFC58 802405E8 4481B000 */ mtc1 $at, $f22 +.L802405EC: +/* 8FFC5C 802405EC 0000202D */ daddu $a0, $zero, $zero +/* 8FFC60 802405F0 3C05FD05 */ lui $a1, 0xfd05 +/* 8FFC64 802405F4 34A50F80 */ ori $a1, $a1, 0xf80 +/* 8FFC68 802405F8 0C0B1EAF */ jal get_variable +/* 8FFC6C 802405FC AFA70030 */ sw $a3, 0x30($sp) +/* 8FFC70 80240600 00502021 */ addu $a0, $v0, $s0 +/* 8FFC74 80240604 8FA70030 */ lw $a3, 0x30($sp) +/* 8FFC78 80240608 24020001 */ addiu $v0, $zero, 1 +/* 8FFC7C 8024060C 10E20011 */ beq $a3, $v0, .L80240654 +/* 8FFC80 80240610 28E20002 */ slti $v0, $a3, 2 +/* 8FFC84 80240614 50400005 */ beql $v0, $zero, .L8024062C +/* 8FFC88 80240618 24020002 */ addiu $v0, $zero, 2 +/* 8FFC8C 8024061C 10E00009 */ beqz $a3, .L80240644 +/* 8FFC90 80240620 00000000 */ nop +/* 8FFC94 80240624 080902AE */ j .L80240AB8 +/* 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 +.L80240644: +/* 8FFCB4 80240644 3C014120 */ lui $at, 0x4120 +/* 8FFCB8 80240648 4481C000 */ mtc1 $at, $f24 +/* 8FFCBC 8024064C 0809019A */ j .L80240668 +/* 8FFCC0 80240650 24140009 */ addiu $s4, $zero, 9 +.L80240654: +/* 8FFCC4 80240654 08090198 */ j .L80240660 +/* 8FFCC8 80240658 24140007 */ addiu $s4, $zero, 7 +.L8024065C: +/* 8FFCCC 8024065C 24140007 */ addiu $s4, $zero, 7 +.L80240660: +/* 8FFCD0 80240660 3C014100 */ lui $at, 0x4100 +/* 8FFCD4 80240664 4481C000 */ mtc1 $at, $f24 +.L80240668: +/* 8FFCD8 80240668 0000882D */ daddu $s1, $zero, $zero +/* 8FFCDC 8024066C AC940090 */ sw $s4, 0x90($a0) +/* 8FFCE0 80240670 1A800027 */ blez $s4, .L80240710 +/* 8FFCE4 80240674 E4980094 */ swc1 $f24, 0x94($a0) +/* 8FFCE8 80240678 2686FFFF */ addiu $a2, $s4, -1 +/* 8FFCEC 8024067C 0080182D */ daddu $v1, $a0, $zero +/* 8FFCF0 80240680 24050004 */ addiu $a1, $zero, 4 +/* 8FFCF4 80240684 3C013FE0 */ lui $at, 0x3fe0 +/* 8FFCF8 80240688 44814800 */ mtc1 $at, $f9 +/* 8FFCFC 8024068C 44804000 */ mtc1 $zero, $f8 +/* 8FFD00 80240690 3C018025 */ lui $at, 0x8025 +/* 8FFD04 80240694 D42683B0 */ ldc1 $f6, -0x7c50($at) +.L80240698: +/* 8FFD08 80240698 16260004 */ bne $s1, $a2, .L802406AC +/* 8FFD0C 8024069C 00851021 */ addu $v0, $a0, $a1 +/* 8FFD10 802406A0 C460006C */ lwc1 $f0, 0x6c($v1) +/* 8FFD14 802406A4 080901BE */ j .L802406F8 +/* 8FFD18 802406A8 461C0000 */ add.s $f0, $f0, $f28 +.L802406AC: +/* 8FFD1C 802406AC C460006C */ lwc1 $f0, 0x6c($v1) +/* 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 +/* 8FFD30 802406C0 45000003 */ bc1f .L802406D0 +/* 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 +/* 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 +/* 8FFD60 802406F0 46260000 */ add.d $f0, $f0, $f6 +/* 8FFD64 802406F4 46200020 */ cvt.s.d $f0, $f0 +.L802406F8: +/* 8FFD68 802406F8 E460006C */ swc1 $f0, 0x6c($v1) +/* 8FFD6C 802406FC 24630004 */ addiu $v1, $v1, 4 +/* 8FFD70 80240700 26310001 */ addiu $s1, $s1, 1 +/* 8FFD74 80240704 0234102A */ slt $v0, $s1, $s4 +/* 8FFD78 80240708 1440FFE3 */ bnez $v0, .L80240698 +/* 8FFD7C 8024070C 24A50004 */ addiu $a1, $a1, 4 +.L80240710: +/* 8FFD80 80240710 0C090090 */ jal func_80240240_8FF8B0 +/* 8FFD84 80240714 AFA70030 */ sw $a3, 0x30($sp) +/* 8FFD88 80240718 8FA70030 */ lw $a3, 0x30($sp) +/* 8FFD8C 8024071C 24E70001 */ addiu $a3, $a3, 1 +/* 8FFD90 80240720 28E20004 */ slti $v0, $a3, 4 +/* 8FFD94 80240724 1440FFB1 */ bnez $v0, .L802405EC +/* 8FFD98 80240728 261001E0 */ addiu $s0, $s0, 0x1e0 +/* 8FFD9C 8024072C 24020001 */ addiu $v0, $zero, 1 +/* 8FFDA0 80240730 3C018025 */ lui $at, 0x8025 +/* 8FFDA4 80240734 AC2283D0 */ sw $v0, -0x7c30($at) +/* 8FFDA8 80240738 0000382D */ daddu $a3, $zero, $zero +.L8024073C: +/* 8FFDAC 8024073C 3C02800A */ lui $v0, 0x800a +/* 8FFDB0 80240740 2442A66C */ addiu $v0, $v0, -0x5994 +/* 8FFDB4 80240744 0040402D */ daddu $t0, $v0, $zero +/* 8FFDB8 80240748 3C090100 */ lui $t1, 0x100 +/* 8FFDBC 8024074C 35294008 */ ori $t1, $t1, 0x4008 +/* 8FFDC0 80240750 AFA90018 */ sw $t1, 0x18($sp) +/* 8FFDC4 80240754 3C090602 */ lui $t1, 0x602 +/* 8FFDC8 80240758 35290004 */ ori $t1, $t1, 4 +/* 8FFDCC 8024075C AFA9001C */ sw $t1, 0x1c($sp) +/* 8FFDD0 80240760 AFA00020 */ sw $zero, 0x20($sp) +/* 8FFDD4 80240764 8D030000 */ lw $v1, ($t0) +/* 8FFDD8 80240768 3C02E700 */ lui $v0, 0xe700 +/* 8FFDDC 8024076C 0060202D */ daddu $a0, $v1, $zero +/* 8FFDE0 80240770 24630008 */ addiu $v1, $v1, 8 +/* 8FFDE4 80240774 AD030000 */ sw $v1, ($t0) +/* 8FFDE8 80240778 AC820000 */ sw $v0, ($a0) +/* 8FFDEC 8024077C 24620008 */ addiu $v0, $v1, 8 +/* 8FFDF0 80240780 AC800004 */ sw $zero, 4($a0) +/* 8FFDF4 80240784 AD020000 */ sw $v0, ($t0) +/* 8FFDF8 80240788 3C02DE00 */ lui $v0, 0xde00 +/* 8FFDFC 8024078C AC620000 */ sw $v0, ($v1) +/* 8FFE00 80240790 3C028024 */ lui $v0, 0x8024 +/* 8FFE04 80240794 24421F00 */ addiu $v0, $v0, 0x1f00 +/* 8FFE08 80240798 AC620004 */ sw $v0, 4($v1) +.L8024079C: +/* 8FFE0C 8024079C 0000202D */ daddu $a0, $zero, $zero +/* 8FFE10 802407A0 3C05FD05 */ lui $a1, 0xfd05 +/* 8FFE14 802407A4 34A50F80 */ ori $a1, $a1, 0xf80 +/* 8FFE18 802407A8 AFA70030 */ sw $a3, 0x30($sp) +/* 8FFE1C 802407AC 0C0B1EAF */ jal get_variable +/* 8FFE20 802407B0 AFA80034 */ sw $t0, 0x34($sp) +/* 8FFE24 802407B4 0000882D */ daddu $s1, $zero, $zero +/* 8FFE28 802407B8 8FA90020 */ lw $t1, 0x20($sp) +/* 8FFE2C 802407BC 8FA80034 */ lw $t0, 0x34($sp) +/* 8FFE30 802407C0 0049A821 */ addu $s5, $v0, $t1 +/* 8FFE34 802407C4 3C02DE01 */ lui $v0, 0xde01 +/* 8FFE38 802407C8 C6B80094 */ lwc1 $f24, 0x94($s5) +/* 8FFE3C 802407CC 8D040000 */ lw $a0, ($t0) +/* 8FFE40 802407D0 8EB40090 */ lw $s4, 0x90($s5) +/* 8FFE44 802407D4 24890008 */ addiu $t1, $a0, 8 +/* 8FFE48 802407D8 AFA90010 */ sw $t1, 0x10($sp) +/* 8FFE4C 802407DC 8EA601DC */ lw $a2, 0x1dc($s5) +/* 8FFE50 802407E0 AC820000 */ sw $v0, ($a0) +/* 8FFE54 802407E4 00061940 */ sll $v1, $a2, 5 +/* 8FFE58 802407E8 24620008 */ addiu $v0, $v1, 8 +/* 8FFE5C 802407EC 00821021 */ addu $v0, $a0, $v0 +/* 8FFE60 802407F0 01231821 */ addu $v1, $t1, $v1 +/* 8FFE64 802407F4 AC820004 */ sw $v0, 4($a0) +/* 8FFE68 802407F8 AD030000 */ sw $v1, ($t0) +/* 8FFE6C 802407FC 8FA70030 */ lw $a3, 0x30($sp) +/* 8FFE70 80240800 18C00088 */ blez $a2, .L80240A24 +/* 8FFE74 80240804 0120982D */ daddu $s3, $t1, $zero +/* 8FFE78 80240808 2682FFFF */ addiu $v0, $s4, -1 +/* 8FFE7C 8024080C 00021080 */ sll $v0, $v0, 2 +/* 8FFE80 80240810 02A21021 */ addu $v0, $s5, $v0 +/* 8FFE84 80240814 AFA20014 */ sw $v0, 0x14($sp) +/* 8FFE88 80240818 0220282D */ daddu $a1, $s1, $zero +/* 8FFE8C 8024081C 0220F02D */ daddu $fp, $s1, $zero +/* 8FFE90 80240820 0220B82D */ daddu $s7, $s1, $zero +/* 8FFE94 80240824 0220B02D */ daddu $s6, $s1, $zero +/* 8FFE98 80240828 02A0902D */ daddu $s2, $s5, $zero +/* 8FFE9C 8024082C 24900016 */ addiu $s0, $a0, 0x16 +.L80240830: +/* 8FFEA0 80240830 44911000 */ mtc1 $s1, $f2 +/* 8FFEA4 80240834 00000000 */ nop +/* 8FFEA8 80240838 468010A0 */ cvt.s.w $f2, $f2 +/* 8FFEAC 8024083C 44940000 */ mtc1 $s4, $f0 +/* 8FFEB0 80240840 00000000 */ nop +/* 8FFEB4 80240844 46800020 */ cvt.s.w $f0, $f0 +/* 8FFEB8 80240848 46001082 */ mul.s $f2, $f2, $f0 +/* 8FFEBC 8024084C 00000000 */ nop +/* 8FFEC0 80240850 44860000 */ mtc1 $a2, $f0 +/* 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) +/* 8FFED4 80240864 C65E00A0 */ lwc1 $f30, 0xa0($s2) +/* 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 +/* 8FFEE8 80240878 44840000 */ mtc1 $a0, $f0 +/* 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 +/* 8FFEFC 8024088C 14400005 */ bnez $v0, .L802408A4 +/* 8FFF00 80240890 46001181 */ sub.s $f6, $f2, $f0 +/* 8FFF04 80240894 8FA90014 */ lw $t1, 0x14($sp) +/* 8FFF08 80240898 C536006C */ lwc1 $f22, 0x6c($t1) +/* 8FFF0C 8024089C 0809024C */ j .L80240930 +/* 8FFF10 802408A0 4600B306 */ mov.s $f12, $f22 +.L802408A4: +/* 8FFF14 802408A4 00031080 */ sll $v0, $v1, 2 +/* 8FFF18 802408A8 02A21021 */ addu $v0, $s5, $v0 +/* 8FFF1C 802408AC C444006C */ lwc1 $f4, 0x6c($v0) +/* 8FFF20 802408B0 00041080 */ sll $v0, $a0, 2 +/* 8FFF24 802408B4 02A21021 */ addu $v0, $s5, $v0 +/* 8FFF28 802408B8 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 8FFF2C 802408BC 460C2081 */ sub.s $f2, $f4, $f12 +/* 8FFF30 802408C0 3C014334 */ lui $at, 0x4334 +/* 8FFF34 802408C4 44810000 */ mtc1 $at, $f0 +/* 8FFF38 802408C8 00000000 */ nop +/* 8FFF3C 802408CC 4602003C */ c.lt.s $f0, $f2 +/* 8FFF40 802408D0 00000000 */ nop +/* 8FFF44 802408D4 45000006 */ bc1f .L802408F0 +/* 8FFF48 802408D8 00000000 */ nop +/* 8FFF4C 802408DC 3C0143B4 */ lui $at, 0x43b4 +/* 8FFF50 802408E0 44815000 */ mtc1 $at, $f10 +/* 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 +/* 8FFF6C 802408FC 4600103C */ c.lt.s $f2, $f0 +/* 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 +/* 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 +/* 8FFF98 80240928 460C0580 */ add.s $f22, $f0, $f12 +/* 8FFF9C 8024092C 4600B306 */ mov.s $f12, $f22 +.L80240930: +/* 8FFFA0 80240930 AFA50028 */ sw $a1, 0x28($sp) +/* 8FFFA4 80240934 AFA6002C */ sw $a2, 0x2c($sp) +/* 8FFFA8 80240938 AFA70030 */ sw $a3, 0x30($sp) +/* 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 +/* 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 +/* 8FFFD0 80240960 4614D100 */ add.s $f4, $f26, $f20 +/* 8FFFD4 80240964 4600E080 */ add.s $f2, $f28, $f0 +/* 8FFFD8 80240968 4614D501 */ sub.s $f20, $f26, $f20 +/* 8FFFDC 8024096C 2652000C */ addiu $s2, $s2, 0xc +/* 8FFFE0 80240970 26310001 */ addiu $s1, $s1, 1 +/* 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 +/* 8FFFF4 80240984 A6620000 */ sh $v0, ($s3) +/* 8FFFF8 80240988 4600128D */ trunc.w.s $f10, $f2 +/* 8FFFFC 8024098C 44025000 */ mfc1 $v0, $f10 +/* 900000 80240990 4600F28D */ trunc.w.s $f10, $f30 +/* 900004 80240994 44035000 */ mfc1 $v1, $f10 +/* 900008 80240998 26730010 */ addiu $s3, $s3, 0x10 +/* 90000C 8024099C A602FFF4 */ sh $v0, -0xc($s0) +/* 900010 802409A0 A603FFF6 */ sh $v1, -0xa($s0) +/* 900014 802409A4 A616FFFA */ sh $s6, -6($s0) +/* 900018 802409A8 A600FFFC */ sh $zero, -4($s0) +/* 90001C 802409AC A217FFFE */ sb $s7, -2($s0) +/* 900020 802409B0 A21EFFFF */ sb $fp, -1($s0) +/* 900024 802409B4 8FA50028 */ lw $a1, 0x28($sp) +/* 900028 802409B8 4600A28D */ trunc.w.s $f10, $f20 +/* 90002C 802409BC 44025000 */ mfc1 $v0, $f10 +/* 900030 802409C0 A2050000 */ sb $a1, ($s0) +/* 900034 802409C4 26100010 */ addiu $s0, $s0, 0x10 +/* 900038 802409C8 A6620000 */ sh $v0, ($s3) +/* 90003C 802409CC 4600028D */ trunc.w.s $f10, $f0 +/* 900040 802409D0 44025000 */ mfc1 $v0, $f10 +/* 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) +/* 900054 802409E4 A616FFFA */ sh $s6, -6($s0) +/* 900058 802409E8 A602FFFC */ sh $v0, -4($s0) +/* 90005C 802409EC A217FFFE */ sb $s7, -2($s0) +/* 900060 802409F0 A21EFFFF */ sb $fp, -1($s0) +/* 900064 802409F4 A2050000 */ sb $a1, ($s0) +/* 900068 802409F8 26100010 */ addiu $s0, $s0, 0x10 +/* 90006C 802409FC 26730010 */ addiu $s3, $s3, 0x10 +/* 900070 80240A00 24A5001E */ addiu $a1, $a1, 0x1e +/* 900074 80240A04 27DE0078 */ addiu $fp, $fp, 0x78 +/* 900078 80240A08 26F70032 */ addiu $s7, $s7, 0x32 +/* 90007C 80240A0C 8FA6002C */ lw $a2, 0x2c($sp) +/* 900080 80240A10 8FA70030 */ lw $a3, 0x30($sp) +/* 900084 80240A14 8FA80034 */ lw $t0, 0x34($sp) +/* 900088 80240A18 0226102A */ slt $v0, $s1, $a2 +/* 90008C 80240A1C 1440FF84 */ bnez $v0, .L80240830 +/* 900090 80240A20 26D60140 */ addiu $s6, $s6, 0x140 +.L80240A24: +/* 900094 80240A24 24C5FFFF */ addiu $a1, $a2, -1 +/* 900098 80240A28 18A00014 */ blez $a1, .L80240A7C +/* 90009C 80240A2C 0000882D */ daddu $s1, $zero, $zero +/* 9000A0 80240A30 3C060002 */ lui $a2, 2 +/* 9000A4 80240A34 34C60406 */ ori $a2, $a2, 0x406 +/* 9000A8 80240A38 8FA40010 */ lw $a0, 0x10($sp) +.L80240A3C: +/* 9000AC 80240A3C 8D030000 */ lw $v1, ($t0) +/* 9000B0 80240A40 26310001 */ addiu $s1, $s1, 1 +/* 9000B4 80240A44 0060102D */ daddu $v0, $v1, $zero +/* 9000B8 80240A48 24630008 */ addiu $v1, $v1, 8 +/* 9000BC 80240A4C AC440004 */ sw $a0, 4($v0) +/* 9000C0 80240A50 AD030000 */ sw $v1, ($t0) +/* 9000C4 80240A54 8FA90018 */ lw $t1, 0x18($sp) +/* 9000C8 80240A58 24840020 */ addiu $a0, $a0, 0x20 +/* 9000CC 80240A5C AC490000 */ sw $t1, ($v0) +/* 9000D0 80240A60 24620008 */ addiu $v0, $v1, 8 +/* 9000D4 80240A64 AD020000 */ sw $v0, ($t0) +/* 9000D8 80240A68 8FA9001C */ lw $t1, 0x1c($sp) +/* 9000DC 80240A6C 0225102A */ slt $v0, $s1, $a1 +/* 9000E0 80240A70 AC660004 */ sw $a2, 4($v1) +/* 9000E4 80240A74 1440FFF1 */ bnez $v0, .L80240A3C +/* 9000E8 80240A78 AC690000 */ sw $t1, ($v1) +.L80240A7C: +/* 9000EC 80240A7C 24E70001 */ addiu $a3, $a3, 1 +/* 9000F0 80240A80 8FA90020 */ lw $t1, 0x20($sp) +/* 9000F4 80240A84 28E20004 */ slti $v0, $a3, 4 +/* 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, 0x800a +/* 900108 80240A98 2463A66C */ addiu $v1, $v1, -0x5994 +/* 90010C 80240A9C 8C620000 */ lw $v0, ($v1) +/* 900110 80240AA0 0040202D */ daddu $a0, $v0, $zero +/* 900114 80240AA4 24420008 */ addiu $v0, $v0, 8 +/* 900118 80240AA8 AC620000 */ sw $v0, ($v1) +/* 90011C 80240AAC 3C02E700 */ lui $v0, 0xe700 +/* 900120 80240AB0 AC820000 */ sw $v0, ($a0) +/* 900124 80240AB4 AC800004 */ sw $zero, 4($a0) +.L80240AB8: +/* 900128 80240AB8 8FBF005C */ lw $ra, 0x5c($sp) +/* 90012C 80240ABC 8FBE0058 */ lw $fp, 0x58($sp) +/* 900130 80240AC0 8FB70054 */ lw $s7, 0x54($sp) +/* 900134 80240AC4 8FB60050 */ lw $s6, 0x50($sp) +/* 900138 80240AC8 8FB5004C */ lw $s5, 0x4c($sp) +/* 90013C 80240ACC 8FB40048 */ lw $s4, 0x48($sp) +/* 900140 80240AD0 8FB30044 */ lw $s3, 0x44($sp) +/* 900144 80240AD4 8FB20040 */ lw $s2, 0x40($sp) +/* 900148 80240AD8 8FB1003C */ lw $s1, 0x3c($sp) +/* 90014C 80240ADC 8FB00038 */ lw $s0, 0x38($sp) +/* 900150 80240AE0 D7BE0088 */ ldc1 $f30, 0x88($sp) +/* 900154 80240AE4 D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 900158 80240AE8 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 90015C 80240AEC D7B80070 */ ldc1 $f24, 0x70($sp) +/* 900160 80240AF0 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 900164 80240AF4 D7B40060 */ ldc1 $f20, 0x60($sp) +/* 900168 80240AF8 03E00008 */ jr $ra +/* 90016C 80240AFC 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C.s deleted file mode 100644 index d769d35e82..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B3C -/* 9001AC 80240B3C 3C018025 */ lui $at, 0x8025 -/* 9001B0 80240B40 AC2083D0 */ sw $zero, -0x7c30($at) -/* 9001B4 80240B44 03E00008 */ jr $ra -/* 9001B8 80240B48 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s new file mode 100644 index 0000000000..a28625e719 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_22/8FF8B0/func_80240B3C_9001AC.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B3C_9001AC +/* 9001AC 80240B3C 3C018025 */ lui $at, 0x8025 +/* 9001B0 80240B40 AC2083D0 */ sw $zero, -0x7c30($at) +/* 9001B4 80240B44 03E00008 */ jr $ra +/* 9001B8 80240B48 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274.s deleted file mode 100644 index f6cf229dc6..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240274 -/* 907CA4 80240274 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 907CA8 80240278 AFB20018 */ sw $s2, 0x18($sp) -/* 907CAC 8024027C 0080902D */ daddu $s2, $a0, $zero -/* 907CB0 80240280 AFB00010 */ sw $s0, 0x10($sp) -/* 907CB4 80240284 00A0802D */ daddu $s0, $a1, $zero -/* 907CB8 80240288 3C05FD05 */ lui $a1, 0xfd05 -/* 907CBC 8024028C AFBF0020 */ sw $ra, 0x20($sp) -/* 907CC0 80240290 AFB3001C */ sw $s3, 0x1c($sp) -/* 907CC4 80240294 AFB10014 */ sw $s1, 0x14($sp) -/* 907CC8 80240298 8E53000C */ lw $s3, 0xc($s2) -/* 907CCC 8024029C 0C0B1EAF */ jal get_variable -/* 907CD0 802402A0 34A50F80 */ ori $a1, $a1, 0xf80 -/* 907CD4 802402A4 12000006 */ beqz $s0, .L802402C0 -/* 907CD8 802402A8 0040882D */ daddu $s1, $v0, $zero -/* 907CDC 802402AC A6200020 */ sh $zero, 0x20($s1) -/* 907CE0 802402B0 8E650000 */ lw $a1, ($s3) -/* 907CE4 802402B4 0C0B210B */ jal get_float_variable -/* 907CE8 802402B8 0240202D */ daddu $a0, $s2, $zero -/* 907CEC 802402BC E6200014 */ swc1 $f0, 0x14($s1) -.L802402C0: -/* 907CF0 802402C0 86220020 */ lh $v0, 0x20($s1) -/* 907CF4 802402C4 14400007 */ bnez $v0, .L802402E4 -/* 907CF8 802402C8 24020002 */ addiu $v0, $zero, 2 -/* 907CFC 802402CC C6200010 */ lwc1 $f0, 0x10($s1) -/* 907D00 802402D0 C62C0014 */ lwc1 $f12, 0x14($s1) -/* 907D04 802402D4 0C00A6C9 */ jal clamp_angle -/* 907D08 802402D8 460C0300 */ add.s $f12, $f0, $f12 -/* 907D0C 802402DC 0000102D */ daddu $v0, $zero, $zero -/* 907D10 802402E0 E6200010 */ swc1 $f0, 0x10($s1) -.L802402E4: -/* 907D14 802402E4 8FBF0020 */ lw $ra, 0x20($sp) -/* 907D18 802402E8 8FB3001C */ lw $s3, 0x1c($sp) -/* 907D1C 802402EC 8FB20018 */ lw $s2, 0x18($sp) -/* 907D20 802402F0 8FB10014 */ lw $s1, 0x14($sp) -/* 907D24 802402F4 8FB00010 */ lw $s0, 0x10($sp) -/* 907D28 802402F8 03E00008 */ jr $ra -/* 907D2C 802402FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274_907CA4.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274_907CA4.s new file mode 100644 index 0000000000..6ffde01333 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240274_907CA4.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240274_907CA4 +/* 907CA4 80240274 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 907CA8 80240278 AFB20018 */ sw $s2, 0x18($sp) +/* 907CAC 8024027C 0080902D */ daddu $s2, $a0, $zero +/* 907CB0 80240280 AFB00010 */ sw $s0, 0x10($sp) +/* 907CB4 80240284 00A0802D */ daddu $s0, $a1, $zero +/* 907CB8 80240288 3C05FD05 */ lui $a1, 0xfd05 +/* 907CBC 8024028C AFBF0020 */ sw $ra, 0x20($sp) +/* 907CC0 80240290 AFB3001C */ sw $s3, 0x1c($sp) +/* 907CC4 80240294 AFB10014 */ sw $s1, 0x14($sp) +/* 907CC8 80240298 8E53000C */ lw $s3, 0xc($s2) +/* 907CCC 8024029C 0C0B1EAF */ jal get_variable +/* 907CD0 802402A0 34A50F80 */ ori $a1, $a1, 0xf80 +/* 907CD4 802402A4 12000006 */ beqz $s0, .L802402C0 +/* 907CD8 802402A8 0040882D */ daddu $s1, $v0, $zero +/* 907CDC 802402AC A6200020 */ sh $zero, 0x20($s1) +/* 907CE0 802402B0 8E650000 */ lw $a1, ($s3) +/* 907CE4 802402B4 0C0B210B */ jal get_float_variable +/* 907CE8 802402B8 0240202D */ daddu $a0, $s2, $zero +/* 907CEC 802402BC E6200014 */ swc1 $f0, 0x14($s1) +.L802402C0: +/* 907CF0 802402C0 86220020 */ lh $v0, 0x20($s1) +/* 907CF4 802402C4 14400007 */ bnez $v0, .L802402E4 +/* 907CF8 802402C8 24020002 */ addiu $v0, $zero, 2 +/* 907CFC 802402CC C6200010 */ lwc1 $f0, 0x10($s1) +/* 907D00 802402D0 C62C0014 */ lwc1 $f12, 0x14($s1) +/* 907D04 802402D4 0C00A6C9 */ jal clamp_angle +/* 907D08 802402D8 460C0300 */ add.s $f12, $f0, $f12 +/* 907D0C 802402DC 0000102D */ daddu $v0, $zero, $zero +/* 907D10 802402E0 E6200010 */ swc1 $f0, 0x10($s1) +.L802402E4: +/* 907D14 802402E4 8FBF0020 */ lw $ra, 0x20($sp) +/* 907D18 802402E8 8FB3001C */ lw $s3, 0x1c($sp) +/* 907D1C 802402EC 8FB20018 */ lw $s2, 0x18($sp) +/* 907D20 802402F0 8FB10014 */ lw $s1, 0x14($sp) +/* 907D24 802402F4 8FB00010 */ lw $s0, 0x10($sp) +/* 907D28 802402F8 03E00008 */ jr $ra +/* 907D2C 802402FC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300.s deleted file mode 100644 index efbee64001..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240300 -/* 907D30 80240300 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 907D34 80240304 AFB10014 */ sw $s1, 0x14($sp) -/* 907D38 80240308 0080882D */ daddu $s1, $a0, $zero -/* 907D3C 8024030C AFBF0018 */ sw $ra, 0x18($sp) -/* 907D40 80240310 AFB00010 */ sw $s0, 0x10($sp) -/* 907D44 80240314 8E30000C */ lw $s0, 0xc($s1) -/* 907D48 80240318 50A00011 */ beql $a1, $zero, .L80240360 -/* 907D4C 8024031C 0220202D */ daddu $a0, $s1, $zero -/* 907D50 80240320 8E050000 */ lw $a1, ($s0) -/* 907D54 80240324 0C0B210B */ jal get_float_variable -/* 907D58 80240328 26100004 */ addiu $s0, $s0, 4 -/* 907D5C 8024032C E6200074 */ swc1 $f0, 0x74($s1) -/* 907D60 80240330 8E050000 */ lw $a1, ($s0) -/* 907D64 80240334 0C0B1EAF */ jal get_variable -/* 907D68 80240338 0220202D */ daddu $a0, $s1, $zero -/* 907D6C 8024033C C6200074 */ lwc1 $f0, 0x74($s1) -/* 907D70 80240340 44821000 */ mtc1 $v0, $f2 -/* 907D74 80240344 00000000 */ nop -/* 907D78 80240348 468010A0 */ cvt.s.w $f2, $f2 -/* 907D7C 8024034C AE220078 */ sw $v0, 0x78($s1) -/* 907D80 80240350 AE200070 */ sw $zero, 0x70($s1) -/* 907D84 80240354 46020003 */ div.s $f0, $f0, $f2 -/* 907D88 80240358 E6200074 */ swc1 $f0, 0x74($s1) -/* 907D8C 8024035C 0220202D */ daddu $a0, $s1, $zero -.L80240360: -/* 907D90 80240360 3C05FD05 */ lui $a1, 0xfd05 -/* 907D94 80240364 0C0B1EAF */ jal get_variable -/* 907D98 80240368 34A50F80 */ ori $a1, $a1, 0xf80 -/* 907D9C 8024036C C4400014 */ lwc1 $f0, 0x14($v0) -/* 907DA0 80240370 C6220074 */ lwc1 $f2, 0x74($s1) -/* 907DA4 80240374 46020000 */ add.s $f0, $f0, $f2 -/* 907DA8 80240378 E4400014 */ swc1 $f0, 0x14($v0) -/* 907DAC 8024037C 8E230070 */ lw $v1, 0x70($s1) -/* 907DB0 80240380 8E220078 */ lw $v0, 0x78($s1) -/* 907DB4 80240384 24630001 */ addiu $v1, $v1, 1 -/* 907DB8 80240388 0062102A */ slt $v0, $v1, $v0 -/* 907DBC 8024038C AE230070 */ sw $v1, 0x70($s1) -/* 907DC0 80240390 8FBF0018 */ lw $ra, 0x18($sp) -/* 907DC4 80240394 8FB10014 */ lw $s1, 0x14($sp) -/* 907DC8 80240398 8FB00010 */ lw $s0, 0x10($sp) -/* 907DCC 8024039C 38420001 */ xori $v0, $v0, 1 -/* 907DD0 802403A0 03E00008 */ jr $ra -/* 907DD4 802403A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s new file mode 100644 index 0000000000..08b703edf3 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240300_907D30.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240300_907D30 +/* 907D30 80240300 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 907D34 80240304 AFB10014 */ sw $s1, 0x14($sp) +/* 907D38 80240308 0080882D */ daddu $s1, $a0, $zero +/* 907D3C 8024030C AFBF0018 */ sw $ra, 0x18($sp) +/* 907D40 80240310 AFB00010 */ sw $s0, 0x10($sp) +/* 907D44 80240314 8E30000C */ lw $s0, 0xc($s1) +/* 907D48 80240318 50A00011 */ beql $a1, $zero, .L80240360 +/* 907D4C 8024031C 0220202D */ daddu $a0, $s1, $zero +/* 907D50 80240320 8E050000 */ lw $a1, ($s0) +/* 907D54 80240324 0C0B210B */ jal get_float_variable +/* 907D58 80240328 26100004 */ addiu $s0, $s0, 4 +/* 907D5C 8024032C E6200074 */ swc1 $f0, 0x74($s1) +/* 907D60 80240330 8E050000 */ lw $a1, ($s0) +/* 907D64 80240334 0C0B1EAF */ jal get_variable +/* 907D68 80240338 0220202D */ daddu $a0, $s1, $zero +/* 907D6C 8024033C C6200074 */ lwc1 $f0, 0x74($s1) +/* 907D70 80240340 44821000 */ mtc1 $v0, $f2 +/* 907D74 80240344 00000000 */ nop +/* 907D78 80240348 468010A0 */ cvt.s.w $f2, $f2 +/* 907D7C 8024034C AE220078 */ sw $v0, 0x78($s1) +/* 907D80 80240350 AE200070 */ sw $zero, 0x70($s1) +/* 907D84 80240354 46020003 */ div.s $f0, $f0, $f2 +/* 907D88 80240358 E6200074 */ swc1 $f0, 0x74($s1) +/* 907D8C 8024035C 0220202D */ daddu $a0, $s1, $zero +.L80240360: +/* 907D90 80240360 3C05FD05 */ lui $a1, 0xfd05 +/* 907D94 80240364 0C0B1EAF */ jal get_variable +/* 907D98 80240368 34A50F80 */ ori $a1, $a1, 0xf80 +/* 907D9C 8024036C C4400014 */ lwc1 $f0, 0x14($v0) +/* 907DA0 80240370 C6220074 */ lwc1 $f2, 0x74($s1) +/* 907DA4 80240374 46020000 */ add.s $f0, $f0, $f2 +/* 907DA8 80240378 E4400014 */ swc1 $f0, 0x14($v0) +/* 907DAC 8024037C 8E230070 */ lw $v1, 0x70($s1) +/* 907DB0 80240380 8E220078 */ lw $v0, 0x78($s1) +/* 907DB4 80240384 24630001 */ addiu $v1, $v1, 1 +/* 907DB8 80240388 0062102A */ slt $v0, $v1, $v0 +/* 907DBC 8024038C AE230070 */ sw $v1, 0x70($s1) +/* 907DC0 80240390 8FBF0018 */ lw $ra, 0x18($sp) +/* 907DC4 80240394 8FB10014 */ lw $s1, 0x14($sp) +/* 907DC8 80240398 8FB00010 */ lw $s0, 0x10($sp) +/* 907DCC 8024039C 38420001 */ xori $v0, $v0, 1 +/* 907DD0 802403A0 03E00008 */ jr $ra +/* 907DD4 802403A4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802403A8.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802403A8.s deleted file mode 100644 index 86f963a49c..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802403A8.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A8 -/* 907DD8 802403A8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 907DDC 802403AC AFB20020 */ sw $s2, 0x20($sp) -/* 907DE0 802403B0 0080902D */ daddu $s2, $a0, $zero -/* 907DE4 802403B4 AFB00018 */ sw $s0, 0x18($sp) -/* 907DE8 802403B8 00A0802D */ daddu $s0, $a1, $zero -/* 907DEC 802403BC 3C05FD05 */ lui $a1, 0xfd05 -/* 907DF0 802403C0 AFBF0028 */ sw $ra, 0x28($sp) -/* 907DF4 802403C4 AFB30024 */ sw $s3, 0x24($sp) -/* 907DF8 802403C8 AFB1001C */ sw $s1, 0x1c($sp) -/* 907DFC 802403CC 8E51000C */ lw $s1, 0xc($s2) -/* 907E00 802403D0 0C0B1EAF */ jal get_variable -/* 907E04 802403D4 34A50F80 */ ori $a1, $a1, 0xf80 -/* 907E08 802403D8 12000015 */ beqz $s0, .L80240430 -/* 907E0C 802403DC 0040982D */ daddu $s3, $v0, $zero -/* 907E10 802403E0 AE400070 */ sw $zero, 0x70($s2) -/* 907E14 802403E4 8E250000 */ lw $a1, ($s1) -/* 907E18 802403E8 26310004 */ addiu $s1, $s1, 4 -/* 907E1C 802403EC 0C0B1EAF */ jal get_variable -/* 907E20 802403F0 0240202D */ daddu $a0, $s2, $zero -/* 907E24 802403F4 AE420084 */ sw $v0, 0x84($s2) -/* 907E28 802403F8 8E250000 */ lw $a1, ($s1) -/* 907E2C 802403FC 26310004 */ addiu $s1, $s1, 4 -/* 907E30 80240400 0C0B1EAF */ jal get_variable -/* 907E34 80240404 0240202D */ daddu $a0, $s2, $zero -/* 907E38 80240408 AE420074 */ sw $v0, 0x74($s2) -/* 907E3C 8024040C 8E250000 */ lw $a1, ($s1) -/* 907E40 80240410 26310004 */ addiu $s1, $s1, 4 -/* 907E44 80240414 0C0B1EAF */ jal get_variable -/* 907E48 80240418 0240202D */ daddu $a0, $s2, $zero -/* 907E4C 8024041C AE420078 */ sw $v0, 0x78($s2) -/* 907E50 80240420 8E250000 */ lw $a1, ($s1) -/* 907E54 80240424 0C0B1EAF */ jal get_variable -/* 907E58 80240428 0240202D */ daddu $a0, $s2, $zero -/* 907E5C 8024042C AE42007C */ sw $v0, 0x7c($s2) -.L80240430: -/* 907E60 80240430 C6400074 */ lwc1 $f0, 0x74($s2) -/* 907E64 80240434 46800020 */ cvt.s.w $f0, $f0 -/* 907E68 80240438 44050000 */ mfc1 $a1, $f0 -/* 907E6C 8024043C C6400078 */ lwc1 $f0, 0x78($s2) -/* 907E70 80240440 46800020 */ cvt.s.w $f0, $f0 -/* 907E74 80240444 8E42007C */ lw $v0, 0x7c($s2) -/* 907E78 80240448 44060000 */ mfc1 $a2, $f0 -/* 907E7C 8024044C AFA20010 */ sw $v0, 0x10($sp) -/* 907E80 80240450 8E440084 */ lw $a0, 0x84($s2) -/* 907E84 80240454 0C00A8ED */ jal update_lerp -/* 907E88 80240458 8E470070 */ lw $a3, 0x70($s2) -/* 907E8C 8024045C E6600004 */ swc1 $f0, 4($s3) -/* 907E90 80240460 8E430070 */ lw $v1, 0x70($s2) -/* 907E94 80240464 8E42007C */ lw $v0, 0x7c($s2) -/* 907E98 80240468 24630001 */ addiu $v1, $v1, 1 -/* 907E9C 8024046C 0062102A */ slt $v0, $v1, $v0 -/* 907EA0 80240470 AE430070 */ sw $v1, 0x70($s2) -/* 907EA4 80240474 8FBF0028 */ lw $ra, 0x28($sp) -/* 907EA8 80240478 8FB30024 */ lw $s3, 0x24($sp) -/* 907EAC 8024047C 8FB20020 */ lw $s2, 0x20($sp) -/* 907EB0 80240480 8FB1001C */ lw $s1, 0x1c($sp) -/* 907EB4 80240484 8FB00018 */ lw $s0, 0x18($sp) -/* 907EB8 80240488 38420001 */ xori $v0, $v0, 1 -/* 907EBC 8024048C 03E00008 */ jr $ra -/* 907EC0 80240490 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802403A8_907DD8.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802403A8_907DD8.s new file mode 100644 index 0000000000..a134905aec --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802403A8_907DD8.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403A8_907DD8 +/* 907DD8 802403A8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 907DDC 802403AC AFB20020 */ sw $s2, 0x20($sp) +/* 907DE0 802403B0 0080902D */ daddu $s2, $a0, $zero +/* 907DE4 802403B4 AFB00018 */ sw $s0, 0x18($sp) +/* 907DE8 802403B8 00A0802D */ daddu $s0, $a1, $zero +/* 907DEC 802403BC 3C05FD05 */ lui $a1, 0xfd05 +/* 907DF0 802403C0 AFBF0028 */ sw $ra, 0x28($sp) +/* 907DF4 802403C4 AFB30024 */ sw $s3, 0x24($sp) +/* 907DF8 802403C8 AFB1001C */ sw $s1, 0x1c($sp) +/* 907DFC 802403CC 8E51000C */ lw $s1, 0xc($s2) +/* 907E00 802403D0 0C0B1EAF */ jal get_variable +/* 907E04 802403D4 34A50F80 */ ori $a1, $a1, 0xf80 +/* 907E08 802403D8 12000015 */ beqz $s0, .L80240430 +/* 907E0C 802403DC 0040982D */ daddu $s3, $v0, $zero +/* 907E10 802403E0 AE400070 */ sw $zero, 0x70($s2) +/* 907E14 802403E4 8E250000 */ lw $a1, ($s1) +/* 907E18 802403E8 26310004 */ addiu $s1, $s1, 4 +/* 907E1C 802403EC 0C0B1EAF */ jal get_variable +/* 907E20 802403F0 0240202D */ daddu $a0, $s2, $zero +/* 907E24 802403F4 AE420084 */ sw $v0, 0x84($s2) +/* 907E28 802403F8 8E250000 */ lw $a1, ($s1) +/* 907E2C 802403FC 26310004 */ addiu $s1, $s1, 4 +/* 907E30 80240400 0C0B1EAF */ jal get_variable +/* 907E34 80240404 0240202D */ daddu $a0, $s2, $zero +/* 907E38 80240408 AE420074 */ sw $v0, 0x74($s2) +/* 907E3C 8024040C 8E250000 */ lw $a1, ($s1) +/* 907E40 80240410 26310004 */ addiu $s1, $s1, 4 +/* 907E44 80240414 0C0B1EAF */ jal get_variable +/* 907E48 80240418 0240202D */ daddu $a0, $s2, $zero +/* 907E4C 8024041C AE420078 */ sw $v0, 0x78($s2) +/* 907E50 80240420 8E250000 */ lw $a1, ($s1) +/* 907E54 80240424 0C0B1EAF */ jal get_variable +/* 907E58 80240428 0240202D */ daddu $a0, $s2, $zero +/* 907E5C 8024042C AE42007C */ sw $v0, 0x7c($s2) +.L80240430: +/* 907E60 80240430 C6400074 */ lwc1 $f0, 0x74($s2) +/* 907E64 80240434 46800020 */ cvt.s.w $f0, $f0 +/* 907E68 80240438 44050000 */ mfc1 $a1, $f0 +/* 907E6C 8024043C C6400078 */ lwc1 $f0, 0x78($s2) +/* 907E70 80240440 46800020 */ cvt.s.w $f0, $f0 +/* 907E74 80240444 8E42007C */ lw $v0, 0x7c($s2) +/* 907E78 80240448 44060000 */ mfc1 $a2, $f0 +/* 907E7C 8024044C AFA20010 */ sw $v0, 0x10($sp) +/* 907E80 80240450 8E440084 */ lw $a0, 0x84($s2) +/* 907E84 80240454 0C00A8ED */ jal update_lerp +/* 907E88 80240458 8E470070 */ lw $a3, 0x70($s2) +/* 907E8C 8024045C E6600004 */ swc1 $f0, 4($s3) +/* 907E90 80240460 8E430070 */ lw $v1, 0x70($s2) +/* 907E94 80240464 8E42007C */ lw $v0, 0x7c($s2) +/* 907E98 80240468 24630001 */ addiu $v1, $v1, 1 +/* 907E9C 8024046C 0062102A */ slt $v0, $v1, $v0 +/* 907EA0 80240470 AE430070 */ sw $v1, 0x70($s2) +/* 907EA4 80240474 8FBF0028 */ lw $ra, 0x28($sp) +/* 907EA8 80240478 8FB30024 */ lw $s3, 0x24($sp) +/* 907EAC 8024047C 8FB20020 */ lw $s2, 0x20($sp) +/* 907EB0 80240480 8FB1001C */ lw $s1, 0x1c($sp) +/* 907EB4 80240484 8FB00018 */ lw $s0, 0x18($sp) +/* 907EB8 80240488 38420001 */ xori $v0, $v0, 1 +/* 907EBC 8024048C 03E00008 */ jr $ra +/* 907EC0 80240490 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494.s deleted file mode 100644 index cb2f18a442..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240494 -/* 907EC4 80240494 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 907EC8 80240498 AFB1001C */ sw $s1, 0x1c($sp) -/* 907ECC 8024049C 0080882D */ daddu $s1, $a0, $zero -/* 907ED0 802404A0 AFBF0020 */ sw $ra, 0x20($sp) -/* 907ED4 802404A4 AFB00018 */ sw $s0, 0x18($sp) -/* 907ED8 802404A8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 907EDC 802404AC 8E30000C */ lw $s0, 0xc($s1) -/* 907EE0 802404B0 8E050000 */ lw $a1, ($s0) -/* 907EE4 802404B4 0C0B210B */ jal get_float_variable -/* 907EE8 802404B8 26100004 */ addiu $s0, $s0, 4 -/* 907EEC 802404BC 0220202D */ daddu $a0, $s1, $zero -/* 907EF0 802404C0 8E050000 */ lw $a1, ($s0) -/* 907EF4 802404C4 0C0B1EAF */ jal get_variable -/* 907EF8 802404C8 46000506 */ mov.s $f20, $f0 -/* 907EFC 802404CC 0220202D */ daddu $a0, $s1, $zero -/* 907F00 802404D0 3C05FD05 */ lui $a1, 0xfd05 -/* 907F04 802404D4 34A50F80 */ ori $a1, $a1, 0xf80 -/* 907F08 802404D8 0C0B1EAF */ jal get_variable -/* 907F0C 802404DC 0040802D */ daddu $s0, $v0, $zero -/* 907F10 802404E0 C4420004 */ lwc1 $f2, 4($v0) -/* 907F14 802404E4 3C014180 */ lui $at, 0x4180 -/* 907F18 802404E8 44810000 */ mtc1 $at, $f0 -/* 907F1C 802404EC E7B40010 */ swc1 $f20, 0x10($sp) -/* 907F20 802404F0 AFB00014 */ sw $s0, 0x14($sp) -/* 907F24 802404F4 46001080 */ add.s $f2, $f2, $f0 -/* 907F28 802404F8 8C450000 */ lw $a1, ($v0) -/* 907F2C 802404FC 8C470008 */ lw $a3, 8($v0) -/* 907F30 80240500 44061000 */ mfc1 $a2, $f2 -/* 907F34 80240504 0C01C2EC */ jal func_80070BB0 -/* 907F38 80240508 2404000E */ addiu $a0, $zero, 0xe -/* 907F3C 8024050C 8FBF0020 */ lw $ra, 0x20($sp) -/* 907F40 80240510 8FB1001C */ lw $s1, 0x1c($sp) -/* 907F44 80240514 8FB00018 */ lw $s0, 0x18($sp) -/* 907F48 80240518 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 907F4C 8024051C 24020002 */ addiu $v0, $zero, 2 -/* 907F50 80240520 03E00008 */ jr $ra -/* 907F54 80240524 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s new file mode 100644 index 0000000000..ced1a250df --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240494_907EC4.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240494_907EC4 +/* 907EC4 80240494 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 907EC8 80240498 AFB1001C */ sw $s1, 0x1c($sp) +/* 907ECC 8024049C 0080882D */ daddu $s1, $a0, $zero +/* 907ED0 802404A0 AFBF0020 */ sw $ra, 0x20($sp) +/* 907ED4 802404A4 AFB00018 */ sw $s0, 0x18($sp) +/* 907ED8 802404A8 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 907EDC 802404AC 8E30000C */ lw $s0, 0xc($s1) +/* 907EE0 802404B0 8E050000 */ lw $a1, ($s0) +/* 907EE4 802404B4 0C0B210B */ jal get_float_variable +/* 907EE8 802404B8 26100004 */ addiu $s0, $s0, 4 +/* 907EEC 802404BC 0220202D */ daddu $a0, $s1, $zero +/* 907EF0 802404C0 8E050000 */ lw $a1, ($s0) +/* 907EF4 802404C4 0C0B1EAF */ jal get_variable +/* 907EF8 802404C8 46000506 */ mov.s $f20, $f0 +/* 907EFC 802404CC 0220202D */ daddu $a0, $s1, $zero +/* 907F00 802404D0 3C05FD05 */ lui $a1, 0xfd05 +/* 907F04 802404D4 34A50F80 */ ori $a1, $a1, 0xf80 +/* 907F08 802404D8 0C0B1EAF */ jal get_variable +/* 907F0C 802404DC 0040802D */ daddu $s0, $v0, $zero +/* 907F10 802404E0 C4420004 */ lwc1 $f2, 4($v0) +/* 907F14 802404E4 3C014180 */ lui $at, 0x4180 +/* 907F18 802404E8 44810000 */ mtc1 $at, $f0 +/* 907F1C 802404EC E7B40010 */ swc1 $f20, 0x10($sp) +/* 907F20 802404F0 AFB00014 */ sw $s0, 0x14($sp) +/* 907F24 802404F4 46001080 */ add.s $f2, $f2, $f0 +/* 907F28 802404F8 8C450000 */ lw $a1, ($v0) +/* 907F2C 802404FC 8C470008 */ lw $a3, 8($v0) +/* 907F30 80240500 44061000 */ mfc1 $a2, $f2 +/* 907F34 80240504 0C01C2EC */ jal func_80070BB0 +/* 907F38 80240508 2404000E */ addiu $a0, $zero, 0xe +/* 907F3C 8024050C 8FBF0020 */ lw $ra, 0x20($sp) +/* 907F40 80240510 8FB1001C */ lw $s1, 0x1c($sp) +/* 907F44 80240514 8FB00018 */ lw $s0, 0x18($sp) +/* 907F48 80240518 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 907F4C 8024051C 24020002 */ addiu $v0, $zero, 2 +/* 907F50 80240520 03E00008 */ jr $ra +/* 907F54 80240524 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528.s deleted file mode 100644 index e1b8b9293d..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240528 -/* 907F58 80240528 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 907F5C 8024052C AFB1001C */ sw $s1, 0x1c($sp) -/* 907F60 80240530 0080882D */ daddu $s1, $a0, $zero -/* 907F64 80240534 AFB00018 */ sw $s0, 0x18($sp) -/* 907F68 80240538 00A0802D */ daddu $s0, $a1, $zero -/* 907F6C 8024053C AFBF0028 */ sw $ra, 0x28($sp) -/* 907F70 80240540 AFB30024 */ sw $s3, 0x24($sp) -/* 907F74 80240544 AFB20020 */ sw $s2, 0x20($sp) -/* 907F78 80240548 8E32000C */ lw $s2, 0xc($s1) -/* 907F7C 8024054C 0C00EAD2 */ jal get_npc_safe -/* 907F80 80240550 0000202D */ daddu $a0, $zero, $zero -/* 907F84 80240554 0220202D */ daddu $a0, $s1, $zero -/* 907F88 80240558 3C05FD05 */ lui $a1, 0xfd05 -/* 907F8C 8024055C 34A50F80 */ ori $a1, $a1, 0xf80 -/* 907F90 80240560 0C0B1EAF */ jal get_variable -/* 907F94 80240564 0040982D */ daddu $s3, $v0, $zero -/* 907F98 80240568 12000006 */ beqz $s0, .L80240584 -/* 907F9C 8024056C 00000000 */ nop -/* 907FA0 80240570 AE200070 */ sw $zero, 0x70($s1) -/* 907FA4 80240574 8E450000 */ lw $a1, ($s2) -/* 907FA8 80240578 0C0B1EAF */ jal get_variable -/* 907FAC 8024057C 0220202D */ daddu $a0, $s1, $zero -/* 907FB0 80240580 AE220074 */ sw $v0, 0x74($s1) -.L80240584: -/* 907FB4 80240584 8E220074 */ lw $v0, 0x74($s1) -/* 907FB8 80240588 3C06437F */ lui $a2, 0x437f -/* 907FBC 8024058C 0000202D */ daddu $a0, $zero, $zero -/* 907FC0 80240590 AFA20010 */ sw $v0, 0x10($sp) -/* 907FC4 80240594 8E270070 */ lw $a3, 0x70($s1) -/* 907FC8 80240598 0C00A8ED */ jal update_lerp -/* 907FCC 8024059C 0000282D */ daddu $a1, $zero, $zero -/* 907FD0 802405A0 3C014F00 */ lui $at, 0x4f00 -/* 907FD4 802405A4 44811000 */ mtc1 $at, $f2 -/* 907FD8 802405A8 00000000 */ nop -/* 907FDC 802405AC 4600103E */ c.le.s $f2, $f0 -/* 907FE0 802405B0 00000000 */ nop -/* 907FE4 802405B4 45010005 */ bc1t .L802405CC -/* 907FE8 802405B8 266400AC */ addiu $a0, $s3, 0xac -/* 907FEC 802405BC 4600010D */ trunc.w.s $f4, $f0 -/* 907FF0 802405C0 44032000 */ mfc1 $v1, $f4 -/* 907FF4 802405C4 0809017A */ j .L802405E8 -/* 907FF8 802405C8 A0830000 */ sb $v1, ($a0) -.L802405CC: -/* 907FFC 802405CC 46020001 */ sub.s $f0, $f0, $f2 -/* 908000 802405D0 3C028000 */ lui $v0, 0x8000 -/* 908004 802405D4 4600010D */ trunc.w.s $f4, $f0 -/* 908008 802405D8 44032000 */ mfc1 $v1, $f4 -/* 90800C 802405DC 00000000 */ nop -/* 908010 802405E0 00621825 */ or $v1, $v1, $v0 -/* 908014 802405E4 A0830000 */ sb $v1, ($a0) -.L802405E8: -/* 908018 802405E8 8E230070 */ lw $v1, 0x70($s1) -/* 90801C 802405EC 8E220074 */ lw $v0, 0x74($s1) -/* 908020 802405F0 24630001 */ addiu $v1, $v1, 1 -/* 908024 802405F4 0062102A */ slt $v0, $v1, $v0 -/* 908028 802405F8 AE230070 */ sw $v1, 0x70($s1) -/* 90802C 802405FC 8FBF0028 */ lw $ra, 0x28($sp) -/* 908030 80240600 8FB30024 */ lw $s3, 0x24($sp) -/* 908034 80240604 8FB20020 */ lw $s2, 0x20($sp) -/* 908038 80240608 8FB1001C */ lw $s1, 0x1c($sp) -/* 90803C 8024060C 8FB00018 */ lw $s0, 0x18($sp) -/* 908040 80240610 38420001 */ xori $v0, $v0, 1 -/* 908044 80240614 03E00008 */ jr $ra -/* 908048 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528_907F58.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528_907F58.s new file mode 100644 index 0000000000..23905ef472 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240528_907F58.s @@ -0,0 +1,68 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240528_907F58 +/* 907F58 80240528 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 907F5C 8024052C AFB1001C */ sw $s1, 0x1c($sp) +/* 907F60 80240530 0080882D */ daddu $s1, $a0, $zero +/* 907F64 80240534 AFB00018 */ sw $s0, 0x18($sp) +/* 907F68 80240538 00A0802D */ daddu $s0, $a1, $zero +/* 907F6C 8024053C AFBF0028 */ sw $ra, 0x28($sp) +/* 907F70 80240540 AFB30024 */ sw $s3, 0x24($sp) +/* 907F74 80240544 AFB20020 */ sw $s2, 0x20($sp) +/* 907F78 80240548 8E32000C */ lw $s2, 0xc($s1) +/* 907F7C 8024054C 0C00EAD2 */ jal get_npc_safe +/* 907F80 80240550 0000202D */ daddu $a0, $zero, $zero +/* 907F84 80240554 0220202D */ daddu $a0, $s1, $zero +/* 907F88 80240558 3C05FD05 */ lui $a1, 0xfd05 +/* 907F8C 8024055C 34A50F80 */ ori $a1, $a1, 0xf80 +/* 907F90 80240560 0C0B1EAF */ jal get_variable +/* 907F94 80240564 0040982D */ daddu $s3, $v0, $zero +/* 907F98 80240568 12000006 */ beqz $s0, .L80240584 +/* 907F9C 8024056C 00000000 */ nop +/* 907FA0 80240570 AE200070 */ sw $zero, 0x70($s1) +/* 907FA4 80240574 8E450000 */ lw $a1, ($s2) +/* 907FA8 80240578 0C0B1EAF */ jal get_variable +/* 907FAC 8024057C 0220202D */ daddu $a0, $s1, $zero +/* 907FB0 80240580 AE220074 */ sw $v0, 0x74($s1) +.L80240584: +/* 907FB4 80240584 8E220074 */ lw $v0, 0x74($s1) +/* 907FB8 80240588 3C06437F */ lui $a2, 0x437f +/* 907FBC 8024058C 0000202D */ daddu $a0, $zero, $zero +/* 907FC0 80240590 AFA20010 */ sw $v0, 0x10($sp) +/* 907FC4 80240594 8E270070 */ lw $a3, 0x70($s1) +/* 907FC8 80240598 0C00A8ED */ jal update_lerp +/* 907FCC 8024059C 0000282D */ daddu $a1, $zero, $zero +/* 907FD0 802405A0 3C014F00 */ lui $at, 0x4f00 +/* 907FD4 802405A4 44811000 */ mtc1 $at, $f2 +/* 907FD8 802405A8 00000000 */ nop +/* 907FDC 802405AC 4600103E */ c.le.s $f2, $f0 +/* 907FE0 802405B0 00000000 */ nop +/* 907FE4 802405B4 45010005 */ bc1t .L802405CC +/* 907FE8 802405B8 266400AC */ addiu $a0, $s3, 0xac +/* 907FEC 802405BC 4600010D */ trunc.w.s $f4, $f0 +/* 907FF0 802405C0 44032000 */ mfc1 $v1, $f4 +/* 907FF4 802405C4 0809017A */ j .L802405E8 +/* 907FF8 802405C8 A0830000 */ sb $v1, ($a0) +.L802405CC: +/* 907FFC 802405CC 46020001 */ sub.s $f0, $f0, $f2 +/* 908000 802405D0 3C028000 */ lui $v0, 0x8000 +/* 908004 802405D4 4600010D */ trunc.w.s $f4, $f0 +/* 908008 802405D8 44032000 */ mfc1 $v1, $f4 +/* 90800C 802405DC 00000000 */ nop +/* 908010 802405E0 00621825 */ or $v1, $v1, $v0 +/* 908014 802405E4 A0830000 */ sb $v1, ($a0) +.L802405E8: +/* 908018 802405E8 8E230070 */ lw $v1, 0x70($s1) +/* 90801C 802405EC 8E220074 */ lw $v0, 0x74($s1) +/* 908020 802405F0 24630001 */ addiu $v1, $v1, 1 +/* 908024 802405F4 0062102A */ slt $v0, $v1, $v0 +/* 908028 802405F8 AE230070 */ sw $v1, 0x70($s1) +/* 90802C 802405FC 8FBF0028 */ lw $ra, 0x28($sp) +/* 908030 80240600 8FB30024 */ lw $s3, 0x24($sp) +/* 908034 80240604 8FB20020 */ lw $s2, 0x20($sp) +/* 908038 80240608 8FB1001C */ lw $s1, 0x1c($sp) +/* 90803C 8024060C 8FB00018 */ lw $s0, 0x18($sp) +/* 908040 80240610 38420001 */ xori $v0, $v0, 1 +/* 908044 80240614 03E00008 */ jr $ra +/* 908048 80240618 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802407B8.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802407B8.s deleted file mode 100644 index 609d73efb8..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802407B8.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407B8 -/* 9081E8 802407B8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9081EC 802407BC AFB20020 */ sw $s2, 0x20($sp) -/* 9081F0 802407C0 0080902D */ daddu $s2, $a0, $zero -/* 9081F4 802407C4 AFB00018 */ sw $s0, 0x18($sp) -/* 9081F8 802407C8 00A0802D */ daddu $s0, $a1, $zero -/* 9081FC 802407CC 3C05FD05 */ lui $a1, 0xfd05 -/* 908200 802407D0 AFBF0028 */ sw $ra, 0x28($sp) -/* 908204 802407D4 AFB30024 */ sw $s3, 0x24($sp) -/* 908208 802407D8 AFB1001C */ sw $s1, 0x1c($sp) -/* 90820C 802407DC 8E51000C */ lw $s1, 0xc($s2) -/* 908210 802407E0 0C0B1EAF */ jal get_variable -/* 908214 802407E4 34A50F80 */ ori $a1, $a1, 0xf80 -/* 908218 802407E8 1200000F */ beqz $s0, .L80240828 -/* 90821C 802407EC 0040982D */ daddu $s3, $v0, $zero -/* 908220 802407F0 24020001 */ addiu $v0, $zero, 1 -/* 908224 802407F4 AE400070 */ sw $zero, 0x70($s2) -/* 908228 802407F8 A6620020 */ sh $v0, 0x20($s3) -/* 90822C 802407FC 8E250000 */ lw $a1, ($s1) -/* 908230 80240800 26310004 */ addiu $s1, $s1, 4 -/* 908234 80240804 0C0B1EAF */ jal get_variable -/* 908238 80240808 0240202D */ daddu $a0, $s2, $zero -/* 90823C 8024080C AE420074 */ sw $v0, 0x74($s2) -/* 908240 80240810 8E250000 */ lw $a1, ($s1) -/* 908244 80240814 0C0B1EAF */ jal get_variable -/* 908248 80240818 0240202D */ daddu $a0, $s2, $zero -/* 90824C 8024081C AE420078 */ sw $v0, 0x78($s2) -/* 908250 80240820 C6600010 */ lwc1 $f0, 0x10($s3) -/* 908254 80240824 E6600018 */ swc1 $f0, 0x18($s3) -.L80240828: -/* 908258 80240828 C6400074 */ lwc1 $f0, 0x74($s2) -/* 90825C 8024082C 46800020 */ cvt.s.w $f0, $f0 -/* 908260 80240830 8E420078 */ lw $v0, 0x78($s2) -/* 908264 80240834 44060000 */ mfc1 $a2, $f0 -/* 908268 80240838 AFA20010 */ sw $v0, 0x10($sp) -/* 90826C 8024083C 8E650018 */ lw $a1, 0x18($s3) -/* 908270 80240840 8E470070 */ lw $a3, 0x70($s2) -/* 908274 80240844 0C00A8ED */ jal update_lerp -/* 908278 80240848 24040004 */ addiu $a0, $zero, 4 -/* 90827C 8024084C 0C00A6C9 */ jal clamp_angle -/* 908280 80240850 46000306 */ mov.s $f12, $f0 -/* 908284 80240854 E6600010 */ swc1 $f0, 0x10($s3) -/* 908288 80240858 8E430070 */ lw $v1, 0x70($s2) -/* 90828C 8024085C 8E420078 */ lw $v0, 0x78($s2) -/* 908290 80240860 24630001 */ addiu $v1, $v1, 1 -/* 908294 80240864 0062102A */ slt $v0, $v1, $v0 -/* 908298 80240868 AE430070 */ sw $v1, 0x70($s2) -/* 90829C 8024086C 8FBF0028 */ lw $ra, 0x28($sp) -/* 9082A0 80240870 8FB30024 */ lw $s3, 0x24($sp) -/* 9082A4 80240874 8FB20020 */ lw $s2, 0x20($sp) -/* 9082A8 80240878 8FB1001C */ lw $s1, 0x1c($sp) -/* 9082AC 8024087C 8FB00018 */ lw $s0, 0x18($sp) -/* 9082B0 80240880 38420001 */ xori $v0, $v0, 1 -/* 9082B4 80240884 03E00008 */ jr $ra -/* 9082B8 80240888 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802407B8_9081E8.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802407B8_9081E8.s new file mode 100644 index 0000000000..e451869b1f --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_802407B8_9081E8.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407B8_9081E8 +/* 9081E8 802407B8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9081EC 802407BC AFB20020 */ sw $s2, 0x20($sp) +/* 9081F0 802407C0 0080902D */ daddu $s2, $a0, $zero +/* 9081F4 802407C4 AFB00018 */ sw $s0, 0x18($sp) +/* 9081F8 802407C8 00A0802D */ daddu $s0, $a1, $zero +/* 9081FC 802407CC 3C05FD05 */ lui $a1, 0xfd05 +/* 908200 802407D0 AFBF0028 */ sw $ra, 0x28($sp) +/* 908204 802407D4 AFB30024 */ sw $s3, 0x24($sp) +/* 908208 802407D8 AFB1001C */ sw $s1, 0x1c($sp) +/* 90820C 802407DC 8E51000C */ lw $s1, 0xc($s2) +/* 908210 802407E0 0C0B1EAF */ jal get_variable +/* 908214 802407E4 34A50F80 */ ori $a1, $a1, 0xf80 +/* 908218 802407E8 1200000F */ beqz $s0, .L80240828 +/* 90821C 802407EC 0040982D */ daddu $s3, $v0, $zero +/* 908220 802407F0 24020001 */ addiu $v0, $zero, 1 +/* 908224 802407F4 AE400070 */ sw $zero, 0x70($s2) +/* 908228 802407F8 A6620020 */ sh $v0, 0x20($s3) +/* 90822C 802407FC 8E250000 */ lw $a1, ($s1) +/* 908230 80240800 26310004 */ addiu $s1, $s1, 4 +/* 908234 80240804 0C0B1EAF */ jal get_variable +/* 908238 80240808 0240202D */ daddu $a0, $s2, $zero +/* 90823C 8024080C AE420074 */ sw $v0, 0x74($s2) +/* 908240 80240810 8E250000 */ lw $a1, ($s1) +/* 908244 80240814 0C0B1EAF */ jal get_variable +/* 908248 80240818 0240202D */ daddu $a0, $s2, $zero +/* 90824C 8024081C AE420078 */ sw $v0, 0x78($s2) +/* 908250 80240820 C6600010 */ lwc1 $f0, 0x10($s3) +/* 908254 80240824 E6600018 */ swc1 $f0, 0x18($s3) +.L80240828: +/* 908258 80240828 C6400074 */ lwc1 $f0, 0x74($s2) +/* 90825C 8024082C 46800020 */ cvt.s.w $f0, $f0 +/* 908260 80240830 8E420078 */ lw $v0, 0x78($s2) +/* 908264 80240834 44060000 */ mfc1 $a2, $f0 +/* 908268 80240838 AFA20010 */ sw $v0, 0x10($sp) +/* 90826C 8024083C 8E650018 */ lw $a1, 0x18($s3) +/* 908270 80240840 8E470070 */ lw $a3, 0x70($s2) +/* 908274 80240844 0C00A8ED */ jal update_lerp +/* 908278 80240848 24040004 */ addiu $a0, $zero, 4 +/* 90827C 8024084C 0C00A6C9 */ jal clamp_angle +/* 908280 80240850 46000306 */ mov.s $f12, $f0 +/* 908284 80240854 E6600010 */ swc1 $f0, 0x10($s3) +/* 908288 80240858 8E430070 */ lw $v1, 0x70($s2) +/* 90828C 8024085C 8E420078 */ lw $v0, 0x78($s2) +/* 908290 80240860 24630001 */ addiu $v1, $v1, 1 +/* 908294 80240864 0062102A */ slt $v0, $v1, $v0 +/* 908298 80240868 AE430070 */ sw $v1, 0x70($s2) +/* 90829C 8024086C 8FBF0028 */ lw $ra, 0x28($sp) +/* 9082A0 80240870 8FB30024 */ lw $s3, 0x24($sp) +/* 9082A4 80240874 8FB20020 */ lw $s2, 0x20($sp) +/* 9082A8 80240878 8FB1001C */ lw $s1, 0x1c($sp) +/* 9082AC 8024087C 8FB00018 */ lw $s0, 0x18($sp) +/* 9082B0 80240880 38420001 */ xori $v0, $v0, 1 +/* 9082B4 80240884 03E00008 */ jr $ra +/* 9082B8 80240888 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240BB4.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240BB4.s deleted file mode 100644 index d7b874ef8b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240BB4.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB4 -/* 9085E4 80240BB4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9085E8 80240BB8 AFB20020 */ sw $s2, 0x20($sp) -/* 9085EC 80240BBC 0080902D */ daddu $s2, $a0, $zero -/* 9085F0 80240BC0 AFB00018 */ sw $s0, 0x18($sp) -/* 9085F4 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* 9085F8 80240BC8 3C05FD05 */ lui $a1, 0xfd05 -/* 9085FC 80240BCC AFBF0028 */ sw $ra, 0x28($sp) -/* 908600 80240BD0 AFB30024 */ sw $s3, 0x24($sp) -/* 908604 80240BD4 AFB1001C */ sw $s1, 0x1c($sp) -/* 908608 80240BD8 8E51000C */ lw $s1, 0xc($s2) -/* 90860C 80240BDC 0C0B1EAF */ jal get_variable -/* 908610 80240BE0 34A50F80 */ ori $a1, $a1, 0xf80 -/* 908614 80240BE4 12000012 */ beqz $s0, .L80240C30 -/* 908618 80240BE8 0040982D */ daddu $s3, $v0, $zero -/* 90861C 80240BEC AE400070 */ sw $zero, 0x70($s2) -/* 908620 80240BF0 8E250000 */ lw $a1, ($s1) -/* 908624 80240BF4 26310004 */ addiu $s1, $s1, 4 -/* 908628 80240BF8 0C0B1EAF */ jal get_variable -/* 90862C 80240BFC 0240202D */ daddu $a0, $s2, $zero -/* 908630 80240C00 AE420074 */ sw $v0, 0x74($s2) -/* 908634 80240C04 8E250000 */ lw $a1, ($s1) -/* 908638 80240C08 26310004 */ addiu $s1, $s1, 4 -/* 90863C 80240C0C 0C0B1EAF */ jal get_variable -/* 908640 80240C10 0240202D */ daddu $a0, $s2, $zero -/* 908644 80240C14 AE420078 */ sw $v0, 0x78($s2) -/* 908648 80240C18 8E250000 */ lw $a1, ($s1) -/* 90864C 80240C1C 0C0B1EAF */ jal get_variable -/* 908650 80240C20 0240202D */ daddu $a0, $s2, $zero -/* 908654 80240C24 AE42007C */ sw $v0, 0x7c($s2) -/* 908658 80240C28 24020001 */ addiu $v0, $zero, 1 -/* 90865C 80240C2C A662001E */ sh $v0, 0x1e($s3) -.L80240C30: -/* 908660 80240C30 C6400074 */ lwc1 $f0, 0x74($s2) -/* 908664 80240C34 46800020 */ cvt.s.w $f0, $f0 -/* 908668 80240C38 44050000 */ mfc1 $a1, $f0 -/* 90866C 80240C3C C6400078 */ lwc1 $f0, 0x78($s2) -/* 908670 80240C40 46800020 */ cvt.s.w $f0, $f0 -/* 908674 80240C44 8E42007C */ lw $v0, 0x7c($s2) -/* 908678 80240C48 44060000 */ mfc1 $a2, $f0 -/* 90867C 80240C4C AFA20010 */ sw $v0, 0x10($sp) -/* 908680 80240C50 8E470070 */ lw $a3, 0x70($s2) -/* 908684 80240C54 0C00A8ED */ jal update_lerp -/* 908688 80240C58 0000202D */ daddu $a0, $zero, $zero -/* 90868C 80240C5C E660000C */ swc1 $f0, 0xc($s3) -/* 908690 80240C60 8E430070 */ lw $v1, 0x70($s2) -/* 908694 80240C64 8E42007C */ lw $v0, 0x7c($s2) -/* 908698 80240C68 24630001 */ addiu $v1, $v1, 1 -/* 90869C 80240C6C 0062102A */ slt $v0, $v1, $v0 -/* 9086A0 80240C70 AE430070 */ sw $v1, 0x70($s2) -/* 9086A4 80240C74 8FBF0028 */ lw $ra, 0x28($sp) -/* 9086A8 80240C78 8FB30024 */ lw $s3, 0x24($sp) -/* 9086AC 80240C7C 8FB20020 */ lw $s2, 0x20($sp) -/* 9086B0 80240C80 8FB1001C */ lw $s1, 0x1c($sp) -/* 9086B4 80240C84 8FB00018 */ lw $s0, 0x18($sp) -/* 9086B8 80240C88 38420001 */ xori $v0, $v0, 1 -/* 9086BC 80240C8C 03E00008 */ jr $ra -/* 9086C0 80240C90 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240BB4_9085E4.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240BB4_9085E4.s new file mode 100644 index 0000000000..fe99fb78dc --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240BB4_9085E4.s @@ -0,0 +1,61 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BB4_9085E4 +/* 9085E4 80240BB4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9085E8 80240BB8 AFB20020 */ sw $s2, 0x20($sp) +/* 9085EC 80240BBC 0080902D */ daddu $s2, $a0, $zero +/* 9085F0 80240BC0 AFB00018 */ sw $s0, 0x18($sp) +/* 9085F4 80240BC4 00A0802D */ daddu $s0, $a1, $zero +/* 9085F8 80240BC8 3C05FD05 */ lui $a1, 0xfd05 +/* 9085FC 80240BCC AFBF0028 */ sw $ra, 0x28($sp) +/* 908600 80240BD0 AFB30024 */ sw $s3, 0x24($sp) +/* 908604 80240BD4 AFB1001C */ sw $s1, 0x1c($sp) +/* 908608 80240BD8 8E51000C */ lw $s1, 0xc($s2) +/* 90860C 80240BDC 0C0B1EAF */ jal get_variable +/* 908610 80240BE0 34A50F80 */ ori $a1, $a1, 0xf80 +/* 908614 80240BE4 12000012 */ beqz $s0, .L80240C30 +/* 908618 80240BE8 0040982D */ daddu $s3, $v0, $zero +/* 90861C 80240BEC AE400070 */ sw $zero, 0x70($s2) +/* 908620 80240BF0 8E250000 */ lw $a1, ($s1) +/* 908624 80240BF4 26310004 */ addiu $s1, $s1, 4 +/* 908628 80240BF8 0C0B1EAF */ jal get_variable +/* 90862C 80240BFC 0240202D */ daddu $a0, $s2, $zero +/* 908630 80240C00 AE420074 */ sw $v0, 0x74($s2) +/* 908634 80240C04 8E250000 */ lw $a1, ($s1) +/* 908638 80240C08 26310004 */ addiu $s1, $s1, 4 +/* 90863C 80240C0C 0C0B1EAF */ jal get_variable +/* 908640 80240C10 0240202D */ daddu $a0, $s2, $zero +/* 908644 80240C14 AE420078 */ sw $v0, 0x78($s2) +/* 908648 80240C18 8E250000 */ lw $a1, ($s1) +/* 90864C 80240C1C 0C0B1EAF */ jal get_variable +/* 908650 80240C20 0240202D */ daddu $a0, $s2, $zero +/* 908654 80240C24 AE42007C */ sw $v0, 0x7c($s2) +/* 908658 80240C28 24020001 */ addiu $v0, $zero, 1 +/* 90865C 80240C2C A662001E */ sh $v0, 0x1e($s3) +.L80240C30: +/* 908660 80240C30 C6400074 */ lwc1 $f0, 0x74($s2) +/* 908664 80240C34 46800020 */ cvt.s.w $f0, $f0 +/* 908668 80240C38 44050000 */ mfc1 $a1, $f0 +/* 90866C 80240C3C C6400078 */ lwc1 $f0, 0x78($s2) +/* 908670 80240C40 46800020 */ cvt.s.w $f0, $f0 +/* 908674 80240C44 8E42007C */ lw $v0, 0x7c($s2) +/* 908678 80240C48 44060000 */ mfc1 $a2, $f0 +/* 90867C 80240C4C AFA20010 */ sw $v0, 0x10($sp) +/* 908680 80240C50 8E470070 */ lw $a3, 0x70($s2) +/* 908684 80240C54 0C00A8ED */ jal update_lerp +/* 908688 80240C58 0000202D */ daddu $a0, $zero, $zero +/* 90868C 80240C5C E660000C */ swc1 $f0, 0xc($s3) +/* 908690 80240C60 8E430070 */ lw $v1, 0x70($s2) +/* 908694 80240C64 8E42007C */ lw $v0, 0x7c($s2) +/* 908698 80240C68 24630001 */ addiu $v1, $v1, 1 +/* 90869C 80240C6C 0062102A */ slt $v0, $v1, $v0 +/* 9086A0 80240C70 AE430070 */ sw $v1, 0x70($s2) +/* 9086A4 80240C74 8FBF0028 */ lw $ra, 0x28($sp) +/* 9086A8 80240C78 8FB30024 */ lw $s3, 0x24($sp) +/* 9086AC 80240C7C 8FB20020 */ lw $s2, 0x20($sp) +/* 9086B0 80240C80 8FB1001C */ lw $s1, 0x1c($sp) +/* 9086B4 80240C84 8FB00018 */ lw $s0, 0x18($sp) +/* 9086B8 80240C88 38420001 */ xori $v0, $v0, 1 +/* 9086BC 80240C8C 03E00008 */ jr $ra +/* 9086C0 80240C90 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240C94.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240C94.s deleted file mode 100644 index 3a24dd3ef0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240C94.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C94 -/* 9086C4 80240C94 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9086C8 80240C98 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9086CC 80240C9C 90420012 */ lbu $v0, 0x12($v0) -/* 9086D0 80240CA0 03E00008 */ jr $ra -/* 9086D4 80240CA4 000211C2 */ srl $v0, $v0, 7 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240C94_9086C4.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240C94_9086C4.s new file mode 100644 index 0000000000..f0e56a40c5 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240C94_9086C4.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C94_9086C4 +/* 9086C4 80240C94 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 9086C8 80240C98 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 9086CC 80240C9C 90420012 */ lbu $v0, 0x12($v0) +/* 9086D0 80240CA0 03E00008 */ jr $ra +/* 9086D4 80240CA4 000211C2 */ srl $v0, $v0, 7 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14.s deleted file mode 100644 index 5d839c0667..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D14 -/* 908744 80240D14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 908748 80240D18 3C05FD05 */ lui $a1, 0xfd05 -/* 90874C 80240D1C 34A50F80 */ ori $a1, $a1, 0xf80 -/* 908750 80240D20 AFBF0010 */ sw $ra, 0x10($sp) -/* 908754 80240D24 0C0B1EAF */ jal get_variable -/* 908758 80240D28 0000202D */ daddu $a0, $zero, $zero -/* 90875C 80240D2C 24030001 */ addiu $v1, $zero, 1 -/* 908760 80240D30 3C05800A */ lui $a1, %hi(D_8009A650) -/* 908764 80240D34 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650) -/* 908768 80240D38 A443001E */ sh $v1, 0x1e($v0) -/* 90876C 80240D3C 8CA30000 */ lw $v1, ($a1) -/* 908770 80240D40 3C040010 */ lui $a0, 0x10 -/* 908774 80240D44 00641825 */ or $v1, $v1, $a0 -/* 908778 80240D48 ACA30000 */ sw $v1, ($a1) -/* 90877C 80240D4C 8FBF0010 */ lw $ra, 0x10($sp) -/* 908780 80240D50 24020002 */ addiu $v0, $zero, 2 -/* 908784 80240D54 03E00008 */ jr $ra -/* 908788 80240D58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14_908744.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14_908744.s new file mode 100644 index 0000000000..1a7ae46a94 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D14_908744.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D14_908744 +/* 908744 80240D14 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 908748 80240D18 3C05FD05 */ lui $a1, 0xfd05 +/* 90874C 80240D1C 34A50F80 */ ori $a1, $a1, 0xf80 +/* 908750 80240D20 AFBF0010 */ sw $ra, 0x10($sp) +/* 908754 80240D24 0C0B1EAF */ jal get_variable +/* 908758 80240D28 0000202D */ daddu $a0, $zero, $zero +/* 90875C 80240D2C 24030001 */ addiu $v1, $zero, 1 +/* 908760 80240D30 3C05800A */ lui $a1, %hi(D_8009A650) +/* 908764 80240D34 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650) +/* 908768 80240D38 A443001E */ sh $v1, 0x1e($v0) +/* 90876C 80240D3C 8CA30000 */ lw $v1, ($a1) +/* 908770 80240D40 3C040010 */ lui $a0, 0x10 +/* 908774 80240D44 00641825 */ or $v1, $v1, $a0 +/* 908778 80240D48 ACA30000 */ sw $v1, ($a1) +/* 90877C 80240D4C 8FBF0010 */ lw $ra, 0x10($sp) +/* 908780 80240D50 24020002 */ addiu $v0, $zero, 2 +/* 908784 80240D54 03E00008 */ jr $ra +/* 908788 80240D58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D5C.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D5C.s deleted file mode 100644 index c8bb4bf492..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D5C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D5C -/* 90878C 80240D5C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 908790 80240D60 3C05FD05 */ lui $a1, 0xfd05 -/* 908794 80240D64 34A50F80 */ ori $a1, $a1, 0xf80 -/* 908798 80240D68 AFBF0010 */ sw $ra, 0x10($sp) -/* 90879C 80240D6C 0C0B1EAF */ jal get_variable -/* 9087A0 80240D70 0000202D */ daddu $a0, $zero, $zero -/* 9087A4 80240D74 3C05FFEF */ lui $a1, 0xffef -/* 9087A8 80240D78 3C04800A */ lui $a0, %hi(D_8009A650) -/* 9087AC 80240D7C 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) -/* 9087B0 80240D80 A440001E */ sh $zero, 0x1e($v0) -/* 9087B4 80240D84 8C830000 */ lw $v1, ($a0) -/* 9087B8 80240D88 34A5FFFF */ ori $a1, $a1, 0xffff -/* 9087BC 80240D8C 00651824 */ and $v1, $v1, $a1 -/* 9087C0 80240D90 AC830000 */ sw $v1, ($a0) -/* 9087C4 80240D94 8FBF0010 */ lw $ra, 0x10($sp) -/* 9087C8 80240D98 24020002 */ addiu $v0, $zero, 2 -/* 9087CC 80240D9C 03E00008 */ jr $ra -/* 9087D0 80240DA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D5C_90878C.s b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D5C_90878C.s new file mode 100644 index 0000000000..93018dc848 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_23/907A40/func_80240D5C_90878C.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D5C_90878C +/* 90878C 80240D5C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 908790 80240D60 3C05FD05 */ lui $a1, 0xfd05 +/* 908794 80240D64 34A50F80 */ ori $a1, $a1, 0xf80 +/* 908798 80240D68 AFBF0010 */ sw $ra, 0x10($sp) +/* 90879C 80240D6C 0C0B1EAF */ jal get_variable +/* 9087A0 80240D70 0000202D */ daddu $a0, $zero, $zero +/* 9087A4 80240D74 3C05FFEF */ lui $a1, 0xffef +/* 9087A8 80240D78 3C04800A */ lui $a0, %hi(D_8009A650) +/* 9087AC 80240D7C 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) +/* 9087B0 80240D80 A440001E */ sh $zero, 0x1e($v0) +/* 9087B4 80240D84 8C830000 */ lw $v1, ($a0) +/* 9087B8 80240D88 34A5FFFF */ ori $a1, $a1, 0xffff +/* 9087BC 80240D8C 00651824 */ and $v1, $v1, $a1 +/* 9087C0 80240D90 AC830000 */ sw $v1, ($a0) +/* 9087C4 80240D94 8FBF0010 */ lw $ra, 0x10($sp) +/* 9087C8 80240D98 24020002 */ addiu $v0, $zero, 2 +/* 9087CC 80240D9C 03E00008 */ jr $ra +/* 9087D0 80240DA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074.s b/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074.s deleted file mode 100644 index 32a180cc8a..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240074 -/* 90B2B4 80240074 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 90B2B8 80240078 3C048024 */ lui $a0, 0x8024 -/* 90B2BC 8024007C 24840480 */ addiu $a0, $a0, 0x480 -/* 90B2C0 80240080 AFB00018 */ sw $s0, 0x18($sp) -/* 90B2C4 80240084 3C108007 */ lui $s0, %hi(gGameStatusPtr) -/* 90B2C8 80240088 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) -/* 90B2CC 8024008C 27A50010 */ addiu $a1, $sp, 0x10 -/* 90B2D0 80240090 AFBF0028 */ sw $ra, 0x28($sp) -/* 90B2D4 80240094 AFB30024 */ sw $s3, 0x24($sp) -/* 90B2D8 80240098 AFB20020 */ sw $s2, 0x20($sp) -/* 90B2DC 8024009C AFB1001C */ sw $s1, 0x1c($sp) -/* 90B2E0 802400A0 8E020000 */ lw $v0, ($s0) -/* 90B2E4 802400A4 94510086 */ lhu $s1, 0x86($v0) -/* 90B2E8 802400A8 9452008C */ lhu $s2, 0x8c($v0) -/* 90B2EC 802400AC 9453008E */ lhu $s3, 0x8e($v0) -/* 90B2F0 802400B0 0C016AFE */ jal get_map_IDs_by_name -/* 90B2F4 802400B4 27A60012 */ addiu $a2, $sp, 0x12 -/* 90B2F8 802400B8 8E030000 */ lw $v1, ($s0) -/* 90B2FC 802400BC 97A20010 */ lhu $v0, 0x10($sp) -/* 90B300 802400C0 97A50012 */ lhu $a1, 0x12($sp) -/* 90B304 802400C4 90640166 */ lbu $a0, 0x166($v1) -/* 90B308 802400C8 A4620086 */ sh $v0, 0x86($v1) -/* 90B30C 802400CC 24020004 */ addiu $v0, $zero, 4 -/* 90B310 802400D0 A465008C */ sh $a1, 0x8c($v1) -/* 90B314 802400D4 0C00ACDD */ jal fio_save_game -/* 90B318 802400D8 A462008E */ sh $v0, 0x8e($v1) -/* 90B31C 802400DC 8E030000 */ lw $v1, ($s0) -/* 90B320 802400E0 A4710086 */ sh $s1, 0x86($v1) -/* 90B324 802400E4 A472008C */ sh $s2, 0x8c($v1) -/* 90B328 802400E8 A473008E */ sh $s3, 0x8e($v1) -/* 90B32C 802400EC 8FBF0028 */ lw $ra, 0x28($sp) -/* 90B330 802400F0 8FB30024 */ lw $s3, 0x24($sp) -/* 90B334 802400F4 8FB20020 */ lw $s2, 0x20($sp) -/* 90B338 802400F8 8FB1001C */ lw $s1, 0x1c($sp) -/* 90B33C 802400FC 8FB00018 */ lw $s0, 0x18($sp) -/* 90B340 80240100 24020002 */ addiu $v0, $zero, 2 -/* 90B344 80240104 03E00008 */ jr $ra -/* 90B348 80240108 27BD0030 */ addiu $sp, $sp, 0x30 -/* 90B34C 8024010C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s b/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s new file mode 100644 index 0000000000..b95e671235 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_24/90B250/func_80240074_90B2B4.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240074_90B2B4 +/* 90B2B4 80240074 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 90B2B8 80240078 3C048024 */ lui $a0, 0x8024 +/* 90B2BC 8024007C 24840480 */ addiu $a0, $a0, 0x480 +/* 90B2C0 80240080 AFB00018 */ sw $s0, 0x18($sp) +/* 90B2C4 80240084 3C108007 */ lui $s0, %hi(gGameStatusPtr) +/* 90B2C8 80240088 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) +/* 90B2CC 8024008C 27A50010 */ addiu $a1, $sp, 0x10 +/* 90B2D0 80240090 AFBF0028 */ sw $ra, 0x28($sp) +/* 90B2D4 80240094 AFB30024 */ sw $s3, 0x24($sp) +/* 90B2D8 80240098 AFB20020 */ sw $s2, 0x20($sp) +/* 90B2DC 8024009C AFB1001C */ sw $s1, 0x1c($sp) +/* 90B2E0 802400A0 8E020000 */ lw $v0, ($s0) +/* 90B2E4 802400A4 94510086 */ lhu $s1, 0x86($v0) +/* 90B2E8 802400A8 9452008C */ lhu $s2, 0x8c($v0) +/* 90B2EC 802400AC 9453008E */ lhu $s3, 0x8e($v0) +/* 90B2F0 802400B0 0C016AFE */ jal get_map_IDs_by_name +/* 90B2F4 802400B4 27A60012 */ addiu $a2, $sp, 0x12 +/* 90B2F8 802400B8 8E030000 */ lw $v1, ($s0) +/* 90B2FC 802400BC 97A20010 */ lhu $v0, 0x10($sp) +/* 90B300 802400C0 97A50012 */ lhu $a1, 0x12($sp) +/* 90B304 802400C4 90640166 */ lbu $a0, 0x166($v1) +/* 90B308 802400C8 A4620086 */ sh $v0, 0x86($v1) +/* 90B30C 802400CC 24020004 */ addiu $v0, $zero, 4 +/* 90B310 802400D0 A465008C */ sh $a1, 0x8c($v1) +/* 90B314 802400D4 0C00ACDD */ jal fio_save_game +/* 90B318 802400D8 A462008E */ sh $v0, 0x8e($v1) +/* 90B31C 802400DC 8E030000 */ lw $v1, ($s0) +/* 90B320 802400E0 A4710086 */ sh $s1, 0x86($v1) +/* 90B324 802400E4 A472008C */ sh $s2, 0x8c($v1) +/* 90B328 802400E8 A473008E */ sh $s3, 0x8e($v1) +/* 90B32C 802400EC 8FBF0028 */ lw $ra, 0x28($sp) +/* 90B330 802400F0 8FB30024 */ lw $s3, 0x24($sp) +/* 90B334 802400F4 8FB20020 */ lw $s2, 0x20($sp) +/* 90B338 802400F8 8FB1001C */ lw $s1, 0x1c($sp) +/* 90B33C 802400FC 8FB00018 */ lw $s0, 0x18($sp) +/* 90B340 80240100 24020002 */ addiu $v0, $zero, 2 +/* 90B344 80240104 03E00008 */ jr $ra +/* 90B348 80240108 27BD0030 */ addiu $sp, $sp, 0x30 +/* 90B34C 8024010C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488.s b/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488.s deleted file mode 100644 index 0e9b2dd177..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240488 -/* 90BB58 80240488 3C06FC12 */ lui $a2, 0xfc12 -/* 90BB5C 8024048C 34C61624 */ ori $a2, $a2, 0x1624 -/* 90BB60 80240490 3C05FF2F */ lui $a1, 0xff2f -/* 90BB64 80240494 3C04800A */ lui $a0, 0x800a -/* 90BB68 80240498 2484A66C */ addiu $a0, $a0, -0x5994 -/* 90BB6C 8024049C 8C820000 */ lw $v0, ($a0) -/* 90BB70 802404A0 34A5FFFF */ ori $a1, $a1, 0xffff -/* 90BB74 802404A4 0040182D */ daddu $v1, $v0, $zero -/* 90BB78 802404A8 24420008 */ addiu $v0, $v0, 8 -/* 90BB7C 802404AC AC820000 */ sw $v0, ($a0) -/* 90BB80 802404B0 AC660000 */ sw $a2, ($v1) -/* 90BB84 802404B4 AC650004 */ sw $a1, 4($v1) -/* 90BB88 802404B8 24430008 */ addiu $v1, $v0, 8 -/* 90BB8C 802404BC AC830000 */ sw $v1, ($a0) -/* 90BB90 802404C0 3C048024 */ lui $a0, 0x8024 -/* 90BB94 802404C4 90840C0F */ lbu $a0, 0xc0f($a0) -/* 90BB98 802404C8 3C03FA00 */ lui $v1, 0xfa00 -/* 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 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 new file mode 100644 index 0000000000..aabf4c0b39 --- /dev/null +++ b/asm/nonmatchings/world/area_kmr/kmr_30/90B9E0/func_80240488_90BB58.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +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, 0x800a +/* 90BB68 80240498 2484A66C */ addiu $a0, $a0, -0x5994 +/* 90BB6C 8024049C 8C820000 */ lw $v0, ($a0) +/* 90BB70 802404A0 34A5FFFF */ ori $a1, $a1, 0xffff +/* 90BB74 802404A4 0040182D */ daddu $v1, $v0, $zero +/* 90BB78 802404A8 24420008 */ addiu $v0, $v0, 8 +/* 90BB7C 802404AC AC820000 */ sw $v0, ($a0) +/* 90BB80 802404B0 AC660000 */ sw $a2, ($v1) +/* 90BB84 802404B4 AC650004 */ sw $a1, 4($v1) +/* 90BB88 802404B8 24430008 */ addiu $v1, $v0, 8 +/* 90BB8C 802404BC AC830000 */ sw $v1, ($a0) +/* 90BB90 802404C0 3C048024 */ lui $a0, 0x8024 +/* 90BB94 802404C4 90840C0F */ lbu $a0, 0xc0f($a0) +/* 90BB98 802404C8 3C03FA00 */ lui $v1, 0xfa00 +/* 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 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC.s deleted file mode 100644 index f66b29b2ac..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401DC -/* A4713C 802401DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A47140 802401E0 AFB3001C */ sw $s3, 0x1c($sp) -/* A47144 802401E4 0080982D */ daddu $s3, $a0, $zero -/* A47148 802401E8 AFBF0020 */ sw $ra, 0x20($sp) -/* A4714C 802401EC AFB20018 */ sw $s2, 0x18($sp) -/* A47150 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* A47154 802401F4 AFB00010 */ sw $s0, 0x10($sp) -/* A47158 802401F8 8E710148 */ lw $s1, 0x148($s3) -/* A4715C 802401FC 86240008 */ lh $a0, 8($s1) -/* A47160 80240200 0C00EABB */ jal get_npc_unsafe -/* A47164 80240204 00A0902D */ daddu $s2, $a1, $zero -/* A47168 80240208 0040802D */ daddu $s0, $v0, $zero -/* A4716C 8024020C 8602008E */ lh $v0, 0x8e($s0) -/* A47170 80240210 9603008E */ lhu $v1, 0x8e($s0) -/* A47174 80240214 18400005 */ blez $v0, .L8024022C -/* A47178 80240218 2462FFFF */ addiu $v0, $v1, -1 -/* A4717C 8024021C A602008E */ sh $v0, 0x8e($s0) -/* A47180 80240220 00021400 */ sll $v0, $v0, 0x10 -/* A47184 80240224 1C400033 */ bgtz $v0, .L802402F4 -/* A47188 80240228 00000000 */ nop -.L8024022C: -/* A4718C 8024022C 8602008C */ lh $v0, 0x8c($s0) -/* A47190 80240230 14400030 */ bnez $v0, .L802402F4 -/* A47194 80240234 00000000 */ nop -/* A47198 80240238 8E2200CC */ lw $v0, 0xcc($s1) -/* A4719C 8024023C 8C420024 */ lw $v0, 0x24($v0) -/* A471A0 80240240 AE020028 */ sw $v0, 0x28($s0) -/* A471A4 80240244 C6400018 */ lwc1 $f0, 0x18($s2) -/* A471A8 80240248 E6000018 */ swc1 $f0, 0x18($s0) -/* A471AC 8024024C 8E230088 */ lw $v1, 0x88($s1) -/* A471B0 80240250 24020005 */ addiu $v0, $zero, 5 -/* A471B4 80240254 10620005 */ beq $v1, $v0, .L8024026C -/* A471B8 80240258 00000000 */ nop -/* A471BC 8024025C 10600003 */ beqz $v1, .L8024026C -/* A471C0 80240260 24020001 */ addiu $v0, $zero, 1 -/* A471C4 80240264 14620006 */ bne $v1, $v0, .L80240280 -/* A471C8 80240268 00000000 */ nop -.L8024026C: -/* A471CC 8024026C 8E220084 */ lw $v0, 0x84($s1) -/* A471D0 80240270 00021FC2 */ srl $v1, $v0, 0x1f -/* A471D4 80240274 00431021 */ addu $v0, $v0, $v1 -/* A471D8 80240278 00021043 */ sra $v0, $v0, 1 -/* A471DC 8024027C A60200A8 */ sh $v0, 0xa8($s0) -.L80240280: -/* A471E0 80240280 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A471E4 80240284 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A471E8 80240288 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A471EC 8024028C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A471F0 80240290 8C460028 */ lw $a2, 0x28($v0) -/* A471F4 80240294 0C00A7B5 */ jal dist2D -/* A471F8 80240298 8C470030 */ lw $a3, 0x30($v0) -/* A471FC 8024029C C6020018 */ lwc1 $f2, 0x18($s0) -/* A47200 802402A0 46020003 */ div.s $f0, $f0, $f2 -/* A47204 802402A4 3C018024 */ lui $at, 0x8024 -/* A47208 802402A8 D4221600 */ ldc1 $f2, 0x1600($at) -/* A4720C 802402AC 46000021 */ cvt.d.s $f0, $f0 -/* A47210 802402B0 46220000 */ add.d $f0, $f0, $f2 -/* A47214 802402B4 4620010D */ trunc.w.d $f4, $f0 -/* A47218 802402B8 44022000 */ mfc1 $v0, $f4 -/* A4721C 802402BC 00000000 */ nop -/* A47220 802402C0 A602008E */ sh $v0, 0x8e($s0) -/* A47224 802402C4 00021400 */ sll $v0, $v0, 0x10 -/* A47228 802402C8 8E230078 */ lw $v1, 0x78($s1) -/* A4722C 802402CC 00021403 */ sra $v0, $v0, 0x10 -/* A47230 802402D0 0043102A */ slt $v0, $v0, $v1 -/* A47234 802402D4 10400003 */ beqz $v0, .L802402E4 -/* A47238 802402D8 00000000 */ nop -/* A4723C 802402DC 9622007A */ lhu $v0, 0x7a($s1) -/* A47240 802402E0 A602008E */ sh $v0, 0x8e($s0) -.L802402E4: -/* A47244 802402E4 8602008E */ lh $v0, 0x8e($s0) -/* A47248 802402E8 AE22007C */ sw $v0, 0x7c($s1) -/* A4724C 802402EC 2402000E */ addiu $v0, $zero, 0xe -/* A47250 802402F0 AE620070 */ sw $v0, 0x70($s3) -.L802402F4: -/* A47254 802402F4 8FBF0020 */ lw $ra, 0x20($sp) -/* A47258 802402F8 8FB3001C */ lw $s3, 0x1c($sp) -/* A4725C 802402FC 8FB20018 */ lw $s2, 0x18($sp) -/* A47260 80240300 8FB10014 */ lw $s1, 0x14($sp) -/* A47264 80240304 8FB00010 */ lw $s0, 0x10($sp) -/* A47268 80240308 03E00008 */ jr $ra -/* A4726C 8024030C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s new file mode 100644 index 0000000000..6572357f44 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802401DC_A4713C.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401DC_A4713C +/* A4713C 802401DC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A47140 802401E0 AFB3001C */ sw $s3, 0x1c($sp) +/* A47144 802401E4 0080982D */ daddu $s3, $a0, $zero +/* A47148 802401E8 AFBF0020 */ sw $ra, 0x20($sp) +/* A4714C 802401EC AFB20018 */ sw $s2, 0x18($sp) +/* A47150 802401F0 AFB10014 */ sw $s1, 0x14($sp) +/* A47154 802401F4 AFB00010 */ sw $s0, 0x10($sp) +/* A47158 802401F8 8E710148 */ lw $s1, 0x148($s3) +/* A4715C 802401FC 86240008 */ lh $a0, 8($s1) +/* A47160 80240200 0C00EABB */ jal get_npc_unsafe +/* A47164 80240204 00A0902D */ daddu $s2, $a1, $zero +/* A47168 80240208 0040802D */ daddu $s0, $v0, $zero +/* A4716C 8024020C 8602008E */ lh $v0, 0x8e($s0) +/* A47170 80240210 9603008E */ lhu $v1, 0x8e($s0) +/* A47174 80240214 18400005 */ blez $v0, .L8024022C +/* A47178 80240218 2462FFFF */ addiu $v0, $v1, -1 +/* A4717C 8024021C A602008E */ sh $v0, 0x8e($s0) +/* A47180 80240220 00021400 */ sll $v0, $v0, 0x10 +/* A47184 80240224 1C400033 */ bgtz $v0, .L802402F4 +/* A47188 80240228 00000000 */ nop +.L8024022C: +/* A4718C 8024022C 8602008C */ lh $v0, 0x8c($s0) +/* A47190 80240230 14400030 */ bnez $v0, .L802402F4 +/* A47194 80240234 00000000 */ nop +/* A47198 80240238 8E2200CC */ lw $v0, 0xcc($s1) +/* A4719C 8024023C 8C420024 */ lw $v0, 0x24($v0) +/* A471A0 80240240 AE020028 */ sw $v0, 0x28($s0) +/* A471A4 80240244 C6400018 */ lwc1 $f0, 0x18($s2) +/* A471A8 80240248 E6000018 */ swc1 $f0, 0x18($s0) +/* A471AC 8024024C 8E230088 */ lw $v1, 0x88($s1) +/* A471B0 80240250 24020005 */ addiu $v0, $zero, 5 +/* A471B4 80240254 10620005 */ beq $v1, $v0, .L8024026C +/* A471B8 80240258 00000000 */ nop +/* A471BC 8024025C 10600003 */ beqz $v1, .L8024026C +/* A471C0 80240260 24020001 */ addiu $v0, $zero, 1 +/* A471C4 80240264 14620006 */ bne $v1, $v0, .L80240280 +/* A471C8 80240268 00000000 */ nop +.L8024026C: +/* A471CC 8024026C 8E220084 */ lw $v0, 0x84($s1) +/* A471D0 80240270 00021FC2 */ srl $v1, $v0, 0x1f +/* A471D4 80240274 00431021 */ addu $v0, $v0, $v1 +/* A471D8 80240278 00021043 */ sra $v0, $v0, 1 +/* A471DC 8024027C A60200A8 */ sh $v0, 0xa8($s0) +.L80240280: +/* A471E0 80240280 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A471E4 80240284 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A471E8 80240288 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A471EC 8024028C C60E0040 */ lwc1 $f14, 0x40($s0) +/* A471F0 80240290 8C460028 */ lw $a2, 0x28($v0) +/* A471F4 80240294 0C00A7B5 */ jal dist2D +/* A471F8 80240298 8C470030 */ lw $a3, 0x30($v0) +/* A471FC 8024029C C6020018 */ lwc1 $f2, 0x18($s0) +/* A47200 802402A0 46020003 */ div.s $f0, $f0, $f2 +/* A47204 802402A4 3C018024 */ lui $at, 0x8024 +/* A47208 802402A8 D4221600 */ ldc1 $f2, 0x1600($at) +/* A4720C 802402AC 46000021 */ cvt.d.s $f0, $f0 +/* A47210 802402B0 46220000 */ add.d $f0, $f0, $f2 +/* A47214 802402B4 4620010D */ trunc.w.d $f4, $f0 +/* A47218 802402B8 44022000 */ mfc1 $v0, $f4 +/* A4721C 802402BC 00000000 */ nop +/* A47220 802402C0 A602008E */ sh $v0, 0x8e($s0) +/* A47224 802402C4 00021400 */ sll $v0, $v0, 0x10 +/* A47228 802402C8 8E230078 */ lw $v1, 0x78($s1) +/* A4722C 802402CC 00021403 */ sra $v0, $v0, 0x10 +/* A47230 802402D0 0043102A */ slt $v0, $v0, $v1 +/* A47234 802402D4 10400003 */ beqz $v0, .L802402E4 +/* A47238 802402D8 00000000 */ nop +/* A4723C 802402DC 9622007A */ lhu $v0, 0x7a($s1) +/* A47240 802402E0 A602008E */ sh $v0, 0x8e($s0) +.L802402E4: +/* A47244 802402E4 8602008E */ lh $v0, 0x8e($s0) +/* A47248 802402E8 AE22007C */ sw $v0, 0x7c($s1) +/* A4724C 802402EC 2402000E */ addiu $v0, $zero, 0xe +/* A47250 802402F0 AE620070 */ sw $v0, 0x70($s3) +.L802402F4: +/* A47254 802402F4 8FBF0020 */ lw $ra, 0x20($sp) +/* A47258 802402F8 8FB3001C */ lw $s3, 0x1c($sp) +/* A4725C 802402FC 8FB20018 */ lw $s2, 0x18($sp) +/* A47260 80240300 8FB10014 */ lw $s1, 0x14($sp) +/* A47264 80240304 8FB00010 */ lw $s0, 0x10($sp) +/* A47268 80240308 03E00008 */ jr $ra +/* A4726C 8024030C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4.s deleted file mode 100644 index 76a3cb2872..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404F4 -/* A47454 802404F4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A47458 802404F8 AFB3005C */ sw $s3, 0x5c($sp) -/* A4745C 802404FC 0080982D */ daddu $s3, $a0, $zero -/* A47460 80240500 AFBF0068 */ sw $ra, 0x68($sp) -/* A47464 80240504 AFB50064 */ sw $s5, 0x64($sp) -/* A47468 80240508 AFB40060 */ sw $s4, 0x60($sp) -/* A4746C 8024050C AFB20058 */ sw $s2, 0x58($sp) -/* A47470 80240510 AFB10054 */ sw $s1, 0x54($sp) -/* A47474 80240514 AFB00050 */ sw $s0, 0x50($sp) -/* A47478 80240518 8E710148 */ lw $s1, 0x148($s3) -/* A4747C 8024051C 86240008 */ lh $a0, 8($s1) -/* A47480 80240520 0C00EABB */ jal get_npc_unsafe -/* A47484 80240524 00A0802D */ daddu $s0, $a1, $zero -/* A47488 80240528 8E63000C */ lw $v1, 0xc($s3) -/* A4748C 8024052C 0260202D */ daddu $a0, $s3, $zero -/* A47490 80240530 8C650000 */ lw $a1, ($v1) -/* A47494 80240534 0C0B1EAF */ jal get_variable -/* A47498 80240538 0040902D */ daddu $s2, $v0, $zero -/* A4749C 8024053C AFA00028 */ sw $zero, 0x28($sp) -/* A474A0 80240540 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474A4 80240544 8C630030 */ lw $v1, 0x30($v1) -/* A474A8 80240548 AFA3002C */ sw $v1, 0x2c($sp) -/* A474AC 8024054C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474B0 80240550 8C63001C */ lw $v1, 0x1c($v1) -/* A474B4 80240554 AFA30030 */ sw $v1, 0x30($sp) -/* A474B8 80240558 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474BC 8024055C 8C630024 */ lw $v1, 0x24($v1) -/* A474C0 80240560 AFA30034 */ sw $v1, 0x34($sp) -/* A474C4 80240564 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474C8 80240568 8C630028 */ lw $v1, 0x28($v1) -/* A474CC 8024056C 27B50028 */ addiu $s5, $sp, 0x28 -/* A474D0 80240570 AFA30038 */ sw $v1, 0x38($sp) -/* A474D4 80240574 8E2300D0 */ lw $v1, 0xd0($s1) -/* A474D8 80240578 3C0142C8 */ lui $at, 0x42c8 -/* A474DC 8024057C 44810000 */ mtc1 $at, $f0 -/* A474E0 80240580 8C63002C */ lw $v1, 0x2c($v1) -/* A474E4 80240584 0040A02D */ daddu $s4, $v0, $zero -/* A474E8 80240588 E7A00040 */ swc1 $f0, 0x40($sp) -/* A474EC 8024058C A7A00044 */ sh $zero, 0x44($sp) -/* A474F0 80240590 12000009 */ beqz $s0, .L802405B8 -/* A474F4 80240594 AFA3003C */ sw $v1, 0x3c($sp) -/* A474F8 80240598 864300A8 */ lh $v1, 0xa8($s2) -/* A474FC 8024059C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A47500 802405A0 AE20008C */ sw $zero, 0x8c($s1) -/* A47504 802405A4 A22000B5 */ sb $zero, 0xb5($s1) -/* A47508 802405A8 34420008 */ ori $v0, $v0, 8 -/* A4750C 802405AC AE230084 */ sw $v1, 0x84($s1) -/* A47510 802405B0 08090172 */ j .L802405C8 -/* A47514 802405B4 AE2200B0 */ sw $v0, 0xb0($s1) -.L802405B8: -/* A47518 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* A4751C 802405BC 30420004 */ andi $v0, $v0, 4 -/* A47520 802405C0 10400047 */ beqz $v0, .L802406E0 -/* A47524 802405C4 00000000 */ nop -.L802405C8: -/* A47528 802405C8 AE600070 */ sw $zero, 0x70($s3) -/* A4752C 802405CC A640008E */ sh $zero, 0x8e($s2) -/* A47530 802405D0 8E2300CC */ lw $v1, 0xcc($s1) -/* A47534 802405D4 2404F7FF */ addiu $a0, $zero, -0x801 -/* A47538 802405D8 A2200007 */ sb $zero, 7($s1) -/* A4753C 802405DC 8E420000 */ lw $v0, ($s2) -/* A47540 802405E0 8C630000 */ lw $v1, ($v1) -/* A47544 802405E4 00441024 */ and $v0, $v0, $a0 -/* A47548 802405E8 AE420000 */ sw $v0, ($s2) -/* A4754C 802405EC AE430028 */ sw $v1, 0x28($s2) -/* A47550 802405F0 96220086 */ lhu $v0, 0x86($s1) -/* A47554 802405F4 A64200A8 */ sh $v0, 0xa8($s2) -/* A47558 802405F8 8E2200D0 */ lw $v0, 0xd0($s1) -/* A4755C 802405FC AE200090 */ sw $zero, 0x90($s1) -/* A47560 80240600 8C420034 */ lw $v0, 0x34($v0) -/* A47564 80240604 14400006 */ bnez $v0, .L80240620 -/* A47568 80240608 2403FDFF */ addiu $v1, $zero, -0x201 -/* A4756C 8024060C 8E420000 */ lw $v0, ($s2) -/* A47570 80240610 2403FFF7 */ addiu $v1, $zero, -9 -/* A47574 80240614 34420200 */ ori $v0, $v0, 0x200 -/* A47578 80240618 0809018B */ j .L8024062C -/* A4757C 8024061C 00431024 */ and $v0, $v0, $v1 -.L80240620: -/* A47580 80240620 8E420000 */ lw $v0, ($s2) -/* A47584 80240624 00431024 */ and $v0, $v0, $v1 -/* A47588 80240628 34420008 */ ori $v0, $v0, 8 -.L8024062C: -/* A4758C 8024062C AE420000 */ sw $v0, ($s2) -/* A47590 80240630 8E2200B0 */ lw $v0, 0xb0($s1) -/* A47594 80240634 30420004 */ andi $v0, $v0, 4 -/* A47598 80240638 1040001E */ beqz $v0, .L802406B4 -/* A4759C 8024063C 24040002 */ addiu $a0, $zero, 2 -/* A475A0 80240640 0240282D */ daddu $a1, $s2, $zero -/* A475A4 80240644 0000302D */ daddu $a2, $zero, $zero -/* A475A8 80240648 24020063 */ addiu $v0, $zero, 0x63 -/* A475AC 8024064C AE620070 */ sw $v0, 0x70($s3) -/* A475B0 80240650 AE600074 */ sw $zero, 0x74($s3) -/* A475B4 80240654 864300A8 */ lh $v1, 0xa8($s2) -/* A475B8 80240658 3C013F80 */ lui $at, 0x3f80 -/* A475BC 8024065C 44810000 */ mtc1 $at, $f0 -/* A475C0 80240660 3C014000 */ lui $at, 0x4000 -/* A475C4 80240664 44811000 */ mtc1 $at, $f2 -/* A475C8 80240668 3C01C1A0 */ lui $at, 0xc1a0 -/* A475CC 8024066C 44812000 */ mtc1 $at, $f4 -/* A475D0 80240670 24020028 */ addiu $v0, $zero, 0x28 -/* A475D4 80240674 AFA2001C */ sw $v0, 0x1c($sp) -/* A475D8 80240678 44833000 */ mtc1 $v1, $f6 -/* A475DC 8024067C 00000000 */ nop -/* A475E0 80240680 468031A0 */ cvt.s.w $f6, $f6 -/* A475E4 80240684 44073000 */ mfc1 $a3, $f6 -/* A475E8 80240688 27A20048 */ addiu $v0, $sp, 0x48 -/* A475EC 8024068C AFA20020 */ sw $v0, 0x20($sp) -/* A475F0 80240690 E7A00010 */ swc1 $f0, 0x10($sp) -/* A475F4 80240694 E7A20014 */ swc1 $f2, 0x14($sp) -/* A475F8 80240698 0C01BFA4 */ jal fx_emote -/* A475FC 8024069C E7A40018 */ swc1 $f4, 0x18($sp) -/* A47600 802406A0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A47604 802406A4 2403FFFB */ addiu $v1, $zero, -5 -/* A47608 802406A8 00431024 */ and $v0, $v0, $v1 -/* A4760C 802406AC 080901B8 */ j .L802406E0 -/* A47610 802406B0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802406B4: -/* A47614 802406B4 8E220000 */ lw $v0, ($s1) -/* A47618 802406B8 3C034000 */ lui $v1, 0x4000 -/* A4761C 802406BC 00431024 */ and $v0, $v0, $v1 -/* A47620 802406C0 10400007 */ beqz $v0, .L802406E0 -/* A47624 802406C4 3C03BFFF */ lui $v1, 0xbfff -/* A47628 802406C8 2402000C */ addiu $v0, $zero, 0xc -/* A4762C 802406CC AE620070 */ sw $v0, 0x70($s3) -/* A47630 802406D0 8E220000 */ lw $v0, ($s1) -/* A47634 802406D4 3463FFFF */ ori $v1, $v1, 0xffff -/* A47638 802406D8 00431024 */ and $v0, $v0, $v1 -/* A4763C 802406DC AE220000 */ sw $v0, ($s1) -.L802406E0: -/* A47640 802406E0 8E220090 */ lw $v0, 0x90($s1) -/* A47644 802406E4 1840000C */ blez $v0, .L80240718 -/* A47648 802406E8 2442FFFF */ addiu $v0, $v0, -1 -/* A4764C 802406EC 14400087 */ bnez $v0, .L8024090C -/* A47650 802406F0 AE220090 */ sw $v0, 0x90($s1) -/* A47654 802406F4 3C03FFAA */ lui $v1, 0xffaa -/* A47658 802406F8 8E420028 */ lw $v0, 0x28($s2) -/* A4765C 802406FC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A47660 80240700 00431021 */ addu $v0, $v0, $v1 -/* A47664 80240704 2C420002 */ sltiu $v0, $v0, 2 -/* A47668 80240708 10400003 */ beqz $v0, .L80240718 -/* A4766C 8024070C 3C020055 */ lui $v0, 0x55 -/* A47670 80240710 3442000C */ ori $v0, $v0, 0xc -/* A47674 80240714 AE420028 */ sw $v0, 0x28($s2) -.L80240718: -/* A47678 80240718 8E630070 */ lw $v1, 0x70($s3) -/* A4767C 8024071C 2402000C */ addiu $v0, $zero, 0xc -/* A47680 80240720 10620048 */ beq $v1, $v0, .L80240844 -/* A47684 80240724 2862000D */ slti $v0, $v1, 0xd -/* A47688 80240728 1040000F */ beqz $v0, .L80240768 -/* A4768C 8024072C 24100001 */ addiu $s0, $zero, 1 -/* A47690 80240730 1070001E */ beq $v1, $s0, .L802407AC -/* A47694 80240734 28620002 */ slti $v0, $v1, 2 -/* A47698 80240738 10400005 */ beqz $v0, .L80240750 -/* A4769C 8024073C 24020002 */ addiu $v0, $zero, 2 -/* A476A0 80240740 10600015 */ beqz $v1, .L80240798 -/* A476A4 80240744 0260202D */ daddu $a0, $s3, $zero -/* A476A8 80240748 08090228 */ j .L802408A0 -/* A476AC 8024074C 00000000 */ nop -.L80240750: -/* A476B0 80240750 1062001C */ beq $v1, $v0, .L802407C4 -/* A476B4 80240754 24020003 */ addiu $v0, $zero, 3 -/* A476B8 80240758 10620035 */ beq $v1, $v0, .L80240830 -/* A476BC 8024075C 0260202D */ daddu $a0, $s3, $zero -/* A476C0 80240760 08090228 */ j .L802408A0 -/* A476C4 80240764 00000000 */ nop -.L80240768: -/* A476C8 80240768 2402000E */ addiu $v0, $zero, 0xe -/* A476CC 8024076C 1062003F */ beq $v1, $v0, .L8024086C -/* A476D0 80240770 0062102A */ slt $v0, $v1, $v0 -/* A476D4 80240774 14400038 */ bnez $v0, .L80240858 -/* A476D8 80240778 0260202D */ daddu $a0, $s3, $zero -/* A476DC 8024077C 2402000F */ addiu $v0, $zero, 0xf -/* A476E0 80240780 10620040 */ beq $v1, $v0, .L80240884 -/* A476E4 80240784 24020063 */ addiu $v0, $zero, 0x63 -/* A476E8 80240788 10620043 */ beq $v1, $v0, .L80240898 -/* A476EC 8024078C 00000000 */ nop -/* A476F0 80240790 08090228 */ j .L802408A0 -/* A476F4 80240794 00000000 */ nop -.L80240798: -/* A476F8 80240798 0280282D */ daddu $a1, $s4, $zero -/* A476FC 8024079C 0C012568 */ jal func_800495A0 -/* A47700 802407A0 02A0302D */ daddu $a2, $s5, $zero -/* A47704 802407A4 96220086 */ lhu $v0, 0x86($s1) -/* A47708 802407A8 A64200A8 */ sh $v0, 0xa8($s2) -.L802407AC: -/* A4770C 802407AC 0260202D */ daddu $a0, $s3, $zero -/* A47710 802407B0 0280282D */ daddu $a1, $s4, $zero -/* A47714 802407B4 0C0125AE */ jal func_800496B8 -/* A47718 802407B8 02A0302D */ daddu $a2, $s5, $zero -/* A4771C 802407BC 08090228 */ j .L802408A0 -/* A47720 802407C0 00000000 */ nop -.L802407C4: -/* A47724 802407C4 0260202D */ daddu $a0, $s3, $zero -/* A47728 802407C8 0280282D */ daddu $a1, $s4, $zero -/* A4772C 802407CC 0C0126D1 */ jal func_80049B44 -/* A47730 802407D0 02A0302D */ daddu $a2, $s5, $zero -/* A47734 802407D4 8E230088 */ lw $v1, 0x88($s1) -/* A47738 802407D8 24020006 */ addiu $v0, $zero, 6 -/* A4773C 802407DC 14620014 */ bne $v1, $v0, .L80240830 -/* A47740 802407E0 0260202D */ daddu $a0, $s3, $zero -/* A47744 802407E4 0C00A67F */ jal rand_int -/* A47748 802407E8 24040064 */ addiu $a0, $zero, 0x64 -/* A4774C 802407EC 28420021 */ slti $v0, $v0, 0x21 -/* A47750 802407F0 5040000F */ beql $v0, $zero, .L80240830 -/* A47754 802407F4 0260202D */ daddu $a0, $s3, $zero -/* A47758 802407F8 8E22008C */ lw $v0, 0x8c($s1) -/* A4775C 802407FC 10400005 */ beqz $v0, .L80240814 -/* A47760 80240800 3C020055 */ lui $v0, 0x55 -/* A47764 80240804 3442002F */ ori $v0, $v0, 0x2f -/* A47768 80240808 AE20008C */ sw $zero, 0x8c($s1) -/* A4776C 8024080C 08090208 */ j .L80240820 -/* A47770 80240810 A22000B5 */ sb $zero, 0xb5($s1) -.L80240814: -/* A47774 80240814 3442002E */ ori $v0, $v0, 0x2e -/* A47778 80240818 AE30008C */ sw $s0, 0x8c($s1) -/* A4777C 8024081C A23000B5 */ sb $s0, 0xb5($s1) -.L80240820: -/* A47780 80240820 AE420028 */ sw $v0, 0x28($s2) -/* A47784 80240824 24020007 */ addiu $v0, $zero, 7 -/* A47788 80240828 08090243 */ j .L8024090C -/* A4778C 8024082C AE220090 */ sw $v0, 0x90($s1) -.L80240830: -/* A47790 80240830 0280282D */ daddu $a1, $s4, $zero -/* A47794 80240834 0C012701 */ jal func_80049C04 -/* A47798 80240838 02A0302D */ daddu $a2, $s5, $zero -/* A4779C 8024083C 08090228 */ j .L802408A0 -/* A477A0 80240840 00000000 */ nop -.L80240844: -/* A477A4 80240844 0260202D */ daddu $a0, $s3, $zero -/* A477A8 80240848 0280282D */ daddu $a1, $s4, $zero -/* A477AC 8024084C 0C090058 */ jal func_80240160 -/* A477B0 80240850 02A0302D */ daddu $a2, $s5, $zero -/* A477B4 80240854 0260202D */ daddu $a0, $s3, $zero -.L80240858: -/* A477B8 80240858 0280282D */ daddu $a1, $s4, $zero -/* A477BC 8024085C 0C090077 */ jal func_802401DC -/* A477C0 80240860 02A0302D */ daddu $a2, $s5, $zero -/* A477C4 80240864 08090228 */ j .L802408A0 -/* A477C8 80240868 00000000 */ nop -.L8024086C: -/* A477CC 8024086C 0260202D */ daddu $a0, $s3, $zero -/* A477D0 80240870 0280282D */ daddu $a1, $s4, $zero -/* A477D4 80240874 0C0900C4 */ jal func_80240310 -/* A477D8 80240878 02A0302D */ daddu $a2, $s5, $zero -/* A477DC 8024087C 08090228 */ j .L802408A0 -/* A477E0 80240880 00000000 */ nop -.L80240884: -/* A477E4 80240884 0280282D */ daddu $a1, $s4, $zero -/* A477E8 80240888 0C09011D */ jal func_80240474 -/* A477EC 8024088C 02A0302D */ daddu $a2, $s5, $zero -/* A477F0 80240890 08090228 */ j .L802408A0 -/* A477F4 80240894 00000000 */ nop -.L80240898: -/* A477F8 80240898 0C0129CF */ jal func_8004A73C -/* A477FC 8024089C 0260202D */ daddu $a0, $s3, $zero -.L802408A0: -/* A47800 802408A0 8E230088 */ lw $v1, 0x88($s1) -/* A47804 802408A4 24020006 */ addiu $v0, $zero, 6 -/* A47808 802408A8 14620019 */ bne $v1, $v0, .L80240910 -/* A4780C 802408AC 0000102D */ daddu $v0, $zero, $zero -/* A47810 802408B0 8E22008C */ lw $v0, 0x8c($s1) -/* A47814 802408B4 10400003 */ beqz $v0, .L802408C4 -/* A47818 802408B8 24020001 */ addiu $v0, $zero, 1 -/* A4781C 802408BC 08090232 */ j .L802408C8 -/* A47820 802408C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802408C4: -/* A47824 802408C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802408C8: -/* A47828 802408C8 8E22008C */ lw $v0, 0x8c($s1) -/* A4782C 802408CC 1040000F */ beqz $v0, .L8024090C -/* A47830 802408D0 3C03FFAA */ lui $v1, 0xffaa -/* A47834 802408D4 8E420028 */ lw $v0, 0x28($s2) -/* A47838 802408D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* A4783C 802408DC 00431821 */ addu $v1, $v0, $v1 -/* A47840 802408E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* A47844 802408E4 10400009 */ beqz $v0, .L8024090C -/* A47848 802408E8 00031080 */ sll $v0, $v1, 2 -/* A4784C 802408EC 3C018024 */ lui $at, 0x8024 -/* A47850 802408F0 00220821 */ addu $at, $at, $v0 -/* A47854 802408F4 8C221608 */ lw $v0, 0x1608($at) -/* A47858 802408F8 00400008 */ jr $v0 -/* A4785C 802408FC 00000000 */ nop -/* A47860 80240900 8E420028 */ lw $v0, 0x28($s2) -/* A47864 80240904 24420001 */ addiu $v0, $v0, 1 -/* A47868 80240908 AE420028 */ sw $v0, 0x28($s2) -.L8024090C: -/* A4786C 8024090C 0000102D */ daddu $v0, $zero, $zero -.L80240910: -/* A47870 80240910 8FBF0068 */ lw $ra, 0x68($sp) -/* A47874 80240914 8FB50064 */ lw $s5, 0x64($sp) -/* A47878 80240918 8FB40060 */ lw $s4, 0x60($sp) -/* A4787C 8024091C 8FB3005C */ lw $s3, 0x5c($sp) -/* A47880 80240920 8FB20058 */ lw $s2, 0x58($sp) -/* A47884 80240924 8FB10054 */ lw $s1, 0x54($sp) -/* A47888 80240928 8FB00050 */ lw $s0, 0x50($sp) -/* A4788C 8024092C 03E00008 */ jr $ra -/* A47890 80240930 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s new file mode 100644 index 0000000000..06b0ba288e --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_802404F4_A47454.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404F4_A47454 +/* A47454 802404F4 27BDFF90 */ addiu $sp, $sp, -0x70 +/* A47458 802404F8 AFB3005C */ sw $s3, 0x5c($sp) +/* A4745C 802404FC 0080982D */ daddu $s3, $a0, $zero +/* A47460 80240500 AFBF0068 */ sw $ra, 0x68($sp) +/* A47464 80240504 AFB50064 */ sw $s5, 0x64($sp) +/* A47468 80240508 AFB40060 */ sw $s4, 0x60($sp) +/* A4746C 8024050C AFB20058 */ sw $s2, 0x58($sp) +/* A47470 80240510 AFB10054 */ sw $s1, 0x54($sp) +/* A47474 80240514 AFB00050 */ sw $s0, 0x50($sp) +/* A47478 80240518 8E710148 */ lw $s1, 0x148($s3) +/* A4747C 8024051C 86240008 */ lh $a0, 8($s1) +/* A47480 80240520 0C00EABB */ jal get_npc_unsafe +/* A47484 80240524 00A0802D */ daddu $s0, $a1, $zero +/* A47488 80240528 8E63000C */ lw $v1, 0xc($s3) +/* A4748C 8024052C 0260202D */ daddu $a0, $s3, $zero +/* A47490 80240530 8C650000 */ lw $a1, ($v1) +/* A47494 80240534 0C0B1EAF */ jal get_variable +/* A47498 80240538 0040902D */ daddu $s2, $v0, $zero +/* A4749C 8024053C AFA00028 */ sw $zero, 0x28($sp) +/* A474A0 80240540 8E2300D0 */ lw $v1, 0xd0($s1) +/* A474A4 80240544 8C630030 */ lw $v1, 0x30($v1) +/* A474A8 80240548 AFA3002C */ sw $v1, 0x2c($sp) +/* A474AC 8024054C 8E2300D0 */ lw $v1, 0xd0($s1) +/* A474B0 80240550 8C63001C */ lw $v1, 0x1c($v1) +/* A474B4 80240554 AFA30030 */ sw $v1, 0x30($sp) +/* A474B8 80240558 8E2300D0 */ lw $v1, 0xd0($s1) +/* A474BC 8024055C 8C630024 */ lw $v1, 0x24($v1) +/* A474C0 80240560 AFA30034 */ sw $v1, 0x34($sp) +/* A474C4 80240564 8E2300D0 */ lw $v1, 0xd0($s1) +/* A474C8 80240568 8C630028 */ lw $v1, 0x28($v1) +/* A474CC 8024056C 27B50028 */ addiu $s5, $sp, 0x28 +/* A474D0 80240570 AFA30038 */ sw $v1, 0x38($sp) +/* A474D4 80240574 8E2300D0 */ lw $v1, 0xd0($s1) +/* A474D8 80240578 3C0142C8 */ lui $at, 0x42c8 +/* A474DC 8024057C 44810000 */ mtc1 $at, $f0 +/* A474E0 80240580 8C63002C */ lw $v1, 0x2c($v1) +/* A474E4 80240584 0040A02D */ daddu $s4, $v0, $zero +/* A474E8 80240588 E7A00040 */ swc1 $f0, 0x40($sp) +/* A474EC 8024058C A7A00044 */ sh $zero, 0x44($sp) +/* A474F0 80240590 12000009 */ beqz $s0, .L802405B8 +/* A474F4 80240594 AFA3003C */ sw $v1, 0x3c($sp) +/* A474F8 80240598 864300A8 */ lh $v1, 0xa8($s2) +/* A474FC 8024059C 8E2200B0 */ lw $v0, 0xb0($s1) +/* A47500 802405A0 AE20008C */ sw $zero, 0x8c($s1) +/* A47504 802405A4 A22000B5 */ sb $zero, 0xb5($s1) +/* A47508 802405A8 34420008 */ ori $v0, $v0, 8 +/* A4750C 802405AC AE230084 */ sw $v1, 0x84($s1) +/* A47510 802405B0 08090172 */ j .L802405C8 +/* A47514 802405B4 AE2200B0 */ sw $v0, 0xb0($s1) +.L802405B8: +/* A47518 802405B8 8E2200B0 */ lw $v0, 0xb0($s1) +/* A4751C 802405BC 30420004 */ andi $v0, $v0, 4 +/* A47520 802405C0 10400047 */ beqz $v0, .L802406E0 +/* A47524 802405C4 00000000 */ nop +.L802405C8: +/* A47528 802405C8 AE600070 */ sw $zero, 0x70($s3) +/* A4752C 802405CC A640008E */ sh $zero, 0x8e($s2) +/* A47530 802405D0 8E2300CC */ lw $v1, 0xcc($s1) +/* A47534 802405D4 2404F7FF */ addiu $a0, $zero, -0x801 +/* A47538 802405D8 A2200007 */ sb $zero, 7($s1) +/* A4753C 802405DC 8E420000 */ lw $v0, ($s2) +/* A47540 802405E0 8C630000 */ lw $v1, ($v1) +/* A47544 802405E4 00441024 */ and $v0, $v0, $a0 +/* A47548 802405E8 AE420000 */ sw $v0, ($s2) +/* A4754C 802405EC AE430028 */ sw $v1, 0x28($s2) +/* A47550 802405F0 96220086 */ lhu $v0, 0x86($s1) +/* A47554 802405F4 A64200A8 */ sh $v0, 0xa8($s2) +/* A47558 802405F8 8E2200D0 */ lw $v0, 0xd0($s1) +/* A4755C 802405FC AE200090 */ sw $zero, 0x90($s1) +/* A47560 80240600 8C420034 */ lw $v0, 0x34($v0) +/* A47564 80240604 14400006 */ bnez $v0, .L80240620 +/* A47568 80240608 2403FDFF */ addiu $v1, $zero, -0x201 +/* A4756C 8024060C 8E420000 */ lw $v0, ($s2) +/* A47570 80240610 2403FFF7 */ addiu $v1, $zero, -9 +/* A47574 80240614 34420200 */ ori $v0, $v0, 0x200 +/* A47578 80240618 0809018B */ j .L8024062C +/* A4757C 8024061C 00431024 */ and $v0, $v0, $v1 +.L80240620: +/* A47580 80240620 8E420000 */ lw $v0, ($s2) +/* A47584 80240624 00431024 */ and $v0, $v0, $v1 +/* A47588 80240628 34420008 */ ori $v0, $v0, 8 +.L8024062C: +/* A4758C 8024062C AE420000 */ sw $v0, ($s2) +/* A47590 80240630 8E2200B0 */ lw $v0, 0xb0($s1) +/* A47594 80240634 30420004 */ andi $v0, $v0, 4 +/* A47598 80240638 1040001E */ beqz $v0, .L802406B4 +/* A4759C 8024063C 24040002 */ addiu $a0, $zero, 2 +/* A475A0 80240640 0240282D */ daddu $a1, $s2, $zero +/* A475A4 80240644 0000302D */ daddu $a2, $zero, $zero +/* A475A8 80240648 24020063 */ addiu $v0, $zero, 0x63 +/* A475AC 8024064C AE620070 */ sw $v0, 0x70($s3) +/* A475B0 80240650 AE600074 */ sw $zero, 0x74($s3) +/* A475B4 80240654 864300A8 */ lh $v1, 0xa8($s2) +/* A475B8 80240658 3C013F80 */ lui $at, 0x3f80 +/* A475BC 8024065C 44810000 */ mtc1 $at, $f0 +/* A475C0 80240660 3C014000 */ lui $at, 0x4000 +/* A475C4 80240664 44811000 */ mtc1 $at, $f2 +/* A475C8 80240668 3C01C1A0 */ lui $at, 0xc1a0 +/* A475CC 8024066C 44812000 */ mtc1 $at, $f4 +/* A475D0 80240670 24020028 */ addiu $v0, $zero, 0x28 +/* A475D4 80240674 AFA2001C */ sw $v0, 0x1c($sp) +/* A475D8 80240678 44833000 */ mtc1 $v1, $f6 +/* A475DC 8024067C 00000000 */ nop +/* A475E0 80240680 468031A0 */ cvt.s.w $f6, $f6 +/* A475E4 80240684 44073000 */ mfc1 $a3, $f6 +/* A475E8 80240688 27A20048 */ addiu $v0, $sp, 0x48 +/* A475EC 8024068C AFA20020 */ sw $v0, 0x20($sp) +/* A475F0 80240690 E7A00010 */ swc1 $f0, 0x10($sp) +/* A475F4 80240694 E7A20014 */ swc1 $f2, 0x14($sp) +/* A475F8 80240698 0C01BFA4 */ jal fx_emote +/* A475FC 8024069C E7A40018 */ swc1 $f4, 0x18($sp) +/* A47600 802406A0 8E2200B0 */ lw $v0, 0xb0($s1) +/* A47604 802406A4 2403FFFB */ addiu $v1, $zero, -5 +/* A47608 802406A8 00431024 */ and $v0, $v0, $v1 +/* A4760C 802406AC 080901B8 */ j .L802406E0 +/* A47610 802406B0 AE2200B0 */ sw $v0, 0xb0($s1) +.L802406B4: +/* A47614 802406B4 8E220000 */ lw $v0, ($s1) +/* A47618 802406B8 3C034000 */ lui $v1, 0x4000 +/* A4761C 802406BC 00431024 */ and $v0, $v0, $v1 +/* A47620 802406C0 10400007 */ beqz $v0, .L802406E0 +/* A47624 802406C4 3C03BFFF */ lui $v1, 0xbfff +/* A47628 802406C8 2402000C */ addiu $v0, $zero, 0xc +/* A4762C 802406CC AE620070 */ sw $v0, 0x70($s3) +/* A47630 802406D0 8E220000 */ lw $v0, ($s1) +/* A47634 802406D4 3463FFFF */ ori $v1, $v1, 0xffff +/* A47638 802406D8 00431024 */ and $v0, $v0, $v1 +/* A4763C 802406DC AE220000 */ sw $v0, ($s1) +.L802406E0: +/* A47640 802406E0 8E220090 */ lw $v0, 0x90($s1) +/* A47644 802406E4 1840000C */ blez $v0, .L80240718 +/* A47648 802406E8 2442FFFF */ addiu $v0, $v0, -1 +/* A4764C 802406EC 14400087 */ bnez $v0, .L8024090C +/* A47650 802406F0 AE220090 */ sw $v0, 0x90($s1) +/* A47654 802406F4 3C03FFAA */ lui $v1, 0xffaa +/* A47658 802406F8 8E420028 */ lw $v0, 0x28($s2) +/* A4765C 802406FC 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* A47660 80240700 00431021 */ addu $v0, $v0, $v1 +/* A47664 80240704 2C420002 */ sltiu $v0, $v0, 2 +/* A47668 80240708 10400003 */ beqz $v0, .L80240718 +/* A4766C 8024070C 3C020055 */ lui $v0, 0x55 +/* A47670 80240710 3442000C */ ori $v0, $v0, 0xc +/* A47674 80240714 AE420028 */ sw $v0, 0x28($s2) +.L80240718: +/* A47678 80240718 8E630070 */ lw $v1, 0x70($s3) +/* A4767C 8024071C 2402000C */ addiu $v0, $zero, 0xc +/* A47680 80240720 10620048 */ beq $v1, $v0, .L80240844 +/* A47684 80240724 2862000D */ slti $v0, $v1, 0xd +/* A47688 80240728 1040000F */ beqz $v0, .L80240768 +/* A4768C 8024072C 24100001 */ addiu $s0, $zero, 1 +/* A47690 80240730 1070001E */ beq $v1, $s0, .L802407AC +/* A47694 80240734 28620002 */ slti $v0, $v1, 2 +/* A47698 80240738 10400005 */ beqz $v0, .L80240750 +/* A4769C 8024073C 24020002 */ addiu $v0, $zero, 2 +/* A476A0 80240740 10600015 */ beqz $v1, .L80240798 +/* A476A4 80240744 0260202D */ daddu $a0, $s3, $zero +/* A476A8 80240748 08090228 */ j .L802408A0 +/* A476AC 8024074C 00000000 */ nop +.L80240750: +/* A476B0 80240750 1062001C */ beq $v1, $v0, .L802407C4 +/* A476B4 80240754 24020003 */ addiu $v0, $zero, 3 +/* A476B8 80240758 10620035 */ beq $v1, $v0, .L80240830 +/* A476BC 8024075C 0260202D */ daddu $a0, $s3, $zero +/* A476C0 80240760 08090228 */ j .L802408A0 +/* A476C4 80240764 00000000 */ nop +.L80240768: +/* A476C8 80240768 2402000E */ addiu $v0, $zero, 0xe +/* A476CC 8024076C 1062003F */ beq $v1, $v0, .L8024086C +/* A476D0 80240770 0062102A */ slt $v0, $v1, $v0 +/* A476D4 80240774 14400038 */ bnez $v0, .L80240858 +/* A476D8 80240778 0260202D */ daddu $a0, $s3, $zero +/* A476DC 8024077C 2402000F */ addiu $v0, $zero, 0xf +/* A476E0 80240780 10620040 */ beq $v1, $v0, .L80240884 +/* A476E4 80240784 24020063 */ addiu $v0, $zero, 0x63 +/* A476E8 80240788 10620043 */ beq $v1, $v0, .L80240898 +/* A476EC 8024078C 00000000 */ nop +/* A476F0 80240790 08090228 */ j .L802408A0 +/* A476F4 80240794 00000000 */ nop +.L80240798: +/* A476F8 80240798 0280282D */ daddu $a1, $s4, $zero +/* A476FC 8024079C 0C012568 */ jal func_800495A0 +/* A47700 802407A0 02A0302D */ daddu $a2, $s5, $zero +/* A47704 802407A4 96220086 */ lhu $v0, 0x86($s1) +/* A47708 802407A8 A64200A8 */ sh $v0, 0xa8($s2) +.L802407AC: +/* A4770C 802407AC 0260202D */ daddu $a0, $s3, $zero +/* A47710 802407B0 0280282D */ daddu $a1, $s4, $zero +/* A47714 802407B4 0C0125AE */ jal func_800496B8 +/* A47718 802407B8 02A0302D */ daddu $a2, $s5, $zero +/* A4771C 802407BC 08090228 */ j .L802408A0 +/* A47720 802407C0 00000000 */ nop +.L802407C4: +/* A47724 802407C4 0260202D */ daddu $a0, $s3, $zero +/* A47728 802407C8 0280282D */ daddu $a1, $s4, $zero +/* A4772C 802407CC 0C0126D1 */ jal func_80049B44 +/* A47730 802407D0 02A0302D */ daddu $a2, $s5, $zero +/* A47734 802407D4 8E230088 */ lw $v1, 0x88($s1) +/* A47738 802407D8 24020006 */ addiu $v0, $zero, 6 +/* A4773C 802407DC 14620014 */ bne $v1, $v0, .L80240830 +/* A47740 802407E0 0260202D */ daddu $a0, $s3, $zero +/* A47744 802407E4 0C00A67F */ jal rand_int +/* A47748 802407E8 24040064 */ addiu $a0, $zero, 0x64 +/* A4774C 802407EC 28420021 */ slti $v0, $v0, 0x21 +/* A47750 802407F0 5040000F */ beql $v0, $zero, .L80240830 +/* A47754 802407F4 0260202D */ daddu $a0, $s3, $zero +/* A47758 802407F8 8E22008C */ lw $v0, 0x8c($s1) +/* A4775C 802407FC 10400005 */ beqz $v0, .L80240814 +/* A47760 80240800 3C020055 */ lui $v0, 0x55 +/* A47764 80240804 3442002F */ ori $v0, $v0, 0x2f +/* A47768 80240808 AE20008C */ sw $zero, 0x8c($s1) +/* A4776C 8024080C 08090208 */ j .L80240820 +/* A47770 80240810 A22000B5 */ sb $zero, 0xb5($s1) +.L80240814: +/* A47774 80240814 3442002E */ ori $v0, $v0, 0x2e +/* A47778 80240818 AE30008C */ sw $s0, 0x8c($s1) +/* A4777C 8024081C A23000B5 */ sb $s0, 0xb5($s1) +.L80240820: +/* A47780 80240820 AE420028 */ sw $v0, 0x28($s2) +/* A47784 80240824 24020007 */ addiu $v0, $zero, 7 +/* A47788 80240828 08090243 */ j .L8024090C +/* A4778C 8024082C AE220090 */ sw $v0, 0x90($s1) +.L80240830: +/* A47790 80240830 0280282D */ daddu $a1, $s4, $zero +/* A47794 80240834 0C012701 */ jal func_80049C04 +/* A47798 80240838 02A0302D */ daddu $a2, $s5, $zero +/* A4779C 8024083C 08090228 */ j .L802408A0 +/* A477A0 80240840 00000000 */ nop +.L80240844: +/* A477A4 80240844 0260202D */ daddu $a0, $s3, $zero +/* A477A8 80240848 0280282D */ daddu $a1, $s4, $zero +/* A477AC 8024084C 0C090058 */ jal func_80240160_A470C0 +/* A477B0 80240850 02A0302D */ daddu $a2, $s5, $zero +/* A477B4 80240854 0260202D */ daddu $a0, $s3, $zero +.L80240858: +/* A477B8 80240858 0280282D */ daddu $a1, $s4, $zero +/* A477BC 8024085C 0C090077 */ jal func_802401DC_A4713C +/* A477C0 80240860 02A0302D */ daddu $a2, $s5, $zero +/* A477C4 80240864 08090228 */ j .L802408A0 +/* A477C8 80240868 00000000 */ nop +.L8024086C: +/* A477CC 8024086C 0260202D */ daddu $a0, $s3, $zero +/* A477D0 80240870 0280282D */ daddu $a1, $s4, $zero +/* A477D4 80240874 0C0900C4 */ jal func_80240310_A47270 +/* A477D8 80240878 02A0302D */ daddu $a2, $s5, $zero +/* A477DC 8024087C 08090228 */ j .L802408A0 +/* A477E0 80240880 00000000 */ nop +.L80240884: +/* A477E4 80240884 0280282D */ daddu $a1, $s4, $zero +/* A477E8 80240888 0C09011D */ jal func_80240474_A473D4 +/* A477EC 8024088C 02A0302D */ daddu $a2, $s5, $zero +/* A477F0 80240890 08090228 */ j .L802408A0 +/* A477F4 80240894 00000000 */ nop +.L80240898: +/* A477F8 80240898 0C0129CF */ jal func_8004A73C +/* A477FC 8024089C 0260202D */ daddu $a0, $s3, $zero +.L802408A0: +/* A47800 802408A0 8E230088 */ lw $v1, 0x88($s1) +/* A47804 802408A4 24020006 */ addiu $v0, $zero, 6 +/* A47808 802408A8 14620019 */ bne $v1, $v0, .L80240910 +/* A4780C 802408AC 0000102D */ daddu $v0, $zero, $zero +/* A47810 802408B0 8E22008C */ lw $v0, 0x8c($s1) +/* A47814 802408B4 10400003 */ beqz $v0, .L802408C4 +/* A47818 802408B8 24020001 */ addiu $v0, $zero, 1 +/* A4781C 802408BC 08090232 */ j .L802408C8 +/* A47820 802408C0 A22200B5 */ sb $v0, 0xb5($s1) +.L802408C4: +/* A47824 802408C4 A22000B5 */ sb $zero, 0xb5($s1) +.L802408C8: +/* A47828 802408C8 8E22008C */ lw $v0, 0x8c($s1) +/* A4782C 802408CC 1040000F */ beqz $v0, .L8024090C +/* A47830 802408D0 3C03FFAA */ lui $v1, 0xffaa +/* A47834 802408D4 8E420028 */ lw $v0, 0x28($s2) +/* A47838 802408D8 3463FFFC */ ori $v1, $v1, 0xfffc +/* A4783C 802408DC 00431821 */ addu $v1, $v0, $v1 +/* A47840 802408E0 2C620015 */ sltiu $v0, $v1, 0x15 +/* A47844 802408E4 10400009 */ beqz $v0, .L8024090C +/* A47848 802408E8 00031080 */ sll $v0, $v1, 2 +/* A4784C 802408EC 3C018024 */ lui $at, 0x8024 +/* A47850 802408F0 00220821 */ addu $at, $at, $v0 +/* A47854 802408F4 8C221608 */ lw $v0, 0x1608($at) +/* A47858 802408F8 00400008 */ jr $v0 +/* A4785C 802408FC 00000000 */ nop +/* A47860 80240900 8E420028 */ lw $v0, 0x28($s2) +/* A47864 80240904 24420001 */ addiu $v0, $v0, 1 +/* A47868 80240908 AE420028 */ sw $v0, 0x28($s2) +.L8024090C: +/* A4786C 8024090C 0000102D */ daddu $v0, $zero, $zero +.L80240910: +/* A47870 80240910 8FBF0068 */ lw $ra, 0x68($sp) +/* A47874 80240914 8FB50064 */ lw $s5, 0x64($sp) +/* A47878 80240918 8FB40060 */ lw $s4, 0x60($sp) +/* A4787C 8024091C 8FB3005C */ lw $s3, 0x5c($sp) +/* A47880 80240920 8FB20058 */ lw $s2, 0x58($sp) +/* A47884 80240924 8FB10054 */ lw $s1, 0x54($sp) +/* A47888 80240928 8FB00050 */ lw $s0, 0x50($sp) +/* A4788C 8024092C 03E00008 */ jr $ra +/* A47890 80240930 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_80240934.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_80240934.s deleted file mode 100644 index 48e602a83a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_80240934.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240934 -/* A47894 80240934 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A47898 80240938 AFBF0010 */ sw $ra, 0x10($sp) -/* A4789C 8024093C 0C00EAD2 */ jal get_npc_safe -/* A478A0 80240940 8C84014C */ lw $a0, 0x14c($a0) -/* A478A4 80240944 0040182D */ daddu $v1, $v0, $zero -/* A478A8 80240948 846200A8 */ lh $v0, 0xa8($v1) -/* A478AC 8024094C C462003C */ lwc1 $f2, 0x3c($v1) -/* A478B0 80240950 906400A9 */ lbu $a0, 0xa9($v1) -/* A478B4 80240954 44820000 */ mtc1 $v0, $f0 -/* A478B8 80240958 00000000 */ nop -/* A478BC 8024095C 46800020 */ cvt.s.w $f0, $f0 -/* A478C0 80240960 46001081 */ sub.s $f2, $f2, $f0 -/* A478C4 80240964 A06400AB */ sb $a0, 0xab($v1) -/* A478C8 80240968 E462003C */ swc1 $f2, 0x3c($v1) -/* A478CC 8024096C 8FBF0010 */ lw $ra, 0x10($sp) -/* A478D0 80240970 24020002 */ addiu $v0, $zero, 2 -/* A478D4 80240974 03E00008 */ jr $ra -/* A478D8 80240978 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_80240934_A47894.s b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_80240934_A47894.s new file mode 100644 index 0000000000..475fccba7a --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_01/A470C0/func_80240934_A47894.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240934_A47894 +/* A47894 80240934 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A47898 80240938 AFBF0010 */ sw $ra, 0x10($sp) +/* A4789C 8024093C 0C00EAD2 */ jal get_npc_safe +/* A478A0 80240940 8C84014C */ lw $a0, 0x14c($a0) +/* A478A4 80240944 0040182D */ daddu $v1, $v0, $zero +/* A478A8 80240948 846200A8 */ lh $v0, 0xa8($v1) +/* A478AC 8024094C C462003C */ lwc1 $f2, 0x3c($v1) +/* A478B0 80240950 906400A9 */ lbu $a0, 0xa9($v1) +/* A478B4 80240954 44820000 */ mtc1 $v0, $f0 +/* A478B8 80240958 00000000 */ nop +/* A478BC 8024095C 46800020 */ cvt.s.w $f0, $f0 +/* A478C0 80240960 46001081 */ sub.s $f2, $f2, $f0 +/* A478C4 80240964 A06400AB */ sb $a0, 0xab($v1) +/* A478C8 80240968 E462003C */ swc1 $f2, 0x3c($v1) +/* A478CC 8024096C 8FBF0010 */ lw $ra, 0x10($sp) +/* A478D0 80240970 24020002 */ addiu $v0, $zero, 2 +/* A478D4 80240974 03E00008 */ jr $ra +/* A478D8 80240978 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s index 01761f7a17..f02fbed3fd 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802404F4_A48AB4.s @@ -232,25 +232,25 @@ glabel func_802404F4_A48AB4 .L80240844: /* A48E04 80240844 0260202D */ daddu $a0, $s3, $zero /* A48E08 80240848 0280282D */ daddu $a1, $s4, $zero -/* A48E0C 8024084C 0C090058 */ jal func_80240160 +/* A48E0C 8024084C 0C090058 */ jal func_80240160_A48720 /* A48E10 80240850 02A0302D */ daddu $a2, $s5, $zero /* A48E14 80240854 0260202D */ daddu $a0, $s3, $zero .L80240858: /* A48E18 80240858 0280282D */ daddu $a1, $s4, $zero -/* A48E1C 8024085C 0C090077 */ jal func_802401DC +/* A48E1C 8024085C 0C090077 */ jal func_802401DC_A4879C /* A48E20 80240860 02A0302D */ daddu $a2, $s5, $zero /* A48E24 80240864 08090228 */ j .L802408A0 /* A48E28 80240868 00000000 */ nop .L8024086C: /* A48E2C 8024086C 0260202D */ daddu $a0, $s3, $zero /* A48E30 80240870 0280282D */ daddu $a1, $s4, $zero -/* A48E34 80240874 0C0900C4 */ jal func_80240310 +/* A48E34 80240874 0C0900C4 */ jal func_80240310_A488D0 /* A48E38 80240878 02A0302D */ daddu $a2, $s5, $zero /* A48E3C 8024087C 08090228 */ j .L802408A0 /* A48E40 80240880 00000000 */ nop .L80240884: /* A48E44 80240884 0280282D */ daddu $a1, $s4, $zero -/* A48E48 80240888 0C09011D */ jal func_80240474 +/* A48E48 80240888 0C09011D */ jal func_80240474_A48A34 /* A48E4C 8024088C 02A0302D */ daddu $a2, $s5, $zero /* A48E50 80240890 08090228 */ j .L802408A0 /* A48E54 80240894 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48.s deleted file mode 100644 index 6438c457e2..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48.s +++ /dev/null @@ -1,123 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A48 -/* A49008 80240A48 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A4900C 80240A4C AFB00018 */ sw $s0, 0x18($sp) -/* A49010 80240A50 AFBF0024 */ sw $ra, 0x24($sp) -/* A49014 80240A54 AFB20020 */ sw $s2, 0x20($sp) -/* A49018 80240A58 AFB1001C */ sw $s1, 0x1c($sp) -/* A4901C 80240A5C F7B60030 */ sdc1 $f22, 0x30($sp) -/* A49020 80240A60 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A49024 80240A64 8C920148 */ lw $s2, 0x148($a0) -/* A49028 80240A68 4485A000 */ mtc1 $a1, $f20 -/* A4902C 80240A6C 86440008 */ lh $a0, 8($s2) -/* A49030 80240A70 4486B000 */ mtc1 $a2, $f22 -/* A49034 80240A74 0C00EABB */ jal get_npc_unsafe -/* A49038 80240A78 00E0802D */ daddu $s0, $a3, $zero -/* A4903C 80240A7C 0200202D */ daddu $a0, $s0, $zero -/* A49040 80240A80 0040882D */ daddu $s1, $v0, $zero -/* A49044 80240A84 4406A000 */ mfc1 $a2, $f20 -/* A49048 80240A88 4407B000 */ mfc1 $a3, $f22 -/* A4904C 80240A8C 3C03800A */ lui $v1, 0x800a -/* A49050 80240A90 8463A634 */ lh $v1, -0x59cc($v1) -/* A49054 80240A94 3C05800B */ lui $a1, %hi(gCameras) -/* A49058 80240A98 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* A4905C 80240A9C AFA00010 */ sw $zero, 0x10($sp) -/* A49060 80240AA0 00031080 */ sll $v0, $v1, 2 -/* A49064 80240AA4 00431021 */ addu $v0, $v0, $v1 -/* A49068 80240AA8 00021080 */ sll $v0, $v0, 2 -/* A4906C 80240AAC 00431023 */ subu $v0, $v0, $v1 -/* A49070 80240AB0 000218C0 */ sll $v1, $v0, 3 -/* A49074 80240AB4 00431021 */ addu $v0, $v0, $v1 -/* A49078 80240AB8 000210C0 */ sll $v0, $v0, 3 -/* A4907C 80240ABC 00458021 */ addu $s0, $v0, $a1 -/* A49080 80240AC0 0C01242D */ jal func_800490B4 -/* A49084 80240AC4 0240282D */ daddu $a1, $s2, $zero -/* A49088 80240AC8 1040004B */ beqz $v0, .L80240BF8 -/* A4908C 80240ACC 2402FFFF */ addiu $v0, $zero, -1 -/* A49090 80240AD0 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A49094 80240AD4 C62E000C */ lwc1 $f14, 0xc($s1) -/* A49098 80240AD8 3C014387 */ lui $at, 0x4387 -/* A4909C 80240ADC 4481A000 */ mtc1 $at, $f20 -/* A490A0 80240AE0 0C00A70A */ jal get_clamped_angle_diff -/* A490A4 80240AE4 00000000 */ nop -/* A490A8 80240AE8 0C00A6C9 */ jal clamp_angle -/* A490AC 80240AEC 46000306 */ mov.s $f12, $f0 -/* A490B0 80240AF0 3C018024 */ lui $at, 0x8024 -/* A490B4 80240AF4 D42238E0 */ ldc1 $f2, 0x38e0($at) -/* A490B8 80240AF8 46000021 */ cvt.d.s $f0, $f0 -/* A490BC 80240AFC 4622003C */ c.lt.d $f0, $f2 -/* A490C0 80240B00 00000000 */ nop -/* A490C4 80240B04 45000003 */ bc1f .L80240B14 -/* A490C8 80240B08 00000000 */ nop -/* A490CC 80240B0C 3C0142B4 */ lui $at, 0x42b4 -/* A490D0 80240B10 4481A000 */ mtc1 $at, $f20 -.L80240B14: -/* A490D4 80240B14 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* A490D8 80240B18 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* A490DC 80240B1C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A490E0 80240B20 8E020000 */ lw $v0, ($s0) -/* A490E4 80240B24 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A490E8 80240B28 8C460028 */ lw $a2, 0x28($v0) -/* A490EC 80240B2C 0C00A720 */ jal atan2 -/* A490F0 80240B30 8C470030 */ lw $a3, 0x30($v0) -/* A490F4 80240B34 4600A306 */ mov.s $f12, $f20 -/* A490F8 80240B38 0C00A70A */ jal get_clamped_angle_diff -/* A490FC 80240B3C 46000386 */ mov.s $f14, $f0 -/* A49100 80240B40 46000005 */ abs.s $f0, $f0 -/* A49104 80240B44 3C018024 */ lui $at, 0x8024 -/* A49108 80240B48 D42238E8 */ ldc1 $f2, 0x38e8($at) -/* A4910C 80240B4C 46000021 */ cvt.d.s $f0, $f0 -/* A49110 80240B50 4620103C */ c.lt.d $f2, $f0 -/* A49114 80240B54 00000000 */ nop -/* A49118 80240B58 45010027 */ bc1t .L80240BF8 -/* A4911C 80240B5C 2402FFFF */ addiu $v0, $zero, -1 -/* A49120 80240B60 8E020000 */ lw $v0, ($s0) -/* A49124 80240B64 C6200038 */ lwc1 $f0, 0x38($s1) -/* A49128 80240B68 C4420028 */ lwc1 $f2, 0x28($v0) -/* A4912C 80240B6C 44806000 */ mtc1 $zero, $f12 -/* A49130 80240B70 46020001 */ sub.s $f0, $f0, $f2 -/* A49134 80240B74 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A49138 80240B78 8C47002C */ lw $a3, 0x2c($v0) -/* A4913C 80240B7C 46000005 */ abs.s $f0, $f0 -/* A49140 80240B80 44060000 */ mfc1 $a2, $f0 -/* A49144 80240B84 0C00A720 */ jal atan2 -/* A49148 80240B88 00000000 */ nop -/* A4914C 80240B8C 3C018024 */ lui $at, 0x8024 -/* A49150 80240B90 D42238F0 */ ldc1 $f2, 0x38f0($at) -/* A49154 80240B94 46000021 */ cvt.d.s $f0, $f0 -/* A49158 80240B98 46220001 */ sub.d $f0, $f0, $f2 -/* A4915C 80240B9C 3C018024 */ lui $at, 0x8024 -/* A49160 80240BA0 D42238F8 */ ldc1 $f2, 0x38f8($at) -/* A49164 80240BA4 46200020 */ cvt.s.d $f0, $f0 -/* A49168 80240BA8 46000005 */ abs.s $f0, $f0 -/* A4916C 80240BAC 46000021 */ cvt.d.s $f0, $f0 -/* A49170 80240BB0 4620103C */ c.lt.d $f2, $f0 -/* A49174 80240BB4 00000000 */ nop -/* A49178 80240BB8 4501000F */ bc1t .L80240BF8 -/* A4917C 80240BBC 2402FFFF */ addiu $v0, $zero, -1 -/* A49180 80240BC0 3C038011 */ lui $v1, 0x8011 -/* A49184 80240BC4 8063EBB3 */ lb $v1, -0x144d($v1) -/* A49188 80240BC8 24020009 */ addiu $v0, $zero, 9 -/* A4918C 80240BCC 10620009 */ beq $v1, $v0, .L80240BF4 -/* A49190 80240BD0 24020007 */ addiu $v0, $zero, 7 -/* A49194 80240BD4 50620008 */ beql $v1, $v0, .L80240BF8 -/* A49198 80240BD8 2402FFFF */ addiu $v0, $zero, -1 -/* A4919C 80240BDC 86440008 */ lh $a0, 8($s2) -/* A491A0 80240BE0 0C00FB3A */ jal get_enemy -/* A491A4 80240BE4 24840001 */ addiu $a0, $a0, 1 -/* A491A8 80240BE8 8C43006C */ lw $v1, 0x6c($v0) -/* A491AC 80240BEC 10600002 */ beqz $v1, .L80240BF8 -/* A491B0 80240BF0 24020001 */ addiu $v0, $zero, 1 -.L80240BF4: -/* A491B4 80240BF4 2402FFFF */ addiu $v0, $zero, -1 -.L80240BF8: -/* A491B8 80240BF8 8FBF0024 */ lw $ra, 0x24($sp) -/* A491BC 80240BFC 8FB20020 */ lw $s2, 0x20($sp) -/* A491C0 80240C00 8FB1001C */ lw $s1, 0x1c($sp) -/* A491C4 80240C04 8FB00018 */ lw $s0, 0x18($sp) -/* A491C8 80240C08 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A491CC 80240C0C D7B40028 */ ldc1 $f20, 0x28($sp) -/* A491D0 80240C10 03E00008 */ jr $ra -/* A491D4 80240C14 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s new file mode 100644 index 0000000000..f71763faca --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240A48_A49008.s @@ -0,0 +1,123 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A48_A49008 +/* A49008 80240A48 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A4900C 80240A4C AFB00018 */ sw $s0, 0x18($sp) +/* A49010 80240A50 AFBF0024 */ sw $ra, 0x24($sp) +/* A49014 80240A54 AFB20020 */ sw $s2, 0x20($sp) +/* A49018 80240A58 AFB1001C */ sw $s1, 0x1c($sp) +/* A4901C 80240A5C F7B60030 */ sdc1 $f22, 0x30($sp) +/* A49020 80240A60 F7B40028 */ sdc1 $f20, 0x28($sp) +/* A49024 80240A64 8C920148 */ lw $s2, 0x148($a0) +/* A49028 80240A68 4485A000 */ mtc1 $a1, $f20 +/* A4902C 80240A6C 86440008 */ lh $a0, 8($s2) +/* A49030 80240A70 4486B000 */ mtc1 $a2, $f22 +/* A49034 80240A74 0C00EABB */ jal get_npc_unsafe +/* A49038 80240A78 00E0802D */ daddu $s0, $a3, $zero +/* A4903C 80240A7C 0200202D */ daddu $a0, $s0, $zero +/* A49040 80240A80 0040882D */ daddu $s1, $v0, $zero +/* A49044 80240A84 4406A000 */ mfc1 $a2, $f20 +/* A49048 80240A88 4407B000 */ mfc1 $a3, $f22 +/* A4904C 80240A8C 3C03800A */ lui $v1, 0x800a +/* A49050 80240A90 8463A634 */ lh $v1, -0x59cc($v1) +/* A49054 80240A94 3C05800B */ lui $a1, %hi(gCameras) +/* A49058 80240A98 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* A4905C 80240A9C AFA00010 */ sw $zero, 0x10($sp) +/* A49060 80240AA0 00031080 */ sll $v0, $v1, 2 +/* A49064 80240AA4 00431021 */ addu $v0, $v0, $v1 +/* A49068 80240AA8 00021080 */ sll $v0, $v0, 2 +/* A4906C 80240AAC 00431023 */ subu $v0, $v0, $v1 +/* A49070 80240AB0 000218C0 */ sll $v1, $v0, 3 +/* A49074 80240AB4 00431021 */ addu $v0, $v0, $v1 +/* A49078 80240AB8 000210C0 */ sll $v0, $v0, 3 +/* A4907C 80240ABC 00458021 */ addu $s0, $v0, $a1 +/* A49080 80240AC0 0C01242D */ jal func_800490B4 +/* A49084 80240AC4 0240282D */ daddu $a1, $s2, $zero +/* A49088 80240AC8 1040004B */ beqz $v0, .L80240BF8 +/* A4908C 80240ACC 2402FFFF */ addiu $v0, $zero, -1 +/* A49090 80240AD0 C60C006C */ lwc1 $f12, 0x6c($s0) +/* A49094 80240AD4 C62E000C */ lwc1 $f14, 0xc($s1) +/* A49098 80240AD8 3C014387 */ lui $at, 0x4387 +/* A4909C 80240ADC 4481A000 */ mtc1 $at, $f20 +/* A490A0 80240AE0 0C00A70A */ jal get_clamped_angle_diff +/* A490A4 80240AE4 00000000 */ nop +/* A490A8 80240AE8 0C00A6C9 */ jal clamp_angle +/* A490AC 80240AEC 46000306 */ mov.s $f12, $f0 +/* A490B0 80240AF0 3C018024 */ lui $at, 0x8024 +/* A490B4 80240AF4 D42238E0 */ ldc1 $f2, 0x38e0($at) +/* A490B8 80240AF8 46000021 */ cvt.d.s $f0, $f0 +/* A490BC 80240AFC 4622003C */ c.lt.d $f0, $f2 +/* A490C0 80240B00 00000000 */ nop +/* A490C4 80240B04 45000003 */ bc1f .L80240B14 +/* A490C8 80240B08 00000000 */ nop +/* A490CC 80240B0C 3C0142B4 */ lui $at, 0x42b4 +/* A490D0 80240B10 4481A000 */ mtc1 $at, $f20 +.L80240B14: +/* A490D4 80240B14 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) +/* A490D8 80240B18 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) +/* A490DC 80240B1C C62C0038 */ lwc1 $f12, 0x38($s1) +/* A490E0 80240B20 8E020000 */ lw $v0, ($s0) +/* A490E4 80240B24 C62E0040 */ lwc1 $f14, 0x40($s1) +/* A490E8 80240B28 8C460028 */ lw $a2, 0x28($v0) +/* A490EC 80240B2C 0C00A720 */ jal atan2 +/* A490F0 80240B30 8C470030 */ lw $a3, 0x30($v0) +/* A490F4 80240B34 4600A306 */ mov.s $f12, $f20 +/* A490F8 80240B38 0C00A70A */ jal get_clamped_angle_diff +/* A490FC 80240B3C 46000386 */ mov.s $f14, $f0 +/* A49100 80240B40 46000005 */ abs.s $f0, $f0 +/* A49104 80240B44 3C018024 */ lui $at, 0x8024 +/* A49108 80240B48 D42238E8 */ ldc1 $f2, 0x38e8($at) +/* A4910C 80240B4C 46000021 */ cvt.d.s $f0, $f0 +/* A49110 80240B50 4620103C */ c.lt.d $f2, $f0 +/* A49114 80240B54 00000000 */ nop +/* A49118 80240B58 45010027 */ bc1t .L80240BF8 +/* A4911C 80240B5C 2402FFFF */ addiu $v0, $zero, -1 +/* A49120 80240B60 8E020000 */ lw $v0, ($s0) +/* A49124 80240B64 C6200038 */ lwc1 $f0, 0x38($s1) +/* A49128 80240B68 C4420028 */ lwc1 $f2, 0x28($v0) +/* A4912C 80240B6C 44806000 */ mtc1 $zero, $f12 +/* A49130 80240B70 46020001 */ sub.s $f0, $f0, $f2 +/* A49134 80240B74 C62E003C */ lwc1 $f14, 0x3c($s1) +/* A49138 80240B78 8C47002C */ lw $a3, 0x2c($v0) +/* A4913C 80240B7C 46000005 */ abs.s $f0, $f0 +/* A49140 80240B80 44060000 */ mfc1 $a2, $f0 +/* A49144 80240B84 0C00A720 */ jal atan2 +/* A49148 80240B88 00000000 */ nop +/* A4914C 80240B8C 3C018024 */ lui $at, 0x8024 +/* A49150 80240B90 D42238F0 */ ldc1 $f2, 0x38f0($at) +/* A49154 80240B94 46000021 */ cvt.d.s $f0, $f0 +/* A49158 80240B98 46220001 */ sub.d $f0, $f0, $f2 +/* A4915C 80240B9C 3C018024 */ lui $at, 0x8024 +/* A49160 80240BA0 D42238F8 */ ldc1 $f2, 0x38f8($at) +/* A49164 80240BA4 46200020 */ cvt.s.d $f0, $f0 +/* A49168 80240BA8 46000005 */ abs.s $f0, $f0 +/* A4916C 80240BAC 46000021 */ cvt.d.s $f0, $f0 +/* A49170 80240BB0 4620103C */ c.lt.d $f2, $f0 +/* A49174 80240BB4 00000000 */ nop +/* A49178 80240BB8 4501000F */ bc1t .L80240BF8 +/* A4917C 80240BBC 2402FFFF */ addiu $v0, $zero, -1 +/* A49180 80240BC0 3C038011 */ lui $v1, 0x8011 +/* A49184 80240BC4 8063EBB3 */ lb $v1, -0x144d($v1) +/* A49188 80240BC8 24020009 */ addiu $v0, $zero, 9 +/* A4918C 80240BCC 10620009 */ beq $v1, $v0, .L80240BF4 +/* A49190 80240BD0 24020007 */ addiu $v0, $zero, 7 +/* A49194 80240BD4 50620008 */ beql $v1, $v0, .L80240BF8 +/* A49198 80240BD8 2402FFFF */ addiu $v0, $zero, -1 +/* A4919C 80240BDC 86440008 */ lh $a0, 8($s2) +/* A491A0 80240BE0 0C00FB3A */ jal get_enemy +/* A491A4 80240BE4 24840001 */ addiu $a0, $a0, 1 +/* A491A8 80240BE8 8C43006C */ lw $v1, 0x6c($v0) +/* A491AC 80240BEC 10600002 */ beqz $v1, .L80240BF8 +/* A491B0 80240BF0 24020001 */ addiu $v0, $zero, 1 +.L80240BF4: +/* A491B4 80240BF4 2402FFFF */ addiu $v0, $zero, -1 +.L80240BF8: +/* A491B8 80240BF8 8FBF0024 */ lw $ra, 0x24($sp) +/* A491BC 80240BFC 8FB20020 */ lw $s2, 0x20($sp) +/* A491C0 80240C00 8FB1001C */ lw $s1, 0x1c($sp) +/* A491C4 80240C04 8FB00018 */ lw $s0, 0x18($sp) +/* A491C8 80240C08 D7B60030 */ ldc1 $f22, 0x30($sp) +/* A491CC 80240C0C D7B40028 */ ldc1 $f20, 0x28($sp) +/* A491D0 80240C10 03E00008 */ jr $ra +/* A491D4 80240C14 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18.s deleted file mode 100644 index b865afb28b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18.s +++ /dev/null @@ -1,336 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C18 -/* A491D8 80240C18 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A491DC 80240C1C AFB60378 */ sw $s6, 0x378($sp) -/* A491E0 80240C20 0080B02D */ daddu $s6, $a0, $zero -/* A491E4 80240C24 AFBF037C */ sw $ra, 0x37c($sp) -/* A491E8 80240C28 AFB50374 */ sw $s5, 0x374($sp) -/* A491EC 80240C2C AFB40370 */ sw $s4, 0x370($sp) -/* A491F0 80240C30 AFB3036C */ sw $s3, 0x36c($sp) -/* A491F4 80240C34 AFB20368 */ sw $s2, 0x368($sp) -/* A491F8 80240C38 AFB10364 */ sw $s1, 0x364($sp) -/* A491FC 80240C3C AFB00360 */ sw $s0, 0x360($sp) -/* A49200 80240C40 F7B40380 */ sdc1 $f20, 0x380($sp) -/* A49204 80240C44 8ED20148 */ lw $s2, 0x148($s6) -/* A49208 80240C48 86440008 */ lh $a0, 8($s2) -/* A4920C 80240C4C 0C00EABB */ jal get_npc_unsafe -/* A49210 80240C50 00A0802D */ daddu $s0, $a1, $zero -/* A49214 80240C54 86440008 */ lh $a0, 8($s2) -/* A49218 80240C58 0040882D */ daddu $s1, $v0, $zero -/* A4921C 80240C5C 0C00FB3A */ jal get_enemy -/* A49220 80240C60 2484FFFF */ addiu $a0, $a0, -1 -/* A49224 80240C64 84440008 */ lh $a0, 8($v0) -/* A49228 80240C68 0C00EABB */ jal get_npc_unsafe -/* A4922C 80240C6C 0000A82D */ daddu $s5, $zero, $zero -/* A49230 80240C70 27B30020 */ addiu $s3, $sp, 0x20 -/* A49234 80240C74 16000005 */ bnez $s0, .L80240C8C -/* A49238 80240C78 0040A02D */ daddu $s4, $v0, $zero -/* A4923C 80240C7C 8E4200B0 */ lw $v0, 0xb0($s2) -/* A49240 80240C80 30420004 */ andi $v0, $v0, 4 -/* A49244 80240C84 10400018 */ beqz $v0, .L80240CE8 -/* A49248 80240C88 00000000 */ nop -.L80240C8C: -/* A4924C 80240C8C 3C030024 */ lui $v1, 0x24 -/* A49250 80240C90 34630102 */ ori $v1, $v1, 0x102 -/* A49254 80240C94 3C041620 */ lui $a0, 0x1620 -/* A49258 80240C98 AEC00070 */ sw $zero, 0x70($s6) -/* A4925C 80240C9C 8E220000 */ lw $v0, ($s1) -/* A49260 80240CA0 34840040 */ ori $a0, $a0, 0x40 -/* A49264 80240CA4 A620008E */ sh $zero, 0x8e($s1) -/* A49268 80240CA8 00431025 */ or $v0, $v0, $v1 -/* A4926C 80240CAC AE220000 */ sw $v0, ($s1) -/* A49270 80240CB0 8E420000 */ lw $v0, ($s2) -/* A49274 80240CB4 3C013ECC */ lui $at, 0x3ecc -/* A49278 80240CB8 3421CCCD */ ori $at, $at, 0xcccd -/* A4927C 80240CBC 44810000 */ mtc1 $at, $f0 -/* A49280 80240CC0 00441025 */ or $v0, $v0, $a0 -/* A49284 80240CC4 AE420000 */ sw $v0, ($s2) -/* A49288 80240CC8 E6200054 */ swc1 $f0, 0x54($s1) -/* A4928C 80240CCC E6200058 */ swc1 $f0, 0x58($s1) -/* A49290 80240CD0 8E4300B0 */ lw $v1, 0xb0($s2) -/* A49294 80240CD4 30620004 */ andi $v0, $v1, 4 -/* A49298 80240CD8 10400003 */ beqz $v0, .L80240CE8 -/* A4929C 80240CDC 2402FFFB */ addiu $v0, $zero, -5 -/* A492A0 80240CE0 00621024 */ and $v0, $v1, $v0 -/* A492A4 80240CE4 AE4200B0 */ sw $v0, 0xb0($s2) -.L80240CE8: -/* A492A8 80240CE8 8EC30070 */ lw $v1, 0x70($s6) -/* A492AC 80240CEC 2C620005 */ sltiu $v0, $v1, 5 -/* A492B0 80240CF0 10400101 */ beqz $v0, .L802410F8 -/* A492B4 80240CF4 00031080 */ sll $v0, $v1, 2 -/* A492B8 80240CF8 3C018024 */ lui $at, 0x8024 -/* A492BC 80240CFC 00220821 */ addu $at, $at, $v0 -/* A492C0 80240D00 8C223900 */ lw $v0, 0x3900($at) -/* A492C4 80240D04 00400008 */ jr $v0 -/* A492C8 80240D08 00000000 */ nop -/* A492CC 80240D0C 3C01C47A */ lui $at, 0xc47a -/* A492D0 80240D10 44810000 */ mtc1 $at, $f0 -/* A492D4 80240D14 24020014 */ addiu $v0, $zero, 0x14 -/* A492D8 80240D18 AE400078 */ sw $zero, 0x78($s2) -/* A492DC 80240D1C A62200A6 */ sh $v0, 0xa6($s1) -/* A492E0 80240D20 A62200A8 */ sh $v0, 0xa8($s1) -/* A492E4 80240D24 24020001 */ addiu $v0, $zero, 1 -/* A492E8 80240D28 AE200038 */ sw $zero, 0x38($s1) -/* A492EC 80240D2C AE200040 */ sw $zero, 0x40($s1) -/* A492F0 80240D30 E620003C */ swc1 $f0, 0x3c($s1) -/* A492F4 80240D34 AE40006C */ sw $zero, 0x6c($s2) -/* A492F8 80240D38 AEC20070 */ sw $v0, 0x70($s6) -/* A492FC 80240D3C 8E50006C */ lw $s0, 0x6c($s2) -/* A49300 80240D40 24020001 */ addiu $v0, $zero, 1 -/* A49304 80240D44 160200EC */ bne $s0, $v0, .L802410F8 -/* A49308 80240D48 24150002 */ addiu $s5, $zero, 2 -/* A4930C 80240D4C AE55006C */ sw $s5, 0x6c($s2) -/* A49310 80240D50 C6800038 */ lwc1 $f0, 0x38($s4) -/* A49314 80240D54 E6600038 */ swc1 $f0, 0x38($s3) -/* A49318 80240D58 C680003C */ lwc1 $f0, 0x3c($s4) -/* A4931C 80240D5C E660003C */ swc1 $f0, 0x3c($s3) -/* A49320 80240D60 C6800040 */ lwc1 $f0, 0x40($s4) -/* A49324 80240D64 E6600040 */ swc1 $f0, 0x40($s3) -/* A49328 80240D68 C6820034 */ lwc1 $f2, 0x34($s4) -/* A4932C 80240D6C 3C014387 */ lui $at, 0x4387 -/* A49330 80240D70 44810000 */ mtc1 $at, $f0 -/* A49334 80240D74 00000000 */ nop -/* A49338 80240D78 46020001 */ sub.s $f0, $f0, $f2 -/* A4933C 80240D7C C6480074 */ lwc1 $f8, 0x74($s2) -/* A49340 80240D80 46804220 */ cvt.s.w $f8, $f8 -/* A49344 80240D84 44054000 */ mfc1 $a1, $f8 -/* A49348 80240D88 44060000 */ mfc1 $a2, $f0 -/* A4934C 80240D8C 0C00EA95 */ jal npc_move_heading -/* A49350 80240D90 0260202D */ daddu $a0, $s3, $zero -/* A49354 80240D94 C6600038 */ lwc1 $f0, 0x38($s3) -/* A49358 80240D98 E6200038 */ swc1 $f0, 0x38($s1) -/* A4935C 80240D9C C680003C */ lwc1 $f0, 0x3c($s4) -/* A49360 80240DA0 C6420070 */ lwc1 $f2, 0x70($s2) -/* A49364 80240DA4 468010A0 */ cvt.s.w $f2, $f2 -/* A49368 80240DA8 46020000 */ add.s $f0, $f0, $f2 -/* A4936C 80240DAC 3C014024 */ lui $at, 0x4024 -/* A49370 80240DB0 4481A800 */ mtc1 $at, $f21 -/* A49374 80240DB4 4480A000 */ mtc1 $zero, $f20 -/* A49378 80240DB8 E620003C */ swc1 $f0, 0x3c($s1) -/* A4937C 80240DBC C6600040 */ lwc1 $f0, 0x40($s3) -/* A49380 80240DC0 E6200040 */ swc1 $f0, 0x40($s1) -/* A49384 80240DC4 A2500007 */ sb $s0, 7($s2) -/* A49388 80240DC8 C6200038 */ lwc1 $f0, 0x38($s1) -/* A4938C 80240DCC 3C014066 */ lui $at, 0x4066 -/* A49390 80240DD0 34216666 */ ori $at, $at, 0x6666 -/* A49394 80240DD4 44811000 */ mtc1 $at, $f2 -/* A49398 80240DD8 4600020D */ trunc.w.s $f8, $f0 -/* A4939C 80240DDC 44024000 */ mfc1 $v0, $f8 -/* A493A0 80240DE0 00000000 */ nop -/* A493A4 80240DE4 A6420010 */ sh $v0, 0x10($s2) -/* A493A8 80240DE8 C620003C */ lwc1 $f0, 0x3c($s1) -/* A493AC 80240DEC 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A493B0 80240DF0 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A493B4 80240DF4 4600020D */ trunc.w.s $f8, $f0 -/* A493B8 80240DF8 44024000 */ mfc1 $v0, $f8 -/* A493BC 80240DFC 00000000 */ nop -/* A493C0 80240E00 A6420012 */ sh $v0, 0x12($s2) -/* A493C4 80240E04 C6200040 */ lwc1 $f0, 0x40($s1) -/* A493C8 80240E08 8E630000 */ lw $v1, ($s3) -/* A493CC 80240E0C 4600020D */ trunc.w.s $f8, $f0 -/* A493D0 80240E10 44024000 */ mfc1 $v0, $f8 -/* A493D4 80240E14 00000000 */ nop -/* A493D8 80240E18 A6420014 */ sh $v0, 0x14($s2) -/* A493DC 80240E1C E6220018 */ swc1 $f2, 0x18($s1) -/* A493E0 80240E20 C460002C */ lwc1 $f0, 0x2c($v1) -/* A493E4 80240E24 C6220038 */ lwc1 $f2, 0x38($s1) -/* A493E8 80240E28 46000021 */ cvt.d.s $f0, $f0 -/* A493EC 80240E2C 46340000 */ add.d $f0, $f0, $f20 -/* A493F0 80240E30 C4640028 */ lwc1 $f4, 0x28($v1) -/* A493F4 80240E34 44806000 */ mtc1 $zero, $f12 -/* A493F8 80240E38 46041081 */ sub.s $f2, $f2, $f4 -/* A493FC 80240E3C C62E003C */ lwc1 $f14, 0x3c($s1) -/* A49400 80240E40 46200020 */ cvt.s.d $f0, $f0 -/* A49404 80240E44 46001085 */ abs.s $f2, $f2 -/* A49408 80240E48 44070000 */ mfc1 $a3, $f0 -/* A4940C 80240E4C 44061000 */ mfc1 $a2, $f2 -/* A49410 80240E50 0C00A720 */ jal atan2 -/* A49414 80240E54 00000000 */ nop -/* A49418 80240E58 3C018024 */ lui $at, 0x8024 -/* A4941C 80240E5C D4223918 */ ldc1 $f2, 0x3918($at) -/* A49420 80240E60 46000021 */ cvt.d.s $f0, $f0 -/* A49424 80240E64 46220001 */ sub.d $f0, $f0, $f2 -/* A49428 80240E68 46200020 */ cvt.s.d $f0, $f0 -/* A4942C 80240E6C 4600020D */ trunc.w.s $f8, $f0 -/* A49430 80240E70 44044000 */ mfc1 $a0, $f8 -/* A49434 80240E74 00000000 */ nop -/* A49438 80240E78 00042400 */ sll $a0, $a0, 0x10 -/* A4943C 80240E7C 0C00A4F5 */ jal cosine -/* A49440 80240E80 00042403 */ sra $a0, $a0, 0x10 -/* A49444 80240E84 C6220018 */ lwc1 $f2, 0x18($s1) -/* A49448 80240E88 46020002 */ mul.s $f0, $f0, $f2 -/* A4944C 80240E8C 00000000 */ nop -/* A49450 80240E90 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A49454 80240E94 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A49458 80240E98 8E620000 */ lw $v0, ($s3) -/* A4945C 80240E9C E620001C */ swc1 $f0, 0x1c($s1) -/* A49460 80240EA0 8C460028 */ lw $a2, 0x28($v0) -/* A49464 80240EA4 0C00A720 */ jal atan2 -/* A49468 80240EA8 8C470030 */ lw $a3, 0x30($v0) -/* A4946C 80240EAC 8E620000 */ lw $v0, ($s3) -/* A49470 80240EB0 E620000C */ swc1 $f0, 0xc($s1) -/* A49474 80240EB4 C440002C */ lwc1 $f0, 0x2c($v0) -/* A49478 80240EB8 46000021 */ cvt.d.s $f0, $f0 -/* A4947C 80240EBC 46340000 */ add.d $f0, $f0, $f20 -/* A49480 80240EC0 46200020 */ cvt.s.d $f0, $f0 -/* A49484 80240EC4 E7A00010 */ swc1 $f0, 0x10($sp) -/* A49488 80240EC8 C4400030 */ lwc1 $f0, 0x30($v0) -/* A4948C 80240ECC E7A00014 */ swc1 $f0, 0x14($sp) -/* A49490 80240ED0 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A49494 80240ED4 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A49498 80240ED8 8E260040 */ lw $a2, 0x40($s1) -/* A4949C 80240EDC 0C00A7CB */ jal dist3D -/* A494A0 80240EE0 8C470028 */ lw $a3, 0x28($v0) -/* A494A4 80240EE4 C6220018 */ lwc1 $f2, 0x18($s1) -/* A494A8 80240EE8 46020003 */ div.s $f0, $f0, $f2 -/* A494AC 80240EEC 4600020D */ trunc.w.s $f8, $f0 -/* A494B0 80240EF0 44104000 */ mfc1 $s0, $f8 -/* A494B4 80240EF4 00000000 */ nop -/* A494B8 80240EF8 5A000001 */ blezl $s0, .L80240F00 -/* A494BC 80240EFC 24100001 */ addiu $s0, $zero, 1 -.L80240F00: -/* A494C0 80240F00 8E620000 */ lw $v0, ($s3) -/* A494C4 80240F04 C624003C */ lwc1 $f4, 0x3c($s1) -/* A494C8 80240F08 3C014120 */ lui $at, 0x4120 -/* A494CC 80240F0C 44811000 */ mtc1 $at, $f2 -/* A494D0 80240F10 C4400028 */ lwc1 $f0, 0x28($v0) -/* A494D4 80240F14 E7A00010 */ swc1 $f0, 0x10($sp) -/* A494D8 80240F18 C440002C */ lwc1 $f0, 0x2c($v0) -/* A494DC 80240F1C 46020000 */ add.s $f0, $f0, $f2 -/* A494E0 80240F20 3C014160 */ lui $at, 0x4160 -/* A494E4 80240F24 44811000 */ mtc1 $at, $f2 -/* A494E8 80240F28 00000000 */ nop -/* A494EC 80240F2C 46022100 */ add.s $f4, $f4, $f2 -/* A494F0 80240F30 46020000 */ add.s $f0, $f0, $f2 -/* A494F4 80240F34 44062000 */ mfc1 $a2, $f4 -/* A494F8 80240F38 E7A00014 */ swc1 $f0, 0x14($sp) -/* A494FC 80240F3C C4400030 */ lwc1 $f0, 0x30($v0) -/* A49500 80240F40 AFB0001C */ sw $s0, 0x1c($sp) -/* A49504 80240F44 E7A00018 */ swc1 $f0, 0x18($sp) -/* A49508 80240F48 8E250038 */ lw $a1, 0x38($s1) -/* A4950C 80240F4C 8E270040 */ lw $a3, 0x40($s1) -/* A49510 80240F50 0C01BFD4 */ jal func_8006FF50 -/* A49514 80240F54 0000202D */ daddu $a0, $zero, $zero -/* A49518 80240F58 AE420078 */ sw $v0, 0x78($s2) -/* A4951C 80240F5C A630008E */ sh $s0, 0x8e($s1) -/* A49520 80240F60 0809043E */ j .L802410F8 -/* A49524 80240F64 AED50070 */ sw $s5, 0x70($s6) -/* A49528 80240F68 9622008E */ lhu $v0, 0x8e($s1) -/* A4952C 80240F6C 2442FFFF */ addiu $v0, $v0, -1 -/* A49530 80240F70 A622008E */ sh $v0, 0x8e($s1) -/* A49534 80240F74 00021400 */ sll $v0, $v0, 0x10 -/* A49538 80240F78 58400001 */ blezl $v0, .L80240F80 -/* A4953C 80240F7C 24150014 */ addiu $s5, $zero, 0x14 -.L80240F80: -/* A49540 80240F80 16A0000A */ bnez $s5, .L80240FAC -/* A49544 80240F84 00000000 */ nop -/* A49548 80240F88 8E250018 */ lw $a1, 0x18($s1) -/* A4954C 80240F8C 8E26000C */ lw $a2, 0xc($s1) -/* A49550 80240F90 0C00EA95 */ jal npc_move_heading -/* A49554 80240F94 0220202D */ daddu $a0, $s1, $zero -/* A49558 80240F98 C620003C */ lwc1 $f0, 0x3c($s1) -/* A4955C 80240F9C C622001C */ lwc1 $f2, 0x1c($s1) -/* A49560 80240FA0 46020000 */ add.s $f0, $f0, $f2 -/* A49564 80240FA4 0809043E */ j .L802410F8 -/* A49568 80240FA8 E620003C */ swc1 $f0, 0x3c($s1) -.L80240FAC: -/* A4956C 80240FAC 862200A8 */ lh $v0, 0xa8($s1) -/* A49570 80240FB0 3C013FE0 */ lui $at, 0x3fe0 -/* A49574 80240FB4 44810800 */ mtc1 $at, $f1 -/* A49578 80240FB8 44800000 */ mtc1 $zero, $f0 -/* A4957C 80240FBC 44821000 */ mtc1 $v0, $f2 -/* A49580 80240FC0 00000000 */ nop -/* A49584 80240FC4 468010A1 */ cvt.d.w $f2, $f2 -/* A49588 80240FC8 46201082 */ mul.d $f2, $f2, $f0 -/* A4958C 80240FCC 00000000 */ nop -/* A49590 80240FD0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A49594 80240FD4 AE20001C */ sw $zero, 0x1c($s1) -/* A49598 80240FD8 46000021 */ cvt.d.s $f0, $f0 -/* A4959C 80240FDC 46220001 */ sub.d $f0, $f0, $f2 -/* A495A0 80240FE0 AE200018 */ sw $zero, 0x18($s1) -/* A495A4 80240FE4 24020003 */ addiu $v0, $zero, 3 -/* A495A8 80240FE8 46200020 */ cvt.s.d $f0, $f0 -/* A495AC 80240FEC E620003C */ swc1 $f0, 0x3c($s1) -/* A495B0 80240FF0 AE42006C */ sw $v0, 0x6c($s2) -/* A495B4 80240FF4 24020004 */ addiu $v0, $zero, 4 -/* A495B8 80240FF8 A620008E */ sh $zero, 0x8e($s1) -/* A495BC 80240FFC 0809043E */ j .L802410F8 -/* A495C0 80241000 AEC20070 */ sw $v0, 0x70($s6) -/* A495C4 80241004 9622008E */ lhu $v0, 0x8e($s1) -/* A495C8 80241008 24420001 */ addiu $v0, $v0, 1 -/* A495CC 8024100C A622008E */ sh $v0, 0x8e($s1) -/* A495D0 80241010 00021400 */ sll $v0, $v0, 0x10 -/* A495D4 80241014 00021C03 */ sra $v1, $v0, 0x10 -/* A495D8 80241018 28620007 */ slti $v0, $v1, 7 -/* A495DC 8024101C 10400027 */ beqz $v0, .L802410BC -/* A495E0 80241020 24020007 */ addiu $v0, $zero, 7 -/* A495E4 80241024 8622008E */ lh $v0, 0x8e($s1) -/* A495E8 80241028 3C01401C */ lui $at, 0x401c -/* A495EC 8024102C 44810800 */ mtc1 $at, $f1 -/* A495F0 80241030 44800000 */ mtc1 $zero, $f0 -/* A495F4 80241034 44822000 */ mtc1 $v0, $f4 -/* A495F8 80241038 00000000 */ nop -/* A495FC 8024103C 46802120 */ cvt.s.w $f4, $f4 -/* A49600 80241040 46002121 */ cvt.d.s $f4, $f4 -/* A49604 80241044 46202102 */ mul.d $f4, $f4, $f0 -/* A49608 80241048 00000000 */ nop -/* A4960C 8024104C 44821000 */ mtc1 $v0, $f2 -/* A49610 80241050 00000000 */ nop -/* A49614 80241054 468010A0 */ cvt.s.w $f2, $f2 -/* A49618 80241058 460010A1 */ cvt.d.s $f2, $f2 -/* A4961C 8024105C 46201082 */ mul.d $f2, $f2, $f0 -/* A49620 80241060 00000000 */ nop -/* A49624 80241064 C620003C */ lwc1 $f0, 0x3c($s1) -/* A49628 80241068 3C01400C */ lui $at, 0x400c -/* A4962C 8024106C 44813800 */ mtc1 $at, $f7 -/* A49630 80241070 44803000 */ mtc1 $zero, $f6 -/* A49634 80241074 46000021 */ cvt.d.s $f0, $f0 -/* A49638 80241078 46260001 */ sub.d $f0, $f0, $f6 -/* A4963C 8024107C 3C014034 */ lui $at, 0x4034 -/* A49640 80241080 44813800 */ mtc1 $at, $f7 -/* A49644 80241084 44803000 */ mtc1 $zero, $f6 -/* A49648 80241088 00000000 */ nop -/* A4964C 8024108C 46262100 */ add.d $f4, $f4, $f6 -/* A49650 80241090 46200020 */ cvt.s.d $f0, $f0 -/* A49654 80241094 E620003C */ swc1 $f0, 0x3c($s1) -/* A49658 80241098 46261080 */ add.d $f2, $f2, $f6 -/* A4965C 8024109C 4620220D */ trunc.w.d $f8, $f4 -/* A49660 802410A0 44024000 */ mfc1 $v0, $f8 -/* A49664 802410A4 00000000 */ nop -/* A49668 802410A8 A62200A6 */ sh $v0, 0xa6($s1) -/* A4966C 802410AC 4620120D */ trunc.w.d $f8, $f2 -/* A49670 802410B0 44024000 */ mfc1 $v0, $f8 -/* A49674 802410B4 0809043E */ j .L802410F8 -/* A49678 802410B8 A62200A8 */ sh $v0, 0xa8($s1) -.L802410BC: -/* A4967C 802410BC 1462000A */ bne $v1, $v0, .L802410E8 -/* A49680 802410C0 28620010 */ slti $v0, $v1, 0x10 -/* A49684 802410C4 3C01C47A */ lui $at, 0xc47a -/* A49688 802410C8 44810000 */ mtc1 $at, $f0 -/* A4968C 802410CC 24020014 */ addiu $v0, $zero, 0x14 -/* A49690 802410D0 AE200038 */ sw $zero, 0x38($s1) -/* A49694 802410D4 AE200040 */ sw $zero, 0x40($s1) -/* A49698 802410D8 A62200A6 */ sh $v0, 0xa6($s1) -/* A4969C 802410DC A62200A8 */ sh $v0, 0xa8($s1) -/* A496A0 802410E0 0809043E */ j .L802410F8 -/* A496A4 802410E4 E620003C */ swc1 $f0, 0x3c($s1) -.L802410E8: -/* A496A8 802410E8 14400003 */ bnez $v0, .L802410F8 -/* A496AC 802410EC 00000000 */ nop -/* A496B0 802410F0 AE40006C */ sw $zero, 0x6c($s2) -/* A496B4 802410F4 AEC00070 */ sw $zero, 0x70($s6) -.L802410F8: -/* A496B8 802410F8 8FBF037C */ lw $ra, 0x37c($sp) -/* A496BC 802410FC 8FB60378 */ lw $s6, 0x378($sp) -/* A496C0 80241100 8FB50374 */ lw $s5, 0x374($sp) -/* A496C4 80241104 8FB40370 */ lw $s4, 0x370($sp) -/* A496C8 80241108 8FB3036C */ lw $s3, 0x36c($sp) -/* A496CC 8024110C 8FB20368 */ lw $s2, 0x368($sp) -/* A496D0 80241110 8FB10364 */ lw $s1, 0x364($sp) -/* A496D4 80241114 8FB00360 */ lw $s0, 0x360($sp) -/* A496D8 80241118 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A496DC 8024111C 0000102D */ daddu $v0, $zero, $zero -/* A496E0 80241120 03E00008 */ jr $ra -/* A496E4 80241124 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s new file mode 100644 index 0000000000..b3b05220cc --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80240C18_A491D8.s @@ -0,0 +1,336 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C18_A491D8 +/* A491D8 80240C18 27BDFC78 */ addiu $sp, $sp, -0x388 +/* A491DC 80240C1C AFB60378 */ sw $s6, 0x378($sp) +/* A491E0 80240C20 0080B02D */ daddu $s6, $a0, $zero +/* A491E4 80240C24 AFBF037C */ sw $ra, 0x37c($sp) +/* A491E8 80240C28 AFB50374 */ sw $s5, 0x374($sp) +/* A491EC 80240C2C AFB40370 */ sw $s4, 0x370($sp) +/* A491F0 80240C30 AFB3036C */ sw $s3, 0x36c($sp) +/* A491F4 80240C34 AFB20368 */ sw $s2, 0x368($sp) +/* A491F8 80240C38 AFB10364 */ sw $s1, 0x364($sp) +/* A491FC 80240C3C AFB00360 */ sw $s0, 0x360($sp) +/* A49200 80240C40 F7B40380 */ sdc1 $f20, 0x380($sp) +/* A49204 80240C44 8ED20148 */ lw $s2, 0x148($s6) +/* A49208 80240C48 86440008 */ lh $a0, 8($s2) +/* A4920C 80240C4C 0C00EABB */ jal get_npc_unsafe +/* A49210 80240C50 00A0802D */ daddu $s0, $a1, $zero +/* A49214 80240C54 86440008 */ lh $a0, 8($s2) +/* A49218 80240C58 0040882D */ daddu $s1, $v0, $zero +/* A4921C 80240C5C 0C00FB3A */ jal get_enemy +/* A49220 80240C60 2484FFFF */ addiu $a0, $a0, -1 +/* A49224 80240C64 84440008 */ lh $a0, 8($v0) +/* A49228 80240C68 0C00EABB */ jal get_npc_unsafe +/* A4922C 80240C6C 0000A82D */ daddu $s5, $zero, $zero +/* A49230 80240C70 27B30020 */ addiu $s3, $sp, 0x20 +/* A49234 80240C74 16000005 */ bnez $s0, .L80240C8C +/* A49238 80240C78 0040A02D */ daddu $s4, $v0, $zero +/* A4923C 80240C7C 8E4200B0 */ lw $v0, 0xb0($s2) +/* A49240 80240C80 30420004 */ andi $v0, $v0, 4 +/* A49244 80240C84 10400018 */ beqz $v0, .L80240CE8 +/* A49248 80240C88 00000000 */ nop +.L80240C8C: +/* A4924C 80240C8C 3C030024 */ lui $v1, 0x24 +/* A49250 80240C90 34630102 */ ori $v1, $v1, 0x102 +/* A49254 80240C94 3C041620 */ lui $a0, 0x1620 +/* A49258 80240C98 AEC00070 */ sw $zero, 0x70($s6) +/* A4925C 80240C9C 8E220000 */ lw $v0, ($s1) +/* A49260 80240CA0 34840040 */ ori $a0, $a0, 0x40 +/* A49264 80240CA4 A620008E */ sh $zero, 0x8e($s1) +/* A49268 80240CA8 00431025 */ or $v0, $v0, $v1 +/* A4926C 80240CAC AE220000 */ sw $v0, ($s1) +/* A49270 80240CB0 8E420000 */ lw $v0, ($s2) +/* A49274 80240CB4 3C013ECC */ lui $at, 0x3ecc +/* A49278 80240CB8 3421CCCD */ ori $at, $at, 0xcccd +/* A4927C 80240CBC 44810000 */ mtc1 $at, $f0 +/* A49280 80240CC0 00441025 */ or $v0, $v0, $a0 +/* A49284 80240CC4 AE420000 */ sw $v0, ($s2) +/* A49288 80240CC8 E6200054 */ swc1 $f0, 0x54($s1) +/* A4928C 80240CCC E6200058 */ swc1 $f0, 0x58($s1) +/* A49290 80240CD0 8E4300B0 */ lw $v1, 0xb0($s2) +/* A49294 80240CD4 30620004 */ andi $v0, $v1, 4 +/* A49298 80240CD8 10400003 */ beqz $v0, .L80240CE8 +/* A4929C 80240CDC 2402FFFB */ addiu $v0, $zero, -5 +/* A492A0 80240CE0 00621024 */ and $v0, $v1, $v0 +/* A492A4 80240CE4 AE4200B0 */ sw $v0, 0xb0($s2) +.L80240CE8: +/* A492A8 80240CE8 8EC30070 */ lw $v1, 0x70($s6) +/* A492AC 80240CEC 2C620005 */ sltiu $v0, $v1, 5 +/* A492B0 80240CF0 10400101 */ beqz $v0, .L802410F8 +/* A492B4 80240CF4 00031080 */ sll $v0, $v1, 2 +/* A492B8 80240CF8 3C018024 */ lui $at, 0x8024 +/* A492BC 80240CFC 00220821 */ addu $at, $at, $v0 +/* A492C0 80240D00 8C223900 */ lw $v0, 0x3900($at) +/* A492C4 80240D04 00400008 */ jr $v0 +/* A492C8 80240D08 00000000 */ nop +/* A492CC 80240D0C 3C01C47A */ lui $at, 0xc47a +/* A492D0 80240D10 44810000 */ mtc1 $at, $f0 +/* A492D4 80240D14 24020014 */ addiu $v0, $zero, 0x14 +/* A492D8 80240D18 AE400078 */ sw $zero, 0x78($s2) +/* A492DC 80240D1C A62200A6 */ sh $v0, 0xa6($s1) +/* A492E0 80240D20 A62200A8 */ sh $v0, 0xa8($s1) +/* A492E4 80240D24 24020001 */ addiu $v0, $zero, 1 +/* A492E8 80240D28 AE200038 */ sw $zero, 0x38($s1) +/* A492EC 80240D2C AE200040 */ sw $zero, 0x40($s1) +/* A492F0 80240D30 E620003C */ swc1 $f0, 0x3c($s1) +/* A492F4 80240D34 AE40006C */ sw $zero, 0x6c($s2) +/* A492F8 80240D38 AEC20070 */ sw $v0, 0x70($s6) +/* A492FC 80240D3C 8E50006C */ lw $s0, 0x6c($s2) +/* A49300 80240D40 24020001 */ addiu $v0, $zero, 1 +/* A49304 80240D44 160200EC */ bne $s0, $v0, .L802410F8 +/* A49308 80240D48 24150002 */ addiu $s5, $zero, 2 +/* A4930C 80240D4C AE55006C */ sw $s5, 0x6c($s2) +/* A49310 80240D50 C6800038 */ lwc1 $f0, 0x38($s4) +/* A49314 80240D54 E6600038 */ swc1 $f0, 0x38($s3) +/* A49318 80240D58 C680003C */ lwc1 $f0, 0x3c($s4) +/* A4931C 80240D5C E660003C */ swc1 $f0, 0x3c($s3) +/* A49320 80240D60 C6800040 */ lwc1 $f0, 0x40($s4) +/* A49324 80240D64 E6600040 */ swc1 $f0, 0x40($s3) +/* A49328 80240D68 C6820034 */ lwc1 $f2, 0x34($s4) +/* A4932C 80240D6C 3C014387 */ lui $at, 0x4387 +/* A49330 80240D70 44810000 */ mtc1 $at, $f0 +/* A49334 80240D74 00000000 */ nop +/* A49338 80240D78 46020001 */ sub.s $f0, $f0, $f2 +/* A4933C 80240D7C C6480074 */ lwc1 $f8, 0x74($s2) +/* A49340 80240D80 46804220 */ cvt.s.w $f8, $f8 +/* A49344 80240D84 44054000 */ mfc1 $a1, $f8 +/* A49348 80240D88 44060000 */ mfc1 $a2, $f0 +/* A4934C 80240D8C 0C00EA95 */ jal npc_move_heading +/* A49350 80240D90 0260202D */ daddu $a0, $s3, $zero +/* A49354 80240D94 C6600038 */ lwc1 $f0, 0x38($s3) +/* A49358 80240D98 E6200038 */ swc1 $f0, 0x38($s1) +/* A4935C 80240D9C C680003C */ lwc1 $f0, 0x3c($s4) +/* A49360 80240DA0 C6420070 */ lwc1 $f2, 0x70($s2) +/* A49364 80240DA4 468010A0 */ cvt.s.w $f2, $f2 +/* A49368 80240DA8 46020000 */ add.s $f0, $f0, $f2 +/* A4936C 80240DAC 3C014024 */ lui $at, 0x4024 +/* A49370 80240DB0 4481A800 */ mtc1 $at, $f21 +/* A49374 80240DB4 4480A000 */ mtc1 $zero, $f20 +/* A49378 80240DB8 E620003C */ swc1 $f0, 0x3c($s1) +/* A4937C 80240DBC C6600040 */ lwc1 $f0, 0x40($s3) +/* A49380 80240DC0 E6200040 */ swc1 $f0, 0x40($s1) +/* A49384 80240DC4 A2500007 */ sb $s0, 7($s2) +/* A49388 80240DC8 C6200038 */ lwc1 $f0, 0x38($s1) +/* A4938C 80240DCC 3C014066 */ lui $at, 0x4066 +/* A49390 80240DD0 34216666 */ ori $at, $at, 0x6666 +/* A49394 80240DD4 44811000 */ mtc1 $at, $f2 +/* A49398 80240DD8 4600020D */ trunc.w.s $f8, $f0 +/* A4939C 80240DDC 44024000 */ mfc1 $v0, $f8 +/* A493A0 80240DE0 00000000 */ nop +/* A493A4 80240DE4 A6420010 */ sh $v0, 0x10($s2) +/* A493A8 80240DE8 C620003C */ lwc1 $f0, 0x3c($s1) +/* A493AC 80240DEC 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) +/* A493B0 80240DF0 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) +/* A493B4 80240DF4 4600020D */ trunc.w.s $f8, $f0 +/* A493B8 80240DF8 44024000 */ mfc1 $v0, $f8 +/* A493BC 80240DFC 00000000 */ nop +/* A493C0 80240E00 A6420012 */ sh $v0, 0x12($s2) +/* A493C4 80240E04 C6200040 */ lwc1 $f0, 0x40($s1) +/* A493C8 80240E08 8E630000 */ lw $v1, ($s3) +/* A493CC 80240E0C 4600020D */ trunc.w.s $f8, $f0 +/* A493D0 80240E10 44024000 */ mfc1 $v0, $f8 +/* A493D4 80240E14 00000000 */ nop +/* A493D8 80240E18 A6420014 */ sh $v0, 0x14($s2) +/* A493DC 80240E1C E6220018 */ swc1 $f2, 0x18($s1) +/* A493E0 80240E20 C460002C */ lwc1 $f0, 0x2c($v1) +/* A493E4 80240E24 C6220038 */ lwc1 $f2, 0x38($s1) +/* A493E8 80240E28 46000021 */ cvt.d.s $f0, $f0 +/* A493EC 80240E2C 46340000 */ add.d $f0, $f0, $f20 +/* A493F0 80240E30 C4640028 */ lwc1 $f4, 0x28($v1) +/* A493F4 80240E34 44806000 */ mtc1 $zero, $f12 +/* A493F8 80240E38 46041081 */ sub.s $f2, $f2, $f4 +/* A493FC 80240E3C C62E003C */ lwc1 $f14, 0x3c($s1) +/* A49400 80240E40 46200020 */ cvt.s.d $f0, $f0 +/* A49404 80240E44 46001085 */ abs.s $f2, $f2 +/* A49408 80240E48 44070000 */ mfc1 $a3, $f0 +/* A4940C 80240E4C 44061000 */ mfc1 $a2, $f2 +/* A49410 80240E50 0C00A720 */ jal atan2 +/* A49414 80240E54 00000000 */ nop +/* A49418 80240E58 3C018024 */ lui $at, 0x8024 +/* A4941C 80240E5C D4223918 */ ldc1 $f2, 0x3918($at) +/* A49420 80240E60 46000021 */ cvt.d.s $f0, $f0 +/* A49424 80240E64 46220001 */ sub.d $f0, $f0, $f2 +/* A49428 80240E68 46200020 */ cvt.s.d $f0, $f0 +/* A4942C 80240E6C 4600020D */ trunc.w.s $f8, $f0 +/* A49430 80240E70 44044000 */ mfc1 $a0, $f8 +/* A49434 80240E74 00000000 */ nop +/* A49438 80240E78 00042400 */ sll $a0, $a0, 0x10 +/* A4943C 80240E7C 0C00A4F5 */ jal cosine +/* A49440 80240E80 00042403 */ sra $a0, $a0, 0x10 +/* A49444 80240E84 C6220018 */ lwc1 $f2, 0x18($s1) +/* A49448 80240E88 46020002 */ mul.s $f0, $f0, $f2 +/* A4944C 80240E8C 00000000 */ nop +/* A49450 80240E90 C62C0038 */ lwc1 $f12, 0x38($s1) +/* A49454 80240E94 C62E0040 */ lwc1 $f14, 0x40($s1) +/* A49458 80240E98 8E620000 */ lw $v0, ($s3) +/* A4945C 80240E9C E620001C */ swc1 $f0, 0x1c($s1) +/* A49460 80240EA0 8C460028 */ lw $a2, 0x28($v0) +/* A49464 80240EA4 0C00A720 */ jal atan2 +/* A49468 80240EA8 8C470030 */ lw $a3, 0x30($v0) +/* A4946C 80240EAC 8E620000 */ lw $v0, ($s3) +/* A49470 80240EB0 E620000C */ swc1 $f0, 0xc($s1) +/* A49474 80240EB4 C440002C */ lwc1 $f0, 0x2c($v0) +/* A49478 80240EB8 46000021 */ cvt.d.s $f0, $f0 +/* A4947C 80240EBC 46340000 */ add.d $f0, $f0, $f20 +/* A49480 80240EC0 46200020 */ cvt.s.d $f0, $f0 +/* A49484 80240EC4 E7A00010 */ swc1 $f0, 0x10($sp) +/* A49488 80240EC8 C4400030 */ lwc1 $f0, 0x30($v0) +/* A4948C 80240ECC E7A00014 */ swc1 $f0, 0x14($sp) +/* A49490 80240ED0 C62C0038 */ lwc1 $f12, 0x38($s1) +/* A49494 80240ED4 C62E003C */ lwc1 $f14, 0x3c($s1) +/* A49498 80240ED8 8E260040 */ lw $a2, 0x40($s1) +/* A4949C 80240EDC 0C00A7CB */ jal dist3D +/* A494A0 80240EE0 8C470028 */ lw $a3, 0x28($v0) +/* A494A4 80240EE4 C6220018 */ lwc1 $f2, 0x18($s1) +/* A494A8 80240EE8 46020003 */ div.s $f0, $f0, $f2 +/* A494AC 80240EEC 4600020D */ trunc.w.s $f8, $f0 +/* A494B0 80240EF0 44104000 */ mfc1 $s0, $f8 +/* A494B4 80240EF4 00000000 */ nop +/* A494B8 80240EF8 5A000001 */ blezl $s0, .L80240F00 +/* A494BC 80240EFC 24100001 */ addiu $s0, $zero, 1 +.L80240F00: +/* A494C0 80240F00 8E620000 */ lw $v0, ($s3) +/* A494C4 80240F04 C624003C */ lwc1 $f4, 0x3c($s1) +/* A494C8 80240F08 3C014120 */ lui $at, 0x4120 +/* A494CC 80240F0C 44811000 */ mtc1 $at, $f2 +/* A494D0 80240F10 C4400028 */ lwc1 $f0, 0x28($v0) +/* A494D4 80240F14 E7A00010 */ swc1 $f0, 0x10($sp) +/* A494D8 80240F18 C440002C */ lwc1 $f0, 0x2c($v0) +/* A494DC 80240F1C 46020000 */ add.s $f0, $f0, $f2 +/* A494E0 80240F20 3C014160 */ lui $at, 0x4160 +/* A494E4 80240F24 44811000 */ mtc1 $at, $f2 +/* A494E8 80240F28 00000000 */ nop +/* A494EC 80240F2C 46022100 */ add.s $f4, $f4, $f2 +/* A494F0 80240F30 46020000 */ add.s $f0, $f0, $f2 +/* A494F4 80240F34 44062000 */ mfc1 $a2, $f4 +/* A494F8 80240F38 E7A00014 */ swc1 $f0, 0x14($sp) +/* A494FC 80240F3C C4400030 */ lwc1 $f0, 0x30($v0) +/* A49500 80240F40 AFB0001C */ sw $s0, 0x1c($sp) +/* A49504 80240F44 E7A00018 */ swc1 $f0, 0x18($sp) +/* A49508 80240F48 8E250038 */ lw $a1, 0x38($s1) +/* A4950C 80240F4C 8E270040 */ lw $a3, 0x40($s1) +/* A49510 80240F50 0C01BFD4 */ jal func_8006FF50 +/* A49514 80240F54 0000202D */ daddu $a0, $zero, $zero +/* A49518 80240F58 AE420078 */ sw $v0, 0x78($s2) +/* A4951C 80240F5C A630008E */ sh $s0, 0x8e($s1) +/* A49520 80240F60 0809043E */ j .L802410F8 +/* A49524 80240F64 AED50070 */ sw $s5, 0x70($s6) +/* A49528 80240F68 9622008E */ lhu $v0, 0x8e($s1) +/* A4952C 80240F6C 2442FFFF */ addiu $v0, $v0, -1 +/* A49530 80240F70 A622008E */ sh $v0, 0x8e($s1) +/* A49534 80240F74 00021400 */ sll $v0, $v0, 0x10 +/* A49538 80240F78 58400001 */ blezl $v0, .L80240F80 +/* A4953C 80240F7C 24150014 */ addiu $s5, $zero, 0x14 +.L80240F80: +/* A49540 80240F80 16A0000A */ bnez $s5, .L80240FAC +/* A49544 80240F84 00000000 */ nop +/* A49548 80240F88 8E250018 */ lw $a1, 0x18($s1) +/* A4954C 80240F8C 8E26000C */ lw $a2, 0xc($s1) +/* A49550 80240F90 0C00EA95 */ jal npc_move_heading +/* A49554 80240F94 0220202D */ daddu $a0, $s1, $zero +/* A49558 80240F98 C620003C */ lwc1 $f0, 0x3c($s1) +/* A4955C 80240F9C C622001C */ lwc1 $f2, 0x1c($s1) +/* A49560 80240FA0 46020000 */ add.s $f0, $f0, $f2 +/* A49564 80240FA4 0809043E */ j .L802410F8 +/* A49568 80240FA8 E620003C */ swc1 $f0, 0x3c($s1) +.L80240FAC: +/* A4956C 80240FAC 862200A8 */ lh $v0, 0xa8($s1) +/* A49570 80240FB0 3C013FE0 */ lui $at, 0x3fe0 +/* A49574 80240FB4 44810800 */ mtc1 $at, $f1 +/* A49578 80240FB8 44800000 */ mtc1 $zero, $f0 +/* A4957C 80240FBC 44821000 */ mtc1 $v0, $f2 +/* A49580 80240FC0 00000000 */ nop +/* A49584 80240FC4 468010A1 */ cvt.d.w $f2, $f2 +/* A49588 80240FC8 46201082 */ mul.d $f2, $f2, $f0 +/* A4958C 80240FCC 00000000 */ nop +/* A49590 80240FD0 C620003C */ lwc1 $f0, 0x3c($s1) +/* A49594 80240FD4 AE20001C */ sw $zero, 0x1c($s1) +/* A49598 80240FD8 46000021 */ cvt.d.s $f0, $f0 +/* A4959C 80240FDC 46220001 */ sub.d $f0, $f0, $f2 +/* A495A0 80240FE0 AE200018 */ sw $zero, 0x18($s1) +/* A495A4 80240FE4 24020003 */ addiu $v0, $zero, 3 +/* A495A8 80240FE8 46200020 */ cvt.s.d $f0, $f0 +/* A495AC 80240FEC E620003C */ swc1 $f0, 0x3c($s1) +/* A495B0 80240FF0 AE42006C */ sw $v0, 0x6c($s2) +/* A495B4 80240FF4 24020004 */ addiu $v0, $zero, 4 +/* A495B8 80240FF8 A620008E */ sh $zero, 0x8e($s1) +/* A495BC 80240FFC 0809043E */ j .L802410F8 +/* A495C0 80241000 AEC20070 */ sw $v0, 0x70($s6) +/* A495C4 80241004 9622008E */ lhu $v0, 0x8e($s1) +/* A495C8 80241008 24420001 */ addiu $v0, $v0, 1 +/* A495CC 8024100C A622008E */ sh $v0, 0x8e($s1) +/* A495D0 80241010 00021400 */ sll $v0, $v0, 0x10 +/* A495D4 80241014 00021C03 */ sra $v1, $v0, 0x10 +/* A495D8 80241018 28620007 */ slti $v0, $v1, 7 +/* A495DC 8024101C 10400027 */ beqz $v0, .L802410BC +/* A495E0 80241020 24020007 */ addiu $v0, $zero, 7 +/* A495E4 80241024 8622008E */ lh $v0, 0x8e($s1) +/* A495E8 80241028 3C01401C */ lui $at, 0x401c +/* A495EC 8024102C 44810800 */ mtc1 $at, $f1 +/* A495F0 80241030 44800000 */ mtc1 $zero, $f0 +/* A495F4 80241034 44822000 */ mtc1 $v0, $f4 +/* A495F8 80241038 00000000 */ nop +/* A495FC 8024103C 46802120 */ cvt.s.w $f4, $f4 +/* A49600 80241040 46002121 */ cvt.d.s $f4, $f4 +/* A49604 80241044 46202102 */ mul.d $f4, $f4, $f0 +/* A49608 80241048 00000000 */ nop +/* A4960C 8024104C 44821000 */ mtc1 $v0, $f2 +/* A49610 80241050 00000000 */ nop +/* A49614 80241054 468010A0 */ cvt.s.w $f2, $f2 +/* A49618 80241058 460010A1 */ cvt.d.s $f2, $f2 +/* A4961C 8024105C 46201082 */ mul.d $f2, $f2, $f0 +/* A49620 80241060 00000000 */ nop +/* A49624 80241064 C620003C */ lwc1 $f0, 0x3c($s1) +/* A49628 80241068 3C01400C */ lui $at, 0x400c +/* A4962C 8024106C 44813800 */ mtc1 $at, $f7 +/* A49630 80241070 44803000 */ mtc1 $zero, $f6 +/* A49634 80241074 46000021 */ cvt.d.s $f0, $f0 +/* A49638 80241078 46260001 */ sub.d $f0, $f0, $f6 +/* A4963C 8024107C 3C014034 */ lui $at, 0x4034 +/* A49640 80241080 44813800 */ mtc1 $at, $f7 +/* A49644 80241084 44803000 */ mtc1 $zero, $f6 +/* A49648 80241088 00000000 */ nop +/* A4964C 8024108C 46262100 */ add.d $f4, $f4, $f6 +/* A49650 80241090 46200020 */ cvt.s.d $f0, $f0 +/* A49654 80241094 E620003C */ swc1 $f0, 0x3c($s1) +/* A49658 80241098 46261080 */ add.d $f2, $f2, $f6 +/* A4965C 8024109C 4620220D */ trunc.w.d $f8, $f4 +/* A49660 802410A0 44024000 */ mfc1 $v0, $f8 +/* A49664 802410A4 00000000 */ nop +/* A49668 802410A8 A62200A6 */ sh $v0, 0xa6($s1) +/* A4966C 802410AC 4620120D */ trunc.w.d $f8, $f2 +/* A49670 802410B0 44024000 */ mfc1 $v0, $f8 +/* A49674 802410B4 0809043E */ j .L802410F8 +/* A49678 802410B8 A62200A8 */ sh $v0, 0xa8($s1) +.L802410BC: +/* A4967C 802410BC 1462000A */ bne $v1, $v0, .L802410E8 +/* A49680 802410C0 28620010 */ slti $v0, $v1, 0x10 +/* A49684 802410C4 3C01C47A */ lui $at, 0xc47a +/* A49688 802410C8 44810000 */ mtc1 $at, $f0 +/* A4968C 802410CC 24020014 */ addiu $v0, $zero, 0x14 +/* A49690 802410D0 AE200038 */ sw $zero, 0x38($s1) +/* A49694 802410D4 AE200040 */ sw $zero, 0x40($s1) +/* A49698 802410D8 A62200A6 */ sh $v0, 0xa6($s1) +/* A4969C 802410DC A62200A8 */ sh $v0, 0xa8($s1) +/* A496A0 802410E0 0809043E */ j .L802410F8 +/* A496A4 802410E4 E620003C */ swc1 $f0, 0x3c($s1) +.L802410E8: +/* A496A8 802410E8 14400003 */ bnez $v0, .L802410F8 +/* A496AC 802410EC 00000000 */ nop +/* A496B0 802410F0 AE40006C */ sw $zero, 0x6c($s2) +/* A496B4 802410F4 AEC00070 */ sw $zero, 0x70($s6) +.L802410F8: +/* A496B8 802410F8 8FBF037C */ lw $ra, 0x37c($sp) +/* A496BC 802410FC 8FB60378 */ lw $s6, 0x378($sp) +/* A496C0 80241100 8FB50374 */ lw $s5, 0x374($sp) +/* A496C4 80241104 8FB40370 */ lw $s4, 0x370($sp) +/* A496C8 80241108 8FB3036C */ lw $s3, 0x36c($sp) +/* A496CC 8024110C 8FB20368 */ lw $s2, 0x368($sp) +/* A496D0 80241110 8FB10364 */ lw $s1, 0x364($sp) +/* A496D4 80241114 8FB00360 */ lw $s0, 0x360($sp) +/* A496D8 80241118 D7B40380 */ ldc1 $f20, 0x380($sp) +/* A496DC 8024111C 0000102D */ daddu $v0, $zero, $zero +/* A496E0 80241120 03E00008 */ jr $ra +/* A496E4 80241124 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8.s deleted file mode 100644 index ad14aa7084..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C8 -/* A49888 802412C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4988C 802412CC AFB10014 */ sw $s1, 0x14($sp) -/* A49890 802412D0 0080882D */ daddu $s1, $a0, $zero -/* A49894 802412D4 AFBF0018 */ sw $ra, 0x18($sp) -/* A49898 802412D8 AFB00010 */ sw $s0, 0x10($sp) -/* A4989C 802412DC 8E220148 */ lw $v0, 0x148($s1) -/* A498A0 802412E0 0C00EABB */ jal get_npc_unsafe -/* A498A4 802412E4 84440008 */ lh $a0, 8($v0) -/* A498A8 802412E8 24040064 */ addiu $a0, $zero, 0x64 -/* A498AC 802412EC 0C00A67F */ jal rand_int -/* A498B0 802412F0 0040802D */ daddu $s0, $v0, $zero -/* A498B4 802412F4 00021FC2 */ srl $v1, $v0, 0x1f -/* A498B8 802412F8 00431821 */ addu $v1, $v0, $v1 -/* A498BC 802412FC 00031843 */ sra $v1, $v1, 1 -/* A498C0 80241300 00031840 */ sll $v1, $v1, 1 -/* A498C4 80241304 00431023 */ subu $v0, $v0, $v1 -/* A498C8 80241308 3C014334 */ lui $at, 0x4334 -/* A498CC 8024130C 44811000 */ mtc1 $at, $f2 -/* A498D0 80241310 44820000 */ mtc1 $v0, $f0 -/* A498D4 80241314 00000000 */ nop -/* A498D8 80241318 46800020 */ cvt.s.w $f0, $f0 -/* A498DC 8024131C 46020002 */ mul.s $f0, $f0, $f2 -/* A498E0 80241320 00000000 */ nop -/* A498E4 80241324 3C013F4C */ lui $at, 0x3f4c -/* A498E8 80241328 3421CCCD */ ori $at, $at, 0xcccd -/* A498EC 8024132C 44812000 */ mtc1 $at, $f4 -/* A498F0 80241330 3C0142B4 */ lui $at, 0x42b4 -/* A498F4 80241334 44811000 */ mtc1 $at, $f2 -/* A498F8 80241338 2402000F */ addiu $v0, $zero, 0xf -/* A498FC 8024133C A602008E */ sh $v0, 0x8e($s0) -/* A49900 80241340 46020000 */ add.s $f0, $f0, $f2 -/* A49904 80241344 24020006 */ addiu $v0, $zero, 6 -/* A49908 80241348 E6040018 */ swc1 $f4, 0x18($s0) -/* A4990C 8024134C E600000C */ swc1 $f0, 0xc($s0) -/* A49910 80241350 AE220070 */ sw $v0, 0x70($s1) -/* A49914 80241354 8FBF0018 */ lw $ra, 0x18($sp) -/* A49918 80241358 8FB10014 */ lw $s1, 0x14($sp) -/* A4991C 8024135C 8FB00010 */ lw $s0, 0x10($sp) -/* A49920 80241360 03E00008 */ jr $ra -/* A49924 80241364 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s new file mode 100644 index 0000000000..13627cf2f1 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802412C8_A49888.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412C8_A49888 +/* A49888 802412C8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A4988C 802412CC AFB10014 */ sw $s1, 0x14($sp) +/* A49890 802412D0 0080882D */ daddu $s1, $a0, $zero +/* A49894 802412D4 AFBF0018 */ sw $ra, 0x18($sp) +/* A49898 802412D8 AFB00010 */ sw $s0, 0x10($sp) +/* A4989C 802412DC 8E220148 */ lw $v0, 0x148($s1) +/* A498A0 802412E0 0C00EABB */ jal get_npc_unsafe +/* A498A4 802412E4 84440008 */ lh $a0, 8($v0) +/* A498A8 802412E8 24040064 */ addiu $a0, $zero, 0x64 +/* A498AC 802412EC 0C00A67F */ jal rand_int +/* A498B0 802412F0 0040802D */ daddu $s0, $v0, $zero +/* A498B4 802412F4 00021FC2 */ srl $v1, $v0, 0x1f +/* A498B8 802412F8 00431821 */ addu $v1, $v0, $v1 +/* A498BC 802412FC 00031843 */ sra $v1, $v1, 1 +/* A498C0 80241300 00031840 */ sll $v1, $v1, 1 +/* A498C4 80241304 00431023 */ subu $v0, $v0, $v1 +/* A498C8 80241308 3C014334 */ lui $at, 0x4334 +/* A498CC 8024130C 44811000 */ mtc1 $at, $f2 +/* A498D0 80241310 44820000 */ mtc1 $v0, $f0 +/* A498D4 80241314 00000000 */ nop +/* A498D8 80241318 46800020 */ cvt.s.w $f0, $f0 +/* A498DC 8024131C 46020002 */ mul.s $f0, $f0, $f2 +/* A498E0 80241320 00000000 */ nop +/* A498E4 80241324 3C013F4C */ lui $at, 0x3f4c +/* A498E8 80241328 3421CCCD */ ori $at, $at, 0xcccd +/* A498EC 8024132C 44812000 */ mtc1 $at, $f4 +/* A498F0 80241330 3C0142B4 */ lui $at, 0x42b4 +/* A498F4 80241334 44811000 */ mtc1 $at, $f2 +/* A498F8 80241338 2402000F */ addiu $v0, $zero, 0xf +/* A498FC 8024133C A602008E */ sh $v0, 0x8e($s0) +/* A49900 80241340 46020000 */ add.s $f0, $f0, $f2 +/* A49904 80241344 24020006 */ addiu $v0, $zero, 6 +/* A49908 80241348 E6040018 */ swc1 $f4, 0x18($s0) +/* A4990C 8024134C E600000C */ swc1 $f0, 0xc($s0) +/* A49910 80241350 AE220070 */ sw $v0, 0x70($s1) +/* A49914 80241354 8FBF0018 */ lw $ra, 0x18($sp) +/* A49918 80241358 8FB10014 */ lw $s1, 0x14($sp) +/* A4991C 8024135C 8FB00010 */ lw $s0, 0x10($sp) +/* A49920 80241360 03E00008 */ jr $ra +/* A49924 80241364 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368.s deleted file mode 100644 index 8c45e5703b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241368 -/* A49928 80241368 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4992C 8024136C AFB10014 */ sw $s1, 0x14($sp) -/* A49930 80241370 0080882D */ daddu $s1, $a0, $zero -/* A49934 80241374 AFBF0018 */ sw $ra, 0x18($sp) -/* A49938 80241378 AFB00010 */ sw $s0, 0x10($sp) -/* A4993C 8024137C 8E220148 */ lw $v0, 0x148($s1) -/* A49940 80241380 0C00EABB */ jal get_npc_unsafe -/* A49944 80241384 84440008 */ lh $a0, 8($v0) -/* A49948 80241388 0040802D */ daddu $s0, $v0, $zero -/* A4994C 8024138C 8E050018 */ lw $a1, 0x18($s0) -/* A49950 80241390 8E06000C */ lw $a2, 0xc($s0) -/* A49954 80241394 0C00EA95 */ jal npc_move_heading -/* A49958 80241398 0200202D */ daddu $a0, $s0, $zero -/* A4995C 8024139C 9602008E */ lhu $v0, 0x8e($s0) -/* A49960 802413A0 2442FFFF */ addiu $v0, $v0, -1 -/* A49964 802413A4 A602008E */ sh $v0, 0x8e($s0) -/* A49968 802413A8 00021400 */ sll $v0, $v0, 0x10 -/* A4996C 802413AC 1C400002 */ bgtz $v0, .L802413B8 -/* A49970 802413B0 2402000A */ addiu $v0, $zero, 0xa -/* A49974 802413B4 AE220070 */ sw $v0, 0x70($s1) -.L802413B8: -/* A49978 802413B8 8FBF0018 */ lw $ra, 0x18($sp) -/* A4997C 802413BC 8FB10014 */ lw $s1, 0x14($sp) -/* A49980 802413C0 8FB00010 */ lw $s0, 0x10($sp) -/* A49984 802413C4 03E00008 */ jr $ra -/* A49988 802413C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368_A49928.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368_A49928.s new file mode 100644 index 0000000000..71857abbe9 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241368_A49928.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241368_A49928 +/* A49928 80241368 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A4992C 8024136C AFB10014 */ sw $s1, 0x14($sp) +/* A49930 80241370 0080882D */ daddu $s1, $a0, $zero +/* A49934 80241374 AFBF0018 */ sw $ra, 0x18($sp) +/* A49938 80241378 AFB00010 */ sw $s0, 0x10($sp) +/* A4993C 8024137C 8E220148 */ lw $v0, 0x148($s1) +/* A49940 80241380 0C00EABB */ jal get_npc_unsafe +/* A49944 80241384 84440008 */ lh $a0, 8($v0) +/* A49948 80241388 0040802D */ daddu $s0, $v0, $zero +/* A4994C 8024138C 8E050018 */ lw $a1, 0x18($s0) +/* A49950 80241390 8E06000C */ lw $a2, 0xc($s0) +/* A49954 80241394 0C00EA95 */ jal npc_move_heading +/* A49958 80241398 0200202D */ daddu $a0, $s0, $zero +/* A4995C 8024139C 9602008E */ lhu $v0, 0x8e($s0) +/* A49960 802413A0 2442FFFF */ addiu $v0, $v0, -1 +/* A49964 802413A4 A602008E */ sh $v0, 0x8e($s0) +/* A49968 802413A8 00021400 */ sll $v0, $v0, 0x10 +/* A4996C 802413AC 1C400002 */ bgtz $v0, .L802413B8 +/* A49970 802413B0 2402000A */ addiu $v0, $zero, 0xa +/* A49974 802413B4 AE220070 */ sw $v0, 0x70($s1) +.L802413B8: +/* A49978 802413B8 8FBF0018 */ lw $ra, 0x18($sp) +/* A4997C 802413BC 8FB10014 */ lw $s1, 0x14($sp) +/* A49980 802413C0 8FB00010 */ lw $s0, 0x10($sp) +/* A49984 802413C4 03E00008 */ jr $ra +/* A49988 802413C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C.s deleted file mode 100644 index e2022f2438..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C.s +++ /dev/null @@ -1,117 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024150C -/* A49ACC 8024150C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A49AD0 80241510 AFB20028 */ sw $s2, 0x28($sp) -/* A49AD4 80241514 0080902D */ daddu $s2, $a0, $zero -/* A49AD8 80241518 AFBF002C */ sw $ra, 0x2c($sp) -/* A49ADC 8024151C AFB10024 */ sw $s1, 0x24($sp) -/* A49AE0 80241520 AFB00020 */ sw $s0, 0x20($sp) -/* A49AE4 80241524 8E510148 */ lw $s1, 0x148($s2) -/* A49AE8 80241528 0C00EABB */ jal get_npc_unsafe -/* A49AEC 8024152C 86240008 */ lh $a0, 8($s1) -/* A49AF0 80241530 8E23006C */ lw $v1, 0x6c($s1) -/* A49AF4 80241534 14600006 */ bnez $v1, .L80241550 -/* A49AF8 80241538 0040802D */ daddu $s0, $v0, $zero -/* A49AFC 8024153C 8603008E */ lh $v1, 0x8e($s0) -/* A49B00 80241540 00031100 */ sll $v0, $v1, 4 -/* A49B04 80241544 00431023 */ subu $v0, $v0, $v1 -/* A49B08 80241548 08090558 */ j .L80241560 -/* A49B0C 8024154C 24430082 */ addiu $v1, $v0, 0x82 -.L80241550: -/* A49B10 80241550 8603008E */ lh $v1, 0x8e($s0) -/* A49B14 80241554 00031100 */ sll $v0, $v1, 4 -/* A49B18 80241558 00431023 */ subu $v0, $v0, $v1 -/* A49B1C 8024155C 2443001E */ addiu $v1, $v0, 0x1e -.L80241560: -/* A49B20 80241560 00031400 */ sll $v0, $v1, 0x10 -/* A49B24 80241564 00021403 */ sra $v0, $v0, 0x10 -/* A49B28 80241568 28420100 */ slti $v0, $v0, 0x100 -/* A49B2C 8024156C 50400001 */ beql $v0, $zero, .L80241574 -/* A49B30 80241570 240300FF */ addiu $v1, $zero, 0xff -.L80241574: -/* A49B34 80241574 8602008E */ lh $v0, 0x8e($s0) -/* A49B38 80241578 3C018024 */ lui $at, 0x8024 -/* A49B3C 8024157C D4223920 */ ldc1 $f2, 0x3920($at) -/* A49B40 80241580 44820000 */ mtc1 $v0, $f0 -/* A49B44 80241584 00000000 */ nop -/* A49B48 80241588 46800020 */ cvt.s.w $f0, $f0 -/* A49B4C 8024158C 46000021 */ cvt.d.s $f0, $f0 -/* A49B50 80241590 46220002 */ mul.d $f0, $f0, $f2 -/* A49B54 80241594 00000000 */ nop -/* A49B58 80241598 3C018024 */ lui $at, 0x8024 -/* A49B5C 8024159C D4223928 */ ldc1 $f2, 0x3928($at) -/* A49B60 802415A0 46220000 */ add.d $f0, $f0, $f2 -/* A49B64 802415A4 A20300AC */ sb $v1, 0xac($s0) -/* A49B68 802415A8 3C013FF0 */ lui $at, 0x3ff0 -/* A49B6C 802415AC 44811800 */ mtc1 $at, $f3 -/* A49B70 802415B0 44801000 */ mtc1 $zero, $f2 -/* A49B74 802415B4 46200020 */ cvt.s.d $f0, $f0 -/* A49B78 802415B8 E6000054 */ swc1 $f0, 0x54($s0) -/* A49B7C 802415BC 46000021 */ cvt.d.s $f0, $f0 -/* A49B80 802415C0 4620103C */ c.lt.d $f2, $f0 -/* A49B84 802415C4 00000000 */ nop -/* A49B88 802415C8 45000005 */ bc1f .L802415E0 -/* A49B8C 802415CC 24030005 */ addiu $v1, $zero, 5 -/* A49B90 802415D0 3C013F80 */ lui $at, 0x3f80 -/* A49B94 802415D4 44810000 */ mtc1 $at, $f0 -/* A49B98 802415D8 00000000 */ nop -/* A49B9C 802415DC E6000054 */ swc1 $f0, 0x54($s0) -.L802415E0: -/* A49BA0 802415E0 C6000054 */ lwc1 $f0, 0x54($s0) -/* A49BA4 802415E4 9602008E */ lhu $v0, 0x8e($s0) -/* A49BA8 802415E8 46000086 */ mov.s $f2, $f0 -/* A49BAC 802415EC 24420001 */ addiu $v0, $v0, 1 -/* A49BB0 802415F0 A602008E */ sh $v0, 0x8e($s0) -/* A49BB4 802415F4 00021400 */ sll $v0, $v0, 0x10 -/* A49BB8 802415F8 00021403 */ sra $v0, $v0, 0x10 -/* A49BBC 802415FC E6000058 */ swc1 $f0, 0x58($s0) -/* A49BC0 80241600 14430008 */ bne $v0, $v1, .L80241624 -/* A49BC4 80241604 E602005C */ swc1 $f2, 0x5c($s0) -/* A49BC8 80241608 0C00EAE8 */ jal enable_npc_shadow -/* A49BCC 8024160C 0200202D */ daddu $a0, $s0, $zero -/* A49BD0 80241610 3C03E0EF */ lui $v1, 0xe0ef -/* A49BD4 80241614 8E220000 */ lw $v0, ($s1) -/* A49BD8 80241618 3463FFFF */ ori $v1, $v1, 0xffff -/* A49BDC 8024161C 00431024 */ and $v0, $v0, $v1 -/* A49BE0 80241620 AE220000 */ sw $v0, ($s1) -.L80241624: -/* A49BE4 80241624 8E22006C */ lw $v0, 0x6c($s1) -/* A49BE8 80241628 1440000E */ bnez $v0, .L80241664 -/* A49BEC 8024162C 00000000 */ nop -/* A49BF0 80241630 8602008E */ lh $v0, 0x8e($s0) -/* A49BF4 80241634 28420014 */ slti $v0, $v0, 0x14 -/* A49BF8 80241638 14400017 */ bnez $v0, .L80241698 -/* A49BFC 8024163C 0000282D */ daddu $a1, $zero, $zero -/* A49C00 80241640 00A0302D */ daddu $a2, $a1, $zero -/* A49C04 80241644 AFA00010 */ sw $zero, 0x10($sp) -/* A49C08 80241648 AFA00014 */ sw $zero, 0x14($sp) -/* A49C0C 8024164C AFA00018 */ sw $zero, 0x18($sp) -/* A49C10 80241650 8E040024 */ lw $a0, 0x24($s0) -/* A49C14 80241654 0C0B7A25 */ jal func_802DE894 -/* A49C18 80241658 00A0382D */ daddu $a3, $a1, $zero -/* A49C1C 8024165C 0809059D */ j .L80241674 -/* A49C20 80241660 00000000 */ nop -.L80241664: -/* A49C24 80241664 8602008E */ lh $v0, 0x8e($s0) -/* A49C28 80241668 2842000A */ slti $v0, $v0, 0xa -/* A49C2C 8024166C 1440000A */ bnez $v0, .L80241698 -/* A49C30 80241670 00000000 */ nop -.L80241674: -/* A49C34 80241674 3C013F80 */ lui $at, 0x3f80 -/* A49C38 80241678 44810000 */ mtc1 $at, $f0 -/* A49C3C 8024167C 240200FF */ addiu $v0, $zero, 0xff -/* A49C40 80241680 A20200AC */ sb $v0, 0xac($s0) -/* A49C44 80241684 24020014 */ addiu $v0, $zero, 0x14 -/* A49C48 80241688 E6000054 */ swc1 $f0, 0x54($s0) -/* A49C4C 8024168C E6000058 */ swc1 $f0, 0x58($s0) -/* A49C50 80241690 E600005C */ swc1 $f0, 0x5c($s0) -/* A49C54 80241694 AE420070 */ sw $v0, 0x70($s2) -.L80241698: -/* A49C58 80241698 8FBF002C */ lw $ra, 0x2c($sp) -/* A49C5C 8024169C 8FB20028 */ lw $s2, 0x28($sp) -/* A49C60 802416A0 8FB10024 */ lw $s1, 0x24($sp) -/* A49C64 802416A4 8FB00020 */ lw $s0, 0x20($sp) -/* A49C68 802416A8 03E00008 */ jr $ra -/* A49C6C 802416AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s new file mode 100644 index 0000000000..0a0942659a --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_8024150C_A49ACC.s @@ -0,0 +1,117 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024150C_A49ACC +/* A49ACC 8024150C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A49AD0 80241510 AFB20028 */ sw $s2, 0x28($sp) +/* A49AD4 80241514 0080902D */ daddu $s2, $a0, $zero +/* A49AD8 80241518 AFBF002C */ sw $ra, 0x2c($sp) +/* A49ADC 8024151C AFB10024 */ sw $s1, 0x24($sp) +/* A49AE0 80241520 AFB00020 */ sw $s0, 0x20($sp) +/* A49AE4 80241524 8E510148 */ lw $s1, 0x148($s2) +/* A49AE8 80241528 0C00EABB */ jal get_npc_unsafe +/* A49AEC 8024152C 86240008 */ lh $a0, 8($s1) +/* A49AF0 80241530 8E23006C */ lw $v1, 0x6c($s1) +/* A49AF4 80241534 14600006 */ bnez $v1, .L80241550 +/* A49AF8 80241538 0040802D */ daddu $s0, $v0, $zero +/* A49AFC 8024153C 8603008E */ lh $v1, 0x8e($s0) +/* A49B00 80241540 00031100 */ sll $v0, $v1, 4 +/* A49B04 80241544 00431023 */ subu $v0, $v0, $v1 +/* A49B08 80241548 08090558 */ j .L80241560 +/* A49B0C 8024154C 24430082 */ addiu $v1, $v0, 0x82 +.L80241550: +/* A49B10 80241550 8603008E */ lh $v1, 0x8e($s0) +/* A49B14 80241554 00031100 */ sll $v0, $v1, 4 +/* A49B18 80241558 00431023 */ subu $v0, $v0, $v1 +/* A49B1C 8024155C 2443001E */ addiu $v1, $v0, 0x1e +.L80241560: +/* A49B20 80241560 00031400 */ sll $v0, $v1, 0x10 +/* A49B24 80241564 00021403 */ sra $v0, $v0, 0x10 +/* A49B28 80241568 28420100 */ slti $v0, $v0, 0x100 +/* A49B2C 8024156C 50400001 */ beql $v0, $zero, .L80241574 +/* A49B30 80241570 240300FF */ addiu $v1, $zero, 0xff +.L80241574: +/* A49B34 80241574 8602008E */ lh $v0, 0x8e($s0) +/* A49B38 80241578 3C018024 */ lui $at, 0x8024 +/* A49B3C 8024157C D4223920 */ ldc1 $f2, 0x3920($at) +/* A49B40 80241580 44820000 */ mtc1 $v0, $f0 +/* A49B44 80241584 00000000 */ nop +/* A49B48 80241588 46800020 */ cvt.s.w $f0, $f0 +/* A49B4C 8024158C 46000021 */ cvt.d.s $f0, $f0 +/* A49B50 80241590 46220002 */ mul.d $f0, $f0, $f2 +/* A49B54 80241594 00000000 */ nop +/* A49B58 80241598 3C018024 */ lui $at, 0x8024 +/* A49B5C 8024159C D4223928 */ ldc1 $f2, 0x3928($at) +/* A49B60 802415A0 46220000 */ add.d $f0, $f0, $f2 +/* A49B64 802415A4 A20300AC */ sb $v1, 0xac($s0) +/* A49B68 802415A8 3C013FF0 */ lui $at, 0x3ff0 +/* A49B6C 802415AC 44811800 */ mtc1 $at, $f3 +/* A49B70 802415B0 44801000 */ mtc1 $zero, $f2 +/* A49B74 802415B4 46200020 */ cvt.s.d $f0, $f0 +/* A49B78 802415B8 E6000054 */ swc1 $f0, 0x54($s0) +/* A49B7C 802415BC 46000021 */ cvt.d.s $f0, $f0 +/* A49B80 802415C0 4620103C */ c.lt.d $f2, $f0 +/* A49B84 802415C4 00000000 */ nop +/* A49B88 802415C8 45000005 */ bc1f .L802415E0 +/* A49B8C 802415CC 24030005 */ addiu $v1, $zero, 5 +/* A49B90 802415D0 3C013F80 */ lui $at, 0x3f80 +/* A49B94 802415D4 44810000 */ mtc1 $at, $f0 +/* A49B98 802415D8 00000000 */ nop +/* A49B9C 802415DC E6000054 */ swc1 $f0, 0x54($s0) +.L802415E0: +/* A49BA0 802415E0 C6000054 */ lwc1 $f0, 0x54($s0) +/* A49BA4 802415E4 9602008E */ lhu $v0, 0x8e($s0) +/* A49BA8 802415E8 46000086 */ mov.s $f2, $f0 +/* A49BAC 802415EC 24420001 */ addiu $v0, $v0, 1 +/* A49BB0 802415F0 A602008E */ sh $v0, 0x8e($s0) +/* A49BB4 802415F4 00021400 */ sll $v0, $v0, 0x10 +/* A49BB8 802415F8 00021403 */ sra $v0, $v0, 0x10 +/* A49BBC 802415FC E6000058 */ swc1 $f0, 0x58($s0) +/* A49BC0 80241600 14430008 */ bne $v0, $v1, .L80241624 +/* A49BC4 80241604 E602005C */ swc1 $f2, 0x5c($s0) +/* A49BC8 80241608 0C00EAE8 */ jal enable_npc_shadow +/* A49BCC 8024160C 0200202D */ daddu $a0, $s0, $zero +/* A49BD0 80241610 3C03E0EF */ lui $v1, 0xe0ef +/* A49BD4 80241614 8E220000 */ lw $v0, ($s1) +/* A49BD8 80241618 3463FFFF */ ori $v1, $v1, 0xffff +/* A49BDC 8024161C 00431024 */ and $v0, $v0, $v1 +/* A49BE0 80241620 AE220000 */ sw $v0, ($s1) +.L80241624: +/* A49BE4 80241624 8E22006C */ lw $v0, 0x6c($s1) +/* A49BE8 80241628 1440000E */ bnez $v0, .L80241664 +/* A49BEC 8024162C 00000000 */ nop +/* A49BF0 80241630 8602008E */ lh $v0, 0x8e($s0) +/* A49BF4 80241634 28420014 */ slti $v0, $v0, 0x14 +/* A49BF8 80241638 14400017 */ bnez $v0, .L80241698 +/* A49BFC 8024163C 0000282D */ daddu $a1, $zero, $zero +/* A49C00 80241640 00A0302D */ daddu $a2, $a1, $zero +/* A49C04 80241644 AFA00010 */ sw $zero, 0x10($sp) +/* A49C08 80241648 AFA00014 */ sw $zero, 0x14($sp) +/* A49C0C 8024164C AFA00018 */ sw $zero, 0x18($sp) +/* A49C10 80241650 8E040024 */ lw $a0, 0x24($s0) +/* A49C14 80241654 0C0B7A25 */ jal func_802DE894 +/* A49C18 80241658 00A0382D */ daddu $a3, $a1, $zero +/* A49C1C 8024165C 0809059D */ j .L80241674 +/* A49C20 80241660 00000000 */ nop +.L80241664: +/* A49C24 80241664 8602008E */ lh $v0, 0x8e($s0) +/* A49C28 80241668 2842000A */ slti $v0, $v0, 0xa +/* A49C2C 8024166C 1440000A */ bnez $v0, .L80241698 +/* A49C30 80241670 00000000 */ nop +.L80241674: +/* A49C34 80241674 3C013F80 */ lui $at, 0x3f80 +/* A49C38 80241678 44810000 */ mtc1 $at, $f0 +/* A49C3C 8024167C 240200FF */ addiu $v0, $zero, 0xff +/* A49C40 80241680 A20200AC */ sb $v0, 0xac($s0) +/* A49C44 80241684 24020014 */ addiu $v0, $zero, 0x14 +/* A49C48 80241688 E6000054 */ swc1 $f0, 0x54($s0) +/* A49C4C 8024168C E6000058 */ swc1 $f0, 0x58($s0) +/* A49C50 80241690 E600005C */ swc1 $f0, 0x5c($s0) +/* A49C54 80241694 AE420070 */ sw $v0, 0x70($s2) +.L80241698: +/* A49C58 80241698 8FBF002C */ lw $ra, 0x2c($sp) +/* A49C5C 8024169C 8FB20028 */ lw $s2, 0x28($sp) +/* A49C60 802416A0 8FB10024 */ lw $s1, 0x24($sp) +/* A49C64 802416A4 8FB00020 */ lw $s0, 0x20($sp) +/* A49C68 802416A8 03E00008 */ jr $ra +/* A49C6C 802416AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0.s deleted file mode 100644 index 0e0111060c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416B0 -/* A49C70 802416B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A49C74 802416B4 AFB00010 */ sw $s0, 0x10($sp) -/* A49C78 802416B8 0080802D */ daddu $s0, $a0, $zero -/* A49C7C 802416BC AFBF0014 */ sw $ra, 0x14($sp) -/* A49C80 802416C0 8E020148 */ lw $v0, 0x148($s0) -/* A49C84 802416C4 0C00EABB */ jal get_npc_unsafe -/* A49C88 802416C8 84440008 */ lh $a0, 8($v0) -/* A49C8C 802416CC 24030028 */ addiu $v1, $zero, 0x28 -/* A49C90 802416D0 A443008E */ sh $v1, 0x8e($v0) -/* A49C94 802416D4 24020015 */ addiu $v0, $zero, 0x15 -/* A49C98 802416D8 AE020070 */ sw $v0, 0x70($s0) -/* A49C9C 802416DC 8FBF0014 */ lw $ra, 0x14($sp) -/* A49CA0 802416E0 8FB00010 */ lw $s0, 0x10($sp) -/* A49CA4 802416E4 03E00008 */ jr $ra -/* A49CA8 802416E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0_A49C70.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0_A49C70.s new file mode 100644 index 0000000000..78e0a04fba --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416B0_A49C70.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416B0_A49C70 +/* A49C70 802416B0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A49C74 802416B4 AFB00010 */ sw $s0, 0x10($sp) +/* A49C78 802416B8 0080802D */ daddu $s0, $a0, $zero +/* A49C7C 802416BC AFBF0014 */ sw $ra, 0x14($sp) +/* A49C80 802416C0 8E020148 */ lw $v0, 0x148($s0) +/* A49C84 802416C4 0C00EABB */ jal get_npc_unsafe +/* A49C88 802416C8 84440008 */ lh $a0, 8($v0) +/* A49C8C 802416CC 24030028 */ addiu $v1, $zero, 0x28 +/* A49C90 802416D0 A443008E */ sh $v1, 0x8e($v0) +/* A49C94 802416D4 24020015 */ addiu $v0, $zero, 0x15 +/* A49C98 802416D8 AE020070 */ sw $v0, 0x70($s0) +/* A49C9C 802416DC 8FBF0014 */ lw $ra, 0x14($sp) +/* A49CA0 802416E0 8FB00010 */ lw $s0, 0x10($sp) +/* A49CA4 802416E4 03E00008 */ jr $ra +/* A49CA8 802416E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s index d3f219c96f..9e4c25ccdf 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_802416EC_A49CAC.s @@ -58,7 +58,7 @@ glabel func_802416EC_A49CAC .L802417C0: /* A49D80 802417C0 8E450024 */ lw $a1, 0x24($s2) /* A49D84 802417C4 8E460028 */ lw $a2, 0x28($s2) -/* A49D88 802417C8 0C090292 */ jal func_80240A48 +/* A49D88 802417C8 0C090292 */ jal func_80240A48_A49008 /* A49D8C 802417CC 0260382D */ daddu $a3, $s3, $zero /* A49D90 802417D0 24030001 */ addiu $v1, $zero, 1 /* A49D94 802417D4 1443002C */ bne $v0, $v1, .L80241888 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918.s deleted file mode 100644 index c7afe97ada..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241918 -/* A49ED8 80241918 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A49EDC 8024191C AFB3003C */ sw $s3, 0x3c($sp) -/* A49EE0 80241920 0080982D */ daddu $s3, $a0, $zero -/* A49EE4 80241924 AFBF0044 */ sw $ra, 0x44($sp) -/* A49EE8 80241928 AFB40040 */ sw $s4, 0x40($sp) -/* A49EEC 8024192C AFB20038 */ sw $s2, 0x38($sp) -/* A49EF0 80241930 AFB10034 */ sw $s1, 0x34($sp) -/* A49EF4 80241934 AFB00030 */ sw $s0, 0x30($sp) -/* A49EF8 80241938 8E720148 */ lw $s2, 0x148($s3) -/* A49EFC 8024193C 00A0882D */ daddu $s1, $a1, $zero -/* A49F00 80241940 86440008 */ lh $a0, 8($s2) -/* A49F04 80241944 0C00EABB */ jal get_npc_unsafe -/* A49F08 80241948 00C0A02D */ daddu $s4, $a2, $zero -/* A49F0C 8024194C 0040802D */ daddu $s0, $v0, $zero -/* A49F10 80241950 9602008E */ lhu $v0, 0x8e($s0) -/* A49F14 80241954 2442FFFF */ addiu $v0, $v0, -1 -/* A49F18 80241958 A602008E */ sh $v0, 0x8e($s0) -/* A49F1C 8024195C 00021400 */ sll $v0, $v0, 0x10 -/* A49F20 80241960 1C400032 */ bgtz $v0, .L80241A2C -/* A49F24 80241964 00000000 */ nop -/* A49F28 80241968 0260202D */ daddu $a0, $s3, $zero -/* A49F2C 8024196C 8E250024 */ lw $a1, 0x24($s1) -/* A49F30 80241970 8E260028 */ lw $a2, 0x28($s1) -/* A49F34 80241974 0C090292 */ jal func_80240A48 -/* A49F38 80241978 0280382D */ daddu $a3, $s4, $zero -/* A49F3C 8024197C 0040882D */ daddu $s1, $v0, $zero -/* A49F40 80241980 24020001 */ addiu $v0, $zero, 1 -/* A49F44 80241984 1222001D */ beq $s1, $v0, .L802419FC -/* A49F48 80241988 0200282D */ daddu $a1, $s0, $zero -/* A49F4C 8024198C 24040002 */ addiu $a0, $zero, 2 -/* A49F50 80241990 0000302D */ daddu $a2, $zero, $zero -/* A49F54 80241994 860300A8 */ lh $v1, 0xa8($s0) -/* A49F58 80241998 3C013F80 */ lui $at, 0x3f80 -/* A49F5C 8024199C 44810000 */ mtc1 $at, $f0 -/* A49F60 802419A0 3C014000 */ lui $at, 0x4000 -/* A49F64 802419A4 44811000 */ mtc1 $at, $f2 -/* A49F68 802419A8 3C01C1A0 */ lui $at, 0xc1a0 -/* A49F6C 802419AC 44812000 */ mtc1 $at, $f4 -/* A49F70 802419B0 2402000C */ addiu $v0, $zero, 0xc -/* A49F74 802419B4 AFA2001C */ sw $v0, 0x1c($sp) -/* A49F78 802419B8 44833000 */ mtc1 $v1, $f6 -/* A49F7C 802419BC 00000000 */ nop -/* A49F80 802419C0 468031A0 */ cvt.s.w $f6, $f6 -/* A49F84 802419C4 44073000 */ mfc1 $a3, $f6 -/* A49F88 802419C8 27A20028 */ addiu $v0, $sp, 0x28 -/* A49F8C 802419CC AFA20020 */ sw $v0, 0x20($sp) -/* A49F90 802419D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A49F94 802419D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A49F98 802419D8 0C01BFA4 */ jal fx_emote -/* A49F9C 802419DC E7A40018 */ swc1 $f4, 0x18($sp) -/* A49FA0 802419E0 8E4200CC */ lw $v0, 0xcc($s2) -/* A49FA4 802419E4 8C430000 */ lw $v1, ($v0) -/* A49FA8 802419E8 2402000F */ addiu $v0, $zero, 0xf -/* A49FAC 802419EC A602008E */ sh $v0, 0x8e($s0) -/* A49FB0 802419F0 AE030028 */ sw $v1, 0x28($s0) -/* A49FB4 802419F4 0809068B */ j .L80241A2C -/* A49FB8 802419F8 AE600070 */ sw $zero, 0x70($s3) -.L802419FC: -/* A49FBC 802419FC 0200202D */ daddu $a0, $s0, $zero -/* A49FC0 80241A00 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A49FC4 80241A04 0C012530 */ jal func_800494C0 -/* A49FC8 80241A08 0000302D */ daddu $a2, $zero, $zero -/* A49FCC 80241A0C 86440008 */ lh $a0, 8($s2) -/* A49FD0 80241A10 0C00FB3A */ jal get_enemy -/* A49FD4 80241A14 24840001 */ addiu $a0, $a0, 1 -/* A49FD8 80241A18 AC51006C */ sw $s1, 0x6c($v0) -/* A49FDC 80241A1C 24020014 */ addiu $v0, $zero, 0x14 -/* A49FE0 80241A20 A602008E */ sh $v0, 0x8e($s0) -/* A49FE4 80241A24 24020018 */ addiu $v0, $zero, 0x18 -/* A49FE8 80241A28 AE620070 */ sw $v0, 0x70($s3) -.L80241A2C: -/* A49FEC 80241A2C 8FBF0044 */ lw $ra, 0x44($sp) -/* A49FF0 80241A30 8FB40040 */ lw $s4, 0x40($sp) -/* A49FF4 80241A34 8FB3003C */ lw $s3, 0x3c($sp) -/* A49FF8 80241A38 8FB20038 */ lw $s2, 0x38($sp) -/* A49FFC 80241A3C 8FB10034 */ lw $s1, 0x34($sp) -/* A4A000 80241A40 8FB00030 */ lw $s0, 0x30($sp) -/* A4A004 80241A44 03E00008 */ jr $ra -/* A4A008 80241A48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s new file mode 100644 index 0000000000..4c3f259980 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241918_A49ED8.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241918_A49ED8 +/* A49ED8 80241918 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A49EDC 8024191C AFB3003C */ sw $s3, 0x3c($sp) +/* A49EE0 80241920 0080982D */ daddu $s3, $a0, $zero +/* A49EE4 80241924 AFBF0044 */ sw $ra, 0x44($sp) +/* A49EE8 80241928 AFB40040 */ sw $s4, 0x40($sp) +/* A49EEC 8024192C AFB20038 */ sw $s2, 0x38($sp) +/* A49EF0 80241930 AFB10034 */ sw $s1, 0x34($sp) +/* A49EF4 80241934 AFB00030 */ sw $s0, 0x30($sp) +/* A49EF8 80241938 8E720148 */ lw $s2, 0x148($s3) +/* A49EFC 8024193C 00A0882D */ daddu $s1, $a1, $zero +/* A49F00 80241940 86440008 */ lh $a0, 8($s2) +/* A49F04 80241944 0C00EABB */ jal get_npc_unsafe +/* A49F08 80241948 00C0A02D */ daddu $s4, $a2, $zero +/* A49F0C 8024194C 0040802D */ daddu $s0, $v0, $zero +/* A49F10 80241950 9602008E */ lhu $v0, 0x8e($s0) +/* A49F14 80241954 2442FFFF */ addiu $v0, $v0, -1 +/* A49F18 80241958 A602008E */ sh $v0, 0x8e($s0) +/* A49F1C 8024195C 00021400 */ sll $v0, $v0, 0x10 +/* A49F20 80241960 1C400032 */ bgtz $v0, .L80241A2C +/* A49F24 80241964 00000000 */ nop +/* A49F28 80241968 0260202D */ daddu $a0, $s3, $zero +/* A49F2C 8024196C 8E250024 */ lw $a1, 0x24($s1) +/* A49F30 80241970 8E260028 */ lw $a2, 0x28($s1) +/* A49F34 80241974 0C090292 */ jal func_80240A48_A49008 +/* A49F38 80241978 0280382D */ daddu $a3, $s4, $zero +/* A49F3C 8024197C 0040882D */ daddu $s1, $v0, $zero +/* A49F40 80241980 24020001 */ addiu $v0, $zero, 1 +/* A49F44 80241984 1222001D */ beq $s1, $v0, .L802419FC +/* A49F48 80241988 0200282D */ daddu $a1, $s0, $zero +/* A49F4C 8024198C 24040002 */ addiu $a0, $zero, 2 +/* A49F50 80241990 0000302D */ daddu $a2, $zero, $zero +/* A49F54 80241994 860300A8 */ lh $v1, 0xa8($s0) +/* A49F58 80241998 3C013F80 */ lui $at, 0x3f80 +/* A49F5C 8024199C 44810000 */ mtc1 $at, $f0 +/* A49F60 802419A0 3C014000 */ lui $at, 0x4000 +/* A49F64 802419A4 44811000 */ mtc1 $at, $f2 +/* A49F68 802419A8 3C01C1A0 */ lui $at, 0xc1a0 +/* A49F6C 802419AC 44812000 */ mtc1 $at, $f4 +/* A49F70 802419B0 2402000C */ addiu $v0, $zero, 0xc +/* A49F74 802419B4 AFA2001C */ sw $v0, 0x1c($sp) +/* A49F78 802419B8 44833000 */ mtc1 $v1, $f6 +/* A49F7C 802419BC 00000000 */ nop +/* A49F80 802419C0 468031A0 */ cvt.s.w $f6, $f6 +/* A49F84 802419C4 44073000 */ mfc1 $a3, $f6 +/* A49F88 802419C8 27A20028 */ addiu $v0, $sp, 0x28 +/* A49F8C 802419CC AFA20020 */ sw $v0, 0x20($sp) +/* A49F90 802419D0 E7A00010 */ swc1 $f0, 0x10($sp) +/* A49F94 802419D4 E7A20014 */ swc1 $f2, 0x14($sp) +/* A49F98 802419D8 0C01BFA4 */ jal fx_emote +/* A49F9C 802419DC E7A40018 */ swc1 $f4, 0x18($sp) +/* A49FA0 802419E0 8E4200CC */ lw $v0, 0xcc($s2) +/* A49FA4 802419E4 8C430000 */ lw $v1, ($v0) +/* A49FA8 802419E8 2402000F */ addiu $v0, $zero, 0xf +/* A49FAC 802419EC A602008E */ sh $v0, 0x8e($s0) +/* A49FB0 802419F0 AE030028 */ sw $v1, 0x28($s0) +/* A49FB4 802419F4 0809068B */ j .L80241A2C +/* A49FB8 802419F8 AE600070 */ sw $zero, 0x70($s3) +.L802419FC: +/* A49FBC 802419FC 0200202D */ daddu $a0, $s0, $zero +/* A49FC0 80241A00 240520D5 */ addiu $a1, $zero, 0x20d5 +/* A49FC4 80241A04 0C012530 */ jal func_800494C0 +/* A49FC8 80241A08 0000302D */ daddu $a2, $zero, $zero +/* A49FCC 80241A0C 86440008 */ lh $a0, 8($s2) +/* A49FD0 80241A10 0C00FB3A */ jal get_enemy +/* A49FD4 80241A14 24840001 */ addiu $a0, $a0, 1 +/* A49FD8 80241A18 AC51006C */ sw $s1, 0x6c($v0) +/* A49FDC 80241A1C 24020014 */ addiu $v0, $zero, 0x14 +/* A49FE0 80241A20 A602008E */ sh $v0, 0x8e($s0) +/* A49FE4 80241A24 24020018 */ addiu $v0, $zero, 0x18 +/* A49FE8 80241A28 AE620070 */ sw $v0, 0x70($s3) +.L80241A2C: +/* A49FEC 80241A2C 8FBF0044 */ lw $ra, 0x44($sp) +/* A49FF0 80241A30 8FB40040 */ lw $s4, 0x40($sp) +/* A49FF4 80241A34 8FB3003C */ lw $s3, 0x3c($sp) +/* A49FF8 80241A38 8FB20038 */ lw $s2, 0x38($sp) +/* A49FFC 80241A3C 8FB10034 */ lw $s1, 0x34($sp) +/* A4A000 80241A40 8FB00030 */ lw $s0, 0x30($sp) +/* A4A004 80241A44 03E00008 */ jr $ra +/* A4A008 80241A48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s index be5ba1de73..c984274524 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241AB4_A4A074.s @@ -90,7 +90,7 @@ glabel func_80241AB4_A4A074 /* A4A1BC 80241BFC 00000000 */ nop /* A4A1C0 80241C00 02A0202D */ daddu $a0, $s5, $zero /* A4A1C4 80241C04 0260282D */ daddu $a1, $s3, $zero -/* A4A1C8 80241C08 0C09044A */ jal func_80241128 +/* A4A1C8 80241C08 0C09044A */ jal func_80241128_A496E8 /* A4A1CC 80241C0C 0280302D */ daddu $a2, $s4, $zero /* A4A1D0 80241C10 8EA30070 */ lw $v1, 0x70($s5) /* A4A1D4 80241C14 24020001 */ addiu $v0, $zero, 1 @@ -98,57 +98,57 @@ glabel func_80241AB4_A4A074 /* A4A1DC 80241C1C 00000000 */ nop /* A4A1E0 80241C20 02A0202D */ daddu $a0, $s5, $zero /* A4A1E4 80241C24 0260282D */ daddu $a1, $s3, $zero -/* A4A1E8 80241C28 0C090467 */ jal func_8024119C +/* A4A1E8 80241C28 0C090467 */ jal func_8024119C_A4975C /* A4A1EC 80241C2C 0280302D */ daddu $a2, $s4, $zero /* A4A1F0 80241C30 0809073E */ j .L80241CF8 /* A4A1F4 80241C34 00000000 */ nop /* A4A1F8 80241C38 02A0202D */ daddu $a0, $s5, $zero /* A4A1FC 80241C3C 0260282D */ daddu $a1, $s3, $zero -/* A4A200 80241C40 0C0904B2 */ jal func_802412C8 +/* A4A200 80241C40 0C0904B2 */ jal func_802412C8_A49888 /* A4A204 80241C44 0280302D */ daddu $a2, $s4, $zero /* A4A208 80241C48 02A0202D */ daddu $a0, $s5, $zero /* A4A20C 80241C4C 0260282D */ daddu $a1, $s3, $zero -/* A4A210 80241C50 0C0904DA */ jal func_80241368 +/* A4A210 80241C50 0C0904DA */ jal func_80241368_A49928 /* A4A214 80241C54 0280302D */ daddu $a2, $s4, $zero /* A4A218 80241C58 0809073E */ j .L80241CF8 /* A4A21C 80241C5C 00000000 */ nop /* A4A220 80241C60 02A0202D */ daddu $a0, $s5, $zero /* A4A224 80241C64 0260282D */ daddu $a1, $s3, $zero -/* A4A228 80241C68 0C0904F3 */ jal func_802413CC +/* A4A228 80241C68 0C0904F3 */ jal func_802413CC_A4998C /* A4A22C 80241C6C 0280302D */ daddu $a2, $s4, $zero /* A4A230 80241C70 02A0202D */ daddu $a0, $s5, $zero /* A4A234 80241C74 0260282D */ daddu $a1, $s3, $zero -/* A4A238 80241C78 0C090543 */ jal func_8024150C +/* A4A238 80241C78 0C090543 */ jal func_8024150C_A49ACC /* A4A23C 80241C7C 0280302D */ daddu $a2, $s4, $zero /* A4A240 80241C80 0809073E */ j .L80241CF8 /* A4A244 80241C84 00000000 */ nop /* A4A248 80241C88 02A0202D */ daddu $a0, $s5, $zero /* A4A24C 80241C8C 0260282D */ daddu $a1, $s3, $zero -/* A4A250 80241C90 0C0905AC */ jal func_802416B0 +/* A4A250 80241C90 0C0905AC */ jal func_802416B0_A49C70 /* A4A254 80241C94 0280302D */ daddu $a2, $s4, $zero /* A4A258 80241C98 0809073E */ j .L80241CF8 /* A4A25C 80241C9C 00000000 */ nop /* A4A260 80241CA0 02A0202D */ daddu $a0, $s5, $zero /* A4A264 80241CA4 0260282D */ daddu $a1, $s3, $zero -/* A4A268 80241CA8 0C0905BB */ jal func_802416EC +/* A4A268 80241CA8 0C0905BB */ jal func_802416EC_A49CAC /* A4A26C 80241CAC 0280302D */ daddu $a2, $s4, $zero /* A4A270 80241CB0 0809073E */ j .L80241CF8 /* A4A274 80241CB4 00000000 */ nop /* A4A278 80241CB8 02A0202D */ daddu $a0, $s5, $zero /* A4A27C 80241CBC 0260282D */ daddu $a1, $s3, $zero -/* A4A280 80241CC0 0C09062B */ jal func_802418AC +/* A4A280 80241CC0 0C09062B */ jal func_802418AC_A49E6C /* A4A284 80241CC4 0280302D */ daddu $a2, $s4, $zero /* A4A288 80241CC8 0809073E */ j .L80241CF8 /* A4A28C 80241CCC 00000000 */ nop /* A4A290 80241CD0 02A0202D */ daddu $a0, $s5, $zero /* A4A294 80241CD4 0260282D */ daddu $a1, $s3, $zero -/* A4A298 80241CD8 0C090646 */ jal func_80241918 +/* A4A298 80241CD8 0C090646 */ jal func_80241918_A49ED8 /* A4A29C 80241CDC 0280302D */ daddu $a2, $s4, $zero /* A4A2A0 80241CE0 0809073E */ j .L80241CF8 /* A4A2A4 80241CE4 00000000 */ nop /* A4A2A8 80241CE8 02A0202D */ daddu $a0, $s5, $zero /* A4A2AC 80241CEC 0260282D */ daddu $a1, $s3, $zero -/* A4A2B0 80241CF0 0C090693 */ jal func_80241A4C +/* A4A2B0 80241CF0 0C090693 */ jal func_80241A4C_A4A00C /* A4A2B4 80241CF4 0280302D */ daddu $a2, $s4, $zero .L80241CF8: /* A4A2B8 80241CF8 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20.s deleted file mode 100644 index a63fea4a29..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D20 -/* A4A2E0 80241D20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A4A2E4 80241D24 AFBF0020 */ sw $ra, 0x20($sp) -/* A4A2E8 80241D28 8C820148 */ lw $v0, 0x148($a0) -/* A4A2EC 80241D2C 0C00EABB */ jal get_npc_unsafe -/* A4A2F0 80241D30 84440008 */ lh $a0, 8($v0) -/* A4A2F4 80241D34 240300FF */ addiu $v1, $zero, 0xff -/* A4A2F8 80241D38 0000282D */ daddu $a1, $zero, $zero -/* A4A2FC 80241D3C 00A0302D */ daddu $a2, $a1, $zero -/* A4A300 80241D40 A04300AC */ sb $v1, 0xac($v0) -/* A4A304 80241D44 AFA00010 */ sw $zero, 0x10($sp) -/* A4A308 80241D48 AFA00014 */ sw $zero, 0x14($sp) -/* A4A30C 80241D4C AFA00018 */ sw $zero, 0x18($sp) -/* A4A310 80241D50 8C440024 */ lw $a0, 0x24($v0) -/* A4A314 80241D54 0C0B7A25 */ jal func_802DE894 -/* A4A318 80241D58 00A0382D */ daddu $a3, $a1, $zero -/* A4A31C 80241D5C 8FBF0020 */ lw $ra, 0x20($sp) -/* A4A320 80241D60 24020002 */ addiu $v0, $zero, 2 -/* A4A324 80241D64 03E00008 */ jr $ra -/* A4A328 80241D68 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20_A4A2E0.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20_A4A2E0.s new file mode 100644 index 0000000000..943e500762 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D20_A4A2E0.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D20_A4A2E0 +/* A4A2E0 80241D20 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A4A2E4 80241D24 AFBF0020 */ sw $ra, 0x20($sp) +/* A4A2E8 80241D28 8C820148 */ lw $v0, 0x148($a0) +/* A4A2EC 80241D2C 0C00EABB */ jal get_npc_unsafe +/* A4A2F0 80241D30 84440008 */ lh $a0, 8($v0) +/* A4A2F4 80241D34 240300FF */ addiu $v1, $zero, 0xff +/* A4A2F8 80241D38 0000282D */ daddu $a1, $zero, $zero +/* A4A2FC 80241D3C 00A0302D */ daddu $a2, $a1, $zero +/* A4A300 80241D40 A04300AC */ sb $v1, 0xac($v0) +/* A4A304 80241D44 AFA00010 */ sw $zero, 0x10($sp) +/* A4A308 80241D48 AFA00014 */ sw $zero, 0x14($sp) +/* A4A30C 80241D4C AFA00018 */ sw $zero, 0x18($sp) +/* A4A310 80241D50 8C440024 */ lw $a0, 0x24($v0) +/* A4A314 80241D54 0C0B7A25 */ jal func_802DE894 +/* A4A318 80241D58 00A0382D */ daddu $a3, $a1, $zero +/* A4A31C 80241D5C 8FBF0020 */ lw $ra, 0x20($sp) +/* A4A320 80241D60 24020002 */ addiu $v0, $zero, 2 +/* A4A324 80241D64 03E00008 */ jr $ra +/* A4A328 80241D68 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C.s deleted file mode 100644 index 42656e4729..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D6C -/* A4A32C 80241D6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4A330 80241D70 AFB10014 */ sw $s1, 0x14($sp) -/* A4A334 80241D74 0080882D */ daddu $s1, $a0, $zero -/* A4A338 80241D78 AFBF0018 */ sw $ra, 0x18($sp) -/* A4A33C 80241D7C AFB00010 */ sw $s0, 0x10($sp) -/* A4A340 80241D80 8E300148 */ lw $s0, 0x148($s1) -/* A4A344 80241D84 0C00EABB */ jal get_npc_unsafe -/* A4A348 80241D88 86040008 */ lh $a0, 8($s0) -/* A4A34C 80241D8C 0040182D */ daddu $v1, $v0, $zero -/* A4A350 80241D90 240200FF */ addiu $v0, $zero, 0xff -/* A4A354 80241D94 A06200AC */ sb $v0, 0xac($v1) -/* A4A358 80241D98 8E0200CC */ lw $v0, 0xcc($s0) -/* A4A35C 80241D9C 8C440008 */ lw $a0, 8($v0) -/* A4A360 80241DA0 A460008E */ sh $zero, 0x8e($v1) -/* A4A364 80241DA4 AC640028 */ sw $a0, 0x28($v1) -/* A4A368 80241DA8 AE200070 */ sw $zero, 0x70($s1) -/* A4A36C 80241DAC 8FBF0018 */ lw $ra, 0x18($sp) -/* A4A370 80241DB0 8FB10014 */ lw $s1, 0x14($sp) -/* A4A374 80241DB4 8FB00010 */ lw $s0, 0x10($sp) -/* A4A378 80241DB8 24020002 */ addiu $v0, $zero, 2 -/* A4A37C 80241DBC 03E00008 */ jr $ra -/* A4A380 80241DC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C_A4A32C.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C_A4A32C.s new file mode 100644 index 0000000000..02e2d2ee22 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241D6C_A4A32C.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D6C_A4A32C +/* A4A32C 80241D6C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A4A330 80241D70 AFB10014 */ sw $s1, 0x14($sp) +/* A4A334 80241D74 0080882D */ daddu $s1, $a0, $zero +/* A4A338 80241D78 AFBF0018 */ sw $ra, 0x18($sp) +/* A4A33C 80241D7C AFB00010 */ sw $s0, 0x10($sp) +/* A4A340 80241D80 8E300148 */ lw $s0, 0x148($s1) +/* A4A344 80241D84 0C00EABB */ jal get_npc_unsafe +/* A4A348 80241D88 86040008 */ lh $a0, 8($s0) +/* A4A34C 80241D8C 0040182D */ daddu $v1, $v0, $zero +/* A4A350 80241D90 240200FF */ addiu $v0, $zero, 0xff +/* A4A354 80241D94 A06200AC */ sb $v0, 0xac($v1) +/* A4A358 80241D98 8E0200CC */ lw $v0, 0xcc($s0) +/* A4A35C 80241D9C 8C440008 */ lw $a0, 8($v0) +/* A4A360 80241DA0 A460008E */ sh $zero, 0x8e($v1) +/* A4A364 80241DA4 AC640028 */ sw $a0, 0x28($v1) +/* A4A368 80241DA8 AE200070 */ sw $zero, 0x70($s1) +/* A4A36C 80241DAC 8FBF0018 */ lw $ra, 0x18($sp) +/* A4A370 80241DB0 8FB10014 */ lw $s1, 0x14($sp) +/* A4A374 80241DB4 8FB00010 */ lw $s0, 0x10($sp) +/* A4A378 80241DB8 24020002 */ addiu $v0, $zero, 2 +/* A4A37C 80241DBC 03E00008 */ jr $ra +/* A4A380 80241DC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4.s deleted file mode 100644 index 54c34f0fc1..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DC4 -/* A4A384 80241DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4A388 80241DC8 3C05FE36 */ lui $a1, 0xfe36 -/* A4A38C 80241DCC AFBF0010 */ sw $ra, 0x10($sp) -/* A4A390 80241DD0 8C820148 */ lw $v0, 0x148($a0) -/* A4A394 80241DD4 3C06800B */ lui $a2, 0x800b -/* A4A398 80241DD8 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A4A39C 80241DDC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4A3A0 80241DE0 00C23026 */ xor $a2, $a2, $v0 -/* A4A3A4 80241DE4 0C0B2026 */ jal set_variable -/* A4A3A8 80241DE8 2CC60001 */ sltiu $a2, $a2, 1 -/* A4A3AC 80241DEC 8FBF0010 */ lw $ra, 0x10($sp) -/* A4A3B0 80241DF0 24020002 */ addiu $v0, $zero, 2 -/* A4A3B4 80241DF4 03E00008 */ jr $ra -/* A4A3B8 80241DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s new file mode 100644 index 0000000000..17a0ee80ea --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DC4_A4A384 +/* A4A384 80241DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A4A388 80241DC8 3C05FE36 */ lui $a1, 0xfe36 +/* A4A38C 80241DCC AFBF0010 */ sw $ra, 0x10($sp) +/* A4A390 80241DD0 8C820148 */ lw $v0, 0x148($a0) +/* A4A394 80241DD4 3C06800B */ lui $a2, 0x800b +/* A4A398 80241DD8 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A4A39C 80241DDC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A4A3A0 80241DE0 00C23026 */ xor $a2, $a2, $v0 +/* A4A3A4 80241DE4 0C0B2026 */ jal set_variable +/* A4A3A8 80241DE8 2CC60001 */ sltiu $a2, $a2, 1 +/* A4A3AC 80241DEC 8FBF0010 */ lw $ra, 0x10($sp) +/* A4A3B0 80241DF0 24020002 */ addiu $v0, $zero, 2 +/* A4A3B4 80241DF4 03E00008 */ jr $ra +/* A4A3B8 80241DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50.s b/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50.s deleted file mode 100644 index cacd7e46af..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E50 -/* A4A410 80241E50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4A414 80241E54 AFB10014 */ sw $s1, 0x14($sp) -/* A4A418 80241E58 0080882D */ daddu $s1, $a0, $zero -/* A4A41C 80241E5C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A4A420 80241E60 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A4A424 80241E64 AFBF0018 */ sw $ra, 0x18($sp) -/* A4A428 80241E68 AFB00010 */ sw $s0, 0x10($sp) -/* A4A42C 80241E6C 84430018 */ lh $v1, 0x18($v0) -/* A4A430 80241E70 04600005 */ bltz $v1, .L80241E88 -/* A4A434 80241E74 0040802D */ daddu $s0, $v0, $zero -/* A4A438 80241E78 3C05FD05 */ lui $a1, 0xfd05 -/* A4A43C 80241E7C 34A50F80 */ ori $a1, $a1, 0xf80 -/* A4A440 80241E80 0C0B2026 */ jal set_variable -/* A4A444 80241E84 0000302D */ daddu $a2, $zero, $zero -.L80241E88: -/* A4A448 80241E88 86020018 */ lh $v0, 0x18($s0) -/* A4A44C 80241E8C 2842FEE9 */ slti $v0, $v0, -0x117 -/* A4A450 80241E90 10400005 */ beqz $v0, .L80241EA8 -/* A4A454 80241E94 0220202D */ daddu $a0, $s1, $zero -/* A4A458 80241E98 3C05FD05 */ lui $a1, 0xfd05 -/* A4A45C 80241E9C 34A50F80 */ ori $a1, $a1, 0xf80 -/* A4A460 80241EA0 0C0B2026 */ jal set_variable -/* A4A464 80241EA4 24060001 */ addiu $a2, $zero, 1 -.L80241EA8: -/* A4A468 80241EA8 8FBF0018 */ lw $ra, 0x18($sp) -/* A4A46C 80241EAC 8FB10014 */ lw $s1, 0x14($sp) -/* A4A470 80241EB0 8FB00010 */ lw $s0, 0x10($sp) -/* A4A474 80241EB4 0000102D */ daddu $v0, $zero, $zero -/* A4A478 80241EB8 03E00008 */ jr $ra -/* A4A47C 80241EBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s b/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s new file mode 100644 index 0000000000..9c8ce1e0d8 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_03/A4A410/func_80241E50_A4A410.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E50_A4A410 +/* A4A410 80241E50 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A4A414 80241E54 AFB10014 */ sw $s1, 0x14($sp) +/* A4A418 80241E58 0080882D */ daddu $s1, $a0, $zero +/* A4A41C 80241E5C 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* A4A420 80241E60 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* A4A424 80241E64 AFBF0018 */ sw $ra, 0x18($sp) +/* A4A428 80241E68 AFB00010 */ sw $s0, 0x10($sp) +/* A4A42C 80241E6C 84430018 */ lh $v1, 0x18($v0) +/* A4A430 80241E70 04600005 */ bltz $v1, .L80241E88 +/* A4A434 80241E74 0040802D */ daddu $s0, $v0, $zero +/* A4A438 80241E78 3C05FD05 */ lui $a1, 0xfd05 +/* A4A43C 80241E7C 34A50F80 */ ori $a1, $a1, 0xf80 +/* A4A440 80241E80 0C0B2026 */ jal set_variable +/* A4A444 80241E84 0000302D */ daddu $a2, $zero, $zero +.L80241E88: +/* A4A448 80241E88 86020018 */ lh $v0, 0x18($s0) +/* A4A44C 80241E8C 2842FEE9 */ slti $v0, $v0, -0x117 +/* A4A450 80241E90 10400005 */ beqz $v0, .L80241EA8 +/* A4A454 80241E94 0220202D */ daddu $a0, $s1, $zero +/* A4A458 80241E98 3C05FD05 */ lui $a1, 0xfd05 +/* A4A45C 80241E9C 34A50F80 */ ori $a1, $a1, 0xf80 +/* A4A460 80241EA0 0C0B2026 */ jal set_variable +/* A4A464 80241EA4 24060001 */ addiu $a2, $zero, 1 +.L80241EA8: +/* A4A468 80241EA8 8FBF0018 */ lw $ra, 0x18($sp) +/* A4A46C 80241EAC 8FB10014 */ lw $s1, 0x14($sp) +/* A4A470 80241EB0 8FB00010 */ lw $s0, 0x10($sp) +/* A4A474 80241EB4 0000102D */ daddu $v0, $zero, $zero +/* A4A478 80241EB8 03E00008 */ jr $ra +/* A4A47C 80241EBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270.s deleted file mode 100644 index e0460c36e7..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270.s +++ /dev/null @@ -1,336 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240270 -/* A4CC90 80240270 27BDFC78 */ addiu $sp, $sp, -0x388 -/* A4CC94 80240274 AFB60378 */ sw $s6, 0x378($sp) -/* A4CC98 80240278 0080B02D */ daddu $s6, $a0, $zero -/* A4CC9C 8024027C AFBF037C */ sw $ra, 0x37c($sp) -/* A4CCA0 80240280 AFB50374 */ sw $s5, 0x374($sp) -/* A4CCA4 80240284 AFB40370 */ sw $s4, 0x370($sp) -/* A4CCA8 80240288 AFB3036C */ sw $s3, 0x36c($sp) -/* A4CCAC 8024028C AFB20368 */ sw $s2, 0x368($sp) -/* A4CCB0 80240290 AFB10364 */ sw $s1, 0x364($sp) -/* A4CCB4 80240294 AFB00360 */ sw $s0, 0x360($sp) -/* A4CCB8 80240298 F7B40380 */ sdc1 $f20, 0x380($sp) -/* A4CCBC 8024029C 8ED20148 */ lw $s2, 0x148($s6) -/* A4CCC0 802402A0 86440008 */ lh $a0, 8($s2) -/* A4CCC4 802402A4 0C00EABB */ jal get_npc_unsafe -/* A4CCC8 802402A8 00A0802D */ daddu $s0, $a1, $zero -/* A4CCCC 802402AC 86440008 */ lh $a0, 8($s2) -/* A4CCD0 802402B0 0040882D */ daddu $s1, $v0, $zero -/* A4CCD4 802402B4 0C00FB3A */ jal get_enemy -/* A4CCD8 802402B8 2484FFFF */ addiu $a0, $a0, -1 -/* A4CCDC 802402BC 84440008 */ lh $a0, 8($v0) -/* A4CCE0 802402C0 0C00EABB */ jal get_npc_unsafe -/* A4CCE4 802402C4 0000A82D */ daddu $s5, $zero, $zero -/* A4CCE8 802402C8 27B30020 */ addiu $s3, $sp, 0x20 -/* A4CCEC 802402CC 16000005 */ bnez $s0, .L802402E4 -/* A4CCF0 802402D0 0040A02D */ daddu $s4, $v0, $zero -/* A4CCF4 802402D4 8E4200B0 */ lw $v0, 0xb0($s2) -/* A4CCF8 802402D8 30420004 */ andi $v0, $v0, 4 -/* A4CCFC 802402DC 10400018 */ beqz $v0, .L80240340 -/* A4CD00 802402E0 00000000 */ nop -.L802402E4: -/* A4CD04 802402E4 3C030024 */ lui $v1, 0x24 -/* A4CD08 802402E8 34630102 */ ori $v1, $v1, 0x102 -/* A4CD0C 802402EC 3C041620 */ lui $a0, 0x1620 -/* A4CD10 802402F0 AEC00070 */ sw $zero, 0x70($s6) -/* A4CD14 802402F4 8E220000 */ lw $v0, ($s1) -/* A4CD18 802402F8 34840040 */ ori $a0, $a0, 0x40 -/* A4CD1C 802402FC A620008E */ sh $zero, 0x8e($s1) -/* A4CD20 80240300 00431025 */ or $v0, $v0, $v1 -/* A4CD24 80240304 AE220000 */ sw $v0, ($s1) -/* A4CD28 80240308 8E420000 */ lw $v0, ($s2) -/* A4CD2C 8024030C 3C013ECC */ lui $at, 0x3ecc -/* A4CD30 80240310 3421CCCD */ ori $at, $at, 0xcccd -/* A4CD34 80240314 44810000 */ mtc1 $at, $f0 -/* A4CD38 80240318 00441025 */ or $v0, $v0, $a0 -/* A4CD3C 8024031C AE420000 */ sw $v0, ($s2) -/* A4CD40 80240320 E6200054 */ swc1 $f0, 0x54($s1) -/* A4CD44 80240324 E6200058 */ swc1 $f0, 0x58($s1) -/* A4CD48 80240328 8E4300B0 */ lw $v1, 0xb0($s2) -/* A4CD4C 8024032C 30620004 */ andi $v0, $v1, 4 -/* A4CD50 80240330 10400003 */ beqz $v0, .L80240340 -/* A4CD54 80240334 2402FFFB */ addiu $v0, $zero, -5 -/* A4CD58 80240338 00621024 */ and $v0, $v1, $v0 -/* A4CD5C 8024033C AE4200B0 */ sw $v0, 0xb0($s2) -.L80240340: -/* A4CD60 80240340 8EC30070 */ lw $v1, 0x70($s6) -/* A4CD64 80240344 2C620005 */ sltiu $v0, $v1, 5 -/* A4CD68 80240348 10400101 */ beqz $v0, .L80240750 -/* A4CD6C 8024034C 00031080 */ sll $v0, $v1, 2 -/* A4CD70 80240350 3C018024 */ lui $at, 0x8024 -/* A4CD74 80240354 00220821 */ addu $at, $at, $v0 -/* A4CD78 80240358 8C222540 */ lw $v0, 0x2540($at) -/* A4CD7C 8024035C 00400008 */ jr $v0 -/* A4CD80 80240360 00000000 */ nop -/* A4CD84 80240364 3C01C47A */ lui $at, 0xc47a -/* A4CD88 80240368 44810000 */ mtc1 $at, $f0 -/* A4CD8C 8024036C 24020014 */ addiu $v0, $zero, 0x14 -/* A4CD90 80240370 AE400078 */ sw $zero, 0x78($s2) -/* A4CD94 80240374 A62200A6 */ sh $v0, 0xa6($s1) -/* A4CD98 80240378 A62200A8 */ sh $v0, 0xa8($s1) -/* A4CD9C 8024037C 24020001 */ addiu $v0, $zero, 1 -/* A4CDA0 80240380 AE200038 */ sw $zero, 0x38($s1) -/* A4CDA4 80240384 AE200040 */ sw $zero, 0x40($s1) -/* A4CDA8 80240388 E620003C */ swc1 $f0, 0x3c($s1) -/* A4CDAC 8024038C AE40006C */ sw $zero, 0x6c($s2) -/* A4CDB0 80240390 AEC20070 */ sw $v0, 0x70($s6) -/* A4CDB4 80240394 8E50006C */ lw $s0, 0x6c($s2) -/* A4CDB8 80240398 24020001 */ addiu $v0, $zero, 1 -/* A4CDBC 8024039C 160200EC */ bne $s0, $v0, .L80240750 -/* A4CDC0 802403A0 24150002 */ addiu $s5, $zero, 2 -/* A4CDC4 802403A4 AE55006C */ sw $s5, 0x6c($s2) -/* A4CDC8 802403A8 C6800038 */ lwc1 $f0, 0x38($s4) -/* A4CDCC 802403AC E6600038 */ swc1 $f0, 0x38($s3) -/* A4CDD0 802403B0 C680003C */ lwc1 $f0, 0x3c($s4) -/* A4CDD4 802403B4 E660003C */ swc1 $f0, 0x3c($s3) -/* A4CDD8 802403B8 C6800040 */ lwc1 $f0, 0x40($s4) -/* A4CDDC 802403BC E6600040 */ swc1 $f0, 0x40($s3) -/* A4CDE0 802403C0 C6820034 */ lwc1 $f2, 0x34($s4) -/* A4CDE4 802403C4 3C014387 */ lui $at, 0x4387 -/* A4CDE8 802403C8 44810000 */ mtc1 $at, $f0 -/* A4CDEC 802403CC 00000000 */ nop -/* A4CDF0 802403D0 46020001 */ sub.s $f0, $f0, $f2 -/* A4CDF4 802403D4 C6480074 */ lwc1 $f8, 0x74($s2) -/* A4CDF8 802403D8 46804220 */ cvt.s.w $f8, $f8 -/* A4CDFC 802403DC 44054000 */ mfc1 $a1, $f8 -/* A4CE00 802403E0 44060000 */ mfc1 $a2, $f0 -/* A4CE04 802403E4 0C00EA95 */ jal npc_move_heading -/* A4CE08 802403E8 0260202D */ daddu $a0, $s3, $zero -/* A4CE0C 802403EC C6600038 */ lwc1 $f0, 0x38($s3) -/* A4CE10 802403F0 E6200038 */ swc1 $f0, 0x38($s1) -/* A4CE14 802403F4 C680003C */ lwc1 $f0, 0x3c($s4) -/* A4CE18 802403F8 C6420070 */ lwc1 $f2, 0x70($s2) -/* A4CE1C 802403FC 468010A0 */ cvt.s.w $f2, $f2 -/* A4CE20 80240400 46020000 */ add.s $f0, $f0, $f2 -/* A4CE24 80240404 3C014024 */ lui $at, 0x4024 -/* A4CE28 80240408 4481A800 */ mtc1 $at, $f21 -/* A4CE2C 8024040C 4480A000 */ mtc1 $zero, $f20 -/* A4CE30 80240410 E620003C */ swc1 $f0, 0x3c($s1) -/* A4CE34 80240414 C6600040 */ lwc1 $f0, 0x40($s3) -/* A4CE38 80240418 E6200040 */ swc1 $f0, 0x40($s1) -/* A4CE3C 8024041C A2500007 */ sb $s0, 7($s2) -/* A4CE40 80240420 C6200038 */ lwc1 $f0, 0x38($s1) -/* A4CE44 80240424 3C014066 */ lui $at, 0x4066 -/* A4CE48 80240428 34216666 */ ori $at, $at, 0x6666 -/* A4CE4C 8024042C 44811000 */ mtc1 $at, $f2 -/* A4CE50 80240430 4600020D */ trunc.w.s $f8, $f0 -/* A4CE54 80240434 44024000 */ mfc1 $v0, $f8 -/* A4CE58 80240438 00000000 */ nop -/* A4CE5C 8024043C A6420010 */ sh $v0, 0x10($s2) -/* A4CE60 80240440 C620003C */ lwc1 $f0, 0x3c($s1) -/* A4CE64 80240444 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) -/* A4CE68 80240448 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) -/* A4CE6C 8024044C 4600020D */ trunc.w.s $f8, $f0 -/* A4CE70 80240450 44024000 */ mfc1 $v0, $f8 -/* A4CE74 80240454 00000000 */ nop -/* A4CE78 80240458 A6420012 */ sh $v0, 0x12($s2) -/* A4CE7C 8024045C C6200040 */ lwc1 $f0, 0x40($s1) -/* A4CE80 80240460 8E630000 */ lw $v1, ($s3) -/* A4CE84 80240464 4600020D */ trunc.w.s $f8, $f0 -/* A4CE88 80240468 44024000 */ mfc1 $v0, $f8 -/* A4CE8C 8024046C 00000000 */ nop -/* A4CE90 80240470 A6420014 */ sh $v0, 0x14($s2) -/* A4CE94 80240474 E6220018 */ swc1 $f2, 0x18($s1) -/* A4CE98 80240478 C460002C */ lwc1 $f0, 0x2c($v1) -/* A4CE9C 8024047C C6220038 */ lwc1 $f2, 0x38($s1) -/* A4CEA0 80240480 46000021 */ cvt.d.s $f0, $f0 -/* A4CEA4 80240484 46340000 */ add.d $f0, $f0, $f20 -/* A4CEA8 80240488 C4640028 */ lwc1 $f4, 0x28($v1) -/* A4CEAC 8024048C 44806000 */ mtc1 $zero, $f12 -/* A4CEB0 80240490 46041081 */ sub.s $f2, $f2, $f4 -/* A4CEB4 80240494 C62E003C */ lwc1 $f14, 0x3c($s1) -/* A4CEB8 80240498 46200020 */ cvt.s.d $f0, $f0 -/* A4CEBC 8024049C 46001085 */ abs.s $f2, $f2 -/* A4CEC0 802404A0 44070000 */ mfc1 $a3, $f0 -/* A4CEC4 802404A4 44061000 */ mfc1 $a2, $f2 -/* A4CEC8 802404A8 0C00A720 */ jal atan2 -/* A4CECC 802404AC 00000000 */ nop -/* A4CED0 802404B0 3C018024 */ lui $at, 0x8024 -/* A4CED4 802404B4 D4222558 */ ldc1 $f2, 0x2558($at) -/* A4CED8 802404B8 46000021 */ cvt.d.s $f0, $f0 -/* A4CEDC 802404BC 46220001 */ sub.d $f0, $f0, $f2 -/* A4CEE0 802404C0 46200020 */ cvt.s.d $f0, $f0 -/* A4CEE4 802404C4 4600020D */ trunc.w.s $f8, $f0 -/* A4CEE8 802404C8 44044000 */ mfc1 $a0, $f8 -/* A4CEEC 802404CC 00000000 */ nop -/* A4CEF0 802404D0 00042400 */ sll $a0, $a0, 0x10 -/* A4CEF4 802404D4 0C00A4F5 */ jal cosine -/* A4CEF8 802404D8 00042403 */ sra $a0, $a0, 0x10 -/* A4CEFC 802404DC C6220018 */ lwc1 $f2, 0x18($s1) -/* A4CF00 802404E0 46020002 */ mul.s $f0, $f0, $f2 -/* A4CF04 802404E4 00000000 */ nop -/* A4CF08 802404E8 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A4CF0C 802404EC C62E0040 */ lwc1 $f14, 0x40($s1) -/* A4CF10 802404F0 8E620000 */ lw $v0, ($s3) -/* A4CF14 802404F4 E620001C */ swc1 $f0, 0x1c($s1) -/* A4CF18 802404F8 8C460028 */ lw $a2, 0x28($v0) -/* A4CF1C 802404FC 0C00A720 */ jal atan2 -/* A4CF20 80240500 8C470030 */ lw $a3, 0x30($v0) -/* A4CF24 80240504 8E620000 */ lw $v0, ($s3) -/* A4CF28 80240508 E620000C */ swc1 $f0, 0xc($s1) -/* A4CF2C 8024050C C440002C */ lwc1 $f0, 0x2c($v0) -/* A4CF30 80240510 46000021 */ cvt.d.s $f0, $f0 -/* A4CF34 80240514 46340000 */ add.d $f0, $f0, $f20 -/* A4CF38 80240518 46200020 */ cvt.s.d $f0, $f0 -/* A4CF3C 8024051C E7A00010 */ swc1 $f0, 0x10($sp) -/* A4CF40 80240520 C4400030 */ lwc1 $f0, 0x30($v0) -/* A4CF44 80240524 E7A00014 */ swc1 $f0, 0x14($sp) -/* A4CF48 80240528 C62C0038 */ lwc1 $f12, 0x38($s1) -/* A4CF4C 8024052C C62E003C */ lwc1 $f14, 0x3c($s1) -/* A4CF50 80240530 8E260040 */ lw $a2, 0x40($s1) -/* A4CF54 80240534 0C00A7CB */ jal dist3D -/* A4CF58 80240538 8C470028 */ lw $a3, 0x28($v0) -/* A4CF5C 8024053C C6220018 */ lwc1 $f2, 0x18($s1) -/* A4CF60 80240540 46020003 */ div.s $f0, $f0, $f2 -/* A4CF64 80240544 4600020D */ trunc.w.s $f8, $f0 -/* A4CF68 80240548 44104000 */ mfc1 $s0, $f8 -/* A4CF6C 8024054C 00000000 */ nop -/* A4CF70 80240550 5A000001 */ blezl $s0, .L80240558 -/* A4CF74 80240554 24100001 */ addiu $s0, $zero, 1 -.L80240558: -/* A4CF78 80240558 8E620000 */ lw $v0, ($s3) -/* A4CF7C 8024055C C624003C */ lwc1 $f4, 0x3c($s1) -/* A4CF80 80240560 3C014120 */ lui $at, 0x4120 -/* A4CF84 80240564 44811000 */ mtc1 $at, $f2 -/* A4CF88 80240568 C4400028 */ lwc1 $f0, 0x28($v0) -/* A4CF8C 8024056C E7A00010 */ swc1 $f0, 0x10($sp) -/* A4CF90 80240570 C440002C */ lwc1 $f0, 0x2c($v0) -/* A4CF94 80240574 46020000 */ add.s $f0, $f0, $f2 -/* A4CF98 80240578 3C014160 */ lui $at, 0x4160 -/* A4CF9C 8024057C 44811000 */ mtc1 $at, $f2 -/* A4CFA0 80240580 00000000 */ nop -/* A4CFA4 80240584 46022100 */ add.s $f4, $f4, $f2 -/* A4CFA8 80240588 46020000 */ add.s $f0, $f0, $f2 -/* A4CFAC 8024058C 44062000 */ mfc1 $a2, $f4 -/* A4CFB0 80240590 E7A00014 */ swc1 $f0, 0x14($sp) -/* A4CFB4 80240594 C4400030 */ lwc1 $f0, 0x30($v0) -/* A4CFB8 80240598 AFB0001C */ sw $s0, 0x1c($sp) -/* A4CFBC 8024059C E7A00018 */ swc1 $f0, 0x18($sp) -/* A4CFC0 802405A0 8E250038 */ lw $a1, 0x38($s1) -/* A4CFC4 802405A4 8E270040 */ lw $a3, 0x40($s1) -/* A4CFC8 802405A8 0C01BFD4 */ jal func_8006FF50 -/* A4CFCC 802405AC 0000202D */ daddu $a0, $zero, $zero -/* A4CFD0 802405B0 AE420078 */ sw $v0, 0x78($s2) -/* A4CFD4 802405B4 A630008E */ sh $s0, 0x8e($s1) -/* A4CFD8 802405B8 080901D4 */ j .L80240750 -/* A4CFDC 802405BC AED50070 */ sw $s5, 0x70($s6) -/* A4CFE0 802405C0 9622008E */ lhu $v0, 0x8e($s1) -/* A4CFE4 802405C4 2442FFFF */ addiu $v0, $v0, -1 -/* A4CFE8 802405C8 A622008E */ sh $v0, 0x8e($s1) -/* A4CFEC 802405CC 00021400 */ sll $v0, $v0, 0x10 -/* A4CFF0 802405D0 58400001 */ blezl $v0, .L802405D8 -/* A4CFF4 802405D4 24150014 */ addiu $s5, $zero, 0x14 -.L802405D8: -/* A4CFF8 802405D8 16A0000A */ bnez $s5, .L80240604 -/* A4CFFC 802405DC 00000000 */ nop -/* A4D000 802405E0 8E250018 */ lw $a1, 0x18($s1) -/* A4D004 802405E4 8E26000C */ lw $a2, 0xc($s1) -/* A4D008 802405E8 0C00EA95 */ jal npc_move_heading -/* A4D00C 802405EC 0220202D */ daddu $a0, $s1, $zero -/* A4D010 802405F0 C620003C */ lwc1 $f0, 0x3c($s1) -/* A4D014 802405F4 C622001C */ lwc1 $f2, 0x1c($s1) -/* A4D018 802405F8 46020000 */ add.s $f0, $f0, $f2 -/* A4D01C 802405FC 080901D4 */ j .L80240750 -/* A4D020 80240600 E620003C */ swc1 $f0, 0x3c($s1) -.L80240604: -/* A4D024 80240604 862200A8 */ lh $v0, 0xa8($s1) -/* A4D028 80240608 3C013FE0 */ lui $at, 0x3fe0 -/* A4D02C 8024060C 44810800 */ mtc1 $at, $f1 -/* A4D030 80240610 44800000 */ mtc1 $zero, $f0 -/* A4D034 80240614 44821000 */ mtc1 $v0, $f2 -/* A4D038 80240618 00000000 */ nop -/* A4D03C 8024061C 468010A1 */ cvt.d.w $f2, $f2 -/* A4D040 80240620 46201082 */ mul.d $f2, $f2, $f0 -/* A4D044 80240624 00000000 */ nop -/* A4D048 80240628 C620003C */ lwc1 $f0, 0x3c($s1) -/* A4D04C 8024062C AE20001C */ sw $zero, 0x1c($s1) -/* A4D050 80240630 46000021 */ cvt.d.s $f0, $f0 -/* A4D054 80240634 46220001 */ sub.d $f0, $f0, $f2 -/* A4D058 80240638 AE200018 */ sw $zero, 0x18($s1) -/* A4D05C 8024063C 24020003 */ addiu $v0, $zero, 3 -/* A4D060 80240640 46200020 */ cvt.s.d $f0, $f0 -/* A4D064 80240644 E620003C */ swc1 $f0, 0x3c($s1) -/* A4D068 80240648 AE42006C */ sw $v0, 0x6c($s2) -/* A4D06C 8024064C 24020004 */ addiu $v0, $zero, 4 -/* A4D070 80240650 A620008E */ sh $zero, 0x8e($s1) -/* A4D074 80240654 080901D4 */ j .L80240750 -/* A4D078 80240658 AEC20070 */ sw $v0, 0x70($s6) -/* A4D07C 8024065C 9622008E */ lhu $v0, 0x8e($s1) -/* A4D080 80240660 24420001 */ addiu $v0, $v0, 1 -/* A4D084 80240664 A622008E */ sh $v0, 0x8e($s1) -/* A4D088 80240668 00021400 */ sll $v0, $v0, 0x10 -/* A4D08C 8024066C 00021C03 */ sra $v1, $v0, 0x10 -/* A4D090 80240670 28620007 */ slti $v0, $v1, 7 -/* A4D094 80240674 10400027 */ beqz $v0, .L80240714 -/* A4D098 80240678 24020007 */ addiu $v0, $zero, 7 -/* A4D09C 8024067C 8622008E */ lh $v0, 0x8e($s1) -/* A4D0A0 80240680 3C01401C */ lui $at, 0x401c -/* A4D0A4 80240684 44810800 */ mtc1 $at, $f1 -/* A4D0A8 80240688 44800000 */ mtc1 $zero, $f0 -/* A4D0AC 8024068C 44822000 */ mtc1 $v0, $f4 -/* A4D0B0 80240690 00000000 */ nop -/* A4D0B4 80240694 46802120 */ cvt.s.w $f4, $f4 -/* A4D0B8 80240698 46002121 */ cvt.d.s $f4, $f4 -/* A4D0BC 8024069C 46202102 */ mul.d $f4, $f4, $f0 -/* A4D0C0 802406A0 00000000 */ nop -/* A4D0C4 802406A4 44821000 */ mtc1 $v0, $f2 -/* A4D0C8 802406A8 00000000 */ nop -/* A4D0CC 802406AC 468010A0 */ cvt.s.w $f2, $f2 -/* A4D0D0 802406B0 460010A1 */ cvt.d.s $f2, $f2 -/* A4D0D4 802406B4 46201082 */ mul.d $f2, $f2, $f0 -/* A4D0D8 802406B8 00000000 */ nop -/* A4D0DC 802406BC C620003C */ lwc1 $f0, 0x3c($s1) -/* A4D0E0 802406C0 3C01400C */ lui $at, 0x400c -/* A4D0E4 802406C4 44813800 */ mtc1 $at, $f7 -/* A4D0E8 802406C8 44803000 */ mtc1 $zero, $f6 -/* A4D0EC 802406CC 46000021 */ cvt.d.s $f0, $f0 -/* A4D0F0 802406D0 46260001 */ sub.d $f0, $f0, $f6 -/* A4D0F4 802406D4 3C014034 */ lui $at, 0x4034 -/* A4D0F8 802406D8 44813800 */ mtc1 $at, $f7 -/* A4D0FC 802406DC 44803000 */ mtc1 $zero, $f6 -/* A4D100 802406E0 00000000 */ nop -/* A4D104 802406E4 46262100 */ add.d $f4, $f4, $f6 -/* A4D108 802406E8 46200020 */ cvt.s.d $f0, $f0 -/* A4D10C 802406EC E620003C */ swc1 $f0, 0x3c($s1) -/* A4D110 802406F0 46261080 */ add.d $f2, $f2, $f6 -/* A4D114 802406F4 4620220D */ trunc.w.d $f8, $f4 -/* A4D118 802406F8 44024000 */ mfc1 $v0, $f8 -/* A4D11C 802406FC 00000000 */ nop -/* A4D120 80240700 A62200A6 */ sh $v0, 0xa6($s1) -/* A4D124 80240704 4620120D */ trunc.w.d $f8, $f2 -/* A4D128 80240708 44024000 */ mfc1 $v0, $f8 -/* A4D12C 8024070C 080901D4 */ j .L80240750 -/* A4D130 80240710 A62200A8 */ sh $v0, 0xa8($s1) -.L80240714: -/* A4D134 80240714 1462000A */ bne $v1, $v0, .L80240740 -/* A4D138 80240718 28620010 */ slti $v0, $v1, 0x10 -/* A4D13C 8024071C 3C01C47A */ lui $at, 0xc47a -/* A4D140 80240720 44810000 */ mtc1 $at, $f0 -/* A4D144 80240724 24020014 */ addiu $v0, $zero, 0x14 -/* A4D148 80240728 AE200038 */ sw $zero, 0x38($s1) -/* A4D14C 8024072C AE200040 */ sw $zero, 0x40($s1) -/* A4D150 80240730 A62200A6 */ sh $v0, 0xa6($s1) -/* A4D154 80240734 A62200A8 */ sh $v0, 0xa8($s1) -/* A4D158 80240738 080901D4 */ j .L80240750 -/* A4D15C 8024073C E620003C */ swc1 $f0, 0x3c($s1) -.L80240740: -/* A4D160 80240740 14400003 */ bnez $v0, .L80240750 -/* A4D164 80240744 00000000 */ nop -/* A4D168 80240748 AE40006C */ sw $zero, 0x6c($s2) -/* A4D16C 8024074C AEC00070 */ sw $zero, 0x70($s6) -.L80240750: -/* A4D170 80240750 8FBF037C */ lw $ra, 0x37c($sp) -/* A4D174 80240754 8FB60378 */ lw $s6, 0x378($sp) -/* A4D178 80240758 8FB50374 */ lw $s5, 0x374($sp) -/* A4D17C 8024075C 8FB40370 */ lw $s4, 0x370($sp) -/* A4D180 80240760 8FB3036C */ lw $s3, 0x36c($sp) -/* A4D184 80240764 8FB20368 */ lw $s2, 0x368($sp) -/* A4D188 80240768 8FB10364 */ lw $s1, 0x364($sp) -/* A4D18C 8024076C 8FB00360 */ lw $s0, 0x360($sp) -/* A4D190 80240770 D7B40380 */ ldc1 $f20, 0x380($sp) -/* A4D194 80240774 0000102D */ daddu $v0, $zero, $zero -/* A4D198 80240778 03E00008 */ jr $ra -/* A4D19C 8024077C 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s new file mode 100644 index 0000000000..de7d90c854 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240270_A4CC90.s @@ -0,0 +1,336 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240270_A4CC90 +/* A4CC90 80240270 27BDFC78 */ addiu $sp, $sp, -0x388 +/* A4CC94 80240274 AFB60378 */ sw $s6, 0x378($sp) +/* A4CC98 80240278 0080B02D */ daddu $s6, $a0, $zero +/* A4CC9C 8024027C AFBF037C */ sw $ra, 0x37c($sp) +/* A4CCA0 80240280 AFB50374 */ sw $s5, 0x374($sp) +/* A4CCA4 80240284 AFB40370 */ sw $s4, 0x370($sp) +/* A4CCA8 80240288 AFB3036C */ sw $s3, 0x36c($sp) +/* A4CCAC 8024028C AFB20368 */ sw $s2, 0x368($sp) +/* A4CCB0 80240290 AFB10364 */ sw $s1, 0x364($sp) +/* A4CCB4 80240294 AFB00360 */ sw $s0, 0x360($sp) +/* A4CCB8 80240298 F7B40380 */ sdc1 $f20, 0x380($sp) +/* A4CCBC 8024029C 8ED20148 */ lw $s2, 0x148($s6) +/* A4CCC0 802402A0 86440008 */ lh $a0, 8($s2) +/* A4CCC4 802402A4 0C00EABB */ jal get_npc_unsafe +/* A4CCC8 802402A8 00A0802D */ daddu $s0, $a1, $zero +/* A4CCCC 802402AC 86440008 */ lh $a0, 8($s2) +/* A4CCD0 802402B0 0040882D */ daddu $s1, $v0, $zero +/* A4CCD4 802402B4 0C00FB3A */ jal get_enemy +/* A4CCD8 802402B8 2484FFFF */ addiu $a0, $a0, -1 +/* A4CCDC 802402BC 84440008 */ lh $a0, 8($v0) +/* A4CCE0 802402C0 0C00EABB */ jal get_npc_unsafe +/* A4CCE4 802402C4 0000A82D */ daddu $s5, $zero, $zero +/* A4CCE8 802402C8 27B30020 */ addiu $s3, $sp, 0x20 +/* A4CCEC 802402CC 16000005 */ bnez $s0, .L802402E4 +/* A4CCF0 802402D0 0040A02D */ daddu $s4, $v0, $zero +/* A4CCF4 802402D4 8E4200B0 */ lw $v0, 0xb0($s2) +/* A4CCF8 802402D8 30420004 */ andi $v0, $v0, 4 +/* A4CCFC 802402DC 10400018 */ beqz $v0, .L80240340 +/* A4CD00 802402E0 00000000 */ nop +.L802402E4: +/* A4CD04 802402E4 3C030024 */ lui $v1, 0x24 +/* A4CD08 802402E8 34630102 */ ori $v1, $v1, 0x102 +/* A4CD0C 802402EC 3C041620 */ lui $a0, 0x1620 +/* A4CD10 802402F0 AEC00070 */ sw $zero, 0x70($s6) +/* A4CD14 802402F4 8E220000 */ lw $v0, ($s1) +/* A4CD18 802402F8 34840040 */ ori $a0, $a0, 0x40 +/* A4CD1C 802402FC A620008E */ sh $zero, 0x8e($s1) +/* A4CD20 80240300 00431025 */ or $v0, $v0, $v1 +/* A4CD24 80240304 AE220000 */ sw $v0, ($s1) +/* A4CD28 80240308 8E420000 */ lw $v0, ($s2) +/* A4CD2C 8024030C 3C013ECC */ lui $at, 0x3ecc +/* A4CD30 80240310 3421CCCD */ ori $at, $at, 0xcccd +/* A4CD34 80240314 44810000 */ mtc1 $at, $f0 +/* A4CD38 80240318 00441025 */ or $v0, $v0, $a0 +/* A4CD3C 8024031C AE420000 */ sw $v0, ($s2) +/* A4CD40 80240320 E6200054 */ swc1 $f0, 0x54($s1) +/* A4CD44 80240324 E6200058 */ swc1 $f0, 0x58($s1) +/* A4CD48 80240328 8E4300B0 */ lw $v1, 0xb0($s2) +/* A4CD4C 8024032C 30620004 */ andi $v0, $v1, 4 +/* A4CD50 80240330 10400003 */ beqz $v0, .L80240340 +/* A4CD54 80240334 2402FFFB */ addiu $v0, $zero, -5 +/* A4CD58 80240338 00621024 */ and $v0, $v1, $v0 +/* A4CD5C 8024033C AE4200B0 */ sw $v0, 0xb0($s2) +.L80240340: +/* A4CD60 80240340 8EC30070 */ lw $v1, 0x70($s6) +/* A4CD64 80240344 2C620005 */ sltiu $v0, $v1, 5 +/* A4CD68 80240348 10400101 */ beqz $v0, .L80240750 +/* A4CD6C 8024034C 00031080 */ sll $v0, $v1, 2 +/* A4CD70 80240350 3C018024 */ lui $at, 0x8024 +/* A4CD74 80240354 00220821 */ addu $at, $at, $v0 +/* A4CD78 80240358 8C222540 */ lw $v0, 0x2540($at) +/* A4CD7C 8024035C 00400008 */ jr $v0 +/* A4CD80 80240360 00000000 */ nop +/* A4CD84 80240364 3C01C47A */ lui $at, 0xc47a +/* A4CD88 80240368 44810000 */ mtc1 $at, $f0 +/* A4CD8C 8024036C 24020014 */ addiu $v0, $zero, 0x14 +/* A4CD90 80240370 AE400078 */ sw $zero, 0x78($s2) +/* A4CD94 80240374 A62200A6 */ sh $v0, 0xa6($s1) +/* A4CD98 80240378 A62200A8 */ sh $v0, 0xa8($s1) +/* A4CD9C 8024037C 24020001 */ addiu $v0, $zero, 1 +/* A4CDA0 80240380 AE200038 */ sw $zero, 0x38($s1) +/* A4CDA4 80240384 AE200040 */ sw $zero, 0x40($s1) +/* A4CDA8 80240388 E620003C */ swc1 $f0, 0x3c($s1) +/* A4CDAC 8024038C AE40006C */ sw $zero, 0x6c($s2) +/* A4CDB0 80240390 AEC20070 */ sw $v0, 0x70($s6) +/* A4CDB4 80240394 8E50006C */ lw $s0, 0x6c($s2) +/* A4CDB8 80240398 24020001 */ addiu $v0, $zero, 1 +/* A4CDBC 8024039C 160200EC */ bne $s0, $v0, .L80240750 +/* A4CDC0 802403A0 24150002 */ addiu $s5, $zero, 2 +/* A4CDC4 802403A4 AE55006C */ sw $s5, 0x6c($s2) +/* A4CDC8 802403A8 C6800038 */ lwc1 $f0, 0x38($s4) +/* A4CDCC 802403AC E6600038 */ swc1 $f0, 0x38($s3) +/* A4CDD0 802403B0 C680003C */ lwc1 $f0, 0x3c($s4) +/* A4CDD4 802403B4 E660003C */ swc1 $f0, 0x3c($s3) +/* A4CDD8 802403B8 C6800040 */ lwc1 $f0, 0x40($s4) +/* A4CDDC 802403BC E6600040 */ swc1 $f0, 0x40($s3) +/* A4CDE0 802403C0 C6820034 */ lwc1 $f2, 0x34($s4) +/* A4CDE4 802403C4 3C014387 */ lui $at, 0x4387 +/* A4CDE8 802403C8 44810000 */ mtc1 $at, $f0 +/* A4CDEC 802403CC 00000000 */ nop +/* A4CDF0 802403D0 46020001 */ sub.s $f0, $f0, $f2 +/* A4CDF4 802403D4 C6480074 */ lwc1 $f8, 0x74($s2) +/* A4CDF8 802403D8 46804220 */ cvt.s.w $f8, $f8 +/* A4CDFC 802403DC 44054000 */ mfc1 $a1, $f8 +/* A4CE00 802403E0 44060000 */ mfc1 $a2, $f0 +/* A4CE04 802403E4 0C00EA95 */ jal npc_move_heading +/* A4CE08 802403E8 0260202D */ daddu $a0, $s3, $zero +/* A4CE0C 802403EC C6600038 */ lwc1 $f0, 0x38($s3) +/* A4CE10 802403F0 E6200038 */ swc1 $f0, 0x38($s1) +/* A4CE14 802403F4 C680003C */ lwc1 $f0, 0x3c($s4) +/* A4CE18 802403F8 C6420070 */ lwc1 $f2, 0x70($s2) +/* A4CE1C 802403FC 468010A0 */ cvt.s.w $f2, $f2 +/* A4CE20 80240400 46020000 */ add.s $f0, $f0, $f2 +/* A4CE24 80240404 3C014024 */ lui $at, 0x4024 +/* A4CE28 80240408 4481A800 */ mtc1 $at, $f21 +/* A4CE2C 8024040C 4480A000 */ mtc1 $zero, $f20 +/* A4CE30 80240410 E620003C */ swc1 $f0, 0x3c($s1) +/* A4CE34 80240414 C6600040 */ lwc1 $f0, 0x40($s3) +/* A4CE38 80240418 E6200040 */ swc1 $f0, 0x40($s1) +/* A4CE3C 8024041C A2500007 */ sb $s0, 7($s2) +/* A4CE40 80240420 C6200038 */ lwc1 $f0, 0x38($s1) +/* A4CE44 80240424 3C014066 */ lui $at, 0x4066 +/* A4CE48 80240428 34216666 */ ori $at, $at, 0x6666 +/* A4CE4C 8024042C 44811000 */ mtc1 $at, $f2 +/* A4CE50 80240430 4600020D */ trunc.w.s $f8, $f0 +/* A4CE54 80240434 44024000 */ mfc1 $v0, $f8 +/* A4CE58 80240438 00000000 */ nop +/* A4CE5C 8024043C A6420010 */ sh $v0, 0x10($s2) +/* A4CE60 80240440 C620003C */ lwc1 $f0, 0x3c($s1) +/* A4CE64 80240444 3C13800F */ lui $s3, %hi(gPlayerStatusPtr) +/* A4CE68 80240448 26737B30 */ addiu $s3, $s3, %lo(gPlayerStatusPtr) +/* A4CE6C 8024044C 4600020D */ trunc.w.s $f8, $f0 +/* A4CE70 80240450 44024000 */ mfc1 $v0, $f8 +/* A4CE74 80240454 00000000 */ nop +/* A4CE78 80240458 A6420012 */ sh $v0, 0x12($s2) +/* A4CE7C 8024045C C6200040 */ lwc1 $f0, 0x40($s1) +/* A4CE80 80240460 8E630000 */ lw $v1, ($s3) +/* A4CE84 80240464 4600020D */ trunc.w.s $f8, $f0 +/* A4CE88 80240468 44024000 */ mfc1 $v0, $f8 +/* A4CE8C 8024046C 00000000 */ nop +/* A4CE90 80240470 A6420014 */ sh $v0, 0x14($s2) +/* A4CE94 80240474 E6220018 */ swc1 $f2, 0x18($s1) +/* A4CE98 80240478 C460002C */ lwc1 $f0, 0x2c($v1) +/* A4CE9C 8024047C C6220038 */ lwc1 $f2, 0x38($s1) +/* A4CEA0 80240480 46000021 */ cvt.d.s $f0, $f0 +/* A4CEA4 80240484 46340000 */ add.d $f0, $f0, $f20 +/* A4CEA8 80240488 C4640028 */ lwc1 $f4, 0x28($v1) +/* A4CEAC 8024048C 44806000 */ mtc1 $zero, $f12 +/* A4CEB0 80240490 46041081 */ sub.s $f2, $f2, $f4 +/* A4CEB4 80240494 C62E003C */ lwc1 $f14, 0x3c($s1) +/* A4CEB8 80240498 46200020 */ cvt.s.d $f0, $f0 +/* A4CEBC 8024049C 46001085 */ abs.s $f2, $f2 +/* A4CEC0 802404A0 44070000 */ mfc1 $a3, $f0 +/* A4CEC4 802404A4 44061000 */ mfc1 $a2, $f2 +/* A4CEC8 802404A8 0C00A720 */ jal atan2 +/* A4CECC 802404AC 00000000 */ nop +/* A4CED0 802404B0 3C018024 */ lui $at, 0x8024 +/* A4CED4 802404B4 D4222558 */ ldc1 $f2, 0x2558($at) +/* A4CED8 802404B8 46000021 */ cvt.d.s $f0, $f0 +/* A4CEDC 802404BC 46220001 */ sub.d $f0, $f0, $f2 +/* A4CEE0 802404C0 46200020 */ cvt.s.d $f0, $f0 +/* A4CEE4 802404C4 4600020D */ trunc.w.s $f8, $f0 +/* A4CEE8 802404C8 44044000 */ mfc1 $a0, $f8 +/* A4CEEC 802404CC 00000000 */ nop +/* A4CEF0 802404D0 00042400 */ sll $a0, $a0, 0x10 +/* A4CEF4 802404D4 0C00A4F5 */ jal cosine +/* A4CEF8 802404D8 00042403 */ sra $a0, $a0, 0x10 +/* A4CEFC 802404DC C6220018 */ lwc1 $f2, 0x18($s1) +/* A4CF00 802404E0 46020002 */ mul.s $f0, $f0, $f2 +/* A4CF04 802404E4 00000000 */ nop +/* A4CF08 802404E8 C62C0038 */ lwc1 $f12, 0x38($s1) +/* A4CF0C 802404EC C62E0040 */ lwc1 $f14, 0x40($s1) +/* A4CF10 802404F0 8E620000 */ lw $v0, ($s3) +/* A4CF14 802404F4 E620001C */ swc1 $f0, 0x1c($s1) +/* A4CF18 802404F8 8C460028 */ lw $a2, 0x28($v0) +/* A4CF1C 802404FC 0C00A720 */ jal atan2 +/* A4CF20 80240500 8C470030 */ lw $a3, 0x30($v0) +/* A4CF24 80240504 8E620000 */ lw $v0, ($s3) +/* A4CF28 80240508 E620000C */ swc1 $f0, 0xc($s1) +/* A4CF2C 8024050C C440002C */ lwc1 $f0, 0x2c($v0) +/* A4CF30 80240510 46000021 */ cvt.d.s $f0, $f0 +/* A4CF34 80240514 46340000 */ add.d $f0, $f0, $f20 +/* A4CF38 80240518 46200020 */ cvt.s.d $f0, $f0 +/* A4CF3C 8024051C E7A00010 */ swc1 $f0, 0x10($sp) +/* A4CF40 80240520 C4400030 */ lwc1 $f0, 0x30($v0) +/* A4CF44 80240524 E7A00014 */ swc1 $f0, 0x14($sp) +/* A4CF48 80240528 C62C0038 */ lwc1 $f12, 0x38($s1) +/* A4CF4C 8024052C C62E003C */ lwc1 $f14, 0x3c($s1) +/* A4CF50 80240530 8E260040 */ lw $a2, 0x40($s1) +/* A4CF54 80240534 0C00A7CB */ jal dist3D +/* A4CF58 80240538 8C470028 */ lw $a3, 0x28($v0) +/* A4CF5C 8024053C C6220018 */ lwc1 $f2, 0x18($s1) +/* A4CF60 80240540 46020003 */ div.s $f0, $f0, $f2 +/* A4CF64 80240544 4600020D */ trunc.w.s $f8, $f0 +/* A4CF68 80240548 44104000 */ mfc1 $s0, $f8 +/* A4CF6C 8024054C 00000000 */ nop +/* A4CF70 80240550 5A000001 */ blezl $s0, .L80240558 +/* A4CF74 80240554 24100001 */ addiu $s0, $zero, 1 +.L80240558: +/* A4CF78 80240558 8E620000 */ lw $v0, ($s3) +/* A4CF7C 8024055C C624003C */ lwc1 $f4, 0x3c($s1) +/* A4CF80 80240560 3C014120 */ lui $at, 0x4120 +/* A4CF84 80240564 44811000 */ mtc1 $at, $f2 +/* A4CF88 80240568 C4400028 */ lwc1 $f0, 0x28($v0) +/* A4CF8C 8024056C E7A00010 */ swc1 $f0, 0x10($sp) +/* A4CF90 80240570 C440002C */ lwc1 $f0, 0x2c($v0) +/* A4CF94 80240574 46020000 */ add.s $f0, $f0, $f2 +/* A4CF98 80240578 3C014160 */ lui $at, 0x4160 +/* A4CF9C 8024057C 44811000 */ mtc1 $at, $f2 +/* A4CFA0 80240580 00000000 */ nop +/* A4CFA4 80240584 46022100 */ add.s $f4, $f4, $f2 +/* A4CFA8 80240588 46020000 */ add.s $f0, $f0, $f2 +/* A4CFAC 8024058C 44062000 */ mfc1 $a2, $f4 +/* A4CFB0 80240590 E7A00014 */ swc1 $f0, 0x14($sp) +/* A4CFB4 80240594 C4400030 */ lwc1 $f0, 0x30($v0) +/* A4CFB8 80240598 AFB0001C */ sw $s0, 0x1c($sp) +/* A4CFBC 8024059C E7A00018 */ swc1 $f0, 0x18($sp) +/* A4CFC0 802405A0 8E250038 */ lw $a1, 0x38($s1) +/* A4CFC4 802405A4 8E270040 */ lw $a3, 0x40($s1) +/* A4CFC8 802405A8 0C01BFD4 */ jal func_8006FF50 +/* A4CFCC 802405AC 0000202D */ daddu $a0, $zero, $zero +/* A4CFD0 802405B0 AE420078 */ sw $v0, 0x78($s2) +/* A4CFD4 802405B4 A630008E */ sh $s0, 0x8e($s1) +/* A4CFD8 802405B8 080901D4 */ j .L80240750 +/* A4CFDC 802405BC AED50070 */ sw $s5, 0x70($s6) +/* A4CFE0 802405C0 9622008E */ lhu $v0, 0x8e($s1) +/* A4CFE4 802405C4 2442FFFF */ addiu $v0, $v0, -1 +/* A4CFE8 802405C8 A622008E */ sh $v0, 0x8e($s1) +/* A4CFEC 802405CC 00021400 */ sll $v0, $v0, 0x10 +/* A4CFF0 802405D0 58400001 */ blezl $v0, .L802405D8 +/* A4CFF4 802405D4 24150014 */ addiu $s5, $zero, 0x14 +.L802405D8: +/* A4CFF8 802405D8 16A0000A */ bnez $s5, .L80240604 +/* A4CFFC 802405DC 00000000 */ nop +/* A4D000 802405E0 8E250018 */ lw $a1, 0x18($s1) +/* A4D004 802405E4 8E26000C */ lw $a2, 0xc($s1) +/* A4D008 802405E8 0C00EA95 */ jal npc_move_heading +/* A4D00C 802405EC 0220202D */ daddu $a0, $s1, $zero +/* A4D010 802405F0 C620003C */ lwc1 $f0, 0x3c($s1) +/* A4D014 802405F4 C622001C */ lwc1 $f2, 0x1c($s1) +/* A4D018 802405F8 46020000 */ add.s $f0, $f0, $f2 +/* A4D01C 802405FC 080901D4 */ j .L80240750 +/* A4D020 80240600 E620003C */ swc1 $f0, 0x3c($s1) +.L80240604: +/* A4D024 80240604 862200A8 */ lh $v0, 0xa8($s1) +/* A4D028 80240608 3C013FE0 */ lui $at, 0x3fe0 +/* A4D02C 8024060C 44810800 */ mtc1 $at, $f1 +/* A4D030 80240610 44800000 */ mtc1 $zero, $f0 +/* A4D034 80240614 44821000 */ mtc1 $v0, $f2 +/* A4D038 80240618 00000000 */ nop +/* A4D03C 8024061C 468010A1 */ cvt.d.w $f2, $f2 +/* A4D040 80240620 46201082 */ mul.d $f2, $f2, $f0 +/* A4D044 80240624 00000000 */ nop +/* A4D048 80240628 C620003C */ lwc1 $f0, 0x3c($s1) +/* A4D04C 8024062C AE20001C */ sw $zero, 0x1c($s1) +/* A4D050 80240630 46000021 */ cvt.d.s $f0, $f0 +/* A4D054 80240634 46220001 */ sub.d $f0, $f0, $f2 +/* A4D058 80240638 AE200018 */ sw $zero, 0x18($s1) +/* A4D05C 8024063C 24020003 */ addiu $v0, $zero, 3 +/* A4D060 80240640 46200020 */ cvt.s.d $f0, $f0 +/* A4D064 80240644 E620003C */ swc1 $f0, 0x3c($s1) +/* A4D068 80240648 AE42006C */ sw $v0, 0x6c($s2) +/* A4D06C 8024064C 24020004 */ addiu $v0, $zero, 4 +/* A4D070 80240650 A620008E */ sh $zero, 0x8e($s1) +/* A4D074 80240654 080901D4 */ j .L80240750 +/* A4D078 80240658 AEC20070 */ sw $v0, 0x70($s6) +/* A4D07C 8024065C 9622008E */ lhu $v0, 0x8e($s1) +/* A4D080 80240660 24420001 */ addiu $v0, $v0, 1 +/* A4D084 80240664 A622008E */ sh $v0, 0x8e($s1) +/* A4D088 80240668 00021400 */ sll $v0, $v0, 0x10 +/* A4D08C 8024066C 00021C03 */ sra $v1, $v0, 0x10 +/* A4D090 80240670 28620007 */ slti $v0, $v1, 7 +/* A4D094 80240674 10400027 */ beqz $v0, .L80240714 +/* A4D098 80240678 24020007 */ addiu $v0, $zero, 7 +/* A4D09C 8024067C 8622008E */ lh $v0, 0x8e($s1) +/* A4D0A0 80240680 3C01401C */ lui $at, 0x401c +/* A4D0A4 80240684 44810800 */ mtc1 $at, $f1 +/* A4D0A8 80240688 44800000 */ mtc1 $zero, $f0 +/* A4D0AC 8024068C 44822000 */ mtc1 $v0, $f4 +/* A4D0B0 80240690 00000000 */ nop +/* A4D0B4 80240694 46802120 */ cvt.s.w $f4, $f4 +/* A4D0B8 80240698 46002121 */ cvt.d.s $f4, $f4 +/* A4D0BC 8024069C 46202102 */ mul.d $f4, $f4, $f0 +/* A4D0C0 802406A0 00000000 */ nop +/* A4D0C4 802406A4 44821000 */ mtc1 $v0, $f2 +/* A4D0C8 802406A8 00000000 */ nop +/* A4D0CC 802406AC 468010A0 */ cvt.s.w $f2, $f2 +/* A4D0D0 802406B0 460010A1 */ cvt.d.s $f2, $f2 +/* A4D0D4 802406B4 46201082 */ mul.d $f2, $f2, $f0 +/* A4D0D8 802406B8 00000000 */ nop +/* A4D0DC 802406BC C620003C */ lwc1 $f0, 0x3c($s1) +/* A4D0E0 802406C0 3C01400C */ lui $at, 0x400c +/* A4D0E4 802406C4 44813800 */ mtc1 $at, $f7 +/* A4D0E8 802406C8 44803000 */ mtc1 $zero, $f6 +/* A4D0EC 802406CC 46000021 */ cvt.d.s $f0, $f0 +/* A4D0F0 802406D0 46260001 */ sub.d $f0, $f0, $f6 +/* A4D0F4 802406D4 3C014034 */ lui $at, 0x4034 +/* A4D0F8 802406D8 44813800 */ mtc1 $at, $f7 +/* A4D0FC 802406DC 44803000 */ mtc1 $zero, $f6 +/* A4D100 802406E0 00000000 */ nop +/* A4D104 802406E4 46262100 */ add.d $f4, $f4, $f6 +/* A4D108 802406E8 46200020 */ cvt.s.d $f0, $f0 +/* A4D10C 802406EC E620003C */ swc1 $f0, 0x3c($s1) +/* A4D110 802406F0 46261080 */ add.d $f2, $f2, $f6 +/* A4D114 802406F4 4620220D */ trunc.w.d $f8, $f4 +/* A4D118 802406F8 44024000 */ mfc1 $v0, $f8 +/* A4D11C 802406FC 00000000 */ nop +/* A4D120 80240700 A62200A6 */ sh $v0, 0xa6($s1) +/* A4D124 80240704 4620120D */ trunc.w.d $f8, $f2 +/* A4D128 80240708 44024000 */ mfc1 $v0, $f8 +/* A4D12C 8024070C 080901D4 */ j .L80240750 +/* A4D130 80240710 A62200A8 */ sh $v0, 0xa8($s1) +.L80240714: +/* A4D134 80240714 1462000A */ bne $v1, $v0, .L80240740 +/* A4D138 80240718 28620010 */ slti $v0, $v1, 0x10 +/* A4D13C 8024071C 3C01C47A */ lui $at, 0xc47a +/* A4D140 80240720 44810000 */ mtc1 $at, $f0 +/* A4D144 80240724 24020014 */ addiu $v0, $zero, 0x14 +/* A4D148 80240728 AE200038 */ sw $zero, 0x38($s1) +/* A4D14C 8024072C AE200040 */ sw $zero, 0x40($s1) +/* A4D150 80240730 A62200A6 */ sh $v0, 0xa6($s1) +/* A4D154 80240734 A62200A8 */ sh $v0, 0xa8($s1) +/* A4D158 80240738 080901D4 */ j .L80240750 +/* A4D15C 8024073C E620003C */ swc1 $f0, 0x3c($s1) +.L80240740: +/* A4D160 80240740 14400003 */ bnez $v0, .L80240750 +/* A4D164 80240744 00000000 */ nop +/* A4D168 80240748 AE40006C */ sw $zero, 0x6c($s2) +/* A4D16C 8024074C AEC00070 */ sw $zero, 0x70($s6) +.L80240750: +/* A4D170 80240750 8FBF037C */ lw $ra, 0x37c($sp) +/* A4D174 80240754 8FB60378 */ lw $s6, 0x378($sp) +/* A4D178 80240758 8FB50374 */ lw $s5, 0x374($sp) +/* A4D17C 8024075C 8FB40370 */ lw $s4, 0x370($sp) +/* A4D180 80240760 8FB3036C */ lw $s3, 0x36c($sp) +/* A4D184 80240764 8FB20368 */ lw $s2, 0x368($sp) +/* A4D188 80240768 8FB10364 */ lw $s1, 0x364($sp) +/* A4D18C 8024076C 8FB00360 */ lw $s0, 0x360($sp) +/* A4D190 80240770 D7B40380 */ ldc1 $f20, 0x380($sp) +/* A4D194 80240774 0000102D */ daddu $v0, $zero, $zero +/* A4D198 80240778 03E00008 */ jr $ra +/* A4D19C 8024077C 27BD0388 */ addiu $sp, $sp, 0x388 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780.s deleted file mode 100644 index 8c95a33dfc..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240780 -/* A4D1A0 80240780 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4D1A4 80240784 AFB10014 */ sw $s1, 0x14($sp) -/* A4D1A8 80240788 0080882D */ daddu $s1, $a0, $zero -/* A4D1AC 8024078C AFBF0018 */ sw $ra, 0x18($sp) -/* A4D1B0 80240790 AFB00010 */ sw $s0, 0x10($sp) -/* A4D1B4 80240794 8E300148 */ lw $s0, 0x148($s1) -/* A4D1B8 80240798 0C00EABB */ jal get_npc_unsafe -/* A4D1BC 8024079C 86040008 */ lh $a0, 8($s0) -/* A4D1C0 802407A0 0040282D */ daddu $a1, $v0, $zero -/* A4D1C4 802407A4 94A2008E */ lhu $v0, 0x8e($a1) -/* A4D1C8 802407A8 2442FFFF */ addiu $v0, $v0, -1 -/* A4D1CC 802407AC A4A2008E */ sh $v0, 0x8e($a1) -/* A4D1D0 802407B0 00021400 */ sll $v0, $v0, 0x10 -/* A4D1D4 802407B4 1C40000A */ bgtz $v0, .L802407E0 -/* A4D1D8 802407B8 2404FFFD */ addiu $a0, $zero, -3 -/* A4D1DC 802407BC 8E0300CC */ lw $v1, 0xcc($s0) -/* A4D1E0 802407C0 8CA20000 */ lw $v0, ($a1) -/* A4D1E4 802407C4 8C630000 */ lw $v1, ($v1) -/* A4D1E8 802407C8 00441024 */ and $v0, $v0, $a0 -/* A4D1EC 802407CC ACA20000 */ sw $v0, ($a1) -/* A4D1F0 802407D0 24020001 */ addiu $v0, $zero, 1 -/* A4D1F4 802407D4 A4A0008E */ sh $zero, 0x8e($a1) -/* A4D1F8 802407D8 ACA30028 */ sw $v1, 0x28($a1) -/* A4D1FC 802407DC AE220070 */ sw $v0, 0x70($s1) -.L802407E0: -/* A4D200 802407E0 8FBF0018 */ lw $ra, 0x18($sp) -/* A4D204 802407E4 8FB10014 */ lw $s1, 0x14($sp) -/* A4D208 802407E8 8FB00010 */ lw $s0, 0x10($sp) -/* A4D20C 802407EC 03E00008 */ jr $ra -/* A4D210 802407F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780_A4D1A0.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780_A4D1A0.s new file mode 100644 index 0000000000..d245e07300 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240780_A4D1A0.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240780_A4D1A0 +/* A4D1A0 80240780 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A4D1A4 80240784 AFB10014 */ sw $s1, 0x14($sp) +/* A4D1A8 80240788 0080882D */ daddu $s1, $a0, $zero +/* A4D1AC 8024078C AFBF0018 */ sw $ra, 0x18($sp) +/* A4D1B0 80240790 AFB00010 */ sw $s0, 0x10($sp) +/* A4D1B4 80240794 8E300148 */ lw $s0, 0x148($s1) +/* A4D1B8 80240798 0C00EABB */ jal get_npc_unsafe +/* A4D1BC 8024079C 86040008 */ lh $a0, 8($s0) +/* A4D1C0 802407A0 0040282D */ daddu $a1, $v0, $zero +/* A4D1C4 802407A4 94A2008E */ lhu $v0, 0x8e($a1) +/* A4D1C8 802407A8 2442FFFF */ addiu $v0, $v0, -1 +/* A4D1CC 802407AC A4A2008E */ sh $v0, 0x8e($a1) +/* A4D1D0 802407B0 00021400 */ sll $v0, $v0, 0x10 +/* A4D1D4 802407B4 1C40000A */ bgtz $v0, .L802407E0 +/* A4D1D8 802407B8 2404FFFD */ addiu $a0, $zero, -3 +/* A4D1DC 802407BC 8E0300CC */ lw $v1, 0xcc($s0) +/* A4D1E0 802407C0 8CA20000 */ lw $v0, ($a1) +/* A4D1E4 802407C4 8C630000 */ lw $v1, ($v1) +/* A4D1E8 802407C8 00441024 */ and $v0, $v0, $a0 +/* A4D1EC 802407CC ACA20000 */ sw $v0, ($a1) +/* A4D1F0 802407D0 24020001 */ addiu $v0, $zero, 1 +/* A4D1F4 802407D4 A4A0008E */ sh $zero, 0x8e($a1) +/* A4D1F8 802407D8 ACA30028 */ sw $v1, 0x28($a1) +/* A4D1FC 802407DC AE220070 */ sw $v0, 0x70($s1) +.L802407E0: +/* A4D200 802407E0 8FBF0018 */ lw $ra, 0x18($sp) +/* A4D204 802407E4 8FB10014 */ lw $s1, 0x14($sp) +/* A4D208 802407E8 8FB00010 */ lw $s0, 0x10($sp) +/* A4D20C 802407EC 03E00008 */ jr $ra +/* A4D210 802407F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920.s deleted file mode 100644 index 2214623a4f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240920 -/* A4D340 80240920 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4D344 80240924 AFB10014 */ sw $s1, 0x14($sp) -/* A4D348 80240928 0080882D */ daddu $s1, $a0, $zero -/* A4D34C 8024092C AFBF0018 */ sw $ra, 0x18($sp) -/* A4D350 80240930 AFB00010 */ sw $s0, 0x10($sp) -/* A4D354 80240934 8E220148 */ lw $v0, 0x148($s1) -/* A4D358 80240938 0C00EABB */ jal get_npc_unsafe -/* A4D35C 8024093C 84440008 */ lh $a0, 8($v0) -/* A4D360 80240940 24040064 */ addiu $a0, $zero, 0x64 -/* A4D364 80240944 0C00A67F */ jal rand_int -/* A4D368 80240948 0040802D */ daddu $s0, $v0, $zero -/* A4D36C 8024094C 00021FC2 */ srl $v1, $v0, 0x1f -/* A4D370 80240950 00431821 */ addu $v1, $v0, $v1 -/* A4D374 80240954 00031843 */ sra $v1, $v1, 1 -/* A4D378 80240958 00031840 */ sll $v1, $v1, 1 -/* A4D37C 8024095C 00431023 */ subu $v0, $v0, $v1 -/* A4D380 80240960 3C014334 */ lui $at, 0x4334 -/* A4D384 80240964 44811000 */ mtc1 $at, $f2 -/* A4D388 80240968 44820000 */ mtc1 $v0, $f0 -/* A4D38C 8024096C 00000000 */ nop -/* A4D390 80240970 46800020 */ cvt.s.w $f0, $f0 -/* A4D394 80240974 46020002 */ mul.s $f0, $f0, $f2 -/* A4D398 80240978 00000000 */ nop -/* A4D39C 8024097C 3C013F4C */ lui $at, 0x3f4c -/* A4D3A0 80240980 3421CCCD */ ori $at, $at, 0xcccd -/* A4D3A4 80240984 44812000 */ mtc1 $at, $f4 -/* A4D3A8 80240988 3C0142B4 */ lui $at, 0x42b4 -/* A4D3AC 8024098C 44811000 */ mtc1 $at, $f2 -/* A4D3B0 80240990 2402000F */ addiu $v0, $zero, 0xf -/* A4D3B4 80240994 A602008E */ sh $v0, 0x8e($s0) -/* A4D3B8 80240998 46020000 */ add.s $f0, $f0, $f2 -/* A4D3BC 8024099C 24020006 */ addiu $v0, $zero, 6 -/* A4D3C0 802409A0 E6040018 */ swc1 $f4, 0x18($s0) -/* A4D3C4 802409A4 E600000C */ swc1 $f0, 0xc($s0) -/* A4D3C8 802409A8 AE220070 */ sw $v0, 0x70($s1) -/* A4D3CC 802409AC 8FBF0018 */ lw $ra, 0x18($sp) -/* A4D3D0 802409B0 8FB10014 */ lw $s1, 0x14($sp) -/* A4D3D4 802409B4 8FB00010 */ lw $s0, 0x10($sp) -/* A4D3D8 802409B8 03E00008 */ jr $ra -/* A4D3DC 802409BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s new file mode 100644 index 0000000000..7fb5e2b6b5 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240920_A4D340.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240920_A4D340 +/* A4D340 80240920 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A4D344 80240924 AFB10014 */ sw $s1, 0x14($sp) +/* A4D348 80240928 0080882D */ daddu $s1, $a0, $zero +/* A4D34C 8024092C AFBF0018 */ sw $ra, 0x18($sp) +/* A4D350 80240930 AFB00010 */ sw $s0, 0x10($sp) +/* A4D354 80240934 8E220148 */ lw $v0, 0x148($s1) +/* A4D358 80240938 0C00EABB */ jal get_npc_unsafe +/* A4D35C 8024093C 84440008 */ lh $a0, 8($v0) +/* A4D360 80240940 24040064 */ addiu $a0, $zero, 0x64 +/* A4D364 80240944 0C00A67F */ jal rand_int +/* A4D368 80240948 0040802D */ daddu $s0, $v0, $zero +/* A4D36C 8024094C 00021FC2 */ srl $v1, $v0, 0x1f +/* A4D370 80240950 00431821 */ addu $v1, $v0, $v1 +/* A4D374 80240954 00031843 */ sra $v1, $v1, 1 +/* A4D378 80240958 00031840 */ sll $v1, $v1, 1 +/* A4D37C 8024095C 00431023 */ subu $v0, $v0, $v1 +/* A4D380 80240960 3C014334 */ lui $at, 0x4334 +/* A4D384 80240964 44811000 */ mtc1 $at, $f2 +/* A4D388 80240968 44820000 */ mtc1 $v0, $f0 +/* A4D38C 8024096C 00000000 */ nop +/* A4D390 80240970 46800020 */ cvt.s.w $f0, $f0 +/* A4D394 80240974 46020002 */ mul.s $f0, $f0, $f2 +/* A4D398 80240978 00000000 */ nop +/* A4D39C 8024097C 3C013F4C */ lui $at, 0x3f4c +/* A4D3A0 80240980 3421CCCD */ ori $at, $at, 0xcccd +/* A4D3A4 80240984 44812000 */ mtc1 $at, $f4 +/* A4D3A8 80240988 3C0142B4 */ lui $at, 0x42b4 +/* A4D3AC 8024098C 44811000 */ mtc1 $at, $f2 +/* A4D3B0 80240990 2402000F */ addiu $v0, $zero, 0xf +/* A4D3B4 80240994 A602008E */ sh $v0, 0x8e($s0) +/* A4D3B8 80240998 46020000 */ add.s $f0, $f0, $f2 +/* A4D3BC 8024099C 24020006 */ addiu $v0, $zero, 6 +/* A4D3C0 802409A0 E6040018 */ swc1 $f4, 0x18($s0) +/* A4D3C4 802409A4 E600000C */ swc1 $f0, 0xc($s0) +/* A4D3C8 802409A8 AE220070 */ sw $v0, 0x70($s1) +/* A4D3CC 802409AC 8FBF0018 */ lw $ra, 0x18($sp) +/* A4D3D0 802409B0 8FB10014 */ lw $s1, 0x14($sp) +/* A4D3D4 802409B4 8FB00010 */ lw $s0, 0x10($sp) +/* A4D3D8 802409B8 03E00008 */ jr $ra +/* A4D3DC 802409BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24.s deleted file mode 100644 index 6348ad2052..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A24 -/* A4D444 80240A24 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A4D448 80240A28 AFB30034 */ sw $s3, 0x34($sp) -/* A4D44C 80240A2C 0080982D */ daddu $s3, $a0, $zero -/* A4D450 80240A30 AFBF0038 */ sw $ra, 0x38($sp) -/* A4D454 80240A34 AFB20030 */ sw $s2, 0x30($sp) -/* A4D458 80240A38 AFB1002C */ sw $s1, 0x2c($sp) -/* A4D45C 80240A3C AFB00028 */ sw $s0, 0x28($sp) -/* A4D460 80240A40 8E700148 */ lw $s0, 0x148($s3) -/* A4D464 80240A44 0C00EABB */ jal get_npc_unsafe -/* A4D468 80240A48 86040008 */ lh $a0, 8($s0) -/* A4D46C 80240A4C 0040902D */ daddu $s2, $v0, $zero -/* A4D470 80240A50 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* A4D474 80240A54 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* A4D478 80240A58 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A4D47C 80240A5C 8E220000 */ lw $v0, ($s1) -/* A4D480 80240A60 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A4D484 80240A64 8C460028 */ lw $a2, 0x28($v0) -/* A4D488 80240A68 0C00A7B5 */ jal dist2D -/* A4D48C 80240A6C 8C470030 */ lw $a3, 0x30($v0) -/* A4D490 80240A70 24020001 */ addiu $v0, $zero, 1 -/* A4D494 80240A74 AE02006C */ sw $v0, 0x6c($s0) -/* A4D498 80240A78 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A4D49C 80240A7C 8E0200CC */ lw $v0, 0xcc($s0) -/* A4D4A0 80240A80 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A4D4A4 80240A84 8E230000 */ lw $v1, ($s1) -/* A4D4A8 80240A88 8C420020 */ lw $v0, 0x20($v0) -/* A4D4AC 80240A8C AE420028 */ sw $v0, 0x28($s2) -/* A4D4B0 80240A90 8C660028 */ lw $a2, 0x28($v1) -/* A4D4B4 80240A94 8C670030 */ lw $a3, 0x30($v1) -/* A4D4B8 80240A98 0C00A720 */ jal atan2 -/* A4D4BC 80240A9C E7A00024 */ swc1 $f0, 0x24($sp) -/* A4D4C0 80240AA0 8E420000 */ lw $v0, ($s2) -/* A4D4C4 80240AA4 3C013DCC */ lui $at, 0x3dcc -/* A4D4C8 80240AA8 3421CCCD */ ori $at, $at, 0xcccd -/* A4D4CC 80240AAC 44811000 */ mtc1 $at, $f2 -/* A4D4D0 80240AB0 2403FFFD */ addiu $v1, $zero, -3 -/* A4D4D4 80240AB4 E640000C */ swc1 $f0, 0xc($s2) -/* A4D4D8 80240AB8 00431024 */ and $v0, $v0, $v1 -/* A4D4DC 80240ABC AE420000 */ sw $v0, ($s2) -/* A4D4E0 80240AC0 30420008 */ andi $v0, $v0, 8 -/* A4D4E4 80240AC4 E6420054 */ swc1 $f2, 0x54($s2) -/* A4D4E8 80240AC8 E6420058 */ swc1 $f2, 0x58($s2) -/* A4D4EC 80240ACC 1440001B */ bnez $v0, .L80240B3C -/* A4D4F0 80240AD0 E642005C */ swc1 $f2, 0x5c($s2) -/* A4D4F4 80240AD4 27A6001C */ addiu $a2, $sp, 0x1c -/* A4D4F8 80240AD8 27A70020 */ addiu $a3, $sp, 0x20 -/* A4D4FC 80240ADC 27A20024 */ addiu $v0, $sp, 0x24 -/* A4D500 80240AE0 C6420038 */ lwc1 $f2, 0x38($s2) -/* A4D504 80240AE4 C640003C */ lwc1 $f0, 0x3c($s2) -/* A4D508 80240AE8 3C014348 */ lui $at, 0x4348 -/* A4D50C 80240AEC 44813000 */ mtc1 $at, $f6 -/* A4D510 80240AF0 46000021 */ cvt.d.s $f0, $f0 -/* A4D514 80240AF4 E7A20018 */ swc1 $f2, 0x18($sp) -/* A4D518 80240AF8 3C014059 */ lui $at, 0x4059 -/* A4D51C 80240AFC 44811800 */ mtc1 $at, $f3 -/* A4D520 80240B00 44801000 */ mtc1 $zero, $f2 -/* A4D524 80240B04 C6440040 */ lwc1 $f4, 0x40($s2) -/* A4D528 80240B08 46220000 */ add.d $f0, $f0, $f2 -/* A4D52C 80240B0C E7A60024 */ swc1 $f6, 0x24($sp) -/* A4D530 80240B10 E7A40020 */ swc1 $f4, 0x20($sp) -/* A4D534 80240B14 46200020 */ cvt.s.d $f0, $f0 -/* A4D538 80240B18 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A4D53C 80240B1C AFA20010 */ sw $v0, 0x10($sp) -/* A4D540 80240B20 8E440080 */ lw $a0, 0x80($s2) -/* A4D544 80240B24 0C0372DF */ jal func_800DCB7C -/* A4D548 80240B28 27A50018 */ addiu $a1, $sp, 0x18 -/* A4D54C 80240B2C 10400004 */ beqz $v0, .L80240B40 -/* A4D550 80240B30 2402000B */ addiu $v0, $zero, 0xb -/* A4D554 80240B34 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A4D558 80240B38 E640003C */ swc1 $f0, 0x3c($s2) -.L80240B3C: -/* A4D55C 80240B3C 2402000B */ addiu $v0, $zero, 0xb -.L80240B40: -/* A4D560 80240B40 A640008E */ sh $zero, 0x8e($s2) -/* A4D564 80240B44 AE620070 */ sw $v0, 0x70($s3) -/* A4D568 80240B48 8FBF0038 */ lw $ra, 0x38($sp) -/* A4D56C 80240B4C 8FB30034 */ lw $s3, 0x34($sp) -/* A4D570 80240B50 8FB20030 */ lw $s2, 0x30($sp) -/* A4D574 80240B54 8FB1002C */ lw $s1, 0x2c($sp) -/* A4D578 80240B58 8FB00028 */ lw $s0, 0x28($sp) -/* A4D57C 80240B5C 03E00008 */ jr $ra -/* A4D580 80240B60 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24_A4D444.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24_A4D444.s new file mode 100644 index 0000000000..978851ac1d --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240A24_A4D444.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A24_A4D444 +/* A4D444 80240A24 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A4D448 80240A28 AFB30034 */ sw $s3, 0x34($sp) +/* A4D44C 80240A2C 0080982D */ daddu $s3, $a0, $zero +/* A4D450 80240A30 AFBF0038 */ sw $ra, 0x38($sp) +/* A4D454 80240A34 AFB20030 */ sw $s2, 0x30($sp) +/* A4D458 80240A38 AFB1002C */ sw $s1, 0x2c($sp) +/* A4D45C 80240A3C AFB00028 */ sw $s0, 0x28($sp) +/* A4D460 80240A40 8E700148 */ lw $s0, 0x148($s3) +/* A4D464 80240A44 0C00EABB */ jal get_npc_unsafe +/* A4D468 80240A48 86040008 */ lh $a0, 8($s0) +/* A4D46C 80240A4C 0040902D */ daddu $s2, $v0, $zero +/* A4D470 80240A50 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) +/* A4D474 80240A54 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) +/* A4D478 80240A58 C64C0038 */ lwc1 $f12, 0x38($s2) +/* A4D47C 80240A5C 8E220000 */ lw $v0, ($s1) +/* A4D480 80240A60 C64E0040 */ lwc1 $f14, 0x40($s2) +/* A4D484 80240A64 8C460028 */ lw $a2, 0x28($v0) +/* A4D488 80240A68 0C00A7B5 */ jal dist2D +/* A4D48C 80240A6C 8C470030 */ lw $a3, 0x30($v0) +/* A4D490 80240A70 24020001 */ addiu $v0, $zero, 1 +/* A4D494 80240A74 AE02006C */ sw $v0, 0x6c($s0) +/* A4D498 80240A78 C64C0038 */ lwc1 $f12, 0x38($s2) +/* A4D49C 80240A7C 8E0200CC */ lw $v0, 0xcc($s0) +/* A4D4A0 80240A80 C64E0040 */ lwc1 $f14, 0x40($s2) +/* A4D4A4 80240A84 8E230000 */ lw $v1, ($s1) +/* A4D4A8 80240A88 8C420020 */ lw $v0, 0x20($v0) +/* A4D4AC 80240A8C AE420028 */ sw $v0, 0x28($s2) +/* A4D4B0 80240A90 8C660028 */ lw $a2, 0x28($v1) +/* A4D4B4 80240A94 8C670030 */ lw $a3, 0x30($v1) +/* A4D4B8 80240A98 0C00A720 */ jal atan2 +/* A4D4BC 80240A9C E7A00024 */ swc1 $f0, 0x24($sp) +/* A4D4C0 80240AA0 8E420000 */ lw $v0, ($s2) +/* A4D4C4 80240AA4 3C013DCC */ lui $at, 0x3dcc +/* A4D4C8 80240AA8 3421CCCD */ ori $at, $at, 0xcccd +/* A4D4CC 80240AAC 44811000 */ mtc1 $at, $f2 +/* A4D4D0 80240AB0 2403FFFD */ addiu $v1, $zero, -3 +/* A4D4D4 80240AB4 E640000C */ swc1 $f0, 0xc($s2) +/* A4D4D8 80240AB8 00431024 */ and $v0, $v0, $v1 +/* A4D4DC 80240ABC AE420000 */ sw $v0, ($s2) +/* A4D4E0 80240AC0 30420008 */ andi $v0, $v0, 8 +/* A4D4E4 80240AC4 E6420054 */ swc1 $f2, 0x54($s2) +/* A4D4E8 80240AC8 E6420058 */ swc1 $f2, 0x58($s2) +/* A4D4EC 80240ACC 1440001B */ bnez $v0, .L80240B3C +/* A4D4F0 80240AD0 E642005C */ swc1 $f2, 0x5c($s2) +/* A4D4F4 80240AD4 27A6001C */ addiu $a2, $sp, 0x1c +/* A4D4F8 80240AD8 27A70020 */ addiu $a3, $sp, 0x20 +/* A4D4FC 80240ADC 27A20024 */ addiu $v0, $sp, 0x24 +/* A4D500 80240AE0 C6420038 */ lwc1 $f2, 0x38($s2) +/* A4D504 80240AE4 C640003C */ lwc1 $f0, 0x3c($s2) +/* A4D508 80240AE8 3C014348 */ lui $at, 0x4348 +/* A4D50C 80240AEC 44813000 */ mtc1 $at, $f6 +/* A4D510 80240AF0 46000021 */ cvt.d.s $f0, $f0 +/* A4D514 80240AF4 E7A20018 */ swc1 $f2, 0x18($sp) +/* A4D518 80240AF8 3C014059 */ lui $at, 0x4059 +/* A4D51C 80240AFC 44811800 */ mtc1 $at, $f3 +/* A4D520 80240B00 44801000 */ mtc1 $zero, $f2 +/* A4D524 80240B04 C6440040 */ lwc1 $f4, 0x40($s2) +/* A4D528 80240B08 46220000 */ add.d $f0, $f0, $f2 +/* A4D52C 80240B0C E7A60024 */ swc1 $f6, 0x24($sp) +/* A4D530 80240B10 E7A40020 */ swc1 $f4, 0x20($sp) +/* A4D534 80240B14 46200020 */ cvt.s.d $f0, $f0 +/* A4D538 80240B18 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A4D53C 80240B1C AFA20010 */ sw $v0, 0x10($sp) +/* A4D540 80240B20 8E440080 */ lw $a0, 0x80($s2) +/* A4D544 80240B24 0C0372DF */ jal func_800DCB7C +/* A4D548 80240B28 27A50018 */ addiu $a1, $sp, 0x18 +/* A4D54C 80240B2C 10400004 */ beqz $v0, .L80240B40 +/* A4D550 80240B30 2402000B */ addiu $v0, $zero, 0xb +/* A4D554 80240B34 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A4D558 80240B38 E640003C */ swc1 $f0, 0x3c($s2) +.L80240B3C: +/* A4D55C 80240B3C 2402000B */ addiu $v0, $zero, 0xb +.L80240B40: +/* A4D560 80240B40 A640008E */ sh $zero, 0x8e($s2) +/* A4D564 80240B44 AE620070 */ sw $v0, 0x70($s3) +/* A4D568 80240B48 8FBF0038 */ lw $ra, 0x38($sp) +/* A4D56C 80240B4C 8FB30034 */ lw $s3, 0x34($sp) +/* A4D570 80240B50 8FB20030 */ lw $s2, 0x30($sp) +/* A4D574 80240B54 8FB1002C */ lw $s1, 0x2c($sp) +/* A4D578 80240B58 8FB00028 */ lw $s0, 0x28($sp) +/* A4D57C 80240B5C 03E00008 */ jr $ra +/* A4D580 80240B60 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s index 40092e1750..57d5680799 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240D44_A4D764.s @@ -58,7 +58,7 @@ glabel func_80240D44_A4D764 .L80240E18: /* A4D838 80240E18 8E450024 */ lw $a1, 0x24($s2) /* A4D83C 80240E1C 8E460028 */ lw $a2, 0x28($s2) -/* A4D840 80240E20 0C090028 */ jal func_802400A0 +/* A4D840 80240E20 0C090028 */ jal func_802400A0_A4CAC0 /* A4D844 80240E24 0260382D */ daddu $a3, $s3, $zero /* A4D848 80240E28 24030001 */ addiu $v1, $zero, 1 /* A4D84C 80240E2C 1443002C */ bne $v0, $v1, .L80240EE0 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04.s deleted file mode 100644 index 75b25e292c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F04 -/* A4D924 80240F04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4D928 80240F08 AFB10014 */ sw $s1, 0x14($sp) -/* A4D92C 80240F0C 0080882D */ daddu $s1, $a0, $zero -/* A4D930 80240F10 AFBF0018 */ sw $ra, 0x18($sp) -/* A4D934 80240F14 AFB00010 */ sw $s0, 0x10($sp) -/* A4D938 80240F18 8E300148 */ lw $s0, 0x148($s1) -/* A4D93C 80240F1C 0C00EABB */ jal get_npc_unsafe -/* A4D940 80240F20 86040008 */ lh $a0, 8($s0) -/* A4D944 80240F24 0040202D */ daddu $a0, $v0, $zero -/* A4D948 80240F28 9482008E */ lhu $v0, 0x8e($a0) -/* A4D94C 80240F2C 2442FFFF */ addiu $v0, $v0, -1 -/* A4D950 80240F30 A482008E */ sh $v0, 0x8e($a0) -/* A4D954 80240F34 00021400 */ sll $v0, $v0, 0x10 -/* A4D958 80240F38 1C400008 */ bgtz $v0, .L80240F5C -/* A4D95C 80240F3C 00000000 */ nop -/* A4D960 80240F40 8E0200CC */ lw $v0, 0xcc($s0) -/* A4D964 80240F44 8C430024 */ lw $v1, 0x24($v0) -/* A4D968 80240F48 24020009 */ addiu $v0, $zero, 9 -/* A4D96C 80240F4C A482008E */ sh $v0, 0x8e($a0) -/* A4D970 80240F50 24020017 */ addiu $v0, $zero, 0x17 -/* A4D974 80240F54 AC830028 */ sw $v1, 0x28($a0) -/* A4D978 80240F58 AE220070 */ sw $v0, 0x70($s1) -.L80240F5C: -/* A4D97C 80240F5C 8FBF0018 */ lw $ra, 0x18($sp) -/* A4D980 80240F60 8FB10014 */ lw $s1, 0x14($sp) -/* A4D984 80240F64 8FB00010 */ lw $s0, 0x10($sp) -/* A4D988 80240F68 03E00008 */ jr $ra -/* A4D98C 80240F6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s new file mode 100644 index 0000000000..78e271a218 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F04_A4D924.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F04_A4D924 +/* A4D924 80240F04 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A4D928 80240F08 AFB10014 */ sw $s1, 0x14($sp) +/* A4D92C 80240F0C 0080882D */ daddu $s1, $a0, $zero +/* A4D930 80240F10 AFBF0018 */ sw $ra, 0x18($sp) +/* A4D934 80240F14 AFB00010 */ sw $s0, 0x10($sp) +/* A4D938 80240F18 8E300148 */ lw $s0, 0x148($s1) +/* A4D93C 80240F1C 0C00EABB */ jal get_npc_unsafe +/* A4D940 80240F20 86040008 */ lh $a0, 8($s0) +/* A4D944 80240F24 0040202D */ daddu $a0, $v0, $zero +/* A4D948 80240F28 9482008E */ lhu $v0, 0x8e($a0) +/* A4D94C 80240F2C 2442FFFF */ addiu $v0, $v0, -1 +/* A4D950 80240F30 A482008E */ sh $v0, 0x8e($a0) +/* A4D954 80240F34 00021400 */ sll $v0, $v0, 0x10 +/* A4D958 80240F38 1C400008 */ bgtz $v0, .L80240F5C +/* A4D95C 80240F3C 00000000 */ nop +/* A4D960 80240F40 8E0200CC */ lw $v0, 0xcc($s0) +/* A4D964 80240F44 8C430024 */ lw $v1, 0x24($v0) +/* A4D968 80240F48 24020009 */ addiu $v0, $zero, 9 +/* A4D96C 80240F4C A482008E */ sh $v0, 0x8e($a0) +/* A4D970 80240F50 24020017 */ addiu $v0, $zero, 0x17 +/* A4D974 80240F54 AC830028 */ sw $v1, 0x28($a0) +/* A4D978 80240F58 AE220070 */ sw $v0, 0x70($s1) +.L80240F5C: +/* A4D97C 80240F5C 8FBF0018 */ lw $ra, 0x18($sp) +/* A4D980 80240F60 8FB10014 */ lw $s1, 0x14($sp) +/* A4D984 80240F64 8FB00010 */ lw $s0, 0x10($sp) +/* A4D988 80240F68 03E00008 */ jr $ra +/* A4D98C 80240F6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s index ed80ec3e3a..6bf43db6bc 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80240F70_A4D990.s @@ -25,7 +25,7 @@ glabel func_80240F70_A4D990 /* A4D9E0 80240FC0 0260202D */ daddu $a0, $s3, $zero /* A4D9E4 80240FC4 8E250024 */ lw $a1, 0x24($s1) /* A4D9E8 80240FC8 8E260028 */ lw $a2, 0x28($s1) -/* A4D9EC 80240FCC 0C090028 */ jal func_802400A0 +/* A4D9EC 80240FCC 0C090028 */ jal func_802400A0_A4CAC0 /* A4D9F0 80240FD0 0280382D */ daddu $a3, $s4, $zero /* A4D9F4 80240FD4 0040882D */ daddu $s1, $v0, $zero /* A4D9F8 80240FD8 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C.s deleted file mode 100644 index 89f5feffeb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024110C -/* A4DB2C 8024110C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A4DB30 80241110 AFB50044 */ sw $s5, 0x44($sp) -/* A4DB34 80241114 0080A82D */ daddu $s5, $a0, $zero -/* A4DB38 80241118 AFBF0048 */ sw $ra, 0x48($sp) -/* A4DB3C 8024111C AFB40040 */ sw $s4, 0x40($sp) -/* A4DB40 80241120 AFB3003C */ sw $s3, 0x3c($sp) -/* A4DB44 80241124 AFB20038 */ sw $s2, 0x38($sp) -/* A4DB48 80241128 AFB10034 */ sw $s1, 0x34($sp) -/* A4DB4C 8024112C AFB00030 */ sw $s0, 0x30($sp) -/* A4DB50 80241130 8EB10148 */ lw $s1, 0x148($s5) -/* A4DB54 80241134 86240008 */ lh $a0, 8($s1) -/* A4DB58 80241138 0C00EABB */ jal get_npc_unsafe -/* A4DB5C 8024113C 00A0802D */ daddu $s0, $a1, $zero -/* A4DB60 80241140 8EA3000C */ lw $v1, 0xc($s5) -/* A4DB64 80241144 02A0202D */ daddu $a0, $s5, $zero -/* A4DB68 80241148 8C650000 */ lw $a1, ($v1) -/* A4DB6C 8024114C 0C0B1EAF */ jal get_variable -/* A4DB70 80241150 0040902D */ daddu $s2, $v0, $zero -/* A4DB74 80241154 AFA00010 */ sw $zero, 0x10($sp) -/* A4DB78 80241158 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DB7C 8024115C 8C630030 */ lw $v1, 0x30($v1) -/* A4DB80 80241160 AFA30014 */ sw $v1, 0x14($sp) -/* A4DB84 80241164 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DB88 80241168 8C63001C */ lw $v1, 0x1c($v1) -/* A4DB8C 8024116C AFA30018 */ sw $v1, 0x18($sp) -/* A4DB90 80241170 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DB94 80241174 8C630024 */ lw $v1, 0x24($v1) -/* A4DB98 80241178 AFA3001C */ sw $v1, 0x1c($sp) -/* A4DB9C 8024117C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DBA0 80241180 8C630028 */ lw $v1, 0x28($v1) -/* A4DBA4 80241184 27B40010 */ addiu $s4, $sp, 0x10 -/* A4DBA8 80241188 AFA30020 */ sw $v1, 0x20($sp) -/* A4DBAC 8024118C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A4DBB0 80241190 3C0142C8 */ lui $at, 0x42c8 -/* A4DBB4 80241194 44810000 */ mtc1 $at, $f0 -/* A4DBB8 80241198 8C63002C */ lw $v1, 0x2c($v1) -/* A4DBBC 8024119C 0040982D */ daddu $s3, $v0, $zero -/* A4DBC0 802411A0 E7A00028 */ swc1 $f0, 0x28($sp) -/* A4DBC4 802411A4 A7A0002C */ sh $zero, 0x2c($sp) -/* A4DBC8 802411A8 16000005 */ bnez $s0, .L802411C0 -/* A4DBCC 802411AC AFA30024 */ sw $v1, 0x24($sp) -/* A4DBD0 802411B0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A4DBD4 802411B4 30420004 */ andi $v0, $v0, 4 -/* A4DBD8 802411B8 1040001E */ beqz $v0, .L80241234 -/* A4DBDC 802411BC 00000000 */ nop -.L802411C0: -/* A4DBE0 802411C0 8E430000 */ lw $v1, ($s2) -/* A4DBE4 802411C4 2402F7FF */ addiu $v0, $zero, -0x801 -/* A4DBE8 802411C8 00621824 */ and $v1, $v1, $v0 -/* A4DBEC 802411CC 8E2200CC */ lw $v0, 0xcc($s1) -/* A4DBF0 802411D0 3C040020 */ lui $a0, 0x20 -/* A4DBF4 802411D4 8C420000 */ lw $v0, ($v0) -/* A4DBF8 802411D8 00641825 */ or $v1, $v1, $a0 -/* A4DBFC 802411DC AE430000 */ sw $v1, ($s2) -/* A4DC00 802411E0 AE420028 */ sw $v0, 0x28($s2) -/* A4DC04 802411E4 8E220000 */ lw $v0, ($s1) -/* A4DC08 802411E8 00441025 */ or $v0, $v0, $a0 -/* A4DC0C 802411EC AE220000 */ sw $v0, ($s1) -/* A4DC10 802411F0 A640008E */ sh $zero, 0x8e($s2) -/* A4DC14 802411F4 8E2300B0 */ lw $v1, 0xb0($s1) -/* A4DC18 802411F8 30620004 */ andi $v0, $v1, 4 -/* A4DC1C 802411FC 1040000C */ beqz $v0, .L80241230 -/* A4DC20 80241200 2402FFFB */ addiu $v0, $zero, -5 -/* A4DC24 80241204 3C013F80 */ lui $at, 0x3f80 -/* A4DC28 80241208 44810000 */ mtc1 $at, $f0 -/* A4DC2C 8024120C 00621024 */ and $v0, $v1, $v0 -/* A4DC30 80241210 AE2200B0 */ sw $v0, 0xb0($s1) -/* A4DC34 80241214 240200FF */ addiu $v0, $zero, 0xff -/* A4DC38 80241218 A24200AC */ sb $v0, 0xac($s2) -/* A4DC3C 8024121C 24020014 */ addiu $v0, $zero, 0x14 -/* A4DC40 80241220 A642008E */ sh $v0, 0x8e($s2) -/* A4DC44 80241224 E6400054 */ swc1 $f0, 0x54($s2) -/* A4DC48 80241228 E6400058 */ swc1 $f0, 0x58($s2) -/* A4DC4C 8024122C E640005C */ swc1 $f0, 0x5c($s2) -.L80241230: -/* A4DC50 80241230 AEA00070 */ sw $zero, 0x70($s5) -.L80241234: -/* A4DC54 80241234 8EA30070 */ lw $v1, 0x70($s5) -/* A4DC58 80241238 2C620019 */ sltiu $v0, $v1, 0x19 -/* A4DC5C 8024123C 10400044 */ beqz $v0, .L80241350 -/* A4DC60 80241240 00031080 */ sll $v0, $v1, 2 -/* A4DC64 80241244 3C018024 */ lui $at, 0x8024 -/* A4DC68 80241248 00220821 */ addu $at, $at, $v0 -/* A4DC6C 8024124C 8C222570 */ lw $v0, 0x2570($at) -/* A4DC70 80241250 00400008 */ jr $v0 -/* A4DC74 80241254 00000000 */ nop -/* A4DC78 80241258 02A0202D */ daddu $a0, $s5, $zero -/* A4DC7C 8024125C 0260282D */ daddu $a1, $s3, $zero -/* A4DC80 80241260 0C0901E0 */ jal func_80240780 -/* A4DC84 80241264 0280302D */ daddu $a2, $s4, $zero -/* A4DC88 80241268 8EA30070 */ lw $v1, 0x70($s5) -/* A4DC8C 8024126C 24020001 */ addiu $v0, $zero, 1 -/* A4DC90 80241270 14620037 */ bne $v1, $v0, .L80241350 -/* A4DC94 80241274 00000000 */ nop -/* A4DC98 80241278 02A0202D */ daddu $a0, $s5, $zero -/* A4DC9C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* A4DCA0 80241280 0C0901FD */ jal func_802407F4 -/* A4DCA4 80241284 0280302D */ daddu $a2, $s4, $zero -/* A4DCA8 80241288 080904D4 */ j .L80241350 -/* A4DCAC 8024128C 00000000 */ nop -/* A4DCB0 80241290 02A0202D */ daddu $a0, $s5, $zero -/* A4DCB4 80241294 0260282D */ daddu $a1, $s3, $zero -/* A4DCB8 80241298 0C090248 */ jal func_80240920 -/* A4DCBC 8024129C 0280302D */ daddu $a2, $s4, $zero -/* A4DCC0 802412A0 02A0202D */ daddu $a0, $s5, $zero -/* A4DCC4 802412A4 0260282D */ daddu $a1, $s3, $zero -/* A4DCC8 802412A8 0C090270 */ jal func_802409C0 -/* A4DCCC 802412AC 0280302D */ daddu $a2, $s4, $zero -/* A4DCD0 802412B0 080904D4 */ j .L80241350 -/* A4DCD4 802412B4 00000000 */ nop -/* A4DCD8 802412B8 02A0202D */ daddu $a0, $s5, $zero -/* A4DCDC 802412BC 0260282D */ daddu $a1, $s3, $zero -/* A4DCE0 802412C0 0C090289 */ jal func_80240A24 -/* A4DCE4 802412C4 0280302D */ daddu $a2, $s4, $zero -/* A4DCE8 802412C8 02A0202D */ daddu $a0, $s5, $zero -/* A4DCEC 802412CC 0260282D */ daddu $a1, $s3, $zero -/* A4DCF0 802412D0 0C0902D9 */ jal func_80240B64 -/* A4DCF4 802412D4 0280302D */ daddu $a2, $s4, $zero -/* A4DCF8 802412D8 080904D4 */ j .L80241350 -/* A4DCFC 802412DC 00000000 */ nop -/* A4DD00 802412E0 02A0202D */ daddu $a0, $s5, $zero -/* A4DD04 802412E4 0260282D */ daddu $a1, $s3, $zero -/* A4DD08 802412E8 0C090342 */ jal func_80240D08 -/* A4DD0C 802412EC 0280302D */ daddu $a2, $s4, $zero -/* A4DD10 802412F0 080904D4 */ j .L80241350 -/* A4DD14 802412F4 00000000 */ nop -/* A4DD18 802412F8 02A0202D */ daddu $a0, $s5, $zero -/* A4DD1C 802412FC 0260282D */ daddu $a1, $s3, $zero -/* A4DD20 80241300 0C090351 */ jal func_80240D44 -/* A4DD24 80241304 0280302D */ daddu $a2, $s4, $zero -/* A4DD28 80241308 080904D4 */ j .L80241350 -/* A4DD2C 8024130C 00000000 */ nop -/* A4DD30 80241310 02A0202D */ daddu $a0, $s5, $zero -/* A4DD34 80241314 0260282D */ daddu $a1, $s3, $zero -/* A4DD38 80241318 0C0903C1 */ jal func_80240F04 -/* A4DD3C 8024131C 0280302D */ daddu $a2, $s4, $zero -/* A4DD40 80241320 080904D4 */ j .L80241350 -/* A4DD44 80241324 00000000 */ nop -/* A4DD48 80241328 02A0202D */ daddu $a0, $s5, $zero -/* A4DD4C 8024132C 0260282D */ daddu $a1, $s3, $zero -/* A4DD50 80241330 0C0903DC */ jal func_80240F70 -/* A4DD54 80241334 0280302D */ daddu $a2, $s4, $zero -/* A4DD58 80241338 080904D4 */ j .L80241350 -/* A4DD5C 8024133C 00000000 */ nop -/* A4DD60 80241340 02A0202D */ daddu $a0, $s5, $zero -/* A4DD64 80241344 0260282D */ daddu $a1, $s3, $zero -/* A4DD68 80241348 0C090429 */ jal func_802410A4 -/* A4DD6C 8024134C 0280302D */ daddu $a2, $s4, $zero -.L80241350: -/* A4DD70 80241350 8FBF0048 */ lw $ra, 0x48($sp) -/* A4DD74 80241354 8FB50044 */ lw $s5, 0x44($sp) -/* A4DD78 80241358 8FB40040 */ lw $s4, 0x40($sp) -/* A4DD7C 8024135C 8FB3003C */ lw $s3, 0x3c($sp) -/* A4DD80 80241360 8FB20038 */ lw $s2, 0x38($sp) -/* A4DD84 80241364 8FB10034 */ lw $s1, 0x34($sp) -/* A4DD88 80241368 8FB00030 */ lw $s0, 0x30($sp) -/* A4DD8C 8024136C 0000102D */ daddu $v0, $zero, $zero -/* A4DD90 80241370 03E00008 */ jr $ra -/* A4DD94 80241374 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s new file mode 100644 index 0000000000..91de053050 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024110C_A4DB2C.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024110C_A4DB2C +/* A4DB2C 8024110C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A4DB30 80241110 AFB50044 */ sw $s5, 0x44($sp) +/* A4DB34 80241114 0080A82D */ daddu $s5, $a0, $zero +/* A4DB38 80241118 AFBF0048 */ sw $ra, 0x48($sp) +/* A4DB3C 8024111C AFB40040 */ sw $s4, 0x40($sp) +/* A4DB40 80241120 AFB3003C */ sw $s3, 0x3c($sp) +/* A4DB44 80241124 AFB20038 */ sw $s2, 0x38($sp) +/* A4DB48 80241128 AFB10034 */ sw $s1, 0x34($sp) +/* A4DB4C 8024112C AFB00030 */ sw $s0, 0x30($sp) +/* A4DB50 80241130 8EB10148 */ lw $s1, 0x148($s5) +/* A4DB54 80241134 86240008 */ lh $a0, 8($s1) +/* A4DB58 80241138 0C00EABB */ jal get_npc_unsafe +/* A4DB5C 8024113C 00A0802D */ daddu $s0, $a1, $zero +/* A4DB60 80241140 8EA3000C */ lw $v1, 0xc($s5) +/* A4DB64 80241144 02A0202D */ daddu $a0, $s5, $zero +/* A4DB68 80241148 8C650000 */ lw $a1, ($v1) +/* A4DB6C 8024114C 0C0B1EAF */ jal get_variable +/* A4DB70 80241150 0040902D */ daddu $s2, $v0, $zero +/* A4DB74 80241154 AFA00010 */ sw $zero, 0x10($sp) +/* A4DB78 80241158 8E2300D0 */ lw $v1, 0xd0($s1) +/* A4DB7C 8024115C 8C630030 */ lw $v1, 0x30($v1) +/* A4DB80 80241160 AFA30014 */ sw $v1, 0x14($sp) +/* A4DB84 80241164 8E2300D0 */ lw $v1, 0xd0($s1) +/* A4DB88 80241168 8C63001C */ lw $v1, 0x1c($v1) +/* A4DB8C 8024116C AFA30018 */ sw $v1, 0x18($sp) +/* A4DB90 80241170 8E2300D0 */ lw $v1, 0xd0($s1) +/* A4DB94 80241174 8C630024 */ lw $v1, 0x24($v1) +/* A4DB98 80241178 AFA3001C */ sw $v1, 0x1c($sp) +/* A4DB9C 8024117C 8E2300D0 */ lw $v1, 0xd0($s1) +/* A4DBA0 80241180 8C630028 */ lw $v1, 0x28($v1) +/* A4DBA4 80241184 27B40010 */ addiu $s4, $sp, 0x10 +/* A4DBA8 80241188 AFA30020 */ sw $v1, 0x20($sp) +/* A4DBAC 8024118C 8E2300D0 */ lw $v1, 0xd0($s1) +/* A4DBB0 80241190 3C0142C8 */ lui $at, 0x42c8 +/* A4DBB4 80241194 44810000 */ mtc1 $at, $f0 +/* A4DBB8 80241198 8C63002C */ lw $v1, 0x2c($v1) +/* A4DBBC 8024119C 0040982D */ daddu $s3, $v0, $zero +/* A4DBC0 802411A0 E7A00028 */ swc1 $f0, 0x28($sp) +/* A4DBC4 802411A4 A7A0002C */ sh $zero, 0x2c($sp) +/* A4DBC8 802411A8 16000005 */ bnez $s0, .L802411C0 +/* A4DBCC 802411AC AFA30024 */ sw $v1, 0x24($sp) +/* A4DBD0 802411B0 8E2200B0 */ lw $v0, 0xb0($s1) +/* A4DBD4 802411B4 30420004 */ andi $v0, $v0, 4 +/* A4DBD8 802411B8 1040001E */ beqz $v0, .L80241234 +/* A4DBDC 802411BC 00000000 */ nop +.L802411C0: +/* A4DBE0 802411C0 8E430000 */ lw $v1, ($s2) +/* A4DBE4 802411C4 2402F7FF */ addiu $v0, $zero, -0x801 +/* A4DBE8 802411C8 00621824 */ and $v1, $v1, $v0 +/* A4DBEC 802411CC 8E2200CC */ lw $v0, 0xcc($s1) +/* A4DBF0 802411D0 3C040020 */ lui $a0, 0x20 +/* A4DBF4 802411D4 8C420000 */ lw $v0, ($v0) +/* A4DBF8 802411D8 00641825 */ or $v1, $v1, $a0 +/* A4DBFC 802411DC AE430000 */ sw $v1, ($s2) +/* A4DC00 802411E0 AE420028 */ sw $v0, 0x28($s2) +/* A4DC04 802411E4 8E220000 */ lw $v0, ($s1) +/* A4DC08 802411E8 00441025 */ or $v0, $v0, $a0 +/* A4DC0C 802411EC AE220000 */ sw $v0, ($s1) +/* A4DC10 802411F0 A640008E */ sh $zero, 0x8e($s2) +/* A4DC14 802411F4 8E2300B0 */ lw $v1, 0xb0($s1) +/* A4DC18 802411F8 30620004 */ andi $v0, $v1, 4 +/* A4DC1C 802411FC 1040000C */ beqz $v0, .L80241230 +/* A4DC20 80241200 2402FFFB */ addiu $v0, $zero, -5 +/* A4DC24 80241204 3C013F80 */ lui $at, 0x3f80 +/* A4DC28 80241208 44810000 */ mtc1 $at, $f0 +/* A4DC2C 8024120C 00621024 */ and $v0, $v1, $v0 +/* A4DC30 80241210 AE2200B0 */ sw $v0, 0xb0($s1) +/* A4DC34 80241214 240200FF */ addiu $v0, $zero, 0xff +/* A4DC38 80241218 A24200AC */ sb $v0, 0xac($s2) +/* A4DC3C 8024121C 24020014 */ addiu $v0, $zero, 0x14 +/* A4DC40 80241220 A642008E */ sh $v0, 0x8e($s2) +/* A4DC44 80241224 E6400054 */ swc1 $f0, 0x54($s2) +/* A4DC48 80241228 E6400058 */ swc1 $f0, 0x58($s2) +/* A4DC4C 8024122C E640005C */ swc1 $f0, 0x5c($s2) +.L80241230: +/* A4DC50 80241230 AEA00070 */ sw $zero, 0x70($s5) +.L80241234: +/* A4DC54 80241234 8EA30070 */ lw $v1, 0x70($s5) +/* A4DC58 80241238 2C620019 */ sltiu $v0, $v1, 0x19 +/* A4DC5C 8024123C 10400044 */ beqz $v0, .L80241350 +/* A4DC60 80241240 00031080 */ sll $v0, $v1, 2 +/* A4DC64 80241244 3C018024 */ lui $at, 0x8024 +/* A4DC68 80241248 00220821 */ addu $at, $at, $v0 +/* A4DC6C 8024124C 8C222570 */ lw $v0, 0x2570($at) +/* A4DC70 80241250 00400008 */ jr $v0 +/* A4DC74 80241254 00000000 */ nop +/* A4DC78 80241258 02A0202D */ daddu $a0, $s5, $zero +/* A4DC7C 8024125C 0260282D */ daddu $a1, $s3, $zero +/* A4DC80 80241260 0C0901E0 */ jal func_80240780_A4D1A0 +/* A4DC84 80241264 0280302D */ daddu $a2, $s4, $zero +/* A4DC88 80241268 8EA30070 */ lw $v1, 0x70($s5) +/* A4DC8C 8024126C 24020001 */ addiu $v0, $zero, 1 +/* A4DC90 80241270 14620037 */ bne $v1, $v0, .L80241350 +/* A4DC94 80241274 00000000 */ nop +/* A4DC98 80241278 02A0202D */ daddu $a0, $s5, $zero +/* A4DC9C 8024127C 0260282D */ daddu $a1, $s3, $zero +/* A4DCA0 80241280 0C0901FD */ jal func_802407F4_A4D214 +/* A4DCA4 80241284 0280302D */ daddu $a2, $s4, $zero +/* A4DCA8 80241288 080904D4 */ j .L80241350 +/* A4DCAC 8024128C 00000000 */ nop +/* A4DCB0 80241290 02A0202D */ daddu $a0, $s5, $zero +/* A4DCB4 80241294 0260282D */ daddu $a1, $s3, $zero +/* A4DCB8 80241298 0C090248 */ jal func_80240920_A4D340 +/* A4DCBC 8024129C 0280302D */ daddu $a2, $s4, $zero +/* A4DCC0 802412A0 02A0202D */ daddu $a0, $s5, $zero +/* A4DCC4 802412A4 0260282D */ daddu $a1, $s3, $zero +/* A4DCC8 802412A8 0C090270 */ jal func_802409C0_A4D3E0 +/* A4DCCC 802412AC 0280302D */ daddu $a2, $s4, $zero +/* A4DCD0 802412B0 080904D4 */ j .L80241350 +/* A4DCD4 802412B4 00000000 */ nop +/* A4DCD8 802412B8 02A0202D */ daddu $a0, $s5, $zero +/* A4DCDC 802412BC 0260282D */ daddu $a1, $s3, $zero +/* A4DCE0 802412C0 0C090289 */ jal func_80240A24_A4D444 +/* A4DCE4 802412C4 0280302D */ daddu $a2, $s4, $zero +/* A4DCE8 802412C8 02A0202D */ daddu $a0, $s5, $zero +/* A4DCEC 802412CC 0260282D */ daddu $a1, $s3, $zero +/* A4DCF0 802412D0 0C0902D9 */ jal func_80240B64_A4D584 +/* A4DCF4 802412D4 0280302D */ daddu $a2, $s4, $zero +/* A4DCF8 802412D8 080904D4 */ j .L80241350 +/* A4DCFC 802412DC 00000000 */ nop +/* A4DD00 802412E0 02A0202D */ daddu $a0, $s5, $zero +/* A4DD04 802412E4 0260282D */ daddu $a1, $s3, $zero +/* A4DD08 802412E8 0C090342 */ jal func_80240D08_A4D728 +/* A4DD0C 802412EC 0280302D */ daddu $a2, $s4, $zero +/* A4DD10 802412F0 080904D4 */ j .L80241350 +/* A4DD14 802412F4 00000000 */ nop +/* A4DD18 802412F8 02A0202D */ daddu $a0, $s5, $zero +/* A4DD1C 802412FC 0260282D */ daddu $a1, $s3, $zero +/* A4DD20 80241300 0C090351 */ jal func_80240D44_A4D764 +/* A4DD24 80241304 0280302D */ daddu $a2, $s4, $zero +/* A4DD28 80241308 080904D4 */ j .L80241350 +/* A4DD2C 8024130C 00000000 */ nop +/* A4DD30 80241310 02A0202D */ daddu $a0, $s5, $zero +/* A4DD34 80241314 0260282D */ daddu $a1, $s3, $zero +/* A4DD38 80241318 0C0903C1 */ jal func_80240F04_A4D924 +/* A4DD3C 8024131C 0280302D */ daddu $a2, $s4, $zero +/* A4DD40 80241320 080904D4 */ j .L80241350 +/* A4DD44 80241324 00000000 */ nop +/* A4DD48 80241328 02A0202D */ daddu $a0, $s5, $zero +/* A4DD4C 8024132C 0260282D */ daddu $a1, $s3, $zero +/* A4DD50 80241330 0C0903DC */ jal func_80240F70_A4D990 +/* A4DD54 80241334 0280302D */ daddu $a2, $s4, $zero +/* A4DD58 80241338 080904D4 */ j .L80241350 +/* A4DD5C 8024133C 00000000 */ nop +/* A4DD60 80241340 02A0202D */ daddu $a0, $s5, $zero +/* A4DD64 80241344 0260282D */ daddu $a1, $s3, $zero +/* A4DD68 80241348 0C090429 */ jal func_802410A4_A4DAC4 +/* A4DD6C 8024134C 0280302D */ daddu $a2, $s4, $zero +.L80241350: +/* A4DD70 80241350 8FBF0048 */ lw $ra, 0x48($sp) +/* A4DD74 80241354 8FB50044 */ lw $s5, 0x44($sp) +/* A4DD78 80241358 8FB40040 */ lw $s4, 0x40($sp) +/* A4DD7C 8024135C 8FB3003C */ lw $s3, 0x3c($sp) +/* A4DD80 80241360 8FB20038 */ lw $s2, 0x38($sp) +/* A4DD84 80241364 8FB10034 */ lw $s1, 0x34($sp) +/* A4DD88 80241368 8FB00030 */ lw $s0, 0x30($sp) +/* A4DD8C 8024136C 0000102D */ daddu $v0, $zero, $zero +/* A4DD90 80241370 03E00008 */ jr $ra +/* A4DD94 80241374 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378.s deleted file mode 100644 index 25f8c40aa6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241378 -/* A4DD98 80241378 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A4DD9C 8024137C AFBF0020 */ sw $ra, 0x20($sp) -/* A4DDA0 80241380 8C820148 */ lw $v0, 0x148($a0) -/* A4DDA4 80241384 0C00EABB */ jal get_npc_unsafe -/* A4DDA8 80241388 84440008 */ lh $a0, 8($v0) -/* A4DDAC 8024138C 240300FF */ addiu $v1, $zero, 0xff -/* A4DDB0 80241390 0000282D */ daddu $a1, $zero, $zero -/* A4DDB4 80241394 00A0302D */ daddu $a2, $a1, $zero -/* A4DDB8 80241398 A04300AC */ sb $v1, 0xac($v0) -/* A4DDBC 8024139C AFA00010 */ sw $zero, 0x10($sp) -/* A4DDC0 802413A0 AFA00014 */ sw $zero, 0x14($sp) -/* A4DDC4 802413A4 AFA00018 */ sw $zero, 0x18($sp) -/* A4DDC8 802413A8 8C440024 */ lw $a0, 0x24($v0) -/* A4DDCC 802413AC 0C0B7A25 */ jal func_802DE894 -/* A4DDD0 802413B0 00A0382D */ daddu $a3, $a1, $zero -/* A4DDD4 802413B4 8FBF0020 */ lw $ra, 0x20($sp) -/* A4DDD8 802413B8 24020002 */ addiu $v0, $zero, 2 -/* A4DDDC 802413BC 03E00008 */ jr $ra -/* A4DDE0 802413C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378_A4DD98.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378_A4DD98.s new file mode 100644 index 0000000000..0681123819 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_80241378_A4DD98.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241378_A4DD98 +/* A4DD98 80241378 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A4DD9C 8024137C AFBF0020 */ sw $ra, 0x20($sp) +/* A4DDA0 80241380 8C820148 */ lw $v0, 0x148($a0) +/* A4DDA4 80241384 0C00EABB */ jal get_npc_unsafe +/* A4DDA8 80241388 84440008 */ lh $a0, 8($v0) +/* A4DDAC 8024138C 240300FF */ addiu $v1, $zero, 0xff +/* A4DDB0 80241390 0000282D */ daddu $a1, $zero, $zero +/* A4DDB4 80241394 00A0302D */ daddu $a2, $a1, $zero +/* A4DDB8 80241398 A04300AC */ sb $v1, 0xac($v0) +/* A4DDBC 8024139C AFA00010 */ sw $zero, 0x10($sp) +/* A4DDC0 802413A0 AFA00014 */ sw $zero, 0x14($sp) +/* A4DDC4 802413A4 AFA00018 */ sw $zero, 0x18($sp) +/* A4DDC8 802413A8 8C440024 */ lw $a0, 0x24($v0) +/* A4DDCC 802413AC 0C0B7A25 */ jal func_802DE894 +/* A4DDD0 802413B0 00A0382D */ daddu $a3, $a1, $zero +/* A4DDD4 802413B4 8FBF0020 */ lw $ra, 0x20($sp) +/* A4DDD8 802413B8 24020002 */ addiu $v0, $zero, 2 +/* A4DDDC 802413BC 03E00008 */ jr $ra +/* A4DDE0 802413C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4.s deleted file mode 100644 index 9fa8f5f6f5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413C4 -/* A4DDE4 802413C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A4DDE8 802413C8 AFB10014 */ sw $s1, 0x14($sp) -/* A4DDEC 802413CC 0080882D */ daddu $s1, $a0, $zero -/* A4DDF0 802413D0 AFBF0018 */ sw $ra, 0x18($sp) -/* A4DDF4 802413D4 AFB00010 */ sw $s0, 0x10($sp) -/* A4DDF8 802413D8 8E300148 */ lw $s0, 0x148($s1) -/* A4DDFC 802413DC 0C00EABB */ jal get_npc_unsafe -/* A4DE00 802413E0 86040008 */ lh $a0, 8($s0) -/* A4DE04 802413E4 0040182D */ daddu $v1, $v0, $zero -/* A4DE08 802413E8 240200FF */ addiu $v0, $zero, 0xff -/* A4DE0C 802413EC A06200AC */ sb $v0, 0xac($v1) -/* A4DE10 802413F0 8E0200CC */ lw $v0, 0xcc($s0) -/* A4DE14 802413F4 8C440008 */ lw $a0, 8($v0) -/* A4DE18 802413F8 A460008E */ sh $zero, 0x8e($v1) -/* A4DE1C 802413FC AC640028 */ sw $a0, 0x28($v1) -/* A4DE20 80241400 AE200070 */ sw $zero, 0x70($s1) -/* A4DE24 80241404 8FBF0018 */ lw $ra, 0x18($sp) -/* A4DE28 80241408 8FB10014 */ lw $s1, 0x14($sp) -/* A4DE2C 8024140C 8FB00010 */ lw $s0, 0x10($sp) -/* A4DE30 80241410 24020002 */ addiu $v0, $zero, 2 -/* A4DE34 80241414 03E00008 */ jr $ra -/* A4DE38 80241418 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4_A4DDE4.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4_A4DDE4.s new file mode 100644 index 0000000000..a8381ec988 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_802413C4_A4DDE4.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413C4_A4DDE4 +/* A4DDE4 802413C4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A4DDE8 802413C8 AFB10014 */ sw $s1, 0x14($sp) +/* A4DDEC 802413CC 0080882D */ daddu $s1, $a0, $zero +/* A4DDF0 802413D0 AFBF0018 */ sw $ra, 0x18($sp) +/* A4DDF4 802413D4 AFB00010 */ sw $s0, 0x10($sp) +/* A4DDF8 802413D8 8E300148 */ lw $s0, 0x148($s1) +/* A4DDFC 802413DC 0C00EABB */ jal get_npc_unsafe +/* A4DE00 802413E0 86040008 */ lh $a0, 8($s0) +/* A4DE04 802413E4 0040182D */ daddu $v1, $v0, $zero +/* A4DE08 802413E8 240200FF */ addiu $v0, $zero, 0xff +/* A4DE0C 802413EC A06200AC */ sb $v0, 0xac($v1) +/* A4DE10 802413F0 8E0200CC */ lw $v0, 0xcc($s0) +/* A4DE14 802413F4 8C440008 */ lw $a0, 8($v0) +/* A4DE18 802413F8 A460008E */ sh $zero, 0x8e($v1) +/* A4DE1C 802413FC AC640028 */ sw $a0, 0x28($v1) +/* A4DE20 80241400 AE200070 */ sw $zero, 0x70($s1) +/* A4DE24 80241404 8FBF0018 */ lw $ra, 0x18($sp) +/* A4DE28 80241408 8FB10014 */ lw $s1, 0x14($sp) +/* A4DE2C 8024140C 8FB00010 */ lw $s0, 0x10($sp) +/* A4DE30 80241410 24020002 */ addiu $v0, $zero, 2 +/* A4DE34 80241414 03E00008 */ jr $ra +/* A4DE38 80241418 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C.s deleted file mode 100644 index 71e1f19219..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024141C -/* A4DE3C 8024141C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4DE40 80241420 3C05FE36 */ lui $a1, 0xfe36 -/* A4DE44 80241424 AFBF0010 */ sw $ra, 0x10($sp) -/* A4DE48 80241428 8C820148 */ lw $v0, 0x148($a0) -/* A4DE4C 8024142C 3C06800B */ lui $a2, 0x800b -/* A4DE50 80241430 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A4DE54 80241434 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4DE58 80241438 00C23026 */ xor $a2, $a2, $v0 -/* A4DE5C 8024143C 0C0B2026 */ jal set_variable -/* A4DE60 80241440 2CC60001 */ sltiu $a2, $a2, 1 -/* A4DE64 80241444 8FBF0010 */ lw $ra, 0x10($sp) -/* A4DE68 80241448 24020002 */ addiu $v0, $zero, 2 -/* A4DE6C 8024144C 03E00008 */ jr $ra -/* A4DE70 80241450 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s new file mode 100644 index 0000000000..04075a251d --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024141C_A4DE3C +/* A4DE3C 8024141C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A4DE40 80241420 3C05FE36 */ lui $a1, 0xfe36 +/* A4DE44 80241424 AFBF0010 */ sw $ra, 0x10($sp) +/* A4DE48 80241428 8C820148 */ lw $v0, 0x148($a0) +/* A4DE4C 8024142C 3C06800B */ lui $a2, 0x800b +/* A4DE50 80241430 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A4DE54 80241434 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A4DE58 80241438 00C23026 */ xor $a2, $a2, $v0 +/* A4DE5C 8024143C 0C0B2026 */ jal set_variable +/* A4DE60 80241440 2CC60001 */ sltiu $a2, $a2, 1 +/* A4DE64 80241444 8FBF0010 */ lw $ra, 0x10($sp) +/* A4DE68 80241448 24020002 */ addiu $v0, $zero, 2 +/* A4DE6C 8024144C 03E00008 */ jr $ra +/* A4DE70 80241450 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s index 7c47dc2e85..aace66edef 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240290_A4F290.s @@ -55,7 +55,7 @@ glabel func_80240290_A4F290 /* A4F358 80240358 080900EC */ j .L802403B0 /* A4F35C 8024035C AE030028 */ sw $v1, 0x28($s0) .L80240360: -/* A4F360 80240360 0C090028 */ jal func_802400A0 +/* A4F360 80240360 0C090028 */ jal func_802400A0_A4F0A0 /* A4F364 80240364 0240202D */ daddu $a0, $s2, $zero /* A4F368 80240368 0040202D */ daddu $a0, $v0, $zero /* A4F36C 8024036C 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s index 8c8a76d085..eaf164d7e9 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802403D4_A4F3D4.s @@ -18,7 +18,7 @@ glabel func_802403D4_A4F3D4 /* A4F408 80240408 00021400 */ sll $v0, $v0, 0x10 /* A4F40C 8024040C 1C40002B */ bgtz $v0, .L802404BC /* A4F410 80240410 00000000 */ nop -/* A4F414 80240414 0C090028 */ jal func_802400A0 +/* A4F414 80240414 0C090028 */ jal func_802400A0_A4F0A0 /* A4F418 80240418 0240202D */ daddu $a0, $s2, $zero /* A4F41C 8024041C 0040202D */ daddu $a0, $v0, $zero /* A4F420 80240420 0481001A */ bgez $a0, .L8024048C diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518.s deleted file mode 100644 index 39b725bb24..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240518 -/* A4F518 80240518 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A4F51C 8024051C AFB3001C */ sw $s3, 0x1c($sp) -/* A4F520 80240520 0080982D */ daddu $s3, $a0, $zero -/* A4F524 80240524 AFBF0020 */ sw $ra, 0x20($sp) -/* A4F528 80240528 AFB20018 */ sw $s2, 0x18($sp) -/* A4F52C 8024052C AFB10014 */ sw $s1, 0x14($sp) -/* A4F530 80240530 AFB00010 */ sw $s0, 0x10($sp) -/* A4F534 80240534 8E720148 */ lw $s2, 0x148($s3) -/* A4F538 80240538 0C00EABB */ jal get_npc_unsafe -/* A4F53C 8024053C 86440008 */ lh $a0, 8($s2) -/* A4F540 80240540 86440008 */ lh $a0, 8($s2) -/* A4F544 80240544 0040882D */ daddu $s1, $v0, $zero -/* A4F548 80240548 0C00FB3A */ jal get_enemy -/* A4F54C 8024054C 24840001 */ addiu $a0, $a0, 1 -/* A4F550 80240550 0040802D */ daddu $s0, $v0, $zero -/* A4F554 80240554 0C00EABB */ jal get_npc_unsafe -/* A4F558 80240558 86040008 */ lh $a0, 8($s0) -/* A4F55C 8024055C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A4F560 80240560 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A4F564 80240564 8C460038 */ lw $a2, 0x38($v0) -/* A4F568 80240568 0C00A720 */ jal atan2 -/* A4F56C 8024056C 8C470040 */ lw $a3, 0x40($v0) -/* A4F570 80240570 E620000C */ swc1 $f0, 0xc($s1) -/* A4F574 80240574 8E02006C */ lw $v0, 0x6c($s0) -/* A4F578 80240578 14400008 */ bnez $v0, .L8024059C -/* A4F57C 8024057C 00000000 */ nop -/* A4F580 80240580 8E4200CC */ lw $v0, 0xcc($s2) -/* A4F584 80240584 8C420000 */ lw $v0, ($v0) -/* A4F588 80240588 AE220028 */ sw $v0, 0x28($s1) -/* A4F58C 8024058C 96420076 */ lhu $v0, 0x76($s2) -/* A4F590 80240590 A622008E */ sh $v0, 0x8e($s1) -/* A4F594 80240594 24020021 */ addiu $v0, $zero, 0x21 -/* A4F598 80240598 AE620070 */ sw $v0, 0x70($s3) -.L8024059C: -/* A4F59C 8024059C 8FBF0020 */ lw $ra, 0x20($sp) -/* A4F5A0 802405A0 8FB3001C */ lw $s3, 0x1c($sp) -/* A4F5A4 802405A4 8FB20018 */ lw $s2, 0x18($sp) -/* A4F5A8 802405A8 8FB10014 */ lw $s1, 0x14($sp) -/* A4F5AC 802405AC 8FB00010 */ lw $s0, 0x10($sp) -/* A4F5B0 802405B0 03E00008 */ jr $ra -/* A4F5B4 802405B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518_A4F518.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518_A4F518.s new file mode 100644 index 0000000000..87e7c48ab6 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240518_A4F518.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240518_A4F518 +/* A4F518 80240518 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A4F51C 8024051C AFB3001C */ sw $s3, 0x1c($sp) +/* A4F520 80240520 0080982D */ daddu $s3, $a0, $zero +/* A4F524 80240524 AFBF0020 */ sw $ra, 0x20($sp) +/* A4F528 80240528 AFB20018 */ sw $s2, 0x18($sp) +/* A4F52C 8024052C AFB10014 */ sw $s1, 0x14($sp) +/* A4F530 80240530 AFB00010 */ sw $s0, 0x10($sp) +/* A4F534 80240534 8E720148 */ lw $s2, 0x148($s3) +/* A4F538 80240538 0C00EABB */ jal get_npc_unsafe +/* A4F53C 8024053C 86440008 */ lh $a0, 8($s2) +/* A4F540 80240540 86440008 */ lh $a0, 8($s2) +/* A4F544 80240544 0040882D */ daddu $s1, $v0, $zero +/* A4F548 80240548 0C00FB3A */ jal get_enemy +/* A4F54C 8024054C 24840001 */ addiu $a0, $a0, 1 +/* A4F550 80240550 0040802D */ daddu $s0, $v0, $zero +/* A4F554 80240554 0C00EABB */ jal get_npc_unsafe +/* A4F558 80240558 86040008 */ lh $a0, 8($s0) +/* A4F55C 8024055C C62C0038 */ lwc1 $f12, 0x38($s1) +/* A4F560 80240560 C62E0040 */ lwc1 $f14, 0x40($s1) +/* A4F564 80240564 8C460038 */ lw $a2, 0x38($v0) +/* A4F568 80240568 0C00A720 */ jal atan2 +/* A4F56C 8024056C 8C470040 */ lw $a3, 0x40($v0) +/* A4F570 80240570 E620000C */ swc1 $f0, 0xc($s1) +/* A4F574 80240574 8E02006C */ lw $v0, 0x6c($s0) +/* A4F578 80240578 14400008 */ bnez $v0, .L8024059C +/* A4F57C 8024057C 00000000 */ nop +/* A4F580 80240580 8E4200CC */ lw $v0, 0xcc($s2) +/* A4F584 80240584 8C420000 */ lw $v0, ($v0) +/* A4F588 80240588 AE220028 */ sw $v0, 0x28($s1) +/* A4F58C 8024058C 96420076 */ lhu $v0, 0x76($s2) +/* A4F590 80240590 A622008E */ sh $v0, 0x8e($s1) +/* A4F594 80240594 24020021 */ addiu $v0, $zero, 0x21 +/* A4F598 80240598 AE620070 */ sw $v0, 0x70($s3) +.L8024059C: +/* A4F59C 8024059C 8FBF0020 */ lw $ra, 0x20($sp) +/* A4F5A0 802405A0 8FB3001C */ lw $s3, 0x1c($sp) +/* A4F5A4 802405A4 8FB20018 */ lw $s2, 0x18($sp) +/* A4F5A8 802405A8 8FB10014 */ lw $s1, 0x14($sp) +/* A4F5AC 802405AC 8FB00010 */ lw $s0, 0x10($sp) +/* A4F5B0 802405B0 03E00008 */ jr $ra +/* A4F5B4 802405B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8.s deleted file mode 100644 index fb7bdeb3dc..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B8 -/* A4F5B8 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4F5BC 802405BC AFB00010 */ sw $s0, 0x10($sp) -/* A4F5C0 802405C0 0080802D */ daddu $s0, $a0, $zero -/* A4F5C4 802405C4 AFBF0014 */ sw $ra, 0x14($sp) -/* A4F5C8 802405C8 8E020148 */ lw $v0, 0x148($s0) -/* A4F5CC 802405CC 0C00EABB */ jal get_npc_unsafe -/* A4F5D0 802405D0 84440008 */ lh $a0, 8($v0) -/* A4F5D4 802405D4 9443008E */ lhu $v1, 0x8e($v0) -/* A4F5D8 802405D8 2463FFFF */ addiu $v1, $v1, -1 -/* A4F5DC 802405DC A443008E */ sh $v1, 0x8e($v0) -/* A4F5E0 802405E0 00031C00 */ sll $v1, $v1, 0x10 -/* A4F5E4 802405E4 58600001 */ blezl $v1, .L802405EC -/* A4F5E8 802405E8 AE000070 */ sw $zero, 0x70($s0) -.L802405EC: -/* A4F5EC 802405EC 8FBF0014 */ lw $ra, 0x14($sp) -/* A4F5F0 802405F0 8FB00010 */ lw $s0, 0x10($sp) -/* A4F5F4 802405F4 03E00008 */ jr $ra -/* A4F5F8 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s new file mode 100644 index 0000000000..8b216e511c --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802405B8_A4F5B8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405B8_A4F5B8 +/* A4F5B8 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A4F5BC 802405BC AFB00010 */ sw $s0, 0x10($sp) +/* A4F5C0 802405C0 0080802D */ daddu $s0, $a0, $zero +/* A4F5C4 802405C4 AFBF0014 */ sw $ra, 0x14($sp) +/* A4F5C8 802405C8 8E020148 */ lw $v0, 0x148($s0) +/* A4F5CC 802405CC 0C00EABB */ jal get_npc_unsafe +/* A4F5D0 802405D0 84440008 */ lh $a0, 8($v0) +/* A4F5D4 802405D4 9443008E */ lhu $v1, 0x8e($v0) +/* A4F5D8 802405D8 2463FFFF */ addiu $v1, $v1, -1 +/* A4F5DC 802405DC A443008E */ sh $v1, 0x8e($v0) +/* A4F5E0 802405E0 00031C00 */ sll $v1, $v1, 0x10 +/* A4F5E4 802405E4 58600001 */ blezl $v1, .L802405EC +/* A4F5E8 802405E8 AE000070 */ sw $zero, 0x70($s0) +.L802405EC: +/* A4F5EC 802405EC 8FBF0014 */ lw $ra, 0x14($sp) +/* A4F5F0 802405F0 8FB00010 */ lw $s0, 0x10($sp) +/* A4F5F4 802405F4 03E00008 */ jr $ra +/* A4F5F8 802405F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94.s deleted file mode 100644 index fce55efe20..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F94 -/* A4FF94 80240F94 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A4FF98 80240F98 AFB3003C */ sw $s3, 0x3c($sp) -/* A4FF9C 80240F9C 0080982D */ daddu $s3, $a0, $zero -/* A4FFA0 80240FA0 AFBF0048 */ sw $ra, 0x48($sp) -/* A4FFA4 80240FA4 AFB50044 */ sw $s5, 0x44($sp) -/* A4FFA8 80240FA8 AFB40040 */ sw $s4, 0x40($sp) -/* A4FFAC 80240FAC AFB20038 */ sw $s2, 0x38($sp) -/* A4FFB0 80240FB0 AFB10034 */ sw $s1, 0x34($sp) -/* A4FFB4 80240FB4 AFB00030 */ sw $s0, 0x30($sp) -/* A4FFB8 80240FB8 8E720148 */ lw $s2, 0x148($s3) -/* A4FFBC 80240FBC 86440008 */ lh $a0, 8($s2) -/* A4FFC0 80240FC0 8E70000C */ lw $s0, 0xc($s3) -/* A4FFC4 80240FC4 0C00EABB */ jal get_npc_unsafe -/* A4FFC8 80240FC8 00A0882D */ daddu $s1, $a1, $zero -/* A4FFCC 80240FCC 0260202D */ daddu $a0, $s3, $zero -/* A4FFD0 80240FD0 8E050000 */ lw $a1, ($s0) -/* A4FFD4 80240FD4 0C0B1EAF */ jal get_variable -/* A4FFD8 80240FD8 0040A02D */ daddu $s4, $v0, $zero -/* A4FFDC 80240FDC AFA00010 */ sw $zero, 0x10($sp) -/* A4FFE0 80240FE0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A4FFE4 80240FE4 8C630030 */ lw $v1, 0x30($v1) -/* A4FFE8 80240FE8 AFA30014 */ sw $v1, 0x14($sp) -/* A4FFEC 80240FEC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A4FFF0 80240FF0 8C63001C */ lw $v1, 0x1c($v1) -/* A4FFF4 80240FF4 AFA30018 */ sw $v1, 0x18($sp) -/* A4FFF8 80240FF8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A4FFFC 80240FFC 8C630024 */ lw $v1, 0x24($v1) -/* A50000 80241000 AFA3001C */ sw $v1, 0x1c($sp) -/* A50004 80241004 8E4300D0 */ lw $v1, 0xd0($s2) -/* A50008 80241008 8C630028 */ lw $v1, 0x28($v1) -/* A5000C 8024100C 27B50010 */ addiu $s5, $sp, 0x10 -/* A50010 80241010 AFA30020 */ sw $v1, 0x20($sp) -/* A50014 80241014 8E4300D0 */ lw $v1, 0xd0($s2) -/* A50018 80241018 3C014220 */ lui $at, 0x4220 -/* A5001C 8024101C 44810000 */ mtc1 $at, $f0 -/* A50020 80241020 8C63002C */ lw $v1, 0x2c($v1) -/* A50024 80241024 0040802D */ daddu $s0, $v0, $zero -/* A50028 80241028 E7A00028 */ swc1 $f0, 0x28($sp) -/* A5002C 8024102C A7A0002C */ sh $zero, 0x2c($sp) -/* A50030 80241030 16200005 */ bnez $s1, .L80241048 -/* A50034 80241034 AFA30024 */ sw $v1, 0x24($sp) -/* A50038 80241038 8E4200B0 */ lw $v0, 0xb0($s2) -/* A5003C 8024103C 30420004 */ andi $v0, $v0, 4 -/* A50040 80241040 1040002F */ beqz $v0, .L80241100 -/* A50044 80241044 00000000 */ nop -.L80241048: -/* A50048 80241048 2404F7FF */ addiu $a0, $zero, -0x801 -/* A5004C 8024104C AE600070 */ sw $zero, 0x70($s3) -/* A50050 80241050 A680008E */ sh $zero, 0x8e($s4) -/* A50054 80241054 8E4200CC */ lw $v0, 0xcc($s2) -/* A50058 80241058 8E830000 */ lw $v1, ($s4) -/* A5005C 8024105C 8C420000 */ lw $v0, ($v0) -/* A50060 80241060 00641824 */ and $v1, $v1, $a0 -/* A50064 80241064 AE830000 */ sw $v1, ($s4) -/* A50068 80241068 AE820028 */ sw $v0, 0x28($s4) -/* A5006C 8024106C 8E4200D0 */ lw $v0, 0xd0($s2) -/* A50070 80241070 8C420034 */ lw $v0, 0x34($v0) -/* A50074 80241074 54400005 */ bnel $v0, $zero, .L8024108C -/* A50078 80241078 2402FDFF */ addiu $v0, $zero, -0x201 -/* A5007C 8024107C 34620200 */ ori $v0, $v1, 0x200 -/* A50080 80241080 2403FFF7 */ addiu $v1, $zero, -9 -/* A50084 80241084 08090425 */ j .L80241094 -/* A50088 80241088 00431024 */ and $v0, $v0, $v1 -.L8024108C: -/* A5008C 8024108C 00621024 */ and $v0, $v1, $v0 -/* A50090 80241090 34420008 */ ori $v0, $v0, 8 -.L80241094: -/* A50094 80241094 AE820000 */ sw $v0, ($s4) -/* A50098 80241098 8E4200B0 */ lw $v0, 0xb0($s2) -/* A5009C 8024109C 30420004 */ andi $v0, $v0, 4 -/* A500A0 802410A0 10400008 */ beqz $v0, .L802410C4 -/* A500A4 802410A4 24020063 */ addiu $v0, $zero, 0x63 -/* A500A8 802410A8 AE620070 */ sw $v0, 0x70($s3) -/* A500AC 802410AC AE600074 */ sw $zero, 0x74($s3) -/* A500B0 802410B0 8E4200B0 */ lw $v0, 0xb0($s2) -/* A500B4 802410B4 2403FFFB */ addiu $v1, $zero, -5 -/* A500B8 802410B8 00431024 */ and $v0, $v0, $v1 -/* A500BC 802410BC 08090437 */ j .L802410DC -/* A500C0 802410C0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802410C4: -/* A500C4 802410C4 8E420000 */ lw $v0, ($s2) -/* A500C8 802410C8 3C034000 */ lui $v1, 0x4000 -/* A500CC 802410CC 00431024 */ and $v0, $v0, $v1 -/* A500D0 802410D0 10400002 */ beqz $v0, .L802410DC -/* A500D4 802410D4 2402000C */ addiu $v0, $zero, 0xc -/* A500D8 802410D8 AE620070 */ sw $v0, 0x70($s3) -.L802410DC: -/* A500DC 802410DC 3C05BFFF */ lui $a1, 0xbfff -/* A500E0 802410E0 34A5FFFF */ ori $a1, $a1, 0xffff -/* A500E4 802410E4 2404FFFB */ addiu $a0, $zero, -5 -/* A500E8 802410E8 8E4200B0 */ lw $v0, 0xb0($s2) -/* A500EC 802410EC 8E430000 */ lw $v1, ($s2) -/* A500F0 802410F0 00441024 */ and $v0, $v0, $a0 -/* A500F4 802410F4 00651824 */ and $v1, $v1, $a1 -/* A500F8 802410F8 AE4200B0 */ sw $v0, 0xb0($s2) -/* A500FC 802410FC AE430000 */ sw $v1, ($s2) -.L80241100: -/* A50100 80241100 8E630070 */ lw $v1, 0x70($s3) -/* A50104 80241104 2C620064 */ sltiu $v0, $v1, 0x64 -/* A50108 80241108 10400060 */ beqz $v0, .L8024128C -/* A5010C 8024110C 00031080 */ sll $v0, $v1, 2 -/* A50110 80241110 3C018024 */ lui $at, 0x8024 -/* A50114 80241114 00220821 */ addu $at, $at, $v0 -/* A50118 80241118 8C2227E8 */ lw $v0, 0x27e8($at) -/* A5011C 8024111C 00400008 */ jr $v0 -/* A50120 80241120 00000000 */ nop -/* A50124 80241124 0260202D */ daddu $a0, $s3, $zero -/* A50128 80241128 0200282D */ daddu $a1, $s0, $zero -/* A5012C 8024112C 0C012568 */ jal func_800495A0 -/* A50130 80241130 02A0302D */ daddu $a2, $s5, $zero -/* A50134 80241134 0260202D */ daddu $a0, $s3, $zero -/* A50138 80241138 0200282D */ daddu $a1, $s0, $zero -/* A5013C 8024113C 0C0125AE */ jal func_800496B8 -/* A50140 80241140 02A0302D */ daddu $a2, $s5, $zero -/* A50144 80241144 080904A3 */ j .L8024128C -/* A50148 80241148 00000000 */ nop -/* A5014C 8024114C 0260202D */ daddu $a0, $s3, $zero -/* A50150 80241150 0200282D */ daddu $a1, $s0, $zero -/* A50154 80241154 0C0126D1 */ jal func_80049B44 -/* A50158 80241158 02A0302D */ daddu $a2, $s5, $zero -/* A5015C 8024115C 0260202D */ daddu $a0, $s3, $zero -/* A50160 80241160 0200282D */ daddu $a1, $s0, $zero -/* A50164 80241164 0C012701 */ jal func_80049C04 -/* A50168 80241168 02A0302D */ daddu $a2, $s5, $zero -/* A5016C 8024116C 080904A3 */ j .L8024128C -/* A50170 80241170 00000000 */ nop -/* A50174 80241174 0260202D */ daddu $a0, $s3, $zero -/* A50178 80241178 0200282D */ daddu $a1, $s0, $zero -/* A5017C 8024117C 0C01278F */ jal func_80049E3C -/* A50180 80241180 02A0302D */ daddu $a2, $s5, $zero -/* A50184 80241184 0260202D */ daddu $a0, $s3, $zero -/* A50188 80241188 0200282D */ daddu $a1, $s0, $zero -/* A5018C 8024118C 0C0127B3 */ jal func_80049ECC -/* A50190 80241190 02A0302D */ daddu $a2, $s5, $zero -/* A50194 80241194 080904A3 */ j .L8024128C -/* A50198 80241198 00000000 */ nop -/* A5019C 8024119C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A501A0 802411A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A501A4 802411A4 C68C0038 */ lwc1 $f12, 0x38($s4) -/* A501A8 802411A8 C68E0040 */ lwc1 $f14, 0x40($s4) -/* A501AC 802411AC 8C460028 */ lw $a2, 0x28($v0) -/* A501B0 802411B0 0C00A7B5 */ jal dist2D -/* A501B4 802411B4 8C470030 */ lw $a3, 0x30($v0) -/* A501B8 802411B8 8E42006C */ lw $v0, 0x6c($s2) -/* A501BC 802411BC 10400008 */ beqz $v0, .L802411E0 -/* A501C0 802411C0 46000086 */ mov.s $f2, $f0 -/* A501C4 802411C4 44820000 */ mtc1 $v0, $f0 -/* A501C8 802411C8 00000000 */ nop -/* A501CC 802411CC 46800020 */ cvt.s.w $f0, $f0 -/* A501D0 802411D0 4602003C */ c.lt.s $f0, $f2 -/* A501D4 802411D4 00000000 */ nop -/* A501D8 802411D8 4500000B */ bc1f .L80241208 -/* A501DC 802411DC 0260202D */ daddu $a0, $s3, $zero -.L802411E0: -/* A501E0 802411E0 0260202D */ daddu $a0, $s3, $zero -/* A501E4 802411E4 8E050024 */ lw $a1, 0x24($s0) -/* A501E8 802411E8 8E060028 */ lw $a2, 0x28($s0) -/* A501EC 802411EC 0C0900A4 */ jal func_80240290 -/* A501F0 802411F0 02A0382D */ daddu $a3, $s5, $zero -/* A501F4 802411F4 8E630070 */ lw $v1, 0x70($s3) -/* A501F8 802411F8 2402000C */ addiu $v0, $zero, 0xc -/* A501FC 802411FC 14620023 */ bne $v1, $v0, .L8024128C -/* A50200 80241200 00000000 */ nop -/* A50204 80241204 0260202D */ daddu $a0, $s3, $zero -.L80241208: -/* A50208 80241208 0200282D */ daddu $a1, $s0, $zero -/* A5020C 8024120C 0C0127DF */ jal func_80049F7C -/* A50210 80241210 02A0302D */ daddu $a2, $s5, $zero -/* A50214 80241214 0260202D */ daddu $a0, $s3, $zero -/* A50218 80241218 0200282D */ daddu $a1, $s0, $zero -/* A5021C 8024121C 0C012849 */ jal func_8004A124 -/* A50220 80241220 02A0302D */ daddu $a2, $s5, $zero -/* A50224 80241224 080904A3 */ j .L8024128C -/* A50228 80241228 00000000 */ nop -/* A5022C 8024122C 0260202D */ daddu $a0, $s3, $zero -/* A50230 80241230 0200282D */ daddu $a1, $s0, $zero -/* A50234 80241234 0C0128FA */ jal func_8004A3E8 -/* A50238 80241238 02A0302D */ daddu $a2, $s5, $zero -/* A5023C 8024123C 080904A3 */ j .L8024128C -/* A50240 80241240 00000000 */ nop -/* A50244 80241244 0C0900F5 */ jal func_802403D4 -/* A50248 80241248 0260202D */ daddu $a0, $s3, $zero -/* A5024C 8024124C 080904A3 */ j .L8024128C -/* A50250 80241250 00000000 */ nop -/* A50254 80241254 0C090135 */ jal func_802404D4 -/* A50258 80241258 0260202D */ daddu $a0, $s3, $zero -/* A5025C 8024125C 080904A3 */ j .L8024128C -/* A50260 80241260 00000000 */ nop -/* A50264 80241264 0C090146 */ jal func_80240518 -/* A50268 80241268 0260202D */ daddu $a0, $s3, $zero -/* A5026C 8024126C 080904A3 */ j .L8024128C -/* A50270 80241270 00000000 */ nop -/* A50274 80241274 0C09016E */ jal func_802405B8 -/* A50278 80241278 0260202D */ daddu $a0, $s3, $zero -/* A5027C 8024127C 080904A3 */ j .L8024128C -/* A50280 80241280 00000000 */ nop -/* A50284 80241284 0C0129CF */ jal func_8004A73C -/* A50288 80241288 0260202D */ daddu $a0, $s3, $zero -.L8024128C: -/* A5028C 8024128C 8FBF0048 */ lw $ra, 0x48($sp) -/* A50290 80241290 8FB50044 */ lw $s5, 0x44($sp) -/* A50294 80241294 8FB40040 */ lw $s4, 0x40($sp) -/* A50298 80241298 8FB3003C */ lw $s3, 0x3c($sp) -/* A5029C 8024129C 8FB20038 */ lw $s2, 0x38($sp) -/* A502A0 802412A0 8FB10034 */ lw $s1, 0x34($sp) -/* A502A4 802412A4 8FB00030 */ lw $s0, 0x30($sp) -/* A502A8 802412A8 0000102D */ daddu $v0, $zero, $zero -/* A502AC 802412AC 03E00008 */ jr $ra -/* A502B0 802412B0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s new file mode 100644 index 0000000000..0c81f6627b --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s @@ -0,0 +1,213 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F94_A4FF94 +/* A4FF94 80240F94 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A4FF98 80240F98 AFB3003C */ sw $s3, 0x3c($sp) +/* A4FF9C 80240F9C 0080982D */ daddu $s3, $a0, $zero +/* A4FFA0 80240FA0 AFBF0048 */ sw $ra, 0x48($sp) +/* A4FFA4 80240FA4 AFB50044 */ sw $s5, 0x44($sp) +/* A4FFA8 80240FA8 AFB40040 */ sw $s4, 0x40($sp) +/* A4FFAC 80240FAC AFB20038 */ sw $s2, 0x38($sp) +/* A4FFB0 80240FB0 AFB10034 */ sw $s1, 0x34($sp) +/* A4FFB4 80240FB4 AFB00030 */ sw $s0, 0x30($sp) +/* A4FFB8 80240FB8 8E720148 */ lw $s2, 0x148($s3) +/* A4FFBC 80240FBC 86440008 */ lh $a0, 8($s2) +/* A4FFC0 80240FC0 8E70000C */ lw $s0, 0xc($s3) +/* A4FFC4 80240FC4 0C00EABB */ jal get_npc_unsafe +/* A4FFC8 80240FC8 00A0882D */ daddu $s1, $a1, $zero +/* A4FFCC 80240FCC 0260202D */ daddu $a0, $s3, $zero +/* A4FFD0 80240FD0 8E050000 */ lw $a1, ($s0) +/* A4FFD4 80240FD4 0C0B1EAF */ jal get_variable +/* A4FFD8 80240FD8 0040A02D */ daddu $s4, $v0, $zero +/* A4FFDC 80240FDC AFA00010 */ sw $zero, 0x10($sp) +/* A4FFE0 80240FE0 8E4300D0 */ lw $v1, 0xd0($s2) +/* A4FFE4 80240FE4 8C630030 */ lw $v1, 0x30($v1) +/* A4FFE8 80240FE8 AFA30014 */ sw $v1, 0x14($sp) +/* A4FFEC 80240FEC 8E4300D0 */ lw $v1, 0xd0($s2) +/* A4FFF0 80240FF0 8C63001C */ lw $v1, 0x1c($v1) +/* A4FFF4 80240FF4 AFA30018 */ sw $v1, 0x18($sp) +/* A4FFF8 80240FF8 8E4300D0 */ lw $v1, 0xd0($s2) +/* A4FFFC 80240FFC 8C630024 */ lw $v1, 0x24($v1) +/* A50000 80241000 AFA3001C */ sw $v1, 0x1c($sp) +/* A50004 80241004 8E4300D0 */ lw $v1, 0xd0($s2) +/* A50008 80241008 8C630028 */ lw $v1, 0x28($v1) +/* A5000C 8024100C 27B50010 */ addiu $s5, $sp, 0x10 +/* A50010 80241010 AFA30020 */ sw $v1, 0x20($sp) +/* A50014 80241014 8E4300D0 */ lw $v1, 0xd0($s2) +/* A50018 80241018 3C014220 */ lui $at, 0x4220 +/* A5001C 8024101C 44810000 */ mtc1 $at, $f0 +/* A50020 80241020 8C63002C */ lw $v1, 0x2c($v1) +/* A50024 80241024 0040802D */ daddu $s0, $v0, $zero +/* A50028 80241028 E7A00028 */ swc1 $f0, 0x28($sp) +/* A5002C 8024102C A7A0002C */ sh $zero, 0x2c($sp) +/* A50030 80241030 16200005 */ bnez $s1, .L80241048 +/* A50034 80241034 AFA30024 */ sw $v1, 0x24($sp) +/* A50038 80241038 8E4200B0 */ lw $v0, 0xb0($s2) +/* A5003C 8024103C 30420004 */ andi $v0, $v0, 4 +/* A50040 80241040 1040002F */ beqz $v0, .L80241100 +/* A50044 80241044 00000000 */ nop +.L80241048: +/* A50048 80241048 2404F7FF */ addiu $a0, $zero, -0x801 +/* A5004C 8024104C AE600070 */ sw $zero, 0x70($s3) +/* A50050 80241050 A680008E */ sh $zero, 0x8e($s4) +/* A50054 80241054 8E4200CC */ lw $v0, 0xcc($s2) +/* A50058 80241058 8E830000 */ lw $v1, ($s4) +/* A5005C 8024105C 8C420000 */ lw $v0, ($v0) +/* A50060 80241060 00641824 */ and $v1, $v1, $a0 +/* A50064 80241064 AE830000 */ sw $v1, ($s4) +/* A50068 80241068 AE820028 */ sw $v0, 0x28($s4) +/* A5006C 8024106C 8E4200D0 */ lw $v0, 0xd0($s2) +/* A50070 80241070 8C420034 */ lw $v0, 0x34($v0) +/* A50074 80241074 54400005 */ bnel $v0, $zero, .L8024108C +/* A50078 80241078 2402FDFF */ addiu $v0, $zero, -0x201 +/* A5007C 8024107C 34620200 */ ori $v0, $v1, 0x200 +/* A50080 80241080 2403FFF7 */ addiu $v1, $zero, -9 +/* A50084 80241084 08090425 */ j .L80241094 +/* A50088 80241088 00431024 */ and $v0, $v0, $v1 +.L8024108C: +/* A5008C 8024108C 00621024 */ and $v0, $v1, $v0 +/* A50090 80241090 34420008 */ ori $v0, $v0, 8 +.L80241094: +/* A50094 80241094 AE820000 */ sw $v0, ($s4) +/* A50098 80241098 8E4200B0 */ lw $v0, 0xb0($s2) +/* A5009C 8024109C 30420004 */ andi $v0, $v0, 4 +/* A500A0 802410A0 10400008 */ beqz $v0, .L802410C4 +/* A500A4 802410A4 24020063 */ addiu $v0, $zero, 0x63 +/* A500A8 802410A8 AE620070 */ sw $v0, 0x70($s3) +/* A500AC 802410AC AE600074 */ sw $zero, 0x74($s3) +/* A500B0 802410B0 8E4200B0 */ lw $v0, 0xb0($s2) +/* A500B4 802410B4 2403FFFB */ addiu $v1, $zero, -5 +/* A500B8 802410B8 00431024 */ and $v0, $v0, $v1 +/* A500BC 802410BC 08090437 */ j .L802410DC +/* A500C0 802410C0 AE4200B0 */ sw $v0, 0xb0($s2) +.L802410C4: +/* A500C4 802410C4 8E420000 */ lw $v0, ($s2) +/* A500C8 802410C8 3C034000 */ lui $v1, 0x4000 +/* A500CC 802410CC 00431024 */ and $v0, $v0, $v1 +/* A500D0 802410D0 10400002 */ beqz $v0, .L802410DC +/* A500D4 802410D4 2402000C */ addiu $v0, $zero, 0xc +/* A500D8 802410D8 AE620070 */ sw $v0, 0x70($s3) +.L802410DC: +/* A500DC 802410DC 3C05BFFF */ lui $a1, 0xbfff +/* A500E0 802410E0 34A5FFFF */ ori $a1, $a1, 0xffff +/* A500E4 802410E4 2404FFFB */ addiu $a0, $zero, -5 +/* A500E8 802410E8 8E4200B0 */ lw $v0, 0xb0($s2) +/* A500EC 802410EC 8E430000 */ lw $v1, ($s2) +/* A500F0 802410F0 00441024 */ and $v0, $v0, $a0 +/* A500F4 802410F4 00651824 */ and $v1, $v1, $a1 +/* A500F8 802410F8 AE4200B0 */ sw $v0, 0xb0($s2) +/* A500FC 802410FC AE430000 */ sw $v1, ($s2) +.L80241100: +/* A50100 80241100 8E630070 */ lw $v1, 0x70($s3) +/* A50104 80241104 2C620064 */ sltiu $v0, $v1, 0x64 +/* A50108 80241108 10400060 */ beqz $v0, .L8024128C +/* A5010C 8024110C 00031080 */ sll $v0, $v1, 2 +/* A50110 80241110 3C018024 */ lui $at, 0x8024 +/* A50114 80241114 00220821 */ addu $at, $at, $v0 +/* A50118 80241118 8C2227E8 */ lw $v0, 0x27e8($at) +/* A5011C 8024111C 00400008 */ jr $v0 +/* A50120 80241120 00000000 */ nop +/* A50124 80241124 0260202D */ daddu $a0, $s3, $zero +/* A50128 80241128 0200282D */ daddu $a1, $s0, $zero +/* A5012C 8024112C 0C012568 */ jal func_800495A0 +/* A50130 80241130 02A0302D */ daddu $a2, $s5, $zero +/* A50134 80241134 0260202D */ daddu $a0, $s3, $zero +/* A50138 80241138 0200282D */ daddu $a1, $s0, $zero +/* A5013C 8024113C 0C0125AE */ jal func_800496B8 +/* A50140 80241140 02A0302D */ daddu $a2, $s5, $zero +/* A50144 80241144 080904A3 */ j .L8024128C +/* A50148 80241148 00000000 */ nop +/* A5014C 8024114C 0260202D */ daddu $a0, $s3, $zero +/* A50150 80241150 0200282D */ daddu $a1, $s0, $zero +/* A50154 80241154 0C0126D1 */ jal func_80049B44 +/* A50158 80241158 02A0302D */ daddu $a2, $s5, $zero +/* A5015C 8024115C 0260202D */ daddu $a0, $s3, $zero +/* A50160 80241160 0200282D */ daddu $a1, $s0, $zero +/* A50164 80241164 0C012701 */ jal func_80049C04 +/* A50168 80241168 02A0302D */ daddu $a2, $s5, $zero +/* A5016C 8024116C 080904A3 */ j .L8024128C +/* A50170 80241170 00000000 */ nop +/* A50174 80241174 0260202D */ daddu $a0, $s3, $zero +/* A50178 80241178 0200282D */ daddu $a1, $s0, $zero +/* A5017C 8024117C 0C01278F */ jal func_80049E3C +/* A50180 80241180 02A0302D */ daddu $a2, $s5, $zero +/* A50184 80241184 0260202D */ daddu $a0, $s3, $zero +/* A50188 80241188 0200282D */ daddu $a1, $s0, $zero +/* A5018C 8024118C 0C0127B3 */ jal func_80049ECC +/* A50190 80241190 02A0302D */ daddu $a2, $s5, $zero +/* A50194 80241194 080904A3 */ j .L8024128C +/* A50198 80241198 00000000 */ nop +/* A5019C 8024119C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A501A0 802411A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A501A4 802411A4 C68C0038 */ lwc1 $f12, 0x38($s4) +/* A501A8 802411A8 C68E0040 */ lwc1 $f14, 0x40($s4) +/* A501AC 802411AC 8C460028 */ lw $a2, 0x28($v0) +/* A501B0 802411B0 0C00A7B5 */ jal dist2D +/* A501B4 802411B4 8C470030 */ lw $a3, 0x30($v0) +/* A501B8 802411B8 8E42006C */ lw $v0, 0x6c($s2) +/* A501BC 802411BC 10400008 */ beqz $v0, .L802411E0 +/* A501C0 802411C0 46000086 */ mov.s $f2, $f0 +/* A501C4 802411C4 44820000 */ mtc1 $v0, $f0 +/* A501C8 802411C8 00000000 */ nop +/* A501CC 802411CC 46800020 */ cvt.s.w $f0, $f0 +/* A501D0 802411D0 4602003C */ c.lt.s $f0, $f2 +/* A501D4 802411D4 00000000 */ nop +/* A501D8 802411D8 4500000B */ bc1f .L80241208 +/* A501DC 802411DC 0260202D */ daddu $a0, $s3, $zero +.L802411E0: +/* A501E0 802411E0 0260202D */ daddu $a0, $s3, $zero +/* A501E4 802411E4 8E050024 */ lw $a1, 0x24($s0) +/* A501E8 802411E8 8E060028 */ lw $a2, 0x28($s0) +/* A501EC 802411EC 0C0900A4 */ jal func_80240290_A4F290 +/* A501F0 802411F0 02A0382D */ daddu $a3, $s5, $zero +/* A501F4 802411F4 8E630070 */ lw $v1, 0x70($s3) +/* A501F8 802411F8 2402000C */ addiu $v0, $zero, 0xc +/* A501FC 802411FC 14620023 */ bne $v1, $v0, .L8024128C +/* A50200 80241200 00000000 */ nop +/* A50204 80241204 0260202D */ daddu $a0, $s3, $zero +.L80241208: +/* A50208 80241208 0200282D */ daddu $a1, $s0, $zero +/* A5020C 8024120C 0C0127DF */ jal func_80049F7C +/* A50210 80241210 02A0302D */ daddu $a2, $s5, $zero +/* A50214 80241214 0260202D */ daddu $a0, $s3, $zero +/* A50218 80241218 0200282D */ daddu $a1, $s0, $zero +/* A5021C 8024121C 0C012849 */ jal func_8004A124 +/* A50220 80241220 02A0302D */ daddu $a2, $s5, $zero +/* A50224 80241224 080904A3 */ j .L8024128C +/* A50228 80241228 00000000 */ nop +/* A5022C 8024122C 0260202D */ daddu $a0, $s3, $zero +/* A50230 80241230 0200282D */ daddu $a1, $s0, $zero +/* A50234 80241234 0C0128FA */ jal func_8004A3E8 +/* A50238 80241238 02A0302D */ daddu $a2, $s5, $zero +/* A5023C 8024123C 080904A3 */ j .L8024128C +/* A50240 80241240 00000000 */ nop +/* A50244 80241244 0C0900F5 */ jal func_802403D4_A4F3D4 +/* A50248 80241248 0260202D */ daddu $a0, $s3, $zero +/* A5024C 8024124C 080904A3 */ j .L8024128C +/* A50250 80241250 00000000 */ nop +/* A50254 80241254 0C090135 */ jal func_802404D4_A4F4D4 +/* A50258 80241258 0260202D */ daddu $a0, $s3, $zero +/* A5025C 8024125C 080904A3 */ j .L8024128C +/* A50260 80241260 00000000 */ nop +/* A50264 80241264 0C090146 */ jal func_80240518_A4F518 +/* A50268 80241268 0260202D */ daddu $a0, $s3, $zero +/* A5026C 8024126C 080904A3 */ j .L8024128C +/* A50270 80241270 00000000 */ nop +/* A50274 80241274 0C09016E */ jal func_802405B8_A4F5B8 +/* A50278 80241278 0260202D */ daddu $a0, $s3, $zero +/* A5027C 8024127C 080904A3 */ j .L8024128C +/* A50280 80241280 00000000 */ nop +/* A50284 80241284 0C0129CF */ jal func_8004A73C +/* A50288 80241288 0260202D */ daddu $a0, $s3, $zero +.L8024128C: +/* A5028C 8024128C 8FBF0048 */ lw $ra, 0x48($sp) +/* A50290 80241290 8FB50044 */ lw $s5, 0x44($sp) +/* A50294 80241294 8FB40040 */ lw $s4, 0x40($sp) +/* A50298 80241298 8FB3003C */ lw $s3, 0x3c($sp) +/* A5029C 8024129C 8FB20038 */ lw $s2, 0x38($sp) +/* A502A0 802412A0 8FB10034 */ lw $s1, 0x34($sp) +/* A502A4 802412A4 8FB00030 */ lw $s0, 0x30($sp) +/* A502A8 802412A8 0000102D */ daddu $v0, $zero, $zero +/* A502AC 802412AC 03E00008 */ jr $ra +/* A502B0 802412B0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4.s deleted file mode 100644 index c09e2a23fb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B4 -/* A502B4 802412B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A502B8 802412B8 3C05FE36 */ lui $a1, 0xfe36 -/* A502BC 802412BC AFBF0010 */ sw $ra, 0x10($sp) -/* A502C0 802412C0 8C820148 */ lw $v0, 0x148($a0) -/* A502C4 802412C4 3C06800B */ lui $a2, 0x800b -/* A502C8 802412C8 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A502CC 802412CC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A502D0 802412D0 00C23026 */ xor $a2, $a2, $v0 -/* A502D4 802412D4 0C0B2026 */ jal set_variable -/* A502D8 802412D8 2CC60001 */ sltiu $a2, $a2, 1 -/* A502DC 802412DC 8FBF0010 */ lw $ra, 0x10($sp) -/* A502E0 802412E0 24020002 */ addiu $v0, $zero, 2 -/* A502E4 802412E4 03E00008 */ jr $ra -/* A502E8 802412E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A502EC 802412EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s new file mode 100644 index 0000000000..c0ac05a300 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412B4_A502B4 +/* A502B4 802412B4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A502B8 802412B8 3C05FE36 */ lui $a1, 0xfe36 +/* A502BC 802412BC AFBF0010 */ sw $ra, 0x10($sp) +/* A502C0 802412C0 8C820148 */ lw $v0, 0x148($a0) +/* A502C4 802412C4 3C06800B */ lui $a2, 0x800b +/* A502C8 802412C8 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A502CC 802412CC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A502D0 802412D0 00C23026 */ xor $a2, $a2, $v0 +/* A502D4 802412D4 0C0B2026 */ jal set_variable +/* A502D8 802412D8 2CC60001 */ sltiu $a2, $a2, 1 +/* A502DC 802412DC 8FBF0010 */ lw $ra, 0x10($sp) +/* A502E0 802412E0 24020002 */ addiu $v0, $zero, 2 +/* A502E4 802412E4 03E00008 */ jr $ra +/* A502E8 802412E8 27BD0018 */ addiu $sp, $sp, 0x18 +/* A502EC 802412EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s index 5c0f1cd894..1874be1ca2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240500_A93C40.s @@ -55,7 +55,7 @@ glabel func_80240500_A93C40 /* A93D08 802405C8 08090188 */ j .L80240620 /* A93D0C 802405CC AE030028 */ sw $v1, 0x28($s0) .L802405D0: -/* A93D10 802405D0 0C0900C4 */ jal func_80240310 +/* A93D10 802405D0 0C0900C4 */ jal func_80240310_A93A50 /* A93D14 802405D4 0240202D */ daddu $a0, $s2, $zero /* A93D18 802405D8 0040202D */ daddu $a0, $v0, $zero /* A93D1C 802405DC 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s index 2d68b39c8b..ce02d972a7 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240644_A93D84.s @@ -18,7 +18,7 @@ glabel func_80240644_A93D84 /* A93DB8 80240678 00021400 */ sll $v0, $v0, 0x10 /* A93DBC 8024067C 1C40002B */ bgtz $v0, .L8024072C /* A93DC0 80240680 00000000 */ nop -/* A93DC4 80240684 0C0900C4 */ jal func_80240310 +/* A93DC4 80240684 0C0900C4 */ jal func_80240310_A93A50 /* A93DC8 80240688 0240202D */ daddu $a0, $s2, $zero /* A93DCC 8024068C 0040202D */ daddu $a0, $v0, $zero /* A93DD0 80240690 0481001A */ bgez $a0, .L802406FC diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744.s deleted file mode 100644 index 46cf4757c3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240744 -/* A93E84 80240744 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A93E88 80240748 AFB10014 */ sw $s1, 0x14($sp) -/* A93E8C 8024074C 0080882D */ daddu $s1, $a0, $zero -/* A93E90 80240750 AFBF0018 */ sw $ra, 0x18($sp) -/* A93E94 80240754 AFB00010 */ sw $s0, 0x10($sp) -/* A93E98 80240758 8E300148 */ lw $s0, 0x148($s1) -/* A93E9C 8024075C 0C00EABB */ jal get_npc_unsafe -/* A93EA0 80240760 86040008 */ lh $a0, 8($s0) -/* A93EA4 80240764 96030076 */ lhu $v1, 0x76($s0) -/* A93EA8 80240768 A443008E */ sh $v1, 0x8e($v0) -/* A93EAC 8024076C 24020021 */ addiu $v0, $zero, 0x21 -/* A93EB0 80240770 AE220070 */ sw $v0, 0x70($s1) -/* A93EB4 80240774 8FBF0018 */ lw $ra, 0x18($sp) -/* A93EB8 80240778 8FB10014 */ lw $s1, 0x14($sp) -/* A93EBC 8024077C 8FB00010 */ lw $s0, 0x10($sp) -/* A93EC0 80240780 03E00008 */ jr $ra -/* A93EC4 80240784 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s new file mode 100644 index 0000000000..30bba8bac4 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240744_A93E84 +/* A93E84 80240744 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A93E88 80240748 AFB10014 */ sw $s1, 0x14($sp) +/* A93E8C 8024074C 0080882D */ daddu $s1, $a0, $zero +/* A93E90 80240750 AFBF0018 */ sw $ra, 0x18($sp) +/* A93E94 80240754 AFB00010 */ sw $s0, 0x10($sp) +/* A93E98 80240758 8E300148 */ lw $s0, 0x148($s1) +/* A93E9C 8024075C 0C00EABB */ jal get_npc_unsafe +/* A93EA0 80240760 86040008 */ lh $a0, 8($s0) +/* A93EA4 80240764 96030076 */ lhu $v1, 0x76($s0) +/* A93EA8 80240768 A443008E */ sh $v1, 0x8e($v0) +/* A93EAC 8024076C 24020021 */ addiu $v0, $zero, 0x21 +/* A93EB0 80240770 AE220070 */ sw $v0, 0x70($s1) +/* A93EB4 80240774 8FBF0018 */ lw $ra, 0x18($sp) +/* A93EB8 80240778 8FB10014 */ lw $s1, 0x14($sp) +/* A93EBC 8024077C 8FB00010 */ lw $s0, 0x10($sp) +/* A93EC0 80240780 03E00008 */ jr $ra +/* A93EC4 80240784 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788.s deleted file mode 100644 index 314c7d3716..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240788 -/* A93EC8 80240788 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A93ECC 8024078C AFB3001C */ sw $s3, 0x1c($sp) -/* A93ED0 80240790 0080982D */ daddu $s3, $a0, $zero -/* A93ED4 80240794 AFBF0020 */ sw $ra, 0x20($sp) -/* A93ED8 80240798 AFB20018 */ sw $s2, 0x18($sp) -/* A93EDC 8024079C AFB10014 */ sw $s1, 0x14($sp) -/* A93EE0 802407A0 AFB00010 */ sw $s0, 0x10($sp) -/* A93EE4 802407A4 8E720148 */ lw $s2, 0x148($s3) -/* A93EE8 802407A8 0C00EABB */ jal get_npc_unsafe -/* A93EEC 802407AC 86440008 */ lh $a0, 8($s2) -/* A93EF0 802407B0 86440008 */ lh $a0, 8($s2) -/* A93EF4 802407B4 0040882D */ daddu $s1, $v0, $zero -/* A93EF8 802407B8 0C00FB3A */ jal get_enemy -/* A93EFC 802407BC 24840001 */ addiu $a0, $a0, 1 -/* A93F00 802407C0 0040802D */ daddu $s0, $v0, $zero -/* A93F04 802407C4 0C00EABB */ jal get_npc_unsafe -/* A93F08 802407C8 86040008 */ lh $a0, 8($s0) -/* A93F0C 802407CC C62C0038 */ lwc1 $f12, 0x38($s1) -/* A93F10 802407D0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A93F14 802407D4 8C460038 */ lw $a2, 0x38($v0) -/* A93F18 802407D8 0C00A720 */ jal atan2 -/* A93F1C 802407DC 8C470040 */ lw $a3, 0x40($v0) -/* A93F20 802407E0 E620000C */ swc1 $f0, 0xc($s1) -/* A93F24 802407E4 8E02006C */ lw $v0, 0x6c($s0) -/* A93F28 802407E8 14400008 */ bnez $v0, .L8024080C -/* A93F2C 802407EC 00000000 */ nop -/* A93F30 802407F0 8E4200CC */ lw $v0, 0xcc($s2) -/* A93F34 802407F4 8C420000 */ lw $v0, ($v0) -/* A93F38 802407F8 AE220028 */ sw $v0, 0x28($s1) -/* A93F3C 802407FC 96420076 */ lhu $v0, 0x76($s2) -/* A93F40 80240800 A622008E */ sh $v0, 0x8e($s1) -/* A93F44 80240804 24020021 */ addiu $v0, $zero, 0x21 -/* A93F48 80240808 AE620070 */ sw $v0, 0x70($s3) -.L8024080C: -/* A93F4C 8024080C 8FBF0020 */ lw $ra, 0x20($sp) -/* A93F50 80240810 8FB3001C */ lw $s3, 0x1c($sp) -/* A93F54 80240814 8FB20018 */ lw $s2, 0x18($sp) -/* A93F58 80240818 8FB10014 */ lw $s1, 0x14($sp) -/* A93F5C 8024081C 8FB00010 */ lw $s0, 0x10($sp) -/* A93F60 80240820 03E00008 */ jr $ra -/* A93F64 80240824 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788_A93EC8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788_A93EC8.s new file mode 100644 index 0000000000..fec0469b63 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240788_A93EC8.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240788_A93EC8 +/* A93EC8 80240788 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A93ECC 8024078C AFB3001C */ sw $s3, 0x1c($sp) +/* A93ED0 80240790 0080982D */ daddu $s3, $a0, $zero +/* A93ED4 80240794 AFBF0020 */ sw $ra, 0x20($sp) +/* A93ED8 80240798 AFB20018 */ sw $s2, 0x18($sp) +/* A93EDC 8024079C AFB10014 */ sw $s1, 0x14($sp) +/* A93EE0 802407A0 AFB00010 */ sw $s0, 0x10($sp) +/* A93EE4 802407A4 8E720148 */ lw $s2, 0x148($s3) +/* A93EE8 802407A8 0C00EABB */ jal get_npc_unsafe +/* A93EEC 802407AC 86440008 */ lh $a0, 8($s2) +/* A93EF0 802407B0 86440008 */ lh $a0, 8($s2) +/* A93EF4 802407B4 0040882D */ daddu $s1, $v0, $zero +/* A93EF8 802407B8 0C00FB3A */ jal get_enemy +/* A93EFC 802407BC 24840001 */ addiu $a0, $a0, 1 +/* A93F00 802407C0 0040802D */ daddu $s0, $v0, $zero +/* A93F04 802407C4 0C00EABB */ jal get_npc_unsafe +/* A93F08 802407C8 86040008 */ lh $a0, 8($s0) +/* A93F0C 802407CC C62C0038 */ lwc1 $f12, 0x38($s1) +/* A93F10 802407D0 C62E0040 */ lwc1 $f14, 0x40($s1) +/* A93F14 802407D4 8C460038 */ lw $a2, 0x38($v0) +/* A93F18 802407D8 0C00A720 */ jal atan2 +/* A93F1C 802407DC 8C470040 */ lw $a3, 0x40($v0) +/* A93F20 802407E0 E620000C */ swc1 $f0, 0xc($s1) +/* A93F24 802407E4 8E02006C */ lw $v0, 0x6c($s0) +/* A93F28 802407E8 14400008 */ bnez $v0, .L8024080C +/* A93F2C 802407EC 00000000 */ nop +/* A93F30 802407F0 8E4200CC */ lw $v0, 0xcc($s2) +/* A93F34 802407F4 8C420000 */ lw $v0, ($v0) +/* A93F38 802407F8 AE220028 */ sw $v0, 0x28($s1) +/* A93F3C 802407FC 96420076 */ lhu $v0, 0x76($s2) +/* A93F40 80240800 A622008E */ sh $v0, 0x8e($s1) +/* A93F44 80240804 24020021 */ addiu $v0, $zero, 0x21 +/* A93F48 80240808 AE620070 */ sw $v0, 0x70($s3) +.L8024080C: +/* A93F4C 8024080C 8FBF0020 */ lw $ra, 0x20($sp) +/* A93F50 80240810 8FB3001C */ lw $s3, 0x1c($sp) +/* A93F54 80240814 8FB20018 */ lw $s2, 0x18($sp) +/* A93F58 80240818 8FB10014 */ lw $s1, 0x14($sp) +/* A93F5C 8024081C 8FB00010 */ lw $s0, 0x10($sp) +/* A93F60 80240820 03E00008 */ jr $ra +/* A93F64 80240824 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828.s deleted file mode 100644 index a0862be96d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240828 -/* A93F68 80240828 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A93F6C 8024082C AFB00010 */ sw $s0, 0x10($sp) -/* A93F70 80240830 0080802D */ daddu $s0, $a0, $zero -/* A93F74 80240834 AFBF0014 */ sw $ra, 0x14($sp) -/* A93F78 80240838 8E020148 */ lw $v0, 0x148($s0) -/* A93F7C 8024083C 0C00EABB */ jal get_npc_unsafe -/* A93F80 80240840 84440008 */ lh $a0, 8($v0) -/* A93F84 80240844 9443008E */ lhu $v1, 0x8e($v0) -/* A93F88 80240848 2463FFFF */ addiu $v1, $v1, -1 -/* A93F8C 8024084C A443008E */ sh $v1, 0x8e($v0) -/* A93F90 80240850 00031C00 */ sll $v1, $v1, 0x10 -/* A93F94 80240854 58600001 */ blezl $v1, .L8024085C -/* A93F98 80240858 AE000070 */ sw $zero, 0x70($s0) -.L8024085C: -/* A93F9C 8024085C 8FBF0014 */ lw $ra, 0x14($sp) -/* A93FA0 80240860 8FB00010 */ lw $s0, 0x10($sp) -/* A93FA4 80240864 03E00008 */ jr $ra -/* A93FA8 80240868 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s new file mode 100644 index 0000000000..232cc64685 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240828_A93F68.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240828_A93F68 +/* A93F68 80240828 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A93F6C 8024082C AFB00010 */ sw $s0, 0x10($sp) +/* A93F70 80240830 0080802D */ daddu $s0, $a0, $zero +/* A93F74 80240834 AFBF0014 */ sw $ra, 0x14($sp) +/* A93F78 80240838 8E020148 */ lw $v0, 0x148($s0) +/* A93F7C 8024083C 0C00EABB */ jal get_npc_unsafe +/* A93F80 80240840 84440008 */ lh $a0, 8($v0) +/* A93F84 80240844 9443008E */ lhu $v1, 0x8e($v0) +/* A93F88 80240848 2463FFFF */ addiu $v1, $v1, -1 +/* A93F8C 8024084C A443008E */ sh $v1, 0x8e($v0) +/* A93F90 80240850 00031C00 */ sll $v1, $v1, 0x10 +/* A93F94 80240854 58600001 */ blezl $v1, .L8024085C +/* A93F98 80240858 AE000070 */ sw $zero, 0x70($s0) +.L8024085C: +/* A93F9C 8024085C 8FBF0014 */ lw $ra, 0x14($sp) +/* A93FA0 80240860 8FB00010 */ lw $s0, 0x10($sp) +/* A93FA4 80240864 03E00008 */ jr $ra +/* A93FA8 80240868 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8.s deleted file mode 100644 index b7e8d41179..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA8 -/* A944E8 80240DA8 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A944EC 80240DAC AFB3003C */ sw $s3, 0x3c($sp) -/* A944F0 80240DB0 0080982D */ daddu $s3, $a0, $zero -/* A944F4 80240DB4 AFB40040 */ sw $s4, 0x40($sp) -/* A944F8 80240DB8 0000A02D */ daddu $s4, $zero, $zero -/* A944FC 80240DBC 3C03800A */ lui $v1, 0x800a -/* A94500 80240DC0 8463A634 */ lh $v1, -0x59cc($v1) -/* A94504 80240DC4 3C04800B */ lui $a0, %hi(gCameras) -/* A94508 80240DC8 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A9450C 80240DCC AFBF0044 */ sw $ra, 0x44($sp) -/* A94510 80240DD0 AFB20038 */ sw $s2, 0x38($sp) -/* A94514 80240DD4 AFB10034 */ sw $s1, 0x34($sp) -/* A94518 80240DD8 AFB00030 */ sw $s0, 0x30($sp) -/* A9451C 80240DDC F7B80058 */ sdc1 $f24, 0x58($sp) -/* A94520 80240DE0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A94524 80240DE4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* A94528 80240DE8 8E710148 */ lw $s1, 0x148($s3) -/* A9452C 80240DEC 00031080 */ sll $v0, $v1, 2 -/* A94530 80240DF0 00431021 */ addu $v0, $v0, $v1 -/* A94534 80240DF4 00021080 */ sll $v0, $v0, 2 -/* A94538 80240DF8 00431023 */ subu $v0, $v0, $v1 -/* A9453C 80240DFC 000218C0 */ sll $v1, $v0, 3 -/* A94540 80240E00 00431021 */ addu $v0, $v0, $v1 -/* A94544 80240E04 000210C0 */ sll $v0, $v0, 3 -/* A94548 80240E08 10A00002 */ beqz $a1, .L80240E14 -/* A9454C 80240E0C 00449021 */ addu $s2, $v0, $a0 -/* A94550 80240E10 AE600070 */ sw $zero, 0x70($s3) -.L80240E14: -/* A94554 80240E14 0C00FB5A */ jal get_enemy_safe -/* A94558 80240E18 86240008 */ lh $a0, 8($s1) -/* A9455C 80240E1C 14400006 */ bnez $v0, .L80240E38 -/* A94560 80240E20 24020005 */ addiu $v0, $zero, 5 -/* A94564 80240E24 0260202D */ daddu $a0, $s3, $zero -/* A94568 80240E28 3C05FE36 */ lui $a1, 0xfe36 -/* A9456C 80240E2C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A94570 80240E30 08090466 */ j .L80241198 -/* A94574 80240E34 0000302D */ daddu $a2, $zero, $zero -.L80240E38: -/* A94578 80240E38 8E23006C */ lw $v1, 0x6c($s1) -/* A9457C 80240E3C 14620005 */ bne $v1, $v0, .L80240E54 -/* A94580 80240E40 0260202D */ daddu $a0, $s3, $zero -/* A94584 80240E44 3C05FE36 */ lui $a1, 0xfe36 -/* A94588 80240E48 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9458C 80240E4C 08090466 */ j .L80241198 -/* A94590 80240E50 0000302D */ daddu $a2, $zero, $zero -.L80240E54: -/* A94594 80240E54 86240008 */ lh $a0, 8($s1) -/* A94598 80240E58 0C00FB5A */ jal get_enemy_safe -/* A9459C 80240E5C 00000000 */ nop -/* A945A0 80240E60 14400005 */ bnez $v0, .L80240E78 -/* A945A4 80240E64 0260202D */ daddu $a0, $s3, $zero -/* A945A8 80240E68 3C05FE36 */ lui $a1, 0xfe36 -/* A945AC 80240E6C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A945B0 80240E70 08090466 */ j .L80241198 -/* A945B4 80240E74 0000302D */ daddu $a2, $zero, $zero -.L80240E78: -/* A945B8 80240E78 86240008 */ lh $a0, 8($s1) -/* A945BC 80240E7C 0C00EABB */ jal get_npc_unsafe -/* A945C0 80240E80 00000000 */ nop -/* A945C4 80240E84 8E630070 */ lw $v1, 0x70($s3) -/* A945C8 80240E88 10600006 */ beqz $v1, .L80240EA4 -/* A945CC 80240E8C 0040802D */ daddu $s0, $v0, $zero -/* A945D0 80240E90 24020001 */ addiu $v0, $zero, 1 -/* A945D4 80240E94 1062003F */ beq $v1, $v0, .L80240F94 -/* A945D8 80240E98 0000102D */ daddu $v0, $zero, $zero -/* A945DC 80240E9C 08090476 */ j .L802411D8 -/* A945E0 80240EA0 00000000 */ nop -.L80240EA4: -/* A945E4 80240EA4 AFA00010 */ sw $zero, 0x10($sp) -/* A945E8 80240EA8 AFA00014 */ sw $zero, 0x14($sp) -/* A945EC 80240EAC 8E050038 */ lw $a1, 0x38($s0) -/* A945F0 80240EB0 8E06003C */ lw $a2, 0x3c($s0) -/* A945F4 80240EB4 8E070040 */ lw $a3, 0x40($s0) -/* A945F8 80240EB8 0C01BECC */ jal fx_walk_normal -/* A945FC 80240EBC 24040002 */ addiu $a0, $zero, 2 -/* A94600 80240EC0 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A94604 80240EC4 0C00A6C9 */ jal clamp_angle -/* A94608 80240EC8 00000000 */ nop -/* A9460C 80240ECC 3C018024 */ lui $at, 0x8024 -/* A94610 80240ED0 D4385B30 */ ldc1 $f24, 0x5b30($at) -/* A94614 80240ED4 46000521 */ cvt.d.s $f20, $f0 -/* A94618 80240ED8 4638A300 */ add.d $f12, $f20, $f24 -/* A9461C 80240EDC 3C018024 */ lui $at, 0x8024 -/* A94620 80240EE0 D4365B38 */ ldc1 $f22, 0x5b38($at) -/* A94624 80240EE4 0C00A6C9 */ jal clamp_angle -/* A94628 80240EE8 46206320 */ cvt.s.d $f12, $f12 -/* A9462C 80240EEC 4636A500 */ add.d $f20, $f20, $f22 -/* A94630 80240EF0 4620A320 */ cvt.s.d $f12, $f20 -/* A94634 80240EF4 0C00A6C9 */ jal clamp_angle -/* A94638 80240EF8 46000506 */ mov.s $f20, $f0 -/* A9463C 80240EFC 4600A521 */ cvt.d.s $f20, $f20 -/* A94640 80240F00 4636A500 */ add.d $f20, $f20, $f22 -/* A94644 80240F04 46000586 */ mov.s $f22, $f0 -/* A94648 80240F08 0C00A6C9 */ jal clamp_angle -/* A9464C 80240F0C 4620A320 */ cvt.s.d $f12, $f20 -/* A94650 80240F10 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A94654 80240F14 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A94658 80240F18 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A9465C 80240F1C C44E0084 */ lwc1 $f14, 0x84($v0) -/* A94660 80240F20 0C00A70A */ jal get_clamped_angle_diff -/* A94664 80240F24 46000506 */ mov.s $f20, $f0 -/* A94668 80240F28 0C00A6C9 */ jal clamp_angle -/* A9466C 80240F2C 46000306 */ mov.s $f12, $f0 -/* A94670 80240F30 46000021 */ cvt.d.s $f0, $f0 -/* A94674 80240F34 4638003C */ c.lt.d $f0, $f24 -/* A94678 80240F38 00000000 */ nop -/* A9467C 80240F3C 45020002 */ bc1fl .L80240F48 -/* A94680 80240F40 E614000C */ swc1 $f20, 0xc($s0) -/* A94684 80240F44 E616000C */ swc1 $f22, 0xc($s0) -.L80240F48: -/* A94688 80240F48 C6000018 */ lwc1 $f0, 0x18($s0) -/* A9468C 80240F4C 3C018024 */ lui $at, 0x8024 -/* A94690 80240F50 D4225B40 */ ldc1 $f2, 0x5b40($at) -/* A94694 80240F54 46000021 */ cvt.d.s $f0, $f0 -/* A94698 80240F58 46220002 */ mul.d $f0, $f0, $f2 -/* A9469C 80240F5C 00000000 */ nop -/* A946A0 80240F60 3C013F66 */ lui $at, 0x3f66 -/* A946A4 80240F64 34216666 */ ori $at, $at, 0x6666 -/* A946A8 80240F68 44812000 */ mtc1 $at, $f4 -/* A946AC 80240F6C 2402001E */ addiu $v0, $zero, 0x1e -/* A946B0 80240F70 A602008E */ sh $v0, 0x8e($s0) -/* A946B4 80240F74 3C014120 */ lui $at, 0x4120 -/* A946B8 80240F78 44811000 */ mtc1 $at, $f2 -/* A946BC 80240F7C 24020001 */ addiu $v0, $zero, 1 -/* A946C0 80240F80 E6040014 */ swc1 $f4, 0x14($s0) -/* A946C4 80240F84 E602001C */ swc1 $f2, 0x1c($s0) -/* A946C8 80240F88 46200020 */ cvt.s.d $f0, $f0 -/* A946CC 80240F8C E6000018 */ swc1 $f0, 0x18($s0) -/* A946D0 80240F90 AE620070 */ sw $v0, 0x70($s3) -.L80240F94: -/* A946D4 80240F94 C6000038 */ lwc1 $f0, 0x38($s0) -/* A946D8 80240F98 C602003C */ lwc1 $f2, 0x3c($s0) -/* A946DC 80240F9C C6040040 */ lwc1 $f4, 0x40($s0) -/* A946E0 80240FA0 C6060018 */ lwc1 $f6, 0x18($s0) -/* A946E4 80240FA4 0000202D */ daddu $a0, $zero, $zero -/* A946E8 80240FA8 E7A00020 */ swc1 $f0, 0x20($sp) -/* A946EC 80240FAC E7A20024 */ swc1 $f2, 0x24($sp) -/* A946F0 80240FB0 E7A40028 */ swc1 $f4, 0x28($sp) -/* A946F4 80240FB4 E7A60010 */ swc1 $f6, 0x10($sp) -/* A946F8 80240FB8 C600000C */ lwc1 $f0, 0xc($s0) -/* A946FC 80240FBC 27A50020 */ addiu $a1, $sp, 0x20 -/* A94700 80240FC0 E7A00014 */ swc1 $f0, 0x14($sp) -/* A94704 80240FC4 860200A6 */ lh $v0, 0xa6($s0) -/* A94708 80240FC8 27A60024 */ addiu $a2, $sp, 0x24 -/* A9470C 80240FCC 44820000 */ mtc1 $v0, $f0 -/* A94710 80240FD0 00000000 */ nop -/* A94714 80240FD4 46800020 */ cvt.s.w $f0, $f0 -/* A94718 80240FD8 E7A00018 */ swc1 $f0, 0x18($sp) -/* A9471C 80240FDC 860200A8 */ lh $v0, 0xa8($s0) -/* A94720 80240FE0 27A70028 */ addiu $a3, $sp, 0x28 -/* A94724 80240FE4 44820000 */ mtc1 $v0, $f0 -/* A94728 80240FE8 00000000 */ nop -/* A9472C 80240FEC 46800020 */ cvt.s.w $f0, $f0 -/* A94730 80240FF0 0C037711 */ jal func_800DDC44 -/* A94734 80240FF4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A94738 80240FF8 54400007 */ bnel $v0, $zero, .L80241018 -/* A9473C 80240FFC 24140001 */ addiu $s4, $zero, 1 -/* A94740 80241000 8E050018 */ lw $a1, 0x18($s0) -/* A94744 80241004 8E06000C */ lw $a2, 0xc($s0) -/* A94748 80241008 0C00EA95 */ jal npc_move_heading -/* A9474C 8024100C 0200202D */ daddu $a0, $s0, $zero -/* A94750 80241010 08090407 */ j .L8024101C -/* A94754 80241014 0000902D */ daddu $s2, $zero, $zero -.L80241018: -/* A94758 80241018 0000902D */ daddu $s2, $zero, $zero -.L8024101C: -/* A9475C 8024101C C600001C */ lwc1 $f0, 0x1c($s0) -/* A94760 80241020 44801000 */ mtc1 $zero, $f2 -/* A94764 80241024 44801800 */ mtc1 $zero, $f3 -/* A94768 80241028 46000021 */ cvt.d.s $f0, $f0 -/* A9476C 8024102C 4622003C */ c.lt.d $f0, $f2 -/* A94770 80241030 00000000 */ nop -/* A94774 80241034 45000028 */ bc1f .L802410D8 -/* A94778 80241038 27A50020 */ addiu $a1, $sp, 0x20 -/* A9477C 8024103C 27A60024 */ addiu $a2, $sp, 0x24 -/* A94780 80241040 27A2002C */ addiu $v0, $sp, 0x2c -/* A94784 80241044 C602003C */ lwc1 $f2, 0x3c($s0) -/* A94788 80241048 C6060038 */ lwc1 $f6, 0x38($s0) -/* A9478C 8024104C 3C01402A */ lui $at, 0x402a -/* A94790 80241050 4481A800 */ mtc1 $at, $f21 -/* A94794 80241054 4480A000 */ mtc1 $zero, $f20 -/* A94798 80241058 460010A1 */ cvt.d.s $f2, $f2 -/* A9479C 8024105C 46341080 */ add.d $f2, $f2, $f20 -/* A947A0 80241060 C600001C */ lwc1 $f0, 0x1c($s0) -/* A947A4 80241064 C6040040 */ lwc1 $f4, 0x40($s0) -/* A947A8 80241068 46000005 */ abs.s $f0, $f0 -/* A947AC 8024106C E7A40028 */ swc1 $f4, 0x28($sp) -/* A947B0 80241070 3C014030 */ lui $at, 0x4030 -/* A947B4 80241074 44812800 */ mtc1 $at, $f5 -/* A947B8 80241078 44802000 */ mtc1 $zero, $f4 -/* A947BC 8024107C 46000021 */ cvt.d.s $f0, $f0 -/* A947C0 80241080 E7A60020 */ swc1 $f6, 0x20($sp) -/* A947C4 80241084 46240000 */ add.d $f0, $f0, $f4 -/* A947C8 80241088 462010A0 */ cvt.s.d $f2, $f2 -/* A947CC 8024108C E7A20024 */ swc1 $f2, 0x24($sp) -/* A947D0 80241090 46200020 */ cvt.s.d $f0, $f0 -/* A947D4 80241094 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A947D8 80241098 AFA20010 */ sw $v0, 0x10($sp) -/* A947DC 8024109C 8E040080 */ lw $a0, 0x80($s0) -/* A947E0 802410A0 0C0372DF */ jal func_800DCB7C -/* A947E4 802410A4 27A70028 */ addiu $a3, $sp, 0x28 -/* A947E8 802410A8 1040000B */ beqz $v0, .L802410D8 -/* A947EC 802410AC 00000000 */ nop -/* A947F0 802410B0 C600001C */ lwc1 $f0, 0x1c($s0) -/* A947F4 802410B4 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A947F8 802410B8 46000005 */ abs.s $f0, $f0 -/* A947FC 802410BC 46000021 */ cvt.d.s $f0, $f0 -/* A94800 802410C0 46340000 */ add.d $f0, $f0, $f20 -/* A94804 802410C4 460010A1 */ cvt.d.s $f2, $f2 -/* A94808 802410C8 4620103E */ c.le.d $f2, $f0 -/* A9480C 802410CC 00000000 */ nop -/* A94810 802410D0 45030001 */ bc1tl .L802410D8 -/* A94814 802410D4 24120001 */ addiu $s2, $zero, 1 -.L802410D8: -/* A94818 802410D8 56400008 */ bnel $s2, $zero, .L802410FC -/* A9481C 802410DC 2414000A */ addiu $s4, $zero, 0xa -/* A94820 802410E0 C604003C */ lwc1 $f4, 0x3c($s0) -/* A94824 802410E4 C600001C */ lwc1 $f0, 0x1c($s0) -/* A94828 802410E8 46002100 */ add.s $f4, $f4, $f0 -/* A9482C 802410EC C6020014 */ lwc1 $f2, 0x14($s0) -/* A94830 802410F0 46020001 */ sub.s $f0, $f0, $f2 -/* A94834 802410F4 E604003C */ swc1 $f4, 0x3c($s0) -/* A94838 802410F8 E600001C */ swc1 $f0, 0x1c($s0) -.L802410FC: -/* A9483C 802410FC 9602008E */ lhu $v0, 0x8e($s0) -/* A94840 80241100 2442FFFF */ addiu $v0, $v0, -1 -/* A94844 80241104 A602008E */ sh $v0, 0x8e($s0) -/* A94848 80241108 00021400 */ sll $v0, $v0, 0x10 -/* A9484C 8024110C 58400001 */ blezl $v0, .L80241114 -/* A94850 80241110 2414000B */ addiu $s4, $zero, 0xb -.L80241114: -/* A94854 80241114 12800024 */ beqz $s4, .L802411A8 -/* A94858 80241118 00000000 */ nop -/* A9485C 8024111C AFA00010 */ sw $zero, 0x10($sp) -/* A94860 80241120 AFA00014 */ sw $zero, 0x14($sp) -/* A94864 80241124 8E050038 */ lw $a1, 0x38($s0) -/* A94868 80241128 8E06003C */ lw $a2, 0x3c($s0) -/* A9486C 8024112C 8E070040 */ lw $a3, 0x40($s0) -/* A94870 80241130 0C01BECC */ jal fx_walk_normal -/* A94874 80241134 24040002 */ addiu $a0, $zero, 2 -/* A94878 80241138 3C01C47A */ lui $at, 0xc47a -/* A9487C 8024113C 44810000 */ mtc1 $at, $f0 -/* A94880 80241140 AE20006C */ sw $zero, 0x6c($s1) -/* A94884 80241144 8E020000 */ lw $v0, ($s0) -/* A94888 80241148 0200202D */ daddu $a0, $s0, $zero -/* A9488C 8024114C AE000038 */ sw $zero, 0x38($s0) -/* A94890 80241150 AE000040 */ sw $zero, 0x40($s0) -/* A94894 80241154 34420002 */ ori $v0, $v0, 2 -/* A94898 80241158 E600003C */ swc1 $f0, 0x3c($s0) -/* A9489C 8024115C 0C00EAFF */ jal disable_npc_shadow -/* A948A0 80241160 AE020000 */ sw $v0, ($s0) -/* A948A4 80241164 0260202D */ daddu $a0, $s3, $zero -/* A948A8 80241168 3C05FE36 */ lui $a1, 0xfe36 -/* A948AC 8024116C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A948B0 80241170 24060001 */ addiu $a2, $zero, 1 -/* A948B4 80241174 8E020000 */ lw $v0, ($s0) -/* A948B8 80241178 2403F7FF */ addiu $v1, $zero, -0x801 -/* A948BC 8024117C 00431024 */ and $v0, $v0, $v1 -/* A948C0 80241180 AE020000 */ sw $v0, ($s0) -/* A948C4 80241184 8E220000 */ lw $v0, ($s1) -/* A948C8 80241188 3C031F00 */ lui $v1, 0x1f00 -/* A948CC 8024118C 00431025 */ or $v0, $v0, $v1 -/* A948D0 80241190 AE220000 */ sw $v0, ($s1) -/* A948D4 80241194 AC800070 */ sw $zero, 0x70($a0) -.L80241198: -/* A948D8 80241198 0C0B2026 */ jal set_variable -/* A948DC 8024119C 00000000 */ nop -/* A948E0 802411A0 08090476 */ j .L802411D8 -/* A948E4 802411A4 24020002 */ addiu $v0, $zero, 2 -.L802411A8: -/* A948E8 802411A8 8E220070 */ lw $v0, 0x70($s1) -/* A948EC 802411AC 30420001 */ andi $v0, $v0, 1 -/* A948F0 802411B0 10400009 */ beqz $v0, .L802411D8 -/* A948F4 802411B4 0000102D */ daddu $v0, $zero, $zero -/* A948F8 802411B8 C600004C */ lwc1 $f0, 0x4c($s0) -/* A948FC 802411BC 3C01404E */ lui $at, 0x404e -/* A94900 802411C0 44811800 */ mtc1 $at, $f3 -/* A94904 802411C4 44801000 */ mtc1 $zero, $f2 -/* A94908 802411C8 46000021 */ cvt.d.s $f0, $f0 -/* A9490C 802411CC 46220000 */ add.d $f0, $f0, $f2 -/* A94910 802411D0 46200020 */ cvt.s.d $f0, $f0 -/* A94914 802411D4 E600004C */ swc1 $f0, 0x4c($s0) -.L802411D8: -/* A94918 802411D8 8FBF0044 */ lw $ra, 0x44($sp) -/* A9491C 802411DC 8FB40040 */ lw $s4, 0x40($sp) -/* A94920 802411E0 8FB3003C */ lw $s3, 0x3c($sp) -/* A94924 802411E4 8FB20038 */ lw $s2, 0x38($sp) -/* A94928 802411E8 8FB10034 */ lw $s1, 0x34($sp) -/* A9492C 802411EC 8FB00030 */ lw $s0, 0x30($sp) -/* A94930 802411F0 D7B80058 */ ldc1 $f24, 0x58($sp) -/* A94934 802411F4 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A94938 802411F8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A9493C 802411FC 03E00008 */ jr $ra -/* A94940 80241200 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s new file mode 100644 index 0000000000..c3c26648e9 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240DA8_A944E8.s @@ -0,0 +1,298 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DA8_A944E8 +/* A944E8 80240DA8 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* A944EC 80240DAC AFB3003C */ sw $s3, 0x3c($sp) +/* A944F0 80240DB0 0080982D */ daddu $s3, $a0, $zero +/* A944F4 80240DB4 AFB40040 */ sw $s4, 0x40($sp) +/* A944F8 80240DB8 0000A02D */ daddu $s4, $zero, $zero +/* A944FC 80240DBC 3C03800A */ lui $v1, 0x800a +/* A94500 80240DC0 8463A634 */ lh $v1, -0x59cc($v1) +/* A94504 80240DC4 3C04800B */ lui $a0, %hi(gCameras) +/* A94508 80240DC8 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A9450C 80240DCC AFBF0044 */ sw $ra, 0x44($sp) +/* A94510 80240DD0 AFB20038 */ sw $s2, 0x38($sp) +/* A94514 80240DD4 AFB10034 */ sw $s1, 0x34($sp) +/* A94518 80240DD8 AFB00030 */ sw $s0, 0x30($sp) +/* A9451C 80240DDC F7B80058 */ sdc1 $f24, 0x58($sp) +/* A94520 80240DE0 F7B60050 */ sdc1 $f22, 0x50($sp) +/* A94524 80240DE4 F7B40048 */ sdc1 $f20, 0x48($sp) +/* A94528 80240DE8 8E710148 */ lw $s1, 0x148($s3) +/* A9452C 80240DEC 00031080 */ sll $v0, $v1, 2 +/* A94530 80240DF0 00431021 */ addu $v0, $v0, $v1 +/* A94534 80240DF4 00021080 */ sll $v0, $v0, 2 +/* A94538 80240DF8 00431023 */ subu $v0, $v0, $v1 +/* A9453C 80240DFC 000218C0 */ sll $v1, $v0, 3 +/* A94540 80240E00 00431021 */ addu $v0, $v0, $v1 +/* A94544 80240E04 000210C0 */ sll $v0, $v0, 3 +/* A94548 80240E08 10A00002 */ beqz $a1, .L80240E14 +/* A9454C 80240E0C 00449021 */ addu $s2, $v0, $a0 +/* A94550 80240E10 AE600070 */ sw $zero, 0x70($s3) +.L80240E14: +/* A94554 80240E14 0C00FB5A */ jal get_enemy_safe +/* A94558 80240E18 86240008 */ lh $a0, 8($s1) +/* A9455C 80240E1C 14400006 */ bnez $v0, .L80240E38 +/* A94560 80240E20 24020005 */ addiu $v0, $zero, 5 +/* A94564 80240E24 0260202D */ daddu $a0, $s3, $zero +/* A94568 80240E28 3C05FE36 */ lui $a1, 0xfe36 +/* A9456C 80240E2C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A94570 80240E30 08090466 */ j .L80241198 +/* A94574 80240E34 0000302D */ daddu $a2, $zero, $zero +.L80240E38: +/* A94578 80240E38 8E23006C */ lw $v1, 0x6c($s1) +/* A9457C 80240E3C 14620005 */ bne $v1, $v0, .L80240E54 +/* A94580 80240E40 0260202D */ daddu $a0, $s3, $zero +/* A94584 80240E44 3C05FE36 */ lui $a1, 0xfe36 +/* A94588 80240E48 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A9458C 80240E4C 08090466 */ j .L80241198 +/* A94590 80240E50 0000302D */ daddu $a2, $zero, $zero +.L80240E54: +/* A94594 80240E54 86240008 */ lh $a0, 8($s1) +/* A94598 80240E58 0C00FB5A */ jal get_enemy_safe +/* A9459C 80240E5C 00000000 */ nop +/* A945A0 80240E60 14400005 */ bnez $v0, .L80240E78 +/* A945A4 80240E64 0260202D */ daddu $a0, $s3, $zero +/* A945A8 80240E68 3C05FE36 */ lui $a1, 0xfe36 +/* A945AC 80240E6C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A945B0 80240E70 08090466 */ j .L80241198 +/* A945B4 80240E74 0000302D */ daddu $a2, $zero, $zero +.L80240E78: +/* A945B8 80240E78 86240008 */ lh $a0, 8($s1) +/* A945BC 80240E7C 0C00EABB */ jal get_npc_unsafe +/* A945C0 80240E80 00000000 */ nop +/* A945C4 80240E84 8E630070 */ lw $v1, 0x70($s3) +/* A945C8 80240E88 10600006 */ beqz $v1, .L80240EA4 +/* A945CC 80240E8C 0040802D */ daddu $s0, $v0, $zero +/* A945D0 80240E90 24020001 */ addiu $v0, $zero, 1 +/* A945D4 80240E94 1062003F */ beq $v1, $v0, .L80240F94 +/* A945D8 80240E98 0000102D */ daddu $v0, $zero, $zero +/* A945DC 80240E9C 08090476 */ j .L802411D8 +/* A945E0 80240EA0 00000000 */ nop +.L80240EA4: +/* A945E4 80240EA4 AFA00010 */ sw $zero, 0x10($sp) +/* A945E8 80240EA8 AFA00014 */ sw $zero, 0x14($sp) +/* A945EC 80240EAC 8E050038 */ lw $a1, 0x38($s0) +/* A945F0 80240EB0 8E06003C */ lw $a2, 0x3c($s0) +/* A945F4 80240EB4 8E070040 */ lw $a3, 0x40($s0) +/* A945F8 80240EB8 0C01BECC */ jal fx_walk_normal +/* A945FC 80240EBC 24040002 */ addiu $a0, $zero, 2 +/* A94600 80240EC0 C64C006C */ lwc1 $f12, 0x6c($s2) +/* A94604 80240EC4 0C00A6C9 */ jal clamp_angle +/* A94608 80240EC8 00000000 */ nop +/* A9460C 80240ECC 3C018024 */ lui $at, 0x8024 +/* A94610 80240ED0 D4385B30 */ ldc1 $f24, 0x5b30($at) +/* A94614 80240ED4 46000521 */ cvt.d.s $f20, $f0 +/* A94618 80240ED8 4638A300 */ add.d $f12, $f20, $f24 +/* A9461C 80240EDC 3C018024 */ lui $at, 0x8024 +/* A94620 80240EE0 D4365B38 */ ldc1 $f22, 0x5b38($at) +/* A94624 80240EE4 0C00A6C9 */ jal clamp_angle +/* A94628 80240EE8 46206320 */ cvt.s.d $f12, $f12 +/* A9462C 80240EEC 4636A500 */ add.d $f20, $f20, $f22 +/* A94630 80240EF0 4620A320 */ cvt.s.d $f12, $f20 +/* A94634 80240EF4 0C00A6C9 */ jal clamp_angle +/* A94638 80240EF8 46000506 */ mov.s $f20, $f0 +/* A9463C 80240EFC 4600A521 */ cvt.d.s $f20, $f20 +/* A94640 80240F00 4636A500 */ add.d $f20, $f20, $f22 +/* A94644 80240F04 46000586 */ mov.s $f22, $f0 +/* A94648 80240F08 0C00A6C9 */ jal clamp_angle +/* A9464C 80240F0C 4620A320 */ cvt.s.d $f12, $f20 +/* A94650 80240F10 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A94654 80240F14 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A94658 80240F18 C64C006C */ lwc1 $f12, 0x6c($s2) +/* A9465C 80240F1C C44E0084 */ lwc1 $f14, 0x84($v0) +/* A94660 80240F20 0C00A70A */ jal get_clamped_angle_diff +/* A94664 80240F24 46000506 */ mov.s $f20, $f0 +/* A94668 80240F28 0C00A6C9 */ jal clamp_angle +/* A9466C 80240F2C 46000306 */ mov.s $f12, $f0 +/* A94670 80240F30 46000021 */ cvt.d.s $f0, $f0 +/* A94674 80240F34 4638003C */ c.lt.d $f0, $f24 +/* A94678 80240F38 00000000 */ nop +/* A9467C 80240F3C 45020002 */ bc1fl .L80240F48 +/* A94680 80240F40 E614000C */ swc1 $f20, 0xc($s0) +/* A94684 80240F44 E616000C */ swc1 $f22, 0xc($s0) +.L80240F48: +/* A94688 80240F48 C6000018 */ lwc1 $f0, 0x18($s0) +/* A9468C 80240F4C 3C018024 */ lui $at, 0x8024 +/* A94690 80240F50 D4225B40 */ ldc1 $f2, 0x5b40($at) +/* A94694 80240F54 46000021 */ cvt.d.s $f0, $f0 +/* A94698 80240F58 46220002 */ mul.d $f0, $f0, $f2 +/* A9469C 80240F5C 00000000 */ nop +/* A946A0 80240F60 3C013F66 */ lui $at, 0x3f66 +/* A946A4 80240F64 34216666 */ ori $at, $at, 0x6666 +/* A946A8 80240F68 44812000 */ mtc1 $at, $f4 +/* A946AC 80240F6C 2402001E */ addiu $v0, $zero, 0x1e +/* A946B0 80240F70 A602008E */ sh $v0, 0x8e($s0) +/* A946B4 80240F74 3C014120 */ lui $at, 0x4120 +/* A946B8 80240F78 44811000 */ mtc1 $at, $f2 +/* A946BC 80240F7C 24020001 */ addiu $v0, $zero, 1 +/* A946C0 80240F80 E6040014 */ swc1 $f4, 0x14($s0) +/* A946C4 80240F84 E602001C */ swc1 $f2, 0x1c($s0) +/* A946C8 80240F88 46200020 */ cvt.s.d $f0, $f0 +/* A946CC 80240F8C E6000018 */ swc1 $f0, 0x18($s0) +/* A946D0 80240F90 AE620070 */ sw $v0, 0x70($s3) +.L80240F94: +/* A946D4 80240F94 C6000038 */ lwc1 $f0, 0x38($s0) +/* A946D8 80240F98 C602003C */ lwc1 $f2, 0x3c($s0) +/* A946DC 80240F9C C6040040 */ lwc1 $f4, 0x40($s0) +/* A946E0 80240FA0 C6060018 */ lwc1 $f6, 0x18($s0) +/* A946E4 80240FA4 0000202D */ daddu $a0, $zero, $zero +/* A946E8 80240FA8 E7A00020 */ swc1 $f0, 0x20($sp) +/* A946EC 80240FAC E7A20024 */ swc1 $f2, 0x24($sp) +/* A946F0 80240FB0 E7A40028 */ swc1 $f4, 0x28($sp) +/* A946F4 80240FB4 E7A60010 */ swc1 $f6, 0x10($sp) +/* A946F8 80240FB8 C600000C */ lwc1 $f0, 0xc($s0) +/* A946FC 80240FBC 27A50020 */ addiu $a1, $sp, 0x20 +/* A94700 80240FC0 E7A00014 */ swc1 $f0, 0x14($sp) +/* A94704 80240FC4 860200A6 */ lh $v0, 0xa6($s0) +/* A94708 80240FC8 27A60024 */ addiu $a2, $sp, 0x24 +/* A9470C 80240FCC 44820000 */ mtc1 $v0, $f0 +/* A94710 80240FD0 00000000 */ nop +/* A94714 80240FD4 46800020 */ cvt.s.w $f0, $f0 +/* A94718 80240FD8 E7A00018 */ swc1 $f0, 0x18($sp) +/* A9471C 80240FDC 860200A8 */ lh $v0, 0xa8($s0) +/* A94720 80240FE0 27A70028 */ addiu $a3, $sp, 0x28 +/* A94724 80240FE4 44820000 */ mtc1 $v0, $f0 +/* A94728 80240FE8 00000000 */ nop +/* A9472C 80240FEC 46800020 */ cvt.s.w $f0, $f0 +/* A94730 80240FF0 0C037711 */ jal func_800DDC44 +/* A94734 80240FF4 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A94738 80240FF8 54400007 */ bnel $v0, $zero, .L80241018 +/* A9473C 80240FFC 24140001 */ addiu $s4, $zero, 1 +/* A94740 80241000 8E050018 */ lw $a1, 0x18($s0) +/* A94744 80241004 8E06000C */ lw $a2, 0xc($s0) +/* A94748 80241008 0C00EA95 */ jal npc_move_heading +/* A9474C 8024100C 0200202D */ daddu $a0, $s0, $zero +/* A94750 80241010 08090407 */ j .L8024101C +/* A94754 80241014 0000902D */ daddu $s2, $zero, $zero +.L80241018: +/* A94758 80241018 0000902D */ daddu $s2, $zero, $zero +.L8024101C: +/* A9475C 8024101C C600001C */ lwc1 $f0, 0x1c($s0) +/* A94760 80241020 44801000 */ mtc1 $zero, $f2 +/* A94764 80241024 44801800 */ mtc1 $zero, $f3 +/* A94768 80241028 46000021 */ cvt.d.s $f0, $f0 +/* A9476C 8024102C 4622003C */ c.lt.d $f0, $f2 +/* A94770 80241030 00000000 */ nop +/* A94774 80241034 45000028 */ bc1f .L802410D8 +/* A94778 80241038 27A50020 */ addiu $a1, $sp, 0x20 +/* A9477C 8024103C 27A60024 */ addiu $a2, $sp, 0x24 +/* A94780 80241040 27A2002C */ addiu $v0, $sp, 0x2c +/* A94784 80241044 C602003C */ lwc1 $f2, 0x3c($s0) +/* A94788 80241048 C6060038 */ lwc1 $f6, 0x38($s0) +/* A9478C 8024104C 3C01402A */ lui $at, 0x402a +/* A94790 80241050 4481A800 */ mtc1 $at, $f21 +/* A94794 80241054 4480A000 */ mtc1 $zero, $f20 +/* A94798 80241058 460010A1 */ cvt.d.s $f2, $f2 +/* A9479C 8024105C 46341080 */ add.d $f2, $f2, $f20 +/* A947A0 80241060 C600001C */ lwc1 $f0, 0x1c($s0) +/* A947A4 80241064 C6040040 */ lwc1 $f4, 0x40($s0) +/* A947A8 80241068 46000005 */ abs.s $f0, $f0 +/* A947AC 8024106C E7A40028 */ swc1 $f4, 0x28($sp) +/* A947B0 80241070 3C014030 */ lui $at, 0x4030 +/* A947B4 80241074 44812800 */ mtc1 $at, $f5 +/* A947B8 80241078 44802000 */ mtc1 $zero, $f4 +/* A947BC 8024107C 46000021 */ cvt.d.s $f0, $f0 +/* A947C0 80241080 E7A60020 */ swc1 $f6, 0x20($sp) +/* A947C4 80241084 46240000 */ add.d $f0, $f0, $f4 +/* A947C8 80241088 462010A0 */ cvt.s.d $f2, $f2 +/* A947CC 8024108C E7A20024 */ swc1 $f2, 0x24($sp) +/* A947D0 80241090 46200020 */ cvt.s.d $f0, $f0 +/* A947D4 80241094 E7A0002C */ swc1 $f0, 0x2c($sp) +/* A947D8 80241098 AFA20010 */ sw $v0, 0x10($sp) +/* A947DC 8024109C 8E040080 */ lw $a0, 0x80($s0) +/* A947E0 802410A0 0C0372DF */ jal func_800DCB7C +/* A947E4 802410A4 27A70028 */ addiu $a3, $sp, 0x28 +/* A947E8 802410A8 1040000B */ beqz $v0, .L802410D8 +/* A947EC 802410AC 00000000 */ nop +/* A947F0 802410B0 C600001C */ lwc1 $f0, 0x1c($s0) +/* A947F4 802410B4 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* A947F8 802410B8 46000005 */ abs.s $f0, $f0 +/* A947FC 802410BC 46000021 */ cvt.d.s $f0, $f0 +/* A94800 802410C0 46340000 */ add.d $f0, $f0, $f20 +/* A94804 802410C4 460010A1 */ cvt.d.s $f2, $f2 +/* A94808 802410C8 4620103E */ c.le.d $f2, $f0 +/* A9480C 802410CC 00000000 */ nop +/* A94810 802410D0 45030001 */ bc1tl .L802410D8 +/* A94814 802410D4 24120001 */ addiu $s2, $zero, 1 +.L802410D8: +/* A94818 802410D8 56400008 */ bnel $s2, $zero, .L802410FC +/* A9481C 802410DC 2414000A */ addiu $s4, $zero, 0xa +/* A94820 802410E0 C604003C */ lwc1 $f4, 0x3c($s0) +/* A94824 802410E4 C600001C */ lwc1 $f0, 0x1c($s0) +/* A94828 802410E8 46002100 */ add.s $f4, $f4, $f0 +/* A9482C 802410EC C6020014 */ lwc1 $f2, 0x14($s0) +/* A94830 802410F0 46020001 */ sub.s $f0, $f0, $f2 +/* A94834 802410F4 E604003C */ swc1 $f4, 0x3c($s0) +/* A94838 802410F8 E600001C */ swc1 $f0, 0x1c($s0) +.L802410FC: +/* A9483C 802410FC 9602008E */ lhu $v0, 0x8e($s0) +/* A94840 80241100 2442FFFF */ addiu $v0, $v0, -1 +/* A94844 80241104 A602008E */ sh $v0, 0x8e($s0) +/* A94848 80241108 00021400 */ sll $v0, $v0, 0x10 +/* A9484C 8024110C 58400001 */ blezl $v0, .L80241114 +/* A94850 80241110 2414000B */ addiu $s4, $zero, 0xb +.L80241114: +/* A94854 80241114 12800024 */ beqz $s4, .L802411A8 +/* A94858 80241118 00000000 */ nop +/* A9485C 8024111C AFA00010 */ sw $zero, 0x10($sp) +/* A94860 80241120 AFA00014 */ sw $zero, 0x14($sp) +/* A94864 80241124 8E050038 */ lw $a1, 0x38($s0) +/* A94868 80241128 8E06003C */ lw $a2, 0x3c($s0) +/* A9486C 8024112C 8E070040 */ lw $a3, 0x40($s0) +/* A94870 80241130 0C01BECC */ jal fx_walk_normal +/* A94874 80241134 24040002 */ addiu $a0, $zero, 2 +/* A94878 80241138 3C01C47A */ lui $at, 0xc47a +/* A9487C 8024113C 44810000 */ mtc1 $at, $f0 +/* A94880 80241140 AE20006C */ sw $zero, 0x6c($s1) +/* A94884 80241144 8E020000 */ lw $v0, ($s0) +/* A94888 80241148 0200202D */ daddu $a0, $s0, $zero +/* A9488C 8024114C AE000038 */ sw $zero, 0x38($s0) +/* A94890 80241150 AE000040 */ sw $zero, 0x40($s0) +/* A94894 80241154 34420002 */ ori $v0, $v0, 2 +/* A94898 80241158 E600003C */ swc1 $f0, 0x3c($s0) +/* A9489C 8024115C 0C00EAFF */ jal disable_npc_shadow +/* A948A0 80241160 AE020000 */ sw $v0, ($s0) +/* A948A4 80241164 0260202D */ daddu $a0, $s3, $zero +/* A948A8 80241168 3C05FE36 */ lui $a1, 0xfe36 +/* A948AC 8024116C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A948B0 80241170 24060001 */ addiu $a2, $zero, 1 +/* A948B4 80241174 8E020000 */ lw $v0, ($s0) +/* A948B8 80241178 2403F7FF */ addiu $v1, $zero, -0x801 +/* A948BC 8024117C 00431024 */ and $v0, $v0, $v1 +/* A948C0 80241180 AE020000 */ sw $v0, ($s0) +/* A948C4 80241184 8E220000 */ lw $v0, ($s1) +/* A948C8 80241188 3C031F00 */ lui $v1, 0x1f00 +/* A948CC 8024118C 00431025 */ or $v0, $v0, $v1 +/* A948D0 80241190 AE220000 */ sw $v0, ($s1) +/* A948D4 80241194 AC800070 */ sw $zero, 0x70($a0) +.L80241198: +/* A948D8 80241198 0C0B2026 */ jal set_variable +/* A948DC 8024119C 00000000 */ nop +/* A948E0 802411A0 08090476 */ j .L802411D8 +/* A948E4 802411A4 24020002 */ addiu $v0, $zero, 2 +.L802411A8: +/* A948E8 802411A8 8E220070 */ lw $v0, 0x70($s1) +/* A948EC 802411AC 30420001 */ andi $v0, $v0, 1 +/* A948F0 802411B0 10400009 */ beqz $v0, .L802411D8 +/* A948F4 802411B4 0000102D */ daddu $v0, $zero, $zero +/* A948F8 802411B8 C600004C */ lwc1 $f0, 0x4c($s0) +/* A948FC 802411BC 3C01404E */ lui $at, 0x404e +/* A94900 802411C0 44811800 */ mtc1 $at, $f3 +/* A94904 802411C4 44801000 */ mtc1 $zero, $f2 +/* A94908 802411C8 46000021 */ cvt.d.s $f0, $f0 +/* A9490C 802411CC 46220000 */ add.d $f0, $f0, $f2 +/* A94910 802411D0 46200020 */ cvt.s.d $f0, $f0 +/* A94914 802411D4 E600004C */ swc1 $f0, 0x4c($s0) +.L802411D8: +/* A94918 802411D8 8FBF0044 */ lw $ra, 0x44($sp) +/* A9491C 802411DC 8FB40040 */ lw $s4, 0x40($sp) +/* A94920 802411E0 8FB3003C */ lw $s3, 0x3c($sp) +/* A94924 802411E4 8FB20038 */ lw $s2, 0x38($sp) +/* A94928 802411E8 8FB10034 */ lw $s1, 0x34($sp) +/* A9492C 802411EC 8FB00030 */ lw $s0, 0x30($sp) +/* A94930 802411F0 D7B80058 */ ldc1 $f24, 0x58($sp) +/* A94934 802411F4 D7B60050 */ ldc1 $f22, 0x50($sp) +/* A94938 802411F8 D7B40048 */ ldc1 $f20, 0x48($sp) +/* A9493C 802411FC 03E00008 */ jr $ra +/* A94940 80241200 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s index 3d96863515..a870b7a8f0 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s @@ -159,7 +159,7 @@ glabel func_80241204_A94944 /* A94B90 80241450 0260202D */ daddu $a0, $s3, $zero /* A94B94 80241454 8E050024 */ lw $a1, 0x24($s0) /* A94B98 80241458 8E060028 */ lw $a2, 0x28($s0) -/* A94B9C 8024145C 0C090140 */ jal func_80240500 +/* A94B9C 8024145C 0C090140 */ jal func_80240500_A93C40 /* A94BA0 80241460 02A0382D */ daddu $a3, $s5, $zero /* A94BA4 80241464 8E630070 */ lw $v1, 0x70($s3) /* A94BA8 80241468 2402000C */ addiu $v0, $zero, 0xc @@ -182,19 +182,19 @@ glabel func_80241204_A94944 /* A94BE8 802414A8 02A0302D */ daddu $a2, $s5, $zero /* A94BEC 802414AC 0809053F */ j .L802414FC /* A94BF0 802414B0 00000000 */ nop -/* A94BF4 802414B4 0C090191 */ jal func_80240644 +/* A94BF4 802414B4 0C090191 */ jal func_80240644_A93D84 /* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero /* A94BFC 802414BC 0809053F */ j .L802414FC /* A94C00 802414C0 00000000 */ nop -/* A94C04 802414C4 0C0901D1 */ jal func_80240744 +/* A94C04 802414C4 0C0901D1 */ jal func_80240744_A93E84 /* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero /* A94C0C 802414CC 0809053F */ j .L802414FC /* A94C10 802414D0 00000000 */ nop -/* A94C14 802414D4 0C0901E2 */ jal func_80240788 +/* A94C14 802414D4 0C0901E2 */ jal func_80240788_A93EC8 /* A94C18 802414D8 0260202D */ daddu $a0, $s3, $zero /* A94C1C 802414DC 0809053F */ j .L802414FC /* A94C20 802414E0 00000000 */ nop -/* A94C24 802414E4 0C09020A */ jal func_80240828 +/* A94C24 802414E4 0C09020A */ jal func_80240828_A93F68 /* A94C28 802414E8 0260202D */ daddu $a0, $s3, $zero /* A94C2C 802414EC 0809053F */ j .L802414FC /* A94C30 802414F0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024155C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024155C.s deleted file mode 100644 index 3a2e916fec..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024155C.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024155C -/* A94C9C 8024155C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A94CA0 80241560 AFB20018 */ sw $s2, 0x18($sp) -/* A94CA4 80241564 0080902D */ daddu $s2, $a0, $zero -/* A94CA8 80241568 AFBF001C */ sw $ra, 0x1c($sp) -/* A94CAC 8024156C AFB10014 */ sw $s1, 0x14($sp) -/* A94CB0 80241570 AFB00010 */ sw $s0, 0x10($sp) -/* A94CB4 80241574 8E510148 */ lw $s1, 0x148($s2) -/* A94CB8 80241578 0C00EABB */ jal get_npc_unsafe -/* A94CBC 8024157C 86240008 */ lh $a0, 8($s1) -/* A94CC0 80241580 0040802D */ daddu $s0, $v0, $zero -/* A94CC4 80241584 8E2300CC */ lw $v1, 0xcc($s1) -/* A94CC8 80241588 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A94CCC 8024158C 8C630020 */ lw $v1, 0x20($v1) -/* A94CD0 80241590 AE030028 */ sw $v1, 0x28($s0) -/* A94CD4 80241594 96220076 */ lhu $v0, 0x76($s1) -/* A94CD8 80241598 A602008E */ sh $v0, 0x8e($s0) -/* A94CDC 8024159C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A94CE0 802415A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A94CE4 802415A4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A94CE8 802415A8 8C460028 */ lw $a2, 0x28($v0) -/* A94CEC 802415AC 0C00A720 */ jal atan2 -/* A94CF0 802415B0 8C470030 */ lw $a3, 0x30($v0) -/* A94CF4 802415B4 2402000D */ addiu $v0, $zero, 0xd -/* A94CF8 802415B8 E600000C */ swc1 $f0, 0xc($s0) -/* A94CFC 802415BC AE420070 */ sw $v0, 0x70($s2) -/* A94D00 802415C0 8FBF001C */ lw $ra, 0x1c($sp) -/* A94D04 802415C4 8FB20018 */ lw $s2, 0x18($sp) -/* A94D08 802415C8 8FB10014 */ lw $s1, 0x14($sp) -/* A94D0C 802415CC 8FB00010 */ lw $s0, 0x10($sp) -/* A94D10 802415D0 03E00008 */ jr $ra -/* A94D14 802415D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024155C_A94C9C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024155C_A94C9C.s new file mode 100644 index 0000000000..2f64c00ff9 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024155C_A94C9C.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024155C_A94C9C +/* A94C9C 8024155C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A94CA0 80241560 AFB20018 */ sw $s2, 0x18($sp) +/* A94CA4 80241564 0080902D */ daddu $s2, $a0, $zero +/* A94CA8 80241568 AFBF001C */ sw $ra, 0x1c($sp) +/* A94CAC 8024156C AFB10014 */ sw $s1, 0x14($sp) +/* A94CB0 80241570 AFB00010 */ sw $s0, 0x10($sp) +/* A94CB4 80241574 8E510148 */ lw $s1, 0x148($s2) +/* A94CB8 80241578 0C00EABB */ jal get_npc_unsafe +/* A94CBC 8024157C 86240008 */ lh $a0, 8($s1) +/* A94CC0 80241580 0040802D */ daddu $s0, $v0, $zero +/* A94CC4 80241584 8E2300CC */ lw $v1, 0xcc($s1) +/* A94CC8 80241588 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A94CCC 8024158C 8C630020 */ lw $v1, 0x20($v1) +/* A94CD0 80241590 AE030028 */ sw $v1, 0x28($s0) +/* A94CD4 80241594 96220076 */ lhu $v0, 0x76($s1) +/* A94CD8 80241598 A602008E */ sh $v0, 0x8e($s0) +/* A94CDC 8024159C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A94CE0 802415A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A94CE4 802415A4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A94CE8 802415A8 8C460028 */ lw $a2, 0x28($v0) +/* A94CEC 802415AC 0C00A720 */ jal atan2 +/* A94CF0 802415B0 8C470030 */ lw $a3, 0x30($v0) +/* A94CF4 802415B4 2402000D */ addiu $v0, $zero, 0xd +/* A94CF8 802415B8 E600000C */ swc1 $f0, 0xc($s0) +/* A94CFC 802415BC AE420070 */ sw $v0, 0x70($s2) +/* A94D00 802415C0 8FBF001C */ lw $ra, 0x1c($sp) +/* A94D04 802415C4 8FB20018 */ lw $s2, 0x18($sp) +/* A94D08 802415C8 8FB10014 */ lw $s1, 0x14($sp) +/* A94D0C 802415CC 8FB00010 */ lw $s0, 0x10($sp) +/* A94D10 802415D0 03E00008 */ jr $ra +/* A94D14 802415D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8.s deleted file mode 100644 index 30c56bf347..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415D8 -/* A94D18 802415D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A94D1C 802415DC AFB3001C */ sw $s3, 0x1c($sp) -/* A94D20 802415E0 0080982D */ daddu $s3, $a0, $zero -/* A94D24 802415E4 AFBF0020 */ sw $ra, 0x20($sp) -/* A94D28 802415E8 AFB20018 */ sw $s2, 0x18($sp) -/* A94D2C 802415EC AFB10014 */ sw $s1, 0x14($sp) -/* A94D30 802415F0 AFB00010 */ sw $s0, 0x10($sp) -/* A94D34 802415F4 8E710148 */ lw $s1, 0x148($s3) -/* A94D38 802415F8 86240008 */ lh $a0, 8($s1) -/* A94D3C 802415FC 0C00EABB */ jal get_npc_unsafe -/* A94D40 80241600 00A0902D */ daddu $s2, $a1, $zero -/* A94D44 80241604 0040802D */ daddu $s0, $v0, $zero -/* A94D48 80241608 8602008E */ lh $v0, 0x8e($s0) -/* A94D4C 8024160C 9603008E */ lhu $v1, 0x8e($s0) -/* A94D50 80241610 18400005 */ blez $v0, .L80241628 -/* A94D54 80241614 2462FFFF */ addiu $v0, $v1, -1 -/* A94D58 80241618 A602008E */ sh $v0, 0x8e($s0) -/* A94D5C 8024161C 00021400 */ sll $v0, $v0, 0x10 -/* A94D60 80241620 1C400033 */ bgtz $v0, .L802416F0 -/* A94D64 80241624 00000000 */ nop -.L80241628: -/* A94D68 80241628 8602008C */ lh $v0, 0x8c($s0) -/* A94D6C 8024162C 14400030 */ bnez $v0, .L802416F0 -/* A94D70 80241630 00000000 */ nop -/* A94D74 80241634 8E2200CC */ lw $v0, 0xcc($s1) -/* A94D78 80241638 8C420024 */ lw $v0, 0x24($v0) -/* A94D7C 8024163C AE020028 */ sw $v0, 0x28($s0) -/* A94D80 80241640 C6400018 */ lwc1 $f0, 0x18($s2) -/* A94D84 80241644 E6000018 */ swc1 $f0, 0x18($s0) -/* A94D88 80241648 8E230088 */ lw $v1, 0x88($s1) -/* A94D8C 8024164C 24020005 */ addiu $v0, $zero, 5 -/* A94D90 80241650 10620005 */ beq $v1, $v0, .L80241668 -/* A94D94 80241654 00000000 */ nop -/* A94D98 80241658 10600003 */ beqz $v1, .L80241668 -/* A94D9C 8024165C 24020001 */ addiu $v0, $zero, 1 -/* A94DA0 80241660 14620006 */ bne $v1, $v0, .L8024167C -/* A94DA4 80241664 00000000 */ nop -.L80241668: -/* A94DA8 80241668 8E220084 */ lw $v0, 0x84($s1) -/* A94DAC 8024166C 00021FC2 */ srl $v1, $v0, 0x1f -/* A94DB0 80241670 00431021 */ addu $v0, $v0, $v1 -/* A94DB4 80241674 00021043 */ sra $v0, $v0, 1 -/* A94DB8 80241678 A60200A8 */ sh $v0, 0xa8($s0) -.L8024167C: -/* A94DBC 8024167C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A94DC0 80241680 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A94DC4 80241684 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A94DC8 80241688 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A94DCC 8024168C 8C460028 */ lw $a2, 0x28($v0) -/* A94DD0 80241690 0C00A7B5 */ jal dist2D -/* A94DD4 80241694 8C470030 */ lw $a3, 0x30($v0) -/* A94DD8 80241698 C6020018 */ lwc1 $f2, 0x18($s0) -/* A94DDC 8024169C 46020003 */ div.s $f0, $f0, $f2 -/* A94DE0 802416A0 3C018024 */ lui $at, 0x8024 -/* A94DE4 802416A4 D4225CD8 */ ldc1 $f2, 0x5cd8($at) -/* A94DE8 802416A8 46000021 */ cvt.d.s $f0, $f0 -/* A94DEC 802416AC 46220000 */ add.d $f0, $f0, $f2 -/* A94DF0 802416B0 4620010D */ trunc.w.d $f4, $f0 -/* A94DF4 802416B4 44022000 */ mfc1 $v0, $f4 -/* A94DF8 802416B8 00000000 */ nop -/* A94DFC 802416BC A602008E */ sh $v0, 0x8e($s0) -/* A94E00 802416C0 00021400 */ sll $v0, $v0, 0x10 -/* A94E04 802416C4 8E230078 */ lw $v1, 0x78($s1) -/* A94E08 802416C8 00021403 */ sra $v0, $v0, 0x10 -/* A94E0C 802416CC 0043102A */ slt $v0, $v0, $v1 -/* A94E10 802416D0 10400003 */ beqz $v0, .L802416E0 -/* A94E14 802416D4 00000000 */ nop -/* A94E18 802416D8 9622007A */ lhu $v0, 0x7a($s1) -/* A94E1C 802416DC A602008E */ sh $v0, 0x8e($s0) -.L802416E0: -/* A94E20 802416E0 8602008E */ lh $v0, 0x8e($s0) -/* A94E24 802416E4 AE22007C */ sw $v0, 0x7c($s1) -/* A94E28 802416E8 2402000E */ addiu $v0, $zero, 0xe -/* A94E2C 802416EC AE620070 */ sw $v0, 0x70($s3) -.L802416F0: -/* A94E30 802416F0 8FBF0020 */ lw $ra, 0x20($sp) -/* A94E34 802416F4 8FB3001C */ lw $s3, 0x1c($sp) -/* A94E38 802416F8 8FB20018 */ lw $s2, 0x18($sp) -/* A94E3C 802416FC 8FB10014 */ lw $s1, 0x14($sp) -/* A94E40 80241700 8FB00010 */ lw $s0, 0x10($sp) -/* A94E44 80241704 03E00008 */ jr $ra -/* A94E48 80241708 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s new file mode 100644 index 0000000000..59c787a210 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802415D8_A94D18.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415D8_A94D18 +/* A94D18 802415D8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A94D1C 802415DC AFB3001C */ sw $s3, 0x1c($sp) +/* A94D20 802415E0 0080982D */ daddu $s3, $a0, $zero +/* A94D24 802415E4 AFBF0020 */ sw $ra, 0x20($sp) +/* A94D28 802415E8 AFB20018 */ sw $s2, 0x18($sp) +/* A94D2C 802415EC AFB10014 */ sw $s1, 0x14($sp) +/* A94D30 802415F0 AFB00010 */ sw $s0, 0x10($sp) +/* A94D34 802415F4 8E710148 */ lw $s1, 0x148($s3) +/* A94D38 802415F8 86240008 */ lh $a0, 8($s1) +/* A94D3C 802415FC 0C00EABB */ jal get_npc_unsafe +/* A94D40 80241600 00A0902D */ daddu $s2, $a1, $zero +/* A94D44 80241604 0040802D */ daddu $s0, $v0, $zero +/* A94D48 80241608 8602008E */ lh $v0, 0x8e($s0) +/* A94D4C 8024160C 9603008E */ lhu $v1, 0x8e($s0) +/* A94D50 80241610 18400005 */ blez $v0, .L80241628 +/* A94D54 80241614 2462FFFF */ addiu $v0, $v1, -1 +/* A94D58 80241618 A602008E */ sh $v0, 0x8e($s0) +/* A94D5C 8024161C 00021400 */ sll $v0, $v0, 0x10 +/* A94D60 80241620 1C400033 */ bgtz $v0, .L802416F0 +/* A94D64 80241624 00000000 */ nop +.L80241628: +/* A94D68 80241628 8602008C */ lh $v0, 0x8c($s0) +/* A94D6C 8024162C 14400030 */ bnez $v0, .L802416F0 +/* A94D70 80241630 00000000 */ nop +/* A94D74 80241634 8E2200CC */ lw $v0, 0xcc($s1) +/* A94D78 80241638 8C420024 */ lw $v0, 0x24($v0) +/* A94D7C 8024163C AE020028 */ sw $v0, 0x28($s0) +/* A94D80 80241640 C6400018 */ lwc1 $f0, 0x18($s2) +/* A94D84 80241644 E6000018 */ swc1 $f0, 0x18($s0) +/* A94D88 80241648 8E230088 */ lw $v1, 0x88($s1) +/* A94D8C 8024164C 24020005 */ addiu $v0, $zero, 5 +/* A94D90 80241650 10620005 */ beq $v1, $v0, .L80241668 +/* A94D94 80241654 00000000 */ nop +/* A94D98 80241658 10600003 */ beqz $v1, .L80241668 +/* A94D9C 8024165C 24020001 */ addiu $v0, $zero, 1 +/* A94DA0 80241660 14620006 */ bne $v1, $v0, .L8024167C +/* A94DA4 80241664 00000000 */ nop +.L80241668: +/* A94DA8 80241668 8E220084 */ lw $v0, 0x84($s1) +/* A94DAC 8024166C 00021FC2 */ srl $v1, $v0, 0x1f +/* A94DB0 80241670 00431021 */ addu $v0, $v0, $v1 +/* A94DB4 80241674 00021043 */ sra $v0, $v0, 1 +/* A94DB8 80241678 A60200A8 */ sh $v0, 0xa8($s0) +.L8024167C: +/* A94DBC 8024167C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A94DC0 80241680 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A94DC4 80241684 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A94DC8 80241688 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A94DCC 8024168C 8C460028 */ lw $a2, 0x28($v0) +/* A94DD0 80241690 0C00A7B5 */ jal dist2D +/* A94DD4 80241694 8C470030 */ lw $a3, 0x30($v0) +/* A94DD8 80241698 C6020018 */ lwc1 $f2, 0x18($s0) +/* A94DDC 8024169C 46020003 */ div.s $f0, $f0, $f2 +/* A94DE0 802416A0 3C018024 */ lui $at, 0x8024 +/* A94DE4 802416A4 D4225CD8 */ ldc1 $f2, 0x5cd8($at) +/* A94DE8 802416A8 46000021 */ cvt.d.s $f0, $f0 +/* A94DEC 802416AC 46220000 */ add.d $f0, $f0, $f2 +/* A94DF0 802416B0 4620010D */ trunc.w.d $f4, $f0 +/* A94DF4 802416B4 44022000 */ mfc1 $v0, $f4 +/* A94DF8 802416B8 00000000 */ nop +/* A94DFC 802416BC A602008E */ sh $v0, 0x8e($s0) +/* A94E00 802416C0 00021400 */ sll $v0, $v0, 0x10 +/* A94E04 802416C4 8E230078 */ lw $v1, 0x78($s1) +/* A94E08 802416C8 00021403 */ sra $v0, $v0, 0x10 +/* A94E0C 802416CC 0043102A */ slt $v0, $v0, $v1 +/* A94E10 802416D0 10400003 */ beqz $v0, .L802416E0 +/* A94E14 802416D4 00000000 */ nop +/* A94E18 802416D8 9622007A */ lhu $v0, 0x7a($s1) +/* A94E1C 802416DC A602008E */ sh $v0, 0x8e($s0) +.L802416E0: +/* A94E20 802416E0 8602008E */ lh $v0, 0x8e($s0) +/* A94E24 802416E4 AE22007C */ sw $v0, 0x7c($s1) +/* A94E28 802416E8 2402000E */ addiu $v0, $zero, 0xe +/* A94E2C 802416EC AE620070 */ sw $v0, 0x70($s3) +.L802416F0: +/* A94E30 802416F0 8FBF0020 */ lw $ra, 0x20($sp) +/* A94E34 802416F4 8FB3001C */ lw $s3, 0x1c($sp) +/* A94E38 802416F8 8FB20018 */ lw $s2, 0x18($sp) +/* A94E3C 802416FC 8FB10014 */ lw $s1, 0x14($sp) +/* A94E40 80241700 8FB00010 */ lw $s0, 0x10($sp) +/* A94E44 80241704 03E00008 */ jr $ra +/* A94E48 80241708 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024170C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024170C.s deleted file mode 100644 index 7b0406283e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024170C.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024170C -/* A94E4C 8024170C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A94E50 80241710 AFB3003C */ sw $s3, 0x3c($sp) -/* A94E54 80241714 0080982D */ daddu $s3, $a0, $zero -/* A94E58 80241718 AFBF0040 */ sw $ra, 0x40($sp) -/* A94E5C 8024171C AFB20038 */ sw $s2, 0x38($sp) -/* A94E60 80241720 AFB10034 */ sw $s1, 0x34($sp) -/* A94E64 80241724 AFB00030 */ sw $s0, 0x30($sp) -/* A94E68 80241728 8E710148 */ lw $s1, 0x148($s3) -/* A94E6C 8024172C 0C00EABB */ jal get_npc_unsafe -/* A94E70 80241730 86240008 */ lh $a0, 8($s1) -/* A94E74 80241734 0040802D */ daddu $s0, $v0, $zero -/* A94E78 80241738 8E22007C */ lw $v0, 0x7c($s1) -/* A94E7C 8024173C 8603008E */ lh $v1, 0x8e($s0) -/* A94E80 80241740 2442FFFF */ addiu $v0, $v0, -1 -/* A94E84 80241744 14620012 */ bne $v1, $v0, .L80241790 -/* A94E88 80241748 00000000 */ nop -/* A94E8C 8024174C C6000038 */ lwc1 $f0, 0x38($s0) -/* A94E90 80241750 4600020D */ trunc.w.s $f8, $f0 -/* A94E94 80241754 44024000 */ mfc1 $v0, $f8 -/* A94E98 80241758 00000000 */ nop -/* A94E9C 8024175C A6220010 */ sh $v0, 0x10($s1) -/* A94EA0 80241760 C600003C */ lwc1 $f0, 0x3c($s0) -/* A94EA4 80241764 4600020D */ trunc.w.s $f8, $f0 -/* A94EA8 80241768 44024000 */ mfc1 $v0, $f8 -/* A94EAC 8024176C 00000000 */ nop -/* A94EB0 80241770 A6220012 */ sh $v0, 0x12($s1) -/* A94EB4 80241774 C6000040 */ lwc1 $f0, 0x40($s0) -/* A94EB8 80241778 24020001 */ addiu $v0, $zero, 1 -/* A94EBC 8024177C A2220007 */ sb $v0, 7($s1) -/* A94EC0 80241780 4600020D */ trunc.w.s $f8, $f0 -/* A94EC4 80241784 44024000 */ mfc1 $v0, $f8 -/* A94EC8 80241788 00000000 */ nop -/* A94ECC 8024178C A6220014 */ sh $v0, 0x14($s1) -.L80241790: -/* A94ED0 80241790 C6000038 */ lwc1 $f0, 0x38($s0) -/* A94ED4 80241794 C602003C */ lwc1 $f2, 0x3c($s0) -/* A94ED8 80241798 C6040040 */ lwc1 $f4, 0x40($s0) -/* A94EDC 8024179C C6060018 */ lwc1 $f6, 0x18($s0) -/* A94EE0 802417A0 E7A00020 */ swc1 $f0, 0x20($sp) -/* A94EE4 802417A4 E7A20024 */ swc1 $f2, 0x24($sp) -/* A94EE8 802417A8 E7A40028 */ swc1 $f4, 0x28($sp) -/* A94EEC 802417AC E7A60010 */ swc1 $f6, 0x10($sp) -/* A94EF0 802417B0 C600000C */ lwc1 $f0, 0xc($s0) -/* A94EF4 802417B4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A94EF8 802417B8 860200A8 */ lh $v0, 0xa8($s0) -/* A94EFC 802417BC 27A50020 */ addiu $a1, $sp, 0x20 -/* A94F00 802417C0 44820000 */ mtc1 $v0, $f0 -/* A94F04 802417C4 00000000 */ nop -/* A94F08 802417C8 46800020 */ cvt.s.w $f0, $f0 -/* A94F0C 802417CC E7A00018 */ swc1 $f0, 0x18($sp) -/* A94F10 802417D0 860200A6 */ lh $v0, 0xa6($s0) -/* A94F14 802417D4 27A60024 */ addiu $a2, $sp, 0x24 -/* A94F18 802417D8 44820000 */ mtc1 $v0, $f0 -/* A94F1C 802417DC 00000000 */ nop -/* A94F20 802417E0 46800020 */ cvt.s.w $f0, $f0 -/* A94F24 802417E4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A94F28 802417E8 8E040080 */ lw $a0, 0x80($s0) -/* A94F2C 802417EC 0C037711 */ jal func_800DDC44 -/* A94F30 802417F0 27A70028 */ addiu $a3, $sp, 0x28 -/* A94F34 802417F4 0040902D */ daddu $s2, $v0, $zero -/* A94F38 802417F8 16400005 */ bnez $s2, .L80241810 -/* A94F3C 802417FC 00000000 */ nop -/* A94F40 80241800 8E050018 */ lw $a1, 0x18($s0) -/* A94F44 80241804 8E06000C */ lw $a2, 0xc($s0) -/* A94F48 80241808 0C00EA95 */ jal npc_move_heading -/* A94F4C 8024180C 0200202D */ daddu $a0, $s0, $zero -.L80241810: -/* A94F50 80241810 8602008E */ lh $v0, 0x8e($s0) -/* A94F54 80241814 9603008E */ lhu $v1, 0x8e($s0) -/* A94F58 80241818 18400007 */ blez $v0, .L80241838 -/* A94F5C 8024181C 2462FFFF */ addiu $v0, $v1, -1 -/* A94F60 80241820 A602008E */ sh $v0, 0x8e($s0) -/* A94F64 80241824 00021400 */ sll $v0, $v0, 0x10 -/* A94F68 80241828 18400003 */ blez $v0, .L80241838 -/* A94F6C 8024182C 00000000 */ nop -/* A94F70 80241830 12400008 */ beqz $s2, .L80241854 -/* A94F74 80241834 00000000 */ nop -.L80241838: -/* A94F78 80241838 8E2200CC */ lw $v0, 0xcc($s1) -/* A94F7C 8024183C A2200007 */ sb $zero, 7($s1) -/* A94F80 80241840 8C420028 */ lw $v0, 0x28($v0) -/* A94F84 80241844 A600008E */ sh $zero, 0x8e($s0) -/* A94F88 80241848 AE020028 */ sw $v0, 0x28($s0) -/* A94F8C 8024184C 2402000F */ addiu $v0, $zero, 0xf -/* A94F90 80241850 AE620070 */ sw $v0, 0x70($s3) -.L80241854: -/* A94F94 80241854 8FBF0040 */ lw $ra, 0x40($sp) -/* A94F98 80241858 8FB3003C */ lw $s3, 0x3c($sp) -/* A94F9C 8024185C 8FB20038 */ lw $s2, 0x38($sp) -/* A94FA0 80241860 8FB10034 */ lw $s1, 0x34($sp) -/* A94FA4 80241864 8FB00030 */ lw $s0, 0x30($sp) -/* A94FA8 80241868 03E00008 */ jr $ra -/* A94FAC 8024186C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024170C_A94E4C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024170C_A94E4C.s new file mode 100644 index 0000000000..4500594c84 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024170C_A94E4C.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024170C_A94E4C +/* A94E4C 8024170C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A94E50 80241710 AFB3003C */ sw $s3, 0x3c($sp) +/* A94E54 80241714 0080982D */ daddu $s3, $a0, $zero +/* A94E58 80241718 AFBF0040 */ sw $ra, 0x40($sp) +/* A94E5C 8024171C AFB20038 */ sw $s2, 0x38($sp) +/* A94E60 80241720 AFB10034 */ sw $s1, 0x34($sp) +/* A94E64 80241724 AFB00030 */ sw $s0, 0x30($sp) +/* A94E68 80241728 8E710148 */ lw $s1, 0x148($s3) +/* A94E6C 8024172C 0C00EABB */ jal get_npc_unsafe +/* A94E70 80241730 86240008 */ lh $a0, 8($s1) +/* A94E74 80241734 0040802D */ daddu $s0, $v0, $zero +/* A94E78 80241738 8E22007C */ lw $v0, 0x7c($s1) +/* A94E7C 8024173C 8603008E */ lh $v1, 0x8e($s0) +/* A94E80 80241740 2442FFFF */ addiu $v0, $v0, -1 +/* A94E84 80241744 14620012 */ bne $v1, $v0, .L80241790 +/* A94E88 80241748 00000000 */ nop +/* A94E8C 8024174C C6000038 */ lwc1 $f0, 0x38($s0) +/* A94E90 80241750 4600020D */ trunc.w.s $f8, $f0 +/* A94E94 80241754 44024000 */ mfc1 $v0, $f8 +/* A94E98 80241758 00000000 */ nop +/* A94E9C 8024175C A6220010 */ sh $v0, 0x10($s1) +/* A94EA0 80241760 C600003C */ lwc1 $f0, 0x3c($s0) +/* A94EA4 80241764 4600020D */ trunc.w.s $f8, $f0 +/* A94EA8 80241768 44024000 */ mfc1 $v0, $f8 +/* A94EAC 8024176C 00000000 */ nop +/* A94EB0 80241770 A6220012 */ sh $v0, 0x12($s1) +/* A94EB4 80241774 C6000040 */ lwc1 $f0, 0x40($s0) +/* A94EB8 80241778 24020001 */ addiu $v0, $zero, 1 +/* A94EBC 8024177C A2220007 */ sb $v0, 7($s1) +/* A94EC0 80241780 4600020D */ trunc.w.s $f8, $f0 +/* A94EC4 80241784 44024000 */ mfc1 $v0, $f8 +/* A94EC8 80241788 00000000 */ nop +/* A94ECC 8024178C A6220014 */ sh $v0, 0x14($s1) +.L80241790: +/* A94ED0 80241790 C6000038 */ lwc1 $f0, 0x38($s0) +/* A94ED4 80241794 C602003C */ lwc1 $f2, 0x3c($s0) +/* A94ED8 80241798 C6040040 */ lwc1 $f4, 0x40($s0) +/* A94EDC 8024179C C6060018 */ lwc1 $f6, 0x18($s0) +/* A94EE0 802417A0 E7A00020 */ swc1 $f0, 0x20($sp) +/* A94EE4 802417A4 E7A20024 */ swc1 $f2, 0x24($sp) +/* A94EE8 802417A8 E7A40028 */ swc1 $f4, 0x28($sp) +/* A94EEC 802417AC E7A60010 */ swc1 $f6, 0x10($sp) +/* A94EF0 802417B0 C600000C */ lwc1 $f0, 0xc($s0) +/* A94EF4 802417B4 E7A00014 */ swc1 $f0, 0x14($sp) +/* A94EF8 802417B8 860200A8 */ lh $v0, 0xa8($s0) +/* A94EFC 802417BC 27A50020 */ addiu $a1, $sp, 0x20 +/* A94F00 802417C0 44820000 */ mtc1 $v0, $f0 +/* A94F04 802417C4 00000000 */ nop +/* A94F08 802417C8 46800020 */ cvt.s.w $f0, $f0 +/* A94F0C 802417CC E7A00018 */ swc1 $f0, 0x18($sp) +/* A94F10 802417D0 860200A6 */ lh $v0, 0xa6($s0) +/* A94F14 802417D4 27A60024 */ addiu $a2, $sp, 0x24 +/* A94F18 802417D8 44820000 */ mtc1 $v0, $f0 +/* A94F1C 802417DC 00000000 */ nop +/* A94F20 802417E0 46800020 */ cvt.s.w $f0, $f0 +/* A94F24 802417E4 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A94F28 802417E8 8E040080 */ lw $a0, 0x80($s0) +/* A94F2C 802417EC 0C037711 */ jal func_800DDC44 +/* A94F30 802417F0 27A70028 */ addiu $a3, $sp, 0x28 +/* A94F34 802417F4 0040902D */ daddu $s2, $v0, $zero +/* A94F38 802417F8 16400005 */ bnez $s2, .L80241810 +/* A94F3C 802417FC 00000000 */ nop +/* A94F40 80241800 8E050018 */ lw $a1, 0x18($s0) +/* A94F44 80241804 8E06000C */ lw $a2, 0xc($s0) +/* A94F48 80241808 0C00EA95 */ jal npc_move_heading +/* A94F4C 8024180C 0200202D */ daddu $a0, $s0, $zero +.L80241810: +/* A94F50 80241810 8602008E */ lh $v0, 0x8e($s0) +/* A94F54 80241814 9603008E */ lhu $v1, 0x8e($s0) +/* A94F58 80241818 18400007 */ blez $v0, .L80241838 +/* A94F5C 8024181C 2462FFFF */ addiu $v0, $v1, -1 +/* A94F60 80241820 A602008E */ sh $v0, 0x8e($s0) +/* A94F64 80241824 00021400 */ sll $v0, $v0, 0x10 +/* A94F68 80241828 18400003 */ blez $v0, .L80241838 +/* A94F6C 8024182C 00000000 */ nop +/* A94F70 80241830 12400008 */ beqz $s2, .L80241854 +/* A94F74 80241834 00000000 */ nop +.L80241838: +/* A94F78 80241838 8E2200CC */ lw $v0, 0xcc($s1) +/* A94F7C 8024183C A2200007 */ sb $zero, 7($s1) +/* A94F80 80241840 8C420028 */ lw $v0, 0x28($v0) +/* A94F84 80241844 A600008E */ sh $zero, 0x8e($s0) +/* A94F88 80241848 AE020028 */ sw $v0, 0x28($s0) +/* A94F8C 8024184C 2402000F */ addiu $v0, $zero, 0xf +/* A94F90 80241850 AE620070 */ sw $v0, 0x70($s3) +.L80241854: +/* A94F94 80241854 8FBF0040 */ lw $ra, 0x40($sp) +/* A94F98 80241858 8FB3003C */ lw $s3, 0x3c($sp) +/* A94F9C 8024185C 8FB20038 */ lw $s2, 0x38($sp) +/* A94FA0 80241860 8FB10034 */ lw $s1, 0x34($sp) +/* A94FA4 80241864 8FB00030 */ lw $s0, 0x30($sp) +/* A94FA8 80241868 03E00008 */ jr $ra +/* A94FAC 8024186C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s index 0c7d736c67..24559f8720 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802418F0_A95030.s @@ -232,25 +232,25 @@ glabel func_802418F0_A95030 .L80241C40: /* A95380 80241C40 0260202D */ daddu $a0, $s3, $zero /* A95384 80241C44 0280282D */ daddu $a1, $s4, $zero -/* A95388 80241C48 0C090557 */ jal func_8024155C +/* A95388 80241C48 0C090557 */ jal func_8024155C_A94C9C /* A9538C 80241C4C 02A0302D */ daddu $a2, $s5, $zero /* A95390 80241C50 0260202D */ daddu $a0, $s3, $zero .L80241C54: /* A95394 80241C54 0280282D */ daddu $a1, $s4, $zero -/* A95398 80241C58 0C090576 */ jal func_802415D8 +/* A95398 80241C58 0C090576 */ jal func_802415D8_A94D18 /* A9539C 80241C5C 02A0302D */ daddu $a2, $s5, $zero /* A953A0 80241C60 08090727 */ j .L80241C9C /* A953A4 80241C64 00000000 */ nop .L80241C68: /* A953A8 80241C68 0260202D */ daddu $a0, $s3, $zero /* A953AC 80241C6C 0280282D */ daddu $a1, $s4, $zero -/* A953B0 80241C70 0C0905C3 */ jal func_8024170C +/* A953B0 80241C70 0C0905C3 */ jal func_8024170C_A94E4C /* A953B4 80241C74 02A0302D */ daddu $a2, $s5, $zero /* A953B8 80241C78 08090727 */ j .L80241C9C /* A953BC 80241C7C 00000000 */ nop .L80241C80: /* A953C0 80241C80 0280282D */ daddu $a1, $s4, $zero -/* A953C4 80241C84 0C09061C */ jal func_80241870 +/* A953C4 80241C84 0C09061C */ jal func_80241870_A94FB0 /* A953C8 80241C88 02A0302D */ daddu $a2, $s5, $zero /* A953CC 80241C8C 08090727 */ j .L80241C9C /* A953D0 80241C90 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s index 792d0bcd4c..21b5f41c47 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024244C_A95B8C.s @@ -49,7 +49,7 @@ glabel func_8024244C_A95B8C /* A95C3C 802424FC 0280202D */ daddu $a0, $s4, $zero /* A95C40 80242500 8E250024 */ lw $a1, 0x24($s1) /* A95C44 80242504 8E260028 */ lw $a2, 0x28($s1) -/* A95C48 80242508 0C09074C */ jal func_80241D30 +/* A95C48 80242508 0C09074C */ jal func_80241D30_A95470 /* A95C4C 8024250C 0240382D */ daddu $a3, $s2, $zero /* A95C50 80242510 24030001 */ addiu $v1, $zero, 1 /* A95C54 80242514 1443001E */ bne $v0, $v1, .L80242590 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8.s deleted file mode 100644 index a5f3d4e419..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429C8 -/* A96108 802429C8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9610C 802429CC AFB20018 */ sw $s2, 0x18($sp) -/* A96110 802429D0 0080902D */ daddu $s2, $a0, $zero -/* A96114 802429D4 AFBF001C */ sw $ra, 0x1c($sp) -/* A96118 802429D8 AFB10014 */ sw $s1, 0x14($sp) -/* A9611C 802429DC AFB00010 */ sw $s0, 0x10($sp) -/* A96120 802429E0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* A96124 802429E4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A96128 802429E8 8E510148 */ lw $s1, 0x148($s2) -/* A9612C 802429EC 0C00EABB */ jal get_npc_unsafe -/* A96130 802429F0 86240008 */ lh $a0, 8($s1) -/* A96134 802429F4 0040802D */ daddu $s0, $v0, $zero -/* A96138 802429F8 C6340070 */ lwc1 $f20, 0x70($s1) -/* A9613C 802429FC 4680A520 */ cvt.s.w $f20, $f20 -/* A96140 80242A00 4600A521 */ cvt.d.s $f20, $f20 -/* A96144 80242A04 8E23006C */ lw $v1, 0x6c($s1) -/* A96148 80242A08 3C014059 */ lui $at, 0x4059 -/* A9614C 80242A0C 4481B800 */ mtc1 $at, $f23 -/* A96150 80242A10 4480B000 */ mtc1 $zero, $f22 -/* A96154 80242A14 2463000A */ addiu $v1, $v1, 0xa -/* A96158 80242A18 44836000 */ mtc1 $v1, $f12 -/* A9615C 80242A1C 00000000 */ nop -/* A96160 80242A20 46806320 */ cvt.s.w $f12, $f12 -/* A96164 80242A24 4636A503 */ div.d $f20, $f20, $f22 -/* A96168 80242A28 0C00A6C9 */ jal clamp_angle -/* A9616C 80242A2C 4620A520 */ cvt.s.d $f20, $f20 -/* A96170 80242A30 4600010D */ trunc.w.s $f4, $f0 -/* A96174 80242A34 44022000 */ mfc1 $v0, $f4 -/* A96178 80242A38 00000000 */ nop -/* A9617C 80242A3C 44826000 */ mtc1 $v0, $f12 -/* A96180 80242A40 00000000 */ nop -/* A96184 80242A44 46806320 */ cvt.s.w $f12, $f12 -/* A96188 80242A48 0C00A8BB */ jal sin_deg -/* A9618C 80242A4C AE22006C */ sw $v0, 0x6c($s1) -/* A96190 80242A50 3C014018 */ lui $at, 0x4018 -/* A96194 80242A54 44811800 */ mtc1 $at, $f3 -/* A96198 80242A58 44801000 */ mtc1 $zero, $f2 -/* A9619C 80242A5C 46000021 */ cvt.d.s $f0, $f0 -/* A961A0 80242A60 46220002 */ mul.d $f0, $f0, $f2 -/* A961A4 80242A64 00000000 */ nop -/* A961A8 80242A68 4600A0A1 */ cvt.d.s $f2, $f20 -/* A961AC 80242A6C 46201080 */ add.d $f2, $f2, $f0 -/* A961B0 80242A70 8602008C */ lh $v0, 0x8c($s0) -/* A961B4 80242A74 46201020 */ cvt.s.d $f0, $f2 -/* A961B8 80242A78 14400008 */ bnez $v0, .L80242A9C -/* A961BC 80242A7C E600003C */ swc1 $f0, 0x3c($s0) -/* A961C0 80242A80 46000021 */ cvt.d.s $f0, $f0 -/* A961C4 80242A84 46360002 */ mul.d $f0, $f0, $f22 -/* A961C8 80242A88 00000000 */ nop -/* A961CC 80242A8C 24020011 */ addiu $v0, $zero, 0x11 -/* A961D0 80242A90 4620010D */ trunc.w.d $f4, $f0 -/* A961D4 80242A94 E6240080 */ swc1 $f4, 0x80($s1) -/* A961D8 80242A98 AE420070 */ sw $v0, 0x70($s2) -.L80242A9C: -/* A961DC 80242A9C 8FBF001C */ lw $ra, 0x1c($sp) -/* A961E0 80242AA0 8FB20018 */ lw $s2, 0x18($sp) -/* A961E4 80242AA4 8FB10014 */ lw $s1, 0x14($sp) -/* A961E8 80242AA8 8FB00010 */ lw $s0, 0x10($sp) -/* A961EC 80242AAC D7B60028 */ ldc1 $f22, 0x28($sp) -/* A961F0 80242AB0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A961F4 80242AB4 03E00008 */ jr $ra -/* A961F8 80242AB8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s new file mode 100644 index 0000000000..381c6c5d2f --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802429C8_A96108.s @@ -0,0 +1,66 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429C8_A96108 +/* A96108 802429C8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A9610C 802429CC AFB20018 */ sw $s2, 0x18($sp) +/* A96110 802429D0 0080902D */ daddu $s2, $a0, $zero +/* A96114 802429D4 AFBF001C */ sw $ra, 0x1c($sp) +/* A96118 802429D8 AFB10014 */ sw $s1, 0x14($sp) +/* A9611C 802429DC AFB00010 */ sw $s0, 0x10($sp) +/* A96120 802429E0 F7B60028 */ sdc1 $f22, 0x28($sp) +/* A96124 802429E4 F7B40020 */ sdc1 $f20, 0x20($sp) +/* A96128 802429E8 8E510148 */ lw $s1, 0x148($s2) +/* A9612C 802429EC 0C00EABB */ jal get_npc_unsafe +/* A96130 802429F0 86240008 */ lh $a0, 8($s1) +/* A96134 802429F4 0040802D */ daddu $s0, $v0, $zero +/* A96138 802429F8 C6340070 */ lwc1 $f20, 0x70($s1) +/* A9613C 802429FC 4680A520 */ cvt.s.w $f20, $f20 +/* A96140 80242A00 4600A521 */ cvt.d.s $f20, $f20 +/* A96144 80242A04 8E23006C */ lw $v1, 0x6c($s1) +/* A96148 80242A08 3C014059 */ lui $at, 0x4059 +/* A9614C 80242A0C 4481B800 */ mtc1 $at, $f23 +/* A96150 80242A10 4480B000 */ mtc1 $zero, $f22 +/* A96154 80242A14 2463000A */ addiu $v1, $v1, 0xa +/* A96158 80242A18 44836000 */ mtc1 $v1, $f12 +/* A9615C 80242A1C 00000000 */ nop +/* A96160 80242A20 46806320 */ cvt.s.w $f12, $f12 +/* A96164 80242A24 4636A503 */ div.d $f20, $f20, $f22 +/* A96168 80242A28 0C00A6C9 */ jal clamp_angle +/* A9616C 80242A2C 4620A520 */ cvt.s.d $f20, $f20 +/* A96170 80242A30 4600010D */ trunc.w.s $f4, $f0 +/* A96174 80242A34 44022000 */ mfc1 $v0, $f4 +/* A96178 80242A38 00000000 */ nop +/* A9617C 80242A3C 44826000 */ mtc1 $v0, $f12 +/* A96180 80242A40 00000000 */ nop +/* A96184 80242A44 46806320 */ cvt.s.w $f12, $f12 +/* A96188 80242A48 0C00A8BB */ jal sin_deg +/* A9618C 80242A4C AE22006C */ sw $v0, 0x6c($s1) +/* A96190 80242A50 3C014018 */ lui $at, 0x4018 +/* A96194 80242A54 44811800 */ mtc1 $at, $f3 +/* A96198 80242A58 44801000 */ mtc1 $zero, $f2 +/* A9619C 80242A5C 46000021 */ cvt.d.s $f0, $f0 +/* A961A0 80242A60 46220002 */ mul.d $f0, $f0, $f2 +/* A961A4 80242A64 00000000 */ nop +/* A961A8 80242A68 4600A0A1 */ cvt.d.s $f2, $f20 +/* A961AC 80242A6C 46201080 */ add.d $f2, $f2, $f0 +/* A961B0 80242A70 8602008C */ lh $v0, 0x8c($s0) +/* A961B4 80242A74 46201020 */ cvt.s.d $f0, $f2 +/* A961B8 80242A78 14400008 */ bnez $v0, .L80242A9C +/* A961BC 80242A7C E600003C */ swc1 $f0, 0x3c($s0) +/* A961C0 80242A80 46000021 */ cvt.d.s $f0, $f0 +/* A961C4 80242A84 46360002 */ mul.d $f0, $f0, $f22 +/* A961C8 80242A88 00000000 */ nop +/* A961CC 80242A8C 24020011 */ addiu $v0, $zero, 0x11 +/* A961D0 80242A90 4620010D */ trunc.w.d $f4, $f0 +/* A961D4 80242A94 E6240080 */ swc1 $f4, 0x80($s1) +/* A961D8 80242A98 AE420070 */ sw $v0, 0x70($s2) +.L80242A9C: +/* A961DC 80242A9C 8FBF001C */ lw $ra, 0x1c($sp) +/* A961E0 80242AA0 8FB20018 */ lw $s2, 0x18($sp) +/* A961E4 80242AA4 8FB10014 */ lw $s1, 0x14($sp) +/* A961E8 80242AA8 8FB00010 */ lw $s0, 0x10($sp) +/* A961EC 80242AAC D7B60028 */ ldc1 $f22, 0x28($sp) +/* A961F0 80242AB0 D7B40020 */ ldc1 $f20, 0x20($sp) +/* A961F4 80242AB4 03E00008 */ jr $ra +/* A961F8 80242AB8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC.s deleted file mode 100644 index 96bce53fc4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC.s +++ /dev/null @@ -1,154 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242ABC -/* A961FC 80242ABC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A96200 80242AC0 AFB20020 */ sw $s2, 0x20($sp) -/* A96204 80242AC4 0080902D */ daddu $s2, $a0, $zero -/* A96208 80242AC8 AFBF0024 */ sw $ra, 0x24($sp) -/* A9620C 80242ACC AFB1001C */ sw $s1, 0x1c($sp) -/* A96210 80242AD0 AFB00018 */ sw $s0, 0x18($sp) -/* A96214 80242AD4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* A96218 80242AD8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* A9621C 80242ADC F7B40028 */ sdc1 $f20, 0x28($sp) -/* A96220 80242AE0 8E510148 */ lw $s1, 0x148($s2) -/* A96224 80242AE4 0C00EABB */ jal get_npc_unsafe -/* A96228 80242AE8 86240008 */ lh $a0, 8($s1) -/* A9622C 80242AEC 2404000B */ addiu $a0, $zero, 0xb -/* A96230 80242AF0 0040802D */ daddu $s0, $v0, $zero -/* A96234 80242AF4 C620007C */ lwc1 $f0, 0x7c($s1) -/* A96238 80242AF8 46800020 */ cvt.s.w $f0, $f0 -/* A9623C 80242AFC 46000021 */ cvt.d.s $f0, $f0 -/* A96240 80242B00 C6360080 */ lwc1 $f22, 0x80($s1) -/* A96244 80242B04 4680B5A0 */ cvt.s.w $f22, $f22 -/* A96248 80242B08 C6340084 */ lwc1 $f20, 0x84($s1) -/* A9624C 80242B0C 4680A520 */ cvt.s.w $f20, $f20 -/* A96250 80242B10 4600B5A1 */ cvt.d.s $f22, $f22 -/* A96254 80242B14 4600A521 */ cvt.d.s $f20, $f20 -/* A96258 80242B18 3C014059 */ lui $at, 0x4059 -/* A9625C 80242B1C 44811800 */ mtc1 $at, $f3 -/* A96260 80242B20 44801000 */ mtc1 $zero, $f2 -/* A96264 80242B24 8607008E */ lh $a3, 0x8e($s0) -/* A96268 80242B28 8E220078 */ lw $v0, 0x78($s1) -/* A9626C 80242B2C 46220003 */ div.d $f0, $f0, $f2 -/* A96270 80242B30 46200020 */ cvt.s.d $f0, $f0 -/* A96274 80242B34 44050000 */ mfc1 $a1, $f0 -/* A96278 80242B38 C6200070 */ lwc1 $f0, 0x70($s1) -/* A9627C 80242B3C 46800020 */ cvt.s.w $f0, $f0 -/* A96280 80242B40 46000021 */ cvt.d.s $f0, $f0 -/* A96284 80242B44 46220003 */ div.d $f0, $f0, $f2 -/* A96288 80242B48 46200620 */ cvt.s.d $f24, $f0 -/* A9628C 80242B4C 4622B583 */ div.d $f22, $f22, $f2 -/* A96290 80242B50 4620B5A0 */ cvt.s.d $f22, $f22 -/* A96294 80242B54 4622A503 */ div.d $f20, $f20, $f2 -/* A96298 80242B58 AFA20010 */ sw $v0, 0x10($sp) -/* A9629C 80242B5C 8E060060 */ lw $a2, 0x60($s0) -/* A962A0 80242B60 0C00A8ED */ jal update_lerp -/* A962A4 80242B64 4620A520 */ cvt.s.d $f20, $f20 -/* A962A8 80242B68 4405A000 */ mfc1 $a1, $f20 -/* A962AC 80242B6C 8607008E */ lh $a3, 0x8e($s0) -/* A962B0 80242B70 8E220078 */ lw $v0, 0x78($s1) -/* A962B4 80242B74 2404000B */ addiu $a0, $zero, 0xb -/* A962B8 80242B78 AFA20010 */ sw $v0, 0x10($sp) -/* A962BC 80242B7C 8E060068 */ lw $a2, 0x68($s0) -/* A962C0 80242B80 0C00A8ED */ jal update_lerp -/* A962C4 80242B84 46000506 */ mov.s $f20, $f0 -/* A962C8 80242B88 E6140038 */ swc1 $f20, 0x38($s0) -/* A962CC 80242B8C E6000040 */ swc1 $f0, 0x40($s0) -/* A962D0 80242B90 C6200078 */ lwc1 $f0, 0x78($s1) -/* A962D4 80242B94 46800020 */ cvt.s.w $f0, $f0 -/* A962D8 80242B98 46000021 */ cvt.d.s $f0, $f0 -/* A962DC 80242B9C 8602008E */ lh $v0, 0x8e($s0) -/* A962E0 80242BA0 3C018024 */ lui $at, 0x8024 -/* A962E4 80242BA4 D4345D90 */ ldc1 $f20, 0x5d90($at) -/* A962E8 80242BA8 44821000 */ mtc1 $v0, $f2 -/* A962EC 80242BAC 00000000 */ nop -/* A962F0 80242BB0 468010A1 */ cvt.d.w $f2, $f2 -/* A962F4 80242BB4 4620A003 */ div.d $f0, $f20, $f0 -/* A962F8 80242BB8 46201082 */ mul.d $f2, $f2, $f0 -/* A962FC 80242BBC 00000000 */ nop -/* A96300 80242BC0 4620110D */ trunc.w.d $f4, $f2 -/* A96304 80242BC4 44022000 */ mfc1 $v0, $f4 -/* A96308 80242BC8 00000000 */ nop -/* A9630C 80242BCC 244200B4 */ addiu $v0, $v0, 0xb4 -/* A96310 80242BD0 44826000 */ mtc1 $v0, $f12 -/* A96314 80242BD4 00000000 */ nop -/* A96318 80242BD8 0C00A8BB */ jal sin_deg -/* A9631C 80242BDC 46806320 */ cvt.s.w $f12, $f12 -/* A96320 80242BE0 3C014039 */ lui $at, 0x4039 -/* A96324 80242BE4 44811800 */ mtc1 $at, $f3 -/* A96328 80242BE8 44801000 */ mtc1 $zero, $f2 -/* A9632C 80242BEC 46000021 */ cvt.d.s $f0, $f0 -/* A96330 80242BF0 46220002 */ mul.d $f0, $f0, $f2 -/* A96334 80242BF4 00000000 */ nop -/* A96338 80242BF8 9602008E */ lhu $v0, 0x8e($s0) -/* A9633C 80242BFC 4600B0A1 */ cvt.d.s $f2, $f22 -/* A96340 80242C00 24420001 */ addiu $v0, $v0, 1 -/* A96344 80242C04 46201080 */ add.d $f2, $f2, $f0 -/* A96348 80242C08 A602008E */ sh $v0, 0x8e($s0) -/* A9634C 80242C0C 00021400 */ sll $v0, $v0, 0x10 -/* A96350 80242C10 462010A0 */ cvt.s.d $f2, $f2 -/* A96354 80242C14 E602003C */ swc1 $f2, 0x3c($s0) -/* A96358 80242C18 8E230078 */ lw $v1, 0x78($s1) -/* A9635C 80242C1C 00021403 */ sra $v0, $v0, 0x10 -/* A96360 80242C20 2463FFF8 */ addiu $v1, $v1, -8 -/* A96364 80242C24 14430009 */ bne $v0, $v1, .L80242C4C -/* A96368 80242C28 00000000 */ nop -/* A9636C 80242C2C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A96370 80242C30 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A96374 80242C34 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A96378 80242C38 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A9637C 80242C3C 8C460028 */ lw $a2, 0x28($v0) -/* A96380 80242C40 0C00A720 */ jal atan2 -/* A96384 80242C44 8C470030 */ lw $a3, 0x30($v0) -/* A96388 80242C48 E600000C */ swc1 $f0, 0xc($s0) -.L80242C4C: -/* A9638C 80242C4C C600003C */ lwc1 $f0, 0x3c($s0) -/* A96390 80242C50 4600C03E */ c.le.s $f24, $f0 -/* A96394 80242C54 00000000 */ nop -/* A96398 80242C58 45000004 */ bc1f .L80242C6C -/* A9639C 80242C5C 2402000A */ addiu $v0, $zero, 0xa -/* A963A0 80242C60 E618003C */ swc1 $f24, 0x3c($s0) -/* A963A4 80242C64 08090B36 */ j .L80242CD8 -/* A963A8 80242C68 AE20006C */ sw $zero, 0x6c($s1) -.L80242C6C: -/* A963AC 80242C6C 8602008E */ lh $v0, 0x8e($s0) -/* A963B0 80242C70 8E230078 */ lw $v1, 0x78($s1) -/* A963B4 80242C74 0043102A */ slt $v0, $v0, $v1 -/* A963B8 80242C78 14400018 */ bnez $v0, .L80242CDC -/* A963BC 80242C7C 00000000 */ nop -/* A963C0 80242C80 8E23006C */ lw $v1, 0x6c($s1) -/* A963C4 80242C84 44831000 */ mtc1 $v1, $f2 -/* A963C8 80242C88 00000000 */ nop -/* A963CC 80242C8C 468010A1 */ cvt.d.w $f2, $f2 -/* A963D0 80242C90 4622A03E */ c.le.d $f20, $f2 -/* A963D4 80242C94 00000000 */ nop -/* A963D8 80242C98 4500000F */ bc1f .L80242CD8 -/* A963DC 80242C9C 2402000A */ addiu $v0, $zero, 0xa -/* A963E0 80242CA0 3C018024 */ lui $at, 0x8024 -/* A963E4 80242CA4 D4205D98 */ ldc1 $f0, 0x5d98($at) -/* A963E8 80242CA8 4620103C */ c.lt.d $f2, $f0 -/* A963EC 80242CAC 00000000 */ nop -/* A963F0 80242CB0 45000008 */ bc1f .L80242CD4 -/* A963F4 80242CB4 2402021C */ addiu $v0, $zero, 0x21c -/* A963F8 80242CB8 00431023 */ subu $v0, $v0, $v1 -/* A963FC 80242CBC 44826000 */ mtc1 $v0, $f12 -/* A96400 80242CC0 00000000 */ nop -/* A96404 80242CC4 0C00A6C9 */ jal clamp_angle -/* A96408 80242CC8 46806320 */ cvt.s.w $f12, $f12 -/* A9640C 80242CCC 4600010D */ trunc.w.s $f4, $f0 -/* A96410 80242CD0 E624006C */ swc1 $f4, 0x6c($s1) -.L80242CD4: -/* A96414 80242CD4 2402000A */ addiu $v0, $zero, 0xa -.L80242CD8: -/* A96418 80242CD8 AE420070 */ sw $v0, 0x70($s2) -.L80242CDC: -/* A9641C 80242CDC 8FBF0024 */ lw $ra, 0x24($sp) -/* A96420 80242CE0 8FB20020 */ lw $s2, 0x20($sp) -/* A96424 80242CE4 8FB1001C */ lw $s1, 0x1c($sp) -/* A96428 80242CE8 8FB00018 */ lw $s0, 0x18($sp) -/* A9642C 80242CEC D7B80038 */ ldc1 $f24, 0x38($sp) -/* A96430 80242CF0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* A96434 80242CF4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A96438 80242CF8 03E00008 */ jr $ra -/* A9643C 80242CFC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s new file mode 100644 index 0000000000..337b3bbd59 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242ABC_A961FC.s @@ -0,0 +1,154 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242ABC_A961FC +/* A961FC 80242ABC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A96200 80242AC0 AFB20020 */ sw $s2, 0x20($sp) +/* A96204 80242AC4 0080902D */ daddu $s2, $a0, $zero +/* A96208 80242AC8 AFBF0024 */ sw $ra, 0x24($sp) +/* A9620C 80242ACC AFB1001C */ sw $s1, 0x1c($sp) +/* A96210 80242AD0 AFB00018 */ sw $s0, 0x18($sp) +/* A96214 80242AD4 F7B80038 */ sdc1 $f24, 0x38($sp) +/* A96218 80242AD8 F7B60030 */ sdc1 $f22, 0x30($sp) +/* A9621C 80242ADC F7B40028 */ sdc1 $f20, 0x28($sp) +/* A96220 80242AE0 8E510148 */ lw $s1, 0x148($s2) +/* A96224 80242AE4 0C00EABB */ jal get_npc_unsafe +/* A96228 80242AE8 86240008 */ lh $a0, 8($s1) +/* A9622C 80242AEC 2404000B */ addiu $a0, $zero, 0xb +/* A96230 80242AF0 0040802D */ daddu $s0, $v0, $zero +/* A96234 80242AF4 C620007C */ lwc1 $f0, 0x7c($s1) +/* A96238 80242AF8 46800020 */ cvt.s.w $f0, $f0 +/* A9623C 80242AFC 46000021 */ cvt.d.s $f0, $f0 +/* A96240 80242B00 C6360080 */ lwc1 $f22, 0x80($s1) +/* A96244 80242B04 4680B5A0 */ cvt.s.w $f22, $f22 +/* A96248 80242B08 C6340084 */ lwc1 $f20, 0x84($s1) +/* A9624C 80242B0C 4680A520 */ cvt.s.w $f20, $f20 +/* A96250 80242B10 4600B5A1 */ cvt.d.s $f22, $f22 +/* A96254 80242B14 4600A521 */ cvt.d.s $f20, $f20 +/* A96258 80242B18 3C014059 */ lui $at, 0x4059 +/* A9625C 80242B1C 44811800 */ mtc1 $at, $f3 +/* A96260 80242B20 44801000 */ mtc1 $zero, $f2 +/* A96264 80242B24 8607008E */ lh $a3, 0x8e($s0) +/* A96268 80242B28 8E220078 */ lw $v0, 0x78($s1) +/* A9626C 80242B2C 46220003 */ div.d $f0, $f0, $f2 +/* A96270 80242B30 46200020 */ cvt.s.d $f0, $f0 +/* A96274 80242B34 44050000 */ mfc1 $a1, $f0 +/* A96278 80242B38 C6200070 */ lwc1 $f0, 0x70($s1) +/* A9627C 80242B3C 46800020 */ cvt.s.w $f0, $f0 +/* A96280 80242B40 46000021 */ cvt.d.s $f0, $f0 +/* A96284 80242B44 46220003 */ div.d $f0, $f0, $f2 +/* A96288 80242B48 46200620 */ cvt.s.d $f24, $f0 +/* A9628C 80242B4C 4622B583 */ div.d $f22, $f22, $f2 +/* A96290 80242B50 4620B5A0 */ cvt.s.d $f22, $f22 +/* A96294 80242B54 4622A503 */ div.d $f20, $f20, $f2 +/* A96298 80242B58 AFA20010 */ sw $v0, 0x10($sp) +/* A9629C 80242B5C 8E060060 */ lw $a2, 0x60($s0) +/* A962A0 80242B60 0C00A8ED */ jal update_lerp +/* A962A4 80242B64 4620A520 */ cvt.s.d $f20, $f20 +/* A962A8 80242B68 4405A000 */ mfc1 $a1, $f20 +/* A962AC 80242B6C 8607008E */ lh $a3, 0x8e($s0) +/* A962B0 80242B70 8E220078 */ lw $v0, 0x78($s1) +/* A962B4 80242B74 2404000B */ addiu $a0, $zero, 0xb +/* A962B8 80242B78 AFA20010 */ sw $v0, 0x10($sp) +/* A962BC 80242B7C 8E060068 */ lw $a2, 0x68($s0) +/* A962C0 80242B80 0C00A8ED */ jal update_lerp +/* A962C4 80242B84 46000506 */ mov.s $f20, $f0 +/* A962C8 80242B88 E6140038 */ swc1 $f20, 0x38($s0) +/* A962CC 80242B8C E6000040 */ swc1 $f0, 0x40($s0) +/* A962D0 80242B90 C6200078 */ lwc1 $f0, 0x78($s1) +/* A962D4 80242B94 46800020 */ cvt.s.w $f0, $f0 +/* A962D8 80242B98 46000021 */ cvt.d.s $f0, $f0 +/* A962DC 80242B9C 8602008E */ lh $v0, 0x8e($s0) +/* A962E0 80242BA0 3C018024 */ lui $at, 0x8024 +/* A962E4 80242BA4 D4345D90 */ ldc1 $f20, 0x5d90($at) +/* A962E8 80242BA8 44821000 */ mtc1 $v0, $f2 +/* A962EC 80242BAC 00000000 */ nop +/* A962F0 80242BB0 468010A1 */ cvt.d.w $f2, $f2 +/* A962F4 80242BB4 4620A003 */ div.d $f0, $f20, $f0 +/* A962F8 80242BB8 46201082 */ mul.d $f2, $f2, $f0 +/* A962FC 80242BBC 00000000 */ nop +/* A96300 80242BC0 4620110D */ trunc.w.d $f4, $f2 +/* A96304 80242BC4 44022000 */ mfc1 $v0, $f4 +/* A96308 80242BC8 00000000 */ nop +/* A9630C 80242BCC 244200B4 */ addiu $v0, $v0, 0xb4 +/* A96310 80242BD0 44826000 */ mtc1 $v0, $f12 +/* A96314 80242BD4 00000000 */ nop +/* A96318 80242BD8 0C00A8BB */ jal sin_deg +/* A9631C 80242BDC 46806320 */ cvt.s.w $f12, $f12 +/* A96320 80242BE0 3C014039 */ lui $at, 0x4039 +/* A96324 80242BE4 44811800 */ mtc1 $at, $f3 +/* A96328 80242BE8 44801000 */ mtc1 $zero, $f2 +/* A9632C 80242BEC 46000021 */ cvt.d.s $f0, $f0 +/* A96330 80242BF0 46220002 */ mul.d $f0, $f0, $f2 +/* A96334 80242BF4 00000000 */ nop +/* A96338 80242BF8 9602008E */ lhu $v0, 0x8e($s0) +/* A9633C 80242BFC 4600B0A1 */ cvt.d.s $f2, $f22 +/* A96340 80242C00 24420001 */ addiu $v0, $v0, 1 +/* A96344 80242C04 46201080 */ add.d $f2, $f2, $f0 +/* A96348 80242C08 A602008E */ sh $v0, 0x8e($s0) +/* A9634C 80242C0C 00021400 */ sll $v0, $v0, 0x10 +/* A96350 80242C10 462010A0 */ cvt.s.d $f2, $f2 +/* A96354 80242C14 E602003C */ swc1 $f2, 0x3c($s0) +/* A96358 80242C18 8E230078 */ lw $v1, 0x78($s1) +/* A9635C 80242C1C 00021403 */ sra $v0, $v0, 0x10 +/* A96360 80242C20 2463FFF8 */ addiu $v1, $v1, -8 +/* A96364 80242C24 14430009 */ bne $v0, $v1, .L80242C4C +/* A96368 80242C28 00000000 */ nop +/* A9636C 80242C2C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A96370 80242C30 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A96374 80242C34 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A96378 80242C38 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A9637C 80242C3C 8C460028 */ lw $a2, 0x28($v0) +/* A96380 80242C40 0C00A720 */ jal atan2 +/* A96384 80242C44 8C470030 */ lw $a3, 0x30($v0) +/* A96388 80242C48 E600000C */ swc1 $f0, 0xc($s0) +.L80242C4C: +/* A9638C 80242C4C C600003C */ lwc1 $f0, 0x3c($s0) +/* A96390 80242C50 4600C03E */ c.le.s $f24, $f0 +/* A96394 80242C54 00000000 */ nop +/* A96398 80242C58 45000004 */ bc1f .L80242C6C +/* A9639C 80242C5C 2402000A */ addiu $v0, $zero, 0xa +/* A963A0 80242C60 E618003C */ swc1 $f24, 0x3c($s0) +/* A963A4 80242C64 08090B36 */ j .L80242CD8 +/* A963A8 80242C68 AE20006C */ sw $zero, 0x6c($s1) +.L80242C6C: +/* A963AC 80242C6C 8602008E */ lh $v0, 0x8e($s0) +/* A963B0 80242C70 8E230078 */ lw $v1, 0x78($s1) +/* A963B4 80242C74 0043102A */ slt $v0, $v0, $v1 +/* A963B8 80242C78 14400018 */ bnez $v0, .L80242CDC +/* A963BC 80242C7C 00000000 */ nop +/* A963C0 80242C80 8E23006C */ lw $v1, 0x6c($s1) +/* A963C4 80242C84 44831000 */ mtc1 $v1, $f2 +/* A963C8 80242C88 00000000 */ nop +/* A963CC 80242C8C 468010A1 */ cvt.d.w $f2, $f2 +/* A963D0 80242C90 4622A03E */ c.le.d $f20, $f2 +/* A963D4 80242C94 00000000 */ nop +/* A963D8 80242C98 4500000F */ bc1f .L80242CD8 +/* A963DC 80242C9C 2402000A */ addiu $v0, $zero, 0xa +/* A963E0 80242CA0 3C018024 */ lui $at, 0x8024 +/* A963E4 80242CA4 D4205D98 */ ldc1 $f0, 0x5d98($at) +/* A963E8 80242CA8 4620103C */ c.lt.d $f2, $f0 +/* A963EC 80242CAC 00000000 */ nop +/* A963F0 80242CB0 45000008 */ bc1f .L80242CD4 +/* A963F4 80242CB4 2402021C */ addiu $v0, $zero, 0x21c +/* A963F8 80242CB8 00431023 */ subu $v0, $v0, $v1 +/* A963FC 80242CBC 44826000 */ mtc1 $v0, $f12 +/* A96400 80242CC0 00000000 */ nop +/* A96404 80242CC4 0C00A6C9 */ jal clamp_angle +/* A96408 80242CC8 46806320 */ cvt.s.w $f12, $f12 +/* A9640C 80242CCC 4600010D */ trunc.w.s $f4, $f0 +/* A96410 80242CD0 E624006C */ swc1 $f4, 0x6c($s1) +.L80242CD4: +/* A96414 80242CD4 2402000A */ addiu $v0, $zero, 0xa +.L80242CD8: +/* A96418 80242CD8 AE420070 */ sw $v0, 0x70($s2) +.L80242CDC: +/* A9641C 80242CDC 8FBF0024 */ lw $ra, 0x24($sp) +/* A96420 80242CE0 8FB20020 */ lw $s2, 0x20($sp) +/* A96424 80242CE4 8FB1001C */ lw $s1, 0x1c($sp) +/* A96428 80242CE8 8FB00018 */ lw $s0, 0x18($sp) +/* A9642C 80242CEC D7B80038 */ ldc1 $f24, 0x38($sp) +/* A96430 80242CF0 D7B60030 */ ldc1 $f22, 0x30($sp) +/* A96434 80242CF4 D7B40028 */ ldc1 $f20, 0x28($sp) +/* A96438 80242CF8 03E00008 */ jr $ra +/* A9643C 80242CFC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00.s deleted file mode 100644 index a094795bee..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D00 -/* A96440 80242D00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A96444 80242D04 AFB00010 */ sw $s0, 0x10($sp) -/* A96448 80242D08 0080802D */ daddu $s0, $a0, $zero -/* A9644C 80242D0C AFBF0014 */ sw $ra, 0x14($sp) -/* A96450 80242D10 8E020148 */ lw $v0, 0x148($s0) -/* A96454 80242D14 0C00EABB */ jal get_npc_unsafe -/* A96458 80242D18 84440008 */ lh $a0, 8($v0) -/* A9645C 80242D1C 24030028 */ addiu $v1, $zero, 0x28 -/* A96460 80242D20 A443008E */ sh $v1, 0x8e($v0) -/* A96464 80242D24 24020015 */ addiu $v0, $zero, 0x15 -/* A96468 80242D28 AE020070 */ sw $v0, 0x70($s0) -/* A9646C 80242D2C 8FBF0014 */ lw $ra, 0x14($sp) -/* A96470 80242D30 8FB00010 */ lw $s0, 0x10($sp) -/* A96474 80242D34 03E00008 */ jr $ra -/* A96478 80242D38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00_A96440.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00_A96440.s new file mode 100644 index 0000000000..3ad8d7883c --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D00_A96440.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D00_A96440 +/* A96440 80242D00 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A96444 80242D04 AFB00010 */ sw $s0, 0x10($sp) +/* A96448 80242D08 0080802D */ daddu $s0, $a0, $zero +/* A9644C 80242D0C AFBF0014 */ sw $ra, 0x14($sp) +/* A96450 80242D10 8E020148 */ lw $v0, 0x148($s0) +/* A96454 80242D14 0C00EABB */ jal get_npc_unsafe +/* A96458 80242D18 84440008 */ lh $a0, 8($v0) +/* A9645C 80242D1C 24030028 */ addiu $v1, $zero, 0x28 +/* A96460 80242D20 A443008E */ sh $v1, 0x8e($v0) +/* A96464 80242D24 24020015 */ addiu $v0, $zero, 0x15 +/* A96468 80242D28 AE020070 */ sw $v0, 0x70($s0) +/* A9646C 80242D2C 8FBF0014 */ lw $ra, 0x14($sp) +/* A96470 80242D30 8FB00010 */ lw $s0, 0x10($sp) +/* A96474 80242D34 03E00008 */ jr $ra +/* A96478 80242D38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C.s deleted file mode 100644 index af644b1612..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D3C -/* A9647C 80242D3C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A96480 80242D40 AFB40048 */ sw $s4, 0x48($sp) -/* A96484 80242D44 0080A02D */ daddu $s4, $a0, $zero -/* A96488 80242D48 AFBF004C */ sw $ra, 0x4c($sp) -/* A9648C 80242D4C AFB30044 */ sw $s3, 0x44($sp) -/* A96490 80242D50 AFB20040 */ sw $s2, 0x40($sp) -/* A96494 80242D54 AFB1003C */ sw $s1, 0x3c($sp) -/* A96498 80242D58 AFB00038 */ sw $s0, 0x38($sp) -/* A9649C 80242D5C F7B40050 */ sdc1 $f20, 0x50($sp) -/* A964A0 80242D60 8E910148 */ lw $s1, 0x148($s4) -/* A964A4 80242D64 00A0902D */ daddu $s2, $a1, $zero -/* A964A8 80242D68 86240008 */ lh $a0, 8($s1) -/* A964AC 80242D6C 0C00EABB */ jal get_npc_unsafe -/* A964B0 80242D70 00C0982D */ daddu $s3, $a2, $zero -/* A964B4 80242D74 0040802D */ daddu $s0, $v0, $zero -/* A964B8 80242D78 9602008E */ lhu $v0, 0x8e($s0) -/* A964BC 80242D7C 2442FFFF */ addiu $v0, $v0, -1 -/* A964C0 80242D80 A602008E */ sh $v0, 0x8e($s0) -/* A964C4 80242D84 00021400 */ sll $v0, $v0, 0x10 -/* A964C8 80242D88 14400021 */ bnez $v0, .L80242E10 -/* A964CC 80242D8C 0280202D */ daddu $a0, $s4, $zero -/* A964D0 80242D90 24040002 */ addiu $a0, $zero, 2 -/* A964D4 80242D94 0200282D */ daddu $a1, $s0, $zero -/* A964D8 80242D98 0000302D */ daddu $a2, $zero, $zero -/* A964DC 80242D9C 8E2200CC */ lw $v0, 0xcc($s1) -/* A964E0 80242DA0 3C013F80 */ lui $at, 0x3f80 -/* A964E4 80242DA4 44810000 */ mtc1 $at, $f0 -/* A964E8 80242DA8 3C014000 */ lui $at, 0x4000 -/* A964EC 80242DAC 44811000 */ mtc1 $at, $f2 -/* A964F0 80242DB0 8C430000 */ lw $v1, ($v0) -/* A964F4 80242DB4 860200A8 */ lh $v0, 0xa8($s0) -/* A964F8 80242DB8 3C01C1A0 */ lui $at, 0xc1a0 -/* A964FC 80242DBC 44812000 */ mtc1 $at, $f4 -/* A96500 80242DC0 44824000 */ mtc1 $v0, $f8 -/* A96504 80242DC4 00000000 */ nop -/* A96508 80242DC8 46804220 */ cvt.s.w $f8, $f8 -/* A9650C 80242DCC 44074000 */ mfc1 $a3, $f8 -/* A96510 80242DD0 2402000C */ addiu $v0, $zero, 0xc -/* A96514 80242DD4 AE030028 */ sw $v1, 0x28($s0) -/* A96518 80242DD8 AFA2001C */ sw $v0, 0x1c($sp) -/* A9651C 80242DDC 27A20028 */ addiu $v0, $sp, 0x28 -/* A96520 80242DE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A96524 80242DE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A96528 80242DE8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A9652C 80242DEC 0C01BFA4 */ jal fx_emote -/* A96530 80242DF0 AFA20020 */ sw $v0, 0x20($sp) -/* A96534 80242DF4 8E2200CC */ lw $v0, 0xcc($s1) -/* A96538 80242DF8 8C430000 */ lw $v1, ($v0) -/* A9653C 80242DFC 2402000F */ addiu $v0, $zero, 0xf -/* A96540 80242E00 A602008E */ sh $v0, 0x8e($s0) -/* A96544 80242E04 24020032 */ addiu $v0, $zero, 0x32 -/* A96548 80242E08 08090BB8 */ j .L80242EE0 -/* A9654C 80242E0C AE030028 */ sw $v1, 0x28($s0) -.L80242E10: -/* A96550 80242E10 8E450024 */ lw $a1, 0x24($s2) -/* A96554 80242E14 8E460028 */ lw $a2, 0x28($s2) -/* A96558 80242E18 0C09074C */ jal func_80241D30 -/* A9655C 80242E1C 0260382D */ daddu $a3, $s3, $zero -/* A96560 80242E20 24030001 */ addiu $v1, $zero, 1 -/* A96564 80242E24 1443002F */ bne $v0, $v1, .L80242EE4 -/* A96568 80242E28 00000000 */ nop -/* A9656C 80242E2C 8602008C */ lh $v0, 0x8c($s0) -/* A96570 80242E30 1440002C */ bnez $v0, .L80242EE4 -/* A96574 80242E34 0200202D */ daddu $a0, $s0, $zero -/* A96578 80242E38 240520D4 */ addiu $a1, $zero, 0x20d4 -/* A9657C 80242E3C 0C012530 */ jal func_800494C0 -/* A96580 80242E40 0000302D */ daddu $a2, $zero, $zero -/* A96584 80242E44 27A4002C */ addiu $a0, $sp, 0x2c -/* A96588 80242E48 27A50030 */ addiu $a1, $sp, 0x30 -/* A9658C 80242E4C 3C0641F0 */ lui $a2, 0x41f0 -/* A96590 80242E50 C6020034 */ lwc1 $f2, 0x34($s0) -/* A96594 80242E54 3C014387 */ lui $at, 0x4387 -/* A96598 80242E58 44810000 */ mtc1 $at, $f0 -/* A9659C 80242E5C 8E2200CC */ lw $v0, 0xcc($s1) -/* A965A0 80242E60 C614003C */ lwc1 $f20, 0x3c($s0) -/* A965A4 80242E64 46020001 */ sub.s $f0, $f0, $f2 -/* A965A8 80242E68 3C0141E8 */ lui $at, 0x41e8 -/* A965AC 80242E6C 44812000 */ mtc1 $at, $f4 -/* A965B0 80242E70 C6060038 */ lwc1 $f6, 0x38($s0) -/* A965B4 80242E74 4604A500 */ add.s $f20, $f20, $f4 -/* A965B8 80242E78 3C013F80 */ lui $at, 0x3f80 -/* A965BC 80242E7C 44811000 */ mtc1 $at, $f2 -/* A965C0 80242E80 44070000 */ mfc1 $a3, $f0 -/* A965C4 80242E84 C6000040 */ lwc1 $f0, 0x40($s0) -/* A965C8 80242E88 8C420020 */ lw $v0, 0x20($v0) -/* A965CC 80242E8C 46020000 */ add.s $f0, $f0, $f2 -/* A965D0 80242E90 E7A6002C */ swc1 $f6, 0x2c($sp) -/* A965D4 80242E94 AE020028 */ sw $v0, 0x28($s0) -/* A965D8 80242E98 0C00A7E7 */ jal add_vec2D_polar -/* A965DC 80242E9C E7A00030 */ swc1 $f0, 0x30($sp) -/* A965E0 80242EA0 0000202D */ daddu $a0, $zero, $zero -/* A965E4 80242EA4 4406A000 */ mfc1 $a2, $f20 -/* A965E8 80242EA8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A965EC 80242EAC C7A20030 */ lwc1 $f2, 0x30($sp) -/* A965F0 80242EB0 44050000 */ mfc1 $a1, $f0 -/* A965F4 80242EB4 44071000 */ mfc1 $a3, $f2 -/* A965F8 80242EB8 3C013DCC */ lui $at, 0x3dcc -/* A965FC 80242EBC 3421CCCD */ ori $at, $at, 0xcccd -/* A96600 80242EC0 44810000 */ mtc1 $at, $f0 -/* A96604 80242EC4 2402000D */ addiu $v0, $zero, 0xd -/* A96608 80242EC8 AFA20014 */ sw $v0, 0x14($sp) -/* A9660C 80242ECC 0C01BFEC */ jal func_8006FFB0 -/* A96610 80242ED0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A96614 80242ED4 2402000F */ addiu $v0, $zero, 0xf -/* A96618 80242ED8 A602008E */ sh $v0, 0x8e($s0) -/* A9661C 80242EDC 24020016 */ addiu $v0, $zero, 0x16 -.L80242EE0: -/* A96620 80242EE0 AE820070 */ sw $v0, 0x70($s4) -.L80242EE4: -/* A96624 80242EE4 8FBF004C */ lw $ra, 0x4c($sp) -/* A96628 80242EE8 8FB40048 */ lw $s4, 0x48($sp) -/* A9662C 80242EEC 8FB30044 */ lw $s3, 0x44($sp) -/* A96630 80242EF0 8FB20040 */ lw $s2, 0x40($sp) -/* A96634 80242EF4 8FB1003C */ lw $s1, 0x3c($sp) -/* A96638 80242EF8 8FB00038 */ lw $s0, 0x38($sp) -/* A9663C 80242EFC D7B40050 */ ldc1 $f20, 0x50($sp) -/* A96640 80242F00 03E00008 */ jr $ra -/* A96644 80242F04 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s new file mode 100644 index 0000000000..670280bc70 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242D3C_A9647C.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D3C_A9647C +/* A9647C 80242D3C 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* A96480 80242D40 AFB40048 */ sw $s4, 0x48($sp) +/* A96484 80242D44 0080A02D */ daddu $s4, $a0, $zero +/* A96488 80242D48 AFBF004C */ sw $ra, 0x4c($sp) +/* A9648C 80242D4C AFB30044 */ sw $s3, 0x44($sp) +/* A96490 80242D50 AFB20040 */ sw $s2, 0x40($sp) +/* A96494 80242D54 AFB1003C */ sw $s1, 0x3c($sp) +/* A96498 80242D58 AFB00038 */ sw $s0, 0x38($sp) +/* A9649C 80242D5C F7B40050 */ sdc1 $f20, 0x50($sp) +/* A964A0 80242D60 8E910148 */ lw $s1, 0x148($s4) +/* A964A4 80242D64 00A0902D */ daddu $s2, $a1, $zero +/* A964A8 80242D68 86240008 */ lh $a0, 8($s1) +/* A964AC 80242D6C 0C00EABB */ jal get_npc_unsafe +/* A964B0 80242D70 00C0982D */ daddu $s3, $a2, $zero +/* A964B4 80242D74 0040802D */ daddu $s0, $v0, $zero +/* A964B8 80242D78 9602008E */ lhu $v0, 0x8e($s0) +/* A964BC 80242D7C 2442FFFF */ addiu $v0, $v0, -1 +/* A964C0 80242D80 A602008E */ sh $v0, 0x8e($s0) +/* A964C4 80242D84 00021400 */ sll $v0, $v0, 0x10 +/* A964C8 80242D88 14400021 */ bnez $v0, .L80242E10 +/* A964CC 80242D8C 0280202D */ daddu $a0, $s4, $zero +/* A964D0 80242D90 24040002 */ addiu $a0, $zero, 2 +/* A964D4 80242D94 0200282D */ daddu $a1, $s0, $zero +/* A964D8 80242D98 0000302D */ daddu $a2, $zero, $zero +/* A964DC 80242D9C 8E2200CC */ lw $v0, 0xcc($s1) +/* A964E0 80242DA0 3C013F80 */ lui $at, 0x3f80 +/* A964E4 80242DA4 44810000 */ mtc1 $at, $f0 +/* A964E8 80242DA8 3C014000 */ lui $at, 0x4000 +/* A964EC 80242DAC 44811000 */ mtc1 $at, $f2 +/* A964F0 80242DB0 8C430000 */ lw $v1, ($v0) +/* A964F4 80242DB4 860200A8 */ lh $v0, 0xa8($s0) +/* A964F8 80242DB8 3C01C1A0 */ lui $at, 0xc1a0 +/* A964FC 80242DBC 44812000 */ mtc1 $at, $f4 +/* A96500 80242DC0 44824000 */ mtc1 $v0, $f8 +/* A96504 80242DC4 00000000 */ nop +/* A96508 80242DC8 46804220 */ cvt.s.w $f8, $f8 +/* A9650C 80242DCC 44074000 */ mfc1 $a3, $f8 +/* A96510 80242DD0 2402000C */ addiu $v0, $zero, 0xc +/* A96514 80242DD4 AE030028 */ sw $v1, 0x28($s0) +/* A96518 80242DD8 AFA2001C */ sw $v0, 0x1c($sp) +/* A9651C 80242DDC 27A20028 */ addiu $v0, $sp, 0x28 +/* A96520 80242DE0 E7A00010 */ swc1 $f0, 0x10($sp) +/* A96524 80242DE4 E7A20014 */ swc1 $f2, 0x14($sp) +/* A96528 80242DE8 E7A40018 */ swc1 $f4, 0x18($sp) +/* A9652C 80242DEC 0C01BFA4 */ jal fx_emote +/* A96530 80242DF0 AFA20020 */ sw $v0, 0x20($sp) +/* A96534 80242DF4 8E2200CC */ lw $v0, 0xcc($s1) +/* A96538 80242DF8 8C430000 */ lw $v1, ($v0) +/* A9653C 80242DFC 2402000F */ addiu $v0, $zero, 0xf +/* A96540 80242E00 A602008E */ sh $v0, 0x8e($s0) +/* A96544 80242E04 24020032 */ addiu $v0, $zero, 0x32 +/* A96548 80242E08 08090BB8 */ j .L80242EE0 +/* A9654C 80242E0C AE030028 */ sw $v1, 0x28($s0) +.L80242E10: +/* A96550 80242E10 8E450024 */ lw $a1, 0x24($s2) +/* A96554 80242E14 8E460028 */ lw $a2, 0x28($s2) +/* A96558 80242E18 0C09074C */ jal func_80241D30_A95470 +/* A9655C 80242E1C 0260382D */ daddu $a3, $s3, $zero +/* A96560 80242E20 24030001 */ addiu $v1, $zero, 1 +/* A96564 80242E24 1443002F */ bne $v0, $v1, .L80242EE4 +/* A96568 80242E28 00000000 */ nop +/* A9656C 80242E2C 8602008C */ lh $v0, 0x8c($s0) +/* A96570 80242E30 1440002C */ bnez $v0, .L80242EE4 +/* A96574 80242E34 0200202D */ daddu $a0, $s0, $zero +/* A96578 80242E38 240520D4 */ addiu $a1, $zero, 0x20d4 +/* A9657C 80242E3C 0C012530 */ jal func_800494C0 +/* A96580 80242E40 0000302D */ daddu $a2, $zero, $zero +/* A96584 80242E44 27A4002C */ addiu $a0, $sp, 0x2c +/* A96588 80242E48 27A50030 */ addiu $a1, $sp, 0x30 +/* A9658C 80242E4C 3C0641F0 */ lui $a2, 0x41f0 +/* A96590 80242E50 C6020034 */ lwc1 $f2, 0x34($s0) +/* A96594 80242E54 3C014387 */ lui $at, 0x4387 +/* A96598 80242E58 44810000 */ mtc1 $at, $f0 +/* A9659C 80242E5C 8E2200CC */ lw $v0, 0xcc($s1) +/* A965A0 80242E60 C614003C */ lwc1 $f20, 0x3c($s0) +/* A965A4 80242E64 46020001 */ sub.s $f0, $f0, $f2 +/* A965A8 80242E68 3C0141E8 */ lui $at, 0x41e8 +/* A965AC 80242E6C 44812000 */ mtc1 $at, $f4 +/* A965B0 80242E70 C6060038 */ lwc1 $f6, 0x38($s0) +/* A965B4 80242E74 4604A500 */ add.s $f20, $f20, $f4 +/* A965B8 80242E78 3C013F80 */ lui $at, 0x3f80 +/* A965BC 80242E7C 44811000 */ mtc1 $at, $f2 +/* A965C0 80242E80 44070000 */ mfc1 $a3, $f0 +/* A965C4 80242E84 C6000040 */ lwc1 $f0, 0x40($s0) +/* A965C8 80242E88 8C420020 */ lw $v0, 0x20($v0) +/* A965CC 80242E8C 46020000 */ add.s $f0, $f0, $f2 +/* A965D0 80242E90 E7A6002C */ swc1 $f6, 0x2c($sp) +/* A965D4 80242E94 AE020028 */ sw $v0, 0x28($s0) +/* A965D8 80242E98 0C00A7E7 */ jal add_vec2D_polar +/* A965DC 80242E9C E7A00030 */ swc1 $f0, 0x30($sp) +/* A965E0 80242EA0 0000202D */ daddu $a0, $zero, $zero +/* A965E4 80242EA4 4406A000 */ mfc1 $a2, $f20 +/* A965E8 80242EA8 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A965EC 80242EAC C7A20030 */ lwc1 $f2, 0x30($sp) +/* A965F0 80242EB0 44050000 */ mfc1 $a1, $f0 +/* A965F4 80242EB4 44071000 */ mfc1 $a3, $f2 +/* A965F8 80242EB8 3C013DCC */ lui $at, 0x3dcc +/* A965FC 80242EBC 3421CCCD */ ori $at, $at, 0xcccd +/* A96600 80242EC0 44810000 */ mtc1 $at, $f0 +/* A96604 80242EC4 2402000D */ addiu $v0, $zero, 0xd +/* A96608 80242EC8 AFA20014 */ sw $v0, 0x14($sp) +/* A9660C 80242ECC 0C01BFEC */ jal func_8006FFB0 +/* A96610 80242ED0 E7A00010 */ swc1 $f0, 0x10($sp) +/* A96614 80242ED4 2402000F */ addiu $v0, $zero, 0xf +/* A96618 80242ED8 A602008E */ sh $v0, 0x8e($s0) +/* A9661C 80242EDC 24020016 */ addiu $v0, $zero, 0x16 +.L80242EE0: +/* A96620 80242EE0 AE820070 */ sw $v0, 0x70($s4) +.L80242EE4: +/* A96624 80242EE4 8FBF004C */ lw $ra, 0x4c($sp) +/* A96628 80242EE8 8FB40048 */ lw $s4, 0x48($sp) +/* A9662C 80242EEC 8FB30044 */ lw $s3, 0x44($sp) +/* A96630 80242EF0 8FB20040 */ lw $s2, 0x40($sp) +/* A96634 80242EF4 8FB1003C */ lw $s1, 0x3c($sp) +/* A96638 80242EF8 8FB00038 */ lw $s0, 0x38($sp) +/* A9663C 80242EFC D7B40050 */ ldc1 $f20, 0x50($sp) +/* A96640 80242F00 03E00008 */ jr $ra +/* A96644 80242F04 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s index e62b306192..7e79c80029 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80242F74_A966B4.s @@ -25,7 +25,7 @@ glabel func_80242F74_A966B4 /* A96704 80242FC4 0260202D */ daddu $a0, $s3, $zero /* A96708 80242FC8 8E250024 */ lw $a1, 0x24($s1) /* A9670C 80242FCC 8E260028 */ lw $a2, 0x28($s1) -/* A96710 80242FD0 0C09074C */ jal func_80241D30 +/* A96710 80242FD0 0C09074C */ jal func_80241D30_A95470 /* A96714 80242FD4 0280382D */ daddu $a3, $s4, $zero /* A96718 80242FD8 0040882D */ daddu $s1, $v0, $zero /* A9671C 80242FDC 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8.s deleted file mode 100644 index 14ebbfa540..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430A8 -/* A967E8 802430A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A967EC 802430AC AFB20018 */ sw $s2, 0x18($sp) -/* A967F0 802430B0 0080902D */ daddu $s2, $a0, $zero -/* A967F4 802430B4 AFBF001C */ sw $ra, 0x1c($sp) -/* A967F8 802430B8 AFB10014 */ sw $s1, 0x14($sp) -/* A967FC 802430BC AFB00010 */ sw $s0, 0x10($sp) -/* A96800 802430C0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A96804 802430C4 8E500148 */ lw $s0, 0x148($s2) -/* A96808 802430C8 0C00EABB */ jal get_npc_unsafe -/* A9680C 802430CC 86040008 */ lh $a0, 8($s0) -/* A96810 802430D0 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A96814 802430D4 46806320 */ cvt.s.w $f12, $f12 -/* A96818 802430D8 0040882D */ daddu $s1, $v0, $zero -/* A9681C 802430DC C6140070 */ lwc1 $f20, 0x70($s0) -/* A96820 802430E0 4680A520 */ cvt.s.w $f20, $f20 -/* A96824 802430E4 3C014059 */ lui $at, 0x4059 -/* A96828 802430E8 44810800 */ mtc1 $at, $f1 -/* A9682C 802430EC 44800000 */ mtc1 $zero, $f0 -/* A96830 802430F0 4600A521 */ cvt.d.s $f20, $f20 -/* A96834 802430F4 4620A503 */ div.d $f20, $f20, $f0 -/* A96838 802430F8 0C00A8BB */ jal sin_deg -/* A9683C 802430FC 4620A520 */ cvt.s.d $f20, $f20 -/* A96840 80243100 3C014018 */ lui $at, 0x4018 -/* A96844 80243104 44811800 */ mtc1 $at, $f3 -/* A96848 80243108 44801000 */ mtc1 $zero, $f2 -/* A9684C 8024310C 46000021 */ cvt.d.s $f0, $f0 -/* A96850 80243110 46220002 */ mul.d $f0, $f0, $f2 -/* A96854 80243114 00000000 */ nop -/* A96858 80243118 4600A0A1 */ cvt.d.s $f2, $f20 -/* A9685C 8024311C 46201080 */ add.d $f2, $f2, $f0 -/* A96860 80243120 462010A0 */ cvt.s.d $f2, $f2 -/* A96864 80243124 E622003C */ swc1 $f2, 0x3c($s1) -/* A96868 80243128 8E02006C */ lw $v0, 0x6c($s0) -/* A9686C 8024312C 2442000A */ addiu $v0, $v0, 0xa -/* A96870 80243130 44826000 */ mtc1 $v0, $f12 -/* A96874 80243134 00000000 */ nop -/* A96878 80243138 0C00A6C9 */ jal clamp_angle -/* A9687C 8024313C 46806320 */ cvt.s.w $f12, $f12 -/* A96880 80243140 4600010D */ trunc.w.s $f4, $f0 -/* A96884 80243144 E604006C */ swc1 $f4, 0x6c($s0) -/* A96888 80243148 9622008E */ lhu $v0, 0x8e($s1) -/* A9688C 8024314C 2442FFFF */ addiu $v0, $v0, -1 -/* A96890 80243150 A622008E */ sh $v0, 0x8e($s1) -/* A96894 80243154 00021400 */ sll $v0, $v0, 0x10 -/* A96898 80243158 1C400008 */ bgtz $v0, .L8024317C -/* A9689C 8024315C 00000000 */ nop -/* A968A0 80243160 8E0200CC */ lw $v0, 0xcc($s0) -/* A968A4 80243164 8C430000 */ lw $v1, ($v0) -/* A968A8 80243168 24020003 */ addiu $v0, $zero, 3 -/* A968AC 8024316C A622008E */ sh $v0, 0x8e($s1) -/* A968B0 80243170 24020032 */ addiu $v0, $zero, 0x32 -/* A968B4 80243174 AE230028 */ sw $v1, 0x28($s1) -/* A968B8 80243178 AE420070 */ sw $v0, 0x70($s2) -.L8024317C: -/* A968BC 8024317C 8FBF001C */ lw $ra, 0x1c($sp) -/* A968C0 80243180 8FB20018 */ lw $s2, 0x18($sp) -/* A968C4 80243184 8FB10014 */ lw $s1, 0x14($sp) -/* A968C8 80243188 8FB00010 */ lw $s0, 0x10($sp) -/* A968CC 8024318C D7B40020 */ ldc1 $f20, 0x20($sp) -/* A968D0 80243190 03E00008 */ jr $ra -/* A968D4 80243194 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s new file mode 100644 index 0000000000..02b61c6ca2 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_802430A8_A967E8.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802430A8_A967E8 +/* A967E8 802430A8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A967EC 802430AC AFB20018 */ sw $s2, 0x18($sp) +/* A967F0 802430B0 0080902D */ daddu $s2, $a0, $zero +/* A967F4 802430B4 AFBF001C */ sw $ra, 0x1c($sp) +/* A967F8 802430B8 AFB10014 */ sw $s1, 0x14($sp) +/* A967FC 802430BC AFB00010 */ sw $s0, 0x10($sp) +/* A96800 802430C0 F7B40020 */ sdc1 $f20, 0x20($sp) +/* A96804 802430C4 8E500148 */ lw $s0, 0x148($s2) +/* A96808 802430C8 0C00EABB */ jal get_npc_unsafe +/* A9680C 802430CC 86040008 */ lh $a0, 8($s0) +/* A96810 802430D0 C60C006C */ lwc1 $f12, 0x6c($s0) +/* A96814 802430D4 46806320 */ cvt.s.w $f12, $f12 +/* A96818 802430D8 0040882D */ daddu $s1, $v0, $zero +/* A9681C 802430DC C6140070 */ lwc1 $f20, 0x70($s0) +/* A96820 802430E0 4680A520 */ cvt.s.w $f20, $f20 +/* A96824 802430E4 3C014059 */ lui $at, 0x4059 +/* A96828 802430E8 44810800 */ mtc1 $at, $f1 +/* A9682C 802430EC 44800000 */ mtc1 $zero, $f0 +/* A96830 802430F0 4600A521 */ cvt.d.s $f20, $f20 +/* A96834 802430F4 4620A503 */ div.d $f20, $f20, $f0 +/* A96838 802430F8 0C00A8BB */ jal sin_deg +/* A9683C 802430FC 4620A520 */ cvt.s.d $f20, $f20 +/* A96840 80243100 3C014018 */ lui $at, 0x4018 +/* A96844 80243104 44811800 */ mtc1 $at, $f3 +/* A96848 80243108 44801000 */ mtc1 $zero, $f2 +/* A9684C 8024310C 46000021 */ cvt.d.s $f0, $f0 +/* A96850 80243110 46220002 */ mul.d $f0, $f0, $f2 +/* A96854 80243114 00000000 */ nop +/* A96858 80243118 4600A0A1 */ cvt.d.s $f2, $f20 +/* A9685C 8024311C 46201080 */ add.d $f2, $f2, $f0 +/* A96860 80243120 462010A0 */ cvt.s.d $f2, $f2 +/* A96864 80243124 E622003C */ swc1 $f2, 0x3c($s1) +/* A96868 80243128 8E02006C */ lw $v0, 0x6c($s0) +/* A9686C 8024312C 2442000A */ addiu $v0, $v0, 0xa +/* A96870 80243130 44826000 */ mtc1 $v0, $f12 +/* A96874 80243134 00000000 */ nop +/* A96878 80243138 0C00A6C9 */ jal clamp_angle +/* A9687C 8024313C 46806320 */ cvt.s.w $f12, $f12 +/* A96880 80243140 4600010D */ trunc.w.s $f4, $f0 +/* A96884 80243144 E604006C */ swc1 $f4, 0x6c($s0) +/* A96888 80243148 9622008E */ lhu $v0, 0x8e($s1) +/* A9688C 8024314C 2442FFFF */ addiu $v0, $v0, -1 +/* A96890 80243150 A622008E */ sh $v0, 0x8e($s1) +/* A96894 80243154 00021400 */ sll $v0, $v0, 0x10 +/* A96898 80243158 1C400008 */ bgtz $v0, .L8024317C +/* A9689C 8024315C 00000000 */ nop +/* A968A0 80243160 8E0200CC */ lw $v0, 0xcc($s0) +/* A968A4 80243164 8C430000 */ lw $v1, ($v0) +/* A968A8 80243168 24020003 */ addiu $v0, $zero, 3 +/* A968AC 8024316C A622008E */ sh $v0, 0x8e($s1) +/* A968B0 80243170 24020032 */ addiu $v0, $zero, 0x32 +/* A968B4 80243174 AE230028 */ sw $v1, 0x28($s1) +/* A968B8 80243178 AE420070 */ sw $v0, 0x70($s2) +.L8024317C: +/* A968BC 8024317C 8FBF001C */ lw $ra, 0x1c($sp) +/* A968C0 80243180 8FB20018 */ lw $s2, 0x18($sp) +/* A968C4 80243184 8FB10014 */ lw $s1, 0x14($sp) +/* A968C8 80243188 8FB00010 */ lw $s0, 0x10($sp) +/* A968CC 8024318C D7B40020 */ ldc1 $f20, 0x20($sp) +/* A968D0 80243190 03E00008 */ jr $ra +/* A968D4 80243194 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198.s deleted file mode 100644 index b21c6b04f2..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243198 -/* A968D8 80243198 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A968DC 8024319C AFB20018 */ sw $s2, 0x18($sp) -/* A968E0 802431A0 0080902D */ daddu $s2, $a0, $zero -/* A968E4 802431A4 AFBF001C */ sw $ra, 0x1c($sp) -/* A968E8 802431A8 AFB10014 */ sw $s1, 0x14($sp) -/* A968EC 802431AC AFB00010 */ sw $s0, 0x10($sp) -/* A968F0 802431B0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A968F4 802431B4 8E500148 */ lw $s0, 0x148($s2) -/* A968F8 802431B8 0C00EABB */ jal get_npc_unsafe -/* A968FC 802431BC 86040008 */ lh $a0, 8($s0) -/* A96900 802431C0 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A96904 802431C4 46806320 */ cvt.s.w $f12, $f12 -/* A96908 802431C8 0040882D */ daddu $s1, $v0, $zero -/* A9690C 802431CC C6140070 */ lwc1 $f20, 0x70($s0) -/* A96910 802431D0 4680A520 */ cvt.s.w $f20, $f20 -/* A96914 802431D4 3C014059 */ lui $at, 0x4059 -/* A96918 802431D8 44810800 */ mtc1 $at, $f1 -/* A9691C 802431DC 44800000 */ mtc1 $zero, $f0 -/* A96920 802431E0 4600A521 */ cvt.d.s $f20, $f20 -/* A96924 802431E4 4620A503 */ div.d $f20, $f20, $f0 -/* A96928 802431E8 0C00A8BB */ jal sin_deg -/* A9692C 802431EC 4620A520 */ cvt.s.d $f20, $f20 -/* A96930 802431F0 3C014018 */ lui $at, 0x4018 -/* A96934 802431F4 44811800 */ mtc1 $at, $f3 -/* A96938 802431F8 44801000 */ mtc1 $zero, $f2 -/* A9693C 802431FC 46000021 */ cvt.d.s $f0, $f0 -/* A96940 80243200 46220002 */ mul.d $f0, $f0, $f2 -/* A96944 80243204 00000000 */ nop -/* A96948 80243208 4600A0A1 */ cvt.d.s $f2, $f20 -/* A9694C 8024320C 46201080 */ add.d $f2, $f2, $f0 -/* A96950 80243210 462010A0 */ cvt.s.d $f2, $f2 -/* A96954 80243214 E622003C */ swc1 $f2, 0x3c($s1) -/* A96958 80243218 8E02006C */ lw $v0, 0x6c($s0) -/* A9695C 8024321C 2442000A */ addiu $v0, $v0, 0xa -/* A96960 80243220 44826000 */ mtc1 $v0, $f12 -/* A96964 80243224 00000000 */ nop -/* A96968 80243228 0C00A6C9 */ jal clamp_angle -/* A9696C 8024322C 46806320 */ cvt.s.w $f12, $f12 -/* A96970 80243230 4600010D */ trunc.w.s $f4, $f0 -/* A96974 80243234 E604006C */ swc1 $f4, 0x6c($s0) -/* A96978 80243238 9622008E */ lhu $v0, 0x8e($s1) -/* A9697C 8024323C 2442FFFF */ addiu $v0, $v0, -1 -/* A96980 80243240 A622008E */ sh $v0, 0x8e($s1) -/* A96984 80243244 00021400 */ sll $v0, $v0, 0x10 -/* A96988 80243248 1C400002 */ bgtz $v0, .L80243254 -/* A9698C 8024324C 2402000A */ addiu $v0, $zero, 0xa -/* A96990 80243250 AE420070 */ sw $v0, 0x70($s2) -.L80243254: -/* A96994 80243254 8FBF001C */ lw $ra, 0x1c($sp) -/* A96998 80243258 8FB20018 */ lw $s2, 0x18($sp) -/* A9699C 8024325C 8FB10014 */ lw $s1, 0x14($sp) -/* A969A0 80243260 8FB00010 */ lw $s0, 0x10($sp) -/* A969A4 80243264 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A969A8 80243268 03E00008 */ jr $ra -/* A969AC 8024326C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s new file mode 100644 index 0000000000..114d51b2f4 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243198_A968D8.s @@ -0,0 +1,59 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243198_A968D8 +/* A968D8 80243198 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A968DC 8024319C AFB20018 */ sw $s2, 0x18($sp) +/* A968E0 802431A0 0080902D */ daddu $s2, $a0, $zero +/* A968E4 802431A4 AFBF001C */ sw $ra, 0x1c($sp) +/* A968E8 802431A8 AFB10014 */ sw $s1, 0x14($sp) +/* A968EC 802431AC AFB00010 */ sw $s0, 0x10($sp) +/* A968F0 802431B0 F7B40020 */ sdc1 $f20, 0x20($sp) +/* A968F4 802431B4 8E500148 */ lw $s0, 0x148($s2) +/* A968F8 802431B8 0C00EABB */ jal get_npc_unsafe +/* A968FC 802431BC 86040008 */ lh $a0, 8($s0) +/* A96900 802431C0 C60C006C */ lwc1 $f12, 0x6c($s0) +/* A96904 802431C4 46806320 */ cvt.s.w $f12, $f12 +/* A96908 802431C8 0040882D */ daddu $s1, $v0, $zero +/* A9690C 802431CC C6140070 */ lwc1 $f20, 0x70($s0) +/* A96910 802431D0 4680A520 */ cvt.s.w $f20, $f20 +/* A96914 802431D4 3C014059 */ lui $at, 0x4059 +/* A96918 802431D8 44810800 */ mtc1 $at, $f1 +/* A9691C 802431DC 44800000 */ mtc1 $zero, $f0 +/* A96920 802431E0 4600A521 */ cvt.d.s $f20, $f20 +/* A96924 802431E4 4620A503 */ div.d $f20, $f20, $f0 +/* A96928 802431E8 0C00A8BB */ jal sin_deg +/* A9692C 802431EC 4620A520 */ cvt.s.d $f20, $f20 +/* A96930 802431F0 3C014018 */ lui $at, 0x4018 +/* A96934 802431F4 44811800 */ mtc1 $at, $f3 +/* A96938 802431F8 44801000 */ mtc1 $zero, $f2 +/* A9693C 802431FC 46000021 */ cvt.d.s $f0, $f0 +/* A96940 80243200 46220002 */ mul.d $f0, $f0, $f2 +/* A96944 80243204 00000000 */ nop +/* A96948 80243208 4600A0A1 */ cvt.d.s $f2, $f20 +/* A9694C 8024320C 46201080 */ add.d $f2, $f2, $f0 +/* A96950 80243210 462010A0 */ cvt.s.d $f2, $f2 +/* A96954 80243214 E622003C */ swc1 $f2, 0x3c($s1) +/* A96958 80243218 8E02006C */ lw $v0, 0x6c($s0) +/* A9695C 8024321C 2442000A */ addiu $v0, $v0, 0xa +/* A96960 80243220 44826000 */ mtc1 $v0, $f12 +/* A96964 80243224 00000000 */ nop +/* A96968 80243228 0C00A6C9 */ jal clamp_angle +/* A9696C 8024322C 46806320 */ cvt.s.w $f12, $f12 +/* A96970 80243230 4600010D */ trunc.w.s $f4, $f0 +/* A96974 80243234 E604006C */ swc1 $f4, 0x6c($s0) +/* A96978 80243238 9622008E */ lhu $v0, 0x8e($s1) +/* A9697C 8024323C 2442FFFF */ addiu $v0, $v0, -1 +/* A96980 80243240 A622008E */ sh $v0, 0x8e($s1) +/* A96984 80243244 00021400 */ sll $v0, $v0, 0x10 +/* A96988 80243248 1C400002 */ bgtz $v0, .L80243254 +/* A9698C 8024324C 2402000A */ addiu $v0, $zero, 0xa +/* A96990 80243250 AE420070 */ sw $v0, 0x70($s2) +.L80243254: +/* A96994 80243254 8FBF001C */ lw $ra, 0x1c($sp) +/* A96998 80243258 8FB20018 */ lw $s2, 0x18($sp) +/* A9699C 8024325C 8FB10014 */ lw $s1, 0x14($sp) +/* A969A0 80243260 8FB00010 */ lw $s0, 0x10($sp) +/* A969A4 80243264 D7B40020 */ ldc1 $f20, 0x20($sp) +/* A969A8 80243268 03E00008 */ jr $ra +/* A969AC 8024326C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270.s deleted file mode 100644 index f14bb3f54d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270.s +++ /dev/null @@ -1,173 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243270 -/* A969B0 80243270 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A969B4 80243274 AFB40040 */ sw $s4, 0x40($sp) -/* A969B8 80243278 0080A02D */ daddu $s4, $a0, $zero -/* A969BC 8024327C AFBF0048 */ sw $ra, 0x48($sp) -/* A969C0 80243280 AFB50044 */ sw $s5, 0x44($sp) -/* A969C4 80243284 AFB3003C */ sw $s3, 0x3c($sp) -/* A969C8 80243288 AFB20038 */ sw $s2, 0x38($sp) -/* A969CC 8024328C AFB10034 */ sw $s1, 0x34($sp) -/* A969D0 80243290 AFB00030 */ sw $s0, 0x30($sp) -/* A969D4 80243294 8E920148 */ lw $s2, 0x148($s4) -/* A969D8 80243298 86440008 */ lh $a0, 8($s2) -/* A969DC 8024329C 8E90000C */ lw $s0, 0xc($s4) -/* A969E0 802432A0 0C00EABB */ jal get_npc_unsafe -/* A969E4 802432A4 00A0882D */ daddu $s1, $a1, $zero -/* A969E8 802432A8 0280202D */ daddu $a0, $s4, $zero -/* A969EC 802432AC 8E050000 */ lw $a1, ($s0) -/* A969F0 802432B0 0C0B1EAF */ jal get_variable -/* A969F4 802432B4 0040A82D */ daddu $s5, $v0, $zero -/* A969F8 802432B8 AFA00010 */ sw $zero, 0x10($sp) -/* A969FC 802432BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A00 802432C0 8C630030 */ lw $v1, 0x30($v1) -/* A96A04 802432C4 AFA30014 */ sw $v1, 0x14($sp) -/* A96A08 802432C8 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A0C 802432CC 8C63001C */ lw $v1, 0x1c($v1) -/* A96A10 802432D0 AFA30018 */ sw $v1, 0x18($sp) -/* A96A14 802432D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A18 802432D8 8C630024 */ lw $v1, 0x24($v1) -/* A96A1C 802432DC AFA3001C */ sw $v1, 0x1c($sp) -/* A96A20 802432E0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A24 802432E4 8C630028 */ lw $v1, 0x28($v1) -/* A96A28 802432E8 27B30010 */ addiu $s3, $sp, 0x10 -/* A96A2C 802432EC AFA30020 */ sw $v1, 0x20($sp) -/* A96A30 802432F0 8E4300D0 */ lw $v1, 0xd0($s2) -/* A96A34 802432F4 3C0142F0 */ lui $at, 0x42f0 -/* A96A38 802432F8 44810000 */ mtc1 $at, $f0 -/* A96A3C 802432FC 8C63002C */ lw $v1, 0x2c($v1) -/* A96A40 80243300 0040802D */ daddu $s0, $v0, $zero -/* A96A44 80243304 E7A00028 */ swc1 $f0, 0x28($sp) -/* A96A48 80243308 A7A0002C */ sh $zero, 0x2c($sp) -/* A96A4C 8024330C 12200019 */ beqz $s1, .L80243374 -/* A96A50 80243310 AFA30024 */ sw $v1, 0x24($sp) -/* A96A54 80243314 8EA20000 */ lw $v0, ($s5) -/* A96A58 80243318 2403FDFF */ addiu $v1, $zero, -0x201 -/* A96A5C 8024331C 00431024 */ and $v0, $v0, $v1 -/* A96A60 80243320 34420008 */ ori $v0, $v0, 8 -/* A96A64 80243324 3C030020 */ lui $v1, 0x20 -/* A96A68 80243328 00431025 */ or $v0, $v0, $v1 -/* A96A6C 8024332C AEA20000 */ sw $v0, ($s5) -/* A96A70 80243330 8E420000 */ lw $v0, ($s2) -/* A96A74 80243334 00431025 */ or $v0, $v0, $v1 -/* A96A78 80243338 AE420000 */ sw $v0, ($s2) -/* A96A7C 8024333C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* A96A80 80243340 3C014059 */ lui $at, 0x4059 -/* A96A84 80243344 44811800 */ mtc1 $at, $f3 -/* A96A88 80243348 44801000 */ mtc1 $zero, $f2 -/* A96A8C 8024334C 46000021 */ cvt.d.s $f0, $f0 -/* A96A90 80243350 46220002 */ mul.d $f0, $f0, $f2 -/* A96A94 80243354 00000000 */ nop -/* A96A98 80243358 2402000A */ addiu $v0, $zero, 0xa -/* A96A9C 8024335C AE40006C */ sw $zero, 0x6c($s2) -/* A96AA0 80243360 AE400074 */ sw $zero, 0x74($s2) -/* A96AA4 80243364 4620010D */ trunc.w.d $f4, $f0 -/* A96AA8 80243368 E6440070 */ swc1 $f4, 0x70($s2) -/* A96AAC 8024336C A6A0008E */ sh $zero, 0x8e($s5) -/* A96AB0 80243370 AE820070 */ sw $v0, 0x70($s4) -.L80243374: -/* A96AB4 80243374 2402FFFB */ addiu $v0, $zero, -5 -/* A96AB8 80243378 A2A200AB */ sb $v0, 0xab($s5) -/* A96ABC 8024337C 8E4300B0 */ lw $v1, 0xb0($s2) -/* A96AC0 80243380 30620004 */ andi $v0, $v1, 4 -/* A96AC4 80243384 10400007 */ beqz $v0, .L802433A4 -/* A96AC8 80243388 00000000 */ nop -/* A96ACC 8024338C 824200B4 */ lb $v0, 0xb4($s2) -/* A96AD0 80243390 14400053 */ bnez $v0, .L802434E0 -/* A96AD4 80243394 0000102D */ daddu $v0, $zero, $zero -/* A96AD8 80243398 2402FFFB */ addiu $v0, $zero, -5 -/* A96ADC 8024339C 00621024 */ and $v0, $v1, $v0 -/* A96AE0 802433A0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802433A4: -/* A96AE4 802433A4 8E820070 */ lw $v0, 0x70($s4) -/* A96AE8 802433A8 2443FFF6 */ addiu $v1, $v0, -0xa -/* A96AEC 802433AC 2C620029 */ sltiu $v0, $v1, 0x29 -/* A96AF0 802433B0 1040004A */ beqz $v0, .L802434DC -/* A96AF4 802433B4 00031080 */ sll $v0, $v1, 2 -/* A96AF8 802433B8 3C018024 */ lui $at, 0x8024 -/* A96AFC 802433BC 00220821 */ addu $at, $at, $v0 -/* A96B00 802433C0 8C225DA0 */ lw $v0, 0x5da0($at) -/* A96B04 802433C4 00400008 */ jr $v0 -/* A96B08 802433C8 00000000 */ nop -/* A96B0C 802433CC 0280202D */ daddu $a0, $s4, $zero -/* A96B10 802433D0 0200282D */ daddu $a1, $s0, $zero -/* A96B14 802433D4 0C090904 */ jal func_80242410_A95B50 -/* A96B18 802433D8 0260302D */ daddu $a2, $s3, $zero -/* A96B1C 802433DC 0280202D */ daddu $a0, $s4, $zero -/* A96B20 802433E0 0200282D */ daddu $a1, $s0, $zero -/* A96B24 802433E4 0C090913 */ jal func_8024244C -/* A96B28 802433E8 0260302D */ daddu $a2, $s3, $zero -/* A96B2C 802433EC 08090D38 */ j .L802434E0 -/* A96B30 802433F0 0000102D */ daddu $v0, $zero, $zero -/* A96B34 802433F4 0280202D */ daddu $a0, $s4, $zero -/* A96B38 802433F8 0200282D */ daddu $a1, $s0, $zero -/* A96B3C 802433FC 0C090976 */ jal func_802425D8 -/* A96B40 80243400 0260302D */ daddu $a2, $s3, $zero -/* A96B44 80243404 8E830070 */ lw $v1, 0x70($s4) -/* A96B48 80243408 24020010 */ addiu $v0, $zero, 0x10 -/* A96B4C 8024340C 14620034 */ bne $v1, $v0, .L802434E0 -/* A96B50 80243410 0000102D */ daddu $v0, $zero, $zero -/* A96B54 80243414 0280202D */ daddu $a0, $s4, $zero -/* A96B58 80243418 0200282D */ daddu $a1, $s0, $zero -/* A96B5C 8024341C 0C090A72 */ jal func_802429C8 -/* A96B60 80243420 0260302D */ daddu $a2, $s3, $zero -/* A96B64 80243424 8E830070 */ lw $v1, 0x70($s4) -/* A96B68 80243428 24020011 */ addiu $v0, $zero, 0x11 -/* A96B6C 8024342C 1462002C */ bne $v1, $v0, .L802434E0 -/* A96B70 80243430 0000102D */ daddu $v0, $zero, $zero -/* A96B74 80243434 0280202D */ daddu $a0, $s4, $zero -/* A96B78 80243438 0200282D */ daddu $a1, $s0, $zero -/* A96B7C 8024343C 0C090AAF */ jal func_80242ABC -/* A96B80 80243440 0260302D */ daddu $a2, $s3, $zero -/* A96B84 80243444 08090D38 */ j .L802434E0 -/* A96B88 80243448 0000102D */ daddu $v0, $zero, $zero -/* A96B8C 8024344C 0280202D */ daddu $a0, $s4, $zero -/* A96B90 80243450 0200282D */ daddu $a1, $s0, $zero -/* A96B94 80243454 0C090B40 */ jal func_80242D00 -/* A96B98 80243458 0260302D */ daddu $a2, $s3, $zero -/* A96B9C 8024345C 08090D38 */ j .L802434E0 -/* A96BA0 80243460 0000102D */ daddu $v0, $zero, $zero -/* A96BA4 80243464 0280202D */ daddu $a0, $s4, $zero -/* A96BA8 80243468 0200282D */ daddu $a1, $s0, $zero -/* A96BAC 8024346C 0C090B4F */ jal func_80242D3C -/* A96BB0 80243470 0260302D */ daddu $a2, $s3, $zero -/* A96BB4 80243474 08090D38 */ j .L802434E0 -/* A96BB8 80243478 0000102D */ daddu $v0, $zero, $zero -/* A96BBC 8024347C 0280202D */ daddu $a0, $s4, $zero -/* A96BC0 80243480 0200282D */ daddu $a1, $s0, $zero -/* A96BC4 80243484 0C090BC2 */ jal func_80242F08 -/* A96BC8 80243488 0260302D */ daddu $a2, $s3, $zero -/* A96BCC 8024348C 08090D38 */ j .L802434E0 -/* A96BD0 80243490 0000102D */ daddu $v0, $zero, $zero -/* A96BD4 80243494 0280202D */ daddu $a0, $s4, $zero -/* A96BD8 80243498 0200282D */ daddu $a1, $s0, $zero -/* A96BDC 8024349C 0C090BDD */ jal func_80242F74 -/* A96BE0 802434A0 0260302D */ daddu $a2, $s3, $zero -/* A96BE4 802434A4 8E830070 */ lw $v1, 0x70($s4) -/* A96BE8 802434A8 24020018 */ addiu $v0, $zero, 0x18 -/* A96BEC 802434AC 1462000C */ bne $v1, $v0, .L802434E0 -/* A96BF0 802434B0 0000102D */ daddu $v0, $zero, $zero -/* A96BF4 802434B4 0280202D */ daddu $a0, $s4, $zero -/* A96BF8 802434B8 0200282D */ daddu $a1, $s0, $zero -/* A96BFC 802434BC 0C090C2A */ jal func_802430A8 -/* A96C00 802434C0 0260302D */ daddu $a2, $s3, $zero -/* A96C04 802434C4 08090D38 */ j .L802434E0 -/* A96C08 802434C8 0000102D */ daddu $v0, $zero, $zero -/* A96C0C 802434CC 0280202D */ daddu $a0, $s4, $zero -/* A96C10 802434D0 0200282D */ daddu $a1, $s0, $zero -/* A96C14 802434D4 0C090C66 */ jal func_80243198 -/* A96C18 802434D8 0260302D */ daddu $a2, $s3, $zero -.L802434DC: -/* A96C1C 802434DC 0000102D */ daddu $v0, $zero, $zero -.L802434E0: -/* A96C20 802434E0 8FBF0048 */ lw $ra, 0x48($sp) -/* A96C24 802434E4 8FB50044 */ lw $s5, 0x44($sp) -/* A96C28 802434E8 8FB40040 */ lw $s4, 0x40($sp) -/* A96C2C 802434EC 8FB3003C */ lw $s3, 0x3c($sp) -/* A96C30 802434F0 8FB20038 */ lw $s2, 0x38($sp) -/* A96C34 802434F4 8FB10034 */ lw $s1, 0x34($sp) -/* A96C38 802434F8 8FB00030 */ lw $s0, 0x30($sp) -/* A96C3C 802434FC 03E00008 */ jr $ra -/* A96C40 80243500 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s new file mode 100644 index 0000000000..ed187c39c2 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243270_A969B0.s @@ -0,0 +1,173 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243270_A969B0 +/* A969B0 80243270 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A969B4 80243274 AFB40040 */ sw $s4, 0x40($sp) +/* A969B8 80243278 0080A02D */ daddu $s4, $a0, $zero +/* A969BC 8024327C AFBF0048 */ sw $ra, 0x48($sp) +/* A969C0 80243280 AFB50044 */ sw $s5, 0x44($sp) +/* A969C4 80243284 AFB3003C */ sw $s3, 0x3c($sp) +/* A969C8 80243288 AFB20038 */ sw $s2, 0x38($sp) +/* A969CC 8024328C AFB10034 */ sw $s1, 0x34($sp) +/* A969D0 80243290 AFB00030 */ sw $s0, 0x30($sp) +/* A969D4 80243294 8E920148 */ lw $s2, 0x148($s4) +/* A969D8 80243298 86440008 */ lh $a0, 8($s2) +/* A969DC 8024329C 8E90000C */ lw $s0, 0xc($s4) +/* A969E0 802432A0 0C00EABB */ jal get_npc_unsafe +/* A969E4 802432A4 00A0882D */ daddu $s1, $a1, $zero +/* A969E8 802432A8 0280202D */ daddu $a0, $s4, $zero +/* A969EC 802432AC 8E050000 */ lw $a1, ($s0) +/* A969F0 802432B0 0C0B1EAF */ jal get_variable +/* A969F4 802432B4 0040A82D */ daddu $s5, $v0, $zero +/* A969F8 802432B8 AFA00010 */ sw $zero, 0x10($sp) +/* A969FC 802432BC 8E4300D0 */ lw $v1, 0xd0($s2) +/* A96A00 802432C0 8C630030 */ lw $v1, 0x30($v1) +/* A96A04 802432C4 AFA30014 */ sw $v1, 0x14($sp) +/* A96A08 802432C8 8E4300D0 */ lw $v1, 0xd0($s2) +/* A96A0C 802432CC 8C63001C */ lw $v1, 0x1c($v1) +/* A96A10 802432D0 AFA30018 */ sw $v1, 0x18($sp) +/* A96A14 802432D4 8E4300D0 */ lw $v1, 0xd0($s2) +/* A96A18 802432D8 8C630024 */ lw $v1, 0x24($v1) +/* A96A1C 802432DC AFA3001C */ sw $v1, 0x1c($sp) +/* A96A20 802432E0 8E4300D0 */ lw $v1, 0xd0($s2) +/* A96A24 802432E4 8C630028 */ lw $v1, 0x28($v1) +/* A96A28 802432E8 27B30010 */ addiu $s3, $sp, 0x10 +/* A96A2C 802432EC AFA30020 */ sw $v1, 0x20($sp) +/* A96A30 802432F0 8E4300D0 */ lw $v1, 0xd0($s2) +/* A96A34 802432F4 3C0142F0 */ lui $at, 0x42f0 +/* A96A38 802432F8 44810000 */ mtc1 $at, $f0 +/* A96A3C 802432FC 8C63002C */ lw $v1, 0x2c($v1) +/* A96A40 80243300 0040802D */ daddu $s0, $v0, $zero +/* A96A44 80243304 E7A00028 */ swc1 $f0, 0x28($sp) +/* A96A48 80243308 A7A0002C */ sh $zero, 0x2c($sp) +/* A96A4C 8024330C 12200019 */ beqz $s1, .L80243374 +/* A96A50 80243310 AFA30024 */ sw $v1, 0x24($sp) +/* A96A54 80243314 8EA20000 */ lw $v0, ($s5) +/* A96A58 80243318 2403FDFF */ addiu $v1, $zero, -0x201 +/* A96A5C 8024331C 00431024 */ and $v0, $v0, $v1 +/* A96A60 80243320 34420008 */ ori $v0, $v0, 8 +/* A96A64 80243324 3C030020 */ lui $v1, 0x20 +/* A96A68 80243328 00431025 */ or $v0, $v0, $v1 +/* A96A6C 8024332C AEA20000 */ sw $v0, ($s5) +/* A96A70 80243330 8E420000 */ lw $v0, ($s2) +/* A96A74 80243334 00431025 */ or $v0, $v0, $v1 +/* A96A78 80243338 AE420000 */ sw $v0, ($s2) +/* A96A7C 8024333C C6A0003C */ lwc1 $f0, 0x3c($s5) +/* A96A80 80243340 3C014059 */ lui $at, 0x4059 +/* A96A84 80243344 44811800 */ mtc1 $at, $f3 +/* A96A88 80243348 44801000 */ mtc1 $zero, $f2 +/* A96A8C 8024334C 46000021 */ cvt.d.s $f0, $f0 +/* A96A90 80243350 46220002 */ mul.d $f0, $f0, $f2 +/* A96A94 80243354 00000000 */ nop +/* A96A98 80243358 2402000A */ addiu $v0, $zero, 0xa +/* A96A9C 8024335C AE40006C */ sw $zero, 0x6c($s2) +/* A96AA0 80243360 AE400074 */ sw $zero, 0x74($s2) +/* A96AA4 80243364 4620010D */ trunc.w.d $f4, $f0 +/* A96AA8 80243368 E6440070 */ swc1 $f4, 0x70($s2) +/* A96AAC 8024336C A6A0008E */ sh $zero, 0x8e($s5) +/* A96AB0 80243370 AE820070 */ sw $v0, 0x70($s4) +.L80243374: +/* A96AB4 80243374 2402FFFB */ addiu $v0, $zero, -5 +/* A96AB8 80243378 A2A200AB */ sb $v0, 0xab($s5) +/* A96ABC 8024337C 8E4300B0 */ lw $v1, 0xb0($s2) +/* A96AC0 80243380 30620004 */ andi $v0, $v1, 4 +/* A96AC4 80243384 10400007 */ beqz $v0, .L802433A4 +/* A96AC8 80243388 00000000 */ nop +/* A96ACC 8024338C 824200B4 */ lb $v0, 0xb4($s2) +/* A96AD0 80243390 14400053 */ bnez $v0, .L802434E0 +/* A96AD4 80243394 0000102D */ daddu $v0, $zero, $zero +/* A96AD8 80243398 2402FFFB */ addiu $v0, $zero, -5 +/* A96ADC 8024339C 00621024 */ and $v0, $v1, $v0 +/* A96AE0 802433A0 AE4200B0 */ sw $v0, 0xb0($s2) +.L802433A4: +/* A96AE4 802433A4 8E820070 */ lw $v0, 0x70($s4) +/* A96AE8 802433A8 2443FFF6 */ addiu $v1, $v0, -0xa +/* A96AEC 802433AC 2C620029 */ sltiu $v0, $v1, 0x29 +/* A96AF0 802433B0 1040004A */ beqz $v0, .L802434DC +/* A96AF4 802433B4 00031080 */ sll $v0, $v1, 2 +/* A96AF8 802433B8 3C018024 */ lui $at, 0x8024 +/* A96AFC 802433BC 00220821 */ addu $at, $at, $v0 +/* A96B00 802433C0 8C225DA0 */ lw $v0, 0x5da0($at) +/* A96B04 802433C4 00400008 */ jr $v0 +/* A96B08 802433C8 00000000 */ nop +/* A96B0C 802433CC 0280202D */ daddu $a0, $s4, $zero +/* A96B10 802433D0 0200282D */ daddu $a1, $s0, $zero +/* A96B14 802433D4 0C090904 */ jal func_80242410_A95B50 +/* A96B18 802433D8 0260302D */ daddu $a2, $s3, $zero +/* A96B1C 802433DC 0280202D */ daddu $a0, $s4, $zero +/* A96B20 802433E0 0200282D */ daddu $a1, $s0, $zero +/* A96B24 802433E4 0C090913 */ jal func_8024244C_A95B8C +/* A96B28 802433E8 0260302D */ daddu $a2, $s3, $zero +/* A96B2C 802433EC 08090D38 */ j .L802434E0 +/* A96B30 802433F0 0000102D */ daddu $v0, $zero, $zero +/* A96B34 802433F4 0280202D */ daddu $a0, $s4, $zero +/* A96B38 802433F8 0200282D */ daddu $a1, $s0, $zero +/* A96B3C 802433FC 0C090976 */ jal func_802425D8_A95D18 +/* A96B40 80243400 0260302D */ daddu $a2, $s3, $zero +/* A96B44 80243404 8E830070 */ lw $v1, 0x70($s4) +/* A96B48 80243408 24020010 */ addiu $v0, $zero, 0x10 +/* A96B4C 8024340C 14620034 */ bne $v1, $v0, .L802434E0 +/* A96B50 80243410 0000102D */ daddu $v0, $zero, $zero +/* A96B54 80243414 0280202D */ daddu $a0, $s4, $zero +/* A96B58 80243418 0200282D */ daddu $a1, $s0, $zero +/* A96B5C 8024341C 0C090A72 */ jal func_802429C8_A96108 +/* A96B60 80243420 0260302D */ daddu $a2, $s3, $zero +/* A96B64 80243424 8E830070 */ lw $v1, 0x70($s4) +/* A96B68 80243428 24020011 */ addiu $v0, $zero, 0x11 +/* A96B6C 8024342C 1462002C */ bne $v1, $v0, .L802434E0 +/* A96B70 80243430 0000102D */ daddu $v0, $zero, $zero +/* A96B74 80243434 0280202D */ daddu $a0, $s4, $zero +/* A96B78 80243438 0200282D */ daddu $a1, $s0, $zero +/* A96B7C 8024343C 0C090AAF */ jal func_80242ABC_A961FC +/* A96B80 80243440 0260302D */ daddu $a2, $s3, $zero +/* A96B84 80243444 08090D38 */ j .L802434E0 +/* A96B88 80243448 0000102D */ daddu $v0, $zero, $zero +/* A96B8C 8024344C 0280202D */ daddu $a0, $s4, $zero +/* A96B90 80243450 0200282D */ daddu $a1, $s0, $zero +/* A96B94 80243454 0C090B40 */ jal func_80242D00_A96440 +/* A96B98 80243458 0260302D */ daddu $a2, $s3, $zero +/* A96B9C 8024345C 08090D38 */ j .L802434E0 +/* A96BA0 80243460 0000102D */ daddu $v0, $zero, $zero +/* A96BA4 80243464 0280202D */ daddu $a0, $s4, $zero +/* A96BA8 80243468 0200282D */ daddu $a1, $s0, $zero +/* A96BAC 8024346C 0C090B4F */ jal func_80242D3C_A9647C +/* A96BB0 80243470 0260302D */ daddu $a2, $s3, $zero +/* A96BB4 80243474 08090D38 */ j .L802434E0 +/* A96BB8 80243478 0000102D */ daddu $v0, $zero, $zero +/* A96BBC 8024347C 0280202D */ daddu $a0, $s4, $zero +/* A96BC0 80243480 0200282D */ daddu $a1, $s0, $zero +/* A96BC4 80243484 0C090BC2 */ jal func_80242F08_A96648 +/* A96BC8 80243488 0260302D */ daddu $a2, $s3, $zero +/* A96BCC 8024348C 08090D38 */ j .L802434E0 +/* A96BD0 80243490 0000102D */ daddu $v0, $zero, $zero +/* A96BD4 80243494 0280202D */ daddu $a0, $s4, $zero +/* A96BD8 80243498 0200282D */ daddu $a1, $s0, $zero +/* A96BDC 8024349C 0C090BDD */ jal func_80242F74_A966B4 +/* A96BE0 802434A0 0260302D */ daddu $a2, $s3, $zero +/* A96BE4 802434A4 8E830070 */ lw $v1, 0x70($s4) +/* A96BE8 802434A8 24020018 */ addiu $v0, $zero, 0x18 +/* A96BEC 802434AC 1462000C */ bne $v1, $v0, .L802434E0 +/* A96BF0 802434B0 0000102D */ daddu $v0, $zero, $zero +/* A96BF4 802434B4 0280202D */ daddu $a0, $s4, $zero +/* A96BF8 802434B8 0200282D */ daddu $a1, $s0, $zero +/* A96BFC 802434BC 0C090C2A */ jal func_802430A8_A967E8 +/* A96C00 802434C0 0260302D */ daddu $a2, $s3, $zero +/* A96C04 802434C4 08090D38 */ j .L802434E0 +/* A96C08 802434C8 0000102D */ daddu $v0, $zero, $zero +/* A96C0C 802434CC 0280202D */ daddu $a0, $s4, $zero +/* A96C10 802434D0 0200282D */ daddu $a1, $s0, $zero +/* A96C14 802434D4 0C090C66 */ jal func_80243198_A968D8 +/* A96C18 802434D8 0260302D */ daddu $a2, $s3, $zero +.L802434DC: +/* A96C1C 802434DC 0000102D */ daddu $v0, $zero, $zero +.L802434E0: +/* A96C20 802434E0 8FBF0048 */ lw $ra, 0x48($sp) +/* A96C24 802434E4 8FB50044 */ lw $s5, 0x44($sp) +/* A96C28 802434E8 8FB40040 */ lw $s4, 0x40($sp) +/* A96C2C 802434EC 8FB3003C */ lw $s3, 0x3c($sp) +/* A96C30 802434F0 8FB20038 */ lw $s2, 0x38($sp) +/* A96C34 802434F4 8FB10034 */ lw $s1, 0x34($sp) +/* A96C38 802434F8 8FB00030 */ lw $s0, 0x30($sp) +/* A96C3C 802434FC 03E00008 */ jr $ra +/* A96C40 80243500 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504.s deleted file mode 100644 index afd0cde9f9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243504 -/* A96C44 80243504 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A96C48 80243508 3C05FE36 */ lui $a1, 0xfe36 -/* A96C4C 8024350C AFBF0010 */ sw $ra, 0x10($sp) -/* A96C50 80243510 8C820148 */ lw $v0, 0x148($a0) -/* A96C54 80243514 3C06800B */ lui $a2, 0x800b -/* A96C58 80243518 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A96C5C 8024351C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A96C60 80243520 00C23026 */ xor $a2, $a2, $v0 -/* A96C64 80243524 0C0B2026 */ jal set_variable -/* A96C68 80243528 2CC60001 */ sltiu $a2, $a2, 1 -/* A96C6C 8024352C 8FBF0010 */ lw $ra, 0x10($sp) -/* A96C70 80243530 24020002 */ addiu $v0, $zero, 2 -/* A96C74 80243534 03E00008 */ jr $ra -/* A96C78 80243538 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s new file mode 100644 index 0000000000..3c386d2a3b --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80243504_A96C44.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243504_A96C44 +/* A96C44 80243504 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A96C48 80243508 3C05FE36 */ lui $a1, 0xfe36 +/* A96C4C 8024350C AFBF0010 */ sw $ra, 0x10($sp) +/* A96C50 80243510 8C820148 */ lw $v0, 0x148($a0) +/* A96C54 80243514 3C06800B */ lui $a2, 0x800b +/* A96C58 80243518 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A96C5C 8024351C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A96C60 80243520 00C23026 */ xor $a2, $a2, $v0 +/* A96C64 80243524 0C0B2026 */ jal set_variable +/* A96C68 80243528 2CC60001 */ sltiu $a2, $a2, 1 +/* A96C6C 8024352C 8FBF0010 */ lw $ra, 0x10($sp) +/* A96C70 80243530 24020002 */ addiu $v0, $zero, 2 +/* A96C74 80243534 03E00008 */ jr $ra +/* A96C78 80243538 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C.s deleted file mode 100644 index 3847df783a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024353C -/* A96C7C 8024353C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A96C80 80243540 AFBF0014 */ sw $ra, 0x14($sp) -/* A96C84 80243544 AFB00010 */ sw $s0, 0x10($sp) -/* A96C88 80243548 8C900148 */ lw $s0, 0x148($a0) -/* A96C8C 8024354C 0C00EABB */ jal get_npc_unsafe -/* A96C90 80243550 86040008 */ lh $a0, 8($s0) -/* A96C94 80243554 0040202D */ daddu $a0, $v0, $zero -/* A96C98 80243558 8E03006C */ lw $v1, 0x6c($s0) -/* A96C9C 8024355C 24020002 */ addiu $v0, $zero, 2 -/* A96CA0 80243560 14620003 */ bne $v1, $v0, .L80243570 -/* A96CA4 80243564 00000000 */ nop -/* A96CA8 80243568 AC80001C */ sw $zero, 0x1c($a0) -/* A96CAC 8024356C AC800018 */ sw $zero, 0x18($a0) -.L80243570: -/* A96CB0 80243570 8FBF0014 */ lw $ra, 0x14($sp) -/* A96CB4 80243574 8FB00010 */ lw $s0, 0x10($sp) -/* A96CB8 80243578 24020002 */ addiu $v0, $zero, 2 -/* A96CBC 8024357C 03E00008 */ jr $ra -/* A96CC0 80243580 27BD0018 */ addiu $sp, $sp, 0x18 -/* A96CC4 80243584 00000000 */ nop -/* A96CC8 80243588 00000000 */ nop -/* A96CCC 8024358C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s new file mode 100644 index 0000000000..5fc487c5a7 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_8024353C_A96C7C.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024353C_A96C7C +/* A96C7C 8024353C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A96C80 80243540 AFBF0014 */ sw $ra, 0x14($sp) +/* A96C84 80243544 AFB00010 */ sw $s0, 0x10($sp) +/* A96C88 80243548 8C900148 */ lw $s0, 0x148($a0) +/* A96C8C 8024354C 0C00EABB */ jal get_npc_unsafe +/* A96C90 80243550 86040008 */ lh $a0, 8($s0) +/* A96C94 80243554 0040202D */ daddu $a0, $v0, $zero +/* A96C98 80243558 8E03006C */ lw $v1, 0x6c($s0) +/* A96C9C 8024355C 24020002 */ addiu $v0, $zero, 2 +/* A96CA0 80243560 14620003 */ bne $v1, $v0, .L80243570 +/* A96CA4 80243564 00000000 */ nop +/* A96CA8 80243568 AC80001C */ sw $zero, 0x1c($a0) +/* A96CAC 8024356C AC800018 */ sw $zero, 0x18($a0) +.L80243570: +/* A96CB0 80243570 8FBF0014 */ lw $ra, 0x14($sp) +/* A96CB4 80243574 8FB00010 */ lw $s0, 0x10($sp) +/* A96CB8 80243578 24020002 */ addiu $v0, $zero, 2 +/* A96CBC 8024357C 03E00008 */ jr $ra +/* A96CC0 80243580 27BD0018 */ addiu $sp, $sp, 0x18 +/* A96CC4 80243584 00000000 */ nop +/* A96CC8 80243588 00000000 */ nop +/* A96CCC 8024358C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s index b37545c0f5..3df9b9f05a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s +++ b/asm/nonmatchings/world/area_kpa/kpa_11/A52BD0/func_802406A4_A52F64.s @@ -232,25 +232,25 @@ glabel func_802406A4_A52F64 .L802409F4: /* A532B4 802409F4 0260202D */ daddu $a0, $s3, $zero /* A532B8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A532BC 802409FC 0C0900C4 */ jal func_80240310 +/* A532BC 802409FC 0C0900C4 */ jal func_80240310_A52BD0 /* A532C0 80240A00 02A0302D */ daddu $a2, $s5, $zero /* A532C4 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: /* A532C8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A532CC 80240A0C 0C0900E3 */ jal func_8024038C +/* A532CC 80240A0C 0C0900E3 */ jal func_8024038C_A52C4C /* A532D0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A532D4 80240A14 08090294 */ j .L80240A50 /* A532D8 80240A18 00000000 */ nop .L80240A1C: /* A532DC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A532E0 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A532E4 80240A24 0C090130 */ jal func_802404C0 +/* A532E4 80240A24 0C090130 */ jal func_802404C0_A52D80 /* A532E8 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A532EC 80240A2C 08090294 */ j .L80240A50 /* A532F0 80240A30 00000000 */ nop .L80240A34: /* A532F4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A532F8 80240A38 0C090189 */ jal func_80240624 +/* A532F8 80240A38 0C090189 */ jal func_80240624_A52EE4 /* A532FC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A53300 80240A40 08090294 */ j .L80240A50 /* A53304 80240A44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s index 406bac4286..ac305aa1f1 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240360_A998F0.s @@ -55,7 +55,7 @@ glabel func_80240360_A998F0 /* A999B8 80240428 08090120 */ j .L80240480 /* A999BC 8024042C AE030028 */ sw $v1, 0x28($s0) .L80240430: -/* A999C0 80240430 0C09005C */ jal func_80240170 +/* A999C0 80240430 0C09005C */ jal func_80240170_A99700 /* A999C4 80240434 0240202D */ daddu $a0, $s2, $zero /* A999C8 80240438 0040202D */ daddu $a0, $v0, $zero /* A999CC 8024043C 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4.s deleted file mode 100644 index de10ec10ac..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A4 -/* A99A34 802404A4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A99A38 802404A8 AFB20038 */ sw $s2, 0x38($sp) -/* A99A3C 802404AC 0080902D */ daddu $s2, $a0, $zero -/* A99A40 802404B0 AFBF003C */ sw $ra, 0x3c($sp) -/* A99A44 802404B4 AFB10034 */ sw $s1, 0x34($sp) -/* A99A48 802404B8 AFB00030 */ sw $s0, 0x30($sp) -/* A99A4C 802404BC 8E510148 */ lw $s1, 0x148($s2) -/* A99A50 802404C0 0C00EABB */ jal get_npc_unsafe -/* A99A54 802404C4 86240008 */ lh $a0, 8($s1) -/* A99A58 802404C8 0040802D */ daddu $s0, $v0, $zero -/* A99A5C 802404CC 9602008E */ lhu $v0, 0x8e($s0) -/* A99A60 802404D0 2442FFFF */ addiu $v0, $v0, -1 -/* A99A64 802404D4 A602008E */ sh $v0, 0x8e($s0) -/* A99A68 802404D8 00021400 */ sll $v0, $v0, 0x10 -/* A99A6C 802404DC 1C40002B */ bgtz $v0, .L8024058C -/* A99A70 802404E0 00000000 */ nop -/* A99A74 802404E4 0C09005C */ jal func_80240170 -/* A99A78 802404E8 0240202D */ daddu $a0, $s2, $zero -/* A99A7C 802404EC 0040202D */ daddu $a0, $v0, $zero -/* A99A80 802404F0 0481001A */ bgez $a0, .L8024055C -/* A99A84 802404F4 2402000F */ addiu $v0, $zero, 0xf -/* A99A88 802404F8 24040002 */ addiu $a0, $zero, 2 -/* A99A8C 802404FC 860300A8 */ lh $v1, 0xa8($s0) -/* A99A90 80240500 AFA2001C */ sw $v0, 0x1c($sp) -/* A99A94 80240504 27A20028 */ addiu $v0, $sp, 0x28 -/* A99A98 80240508 0200282D */ daddu $a1, $s0, $zero -/* A99A9C 8024050C 3C013F80 */ lui $at, 0x3f80 -/* A99AA0 80240510 44810000 */ mtc1 $at, $f0 -/* A99AA4 80240514 3C014000 */ lui $at, 0x4000 -/* A99AA8 80240518 44811000 */ mtc1 $at, $f2 -/* A99AAC 8024051C 3C01C1A0 */ lui $at, 0xc1a0 -/* A99AB0 80240520 44812000 */ mtc1 $at, $f4 -/* A99AB4 80240524 44833000 */ mtc1 $v1, $f6 -/* A99AB8 80240528 00000000 */ nop -/* A99ABC 8024052C 468031A0 */ cvt.s.w $f6, $f6 -/* A99AC0 80240530 44073000 */ mfc1 $a3, $f6 -/* A99AC4 80240534 0000302D */ daddu $a2, $zero, $zero -/* A99AC8 80240538 AFA20020 */ sw $v0, 0x20($sp) -/* A99ACC 8024053C E7A00010 */ swc1 $f0, 0x10($sp) -/* A99AD0 80240540 E7A20014 */ swc1 $f2, 0x14($sp) -/* A99AD4 80240544 0C01BFA4 */ jal fx_emote -/* A99AD8 80240548 E7A40018 */ swc1 $f4, 0x18($sp) -/* A99ADC 8024054C 8E2200CC */ lw $v0, 0xcc($s1) -/* A99AE0 80240550 8C420000 */ lw $v0, ($v0) -/* A99AE4 80240554 0809015F */ j .L8024057C -/* A99AE8 80240558 AE020028 */ sw $v0, 0x28($s0) -.L8024055C: -/* A99AEC 8024055C 8E2200CC */ lw $v0, 0xcc($s1) -/* A99AF0 80240560 8C420024 */ lw $v0, 0x24($v0) -/* A99AF4 80240564 0C00FB3A */ jal get_enemy -/* A99AF8 80240568 AE020028 */ sw $v0, 0x28($s0) -/* A99AFC 8024056C 86240008 */ lh $a0, 8($s1) -/* A99B00 80240570 24030001 */ addiu $v1, $zero, 1 -/* A99B04 80240574 AC43006C */ sw $v1, 0x6c($v0) -/* A99B08 80240578 AC44007C */ sw $a0, 0x7c($v0) -.L8024057C: -/* A99B0C 8024057C 96220076 */ lhu $v0, 0x76($s1) -/* A99B10 80240580 A602008E */ sh $v0, 0x8e($s0) -/* A99B14 80240584 24020021 */ addiu $v0, $zero, 0x21 -/* A99B18 80240588 AE420070 */ sw $v0, 0x70($s2) -.L8024058C: -/* A99B1C 8024058C 8FBF003C */ lw $ra, 0x3c($sp) -/* A99B20 80240590 8FB20038 */ lw $s2, 0x38($sp) -/* A99B24 80240594 8FB10034 */ lw $s1, 0x34($sp) -/* A99B28 80240598 8FB00030 */ lw $s0, 0x30($sp) -/* A99B2C 8024059C 03E00008 */ jr $ra -/* A99B30 802405A0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s new file mode 100644 index 0000000000..42dc300970 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802404A4_A99A34.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404A4_A99A34 +/* A99A34 802404A4 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A99A38 802404A8 AFB20038 */ sw $s2, 0x38($sp) +/* A99A3C 802404AC 0080902D */ daddu $s2, $a0, $zero +/* A99A40 802404B0 AFBF003C */ sw $ra, 0x3c($sp) +/* A99A44 802404B4 AFB10034 */ sw $s1, 0x34($sp) +/* A99A48 802404B8 AFB00030 */ sw $s0, 0x30($sp) +/* A99A4C 802404BC 8E510148 */ lw $s1, 0x148($s2) +/* A99A50 802404C0 0C00EABB */ jal get_npc_unsafe +/* A99A54 802404C4 86240008 */ lh $a0, 8($s1) +/* A99A58 802404C8 0040802D */ daddu $s0, $v0, $zero +/* A99A5C 802404CC 9602008E */ lhu $v0, 0x8e($s0) +/* A99A60 802404D0 2442FFFF */ addiu $v0, $v0, -1 +/* A99A64 802404D4 A602008E */ sh $v0, 0x8e($s0) +/* A99A68 802404D8 00021400 */ sll $v0, $v0, 0x10 +/* A99A6C 802404DC 1C40002B */ bgtz $v0, .L8024058C +/* A99A70 802404E0 00000000 */ nop +/* A99A74 802404E4 0C09005C */ jal func_80240170_A99700 +/* A99A78 802404E8 0240202D */ daddu $a0, $s2, $zero +/* A99A7C 802404EC 0040202D */ daddu $a0, $v0, $zero +/* A99A80 802404F0 0481001A */ bgez $a0, .L8024055C +/* A99A84 802404F4 2402000F */ addiu $v0, $zero, 0xf +/* A99A88 802404F8 24040002 */ addiu $a0, $zero, 2 +/* A99A8C 802404FC 860300A8 */ lh $v1, 0xa8($s0) +/* A99A90 80240500 AFA2001C */ sw $v0, 0x1c($sp) +/* A99A94 80240504 27A20028 */ addiu $v0, $sp, 0x28 +/* A99A98 80240508 0200282D */ daddu $a1, $s0, $zero +/* A99A9C 8024050C 3C013F80 */ lui $at, 0x3f80 +/* A99AA0 80240510 44810000 */ mtc1 $at, $f0 +/* A99AA4 80240514 3C014000 */ lui $at, 0x4000 +/* A99AA8 80240518 44811000 */ mtc1 $at, $f2 +/* A99AAC 8024051C 3C01C1A0 */ lui $at, 0xc1a0 +/* A99AB0 80240520 44812000 */ mtc1 $at, $f4 +/* A99AB4 80240524 44833000 */ mtc1 $v1, $f6 +/* A99AB8 80240528 00000000 */ nop +/* A99ABC 8024052C 468031A0 */ cvt.s.w $f6, $f6 +/* A99AC0 80240530 44073000 */ mfc1 $a3, $f6 +/* A99AC4 80240534 0000302D */ daddu $a2, $zero, $zero +/* A99AC8 80240538 AFA20020 */ sw $v0, 0x20($sp) +/* A99ACC 8024053C E7A00010 */ swc1 $f0, 0x10($sp) +/* A99AD0 80240540 E7A20014 */ swc1 $f2, 0x14($sp) +/* A99AD4 80240544 0C01BFA4 */ jal fx_emote +/* A99AD8 80240548 E7A40018 */ swc1 $f4, 0x18($sp) +/* A99ADC 8024054C 8E2200CC */ lw $v0, 0xcc($s1) +/* A99AE0 80240550 8C420000 */ lw $v0, ($v0) +/* A99AE4 80240554 0809015F */ j .L8024057C +/* A99AE8 80240558 AE020028 */ sw $v0, 0x28($s0) +.L8024055C: +/* A99AEC 8024055C 8E2200CC */ lw $v0, 0xcc($s1) +/* A99AF0 80240560 8C420024 */ lw $v0, 0x24($v0) +/* A99AF4 80240564 0C00FB3A */ jal get_enemy +/* A99AF8 80240568 AE020028 */ sw $v0, 0x28($s0) +/* A99AFC 8024056C 86240008 */ lh $a0, 8($s1) +/* A99B00 80240570 24030001 */ addiu $v1, $zero, 1 +/* A99B04 80240574 AC43006C */ sw $v1, 0x6c($v0) +/* A99B08 80240578 AC44007C */ sw $a0, 0x7c($v0) +.L8024057C: +/* A99B0C 8024057C 96220076 */ lhu $v0, 0x76($s1) +/* A99B10 80240580 A602008E */ sh $v0, 0x8e($s0) +/* A99B14 80240584 24020021 */ addiu $v0, $zero, 0x21 +/* A99B18 80240588 AE420070 */ sw $v0, 0x70($s2) +.L8024058C: +/* A99B1C 8024058C 8FBF003C */ lw $ra, 0x3c($sp) +/* A99B20 80240590 8FB20038 */ lw $s2, 0x38($sp) +/* A99B24 80240594 8FB10034 */ lw $s1, 0x34($sp) +/* A99B28 80240598 8FB00030 */ lw $s0, 0x30($sp) +/* A99B2C 8024059C 03E00008 */ jr $ra +/* A99B30 802405A0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688.s deleted file mode 100644 index eb97e8b78f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240688 -/* A99C18 80240688 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A99C1C 8024068C AFB00010 */ sw $s0, 0x10($sp) -/* A99C20 80240690 0080802D */ daddu $s0, $a0, $zero -/* A99C24 80240694 AFBF0014 */ sw $ra, 0x14($sp) -/* A99C28 80240698 8E020148 */ lw $v0, 0x148($s0) -/* A99C2C 8024069C 0C00EABB */ jal get_npc_unsafe -/* A99C30 802406A0 84440008 */ lh $a0, 8($v0) -/* A99C34 802406A4 9443008E */ lhu $v1, 0x8e($v0) -/* A99C38 802406A8 2463FFFF */ addiu $v1, $v1, -1 -/* A99C3C 802406AC A443008E */ sh $v1, 0x8e($v0) -/* A99C40 802406B0 00031C00 */ sll $v1, $v1, 0x10 -/* A99C44 802406B4 58600001 */ blezl $v1, .L802406BC -/* A99C48 802406B8 AE000070 */ sw $zero, 0x70($s0) -.L802406BC: -/* A99C4C 802406BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A99C50 802406C0 8FB00010 */ lw $s0, 0x10($sp) -/* A99C54 802406C4 03E00008 */ jr $ra -/* A99C58 802406C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s new file mode 100644 index 0000000000..7e1d64f2cb --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80240688_A99C18.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240688_A99C18 +/* A99C18 80240688 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A99C1C 8024068C AFB00010 */ sw $s0, 0x10($sp) +/* A99C20 80240690 0080802D */ daddu $s0, $a0, $zero +/* A99C24 80240694 AFBF0014 */ sw $ra, 0x14($sp) +/* A99C28 80240698 8E020148 */ lw $v0, 0x148($s0) +/* A99C2C 8024069C 0C00EABB */ jal get_npc_unsafe +/* A99C30 802406A0 84440008 */ lh $a0, 8($v0) +/* A99C34 802406A4 9443008E */ lhu $v1, 0x8e($v0) +/* A99C38 802406A8 2463FFFF */ addiu $v1, $v1, -1 +/* A99C3C 802406AC A443008E */ sh $v1, 0x8e($v0) +/* A99C40 802406B0 00031C00 */ sll $v1, $v1, 0x10 +/* A99C44 802406B4 58600001 */ blezl $v1, .L802406BC +/* A99C48 802406B8 AE000070 */ sw $zero, 0x70($s0) +.L802406BC: +/* A99C4C 802406BC 8FBF0014 */ lw $ra, 0x14($sp) +/* A99C50 802406C0 8FB00010 */ lw $s0, 0x10($sp) +/* A99C54 802406C4 03E00008 */ jr $ra +/* A99C58 802406C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s index 93cc15dd5b..06dea9a1b9 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s @@ -159,7 +159,7 @@ glabel func_80241064_A9A5F4 /* A9A840 802412B0 0260202D */ daddu $a0, $s3, $zero /* A9A844 802412B4 8E050024 */ lw $a1, 0x24($s0) /* A9A848 802412B8 8E060028 */ lw $a2, 0x28($s0) -/* A9A84C 802412BC 0C0900D8 */ jal func_80240360 +/* A9A84C 802412BC 0C0900D8 */ jal func_80240360_A998F0 /* A9A850 802412C0 02A0382D */ daddu $a3, $s5, $zero /* A9A854 802412C4 8E630070 */ lw $v1, 0x70($s3) /* A9A858 802412C8 2402000C */ addiu $v0, $zero, 0xc @@ -182,19 +182,19 @@ glabel func_80241064_A9A5F4 /* A9A898 80241308 02A0302D */ daddu $a2, $s5, $zero /* A9A89C 8024130C 080904D7 */ j .L8024135C /* A9A8A0 80241310 00000000 */ nop -/* A9A8A4 80241314 0C090129 */ jal func_802404A4 +/* A9A8A4 80241314 0C090129 */ jal func_802404A4_A99A34 /* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero /* A9A8AC 8024131C 080904D7 */ j .L8024135C /* A9A8B0 80241320 00000000 */ nop -/* A9A8B4 80241324 0C090169 */ jal func_802405A4 +/* A9A8B4 80241324 0C090169 */ jal func_802405A4_A99B34 /* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero /* A9A8BC 8024132C 080904D7 */ j .L8024135C /* A9A8C0 80241330 00000000 */ nop -/* A9A8C4 80241334 0C09017A */ jal func_802405E8 +/* A9A8C4 80241334 0C09017A */ jal func_802405E8_A99B78 /* A9A8C8 80241338 0260202D */ daddu $a0, $s3, $zero /* A9A8CC 8024133C 080904D7 */ j .L8024135C /* A9A8D0 80241340 00000000 */ nop -/* A9A8D4 80241344 0C0901A2 */ jal func_80240688 +/* A9A8D4 80241344 0C0901A2 */ jal func_80240688_A99C18 /* A9A8D8 80241348 0260202D */ daddu $a0, $s3, $zero /* A9A8DC 8024134C 080904D7 */ j .L8024135C /* A9A8E0 80241350 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384.s deleted file mode 100644 index 7b141cc8a9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241384 -/* A9A914 80241384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9A918 80241388 3C05FE36 */ lui $a1, 0xfe36 -/* A9A91C 8024138C AFBF0010 */ sw $ra, 0x10($sp) -/* A9A920 80241390 8C820148 */ lw $v0, 0x148($a0) -/* A9A924 80241394 3C06800B */ lui $a2, 0x800b -/* A9A928 80241398 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A9A92C 8024139C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9A930 802413A0 00C23026 */ xor $a2, $a2, $v0 -/* A9A934 802413A4 0C0B2026 */ jal set_variable -/* A9A938 802413A8 2CC60001 */ sltiu $a2, $a2, 1 -/* A9A93C 802413AC 8FBF0010 */ lw $ra, 0x10($sp) -/* A9A940 802413B0 24020002 */ addiu $v0, $zero, 2 -/* A9A944 802413B4 03E00008 */ jr $ra -/* A9A948 802413B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A9A94C 802413BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s new file mode 100644 index 0000000000..698e374971 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241384_A9A914 +/* A9A914 80241384 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A9A918 80241388 3C05FE36 */ lui $a1, 0xfe36 +/* A9A91C 8024138C AFBF0010 */ sw $ra, 0x10($sp) +/* A9A920 80241390 8C820148 */ lw $v0, 0x148($a0) +/* A9A924 80241394 3C06800B */ lui $a2, 0x800b +/* A9A928 80241398 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A9A92C 8024139C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A9A930 802413A0 00C23026 */ xor $a2, $a2, $v0 +/* A9A934 802413A4 0C0B2026 */ jal set_variable +/* A9A938 802413A8 2CC60001 */ sltiu $a2, $a2, 1 +/* A9A93C 802413AC 8FBF0010 */ lw $ra, 0x10($sp) +/* A9A940 802413B0 24020002 */ addiu $v0, $zero, 2 +/* A9A944 802413B4 03E00008 */ jr $ra +/* A9A948 802413B8 27BD0018 */ addiu $sp, $sp, 0x18 +/* A9A94C 802413BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC.s deleted file mode 100644 index 20c6713116..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400FC -/* A9CD2C 802400FC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A9CD30 80240100 AFBF002C */ sw $ra, 0x2c($sp) -/* A9CD34 80240104 AFB00028 */ sw $s0, 0x28($sp) -/* A9CD38 80240108 8C820098 */ lw $v0, 0x98($a0) -/* A9CD3C 8024010C 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* A9CD40 80240110 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* A9CD44 80240114 14400005 */ bnez $v0, .L8024012C -/* A9CD48 80240118 00000000 */ nop -/* A9CD4C 8024011C C4800084 */ lwc1 $f0, 0x84($a0) -/* A9CD50 80240120 46800020 */ cvt.s.w $f0, $f0 -/* A9CD54 80240124 0809004E */ j .L80240138 -/* A9CD58 80240128 E6000028 */ swc1 $f0, 0x28($s0) -.L8024012C: -/* A9CD5C 8024012C C4800084 */ lwc1 $f0, 0x84($a0) -/* A9CD60 80240130 46800020 */ cvt.s.w $f0, $f0 -/* A9CD64 80240134 E6000030 */ swc1 $f0, 0x30($s0) -.L80240138: -/* A9CD68 80240138 27A20024 */ addiu $v0, $sp, 0x24 -/* A9CD6C 8024013C 0000202D */ daddu $a0, $zero, $zero -/* A9CD70 80240140 27A50018 */ addiu $a1, $sp, 0x18 -/* A9CD74 80240144 27A6001C */ addiu $a2, $sp, 0x1c -/* A9CD78 80240148 C6000028 */ lwc1 $f0, 0x28($s0) -/* A9CD7C 8024014C 3C014120 */ lui $at, 0x4120 -/* A9CD80 80240150 44811000 */ mtc1 $at, $f2 -/* A9CD84 80240154 3C014220 */ lui $at, 0x4220 -/* A9CD88 80240158 44813000 */ mtc1 $at, $f6 -/* A9CD8C 8024015C 27A70020 */ addiu $a3, $sp, 0x20 -/* A9CD90 80240160 E7A00018 */ swc1 $f0, 0x18($sp) -/* A9CD94 80240164 C600002C */ lwc1 $f0, 0x2c($s0) -/* A9CD98 80240168 C6040030 */ lwc1 $f4, 0x30($s0) -/* A9CD9C 8024016C 46020000 */ add.s $f0, $f0, $f2 -/* A9CDA0 80240170 E7A60024 */ swc1 $f6, 0x24($sp) -/* A9CDA4 80240174 E7A40020 */ swc1 $f4, 0x20($sp) -/* A9CDA8 80240178 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A9CDAC 8024017C 0C0372DF */ jal func_800DCB7C -/* A9CDB0 80240180 AFA20010 */ sw $v0, 0x10($sp) -/* A9CDB4 80240184 C7A00018 */ lwc1 $f0, 0x18($sp) -/* A9CDB8 80240188 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* A9CDBC 8024018C C7A40020 */ lwc1 $f4, 0x20($sp) -/* A9CDC0 80240190 E6000028 */ swc1 $f0, 0x28($s0) -/* A9CDC4 80240194 E602002C */ swc1 $f2, 0x2c($s0) -/* A9CDC8 80240198 E6040030 */ swc1 $f4, 0x30($s0) -/* A9CDCC 8024019C 8FBF002C */ lw $ra, 0x2c($sp) -/* A9CDD0 802401A0 8FB00028 */ lw $s0, 0x28($sp) -/* A9CDD4 802401A4 24020002 */ addiu $v0, $zero, 2 -/* A9CDD8 802401A8 03E00008 */ jr $ra -/* A9CDDC 802401AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s new file mode 100644 index 0000000000..60fd33e2ab --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802400FC_A9CD2C.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400FC_A9CD2C +/* A9CD2C 802400FC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A9CD30 80240100 AFBF002C */ sw $ra, 0x2c($sp) +/* A9CD34 80240104 AFB00028 */ sw $s0, 0x28($sp) +/* A9CD38 80240108 8C820098 */ lw $v0, 0x98($a0) +/* A9CD3C 8024010C 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* A9CD40 80240110 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* A9CD44 80240114 14400005 */ bnez $v0, .L8024012C +/* A9CD48 80240118 00000000 */ nop +/* A9CD4C 8024011C C4800084 */ lwc1 $f0, 0x84($a0) +/* A9CD50 80240120 46800020 */ cvt.s.w $f0, $f0 +/* A9CD54 80240124 0809004E */ j .L80240138 +/* A9CD58 80240128 E6000028 */ swc1 $f0, 0x28($s0) +.L8024012C: +/* A9CD5C 8024012C C4800084 */ lwc1 $f0, 0x84($a0) +/* A9CD60 80240130 46800020 */ cvt.s.w $f0, $f0 +/* A9CD64 80240134 E6000030 */ swc1 $f0, 0x30($s0) +.L80240138: +/* A9CD68 80240138 27A20024 */ addiu $v0, $sp, 0x24 +/* A9CD6C 8024013C 0000202D */ daddu $a0, $zero, $zero +/* A9CD70 80240140 27A50018 */ addiu $a1, $sp, 0x18 +/* A9CD74 80240144 27A6001C */ addiu $a2, $sp, 0x1c +/* A9CD78 80240148 C6000028 */ lwc1 $f0, 0x28($s0) +/* A9CD7C 8024014C 3C014120 */ lui $at, 0x4120 +/* A9CD80 80240150 44811000 */ mtc1 $at, $f2 +/* A9CD84 80240154 3C014220 */ lui $at, 0x4220 +/* A9CD88 80240158 44813000 */ mtc1 $at, $f6 +/* A9CD8C 8024015C 27A70020 */ addiu $a3, $sp, 0x20 +/* A9CD90 80240160 E7A00018 */ swc1 $f0, 0x18($sp) +/* A9CD94 80240164 C600002C */ lwc1 $f0, 0x2c($s0) +/* A9CD98 80240168 C6040030 */ lwc1 $f4, 0x30($s0) +/* A9CD9C 8024016C 46020000 */ add.s $f0, $f0, $f2 +/* A9CDA0 80240170 E7A60024 */ swc1 $f6, 0x24($sp) +/* A9CDA4 80240174 E7A40020 */ swc1 $f4, 0x20($sp) +/* A9CDA8 80240178 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A9CDAC 8024017C 0C0372DF */ jal func_800DCB7C +/* A9CDB0 80240180 AFA20010 */ sw $v0, 0x10($sp) +/* A9CDB4 80240184 C7A00018 */ lwc1 $f0, 0x18($sp) +/* A9CDB8 80240188 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* A9CDBC 8024018C C7A40020 */ lwc1 $f4, 0x20($sp) +/* A9CDC0 80240190 E6000028 */ swc1 $f0, 0x28($s0) +/* A9CDC4 80240194 E602002C */ swc1 $f2, 0x2c($s0) +/* A9CDC8 80240198 E6040030 */ swc1 $f4, 0x30($s0) +/* A9CDCC 8024019C 8FBF002C */ lw $ra, 0x2c($sp) +/* A9CDD0 802401A0 8FB00028 */ lw $s0, 0x28($sp) +/* A9CDD4 802401A4 24020002 */ addiu $v0, $zero, 2 +/* A9CDD8 802401A8 03E00008 */ jr $ra +/* A9CDDC 802401AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C.s deleted file mode 100644 index 5c82260623..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024022C -/* A9CE5C 8024022C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A9CE60 80240230 AFB3001C */ sw $s3, 0x1c($sp) -/* A9CE64 80240234 0080982D */ daddu $s3, $a0, $zero -/* A9CE68 80240238 AFBF0020 */ sw $ra, 0x20($sp) -/* A9CE6C 8024023C AFB20018 */ sw $s2, 0x18($sp) -/* A9CE70 80240240 AFB10014 */ sw $s1, 0x14($sp) -/* A9CE74 80240244 AFB00010 */ sw $s0, 0x10($sp) -/* A9CE78 80240248 8E710148 */ lw $s1, 0x148($s3) -/* A9CE7C 8024024C 86240008 */ lh $a0, 8($s1) -/* A9CE80 80240250 0C00EABB */ jal get_npc_unsafe -/* A9CE84 80240254 00A0902D */ daddu $s2, $a1, $zero -/* A9CE88 80240258 0040802D */ daddu $s0, $v0, $zero -/* A9CE8C 8024025C 8602008E */ lh $v0, 0x8e($s0) -/* A9CE90 80240260 9603008E */ lhu $v1, 0x8e($s0) -/* A9CE94 80240264 18400005 */ blez $v0, .L8024027C -/* A9CE98 80240268 2462FFFF */ addiu $v0, $v1, -1 -/* A9CE9C 8024026C A602008E */ sh $v0, 0x8e($s0) -/* A9CEA0 80240270 00021400 */ sll $v0, $v0, 0x10 -/* A9CEA4 80240274 1C400033 */ bgtz $v0, .L80240344 -/* A9CEA8 80240278 00000000 */ nop -.L8024027C: -/* A9CEAC 8024027C 8602008C */ lh $v0, 0x8c($s0) -/* A9CEB0 80240280 14400030 */ bnez $v0, .L80240344 -/* A9CEB4 80240284 00000000 */ nop -/* A9CEB8 80240288 8E2200CC */ lw $v0, 0xcc($s1) -/* A9CEBC 8024028C 8C420024 */ lw $v0, 0x24($v0) -/* A9CEC0 80240290 AE020028 */ sw $v0, 0x28($s0) -/* A9CEC4 80240294 C6400018 */ lwc1 $f0, 0x18($s2) -/* A9CEC8 80240298 E6000018 */ swc1 $f0, 0x18($s0) -/* A9CECC 8024029C 8E230088 */ lw $v1, 0x88($s1) -/* A9CED0 802402A0 24020005 */ addiu $v0, $zero, 5 -/* A9CED4 802402A4 10620005 */ beq $v1, $v0, .L802402BC -/* A9CED8 802402A8 00000000 */ nop -/* A9CEDC 802402AC 10600003 */ beqz $v1, .L802402BC -/* A9CEE0 802402B0 24020001 */ addiu $v0, $zero, 1 -/* A9CEE4 802402B4 14620006 */ bne $v1, $v0, .L802402D0 -/* A9CEE8 802402B8 00000000 */ nop -.L802402BC: -/* A9CEEC 802402BC 8E220084 */ lw $v0, 0x84($s1) -/* A9CEF0 802402C0 00021FC2 */ srl $v1, $v0, 0x1f -/* A9CEF4 802402C4 00431021 */ addu $v0, $v0, $v1 -/* A9CEF8 802402C8 00021043 */ sra $v0, $v0, 1 -/* A9CEFC 802402CC A60200A8 */ sh $v0, 0xa8($s0) -.L802402D0: -/* A9CF00 802402D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A9CF04 802402D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A9CF08 802402D8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A9CF0C 802402DC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A9CF10 802402E0 8C460028 */ lw $a2, 0x28($v0) -/* A9CF14 802402E4 0C00A7B5 */ jal dist2D -/* A9CF18 802402E8 8C470030 */ lw $a3, 0x30($v0) -/* A9CF1C 802402EC C6020018 */ lwc1 $f2, 0x18($s0) -/* A9CF20 802402F0 46020003 */ div.s $f0, $f0, $f2 -/* A9CF24 802402F4 3C018024 */ lui $at, 0x8024 -/* A9CF28 802402F8 D4221CF0 */ ldc1 $f2, 0x1cf0($at) -/* A9CF2C 802402FC 46000021 */ cvt.d.s $f0, $f0 -/* A9CF30 80240300 46220000 */ add.d $f0, $f0, $f2 -/* A9CF34 80240304 4620010D */ trunc.w.d $f4, $f0 -/* A9CF38 80240308 44022000 */ mfc1 $v0, $f4 -/* A9CF3C 8024030C 00000000 */ nop -/* A9CF40 80240310 A602008E */ sh $v0, 0x8e($s0) -/* A9CF44 80240314 00021400 */ sll $v0, $v0, 0x10 -/* A9CF48 80240318 8E230078 */ lw $v1, 0x78($s1) -/* A9CF4C 8024031C 00021403 */ sra $v0, $v0, 0x10 -/* A9CF50 80240320 0043102A */ slt $v0, $v0, $v1 -/* A9CF54 80240324 10400003 */ beqz $v0, .L80240334 -/* A9CF58 80240328 00000000 */ nop -/* A9CF5C 8024032C 9622007A */ lhu $v0, 0x7a($s1) -/* A9CF60 80240330 A602008E */ sh $v0, 0x8e($s0) -.L80240334: -/* A9CF64 80240334 8602008E */ lh $v0, 0x8e($s0) -/* A9CF68 80240338 AE22007C */ sw $v0, 0x7c($s1) -/* A9CF6C 8024033C 2402000E */ addiu $v0, $zero, 0xe -/* A9CF70 80240340 AE620070 */ sw $v0, 0x70($s3) -.L80240344: -/* A9CF74 80240344 8FBF0020 */ lw $ra, 0x20($sp) -/* A9CF78 80240348 8FB3001C */ lw $s3, 0x1c($sp) -/* A9CF7C 8024034C 8FB20018 */ lw $s2, 0x18($sp) -/* A9CF80 80240350 8FB10014 */ lw $s1, 0x14($sp) -/* A9CF84 80240354 8FB00010 */ lw $s0, 0x10($sp) -/* A9CF88 80240358 03E00008 */ jr $ra -/* A9CF8C 8024035C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s new file mode 100644 index 0000000000..5170a94ca9 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_8024022C_A9CE5C.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024022C_A9CE5C +/* A9CE5C 8024022C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A9CE60 80240230 AFB3001C */ sw $s3, 0x1c($sp) +/* A9CE64 80240234 0080982D */ daddu $s3, $a0, $zero +/* A9CE68 80240238 AFBF0020 */ sw $ra, 0x20($sp) +/* A9CE6C 8024023C AFB20018 */ sw $s2, 0x18($sp) +/* A9CE70 80240240 AFB10014 */ sw $s1, 0x14($sp) +/* A9CE74 80240244 AFB00010 */ sw $s0, 0x10($sp) +/* A9CE78 80240248 8E710148 */ lw $s1, 0x148($s3) +/* A9CE7C 8024024C 86240008 */ lh $a0, 8($s1) +/* A9CE80 80240250 0C00EABB */ jal get_npc_unsafe +/* A9CE84 80240254 00A0902D */ daddu $s2, $a1, $zero +/* A9CE88 80240258 0040802D */ daddu $s0, $v0, $zero +/* A9CE8C 8024025C 8602008E */ lh $v0, 0x8e($s0) +/* A9CE90 80240260 9603008E */ lhu $v1, 0x8e($s0) +/* A9CE94 80240264 18400005 */ blez $v0, .L8024027C +/* A9CE98 80240268 2462FFFF */ addiu $v0, $v1, -1 +/* A9CE9C 8024026C A602008E */ sh $v0, 0x8e($s0) +/* A9CEA0 80240270 00021400 */ sll $v0, $v0, 0x10 +/* A9CEA4 80240274 1C400033 */ bgtz $v0, .L80240344 +/* A9CEA8 80240278 00000000 */ nop +.L8024027C: +/* A9CEAC 8024027C 8602008C */ lh $v0, 0x8c($s0) +/* A9CEB0 80240280 14400030 */ bnez $v0, .L80240344 +/* A9CEB4 80240284 00000000 */ nop +/* A9CEB8 80240288 8E2200CC */ lw $v0, 0xcc($s1) +/* A9CEBC 8024028C 8C420024 */ lw $v0, 0x24($v0) +/* A9CEC0 80240290 AE020028 */ sw $v0, 0x28($s0) +/* A9CEC4 80240294 C6400018 */ lwc1 $f0, 0x18($s2) +/* A9CEC8 80240298 E6000018 */ swc1 $f0, 0x18($s0) +/* A9CECC 8024029C 8E230088 */ lw $v1, 0x88($s1) +/* A9CED0 802402A0 24020005 */ addiu $v0, $zero, 5 +/* A9CED4 802402A4 10620005 */ beq $v1, $v0, .L802402BC +/* A9CED8 802402A8 00000000 */ nop +/* A9CEDC 802402AC 10600003 */ beqz $v1, .L802402BC +/* A9CEE0 802402B0 24020001 */ addiu $v0, $zero, 1 +/* A9CEE4 802402B4 14620006 */ bne $v1, $v0, .L802402D0 +/* A9CEE8 802402B8 00000000 */ nop +.L802402BC: +/* A9CEEC 802402BC 8E220084 */ lw $v0, 0x84($s1) +/* A9CEF0 802402C0 00021FC2 */ srl $v1, $v0, 0x1f +/* A9CEF4 802402C4 00431021 */ addu $v0, $v0, $v1 +/* A9CEF8 802402C8 00021043 */ sra $v0, $v0, 1 +/* A9CEFC 802402CC A60200A8 */ sh $v0, 0xa8($s0) +.L802402D0: +/* A9CF00 802402D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A9CF04 802402D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A9CF08 802402D8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A9CF0C 802402DC C60E0040 */ lwc1 $f14, 0x40($s0) +/* A9CF10 802402E0 8C460028 */ lw $a2, 0x28($v0) +/* A9CF14 802402E4 0C00A7B5 */ jal dist2D +/* A9CF18 802402E8 8C470030 */ lw $a3, 0x30($v0) +/* A9CF1C 802402EC C6020018 */ lwc1 $f2, 0x18($s0) +/* A9CF20 802402F0 46020003 */ div.s $f0, $f0, $f2 +/* A9CF24 802402F4 3C018024 */ lui $at, 0x8024 +/* A9CF28 802402F8 D4221CF0 */ ldc1 $f2, 0x1cf0($at) +/* A9CF2C 802402FC 46000021 */ cvt.d.s $f0, $f0 +/* A9CF30 80240300 46220000 */ add.d $f0, $f0, $f2 +/* A9CF34 80240304 4620010D */ trunc.w.d $f4, $f0 +/* A9CF38 80240308 44022000 */ mfc1 $v0, $f4 +/* A9CF3C 8024030C 00000000 */ nop +/* A9CF40 80240310 A602008E */ sh $v0, 0x8e($s0) +/* A9CF44 80240314 00021400 */ sll $v0, $v0, 0x10 +/* A9CF48 80240318 8E230078 */ lw $v1, 0x78($s1) +/* A9CF4C 8024031C 00021403 */ sra $v0, $v0, 0x10 +/* A9CF50 80240320 0043102A */ slt $v0, $v0, $v1 +/* A9CF54 80240324 10400003 */ beqz $v0, .L80240334 +/* A9CF58 80240328 00000000 */ nop +/* A9CF5C 8024032C 9622007A */ lhu $v0, 0x7a($s1) +/* A9CF60 80240330 A602008E */ sh $v0, 0x8e($s0) +.L80240334: +/* A9CF64 80240334 8602008E */ lh $v0, 0x8e($s0) +/* A9CF68 80240338 AE22007C */ sw $v0, 0x7c($s1) +/* A9CF6C 8024033C 2402000E */ addiu $v0, $zero, 0xe +/* A9CF70 80240340 AE620070 */ sw $v0, 0x70($s3) +.L80240344: +/* A9CF74 80240344 8FBF0020 */ lw $ra, 0x20($sp) +/* A9CF78 80240348 8FB3001C */ lw $s3, 0x1c($sp) +/* A9CF7C 8024034C 8FB20018 */ lw $s2, 0x18($sp) +/* A9CF80 80240350 8FB10014 */ lw $s1, 0x14($sp) +/* A9CF84 80240354 8FB00010 */ lw $s0, 0x10($sp) +/* A9CF88 80240358 03E00008 */ jr $ra +/* A9CF8C 8024035C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802404C4.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802404C4.s deleted file mode 100644 index a7c83ca329..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802404C4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C4 -/* A9D0F4 802404C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A9D0F8 802404C8 AFB10014 */ sw $s1, 0x14($sp) -/* A9D0FC 802404CC 0080882D */ daddu $s1, $a0, $zero -/* A9D100 802404D0 AFBF0018 */ sw $ra, 0x18($sp) -/* A9D104 802404D4 AFB00010 */ sw $s0, 0x10($sp) -/* A9D108 802404D8 8E300148 */ lw $s0, 0x148($s1) -/* A9D10C 802404DC 0C00EABB */ jal get_npc_unsafe -/* A9D110 802404E0 86040008 */ lh $a0, 8($s0) -/* A9D114 802404E4 0040202D */ daddu $a0, $v0, $zero -/* A9D118 802404E8 9482008E */ lhu $v0, 0x8e($a0) -/* A9D11C 802404EC 24030003 */ addiu $v1, $zero, 3 -/* A9D120 802404F0 24420001 */ addiu $v0, $v0, 1 -/* A9D124 802404F4 A482008E */ sh $v0, 0x8e($a0) -/* A9D128 802404F8 00021400 */ sll $v0, $v0, 0x10 -/* A9D12C 802404FC 00021403 */ sra $v0, $v0, 0x10 -/* A9D130 80240500 14430003 */ bne $v0, $v1, .L80240510 -/* A9D134 80240504 00000000 */ nop -/* A9D138 80240508 96020086 */ lhu $v0, 0x86($s0) -/* A9D13C 8024050C A48200A8 */ sh $v0, 0xa8($a0) -.L80240510: -/* A9D140 80240510 8482008E */ lh $v0, 0x8e($a0) -/* A9D144 80240514 8E030080 */ lw $v1, 0x80($s0) -/* A9D148 80240518 0043102A */ slt $v0, $v0, $v1 -/* A9D14C 8024051C 14400004 */ bnez $v0, .L80240530 -/* A9D150 80240520 00000000 */ nop -/* A9D154 80240524 96020086 */ lhu $v0, 0x86($s0) -/* A9D158 80240528 A48200A8 */ sh $v0, 0xa8($a0) -/* A9D15C 8024052C AE200070 */ sw $zero, 0x70($s1) -.L80240530: -/* A9D160 80240530 8FBF0018 */ lw $ra, 0x18($sp) -/* A9D164 80240534 8FB10014 */ lw $s1, 0x14($sp) -/* A9D168 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* A9D16C 8024053C 03E00008 */ jr $ra -/* A9D170 80240540 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802404C4_A9D0F4.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802404C4_A9D0F4.s new file mode 100644 index 0000000000..55270c7b2a --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_802404C4_A9D0F4.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404C4_A9D0F4 +/* A9D0F4 802404C4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A9D0F8 802404C8 AFB10014 */ sw $s1, 0x14($sp) +/* A9D0FC 802404CC 0080882D */ daddu $s1, $a0, $zero +/* A9D100 802404D0 AFBF0018 */ sw $ra, 0x18($sp) +/* A9D104 802404D4 AFB00010 */ sw $s0, 0x10($sp) +/* A9D108 802404D8 8E300148 */ lw $s0, 0x148($s1) +/* A9D10C 802404DC 0C00EABB */ jal get_npc_unsafe +/* A9D110 802404E0 86040008 */ lh $a0, 8($s0) +/* A9D114 802404E4 0040202D */ daddu $a0, $v0, $zero +/* A9D118 802404E8 9482008E */ lhu $v0, 0x8e($a0) +/* A9D11C 802404EC 24030003 */ addiu $v1, $zero, 3 +/* A9D120 802404F0 24420001 */ addiu $v0, $v0, 1 +/* A9D124 802404F4 A482008E */ sh $v0, 0x8e($a0) +/* A9D128 802404F8 00021400 */ sll $v0, $v0, 0x10 +/* A9D12C 802404FC 00021403 */ sra $v0, $v0, 0x10 +/* A9D130 80240500 14430003 */ bne $v0, $v1, .L80240510 +/* A9D134 80240504 00000000 */ nop +/* A9D138 80240508 96020086 */ lhu $v0, 0x86($s0) +/* A9D13C 8024050C A48200A8 */ sh $v0, 0xa8($a0) +.L80240510: +/* A9D140 80240510 8482008E */ lh $v0, 0x8e($a0) +/* A9D144 80240514 8E030080 */ lw $v1, 0x80($s0) +/* A9D148 80240518 0043102A */ slt $v0, $v0, $v1 +/* A9D14C 8024051C 14400004 */ bnez $v0, .L80240530 +/* A9D150 80240520 00000000 */ nop +/* A9D154 80240524 96020086 */ lhu $v0, 0x86($s0) +/* A9D158 80240528 A48200A8 */ sh $v0, 0xa8($a0) +/* A9D15C 8024052C AE200070 */ sw $zero, 0x70($s1) +.L80240530: +/* A9D160 80240530 8FBF0018 */ lw $ra, 0x18($sp) +/* A9D164 80240534 8FB10014 */ lw $s1, 0x14($sp) +/* A9D168 80240538 8FB00010 */ lw $s0, 0x10($sp) +/* A9D16C 8024053C 03E00008 */ jr $ra +/* A9D170 80240540 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s index d86405ac9c..5fb2d26b5a 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s +++ b/asm/nonmatchings/world/area_kpa/kpa_113/A9CC70/func_80240544_A9D174.s @@ -232,25 +232,25 @@ glabel func_80240544_A9D174 .L80240894: /* A9D4C4 80240894 0260202D */ daddu $a0, $s3, $zero /* A9D4C8 80240898 0280282D */ daddu $a1, $s4, $zero -/* A9D4CC 8024089C 0C09006C */ jal func_802401B0 +/* A9D4CC 8024089C 0C09006C */ jal func_802401B0_A9CDE0 /* A9D4D0 802408A0 02A0302D */ daddu $a2, $s5, $zero /* A9D4D4 802408A4 0260202D */ daddu $a0, $s3, $zero .L802408A8: /* A9D4D8 802408A8 0280282D */ daddu $a1, $s4, $zero -/* A9D4DC 802408AC 0C09008B */ jal func_8024022C +/* A9D4DC 802408AC 0C09008B */ jal func_8024022C_A9CE5C /* A9D4E0 802408B0 02A0302D */ daddu $a2, $s5, $zero /* A9D4E4 802408B4 0809023C */ j .L802408F0 /* A9D4E8 802408B8 00000000 */ nop .L802408BC: /* A9D4EC 802408BC 0260202D */ daddu $a0, $s3, $zero /* A9D4F0 802408C0 0280282D */ daddu $a1, $s4, $zero -/* A9D4F4 802408C4 0C0900D8 */ jal func_80240360 +/* A9D4F4 802408C4 0C0900D8 */ jal func_80240360_A9CF90 /* A9D4F8 802408C8 02A0302D */ daddu $a2, $s5, $zero /* A9D4FC 802408CC 0809023C */ j .L802408F0 /* A9D500 802408D0 00000000 */ nop .L802408D4: /* A9D504 802408D4 0280282D */ daddu $a1, $s4, $zero -/* A9D508 802408D8 0C090131 */ jal func_802404C4 +/* A9D508 802408D8 0C090131 */ jal func_802404C4_A9D0F4 /* A9D50C 802408DC 02A0302D */ daddu $a2, $s5, $zero /* A9D510 802408E0 0809023C */ j .L802408F0 /* A9D514 802408E4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s index 5f7ae41fd4..bb469b1de6 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80240360_A9F0A0.s @@ -55,7 +55,7 @@ glabel func_80240360_A9F0A0 /* A9F168 80240428 08090120 */ j .L80240480 /* A9F16C 8024042C AE030028 */ sw $v1, 0x28($s0) .L80240430: -/* A9F170 80240430 0C09005C */ jal func_80240170 +/* A9F170 80240430 0C09005C */ jal func_80240170_A9EEB0 /* A9F174 80240434 0240202D */ daddu $a0, $s2, $zero /* A9F178 80240438 0040202D */ daddu $a0, $v0, $zero /* A9F17C 8024043C 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s index f85730e8ce..3218b95b3e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802404A4_A9F1E4.s @@ -18,7 +18,7 @@ glabel func_802404A4_A9F1E4 /* A9F218 802404D8 00021400 */ sll $v0, $v0, 0x10 /* A9F21C 802404DC 1C40002B */ bgtz $v0, .L8024058C /* A9F220 802404E0 00000000 */ nop -/* A9F224 802404E4 0C09005C */ jal func_80240170 +/* A9F224 802404E4 0C09005C */ jal func_80240170_A9EEB0 /* A9F228 802404E8 0240202D */ daddu $a0, $s2, $zero /* A9F22C 802404EC 0040202D */ daddu $a0, $v0, $zero /* A9F230 802404F0 0481001A */ bgez $a0, .L8024055C diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s index 28db87cfd0..a5f11e2249 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s @@ -159,7 +159,7 @@ glabel func_80241064_A9FDA4 /* A9FFF0 802412B0 0260202D */ daddu $a0, $s3, $zero /* A9FFF4 802412B4 8E050024 */ lw $a1, 0x24($s0) /* A9FFF8 802412B8 8E060028 */ lw $a2, 0x28($s0) -/* A9FFFC 802412BC 0C0900D8 */ jal func_80240360 +/* A9FFFC 802412BC 0C0900D8 */ jal func_80240360_A9F0A0 /* AA0000 802412C0 02A0382D */ daddu $a3, $s5, $zero /* AA0004 802412C4 8E630070 */ lw $v1, 0x70($s3) /* AA0008 802412C8 2402000C */ addiu $v0, $zero, 0xc @@ -182,19 +182,19 @@ glabel func_80241064_A9FDA4 /* AA0048 80241308 02A0302D */ daddu $a2, $s5, $zero /* AA004C 8024130C 080904D7 */ j .L8024135C /* AA0050 80241310 00000000 */ nop -/* AA0054 80241314 0C090129 */ jal func_802404A4 +/* AA0054 80241314 0C090129 */ jal func_802404A4_A9F1E4 /* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero /* AA005C 8024131C 080904D7 */ j .L8024135C /* AA0060 80241320 00000000 */ nop -/* AA0064 80241324 0C090169 */ jal func_802405A4 +/* AA0064 80241324 0C090169 */ jal func_802405A4_A9F2E4 /* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero /* AA006C 8024132C 080904D7 */ j .L8024135C /* AA0070 80241330 00000000 */ nop -/* AA0074 80241334 0C09017A */ jal func_802405E8 +/* AA0074 80241334 0C09017A */ jal func_802405E8_A9F328 /* AA0078 80241338 0260202D */ daddu $a0, $s3, $zero /* AA007C 8024133C 080904D7 */ j .L8024135C /* AA0080 80241340 00000000 */ nop -/* AA0084 80241344 0C0901A2 */ jal func_80240688 +/* AA0084 80241344 0C0901A2 */ jal func_80240688_A9F3C8 /* AA0088 80241348 0260202D */ daddu $a0, $s3, $zero /* AA008C 8024134C 080904D7 */ j .L8024135C /* AA0090 80241350 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240350.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240350.s deleted file mode 100644 index a6bf89c91d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240350.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240350 -/* A54CA0 80240350 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A54CA4 80240354 AFBF0010 */ sw $ra, 0x10($sp) -/* A54CA8 80240358 8C82000C */ lw $v0, 0xc($a0) -/* A54CAC 8024035C 3C068016 */ lui $a2, 0x8016 -/* A54CB0 80240360 84C6A556 */ lh $a2, -0x5aaa($a2) -/* A54CB4 80240364 0C0B2026 */ jal set_variable -/* A54CB8 80240368 8C450000 */ lw $a1, ($v0) -/* A54CBC 8024036C 8FBF0010 */ lw $ra, 0x10($sp) -/* A54CC0 80240370 24020002 */ addiu $v0, $zero, 2 -/* A54CC4 80240374 03E00008 */ jr $ra -/* A54CC8 80240378 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240350_A54CA0.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240350_A54CA0.s new file mode 100644 index 0000000000..8d2c33bad0 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_80240350_A54CA0.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240350_A54CA0 +/* A54CA0 80240350 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A54CA4 80240354 AFBF0010 */ sw $ra, 0x10($sp) +/* A54CA8 80240358 8C82000C */ lw $v0, 0xc($a0) +/* A54CAC 8024035C 3C068016 */ lui $a2, 0x8016 +/* A54CB0 80240360 84C6A556 */ lh $a2, -0x5aaa($a2) +/* A54CB4 80240364 0C0B2026 */ jal set_variable +/* A54CB8 80240368 8C450000 */ lw $a1, ($v0) +/* A54CBC 8024036C 8FBF0010 */ lw $ra, 0x10($sp) +/* A54CC0 80240370 24020002 */ addiu $v0, $zero, 2 +/* A54CC4 80240374 03E00008 */ jr $ra +/* A54CC8 80240378 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s index 312f8622e9..adffe8c957 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_130/AA2D20/func_802404AC_AA31CC.s @@ -95,7 +95,7 @@ glabel func_802404AC_AA31CC /* AA3328 80240608 080901C4 */ j .L80240710 /* AA332C 8024060C AE820070 */ sw $v0, 0x70($s4) .L80240610: -/* AA3330 80240610 0C090000 */ jal func_80240000 +/* AA3330 80240610 0C090000 */ jal func_80240000_AA2D20 /* AA3334 80240614 00000000 */ nop /* AA3338 80240618 1840002C */ blez $v0, .L802406CC /* AA333C 8024061C AE42006C */ sw $v0, 0x6c($s2) diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C.s deleted file mode 100644 index 3bd003f720..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024065C -/* AA95FC 8024065C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AA9600 80240660 AFB20018 */ sw $s2, 0x18($sp) -/* AA9604 80240664 0080902D */ daddu $s2, $a0, $zero -/* AA9608 80240668 AFBF001C */ sw $ra, 0x1c($sp) -/* AA960C 8024066C AFB10014 */ sw $s1, 0x14($sp) -/* AA9610 80240670 AFB00010 */ sw $s0, 0x10($sp) -/* AA9614 80240674 8E50000C */ lw $s0, 0xc($s2) -/* AA9618 80240678 8E050000 */ lw $a1, ($s0) -/* AA961C 8024067C 0C0B1EAF */ jal get_variable -/* AA9620 80240680 26100004 */ addiu $s0, $s0, 4 -/* AA9624 80240684 0C04417A */ jal get_entity_by_index -/* AA9628 80240688 0040202D */ daddu $a0, $v0, $zero -/* AA962C 8024068C 8E050000 */ lw $a1, ($s0) -/* AA9630 80240690 26100004 */ addiu $s0, $s0, 4 -/* AA9634 80240694 0040882D */ daddu $s1, $v0, $zero -/* AA9638 80240698 C6200048 */ lwc1 $f0, 0x48($s1) -/* AA963C 8024069C 4600008D */ trunc.w.s $f2, $f0 -/* AA9640 802406A0 44061000 */ mfc1 $a2, $f2 -/* AA9644 802406A4 0C0B2026 */ jal set_variable -/* AA9648 802406A8 0240202D */ daddu $a0, $s2, $zero -/* AA964C 802406AC 8E050000 */ lw $a1, ($s0) -/* AA9650 802406B0 26100004 */ addiu $s0, $s0, 4 -/* AA9654 802406B4 C620004C */ lwc1 $f0, 0x4c($s1) -/* AA9658 802406B8 4600008D */ trunc.w.s $f2, $f0 -/* AA965C 802406BC 44061000 */ mfc1 $a2, $f2 -/* AA9660 802406C0 0C0B2026 */ jal set_variable -/* AA9664 802406C4 0240202D */ daddu $a0, $s2, $zero -/* AA9668 802406C8 C6200050 */ lwc1 $f0, 0x50($s1) -/* AA966C 802406CC 8E050000 */ lw $a1, ($s0) -/* AA9670 802406D0 4600008D */ trunc.w.s $f2, $f0 -/* AA9674 802406D4 44061000 */ mfc1 $a2, $f2 -/* AA9678 802406D8 0C0B2026 */ jal set_variable -/* AA967C 802406DC 0240202D */ daddu $a0, $s2, $zero -/* AA9680 802406E0 8FBF001C */ lw $ra, 0x1c($sp) -/* AA9684 802406E4 8FB20018 */ lw $s2, 0x18($sp) -/* AA9688 802406E8 8FB10014 */ lw $s1, 0x14($sp) -/* AA968C 802406EC 8FB00010 */ lw $s0, 0x10($sp) -/* AA9690 802406F0 24020002 */ addiu $v0, $zero, 2 -/* AA9694 802406F4 03E00008 */ jr $ra -/* AA9698 802406F8 27BD0020 */ addiu $sp, $sp, 0x20 -/* AA969C 802406FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s b/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s new file mode 100644 index 0000000000..310e79186b --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_134/AA94B0/func_8024065C_AA95FC.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024065C_AA95FC +/* AA95FC 8024065C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* AA9600 80240660 AFB20018 */ sw $s2, 0x18($sp) +/* AA9604 80240664 0080902D */ daddu $s2, $a0, $zero +/* AA9608 80240668 AFBF001C */ sw $ra, 0x1c($sp) +/* AA960C 8024066C AFB10014 */ sw $s1, 0x14($sp) +/* AA9610 80240670 AFB00010 */ sw $s0, 0x10($sp) +/* AA9614 80240674 8E50000C */ lw $s0, 0xc($s2) +/* AA9618 80240678 8E050000 */ lw $a1, ($s0) +/* AA961C 8024067C 0C0B1EAF */ jal get_variable +/* AA9620 80240680 26100004 */ addiu $s0, $s0, 4 +/* AA9624 80240684 0C04417A */ jal get_entity_by_index +/* AA9628 80240688 0040202D */ daddu $a0, $v0, $zero +/* AA962C 8024068C 8E050000 */ lw $a1, ($s0) +/* AA9630 80240690 26100004 */ addiu $s0, $s0, 4 +/* AA9634 80240694 0040882D */ daddu $s1, $v0, $zero +/* AA9638 80240698 C6200048 */ lwc1 $f0, 0x48($s1) +/* AA963C 8024069C 4600008D */ trunc.w.s $f2, $f0 +/* AA9640 802406A0 44061000 */ mfc1 $a2, $f2 +/* AA9644 802406A4 0C0B2026 */ jal set_variable +/* AA9648 802406A8 0240202D */ daddu $a0, $s2, $zero +/* AA964C 802406AC 8E050000 */ lw $a1, ($s0) +/* AA9650 802406B0 26100004 */ addiu $s0, $s0, 4 +/* AA9654 802406B4 C620004C */ lwc1 $f0, 0x4c($s1) +/* AA9658 802406B8 4600008D */ trunc.w.s $f2, $f0 +/* AA965C 802406BC 44061000 */ mfc1 $a2, $f2 +/* AA9660 802406C0 0C0B2026 */ jal set_variable +/* AA9664 802406C4 0240202D */ daddu $a0, $s2, $zero +/* AA9668 802406C8 C6200050 */ lwc1 $f0, 0x50($s1) +/* AA966C 802406CC 8E050000 */ lw $a1, ($s0) +/* AA9670 802406D0 4600008D */ trunc.w.s $f2, $f0 +/* AA9674 802406D4 44061000 */ mfc1 $a2, $f2 +/* AA9678 802406D8 0C0B2026 */ jal set_variable +/* AA967C 802406DC 0240202D */ daddu $a0, $s2, $zero +/* AA9680 802406E0 8FBF001C */ lw $ra, 0x1c($sp) +/* AA9684 802406E4 8FB20018 */ lw $s2, 0x18($sp) +/* AA9688 802406E8 8FB10014 */ lw $s1, 0x14($sp) +/* AA968C 802406EC 8FB00010 */ lw $s0, 0x10($sp) +/* AA9690 802406F0 24020002 */ addiu $v0, $zero, 2 +/* AA9694 802406F4 03E00008 */ jr $ra +/* AA9698 802406F8 27BD0020 */ addiu $sp, $sp, 0x20 +/* AA969C 802406FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C.s b/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C.s deleted file mode 100644 index c6dc7aabb6..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024034C -/* A577FC 8024034C 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* A57800 80240350 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* A57804 80240354 80620000 */ lb $v0, ($v1) -/* A57808 80240358 10400004 */ beqz $v0, .L8024036C -/* A5780C 8024035C 2402FFFF */ addiu $v0, $zero, -1 -/* A57810 80240360 80620003 */ lb $v0, 3($v1) -/* A57814 80240364 080900DC */ j .L80240370 -/* A57818 80240368 AC8200A8 */ sw $v0, 0xa8($a0) -.L8024036C: -/* A5781C 8024036C AC8200A8 */ sw $v0, 0xa8($a0) -.L80240370: -/* A57820 80240370 03E00008 */ jr $ra -/* A57824 80240374 24020002 */ addiu $v0, $zero, 2 -/* A57828 80240378 00000000 */ nop -/* A5782C 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s b/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s new file mode 100644 index 0000000000..90ecc2bb63 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A574F0/func_8024034C_A577FC.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024034C_A577FC +/* A577FC 8024034C 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* A57800 80240350 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* A57804 80240354 80620000 */ lb $v0, ($v1) +/* A57808 80240358 10400004 */ beqz $v0, .L8024036C +/* A5780C 8024035C 2402FFFF */ addiu $v0, $zero, -1 +/* A57810 80240360 80620003 */ lb $v0, 3($v1) +/* A57814 80240364 080900DC */ j .L80240370 +/* A57818 80240368 AC8200A8 */ sw $v0, 0xa8($a0) +.L8024036C: +/* A5781C 8024036C AC8200A8 */ sw $v0, 0xa8($a0) +.L80240370: +/* A57820 80240370 03E00008 */ jr $ra +/* A57824 80240374 24020002 */ addiu $v0, $zero, 2 +/* A57828 80240378 00000000 */ nop +/* A5782C 8024037C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498.s deleted file mode 100644 index a7f389836f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240498 -/* A57948 80240498 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A5794C 8024049C AFB10014 */ sw $s1, 0x14($sp) -/* A57950 802404A0 0080882D */ daddu $s1, $a0, $zero -/* A57954 802404A4 AFBF001C */ sw $ra, 0x1c($sp) -/* A57958 802404A8 AFB20018 */ sw $s2, 0x18($sp) -/* A5795C 802404AC AFB00010 */ sw $s0, 0x10($sp) -/* A57960 802404B0 8E240084 */ lw $a0, 0x84($s1) -/* A57964 802404B4 0C04C3D6 */ jal get_item_entity -/* A57968 802404B8 00A0802D */ daddu $s0, $a1, $zero -/* A5796C 802404BC 12000005 */ beqz $s0, .L802404D4 -/* A57970 802404C0 0040902D */ daddu $s2, $v0, $zero -/* A57974 802404C4 C640000C */ lwc1 $f0, 0xc($s2) -/* A57978 802404C8 AE200074 */ sw $zero, 0x74($s1) -/* A5797C 802404CC AE20007C */ sw $zero, 0x7c($s1) -/* A57980 802404D0 E6200078 */ swc1 $f0, 0x78($s1) -.L802404D4: -/* A57984 802404D4 8E230074 */ lw $v1, 0x74($s1) -/* A57988 802404D8 10600005 */ beqz $v1, .L802404F0 -/* A5798C 802404DC 24020001 */ addiu $v0, $zero, 1 -/* A57990 802404E0 10620024 */ beq $v1, $v0, .L80240574 -/* A57994 802404E4 00000000 */ nop -/* A57998 802404E8 08090173 */ j .L802405CC -/* A5799C 802404EC 00000000 */ nop -.L802404F0: -/* A579A0 802404F0 3C013FC9 */ lui $at, 0x3fc9 -/* A579A4 802404F4 34210FD8 */ ori $at, $at, 0xfd8 -/* A579A8 802404F8 44810000 */ mtc1 $at, $f0 -/* A579AC 802404FC C62C007C */ lwc1 $f12, 0x7c($s1) -/* A579B0 80240500 46806320 */ cvt.s.w $f12, $f12 -/* A579B4 80240504 46006302 */ mul.s $f12, $f12, $f0 -/* A579B8 80240508 00000000 */ nop -/* A579BC 8024050C 3C0141F0 */ lui $at, 0x41f0 -/* A579C0 80240510 44810000 */ mtc1 $at, $f0 -/* A579C4 80240514 0C00A874 */ jal cos_rad -/* A579C8 80240518 46006303 */ div.s $f12, $f12, $f0 -/* A579CC 8024051C 3C013F80 */ lui $at, 0x3f80 -/* A579D0 80240520 44811000 */ mtc1 $at, $f2 -/* A579D4 80240524 00000000 */ nop -/* A579D8 80240528 46001081 */ sub.s $f2, $f2, $f0 -/* A579DC 8024052C 3C0141A0 */ lui $at, 0x41a0 -/* A579E0 80240530 44810000 */ mtc1 $at, $f0 -/* A579E4 80240534 00000000 */ nop -/* A579E8 80240538 46001082 */ mul.s $f2, $f2, $f0 -/* A579EC 8024053C 00000000 */ nop -/* A579F0 80240540 C6200078 */ lwc1 $f0, 0x78($s1) -/* A579F4 80240544 46020000 */ add.s $f0, $f0, $f2 -/* A579F8 80240548 E640000C */ swc1 $f0, 0xc($s2) -/* A579FC 8024054C 8E23007C */ lw $v1, 0x7c($s1) -/* A57A00 80240550 2402001E */ addiu $v0, $zero, 0x1e -/* A57A04 80240554 14620005 */ bne $v1, $v0, .L8024056C -/* A57A08 80240558 24620001 */ addiu $v0, $v1, 1 -/* A57A0C 8024055C 24020001 */ addiu $v0, $zero, 1 -/* A57A10 80240560 AE220074 */ sw $v0, 0x74($s1) -/* A57A14 80240564 08090173 */ j .L802405CC -/* A57A18 80240568 AE20007C */ sw $zero, 0x7c($s1) -.L8024056C: -/* A57A1C 8024056C 08090173 */ j .L802405CC -/* A57A20 80240570 AE22007C */ sw $v0, 0x7c($s1) -.L80240574: -/* A57A24 80240574 C62C007C */ lwc1 $f12, 0x7c($s1) -/* A57A28 80240578 0C00A8D4 */ jal cos_deg -/* A57A2C 8024057C 46806320 */ cvt.s.w $f12, $f12 -/* A57A30 80240580 3C014040 */ lui $at, 0x4040 -/* A57A34 80240584 44811000 */ mtc1 $at, $f2 -/* A57A38 80240588 00000000 */ nop -/* A57A3C 8024058C 46020002 */ mul.s $f0, $f0, $f2 -/* A57A40 80240590 00000000 */ nop -/* A57A44 80240594 3C014188 */ lui $at, 0x4188 -/* A57A48 80240598 44812000 */ mtc1 $at, $f4 -/* A57A4C 8024059C C6220078 */ lwc1 $f2, 0x78($s1) -/* A57A50 802405A0 46041080 */ add.s $f2, $f2, $f4 -/* A57A54 802405A4 46001080 */ add.s $f2, $f2, $f0 -/* A57A58 802405A8 E642000C */ swc1 $f2, 0xc($s2) -/* A57A5C 802405AC 8E22007C */ lw $v0, 0x7c($s1) -/* A57A60 802405B0 24420009 */ addiu $v0, $v0, 9 -/* A57A64 802405B4 44826000 */ mtc1 $v0, $f12 -/* A57A68 802405B8 00000000 */ nop -/* A57A6C 802405BC 0C00A6C9 */ jal clamp_angle -/* A57A70 802405C0 46806320 */ cvt.s.w $f12, $f12 -/* A57A74 802405C4 4600018D */ trunc.w.s $f6, $f0 -/* A57A78 802405C8 E626007C */ swc1 $f6, 0x7c($s1) -.L802405CC: -/* A57A7C 802405CC 8FBF001C */ lw $ra, 0x1c($sp) -/* A57A80 802405D0 8FB20018 */ lw $s2, 0x18($sp) -/* A57A84 802405D4 8FB10014 */ lw $s1, 0x14($sp) -/* A57A88 802405D8 8FB00010 */ lw $s0, 0x10($sp) -/* A57A8C 802405DC 0000102D */ daddu $v0, $zero, $zero -/* A57A90 802405E0 03E00008 */ jr $ra -/* A57A94 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s new file mode 100644 index 0000000000..40f57aab73 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240498_A57948.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240498_A57948 +/* A57948 80240498 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A5794C 8024049C AFB10014 */ sw $s1, 0x14($sp) +/* A57950 802404A0 0080882D */ daddu $s1, $a0, $zero +/* A57954 802404A4 AFBF001C */ sw $ra, 0x1c($sp) +/* A57958 802404A8 AFB20018 */ sw $s2, 0x18($sp) +/* A5795C 802404AC AFB00010 */ sw $s0, 0x10($sp) +/* A57960 802404B0 8E240084 */ lw $a0, 0x84($s1) +/* A57964 802404B4 0C04C3D6 */ jal get_item_entity +/* A57968 802404B8 00A0802D */ daddu $s0, $a1, $zero +/* A5796C 802404BC 12000005 */ beqz $s0, .L802404D4 +/* A57970 802404C0 0040902D */ daddu $s2, $v0, $zero +/* A57974 802404C4 C640000C */ lwc1 $f0, 0xc($s2) +/* A57978 802404C8 AE200074 */ sw $zero, 0x74($s1) +/* A5797C 802404CC AE20007C */ sw $zero, 0x7c($s1) +/* A57980 802404D0 E6200078 */ swc1 $f0, 0x78($s1) +.L802404D4: +/* A57984 802404D4 8E230074 */ lw $v1, 0x74($s1) +/* A57988 802404D8 10600005 */ beqz $v1, .L802404F0 +/* A5798C 802404DC 24020001 */ addiu $v0, $zero, 1 +/* A57990 802404E0 10620024 */ beq $v1, $v0, .L80240574 +/* A57994 802404E4 00000000 */ nop +/* A57998 802404E8 08090173 */ j .L802405CC +/* A5799C 802404EC 00000000 */ nop +.L802404F0: +/* A579A0 802404F0 3C013FC9 */ lui $at, 0x3fc9 +/* A579A4 802404F4 34210FD8 */ ori $at, $at, 0xfd8 +/* A579A8 802404F8 44810000 */ mtc1 $at, $f0 +/* A579AC 802404FC C62C007C */ lwc1 $f12, 0x7c($s1) +/* A579B0 80240500 46806320 */ cvt.s.w $f12, $f12 +/* A579B4 80240504 46006302 */ mul.s $f12, $f12, $f0 +/* A579B8 80240508 00000000 */ nop +/* A579BC 8024050C 3C0141F0 */ lui $at, 0x41f0 +/* A579C0 80240510 44810000 */ mtc1 $at, $f0 +/* A579C4 80240514 0C00A874 */ jal cos_rad +/* A579C8 80240518 46006303 */ div.s $f12, $f12, $f0 +/* A579CC 8024051C 3C013F80 */ lui $at, 0x3f80 +/* A579D0 80240520 44811000 */ mtc1 $at, $f2 +/* A579D4 80240524 00000000 */ nop +/* A579D8 80240528 46001081 */ sub.s $f2, $f2, $f0 +/* A579DC 8024052C 3C0141A0 */ lui $at, 0x41a0 +/* A579E0 80240530 44810000 */ mtc1 $at, $f0 +/* A579E4 80240534 00000000 */ nop +/* A579E8 80240538 46001082 */ mul.s $f2, $f2, $f0 +/* A579EC 8024053C 00000000 */ nop +/* A579F0 80240540 C6200078 */ lwc1 $f0, 0x78($s1) +/* A579F4 80240544 46020000 */ add.s $f0, $f0, $f2 +/* A579F8 80240548 E640000C */ swc1 $f0, 0xc($s2) +/* A579FC 8024054C 8E23007C */ lw $v1, 0x7c($s1) +/* A57A00 80240550 2402001E */ addiu $v0, $zero, 0x1e +/* A57A04 80240554 14620005 */ bne $v1, $v0, .L8024056C +/* A57A08 80240558 24620001 */ addiu $v0, $v1, 1 +/* A57A0C 8024055C 24020001 */ addiu $v0, $zero, 1 +/* A57A10 80240560 AE220074 */ sw $v0, 0x74($s1) +/* A57A14 80240564 08090173 */ j .L802405CC +/* A57A18 80240568 AE20007C */ sw $zero, 0x7c($s1) +.L8024056C: +/* A57A1C 8024056C 08090173 */ j .L802405CC +/* A57A20 80240570 AE22007C */ sw $v0, 0x7c($s1) +.L80240574: +/* A57A24 80240574 C62C007C */ lwc1 $f12, 0x7c($s1) +/* A57A28 80240578 0C00A8D4 */ jal cos_deg +/* A57A2C 8024057C 46806320 */ cvt.s.w $f12, $f12 +/* A57A30 80240580 3C014040 */ lui $at, 0x4040 +/* A57A34 80240584 44811000 */ mtc1 $at, $f2 +/* A57A38 80240588 00000000 */ nop +/* A57A3C 8024058C 46020002 */ mul.s $f0, $f0, $f2 +/* A57A40 80240590 00000000 */ nop +/* A57A44 80240594 3C014188 */ lui $at, 0x4188 +/* A57A48 80240598 44812000 */ mtc1 $at, $f4 +/* A57A4C 8024059C C6220078 */ lwc1 $f2, 0x78($s1) +/* A57A50 802405A0 46041080 */ add.s $f2, $f2, $f4 +/* A57A54 802405A4 46001080 */ add.s $f2, $f2, $f0 +/* A57A58 802405A8 E642000C */ swc1 $f2, 0xc($s2) +/* A57A5C 802405AC 8E22007C */ lw $v0, 0x7c($s1) +/* A57A60 802405B0 24420009 */ addiu $v0, $v0, 9 +/* A57A64 802405B4 44826000 */ mtc1 $v0, $f12 +/* A57A68 802405B8 00000000 */ nop +/* A57A6C 802405BC 0C00A6C9 */ jal clamp_angle +/* A57A70 802405C0 46806320 */ cvt.s.w $f12, $f12 +/* A57A74 802405C4 4600018D */ trunc.w.s $f6, $f0 +/* A57A78 802405C8 E626007C */ swc1 $f6, 0x7c($s1) +.L802405CC: +/* A57A7C 802405CC 8FBF001C */ lw $ra, 0x1c($sp) +/* A57A80 802405D0 8FB20018 */ lw $s2, 0x18($sp) +/* A57A84 802405D4 8FB10014 */ lw $s1, 0x14($sp) +/* A57A88 802405D8 8FB00010 */ lw $s0, 0x10($sp) +/* A57A8C 802405DC 0000102D */ daddu $v0, $zero, $zero +/* A57A90 802405E0 03E00008 */ jr $ra +/* A57A94 802405E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C.s deleted file mode 100644 index b8d7beced9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024063C -/* A57AEC 8024063C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A57AF0 80240640 AFBF0010 */ sw $ra, 0x10($sp) -/* A57AF4 80240644 0C04417A */ jal get_entity_by_index -/* A57AF8 80240648 8C840084 */ lw $a0, 0x84($a0) -/* A57AFC 8024064C 0040182D */ daddu $v1, $v0, $zero -/* A57B00 80240650 8C640000 */ lw $a0, ($v1) -/* A57B04 80240654 3C050010 */ lui $a1, 0x10 -/* A57B08 80240658 00852025 */ or $a0, $a0, $a1 -/* A57B0C 8024065C AC640000 */ sw $a0, ($v1) -/* A57B10 80240660 8FBF0010 */ lw $ra, 0x10($sp) -/* A57B14 80240664 24020002 */ addiu $v0, $zero, 2 -/* A57B18 80240668 03E00008 */ jr $ra -/* A57B1C 8024066C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C_A57AEC.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C_A57AEC.s new file mode 100644 index 0000000000..dafaf03a7a --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024063C_A57AEC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024063C_A57AEC +/* A57AEC 8024063C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A57AF0 80240640 AFBF0010 */ sw $ra, 0x10($sp) +/* A57AF4 80240644 0C04417A */ jal get_entity_by_index +/* A57AF8 80240648 8C840084 */ lw $a0, 0x84($a0) +/* A57AFC 8024064C 0040182D */ daddu $v1, $v0, $zero +/* A57B00 80240650 8C640000 */ lw $a0, ($v1) +/* A57B04 80240654 3C050010 */ lui $a1, 0x10 +/* A57B08 80240658 00852025 */ or $a0, $a0, $a1 +/* A57B0C 8024065C AC640000 */ sw $a0, ($v1) +/* A57B10 80240660 8FBF0010 */ lw $ra, 0x10($sp) +/* A57B14 80240664 24020002 */ addiu $v0, $zero, 2 +/* A57B18 80240668 03E00008 */ jr $ra +/* A57B1C 8024066C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670.s deleted file mode 100644 index 4d6deb1a56..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240670 -/* A57B20 80240670 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A57B24 80240674 AFB20018 */ sw $s2, 0x18($sp) -/* A57B28 80240678 0080902D */ daddu $s2, $a0, $zero -/* A57B2C 8024067C AFBF001C */ sw $ra, 0x1c($sp) -/* A57B30 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* A57B34 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* A57B38 80240688 8E50000C */ lw $s0, 0xc($s2) -/* A57B3C 8024068C 8E050000 */ lw $a1, ($s0) -/* A57B40 80240690 0C0B1EAF */ jal get_variable -/* A57B44 80240694 26100004 */ addiu $s0, $s0, 4 -/* A57B48 80240698 0C04417A */ jal get_entity_by_index -/* A57B4C 8024069C 0040202D */ daddu $a0, $v0, $zero -/* A57B50 802406A0 8E050000 */ lw $a1, ($s0) -/* A57B54 802406A4 26100004 */ addiu $s0, $s0, 4 -/* A57B58 802406A8 0040882D */ daddu $s1, $v0, $zero -/* A57B5C 802406AC C6200048 */ lwc1 $f0, 0x48($s1) -/* A57B60 802406B0 4600008D */ trunc.w.s $f2, $f0 -/* A57B64 802406B4 44061000 */ mfc1 $a2, $f2 -/* A57B68 802406B8 0C0B2026 */ jal set_variable -/* A57B6C 802406BC 0240202D */ daddu $a0, $s2, $zero -/* A57B70 802406C0 8E050000 */ lw $a1, ($s0) -/* A57B74 802406C4 26100004 */ addiu $s0, $s0, 4 -/* A57B78 802406C8 C620004C */ lwc1 $f0, 0x4c($s1) -/* A57B7C 802406CC 4600008D */ trunc.w.s $f2, $f0 -/* A57B80 802406D0 44061000 */ mfc1 $a2, $f2 -/* A57B84 802406D4 0C0B2026 */ jal set_variable -/* A57B88 802406D8 0240202D */ daddu $a0, $s2, $zero -/* A57B8C 802406DC C6200050 */ lwc1 $f0, 0x50($s1) -/* A57B90 802406E0 8E050000 */ lw $a1, ($s0) -/* A57B94 802406E4 4600008D */ trunc.w.s $f2, $f0 -/* A57B98 802406E8 44061000 */ mfc1 $a2, $f2 -/* A57B9C 802406EC 0C0B2026 */ jal set_variable -/* A57BA0 802406F0 0240202D */ daddu $a0, $s2, $zero -/* A57BA4 802406F4 8FBF001C */ lw $ra, 0x1c($sp) -/* A57BA8 802406F8 8FB20018 */ lw $s2, 0x18($sp) -/* A57BAC 802406FC 8FB10014 */ lw $s1, 0x14($sp) -/* A57BB0 80240700 8FB00010 */ lw $s0, 0x10($sp) -/* A57BB4 80240704 24020002 */ addiu $v0, $zero, 2 -/* A57BB8 80240708 03E00008 */ jr $ra -/* A57BBC 8024070C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s new file mode 100644 index 0000000000..fc77a083cb --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240670_A57B20.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240670_A57B20 +/* A57B20 80240670 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A57B24 80240674 AFB20018 */ sw $s2, 0x18($sp) +/* A57B28 80240678 0080902D */ daddu $s2, $a0, $zero +/* A57B2C 8024067C AFBF001C */ sw $ra, 0x1c($sp) +/* A57B30 80240680 AFB10014 */ sw $s1, 0x14($sp) +/* A57B34 80240684 AFB00010 */ sw $s0, 0x10($sp) +/* A57B38 80240688 8E50000C */ lw $s0, 0xc($s2) +/* A57B3C 8024068C 8E050000 */ lw $a1, ($s0) +/* A57B40 80240690 0C0B1EAF */ jal get_variable +/* A57B44 80240694 26100004 */ addiu $s0, $s0, 4 +/* A57B48 80240698 0C04417A */ jal get_entity_by_index +/* A57B4C 8024069C 0040202D */ daddu $a0, $v0, $zero +/* A57B50 802406A0 8E050000 */ lw $a1, ($s0) +/* A57B54 802406A4 26100004 */ addiu $s0, $s0, 4 +/* A57B58 802406A8 0040882D */ daddu $s1, $v0, $zero +/* A57B5C 802406AC C6200048 */ lwc1 $f0, 0x48($s1) +/* A57B60 802406B0 4600008D */ trunc.w.s $f2, $f0 +/* A57B64 802406B4 44061000 */ mfc1 $a2, $f2 +/* A57B68 802406B8 0C0B2026 */ jal set_variable +/* A57B6C 802406BC 0240202D */ daddu $a0, $s2, $zero +/* A57B70 802406C0 8E050000 */ lw $a1, ($s0) +/* A57B74 802406C4 26100004 */ addiu $s0, $s0, 4 +/* A57B78 802406C8 C620004C */ lwc1 $f0, 0x4c($s1) +/* A57B7C 802406CC 4600008D */ trunc.w.s $f2, $f0 +/* A57B80 802406D0 44061000 */ mfc1 $a2, $f2 +/* A57B84 802406D4 0C0B2026 */ jal set_variable +/* A57B88 802406D8 0240202D */ daddu $a0, $s2, $zero +/* A57B8C 802406DC C6200050 */ lwc1 $f0, 0x50($s1) +/* A57B90 802406E0 8E050000 */ lw $a1, ($s0) +/* A57B94 802406E4 4600008D */ trunc.w.s $f2, $f0 +/* A57B98 802406E8 44061000 */ mfc1 $a2, $f2 +/* A57B9C 802406EC 0C0B2026 */ jal set_variable +/* A57BA0 802406F0 0240202D */ daddu $a0, $s2, $zero +/* A57BA4 802406F4 8FBF001C */ lw $ra, 0x1c($sp) +/* A57BA8 802406F8 8FB20018 */ lw $s2, 0x18($sp) +/* A57BAC 802406FC 8FB10014 */ lw $s1, 0x14($sp) +/* A57BB0 80240700 8FB00010 */ lw $s0, 0x10($sp) +/* A57BB4 80240704 24020002 */ addiu $v0, $zero, 2 +/* A57BB8 80240708 03E00008 */ jr $ra +/* A57BBC 8024070C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840.s deleted file mode 100644 index 0f03fd31ea..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240840 -/* A57CF0 80240840 3C038011 */ lui $v1, 0x8011 -/* A57CF4 80240844 8063EBB3 */ lb $v1, -0x144d($v1) -/* A57CF8 80240848 24020008 */ addiu $v0, $zero, 8 -/* A57CFC 8024084C 54620003 */ bnel $v1, $v0, .L8024085C -/* A57D00 80240850 AC8000A8 */ sw $zero, 0xa8($a0) -/* A57D04 80240854 24020001 */ addiu $v0, $zero, 1 -/* A57D08 80240858 AC8200A8 */ sw $v0, 0xa8($a0) -.L8024085C: -/* A57D0C 8024085C 03E00008 */ jr $ra -/* A57D10 80240860 24020002 */ addiu $v0, $zero, 2 -/* A57D14 80240864 00000000 */ nop -/* A57D18 80240868 00000000 */ nop -/* A57D1C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s new file mode 100644 index 0000000000..12b4367cd1 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_80240840_A57CF0.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240840_A57CF0 +/* A57CF0 80240840 3C038011 */ lui $v1, 0x8011 +/* A57CF4 80240844 8063EBB3 */ lb $v1, -0x144d($v1) +/* A57CF8 80240848 24020008 */ addiu $v0, $zero, 8 +/* A57CFC 8024084C 54620003 */ bnel $v1, $v0, .L8024085C +/* A57D00 80240850 AC8000A8 */ sw $zero, 0xa8($a0) +/* A57D04 80240854 24020001 */ addiu $v0, $zero, 1 +/* A57D08 80240858 AC8200A8 */ sw $v0, 0xa8($a0) +.L8024085C: +/* A57D0C 8024085C 03E00008 */ jr $ra +/* A57D10 80240860 24020002 */ addiu $v0, $zero, 2 +/* A57D14 80240864 00000000 */ nop +/* A57D18 80240868 00000000 */ nop +/* A57D1C 8024086C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s index 9e901faef9..c21fc22058 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802401F0_A60BC0.s @@ -55,7 +55,7 @@ glabel func_802401F0_A60BC0 /* A60C88 802402B8 080900C4 */ j .L80240310 /* A60C8C 802402BC AE030028 */ sw $v1, 0x28($s0) .L802402C0: -/* A60C90 802402C0 0C090000 */ jal func_80240000 +/* A60C90 802402C0 0C090000 */ jal func_80240000_A609D0 /* A60C94 802402C4 0240202D */ daddu $a0, $s2, $zero /* A60C98 802402C8 0040202D */ daddu $a0, $v0, $zero /* A60C9C 802402CC 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334.s deleted file mode 100644 index fbfa817fe4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240334 -/* A60D04 80240334 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A60D08 80240338 AFB20038 */ sw $s2, 0x38($sp) -/* A60D0C 8024033C 0080902D */ daddu $s2, $a0, $zero -/* A60D10 80240340 AFBF003C */ sw $ra, 0x3c($sp) -/* A60D14 80240344 AFB10034 */ sw $s1, 0x34($sp) -/* A60D18 80240348 AFB00030 */ sw $s0, 0x30($sp) -/* A60D1C 8024034C 8E510148 */ lw $s1, 0x148($s2) -/* A60D20 80240350 0C00EABB */ jal get_npc_unsafe -/* A60D24 80240354 86240008 */ lh $a0, 8($s1) -/* A60D28 80240358 0040802D */ daddu $s0, $v0, $zero -/* A60D2C 8024035C 9602008E */ lhu $v0, 0x8e($s0) -/* A60D30 80240360 2442FFFF */ addiu $v0, $v0, -1 -/* A60D34 80240364 A602008E */ sh $v0, 0x8e($s0) -/* A60D38 80240368 00021400 */ sll $v0, $v0, 0x10 -/* A60D3C 8024036C 1C40002B */ bgtz $v0, .L8024041C -/* A60D40 80240370 00000000 */ nop -/* A60D44 80240374 0C090000 */ jal func_80240000 -/* A60D48 80240378 0240202D */ daddu $a0, $s2, $zero -/* A60D4C 8024037C 0040202D */ daddu $a0, $v0, $zero -/* A60D50 80240380 0481001A */ bgez $a0, .L802403EC -/* A60D54 80240384 2402000F */ addiu $v0, $zero, 0xf -/* A60D58 80240388 24040002 */ addiu $a0, $zero, 2 -/* A60D5C 8024038C 860300A8 */ lh $v1, 0xa8($s0) -/* A60D60 80240390 AFA2001C */ sw $v0, 0x1c($sp) -/* A60D64 80240394 27A20028 */ addiu $v0, $sp, 0x28 -/* A60D68 80240398 0200282D */ daddu $a1, $s0, $zero -/* A60D6C 8024039C 3C013F80 */ lui $at, 0x3f80 -/* A60D70 802403A0 44810000 */ mtc1 $at, $f0 -/* A60D74 802403A4 3C014000 */ lui $at, 0x4000 -/* A60D78 802403A8 44811000 */ mtc1 $at, $f2 -/* A60D7C 802403AC 3C01C1A0 */ lui $at, 0xc1a0 -/* A60D80 802403B0 44812000 */ mtc1 $at, $f4 -/* A60D84 802403B4 44833000 */ mtc1 $v1, $f6 -/* A60D88 802403B8 00000000 */ nop -/* A60D8C 802403BC 468031A0 */ cvt.s.w $f6, $f6 -/* A60D90 802403C0 44073000 */ mfc1 $a3, $f6 -/* A60D94 802403C4 0000302D */ daddu $a2, $zero, $zero -/* A60D98 802403C8 AFA20020 */ sw $v0, 0x20($sp) -/* A60D9C 802403CC E7A00010 */ swc1 $f0, 0x10($sp) -/* A60DA0 802403D0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A60DA4 802403D4 0C01BFA4 */ jal fx_emote -/* A60DA8 802403D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A60DAC 802403DC 8E2200CC */ lw $v0, 0xcc($s1) -/* A60DB0 802403E0 8C420000 */ lw $v0, ($v0) -/* A60DB4 802403E4 08090103 */ j .L8024040C -/* A60DB8 802403E8 AE020028 */ sw $v0, 0x28($s0) -.L802403EC: -/* A60DBC 802403EC 8E2200CC */ lw $v0, 0xcc($s1) -/* A60DC0 802403F0 8C420024 */ lw $v0, 0x24($v0) -/* A60DC4 802403F4 0C00FB3A */ jal get_enemy -/* A60DC8 802403F8 AE020028 */ sw $v0, 0x28($s0) -/* A60DCC 802403FC 86240008 */ lh $a0, 8($s1) -/* A60DD0 80240400 24030001 */ addiu $v1, $zero, 1 -/* A60DD4 80240404 AC43006C */ sw $v1, 0x6c($v0) -/* A60DD8 80240408 AC44007C */ sw $a0, 0x7c($v0) -.L8024040C: -/* A60DDC 8024040C 96220076 */ lhu $v0, 0x76($s1) -/* A60DE0 80240410 A602008E */ sh $v0, 0x8e($s0) -/* A60DE4 80240414 24020021 */ addiu $v0, $zero, 0x21 -/* A60DE8 80240418 AE420070 */ sw $v0, 0x70($s2) -.L8024041C: -/* A60DEC 8024041C 8FBF003C */ lw $ra, 0x3c($sp) -/* A60DF0 80240420 8FB20038 */ lw $s2, 0x38($sp) -/* A60DF4 80240424 8FB10034 */ lw $s1, 0x34($sp) -/* A60DF8 80240428 8FB00030 */ lw $s0, 0x30($sp) -/* A60DFC 8024042C 03E00008 */ jr $ra -/* A60E00 80240430 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s new file mode 100644 index 0000000000..acd4a42b6b --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240334_A60D04.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240334_A60D04 +/* A60D04 80240334 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A60D08 80240338 AFB20038 */ sw $s2, 0x38($sp) +/* A60D0C 8024033C 0080902D */ daddu $s2, $a0, $zero +/* A60D10 80240340 AFBF003C */ sw $ra, 0x3c($sp) +/* A60D14 80240344 AFB10034 */ sw $s1, 0x34($sp) +/* A60D18 80240348 AFB00030 */ sw $s0, 0x30($sp) +/* A60D1C 8024034C 8E510148 */ lw $s1, 0x148($s2) +/* A60D20 80240350 0C00EABB */ jal get_npc_unsafe +/* A60D24 80240354 86240008 */ lh $a0, 8($s1) +/* A60D28 80240358 0040802D */ daddu $s0, $v0, $zero +/* A60D2C 8024035C 9602008E */ lhu $v0, 0x8e($s0) +/* A60D30 80240360 2442FFFF */ addiu $v0, $v0, -1 +/* A60D34 80240364 A602008E */ sh $v0, 0x8e($s0) +/* A60D38 80240368 00021400 */ sll $v0, $v0, 0x10 +/* A60D3C 8024036C 1C40002B */ bgtz $v0, .L8024041C +/* A60D40 80240370 00000000 */ nop +/* A60D44 80240374 0C090000 */ jal func_80240000_A609D0 +/* A60D48 80240378 0240202D */ daddu $a0, $s2, $zero +/* A60D4C 8024037C 0040202D */ daddu $a0, $v0, $zero +/* A60D50 80240380 0481001A */ bgez $a0, .L802403EC +/* A60D54 80240384 2402000F */ addiu $v0, $zero, 0xf +/* A60D58 80240388 24040002 */ addiu $a0, $zero, 2 +/* A60D5C 8024038C 860300A8 */ lh $v1, 0xa8($s0) +/* A60D60 80240390 AFA2001C */ sw $v0, 0x1c($sp) +/* A60D64 80240394 27A20028 */ addiu $v0, $sp, 0x28 +/* A60D68 80240398 0200282D */ daddu $a1, $s0, $zero +/* A60D6C 8024039C 3C013F80 */ lui $at, 0x3f80 +/* A60D70 802403A0 44810000 */ mtc1 $at, $f0 +/* A60D74 802403A4 3C014000 */ lui $at, 0x4000 +/* A60D78 802403A8 44811000 */ mtc1 $at, $f2 +/* A60D7C 802403AC 3C01C1A0 */ lui $at, 0xc1a0 +/* A60D80 802403B0 44812000 */ mtc1 $at, $f4 +/* A60D84 802403B4 44833000 */ mtc1 $v1, $f6 +/* A60D88 802403B8 00000000 */ nop +/* A60D8C 802403BC 468031A0 */ cvt.s.w $f6, $f6 +/* A60D90 802403C0 44073000 */ mfc1 $a3, $f6 +/* A60D94 802403C4 0000302D */ daddu $a2, $zero, $zero +/* A60D98 802403C8 AFA20020 */ sw $v0, 0x20($sp) +/* A60D9C 802403CC E7A00010 */ swc1 $f0, 0x10($sp) +/* A60DA0 802403D0 E7A20014 */ swc1 $f2, 0x14($sp) +/* A60DA4 802403D4 0C01BFA4 */ jal fx_emote +/* A60DA8 802403D8 E7A40018 */ swc1 $f4, 0x18($sp) +/* A60DAC 802403DC 8E2200CC */ lw $v0, 0xcc($s1) +/* A60DB0 802403E0 8C420000 */ lw $v0, ($v0) +/* A60DB4 802403E4 08090103 */ j .L8024040C +/* A60DB8 802403E8 AE020028 */ sw $v0, 0x28($s0) +.L802403EC: +/* A60DBC 802403EC 8E2200CC */ lw $v0, 0xcc($s1) +/* A60DC0 802403F0 8C420024 */ lw $v0, 0x24($v0) +/* A60DC4 802403F4 0C00FB3A */ jal get_enemy +/* A60DC8 802403F8 AE020028 */ sw $v0, 0x28($s0) +/* A60DCC 802403FC 86240008 */ lh $a0, 8($s1) +/* A60DD0 80240400 24030001 */ addiu $v1, $zero, 1 +/* A60DD4 80240404 AC43006C */ sw $v1, 0x6c($v0) +/* A60DD8 80240408 AC44007C */ sw $a0, 0x7c($v0) +.L8024040C: +/* A60DDC 8024040C 96220076 */ lhu $v0, 0x76($s1) +/* A60DE0 80240410 A602008E */ sh $v0, 0x8e($s0) +/* A60DE4 80240414 24020021 */ addiu $v0, $zero, 0x21 +/* A60DE8 80240418 AE420070 */ sw $v0, 0x70($s2) +.L8024041C: +/* A60DEC 8024041C 8FBF003C */ lw $ra, 0x3c($sp) +/* A60DF0 80240420 8FB20038 */ lw $s2, 0x38($sp) +/* A60DF4 80240424 8FB10034 */ lw $s1, 0x34($sp) +/* A60DF8 80240428 8FB00030 */ lw $s0, 0x30($sp) +/* A60DFC 8024042C 03E00008 */ jr $ra +/* A60E00 80240430 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C.s deleted file mode 100644 index e342a3887e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024055C -/* A60F2C 8024055C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A60F30 80240560 AFB7004C */ sw $s7, 0x4c($sp) -/* A60F34 80240564 0080B82D */ daddu $s7, $a0, $zero -/* A60F38 80240568 AFB10034 */ sw $s1, 0x34($sp) -/* A60F3C 8024056C 00A0882D */ daddu $s1, $a1, $zero -/* A60F40 80240570 AFBF0050 */ sw $ra, 0x50($sp) -/* A60F44 80240574 AFB60048 */ sw $s6, 0x48($sp) -/* A60F48 80240578 AFB50044 */ sw $s5, 0x44($sp) -/* A60F4C 8024057C AFB40040 */ sw $s4, 0x40($sp) -/* A60F50 80240580 AFB3003C */ sw $s3, 0x3c($sp) -/* A60F54 80240584 AFB20038 */ sw $s2, 0x38($sp) -/* A60F58 80240588 AFB00030 */ sw $s0, 0x30($sp) -/* A60F5C 8024058C 8EF30148 */ lw $s3, 0x148($s7) -/* A60F60 80240590 86640008 */ lh $a0, 8($s3) -/* A60F64 80240594 8EF0000C */ lw $s0, 0xc($s7) -/* A60F68 80240598 0C00FB5A */ jal get_enemy_safe -/* A60F6C 8024059C 0000B02D */ daddu $s6, $zero, $zero -/* A60F70 802405A0 10400131 */ beqz $v0, .L80240A68 -/* A60F74 802405A4 24020005 */ addiu $v0, $zero, 5 -/* A60F78 802405A8 8E63006C */ lw $v1, 0x6c($s3) -/* A60F7C 802405AC 1062012F */ beq $v1, $v0, .L80240A6C -/* A60F80 802405B0 0000102D */ daddu $v0, $zero, $zero -/* A60F84 802405B4 8E050000 */ lw $a1, ($s0) -/* A60F88 802405B8 0C0B1EAF */ jal get_variable -/* A60F8C 802405BC 02E0202D */ daddu $a0, $s7, $zero -/* A60F90 802405C0 86640008 */ lh $a0, 8($s3) -/* A60F94 802405C4 0C00EABB */ jal get_npc_unsafe -/* A60F98 802405C8 0040A82D */ daddu $s5, $v0, $zero -/* A60F9C 802405CC 8E630070 */ lw $v1, 0x70($s3) -/* A60FA0 802405D0 30630002 */ andi $v1, $v1, 2 -/* A60FA4 802405D4 10600008 */ beqz $v1, .L802405F8 -/* A60FA8 802405D8 0040902D */ daddu $s2, $v0, $zero -/* A60FAC 802405DC 964200A8 */ lhu $v0, 0xa8($s2) -/* A60FB0 802405E0 00021400 */ sll $v0, $v0, 0x10 -/* A60FB4 802405E4 00021C03 */ sra $v1, $v0, 0x10 -/* A60FB8 802405E8 000217C2 */ srl $v0, $v0, 0x1f -/* A60FBC 802405EC 00621821 */ addu $v1, $v1, $v0 -/* A60FC0 802405F0 00031843 */ sra $v1, $v1, 1 -/* A60FC4 802405F4 A24300AB */ sb $v1, 0xab($s2) -.L802405F8: -/* A60FC8 802405F8 16200005 */ bnez $s1, .L80240610 -/* A60FCC 802405FC 3C030004 */ lui $v1, 4 -/* A60FD0 80240600 8E6200B0 */ lw $v0, 0xb0($s3) -/* A60FD4 80240604 30420004 */ andi $v0, $v0, 4 -/* A60FD8 80240608 10400019 */ beqz $v0, .L80240670 -/* A60FDC 8024060C 00000000 */ nop -.L80240610: -/* A60FE0 80240610 34630102 */ ori $v1, $v1, 0x102 -/* A60FE4 80240614 AEE00070 */ sw $zero, 0x70($s7) -/* A60FE8 80240618 8E420000 */ lw $v0, ($s2) -/* A60FEC 8024061C 0240202D */ daddu $a0, $s2, $zero -/* A60FF0 80240620 A640008E */ sh $zero, 0x8e($s2) -/* A60FF4 80240624 00431025 */ or $v0, $v0, $v1 -/* A60FF8 80240628 0C00EAFF */ jal disable_npc_shadow -/* A60FFC 8024062C AE420000 */ sw $v0, ($s2) -/* A61000 80240630 3C041F30 */ lui $a0, 0x1f30 -/* A61004 80240634 8E420000 */ lw $v0, ($s2) -/* A61008 80240638 2403F7FF */ addiu $v1, $zero, -0x801 -/* A6100C 8024063C 00431024 */ and $v0, $v0, $v1 -/* A61010 80240640 AE420000 */ sw $v0, ($s2) -/* A61014 80240644 8E620000 */ lw $v0, ($s3) -/* A61018 80240648 8E6300B0 */ lw $v1, 0xb0($s3) -/* A6101C 8024064C 34840040 */ ori $a0, $a0, 0x40 -/* A61020 80240650 AE60006C */ sw $zero, 0x6c($s3) -/* A61024 80240654 00441025 */ or $v0, $v0, $a0 -/* A61028 80240658 AE620000 */ sw $v0, ($s3) -/* A6102C 8024065C 30620004 */ andi $v0, $v1, 4 -/* A61030 80240660 10400003 */ beqz $v0, .L80240670 -/* A61034 80240664 2402FFFB */ addiu $v0, $zero, -5 -/* A61038 80240668 00621024 */ and $v0, $v1, $v0 -/* A6103C 8024066C AE6200B0 */ sw $v0, 0xb0($s3) -.L80240670: -/* A61040 80240670 8EE30070 */ lw $v1, 0x70($s7) -/* A61044 80240674 24100001 */ addiu $s0, $zero, 1 -/* A61048 80240678 10700012 */ beq $v1, $s0, .L802406C4 -/* A6104C 8024067C 28620002 */ slti $v0, $v1, 2 -/* A61050 80240680 10400005 */ beqz $v0, .L80240698 -/* A61054 80240684 24020002 */ addiu $v0, $zero, 2 -/* A61058 80240688 10600007 */ beqz $v1, .L802406A8 -/* A6105C 8024068C 0000102D */ daddu $v0, $zero, $zero -/* A61060 80240690 0809029B */ j .L80240A6C -/* A61064 80240694 00000000 */ nop -.L80240698: -/* A61068 80240698 1062005B */ beq $v1, $v0, .L80240808 -/* A6106C 8024069C 0000102D */ daddu $v0, $zero, $zero -/* A61070 802406A0 0809029B */ j .L80240A6C -/* A61074 802406A4 00000000 */ nop -.L802406A8: -/* A61078 802406A8 8E420000 */ lw $v0, ($s2) -/* A6107C 802406AC 0240202D */ daddu $a0, $s2, $zero -/* A61080 802406B0 34420002 */ ori $v0, $v0, 2 -/* A61084 802406B4 0C00EAFF */ jal disable_npc_shadow -/* A61088 802406B8 AE420000 */ sw $v0, ($s2) -/* A6108C 802406BC AE60006C */ sw $zero, 0x6c($s3) -/* A61090 802406C0 AEF00070 */ sw $s0, 0x70($s7) -.L802406C4: -/* A61094 802406C4 8E74006C */ lw $s4, 0x6c($s3) -/* A61098 802406C8 24020001 */ addiu $v0, $zero, 1 -/* A6109C 802406CC 168200E7 */ bne $s4, $v0, .L80240A6C -/* A610A0 802406D0 0000102D */ daddu $v0, $zero, $zero -/* A610A4 802406D4 8E64007C */ lw $a0, 0x7c($s3) -/* A610A8 802406D8 24110002 */ addiu $s1, $zero, 2 -/* A610AC 802406DC 0C00EABB */ jal get_npc_unsafe -/* A610B0 802406E0 AE71006C */ sw $s1, 0x6c($s3) -/* A610B4 802406E4 0040802D */ daddu $s0, $v0, $zero -/* A610B8 802406E8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A610BC 802406EC E6400038 */ swc1 $f0, 0x38($s2) -/* A610C0 802406F0 C6000040 */ lwc1 $f0, 0x40($s0) -/* A610C4 802406F4 E6400040 */ swc1 $f0, 0x40($s2) -/* A610C8 802406F8 C6020034 */ lwc1 $f2, 0x34($s0) -/* A610CC 802406FC 3C014387 */ lui $at, 0x4387 -/* A610D0 80240700 44810000 */ mtc1 $at, $f0 -/* A610D4 80240704 26440038 */ addiu $a0, $s2, 0x38 -/* A610D8 80240708 46020001 */ sub.s $f0, $f0, $f2 -/* A610DC 8024070C C6680078 */ lwc1 $f8, 0x78($s3) -/* A610E0 80240710 46804220 */ cvt.s.w $f8, $f8 -/* A610E4 80240714 44064000 */ mfc1 $a2, $f8 -/* A610E8 80240718 44070000 */ mfc1 $a3, $f0 -/* A610EC 8024071C 0C00A7E7 */ jal add_vec2D_polar -/* A610F0 80240720 26450040 */ addiu $a1, $s2, 0x40 -/* A610F4 80240724 C600003C */ lwc1 $f0, 0x3c($s0) -/* A610F8 80240728 C6620074 */ lwc1 $f2, 0x74($s3) -/* A610FC 8024072C 468010A0 */ cvt.s.w $f2, $f2 -/* A61100 80240730 46020000 */ add.s $f0, $f0, $f2 -/* A61104 80240734 E640003C */ swc1 $f0, 0x3c($s2) -/* A61108 80240738 A2740007 */ sb $s4, 7($s3) -/* A6110C 8024073C C6400038 */ lwc1 $f0, 0x38($s2) -/* A61110 80240740 4600020D */ trunc.w.s $f8, $f0 -/* A61114 80240744 44024000 */ mfc1 $v0, $f8 -/* A61118 80240748 00000000 */ nop -/* A6111C 8024074C A6620010 */ sh $v0, 0x10($s3) -/* A61120 80240750 C640003C */ lwc1 $f0, 0x3c($s2) -/* A61124 80240754 4600020D */ trunc.w.s $f8, $f0 -/* A61128 80240758 44024000 */ mfc1 $v0, $f8 -/* A6112C 8024075C 00000000 */ nop -/* A61130 80240760 A6620012 */ sh $v0, 0x12($s3) -/* A61134 80240764 C6400040 */ lwc1 $f0, 0x40($s2) -/* A61138 80240768 4600020D */ trunc.w.s $f8, $f0 -/* A6113C 8024076C 44024000 */ mfc1 $v0, $f8 -/* A61140 80240770 00000000 */ nop -/* A61144 80240774 A6620014 */ sh $v0, 0x14($s3) -/* A61148 80240778 AE400044 */ sw $zero, 0x44($s2) -/* A6114C 8024077C AE400048 */ sw $zero, 0x48($s2) -/* A61150 80240780 AE40004C */ sw $zero, 0x4c($s2) -/* A61154 80240784 C6A00000 */ lwc1 $f0, ($s5) -/* A61158 80240788 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A6115C 8024078C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A61160 80240790 C64C0038 */ lwc1 $f12, 0x38($s2) -/* A61164 80240794 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A61168 80240798 E6400018 */ swc1 $f0, 0x18($s2) -/* A6116C 8024079C 8C460028 */ lw $a2, 0x28($v0) -/* A61170 802407A0 0C00A720 */ jal atan2 -/* A61174 802407A4 8C470030 */ lw $a3, 0x30($v0) -/* A61178 802407A8 E640000C */ swc1 $f0, 0xc($s2) -/* A6117C 802407AC C6A0000C */ lwc1 $f0, 0xc($s5) -/* A61180 802407B0 8E420000 */ lw $v0, ($s2) -/* A61184 802407B4 0240202D */ daddu $a0, $s2, $zero -/* A61188 802407B8 E640001C */ swc1 $f0, 0x1c($s2) -/* A6118C 802407BC C6A00010 */ lwc1 $f0, 0x10($s5) -/* A61190 802407C0 2403FFFD */ addiu $v1, $zero, -3 -/* A61194 802407C4 E6400014 */ swc1 $f0, 0x14($s2) -/* A61198 802407C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A6119C 802407CC 00431024 */ and $v0, $v0, $v1 -/* A611A0 802407D0 AE420000 */ sw $v0, ($s2) -/* A611A4 802407D4 0C00EAE8 */ jal enable_npc_shadow -/* A611A8 802407D8 E6400064 */ swc1 $f0, 0x64($s2) -/* A611AC 802407DC 8E420000 */ lw $v0, ($s2) -/* A611B0 802407E0 3C03E0FF */ lui $v1, 0xe0ff -/* A611B4 802407E4 34420800 */ ori $v0, $v0, 0x800 -/* A611B8 802407E8 AE420000 */ sw $v0, ($s2) -/* A611BC 802407EC 8E620000 */ lw $v0, ($s3) -/* A611C0 802407F0 3463FFFF */ ori $v1, $v1, 0xffff -/* A611C4 802407F4 00431024 */ and $v0, $v0, $v1 -/* A611C8 802407F8 AE620000 */ sw $v0, ($s3) -/* A611CC 802407FC 2402005A */ addiu $v0, $zero, 0x5a -/* A611D0 80240800 A642008E */ sh $v0, 0x8e($s2) -/* A611D4 80240804 AEF10070 */ sw $s1, 0x70($s7) -.L80240808: -/* A611D8 80240808 0000202D */ daddu $a0, $zero, $zero -/* A611DC 8024080C 27B00020 */ addiu $s0, $sp, 0x20 -/* A611E0 80240810 864200A8 */ lh $v0, 0xa8($s2) -/* A611E4 80240814 3C013FE0 */ lui $at, 0x3fe0 -/* A611E8 80240818 44810800 */ mtc1 $at, $f1 -/* A611EC 8024081C 44800000 */ mtc1 $zero, $f0 -/* A611F0 80240820 44821000 */ mtc1 $v0, $f2 -/* A611F4 80240824 00000000 */ nop -/* A611F8 80240828 468010A1 */ cvt.d.w $f2, $f2 -/* A611FC 8024082C 46201082 */ mul.d $f2, $f2, $f0 -/* A61200 80240830 00000000 */ nop -/* A61204 80240834 0200282D */ daddu $a1, $s0, $zero -/* A61208 80240838 C6440038 */ lwc1 $f4, 0x38($s2) -/* A6120C 8024083C C640003C */ lwc1 $f0, 0x3c($s2) -/* A61210 80240840 27B10024 */ addiu $s1, $sp, 0x24 -/* A61214 80240844 E7A40020 */ swc1 $f4, 0x20($sp) -/* A61218 80240848 C6440040 */ lwc1 $f4, 0x40($s2) -/* A6121C 8024084C 46000021 */ cvt.d.s $f0, $f0 -/* A61220 80240850 46220000 */ add.d $f0, $f0, $f2 -/* A61224 80240854 E7A40028 */ swc1 $f4, 0x28($sp) -/* A61228 80240858 C6420018 */ lwc1 $f2, 0x18($s2) -/* A6122C 8024085C 46200020 */ cvt.s.d $f0, $f0 -/* A61230 80240860 E7A00024 */ swc1 $f0, 0x24($sp) -/* A61234 80240864 E7A20010 */ swc1 $f2, 0x10($sp) -/* A61238 80240868 C640000C */ lwc1 $f0, 0xc($s2) -/* A6123C 8024086C 0220302D */ daddu $a2, $s1, $zero -/* A61240 80240870 E7A00014 */ swc1 $f0, 0x14($sp) -/* A61244 80240874 864200A6 */ lh $v0, 0xa6($s2) -/* A61248 80240878 27B40028 */ addiu $s4, $sp, 0x28 -/* A6124C 8024087C 44820000 */ mtc1 $v0, $f0 -/* A61250 80240880 00000000 */ nop -/* A61254 80240884 46800020 */ cvt.s.w $f0, $f0 -/* A61258 80240888 E7A00018 */ swc1 $f0, 0x18($sp) -/* A6125C 8024088C 864200A8 */ lh $v0, 0xa8($s2) -/* A61260 80240890 0280382D */ daddu $a3, $s4, $zero -/* A61264 80240894 44820000 */ mtc1 $v0, $f0 -/* A61268 80240898 00000000 */ nop -/* A6126C 8024089C 46800020 */ cvt.s.w $f0, $f0 -/* A61270 802408A0 0C0376B9 */ jal func_800DDAE4 -/* A61274 802408A4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A61278 802408A8 54400001 */ bnel $v0, $zero, .L802408B0 -/* A6127C 802408AC 24160001 */ addiu $s6, $zero, 1 -.L802408B0: -/* A61280 802408B0 0200282D */ daddu $a1, $s0, $zero -/* A61284 802408B4 0220302D */ daddu $a2, $s1, $zero -/* A61288 802408B8 C6400038 */ lwc1 $f0, 0x38($s2) -/* A6128C 802408BC C642003C */ lwc1 $f2, 0x3c($s2) -/* A61290 802408C0 C6440040 */ lwc1 $f4, 0x40($s2) -/* A61294 802408C4 3C01447A */ lui $at, 0x447a -/* A61298 802408C8 44813000 */ mtc1 $at, $f6 -/* A6129C 802408CC 27A2002C */ addiu $v0, $sp, 0x2c -/* A612A0 802408D0 E7A00020 */ swc1 $f0, 0x20($sp) -/* A612A4 802408D4 E7A20024 */ swc1 $f2, 0x24($sp) -/* A612A8 802408D8 E7A40028 */ swc1 $f4, 0x28($sp) -/* A612AC 802408DC E7A6002C */ swc1 $f6, 0x2c($sp) -/* A612B0 802408E0 AFA20010 */ sw $v0, 0x10($sp) -/* A612B4 802408E4 8E440080 */ lw $a0, 0x80($s2) -/* A612B8 802408E8 0C0372DF */ jal func_800DCB7C -/* A612BC 802408EC 0280382D */ daddu $a3, $s4, $zero -/* A612C0 802408F0 10400019 */ beqz $v0, .L80240958 -/* A612C4 802408F4 00000000 */ nop -/* A612C8 802408F8 C640001C */ lwc1 $f0, 0x1c($s2) -/* A612CC 802408FC C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A612D0 80240900 46000005 */ abs.s $f0, $f0 -/* A612D4 80240904 4600103C */ c.lt.s $f2, $f0 -/* A612D8 80240908 00000000 */ nop -/* A612DC 8024090C 45000012 */ bc1f .L80240958 -/* A612E0 80240910 00000000 */ nop -/* A612E4 80240914 C7A40024 */ lwc1 $f4, 0x24($sp) -/* A612E8 80240918 C6400064 */ lwc1 $f0, 0x64($s2) -/* A612EC 8024091C 46002001 */ sub.s $f0, $f4, $f0 -/* A612F0 80240920 3C014034 */ lui $at, 0x4034 -/* A612F4 80240924 44811800 */ mtc1 $at, $f3 -/* A612F8 80240928 44801000 */ mtc1 $zero, $f2 -/* A612FC 8024092C 46000005 */ abs.s $f0, $f0 -/* A61300 80240930 46000021 */ cvt.d.s $f0, $f0 -/* A61304 80240934 4622003C */ c.lt.d $f0, $f2 -/* A61308 80240938 00000000 */ nop -/* A6130C 8024093C 45000006 */ bc1f .L80240958 -/* A61310 80240940 0240202D */ daddu $a0, $s2, $zero -/* A61314 80240944 8E450018 */ lw $a1, 0x18($s2) -/* A61318 80240948 8E46000C */ lw $a2, 0xc($s2) -/* A6131C 8024094C 2416000A */ addiu $s6, $zero, 0xa -/* A61320 80240950 0C00EA95 */ jal npc_move_heading -/* A61324 80240954 E644003C */ swc1 $f4, 0x3c($s2) -.L80240958: -/* A61328 80240958 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A6132C 8024095C 3C013FF0 */ lui $at, 0x3ff0 -/* A61330 80240960 44811800 */ mtc1 $at, $f3 -/* A61334 80240964 44801000 */ mtc1 $zero, $f2 -/* A61338 80240968 46000021 */ cvt.d.s $f0, $f0 -/* A6133C 8024096C 4622003C */ c.lt.d $f0, $f2 -/* A61340 80240970 00000000 */ nop -/* A61344 80240974 45030001 */ bc1tl .L8024097C -/* A61348 80240978 2416000B */ addiu $s6, $zero, 0xb -.L8024097C: -/* A6134C 8024097C 9642008E */ lhu $v0, 0x8e($s2) -/* A61350 80240980 2442FFFF */ addiu $v0, $v0, -1 -/* A61354 80240984 A642008E */ sh $v0, 0x8e($s2) -/* A61358 80240988 00021400 */ sll $v0, $v0, 0x10 -/* A6135C 8024098C 58400001 */ blezl $v0, .L80240994 -/* A61360 80240990 24160014 */ addiu $s6, $zero, 0x14 -.L80240994: -/* A61364 80240994 56C00019 */ bnel $s6, $zero, .L802409FC -/* A61368 80240998 AFA00010 */ sw $zero, 0x10($sp) -/* A6136C 8024099C 8E620070 */ lw $v0, 0x70($s3) -/* A61370 802409A0 30420001 */ andi $v0, $v0, 1 -/* A61374 802409A4 10400009 */ beqz $v0, .L802409CC -/* A61378 802409A8 00000000 */ nop -/* A6137C 802409AC C640004C */ lwc1 $f0, 0x4c($s2) -/* A61380 802409B0 3C014044 */ lui $at, 0x4044 -/* A61384 802409B4 44811800 */ mtc1 $at, $f3 -/* A61388 802409B8 44801000 */ mtc1 $zero, $f2 -/* A6138C 802409BC 46000021 */ cvt.d.s $f0, $f0 -/* A61390 802409C0 46220000 */ add.d $f0, $f0, $f2 -/* A61394 802409C4 46200020 */ cvt.s.d $f0, $f0 -/* A61398 802409C8 E640004C */ swc1 $f0, 0x4c($s2) -.L802409CC: -/* A6139C 802409CC 8E450018 */ lw $a1, 0x18($s2) -/* A613A0 802409D0 8E46000C */ lw $a2, 0xc($s2) -/* A613A4 802409D4 0C00EA95 */ jal npc_move_heading -/* A613A8 802409D8 0240202D */ daddu $a0, $s2, $zero -/* A613AC 802409DC C644003C */ lwc1 $f4, 0x3c($s2) -/* A613B0 802409E0 C640001C */ lwc1 $f0, 0x1c($s2) -/* A613B4 802409E4 46002100 */ add.s $f4, $f4, $f0 -/* A613B8 802409E8 C6420014 */ lwc1 $f2, 0x14($s2) -/* A613BC 802409EC 46020001 */ sub.s $f0, $f0, $f2 -/* A613C0 802409F0 E644003C */ swc1 $f4, 0x3c($s2) -/* A613C4 802409F4 0809029A */ j .L80240A68 -/* A613C8 802409F8 E640001C */ swc1 $f0, 0x1c($s2) -.L802409FC: -/* A613CC 802409FC AFA00014 */ sw $zero, 0x14($sp) -/* A613D0 80240A00 8E450038 */ lw $a1, 0x38($s2) -/* A613D4 80240A04 8E46003C */ lw $a2, 0x3c($s2) -/* A613D8 80240A08 8E470040 */ lw $a3, 0x40($s2) -/* A613DC 80240A0C 0C01BECC */ jal fx_walk_normal -/* A613E0 80240A10 24040002 */ addiu $a0, $zero, 2 -/* A613E4 80240A14 3C01C47A */ lui $at, 0xc47a -/* A613E8 80240A18 44810000 */ mtc1 $at, $f0 -/* A613EC 80240A1C AE60006C */ sw $zero, 0x6c($s3) -/* A613F0 80240A20 8E420000 */ lw $v0, ($s2) -/* A613F4 80240A24 0240202D */ daddu $a0, $s2, $zero -/* A613F8 80240A28 AE400038 */ sw $zero, 0x38($s2) -/* A613FC 80240A2C AE400040 */ sw $zero, 0x40($s2) -/* A61400 80240A30 AE40001C */ sw $zero, 0x1c($s2) -/* A61404 80240A34 34420002 */ ori $v0, $v0, 2 -/* A61408 80240A38 E640003C */ swc1 $f0, 0x3c($s2) -/* A6140C 80240A3C 0C00EAFF */ jal disable_npc_shadow -/* A61410 80240A40 AE420000 */ sw $v0, ($s2) -/* A61414 80240A44 8E420000 */ lw $v0, ($s2) -/* A61418 80240A48 2403F7FF */ addiu $v1, $zero, -0x801 -/* A6141C 80240A4C 00431024 */ and $v0, $v0, $v1 -/* A61420 80240A50 AE420000 */ sw $v0, ($s2) -/* A61424 80240A54 8E620000 */ lw $v0, ($s3) -/* A61428 80240A58 3C031F00 */ lui $v1, 0x1f00 -/* A6142C 80240A5C 00431025 */ or $v0, $v0, $v1 -/* A61430 80240A60 AE620000 */ sw $v0, ($s3) -/* A61434 80240A64 AEE00070 */ sw $zero, 0x70($s7) -.L80240A68: -/* A61438 80240A68 0000102D */ daddu $v0, $zero, $zero -.L80240A6C: -/* A6143C 80240A6C 8FBF0050 */ lw $ra, 0x50($sp) -/* A61440 80240A70 8FB7004C */ lw $s7, 0x4c($sp) -/* A61444 80240A74 8FB60048 */ lw $s6, 0x48($sp) -/* A61448 80240A78 8FB50044 */ lw $s5, 0x44($sp) -/* A6144C 80240A7C 8FB40040 */ lw $s4, 0x40($sp) -/* A61450 80240A80 8FB3003C */ lw $s3, 0x3c($sp) -/* A61454 80240A84 8FB20038 */ lw $s2, 0x38($sp) -/* A61458 80240A88 8FB10034 */ lw $s1, 0x34($sp) -/* A6145C 80240A8C 8FB00030 */ lw $s0, 0x30($sp) -/* A61460 80240A90 03E00008 */ jr $ra -/* A61464 80240A94 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s new file mode 100644 index 0000000000..cda422e535 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024055C_A60F2C.s @@ -0,0 +1,354 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024055C_A60F2C +/* A60F2C 8024055C 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* A60F30 80240560 AFB7004C */ sw $s7, 0x4c($sp) +/* A60F34 80240564 0080B82D */ daddu $s7, $a0, $zero +/* A60F38 80240568 AFB10034 */ sw $s1, 0x34($sp) +/* A60F3C 8024056C 00A0882D */ daddu $s1, $a1, $zero +/* A60F40 80240570 AFBF0050 */ sw $ra, 0x50($sp) +/* A60F44 80240574 AFB60048 */ sw $s6, 0x48($sp) +/* A60F48 80240578 AFB50044 */ sw $s5, 0x44($sp) +/* A60F4C 8024057C AFB40040 */ sw $s4, 0x40($sp) +/* A60F50 80240580 AFB3003C */ sw $s3, 0x3c($sp) +/* A60F54 80240584 AFB20038 */ sw $s2, 0x38($sp) +/* A60F58 80240588 AFB00030 */ sw $s0, 0x30($sp) +/* A60F5C 8024058C 8EF30148 */ lw $s3, 0x148($s7) +/* A60F60 80240590 86640008 */ lh $a0, 8($s3) +/* A60F64 80240594 8EF0000C */ lw $s0, 0xc($s7) +/* A60F68 80240598 0C00FB5A */ jal get_enemy_safe +/* A60F6C 8024059C 0000B02D */ daddu $s6, $zero, $zero +/* A60F70 802405A0 10400131 */ beqz $v0, .L80240A68 +/* A60F74 802405A4 24020005 */ addiu $v0, $zero, 5 +/* A60F78 802405A8 8E63006C */ lw $v1, 0x6c($s3) +/* A60F7C 802405AC 1062012F */ beq $v1, $v0, .L80240A6C +/* A60F80 802405B0 0000102D */ daddu $v0, $zero, $zero +/* A60F84 802405B4 8E050000 */ lw $a1, ($s0) +/* A60F88 802405B8 0C0B1EAF */ jal get_variable +/* A60F8C 802405BC 02E0202D */ daddu $a0, $s7, $zero +/* A60F90 802405C0 86640008 */ lh $a0, 8($s3) +/* A60F94 802405C4 0C00EABB */ jal get_npc_unsafe +/* A60F98 802405C8 0040A82D */ daddu $s5, $v0, $zero +/* A60F9C 802405CC 8E630070 */ lw $v1, 0x70($s3) +/* A60FA0 802405D0 30630002 */ andi $v1, $v1, 2 +/* A60FA4 802405D4 10600008 */ beqz $v1, .L802405F8 +/* A60FA8 802405D8 0040902D */ daddu $s2, $v0, $zero +/* A60FAC 802405DC 964200A8 */ lhu $v0, 0xa8($s2) +/* A60FB0 802405E0 00021400 */ sll $v0, $v0, 0x10 +/* A60FB4 802405E4 00021C03 */ sra $v1, $v0, 0x10 +/* A60FB8 802405E8 000217C2 */ srl $v0, $v0, 0x1f +/* A60FBC 802405EC 00621821 */ addu $v1, $v1, $v0 +/* A60FC0 802405F0 00031843 */ sra $v1, $v1, 1 +/* A60FC4 802405F4 A24300AB */ sb $v1, 0xab($s2) +.L802405F8: +/* A60FC8 802405F8 16200005 */ bnez $s1, .L80240610 +/* A60FCC 802405FC 3C030004 */ lui $v1, 4 +/* A60FD0 80240600 8E6200B0 */ lw $v0, 0xb0($s3) +/* A60FD4 80240604 30420004 */ andi $v0, $v0, 4 +/* A60FD8 80240608 10400019 */ beqz $v0, .L80240670 +/* A60FDC 8024060C 00000000 */ nop +.L80240610: +/* A60FE0 80240610 34630102 */ ori $v1, $v1, 0x102 +/* A60FE4 80240614 AEE00070 */ sw $zero, 0x70($s7) +/* A60FE8 80240618 8E420000 */ lw $v0, ($s2) +/* A60FEC 8024061C 0240202D */ daddu $a0, $s2, $zero +/* A60FF0 80240620 A640008E */ sh $zero, 0x8e($s2) +/* A60FF4 80240624 00431025 */ or $v0, $v0, $v1 +/* A60FF8 80240628 0C00EAFF */ jal disable_npc_shadow +/* A60FFC 8024062C AE420000 */ sw $v0, ($s2) +/* A61000 80240630 3C041F30 */ lui $a0, 0x1f30 +/* A61004 80240634 8E420000 */ lw $v0, ($s2) +/* A61008 80240638 2403F7FF */ addiu $v1, $zero, -0x801 +/* A6100C 8024063C 00431024 */ and $v0, $v0, $v1 +/* A61010 80240640 AE420000 */ sw $v0, ($s2) +/* A61014 80240644 8E620000 */ lw $v0, ($s3) +/* A61018 80240648 8E6300B0 */ lw $v1, 0xb0($s3) +/* A6101C 8024064C 34840040 */ ori $a0, $a0, 0x40 +/* A61020 80240650 AE60006C */ sw $zero, 0x6c($s3) +/* A61024 80240654 00441025 */ or $v0, $v0, $a0 +/* A61028 80240658 AE620000 */ sw $v0, ($s3) +/* A6102C 8024065C 30620004 */ andi $v0, $v1, 4 +/* A61030 80240660 10400003 */ beqz $v0, .L80240670 +/* A61034 80240664 2402FFFB */ addiu $v0, $zero, -5 +/* A61038 80240668 00621024 */ and $v0, $v1, $v0 +/* A6103C 8024066C AE6200B0 */ sw $v0, 0xb0($s3) +.L80240670: +/* A61040 80240670 8EE30070 */ lw $v1, 0x70($s7) +/* A61044 80240674 24100001 */ addiu $s0, $zero, 1 +/* A61048 80240678 10700012 */ beq $v1, $s0, .L802406C4 +/* A6104C 8024067C 28620002 */ slti $v0, $v1, 2 +/* A61050 80240680 10400005 */ beqz $v0, .L80240698 +/* A61054 80240684 24020002 */ addiu $v0, $zero, 2 +/* A61058 80240688 10600007 */ beqz $v1, .L802406A8 +/* A6105C 8024068C 0000102D */ daddu $v0, $zero, $zero +/* A61060 80240690 0809029B */ j .L80240A6C +/* A61064 80240694 00000000 */ nop +.L80240698: +/* A61068 80240698 1062005B */ beq $v1, $v0, .L80240808 +/* A6106C 8024069C 0000102D */ daddu $v0, $zero, $zero +/* A61070 802406A0 0809029B */ j .L80240A6C +/* A61074 802406A4 00000000 */ nop +.L802406A8: +/* A61078 802406A8 8E420000 */ lw $v0, ($s2) +/* A6107C 802406AC 0240202D */ daddu $a0, $s2, $zero +/* A61080 802406B0 34420002 */ ori $v0, $v0, 2 +/* A61084 802406B4 0C00EAFF */ jal disable_npc_shadow +/* A61088 802406B8 AE420000 */ sw $v0, ($s2) +/* A6108C 802406BC AE60006C */ sw $zero, 0x6c($s3) +/* A61090 802406C0 AEF00070 */ sw $s0, 0x70($s7) +.L802406C4: +/* A61094 802406C4 8E74006C */ lw $s4, 0x6c($s3) +/* A61098 802406C8 24020001 */ addiu $v0, $zero, 1 +/* A6109C 802406CC 168200E7 */ bne $s4, $v0, .L80240A6C +/* A610A0 802406D0 0000102D */ daddu $v0, $zero, $zero +/* A610A4 802406D4 8E64007C */ lw $a0, 0x7c($s3) +/* A610A8 802406D8 24110002 */ addiu $s1, $zero, 2 +/* A610AC 802406DC 0C00EABB */ jal get_npc_unsafe +/* A610B0 802406E0 AE71006C */ sw $s1, 0x6c($s3) +/* A610B4 802406E4 0040802D */ daddu $s0, $v0, $zero +/* A610B8 802406E8 C6000038 */ lwc1 $f0, 0x38($s0) +/* A610BC 802406EC E6400038 */ swc1 $f0, 0x38($s2) +/* A610C0 802406F0 C6000040 */ lwc1 $f0, 0x40($s0) +/* A610C4 802406F4 E6400040 */ swc1 $f0, 0x40($s2) +/* A610C8 802406F8 C6020034 */ lwc1 $f2, 0x34($s0) +/* A610CC 802406FC 3C014387 */ lui $at, 0x4387 +/* A610D0 80240700 44810000 */ mtc1 $at, $f0 +/* A610D4 80240704 26440038 */ addiu $a0, $s2, 0x38 +/* A610D8 80240708 46020001 */ sub.s $f0, $f0, $f2 +/* A610DC 8024070C C6680078 */ lwc1 $f8, 0x78($s3) +/* A610E0 80240710 46804220 */ cvt.s.w $f8, $f8 +/* A610E4 80240714 44064000 */ mfc1 $a2, $f8 +/* A610E8 80240718 44070000 */ mfc1 $a3, $f0 +/* A610EC 8024071C 0C00A7E7 */ jal add_vec2D_polar +/* A610F0 80240720 26450040 */ addiu $a1, $s2, 0x40 +/* A610F4 80240724 C600003C */ lwc1 $f0, 0x3c($s0) +/* A610F8 80240728 C6620074 */ lwc1 $f2, 0x74($s3) +/* A610FC 8024072C 468010A0 */ cvt.s.w $f2, $f2 +/* A61100 80240730 46020000 */ add.s $f0, $f0, $f2 +/* A61104 80240734 E640003C */ swc1 $f0, 0x3c($s2) +/* A61108 80240738 A2740007 */ sb $s4, 7($s3) +/* A6110C 8024073C C6400038 */ lwc1 $f0, 0x38($s2) +/* A61110 80240740 4600020D */ trunc.w.s $f8, $f0 +/* A61114 80240744 44024000 */ mfc1 $v0, $f8 +/* A61118 80240748 00000000 */ nop +/* A6111C 8024074C A6620010 */ sh $v0, 0x10($s3) +/* A61120 80240750 C640003C */ lwc1 $f0, 0x3c($s2) +/* A61124 80240754 4600020D */ trunc.w.s $f8, $f0 +/* A61128 80240758 44024000 */ mfc1 $v0, $f8 +/* A6112C 8024075C 00000000 */ nop +/* A61130 80240760 A6620012 */ sh $v0, 0x12($s3) +/* A61134 80240764 C6400040 */ lwc1 $f0, 0x40($s2) +/* A61138 80240768 4600020D */ trunc.w.s $f8, $f0 +/* A6113C 8024076C 44024000 */ mfc1 $v0, $f8 +/* A61140 80240770 00000000 */ nop +/* A61144 80240774 A6620014 */ sh $v0, 0x14($s3) +/* A61148 80240778 AE400044 */ sw $zero, 0x44($s2) +/* A6114C 8024077C AE400048 */ sw $zero, 0x48($s2) +/* A61150 80240780 AE40004C */ sw $zero, 0x4c($s2) +/* A61154 80240784 C6A00000 */ lwc1 $f0, ($s5) +/* A61158 80240788 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A6115C 8024078C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A61160 80240790 C64C0038 */ lwc1 $f12, 0x38($s2) +/* A61164 80240794 C64E0040 */ lwc1 $f14, 0x40($s2) +/* A61168 80240798 E6400018 */ swc1 $f0, 0x18($s2) +/* A6116C 8024079C 8C460028 */ lw $a2, 0x28($v0) +/* A61170 802407A0 0C00A720 */ jal atan2 +/* A61174 802407A4 8C470030 */ lw $a3, 0x30($v0) +/* A61178 802407A8 E640000C */ swc1 $f0, 0xc($s2) +/* A6117C 802407AC C6A0000C */ lwc1 $f0, 0xc($s5) +/* A61180 802407B0 8E420000 */ lw $v0, ($s2) +/* A61184 802407B4 0240202D */ daddu $a0, $s2, $zero +/* A61188 802407B8 E640001C */ swc1 $f0, 0x1c($s2) +/* A6118C 802407BC C6A00010 */ lwc1 $f0, 0x10($s5) +/* A61190 802407C0 2403FFFD */ addiu $v1, $zero, -3 +/* A61194 802407C4 E6400014 */ swc1 $f0, 0x14($s2) +/* A61198 802407C8 C600003C */ lwc1 $f0, 0x3c($s0) +/* A6119C 802407CC 00431024 */ and $v0, $v0, $v1 +/* A611A0 802407D0 AE420000 */ sw $v0, ($s2) +/* A611A4 802407D4 0C00EAE8 */ jal enable_npc_shadow +/* A611A8 802407D8 E6400064 */ swc1 $f0, 0x64($s2) +/* A611AC 802407DC 8E420000 */ lw $v0, ($s2) +/* A611B0 802407E0 3C03E0FF */ lui $v1, 0xe0ff +/* A611B4 802407E4 34420800 */ ori $v0, $v0, 0x800 +/* A611B8 802407E8 AE420000 */ sw $v0, ($s2) +/* A611BC 802407EC 8E620000 */ lw $v0, ($s3) +/* A611C0 802407F0 3463FFFF */ ori $v1, $v1, 0xffff +/* A611C4 802407F4 00431024 */ and $v0, $v0, $v1 +/* A611C8 802407F8 AE620000 */ sw $v0, ($s3) +/* A611CC 802407FC 2402005A */ addiu $v0, $zero, 0x5a +/* A611D0 80240800 A642008E */ sh $v0, 0x8e($s2) +/* A611D4 80240804 AEF10070 */ sw $s1, 0x70($s7) +.L80240808: +/* A611D8 80240808 0000202D */ daddu $a0, $zero, $zero +/* A611DC 8024080C 27B00020 */ addiu $s0, $sp, 0x20 +/* A611E0 80240810 864200A8 */ lh $v0, 0xa8($s2) +/* A611E4 80240814 3C013FE0 */ lui $at, 0x3fe0 +/* A611E8 80240818 44810800 */ mtc1 $at, $f1 +/* A611EC 8024081C 44800000 */ mtc1 $zero, $f0 +/* A611F0 80240820 44821000 */ mtc1 $v0, $f2 +/* A611F4 80240824 00000000 */ nop +/* A611F8 80240828 468010A1 */ cvt.d.w $f2, $f2 +/* A611FC 8024082C 46201082 */ mul.d $f2, $f2, $f0 +/* A61200 80240830 00000000 */ nop +/* A61204 80240834 0200282D */ daddu $a1, $s0, $zero +/* A61208 80240838 C6440038 */ lwc1 $f4, 0x38($s2) +/* A6120C 8024083C C640003C */ lwc1 $f0, 0x3c($s2) +/* A61210 80240840 27B10024 */ addiu $s1, $sp, 0x24 +/* A61214 80240844 E7A40020 */ swc1 $f4, 0x20($sp) +/* A61218 80240848 C6440040 */ lwc1 $f4, 0x40($s2) +/* A6121C 8024084C 46000021 */ cvt.d.s $f0, $f0 +/* A61220 80240850 46220000 */ add.d $f0, $f0, $f2 +/* A61224 80240854 E7A40028 */ swc1 $f4, 0x28($sp) +/* A61228 80240858 C6420018 */ lwc1 $f2, 0x18($s2) +/* A6122C 8024085C 46200020 */ cvt.s.d $f0, $f0 +/* A61230 80240860 E7A00024 */ swc1 $f0, 0x24($sp) +/* A61234 80240864 E7A20010 */ swc1 $f2, 0x10($sp) +/* A61238 80240868 C640000C */ lwc1 $f0, 0xc($s2) +/* A6123C 8024086C 0220302D */ daddu $a2, $s1, $zero +/* A61240 80240870 E7A00014 */ swc1 $f0, 0x14($sp) +/* A61244 80240874 864200A6 */ lh $v0, 0xa6($s2) +/* A61248 80240878 27B40028 */ addiu $s4, $sp, 0x28 +/* A6124C 8024087C 44820000 */ mtc1 $v0, $f0 +/* A61250 80240880 00000000 */ nop +/* A61254 80240884 46800020 */ cvt.s.w $f0, $f0 +/* A61258 80240888 E7A00018 */ swc1 $f0, 0x18($sp) +/* A6125C 8024088C 864200A8 */ lh $v0, 0xa8($s2) +/* A61260 80240890 0280382D */ daddu $a3, $s4, $zero +/* A61264 80240894 44820000 */ mtc1 $v0, $f0 +/* A61268 80240898 00000000 */ nop +/* A6126C 8024089C 46800020 */ cvt.s.w $f0, $f0 +/* A61270 802408A0 0C0376B9 */ jal func_800DDAE4 +/* A61274 802408A4 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A61278 802408A8 54400001 */ bnel $v0, $zero, .L802408B0 +/* A6127C 802408AC 24160001 */ addiu $s6, $zero, 1 +.L802408B0: +/* A61280 802408B0 0200282D */ daddu $a1, $s0, $zero +/* A61284 802408B4 0220302D */ daddu $a2, $s1, $zero +/* A61288 802408B8 C6400038 */ lwc1 $f0, 0x38($s2) +/* A6128C 802408BC C642003C */ lwc1 $f2, 0x3c($s2) +/* A61290 802408C0 C6440040 */ lwc1 $f4, 0x40($s2) +/* A61294 802408C4 3C01447A */ lui $at, 0x447a +/* A61298 802408C8 44813000 */ mtc1 $at, $f6 +/* A6129C 802408CC 27A2002C */ addiu $v0, $sp, 0x2c +/* A612A0 802408D0 E7A00020 */ swc1 $f0, 0x20($sp) +/* A612A4 802408D4 E7A20024 */ swc1 $f2, 0x24($sp) +/* A612A8 802408D8 E7A40028 */ swc1 $f4, 0x28($sp) +/* A612AC 802408DC E7A6002C */ swc1 $f6, 0x2c($sp) +/* A612B0 802408E0 AFA20010 */ sw $v0, 0x10($sp) +/* A612B4 802408E4 8E440080 */ lw $a0, 0x80($s2) +/* A612B8 802408E8 0C0372DF */ jal func_800DCB7C +/* A612BC 802408EC 0280382D */ daddu $a3, $s4, $zero +/* A612C0 802408F0 10400019 */ beqz $v0, .L80240958 +/* A612C4 802408F4 00000000 */ nop +/* A612C8 802408F8 C640001C */ lwc1 $f0, 0x1c($s2) +/* A612CC 802408FC C7A2002C */ lwc1 $f2, 0x2c($sp) +/* A612D0 80240900 46000005 */ abs.s $f0, $f0 +/* A612D4 80240904 4600103C */ c.lt.s $f2, $f0 +/* A612D8 80240908 00000000 */ nop +/* A612DC 8024090C 45000012 */ bc1f .L80240958 +/* A612E0 80240910 00000000 */ nop +/* A612E4 80240914 C7A40024 */ lwc1 $f4, 0x24($sp) +/* A612E8 80240918 C6400064 */ lwc1 $f0, 0x64($s2) +/* A612EC 8024091C 46002001 */ sub.s $f0, $f4, $f0 +/* A612F0 80240920 3C014034 */ lui $at, 0x4034 +/* A612F4 80240924 44811800 */ mtc1 $at, $f3 +/* A612F8 80240928 44801000 */ mtc1 $zero, $f2 +/* A612FC 8024092C 46000005 */ abs.s $f0, $f0 +/* A61300 80240930 46000021 */ cvt.d.s $f0, $f0 +/* A61304 80240934 4622003C */ c.lt.d $f0, $f2 +/* A61308 80240938 00000000 */ nop +/* A6130C 8024093C 45000006 */ bc1f .L80240958 +/* A61310 80240940 0240202D */ daddu $a0, $s2, $zero +/* A61314 80240944 8E450018 */ lw $a1, 0x18($s2) +/* A61318 80240948 8E46000C */ lw $a2, 0xc($s2) +/* A6131C 8024094C 2416000A */ addiu $s6, $zero, 0xa +/* A61320 80240950 0C00EA95 */ jal npc_move_heading +/* A61324 80240954 E644003C */ swc1 $f4, 0x3c($s2) +.L80240958: +/* A61328 80240958 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A6132C 8024095C 3C013FF0 */ lui $at, 0x3ff0 +/* A61330 80240960 44811800 */ mtc1 $at, $f3 +/* A61334 80240964 44801000 */ mtc1 $zero, $f2 +/* A61338 80240968 46000021 */ cvt.d.s $f0, $f0 +/* A6133C 8024096C 4622003C */ c.lt.d $f0, $f2 +/* A61340 80240970 00000000 */ nop +/* A61344 80240974 45030001 */ bc1tl .L8024097C +/* A61348 80240978 2416000B */ addiu $s6, $zero, 0xb +.L8024097C: +/* A6134C 8024097C 9642008E */ lhu $v0, 0x8e($s2) +/* A61350 80240980 2442FFFF */ addiu $v0, $v0, -1 +/* A61354 80240984 A642008E */ sh $v0, 0x8e($s2) +/* A61358 80240988 00021400 */ sll $v0, $v0, 0x10 +/* A6135C 8024098C 58400001 */ blezl $v0, .L80240994 +/* A61360 80240990 24160014 */ addiu $s6, $zero, 0x14 +.L80240994: +/* A61364 80240994 56C00019 */ bnel $s6, $zero, .L802409FC +/* A61368 80240998 AFA00010 */ sw $zero, 0x10($sp) +/* A6136C 8024099C 8E620070 */ lw $v0, 0x70($s3) +/* A61370 802409A0 30420001 */ andi $v0, $v0, 1 +/* A61374 802409A4 10400009 */ beqz $v0, .L802409CC +/* A61378 802409A8 00000000 */ nop +/* A6137C 802409AC C640004C */ lwc1 $f0, 0x4c($s2) +/* A61380 802409B0 3C014044 */ lui $at, 0x4044 +/* A61384 802409B4 44811800 */ mtc1 $at, $f3 +/* A61388 802409B8 44801000 */ mtc1 $zero, $f2 +/* A6138C 802409BC 46000021 */ cvt.d.s $f0, $f0 +/* A61390 802409C0 46220000 */ add.d $f0, $f0, $f2 +/* A61394 802409C4 46200020 */ cvt.s.d $f0, $f0 +/* A61398 802409C8 E640004C */ swc1 $f0, 0x4c($s2) +.L802409CC: +/* A6139C 802409CC 8E450018 */ lw $a1, 0x18($s2) +/* A613A0 802409D0 8E46000C */ lw $a2, 0xc($s2) +/* A613A4 802409D4 0C00EA95 */ jal npc_move_heading +/* A613A8 802409D8 0240202D */ daddu $a0, $s2, $zero +/* A613AC 802409DC C644003C */ lwc1 $f4, 0x3c($s2) +/* A613B0 802409E0 C640001C */ lwc1 $f0, 0x1c($s2) +/* A613B4 802409E4 46002100 */ add.s $f4, $f4, $f0 +/* A613B8 802409E8 C6420014 */ lwc1 $f2, 0x14($s2) +/* A613BC 802409EC 46020001 */ sub.s $f0, $f0, $f2 +/* A613C0 802409F0 E644003C */ swc1 $f4, 0x3c($s2) +/* A613C4 802409F4 0809029A */ j .L80240A68 +/* A613C8 802409F8 E640001C */ swc1 $f0, 0x1c($s2) +.L802409FC: +/* A613CC 802409FC AFA00014 */ sw $zero, 0x14($sp) +/* A613D0 80240A00 8E450038 */ lw $a1, 0x38($s2) +/* A613D4 80240A04 8E46003C */ lw $a2, 0x3c($s2) +/* A613D8 80240A08 8E470040 */ lw $a3, 0x40($s2) +/* A613DC 80240A0C 0C01BECC */ jal fx_walk_normal +/* A613E0 80240A10 24040002 */ addiu $a0, $zero, 2 +/* A613E4 80240A14 3C01C47A */ lui $at, 0xc47a +/* A613E8 80240A18 44810000 */ mtc1 $at, $f0 +/* A613EC 80240A1C AE60006C */ sw $zero, 0x6c($s3) +/* A613F0 80240A20 8E420000 */ lw $v0, ($s2) +/* A613F4 80240A24 0240202D */ daddu $a0, $s2, $zero +/* A613F8 80240A28 AE400038 */ sw $zero, 0x38($s2) +/* A613FC 80240A2C AE400040 */ sw $zero, 0x40($s2) +/* A61400 80240A30 AE40001C */ sw $zero, 0x1c($s2) +/* A61404 80240A34 34420002 */ ori $v0, $v0, 2 +/* A61408 80240A38 E640003C */ swc1 $f0, 0x3c($s2) +/* A6140C 80240A3C 0C00EAFF */ jal disable_npc_shadow +/* A61410 80240A40 AE420000 */ sw $v0, ($s2) +/* A61414 80240A44 8E420000 */ lw $v0, ($s2) +/* A61418 80240A48 2403F7FF */ addiu $v1, $zero, -0x801 +/* A6141C 80240A4C 00431024 */ and $v0, $v0, $v1 +/* A61420 80240A50 AE420000 */ sw $v0, ($s2) +/* A61424 80240A54 8E620000 */ lw $v0, ($s3) +/* A61428 80240A58 3C031F00 */ lui $v1, 0x1f00 +/* A6142C 80240A5C 00431025 */ or $v0, $v0, $v1 +/* A61430 80240A60 AE620000 */ sw $v0, ($s3) +/* A61434 80240A64 AEE00070 */ sw $zero, 0x70($s7) +.L80240A68: +/* A61438 80240A68 0000102D */ daddu $v0, $zero, $zero +.L80240A6C: +/* A6143C 80240A6C 8FBF0050 */ lw $ra, 0x50($sp) +/* A61440 80240A70 8FB7004C */ lw $s7, 0x4c($sp) +/* A61444 80240A74 8FB60048 */ lw $s6, 0x48($sp) +/* A61448 80240A78 8FB50044 */ lw $s5, 0x44($sp) +/* A6144C 80240A7C 8FB40040 */ lw $s4, 0x40($sp) +/* A61450 80240A80 8FB3003C */ lw $s3, 0x3c($sp) +/* A61454 80240A84 8FB20038 */ lw $s2, 0x38($sp) +/* A61458 80240A88 8FB10034 */ lw $s1, 0x34($sp) +/* A6145C 80240A8C 8FB00030 */ lw $s0, 0x30($sp) +/* A61460 80240A90 03E00008 */ jr $ra +/* A61464 80240A94 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98.s deleted file mode 100644 index 7cbe2b5a38..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A98 -/* A61468 80240A98 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A6146C 80240A9C AFB3003C */ sw $s3, 0x3c($sp) -/* A61470 80240AA0 0080982D */ daddu $s3, $a0, $zero -/* A61474 80240AA4 AFB40040 */ sw $s4, 0x40($sp) -/* A61478 80240AA8 0000A02D */ daddu $s4, $zero, $zero -/* A6147C 80240AAC 3C03800A */ lui $v1, 0x800a -/* A61480 80240AB0 8463A634 */ lh $v1, -0x59cc($v1) -/* A61484 80240AB4 3C04800B */ lui $a0, %hi(gCameras) -/* A61488 80240AB8 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A6148C 80240ABC AFBF0044 */ sw $ra, 0x44($sp) -/* A61490 80240AC0 AFB20038 */ sw $s2, 0x38($sp) -/* A61494 80240AC4 AFB10034 */ sw $s1, 0x34($sp) -/* A61498 80240AC8 AFB00030 */ sw $s0, 0x30($sp) -/* A6149C 80240ACC F7B80058 */ sdc1 $f24, 0x58($sp) -/* A614A0 80240AD0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A614A4 80240AD4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* A614A8 80240AD8 8E710148 */ lw $s1, 0x148($s3) -/* A614AC 80240ADC 00031080 */ sll $v0, $v1, 2 -/* A614B0 80240AE0 00431021 */ addu $v0, $v0, $v1 -/* A614B4 80240AE4 00021080 */ sll $v0, $v0, 2 -/* A614B8 80240AE8 00431023 */ subu $v0, $v0, $v1 -/* A614BC 80240AEC 000218C0 */ sll $v1, $v0, 3 -/* A614C0 80240AF0 00431021 */ addu $v0, $v0, $v1 -/* A614C4 80240AF4 000210C0 */ sll $v0, $v0, 3 -/* A614C8 80240AF8 10A00002 */ beqz $a1, .L80240B04 -/* A614CC 80240AFC 00449021 */ addu $s2, $v0, $a0 -/* A614D0 80240B00 AE600070 */ sw $zero, 0x70($s3) -.L80240B04: -/* A614D4 80240B04 0C00FB5A */ jal get_enemy_safe -/* A614D8 80240B08 86240008 */ lh $a0, 8($s1) -/* A614DC 80240B0C 14400006 */ bnez $v0, .L80240B28 -/* A614E0 80240B10 24020005 */ addiu $v0, $zero, 5 -/* A614E4 80240B14 0260202D */ daddu $a0, $s3, $zero -/* A614E8 80240B18 3C05FE36 */ lui $a1, 0xfe36 -/* A614EC 80240B1C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A614F0 80240B20 080903A2 */ j .L80240E88 -/* A614F4 80240B24 0000302D */ daddu $a2, $zero, $zero -.L80240B28: -/* A614F8 80240B28 8E23006C */ lw $v1, 0x6c($s1) -/* A614FC 80240B2C 14620005 */ bne $v1, $v0, .L80240B44 -/* A61500 80240B30 0260202D */ daddu $a0, $s3, $zero -/* A61504 80240B34 3C05FE36 */ lui $a1, 0xfe36 -/* A61508 80240B38 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A6150C 80240B3C 080903A2 */ j .L80240E88 -/* A61510 80240B40 0000302D */ daddu $a2, $zero, $zero -.L80240B44: -/* A61514 80240B44 86240008 */ lh $a0, 8($s1) -/* A61518 80240B48 0C00FB5A */ jal get_enemy_safe -/* A6151C 80240B4C 00000000 */ nop -/* A61520 80240B50 14400005 */ bnez $v0, .L80240B68 -/* A61524 80240B54 0260202D */ daddu $a0, $s3, $zero -/* A61528 80240B58 3C05FE36 */ lui $a1, 0xfe36 -/* A6152C 80240B5C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A61530 80240B60 080903A2 */ j .L80240E88 -/* A61534 80240B64 0000302D */ daddu $a2, $zero, $zero -.L80240B68: -/* A61538 80240B68 86240008 */ lh $a0, 8($s1) -/* A6153C 80240B6C 0C00EABB */ jal get_npc_unsafe -/* A61540 80240B70 00000000 */ nop -/* A61544 80240B74 8E630070 */ lw $v1, 0x70($s3) -/* A61548 80240B78 10600006 */ beqz $v1, .L80240B94 -/* A6154C 80240B7C 0040802D */ daddu $s0, $v0, $zero -/* A61550 80240B80 24020001 */ addiu $v0, $zero, 1 -/* A61554 80240B84 1062003F */ beq $v1, $v0, .L80240C84 -/* A61558 80240B88 0000102D */ daddu $v0, $zero, $zero -/* A6155C 80240B8C 080903B2 */ j .L80240EC8 -/* A61560 80240B90 00000000 */ nop -.L80240B94: -/* A61564 80240B94 AFA00010 */ sw $zero, 0x10($sp) -/* A61568 80240B98 AFA00014 */ sw $zero, 0x14($sp) -/* A6156C 80240B9C 8E050038 */ lw $a1, 0x38($s0) -/* A61570 80240BA0 8E06003C */ lw $a2, 0x3c($s0) -/* A61574 80240BA4 8E070040 */ lw $a3, 0x40($s0) -/* A61578 80240BA8 0C01BECC */ jal fx_walk_normal -/* A6157C 80240BAC 24040002 */ addiu $a0, $zero, 2 -/* A61580 80240BB0 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A61584 80240BB4 0C00A6C9 */ jal clamp_angle -/* A61588 80240BB8 00000000 */ nop -/* A6158C 80240BBC 3C018024 */ lui $at, 0x8024 -/* A61590 80240BC0 D43834B0 */ ldc1 $f24, 0x34b0($at) -/* A61594 80240BC4 46000521 */ cvt.d.s $f20, $f0 -/* A61598 80240BC8 4638A300 */ add.d $f12, $f20, $f24 -/* A6159C 80240BCC 3C018024 */ lui $at, 0x8024 -/* A615A0 80240BD0 D43634B8 */ ldc1 $f22, 0x34b8($at) -/* A615A4 80240BD4 0C00A6C9 */ jal clamp_angle -/* A615A8 80240BD8 46206320 */ cvt.s.d $f12, $f12 -/* A615AC 80240BDC 4636A500 */ add.d $f20, $f20, $f22 -/* A615B0 80240BE0 4620A320 */ cvt.s.d $f12, $f20 -/* A615B4 80240BE4 0C00A6C9 */ jal clamp_angle -/* A615B8 80240BE8 46000506 */ mov.s $f20, $f0 -/* A615BC 80240BEC 4600A521 */ cvt.d.s $f20, $f20 -/* A615C0 80240BF0 4636A500 */ add.d $f20, $f20, $f22 -/* A615C4 80240BF4 46000586 */ mov.s $f22, $f0 -/* A615C8 80240BF8 0C00A6C9 */ jal clamp_angle -/* A615CC 80240BFC 4620A320 */ cvt.s.d $f12, $f20 -/* A615D0 80240C00 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A615D4 80240C04 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A615D8 80240C08 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A615DC 80240C0C C44E0084 */ lwc1 $f14, 0x84($v0) -/* A615E0 80240C10 0C00A70A */ jal get_clamped_angle_diff -/* A615E4 80240C14 46000506 */ mov.s $f20, $f0 -/* A615E8 80240C18 0C00A6C9 */ jal clamp_angle -/* A615EC 80240C1C 46000306 */ mov.s $f12, $f0 -/* A615F0 80240C20 46000021 */ cvt.d.s $f0, $f0 -/* A615F4 80240C24 4638003C */ c.lt.d $f0, $f24 -/* A615F8 80240C28 00000000 */ nop -/* A615FC 80240C2C 45020002 */ bc1fl .L80240C38 -/* A61600 80240C30 E614000C */ swc1 $f20, 0xc($s0) -/* A61604 80240C34 E616000C */ swc1 $f22, 0xc($s0) -.L80240C38: -/* A61608 80240C38 C6000018 */ lwc1 $f0, 0x18($s0) -/* A6160C 80240C3C 3C018024 */ lui $at, 0x8024 -/* A61610 80240C40 D42234C0 */ ldc1 $f2, 0x34c0($at) -/* A61614 80240C44 46000021 */ cvt.d.s $f0, $f0 -/* A61618 80240C48 46220002 */ mul.d $f0, $f0, $f2 -/* A6161C 80240C4C 00000000 */ nop -/* A61620 80240C50 3C013F66 */ lui $at, 0x3f66 -/* A61624 80240C54 34216666 */ ori $at, $at, 0x6666 -/* A61628 80240C58 44812000 */ mtc1 $at, $f4 -/* A6162C 80240C5C 2402001E */ addiu $v0, $zero, 0x1e -/* A61630 80240C60 A602008E */ sh $v0, 0x8e($s0) -/* A61634 80240C64 3C014120 */ lui $at, 0x4120 -/* A61638 80240C68 44811000 */ mtc1 $at, $f2 -/* A6163C 80240C6C 24020001 */ addiu $v0, $zero, 1 -/* A61640 80240C70 E6040014 */ swc1 $f4, 0x14($s0) -/* A61644 80240C74 E602001C */ swc1 $f2, 0x1c($s0) -/* A61648 80240C78 46200020 */ cvt.s.d $f0, $f0 -/* A6164C 80240C7C E6000018 */ swc1 $f0, 0x18($s0) -/* A61650 80240C80 AE620070 */ sw $v0, 0x70($s3) -.L80240C84: -/* A61654 80240C84 C6000038 */ lwc1 $f0, 0x38($s0) -/* A61658 80240C88 C602003C */ lwc1 $f2, 0x3c($s0) -/* A6165C 80240C8C C6040040 */ lwc1 $f4, 0x40($s0) -/* A61660 80240C90 C6060018 */ lwc1 $f6, 0x18($s0) -/* A61664 80240C94 0000202D */ daddu $a0, $zero, $zero -/* A61668 80240C98 E7A00020 */ swc1 $f0, 0x20($sp) -/* A6166C 80240C9C E7A20024 */ swc1 $f2, 0x24($sp) -/* A61670 80240CA0 E7A40028 */ swc1 $f4, 0x28($sp) -/* A61674 80240CA4 E7A60010 */ swc1 $f6, 0x10($sp) -/* A61678 80240CA8 C600000C */ lwc1 $f0, 0xc($s0) -/* A6167C 80240CAC 27A50020 */ addiu $a1, $sp, 0x20 -/* A61680 80240CB0 E7A00014 */ swc1 $f0, 0x14($sp) -/* A61684 80240CB4 860200A6 */ lh $v0, 0xa6($s0) -/* A61688 80240CB8 27A60024 */ addiu $a2, $sp, 0x24 -/* A6168C 80240CBC 44820000 */ mtc1 $v0, $f0 -/* A61690 80240CC0 00000000 */ nop -/* A61694 80240CC4 46800020 */ cvt.s.w $f0, $f0 -/* A61698 80240CC8 E7A00018 */ swc1 $f0, 0x18($sp) -/* A6169C 80240CCC 860200A8 */ lh $v0, 0xa8($s0) -/* A616A0 80240CD0 27A70028 */ addiu $a3, $sp, 0x28 -/* A616A4 80240CD4 44820000 */ mtc1 $v0, $f0 -/* A616A8 80240CD8 00000000 */ nop -/* A616AC 80240CDC 46800020 */ cvt.s.w $f0, $f0 -/* A616B0 80240CE0 0C037711 */ jal func_800DDC44 -/* A616B4 80240CE4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A616B8 80240CE8 54400007 */ bnel $v0, $zero, .L80240D08 -/* A616BC 80240CEC 24140001 */ addiu $s4, $zero, 1 -/* A616C0 80240CF0 8E050018 */ lw $a1, 0x18($s0) -/* A616C4 80240CF4 8E06000C */ lw $a2, 0xc($s0) -/* A616C8 80240CF8 0C00EA95 */ jal npc_move_heading -/* A616CC 80240CFC 0200202D */ daddu $a0, $s0, $zero -/* A616D0 80240D00 08090343 */ j .L80240D0C -/* A616D4 80240D04 0000902D */ daddu $s2, $zero, $zero -.L80240D08: -/* A616D8 80240D08 0000902D */ daddu $s2, $zero, $zero -.L80240D0C: -/* A616DC 80240D0C C600001C */ lwc1 $f0, 0x1c($s0) -/* A616E0 80240D10 44801000 */ mtc1 $zero, $f2 -/* A616E4 80240D14 44801800 */ mtc1 $zero, $f3 -/* A616E8 80240D18 46000021 */ cvt.d.s $f0, $f0 -/* A616EC 80240D1C 4622003C */ c.lt.d $f0, $f2 -/* A616F0 80240D20 00000000 */ nop -/* A616F4 80240D24 45000028 */ bc1f .L80240DC8 -/* A616F8 80240D28 27A50020 */ addiu $a1, $sp, 0x20 -/* A616FC 80240D2C 27A60024 */ addiu $a2, $sp, 0x24 -/* A61700 80240D30 27A2002C */ addiu $v0, $sp, 0x2c -/* A61704 80240D34 C602003C */ lwc1 $f2, 0x3c($s0) -/* A61708 80240D38 C6060038 */ lwc1 $f6, 0x38($s0) -/* A6170C 80240D3C 3C01402A */ lui $at, 0x402a -/* A61710 80240D40 4481A800 */ mtc1 $at, $f21 -/* A61714 80240D44 4480A000 */ mtc1 $zero, $f20 -/* A61718 80240D48 460010A1 */ cvt.d.s $f2, $f2 -/* A6171C 80240D4C 46341080 */ add.d $f2, $f2, $f20 -/* A61720 80240D50 C600001C */ lwc1 $f0, 0x1c($s0) -/* A61724 80240D54 C6040040 */ lwc1 $f4, 0x40($s0) -/* A61728 80240D58 46000005 */ abs.s $f0, $f0 -/* A6172C 80240D5C E7A40028 */ swc1 $f4, 0x28($sp) -/* A61730 80240D60 3C014030 */ lui $at, 0x4030 -/* A61734 80240D64 44812800 */ mtc1 $at, $f5 -/* A61738 80240D68 44802000 */ mtc1 $zero, $f4 -/* A6173C 80240D6C 46000021 */ cvt.d.s $f0, $f0 -/* A61740 80240D70 E7A60020 */ swc1 $f6, 0x20($sp) -/* A61744 80240D74 46240000 */ add.d $f0, $f0, $f4 -/* A61748 80240D78 462010A0 */ cvt.s.d $f2, $f2 -/* A6174C 80240D7C E7A20024 */ swc1 $f2, 0x24($sp) -/* A61750 80240D80 46200020 */ cvt.s.d $f0, $f0 -/* A61754 80240D84 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A61758 80240D88 AFA20010 */ sw $v0, 0x10($sp) -/* A6175C 80240D8C 8E040080 */ lw $a0, 0x80($s0) -/* A61760 80240D90 0C0372DF */ jal func_800DCB7C -/* A61764 80240D94 27A70028 */ addiu $a3, $sp, 0x28 -/* A61768 80240D98 1040000B */ beqz $v0, .L80240DC8 -/* A6176C 80240D9C 00000000 */ nop -/* A61770 80240DA0 C600001C */ lwc1 $f0, 0x1c($s0) -/* A61774 80240DA4 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A61778 80240DA8 46000005 */ abs.s $f0, $f0 -/* A6177C 80240DAC 46000021 */ cvt.d.s $f0, $f0 -/* A61780 80240DB0 46340000 */ add.d $f0, $f0, $f20 -/* A61784 80240DB4 460010A1 */ cvt.d.s $f2, $f2 -/* A61788 80240DB8 4620103E */ c.le.d $f2, $f0 -/* A6178C 80240DBC 00000000 */ nop -/* A61790 80240DC0 45030001 */ bc1tl .L80240DC8 -/* A61794 80240DC4 24120001 */ addiu $s2, $zero, 1 -.L80240DC8: -/* A61798 80240DC8 56400008 */ bnel $s2, $zero, .L80240DEC -/* A6179C 80240DCC 2414000A */ addiu $s4, $zero, 0xa -/* A617A0 80240DD0 C604003C */ lwc1 $f4, 0x3c($s0) -/* A617A4 80240DD4 C600001C */ lwc1 $f0, 0x1c($s0) -/* A617A8 80240DD8 46002100 */ add.s $f4, $f4, $f0 -/* A617AC 80240DDC C6020014 */ lwc1 $f2, 0x14($s0) -/* A617B0 80240DE0 46020001 */ sub.s $f0, $f0, $f2 -/* A617B4 80240DE4 E604003C */ swc1 $f4, 0x3c($s0) -/* A617B8 80240DE8 E600001C */ swc1 $f0, 0x1c($s0) -.L80240DEC: -/* A617BC 80240DEC 9602008E */ lhu $v0, 0x8e($s0) -/* A617C0 80240DF0 2442FFFF */ addiu $v0, $v0, -1 -/* A617C4 80240DF4 A602008E */ sh $v0, 0x8e($s0) -/* A617C8 80240DF8 00021400 */ sll $v0, $v0, 0x10 -/* A617CC 80240DFC 58400001 */ blezl $v0, .L80240E04 -/* A617D0 80240E00 2414000B */ addiu $s4, $zero, 0xb -.L80240E04: -/* A617D4 80240E04 12800024 */ beqz $s4, .L80240E98 -/* A617D8 80240E08 00000000 */ nop -/* A617DC 80240E0C AFA00010 */ sw $zero, 0x10($sp) -/* A617E0 80240E10 AFA00014 */ sw $zero, 0x14($sp) -/* A617E4 80240E14 8E050038 */ lw $a1, 0x38($s0) -/* A617E8 80240E18 8E06003C */ lw $a2, 0x3c($s0) -/* A617EC 80240E1C 8E070040 */ lw $a3, 0x40($s0) -/* A617F0 80240E20 0C01BECC */ jal fx_walk_normal -/* A617F4 80240E24 24040002 */ addiu $a0, $zero, 2 -/* A617F8 80240E28 3C01C47A */ lui $at, 0xc47a -/* A617FC 80240E2C 44810000 */ mtc1 $at, $f0 -/* A61800 80240E30 AE20006C */ sw $zero, 0x6c($s1) -/* A61804 80240E34 8E020000 */ lw $v0, ($s0) -/* A61808 80240E38 0200202D */ daddu $a0, $s0, $zero -/* A6180C 80240E3C AE000038 */ sw $zero, 0x38($s0) -/* A61810 80240E40 AE000040 */ sw $zero, 0x40($s0) -/* A61814 80240E44 34420002 */ ori $v0, $v0, 2 -/* A61818 80240E48 E600003C */ swc1 $f0, 0x3c($s0) -/* A6181C 80240E4C 0C00EAFF */ jal disable_npc_shadow -/* A61820 80240E50 AE020000 */ sw $v0, ($s0) -/* A61824 80240E54 0260202D */ daddu $a0, $s3, $zero -/* A61828 80240E58 3C05FE36 */ lui $a1, 0xfe36 -/* A6182C 80240E5C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A61830 80240E60 24060001 */ addiu $a2, $zero, 1 -/* A61834 80240E64 8E020000 */ lw $v0, ($s0) -/* A61838 80240E68 2403F7FF */ addiu $v1, $zero, -0x801 -/* A6183C 80240E6C 00431024 */ and $v0, $v0, $v1 -/* A61840 80240E70 AE020000 */ sw $v0, ($s0) -/* A61844 80240E74 8E220000 */ lw $v0, ($s1) -/* A61848 80240E78 3C031F00 */ lui $v1, 0x1f00 -/* A6184C 80240E7C 00431025 */ or $v0, $v0, $v1 -/* A61850 80240E80 AE220000 */ sw $v0, ($s1) -/* A61854 80240E84 AC800070 */ sw $zero, 0x70($a0) -.L80240E88: -/* A61858 80240E88 0C0B2026 */ jal set_variable -/* A6185C 80240E8C 00000000 */ nop -/* A61860 80240E90 080903B2 */ j .L80240EC8 -/* A61864 80240E94 24020002 */ addiu $v0, $zero, 2 -.L80240E98: -/* A61868 80240E98 8E220070 */ lw $v0, 0x70($s1) -/* A6186C 80240E9C 30420001 */ andi $v0, $v0, 1 -/* A61870 80240EA0 10400009 */ beqz $v0, .L80240EC8 -/* A61874 80240EA4 0000102D */ daddu $v0, $zero, $zero -/* A61878 80240EA8 C600004C */ lwc1 $f0, 0x4c($s0) -/* A6187C 80240EAC 3C01404E */ lui $at, 0x404e -/* A61880 80240EB0 44811800 */ mtc1 $at, $f3 -/* A61884 80240EB4 44801000 */ mtc1 $zero, $f2 -/* A61888 80240EB8 46000021 */ cvt.d.s $f0, $f0 -/* A6188C 80240EBC 46220000 */ add.d $f0, $f0, $f2 -/* A61890 80240EC0 46200020 */ cvt.s.d $f0, $f0 -/* A61894 80240EC4 E600004C */ swc1 $f0, 0x4c($s0) -.L80240EC8: -/* A61898 80240EC8 8FBF0044 */ lw $ra, 0x44($sp) -/* A6189C 80240ECC 8FB40040 */ lw $s4, 0x40($sp) -/* A618A0 80240ED0 8FB3003C */ lw $s3, 0x3c($sp) -/* A618A4 80240ED4 8FB20038 */ lw $s2, 0x38($sp) -/* A618A8 80240ED8 8FB10034 */ lw $s1, 0x34($sp) -/* A618AC 80240EDC 8FB00030 */ lw $s0, 0x30($sp) -/* A618B0 80240EE0 D7B80058 */ ldc1 $f24, 0x58($sp) -/* A618B4 80240EE4 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A618B8 80240EE8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A618BC 80240EEC 03E00008 */ jr $ra -/* A618C0 80240EF0 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s new file mode 100644 index 0000000000..2737fb1e12 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240A98_A61468.s @@ -0,0 +1,298 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A98_A61468 +/* A61468 80240A98 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* A6146C 80240A9C AFB3003C */ sw $s3, 0x3c($sp) +/* A61470 80240AA0 0080982D */ daddu $s3, $a0, $zero +/* A61474 80240AA4 AFB40040 */ sw $s4, 0x40($sp) +/* A61478 80240AA8 0000A02D */ daddu $s4, $zero, $zero +/* A6147C 80240AAC 3C03800A */ lui $v1, 0x800a +/* A61480 80240AB0 8463A634 */ lh $v1, -0x59cc($v1) +/* A61484 80240AB4 3C04800B */ lui $a0, %hi(gCameras) +/* A61488 80240AB8 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A6148C 80240ABC AFBF0044 */ sw $ra, 0x44($sp) +/* A61490 80240AC0 AFB20038 */ sw $s2, 0x38($sp) +/* A61494 80240AC4 AFB10034 */ sw $s1, 0x34($sp) +/* A61498 80240AC8 AFB00030 */ sw $s0, 0x30($sp) +/* A6149C 80240ACC F7B80058 */ sdc1 $f24, 0x58($sp) +/* A614A0 80240AD0 F7B60050 */ sdc1 $f22, 0x50($sp) +/* A614A4 80240AD4 F7B40048 */ sdc1 $f20, 0x48($sp) +/* A614A8 80240AD8 8E710148 */ lw $s1, 0x148($s3) +/* A614AC 80240ADC 00031080 */ sll $v0, $v1, 2 +/* A614B0 80240AE0 00431021 */ addu $v0, $v0, $v1 +/* A614B4 80240AE4 00021080 */ sll $v0, $v0, 2 +/* A614B8 80240AE8 00431023 */ subu $v0, $v0, $v1 +/* A614BC 80240AEC 000218C0 */ sll $v1, $v0, 3 +/* A614C0 80240AF0 00431021 */ addu $v0, $v0, $v1 +/* A614C4 80240AF4 000210C0 */ sll $v0, $v0, 3 +/* A614C8 80240AF8 10A00002 */ beqz $a1, .L80240B04 +/* A614CC 80240AFC 00449021 */ addu $s2, $v0, $a0 +/* A614D0 80240B00 AE600070 */ sw $zero, 0x70($s3) +.L80240B04: +/* A614D4 80240B04 0C00FB5A */ jal get_enemy_safe +/* A614D8 80240B08 86240008 */ lh $a0, 8($s1) +/* A614DC 80240B0C 14400006 */ bnez $v0, .L80240B28 +/* A614E0 80240B10 24020005 */ addiu $v0, $zero, 5 +/* A614E4 80240B14 0260202D */ daddu $a0, $s3, $zero +/* A614E8 80240B18 3C05FE36 */ lui $a1, 0xfe36 +/* A614EC 80240B1C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A614F0 80240B20 080903A2 */ j .L80240E88 +/* A614F4 80240B24 0000302D */ daddu $a2, $zero, $zero +.L80240B28: +/* A614F8 80240B28 8E23006C */ lw $v1, 0x6c($s1) +/* A614FC 80240B2C 14620005 */ bne $v1, $v0, .L80240B44 +/* A61500 80240B30 0260202D */ daddu $a0, $s3, $zero +/* A61504 80240B34 3C05FE36 */ lui $a1, 0xfe36 +/* A61508 80240B38 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A6150C 80240B3C 080903A2 */ j .L80240E88 +/* A61510 80240B40 0000302D */ daddu $a2, $zero, $zero +.L80240B44: +/* A61514 80240B44 86240008 */ lh $a0, 8($s1) +/* A61518 80240B48 0C00FB5A */ jal get_enemy_safe +/* A6151C 80240B4C 00000000 */ nop +/* A61520 80240B50 14400005 */ bnez $v0, .L80240B68 +/* A61524 80240B54 0260202D */ daddu $a0, $s3, $zero +/* A61528 80240B58 3C05FE36 */ lui $a1, 0xfe36 +/* A6152C 80240B5C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A61530 80240B60 080903A2 */ j .L80240E88 +/* A61534 80240B64 0000302D */ daddu $a2, $zero, $zero +.L80240B68: +/* A61538 80240B68 86240008 */ lh $a0, 8($s1) +/* A6153C 80240B6C 0C00EABB */ jal get_npc_unsafe +/* A61540 80240B70 00000000 */ nop +/* A61544 80240B74 8E630070 */ lw $v1, 0x70($s3) +/* A61548 80240B78 10600006 */ beqz $v1, .L80240B94 +/* A6154C 80240B7C 0040802D */ daddu $s0, $v0, $zero +/* A61550 80240B80 24020001 */ addiu $v0, $zero, 1 +/* A61554 80240B84 1062003F */ beq $v1, $v0, .L80240C84 +/* A61558 80240B88 0000102D */ daddu $v0, $zero, $zero +/* A6155C 80240B8C 080903B2 */ j .L80240EC8 +/* A61560 80240B90 00000000 */ nop +.L80240B94: +/* A61564 80240B94 AFA00010 */ sw $zero, 0x10($sp) +/* A61568 80240B98 AFA00014 */ sw $zero, 0x14($sp) +/* A6156C 80240B9C 8E050038 */ lw $a1, 0x38($s0) +/* A61570 80240BA0 8E06003C */ lw $a2, 0x3c($s0) +/* A61574 80240BA4 8E070040 */ lw $a3, 0x40($s0) +/* A61578 80240BA8 0C01BECC */ jal fx_walk_normal +/* A6157C 80240BAC 24040002 */ addiu $a0, $zero, 2 +/* A61580 80240BB0 C64C006C */ lwc1 $f12, 0x6c($s2) +/* A61584 80240BB4 0C00A6C9 */ jal clamp_angle +/* A61588 80240BB8 00000000 */ nop +/* A6158C 80240BBC 3C018024 */ lui $at, 0x8024 +/* A61590 80240BC0 D43834B0 */ ldc1 $f24, 0x34b0($at) +/* A61594 80240BC4 46000521 */ cvt.d.s $f20, $f0 +/* A61598 80240BC8 4638A300 */ add.d $f12, $f20, $f24 +/* A6159C 80240BCC 3C018024 */ lui $at, 0x8024 +/* A615A0 80240BD0 D43634B8 */ ldc1 $f22, 0x34b8($at) +/* A615A4 80240BD4 0C00A6C9 */ jal clamp_angle +/* A615A8 80240BD8 46206320 */ cvt.s.d $f12, $f12 +/* A615AC 80240BDC 4636A500 */ add.d $f20, $f20, $f22 +/* A615B0 80240BE0 4620A320 */ cvt.s.d $f12, $f20 +/* A615B4 80240BE4 0C00A6C9 */ jal clamp_angle +/* A615B8 80240BE8 46000506 */ mov.s $f20, $f0 +/* A615BC 80240BEC 4600A521 */ cvt.d.s $f20, $f20 +/* A615C0 80240BF0 4636A500 */ add.d $f20, $f20, $f22 +/* A615C4 80240BF4 46000586 */ mov.s $f22, $f0 +/* A615C8 80240BF8 0C00A6C9 */ jal clamp_angle +/* A615CC 80240BFC 4620A320 */ cvt.s.d $f12, $f20 +/* A615D0 80240C00 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A615D4 80240C04 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A615D8 80240C08 C64C006C */ lwc1 $f12, 0x6c($s2) +/* A615DC 80240C0C C44E0084 */ lwc1 $f14, 0x84($v0) +/* A615E0 80240C10 0C00A70A */ jal get_clamped_angle_diff +/* A615E4 80240C14 46000506 */ mov.s $f20, $f0 +/* A615E8 80240C18 0C00A6C9 */ jal clamp_angle +/* A615EC 80240C1C 46000306 */ mov.s $f12, $f0 +/* A615F0 80240C20 46000021 */ cvt.d.s $f0, $f0 +/* A615F4 80240C24 4638003C */ c.lt.d $f0, $f24 +/* A615F8 80240C28 00000000 */ nop +/* A615FC 80240C2C 45020002 */ bc1fl .L80240C38 +/* A61600 80240C30 E614000C */ swc1 $f20, 0xc($s0) +/* A61604 80240C34 E616000C */ swc1 $f22, 0xc($s0) +.L80240C38: +/* A61608 80240C38 C6000018 */ lwc1 $f0, 0x18($s0) +/* A6160C 80240C3C 3C018024 */ lui $at, 0x8024 +/* A61610 80240C40 D42234C0 */ ldc1 $f2, 0x34c0($at) +/* A61614 80240C44 46000021 */ cvt.d.s $f0, $f0 +/* A61618 80240C48 46220002 */ mul.d $f0, $f0, $f2 +/* A6161C 80240C4C 00000000 */ nop +/* A61620 80240C50 3C013F66 */ lui $at, 0x3f66 +/* A61624 80240C54 34216666 */ ori $at, $at, 0x6666 +/* A61628 80240C58 44812000 */ mtc1 $at, $f4 +/* A6162C 80240C5C 2402001E */ addiu $v0, $zero, 0x1e +/* A61630 80240C60 A602008E */ sh $v0, 0x8e($s0) +/* A61634 80240C64 3C014120 */ lui $at, 0x4120 +/* A61638 80240C68 44811000 */ mtc1 $at, $f2 +/* A6163C 80240C6C 24020001 */ addiu $v0, $zero, 1 +/* A61640 80240C70 E6040014 */ swc1 $f4, 0x14($s0) +/* A61644 80240C74 E602001C */ swc1 $f2, 0x1c($s0) +/* A61648 80240C78 46200020 */ cvt.s.d $f0, $f0 +/* A6164C 80240C7C E6000018 */ swc1 $f0, 0x18($s0) +/* A61650 80240C80 AE620070 */ sw $v0, 0x70($s3) +.L80240C84: +/* A61654 80240C84 C6000038 */ lwc1 $f0, 0x38($s0) +/* A61658 80240C88 C602003C */ lwc1 $f2, 0x3c($s0) +/* A6165C 80240C8C C6040040 */ lwc1 $f4, 0x40($s0) +/* A61660 80240C90 C6060018 */ lwc1 $f6, 0x18($s0) +/* A61664 80240C94 0000202D */ daddu $a0, $zero, $zero +/* A61668 80240C98 E7A00020 */ swc1 $f0, 0x20($sp) +/* A6166C 80240C9C E7A20024 */ swc1 $f2, 0x24($sp) +/* A61670 80240CA0 E7A40028 */ swc1 $f4, 0x28($sp) +/* A61674 80240CA4 E7A60010 */ swc1 $f6, 0x10($sp) +/* A61678 80240CA8 C600000C */ lwc1 $f0, 0xc($s0) +/* A6167C 80240CAC 27A50020 */ addiu $a1, $sp, 0x20 +/* A61680 80240CB0 E7A00014 */ swc1 $f0, 0x14($sp) +/* A61684 80240CB4 860200A6 */ lh $v0, 0xa6($s0) +/* A61688 80240CB8 27A60024 */ addiu $a2, $sp, 0x24 +/* A6168C 80240CBC 44820000 */ mtc1 $v0, $f0 +/* A61690 80240CC0 00000000 */ nop +/* A61694 80240CC4 46800020 */ cvt.s.w $f0, $f0 +/* A61698 80240CC8 E7A00018 */ swc1 $f0, 0x18($sp) +/* A6169C 80240CCC 860200A8 */ lh $v0, 0xa8($s0) +/* A616A0 80240CD0 27A70028 */ addiu $a3, $sp, 0x28 +/* A616A4 80240CD4 44820000 */ mtc1 $v0, $f0 +/* A616A8 80240CD8 00000000 */ nop +/* A616AC 80240CDC 46800020 */ cvt.s.w $f0, $f0 +/* A616B0 80240CE0 0C037711 */ jal func_800DDC44 +/* A616B4 80240CE4 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A616B8 80240CE8 54400007 */ bnel $v0, $zero, .L80240D08 +/* A616BC 80240CEC 24140001 */ addiu $s4, $zero, 1 +/* A616C0 80240CF0 8E050018 */ lw $a1, 0x18($s0) +/* A616C4 80240CF4 8E06000C */ lw $a2, 0xc($s0) +/* A616C8 80240CF8 0C00EA95 */ jal npc_move_heading +/* A616CC 80240CFC 0200202D */ daddu $a0, $s0, $zero +/* A616D0 80240D00 08090343 */ j .L80240D0C +/* A616D4 80240D04 0000902D */ daddu $s2, $zero, $zero +.L80240D08: +/* A616D8 80240D08 0000902D */ daddu $s2, $zero, $zero +.L80240D0C: +/* A616DC 80240D0C C600001C */ lwc1 $f0, 0x1c($s0) +/* A616E0 80240D10 44801000 */ mtc1 $zero, $f2 +/* A616E4 80240D14 44801800 */ mtc1 $zero, $f3 +/* A616E8 80240D18 46000021 */ cvt.d.s $f0, $f0 +/* A616EC 80240D1C 4622003C */ c.lt.d $f0, $f2 +/* A616F0 80240D20 00000000 */ nop +/* A616F4 80240D24 45000028 */ bc1f .L80240DC8 +/* A616F8 80240D28 27A50020 */ addiu $a1, $sp, 0x20 +/* A616FC 80240D2C 27A60024 */ addiu $a2, $sp, 0x24 +/* A61700 80240D30 27A2002C */ addiu $v0, $sp, 0x2c +/* A61704 80240D34 C602003C */ lwc1 $f2, 0x3c($s0) +/* A61708 80240D38 C6060038 */ lwc1 $f6, 0x38($s0) +/* A6170C 80240D3C 3C01402A */ lui $at, 0x402a +/* A61710 80240D40 4481A800 */ mtc1 $at, $f21 +/* A61714 80240D44 4480A000 */ mtc1 $zero, $f20 +/* A61718 80240D48 460010A1 */ cvt.d.s $f2, $f2 +/* A6171C 80240D4C 46341080 */ add.d $f2, $f2, $f20 +/* A61720 80240D50 C600001C */ lwc1 $f0, 0x1c($s0) +/* A61724 80240D54 C6040040 */ lwc1 $f4, 0x40($s0) +/* A61728 80240D58 46000005 */ abs.s $f0, $f0 +/* A6172C 80240D5C E7A40028 */ swc1 $f4, 0x28($sp) +/* A61730 80240D60 3C014030 */ lui $at, 0x4030 +/* A61734 80240D64 44812800 */ mtc1 $at, $f5 +/* A61738 80240D68 44802000 */ mtc1 $zero, $f4 +/* A6173C 80240D6C 46000021 */ cvt.d.s $f0, $f0 +/* A61740 80240D70 E7A60020 */ swc1 $f6, 0x20($sp) +/* A61744 80240D74 46240000 */ add.d $f0, $f0, $f4 +/* A61748 80240D78 462010A0 */ cvt.s.d $f2, $f2 +/* A6174C 80240D7C E7A20024 */ swc1 $f2, 0x24($sp) +/* A61750 80240D80 46200020 */ cvt.s.d $f0, $f0 +/* A61754 80240D84 E7A0002C */ swc1 $f0, 0x2c($sp) +/* A61758 80240D88 AFA20010 */ sw $v0, 0x10($sp) +/* A6175C 80240D8C 8E040080 */ lw $a0, 0x80($s0) +/* A61760 80240D90 0C0372DF */ jal func_800DCB7C +/* A61764 80240D94 27A70028 */ addiu $a3, $sp, 0x28 +/* A61768 80240D98 1040000B */ beqz $v0, .L80240DC8 +/* A6176C 80240D9C 00000000 */ nop +/* A61770 80240DA0 C600001C */ lwc1 $f0, 0x1c($s0) +/* A61774 80240DA4 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* A61778 80240DA8 46000005 */ abs.s $f0, $f0 +/* A6177C 80240DAC 46000021 */ cvt.d.s $f0, $f0 +/* A61780 80240DB0 46340000 */ add.d $f0, $f0, $f20 +/* A61784 80240DB4 460010A1 */ cvt.d.s $f2, $f2 +/* A61788 80240DB8 4620103E */ c.le.d $f2, $f0 +/* A6178C 80240DBC 00000000 */ nop +/* A61790 80240DC0 45030001 */ bc1tl .L80240DC8 +/* A61794 80240DC4 24120001 */ addiu $s2, $zero, 1 +.L80240DC8: +/* A61798 80240DC8 56400008 */ bnel $s2, $zero, .L80240DEC +/* A6179C 80240DCC 2414000A */ addiu $s4, $zero, 0xa +/* A617A0 80240DD0 C604003C */ lwc1 $f4, 0x3c($s0) +/* A617A4 80240DD4 C600001C */ lwc1 $f0, 0x1c($s0) +/* A617A8 80240DD8 46002100 */ add.s $f4, $f4, $f0 +/* A617AC 80240DDC C6020014 */ lwc1 $f2, 0x14($s0) +/* A617B0 80240DE0 46020001 */ sub.s $f0, $f0, $f2 +/* A617B4 80240DE4 E604003C */ swc1 $f4, 0x3c($s0) +/* A617B8 80240DE8 E600001C */ swc1 $f0, 0x1c($s0) +.L80240DEC: +/* A617BC 80240DEC 9602008E */ lhu $v0, 0x8e($s0) +/* A617C0 80240DF0 2442FFFF */ addiu $v0, $v0, -1 +/* A617C4 80240DF4 A602008E */ sh $v0, 0x8e($s0) +/* A617C8 80240DF8 00021400 */ sll $v0, $v0, 0x10 +/* A617CC 80240DFC 58400001 */ blezl $v0, .L80240E04 +/* A617D0 80240E00 2414000B */ addiu $s4, $zero, 0xb +.L80240E04: +/* A617D4 80240E04 12800024 */ beqz $s4, .L80240E98 +/* A617D8 80240E08 00000000 */ nop +/* A617DC 80240E0C AFA00010 */ sw $zero, 0x10($sp) +/* A617E0 80240E10 AFA00014 */ sw $zero, 0x14($sp) +/* A617E4 80240E14 8E050038 */ lw $a1, 0x38($s0) +/* A617E8 80240E18 8E06003C */ lw $a2, 0x3c($s0) +/* A617EC 80240E1C 8E070040 */ lw $a3, 0x40($s0) +/* A617F0 80240E20 0C01BECC */ jal fx_walk_normal +/* A617F4 80240E24 24040002 */ addiu $a0, $zero, 2 +/* A617F8 80240E28 3C01C47A */ lui $at, 0xc47a +/* A617FC 80240E2C 44810000 */ mtc1 $at, $f0 +/* A61800 80240E30 AE20006C */ sw $zero, 0x6c($s1) +/* A61804 80240E34 8E020000 */ lw $v0, ($s0) +/* A61808 80240E38 0200202D */ daddu $a0, $s0, $zero +/* A6180C 80240E3C AE000038 */ sw $zero, 0x38($s0) +/* A61810 80240E40 AE000040 */ sw $zero, 0x40($s0) +/* A61814 80240E44 34420002 */ ori $v0, $v0, 2 +/* A61818 80240E48 E600003C */ swc1 $f0, 0x3c($s0) +/* A6181C 80240E4C 0C00EAFF */ jal disable_npc_shadow +/* A61820 80240E50 AE020000 */ sw $v0, ($s0) +/* A61824 80240E54 0260202D */ daddu $a0, $s3, $zero +/* A61828 80240E58 3C05FE36 */ lui $a1, 0xfe36 +/* A6182C 80240E5C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A61830 80240E60 24060001 */ addiu $a2, $zero, 1 +/* A61834 80240E64 8E020000 */ lw $v0, ($s0) +/* A61838 80240E68 2403F7FF */ addiu $v1, $zero, -0x801 +/* A6183C 80240E6C 00431024 */ and $v0, $v0, $v1 +/* A61840 80240E70 AE020000 */ sw $v0, ($s0) +/* A61844 80240E74 8E220000 */ lw $v0, ($s1) +/* A61848 80240E78 3C031F00 */ lui $v1, 0x1f00 +/* A6184C 80240E7C 00431025 */ or $v0, $v0, $v1 +/* A61850 80240E80 AE220000 */ sw $v0, ($s1) +/* A61854 80240E84 AC800070 */ sw $zero, 0x70($a0) +.L80240E88: +/* A61858 80240E88 0C0B2026 */ jal set_variable +/* A6185C 80240E8C 00000000 */ nop +/* A61860 80240E90 080903B2 */ j .L80240EC8 +/* A61864 80240E94 24020002 */ addiu $v0, $zero, 2 +.L80240E98: +/* A61868 80240E98 8E220070 */ lw $v0, 0x70($s1) +/* A6186C 80240E9C 30420001 */ andi $v0, $v0, 1 +/* A61870 80240EA0 10400009 */ beqz $v0, .L80240EC8 +/* A61874 80240EA4 0000102D */ daddu $v0, $zero, $zero +/* A61878 80240EA8 C600004C */ lwc1 $f0, 0x4c($s0) +/* A6187C 80240EAC 3C01404E */ lui $at, 0x404e +/* A61880 80240EB0 44811800 */ mtc1 $at, $f3 +/* A61884 80240EB4 44801000 */ mtc1 $zero, $f2 +/* A61888 80240EB8 46000021 */ cvt.d.s $f0, $f0 +/* A6188C 80240EBC 46220000 */ add.d $f0, $f0, $f2 +/* A61890 80240EC0 46200020 */ cvt.s.d $f0, $f0 +/* A61894 80240EC4 E600004C */ swc1 $f0, 0x4c($s0) +.L80240EC8: +/* A61898 80240EC8 8FBF0044 */ lw $ra, 0x44($sp) +/* A6189C 80240ECC 8FB40040 */ lw $s4, 0x40($sp) +/* A618A0 80240ED0 8FB3003C */ lw $s3, 0x3c($sp) +/* A618A4 80240ED4 8FB20038 */ lw $s2, 0x38($sp) +/* A618A8 80240ED8 8FB10034 */ lw $s1, 0x34($sp) +/* A618AC 80240EDC 8FB00030 */ lw $s0, 0x30($sp) +/* A618B0 80240EE0 D7B80058 */ ldc1 $f24, 0x58($sp) +/* A618B4 80240EE4 D7B60050 */ ldc1 $f22, 0x50($sp) +/* A618B8 80240EE8 D7B40048 */ ldc1 $f20, 0x48($sp) +/* A618BC 80240EEC 03E00008 */ jr $ra +/* A618C0 80240EF0 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s index 2b25b43c50..391e8bf717 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s @@ -159,7 +159,7 @@ glabel func_80240EF4_A618C4 /* A61B10 80241140 0260202D */ daddu $a0, $s3, $zero /* A61B14 80241144 8E050024 */ lw $a1, 0x24($s0) /* A61B18 80241148 8E060028 */ lw $a2, 0x28($s0) -/* A61B1C 8024114C 0C09007C */ jal func_802401F0 +/* A61B1C 8024114C 0C09007C */ jal func_802401F0_A60BC0 /* A61B20 80241150 02A0382D */ daddu $a3, $s5, $zero /* A61B24 80241154 8E630070 */ lw $v1, 0x70($s3) /* A61B28 80241158 2402000C */ addiu $v0, $zero, 0xc @@ -182,19 +182,19 @@ glabel func_80240EF4_A618C4 /* A61B68 80241198 02A0302D */ daddu $a2, $s5, $zero /* A61B6C 8024119C 0809047B */ j .L802411EC /* A61B70 802411A0 00000000 */ nop -/* A61B74 802411A4 0C0900CD */ jal func_80240334 +/* A61B74 802411A4 0C0900CD */ jal func_80240334_A60D04 /* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero /* A61B7C 802411AC 0809047B */ j .L802411EC /* A61B80 802411B0 00000000 */ nop -/* A61B84 802411B4 0C09010D */ jal func_80240434 +/* A61B84 802411B4 0C09010D */ jal func_80240434_A60E04 /* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero /* A61B8C 802411BC 0809047B */ j .L802411EC /* A61B90 802411C0 00000000 */ nop -/* A61B94 802411C4 0C09011E */ jal func_80240478 +/* A61B94 802411C4 0C09011E */ jal func_80240478_A60E48 /* A61B98 802411C8 0260202D */ daddu $a0, $s3, $zero /* A61B9C 802411CC 0809047B */ j .L802411EC /* A61BA0 802411D0 00000000 */ nop -/* A61BA4 802411D4 0C090146 */ jal func_80240518 +/* A61BA4 802411D4 0C090146 */ jal func_80240518_A60EE8 /* A61BA8 802411D8 0260202D */ daddu $a0, $s3, $zero /* A61BAC 802411DC 0809047B */ j .L802411EC /* A61BB0 802411E0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214.s deleted file mode 100644 index 7ace46aac7..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241214 -/* A61BE4 80241214 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A61BE8 80241218 3C05FE36 */ lui $a1, 0xfe36 -/* A61BEC 8024121C AFBF0010 */ sw $ra, 0x10($sp) -/* A61BF0 80241220 8C820148 */ lw $v0, 0x148($a0) -/* A61BF4 80241224 3C06800B */ lui $a2, 0x800b -/* A61BF8 80241228 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A61BFC 8024122C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A61C00 80241230 00C23026 */ xor $a2, $a2, $v0 -/* A61C04 80241234 0C0B2026 */ jal set_variable -/* A61C08 80241238 2CC60001 */ sltiu $a2, $a2, 1 -/* A61C0C 8024123C 8FBF0010 */ lw $ra, 0x10($sp) -/* A61C10 80241240 24020002 */ addiu $v0, $zero, 2 -/* A61C14 80241244 03E00008 */ jr $ra -/* A61C18 80241248 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s new file mode 100644 index 0000000000..dd0c30bb0c --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241214_A61BE4 +/* A61BE4 80241214 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A61BE8 80241218 3C05FE36 */ lui $a1, 0xfe36 +/* A61BEC 8024121C AFBF0010 */ sw $ra, 0x10($sp) +/* A61BF0 80241220 8C820148 */ lw $v0, 0x148($a0) +/* A61BF4 80241224 3C06800B */ lui $a2, 0x800b +/* A61BF8 80241228 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A61BFC 8024122C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A61C00 80241230 00C23026 */ xor $a2, $a2, $v0 +/* A61C04 80241234 0C0B2026 */ jal set_variable +/* A61C08 80241238 2CC60001 */ sltiu $a2, $a2, 1 +/* A61C0C 8024123C 8FBF0010 */ lw $ra, 0x10($sp) +/* A61C10 80241240 24020002 */ addiu $v0, $zero, 2 +/* A61C14 80241244 03E00008 */ jr $ra +/* A61C18 80241248 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024124C.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024124C.s deleted file mode 100644 index bb346f0a61..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024124C.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024124C -/* A61C1C 8024124C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A61C20 80241250 AFB20018 */ sw $s2, 0x18($sp) -/* A61C24 80241254 0080902D */ daddu $s2, $a0, $zero -/* A61C28 80241258 AFBF001C */ sw $ra, 0x1c($sp) -/* A61C2C 8024125C AFB10014 */ sw $s1, 0x14($sp) -/* A61C30 80241260 AFB00010 */ sw $s0, 0x10($sp) -/* A61C34 80241264 8E510148 */ lw $s1, 0x148($s2) -/* A61C38 80241268 0C00EABB */ jal get_npc_unsafe -/* A61C3C 8024126C 86240008 */ lh $a0, 8($s1) -/* A61C40 80241270 0040802D */ daddu $s0, $v0, $zero -/* A61C44 80241274 8E2300CC */ lw $v1, 0xcc($s1) -/* A61C48 80241278 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A61C4C 8024127C 8C630020 */ lw $v1, 0x20($v1) -/* A61C50 80241280 AE030028 */ sw $v1, 0x28($s0) -/* A61C54 80241284 96220076 */ lhu $v0, 0x76($s1) -/* A61C58 80241288 A602008E */ sh $v0, 0x8e($s0) -/* A61C5C 8024128C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A61C60 80241290 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A61C64 80241294 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A61C68 80241298 8C460028 */ lw $a2, 0x28($v0) -/* A61C6C 8024129C 0C00A720 */ jal atan2 -/* A61C70 802412A0 8C470030 */ lw $a3, 0x30($v0) -/* A61C74 802412A4 2402000D */ addiu $v0, $zero, 0xd -/* A61C78 802412A8 E600000C */ swc1 $f0, 0xc($s0) -/* A61C7C 802412AC AE420070 */ sw $v0, 0x70($s2) -/* A61C80 802412B0 8FBF001C */ lw $ra, 0x1c($sp) -/* A61C84 802412B4 8FB20018 */ lw $s2, 0x18($sp) -/* A61C88 802412B8 8FB10014 */ lw $s1, 0x14($sp) -/* A61C8C 802412BC 8FB00010 */ lw $s0, 0x10($sp) -/* A61C90 802412C0 03E00008 */ jr $ra -/* A61C94 802412C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024124C_A61C1C.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024124C_A61C1C.s new file mode 100644 index 0000000000..daa633bfa5 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_8024124C_A61C1C.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024124C_A61C1C +/* A61C1C 8024124C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A61C20 80241250 AFB20018 */ sw $s2, 0x18($sp) +/* A61C24 80241254 0080902D */ daddu $s2, $a0, $zero +/* A61C28 80241258 AFBF001C */ sw $ra, 0x1c($sp) +/* A61C2C 8024125C AFB10014 */ sw $s1, 0x14($sp) +/* A61C30 80241260 AFB00010 */ sw $s0, 0x10($sp) +/* A61C34 80241264 8E510148 */ lw $s1, 0x148($s2) +/* A61C38 80241268 0C00EABB */ jal get_npc_unsafe +/* A61C3C 8024126C 86240008 */ lh $a0, 8($s1) +/* A61C40 80241270 0040802D */ daddu $s0, $v0, $zero +/* A61C44 80241274 8E2300CC */ lw $v1, 0xcc($s1) +/* A61C48 80241278 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A61C4C 8024127C 8C630020 */ lw $v1, 0x20($v1) +/* A61C50 80241280 AE030028 */ sw $v1, 0x28($s0) +/* A61C54 80241284 96220076 */ lhu $v0, 0x76($s1) +/* A61C58 80241288 A602008E */ sh $v0, 0x8e($s0) +/* A61C5C 8024128C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A61C60 80241290 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A61C64 80241294 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A61C68 80241298 8C460028 */ lw $a2, 0x28($v0) +/* A61C6C 8024129C 0C00A720 */ jal atan2 +/* A61C70 802412A0 8C470030 */ lw $a3, 0x30($v0) +/* A61C74 802412A4 2402000D */ addiu $v0, $zero, 0xd +/* A61C78 802412A8 E600000C */ swc1 $f0, 0xc($s0) +/* A61C7C 802412AC AE420070 */ sw $v0, 0x70($s2) +/* A61C80 802412B0 8FBF001C */ lw $ra, 0x1c($sp) +/* A61C84 802412B4 8FB20018 */ lw $s2, 0x18($sp) +/* A61C88 802412B8 8FB10014 */ lw $s1, 0x14($sp) +/* A61C8C 802412BC 8FB00010 */ lw $s0, 0x10($sp) +/* A61C90 802412C0 03E00008 */ jr $ra +/* A61C94 802412C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802413FC.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802413FC.s deleted file mode 100644 index 0794f0e2c8..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802413FC.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413FC -/* A61DCC 802413FC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A61DD0 80241400 AFB3003C */ sw $s3, 0x3c($sp) -/* A61DD4 80241404 0080982D */ daddu $s3, $a0, $zero -/* A61DD8 80241408 AFBF0040 */ sw $ra, 0x40($sp) -/* A61DDC 8024140C AFB20038 */ sw $s2, 0x38($sp) -/* A61DE0 80241410 AFB10034 */ sw $s1, 0x34($sp) -/* A61DE4 80241414 AFB00030 */ sw $s0, 0x30($sp) -/* A61DE8 80241418 8E710148 */ lw $s1, 0x148($s3) -/* A61DEC 8024141C 0C00EABB */ jal get_npc_unsafe -/* A61DF0 80241420 86240008 */ lh $a0, 8($s1) -/* A61DF4 80241424 0040802D */ daddu $s0, $v0, $zero -/* A61DF8 80241428 8E22007C */ lw $v0, 0x7c($s1) -/* A61DFC 8024142C 8603008E */ lh $v1, 0x8e($s0) -/* A61E00 80241430 2442FFFF */ addiu $v0, $v0, -1 -/* A61E04 80241434 14620012 */ bne $v1, $v0, .L80241480 -/* A61E08 80241438 00000000 */ nop -/* A61E0C 8024143C C6000038 */ lwc1 $f0, 0x38($s0) -/* A61E10 80241440 4600020D */ trunc.w.s $f8, $f0 -/* A61E14 80241444 44024000 */ mfc1 $v0, $f8 -/* A61E18 80241448 00000000 */ nop -/* A61E1C 8024144C A6220010 */ sh $v0, 0x10($s1) -/* A61E20 80241450 C600003C */ lwc1 $f0, 0x3c($s0) -/* A61E24 80241454 4600020D */ trunc.w.s $f8, $f0 -/* A61E28 80241458 44024000 */ mfc1 $v0, $f8 -/* A61E2C 8024145C 00000000 */ nop -/* A61E30 80241460 A6220012 */ sh $v0, 0x12($s1) -/* A61E34 80241464 C6000040 */ lwc1 $f0, 0x40($s0) -/* A61E38 80241468 24020001 */ addiu $v0, $zero, 1 -/* A61E3C 8024146C A2220007 */ sb $v0, 7($s1) -/* A61E40 80241470 4600020D */ trunc.w.s $f8, $f0 -/* A61E44 80241474 44024000 */ mfc1 $v0, $f8 -/* A61E48 80241478 00000000 */ nop -/* A61E4C 8024147C A6220014 */ sh $v0, 0x14($s1) -.L80241480: -/* A61E50 80241480 C6000038 */ lwc1 $f0, 0x38($s0) -/* A61E54 80241484 C602003C */ lwc1 $f2, 0x3c($s0) -/* A61E58 80241488 C6040040 */ lwc1 $f4, 0x40($s0) -/* A61E5C 8024148C C6060018 */ lwc1 $f6, 0x18($s0) -/* A61E60 80241490 E7A00020 */ swc1 $f0, 0x20($sp) -/* A61E64 80241494 E7A20024 */ swc1 $f2, 0x24($sp) -/* A61E68 80241498 E7A40028 */ swc1 $f4, 0x28($sp) -/* A61E6C 8024149C E7A60010 */ swc1 $f6, 0x10($sp) -/* A61E70 802414A0 C600000C */ lwc1 $f0, 0xc($s0) -/* A61E74 802414A4 E7A00014 */ swc1 $f0, 0x14($sp) -/* A61E78 802414A8 860200A8 */ lh $v0, 0xa8($s0) -/* A61E7C 802414AC 27A50020 */ addiu $a1, $sp, 0x20 -/* A61E80 802414B0 44820000 */ mtc1 $v0, $f0 -/* A61E84 802414B4 00000000 */ nop -/* A61E88 802414B8 46800020 */ cvt.s.w $f0, $f0 -/* A61E8C 802414BC E7A00018 */ swc1 $f0, 0x18($sp) -/* A61E90 802414C0 860200A6 */ lh $v0, 0xa6($s0) -/* A61E94 802414C4 27A60024 */ addiu $a2, $sp, 0x24 -/* A61E98 802414C8 44820000 */ mtc1 $v0, $f0 -/* A61E9C 802414CC 00000000 */ nop -/* A61EA0 802414D0 46800020 */ cvt.s.w $f0, $f0 -/* A61EA4 802414D4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A61EA8 802414D8 8E040080 */ lw $a0, 0x80($s0) -/* A61EAC 802414DC 0C037711 */ jal func_800DDC44 -/* A61EB0 802414E0 27A70028 */ addiu $a3, $sp, 0x28 -/* A61EB4 802414E4 0040902D */ daddu $s2, $v0, $zero -/* A61EB8 802414E8 16400005 */ bnez $s2, .L80241500 -/* A61EBC 802414EC 00000000 */ nop -/* A61EC0 802414F0 8E050018 */ lw $a1, 0x18($s0) -/* A61EC4 802414F4 8E06000C */ lw $a2, 0xc($s0) -/* A61EC8 802414F8 0C00EA95 */ jal npc_move_heading -/* A61ECC 802414FC 0200202D */ daddu $a0, $s0, $zero -.L80241500: -/* A61ED0 80241500 8602008E */ lh $v0, 0x8e($s0) -/* A61ED4 80241504 9603008E */ lhu $v1, 0x8e($s0) -/* A61ED8 80241508 18400007 */ blez $v0, .L80241528 -/* A61EDC 8024150C 2462FFFF */ addiu $v0, $v1, -1 -/* A61EE0 80241510 A602008E */ sh $v0, 0x8e($s0) -/* A61EE4 80241514 00021400 */ sll $v0, $v0, 0x10 -/* A61EE8 80241518 18400003 */ blez $v0, .L80241528 -/* A61EEC 8024151C 00000000 */ nop -/* A61EF0 80241520 12400008 */ beqz $s2, .L80241544 -/* A61EF4 80241524 00000000 */ nop -.L80241528: -/* A61EF8 80241528 8E2200CC */ lw $v0, 0xcc($s1) -/* A61EFC 8024152C A2200007 */ sb $zero, 7($s1) -/* A61F00 80241530 8C420028 */ lw $v0, 0x28($v0) -/* A61F04 80241534 A600008E */ sh $zero, 0x8e($s0) -/* A61F08 80241538 AE020028 */ sw $v0, 0x28($s0) -/* A61F0C 8024153C 2402000F */ addiu $v0, $zero, 0xf -/* A61F10 80241540 AE620070 */ sw $v0, 0x70($s3) -.L80241544: -/* A61F14 80241544 8FBF0040 */ lw $ra, 0x40($sp) -/* A61F18 80241548 8FB3003C */ lw $s3, 0x3c($sp) -/* A61F1C 8024154C 8FB20038 */ lw $s2, 0x38($sp) -/* A61F20 80241550 8FB10034 */ lw $s1, 0x34($sp) -/* A61F24 80241554 8FB00030 */ lw $s0, 0x30($sp) -/* A61F28 80241558 03E00008 */ jr $ra -/* A61F2C 8024155C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802413FC_A61DCC.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802413FC_A61DCC.s new file mode 100644 index 0000000000..bc5f6c5a71 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802413FC_A61DCC.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413FC_A61DCC +/* A61DCC 802413FC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A61DD0 80241400 AFB3003C */ sw $s3, 0x3c($sp) +/* A61DD4 80241404 0080982D */ daddu $s3, $a0, $zero +/* A61DD8 80241408 AFBF0040 */ sw $ra, 0x40($sp) +/* A61DDC 8024140C AFB20038 */ sw $s2, 0x38($sp) +/* A61DE0 80241410 AFB10034 */ sw $s1, 0x34($sp) +/* A61DE4 80241414 AFB00030 */ sw $s0, 0x30($sp) +/* A61DE8 80241418 8E710148 */ lw $s1, 0x148($s3) +/* A61DEC 8024141C 0C00EABB */ jal get_npc_unsafe +/* A61DF0 80241420 86240008 */ lh $a0, 8($s1) +/* A61DF4 80241424 0040802D */ daddu $s0, $v0, $zero +/* A61DF8 80241428 8E22007C */ lw $v0, 0x7c($s1) +/* A61DFC 8024142C 8603008E */ lh $v1, 0x8e($s0) +/* A61E00 80241430 2442FFFF */ addiu $v0, $v0, -1 +/* A61E04 80241434 14620012 */ bne $v1, $v0, .L80241480 +/* A61E08 80241438 00000000 */ nop +/* A61E0C 8024143C C6000038 */ lwc1 $f0, 0x38($s0) +/* A61E10 80241440 4600020D */ trunc.w.s $f8, $f0 +/* A61E14 80241444 44024000 */ mfc1 $v0, $f8 +/* A61E18 80241448 00000000 */ nop +/* A61E1C 8024144C A6220010 */ sh $v0, 0x10($s1) +/* A61E20 80241450 C600003C */ lwc1 $f0, 0x3c($s0) +/* A61E24 80241454 4600020D */ trunc.w.s $f8, $f0 +/* A61E28 80241458 44024000 */ mfc1 $v0, $f8 +/* A61E2C 8024145C 00000000 */ nop +/* A61E30 80241460 A6220012 */ sh $v0, 0x12($s1) +/* A61E34 80241464 C6000040 */ lwc1 $f0, 0x40($s0) +/* A61E38 80241468 24020001 */ addiu $v0, $zero, 1 +/* A61E3C 8024146C A2220007 */ sb $v0, 7($s1) +/* A61E40 80241470 4600020D */ trunc.w.s $f8, $f0 +/* A61E44 80241474 44024000 */ mfc1 $v0, $f8 +/* A61E48 80241478 00000000 */ nop +/* A61E4C 8024147C A6220014 */ sh $v0, 0x14($s1) +.L80241480: +/* A61E50 80241480 C6000038 */ lwc1 $f0, 0x38($s0) +/* A61E54 80241484 C602003C */ lwc1 $f2, 0x3c($s0) +/* A61E58 80241488 C6040040 */ lwc1 $f4, 0x40($s0) +/* A61E5C 8024148C C6060018 */ lwc1 $f6, 0x18($s0) +/* A61E60 80241490 E7A00020 */ swc1 $f0, 0x20($sp) +/* A61E64 80241494 E7A20024 */ swc1 $f2, 0x24($sp) +/* A61E68 80241498 E7A40028 */ swc1 $f4, 0x28($sp) +/* A61E6C 8024149C E7A60010 */ swc1 $f6, 0x10($sp) +/* A61E70 802414A0 C600000C */ lwc1 $f0, 0xc($s0) +/* A61E74 802414A4 E7A00014 */ swc1 $f0, 0x14($sp) +/* A61E78 802414A8 860200A8 */ lh $v0, 0xa8($s0) +/* A61E7C 802414AC 27A50020 */ addiu $a1, $sp, 0x20 +/* A61E80 802414B0 44820000 */ mtc1 $v0, $f0 +/* A61E84 802414B4 00000000 */ nop +/* A61E88 802414B8 46800020 */ cvt.s.w $f0, $f0 +/* A61E8C 802414BC E7A00018 */ swc1 $f0, 0x18($sp) +/* A61E90 802414C0 860200A6 */ lh $v0, 0xa6($s0) +/* A61E94 802414C4 27A60024 */ addiu $a2, $sp, 0x24 +/* A61E98 802414C8 44820000 */ mtc1 $v0, $f0 +/* A61E9C 802414CC 00000000 */ nop +/* A61EA0 802414D0 46800020 */ cvt.s.w $f0, $f0 +/* A61EA4 802414D4 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A61EA8 802414D8 8E040080 */ lw $a0, 0x80($s0) +/* A61EAC 802414DC 0C037711 */ jal func_800DDC44 +/* A61EB0 802414E0 27A70028 */ addiu $a3, $sp, 0x28 +/* A61EB4 802414E4 0040902D */ daddu $s2, $v0, $zero +/* A61EB8 802414E8 16400005 */ bnez $s2, .L80241500 +/* A61EBC 802414EC 00000000 */ nop +/* A61EC0 802414F0 8E050018 */ lw $a1, 0x18($s0) +/* A61EC4 802414F4 8E06000C */ lw $a2, 0xc($s0) +/* A61EC8 802414F8 0C00EA95 */ jal npc_move_heading +/* A61ECC 802414FC 0200202D */ daddu $a0, $s0, $zero +.L80241500: +/* A61ED0 80241500 8602008E */ lh $v0, 0x8e($s0) +/* A61ED4 80241504 9603008E */ lhu $v1, 0x8e($s0) +/* A61ED8 80241508 18400007 */ blez $v0, .L80241528 +/* A61EDC 8024150C 2462FFFF */ addiu $v0, $v1, -1 +/* A61EE0 80241510 A602008E */ sh $v0, 0x8e($s0) +/* A61EE4 80241514 00021400 */ sll $v0, $v0, 0x10 +/* A61EE8 80241518 18400003 */ blez $v0, .L80241528 +/* A61EEC 8024151C 00000000 */ nop +/* A61EF0 80241520 12400008 */ beqz $s2, .L80241544 +/* A61EF4 80241524 00000000 */ nop +.L80241528: +/* A61EF8 80241528 8E2200CC */ lw $v0, 0xcc($s1) +/* A61EFC 8024152C A2200007 */ sb $zero, 7($s1) +/* A61F00 80241530 8C420028 */ lw $v0, 0x28($v0) +/* A61F04 80241534 A600008E */ sh $zero, 0x8e($s0) +/* A61F08 80241538 AE020028 */ sw $v0, 0x28($s0) +/* A61F0C 8024153C 2402000F */ addiu $v0, $zero, 0xf +/* A61F10 80241540 AE620070 */ sw $v0, 0x70($s3) +.L80241544: +/* A61F14 80241544 8FBF0040 */ lw $ra, 0x40($sp) +/* A61F18 80241548 8FB3003C */ lw $s3, 0x3c($sp) +/* A61F1C 8024154C 8FB20038 */ lw $s2, 0x38($sp) +/* A61F20 80241550 8FB10034 */ lw $s1, 0x34($sp) +/* A61F24 80241554 8FB00030 */ lw $s0, 0x30($sp) +/* A61F28 80241558 03E00008 */ jr $ra +/* A61F2C 8024155C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s index c1e0dbe326..ce04b6ffd2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_802415E0_A61FB0.s @@ -232,25 +232,25 @@ glabel func_802415E0_A61FB0 .L80241930: /* A62300 80241930 0260202D */ daddu $a0, $s3, $zero /* A62304 80241934 0280282D */ daddu $a1, $s4, $zero -/* A62308 80241938 0C090493 */ jal func_8024124C +/* A62308 80241938 0C090493 */ jal func_8024124C_A61C1C /* A6230C 8024193C 02A0302D */ daddu $a2, $s5, $zero /* A62310 80241940 0260202D */ daddu $a0, $s3, $zero .L80241944: /* A62314 80241944 0280282D */ daddu $a1, $s4, $zero -/* A62318 80241948 0C0904B2 */ jal func_802412C8 +/* A62318 80241948 0C0904B2 */ jal func_802412C8_A61C98 /* A6231C 8024194C 02A0302D */ daddu $a2, $s5, $zero /* A62320 80241950 08090663 */ j .L8024198C /* A62324 80241954 00000000 */ nop .L80241958: /* A62328 80241958 0260202D */ daddu $a0, $s3, $zero /* A6232C 8024195C 0280282D */ daddu $a1, $s4, $zero -/* A62330 80241960 0C0904FF */ jal func_802413FC +/* A62330 80241960 0C0904FF */ jal func_802413FC_A61DCC /* A62334 80241964 02A0302D */ daddu $a2, $s5, $zero /* A62338 80241968 08090663 */ j .L8024198C /* A6233C 8024196C 00000000 */ nop .L80241970: /* A62340 80241970 0280282D */ daddu $a1, $s4, $zero -/* A62344 80241974 0C090558 */ jal func_80241560 +/* A62344 80241974 0C090558 */ jal func_80241560_A61F30 /* A62348 80241978 02A0302D */ daddu $a2, $s5, $zero /* A6234C 8024197C 08090663 */ j .L8024198C /* A62350 80241980 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4.s deleted file mode 100644 index b8ffbce22a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A4 -/* A64834 802407A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A64838 802407A8 AFB3001C */ sw $s3, 0x1c($sp) -/* A6483C 802407AC 0080982D */ daddu $s3, $a0, $zero -/* A64840 802407B0 AFBF0020 */ sw $ra, 0x20($sp) -/* A64844 802407B4 AFB20018 */ sw $s2, 0x18($sp) -/* A64848 802407B8 AFB10014 */ sw $s1, 0x14($sp) -/* A6484C 802407BC AFB00010 */ sw $s0, 0x10($sp) -/* A64850 802407C0 8E720148 */ lw $s2, 0x148($s3) -/* A64854 802407C4 0C00EABB */ jal get_npc_unsafe -/* A64858 802407C8 86440008 */ lh $a0, 8($s2) -/* A6485C 802407CC 0040802D */ daddu $s0, $v0, $zero -/* A64860 802407D0 8603008E */ lh $v1, 0x8e($s0) -/* A64864 802407D4 3C118024 */ lui $s1, 0x8024 -/* A64868 802407D8 26312050 */ addiu $s1, $s1, 0x2050 -/* A6486C 802407DC 00031040 */ sll $v0, $v1, 1 -/* A64870 802407E0 00431021 */ addu $v0, $v0, $v1 -/* A64874 802407E4 00021080 */ sll $v0, $v0, 2 -/* A64878 802407E8 3C018024 */ lui $at, 0x8024 -/* A6487C 802407EC 00220821 */ addu $at, $at, $v0 -/* A64880 802407F0 C4202050 */ lwc1 $f0, 0x2050($at) -/* A64884 802407F4 00031040 */ sll $v0, $v1, 1 -/* A64888 802407F8 00431021 */ addu $v0, $v0, $v1 -/* A6488C 802407FC 00021080 */ sll $v0, $v0, 2 -/* A64890 80240800 E6000054 */ swc1 $f0, 0x54($s0) -/* A64894 80240804 3C018024 */ lui $at, 0x8024 -/* A64898 80240808 00220821 */ addu $at, $at, $v0 -/* A6489C 8024080C C4202054 */ lwc1 $f0, 0x2054($at) -/* A648A0 80240810 00031040 */ sll $v0, $v1, 1 -/* A648A4 80240814 00431021 */ addu $v0, $v0, $v1 -/* A648A8 80240818 9603008E */ lhu $v1, 0x8e($s0) -/* A648AC 8024081C 00021080 */ sll $v0, $v0, 2 -/* A648B0 80240820 E6000058 */ swc1 $f0, 0x58($s0) -/* A648B4 80240824 3C018024 */ lui $at, 0x8024 -/* A648B8 80240828 00220821 */ addu $at, $at, $v0 -/* A648BC 8024082C 90222058 */ lbu $v0, 0x2058($at) -/* A648C0 80240830 24630001 */ addiu $v1, $v1, 1 -/* A648C4 80240834 A603008E */ sh $v1, 0x8e($s0) -/* A648C8 80240838 00031C00 */ sll $v1, $v1, 0x10 -/* A648CC 8024083C 00031C03 */ sra $v1, $v1, 0x10 -/* A648D0 80240840 A20200AC */ sb $v0, 0xac($s0) -/* A648D4 80240844 24020004 */ addiu $v0, $zero, 4 -/* A648D8 80240848 14620007 */ bne $v1, $v0, .L80240868 -/* A648DC 8024084C 00000000 */ nop -/* A648E0 80240850 0C00EAFF */ jal disable_npc_shadow -/* A648E4 80240854 0200202D */ daddu $a0, $s0, $zero -/* A648E8 80240858 8E420000 */ lw $v0, ($s2) -/* A648EC 8024085C 3C031F10 */ lui $v1, 0x1f10 -/* A648F0 80240860 00431025 */ or $v0, $v0, $v1 -/* A648F4 80240864 AE420000 */ sw $v0, ($s2) -.L80240868: -/* A648F8 80240868 8602008E */ lh $v0, 0x8e($s0) -/* A648FC 8024086C 00021840 */ sll $v1, $v0, 1 -/* A64900 80240870 00621821 */ addu $v1, $v1, $v0 -/* A64904 80240874 00031880 */ sll $v1, $v1, 2 -/* A64908 80240878 00711821 */ addu $v1, $v1, $s1 -/* A6490C 8024087C 90620008 */ lbu $v0, 8($v1) -/* A64910 80240880 1440000C */ bnez $v0, .L802408B4 -/* A64914 80240884 240200FF */ addiu $v0, $zero, 0xff -/* A64918 80240888 A20200AC */ sb $v0, 0xac($s0) -/* A6491C 8024088C 24020005 */ addiu $v0, $zero, 5 -/* A64920 80240890 8E030000 */ lw $v1, ($s0) -/* A64924 80240894 3C013F80 */ lui $at, 0x3f80 -/* A64928 80240898 44810000 */ mtc1 $at, $f0 -/* A6492C 8024089C 34630002 */ ori $v1, $v1, 2 -/* A64930 802408A0 E6000054 */ swc1 $f0, 0x54($s0) -/* A64934 802408A4 E6000058 */ swc1 $f0, 0x58($s0) -/* A64938 802408A8 E600005C */ swc1 $f0, 0x5c($s0) -/* A6493C 802408AC AE030000 */ sw $v1, ($s0) -/* A64940 802408B0 AE620070 */ sw $v0, 0x70($s3) -.L802408B4: -/* A64944 802408B4 8FBF0020 */ lw $ra, 0x20($sp) -/* A64948 802408B8 8FB3001C */ lw $s3, 0x1c($sp) -/* A6494C 802408BC 8FB20018 */ lw $s2, 0x18($sp) -/* A64950 802408C0 8FB10014 */ lw $s1, 0x14($sp) -/* A64954 802408C4 8FB00010 */ lw $s0, 0x10($sp) -/* A64958 802408C8 03E00008 */ jr $ra -/* A6495C 802408CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s new file mode 100644 index 0000000000..a84033b3ba --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802407A4_A64834.s @@ -0,0 +1,81 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407A4_A64834 +/* A64834 802407A4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A64838 802407A8 AFB3001C */ sw $s3, 0x1c($sp) +/* A6483C 802407AC 0080982D */ daddu $s3, $a0, $zero +/* A64840 802407B0 AFBF0020 */ sw $ra, 0x20($sp) +/* A64844 802407B4 AFB20018 */ sw $s2, 0x18($sp) +/* A64848 802407B8 AFB10014 */ sw $s1, 0x14($sp) +/* A6484C 802407BC AFB00010 */ sw $s0, 0x10($sp) +/* A64850 802407C0 8E720148 */ lw $s2, 0x148($s3) +/* A64854 802407C4 0C00EABB */ jal get_npc_unsafe +/* A64858 802407C8 86440008 */ lh $a0, 8($s2) +/* A6485C 802407CC 0040802D */ daddu $s0, $v0, $zero +/* A64860 802407D0 8603008E */ lh $v1, 0x8e($s0) +/* A64864 802407D4 3C118024 */ lui $s1, 0x8024 +/* A64868 802407D8 26312050 */ addiu $s1, $s1, 0x2050 +/* A6486C 802407DC 00031040 */ sll $v0, $v1, 1 +/* A64870 802407E0 00431021 */ addu $v0, $v0, $v1 +/* A64874 802407E4 00021080 */ sll $v0, $v0, 2 +/* A64878 802407E8 3C018024 */ lui $at, 0x8024 +/* A6487C 802407EC 00220821 */ addu $at, $at, $v0 +/* A64880 802407F0 C4202050 */ lwc1 $f0, 0x2050($at) +/* A64884 802407F4 00031040 */ sll $v0, $v1, 1 +/* A64888 802407F8 00431021 */ addu $v0, $v0, $v1 +/* A6488C 802407FC 00021080 */ sll $v0, $v0, 2 +/* A64890 80240800 E6000054 */ swc1 $f0, 0x54($s0) +/* A64894 80240804 3C018024 */ lui $at, 0x8024 +/* A64898 80240808 00220821 */ addu $at, $at, $v0 +/* A6489C 8024080C C4202054 */ lwc1 $f0, 0x2054($at) +/* A648A0 80240810 00031040 */ sll $v0, $v1, 1 +/* A648A4 80240814 00431021 */ addu $v0, $v0, $v1 +/* A648A8 80240818 9603008E */ lhu $v1, 0x8e($s0) +/* A648AC 8024081C 00021080 */ sll $v0, $v0, 2 +/* A648B0 80240820 E6000058 */ swc1 $f0, 0x58($s0) +/* A648B4 80240824 3C018024 */ lui $at, 0x8024 +/* A648B8 80240828 00220821 */ addu $at, $at, $v0 +/* A648BC 8024082C 90222058 */ lbu $v0, 0x2058($at) +/* A648C0 80240830 24630001 */ addiu $v1, $v1, 1 +/* A648C4 80240834 A603008E */ sh $v1, 0x8e($s0) +/* A648C8 80240838 00031C00 */ sll $v1, $v1, 0x10 +/* A648CC 8024083C 00031C03 */ sra $v1, $v1, 0x10 +/* A648D0 80240840 A20200AC */ sb $v0, 0xac($s0) +/* A648D4 80240844 24020004 */ addiu $v0, $zero, 4 +/* A648D8 80240848 14620007 */ bne $v1, $v0, .L80240868 +/* A648DC 8024084C 00000000 */ nop +/* A648E0 80240850 0C00EAFF */ jal disable_npc_shadow +/* A648E4 80240854 0200202D */ daddu $a0, $s0, $zero +/* A648E8 80240858 8E420000 */ lw $v0, ($s2) +/* A648EC 8024085C 3C031F10 */ lui $v1, 0x1f10 +/* A648F0 80240860 00431025 */ or $v0, $v0, $v1 +/* A648F4 80240864 AE420000 */ sw $v0, ($s2) +.L80240868: +/* A648F8 80240868 8602008E */ lh $v0, 0x8e($s0) +/* A648FC 8024086C 00021840 */ sll $v1, $v0, 1 +/* A64900 80240870 00621821 */ addu $v1, $v1, $v0 +/* A64904 80240874 00031880 */ sll $v1, $v1, 2 +/* A64908 80240878 00711821 */ addu $v1, $v1, $s1 +/* A6490C 8024087C 90620008 */ lbu $v0, 8($v1) +/* A64910 80240880 1440000C */ bnez $v0, .L802408B4 +/* A64914 80240884 240200FF */ addiu $v0, $zero, 0xff +/* A64918 80240888 A20200AC */ sb $v0, 0xac($s0) +/* A6491C 8024088C 24020005 */ addiu $v0, $zero, 5 +/* A64920 80240890 8E030000 */ lw $v1, ($s0) +/* A64924 80240894 3C013F80 */ lui $at, 0x3f80 +/* A64928 80240898 44810000 */ mtc1 $at, $f0 +/* A6492C 8024089C 34630002 */ ori $v1, $v1, 2 +/* A64930 802408A0 E6000054 */ swc1 $f0, 0x54($s0) +/* A64934 802408A4 E6000058 */ swc1 $f0, 0x58($s0) +/* A64938 802408A8 E600005C */ swc1 $f0, 0x5c($s0) +/* A6493C 802408AC AE030000 */ sw $v1, ($s0) +/* A64940 802408B0 AE620070 */ sw $v0, 0x70($s3) +.L802408B4: +/* A64944 802408B4 8FBF0020 */ lw $ra, 0x20($sp) +/* A64948 802408B8 8FB3001C */ lw $s3, 0x1c($sp) +/* A6494C 802408BC 8FB20018 */ lw $s2, 0x18($sp) +/* A64950 802408C0 8FB10014 */ lw $s1, 0x14($sp) +/* A64954 802408C4 8FB00010 */ lw $s0, 0x10($sp) +/* A64958 802408C8 03E00008 */ jr $ra +/* A6495C 802408CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14.s deleted file mode 100644 index e92914d606..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14.s +++ /dev/null @@ -1,117 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B14 -/* A64BA4 80240B14 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A64BA8 80240B18 AFB20028 */ sw $s2, 0x28($sp) -/* A64BAC 80240B1C 0080902D */ daddu $s2, $a0, $zero -/* A64BB0 80240B20 AFBF002C */ sw $ra, 0x2c($sp) -/* A64BB4 80240B24 AFB10024 */ sw $s1, 0x24($sp) -/* A64BB8 80240B28 AFB00020 */ sw $s0, 0x20($sp) -/* A64BBC 80240B2C 8E510148 */ lw $s1, 0x148($s2) -/* A64BC0 80240B30 0C00EABB */ jal get_npc_unsafe -/* A64BC4 80240B34 86240008 */ lh $a0, 8($s1) -/* A64BC8 80240B38 8E23006C */ lw $v1, 0x6c($s1) -/* A64BCC 80240B3C 14600006 */ bnez $v1, .L80240B58 -/* A64BD0 80240B40 0040802D */ daddu $s0, $v0, $zero -/* A64BD4 80240B44 8603008E */ lh $v1, 0x8e($s0) -/* A64BD8 80240B48 00031100 */ sll $v0, $v1, 4 -/* A64BDC 80240B4C 00431023 */ subu $v0, $v0, $v1 -/* A64BE0 80240B50 080902DA */ j .L80240B68 -/* A64BE4 80240B54 24430082 */ addiu $v1, $v0, 0x82 -.L80240B58: -/* A64BE8 80240B58 8603008E */ lh $v1, 0x8e($s0) -/* A64BEC 80240B5C 00031100 */ sll $v0, $v1, 4 -/* A64BF0 80240B60 00431023 */ subu $v0, $v0, $v1 -/* A64BF4 80240B64 2443001E */ addiu $v1, $v0, 0x1e -.L80240B68: -/* A64BF8 80240B68 00031400 */ sll $v0, $v1, 0x10 -/* A64BFC 80240B6C 00021403 */ sra $v0, $v0, 0x10 -/* A64C00 80240B70 28420100 */ slti $v0, $v0, 0x100 -/* A64C04 80240B74 50400001 */ beql $v0, $zero, .L80240B7C -/* A64C08 80240B78 240300FF */ addiu $v1, $zero, 0xff -.L80240B7C: -/* A64C0C 80240B7C 8602008E */ lh $v0, 0x8e($s0) -/* A64C10 80240B80 3C018024 */ lui $at, 0x8024 -/* A64C14 80240B84 D4222F90 */ ldc1 $f2, 0x2f90($at) -/* A64C18 80240B88 44820000 */ mtc1 $v0, $f0 -/* A64C1C 80240B8C 00000000 */ nop -/* A64C20 80240B90 46800020 */ cvt.s.w $f0, $f0 -/* A64C24 80240B94 46000021 */ cvt.d.s $f0, $f0 -/* A64C28 80240B98 46220002 */ mul.d $f0, $f0, $f2 -/* A64C2C 80240B9C 00000000 */ nop -/* A64C30 80240BA0 3C018024 */ lui $at, 0x8024 -/* A64C34 80240BA4 D4222F98 */ ldc1 $f2, 0x2f98($at) -/* A64C38 80240BA8 46220000 */ add.d $f0, $f0, $f2 -/* A64C3C 80240BAC A20300AC */ sb $v1, 0xac($s0) -/* A64C40 80240BB0 3C013FF0 */ lui $at, 0x3ff0 -/* A64C44 80240BB4 44811800 */ mtc1 $at, $f3 -/* A64C48 80240BB8 44801000 */ mtc1 $zero, $f2 -/* A64C4C 80240BBC 46200020 */ cvt.s.d $f0, $f0 -/* A64C50 80240BC0 E6000054 */ swc1 $f0, 0x54($s0) -/* A64C54 80240BC4 46000021 */ cvt.d.s $f0, $f0 -/* A64C58 80240BC8 4620103C */ c.lt.d $f2, $f0 -/* A64C5C 80240BCC 00000000 */ nop -/* A64C60 80240BD0 45000005 */ bc1f .L80240BE8 -/* A64C64 80240BD4 24030005 */ addiu $v1, $zero, 5 -/* A64C68 80240BD8 3C013F80 */ lui $at, 0x3f80 -/* A64C6C 80240BDC 44810000 */ mtc1 $at, $f0 -/* A64C70 80240BE0 00000000 */ nop -/* A64C74 80240BE4 E6000054 */ swc1 $f0, 0x54($s0) -.L80240BE8: -/* A64C78 80240BE8 C6000054 */ lwc1 $f0, 0x54($s0) -/* A64C7C 80240BEC 9602008E */ lhu $v0, 0x8e($s0) -/* A64C80 80240BF0 46000086 */ mov.s $f2, $f0 -/* A64C84 80240BF4 24420001 */ addiu $v0, $v0, 1 -/* A64C88 80240BF8 A602008E */ sh $v0, 0x8e($s0) -/* A64C8C 80240BFC 00021400 */ sll $v0, $v0, 0x10 -/* A64C90 80240C00 00021403 */ sra $v0, $v0, 0x10 -/* A64C94 80240C04 E6000058 */ swc1 $f0, 0x58($s0) -/* A64C98 80240C08 14430008 */ bne $v0, $v1, .L80240C2C -/* A64C9C 80240C0C E602005C */ swc1 $f2, 0x5c($s0) -/* A64CA0 80240C10 0C00EAE8 */ jal enable_npc_shadow -/* A64CA4 80240C14 0200202D */ daddu $a0, $s0, $zero -/* A64CA8 80240C18 3C03E0EF */ lui $v1, 0xe0ef -/* A64CAC 80240C1C 8E220000 */ lw $v0, ($s1) -/* A64CB0 80240C20 3463FFFF */ ori $v1, $v1, 0xffff -/* A64CB4 80240C24 00431024 */ and $v0, $v0, $v1 -/* A64CB8 80240C28 AE220000 */ sw $v0, ($s1) -.L80240C2C: -/* A64CBC 80240C2C 8E22006C */ lw $v0, 0x6c($s1) -/* A64CC0 80240C30 1440000E */ bnez $v0, .L80240C6C -/* A64CC4 80240C34 00000000 */ nop -/* A64CC8 80240C38 8602008E */ lh $v0, 0x8e($s0) -/* A64CCC 80240C3C 28420014 */ slti $v0, $v0, 0x14 -/* A64CD0 80240C40 14400017 */ bnez $v0, .L80240CA0 -/* A64CD4 80240C44 0000282D */ daddu $a1, $zero, $zero -/* A64CD8 80240C48 00A0302D */ daddu $a2, $a1, $zero -/* A64CDC 80240C4C AFA00010 */ sw $zero, 0x10($sp) -/* A64CE0 80240C50 AFA00014 */ sw $zero, 0x14($sp) -/* A64CE4 80240C54 AFA00018 */ sw $zero, 0x18($sp) -/* A64CE8 80240C58 8E040024 */ lw $a0, 0x24($s0) -/* A64CEC 80240C5C 0C0B7A25 */ jal func_802DE894 -/* A64CF0 80240C60 00A0382D */ daddu $a3, $a1, $zero -/* A64CF4 80240C64 0809031F */ j .L80240C7C -/* A64CF8 80240C68 00000000 */ nop -.L80240C6C: -/* A64CFC 80240C6C 8602008E */ lh $v0, 0x8e($s0) -/* A64D00 80240C70 2842000A */ slti $v0, $v0, 0xa -/* A64D04 80240C74 1440000A */ bnez $v0, .L80240CA0 -/* A64D08 80240C78 00000000 */ nop -.L80240C7C: -/* A64D0C 80240C7C 3C013F80 */ lui $at, 0x3f80 -/* A64D10 80240C80 44810000 */ mtc1 $at, $f0 -/* A64D14 80240C84 240200FF */ addiu $v0, $zero, 0xff -/* A64D18 80240C88 A20200AC */ sb $v0, 0xac($s0) -/* A64D1C 80240C8C 24020014 */ addiu $v0, $zero, 0x14 -/* A64D20 80240C90 E6000054 */ swc1 $f0, 0x54($s0) -/* A64D24 80240C94 E6000058 */ swc1 $f0, 0x58($s0) -/* A64D28 80240C98 E600005C */ swc1 $f0, 0x5c($s0) -/* A64D2C 80240C9C AE420070 */ sw $v0, 0x70($s2) -.L80240CA0: -/* A64D30 80240CA0 8FBF002C */ lw $ra, 0x2c($sp) -/* A64D34 80240CA4 8FB20028 */ lw $s2, 0x28($sp) -/* A64D38 80240CA8 8FB10024 */ lw $s1, 0x24($sp) -/* A64D3C 80240CAC 8FB00020 */ lw $s0, 0x20($sp) -/* A64D40 80240CB0 03E00008 */ jr $ra -/* A64D44 80240CB4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s new file mode 100644 index 0000000000..31e17def2f --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240B14_A64BA4.s @@ -0,0 +1,117 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B14_A64BA4 +/* A64BA4 80240B14 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A64BA8 80240B18 AFB20028 */ sw $s2, 0x28($sp) +/* A64BAC 80240B1C 0080902D */ daddu $s2, $a0, $zero +/* A64BB0 80240B20 AFBF002C */ sw $ra, 0x2c($sp) +/* A64BB4 80240B24 AFB10024 */ sw $s1, 0x24($sp) +/* A64BB8 80240B28 AFB00020 */ sw $s0, 0x20($sp) +/* A64BBC 80240B2C 8E510148 */ lw $s1, 0x148($s2) +/* A64BC0 80240B30 0C00EABB */ jal get_npc_unsafe +/* A64BC4 80240B34 86240008 */ lh $a0, 8($s1) +/* A64BC8 80240B38 8E23006C */ lw $v1, 0x6c($s1) +/* A64BCC 80240B3C 14600006 */ bnez $v1, .L80240B58 +/* A64BD0 80240B40 0040802D */ daddu $s0, $v0, $zero +/* A64BD4 80240B44 8603008E */ lh $v1, 0x8e($s0) +/* A64BD8 80240B48 00031100 */ sll $v0, $v1, 4 +/* A64BDC 80240B4C 00431023 */ subu $v0, $v0, $v1 +/* A64BE0 80240B50 080902DA */ j .L80240B68 +/* A64BE4 80240B54 24430082 */ addiu $v1, $v0, 0x82 +.L80240B58: +/* A64BE8 80240B58 8603008E */ lh $v1, 0x8e($s0) +/* A64BEC 80240B5C 00031100 */ sll $v0, $v1, 4 +/* A64BF0 80240B60 00431023 */ subu $v0, $v0, $v1 +/* A64BF4 80240B64 2443001E */ addiu $v1, $v0, 0x1e +.L80240B68: +/* A64BF8 80240B68 00031400 */ sll $v0, $v1, 0x10 +/* A64BFC 80240B6C 00021403 */ sra $v0, $v0, 0x10 +/* A64C00 80240B70 28420100 */ slti $v0, $v0, 0x100 +/* A64C04 80240B74 50400001 */ beql $v0, $zero, .L80240B7C +/* A64C08 80240B78 240300FF */ addiu $v1, $zero, 0xff +.L80240B7C: +/* A64C0C 80240B7C 8602008E */ lh $v0, 0x8e($s0) +/* A64C10 80240B80 3C018024 */ lui $at, 0x8024 +/* A64C14 80240B84 D4222F90 */ ldc1 $f2, 0x2f90($at) +/* A64C18 80240B88 44820000 */ mtc1 $v0, $f0 +/* A64C1C 80240B8C 00000000 */ nop +/* A64C20 80240B90 46800020 */ cvt.s.w $f0, $f0 +/* A64C24 80240B94 46000021 */ cvt.d.s $f0, $f0 +/* A64C28 80240B98 46220002 */ mul.d $f0, $f0, $f2 +/* A64C2C 80240B9C 00000000 */ nop +/* A64C30 80240BA0 3C018024 */ lui $at, 0x8024 +/* A64C34 80240BA4 D4222F98 */ ldc1 $f2, 0x2f98($at) +/* A64C38 80240BA8 46220000 */ add.d $f0, $f0, $f2 +/* A64C3C 80240BAC A20300AC */ sb $v1, 0xac($s0) +/* A64C40 80240BB0 3C013FF0 */ lui $at, 0x3ff0 +/* A64C44 80240BB4 44811800 */ mtc1 $at, $f3 +/* A64C48 80240BB8 44801000 */ mtc1 $zero, $f2 +/* A64C4C 80240BBC 46200020 */ cvt.s.d $f0, $f0 +/* A64C50 80240BC0 E6000054 */ swc1 $f0, 0x54($s0) +/* A64C54 80240BC4 46000021 */ cvt.d.s $f0, $f0 +/* A64C58 80240BC8 4620103C */ c.lt.d $f2, $f0 +/* A64C5C 80240BCC 00000000 */ nop +/* A64C60 80240BD0 45000005 */ bc1f .L80240BE8 +/* A64C64 80240BD4 24030005 */ addiu $v1, $zero, 5 +/* A64C68 80240BD8 3C013F80 */ lui $at, 0x3f80 +/* A64C6C 80240BDC 44810000 */ mtc1 $at, $f0 +/* A64C70 80240BE0 00000000 */ nop +/* A64C74 80240BE4 E6000054 */ swc1 $f0, 0x54($s0) +.L80240BE8: +/* A64C78 80240BE8 C6000054 */ lwc1 $f0, 0x54($s0) +/* A64C7C 80240BEC 9602008E */ lhu $v0, 0x8e($s0) +/* A64C80 80240BF0 46000086 */ mov.s $f2, $f0 +/* A64C84 80240BF4 24420001 */ addiu $v0, $v0, 1 +/* A64C88 80240BF8 A602008E */ sh $v0, 0x8e($s0) +/* A64C8C 80240BFC 00021400 */ sll $v0, $v0, 0x10 +/* A64C90 80240C00 00021403 */ sra $v0, $v0, 0x10 +/* A64C94 80240C04 E6000058 */ swc1 $f0, 0x58($s0) +/* A64C98 80240C08 14430008 */ bne $v0, $v1, .L80240C2C +/* A64C9C 80240C0C E602005C */ swc1 $f2, 0x5c($s0) +/* A64CA0 80240C10 0C00EAE8 */ jal enable_npc_shadow +/* A64CA4 80240C14 0200202D */ daddu $a0, $s0, $zero +/* A64CA8 80240C18 3C03E0EF */ lui $v1, 0xe0ef +/* A64CAC 80240C1C 8E220000 */ lw $v0, ($s1) +/* A64CB0 80240C20 3463FFFF */ ori $v1, $v1, 0xffff +/* A64CB4 80240C24 00431024 */ and $v0, $v0, $v1 +/* A64CB8 80240C28 AE220000 */ sw $v0, ($s1) +.L80240C2C: +/* A64CBC 80240C2C 8E22006C */ lw $v0, 0x6c($s1) +/* A64CC0 80240C30 1440000E */ bnez $v0, .L80240C6C +/* A64CC4 80240C34 00000000 */ nop +/* A64CC8 80240C38 8602008E */ lh $v0, 0x8e($s0) +/* A64CCC 80240C3C 28420014 */ slti $v0, $v0, 0x14 +/* A64CD0 80240C40 14400017 */ bnez $v0, .L80240CA0 +/* A64CD4 80240C44 0000282D */ daddu $a1, $zero, $zero +/* A64CD8 80240C48 00A0302D */ daddu $a2, $a1, $zero +/* A64CDC 80240C4C AFA00010 */ sw $zero, 0x10($sp) +/* A64CE0 80240C50 AFA00014 */ sw $zero, 0x14($sp) +/* A64CE4 80240C54 AFA00018 */ sw $zero, 0x18($sp) +/* A64CE8 80240C58 8E040024 */ lw $a0, 0x24($s0) +/* A64CEC 80240C5C 0C0B7A25 */ jal func_802DE894 +/* A64CF0 80240C60 00A0382D */ daddu $a3, $a1, $zero +/* A64CF4 80240C64 0809031F */ j .L80240C7C +/* A64CF8 80240C68 00000000 */ nop +.L80240C6C: +/* A64CFC 80240C6C 8602008E */ lh $v0, 0x8e($s0) +/* A64D00 80240C70 2842000A */ slti $v0, $v0, 0xa +/* A64D04 80240C74 1440000A */ bnez $v0, .L80240CA0 +/* A64D08 80240C78 00000000 */ nop +.L80240C7C: +/* A64D0C 80240C7C 3C013F80 */ lui $at, 0x3f80 +/* A64D10 80240C80 44810000 */ mtc1 $at, $f0 +/* A64D14 80240C84 240200FF */ addiu $v0, $zero, 0xff +/* A64D18 80240C88 A20200AC */ sb $v0, 0xac($s0) +/* A64D1C 80240C8C 24020014 */ addiu $v0, $zero, 0x14 +/* A64D20 80240C90 E6000054 */ swc1 $f0, 0x54($s0) +/* A64D24 80240C94 E6000058 */ swc1 $f0, 0x58($s0) +/* A64D28 80240C98 E600005C */ swc1 $f0, 0x5c($s0) +/* A64D2C 80240C9C AE420070 */ sw $v0, 0x70($s2) +.L80240CA0: +/* A64D30 80240CA0 8FBF002C */ lw $ra, 0x2c($sp) +/* A64D34 80240CA4 8FB20028 */ lw $s2, 0x28($sp) +/* A64D38 80240CA8 8FB10024 */ lw $s1, 0x24($sp) +/* A64D3C 80240CAC 8FB00020 */ lw $s0, 0x20($sp) +/* A64D40 80240CB0 03E00008 */ jr $ra +/* A64D44 80240CB4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8.s deleted file mode 100644 index 1755495a94..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB8 -/* A64D48 80240CB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A64D4C 80240CBC AFB00010 */ sw $s0, 0x10($sp) -/* A64D50 80240CC0 0080802D */ daddu $s0, $a0, $zero -/* A64D54 80240CC4 AFBF0014 */ sw $ra, 0x14($sp) -/* A64D58 80240CC8 8E020148 */ lw $v0, 0x148($s0) -/* A64D5C 80240CCC 0C00EABB */ jal get_npc_unsafe -/* A64D60 80240CD0 84440008 */ lh $a0, 8($v0) -/* A64D64 80240CD4 24030028 */ addiu $v1, $zero, 0x28 -/* A64D68 80240CD8 A443008E */ sh $v1, 0x8e($v0) -/* A64D6C 80240CDC 24020015 */ addiu $v0, $zero, 0x15 -/* A64D70 80240CE0 AE020070 */ sw $v0, 0x70($s0) -/* A64D74 80240CE4 8FBF0014 */ lw $ra, 0x14($sp) -/* A64D78 80240CE8 8FB00010 */ lw $s0, 0x10($sp) -/* A64D7C 80240CEC 03E00008 */ jr $ra -/* A64D80 80240CF0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8_A64D48.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8_A64D48.s new file mode 100644 index 0000000000..50b27068c7 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CB8_A64D48.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CB8_A64D48 +/* A64D48 80240CB8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A64D4C 80240CBC AFB00010 */ sw $s0, 0x10($sp) +/* A64D50 80240CC0 0080802D */ daddu $s0, $a0, $zero +/* A64D54 80240CC4 AFBF0014 */ sw $ra, 0x14($sp) +/* A64D58 80240CC8 8E020148 */ lw $v0, 0x148($s0) +/* A64D5C 80240CCC 0C00EABB */ jal get_npc_unsafe +/* A64D60 80240CD0 84440008 */ lh $a0, 8($v0) +/* A64D64 80240CD4 24030028 */ addiu $v1, $zero, 0x28 +/* A64D68 80240CD8 A443008E */ sh $v1, 0x8e($v0) +/* A64D6C 80240CDC 24020015 */ addiu $v0, $zero, 0x15 +/* A64D70 80240CE0 AE020070 */ sw $v0, 0x70($s0) +/* A64D74 80240CE4 8FBF0014 */ lw $ra, 0x14($sp) +/* A64D78 80240CE8 8FB00010 */ lw $s0, 0x10($sp) +/* A64D7C 80240CEC 03E00008 */ jr $ra +/* A64D80 80240CF0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s index d3c7c4f450..788e1fbaf2 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240CF4_A64D84.s @@ -58,7 +58,7 @@ glabel func_80240CF4_A64D84 .L80240DC8: /* A64E58 80240DC8 8E450024 */ lw $a1, 0x24($s2) /* A64E5C 80240DCC 8E460028 */ lw $a2, 0x28($s2) -/* A64E60 80240DD0 0C090014 */ jal func_80240050 +/* A64E60 80240DD0 0C090014 */ jal func_80240050_A640E0 /* A64E64 80240DD4 0260382D */ daddu $a3, $s3, $zero /* A64E68 80240DD8 24030001 */ addiu $v1, $zero, 1 /* A64E6C 80240DDC 1443002C */ bne $v0, $v1, .L80240E90 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s index 89210b3532..bb71e40c2c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80240F20_A64FB0.s @@ -25,7 +25,7 @@ glabel func_80240F20_A64FB0 /* A65000 80240F70 0260202D */ daddu $a0, $s3, $zero /* A65004 80240F74 8E250024 */ lw $a1, 0x24($s1) /* A65008 80240F78 8E260028 */ lw $a2, 0x28($s1) -/* A6500C 80240F7C 0C090014 */ jal func_80240050 +/* A6500C 80240F7C 0C090014 */ jal func_80240050_A640E0 /* A65010 80240F80 0280382D */ daddu $a3, $s4, $zero /* A65014 80240F84 0040882D */ daddu $s1, $v0, $zero /* A65018 80240F88 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054.s deleted file mode 100644 index 6790080571..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241054 -/* A650E4 80241054 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A650E8 80241058 AFB10014 */ sw $s1, 0x14($sp) -/* A650EC 8024105C 0080882D */ daddu $s1, $a0, $zero -/* A650F0 80241060 AFBF0018 */ sw $ra, 0x18($sp) -/* A650F4 80241064 AFB00010 */ sw $s0, 0x10($sp) -/* A650F8 80241068 8E300148 */ lw $s0, 0x148($s1) -/* A650FC 8024106C 0C00EABB */ jal get_npc_unsafe -/* A65100 80241070 86040008 */ lh $a0, 8($s0) -/* A65104 80241074 0040202D */ daddu $a0, $v0, $zero -/* A65108 80241078 9482008E */ lhu $v0, 0x8e($a0) -/* A6510C 8024107C 2442FFFF */ addiu $v0, $v0, -1 -/* A65110 80241080 A482008E */ sh $v0, 0x8e($a0) -/* A65114 80241084 00021400 */ sll $v0, $v0, 0x10 -/* A65118 80241088 1C400007 */ bgtz $v0, .L802410A8 -/* A6511C 8024108C 00000000 */ nop -/* A65120 80241090 8E0200CC */ lw $v0, 0xcc($s0) -/* A65124 80241094 8C430000 */ lw $v1, ($v0) -/* A65128 80241098 24020003 */ addiu $v0, $zero, 3 -/* A6512C 8024109C A482008E */ sh $v0, 0x8e($a0) -/* A65130 802410A0 AC830028 */ sw $v1, 0x28($a0) -/* A65134 802410A4 AE200070 */ sw $zero, 0x70($s1) -.L802410A8: -/* A65138 802410A8 8FBF0018 */ lw $ra, 0x18($sp) -/* A6513C 802410AC 8FB10014 */ lw $s1, 0x14($sp) -/* A65140 802410B0 8FB00010 */ lw $s0, 0x10($sp) -/* A65144 802410B4 03E00008 */ jr $ra -/* A65148 802410B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s new file mode 100644 index 0000000000..2fc040f9c5 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241054_A650E4.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241054_A650E4 +/* A650E4 80241054 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A650E8 80241058 AFB10014 */ sw $s1, 0x14($sp) +/* A650EC 8024105C 0080882D */ daddu $s1, $a0, $zero +/* A650F0 80241060 AFBF0018 */ sw $ra, 0x18($sp) +/* A650F4 80241064 AFB00010 */ sw $s0, 0x10($sp) +/* A650F8 80241068 8E300148 */ lw $s0, 0x148($s1) +/* A650FC 8024106C 0C00EABB */ jal get_npc_unsafe +/* A65100 80241070 86040008 */ lh $a0, 8($s0) +/* A65104 80241074 0040202D */ daddu $a0, $v0, $zero +/* A65108 80241078 9482008E */ lhu $v0, 0x8e($a0) +/* A6510C 8024107C 2442FFFF */ addiu $v0, $v0, -1 +/* A65110 80241080 A482008E */ sh $v0, 0x8e($a0) +/* A65114 80241084 00021400 */ sll $v0, $v0, 0x10 +/* A65118 80241088 1C400007 */ bgtz $v0, .L802410A8 +/* A6511C 8024108C 00000000 */ nop +/* A65120 80241090 8E0200CC */ lw $v0, 0xcc($s0) +/* A65124 80241094 8C430000 */ lw $v1, ($v0) +/* A65128 80241098 24020003 */ addiu $v0, $zero, 3 +/* A6512C 8024109C A482008E */ sh $v0, 0x8e($a0) +/* A65130 802410A0 AC830028 */ sw $v1, 0x28($a0) +/* A65134 802410A4 AE200070 */ sw $zero, 0x70($s1) +.L802410A8: +/* A65138 802410A8 8FBF0018 */ lw $ra, 0x18($sp) +/* A6513C 802410AC 8FB10014 */ lw $s1, 0x14($sp) +/* A65140 802410B0 8FB00010 */ lw $s0, 0x10($sp) +/* A65144 802410B4 03E00008 */ jr $ra +/* A65148 802410B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s index 72de5c88e8..9e12789d79 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802410BC_A6514C.s @@ -90,7 +90,7 @@ glabel func_802410BC_A6514C /* A65294 80241204 00000000 */ nop /* A65298 80241208 02A0202D */ daddu $a0, $s5, $zero /* A6529C 8024120C 0260282D */ daddu $a1, $s3, $zero -/* A652A0 80241210 0C0901CC */ jal func_80240730 +/* A652A0 80241210 0C0901CC */ jal func_80240730_A647C0 /* A652A4 80241214 0280302D */ daddu $a2, $s4, $zero /* A652A8 80241218 8EA30070 */ lw $v1, 0x70($s5) /* A652AC 8024121C 24020001 */ addiu $v0, $zero, 1 @@ -98,57 +98,57 @@ glabel func_802410BC_A6514C /* A652B4 80241224 00000000 */ nop /* A652B8 80241228 02A0202D */ daddu $a0, $s5, $zero /* A652BC 8024122C 0260282D */ daddu $a1, $s3, $zero -/* A652C0 80241230 0C0901E9 */ jal func_802407A4 +/* A652C0 80241230 0C0901E9 */ jal func_802407A4_A64834 /* A652C4 80241234 0280302D */ daddu $a2, $s4, $zero /* A652C8 80241238 080904C0 */ j .L80241300 /* A652CC 8024123C 00000000 */ nop /* A652D0 80241240 02A0202D */ daddu $a0, $s5, $zero /* A652D4 80241244 0260282D */ daddu $a1, $s3, $zero -/* A652D8 80241248 0C090234 */ jal func_802408D0 +/* A652D8 80241248 0C090234 */ jal func_802408D0_A64960 /* A652DC 8024124C 0280302D */ daddu $a2, $s4, $zero /* A652E0 80241250 02A0202D */ daddu $a0, $s5, $zero /* A652E4 80241254 0260282D */ daddu $a1, $s3, $zero -/* A652E8 80241258 0C09025C */ jal func_80240970 +/* A652E8 80241258 0C09025C */ jal func_80240970_A64A00 /* A652EC 8024125C 0280302D */ daddu $a2, $s4, $zero /* A652F0 80241260 080904C0 */ j .L80241300 /* A652F4 80241264 00000000 */ nop /* A652F8 80241268 02A0202D */ daddu $a0, $s5, $zero /* A652FC 8024126C 0260282D */ daddu $a1, $s3, $zero -/* A65300 80241270 0C090275 */ jal func_802409D4 +/* A65300 80241270 0C090275 */ jal func_802409D4_A64A64 /* A65304 80241274 0280302D */ daddu $a2, $s4, $zero /* A65308 80241278 02A0202D */ daddu $a0, $s5, $zero /* A6530C 8024127C 0260282D */ daddu $a1, $s3, $zero -/* A65310 80241280 0C0902C5 */ jal func_80240B14 +/* A65310 80241280 0C0902C5 */ jal func_80240B14_A64BA4 /* A65314 80241284 0280302D */ daddu $a2, $s4, $zero /* A65318 80241288 080904C0 */ j .L80241300 /* A6531C 8024128C 00000000 */ nop /* A65320 80241290 02A0202D */ daddu $a0, $s5, $zero /* A65324 80241294 0260282D */ daddu $a1, $s3, $zero -/* A65328 80241298 0C09032E */ jal func_80240CB8 +/* A65328 80241298 0C09032E */ jal func_80240CB8_A64D48 /* A6532C 8024129C 0280302D */ daddu $a2, $s4, $zero /* A65330 802412A0 080904C0 */ j .L80241300 /* A65334 802412A4 00000000 */ nop /* A65338 802412A8 02A0202D */ daddu $a0, $s5, $zero /* A6533C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* A65340 802412B0 0C09033D */ jal func_80240CF4 +/* A65340 802412B0 0C09033D */ jal func_80240CF4_A64D84 /* A65344 802412B4 0280302D */ daddu $a2, $s4, $zero /* A65348 802412B8 080904C0 */ j .L80241300 /* A6534C 802412BC 00000000 */ nop /* A65350 802412C0 02A0202D */ daddu $a0, $s5, $zero /* A65354 802412C4 0260282D */ daddu $a1, $s3, $zero -/* A65358 802412C8 0C0903AD */ jal func_80240EB4 +/* A65358 802412C8 0C0903AD */ jal func_80240EB4_A64F44 /* A6535C 802412CC 0280302D */ daddu $a2, $s4, $zero /* A65360 802412D0 080904C0 */ j .L80241300 /* A65364 802412D4 00000000 */ nop /* A65368 802412D8 02A0202D */ daddu $a0, $s5, $zero /* A6536C 802412DC 0260282D */ daddu $a1, $s3, $zero -/* A65370 802412E0 0C0903C8 */ jal func_80240F20 +/* A65370 802412E0 0C0903C8 */ jal func_80240F20_A64FB0 /* A65374 802412E4 0280302D */ daddu $a2, $s4, $zero /* A65378 802412E8 080904C0 */ j .L80241300 /* A6537C 802412EC 00000000 */ nop /* A65380 802412F0 02A0202D */ daddu $a0, $s5, $zero /* A65384 802412F4 0260282D */ daddu $a1, $s3, $zero -/* A65388 802412F8 0C090415 */ jal func_80241054 +/* A65388 802412F8 0C090415 */ jal func_80241054_A650E4 /* A6538C 802412FC 0280302D */ daddu $a2, $s4, $zero .L80241300: /* A65390 80241300 8FBF0048 */ lw $ra, 0x48($sp) diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328.s deleted file mode 100644 index 0162b5399e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241328 -/* A653B8 80241328 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A653BC 8024132C AFBF0020 */ sw $ra, 0x20($sp) -/* A653C0 80241330 8C820148 */ lw $v0, 0x148($a0) -/* A653C4 80241334 0C00EABB */ jal get_npc_unsafe -/* A653C8 80241338 84440008 */ lh $a0, 8($v0) -/* A653CC 8024133C 240300FF */ addiu $v1, $zero, 0xff -/* A653D0 80241340 0000282D */ daddu $a1, $zero, $zero -/* A653D4 80241344 00A0302D */ daddu $a2, $a1, $zero -/* A653D8 80241348 A04300AC */ sb $v1, 0xac($v0) -/* A653DC 8024134C AFA00010 */ sw $zero, 0x10($sp) -/* A653E0 80241350 AFA00014 */ sw $zero, 0x14($sp) -/* A653E4 80241354 AFA00018 */ sw $zero, 0x18($sp) -/* A653E8 80241358 8C440024 */ lw $a0, 0x24($v0) -/* A653EC 8024135C 0C0B7A25 */ jal func_802DE894 -/* A653F0 80241360 00A0382D */ daddu $a3, $a1, $zero -/* A653F4 80241364 8FBF0020 */ lw $ra, 0x20($sp) -/* A653F8 80241368 24020002 */ addiu $v0, $zero, 2 -/* A653FC 8024136C 03E00008 */ jr $ra -/* A65400 80241370 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328_A653B8.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328_A653B8.s new file mode 100644 index 0000000000..c91cff0e4c --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241328_A653B8.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241328_A653B8 +/* A653B8 80241328 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A653BC 8024132C AFBF0020 */ sw $ra, 0x20($sp) +/* A653C0 80241330 8C820148 */ lw $v0, 0x148($a0) +/* A653C4 80241334 0C00EABB */ jal get_npc_unsafe +/* A653C8 80241338 84440008 */ lh $a0, 8($v0) +/* A653CC 8024133C 240300FF */ addiu $v1, $zero, 0xff +/* A653D0 80241340 0000282D */ daddu $a1, $zero, $zero +/* A653D4 80241344 00A0302D */ daddu $a2, $a1, $zero +/* A653D8 80241348 A04300AC */ sb $v1, 0xac($v0) +/* A653DC 8024134C AFA00010 */ sw $zero, 0x10($sp) +/* A653E0 80241350 AFA00014 */ sw $zero, 0x14($sp) +/* A653E4 80241354 AFA00018 */ sw $zero, 0x18($sp) +/* A653E8 80241358 8C440024 */ lw $a0, 0x24($v0) +/* A653EC 8024135C 0C0B7A25 */ jal func_802DE894 +/* A653F0 80241360 00A0382D */ daddu $a3, $a1, $zero +/* A653F4 80241364 8FBF0020 */ lw $ra, 0x20($sp) +/* A653F8 80241368 24020002 */ addiu $v0, $zero, 2 +/* A653FC 8024136C 03E00008 */ jr $ra +/* A65400 80241370 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374.s deleted file mode 100644 index 0586b5f322..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241374 -/* A65404 80241374 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A65408 80241378 AFB10014 */ sw $s1, 0x14($sp) -/* A6540C 8024137C 0080882D */ daddu $s1, $a0, $zero -/* A65410 80241380 AFBF0018 */ sw $ra, 0x18($sp) -/* A65414 80241384 AFB00010 */ sw $s0, 0x10($sp) -/* A65418 80241388 8E300148 */ lw $s0, 0x148($s1) -/* A6541C 8024138C 0C00EABB */ jal get_npc_unsafe -/* A65420 80241390 86040008 */ lh $a0, 8($s0) -/* A65424 80241394 0040182D */ daddu $v1, $v0, $zero -/* A65428 80241398 240200FF */ addiu $v0, $zero, 0xff -/* A6542C 8024139C A06200AC */ sb $v0, 0xac($v1) -/* A65430 802413A0 8E0200CC */ lw $v0, 0xcc($s0) -/* A65434 802413A4 8C440008 */ lw $a0, 8($v0) -/* A65438 802413A8 A460008E */ sh $zero, 0x8e($v1) -/* A6543C 802413AC AC640028 */ sw $a0, 0x28($v1) -/* A65440 802413B0 AE200070 */ sw $zero, 0x70($s1) -/* A65444 802413B4 8FBF0018 */ lw $ra, 0x18($sp) -/* A65448 802413B8 8FB10014 */ lw $s1, 0x14($sp) -/* A6544C 802413BC 8FB00010 */ lw $s0, 0x10($sp) -/* A65450 802413C0 24020002 */ addiu $v0, $zero, 2 -/* A65454 802413C4 03E00008 */ jr $ra -/* A65458 802413C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374_A65404.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374_A65404.s new file mode 100644 index 0000000000..81760925bb --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241374_A65404.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241374_A65404 +/* A65404 80241374 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A65408 80241378 AFB10014 */ sw $s1, 0x14($sp) +/* A6540C 8024137C 0080882D */ daddu $s1, $a0, $zero +/* A65410 80241380 AFBF0018 */ sw $ra, 0x18($sp) +/* A65414 80241384 AFB00010 */ sw $s0, 0x10($sp) +/* A65418 80241388 8E300148 */ lw $s0, 0x148($s1) +/* A6541C 8024138C 0C00EABB */ jal get_npc_unsafe +/* A65420 80241390 86040008 */ lh $a0, 8($s0) +/* A65424 80241394 0040182D */ daddu $v1, $v0, $zero +/* A65428 80241398 240200FF */ addiu $v0, $zero, 0xff +/* A6542C 8024139C A06200AC */ sb $v0, 0xac($v1) +/* A65430 802413A0 8E0200CC */ lw $v0, 0xcc($s0) +/* A65434 802413A4 8C440008 */ lw $a0, 8($v0) +/* A65438 802413A8 A460008E */ sh $zero, 0x8e($v1) +/* A6543C 802413AC AC640028 */ sw $a0, 0x28($v1) +/* A65440 802413B0 AE200070 */ sw $zero, 0x70($s1) +/* A65444 802413B4 8FBF0018 */ lw $ra, 0x18($sp) +/* A65448 802413B8 8FB10014 */ lw $s1, 0x14($sp) +/* A6544C 802413BC 8FB00010 */ lw $s0, 0x10($sp) +/* A65450 802413C0 24020002 */ addiu $v0, $zero, 2 +/* A65454 802413C4 03E00008 */ jr $ra +/* A65458 802413C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8.s deleted file mode 100644 index 176e7b665c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414C8 -/* A65558 802414C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A6555C 802414CC AFB3001C */ sw $s3, 0x1c($sp) -/* A65560 802414D0 0080982D */ daddu $s3, $a0, $zero -/* A65564 802414D4 AFBF0020 */ sw $ra, 0x20($sp) -/* A65568 802414D8 AFB20018 */ sw $s2, 0x18($sp) -/* A6556C 802414DC AFB10014 */ sw $s1, 0x14($sp) -/* A65570 802414E0 AFB00010 */ sw $s0, 0x10($sp) -/* A65574 802414E4 8E710148 */ lw $s1, 0x148($s3) -/* A65578 802414E8 86240008 */ lh $a0, 8($s1) -/* A6557C 802414EC 0C00EABB */ jal get_npc_unsafe -/* A65580 802414F0 00A0902D */ daddu $s2, $a1, $zero -/* A65584 802414F4 0040802D */ daddu $s0, $v0, $zero -/* A65588 802414F8 8602008E */ lh $v0, 0x8e($s0) -/* A6558C 802414FC 9603008E */ lhu $v1, 0x8e($s0) -/* A65590 80241500 18400005 */ blez $v0, .L80241518 -/* A65594 80241504 2462FFFF */ addiu $v0, $v1, -1 -/* A65598 80241508 A602008E */ sh $v0, 0x8e($s0) -/* A6559C 8024150C 00021400 */ sll $v0, $v0, 0x10 -/* A655A0 80241510 1C400033 */ bgtz $v0, .L802415E0 -/* A655A4 80241514 00000000 */ nop -.L80241518: -/* A655A8 80241518 8602008C */ lh $v0, 0x8c($s0) -/* A655AC 8024151C 14400030 */ bnez $v0, .L802415E0 -/* A655B0 80241520 00000000 */ nop -/* A655B4 80241524 8E2200CC */ lw $v0, 0xcc($s1) -/* A655B8 80241528 8C420024 */ lw $v0, 0x24($v0) -/* A655BC 8024152C AE020028 */ sw $v0, 0x28($s0) -/* A655C0 80241530 C6400018 */ lwc1 $f0, 0x18($s2) -/* A655C4 80241534 E6000018 */ swc1 $f0, 0x18($s0) -/* A655C8 80241538 8E230088 */ lw $v1, 0x88($s1) -/* A655CC 8024153C 24020005 */ addiu $v0, $zero, 5 -/* A655D0 80241540 10620005 */ beq $v1, $v0, .L80241558 -/* A655D4 80241544 00000000 */ nop -/* A655D8 80241548 10600003 */ beqz $v1, .L80241558 -/* A655DC 8024154C 24020001 */ addiu $v0, $zero, 1 -/* A655E0 80241550 14620006 */ bne $v1, $v0, .L8024156C -/* A655E4 80241554 00000000 */ nop -.L80241558: -/* A655E8 80241558 8E220084 */ lw $v0, 0x84($s1) -/* A655EC 8024155C 00021FC2 */ srl $v1, $v0, 0x1f -/* A655F0 80241560 00431021 */ addu $v0, $v0, $v1 -/* A655F4 80241564 00021043 */ sra $v0, $v0, 1 -/* A655F8 80241568 A60200A8 */ sh $v0, 0xa8($s0) -.L8024156C: -/* A655FC 8024156C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A65600 80241570 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A65604 80241574 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A65608 80241578 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6560C 8024157C 8C460028 */ lw $a2, 0x28($v0) -/* A65610 80241580 0C00A7B5 */ jal dist2D -/* A65614 80241584 8C470030 */ lw $a3, 0x30($v0) -/* A65618 80241588 C6020018 */ lwc1 $f2, 0x18($s0) -/* A6561C 8024158C 46020003 */ div.s $f0, $f0, $f2 -/* A65620 80241590 3C018024 */ lui $at, 0x8024 -/* A65624 80241594 D4223008 */ ldc1 $f2, 0x3008($at) -/* A65628 80241598 46000021 */ cvt.d.s $f0, $f0 -/* A6562C 8024159C 46220000 */ add.d $f0, $f0, $f2 -/* A65630 802415A0 4620010D */ trunc.w.d $f4, $f0 -/* A65634 802415A4 44022000 */ mfc1 $v0, $f4 -/* A65638 802415A8 00000000 */ nop -/* A6563C 802415AC A602008E */ sh $v0, 0x8e($s0) -/* A65640 802415B0 00021400 */ sll $v0, $v0, 0x10 -/* A65644 802415B4 8E230078 */ lw $v1, 0x78($s1) -/* A65648 802415B8 00021403 */ sra $v0, $v0, 0x10 -/* A6564C 802415BC 0043102A */ slt $v0, $v0, $v1 -/* A65650 802415C0 10400003 */ beqz $v0, .L802415D0 -/* A65654 802415C4 00000000 */ nop -/* A65658 802415C8 9622007A */ lhu $v0, 0x7a($s1) -/* A6565C 802415CC A602008E */ sh $v0, 0x8e($s0) -.L802415D0: -/* A65660 802415D0 8602008E */ lh $v0, 0x8e($s0) -/* A65664 802415D4 AE22007C */ sw $v0, 0x7c($s1) -/* A65668 802415D8 2402000E */ addiu $v0, $zero, 0xe -/* A6566C 802415DC AE620070 */ sw $v0, 0x70($s3) -.L802415E0: -/* A65670 802415E0 8FBF0020 */ lw $ra, 0x20($sp) -/* A65674 802415E4 8FB3001C */ lw $s3, 0x1c($sp) -/* A65678 802415E8 8FB20018 */ lw $s2, 0x18($sp) -/* A6567C 802415EC 8FB10014 */ lw $s1, 0x14($sp) -/* A65680 802415F0 8FB00010 */ lw $s0, 0x10($sp) -/* A65684 802415F4 03E00008 */ jr $ra -/* A65688 802415F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s new file mode 100644 index 0000000000..6493119069 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802414C8_A65558.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414C8_A65558 +/* A65558 802414C8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A6555C 802414CC AFB3001C */ sw $s3, 0x1c($sp) +/* A65560 802414D0 0080982D */ daddu $s3, $a0, $zero +/* A65564 802414D4 AFBF0020 */ sw $ra, 0x20($sp) +/* A65568 802414D8 AFB20018 */ sw $s2, 0x18($sp) +/* A6556C 802414DC AFB10014 */ sw $s1, 0x14($sp) +/* A65570 802414E0 AFB00010 */ sw $s0, 0x10($sp) +/* A65574 802414E4 8E710148 */ lw $s1, 0x148($s3) +/* A65578 802414E8 86240008 */ lh $a0, 8($s1) +/* A6557C 802414EC 0C00EABB */ jal get_npc_unsafe +/* A65580 802414F0 00A0902D */ daddu $s2, $a1, $zero +/* A65584 802414F4 0040802D */ daddu $s0, $v0, $zero +/* A65588 802414F8 8602008E */ lh $v0, 0x8e($s0) +/* A6558C 802414FC 9603008E */ lhu $v1, 0x8e($s0) +/* A65590 80241500 18400005 */ blez $v0, .L80241518 +/* A65594 80241504 2462FFFF */ addiu $v0, $v1, -1 +/* A65598 80241508 A602008E */ sh $v0, 0x8e($s0) +/* A6559C 8024150C 00021400 */ sll $v0, $v0, 0x10 +/* A655A0 80241510 1C400033 */ bgtz $v0, .L802415E0 +/* A655A4 80241514 00000000 */ nop +.L80241518: +/* A655A8 80241518 8602008C */ lh $v0, 0x8c($s0) +/* A655AC 8024151C 14400030 */ bnez $v0, .L802415E0 +/* A655B0 80241520 00000000 */ nop +/* A655B4 80241524 8E2200CC */ lw $v0, 0xcc($s1) +/* A655B8 80241528 8C420024 */ lw $v0, 0x24($v0) +/* A655BC 8024152C AE020028 */ sw $v0, 0x28($s0) +/* A655C0 80241530 C6400018 */ lwc1 $f0, 0x18($s2) +/* A655C4 80241534 E6000018 */ swc1 $f0, 0x18($s0) +/* A655C8 80241538 8E230088 */ lw $v1, 0x88($s1) +/* A655CC 8024153C 24020005 */ addiu $v0, $zero, 5 +/* A655D0 80241540 10620005 */ beq $v1, $v0, .L80241558 +/* A655D4 80241544 00000000 */ nop +/* A655D8 80241548 10600003 */ beqz $v1, .L80241558 +/* A655DC 8024154C 24020001 */ addiu $v0, $zero, 1 +/* A655E0 80241550 14620006 */ bne $v1, $v0, .L8024156C +/* A655E4 80241554 00000000 */ nop +.L80241558: +/* A655E8 80241558 8E220084 */ lw $v0, 0x84($s1) +/* A655EC 8024155C 00021FC2 */ srl $v1, $v0, 0x1f +/* A655F0 80241560 00431021 */ addu $v0, $v0, $v1 +/* A655F4 80241564 00021043 */ sra $v0, $v0, 1 +/* A655F8 80241568 A60200A8 */ sh $v0, 0xa8($s0) +.L8024156C: +/* A655FC 8024156C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A65600 80241570 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A65604 80241574 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A65608 80241578 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A6560C 8024157C 8C460028 */ lw $a2, 0x28($v0) +/* A65610 80241580 0C00A7B5 */ jal dist2D +/* A65614 80241584 8C470030 */ lw $a3, 0x30($v0) +/* A65618 80241588 C6020018 */ lwc1 $f2, 0x18($s0) +/* A6561C 8024158C 46020003 */ div.s $f0, $f0, $f2 +/* A65620 80241590 3C018024 */ lui $at, 0x8024 +/* A65624 80241594 D4223008 */ ldc1 $f2, 0x3008($at) +/* A65628 80241598 46000021 */ cvt.d.s $f0, $f0 +/* A6562C 8024159C 46220000 */ add.d $f0, $f0, $f2 +/* A65630 802415A0 4620010D */ trunc.w.d $f4, $f0 +/* A65634 802415A4 44022000 */ mfc1 $v0, $f4 +/* A65638 802415A8 00000000 */ nop +/* A6563C 802415AC A602008E */ sh $v0, 0x8e($s0) +/* A65640 802415B0 00021400 */ sll $v0, $v0, 0x10 +/* A65644 802415B4 8E230078 */ lw $v1, 0x78($s1) +/* A65648 802415B8 00021403 */ sra $v0, $v0, 0x10 +/* A6564C 802415BC 0043102A */ slt $v0, $v0, $v1 +/* A65650 802415C0 10400003 */ beqz $v0, .L802415D0 +/* A65654 802415C4 00000000 */ nop +/* A65658 802415C8 9622007A */ lhu $v0, 0x7a($s1) +/* A6565C 802415CC A602008E */ sh $v0, 0x8e($s0) +.L802415D0: +/* A65660 802415D0 8602008E */ lh $v0, 0x8e($s0) +/* A65664 802415D4 AE22007C */ sw $v0, 0x7c($s1) +/* A65668 802415D8 2402000E */ addiu $v0, $zero, 0xe +/* A6566C 802415DC AE620070 */ sw $v0, 0x70($s3) +.L802415E0: +/* A65670 802415E0 8FBF0020 */ lw $ra, 0x20($sp) +/* A65674 802415E4 8FB3001C */ lw $s3, 0x1c($sp) +/* A65678 802415E8 8FB20018 */ lw $s2, 0x18($sp) +/* A6567C 802415EC 8FB10014 */ lw $s1, 0x14($sp) +/* A65680 802415F0 8FB00010 */ lw $s0, 0x10($sp) +/* A65684 802415F4 03E00008 */ jr $ra +/* A65688 802415F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241760.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241760.s deleted file mode 100644 index 36a138c5c5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241760.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241760 -/* A657F0 80241760 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A657F4 80241764 AFB10014 */ sw $s1, 0x14($sp) -/* A657F8 80241768 0080882D */ daddu $s1, $a0, $zero -/* A657FC 8024176C AFBF0018 */ sw $ra, 0x18($sp) -/* A65800 80241770 AFB00010 */ sw $s0, 0x10($sp) -/* A65804 80241774 8E300148 */ lw $s0, 0x148($s1) -/* A65808 80241778 0C00EABB */ jal get_npc_unsafe -/* A6580C 8024177C 86040008 */ lh $a0, 8($s0) -/* A65810 80241780 0040202D */ daddu $a0, $v0, $zero -/* A65814 80241784 9482008E */ lhu $v0, 0x8e($a0) -/* A65818 80241788 24030003 */ addiu $v1, $zero, 3 -/* A6581C 8024178C 24420001 */ addiu $v0, $v0, 1 -/* A65820 80241790 A482008E */ sh $v0, 0x8e($a0) -/* A65824 80241794 00021400 */ sll $v0, $v0, 0x10 -/* A65828 80241798 00021403 */ sra $v0, $v0, 0x10 -/* A6582C 8024179C 14430003 */ bne $v0, $v1, .L802417AC -/* A65830 802417A0 00000000 */ nop -/* A65834 802417A4 96020086 */ lhu $v0, 0x86($s0) -/* A65838 802417A8 A48200A8 */ sh $v0, 0xa8($a0) -.L802417AC: -/* A6583C 802417AC 8482008E */ lh $v0, 0x8e($a0) -/* A65840 802417B0 8E030080 */ lw $v1, 0x80($s0) -/* A65844 802417B4 0043102A */ slt $v0, $v0, $v1 -/* A65848 802417B8 14400004 */ bnez $v0, .L802417CC -/* A6584C 802417BC 00000000 */ nop -/* A65850 802417C0 96020086 */ lhu $v0, 0x86($s0) -/* A65854 802417C4 A48200A8 */ sh $v0, 0xa8($a0) -/* A65858 802417C8 AE200070 */ sw $zero, 0x70($s1) -.L802417CC: -/* A6585C 802417CC 8FBF0018 */ lw $ra, 0x18($sp) -/* A65860 802417D0 8FB10014 */ lw $s1, 0x14($sp) -/* A65864 802417D4 8FB00010 */ lw $s0, 0x10($sp) -/* A65868 802417D8 03E00008 */ jr $ra -/* A6586C 802417DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241760_A657F0.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241760_A657F0.s new file mode 100644 index 0000000000..472d3b9f9b --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_80241760_A657F0.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241760_A657F0 +/* A657F0 80241760 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A657F4 80241764 AFB10014 */ sw $s1, 0x14($sp) +/* A657F8 80241768 0080882D */ daddu $s1, $a0, $zero +/* A657FC 8024176C AFBF0018 */ sw $ra, 0x18($sp) +/* A65800 80241770 AFB00010 */ sw $s0, 0x10($sp) +/* A65804 80241774 8E300148 */ lw $s0, 0x148($s1) +/* A65808 80241778 0C00EABB */ jal get_npc_unsafe +/* A6580C 8024177C 86040008 */ lh $a0, 8($s0) +/* A65810 80241780 0040202D */ daddu $a0, $v0, $zero +/* A65814 80241784 9482008E */ lhu $v0, 0x8e($a0) +/* A65818 80241788 24030003 */ addiu $v1, $zero, 3 +/* A6581C 8024178C 24420001 */ addiu $v0, $v0, 1 +/* A65820 80241790 A482008E */ sh $v0, 0x8e($a0) +/* A65824 80241794 00021400 */ sll $v0, $v0, 0x10 +/* A65828 80241798 00021403 */ sra $v0, $v0, 0x10 +/* A6582C 8024179C 14430003 */ bne $v0, $v1, .L802417AC +/* A65830 802417A0 00000000 */ nop +/* A65834 802417A4 96020086 */ lhu $v0, 0x86($s0) +/* A65838 802417A8 A48200A8 */ sh $v0, 0xa8($a0) +.L802417AC: +/* A6583C 802417AC 8482008E */ lh $v0, 0x8e($a0) +/* A65840 802417B0 8E030080 */ lw $v1, 0x80($s0) +/* A65844 802417B4 0043102A */ slt $v0, $v0, $v1 +/* A65848 802417B8 14400004 */ bnez $v0, .L802417CC +/* A6584C 802417BC 00000000 */ nop +/* A65850 802417C0 96020086 */ lhu $v0, 0x86($s0) +/* A65854 802417C4 A48200A8 */ sh $v0, 0xa8($a0) +/* A65858 802417C8 AE200070 */ sw $zero, 0x70($s1) +.L802417CC: +/* A6585C 802417CC 8FBF0018 */ lw $ra, 0x18($sp) +/* A65860 802417D0 8FB10014 */ lw $s1, 0x14($sp) +/* A65864 802417D4 8FB00010 */ lw $s0, 0x10($sp) +/* A65868 802417D8 03E00008 */ jr $ra +/* A6586C 802417DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s index d93ed30d1d..37ff78a161 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s +++ b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802417E0_A65870.s @@ -232,25 +232,25 @@ glabel func_802417E0_A65870 .L80241B30: /* A65BC0 80241B30 0260202D */ daddu $a0, $s3, $zero /* A65BC4 80241B34 0280282D */ daddu $a1, $s4, $zero -/* A65BC8 80241B38 0C090513 */ jal func_8024144C +/* A65BC8 80241B38 0C090513 */ jal func_8024144C_A654DC /* A65BCC 80241B3C 02A0302D */ daddu $a2, $s5, $zero /* A65BD0 80241B40 0260202D */ daddu $a0, $s3, $zero .L80241B44: /* A65BD4 80241B44 0280282D */ daddu $a1, $s4, $zero -/* A65BD8 80241B48 0C090532 */ jal func_802414C8 +/* A65BD8 80241B48 0C090532 */ jal func_802414C8_A65558 /* A65BDC 80241B4C 02A0302D */ daddu $a2, $s5, $zero /* A65BE0 80241B50 080906E3 */ j .L80241B8C /* A65BE4 80241B54 00000000 */ nop .L80241B58: /* A65BE8 80241B58 0260202D */ daddu $a0, $s3, $zero /* A65BEC 80241B5C 0280282D */ daddu $a1, $s4, $zero -/* A65BF0 80241B60 0C09057F */ jal func_802415FC +/* A65BF0 80241B60 0C09057F */ jal func_802415FC_A6568C /* A65BF4 80241B64 02A0302D */ daddu $a2, $s5, $zero /* A65BF8 80241B68 080906E3 */ j .L80241B8C /* A65BFC 80241B6C 00000000 */ nop .L80241B70: /* A65C00 80241B70 0280282D */ daddu $a1, $s4, $zero -/* A65C04 80241B74 0C0905D8 */ jal func_80241760 +/* A65C04 80241B74 0C0905D8 */ jal func_80241760_A657F0 /* A65C08 80241B78 02A0302D */ daddu $a2, $s5, $zero /* A65C0C 80241B7C 080906E3 */ j .L80241B8C /* A65C10 80241B80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0.s deleted file mode 100644 index 00fd47a28e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D0 -/* A673D0 802402D0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A673D4 802402D4 AFB20038 */ sw $s2, 0x38($sp) -/* A673D8 802402D8 0080902D */ daddu $s2, $a0, $zero -/* A673DC 802402DC AFB00030 */ sw $s0, 0x30($sp) -/* A673E0 802402E0 AFBF003C */ sw $ra, 0x3c($sp) -/* A673E4 802402E4 AFB10034 */ sw $s1, 0x34($sp) -/* A673E8 802402E8 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A673EC 802402EC F7B40040 */ sdc1 $f20, 0x40($sp) -/* A673F0 802402F0 8E510148 */ lw $s1, 0x148($s2) -/* A673F4 802402F4 4485A000 */ mtc1 $a1, $f20 -/* A673F8 802402F8 86240008 */ lh $a0, 8($s1) -/* A673FC 802402FC 4486B000 */ mtc1 $a2, $f22 -/* A67400 80240300 0C00EABB */ jal get_npc_unsafe -/* A67404 80240304 00E0802D */ daddu $s0, $a3, $zero -/* A67408 80240308 0200202D */ daddu $a0, $s0, $zero -/* A6740C 8024030C 0220282D */ daddu $a1, $s1, $zero -/* A67410 80240310 24030001 */ addiu $v1, $zero, 1 -/* A67414 80240314 4406A000 */ mfc1 $a2, $f20 -/* A67418 80240318 4407B000 */ mfc1 $a3, $f22 -/* A6741C 8024031C 0040802D */ daddu $s0, $v0, $zero -/* A67420 80240320 0C01242D */ jal func_800490B4 -/* A67424 80240324 AFA30010 */ sw $v1, 0x10($sp) -/* A67428 80240328 1440001D */ bnez $v0, .L802403A0 -/* A6742C 8024032C 24040002 */ addiu $a0, $zero, 2 -/* A67430 80240330 0200282D */ daddu $a1, $s0, $zero -/* A67434 80240334 0000302D */ daddu $a2, $zero, $zero -/* A67438 80240338 860300A8 */ lh $v1, 0xa8($s0) -/* A6743C 8024033C 3C013F80 */ lui $at, 0x3f80 -/* A67440 80240340 44810000 */ mtc1 $at, $f0 -/* A67444 80240344 3C014000 */ lui $at, 0x4000 -/* A67448 80240348 44811000 */ mtc1 $at, $f2 -/* A6744C 8024034C 3C01C1A0 */ lui $at, 0xc1a0 -/* A67450 80240350 44812000 */ mtc1 $at, $f4 -/* A67454 80240354 2402000F */ addiu $v0, $zero, 0xf -/* A67458 80240358 AFA2001C */ sw $v0, 0x1c($sp) -/* A6745C 8024035C 44833000 */ mtc1 $v1, $f6 -/* A67460 80240360 00000000 */ nop -/* A67464 80240364 468031A0 */ cvt.s.w $f6, $f6 -/* A67468 80240368 44073000 */ mfc1 $a3, $f6 -/* A6746C 8024036C 27A20028 */ addiu $v0, $sp, 0x28 -/* A67470 80240370 AFA20020 */ sw $v0, 0x20($sp) -/* A67474 80240374 E7A00010 */ swc1 $f0, 0x10($sp) -/* A67478 80240378 E7A20014 */ swc1 $f2, 0x14($sp) -/* A6747C 8024037C 0C01BFA4 */ jal fx_emote -/* A67480 80240380 E7A40018 */ swc1 $f4, 0x18($sp) -/* A67484 80240384 8E2200CC */ lw $v0, 0xcc($s1) -/* A67488 80240388 8C430000 */ lw $v1, ($v0) -/* A6748C 8024038C 24020014 */ addiu $v0, $zero, 0x14 -/* A67490 80240390 A602008E */ sh $v0, 0x8e($s0) -/* A67494 80240394 24020021 */ addiu $v0, $zero, 0x21 -/* A67498 80240398 080900FC */ j .L802403F0 -/* A6749C 8024039C AE030028 */ sw $v1, 0x28($s0) -.L802403A0: -/* A674A0 802403A0 0C090038 */ jal func_802400E0 -/* A674A4 802403A4 0240202D */ daddu $a0, $s2, $zero -/* A674A8 802403A8 0040202D */ daddu $a0, $v0, $zero -/* A674AC 802403AC 2402FFFF */ addiu $v0, $zero, -1 -/* A674B0 802403B0 10820010 */ beq $a0, $v0, .L802403F4 -/* A674B4 802403B4 00000000 */ nop -/* A674B8 802403B8 0C00FB3A */ jal get_enemy -/* A674BC 802403BC 00000000 */ nop -/* A674C0 802403C0 8C42006C */ lw $v0, 0x6c($v0) -/* A674C4 802403C4 1440000B */ bnez $v0, .L802403F4 -/* A674C8 802403C8 00000000 */ nop -/* A674CC 802403CC 8602008C */ lh $v0, 0x8c($s0) -/* A674D0 802403D0 14400008 */ bnez $v0, .L802403F4 -/* A674D4 802403D4 00000000 */ nop -/* A674D8 802403D8 8E2200CC */ lw $v0, 0xcc($s1) -/* A674DC 802403DC 8C420020 */ lw $v0, 0x20($v0) -/* A674E0 802403E0 AE020028 */ sw $v0, 0x28($s0) -/* A674E4 802403E4 96220072 */ lhu $v0, 0x72($s1) -/* A674E8 802403E8 A602008E */ sh $v0, 0x8e($s0) -/* A674EC 802403EC 2402001E */ addiu $v0, $zero, 0x1e -.L802403F0: -/* A674F0 802403F0 AE420070 */ sw $v0, 0x70($s2) -.L802403F4: -/* A674F4 802403F4 8FBF003C */ lw $ra, 0x3c($sp) -/* A674F8 802403F8 8FB20038 */ lw $s2, 0x38($sp) -/* A674FC 802403FC 8FB10034 */ lw $s1, 0x34($sp) -/* A67500 80240400 8FB00030 */ lw $s0, 0x30($sp) -/* A67504 80240404 D7B60048 */ ldc1 $f22, 0x48($sp) -/* A67508 80240408 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A6750C 8024040C 03E00008 */ jr $ra -/* A67510 80240410 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s new file mode 100644 index 0000000000..89ad113f81 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802402D0_A673D0.s @@ -0,0 +1,88 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402D0_A673D0 +/* A673D0 802402D0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A673D4 802402D4 AFB20038 */ sw $s2, 0x38($sp) +/* A673D8 802402D8 0080902D */ daddu $s2, $a0, $zero +/* A673DC 802402DC AFB00030 */ sw $s0, 0x30($sp) +/* A673E0 802402E0 AFBF003C */ sw $ra, 0x3c($sp) +/* A673E4 802402E4 AFB10034 */ sw $s1, 0x34($sp) +/* A673E8 802402E8 F7B60048 */ sdc1 $f22, 0x48($sp) +/* A673EC 802402EC F7B40040 */ sdc1 $f20, 0x40($sp) +/* A673F0 802402F0 8E510148 */ lw $s1, 0x148($s2) +/* A673F4 802402F4 4485A000 */ mtc1 $a1, $f20 +/* A673F8 802402F8 86240008 */ lh $a0, 8($s1) +/* A673FC 802402FC 4486B000 */ mtc1 $a2, $f22 +/* A67400 80240300 0C00EABB */ jal get_npc_unsafe +/* A67404 80240304 00E0802D */ daddu $s0, $a3, $zero +/* A67408 80240308 0200202D */ daddu $a0, $s0, $zero +/* A6740C 8024030C 0220282D */ daddu $a1, $s1, $zero +/* A67410 80240310 24030001 */ addiu $v1, $zero, 1 +/* A67414 80240314 4406A000 */ mfc1 $a2, $f20 +/* A67418 80240318 4407B000 */ mfc1 $a3, $f22 +/* A6741C 8024031C 0040802D */ daddu $s0, $v0, $zero +/* A67420 80240320 0C01242D */ jal func_800490B4 +/* A67424 80240324 AFA30010 */ sw $v1, 0x10($sp) +/* A67428 80240328 1440001D */ bnez $v0, .L802403A0 +/* A6742C 8024032C 24040002 */ addiu $a0, $zero, 2 +/* A67430 80240330 0200282D */ daddu $a1, $s0, $zero +/* A67434 80240334 0000302D */ daddu $a2, $zero, $zero +/* A67438 80240338 860300A8 */ lh $v1, 0xa8($s0) +/* A6743C 8024033C 3C013F80 */ lui $at, 0x3f80 +/* A67440 80240340 44810000 */ mtc1 $at, $f0 +/* A67444 80240344 3C014000 */ lui $at, 0x4000 +/* A67448 80240348 44811000 */ mtc1 $at, $f2 +/* A6744C 8024034C 3C01C1A0 */ lui $at, 0xc1a0 +/* A67450 80240350 44812000 */ mtc1 $at, $f4 +/* A67454 80240354 2402000F */ addiu $v0, $zero, 0xf +/* A67458 80240358 AFA2001C */ sw $v0, 0x1c($sp) +/* A6745C 8024035C 44833000 */ mtc1 $v1, $f6 +/* A67460 80240360 00000000 */ nop +/* A67464 80240364 468031A0 */ cvt.s.w $f6, $f6 +/* A67468 80240368 44073000 */ mfc1 $a3, $f6 +/* A6746C 8024036C 27A20028 */ addiu $v0, $sp, 0x28 +/* A67470 80240370 AFA20020 */ sw $v0, 0x20($sp) +/* A67474 80240374 E7A00010 */ swc1 $f0, 0x10($sp) +/* A67478 80240378 E7A20014 */ swc1 $f2, 0x14($sp) +/* A6747C 8024037C 0C01BFA4 */ jal fx_emote +/* A67480 80240380 E7A40018 */ swc1 $f4, 0x18($sp) +/* A67484 80240384 8E2200CC */ lw $v0, 0xcc($s1) +/* A67488 80240388 8C430000 */ lw $v1, ($v0) +/* A6748C 8024038C 24020014 */ addiu $v0, $zero, 0x14 +/* A67490 80240390 A602008E */ sh $v0, 0x8e($s0) +/* A67494 80240394 24020021 */ addiu $v0, $zero, 0x21 +/* A67498 80240398 080900FC */ j .L802403F0 +/* A6749C 8024039C AE030028 */ sw $v1, 0x28($s0) +.L802403A0: +/* A674A0 802403A0 0C090038 */ jal func_802400E0_A671E0 +/* A674A4 802403A4 0240202D */ daddu $a0, $s2, $zero +/* A674A8 802403A8 0040202D */ daddu $a0, $v0, $zero +/* A674AC 802403AC 2402FFFF */ addiu $v0, $zero, -1 +/* A674B0 802403B0 10820010 */ beq $a0, $v0, .L802403F4 +/* A674B4 802403B4 00000000 */ nop +/* A674B8 802403B8 0C00FB3A */ jal get_enemy +/* A674BC 802403BC 00000000 */ nop +/* A674C0 802403C0 8C42006C */ lw $v0, 0x6c($v0) +/* A674C4 802403C4 1440000B */ bnez $v0, .L802403F4 +/* A674C8 802403C8 00000000 */ nop +/* A674CC 802403CC 8602008C */ lh $v0, 0x8c($s0) +/* A674D0 802403D0 14400008 */ bnez $v0, .L802403F4 +/* A674D4 802403D4 00000000 */ nop +/* A674D8 802403D8 8E2200CC */ lw $v0, 0xcc($s1) +/* A674DC 802403DC 8C420020 */ lw $v0, 0x20($v0) +/* A674E0 802403E0 AE020028 */ sw $v0, 0x28($s0) +/* A674E4 802403E4 96220072 */ lhu $v0, 0x72($s1) +/* A674E8 802403E8 A602008E */ sh $v0, 0x8e($s0) +/* A674EC 802403EC 2402001E */ addiu $v0, $zero, 0x1e +.L802403F0: +/* A674F0 802403F0 AE420070 */ sw $v0, 0x70($s2) +.L802403F4: +/* A674F4 802403F4 8FBF003C */ lw $ra, 0x3c($sp) +/* A674F8 802403F8 8FB20038 */ lw $s2, 0x38($sp) +/* A674FC 802403FC 8FB10034 */ lw $s1, 0x34($sp) +/* A67500 80240400 8FB00030 */ lw $s0, 0x30($sp) +/* A67504 80240404 D7B60048 */ ldc1 $f22, 0x48($sp) +/* A67508 80240408 D7B40040 */ ldc1 $f20, 0x40($sp) +/* A6750C 8024040C 03E00008 */ jr $ra +/* A67510 80240410 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414.s deleted file mode 100644 index b9d8c1c38e..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240414 -/* A67514 80240414 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A67518 80240418 AFB20038 */ sw $s2, 0x38($sp) -/* A6751C 8024041C 0080902D */ daddu $s2, $a0, $zero -/* A67520 80240420 AFBF003C */ sw $ra, 0x3c($sp) -/* A67524 80240424 AFB10034 */ sw $s1, 0x34($sp) -/* A67528 80240428 AFB00030 */ sw $s0, 0x30($sp) -/* A6752C 8024042C 8E510148 */ lw $s1, 0x148($s2) -/* A67530 80240430 0C00EABB */ jal get_npc_unsafe -/* A67534 80240434 86240008 */ lh $a0, 8($s1) -/* A67538 80240438 0040802D */ daddu $s0, $v0, $zero -/* A6753C 8024043C 9602008E */ lhu $v0, 0x8e($s0) -/* A67540 80240440 2442FFFF */ addiu $v0, $v0, -1 -/* A67544 80240444 A602008E */ sh $v0, 0x8e($s0) -/* A67548 80240448 00021400 */ sll $v0, $v0, 0x10 -/* A6754C 8024044C 1C40002B */ bgtz $v0, .L802404FC -/* A67550 80240450 00000000 */ nop -/* A67554 80240454 0C090038 */ jal func_802400E0 -/* A67558 80240458 0240202D */ daddu $a0, $s2, $zero -/* A6755C 8024045C 0040202D */ daddu $a0, $v0, $zero -/* A67560 80240460 0481001A */ bgez $a0, .L802404CC -/* A67564 80240464 2402000F */ addiu $v0, $zero, 0xf -/* A67568 80240468 24040002 */ addiu $a0, $zero, 2 -/* A6756C 8024046C 860300A8 */ lh $v1, 0xa8($s0) -/* A67570 80240470 AFA2001C */ sw $v0, 0x1c($sp) -/* A67574 80240474 27A20028 */ addiu $v0, $sp, 0x28 -/* A67578 80240478 0200282D */ daddu $a1, $s0, $zero -/* A6757C 8024047C 3C013F80 */ lui $at, 0x3f80 -/* A67580 80240480 44810000 */ mtc1 $at, $f0 -/* A67584 80240484 3C014000 */ lui $at, 0x4000 -/* A67588 80240488 44811000 */ mtc1 $at, $f2 -/* A6758C 8024048C 3C01C1A0 */ lui $at, 0xc1a0 -/* A67590 80240490 44812000 */ mtc1 $at, $f4 -/* A67594 80240494 44833000 */ mtc1 $v1, $f6 -/* A67598 80240498 00000000 */ nop -/* A6759C 8024049C 468031A0 */ cvt.s.w $f6, $f6 -/* A675A0 802404A0 44073000 */ mfc1 $a3, $f6 -/* A675A4 802404A4 0000302D */ daddu $a2, $zero, $zero -/* A675A8 802404A8 AFA20020 */ sw $v0, 0x20($sp) -/* A675AC 802404AC E7A00010 */ swc1 $f0, 0x10($sp) -/* A675B0 802404B0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A675B4 802404B4 0C01BFA4 */ jal fx_emote -/* A675B8 802404B8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A675BC 802404BC 8E2200CC */ lw $v0, 0xcc($s1) -/* A675C0 802404C0 8C420000 */ lw $v0, ($v0) -/* A675C4 802404C4 0809013B */ j .L802404EC -/* A675C8 802404C8 AE020028 */ sw $v0, 0x28($s0) -.L802404CC: -/* A675CC 802404CC 8E2200CC */ lw $v0, 0xcc($s1) -/* A675D0 802404D0 8C420024 */ lw $v0, 0x24($v0) -/* A675D4 802404D4 0C00FB3A */ jal get_enemy -/* A675D8 802404D8 AE020028 */ sw $v0, 0x28($s0) -/* A675DC 802404DC 86240008 */ lh $a0, 8($s1) -/* A675E0 802404E0 24030001 */ addiu $v1, $zero, 1 -/* A675E4 802404E4 AC43006C */ sw $v1, 0x6c($v0) -/* A675E8 802404E8 AC44007C */ sw $a0, 0x7c($v0) -.L802404EC: -/* A675EC 802404EC 96220076 */ lhu $v0, 0x76($s1) -/* A675F0 802404F0 A602008E */ sh $v0, 0x8e($s0) -/* A675F4 802404F4 24020021 */ addiu $v0, $zero, 0x21 -/* A675F8 802404F8 AE420070 */ sw $v0, 0x70($s2) -.L802404FC: -/* A675FC 802404FC 8FBF003C */ lw $ra, 0x3c($sp) -/* A67600 80240500 8FB20038 */ lw $s2, 0x38($sp) -/* A67604 80240504 8FB10034 */ lw $s1, 0x34($sp) -/* A67608 80240508 8FB00030 */ lw $s0, 0x30($sp) -/* A6760C 8024050C 03E00008 */ jr $ra -/* A67610 80240510 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s new file mode 100644 index 0000000000..5abf48e89f --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240414_A67514.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240414_A67514 +/* A67514 80240414 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A67518 80240418 AFB20038 */ sw $s2, 0x38($sp) +/* A6751C 8024041C 0080902D */ daddu $s2, $a0, $zero +/* A67520 80240420 AFBF003C */ sw $ra, 0x3c($sp) +/* A67524 80240424 AFB10034 */ sw $s1, 0x34($sp) +/* A67528 80240428 AFB00030 */ sw $s0, 0x30($sp) +/* A6752C 8024042C 8E510148 */ lw $s1, 0x148($s2) +/* A67530 80240430 0C00EABB */ jal get_npc_unsafe +/* A67534 80240434 86240008 */ lh $a0, 8($s1) +/* A67538 80240438 0040802D */ daddu $s0, $v0, $zero +/* A6753C 8024043C 9602008E */ lhu $v0, 0x8e($s0) +/* A67540 80240440 2442FFFF */ addiu $v0, $v0, -1 +/* A67544 80240444 A602008E */ sh $v0, 0x8e($s0) +/* A67548 80240448 00021400 */ sll $v0, $v0, 0x10 +/* A6754C 8024044C 1C40002B */ bgtz $v0, .L802404FC +/* A67550 80240450 00000000 */ nop +/* A67554 80240454 0C090038 */ jal func_802400E0_A671E0 +/* A67558 80240458 0240202D */ daddu $a0, $s2, $zero +/* A6755C 8024045C 0040202D */ daddu $a0, $v0, $zero +/* A67560 80240460 0481001A */ bgez $a0, .L802404CC +/* A67564 80240464 2402000F */ addiu $v0, $zero, 0xf +/* A67568 80240468 24040002 */ addiu $a0, $zero, 2 +/* A6756C 8024046C 860300A8 */ lh $v1, 0xa8($s0) +/* A67570 80240470 AFA2001C */ sw $v0, 0x1c($sp) +/* A67574 80240474 27A20028 */ addiu $v0, $sp, 0x28 +/* A67578 80240478 0200282D */ daddu $a1, $s0, $zero +/* A6757C 8024047C 3C013F80 */ lui $at, 0x3f80 +/* A67580 80240480 44810000 */ mtc1 $at, $f0 +/* A67584 80240484 3C014000 */ lui $at, 0x4000 +/* A67588 80240488 44811000 */ mtc1 $at, $f2 +/* A6758C 8024048C 3C01C1A0 */ lui $at, 0xc1a0 +/* A67590 80240490 44812000 */ mtc1 $at, $f4 +/* A67594 80240494 44833000 */ mtc1 $v1, $f6 +/* A67598 80240498 00000000 */ nop +/* A6759C 8024049C 468031A0 */ cvt.s.w $f6, $f6 +/* A675A0 802404A0 44073000 */ mfc1 $a3, $f6 +/* A675A4 802404A4 0000302D */ daddu $a2, $zero, $zero +/* A675A8 802404A8 AFA20020 */ sw $v0, 0x20($sp) +/* A675AC 802404AC E7A00010 */ swc1 $f0, 0x10($sp) +/* A675B0 802404B0 E7A20014 */ swc1 $f2, 0x14($sp) +/* A675B4 802404B4 0C01BFA4 */ jal fx_emote +/* A675B8 802404B8 E7A40018 */ swc1 $f4, 0x18($sp) +/* A675BC 802404BC 8E2200CC */ lw $v0, 0xcc($s1) +/* A675C0 802404C0 8C420000 */ lw $v0, ($v0) +/* A675C4 802404C4 0809013B */ j .L802404EC +/* A675C8 802404C8 AE020028 */ sw $v0, 0x28($s0) +.L802404CC: +/* A675CC 802404CC 8E2200CC */ lw $v0, 0xcc($s1) +/* A675D0 802404D0 8C420024 */ lw $v0, 0x24($v0) +/* A675D4 802404D4 0C00FB3A */ jal get_enemy +/* A675D8 802404D8 AE020028 */ sw $v0, 0x28($s0) +/* A675DC 802404DC 86240008 */ lh $a0, 8($s1) +/* A675E0 802404E0 24030001 */ addiu $v1, $zero, 1 +/* A675E4 802404E4 AC43006C */ sw $v1, 0x6c($v0) +/* A675E8 802404E8 AC44007C */ sw $a0, 0x7c($v0) +.L802404EC: +/* A675EC 802404EC 96220076 */ lhu $v0, 0x76($s1) +/* A675F0 802404F0 A602008E */ sh $v0, 0x8e($s0) +/* A675F4 802404F4 24020021 */ addiu $v0, $zero, 0x21 +/* A675F8 802404F8 AE420070 */ sw $v0, 0x70($s2) +.L802404FC: +/* A675FC 802404FC 8FBF003C */ lw $ra, 0x3c($sp) +/* A67600 80240500 8FB20038 */ lw $s2, 0x38($sp) +/* A67604 80240504 8FB10034 */ lw $s1, 0x34($sp) +/* A67608 80240508 8FB00030 */ lw $s0, 0x30($sp) +/* A6760C 8024050C 03E00008 */ jr $ra +/* A67610 80240510 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558.s deleted file mode 100644 index c0e6782e0f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240558 -/* A67658 80240558 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A6765C 8024055C AFB3001C */ sw $s3, 0x1c($sp) -/* A67660 80240560 0080982D */ daddu $s3, $a0, $zero -/* A67664 80240564 AFBF0020 */ sw $ra, 0x20($sp) -/* A67668 80240568 AFB20018 */ sw $s2, 0x18($sp) -/* A6766C 8024056C AFB10014 */ sw $s1, 0x14($sp) -/* A67670 80240570 AFB00010 */ sw $s0, 0x10($sp) -/* A67674 80240574 8E720148 */ lw $s2, 0x148($s3) -/* A67678 80240578 0C00EABB */ jal get_npc_unsafe -/* A6767C 8024057C 86440008 */ lh $a0, 8($s2) -/* A67680 80240580 86440008 */ lh $a0, 8($s2) -/* A67684 80240584 0040882D */ daddu $s1, $v0, $zero -/* A67688 80240588 0C00FB3A */ jal get_enemy -/* A6768C 8024058C 24840001 */ addiu $a0, $a0, 1 -/* A67690 80240590 0040802D */ daddu $s0, $v0, $zero -/* A67694 80240594 0C00EABB */ jal get_npc_unsafe -/* A67698 80240598 86040008 */ lh $a0, 8($s0) -/* A6769C 8024059C C62C0038 */ lwc1 $f12, 0x38($s1) -/* A676A0 802405A0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A676A4 802405A4 8C460038 */ lw $a2, 0x38($v0) -/* A676A8 802405A8 0C00A720 */ jal atan2 -/* A676AC 802405AC 8C470040 */ lw $a3, 0x40($v0) -/* A676B0 802405B0 E620000C */ swc1 $f0, 0xc($s1) -/* A676B4 802405B4 8E02006C */ lw $v0, 0x6c($s0) -/* A676B8 802405B8 14400008 */ bnez $v0, .L802405DC -/* A676BC 802405BC 00000000 */ nop -/* A676C0 802405C0 8E4200CC */ lw $v0, 0xcc($s2) -/* A676C4 802405C4 8C420000 */ lw $v0, ($v0) -/* A676C8 802405C8 AE220028 */ sw $v0, 0x28($s1) -/* A676CC 802405CC 96420076 */ lhu $v0, 0x76($s2) -/* A676D0 802405D0 A622008E */ sh $v0, 0x8e($s1) -/* A676D4 802405D4 24020021 */ addiu $v0, $zero, 0x21 -/* A676D8 802405D8 AE620070 */ sw $v0, 0x70($s3) -.L802405DC: -/* A676DC 802405DC 8FBF0020 */ lw $ra, 0x20($sp) -/* A676E0 802405E0 8FB3001C */ lw $s3, 0x1c($sp) -/* A676E4 802405E4 8FB20018 */ lw $s2, 0x18($sp) -/* A676E8 802405E8 8FB10014 */ lw $s1, 0x14($sp) -/* A676EC 802405EC 8FB00010 */ lw $s0, 0x10($sp) -/* A676F0 802405F0 03E00008 */ jr $ra -/* A676F4 802405F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558_A67658.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558_A67658.s new file mode 100644 index 0000000000..b36f3c7a32 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240558_A67658.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240558_A67658 +/* A67658 80240558 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A6765C 8024055C AFB3001C */ sw $s3, 0x1c($sp) +/* A67660 80240560 0080982D */ daddu $s3, $a0, $zero +/* A67664 80240564 AFBF0020 */ sw $ra, 0x20($sp) +/* A67668 80240568 AFB20018 */ sw $s2, 0x18($sp) +/* A6766C 8024056C AFB10014 */ sw $s1, 0x14($sp) +/* A67670 80240570 AFB00010 */ sw $s0, 0x10($sp) +/* A67674 80240574 8E720148 */ lw $s2, 0x148($s3) +/* A67678 80240578 0C00EABB */ jal get_npc_unsafe +/* A6767C 8024057C 86440008 */ lh $a0, 8($s2) +/* A67680 80240580 86440008 */ lh $a0, 8($s2) +/* A67684 80240584 0040882D */ daddu $s1, $v0, $zero +/* A67688 80240588 0C00FB3A */ jal get_enemy +/* A6768C 8024058C 24840001 */ addiu $a0, $a0, 1 +/* A67690 80240590 0040802D */ daddu $s0, $v0, $zero +/* A67694 80240594 0C00EABB */ jal get_npc_unsafe +/* A67698 80240598 86040008 */ lh $a0, 8($s0) +/* A6769C 8024059C C62C0038 */ lwc1 $f12, 0x38($s1) +/* A676A0 802405A0 C62E0040 */ lwc1 $f14, 0x40($s1) +/* A676A4 802405A4 8C460038 */ lw $a2, 0x38($v0) +/* A676A8 802405A8 0C00A720 */ jal atan2 +/* A676AC 802405AC 8C470040 */ lw $a3, 0x40($v0) +/* A676B0 802405B0 E620000C */ swc1 $f0, 0xc($s1) +/* A676B4 802405B4 8E02006C */ lw $v0, 0x6c($s0) +/* A676B8 802405B8 14400008 */ bnez $v0, .L802405DC +/* A676BC 802405BC 00000000 */ nop +/* A676C0 802405C0 8E4200CC */ lw $v0, 0xcc($s2) +/* A676C4 802405C4 8C420000 */ lw $v0, ($v0) +/* A676C8 802405C8 AE220028 */ sw $v0, 0x28($s1) +/* A676CC 802405CC 96420076 */ lhu $v0, 0x76($s2) +/* A676D0 802405D0 A622008E */ sh $v0, 0x8e($s1) +/* A676D4 802405D4 24020021 */ addiu $v0, $zero, 0x21 +/* A676D8 802405D8 AE620070 */ sw $v0, 0x70($s3) +.L802405DC: +/* A676DC 802405DC 8FBF0020 */ lw $ra, 0x20($sp) +/* A676E0 802405E0 8FB3001C */ lw $s3, 0x1c($sp) +/* A676E4 802405E4 8FB20018 */ lw $s2, 0x18($sp) +/* A676E8 802405E8 8FB10014 */ lw $s1, 0x14($sp) +/* A676EC 802405EC 8FB00010 */ lw $s0, 0x10($sp) +/* A676F0 802405F0 03E00008 */ jr $ra +/* A676F4 802405F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8.s deleted file mode 100644 index ef2973c341..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F8 -/* A676F8 802405F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A676FC 802405FC AFB00010 */ sw $s0, 0x10($sp) -/* A67700 80240600 0080802D */ daddu $s0, $a0, $zero -/* A67704 80240604 AFBF0014 */ sw $ra, 0x14($sp) -/* A67708 80240608 8E020148 */ lw $v0, 0x148($s0) -/* A6770C 8024060C 0C00EABB */ jal get_npc_unsafe -/* A67710 80240610 84440008 */ lh $a0, 8($v0) -/* A67714 80240614 9443008E */ lhu $v1, 0x8e($v0) -/* A67718 80240618 2463FFFF */ addiu $v1, $v1, -1 -/* A6771C 8024061C A443008E */ sh $v1, 0x8e($v0) -/* A67720 80240620 00031C00 */ sll $v1, $v1, 0x10 -/* A67724 80240624 58600001 */ blezl $v1, .L8024062C -/* A67728 80240628 AE000070 */ sw $zero, 0x70($s0) -.L8024062C: -/* A6772C 8024062C 8FBF0014 */ lw $ra, 0x14($sp) -/* A67730 80240630 8FB00010 */ lw $s0, 0x10($sp) -/* A67734 80240634 03E00008 */ jr $ra -/* A67738 80240638 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s new file mode 100644 index 0000000000..e02a5ac486 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802405F8_A676F8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405F8_A676F8 +/* A676F8 802405F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A676FC 802405FC AFB00010 */ sw $s0, 0x10($sp) +/* A67700 80240600 0080802D */ daddu $s0, $a0, $zero +/* A67704 80240604 AFBF0014 */ sw $ra, 0x14($sp) +/* A67708 80240608 8E020148 */ lw $v0, 0x148($s0) +/* A6770C 8024060C 0C00EABB */ jal get_npc_unsafe +/* A67710 80240610 84440008 */ lh $a0, 8($v0) +/* A67714 80240614 9443008E */ lhu $v1, 0x8e($v0) +/* A67718 80240618 2463FFFF */ addiu $v1, $v1, -1 +/* A6771C 8024061C A443008E */ sh $v1, 0x8e($v0) +/* A67720 80240620 00031C00 */ sll $v1, $v1, 0x10 +/* A67724 80240624 58600001 */ blezl $v1, .L8024062C +/* A67728 80240628 AE000070 */ sw $zero, 0x70($s0) +.L8024062C: +/* A6772C 8024062C 8FBF0014 */ lw $ra, 0x14($sp) +/* A67730 80240630 8FB00010 */ lw $s0, 0x10($sp) +/* A67734 80240634 03E00008 */ jr $ra +/* A67738 80240638 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78.s deleted file mode 100644 index 9ee24de313..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B78 -/* A67C78 80240B78 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A67C7C 80240B7C AFB3003C */ sw $s3, 0x3c($sp) -/* A67C80 80240B80 0080982D */ daddu $s3, $a0, $zero -/* A67C84 80240B84 AFB40040 */ sw $s4, 0x40($sp) -/* A67C88 80240B88 0000A02D */ daddu $s4, $zero, $zero -/* A67C8C 80240B8C 3C03800A */ lui $v1, 0x800a -/* A67C90 80240B90 8463A634 */ lh $v1, -0x59cc($v1) -/* A67C94 80240B94 3C04800B */ lui $a0, %hi(gCameras) -/* A67C98 80240B98 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* A67C9C 80240B9C AFBF0044 */ sw $ra, 0x44($sp) -/* A67CA0 80240BA0 AFB20038 */ sw $s2, 0x38($sp) -/* A67CA4 80240BA4 AFB10034 */ sw $s1, 0x34($sp) -/* A67CA8 80240BA8 AFB00030 */ sw $s0, 0x30($sp) -/* A67CAC 80240BAC F7B80058 */ sdc1 $f24, 0x58($sp) -/* A67CB0 80240BB0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A67CB4 80240BB4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* A67CB8 80240BB8 8E710148 */ lw $s1, 0x148($s3) -/* A67CBC 80240BBC 00031080 */ sll $v0, $v1, 2 -/* A67CC0 80240BC0 00431021 */ addu $v0, $v0, $v1 -/* A67CC4 80240BC4 00021080 */ sll $v0, $v0, 2 -/* A67CC8 80240BC8 00431023 */ subu $v0, $v0, $v1 -/* A67CCC 80240BCC 000218C0 */ sll $v1, $v0, 3 -/* A67CD0 80240BD0 00431021 */ addu $v0, $v0, $v1 -/* A67CD4 80240BD4 000210C0 */ sll $v0, $v0, 3 -/* A67CD8 80240BD8 10A00002 */ beqz $a1, .L80240BE4 -/* A67CDC 80240BDC 00449021 */ addu $s2, $v0, $a0 -/* A67CE0 80240BE0 AE600070 */ sw $zero, 0x70($s3) -.L80240BE4: -/* A67CE4 80240BE4 0C00FB5A */ jal get_enemy_safe -/* A67CE8 80240BE8 86240008 */ lh $a0, 8($s1) -/* A67CEC 80240BEC 14400006 */ bnez $v0, .L80240C08 -/* A67CF0 80240BF0 24020005 */ addiu $v0, $zero, 5 -/* A67CF4 80240BF4 0260202D */ daddu $a0, $s3, $zero -/* A67CF8 80240BF8 3C05FE36 */ lui $a1, 0xfe36 -/* A67CFC 80240BFC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A67D00 80240C00 080903DA */ j .L80240F68 -/* A67D04 80240C04 0000302D */ daddu $a2, $zero, $zero -.L80240C08: -/* A67D08 80240C08 8E23006C */ lw $v1, 0x6c($s1) -/* A67D0C 80240C0C 14620005 */ bne $v1, $v0, .L80240C24 -/* A67D10 80240C10 0260202D */ daddu $a0, $s3, $zero -/* A67D14 80240C14 3C05FE36 */ lui $a1, 0xfe36 -/* A67D18 80240C18 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A67D1C 80240C1C 080903DA */ j .L80240F68 -/* A67D20 80240C20 0000302D */ daddu $a2, $zero, $zero -.L80240C24: -/* A67D24 80240C24 86240008 */ lh $a0, 8($s1) -/* A67D28 80240C28 0C00FB5A */ jal get_enemy_safe -/* A67D2C 80240C2C 00000000 */ nop -/* A67D30 80240C30 14400005 */ bnez $v0, .L80240C48 -/* A67D34 80240C34 0260202D */ daddu $a0, $s3, $zero -/* A67D38 80240C38 3C05FE36 */ lui $a1, 0xfe36 -/* A67D3C 80240C3C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A67D40 80240C40 080903DA */ j .L80240F68 -/* A67D44 80240C44 0000302D */ daddu $a2, $zero, $zero -.L80240C48: -/* A67D48 80240C48 86240008 */ lh $a0, 8($s1) -/* A67D4C 80240C4C 0C00EABB */ jal get_npc_unsafe -/* A67D50 80240C50 00000000 */ nop -/* A67D54 80240C54 8E630070 */ lw $v1, 0x70($s3) -/* A67D58 80240C58 10600006 */ beqz $v1, .L80240C74 -/* A67D5C 80240C5C 0040802D */ daddu $s0, $v0, $zero -/* A67D60 80240C60 24020001 */ addiu $v0, $zero, 1 -/* A67D64 80240C64 1062003F */ beq $v1, $v0, .L80240D64 -/* A67D68 80240C68 0000102D */ daddu $v0, $zero, $zero -/* A67D6C 80240C6C 080903EA */ j .L80240FA8 -/* A67D70 80240C70 00000000 */ nop -.L80240C74: -/* A67D74 80240C74 AFA00010 */ sw $zero, 0x10($sp) -/* A67D78 80240C78 AFA00014 */ sw $zero, 0x14($sp) -/* A67D7C 80240C7C 8E050038 */ lw $a1, 0x38($s0) -/* A67D80 80240C80 8E06003C */ lw $a2, 0x3c($s0) -/* A67D84 80240C84 8E070040 */ lw $a3, 0x40($s0) -/* A67D88 80240C88 0C01BECC */ jal fx_walk_normal -/* A67D8C 80240C8C 24040002 */ addiu $a0, $zero, 2 -/* A67D90 80240C90 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A67D94 80240C94 0C00A6C9 */ jal clamp_angle -/* A67D98 80240C98 00000000 */ nop -/* A67D9C 80240C9C 3C018024 */ lui $at, 0x8024 -/* A67DA0 80240CA0 D43839F0 */ ldc1 $f24, 0x39f0($at) -/* A67DA4 80240CA4 46000521 */ cvt.d.s $f20, $f0 -/* A67DA8 80240CA8 4638A300 */ add.d $f12, $f20, $f24 -/* A67DAC 80240CAC 3C018024 */ lui $at, 0x8024 -/* A67DB0 80240CB0 D43639F8 */ ldc1 $f22, 0x39f8($at) -/* A67DB4 80240CB4 0C00A6C9 */ jal clamp_angle -/* A67DB8 80240CB8 46206320 */ cvt.s.d $f12, $f12 -/* A67DBC 80240CBC 4636A500 */ add.d $f20, $f20, $f22 -/* A67DC0 80240CC0 4620A320 */ cvt.s.d $f12, $f20 -/* A67DC4 80240CC4 0C00A6C9 */ jal clamp_angle -/* A67DC8 80240CC8 46000506 */ mov.s $f20, $f0 -/* A67DCC 80240CCC 4600A521 */ cvt.d.s $f20, $f20 -/* A67DD0 80240CD0 4636A500 */ add.d $f20, $f20, $f22 -/* A67DD4 80240CD4 46000586 */ mov.s $f22, $f0 -/* A67DD8 80240CD8 0C00A6C9 */ jal clamp_angle -/* A67DDC 80240CDC 4620A320 */ cvt.s.d $f12, $f20 -/* A67DE0 80240CE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A67DE4 80240CE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A67DE8 80240CE8 C64C006C */ lwc1 $f12, 0x6c($s2) -/* A67DEC 80240CEC C44E0084 */ lwc1 $f14, 0x84($v0) -/* A67DF0 80240CF0 0C00A70A */ jal get_clamped_angle_diff -/* A67DF4 80240CF4 46000506 */ mov.s $f20, $f0 -/* A67DF8 80240CF8 0C00A6C9 */ jal clamp_angle -/* A67DFC 80240CFC 46000306 */ mov.s $f12, $f0 -/* A67E00 80240D00 46000021 */ cvt.d.s $f0, $f0 -/* A67E04 80240D04 4638003C */ c.lt.d $f0, $f24 -/* A67E08 80240D08 00000000 */ nop -/* A67E0C 80240D0C 45020002 */ bc1fl .L80240D18 -/* A67E10 80240D10 E614000C */ swc1 $f20, 0xc($s0) -/* A67E14 80240D14 E616000C */ swc1 $f22, 0xc($s0) -.L80240D18: -/* A67E18 80240D18 C6000018 */ lwc1 $f0, 0x18($s0) -/* A67E1C 80240D1C 3C018024 */ lui $at, 0x8024 -/* A67E20 80240D20 D4223A00 */ ldc1 $f2, 0x3a00($at) -/* A67E24 80240D24 46000021 */ cvt.d.s $f0, $f0 -/* A67E28 80240D28 46220002 */ mul.d $f0, $f0, $f2 -/* A67E2C 80240D2C 00000000 */ nop -/* A67E30 80240D30 3C013F66 */ lui $at, 0x3f66 -/* A67E34 80240D34 34216666 */ ori $at, $at, 0x6666 -/* A67E38 80240D38 44812000 */ mtc1 $at, $f4 -/* A67E3C 80240D3C 2402001E */ addiu $v0, $zero, 0x1e -/* A67E40 80240D40 A602008E */ sh $v0, 0x8e($s0) -/* A67E44 80240D44 3C014120 */ lui $at, 0x4120 -/* A67E48 80240D48 44811000 */ mtc1 $at, $f2 -/* A67E4C 80240D4C 24020001 */ addiu $v0, $zero, 1 -/* A67E50 80240D50 E6040014 */ swc1 $f4, 0x14($s0) -/* A67E54 80240D54 E602001C */ swc1 $f2, 0x1c($s0) -/* A67E58 80240D58 46200020 */ cvt.s.d $f0, $f0 -/* A67E5C 80240D5C E6000018 */ swc1 $f0, 0x18($s0) -/* A67E60 80240D60 AE620070 */ sw $v0, 0x70($s3) -.L80240D64: -/* A67E64 80240D64 C6000038 */ lwc1 $f0, 0x38($s0) -/* A67E68 80240D68 C602003C */ lwc1 $f2, 0x3c($s0) -/* A67E6C 80240D6C C6040040 */ lwc1 $f4, 0x40($s0) -/* A67E70 80240D70 C6060018 */ lwc1 $f6, 0x18($s0) -/* A67E74 80240D74 0000202D */ daddu $a0, $zero, $zero -/* A67E78 80240D78 E7A00020 */ swc1 $f0, 0x20($sp) -/* A67E7C 80240D7C E7A20024 */ swc1 $f2, 0x24($sp) -/* A67E80 80240D80 E7A40028 */ swc1 $f4, 0x28($sp) -/* A67E84 80240D84 E7A60010 */ swc1 $f6, 0x10($sp) -/* A67E88 80240D88 C600000C */ lwc1 $f0, 0xc($s0) -/* A67E8C 80240D8C 27A50020 */ addiu $a1, $sp, 0x20 -/* A67E90 80240D90 E7A00014 */ swc1 $f0, 0x14($sp) -/* A67E94 80240D94 860200A6 */ lh $v0, 0xa6($s0) -/* A67E98 80240D98 27A60024 */ addiu $a2, $sp, 0x24 -/* A67E9C 80240D9C 44820000 */ mtc1 $v0, $f0 -/* A67EA0 80240DA0 00000000 */ nop -/* A67EA4 80240DA4 46800020 */ cvt.s.w $f0, $f0 -/* A67EA8 80240DA8 E7A00018 */ swc1 $f0, 0x18($sp) -/* A67EAC 80240DAC 860200A8 */ lh $v0, 0xa8($s0) -/* A67EB0 80240DB0 27A70028 */ addiu $a3, $sp, 0x28 -/* A67EB4 80240DB4 44820000 */ mtc1 $v0, $f0 -/* A67EB8 80240DB8 00000000 */ nop -/* A67EBC 80240DBC 46800020 */ cvt.s.w $f0, $f0 -/* A67EC0 80240DC0 0C037711 */ jal func_800DDC44 -/* A67EC4 80240DC4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A67EC8 80240DC8 54400007 */ bnel $v0, $zero, .L80240DE8 -/* A67ECC 80240DCC 24140001 */ addiu $s4, $zero, 1 -/* A67ED0 80240DD0 8E050018 */ lw $a1, 0x18($s0) -/* A67ED4 80240DD4 8E06000C */ lw $a2, 0xc($s0) -/* A67ED8 80240DD8 0C00EA95 */ jal npc_move_heading -/* A67EDC 80240DDC 0200202D */ daddu $a0, $s0, $zero -/* A67EE0 80240DE0 0809037B */ j .L80240DEC -/* A67EE4 80240DE4 0000902D */ daddu $s2, $zero, $zero -.L80240DE8: -/* A67EE8 80240DE8 0000902D */ daddu $s2, $zero, $zero -.L80240DEC: -/* A67EEC 80240DEC C600001C */ lwc1 $f0, 0x1c($s0) -/* A67EF0 80240DF0 44801000 */ mtc1 $zero, $f2 -/* A67EF4 80240DF4 44801800 */ mtc1 $zero, $f3 -/* A67EF8 80240DF8 46000021 */ cvt.d.s $f0, $f0 -/* A67EFC 80240DFC 4622003C */ c.lt.d $f0, $f2 -/* A67F00 80240E00 00000000 */ nop -/* A67F04 80240E04 45000028 */ bc1f .L80240EA8 -/* A67F08 80240E08 27A50020 */ addiu $a1, $sp, 0x20 -/* A67F0C 80240E0C 27A60024 */ addiu $a2, $sp, 0x24 -/* A67F10 80240E10 27A2002C */ addiu $v0, $sp, 0x2c -/* A67F14 80240E14 C602003C */ lwc1 $f2, 0x3c($s0) -/* A67F18 80240E18 C6060038 */ lwc1 $f6, 0x38($s0) -/* A67F1C 80240E1C 3C01402A */ lui $at, 0x402a -/* A67F20 80240E20 4481A800 */ mtc1 $at, $f21 -/* A67F24 80240E24 4480A000 */ mtc1 $zero, $f20 -/* A67F28 80240E28 460010A1 */ cvt.d.s $f2, $f2 -/* A67F2C 80240E2C 46341080 */ add.d $f2, $f2, $f20 -/* A67F30 80240E30 C600001C */ lwc1 $f0, 0x1c($s0) -/* A67F34 80240E34 C6040040 */ lwc1 $f4, 0x40($s0) -/* A67F38 80240E38 46000005 */ abs.s $f0, $f0 -/* A67F3C 80240E3C E7A40028 */ swc1 $f4, 0x28($sp) -/* A67F40 80240E40 3C014030 */ lui $at, 0x4030 -/* A67F44 80240E44 44812800 */ mtc1 $at, $f5 -/* A67F48 80240E48 44802000 */ mtc1 $zero, $f4 -/* A67F4C 80240E4C 46000021 */ cvt.d.s $f0, $f0 -/* A67F50 80240E50 E7A60020 */ swc1 $f6, 0x20($sp) -/* A67F54 80240E54 46240000 */ add.d $f0, $f0, $f4 -/* A67F58 80240E58 462010A0 */ cvt.s.d $f2, $f2 -/* A67F5C 80240E5C E7A20024 */ swc1 $f2, 0x24($sp) -/* A67F60 80240E60 46200020 */ cvt.s.d $f0, $f0 -/* A67F64 80240E64 E7A0002C */ swc1 $f0, 0x2c($sp) -/* A67F68 80240E68 AFA20010 */ sw $v0, 0x10($sp) -/* A67F6C 80240E6C 8E040080 */ lw $a0, 0x80($s0) -/* A67F70 80240E70 0C0372DF */ jal func_800DCB7C -/* A67F74 80240E74 27A70028 */ addiu $a3, $sp, 0x28 -/* A67F78 80240E78 1040000B */ beqz $v0, .L80240EA8 -/* A67F7C 80240E7C 00000000 */ nop -/* A67F80 80240E80 C600001C */ lwc1 $f0, 0x1c($s0) -/* A67F84 80240E84 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* A67F88 80240E88 46000005 */ abs.s $f0, $f0 -/* A67F8C 80240E8C 46000021 */ cvt.d.s $f0, $f0 -/* A67F90 80240E90 46340000 */ add.d $f0, $f0, $f20 -/* A67F94 80240E94 460010A1 */ cvt.d.s $f2, $f2 -/* A67F98 80240E98 4620103E */ c.le.d $f2, $f0 -/* A67F9C 80240E9C 00000000 */ nop -/* A67FA0 80240EA0 45030001 */ bc1tl .L80240EA8 -/* A67FA4 80240EA4 24120001 */ addiu $s2, $zero, 1 -.L80240EA8: -/* A67FA8 80240EA8 56400008 */ bnel $s2, $zero, .L80240ECC -/* A67FAC 80240EAC 2414000A */ addiu $s4, $zero, 0xa -/* A67FB0 80240EB0 C604003C */ lwc1 $f4, 0x3c($s0) -/* A67FB4 80240EB4 C600001C */ lwc1 $f0, 0x1c($s0) -/* A67FB8 80240EB8 46002100 */ add.s $f4, $f4, $f0 -/* A67FBC 80240EBC C6020014 */ lwc1 $f2, 0x14($s0) -/* A67FC0 80240EC0 46020001 */ sub.s $f0, $f0, $f2 -/* A67FC4 80240EC4 E604003C */ swc1 $f4, 0x3c($s0) -/* A67FC8 80240EC8 E600001C */ swc1 $f0, 0x1c($s0) -.L80240ECC: -/* A67FCC 80240ECC 9602008E */ lhu $v0, 0x8e($s0) -/* A67FD0 80240ED0 2442FFFF */ addiu $v0, $v0, -1 -/* A67FD4 80240ED4 A602008E */ sh $v0, 0x8e($s0) -/* A67FD8 80240ED8 00021400 */ sll $v0, $v0, 0x10 -/* A67FDC 80240EDC 58400001 */ blezl $v0, .L80240EE4 -/* A67FE0 80240EE0 2414000B */ addiu $s4, $zero, 0xb -.L80240EE4: -/* A67FE4 80240EE4 12800024 */ beqz $s4, .L80240F78 -/* A67FE8 80240EE8 00000000 */ nop -/* A67FEC 80240EEC AFA00010 */ sw $zero, 0x10($sp) -/* A67FF0 80240EF0 AFA00014 */ sw $zero, 0x14($sp) -/* A67FF4 80240EF4 8E050038 */ lw $a1, 0x38($s0) -/* A67FF8 80240EF8 8E06003C */ lw $a2, 0x3c($s0) -/* A67FFC 80240EFC 8E070040 */ lw $a3, 0x40($s0) -/* A68000 80240F00 0C01BECC */ jal fx_walk_normal -/* A68004 80240F04 24040002 */ addiu $a0, $zero, 2 -/* A68008 80240F08 3C01C47A */ lui $at, 0xc47a -/* A6800C 80240F0C 44810000 */ mtc1 $at, $f0 -/* A68010 80240F10 AE20006C */ sw $zero, 0x6c($s1) -/* A68014 80240F14 8E020000 */ lw $v0, ($s0) -/* A68018 80240F18 0200202D */ daddu $a0, $s0, $zero -/* A6801C 80240F1C AE000038 */ sw $zero, 0x38($s0) -/* A68020 80240F20 AE000040 */ sw $zero, 0x40($s0) -/* A68024 80240F24 34420002 */ ori $v0, $v0, 2 -/* A68028 80240F28 E600003C */ swc1 $f0, 0x3c($s0) -/* A6802C 80240F2C 0C00EAFF */ jal disable_npc_shadow -/* A68030 80240F30 AE020000 */ sw $v0, ($s0) -/* A68034 80240F34 0260202D */ daddu $a0, $s3, $zero -/* A68038 80240F38 3C05FE36 */ lui $a1, 0xfe36 -/* A6803C 80240F3C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A68040 80240F40 24060001 */ addiu $a2, $zero, 1 -/* A68044 80240F44 8E020000 */ lw $v0, ($s0) -/* A68048 80240F48 2403F7FF */ addiu $v1, $zero, -0x801 -/* A6804C 80240F4C 00431024 */ and $v0, $v0, $v1 -/* A68050 80240F50 AE020000 */ sw $v0, ($s0) -/* A68054 80240F54 8E220000 */ lw $v0, ($s1) -/* A68058 80240F58 3C031F00 */ lui $v1, 0x1f00 -/* A6805C 80240F5C 00431025 */ or $v0, $v0, $v1 -/* A68060 80240F60 AE220000 */ sw $v0, ($s1) -/* A68064 80240F64 AC800070 */ sw $zero, 0x70($a0) -.L80240F68: -/* A68068 80240F68 0C0B2026 */ jal set_variable -/* A6806C 80240F6C 00000000 */ nop -/* A68070 80240F70 080903EA */ j .L80240FA8 -/* A68074 80240F74 24020002 */ addiu $v0, $zero, 2 -.L80240F78: -/* A68078 80240F78 8E220070 */ lw $v0, 0x70($s1) -/* A6807C 80240F7C 30420001 */ andi $v0, $v0, 1 -/* A68080 80240F80 10400009 */ beqz $v0, .L80240FA8 -/* A68084 80240F84 0000102D */ daddu $v0, $zero, $zero -/* A68088 80240F88 C600004C */ lwc1 $f0, 0x4c($s0) -/* A6808C 80240F8C 3C01404E */ lui $at, 0x404e -/* A68090 80240F90 44811800 */ mtc1 $at, $f3 -/* A68094 80240F94 44801000 */ mtc1 $zero, $f2 -/* A68098 80240F98 46000021 */ cvt.d.s $f0, $f0 -/* A6809C 80240F9C 46220000 */ add.d $f0, $f0, $f2 -/* A680A0 80240FA0 46200020 */ cvt.s.d $f0, $f0 -/* A680A4 80240FA4 E600004C */ swc1 $f0, 0x4c($s0) -.L80240FA8: -/* A680A8 80240FA8 8FBF0044 */ lw $ra, 0x44($sp) -/* A680AC 80240FAC 8FB40040 */ lw $s4, 0x40($sp) -/* A680B0 80240FB0 8FB3003C */ lw $s3, 0x3c($sp) -/* A680B4 80240FB4 8FB20038 */ lw $s2, 0x38($sp) -/* A680B8 80240FB8 8FB10034 */ lw $s1, 0x34($sp) -/* A680BC 80240FBC 8FB00030 */ lw $s0, 0x30($sp) -/* A680C0 80240FC0 D7B80058 */ ldc1 $f24, 0x58($sp) -/* A680C4 80240FC4 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A680C8 80240FC8 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A680CC 80240FCC 03E00008 */ jr $ra -/* A680D0 80240FD0 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s new file mode 100644 index 0000000000..8f171daaa9 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240B78_A67C78.s @@ -0,0 +1,298 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B78_A67C78 +/* A67C78 80240B78 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* A67C7C 80240B7C AFB3003C */ sw $s3, 0x3c($sp) +/* A67C80 80240B80 0080982D */ daddu $s3, $a0, $zero +/* A67C84 80240B84 AFB40040 */ sw $s4, 0x40($sp) +/* A67C88 80240B88 0000A02D */ daddu $s4, $zero, $zero +/* A67C8C 80240B8C 3C03800A */ lui $v1, 0x800a +/* A67C90 80240B90 8463A634 */ lh $v1, -0x59cc($v1) +/* A67C94 80240B94 3C04800B */ lui $a0, %hi(gCameras) +/* A67C98 80240B98 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* A67C9C 80240B9C AFBF0044 */ sw $ra, 0x44($sp) +/* A67CA0 80240BA0 AFB20038 */ sw $s2, 0x38($sp) +/* A67CA4 80240BA4 AFB10034 */ sw $s1, 0x34($sp) +/* A67CA8 80240BA8 AFB00030 */ sw $s0, 0x30($sp) +/* A67CAC 80240BAC F7B80058 */ sdc1 $f24, 0x58($sp) +/* A67CB0 80240BB0 F7B60050 */ sdc1 $f22, 0x50($sp) +/* A67CB4 80240BB4 F7B40048 */ sdc1 $f20, 0x48($sp) +/* A67CB8 80240BB8 8E710148 */ lw $s1, 0x148($s3) +/* A67CBC 80240BBC 00031080 */ sll $v0, $v1, 2 +/* A67CC0 80240BC0 00431021 */ addu $v0, $v0, $v1 +/* A67CC4 80240BC4 00021080 */ sll $v0, $v0, 2 +/* A67CC8 80240BC8 00431023 */ subu $v0, $v0, $v1 +/* A67CCC 80240BCC 000218C0 */ sll $v1, $v0, 3 +/* A67CD0 80240BD0 00431021 */ addu $v0, $v0, $v1 +/* A67CD4 80240BD4 000210C0 */ sll $v0, $v0, 3 +/* A67CD8 80240BD8 10A00002 */ beqz $a1, .L80240BE4 +/* A67CDC 80240BDC 00449021 */ addu $s2, $v0, $a0 +/* A67CE0 80240BE0 AE600070 */ sw $zero, 0x70($s3) +.L80240BE4: +/* A67CE4 80240BE4 0C00FB5A */ jal get_enemy_safe +/* A67CE8 80240BE8 86240008 */ lh $a0, 8($s1) +/* A67CEC 80240BEC 14400006 */ bnez $v0, .L80240C08 +/* A67CF0 80240BF0 24020005 */ addiu $v0, $zero, 5 +/* A67CF4 80240BF4 0260202D */ daddu $a0, $s3, $zero +/* A67CF8 80240BF8 3C05FE36 */ lui $a1, 0xfe36 +/* A67CFC 80240BFC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A67D00 80240C00 080903DA */ j .L80240F68 +/* A67D04 80240C04 0000302D */ daddu $a2, $zero, $zero +.L80240C08: +/* A67D08 80240C08 8E23006C */ lw $v1, 0x6c($s1) +/* A67D0C 80240C0C 14620005 */ bne $v1, $v0, .L80240C24 +/* A67D10 80240C10 0260202D */ daddu $a0, $s3, $zero +/* A67D14 80240C14 3C05FE36 */ lui $a1, 0xfe36 +/* A67D18 80240C18 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A67D1C 80240C1C 080903DA */ j .L80240F68 +/* A67D20 80240C20 0000302D */ daddu $a2, $zero, $zero +.L80240C24: +/* A67D24 80240C24 86240008 */ lh $a0, 8($s1) +/* A67D28 80240C28 0C00FB5A */ jal get_enemy_safe +/* A67D2C 80240C2C 00000000 */ nop +/* A67D30 80240C30 14400005 */ bnez $v0, .L80240C48 +/* A67D34 80240C34 0260202D */ daddu $a0, $s3, $zero +/* A67D38 80240C38 3C05FE36 */ lui $a1, 0xfe36 +/* A67D3C 80240C3C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A67D40 80240C40 080903DA */ j .L80240F68 +/* A67D44 80240C44 0000302D */ daddu $a2, $zero, $zero +.L80240C48: +/* A67D48 80240C48 86240008 */ lh $a0, 8($s1) +/* A67D4C 80240C4C 0C00EABB */ jal get_npc_unsafe +/* A67D50 80240C50 00000000 */ nop +/* A67D54 80240C54 8E630070 */ lw $v1, 0x70($s3) +/* A67D58 80240C58 10600006 */ beqz $v1, .L80240C74 +/* A67D5C 80240C5C 0040802D */ daddu $s0, $v0, $zero +/* A67D60 80240C60 24020001 */ addiu $v0, $zero, 1 +/* A67D64 80240C64 1062003F */ beq $v1, $v0, .L80240D64 +/* A67D68 80240C68 0000102D */ daddu $v0, $zero, $zero +/* A67D6C 80240C6C 080903EA */ j .L80240FA8 +/* A67D70 80240C70 00000000 */ nop +.L80240C74: +/* A67D74 80240C74 AFA00010 */ sw $zero, 0x10($sp) +/* A67D78 80240C78 AFA00014 */ sw $zero, 0x14($sp) +/* A67D7C 80240C7C 8E050038 */ lw $a1, 0x38($s0) +/* A67D80 80240C80 8E06003C */ lw $a2, 0x3c($s0) +/* A67D84 80240C84 8E070040 */ lw $a3, 0x40($s0) +/* A67D88 80240C88 0C01BECC */ jal fx_walk_normal +/* A67D8C 80240C8C 24040002 */ addiu $a0, $zero, 2 +/* A67D90 80240C90 C64C006C */ lwc1 $f12, 0x6c($s2) +/* A67D94 80240C94 0C00A6C9 */ jal clamp_angle +/* A67D98 80240C98 00000000 */ nop +/* A67D9C 80240C9C 3C018024 */ lui $at, 0x8024 +/* A67DA0 80240CA0 D43839F0 */ ldc1 $f24, 0x39f0($at) +/* A67DA4 80240CA4 46000521 */ cvt.d.s $f20, $f0 +/* A67DA8 80240CA8 4638A300 */ add.d $f12, $f20, $f24 +/* A67DAC 80240CAC 3C018024 */ lui $at, 0x8024 +/* A67DB0 80240CB0 D43639F8 */ ldc1 $f22, 0x39f8($at) +/* A67DB4 80240CB4 0C00A6C9 */ jal clamp_angle +/* A67DB8 80240CB8 46206320 */ cvt.s.d $f12, $f12 +/* A67DBC 80240CBC 4636A500 */ add.d $f20, $f20, $f22 +/* A67DC0 80240CC0 4620A320 */ cvt.s.d $f12, $f20 +/* A67DC4 80240CC4 0C00A6C9 */ jal clamp_angle +/* A67DC8 80240CC8 46000506 */ mov.s $f20, $f0 +/* A67DCC 80240CCC 4600A521 */ cvt.d.s $f20, $f20 +/* A67DD0 80240CD0 4636A500 */ add.d $f20, $f20, $f22 +/* A67DD4 80240CD4 46000586 */ mov.s $f22, $f0 +/* A67DD8 80240CD8 0C00A6C9 */ jal clamp_angle +/* A67DDC 80240CDC 4620A320 */ cvt.s.d $f12, $f20 +/* A67DE0 80240CE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A67DE4 80240CE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A67DE8 80240CE8 C64C006C */ lwc1 $f12, 0x6c($s2) +/* A67DEC 80240CEC C44E0084 */ lwc1 $f14, 0x84($v0) +/* A67DF0 80240CF0 0C00A70A */ jal get_clamped_angle_diff +/* A67DF4 80240CF4 46000506 */ mov.s $f20, $f0 +/* A67DF8 80240CF8 0C00A6C9 */ jal clamp_angle +/* A67DFC 80240CFC 46000306 */ mov.s $f12, $f0 +/* A67E00 80240D00 46000021 */ cvt.d.s $f0, $f0 +/* A67E04 80240D04 4638003C */ c.lt.d $f0, $f24 +/* A67E08 80240D08 00000000 */ nop +/* A67E0C 80240D0C 45020002 */ bc1fl .L80240D18 +/* A67E10 80240D10 E614000C */ swc1 $f20, 0xc($s0) +/* A67E14 80240D14 E616000C */ swc1 $f22, 0xc($s0) +.L80240D18: +/* A67E18 80240D18 C6000018 */ lwc1 $f0, 0x18($s0) +/* A67E1C 80240D1C 3C018024 */ lui $at, 0x8024 +/* A67E20 80240D20 D4223A00 */ ldc1 $f2, 0x3a00($at) +/* A67E24 80240D24 46000021 */ cvt.d.s $f0, $f0 +/* A67E28 80240D28 46220002 */ mul.d $f0, $f0, $f2 +/* A67E2C 80240D2C 00000000 */ nop +/* A67E30 80240D30 3C013F66 */ lui $at, 0x3f66 +/* A67E34 80240D34 34216666 */ ori $at, $at, 0x6666 +/* A67E38 80240D38 44812000 */ mtc1 $at, $f4 +/* A67E3C 80240D3C 2402001E */ addiu $v0, $zero, 0x1e +/* A67E40 80240D40 A602008E */ sh $v0, 0x8e($s0) +/* A67E44 80240D44 3C014120 */ lui $at, 0x4120 +/* A67E48 80240D48 44811000 */ mtc1 $at, $f2 +/* A67E4C 80240D4C 24020001 */ addiu $v0, $zero, 1 +/* A67E50 80240D50 E6040014 */ swc1 $f4, 0x14($s0) +/* A67E54 80240D54 E602001C */ swc1 $f2, 0x1c($s0) +/* A67E58 80240D58 46200020 */ cvt.s.d $f0, $f0 +/* A67E5C 80240D5C E6000018 */ swc1 $f0, 0x18($s0) +/* A67E60 80240D60 AE620070 */ sw $v0, 0x70($s3) +.L80240D64: +/* A67E64 80240D64 C6000038 */ lwc1 $f0, 0x38($s0) +/* A67E68 80240D68 C602003C */ lwc1 $f2, 0x3c($s0) +/* A67E6C 80240D6C C6040040 */ lwc1 $f4, 0x40($s0) +/* A67E70 80240D70 C6060018 */ lwc1 $f6, 0x18($s0) +/* A67E74 80240D74 0000202D */ daddu $a0, $zero, $zero +/* A67E78 80240D78 E7A00020 */ swc1 $f0, 0x20($sp) +/* A67E7C 80240D7C E7A20024 */ swc1 $f2, 0x24($sp) +/* A67E80 80240D80 E7A40028 */ swc1 $f4, 0x28($sp) +/* A67E84 80240D84 E7A60010 */ swc1 $f6, 0x10($sp) +/* A67E88 80240D88 C600000C */ lwc1 $f0, 0xc($s0) +/* A67E8C 80240D8C 27A50020 */ addiu $a1, $sp, 0x20 +/* A67E90 80240D90 E7A00014 */ swc1 $f0, 0x14($sp) +/* A67E94 80240D94 860200A6 */ lh $v0, 0xa6($s0) +/* A67E98 80240D98 27A60024 */ addiu $a2, $sp, 0x24 +/* A67E9C 80240D9C 44820000 */ mtc1 $v0, $f0 +/* A67EA0 80240DA0 00000000 */ nop +/* A67EA4 80240DA4 46800020 */ cvt.s.w $f0, $f0 +/* A67EA8 80240DA8 E7A00018 */ swc1 $f0, 0x18($sp) +/* A67EAC 80240DAC 860200A8 */ lh $v0, 0xa8($s0) +/* A67EB0 80240DB0 27A70028 */ addiu $a3, $sp, 0x28 +/* A67EB4 80240DB4 44820000 */ mtc1 $v0, $f0 +/* A67EB8 80240DB8 00000000 */ nop +/* A67EBC 80240DBC 46800020 */ cvt.s.w $f0, $f0 +/* A67EC0 80240DC0 0C037711 */ jal func_800DDC44 +/* A67EC4 80240DC4 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A67EC8 80240DC8 54400007 */ bnel $v0, $zero, .L80240DE8 +/* A67ECC 80240DCC 24140001 */ addiu $s4, $zero, 1 +/* A67ED0 80240DD0 8E050018 */ lw $a1, 0x18($s0) +/* A67ED4 80240DD4 8E06000C */ lw $a2, 0xc($s0) +/* A67ED8 80240DD8 0C00EA95 */ jal npc_move_heading +/* A67EDC 80240DDC 0200202D */ daddu $a0, $s0, $zero +/* A67EE0 80240DE0 0809037B */ j .L80240DEC +/* A67EE4 80240DE4 0000902D */ daddu $s2, $zero, $zero +.L80240DE8: +/* A67EE8 80240DE8 0000902D */ daddu $s2, $zero, $zero +.L80240DEC: +/* A67EEC 80240DEC C600001C */ lwc1 $f0, 0x1c($s0) +/* A67EF0 80240DF0 44801000 */ mtc1 $zero, $f2 +/* A67EF4 80240DF4 44801800 */ mtc1 $zero, $f3 +/* A67EF8 80240DF8 46000021 */ cvt.d.s $f0, $f0 +/* A67EFC 80240DFC 4622003C */ c.lt.d $f0, $f2 +/* A67F00 80240E00 00000000 */ nop +/* A67F04 80240E04 45000028 */ bc1f .L80240EA8 +/* A67F08 80240E08 27A50020 */ addiu $a1, $sp, 0x20 +/* A67F0C 80240E0C 27A60024 */ addiu $a2, $sp, 0x24 +/* A67F10 80240E10 27A2002C */ addiu $v0, $sp, 0x2c +/* A67F14 80240E14 C602003C */ lwc1 $f2, 0x3c($s0) +/* A67F18 80240E18 C6060038 */ lwc1 $f6, 0x38($s0) +/* A67F1C 80240E1C 3C01402A */ lui $at, 0x402a +/* A67F20 80240E20 4481A800 */ mtc1 $at, $f21 +/* A67F24 80240E24 4480A000 */ mtc1 $zero, $f20 +/* A67F28 80240E28 460010A1 */ cvt.d.s $f2, $f2 +/* A67F2C 80240E2C 46341080 */ add.d $f2, $f2, $f20 +/* A67F30 80240E30 C600001C */ lwc1 $f0, 0x1c($s0) +/* A67F34 80240E34 C6040040 */ lwc1 $f4, 0x40($s0) +/* A67F38 80240E38 46000005 */ abs.s $f0, $f0 +/* A67F3C 80240E3C E7A40028 */ swc1 $f4, 0x28($sp) +/* A67F40 80240E40 3C014030 */ lui $at, 0x4030 +/* A67F44 80240E44 44812800 */ mtc1 $at, $f5 +/* A67F48 80240E48 44802000 */ mtc1 $zero, $f4 +/* A67F4C 80240E4C 46000021 */ cvt.d.s $f0, $f0 +/* A67F50 80240E50 E7A60020 */ swc1 $f6, 0x20($sp) +/* A67F54 80240E54 46240000 */ add.d $f0, $f0, $f4 +/* A67F58 80240E58 462010A0 */ cvt.s.d $f2, $f2 +/* A67F5C 80240E5C E7A20024 */ swc1 $f2, 0x24($sp) +/* A67F60 80240E60 46200020 */ cvt.s.d $f0, $f0 +/* A67F64 80240E64 E7A0002C */ swc1 $f0, 0x2c($sp) +/* A67F68 80240E68 AFA20010 */ sw $v0, 0x10($sp) +/* A67F6C 80240E6C 8E040080 */ lw $a0, 0x80($s0) +/* A67F70 80240E70 0C0372DF */ jal func_800DCB7C +/* A67F74 80240E74 27A70028 */ addiu $a3, $sp, 0x28 +/* A67F78 80240E78 1040000B */ beqz $v0, .L80240EA8 +/* A67F7C 80240E7C 00000000 */ nop +/* A67F80 80240E80 C600001C */ lwc1 $f0, 0x1c($s0) +/* A67F84 80240E84 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* A67F88 80240E88 46000005 */ abs.s $f0, $f0 +/* A67F8C 80240E8C 46000021 */ cvt.d.s $f0, $f0 +/* A67F90 80240E90 46340000 */ add.d $f0, $f0, $f20 +/* A67F94 80240E94 460010A1 */ cvt.d.s $f2, $f2 +/* A67F98 80240E98 4620103E */ c.le.d $f2, $f0 +/* A67F9C 80240E9C 00000000 */ nop +/* A67FA0 80240EA0 45030001 */ bc1tl .L80240EA8 +/* A67FA4 80240EA4 24120001 */ addiu $s2, $zero, 1 +.L80240EA8: +/* A67FA8 80240EA8 56400008 */ bnel $s2, $zero, .L80240ECC +/* A67FAC 80240EAC 2414000A */ addiu $s4, $zero, 0xa +/* A67FB0 80240EB0 C604003C */ lwc1 $f4, 0x3c($s0) +/* A67FB4 80240EB4 C600001C */ lwc1 $f0, 0x1c($s0) +/* A67FB8 80240EB8 46002100 */ add.s $f4, $f4, $f0 +/* A67FBC 80240EBC C6020014 */ lwc1 $f2, 0x14($s0) +/* A67FC0 80240EC0 46020001 */ sub.s $f0, $f0, $f2 +/* A67FC4 80240EC4 E604003C */ swc1 $f4, 0x3c($s0) +/* A67FC8 80240EC8 E600001C */ swc1 $f0, 0x1c($s0) +.L80240ECC: +/* A67FCC 80240ECC 9602008E */ lhu $v0, 0x8e($s0) +/* A67FD0 80240ED0 2442FFFF */ addiu $v0, $v0, -1 +/* A67FD4 80240ED4 A602008E */ sh $v0, 0x8e($s0) +/* A67FD8 80240ED8 00021400 */ sll $v0, $v0, 0x10 +/* A67FDC 80240EDC 58400001 */ blezl $v0, .L80240EE4 +/* A67FE0 80240EE0 2414000B */ addiu $s4, $zero, 0xb +.L80240EE4: +/* A67FE4 80240EE4 12800024 */ beqz $s4, .L80240F78 +/* A67FE8 80240EE8 00000000 */ nop +/* A67FEC 80240EEC AFA00010 */ sw $zero, 0x10($sp) +/* A67FF0 80240EF0 AFA00014 */ sw $zero, 0x14($sp) +/* A67FF4 80240EF4 8E050038 */ lw $a1, 0x38($s0) +/* A67FF8 80240EF8 8E06003C */ lw $a2, 0x3c($s0) +/* A67FFC 80240EFC 8E070040 */ lw $a3, 0x40($s0) +/* A68000 80240F00 0C01BECC */ jal fx_walk_normal +/* A68004 80240F04 24040002 */ addiu $a0, $zero, 2 +/* A68008 80240F08 3C01C47A */ lui $at, 0xc47a +/* A6800C 80240F0C 44810000 */ mtc1 $at, $f0 +/* A68010 80240F10 AE20006C */ sw $zero, 0x6c($s1) +/* A68014 80240F14 8E020000 */ lw $v0, ($s0) +/* A68018 80240F18 0200202D */ daddu $a0, $s0, $zero +/* A6801C 80240F1C AE000038 */ sw $zero, 0x38($s0) +/* A68020 80240F20 AE000040 */ sw $zero, 0x40($s0) +/* A68024 80240F24 34420002 */ ori $v0, $v0, 2 +/* A68028 80240F28 E600003C */ swc1 $f0, 0x3c($s0) +/* A6802C 80240F2C 0C00EAFF */ jal disable_npc_shadow +/* A68030 80240F30 AE020000 */ sw $v0, ($s0) +/* A68034 80240F34 0260202D */ daddu $a0, $s3, $zero +/* A68038 80240F38 3C05FE36 */ lui $a1, 0xfe36 +/* A6803C 80240F3C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A68040 80240F40 24060001 */ addiu $a2, $zero, 1 +/* A68044 80240F44 8E020000 */ lw $v0, ($s0) +/* A68048 80240F48 2403F7FF */ addiu $v1, $zero, -0x801 +/* A6804C 80240F4C 00431024 */ and $v0, $v0, $v1 +/* A68050 80240F50 AE020000 */ sw $v0, ($s0) +/* A68054 80240F54 8E220000 */ lw $v0, ($s1) +/* A68058 80240F58 3C031F00 */ lui $v1, 0x1f00 +/* A6805C 80240F5C 00431025 */ or $v0, $v0, $v1 +/* A68060 80240F60 AE220000 */ sw $v0, ($s1) +/* A68064 80240F64 AC800070 */ sw $zero, 0x70($a0) +.L80240F68: +/* A68068 80240F68 0C0B2026 */ jal set_variable +/* A6806C 80240F6C 00000000 */ nop +/* A68070 80240F70 080903EA */ j .L80240FA8 +/* A68074 80240F74 24020002 */ addiu $v0, $zero, 2 +.L80240F78: +/* A68078 80240F78 8E220070 */ lw $v0, 0x70($s1) +/* A6807C 80240F7C 30420001 */ andi $v0, $v0, 1 +/* A68080 80240F80 10400009 */ beqz $v0, .L80240FA8 +/* A68084 80240F84 0000102D */ daddu $v0, $zero, $zero +/* A68088 80240F88 C600004C */ lwc1 $f0, 0x4c($s0) +/* A6808C 80240F8C 3C01404E */ lui $at, 0x404e +/* A68090 80240F90 44811800 */ mtc1 $at, $f3 +/* A68094 80240F94 44801000 */ mtc1 $zero, $f2 +/* A68098 80240F98 46000021 */ cvt.d.s $f0, $f0 +/* A6809C 80240F9C 46220000 */ add.d $f0, $f0, $f2 +/* A680A0 80240FA0 46200020 */ cvt.s.d $f0, $f0 +/* A680A4 80240FA4 E600004C */ swc1 $f0, 0x4c($s0) +.L80240FA8: +/* A680A8 80240FA8 8FBF0044 */ lw $ra, 0x44($sp) +/* A680AC 80240FAC 8FB40040 */ lw $s4, 0x40($sp) +/* A680B0 80240FB0 8FB3003C */ lw $s3, 0x3c($sp) +/* A680B4 80240FB4 8FB20038 */ lw $s2, 0x38($sp) +/* A680B8 80240FB8 8FB10034 */ lw $s1, 0x34($sp) +/* A680BC 80240FBC 8FB00030 */ lw $s0, 0x30($sp) +/* A680C0 80240FC0 D7B80058 */ ldc1 $f24, 0x58($sp) +/* A680C4 80240FC4 D7B60050 */ ldc1 $f22, 0x50($sp) +/* A680C8 80240FC8 D7B40048 */ ldc1 $f20, 0x48($sp) +/* A680CC 80240FCC 03E00008 */ jr $ra +/* A680D0 80240FD0 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s index db96113509..12cd949e49 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s @@ -159,7 +159,7 @@ glabel func_80240FD4_A680D4 /* A68320 80241220 0260202D */ daddu $a0, $s3, $zero /* A68324 80241224 8E050024 */ lw $a1, 0x24($s0) /* A68328 80241228 8E060028 */ lw $a2, 0x28($s0) -/* A6832C 8024122C 0C0900B4 */ jal func_802402D0 +/* A6832C 8024122C 0C0900B4 */ jal func_802402D0_A673D0 /* A68330 80241230 02A0382D */ daddu $a3, $s5, $zero /* A68334 80241234 8E630070 */ lw $v1, 0x70($s3) /* A68338 80241238 2402000C */ addiu $v0, $zero, 0xc @@ -182,7 +182,7 @@ glabel func_80240FD4_A680D4 /* A68378 80241278 02A0302D */ daddu $a2, $s5, $zero /* A6837C 8024127C 080904B3 */ j .L802412CC /* A68380 80241280 00000000 */ nop -/* A68384 80241284 0C090105 */ jal func_80240414 +/* A68384 80241284 0C090105 */ jal func_80240414_A67514 /* A68388 80241288 0260202D */ daddu $a0, $s3, $zero /* A6838C 8024128C 080904B3 */ j .L802412CC /* A68390 80241290 00000000 */ nop @@ -190,11 +190,11 @@ glabel func_80240FD4_A680D4 /* A68398 80241298 0260202D */ daddu $a0, $s3, $zero /* A6839C 8024129C 080904B3 */ j .L802412CC /* A683A0 802412A0 00000000 */ nop -/* A683A4 802412A4 0C090156 */ jal func_80240558 +/* A683A4 802412A4 0C090156 */ jal func_80240558_A67658 /* A683A8 802412A8 0260202D */ daddu $a0, $s3, $zero /* A683AC 802412AC 080904B3 */ j .L802412CC /* A683B0 802412B0 00000000 */ nop -/* A683B4 802412B4 0C09017E */ jal func_802405F8 +/* A683B4 802412B4 0C09017E */ jal func_802405F8_A676F8 /* A683B8 802412B8 0260202D */ daddu $a0, $s3, $zero /* A683BC 802412BC 080904B3 */ j .L802412CC /* A683C0 802412C0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4.s deleted file mode 100644 index fabf48033c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412F4 -/* A683F4 802412F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A683F8 802412F8 3C05FE36 */ lui $a1, 0xfe36 -/* A683FC 802412FC AFBF0010 */ sw $ra, 0x10($sp) -/* A68400 80241300 8C820148 */ lw $v0, 0x148($a0) -/* A68404 80241304 3C06800B */ lui $a2, 0x800b -/* A68408 80241308 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A6840C 8024130C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A68410 80241310 00C23026 */ xor $a2, $a2, $v0 -/* A68414 80241314 0C0B2026 */ jal set_variable -/* A68418 80241318 2CC60001 */ sltiu $a2, $a2, 1 -/* A6841C 8024131C 8FBF0010 */ lw $ra, 0x10($sp) -/* A68420 80241320 24020002 */ addiu $v0, $zero, 2 -/* A68424 80241324 03E00008 */ jr $ra -/* A68428 80241328 27BD0018 */ addiu $sp, $sp, 0x18 -/* A6842C 8024132C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s new file mode 100644 index 0000000000..b62c620db6 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412F4_A683F4 +/* A683F4 802412F4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A683F8 802412F8 3C05FE36 */ lui $a1, 0xfe36 +/* A683FC 802412FC AFBF0010 */ sw $ra, 0x10($sp) +/* A68400 80241300 8C820148 */ lw $v0, 0x148($a0) +/* A68404 80241304 3C06800B */ lui $a2, 0x800b +/* A68408 80241308 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A6840C 8024130C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A68410 80241310 00C23026 */ xor $a2, $a2, $v0 +/* A68414 80241314 0C0B2026 */ jal set_variable +/* A68418 80241318 2CC60001 */ sltiu $a2, $a2, 1 +/* A6841C 8024131C 8FBF0010 */ lw $ra, 0x10($sp) +/* A68420 80241320 24020002 */ addiu $v0, $zero, 2 +/* A68424 80241324 03E00008 */ jr $ra +/* A68428 80241328 27BD0018 */ addiu $sp, $sp, 0x18 +/* A6842C 8024132C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204.s b/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204.s deleted file mode 100644 index 7116aa568a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240204 -/* A6CD04 80240204 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A6CD08 80240208 AFB00010 */ sw $s0, 0x10($sp) -/* A6CD0C 8024020C 0080802D */ daddu $s0, $a0, $zero -/* A6CD10 80240210 10A00005 */ beqz $a1, .L80240228 -/* A6CD14 80240214 AFBF0014 */ sw $ra, 0x14($sp) -/* A6CD18 80240218 AE000070 */ sw $zero, 0x70($s0) -/* A6CD1C 8024021C AE000074 */ sw $zero, 0x74($s0) -/* A6CD20 80240220 AE000078 */ sw $zero, 0x78($s0) -/* A6CD24 80240224 AE00007C */ sw $zero, 0x7c($s0) -.L80240228: -/* A6CD28 80240228 8E020070 */ lw $v0, 0x70($s0) -/* A6CD2C 8024022C 1440000E */ bnez $v0, .L80240268 -/* A6CD30 80240230 00000000 */ nop -/* A6CD34 80240234 8E0300A8 */ lw $v1, 0xa8($s0) -/* A6CD38 80240238 8E020088 */ lw $v0, 0x88($s0) -/* A6CD3C 8024023C 00621821 */ addu $v1, $v1, $v0 -/* A6CD40 80240240 04610004 */ bgez $v1, .L80240254 -/* A6CD44 80240244 AE0300A8 */ sw $v1, 0xa8($s0) -/* A6CD48 80240248 3C020002 */ lui $v0, 2 -/* A6CD4C 8024024C 08090099 */ j .L80240264 -/* A6CD50 80240250 00621021 */ addu $v0, $v1, $v0 -.L80240254: -/* A6CD54 80240254 3C040002 */ lui $a0, 2 -/* A6CD58 80240258 0083102A */ slt $v0, $a0, $v1 -/* A6CD5C 8024025C 10400002 */ beqz $v0, .L80240268 -/* A6CD60 80240260 00641023 */ subu $v0, $v1, $a0 -.L80240264: -/* A6CD64 80240264 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240268: -/* A6CD68 80240268 8E020074 */ lw $v0, 0x74($s0) -/* A6CD6C 8024026C 1440000E */ bnez $v0, .L802402A8 -/* A6CD70 80240270 00000000 */ nop -/* A6CD74 80240274 8E0300AC */ lw $v1, 0xac($s0) -/* A6CD78 80240278 8E02008C */ lw $v0, 0x8c($s0) -/* A6CD7C 8024027C 00621821 */ addu $v1, $v1, $v0 -/* A6CD80 80240280 04610004 */ bgez $v1, .L80240294 -/* A6CD84 80240284 AE0300AC */ sw $v1, 0xac($s0) -/* A6CD88 80240288 3C020002 */ lui $v0, 2 -/* A6CD8C 8024028C 080900A9 */ j .L802402A4 -/* A6CD90 80240290 00621021 */ addu $v0, $v1, $v0 -.L80240294: -/* A6CD94 80240294 3C040002 */ lui $a0, 2 -/* A6CD98 80240298 0083102A */ slt $v0, $a0, $v1 -/* A6CD9C 8024029C 10400002 */ beqz $v0, .L802402A8 -/* A6CDA0 802402A0 00641023 */ subu $v0, $v1, $a0 -.L802402A4: -/* A6CDA4 802402A4 AE0200AC */ sw $v0, 0xac($s0) -.L802402A8: -/* A6CDA8 802402A8 8E020078 */ lw $v0, 0x78($s0) -/* A6CDAC 802402AC 1440000E */ bnez $v0, .L802402E8 -/* A6CDB0 802402B0 00000000 */ nop -/* A6CDB4 802402B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* A6CDB8 802402B8 8E020090 */ lw $v0, 0x90($s0) -/* A6CDBC 802402BC 00621821 */ addu $v1, $v1, $v0 -/* A6CDC0 802402C0 04610004 */ bgez $v1, .L802402D4 -/* A6CDC4 802402C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* A6CDC8 802402C8 3C020002 */ lui $v0, 2 -/* A6CDCC 802402CC 080900B9 */ j .L802402E4 -/* A6CDD0 802402D0 00621021 */ addu $v0, $v1, $v0 -.L802402D4: -/* A6CDD4 802402D4 3C040002 */ lui $a0, 2 -/* A6CDD8 802402D8 0083102A */ slt $v0, $a0, $v1 -/* A6CDDC 802402DC 10400002 */ beqz $v0, .L802402E8 -/* A6CDE0 802402E0 00641023 */ subu $v0, $v1, $a0 -.L802402E4: -/* A6CDE4 802402E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802402E8: -/* A6CDE8 802402E8 8E02007C */ lw $v0, 0x7c($s0) -/* A6CDEC 802402EC 1440000E */ bnez $v0, .L80240328 -/* A6CDF0 802402F0 00000000 */ nop -/* A6CDF4 802402F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* A6CDF8 802402F8 8E020094 */ lw $v0, 0x94($s0) -/* A6CDFC 802402FC 00621821 */ addu $v1, $v1, $v0 -/* A6CE00 80240300 04610004 */ bgez $v1, .L80240314 -/* A6CE04 80240304 AE0300B4 */ sw $v1, 0xb4($s0) -/* A6CE08 80240308 3C020002 */ lui $v0, 2 -/* A6CE0C 8024030C 080900C9 */ j .L80240324 -/* A6CE10 80240310 00621021 */ addu $v0, $v1, $v0 -.L80240314: -/* A6CE14 80240314 3C040002 */ lui $a0, 2 -/* A6CE18 80240318 0083102A */ slt $v0, $a0, $v1 -/* A6CE1C 8024031C 10400002 */ beqz $v0, .L80240328 -/* A6CE20 80240320 00641023 */ subu $v0, $v1, $a0 -.L80240324: -/* A6CE24 80240324 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240328: -/* A6CE28 80240328 8E040084 */ lw $a0, 0x84($s0) -/* A6CE2C 8024032C 0C046F07 */ jal set_main_pan_u -/* A6CE30 80240330 8E0500A8 */ lw $a1, 0xa8($s0) -/* A6CE34 80240334 8E040084 */ lw $a0, 0x84($s0) -/* A6CE38 80240338 0C046F0D */ jal set_main_pan_v -/* A6CE3C 8024033C 8E0500AC */ lw $a1, 0xac($s0) -/* A6CE40 80240340 8E040084 */ lw $a0, 0x84($s0) -/* A6CE44 80240344 0C046F13 */ jal set_aux_pan_u -/* A6CE48 80240348 8E0500B0 */ lw $a1, 0xb0($s0) -/* A6CE4C 8024034C 8E040084 */ lw $a0, 0x84($s0) -/* A6CE50 80240350 0C046F19 */ jal set_aux_pan_v -/* A6CE54 80240354 8E0500B4 */ lw $a1, 0xb4($s0) -/* A6CE58 80240358 8E020070 */ lw $v0, 0x70($s0) -/* A6CE5C 8024035C 8E030078 */ lw $v1, 0x78($s0) -/* A6CE60 80240360 8E040098 */ lw $a0, 0x98($s0) -/* A6CE64 80240364 24420001 */ addiu $v0, $v0, 1 -/* A6CE68 80240368 AE020070 */ sw $v0, 0x70($s0) -/* A6CE6C 8024036C 8E020074 */ lw $v0, 0x74($s0) -/* A6CE70 80240370 24630001 */ addiu $v1, $v1, 1 -/* A6CE74 80240374 AE030078 */ sw $v1, 0x78($s0) -/* A6CE78 80240378 8E030070 */ lw $v1, 0x70($s0) -/* A6CE7C 8024037C 24420001 */ addiu $v0, $v0, 1 -/* A6CE80 80240380 AE020074 */ sw $v0, 0x74($s0) -/* A6CE84 80240384 8E02007C */ lw $v0, 0x7c($s0) -/* A6CE88 80240388 0064182A */ slt $v1, $v1, $a0 -/* A6CE8C 8024038C 24420001 */ addiu $v0, $v0, 1 -/* A6CE90 80240390 14600002 */ bnez $v1, .L8024039C -/* A6CE94 80240394 AE02007C */ sw $v0, 0x7c($s0) -/* A6CE98 80240398 AE000070 */ sw $zero, 0x70($s0) -.L8024039C: -/* A6CE9C 8024039C 8E020074 */ lw $v0, 0x74($s0) -/* A6CEA0 802403A0 8E03009C */ lw $v1, 0x9c($s0) -/* A6CEA4 802403A4 0043102A */ slt $v0, $v0, $v1 -/* A6CEA8 802403A8 50400001 */ beql $v0, $zero, .L802403B0 -/* A6CEAC 802403AC AE000074 */ sw $zero, 0x74($s0) -.L802403B0: -/* A6CEB0 802403B0 8E020078 */ lw $v0, 0x78($s0) -/* A6CEB4 802403B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* A6CEB8 802403B8 0043102A */ slt $v0, $v0, $v1 -/* A6CEBC 802403BC 50400001 */ beql $v0, $zero, .L802403C4 -/* A6CEC0 802403C0 AE000078 */ sw $zero, 0x78($s0) -.L802403C4: -/* A6CEC4 802403C4 8E02007C */ lw $v0, 0x7c($s0) -/* A6CEC8 802403C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* A6CECC 802403CC 0043102A */ slt $v0, $v0, $v1 -/* A6CED0 802403D0 50400001 */ beql $v0, $zero, .L802403D8 -/* A6CED4 802403D4 AE00007C */ sw $zero, 0x7c($s0) -.L802403D8: -/* A6CED8 802403D8 8FBF0014 */ lw $ra, 0x14($sp) -/* A6CEDC 802403DC 8FB00010 */ lw $s0, 0x10($sp) -/* A6CEE0 802403E0 0000102D */ daddu $v0, $zero, $zero -/* A6CEE4 802403E4 03E00008 */ jr $ra -/* A6CEE8 802403E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A6CEEC 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204_A6CD04.s b/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204_A6CD04.s new file mode 100644 index 0000000000..70fcbaeaa3 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_60/A6CBE0/func_80240204_A6CD04.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240204_A6CD04 +/* A6CD04 80240204 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A6CD08 80240208 AFB00010 */ sw $s0, 0x10($sp) +/* A6CD0C 8024020C 0080802D */ daddu $s0, $a0, $zero +/* A6CD10 80240210 10A00005 */ beqz $a1, .L80240228 +/* A6CD14 80240214 AFBF0014 */ sw $ra, 0x14($sp) +/* A6CD18 80240218 AE000070 */ sw $zero, 0x70($s0) +/* A6CD1C 8024021C AE000074 */ sw $zero, 0x74($s0) +/* A6CD20 80240220 AE000078 */ sw $zero, 0x78($s0) +/* A6CD24 80240224 AE00007C */ sw $zero, 0x7c($s0) +.L80240228: +/* A6CD28 80240228 8E020070 */ lw $v0, 0x70($s0) +/* A6CD2C 8024022C 1440000E */ bnez $v0, .L80240268 +/* A6CD30 80240230 00000000 */ nop +/* A6CD34 80240234 8E0300A8 */ lw $v1, 0xa8($s0) +/* A6CD38 80240238 8E020088 */ lw $v0, 0x88($s0) +/* A6CD3C 8024023C 00621821 */ addu $v1, $v1, $v0 +/* A6CD40 80240240 04610004 */ bgez $v1, .L80240254 +/* A6CD44 80240244 AE0300A8 */ sw $v1, 0xa8($s0) +/* A6CD48 80240248 3C020002 */ lui $v0, 2 +/* A6CD4C 8024024C 08090099 */ j .L80240264 +/* A6CD50 80240250 00621021 */ addu $v0, $v1, $v0 +.L80240254: +/* A6CD54 80240254 3C040002 */ lui $a0, 2 +/* A6CD58 80240258 0083102A */ slt $v0, $a0, $v1 +/* A6CD5C 8024025C 10400002 */ beqz $v0, .L80240268 +/* A6CD60 80240260 00641023 */ subu $v0, $v1, $a0 +.L80240264: +/* A6CD64 80240264 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240268: +/* A6CD68 80240268 8E020074 */ lw $v0, 0x74($s0) +/* A6CD6C 8024026C 1440000E */ bnez $v0, .L802402A8 +/* A6CD70 80240270 00000000 */ nop +/* A6CD74 80240274 8E0300AC */ lw $v1, 0xac($s0) +/* A6CD78 80240278 8E02008C */ lw $v0, 0x8c($s0) +/* A6CD7C 8024027C 00621821 */ addu $v1, $v1, $v0 +/* A6CD80 80240280 04610004 */ bgez $v1, .L80240294 +/* A6CD84 80240284 AE0300AC */ sw $v1, 0xac($s0) +/* A6CD88 80240288 3C020002 */ lui $v0, 2 +/* A6CD8C 8024028C 080900A9 */ j .L802402A4 +/* A6CD90 80240290 00621021 */ addu $v0, $v1, $v0 +.L80240294: +/* A6CD94 80240294 3C040002 */ lui $a0, 2 +/* A6CD98 80240298 0083102A */ slt $v0, $a0, $v1 +/* A6CD9C 8024029C 10400002 */ beqz $v0, .L802402A8 +/* A6CDA0 802402A0 00641023 */ subu $v0, $v1, $a0 +.L802402A4: +/* A6CDA4 802402A4 AE0200AC */ sw $v0, 0xac($s0) +.L802402A8: +/* A6CDA8 802402A8 8E020078 */ lw $v0, 0x78($s0) +/* A6CDAC 802402AC 1440000E */ bnez $v0, .L802402E8 +/* A6CDB0 802402B0 00000000 */ nop +/* A6CDB4 802402B4 8E0300B0 */ lw $v1, 0xb0($s0) +/* A6CDB8 802402B8 8E020090 */ lw $v0, 0x90($s0) +/* A6CDBC 802402BC 00621821 */ addu $v1, $v1, $v0 +/* A6CDC0 802402C0 04610004 */ bgez $v1, .L802402D4 +/* A6CDC4 802402C4 AE0300B0 */ sw $v1, 0xb0($s0) +/* A6CDC8 802402C8 3C020002 */ lui $v0, 2 +/* A6CDCC 802402CC 080900B9 */ j .L802402E4 +/* A6CDD0 802402D0 00621021 */ addu $v0, $v1, $v0 +.L802402D4: +/* A6CDD4 802402D4 3C040002 */ lui $a0, 2 +/* A6CDD8 802402D8 0083102A */ slt $v0, $a0, $v1 +/* A6CDDC 802402DC 10400002 */ beqz $v0, .L802402E8 +/* A6CDE0 802402E0 00641023 */ subu $v0, $v1, $a0 +.L802402E4: +/* A6CDE4 802402E4 AE0200B0 */ sw $v0, 0xb0($s0) +.L802402E8: +/* A6CDE8 802402E8 8E02007C */ lw $v0, 0x7c($s0) +/* A6CDEC 802402EC 1440000E */ bnez $v0, .L80240328 +/* A6CDF0 802402F0 00000000 */ nop +/* A6CDF4 802402F4 8E0300B4 */ lw $v1, 0xb4($s0) +/* A6CDF8 802402F8 8E020094 */ lw $v0, 0x94($s0) +/* A6CDFC 802402FC 00621821 */ addu $v1, $v1, $v0 +/* A6CE00 80240300 04610004 */ bgez $v1, .L80240314 +/* A6CE04 80240304 AE0300B4 */ sw $v1, 0xb4($s0) +/* A6CE08 80240308 3C020002 */ lui $v0, 2 +/* A6CE0C 8024030C 080900C9 */ j .L80240324 +/* A6CE10 80240310 00621021 */ addu $v0, $v1, $v0 +.L80240314: +/* A6CE14 80240314 3C040002 */ lui $a0, 2 +/* A6CE18 80240318 0083102A */ slt $v0, $a0, $v1 +/* A6CE1C 8024031C 10400002 */ beqz $v0, .L80240328 +/* A6CE20 80240320 00641023 */ subu $v0, $v1, $a0 +.L80240324: +/* A6CE24 80240324 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240328: +/* A6CE28 80240328 8E040084 */ lw $a0, 0x84($s0) +/* A6CE2C 8024032C 0C046F07 */ jal set_main_pan_u +/* A6CE30 80240330 8E0500A8 */ lw $a1, 0xa8($s0) +/* A6CE34 80240334 8E040084 */ lw $a0, 0x84($s0) +/* A6CE38 80240338 0C046F0D */ jal set_main_pan_v +/* A6CE3C 8024033C 8E0500AC */ lw $a1, 0xac($s0) +/* A6CE40 80240340 8E040084 */ lw $a0, 0x84($s0) +/* A6CE44 80240344 0C046F13 */ jal set_aux_pan_u +/* A6CE48 80240348 8E0500B0 */ lw $a1, 0xb0($s0) +/* A6CE4C 8024034C 8E040084 */ lw $a0, 0x84($s0) +/* A6CE50 80240350 0C046F19 */ jal set_aux_pan_v +/* A6CE54 80240354 8E0500B4 */ lw $a1, 0xb4($s0) +/* A6CE58 80240358 8E020070 */ lw $v0, 0x70($s0) +/* A6CE5C 8024035C 8E030078 */ lw $v1, 0x78($s0) +/* A6CE60 80240360 8E040098 */ lw $a0, 0x98($s0) +/* A6CE64 80240364 24420001 */ addiu $v0, $v0, 1 +/* A6CE68 80240368 AE020070 */ sw $v0, 0x70($s0) +/* A6CE6C 8024036C 8E020074 */ lw $v0, 0x74($s0) +/* A6CE70 80240370 24630001 */ addiu $v1, $v1, 1 +/* A6CE74 80240374 AE030078 */ sw $v1, 0x78($s0) +/* A6CE78 80240378 8E030070 */ lw $v1, 0x70($s0) +/* A6CE7C 8024037C 24420001 */ addiu $v0, $v0, 1 +/* A6CE80 80240380 AE020074 */ sw $v0, 0x74($s0) +/* A6CE84 80240384 8E02007C */ lw $v0, 0x7c($s0) +/* A6CE88 80240388 0064182A */ slt $v1, $v1, $a0 +/* A6CE8C 8024038C 24420001 */ addiu $v0, $v0, 1 +/* A6CE90 80240390 14600002 */ bnez $v1, .L8024039C +/* A6CE94 80240394 AE02007C */ sw $v0, 0x7c($s0) +/* A6CE98 80240398 AE000070 */ sw $zero, 0x70($s0) +.L8024039C: +/* A6CE9C 8024039C 8E020074 */ lw $v0, 0x74($s0) +/* A6CEA0 802403A0 8E03009C */ lw $v1, 0x9c($s0) +/* A6CEA4 802403A4 0043102A */ slt $v0, $v0, $v1 +/* A6CEA8 802403A8 50400001 */ beql $v0, $zero, .L802403B0 +/* A6CEAC 802403AC AE000074 */ sw $zero, 0x74($s0) +.L802403B0: +/* A6CEB0 802403B0 8E020078 */ lw $v0, 0x78($s0) +/* A6CEB4 802403B4 8E0300A0 */ lw $v1, 0xa0($s0) +/* A6CEB8 802403B8 0043102A */ slt $v0, $v0, $v1 +/* A6CEBC 802403BC 50400001 */ beql $v0, $zero, .L802403C4 +/* A6CEC0 802403C0 AE000078 */ sw $zero, 0x78($s0) +.L802403C4: +/* A6CEC4 802403C4 8E02007C */ lw $v0, 0x7c($s0) +/* A6CEC8 802403C8 8E0300A4 */ lw $v1, 0xa4($s0) +/* A6CECC 802403CC 0043102A */ slt $v0, $v0, $v1 +/* A6CED0 802403D0 50400001 */ beql $v0, $zero, .L802403D8 +/* A6CED4 802403D4 AE00007C */ sw $zero, 0x7c($s0) +.L802403D8: +/* A6CED8 802403D8 8FBF0014 */ lw $ra, 0x14($sp) +/* A6CEDC 802403DC 8FB00010 */ lw $s0, 0x10($sp) +/* A6CEE0 802403E0 0000102D */ daddu $v0, $zero, $zero +/* A6CEE4 802403E4 03E00008 */ jr $ra +/* A6CEE8 802403E8 27BD0018 */ addiu $sp, $sp, 0x18 +/* A6CEEC 802403EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s index c6b2a00be6..dae6743224 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802406A4_A6EA84.s @@ -232,25 +232,25 @@ glabel func_802406A4_A6EA84 .L802409F4: /* A6EDD4 802409F4 0260202D */ daddu $a0, $s3, $zero /* A6EDD8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A6EDDC 802409FC 0C0900C4 */ jal func_80240310 +/* A6EDDC 802409FC 0C0900C4 */ jal func_80240310_A6E6F0 /* A6EDE0 80240A00 02A0302D */ daddu $a2, $s5, $zero /* A6EDE4 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: /* A6EDE8 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A6EDEC 80240A0C 0C0900E3 */ jal func_8024038C +/* A6EDEC 80240A0C 0C0900E3 */ jal func_8024038C_A6E76C /* A6EDF0 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A6EDF4 80240A14 08090294 */ j .L80240A50 /* A6EDF8 80240A18 00000000 */ nop .L80240A1C: /* A6EDFC 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A6EE00 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A6EE04 80240A24 0C090130 */ jal func_802404C0 +/* A6EE04 80240A24 0C090130 */ jal func_802404C0_A6E8A0 /* A6EE08 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A6EE0C 80240A2C 08090294 */ j .L80240A50 /* A6EE10 80240A30 00000000 */ nop .L80240A34: /* A6EE14 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A6EE18 80240A38 0C090189 */ jal func_80240624 +/* A6EE18 80240A38 0C090189 */ jal func_80240624_A6EA04 /* A6EE1C 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A6EE20 80240A40 08090294 */ j .L80240A50 /* A6EE24 80240A44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s index b61daa5072..781060ade8 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241200_A6F5E0.s @@ -49,7 +49,7 @@ glabel func_80241200_A6F5E0 /* A6F690 802412B0 0280202D */ daddu $a0, $s4, $zero /* A6F694 802412B4 8E250024 */ lw $a1, 0x24($s1) /* A6F698 802412B8 8E260028 */ lw $a2, 0x28($s1) -/* A6F69C 802412BC 0C0902B9 */ jal func_80240AE4 +/* A6F69C 802412BC 0C0902B9 */ jal func_80240AE4_A6EEC4 /* A6F6A0 802412C0 0240382D */ daddu $a3, $s2, $zero /* A6F6A4 802412C4 24030001 */ addiu $v1, $zero, 1 /* A6F6A8 802412C8 1443001E */ bne $v0, $v1, .L80241344 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C.s deleted file mode 100644 index 97d2acacf4..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C.s +++ /dev/null @@ -1,269 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024138C -/* A6F76C 8024138C 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* A6F770 80241390 AFB60048 */ sw $s6, 0x48($sp) -/* A6F774 80241394 0080B02D */ daddu $s6, $a0, $zero -/* A6F778 80241398 AFBF004C */ sw $ra, 0x4c($sp) -/* A6F77C 8024139C AFB50044 */ sw $s5, 0x44($sp) -/* A6F780 802413A0 AFB40040 */ sw $s4, 0x40($sp) -/* A6F784 802413A4 AFB3003C */ sw $s3, 0x3c($sp) -/* A6F788 802413A8 AFB20038 */ sw $s2, 0x38($sp) -/* A6F78C 802413AC AFB10034 */ sw $s1, 0x34($sp) -/* A6F790 802413B0 AFB00030 */ sw $s0, 0x30($sp) -/* A6F794 802413B4 F7B60058 */ sdc1 $f22, 0x58($sp) -/* A6F798 802413B8 F7B40050 */ sdc1 $f20, 0x50($sp) -/* A6F79C 802413BC 8ED50148 */ lw $s5, 0x148($s6) -/* A6F7A0 802413C0 86A40008 */ lh $a0, 8($s5) -/* A6F7A4 802413C4 0C00EABB */ jal get_npc_unsafe -/* A6F7A8 802413C8 0000982D */ daddu $s3, $zero, $zero -/* A6F7AC 802413CC 0040802D */ daddu $s0, $v0, $zero -/* A6F7B0 802413D0 9602008E */ lhu $v0, 0x8e($s0) -/* A6F7B4 802413D4 2442FFFF */ addiu $v0, $v0, -1 -/* A6F7B8 802413D8 A602008E */ sh $v0, 0x8e($s0) -/* A6F7BC 802413DC 00021400 */ sll $v0, $v0, 0x10 -/* A6F7C0 802413E0 1C4000DA */ bgtz $v0, .L8024174C -/* A6F7C4 802413E4 0260A02D */ daddu $s4, $s3, $zero -/* A6F7C8 802413E8 0C00A67F */ jal rand_int -/* A6F7CC 802413EC 2404001E */ addiu $a0, $zero, 0x1e -/* A6F7D0 802413F0 0260902D */ daddu $s2, $s3, $zero -/* A6F7D4 802413F4 8EA400D0 */ lw $a0, 0xd0($s5) -/* A6F7D8 802413F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A6F7DC 802413FC 3C018024 */ lui $at, 0x8024 -/* A6F7E0 80241400 D4363D70 */ ldc1 $f22, 0x3d70($at) -/* A6F7E4 80241404 C4820000 */ lwc1 $f2, ($a0) -/* A6F7E8 80241408 468010A0 */ cvt.s.w $f2, $f2 -/* A6F7EC 8024140C C4840008 */ lwc1 $f4, 8($a0) -/* A6F7F0 80241410 46802120 */ cvt.s.w $f4, $f4 -/* A6F7F4 80241414 E7A00010 */ swc1 $f0, 0x10($sp) -/* A6F7F8 80241418 8EA300D0 */ lw $v1, 0xd0($s5) -/* A6F7FC 8024141C 44051000 */ mfc1 $a1, $f2 -/* A6F800 80241420 C460000C */ lwc1 $f0, 0xc($v1) -/* A6F804 80241424 46800020 */ cvt.s.w $f0, $f0 -/* A6F808 80241428 E7A00014 */ swc1 $f0, 0x14($sp) -/* A6F80C 8024142C 8EA300D0 */ lw $v1, 0xd0($s5) -/* A6F810 80241430 44062000 */ mfc1 $a2, $f4 -/* A6F814 80241434 C4600010 */ lwc1 $f0, 0x10($v1) -/* A6F818 80241438 46800020 */ cvt.s.w $f0, $f0 -/* A6F81C 8024143C E7A00018 */ swc1 $f0, 0x18($sp) -/* A6F820 80241440 44820000 */ mtc1 $v0, $f0 -/* A6F824 80241444 00000000 */ nop -/* A6F828 80241448 46800021 */ cvt.d.w $f0, $f0 -/* A6F82C 8024144C 46360000 */ add.d $f0, $f0, $f22 -/* A6F830 80241450 8C840018 */ lw $a0, 0x18($a0) -/* A6F834 80241454 8E070038 */ lw $a3, 0x38($s0) -/* A6F838 80241458 0C0123F5 */ jal is_point_within_region -/* A6F83C 8024145C 46200520 */ cvt.s.d $f20, $f0 -/* A6F840 80241460 10400023 */ beqz $v0, .L802414F0 -/* A6F844 80241464 00000000 */ nop -/* A6F848 80241468 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6F84C 8024146C 8EA200D0 */ lw $v0, 0xd0($s5) -/* A6F850 80241470 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6F854 80241474 C44A0000 */ lwc1 $f10, ($v0) -/* A6F858 80241478 468052A0 */ cvt.s.w $f10, $f10 -/* A6F85C 8024147C 44065000 */ mfc1 $a2, $f10 -/* A6F860 80241480 C44A0008 */ lwc1 $f10, 8($v0) -/* A6F864 80241484 468052A0 */ cvt.s.w $f10, $f10 -/* A6F868 80241488 44075000 */ mfc1 $a3, $f10 -/* A6F86C 8024148C 0C00A720 */ jal atan2 -/* A6F870 80241490 00000000 */ nop -/* A6F874 80241494 44931000 */ mtc1 $s3, $f2 -/* A6F878 80241498 00000000 */ nop -/* A6F87C 8024149C 468010A0 */ cvt.s.w $f2, $f2 -/* A6F880 802414A0 46020001 */ sub.s $f0, $f0, $f2 -/* A6F884 802414A4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6F888 802414A8 E600000C */ swc1 $f0, 0xc($s0) -/* A6F88C 802414AC 8EA200D0 */ lw $v0, 0xd0($s5) -/* A6F890 802414B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6F894 802414B4 C44A0000 */ lwc1 $f10, ($v0) -/* A6F898 802414B8 468052A0 */ cvt.s.w $f10, $f10 -/* A6F89C 802414BC 44065000 */ mfc1 $a2, $f10 -/* A6F8A0 802414C0 C44A0008 */ lwc1 $f10, 8($v0) -/* A6F8A4 802414C4 468052A0 */ cvt.s.w $f10, $f10 -/* A6F8A8 802414C8 44075000 */ mfc1 $a3, $f10 -/* A6F8AC 802414CC 0C00A7B5 */ jal dist2D -/* A6F8B0 802414D0 00000000 */ nop -/* A6F8B4 802414D4 46000106 */ mov.s $f4, $f0 -/* A6F8B8 802414D8 4614003C */ c.lt.s $f0, $f20 -/* A6F8BC 802414DC 00000000 */ nop -/* A6F8C0 802414E0 4503006A */ bc1tl .L8024168C -/* A6F8C4 802414E4 46002506 */ mov.s $f20, $f4 -/* A6F8C8 802414E8 080905A4 */ j .L80241690 -/* A6F8CC 802414EC 27A40020 */ addiu $a0, $sp, 0x20 -.L802414F0: -/* A6F8D0 802414F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6F8D4 802414F4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A6F8D8 802414F8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A6F8DC 802414FC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6F8E0 80241500 8C460028 */ lw $a2, 0x28($v0) -/* A6F8E4 80241504 0C00A720 */ jal atan2 -/* A6F8E8 80241508 8C470030 */ lw $a3, 0x30($v0) -/* A6F8EC 8024150C 460000A1 */ cvt.d.s $f2, $f0 -/* A6F8F0 80241510 4636103C */ c.lt.d $f2, $f22 -/* A6F8F4 80241514 00000000 */ nop -/* A6F8F8 80241518 45000006 */ bc1f .L80241534 -/* A6F8FC 8024151C E600000C */ swc1 $f0, 0xc($s0) -/* A6F900 80241520 0C00A67F */ jal rand_int -/* A6F904 80241524 2404000A */ addiu $a0, $zero, 0xa -/* A6F908 80241528 3C018024 */ lui $at, 0x8024 -/* A6F90C 8024152C 08090551 */ j .L80241544 -/* A6F910 80241530 D4203D78 */ ldc1 $f0, 0x3d78($at) -.L80241534: -/* A6F914 80241534 0C00A67F */ jal rand_int -/* A6F918 80241538 2404000A */ addiu $a0, $zero, 0xa -/* A6F91C 8024153C 3C018024 */ lui $at, 0x8024 -/* A6F920 80241540 D4203D80 */ ldc1 $f0, 0x3d80($at) -.L80241544: -/* A6F924 80241544 44821000 */ mtc1 $v0, $f2 -/* A6F928 80241548 00000000 */ nop -/* A6F92C 8024154C 468010A1 */ cvt.d.w $f2, $f2 -/* A6F930 80241550 46201080 */ add.d $f2, $f2, $f0 -/* A6F934 80241554 3C014014 */ lui $at, 0x4014 -/* A6F938 80241558 44810800 */ mtc1 $at, $f1 -/* A6F93C 8024155C 44800000 */ mtc1 $zero, $f0 -/* A6F940 80241560 00000000 */ nop -/* A6F944 80241564 46201081 */ sub.d $f2, $f2, $f0 -/* A6F948 80241568 462015A0 */ cvt.s.d $f22, $f2 -/* A6F94C 8024156C 00141080 */ sll $v0, $s4, 2 -/* A6F950 80241570 00548821 */ addu $s1, $v0, $s4 -.L80241574: -/* A6F954 80241574 12400006 */ beqz $s2, .L80241590 -/* A6F958 80241578 00000000 */ nop -/* A6F95C 8024157C 44910000 */ mtc1 $s1, $f0 -/* A6F960 80241580 00000000 */ nop -/* A6F964 80241584 46800020 */ cvt.s.w $f0, $f0 -/* A6F968 80241588 08090568 */ j .L802415A0 -/* A6F96C 8024158C 4600B000 */ add.s $f0, $f22, $f0 -.L80241590: -/* A6F970 80241590 44910000 */ mtc1 $s1, $f0 -/* A6F974 80241594 00000000 */ nop -/* A6F978 80241598 46800020 */ cvt.s.w $f0, $f0 -/* A6F97C 8024159C 4600B001 */ sub.s $f0, $f22, $f0 -.L802415A0: -/* A6F980 802415A0 E600000C */ swc1 $f0, 0xc($s0) -/* A6F984 802415A4 C6000038 */ lwc1 $f0, 0x38($s0) -/* A6F988 802415A8 C602003C */ lwc1 $f2, 0x3c($s0) -/* A6F98C 802415AC C6040040 */ lwc1 $f4, 0x40($s0) -/* A6F990 802415B0 0000202D */ daddu $a0, $zero, $zero -/* A6F994 802415B4 E7A00020 */ swc1 $f0, 0x20($sp) -/* A6F998 802415B8 E7A20024 */ swc1 $f2, 0x24($sp) -/* A6F99C 802415BC E7A40028 */ swc1 $f4, 0x28($sp) -/* A6F9A0 802415C0 E7B40010 */ swc1 $f20, 0x10($sp) -/* A6F9A4 802415C4 C600000C */ lwc1 $f0, 0xc($s0) -/* A6F9A8 802415C8 27A50020 */ addiu $a1, $sp, 0x20 -/* A6F9AC 802415CC E7A00014 */ swc1 $f0, 0x14($sp) -/* A6F9B0 802415D0 860200A8 */ lh $v0, 0xa8($s0) -/* A6F9B4 802415D4 27A60024 */ addiu $a2, $sp, 0x24 -/* A6F9B8 802415D8 44820000 */ mtc1 $v0, $f0 -/* A6F9BC 802415DC 00000000 */ nop -/* A6F9C0 802415E0 46800020 */ cvt.s.w $f0, $f0 -/* A6F9C4 802415E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A6F9C8 802415E8 860200A6 */ lh $v0, 0xa6($s0) -/* A6F9CC 802415EC 27A70028 */ addiu $a3, $sp, 0x28 -/* A6F9D0 802415F0 44820000 */ mtc1 $v0, $f0 -/* A6F9D4 802415F4 00000000 */ nop -/* A6F9D8 802415F8 46800020 */ cvt.s.w $f0, $f0 -/* A6F9DC 802415FC 0C0376B9 */ jal func_800DDAE4 -/* A6F9E0 80241600 E7A0001C */ swc1 $f0, 0x1c($sp) -/* A6F9E4 80241604 50400014 */ beql $v0, $zero, .L80241658 -/* A6F9E8 80241608 24130002 */ addiu $s3, $zero, 2 -/* A6F9EC 8024160C C60C0038 */ lwc1 $f12, 0x38($s0) -/* A6F9F0 80241610 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A6F9F4 80241614 8FA60020 */ lw $a2, 0x20($sp) -/* A6F9F8 80241618 0C00A7B5 */ jal dist2D -/* A6F9FC 8024161C 8FA70028 */ lw $a3, 0x28($sp) -/* A6FA00 80241620 46000106 */ mov.s $f4, $f0 -/* A6FA04 80241624 3C014064 */ lui $at, 0x4064 -/* A6FA08 80241628 44811800 */ mtc1 $at, $f3 -/* A6FA0C 8024162C 44801000 */ mtc1 $zero, $f2 -/* A6FA10 80241630 46002021 */ cvt.d.s $f0, $f4 -/* A6FA14 80241634 4620103C */ c.lt.d $f2, $f0 -/* A6FA18 80241638 00000000 */ nop -/* A6FA1C 8024163C 45000006 */ bc1f .L80241658 -/* A6FA20 80241640 00000000 */ nop -/* A6FA24 80241644 4614203C */ c.lt.s $f4, $f20 -/* A6FA28 80241648 00000000 */ nop -/* A6FA2C 8024164C 45030001 */ bc1tl .L80241654 -/* A6FA30 80241650 46002506 */ mov.s $f20, $f4 -.L80241654: -/* A6FA34 80241654 24130001 */ addiu $s3, $zero, 1 -.L80241658: -/* A6FA38 80241658 1660000D */ bnez $s3, .L80241690 -/* A6FA3C 8024165C 27A40020 */ addiu $a0, $sp, 0x20 -/* A6FA40 80241660 56400003 */ bnel $s2, $zero, .L80241670 -/* A6FA44 80241664 26310005 */ addiu $s1, $s1, 5 -/* A6FA48 80241668 0809059E */ j .L80241678 -/* A6FA4C 8024166C 24120001 */ addiu $s2, $zero, 1 -.L80241670: -/* A6FA50 80241670 26940001 */ addiu $s4, $s4, 1 -/* A6FA54 80241674 0000902D */ daddu $s2, $zero, $zero -.L80241678: -/* A6FA58 80241678 2A820007 */ slti $v0, $s4, 7 -/* A6FA5C 8024167C 5040FFBD */ beql $v0, $zero, .L80241574 -/* A6FA60 80241680 24130003 */ addiu $s3, $zero, 3 -/* A6FA64 80241684 0809055D */ j .L80241574 -/* A6FA68 80241688 00000000 */ nop -.L8024168C: -/* A6FA6C 8024168C 27A40020 */ addiu $a0, $sp, 0x20 -.L80241690: -/* A6FA70 80241690 4406A000 */ mfc1 $a2, $f20 -/* A6FA74 80241694 8E07000C */ lw $a3, 0xc($s0) -/* A6FA78 80241698 C6000038 */ lwc1 $f0, 0x38($s0) -/* A6FA7C 8024169C C6020040 */ lwc1 $f2, 0x40($s0) -/* A6FA80 802416A0 27A50028 */ addiu $a1, $sp, 0x28 -/* A6FA84 802416A4 E7A00020 */ swc1 $f0, 0x20($sp) -/* A6FA88 802416A8 0C00A7E7 */ jal add_vec2D_polar -/* A6FA8C 802416AC E7A20028 */ swc1 $f2, 0x28($sp) -/* A6FA90 802416B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* A6FA94 802416B4 3C014059 */ lui $at, 0x4059 -/* A6FA98 802416B8 44814800 */ mtc1 $at, $f9 -/* A6FA9C 802416BC 44804000 */ mtc1 $zero, $f8 -/* A6FAA0 802416C0 46000021 */ cvt.d.s $f0, $f0 -/* A6FAA4 802416C4 46280002 */ mul.d $f0, $f0, $f8 -/* A6FAA8 802416C8 00000000 */ nop -/* A6FAAC 802416CC C7A20020 */ lwc1 $f2, 0x20($sp) -/* A6FAB0 802416D0 C604003C */ lwc1 $f4, 0x3c($s0) -/* A6FAB4 802416D4 C7A60028 */ lwc1 $f6, 0x28($sp) -/* A6FAB8 802416D8 E6020060 */ swc1 $f2, 0x60($s0) -/* A6FABC 802416DC E6040064 */ swc1 $f4, 0x64($s0) -/* A6FAC0 802416E0 E6060068 */ swc1 $f6, 0x68($s0) -/* A6FAC4 802416E4 4620028D */ trunc.w.d $f10, $f0 -/* A6FAC8 802416E8 E6AA007C */ swc1 $f10, 0x7c($s5) -/* A6FACC 802416EC C6000040 */ lwc1 $f0, 0x40($s0) -/* A6FAD0 802416F0 46000021 */ cvt.d.s $f0, $f0 -/* A6FAD4 802416F4 46280002 */ mul.d $f0, $f0, $f8 -/* A6FAD8 802416F8 00000000 */ nop -/* A6FADC 802416FC 4620028D */ trunc.w.d $f10, $f0 -/* A6FAE0 80241700 E6AA0084 */ swc1 $f10, 0x84($s5) -/* A6FAE4 80241704 0C00A67F */ jal rand_int -/* A6FAE8 80241708 2404000A */ addiu $a0, $zero, 0xa -/* A6FAEC 8024170C 3C014040 */ lui $at, 0x4040 -/* A6FAF0 80241710 44810000 */ mtc1 $at, $f0 -/* A6FAF4 80241714 3C013FB3 */ lui $at, 0x3fb3 -/* A6FAF8 80241718 34213333 */ ori $at, $at, 0x3333 -/* A6FAFC 8024171C 44811000 */ mtc1 $at, $f2 -/* A6FB00 80241720 3C013E4C */ lui $at, 0x3e4c -/* A6FB04 80241724 3421CCCD */ ori $at, $at, 0xcccd -/* A6FB08 80241728 44812000 */ mtc1 $at, $f4 -/* A6FB0C 8024172C 24420023 */ addiu $v0, $v0, 0x23 -/* A6FB10 80241730 AEA20078 */ sw $v0, 0x78($s5) -/* A6FB14 80241734 24020010 */ addiu $v0, $zero, 0x10 -/* A6FB18 80241738 A600008E */ sh $zero, 0x8e($s0) -/* A6FB1C 8024173C E6000018 */ swc1 $f0, 0x18($s0) -/* A6FB20 80241740 E602001C */ swc1 $f2, 0x1c($s0) -/* A6FB24 80241744 E6040014 */ swc1 $f4, 0x14($s0) -/* A6FB28 80241748 AEC20070 */ sw $v0, 0x70($s6) -.L8024174C: -/* A6FB2C 8024174C 8FBF004C */ lw $ra, 0x4c($sp) -/* A6FB30 80241750 8FB60048 */ lw $s6, 0x48($sp) -/* A6FB34 80241754 8FB50044 */ lw $s5, 0x44($sp) -/* A6FB38 80241758 8FB40040 */ lw $s4, 0x40($sp) -/* A6FB3C 8024175C 8FB3003C */ lw $s3, 0x3c($sp) -/* A6FB40 80241760 8FB20038 */ lw $s2, 0x38($sp) -/* A6FB44 80241764 8FB10034 */ lw $s1, 0x34($sp) -/* A6FB48 80241768 8FB00030 */ lw $s0, 0x30($sp) -/* A6FB4C 8024176C D7B60058 */ ldc1 $f22, 0x58($sp) -/* A6FB50 80241770 D7B40050 */ ldc1 $f20, 0x50($sp) -/* A6FB54 80241774 03E00008 */ jr $ra -/* A6FB58 80241778 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s new file mode 100644 index 0000000000..23011dfe9b --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024138C_A6F76C.s @@ -0,0 +1,269 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024138C_A6F76C +/* A6F76C 8024138C 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* A6F770 80241390 AFB60048 */ sw $s6, 0x48($sp) +/* A6F774 80241394 0080B02D */ daddu $s6, $a0, $zero +/* A6F778 80241398 AFBF004C */ sw $ra, 0x4c($sp) +/* A6F77C 8024139C AFB50044 */ sw $s5, 0x44($sp) +/* A6F780 802413A0 AFB40040 */ sw $s4, 0x40($sp) +/* A6F784 802413A4 AFB3003C */ sw $s3, 0x3c($sp) +/* A6F788 802413A8 AFB20038 */ sw $s2, 0x38($sp) +/* A6F78C 802413AC AFB10034 */ sw $s1, 0x34($sp) +/* A6F790 802413B0 AFB00030 */ sw $s0, 0x30($sp) +/* A6F794 802413B4 F7B60058 */ sdc1 $f22, 0x58($sp) +/* A6F798 802413B8 F7B40050 */ sdc1 $f20, 0x50($sp) +/* A6F79C 802413BC 8ED50148 */ lw $s5, 0x148($s6) +/* A6F7A0 802413C0 86A40008 */ lh $a0, 8($s5) +/* A6F7A4 802413C4 0C00EABB */ jal get_npc_unsafe +/* A6F7A8 802413C8 0000982D */ daddu $s3, $zero, $zero +/* A6F7AC 802413CC 0040802D */ daddu $s0, $v0, $zero +/* A6F7B0 802413D0 9602008E */ lhu $v0, 0x8e($s0) +/* A6F7B4 802413D4 2442FFFF */ addiu $v0, $v0, -1 +/* A6F7B8 802413D8 A602008E */ sh $v0, 0x8e($s0) +/* A6F7BC 802413DC 00021400 */ sll $v0, $v0, 0x10 +/* A6F7C0 802413E0 1C4000DA */ bgtz $v0, .L8024174C +/* A6F7C4 802413E4 0260A02D */ daddu $s4, $s3, $zero +/* A6F7C8 802413E8 0C00A67F */ jal rand_int +/* A6F7CC 802413EC 2404001E */ addiu $a0, $zero, 0x1e +/* A6F7D0 802413F0 0260902D */ daddu $s2, $s3, $zero +/* A6F7D4 802413F4 8EA400D0 */ lw $a0, 0xd0($s5) +/* A6F7D8 802413F8 C6000040 */ lwc1 $f0, 0x40($s0) +/* A6F7DC 802413FC 3C018024 */ lui $at, 0x8024 +/* A6F7E0 80241400 D4363D70 */ ldc1 $f22, 0x3d70($at) +/* A6F7E4 80241404 C4820000 */ lwc1 $f2, ($a0) +/* A6F7E8 80241408 468010A0 */ cvt.s.w $f2, $f2 +/* A6F7EC 8024140C C4840008 */ lwc1 $f4, 8($a0) +/* A6F7F0 80241410 46802120 */ cvt.s.w $f4, $f4 +/* A6F7F4 80241414 E7A00010 */ swc1 $f0, 0x10($sp) +/* A6F7F8 80241418 8EA300D0 */ lw $v1, 0xd0($s5) +/* A6F7FC 8024141C 44051000 */ mfc1 $a1, $f2 +/* A6F800 80241420 C460000C */ lwc1 $f0, 0xc($v1) +/* A6F804 80241424 46800020 */ cvt.s.w $f0, $f0 +/* A6F808 80241428 E7A00014 */ swc1 $f0, 0x14($sp) +/* A6F80C 8024142C 8EA300D0 */ lw $v1, 0xd0($s5) +/* A6F810 80241430 44062000 */ mfc1 $a2, $f4 +/* A6F814 80241434 C4600010 */ lwc1 $f0, 0x10($v1) +/* A6F818 80241438 46800020 */ cvt.s.w $f0, $f0 +/* A6F81C 8024143C E7A00018 */ swc1 $f0, 0x18($sp) +/* A6F820 80241440 44820000 */ mtc1 $v0, $f0 +/* A6F824 80241444 00000000 */ nop +/* A6F828 80241448 46800021 */ cvt.d.w $f0, $f0 +/* A6F82C 8024144C 46360000 */ add.d $f0, $f0, $f22 +/* A6F830 80241450 8C840018 */ lw $a0, 0x18($a0) +/* A6F834 80241454 8E070038 */ lw $a3, 0x38($s0) +/* A6F838 80241458 0C0123F5 */ jal is_point_within_region +/* A6F83C 8024145C 46200520 */ cvt.s.d $f20, $f0 +/* A6F840 80241460 10400023 */ beqz $v0, .L802414F0 +/* A6F844 80241464 00000000 */ nop +/* A6F848 80241468 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A6F84C 8024146C 8EA200D0 */ lw $v0, 0xd0($s5) +/* A6F850 80241470 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A6F854 80241474 C44A0000 */ lwc1 $f10, ($v0) +/* A6F858 80241478 468052A0 */ cvt.s.w $f10, $f10 +/* A6F85C 8024147C 44065000 */ mfc1 $a2, $f10 +/* A6F860 80241480 C44A0008 */ lwc1 $f10, 8($v0) +/* A6F864 80241484 468052A0 */ cvt.s.w $f10, $f10 +/* A6F868 80241488 44075000 */ mfc1 $a3, $f10 +/* A6F86C 8024148C 0C00A720 */ jal atan2 +/* A6F870 80241490 00000000 */ nop +/* A6F874 80241494 44931000 */ mtc1 $s3, $f2 +/* A6F878 80241498 00000000 */ nop +/* A6F87C 8024149C 468010A0 */ cvt.s.w $f2, $f2 +/* A6F880 802414A0 46020001 */ sub.s $f0, $f0, $f2 +/* A6F884 802414A4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A6F888 802414A8 E600000C */ swc1 $f0, 0xc($s0) +/* A6F88C 802414AC 8EA200D0 */ lw $v0, 0xd0($s5) +/* A6F890 802414B0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A6F894 802414B4 C44A0000 */ lwc1 $f10, ($v0) +/* A6F898 802414B8 468052A0 */ cvt.s.w $f10, $f10 +/* A6F89C 802414BC 44065000 */ mfc1 $a2, $f10 +/* A6F8A0 802414C0 C44A0008 */ lwc1 $f10, 8($v0) +/* A6F8A4 802414C4 468052A0 */ cvt.s.w $f10, $f10 +/* A6F8A8 802414C8 44075000 */ mfc1 $a3, $f10 +/* A6F8AC 802414CC 0C00A7B5 */ jal dist2D +/* A6F8B0 802414D0 00000000 */ nop +/* A6F8B4 802414D4 46000106 */ mov.s $f4, $f0 +/* A6F8B8 802414D8 4614003C */ c.lt.s $f0, $f20 +/* A6F8BC 802414DC 00000000 */ nop +/* A6F8C0 802414E0 4503006A */ bc1tl .L8024168C +/* A6F8C4 802414E4 46002506 */ mov.s $f20, $f4 +/* A6F8C8 802414E8 080905A4 */ j .L80241690 +/* A6F8CC 802414EC 27A40020 */ addiu $a0, $sp, 0x20 +.L802414F0: +/* A6F8D0 802414F0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A6F8D4 802414F4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A6F8D8 802414F8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A6F8DC 802414FC C60E0040 */ lwc1 $f14, 0x40($s0) +/* A6F8E0 80241500 8C460028 */ lw $a2, 0x28($v0) +/* A6F8E4 80241504 0C00A720 */ jal atan2 +/* A6F8E8 80241508 8C470030 */ lw $a3, 0x30($v0) +/* A6F8EC 8024150C 460000A1 */ cvt.d.s $f2, $f0 +/* A6F8F0 80241510 4636103C */ c.lt.d $f2, $f22 +/* A6F8F4 80241514 00000000 */ nop +/* A6F8F8 80241518 45000006 */ bc1f .L80241534 +/* A6F8FC 8024151C E600000C */ swc1 $f0, 0xc($s0) +/* A6F900 80241520 0C00A67F */ jal rand_int +/* A6F904 80241524 2404000A */ addiu $a0, $zero, 0xa +/* A6F908 80241528 3C018024 */ lui $at, 0x8024 +/* A6F90C 8024152C 08090551 */ j .L80241544 +/* A6F910 80241530 D4203D78 */ ldc1 $f0, 0x3d78($at) +.L80241534: +/* A6F914 80241534 0C00A67F */ jal rand_int +/* A6F918 80241538 2404000A */ addiu $a0, $zero, 0xa +/* A6F91C 8024153C 3C018024 */ lui $at, 0x8024 +/* A6F920 80241540 D4203D80 */ ldc1 $f0, 0x3d80($at) +.L80241544: +/* A6F924 80241544 44821000 */ mtc1 $v0, $f2 +/* A6F928 80241548 00000000 */ nop +/* A6F92C 8024154C 468010A1 */ cvt.d.w $f2, $f2 +/* A6F930 80241550 46201080 */ add.d $f2, $f2, $f0 +/* A6F934 80241554 3C014014 */ lui $at, 0x4014 +/* A6F938 80241558 44810800 */ mtc1 $at, $f1 +/* A6F93C 8024155C 44800000 */ mtc1 $zero, $f0 +/* A6F940 80241560 00000000 */ nop +/* A6F944 80241564 46201081 */ sub.d $f2, $f2, $f0 +/* A6F948 80241568 462015A0 */ cvt.s.d $f22, $f2 +/* A6F94C 8024156C 00141080 */ sll $v0, $s4, 2 +/* A6F950 80241570 00548821 */ addu $s1, $v0, $s4 +.L80241574: +/* A6F954 80241574 12400006 */ beqz $s2, .L80241590 +/* A6F958 80241578 00000000 */ nop +/* A6F95C 8024157C 44910000 */ mtc1 $s1, $f0 +/* A6F960 80241580 00000000 */ nop +/* A6F964 80241584 46800020 */ cvt.s.w $f0, $f0 +/* A6F968 80241588 08090568 */ j .L802415A0 +/* A6F96C 8024158C 4600B000 */ add.s $f0, $f22, $f0 +.L80241590: +/* A6F970 80241590 44910000 */ mtc1 $s1, $f0 +/* A6F974 80241594 00000000 */ nop +/* A6F978 80241598 46800020 */ cvt.s.w $f0, $f0 +/* A6F97C 8024159C 4600B001 */ sub.s $f0, $f22, $f0 +.L802415A0: +/* A6F980 802415A0 E600000C */ swc1 $f0, 0xc($s0) +/* A6F984 802415A4 C6000038 */ lwc1 $f0, 0x38($s0) +/* A6F988 802415A8 C602003C */ lwc1 $f2, 0x3c($s0) +/* A6F98C 802415AC C6040040 */ lwc1 $f4, 0x40($s0) +/* A6F990 802415B0 0000202D */ daddu $a0, $zero, $zero +/* A6F994 802415B4 E7A00020 */ swc1 $f0, 0x20($sp) +/* A6F998 802415B8 E7A20024 */ swc1 $f2, 0x24($sp) +/* A6F99C 802415BC E7A40028 */ swc1 $f4, 0x28($sp) +/* A6F9A0 802415C0 E7B40010 */ swc1 $f20, 0x10($sp) +/* A6F9A4 802415C4 C600000C */ lwc1 $f0, 0xc($s0) +/* A6F9A8 802415C8 27A50020 */ addiu $a1, $sp, 0x20 +/* A6F9AC 802415CC E7A00014 */ swc1 $f0, 0x14($sp) +/* A6F9B0 802415D0 860200A8 */ lh $v0, 0xa8($s0) +/* A6F9B4 802415D4 27A60024 */ addiu $a2, $sp, 0x24 +/* A6F9B8 802415D8 44820000 */ mtc1 $v0, $f0 +/* A6F9BC 802415DC 00000000 */ nop +/* A6F9C0 802415E0 46800020 */ cvt.s.w $f0, $f0 +/* A6F9C4 802415E4 E7A00018 */ swc1 $f0, 0x18($sp) +/* A6F9C8 802415E8 860200A6 */ lh $v0, 0xa6($s0) +/* A6F9CC 802415EC 27A70028 */ addiu $a3, $sp, 0x28 +/* A6F9D0 802415F0 44820000 */ mtc1 $v0, $f0 +/* A6F9D4 802415F4 00000000 */ nop +/* A6F9D8 802415F8 46800020 */ cvt.s.w $f0, $f0 +/* A6F9DC 802415FC 0C0376B9 */ jal func_800DDAE4 +/* A6F9E0 80241600 E7A0001C */ swc1 $f0, 0x1c($sp) +/* A6F9E4 80241604 50400014 */ beql $v0, $zero, .L80241658 +/* A6F9E8 80241608 24130002 */ addiu $s3, $zero, 2 +/* A6F9EC 8024160C C60C0038 */ lwc1 $f12, 0x38($s0) +/* A6F9F0 80241610 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A6F9F4 80241614 8FA60020 */ lw $a2, 0x20($sp) +/* A6F9F8 80241618 0C00A7B5 */ jal dist2D +/* A6F9FC 8024161C 8FA70028 */ lw $a3, 0x28($sp) +/* A6FA00 80241620 46000106 */ mov.s $f4, $f0 +/* A6FA04 80241624 3C014064 */ lui $at, 0x4064 +/* A6FA08 80241628 44811800 */ mtc1 $at, $f3 +/* A6FA0C 8024162C 44801000 */ mtc1 $zero, $f2 +/* A6FA10 80241630 46002021 */ cvt.d.s $f0, $f4 +/* A6FA14 80241634 4620103C */ c.lt.d $f2, $f0 +/* A6FA18 80241638 00000000 */ nop +/* A6FA1C 8024163C 45000006 */ bc1f .L80241658 +/* A6FA20 80241640 00000000 */ nop +/* A6FA24 80241644 4614203C */ c.lt.s $f4, $f20 +/* A6FA28 80241648 00000000 */ nop +/* A6FA2C 8024164C 45030001 */ bc1tl .L80241654 +/* A6FA30 80241650 46002506 */ mov.s $f20, $f4 +.L80241654: +/* A6FA34 80241654 24130001 */ addiu $s3, $zero, 1 +.L80241658: +/* A6FA38 80241658 1660000D */ bnez $s3, .L80241690 +/* A6FA3C 8024165C 27A40020 */ addiu $a0, $sp, 0x20 +/* A6FA40 80241660 56400003 */ bnel $s2, $zero, .L80241670 +/* A6FA44 80241664 26310005 */ addiu $s1, $s1, 5 +/* A6FA48 80241668 0809059E */ j .L80241678 +/* A6FA4C 8024166C 24120001 */ addiu $s2, $zero, 1 +.L80241670: +/* A6FA50 80241670 26940001 */ addiu $s4, $s4, 1 +/* A6FA54 80241674 0000902D */ daddu $s2, $zero, $zero +.L80241678: +/* A6FA58 80241678 2A820007 */ slti $v0, $s4, 7 +/* A6FA5C 8024167C 5040FFBD */ beql $v0, $zero, .L80241574 +/* A6FA60 80241680 24130003 */ addiu $s3, $zero, 3 +/* A6FA64 80241684 0809055D */ j .L80241574 +/* A6FA68 80241688 00000000 */ nop +.L8024168C: +/* A6FA6C 8024168C 27A40020 */ addiu $a0, $sp, 0x20 +.L80241690: +/* A6FA70 80241690 4406A000 */ mfc1 $a2, $f20 +/* A6FA74 80241694 8E07000C */ lw $a3, 0xc($s0) +/* A6FA78 80241698 C6000038 */ lwc1 $f0, 0x38($s0) +/* A6FA7C 8024169C C6020040 */ lwc1 $f2, 0x40($s0) +/* A6FA80 802416A0 27A50028 */ addiu $a1, $sp, 0x28 +/* A6FA84 802416A4 E7A00020 */ swc1 $f0, 0x20($sp) +/* A6FA88 802416A8 0C00A7E7 */ jal add_vec2D_polar +/* A6FA8C 802416AC E7A20028 */ swc1 $f2, 0x28($sp) +/* A6FA90 802416B0 C6000038 */ lwc1 $f0, 0x38($s0) +/* A6FA94 802416B4 3C014059 */ lui $at, 0x4059 +/* A6FA98 802416B8 44814800 */ mtc1 $at, $f9 +/* A6FA9C 802416BC 44804000 */ mtc1 $zero, $f8 +/* A6FAA0 802416C0 46000021 */ cvt.d.s $f0, $f0 +/* A6FAA4 802416C4 46280002 */ mul.d $f0, $f0, $f8 +/* A6FAA8 802416C8 00000000 */ nop +/* A6FAAC 802416CC C7A20020 */ lwc1 $f2, 0x20($sp) +/* A6FAB0 802416D0 C604003C */ lwc1 $f4, 0x3c($s0) +/* A6FAB4 802416D4 C7A60028 */ lwc1 $f6, 0x28($sp) +/* A6FAB8 802416D8 E6020060 */ swc1 $f2, 0x60($s0) +/* A6FABC 802416DC E6040064 */ swc1 $f4, 0x64($s0) +/* A6FAC0 802416E0 E6060068 */ swc1 $f6, 0x68($s0) +/* A6FAC4 802416E4 4620028D */ trunc.w.d $f10, $f0 +/* A6FAC8 802416E8 E6AA007C */ swc1 $f10, 0x7c($s5) +/* A6FACC 802416EC C6000040 */ lwc1 $f0, 0x40($s0) +/* A6FAD0 802416F0 46000021 */ cvt.d.s $f0, $f0 +/* A6FAD4 802416F4 46280002 */ mul.d $f0, $f0, $f8 +/* A6FAD8 802416F8 00000000 */ nop +/* A6FADC 802416FC 4620028D */ trunc.w.d $f10, $f0 +/* A6FAE0 80241700 E6AA0084 */ swc1 $f10, 0x84($s5) +/* A6FAE4 80241704 0C00A67F */ jal rand_int +/* A6FAE8 80241708 2404000A */ addiu $a0, $zero, 0xa +/* A6FAEC 8024170C 3C014040 */ lui $at, 0x4040 +/* A6FAF0 80241710 44810000 */ mtc1 $at, $f0 +/* A6FAF4 80241714 3C013FB3 */ lui $at, 0x3fb3 +/* A6FAF8 80241718 34213333 */ ori $at, $at, 0x3333 +/* A6FAFC 8024171C 44811000 */ mtc1 $at, $f2 +/* A6FB00 80241720 3C013E4C */ lui $at, 0x3e4c +/* A6FB04 80241724 3421CCCD */ ori $at, $at, 0xcccd +/* A6FB08 80241728 44812000 */ mtc1 $at, $f4 +/* A6FB0C 8024172C 24420023 */ addiu $v0, $v0, 0x23 +/* A6FB10 80241730 AEA20078 */ sw $v0, 0x78($s5) +/* A6FB14 80241734 24020010 */ addiu $v0, $zero, 0x10 +/* A6FB18 80241738 A600008E */ sh $zero, 0x8e($s0) +/* A6FB1C 8024173C E6000018 */ swc1 $f0, 0x18($s0) +/* A6FB20 80241740 E602001C */ swc1 $f2, 0x1c($s0) +/* A6FB24 80241744 E6040014 */ swc1 $f4, 0x14($s0) +/* A6FB28 80241748 AEC20070 */ sw $v0, 0x70($s6) +.L8024174C: +/* A6FB2C 8024174C 8FBF004C */ lw $ra, 0x4c($sp) +/* A6FB30 80241750 8FB60048 */ lw $s6, 0x48($sp) +/* A6FB34 80241754 8FB50044 */ lw $s5, 0x44($sp) +/* A6FB38 80241758 8FB40040 */ lw $s4, 0x40($sp) +/* A6FB3C 8024175C 8FB3003C */ lw $s3, 0x3c($sp) +/* A6FB40 80241760 8FB20038 */ lw $s2, 0x38($sp) +/* A6FB44 80241764 8FB10034 */ lw $s1, 0x34($sp) +/* A6FB48 80241768 8FB00030 */ lw $s0, 0x30($sp) +/* A6FB4C 8024176C D7B60058 */ ldc1 $f22, 0x58($sp) +/* A6FB50 80241770 D7B40050 */ ldc1 $f20, 0x50($sp) +/* A6FB54 80241774 03E00008 */ jr $ra +/* A6FB58 80241778 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C.s deleted file mode 100644 index afc7adea39..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024177C -/* A6FB5C 8024177C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A6FB60 80241780 AFB20018 */ sw $s2, 0x18($sp) -/* A6FB64 80241784 0080902D */ daddu $s2, $a0, $zero -/* A6FB68 80241788 AFBF001C */ sw $ra, 0x1c($sp) -/* A6FB6C 8024178C AFB10014 */ sw $s1, 0x14($sp) -/* A6FB70 80241790 AFB00010 */ sw $s0, 0x10($sp) -/* A6FB74 80241794 F7B60028 */ sdc1 $f22, 0x28($sp) -/* A6FB78 80241798 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A6FB7C 8024179C 8E510148 */ lw $s1, 0x148($s2) -/* A6FB80 802417A0 0C00EABB */ jal get_npc_unsafe -/* A6FB84 802417A4 86240008 */ lh $a0, 8($s1) -/* A6FB88 802417A8 0040802D */ daddu $s0, $v0, $zero -/* A6FB8C 802417AC C6340070 */ lwc1 $f20, 0x70($s1) -/* A6FB90 802417B0 4680A520 */ cvt.s.w $f20, $f20 -/* A6FB94 802417B4 4600A521 */ cvt.d.s $f20, $f20 -/* A6FB98 802417B8 8E23006C */ lw $v1, 0x6c($s1) -/* A6FB9C 802417BC 3C014059 */ lui $at, 0x4059 -/* A6FBA0 802417C0 4481B800 */ mtc1 $at, $f23 -/* A6FBA4 802417C4 4480B000 */ mtc1 $zero, $f22 -/* A6FBA8 802417C8 2463000A */ addiu $v1, $v1, 0xa -/* A6FBAC 802417CC 44836000 */ mtc1 $v1, $f12 -/* A6FBB0 802417D0 00000000 */ nop -/* A6FBB4 802417D4 46806320 */ cvt.s.w $f12, $f12 -/* A6FBB8 802417D8 4636A503 */ div.d $f20, $f20, $f22 -/* A6FBBC 802417DC 0C00A6C9 */ jal clamp_angle -/* A6FBC0 802417E0 4620A520 */ cvt.s.d $f20, $f20 -/* A6FBC4 802417E4 4600010D */ trunc.w.s $f4, $f0 -/* A6FBC8 802417E8 44022000 */ mfc1 $v0, $f4 -/* A6FBCC 802417EC 00000000 */ nop -/* A6FBD0 802417F0 44826000 */ mtc1 $v0, $f12 -/* A6FBD4 802417F4 00000000 */ nop -/* A6FBD8 802417F8 46806320 */ cvt.s.w $f12, $f12 -/* A6FBDC 802417FC 0C00A8BB */ jal sin_deg -/* A6FBE0 80241800 AE22006C */ sw $v0, 0x6c($s1) -/* A6FBE4 80241804 3C014018 */ lui $at, 0x4018 -/* A6FBE8 80241808 44811800 */ mtc1 $at, $f3 -/* A6FBEC 8024180C 44801000 */ mtc1 $zero, $f2 -/* A6FBF0 80241810 46000021 */ cvt.d.s $f0, $f0 -/* A6FBF4 80241814 46220002 */ mul.d $f0, $f0, $f2 -/* A6FBF8 80241818 00000000 */ nop -/* A6FBFC 8024181C 4600A0A1 */ cvt.d.s $f2, $f20 -/* A6FC00 80241820 46201080 */ add.d $f2, $f2, $f0 -/* A6FC04 80241824 8602008C */ lh $v0, 0x8c($s0) -/* A6FC08 80241828 46201020 */ cvt.s.d $f0, $f2 -/* A6FC0C 8024182C 14400008 */ bnez $v0, .L80241850 -/* A6FC10 80241830 E600003C */ swc1 $f0, 0x3c($s0) -/* A6FC14 80241834 46000021 */ cvt.d.s $f0, $f0 -/* A6FC18 80241838 46360002 */ mul.d $f0, $f0, $f22 -/* A6FC1C 8024183C 00000000 */ nop -/* A6FC20 80241840 24020011 */ addiu $v0, $zero, 0x11 -/* A6FC24 80241844 4620010D */ trunc.w.d $f4, $f0 -/* A6FC28 80241848 E6240080 */ swc1 $f4, 0x80($s1) -/* A6FC2C 8024184C AE420070 */ sw $v0, 0x70($s2) -.L80241850: -/* A6FC30 80241850 8FBF001C */ lw $ra, 0x1c($sp) -/* A6FC34 80241854 8FB20018 */ lw $s2, 0x18($sp) -/* A6FC38 80241858 8FB10014 */ lw $s1, 0x14($sp) -/* A6FC3C 8024185C 8FB00010 */ lw $s0, 0x10($sp) -/* A6FC40 80241860 D7B60028 */ ldc1 $f22, 0x28($sp) -/* A6FC44 80241864 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A6FC48 80241868 03E00008 */ jr $ra -/* A6FC4C 8024186C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s new file mode 100644 index 0000000000..35d1437fa6 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_8024177C_A6FB5C.s @@ -0,0 +1,66 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024177C_A6FB5C +/* A6FB5C 8024177C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A6FB60 80241780 AFB20018 */ sw $s2, 0x18($sp) +/* A6FB64 80241784 0080902D */ daddu $s2, $a0, $zero +/* A6FB68 80241788 AFBF001C */ sw $ra, 0x1c($sp) +/* A6FB6C 8024178C AFB10014 */ sw $s1, 0x14($sp) +/* A6FB70 80241790 AFB00010 */ sw $s0, 0x10($sp) +/* A6FB74 80241794 F7B60028 */ sdc1 $f22, 0x28($sp) +/* A6FB78 80241798 F7B40020 */ sdc1 $f20, 0x20($sp) +/* A6FB7C 8024179C 8E510148 */ lw $s1, 0x148($s2) +/* A6FB80 802417A0 0C00EABB */ jal get_npc_unsafe +/* A6FB84 802417A4 86240008 */ lh $a0, 8($s1) +/* A6FB88 802417A8 0040802D */ daddu $s0, $v0, $zero +/* A6FB8C 802417AC C6340070 */ lwc1 $f20, 0x70($s1) +/* A6FB90 802417B0 4680A520 */ cvt.s.w $f20, $f20 +/* A6FB94 802417B4 4600A521 */ cvt.d.s $f20, $f20 +/* A6FB98 802417B8 8E23006C */ lw $v1, 0x6c($s1) +/* A6FB9C 802417BC 3C014059 */ lui $at, 0x4059 +/* A6FBA0 802417C0 4481B800 */ mtc1 $at, $f23 +/* A6FBA4 802417C4 4480B000 */ mtc1 $zero, $f22 +/* A6FBA8 802417C8 2463000A */ addiu $v1, $v1, 0xa +/* A6FBAC 802417CC 44836000 */ mtc1 $v1, $f12 +/* A6FBB0 802417D0 00000000 */ nop +/* A6FBB4 802417D4 46806320 */ cvt.s.w $f12, $f12 +/* A6FBB8 802417D8 4636A503 */ div.d $f20, $f20, $f22 +/* A6FBBC 802417DC 0C00A6C9 */ jal clamp_angle +/* A6FBC0 802417E0 4620A520 */ cvt.s.d $f20, $f20 +/* A6FBC4 802417E4 4600010D */ trunc.w.s $f4, $f0 +/* A6FBC8 802417E8 44022000 */ mfc1 $v0, $f4 +/* A6FBCC 802417EC 00000000 */ nop +/* A6FBD0 802417F0 44826000 */ mtc1 $v0, $f12 +/* A6FBD4 802417F4 00000000 */ nop +/* A6FBD8 802417F8 46806320 */ cvt.s.w $f12, $f12 +/* A6FBDC 802417FC 0C00A8BB */ jal sin_deg +/* A6FBE0 80241800 AE22006C */ sw $v0, 0x6c($s1) +/* A6FBE4 80241804 3C014018 */ lui $at, 0x4018 +/* A6FBE8 80241808 44811800 */ mtc1 $at, $f3 +/* A6FBEC 8024180C 44801000 */ mtc1 $zero, $f2 +/* A6FBF0 80241810 46000021 */ cvt.d.s $f0, $f0 +/* A6FBF4 80241814 46220002 */ mul.d $f0, $f0, $f2 +/* A6FBF8 80241818 00000000 */ nop +/* A6FBFC 8024181C 4600A0A1 */ cvt.d.s $f2, $f20 +/* A6FC00 80241820 46201080 */ add.d $f2, $f2, $f0 +/* A6FC04 80241824 8602008C */ lh $v0, 0x8c($s0) +/* A6FC08 80241828 46201020 */ cvt.s.d $f0, $f2 +/* A6FC0C 8024182C 14400008 */ bnez $v0, .L80241850 +/* A6FC10 80241830 E600003C */ swc1 $f0, 0x3c($s0) +/* A6FC14 80241834 46000021 */ cvt.d.s $f0, $f0 +/* A6FC18 80241838 46360002 */ mul.d $f0, $f0, $f22 +/* A6FC1C 8024183C 00000000 */ nop +/* A6FC20 80241840 24020011 */ addiu $v0, $zero, 0x11 +/* A6FC24 80241844 4620010D */ trunc.w.d $f4, $f0 +/* A6FC28 80241848 E6240080 */ swc1 $f4, 0x80($s1) +/* A6FC2C 8024184C AE420070 */ sw $v0, 0x70($s2) +.L80241850: +/* A6FC30 80241850 8FBF001C */ lw $ra, 0x1c($sp) +/* A6FC34 80241854 8FB20018 */ lw $s2, 0x18($sp) +/* A6FC38 80241858 8FB10014 */ lw $s1, 0x14($sp) +/* A6FC3C 8024185C 8FB00010 */ lw $s0, 0x10($sp) +/* A6FC40 80241860 D7B60028 */ ldc1 $f22, 0x28($sp) +/* A6FC44 80241864 D7B40020 */ ldc1 $f20, 0x20($sp) +/* A6FC48 80241868 03E00008 */ jr $ra +/* A6FC4C 8024186C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s index dcbbf28d21..931c98fc50 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241AF0_A6FED0.s @@ -58,7 +58,7 @@ glabel func_80241AF0_A6FED0 .L80241BC4: /* A6FFA4 80241BC4 8E450024 */ lw $a1, 0x24($s2) /* A6FFA8 80241BC8 8E460028 */ lw $a2, 0x28($s2) -/* A6FFAC 80241BCC 0C0902B9 */ jal func_80240AE4 +/* A6FFAC 80241BCC 0C0902B9 */ jal func_80240AE4_A6EEC4 /* A6FFB0 80241BD0 0260382D */ daddu $a3, $s3, $zero /* A6FFB4 80241BD4 24030001 */ addiu $v1, $zero, 1 /* A6FFB8 80241BD8 1443002F */ bne $v0, $v1, .L80241C98 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28.s deleted file mode 100644 index 5e5b7aaab8..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28.s +++ /dev/null @@ -1,84 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D28 -/* A70108 80241D28 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A7010C 80241D2C AFB3003C */ sw $s3, 0x3c($sp) -/* A70110 80241D30 0080982D */ daddu $s3, $a0, $zero -/* A70114 80241D34 AFBF0044 */ sw $ra, 0x44($sp) -/* A70118 80241D38 AFB40040 */ sw $s4, 0x40($sp) -/* A7011C 80241D3C AFB20038 */ sw $s2, 0x38($sp) -/* A70120 80241D40 AFB10034 */ sw $s1, 0x34($sp) -/* A70124 80241D44 AFB00030 */ sw $s0, 0x30($sp) -/* A70128 80241D48 8E720148 */ lw $s2, 0x148($s3) -/* A7012C 80241D4C 00A0882D */ daddu $s1, $a1, $zero -/* A70130 80241D50 86440008 */ lh $a0, 8($s2) -/* A70134 80241D54 0C00EABB */ jal get_npc_unsafe -/* A70138 80241D58 00C0A02D */ daddu $s4, $a2, $zero -/* A7013C 80241D5C 0040802D */ daddu $s0, $v0, $zero -/* A70140 80241D60 9602008E */ lhu $v0, 0x8e($s0) -/* A70144 80241D64 2442FFFF */ addiu $v0, $v0, -1 -/* A70148 80241D68 A602008E */ sh $v0, 0x8e($s0) -/* A7014C 80241D6C 00021400 */ sll $v0, $v0, 0x10 -/* A70150 80241D70 1C400032 */ bgtz $v0, .L80241E3C -/* A70154 80241D74 00000000 */ nop -/* A70158 80241D78 0260202D */ daddu $a0, $s3, $zero -/* A7015C 80241D7C 8E250024 */ lw $a1, 0x24($s1) -/* A70160 80241D80 8E260028 */ lw $a2, 0x28($s1) -/* A70164 80241D84 0C0902B9 */ jal func_80240AE4 -/* A70168 80241D88 0280382D */ daddu $a3, $s4, $zero -/* A7016C 80241D8C 0040882D */ daddu $s1, $v0, $zero -/* A70170 80241D90 24020001 */ addiu $v0, $zero, 1 -/* A70174 80241D94 1222001D */ beq $s1, $v0, .L80241E0C -/* A70178 80241D98 0200282D */ daddu $a1, $s0, $zero -/* A7017C 80241D9C 24040002 */ addiu $a0, $zero, 2 -/* A70180 80241DA0 0000302D */ daddu $a2, $zero, $zero -/* A70184 80241DA4 860300A8 */ lh $v1, 0xa8($s0) -/* A70188 80241DA8 3C013F80 */ lui $at, 0x3f80 -/* A7018C 80241DAC 44810000 */ mtc1 $at, $f0 -/* A70190 80241DB0 3C014000 */ lui $at, 0x4000 -/* A70194 80241DB4 44811000 */ mtc1 $at, $f2 -/* A70198 80241DB8 3C01C1A0 */ lui $at, 0xc1a0 -/* A7019C 80241DBC 44812000 */ mtc1 $at, $f4 -/* A701A0 80241DC0 2402000C */ addiu $v0, $zero, 0xc -/* A701A4 80241DC4 AFA2001C */ sw $v0, 0x1c($sp) -/* A701A8 80241DC8 44833000 */ mtc1 $v1, $f6 -/* A701AC 80241DCC 00000000 */ nop -/* A701B0 80241DD0 468031A0 */ cvt.s.w $f6, $f6 -/* A701B4 80241DD4 44073000 */ mfc1 $a3, $f6 -/* A701B8 80241DD8 27A20028 */ addiu $v0, $sp, 0x28 -/* A701BC 80241DDC AFA20020 */ sw $v0, 0x20($sp) -/* A701C0 80241DE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A701C4 80241DE4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A701C8 80241DE8 0C01BFA4 */ jal fx_emote -/* A701CC 80241DEC E7A40018 */ swc1 $f4, 0x18($sp) -/* A701D0 80241DF0 8E4200CC */ lw $v0, 0xcc($s2) -/* A701D4 80241DF4 8C430000 */ lw $v1, ($v0) -/* A701D8 80241DF8 2402000F */ addiu $v0, $zero, 0xf -/* A701DC 80241DFC A602008E */ sh $v0, 0x8e($s0) -/* A701E0 80241E00 24020032 */ addiu $v0, $zero, 0x32 -/* A701E4 80241E04 0809078E */ j .L80241E38 -/* A701E8 80241E08 AE030028 */ sw $v1, 0x28($s0) -.L80241E0C: -/* A701EC 80241E0C 0200202D */ daddu $a0, $s0, $zero -/* A701F0 80241E10 240520D5 */ addiu $a1, $zero, 0x20d5 -/* A701F4 80241E14 0C012530 */ jal func_800494C0 -/* A701F8 80241E18 0000302D */ daddu $a2, $zero, $zero -/* A701FC 80241E1C 86440008 */ lh $a0, 8($s2) -/* A70200 80241E20 0C00FB3A */ jal get_enemy -/* A70204 80241E24 24840001 */ addiu $a0, $a0, 1 -/* A70208 80241E28 AC51006C */ sw $s1, 0x6c($v0) -/* A7020C 80241E2C 24020014 */ addiu $v0, $zero, 0x14 -/* A70210 80241E30 A602008E */ sh $v0, 0x8e($s0) -/* A70214 80241E34 24020018 */ addiu $v0, $zero, 0x18 -.L80241E38: -/* A70218 80241E38 AE620070 */ sw $v0, 0x70($s3) -.L80241E3C: -/* A7021C 80241E3C 8FBF0044 */ lw $ra, 0x44($sp) -/* A70220 80241E40 8FB40040 */ lw $s4, 0x40($sp) -/* A70224 80241E44 8FB3003C */ lw $s3, 0x3c($sp) -/* A70228 80241E48 8FB20038 */ lw $s2, 0x38($sp) -/* A7022C 80241E4C 8FB10034 */ lw $s1, 0x34($sp) -/* A70230 80241E50 8FB00030 */ lw $s0, 0x30($sp) -/* A70234 80241E54 03E00008 */ jr $ra -/* A70238 80241E58 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s new file mode 100644 index 0000000000..7b54def682 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241D28_A70108.s @@ -0,0 +1,84 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D28_A70108 +/* A70108 80241D28 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A7010C 80241D2C AFB3003C */ sw $s3, 0x3c($sp) +/* A70110 80241D30 0080982D */ daddu $s3, $a0, $zero +/* A70114 80241D34 AFBF0044 */ sw $ra, 0x44($sp) +/* A70118 80241D38 AFB40040 */ sw $s4, 0x40($sp) +/* A7011C 80241D3C AFB20038 */ sw $s2, 0x38($sp) +/* A70120 80241D40 AFB10034 */ sw $s1, 0x34($sp) +/* A70124 80241D44 AFB00030 */ sw $s0, 0x30($sp) +/* A70128 80241D48 8E720148 */ lw $s2, 0x148($s3) +/* A7012C 80241D4C 00A0882D */ daddu $s1, $a1, $zero +/* A70130 80241D50 86440008 */ lh $a0, 8($s2) +/* A70134 80241D54 0C00EABB */ jal get_npc_unsafe +/* A70138 80241D58 00C0A02D */ daddu $s4, $a2, $zero +/* A7013C 80241D5C 0040802D */ daddu $s0, $v0, $zero +/* A70140 80241D60 9602008E */ lhu $v0, 0x8e($s0) +/* A70144 80241D64 2442FFFF */ addiu $v0, $v0, -1 +/* A70148 80241D68 A602008E */ sh $v0, 0x8e($s0) +/* A7014C 80241D6C 00021400 */ sll $v0, $v0, 0x10 +/* A70150 80241D70 1C400032 */ bgtz $v0, .L80241E3C +/* A70154 80241D74 00000000 */ nop +/* A70158 80241D78 0260202D */ daddu $a0, $s3, $zero +/* A7015C 80241D7C 8E250024 */ lw $a1, 0x24($s1) +/* A70160 80241D80 8E260028 */ lw $a2, 0x28($s1) +/* A70164 80241D84 0C0902B9 */ jal func_80240AE4_A6EEC4 +/* A70168 80241D88 0280382D */ daddu $a3, $s4, $zero +/* A7016C 80241D8C 0040882D */ daddu $s1, $v0, $zero +/* A70170 80241D90 24020001 */ addiu $v0, $zero, 1 +/* A70174 80241D94 1222001D */ beq $s1, $v0, .L80241E0C +/* A70178 80241D98 0200282D */ daddu $a1, $s0, $zero +/* A7017C 80241D9C 24040002 */ addiu $a0, $zero, 2 +/* A70180 80241DA0 0000302D */ daddu $a2, $zero, $zero +/* A70184 80241DA4 860300A8 */ lh $v1, 0xa8($s0) +/* A70188 80241DA8 3C013F80 */ lui $at, 0x3f80 +/* A7018C 80241DAC 44810000 */ mtc1 $at, $f0 +/* A70190 80241DB0 3C014000 */ lui $at, 0x4000 +/* A70194 80241DB4 44811000 */ mtc1 $at, $f2 +/* A70198 80241DB8 3C01C1A0 */ lui $at, 0xc1a0 +/* A7019C 80241DBC 44812000 */ mtc1 $at, $f4 +/* A701A0 80241DC0 2402000C */ addiu $v0, $zero, 0xc +/* A701A4 80241DC4 AFA2001C */ sw $v0, 0x1c($sp) +/* A701A8 80241DC8 44833000 */ mtc1 $v1, $f6 +/* A701AC 80241DCC 00000000 */ nop +/* A701B0 80241DD0 468031A0 */ cvt.s.w $f6, $f6 +/* A701B4 80241DD4 44073000 */ mfc1 $a3, $f6 +/* A701B8 80241DD8 27A20028 */ addiu $v0, $sp, 0x28 +/* A701BC 80241DDC AFA20020 */ sw $v0, 0x20($sp) +/* A701C0 80241DE0 E7A00010 */ swc1 $f0, 0x10($sp) +/* A701C4 80241DE4 E7A20014 */ swc1 $f2, 0x14($sp) +/* A701C8 80241DE8 0C01BFA4 */ jal fx_emote +/* A701CC 80241DEC E7A40018 */ swc1 $f4, 0x18($sp) +/* A701D0 80241DF0 8E4200CC */ lw $v0, 0xcc($s2) +/* A701D4 80241DF4 8C430000 */ lw $v1, ($v0) +/* A701D8 80241DF8 2402000F */ addiu $v0, $zero, 0xf +/* A701DC 80241DFC A602008E */ sh $v0, 0x8e($s0) +/* A701E0 80241E00 24020032 */ addiu $v0, $zero, 0x32 +/* A701E4 80241E04 0809078E */ j .L80241E38 +/* A701E8 80241E08 AE030028 */ sw $v1, 0x28($s0) +.L80241E0C: +/* A701EC 80241E0C 0200202D */ daddu $a0, $s0, $zero +/* A701F0 80241E10 240520D5 */ addiu $a1, $zero, 0x20d5 +/* A701F4 80241E14 0C012530 */ jal func_800494C0 +/* A701F8 80241E18 0000302D */ daddu $a2, $zero, $zero +/* A701FC 80241E1C 86440008 */ lh $a0, 8($s2) +/* A70200 80241E20 0C00FB3A */ jal get_enemy +/* A70204 80241E24 24840001 */ addiu $a0, $a0, 1 +/* A70208 80241E28 AC51006C */ sw $s1, 0x6c($v0) +/* A7020C 80241E2C 24020014 */ addiu $v0, $zero, 0x14 +/* A70210 80241E30 A602008E */ sh $v0, 0x8e($s0) +/* A70214 80241E34 24020018 */ addiu $v0, $zero, 0x18 +.L80241E38: +/* A70218 80241E38 AE620070 */ sw $v0, 0x70($s3) +.L80241E3C: +/* A7021C 80241E3C 8FBF0044 */ lw $ra, 0x44($sp) +/* A70220 80241E40 8FB40040 */ lw $s4, 0x40($sp) +/* A70224 80241E44 8FB3003C */ lw $s3, 0x3c($sp) +/* A70228 80241E48 8FB20038 */ lw $s2, 0x38($sp) +/* A7022C 80241E4C 8FB10034 */ lw $s1, 0x34($sp) +/* A70230 80241E50 8FB00030 */ lw $s0, 0x30($sp) +/* A70234 80241E54 03E00008 */ jr $ra +/* A70238 80241E58 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C.s deleted file mode 100644 index 9de8966f3d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F4C -/* A7032C 80241F4C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A70330 80241F50 AFB20018 */ sw $s2, 0x18($sp) -/* A70334 80241F54 0080902D */ daddu $s2, $a0, $zero -/* A70338 80241F58 AFBF001C */ sw $ra, 0x1c($sp) -/* A7033C 80241F5C AFB10014 */ sw $s1, 0x14($sp) -/* A70340 80241F60 AFB00010 */ sw $s0, 0x10($sp) -/* A70344 80241F64 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A70348 80241F68 8E500148 */ lw $s0, 0x148($s2) -/* A7034C 80241F6C 0C00EABB */ jal get_npc_unsafe -/* A70350 80241F70 86040008 */ lh $a0, 8($s0) -/* A70354 80241F74 C60C006C */ lwc1 $f12, 0x6c($s0) -/* A70358 80241F78 46806320 */ cvt.s.w $f12, $f12 -/* A7035C 80241F7C 0040882D */ daddu $s1, $v0, $zero -/* A70360 80241F80 C6140070 */ lwc1 $f20, 0x70($s0) -/* A70364 80241F84 4680A520 */ cvt.s.w $f20, $f20 -/* A70368 80241F88 3C014059 */ lui $at, 0x4059 -/* A7036C 80241F8C 44810800 */ mtc1 $at, $f1 -/* A70370 80241F90 44800000 */ mtc1 $zero, $f0 -/* A70374 80241F94 4600A521 */ cvt.d.s $f20, $f20 -/* A70378 80241F98 4620A503 */ div.d $f20, $f20, $f0 -/* A7037C 80241F9C 0C00A8BB */ jal sin_deg -/* A70380 80241FA0 4620A520 */ cvt.s.d $f20, $f20 -/* A70384 80241FA4 3C014018 */ lui $at, 0x4018 -/* A70388 80241FA8 44811800 */ mtc1 $at, $f3 -/* A7038C 80241FAC 44801000 */ mtc1 $zero, $f2 -/* A70390 80241FB0 46000021 */ cvt.d.s $f0, $f0 -/* A70394 80241FB4 46220002 */ mul.d $f0, $f0, $f2 -/* A70398 80241FB8 00000000 */ nop -/* A7039C 80241FBC 4600A0A1 */ cvt.d.s $f2, $f20 -/* A703A0 80241FC0 46201080 */ add.d $f2, $f2, $f0 -/* A703A4 80241FC4 462010A0 */ cvt.s.d $f2, $f2 -/* A703A8 80241FC8 E622003C */ swc1 $f2, 0x3c($s1) -/* A703AC 80241FCC 8E02006C */ lw $v0, 0x6c($s0) -/* A703B0 80241FD0 2442000A */ addiu $v0, $v0, 0xa -/* A703B4 80241FD4 44826000 */ mtc1 $v0, $f12 -/* A703B8 80241FD8 00000000 */ nop -/* A703BC 80241FDC 0C00A6C9 */ jal clamp_angle -/* A703C0 80241FE0 46806320 */ cvt.s.w $f12, $f12 -/* A703C4 80241FE4 4600010D */ trunc.w.s $f4, $f0 -/* A703C8 80241FE8 E604006C */ swc1 $f4, 0x6c($s0) -/* A703CC 80241FEC 9622008E */ lhu $v0, 0x8e($s1) -/* A703D0 80241FF0 2442FFFF */ addiu $v0, $v0, -1 -/* A703D4 80241FF4 A622008E */ sh $v0, 0x8e($s1) -/* A703D8 80241FF8 00021400 */ sll $v0, $v0, 0x10 -/* A703DC 80241FFC 1C400002 */ bgtz $v0, .L80242008 -/* A703E0 80242000 2402000A */ addiu $v0, $zero, 0xa -/* A703E4 80242004 AE420070 */ sw $v0, 0x70($s2) -.L80242008: -/* A703E8 80242008 8FBF001C */ lw $ra, 0x1c($sp) -/* A703EC 8024200C 8FB20018 */ lw $s2, 0x18($sp) -/* A703F0 80242010 8FB10014 */ lw $s1, 0x14($sp) -/* A703F4 80242014 8FB00010 */ lw $s0, 0x10($sp) -/* A703F8 80242018 D7B40020 */ ldc1 $f20, 0x20($sp) -/* A703FC 8024201C 03E00008 */ jr $ra -/* A70400 80242020 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s new file mode 100644 index 0000000000..38520c22ec --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_80241F4C_A7032C.s @@ -0,0 +1,59 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F4C_A7032C +/* A7032C 80241F4C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A70330 80241F50 AFB20018 */ sw $s2, 0x18($sp) +/* A70334 80241F54 0080902D */ daddu $s2, $a0, $zero +/* A70338 80241F58 AFBF001C */ sw $ra, 0x1c($sp) +/* A7033C 80241F5C AFB10014 */ sw $s1, 0x14($sp) +/* A70340 80241F60 AFB00010 */ sw $s0, 0x10($sp) +/* A70344 80241F64 F7B40020 */ sdc1 $f20, 0x20($sp) +/* A70348 80241F68 8E500148 */ lw $s0, 0x148($s2) +/* A7034C 80241F6C 0C00EABB */ jal get_npc_unsafe +/* A70350 80241F70 86040008 */ lh $a0, 8($s0) +/* A70354 80241F74 C60C006C */ lwc1 $f12, 0x6c($s0) +/* A70358 80241F78 46806320 */ cvt.s.w $f12, $f12 +/* A7035C 80241F7C 0040882D */ daddu $s1, $v0, $zero +/* A70360 80241F80 C6140070 */ lwc1 $f20, 0x70($s0) +/* A70364 80241F84 4680A520 */ cvt.s.w $f20, $f20 +/* A70368 80241F88 3C014059 */ lui $at, 0x4059 +/* A7036C 80241F8C 44810800 */ mtc1 $at, $f1 +/* A70370 80241F90 44800000 */ mtc1 $zero, $f0 +/* A70374 80241F94 4600A521 */ cvt.d.s $f20, $f20 +/* A70378 80241F98 4620A503 */ div.d $f20, $f20, $f0 +/* A7037C 80241F9C 0C00A8BB */ jal sin_deg +/* A70380 80241FA0 4620A520 */ cvt.s.d $f20, $f20 +/* A70384 80241FA4 3C014018 */ lui $at, 0x4018 +/* A70388 80241FA8 44811800 */ mtc1 $at, $f3 +/* A7038C 80241FAC 44801000 */ mtc1 $zero, $f2 +/* A70390 80241FB0 46000021 */ cvt.d.s $f0, $f0 +/* A70394 80241FB4 46220002 */ mul.d $f0, $f0, $f2 +/* A70398 80241FB8 00000000 */ nop +/* A7039C 80241FBC 4600A0A1 */ cvt.d.s $f2, $f20 +/* A703A0 80241FC0 46201080 */ add.d $f2, $f2, $f0 +/* A703A4 80241FC4 462010A0 */ cvt.s.d $f2, $f2 +/* A703A8 80241FC8 E622003C */ swc1 $f2, 0x3c($s1) +/* A703AC 80241FCC 8E02006C */ lw $v0, 0x6c($s0) +/* A703B0 80241FD0 2442000A */ addiu $v0, $v0, 0xa +/* A703B4 80241FD4 44826000 */ mtc1 $v0, $f12 +/* A703B8 80241FD8 00000000 */ nop +/* A703BC 80241FDC 0C00A6C9 */ jal clamp_angle +/* A703C0 80241FE0 46806320 */ cvt.s.w $f12, $f12 +/* A703C4 80241FE4 4600010D */ trunc.w.s $f4, $f0 +/* A703C8 80241FE8 E604006C */ swc1 $f4, 0x6c($s0) +/* A703CC 80241FEC 9622008E */ lhu $v0, 0x8e($s1) +/* A703D0 80241FF0 2442FFFF */ addiu $v0, $v0, -1 +/* A703D4 80241FF4 A622008E */ sh $v0, 0x8e($s1) +/* A703D8 80241FF8 00021400 */ sll $v0, $v0, 0x10 +/* A703DC 80241FFC 1C400002 */ bgtz $v0, .L80242008 +/* A703E0 80242000 2402000A */ addiu $v0, $zero, 0xa +/* A703E4 80242004 AE420070 */ sw $v0, 0x70($s2) +.L80242008: +/* A703E8 80242008 8FBF001C */ lw $ra, 0x1c($sp) +/* A703EC 8024200C 8FB20018 */ lw $s2, 0x18($sp) +/* A703F0 80242010 8FB10014 */ lw $s1, 0x14($sp) +/* A703F4 80242014 8FB00010 */ lw $s0, 0x10($sp) +/* A703F8 80242018 D7B40020 */ ldc1 $f20, 0x20($sp) +/* A703FC 8024201C 03E00008 */ jr $ra +/* A70400 80242020 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8.s deleted file mode 100644 index a5090cd5db..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422B8 -/* A70698 802422B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7069C 802422BC 3C05FE36 */ lui $a1, 0xfe36 -/* A706A0 802422C0 AFBF0010 */ sw $ra, 0x10($sp) -/* A706A4 802422C4 8C820148 */ lw $v0, 0x148($a0) -/* A706A8 802422C8 3C06800B */ lui $a2, 0x800b -/* A706AC 802422CC 8CC60F9C */ lw $a2, 0xf9c($a2) -/* A706B0 802422D0 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A706B4 802422D4 00C23026 */ xor $a2, $a2, $v0 -/* A706B8 802422D8 0C0B2026 */ jal set_variable -/* A706BC 802422DC 2CC60001 */ sltiu $a2, $a2, 1 -/* A706C0 802422E0 8FBF0010 */ lw $ra, 0x10($sp) -/* A706C4 802422E4 24020002 */ addiu $v0, $zero, 2 -/* A706C8 802422E8 03E00008 */ jr $ra -/* A706CC 802422EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s new file mode 100644 index 0000000000..cb6166a364 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422B8_A70698 +/* A70698 802422B8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A7069C 802422BC 3C05FE36 */ lui $a1, 0xfe36 +/* A706A0 802422C0 AFBF0010 */ sw $ra, 0x10($sp) +/* A706A4 802422C4 8C820148 */ lw $v0, 0x148($a0) +/* A706A8 802422C8 3C06800B */ lui $a2, 0x800b +/* A706AC 802422CC 8CC60F9C */ lw $a2, 0xf9c($a2) +/* A706B0 802422D0 34A53C80 */ ori $a1, $a1, 0x3c80 +/* A706B4 802422D4 00C23026 */ xor $a2, $a2, $v0 +/* A706B8 802422D8 0C0B2026 */ jal set_variable +/* A706BC 802422DC 2CC60001 */ sltiu $a2, $a2, 1 +/* A706C0 802422E0 8FBF0010 */ lw $ra, 0x10($sp) +/* A706C4 802422E4 24020002 */ addiu $v0, $zero, 2 +/* A706C8 802422E8 03E00008 */ jr $ra +/* A706CC 802422EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s index 08cfcafd14..4b168b0b66 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s +++ b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/update_heroes_start_turn_A70404.s @@ -93,17 +93,17 @@ glabel update_heroes_start_turn_A70404 /* A7055C 8024217C 00000000 */ nop /* A70560 80242180 0280202D */ daddu $a0, $s4, $zero /* A70564 80242184 0200282D */ daddu $a1, $s0, $zero -/* A70568 80242188 0C090471 */ jal func_802411C4 +/* A70568 80242188 0C090471 */ jal func_802411C4_A6F5A4 /* A7056C 8024218C 0260302D */ daddu $a2, $s3, $zero /* A70570 80242190 0280202D */ daddu $a0, $s4, $zero /* A70574 80242194 0200282D */ daddu $a1, $s0, $zero -/* A70578 80242198 0C090480 */ jal func_80241200 +/* A70578 80242198 0C090480 */ jal func_80241200_A6F5E0 /* A7057C 8024219C 0260302D */ daddu $a2, $s3, $zero /* A70580 802421A0 080908A5 */ j .L80242294 /* A70584 802421A4 0000102D */ daddu $v0, $zero, $zero /* A70588 802421A8 0280202D */ daddu $a0, $s4, $zero /* A7058C 802421AC 0200282D */ daddu $a1, $s0, $zero -/* A70590 802421B0 0C0904E3 */ jal func_8024138C +/* A70590 802421B0 0C0904E3 */ jal func_8024138C_A6F76C /* A70594 802421B4 0260302D */ daddu $a2, $s3, $zero /* A70598 802421B8 8E830070 */ lw $v1, 0x70($s4) /* A7059C 802421BC 24020010 */ addiu $v0, $zero, 0x10 @@ -111,7 +111,7 @@ glabel update_heroes_start_turn_A70404 /* A705A4 802421C4 0000102D */ daddu $v0, $zero, $zero /* A705A8 802421C8 0280202D */ daddu $a0, $s4, $zero /* A705AC 802421CC 0200282D */ daddu $a1, $s0, $zero -/* A705B0 802421D0 0C0905DF */ jal func_8024177C +/* A705B0 802421D0 0C0905DF */ jal func_8024177C_A6FB5C /* A705B4 802421D4 0260302D */ daddu $a2, $s3, $zero /* A705B8 802421D8 8E830070 */ lw $v1, 0x70($s4) /* A705BC 802421DC 24020011 */ addiu $v0, $zero, 0x11 @@ -119,31 +119,31 @@ glabel update_heroes_start_turn_A70404 /* A705C4 802421E4 0000102D */ daddu $v0, $zero, $zero /* A705C8 802421E8 0280202D */ daddu $a0, $s4, $zero /* A705CC 802421EC 0200282D */ daddu $a1, $s0, $zero -/* A705D0 802421F0 0C09061C */ jal func_80241870 +/* A705D0 802421F0 0C09061C */ jal func_80241870_A6FC50 /* A705D4 802421F4 0260302D */ daddu $a2, $s3, $zero /* A705D8 802421F8 080908A5 */ j .L80242294 /* A705DC 802421FC 0000102D */ daddu $v0, $zero, $zero /* A705E0 80242200 0280202D */ daddu $a0, $s4, $zero /* A705E4 80242204 0200282D */ daddu $a1, $s0, $zero -/* A705E8 80242208 0C0906AD */ jal func_80241AB4 +/* A705E8 80242208 0C0906AD */ jal func_80241AB4_A6FE94 /* A705EC 8024220C 0260302D */ daddu $a2, $s3, $zero /* A705F0 80242210 080908A5 */ j .L80242294 /* A705F4 80242214 0000102D */ daddu $v0, $zero, $zero /* A705F8 80242218 0280202D */ daddu $a0, $s4, $zero /* A705FC 8024221C 0200282D */ daddu $a1, $s0, $zero -/* A70600 80242220 0C0906BC */ jal func_80241AF0 +/* A70600 80242220 0C0906BC */ jal func_80241AF0_A6FED0 /* A70604 80242224 0260302D */ daddu $a2, $s3, $zero /* A70608 80242228 080908A5 */ j .L80242294 /* A7060C 8024222C 0000102D */ daddu $v0, $zero, $zero /* A70610 80242230 0280202D */ daddu $a0, $s4, $zero /* A70614 80242234 0200282D */ daddu $a1, $s0, $zero -/* A70618 80242238 0C09072F */ jal func_80241CBC +/* A70618 80242238 0C09072F */ jal func_80241CBC_A7009C /* A7061C 8024223C 0260302D */ daddu $a2, $s3, $zero /* A70620 80242240 080908A5 */ j .L80242294 /* A70624 80242244 0000102D */ daddu $v0, $zero, $zero /* A70628 80242248 0280202D */ daddu $a0, $s4, $zero /* A7062C 8024224C 0200282D */ daddu $a1, $s0, $zero -/* A70630 80242250 0C09074A */ jal func_80241D28 +/* A70630 80242250 0C09074A */ jal func_80241D28_A70108 /* A70634 80242254 0260302D */ daddu $a2, $s3, $zero /* A70638 80242258 8E830070 */ lw $v1, 0x70($s4) /* A7063C 8024225C 24020018 */ addiu $v0, $zero, 0x18 @@ -151,13 +151,13 @@ glabel update_heroes_start_turn_A70404 /* A70644 80242264 0000102D */ daddu $v0, $zero, $zero /* A70648 80242268 0280202D */ daddu $a0, $s4, $zero /* A7064C 8024226C 0200282D */ daddu $a1, $s0, $zero -/* A70650 80242270 0C090797 */ jal func_80241E5C +/* A70650 80242270 0C090797 */ jal func_80241E5C_A7023C /* A70654 80242274 0260302D */ daddu $a2, $s3, $zero /* A70658 80242278 080908A5 */ j .L80242294 /* A7065C 8024227C 0000102D */ daddu $v0, $zero, $zero /* A70660 80242280 0280202D */ daddu $a0, $s4, $zero /* A70664 80242284 0200282D */ daddu $a1, $s0, $zero -/* A70668 80242288 0C0907D3 */ jal func_80241F4C +/* A70668 80242288 0C0907D3 */ jal func_80241F4C_A7032C /* A7066C 8024228C 0260302D */ daddu $a2, $s3, $zero .L80242290: /* A70670 80242290 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s index 3d84874398..3639a44714 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s +++ b/asm/nonmatchings/world/area_kpa/kpa_70/A74B80/func_802406A4_A74F14.s @@ -232,25 +232,25 @@ glabel func_802406A4_A74F14 .L802409F4: /* A75264 802409F4 0260202D */ daddu $a0, $s3, $zero /* A75268 802409F8 0280282D */ daddu $a1, $s4, $zero -/* A7526C 802409FC 0C0900C4 */ jal func_80240310 +/* A7526C 802409FC 0C0900C4 */ jal func_80240310_A74B80 /* A75270 80240A00 02A0302D */ daddu $a2, $s5, $zero /* A75274 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: /* A75278 80240A08 0280282D */ daddu $a1, $s4, $zero -/* A7527C 80240A0C 0C0900E3 */ jal func_8024038C +/* A7527C 80240A0C 0C0900E3 */ jal func_8024038C_A74BFC /* A75280 80240A10 02A0302D */ daddu $a2, $s5, $zero /* A75284 80240A14 08090294 */ j .L80240A50 /* A75288 80240A18 00000000 */ nop .L80240A1C: /* A7528C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* A75290 80240A20 0280282D */ daddu $a1, $s4, $zero -/* A75294 80240A24 0C090130 */ jal func_802404C0 +/* A75294 80240A24 0C090130 */ jal func_802404C0_A74D30 /* A75298 80240A28 02A0302D */ daddu $a2, $s5, $zero /* A7529C 80240A2C 08090294 */ j .L80240A50 /* A752A0 80240A30 00000000 */ nop .L80240A34: /* A752A4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* A752A8 80240A38 0C090189 */ jal func_80240624 +/* A752A8 80240A38 0C090189 */ jal func_80240624_A74E94 /* A752AC 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* A752B0 80240A40 08090294 */ j .L80240A50 /* A752B4 80240A44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308.s deleted file mode 100644 index 71eae134ce..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240308 -/* A787C8 80240308 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A787CC 8024030C AFBF0010 */ sw $ra, 0x10($sp) -/* A787D0 80240310 8C82000C */ lw $v0, 0xc($a0) -/* A787D4 80240314 0C0B1EAF */ jal get_variable -/* A787D8 80240318 8C450000 */ lw $a1, ($v0) -/* A787DC 8024031C 0040182D */ daddu $v1, $v0, $zero -/* A787E0 80240320 10600012 */ beqz $v1, .L8024036C -/* A787E4 80240324 0000202D */ daddu $a0, $zero, $zero -/* A787E8 80240328 8C620000 */ lw $v0, ($v1) -/* A787EC 8024032C 5040000A */ beql $v0, $zero, .L80240358 -/* A787F0 80240330 00041080 */ sll $v0, $a0, 2 -/* A787F4 80240334 3C058024 */ lui $a1, 0x8024 -/* A787F8 80240338 24A52040 */ addiu $a1, $a1, 0x2040 -.L8024033C: -/* A787FC 8024033C 24630004 */ addiu $v1, $v1, 4 -/* A78800 80240340 24840001 */ addiu $a0, $a0, 1 -/* A78804 80240344 ACA20000 */ sw $v0, ($a1) -/* A78808 80240348 8C620000 */ lw $v0, ($v1) -/* A7880C 8024034C 1440FFFB */ bnez $v0, .L8024033C -/* A78810 80240350 24A50004 */ addiu $a1, $a1, 4 -/* A78814 80240354 00041080 */ sll $v0, $a0, 2 -.L80240358: -/* A78818 80240358 3C018024 */ lui $at, 0x8024 -/* A7881C 8024035C 00220821 */ addu $at, $at, $v0 -/* A78820 80240360 AC202040 */ sw $zero, 0x2040($at) -/* A78824 80240364 080900E5 */ j .L80240394 -/* A78828 80240368 00000000 */ nop -.L8024036C: -/* A7882C 8024036C 3C038024 */ lui $v1, 0x8024 -/* A78830 80240370 24632040 */ addiu $v1, $v1, 0x2040 -/* A78834 80240374 0060282D */ daddu $a1, $v1, $zero -.L80240378: -/* A78838 80240378 24820010 */ addiu $v0, $a0, 0x10 -/* A7883C 8024037C AC620000 */ sw $v0, ($v1) -/* A78840 80240380 24630004 */ addiu $v1, $v1, 4 -/* A78844 80240384 24840001 */ addiu $a0, $a0, 1 -/* A78848 80240388 28820070 */ slti $v0, $a0, 0x70 -/* A7884C 8024038C 1440FFFA */ bnez $v0, .L80240378 -/* A78850 80240390 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240394: -/* A78854 80240394 8FBF0010 */ lw $ra, 0x10($sp) -/* A78858 80240398 24020002 */ addiu $v0, $zero, 2 -/* A7885C 8024039C 03E00008 */ jr $ra -/* A78860 802403A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s new file mode 100644 index 0000000000..be0bb5e904 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_80240308_A787C8.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240308_A787C8 +/* A787C8 80240308 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A787CC 8024030C AFBF0010 */ sw $ra, 0x10($sp) +/* A787D0 80240310 8C82000C */ lw $v0, 0xc($a0) +/* A787D4 80240314 0C0B1EAF */ jal get_variable +/* A787D8 80240318 8C450000 */ lw $a1, ($v0) +/* A787DC 8024031C 0040182D */ daddu $v1, $v0, $zero +/* A787E0 80240320 10600012 */ beqz $v1, .L8024036C +/* A787E4 80240324 0000202D */ daddu $a0, $zero, $zero +/* A787E8 80240328 8C620000 */ lw $v0, ($v1) +/* A787EC 8024032C 5040000A */ beql $v0, $zero, .L80240358 +/* A787F0 80240330 00041080 */ sll $v0, $a0, 2 +/* A787F4 80240334 3C058024 */ lui $a1, 0x8024 +/* A787F8 80240338 24A52040 */ addiu $a1, $a1, 0x2040 +.L8024033C: +/* A787FC 8024033C 24630004 */ addiu $v1, $v1, 4 +/* A78800 80240340 24840001 */ addiu $a0, $a0, 1 +/* A78804 80240344 ACA20000 */ sw $v0, ($a1) +/* A78808 80240348 8C620000 */ lw $v0, ($v1) +/* A7880C 8024034C 1440FFFB */ bnez $v0, .L8024033C +/* A78810 80240350 24A50004 */ addiu $a1, $a1, 4 +/* A78814 80240354 00041080 */ sll $v0, $a0, 2 +.L80240358: +/* A78818 80240358 3C018024 */ lui $at, 0x8024 +/* A7881C 8024035C 00220821 */ addu $at, $at, $v0 +/* A78820 80240360 AC202040 */ sw $zero, 0x2040($at) +/* A78824 80240364 080900E5 */ j .L80240394 +/* A78828 80240368 00000000 */ nop +.L8024036C: +/* A7882C 8024036C 3C038024 */ lui $v1, 0x8024 +/* A78830 80240370 24632040 */ addiu $v1, $v1, 0x2040 +/* A78834 80240374 0060282D */ daddu $a1, $v1, $zero +.L80240378: +/* A78838 80240378 24820010 */ addiu $v0, $a0, 0x10 +/* A7883C 8024037C AC620000 */ sw $v0, ($v1) +/* A78840 80240380 24630004 */ addiu $v1, $v1, 4 +/* A78844 80240384 24840001 */ addiu $a0, $a0, 1 +/* A78848 80240388 28820070 */ slti $v0, $a0, 0x70 +/* A7884C 8024038C 1440FFFA */ bnez $v0, .L80240378 +/* A78850 80240390 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80240394: +/* A78854 80240394 8FBF0010 */ lw $ra, 0x10($sp) +/* A78858 80240398 24020002 */ addiu $v0, $zero, 2 +/* A7885C 8024039C 03E00008 */ jr $ra +/* A78860 802403A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4.s deleted file mode 100644 index 5df93e45d5..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A4 -/* A78864 802403A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A78868 802403A8 AFBF0010 */ sw $ra, 0x10($sp) -/* A7886C 802403AC 8C82000C */ lw $v0, 0xc($a0) -/* A78870 802403B0 0C0B1EAF */ jal get_variable -/* A78874 802403B4 8C450000 */ lw $a1, ($v0) -/* A78878 802403B8 0040182D */ daddu $v1, $v0, $zero -/* A7887C 802403BC 10600012 */ beqz $v1, .L80240408 -/* A78880 802403C0 0000202D */ daddu $a0, $zero, $zero -/* A78884 802403C4 8C620000 */ lw $v0, ($v1) -/* A78888 802403C8 5040000A */ beql $v0, $zero, .L802403F4 -/* A7888C 802403CC 00041080 */ sll $v0, $a0, 2 -/* A78890 802403D0 3C058024 */ lui $a1, 0x8024 -/* A78894 802403D4 24A52208 */ addiu $a1, $a1, 0x2208 -.L802403D8: -/* A78898 802403D8 24630004 */ addiu $v1, $v1, 4 -/* A7889C 802403DC 24840001 */ addiu $a0, $a0, 1 -/* A788A0 802403E0 ACA20000 */ sw $v0, ($a1) -/* A788A4 802403E4 8C620000 */ lw $v0, ($v1) -/* A788A8 802403E8 1440FFFB */ bnez $v0, .L802403D8 -/* A788AC 802403EC 24A50004 */ addiu $a1, $a1, 4 -/* A788B0 802403F0 00041080 */ sll $v0, $a0, 2 -.L802403F4: -/* A788B4 802403F4 3C018024 */ lui $at, 0x8024 -/* A788B8 802403F8 00220821 */ addu $at, $at, $v0 -/* A788BC 802403FC AC202208 */ sw $zero, 0x2208($at) -/* A788C0 80240400 0809010C */ j .L80240430 -/* A788C4 80240404 00000000 */ nop -.L80240408: -/* A788C8 80240408 3C038024 */ lui $v1, 0x8024 -/* A788CC 8024040C 24632208 */ addiu $v1, $v1, 0x2208 -/* A788D0 80240410 0060282D */ daddu $a1, $v1, $zero -.L80240414: -/* A788D4 80240414 24820080 */ addiu $v0, $a0, 0x80 -/* A788D8 80240418 AC620000 */ sw $v0, ($v1) -/* A788DC 8024041C 24630004 */ addiu $v1, $v1, 4 -/* A788E0 80240420 24840001 */ addiu $a0, $a0, 1 -/* A788E4 80240424 2882005B */ slti $v0, $a0, 0x5b -/* A788E8 80240428 1440FFFA */ bnez $v0, .L80240414 -/* A788EC 8024042C ACA0016C */ sw $zero, 0x16c($a1) -.L80240430: -/* A788F0 80240430 8FBF0010 */ lw $ra, 0x10($sp) -/* A788F4 80240434 24020002 */ addiu $v0, $zero, 2 -/* A788F8 80240438 03E00008 */ jr $ra -/* A788FC 8024043C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s new file mode 100644 index 0000000000..c304cb5cb3 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_81/A78510/func_802403A4_A78864.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403A4_A78864 +/* A78864 802403A4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A78868 802403A8 AFBF0010 */ sw $ra, 0x10($sp) +/* A7886C 802403AC 8C82000C */ lw $v0, 0xc($a0) +/* A78870 802403B0 0C0B1EAF */ jal get_variable +/* A78874 802403B4 8C450000 */ lw $a1, ($v0) +/* A78878 802403B8 0040182D */ daddu $v1, $v0, $zero +/* A7887C 802403BC 10600012 */ beqz $v1, .L80240408 +/* A78880 802403C0 0000202D */ daddu $a0, $zero, $zero +/* A78884 802403C4 8C620000 */ lw $v0, ($v1) +/* A78888 802403C8 5040000A */ beql $v0, $zero, .L802403F4 +/* A7888C 802403CC 00041080 */ sll $v0, $a0, 2 +/* A78890 802403D0 3C058024 */ lui $a1, 0x8024 +/* A78894 802403D4 24A52208 */ addiu $a1, $a1, 0x2208 +.L802403D8: +/* A78898 802403D8 24630004 */ addiu $v1, $v1, 4 +/* A7889C 802403DC 24840001 */ addiu $a0, $a0, 1 +/* A788A0 802403E0 ACA20000 */ sw $v0, ($a1) +/* A788A4 802403E4 8C620000 */ lw $v0, ($v1) +/* A788A8 802403E8 1440FFFB */ bnez $v0, .L802403D8 +/* A788AC 802403EC 24A50004 */ addiu $a1, $a1, 4 +/* A788B0 802403F0 00041080 */ sll $v0, $a0, 2 +.L802403F4: +/* A788B4 802403F4 3C018024 */ lui $at, 0x8024 +/* A788B8 802403F8 00220821 */ addu $at, $at, $v0 +/* A788BC 802403FC AC202208 */ sw $zero, 0x2208($at) +/* A788C0 80240400 0809010C */ j .L80240430 +/* A788C4 80240404 00000000 */ nop +.L80240408: +/* A788C8 80240408 3C038024 */ lui $v1, 0x8024 +/* A788CC 8024040C 24632208 */ addiu $v1, $v1, 0x2208 +/* A788D0 80240410 0060282D */ daddu $a1, $v1, $zero +.L80240414: +/* A788D4 80240414 24820080 */ addiu $v0, $a0, 0x80 +/* A788D8 80240418 AC620000 */ sw $v0, ($v1) +/* A788DC 8024041C 24630004 */ addiu $v1, $v1, 4 +/* A788E0 80240420 24840001 */ addiu $a0, $a0, 1 +/* A788E4 80240424 2882005B */ slti $v0, $a0, 0x5b +/* A788E8 80240428 1440FFFA */ bnez $v0, .L80240414 +/* A788EC 8024042C ACA0016C */ sw $zero, 0x16c($a1) +.L80240430: +/* A788F0 80240430 8FBF0010 */ lw $ra, 0x10($sp) +/* A788F4 80240434 24020002 */ addiu $v0, $zero, 2 +/* A788F8 80240438 03E00008 */ jr $ra +/* A788FC 8024043C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C.s deleted file mode 100644 index 6e73902f42..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024067C -/* A870CC 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A870D0 80240680 AFB10014 */ sw $s1, 0x14($sp) -/* A870D4 80240684 0080882D */ daddu $s1, $a0, $zero -/* A870D8 80240688 AFBF001C */ sw $ra, 0x1c($sp) -/* A870DC 8024068C AFB20018 */ sw $s2, 0x18($sp) -/* A870E0 80240690 AFB00010 */ sw $s0, 0x10($sp) -/* A870E4 80240694 8E300148 */ lw $s0, 0x148($s1) -/* A870E8 80240698 86040008 */ lh $a0, 8($s0) -/* A870EC 8024069C 0C00EABB */ jal get_npc_unsafe -/* A870F0 802406A0 00A0902D */ daddu $s2, $a1, $zero -/* A870F4 802406A4 8E230078 */ lw $v1, 0x78($s1) -/* A870F8 802406A8 24630001 */ addiu $v1, $v1, 1 -/* A870FC 802406AC AE230078 */ sw $v1, 0x78($s1) -/* A87100 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) -/* A87104 802406B4 8C840000 */ lw $a0, ($a0) -/* A87108 802406B8 0064182A */ slt $v1, $v1, $a0 -/* A8710C 802406BC 14600002 */ bnez $v1, .L802406C8 -/* A87110 802406C0 0040282D */ daddu $a1, $v0, $zero -/* A87114 802406C4 AE200078 */ sw $zero, 0x78($s1) -.L802406C8: -/* A87118 802406C8 8E0200CC */ lw $v0, 0xcc($s0) -/* A8711C 802406CC 8C420004 */ lw $v0, 4($v0) -/* A87120 802406D0 ACA20028 */ sw $v0, 0x28($a1) -/* A87124 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) -/* A87128 802406D8 8C42007C */ lw $v0, 0x7c($v0) -/* A8712C 802406DC 04410004 */ bgez $v0, .L802406F0 -/* A87130 802406E0 00000000 */ nop -/* A87134 802406E4 C6400000 */ lwc1 $f0, ($s2) -/* A87138 802406E8 080901C4 */ j .L80240710 -/* A8713C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) -.L802406F0: -/* A87140 802406F0 3C018024 */ lui $at, 0x8024 -/* A87144 802406F4 D4225A38 */ ldc1 $f2, 0x5a38($at) -/* A87148 802406F8 44820000 */ mtc1 $v0, $f0 -/* A8714C 802406FC 00000000 */ nop -/* A87150 80240700 46800021 */ cvt.d.w $f0, $f0 -/* A87154 80240704 46220003 */ div.d $f0, $f0, $f2 -/* A87158 80240708 46200020 */ cvt.s.d $f0, $f0 -/* A8715C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240710: -/* A87160 80240710 24020001 */ addiu $v0, $zero, 1 -/* A87164 80240714 AE220070 */ sw $v0, 0x70($s1) -/* A87168 80240718 8FBF001C */ lw $ra, 0x1c($sp) -/* A8716C 8024071C 8FB20018 */ lw $s2, 0x18($sp) -/* A87170 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* A87174 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* A87178 80240728 03E00008 */ jr $ra -/* A8717C 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s new file mode 100644 index 0000000000..6286a88426 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024067C_A870CC.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024067C_A870CC +/* A870CC 8024067C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A870D0 80240680 AFB10014 */ sw $s1, 0x14($sp) +/* A870D4 80240684 0080882D */ daddu $s1, $a0, $zero +/* A870D8 80240688 AFBF001C */ sw $ra, 0x1c($sp) +/* A870DC 8024068C AFB20018 */ sw $s2, 0x18($sp) +/* A870E0 80240690 AFB00010 */ sw $s0, 0x10($sp) +/* A870E4 80240694 8E300148 */ lw $s0, 0x148($s1) +/* A870E8 80240698 86040008 */ lh $a0, 8($s0) +/* A870EC 8024069C 0C00EABB */ jal get_npc_unsafe +/* A870F0 802406A0 00A0902D */ daddu $s2, $a1, $zero +/* A870F4 802406A4 8E230078 */ lw $v1, 0x78($s1) +/* A870F8 802406A8 24630001 */ addiu $v1, $v1, 1 +/* A870FC 802406AC AE230078 */ sw $v1, 0x78($s1) +/* A87100 802406B0 8E0400D0 */ lw $a0, 0xd0($s0) +/* A87104 802406B4 8C840000 */ lw $a0, ($a0) +/* A87108 802406B8 0064182A */ slt $v1, $v1, $a0 +/* A8710C 802406BC 14600002 */ bnez $v1, .L802406C8 +/* A87110 802406C0 0040282D */ daddu $a1, $v0, $zero +/* A87114 802406C4 AE200078 */ sw $zero, 0x78($s1) +.L802406C8: +/* A87118 802406C8 8E0200CC */ lw $v0, 0xcc($s0) +/* A8711C 802406CC 8C420004 */ lw $v0, 4($v0) +/* A87120 802406D0 ACA20028 */ sw $v0, 0x28($a1) +/* A87124 802406D4 8E0200D0 */ lw $v0, 0xd0($s0) +/* A87128 802406D8 8C42007C */ lw $v0, 0x7c($v0) +/* A8712C 802406DC 04410004 */ bgez $v0, .L802406F0 +/* A87130 802406E0 00000000 */ nop +/* A87134 802406E4 C6400000 */ lwc1 $f0, ($s2) +/* A87138 802406E8 080901C4 */ j .L80240710 +/* A8713C 802406EC E4A00018 */ swc1 $f0, 0x18($a1) +.L802406F0: +/* A87140 802406F0 3C018024 */ lui $at, 0x8024 +/* A87144 802406F4 D4225A38 */ ldc1 $f2, 0x5a38($at) +/* A87148 802406F8 44820000 */ mtc1 $v0, $f0 +/* A8714C 802406FC 00000000 */ nop +/* A87150 80240700 46800021 */ cvt.d.w $f0, $f0 +/* A87154 80240704 46220003 */ div.d $f0, $f0, $f2 +/* A87158 80240708 46200020 */ cvt.s.d $f0, $f0 +/* A8715C 8024070C E4A00018 */ swc1 $f0, 0x18($a1) +.L80240710: +/* A87160 80240710 24020001 */ addiu $v0, $zero, 1 +/* A87164 80240714 AE220070 */ sw $v0, 0x70($s1) +/* A87168 80240718 8FBF001C */ lw $ra, 0x1c($sp) +/* A8716C 8024071C 8FB20018 */ lw $s2, 0x18($sp) +/* A87170 80240720 8FB10014 */ lw $s1, 0x14($sp) +/* A87174 80240724 8FB00010 */ lw $s0, 0x10($sp) +/* A87178 80240728 03E00008 */ jr $ra +/* A8717C 8024072C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C.s deleted file mode 100644 index 1451a03c44..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024094C -/* A8739C 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A873A0 80240950 AFB3003C */ sw $s3, 0x3c($sp) -/* A873A4 80240954 0080982D */ daddu $s3, $a0, $zero -/* A873A8 80240958 AFBF0040 */ sw $ra, 0x40($sp) -/* A873AC 8024095C AFB20038 */ sw $s2, 0x38($sp) -/* A873B0 80240960 AFB10034 */ sw $s1, 0x34($sp) -/* A873B4 80240964 AFB00030 */ sw $s0, 0x30($sp) -/* A873B8 80240968 8E720148 */ lw $s2, 0x148($s3) -/* A873BC 8024096C 00A0882D */ daddu $s1, $a1, $zero -/* A873C0 80240970 86440008 */ lh $a0, 8($s2) -/* A873C4 80240974 0C00EABB */ jal get_npc_unsafe -/* A873C8 80240978 00C0802D */ daddu $s0, $a2, $zero -/* A873CC 8024097C 0200202D */ daddu $a0, $s0, $zero -/* A873D0 80240980 0240282D */ daddu $a1, $s2, $zero -/* A873D4 80240984 24030001 */ addiu $v1, $zero, 1 -/* A873D8 80240988 AFA30010 */ sw $v1, 0x10($sp) -/* A873DC 8024098C 8E260024 */ lw $a2, 0x24($s1) -/* A873E0 80240990 8E270028 */ lw $a3, 0x28($s1) -/* A873E4 80240994 0C01242D */ jal func_800490B4 -/* A873E8 80240998 0040802D */ daddu $s0, $v0, $zero -/* A873EC 8024099C 1440001E */ bnez $v0, .L80240A18 -/* A873F0 802409A0 0200202D */ daddu $a0, $s0, $zero -/* A873F4 802409A4 24040002 */ addiu $a0, $zero, 2 -/* A873F8 802409A8 0200282D */ daddu $a1, $s0, $zero -/* A873FC 802409AC 0000302D */ daddu $a2, $zero, $zero -/* A87400 802409B0 860300A8 */ lh $v1, 0xa8($s0) -/* A87404 802409B4 3C013F80 */ lui $at, 0x3f80 -/* A87408 802409B8 44810000 */ mtc1 $at, $f0 -/* A8740C 802409BC 3C014000 */ lui $at, 0x4000 -/* A87410 802409C0 44811000 */ mtc1 $at, $f2 -/* A87414 802409C4 3C01C1A0 */ lui $at, 0xc1a0 -/* A87418 802409C8 44812000 */ mtc1 $at, $f4 -/* A8741C 802409CC 2402000F */ addiu $v0, $zero, 0xf -/* A87420 802409D0 AFA2001C */ sw $v0, 0x1c($sp) -/* A87424 802409D4 44833000 */ mtc1 $v1, $f6 -/* A87428 802409D8 00000000 */ nop -/* A8742C 802409DC 468031A0 */ cvt.s.w $f6, $f6 -/* A87430 802409E0 44073000 */ mfc1 $a3, $f6 -/* A87434 802409E4 27A20028 */ addiu $v0, $sp, 0x28 -/* A87438 802409E8 AFA20020 */ sw $v0, 0x20($sp) -/* A8743C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) -/* A87440 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A87444 802409F4 0C01BFA4 */ jal fx_emote -/* A87448 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8744C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* A87450 80240A00 8C430000 */ lw $v1, ($v0) -/* A87454 80240A04 24020019 */ addiu $v0, $zero, 0x19 -/* A87458 80240A08 A602008E */ sh $v0, 0x8e($s0) -/* A8745C 80240A0C 2402000E */ addiu $v0, $zero, 0xe -/* A87460 80240A10 08090293 */ j .L80240A4C -/* A87464 80240A14 AE030028 */ sw $v1, 0x28($s0) -.L80240A18: -/* A87468 80240A18 0C00F598 */ jal func_8003D660 -/* A8746C 80240A1C 24050001 */ addiu $a1, $zero, 1 -/* A87470 80240A20 8E050018 */ lw $a1, 0x18($s0) -/* A87474 80240A24 8E06000C */ lw $a2, 0xc($s0) -/* A87478 80240A28 0C00EA95 */ jal npc_move_heading -/* A8747C 80240A2C 0200202D */ daddu $a0, $s0, $zero -/* A87480 80240A30 8602008E */ lh $v0, 0x8e($s0) -/* A87484 80240A34 9603008E */ lhu $v1, 0x8e($s0) -/* A87488 80240A38 18400003 */ blez $v0, .L80240A48 -/* A8748C 80240A3C 2462FFFF */ addiu $v0, $v1, -1 -/* A87490 80240A40 08090294 */ j .L80240A50 -/* A87494 80240A44 A602008E */ sh $v0, 0x8e($s0) -.L80240A48: -/* A87498 80240A48 2402000C */ addiu $v0, $zero, 0xc -.L80240A4C: -/* A8749C 80240A4C AE620070 */ sw $v0, 0x70($s3) -.L80240A50: -/* A874A0 80240A50 8FBF0040 */ lw $ra, 0x40($sp) -/* A874A4 80240A54 8FB3003C */ lw $s3, 0x3c($sp) -/* A874A8 80240A58 8FB20038 */ lw $s2, 0x38($sp) -/* A874AC 80240A5C 8FB10034 */ lw $s1, 0x34($sp) -/* A874B0 80240A60 8FB00030 */ lw $s0, 0x30($sp) -/* A874B4 80240A64 03E00008 */ jr $ra -/* A874B8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s new file mode 100644 index 0000000000..63b8d993cb --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024094C_A8739C.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024094C_A8739C +/* A8739C 8024094C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A873A0 80240950 AFB3003C */ sw $s3, 0x3c($sp) +/* A873A4 80240954 0080982D */ daddu $s3, $a0, $zero +/* A873A8 80240958 AFBF0040 */ sw $ra, 0x40($sp) +/* A873AC 8024095C AFB20038 */ sw $s2, 0x38($sp) +/* A873B0 80240960 AFB10034 */ sw $s1, 0x34($sp) +/* A873B4 80240964 AFB00030 */ sw $s0, 0x30($sp) +/* A873B8 80240968 8E720148 */ lw $s2, 0x148($s3) +/* A873BC 8024096C 00A0882D */ daddu $s1, $a1, $zero +/* A873C0 80240970 86440008 */ lh $a0, 8($s2) +/* A873C4 80240974 0C00EABB */ jal get_npc_unsafe +/* A873C8 80240978 00C0802D */ daddu $s0, $a2, $zero +/* A873CC 8024097C 0200202D */ daddu $a0, $s0, $zero +/* A873D0 80240980 0240282D */ daddu $a1, $s2, $zero +/* A873D4 80240984 24030001 */ addiu $v1, $zero, 1 +/* A873D8 80240988 AFA30010 */ sw $v1, 0x10($sp) +/* A873DC 8024098C 8E260024 */ lw $a2, 0x24($s1) +/* A873E0 80240990 8E270028 */ lw $a3, 0x28($s1) +/* A873E4 80240994 0C01242D */ jal func_800490B4 +/* A873E8 80240998 0040802D */ daddu $s0, $v0, $zero +/* A873EC 8024099C 1440001E */ bnez $v0, .L80240A18 +/* A873F0 802409A0 0200202D */ daddu $a0, $s0, $zero +/* A873F4 802409A4 24040002 */ addiu $a0, $zero, 2 +/* A873F8 802409A8 0200282D */ daddu $a1, $s0, $zero +/* A873FC 802409AC 0000302D */ daddu $a2, $zero, $zero +/* A87400 802409B0 860300A8 */ lh $v1, 0xa8($s0) +/* A87404 802409B4 3C013F80 */ lui $at, 0x3f80 +/* A87408 802409B8 44810000 */ mtc1 $at, $f0 +/* A8740C 802409BC 3C014000 */ lui $at, 0x4000 +/* A87410 802409C0 44811000 */ mtc1 $at, $f2 +/* A87414 802409C4 3C01C1A0 */ lui $at, 0xc1a0 +/* A87418 802409C8 44812000 */ mtc1 $at, $f4 +/* A8741C 802409CC 2402000F */ addiu $v0, $zero, 0xf +/* A87420 802409D0 AFA2001C */ sw $v0, 0x1c($sp) +/* A87424 802409D4 44833000 */ mtc1 $v1, $f6 +/* A87428 802409D8 00000000 */ nop +/* A8742C 802409DC 468031A0 */ cvt.s.w $f6, $f6 +/* A87430 802409E0 44073000 */ mfc1 $a3, $f6 +/* A87434 802409E4 27A20028 */ addiu $v0, $sp, 0x28 +/* A87438 802409E8 AFA20020 */ sw $v0, 0x20($sp) +/* A8743C 802409EC E7A00010 */ swc1 $f0, 0x10($sp) +/* A87440 802409F0 E7A20014 */ swc1 $f2, 0x14($sp) +/* A87444 802409F4 0C01BFA4 */ jal fx_emote +/* A87448 802409F8 E7A40018 */ swc1 $f4, 0x18($sp) +/* A8744C 802409FC 8E4200CC */ lw $v0, 0xcc($s2) +/* A87450 80240A00 8C430000 */ lw $v1, ($v0) +/* A87454 80240A04 24020019 */ addiu $v0, $zero, 0x19 +/* A87458 80240A08 A602008E */ sh $v0, 0x8e($s0) +/* A8745C 80240A0C 2402000E */ addiu $v0, $zero, 0xe +/* A87460 80240A10 08090293 */ j .L80240A4C +/* A87464 80240A14 AE030028 */ sw $v1, 0x28($s0) +.L80240A18: +/* A87468 80240A18 0C00F598 */ jal func_8003D660 +/* A8746C 80240A1C 24050001 */ addiu $a1, $zero, 1 +/* A87470 80240A20 8E050018 */ lw $a1, 0x18($s0) +/* A87474 80240A24 8E06000C */ lw $a2, 0xc($s0) +/* A87478 80240A28 0C00EA95 */ jal npc_move_heading +/* A8747C 80240A2C 0200202D */ daddu $a0, $s0, $zero +/* A87480 80240A30 8602008E */ lh $v0, 0x8e($s0) +/* A87484 80240A34 9603008E */ lhu $v1, 0x8e($s0) +/* A87488 80240A38 18400003 */ blez $v0, .L80240A48 +/* A8748C 80240A3C 2462FFFF */ addiu $v0, $v1, -1 +/* A87490 80240A40 08090294 */ j .L80240A50 +/* A87494 80240A44 A602008E */ sh $v0, 0x8e($s0) +.L80240A48: +/* A87498 80240A48 2402000C */ addiu $v0, $zero, 0xc +.L80240A4C: +/* A8749C 80240A4C AE620070 */ sw $v0, 0x70($s3) +.L80240A50: +/* A874A0 80240A50 8FBF0040 */ lw $ra, 0x40($sp) +/* A874A4 80240A54 8FB3003C */ lw $s3, 0x3c($sp) +/* A874A8 80240A58 8FB20038 */ lw $s2, 0x38($sp) +/* A874AC 80240A5C 8FB10034 */ lw $s1, 0x34($sp) +/* A874B0 80240A60 8FB00030 */ lw $s0, 0x30($sp) +/* A874B4 80240A64 03E00008 */ jr $ra +/* A874B8 80240A68 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4.s deleted file mode 100644 index e2b98a36d9..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD4 -/* A87524 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A87528 80240AD8 AFB10014 */ sw $s1, 0x14($sp) -/* A8752C 80240ADC 0080882D */ daddu $s1, $a0, $zero -/* A87530 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) -/* A87534 80240AE4 AFB20018 */ sw $s2, 0x18($sp) -/* A87538 80240AE8 AFB00010 */ sw $s0, 0x10($sp) -/* A8753C 80240AEC 8E300148 */ lw $s0, 0x148($s1) -/* A87540 80240AF0 86040008 */ lh $a0, 8($s0) -/* A87544 80240AF4 0C00EABB */ jal get_npc_unsafe -/* A87548 80240AF8 00A0902D */ daddu $s2, $a1, $zero -/* A8754C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) -/* A87550 80240B00 8E240078 */ lw $a0, 0x78($s1) -/* A87554 80240B04 8C630000 */ lw $v1, ($v1) -/* A87558 80240B08 0083182A */ slt $v1, $a0, $v1 -/* A8755C 80240B0C 10600013 */ beqz $v1, .L80240B5C -/* A87560 80240B10 0040302D */ daddu $a2, $v0, $zero -/* A87564 80240B14 00041040 */ sll $v0, $a0, 1 -/* A87568 80240B18 00441021 */ addu $v0, $v0, $a0 -/* A8756C 80240B1C 00022880 */ sll $a1, $v0, 2 -.L80240B20: -/* A87570 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) -/* A87574 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* A87578 80240B28 00A31021 */ addu $v0, $a1, $v1 -/* A8757C 80240B2C C4400008 */ lwc1 $f0, 8($v0) -/* A87580 80240B30 46800020 */ cvt.s.w $f0, $f0 -/* A87584 80240B34 4602003E */ c.le.s $f0, $f2 -/* A87588 80240B38 00000000 */ nop -/* A8758C 80240B3C 45020003 */ bc1fl .L80240B4C -/* A87590 80240B40 24840001 */ addiu $a0, $a0, 1 -/* A87594 80240B44 080902D7 */ j .L80240B5C -/* A87598 80240B48 AE240078 */ sw $a0, 0x78($s1) -.L80240B4C: -/* A8759C 80240B4C 8C620000 */ lw $v0, ($v1) -/* A875A0 80240B50 0082102A */ slt $v0, $a0, $v0 -/* A875A4 80240B54 1440FFF2 */ bnez $v0, .L80240B20 -/* A875A8 80240B58 24A5000C */ addiu $a1, $a1, 0xc -.L80240B5C: -/* A875AC 80240B5C C6400000 */ lwc1 $f0, ($s2) -/* A875B0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) -/* A875B4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) -/* A875B8 80240B68 8C420004 */ lw $v0, 4($v0) -/* A875BC 80240B6C ACC20028 */ sw $v0, 0x28($a2) -/* A875C0 80240B70 24020001 */ addiu $v0, $zero, 1 -/* A875C4 80240B74 AE200074 */ sw $zero, 0x74($s1) -/* A875C8 80240B78 AE220070 */ sw $v0, 0x70($s1) -/* A875CC 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) -/* A875D0 80240B80 8FB20018 */ lw $s2, 0x18($sp) -/* A875D4 80240B84 8FB10014 */ lw $s1, 0x14($sp) -/* A875D8 80240B88 8FB00010 */ lw $s0, 0x10($sp) -/* A875DC 80240B8C 03E00008 */ jr $ra -/* A875E0 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s new file mode 100644 index 0000000000..5b0910c64f --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240AD4_A87524.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AD4_A87524 +/* A87524 80240AD4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A87528 80240AD8 AFB10014 */ sw $s1, 0x14($sp) +/* A8752C 80240ADC 0080882D */ daddu $s1, $a0, $zero +/* A87530 80240AE0 AFBF001C */ sw $ra, 0x1c($sp) +/* A87534 80240AE4 AFB20018 */ sw $s2, 0x18($sp) +/* A87538 80240AE8 AFB00010 */ sw $s0, 0x10($sp) +/* A8753C 80240AEC 8E300148 */ lw $s0, 0x148($s1) +/* A87540 80240AF0 86040008 */ lh $a0, 8($s0) +/* A87544 80240AF4 0C00EABB */ jal get_npc_unsafe +/* A87548 80240AF8 00A0902D */ daddu $s2, $a1, $zero +/* A8754C 80240AFC 8E0300D0 */ lw $v1, 0xd0($s0) +/* A87550 80240B00 8E240078 */ lw $a0, 0x78($s1) +/* A87554 80240B04 8C630000 */ lw $v1, ($v1) +/* A87558 80240B08 0083182A */ slt $v1, $a0, $v1 +/* A8755C 80240B0C 10600013 */ beqz $v1, .L80240B5C +/* A87560 80240B10 0040302D */ daddu $a2, $v0, $zero +/* A87564 80240B14 00041040 */ sll $v0, $a0, 1 +/* A87568 80240B18 00441021 */ addu $v0, $v0, $a0 +/* A8756C 80240B1C 00022880 */ sll $a1, $v0, 2 +.L80240B20: +/* A87570 80240B20 8E0300D0 */ lw $v1, 0xd0($s0) +/* A87574 80240B24 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* A87578 80240B28 00A31021 */ addu $v0, $a1, $v1 +/* A8757C 80240B2C C4400008 */ lwc1 $f0, 8($v0) +/* A87580 80240B30 46800020 */ cvt.s.w $f0, $f0 +/* A87584 80240B34 4602003E */ c.le.s $f0, $f2 +/* A87588 80240B38 00000000 */ nop +/* A8758C 80240B3C 45020003 */ bc1fl .L80240B4C +/* A87590 80240B40 24840001 */ addiu $a0, $a0, 1 +/* A87594 80240B44 080902D7 */ j .L80240B5C +/* A87598 80240B48 AE240078 */ sw $a0, 0x78($s1) +.L80240B4C: +/* A8759C 80240B4C 8C620000 */ lw $v0, ($v1) +/* A875A0 80240B50 0082102A */ slt $v0, $a0, $v0 +/* A875A4 80240B54 1440FFF2 */ bnez $v0, .L80240B20 +/* A875A8 80240B58 24A5000C */ addiu $a1, $a1, 0xc +.L80240B5C: +/* A875AC 80240B5C C6400000 */ lwc1 $f0, ($s2) +/* A875B0 80240B60 E4C00018 */ swc1 $f0, 0x18($a2) +/* A875B4 80240B64 8E0200CC */ lw $v0, 0xcc($s0) +/* A875B8 80240B68 8C420004 */ lw $v0, 4($v0) +/* A875BC 80240B6C ACC20028 */ sw $v0, 0x28($a2) +/* A875C0 80240B70 24020001 */ addiu $v0, $zero, 1 +/* A875C4 80240B74 AE200074 */ sw $zero, 0x74($s1) +/* A875C8 80240B78 AE220070 */ sw $v0, 0x70($s1) +/* A875CC 80240B7C 8FBF001C */ lw $ra, 0x1c($sp) +/* A875D0 80240B80 8FB20018 */ lw $s2, 0x18($sp) +/* A875D4 80240B84 8FB10014 */ lw $s1, 0x14($sp) +/* A875D8 80240B88 8FB00010 */ lw $s0, 0x10($sp) +/* A875DC 80240B8C 03E00008 */ jr $ra +/* A875E0 80240B90 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s deleted file mode 100644 index f0b2556817..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B94 -/* A875E4 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 -/* A875E8 80240B98 AFB40058 */ sw $s4, 0x58($sp) -/* A875EC 80240B9C 0080A02D */ daddu $s4, $a0, $zero -/* A875F0 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) -/* A875F4 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) -/* A875F8 80240BA8 AFB30054 */ sw $s3, 0x54($sp) -/* A875FC 80240BAC AFB20050 */ sw $s2, 0x50($sp) -/* A87600 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) -/* A87604 80240BB4 AFB00048 */ sw $s0, 0x48($sp) -/* A87608 80240BB8 8E910148 */ lw $s1, 0x148($s4) -/* A8760C 80240BBC 86240008 */ lh $a0, 8($s1) -/* A87610 80240BC0 0C00EABB */ jal get_npc_unsafe -/* A87614 80240BC4 00A0802D */ daddu $s0, $a1, $zero -/* A87618 80240BC8 8E83000C */ lw $v1, 0xc($s4) -/* A8761C 80240BCC 0280202D */ daddu $a0, $s4, $zero -/* A87620 80240BD0 8C650000 */ lw $a1, ($v1) -/* A87624 80240BD4 0C0B1EAF */ jal get_variable -/* A87628 80240BD8 0040902D */ daddu $s2, $v0, $zero -/* A8762C 80240BDC AFA00018 */ sw $zero, 0x18($sp) -/* A87630 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87634 80240BE4 8C630094 */ lw $v1, 0x94($v1) -/* A87638 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) -/* A8763C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87640 80240BF0 8C630080 */ lw $v1, 0x80($v1) -/* A87644 80240BF4 AFA30020 */ sw $v1, 0x20($sp) -/* A87648 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8764C 80240BFC 8C630088 */ lw $v1, 0x88($v1) -/* A87650 80240C00 AFA30024 */ sw $v1, 0x24($sp) -/* A87654 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87658 80240C08 8C63008C */ lw $v1, 0x8c($v1) -/* A8765C 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 -/* A87660 80240C10 AFA30028 */ sw $v1, 0x28($sp) -/* A87664 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) -/* A87668 80240C18 3C014282 */ lui $at, 0x4282 -/* A8766C 80240C1C 44810000 */ mtc1 $at, $f0 -/* A87670 80240C20 8C630090 */ lw $v1, 0x90($v1) -/* A87674 80240C24 0040982D */ daddu $s3, $v0, $zero -/* A87678 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) -/* A8767C 80240C2C A7A00034 */ sh $zero, 0x34($sp) -/* A87680 80240C30 16000005 */ bnez $s0, .L80240C48 -/* A87684 80240C34 AFA3002C */ sw $v1, 0x2c($sp) -/* A87688 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8768C 80240C3C 30420004 */ andi $v0, $v0, 4 -/* A87690 80240C40 10400044 */ beqz $v0, .L80240D54 -/* A87694 80240C44 00000000 */ nop -.L80240C48: -/* A87698 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 -/* A8769C 80240C4C AE800070 */ sw $zero, 0x70($s4) -/* A876A0 80240C50 A640008E */ sh $zero, 0x8e($s2) -/* A876A4 80240C54 8E2200CC */ lw $v0, 0xcc($s1) -/* A876A8 80240C58 8E430000 */ lw $v1, ($s2) -/* A876AC 80240C5C 8C420000 */ lw $v0, ($v0) -/* A876B0 80240C60 00641824 */ and $v1, $v1, $a0 -/* A876B4 80240C64 AE430000 */ sw $v1, ($s2) -/* A876B8 80240C68 AE420028 */ sw $v0, 0x28($s2) -/* A876BC 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A876C0 80240C70 8C420098 */ lw $v0, 0x98($v0) -/* A876C4 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C -/* A876C8 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 -/* A876CC 80240C7C 34620200 */ ori $v0, $v1, 0x200 -/* A876D0 80240C80 2403FFF7 */ addiu $v1, $zero, -9 -/* A876D4 80240C84 08090325 */ j .L80240C94 -/* A876D8 80240C88 00431024 */ and $v0, $v0, $v1 -.L80240C8C: -/* A876DC 80240C8C 00621024 */ and $v0, $v1, $v0 -/* A876E0 80240C90 34420008 */ ori $v0, $v0, 8 -.L80240C94: -/* A876E4 80240C94 AE420000 */ sw $v0, ($s2) -/* A876E8 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) -/* A876EC 80240C9C 30420004 */ andi $v0, $v0, 4 -/* A876F0 80240CA0 10400008 */ beqz $v0, .L80240CC4 -/* A876F4 80240CA4 24020063 */ addiu $v0, $zero, 0x63 -/* A876F8 80240CA8 AE820070 */ sw $v0, 0x70($s4) -/* A876FC 80240CAC AE800074 */ sw $zero, 0x74($s4) -/* A87700 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A87704 80240CB4 2403FFFB */ addiu $v1, $zero, -5 -/* A87708 80240CB8 00431024 */ and $v0, $v0, $v1 -/* A8770C 80240CBC 0809033C */ j .L80240CF0 -/* A87710 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240CC4: -/* A87714 80240CC4 8E220000 */ lw $v0, ($s1) -/* A87718 80240CC8 3C034000 */ lui $v1, 0x4000 -/* A8771C 80240CCC 00431024 */ and $v0, $v0, $v1 -/* A87720 80240CD0 10400007 */ beqz $v0, .L80240CF0 -/* A87724 80240CD4 3C03BFFF */ lui $v1, 0xbfff -/* A87728 80240CD8 2402000C */ addiu $v0, $zero, 0xc -/* A8772C 80240CDC AE820070 */ sw $v0, 0x70($s4) -/* A87730 80240CE0 8E220000 */ lw $v0, ($s1) -/* A87734 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff -/* A87738 80240CE8 00431024 */ and $v0, $v0, $v1 -/* A8773C 80240CEC AE220000 */ sw $v0, ($s1) -.L80240CF0: -/* A87740 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 -/* A87744 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c -/* A87748 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) -/* A8774C 80240CFC 864200A8 */ lh $v0, 0xa8($s2) -/* A87750 80240D00 3C0142C8 */ lui $at, 0x42c8 -/* A87754 80240D04 44812000 */ mtc1 $at, $f4 -/* A87758 80240D08 44823000 */ mtc1 $v0, $f6 -/* A8775C 80240D0C 00000000 */ nop -/* A87760 80240D10 468031A0 */ cvt.s.w $f6, $f6 -/* A87764 80240D14 27A20044 */ addiu $v0, $sp, 0x44 -/* A87768 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) -/* A8776C 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) -/* A87770 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) -/* A87774 80240D24 46060000 */ add.s $f0, $f0, $f6 -/* A87778 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) -/* A8777C 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) -/* A87780 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) -/* A87784 80240D34 AFA20010 */ sw $v0, 0x10($sp) -/* A87788 80240D38 8E440080 */ lw $a0, 0x80($s2) -/* A8778C 80240D3C 0C0372DF */ jal func_800DCB7C -/* A87790 80240D40 27A70040 */ addiu $a3, $sp, 0x40 -/* A87794 80240D44 10400003 */ beqz $v0, .L80240D54 -/* A87798 80240D48 00000000 */ nop -/* A8779C 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* A877A0 80240D50 E640003C */ swc1 $f0, 0x3c($s2) -.L80240D54: -/* A877A4 80240D54 8E830070 */ lw $v1, 0x70($s4) -/* A877A8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 -/* A877AC 80240D5C 10400042 */ beqz $v0, .L80240E68 -/* A877B0 80240D60 00031080 */ sll $v0, $v1, 2 -/* A877B4 80240D64 3C018024 */ lui $at, 0x8024 -/* A877B8 80240D68 00220821 */ addu $at, $at, $v0 -/* A877BC 80240D6C 8C225A40 */ lw $v0, 0x5a40($at) -/* A877C0 80240D70 00400008 */ jr $v0 -/* A877C4 80240D74 00000000 */ nop -/* A877C8 80240D78 0280202D */ daddu $a0, $s4, $zero -/* A877CC 80240D7C 0260282D */ daddu $a1, $s3, $zero -/* A877D0 80240D80 0C090000 */ jal func_80240000 -/* A877D4 80240D84 02A0302D */ daddu $a2, $s5, $zero -/* A877D8 80240D88 0280202D */ daddu $a0, $s4, $zero -/* A877DC 80240D8C 0260282D */ daddu $a1, $s3, $zero -/* A877E0 80240D90 0C090056 */ jal func_80240158_A86BA8 -/* A877E4 80240D94 02A0302D */ daddu $a2, $s5, $zero -/* A877E8 80240D98 0809039A */ j .L80240E68 -/* A877EC 80240D9C 00000000 */ nop -/* A877F0 80240DA0 0280202D */ daddu $a0, $s4, $zero -/* A877F4 80240DA4 0260282D */ daddu $a1, $s3, $zero -/* A877F8 80240DA8 0C090100 */ jal func_80240400 -/* A877FC 80240DAC 02A0302D */ daddu $a2, $s5, $zero -/* A87800 80240DB0 0280202D */ daddu $a0, $s4, $zero -/* A87804 80240DB4 0260282D */ daddu $a1, $s3, $zero -/* A87808 80240DB8 0C090130 */ jal func_802404C0 -/* A8780C 80240DBC 02A0302D */ daddu $a2, $s5, $zero -/* A87810 80240DC0 0809039A */ j .L80240E68 -/* A87814 80240DC4 00000000 */ nop -/* A87818 80240DC8 0280202D */ daddu $a0, $s4, $zero -/* A8781C 80240DCC 0260282D */ daddu $a1, $s3, $zero -/* A87820 80240DD0 0C09019F */ jal func_8024067C -/* A87824 80240DD4 02A0302D */ daddu $a2, $s5, $zero -/* A87828 80240DD8 0809039A */ j .L80240E68 -/* A8782C 80240DDC 00000000 */ nop -/* A87830 80240DE0 0280202D */ daddu $a0, $s4, $zero -/* A87834 80240DE4 0260282D */ daddu $a1, $s3, $zero -/* A87838 80240DE8 0C0901CC */ jal func_80240730 -/* A8783C 80240DEC 02A0302D */ daddu $a2, $s5, $zero -/* A87840 80240DF0 0280202D */ daddu $a0, $s4, $zero -/* A87844 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* A87848 80240DF8 0C0901E9 */ jal func_802407A4 -/* A8784C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* A87850 80240E00 0809039A */ j .L80240E68 -/* A87854 80240E04 00000000 */ nop -/* A87858 80240E08 0280202D */ daddu $a0, $s4, $zero -/* A8785C 80240E0C 0260282D */ daddu $a1, $s3, $zero -/* A87860 80240E10 0C090207 */ jal func_8024081C_A8726C -/* A87864 80240E14 02A0302D */ daddu $a2, $s5, $zero -/* A87868 80240E18 0280202D */ daddu $a0, $s4, $zero -/* A8786C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* A87870 80240E20 0C090253 */ jal func_8024094C -/* A87874 80240E24 02A0302D */ daddu $a2, $s5, $zero -/* A87878 80240E28 0809039A */ j .L80240E68 -/* A8787C 80240E2C 00000000 */ nop -/* A87880 80240E30 0280202D */ daddu $a0, $s4, $zero -/* A87884 80240E34 0260282D */ daddu $a1, $s3, $zero -/* A87888 80240E38 0C09029B */ jal func_80240A6C -/* A8788C 80240E3C 02A0302D */ daddu $a2, $s5, $zero -/* A87890 80240E40 0809039A */ j .L80240E68 -/* A87894 80240E44 00000000 */ nop -/* A87898 80240E48 0280202D */ daddu $a0, $s4, $zero -/* A8789C 80240E4C 0260282D */ daddu $a1, $s3, $zero -/* A878A0 80240E50 0C0902B5 */ jal func_80240AD4 -/* A878A4 80240E54 02A0302D */ daddu $a2, $s5, $zero -/* A878A8 80240E58 0809039A */ j .L80240E68 -/* A878AC 80240E5C 00000000 */ nop -/* A878B0 80240E60 0C0129CF */ jal func_8004A73C -/* A878B4 80240E64 0280202D */ daddu $a0, $s4, $zero -.L80240E68: -/* A878B8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) -/* A878BC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) -/* A878C0 80240E70 8FB40058 */ lw $s4, 0x58($sp) -/* A878C4 80240E74 8FB30054 */ lw $s3, 0x54($sp) -/* A878C8 80240E78 8FB20050 */ lw $s2, 0x50($sp) -/* A878CC 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) -/* A878D0 80240E80 8FB00048 */ lw $s0, 0x48($sp) -/* A878D4 80240E84 0000102D */ daddu $v0, $zero, $zero -/* A878D8 80240E88 03E00008 */ jr $ra -/* A878DC 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s new file mode 100644 index 0000000000..8de63aa72e --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240B94_A875E4.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B94_A875E4 +/* A875E4 80240B94 27BDFF98 */ addiu $sp, $sp, -0x68 +/* A875E8 80240B98 AFB40058 */ sw $s4, 0x58($sp) +/* A875EC 80240B9C 0080A02D */ daddu $s4, $a0, $zero +/* A875F0 80240BA0 AFBF0060 */ sw $ra, 0x60($sp) +/* A875F4 80240BA4 AFB5005C */ sw $s5, 0x5c($sp) +/* A875F8 80240BA8 AFB30054 */ sw $s3, 0x54($sp) +/* A875FC 80240BAC AFB20050 */ sw $s2, 0x50($sp) +/* A87600 80240BB0 AFB1004C */ sw $s1, 0x4c($sp) +/* A87604 80240BB4 AFB00048 */ sw $s0, 0x48($sp) +/* A87608 80240BB8 8E910148 */ lw $s1, 0x148($s4) +/* A8760C 80240BBC 86240008 */ lh $a0, 8($s1) +/* A87610 80240BC0 0C00EABB */ jal get_npc_unsafe +/* A87614 80240BC4 00A0802D */ daddu $s0, $a1, $zero +/* A87618 80240BC8 8E83000C */ lw $v1, 0xc($s4) +/* A8761C 80240BCC 0280202D */ daddu $a0, $s4, $zero +/* A87620 80240BD0 8C650000 */ lw $a1, ($v1) +/* A87624 80240BD4 0C0B1EAF */ jal get_variable +/* A87628 80240BD8 0040902D */ daddu $s2, $v0, $zero +/* A8762C 80240BDC AFA00018 */ sw $zero, 0x18($sp) +/* A87630 80240BE0 8E2300D0 */ lw $v1, 0xd0($s1) +/* A87634 80240BE4 8C630094 */ lw $v1, 0x94($v1) +/* A87638 80240BE8 AFA3001C */ sw $v1, 0x1c($sp) +/* A8763C 80240BEC 8E2300D0 */ lw $v1, 0xd0($s1) +/* A87640 80240BF0 8C630080 */ lw $v1, 0x80($v1) +/* A87644 80240BF4 AFA30020 */ sw $v1, 0x20($sp) +/* A87648 80240BF8 8E2300D0 */ lw $v1, 0xd0($s1) +/* A8764C 80240BFC 8C630088 */ lw $v1, 0x88($v1) +/* A87650 80240C00 AFA30024 */ sw $v1, 0x24($sp) +/* A87654 80240C04 8E2300D0 */ lw $v1, 0xd0($s1) +/* A87658 80240C08 8C63008C */ lw $v1, 0x8c($v1) +/* A8765C 80240C0C 27B50018 */ addiu $s5, $sp, 0x18 +/* A87660 80240C10 AFA30028 */ sw $v1, 0x28($sp) +/* A87664 80240C14 8E2300D0 */ lw $v1, 0xd0($s1) +/* A87668 80240C18 3C014282 */ lui $at, 0x4282 +/* A8766C 80240C1C 44810000 */ mtc1 $at, $f0 +/* A87670 80240C20 8C630090 */ lw $v1, 0x90($v1) +/* A87674 80240C24 0040982D */ daddu $s3, $v0, $zero +/* A87678 80240C28 E7A00030 */ swc1 $f0, 0x30($sp) +/* A8767C 80240C2C A7A00034 */ sh $zero, 0x34($sp) +/* A87680 80240C30 16000005 */ bnez $s0, .L80240C48 +/* A87684 80240C34 AFA3002C */ sw $v1, 0x2c($sp) +/* A87688 80240C38 8E2200B0 */ lw $v0, 0xb0($s1) +/* A8768C 80240C3C 30420004 */ andi $v0, $v0, 4 +/* A87690 80240C40 10400044 */ beqz $v0, .L80240D54 +/* A87694 80240C44 00000000 */ nop +.L80240C48: +/* A87698 80240C48 2404F7FF */ addiu $a0, $zero, -0x801 +/* A8769C 80240C4C AE800070 */ sw $zero, 0x70($s4) +/* A876A0 80240C50 A640008E */ sh $zero, 0x8e($s2) +/* A876A4 80240C54 8E2200CC */ lw $v0, 0xcc($s1) +/* A876A8 80240C58 8E430000 */ lw $v1, ($s2) +/* A876AC 80240C5C 8C420000 */ lw $v0, ($v0) +/* A876B0 80240C60 00641824 */ and $v1, $v1, $a0 +/* A876B4 80240C64 AE430000 */ sw $v1, ($s2) +/* A876B8 80240C68 AE420028 */ sw $v0, 0x28($s2) +/* A876BC 80240C6C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A876C0 80240C70 8C420098 */ lw $v0, 0x98($v0) +/* A876C4 80240C74 54400005 */ bnel $v0, $zero, .L80240C8C +/* A876C8 80240C78 2402FDFF */ addiu $v0, $zero, -0x201 +/* A876CC 80240C7C 34620200 */ ori $v0, $v1, 0x200 +/* A876D0 80240C80 2403FFF7 */ addiu $v1, $zero, -9 +/* A876D4 80240C84 08090325 */ j .L80240C94 +/* A876D8 80240C88 00431024 */ and $v0, $v0, $v1 +.L80240C8C: +/* A876DC 80240C8C 00621024 */ and $v0, $v1, $v0 +/* A876E0 80240C90 34420008 */ ori $v0, $v0, 8 +.L80240C94: +/* A876E4 80240C94 AE420000 */ sw $v0, ($s2) +/* A876E8 80240C98 8E2200B0 */ lw $v0, 0xb0($s1) +/* A876EC 80240C9C 30420004 */ andi $v0, $v0, 4 +/* A876F0 80240CA0 10400008 */ beqz $v0, .L80240CC4 +/* A876F4 80240CA4 24020063 */ addiu $v0, $zero, 0x63 +/* A876F8 80240CA8 AE820070 */ sw $v0, 0x70($s4) +/* A876FC 80240CAC AE800074 */ sw $zero, 0x74($s4) +/* A87700 80240CB0 8E2200B0 */ lw $v0, 0xb0($s1) +/* A87704 80240CB4 2403FFFB */ addiu $v1, $zero, -5 +/* A87708 80240CB8 00431024 */ and $v0, $v0, $v1 +/* A8770C 80240CBC 0809033C */ j .L80240CF0 +/* A87710 80240CC0 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240CC4: +/* A87714 80240CC4 8E220000 */ lw $v0, ($s1) +/* A87718 80240CC8 3C034000 */ lui $v1, 0x4000 +/* A8771C 80240CCC 00431024 */ and $v0, $v0, $v1 +/* A87720 80240CD0 10400007 */ beqz $v0, .L80240CF0 +/* A87724 80240CD4 3C03BFFF */ lui $v1, 0xbfff +/* A87728 80240CD8 2402000C */ addiu $v0, $zero, 0xc +/* A8772C 80240CDC AE820070 */ sw $v0, 0x70($s4) +/* A87730 80240CE0 8E220000 */ lw $v0, ($s1) +/* A87734 80240CE4 3463FFFF */ ori $v1, $v1, 0xffff +/* A87738 80240CE8 00431024 */ and $v0, $v0, $v1 +/* A8773C 80240CEC AE220000 */ sw $v0, ($s1) +.L80240CF0: +/* A87740 80240CF0 27A50038 */ addiu $a1, $sp, 0x38 +/* A87744 80240CF4 27A6003C */ addiu $a2, $sp, 0x3c +/* A87748 80240CF8 C6400038 */ lwc1 $f0, 0x38($s2) +/* A8774C 80240CFC 864200A8 */ lh $v0, 0xa8($s2) +/* A87750 80240D00 3C0142C8 */ lui $at, 0x42c8 +/* A87754 80240D04 44812000 */ mtc1 $at, $f4 +/* A87758 80240D08 44823000 */ mtc1 $v0, $f6 +/* A8775C 80240D0C 00000000 */ nop +/* A87760 80240D10 468031A0 */ cvt.s.w $f6, $f6 +/* A87764 80240D14 27A20044 */ addiu $v0, $sp, 0x44 +/* A87768 80240D18 E7A00038 */ swc1 $f0, 0x38($sp) +/* A8776C 80240D1C C640003C */ lwc1 $f0, 0x3c($s2) +/* A87770 80240D20 C6420040 */ lwc1 $f2, 0x40($s2) +/* A87774 80240D24 46060000 */ add.s $f0, $f0, $f6 +/* A87778 80240D28 E7A40044 */ swc1 $f4, 0x44($sp) +/* A8777C 80240D2C E7A20040 */ swc1 $f2, 0x40($sp) +/* A87780 80240D30 E7A0003C */ swc1 $f0, 0x3c($sp) +/* A87784 80240D34 AFA20010 */ sw $v0, 0x10($sp) +/* A87788 80240D38 8E440080 */ lw $a0, 0x80($s2) +/* A8778C 80240D3C 0C0372DF */ jal func_800DCB7C +/* A87790 80240D40 27A70040 */ addiu $a3, $sp, 0x40 +/* A87794 80240D44 10400003 */ beqz $v0, .L80240D54 +/* A87798 80240D48 00000000 */ nop +/* A8779C 80240D4C C7A0003C */ lwc1 $f0, 0x3c($sp) +/* A877A0 80240D50 E640003C */ swc1 $f0, 0x3c($s2) +.L80240D54: +/* A877A4 80240D54 8E830070 */ lw $v1, 0x70($s4) +/* A877A8 80240D58 2C620064 */ sltiu $v0, $v1, 0x64 +/* A877AC 80240D5C 10400042 */ beqz $v0, .L80240E68 +/* A877B0 80240D60 00031080 */ sll $v0, $v1, 2 +/* A877B4 80240D64 3C018024 */ lui $at, 0x8024 +/* A877B8 80240D68 00220821 */ addu $at, $at, $v0 +/* A877BC 80240D6C 8C225A40 */ lw $v0, 0x5a40($at) +/* A877C0 80240D70 00400008 */ jr $v0 +/* A877C4 80240D74 00000000 */ nop +/* A877C8 80240D78 0280202D */ daddu $a0, $s4, $zero +/* A877CC 80240D7C 0260282D */ daddu $a1, $s3, $zero +/* A877D0 80240D80 0C090000 */ jal func_80240000_A86A50 +/* A877D4 80240D84 02A0302D */ daddu $a2, $s5, $zero +/* A877D8 80240D88 0280202D */ daddu $a0, $s4, $zero +/* A877DC 80240D8C 0260282D */ daddu $a1, $s3, $zero +/* A877E0 80240D90 0C090056 */ jal func_80240158_A86BA8 +/* A877E4 80240D94 02A0302D */ daddu $a2, $s5, $zero +/* A877E8 80240D98 0809039A */ j .L80240E68 +/* A877EC 80240D9C 00000000 */ nop +/* A877F0 80240DA0 0280202D */ daddu $a0, $s4, $zero +/* A877F4 80240DA4 0260282D */ daddu $a1, $s3, $zero +/* A877F8 80240DA8 0C090100 */ jal func_80240400_A86E50 +/* A877FC 80240DAC 02A0302D */ daddu $a2, $s5, $zero +/* A87800 80240DB0 0280202D */ daddu $a0, $s4, $zero +/* A87804 80240DB4 0260282D */ daddu $a1, $s3, $zero +/* A87808 80240DB8 0C090130 */ jal func_802404C0_A86F10 +/* A8780C 80240DBC 02A0302D */ daddu $a2, $s5, $zero +/* A87810 80240DC0 0809039A */ j .L80240E68 +/* A87814 80240DC4 00000000 */ nop +/* A87818 80240DC8 0280202D */ daddu $a0, $s4, $zero +/* A8781C 80240DCC 0260282D */ daddu $a1, $s3, $zero +/* A87820 80240DD0 0C09019F */ jal func_8024067C_A870CC +/* A87824 80240DD4 02A0302D */ daddu $a2, $s5, $zero +/* A87828 80240DD8 0809039A */ j .L80240E68 +/* A8782C 80240DDC 00000000 */ nop +/* A87830 80240DE0 0280202D */ daddu $a0, $s4, $zero +/* A87834 80240DE4 0260282D */ daddu $a1, $s3, $zero +/* A87838 80240DE8 0C0901CC */ jal func_80240730_A87180 +/* A8783C 80240DEC 02A0302D */ daddu $a2, $s5, $zero +/* A87840 80240DF0 0280202D */ daddu $a0, $s4, $zero +/* A87844 80240DF4 0260282D */ daddu $a1, $s3, $zero +/* A87848 80240DF8 0C0901E9 */ jal func_802407A4_A871F4 +/* A8784C 80240DFC 02A0302D */ daddu $a2, $s5, $zero +/* A87850 80240E00 0809039A */ j .L80240E68 +/* A87854 80240E04 00000000 */ nop +/* A87858 80240E08 0280202D */ daddu $a0, $s4, $zero +/* A8785C 80240E0C 0260282D */ daddu $a1, $s3, $zero +/* A87860 80240E10 0C090207 */ jal func_8024081C_A8726C +/* A87864 80240E14 02A0302D */ daddu $a2, $s5, $zero +/* A87868 80240E18 0280202D */ daddu $a0, $s4, $zero +/* A8786C 80240E1C 0260282D */ daddu $a1, $s3, $zero +/* A87870 80240E20 0C090253 */ jal func_8024094C_A8739C +/* A87874 80240E24 02A0302D */ daddu $a2, $s5, $zero +/* A87878 80240E28 0809039A */ j .L80240E68 +/* A8787C 80240E2C 00000000 */ nop +/* A87880 80240E30 0280202D */ daddu $a0, $s4, $zero +/* A87884 80240E34 0260282D */ daddu $a1, $s3, $zero +/* A87888 80240E38 0C09029B */ jal func_80240A6C_A874BC +/* A8788C 80240E3C 02A0302D */ daddu $a2, $s5, $zero +/* A87890 80240E40 0809039A */ j .L80240E68 +/* A87894 80240E44 00000000 */ nop +/* A87898 80240E48 0280202D */ daddu $a0, $s4, $zero +/* A8789C 80240E4C 0260282D */ daddu $a1, $s3, $zero +/* A878A0 80240E50 0C0902B5 */ jal func_80240AD4_A87524 +/* A878A4 80240E54 02A0302D */ daddu $a2, $s5, $zero +/* A878A8 80240E58 0809039A */ j .L80240E68 +/* A878AC 80240E5C 00000000 */ nop +/* A878B0 80240E60 0C0129CF */ jal func_8004A73C +/* A878B4 80240E64 0280202D */ daddu $a0, $s4, $zero +.L80240E68: +/* A878B8 80240E68 8FBF0060 */ lw $ra, 0x60($sp) +/* A878BC 80240E6C 8FB5005C */ lw $s5, 0x5c($sp) +/* A878C0 80240E70 8FB40058 */ lw $s4, 0x58($sp) +/* A878C4 80240E74 8FB30054 */ lw $s3, 0x54($sp) +/* A878C8 80240E78 8FB20050 */ lw $s2, 0x50($sp) +/* A878CC 80240E7C 8FB1004C */ lw $s1, 0x4c($sp) +/* A878D0 80240E80 8FB00048 */ lw $s0, 0x48($sp) +/* A878D4 80240E84 0000102D */ daddu $v0, $zero, $zero +/* A878D8 80240E88 03E00008 */ jr $ra +/* A878DC 80240E8C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C.s deleted file mode 100644 index a4c17471ce..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F0C -/* A8795C 80240F0C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A87960 80240F10 AFB3001C */ sw $s3, 0x1c($sp) -/* A87964 80240F14 0080982D */ daddu $s3, $a0, $zero -/* A87968 80240F18 AFBF0020 */ sw $ra, 0x20($sp) -/* A8796C 80240F1C AFB20018 */ sw $s2, 0x18($sp) -/* A87970 80240F20 AFB10014 */ sw $s1, 0x14($sp) -/* A87974 80240F24 AFB00010 */ sw $s0, 0x10($sp) -/* A87978 80240F28 8E710148 */ lw $s1, 0x148($s3) -/* A8797C 80240F2C 86240008 */ lh $a0, 8($s1) -/* A87980 80240F30 0C00EABB */ jal get_npc_unsafe -/* A87984 80240F34 00A0902D */ daddu $s2, $a1, $zero -/* A87988 80240F38 0040802D */ daddu $s0, $v0, $zero -/* A8798C 80240F3C 8602008E */ lh $v0, 0x8e($s0) -/* A87990 80240F40 9603008E */ lhu $v1, 0x8e($s0) -/* A87994 80240F44 18400005 */ blez $v0, .L80240F5C -/* A87998 80240F48 2462FFFF */ addiu $v0, $v1, -1 -/* A8799C 80240F4C A602008E */ sh $v0, 0x8e($s0) -/* A879A0 80240F50 00021400 */ sll $v0, $v0, 0x10 -/* A879A4 80240F54 1C400033 */ bgtz $v0, .L80241024 -/* A879A8 80240F58 00000000 */ nop -.L80240F5C: -/* A879AC 80240F5C 8602008C */ lh $v0, 0x8c($s0) -/* A879B0 80240F60 14400030 */ bnez $v0, .L80241024 -/* A879B4 80240F64 00000000 */ nop -/* A879B8 80240F68 8E2200CC */ lw $v0, 0xcc($s1) -/* A879BC 80240F6C 8C420024 */ lw $v0, 0x24($v0) -/* A879C0 80240F70 AE020028 */ sw $v0, 0x28($s0) -/* A879C4 80240F74 C6400018 */ lwc1 $f0, 0x18($s2) -/* A879C8 80240F78 E6000018 */ swc1 $f0, 0x18($s0) -/* A879CC 80240F7C 8E230088 */ lw $v1, 0x88($s1) -/* A879D0 80240F80 24020005 */ addiu $v0, $zero, 5 -/* A879D4 80240F84 10620005 */ beq $v1, $v0, .L80240F9C -/* A879D8 80240F88 00000000 */ nop -/* A879DC 80240F8C 10600003 */ beqz $v1, .L80240F9C -/* A879E0 80240F90 24020001 */ addiu $v0, $zero, 1 -/* A879E4 80240F94 14620006 */ bne $v1, $v0, .L80240FB0 -/* A879E8 80240F98 00000000 */ nop -.L80240F9C: -/* A879EC 80240F9C 8E220084 */ lw $v0, 0x84($s1) -/* A879F0 80240FA0 00021FC2 */ srl $v1, $v0, 0x1f -/* A879F4 80240FA4 00431021 */ addu $v0, $v0, $v1 -/* A879F8 80240FA8 00021043 */ sra $v0, $v0, 1 -/* A879FC 80240FAC A60200A8 */ sh $v0, 0xa8($s0) -.L80240FB0: -/* A87A00 80240FB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A87A04 80240FB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A87A08 80240FB8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A87A0C 80240FBC C60E0040 */ lwc1 $f14, 0x40($s0) -/* A87A10 80240FC0 8C460028 */ lw $a2, 0x28($v0) -/* A87A14 80240FC4 0C00A7B5 */ jal dist2D -/* A87A18 80240FC8 8C470030 */ lw $a3, 0x30($v0) -/* A87A1C 80240FCC C6020018 */ lwc1 $f2, 0x18($s0) -/* A87A20 80240FD0 46020003 */ div.s $f0, $f0, $f2 -/* A87A24 80240FD4 3C018024 */ lui $at, 0x8024 -/* A87A28 80240FD8 D4225BD0 */ ldc1 $f2, 0x5bd0($at) -/* A87A2C 80240FDC 46000021 */ cvt.d.s $f0, $f0 -/* A87A30 80240FE0 46220000 */ add.d $f0, $f0, $f2 -/* A87A34 80240FE4 4620010D */ trunc.w.d $f4, $f0 -/* A87A38 80240FE8 44022000 */ mfc1 $v0, $f4 -/* A87A3C 80240FEC 00000000 */ nop -/* A87A40 80240FF0 A602008E */ sh $v0, 0x8e($s0) -/* A87A44 80240FF4 00021400 */ sll $v0, $v0, 0x10 -/* A87A48 80240FF8 8E230078 */ lw $v1, 0x78($s1) -/* A87A4C 80240FFC 00021403 */ sra $v0, $v0, 0x10 -/* A87A50 80241000 0043102A */ slt $v0, $v0, $v1 -/* A87A54 80241004 10400003 */ beqz $v0, .L80241014 -/* A87A58 80241008 00000000 */ nop -/* A87A5C 8024100C 9622007A */ lhu $v0, 0x7a($s1) -/* A87A60 80241010 A602008E */ sh $v0, 0x8e($s0) -.L80241014: -/* A87A64 80241014 8602008E */ lh $v0, 0x8e($s0) -/* A87A68 80241018 AE22007C */ sw $v0, 0x7c($s1) -/* A87A6C 8024101C 2402000E */ addiu $v0, $zero, 0xe -/* A87A70 80241020 AE620070 */ sw $v0, 0x70($s3) -.L80241024: -/* A87A74 80241024 8FBF0020 */ lw $ra, 0x20($sp) -/* A87A78 80241028 8FB3001C */ lw $s3, 0x1c($sp) -/* A87A7C 8024102C 8FB20018 */ lw $s2, 0x18($sp) -/* A87A80 80241030 8FB10014 */ lw $s1, 0x14($sp) -/* A87A84 80241034 8FB00010 */ lw $s0, 0x10($sp) -/* A87A88 80241038 03E00008 */ jr $ra -/* A87A8C 8024103C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s new file mode 100644 index 0000000000..d2cf09f277 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80240F0C_A8795C.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F0C_A8795C +/* A8795C 80240F0C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A87960 80240F10 AFB3001C */ sw $s3, 0x1c($sp) +/* A87964 80240F14 0080982D */ daddu $s3, $a0, $zero +/* A87968 80240F18 AFBF0020 */ sw $ra, 0x20($sp) +/* A8796C 80240F1C AFB20018 */ sw $s2, 0x18($sp) +/* A87970 80240F20 AFB10014 */ sw $s1, 0x14($sp) +/* A87974 80240F24 AFB00010 */ sw $s0, 0x10($sp) +/* A87978 80240F28 8E710148 */ lw $s1, 0x148($s3) +/* A8797C 80240F2C 86240008 */ lh $a0, 8($s1) +/* A87980 80240F30 0C00EABB */ jal get_npc_unsafe +/* A87984 80240F34 00A0902D */ daddu $s2, $a1, $zero +/* A87988 80240F38 0040802D */ daddu $s0, $v0, $zero +/* A8798C 80240F3C 8602008E */ lh $v0, 0x8e($s0) +/* A87990 80240F40 9603008E */ lhu $v1, 0x8e($s0) +/* A87994 80240F44 18400005 */ blez $v0, .L80240F5C +/* A87998 80240F48 2462FFFF */ addiu $v0, $v1, -1 +/* A8799C 80240F4C A602008E */ sh $v0, 0x8e($s0) +/* A879A0 80240F50 00021400 */ sll $v0, $v0, 0x10 +/* A879A4 80240F54 1C400033 */ bgtz $v0, .L80241024 +/* A879A8 80240F58 00000000 */ nop +.L80240F5C: +/* A879AC 80240F5C 8602008C */ lh $v0, 0x8c($s0) +/* A879B0 80240F60 14400030 */ bnez $v0, .L80241024 +/* A879B4 80240F64 00000000 */ nop +/* A879B8 80240F68 8E2200CC */ lw $v0, 0xcc($s1) +/* A879BC 80240F6C 8C420024 */ lw $v0, 0x24($v0) +/* A879C0 80240F70 AE020028 */ sw $v0, 0x28($s0) +/* A879C4 80240F74 C6400018 */ lwc1 $f0, 0x18($s2) +/* A879C8 80240F78 E6000018 */ swc1 $f0, 0x18($s0) +/* A879CC 80240F7C 8E230088 */ lw $v1, 0x88($s1) +/* A879D0 80240F80 24020005 */ addiu $v0, $zero, 5 +/* A879D4 80240F84 10620005 */ beq $v1, $v0, .L80240F9C +/* A879D8 80240F88 00000000 */ nop +/* A879DC 80240F8C 10600003 */ beqz $v1, .L80240F9C +/* A879E0 80240F90 24020001 */ addiu $v0, $zero, 1 +/* A879E4 80240F94 14620006 */ bne $v1, $v0, .L80240FB0 +/* A879E8 80240F98 00000000 */ nop +.L80240F9C: +/* A879EC 80240F9C 8E220084 */ lw $v0, 0x84($s1) +/* A879F0 80240FA0 00021FC2 */ srl $v1, $v0, 0x1f +/* A879F4 80240FA4 00431021 */ addu $v0, $v0, $v1 +/* A879F8 80240FA8 00021043 */ sra $v0, $v0, 1 +/* A879FC 80240FAC A60200A8 */ sh $v0, 0xa8($s0) +.L80240FB0: +/* A87A00 80240FB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A87A04 80240FB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A87A08 80240FB8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A87A0C 80240FBC C60E0040 */ lwc1 $f14, 0x40($s0) +/* A87A10 80240FC0 8C460028 */ lw $a2, 0x28($v0) +/* A87A14 80240FC4 0C00A7B5 */ jal dist2D +/* A87A18 80240FC8 8C470030 */ lw $a3, 0x30($v0) +/* A87A1C 80240FCC C6020018 */ lwc1 $f2, 0x18($s0) +/* A87A20 80240FD0 46020003 */ div.s $f0, $f0, $f2 +/* A87A24 80240FD4 3C018024 */ lui $at, 0x8024 +/* A87A28 80240FD8 D4225BD0 */ ldc1 $f2, 0x5bd0($at) +/* A87A2C 80240FDC 46000021 */ cvt.d.s $f0, $f0 +/* A87A30 80240FE0 46220000 */ add.d $f0, $f0, $f2 +/* A87A34 80240FE4 4620010D */ trunc.w.d $f4, $f0 +/* A87A38 80240FE8 44022000 */ mfc1 $v0, $f4 +/* A87A3C 80240FEC 00000000 */ nop +/* A87A40 80240FF0 A602008E */ sh $v0, 0x8e($s0) +/* A87A44 80240FF4 00021400 */ sll $v0, $v0, 0x10 +/* A87A48 80240FF8 8E230078 */ lw $v1, 0x78($s1) +/* A87A4C 80240FFC 00021403 */ sra $v0, $v0, 0x10 +/* A87A50 80241000 0043102A */ slt $v0, $v0, $v1 +/* A87A54 80241004 10400003 */ beqz $v0, .L80241014 +/* A87A58 80241008 00000000 */ nop +/* A87A5C 8024100C 9622007A */ lhu $v0, 0x7a($s1) +/* A87A60 80241010 A602008E */ sh $v0, 0x8e($s0) +.L80241014: +/* A87A64 80241014 8602008E */ lh $v0, 0x8e($s0) +/* A87A68 80241018 AE22007C */ sw $v0, 0x7c($s1) +/* A87A6C 8024101C 2402000E */ addiu $v0, $zero, 0xe +/* A87A70 80241020 AE620070 */ sw $v0, 0x70($s3) +.L80241024: +/* A87A74 80241024 8FBF0020 */ lw $ra, 0x20($sp) +/* A87A78 80241028 8FB3001C */ lw $s3, 0x1c($sp) +/* A87A7C 8024102C 8FB20018 */ lw $s2, 0x18($sp) +/* A87A80 80241030 8FB10014 */ lw $s1, 0x14($sp) +/* A87A84 80241034 8FB00010 */ lw $s0, 0x10($sp) +/* A87A88 80241038 03E00008 */ jr $ra +/* A87A8C 8024103C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802411A4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802411A4.s deleted file mode 100644 index 78bb7c2d01..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802411A4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411A4 -/* A87BF4 802411A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A87BF8 802411A8 AFB10014 */ sw $s1, 0x14($sp) -/* A87BFC 802411AC 0080882D */ daddu $s1, $a0, $zero -/* A87C00 802411B0 AFBF0018 */ sw $ra, 0x18($sp) -/* A87C04 802411B4 AFB00010 */ sw $s0, 0x10($sp) -/* A87C08 802411B8 8E300148 */ lw $s0, 0x148($s1) -/* A87C0C 802411BC 0C00EABB */ jal get_npc_unsafe -/* A87C10 802411C0 86040008 */ lh $a0, 8($s0) -/* A87C14 802411C4 0040202D */ daddu $a0, $v0, $zero -/* A87C18 802411C8 9482008E */ lhu $v0, 0x8e($a0) -/* A87C1C 802411CC 24030003 */ addiu $v1, $zero, 3 -/* A87C20 802411D0 24420001 */ addiu $v0, $v0, 1 -/* A87C24 802411D4 A482008E */ sh $v0, 0x8e($a0) -/* A87C28 802411D8 00021400 */ sll $v0, $v0, 0x10 -/* A87C2C 802411DC 00021403 */ sra $v0, $v0, 0x10 -/* A87C30 802411E0 14430003 */ bne $v0, $v1, .L802411F0 -/* A87C34 802411E4 00000000 */ nop -/* A87C38 802411E8 96020086 */ lhu $v0, 0x86($s0) -/* A87C3C 802411EC A48200A8 */ sh $v0, 0xa8($a0) -.L802411F0: -/* A87C40 802411F0 8482008E */ lh $v0, 0x8e($a0) -/* A87C44 802411F4 8E030080 */ lw $v1, 0x80($s0) -/* A87C48 802411F8 0043102A */ slt $v0, $v0, $v1 -/* A87C4C 802411FC 14400004 */ bnez $v0, .L80241210 -/* A87C50 80241200 00000000 */ nop -/* A87C54 80241204 96020086 */ lhu $v0, 0x86($s0) -/* A87C58 80241208 A48200A8 */ sh $v0, 0xa8($a0) -/* A87C5C 8024120C AE200070 */ sw $zero, 0x70($s1) -.L80241210: -/* A87C60 80241210 8FBF0018 */ lw $ra, 0x18($sp) -/* A87C64 80241214 8FB10014 */ lw $s1, 0x14($sp) -/* A87C68 80241218 8FB00010 */ lw $s0, 0x10($sp) -/* A87C6C 8024121C 03E00008 */ jr $ra -/* A87C70 80241220 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802411A4_A87BF4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802411A4_A87BF4.s new file mode 100644 index 0000000000..c2de62a87d --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802411A4_A87BF4.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411A4_A87BF4 +/* A87BF4 802411A4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A87BF8 802411A8 AFB10014 */ sw $s1, 0x14($sp) +/* A87BFC 802411AC 0080882D */ daddu $s1, $a0, $zero +/* A87C00 802411B0 AFBF0018 */ sw $ra, 0x18($sp) +/* A87C04 802411B4 AFB00010 */ sw $s0, 0x10($sp) +/* A87C08 802411B8 8E300148 */ lw $s0, 0x148($s1) +/* A87C0C 802411BC 0C00EABB */ jal get_npc_unsafe +/* A87C10 802411C0 86040008 */ lh $a0, 8($s0) +/* A87C14 802411C4 0040202D */ daddu $a0, $v0, $zero +/* A87C18 802411C8 9482008E */ lhu $v0, 0x8e($a0) +/* A87C1C 802411CC 24030003 */ addiu $v1, $zero, 3 +/* A87C20 802411D0 24420001 */ addiu $v0, $v0, 1 +/* A87C24 802411D4 A482008E */ sh $v0, 0x8e($a0) +/* A87C28 802411D8 00021400 */ sll $v0, $v0, 0x10 +/* A87C2C 802411DC 00021403 */ sra $v0, $v0, 0x10 +/* A87C30 802411E0 14430003 */ bne $v0, $v1, .L802411F0 +/* A87C34 802411E4 00000000 */ nop +/* A87C38 802411E8 96020086 */ lhu $v0, 0x86($s0) +/* A87C3C 802411EC A48200A8 */ sh $v0, 0xa8($a0) +.L802411F0: +/* A87C40 802411F0 8482008E */ lh $v0, 0x8e($a0) +/* A87C44 802411F4 8E030080 */ lw $v1, 0x80($s0) +/* A87C48 802411F8 0043102A */ slt $v0, $v0, $v1 +/* A87C4C 802411FC 14400004 */ bnez $v0, .L80241210 +/* A87C50 80241200 00000000 */ nop +/* A87C54 80241204 96020086 */ lhu $v0, 0x86($s0) +/* A87C58 80241208 A48200A8 */ sh $v0, 0xa8($a0) +/* A87C5C 8024120C AE200070 */ sw $zero, 0x70($s1) +.L80241210: +/* A87C60 80241210 8FBF0018 */ lw $ra, 0x18($sp) +/* A87C64 80241214 8FB10014 */ lw $s1, 0x14($sp) +/* A87C68 80241218 8FB00010 */ lw $s0, 0x10($sp) +/* A87C6C 8024121C 03E00008 */ jr $ra +/* A87C70 80241220 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s index 430edc0647..1eb6ac3dfd 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241224_A87C74.s @@ -141,7 +141,7 @@ glabel func_80241224_A87C74 /* A87E7C 8024142C 00000000 */ nop /* A87E80 80241430 0260202D */ daddu $a0, $s3, $zero /* A87E84 80241434 0280282D */ daddu $a1, $s4, $zero -/* A87E88 80241438 0C090000 */ jal func_80240000 +/* A87E88 80241438 0C090000 */ jal func_80240000_A86A50 /* A87E8C 8024143C 02A0302D */ daddu $a2, $s5, $zero /* A87E90 80241440 96220086 */ lhu $v0, 0x86($s1) /* A87E94 80241444 A64200A8 */ sh $v0, 0xa8($s2) @@ -153,39 +153,39 @@ glabel func_80241224_A87C74 /* A87EAC 8024145C 00000000 */ nop /* A87EB0 80241460 0260202D */ daddu $a0, $s3, $zero /* A87EB4 80241464 0280282D */ daddu $a1, $s4, $zero -/* A87EB8 80241468 0C090100 */ jal func_80240400 +/* A87EB8 80241468 0C090100 */ jal func_80240400_A86E50 /* A87EBC 8024146C 02A0302D */ daddu $a2, $s5, $zero /* A87EC0 80241470 0260202D */ daddu $a0, $s3, $zero /* A87EC4 80241474 0280282D */ daddu $a1, $s4, $zero -/* A87EC8 80241478 0C090130 */ jal func_802404C0 +/* A87EC8 80241478 0C090130 */ jal func_802404C0_A86F10 /* A87ECC 8024147C 02A0302D */ daddu $a2, $s5, $zero /* A87ED0 80241480 08090540 */ j .L80241500 /* A87ED4 80241484 00000000 */ nop /* A87ED8 80241488 0260202D */ daddu $a0, $s3, $zero /* A87EDC 8024148C 0280282D */ daddu $a1, $s4, $zero -/* A87EE0 80241490 0C09019F */ jal func_8024067C +/* A87EE0 80241490 0C09019F */ jal func_8024067C_A870CC /* A87EE4 80241494 02A0302D */ daddu $a2, $s5, $zero /* A87EE8 80241498 08090540 */ j .L80241500 /* A87EEC 8024149C 00000000 */ nop /* A87EF0 802414A0 0260202D */ daddu $a0, $s3, $zero /* A87EF4 802414A4 0280282D */ daddu $a1, $s4, $zero -/* A87EF8 802414A8 0C0903A4 */ jal func_80240E90 +/* A87EF8 802414A8 0C0903A4 */ jal func_80240E90_A878E0 /* A87EFC 802414AC 02A0302D */ daddu $a2, $s5, $zero /* A87F00 802414B0 0260202D */ daddu $a0, $s3, $zero /* A87F04 802414B4 0280282D */ daddu $a1, $s4, $zero -/* A87F08 802414B8 0C0903C3 */ jal func_80240F0C +/* A87F08 802414B8 0C0903C3 */ jal func_80240F0C_A8795C /* A87F0C 802414BC 02A0302D */ daddu $a2, $s5, $zero /* A87F10 802414C0 08090540 */ j .L80241500 /* A87F14 802414C4 00000000 */ nop /* A87F18 802414C8 0260202D */ daddu $a0, $s3, $zero /* A87F1C 802414CC 0280282D */ daddu $a1, $s4, $zero -/* A87F20 802414D0 0C090410 */ jal func_80241040 +/* A87F20 802414D0 0C090410 */ jal func_80241040_A87A90 /* A87F24 802414D4 02A0302D */ daddu $a2, $s5, $zero /* A87F28 802414D8 08090540 */ j .L80241500 /* A87F2C 802414DC 00000000 */ nop /* A87F30 802414E0 0260202D */ daddu $a0, $s3, $zero /* A87F34 802414E4 0280282D */ daddu $a1, $s4, $zero -/* A87F38 802414E8 0C090469 */ jal func_802411A4 +/* A87F38 802414E8 0C090469 */ jal func_802411A4_A87BF4 /* A87F3C 802414EC 02A0302D */ daddu $a2, $s5, $zero /* A87F40 802414F0 08090540 */ j .L80241500 /* A87F44 802414F4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528.s deleted file mode 100644 index f8db23b612..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241528 -/* A87F78 80241528 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A87F7C 8024152C AFBF0010 */ sw $ra, 0x10($sp) -/* A87F80 80241530 0C03A625 */ jal func_800E9894 -/* A87F84 80241534 00000000 */ nop -/* A87F88 80241538 8FBF0010 */ lw $ra, 0x10($sp) -/* A87F8C 8024153C 24020002 */ addiu $v0, $zero, 2 -/* A87F90 80241540 03E00008 */ jr $ra -/* A87F94 80241544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s new file mode 100644 index 0000000000..6bb6d6c785 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241528_A87F78 +/* A87F78 80241528 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A87F7C 8024152C AFBF0010 */ sw $ra, 0x10($sp) +/* A87F80 80241530 0C03A625 */ jal func_800E9894 +/* A87F84 80241534 00000000 */ nop +/* A87F88 80241538 8FBF0010 */ lw $ra, 0x10($sp) +/* A87F8C 8024153C 24020002 */ addiu $v0, $zero, 2 +/* A87F90 80241540 03E00008 */ jr $ra +/* A87F94 80241544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C.s deleted file mode 100644 index cfd2a73238..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024166C -/* A880BC 8024166C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A880C0 80241670 AFBF0010 */ sw $ra, 0x10($sp) -/* A880C4 80241674 8C82000C */ lw $v0, 0xc($a0) -/* A880C8 80241678 0C0B1EAF */ jal get_variable -/* A880CC 8024167C 8C450000 */ lw $a1, ($v0) -/* A880D0 80241680 0C0B1059 */ jal does_script_exist -/* A880D4 80241684 0040202D */ daddu $a0, $v0, $zero -/* A880D8 80241688 2C420001 */ sltiu $v0, $v0, 1 -/* A880DC 8024168C 8FBF0010 */ lw $ra, 0x10($sp) -/* A880E0 80241690 00021040 */ sll $v0, $v0, 1 -/* A880E4 80241694 03E00008 */ jr $ra -/* A880E8 80241698 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s new file mode 100644 index 0000000000..1333a5a1b3 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024166C_A880BC +/* A880BC 8024166C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A880C0 80241670 AFBF0010 */ sw $ra, 0x10($sp) +/* A880C4 80241674 8C82000C */ lw $v0, 0xc($a0) +/* A880C8 80241678 0C0B1EAF */ jal get_variable +/* A880CC 8024167C 8C450000 */ lw $a1, ($v0) +/* A880D0 80241680 0C0B1059 */ jal does_script_exist +/* A880D4 80241684 0040202D */ daddu $a0, $v0, $zero +/* A880D8 80241688 2C420001 */ sltiu $v0, $v0, 1 +/* A880DC 8024168C 8FBF0010 */ lw $ra, 0x10($sp) +/* A880E0 80241690 00021040 */ sll $v0, $v0, 1 +/* A880E4 80241694 03E00008 */ jr $ra +/* A880E8 80241698 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C.s deleted file mode 100644 index aab5b1fabb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024169C -/* A880EC 8024169C 3C028011 */ lui $v0, 0x8011 -/* A880F0 802416A0 8042F2A2 */ lb $v0, -0xd5e($v0) -/* A880F4 802416A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A880F8 802416A8 10400003 */ beqz $v0, .L802416B8 -/* A880FC 802416AC AFBF0010 */ sw $ra, 0x10($sp) -/* A88100 802416B0 0C03AE06 */ jal partner_suspend_ability_script -/* A88104 802416B4 00000000 */ nop -.L802416B8: -/* A88108 802416B8 24020002 */ addiu $v0, $zero, 2 -/* A8810C 802416BC 8FBF0010 */ lw $ra, 0x10($sp) -/* A88110 802416C0 03E00008 */ jr $ra -/* A88114 802416C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s new file mode 100644 index 0000000000..5733b7c686 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024169C_A880EC +/* A880EC 8024169C 3C028011 */ lui $v0, 0x8011 +/* A880F0 802416A0 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A880F4 802416A4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A880F8 802416A8 10400003 */ beqz $v0, .L802416B8 +/* A880FC 802416AC AFBF0010 */ sw $ra, 0x10($sp) +/* A88100 802416B0 0C03AE06 */ jal partner_suspend_ability_script +/* A88104 802416B4 00000000 */ nop +.L802416B8: +/* A88108 802416B8 24020002 */ addiu $v0, $zero, 2 +/* A8810C 802416BC 8FBF0010 */ lw $ra, 0x10($sp) +/* A88110 802416C0 03E00008 */ jr $ra +/* A88114 802416C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8.s deleted file mode 100644 index 57e2b779bc..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C8 -/* A88118 802416C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8811C 802416CC AFBF0010 */ sw $ra, 0x10($sp) -/* A88120 802416D0 0C03AE18 */ jal partner_resume_ability_script -/* A88124 802416D4 00000000 */ nop -/* A88128 802416D8 8FBF0010 */ lw $ra, 0x10($sp) -/* A8812C 802416DC 24020002 */ addiu $v0, $zero, 2 -/* A88130 802416E0 03E00008 */ jr $ra -/* A88134 802416E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s new file mode 100644 index 0000000000..50df82f11a --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416C8_A88118 +/* A88118 802416C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A8811C 802416CC AFBF0010 */ sw $ra, 0x10($sp) +/* A88120 802416D0 0C03AE18 */ jal partner_resume_ability_script +/* A88124 802416D4 00000000 */ nop +/* A88128 802416D8 8FBF0010 */ lw $ra, 0x10($sp) +/* A8812C 802416DC 24020002 */ addiu $v0, $zero, 2 +/* A88130 802416E0 03E00008 */ jr $ra +/* A88134 802416E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8.s deleted file mode 100644 index 49e2b89c6c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416E8 -/* A88138 802416E8 3C058011 */ lui $a1, %hi(gPlayerData) -/* A8813C 802416EC 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* A88140 802416F0 AC800088 */ sw $zero, 0x88($a0) -/* A88144 802416F4 80A30003 */ lb $v1, 3($a1) -/* A88148 802416F8 80A20002 */ lb $v0, 2($a1) -/* A8814C 802416FC 1462000B */ bne $v1, $v0, .L8024172C -/* A88150 80241700 00A0302D */ daddu $a2, $a1, $zero -/* A88154 80241704 80A30006 */ lb $v1, 6($a1) -/* A88158 80241708 80A20005 */ lb $v0, 5($a1) -/* A8815C 8024170C 14620007 */ bne $v1, $v0, .L8024172C -/* A88160 80241710 00000000 */ nop -/* A88164 80241714 80C2028E */ lb $v0, 0x28e($a2) -/* A88168 80241718 84C30290 */ lh $v1, 0x290($a2) -/* A8816C 8024171C 00021200 */ sll $v0, $v0, 8 -/* A88170 80241720 14620004 */ bne $v1, $v0, .L80241734 -/* A88174 80241724 24020001 */ addiu $v0, $zero, 1 -/* A88178 80241728 AC820088 */ sw $v0, 0x88($a0) -.L8024172C: -/* A8817C 8024172C 03E00008 */ jr $ra -/* A88180 80241730 24020002 */ addiu $v0, $zero, 2 -.L80241734: -/* A88184 80241734 03E00008 */ jr $ra -/* A88188 80241738 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s new file mode 100644 index 0000000000..765a502002 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416E8_A88138.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416E8_A88138 +/* A88138 802416E8 3C058011 */ lui $a1, %hi(gPlayerData) +/* A8813C 802416EC 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* A88140 802416F0 AC800088 */ sw $zero, 0x88($a0) +/* A88144 802416F4 80A30003 */ lb $v1, 3($a1) +/* A88148 802416F8 80A20002 */ lb $v0, 2($a1) +/* A8814C 802416FC 1462000B */ bne $v1, $v0, .L8024172C +/* A88150 80241700 00A0302D */ daddu $a2, $a1, $zero +/* A88154 80241704 80A30006 */ lb $v1, 6($a1) +/* A88158 80241708 80A20005 */ lb $v0, 5($a1) +/* A8815C 8024170C 14620007 */ bne $v1, $v0, .L8024172C +/* A88160 80241710 00000000 */ nop +/* A88164 80241714 80C2028E */ lb $v0, 0x28e($a2) +/* A88168 80241718 84C30290 */ lh $v1, 0x290($a2) +/* A8816C 8024171C 00021200 */ sll $v0, $v0, 8 +/* A88170 80241720 14620004 */ bne $v1, $v0, .L80241734 +/* A88174 80241724 24020001 */ addiu $v0, $zero, 1 +/* A88178 80241728 AC820088 */ sw $v0, 0x88($a0) +.L8024172C: +/* A8817C 8024172C 03E00008 */ jr $ra +/* A88180 80241730 24020002 */ addiu $v0, $zero, 2 +.L80241734: +/* A88184 80241734 03E00008 */ jr $ra +/* A88188 80241738 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8.s deleted file mode 100644 index aab9d83c13..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417B8 -/* A88208 802417B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8820C 802417BC AFBF0010 */ sw $ra, 0x10($sp) -/* A88210 802417C0 8C82000C */ lw $v0, 0xc($a0) -/* A88214 802417C4 3C068011 */ lui $a2, 0x8011 -/* A88218 802417C8 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* A8821C 802417CC 0C0B2026 */ jal set_variable -/* A88220 802417D0 8C450000 */ lw $a1, ($v0) -/* A88224 802417D4 0C03AC5A */ jal func_800EB168 -/* A88228 802417D8 0000202D */ daddu $a0, $zero, $zero -/* A8822C 802417DC 8FBF0010 */ lw $ra, 0x10($sp) -/* A88230 802417E0 24020002 */ addiu $v0, $zero, 2 -/* A88234 802417E4 03E00008 */ jr $ra -/* A88238 802417E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s new file mode 100644 index 0000000000..d967f519bb --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417B8_A88208 +/* A88208 802417B8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A8820C 802417BC AFBF0010 */ sw $ra, 0x10($sp) +/* A88210 802417C0 8C82000C */ lw $v0, 0xc($a0) +/* A88214 802417C4 3C068011 */ lui $a2, 0x8011 +/* A88218 802417C8 80C6F2A2 */ lb $a2, -0xd5e($a2) +/* A8821C 802417CC 0C0B2026 */ jal set_variable +/* A88220 802417D0 8C450000 */ lw $a1, ($v0) +/* A88224 802417D4 0C03AC5A */ jal func_800EB168 +/* A88228 802417D8 0000202D */ daddu $a0, $zero, $zero +/* A8822C 802417DC 8FBF0010 */ lw $ra, 0x10($sp) +/* A88230 802417E0 24020002 */ addiu $v0, $zero, 2 +/* A88234 802417E4 03E00008 */ jr $ra +/* A88238 802417E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830.s b/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830.s deleted file mode 100644 index 1749a65640..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241830 -/* A88280 80241830 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A88284 80241834 AFBF0010 */ sw $ra, 0x10($sp) -/* A88288 80241838 0C04417A */ jal get_entity_by_index -/* A8828C 8024183C 8C840084 */ lw $a0, 0x84($a0) -/* A88290 80241840 0040182D */ daddu $v1, $v0, $zero -/* A88294 80241844 8C640000 */ lw $a0, ($v1) -/* A88298 80241848 3C050010 */ lui $a1, 0x10 -/* A8829C 8024184C 00852025 */ or $a0, $a0, $a1 -/* A882A0 80241850 AC640000 */ sw $a0, ($v1) -/* A882A4 80241854 8FBF0010 */ lw $ra, 0x10($sp) -/* A882A8 80241858 24020002 */ addiu $v0, $zero, 2 -/* A882AC 8024185C 03E00008 */ jr $ra -/* A882B0 80241860 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830_A88280.s b/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830_A88280.s new file mode 100644 index 0000000000..8fc3dde8b2 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241830_A88280.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241830_A88280 +/* A88280 80241830 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A88284 80241834 AFBF0010 */ sw $ra, 0x10($sp) +/* A88288 80241838 0C04417A */ jal get_entity_by_index +/* A8828C 8024183C 8C840084 */ lw $a0, 0x84($a0) +/* A88290 80241840 0040182D */ daddu $v1, $v0, $zero +/* A88294 80241844 8C640000 */ lw $a0, ($v1) +/* A88298 80241848 3C050010 */ lui $a1, 0x10 +/* A8829C 8024184C 00852025 */ or $a0, $a0, $a1 +/* A882A0 80241850 AC640000 */ sw $a0, ($v1) +/* A882A4 80241854 8FBF0010 */ lw $ra, 0x10($sp) +/* A882A8 80241858 24020002 */ addiu $v0, $zero, 2 +/* A882AC 8024185C 03E00008 */ jr $ra +/* A882B0 80241860 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864.s b/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864.s deleted file mode 100644 index d02cbf10de..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241864 -/* A882B4 80241864 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A882B8 80241868 AFB20018 */ sw $s2, 0x18($sp) -/* A882BC 8024186C 0080902D */ daddu $s2, $a0, $zero -/* A882C0 80241870 AFBF001C */ sw $ra, 0x1c($sp) -/* A882C4 80241874 AFB10014 */ sw $s1, 0x14($sp) -/* A882C8 80241878 AFB00010 */ sw $s0, 0x10($sp) -/* A882CC 8024187C 8E50000C */ lw $s0, 0xc($s2) -/* A882D0 80241880 8E050000 */ lw $a1, ($s0) -/* A882D4 80241884 0C0B1EAF */ jal get_variable -/* A882D8 80241888 26100004 */ addiu $s0, $s0, 4 -/* A882DC 8024188C 0C04417A */ jal get_entity_by_index -/* A882E0 80241890 0040202D */ daddu $a0, $v0, $zero -/* A882E4 80241894 8E050000 */ lw $a1, ($s0) -/* A882E8 80241898 26100004 */ addiu $s0, $s0, 4 -/* A882EC 8024189C 0040882D */ daddu $s1, $v0, $zero -/* A882F0 802418A0 C6200048 */ lwc1 $f0, 0x48($s1) -/* A882F4 802418A4 4600008D */ trunc.w.s $f2, $f0 -/* A882F8 802418A8 44061000 */ mfc1 $a2, $f2 -/* A882FC 802418AC 0C0B2026 */ jal set_variable -/* A88300 802418B0 0240202D */ daddu $a0, $s2, $zero -/* A88304 802418B4 8E050000 */ lw $a1, ($s0) -/* A88308 802418B8 26100004 */ addiu $s0, $s0, 4 -/* A8830C 802418BC C620004C */ lwc1 $f0, 0x4c($s1) -/* A88310 802418C0 4600008D */ trunc.w.s $f2, $f0 -/* A88314 802418C4 44061000 */ mfc1 $a2, $f2 -/* A88318 802418C8 0C0B2026 */ jal set_variable -/* A8831C 802418CC 0240202D */ daddu $a0, $s2, $zero -/* A88320 802418D0 C6200050 */ lwc1 $f0, 0x50($s1) -/* A88324 802418D4 8E050000 */ lw $a1, ($s0) -/* A88328 802418D8 4600008D */ trunc.w.s $f2, $f0 -/* A8832C 802418DC 44061000 */ mfc1 $a2, $f2 -/* A88330 802418E0 0C0B2026 */ jal set_variable -/* A88334 802418E4 0240202D */ daddu $a0, $s2, $zero -/* A88338 802418E8 8FBF001C */ lw $ra, 0x1c($sp) -/* A8833C 802418EC 8FB20018 */ lw $s2, 0x18($sp) -/* A88340 802418F0 8FB10014 */ lw $s1, 0x14($sp) -/* A88344 802418F4 8FB00010 */ lw $s0, 0x10($sp) -/* A88348 802418F8 24020002 */ addiu $v0, $zero, 2 -/* A8834C 802418FC 03E00008 */ jr $ra -/* A88350 80241900 27BD0020 */ addiu $sp, $sp, 0x20 -/* A88354 80241904 00000000 */ nop -/* A88358 80241908 00000000 */ nop -/* A8835C 8024190C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864_A882B4.s b/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864_A882B4.s new file mode 100644 index 0000000000..e5106048c3 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_91/A88280/func_80241864_A882B4.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241864_A882B4 +/* A882B4 80241864 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A882B8 80241868 AFB20018 */ sw $s2, 0x18($sp) +/* A882BC 8024186C 0080902D */ daddu $s2, $a0, $zero +/* A882C0 80241870 AFBF001C */ sw $ra, 0x1c($sp) +/* A882C4 80241874 AFB10014 */ sw $s1, 0x14($sp) +/* A882C8 80241878 AFB00010 */ sw $s0, 0x10($sp) +/* A882CC 8024187C 8E50000C */ lw $s0, 0xc($s2) +/* A882D0 80241880 8E050000 */ lw $a1, ($s0) +/* A882D4 80241884 0C0B1EAF */ jal get_variable +/* A882D8 80241888 26100004 */ addiu $s0, $s0, 4 +/* A882DC 8024188C 0C04417A */ jal get_entity_by_index +/* A882E0 80241890 0040202D */ daddu $a0, $v0, $zero +/* A882E4 80241894 8E050000 */ lw $a1, ($s0) +/* A882E8 80241898 26100004 */ addiu $s0, $s0, 4 +/* A882EC 8024189C 0040882D */ daddu $s1, $v0, $zero +/* A882F0 802418A0 C6200048 */ lwc1 $f0, 0x48($s1) +/* A882F4 802418A4 4600008D */ trunc.w.s $f2, $f0 +/* A882F8 802418A8 44061000 */ mfc1 $a2, $f2 +/* A882FC 802418AC 0C0B2026 */ jal set_variable +/* A88300 802418B0 0240202D */ daddu $a0, $s2, $zero +/* A88304 802418B4 8E050000 */ lw $a1, ($s0) +/* A88308 802418B8 26100004 */ addiu $s0, $s0, 4 +/* A8830C 802418BC C620004C */ lwc1 $f0, 0x4c($s1) +/* A88310 802418C0 4600008D */ trunc.w.s $f2, $f0 +/* A88314 802418C4 44061000 */ mfc1 $a2, $f2 +/* A88318 802418C8 0C0B2026 */ jal set_variable +/* A8831C 802418CC 0240202D */ daddu $a0, $s2, $zero +/* A88320 802418D0 C6200050 */ lwc1 $f0, 0x50($s1) +/* A88324 802418D4 8E050000 */ lw $a1, ($s0) +/* A88328 802418D8 4600008D */ trunc.w.s $f2, $f0 +/* A8832C 802418DC 44061000 */ mfc1 $a2, $f2 +/* A88330 802418E0 0C0B2026 */ jal set_variable +/* A88334 802418E4 0240202D */ daddu $a0, $s2, $zero +/* A88338 802418E8 8FBF001C */ lw $ra, 0x1c($sp) +/* A8833C 802418EC 8FB20018 */ lw $s2, 0x18($sp) +/* A88340 802418F0 8FB10014 */ lw $s1, 0x14($sp) +/* A88344 802418F4 8FB00010 */ lw $s0, 0x10($sp) +/* A88348 802418F8 24020002 */ addiu $v0, $zero, 2 +/* A8834C 802418FC 03E00008 */ jr $ra +/* A88350 80241900 27BD0020 */ addiu $sp, $sp, 0x20 +/* A88354 80241904 00000000 */ nop +/* A88358 80241908 00000000 */ nop +/* A8835C 8024190C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238.s deleted file mode 100644 index d6c4ab90ba..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240238 -/* A8CCB8 80240238 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* A8CCBC 8024023C AFB20038 */ sw $s2, 0x38($sp) -/* A8CCC0 80240240 0080902D */ daddu $s2, $a0, $zero -/* A8CCC4 80240244 AFBF0044 */ sw $ra, 0x44($sp) -/* A8CCC8 80240248 AFB40040 */ sw $s4, 0x40($sp) -/* A8CCCC 8024024C AFB3003C */ sw $s3, 0x3c($sp) -/* A8CCD0 80240250 AFB10034 */ sw $s1, 0x34($sp) -/* A8CCD4 80240254 AFB00030 */ sw $s0, 0x30($sp) -/* A8CCD8 80240258 F7B60050 */ sdc1 $f22, 0x50($sp) -/* A8CCDC 8024025C F7B40048 */ sdc1 $f20, 0x48($sp) -/* A8CCE0 80240260 8E510148 */ lw $s1, 0x148($s2) -/* A8CCE4 80240264 00A0982D */ daddu $s3, $a1, $zero -/* A8CCE8 80240268 86240008 */ lh $a0, 8($s1) -/* A8CCEC 8024026C 0C00EABB */ jal get_npc_unsafe -/* A8CCF0 80240270 00C0A02D */ daddu $s4, $a2, $zero -/* A8CCF4 80240274 8E630014 */ lw $v1, 0x14($s3) -/* A8CCF8 80240278 04600030 */ bltz $v1, .L8024033C -/* A8CCFC 8024027C 0040802D */ daddu $s0, $v0, $zero -/* A8CD00 80240280 8E420074 */ lw $v0, 0x74($s2) -/* A8CD04 80240284 1C40002C */ bgtz $v0, .L80240338 -/* A8CD08 80240288 2442FFFF */ addiu $v0, $v0, -1 -/* A8CD0C 8024028C 0280202D */ daddu $a0, $s4, $zero -/* A8CD10 80240290 AE430074 */ sw $v1, 0x74($s2) -/* A8CD14 80240294 AFA00010 */ sw $zero, 0x10($sp) -/* A8CD18 80240298 8E66000C */ lw $a2, 0xc($s3) -/* A8CD1C 8024029C 8E670010 */ lw $a3, 0x10($s3) -/* A8CD20 802402A0 0C01242D */ jal func_800490B4 -/* A8CD24 802402A4 0220282D */ daddu $a1, $s1, $zero -/* A8CD28 802402A8 10400021 */ beqz $v0, .L80240330 -/* A8CD2C 802402AC 0000202D */ daddu $a0, $zero, $zero -/* A8CD30 802402B0 0200282D */ daddu $a1, $s0, $zero -/* A8CD34 802402B4 0000302D */ daddu $a2, $zero, $zero -/* A8CD38 802402B8 860300A8 */ lh $v1, 0xa8($s0) -/* A8CD3C 802402BC 3C013F80 */ lui $at, 0x3f80 -/* A8CD40 802402C0 44810000 */ mtc1 $at, $f0 -/* A8CD44 802402C4 3C014000 */ lui $at, 0x4000 -/* A8CD48 802402C8 44811000 */ mtc1 $at, $f2 -/* A8CD4C 802402CC 3C01C1A0 */ lui $at, 0xc1a0 -/* A8CD50 802402D0 44812000 */ mtc1 $at, $f4 -/* A8CD54 802402D4 2402000F */ addiu $v0, $zero, 0xf -/* A8CD58 802402D8 AFA2001C */ sw $v0, 0x1c($sp) -/* A8CD5C 802402DC 44833000 */ mtc1 $v1, $f6 -/* A8CD60 802402E0 00000000 */ nop -/* A8CD64 802402E4 468031A0 */ cvt.s.w $f6, $f6 -/* A8CD68 802402E8 44073000 */ mfc1 $a3, $f6 -/* A8CD6C 802402EC 27A20028 */ addiu $v0, $sp, 0x28 -/* A8CD70 802402F0 AFA20020 */ sw $v0, 0x20($sp) -/* A8CD74 802402F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* A8CD78 802402F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* A8CD7C 802402FC 0C01BFA4 */ jal fx_emote -/* A8CD80 80240300 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8CD84 80240304 0200202D */ daddu $a0, $s0, $zero -/* A8CD88 80240308 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A8CD8C 8024030C 0C012530 */ jal func_800494C0 -/* A8CD90 80240310 3C060020 */ lui $a2, 0x20 -/* A8CD94 80240314 8E220018 */ lw $v0, 0x18($s1) -/* A8CD98 80240318 9442002A */ lhu $v0, 0x2a($v0) -/* A8CD9C 8024031C 30420001 */ andi $v0, $v0, 1 -/* A8CDA0 80240320 14400064 */ bnez $v0, .L802404B4 -/* A8CDA4 80240324 2402000A */ addiu $v0, $zero, 0xa -/* A8CDA8 80240328 0809012D */ j .L802404B4 -/* A8CDAC 8024032C 2402000C */ addiu $v0, $zero, 0xc -.L80240330: -/* A8CDB0 80240330 8E420074 */ lw $v0, 0x74($s2) -/* A8CDB4 80240334 2442FFFF */ addiu $v0, $v0, -1 -.L80240338: -/* A8CDB8 80240338 AE420074 */ sw $v0, 0x74($s2) -.L8024033C: -/* A8CDBC 8024033C 8602008C */ lh $v0, 0x8c($s0) -/* A8CDC0 80240340 1440005D */ bnez $v0, .L802404B8 -/* A8CDC4 80240344 00000000 */ nop -/* A8CDC8 80240348 C6000018 */ lwc1 $f0, 0x18($s0) -/* A8CDCC 8024034C 3C014010 */ lui $at, 0x4010 -/* A8CDD0 80240350 44811800 */ mtc1 $at, $f3 -/* A8CDD4 80240354 44801000 */ mtc1 $zero, $f2 -/* A8CDD8 80240358 46000021 */ cvt.d.s $f0, $f0 -/* A8CDDC 8024035C 4622003C */ c.lt.d $f0, $f2 -/* A8CDE0 80240360 00000000 */ nop -/* A8CDE4 80240364 45000003 */ bc1f .L80240374 -/* A8CDE8 80240368 0200202D */ daddu $a0, $s0, $zero -/* A8CDEC 8024036C 080900DE */ j .L80240378 -/* A8CDF0 80240370 0000282D */ daddu $a1, $zero, $zero -.L80240374: -/* A8CDF4 80240374 24050001 */ addiu $a1, $zero, 1 -.L80240378: -/* A8CDF8 80240378 0C00F598 */ jal func_8003D660 -/* A8CDFC 8024037C 00000000 */ nop -/* A8CE00 80240380 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A8CE04 80240384 8E430078 */ lw $v1, 0x78($s2) -/* A8CE08 80240388 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8CE0C 8024038C 00031040 */ sll $v0, $v1, 1 -/* A8CE10 80240390 00431021 */ addu $v0, $v0, $v1 -/* A8CE14 80240394 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8CE18 80240398 00021080 */ sll $v0, $v0, 2 -/* A8CE1C 8024039C 00431021 */ addu $v0, $v0, $v1 -/* A8CE20 802403A0 C4560004 */ lwc1 $f22, 4($v0) -/* A8CE24 802403A4 4680B5A0 */ cvt.s.w $f22, $f22 -/* A8CE28 802403A8 C454000C */ lwc1 $f20, 0xc($v0) -/* A8CE2C 802403AC 4680A520 */ cvt.s.w $f20, $f20 -/* A8CE30 802403B0 4406B000 */ mfc1 $a2, $f22 -/* A8CE34 802403B4 4407A000 */ mfc1 $a3, $f20 -/* A8CE38 802403B8 0C00A720 */ jal atan2 -/* A8CE3C 802403BC 00000000 */ nop -/* A8CE40 802403C0 8E050018 */ lw $a1, 0x18($s0) -/* A8CE44 802403C4 44060000 */ mfc1 $a2, $f0 -/* A8CE48 802403C8 0200202D */ daddu $a0, $s0, $zero -/* A8CE4C 802403CC 0C00EA95 */ jal npc_move_heading -/* A8CE50 802403D0 AE06000C */ sw $a2, 0xc($s0) -/* A8CE54 802403D4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A8CE58 802403D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A8CE5C 802403DC 4406B000 */ mfc1 $a2, $f22 -/* A8CE60 802403E0 4407A000 */ mfc1 $a3, $f20 -/* A8CE64 802403E4 0C00A7B5 */ jal dist2D -/* A8CE68 802403E8 00000000 */ nop -/* A8CE6C 802403EC C6020018 */ lwc1 $f2, 0x18($s0) -/* A8CE70 802403F0 4602003E */ c.le.s $f0, $f2 -/* A8CE74 802403F4 00000000 */ nop -/* A8CE78 802403F8 4500002F */ bc1f .L802404B8 -/* A8CE7C 802403FC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A8CE80 80240400 24020002 */ addiu $v0, $zero, 2 -/* A8CE84 80240404 0C00A67F */ jal rand_int -/* A8CE88 80240408 AE420070 */ sw $v0, 0x70($s2) -/* A8CE8C 8024040C 3C035555 */ lui $v1, 0x5555 -/* A8CE90 80240410 34635556 */ ori $v1, $v1, 0x5556 -/* A8CE94 80240414 00430018 */ mult $v0, $v1 -/* A8CE98 80240418 000227C3 */ sra $a0, $v0, 0x1f -/* A8CE9C 8024041C 00004010 */ mfhi $t0 -/* A8CEA0 80240420 01042023 */ subu $a0, $t0, $a0 -/* A8CEA4 80240424 00041840 */ sll $v1, $a0, 1 -/* A8CEA8 80240428 00641821 */ addu $v1, $v1, $a0 -/* A8CEAC 8024042C 00431023 */ subu $v0, $v0, $v1 -/* A8CEB0 80240430 24430002 */ addiu $v1, $v0, 2 -/* A8CEB4 80240434 AE430074 */ sw $v1, 0x74($s2) -/* A8CEB8 80240438 8E62002C */ lw $v0, 0x2c($s3) -/* A8CEBC 8024043C 18400009 */ blez $v0, .L80240464 -/* A8CEC0 80240440 24020004 */ addiu $v0, $zero, 4 -/* A8CEC4 80240444 8E620004 */ lw $v0, 4($s3) -/* A8CEC8 80240448 18400006 */ blez $v0, .L80240464 -/* A8CECC 8024044C 24020004 */ addiu $v0, $zero, 4 -/* A8CED0 80240450 8E620008 */ lw $v0, 8($s3) -/* A8CED4 80240454 18400003 */ blez $v0, .L80240464 -/* A8CED8 80240458 24020004 */ addiu $v0, $zero, 4 -/* A8CEDC 8024045C 14600002 */ bnez $v1, .L80240468 -/* A8CEE0 80240460 00000000 */ nop -.L80240464: -/* A8CEE4 80240464 AE420070 */ sw $v0, 0x70($s2) -.L80240468: -/* A8CEE8 80240468 0C00A67F */ jal rand_int -/* A8CEEC 8024046C 24042710 */ addiu $a0, $zero, 0x2710 -/* A8CEF0 80240470 3C0351EB */ lui $v1, 0x51eb -/* A8CEF4 80240474 3463851F */ ori $v1, $v1, 0x851f -/* A8CEF8 80240478 00430018 */ mult $v0, $v1 -/* A8CEFC 8024047C 00021FC3 */ sra $v1, $v0, 0x1f -/* A8CF00 80240480 00004010 */ mfhi $t0 -/* A8CF04 80240484 00082143 */ sra $a0, $t0, 5 -/* A8CF08 80240488 00832023 */ subu $a0, $a0, $v1 -/* A8CF0C 8024048C 00041840 */ sll $v1, $a0, 1 -/* A8CF10 80240490 00641821 */ addu $v1, $v1, $a0 -/* A8CF14 80240494 000318C0 */ sll $v1, $v1, 3 -/* A8CF18 80240498 00641821 */ addu $v1, $v1, $a0 -/* A8CF1C 8024049C 00031880 */ sll $v1, $v1, 2 -/* A8CF20 802404A0 8E640004 */ lw $a0, 4($s3) -/* A8CF24 802404A4 00431023 */ subu $v0, $v0, $v1 -/* A8CF28 802404A8 0044102A */ slt $v0, $v0, $a0 -/* A8CF2C 802404AC 10400002 */ beqz $v0, .L802404B8 -/* A8CF30 802404B0 24020004 */ addiu $v0, $zero, 4 -.L802404B4: -/* A8CF34 802404B4 AE420070 */ sw $v0, 0x70($s2) -.L802404B8: -/* A8CF38 802404B8 8FBF0044 */ lw $ra, 0x44($sp) -/* A8CF3C 802404BC 8FB40040 */ lw $s4, 0x40($sp) -/* A8CF40 802404C0 8FB3003C */ lw $s3, 0x3c($sp) -/* A8CF44 802404C4 8FB20038 */ lw $s2, 0x38($sp) -/* A8CF48 802404C8 8FB10034 */ lw $s1, 0x34($sp) -/* A8CF4C 802404CC 8FB00030 */ lw $s0, 0x30($sp) -/* A8CF50 802404D0 D7B60050 */ ldc1 $f22, 0x50($sp) -/* A8CF54 802404D4 D7B40048 */ ldc1 $f20, 0x48($sp) -/* A8CF58 802404D8 03E00008 */ jr $ra -/* A8CF5C 802404DC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s new file mode 100644 index 0000000000..9775fe8ecf --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240238_A8CCB8.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240238_A8CCB8 +/* A8CCB8 80240238 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* A8CCBC 8024023C AFB20038 */ sw $s2, 0x38($sp) +/* A8CCC0 80240240 0080902D */ daddu $s2, $a0, $zero +/* A8CCC4 80240244 AFBF0044 */ sw $ra, 0x44($sp) +/* A8CCC8 80240248 AFB40040 */ sw $s4, 0x40($sp) +/* A8CCCC 8024024C AFB3003C */ sw $s3, 0x3c($sp) +/* A8CCD0 80240250 AFB10034 */ sw $s1, 0x34($sp) +/* A8CCD4 80240254 AFB00030 */ sw $s0, 0x30($sp) +/* A8CCD8 80240258 F7B60050 */ sdc1 $f22, 0x50($sp) +/* A8CCDC 8024025C F7B40048 */ sdc1 $f20, 0x48($sp) +/* A8CCE0 80240260 8E510148 */ lw $s1, 0x148($s2) +/* A8CCE4 80240264 00A0982D */ daddu $s3, $a1, $zero +/* A8CCE8 80240268 86240008 */ lh $a0, 8($s1) +/* A8CCEC 8024026C 0C00EABB */ jal get_npc_unsafe +/* A8CCF0 80240270 00C0A02D */ daddu $s4, $a2, $zero +/* A8CCF4 80240274 8E630014 */ lw $v1, 0x14($s3) +/* A8CCF8 80240278 04600030 */ bltz $v1, .L8024033C +/* A8CCFC 8024027C 0040802D */ daddu $s0, $v0, $zero +/* A8CD00 80240280 8E420074 */ lw $v0, 0x74($s2) +/* A8CD04 80240284 1C40002C */ bgtz $v0, .L80240338 +/* A8CD08 80240288 2442FFFF */ addiu $v0, $v0, -1 +/* A8CD0C 8024028C 0280202D */ daddu $a0, $s4, $zero +/* A8CD10 80240290 AE430074 */ sw $v1, 0x74($s2) +/* A8CD14 80240294 AFA00010 */ sw $zero, 0x10($sp) +/* A8CD18 80240298 8E66000C */ lw $a2, 0xc($s3) +/* A8CD1C 8024029C 8E670010 */ lw $a3, 0x10($s3) +/* A8CD20 802402A0 0C01242D */ jal func_800490B4 +/* A8CD24 802402A4 0220282D */ daddu $a1, $s1, $zero +/* A8CD28 802402A8 10400021 */ beqz $v0, .L80240330 +/* A8CD2C 802402AC 0000202D */ daddu $a0, $zero, $zero +/* A8CD30 802402B0 0200282D */ daddu $a1, $s0, $zero +/* A8CD34 802402B4 0000302D */ daddu $a2, $zero, $zero +/* A8CD38 802402B8 860300A8 */ lh $v1, 0xa8($s0) +/* A8CD3C 802402BC 3C013F80 */ lui $at, 0x3f80 +/* A8CD40 802402C0 44810000 */ mtc1 $at, $f0 +/* A8CD44 802402C4 3C014000 */ lui $at, 0x4000 +/* A8CD48 802402C8 44811000 */ mtc1 $at, $f2 +/* A8CD4C 802402CC 3C01C1A0 */ lui $at, 0xc1a0 +/* A8CD50 802402D0 44812000 */ mtc1 $at, $f4 +/* A8CD54 802402D4 2402000F */ addiu $v0, $zero, 0xf +/* A8CD58 802402D8 AFA2001C */ sw $v0, 0x1c($sp) +/* A8CD5C 802402DC 44833000 */ mtc1 $v1, $f6 +/* A8CD60 802402E0 00000000 */ nop +/* A8CD64 802402E4 468031A0 */ cvt.s.w $f6, $f6 +/* A8CD68 802402E8 44073000 */ mfc1 $a3, $f6 +/* A8CD6C 802402EC 27A20028 */ addiu $v0, $sp, 0x28 +/* A8CD70 802402F0 AFA20020 */ sw $v0, 0x20($sp) +/* A8CD74 802402F4 E7A00010 */ swc1 $f0, 0x10($sp) +/* A8CD78 802402F8 E7A20014 */ swc1 $f2, 0x14($sp) +/* A8CD7C 802402FC 0C01BFA4 */ jal fx_emote +/* A8CD80 80240300 E7A40018 */ swc1 $f4, 0x18($sp) +/* A8CD84 80240304 0200202D */ daddu $a0, $s0, $zero +/* A8CD88 80240308 240502F4 */ addiu $a1, $zero, 0x2f4 +/* A8CD8C 8024030C 0C012530 */ jal func_800494C0 +/* A8CD90 80240310 3C060020 */ lui $a2, 0x20 +/* A8CD94 80240314 8E220018 */ lw $v0, 0x18($s1) +/* A8CD98 80240318 9442002A */ lhu $v0, 0x2a($v0) +/* A8CD9C 8024031C 30420001 */ andi $v0, $v0, 1 +/* A8CDA0 80240320 14400064 */ bnez $v0, .L802404B4 +/* A8CDA4 80240324 2402000A */ addiu $v0, $zero, 0xa +/* A8CDA8 80240328 0809012D */ j .L802404B4 +/* A8CDAC 8024032C 2402000C */ addiu $v0, $zero, 0xc +.L80240330: +/* A8CDB0 80240330 8E420074 */ lw $v0, 0x74($s2) +/* A8CDB4 80240334 2442FFFF */ addiu $v0, $v0, -1 +.L80240338: +/* A8CDB8 80240338 AE420074 */ sw $v0, 0x74($s2) +.L8024033C: +/* A8CDBC 8024033C 8602008C */ lh $v0, 0x8c($s0) +/* A8CDC0 80240340 1440005D */ bnez $v0, .L802404B8 +/* A8CDC4 80240344 00000000 */ nop +/* A8CDC8 80240348 C6000018 */ lwc1 $f0, 0x18($s0) +/* A8CDCC 8024034C 3C014010 */ lui $at, 0x4010 +/* A8CDD0 80240350 44811800 */ mtc1 $at, $f3 +/* A8CDD4 80240354 44801000 */ mtc1 $zero, $f2 +/* A8CDD8 80240358 46000021 */ cvt.d.s $f0, $f0 +/* A8CDDC 8024035C 4622003C */ c.lt.d $f0, $f2 +/* A8CDE0 80240360 00000000 */ nop +/* A8CDE4 80240364 45000003 */ bc1f .L80240374 +/* A8CDE8 80240368 0200202D */ daddu $a0, $s0, $zero +/* A8CDEC 8024036C 080900DE */ j .L80240378 +/* A8CDF0 80240370 0000282D */ daddu $a1, $zero, $zero +.L80240374: +/* A8CDF4 80240374 24050001 */ addiu $a1, $zero, 1 +.L80240378: +/* A8CDF8 80240378 0C00F598 */ jal func_8003D660 +/* A8CDFC 8024037C 00000000 */ nop +/* A8CE00 80240380 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A8CE04 80240384 8E430078 */ lw $v1, 0x78($s2) +/* A8CE08 80240388 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A8CE0C 8024038C 00031040 */ sll $v0, $v1, 1 +/* A8CE10 80240390 00431021 */ addu $v0, $v0, $v1 +/* A8CE14 80240394 8E2300D0 */ lw $v1, 0xd0($s1) +/* A8CE18 80240398 00021080 */ sll $v0, $v0, 2 +/* A8CE1C 8024039C 00431021 */ addu $v0, $v0, $v1 +/* A8CE20 802403A0 C4560004 */ lwc1 $f22, 4($v0) +/* A8CE24 802403A4 4680B5A0 */ cvt.s.w $f22, $f22 +/* A8CE28 802403A8 C454000C */ lwc1 $f20, 0xc($v0) +/* A8CE2C 802403AC 4680A520 */ cvt.s.w $f20, $f20 +/* A8CE30 802403B0 4406B000 */ mfc1 $a2, $f22 +/* A8CE34 802403B4 4407A000 */ mfc1 $a3, $f20 +/* A8CE38 802403B8 0C00A720 */ jal atan2 +/* A8CE3C 802403BC 00000000 */ nop +/* A8CE40 802403C0 8E050018 */ lw $a1, 0x18($s0) +/* A8CE44 802403C4 44060000 */ mfc1 $a2, $f0 +/* A8CE48 802403C8 0200202D */ daddu $a0, $s0, $zero +/* A8CE4C 802403CC 0C00EA95 */ jal npc_move_heading +/* A8CE50 802403D0 AE06000C */ sw $a2, 0xc($s0) +/* A8CE54 802403D4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A8CE58 802403D8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A8CE5C 802403DC 4406B000 */ mfc1 $a2, $f22 +/* A8CE60 802403E0 4407A000 */ mfc1 $a3, $f20 +/* A8CE64 802403E4 0C00A7B5 */ jal dist2D +/* A8CE68 802403E8 00000000 */ nop +/* A8CE6C 802403EC C6020018 */ lwc1 $f2, 0x18($s0) +/* A8CE70 802403F0 4602003E */ c.le.s $f0, $f2 +/* A8CE74 802403F4 00000000 */ nop +/* A8CE78 802403F8 4500002F */ bc1f .L802404B8 +/* A8CE7C 802403FC 240403E8 */ addiu $a0, $zero, 0x3e8 +/* A8CE80 80240400 24020002 */ addiu $v0, $zero, 2 +/* A8CE84 80240404 0C00A67F */ jal rand_int +/* A8CE88 80240408 AE420070 */ sw $v0, 0x70($s2) +/* A8CE8C 8024040C 3C035555 */ lui $v1, 0x5555 +/* A8CE90 80240410 34635556 */ ori $v1, $v1, 0x5556 +/* A8CE94 80240414 00430018 */ mult $v0, $v1 +/* A8CE98 80240418 000227C3 */ sra $a0, $v0, 0x1f +/* A8CE9C 8024041C 00004010 */ mfhi $t0 +/* A8CEA0 80240420 01042023 */ subu $a0, $t0, $a0 +/* A8CEA4 80240424 00041840 */ sll $v1, $a0, 1 +/* A8CEA8 80240428 00641821 */ addu $v1, $v1, $a0 +/* A8CEAC 8024042C 00431023 */ subu $v0, $v0, $v1 +/* A8CEB0 80240430 24430002 */ addiu $v1, $v0, 2 +/* A8CEB4 80240434 AE430074 */ sw $v1, 0x74($s2) +/* A8CEB8 80240438 8E62002C */ lw $v0, 0x2c($s3) +/* A8CEBC 8024043C 18400009 */ blez $v0, .L80240464 +/* A8CEC0 80240440 24020004 */ addiu $v0, $zero, 4 +/* A8CEC4 80240444 8E620004 */ lw $v0, 4($s3) +/* A8CEC8 80240448 18400006 */ blez $v0, .L80240464 +/* A8CECC 8024044C 24020004 */ addiu $v0, $zero, 4 +/* A8CED0 80240450 8E620008 */ lw $v0, 8($s3) +/* A8CED4 80240454 18400003 */ blez $v0, .L80240464 +/* A8CED8 80240458 24020004 */ addiu $v0, $zero, 4 +/* A8CEDC 8024045C 14600002 */ bnez $v1, .L80240468 +/* A8CEE0 80240460 00000000 */ nop +.L80240464: +/* A8CEE4 80240464 AE420070 */ sw $v0, 0x70($s2) +.L80240468: +/* A8CEE8 80240468 0C00A67F */ jal rand_int +/* A8CEEC 8024046C 24042710 */ addiu $a0, $zero, 0x2710 +/* A8CEF0 80240470 3C0351EB */ lui $v1, 0x51eb +/* A8CEF4 80240474 3463851F */ ori $v1, $v1, 0x851f +/* A8CEF8 80240478 00430018 */ mult $v0, $v1 +/* A8CEFC 8024047C 00021FC3 */ sra $v1, $v0, 0x1f +/* A8CF00 80240480 00004010 */ mfhi $t0 +/* A8CF04 80240484 00082143 */ sra $a0, $t0, 5 +/* A8CF08 80240488 00832023 */ subu $a0, $a0, $v1 +/* A8CF0C 8024048C 00041840 */ sll $v1, $a0, 1 +/* A8CF10 80240490 00641821 */ addu $v1, $v1, $a0 +/* A8CF14 80240494 000318C0 */ sll $v1, $v1, 3 +/* A8CF18 80240498 00641821 */ addu $v1, $v1, $a0 +/* A8CF1C 8024049C 00031880 */ sll $v1, $v1, 2 +/* A8CF20 802404A0 8E640004 */ lw $a0, 4($s3) +/* A8CF24 802404A4 00431023 */ subu $v0, $v0, $v1 +/* A8CF28 802404A8 0044102A */ slt $v0, $v0, $a0 +/* A8CF2C 802404AC 10400002 */ beqz $v0, .L802404B8 +/* A8CF30 802404B0 24020004 */ addiu $v0, $zero, 4 +.L802404B4: +/* A8CF34 802404B4 AE420070 */ sw $v0, 0x70($s2) +.L802404B8: +/* A8CF38 802404B8 8FBF0044 */ lw $ra, 0x44($sp) +/* A8CF3C 802404BC 8FB40040 */ lw $s4, 0x40($sp) +/* A8CF40 802404C0 8FB3003C */ lw $s3, 0x3c($sp) +/* A8CF44 802404C4 8FB20038 */ lw $s2, 0x38($sp) +/* A8CF48 802404C8 8FB10034 */ lw $s1, 0x34($sp) +/* A8CF4C 802404CC 8FB00030 */ lw $s0, 0x30($sp) +/* A8CF50 802404D0 D7B60050 */ ldc1 $f22, 0x50($sp) +/* A8CF54 802404D4 D7B40048 */ ldc1 $f20, 0x48($sp) +/* A8CF58 802404D8 03E00008 */ jr $ra +/* A8CF5C 802404DC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0.s deleted file mode 100644 index 1edcb56230..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404E0 -/* A8CF60 802404E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A8CF64 802404E4 AFB3001C */ sw $s3, 0x1c($sp) -/* A8CF68 802404E8 0080982D */ daddu $s3, $a0, $zero -/* A8CF6C 802404EC AFBF0020 */ sw $ra, 0x20($sp) -/* A8CF70 802404F0 AFB20018 */ sw $s2, 0x18($sp) -/* A8CF74 802404F4 AFB10014 */ sw $s1, 0x14($sp) -/* A8CF78 802404F8 AFB00010 */ sw $s0, 0x10($sp) -/* A8CF7C 802404FC 8E720148 */ lw $s2, 0x148($s3) -/* A8CF80 80240500 86440008 */ lh $a0, 8($s2) -/* A8CF84 80240504 0C00EABB */ jal get_npc_unsafe -/* A8CF88 80240508 00A0882D */ daddu $s1, $a1, $zero -/* A8CF8C 8024050C 8E240008 */ lw $a0, 8($s1) -/* A8CF90 80240510 0040802D */ daddu $s0, $v0, $zero -/* A8CF94 80240514 00041FC2 */ srl $v1, $a0, 0x1f -/* A8CF98 80240518 00832021 */ addu $a0, $a0, $v1 -/* A8CF9C 8024051C 00042043 */ sra $a0, $a0, 1 -/* A8CFA0 80240520 0C00A67F */ jal rand_int -/* A8CFA4 80240524 24840001 */ addiu $a0, $a0, 1 -/* A8CFA8 80240528 8E230008 */ lw $v1, 8($s1) -/* A8CFAC 8024052C 240400B4 */ addiu $a0, $zero, 0xb4 -/* A8CFB0 80240530 00032FC2 */ srl $a1, $v1, 0x1f -/* A8CFB4 80240534 00651821 */ addu $v1, $v1, $a1 -/* A8CFB8 80240538 00031843 */ sra $v1, $v1, 1 -/* A8CFBC 8024053C 00621821 */ addu $v1, $v1, $v0 -/* A8CFC0 80240540 0C00A67F */ jal rand_int -/* A8CFC4 80240544 A603008E */ sh $v1, 0x8e($s0) -/* A8CFC8 80240548 C60C000C */ lwc1 $f12, 0xc($s0) -/* A8CFCC 8024054C 44820000 */ mtc1 $v0, $f0 -/* A8CFD0 80240550 00000000 */ nop -/* A8CFD4 80240554 46800020 */ cvt.s.w $f0, $f0 -/* A8CFD8 80240558 46006300 */ add.s $f12, $f12, $f0 -/* A8CFDC 8024055C 3C0142B4 */ lui $at, 0x42b4 -/* A8CFE0 80240560 44810000 */ mtc1 $at, $f0 -/* A8CFE4 80240564 0C00A6C9 */ jal clamp_angle -/* A8CFE8 80240568 46006301 */ sub.s $f12, $f12, $f0 -/* A8CFEC 8024056C E600000C */ swc1 $f0, 0xc($s0) -/* A8CFF0 80240570 8E4200CC */ lw $v0, 0xcc($s2) -/* A8CFF4 80240574 8C420000 */ lw $v0, ($v0) -/* A8CFF8 80240578 AE020028 */ sw $v0, 0x28($s0) -/* A8CFFC 8024057C 24020003 */ addiu $v0, $zero, 3 -/* A8D000 80240580 AE620070 */ sw $v0, 0x70($s3) -/* A8D004 80240584 8FBF0020 */ lw $ra, 0x20($sp) -/* A8D008 80240588 8FB3001C */ lw $s3, 0x1c($sp) -/* A8D00C 8024058C 8FB20018 */ lw $s2, 0x18($sp) -/* A8D010 80240590 8FB10014 */ lw $s1, 0x14($sp) -/* A8D014 80240594 8FB00010 */ lw $s0, 0x10($sp) -/* A8D018 80240598 03E00008 */ jr $ra -/* A8D01C 8024059C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s new file mode 100644 index 0000000000..1f01d6ade5 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802404E0_A8CF60.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404E0_A8CF60 +/* A8CF60 802404E0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A8CF64 802404E4 AFB3001C */ sw $s3, 0x1c($sp) +/* A8CF68 802404E8 0080982D */ daddu $s3, $a0, $zero +/* A8CF6C 802404EC AFBF0020 */ sw $ra, 0x20($sp) +/* A8CF70 802404F0 AFB20018 */ sw $s2, 0x18($sp) +/* A8CF74 802404F4 AFB10014 */ sw $s1, 0x14($sp) +/* A8CF78 802404F8 AFB00010 */ sw $s0, 0x10($sp) +/* A8CF7C 802404FC 8E720148 */ lw $s2, 0x148($s3) +/* A8CF80 80240500 86440008 */ lh $a0, 8($s2) +/* A8CF84 80240504 0C00EABB */ jal get_npc_unsafe +/* A8CF88 80240508 00A0882D */ daddu $s1, $a1, $zero +/* A8CF8C 8024050C 8E240008 */ lw $a0, 8($s1) +/* A8CF90 80240510 0040802D */ daddu $s0, $v0, $zero +/* A8CF94 80240514 00041FC2 */ srl $v1, $a0, 0x1f +/* A8CF98 80240518 00832021 */ addu $a0, $a0, $v1 +/* A8CF9C 8024051C 00042043 */ sra $a0, $a0, 1 +/* A8CFA0 80240520 0C00A67F */ jal rand_int +/* A8CFA4 80240524 24840001 */ addiu $a0, $a0, 1 +/* A8CFA8 80240528 8E230008 */ lw $v1, 8($s1) +/* A8CFAC 8024052C 240400B4 */ addiu $a0, $zero, 0xb4 +/* A8CFB0 80240530 00032FC2 */ srl $a1, $v1, 0x1f +/* A8CFB4 80240534 00651821 */ addu $v1, $v1, $a1 +/* A8CFB8 80240538 00031843 */ sra $v1, $v1, 1 +/* A8CFBC 8024053C 00621821 */ addu $v1, $v1, $v0 +/* A8CFC0 80240540 0C00A67F */ jal rand_int +/* A8CFC4 80240544 A603008E */ sh $v1, 0x8e($s0) +/* A8CFC8 80240548 C60C000C */ lwc1 $f12, 0xc($s0) +/* A8CFCC 8024054C 44820000 */ mtc1 $v0, $f0 +/* A8CFD0 80240550 00000000 */ nop +/* A8CFD4 80240554 46800020 */ cvt.s.w $f0, $f0 +/* A8CFD8 80240558 46006300 */ add.s $f12, $f12, $f0 +/* A8CFDC 8024055C 3C0142B4 */ lui $at, 0x42b4 +/* A8CFE0 80240560 44810000 */ mtc1 $at, $f0 +/* A8CFE4 80240564 0C00A6C9 */ jal clamp_angle +/* A8CFE8 80240568 46006301 */ sub.s $f12, $f12, $f0 +/* A8CFEC 8024056C E600000C */ swc1 $f0, 0xc($s0) +/* A8CFF0 80240570 8E4200CC */ lw $v0, 0xcc($s2) +/* A8CFF4 80240574 8C420000 */ lw $v0, ($v0) +/* A8CFF8 80240578 AE020028 */ sw $v0, 0x28($s0) +/* A8CFFC 8024057C 24020003 */ addiu $v0, $zero, 3 +/* A8D000 80240580 AE620070 */ sw $v0, 0x70($s3) +/* A8D004 80240584 8FBF0020 */ lw $ra, 0x20($sp) +/* A8D008 80240588 8FB3001C */ lw $s3, 0x1c($sp) +/* A8D00C 8024058C 8FB20018 */ lw $s2, 0x18($sp) +/* A8D010 80240590 8FB10014 */ lw $s1, 0x14($sp) +/* A8D014 80240594 8FB00010 */ lw $s0, 0x10($sp) +/* A8D018 80240598 03E00008 */ jr $ra +/* A8D01C 8024059C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC.s deleted file mode 100644 index 7aacf18a30..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408FC -/* A8D37C 802408FC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A8D380 80240900 AFB3001C */ sw $s3, 0x1c($sp) -/* A8D384 80240904 0080982D */ daddu $s3, $a0, $zero -/* A8D388 80240908 AFBF0020 */ sw $ra, 0x20($sp) -/* A8D38C 8024090C AFB20018 */ sw $s2, 0x18($sp) -/* A8D390 80240910 AFB10014 */ sw $s1, 0x14($sp) -/* A8D394 80240914 AFB00010 */ sw $s0, 0x10($sp) -/* A8D398 80240918 F7B40028 */ sdc1 $f20, 0x28($sp) -/* A8D39C 8024091C 8E710148 */ lw $s1, 0x148($s3) -/* A8D3A0 80240920 86240008 */ lh $a0, 8($s1) -/* A8D3A4 80240924 0C00EABB */ jal get_npc_unsafe -/* A8D3A8 80240928 00A0802D */ daddu $s0, $a1, $zero -/* A8D3AC 8024092C 8E040020 */ lw $a0, 0x20($s0) -/* A8D3B0 80240930 0040902D */ daddu $s2, $v0, $zero -/* A8D3B4 80240934 00041FC2 */ srl $v1, $a0, 0x1f -/* A8D3B8 80240938 00832021 */ addu $a0, $a0, $v1 -/* A8D3BC 8024093C 00042043 */ sra $a0, $a0, 1 -/* A8D3C0 80240940 0C00A67F */ jal rand_int -/* A8D3C4 80240944 24840001 */ addiu $a0, $a0, 1 -/* A8D3C8 80240948 8E030020 */ lw $v1, 0x20($s0) -/* A8D3CC 8024094C C64C0038 */ lwc1 $f12, 0x38($s2) -/* A8D3D0 80240950 000327C2 */ srl $a0, $v1, 0x1f -/* A8D3D4 80240954 00641821 */ addu $v1, $v1, $a0 -/* A8D3D8 80240958 00031843 */ sra $v1, $v1, 1 -/* A8D3DC 8024095C 00621821 */ addu $v1, $v1, $v0 -/* A8D3E0 80240960 A643008E */ sh $v1, 0x8e($s2) -/* A8D3E4 80240964 8E2200CC */ lw $v0, 0xcc($s1) -/* A8D3E8 80240968 C64E0040 */ lwc1 $f14, 0x40($s2) -/* A8D3EC 8024096C 8C42000C */ lw $v0, 0xc($v0) -/* A8D3F0 80240970 AE420028 */ sw $v0, 0x28($s2) -/* A8D3F4 80240974 C6000018 */ lwc1 $f0, 0x18($s0) -/* A8D3F8 80240978 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A8D3FC 8024097C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A8D400 80240980 E6400018 */ swc1 $f0, 0x18($s2) -/* A8D404 80240984 8C460028 */ lw $a2, 0x28($v0) -/* A8D408 80240988 0C00A720 */ jal atan2 -/* A8D40C 8024098C 8C470030 */ lw $a3, 0x30($v0) -/* A8D410 80240990 46000506 */ mov.s $f20, $f0 -/* A8D414 80240994 C64C000C */ lwc1 $f12, 0xc($s2) -/* A8D418 80240998 0C00A70A */ jal get_clamped_angle_diff -/* A8D41C 8024099C 4600A386 */ mov.s $f14, $f20 -/* A8D420 802409A0 46000086 */ mov.s $f2, $f0 -/* A8D424 802409A4 8E02001C */ lw $v0, 0x1c($s0) -/* A8D428 802409A8 46001005 */ abs.s $f0, $f2 -/* A8D42C 802409AC 44822000 */ mtc1 $v0, $f4 -/* A8D430 802409B0 00000000 */ nop -/* A8D434 802409B4 46802120 */ cvt.s.w $f4, $f4 -/* A8D438 802409B8 4600203C */ c.lt.s $f4, $f0 -/* A8D43C 802409BC 00000000 */ nop -/* A8D440 802409C0 4500000D */ bc1f .L802409F8 -/* A8D444 802409C4 00000000 */ nop -/* A8D448 802409C8 44800000 */ mtc1 $zero, $f0 -/* A8D44C 802409CC C654000C */ lwc1 $f20, 0xc($s2) -/* A8D450 802409D0 4600103C */ c.lt.s $f2, $f0 -/* A8D454 802409D4 00000000 */ nop -/* A8D458 802409D8 45000006 */ bc1f .L802409F4 -/* A8D45C 802409DC 00021023 */ negu $v0, $v0 -/* A8D460 802409E0 44820000 */ mtc1 $v0, $f0 -/* A8D464 802409E4 00000000 */ nop -/* A8D468 802409E8 46800020 */ cvt.s.w $f0, $f0 -/* A8D46C 802409EC 0809027E */ j .L802409F8 -/* A8D470 802409F0 4600A500 */ add.s $f20, $f20, $f0 -.L802409F4: -/* A8D474 802409F4 4604A500 */ add.s $f20, $f20, $f4 -.L802409F8: -/* A8D478 802409F8 0C00A6C9 */ jal clamp_angle -/* A8D47C 802409FC 4600A306 */ mov.s $f12, $f20 -/* A8D480 80240A00 2402000D */ addiu $v0, $zero, 0xd -/* A8D484 80240A04 E640000C */ swc1 $f0, 0xc($s2) -/* A8D488 80240A08 AE620070 */ sw $v0, 0x70($s3) -/* A8D48C 80240A0C 8FBF0020 */ lw $ra, 0x20($sp) -/* A8D490 80240A10 8FB3001C */ lw $s3, 0x1c($sp) -/* A8D494 80240A14 8FB20018 */ lw $s2, 0x18($sp) -/* A8D498 80240A18 8FB10014 */ lw $s1, 0x14($sp) -/* A8D49C 80240A1C 8FB00010 */ lw $s0, 0x10($sp) -/* A8D4A0 80240A20 D7B40028 */ ldc1 $f20, 0x28($sp) -/* A8D4A4 80240A24 03E00008 */ jr $ra -/* A8D4A8 80240A28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC_A8D37C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC_A8D37C.s new file mode 100644 index 0000000000..2fbb458fa6 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802408FC_A8D37C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408FC_A8D37C +/* A8D37C 802408FC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A8D380 80240900 AFB3001C */ sw $s3, 0x1c($sp) +/* A8D384 80240904 0080982D */ daddu $s3, $a0, $zero +/* A8D388 80240908 AFBF0020 */ sw $ra, 0x20($sp) +/* A8D38C 8024090C AFB20018 */ sw $s2, 0x18($sp) +/* A8D390 80240910 AFB10014 */ sw $s1, 0x14($sp) +/* A8D394 80240914 AFB00010 */ sw $s0, 0x10($sp) +/* A8D398 80240918 F7B40028 */ sdc1 $f20, 0x28($sp) +/* A8D39C 8024091C 8E710148 */ lw $s1, 0x148($s3) +/* A8D3A0 80240920 86240008 */ lh $a0, 8($s1) +/* A8D3A4 80240924 0C00EABB */ jal get_npc_unsafe +/* A8D3A8 80240928 00A0802D */ daddu $s0, $a1, $zero +/* A8D3AC 8024092C 8E040020 */ lw $a0, 0x20($s0) +/* A8D3B0 80240930 0040902D */ daddu $s2, $v0, $zero +/* A8D3B4 80240934 00041FC2 */ srl $v1, $a0, 0x1f +/* A8D3B8 80240938 00832021 */ addu $a0, $a0, $v1 +/* A8D3BC 8024093C 00042043 */ sra $a0, $a0, 1 +/* A8D3C0 80240940 0C00A67F */ jal rand_int +/* A8D3C4 80240944 24840001 */ addiu $a0, $a0, 1 +/* A8D3C8 80240948 8E030020 */ lw $v1, 0x20($s0) +/* A8D3CC 8024094C C64C0038 */ lwc1 $f12, 0x38($s2) +/* A8D3D0 80240950 000327C2 */ srl $a0, $v1, 0x1f +/* A8D3D4 80240954 00641821 */ addu $v1, $v1, $a0 +/* A8D3D8 80240958 00031843 */ sra $v1, $v1, 1 +/* A8D3DC 8024095C 00621821 */ addu $v1, $v1, $v0 +/* A8D3E0 80240960 A643008E */ sh $v1, 0x8e($s2) +/* A8D3E4 80240964 8E2200CC */ lw $v0, 0xcc($s1) +/* A8D3E8 80240968 C64E0040 */ lwc1 $f14, 0x40($s2) +/* A8D3EC 8024096C 8C42000C */ lw $v0, 0xc($v0) +/* A8D3F0 80240970 AE420028 */ sw $v0, 0x28($s2) +/* A8D3F4 80240974 C6000018 */ lwc1 $f0, 0x18($s0) +/* A8D3F8 80240978 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A8D3FC 8024097C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A8D400 80240980 E6400018 */ swc1 $f0, 0x18($s2) +/* A8D404 80240984 8C460028 */ lw $a2, 0x28($v0) +/* A8D408 80240988 0C00A720 */ jal atan2 +/* A8D40C 8024098C 8C470030 */ lw $a3, 0x30($v0) +/* A8D410 80240990 46000506 */ mov.s $f20, $f0 +/* A8D414 80240994 C64C000C */ lwc1 $f12, 0xc($s2) +/* A8D418 80240998 0C00A70A */ jal get_clamped_angle_diff +/* A8D41C 8024099C 4600A386 */ mov.s $f14, $f20 +/* A8D420 802409A0 46000086 */ mov.s $f2, $f0 +/* A8D424 802409A4 8E02001C */ lw $v0, 0x1c($s0) +/* A8D428 802409A8 46001005 */ abs.s $f0, $f2 +/* A8D42C 802409AC 44822000 */ mtc1 $v0, $f4 +/* A8D430 802409B0 00000000 */ nop +/* A8D434 802409B4 46802120 */ cvt.s.w $f4, $f4 +/* A8D438 802409B8 4600203C */ c.lt.s $f4, $f0 +/* A8D43C 802409BC 00000000 */ nop +/* A8D440 802409C0 4500000D */ bc1f .L802409F8 +/* A8D444 802409C4 00000000 */ nop +/* A8D448 802409C8 44800000 */ mtc1 $zero, $f0 +/* A8D44C 802409CC C654000C */ lwc1 $f20, 0xc($s2) +/* A8D450 802409D0 4600103C */ c.lt.s $f2, $f0 +/* A8D454 802409D4 00000000 */ nop +/* A8D458 802409D8 45000006 */ bc1f .L802409F4 +/* A8D45C 802409DC 00021023 */ negu $v0, $v0 +/* A8D460 802409E0 44820000 */ mtc1 $v0, $f0 +/* A8D464 802409E4 00000000 */ nop +/* A8D468 802409E8 46800020 */ cvt.s.w $f0, $f0 +/* A8D46C 802409EC 0809027E */ j .L802409F8 +/* A8D470 802409F0 4600A500 */ add.s $f20, $f20, $f0 +.L802409F4: +/* A8D474 802409F4 4604A500 */ add.s $f20, $f20, $f4 +.L802409F8: +/* A8D478 802409F8 0C00A6C9 */ jal clamp_angle +/* A8D47C 802409FC 4600A306 */ mov.s $f12, $f20 +/* A8D480 80240A00 2402000D */ addiu $v0, $zero, 0xd +/* A8D484 80240A04 E640000C */ swc1 $f0, 0xc($s2) +/* A8D488 80240A08 AE620070 */ sw $v0, 0x70($s3) +/* A8D48C 80240A0C 8FBF0020 */ lw $ra, 0x20($sp) +/* A8D490 80240A10 8FB3001C */ lw $s3, 0x1c($sp) +/* A8D494 80240A14 8FB20018 */ lw $s2, 0x18($sp) +/* A8D498 80240A18 8FB10014 */ lw $s1, 0x14($sp) +/* A8D49C 80240A1C 8FB00010 */ lw $s0, 0x10($sp) +/* A8D4A0 80240A20 D7B40028 */ ldc1 $f20, 0x28($sp) +/* A8D4A4 80240A24 03E00008 */ jr $ra +/* A8D4A8 80240A28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C.s deleted file mode 100644 index 061eae9a39..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A2C -/* A8D4AC 80240A2C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A8D4B0 80240A30 AFB3003C */ sw $s3, 0x3c($sp) -/* A8D4B4 80240A34 0080982D */ daddu $s3, $a0, $zero -/* A8D4B8 80240A38 AFBF0040 */ sw $ra, 0x40($sp) -/* A8D4BC 80240A3C AFB20038 */ sw $s2, 0x38($sp) -/* A8D4C0 80240A40 AFB10034 */ sw $s1, 0x34($sp) -/* A8D4C4 80240A44 AFB00030 */ sw $s0, 0x30($sp) -/* A8D4C8 80240A48 8E720148 */ lw $s2, 0x148($s3) -/* A8D4CC 80240A4C 00A0882D */ daddu $s1, $a1, $zero -/* A8D4D0 80240A50 86440008 */ lh $a0, 8($s2) -/* A8D4D4 80240A54 0C00EABB */ jal get_npc_unsafe -/* A8D4D8 80240A58 00C0802D */ daddu $s0, $a2, $zero -/* A8D4DC 80240A5C 0200202D */ daddu $a0, $s0, $zero -/* A8D4E0 80240A60 0240282D */ daddu $a1, $s2, $zero -/* A8D4E4 80240A64 24030001 */ addiu $v1, $zero, 1 -/* A8D4E8 80240A68 AFA30010 */ sw $v1, 0x10($sp) -/* A8D4EC 80240A6C 8E260024 */ lw $a2, 0x24($s1) -/* A8D4F0 80240A70 8E270028 */ lw $a3, 0x28($s1) -/* A8D4F4 80240A74 0C01242D */ jal func_800490B4 -/* A8D4F8 80240A78 0040802D */ daddu $s0, $v0, $zero -/* A8D4FC 80240A7C 1440001E */ bnez $v0, .L80240AF8 -/* A8D500 80240A80 0200202D */ daddu $a0, $s0, $zero -/* A8D504 80240A84 24040002 */ addiu $a0, $zero, 2 -/* A8D508 80240A88 0200282D */ daddu $a1, $s0, $zero -/* A8D50C 80240A8C 0000302D */ daddu $a2, $zero, $zero -/* A8D510 80240A90 860300A8 */ lh $v1, 0xa8($s0) -/* A8D514 80240A94 3C013F80 */ lui $at, 0x3f80 -/* A8D518 80240A98 44810000 */ mtc1 $at, $f0 -/* A8D51C 80240A9C 3C014000 */ lui $at, 0x4000 -/* A8D520 80240AA0 44811000 */ mtc1 $at, $f2 -/* A8D524 80240AA4 3C01C1A0 */ lui $at, 0xc1a0 -/* A8D528 80240AA8 44812000 */ mtc1 $at, $f4 -/* A8D52C 80240AAC 2402000F */ addiu $v0, $zero, 0xf -/* A8D530 80240AB0 AFA2001C */ sw $v0, 0x1c($sp) -/* A8D534 80240AB4 44833000 */ mtc1 $v1, $f6 -/* A8D538 80240AB8 00000000 */ nop -/* A8D53C 80240ABC 468031A0 */ cvt.s.w $f6, $f6 -/* A8D540 80240AC0 44073000 */ mfc1 $a3, $f6 -/* A8D544 80240AC4 27A20028 */ addiu $v0, $sp, 0x28 -/* A8D548 80240AC8 AFA20020 */ sw $v0, 0x20($sp) -/* A8D54C 80240ACC E7A00010 */ swc1 $f0, 0x10($sp) -/* A8D550 80240AD0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A8D554 80240AD4 0C01BFA4 */ jal fx_emote -/* A8D558 80240AD8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8D55C 80240ADC 8E4200CC */ lw $v0, 0xcc($s2) -/* A8D560 80240AE0 8C430000 */ lw $v1, ($v0) -/* A8D564 80240AE4 24020019 */ addiu $v0, $zero, 0x19 -/* A8D568 80240AE8 A602008E */ sh $v0, 0x8e($s0) -/* A8D56C 80240AEC 2402000E */ addiu $v0, $zero, 0xe -/* A8D570 80240AF0 080902CB */ j .L80240B2C -/* A8D574 80240AF4 AE030028 */ sw $v1, 0x28($s0) -.L80240AF8: -/* A8D578 80240AF8 0C00F598 */ jal func_8003D660 -/* A8D57C 80240AFC 24050001 */ addiu $a1, $zero, 1 -/* A8D580 80240B00 8E050018 */ lw $a1, 0x18($s0) -/* A8D584 80240B04 8E06000C */ lw $a2, 0xc($s0) -/* A8D588 80240B08 0C00EA95 */ jal npc_move_heading -/* A8D58C 80240B0C 0200202D */ daddu $a0, $s0, $zero -/* A8D590 80240B10 8602008E */ lh $v0, 0x8e($s0) -/* A8D594 80240B14 9603008E */ lhu $v1, 0x8e($s0) -/* A8D598 80240B18 18400003 */ blez $v0, .L80240B28 -/* A8D59C 80240B1C 2462FFFF */ addiu $v0, $v1, -1 -/* A8D5A0 80240B20 080902CC */ j .L80240B30 -/* A8D5A4 80240B24 A602008E */ sh $v0, 0x8e($s0) -.L80240B28: -/* A8D5A8 80240B28 2402000C */ addiu $v0, $zero, 0xc -.L80240B2C: -/* A8D5AC 80240B2C AE620070 */ sw $v0, 0x70($s3) -.L80240B30: -/* A8D5B0 80240B30 8FBF0040 */ lw $ra, 0x40($sp) -/* A8D5B4 80240B34 8FB3003C */ lw $s3, 0x3c($sp) -/* A8D5B8 80240B38 8FB20038 */ lw $s2, 0x38($sp) -/* A8D5BC 80240B3C 8FB10034 */ lw $s1, 0x34($sp) -/* A8D5C0 80240B40 8FB00030 */ lw $s0, 0x30($sp) -/* A8D5C4 80240B44 03E00008 */ jr $ra -/* A8D5C8 80240B48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s new file mode 100644 index 0000000000..8ce82d253f --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240A2C_A8D4AC.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A2C_A8D4AC +/* A8D4AC 80240A2C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* A8D4B0 80240A30 AFB3003C */ sw $s3, 0x3c($sp) +/* A8D4B4 80240A34 0080982D */ daddu $s3, $a0, $zero +/* A8D4B8 80240A38 AFBF0040 */ sw $ra, 0x40($sp) +/* A8D4BC 80240A3C AFB20038 */ sw $s2, 0x38($sp) +/* A8D4C0 80240A40 AFB10034 */ sw $s1, 0x34($sp) +/* A8D4C4 80240A44 AFB00030 */ sw $s0, 0x30($sp) +/* A8D4C8 80240A48 8E720148 */ lw $s2, 0x148($s3) +/* A8D4CC 80240A4C 00A0882D */ daddu $s1, $a1, $zero +/* A8D4D0 80240A50 86440008 */ lh $a0, 8($s2) +/* A8D4D4 80240A54 0C00EABB */ jal get_npc_unsafe +/* A8D4D8 80240A58 00C0802D */ daddu $s0, $a2, $zero +/* A8D4DC 80240A5C 0200202D */ daddu $a0, $s0, $zero +/* A8D4E0 80240A60 0240282D */ daddu $a1, $s2, $zero +/* A8D4E4 80240A64 24030001 */ addiu $v1, $zero, 1 +/* A8D4E8 80240A68 AFA30010 */ sw $v1, 0x10($sp) +/* A8D4EC 80240A6C 8E260024 */ lw $a2, 0x24($s1) +/* A8D4F0 80240A70 8E270028 */ lw $a3, 0x28($s1) +/* A8D4F4 80240A74 0C01242D */ jal func_800490B4 +/* A8D4F8 80240A78 0040802D */ daddu $s0, $v0, $zero +/* A8D4FC 80240A7C 1440001E */ bnez $v0, .L80240AF8 +/* A8D500 80240A80 0200202D */ daddu $a0, $s0, $zero +/* A8D504 80240A84 24040002 */ addiu $a0, $zero, 2 +/* A8D508 80240A88 0200282D */ daddu $a1, $s0, $zero +/* A8D50C 80240A8C 0000302D */ daddu $a2, $zero, $zero +/* A8D510 80240A90 860300A8 */ lh $v1, 0xa8($s0) +/* A8D514 80240A94 3C013F80 */ lui $at, 0x3f80 +/* A8D518 80240A98 44810000 */ mtc1 $at, $f0 +/* A8D51C 80240A9C 3C014000 */ lui $at, 0x4000 +/* A8D520 80240AA0 44811000 */ mtc1 $at, $f2 +/* A8D524 80240AA4 3C01C1A0 */ lui $at, 0xc1a0 +/* A8D528 80240AA8 44812000 */ mtc1 $at, $f4 +/* A8D52C 80240AAC 2402000F */ addiu $v0, $zero, 0xf +/* A8D530 80240AB0 AFA2001C */ sw $v0, 0x1c($sp) +/* A8D534 80240AB4 44833000 */ mtc1 $v1, $f6 +/* A8D538 80240AB8 00000000 */ nop +/* A8D53C 80240ABC 468031A0 */ cvt.s.w $f6, $f6 +/* A8D540 80240AC0 44073000 */ mfc1 $a3, $f6 +/* A8D544 80240AC4 27A20028 */ addiu $v0, $sp, 0x28 +/* A8D548 80240AC8 AFA20020 */ sw $v0, 0x20($sp) +/* A8D54C 80240ACC E7A00010 */ swc1 $f0, 0x10($sp) +/* A8D550 80240AD0 E7A20014 */ swc1 $f2, 0x14($sp) +/* A8D554 80240AD4 0C01BFA4 */ jal fx_emote +/* A8D558 80240AD8 E7A40018 */ swc1 $f4, 0x18($sp) +/* A8D55C 80240ADC 8E4200CC */ lw $v0, 0xcc($s2) +/* A8D560 80240AE0 8C430000 */ lw $v1, ($v0) +/* A8D564 80240AE4 24020019 */ addiu $v0, $zero, 0x19 +/* A8D568 80240AE8 A602008E */ sh $v0, 0x8e($s0) +/* A8D56C 80240AEC 2402000E */ addiu $v0, $zero, 0xe +/* A8D570 80240AF0 080902CB */ j .L80240B2C +/* A8D574 80240AF4 AE030028 */ sw $v1, 0x28($s0) +.L80240AF8: +/* A8D578 80240AF8 0C00F598 */ jal func_8003D660 +/* A8D57C 80240AFC 24050001 */ addiu $a1, $zero, 1 +/* A8D580 80240B00 8E050018 */ lw $a1, 0x18($s0) +/* A8D584 80240B04 8E06000C */ lw $a2, 0xc($s0) +/* A8D588 80240B08 0C00EA95 */ jal npc_move_heading +/* A8D58C 80240B0C 0200202D */ daddu $a0, $s0, $zero +/* A8D590 80240B10 8602008E */ lh $v0, 0x8e($s0) +/* A8D594 80240B14 9603008E */ lhu $v1, 0x8e($s0) +/* A8D598 80240B18 18400003 */ blez $v0, .L80240B28 +/* A8D59C 80240B1C 2462FFFF */ addiu $v0, $v1, -1 +/* A8D5A0 80240B20 080902CC */ j .L80240B30 +/* A8D5A4 80240B24 A602008E */ sh $v0, 0x8e($s0) +.L80240B28: +/* A8D5A8 80240B28 2402000C */ addiu $v0, $zero, 0xc +.L80240B2C: +/* A8D5AC 80240B2C AE620070 */ sw $v0, 0x70($s3) +.L80240B30: +/* A8D5B0 80240B30 8FBF0040 */ lw $ra, 0x40($sp) +/* A8D5B4 80240B34 8FB3003C */ lw $s3, 0x3c($sp) +/* A8D5B8 80240B38 8FB20038 */ lw $s2, 0x38($sp) +/* A8D5BC 80240B3C 8FB10034 */ lw $s1, 0x34($sp) +/* A8D5C0 80240B40 8FB00030 */ lw $s0, 0x30($sp) +/* A8D5C4 80240B44 03E00008 */ jr $ra +/* A8D5C8 80240B48 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s index b067189e0c..5be08d3b0c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80240C74_A8D6F4.s @@ -131,59 +131,59 @@ glabel func_80240C74_A8D6F4 /* A8D8D4 80240E54 00000000 */ nop /* A8D8D8 80240E58 0280202D */ daddu $a0, $s4, $zero /* A8D8DC 80240E5C 0260282D */ daddu $a1, $s3, $zero -/* A8D8E0 80240E60 0C090038 */ jal func_802400E0 +/* A8D8E0 80240E60 0C090038 */ jal func_802400E0_A8CB60 /* A8D8E4 80240E64 02A0302D */ daddu $a2, $s5, $zero /* A8D8E8 80240E68 0280202D */ daddu $a0, $s4, $zero /* A8D8EC 80240E6C 0260282D */ daddu $a1, $s3, $zero -/* A8D8F0 80240E70 0C09008E */ jal func_80240238 +/* A8D8F0 80240E70 0C09008E */ jal func_80240238_A8CCB8 /* A8D8F4 80240E74 02A0302D */ daddu $a2, $s5, $zero /* A8D8F8 80240E78 080903D2 */ j .L80240F48 /* A8D8FC 80240E7C 00000000 */ nop /* A8D900 80240E80 0280202D */ daddu $a0, $s4, $zero /* A8D904 80240E84 0260282D */ daddu $a1, $s3, $zero -/* A8D908 80240E88 0C090138 */ jal func_802404E0 +/* A8D908 80240E88 0C090138 */ jal func_802404E0_A8CF60 /* A8D90C 80240E8C 02A0302D */ daddu $a2, $s5, $zero /* A8D910 80240E90 0280202D */ daddu $a0, $s4, $zero /* A8D914 80240E94 0260282D */ daddu $a1, $s3, $zero -/* A8D918 80240E98 0C090168 */ jal func_802405A0 +/* A8D918 80240E98 0C090168 */ jal func_802405A0_A8D020 /* A8D91C 80240E9C 02A0302D */ daddu $a2, $s5, $zero /* A8D920 80240EA0 080903D2 */ j .L80240F48 /* A8D924 80240EA4 00000000 */ nop /* A8D928 80240EA8 0280202D */ daddu $a0, $s4, $zero /* A8D92C 80240EAC 0260282D */ daddu $a1, $s3, $zero -/* A8D930 80240EB0 0C0901D7 */ jal func_8024075C +/* A8D930 80240EB0 0C0901D7 */ jal func_8024075C_A8D1DC /* A8D934 80240EB4 02A0302D */ daddu $a2, $s5, $zero /* A8D938 80240EB8 080903D2 */ j .L80240F48 /* A8D93C 80240EBC 00000000 */ nop /* A8D940 80240EC0 0280202D */ daddu $a0, $s4, $zero /* A8D944 80240EC4 0260282D */ daddu $a1, $s3, $zero -/* A8D948 80240EC8 0C090204 */ jal func_80240810 +/* A8D948 80240EC8 0C090204 */ jal func_80240810_A8D290 /* A8D94C 80240ECC 02A0302D */ daddu $a2, $s5, $zero /* A8D950 80240ED0 0280202D */ daddu $a0, $s4, $zero /* A8D954 80240ED4 0260282D */ daddu $a1, $s3, $zero -/* A8D958 80240ED8 0C090221 */ jal func_80240884 +/* A8D958 80240ED8 0C090221 */ jal func_80240884_A8D304 /* A8D95C 80240EDC 02A0302D */ daddu $a2, $s5, $zero /* A8D960 80240EE0 080903D2 */ j .L80240F48 /* A8D964 80240EE4 00000000 */ nop /* A8D968 80240EE8 0280202D */ daddu $a0, $s4, $zero /* A8D96C 80240EEC 0260282D */ daddu $a1, $s3, $zero -/* A8D970 80240EF0 0C09023F */ jal func_802408FC +/* A8D970 80240EF0 0C09023F */ jal func_802408FC_A8D37C /* A8D974 80240EF4 02A0302D */ daddu $a2, $s5, $zero /* A8D978 80240EF8 0280202D */ daddu $a0, $s4, $zero /* A8D97C 80240EFC 0260282D */ daddu $a1, $s3, $zero -/* A8D980 80240F00 0C09028B */ jal func_80240A2C +/* A8D980 80240F00 0C09028B */ jal func_80240A2C_A8D4AC /* A8D984 80240F04 02A0302D */ daddu $a2, $s5, $zero /* A8D988 80240F08 080903D2 */ j .L80240F48 /* A8D98C 80240F0C 00000000 */ nop /* A8D990 80240F10 0280202D */ daddu $a0, $s4, $zero /* A8D994 80240F14 0260282D */ daddu $a1, $s3, $zero -/* A8D998 80240F18 0C0902D3 */ jal func_80240B4C +/* A8D998 80240F18 0C0902D3 */ jal func_80240B4C_A8D5CC /* A8D99C 80240F1C 02A0302D */ daddu $a2, $s5, $zero /* A8D9A0 80240F20 080903D2 */ j .L80240F48 /* A8D9A4 80240F24 00000000 */ nop /* A8D9A8 80240F28 0280202D */ daddu $a0, $s4, $zero /* A8D9AC 80240F2C 0260282D */ daddu $a1, $s3, $zero -/* A8D9B0 80240F30 0C0902ED */ jal func_80240BB4 +/* A8D9B0 80240F30 0C0902ED */ jal func_80240BB4_A8D634 /* A8D9B4 80240F34 02A0302D */ daddu $a2, $s5, $zero /* A8D9B8 80240F38 080903D2 */ j .L80240F48 /* A8D9BC 80240F3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241284.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241284.s deleted file mode 100644 index cb9b15adbf..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241284.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241284 -/* A8DD04 80241284 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8DD08 80241288 AFB10014 */ sw $s1, 0x14($sp) -/* A8DD0C 8024128C 0080882D */ daddu $s1, $a0, $zero -/* A8DD10 80241290 AFBF0018 */ sw $ra, 0x18($sp) -/* A8DD14 80241294 AFB00010 */ sw $s0, 0x10($sp) -/* A8DD18 80241298 8E300148 */ lw $s0, 0x148($s1) -/* A8DD1C 8024129C 0C00EABB */ jal get_npc_unsafe -/* A8DD20 802412A0 86040008 */ lh $a0, 8($s0) -/* A8DD24 802412A4 0040202D */ daddu $a0, $v0, $zero -/* A8DD28 802412A8 9482008E */ lhu $v0, 0x8e($a0) -/* A8DD2C 802412AC 24030003 */ addiu $v1, $zero, 3 -/* A8DD30 802412B0 24420001 */ addiu $v0, $v0, 1 -/* A8DD34 802412B4 A482008E */ sh $v0, 0x8e($a0) -/* A8DD38 802412B8 00021400 */ sll $v0, $v0, 0x10 -/* A8DD3C 802412BC 00021403 */ sra $v0, $v0, 0x10 -/* A8DD40 802412C0 14430003 */ bne $v0, $v1, .L802412D0 -/* A8DD44 802412C4 00000000 */ nop -/* A8DD48 802412C8 96020086 */ lhu $v0, 0x86($s0) -/* A8DD4C 802412CC A48200A8 */ sh $v0, 0xa8($a0) -.L802412D0: -/* A8DD50 802412D0 8482008E */ lh $v0, 0x8e($a0) -/* A8DD54 802412D4 8E030080 */ lw $v1, 0x80($s0) -/* A8DD58 802412D8 0043102A */ slt $v0, $v0, $v1 -/* A8DD5C 802412DC 14400004 */ bnez $v0, .L802412F0 -/* A8DD60 802412E0 00000000 */ nop -/* A8DD64 802412E4 96020086 */ lhu $v0, 0x86($s0) -/* A8DD68 802412E8 A48200A8 */ sh $v0, 0xa8($a0) -/* A8DD6C 802412EC AE200070 */ sw $zero, 0x70($s1) -.L802412F0: -/* A8DD70 802412F0 8FBF0018 */ lw $ra, 0x18($sp) -/* A8DD74 802412F4 8FB10014 */ lw $s1, 0x14($sp) -/* A8DD78 802412F8 8FB00010 */ lw $s0, 0x10($sp) -/* A8DD7C 802412FC 03E00008 */ jr $ra -/* A8DD80 80241300 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241284_A8DD04.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241284_A8DD04.s new file mode 100644 index 0000000000..adb4b21469 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241284_A8DD04.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241284_A8DD04 +/* A8DD04 80241284 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A8DD08 80241288 AFB10014 */ sw $s1, 0x14($sp) +/* A8DD0C 8024128C 0080882D */ daddu $s1, $a0, $zero +/* A8DD10 80241290 AFBF0018 */ sw $ra, 0x18($sp) +/* A8DD14 80241294 AFB00010 */ sw $s0, 0x10($sp) +/* A8DD18 80241298 8E300148 */ lw $s0, 0x148($s1) +/* A8DD1C 8024129C 0C00EABB */ jal get_npc_unsafe +/* A8DD20 802412A0 86040008 */ lh $a0, 8($s0) +/* A8DD24 802412A4 0040202D */ daddu $a0, $v0, $zero +/* A8DD28 802412A8 9482008E */ lhu $v0, 0x8e($a0) +/* A8DD2C 802412AC 24030003 */ addiu $v1, $zero, 3 +/* A8DD30 802412B0 24420001 */ addiu $v0, $v0, 1 +/* A8DD34 802412B4 A482008E */ sh $v0, 0x8e($a0) +/* A8DD38 802412B8 00021400 */ sll $v0, $v0, 0x10 +/* A8DD3C 802412BC 00021403 */ sra $v0, $v0, 0x10 +/* A8DD40 802412C0 14430003 */ bne $v0, $v1, .L802412D0 +/* A8DD44 802412C4 00000000 */ nop +/* A8DD48 802412C8 96020086 */ lhu $v0, 0x86($s0) +/* A8DD4C 802412CC A48200A8 */ sh $v0, 0xa8($a0) +.L802412D0: +/* A8DD50 802412D0 8482008E */ lh $v0, 0x8e($a0) +/* A8DD54 802412D4 8E030080 */ lw $v1, 0x80($s0) +/* A8DD58 802412D8 0043102A */ slt $v0, $v0, $v1 +/* A8DD5C 802412DC 14400004 */ bnez $v0, .L802412F0 +/* A8DD60 802412E0 00000000 */ nop +/* A8DD64 802412E4 96020086 */ lhu $v0, 0x86($s0) +/* A8DD68 802412E8 A48200A8 */ sh $v0, 0xa8($a0) +/* A8DD6C 802412EC AE200070 */ sw $zero, 0x70($s1) +.L802412F0: +/* A8DD70 802412F0 8FBF0018 */ lw $ra, 0x18($sp) +/* A8DD74 802412F4 8FB10014 */ lw $s1, 0x14($sp) +/* A8DD78 802412F8 8FB00010 */ lw $s0, 0x10($sp) +/* A8DD7C 802412FC 03E00008 */ jr $ra +/* A8DD80 80241300 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304.s deleted file mode 100644 index d8ce2ba910..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304.s +++ /dev/null @@ -1,204 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241304 -/* A8DD84 80241304 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A8DD88 80241308 AFB3005C */ sw $s3, 0x5c($sp) -/* A8DD8C 8024130C 0080982D */ daddu $s3, $a0, $zero -/* A8DD90 80241310 AFBF0068 */ sw $ra, 0x68($sp) -/* A8DD94 80241314 AFB50064 */ sw $s5, 0x64($sp) -/* A8DD98 80241318 AFB40060 */ sw $s4, 0x60($sp) -/* A8DD9C 8024131C AFB20058 */ sw $s2, 0x58($sp) -/* A8DDA0 80241320 AFB10054 */ sw $s1, 0x54($sp) -/* A8DDA4 80241324 AFB00050 */ sw $s0, 0x50($sp) -/* A8DDA8 80241328 8E710148 */ lw $s1, 0x148($s3) -/* A8DDAC 8024132C 86240008 */ lh $a0, 8($s1) -/* A8DDB0 80241330 0C00EABB */ jal get_npc_unsafe -/* A8DDB4 80241334 00A0802D */ daddu $s0, $a1, $zero -/* A8DDB8 80241338 8E63000C */ lw $v1, 0xc($s3) -/* A8DDBC 8024133C 0260202D */ daddu $a0, $s3, $zero -/* A8DDC0 80241340 8C650000 */ lw $a1, ($v1) -/* A8DDC4 80241344 0C0B1EAF */ jal get_variable -/* A8DDC8 80241348 0040902D */ daddu $s2, $v0, $zero -/* A8DDCC 8024134C AFA00028 */ sw $zero, 0x28($sp) -/* A8DDD0 80241350 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DDD4 80241354 8C630094 */ lw $v1, 0x94($v1) -/* A8DDD8 80241358 AFA3002C */ sw $v1, 0x2c($sp) -/* A8DDDC 8024135C 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DDE0 80241360 8C630080 */ lw $v1, 0x80($v1) -/* A8DDE4 80241364 AFA30030 */ sw $v1, 0x30($sp) -/* A8DDE8 80241368 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DDEC 8024136C 8C630088 */ lw $v1, 0x88($v1) -/* A8DDF0 80241370 AFA30034 */ sw $v1, 0x34($sp) -/* A8DDF4 80241374 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DDF8 80241378 8C63008C */ lw $v1, 0x8c($v1) -/* A8DDFC 8024137C 27B50028 */ addiu $s5, $sp, 0x28 -/* A8DE00 80241380 AFA30038 */ sw $v1, 0x38($sp) -/* A8DE04 80241384 8E2300D0 */ lw $v1, 0xd0($s1) -/* A8DE08 80241388 3C0142C8 */ lui $at, 0x42c8 -/* A8DE0C 8024138C 44810000 */ mtc1 $at, $f0 -/* A8DE10 80241390 8C630090 */ lw $v1, 0x90($v1) -/* A8DE14 80241394 0040A02D */ daddu $s4, $v0, $zero -/* A8DE18 80241398 E7A00040 */ swc1 $f0, 0x40($sp) -/* A8DE1C 8024139C A7A00044 */ sh $zero, 0x44($sp) -/* A8DE20 802413A0 12000007 */ beqz $s0, .L802413C0 -/* A8DE24 802413A4 AFA3003C */ sw $v1, 0x3c($sp) -/* A8DE28 802413A8 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8DE2C 802413AC 864300A8 */ lh $v1, 0xa8($s2) -/* A8DE30 802413B0 34420008 */ ori $v0, $v0, 8 -/* A8DE34 802413B4 AE230084 */ sw $v1, 0x84($s1) -/* A8DE38 802413B8 080904F4 */ j .L802413D0 -/* A8DE3C 802413BC AE2200B0 */ sw $v0, 0xb0($s1) -.L802413C0: -/* A8DE40 802413C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8DE44 802413C4 30420004 */ andi $v0, $v0, 4 -/* A8DE48 802413C8 10400048 */ beqz $v0, .L802414EC -/* A8DE4C 802413CC 00000000 */ nop -.L802413D0: -/* A8DE50 802413D0 A640008E */ sh $zero, 0x8e($s2) -/* A8DE54 802413D4 AE600070 */ sw $zero, 0x70($s3) -/* A8DE58 802413D8 8E2300CC */ lw $v1, 0xcc($s1) -/* A8DE5C 802413DC 2404F7FF */ addiu $a0, $zero, -0x801 -/* A8DE60 802413E0 A2200007 */ sb $zero, 7($s1) -/* A8DE64 802413E4 8E420000 */ lw $v0, ($s2) -/* A8DE68 802413E8 8C630000 */ lw $v1, ($v1) -/* A8DE6C 802413EC 00441024 */ and $v0, $v0, $a0 -/* A8DE70 802413F0 AE420000 */ sw $v0, ($s2) -/* A8DE74 802413F4 AE430028 */ sw $v1, 0x28($s2) -/* A8DE78 802413F8 96220086 */ lhu $v0, 0x86($s1) -/* A8DE7C 802413FC A64200A8 */ sh $v0, 0xa8($s2) -/* A8DE80 80241400 8E2200D0 */ lw $v0, 0xd0($s1) -/* A8DE84 80241404 A22000B5 */ sb $zero, 0xb5($s1) -/* A8DE88 80241408 AE20008C */ sw $zero, 0x8c($s1) -/* A8DE8C 8024140C 8C420098 */ lw $v0, 0x98($v0) -/* A8DE90 80241410 14400006 */ bnez $v0, .L8024142C -/* A8DE94 80241414 2403FDFF */ addiu $v1, $zero, -0x201 -/* A8DE98 80241418 8E420000 */ lw $v0, ($s2) -/* A8DE9C 8024141C 2403FFF7 */ addiu $v1, $zero, -9 -/* A8DEA0 80241420 34420200 */ ori $v0, $v0, 0x200 -/* A8DEA4 80241424 0809050E */ j .L80241438 -/* A8DEA8 80241428 00431024 */ and $v0, $v0, $v1 -.L8024142C: -/* A8DEAC 8024142C 8E420000 */ lw $v0, ($s2) -/* A8DEB0 80241430 00431024 */ and $v0, $v0, $v1 -/* A8DEB4 80241434 34420008 */ ori $v0, $v0, 8 -.L80241438: -/* A8DEB8 80241438 AE420000 */ sw $v0, ($s2) -/* A8DEBC 8024143C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8DEC0 80241440 30420004 */ andi $v0, $v0, 4 -/* A8DEC4 80241444 1040001E */ beqz $v0, .L802414C0 -/* A8DEC8 80241448 24040002 */ addiu $a0, $zero, 2 -/* A8DECC 8024144C 0240282D */ daddu $a1, $s2, $zero -/* A8DED0 80241450 0000302D */ daddu $a2, $zero, $zero -/* A8DED4 80241454 24020063 */ addiu $v0, $zero, 0x63 -/* A8DED8 80241458 AE620070 */ sw $v0, 0x70($s3) -/* A8DEDC 8024145C AE600074 */ sw $zero, 0x74($s3) -/* A8DEE0 80241460 864300A8 */ lh $v1, 0xa8($s2) -/* A8DEE4 80241464 3C013F80 */ lui $at, 0x3f80 -/* A8DEE8 80241468 44810000 */ mtc1 $at, $f0 -/* A8DEEC 8024146C 3C014000 */ lui $at, 0x4000 -/* A8DEF0 80241470 44811000 */ mtc1 $at, $f2 -/* A8DEF4 80241474 3C01C1A0 */ lui $at, 0xc1a0 -/* A8DEF8 80241478 44812000 */ mtc1 $at, $f4 -/* A8DEFC 8024147C 24020028 */ addiu $v0, $zero, 0x28 -/* A8DF00 80241480 AFA2001C */ sw $v0, 0x1c($sp) -/* A8DF04 80241484 44833000 */ mtc1 $v1, $f6 -/* A8DF08 80241488 00000000 */ nop -/* A8DF0C 8024148C 468031A0 */ cvt.s.w $f6, $f6 -/* A8DF10 80241490 44073000 */ mfc1 $a3, $f6 -/* A8DF14 80241494 27A20048 */ addiu $v0, $sp, 0x48 -/* A8DF18 80241498 AFA20020 */ sw $v0, 0x20($sp) -/* A8DF1C 8024149C E7A00010 */ swc1 $f0, 0x10($sp) -/* A8DF20 802414A0 E7A20014 */ swc1 $f2, 0x14($sp) -/* A8DF24 802414A4 0C01BFA4 */ jal fx_emote -/* A8DF28 802414A8 E7A40018 */ swc1 $f4, 0x18($sp) -/* A8DF2C 802414AC 8E2200B0 */ lw $v0, 0xb0($s1) -/* A8DF30 802414B0 2403FFFB */ addiu $v1, $zero, -5 -/* A8DF34 802414B4 00431024 */ and $v0, $v0, $v1 -/* A8DF38 802414B8 0809053B */ j .L802414EC -/* A8DF3C 802414BC AE2200B0 */ sw $v0, 0xb0($s1) -.L802414C0: -/* A8DF40 802414C0 8E220000 */ lw $v0, ($s1) -/* A8DF44 802414C4 3C034000 */ lui $v1, 0x4000 -/* A8DF48 802414C8 00431024 */ and $v0, $v0, $v1 -/* A8DF4C 802414CC 10400007 */ beqz $v0, .L802414EC -/* A8DF50 802414D0 3C03BFFF */ lui $v1, 0xbfff -/* A8DF54 802414D4 2402000C */ addiu $v0, $zero, 0xc -/* A8DF58 802414D8 AE620070 */ sw $v0, 0x70($s3) -/* A8DF5C 802414DC 8E220000 */ lw $v0, ($s1) -/* A8DF60 802414E0 3463FFFF */ ori $v1, $v1, 0xffff -/* A8DF64 802414E4 00431024 */ and $v0, $v0, $v1 -/* A8DF68 802414E8 AE220000 */ sw $v0, ($s1) -.L802414EC: -/* A8DF6C 802414EC 8E630070 */ lw $v1, 0x70($s3) -/* A8DF70 802414F0 2C620064 */ sltiu $v0, $v1, 0x64 -/* A8DF74 802414F4 1040003A */ beqz $v0, .L802415E0 -/* A8DF78 802414F8 00031080 */ sll $v0, $v1, 2 -/* A8DF7C 802414FC 3C018024 */ lui $at, 0x8024 -/* A8DF80 80241500 00220821 */ addu $at, $at, $v0 -/* A8DF84 80241504 8C225BA8 */ lw $v0, 0x5ba8($at) -/* A8DF88 80241508 00400008 */ jr $v0 -/* A8DF8C 8024150C 00000000 */ nop -/* A8DF90 80241510 0260202D */ daddu $a0, $s3, $zero -/* A8DF94 80241514 0280282D */ daddu $a1, $s4, $zero -/* A8DF98 80241518 0C090038 */ jal func_802400E0 -/* A8DF9C 8024151C 02A0302D */ daddu $a2, $s5, $zero -/* A8DFA0 80241520 96220086 */ lhu $v0, 0x86($s1) -/* A8DFA4 80241524 A64200A8 */ sh $v0, 0xa8($s2) -/* A8DFA8 80241528 0260202D */ daddu $a0, $s3, $zero -/* A8DFAC 8024152C 0280282D */ daddu $a1, $s4, $zero -/* A8DFB0 80241530 0C09008E */ jal func_80240238 -/* A8DFB4 80241534 02A0302D */ daddu $a2, $s5, $zero -/* A8DFB8 80241538 08090578 */ j .L802415E0 -/* A8DFBC 8024153C 00000000 */ nop -/* A8DFC0 80241540 0260202D */ daddu $a0, $s3, $zero -/* A8DFC4 80241544 0280282D */ daddu $a1, $s4, $zero -/* A8DFC8 80241548 0C090138 */ jal func_802404E0 -/* A8DFCC 8024154C 02A0302D */ daddu $a2, $s5, $zero -/* A8DFD0 80241550 0260202D */ daddu $a0, $s3, $zero -/* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero -/* A8DFD8 80241558 0C090168 */ jal func_802405A0 -/* A8DFDC 8024155C 02A0302D */ daddu $a2, $s5, $zero -/* A8DFE0 80241560 08090578 */ j .L802415E0 -/* A8DFE4 80241564 00000000 */ nop -/* A8DFE8 80241568 0260202D */ daddu $a0, $s3, $zero -/* A8DFEC 8024156C 0280282D */ daddu $a1, $s4, $zero -/* A8DFF0 80241570 0C0901D7 */ jal func_8024075C -/* A8DFF4 80241574 02A0302D */ daddu $a2, $s5, $zero -/* A8DFF8 80241578 08090578 */ j .L802415E0 -/* A8DFFC 8024157C 00000000 */ nop -/* A8E000 80241580 0260202D */ daddu $a0, $s3, $zero -/* A8E004 80241584 0280282D */ daddu $a1, $s4, $zero -/* A8E008 80241588 0C0903DC */ jal func_80240F70 -/* A8E00C 8024158C 02A0302D */ daddu $a2, $s5, $zero -/* A8E010 80241590 0260202D */ daddu $a0, $s3, $zero -/* A8E014 80241594 0280282D */ daddu $a1, $s4, $zero -/* A8E018 80241598 0C0903FB */ jal func_80240FEC -/* A8E01C 8024159C 02A0302D */ daddu $a2, $s5, $zero -/* A8E020 802415A0 08090578 */ j .L802415E0 -/* A8E024 802415A4 00000000 */ nop -/* A8E028 802415A8 0260202D */ daddu $a0, $s3, $zero -/* A8E02C 802415AC 0280282D */ daddu $a1, $s4, $zero -/* A8E030 802415B0 0C090448 */ jal func_80241120 -/* A8E034 802415B4 02A0302D */ daddu $a2, $s5, $zero -/* A8E038 802415B8 08090578 */ j .L802415E0 -/* A8E03C 802415BC 00000000 */ nop -/* A8E040 802415C0 0260202D */ daddu $a0, $s3, $zero -/* A8E044 802415C4 0280282D */ daddu $a1, $s4, $zero -/* A8E048 802415C8 0C0904A1 */ jal func_80241284 -/* A8E04C 802415CC 02A0302D */ daddu $a2, $s5, $zero -/* A8E050 802415D0 08090578 */ j .L802415E0 -/* A8E054 802415D4 00000000 */ nop -/* A8E058 802415D8 0C0129CF */ jal func_8004A73C -/* A8E05C 802415DC 0260202D */ daddu $a0, $s3, $zero -.L802415E0: -/* A8E060 802415E0 8FBF0068 */ lw $ra, 0x68($sp) -/* A8E064 802415E4 8FB50064 */ lw $s5, 0x64($sp) -/* A8E068 802415E8 8FB40060 */ lw $s4, 0x60($sp) -/* A8E06C 802415EC 8FB3005C */ lw $s3, 0x5c($sp) -/* A8E070 802415F0 8FB20058 */ lw $s2, 0x58($sp) -/* A8E074 802415F4 8FB10054 */ lw $s1, 0x54($sp) -/* A8E078 802415F8 8FB00050 */ lw $s0, 0x50($sp) -/* A8E07C 802415FC 0000102D */ daddu $v0, $zero, $zero -/* A8E080 80241600 03E00008 */ jr $ra -/* A8E084 80241604 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s new file mode 100644 index 0000000000..c206c8336a --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241304_A8DD84.s @@ -0,0 +1,204 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241304_A8DD84 +/* A8DD84 80241304 27BDFF90 */ addiu $sp, $sp, -0x70 +/* A8DD88 80241308 AFB3005C */ sw $s3, 0x5c($sp) +/* A8DD8C 8024130C 0080982D */ daddu $s3, $a0, $zero +/* A8DD90 80241310 AFBF0068 */ sw $ra, 0x68($sp) +/* A8DD94 80241314 AFB50064 */ sw $s5, 0x64($sp) +/* A8DD98 80241318 AFB40060 */ sw $s4, 0x60($sp) +/* A8DD9C 8024131C AFB20058 */ sw $s2, 0x58($sp) +/* A8DDA0 80241320 AFB10054 */ sw $s1, 0x54($sp) +/* A8DDA4 80241324 AFB00050 */ sw $s0, 0x50($sp) +/* A8DDA8 80241328 8E710148 */ lw $s1, 0x148($s3) +/* A8DDAC 8024132C 86240008 */ lh $a0, 8($s1) +/* A8DDB0 80241330 0C00EABB */ jal get_npc_unsafe +/* A8DDB4 80241334 00A0802D */ daddu $s0, $a1, $zero +/* A8DDB8 80241338 8E63000C */ lw $v1, 0xc($s3) +/* A8DDBC 8024133C 0260202D */ daddu $a0, $s3, $zero +/* A8DDC0 80241340 8C650000 */ lw $a1, ($v1) +/* A8DDC4 80241344 0C0B1EAF */ jal get_variable +/* A8DDC8 80241348 0040902D */ daddu $s2, $v0, $zero +/* A8DDCC 8024134C AFA00028 */ sw $zero, 0x28($sp) +/* A8DDD0 80241350 8E2300D0 */ lw $v1, 0xd0($s1) +/* A8DDD4 80241354 8C630094 */ lw $v1, 0x94($v1) +/* A8DDD8 80241358 AFA3002C */ sw $v1, 0x2c($sp) +/* A8DDDC 8024135C 8E2300D0 */ lw $v1, 0xd0($s1) +/* A8DDE0 80241360 8C630080 */ lw $v1, 0x80($v1) +/* A8DDE4 80241364 AFA30030 */ sw $v1, 0x30($sp) +/* A8DDE8 80241368 8E2300D0 */ lw $v1, 0xd0($s1) +/* A8DDEC 8024136C 8C630088 */ lw $v1, 0x88($v1) +/* A8DDF0 80241370 AFA30034 */ sw $v1, 0x34($sp) +/* A8DDF4 80241374 8E2300D0 */ lw $v1, 0xd0($s1) +/* A8DDF8 80241378 8C63008C */ lw $v1, 0x8c($v1) +/* A8DDFC 8024137C 27B50028 */ addiu $s5, $sp, 0x28 +/* A8DE00 80241380 AFA30038 */ sw $v1, 0x38($sp) +/* A8DE04 80241384 8E2300D0 */ lw $v1, 0xd0($s1) +/* A8DE08 80241388 3C0142C8 */ lui $at, 0x42c8 +/* A8DE0C 8024138C 44810000 */ mtc1 $at, $f0 +/* A8DE10 80241390 8C630090 */ lw $v1, 0x90($v1) +/* A8DE14 80241394 0040A02D */ daddu $s4, $v0, $zero +/* A8DE18 80241398 E7A00040 */ swc1 $f0, 0x40($sp) +/* A8DE1C 8024139C A7A00044 */ sh $zero, 0x44($sp) +/* A8DE20 802413A0 12000007 */ beqz $s0, .L802413C0 +/* A8DE24 802413A4 AFA3003C */ sw $v1, 0x3c($sp) +/* A8DE28 802413A8 8E2200B0 */ lw $v0, 0xb0($s1) +/* A8DE2C 802413AC 864300A8 */ lh $v1, 0xa8($s2) +/* A8DE30 802413B0 34420008 */ ori $v0, $v0, 8 +/* A8DE34 802413B4 AE230084 */ sw $v1, 0x84($s1) +/* A8DE38 802413B8 080904F4 */ j .L802413D0 +/* A8DE3C 802413BC AE2200B0 */ sw $v0, 0xb0($s1) +.L802413C0: +/* A8DE40 802413C0 8E2200B0 */ lw $v0, 0xb0($s1) +/* A8DE44 802413C4 30420004 */ andi $v0, $v0, 4 +/* A8DE48 802413C8 10400048 */ beqz $v0, .L802414EC +/* A8DE4C 802413CC 00000000 */ nop +.L802413D0: +/* A8DE50 802413D0 A640008E */ sh $zero, 0x8e($s2) +/* A8DE54 802413D4 AE600070 */ sw $zero, 0x70($s3) +/* A8DE58 802413D8 8E2300CC */ lw $v1, 0xcc($s1) +/* A8DE5C 802413DC 2404F7FF */ addiu $a0, $zero, -0x801 +/* A8DE60 802413E0 A2200007 */ sb $zero, 7($s1) +/* A8DE64 802413E4 8E420000 */ lw $v0, ($s2) +/* A8DE68 802413E8 8C630000 */ lw $v1, ($v1) +/* A8DE6C 802413EC 00441024 */ and $v0, $v0, $a0 +/* A8DE70 802413F0 AE420000 */ sw $v0, ($s2) +/* A8DE74 802413F4 AE430028 */ sw $v1, 0x28($s2) +/* A8DE78 802413F8 96220086 */ lhu $v0, 0x86($s1) +/* A8DE7C 802413FC A64200A8 */ sh $v0, 0xa8($s2) +/* A8DE80 80241400 8E2200D0 */ lw $v0, 0xd0($s1) +/* A8DE84 80241404 A22000B5 */ sb $zero, 0xb5($s1) +/* A8DE88 80241408 AE20008C */ sw $zero, 0x8c($s1) +/* A8DE8C 8024140C 8C420098 */ lw $v0, 0x98($v0) +/* A8DE90 80241410 14400006 */ bnez $v0, .L8024142C +/* A8DE94 80241414 2403FDFF */ addiu $v1, $zero, -0x201 +/* A8DE98 80241418 8E420000 */ lw $v0, ($s2) +/* A8DE9C 8024141C 2403FFF7 */ addiu $v1, $zero, -9 +/* A8DEA0 80241420 34420200 */ ori $v0, $v0, 0x200 +/* A8DEA4 80241424 0809050E */ j .L80241438 +/* A8DEA8 80241428 00431024 */ and $v0, $v0, $v1 +.L8024142C: +/* A8DEAC 8024142C 8E420000 */ lw $v0, ($s2) +/* A8DEB0 80241430 00431024 */ and $v0, $v0, $v1 +/* A8DEB4 80241434 34420008 */ ori $v0, $v0, 8 +.L80241438: +/* A8DEB8 80241438 AE420000 */ sw $v0, ($s2) +/* A8DEBC 8024143C 8E2200B0 */ lw $v0, 0xb0($s1) +/* A8DEC0 80241440 30420004 */ andi $v0, $v0, 4 +/* A8DEC4 80241444 1040001E */ beqz $v0, .L802414C0 +/* A8DEC8 80241448 24040002 */ addiu $a0, $zero, 2 +/* A8DECC 8024144C 0240282D */ daddu $a1, $s2, $zero +/* A8DED0 80241450 0000302D */ daddu $a2, $zero, $zero +/* A8DED4 80241454 24020063 */ addiu $v0, $zero, 0x63 +/* A8DED8 80241458 AE620070 */ sw $v0, 0x70($s3) +/* A8DEDC 8024145C AE600074 */ sw $zero, 0x74($s3) +/* A8DEE0 80241460 864300A8 */ lh $v1, 0xa8($s2) +/* A8DEE4 80241464 3C013F80 */ lui $at, 0x3f80 +/* A8DEE8 80241468 44810000 */ mtc1 $at, $f0 +/* A8DEEC 8024146C 3C014000 */ lui $at, 0x4000 +/* A8DEF0 80241470 44811000 */ mtc1 $at, $f2 +/* A8DEF4 80241474 3C01C1A0 */ lui $at, 0xc1a0 +/* A8DEF8 80241478 44812000 */ mtc1 $at, $f4 +/* A8DEFC 8024147C 24020028 */ addiu $v0, $zero, 0x28 +/* A8DF00 80241480 AFA2001C */ sw $v0, 0x1c($sp) +/* A8DF04 80241484 44833000 */ mtc1 $v1, $f6 +/* A8DF08 80241488 00000000 */ nop +/* A8DF0C 8024148C 468031A0 */ cvt.s.w $f6, $f6 +/* A8DF10 80241490 44073000 */ mfc1 $a3, $f6 +/* A8DF14 80241494 27A20048 */ addiu $v0, $sp, 0x48 +/* A8DF18 80241498 AFA20020 */ sw $v0, 0x20($sp) +/* A8DF1C 8024149C E7A00010 */ swc1 $f0, 0x10($sp) +/* A8DF20 802414A0 E7A20014 */ swc1 $f2, 0x14($sp) +/* A8DF24 802414A4 0C01BFA4 */ jal fx_emote +/* A8DF28 802414A8 E7A40018 */ swc1 $f4, 0x18($sp) +/* A8DF2C 802414AC 8E2200B0 */ lw $v0, 0xb0($s1) +/* A8DF30 802414B0 2403FFFB */ addiu $v1, $zero, -5 +/* A8DF34 802414B4 00431024 */ and $v0, $v0, $v1 +/* A8DF38 802414B8 0809053B */ j .L802414EC +/* A8DF3C 802414BC AE2200B0 */ sw $v0, 0xb0($s1) +.L802414C0: +/* A8DF40 802414C0 8E220000 */ lw $v0, ($s1) +/* A8DF44 802414C4 3C034000 */ lui $v1, 0x4000 +/* A8DF48 802414C8 00431024 */ and $v0, $v0, $v1 +/* A8DF4C 802414CC 10400007 */ beqz $v0, .L802414EC +/* A8DF50 802414D0 3C03BFFF */ lui $v1, 0xbfff +/* A8DF54 802414D4 2402000C */ addiu $v0, $zero, 0xc +/* A8DF58 802414D8 AE620070 */ sw $v0, 0x70($s3) +/* A8DF5C 802414DC 8E220000 */ lw $v0, ($s1) +/* A8DF60 802414E0 3463FFFF */ ori $v1, $v1, 0xffff +/* A8DF64 802414E4 00431024 */ and $v0, $v0, $v1 +/* A8DF68 802414E8 AE220000 */ sw $v0, ($s1) +.L802414EC: +/* A8DF6C 802414EC 8E630070 */ lw $v1, 0x70($s3) +/* A8DF70 802414F0 2C620064 */ sltiu $v0, $v1, 0x64 +/* A8DF74 802414F4 1040003A */ beqz $v0, .L802415E0 +/* A8DF78 802414F8 00031080 */ sll $v0, $v1, 2 +/* A8DF7C 802414FC 3C018024 */ lui $at, 0x8024 +/* A8DF80 80241500 00220821 */ addu $at, $at, $v0 +/* A8DF84 80241504 8C225BA8 */ lw $v0, 0x5ba8($at) +/* A8DF88 80241508 00400008 */ jr $v0 +/* A8DF8C 8024150C 00000000 */ nop +/* A8DF90 80241510 0260202D */ daddu $a0, $s3, $zero +/* A8DF94 80241514 0280282D */ daddu $a1, $s4, $zero +/* A8DF98 80241518 0C090038 */ jal func_802400E0_A8CB60 +/* A8DF9C 8024151C 02A0302D */ daddu $a2, $s5, $zero +/* A8DFA0 80241520 96220086 */ lhu $v0, 0x86($s1) +/* A8DFA4 80241524 A64200A8 */ sh $v0, 0xa8($s2) +/* A8DFA8 80241528 0260202D */ daddu $a0, $s3, $zero +/* A8DFAC 8024152C 0280282D */ daddu $a1, $s4, $zero +/* A8DFB0 80241530 0C09008E */ jal func_80240238_A8CCB8 +/* A8DFB4 80241534 02A0302D */ daddu $a2, $s5, $zero +/* A8DFB8 80241538 08090578 */ j .L802415E0 +/* A8DFBC 8024153C 00000000 */ nop +/* A8DFC0 80241540 0260202D */ daddu $a0, $s3, $zero +/* A8DFC4 80241544 0280282D */ daddu $a1, $s4, $zero +/* A8DFC8 80241548 0C090138 */ jal func_802404E0_A8CF60 +/* A8DFCC 8024154C 02A0302D */ daddu $a2, $s5, $zero +/* A8DFD0 80241550 0260202D */ daddu $a0, $s3, $zero +/* A8DFD4 80241554 0280282D */ daddu $a1, $s4, $zero +/* A8DFD8 80241558 0C090168 */ jal func_802405A0_A8D020 +/* A8DFDC 8024155C 02A0302D */ daddu $a2, $s5, $zero +/* A8DFE0 80241560 08090578 */ j .L802415E0 +/* A8DFE4 80241564 00000000 */ nop +/* A8DFE8 80241568 0260202D */ daddu $a0, $s3, $zero +/* A8DFEC 8024156C 0280282D */ daddu $a1, $s4, $zero +/* A8DFF0 80241570 0C0901D7 */ jal func_8024075C_A8D1DC +/* A8DFF4 80241574 02A0302D */ daddu $a2, $s5, $zero +/* A8DFF8 80241578 08090578 */ j .L802415E0 +/* A8DFFC 8024157C 00000000 */ nop +/* A8E000 80241580 0260202D */ daddu $a0, $s3, $zero +/* A8E004 80241584 0280282D */ daddu $a1, $s4, $zero +/* A8E008 80241588 0C0903DC */ jal func_80240F70_A8D9F0 +/* A8E00C 8024158C 02A0302D */ daddu $a2, $s5, $zero +/* A8E010 80241590 0260202D */ daddu $a0, $s3, $zero +/* A8E014 80241594 0280282D */ daddu $a1, $s4, $zero +/* A8E018 80241598 0C0903FB */ jal func_80240FEC_A8DA6C +/* A8E01C 8024159C 02A0302D */ daddu $a2, $s5, $zero +/* A8E020 802415A0 08090578 */ j .L802415E0 +/* A8E024 802415A4 00000000 */ nop +/* A8E028 802415A8 0260202D */ daddu $a0, $s3, $zero +/* A8E02C 802415AC 0280282D */ daddu $a1, $s4, $zero +/* A8E030 802415B0 0C090448 */ jal func_80241120_A8DBA0 +/* A8E034 802415B4 02A0302D */ daddu $a2, $s5, $zero +/* A8E038 802415B8 08090578 */ j .L802415E0 +/* A8E03C 802415BC 00000000 */ nop +/* A8E040 802415C0 0260202D */ daddu $a0, $s3, $zero +/* A8E044 802415C4 0280282D */ daddu $a1, $s4, $zero +/* A8E048 802415C8 0C0904A1 */ jal func_80241284_A8DD04 +/* A8E04C 802415CC 02A0302D */ daddu $a2, $s5, $zero +/* A8E050 802415D0 08090578 */ j .L802415E0 +/* A8E054 802415D4 00000000 */ nop +/* A8E058 802415D8 0C0129CF */ jal func_8004A73C +/* A8E05C 802415DC 0260202D */ daddu $a0, $s3, $zero +.L802415E0: +/* A8E060 802415E0 8FBF0068 */ lw $ra, 0x68($sp) +/* A8E064 802415E4 8FB50064 */ lw $s5, 0x64($sp) +/* A8E068 802415E8 8FB40060 */ lw $s4, 0x60($sp) +/* A8E06C 802415EC 8FB3005C */ lw $s3, 0x5c($sp) +/* A8E070 802415F0 8FB20058 */ lw $s2, 0x58($sp) +/* A8E074 802415F4 8FB10054 */ lw $s1, 0x54($sp) +/* A8E078 802415F8 8FB00050 */ lw $s0, 0x50($sp) +/* A8E07C 802415FC 0000102D */ daddu $v0, $zero, $zero +/* A8E080 80241600 03E00008 */ jr $ra +/* A8E084 80241604 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608.s deleted file mode 100644 index ac6e6c786d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241608 -/* A8E088 80241608 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E08C 8024160C AFBF0010 */ sw $ra, 0x10($sp) -/* A8E090 80241610 0C03A625 */ jal func_800E9894 -/* A8E094 80241614 00000000 */ nop -/* A8E098 80241618 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E09C 8024161C 24020002 */ addiu $v0, $zero, 2 -/* A8E0A0 80241620 03E00008 */ jr $ra -/* A8E0A4 80241624 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s new file mode 100644 index 0000000000..47400bd37f --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241608_A8E088 +/* A8E088 80241608 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A8E08C 8024160C AFBF0010 */ sw $ra, 0x10($sp) +/* A8E090 80241610 0C03A625 */ jal func_800E9894 +/* A8E094 80241614 00000000 */ nop +/* A8E098 80241618 8FBF0010 */ lw $ra, 0x10($sp) +/* A8E09C 8024161C 24020002 */ addiu $v0, $zero, 2 +/* A8E0A0 80241620 03E00008 */ jr $ra +/* A8E0A4 80241624 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650.s deleted file mode 100644 index dbf4fe5352..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650 -/* A8E0D0 80241650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A8E0D4 80241654 AFB10014 */ sw $s1, 0x14($sp) -/* A8E0D8 80241658 0080882D */ daddu $s1, $a0, $zero -/* A8E0DC 8024165C AFBF0018 */ sw $ra, 0x18($sp) -/* A8E0E0 80241660 AFB00010 */ sw $s0, 0x10($sp) -/* A8E0E4 80241664 8E30000C */ lw $s0, 0xc($s1) -/* A8E0E8 80241668 8E050000 */ lw $a1, ($s0) -/* A8E0EC 8024166C 0C0B1EAF */ jal get_variable -/* A8E0F0 80241670 26100004 */ addiu $s0, $s0, 4 -/* A8E0F4 80241674 0220202D */ daddu $a0, $s1, $zero -/* A8E0F8 80241678 8E050000 */ lw $a1, ($s0) -/* A8E0FC 8024167C 0C0B1EAF */ jal get_variable -/* A8E100 80241680 0040882D */ daddu $s1, $v0, $zero -/* A8E104 80241684 0000202D */ daddu $a0, $zero, $zero -/* A8E108 80241688 0080282D */ daddu $a1, $a0, $zero -/* A8E10C 8024168C 0040802D */ daddu $s0, $v0, $zero -/* A8E110 80241690 240600BE */ addiu $a2, $zero, 0xbe -/* A8E114 80241694 0C04DF93 */ jal func_80137E4C -/* A8E118 80241698 24070091 */ addiu $a3, $zero, 0x91 -/* A8E11C 8024169C 44900000 */ mtc1 $s0, $f0 -/* A8E120 802416A0 00000000 */ nop -/* A8E124 802416A4 46800020 */ cvt.s.w $f0, $f0 -/* A8E128 802416A8 44050000 */ mfc1 $a1, $f0 -/* A8E12C 802416AC 0C04DF62 */ jal func_80137D88 -/* A8E130 802416B0 322400FF */ andi $a0, $s1, 0xff -/* A8E134 802416B4 8FBF0018 */ lw $ra, 0x18($sp) -/* A8E138 802416B8 8FB10014 */ lw $s1, 0x14($sp) -/* A8E13C 802416BC 8FB00010 */ lw $s0, 0x10($sp) -/* A8E140 802416C0 24020002 */ addiu $v0, $zero, 2 -/* A8E144 802416C4 03E00008 */ jr $ra -/* A8E148 802416C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s new file mode 100644 index 0000000000..e0bbd99356 --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241650_A8E0D0.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241650_A8E0D0 +/* A8E0D0 80241650 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A8E0D4 80241654 AFB10014 */ sw $s1, 0x14($sp) +/* A8E0D8 80241658 0080882D */ daddu $s1, $a0, $zero +/* A8E0DC 8024165C AFBF0018 */ sw $ra, 0x18($sp) +/* A8E0E0 80241660 AFB00010 */ sw $s0, 0x10($sp) +/* A8E0E4 80241664 8E30000C */ lw $s0, 0xc($s1) +/* A8E0E8 80241668 8E050000 */ lw $a1, ($s0) +/* A8E0EC 8024166C 0C0B1EAF */ jal get_variable +/* A8E0F0 80241670 26100004 */ addiu $s0, $s0, 4 +/* A8E0F4 80241674 0220202D */ daddu $a0, $s1, $zero +/* A8E0F8 80241678 8E050000 */ lw $a1, ($s0) +/* A8E0FC 8024167C 0C0B1EAF */ jal get_variable +/* A8E100 80241680 0040882D */ daddu $s1, $v0, $zero +/* A8E104 80241684 0000202D */ daddu $a0, $zero, $zero +/* A8E108 80241688 0080282D */ daddu $a1, $a0, $zero +/* A8E10C 8024168C 0040802D */ daddu $s0, $v0, $zero +/* A8E110 80241690 240600BE */ addiu $a2, $zero, 0xbe +/* A8E114 80241694 0C04DF93 */ jal func_80137E4C +/* A8E118 80241698 24070091 */ addiu $a3, $zero, 0x91 +/* A8E11C 8024169C 44900000 */ mtc1 $s0, $f0 +/* A8E120 802416A0 00000000 */ nop +/* A8E124 802416A4 46800020 */ cvt.s.w $f0, $f0 +/* A8E128 802416A8 44050000 */ mfc1 $a1, $f0 +/* A8E12C 802416AC 0C04DF62 */ jal func_80137D88 +/* A8E130 802416B0 322400FF */ andi $a0, $s1, 0xff +/* A8E134 802416B4 8FBF0018 */ lw $ra, 0x18($sp) +/* A8E138 802416B8 8FB10014 */ lw $s1, 0x14($sp) +/* A8E13C 802416BC 8FB00010 */ lw $s0, 0x10($sp) +/* A8E140 802416C0 24020002 */ addiu $v0, $zero, 2 +/* A8E144 802416C4 03E00008 */ jr $ra +/* A8E148 802416C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC.s deleted file mode 100644 index c8ea1a0b8c..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418CC -/* A8E34C 802418CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E350 802418D0 AFBF0010 */ sw $ra, 0x10($sp) -/* A8E354 802418D4 8C82000C */ lw $v0, 0xc($a0) -/* A8E358 802418D8 0C0B1EAF */ jal get_variable -/* A8E35C 802418DC 8C450000 */ lw $a1, ($v0) -/* A8E360 802418E0 00021600 */ sll $v0, $v0, 0x18 -/* A8E364 802418E4 0C03AC5A */ jal func_800EB168 -/* A8E368 802418E8 00022603 */ sra $a0, $v0, 0x18 -/* A8E36C 802418EC 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E370 802418F0 24020002 */ addiu $v0, $zero, 2 -/* A8E374 802418F4 03E00008 */ jr $ra -/* A8E378 802418F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s new file mode 100644 index 0000000000..353115d95f --- /dev/null +++ b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418CC_A8E34C +/* A8E34C 802418CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A8E350 802418D0 AFBF0010 */ sw $ra, 0x10($sp) +/* A8E354 802418D4 8C82000C */ lw $v0, 0xc($a0) +/* A8E358 802418D8 0C0B1EAF */ jal get_variable +/* A8E35C 802418DC 8C450000 */ lw $a1, ($v0) +/* A8E360 802418E0 00021600 */ sll $v0, $v0, 0x18 +/* A8E364 802418E4 0C03AC5A */ jal func_800EB168 +/* A8E368 802418E8 00022603 */ sra $a0, $v0, 0x18 +/* A8E36C 802418EC 8FBF0010 */ lw $ra, 0x10($sp) +/* A8E370 802418F0 24020002 */ addiu $v0, $zero, 2 +/* A8E374 802418F4 03E00008 */ jr $ra +/* A8E378 802418F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78.s deleted file mode 100644 index f11934da74..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D78 -/* C5B4B8 80240D78 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C5B4BC 80240D7C AFB3004C */ sw $s3, 0x4c($sp) -/* C5B4C0 80240D80 0080982D */ daddu $s3, $a0, $zero -/* C5B4C4 80240D84 AFBF0054 */ sw $ra, 0x54($sp) -/* C5B4C8 80240D88 AFB40050 */ sw $s4, 0x50($sp) -/* C5B4CC 80240D8C AFB20048 */ sw $s2, 0x48($sp) -/* C5B4D0 80240D90 AFB10044 */ sw $s1, 0x44($sp) -/* C5B4D4 80240D94 AFB00040 */ sw $s0, 0x40($sp) -/* C5B4D8 80240D98 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C5B4DC 80240D9C F7B80068 */ sdc1 $f24, 0x68($sp) -/* C5B4E0 80240DA0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C5B4E4 80240DA4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C5B4E8 80240DA8 8E710148 */ lw $s1, 0x148($s3) -/* C5B4EC 80240DAC 00A0902D */ daddu $s2, $a1, $zero -/* C5B4F0 80240DB0 86240008 */ lh $a0, 8($s1) -/* C5B4F4 80240DB4 0C00EABB */ jal get_npc_unsafe -/* C5B4F8 80240DB8 00C0A02D */ daddu $s4, $a2, $zero -/* C5B4FC 80240DBC 0040802D */ daddu $s0, $v0, $zero -/* C5B500 80240DC0 C6200078 */ lwc1 $f0, 0x78($s1) -/* C5B504 80240DC4 46800020 */ cvt.s.w $f0, $f0 -/* C5B508 80240DC8 46000021 */ cvt.d.s $f0, $f0 -/* C5B50C 80240DCC 3C014059 */ lui $at, 0x4059 -/* C5B510 80240DD0 44811800 */ mtc1 $at, $f3 -/* C5B514 80240DD4 44801000 */ mtc1 $zero, $f2 -/* C5B518 80240DD8 8602008E */ lh $v0, 0x8e($s0) -/* C5B51C 80240DDC 9603008E */ lhu $v1, 0x8e($s0) -/* C5B520 80240DE0 46220003 */ div.d $f0, $f0, $f2 -/* C5B524 80240DE4 46200620 */ cvt.s.d $f24, $f0 -/* C5B528 80240DE8 C6200088 */ lwc1 $f0, 0x88($s1) -/* C5B52C 80240DEC 46800020 */ cvt.s.w $f0, $f0 -/* C5B530 80240DF0 46000021 */ cvt.d.s $f0, $f0 -/* C5B534 80240DF4 46220003 */ div.d $f0, $f0, $f2 -/* C5B538 80240DF8 46200020 */ cvt.s.d $f0, $f0 -/* C5B53C 80240DFC 18400003 */ blez $v0, .L80240E0C -/* C5B540 80240E00 4600C680 */ add.s $f26, $f24, $f0 -/* C5B544 80240E04 2462FFFF */ addiu $v0, $v1, -1 -/* C5B548 80240E08 A602008E */ sh $v0, 0x8e($s0) -.L80240E0C: -/* C5B54C 80240E0C 8E220070 */ lw $v0, 0x70($s1) -/* C5B550 80240E10 18400034 */ blez $v0, .L80240EE4 -/* C5B554 80240E14 00000000 */ nop -/* C5B558 80240E18 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C5B55C 80240E1C 46806320 */ cvt.s.w $f12, $f12 -/* C5B560 80240E20 44820000 */ mtc1 $v0, $f0 -/* C5B564 80240E24 00000000 */ nop -/* C5B568 80240E28 46800020 */ cvt.s.w $f0, $f0 -/* C5B56C 80240E2C 46000021 */ cvt.d.s $f0, $f0 -/* C5B570 80240E30 46220003 */ div.d $f0, $f0, $f2 -/* C5B574 80240E34 0C00A8BB */ jal sin_deg -/* C5B578 80240E38 462005A0 */ cvt.s.d $f22, $f0 -/* C5B57C 80240E3C 8E020000 */ lw $v0, ($s0) -/* C5B580 80240E40 30420008 */ andi $v0, $v0, 8 -/* C5B584 80240E44 10400003 */ beqz $v0, .L80240E54 -/* C5B588 80240E48 46000506 */ mov.s $f20, $f0 -/* C5B58C 80240E4C 080903A5 */ j .L80240E94 -/* C5B590 80240E50 0000102D */ daddu $v0, $zero, $zero -.L80240E54: -/* C5B594 80240E54 27A50028 */ addiu $a1, $sp, 0x28 -/* C5B598 80240E58 27A6002C */ addiu $a2, $sp, 0x2c -/* C5B59C 80240E5C C6000038 */ lwc1 $f0, 0x38($s0) -/* C5B5A0 80240E60 C602003C */ lwc1 $f2, 0x3c($s0) -/* C5B5A4 80240E64 C6040040 */ lwc1 $f4, 0x40($s0) -/* C5B5A8 80240E68 3C01447A */ lui $at, 0x447a -/* C5B5AC 80240E6C 44813000 */ mtc1 $at, $f6 -/* C5B5B0 80240E70 27A20034 */ addiu $v0, $sp, 0x34 -/* C5B5B4 80240E74 E7A00028 */ swc1 $f0, 0x28($sp) -/* C5B5B8 80240E78 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C5B5BC 80240E7C E7A40030 */ swc1 $f4, 0x30($sp) -/* C5B5C0 80240E80 E7A60034 */ swc1 $f6, 0x34($sp) -/* C5B5C4 80240E84 AFA20010 */ sw $v0, 0x10($sp) -/* C5B5C8 80240E88 8E040080 */ lw $a0, 0x80($s0) -/* C5B5CC 80240E8C 0C0372DF */ jal func_800DCB7C -/* C5B5D0 80240E90 27A70030 */ addiu $a3, $sp, 0x30 -.L80240E94: -/* C5B5D4 80240E94 10400007 */ beqz $v0, .L80240EB4 -/* C5B5D8 80240E98 00000000 */ nop -/* C5B5DC 80240E9C 4616A082 */ mul.s $f2, $f20, $f22 -/* C5B5E0 80240EA0 00000000 */ nop -/* C5B5E4 80240EA4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C5B5E8 80240EA8 46180000 */ add.s $f0, $f0, $f24 -/* C5B5EC 80240EAC 080903B0 */ j .L80240EC0 -/* C5B5F0 80240EB0 46020000 */ add.s $f0, $f0, $f2 -.L80240EB4: -/* C5B5F4 80240EB4 4616A002 */ mul.s $f0, $f20, $f22 -/* C5B5F8 80240EB8 00000000 */ nop -/* C5B5FC 80240EBC 4600D000 */ add.s $f0, $f26, $f0 -.L80240EC0: -/* C5B600 80240EC0 E600003C */ swc1 $f0, 0x3c($s0) -/* C5B604 80240EC4 8E220074 */ lw $v0, 0x74($s1) -/* C5B608 80240EC8 2442000A */ addiu $v0, $v0, 0xa -/* C5B60C 80240ECC 44826000 */ mtc1 $v0, $f12 -/* C5B610 80240ED0 00000000 */ nop -/* C5B614 80240ED4 0C00A6C9 */ jal clamp_angle -/* C5B618 80240ED8 46806320 */ cvt.s.w $f12, $f12 -/* C5B61C 80240EDC 4600020D */ trunc.w.s $f8, $f0 -/* C5B620 80240EE0 E6280074 */ swc1 $f8, 0x74($s1) -.L80240EE4: -/* C5B624 80240EE4 8E220090 */ lw $v0, 0x90($s1) -/* C5B628 80240EE8 1C400040 */ bgtz $v0, .L80240FEC -/* C5B62C 80240EEC 2442FFFF */ addiu $v0, $v0, -1 -/* C5B630 80240EF0 860200A8 */ lh $v0, 0xa8($s0) -/* C5B634 80240EF4 C600003C */ lwc1 $f0, 0x3c($s0) -/* C5B638 80240EF8 44821000 */ mtc1 $v0, $f2 -/* C5B63C 80240EFC 00000000 */ nop -/* C5B640 80240F00 468010A0 */ cvt.s.w $f2, $f2 -/* C5B644 80240F04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C5B648 80240F08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C5B64C 80240F0C 46020000 */ add.s $f0, $f0, $f2 -/* C5B650 80240F10 3C014024 */ lui $at, 0x4024 -/* C5B654 80240F14 44812800 */ mtc1 $at, $f5 -/* C5B658 80240F18 44802000 */ mtc1 $zero, $f4 -/* C5B65C 80240F1C C442002C */ lwc1 $f2, 0x2c($v0) -/* C5B660 80240F20 46000021 */ cvt.d.s $f0, $f0 -/* C5B664 80240F24 46240000 */ add.d $f0, $f0, $f4 -/* C5B668 80240F28 460010A1 */ cvt.d.s $f2, $f2 -/* C5B66C 80240F2C 4620103C */ c.lt.d $f2, $f0 -/* C5B670 80240F30 00000000 */ nop -/* C5B674 80240F34 4500002E */ bc1f .L80240FF0 -/* C5B678 80240F38 0280202D */ daddu $a0, $s4, $zero -/* C5B67C 80240F3C 24020001 */ addiu $v0, $zero, 1 -/* C5B680 80240F40 AFA20010 */ sw $v0, 0x10($sp) -/* C5B684 80240F44 8E460024 */ lw $a2, 0x24($s2) -/* C5B688 80240F48 8E470028 */ lw $a3, 0x28($s2) -/* C5B68C 80240F4C 0C01242D */ jal func_800490B4 -/* C5B690 80240F50 0220282D */ daddu $a1, $s1, $zero -/* C5B694 80240F54 10400026 */ beqz $v0, .L80240FF0 -/* C5B698 80240F58 0000202D */ daddu $a0, $zero, $zero -/* C5B69C 80240F5C 0200282D */ daddu $a1, $s0, $zero -/* C5B6A0 80240F60 0000302D */ daddu $a2, $zero, $zero -/* C5B6A4 80240F64 2412000C */ addiu $s2, $zero, 0xc -/* C5B6A8 80240F68 860300A8 */ lh $v1, 0xa8($s0) -/* C5B6AC 80240F6C 3C013F80 */ lui $at, 0x3f80 -/* C5B6B0 80240F70 44810000 */ mtc1 $at, $f0 -/* C5B6B4 80240F74 3C014000 */ lui $at, 0x4000 -/* C5B6B8 80240F78 44811000 */ mtc1 $at, $f2 -/* C5B6BC 80240F7C 3C01C1A0 */ lui $at, 0xc1a0 -/* C5B6C0 80240F80 44812000 */ mtc1 $at, $f4 -/* C5B6C4 80240F84 44834000 */ mtc1 $v1, $f8 -/* C5B6C8 80240F88 00000000 */ nop -/* C5B6CC 80240F8C 46804220 */ cvt.s.w $f8, $f8 -/* C5B6D0 80240F90 44074000 */ mfc1 $a3, $f8 -/* C5B6D4 80240F94 27A20038 */ addiu $v0, $sp, 0x38 -/* C5B6D8 80240F98 AFB2001C */ sw $s2, 0x1c($sp) -/* C5B6DC 80240F9C AFA20020 */ sw $v0, 0x20($sp) -/* C5B6E0 80240FA0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5B6E4 80240FA4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C5B6E8 80240FA8 0C01BFA4 */ jal fx_emote -/* C5B6EC 80240FAC E7A40018 */ swc1 $f4, 0x18($sp) -/* C5B6F0 80240FB0 0200202D */ daddu $a0, $s0, $zero -/* C5B6F4 80240FB4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C5B6F8 80240FB8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C5B6FC 80240FBC 3C060020 */ lui $a2, 0x20 -/* C5B700 80240FC0 0C012530 */ jal func_800494C0 -/* C5B704 80240FC4 E4800064 */ swc1 $f0, 0x64($a0) -/* C5B708 80240FC8 8E220018 */ lw $v0, 0x18($s1) -/* C5B70C 80240FCC 9442002A */ lhu $v0, 0x2a($v0) -/* C5B710 80240FD0 30420001 */ andi $v0, $v0, 1 -/* C5B714 80240FD4 10400003 */ beqz $v0, .L80240FE4 -/* C5B718 80240FD8 2402000A */ addiu $v0, $zero, 0xa -/* C5B71C 80240FDC 08090423 */ j .L8024108C -/* C5B720 80240FE0 AE620070 */ sw $v0, 0x70($s3) -.L80240FE4: -/* C5B724 80240FE4 08090423 */ j .L8024108C -/* C5B728 80240FE8 AE720070 */ sw $s2, 0x70($s3) -.L80240FEC: -/* C5B72C 80240FEC AE220090 */ sw $v0, 0x90($s1) -.L80240FF0: -/* C5B730 80240FF0 8602008C */ lh $v0, 0x8c($s0) -/* C5B734 80240FF4 14400025 */ bnez $v0, .L8024108C -/* C5B738 80240FF8 00000000 */ nop -/* C5B73C 80240FFC 8602008E */ lh $v0, 0x8e($s0) -/* C5B740 80241000 1C400022 */ bgtz $v0, .L8024108C -/* C5B744 80241004 00000000 */ nop -/* C5B748 80241008 8E620074 */ lw $v0, 0x74($s3) -/* C5B74C 8024100C 2442FFFF */ addiu $v0, $v0, -1 -/* C5B750 80241010 1840001D */ blez $v0, .L80241088 -/* C5B754 80241014 AE620074 */ sw $v0, 0x74($s3) -/* C5B758 80241018 8E220018 */ lw $v0, 0x18($s1) -/* C5B75C 8024101C 9442002A */ lhu $v0, 0x2a($v0) -/* C5B760 80241020 30420010 */ andi $v0, $v0, 0x10 -/* C5B764 80241024 14400007 */ bnez $v0, .L80241044 -/* C5B768 80241028 00000000 */ nop -/* C5B76C 8024102C C600000C */ lwc1 $f0, 0xc($s0) -/* C5B770 80241030 3C014334 */ lui $at, 0x4334 -/* C5B774 80241034 44816000 */ mtc1 $at, $f12 -/* C5B778 80241038 0C00A6C9 */ jal clamp_angle -/* C5B77C 8024103C 460C0300 */ add.s $f12, $f0, $f12 -/* C5B780 80241040 E600000C */ swc1 $f0, 0xc($s0) -.L80241044: -/* C5B784 80241044 0C00A67F */ jal rand_int -/* C5B788 80241048 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C5B78C 8024104C 3C032E8B */ lui $v1, 0x2e8b -/* C5B790 80241050 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C5B794 80241054 00430018 */ mult $v0, $v1 -/* C5B798 80241058 00021FC3 */ sra $v1, $v0, 0x1f -/* C5B79C 8024105C 00004010 */ mfhi $t0 -/* C5B7A0 80241060 00082043 */ sra $a0, $t0, 1 -/* C5B7A4 80241064 00832023 */ subu $a0, $a0, $v1 -/* C5B7A8 80241068 00041840 */ sll $v1, $a0, 1 -/* C5B7AC 8024106C 00641821 */ addu $v1, $v1, $a0 -/* C5B7B0 80241070 00031880 */ sll $v1, $v1, 2 -/* C5B7B4 80241074 00641823 */ subu $v1, $v1, $a0 -/* C5B7B8 80241078 00431023 */ subu $v0, $v0, $v1 -/* C5B7BC 8024107C 24420005 */ addiu $v0, $v0, 5 -/* C5B7C0 80241080 08090423 */ j .L8024108C -/* C5B7C4 80241084 A602008E */ sh $v0, 0x8e($s0) -.L80241088: -/* C5B7C8 80241088 AE600070 */ sw $zero, 0x70($s3) -.L8024108C: -/* C5B7CC 8024108C 8FBF0054 */ lw $ra, 0x54($sp) -/* C5B7D0 80241090 8FB40050 */ lw $s4, 0x50($sp) -/* C5B7D4 80241094 8FB3004C */ lw $s3, 0x4c($sp) -/* C5B7D8 80241098 8FB20048 */ lw $s2, 0x48($sp) -/* C5B7DC 8024109C 8FB10044 */ lw $s1, 0x44($sp) -/* C5B7E0 802410A0 8FB00040 */ lw $s0, 0x40($sp) -/* C5B7E4 802410A4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C5B7E8 802410A8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C5B7EC 802410AC D7B60060 */ ldc1 $f22, 0x60($sp) -/* C5B7F0 802410B0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C5B7F4 802410B4 03E00008 */ jr $ra -/* C5B7F8 802410B8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s new file mode 100644 index 0000000000..a54573c721 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80240D78_C5B4B8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D78_C5B4B8 +/* C5B4B8 80240D78 27BDFF88 */ addiu $sp, $sp, -0x78 +/* C5B4BC 80240D7C AFB3004C */ sw $s3, 0x4c($sp) +/* C5B4C0 80240D80 0080982D */ daddu $s3, $a0, $zero +/* C5B4C4 80240D84 AFBF0054 */ sw $ra, 0x54($sp) +/* C5B4C8 80240D88 AFB40050 */ sw $s4, 0x50($sp) +/* C5B4CC 80240D8C AFB20048 */ sw $s2, 0x48($sp) +/* C5B4D0 80240D90 AFB10044 */ sw $s1, 0x44($sp) +/* C5B4D4 80240D94 AFB00040 */ sw $s0, 0x40($sp) +/* C5B4D8 80240D98 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* C5B4DC 80240D9C F7B80068 */ sdc1 $f24, 0x68($sp) +/* C5B4E0 80240DA0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* C5B4E4 80240DA4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* C5B4E8 80240DA8 8E710148 */ lw $s1, 0x148($s3) +/* C5B4EC 80240DAC 00A0902D */ daddu $s2, $a1, $zero +/* C5B4F0 80240DB0 86240008 */ lh $a0, 8($s1) +/* C5B4F4 80240DB4 0C00EABB */ jal get_npc_unsafe +/* C5B4F8 80240DB8 00C0A02D */ daddu $s4, $a2, $zero +/* C5B4FC 80240DBC 0040802D */ daddu $s0, $v0, $zero +/* C5B500 80240DC0 C6200078 */ lwc1 $f0, 0x78($s1) +/* C5B504 80240DC4 46800020 */ cvt.s.w $f0, $f0 +/* C5B508 80240DC8 46000021 */ cvt.d.s $f0, $f0 +/* C5B50C 80240DCC 3C014059 */ lui $at, 0x4059 +/* C5B510 80240DD0 44811800 */ mtc1 $at, $f3 +/* C5B514 80240DD4 44801000 */ mtc1 $zero, $f2 +/* C5B518 80240DD8 8602008E */ lh $v0, 0x8e($s0) +/* C5B51C 80240DDC 9603008E */ lhu $v1, 0x8e($s0) +/* C5B520 80240DE0 46220003 */ div.d $f0, $f0, $f2 +/* C5B524 80240DE4 46200620 */ cvt.s.d $f24, $f0 +/* C5B528 80240DE8 C6200088 */ lwc1 $f0, 0x88($s1) +/* C5B52C 80240DEC 46800020 */ cvt.s.w $f0, $f0 +/* C5B530 80240DF0 46000021 */ cvt.d.s $f0, $f0 +/* C5B534 80240DF4 46220003 */ div.d $f0, $f0, $f2 +/* C5B538 80240DF8 46200020 */ cvt.s.d $f0, $f0 +/* C5B53C 80240DFC 18400003 */ blez $v0, .L80240E0C +/* C5B540 80240E00 4600C680 */ add.s $f26, $f24, $f0 +/* C5B544 80240E04 2462FFFF */ addiu $v0, $v1, -1 +/* C5B548 80240E08 A602008E */ sh $v0, 0x8e($s0) +.L80240E0C: +/* C5B54C 80240E0C 8E220070 */ lw $v0, 0x70($s1) +/* C5B550 80240E10 18400034 */ blez $v0, .L80240EE4 +/* C5B554 80240E14 00000000 */ nop +/* C5B558 80240E18 C62C0074 */ lwc1 $f12, 0x74($s1) +/* C5B55C 80240E1C 46806320 */ cvt.s.w $f12, $f12 +/* C5B560 80240E20 44820000 */ mtc1 $v0, $f0 +/* C5B564 80240E24 00000000 */ nop +/* C5B568 80240E28 46800020 */ cvt.s.w $f0, $f0 +/* C5B56C 80240E2C 46000021 */ cvt.d.s $f0, $f0 +/* C5B570 80240E30 46220003 */ div.d $f0, $f0, $f2 +/* C5B574 80240E34 0C00A8BB */ jal sin_deg +/* C5B578 80240E38 462005A0 */ cvt.s.d $f22, $f0 +/* C5B57C 80240E3C 8E020000 */ lw $v0, ($s0) +/* C5B580 80240E40 30420008 */ andi $v0, $v0, 8 +/* C5B584 80240E44 10400003 */ beqz $v0, .L80240E54 +/* C5B588 80240E48 46000506 */ mov.s $f20, $f0 +/* C5B58C 80240E4C 080903A5 */ j .L80240E94 +/* C5B590 80240E50 0000102D */ daddu $v0, $zero, $zero +.L80240E54: +/* C5B594 80240E54 27A50028 */ addiu $a1, $sp, 0x28 +/* C5B598 80240E58 27A6002C */ addiu $a2, $sp, 0x2c +/* C5B59C 80240E5C C6000038 */ lwc1 $f0, 0x38($s0) +/* C5B5A0 80240E60 C602003C */ lwc1 $f2, 0x3c($s0) +/* C5B5A4 80240E64 C6040040 */ lwc1 $f4, 0x40($s0) +/* C5B5A8 80240E68 3C01447A */ lui $at, 0x447a +/* C5B5AC 80240E6C 44813000 */ mtc1 $at, $f6 +/* C5B5B0 80240E70 27A20034 */ addiu $v0, $sp, 0x34 +/* C5B5B4 80240E74 E7A00028 */ swc1 $f0, 0x28($sp) +/* C5B5B8 80240E78 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C5B5BC 80240E7C E7A40030 */ swc1 $f4, 0x30($sp) +/* C5B5C0 80240E80 E7A60034 */ swc1 $f6, 0x34($sp) +/* C5B5C4 80240E84 AFA20010 */ sw $v0, 0x10($sp) +/* C5B5C8 80240E88 8E040080 */ lw $a0, 0x80($s0) +/* C5B5CC 80240E8C 0C0372DF */ jal func_800DCB7C +/* C5B5D0 80240E90 27A70030 */ addiu $a3, $sp, 0x30 +.L80240E94: +/* C5B5D4 80240E94 10400007 */ beqz $v0, .L80240EB4 +/* C5B5D8 80240E98 00000000 */ nop +/* C5B5DC 80240E9C 4616A082 */ mul.s $f2, $f20, $f22 +/* C5B5E0 80240EA0 00000000 */ nop +/* C5B5E4 80240EA4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C5B5E8 80240EA8 46180000 */ add.s $f0, $f0, $f24 +/* C5B5EC 80240EAC 080903B0 */ j .L80240EC0 +/* C5B5F0 80240EB0 46020000 */ add.s $f0, $f0, $f2 +.L80240EB4: +/* C5B5F4 80240EB4 4616A002 */ mul.s $f0, $f20, $f22 +/* C5B5F8 80240EB8 00000000 */ nop +/* C5B5FC 80240EBC 4600D000 */ add.s $f0, $f26, $f0 +.L80240EC0: +/* C5B600 80240EC0 E600003C */ swc1 $f0, 0x3c($s0) +/* C5B604 80240EC4 8E220074 */ lw $v0, 0x74($s1) +/* C5B608 80240EC8 2442000A */ addiu $v0, $v0, 0xa +/* C5B60C 80240ECC 44826000 */ mtc1 $v0, $f12 +/* C5B610 80240ED0 00000000 */ nop +/* C5B614 80240ED4 0C00A6C9 */ jal clamp_angle +/* C5B618 80240ED8 46806320 */ cvt.s.w $f12, $f12 +/* C5B61C 80240EDC 4600020D */ trunc.w.s $f8, $f0 +/* C5B620 80240EE0 E6280074 */ swc1 $f8, 0x74($s1) +.L80240EE4: +/* C5B624 80240EE4 8E220090 */ lw $v0, 0x90($s1) +/* C5B628 80240EE8 1C400040 */ bgtz $v0, .L80240FEC +/* C5B62C 80240EEC 2442FFFF */ addiu $v0, $v0, -1 +/* C5B630 80240EF0 860200A8 */ lh $v0, 0xa8($s0) +/* C5B634 80240EF4 C600003C */ lwc1 $f0, 0x3c($s0) +/* C5B638 80240EF8 44821000 */ mtc1 $v0, $f2 +/* C5B63C 80240EFC 00000000 */ nop +/* C5B640 80240F00 468010A0 */ cvt.s.w $f2, $f2 +/* C5B644 80240F04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C5B648 80240F08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C5B64C 80240F0C 46020000 */ add.s $f0, $f0, $f2 +/* C5B650 80240F10 3C014024 */ lui $at, 0x4024 +/* C5B654 80240F14 44812800 */ mtc1 $at, $f5 +/* C5B658 80240F18 44802000 */ mtc1 $zero, $f4 +/* C5B65C 80240F1C C442002C */ lwc1 $f2, 0x2c($v0) +/* C5B660 80240F20 46000021 */ cvt.d.s $f0, $f0 +/* C5B664 80240F24 46240000 */ add.d $f0, $f0, $f4 +/* C5B668 80240F28 460010A1 */ cvt.d.s $f2, $f2 +/* C5B66C 80240F2C 4620103C */ c.lt.d $f2, $f0 +/* C5B670 80240F30 00000000 */ nop +/* C5B674 80240F34 4500002E */ bc1f .L80240FF0 +/* C5B678 80240F38 0280202D */ daddu $a0, $s4, $zero +/* C5B67C 80240F3C 24020001 */ addiu $v0, $zero, 1 +/* C5B680 80240F40 AFA20010 */ sw $v0, 0x10($sp) +/* C5B684 80240F44 8E460024 */ lw $a2, 0x24($s2) +/* C5B688 80240F48 8E470028 */ lw $a3, 0x28($s2) +/* C5B68C 80240F4C 0C01242D */ jal func_800490B4 +/* C5B690 80240F50 0220282D */ daddu $a1, $s1, $zero +/* C5B694 80240F54 10400026 */ beqz $v0, .L80240FF0 +/* C5B698 80240F58 0000202D */ daddu $a0, $zero, $zero +/* C5B69C 80240F5C 0200282D */ daddu $a1, $s0, $zero +/* C5B6A0 80240F60 0000302D */ daddu $a2, $zero, $zero +/* C5B6A4 80240F64 2412000C */ addiu $s2, $zero, 0xc +/* C5B6A8 80240F68 860300A8 */ lh $v1, 0xa8($s0) +/* C5B6AC 80240F6C 3C013F80 */ lui $at, 0x3f80 +/* C5B6B0 80240F70 44810000 */ mtc1 $at, $f0 +/* C5B6B4 80240F74 3C014000 */ lui $at, 0x4000 +/* C5B6B8 80240F78 44811000 */ mtc1 $at, $f2 +/* C5B6BC 80240F7C 3C01C1A0 */ lui $at, 0xc1a0 +/* C5B6C0 80240F80 44812000 */ mtc1 $at, $f4 +/* C5B6C4 80240F84 44834000 */ mtc1 $v1, $f8 +/* C5B6C8 80240F88 00000000 */ nop +/* C5B6CC 80240F8C 46804220 */ cvt.s.w $f8, $f8 +/* C5B6D0 80240F90 44074000 */ mfc1 $a3, $f8 +/* C5B6D4 80240F94 27A20038 */ addiu $v0, $sp, 0x38 +/* C5B6D8 80240F98 AFB2001C */ sw $s2, 0x1c($sp) +/* C5B6DC 80240F9C AFA20020 */ sw $v0, 0x20($sp) +/* C5B6E0 80240FA0 E7A00010 */ swc1 $f0, 0x10($sp) +/* C5B6E4 80240FA4 E7A20014 */ swc1 $f2, 0x14($sp) +/* C5B6E8 80240FA8 0C01BFA4 */ jal fx_emote +/* C5B6EC 80240FAC E7A40018 */ swc1 $f4, 0x18($sp) +/* C5B6F0 80240FB0 0200202D */ daddu $a0, $s0, $zero +/* C5B6F4 80240FB4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C5B6F8 80240FB8 C480003C */ lwc1 $f0, 0x3c($a0) +/* C5B6FC 80240FBC 3C060020 */ lui $a2, 0x20 +/* C5B700 80240FC0 0C012530 */ jal func_800494C0 +/* C5B704 80240FC4 E4800064 */ swc1 $f0, 0x64($a0) +/* C5B708 80240FC8 8E220018 */ lw $v0, 0x18($s1) +/* C5B70C 80240FCC 9442002A */ lhu $v0, 0x2a($v0) +/* C5B710 80240FD0 30420001 */ andi $v0, $v0, 1 +/* C5B714 80240FD4 10400003 */ beqz $v0, .L80240FE4 +/* C5B718 80240FD8 2402000A */ addiu $v0, $zero, 0xa +/* C5B71C 80240FDC 08090423 */ j .L8024108C +/* C5B720 80240FE0 AE620070 */ sw $v0, 0x70($s3) +.L80240FE4: +/* C5B724 80240FE4 08090423 */ j .L8024108C +/* C5B728 80240FE8 AE720070 */ sw $s2, 0x70($s3) +.L80240FEC: +/* C5B72C 80240FEC AE220090 */ sw $v0, 0x90($s1) +.L80240FF0: +/* C5B730 80240FF0 8602008C */ lh $v0, 0x8c($s0) +/* C5B734 80240FF4 14400025 */ bnez $v0, .L8024108C +/* C5B738 80240FF8 00000000 */ nop +/* C5B73C 80240FFC 8602008E */ lh $v0, 0x8e($s0) +/* C5B740 80241000 1C400022 */ bgtz $v0, .L8024108C +/* C5B744 80241004 00000000 */ nop +/* C5B748 80241008 8E620074 */ lw $v0, 0x74($s3) +/* C5B74C 8024100C 2442FFFF */ addiu $v0, $v0, -1 +/* C5B750 80241010 1840001D */ blez $v0, .L80241088 +/* C5B754 80241014 AE620074 */ sw $v0, 0x74($s3) +/* C5B758 80241018 8E220018 */ lw $v0, 0x18($s1) +/* C5B75C 8024101C 9442002A */ lhu $v0, 0x2a($v0) +/* C5B760 80241020 30420010 */ andi $v0, $v0, 0x10 +/* C5B764 80241024 14400007 */ bnez $v0, .L80241044 +/* C5B768 80241028 00000000 */ nop +/* C5B76C 8024102C C600000C */ lwc1 $f0, 0xc($s0) +/* C5B770 80241030 3C014334 */ lui $at, 0x4334 +/* C5B774 80241034 44816000 */ mtc1 $at, $f12 +/* C5B778 80241038 0C00A6C9 */ jal clamp_angle +/* C5B77C 8024103C 460C0300 */ add.s $f12, $f0, $f12 +/* C5B780 80241040 E600000C */ swc1 $f0, 0xc($s0) +.L80241044: +/* C5B784 80241044 0C00A67F */ jal rand_int +/* C5B788 80241048 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C5B78C 8024104C 3C032E8B */ lui $v1, 0x2e8b +/* C5B790 80241050 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* C5B794 80241054 00430018 */ mult $v0, $v1 +/* C5B798 80241058 00021FC3 */ sra $v1, $v0, 0x1f +/* C5B79C 8024105C 00004010 */ mfhi $t0 +/* C5B7A0 80241060 00082043 */ sra $a0, $t0, 1 +/* C5B7A4 80241064 00832023 */ subu $a0, $a0, $v1 +/* C5B7A8 80241068 00041840 */ sll $v1, $a0, 1 +/* C5B7AC 8024106C 00641821 */ addu $v1, $v1, $a0 +/* C5B7B0 80241070 00031880 */ sll $v1, $v1, 2 +/* C5B7B4 80241074 00641823 */ subu $v1, $v1, $a0 +/* C5B7B8 80241078 00431023 */ subu $v0, $v0, $v1 +/* C5B7BC 8024107C 24420005 */ addiu $v0, $v0, 5 +/* C5B7C0 80241080 08090423 */ j .L8024108C +/* C5B7C4 80241084 A602008E */ sh $v0, 0x8e($s0) +.L80241088: +/* C5B7C8 80241088 AE600070 */ sw $zero, 0x70($s3) +.L8024108C: +/* C5B7CC 8024108C 8FBF0054 */ lw $ra, 0x54($sp) +/* C5B7D0 80241090 8FB40050 */ lw $s4, 0x50($sp) +/* C5B7D4 80241094 8FB3004C */ lw $s3, 0x4c($sp) +/* C5B7D8 80241098 8FB20048 */ lw $s2, 0x48($sp) +/* C5B7DC 8024109C 8FB10044 */ lw $s1, 0x44($sp) +/* C5B7E0 802410A0 8FB00040 */ lw $s0, 0x40($sp) +/* C5B7E4 802410A4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* C5B7E8 802410A8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* C5B7EC 802410AC D7B60060 */ ldc1 $f22, 0x60($sp) +/* C5B7F0 802410B0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* C5B7F4 802410B4 03E00008 */ jr $ra +/* C5B7F8 802410B8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4.s deleted file mode 100644 index b1b068f946..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412D4 -/* C5BA14 802412D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5BA18 802412D8 AFB00010 */ sw $s0, 0x10($sp) -/* C5BA1C 802412DC 0080802D */ daddu $s0, $a0, $zero -/* C5BA20 802412E0 AFBF0014 */ sw $ra, 0x14($sp) -/* C5BA24 802412E4 8E020148 */ lw $v0, 0x148($s0) -/* C5BA28 802412E8 0C00EABB */ jal get_npc_unsafe -/* C5BA2C 802412EC 84440008 */ lh $a0, 8($v0) -/* C5BA30 802412F0 0040202D */ daddu $a0, $v0, $zero -/* C5BA34 802412F4 8482008E */ lh $v0, 0x8e($a0) -/* C5BA38 802412F8 9483008E */ lhu $v1, 0x8e($a0) -/* C5BA3C 802412FC 18400005 */ blez $v0, .L80241314 -/* C5BA40 80241300 2462FFFF */ addiu $v0, $v1, -1 -/* C5BA44 80241304 A482008E */ sh $v0, 0x8e($a0) -/* C5BA48 80241308 00021400 */ sll $v0, $v0, 0x10 -/* C5BA4C 8024130C 1C400006 */ bgtz $v0, .L80241328 -/* C5BA50 80241310 00000000 */ nop -.L80241314: -/* C5BA54 80241314 8482008C */ lh $v0, 0x8c($a0) -/* C5BA58 80241318 14400003 */ bnez $v0, .L80241328 -/* C5BA5C 8024131C 2402000E */ addiu $v0, $zero, 0xe -/* C5BA60 80241320 A480008E */ sh $zero, 0x8e($a0) -/* C5BA64 80241324 AE020070 */ sw $v0, 0x70($s0) -.L80241328: -/* C5BA68 80241328 8FBF0014 */ lw $ra, 0x14($sp) -/* C5BA6C 8024132C 8FB00010 */ lw $s0, 0x10($sp) -/* C5BA70 80241330 03E00008 */ jr $ra -/* C5BA74 80241334 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s new file mode 100644 index 0000000000..42552e2471 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802412D4_C5BA14.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412D4_C5BA14 +/* C5BA14 802412D4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C5BA18 802412D8 AFB00010 */ sw $s0, 0x10($sp) +/* C5BA1C 802412DC 0080802D */ daddu $s0, $a0, $zero +/* C5BA20 802412E0 AFBF0014 */ sw $ra, 0x14($sp) +/* C5BA24 802412E4 8E020148 */ lw $v0, 0x148($s0) +/* C5BA28 802412E8 0C00EABB */ jal get_npc_unsafe +/* C5BA2C 802412EC 84440008 */ lh $a0, 8($v0) +/* C5BA30 802412F0 0040202D */ daddu $a0, $v0, $zero +/* C5BA34 802412F4 8482008E */ lh $v0, 0x8e($a0) +/* C5BA38 802412F8 9483008E */ lhu $v1, 0x8e($a0) +/* C5BA3C 802412FC 18400005 */ blez $v0, .L80241314 +/* C5BA40 80241300 2462FFFF */ addiu $v0, $v1, -1 +/* C5BA44 80241304 A482008E */ sh $v0, 0x8e($a0) +/* C5BA48 80241308 00021400 */ sll $v0, $v0, 0x10 +/* C5BA4C 8024130C 1C400006 */ bgtz $v0, .L80241328 +/* C5BA50 80241310 00000000 */ nop +.L80241314: +/* C5BA54 80241314 8482008C */ lh $v0, 0x8c($a0) +/* C5BA58 80241318 14400003 */ bnez $v0, .L80241328 +/* C5BA5C 8024131C 2402000E */ addiu $v0, $zero, 0xe +/* C5BA60 80241320 A480008E */ sh $zero, 0x8e($a0) +/* C5BA64 80241324 AE020070 */ sw $v0, 0x70($s0) +.L80241328: +/* C5BA68 80241328 8FBF0014 */ lw $ra, 0x14($sp) +/* C5BA6C 8024132C 8FB00010 */ lw $s0, 0x10($sp) +/* C5BA70 80241330 03E00008 */ jr $ra +/* C5BA74 80241334 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s index 900a872787..e28be0f87b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802417EC_C5BF2C.s @@ -46,7 +46,7 @@ glabel func_802417EC_C5BF2C /* C5BFD0 80241890 02A0202D */ daddu $a0, $s5, $zero /* C5BFD4 80241894 0240282D */ daddu $a1, $s2, $zero /* C5BFD8 80241898 0280302D */ daddu $a2, $s4, $zero -/* C5BFDC 8024189C 0C0905B2 */ jal func_802416C8 +/* C5BFDC 8024189C 0C0905B2 */ jal func_802416C8_C5BE08 /* C5BFE0 802418A0 0200382D */ daddu $a3, $s0, $zero .L802418A4: /* C5BFE4 802418A4 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_802417EC_C5BF2C /* C5C034 802418F4 00000000 */ nop /* C5C038 802418F8 0280202D */ daddu $a0, $s4, $zero /* C5C03C 802418FC 0200282D */ daddu $a1, $s0, $zero -/* C5C040 80241900 0C090138 */ jal func_802404E0 +/* C5C040 80241900 0C090138 */ jal func_802404E0_C5AC20 /* C5C044 80241904 0260302D */ daddu $a2, $s3, $zero /* C5C048 80241908 0280202D */ daddu $a0, $s4, $zero /* C5C04C 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C5C050 80241910 0C0901A4 */ jal func_80240690 +/* C5C050 80241910 0C0901A4 */ jal func_80240690_C5ADD0 /* C5C054 80241914 0260302D */ daddu $a2, $s3, $zero /* C5C058 80241918 0809066D */ j .L802419B4 /* C5C05C 8024191C 0000102D */ daddu $v0, $zero, $zero /* C5C060 80241920 0280202D */ daddu $a0, $s4, $zero /* C5C064 80241924 0200282D */ daddu $a1, $s0, $zero -/* C5C068 80241928 0C09032E */ jal func_80240CB8 +/* C5C068 80241928 0C09032E */ jal func_80240CB8_C5B3F8 /* C5C06C 8024192C 0260302D */ daddu $a2, $s3, $zero /* C5C070 80241930 0280202D */ daddu $a0, $s4, $zero /* C5C074 80241934 0200282D */ daddu $a1, $s0, $zero -/* C5C078 80241938 0C09035E */ jal func_80240D78 +/* C5C078 80241938 0C09035E */ jal func_80240D78_C5B4B8 /* C5C07C 8024193C 0260302D */ daddu $a2, $s3, $zero /* C5C080 80241940 0809066D */ j .L802419B4 /* C5C084 80241944 0000102D */ daddu $v0, $zero, $zero /* C5C088 80241948 0280202D */ daddu $a0, $s4, $zero /* C5C08C 8024194C 0200282D */ daddu $a1, $s0, $zero -/* C5C090 80241950 0C09042F */ jal func_802410BC +/* C5C090 80241950 0C09042F */ jal func_802410BC_C5B7FC /* C5C094 80241954 0260302D */ daddu $a2, $s3, $zero /* C5C098 80241958 0280202D */ daddu $a0, $s4, $zero /* C5C09C 8024195C 0200282D */ daddu $a1, $s0, $zero -/* C5C0A0 80241960 0C09044D */ jal func_80241134 +/* C5C0A0 80241960 0C09044D */ jal func_80241134_C5B874 /* C5C0A4 80241964 0260302D */ daddu $a2, $s3, $zero /* C5C0A8 80241968 0809066D */ j .L802419B4 /* C5C0AC 8024196C 0000102D */ daddu $v0, $zero, $zero /* C5C0B0 80241970 0280202D */ daddu $a0, $s4, $zero /* C5C0B4 80241974 0200282D */ daddu $a1, $s0, $zero -/* C5C0B8 80241978 0C090468 */ jal func_802411A0 +/* C5C0B8 80241978 0C090468 */ jal func_802411A0_C5B8E0 /* C5C0BC 8024197C 0260302D */ daddu $a2, $s3, $zero /* C5C0C0 80241980 0809066D */ j .L802419B4 /* C5C0C4 80241984 0000102D */ daddu $v0, $zero, $zero /* C5C0C8 80241988 0280202D */ daddu $a0, $s4, $zero /* C5C0CC 8024198C 0200282D */ daddu $a1, $s0, $zero -/* C5C0D0 80241990 0C0904B5 */ jal func_802412D4 +/* C5C0D0 80241990 0C0904B5 */ jal func_802412D4_C5BA14 /* C5C0D4 80241994 0260302D */ daddu $a2, $s3, $zero /* C5C0D8 80241998 0809066D */ j .L802419B4 /* C5C0DC 8024199C 0000102D */ daddu $v0, $zero, $zero /* C5C0E0 802419A0 0280202D */ daddu $a0, $s4, $zero /* C5C0E4 802419A4 0200282D */ daddu $a1, $s0, $zero -/* C5C0E8 802419A8 0C0904CE */ jal func_80241338 +/* C5C0E8 802419A8 0C0904CE */ jal func_80241338_C5BA78 /* C5C0EC 802419AC 0260302D */ daddu $a2, $s3, $zero .L802419B0: /* C5C0F0 802419B0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88.s deleted file mode 100644 index c2dc05d7df..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D88 -/* C5C4C8 80241D88 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C5C4CC 80241D8C AFB10014 */ sw $s1, 0x14($sp) -/* C5C4D0 80241D90 0080882D */ daddu $s1, $a0, $zero -/* C5C4D4 80241D94 AFBF0018 */ sw $ra, 0x18($sp) -/* C5C4D8 80241D98 AFB00010 */ sw $s0, 0x10($sp) -/* C5C4DC 80241D9C 8E300148 */ lw $s0, 0x148($s1) -/* C5C4E0 80241DA0 0C00EABB */ jal get_npc_unsafe -/* C5C4E4 80241DA4 86040008 */ lh $a0, 8($s0) -/* C5C4E8 80241DA8 0040182D */ daddu $v1, $v0, $zero -/* C5C4EC 80241DAC 9462008E */ lhu $v0, 0x8e($v1) -/* C5C4F0 80241DB0 2442FFFF */ addiu $v0, $v0, -1 -/* C5C4F4 80241DB4 A462008E */ sh $v0, 0x8e($v1) -/* C5C4F8 80241DB8 00021400 */ sll $v0, $v0, 0x10 -/* C5C4FC 80241DBC 1C400004 */ bgtz $v0, .L80241DD0 -/* C5C500 80241DC0 00000000 */ nop -/* C5C504 80241DC4 AE000074 */ sw $zero, 0x74($s0) -/* C5C508 80241DC8 A460008E */ sh $zero, 0x8e($v1) -/* C5C50C 80241DCC AE200070 */ sw $zero, 0x70($s1) -.L80241DD0: -/* C5C510 80241DD0 8FBF0018 */ lw $ra, 0x18($sp) -/* C5C514 80241DD4 8FB10014 */ lw $s1, 0x14($sp) -/* C5C518 80241DD8 8FB00010 */ lw $s0, 0x10($sp) -/* C5C51C 80241DDC 03E00008 */ jr $ra -/* C5C520 80241DE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s new file mode 100644 index 0000000000..e02a661fd9 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241D88_C5C4C8.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D88_C5C4C8 +/* C5C4C8 80241D88 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C5C4CC 80241D8C AFB10014 */ sw $s1, 0x14($sp) +/* C5C4D0 80241D90 0080882D */ daddu $s1, $a0, $zero +/* C5C4D4 80241D94 AFBF0018 */ sw $ra, 0x18($sp) +/* C5C4D8 80241D98 AFB00010 */ sw $s0, 0x10($sp) +/* C5C4DC 80241D9C 8E300148 */ lw $s0, 0x148($s1) +/* C5C4E0 80241DA0 0C00EABB */ jal get_npc_unsafe +/* C5C4E4 80241DA4 86040008 */ lh $a0, 8($s0) +/* C5C4E8 80241DA8 0040182D */ daddu $v1, $v0, $zero +/* C5C4EC 80241DAC 9462008E */ lhu $v0, 0x8e($v1) +/* C5C4F0 80241DB0 2442FFFF */ addiu $v0, $v0, -1 +/* C5C4F4 80241DB4 A462008E */ sh $v0, 0x8e($v1) +/* C5C4F8 80241DB8 00021400 */ sll $v0, $v0, 0x10 +/* C5C4FC 80241DBC 1C400004 */ bgtz $v0, .L80241DD0 +/* C5C500 80241DC0 00000000 */ nop +/* C5C504 80241DC4 AE000074 */ sw $zero, 0x74($s0) +/* C5C508 80241DC8 A460008E */ sh $zero, 0x8e($v1) +/* C5C50C 80241DCC AE200070 */ sw $zero, 0x70($s1) +.L80241DD0: +/* C5C510 80241DD0 8FBF0018 */ lw $ra, 0x18($sp) +/* C5C514 80241DD4 8FB10014 */ lw $s1, 0x14($sp) +/* C5C518 80241DD8 8FB00010 */ lw $s0, 0x10($sp) +/* C5C51C 80241DDC 03E00008 */ jr $ra +/* C5C520 80241DE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s index c5e0eeb4dd..33350c391e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80241DE4_C5C524.s @@ -46,7 +46,7 @@ glabel func_80241DE4_C5C524 /* C5C5C8 80241E88 02A0202D */ daddu $a0, $s5, $zero /* C5C5CC 80241E8C 0240282D */ daddu $a1, $s2, $zero /* C5C5D0 80241E90 0280302D */ daddu $a2, $s4, $zero -/* C5C5D4 80241E94 0C0905B2 */ jal func_802416C8 +/* C5C5D4 80241E94 0C0905B2 */ jal func_802416C8_C5BE08 /* C5C5D8 80241E98 0200382D */ daddu $a3, $s0, $zero /* C5C5DC 80241E9C AE800070 */ sw $zero, 0x70($s4) .L80241EA0: @@ -74,47 +74,47 @@ glabel func_80241DE4_C5C524 /* C5C630 80241EF0 00000000 */ nop /* C5C634 80241EF4 0280202D */ daddu $a0, $s4, $zero /* C5C638 80241EF8 0200282D */ daddu $a1, $s0, $zero -/* C5C63C 80241EFC 0C090138 */ jal func_802404E0 +/* C5C63C 80241EFC 0C090138 */ jal func_802404E0_C5AC20 /* C5C640 80241F00 0260302D */ daddu $a2, $s3, $zero /* C5C644 80241F04 0280202D */ daddu $a0, $s4, $zero /* C5C648 80241F08 0200282D */ daddu $a1, $s0, $zero -/* C5C64C 80241F0C 0C0901A4 */ jal func_80240690 +/* C5C64C 80241F0C 0C0901A4 */ jal func_80240690_C5ADD0 /* C5C650 80241F10 0260302D */ daddu $a2, $s3, $zero /* C5C654 80241F14 080907EA */ j .L80241FA8 /* C5C658 80241F18 0000102D */ daddu $v0, $zero, $zero /* C5C65C 80241F1C 0280202D */ daddu $a0, $s4, $zero /* C5C660 80241F20 0200282D */ daddu $a1, $s0, $zero -/* C5C664 80241F24 0C09032E */ jal func_80240CB8 +/* C5C664 80241F24 0C09032E */ jal func_80240CB8_C5B3F8 /* C5C668 80241F28 0260302D */ daddu $a2, $s3, $zero /* C5C66C 80241F2C 0280202D */ daddu $a0, $s4, $zero /* C5C670 80241F30 0200282D */ daddu $a1, $s0, $zero -/* C5C674 80241F34 0C09035E */ jal func_80240D78 +/* C5C674 80241F34 0C09035E */ jal func_80240D78_C5B4B8 /* C5C678 80241F38 0260302D */ daddu $a2, $s3, $zero /* C5C67C 80241F3C 080907EA */ j .L80241FA8 /* C5C680 80241F40 0000102D */ daddu $v0, $zero, $zero /* C5C684 80241F44 0280202D */ daddu $a0, $s4, $zero /* C5C688 80241F48 0200282D */ daddu $a1, $s0, $zero -/* C5C68C 80241F4C 0C09042F */ jal func_802410BC +/* C5C68C 80241F4C 0C09042F */ jal func_802410BC_C5B7FC /* C5C690 80241F50 0260302D */ daddu $a2, $s3, $zero /* C5C694 80241F54 0280202D */ daddu $a0, $s4, $zero /* C5C698 80241F58 0200282D */ daddu $a1, $s0, $zero -/* C5C69C 80241F5C 0C09044D */ jal func_80241134 +/* C5C69C 80241F5C 0C09044D */ jal func_80241134_C5B874 /* C5C6A0 80241F60 0260302D */ daddu $a2, $s3, $zero /* C5C6A4 80241F64 080907EA */ j .L80241FA8 /* C5C6A8 80241F68 0000102D */ daddu $v0, $zero, $zero /* C5C6AC 80241F6C 0280202D */ daddu $a0, $s4, $zero /* C5C6B0 80241F70 0200282D */ daddu $a1, $s0, $zero -/* C5C6B4 80241F74 0C090676 */ jal func_802419D8 +/* C5C6B4 80241F74 0C090676 */ jal func_802419D8_C5C118 /* C5C6B8 80241F78 0260302D */ daddu $a2, $s3, $zero /* C5C6BC 80241F7C 0280202D */ daddu $a0, $s4, $zero /* C5C6C0 80241F80 0200282D */ daddu $a1, $s0, $zero -/* C5C6C4 80241F84 0C0906C2 */ jal func_80241B08 +/* C5C6C4 80241F84 0C0906C2 */ jal func_80241B08_C5C248 /* C5C6C8 80241F88 0260302D */ daddu $a2, $s3, $zero /* C5C6CC 80241F8C 080907EA */ j .L80241FA8 /* C5C6D0 80241F90 0000102D */ daddu $v0, $zero, $zero /* C5C6D4 80241F94 0280202D */ daddu $a0, $s4, $zero /* C5C6D8 80241F98 0200282D */ daddu $a1, $s0, $zero -/* C5C6DC 80241F9C 0C090762 */ jal func_80241D88 +/* C5C6DC 80241F9C 0C090762 */ jal func_80241D88_C5C4C8 /* C5C6E0 80241FA0 0260302D */ daddu $a2, $s3, $zero .L80241FA4: /* C5C6E4 80241FA4 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310.s deleted file mode 100644 index b044b21475..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242310 -/* C5CA50 80242310 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5CA54 80242314 AFBF0010 */ sw $ra, 0x10($sp) -/* C5CA58 80242318 10A00003 */ beqz $a1, .L80242328 -/* C5CA5C 8024231C 8C86000C */ lw $a2, 0xc($a0) -/* C5CA60 80242320 3C018024 */ lui $at, 0x8024 -/* C5CA64 80242324 AC204A74 */ sw $zero, 0x4a74($at) -.L80242328: -/* C5CA68 80242328 3C038024 */ lui $v1, 0x8024 -/* C5CA6C 8024232C 24634A74 */ addiu $v1, $v1, 0x4a74 -/* C5CA70 80242330 8C620000 */ lw $v0, ($v1) -/* C5CA74 80242334 54400003 */ bnel $v0, $zero, .L80242344 -/* C5CA78 80242338 AC600000 */ sw $zero, ($v1) -/* C5CA7C 8024233C 080908D6 */ j .L80242358 -/* C5CA80 80242340 0000102D */ daddu $v0, $zero, $zero -.L80242344: -/* C5CA84 80242344 8CC50000 */ lw $a1, ($a2) -/* C5CA88 80242348 3C068024 */ lui $a2, 0x8024 -/* C5CA8C 8024234C 0C0B2026 */ jal set_variable -/* C5CA90 80242350 8CC64A78 */ lw $a2, 0x4a78($a2) -/* C5CA94 80242354 24020002 */ addiu $v0, $zero, 2 -.L80242358: -/* C5CA98 80242358 8FBF0010 */ lw $ra, 0x10($sp) -/* C5CA9C 8024235C 03E00008 */ jr $ra -/* C5CAA0 80242360 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s new file mode 100644 index 0000000000..dc8ee30192 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242310_C5CA50.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242310_C5CA50 +/* C5CA50 80242310 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C5CA54 80242314 AFBF0010 */ sw $ra, 0x10($sp) +/* C5CA58 80242318 10A00003 */ beqz $a1, .L80242328 +/* C5CA5C 8024231C 8C86000C */ lw $a2, 0xc($a0) +/* C5CA60 80242320 3C018024 */ lui $at, 0x8024 +/* C5CA64 80242324 AC204A74 */ sw $zero, 0x4a74($at) +.L80242328: +/* C5CA68 80242328 3C038024 */ lui $v1, 0x8024 +/* C5CA6C 8024232C 24634A74 */ addiu $v1, $v1, 0x4a74 +/* C5CA70 80242330 8C620000 */ lw $v0, ($v1) +/* C5CA74 80242334 54400003 */ bnel $v0, $zero, .L80242344 +/* C5CA78 80242338 AC600000 */ sw $zero, ($v1) +/* C5CA7C 8024233C 080908D6 */ j .L80242358 +/* C5CA80 80242340 0000102D */ daddu $v0, $zero, $zero +.L80242344: +/* C5CA84 80242344 8CC50000 */ lw $a1, ($a2) +/* C5CA88 80242348 3C068024 */ lui $a2, 0x8024 +/* C5CA8C 8024234C 0C0B2026 */ jal set_variable +/* C5CA90 80242350 8CC64A78 */ lw $a2, 0x4a78($a2) +/* C5CA94 80242354 24020002 */ addiu $v0, $zero, 2 +.L80242358: +/* C5CA98 80242358 8FBF0010 */ lw $ra, 0x10($sp) +/* C5CA9C 8024235C 03E00008 */ jr $ra +/* C5CAA0 80242360 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364.s deleted file mode 100644 index 31294a4b0a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242364 -/* C5CAA4 80242364 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5CAA8 80242368 AFBF0010 */ sw $ra, 0x10($sp) -/* C5CAAC 8024236C 8C82000C */ lw $v0, 0xc($a0) -/* C5CAB0 80242370 0C0B1EAF */ jal get_variable -/* C5CAB4 80242374 8C450000 */ lw $a1, ($v0) -/* C5CAB8 80242378 3C018024 */ lui $at, 0x8024 -/* C5CABC 8024237C AC224A78 */ sw $v0, 0x4a78($at) -/* C5CAC0 80242380 24020002 */ addiu $v0, $zero, 2 -/* C5CAC4 80242384 8FBF0010 */ lw $ra, 0x10($sp) -/* C5CAC8 80242388 24030001 */ addiu $v1, $zero, 1 -/* C5CACC 8024238C 3C018024 */ lui $at, 0x8024 -/* C5CAD0 80242390 AC234A74 */ sw $v1, 0x4a74($at) -/* C5CAD4 80242394 03E00008 */ jr $ra -/* C5CAD8 80242398 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364_C5CAA4.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364_C5CAA4.s new file mode 100644 index 0000000000..6904d78db6 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242364_C5CAA4.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242364_C5CAA4 +/* C5CAA4 80242364 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C5CAA8 80242368 AFBF0010 */ sw $ra, 0x10($sp) +/* C5CAAC 8024236C 8C82000C */ lw $v0, 0xc($a0) +/* C5CAB0 80242370 0C0B1EAF */ jal get_variable +/* C5CAB4 80242374 8C450000 */ lw $a1, ($v0) +/* C5CAB8 80242378 3C018024 */ lui $at, 0x8024 +/* C5CABC 8024237C AC224A78 */ sw $v0, 0x4a78($at) +/* C5CAC0 80242380 24020002 */ addiu $v0, $zero, 2 +/* C5CAC4 80242384 8FBF0010 */ lw $ra, 0x10($sp) +/* C5CAC8 80242388 24030001 */ addiu $v1, $zero, 1 +/* C5CACC 8024238C 3C018024 */ lui $at, 0x8024 +/* C5CAD0 80242390 AC234A74 */ sw $v1, 0x4a74($at) +/* C5CAD4 80242394 03E00008 */ jr $ra +/* C5CAD8 80242398 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C.s deleted file mode 100644 index bf9bb8a188..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024239C -/* C5CADC 8024239C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5CAE0 802423A0 AFBF0010 */ sw $ra, 0x10($sp) -/* C5CAE4 802423A4 8C82000C */ lw $v0, 0xc($a0) -/* C5CAE8 802423A8 0C0B1EAF */ jal get_variable -/* C5CAEC 802423AC 8C450000 */ lw $a1, ($v0) -/* C5CAF0 802423B0 0040182D */ daddu $v1, $v0, $zero -/* C5CAF4 802423B4 10600012 */ beqz $v1, .L80242400 -/* C5CAF8 802423B8 0000202D */ daddu $a0, $zero, $zero -/* C5CAFC 802423BC 8C620000 */ lw $v0, ($v1) -/* C5CB00 802423C0 5040000A */ beql $v0, $zero, .L802423EC -/* C5CB04 802423C4 00041080 */ sll $v0, $a0, 2 -/* C5CB08 802423C8 3C058024 */ lui $a1, 0x8024 -/* C5CB0C 802423CC 24A565D0 */ addiu $a1, $a1, 0x65d0 -.L802423D0: -/* C5CB10 802423D0 24630004 */ addiu $v1, $v1, 4 -/* C5CB14 802423D4 24840001 */ addiu $a0, $a0, 1 -/* C5CB18 802423D8 ACA20000 */ sw $v0, ($a1) -/* C5CB1C 802423DC 8C620000 */ lw $v0, ($v1) -/* C5CB20 802423E0 1440FFFB */ bnez $v0, .L802423D0 -/* C5CB24 802423E4 24A50004 */ addiu $a1, $a1, 4 -/* C5CB28 802423E8 00041080 */ sll $v0, $a0, 2 -.L802423EC: -/* C5CB2C 802423EC 3C018024 */ lui $at, 0x8024 -/* C5CB30 802423F0 00220821 */ addu $at, $at, $v0 -/* C5CB34 802423F4 AC2065D0 */ sw $zero, 0x65d0($at) -/* C5CB38 802423F8 0809090A */ j .L80242428 -/* C5CB3C 802423FC 00000000 */ nop -.L80242400: -/* C5CB40 80242400 3C038024 */ lui $v1, 0x8024 -/* C5CB44 80242404 246365D0 */ addiu $v1, $v1, 0x65d0 -/* C5CB48 80242408 0060282D */ daddu $a1, $v1, $zero -.L8024240C: -/* C5CB4C 8024240C 24820010 */ addiu $v0, $a0, 0x10 -/* C5CB50 80242410 AC620000 */ sw $v0, ($v1) -/* C5CB54 80242414 24630004 */ addiu $v1, $v1, 4 -/* C5CB58 80242418 24840001 */ addiu $a0, $a0, 1 -/* C5CB5C 8024241C 28820070 */ slti $v0, $a0, 0x70 -/* C5CB60 80242420 1440FFFA */ bnez $v0, .L8024240C -/* C5CB64 80242424 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242428: -/* C5CB68 80242428 8FBF0010 */ lw $ra, 0x10($sp) -/* C5CB6C 8024242C 24020002 */ addiu $v0, $zero, 2 -/* C5CB70 80242430 03E00008 */ jr $ra -/* C5CB74 80242434 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s new file mode 100644 index 0000000000..2a97b668f3 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_8024239C_C5CADC.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024239C_C5CADC +/* C5CADC 8024239C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C5CAE0 802423A0 AFBF0010 */ sw $ra, 0x10($sp) +/* C5CAE4 802423A4 8C82000C */ lw $v0, 0xc($a0) +/* C5CAE8 802423A8 0C0B1EAF */ jal get_variable +/* C5CAEC 802423AC 8C450000 */ lw $a1, ($v0) +/* C5CAF0 802423B0 0040182D */ daddu $v1, $v0, $zero +/* C5CAF4 802423B4 10600012 */ beqz $v1, .L80242400 +/* C5CAF8 802423B8 0000202D */ daddu $a0, $zero, $zero +/* C5CAFC 802423BC 8C620000 */ lw $v0, ($v1) +/* C5CB00 802423C0 5040000A */ beql $v0, $zero, .L802423EC +/* C5CB04 802423C4 00041080 */ sll $v0, $a0, 2 +/* C5CB08 802423C8 3C058024 */ lui $a1, 0x8024 +/* C5CB0C 802423CC 24A565D0 */ addiu $a1, $a1, 0x65d0 +.L802423D0: +/* C5CB10 802423D0 24630004 */ addiu $v1, $v1, 4 +/* C5CB14 802423D4 24840001 */ addiu $a0, $a0, 1 +/* C5CB18 802423D8 ACA20000 */ sw $v0, ($a1) +/* C5CB1C 802423DC 8C620000 */ lw $v0, ($v1) +/* C5CB20 802423E0 1440FFFB */ bnez $v0, .L802423D0 +/* C5CB24 802423E4 24A50004 */ addiu $a1, $a1, 4 +/* C5CB28 802423E8 00041080 */ sll $v0, $a0, 2 +.L802423EC: +/* C5CB2C 802423EC 3C018024 */ lui $at, 0x8024 +/* C5CB30 802423F0 00220821 */ addu $at, $at, $v0 +/* C5CB34 802423F4 AC2065D0 */ sw $zero, 0x65d0($at) +/* C5CB38 802423F8 0809090A */ j .L80242428 +/* C5CB3C 802423FC 00000000 */ nop +.L80242400: +/* C5CB40 80242400 3C038024 */ lui $v1, 0x8024 +/* C5CB44 80242404 246365D0 */ addiu $v1, $v1, 0x65d0 +/* C5CB48 80242408 0060282D */ daddu $a1, $v1, $zero +.L8024240C: +/* C5CB4C 8024240C 24820010 */ addiu $v0, $a0, 0x10 +/* C5CB50 80242410 AC620000 */ sw $v0, ($v1) +/* C5CB54 80242414 24630004 */ addiu $v1, $v1, 4 +/* C5CB58 80242418 24840001 */ addiu $a0, $a0, 1 +/* C5CB5C 8024241C 28820070 */ slti $v0, $a0, 0x70 +/* C5CB60 80242420 1440FFFA */ bnez $v0, .L8024240C +/* C5CB64 80242424 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80242428: +/* C5CB68 80242428 8FBF0010 */ lw $ra, 0x10($sp) +/* C5CB6C 8024242C 24020002 */ addiu $v0, $zero, 2 +/* C5CB70 80242430 03E00008 */ jr $ra +/* C5CB74 80242434 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528.s deleted file mode 100644 index 2f278ae4de..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242528 -/* C5CC68 80242528 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C5CC6C 8024252C AFB1001C */ sw $s1, 0x1c($sp) -/* C5CC70 80242530 0080882D */ daddu $s1, $a0, $zero -/* C5CC74 80242534 AFBF0034 */ sw $ra, 0x34($sp) -/* C5CC78 80242538 AFB60030 */ sw $s6, 0x30($sp) -/* C5CC7C 8024253C AFB5002C */ sw $s5, 0x2c($sp) -/* C5CC80 80242540 AFB40028 */ sw $s4, 0x28($sp) -/* C5CC84 80242544 AFB30024 */ sw $s3, 0x24($sp) -/* C5CC88 80242548 AFB20020 */ sw $s2, 0x20($sp) -/* C5CC8C 8024254C AFB00018 */ sw $s0, 0x18($sp) -/* C5CC90 80242550 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C5CC94 80242554 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C5CC98 80242558 8E30000C */ lw $s0, 0xc($s1) -/* C5CC9C 8024255C 8E160000 */ lw $s6, ($s0) -/* C5CCA0 80242560 26100004 */ addiu $s0, $s0, 4 -/* C5CCA4 80242564 0C0B1EAF */ jal get_variable -/* C5CCA8 80242568 02C0282D */ daddu $a1, $s6, $zero -/* C5CCAC 8024256C 44820000 */ mtc1 $v0, $f0 -/* C5CCB0 80242570 00000000 */ nop -/* C5CCB4 80242574 46800020 */ cvt.s.w $f0, $f0 -/* C5CCB8 80242578 E7A00010 */ swc1 $f0, 0x10($sp) -/* C5CCBC 8024257C 8E140000 */ lw $s4, ($s0) -/* C5CCC0 80242580 26100004 */ addiu $s0, $s0, 4 -/* C5CCC4 80242584 0220202D */ daddu $a0, $s1, $zero -/* C5CCC8 80242588 0C0B1EAF */ jal get_variable -/* C5CCCC 8024258C 0280282D */ daddu $a1, $s4, $zero -/* C5CCD0 80242590 0220202D */ daddu $a0, $s1, $zero -/* C5CCD4 80242594 8E150000 */ lw $s5, ($s0) -/* C5CCD8 80242598 4482B000 */ mtc1 $v0, $f22 -/* C5CCDC 8024259C 00000000 */ nop -/* C5CCE0 802425A0 4680B5A0 */ cvt.s.w $f22, $f22 -/* C5CCE4 802425A4 0C0B1EAF */ jal get_variable -/* C5CCE8 802425A8 02A0282D */ daddu $a1, $s5, $zero -/* C5CCEC 802425AC 2404FFFC */ addiu $a0, $zero, -4 -/* C5CCF0 802425B0 44820000 */ mtc1 $v0, $f0 -/* C5CCF4 802425B4 00000000 */ nop -/* C5CCF8 802425B8 46800020 */ cvt.s.w $f0, $f0 -/* C5CCFC 802425BC 0C00EABB */ jal get_npc_unsafe -/* C5CD00 802425C0 E7A00014 */ swc1 $f0, 0x14($sp) -/* C5CD04 802425C4 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C5CD08 802425C8 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C5CD0C 802425CC 3C014334 */ lui $at, 0x4334 -/* C5CD10 802425D0 44816000 */ mtc1 $at, $f12 -/* C5CD14 802425D4 00041880 */ sll $v1, $a0, 2 -/* C5CD18 802425D8 00641821 */ addu $v1, $v1, $a0 -/* C5CD1C 802425DC 00031880 */ sll $v1, $v1, 2 -/* C5CD20 802425E0 00641823 */ subu $v1, $v1, $a0 -/* C5CD24 802425E4 000320C0 */ sll $a0, $v1, 3 -/* C5CD28 802425E8 00641821 */ addu $v1, $v1, $a0 -/* C5CD2C 802425EC 000318C0 */ sll $v1, $v1, 3 -/* C5CD30 802425F0 3C01800B */ lui $at, 0x800b -/* C5CD34 802425F4 00230821 */ addu $at, $at, $v1 -/* C5CD38 802425F8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C5CD3C 802425FC 460C0300 */ add.s $f12, $f0, $f12 -/* C5CD40 80242600 0C00A6C9 */ jal clamp_angle -/* C5CD44 80242604 0040982D */ daddu $s3, $v0, $zero -/* C5CD48 80242608 27B00010 */ addiu $s0, $sp, 0x10 -/* C5CD4C 8024260C 0200202D */ daddu $a0, $s0, $zero -/* C5CD50 80242610 27B20014 */ addiu $s2, $sp, 0x14 -/* C5CD54 80242614 0240282D */ daddu $a1, $s2, $zero -/* C5CD58 80242618 3C064170 */ lui $a2, 0x4170 -/* C5CD5C 8024261C 8E67000C */ lw $a3, 0xc($s3) -/* C5CD60 80242620 0C00A7E7 */ jal add_vec2D_polar -/* C5CD64 80242624 46000506 */ mov.s $f20, $f0 -/* C5CD68 80242628 0200202D */ daddu $a0, $s0, $zero -/* C5CD6C 8024262C 3C064120 */ lui $a2, 0x4120 -/* C5CD70 80242630 4407A000 */ mfc1 $a3, $f20 -/* C5CD74 80242634 0C00A7E7 */ jal add_vec2D_polar -/* C5CD78 80242638 0240282D */ daddu $a1, $s2, $zero -/* C5CD7C 8024263C 0220202D */ daddu $a0, $s1, $zero -/* C5CD80 80242640 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C5CD84 80242644 4600008D */ trunc.w.s $f2, $f0 -/* C5CD88 80242648 44061000 */ mfc1 $a2, $f2 -/* C5CD8C 8024264C 0C0B2026 */ jal set_variable -/* C5CD90 80242650 02C0282D */ daddu $a1, $s6, $zero -/* C5CD94 80242654 0220202D */ daddu $a0, $s1, $zero -/* C5CD98 80242658 4600B08D */ trunc.w.s $f2, $f22 -/* C5CD9C 8024265C 44061000 */ mfc1 $a2, $f2 -/* C5CDA0 80242660 0C0B2026 */ jal set_variable -/* C5CDA4 80242664 0280282D */ daddu $a1, $s4, $zero -/* C5CDA8 80242668 0220202D */ daddu $a0, $s1, $zero -/* C5CDAC 8024266C C7A00014 */ lwc1 $f0, 0x14($sp) -/* C5CDB0 80242670 4600008D */ trunc.w.s $f2, $f0 -/* C5CDB4 80242674 44061000 */ mfc1 $a2, $f2 -/* C5CDB8 80242678 0C0B2026 */ jal set_variable -/* C5CDBC 8024267C 02A0282D */ daddu $a1, $s5, $zero -/* C5CDC0 80242680 8FBF0034 */ lw $ra, 0x34($sp) -/* C5CDC4 80242684 8FB60030 */ lw $s6, 0x30($sp) -/* C5CDC8 80242688 8FB5002C */ lw $s5, 0x2c($sp) -/* C5CDCC 8024268C 8FB40028 */ lw $s4, 0x28($sp) -/* C5CDD0 80242690 8FB30024 */ lw $s3, 0x24($sp) -/* C5CDD4 80242694 8FB20020 */ lw $s2, 0x20($sp) -/* C5CDD8 80242698 8FB1001C */ lw $s1, 0x1c($sp) -/* C5CDDC 8024269C 8FB00018 */ lw $s0, 0x18($sp) -/* C5CDE0 802426A0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C5CDE4 802426A4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C5CDE8 802426A8 24020002 */ addiu $v0, $zero, 2 -/* C5CDEC 802426AC 03E00008 */ jr $ra -/* C5CDF0 802426B0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528_C5CC68.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528_C5CC68.s new file mode 100644 index 0000000000..87c53dfa98 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_80242528_C5CC68.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242528_C5CC68 +/* C5CC68 80242528 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C5CC6C 8024252C AFB1001C */ sw $s1, 0x1c($sp) +/* C5CC70 80242530 0080882D */ daddu $s1, $a0, $zero +/* C5CC74 80242534 AFBF0034 */ sw $ra, 0x34($sp) +/* C5CC78 80242538 AFB60030 */ sw $s6, 0x30($sp) +/* C5CC7C 8024253C AFB5002C */ sw $s5, 0x2c($sp) +/* C5CC80 80242540 AFB40028 */ sw $s4, 0x28($sp) +/* C5CC84 80242544 AFB30024 */ sw $s3, 0x24($sp) +/* C5CC88 80242548 AFB20020 */ sw $s2, 0x20($sp) +/* C5CC8C 8024254C AFB00018 */ sw $s0, 0x18($sp) +/* C5CC90 80242550 F7B60040 */ sdc1 $f22, 0x40($sp) +/* C5CC94 80242554 F7B40038 */ sdc1 $f20, 0x38($sp) +/* C5CC98 80242558 8E30000C */ lw $s0, 0xc($s1) +/* C5CC9C 8024255C 8E160000 */ lw $s6, ($s0) +/* C5CCA0 80242560 26100004 */ addiu $s0, $s0, 4 +/* C5CCA4 80242564 0C0B1EAF */ jal get_variable +/* C5CCA8 80242568 02C0282D */ daddu $a1, $s6, $zero +/* C5CCAC 8024256C 44820000 */ mtc1 $v0, $f0 +/* C5CCB0 80242570 00000000 */ nop +/* C5CCB4 80242574 46800020 */ cvt.s.w $f0, $f0 +/* C5CCB8 80242578 E7A00010 */ swc1 $f0, 0x10($sp) +/* C5CCBC 8024257C 8E140000 */ lw $s4, ($s0) +/* C5CCC0 80242580 26100004 */ addiu $s0, $s0, 4 +/* C5CCC4 80242584 0220202D */ daddu $a0, $s1, $zero +/* C5CCC8 80242588 0C0B1EAF */ jal get_variable +/* C5CCCC 8024258C 0280282D */ daddu $a1, $s4, $zero +/* C5CCD0 80242590 0220202D */ daddu $a0, $s1, $zero +/* C5CCD4 80242594 8E150000 */ lw $s5, ($s0) +/* C5CCD8 80242598 4482B000 */ mtc1 $v0, $f22 +/* C5CCDC 8024259C 00000000 */ nop +/* C5CCE0 802425A0 4680B5A0 */ cvt.s.w $f22, $f22 +/* C5CCE4 802425A4 0C0B1EAF */ jal get_variable +/* C5CCE8 802425A8 02A0282D */ daddu $a1, $s5, $zero +/* C5CCEC 802425AC 2404FFFC */ addiu $a0, $zero, -4 +/* C5CCF0 802425B0 44820000 */ mtc1 $v0, $f0 +/* C5CCF4 802425B4 00000000 */ nop +/* C5CCF8 802425B8 46800020 */ cvt.s.w $f0, $f0 +/* C5CCFC 802425BC 0C00EABB */ jal get_npc_unsafe +/* C5CD00 802425C0 E7A00014 */ swc1 $f0, 0x14($sp) +/* C5CD04 802425C4 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* C5CD08 802425C8 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* C5CD0C 802425CC 3C014334 */ lui $at, 0x4334 +/* C5CD10 802425D0 44816000 */ mtc1 $at, $f12 +/* C5CD14 802425D4 00041880 */ sll $v1, $a0, 2 +/* C5CD18 802425D8 00641821 */ addu $v1, $v1, $a0 +/* C5CD1C 802425DC 00031880 */ sll $v1, $v1, 2 +/* C5CD20 802425E0 00641823 */ subu $v1, $v1, $a0 +/* C5CD24 802425E4 000320C0 */ sll $a0, $v1, 3 +/* C5CD28 802425E8 00641821 */ addu $v1, $v1, $a0 +/* C5CD2C 802425EC 000318C0 */ sll $v1, $v1, 3 +/* C5CD30 802425F0 3C01800B */ lui $at, 0x800b +/* C5CD34 802425F4 00230821 */ addu $at, $at, $v1 +/* C5CD38 802425F8 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* C5CD3C 802425FC 460C0300 */ add.s $f12, $f0, $f12 +/* C5CD40 80242600 0C00A6C9 */ jal clamp_angle +/* C5CD44 80242604 0040982D */ daddu $s3, $v0, $zero +/* C5CD48 80242608 27B00010 */ addiu $s0, $sp, 0x10 +/* C5CD4C 8024260C 0200202D */ daddu $a0, $s0, $zero +/* C5CD50 80242610 27B20014 */ addiu $s2, $sp, 0x14 +/* C5CD54 80242614 0240282D */ daddu $a1, $s2, $zero +/* C5CD58 80242618 3C064170 */ lui $a2, 0x4170 +/* C5CD5C 8024261C 8E67000C */ lw $a3, 0xc($s3) +/* C5CD60 80242620 0C00A7E7 */ jal add_vec2D_polar +/* C5CD64 80242624 46000506 */ mov.s $f20, $f0 +/* C5CD68 80242628 0200202D */ daddu $a0, $s0, $zero +/* C5CD6C 8024262C 3C064120 */ lui $a2, 0x4120 +/* C5CD70 80242630 4407A000 */ mfc1 $a3, $f20 +/* C5CD74 80242634 0C00A7E7 */ jal add_vec2D_polar +/* C5CD78 80242638 0240282D */ daddu $a1, $s2, $zero +/* C5CD7C 8024263C 0220202D */ daddu $a0, $s1, $zero +/* C5CD80 80242640 C7A00010 */ lwc1 $f0, 0x10($sp) +/* C5CD84 80242644 4600008D */ trunc.w.s $f2, $f0 +/* C5CD88 80242648 44061000 */ mfc1 $a2, $f2 +/* C5CD8C 8024264C 0C0B2026 */ jal set_variable +/* C5CD90 80242650 02C0282D */ daddu $a1, $s6, $zero +/* C5CD94 80242654 0220202D */ daddu $a0, $s1, $zero +/* C5CD98 80242658 4600B08D */ trunc.w.s $f2, $f22 +/* C5CD9C 8024265C 44061000 */ mfc1 $a2, $f2 +/* C5CDA0 80242660 0C0B2026 */ jal set_variable +/* C5CDA4 80242664 0280282D */ daddu $a1, $s4, $zero +/* C5CDA8 80242668 0220202D */ daddu $a0, $s1, $zero +/* C5CDAC 8024266C C7A00014 */ lwc1 $f0, 0x14($sp) +/* C5CDB0 80242670 4600008D */ trunc.w.s $f2, $f0 +/* C5CDB4 80242674 44061000 */ mfc1 $a2, $f2 +/* C5CDB8 80242678 0C0B2026 */ jal set_variable +/* C5CDBC 8024267C 02A0282D */ daddu $a1, $s5, $zero +/* C5CDC0 80242680 8FBF0034 */ lw $ra, 0x34($sp) +/* C5CDC4 80242684 8FB60030 */ lw $s6, 0x30($sp) +/* C5CDC8 80242688 8FB5002C */ lw $s5, 0x2c($sp) +/* C5CDCC 8024268C 8FB40028 */ lw $s4, 0x28($sp) +/* C5CDD0 80242690 8FB30024 */ lw $s3, 0x24($sp) +/* C5CDD4 80242694 8FB20020 */ lw $s2, 0x20($sp) +/* C5CDD8 80242698 8FB1001C */ lw $s1, 0x1c($sp) +/* C5CDDC 8024269C 8FB00018 */ lw $s0, 0x18($sp) +/* C5CDE0 802426A0 D7B60040 */ ldc1 $f22, 0x40($sp) +/* C5CDE4 802426A4 D7B40038 */ ldc1 $f20, 0x38($sp) +/* C5CDE8 802426A8 24020002 */ addiu $v0, $zero, 2 +/* C5CDEC 802426AC 03E00008 */ jr $ra +/* C5CDF0 802426B0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4.s deleted file mode 100644 index 27a5d2e801..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426B4 -/* C5CDF4 802426B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5CDF8 802426B8 AFB00010 */ sw $s0, 0x10($sp) -/* C5CDFC 802426BC 0080802D */ daddu $s0, $a0, $zero -/* C5CE00 802426C0 AFBF0014 */ sw $ra, 0x14($sp) -/* C5CE04 802426C4 0C00EABB */ jal get_npc_unsafe -/* C5CE08 802426C8 8E04008C */ lw $a0, 0x8c($s0) -/* C5CE0C 802426CC 0040282D */ daddu $a1, $v0, $zero -/* C5CE10 802426D0 8E040094 */ lw $a0, 0x94($s0) -/* C5CE14 802426D4 8CA30028 */ lw $v1, 0x28($a1) -/* C5CE18 802426D8 ACA40028 */ sw $a0, 0x28($a1) -/* C5CE1C 802426DC 8FBF0014 */ lw $ra, 0x14($sp) -/* C5CE20 802426E0 8FB00010 */ lw $s0, 0x10($sp) -/* C5CE24 802426E4 24020002 */ addiu $v0, $zero, 2 -/* C5CE28 802426E8 3C018024 */ lui $at, 0x8024 -/* C5CE2C 802426EC AC236794 */ sw $v1, 0x6794($at) -/* C5CE30 802426F0 03E00008 */ jr $ra -/* C5CE34 802426F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s new file mode 100644 index 0000000000..980df4c1eb --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426B4_C5CDF4.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426B4_C5CDF4 +/* C5CDF4 802426B4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C5CDF8 802426B8 AFB00010 */ sw $s0, 0x10($sp) +/* C5CDFC 802426BC 0080802D */ daddu $s0, $a0, $zero +/* C5CE00 802426C0 AFBF0014 */ sw $ra, 0x14($sp) +/* C5CE04 802426C4 0C00EABB */ jal get_npc_unsafe +/* C5CE08 802426C8 8E04008C */ lw $a0, 0x8c($s0) +/* C5CE0C 802426CC 0040282D */ daddu $a1, $v0, $zero +/* C5CE10 802426D0 8E040094 */ lw $a0, 0x94($s0) +/* C5CE14 802426D4 8CA30028 */ lw $v1, 0x28($a1) +/* C5CE18 802426D8 ACA40028 */ sw $a0, 0x28($a1) +/* C5CE1C 802426DC 8FBF0014 */ lw $ra, 0x14($sp) +/* C5CE20 802426E0 8FB00010 */ lw $s0, 0x10($sp) +/* C5CE24 802426E4 24020002 */ addiu $v0, $zero, 2 +/* C5CE28 802426E8 3C018024 */ lui $at, 0x8024 +/* C5CE2C 802426EC AC236794 */ sw $v1, 0x6794($at) +/* C5CE30 802426F0 03E00008 */ jr $ra +/* C5CE34 802426F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8.s deleted file mode 100644 index fba4a1b4d4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426F8 -/* C5CE38 802426F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C5CE3C 802426FC AFBF0010 */ sw $ra, 0x10($sp) -/* C5CE40 80242700 0C00EABB */ jal get_npc_unsafe -/* C5CE44 80242704 8C84008C */ lw $a0, 0x8c($a0) -/* C5CE48 80242708 3C038024 */ lui $v1, 0x8024 -/* C5CE4C 8024270C 8C636794 */ lw $v1, 0x6794($v1) -/* C5CE50 80242710 AC430028 */ sw $v1, 0x28($v0) -/* C5CE54 80242714 8FBF0010 */ lw $ra, 0x10($sp) -/* C5CE58 80242718 24020002 */ addiu $v0, $zero, 2 -/* C5CE5C 8024271C 03E00008 */ jr $ra -/* C5CE60 80242720 27BD0018 */ addiu $sp, $sp, 0x18 -/* C5CE64 80242724 00000000 */ nop -/* C5CE68 80242728 00000000 */ nop -/* C5CE6C 8024272C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s new file mode 100644 index 0000000000..0ed28e4e81 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AC20/func_802426F8_C5CE38.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426F8_C5CE38 +/* C5CE38 802426F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C5CE3C 802426FC AFBF0010 */ sw $ra, 0x10($sp) +/* C5CE40 80242700 0C00EABB */ jal get_npc_unsafe +/* C5CE44 80242704 8C84008C */ lw $a0, 0x8c($a0) +/* C5CE48 80242708 3C038024 */ lui $v1, 0x8024 +/* C5CE4C 8024270C 8C636794 */ lw $v1, 0x6794($v1) +/* C5CE50 80242710 AC430028 */ sw $v1, 0x28($v0) +/* C5CE54 80242714 8FBF0010 */ lw $ra, 0x10($sp) +/* C5CE58 80242718 24020002 */ addiu $v0, $zero, 2 +/* C5CE5C 8024271C 03E00008 */ jr $ra +/* C5CE60 80242720 27BD0018 */ addiu $sp, $sp, 0x18 +/* C5CE64 80242724 00000000 */ nop +/* C5CE68 80242728 00000000 */ nop +/* C5CE6C 8024272C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s index ecf4b0b970..f332aaa226 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_802406A4_C613B4.s @@ -232,25 +232,25 @@ glabel func_802406A4_C613B4 .L802409F4: /* C61704 802409F4 0260202D */ daddu $a0, $s3, $zero /* C61708 802409F8 0280282D */ daddu $a1, $s4, $zero -/* C6170C 802409FC 0C0900C4 */ jal func_80240310 +/* C6170C 802409FC 0C0900C4 */ jal func_80240310_C61020 /* C61710 80240A00 02A0302D */ daddu $a2, $s5, $zero /* C61714 80240A04 0260202D */ daddu $a0, $s3, $zero .L80240A08: /* C61718 80240A08 0280282D */ daddu $a1, $s4, $zero -/* C6171C 80240A0C 0C0900E3 */ jal func_8024038C +/* C6171C 80240A0C 0C0900E3 */ jal func_8024038C_C6109C /* C61720 80240A10 02A0302D */ daddu $a2, $s5, $zero /* C61724 80240A14 08090294 */ j .L80240A50 /* C61728 80240A18 00000000 */ nop .L80240A1C: /* C6172C 80240A1C 0260202D */ daddu $a0, $s3, $zero /* C61730 80240A20 0280282D */ daddu $a1, $s4, $zero -/* C61734 80240A24 0C090130 */ jal func_802404C0 +/* C61734 80240A24 0C090130 */ jal func_802404C0_C611D0 /* C61738 80240A28 02A0302D */ daddu $a2, $s5, $zero /* C6173C 80240A2C 08090294 */ j .L80240A50 /* C61740 80240A30 00000000 */ nop .L80240A34: /* C61744 80240A34 0280282D */ daddu $a1, $s4, $zero -/* C61748 80240A38 0C090189 */ jal func_80240624 +/* C61748 80240A38 0C090189 */ jal func_80240624_C61334 /* C6174C 80240A3C 02A0302D */ daddu $a2, $s5, $zero /* C61750 80240A40 08090294 */ j .L80240A50 /* C61754 80240A44 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8.s deleted file mode 100644 index 14d6ff176a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF8 -/* C61908 80240BF8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C6190C 80240BFC AFB10014 */ sw $s1, 0x14($sp) -/* C61910 80240C00 0080882D */ daddu $s1, $a0, $zero -/* C61914 80240C04 AFBF0018 */ sw $ra, 0x18($sp) -/* C61918 80240C08 AFB00010 */ sw $s0, 0x10($sp) -/* C6191C 80240C0C 8E300148 */ lw $s0, 0x148($s1) -/* C61920 80240C10 0C00EABB */ jal get_npc_unsafe -/* C61924 80240C14 86040008 */ lh $a0, 8($s0) -/* C61928 80240C18 24030001 */ addiu $v1, $zero, 1 -/* C6192C 80240C1C 0040202D */ daddu $a0, $v0, $zero -/* C61930 80240C20 AE03006C */ sw $v1, 0x6c($s0) -/* C61934 80240C24 8482008C */ lh $v0, 0x8c($a0) -/* C61938 80240C28 14400009 */ bnez $v0, .L80240C50 -/* C6193C 80240C2C 24020002 */ addiu $v0, $zero, 2 -/* C61940 80240C30 96030072 */ lhu $v1, 0x72($s0) -/* C61944 80240C34 AE02006C */ sw $v0, 0x6c($s0) -/* C61948 80240C38 A483008E */ sh $v1, 0x8e($a0) -/* C6194C 80240C3C 8E0200CC */ lw $v0, 0xcc($s0) -/* C61950 80240C40 8C420020 */ lw $v0, 0x20($v0) -/* C61954 80240C44 AC820028 */ sw $v0, 0x28($a0) -/* C61958 80240C48 2402001F */ addiu $v0, $zero, 0x1f -/* C6195C 80240C4C AE220070 */ sw $v0, 0x70($s1) -.L80240C50: -/* C61960 80240C50 8FBF0018 */ lw $ra, 0x18($sp) -/* C61964 80240C54 8FB10014 */ lw $s1, 0x14($sp) -/* C61968 80240C58 8FB00010 */ lw $s0, 0x10($sp) -/* C6196C 80240C5C 03E00008 */ jr $ra -/* C61970 80240C60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8_C61908.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8_C61908.s new file mode 100644 index 0000000000..534daa5fd1 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240BF8_C61908.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BF8_C61908 +/* C61908 80240BF8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C6190C 80240BFC AFB10014 */ sw $s1, 0x14($sp) +/* C61910 80240C00 0080882D */ daddu $s1, $a0, $zero +/* C61914 80240C04 AFBF0018 */ sw $ra, 0x18($sp) +/* C61918 80240C08 AFB00010 */ sw $s0, 0x10($sp) +/* C6191C 80240C0C 8E300148 */ lw $s0, 0x148($s1) +/* C61920 80240C10 0C00EABB */ jal get_npc_unsafe +/* C61924 80240C14 86040008 */ lh $a0, 8($s0) +/* C61928 80240C18 24030001 */ addiu $v1, $zero, 1 +/* C6192C 80240C1C 0040202D */ daddu $a0, $v0, $zero +/* C61930 80240C20 AE03006C */ sw $v1, 0x6c($s0) +/* C61934 80240C24 8482008C */ lh $v0, 0x8c($a0) +/* C61938 80240C28 14400009 */ bnez $v0, .L80240C50 +/* C6193C 80240C2C 24020002 */ addiu $v0, $zero, 2 +/* C61940 80240C30 96030072 */ lhu $v1, 0x72($s0) +/* C61944 80240C34 AE02006C */ sw $v0, 0x6c($s0) +/* C61948 80240C38 A483008E */ sh $v1, 0x8e($a0) +/* C6194C 80240C3C 8E0200CC */ lw $v0, 0xcc($s0) +/* C61950 80240C40 8C420020 */ lw $v0, 0x20($v0) +/* C61954 80240C44 AC820028 */ sw $v0, 0x28($a0) +/* C61958 80240C48 2402001F */ addiu $v0, $zero, 0x1f +/* C6195C 80240C4C AE220070 */ sw $v0, 0x70($s1) +.L80240C50: +/* C61960 80240C50 8FBF0018 */ lw $ra, 0x18($sp) +/* C61964 80240C54 8FB10014 */ lw $s1, 0x14($sp) +/* C61968 80240C58 8FB00010 */ lw $s0, 0x10($sp) +/* C6196C 80240C5C 03E00008 */ jr $ra +/* C61970 80240C60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4.s deleted file mode 100644 index a18130a9f2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB4 -/* C61CC4 80240FB4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C61CC8 80240FB8 AFB40028 */ sw $s4, 0x28($sp) -/* C61CCC 80240FBC 0080A02D */ daddu $s4, $a0, $zero -/* C61CD0 80240FC0 AFBF002C */ sw $ra, 0x2c($sp) -/* C61CD4 80240FC4 AFB30024 */ sw $s3, 0x24($sp) -/* C61CD8 80240FC8 AFB20020 */ sw $s2, 0x20($sp) -/* C61CDC 80240FCC AFB1001C */ sw $s1, 0x1c($sp) -/* C61CE0 80240FD0 AFB00018 */ sw $s0, 0x18($sp) -/* C61CE4 80240FD4 8E910148 */ lw $s1, 0x148($s4) -/* C61CE8 80240FD8 86240008 */ lh $a0, 8($s1) -/* C61CEC 80240FDC 0C00EABB */ jal get_npc_unsafe -/* C61CF0 80240FE0 00A0802D */ daddu $s0, $a1, $zero -/* C61CF4 80240FE4 16000005 */ bnez $s0, .L80240FFC -/* C61CF8 80240FE8 0040902D */ daddu $s2, $v0, $zero -/* C61CFC 80240FEC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C61D00 80240FF0 30420004 */ andi $v0, $v0, 4 -/* C61D04 80240FF4 10400015 */ beqz $v0, .L8024104C -/* C61D08 80240FF8 00000000 */ nop -.L80240FFC: -/* C61D0C 80240FFC AE800070 */ sw $zero, 0x70($s4) -/* C61D10 80241000 8E420000 */ lw $v0, ($s2) -/* C61D14 80241004 3C031F30 */ lui $v1, 0x1f30 -/* C61D18 80241008 A640008E */ sh $zero, 0x8e($s2) -/* C61D1C 8024100C 34420102 */ ori $v0, $v0, 0x102 -/* C61D20 80241010 AE420000 */ sw $v0, ($s2) -/* C61D24 80241014 8E220000 */ lw $v0, ($s1) -/* C61D28 80241018 3C01C47A */ lui $at, 0xc47a -/* C61D2C 8024101C 44810000 */ mtc1 $at, $f0 -/* C61D30 80241020 00431025 */ or $v0, $v0, $v1 -/* C61D34 80241024 AE220000 */ sw $v0, ($s1) -/* C61D38 80241028 AE400038 */ sw $zero, 0x38($s2) -/* C61D3C 8024102C E640003C */ swc1 $f0, 0x3c($s2) -/* C61D40 80241030 AE400040 */ sw $zero, 0x40($s2) -/* C61D44 80241034 8E2300B0 */ lw $v1, 0xb0($s1) -/* C61D48 80241038 30620004 */ andi $v0, $v1, 4 -/* C61D4C 8024103C 10400003 */ beqz $v0, .L8024104C -/* C61D50 80241040 2402FFFB */ addiu $v0, $zero, -5 -/* C61D54 80241044 00621024 */ and $v0, $v1, $v0 -/* C61D58 80241048 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024104C: -/* C61D5C 8024104C 8E930070 */ lw $s3, 0x70($s4) -/* C61D60 80241050 12600005 */ beqz $s3, .L80241068 -/* C61D64 80241054 24020001 */ addiu $v0, $zero, 1 -/* C61D68 80241058 12620048 */ beq $s3, $v0, .L8024117C -/* C61D6C 8024105C 00000000 */ nop -/* C61D70 80241060 0809047C */ j .L802411F0 -/* C61D74 80241064 00000000 */ nop -.L80241068: -/* C61D78 80241068 86240008 */ lh $a0, 8($s1) -/* C61D7C 8024106C 0C00FB3A */ jal get_enemy -/* C61D80 80241070 2484FFFF */ addiu $a0, $a0, -1 -/* C61D84 80241074 0040802D */ daddu $s0, $v0, $zero -/* C61D88 80241078 0C00EABB */ jal get_npc_unsafe -/* C61D8C 8024107C 86040008 */ lh $a0, 8($s0) -/* C61D90 80241080 24030001 */ addiu $v1, $zero, 1 -/* C61D94 80241084 0040982D */ daddu $s3, $v0, $zero -/* C61D98 80241088 A2230007 */ sb $v1, 7($s1) -/* C61D9C 8024108C 8E03006C */ lw $v1, 0x6c($s0) -/* C61DA0 80241090 24020003 */ addiu $v0, $zero, 3 -/* C61DA4 80241094 14620056 */ bne $v1, $v0, .L802411F0 -/* C61DA8 80241098 00000000 */ nop -/* C61DAC 8024109C 8E2500A8 */ lw $a1, 0xa8($s1) -/* C61DB0 802410A0 10A00003 */ beqz $a1, .L802410B0 -/* C61DB4 802410A4 0260202D */ daddu $a0, $s3, $zero -/* C61DB8 802410A8 0C012530 */ jal func_800494C0 -/* C61DBC 802410AC 0000302D */ daddu $a2, $zero, $zero -.L802410B0: -/* C61DC0 802410B0 27A40010 */ addiu $a0, $sp, 0x10 -/* C61DC4 802410B4 C6280070 */ lwc1 $f8, 0x70($s1) -/* C61DC8 802410B8 46804220 */ cvt.s.w $f8, $f8 -/* C61DCC 802410BC C6620034 */ lwc1 $f2, 0x34($s3) -/* C61DD0 802410C0 3C014387 */ lui $at, 0x4387 -/* C61DD4 802410C4 44810000 */ mtc1 $at, $f0 -/* C61DD8 802410C8 44064000 */ mfc1 $a2, $f8 -/* C61DDC 802410CC 46020001 */ sub.s $f0, $f0, $f2 -/* C61DE0 802410D0 C6660038 */ lwc1 $f6, 0x38($s3) -/* C61DE4 802410D4 C6640040 */ lwc1 $f4, 0x40($s3) -/* C61DE8 802410D8 44070000 */ mfc1 $a3, $f0 -/* C61DEC 802410DC 27A50014 */ addiu $a1, $sp, 0x14 -/* C61DF0 802410E0 E7A60010 */ swc1 $f6, 0x10($sp) -/* C61DF4 802410E4 0C00A7E7 */ jal add_vec2D_polar -/* C61DF8 802410E8 E7A40014 */ swc1 $f4, 0x14($sp) -/* C61DFC 802410EC C7A00010 */ lwc1 $f0, 0x10($sp) -/* C61E00 802410F0 4600020D */ trunc.w.s $f8, $f0 -/* C61E04 802410F4 44024000 */ mfc1 $v0, $f8 -/* C61E08 802410F8 E6400038 */ swc1 $f0, 0x38($s2) -/* C61E0C 802410FC A6220010 */ sh $v0, 0x10($s1) -/* C61E10 80241100 C660003C */ lwc1 $f0, 0x3c($s3) -/* C61E14 80241104 C622006C */ lwc1 $f2, 0x6c($s1) -/* C61E18 80241108 468010A0 */ cvt.s.w $f2, $f2 -/* C61E1C 8024110C 46020000 */ add.s $f0, $f0, $f2 -/* C61E20 80241110 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C61E24 80241114 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C61E28 80241118 E640003C */ swc1 $f0, 0x3c($s2) -/* C61E2C 8024111C C7A20014 */ lwc1 $f2, 0x14($sp) -/* C61E30 80241120 4600020D */ trunc.w.s $f8, $f0 -/* C61E34 80241124 44024000 */ mfc1 $v0, $f8 -/* C61E38 80241128 00000000 */ nop -/* C61E3C 8024112C A6220012 */ sh $v0, 0x12($s1) -/* C61E40 80241130 4600120D */ trunc.w.s $f8, $f2 -/* C61E44 80241134 44024000 */ mfc1 $v0, $f8 -/* C61E48 80241138 E6420040 */ swc1 $f2, 0x40($s2) -/* C61E4C 8024113C A6220014 */ sh $v0, 0x14($s1) -/* C61E50 80241140 8C660028 */ lw $a2, 0x28($v1) -/* C61E54 80241144 8C670030 */ lw $a3, 0x30($v1) -/* C61E58 80241148 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C61E5C 8024114C 0C00A720 */ jal atan2 -/* C61E60 80241150 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C61E64 80241154 3C03E0EF */ lui $v1, 0xe0ef -/* C61E68 80241158 E640000C */ swc1 $f0, 0xc($s2) -/* C61E6C 8024115C 8E220000 */ lw $v0, ($s1) -/* C61E70 80241160 3463FFFF */ ori $v1, $v1, 0xffff -/* C61E74 80241164 00431024 */ and $v0, $v0, $v1 -/* C61E78 80241168 AE220000 */ sw $v0, ($s1) -/* C61E7C 8024116C 24020001 */ addiu $v0, $zero, 1 -/* C61E80 80241170 A640008E */ sh $zero, 0x8e($s2) -/* C61E84 80241174 0809047C */ j .L802411F0 -/* C61E88 80241178 AE820070 */ sw $v0, 0x70($s4) -.L8024117C: -/* C61E8C 8024117C 86240008 */ lh $a0, 8($s1) -/* C61E90 80241180 0C00FB3A */ jal get_enemy -/* C61E94 80241184 2484FFFF */ addiu $a0, $a0, -1 -/* C61E98 80241188 0040802D */ daddu $s0, $v0, $zero -/* C61E9C 8024118C 0C00EABB */ jal get_npc_unsafe -/* C61EA0 80241190 86040008 */ lh $a0, 8($s0) -/* C61EA4 80241194 9642008E */ lhu $v0, 0x8e($s2) -/* C61EA8 80241198 24420001 */ addiu $v0, $v0, 1 -/* C61EAC 8024119C A642008E */ sh $v0, 0x8e($s2) -/* C61EB0 802411A0 00021400 */ sll $v0, $v0, 0x10 -/* C61EB4 802411A4 8E23007C */ lw $v1, 0x7c($s1) -/* C61EB8 802411A8 00021403 */ sra $v0, $v0, 0x10 -/* C61EBC 802411AC 0043102A */ slt $v0, $v0, $v1 -/* C61EC0 802411B0 50400001 */ beql $v0, $zero, .L802411B8 -/* C61EC4 802411B4 A2200007 */ sb $zero, 7($s1) -.L802411B8: -/* C61EC8 802411B8 8E03006C */ lw $v1, 0x6c($s0) -/* C61ECC 802411BC 24020004 */ addiu $v0, $zero, 4 -/* C61ED0 802411C0 1462000B */ bne $v1, $v0, .L802411F0 -/* C61ED4 802411C4 3C021F10 */ lui $v0, 0x1f10 -/* C61ED8 802411C8 8E230000 */ lw $v1, ($s1) -/* C61EDC 802411CC 3C01C47A */ lui $at, 0xc47a -/* C61EE0 802411D0 44810000 */ mtc1 $at, $f0 -/* C61EE4 802411D4 00621825 */ or $v1, $v1, $v0 -/* C61EE8 802411D8 AE230000 */ sw $v1, ($s1) -/* C61EEC 802411DC AE400038 */ sw $zero, 0x38($s2) -/* C61EF0 802411E0 E640003C */ swc1 $f0, 0x3c($s2) -/* C61EF4 802411E4 AE400040 */ sw $zero, 0x40($s2) -/* C61EF8 802411E8 A2330007 */ sb $s3, 7($s1) -/* C61EFC 802411EC AE800070 */ sw $zero, 0x70($s4) -.L802411F0: -/* C61F00 802411F0 8FBF002C */ lw $ra, 0x2c($sp) -/* C61F04 802411F4 8FB40028 */ lw $s4, 0x28($sp) -/* C61F08 802411F8 8FB30024 */ lw $s3, 0x24($sp) -/* C61F0C 802411FC 8FB20020 */ lw $s2, 0x20($sp) -/* C61F10 80241200 8FB1001C */ lw $s1, 0x1c($sp) -/* C61F14 80241204 8FB00018 */ lw $s0, 0x18($sp) -/* C61F18 80241208 0000102D */ daddu $v0, $zero, $zero -/* C61F1C 8024120C 03E00008 */ jr $ra -/* C61F20 80241210 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s new file mode 100644 index 0000000000..f951b1cfb9 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80240FB4_C61CC4.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FB4_C61CC4 +/* C61CC4 80240FB4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C61CC8 80240FB8 AFB40028 */ sw $s4, 0x28($sp) +/* C61CCC 80240FBC 0080A02D */ daddu $s4, $a0, $zero +/* C61CD0 80240FC0 AFBF002C */ sw $ra, 0x2c($sp) +/* C61CD4 80240FC4 AFB30024 */ sw $s3, 0x24($sp) +/* C61CD8 80240FC8 AFB20020 */ sw $s2, 0x20($sp) +/* C61CDC 80240FCC AFB1001C */ sw $s1, 0x1c($sp) +/* C61CE0 80240FD0 AFB00018 */ sw $s0, 0x18($sp) +/* C61CE4 80240FD4 8E910148 */ lw $s1, 0x148($s4) +/* C61CE8 80240FD8 86240008 */ lh $a0, 8($s1) +/* C61CEC 80240FDC 0C00EABB */ jal get_npc_unsafe +/* C61CF0 80240FE0 00A0802D */ daddu $s0, $a1, $zero +/* C61CF4 80240FE4 16000005 */ bnez $s0, .L80240FFC +/* C61CF8 80240FE8 0040902D */ daddu $s2, $v0, $zero +/* C61CFC 80240FEC 8E2200B0 */ lw $v0, 0xb0($s1) +/* C61D00 80240FF0 30420004 */ andi $v0, $v0, 4 +/* C61D04 80240FF4 10400015 */ beqz $v0, .L8024104C +/* C61D08 80240FF8 00000000 */ nop +.L80240FFC: +/* C61D0C 80240FFC AE800070 */ sw $zero, 0x70($s4) +/* C61D10 80241000 8E420000 */ lw $v0, ($s2) +/* C61D14 80241004 3C031F30 */ lui $v1, 0x1f30 +/* C61D18 80241008 A640008E */ sh $zero, 0x8e($s2) +/* C61D1C 8024100C 34420102 */ ori $v0, $v0, 0x102 +/* C61D20 80241010 AE420000 */ sw $v0, ($s2) +/* C61D24 80241014 8E220000 */ lw $v0, ($s1) +/* C61D28 80241018 3C01C47A */ lui $at, 0xc47a +/* C61D2C 8024101C 44810000 */ mtc1 $at, $f0 +/* C61D30 80241020 00431025 */ or $v0, $v0, $v1 +/* C61D34 80241024 AE220000 */ sw $v0, ($s1) +/* C61D38 80241028 AE400038 */ sw $zero, 0x38($s2) +/* C61D3C 8024102C E640003C */ swc1 $f0, 0x3c($s2) +/* C61D40 80241030 AE400040 */ sw $zero, 0x40($s2) +/* C61D44 80241034 8E2300B0 */ lw $v1, 0xb0($s1) +/* C61D48 80241038 30620004 */ andi $v0, $v1, 4 +/* C61D4C 8024103C 10400003 */ beqz $v0, .L8024104C +/* C61D50 80241040 2402FFFB */ addiu $v0, $zero, -5 +/* C61D54 80241044 00621024 */ and $v0, $v1, $v0 +/* C61D58 80241048 AE2200B0 */ sw $v0, 0xb0($s1) +.L8024104C: +/* C61D5C 8024104C 8E930070 */ lw $s3, 0x70($s4) +/* C61D60 80241050 12600005 */ beqz $s3, .L80241068 +/* C61D64 80241054 24020001 */ addiu $v0, $zero, 1 +/* C61D68 80241058 12620048 */ beq $s3, $v0, .L8024117C +/* C61D6C 8024105C 00000000 */ nop +/* C61D70 80241060 0809047C */ j .L802411F0 +/* C61D74 80241064 00000000 */ nop +.L80241068: +/* C61D78 80241068 86240008 */ lh $a0, 8($s1) +/* C61D7C 8024106C 0C00FB3A */ jal get_enemy +/* C61D80 80241070 2484FFFF */ addiu $a0, $a0, -1 +/* C61D84 80241074 0040802D */ daddu $s0, $v0, $zero +/* C61D88 80241078 0C00EABB */ jal get_npc_unsafe +/* C61D8C 8024107C 86040008 */ lh $a0, 8($s0) +/* C61D90 80241080 24030001 */ addiu $v1, $zero, 1 +/* C61D94 80241084 0040982D */ daddu $s3, $v0, $zero +/* C61D98 80241088 A2230007 */ sb $v1, 7($s1) +/* C61D9C 8024108C 8E03006C */ lw $v1, 0x6c($s0) +/* C61DA0 80241090 24020003 */ addiu $v0, $zero, 3 +/* C61DA4 80241094 14620056 */ bne $v1, $v0, .L802411F0 +/* C61DA8 80241098 00000000 */ nop +/* C61DAC 8024109C 8E2500A8 */ lw $a1, 0xa8($s1) +/* C61DB0 802410A0 10A00003 */ beqz $a1, .L802410B0 +/* C61DB4 802410A4 0260202D */ daddu $a0, $s3, $zero +/* C61DB8 802410A8 0C012530 */ jal func_800494C0 +/* C61DBC 802410AC 0000302D */ daddu $a2, $zero, $zero +.L802410B0: +/* C61DC0 802410B0 27A40010 */ addiu $a0, $sp, 0x10 +/* C61DC4 802410B4 C6280070 */ lwc1 $f8, 0x70($s1) +/* C61DC8 802410B8 46804220 */ cvt.s.w $f8, $f8 +/* C61DCC 802410BC C6620034 */ lwc1 $f2, 0x34($s3) +/* C61DD0 802410C0 3C014387 */ lui $at, 0x4387 +/* C61DD4 802410C4 44810000 */ mtc1 $at, $f0 +/* C61DD8 802410C8 44064000 */ mfc1 $a2, $f8 +/* C61DDC 802410CC 46020001 */ sub.s $f0, $f0, $f2 +/* C61DE0 802410D0 C6660038 */ lwc1 $f6, 0x38($s3) +/* C61DE4 802410D4 C6640040 */ lwc1 $f4, 0x40($s3) +/* C61DE8 802410D8 44070000 */ mfc1 $a3, $f0 +/* C61DEC 802410DC 27A50014 */ addiu $a1, $sp, 0x14 +/* C61DF0 802410E0 E7A60010 */ swc1 $f6, 0x10($sp) +/* C61DF4 802410E4 0C00A7E7 */ jal add_vec2D_polar +/* C61DF8 802410E8 E7A40014 */ swc1 $f4, 0x14($sp) +/* C61DFC 802410EC C7A00010 */ lwc1 $f0, 0x10($sp) +/* C61E00 802410F0 4600020D */ trunc.w.s $f8, $f0 +/* C61E04 802410F4 44024000 */ mfc1 $v0, $f8 +/* C61E08 802410F8 E6400038 */ swc1 $f0, 0x38($s2) +/* C61E0C 802410FC A6220010 */ sh $v0, 0x10($s1) +/* C61E10 80241100 C660003C */ lwc1 $f0, 0x3c($s3) +/* C61E14 80241104 C622006C */ lwc1 $f2, 0x6c($s1) +/* C61E18 80241108 468010A0 */ cvt.s.w $f2, $f2 +/* C61E1C 8024110C 46020000 */ add.s $f0, $f0, $f2 +/* C61E20 80241110 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) +/* C61E24 80241114 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) +/* C61E28 80241118 E640003C */ swc1 $f0, 0x3c($s2) +/* C61E2C 8024111C C7A20014 */ lwc1 $f2, 0x14($sp) +/* C61E30 80241120 4600020D */ trunc.w.s $f8, $f0 +/* C61E34 80241124 44024000 */ mfc1 $v0, $f8 +/* C61E38 80241128 00000000 */ nop +/* C61E3C 8024112C A6220012 */ sh $v0, 0x12($s1) +/* C61E40 80241130 4600120D */ trunc.w.s $f8, $f2 +/* C61E44 80241134 44024000 */ mfc1 $v0, $f8 +/* C61E48 80241138 E6420040 */ swc1 $f2, 0x40($s2) +/* C61E4C 8024113C A6220014 */ sh $v0, 0x14($s1) +/* C61E50 80241140 8C660028 */ lw $a2, 0x28($v1) +/* C61E54 80241144 8C670030 */ lw $a3, 0x30($v1) +/* C61E58 80241148 C64C0038 */ lwc1 $f12, 0x38($s2) +/* C61E5C 8024114C 0C00A720 */ jal atan2 +/* C61E60 80241150 C64E0040 */ lwc1 $f14, 0x40($s2) +/* C61E64 80241154 3C03E0EF */ lui $v1, 0xe0ef +/* C61E68 80241158 E640000C */ swc1 $f0, 0xc($s2) +/* C61E6C 8024115C 8E220000 */ lw $v0, ($s1) +/* C61E70 80241160 3463FFFF */ ori $v1, $v1, 0xffff +/* C61E74 80241164 00431024 */ and $v0, $v0, $v1 +/* C61E78 80241168 AE220000 */ sw $v0, ($s1) +/* C61E7C 8024116C 24020001 */ addiu $v0, $zero, 1 +/* C61E80 80241170 A640008E */ sh $zero, 0x8e($s2) +/* C61E84 80241174 0809047C */ j .L802411F0 +/* C61E88 80241178 AE820070 */ sw $v0, 0x70($s4) +.L8024117C: +/* C61E8C 8024117C 86240008 */ lh $a0, 8($s1) +/* C61E90 80241180 0C00FB3A */ jal get_enemy +/* C61E94 80241184 2484FFFF */ addiu $a0, $a0, -1 +/* C61E98 80241188 0040802D */ daddu $s0, $v0, $zero +/* C61E9C 8024118C 0C00EABB */ jal get_npc_unsafe +/* C61EA0 80241190 86040008 */ lh $a0, 8($s0) +/* C61EA4 80241194 9642008E */ lhu $v0, 0x8e($s2) +/* C61EA8 80241198 24420001 */ addiu $v0, $v0, 1 +/* C61EAC 8024119C A642008E */ sh $v0, 0x8e($s2) +/* C61EB0 802411A0 00021400 */ sll $v0, $v0, 0x10 +/* C61EB4 802411A4 8E23007C */ lw $v1, 0x7c($s1) +/* C61EB8 802411A8 00021403 */ sra $v0, $v0, 0x10 +/* C61EBC 802411AC 0043102A */ slt $v0, $v0, $v1 +/* C61EC0 802411B0 50400001 */ beql $v0, $zero, .L802411B8 +/* C61EC4 802411B4 A2200007 */ sb $zero, 7($s1) +.L802411B8: +/* C61EC8 802411B8 8E03006C */ lw $v1, 0x6c($s0) +/* C61ECC 802411BC 24020004 */ addiu $v0, $zero, 4 +/* C61ED0 802411C0 1462000B */ bne $v1, $v0, .L802411F0 +/* C61ED4 802411C4 3C021F10 */ lui $v0, 0x1f10 +/* C61ED8 802411C8 8E230000 */ lw $v1, ($s1) +/* C61EDC 802411CC 3C01C47A */ lui $at, 0xc47a +/* C61EE0 802411D0 44810000 */ mtc1 $at, $f0 +/* C61EE4 802411D4 00621825 */ or $v1, $v1, $v0 +/* C61EE8 802411D8 AE230000 */ sw $v1, ($s1) +/* C61EEC 802411DC AE400038 */ sw $zero, 0x38($s2) +/* C61EF0 802411E0 E640003C */ swc1 $f0, 0x3c($s2) +/* C61EF4 802411E4 AE400040 */ sw $zero, 0x40($s2) +/* C61EF8 802411E8 A2330007 */ sb $s3, 7($s1) +/* C61EFC 802411EC AE800070 */ sw $zero, 0x70($s4) +.L802411F0: +/* C61F00 802411F0 8FBF002C */ lw $ra, 0x2c($sp) +/* C61F04 802411F4 8FB40028 */ lw $s4, 0x28($sp) +/* C61F08 802411F8 8FB30024 */ lw $s3, 0x24($sp) +/* C61F0C 802411FC 8FB20020 */ lw $s2, 0x20($sp) +/* C61F10 80241200 8FB1001C */ lw $s1, 0x1c($sp) +/* C61F14 80241204 8FB00018 */ lw $s0, 0x18($sp) +/* C61F18 80241208 0000102D */ daddu $v0, $zero, $zero +/* C61F1C 8024120C 03E00008 */ jr $ra +/* C61F20 80241210 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s index b04bfe50d2..2531131767 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241214_C61F24.s @@ -90,7 +90,7 @@ glabel func_80241214_C61F24 /* C62064 80241354 8E22006C */ lw $v0, 0x6c($s1) /* C62068 80241358 14400006 */ bnez $v0, .L80241374 /* C6206C 8024135C 00000000 */ nop -/* C62070 80241360 0C090380 */ jal func_80240E00 +/* C62070 80241360 0C090380 */ jal func_80240E00_C61B10 /* C62074 80241364 0240202D */ daddu $a0, $s2, $zero /* C62078 80241368 10400002 */ beqz $v0, .L80241374 /* C6207C 8024136C 2402001E */ addiu $v0, $zero, 0x1e @@ -151,15 +151,15 @@ glabel func_80241214_C61F24 /* C62154 80241444 0280302D */ daddu $a2, $s4, $zero /* C62158 80241448 08090528 */ j .L802414A0 /* C6215C 8024144C 00000000 */ nop -/* C62160 80241450 0C0902FE */ jal func_80240BF8 +/* C62160 80241450 0C0902FE */ jal func_80240BF8_C61908 /* C62164 80241454 0240202D */ daddu $a0, $s2, $zero -/* C62168 80241458 0C090319 */ jal func_80240C64 +/* C62168 80241458 0C090319 */ jal func_80240C64_C61974 /* C6216C 8024145C 0240202D */ daddu $a0, $s2, $zero /* C62170 80241460 8E430070 */ lw $v1, 0x70($s2) /* C62174 80241464 24020020 */ addiu $v0, $zero, 0x20 /* C62178 80241468 1462000D */ bne $v1, $v0, .L802414A0 /* C6217C 8024146C 00000000 */ nop -/* C62180 80241470 0C090335 */ jal func_80240CD4 +/* C62180 80241470 0C090335 */ jal func_80240CD4_C619E4 /* C62184 80241474 0240202D */ daddu $a0, $s2, $zero /* C62188 80241478 8E430070 */ lw $v1, 0x70($s2) /* C6218C 8024147C 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534.s deleted file mode 100644 index df311e6ae3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241534 -/* C62244 80241534 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C62248 80241538 AFB3003C */ sw $s3, 0x3c($sp) -/* C6224C 8024153C 0080982D */ daddu $s3, $a0, $zero -/* C62250 80241540 AFBF0040 */ sw $ra, 0x40($sp) -/* C62254 80241544 AFB20038 */ sw $s2, 0x38($sp) -/* C62258 80241548 AFB10034 */ sw $s1, 0x34($sp) -/* C6225C 8024154C AFB00030 */ sw $s0, 0x30($sp) -/* C62260 80241550 8E720148 */ lw $s2, 0x148($s3) -/* C62264 80241554 00A0882D */ daddu $s1, $a1, $zero -/* C62268 80241558 86440008 */ lh $a0, 8($s2) -/* C6226C 8024155C 0C00EABB */ jal get_npc_unsafe -/* C62270 80241560 00C0802D */ daddu $s0, $a2, $zero -/* C62274 80241564 0200202D */ daddu $a0, $s0, $zero -/* C62278 80241568 0240282D */ daddu $a1, $s2, $zero -/* C6227C 8024156C AFA00010 */ sw $zero, 0x10($sp) -/* C62280 80241570 8E26000C */ lw $a2, 0xc($s1) -/* C62284 80241574 8E270010 */ lw $a3, 0x10($s1) -/* C62288 80241578 0C01242D */ jal func_800490B4 -/* C6228C 8024157C 0040882D */ daddu $s1, $v0, $zero -/* C62290 80241580 10400024 */ beqz $v0, .L80241614 -/* C62294 80241584 0220202D */ daddu $a0, $s1, $zero -/* C62298 80241588 24050322 */ addiu $a1, $zero, 0x322 -/* C6229C 8024158C 0C012530 */ jal func_800494C0 -/* C622A0 80241590 0000302D */ daddu $a2, $zero, $zero -/* C622A4 80241594 0000202D */ daddu $a0, $zero, $zero -/* C622A8 80241598 0220282D */ daddu $a1, $s1, $zero -/* C622AC 8024159C 0000302D */ daddu $a2, $zero, $zero -/* C622B0 802415A0 2410000A */ addiu $s0, $zero, 0xa -/* C622B4 802415A4 862300A8 */ lh $v1, 0xa8($s1) -/* C622B8 802415A8 3C013F80 */ lui $at, 0x3f80 -/* C622BC 802415AC 44810000 */ mtc1 $at, $f0 -/* C622C0 802415B0 3C014000 */ lui $at, 0x4000 -/* C622C4 802415B4 44811000 */ mtc1 $at, $f2 -/* C622C8 802415B8 3C01C1A0 */ lui $at, 0xc1a0 -/* C622CC 802415BC 44812000 */ mtc1 $at, $f4 -/* C622D0 802415C0 44833000 */ mtc1 $v1, $f6 -/* C622D4 802415C4 00000000 */ nop -/* C622D8 802415C8 468031A0 */ cvt.s.w $f6, $f6 -/* C622DC 802415CC 44073000 */ mfc1 $a3, $f6 -/* C622E0 802415D0 27A20028 */ addiu $v0, $sp, 0x28 -/* C622E4 802415D4 AFB0001C */ sw $s0, 0x1c($sp) -/* C622E8 802415D8 AFA20020 */ sw $v0, 0x20($sp) -/* C622EC 802415DC E7A00010 */ swc1 $f0, 0x10($sp) -/* C622F0 802415E0 E7A20014 */ swc1 $f2, 0x14($sp) -/* C622F4 802415E4 0C01BFA4 */ jal fx_emote -/* C622F8 802415E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C622FC 802415EC 0220202D */ daddu $a0, $s1, $zero -/* C62300 802415F0 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C62304 802415F4 0C012530 */ jal func_800494C0 -/* C62308 802415F8 3C060020 */ lui $a2, 0x20 -/* C6230C 802415FC 8E4200CC */ lw $v0, 0xcc($s2) -/* C62310 80241600 8C420020 */ lw $v0, 0x20($v0) -/* C62314 80241604 AE220028 */ sw $v0, 0x28($s1) -/* C62318 80241608 9642008E */ lhu $v0, 0x8e($s2) -/* C6231C 8024160C A622008E */ sh $v0, 0x8e($s1) -/* C62320 80241610 AE700070 */ sw $s0, 0x70($s3) -.L80241614: -/* C62324 80241614 8FBF0040 */ lw $ra, 0x40($sp) -/* C62328 80241618 8FB3003C */ lw $s3, 0x3c($sp) -/* C6232C 8024161C 8FB20038 */ lw $s2, 0x38($sp) -/* C62330 80241620 8FB10034 */ lw $s1, 0x34($sp) -/* C62334 80241624 8FB00030 */ lw $s0, 0x30($sp) -/* C62338 80241628 03E00008 */ jr $ra -/* C6233C 8024162C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s new file mode 100644 index 0000000000..25fee5fc94 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80241534_C62244.s @@ -0,0 +1,68 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241534_C62244 +/* C62244 80241534 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C62248 80241538 AFB3003C */ sw $s3, 0x3c($sp) +/* C6224C 8024153C 0080982D */ daddu $s3, $a0, $zero +/* C62250 80241540 AFBF0040 */ sw $ra, 0x40($sp) +/* C62254 80241544 AFB20038 */ sw $s2, 0x38($sp) +/* C62258 80241548 AFB10034 */ sw $s1, 0x34($sp) +/* C6225C 8024154C AFB00030 */ sw $s0, 0x30($sp) +/* C62260 80241550 8E720148 */ lw $s2, 0x148($s3) +/* C62264 80241554 00A0882D */ daddu $s1, $a1, $zero +/* C62268 80241558 86440008 */ lh $a0, 8($s2) +/* C6226C 8024155C 0C00EABB */ jal get_npc_unsafe +/* C62270 80241560 00C0802D */ daddu $s0, $a2, $zero +/* C62274 80241564 0200202D */ daddu $a0, $s0, $zero +/* C62278 80241568 0240282D */ daddu $a1, $s2, $zero +/* C6227C 8024156C AFA00010 */ sw $zero, 0x10($sp) +/* C62280 80241570 8E26000C */ lw $a2, 0xc($s1) +/* C62284 80241574 8E270010 */ lw $a3, 0x10($s1) +/* C62288 80241578 0C01242D */ jal func_800490B4 +/* C6228C 8024157C 0040882D */ daddu $s1, $v0, $zero +/* C62290 80241580 10400024 */ beqz $v0, .L80241614 +/* C62294 80241584 0220202D */ daddu $a0, $s1, $zero +/* C62298 80241588 24050322 */ addiu $a1, $zero, 0x322 +/* C6229C 8024158C 0C012530 */ jal func_800494C0 +/* C622A0 80241590 0000302D */ daddu $a2, $zero, $zero +/* C622A4 80241594 0000202D */ daddu $a0, $zero, $zero +/* C622A8 80241598 0220282D */ daddu $a1, $s1, $zero +/* C622AC 8024159C 0000302D */ daddu $a2, $zero, $zero +/* C622B0 802415A0 2410000A */ addiu $s0, $zero, 0xa +/* C622B4 802415A4 862300A8 */ lh $v1, 0xa8($s1) +/* C622B8 802415A8 3C013F80 */ lui $at, 0x3f80 +/* C622BC 802415AC 44810000 */ mtc1 $at, $f0 +/* C622C0 802415B0 3C014000 */ lui $at, 0x4000 +/* C622C4 802415B4 44811000 */ mtc1 $at, $f2 +/* C622C8 802415B8 3C01C1A0 */ lui $at, 0xc1a0 +/* C622CC 802415BC 44812000 */ mtc1 $at, $f4 +/* C622D0 802415C0 44833000 */ mtc1 $v1, $f6 +/* C622D4 802415C4 00000000 */ nop +/* C622D8 802415C8 468031A0 */ cvt.s.w $f6, $f6 +/* C622DC 802415CC 44073000 */ mfc1 $a3, $f6 +/* C622E0 802415D0 27A20028 */ addiu $v0, $sp, 0x28 +/* C622E4 802415D4 AFB0001C */ sw $s0, 0x1c($sp) +/* C622E8 802415D8 AFA20020 */ sw $v0, 0x20($sp) +/* C622EC 802415DC E7A00010 */ swc1 $f0, 0x10($sp) +/* C622F0 802415E0 E7A20014 */ swc1 $f2, 0x14($sp) +/* C622F4 802415E4 0C01BFA4 */ jal fx_emote +/* C622F8 802415E8 E7A40018 */ swc1 $f4, 0x18($sp) +/* C622FC 802415EC 0220202D */ daddu $a0, $s1, $zero +/* C62300 802415F0 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C62304 802415F4 0C012530 */ jal func_800494C0 +/* C62308 802415F8 3C060020 */ lui $a2, 0x20 +/* C6230C 802415FC 8E4200CC */ lw $v0, 0xcc($s2) +/* C62310 80241600 8C420020 */ lw $v0, 0x20($v0) +/* C62314 80241604 AE220028 */ sw $v0, 0x28($s1) +/* C62318 80241608 9642008E */ lhu $v0, 0x8e($s2) +/* C6231C 8024160C A622008E */ sh $v0, 0x8e($s1) +/* C62320 80241610 AE700070 */ sw $s0, 0x70($s3) +.L80241614: +/* C62324 80241614 8FBF0040 */ lw $ra, 0x40($sp) +/* C62328 80241618 8FB3003C */ lw $s3, 0x3c($sp) +/* C6232C 8024161C 8FB20038 */ lw $s2, 0x38($sp) +/* C62330 80241620 8FB10034 */ lw $s1, 0x34($sp) +/* C62334 80241624 8FB00030 */ lw $s0, 0x30($sp) +/* C62338 80241628 03E00008 */ jr $ra +/* C6233C 8024162C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100.s deleted file mode 100644 index 4f101f6a32..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242100 -/* C62E10 80242100 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C62E14 80242104 AFB10034 */ sw $s1, 0x34($sp) -/* C62E18 80242108 0080882D */ daddu $s1, $a0, $zero -/* C62E1C 8024210C AFBF0038 */ sw $ra, 0x38($sp) -/* C62E20 80242110 AFB00030 */ sw $s0, 0x30($sp) -/* C62E24 80242114 8E300148 */ lw $s0, 0x148($s1) -/* C62E28 80242118 0C00EABB */ jal get_npc_unsafe -/* C62E2C 8024211C 86040008 */ lh $a0, 8($s0) -/* C62E30 80242120 0040282D */ daddu $a1, $v0, $zero -/* C62E34 80242124 94A2008E */ lhu $v0, 0x8e($a1) -/* C62E38 80242128 24420001 */ addiu $v0, $v0, 1 -/* C62E3C 8024212C A4A2008E */ sh $v0, 0x8e($a1) -/* C62E40 80242130 00021400 */ sll $v0, $v0, 0x10 -/* C62E44 80242134 8E0300A0 */ lw $v1, 0xa0($s0) -/* C62E48 80242138 00021403 */ sra $v0, $v0, 0x10 -/* C62E4C 8024213C 14430004 */ bne $v0, $v1, .L80242150 -/* C62E50 80242140 00000000 */ nop -/* C62E54 80242144 8E0200CC */ lw $v0, 0xcc($s0) -/* C62E58 80242148 8C42002C */ lw $v0, 0x2c($v0) -/* C62E5C 8024214C ACA20028 */ sw $v0, 0x28($a1) -.L80242150: -/* C62E60 80242150 84A3008E */ lh $v1, 0x8e($a1) -/* C62E64 80242154 8E0200A4 */ lw $v0, 0xa4($s0) -/* C62E68 80242158 14620002 */ bne $v1, $v0, .L80242164 -/* C62E6C 8024215C 24020003 */ addiu $v0, $zero, 3 -/* C62E70 80242160 AE02006C */ sw $v0, 0x6c($s0) -.L80242164: -/* C62E74 80242164 84A2008E */ lh $v0, 0x8e($a1) -/* C62E78 80242168 8E03009C */ lw $v1, 0x9c($s0) -/* C62E7C 8024216C 0043102A */ slt $v0, $v0, $v1 -/* C62E80 80242170 1440001E */ bnez $v0, .L802421EC -/* C62E84 80242174 24020004 */ addiu $v0, $zero, 4 -/* C62E88 80242178 AE02006C */ sw $v0, 0x6c($s0) -/* C62E8C 8024217C 24020008 */ addiu $v0, $zero, 8 -/* C62E90 80242180 24040003 */ addiu $a0, $zero, 3 -/* C62E94 80242184 A4A2008E */ sh $v0, 0x8e($a1) -/* C62E98 80242188 8E0200CC */ lw $v0, 0xcc($s0) -/* C62E9C 8024218C 84A300A8 */ lh $v1, 0xa8($a1) -/* C62EA0 80242190 3C013F80 */ lui $at, 0x3f80 -/* C62EA4 80242194 44810000 */ mtc1 $at, $f0 -/* C62EA8 80242198 3C014000 */ lui $at, 0x4000 -/* C62EAC 8024219C 44811000 */ mtc1 $at, $f2 -/* C62EB0 802421A0 3C01C1A0 */ lui $at, 0xc1a0 -/* C62EB4 802421A4 44812000 */ mtc1 $at, $f4 -/* C62EB8 802421A8 44833000 */ mtc1 $v1, $f6 -/* C62EBC 802421AC 00000000 */ nop -/* C62EC0 802421B0 468031A0 */ cvt.s.w $f6, $f6 -/* C62EC4 802421B4 8C420000 */ lw $v0, ($v0) -/* C62EC8 802421B8 44073000 */ mfc1 $a3, $f6 -/* C62ECC 802421BC 0000302D */ daddu $a2, $zero, $zero -/* C62ED0 802421C0 ACA20028 */ sw $v0, 0x28($a1) -/* C62ED4 802421C4 2402000A */ addiu $v0, $zero, 0xa -/* C62ED8 802421C8 AFA2001C */ sw $v0, 0x1c($sp) -/* C62EDC 802421CC 27A20028 */ addiu $v0, $sp, 0x28 -/* C62EE0 802421D0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C62EE4 802421D4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C62EE8 802421D8 E7A40018 */ swc1 $f4, 0x18($sp) -/* C62EEC 802421DC 0C01BFA4 */ jal fx_emote -/* C62EF0 802421E0 AFA20020 */ sw $v0, 0x20($sp) -/* C62EF4 802421E4 2402000D */ addiu $v0, $zero, 0xd -/* C62EF8 802421E8 AE220070 */ sw $v0, 0x70($s1) -.L802421EC: -/* C62EFC 802421EC 8FBF0038 */ lw $ra, 0x38($sp) -/* C62F00 802421F0 8FB10034 */ lw $s1, 0x34($sp) -/* C62F04 802421F4 8FB00030 */ lw $s0, 0x30($sp) -/* C62F08 802421F8 03E00008 */ jr $ra -/* C62F0C 802421FC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s new file mode 100644 index 0000000000..307d2cead7 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242100_C62E10.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242100_C62E10 +/* C62E10 80242100 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* C62E14 80242104 AFB10034 */ sw $s1, 0x34($sp) +/* C62E18 80242108 0080882D */ daddu $s1, $a0, $zero +/* C62E1C 8024210C AFBF0038 */ sw $ra, 0x38($sp) +/* C62E20 80242110 AFB00030 */ sw $s0, 0x30($sp) +/* C62E24 80242114 8E300148 */ lw $s0, 0x148($s1) +/* C62E28 80242118 0C00EABB */ jal get_npc_unsafe +/* C62E2C 8024211C 86040008 */ lh $a0, 8($s0) +/* C62E30 80242120 0040282D */ daddu $a1, $v0, $zero +/* C62E34 80242124 94A2008E */ lhu $v0, 0x8e($a1) +/* C62E38 80242128 24420001 */ addiu $v0, $v0, 1 +/* C62E3C 8024212C A4A2008E */ sh $v0, 0x8e($a1) +/* C62E40 80242130 00021400 */ sll $v0, $v0, 0x10 +/* C62E44 80242134 8E0300A0 */ lw $v1, 0xa0($s0) +/* C62E48 80242138 00021403 */ sra $v0, $v0, 0x10 +/* C62E4C 8024213C 14430004 */ bne $v0, $v1, .L80242150 +/* C62E50 80242140 00000000 */ nop +/* C62E54 80242144 8E0200CC */ lw $v0, 0xcc($s0) +/* C62E58 80242148 8C42002C */ lw $v0, 0x2c($v0) +/* C62E5C 8024214C ACA20028 */ sw $v0, 0x28($a1) +.L80242150: +/* C62E60 80242150 84A3008E */ lh $v1, 0x8e($a1) +/* C62E64 80242154 8E0200A4 */ lw $v0, 0xa4($s0) +/* C62E68 80242158 14620002 */ bne $v1, $v0, .L80242164 +/* C62E6C 8024215C 24020003 */ addiu $v0, $zero, 3 +/* C62E70 80242160 AE02006C */ sw $v0, 0x6c($s0) +.L80242164: +/* C62E74 80242164 84A2008E */ lh $v0, 0x8e($a1) +/* C62E78 80242168 8E03009C */ lw $v1, 0x9c($s0) +/* C62E7C 8024216C 0043102A */ slt $v0, $v0, $v1 +/* C62E80 80242170 1440001E */ bnez $v0, .L802421EC +/* C62E84 80242174 24020004 */ addiu $v0, $zero, 4 +/* C62E88 80242178 AE02006C */ sw $v0, 0x6c($s0) +/* C62E8C 8024217C 24020008 */ addiu $v0, $zero, 8 +/* C62E90 80242180 24040003 */ addiu $a0, $zero, 3 +/* C62E94 80242184 A4A2008E */ sh $v0, 0x8e($a1) +/* C62E98 80242188 8E0200CC */ lw $v0, 0xcc($s0) +/* C62E9C 8024218C 84A300A8 */ lh $v1, 0xa8($a1) +/* C62EA0 80242190 3C013F80 */ lui $at, 0x3f80 +/* C62EA4 80242194 44810000 */ mtc1 $at, $f0 +/* C62EA8 80242198 3C014000 */ lui $at, 0x4000 +/* C62EAC 8024219C 44811000 */ mtc1 $at, $f2 +/* C62EB0 802421A0 3C01C1A0 */ lui $at, 0xc1a0 +/* C62EB4 802421A4 44812000 */ mtc1 $at, $f4 +/* C62EB8 802421A8 44833000 */ mtc1 $v1, $f6 +/* C62EBC 802421AC 00000000 */ nop +/* C62EC0 802421B0 468031A0 */ cvt.s.w $f6, $f6 +/* C62EC4 802421B4 8C420000 */ lw $v0, ($v0) +/* C62EC8 802421B8 44073000 */ mfc1 $a3, $f6 +/* C62ECC 802421BC 0000302D */ daddu $a2, $zero, $zero +/* C62ED0 802421C0 ACA20028 */ sw $v0, 0x28($a1) +/* C62ED4 802421C4 2402000A */ addiu $v0, $zero, 0xa +/* C62ED8 802421C8 AFA2001C */ sw $v0, 0x1c($sp) +/* C62EDC 802421CC 27A20028 */ addiu $v0, $sp, 0x28 +/* C62EE0 802421D0 E7A00010 */ swc1 $f0, 0x10($sp) +/* C62EE4 802421D4 E7A20014 */ swc1 $f2, 0x14($sp) +/* C62EE8 802421D8 E7A40018 */ swc1 $f4, 0x18($sp) +/* C62EEC 802421DC 0C01BFA4 */ jal fx_emote +/* C62EF0 802421E0 AFA20020 */ sw $v0, 0x20($sp) +/* C62EF4 802421E4 2402000D */ addiu $v0, $zero, 0xd +/* C62EF8 802421E8 AE220070 */ sw $v0, 0x70($s1) +.L802421EC: +/* C62EFC 802421EC 8FBF0038 */ lw $ra, 0x38($sp) +/* C62F00 802421F0 8FB10034 */ lw $s1, 0x34($sp) +/* C62F04 802421F4 8FB00030 */ lw $s0, 0x30($sp) +/* C62F08 802421F8 03E00008 */ jr $ra +/* C62F0C 802421FC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s index c0ea8c2b24..8a74214873 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024234C_C6305C.s @@ -99,18 +99,18 @@ glabel func_8024234C_C6305C /* C631C4 802424B4 00000000 */ nop .L802424B8: /* C631C8 802424B8 0260282D */ daddu $a1, $s3, $zero -/* C631CC 802424BC 0C090532 */ jal func_802414C8 +/* C631CC 802424BC 0C090532 */ jal func_802414C8_C621D8 /* C631D0 802424C0 0280302D */ daddu $a2, $s4, $zero .L802424C4: /* C631D4 802424C4 0240202D */ daddu $a0, $s2, $zero /* C631D8 802424C8 0260282D */ daddu $a1, $s3, $zero -/* C631DC 802424CC 0C09054D */ jal func_80241534 +/* C631DC 802424CC 0C09054D */ jal func_80241534_C62244 /* C631E0 802424D0 0280302D */ daddu $a2, $s4, $zero /* C631E4 802424D4 0809095D */ j .L80242574 /* C631E8 802424D8 00000000 */ nop .L802424DC: /* C631EC 802424DC 0260282D */ daddu $a1, $s3, $zero -/* C631F0 802424E0 0C09058C */ jal func_80241630 +/* C631F0 802424E0 0C09058C */ jal func_80241630_C62340 /* C631F4 802424E4 0280302D */ daddu $a2, $s4, $zero /* C631F8 802424E8 8E420070 */ lw $v0, 0x70($s2) /* C631FC 802424EC 14500021 */ bne $v0, $s0, .L80242574 @@ -118,7 +118,7 @@ glabel func_8024234C_C6305C .L802424F4: /* C63204 802424F4 0240202D */ daddu $a0, $s2, $zero /* C63208 802424F8 0260282D */ daddu $a1, $s3, $zero -/* C6320C 802424FC 0C09081C */ jal func_80242070 +/* C6320C 802424FC 0C09081C */ jal func_80242070_C62D80 /* C63210 80242500 0280302D */ daddu $a2, $s4, $zero /* C63214 80242504 8E430070 */ lw $v1, 0x70($s2) /* C63218 80242508 2402000C */ addiu $v0, $zero, 0xc @@ -127,7 +127,7 @@ glabel func_8024234C_C6305C /* C63224 80242514 0240202D */ daddu $a0, $s2, $zero .L80242518: /* C63228 80242518 0260282D */ daddu $a1, $s3, $zero -/* C6322C 8024251C 0C090840 */ jal func_80242100 +/* C6322C 8024251C 0C090840 */ jal func_80242100_C62E10 /* C63230 80242520 0280302D */ daddu $a2, $s4, $zero /* C63234 80242524 8E430070 */ lw $v1, 0x70($s2) /* C63238 80242528 2402000D */ addiu $v0, $zero, 0xd @@ -136,7 +136,7 @@ glabel func_8024234C_C6305C .L80242534: /* C63244 80242534 0240202D */ daddu $a0, $s2, $zero /* C63248 80242538 0260282D */ daddu $a1, $s3, $zero -/* C6324C 8024253C 0C090880 */ jal func_80242200 +/* C6324C 8024253C 0C090880 */ jal func_80242200_C62F10 /* C63250 80242540 0280302D */ daddu $a2, $s4, $zero /* C63254 80242544 8E430070 */ lw $v1, 0x70($s2) /* C63258 80242548 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_8024234C_C6305C /* C63264 80242554 0240202D */ daddu $a0, $s2, $zero .L80242558: /* C63268 80242558 0260282D */ daddu $a1, $s3, $zero -/* C6326C 8024255C 0C090898 */ jal func_80242260 +/* C6326C 8024255C 0C090898 */ jal func_80242260_C62F70 /* C63270 80242560 0280302D */ daddu $a2, $s4, $zero /* C63274 80242564 0809095D */ j .L80242574 /* C63278 80242568 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934.s deleted file mode 100644 index c75df5cd74..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242934 -/* C63644 80242934 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C63648 80242938 AFBF0010 */ sw $ra, 0x10($sp) -/* C6364C 8024293C 8C82000C */ lw $v0, 0xc($a0) -/* C63650 80242940 0C0B1EAF */ jal get_variable -/* C63654 80242944 8C450000 */ lw $a1, ($v0) -/* C63658 80242948 3C018024 */ lui $at, 0x8024 -/* C6365C 8024294C AC224208 */ sw $v0, 0x4208($at) -/* C63660 80242950 24020002 */ addiu $v0, $zero, 2 -/* C63664 80242954 8FBF0010 */ lw $ra, 0x10($sp) -/* C63668 80242958 24030001 */ addiu $v1, $zero, 1 -/* C6366C 8024295C 3C018024 */ lui $at, 0x8024 -/* C63670 80242960 AC234204 */ sw $v1, 0x4204($at) -/* C63674 80242964 03E00008 */ jr $ra -/* C63678 80242968 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934_C63644.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934_C63644.s new file mode 100644 index 0000000000..d04a710c94 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242934_C63644.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242934_C63644 +/* C63644 80242934 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C63648 80242938 AFBF0010 */ sw $ra, 0x10($sp) +/* C6364C 8024293C 8C82000C */ lw $v0, 0xc($a0) +/* C63650 80242940 0C0B1EAF */ jal get_variable +/* C63654 80242944 8C450000 */ lw $a1, ($v0) +/* C63658 80242948 3C018024 */ lui $at, 0x8024 +/* C6365C 8024294C AC224208 */ sw $v0, 0x4208($at) +/* C63660 80242950 24020002 */ addiu $v0, $zero, 2 +/* C63664 80242954 8FBF0010 */ lw $ra, 0x10($sp) +/* C63668 80242958 24030001 */ addiu $v1, $zero, 1 +/* C6366C 8024295C 3C018024 */ lui $at, 0x8024 +/* C63670 80242960 AC234204 */ sw $v1, 0x4204($at) +/* C63674 80242964 03E00008 */ jr $ra +/* C63678 80242968 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C.s deleted file mode 100644 index 5ab5be84d5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024296C -/* C6367C 8024296C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C63680 80242970 AFBF0010 */ sw $ra, 0x10($sp) -/* C63684 80242974 8C82000C */ lw $v0, 0xc($a0) -/* C63688 80242978 0C0B1EAF */ jal get_variable -/* C6368C 8024297C 8C450000 */ lw $a1, ($v0) -/* C63690 80242980 0040182D */ daddu $v1, $v0, $zero -/* C63694 80242984 10600012 */ beqz $v1, .L802429D0 -/* C63698 80242988 0000202D */ daddu $a0, $zero, $zero -/* C6369C 8024298C 8C620000 */ lw $v0, ($v1) -/* C636A0 80242990 5040000A */ beql $v0, $zero, .L802429BC -/* C636A4 80242994 00041080 */ sll $v0, $a0, 2 -/* C636A8 80242998 3C058024 */ lui $a1, 0x8024 -/* C636AC 8024299C 24A57420 */ addiu $a1, $a1, 0x7420 -.L802429A0: -/* C636B0 802429A0 24630004 */ addiu $v1, $v1, 4 -/* C636B4 802429A4 24840001 */ addiu $a0, $a0, 1 -/* C636B8 802429A8 ACA20000 */ sw $v0, ($a1) -/* C636BC 802429AC 8C620000 */ lw $v0, ($v1) -/* C636C0 802429B0 1440FFFB */ bnez $v0, .L802429A0 -/* C636C4 802429B4 24A50004 */ addiu $a1, $a1, 4 -/* C636C8 802429B8 00041080 */ sll $v0, $a0, 2 -.L802429BC: -/* C636CC 802429BC 3C018024 */ lui $at, 0x8024 -/* C636D0 802429C0 00220821 */ addu $at, $at, $v0 -/* C636D4 802429C4 AC207420 */ sw $zero, 0x7420($at) -/* C636D8 802429C8 08090A7E */ j .L802429F8 -/* C636DC 802429CC 00000000 */ nop -.L802429D0: -/* C636E0 802429D0 3C038024 */ lui $v1, 0x8024 -/* C636E4 802429D4 24637420 */ addiu $v1, $v1, 0x7420 -/* C636E8 802429D8 0060282D */ daddu $a1, $v1, $zero -.L802429DC: -/* C636EC 802429DC 24820010 */ addiu $v0, $a0, 0x10 -/* C636F0 802429E0 AC620000 */ sw $v0, ($v1) -/* C636F4 802429E4 24630004 */ addiu $v1, $v1, 4 -/* C636F8 802429E8 24840001 */ addiu $a0, $a0, 1 -/* C636FC 802429EC 28820070 */ slti $v0, $a0, 0x70 -/* C63700 802429F0 1440FFFA */ bnez $v0, .L802429DC -/* C63704 802429F4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802429F8: -/* C63708 802429F8 8FBF0010 */ lw $ra, 0x10($sp) -/* C6370C 802429FC 24020002 */ addiu $v0, $zero, 2 -/* C63710 80242A00 03E00008 */ jr $ra -/* C63714 80242A04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s new file mode 100644 index 0000000000..dd0a970f1c --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_8024296C_C6367C.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024296C_C6367C +/* C6367C 8024296C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C63680 80242970 AFBF0010 */ sw $ra, 0x10($sp) +/* C63684 80242974 8C82000C */ lw $v0, 0xc($a0) +/* C63688 80242978 0C0B1EAF */ jal get_variable +/* C6368C 8024297C 8C450000 */ lw $a1, ($v0) +/* C63690 80242980 0040182D */ daddu $v1, $v0, $zero +/* C63694 80242984 10600012 */ beqz $v1, .L802429D0 +/* C63698 80242988 0000202D */ daddu $a0, $zero, $zero +/* C6369C 8024298C 8C620000 */ lw $v0, ($v1) +/* C636A0 80242990 5040000A */ beql $v0, $zero, .L802429BC +/* C636A4 80242994 00041080 */ sll $v0, $a0, 2 +/* C636A8 80242998 3C058024 */ lui $a1, 0x8024 +/* C636AC 8024299C 24A57420 */ addiu $a1, $a1, 0x7420 +.L802429A0: +/* C636B0 802429A0 24630004 */ addiu $v1, $v1, 4 +/* C636B4 802429A4 24840001 */ addiu $a0, $a0, 1 +/* C636B8 802429A8 ACA20000 */ sw $v0, ($a1) +/* C636BC 802429AC 8C620000 */ lw $v0, ($v1) +/* C636C0 802429B0 1440FFFB */ bnez $v0, .L802429A0 +/* C636C4 802429B4 24A50004 */ addiu $a1, $a1, 4 +/* C636C8 802429B8 00041080 */ sll $v0, $a0, 2 +.L802429BC: +/* C636CC 802429BC 3C018024 */ lui $at, 0x8024 +/* C636D0 802429C0 00220821 */ addu $at, $at, $v0 +/* C636D4 802429C4 AC207420 */ sw $zero, 0x7420($at) +/* C636D8 802429C8 08090A7E */ j .L802429F8 +/* C636DC 802429CC 00000000 */ nop +.L802429D0: +/* C636E0 802429D0 3C038024 */ lui $v1, 0x8024 +/* C636E4 802429D4 24637420 */ addiu $v1, $v1, 0x7420 +/* C636E8 802429D8 0060282D */ daddu $a1, $v1, $zero +.L802429DC: +/* C636EC 802429DC 24820010 */ addiu $v0, $a0, 0x10 +/* C636F0 802429E0 AC620000 */ sw $v0, ($v1) +/* C636F4 802429E4 24630004 */ addiu $v1, $v1, 4 +/* C636F8 802429E8 24840001 */ addiu $a0, $a0, 1 +/* C636FC 802429EC 28820070 */ slti $v0, $a0, 0x70 +/* C63700 802429F0 1440FFFA */ bnez $v0, .L802429DC +/* C63704 802429F4 ACA001C0 */ sw $zero, 0x1c0($a1) +.L802429F8: +/* C63708 802429F8 8FBF0010 */ lw $ra, 0x10($sp) +/* C6370C 802429FC 24020002 */ addiu $v0, $zero, 2 +/* C63710 80242A00 03E00008 */ jr $ra +/* C63714 80242A04 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242A08.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242A08.s deleted file mode 100644 index 41379980e2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242A08.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A08 -/* C63718 80242A08 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C6371C 80242A0C AFB10014 */ sw $s1, 0x14($sp) -/* C63720 80242A10 0080882D */ daddu $s1, $a0, $zero -/* C63724 80242A14 AFBF0018 */ sw $ra, 0x18($sp) -/* C63728 80242A18 AFB00010 */ sw $s0, 0x10($sp) -/* C6372C 80242A1C 8E30000C */ lw $s0, 0xc($s1) -/* C63730 80242A20 8E050000 */ lw $a1, ($s0) -/* C63734 80242A24 0C0B1EAF */ jal get_variable -/* C63738 80242A28 26100004 */ addiu $s0, $s0, 4 -/* C6373C 80242A2C AE22008C */ sw $v0, 0x8c($s1) -/* C63740 80242A30 8E050000 */ lw $a1, ($s0) -/* C63744 80242A34 26100004 */ addiu $s0, $s0, 4 -/* C63748 80242A38 0C0B1EAF */ jal get_variable -/* C6374C 80242A3C 0220202D */ daddu $a0, $s1, $zero -/* C63750 80242A40 AE220090 */ sw $v0, 0x90($s1) -/* C63754 80242A44 8E050000 */ lw $a1, ($s0) -/* C63758 80242A48 26100004 */ addiu $s0, $s0, 4 -/* C6375C 80242A4C 0C0B1EAF */ jal get_variable -/* C63760 80242A50 0220202D */ daddu $a0, $s1, $zero -/* C63764 80242A54 AE220094 */ sw $v0, 0x94($s1) -/* C63768 80242A58 8E050000 */ lw $a1, ($s0) -/* C6376C 80242A5C 26100004 */ addiu $s0, $s0, 4 -/* C63770 80242A60 0C0B1EAF */ jal get_variable -/* C63774 80242A64 0220202D */ daddu $a0, $s1, $zero -/* C63778 80242A68 AE220098 */ sw $v0, 0x98($s1) -/* C6377C 80242A6C 8E050000 */ lw $a1, ($s0) -/* C63780 80242A70 26100004 */ addiu $s0, $s0, 4 -/* C63784 80242A74 0C0B1EAF */ jal get_variable -/* C63788 80242A78 0220202D */ daddu $a0, $s1, $zero -/* C6378C 80242A7C AE22009C */ sw $v0, 0x9c($s1) -/* C63790 80242A80 8E050000 */ lw $a1, ($s0) -/* C63794 80242A84 26100004 */ addiu $s0, $s0, 4 -/* C63798 80242A88 0C0B1EAF */ jal get_variable -/* C6379C 80242A8C 0220202D */ daddu $a0, $s1, $zero -/* C637A0 80242A90 AE2200A0 */ sw $v0, 0xa0($s1) -/* C637A4 80242A94 8E050000 */ lw $a1, ($s0) -/* C637A8 80242A98 26100004 */ addiu $s0, $s0, 4 -/* C637AC 80242A9C 0C0B1EAF */ jal get_variable -/* C637B0 80242AA0 0220202D */ daddu $a0, $s1, $zero -/* C637B4 80242AA4 AE2200A4 */ sw $v0, 0xa4($s1) -/* C637B8 80242AA8 8E050000 */ lw $a1, ($s0) -/* C637BC 80242AAC 26100004 */ addiu $s0, $s0, 4 -/* C637C0 80242AB0 0C0B1EAF */ jal get_variable -/* C637C4 80242AB4 0220202D */ daddu $a0, $s1, $zero -/* C637C8 80242AB8 AE2200A8 */ sw $v0, 0xa8($s1) -/* C637CC 80242ABC 8E050000 */ lw $a1, ($s0) -/* C637D0 80242AC0 26100004 */ addiu $s0, $s0, 4 -/* C637D4 80242AC4 0C0B1EAF */ jal get_variable -/* C637D8 80242AC8 0220202D */ daddu $a0, $s1, $zero -/* C637DC 80242ACC AE2200AC */ sw $v0, 0xac($s1) -/* C637E0 80242AD0 8E050000 */ lw $a1, ($s0) -/* C637E4 80242AD4 0C0B1EAF */ jal get_variable -/* C637E8 80242AD8 0220202D */ daddu $a0, $s1, $zero -/* C637EC 80242ADC AE2200B0 */ sw $v0, 0xb0($s1) -/* C637F0 80242AE0 8FBF0018 */ lw $ra, 0x18($sp) -/* C637F4 80242AE4 8FB10014 */ lw $s1, 0x14($sp) -/* C637F8 80242AE8 8FB00010 */ lw $s0, 0x10($sp) -/* C637FC 80242AEC 24020002 */ addiu $v0, $zero, 2 -/* C63800 80242AF0 03E00008 */ jr $ra -/* C63804 80242AF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242A08_C63718.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242A08_C63718.s new file mode 100644 index 0000000000..92202d1817 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242A08_C63718.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A08_C63718 +/* C63718 80242A08 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C6371C 80242A0C AFB10014 */ sw $s1, 0x14($sp) +/* C63720 80242A10 0080882D */ daddu $s1, $a0, $zero +/* C63724 80242A14 AFBF0018 */ sw $ra, 0x18($sp) +/* C63728 80242A18 AFB00010 */ sw $s0, 0x10($sp) +/* C6372C 80242A1C 8E30000C */ lw $s0, 0xc($s1) +/* C63730 80242A20 8E050000 */ lw $a1, ($s0) +/* C63734 80242A24 0C0B1EAF */ jal get_variable +/* C63738 80242A28 26100004 */ addiu $s0, $s0, 4 +/* C6373C 80242A2C AE22008C */ sw $v0, 0x8c($s1) +/* C63740 80242A30 8E050000 */ lw $a1, ($s0) +/* C63744 80242A34 26100004 */ addiu $s0, $s0, 4 +/* C63748 80242A38 0C0B1EAF */ jal get_variable +/* C6374C 80242A3C 0220202D */ daddu $a0, $s1, $zero +/* C63750 80242A40 AE220090 */ sw $v0, 0x90($s1) +/* C63754 80242A44 8E050000 */ lw $a1, ($s0) +/* C63758 80242A48 26100004 */ addiu $s0, $s0, 4 +/* C6375C 80242A4C 0C0B1EAF */ jal get_variable +/* C63760 80242A50 0220202D */ daddu $a0, $s1, $zero +/* C63764 80242A54 AE220094 */ sw $v0, 0x94($s1) +/* C63768 80242A58 8E050000 */ lw $a1, ($s0) +/* C6376C 80242A5C 26100004 */ addiu $s0, $s0, 4 +/* C63770 80242A60 0C0B1EAF */ jal get_variable +/* C63774 80242A64 0220202D */ daddu $a0, $s1, $zero +/* C63778 80242A68 AE220098 */ sw $v0, 0x98($s1) +/* C6377C 80242A6C 8E050000 */ lw $a1, ($s0) +/* C63780 80242A70 26100004 */ addiu $s0, $s0, 4 +/* C63784 80242A74 0C0B1EAF */ jal get_variable +/* C63788 80242A78 0220202D */ daddu $a0, $s1, $zero +/* C6378C 80242A7C AE22009C */ sw $v0, 0x9c($s1) +/* C63790 80242A80 8E050000 */ lw $a1, ($s0) +/* C63794 80242A84 26100004 */ addiu $s0, $s0, 4 +/* C63798 80242A88 0C0B1EAF */ jal get_variable +/* C6379C 80242A8C 0220202D */ daddu $a0, $s1, $zero +/* C637A0 80242A90 AE2200A0 */ sw $v0, 0xa0($s1) +/* C637A4 80242A94 8E050000 */ lw $a1, ($s0) +/* C637A8 80242A98 26100004 */ addiu $s0, $s0, 4 +/* C637AC 80242A9C 0C0B1EAF */ jal get_variable +/* C637B0 80242AA0 0220202D */ daddu $a0, $s1, $zero +/* C637B4 80242AA4 AE2200A4 */ sw $v0, 0xa4($s1) +/* C637B8 80242AA8 8E050000 */ lw $a1, ($s0) +/* C637BC 80242AAC 26100004 */ addiu $s0, $s0, 4 +/* C637C0 80242AB0 0C0B1EAF */ jal get_variable +/* C637C4 80242AB4 0220202D */ daddu $a0, $s1, $zero +/* C637C8 80242AB8 AE2200A8 */ sw $v0, 0xa8($s1) +/* C637CC 80242ABC 8E050000 */ lw $a1, ($s0) +/* C637D0 80242AC0 26100004 */ addiu $s0, $s0, 4 +/* C637D4 80242AC4 0C0B1EAF */ jal get_variable +/* C637D8 80242AC8 0220202D */ daddu $a0, $s1, $zero +/* C637DC 80242ACC AE2200AC */ sw $v0, 0xac($s1) +/* C637E0 80242AD0 8E050000 */ lw $a1, ($s0) +/* C637E4 80242AD4 0C0B1EAF */ jal get_variable +/* C637E8 80242AD8 0220202D */ daddu $a0, $s1, $zero +/* C637EC 80242ADC AE2200B0 */ sw $v0, 0xb0($s1) +/* C637F0 80242AE0 8FBF0018 */ lw $ra, 0x18($sp) +/* C637F4 80242AE4 8FB10014 */ lw $s1, 0x14($sp) +/* C637F8 80242AE8 8FB00010 */ lw $s0, 0x10($sp) +/* C637FC 80242AEC 24020002 */ addiu $v0, $zero, 2 +/* C63800 80242AF0 03E00008 */ jr $ra +/* C63804 80242AF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84.s deleted file mode 100644 index ca84cae498..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C84 -/* C63994 80242C84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C63998 80242C88 AFB00010 */ sw $s0, 0x10($sp) -/* C6399C 80242C8C 0080802D */ daddu $s0, $a0, $zero -/* C639A0 80242C90 AFBF0014 */ sw $ra, 0x14($sp) -/* C639A4 80242C94 0C00EABB */ jal get_npc_unsafe -/* C639A8 80242C98 8E04008C */ lw $a0, 0x8c($s0) -/* C639AC 80242C9C 0040282D */ daddu $a1, $v0, $zero -/* C639B0 80242CA0 8E040094 */ lw $a0, 0x94($s0) -/* C639B4 80242CA4 8CA30028 */ lw $v1, 0x28($a1) -/* C639B8 80242CA8 ACA40028 */ sw $a0, 0x28($a1) -/* C639BC 80242CAC 8FBF0014 */ lw $ra, 0x14($sp) -/* C639C0 80242CB0 8FB00010 */ lw $s0, 0x10($sp) -/* C639C4 80242CB4 24020002 */ addiu $v0, $zero, 2 -/* C639C8 80242CB8 3C018024 */ lui $at, 0x8024 -/* C639CC 80242CBC AC2375E4 */ sw $v1, 0x75e4($at) -/* C639D0 80242CC0 03E00008 */ jr $ra -/* C639D4 80242CC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s new file mode 100644 index 0000000000..1842e42174 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242C84_C63994.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C84_C63994 +/* C63994 80242C84 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C63998 80242C88 AFB00010 */ sw $s0, 0x10($sp) +/* C6399C 80242C8C 0080802D */ daddu $s0, $a0, $zero +/* C639A0 80242C90 AFBF0014 */ sw $ra, 0x14($sp) +/* C639A4 80242C94 0C00EABB */ jal get_npc_unsafe +/* C639A8 80242C98 8E04008C */ lw $a0, 0x8c($s0) +/* C639AC 80242C9C 0040282D */ daddu $a1, $v0, $zero +/* C639B0 80242CA0 8E040094 */ lw $a0, 0x94($s0) +/* C639B4 80242CA4 8CA30028 */ lw $v1, 0x28($a1) +/* C639B8 80242CA8 ACA40028 */ sw $a0, 0x28($a1) +/* C639BC 80242CAC 8FBF0014 */ lw $ra, 0x14($sp) +/* C639C0 80242CB0 8FB00010 */ lw $s0, 0x10($sp) +/* C639C4 80242CB4 24020002 */ addiu $v0, $zero, 2 +/* C639C8 80242CB8 3C018024 */ lui $at, 0x8024 +/* C639CC 80242CBC AC2375E4 */ sw $v1, 0x75e4($at) +/* C639D0 80242CC0 03E00008 */ jr $ra +/* C639D4 80242CC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8.s deleted file mode 100644 index 2ae495c172..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CC8 -/* C639D8 80242CC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C639DC 80242CCC AFBF0010 */ sw $ra, 0x10($sp) -/* C639E0 80242CD0 0C00EABB */ jal get_npc_unsafe -/* C639E4 80242CD4 8C84008C */ lw $a0, 0x8c($a0) -/* C639E8 80242CD8 3C038024 */ lui $v1, 0x8024 -/* C639EC 80242CDC 8C6375E4 */ lw $v1, 0x75e4($v1) -/* C639F0 80242CE0 AC430028 */ sw $v1, 0x28($v0) -/* C639F4 80242CE4 8FBF0010 */ lw $ra, 0x10($sp) -/* C639F8 80242CE8 24020002 */ addiu $v0, $zero, 2 -/* C639FC 80242CEC 03E00008 */ jr $ra -/* C63A00 80242CF0 27BD0018 */ addiu $sp, $sp, 0x18 -/* C63A04 80242CF4 00000000 */ nop -/* C63A08 80242CF8 00000000 */ nop -/* C63A0C 80242CFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s new file mode 100644 index 0000000000..6abbed6865 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C61020/func_80242CC8_C639D8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242CC8_C639D8 +/* C639D8 80242CC8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C639DC 80242CCC AFBF0010 */ sw $ra, 0x10($sp) +/* C639E0 80242CD0 0C00EABB */ jal get_npc_unsafe +/* C639E4 80242CD4 8C84008C */ lw $a0, 0x8c($a0) +/* C639E8 80242CD8 3C038024 */ lui $v1, 0x8024 +/* C639EC 80242CDC 8C6375E4 */ lw $v1, 0x75e4($v1) +/* C639F0 80242CE0 AC430028 */ sw $v1, 0x28($v0) +/* C639F4 80242CE4 8FBF0010 */ lw $ra, 0x10($sp) +/* C639F8 80242CE8 24020002 */ addiu $v0, $zero, 2 +/* C639FC 80242CEC 03E00008 */ jr $ra +/* C63A00 80242CF0 27BD0018 */ addiu $sp, $sp, 0x18 +/* C63A04 80242CF4 00000000 */ nop +/* C63A08 80242CF8 00000000 */ nop +/* C63A0C 80242CFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C.s deleted file mode 100644 index ddf2383f7d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D1C -/* C63A2C 80242D1C 3C03800B */ lui $v1, %hi(gCameras) -/* C63A30 80242D20 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* C63A34 80242D24 94620002 */ lhu $v0, 2($v1) -/* C63A38 80242D28 34420001 */ ori $v0, $v0, 1 -/* C63A3C 80242D2C A4620002 */ sh $v0, 2($v1) -/* C63A40 80242D30 03E00008 */ jr $ra -/* C63A44 80242D34 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s new file mode 100644 index 0000000000..02d3b3b4da --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D1C_C63A2C +/* C63A2C 80242D1C 3C03800B */ lui $v1, %hi(gCameras) +/* C63A30 80242D20 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* C63A34 80242D24 94620002 */ lhu $v0, 2($v1) +/* C63A38 80242D28 34420001 */ ori $v0, $v0, 1 +/* C63A3C 80242D2C A4620002 */ sh $v0, 2($v1) +/* C63A40 80242D30 03E00008 */ jr $ra +/* C63A44 80242D34 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38.s deleted file mode 100644 index a9bb1e6c30..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D38 -/* C63A48 80242D38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C63A4C 80242D3C 3C028011 */ lui $v0, 0x8011 -/* C63A50 80242D40 8442EFE0 */ lh $v0, -0x1020($v0) -/* C63A54 80242D44 3C014089 */ lui $at, 0x4089 -/* C63A58 80242D48 44810800 */ mtc1 $at, $f1 -/* C63A5C 80242D4C 44800000 */ mtc1 $zero, $f0 -/* C63A60 80242D50 2406FFFF */ addiu $a2, $zero, -1 -/* C63A64 80242D54 44821000 */ mtc1 $v0, $f2 -/* C63A68 80242D58 00000000 */ nop -/* C63A6C 80242D5C 468010A1 */ cvt.d.w $f2, $f2 -/* C63A70 80242D60 4622003C */ c.lt.d $f0, $f2 -/* C63A74 80242D64 00000000 */ nop -/* C63A78 80242D68 45000002 */ bc1f .L80242D74 -/* C63A7C 80242D6C AFBF0010 */ sw $ra, 0x10($sp) -/* C63A80 80242D70 0000302D */ daddu $a2, $zero, $zero -.L80242D74: -/* C63A84 80242D74 3C018024 */ lui $at, 0x8024 -/* C63A88 80242D78 D4207410 */ ldc1 $f0, 0x7410($at) -/* C63A8C 80242D7C 4620103C */ c.lt.d $f2, $f0 -/* C63A90 80242D80 00000000 */ nop -/* C63A94 80242D84 45030001 */ bc1tl .L80242D8C -/* C63A98 80242D88 24060001 */ addiu $a2, $zero, 1 -.L80242D8C: -/* C63A9C 80242D8C 04C00004 */ bltz $a2, .L80242DA0 -/* C63AA0 80242D90 00000000 */ nop -/* C63AA4 80242D94 3C05FD05 */ lui $a1, 0xfd05 -/* C63AA8 80242D98 0C0B2026 */ jal set_variable -/* C63AAC 80242D9C 34A50F89 */ ori $a1, $a1, 0xf89 -.L80242DA0: -/* C63AB0 80242DA0 8FBF0010 */ lw $ra, 0x10($sp) -/* C63AB4 80242DA4 0000102D */ daddu $v0, $zero, $zero -/* C63AB8 80242DA8 03E00008 */ jr $ra -/* C63ABC 80242DAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s new file mode 100644 index 0000000000..a16bbd1a0c --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D38_C63A48 +/* C63A48 80242D38 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C63A4C 80242D3C 3C028011 */ lui $v0, 0x8011 +/* C63A50 80242D40 8442EFE0 */ lh $v0, -0x1020($v0) +/* C63A54 80242D44 3C014089 */ lui $at, 0x4089 +/* C63A58 80242D48 44810800 */ mtc1 $at, $f1 +/* C63A5C 80242D4C 44800000 */ mtc1 $zero, $f0 +/* C63A60 80242D50 2406FFFF */ addiu $a2, $zero, -1 +/* C63A64 80242D54 44821000 */ mtc1 $v0, $f2 +/* C63A68 80242D58 00000000 */ nop +/* C63A6C 80242D5C 468010A1 */ cvt.d.w $f2, $f2 +/* C63A70 80242D60 4622003C */ c.lt.d $f0, $f2 +/* C63A74 80242D64 00000000 */ nop +/* C63A78 80242D68 45000002 */ bc1f .L80242D74 +/* C63A7C 80242D6C AFBF0010 */ sw $ra, 0x10($sp) +/* C63A80 80242D70 0000302D */ daddu $a2, $zero, $zero +.L80242D74: +/* C63A84 80242D74 3C018024 */ lui $at, 0x8024 +/* C63A88 80242D78 D4207410 */ ldc1 $f0, 0x7410($at) +/* C63A8C 80242D7C 4620103C */ c.lt.d $f2, $f0 +/* C63A90 80242D80 00000000 */ nop +/* C63A94 80242D84 45030001 */ bc1tl .L80242D8C +/* C63A98 80242D88 24060001 */ addiu $a2, $zero, 1 +.L80242D8C: +/* C63A9C 80242D8C 04C00004 */ bltz $a2, .L80242DA0 +/* C63AA0 80242D90 00000000 */ nop +/* C63AA4 80242D94 3C05FD05 */ lui $a1, 0xfd05 +/* C63AA8 80242D98 0C0B2026 */ jal set_variable +/* C63AAC 80242D9C 34A50F89 */ ori $a1, $a1, 0xf89 +.L80242DA0: +/* C63AB0 80242DA0 8FBF0010 */ lw $ra, 0x10($sp) +/* C63AB4 80242DA4 0000102D */ daddu $v0, $zero, $zero +/* C63AB8 80242DA8 03E00008 */ jr $ra +/* C63ABC 80242DAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54.s deleted file mode 100644 index 2c10959531..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E54 -/* C63B64 80242E54 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C63B68 80242E58 AFB1001C */ sw $s1, 0x1c($sp) -/* C63B6C 80242E5C 0080882D */ daddu $s1, $a0, $zero -/* C63B70 80242E60 AFBF0020 */ sw $ra, 0x20($sp) -/* C63B74 80242E64 AFB00018 */ sw $s0, 0x18($sp) -/* C63B78 80242E68 8E30000C */ lw $s0, 0xc($s1) -/* C63B7C 80242E6C 8E020000 */ lw $v0, ($s0) -/* C63B80 80242E70 1040001B */ beqz $v0, .L80242EE0 -/* C63B84 80242E74 26100004 */ addiu $s0, $s0, 4 -/* C63B88 80242E78 8E050000 */ lw $a1, ($s0) -/* C63B8C 80242E7C 0C0B1EAF */ jal get_variable -/* C63B90 80242E80 26100004 */ addiu $s0, $s0, 4 -/* C63B94 80242E84 AE220070 */ sw $v0, 0x70($s1) -/* C63B98 80242E88 8E050000 */ lw $a1, ($s0) -/* C63B9C 80242E8C 26100004 */ addiu $s0, $s0, 4 -/* C63BA0 80242E90 0C0B1EAF */ jal get_variable -/* C63BA4 80242E94 0220202D */ daddu $a0, $s1, $zero -/* C63BA8 80242E98 AE220074 */ sw $v0, 0x74($s1) -/* C63BAC 80242E9C 8E050000 */ lw $a1, ($s0) -/* C63BB0 80242EA0 0C0B1EAF */ jal get_variable -/* C63BB4 80242EA4 0220202D */ daddu $a0, $s1, $zero -/* C63BB8 80242EA8 24040185 */ addiu $a0, $zero, 0x185 -/* C63BBC 80242EAC 0000282D */ daddu $a1, $zero, $zero -/* C63BC0 80242EB0 C6200070 */ lwc1 $f0, 0x70($s1) -/* C63BC4 80242EB4 46800020 */ cvt.s.w $f0, $f0 -/* C63BC8 80242EB8 C6220074 */ lwc1 $f2, 0x74($s1) -/* C63BCC 80242EBC 468010A0 */ cvt.s.w $f2, $f2 -/* C63BD0 80242EC0 44060000 */ mfc1 $a2, $f0 -/* C63BD4 80242EC4 44071000 */ mfc1 $a3, $f2 -/* C63BD8 80242EC8 44820000 */ mtc1 $v0, $f0 -/* C63BDC 80242ECC 00000000 */ nop -/* C63BE0 80242ED0 46800020 */ cvt.s.w $f0, $f0 -/* C63BE4 80242ED4 AE220078 */ sw $v0, 0x78($s1) -/* C63BE8 80242ED8 0C05267B */ jal func_801499EC -/* C63BEC 80242EDC E7A00010 */ swc1 $f0, 0x10($sp) -.L80242EE0: -/* C63BF0 80242EE0 8FBF0020 */ lw $ra, 0x20($sp) -/* C63BF4 80242EE4 8FB1001C */ lw $s1, 0x1c($sp) -/* C63BF8 80242EE8 8FB00018 */ lw $s0, 0x18($sp) -/* C63BFC 80242EEC 24020002 */ addiu $v0, $zero, 2 -/* C63C00 80242EF0 03E00008 */ jr $ra -/* C63C04 80242EF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s new file mode 100644 index 0000000000..16f3a30b8f --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242E54_C63B64.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E54_C63B64 +/* C63B64 80242E54 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C63B68 80242E58 AFB1001C */ sw $s1, 0x1c($sp) +/* C63B6C 80242E5C 0080882D */ daddu $s1, $a0, $zero +/* C63B70 80242E60 AFBF0020 */ sw $ra, 0x20($sp) +/* C63B74 80242E64 AFB00018 */ sw $s0, 0x18($sp) +/* C63B78 80242E68 8E30000C */ lw $s0, 0xc($s1) +/* C63B7C 80242E6C 8E020000 */ lw $v0, ($s0) +/* C63B80 80242E70 1040001B */ beqz $v0, .L80242EE0 +/* C63B84 80242E74 26100004 */ addiu $s0, $s0, 4 +/* C63B88 80242E78 8E050000 */ lw $a1, ($s0) +/* C63B8C 80242E7C 0C0B1EAF */ jal get_variable +/* C63B90 80242E80 26100004 */ addiu $s0, $s0, 4 +/* C63B94 80242E84 AE220070 */ sw $v0, 0x70($s1) +/* C63B98 80242E88 8E050000 */ lw $a1, ($s0) +/* C63B9C 80242E8C 26100004 */ addiu $s0, $s0, 4 +/* C63BA0 80242E90 0C0B1EAF */ jal get_variable +/* C63BA4 80242E94 0220202D */ daddu $a0, $s1, $zero +/* C63BA8 80242E98 AE220074 */ sw $v0, 0x74($s1) +/* C63BAC 80242E9C 8E050000 */ lw $a1, ($s0) +/* C63BB0 80242EA0 0C0B1EAF */ jal get_variable +/* C63BB4 80242EA4 0220202D */ daddu $a0, $s1, $zero +/* C63BB8 80242EA8 24040185 */ addiu $a0, $zero, 0x185 +/* C63BBC 80242EAC 0000282D */ daddu $a1, $zero, $zero +/* C63BC0 80242EB0 C6200070 */ lwc1 $f0, 0x70($s1) +/* C63BC4 80242EB4 46800020 */ cvt.s.w $f0, $f0 +/* C63BC8 80242EB8 C6220074 */ lwc1 $f2, 0x74($s1) +/* C63BCC 80242EBC 468010A0 */ cvt.s.w $f2, $f2 +/* C63BD0 80242EC0 44060000 */ mfc1 $a2, $f0 +/* C63BD4 80242EC4 44071000 */ mfc1 $a3, $f2 +/* C63BD8 80242EC8 44820000 */ mtc1 $v0, $f0 +/* C63BDC 80242ECC 00000000 */ nop +/* C63BE0 80242ED0 46800020 */ cvt.s.w $f0, $f0 +/* C63BE4 80242ED4 AE220078 */ sw $v0, 0x78($s1) +/* C63BE8 80242ED8 0C05267B */ jal func_801499EC +/* C63BEC 80242EDC E7A00010 */ swc1 $f0, 0x10($sp) +.L80242EE0: +/* C63BF0 80242EE0 8FBF0020 */ lw $ra, 0x20($sp) +/* C63BF4 80242EE4 8FB1001C */ lw $s1, 0x1c($sp) +/* C63BF8 80242EE8 8FB00018 */ lw $s0, 0x18($sp) +/* C63BFC 80242EEC 24020002 */ addiu $v0, $zero, 2 +/* C63C00 80242EF0 03E00008 */ jr $ra +/* C63C04 80242EF4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378.s deleted file mode 100644 index 31925c7d1d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240378 -/* C684A8 80240378 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C684AC 8024037C AFB00010 */ sw $s0, 0x10($sp) -/* C684B0 80240380 0080802D */ daddu $s0, $a0, $zero -/* C684B4 80240384 AFBF0018 */ sw $ra, 0x18($sp) -/* C684B8 80240388 AFB10014 */ sw $s1, 0x14($sp) -/* C684BC 8024038C 8E11000C */ lw $s1, 0xc($s0) -/* C684C0 80240390 8E250000 */ lw $a1, ($s1) -/* C684C4 80240394 0C0B1EAF */ jal get_variable -/* C684C8 80240398 26310004 */ addiu $s1, $s1, 4 -/* C684CC 8024039C 0200202D */ daddu $a0, $s0, $zero -/* C684D0 802403A0 3C038011 */ lui $v1, %hi(gPlayerData) -/* C684D4 802403A4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* C684D8 802403A8 000210C0 */ sll $v0, $v0, 3 -/* C684DC 802403AC 00431021 */ addu $v0, $v0, $v1 -/* C684E0 802403B0 90460015 */ lbu $a2, 0x15($v0) -/* C684E4 802403B4 8E250000 */ lw $a1, ($s1) -/* C684E8 802403B8 24C60001 */ addiu $a2, $a2, 1 -/* C684EC 802403BC A0460015 */ sb $a2, 0x15($v0) -/* C684F0 802403C0 00063600 */ sll $a2, $a2, 0x18 -/* C684F4 802403C4 0C0B2026 */ jal set_variable -/* C684F8 802403C8 00063603 */ sra $a2, $a2, 0x18 -/* C684FC 802403CC 8FBF0018 */ lw $ra, 0x18($sp) -/* C68500 802403D0 8FB10014 */ lw $s1, 0x14($sp) -/* C68504 802403D4 8FB00010 */ lw $s0, 0x10($sp) -/* C68508 802403D8 24020002 */ addiu $v0, $zero, 2 -/* C6850C 802403DC 03E00008 */ jr $ra -/* C68510 802403E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378_C684A8.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378_C684A8.s new file mode 100644 index 0000000000..b84e45672a --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240378_C684A8.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240378_C684A8 +/* C684A8 80240378 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C684AC 8024037C AFB00010 */ sw $s0, 0x10($sp) +/* C684B0 80240380 0080802D */ daddu $s0, $a0, $zero +/* C684B4 80240384 AFBF0018 */ sw $ra, 0x18($sp) +/* C684B8 80240388 AFB10014 */ sw $s1, 0x14($sp) +/* C684BC 8024038C 8E11000C */ lw $s1, 0xc($s0) +/* C684C0 80240390 8E250000 */ lw $a1, ($s1) +/* C684C4 80240394 0C0B1EAF */ jal get_variable +/* C684C8 80240398 26310004 */ addiu $s1, $s1, 4 +/* C684CC 8024039C 0200202D */ daddu $a0, $s0, $zero +/* C684D0 802403A0 3C038011 */ lui $v1, %hi(gPlayerData) +/* C684D4 802403A4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* C684D8 802403A8 000210C0 */ sll $v0, $v0, 3 +/* C684DC 802403AC 00431021 */ addu $v0, $v0, $v1 +/* C684E0 802403B0 90460015 */ lbu $a2, 0x15($v0) +/* C684E4 802403B4 8E250000 */ lw $a1, ($s1) +/* C684E8 802403B8 24C60001 */ addiu $a2, $a2, 1 +/* C684EC 802403BC A0460015 */ sb $a2, 0x15($v0) +/* C684F0 802403C0 00063600 */ sll $a2, $a2, 0x18 +/* C684F4 802403C4 0C0B2026 */ jal set_variable +/* C684F8 802403C8 00063603 */ sra $a2, $a2, 0x18 +/* C684FC 802403CC 8FBF0018 */ lw $ra, 0x18($sp) +/* C68500 802403D0 8FB10014 */ lw $s1, 0x14($sp) +/* C68504 802403D4 8FB00010 */ lw $s0, 0x10($sp) +/* C68508 802403D8 24020002 */ addiu $v0, $zero, 2 +/* C6850C 802403DC 03E00008 */ jr $ra +/* C68510 802403E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4.s deleted file mode 100644 index 8c53295455..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403E4 -/* C68514 802403E4 3C028011 */ lui $v0, %hi(gPlayerData) -/* C68518 802403E8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* C6851C 802403EC 000420C0 */ sll $a0, $a0, 3 -/* C68520 802403F0 00822021 */ addu $a0, $a0, $v0 -/* C68524 802403F4 90820014 */ lbu $v0, 0x14($a0) -/* C68528 802403F8 10400009 */ beqz $v0, .L80240420 -/* C6852C 802403FC 00000000 */ nop -/* C68530 80240400 90820015 */ lbu $v0, 0x15($a0) -/* C68534 80240404 00022600 */ sll $a0, $v0, 0x18 -/* C68538 80240408 00041E03 */ sra $v1, $a0, 0x18 -/* C6853C 8024040C 00051400 */ sll $v0, $a1, 0x10 -/* C68540 80240410 00021403 */ sra $v0, $v0, 0x10 -/* C68544 80240414 0043102A */ slt $v0, $v0, $v1 -/* C68548 80240418 10400003 */ beqz $v0, .L80240428 -/* C6854C 8024041C 00000000 */ nop -.L80240420: -/* C68550 80240420 03E00008 */ jr $ra -/* C68554 80240424 2402FFFF */ addiu $v0, $zero, -1 -.L80240428: -/* C68558 80240428 03E00008 */ jr $ra -/* C6855C 8024042C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s new file mode 100644 index 0000000000..4047f4d657 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802403E4_C68514.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403E4_C68514 +/* C68514 802403E4 3C028011 */ lui $v0, %hi(gPlayerData) +/* C68518 802403E8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* C6851C 802403EC 000420C0 */ sll $a0, $a0, 3 +/* C68520 802403F0 00822021 */ addu $a0, $a0, $v0 +/* C68524 802403F4 90820014 */ lbu $v0, 0x14($a0) +/* C68528 802403F8 10400009 */ beqz $v0, .L80240420 +/* C6852C 802403FC 00000000 */ nop +/* C68530 80240400 90820015 */ lbu $v0, 0x15($a0) +/* C68534 80240404 00022600 */ sll $a0, $v0, 0x18 +/* C68538 80240408 00041E03 */ sra $v1, $a0, 0x18 +/* C6853C 8024040C 00051400 */ sll $v0, $a1, 0x10 +/* C68540 80240410 00021403 */ sra $v0, $v0, 0x10 +/* C68544 80240414 0043102A */ slt $v0, $v0, $v1 +/* C68548 80240418 10400003 */ beqz $v0, .L80240428 +/* C6854C 8024041C 00000000 */ nop +.L80240420: +/* C68550 80240420 03E00008 */ jr $ra +/* C68554 80240424 2402FFFF */ addiu $v0, $zero, -1 +.L80240428: +/* C68558 80240428 03E00008 */ jr $ra +/* C6855C 8024042C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s index 5ac283ce96..ae3cc022c2 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s @@ -27,7 +27,7 @@ glabel func_80240430_C68560 /* C685B4 80240484 50400008 */ beql $v0, $zero, .L802404A8 /* C685B8 80240488 26100001 */ addiu $s0, $s0, 1 /* C685BC 8024048C 0200202D */ daddu $a0, $s0, $zero -/* C685C0 80240490 0C0900F9 */ jal func_802403E4 +/* C685C0 80240490 0C0900F9 */ jal func_802403E4_C68514 /* C685C4 80240494 00122C03 */ sra $a1, $s2, 0x10 /* C685C8 80240498 10540003 */ beq $v0, $s4, .L802404A8 /* C685CC 8024049C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s index 49425514be..97387f033e 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802404DC_C6860C.s @@ -49,7 +49,7 @@ glabel func_802404DC_C6860C /* C686B8 80240588 AE300108 */ sw $s0, 0x108($s1) /* C686BC 8024058C 8C420000 */ lw $v0, ($v0) /* C686C0 80240590 02E0282D */ daddu $a1, $s7, $zero -/* C686C4 80240594 0C0900F9 */ jal func_802403E4 +/* C686C4 80240594 0C0900F9 */ jal func_802403E4_C68514 /* C686C8 80240598 AE220084 */ sw $v0, 0x84($s1) /* C686CC 8024059C 0040202D */ daddu $a0, $v0, $zero /* C686D0 802405A0 04800011 */ bltz $a0, .L802405E8 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8.s deleted file mode 100644 index b945b275f7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408B8 -/* C689E8 802408B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C689EC 802408BC AFBF0018 */ sw $ra, 0x18($sp) -/* C689F0 802408C0 0C00EAD2 */ jal get_npc_safe -/* C689F4 802408C4 2404FFFC */ addiu $a0, $zero, -4 -/* C689F8 802408C8 C444003C */ lwc1 $f4, 0x3c($v0) -/* C689FC 802408CC 3C014148 */ lui $at, 0x4148 -/* C68A00 802408D0 44811000 */ mtc1 $at, $f2 -/* C68A04 802408D4 3C013F80 */ lui $at, 0x3f80 -/* C68A08 802408D8 44810000 */ mtc1 $at, $f0 -/* C68A0C 802408DC 2403001E */ addiu $v1, $zero, 0x1e -/* C68A10 802408E0 AFA30014 */ sw $v1, 0x14($sp) -/* C68A14 802408E4 46022100 */ add.s $f4, $f4, $f2 -/* C68A18 802408E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* C68A1C 802408EC 8C450038 */ lw $a1, 0x38($v0) -/* C68A20 802408F0 8C470040 */ lw $a3, 0x40($v0) -/* C68A24 802408F4 44062000 */ mfc1 $a2, $f4 -/* C68A28 802408F8 0C01C2EC */ jal func_80070BB0 -/* C68A2C 802408FC 24040009 */ addiu $a0, $zero, 9 -/* C68A30 80240900 8FBF0018 */ lw $ra, 0x18($sp) -/* C68A34 80240904 24020002 */ addiu $v0, $zero, 2 -/* C68A38 80240908 03E00008 */ jr $ra -/* C68A3C 8024090C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8_C689E8.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8_C689E8.s new file mode 100644 index 0000000000..327bb840d0 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_802408B8_C689E8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408B8_C689E8 +/* C689E8 802408B8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C689EC 802408BC AFBF0018 */ sw $ra, 0x18($sp) +/* C689F0 802408C0 0C00EAD2 */ jal get_npc_safe +/* C689F4 802408C4 2404FFFC */ addiu $a0, $zero, -4 +/* C689F8 802408C8 C444003C */ lwc1 $f4, 0x3c($v0) +/* C689FC 802408CC 3C014148 */ lui $at, 0x4148 +/* C68A00 802408D0 44811000 */ mtc1 $at, $f2 +/* C68A04 802408D4 3C013F80 */ lui $at, 0x3f80 +/* C68A08 802408D8 44810000 */ mtc1 $at, $f0 +/* C68A0C 802408DC 2403001E */ addiu $v1, $zero, 0x1e +/* C68A10 802408E0 AFA30014 */ sw $v1, 0x14($sp) +/* C68A14 802408E4 46022100 */ add.s $f4, $f4, $f2 +/* C68A18 802408E8 E7A00010 */ swc1 $f0, 0x10($sp) +/* C68A1C 802408EC 8C450038 */ lw $a1, 0x38($v0) +/* C68A20 802408F0 8C470040 */ lw $a3, 0x40($v0) +/* C68A24 802408F4 44062000 */ mfc1 $a2, $f4 +/* C68A28 802408F8 0C01C2EC */ jal func_80070BB0 +/* C68A2C 802408FC 24040009 */ addiu $a0, $zero, 9 +/* C68A30 80240900 8FBF0018 */ lw $ra, 0x18($sp) +/* C68A34 80240904 24020002 */ addiu $v0, $zero, 2 +/* C68A38 80240908 03E00008 */ jr $ra +/* C68A3C 8024090C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018.s deleted file mode 100644 index a1141ec62a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241018 -/* C69148 80241018 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* C6914C 8024101C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* C69150 80241020 AC800084 */ sw $zero, 0x84($a0) -/* C69154 80241024 80620000 */ lb $v0, ($v1) -/* C69158 80241028 10400005 */ beqz $v0, .L80241040 -/* C6915C 8024102C 24020003 */ addiu $v0, $zero, 3 -/* C69160 80241030 80630003 */ lb $v1, 3($v1) -/* C69164 80241034 14620002 */ bne $v1, $v0, .L80241040 -/* C69168 80241038 24020001 */ addiu $v0, $zero, 1 -/* C6916C 8024103C AC820084 */ sw $v0, 0x84($a0) -.L80241040: -/* C69170 80241040 03E00008 */ jr $ra -/* C69174 80241044 24020002 */ addiu $v0, $zero, 2 -/* C69178 80241048 00000000 */ nop -/* C6917C 8024104C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s new file mode 100644 index 0000000000..89ce6df7b4 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80241018_C69148.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241018_C69148 +/* C69148 80241018 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* C6914C 8024101C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* C69150 80241020 AC800084 */ sw $zero, 0x84($a0) +/* C69154 80241024 80620000 */ lb $v0, ($v1) +/* C69158 80241028 10400005 */ beqz $v0, .L80241040 +/* C6915C 8024102C 24020003 */ addiu $v0, $zero, 3 +/* C69160 80241030 80630003 */ lb $v1, 3($v1) +/* C69164 80241034 14620002 */ bne $v1, $v0, .L80241040 +/* C69168 80241038 24020001 */ addiu $v0, $zero, 1 +/* C6916C 8024103C AC820084 */ sw $v0, 0x84($a0) +.L80241040: +/* C69170 80241040 03E00008 */ jr $ra +/* C69174 80241044 24020002 */ addiu $v0, $zero, 2 +/* C69178 80241048 00000000 */ nop +/* C6917C 8024104C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644.s deleted file mode 100644 index 08baaf0b45..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241644 -/* C69774 80241644 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C69778 80241648 AFB00010 */ sw $s0, 0x10($sp) -/* C6977C 8024164C 0080802D */ daddu $s0, $a0, $zero -/* C69780 80241650 24020001 */ addiu $v0, $zero, 1 -/* C69784 80241654 10A20019 */ beq $a1, $v0, .L802416BC -/* C69788 80241658 AFBF0014 */ sw $ra, 0x14($sp) -/* C6978C 8024165C 28A20002 */ slti $v0, $a1, 2 -/* C69790 80241660 50400005 */ beql $v0, $zero, .L80241678 -/* C69794 80241664 24020002 */ addiu $v0, $zero, 2 -/* C69798 80241668 10A00007 */ beqz $a1, .L80241688 -/* C6979C 8024166C 00000000 */ nop -/* C697A0 80241670 080905D4 */ j .L80241750 -/* C697A4 80241674 00000000 */ nop -.L80241678: -/* C697A8 80241678 10A20028 */ beq $a1, $v0, .L8024171C -/* C697AC 8024167C 00000000 */ nop -/* C697B0 80241680 080905D4 */ j .L80241750 -/* C697B4 80241684 00000000 */ nop -.L80241688: -/* C697B8 80241688 8E020000 */ lw $v0, ($s0) -/* C697BC 8024168C 30420002 */ andi $v0, $v0, 2 -/* C697C0 80241690 1040002F */ beqz $v0, .L80241750 -/* C697C4 80241694 00000000 */ nop -/* C697C8 80241698 C6000010 */ lwc1 $f0, 0x10($s0) -/* C697CC 8024169C 3C013F73 */ lui $at, 0x3f73 -/* C697D0 802416A0 34213333 */ ori $at, $at, 0x3333 -/* C697D4 802416A4 44811000 */ mtc1 $at, $f2 -/* C697D8 802416A8 00000000 */ nop -/* C697DC 802416AC 46020002 */ mul.s $f0, $f0, $f2 -/* C697E0 802416B0 00000000 */ nop -/* C697E4 802416B4 080905D4 */ j .L80241750 -/* C697E8 802416B8 E6000010 */ swc1 $f0, 0x10($s0) -.L802416BC: -/* C697EC 802416BC C6000010 */ lwc1 $f0, 0x10($s0) -/* C697F0 802416C0 3C013F8F */ lui $at, 0x3f8f -/* C697F4 802416C4 34215C29 */ ori $at, $at, 0x5c29 -/* C697F8 802416C8 44811000 */ mtc1 $at, $f2 -/* C697FC 802416CC 00000000 */ nop -/* C69800 802416D0 46020002 */ mul.s $f0, $f0, $f2 -/* C69804 802416D4 00000000 */ nop -/* C69808 802416D8 8E030020 */ lw $v1, 0x20($s0) -/* C6980C 802416DC 2402000A */ addiu $v0, $zero, 0xa -/* C69810 802416E0 1462001B */ bne $v1, $v0, .L80241750 -/* C69814 802416E4 E6000010 */ swc1 $f0, 0x10($s0) -/* C69818 802416E8 3C048024 */ lui $a0, 0x8024 -/* C6981C 802416EC 2484231C */ addiu $a0, $a0, 0x231c -/* C69820 802416F0 24050001 */ addiu $a1, $zero, 1 -/* C69824 802416F4 0C0B0CF8 */ jal start_script -/* C69828 802416F8 0000302D */ daddu $a2, $zero, $zero -/* C6982C 802416FC 8E030014 */ lw $v1, 0x14($s0) -/* C69830 80241700 AC430084 */ sw $v1, 0x84($v0) -/* C69834 80241704 8E030018 */ lw $v1, 0x18($s0) -/* C69838 80241708 AC430088 */ sw $v1, 0x88($v0) -/* C6983C 8024170C 8E020000 */ lw $v0, ($s0) -/* C69840 80241710 34420002 */ ori $v0, $v0, 2 -/* C69844 80241714 080905D4 */ j .L80241750 -/* C69848 80241718 AE020000 */ sw $v0, ($s0) -.L8024171C: -/* C6984C 8024171C C60C0010 */ lwc1 $f12, 0x10($s0) -/* C69850 80241720 0C00A69F */ jal signF -/* C69854 80241724 46006307 */ neg.s $f12, $f12 -/* C69858 80241728 8E02002C */ lw $v0, 0x2c($s0) -/* C6985C 8024172C 8C42000C */ lw $v0, 0xc($v0) -/* C69860 80241730 04420001 */ bltzl $v0, .L80241738 -/* C69864 80241734 00021023 */ negu $v0, $v0 -.L80241738: -/* C69868 80241738 44821000 */ mtc1 $v0, $f2 -/* C6986C 8024173C 00000000 */ nop -/* C69870 80241740 468010A0 */ cvt.s.w $f2, $f2 -/* C69874 80241744 46001082 */ mul.s $f2, $f2, $f0 -/* C69878 80241748 00000000 */ nop -/* C6987C 8024174C E6020010 */ swc1 $f2, 0x10($s0) -.L80241750: -/* C69880 80241750 8FBF0014 */ lw $ra, 0x14($sp) -/* C69884 80241754 8FB00010 */ lw $s0, 0x10($sp) -/* C69888 80241758 03E00008 */ jr $ra -/* C6988C 8024175C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s new file mode 100644 index 0000000000..d305326f00 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C69180/func_80241644_C69774.s @@ -0,0 +1,81 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241644_C69774 +/* C69774 80241644 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C69778 80241648 AFB00010 */ sw $s0, 0x10($sp) +/* C6977C 8024164C 0080802D */ daddu $s0, $a0, $zero +/* C69780 80241650 24020001 */ addiu $v0, $zero, 1 +/* C69784 80241654 10A20019 */ beq $a1, $v0, .L802416BC +/* C69788 80241658 AFBF0014 */ sw $ra, 0x14($sp) +/* C6978C 8024165C 28A20002 */ slti $v0, $a1, 2 +/* C69790 80241660 50400005 */ beql $v0, $zero, .L80241678 +/* C69794 80241664 24020002 */ addiu $v0, $zero, 2 +/* C69798 80241668 10A00007 */ beqz $a1, .L80241688 +/* C6979C 8024166C 00000000 */ nop +/* C697A0 80241670 080905D4 */ j .L80241750 +/* C697A4 80241674 00000000 */ nop +.L80241678: +/* C697A8 80241678 10A20028 */ beq $a1, $v0, .L8024171C +/* C697AC 8024167C 00000000 */ nop +/* C697B0 80241680 080905D4 */ j .L80241750 +/* C697B4 80241684 00000000 */ nop +.L80241688: +/* C697B8 80241688 8E020000 */ lw $v0, ($s0) +/* C697BC 8024168C 30420002 */ andi $v0, $v0, 2 +/* C697C0 80241690 1040002F */ beqz $v0, .L80241750 +/* C697C4 80241694 00000000 */ nop +/* C697C8 80241698 C6000010 */ lwc1 $f0, 0x10($s0) +/* C697CC 8024169C 3C013F73 */ lui $at, 0x3f73 +/* C697D0 802416A0 34213333 */ ori $at, $at, 0x3333 +/* C697D4 802416A4 44811000 */ mtc1 $at, $f2 +/* C697D8 802416A8 00000000 */ nop +/* C697DC 802416AC 46020002 */ mul.s $f0, $f0, $f2 +/* C697E0 802416B0 00000000 */ nop +/* C697E4 802416B4 080905D4 */ j .L80241750 +/* C697E8 802416B8 E6000010 */ swc1 $f0, 0x10($s0) +.L802416BC: +/* C697EC 802416BC C6000010 */ lwc1 $f0, 0x10($s0) +/* C697F0 802416C0 3C013F8F */ lui $at, 0x3f8f +/* C697F4 802416C4 34215C29 */ ori $at, $at, 0x5c29 +/* C697F8 802416C8 44811000 */ mtc1 $at, $f2 +/* C697FC 802416CC 00000000 */ nop +/* C69800 802416D0 46020002 */ mul.s $f0, $f0, $f2 +/* C69804 802416D4 00000000 */ nop +/* C69808 802416D8 8E030020 */ lw $v1, 0x20($s0) +/* C6980C 802416DC 2402000A */ addiu $v0, $zero, 0xa +/* C69810 802416E0 1462001B */ bne $v1, $v0, .L80241750 +/* C69814 802416E4 E6000010 */ swc1 $f0, 0x10($s0) +/* C69818 802416E8 3C048024 */ lui $a0, 0x8024 +/* C6981C 802416EC 2484231C */ addiu $a0, $a0, 0x231c +/* C69820 802416F0 24050001 */ addiu $a1, $zero, 1 +/* C69824 802416F4 0C0B0CF8 */ jal start_script +/* C69828 802416F8 0000302D */ daddu $a2, $zero, $zero +/* C6982C 802416FC 8E030014 */ lw $v1, 0x14($s0) +/* C69830 80241700 AC430084 */ sw $v1, 0x84($v0) +/* C69834 80241704 8E030018 */ lw $v1, 0x18($s0) +/* C69838 80241708 AC430088 */ sw $v1, 0x88($v0) +/* C6983C 8024170C 8E020000 */ lw $v0, ($s0) +/* C69840 80241710 34420002 */ ori $v0, $v0, 2 +/* C69844 80241714 080905D4 */ j .L80241750 +/* C69848 80241718 AE020000 */ sw $v0, ($s0) +.L8024171C: +/* C6984C 8024171C C60C0010 */ lwc1 $f12, 0x10($s0) +/* C69850 80241720 0C00A69F */ jal signF +/* C69854 80241724 46006307 */ neg.s $f12, $f12 +/* C69858 80241728 8E02002C */ lw $v0, 0x2c($s0) +/* C6985C 8024172C 8C42000C */ lw $v0, 0xc($v0) +/* C69860 80241730 04420001 */ bltzl $v0, .L80241738 +/* C69864 80241734 00021023 */ negu $v0, $v0 +.L80241738: +/* C69868 80241738 44821000 */ mtc1 $v0, $f2 +/* C6986C 8024173C 00000000 */ nop +/* C69870 80241740 468010A0 */ cvt.s.w $f2, $f2 +/* C69874 80241744 46001082 */ mul.s $f2, $f2, $f0 +/* C69878 80241748 00000000 */ nop +/* C6987C 8024174C E6020010 */ swc1 $f2, 0x10($s0) +.L80241750: +/* C69880 80241750 8FBF0014 */ lw $ra, 0x14($sp) +/* C69884 80241754 8FB00010 */ lw $s0, 0x10($sp) +/* C69888 80241758 03E00008 */ jr $ra +/* C6988C 8024175C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC.s deleted file mode 100644 index 50c3d8f8f7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407FC -/* C6D11C 802407FC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C6D120 80240800 AFB5002C */ sw $s5, 0x2c($sp) -/* C6D124 80240804 0080A82D */ daddu $s5, $a0, $zero -/* C6D128 80240808 AFB20020 */ sw $s2, 0x20($sp) -/* C6D12C 8024080C 00A0902D */ daddu $s2, $a1, $zero -/* C6D130 80240810 AFBF003C */ sw $ra, 0x3c($sp) -/* C6D134 80240814 AFBE0038 */ sw $fp, 0x38($sp) -/* C6D138 80240818 AFB70034 */ sw $s7, 0x34($sp) -/* C6D13C 8024081C AFB60030 */ sw $s6, 0x30($sp) -/* C6D140 80240820 AFB40028 */ sw $s4, 0x28($sp) -/* C6D144 80240824 AFB30024 */ sw $s3, 0x24($sp) -/* C6D148 80240828 AFB1001C */ sw $s1, 0x1c($sp) -/* C6D14C 8024082C AFB00018 */ sw $s0, 0x18($sp) -/* C6D150 80240830 8EB0000C */ lw $s0, 0xc($s5) -/* C6D154 80240834 8E050000 */ lw $a1, ($s0) -/* C6D158 80240838 0C0B1EAF */ jal get_variable -/* C6D15C 8024083C 26100004 */ addiu $s0, $s0, 4 -/* C6D160 80240840 8E050000 */ lw $a1, ($s0) -/* C6D164 80240844 26100004 */ addiu $s0, $s0, 4 -/* C6D168 80240848 02A0202D */ daddu $a0, $s5, $zero -/* C6D16C 8024084C 0C0B1EAF */ jal get_variable -/* C6D170 80240850 0040882D */ daddu $s1, $v0, $zero -/* C6D174 80240854 8E050000 */ lw $a1, ($s0) -/* C6D178 80240858 26100004 */ addiu $s0, $s0, 4 -/* C6D17C 8024085C 02A0202D */ daddu $a0, $s5, $zero -/* C6D180 80240860 0C0B1EAF */ jal get_variable -/* C6D184 80240864 AFA20010 */ sw $v0, 0x10($sp) -/* C6D188 80240868 8E050000 */ lw $a1, ($s0) -/* C6D18C 8024086C 26100004 */ addiu $s0, $s0, 4 -/* C6D190 80240870 02A0202D */ daddu $a0, $s5, $zero -/* C6D194 80240874 0C0B1EAF */ jal get_variable -/* C6D198 80240878 0040F02D */ daddu $fp, $v0, $zero -/* C6D19C 8024087C 8E050000 */ lw $a1, ($s0) -/* C6D1A0 80240880 26100004 */ addiu $s0, $s0, 4 -/* C6D1A4 80240884 02A0202D */ daddu $a0, $s5, $zero -/* C6D1A8 80240888 0C0B1EAF */ jal get_variable -/* C6D1AC 8024088C 0040B82D */ daddu $s7, $v0, $zero -/* C6D1B0 80240890 02A0202D */ daddu $a0, $s5, $zero -/* C6D1B4 80240894 8E050000 */ lw $a1, ($s0) -/* C6D1B8 80240898 0C0B1EAF */ jal get_variable -/* C6D1BC 8024089C 0040A02D */ daddu $s4, $v0, $zero -/* C6D1C0 802408A0 0040B02D */ daddu $s6, $v0, $zero -/* C6D1C4 802408A4 12400019 */ beqz $s2, .L8024090C -/* C6D1C8 802408A8 0220982D */ daddu $s3, $s1, $zero -/* C6D1CC 802408AC 96620000 */ lhu $v0, ($s3) -/* C6D1D0 802408B0 10400015 */ beqz $v0, .L80240908 -/* C6D1D4 802408B4 0000902D */ daddu $s2, $zero, $zero -.L802408B8: -/* C6D1D8 802408B8 96240002 */ lhu $a0, 2($s1) -/* C6D1DC 802408BC 0C046C04 */ jal get_model_list_index_from_tree_index -/* C6D1E0 802408C0 00000000 */ nop -/* C6D1E4 802408C4 0C046B4C */ jal get_model_from_list_index -/* C6D1E8 802408C8 0040202D */ daddu $a0, $v0, $zero -/* C6D1EC 802408CC 0040802D */ daddu $s0, $v0, $zero -/* C6D1F0 802408D0 0200202D */ daddu $a0, $s0, $zero -/* C6D1F4 802408D4 2405FFFF */ addiu $a1, $zero, -1 -/* C6D1F8 802408D8 0C046F1F */ jal func_8011BC7C -/* C6D1FC 802408DC 24060003 */ addiu $a2, $zero, 3 -/* C6D200 802408E0 12C00004 */ beqz $s6, .L802408F4 -/* C6D204 802408E4 00000000 */ nop -/* C6D208 802408E8 96020000 */ lhu $v0, ($s0) -/* C6D20C 802408EC 3042FFFD */ andi $v0, $v0, 0xfffd -/* C6D210 802408F0 A6020000 */ sh $v0, ($s0) -.L802408F4: -/* C6D214 802408F4 96620000 */ lhu $v0, ($s3) -/* C6D218 802408F8 26520001 */ addiu $s2, $s2, 1 -/* C6D21C 802408FC 0242102A */ slt $v0, $s2, $v0 -/* C6D220 80240900 1440FFED */ bnez $v0, .L802408B8 -/* C6D224 80240904 26310002 */ addiu $s1, $s1, 2 -.L80240908: -/* C6D228 80240908 AEB40070 */ sw $s4, 0x70($s5) -.L8024090C: -/* C6D22C 8024090C 12C00011 */ beqz $s6, .L80240954 -/* C6D230 80240910 33C500FF */ andi $a1, $fp, 0xff -/* C6D234 80240914 8EA20070 */ lw $v0, 0x70($s5) -/* C6D238 80240918 00023A00 */ sll $a3, $v0, 8 -/* C6D23C 8024091C 00E23823 */ subu $a3, $a3, $v0 -/* C6D240 80240920 16800002 */ bnez $s4, .L8024092C -/* C6D244 80240924 00F4001A */ div $zero, $a3, $s4 -/* C6D248 80240928 0007000D */ break 7 -.L8024092C: -/* C6D24C 8024092C 2401FFFF */ addiu $at, $zero, -1 -/* C6D250 80240930 16810004 */ bne $s4, $at, .L80240944 -/* C6D254 80240934 3C018000 */ lui $at, 0x8000 -/* C6D258 80240938 14E10002 */ bne $a3, $at, .L80240944 -/* C6D25C 8024093C 00000000 */ nop -/* C6D260 80240940 0006000D */ break 6 -.L80240944: -/* C6D264 80240944 00003812 */ mflo $a3 -/* C6D268 80240948 93A40013 */ lbu $a0, 0x13($sp) -/* C6D26C 8024094C 08090265 */ j .L80240994 -/* C6D270 80240950 32E600FF */ andi $a2, $s7, 0xff -.L80240954: -/* C6D274 80240954 8EA20070 */ lw $v0, 0x70($s5) -/* C6D278 80240958 00023A00 */ sll $a3, $v0, 8 -/* C6D27C 8024095C 00E23823 */ subu $a3, $a3, $v0 -/* C6D280 80240960 16800002 */ bnez $s4, .L8024096C -/* C6D284 80240964 00F4001A */ div $zero, $a3, $s4 -/* C6D288 80240968 0007000D */ break 7 -.L8024096C: -/* C6D28C 8024096C 2401FFFF */ addiu $at, $zero, -1 -/* C6D290 80240970 16810004 */ bne $s4, $at, .L80240984 -/* C6D294 80240974 3C018000 */ lui $at, 0x8000 -/* C6D298 80240978 14E10002 */ bne $a3, $at, .L80240984 -/* C6D29C 8024097C 00000000 */ nop -/* C6D2A0 80240980 0006000D */ break 6 -.L80240984: -/* C6D2A4 80240984 00003812 */ mflo $a3 -/* C6D2A8 80240988 32E600FF */ andi $a2, $s7, 0xff -/* C6D2AC 8024098C 93A40013 */ lbu $a0, 0x13($sp) -/* C6D2B0 80240990 00073827 */ nor $a3, $zero, $a3 -.L80240994: -/* C6D2B4 80240994 0C046F97 */ jal set_background_color_blend -/* C6D2B8 80240998 30E700FF */ andi $a3, $a3, 0xff -/* C6D2BC 8024099C 8EA20070 */ lw $v0, 0x70($s5) -/* C6D2C0 802409A0 2442FFFF */ addiu $v0, $v0, -1 -/* C6D2C4 802409A4 0441001A */ bgez $v0, .L80240A10 -/* C6D2C8 802409A8 AEA20070 */ sw $v0, 0x70($s5) -/* C6D2CC 802409AC 96620000 */ lhu $v0, ($s3) -/* C6D2D0 802409B0 10400015 */ beqz $v0, .L80240A08 -/* C6D2D4 802409B4 0000902D */ daddu $s2, $zero, $zero -/* C6D2D8 802409B8 0260882D */ daddu $s1, $s3, $zero -.L802409BC: -/* C6D2DC 802409BC 0C046C04 */ jal get_model_list_index_from_tree_index -/* C6D2E0 802409C0 96240002 */ lhu $a0, 2($s1) -/* C6D2E4 802409C4 0C046B4C */ jal get_model_from_list_index -/* C6D2E8 802409C8 0040202D */ daddu $a0, $v0, $zero -/* C6D2EC 802409CC 0040802D */ daddu $s0, $v0, $zero -/* C6D2F0 802409D0 0200202D */ daddu $a0, $s0, $zero -/* C6D2F4 802409D4 2405FFFF */ addiu $a1, $zero, -1 -/* C6D2F8 802409D8 0C046F1F */ jal func_8011BC7C -/* C6D2FC 802409DC 0000302D */ daddu $a2, $zero, $zero -/* C6D300 802409E0 16C00004 */ bnez $s6, .L802409F4 -/* C6D304 802409E4 00000000 */ nop -/* C6D308 802409E8 96020000 */ lhu $v0, ($s0) -/* C6D30C 802409EC 34420002 */ ori $v0, $v0, 2 -/* C6D310 802409F0 A6020000 */ sh $v0, ($s0) -.L802409F4: -/* C6D314 802409F4 96620000 */ lhu $v0, ($s3) -/* C6D318 802409F8 26520001 */ addiu $s2, $s2, 1 -/* C6D31C 802409FC 0242102A */ slt $v0, $s2, $v0 -/* C6D320 80240A00 1440FFEE */ bnez $v0, .L802409BC -/* C6D324 80240A04 26310002 */ addiu $s1, $s1, 2 -.L80240A08: -/* C6D328 80240A08 08090285 */ j .L80240A14 -/* C6D32C 80240A0C 24020001 */ addiu $v0, $zero, 1 -.L80240A10: -/* C6D330 80240A10 0000102D */ daddu $v0, $zero, $zero -.L80240A14: -/* C6D334 80240A14 8FBF003C */ lw $ra, 0x3c($sp) -/* C6D338 80240A18 8FBE0038 */ lw $fp, 0x38($sp) -/* C6D33C 80240A1C 8FB70034 */ lw $s7, 0x34($sp) -/* C6D340 80240A20 8FB60030 */ lw $s6, 0x30($sp) -/* C6D344 80240A24 8FB5002C */ lw $s5, 0x2c($sp) -/* C6D348 80240A28 8FB40028 */ lw $s4, 0x28($sp) -/* C6D34C 80240A2C 8FB30024 */ lw $s3, 0x24($sp) -/* C6D350 80240A30 8FB20020 */ lw $s2, 0x20($sp) -/* C6D354 80240A34 8FB1001C */ lw $s1, 0x1c($sp) -/* C6D358 80240A38 8FB00018 */ lw $s0, 0x18($sp) -/* C6D35C 80240A3C 03E00008 */ jr $ra -/* C6D360 80240A40 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC_C6D11C.s b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC_C6D11C.s new file mode 100644 index 0000000000..6cd7d8933a --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_06/C6CD10/func_802407FC_C6D11C.s @@ -0,0 +1,165 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407FC_C6D11C +/* C6D11C 802407FC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* C6D120 80240800 AFB5002C */ sw $s5, 0x2c($sp) +/* C6D124 80240804 0080A82D */ daddu $s5, $a0, $zero +/* C6D128 80240808 AFB20020 */ sw $s2, 0x20($sp) +/* C6D12C 8024080C 00A0902D */ daddu $s2, $a1, $zero +/* C6D130 80240810 AFBF003C */ sw $ra, 0x3c($sp) +/* C6D134 80240814 AFBE0038 */ sw $fp, 0x38($sp) +/* C6D138 80240818 AFB70034 */ sw $s7, 0x34($sp) +/* C6D13C 8024081C AFB60030 */ sw $s6, 0x30($sp) +/* C6D140 80240820 AFB40028 */ sw $s4, 0x28($sp) +/* C6D144 80240824 AFB30024 */ sw $s3, 0x24($sp) +/* C6D148 80240828 AFB1001C */ sw $s1, 0x1c($sp) +/* C6D14C 8024082C AFB00018 */ sw $s0, 0x18($sp) +/* C6D150 80240830 8EB0000C */ lw $s0, 0xc($s5) +/* C6D154 80240834 8E050000 */ lw $a1, ($s0) +/* C6D158 80240838 0C0B1EAF */ jal get_variable +/* C6D15C 8024083C 26100004 */ addiu $s0, $s0, 4 +/* C6D160 80240840 8E050000 */ lw $a1, ($s0) +/* C6D164 80240844 26100004 */ addiu $s0, $s0, 4 +/* C6D168 80240848 02A0202D */ daddu $a0, $s5, $zero +/* C6D16C 8024084C 0C0B1EAF */ jal get_variable +/* C6D170 80240850 0040882D */ daddu $s1, $v0, $zero +/* C6D174 80240854 8E050000 */ lw $a1, ($s0) +/* C6D178 80240858 26100004 */ addiu $s0, $s0, 4 +/* C6D17C 8024085C 02A0202D */ daddu $a0, $s5, $zero +/* C6D180 80240860 0C0B1EAF */ jal get_variable +/* C6D184 80240864 AFA20010 */ sw $v0, 0x10($sp) +/* C6D188 80240868 8E050000 */ lw $a1, ($s0) +/* C6D18C 8024086C 26100004 */ addiu $s0, $s0, 4 +/* C6D190 80240870 02A0202D */ daddu $a0, $s5, $zero +/* C6D194 80240874 0C0B1EAF */ jal get_variable +/* C6D198 80240878 0040F02D */ daddu $fp, $v0, $zero +/* C6D19C 8024087C 8E050000 */ lw $a1, ($s0) +/* C6D1A0 80240880 26100004 */ addiu $s0, $s0, 4 +/* C6D1A4 80240884 02A0202D */ daddu $a0, $s5, $zero +/* C6D1A8 80240888 0C0B1EAF */ jal get_variable +/* C6D1AC 8024088C 0040B82D */ daddu $s7, $v0, $zero +/* C6D1B0 80240890 02A0202D */ daddu $a0, $s5, $zero +/* C6D1B4 80240894 8E050000 */ lw $a1, ($s0) +/* C6D1B8 80240898 0C0B1EAF */ jal get_variable +/* C6D1BC 8024089C 0040A02D */ daddu $s4, $v0, $zero +/* C6D1C0 802408A0 0040B02D */ daddu $s6, $v0, $zero +/* C6D1C4 802408A4 12400019 */ beqz $s2, .L8024090C +/* C6D1C8 802408A8 0220982D */ daddu $s3, $s1, $zero +/* C6D1CC 802408AC 96620000 */ lhu $v0, ($s3) +/* C6D1D0 802408B0 10400015 */ beqz $v0, .L80240908 +/* C6D1D4 802408B4 0000902D */ daddu $s2, $zero, $zero +.L802408B8: +/* C6D1D8 802408B8 96240002 */ lhu $a0, 2($s1) +/* C6D1DC 802408BC 0C046C04 */ jal get_model_list_index_from_tree_index +/* C6D1E0 802408C0 00000000 */ nop +/* C6D1E4 802408C4 0C046B4C */ jal get_model_from_list_index +/* C6D1E8 802408C8 0040202D */ daddu $a0, $v0, $zero +/* C6D1EC 802408CC 0040802D */ daddu $s0, $v0, $zero +/* C6D1F0 802408D0 0200202D */ daddu $a0, $s0, $zero +/* C6D1F4 802408D4 2405FFFF */ addiu $a1, $zero, -1 +/* C6D1F8 802408D8 0C046F1F */ jal func_8011BC7C +/* C6D1FC 802408DC 24060003 */ addiu $a2, $zero, 3 +/* C6D200 802408E0 12C00004 */ beqz $s6, .L802408F4 +/* C6D204 802408E4 00000000 */ nop +/* C6D208 802408E8 96020000 */ lhu $v0, ($s0) +/* C6D20C 802408EC 3042FFFD */ andi $v0, $v0, 0xfffd +/* C6D210 802408F0 A6020000 */ sh $v0, ($s0) +.L802408F4: +/* C6D214 802408F4 96620000 */ lhu $v0, ($s3) +/* C6D218 802408F8 26520001 */ addiu $s2, $s2, 1 +/* C6D21C 802408FC 0242102A */ slt $v0, $s2, $v0 +/* C6D220 80240900 1440FFED */ bnez $v0, .L802408B8 +/* C6D224 80240904 26310002 */ addiu $s1, $s1, 2 +.L80240908: +/* C6D228 80240908 AEB40070 */ sw $s4, 0x70($s5) +.L8024090C: +/* C6D22C 8024090C 12C00011 */ beqz $s6, .L80240954 +/* C6D230 80240910 33C500FF */ andi $a1, $fp, 0xff +/* C6D234 80240914 8EA20070 */ lw $v0, 0x70($s5) +/* C6D238 80240918 00023A00 */ sll $a3, $v0, 8 +/* C6D23C 8024091C 00E23823 */ subu $a3, $a3, $v0 +/* C6D240 80240920 16800002 */ bnez $s4, .L8024092C +/* C6D244 80240924 00F4001A */ div $zero, $a3, $s4 +/* C6D248 80240928 0007000D */ break 7 +.L8024092C: +/* C6D24C 8024092C 2401FFFF */ addiu $at, $zero, -1 +/* C6D250 80240930 16810004 */ bne $s4, $at, .L80240944 +/* C6D254 80240934 3C018000 */ lui $at, 0x8000 +/* C6D258 80240938 14E10002 */ bne $a3, $at, .L80240944 +/* C6D25C 8024093C 00000000 */ nop +/* C6D260 80240940 0006000D */ break 6 +.L80240944: +/* C6D264 80240944 00003812 */ mflo $a3 +/* C6D268 80240948 93A40013 */ lbu $a0, 0x13($sp) +/* C6D26C 8024094C 08090265 */ j .L80240994 +/* C6D270 80240950 32E600FF */ andi $a2, $s7, 0xff +.L80240954: +/* C6D274 80240954 8EA20070 */ lw $v0, 0x70($s5) +/* C6D278 80240958 00023A00 */ sll $a3, $v0, 8 +/* C6D27C 8024095C 00E23823 */ subu $a3, $a3, $v0 +/* C6D280 80240960 16800002 */ bnez $s4, .L8024096C +/* C6D284 80240964 00F4001A */ div $zero, $a3, $s4 +/* C6D288 80240968 0007000D */ break 7 +.L8024096C: +/* C6D28C 8024096C 2401FFFF */ addiu $at, $zero, -1 +/* C6D290 80240970 16810004 */ bne $s4, $at, .L80240984 +/* C6D294 80240974 3C018000 */ lui $at, 0x8000 +/* C6D298 80240978 14E10002 */ bne $a3, $at, .L80240984 +/* C6D29C 8024097C 00000000 */ nop +/* C6D2A0 80240980 0006000D */ break 6 +.L80240984: +/* C6D2A4 80240984 00003812 */ mflo $a3 +/* C6D2A8 80240988 32E600FF */ andi $a2, $s7, 0xff +/* C6D2AC 8024098C 93A40013 */ lbu $a0, 0x13($sp) +/* C6D2B0 80240990 00073827 */ nor $a3, $zero, $a3 +.L80240994: +/* C6D2B4 80240994 0C046F97 */ jal set_background_color_blend +/* C6D2B8 80240998 30E700FF */ andi $a3, $a3, 0xff +/* C6D2BC 8024099C 8EA20070 */ lw $v0, 0x70($s5) +/* C6D2C0 802409A0 2442FFFF */ addiu $v0, $v0, -1 +/* C6D2C4 802409A4 0441001A */ bgez $v0, .L80240A10 +/* C6D2C8 802409A8 AEA20070 */ sw $v0, 0x70($s5) +/* C6D2CC 802409AC 96620000 */ lhu $v0, ($s3) +/* C6D2D0 802409B0 10400015 */ beqz $v0, .L80240A08 +/* C6D2D4 802409B4 0000902D */ daddu $s2, $zero, $zero +/* C6D2D8 802409B8 0260882D */ daddu $s1, $s3, $zero +.L802409BC: +/* C6D2DC 802409BC 0C046C04 */ jal get_model_list_index_from_tree_index +/* C6D2E0 802409C0 96240002 */ lhu $a0, 2($s1) +/* C6D2E4 802409C4 0C046B4C */ jal get_model_from_list_index +/* C6D2E8 802409C8 0040202D */ daddu $a0, $v0, $zero +/* C6D2EC 802409CC 0040802D */ daddu $s0, $v0, $zero +/* C6D2F0 802409D0 0200202D */ daddu $a0, $s0, $zero +/* C6D2F4 802409D4 2405FFFF */ addiu $a1, $zero, -1 +/* C6D2F8 802409D8 0C046F1F */ jal func_8011BC7C +/* C6D2FC 802409DC 0000302D */ daddu $a2, $zero, $zero +/* C6D300 802409E0 16C00004 */ bnez $s6, .L802409F4 +/* C6D304 802409E4 00000000 */ nop +/* C6D308 802409E8 96020000 */ lhu $v0, ($s0) +/* C6D30C 802409EC 34420002 */ ori $v0, $v0, 2 +/* C6D310 802409F0 A6020000 */ sh $v0, ($s0) +.L802409F4: +/* C6D314 802409F4 96620000 */ lhu $v0, ($s3) +/* C6D318 802409F8 26520001 */ addiu $s2, $s2, 1 +/* C6D31C 802409FC 0242102A */ slt $v0, $s2, $v0 +/* C6D320 80240A00 1440FFEE */ bnez $v0, .L802409BC +/* C6D324 80240A04 26310002 */ addiu $s1, $s1, 2 +.L80240A08: +/* C6D328 80240A08 08090285 */ j .L80240A14 +/* C6D32C 80240A0C 24020001 */ addiu $v0, $zero, 1 +.L80240A10: +/* C6D330 80240A10 0000102D */ daddu $v0, $zero, $zero +.L80240A14: +/* C6D334 80240A14 8FBF003C */ lw $ra, 0x3c($sp) +/* C6D338 80240A18 8FBE0038 */ lw $fp, 0x38($sp) +/* C6D33C 80240A1C 8FB70034 */ lw $s7, 0x34($sp) +/* C6D340 80240A20 8FB60030 */ lw $s6, 0x30($sp) +/* C6D344 80240A24 8FB5002C */ lw $s5, 0x2c($sp) +/* C6D348 80240A28 8FB40028 */ lw $s4, 0x28($sp) +/* C6D34C 80240A2C 8FB30024 */ lw $s3, 0x24($sp) +/* C6D350 80240A30 8FB20020 */ lw $s2, 0x20($sp) +/* C6D354 80240A34 8FB1001C */ lw $s1, 0x1c($sp) +/* C6D358 80240A38 8FB00018 */ lw $s0, 0x18($sp) +/* C6D35C 80240A3C 03E00008 */ jr $ra +/* C6D360 80240A40 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C.s deleted file mode 100644 index d92dd538be..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024040C -/* C6E73C 8024040C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C6E740 80240410 AFB00010 */ sw $s0, 0x10($sp) -/* C6E744 80240414 0080802D */ daddu $s0, $a0, $zero -/* C6E748 80240418 AFBF0014 */ sw $ra, 0x14($sp) -/* C6E74C 8024041C 8E0300A8 */ lw $v1, 0xa8($s0) -/* C6E750 80240420 8E020088 */ lw $v0, 0x88($s0) -/* C6E754 80240424 00621821 */ addu $v1, $v1, $v0 -/* C6E758 80240428 04610004 */ bgez $v1, .L8024043C -/* C6E75C 8024042C AE0300A8 */ sw $v1, 0xa8($s0) -/* C6E760 80240430 3C020002 */ lui $v0, 2 -/* C6E764 80240434 08090113 */ j .L8024044C -/* C6E768 80240438 00621021 */ addu $v0, $v1, $v0 -.L8024043C: -/* C6E76C 8024043C 3C040002 */ lui $a0, 2 -/* C6E770 80240440 0083102A */ slt $v0, $a0, $v1 -/* C6E774 80240444 10400002 */ beqz $v0, .L80240450 -/* C6E778 80240448 00641023 */ subu $v0, $v1, $a0 -.L8024044C: -/* C6E77C 8024044C AE0200A8 */ sw $v0, 0xa8($s0) -.L80240450: -/* C6E780 80240450 8E0300AC */ lw $v1, 0xac($s0) -/* C6E784 80240454 8E02008C */ lw $v0, 0x8c($s0) -/* C6E788 80240458 00621821 */ addu $v1, $v1, $v0 -/* C6E78C 8024045C 04610004 */ bgez $v1, .L80240470 -/* C6E790 80240460 AE0300AC */ sw $v1, 0xac($s0) -/* C6E794 80240464 3C020002 */ lui $v0, 2 -/* C6E798 80240468 08090120 */ j .L80240480 -/* C6E79C 8024046C 00621021 */ addu $v0, $v1, $v0 -.L80240470: -/* C6E7A0 80240470 3C040002 */ lui $a0, 2 -/* C6E7A4 80240474 0083102A */ slt $v0, $a0, $v1 -/* C6E7A8 80240478 10400002 */ beqz $v0, .L80240484 -/* C6E7AC 8024047C 00641023 */ subu $v0, $v1, $a0 -.L80240480: -/* C6E7B0 80240480 AE0200AC */ sw $v0, 0xac($s0) -.L80240484: -/* C6E7B4 80240484 8E0300B0 */ lw $v1, 0xb0($s0) -/* C6E7B8 80240488 8E020090 */ lw $v0, 0x90($s0) -/* C6E7BC 8024048C 00621821 */ addu $v1, $v1, $v0 -/* C6E7C0 80240490 04610004 */ bgez $v1, .L802404A4 -/* C6E7C4 80240494 AE0300B0 */ sw $v1, 0xb0($s0) -/* C6E7C8 80240498 3C020002 */ lui $v0, 2 -/* C6E7CC 8024049C 0809012D */ j .L802404B4 -/* C6E7D0 802404A0 00621021 */ addu $v0, $v1, $v0 -.L802404A4: -/* C6E7D4 802404A4 3C040002 */ lui $a0, 2 -/* C6E7D8 802404A8 0083102A */ slt $v0, $a0, $v1 -/* C6E7DC 802404AC 10400002 */ beqz $v0, .L802404B8 -/* C6E7E0 802404B0 00641023 */ subu $v0, $v1, $a0 -.L802404B4: -/* C6E7E4 802404B4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404B8: -/* C6E7E8 802404B8 8E0300B4 */ lw $v1, 0xb4($s0) -/* C6E7EC 802404BC 8E020094 */ lw $v0, 0x94($s0) -/* C6E7F0 802404C0 00621821 */ addu $v1, $v1, $v0 -/* C6E7F4 802404C4 04610004 */ bgez $v1, .L802404D8 -/* C6E7F8 802404C8 AE0300B4 */ sw $v1, 0xb4($s0) -/* C6E7FC 802404CC 3C020002 */ lui $v0, 2 -/* C6E800 802404D0 0809013A */ j .L802404E8 -/* C6E804 802404D4 00621021 */ addu $v0, $v1, $v0 -.L802404D8: -/* C6E808 802404D8 3C040002 */ lui $a0, 2 -/* C6E80C 802404DC 0083102A */ slt $v0, $a0, $v1 -/* C6E810 802404E0 10400002 */ beqz $v0, .L802404EC -/* C6E814 802404E4 00641023 */ subu $v0, $v1, $a0 -.L802404E8: -/* C6E818 802404E8 AE0200B4 */ sw $v0, 0xb4($s0) -.L802404EC: -/* C6E81C 802404EC 8E040084 */ lw $a0, 0x84($s0) -/* C6E820 802404F0 0C046F07 */ jal set_main_pan_u -/* C6E824 802404F4 8E0500A8 */ lw $a1, 0xa8($s0) -/* C6E828 802404F8 8E040084 */ lw $a0, 0x84($s0) -/* C6E82C 802404FC 0C046F0D */ jal set_main_pan_v -/* C6E830 80240500 8E0500AC */ lw $a1, 0xac($s0) -/* C6E834 80240504 8E040084 */ lw $a0, 0x84($s0) -/* C6E838 80240508 0C046F13 */ jal set_aux_pan_u -/* C6E83C 8024050C 8E0500B0 */ lw $a1, 0xb0($s0) -/* C6E840 80240510 8E040084 */ lw $a0, 0x84($s0) -/* C6E844 80240514 0C046F19 */ jal set_aux_pan_v -/* C6E848 80240518 8E0500B4 */ lw $a1, 0xb4($s0) -/* C6E84C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) -/* C6E850 80240520 8FB00010 */ lw $s0, 0x10($sp) -/* C6E854 80240524 0000102D */ daddu $v0, $zero, $zero -/* C6E858 80240528 03E00008 */ jr $ra -/* C6E85C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C_C6E73C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C_C6E73C.s new file mode 100644 index 0000000000..a2a916367a --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6E330/func_8024040C_C6E73C.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024040C_C6E73C +/* C6E73C 8024040C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C6E740 80240410 AFB00010 */ sw $s0, 0x10($sp) +/* C6E744 80240414 0080802D */ daddu $s0, $a0, $zero +/* C6E748 80240418 AFBF0014 */ sw $ra, 0x14($sp) +/* C6E74C 8024041C 8E0300A8 */ lw $v1, 0xa8($s0) +/* C6E750 80240420 8E020088 */ lw $v0, 0x88($s0) +/* C6E754 80240424 00621821 */ addu $v1, $v1, $v0 +/* C6E758 80240428 04610004 */ bgez $v1, .L8024043C +/* C6E75C 8024042C AE0300A8 */ sw $v1, 0xa8($s0) +/* C6E760 80240430 3C020002 */ lui $v0, 2 +/* C6E764 80240434 08090113 */ j .L8024044C +/* C6E768 80240438 00621021 */ addu $v0, $v1, $v0 +.L8024043C: +/* C6E76C 8024043C 3C040002 */ lui $a0, 2 +/* C6E770 80240440 0083102A */ slt $v0, $a0, $v1 +/* C6E774 80240444 10400002 */ beqz $v0, .L80240450 +/* C6E778 80240448 00641023 */ subu $v0, $v1, $a0 +.L8024044C: +/* C6E77C 8024044C AE0200A8 */ sw $v0, 0xa8($s0) +.L80240450: +/* C6E780 80240450 8E0300AC */ lw $v1, 0xac($s0) +/* C6E784 80240454 8E02008C */ lw $v0, 0x8c($s0) +/* C6E788 80240458 00621821 */ addu $v1, $v1, $v0 +/* C6E78C 8024045C 04610004 */ bgez $v1, .L80240470 +/* C6E790 80240460 AE0300AC */ sw $v1, 0xac($s0) +/* C6E794 80240464 3C020002 */ lui $v0, 2 +/* C6E798 80240468 08090120 */ j .L80240480 +/* C6E79C 8024046C 00621021 */ addu $v0, $v1, $v0 +.L80240470: +/* C6E7A0 80240470 3C040002 */ lui $a0, 2 +/* C6E7A4 80240474 0083102A */ slt $v0, $a0, $v1 +/* C6E7A8 80240478 10400002 */ beqz $v0, .L80240484 +/* C6E7AC 8024047C 00641023 */ subu $v0, $v1, $a0 +.L80240480: +/* C6E7B0 80240480 AE0200AC */ sw $v0, 0xac($s0) +.L80240484: +/* C6E7B4 80240484 8E0300B0 */ lw $v1, 0xb0($s0) +/* C6E7B8 80240488 8E020090 */ lw $v0, 0x90($s0) +/* C6E7BC 8024048C 00621821 */ addu $v1, $v1, $v0 +/* C6E7C0 80240490 04610004 */ bgez $v1, .L802404A4 +/* C6E7C4 80240494 AE0300B0 */ sw $v1, 0xb0($s0) +/* C6E7C8 80240498 3C020002 */ lui $v0, 2 +/* C6E7CC 8024049C 0809012D */ j .L802404B4 +/* C6E7D0 802404A0 00621021 */ addu $v0, $v1, $v0 +.L802404A4: +/* C6E7D4 802404A4 3C040002 */ lui $a0, 2 +/* C6E7D8 802404A8 0083102A */ slt $v0, $a0, $v1 +/* C6E7DC 802404AC 10400002 */ beqz $v0, .L802404B8 +/* C6E7E0 802404B0 00641023 */ subu $v0, $v1, $a0 +.L802404B4: +/* C6E7E4 802404B4 AE0200B0 */ sw $v0, 0xb0($s0) +.L802404B8: +/* C6E7E8 802404B8 8E0300B4 */ lw $v1, 0xb4($s0) +/* C6E7EC 802404BC 8E020094 */ lw $v0, 0x94($s0) +/* C6E7F0 802404C0 00621821 */ addu $v1, $v1, $v0 +/* C6E7F4 802404C4 04610004 */ bgez $v1, .L802404D8 +/* C6E7F8 802404C8 AE0300B4 */ sw $v1, 0xb4($s0) +/* C6E7FC 802404CC 3C020002 */ lui $v0, 2 +/* C6E800 802404D0 0809013A */ j .L802404E8 +/* C6E804 802404D4 00621021 */ addu $v0, $v1, $v0 +.L802404D8: +/* C6E808 802404D8 3C040002 */ lui $a0, 2 +/* C6E80C 802404DC 0083102A */ slt $v0, $a0, $v1 +/* C6E810 802404E0 10400002 */ beqz $v0, .L802404EC +/* C6E814 802404E4 00641023 */ subu $v0, $v1, $a0 +.L802404E8: +/* C6E818 802404E8 AE0200B4 */ sw $v0, 0xb4($s0) +.L802404EC: +/* C6E81C 802404EC 8E040084 */ lw $a0, 0x84($s0) +/* C6E820 802404F0 0C046F07 */ jal set_main_pan_u +/* C6E824 802404F4 8E0500A8 */ lw $a1, 0xa8($s0) +/* C6E828 802404F8 8E040084 */ lw $a0, 0x84($s0) +/* C6E82C 802404FC 0C046F0D */ jal set_main_pan_v +/* C6E830 80240500 8E0500AC */ lw $a1, 0xac($s0) +/* C6E834 80240504 8E040084 */ lw $a0, 0x84($s0) +/* C6E838 80240508 0C046F13 */ jal set_aux_pan_u +/* C6E83C 8024050C 8E0500B0 */ lw $a1, 0xb0($s0) +/* C6E840 80240510 8E040084 */ lw $a0, 0x84($s0) +/* C6E844 80240514 0C046F19 */ jal set_aux_pan_v +/* C6E848 80240518 8E0500B4 */ lw $a1, 0xb4($s0) +/* C6E84C 8024051C 8FBF0014 */ lw $ra, 0x14($sp) +/* C6E850 80240520 8FB00010 */ lw $s0, 0x10($sp) +/* C6E854 80240524 0000102D */ daddu $v0, $zero, $zero +/* C6E858 80240528 03E00008 */ jr $ra +/* C6E85C 8024052C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0.s deleted file mode 100644 index f6f64f08dc..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409D0 -/* C6ED00 802409D0 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C6ED04 802409D4 AFB3004C */ sw $s3, 0x4c($sp) -/* C6ED08 802409D8 0080982D */ daddu $s3, $a0, $zero -/* C6ED0C 802409DC AFBF0058 */ sw $ra, 0x58($sp) -/* C6ED10 802409E0 AFB50054 */ sw $s5, 0x54($sp) -/* C6ED14 802409E4 AFB40050 */ sw $s4, 0x50($sp) -/* C6ED18 802409E8 AFB20048 */ sw $s2, 0x48($sp) -/* C6ED1C 802409EC AFB10044 */ sw $s1, 0x44($sp) -/* C6ED20 802409F0 AFB00040 */ sw $s0, 0x40($sp) -/* C6ED24 802409F4 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C6ED28 802409F8 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C6ED2C 802409FC F7B60068 */ sdc1 $f22, 0x68($sp) -/* C6ED30 80240A00 F7B40060 */ sdc1 $f20, 0x60($sp) -/* C6ED34 80240A04 8E710148 */ lw $s1, 0x148($s3) -/* C6ED38 80240A08 00A0902D */ daddu $s2, $a1, $zero -/* C6ED3C 80240A0C 86240008 */ lh $a0, 8($s1) -/* C6ED40 80240A10 0C00EABB */ jal get_npc_unsafe -/* C6ED44 80240A14 00C0A82D */ daddu $s5, $a2, $zero -/* C6ED48 80240A18 0040802D */ daddu $s0, $v0, $zero -/* C6ED4C 80240A1C 0000A02D */ daddu $s4, $zero, $zero -/* C6ED50 80240A20 C624007C */ lwc1 $f4, 0x7c($s1) -/* C6ED54 80240A24 46802120 */ cvt.s.w $f4, $f4 -/* C6ED58 80240A28 C6220088 */ lwc1 $f2, 0x88($s1) -/* C6ED5C 80240A2C 468010A0 */ cvt.s.w $f2, $f2 -/* C6ED60 80240A30 460010A1 */ cvt.d.s $f2, $f2 -/* C6ED64 80240A34 46002121 */ cvt.d.s $f4, $f4 -/* C6ED68 80240A38 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6ED6C 80240A3C 3C014059 */ lui $at, 0x4059 -/* C6ED70 80240A40 44813800 */ mtc1 $at, $f7 -/* C6ED74 80240A44 44803000 */ mtc1 $zero, $f6 -/* C6ED78 80240A48 46000021 */ cvt.d.s $f0, $f0 -/* C6ED7C 80240A4C 46260002 */ mul.d $f0, $f0, $f6 -/* C6ED80 80240A50 00000000 */ nop -/* C6ED84 80240A54 24020001 */ addiu $v0, $zero, 1 -/* C6ED88 80240A58 8E24006C */ lw $a0, 0x6c($s1) -/* C6ED8C 80240A5C 46261083 */ div.d $f2, $f2, $f6 -/* C6ED90 80240A60 462010A0 */ cvt.s.d $f2, $f2 -/* C6ED94 80240A64 46262103 */ div.d $f4, $f4, $f6 -/* C6ED98 80240A68 46202520 */ cvt.s.d $f20, $f4 -/* C6ED9C 80240A6C 30830011 */ andi $v1, $a0, 0x11 -/* C6EDA0 80240A70 4620020D */ trunc.w.d $f8, $f0 -/* C6EDA4 80240A74 E628007C */ swc1 $f8, 0x7c($s1) -/* C6EDA8 80240A78 C6200078 */ lwc1 $f0, 0x78($s1) -/* C6EDAC 80240A7C 46800020 */ cvt.s.w $f0, $f0 -/* C6EDB0 80240A80 46000021 */ cvt.d.s $f0, $f0 -/* C6EDB4 80240A84 46260003 */ div.d $f0, $f0, $f6 -/* C6EDB8 80240A88 462006A0 */ cvt.s.d $f26, $f0 -/* C6EDBC 80240A8C C6200070 */ lwc1 $f0, 0x70($s1) -/* C6EDC0 80240A90 46800020 */ cvt.s.w $f0, $f0 -/* C6EDC4 80240A94 46000021 */ cvt.d.s $f0, $f0 -/* C6EDC8 80240A98 46260003 */ div.d $f0, $f0, $f6 -/* C6EDCC 80240A9C 462005A0 */ cvt.s.d $f22, $f0 -/* C6EDD0 80240AA0 14620025 */ bne $v1, $v0, .L80240B38 -/* C6EDD4 80240AA4 4602D600 */ add.s $f24, $f26, $f2 -/* C6EDD8 80240AA8 8E020000 */ lw $v0, ($s0) -/* C6EDDC 80240AAC 30420008 */ andi $v0, $v0, 8 -/* C6EDE0 80240AB0 10400009 */ beqz $v0, .L80240AD8 -/* C6EDE4 80240AB4 27A50028 */ addiu $a1, $sp, 0x28 -/* C6EDE8 80240AB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6EDEC 80240ABC 4600C001 */ sub.s $f0, $f24, $f0 -/* C6EDF0 80240AC0 4600B03C */ c.lt.s $f22, $f0 -/* C6EDF4 80240AC4 00000000 */ nop -/* C6EDF8 80240AC8 4500001B */ bc1f .L80240B38 -/* C6EDFC 80240ACC 34820010 */ ori $v0, $a0, 0x10 -/* C6EE00 80240AD0 080902CE */ j .L80240B38 -/* C6EE04 80240AD4 AE22006C */ sw $v0, 0x6c($s1) -.L80240AD8: -/* C6EE08 80240AD8 27A6002C */ addiu $a2, $sp, 0x2c -/* C6EE0C 80240ADC C6000038 */ lwc1 $f0, 0x38($s0) -/* C6EE10 80240AE0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6EE14 80240AE4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C6EE18 80240AE8 3C01447A */ lui $at, 0x447a -/* C6EE1C 80240AEC 44813000 */ mtc1 $at, $f6 -/* C6EE20 80240AF0 27A20034 */ addiu $v0, $sp, 0x34 -/* C6EE24 80240AF4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C6EE28 80240AF8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C6EE2C 80240AFC E7A40030 */ swc1 $f4, 0x30($sp) -/* C6EE30 80240B00 E7A60034 */ swc1 $f6, 0x34($sp) -/* C6EE34 80240B04 AFA20010 */ sw $v0, 0x10($sp) -/* C6EE38 80240B08 8E040080 */ lw $a0, 0x80($s0) -/* C6EE3C 80240B0C 0C0372DF */ jal func_800DCB7C -/* C6EE40 80240B10 27A70030 */ addiu $a3, $sp, 0x30 -/* C6EE44 80240B14 C7A00034 */ lwc1 $f0, 0x34($sp) -/* C6EE48 80240B18 4600D001 */ sub.s $f0, $f26, $f0 -/* C6EE4C 80240B1C 4600B03C */ c.lt.s $f22, $f0 -/* C6EE50 80240B20 00000000 */ nop -/* C6EE54 80240B24 45000004 */ bc1f .L80240B38 -/* C6EE58 80240B28 00000000 */ nop -/* C6EE5C 80240B2C 8E22006C */ lw $v0, 0x6c($s1) -/* C6EE60 80240B30 34420010 */ ori $v0, $v0, 0x10 -/* C6EE64 80240B34 AE22006C */ sw $v0, 0x6c($s1) -.L80240B38: -/* C6EE68 80240B38 8E22006C */ lw $v0, 0x6c($s1) -/* C6EE6C 80240B3C 24030011 */ addiu $v1, $zero, 0x11 -/* C6EE70 80240B40 30420011 */ andi $v0, $v0, 0x11 -/* C6EE74 80240B44 14430039 */ bne $v0, $v1, .L80240C2C -/* C6EE78 80240B48 00000000 */ nop -/* C6EE7C 80240B4C 8E020000 */ lw $v0, ($s0) -/* C6EE80 80240B50 30420008 */ andi $v0, $v0, 8 -/* C6EE84 80240B54 1040000A */ beqz $v0, .L80240B80 -/* C6EE88 80240B58 4600C106 */ mov.s $f4, $f24 -/* C6EE8C 80240B5C 4614C081 */ sub.s $f2, $f24, $f20 -/* C6EE90 80240B60 3C018024 */ lui $at, 0x8024 -/* C6EE94 80240B64 D4203098 */ ldc1 $f0, 0x3098($at) -/* C6EE98 80240B68 460010A1 */ cvt.d.s $f2, $f2 -/* C6EE9C 80240B6C 46201082 */ mul.d $f2, $f2, $f0 -/* C6EEA0 80240B70 00000000 */ nop -/* C6EEA4 80240B74 4600A021 */ cvt.d.s $f0, $f20 -/* C6EEA8 80240B78 080902F9 */ j .L80240BE4 -/* C6EEAC 80240B7C 46220000 */ add.d $f0, $f0, $f2 -.L80240B80: -/* C6EEB0 80240B80 27A50028 */ addiu $a1, $sp, 0x28 -/* C6EEB4 80240B84 27A6002C */ addiu $a2, $sp, 0x2c -/* C6EEB8 80240B88 C6000038 */ lwc1 $f0, 0x38($s0) -/* C6EEBC 80240B8C C6020040 */ lwc1 $f2, 0x40($s0) -/* C6EEC0 80240B90 3C01447A */ lui $at, 0x447a -/* C6EEC4 80240B94 44812000 */ mtc1 $at, $f4 -/* C6EEC8 80240B98 27A20034 */ addiu $v0, $sp, 0x34 -/* C6EECC 80240B9C E7B4002C */ swc1 $f20, 0x2c($sp) -/* C6EED0 80240BA0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C6EED4 80240BA4 E7A20030 */ swc1 $f2, 0x30($sp) -/* C6EED8 80240BA8 E7A40034 */ swc1 $f4, 0x34($sp) -/* C6EEDC 80240BAC AFA20010 */ sw $v0, 0x10($sp) -/* C6EEE0 80240BB0 8E040080 */ lw $a0, 0x80($s0) -/* C6EEE4 80240BB4 0C0372DF */ jal func_800DCB7C -/* C6EEE8 80240BB8 27A70030 */ addiu $a3, $sp, 0x30 -/* C6EEEC 80240BBC C7A4002C */ lwc1 $f4, 0x2c($sp) -/* C6EEF0 80240BC0 461A2100 */ add.s $f4, $f4, $f26 -/* C6EEF4 80240BC4 46142081 */ sub.s $f2, $f4, $f20 -/* C6EEF8 80240BC8 3C018024 */ lui $at, 0x8024 -/* C6EEFC 80240BCC D42030A0 */ ldc1 $f0, 0x30a0($at) -/* C6EF00 80240BD0 460010A1 */ cvt.d.s $f2, $f2 -/* C6EF04 80240BD4 46201082 */ mul.d $f2, $f2, $f0 -/* C6EF08 80240BD8 00000000 */ nop -/* C6EF0C 80240BDC 4600A021 */ cvt.d.s $f0, $f20 -/* C6EF10 80240BE0 46220000 */ add.d $f0, $f0, $f2 -.L80240BE4: -/* C6EF14 80240BE4 46200020 */ cvt.s.d $f0, $f0 -/* C6EF18 80240BE8 E600003C */ swc1 $f0, 0x3c($s0) -/* C6EF1C 80240BEC C600003C */ lwc1 $f0, 0x3c($s0) -/* C6EF20 80240BF0 46002001 */ sub.s $f0, $f4, $f0 -/* C6EF24 80240BF4 3C013FF0 */ lui $at, 0x3ff0 -/* C6EF28 80240BF8 44811800 */ mtc1 $at, $f3 -/* C6EF2C 80240BFC 44801000 */ mtc1 $zero, $f2 -/* C6EF30 80240C00 46000005 */ abs.s $f0, $f0 -/* C6EF34 80240C04 46000021 */ cvt.d.s $f0, $f0 -/* C6EF38 80240C08 4622003C */ c.lt.d $f0, $f2 -/* C6EF3C 80240C0C 00000000 */ nop -/* C6EF40 80240C10 45000036 */ bc1f .L80240CEC -/* C6EF44 80240C14 2403FFEF */ addiu $v1, $zero, -0x11 -/* C6EF48 80240C18 E604003C */ swc1 $f4, 0x3c($s0) -/* C6EF4C 80240C1C 8E22006C */ lw $v0, 0x6c($s1) -/* C6EF50 80240C20 00431024 */ and $v0, $v0, $v1 -/* C6EF54 80240C24 0809033B */ j .L80240CEC -/* C6EF58 80240C28 AE22006C */ sw $v0, 0x6c($s1) -.L80240C2C: -/* C6EF5C 80240C2C 8E220070 */ lw $v0, 0x70($s1) -/* C6EF60 80240C30 1840002E */ blez $v0, .L80240CEC -/* C6EF64 80240C34 00000000 */ nop -/* C6EF68 80240C38 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C6EF6C 80240C3C 0C00A8BB */ jal sin_deg -/* C6EF70 80240C40 46806320 */ cvt.s.w $f12, $f12 -/* C6EF74 80240C44 8E020000 */ lw $v0, ($s0) -/* C6EF78 80240C48 30420008 */ andi $v0, $v0, 8 -/* C6EF7C 80240C4C 10400003 */ beqz $v0, .L80240C5C -/* C6EF80 80240C50 46000506 */ mov.s $f20, $f0 -/* C6EF84 80240C54 08090327 */ j .L80240C9C -/* C6EF88 80240C58 0000102D */ daddu $v0, $zero, $zero -.L80240C5C: -/* C6EF8C 80240C5C 27A50028 */ addiu $a1, $sp, 0x28 -/* C6EF90 80240C60 27A6002C */ addiu $a2, $sp, 0x2c -/* C6EF94 80240C64 C6000038 */ lwc1 $f0, 0x38($s0) -/* C6EF98 80240C68 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6EF9C 80240C6C C6040040 */ lwc1 $f4, 0x40($s0) -/* C6EFA0 80240C70 3C01447A */ lui $at, 0x447a -/* C6EFA4 80240C74 44813000 */ mtc1 $at, $f6 -/* C6EFA8 80240C78 27A20034 */ addiu $v0, $sp, 0x34 -/* C6EFAC 80240C7C E7A00028 */ swc1 $f0, 0x28($sp) -/* C6EFB0 80240C80 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C6EFB4 80240C84 E7A40030 */ swc1 $f4, 0x30($sp) -/* C6EFB8 80240C88 E7A60034 */ swc1 $f6, 0x34($sp) -/* C6EFBC 80240C8C AFA20010 */ sw $v0, 0x10($sp) -/* C6EFC0 80240C90 8E040080 */ lw $a0, 0x80($s0) -/* C6EFC4 80240C94 0C0372DF */ jal func_800DCB7C -/* C6EFC8 80240C98 27A70030 */ addiu $a3, $sp, 0x30 -.L80240C9C: -/* C6EFCC 80240C9C 10400007 */ beqz $v0, .L80240CBC -/* C6EFD0 80240CA0 00000000 */ nop -/* C6EFD4 80240CA4 4616A082 */ mul.s $f2, $f20, $f22 -/* C6EFD8 80240CA8 00000000 */ nop -/* C6EFDC 80240CAC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C6EFE0 80240CB0 461A0000 */ add.s $f0, $f0, $f26 -/* C6EFE4 80240CB4 08090332 */ j .L80240CC8 -/* C6EFE8 80240CB8 46020000 */ add.s $f0, $f0, $f2 -.L80240CBC: -/* C6EFEC 80240CBC 4616A002 */ mul.s $f0, $f20, $f22 -/* C6EFF0 80240CC0 00000000 */ nop -/* C6EFF4 80240CC4 4600C000 */ add.s $f0, $f24, $f0 -.L80240CC8: -/* C6EFF8 80240CC8 E600003C */ swc1 $f0, 0x3c($s0) -/* C6EFFC 80240CCC 8E220074 */ lw $v0, 0x74($s1) -/* C6F000 80240CD0 2442000A */ addiu $v0, $v0, 0xa -/* C6F004 80240CD4 44826000 */ mtc1 $v0, $f12 -/* C6F008 80240CD8 00000000 */ nop -/* C6F00C 80240CDC 0C00A6C9 */ jal clamp_angle -/* C6F010 80240CE0 46806320 */ cvt.s.w $f12, $f12 -/* C6F014 80240CE4 4600020D */ trunc.w.s $f8, $f0 -/* C6F018 80240CE8 E6280074 */ swc1 $f8, 0x74($s1) -.L80240CEC: -/* C6F01C 80240CEC 8E220090 */ lw $v0, 0x90($s1) -/* C6F020 80240CF0 1C40004A */ bgtz $v0, .L80240E1C -/* C6F024 80240CF4 2442FFFF */ addiu $v0, $v0, -1 -/* C6F028 80240CF8 8E430014 */ lw $v1, 0x14($s2) -/* C6F02C 80240CFC 04600048 */ bltz $v1, .L80240E20 -/* C6F030 80240D00 00000000 */ nop -/* C6F034 80240D04 8E620074 */ lw $v0, 0x74($s3) -/* C6F038 80240D08 1C400042 */ bgtz $v0, .L80240E14 -/* C6F03C 80240D0C 2442FFFF */ addiu $v0, $v0, -1 -/* C6F040 80240D10 AE630074 */ sw $v1, 0x74($s3) -/* C6F044 80240D14 860200A8 */ lh $v0, 0xa8($s0) -/* C6F048 80240D18 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6F04C 80240D1C 44820000 */ mtc1 $v0, $f0 -/* C6F050 80240D20 00000000 */ nop -/* C6F054 80240D24 46800020 */ cvt.s.w $f0, $f0 -/* C6F058 80240D28 46001080 */ add.s $f2, $f2, $f0 -/* C6F05C 80240D2C 3C014024 */ lui $at, 0x4024 -/* C6F060 80240D30 44810800 */ mtc1 $at, $f1 -/* C6F064 80240D34 44800000 */ mtc1 $zero, $f0 -/* C6F068 80240D38 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6F06C 80240D3C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6F070 80240D40 460010A1 */ cvt.d.s $f2, $f2 -/* C6F074 80240D44 46201080 */ add.d $f2, $f2, $f0 -/* C6F078 80240D48 C440002C */ lwc1 $f0, 0x2c($v0) -/* C6F07C 80240D4C 46000021 */ cvt.d.s $f0, $f0 -/* C6F080 80240D50 4622003C */ c.lt.d $f0, $f2 -/* C6F084 80240D54 00000000 */ nop -/* C6F088 80240D58 4500002C */ bc1f .L80240E0C -/* C6F08C 80240D5C 02A0202D */ daddu $a0, $s5, $zero -/* C6F090 80240D60 AFA00010 */ sw $zero, 0x10($sp) -/* C6F094 80240D64 8E46000C */ lw $a2, 0xc($s2) -/* C6F098 80240D68 8E470010 */ lw $a3, 0x10($s2) -/* C6F09C 80240D6C 0C01242D */ jal func_800490B4 -/* C6F0A0 80240D70 0220282D */ daddu $a1, $s1, $zero -/* C6F0A4 80240D74 10400025 */ beqz $v0, .L80240E0C -/* C6F0A8 80240D78 0000202D */ daddu $a0, $zero, $zero -/* C6F0AC 80240D7C 0200282D */ daddu $a1, $s0, $zero -/* C6F0B0 80240D80 0000302D */ daddu $a2, $zero, $zero -/* C6F0B4 80240D84 2412000C */ addiu $s2, $zero, 0xc -/* C6F0B8 80240D88 860300A8 */ lh $v1, 0xa8($s0) -/* C6F0BC 80240D8C 3C013F80 */ lui $at, 0x3f80 -/* C6F0C0 80240D90 44810000 */ mtc1 $at, $f0 -/* C6F0C4 80240D94 3C014000 */ lui $at, 0x4000 -/* C6F0C8 80240D98 44811000 */ mtc1 $at, $f2 -/* C6F0CC 80240D9C 3C01C1A0 */ lui $at, 0xc1a0 -/* C6F0D0 80240DA0 44812000 */ mtc1 $at, $f4 -/* C6F0D4 80240DA4 44834000 */ mtc1 $v1, $f8 -/* C6F0D8 80240DA8 00000000 */ nop -/* C6F0DC 80240DAC 46804220 */ cvt.s.w $f8, $f8 -/* C6F0E0 80240DB0 44074000 */ mfc1 $a3, $f8 -/* C6F0E4 80240DB4 27A20038 */ addiu $v0, $sp, 0x38 -/* C6F0E8 80240DB8 AFB2001C */ sw $s2, 0x1c($sp) -/* C6F0EC 80240DBC AFA20020 */ sw $v0, 0x20($sp) -/* C6F0F0 80240DC0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6F0F4 80240DC4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C6F0F8 80240DC8 0C01BFA4 */ jal fx_emote -/* C6F0FC 80240DCC E7A40018 */ swc1 $f4, 0x18($sp) -/* C6F100 80240DD0 0200202D */ daddu $a0, $s0, $zero -/* C6F104 80240DD4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C6F108 80240DD8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C6F10C 80240DDC 3C060020 */ lui $a2, 0x20 -/* C6F110 80240DE0 0C012530 */ jal func_800494C0 -/* C6F114 80240DE4 E4800064 */ swc1 $f0, 0x64($a0) -/* C6F118 80240DE8 8E220018 */ lw $v0, 0x18($s1) -/* C6F11C 80240DEC 9442002A */ lhu $v0, 0x2a($v0) -/* C6F120 80240DF0 30420001 */ andi $v0, $v0, 1 -/* C6F124 80240DF4 10400003 */ beqz $v0, .L80240E04 -/* C6F128 80240DF8 2402000A */ addiu $v0, $zero, 0xa -/* C6F12C 80240DFC 080903F1 */ j .L80240FC4 -/* C6F130 80240E00 AE620070 */ sw $v0, 0x70($s3) -.L80240E04: -/* C6F134 80240E04 080903F1 */ j .L80240FC4 -/* C6F138 80240E08 AE720070 */ sw $s2, 0x70($s3) -.L80240E0C: -/* C6F13C 80240E0C 8E620074 */ lw $v0, 0x74($s3) -/* C6F140 80240E10 2442FFFF */ addiu $v0, $v0, -1 -.L80240E14: -/* C6F144 80240E14 08090388 */ j .L80240E20 -/* C6F148 80240E18 AE620074 */ sw $v0, 0x74($s3) -.L80240E1C: -/* C6F14C 80240E1C AE220090 */ sw $v0, 0x90($s1) -.L80240E20: -/* C6F150 80240E20 8E2300D0 */ lw $v1, 0xd0($s1) -/* C6F154 80240E24 C6000040 */ lwc1 $f0, 0x40($s0) -/* C6F158 80240E28 C4620000 */ lwc1 $f2, ($v1) -/* C6F15C 80240E2C 468010A0 */ cvt.s.w $f2, $f2 -/* C6F160 80240E30 C4640008 */ lwc1 $f4, 8($v1) -/* C6F164 80240E34 46802120 */ cvt.s.w $f4, $f4 -/* C6F168 80240E38 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6F16C 80240E3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F170 80240E40 44051000 */ mfc1 $a1, $f2 -/* C6F174 80240E44 C440000C */ lwc1 $f0, 0xc($v0) -/* C6F178 80240E48 46800020 */ cvt.s.w $f0, $f0 -/* C6F17C 80240E4C E7A00014 */ swc1 $f0, 0x14($sp) -/* C6F180 80240E50 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F184 80240E54 44062000 */ mfc1 $a2, $f4 -/* C6F188 80240E58 C4400010 */ lwc1 $f0, 0x10($v0) -/* C6F18C 80240E5C 46800020 */ cvt.s.w $f0, $f0 -/* C6F190 80240E60 E7A00018 */ swc1 $f0, 0x18($sp) -/* C6F194 80240E64 8C640018 */ lw $a0, 0x18($v1) -/* C6F198 80240E68 0C0123F5 */ jal is_point_within_region -/* C6F19C 80240E6C 8E070038 */ lw $a3, 0x38($s0) -/* C6F1A0 80240E70 1040001A */ beqz $v0, .L80240EDC -/* C6F1A4 80240E74 00000000 */ nop -/* C6F1A8 80240E78 8E060038 */ lw $a2, 0x38($s0) -/* C6F1AC 80240E7C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F1B0 80240E80 8E070040 */ lw $a3, 0x40($s0) -/* C6F1B4 80240E84 C44C0000 */ lwc1 $f12, ($v0) -/* C6F1B8 80240E88 46806320 */ cvt.s.w $f12, $f12 -/* C6F1BC 80240E8C C44E0008 */ lwc1 $f14, 8($v0) -/* C6F1C0 80240E90 0C00A7B5 */ jal dist2D -/* C6F1C4 80240E94 468073A0 */ cvt.s.w $f14, $f14 -/* C6F1C8 80240E98 C6020018 */ lwc1 $f2, 0x18($s0) -/* C6F1CC 80240E9C 4600103C */ c.lt.s $f2, $f0 -/* C6F1D0 80240EA0 00000000 */ nop -/* C6F1D4 80240EA4 4500000D */ bc1f .L80240EDC -/* C6F1D8 80240EA8 E7A00034 */ swc1 $f0, 0x34($sp) -/* C6F1DC 80240EAC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C6F1E0 80240EB0 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F1E4 80240EB4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C6F1E8 80240EB8 C4480000 */ lwc1 $f8, ($v0) -/* C6F1EC 80240EBC 46804220 */ cvt.s.w $f8, $f8 -/* C6F1F0 80240EC0 44064000 */ mfc1 $a2, $f8 -/* C6F1F4 80240EC4 C4480008 */ lwc1 $f8, 8($v0) -/* C6F1F8 80240EC8 46804220 */ cvt.s.w $f8, $f8 -/* C6F1FC 80240ECC 44074000 */ mfc1 $a3, $f8 -/* C6F200 80240ED0 0C00A720 */ jal atan2 -/* C6F204 80240ED4 24140001 */ addiu $s4, $zero, 1 -/* C6F208 80240ED8 E600000C */ swc1 $f0, 0xc($s0) -.L80240EDC: -/* C6F20C 80240EDC 8E2200D0 */ lw $v0, 0xd0($s1) -/* C6F210 80240EE0 8C43000C */ lw $v1, 0xc($v0) -/* C6F214 80240EE4 8C420010 */ lw $v0, 0x10($v0) -/* C6F218 80240EE8 00621825 */ or $v1, $v1, $v0 -/* C6F21C 80240EEC 00741825 */ or $v1, $v1, $s4 -/* C6F220 80240EF0 10600008 */ beqz $v1, .L80240F14 -/* C6F224 80240EF4 00000000 */ nop -/* C6F228 80240EF8 8602008C */ lh $v0, 0x8c($s0) -/* C6F22C 80240EFC 14400031 */ bnez $v0, .L80240FC4 -/* C6F230 80240F00 00000000 */ nop -/* C6F234 80240F04 8E050018 */ lw $a1, 0x18($s0) -/* C6F238 80240F08 8E06000C */ lw $a2, 0xc($s0) -/* C6F23C 80240F0C 0C00EA95 */ jal npc_move_heading -/* C6F240 80240F10 0200202D */ daddu $a0, $s0, $zero -.L80240F14: -/* C6F244 80240F14 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6F248 80240F18 3C014059 */ lui $at, 0x4059 -/* C6F24C 80240F1C 44811800 */ mtc1 $at, $f3 -/* C6F250 80240F20 44801000 */ mtc1 $zero, $f2 -/* C6F254 80240F24 46000021 */ cvt.d.s $f0, $f0 -/* C6F258 80240F28 46220002 */ mul.d $f0, $f0, $f2 -/* C6F25C 80240F2C 00000000 */ nop -/* C6F260 80240F30 4620020D */ trunc.w.d $f8, $f0 -/* C6F264 80240F34 E628007C */ swc1 $f8, 0x7c($s1) -/* C6F268 80240F38 8E420004 */ lw $v0, 4($s2) -/* C6F26C 80240F3C 18400021 */ blez $v0, .L80240FC4 -/* C6F270 80240F40 00000000 */ nop -/* C6F274 80240F44 8602008E */ lh $v0, 0x8e($s0) -/* C6F278 80240F48 9603008E */ lhu $v1, 0x8e($s0) -/* C6F27C 80240F4C 18400005 */ blez $v0, .L80240F64 -/* C6F280 80240F50 2462FFFF */ addiu $v0, $v1, -1 -/* C6F284 80240F54 A602008E */ sh $v0, 0x8e($s0) -/* C6F288 80240F58 00021400 */ sll $v0, $v0, 0x10 -/* C6F28C 80240F5C 1C400019 */ bgtz $v0, .L80240FC4 -/* C6F290 80240F60 00000000 */ nop -.L80240F64: -/* C6F294 80240F64 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C6F298 80240F68 24020002 */ addiu $v0, $zero, 2 -/* C6F29C 80240F6C 0C00A67F */ jal rand_int -/* C6F2A0 80240F70 AE620070 */ sw $v0, 0x70($s3) -/* C6F2A4 80240F74 3C035555 */ lui $v1, 0x5555 -/* C6F2A8 80240F78 34635556 */ ori $v1, $v1, 0x5556 -/* C6F2AC 80240F7C 00430018 */ mult $v0, $v1 -/* C6F2B0 80240F80 000227C3 */ sra $a0, $v0, 0x1f -/* C6F2B4 80240F84 00004010 */ mfhi $t0 -/* C6F2B8 80240F88 01042023 */ subu $a0, $t0, $a0 -/* C6F2BC 80240F8C 00041840 */ sll $v1, $a0, 1 -/* C6F2C0 80240F90 00641821 */ addu $v1, $v1, $a0 -/* C6F2C4 80240F94 00431023 */ subu $v0, $v0, $v1 -/* C6F2C8 80240F98 24430002 */ addiu $v1, $v0, 2 -/* C6F2CC 80240F9C AE630074 */ sw $v1, 0x74($s3) -/* C6F2D0 80240FA0 8E42002C */ lw $v0, 0x2c($s2) -/* C6F2D4 80240FA4 58400007 */ blezl $v0, .L80240FC4 -/* C6F2D8 80240FA8 AE600070 */ sw $zero, 0x70($s3) -/* C6F2DC 80240FAC 8E420008 */ lw $v0, 8($s2) -/* C6F2E0 80240FB0 18400003 */ blez $v0, .L80240FC0 -/* C6F2E4 80240FB4 28620003 */ slti $v0, $v1, 3 -/* C6F2E8 80240FB8 10400002 */ beqz $v0, .L80240FC4 -/* C6F2EC 80240FBC 00000000 */ nop -.L80240FC0: -/* C6F2F0 80240FC0 AE600070 */ sw $zero, 0x70($s3) -.L80240FC4: -/* C6F2F4 80240FC4 8FBF0058 */ lw $ra, 0x58($sp) -/* C6F2F8 80240FC8 8FB50054 */ lw $s5, 0x54($sp) -/* C6F2FC 80240FCC 8FB40050 */ lw $s4, 0x50($sp) -/* C6F300 80240FD0 8FB3004C */ lw $s3, 0x4c($sp) -/* C6F304 80240FD4 8FB20048 */ lw $s2, 0x48($sp) -/* C6F308 80240FD8 8FB10044 */ lw $s1, 0x44($sp) -/* C6F30C 80240FDC 8FB00040 */ lw $s0, 0x40($sp) -/* C6F310 80240FE0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C6F314 80240FE4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* C6F318 80240FE8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C6F31C 80240FEC D7B40060 */ ldc1 $f20, 0x60($sp) -/* C6F320 80240FF0 03E00008 */ jr $ra -/* C6F324 80240FF4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s new file mode 100644 index 0000000000..b40a1214bd --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802409D0_C6ED00.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409D0_C6ED00 +/* C6ED00 802409D0 27BDFF80 */ addiu $sp, $sp, -0x80 +/* C6ED04 802409D4 AFB3004C */ sw $s3, 0x4c($sp) +/* C6ED08 802409D8 0080982D */ daddu $s3, $a0, $zero +/* C6ED0C 802409DC AFBF0058 */ sw $ra, 0x58($sp) +/* C6ED10 802409E0 AFB50054 */ sw $s5, 0x54($sp) +/* C6ED14 802409E4 AFB40050 */ sw $s4, 0x50($sp) +/* C6ED18 802409E8 AFB20048 */ sw $s2, 0x48($sp) +/* C6ED1C 802409EC AFB10044 */ sw $s1, 0x44($sp) +/* C6ED20 802409F0 AFB00040 */ sw $s0, 0x40($sp) +/* C6ED24 802409F4 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* C6ED28 802409F8 F7B80070 */ sdc1 $f24, 0x70($sp) +/* C6ED2C 802409FC F7B60068 */ sdc1 $f22, 0x68($sp) +/* C6ED30 80240A00 F7B40060 */ sdc1 $f20, 0x60($sp) +/* C6ED34 80240A04 8E710148 */ lw $s1, 0x148($s3) +/* C6ED38 80240A08 00A0902D */ daddu $s2, $a1, $zero +/* C6ED3C 80240A0C 86240008 */ lh $a0, 8($s1) +/* C6ED40 80240A10 0C00EABB */ jal get_npc_unsafe +/* C6ED44 80240A14 00C0A82D */ daddu $s5, $a2, $zero +/* C6ED48 80240A18 0040802D */ daddu $s0, $v0, $zero +/* C6ED4C 80240A1C 0000A02D */ daddu $s4, $zero, $zero +/* C6ED50 80240A20 C624007C */ lwc1 $f4, 0x7c($s1) +/* C6ED54 80240A24 46802120 */ cvt.s.w $f4, $f4 +/* C6ED58 80240A28 C6220088 */ lwc1 $f2, 0x88($s1) +/* C6ED5C 80240A2C 468010A0 */ cvt.s.w $f2, $f2 +/* C6ED60 80240A30 460010A1 */ cvt.d.s $f2, $f2 +/* C6ED64 80240A34 46002121 */ cvt.d.s $f4, $f4 +/* C6ED68 80240A38 C600003C */ lwc1 $f0, 0x3c($s0) +/* C6ED6C 80240A3C 3C014059 */ lui $at, 0x4059 +/* C6ED70 80240A40 44813800 */ mtc1 $at, $f7 +/* C6ED74 80240A44 44803000 */ mtc1 $zero, $f6 +/* C6ED78 80240A48 46000021 */ cvt.d.s $f0, $f0 +/* C6ED7C 80240A4C 46260002 */ mul.d $f0, $f0, $f6 +/* C6ED80 80240A50 00000000 */ nop +/* C6ED84 80240A54 24020001 */ addiu $v0, $zero, 1 +/* C6ED88 80240A58 8E24006C */ lw $a0, 0x6c($s1) +/* C6ED8C 80240A5C 46261083 */ div.d $f2, $f2, $f6 +/* C6ED90 80240A60 462010A0 */ cvt.s.d $f2, $f2 +/* C6ED94 80240A64 46262103 */ div.d $f4, $f4, $f6 +/* C6ED98 80240A68 46202520 */ cvt.s.d $f20, $f4 +/* C6ED9C 80240A6C 30830011 */ andi $v1, $a0, 0x11 +/* C6EDA0 80240A70 4620020D */ trunc.w.d $f8, $f0 +/* C6EDA4 80240A74 E628007C */ swc1 $f8, 0x7c($s1) +/* C6EDA8 80240A78 C6200078 */ lwc1 $f0, 0x78($s1) +/* C6EDAC 80240A7C 46800020 */ cvt.s.w $f0, $f0 +/* C6EDB0 80240A80 46000021 */ cvt.d.s $f0, $f0 +/* C6EDB4 80240A84 46260003 */ div.d $f0, $f0, $f6 +/* C6EDB8 80240A88 462006A0 */ cvt.s.d $f26, $f0 +/* C6EDBC 80240A8C C6200070 */ lwc1 $f0, 0x70($s1) +/* C6EDC0 80240A90 46800020 */ cvt.s.w $f0, $f0 +/* C6EDC4 80240A94 46000021 */ cvt.d.s $f0, $f0 +/* C6EDC8 80240A98 46260003 */ div.d $f0, $f0, $f6 +/* C6EDCC 80240A9C 462005A0 */ cvt.s.d $f22, $f0 +/* C6EDD0 80240AA0 14620025 */ bne $v1, $v0, .L80240B38 +/* C6EDD4 80240AA4 4602D600 */ add.s $f24, $f26, $f2 +/* C6EDD8 80240AA8 8E020000 */ lw $v0, ($s0) +/* C6EDDC 80240AAC 30420008 */ andi $v0, $v0, 8 +/* C6EDE0 80240AB0 10400009 */ beqz $v0, .L80240AD8 +/* C6EDE4 80240AB4 27A50028 */ addiu $a1, $sp, 0x28 +/* C6EDE8 80240AB8 C600003C */ lwc1 $f0, 0x3c($s0) +/* C6EDEC 80240ABC 4600C001 */ sub.s $f0, $f24, $f0 +/* C6EDF0 80240AC0 4600B03C */ c.lt.s $f22, $f0 +/* C6EDF4 80240AC4 00000000 */ nop +/* C6EDF8 80240AC8 4500001B */ bc1f .L80240B38 +/* C6EDFC 80240ACC 34820010 */ ori $v0, $a0, 0x10 +/* C6EE00 80240AD0 080902CE */ j .L80240B38 +/* C6EE04 80240AD4 AE22006C */ sw $v0, 0x6c($s1) +.L80240AD8: +/* C6EE08 80240AD8 27A6002C */ addiu $a2, $sp, 0x2c +/* C6EE0C 80240ADC C6000038 */ lwc1 $f0, 0x38($s0) +/* C6EE10 80240AE0 C602003C */ lwc1 $f2, 0x3c($s0) +/* C6EE14 80240AE4 C6040040 */ lwc1 $f4, 0x40($s0) +/* C6EE18 80240AE8 3C01447A */ lui $at, 0x447a +/* C6EE1C 80240AEC 44813000 */ mtc1 $at, $f6 +/* C6EE20 80240AF0 27A20034 */ addiu $v0, $sp, 0x34 +/* C6EE24 80240AF4 E7A00028 */ swc1 $f0, 0x28($sp) +/* C6EE28 80240AF8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C6EE2C 80240AFC E7A40030 */ swc1 $f4, 0x30($sp) +/* C6EE30 80240B00 E7A60034 */ swc1 $f6, 0x34($sp) +/* C6EE34 80240B04 AFA20010 */ sw $v0, 0x10($sp) +/* C6EE38 80240B08 8E040080 */ lw $a0, 0x80($s0) +/* C6EE3C 80240B0C 0C0372DF */ jal func_800DCB7C +/* C6EE40 80240B10 27A70030 */ addiu $a3, $sp, 0x30 +/* C6EE44 80240B14 C7A00034 */ lwc1 $f0, 0x34($sp) +/* C6EE48 80240B18 4600D001 */ sub.s $f0, $f26, $f0 +/* C6EE4C 80240B1C 4600B03C */ c.lt.s $f22, $f0 +/* C6EE50 80240B20 00000000 */ nop +/* C6EE54 80240B24 45000004 */ bc1f .L80240B38 +/* C6EE58 80240B28 00000000 */ nop +/* C6EE5C 80240B2C 8E22006C */ lw $v0, 0x6c($s1) +/* C6EE60 80240B30 34420010 */ ori $v0, $v0, 0x10 +/* C6EE64 80240B34 AE22006C */ sw $v0, 0x6c($s1) +.L80240B38: +/* C6EE68 80240B38 8E22006C */ lw $v0, 0x6c($s1) +/* C6EE6C 80240B3C 24030011 */ addiu $v1, $zero, 0x11 +/* C6EE70 80240B40 30420011 */ andi $v0, $v0, 0x11 +/* C6EE74 80240B44 14430039 */ bne $v0, $v1, .L80240C2C +/* C6EE78 80240B48 00000000 */ nop +/* C6EE7C 80240B4C 8E020000 */ lw $v0, ($s0) +/* C6EE80 80240B50 30420008 */ andi $v0, $v0, 8 +/* C6EE84 80240B54 1040000A */ beqz $v0, .L80240B80 +/* C6EE88 80240B58 4600C106 */ mov.s $f4, $f24 +/* C6EE8C 80240B5C 4614C081 */ sub.s $f2, $f24, $f20 +/* C6EE90 80240B60 3C018024 */ lui $at, 0x8024 +/* C6EE94 80240B64 D4203098 */ ldc1 $f0, 0x3098($at) +/* C6EE98 80240B68 460010A1 */ cvt.d.s $f2, $f2 +/* C6EE9C 80240B6C 46201082 */ mul.d $f2, $f2, $f0 +/* C6EEA0 80240B70 00000000 */ nop +/* C6EEA4 80240B74 4600A021 */ cvt.d.s $f0, $f20 +/* C6EEA8 80240B78 080902F9 */ j .L80240BE4 +/* C6EEAC 80240B7C 46220000 */ add.d $f0, $f0, $f2 +.L80240B80: +/* C6EEB0 80240B80 27A50028 */ addiu $a1, $sp, 0x28 +/* C6EEB4 80240B84 27A6002C */ addiu $a2, $sp, 0x2c +/* C6EEB8 80240B88 C6000038 */ lwc1 $f0, 0x38($s0) +/* C6EEBC 80240B8C C6020040 */ lwc1 $f2, 0x40($s0) +/* C6EEC0 80240B90 3C01447A */ lui $at, 0x447a +/* C6EEC4 80240B94 44812000 */ mtc1 $at, $f4 +/* C6EEC8 80240B98 27A20034 */ addiu $v0, $sp, 0x34 +/* C6EECC 80240B9C E7B4002C */ swc1 $f20, 0x2c($sp) +/* C6EED0 80240BA0 E7A00028 */ swc1 $f0, 0x28($sp) +/* C6EED4 80240BA4 E7A20030 */ swc1 $f2, 0x30($sp) +/* C6EED8 80240BA8 E7A40034 */ swc1 $f4, 0x34($sp) +/* C6EEDC 80240BAC AFA20010 */ sw $v0, 0x10($sp) +/* C6EEE0 80240BB0 8E040080 */ lw $a0, 0x80($s0) +/* C6EEE4 80240BB4 0C0372DF */ jal func_800DCB7C +/* C6EEE8 80240BB8 27A70030 */ addiu $a3, $sp, 0x30 +/* C6EEEC 80240BBC C7A4002C */ lwc1 $f4, 0x2c($sp) +/* C6EEF0 80240BC0 461A2100 */ add.s $f4, $f4, $f26 +/* C6EEF4 80240BC4 46142081 */ sub.s $f2, $f4, $f20 +/* C6EEF8 80240BC8 3C018024 */ lui $at, 0x8024 +/* C6EEFC 80240BCC D42030A0 */ ldc1 $f0, 0x30a0($at) +/* C6EF00 80240BD0 460010A1 */ cvt.d.s $f2, $f2 +/* C6EF04 80240BD4 46201082 */ mul.d $f2, $f2, $f0 +/* C6EF08 80240BD8 00000000 */ nop +/* C6EF0C 80240BDC 4600A021 */ cvt.d.s $f0, $f20 +/* C6EF10 80240BE0 46220000 */ add.d $f0, $f0, $f2 +.L80240BE4: +/* C6EF14 80240BE4 46200020 */ cvt.s.d $f0, $f0 +/* C6EF18 80240BE8 E600003C */ swc1 $f0, 0x3c($s0) +/* C6EF1C 80240BEC C600003C */ lwc1 $f0, 0x3c($s0) +/* C6EF20 80240BF0 46002001 */ sub.s $f0, $f4, $f0 +/* C6EF24 80240BF4 3C013FF0 */ lui $at, 0x3ff0 +/* C6EF28 80240BF8 44811800 */ mtc1 $at, $f3 +/* C6EF2C 80240BFC 44801000 */ mtc1 $zero, $f2 +/* C6EF30 80240C00 46000005 */ abs.s $f0, $f0 +/* C6EF34 80240C04 46000021 */ cvt.d.s $f0, $f0 +/* C6EF38 80240C08 4622003C */ c.lt.d $f0, $f2 +/* C6EF3C 80240C0C 00000000 */ nop +/* C6EF40 80240C10 45000036 */ bc1f .L80240CEC +/* C6EF44 80240C14 2403FFEF */ addiu $v1, $zero, -0x11 +/* C6EF48 80240C18 E604003C */ swc1 $f4, 0x3c($s0) +/* C6EF4C 80240C1C 8E22006C */ lw $v0, 0x6c($s1) +/* C6EF50 80240C20 00431024 */ and $v0, $v0, $v1 +/* C6EF54 80240C24 0809033B */ j .L80240CEC +/* C6EF58 80240C28 AE22006C */ sw $v0, 0x6c($s1) +.L80240C2C: +/* C6EF5C 80240C2C 8E220070 */ lw $v0, 0x70($s1) +/* C6EF60 80240C30 1840002E */ blez $v0, .L80240CEC +/* C6EF64 80240C34 00000000 */ nop +/* C6EF68 80240C38 C62C0074 */ lwc1 $f12, 0x74($s1) +/* C6EF6C 80240C3C 0C00A8BB */ jal sin_deg +/* C6EF70 80240C40 46806320 */ cvt.s.w $f12, $f12 +/* C6EF74 80240C44 8E020000 */ lw $v0, ($s0) +/* C6EF78 80240C48 30420008 */ andi $v0, $v0, 8 +/* C6EF7C 80240C4C 10400003 */ beqz $v0, .L80240C5C +/* C6EF80 80240C50 46000506 */ mov.s $f20, $f0 +/* C6EF84 80240C54 08090327 */ j .L80240C9C +/* C6EF88 80240C58 0000102D */ daddu $v0, $zero, $zero +.L80240C5C: +/* C6EF8C 80240C5C 27A50028 */ addiu $a1, $sp, 0x28 +/* C6EF90 80240C60 27A6002C */ addiu $a2, $sp, 0x2c +/* C6EF94 80240C64 C6000038 */ lwc1 $f0, 0x38($s0) +/* C6EF98 80240C68 C602003C */ lwc1 $f2, 0x3c($s0) +/* C6EF9C 80240C6C C6040040 */ lwc1 $f4, 0x40($s0) +/* C6EFA0 80240C70 3C01447A */ lui $at, 0x447a +/* C6EFA4 80240C74 44813000 */ mtc1 $at, $f6 +/* C6EFA8 80240C78 27A20034 */ addiu $v0, $sp, 0x34 +/* C6EFAC 80240C7C E7A00028 */ swc1 $f0, 0x28($sp) +/* C6EFB0 80240C80 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C6EFB4 80240C84 E7A40030 */ swc1 $f4, 0x30($sp) +/* C6EFB8 80240C88 E7A60034 */ swc1 $f6, 0x34($sp) +/* C6EFBC 80240C8C AFA20010 */ sw $v0, 0x10($sp) +/* C6EFC0 80240C90 8E040080 */ lw $a0, 0x80($s0) +/* C6EFC4 80240C94 0C0372DF */ jal func_800DCB7C +/* C6EFC8 80240C98 27A70030 */ addiu $a3, $sp, 0x30 +.L80240C9C: +/* C6EFCC 80240C9C 10400007 */ beqz $v0, .L80240CBC +/* C6EFD0 80240CA0 00000000 */ nop +/* C6EFD4 80240CA4 4616A082 */ mul.s $f2, $f20, $f22 +/* C6EFD8 80240CA8 00000000 */ nop +/* C6EFDC 80240CAC C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C6EFE0 80240CB0 461A0000 */ add.s $f0, $f0, $f26 +/* C6EFE4 80240CB4 08090332 */ j .L80240CC8 +/* C6EFE8 80240CB8 46020000 */ add.s $f0, $f0, $f2 +.L80240CBC: +/* C6EFEC 80240CBC 4616A002 */ mul.s $f0, $f20, $f22 +/* C6EFF0 80240CC0 00000000 */ nop +/* C6EFF4 80240CC4 4600C000 */ add.s $f0, $f24, $f0 +.L80240CC8: +/* C6EFF8 80240CC8 E600003C */ swc1 $f0, 0x3c($s0) +/* C6EFFC 80240CCC 8E220074 */ lw $v0, 0x74($s1) +/* C6F000 80240CD0 2442000A */ addiu $v0, $v0, 0xa +/* C6F004 80240CD4 44826000 */ mtc1 $v0, $f12 +/* C6F008 80240CD8 00000000 */ nop +/* C6F00C 80240CDC 0C00A6C9 */ jal clamp_angle +/* C6F010 80240CE0 46806320 */ cvt.s.w $f12, $f12 +/* C6F014 80240CE4 4600020D */ trunc.w.s $f8, $f0 +/* C6F018 80240CE8 E6280074 */ swc1 $f8, 0x74($s1) +.L80240CEC: +/* C6F01C 80240CEC 8E220090 */ lw $v0, 0x90($s1) +/* C6F020 80240CF0 1C40004A */ bgtz $v0, .L80240E1C +/* C6F024 80240CF4 2442FFFF */ addiu $v0, $v0, -1 +/* C6F028 80240CF8 8E430014 */ lw $v1, 0x14($s2) +/* C6F02C 80240CFC 04600048 */ bltz $v1, .L80240E20 +/* C6F030 80240D00 00000000 */ nop +/* C6F034 80240D04 8E620074 */ lw $v0, 0x74($s3) +/* C6F038 80240D08 1C400042 */ bgtz $v0, .L80240E14 +/* C6F03C 80240D0C 2442FFFF */ addiu $v0, $v0, -1 +/* C6F040 80240D10 AE630074 */ sw $v1, 0x74($s3) +/* C6F044 80240D14 860200A8 */ lh $v0, 0xa8($s0) +/* C6F048 80240D18 C602003C */ lwc1 $f2, 0x3c($s0) +/* C6F04C 80240D1C 44820000 */ mtc1 $v0, $f0 +/* C6F050 80240D20 00000000 */ nop +/* C6F054 80240D24 46800020 */ cvt.s.w $f0, $f0 +/* C6F058 80240D28 46001080 */ add.s $f2, $f2, $f0 +/* C6F05C 80240D2C 3C014024 */ lui $at, 0x4024 +/* C6F060 80240D30 44810800 */ mtc1 $at, $f1 +/* C6F064 80240D34 44800000 */ mtc1 $zero, $f0 +/* C6F068 80240D38 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C6F06C 80240D3C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C6F070 80240D40 460010A1 */ cvt.d.s $f2, $f2 +/* C6F074 80240D44 46201080 */ add.d $f2, $f2, $f0 +/* C6F078 80240D48 C440002C */ lwc1 $f0, 0x2c($v0) +/* C6F07C 80240D4C 46000021 */ cvt.d.s $f0, $f0 +/* C6F080 80240D50 4622003C */ c.lt.d $f0, $f2 +/* C6F084 80240D54 00000000 */ nop +/* C6F088 80240D58 4500002C */ bc1f .L80240E0C +/* C6F08C 80240D5C 02A0202D */ daddu $a0, $s5, $zero +/* C6F090 80240D60 AFA00010 */ sw $zero, 0x10($sp) +/* C6F094 80240D64 8E46000C */ lw $a2, 0xc($s2) +/* C6F098 80240D68 8E470010 */ lw $a3, 0x10($s2) +/* C6F09C 80240D6C 0C01242D */ jal func_800490B4 +/* C6F0A0 80240D70 0220282D */ daddu $a1, $s1, $zero +/* C6F0A4 80240D74 10400025 */ beqz $v0, .L80240E0C +/* C6F0A8 80240D78 0000202D */ daddu $a0, $zero, $zero +/* C6F0AC 80240D7C 0200282D */ daddu $a1, $s0, $zero +/* C6F0B0 80240D80 0000302D */ daddu $a2, $zero, $zero +/* C6F0B4 80240D84 2412000C */ addiu $s2, $zero, 0xc +/* C6F0B8 80240D88 860300A8 */ lh $v1, 0xa8($s0) +/* C6F0BC 80240D8C 3C013F80 */ lui $at, 0x3f80 +/* C6F0C0 80240D90 44810000 */ mtc1 $at, $f0 +/* C6F0C4 80240D94 3C014000 */ lui $at, 0x4000 +/* C6F0C8 80240D98 44811000 */ mtc1 $at, $f2 +/* C6F0CC 80240D9C 3C01C1A0 */ lui $at, 0xc1a0 +/* C6F0D0 80240DA0 44812000 */ mtc1 $at, $f4 +/* C6F0D4 80240DA4 44834000 */ mtc1 $v1, $f8 +/* C6F0D8 80240DA8 00000000 */ nop +/* C6F0DC 80240DAC 46804220 */ cvt.s.w $f8, $f8 +/* C6F0E0 80240DB0 44074000 */ mfc1 $a3, $f8 +/* C6F0E4 80240DB4 27A20038 */ addiu $v0, $sp, 0x38 +/* C6F0E8 80240DB8 AFB2001C */ sw $s2, 0x1c($sp) +/* C6F0EC 80240DBC AFA20020 */ sw $v0, 0x20($sp) +/* C6F0F0 80240DC0 E7A00010 */ swc1 $f0, 0x10($sp) +/* C6F0F4 80240DC4 E7A20014 */ swc1 $f2, 0x14($sp) +/* C6F0F8 80240DC8 0C01BFA4 */ jal fx_emote +/* C6F0FC 80240DCC E7A40018 */ swc1 $f4, 0x18($sp) +/* C6F100 80240DD0 0200202D */ daddu $a0, $s0, $zero +/* C6F104 80240DD4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C6F108 80240DD8 C480003C */ lwc1 $f0, 0x3c($a0) +/* C6F10C 80240DDC 3C060020 */ lui $a2, 0x20 +/* C6F110 80240DE0 0C012530 */ jal func_800494C0 +/* C6F114 80240DE4 E4800064 */ swc1 $f0, 0x64($a0) +/* C6F118 80240DE8 8E220018 */ lw $v0, 0x18($s1) +/* C6F11C 80240DEC 9442002A */ lhu $v0, 0x2a($v0) +/* C6F120 80240DF0 30420001 */ andi $v0, $v0, 1 +/* C6F124 80240DF4 10400003 */ beqz $v0, .L80240E04 +/* C6F128 80240DF8 2402000A */ addiu $v0, $zero, 0xa +/* C6F12C 80240DFC 080903F1 */ j .L80240FC4 +/* C6F130 80240E00 AE620070 */ sw $v0, 0x70($s3) +.L80240E04: +/* C6F134 80240E04 080903F1 */ j .L80240FC4 +/* C6F138 80240E08 AE720070 */ sw $s2, 0x70($s3) +.L80240E0C: +/* C6F13C 80240E0C 8E620074 */ lw $v0, 0x74($s3) +/* C6F140 80240E10 2442FFFF */ addiu $v0, $v0, -1 +.L80240E14: +/* C6F144 80240E14 08090388 */ j .L80240E20 +/* C6F148 80240E18 AE620074 */ sw $v0, 0x74($s3) +.L80240E1C: +/* C6F14C 80240E1C AE220090 */ sw $v0, 0x90($s1) +.L80240E20: +/* C6F150 80240E20 8E2300D0 */ lw $v1, 0xd0($s1) +/* C6F154 80240E24 C6000040 */ lwc1 $f0, 0x40($s0) +/* C6F158 80240E28 C4620000 */ lwc1 $f2, ($v1) +/* C6F15C 80240E2C 468010A0 */ cvt.s.w $f2, $f2 +/* C6F160 80240E30 C4640008 */ lwc1 $f4, 8($v1) +/* C6F164 80240E34 46802120 */ cvt.s.w $f4, $f4 +/* C6F168 80240E38 E7A00010 */ swc1 $f0, 0x10($sp) +/* C6F16C 80240E3C 8E2200D0 */ lw $v0, 0xd0($s1) +/* C6F170 80240E40 44051000 */ mfc1 $a1, $f2 +/* C6F174 80240E44 C440000C */ lwc1 $f0, 0xc($v0) +/* C6F178 80240E48 46800020 */ cvt.s.w $f0, $f0 +/* C6F17C 80240E4C E7A00014 */ swc1 $f0, 0x14($sp) +/* C6F180 80240E50 8E2200D0 */ lw $v0, 0xd0($s1) +/* C6F184 80240E54 44062000 */ mfc1 $a2, $f4 +/* C6F188 80240E58 C4400010 */ lwc1 $f0, 0x10($v0) +/* C6F18C 80240E5C 46800020 */ cvt.s.w $f0, $f0 +/* C6F190 80240E60 E7A00018 */ swc1 $f0, 0x18($sp) +/* C6F194 80240E64 8C640018 */ lw $a0, 0x18($v1) +/* C6F198 80240E68 0C0123F5 */ jal is_point_within_region +/* C6F19C 80240E6C 8E070038 */ lw $a3, 0x38($s0) +/* C6F1A0 80240E70 1040001A */ beqz $v0, .L80240EDC +/* C6F1A4 80240E74 00000000 */ nop +/* C6F1A8 80240E78 8E060038 */ lw $a2, 0x38($s0) +/* C6F1AC 80240E7C 8E2200D0 */ lw $v0, 0xd0($s1) +/* C6F1B0 80240E80 8E070040 */ lw $a3, 0x40($s0) +/* C6F1B4 80240E84 C44C0000 */ lwc1 $f12, ($v0) +/* C6F1B8 80240E88 46806320 */ cvt.s.w $f12, $f12 +/* C6F1BC 80240E8C C44E0008 */ lwc1 $f14, 8($v0) +/* C6F1C0 80240E90 0C00A7B5 */ jal dist2D +/* C6F1C4 80240E94 468073A0 */ cvt.s.w $f14, $f14 +/* C6F1C8 80240E98 C6020018 */ lwc1 $f2, 0x18($s0) +/* C6F1CC 80240E9C 4600103C */ c.lt.s $f2, $f0 +/* C6F1D0 80240EA0 00000000 */ nop +/* C6F1D4 80240EA4 4500000D */ bc1f .L80240EDC +/* C6F1D8 80240EA8 E7A00034 */ swc1 $f0, 0x34($sp) +/* C6F1DC 80240EAC C60C0038 */ lwc1 $f12, 0x38($s0) +/* C6F1E0 80240EB0 8E2200D0 */ lw $v0, 0xd0($s1) +/* C6F1E4 80240EB4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C6F1E8 80240EB8 C4480000 */ lwc1 $f8, ($v0) +/* C6F1EC 80240EBC 46804220 */ cvt.s.w $f8, $f8 +/* C6F1F0 80240EC0 44064000 */ mfc1 $a2, $f8 +/* C6F1F4 80240EC4 C4480008 */ lwc1 $f8, 8($v0) +/* C6F1F8 80240EC8 46804220 */ cvt.s.w $f8, $f8 +/* C6F1FC 80240ECC 44074000 */ mfc1 $a3, $f8 +/* C6F200 80240ED0 0C00A720 */ jal atan2 +/* C6F204 80240ED4 24140001 */ addiu $s4, $zero, 1 +/* C6F208 80240ED8 E600000C */ swc1 $f0, 0xc($s0) +.L80240EDC: +/* C6F20C 80240EDC 8E2200D0 */ lw $v0, 0xd0($s1) +/* C6F210 80240EE0 8C43000C */ lw $v1, 0xc($v0) +/* C6F214 80240EE4 8C420010 */ lw $v0, 0x10($v0) +/* C6F218 80240EE8 00621825 */ or $v1, $v1, $v0 +/* C6F21C 80240EEC 00741825 */ or $v1, $v1, $s4 +/* C6F220 80240EF0 10600008 */ beqz $v1, .L80240F14 +/* C6F224 80240EF4 00000000 */ nop +/* C6F228 80240EF8 8602008C */ lh $v0, 0x8c($s0) +/* C6F22C 80240EFC 14400031 */ bnez $v0, .L80240FC4 +/* C6F230 80240F00 00000000 */ nop +/* C6F234 80240F04 8E050018 */ lw $a1, 0x18($s0) +/* C6F238 80240F08 8E06000C */ lw $a2, 0xc($s0) +/* C6F23C 80240F0C 0C00EA95 */ jal npc_move_heading +/* C6F240 80240F10 0200202D */ daddu $a0, $s0, $zero +.L80240F14: +/* C6F244 80240F14 C600003C */ lwc1 $f0, 0x3c($s0) +/* C6F248 80240F18 3C014059 */ lui $at, 0x4059 +/* C6F24C 80240F1C 44811800 */ mtc1 $at, $f3 +/* C6F250 80240F20 44801000 */ mtc1 $zero, $f2 +/* C6F254 80240F24 46000021 */ cvt.d.s $f0, $f0 +/* C6F258 80240F28 46220002 */ mul.d $f0, $f0, $f2 +/* C6F25C 80240F2C 00000000 */ nop +/* C6F260 80240F30 4620020D */ trunc.w.d $f8, $f0 +/* C6F264 80240F34 E628007C */ swc1 $f8, 0x7c($s1) +/* C6F268 80240F38 8E420004 */ lw $v0, 4($s2) +/* C6F26C 80240F3C 18400021 */ blez $v0, .L80240FC4 +/* C6F270 80240F40 00000000 */ nop +/* C6F274 80240F44 8602008E */ lh $v0, 0x8e($s0) +/* C6F278 80240F48 9603008E */ lhu $v1, 0x8e($s0) +/* C6F27C 80240F4C 18400005 */ blez $v0, .L80240F64 +/* C6F280 80240F50 2462FFFF */ addiu $v0, $v1, -1 +/* C6F284 80240F54 A602008E */ sh $v0, 0x8e($s0) +/* C6F288 80240F58 00021400 */ sll $v0, $v0, 0x10 +/* C6F28C 80240F5C 1C400019 */ bgtz $v0, .L80240FC4 +/* C6F290 80240F60 00000000 */ nop +.L80240F64: +/* C6F294 80240F64 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C6F298 80240F68 24020002 */ addiu $v0, $zero, 2 +/* C6F29C 80240F6C 0C00A67F */ jal rand_int +/* C6F2A0 80240F70 AE620070 */ sw $v0, 0x70($s3) +/* C6F2A4 80240F74 3C035555 */ lui $v1, 0x5555 +/* C6F2A8 80240F78 34635556 */ ori $v1, $v1, 0x5556 +/* C6F2AC 80240F7C 00430018 */ mult $v0, $v1 +/* C6F2B0 80240F80 000227C3 */ sra $a0, $v0, 0x1f +/* C6F2B4 80240F84 00004010 */ mfhi $t0 +/* C6F2B8 80240F88 01042023 */ subu $a0, $t0, $a0 +/* C6F2BC 80240F8C 00041840 */ sll $v1, $a0, 1 +/* C6F2C0 80240F90 00641821 */ addu $v1, $v1, $a0 +/* C6F2C4 80240F94 00431023 */ subu $v0, $v0, $v1 +/* C6F2C8 80240F98 24430002 */ addiu $v1, $v0, 2 +/* C6F2CC 80240F9C AE630074 */ sw $v1, 0x74($s3) +/* C6F2D0 80240FA0 8E42002C */ lw $v0, 0x2c($s2) +/* C6F2D4 80240FA4 58400007 */ blezl $v0, .L80240FC4 +/* C6F2D8 80240FA8 AE600070 */ sw $zero, 0x70($s3) +/* C6F2DC 80240FAC 8E420008 */ lw $v0, 8($s2) +/* C6F2E0 80240FB0 18400003 */ blez $v0, .L80240FC0 +/* C6F2E4 80240FB4 28620003 */ slti $v0, $v1, 3 +/* C6F2E8 80240FB8 10400002 */ beqz $v0, .L80240FC4 +/* C6F2EC 80240FBC 00000000 */ nop +.L80240FC0: +/* C6F2F0 80240FC0 AE600070 */ sw $zero, 0x70($s3) +.L80240FC4: +/* C6F2F4 80240FC4 8FBF0058 */ lw $ra, 0x58($sp) +/* C6F2F8 80240FC8 8FB50054 */ lw $s5, 0x54($sp) +/* C6F2FC 80240FCC 8FB40050 */ lw $s4, 0x50($sp) +/* C6F300 80240FD0 8FB3004C */ lw $s3, 0x4c($sp) +/* C6F304 80240FD4 8FB20048 */ lw $s2, 0x48($sp) +/* C6F308 80240FD8 8FB10044 */ lw $s1, 0x44($sp) +/* C6F30C 80240FDC 8FB00040 */ lw $s0, 0x40($sp) +/* C6F310 80240FE0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* C6F314 80240FE4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* C6F318 80240FE8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* C6F31C 80240FEC D7B40060 */ ldc1 $f20, 0x60($sp) +/* C6F320 80240FF0 03E00008 */ jr $ra +/* C6F324 80240FF4 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8.s deleted file mode 100644 index 10d3042b34..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410B8 -/* C6F3E8 802410B8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* C6F3EC 802410BC AFB3004C */ sw $s3, 0x4c($sp) -/* C6F3F0 802410C0 0080982D */ daddu $s3, $a0, $zero -/* C6F3F4 802410C4 AFBF0054 */ sw $ra, 0x54($sp) -/* C6F3F8 802410C8 AFB40050 */ sw $s4, 0x50($sp) -/* C6F3FC 802410CC AFB20048 */ sw $s2, 0x48($sp) -/* C6F400 802410D0 AFB10044 */ sw $s1, 0x44($sp) -/* C6F404 802410D4 AFB00040 */ sw $s0, 0x40($sp) -/* C6F408 802410D8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* C6F40C 802410DC F7B80068 */ sdc1 $f24, 0x68($sp) -/* C6F410 802410E0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* C6F414 802410E4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* C6F418 802410E8 8E710148 */ lw $s1, 0x148($s3) -/* C6F41C 802410EC 00A0902D */ daddu $s2, $a1, $zero -/* C6F420 802410F0 86240008 */ lh $a0, 8($s1) -/* C6F424 802410F4 0C00EABB */ jal get_npc_unsafe -/* C6F428 802410F8 00C0A02D */ daddu $s4, $a2, $zero -/* C6F42C 802410FC 0040802D */ daddu $s0, $v0, $zero -/* C6F430 80241100 C6200078 */ lwc1 $f0, 0x78($s1) -/* C6F434 80241104 46800020 */ cvt.s.w $f0, $f0 -/* C6F438 80241108 46000021 */ cvt.d.s $f0, $f0 -/* C6F43C 8024110C 3C014059 */ lui $at, 0x4059 -/* C6F440 80241110 44811800 */ mtc1 $at, $f3 -/* C6F444 80241114 44801000 */ mtc1 $zero, $f2 -/* C6F448 80241118 8602008E */ lh $v0, 0x8e($s0) -/* C6F44C 8024111C 9603008E */ lhu $v1, 0x8e($s0) -/* C6F450 80241120 46220003 */ div.d $f0, $f0, $f2 -/* C6F454 80241124 46200620 */ cvt.s.d $f24, $f0 -/* C6F458 80241128 C6200088 */ lwc1 $f0, 0x88($s1) -/* C6F45C 8024112C 46800020 */ cvt.s.w $f0, $f0 -/* C6F460 80241130 46000021 */ cvt.d.s $f0, $f0 -/* C6F464 80241134 46220003 */ div.d $f0, $f0, $f2 -/* C6F468 80241138 46200020 */ cvt.s.d $f0, $f0 -/* C6F46C 8024113C 18400003 */ blez $v0, .L8024114C -/* C6F470 80241140 4600C680 */ add.s $f26, $f24, $f0 -/* C6F474 80241144 2462FFFF */ addiu $v0, $v1, -1 -/* C6F478 80241148 A602008E */ sh $v0, 0x8e($s0) -.L8024114C: -/* C6F47C 8024114C 8E220070 */ lw $v0, 0x70($s1) -/* C6F480 80241150 18400034 */ blez $v0, .L80241224 -/* C6F484 80241154 00000000 */ nop -/* C6F488 80241158 C62C0074 */ lwc1 $f12, 0x74($s1) -/* C6F48C 8024115C 46806320 */ cvt.s.w $f12, $f12 -/* C6F490 80241160 44820000 */ mtc1 $v0, $f0 -/* C6F494 80241164 00000000 */ nop -/* C6F498 80241168 46800020 */ cvt.s.w $f0, $f0 -/* C6F49C 8024116C 46000021 */ cvt.d.s $f0, $f0 -/* C6F4A0 80241170 46220003 */ div.d $f0, $f0, $f2 -/* C6F4A4 80241174 0C00A8BB */ jal sin_deg -/* C6F4A8 80241178 462005A0 */ cvt.s.d $f22, $f0 -/* C6F4AC 8024117C 8E020000 */ lw $v0, ($s0) -/* C6F4B0 80241180 30420008 */ andi $v0, $v0, 8 -/* C6F4B4 80241184 10400003 */ beqz $v0, .L80241194 -/* C6F4B8 80241188 46000506 */ mov.s $f20, $f0 -/* C6F4BC 8024118C 08090475 */ j .L802411D4 -/* C6F4C0 80241190 0000102D */ daddu $v0, $zero, $zero -.L80241194: -/* C6F4C4 80241194 27A50028 */ addiu $a1, $sp, 0x28 -/* C6F4C8 80241198 27A6002C */ addiu $a2, $sp, 0x2c -/* C6F4CC 8024119C C6000038 */ lwc1 $f0, 0x38($s0) -/* C6F4D0 802411A0 C602003C */ lwc1 $f2, 0x3c($s0) -/* C6F4D4 802411A4 C6040040 */ lwc1 $f4, 0x40($s0) -/* C6F4D8 802411A8 3C01447A */ lui $at, 0x447a -/* C6F4DC 802411AC 44813000 */ mtc1 $at, $f6 -/* C6F4E0 802411B0 27A20034 */ addiu $v0, $sp, 0x34 -/* C6F4E4 802411B4 E7A00028 */ swc1 $f0, 0x28($sp) -/* C6F4E8 802411B8 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C6F4EC 802411BC E7A40030 */ swc1 $f4, 0x30($sp) -/* C6F4F0 802411C0 E7A60034 */ swc1 $f6, 0x34($sp) -/* C6F4F4 802411C4 AFA20010 */ sw $v0, 0x10($sp) -/* C6F4F8 802411C8 8E040080 */ lw $a0, 0x80($s0) -/* C6F4FC 802411CC 0C0372DF */ jal func_800DCB7C -/* C6F500 802411D0 27A70030 */ addiu $a3, $sp, 0x30 -.L802411D4: -/* C6F504 802411D4 10400007 */ beqz $v0, .L802411F4 -/* C6F508 802411D8 00000000 */ nop -/* C6F50C 802411DC 4616A082 */ mul.s $f2, $f20, $f22 -/* C6F510 802411E0 00000000 */ nop -/* C6F514 802411E4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* C6F518 802411E8 46180000 */ add.s $f0, $f0, $f24 -/* C6F51C 802411EC 08090480 */ j .L80241200 -/* C6F520 802411F0 46020000 */ add.s $f0, $f0, $f2 -.L802411F4: -/* C6F524 802411F4 4616A002 */ mul.s $f0, $f20, $f22 -/* C6F528 802411F8 00000000 */ nop -/* C6F52C 802411FC 4600D000 */ add.s $f0, $f26, $f0 -.L80241200: -/* C6F530 80241200 E600003C */ swc1 $f0, 0x3c($s0) -/* C6F534 80241204 8E220074 */ lw $v0, 0x74($s1) -/* C6F538 80241208 2442000A */ addiu $v0, $v0, 0xa -/* C6F53C 8024120C 44826000 */ mtc1 $v0, $f12 -/* C6F540 80241210 00000000 */ nop -/* C6F544 80241214 0C00A6C9 */ jal clamp_angle -/* C6F548 80241218 46806320 */ cvt.s.w $f12, $f12 -/* C6F54C 8024121C 4600020D */ trunc.w.s $f8, $f0 -/* C6F550 80241220 E6280074 */ swc1 $f8, 0x74($s1) -.L80241224: -/* C6F554 80241224 8E220090 */ lw $v0, 0x90($s1) -/* C6F558 80241228 1C400040 */ bgtz $v0, .L8024132C -/* C6F55C 8024122C 2442FFFF */ addiu $v0, $v0, -1 -/* C6F560 80241230 860200A8 */ lh $v0, 0xa8($s0) -/* C6F564 80241234 C600003C */ lwc1 $f0, 0x3c($s0) -/* C6F568 80241238 44821000 */ mtc1 $v0, $f2 -/* C6F56C 8024123C 00000000 */ nop -/* C6F570 80241240 468010A0 */ cvt.s.w $f2, $f2 -/* C6F574 80241244 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6F578 80241248 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6F57C 8024124C 46020000 */ add.s $f0, $f0, $f2 -/* C6F580 80241250 3C014024 */ lui $at, 0x4024 -/* C6F584 80241254 44812800 */ mtc1 $at, $f5 -/* C6F588 80241258 44802000 */ mtc1 $zero, $f4 -/* C6F58C 8024125C C442002C */ lwc1 $f2, 0x2c($v0) -/* C6F590 80241260 46000021 */ cvt.d.s $f0, $f0 -/* C6F594 80241264 46240000 */ add.d $f0, $f0, $f4 -/* C6F598 80241268 460010A1 */ cvt.d.s $f2, $f2 -/* C6F59C 8024126C 4620103C */ c.lt.d $f2, $f0 -/* C6F5A0 80241270 00000000 */ nop -/* C6F5A4 80241274 4500002E */ bc1f .L80241330 -/* C6F5A8 80241278 0280202D */ daddu $a0, $s4, $zero -/* C6F5AC 8024127C 24020001 */ addiu $v0, $zero, 1 -/* C6F5B0 80241280 AFA20010 */ sw $v0, 0x10($sp) -/* C6F5B4 80241284 8E460024 */ lw $a2, 0x24($s2) -/* C6F5B8 80241288 8E470028 */ lw $a3, 0x28($s2) -/* C6F5BC 8024128C 0C01242D */ jal func_800490B4 -/* C6F5C0 80241290 0220282D */ daddu $a1, $s1, $zero -/* C6F5C4 80241294 10400026 */ beqz $v0, .L80241330 -/* C6F5C8 80241298 0000202D */ daddu $a0, $zero, $zero -/* C6F5CC 8024129C 0200282D */ daddu $a1, $s0, $zero -/* C6F5D0 802412A0 0000302D */ daddu $a2, $zero, $zero -/* C6F5D4 802412A4 2412000C */ addiu $s2, $zero, 0xc -/* C6F5D8 802412A8 860300A8 */ lh $v1, 0xa8($s0) -/* C6F5DC 802412AC 3C013F80 */ lui $at, 0x3f80 -/* C6F5E0 802412B0 44810000 */ mtc1 $at, $f0 -/* C6F5E4 802412B4 3C014000 */ lui $at, 0x4000 -/* C6F5E8 802412B8 44811000 */ mtc1 $at, $f2 -/* C6F5EC 802412BC 3C01C1A0 */ lui $at, 0xc1a0 -/* C6F5F0 802412C0 44812000 */ mtc1 $at, $f4 -/* C6F5F4 802412C4 44834000 */ mtc1 $v1, $f8 -/* C6F5F8 802412C8 00000000 */ nop -/* C6F5FC 802412CC 46804220 */ cvt.s.w $f8, $f8 -/* C6F600 802412D0 44074000 */ mfc1 $a3, $f8 -/* C6F604 802412D4 27A20038 */ addiu $v0, $sp, 0x38 -/* C6F608 802412D8 AFB2001C */ sw $s2, 0x1c($sp) -/* C6F60C 802412DC AFA20020 */ sw $v0, 0x20($sp) -/* C6F610 802412E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* C6F614 802412E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* C6F618 802412E8 0C01BFA4 */ jal fx_emote -/* C6F61C 802412EC E7A40018 */ swc1 $f4, 0x18($sp) -/* C6F620 802412F0 0200202D */ daddu $a0, $s0, $zero -/* C6F624 802412F4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C6F628 802412F8 C480003C */ lwc1 $f0, 0x3c($a0) -/* C6F62C 802412FC 3C060020 */ lui $a2, 0x20 -/* C6F630 80241300 0C012530 */ jal func_800494C0 -/* C6F634 80241304 E4800064 */ swc1 $f0, 0x64($a0) -/* C6F638 80241308 8E220018 */ lw $v0, 0x18($s1) -/* C6F63C 8024130C 9442002A */ lhu $v0, 0x2a($v0) -/* C6F640 80241310 30420001 */ andi $v0, $v0, 1 -/* C6F644 80241314 10400003 */ beqz $v0, .L80241324 -/* C6F648 80241318 2402000A */ addiu $v0, $zero, 0xa -/* C6F64C 8024131C 080904F3 */ j .L802413CC -/* C6F650 80241320 AE620070 */ sw $v0, 0x70($s3) -.L80241324: -/* C6F654 80241324 080904F3 */ j .L802413CC -/* C6F658 80241328 AE720070 */ sw $s2, 0x70($s3) -.L8024132C: -/* C6F65C 8024132C AE220090 */ sw $v0, 0x90($s1) -.L80241330: -/* C6F660 80241330 8602008C */ lh $v0, 0x8c($s0) -/* C6F664 80241334 14400025 */ bnez $v0, .L802413CC -/* C6F668 80241338 00000000 */ nop -/* C6F66C 8024133C 8602008E */ lh $v0, 0x8e($s0) -/* C6F670 80241340 1C400022 */ bgtz $v0, .L802413CC -/* C6F674 80241344 00000000 */ nop -/* C6F678 80241348 8E620074 */ lw $v0, 0x74($s3) -/* C6F67C 8024134C 2442FFFF */ addiu $v0, $v0, -1 -/* C6F680 80241350 1840001D */ blez $v0, .L802413C8 -/* C6F684 80241354 AE620074 */ sw $v0, 0x74($s3) -/* C6F688 80241358 8E220018 */ lw $v0, 0x18($s1) -/* C6F68C 8024135C 9442002A */ lhu $v0, 0x2a($v0) -/* C6F690 80241360 30420010 */ andi $v0, $v0, 0x10 -/* C6F694 80241364 14400007 */ bnez $v0, .L80241384 -/* C6F698 80241368 00000000 */ nop -/* C6F69C 8024136C C600000C */ lwc1 $f0, 0xc($s0) -/* C6F6A0 80241370 3C014334 */ lui $at, 0x4334 -/* C6F6A4 80241374 44816000 */ mtc1 $at, $f12 -/* C6F6A8 80241378 0C00A6C9 */ jal clamp_angle -/* C6F6AC 8024137C 460C0300 */ add.s $f12, $f0, $f12 -/* C6F6B0 80241380 E600000C */ swc1 $f0, 0xc($s0) -.L80241384: -/* C6F6B4 80241384 0C00A67F */ jal rand_int -/* C6F6B8 80241388 240403E8 */ addiu $a0, $zero, 0x3e8 -/* C6F6BC 8024138C 3C032E8B */ lui $v1, 0x2e8b -/* C6F6C0 80241390 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* C6F6C4 80241394 00430018 */ mult $v0, $v1 -/* C6F6C8 80241398 00021FC3 */ sra $v1, $v0, 0x1f -/* C6F6CC 8024139C 00004010 */ mfhi $t0 -/* C6F6D0 802413A0 00082043 */ sra $a0, $t0, 1 -/* C6F6D4 802413A4 00832023 */ subu $a0, $a0, $v1 -/* C6F6D8 802413A8 00041840 */ sll $v1, $a0, 1 -/* C6F6DC 802413AC 00641821 */ addu $v1, $v1, $a0 -/* C6F6E0 802413B0 00031880 */ sll $v1, $v1, 2 -/* C6F6E4 802413B4 00641823 */ subu $v1, $v1, $a0 -/* C6F6E8 802413B8 00431023 */ subu $v0, $v0, $v1 -/* C6F6EC 802413BC 24420005 */ addiu $v0, $v0, 5 -/* C6F6F0 802413C0 080904F3 */ j .L802413CC -/* C6F6F4 802413C4 A602008E */ sh $v0, 0x8e($s0) -.L802413C8: -/* C6F6F8 802413C8 AE600070 */ sw $zero, 0x70($s3) -.L802413CC: -/* C6F6FC 802413CC 8FBF0054 */ lw $ra, 0x54($sp) -/* C6F700 802413D0 8FB40050 */ lw $s4, 0x50($sp) -/* C6F704 802413D4 8FB3004C */ lw $s3, 0x4c($sp) -/* C6F708 802413D8 8FB20048 */ lw $s2, 0x48($sp) -/* C6F70C 802413DC 8FB10044 */ lw $s1, 0x44($sp) -/* C6F710 802413E0 8FB00040 */ lw $s0, 0x40($sp) -/* C6F714 802413E4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* C6F718 802413E8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* C6F71C 802413EC D7B60060 */ ldc1 $f22, 0x60($sp) -/* C6F720 802413F0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* C6F724 802413F4 03E00008 */ jr $ra -/* C6F728 802413F8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s new file mode 100644 index 0000000000..445ec4406f --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802410B8_C6F3E8.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410B8_C6F3E8 +/* C6F3E8 802410B8 27BDFF88 */ addiu $sp, $sp, -0x78 +/* C6F3EC 802410BC AFB3004C */ sw $s3, 0x4c($sp) +/* C6F3F0 802410C0 0080982D */ daddu $s3, $a0, $zero +/* C6F3F4 802410C4 AFBF0054 */ sw $ra, 0x54($sp) +/* C6F3F8 802410C8 AFB40050 */ sw $s4, 0x50($sp) +/* C6F3FC 802410CC AFB20048 */ sw $s2, 0x48($sp) +/* C6F400 802410D0 AFB10044 */ sw $s1, 0x44($sp) +/* C6F404 802410D4 AFB00040 */ sw $s0, 0x40($sp) +/* C6F408 802410D8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* C6F40C 802410DC F7B80068 */ sdc1 $f24, 0x68($sp) +/* C6F410 802410E0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* C6F414 802410E4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* C6F418 802410E8 8E710148 */ lw $s1, 0x148($s3) +/* C6F41C 802410EC 00A0902D */ daddu $s2, $a1, $zero +/* C6F420 802410F0 86240008 */ lh $a0, 8($s1) +/* C6F424 802410F4 0C00EABB */ jal get_npc_unsafe +/* C6F428 802410F8 00C0A02D */ daddu $s4, $a2, $zero +/* C6F42C 802410FC 0040802D */ daddu $s0, $v0, $zero +/* C6F430 80241100 C6200078 */ lwc1 $f0, 0x78($s1) +/* C6F434 80241104 46800020 */ cvt.s.w $f0, $f0 +/* C6F438 80241108 46000021 */ cvt.d.s $f0, $f0 +/* C6F43C 8024110C 3C014059 */ lui $at, 0x4059 +/* C6F440 80241110 44811800 */ mtc1 $at, $f3 +/* C6F444 80241114 44801000 */ mtc1 $zero, $f2 +/* C6F448 80241118 8602008E */ lh $v0, 0x8e($s0) +/* C6F44C 8024111C 9603008E */ lhu $v1, 0x8e($s0) +/* C6F450 80241120 46220003 */ div.d $f0, $f0, $f2 +/* C6F454 80241124 46200620 */ cvt.s.d $f24, $f0 +/* C6F458 80241128 C6200088 */ lwc1 $f0, 0x88($s1) +/* C6F45C 8024112C 46800020 */ cvt.s.w $f0, $f0 +/* C6F460 80241130 46000021 */ cvt.d.s $f0, $f0 +/* C6F464 80241134 46220003 */ div.d $f0, $f0, $f2 +/* C6F468 80241138 46200020 */ cvt.s.d $f0, $f0 +/* C6F46C 8024113C 18400003 */ blez $v0, .L8024114C +/* C6F470 80241140 4600C680 */ add.s $f26, $f24, $f0 +/* C6F474 80241144 2462FFFF */ addiu $v0, $v1, -1 +/* C6F478 80241148 A602008E */ sh $v0, 0x8e($s0) +.L8024114C: +/* C6F47C 8024114C 8E220070 */ lw $v0, 0x70($s1) +/* C6F480 80241150 18400034 */ blez $v0, .L80241224 +/* C6F484 80241154 00000000 */ nop +/* C6F488 80241158 C62C0074 */ lwc1 $f12, 0x74($s1) +/* C6F48C 8024115C 46806320 */ cvt.s.w $f12, $f12 +/* C6F490 80241160 44820000 */ mtc1 $v0, $f0 +/* C6F494 80241164 00000000 */ nop +/* C6F498 80241168 46800020 */ cvt.s.w $f0, $f0 +/* C6F49C 8024116C 46000021 */ cvt.d.s $f0, $f0 +/* C6F4A0 80241170 46220003 */ div.d $f0, $f0, $f2 +/* C6F4A4 80241174 0C00A8BB */ jal sin_deg +/* C6F4A8 80241178 462005A0 */ cvt.s.d $f22, $f0 +/* C6F4AC 8024117C 8E020000 */ lw $v0, ($s0) +/* C6F4B0 80241180 30420008 */ andi $v0, $v0, 8 +/* C6F4B4 80241184 10400003 */ beqz $v0, .L80241194 +/* C6F4B8 80241188 46000506 */ mov.s $f20, $f0 +/* C6F4BC 8024118C 08090475 */ j .L802411D4 +/* C6F4C0 80241190 0000102D */ daddu $v0, $zero, $zero +.L80241194: +/* C6F4C4 80241194 27A50028 */ addiu $a1, $sp, 0x28 +/* C6F4C8 80241198 27A6002C */ addiu $a2, $sp, 0x2c +/* C6F4CC 8024119C C6000038 */ lwc1 $f0, 0x38($s0) +/* C6F4D0 802411A0 C602003C */ lwc1 $f2, 0x3c($s0) +/* C6F4D4 802411A4 C6040040 */ lwc1 $f4, 0x40($s0) +/* C6F4D8 802411A8 3C01447A */ lui $at, 0x447a +/* C6F4DC 802411AC 44813000 */ mtc1 $at, $f6 +/* C6F4E0 802411B0 27A20034 */ addiu $v0, $sp, 0x34 +/* C6F4E4 802411B4 E7A00028 */ swc1 $f0, 0x28($sp) +/* C6F4E8 802411B8 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C6F4EC 802411BC E7A40030 */ swc1 $f4, 0x30($sp) +/* C6F4F0 802411C0 E7A60034 */ swc1 $f6, 0x34($sp) +/* C6F4F4 802411C4 AFA20010 */ sw $v0, 0x10($sp) +/* C6F4F8 802411C8 8E040080 */ lw $a0, 0x80($s0) +/* C6F4FC 802411CC 0C0372DF */ jal func_800DCB7C +/* C6F500 802411D0 27A70030 */ addiu $a3, $sp, 0x30 +.L802411D4: +/* C6F504 802411D4 10400007 */ beqz $v0, .L802411F4 +/* C6F508 802411D8 00000000 */ nop +/* C6F50C 802411DC 4616A082 */ mul.s $f2, $f20, $f22 +/* C6F510 802411E0 00000000 */ nop +/* C6F514 802411E4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* C6F518 802411E8 46180000 */ add.s $f0, $f0, $f24 +/* C6F51C 802411EC 08090480 */ j .L80241200 +/* C6F520 802411F0 46020000 */ add.s $f0, $f0, $f2 +.L802411F4: +/* C6F524 802411F4 4616A002 */ mul.s $f0, $f20, $f22 +/* C6F528 802411F8 00000000 */ nop +/* C6F52C 802411FC 4600D000 */ add.s $f0, $f26, $f0 +.L80241200: +/* C6F530 80241200 E600003C */ swc1 $f0, 0x3c($s0) +/* C6F534 80241204 8E220074 */ lw $v0, 0x74($s1) +/* C6F538 80241208 2442000A */ addiu $v0, $v0, 0xa +/* C6F53C 8024120C 44826000 */ mtc1 $v0, $f12 +/* C6F540 80241210 00000000 */ nop +/* C6F544 80241214 0C00A6C9 */ jal clamp_angle +/* C6F548 80241218 46806320 */ cvt.s.w $f12, $f12 +/* C6F54C 8024121C 4600020D */ trunc.w.s $f8, $f0 +/* C6F550 80241220 E6280074 */ swc1 $f8, 0x74($s1) +.L80241224: +/* C6F554 80241224 8E220090 */ lw $v0, 0x90($s1) +/* C6F558 80241228 1C400040 */ bgtz $v0, .L8024132C +/* C6F55C 8024122C 2442FFFF */ addiu $v0, $v0, -1 +/* C6F560 80241230 860200A8 */ lh $v0, 0xa8($s0) +/* C6F564 80241234 C600003C */ lwc1 $f0, 0x3c($s0) +/* C6F568 80241238 44821000 */ mtc1 $v0, $f2 +/* C6F56C 8024123C 00000000 */ nop +/* C6F570 80241240 468010A0 */ cvt.s.w $f2, $f2 +/* C6F574 80241244 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C6F578 80241248 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C6F57C 8024124C 46020000 */ add.s $f0, $f0, $f2 +/* C6F580 80241250 3C014024 */ lui $at, 0x4024 +/* C6F584 80241254 44812800 */ mtc1 $at, $f5 +/* C6F588 80241258 44802000 */ mtc1 $zero, $f4 +/* C6F58C 8024125C C442002C */ lwc1 $f2, 0x2c($v0) +/* C6F590 80241260 46000021 */ cvt.d.s $f0, $f0 +/* C6F594 80241264 46240000 */ add.d $f0, $f0, $f4 +/* C6F598 80241268 460010A1 */ cvt.d.s $f2, $f2 +/* C6F59C 8024126C 4620103C */ c.lt.d $f2, $f0 +/* C6F5A0 80241270 00000000 */ nop +/* C6F5A4 80241274 4500002E */ bc1f .L80241330 +/* C6F5A8 80241278 0280202D */ daddu $a0, $s4, $zero +/* C6F5AC 8024127C 24020001 */ addiu $v0, $zero, 1 +/* C6F5B0 80241280 AFA20010 */ sw $v0, 0x10($sp) +/* C6F5B4 80241284 8E460024 */ lw $a2, 0x24($s2) +/* C6F5B8 80241288 8E470028 */ lw $a3, 0x28($s2) +/* C6F5BC 8024128C 0C01242D */ jal func_800490B4 +/* C6F5C0 80241290 0220282D */ daddu $a1, $s1, $zero +/* C6F5C4 80241294 10400026 */ beqz $v0, .L80241330 +/* C6F5C8 80241298 0000202D */ daddu $a0, $zero, $zero +/* C6F5CC 8024129C 0200282D */ daddu $a1, $s0, $zero +/* C6F5D0 802412A0 0000302D */ daddu $a2, $zero, $zero +/* C6F5D4 802412A4 2412000C */ addiu $s2, $zero, 0xc +/* C6F5D8 802412A8 860300A8 */ lh $v1, 0xa8($s0) +/* C6F5DC 802412AC 3C013F80 */ lui $at, 0x3f80 +/* C6F5E0 802412B0 44810000 */ mtc1 $at, $f0 +/* C6F5E4 802412B4 3C014000 */ lui $at, 0x4000 +/* C6F5E8 802412B8 44811000 */ mtc1 $at, $f2 +/* C6F5EC 802412BC 3C01C1A0 */ lui $at, 0xc1a0 +/* C6F5F0 802412C0 44812000 */ mtc1 $at, $f4 +/* C6F5F4 802412C4 44834000 */ mtc1 $v1, $f8 +/* C6F5F8 802412C8 00000000 */ nop +/* C6F5FC 802412CC 46804220 */ cvt.s.w $f8, $f8 +/* C6F600 802412D0 44074000 */ mfc1 $a3, $f8 +/* C6F604 802412D4 27A20038 */ addiu $v0, $sp, 0x38 +/* C6F608 802412D8 AFB2001C */ sw $s2, 0x1c($sp) +/* C6F60C 802412DC AFA20020 */ sw $v0, 0x20($sp) +/* C6F610 802412E0 E7A00010 */ swc1 $f0, 0x10($sp) +/* C6F614 802412E4 E7A20014 */ swc1 $f2, 0x14($sp) +/* C6F618 802412E8 0C01BFA4 */ jal fx_emote +/* C6F61C 802412EC E7A40018 */ swc1 $f4, 0x18($sp) +/* C6F620 802412F0 0200202D */ daddu $a0, $s0, $zero +/* C6F624 802412F4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C6F628 802412F8 C480003C */ lwc1 $f0, 0x3c($a0) +/* C6F62C 802412FC 3C060020 */ lui $a2, 0x20 +/* C6F630 80241300 0C012530 */ jal func_800494C0 +/* C6F634 80241304 E4800064 */ swc1 $f0, 0x64($a0) +/* C6F638 80241308 8E220018 */ lw $v0, 0x18($s1) +/* C6F63C 8024130C 9442002A */ lhu $v0, 0x2a($v0) +/* C6F640 80241310 30420001 */ andi $v0, $v0, 1 +/* C6F644 80241314 10400003 */ beqz $v0, .L80241324 +/* C6F648 80241318 2402000A */ addiu $v0, $zero, 0xa +/* C6F64C 8024131C 080904F3 */ j .L802413CC +/* C6F650 80241320 AE620070 */ sw $v0, 0x70($s3) +.L80241324: +/* C6F654 80241324 080904F3 */ j .L802413CC +/* C6F658 80241328 AE720070 */ sw $s2, 0x70($s3) +.L8024132C: +/* C6F65C 8024132C AE220090 */ sw $v0, 0x90($s1) +.L80241330: +/* C6F660 80241330 8602008C */ lh $v0, 0x8c($s0) +/* C6F664 80241334 14400025 */ bnez $v0, .L802413CC +/* C6F668 80241338 00000000 */ nop +/* C6F66C 8024133C 8602008E */ lh $v0, 0x8e($s0) +/* C6F670 80241340 1C400022 */ bgtz $v0, .L802413CC +/* C6F674 80241344 00000000 */ nop +/* C6F678 80241348 8E620074 */ lw $v0, 0x74($s3) +/* C6F67C 8024134C 2442FFFF */ addiu $v0, $v0, -1 +/* C6F680 80241350 1840001D */ blez $v0, .L802413C8 +/* C6F684 80241354 AE620074 */ sw $v0, 0x74($s3) +/* C6F688 80241358 8E220018 */ lw $v0, 0x18($s1) +/* C6F68C 8024135C 9442002A */ lhu $v0, 0x2a($v0) +/* C6F690 80241360 30420010 */ andi $v0, $v0, 0x10 +/* C6F694 80241364 14400007 */ bnez $v0, .L80241384 +/* C6F698 80241368 00000000 */ nop +/* C6F69C 8024136C C600000C */ lwc1 $f0, 0xc($s0) +/* C6F6A0 80241370 3C014334 */ lui $at, 0x4334 +/* C6F6A4 80241374 44816000 */ mtc1 $at, $f12 +/* C6F6A8 80241378 0C00A6C9 */ jal clamp_angle +/* C6F6AC 8024137C 460C0300 */ add.s $f12, $f0, $f12 +/* C6F6B0 80241380 E600000C */ swc1 $f0, 0xc($s0) +.L80241384: +/* C6F6B4 80241384 0C00A67F */ jal rand_int +/* C6F6B8 80241388 240403E8 */ addiu $a0, $zero, 0x3e8 +/* C6F6BC 8024138C 3C032E8B */ lui $v1, 0x2e8b +/* C6F6C0 80241390 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* C6F6C4 80241394 00430018 */ mult $v0, $v1 +/* C6F6C8 80241398 00021FC3 */ sra $v1, $v0, 0x1f +/* C6F6CC 8024139C 00004010 */ mfhi $t0 +/* C6F6D0 802413A0 00082043 */ sra $a0, $t0, 1 +/* C6F6D4 802413A4 00832023 */ subu $a0, $a0, $v1 +/* C6F6D8 802413A8 00041840 */ sll $v1, $a0, 1 +/* C6F6DC 802413AC 00641821 */ addu $v1, $v1, $a0 +/* C6F6E0 802413B0 00031880 */ sll $v1, $v1, 2 +/* C6F6E4 802413B4 00641823 */ subu $v1, $v1, $a0 +/* C6F6E8 802413B8 00431023 */ subu $v0, $v0, $v1 +/* C6F6EC 802413BC 24420005 */ addiu $v0, $v0, 5 +/* C6F6F0 802413C0 080904F3 */ j .L802413CC +/* C6F6F4 802413C4 A602008E */ sh $v0, 0x8e($s0) +.L802413C8: +/* C6F6F8 802413C8 AE600070 */ sw $zero, 0x70($s3) +.L802413CC: +/* C6F6FC 802413CC 8FBF0054 */ lw $ra, 0x54($sp) +/* C6F700 802413D0 8FB40050 */ lw $s4, 0x50($sp) +/* C6F704 802413D4 8FB3004C */ lw $s3, 0x4c($sp) +/* C6F708 802413D8 8FB20048 */ lw $s2, 0x48($sp) +/* C6F70C 802413DC 8FB10044 */ lw $s1, 0x44($sp) +/* C6F710 802413E0 8FB00040 */ lw $s0, 0x40($sp) +/* C6F714 802413E4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* C6F718 802413E8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* C6F71C 802413EC D7B60060 */ ldc1 $f22, 0x60($sp) +/* C6F720 802413F0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* C6F724 802413F4 03E00008 */ jr $ra +/* C6F728 802413F8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0.s deleted file mode 100644 index 08aa2b5076..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414E0 -/* C6F810 802414E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C6F814 802414E4 AFB3001C */ sw $s3, 0x1c($sp) -/* C6F818 802414E8 0080982D */ daddu $s3, $a0, $zero -/* C6F81C 802414EC AFBF0020 */ sw $ra, 0x20($sp) -/* C6F820 802414F0 AFB20018 */ sw $s2, 0x18($sp) -/* C6F824 802414F4 AFB10014 */ sw $s1, 0x14($sp) -/* C6F828 802414F8 AFB00010 */ sw $s0, 0x10($sp) -/* C6F82C 802414FC 8E720148 */ lw $s2, 0x148($s3) -/* C6F830 80241500 86440008 */ lh $a0, 8($s2) -/* C6F834 80241504 0C00EABB */ jal get_npc_unsafe -/* C6F838 80241508 00A0802D */ daddu $s0, $a1, $zero -/* C6F83C 8024150C 0040882D */ daddu $s1, $v0, $zero -/* C6F840 80241510 C6420080 */ lwc1 $f2, 0x80($s2) -/* C6F844 80241514 468010A0 */ cvt.s.w $f2, $f2 -/* C6F848 80241518 460010A1 */ cvt.d.s $f2, $f2 -/* C6F84C 8024151C C6400084 */ lwc1 $f0, 0x84($s2) -/* C6F850 80241520 46800020 */ cvt.s.w $f0, $f0 -/* C6F854 80241524 46000021 */ cvt.d.s $f0, $f0 -/* C6F858 80241528 3C014059 */ lui $at, 0x4059 -/* C6F85C 8024152C 44812800 */ mtc1 $at, $f5 -/* C6F860 80241530 44802000 */ mtc1 $zero, $f4 -/* C6F864 80241534 8E4200CC */ lw $v0, 0xcc($s2) -/* C6F868 80241538 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C6F86C 8024153C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C6F870 80241540 46241083 */ div.d $f2, $f2, $f4 -/* C6F874 80241544 462010A0 */ cvt.s.d $f2, $f2 -/* C6F878 80241548 46240003 */ div.d $f0, $f0, $f4 -/* C6F87C 8024154C 8C420020 */ lw $v0, 0x20($v0) -/* C6F880 80241550 46200020 */ cvt.s.d $f0, $f0 -/* C6F884 80241554 E622001C */ swc1 $f2, 0x1c($s1) -/* C6F888 80241558 E6200014 */ swc1 $f0, 0x14($s1) -/* C6F88C 8024155C AE220028 */ sw $v0, 0x28($s1) -/* C6F890 80241560 C6000018 */ lwc1 $f0, 0x18($s0) -/* C6F894 80241564 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C6F898 80241568 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C6F89C 8024156C E6200018 */ swc1 $f0, 0x18($s1) -/* C6F8A0 80241570 8C460028 */ lw $a2, 0x28($v0) -/* C6F8A4 80241574 0C00A720 */ jal atan2 -/* C6F8A8 80241578 8C470030 */ lw $a3, 0x30($v0) -/* C6F8AC 8024157C E620000C */ swc1 $f0, 0xc($s1) -/* C6F8B0 80241580 8E420018 */ lw $v0, 0x18($s2) -/* C6F8B4 80241584 AE400074 */ sw $zero, 0x74($s2) -/* C6F8B8 80241588 9442002A */ lhu $v0, 0x2a($v0) -/* C6F8BC 8024158C 30420002 */ andi $v0, $v0, 2 -/* C6F8C0 80241590 10400005 */ beqz $v0, .L802415A8 -/* C6F8C4 80241594 24020003 */ addiu $v0, $zero, 3 -/* C6F8C8 80241598 A622008E */ sh $v0, 0x8e($s1) -/* C6F8CC 8024159C 2402000D */ addiu $v0, $zero, 0xd -/* C6F8D0 802415A0 0809057E */ j .L802415F8 -/* C6F8D4 802415A4 AE620070 */ sw $v0, 0x70($s3) -.L802415A8: -/* C6F8D8 802415A8 24030001 */ addiu $v1, $zero, 1 -/* C6F8DC 802415AC 2402000E */ addiu $v0, $zero, 0xe -/* C6F8E0 802415B0 A623008E */ sh $v1, 0x8e($s1) -/* C6F8E4 802415B4 AE620070 */ sw $v0, 0x70($s3) -/* C6F8E8 802415B8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C6F8EC 802415BC 4600018D */ trunc.w.s $f6, $f0 -/* C6F8F0 802415C0 44023000 */ mfc1 $v0, $f6 -/* C6F8F4 802415C4 00000000 */ nop -/* C6F8F8 802415C8 A6420010 */ sh $v0, 0x10($s2) -/* C6F8FC 802415CC C620003C */ lwc1 $f0, 0x3c($s1) -/* C6F900 802415D0 4600018D */ trunc.w.s $f6, $f0 -/* C6F904 802415D4 44023000 */ mfc1 $v0, $f6 -/* C6F908 802415D8 00000000 */ nop -/* C6F90C 802415DC A6420012 */ sh $v0, 0x12($s2) -/* C6F910 802415E0 C6200040 */ lwc1 $f0, 0x40($s1) -/* C6F914 802415E4 A2430007 */ sb $v1, 7($s2) -/* C6F918 802415E8 4600018D */ trunc.w.s $f6, $f0 -/* C6F91C 802415EC 44023000 */ mfc1 $v0, $f6 -/* C6F920 802415F0 00000000 */ nop -/* C6F924 802415F4 A6420014 */ sh $v0, 0x14($s2) -.L802415F8: -/* C6F928 802415F8 8FBF0020 */ lw $ra, 0x20($sp) -/* C6F92C 802415FC 8FB3001C */ lw $s3, 0x1c($sp) -/* C6F930 80241600 8FB20018 */ lw $s2, 0x18($sp) -/* C6F934 80241604 8FB10014 */ lw $s1, 0x14($sp) -/* C6F938 80241608 8FB00010 */ lw $s0, 0x10($sp) -/* C6F93C 8024160C 03E00008 */ jr $ra -/* C6F940 80241610 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s new file mode 100644 index 0000000000..4c5f53fa12 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_802414E0_C6F810.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414E0_C6F810 +/* C6F810 802414E0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C6F814 802414E4 AFB3001C */ sw $s3, 0x1c($sp) +/* C6F818 802414E8 0080982D */ daddu $s3, $a0, $zero +/* C6F81C 802414EC AFBF0020 */ sw $ra, 0x20($sp) +/* C6F820 802414F0 AFB20018 */ sw $s2, 0x18($sp) +/* C6F824 802414F4 AFB10014 */ sw $s1, 0x14($sp) +/* C6F828 802414F8 AFB00010 */ sw $s0, 0x10($sp) +/* C6F82C 802414FC 8E720148 */ lw $s2, 0x148($s3) +/* C6F830 80241500 86440008 */ lh $a0, 8($s2) +/* C6F834 80241504 0C00EABB */ jal get_npc_unsafe +/* C6F838 80241508 00A0802D */ daddu $s0, $a1, $zero +/* C6F83C 8024150C 0040882D */ daddu $s1, $v0, $zero +/* C6F840 80241510 C6420080 */ lwc1 $f2, 0x80($s2) +/* C6F844 80241514 468010A0 */ cvt.s.w $f2, $f2 +/* C6F848 80241518 460010A1 */ cvt.d.s $f2, $f2 +/* C6F84C 8024151C C6400084 */ lwc1 $f0, 0x84($s2) +/* C6F850 80241520 46800020 */ cvt.s.w $f0, $f0 +/* C6F854 80241524 46000021 */ cvt.d.s $f0, $f0 +/* C6F858 80241528 3C014059 */ lui $at, 0x4059 +/* C6F85C 8024152C 44812800 */ mtc1 $at, $f5 +/* C6F860 80241530 44802000 */ mtc1 $zero, $f4 +/* C6F864 80241534 8E4200CC */ lw $v0, 0xcc($s2) +/* C6F868 80241538 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C6F86C 8024153C C62E0040 */ lwc1 $f14, 0x40($s1) +/* C6F870 80241540 46241083 */ div.d $f2, $f2, $f4 +/* C6F874 80241544 462010A0 */ cvt.s.d $f2, $f2 +/* C6F878 80241548 46240003 */ div.d $f0, $f0, $f4 +/* C6F87C 8024154C 8C420020 */ lw $v0, 0x20($v0) +/* C6F880 80241550 46200020 */ cvt.s.d $f0, $f0 +/* C6F884 80241554 E622001C */ swc1 $f2, 0x1c($s1) +/* C6F888 80241558 E6200014 */ swc1 $f0, 0x14($s1) +/* C6F88C 8024155C AE220028 */ sw $v0, 0x28($s1) +/* C6F890 80241560 C6000018 */ lwc1 $f0, 0x18($s0) +/* C6F894 80241564 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C6F898 80241568 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C6F89C 8024156C E6200018 */ swc1 $f0, 0x18($s1) +/* C6F8A0 80241570 8C460028 */ lw $a2, 0x28($v0) +/* C6F8A4 80241574 0C00A720 */ jal atan2 +/* C6F8A8 80241578 8C470030 */ lw $a3, 0x30($v0) +/* C6F8AC 8024157C E620000C */ swc1 $f0, 0xc($s1) +/* C6F8B0 80241580 8E420018 */ lw $v0, 0x18($s2) +/* C6F8B4 80241584 AE400074 */ sw $zero, 0x74($s2) +/* C6F8B8 80241588 9442002A */ lhu $v0, 0x2a($v0) +/* C6F8BC 8024158C 30420002 */ andi $v0, $v0, 2 +/* C6F8C0 80241590 10400005 */ beqz $v0, .L802415A8 +/* C6F8C4 80241594 24020003 */ addiu $v0, $zero, 3 +/* C6F8C8 80241598 A622008E */ sh $v0, 0x8e($s1) +/* C6F8CC 8024159C 2402000D */ addiu $v0, $zero, 0xd +/* C6F8D0 802415A0 0809057E */ j .L802415F8 +/* C6F8D4 802415A4 AE620070 */ sw $v0, 0x70($s3) +.L802415A8: +/* C6F8D8 802415A8 24030001 */ addiu $v1, $zero, 1 +/* C6F8DC 802415AC 2402000E */ addiu $v0, $zero, 0xe +/* C6F8E0 802415B0 A623008E */ sh $v1, 0x8e($s1) +/* C6F8E4 802415B4 AE620070 */ sw $v0, 0x70($s3) +/* C6F8E8 802415B8 C6200038 */ lwc1 $f0, 0x38($s1) +/* C6F8EC 802415BC 4600018D */ trunc.w.s $f6, $f0 +/* C6F8F0 802415C0 44023000 */ mfc1 $v0, $f6 +/* C6F8F4 802415C4 00000000 */ nop +/* C6F8F8 802415C8 A6420010 */ sh $v0, 0x10($s2) +/* C6F8FC 802415CC C620003C */ lwc1 $f0, 0x3c($s1) +/* C6F900 802415D0 4600018D */ trunc.w.s $f6, $f0 +/* C6F904 802415D4 44023000 */ mfc1 $v0, $f6 +/* C6F908 802415D8 00000000 */ nop +/* C6F90C 802415DC A6420012 */ sh $v0, 0x12($s2) +/* C6F910 802415E0 C6200040 */ lwc1 $f0, 0x40($s1) +/* C6F914 802415E4 A2430007 */ sb $v1, 7($s2) +/* C6F918 802415E8 4600018D */ trunc.w.s $f6, $f0 +/* C6F91C 802415EC 44023000 */ mfc1 $v0, $f6 +/* C6F920 802415F0 00000000 */ nop +/* C6F924 802415F4 A6420014 */ sh $v0, 0x14($s2) +.L802415F8: +/* C6F928 802415F8 8FBF0020 */ lw $ra, 0x20($sp) +/* C6F92C 802415FC 8FB3001C */ lw $s3, 0x1c($sp) +/* C6F930 80241600 8FB20018 */ lw $s2, 0x18($sp) +/* C6F934 80241604 8FB10014 */ lw $s1, 0x14($sp) +/* C6F938 80241608 8FB00010 */ lw $s0, 0x10($sp) +/* C6F93C 8024160C 03E00008 */ jr $ra +/* C6F940 80241610 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C.s deleted file mode 100644 index f3977f2f5e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B2C -/* C6FE5C 80241B2C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C6FE60 80241B30 AFB40040 */ sw $s4, 0x40($sp) -/* C6FE64 80241B34 0080A02D */ daddu $s4, $a0, $zero -/* C6FE68 80241B38 AFBF0048 */ sw $ra, 0x48($sp) -/* C6FE6C 80241B3C AFB50044 */ sw $s5, 0x44($sp) -/* C6FE70 80241B40 AFB3003C */ sw $s3, 0x3c($sp) -/* C6FE74 80241B44 AFB20038 */ sw $s2, 0x38($sp) -/* C6FE78 80241B48 AFB10034 */ sw $s1, 0x34($sp) -/* C6FE7C 80241B4C AFB00030 */ sw $s0, 0x30($sp) -/* C6FE80 80241B50 8E920148 */ lw $s2, 0x148($s4) -/* C6FE84 80241B54 86440008 */ lh $a0, 8($s2) -/* C6FE88 80241B58 8E90000C */ lw $s0, 0xc($s4) -/* C6FE8C 80241B5C 0C00EABB */ jal get_npc_unsafe -/* C6FE90 80241B60 00A0882D */ daddu $s1, $a1, $zero -/* C6FE94 80241B64 0280202D */ daddu $a0, $s4, $zero -/* C6FE98 80241B68 8E050000 */ lw $a1, ($s0) -/* C6FE9C 80241B6C 0C0B1EAF */ jal get_variable -/* C6FEA0 80241B70 0040A82D */ daddu $s5, $v0, $zero -/* C6FEA4 80241B74 AFA00010 */ sw $zero, 0x10($sp) -/* C6FEA8 80241B78 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FEAC 80241B7C 8C630030 */ lw $v1, 0x30($v1) -/* C6FEB0 80241B80 AFA30014 */ sw $v1, 0x14($sp) -/* C6FEB4 80241B84 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FEB8 80241B88 8C63001C */ lw $v1, 0x1c($v1) -/* C6FEBC 80241B8C AFA30018 */ sw $v1, 0x18($sp) -/* C6FEC0 80241B90 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FEC4 80241B94 8C630024 */ lw $v1, 0x24($v1) -/* C6FEC8 80241B98 AFA3001C */ sw $v1, 0x1c($sp) -/* C6FECC 80241B9C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FED0 80241BA0 8C630028 */ lw $v1, 0x28($v1) -/* C6FED4 80241BA4 27B30010 */ addiu $s3, $sp, 0x10 -/* C6FED8 80241BA8 AFA30020 */ sw $v1, 0x20($sp) -/* C6FEDC 80241BAC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C6FEE0 80241BB0 3C0142F0 */ lui $at, 0x42f0 -/* C6FEE4 80241BB4 44810000 */ mtc1 $at, $f0 -/* C6FEE8 80241BB8 8C63002C */ lw $v1, 0x2c($v1) -/* C6FEEC 80241BBC 0040802D */ daddu $s0, $v0, $zero -/* C6FEF0 80241BC0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C6FEF4 80241BC4 A7A0002C */ sh $zero, 0x2c($sp) -/* C6FEF8 80241BC8 12200006 */ beqz $s1, .L80241BE4 -/* C6FEFC 80241BCC AFA30024 */ sw $v1, 0x24($sp) -/* C6FF00 80241BD0 02A0202D */ daddu $a0, $s5, $zero -/* C6FF04 80241BD4 0240282D */ daddu $a1, $s2, $zero -/* C6FF08 80241BD8 0280302D */ daddu $a2, $s4, $zero -/* C6FF0C 80241BDC 0C090682 */ jal func_80241A08 -/* C6FF10 80241BE0 0200382D */ daddu $a3, $s0, $zero -.L80241BE4: -/* C6FF14 80241BE4 2402FFFE */ addiu $v0, $zero, -2 -/* C6FF18 80241BE8 A2A200AB */ sb $v0, 0xab($s5) -/* C6FF1C 80241BEC 8E4300B0 */ lw $v1, 0xb0($s2) -/* C6FF20 80241BF0 30620004 */ andi $v0, $v1, 4 -/* C6FF24 80241BF4 10400007 */ beqz $v0, .L80241C14 -/* C6FF28 80241BF8 00000000 */ nop -/* C6FF2C 80241BFC 824200B4 */ lb $v0, 0xb4($s2) -/* C6FF30 80241C00 1440003C */ bnez $v0, .L80241CF4 -/* C6FF34 80241C04 0000102D */ daddu $v0, $zero, $zero -/* C6FF38 80241C08 2402FFFB */ addiu $v0, $zero, -5 -/* C6FF3C 80241C0C 00621024 */ and $v0, $v1, $v0 -/* C6FF40 80241C10 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241C14: -/* C6FF44 80241C14 8E830070 */ lw $v1, 0x70($s4) -/* C6FF48 80241C18 2C62000F */ sltiu $v0, $v1, 0xf -/* C6FF4C 80241C1C 10400034 */ beqz $v0, .L80241CF0 -/* C6FF50 80241C20 00031080 */ sll $v0, $v1, 2 -/* C6FF54 80241C24 3C018024 */ lui $at, 0x8024 -/* C6FF58 80241C28 00220821 */ addu $at, $at, $v0 -/* C6FF5C 80241C2C 8C2230A8 */ lw $v0, 0x30a8($at) -/* C6FF60 80241C30 00400008 */ jr $v0 -/* C6FF64 80241C34 00000000 */ nop -/* C6FF68 80241C38 0280202D */ daddu $a0, $s4, $zero -/* C6FF6C 80241C3C 0200282D */ daddu $a1, $s0, $zero -/* C6FF70 80241C40 0C090208 */ jal func_80240820 -/* C6FF74 80241C44 0260302D */ daddu $a2, $s3, $zero -/* C6FF78 80241C48 0280202D */ daddu $a0, $s4, $zero -/* C6FF7C 80241C4C 0200282D */ daddu $a1, $s0, $zero -/* C6FF80 80241C50 0C090274 */ jal func_802409D0 -/* C6FF84 80241C54 0260302D */ daddu $a2, $s3, $zero -/* C6FF88 80241C58 0809073D */ j .L80241CF4 -/* C6FF8C 80241C5C 0000102D */ daddu $v0, $zero, $zero -/* C6FF90 80241C60 0280202D */ daddu $a0, $s4, $zero -/* C6FF94 80241C64 0200282D */ daddu $a1, $s0, $zero -/* C6FF98 80241C68 0C0903FE */ jal func_80240FF8 -/* C6FF9C 80241C6C 0260302D */ daddu $a2, $s3, $zero -/* C6FFA0 80241C70 0280202D */ daddu $a0, $s4, $zero -/* C6FFA4 80241C74 0200282D */ daddu $a1, $s0, $zero -/* C6FFA8 80241C78 0C09042E */ jal func_802410B8 -/* C6FFAC 80241C7C 0260302D */ daddu $a2, $s3, $zero -/* C6FFB0 80241C80 0809073D */ j .L80241CF4 -/* C6FFB4 80241C84 0000102D */ daddu $v0, $zero, $zero -/* C6FFB8 80241C88 0280202D */ daddu $a0, $s4, $zero -/* C6FFBC 80241C8C 0200282D */ daddu $a1, $s0, $zero -/* C6FFC0 80241C90 0C0904FF */ jal func_802413FC -/* C6FFC4 80241C94 0260302D */ daddu $a2, $s3, $zero -/* C6FFC8 80241C98 0280202D */ daddu $a0, $s4, $zero -/* C6FFCC 80241C9C 0200282D */ daddu $a1, $s0, $zero -/* C6FFD0 80241CA0 0C09051D */ jal func_80241474 -/* C6FFD4 80241CA4 0260302D */ daddu $a2, $s3, $zero -/* C6FFD8 80241CA8 0809073D */ j .L80241CF4 -/* C6FFDC 80241CAC 0000102D */ daddu $v0, $zero, $zero -/* C6FFE0 80241CB0 0280202D */ daddu $a0, $s4, $zero -/* C6FFE4 80241CB4 0200282D */ daddu $a1, $s0, $zero -/* C6FFE8 80241CB8 0C090538 */ jal func_802414E0 -/* C6FFEC 80241CBC 0260302D */ daddu $a2, $s3, $zero -/* C6FFF0 80241CC0 0809073D */ j .L80241CF4 -/* C6FFF4 80241CC4 0000102D */ daddu $v0, $zero, $zero -/* C6FFF8 80241CC8 0280202D */ daddu $a0, $s4, $zero -/* C6FFFC 80241CCC 0200282D */ daddu $a1, $s0, $zero -/* C70000 80241CD0 0C090585 */ jal func_80241614 -/* C70004 80241CD4 0260302D */ daddu $a2, $s3, $zero -/* C70008 80241CD8 0809073D */ j .L80241CF4 -/* C7000C 80241CDC 0000102D */ daddu $v0, $zero, $zero -/* C70010 80241CE0 0280202D */ daddu $a0, $s4, $zero -/* C70014 80241CE4 0200282D */ daddu $a1, $s0, $zero -/* C70018 80241CE8 0C09059E */ jal func_80241678 -/* C7001C 80241CEC 0260302D */ daddu $a2, $s3, $zero -.L80241CF0: -/* C70020 80241CF0 0000102D */ daddu $v0, $zero, $zero -.L80241CF4: -/* C70024 80241CF4 8FBF0048 */ lw $ra, 0x48($sp) -/* C70028 80241CF8 8FB50044 */ lw $s5, 0x44($sp) -/* C7002C 80241CFC 8FB40040 */ lw $s4, 0x40($sp) -/* C70030 80241D00 8FB3003C */ lw $s3, 0x3c($sp) -/* C70034 80241D04 8FB20038 */ lw $s2, 0x38($sp) -/* C70038 80241D08 8FB10034 */ lw $s1, 0x34($sp) -/* C7003C 80241D0C 8FB00030 */ lw $s0, 0x30($sp) -/* C70040 80241D10 03E00008 */ jr $ra -/* C70044 80241D14 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s new file mode 100644 index 0000000000..2e3999a29d --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241B2C_C6FE5C.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B2C_C6FE5C +/* C6FE5C 80241B2C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C6FE60 80241B30 AFB40040 */ sw $s4, 0x40($sp) +/* C6FE64 80241B34 0080A02D */ daddu $s4, $a0, $zero +/* C6FE68 80241B38 AFBF0048 */ sw $ra, 0x48($sp) +/* C6FE6C 80241B3C AFB50044 */ sw $s5, 0x44($sp) +/* C6FE70 80241B40 AFB3003C */ sw $s3, 0x3c($sp) +/* C6FE74 80241B44 AFB20038 */ sw $s2, 0x38($sp) +/* C6FE78 80241B48 AFB10034 */ sw $s1, 0x34($sp) +/* C6FE7C 80241B4C AFB00030 */ sw $s0, 0x30($sp) +/* C6FE80 80241B50 8E920148 */ lw $s2, 0x148($s4) +/* C6FE84 80241B54 86440008 */ lh $a0, 8($s2) +/* C6FE88 80241B58 8E90000C */ lw $s0, 0xc($s4) +/* C6FE8C 80241B5C 0C00EABB */ jal get_npc_unsafe +/* C6FE90 80241B60 00A0882D */ daddu $s1, $a1, $zero +/* C6FE94 80241B64 0280202D */ daddu $a0, $s4, $zero +/* C6FE98 80241B68 8E050000 */ lw $a1, ($s0) +/* C6FE9C 80241B6C 0C0B1EAF */ jal get_variable +/* C6FEA0 80241B70 0040A82D */ daddu $s5, $v0, $zero +/* C6FEA4 80241B74 AFA00010 */ sw $zero, 0x10($sp) +/* C6FEA8 80241B78 8E4300D0 */ lw $v1, 0xd0($s2) +/* C6FEAC 80241B7C 8C630030 */ lw $v1, 0x30($v1) +/* C6FEB0 80241B80 AFA30014 */ sw $v1, 0x14($sp) +/* C6FEB4 80241B84 8E4300D0 */ lw $v1, 0xd0($s2) +/* C6FEB8 80241B88 8C63001C */ lw $v1, 0x1c($v1) +/* C6FEBC 80241B8C AFA30018 */ sw $v1, 0x18($sp) +/* C6FEC0 80241B90 8E4300D0 */ lw $v1, 0xd0($s2) +/* C6FEC4 80241B94 8C630024 */ lw $v1, 0x24($v1) +/* C6FEC8 80241B98 AFA3001C */ sw $v1, 0x1c($sp) +/* C6FECC 80241B9C 8E4300D0 */ lw $v1, 0xd0($s2) +/* C6FED0 80241BA0 8C630028 */ lw $v1, 0x28($v1) +/* C6FED4 80241BA4 27B30010 */ addiu $s3, $sp, 0x10 +/* C6FED8 80241BA8 AFA30020 */ sw $v1, 0x20($sp) +/* C6FEDC 80241BAC 8E4300D0 */ lw $v1, 0xd0($s2) +/* C6FEE0 80241BB0 3C0142F0 */ lui $at, 0x42f0 +/* C6FEE4 80241BB4 44810000 */ mtc1 $at, $f0 +/* C6FEE8 80241BB8 8C63002C */ lw $v1, 0x2c($v1) +/* C6FEEC 80241BBC 0040802D */ daddu $s0, $v0, $zero +/* C6FEF0 80241BC0 E7A00028 */ swc1 $f0, 0x28($sp) +/* C6FEF4 80241BC4 A7A0002C */ sh $zero, 0x2c($sp) +/* C6FEF8 80241BC8 12200006 */ beqz $s1, .L80241BE4 +/* C6FEFC 80241BCC AFA30024 */ sw $v1, 0x24($sp) +/* C6FF00 80241BD0 02A0202D */ daddu $a0, $s5, $zero +/* C6FF04 80241BD4 0240282D */ daddu $a1, $s2, $zero +/* C6FF08 80241BD8 0280302D */ daddu $a2, $s4, $zero +/* C6FF0C 80241BDC 0C090682 */ jal func_80241A08_C6FD38 +/* C6FF10 80241BE0 0200382D */ daddu $a3, $s0, $zero +.L80241BE4: +/* C6FF14 80241BE4 2402FFFE */ addiu $v0, $zero, -2 +/* C6FF18 80241BE8 A2A200AB */ sb $v0, 0xab($s5) +/* C6FF1C 80241BEC 8E4300B0 */ lw $v1, 0xb0($s2) +/* C6FF20 80241BF0 30620004 */ andi $v0, $v1, 4 +/* C6FF24 80241BF4 10400007 */ beqz $v0, .L80241C14 +/* C6FF28 80241BF8 00000000 */ nop +/* C6FF2C 80241BFC 824200B4 */ lb $v0, 0xb4($s2) +/* C6FF30 80241C00 1440003C */ bnez $v0, .L80241CF4 +/* C6FF34 80241C04 0000102D */ daddu $v0, $zero, $zero +/* C6FF38 80241C08 2402FFFB */ addiu $v0, $zero, -5 +/* C6FF3C 80241C0C 00621024 */ and $v0, $v1, $v0 +/* C6FF40 80241C10 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241C14: +/* C6FF44 80241C14 8E830070 */ lw $v1, 0x70($s4) +/* C6FF48 80241C18 2C62000F */ sltiu $v0, $v1, 0xf +/* C6FF4C 80241C1C 10400034 */ beqz $v0, .L80241CF0 +/* C6FF50 80241C20 00031080 */ sll $v0, $v1, 2 +/* C6FF54 80241C24 3C018024 */ lui $at, 0x8024 +/* C6FF58 80241C28 00220821 */ addu $at, $at, $v0 +/* C6FF5C 80241C2C 8C2230A8 */ lw $v0, 0x30a8($at) +/* C6FF60 80241C30 00400008 */ jr $v0 +/* C6FF64 80241C34 00000000 */ nop +/* C6FF68 80241C38 0280202D */ daddu $a0, $s4, $zero +/* C6FF6C 80241C3C 0200282D */ daddu $a1, $s0, $zero +/* C6FF70 80241C40 0C090208 */ jal func_80240820_C6EB50 +/* C6FF74 80241C44 0260302D */ daddu $a2, $s3, $zero +/* C6FF78 80241C48 0280202D */ daddu $a0, $s4, $zero +/* C6FF7C 80241C4C 0200282D */ daddu $a1, $s0, $zero +/* C6FF80 80241C50 0C090274 */ jal func_802409D0_C6ED00 +/* C6FF84 80241C54 0260302D */ daddu $a2, $s3, $zero +/* C6FF88 80241C58 0809073D */ j .L80241CF4 +/* C6FF8C 80241C5C 0000102D */ daddu $v0, $zero, $zero +/* C6FF90 80241C60 0280202D */ daddu $a0, $s4, $zero +/* C6FF94 80241C64 0200282D */ daddu $a1, $s0, $zero +/* C6FF98 80241C68 0C0903FE */ jal func_80240FF8_C6F328 +/* C6FF9C 80241C6C 0260302D */ daddu $a2, $s3, $zero +/* C6FFA0 80241C70 0280202D */ daddu $a0, $s4, $zero +/* C6FFA4 80241C74 0200282D */ daddu $a1, $s0, $zero +/* C6FFA8 80241C78 0C09042E */ jal func_802410B8_C6F3E8 +/* C6FFAC 80241C7C 0260302D */ daddu $a2, $s3, $zero +/* C6FFB0 80241C80 0809073D */ j .L80241CF4 +/* C6FFB4 80241C84 0000102D */ daddu $v0, $zero, $zero +/* C6FFB8 80241C88 0280202D */ daddu $a0, $s4, $zero +/* C6FFBC 80241C8C 0200282D */ daddu $a1, $s0, $zero +/* C6FFC0 80241C90 0C0904FF */ jal func_802413FC_C6F72C +/* C6FFC4 80241C94 0260302D */ daddu $a2, $s3, $zero +/* C6FFC8 80241C98 0280202D */ daddu $a0, $s4, $zero +/* C6FFCC 80241C9C 0200282D */ daddu $a1, $s0, $zero +/* C6FFD0 80241CA0 0C09051D */ jal func_80241474_C6F7A4 +/* C6FFD4 80241CA4 0260302D */ daddu $a2, $s3, $zero +/* C6FFD8 80241CA8 0809073D */ j .L80241CF4 +/* C6FFDC 80241CAC 0000102D */ daddu $v0, $zero, $zero +/* C6FFE0 80241CB0 0280202D */ daddu $a0, $s4, $zero +/* C6FFE4 80241CB4 0200282D */ daddu $a1, $s0, $zero +/* C6FFE8 80241CB8 0C090538 */ jal func_802414E0_C6F810 +/* C6FFEC 80241CBC 0260302D */ daddu $a2, $s3, $zero +/* C6FFF0 80241CC0 0809073D */ j .L80241CF4 +/* C6FFF4 80241CC4 0000102D */ daddu $v0, $zero, $zero +/* C6FFF8 80241CC8 0280202D */ daddu $a0, $s4, $zero +/* C6FFFC 80241CCC 0200282D */ daddu $a1, $s0, $zero +/* C70000 80241CD0 0C090585 */ jal func_80241614_C6F944 +/* C70004 80241CD4 0260302D */ daddu $a2, $s3, $zero +/* C70008 80241CD8 0809073D */ j .L80241CF4 +/* C7000C 80241CDC 0000102D */ daddu $v0, $zero, $zero +/* C70010 80241CE0 0280202D */ daddu $a0, $s4, $zero +/* C70014 80241CE4 0200282D */ daddu $a1, $s0, $zero +/* C70018 80241CE8 0C09059E */ jal func_80241678_C6F9A8 +/* C7001C 80241CEC 0260302D */ daddu $a2, $s3, $zero +.L80241CF0: +/* C70020 80241CF0 0000102D */ daddu $v0, $zero, $zero +.L80241CF4: +/* C70024 80241CF4 8FBF0048 */ lw $ra, 0x48($sp) +/* C70028 80241CF8 8FB50044 */ lw $s5, 0x44($sp) +/* C7002C 80241CFC 8FB40040 */ lw $s4, 0x40($sp) +/* C70030 80241D00 8FB3003C */ lw $s3, 0x3c($sp) +/* C70034 80241D04 8FB20038 */ lw $s2, 0x38($sp) +/* C70038 80241D08 8FB10034 */ lw $s1, 0x34($sp) +/* C7003C 80241D0C 8FB00030 */ lw $s0, 0x30($sp) +/* C70040 80241D10 03E00008 */ jr $ra +/* C70044 80241D14 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18.s deleted file mode 100644 index bcad9fbaaa..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D18 -/* C70048 80241D18 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C7004C 80241D1C AFB3001C */ sw $s3, 0x1c($sp) -/* C70050 80241D20 0080982D */ daddu $s3, $a0, $zero -/* C70054 80241D24 AFBF0020 */ sw $ra, 0x20($sp) -/* C70058 80241D28 AFB20018 */ sw $s2, 0x18($sp) -/* C7005C 80241D2C AFB10014 */ sw $s1, 0x14($sp) -/* C70060 80241D30 AFB00010 */ sw $s0, 0x10($sp) -/* C70064 80241D34 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C70068 80241D38 8E710148 */ lw $s1, 0x148($s3) -/* C7006C 80241D3C 86240008 */ lh $a0, 8($s1) -/* C70070 80241D40 0C00EABB */ jal get_npc_unsafe -/* C70074 80241D44 00A0802D */ daddu $s0, $a1, $zero -/* C70078 80241D48 8E040020 */ lw $a0, 0x20($s0) -/* C7007C 80241D4C 0040902D */ daddu $s2, $v0, $zero -/* C70080 80241D50 00041FC2 */ srl $v1, $a0, 0x1f -/* C70084 80241D54 00832021 */ addu $a0, $a0, $v1 -/* C70088 80241D58 00042043 */ sra $a0, $a0, 1 -/* C7008C 80241D5C 0C00A67F */ jal rand_int -/* C70090 80241D60 24840001 */ addiu $a0, $a0, 1 -/* C70094 80241D64 8E030020 */ lw $v1, 0x20($s0) -/* C70098 80241D68 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C7009C 80241D6C 000327C2 */ srl $a0, $v1, 0x1f -/* C700A0 80241D70 00641821 */ addu $v1, $v1, $a0 -/* C700A4 80241D74 00031843 */ sra $v1, $v1, 1 -/* C700A8 80241D78 00621821 */ addu $v1, $v1, $v0 -/* C700AC 80241D7C A643008E */ sh $v1, 0x8e($s2) -/* C700B0 80241D80 8E2200CC */ lw $v0, 0xcc($s1) -/* C700B4 80241D84 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C700B8 80241D88 8C42000C */ lw $v0, 0xc($v0) -/* C700BC 80241D8C AE420028 */ sw $v0, 0x28($s2) -/* C700C0 80241D90 C6000018 */ lwc1 $f0, 0x18($s0) -/* C700C4 80241D94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C700C8 80241D98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C700CC 80241D9C E6400018 */ swc1 $f0, 0x18($s2) -/* C700D0 80241DA0 8C460028 */ lw $a2, 0x28($v0) -/* C700D4 80241DA4 0C00A720 */ jal atan2 -/* C700D8 80241DA8 8C470030 */ lw $a3, 0x30($v0) -/* C700DC 80241DAC 46000506 */ mov.s $f20, $f0 -/* C700E0 80241DB0 C64C000C */ lwc1 $f12, 0xc($s2) -/* C700E4 80241DB4 0C00A70A */ jal get_clamped_angle_diff -/* C700E8 80241DB8 4600A386 */ mov.s $f14, $f20 -/* C700EC 80241DBC 46000086 */ mov.s $f2, $f0 -/* C700F0 80241DC0 8E02001C */ lw $v0, 0x1c($s0) -/* C700F4 80241DC4 46001005 */ abs.s $f0, $f2 -/* C700F8 80241DC8 44822000 */ mtc1 $v0, $f4 -/* C700FC 80241DCC 00000000 */ nop -/* C70100 80241DD0 46802120 */ cvt.s.w $f4, $f4 -/* C70104 80241DD4 4600203C */ c.lt.s $f4, $f0 -/* C70108 80241DD8 00000000 */ nop -/* C7010C 80241DDC 4500000D */ bc1f .L80241E14 -/* C70110 80241DE0 00000000 */ nop -/* C70114 80241DE4 44800000 */ mtc1 $zero, $f0 -/* C70118 80241DE8 C654000C */ lwc1 $f20, 0xc($s2) -/* C7011C 80241DEC 4600103C */ c.lt.s $f2, $f0 -/* C70120 80241DF0 00000000 */ nop -/* C70124 80241DF4 45000006 */ bc1f .L80241E10 -/* C70128 80241DF8 00021023 */ negu $v0, $v0 -/* C7012C 80241DFC 44820000 */ mtc1 $v0, $f0 -/* C70130 80241E00 00000000 */ nop -/* C70134 80241E04 46800020 */ cvt.s.w $f0, $f0 -/* C70138 80241E08 08090785 */ j .L80241E14 -/* C7013C 80241E0C 4600A500 */ add.s $f20, $f20, $f0 -.L80241E10: -/* C70140 80241E10 4604A500 */ add.s $f20, $f20, $f4 -.L80241E14: -/* C70144 80241E14 0C00A6C9 */ jal clamp_angle -/* C70148 80241E18 4600A306 */ mov.s $f12, $f20 -/* C7014C 80241E1C 2402000D */ addiu $v0, $zero, 0xd -/* C70150 80241E20 E640000C */ swc1 $f0, 0xc($s2) -/* C70154 80241E24 AE620070 */ sw $v0, 0x70($s3) -/* C70158 80241E28 8FBF0020 */ lw $ra, 0x20($sp) -/* C7015C 80241E2C 8FB3001C */ lw $s3, 0x1c($sp) -/* C70160 80241E30 8FB20018 */ lw $s2, 0x18($sp) -/* C70164 80241E34 8FB10014 */ lw $s1, 0x14($sp) -/* C70168 80241E38 8FB00010 */ lw $s0, 0x10($sp) -/* C7016C 80241E3C D7B40028 */ ldc1 $f20, 0x28($sp) -/* C70170 80241E40 03E00008 */ jr $ra -/* C70174 80241E44 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18_C70048.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18_C70048.s new file mode 100644 index 0000000000..0a390b9d27 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80241D18_C70048.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D18_C70048 +/* C70048 80241D18 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C7004C 80241D1C AFB3001C */ sw $s3, 0x1c($sp) +/* C70050 80241D20 0080982D */ daddu $s3, $a0, $zero +/* C70054 80241D24 AFBF0020 */ sw $ra, 0x20($sp) +/* C70058 80241D28 AFB20018 */ sw $s2, 0x18($sp) +/* C7005C 80241D2C AFB10014 */ sw $s1, 0x14($sp) +/* C70060 80241D30 AFB00010 */ sw $s0, 0x10($sp) +/* C70064 80241D34 F7B40028 */ sdc1 $f20, 0x28($sp) +/* C70068 80241D38 8E710148 */ lw $s1, 0x148($s3) +/* C7006C 80241D3C 86240008 */ lh $a0, 8($s1) +/* C70070 80241D40 0C00EABB */ jal get_npc_unsafe +/* C70074 80241D44 00A0802D */ daddu $s0, $a1, $zero +/* C70078 80241D48 8E040020 */ lw $a0, 0x20($s0) +/* C7007C 80241D4C 0040902D */ daddu $s2, $v0, $zero +/* C70080 80241D50 00041FC2 */ srl $v1, $a0, 0x1f +/* C70084 80241D54 00832021 */ addu $a0, $a0, $v1 +/* C70088 80241D58 00042043 */ sra $a0, $a0, 1 +/* C7008C 80241D5C 0C00A67F */ jal rand_int +/* C70090 80241D60 24840001 */ addiu $a0, $a0, 1 +/* C70094 80241D64 8E030020 */ lw $v1, 0x20($s0) +/* C70098 80241D68 C64C0038 */ lwc1 $f12, 0x38($s2) +/* C7009C 80241D6C 000327C2 */ srl $a0, $v1, 0x1f +/* C700A0 80241D70 00641821 */ addu $v1, $v1, $a0 +/* C700A4 80241D74 00031843 */ sra $v1, $v1, 1 +/* C700A8 80241D78 00621821 */ addu $v1, $v1, $v0 +/* C700AC 80241D7C A643008E */ sh $v1, 0x8e($s2) +/* C700B0 80241D80 8E2200CC */ lw $v0, 0xcc($s1) +/* C700B4 80241D84 C64E0040 */ lwc1 $f14, 0x40($s2) +/* C700B8 80241D88 8C42000C */ lw $v0, 0xc($v0) +/* C700BC 80241D8C AE420028 */ sw $v0, 0x28($s2) +/* C700C0 80241D90 C6000018 */ lwc1 $f0, 0x18($s0) +/* C700C4 80241D94 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C700C8 80241D98 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C700CC 80241D9C E6400018 */ swc1 $f0, 0x18($s2) +/* C700D0 80241DA0 8C460028 */ lw $a2, 0x28($v0) +/* C700D4 80241DA4 0C00A720 */ jal atan2 +/* C700D8 80241DA8 8C470030 */ lw $a3, 0x30($v0) +/* C700DC 80241DAC 46000506 */ mov.s $f20, $f0 +/* C700E0 80241DB0 C64C000C */ lwc1 $f12, 0xc($s2) +/* C700E4 80241DB4 0C00A70A */ jal get_clamped_angle_diff +/* C700E8 80241DB8 4600A386 */ mov.s $f14, $f20 +/* C700EC 80241DBC 46000086 */ mov.s $f2, $f0 +/* C700F0 80241DC0 8E02001C */ lw $v0, 0x1c($s0) +/* C700F4 80241DC4 46001005 */ abs.s $f0, $f2 +/* C700F8 80241DC8 44822000 */ mtc1 $v0, $f4 +/* C700FC 80241DCC 00000000 */ nop +/* C70100 80241DD0 46802120 */ cvt.s.w $f4, $f4 +/* C70104 80241DD4 4600203C */ c.lt.s $f4, $f0 +/* C70108 80241DD8 00000000 */ nop +/* C7010C 80241DDC 4500000D */ bc1f .L80241E14 +/* C70110 80241DE0 00000000 */ nop +/* C70114 80241DE4 44800000 */ mtc1 $zero, $f0 +/* C70118 80241DE8 C654000C */ lwc1 $f20, 0xc($s2) +/* C7011C 80241DEC 4600103C */ c.lt.s $f2, $f0 +/* C70120 80241DF0 00000000 */ nop +/* C70124 80241DF4 45000006 */ bc1f .L80241E10 +/* C70128 80241DF8 00021023 */ negu $v0, $v0 +/* C7012C 80241DFC 44820000 */ mtc1 $v0, $f0 +/* C70130 80241E00 00000000 */ nop +/* C70134 80241E04 46800020 */ cvt.s.w $f0, $f0 +/* C70138 80241E08 08090785 */ j .L80241E14 +/* C7013C 80241E0C 4600A500 */ add.s $f20, $f20, $f0 +.L80241E10: +/* C70140 80241E10 4604A500 */ add.s $f20, $f20, $f4 +.L80241E14: +/* C70144 80241E14 0C00A6C9 */ jal clamp_angle +/* C70148 80241E18 4600A306 */ mov.s $f12, $f20 +/* C7014C 80241E1C 2402000D */ addiu $v0, $zero, 0xd +/* C70150 80241E20 E640000C */ swc1 $f0, 0xc($s2) +/* C70154 80241E24 AE620070 */ sw $v0, 0x70($s3) +/* C70158 80241E28 8FBF0020 */ lw $ra, 0x20($sp) +/* C7015C 80241E2C 8FB3001C */ lw $s3, 0x1c($sp) +/* C70160 80241E30 8FB20018 */ lw $s2, 0x18($sp) +/* C70164 80241E34 8FB10014 */ lw $s1, 0x14($sp) +/* C70168 80241E38 8FB00010 */ lw $s0, 0x10($sp) +/* C7016C 80241E3C D7B40028 */ ldc1 $f20, 0x28($sp) +/* C70170 80241E40 03E00008 */ jr $ra +/* C70174 80241E44 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124.s deleted file mode 100644 index d3ee67b5c2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242124 -/* C70454 80242124 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C70458 80242128 AFB40040 */ sw $s4, 0x40($sp) -/* C7045C 8024212C 0080A02D */ daddu $s4, $a0, $zero -/* C70460 80242130 AFBF0048 */ sw $ra, 0x48($sp) -/* C70464 80242134 AFB50044 */ sw $s5, 0x44($sp) -/* C70468 80242138 AFB3003C */ sw $s3, 0x3c($sp) -/* C7046C 8024213C AFB20038 */ sw $s2, 0x38($sp) -/* C70470 80242140 AFB10034 */ sw $s1, 0x34($sp) -/* C70474 80242144 AFB00030 */ sw $s0, 0x30($sp) -/* C70478 80242148 8E920148 */ lw $s2, 0x148($s4) -/* C7047C 8024214C 86440008 */ lh $a0, 8($s2) -/* C70480 80242150 8E90000C */ lw $s0, 0xc($s4) -/* C70484 80242154 0C00EABB */ jal get_npc_unsafe -/* C70488 80242158 00A0882D */ daddu $s1, $a1, $zero -/* C7048C 8024215C 0280202D */ daddu $a0, $s4, $zero -/* C70490 80242160 8E050000 */ lw $a1, ($s0) -/* C70494 80242164 0C0B1EAF */ jal get_variable -/* C70498 80242168 0040A82D */ daddu $s5, $v0, $zero -/* C7049C 8024216C AFA00010 */ sw $zero, 0x10($sp) -/* C704A0 80242170 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704A4 80242174 8C630030 */ lw $v1, 0x30($v1) -/* C704A8 80242178 AFA30014 */ sw $v1, 0x14($sp) -/* C704AC 8024217C 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704B0 80242180 8C63001C */ lw $v1, 0x1c($v1) -/* C704B4 80242184 AFA30018 */ sw $v1, 0x18($sp) -/* C704B8 80242188 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704BC 8024218C 8C630024 */ lw $v1, 0x24($v1) -/* C704C0 80242190 AFA3001C */ sw $v1, 0x1c($sp) -/* C704C4 80242194 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704C8 80242198 8C630028 */ lw $v1, 0x28($v1) -/* C704CC 8024219C 27B30010 */ addiu $s3, $sp, 0x10 -/* C704D0 802421A0 AFA30020 */ sw $v1, 0x20($sp) -/* C704D4 802421A4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C704D8 802421A8 3C0142F0 */ lui $at, 0x42f0 -/* C704DC 802421AC 44810000 */ mtc1 $at, $f0 -/* C704E0 802421B0 8C63002C */ lw $v1, 0x2c($v1) -/* C704E4 802421B4 0040802D */ daddu $s0, $v0, $zero -/* C704E8 802421B8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C704EC 802421BC A7A0002C */ sh $zero, 0x2c($sp) -/* C704F0 802421C0 12200007 */ beqz $s1, .L802421E0 -/* C704F4 802421C4 AFA30024 */ sw $v1, 0x24($sp) -/* C704F8 802421C8 02A0202D */ daddu $a0, $s5, $zero -/* C704FC 802421CC 0240282D */ daddu $a1, $s2, $zero -/* C70500 802421D0 0280302D */ daddu $a2, $s4, $zero -/* C70504 802421D4 0C090682 */ jal func_80241A08 -/* C70508 802421D8 0200382D */ daddu $a3, $s0, $zero -/* C7050C 802421DC AE800070 */ sw $zero, 0x70($s4) -.L802421E0: -/* C70510 802421E0 2402FFFE */ addiu $v0, $zero, -2 -/* C70514 802421E4 A2A200AB */ sb $v0, 0xab($s5) -/* C70518 802421E8 8E4300B0 */ lw $v1, 0xb0($s2) -/* C7051C 802421EC 30620004 */ andi $v0, $v1, 4 -/* C70520 802421F0 10400007 */ beqz $v0, .L80242210 -/* C70524 802421F4 00000000 */ nop -/* C70528 802421F8 824200B4 */ lb $v0, 0xb4($s2) -/* C7052C 802421FC 1440003A */ bnez $v0, .L802422E8 -/* C70530 80242200 0000102D */ daddu $v0, $zero, $zero -/* C70534 80242204 2402FFFB */ addiu $v0, $zero, -5 -/* C70538 80242208 00621024 */ and $v0, $v1, $v0 -/* C7053C 8024220C AE4200B0 */ sw $v0, 0xb0($s2) -.L80242210: -/* C70540 80242210 8E830070 */ lw $v1, 0x70($s4) -/* C70544 80242214 2C620015 */ sltiu $v0, $v1, 0x15 -/* C70548 80242218 10400032 */ beqz $v0, .L802422E4 -/* C7054C 8024221C 00031080 */ sll $v0, $v1, 2 -/* C70550 80242220 3C018024 */ lui $at, 0x8024 -/* C70554 80242224 00220821 */ addu $at, $at, $v0 -/* C70558 80242228 8C2230F0 */ lw $v0, 0x30f0($at) -/* C7055C 8024222C 00400008 */ jr $v0 -/* C70560 80242230 00000000 */ nop -/* C70564 80242234 0280202D */ daddu $a0, $s4, $zero -/* C70568 80242238 0200282D */ daddu $a1, $s0, $zero -/* C7056C 8024223C 0C090208 */ jal func_80240820 -/* C70570 80242240 0260302D */ daddu $a2, $s3, $zero -/* C70574 80242244 0280202D */ daddu $a0, $s4, $zero -/* C70578 80242248 0200282D */ daddu $a1, $s0, $zero -/* C7057C 8024224C 0C090274 */ jal func_802409D0 -/* C70580 80242250 0260302D */ daddu $a2, $s3, $zero -/* C70584 80242254 080908BA */ j .L802422E8 -/* C70588 80242258 0000102D */ daddu $v0, $zero, $zero -/* C7058C 8024225C 0280202D */ daddu $a0, $s4, $zero -/* C70590 80242260 0200282D */ daddu $a1, $s0, $zero -/* C70594 80242264 0C0903FE */ jal func_80240FF8 -/* C70598 80242268 0260302D */ daddu $a2, $s3, $zero -/* C7059C 8024226C 0280202D */ daddu $a0, $s4, $zero -/* C705A0 80242270 0200282D */ daddu $a1, $s0, $zero -/* C705A4 80242274 0C09042E */ jal func_802410B8 -/* C705A8 80242278 0260302D */ daddu $a2, $s3, $zero -/* C705AC 8024227C 080908BA */ j .L802422E8 -/* C705B0 80242280 0000102D */ daddu $v0, $zero, $zero -/* C705B4 80242284 0280202D */ daddu $a0, $s4, $zero -/* C705B8 80242288 0200282D */ daddu $a1, $s0, $zero -/* C705BC 8024228C 0C0904FF */ jal func_802413FC -/* C705C0 80242290 0260302D */ daddu $a2, $s3, $zero -/* C705C4 80242294 0280202D */ daddu $a0, $s4, $zero -/* C705C8 80242298 0200282D */ daddu $a1, $s0, $zero -/* C705CC 8024229C 0C09051D */ jal func_80241474 -/* C705D0 802422A0 0260302D */ daddu $a2, $s3, $zero -/* C705D4 802422A4 080908BA */ j .L802422E8 -/* C705D8 802422A8 0000102D */ daddu $v0, $zero, $zero -/* C705DC 802422AC 0280202D */ daddu $a0, $s4, $zero -/* C705E0 802422B0 0200282D */ daddu $a1, $s0, $zero -/* C705E4 802422B4 0C090746 */ jal func_80241D18 -/* C705E8 802422B8 0260302D */ daddu $a2, $s3, $zero -/* C705EC 802422BC 0280202D */ daddu $a0, $s4, $zero -/* C705F0 802422C0 0200282D */ daddu $a1, $s0, $zero -/* C705F4 802422C4 0C090792 */ jal func_80241E48 -/* C705F8 802422C8 0260302D */ daddu $a2, $s3, $zero -/* C705FC 802422CC 080908BA */ j .L802422E8 -/* C70600 802422D0 0000102D */ daddu $v0, $zero, $zero -/* C70604 802422D4 0280202D */ daddu $a0, $s4, $zero -/* C70608 802422D8 0200282D */ daddu $a1, $s0, $zero -/* C7060C 802422DC 0C090832 */ jal func_802420C8 -/* C70610 802422E0 0260302D */ daddu $a2, $s3, $zero -.L802422E4: -/* C70614 802422E4 0000102D */ daddu $v0, $zero, $zero -.L802422E8: -/* C70618 802422E8 8FBF0048 */ lw $ra, 0x48($sp) -/* C7061C 802422EC 8FB50044 */ lw $s5, 0x44($sp) -/* C70620 802422F0 8FB40040 */ lw $s4, 0x40($sp) -/* C70624 802422F4 8FB3003C */ lw $s3, 0x3c($sp) -/* C70628 802422F8 8FB20038 */ lw $s2, 0x38($sp) -/* C7062C 802422FC 8FB10034 */ lw $s1, 0x34($sp) -/* C70630 80242300 8FB00030 */ lw $s0, 0x30($sp) -/* C70634 80242304 03E00008 */ jr $ra -/* C70638 80242308 27BD0050 */ addiu $sp, $sp, 0x50 -/* C7063C 8024230C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s new file mode 100644 index 0000000000..3a735c8b1d --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_07/C6EA50/func_80242124_C70454.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242124_C70454 +/* C70454 80242124 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C70458 80242128 AFB40040 */ sw $s4, 0x40($sp) +/* C7045C 8024212C 0080A02D */ daddu $s4, $a0, $zero +/* C70460 80242130 AFBF0048 */ sw $ra, 0x48($sp) +/* C70464 80242134 AFB50044 */ sw $s5, 0x44($sp) +/* C70468 80242138 AFB3003C */ sw $s3, 0x3c($sp) +/* C7046C 8024213C AFB20038 */ sw $s2, 0x38($sp) +/* C70470 80242140 AFB10034 */ sw $s1, 0x34($sp) +/* C70474 80242144 AFB00030 */ sw $s0, 0x30($sp) +/* C70478 80242148 8E920148 */ lw $s2, 0x148($s4) +/* C7047C 8024214C 86440008 */ lh $a0, 8($s2) +/* C70480 80242150 8E90000C */ lw $s0, 0xc($s4) +/* C70484 80242154 0C00EABB */ jal get_npc_unsafe +/* C70488 80242158 00A0882D */ daddu $s1, $a1, $zero +/* C7048C 8024215C 0280202D */ daddu $a0, $s4, $zero +/* C70490 80242160 8E050000 */ lw $a1, ($s0) +/* C70494 80242164 0C0B1EAF */ jal get_variable +/* C70498 80242168 0040A82D */ daddu $s5, $v0, $zero +/* C7049C 8024216C AFA00010 */ sw $zero, 0x10($sp) +/* C704A0 80242170 8E4300D0 */ lw $v1, 0xd0($s2) +/* C704A4 80242174 8C630030 */ lw $v1, 0x30($v1) +/* C704A8 80242178 AFA30014 */ sw $v1, 0x14($sp) +/* C704AC 8024217C 8E4300D0 */ lw $v1, 0xd0($s2) +/* C704B0 80242180 8C63001C */ lw $v1, 0x1c($v1) +/* C704B4 80242184 AFA30018 */ sw $v1, 0x18($sp) +/* C704B8 80242188 8E4300D0 */ lw $v1, 0xd0($s2) +/* C704BC 8024218C 8C630024 */ lw $v1, 0x24($v1) +/* C704C0 80242190 AFA3001C */ sw $v1, 0x1c($sp) +/* C704C4 80242194 8E4300D0 */ lw $v1, 0xd0($s2) +/* C704C8 80242198 8C630028 */ lw $v1, 0x28($v1) +/* C704CC 8024219C 27B30010 */ addiu $s3, $sp, 0x10 +/* C704D0 802421A0 AFA30020 */ sw $v1, 0x20($sp) +/* C704D4 802421A4 8E4300D0 */ lw $v1, 0xd0($s2) +/* C704D8 802421A8 3C0142F0 */ lui $at, 0x42f0 +/* C704DC 802421AC 44810000 */ mtc1 $at, $f0 +/* C704E0 802421B0 8C63002C */ lw $v1, 0x2c($v1) +/* C704E4 802421B4 0040802D */ daddu $s0, $v0, $zero +/* C704E8 802421B8 E7A00028 */ swc1 $f0, 0x28($sp) +/* C704EC 802421BC A7A0002C */ sh $zero, 0x2c($sp) +/* C704F0 802421C0 12200007 */ beqz $s1, .L802421E0 +/* C704F4 802421C4 AFA30024 */ sw $v1, 0x24($sp) +/* C704F8 802421C8 02A0202D */ daddu $a0, $s5, $zero +/* C704FC 802421CC 0240282D */ daddu $a1, $s2, $zero +/* C70500 802421D0 0280302D */ daddu $a2, $s4, $zero +/* C70504 802421D4 0C090682 */ jal func_80241A08_C6FD38 +/* C70508 802421D8 0200382D */ daddu $a3, $s0, $zero +/* C7050C 802421DC AE800070 */ sw $zero, 0x70($s4) +.L802421E0: +/* C70510 802421E0 2402FFFE */ addiu $v0, $zero, -2 +/* C70514 802421E4 A2A200AB */ sb $v0, 0xab($s5) +/* C70518 802421E8 8E4300B0 */ lw $v1, 0xb0($s2) +/* C7051C 802421EC 30620004 */ andi $v0, $v1, 4 +/* C70520 802421F0 10400007 */ beqz $v0, .L80242210 +/* C70524 802421F4 00000000 */ nop +/* C70528 802421F8 824200B4 */ lb $v0, 0xb4($s2) +/* C7052C 802421FC 1440003A */ bnez $v0, .L802422E8 +/* C70530 80242200 0000102D */ daddu $v0, $zero, $zero +/* C70534 80242204 2402FFFB */ addiu $v0, $zero, -5 +/* C70538 80242208 00621024 */ and $v0, $v1, $v0 +/* C7053C 8024220C AE4200B0 */ sw $v0, 0xb0($s2) +.L80242210: +/* C70540 80242210 8E830070 */ lw $v1, 0x70($s4) +/* C70544 80242214 2C620015 */ sltiu $v0, $v1, 0x15 +/* C70548 80242218 10400032 */ beqz $v0, .L802422E4 +/* C7054C 8024221C 00031080 */ sll $v0, $v1, 2 +/* C70550 80242220 3C018024 */ lui $at, 0x8024 +/* C70554 80242224 00220821 */ addu $at, $at, $v0 +/* C70558 80242228 8C2230F0 */ lw $v0, 0x30f0($at) +/* C7055C 8024222C 00400008 */ jr $v0 +/* C70560 80242230 00000000 */ nop +/* C70564 80242234 0280202D */ daddu $a0, $s4, $zero +/* C70568 80242238 0200282D */ daddu $a1, $s0, $zero +/* C7056C 8024223C 0C090208 */ jal func_80240820_C6EB50 +/* C70570 80242240 0260302D */ daddu $a2, $s3, $zero +/* C70574 80242244 0280202D */ daddu $a0, $s4, $zero +/* C70578 80242248 0200282D */ daddu $a1, $s0, $zero +/* C7057C 8024224C 0C090274 */ jal func_802409D0_C6ED00 +/* C70580 80242250 0260302D */ daddu $a2, $s3, $zero +/* C70584 80242254 080908BA */ j .L802422E8 +/* C70588 80242258 0000102D */ daddu $v0, $zero, $zero +/* C7058C 8024225C 0280202D */ daddu $a0, $s4, $zero +/* C70590 80242260 0200282D */ daddu $a1, $s0, $zero +/* C70594 80242264 0C0903FE */ jal func_80240FF8_C6F328 +/* C70598 80242268 0260302D */ daddu $a2, $s3, $zero +/* C7059C 8024226C 0280202D */ daddu $a0, $s4, $zero +/* C705A0 80242270 0200282D */ daddu $a1, $s0, $zero +/* C705A4 80242274 0C09042E */ jal func_802410B8_C6F3E8 +/* C705A8 80242278 0260302D */ daddu $a2, $s3, $zero +/* C705AC 8024227C 080908BA */ j .L802422E8 +/* C705B0 80242280 0000102D */ daddu $v0, $zero, $zero +/* C705B4 80242284 0280202D */ daddu $a0, $s4, $zero +/* C705B8 80242288 0200282D */ daddu $a1, $s0, $zero +/* C705BC 8024228C 0C0904FF */ jal func_802413FC_C6F72C +/* C705C0 80242290 0260302D */ daddu $a2, $s3, $zero +/* C705C4 80242294 0280202D */ daddu $a0, $s4, $zero +/* C705C8 80242298 0200282D */ daddu $a1, $s0, $zero +/* C705CC 8024229C 0C09051D */ jal func_80241474_C6F7A4 +/* C705D0 802422A0 0260302D */ daddu $a2, $s3, $zero +/* C705D4 802422A4 080908BA */ j .L802422E8 +/* C705D8 802422A8 0000102D */ daddu $v0, $zero, $zero +/* C705DC 802422AC 0280202D */ daddu $a0, $s4, $zero +/* C705E0 802422B0 0200282D */ daddu $a1, $s0, $zero +/* C705E4 802422B4 0C090746 */ jal func_80241D18_C70048 +/* C705E8 802422B8 0260302D */ daddu $a2, $s3, $zero +/* C705EC 802422BC 0280202D */ daddu $a0, $s4, $zero +/* C705F0 802422C0 0200282D */ daddu $a1, $s0, $zero +/* C705F4 802422C4 0C090792 */ jal func_80241E48_C70178 +/* C705F8 802422C8 0260302D */ daddu $a2, $s3, $zero +/* C705FC 802422CC 080908BA */ j .L802422E8 +/* C70600 802422D0 0000102D */ daddu $v0, $zero, $zero +/* C70604 802422D4 0280202D */ daddu $a0, $s4, $zero +/* C70608 802422D8 0200282D */ daddu $a1, $s0, $zero +/* C7060C 802422DC 0C090832 */ jal func_802420C8_C703F8 +/* C70610 802422E0 0260302D */ daddu $a2, $s3, $zero +.L802422E4: +/* C70614 802422E4 0000102D */ daddu $v0, $zero, $zero +.L802422E8: +/* C70618 802422E8 8FBF0048 */ lw $ra, 0x48($sp) +/* C7061C 802422EC 8FB50044 */ lw $s5, 0x44($sp) +/* C70620 802422F0 8FB40040 */ lw $s4, 0x40($sp) +/* C70624 802422F4 8FB3003C */ lw $s3, 0x3c($sp) +/* C70628 802422F8 8FB20038 */ lw $s2, 0x38($sp) +/* C7062C 802422FC 8FB10034 */ lw $s1, 0x34($sp) +/* C70630 80242300 8FB00030 */ lw $s0, 0x30($sp) +/* C70634 80242304 03E00008 */ jr $ra +/* C70638 80242308 27BD0050 */ addiu $sp, $sp, 0x50 +/* C7063C 8024230C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718.s deleted file mode 100644 index 434d3213c8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240718 -/* C71B98 80240718 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C71B9C 8024071C AFBF0014 */ sw $ra, 0x14($sp) -/* C71BA0 80240720 AFB00010 */ sw $s0, 0x10($sp) -/* C71BA4 80240724 8C82000C */ lw $v0, 0xc($a0) -/* C71BA8 80240728 0C0B1EAF */ jal get_variable -/* C71BAC 8024072C 8C450000 */ lw $a1, ($v0) -/* C71BB0 80240730 0040802D */ daddu $s0, $v0, $zero -/* C71BB4 80240734 12000006 */ beqz $s0, .L80240750 -/* C71BB8 80240738 00000000 */ nop -/* C71BBC 8024073C 0C046ED4 */ jal enable_world_fog -/* C71BC0 80240740 00000000 */ nop -/* C71BC4 80240744 240403E3 */ addiu $a0, $zero, 0x3e3 -/* C71BC8 80240748 080901D7 */ j .L8024075C -/* C71BCC 8024074C 00902023 */ subu $a0, $a0, $s0 -.L80240750: -/* C71BD0 80240750 0C046ED9 */ jal disable_world_fog -/* C71BD4 80240754 00000000 */ nop -/* C71BD8 80240758 240403E3 */ addiu $a0, $zero, 0x3e3 -.L8024075C: -/* C71BDC 8024075C 0C046EDD */ jal set_world_fog_dist -/* C71BE0 80240760 240503E8 */ addiu $a1, $zero, 0x3e8 -/* C71BE4 80240764 0000202D */ daddu $a0, $zero, $zero -/* C71BE8 80240768 0080282D */ daddu $a1, $a0, $zero -/* C71BEC 8024076C 0080302D */ daddu $a2, $a0, $zero -/* C71BF0 80240770 0C046EE2 */ jal set_world_fog_color -/* C71BF4 80240774 0080382D */ daddu $a3, $a0, $zero -/* C71BF8 80240778 8FBF0014 */ lw $ra, 0x14($sp) -/* C71BFC 8024077C 8FB00010 */ lw $s0, 0x10($sp) -/* C71C00 80240780 24020002 */ addiu $v0, $zero, 2 -/* C71C04 80240784 03E00008 */ jr $ra -/* C71C08 80240788 27BD0018 */ addiu $sp, $sp, 0x18 -/* C71C0C 8024078C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718_C71B98.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718_C71B98.s new file mode 100644 index 0000000000..11205600f6 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71480/func_80240718_C71B98.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240718_C71B98 +/* C71B98 80240718 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C71B9C 8024071C AFBF0014 */ sw $ra, 0x14($sp) +/* C71BA0 80240720 AFB00010 */ sw $s0, 0x10($sp) +/* C71BA4 80240724 8C82000C */ lw $v0, 0xc($a0) +/* C71BA8 80240728 0C0B1EAF */ jal get_variable +/* C71BAC 8024072C 8C450000 */ lw $a1, ($v0) +/* C71BB0 80240730 0040802D */ daddu $s0, $v0, $zero +/* C71BB4 80240734 12000006 */ beqz $s0, .L80240750 +/* C71BB8 80240738 00000000 */ nop +/* C71BBC 8024073C 0C046ED4 */ jal enable_world_fog +/* C71BC0 80240740 00000000 */ nop +/* C71BC4 80240744 240403E3 */ addiu $a0, $zero, 0x3e3 +/* C71BC8 80240748 080901D7 */ j .L8024075C +/* C71BCC 8024074C 00902023 */ subu $a0, $a0, $s0 +.L80240750: +/* C71BD0 80240750 0C046ED9 */ jal disable_world_fog +/* C71BD4 80240754 00000000 */ nop +/* C71BD8 80240758 240403E3 */ addiu $a0, $zero, 0x3e3 +.L8024075C: +/* C71BDC 8024075C 0C046EDD */ jal set_world_fog_dist +/* C71BE0 80240760 240503E8 */ addiu $a1, $zero, 0x3e8 +/* C71BE4 80240764 0000202D */ daddu $a0, $zero, $zero +/* C71BE8 80240768 0080282D */ daddu $a1, $a0, $zero +/* C71BEC 8024076C 0080302D */ daddu $a2, $a0, $zero +/* C71BF0 80240770 0C046EE2 */ jal set_world_fog_color +/* C71BF4 80240774 0080382D */ daddu $a3, $a0, $zero +/* C71BF8 80240778 8FBF0014 */ lw $ra, 0x14($sp) +/* C71BFC 8024077C 8FB00010 */ lw $s0, 0x10($sp) +/* C71C00 80240780 24020002 */ addiu $v0, $zero, 2 +/* C71C04 80240784 03E00008 */ jr $ra +/* C71C08 80240788 27BD0018 */ addiu $sp, $sp, 0x18 +/* C71C0C 8024078C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228.s deleted file mode 100644 index 10dcfa1476..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241228 -/* C726A8 80241228 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C726AC 8024122C AFB3001C */ sw $s3, 0x1c($sp) -/* C726B0 80241230 0080982D */ daddu $s3, $a0, $zero -/* C726B4 80241234 AFBF0020 */ sw $ra, 0x20($sp) -/* C726B8 80241238 AFB20018 */ sw $s2, 0x18($sp) -/* C726BC 8024123C AFB10014 */ sw $s1, 0x14($sp) -/* C726C0 80241240 AFB00010 */ sw $s0, 0x10($sp) -/* C726C4 80241244 8E720148 */ lw $s2, 0x148($s3) -/* C726C8 80241248 86440008 */ lh $a0, 8($s2) -/* C726CC 8024124C 0C00EABB */ jal get_npc_unsafe -/* C726D0 80241250 00A0882D */ daddu $s1, $a1, $zero -/* C726D4 80241254 8E240008 */ lw $a0, 8($s1) -/* C726D8 80241258 0040802D */ daddu $s0, $v0, $zero -/* C726DC 8024125C 00041FC2 */ srl $v1, $a0, 0x1f -/* C726E0 80241260 00832021 */ addu $a0, $a0, $v1 -/* C726E4 80241264 00042043 */ sra $a0, $a0, 1 -/* C726E8 80241268 0C00A67F */ jal rand_int -/* C726EC 8024126C 24840001 */ addiu $a0, $a0, 1 -/* C726F0 80241270 8E230008 */ lw $v1, 8($s1) -/* C726F4 80241274 240400B4 */ addiu $a0, $zero, 0xb4 -/* C726F8 80241278 00032FC2 */ srl $a1, $v1, 0x1f -/* C726FC 8024127C 00651821 */ addu $v1, $v1, $a1 -/* C72700 80241280 00031843 */ sra $v1, $v1, 1 -/* C72704 80241284 00621821 */ addu $v1, $v1, $v0 -/* C72708 80241288 0C00A67F */ jal rand_int -/* C7270C 8024128C A603008E */ sh $v1, 0x8e($s0) -/* C72710 80241290 C60C000C */ lwc1 $f12, 0xc($s0) -/* C72714 80241294 44820000 */ mtc1 $v0, $f0 -/* C72718 80241298 00000000 */ nop -/* C7271C 8024129C 46800020 */ cvt.s.w $f0, $f0 -/* C72720 802412A0 46006300 */ add.s $f12, $f12, $f0 -/* C72724 802412A4 3C0142B4 */ lui $at, 0x42b4 -/* C72728 802412A8 44810000 */ mtc1 $at, $f0 -/* C7272C 802412AC 0C00A6C9 */ jal clamp_angle -/* C72730 802412B0 46006301 */ sub.s $f12, $f12, $f0 -/* C72734 802412B4 E600000C */ swc1 $f0, 0xc($s0) -/* C72738 802412B8 8E4200CC */ lw $v0, 0xcc($s2) -/* C7273C 802412BC 8C420000 */ lw $v0, ($v0) -/* C72740 802412C0 AE020028 */ sw $v0, 0x28($s0) -/* C72744 802412C4 24020003 */ addiu $v0, $zero, 3 -/* C72748 802412C8 AE620070 */ sw $v0, 0x70($s3) -/* C7274C 802412CC 8FBF0020 */ lw $ra, 0x20($sp) -/* C72750 802412D0 8FB3001C */ lw $s3, 0x1c($sp) -/* C72754 802412D4 8FB20018 */ lw $s2, 0x18($sp) -/* C72758 802412D8 8FB10014 */ lw $s1, 0x14($sp) -/* C7275C 802412DC 8FB00010 */ lw $s0, 0x10($sp) -/* C72760 802412E0 03E00008 */ jr $ra -/* C72764 802412E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s new file mode 100644 index 0000000000..3710c00487 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241228_C726A8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241228_C726A8 +/* C726A8 80241228 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C726AC 8024122C AFB3001C */ sw $s3, 0x1c($sp) +/* C726B0 80241230 0080982D */ daddu $s3, $a0, $zero +/* C726B4 80241234 AFBF0020 */ sw $ra, 0x20($sp) +/* C726B8 80241238 AFB20018 */ sw $s2, 0x18($sp) +/* C726BC 8024123C AFB10014 */ sw $s1, 0x14($sp) +/* C726C0 80241240 AFB00010 */ sw $s0, 0x10($sp) +/* C726C4 80241244 8E720148 */ lw $s2, 0x148($s3) +/* C726C8 80241248 86440008 */ lh $a0, 8($s2) +/* C726CC 8024124C 0C00EABB */ jal get_npc_unsafe +/* C726D0 80241250 00A0882D */ daddu $s1, $a1, $zero +/* C726D4 80241254 8E240008 */ lw $a0, 8($s1) +/* C726D8 80241258 0040802D */ daddu $s0, $v0, $zero +/* C726DC 8024125C 00041FC2 */ srl $v1, $a0, 0x1f +/* C726E0 80241260 00832021 */ addu $a0, $a0, $v1 +/* C726E4 80241264 00042043 */ sra $a0, $a0, 1 +/* C726E8 80241268 0C00A67F */ jal rand_int +/* C726EC 8024126C 24840001 */ addiu $a0, $a0, 1 +/* C726F0 80241270 8E230008 */ lw $v1, 8($s1) +/* C726F4 80241274 240400B4 */ addiu $a0, $zero, 0xb4 +/* C726F8 80241278 00032FC2 */ srl $a1, $v1, 0x1f +/* C726FC 8024127C 00651821 */ addu $v1, $v1, $a1 +/* C72700 80241280 00031843 */ sra $v1, $v1, 1 +/* C72704 80241284 00621821 */ addu $v1, $v1, $v0 +/* C72708 80241288 0C00A67F */ jal rand_int +/* C7270C 8024128C A603008E */ sh $v1, 0x8e($s0) +/* C72710 80241290 C60C000C */ lwc1 $f12, 0xc($s0) +/* C72714 80241294 44820000 */ mtc1 $v0, $f0 +/* C72718 80241298 00000000 */ nop +/* C7271C 8024129C 46800020 */ cvt.s.w $f0, $f0 +/* C72720 802412A0 46006300 */ add.s $f12, $f12, $f0 +/* C72724 802412A4 3C0142B4 */ lui $at, 0x42b4 +/* C72728 802412A8 44810000 */ mtc1 $at, $f0 +/* C7272C 802412AC 0C00A6C9 */ jal clamp_angle +/* C72730 802412B0 46006301 */ sub.s $f12, $f12, $f0 +/* C72734 802412B4 E600000C */ swc1 $f0, 0xc($s0) +/* C72738 802412B8 8E4200CC */ lw $v0, 0xcc($s2) +/* C7273C 802412BC 8C420000 */ lw $v0, ($v0) +/* C72740 802412C0 AE020028 */ sw $v0, 0x28($s0) +/* C72744 802412C4 24020003 */ addiu $v0, $zero, 3 +/* C72748 802412C8 AE620070 */ sw $v0, 0x70($s3) +/* C7274C 802412CC 8FBF0020 */ lw $ra, 0x20($sp) +/* C72750 802412D0 8FB3001C */ lw $s3, 0x1c($sp) +/* C72754 802412D4 8FB20018 */ lw $s2, 0x18($sp) +/* C72758 802412D8 8FB10014 */ lw $s1, 0x14($sp) +/* C7275C 802412DC 8FB00010 */ lw $s0, 0x10($sp) +/* C72760 802412E0 03E00008 */ jr $ra +/* C72764 802412E4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4.s deleted file mode 100644 index ceed19942a..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416A4 -/* C72B24 802416A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C72B28 802416A8 AFB00010 */ sw $s0, 0x10($sp) -/* C72B2C 802416AC 0080802D */ daddu $s0, $a0, $zero -/* C72B30 802416B0 AFBF0014 */ sw $ra, 0x14($sp) -/* C72B34 802416B4 8E020148 */ lw $v0, 0x148($s0) -/* C72B38 802416B8 0C00EABB */ jal get_npc_unsafe -/* C72B3C 802416BC 84440008 */ lh $a0, 8($v0) -/* C72B40 802416C0 9443008E */ lhu $v1, 0x8e($v0) -/* C72B44 802416C4 C440003C */ lwc1 $f0, 0x3c($v0) -/* C72B48 802416C8 24640001 */ addiu $a0, $v1, 1 -/* C72B4C 802416CC 00031C00 */ sll $v1, $v1, 0x10 -/* C72B50 802416D0 00031B83 */ sra $v1, $v1, 0xe -/* C72B54 802416D4 A444008E */ sh $a0, 0x8e($v0) -/* C72B58 802416D8 3C018024 */ lui $at, 0x8024 -/* C72B5C 802416DC 00230821 */ addu $at, $at, $v1 -/* C72B60 802416E0 C4224DA0 */ lwc1 $f2, 0x4da0($at) -/* C72B64 802416E4 8443008E */ lh $v1, 0x8e($v0) -/* C72B68 802416E8 46020000 */ add.s $f0, $f0, $f2 -/* C72B6C 802416EC 28630005 */ slti $v1, $v1, 5 -/* C72B70 802416F0 14600003 */ bnez $v1, .L80241700 -/* C72B74 802416F4 E440003C */ swc1 $f0, 0x3c($v0) -/* C72B78 802416F8 2402000C */ addiu $v0, $zero, 0xc -/* C72B7C 802416FC AE020070 */ sw $v0, 0x70($s0) -.L80241700: -/* C72B80 80241700 8FBF0014 */ lw $ra, 0x14($sp) -/* C72B84 80241704 8FB00010 */ lw $s0, 0x10($sp) -/* C72B88 80241708 03E00008 */ jr $ra -/* C72B8C 8024170C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s new file mode 100644 index 0000000000..e6aeadc061 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802416A4_C72B24.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416A4_C72B24 +/* C72B24 802416A4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C72B28 802416A8 AFB00010 */ sw $s0, 0x10($sp) +/* C72B2C 802416AC 0080802D */ daddu $s0, $a0, $zero +/* C72B30 802416B0 AFBF0014 */ sw $ra, 0x14($sp) +/* C72B34 802416B4 8E020148 */ lw $v0, 0x148($s0) +/* C72B38 802416B8 0C00EABB */ jal get_npc_unsafe +/* C72B3C 802416BC 84440008 */ lh $a0, 8($v0) +/* C72B40 802416C0 9443008E */ lhu $v1, 0x8e($v0) +/* C72B44 802416C4 C440003C */ lwc1 $f0, 0x3c($v0) +/* C72B48 802416C8 24640001 */ addiu $a0, $v1, 1 +/* C72B4C 802416CC 00031C00 */ sll $v1, $v1, 0x10 +/* C72B50 802416D0 00031B83 */ sra $v1, $v1, 0xe +/* C72B54 802416D4 A444008E */ sh $a0, 0x8e($v0) +/* C72B58 802416D8 3C018024 */ lui $at, 0x8024 +/* C72B5C 802416DC 00230821 */ addu $at, $at, $v1 +/* C72B60 802416E0 C4224DA0 */ lwc1 $f2, 0x4da0($at) +/* C72B64 802416E4 8443008E */ lh $v1, 0x8e($v0) +/* C72B68 802416E8 46020000 */ add.s $f0, $f0, $f2 +/* C72B6C 802416EC 28630005 */ slti $v1, $v1, 5 +/* C72B70 802416F0 14600003 */ bnez $v1, .L80241700 +/* C72B74 802416F4 E440003C */ swc1 $f0, 0x3c($v0) +/* C72B78 802416F8 2402000C */ addiu $v0, $zero, 0xc +/* C72B7C 802416FC AE020070 */ sw $v0, 0x70($s0) +.L80241700: +/* C72B80 80241700 8FBF0014 */ lw $ra, 0x14($sp) +/* C72B84 80241704 8FB00010 */ lw $s0, 0x10($sp) +/* C72B88 80241708 03E00008 */ jr $ra +/* C72B8C 8024170C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710.s deleted file mode 100644 index f7e444f3e4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241710 -/* C72B90 80241710 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C72B94 80241714 AFB3001C */ sw $s3, 0x1c($sp) -/* C72B98 80241718 0080982D */ daddu $s3, $a0, $zero -/* C72B9C 8024171C AFBF0020 */ sw $ra, 0x20($sp) -/* C72BA0 80241720 AFB20018 */ sw $s2, 0x18($sp) -/* C72BA4 80241724 AFB10014 */ sw $s1, 0x14($sp) -/* C72BA8 80241728 AFB00010 */ sw $s0, 0x10($sp) -/* C72BAC 8024172C 8E720148 */ lw $s2, 0x148($s3) -/* C72BB0 80241730 86440008 */ lh $a0, 8($s2) -/* C72BB4 80241734 0C00EABB */ jal get_npc_unsafe -/* C72BB8 80241738 00A0802D */ daddu $s0, $a1, $zero -/* C72BBC 8024173C 0040882D */ daddu $s1, $v0, $zero -/* C72BC0 80241740 C6420080 */ lwc1 $f2, 0x80($s2) -/* C72BC4 80241744 468010A0 */ cvt.s.w $f2, $f2 -/* C72BC8 80241748 460010A1 */ cvt.d.s $f2, $f2 -/* C72BCC 8024174C C6400084 */ lwc1 $f0, 0x84($s2) -/* C72BD0 80241750 46800020 */ cvt.s.w $f0, $f0 -/* C72BD4 80241754 46000021 */ cvt.d.s $f0, $f0 -/* C72BD8 80241758 3C014059 */ lui $at, 0x4059 -/* C72BDC 8024175C 44812800 */ mtc1 $at, $f5 -/* C72BE0 80241760 44802000 */ mtc1 $zero, $f4 -/* C72BE4 80241764 8E4200CC */ lw $v0, 0xcc($s2) -/* C72BE8 80241768 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C72BEC 8024176C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C72BF0 80241770 46241083 */ div.d $f2, $f2, $f4 -/* C72BF4 80241774 462010A0 */ cvt.s.d $f2, $f2 -/* C72BF8 80241778 46240003 */ div.d $f0, $f0, $f4 -/* C72BFC 8024177C 8C420020 */ lw $v0, 0x20($v0) -/* C72C00 80241780 46200020 */ cvt.s.d $f0, $f0 -/* C72C04 80241784 E622001C */ swc1 $f2, 0x1c($s1) -/* C72C08 80241788 E6200014 */ swc1 $f0, 0x14($s1) -/* C72C0C 8024178C AE220028 */ sw $v0, 0x28($s1) -/* C72C10 80241790 C6000018 */ lwc1 $f0, 0x18($s0) -/* C72C14 80241794 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C72C18 80241798 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C72C1C 8024179C E6200018 */ swc1 $f0, 0x18($s1) -/* C72C20 802417A0 8C460028 */ lw $a2, 0x28($v0) -/* C72C24 802417A4 0C00A720 */ jal atan2 -/* C72C28 802417A8 8C470030 */ lw $a3, 0x30($v0) -/* C72C2C 802417AC E620000C */ swc1 $f0, 0xc($s1) -/* C72C30 802417B0 8E420018 */ lw $v0, 0x18($s2) -/* C72C34 802417B4 AE400074 */ sw $zero, 0x74($s2) -/* C72C38 802417B8 9442002A */ lhu $v0, 0x2a($v0) -/* C72C3C 802417BC 30420002 */ andi $v0, $v0, 2 -/* C72C40 802417C0 10400005 */ beqz $v0, .L802417D8 -/* C72C44 802417C4 24020003 */ addiu $v0, $zero, 3 -/* C72C48 802417C8 A622008E */ sh $v0, 0x8e($s1) -/* C72C4C 802417CC 2402000D */ addiu $v0, $zero, 0xd -/* C72C50 802417D0 0809060A */ j .L80241828 -/* C72C54 802417D4 AE620070 */ sw $v0, 0x70($s3) -.L802417D8: -/* C72C58 802417D8 24030001 */ addiu $v1, $zero, 1 -/* C72C5C 802417DC 2402000E */ addiu $v0, $zero, 0xe -/* C72C60 802417E0 A623008E */ sh $v1, 0x8e($s1) -/* C72C64 802417E4 AE620070 */ sw $v0, 0x70($s3) -/* C72C68 802417E8 C6200038 */ lwc1 $f0, 0x38($s1) -/* C72C6C 802417EC 4600018D */ trunc.w.s $f6, $f0 -/* C72C70 802417F0 44023000 */ mfc1 $v0, $f6 -/* C72C74 802417F4 00000000 */ nop -/* C72C78 802417F8 A6420010 */ sh $v0, 0x10($s2) -/* C72C7C 802417FC C620003C */ lwc1 $f0, 0x3c($s1) -/* C72C80 80241800 4600018D */ trunc.w.s $f6, $f0 -/* C72C84 80241804 44023000 */ mfc1 $v0, $f6 -/* C72C88 80241808 00000000 */ nop -/* C72C8C 8024180C A6420012 */ sh $v0, 0x12($s2) -/* C72C90 80241810 C6200040 */ lwc1 $f0, 0x40($s1) -/* C72C94 80241814 A2430007 */ sb $v1, 7($s2) -/* C72C98 80241818 4600018D */ trunc.w.s $f6, $f0 -/* C72C9C 8024181C 44023000 */ mfc1 $v0, $f6 -/* C72CA0 80241820 00000000 */ nop -/* C72CA4 80241824 A6420014 */ sh $v0, 0x14($s2) -.L80241828: -/* C72CA8 80241828 8FBF0020 */ lw $ra, 0x20($sp) -/* C72CAC 8024182C 8FB3001C */ lw $s3, 0x1c($sp) -/* C72CB0 80241830 8FB20018 */ lw $s2, 0x18($sp) -/* C72CB4 80241834 8FB10014 */ lw $s1, 0x14($sp) -/* C72CB8 80241838 8FB00010 */ lw $s0, 0x10($sp) -/* C72CBC 8024183C 03E00008 */ jr $ra -/* C72CC0 80241840 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s new file mode 100644 index 0000000000..5cf597ad1f --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241710_C72B90.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241710_C72B90 +/* C72B90 80241710 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C72B94 80241714 AFB3001C */ sw $s3, 0x1c($sp) +/* C72B98 80241718 0080982D */ daddu $s3, $a0, $zero +/* C72B9C 8024171C AFBF0020 */ sw $ra, 0x20($sp) +/* C72BA0 80241720 AFB20018 */ sw $s2, 0x18($sp) +/* C72BA4 80241724 AFB10014 */ sw $s1, 0x14($sp) +/* C72BA8 80241728 AFB00010 */ sw $s0, 0x10($sp) +/* C72BAC 8024172C 8E720148 */ lw $s2, 0x148($s3) +/* C72BB0 80241730 86440008 */ lh $a0, 8($s2) +/* C72BB4 80241734 0C00EABB */ jal get_npc_unsafe +/* C72BB8 80241738 00A0802D */ daddu $s0, $a1, $zero +/* C72BBC 8024173C 0040882D */ daddu $s1, $v0, $zero +/* C72BC0 80241740 C6420080 */ lwc1 $f2, 0x80($s2) +/* C72BC4 80241744 468010A0 */ cvt.s.w $f2, $f2 +/* C72BC8 80241748 460010A1 */ cvt.d.s $f2, $f2 +/* C72BCC 8024174C C6400084 */ lwc1 $f0, 0x84($s2) +/* C72BD0 80241750 46800020 */ cvt.s.w $f0, $f0 +/* C72BD4 80241754 46000021 */ cvt.d.s $f0, $f0 +/* C72BD8 80241758 3C014059 */ lui $at, 0x4059 +/* C72BDC 8024175C 44812800 */ mtc1 $at, $f5 +/* C72BE0 80241760 44802000 */ mtc1 $zero, $f4 +/* C72BE4 80241764 8E4200CC */ lw $v0, 0xcc($s2) +/* C72BE8 80241768 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C72BEC 8024176C C62E0040 */ lwc1 $f14, 0x40($s1) +/* C72BF0 80241770 46241083 */ div.d $f2, $f2, $f4 +/* C72BF4 80241774 462010A0 */ cvt.s.d $f2, $f2 +/* C72BF8 80241778 46240003 */ div.d $f0, $f0, $f4 +/* C72BFC 8024177C 8C420020 */ lw $v0, 0x20($v0) +/* C72C00 80241780 46200020 */ cvt.s.d $f0, $f0 +/* C72C04 80241784 E622001C */ swc1 $f2, 0x1c($s1) +/* C72C08 80241788 E6200014 */ swc1 $f0, 0x14($s1) +/* C72C0C 8024178C AE220028 */ sw $v0, 0x28($s1) +/* C72C10 80241790 C6000018 */ lwc1 $f0, 0x18($s0) +/* C72C14 80241794 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C72C18 80241798 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C72C1C 8024179C E6200018 */ swc1 $f0, 0x18($s1) +/* C72C20 802417A0 8C460028 */ lw $a2, 0x28($v0) +/* C72C24 802417A4 0C00A720 */ jal atan2 +/* C72C28 802417A8 8C470030 */ lw $a3, 0x30($v0) +/* C72C2C 802417AC E620000C */ swc1 $f0, 0xc($s1) +/* C72C30 802417B0 8E420018 */ lw $v0, 0x18($s2) +/* C72C34 802417B4 AE400074 */ sw $zero, 0x74($s2) +/* C72C38 802417B8 9442002A */ lhu $v0, 0x2a($v0) +/* C72C3C 802417BC 30420002 */ andi $v0, $v0, 2 +/* C72C40 802417C0 10400005 */ beqz $v0, .L802417D8 +/* C72C44 802417C4 24020003 */ addiu $v0, $zero, 3 +/* C72C48 802417C8 A622008E */ sh $v0, 0x8e($s1) +/* C72C4C 802417CC 2402000D */ addiu $v0, $zero, 0xd +/* C72C50 802417D0 0809060A */ j .L80241828 +/* C72C54 802417D4 AE620070 */ sw $v0, 0x70($s3) +.L802417D8: +/* C72C58 802417D8 24030001 */ addiu $v1, $zero, 1 +/* C72C5C 802417DC 2402000E */ addiu $v0, $zero, 0xe +/* C72C60 802417E0 A623008E */ sh $v1, 0x8e($s1) +/* C72C64 802417E4 AE620070 */ sw $v0, 0x70($s3) +/* C72C68 802417E8 C6200038 */ lwc1 $f0, 0x38($s1) +/* C72C6C 802417EC 4600018D */ trunc.w.s $f6, $f0 +/* C72C70 802417F0 44023000 */ mfc1 $v0, $f6 +/* C72C74 802417F4 00000000 */ nop +/* C72C78 802417F8 A6420010 */ sh $v0, 0x10($s2) +/* C72C7C 802417FC C620003C */ lwc1 $f0, 0x3c($s1) +/* C72C80 80241800 4600018D */ trunc.w.s $f6, $f0 +/* C72C84 80241804 44023000 */ mfc1 $v0, $f6 +/* C72C88 80241808 00000000 */ nop +/* C72C8C 8024180C A6420012 */ sh $v0, 0x12($s2) +/* C72C90 80241810 C6200040 */ lwc1 $f0, 0x40($s1) +/* C72C94 80241814 A2430007 */ sb $v1, 7($s2) +/* C72C98 80241818 4600018D */ trunc.w.s $f6, $f0 +/* C72C9C 8024181C 44023000 */ mfc1 $v0, $f6 +/* C72CA0 80241820 00000000 */ nop +/* C72CA4 80241824 A6420014 */ sh $v0, 0x14($s2) +.L80241828: +/* C72CA8 80241828 8FBF0020 */ lw $ra, 0x20($sp) +/* C72CAC 8024182C 8FB3001C */ lw $s3, 0x1c($sp) +/* C72CB0 80241830 8FB20018 */ lw $s2, 0x18($sp) +/* C72CB4 80241834 8FB10014 */ lw $s1, 0x14($sp) +/* C72CB8 80241838 8FB00010 */ lw $s0, 0x10($sp) +/* C72CBC 8024183C 03E00008 */ jr $ra +/* C72CC0 80241840 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844.s deleted file mode 100644 index 2eebdcbb73..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241844 -/* C72CC4 80241844 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C72CC8 80241848 AFB00010 */ sw $s0, 0x10($sp) -/* C72CCC 8024184C 0080802D */ daddu $s0, $a0, $zero -/* C72CD0 80241850 AFBF0014 */ sw $ra, 0x14($sp) -/* C72CD4 80241854 8E020148 */ lw $v0, 0x148($s0) -/* C72CD8 80241858 0C00EABB */ jal get_npc_unsafe -/* C72CDC 8024185C 84440008 */ lh $a0, 8($v0) -/* C72CE0 80241860 0040202D */ daddu $a0, $v0, $zero -/* C72CE4 80241864 8482008E */ lh $v0, 0x8e($a0) -/* C72CE8 80241868 9483008E */ lhu $v1, 0x8e($a0) -/* C72CEC 8024186C 18400005 */ blez $v0, .L80241884 -/* C72CF0 80241870 2462FFFF */ addiu $v0, $v1, -1 -/* C72CF4 80241874 A482008E */ sh $v0, 0x8e($a0) -/* C72CF8 80241878 00021400 */ sll $v0, $v0, 0x10 -/* C72CFC 8024187C 1C400006 */ bgtz $v0, .L80241898 -/* C72D00 80241880 00000000 */ nop -.L80241884: -/* C72D04 80241884 8482008C */ lh $v0, 0x8c($a0) -/* C72D08 80241888 14400003 */ bnez $v0, .L80241898 -/* C72D0C 8024188C 2402000E */ addiu $v0, $zero, 0xe -/* C72D10 80241890 A480008E */ sh $zero, 0x8e($a0) -/* C72D14 80241894 AE020070 */ sw $v0, 0x70($s0) -.L80241898: -/* C72D18 80241898 8FBF0014 */ lw $ra, 0x14($sp) -/* C72D1C 8024189C 8FB00010 */ lw $s0, 0x10($sp) -/* C72D20 802418A0 03E00008 */ jr $ra -/* C72D24 802418A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s new file mode 100644 index 0000000000..3846362187 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241844_C72CC4.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241844_C72CC4 +/* C72CC4 80241844 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C72CC8 80241848 AFB00010 */ sw $s0, 0x10($sp) +/* C72CCC 8024184C 0080802D */ daddu $s0, $a0, $zero +/* C72CD0 80241850 AFBF0014 */ sw $ra, 0x14($sp) +/* C72CD4 80241854 8E020148 */ lw $v0, 0x148($s0) +/* C72CD8 80241858 0C00EABB */ jal get_npc_unsafe +/* C72CDC 8024185C 84440008 */ lh $a0, 8($v0) +/* C72CE0 80241860 0040202D */ daddu $a0, $v0, $zero +/* C72CE4 80241864 8482008E */ lh $v0, 0x8e($a0) +/* C72CE8 80241868 9483008E */ lhu $v1, 0x8e($a0) +/* C72CEC 8024186C 18400005 */ blez $v0, .L80241884 +/* C72CF0 80241870 2462FFFF */ addiu $v0, $v1, -1 +/* C72CF4 80241874 A482008E */ sh $v0, 0x8e($a0) +/* C72CF8 80241878 00021400 */ sll $v0, $v0, 0x10 +/* C72CFC 8024187C 1C400006 */ bgtz $v0, .L80241898 +/* C72D00 80241880 00000000 */ nop +.L80241884: +/* C72D04 80241884 8482008C */ lh $v0, 0x8c($a0) +/* C72D08 80241888 14400003 */ bnez $v0, .L80241898 +/* C72D0C 8024188C 2402000E */ addiu $v0, $zero, 0xe +/* C72D10 80241890 A480008E */ sh $zero, 0x8e($a0) +/* C72D14 80241894 AE020070 */ sw $v0, 0x70($s0) +.L80241898: +/* C72D18 80241898 8FBF0014 */ lw $ra, 0x14($sp) +/* C72D1C 8024189C 8FB00010 */ lw $s0, 0x10($sp) +/* C72D20 802418A0 03E00008 */ jr $ra +/* C72D24 802418A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38.s deleted file mode 100644 index a5dea62f84..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C38 -/* C730B8 80241C38 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* C730BC 80241C3C AFB00028 */ sw $s0, 0x28($sp) -/* C730C0 80241C40 00A0802D */ daddu $s0, $a1, $zero -/* C730C4 80241C44 AFB1002C */ sw $s1, 0x2c($sp) -/* C730C8 80241C48 00C0882D */ daddu $s1, $a2, $zero -/* C730CC 80241C4C AFBF0034 */ sw $ra, 0x34($sp) -/* C730D0 80241C50 AFB20030 */ sw $s2, 0x30($sp) -/* C730D4 80241C54 AE200070 */ sw $zero, 0x70($s1) -/* C730D8 80241C58 8C830000 */ lw $v1, ($a0) -/* C730DC 80241C5C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C730E0 80241C60 A480008E */ sh $zero, 0x8e($a0) -/* C730E4 80241C64 00621824 */ and $v1, $v1, $v0 -/* C730E8 80241C68 34650800 */ ori $a1, $v1, 0x800 -/* C730EC 80241C6C AC850000 */ sw $a1, ($a0) -/* C730F0 80241C70 8E0200D0 */ lw $v0, 0xd0($s0) -/* C730F4 80241C74 8C420034 */ lw $v0, 0x34($v0) -/* C730F8 80241C78 10400003 */ beqz $v0, .L80241C88 -/* C730FC 80241C7C 00E0902D */ daddu $s2, $a3, $zero -/* C73100 80241C80 08090724 */ j .L80241C90 -/* C73104 80241C84 34620808 */ ori $v0, $v1, 0x808 -.L80241C88: -/* C73108 80241C88 2402FFF7 */ addiu $v0, $zero, -9 -/* C7310C 80241C8C 00A21024 */ and $v0, $a1, $v0 -.L80241C90: -/* C73110 80241C90 AC820000 */ sw $v0, ($a0) -/* C73114 80241C94 27A20024 */ addiu $v0, $sp, 0x24 -/* C73118 80241C98 27A50018 */ addiu $a1, $sp, 0x18 -/* C7311C 80241C9C C4800038 */ lwc1 $f0, 0x38($a0) -/* C73120 80241CA0 C482003C */ lwc1 $f2, 0x3c($a0) -/* C73124 80241CA4 C4840040 */ lwc1 $f4, 0x40($a0) -/* C73128 80241CA8 3C01447A */ lui $at, 0x447a -/* C7312C 80241CAC 44813000 */ mtc1 $at, $f6 -/* C73130 80241CB0 27A6001C */ addiu $a2, $sp, 0x1c -/* C73134 80241CB4 E7A00018 */ swc1 $f0, 0x18($sp) -/* C73138 80241CB8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C7313C 80241CBC E7A40020 */ swc1 $f4, 0x20($sp) -/* C73140 80241CC0 E7A60024 */ swc1 $f6, 0x24($sp) -/* C73144 80241CC4 AFA20010 */ sw $v0, 0x10($sp) -/* C73148 80241CC8 8C840080 */ lw $a0, 0x80($a0) -/* C7314C 80241CCC 0C0372DF */ jal func_800DCB7C -/* C73150 80241CD0 27A70020 */ addiu $a3, $sp, 0x20 -/* C73154 80241CD4 C7A20024 */ lwc1 $f2, 0x24($sp) -/* C73158 80241CD8 3C014059 */ lui $at, 0x4059 -/* C7315C 80241CDC 44812800 */ mtc1 $at, $f5 -/* C73160 80241CE0 44802000 */ mtc1 $zero, $f4 -/* C73164 80241CE4 460010A1 */ cvt.d.s $f2, $f2 -/* C73168 80241CE8 46241082 */ mul.d $f2, $f2, $f4 -/* C7316C 80241CEC 00000000 */ nop -/* C73170 80241CF0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C73174 80241CF4 46000021 */ cvt.d.s $f0, $f0 -/* C73178 80241CF8 46240002 */ mul.d $f0, $f0, $f4 -/* C7317C 80241CFC 00000000 */ nop -/* C73180 80241D00 3C013FE0 */ lui $at, 0x3fe0 -/* C73184 80241D04 44812800 */ mtc1 $at, $f5 -/* C73188 80241D08 44802000 */ mtc1 $zero, $f4 -/* C7318C 80241D0C 00000000 */ nop -/* C73190 80241D10 46241080 */ add.d $f2, $f2, $f4 -/* C73194 80241D14 AE000074 */ sw $zero, 0x74($s0) -/* C73198 80241D18 46240000 */ add.d $f0, $f0, $f4 -/* C7319C 80241D1C AE000090 */ sw $zero, 0x90($s0) -/* C731A0 80241D20 4620120D */ trunc.w.d $f8, $f2 -/* C731A4 80241D24 E6080078 */ swc1 $f8, 0x78($s0) -/* C731A8 80241D28 4620020D */ trunc.w.d $f8, $f0 -/* C731AC 80241D2C E6080088 */ swc1 $f8, 0x88($s0) -/* C731B0 80241D30 8E420014 */ lw $v0, 0x14($s2) -/* C731B4 80241D34 AE220074 */ sw $v0, 0x74($s1) -/* C731B8 80241D38 8E0200B0 */ lw $v0, 0xb0($s0) -/* C731BC 80241D3C 34420010 */ ori $v0, $v0, 0x10 -/* C731C0 80241D40 AE0200B0 */ sw $v0, 0xb0($s0) -/* C731C4 80241D44 8FBF0034 */ lw $ra, 0x34($sp) -/* C731C8 80241D48 8FB20030 */ lw $s2, 0x30($sp) -/* C731CC 80241D4C 8FB1002C */ lw $s1, 0x2c($sp) -/* C731D0 80241D50 8FB00028 */ lw $s0, 0x28($sp) -/* C731D4 80241D54 03E00008 */ jr $ra -/* C731D8 80241D58 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s new file mode 100644 index 0000000000..1edc54be21 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241C38_C730B8.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C38_C730B8 +/* C730B8 80241C38 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* C730BC 80241C3C AFB00028 */ sw $s0, 0x28($sp) +/* C730C0 80241C40 00A0802D */ daddu $s0, $a1, $zero +/* C730C4 80241C44 AFB1002C */ sw $s1, 0x2c($sp) +/* C730C8 80241C48 00C0882D */ daddu $s1, $a2, $zero +/* C730CC 80241C4C AFBF0034 */ sw $ra, 0x34($sp) +/* C730D0 80241C50 AFB20030 */ sw $s2, 0x30($sp) +/* C730D4 80241C54 AE200070 */ sw $zero, 0x70($s1) +/* C730D8 80241C58 8C830000 */ lw $v1, ($a0) +/* C730DC 80241C5C 2402FDFF */ addiu $v0, $zero, -0x201 +/* C730E0 80241C60 A480008E */ sh $zero, 0x8e($a0) +/* C730E4 80241C64 00621824 */ and $v1, $v1, $v0 +/* C730E8 80241C68 34650800 */ ori $a1, $v1, 0x800 +/* C730EC 80241C6C AC850000 */ sw $a1, ($a0) +/* C730F0 80241C70 8E0200D0 */ lw $v0, 0xd0($s0) +/* C730F4 80241C74 8C420034 */ lw $v0, 0x34($v0) +/* C730F8 80241C78 10400003 */ beqz $v0, .L80241C88 +/* C730FC 80241C7C 00E0902D */ daddu $s2, $a3, $zero +/* C73100 80241C80 08090724 */ j .L80241C90 +/* C73104 80241C84 34620808 */ ori $v0, $v1, 0x808 +.L80241C88: +/* C73108 80241C88 2402FFF7 */ addiu $v0, $zero, -9 +/* C7310C 80241C8C 00A21024 */ and $v0, $a1, $v0 +.L80241C90: +/* C73110 80241C90 AC820000 */ sw $v0, ($a0) +/* C73114 80241C94 27A20024 */ addiu $v0, $sp, 0x24 +/* C73118 80241C98 27A50018 */ addiu $a1, $sp, 0x18 +/* C7311C 80241C9C C4800038 */ lwc1 $f0, 0x38($a0) +/* C73120 80241CA0 C482003C */ lwc1 $f2, 0x3c($a0) +/* C73124 80241CA4 C4840040 */ lwc1 $f4, 0x40($a0) +/* C73128 80241CA8 3C01447A */ lui $at, 0x447a +/* C7312C 80241CAC 44813000 */ mtc1 $at, $f6 +/* C73130 80241CB0 27A6001C */ addiu $a2, $sp, 0x1c +/* C73134 80241CB4 E7A00018 */ swc1 $f0, 0x18($sp) +/* C73138 80241CB8 E7A2001C */ swc1 $f2, 0x1c($sp) +/* C7313C 80241CBC E7A40020 */ swc1 $f4, 0x20($sp) +/* C73140 80241CC0 E7A60024 */ swc1 $f6, 0x24($sp) +/* C73144 80241CC4 AFA20010 */ sw $v0, 0x10($sp) +/* C73148 80241CC8 8C840080 */ lw $a0, 0x80($a0) +/* C7314C 80241CCC 0C0372DF */ jal func_800DCB7C +/* C73150 80241CD0 27A70020 */ addiu $a3, $sp, 0x20 +/* C73154 80241CD4 C7A20024 */ lwc1 $f2, 0x24($sp) +/* C73158 80241CD8 3C014059 */ lui $at, 0x4059 +/* C7315C 80241CDC 44812800 */ mtc1 $at, $f5 +/* C73160 80241CE0 44802000 */ mtc1 $zero, $f4 +/* C73164 80241CE4 460010A1 */ cvt.d.s $f2, $f2 +/* C73168 80241CE8 46241082 */ mul.d $f2, $f2, $f4 +/* C7316C 80241CEC 00000000 */ nop +/* C73170 80241CF0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* C73174 80241CF4 46000021 */ cvt.d.s $f0, $f0 +/* C73178 80241CF8 46240002 */ mul.d $f0, $f0, $f4 +/* C7317C 80241CFC 00000000 */ nop +/* C73180 80241D00 3C013FE0 */ lui $at, 0x3fe0 +/* C73184 80241D04 44812800 */ mtc1 $at, $f5 +/* C73188 80241D08 44802000 */ mtc1 $zero, $f4 +/* C7318C 80241D0C 00000000 */ nop +/* C73190 80241D10 46241080 */ add.d $f2, $f2, $f4 +/* C73194 80241D14 AE000074 */ sw $zero, 0x74($s0) +/* C73198 80241D18 46240000 */ add.d $f0, $f0, $f4 +/* C7319C 80241D1C AE000090 */ sw $zero, 0x90($s0) +/* C731A0 80241D20 4620120D */ trunc.w.d $f8, $f2 +/* C731A4 80241D24 E6080078 */ swc1 $f8, 0x78($s0) +/* C731A8 80241D28 4620020D */ trunc.w.d $f8, $f0 +/* C731AC 80241D2C E6080088 */ swc1 $f8, 0x88($s0) +/* C731B0 80241D30 8E420014 */ lw $v0, 0x14($s2) +/* C731B4 80241D34 AE220074 */ sw $v0, 0x74($s1) +/* C731B8 80241D38 8E0200B0 */ lw $v0, 0xb0($s0) +/* C731BC 80241D3C 34420010 */ ori $v0, $v0, 0x10 +/* C731C0 80241D40 AE0200B0 */ sw $v0, 0xb0($s0) +/* C731C4 80241D44 8FBF0034 */ lw $ra, 0x34($sp) +/* C731C8 80241D48 8FB20030 */ lw $s2, 0x30($sp) +/* C731CC 80241D4C 8FB1002C */ lw $s1, 0x2c($sp) +/* C731D0 80241D50 8FB00028 */ lw $s0, 0x28($sp) +/* C731D4 80241D54 03E00008 */ jr $ra +/* C731D8 80241D58 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s index 996a93c76f..175493694f 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80241D5C_C731DC.s @@ -46,7 +46,7 @@ glabel func_80241D5C_C731DC /* C73280 80241E00 02A0202D */ daddu $a0, $s5, $zero /* C73284 80241E04 0240282D */ daddu $a1, $s2, $zero /* C73288 80241E08 0280302D */ daddu $a2, $s4, $zero -/* C7328C 80241E0C 0C09070E */ jal func_80241C38 +/* C7328C 80241E0C 0C09070E */ jal func_80241C38_C730B8 /* C73290 80241E10 0200382D */ daddu $a3, $s0, $zero .L80241E14: /* C73294 80241E14 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_80241D5C_C731DC /* C732E4 80241E64 00000000 */ nop /* C732E8 80241E68 0280202D */ daddu $a0, $s4, $zero /* C732EC 80241E6C 0200282D */ daddu $a1, $s0, $zero -/* C732F0 80241E70 0C090294 */ jal func_80240A50 +/* C732F0 80241E70 0C090294 */ jal func_80240A50_C71ED0 /* C732F4 80241E74 0260302D */ daddu $a2, $s3, $zero /* C732F8 80241E78 0280202D */ daddu $a0, $s4, $zero /* C732FC 80241E7C 0200282D */ daddu $a1, $s0, $zero -/* C73300 80241E80 0C090300 */ jal func_80240C00 +/* C73300 80241E80 0C090300 */ jal func_80240C00_C72080 /* C73304 80241E84 0260302D */ daddu $a2, $s3, $zero /* C73308 80241E88 080907C9 */ j .L80241F24 /* C7330C 80241E8C 0000102D */ daddu $v0, $zero, $zero /* C73310 80241E90 0280202D */ daddu $a0, $s4, $zero /* C73314 80241E94 0200282D */ daddu $a1, $s0, $zero -/* C73318 80241E98 0C09048A */ jal func_80241228 +/* C73318 80241E98 0C09048A */ jal func_80241228_C726A8 /* C7331C 80241E9C 0260302D */ daddu $a2, $s3, $zero /* C73320 80241EA0 0280202D */ daddu $a0, $s4, $zero /* C73324 80241EA4 0200282D */ daddu $a1, $s0, $zero -/* C73328 80241EA8 0C0904BA */ jal func_802412E8 +/* C73328 80241EA8 0C0904BA */ jal func_802412E8_C72768 /* C7332C 80241EAC 0260302D */ daddu $a2, $s3, $zero /* C73330 80241EB0 080907C9 */ j .L80241F24 /* C73334 80241EB4 0000102D */ daddu $v0, $zero, $zero /* C73338 80241EB8 0280202D */ daddu $a0, $s4, $zero /* C7333C 80241EBC 0200282D */ daddu $a1, $s0, $zero -/* C73340 80241EC0 0C09058B */ jal func_8024162C +/* C73340 80241EC0 0C09058B */ jal func_8024162C_C72AAC /* C73344 80241EC4 0260302D */ daddu $a2, $s3, $zero /* C73348 80241EC8 0280202D */ daddu $a0, $s4, $zero /* C7334C 80241ECC 0200282D */ daddu $a1, $s0, $zero -/* C73350 80241ED0 0C0905A9 */ jal func_802416A4 +/* C73350 80241ED0 0C0905A9 */ jal func_802416A4_C72B24 /* C73354 80241ED4 0260302D */ daddu $a2, $s3, $zero /* C73358 80241ED8 080907C9 */ j .L80241F24 /* C7335C 80241EDC 0000102D */ daddu $v0, $zero, $zero /* C73360 80241EE0 0280202D */ daddu $a0, $s4, $zero /* C73364 80241EE4 0200282D */ daddu $a1, $s0, $zero -/* C73368 80241EE8 0C0905C4 */ jal func_80241710 +/* C73368 80241EE8 0C0905C4 */ jal func_80241710_C72B90 /* C7336C 80241EEC 0260302D */ daddu $a2, $s3, $zero /* C73370 80241EF0 080907C9 */ j .L80241F24 /* C73374 80241EF4 0000102D */ daddu $v0, $zero, $zero /* C73378 80241EF8 0280202D */ daddu $a0, $s4, $zero /* C7337C 80241EFC 0200282D */ daddu $a1, $s0, $zero -/* C73380 80241F00 0C090611 */ jal func_80241844 +/* C73380 80241F00 0C090611 */ jal func_80241844_C72CC4 /* C73384 80241F04 0260302D */ daddu $a2, $s3, $zero /* C73388 80241F08 080907C9 */ j .L80241F24 /* C7338C 80241F0C 0000102D */ daddu $v0, $zero, $zero /* C73390 80241F10 0280202D */ daddu $a0, $s4, $zero /* C73394 80241F14 0200282D */ daddu $a1, $s0, $zero -/* C73398 80241F18 0C09062A */ jal func_802418A8 +/* C73398 80241F18 0C09062A */ jal func_802418A8_C72D28 /* C7339C 80241F1C 0260302D */ daddu $a2, $s3, $zero .L80241F20: /* C733A0 80241F20 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354.s deleted file mode 100644 index a285b9e209..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354.s +++ /dev/null @@ -1,130 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242354 -/* C737D4 80242354 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C737D8 80242358 AFB40040 */ sw $s4, 0x40($sp) -/* C737DC 8024235C 0080A02D */ daddu $s4, $a0, $zero -/* C737E0 80242360 AFBF0048 */ sw $ra, 0x48($sp) -/* C737E4 80242364 AFB50044 */ sw $s5, 0x44($sp) -/* C737E8 80242368 AFB3003C */ sw $s3, 0x3c($sp) -/* C737EC 8024236C AFB20038 */ sw $s2, 0x38($sp) -/* C737F0 80242370 AFB10034 */ sw $s1, 0x34($sp) -/* C737F4 80242374 AFB00030 */ sw $s0, 0x30($sp) -/* C737F8 80242378 8E920148 */ lw $s2, 0x148($s4) -/* C737FC 8024237C 86440008 */ lh $a0, 8($s2) -/* C73800 80242380 8E90000C */ lw $s0, 0xc($s4) -/* C73804 80242384 0C00EABB */ jal get_npc_unsafe -/* C73808 80242388 00A0882D */ daddu $s1, $a1, $zero -/* C7380C 8024238C 0280202D */ daddu $a0, $s4, $zero -/* C73810 80242390 8E050000 */ lw $a1, ($s0) -/* C73814 80242394 0C0B1EAF */ jal get_variable -/* C73818 80242398 0040A82D */ daddu $s5, $v0, $zero -/* C7381C 8024239C AFA00010 */ sw $zero, 0x10($sp) -/* C73820 802423A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73824 802423A4 8C630030 */ lw $v1, 0x30($v1) -/* C73828 802423A8 AFA30014 */ sw $v1, 0x14($sp) -/* C7382C 802423AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73830 802423B0 8C63001C */ lw $v1, 0x1c($v1) -/* C73834 802423B4 AFA30018 */ sw $v1, 0x18($sp) -/* C73838 802423B8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C7383C 802423BC 8C630024 */ lw $v1, 0x24($v1) -/* C73840 802423C0 AFA3001C */ sw $v1, 0x1c($sp) -/* C73844 802423C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73848 802423C8 8C630028 */ lw $v1, 0x28($v1) -/* C7384C 802423CC 27B30010 */ addiu $s3, $sp, 0x10 -/* C73850 802423D0 AFA30020 */ sw $v1, 0x20($sp) -/* C73854 802423D4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C73858 802423D8 3C0142F0 */ lui $at, 0x42f0 -/* C7385C 802423DC 44810000 */ mtc1 $at, $f0 -/* C73860 802423E0 8C63002C */ lw $v1, 0x2c($v1) -/* C73864 802423E4 0040802D */ daddu $s0, $v0, $zero -/* C73868 802423E8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C7386C 802423EC A7A0002C */ sh $zero, 0x2c($sp) -/* C73870 802423F0 12200007 */ beqz $s1, .L80242410 -/* C73874 802423F4 AFA30024 */ sw $v1, 0x24($sp) -/* C73878 802423F8 02A0202D */ daddu $a0, $s5, $zero -/* C7387C 802423FC 0240282D */ daddu $a1, $s2, $zero -/* C73880 80242400 0280302D */ daddu $a2, $s4, $zero -/* C73884 80242404 0C09070E */ jal func_80241C38 -/* C73888 80242408 0200382D */ daddu $a3, $s0, $zero -/* C7388C 8024240C AE800070 */ sw $zero, 0x70($s4) -.L80242410: -/* C73890 80242410 2402FFFE */ addiu $v0, $zero, -2 -/* C73894 80242414 A2A200AB */ sb $v0, 0xab($s5) -/* C73898 80242418 8E4300B0 */ lw $v1, 0xb0($s2) -/* C7389C 8024241C 30620004 */ andi $v0, $v1, 4 -/* C738A0 80242420 10400007 */ beqz $v0, .L80242440 -/* C738A4 80242424 00000000 */ nop -/* C738A8 80242428 824200B4 */ lb $v0, 0xb4($s2) -/* C738AC 8024242C 1440003A */ bnez $v0, .L80242518 -/* C738B0 80242430 0000102D */ daddu $v0, $zero, $zero -/* C738B4 80242434 2402FFFB */ addiu $v0, $zero, -5 -/* C738B8 80242438 00621024 */ and $v0, $v1, $v0 -/* C738BC 8024243C AE4200B0 */ sw $v0, 0xb0($s2) -.L80242440: -/* C738C0 80242440 8E830070 */ lw $v1, 0x70($s4) -/* C738C4 80242444 2C620015 */ sltiu $v0, $v1, 0x15 -/* C738C8 80242448 10400032 */ beqz $v0, .L80242514 -/* C738CC 8024244C 00031080 */ sll $v0, $v1, 2 -/* C738D0 80242450 3C018024 */ lui $at, 0x8024 -/* C738D4 80242454 00220821 */ addu $at, $at, $v0 -/* C738D8 80242458 8C225640 */ lw $v0, 0x5640($at) -/* C738DC 8024245C 00400008 */ jr $v0 -/* C738E0 80242460 00000000 */ nop -/* C738E4 80242464 0280202D */ daddu $a0, $s4, $zero -/* C738E8 80242468 0200282D */ daddu $a1, $s0, $zero -/* C738EC 8024246C 0C090294 */ jal func_80240A50 -/* C738F0 80242470 0260302D */ daddu $a2, $s3, $zero -/* C738F4 80242474 0280202D */ daddu $a0, $s4, $zero -/* C738F8 80242478 0200282D */ daddu $a1, $s0, $zero -/* C738FC 8024247C 0C090300 */ jal func_80240C00 -/* C73900 80242480 0260302D */ daddu $a2, $s3, $zero -/* C73904 80242484 08090946 */ j .L80242518 -/* C73908 80242488 0000102D */ daddu $v0, $zero, $zero -/* C7390C 8024248C 0280202D */ daddu $a0, $s4, $zero -/* C73910 80242490 0200282D */ daddu $a1, $s0, $zero -/* C73914 80242494 0C09048A */ jal func_80241228 -/* C73918 80242498 0260302D */ daddu $a2, $s3, $zero -/* C7391C 8024249C 0280202D */ daddu $a0, $s4, $zero -/* C73920 802424A0 0200282D */ daddu $a1, $s0, $zero -/* C73924 802424A4 0C0904BA */ jal func_802412E8 -/* C73928 802424A8 0260302D */ daddu $a2, $s3, $zero -/* C7392C 802424AC 08090946 */ j .L80242518 -/* C73930 802424B0 0000102D */ daddu $v0, $zero, $zero -/* C73934 802424B4 0280202D */ daddu $a0, $s4, $zero -/* C73938 802424B8 0200282D */ daddu $a1, $s0, $zero -/* C7393C 802424BC 0C09058B */ jal func_8024162C -/* C73940 802424C0 0260302D */ daddu $a2, $s3, $zero -/* C73944 802424C4 0280202D */ daddu $a0, $s4, $zero -/* C73948 802424C8 0200282D */ daddu $a1, $s0, $zero -/* C7394C 802424CC 0C0905A9 */ jal func_802416A4 -/* C73950 802424D0 0260302D */ daddu $a2, $s3, $zero -/* C73954 802424D4 08090946 */ j .L80242518 -/* C73958 802424D8 0000102D */ daddu $v0, $zero, $zero -/* C7395C 802424DC 0280202D */ daddu $a0, $s4, $zero -/* C73960 802424E0 0200282D */ daddu $a1, $s0, $zero -/* C73964 802424E4 0C0907D2 */ jal func_80241F48 -/* C73968 802424E8 0260302D */ daddu $a2, $s3, $zero -/* C7396C 802424EC 0280202D */ daddu $a0, $s4, $zero -/* C73970 802424F0 0200282D */ daddu $a1, $s0, $zero -/* C73974 802424F4 0C09081E */ jal func_80242078 -/* C73978 802424F8 0260302D */ daddu $a2, $s3, $zero -/* C7397C 802424FC 08090946 */ j .L80242518 -/* C73980 80242500 0000102D */ daddu $v0, $zero, $zero -/* C73984 80242504 0280202D */ daddu $a0, $s4, $zero -/* C73988 80242508 0200282D */ daddu $a1, $s0, $zero -/* C7398C 8024250C 0C0908BE */ jal func_802422F8 -/* C73990 80242510 0260302D */ daddu $a2, $s3, $zero -.L80242514: -/* C73994 80242514 0000102D */ daddu $v0, $zero, $zero -.L80242518: -/* C73998 80242518 8FBF0048 */ lw $ra, 0x48($sp) -/* C7399C 8024251C 8FB50044 */ lw $s5, 0x44($sp) -/* C739A0 80242520 8FB40040 */ lw $s4, 0x40($sp) -/* C739A4 80242524 8FB3003C */ lw $s3, 0x3c($sp) -/* C739A8 80242528 8FB20038 */ lw $s2, 0x38($sp) -/* C739AC 8024252C 8FB10034 */ lw $s1, 0x34($sp) -/* C739B0 80242530 8FB00030 */ lw $s0, 0x30($sp) -/* C739B4 80242534 03E00008 */ jr $ra -/* C739B8 80242538 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s new file mode 100644 index 0000000000..a9280deae5 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242354_C737D4.s @@ -0,0 +1,130 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242354_C737D4 +/* C737D4 80242354 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C737D8 80242358 AFB40040 */ sw $s4, 0x40($sp) +/* C737DC 8024235C 0080A02D */ daddu $s4, $a0, $zero +/* C737E0 80242360 AFBF0048 */ sw $ra, 0x48($sp) +/* C737E4 80242364 AFB50044 */ sw $s5, 0x44($sp) +/* C737E8 80242368 AFB3003C */ sw $s3, 0x3c($sp) +/* C737EC 8024236C AFB20038 */ sw $s2, 0x38($sp) +/* C737F0 80242370 AFB10034 */ sw $s1, 0x34($sp) +/* C737F4 80242374 AFB00030 */ sw $s0, 0x30($sp) +/* C737F8 80242378 8E920148 */ lw $s2, 0x148($s4) +/* C737FC 8024237C 86440008 */ lh $a0, 8($s2) +/* C73800 80242380 8E90000C */ lw $s0, 0xc($s4) +/* C73804 80242384 0C00EABB */ jal get_npc_unsafe +/* C73808 80242388 00A0882D */ daddu $s1, $a1, $zero +/* C7380C 8024238C 0280202D */ daddu $a0, $s4, $zero +/* C73810 80242390 8E050000 */ lw $a1, ($s0) +/* C73814 80242394 0C0B1EAF */ jal get_variable +/* C73818 80242398 0040A82D */ daddu $s5, $v0, $zero +/* C7381C 8024239C AFA00010 */ sw $zero, 0x10($sp) +/* C73820 802423A0 8E4300D0 */ lw $v1, 0xd0($s2) +/* C73824 802423A4 8C630030 */ lw $v1, 0x30($v1) +/* C73828 802423A8 AFA30014 */ sw $v1, 0x14($sp) +/* C7382C 802423AC 8E4300D0 */ lw $v1, 0xd0($s2) +/* C73830 802423B0 8C63001C */ lw $v1, 0x1c($v1) +/* C73834 802423B4 AFA30018 */ sw $v1, 0x18($sp) +/* C73838 802423B8 8E4300D0 */ lw $v1, 0xd0($s2) +/* C7383C 802423BC 8C630024 */ lw $v1, 0x24($v1) +/* C73840 802423C0 AFA3001C */ sw $v1, 0x1c($sp) +/* C73844 802423C4 8E4300D0 */ lw $v1, 0xd0($s2) +/* C73848 802423C8 8C630028 */ lw $v1, 0x28($v1) +/* C7384C 802423CC 27B30010 */ addiu $s3, $sp, 0x10 +/* C73850 802423D0 AFA30020 */ sw $v1, 0x20($sp) +/* C73854 802423D4 8E4300D0 */ lw $v1, 0xd0($s2) +/* C73858 802423D8 3C0142F0 */ lui $at, 0x42f0 +/* C7385C 802423DC 44810000 */ mtc1 $at, $f0 +/* C73860 802423E0 8C63002C */ lw $v1, 0x2c($v1) +/* C73864 802423E4 0040802D */ daddu $s0, $v0, $zero +/* C73868 802423E8 E7A00028 */ swc1 $f0, 0x28($sp) +/* C7386C 802423EC A7A0002C */ sh $zero, 0x2c($sp) +/* C73870 802423F0 12200007 */ beqz $s1, .L80242410 +/* C73874 802423F4 AFA30024 */ sw $v1, 0x24($sp) +/* C73878 802423F8 02A0202D */ daddu $a0, $s5, $zero +/* C7387C 802423FC 0240282D */ daddu $a1, $s2, $zero +/* C73880 80242400 0280302D */ daddu $a2, $s4, $zero +/* C73884 80242404 0C09070E */ jal func_80241C38_C730B8 +/* C73888 80242408 0200382D */ daddu $a3, $s0, $zero +/* C7388C 8024240C AE800070 */ sw $zero, 0x70($s4) +.L80242410: +/* C73890 80242410 2402FFFE */ addiu $v0, $zero, -2 +/* C73894 80242414 A2A200AB */ sb $v0, 0xab($s5) +/* C73898 80242418 8E4300B0 */ lw $v1, 0xb0($s2) +/* C7389C 8024241C 30620004 */ andi $v0, $v1, 4 +/* C738A0 80242420 10400007 */ beqz $v0, .L80242440 +/* C738A4 80242424 00000000 */ nop +/* C738A8 80242428 824200B4 */ lb $v0, 0xb4($s2) +/* C738AC 8024242C 1440003A */ bnez $v0, .L80242518 +/* C738B0 80242430 0000102D */ daddu $v0, $zero, $zero +/* C738B4 80242434 2402FFFB */ addiu $v0, $zero, -5 +/* C738B8 80242438 00621024 */ and $v0, $v1, $v0 +/* C738BC 8024243C AE4200B0 */ sw $v0, 0xb0($s2) +.L80242440: +/* C738C0 80242440 8E830070 */ lw $v1, 0x70($s4) +/* C738C4 80242444 2C620015 */ sltiu $v0, $v1, 0x15 +/* C738C8 80242448 10400032 */ beqz $v0, .L80242514 +/* C738CC 8024244C 00031080 */ sll $v0, $v1, 2 +/* C738D0 80242450 3C018024 */ lui $at, 0x8024 +/* C738D4 80242454 00220821 */ addu $at, $at, $v0 +/* C738D8 80242458 8C225640 */ lw $v0, 0x5640($at) +/* C738DC 8024245C 00400008 */ jr $v0 +/* C738E0 80242460 00000000 */ nop +/* C738E4 80242464 0280202D */ daddu $a0, $s4, $zero +/* C738E8 80242468 0200282D */ daddu $a1, $s0, $zero +/* C738EC 8024246C 0C090294 */ jal func_80240A50_C71ED0 +/* C738F0 80242470 0260302D */ daddu $a2, $s3, $zero +/* C738F4 80242474 0280202D */ daddu $a0, $s4, $zero +/* C738F8 80242478 0200282D */ daddu $a1, $s0, $zero +/* C738FC 8024247C 0C090300 */ jal func_80240C00_C72080 +/* C73900 80242480 0260302D */ daddu $a2, $s3, $zero +/* C73904 80242484 08090946 */ j .L80242518 +/* C73908 80242488 0000102D */ daddu $v0, $zero, $zero +/* C7390C 8024248C 0280202D */ daddu $a0, $s4, $zero +/* C73910 80242490 0200282D */ daddu $a1, $s0, $zero +/* C73914 80242494 0C09048A */ jal func_80241228_C726A8 +/* C73918 80242498 0260302D */ daddu $a2, $s3, $zero +/* C7391C 8024249C 0280202D */ daddu $a0, $s4, $zero +/* C73920 802424A0 0200282D */ daddu $a1, $s0, $zero +/* C73924 802424A4 0C0904BA */ jal func_802412E8_C72768 +/* C73928 802424A8 0260302D */ daddu $a2, $s3, $zero +/* C7392C 802424AC 08090946 */ j .L80242518 +/* C73930 802424B0 0000102D */ daddu $v0, $zero, $zero +/* C73934 802424B4 0280202D */ daddu $a0, $s4, $zero +/* C73938 802424B8 0200282D */ daddu $a1, $s0, $zero +/* C7393C 802424BC 0C09058B */ jal func_8024162C_C72AAC +/* C73940 802424C0 0260302D */ daddu $a2, $s3, $zero +/* C73944 802424C4 0280202D */ daddu $a0, $s4, $zero +/* C73948 802424C8 0200282D */ daddu $a1, $s0, $zero +/* C7394C 802424CC 0C0905A9 */ jal func_802416A4_C72B24 +/* C73950 802424D0 0260302D */ daddu $a2, $s3, $zero +/* C73954 802424D4 08090946 */ j .L80242518 +/* C73958 802424D8 0000102D */ daddu $v0, $zero, $zero +/* C7395C 802424DC 0280202D */ daddu $a0, $s4, $zero +/* C73960 802424E0 0200282D */ daddu $a1, $s0, $zero +/* C73964 802424E4 0C0907D2 */ jal func_80241F48_C733C8 +/* C73968 802424E8 0260302D */ daddu $a2, $s3, $zero +/* C7396C 802424EC 0280202D */ daddu $a0, $s4, $zero +/* C73970 802424F0 0200282D */ daddu $a1, $s0, $zero +/* C73974 802424F4 0C09081E */ jal func_80242078_C734F8 +/* C73978 802424F8 0260302D */ daddu $a2, $s3, $zero +/* C7397C 802424FC 08090946 */ j .L80242518 +/* C73980 80242500 0000102D */ daddu $v0, $zero, $zero +/* C73984 80242504 0280202D */ daddu $a0, $s4, $zero +/* C73988 80242508 0200282D */ daddu $a1, $s0, $zero +/* C7398C 8024250C 0C0908BE */ jal func_802422F8_C73778 +/* C73990 80242510 0260302D */ daddu $a2, $s3, $zero +.L80242514: +/* C73994 80242514 0000102D */ daddu $v0, $zero, $zero +.L80242518: +/* C73998 80242518 8FBF0048 */ lw $ra, 0x48($sp) +/* C7399C 8024251C 8FB50044 */ lw $s5, 0x44($sp) +/* C739A0 80242520 8FB40040 */ lw $s4, 0x40($sp) +/* C739A4 80242524 8FB3003C */ lw $s3, 0x3c($sp) +/* C739A8 80242528 8FB20038 */ lw $s2, 0x38($sp) +/* C739AC 8024252C 8FB10034 */ lw $s1, 0x34($sp) +/* C739B0 80242530 8FB00030 */ lw $s0, 0x30($sp) +/* C739B4 80242534 03E00008 */ jr $ra +/* C739B8 80242538 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0.s deleted file mode 100644 index 83c679efc8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426F0 -/* C73B70 802426F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C73B74 802426F4 AFB10014 */ sw $s1, 0x14($sp) -/* C73B78 802426F8 0080882D */ daddu $s1, $a0, $zero -/* C73B7C 802426FC AFBF0018 */ sw $ra, 0x18($sp) -/* C73B80 80242700 AFB00010 */ sw $s0, 0x10($sp) -/* C73B84 80242704 8E300148 */ lw $s0, 0x148($s1) -/* C73B88 80242708 0C00EABB */ jal get_npc_unsafe -/* C73B8C 8024270C 86040008 */ lh $a0, 8($s0) -/* C73B90 80242710 9443008E */ lhu $v1, 0x8e($v0) -/* C73B94 80242714 2463FFFF */ addiu $v1, $v1, -1 -/* C73B98 80242718 A443008E */ sh $v1, 0x8e($v0) -/* C73B9C 8024271C 00031C00 */ sll $v1, $v1, 0x10 -/* C73BA0 80242720 1C600003 */ bgtz $v1, .L80242730 -/* C73BA4 80242724 2402000C */ addiu $v0, $zero, 0xc -/* C73BA8 80242728 AE00006C */ sw $zero, 0x6c($s0) -/* C73BAC 8024272C AE220070 */ sw $v0, 0x70($s1) -.L80242730: -/* C73BB0 80242730 8FBF0018 */ lw $ra, 0x18($sp) -/* C73BB4 80242734 8FB10014 */ lw $s1, 0x14($sp) -/* C73BB8 80242738 8FB00010 */ lw $s0, 0x10($sp) -/* C73BBC 8024273C 03E00008 */ jr $ra -/* C73BC0 80242740 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s new file mode 100644 index 0000000000..e2e9095e46 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802426F0_C73B70.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426F0_C73B70 +/* C73B70 802426F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C73B74 802426F4 AFB10014 */ sw $s1, 0x14($sp) +/* C73B78 802426F8 0080882D */ daddu $s1, $a0, $zero +/* C73B7C 802426FC AFBF0018 */ sw $ra, 0x18($sp) +/* C73B80 80242700 AFB00010 */ sw $s0, 0x10($sp) +/* C73B84 80242704 8E300148 */ lw $s0, 0x148($s1) +/* C73B88 80242708 0C00EABB */ jal get_npc_unsafe +/* C73B8C 8024270C 86040008 */ lh $a0, 8($s0) +/* C73B90 80242710 9443008E */ lhu $v1, 0x8e($v0) +/* C73B94 80242714 2463FFFF */ addiu $v1, $v1, -1 +/* C73B98 80242718 A443008E */ sh $v1, 0x8e($v0) +/* C73B9C 8024271C 00031C00 */ sll $v1, $v1, 0x10 +/* C73BA0 80242720 1C600003 */ bgtz $v1, .L80242730 +/* C73BA4 80242724 2402000C */ addiu $v0, $zero, 0xc +/* C73BA8 80242728 AE00006C */ sw $zero, 0x6c($s0) +/* C73BAC 8024272C AE220070 */ sw $v0, 0x70($s1) +.L80242730: +/* C73BB0 80242730 8FBF0018 */ lw $ra, 0x18($sp) +/* C73BB4 80242734 8FB10014 */ lw $s1, 0x14($sp) +/* C73BB8 80242738 8FB00010 */ lw $s0, 0x10($sp) +/* C73BBC 8024273C 03E00008 */ jr $ra +/* C73BC0 80242740 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744.s deleted file mode 100644 index 7ebd69a1d8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242744 -/* C73BC4 80242744 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C73BC8 80242748 AFBF0024 */ sw $ra, 0x24($sp) -/* C73BCC 8024274C AFB40020 */ sw $s4, 0x20($sp) -/* C73BD0 80242750 AFB3001C */ sw $s3, 0x1c($sp) -/* C73BD4 80242754 AFB20018 */ sw $s2, 0x18($sp) -/* C73BD8 80242758 AFB10014 */ sw $s1, 0x14($sp) -/* C73BDC 8024275C AFB00010 */ sw $s0, 0x10($sp) -/* C73BE0 80242760 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C73BE4 80242764 8C900148 */ lw $s0, 0x148($a0) -/* C73BE8 80242768 86040008 */ lh $a0, 8($s0) -/* C73BEC 8024276C 0C00EABB */ jal get_npc_unsafe -/* C73BF0 80242770 24110001 */ addiu $s1, $zero, 1 -/* C73BF4 80242774 86040008 */ lh $a0, 8($s0) -/* C73BF8 80242778 0040802D */ daddu $s0, $v0, $zero -/* C73BFC 8024277C 3C05800B */ lui $a1, %hi(gCameras) -/* C73C00 80242780 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* C73C04 80242784 3C03800A */ lui $v1, 0x800a -/* C73C08 80242788 8463A634 */ lh $v1, -0x59cc($v1) -/* C73C0C 8024278C 00912021 */ addu $a0, $a0, $s1 -/* C73C10 80242790 00031080 */ sll $v0, $v1, 2 -/* C73C14 80242794 00431021 */ addu $v0, $v0, $v1 -/* C73C18 80242798 00021080 */ sll $v0, $v0, 2 -/* C73C1C 8024279C 00431023 */ subu $v0, $v0, $v1 -/* C73C20 802427A0 000218C0 */ sll $v1, $v0, 3 -/* C73C24 802427A4 00431021 */ addu $v0, $v0, $v1 -/* C73C28 802427A8 000210C0 */ sll $v0, $v0, 3 -/* C73C2C 802427AC 0C00FB3A */ jal get_enemy -/* C73C30 802427B0 00459021 */ addu $s2, $v0, $a1 -/* C73C34 802427B4 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* C73C38 802427B8 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* C73C3C 802427BC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C73C40 802427C0 8E830000 */ lw $v1, ($s4) -/* C73C44 802427C4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C73C48 802427C8 8C660028 */ lw $a2, 0x28($v1) -/* C73C4C 802427CC 8C670030 */ lw $a3, 0x30($v1) -/* C73C50 802427D0 0C00A7B5 */ jal dist2D -/* C73C54 802427D4 0040982D */ daddu $s3, $v0, $zero -/* C73C58 802427D8 C6620074 */ lwc1 $f2, 0x74($s3) -/* C73C5C 802427DC 468010A0 */ cvt.s.w $f2, $f2 -/* C73C60 802427E0 4600103C */ c.lt.s $f2, $f0 -/* C73C64 802427E4 00000000 */ nop -/* C73C68 802427E8 45030001 */ bc1tl .L802427F0 -/* C73C6C 802427EC 0000882D */ daddu $s1, $zero, $zero -.L802427F0: -/* C73C70 802427F0 C64C006C */ lwc1 $f12, 0x6c($s2) -/* C73C74 802427F4 C60E000C */ lwc1 $f14, 0xc($s0) -/* C73C78 802427F8 3C014387 */ lui $at, 0x4387 -/* C73C7C 802427FC 4481A000 */ mtc1 $at, $f20 -/* C73C80 80242800 0C00A70A */ jal get_clamped_angle_diff -/* C73C84 80242804 00000000 */ nop -/* C73C88 80242808 0C00A6C9 */ jal clamp_angle -/* C73C8C 8024280C 46000306 */ mov.s $f12, $f0 -/* C73C90 80242810 3C018024 */ lui $at, 0x8024 -/* C73C94 80242814 D4225698 */ ldc1 $f2, 0x5698($at) -/* C73C98 80242818 46000021 */ cvt.d.s $f0, $f0 -/* C73C9C 8024281C 4622003C */ c.lt.d $f0, $f2 -/* C73CA0 80242820 00000000 */ nop -/* C73CA4 80242824 45000003 */ bc1f .L80242834 -/* C73CA8 80242828 00000000 */ nop -/* C73CAC 8024282C 3C0142B4 */ lui $at, 0x42b4 -/* C73CB0 80242830 4481A000 */ mtc1 $at, $f20 -.L80242834: -/* C73CB4 80242834 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C73CB8 80242838 8E820000 */ lw $v0, ($s4) -/* C73CBC 8024283C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C73CC0 80242840 8C460028 */ lw $a2, 0x28($v0) -/* C73CC4 80242844 0C00A720 */ jal atan2 -/* C73CC8 80242848 8C470030 */ lw $a3, 0x30($v0) -/* C73CCC 8024284C 4600A306 */ mov.s $f12, $f20 -/* C73CD0 80242850 0C00A70A */ jal get_clamped_angle_diff -/* C73CD4 80242854 46000386 */ mov.s $f14, $f0 -/* C73CD8 80242858 C6620078 */ lwc1 $f2, 0x78($s3) -/* C73CDC 8024285C 468010A0 */ cvt.s.w $f2, $f2 -/* C73CE0 80242860 46000005 */ abs.s $f0, $f0 -/* C73CE4 80242864 4600103C */ c.lt.s $f2, $f0 -/* C73CE8 80242868 00000000 */ nop -/* C73CEC 8024286C 45030001 */ bc1tl .L80242874 -/* C73CF0 80242870 0000882D */ daddu $s1, $zero, $zero -.L80242874: -/* C73CF4 80242874 8E820000 */ lw $v0, ($s4) -/* C73CF8 80242878 C600003C */ lwc1 $f0, 0x3c($s0) -/* C73CFC 8024287C C442002C */ lwc1 $f2, 0x2c($v0) -/* C73D00 80242880 860200A8 */ lh $v0, 0xa8($s0) -/* C73D04 80242884 46020001 */ sub.s $f0, $f0, $f2 -/* C73D08 80242888 44821000 */ mtc1 $v0, $f2 -/* C73D0C 8024288C 00000000 */ nop -/* C73D10 80242890 468010A1 */ cvt.d.w $f2, $f2 -/* C73D14 80242894 46221080 */ add.d $f2, $f2, $f2 -/* C73D18 80242898 46000005 */ abs.s $f0, $f0 -/* C73D1C 8024289C 46000021 */ cvt.d.s $f0, $f0 -/* C73D20 802428A0 4620103E */ c.le.d $f2, $f0 -/* C73D24 802428A4 00000000 */ nop -/* C73D28 802428A8 45030001 */ bc1tl .L802428B0 -/* C73D2C 802428AC 0000882D */ daddu $s1, $zero, $zero -.L802428B0: -/* C73D30 802428B0 3C038011 */ lui $v1, 0x8011 -/* C73D34 802428B4 8063EBB3 */ lb $v1, -0x144d($v1) -/* C73D38 802428B8 24020009 */ addiu $v0, $zero, 9 -/* C73D3C 802428BC 50620001 */ beql $v1, $v0, .L802428C4 -/* C73D40 802428C0 0000882D */ daddu $s1, $zero, $zero -.L802428C4: -/* C73D44 802428C4 24020007 */ addiu $v0, $zero, 7 -/* C73D48 802428C8 50620001 */ beql $v1, $v0, .L802428D0 -/* C73D4C 802428CC 0000882D */ daddu $s1, $zero, $zero -.L802428D0: -/* C73D50 802428D0 0220102D */ daddu $v0, $s1, $zero -/* C73D54 802428D4 8FBF0024 */ lw $ra, 0x24($sp) -/* C73D58 802428D8 8FB40020 */ lw $s4, 0x20($sp) -/* C73D5C 802428DC 8FB3001C */ lw $s3, 0x1c($sp) -/* C73D60 802428E0 8FB20018 */ lw $s2, 0x18($sp) -/* C73D64 802428E4 8FB10014 */ lw $s1, 0x14($sp) -/* C73D68 802428E8 8FB00010 */ lw $s0, 0x10($sp) -/* C73D6C 802428EC D7B40028 */ ldc1 $f20, 0x28($sp) -/* C73D70 802428F0 03E00008 */ jr $ra -/* C73D74 802428F4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s new file mode 100644 index 0000000000..474089ec19 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242744_C73BC4.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242744_C73BC4 +/* C73BC4 80242744 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C73BC8 80242748 AFBF0024 */ sw $ra, 0x24($sp) +/* C73BCC 8024274C AFB40020 */ sw $s4, 0x20($sp) +/* C73BD0 80242750 AFB3001C */ sw $s3, 0x1c($sp) +/* C73BD4 80242754 AFB20018 */ sw $s2, 0x18($sp) +/* C73BD8 80242758 AFB10014 */ sw $s1, 0x14($sp) +/* C73BDC 8024275C AFB00010 */ sw $s0, 0x10($sp) +/* C73BE0 80242760 F7B40028 */ sdc1 $f20, 0x28($sp) +/* C73BE4 80242764 8C900148 */ lw $s0, 0x148($a0) +/* C73BE8 80242768 86040008 */ lh $a0, 8($s0) +/* C73BEC 8024276C 0C00EABB */ jal get_npc_unsafe +/* C73BF0 80242770 24110001 */ addiu $s1, $zero, 1 +/* C73BF4 80242774 86040008 */ lh $a0, 8($s0) +/* C73BF8 80242778 0040802D */ daddu $s0, $v0, $zero +/* C73BFC 8024277C 3C05800B */ lui $a1, %hi(gCameras) +/* C73C00 80242780 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* C73C04 80242784 3C03800A */ lui $v1, 0x800a +/* C73C08 80242788 8463A634 */ lh $v1, -0x59cc($v1) +/* C73C0C 8024278C 00912021 */ addu $a0, $a0, $s1 +/* C73C10 80242790 00031080 */ sll $v0, $v1, 2 +/* C73C14 80242794 00431021 */ addu $v0, $v0, $v1 +/* C73C18 80242798 00021080 */ sll $v0, $v0, 2 +/* C73C1C 8024279C 00431023 */ subu $v0, $v0, $v1 +/* C73C20 802427A0 000218C0 */ sll $v1, $v0, 3 +/* C73C24 802427A4 00431021 */ addu $v0, $v0, $v1 +/* C73C28 802427A8 000210C0 */ sll $v0, $v0, 3 +/* C73C2C 802427AC 0C00FB3A */ jal get_enemy +/* C73C30 802427B0 00459021 */ addu $s2, $v0, $a1 +/* C73C34 802427B4 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) +/* C73C38 802427B8 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) +/* C73C3C 802427BC C60C0038 */ lwc1 $f12, 0x38($s0) +/* C73C40 802427C0 8E830000 */ lw $v1, ($s4) +/* C73C44 802427C4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C73C48 802427C8 8C660028 */ lw $a2, 0x28($v1) +/* C73C4C 802427CC 8C670030 */ lw $a3, 0x30($v1) +/* C73C50 802427D0 0C00A7B5 */ jal dist2D +/* C73C54 802427D4 0040982D */ daddu $s3, $v0, $zero +/* C73C58 802427D8 C6620074 */ lwc1 $f2, 0x74($s3) +/* C73C5C 802427DC 468010A0 */ cvt.s.w $f2, $f2 +/* C73C60 802427E0 4600103C */ c.lt.s $f2, $f0 +/* C73C64 802427E4 00000000 */ nop +/* C73C68 802427E8 45030001 */ bc1tl .L802427F0 +/* C73C6C 802427EC 0000882D */ daddu $s1, $zero, $zero +.L802427F0: +/* C73C70 802427F0 C64C006C */ lwc1 $f12, 0x6c($s2) +/* C73C74 802427F4 C60E000C */ lwc1 $f14, 0xc($s0) +/* C73C78 802427F8 3C014387 */ lui $at, 0x4387 +/* C73C7C 802427FC 4481A000 */ mtc1 $at, $f20 +/* C73C80 80242800 0C00A70A */ jal get_clamped_angle_diff +/* C73C84 80242804 00000000 */ nop +/* C73C88 80242808 0C00A6C9 */ jal clamp_angle +/* C73C8C 8024280C 46000306 */ mov.s $f12, $f0 +/* C73C90 80242810 3C018024 */ lui $at, 0x8024 +/* C73C94 80242814 D4225698 */ ldc1 $f2, 0x5698($at) +/* C73C98 80242818 46000021 */ cvt.d.s $f0, $f0 +/* C73C9C 8024281C 4622003C */ c.lt.d $f0, $f2 +/* C73CA0 80242820 00000000 */ nop +/* C73CA4 80242824 45000003 */ bc1f .L80242834 +/* C73CA8 80242828 00000000 */ nop +/* C73CAC 8024282C 3C0142B4 */ lui $at, 0x42b4 +/* C73CB0 80242830 4481A000 */ mtc1 $at, $f20 +.L80242834: +/* C73CB4 80242834 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C73CB8 80242838 8E820000 */ lw $v0, ($s4) +/* C73CBC 8024283C C60E0040 */ lwc1 $f14, 0x40($s0) +/* C73CC0 80242840 8C460028 */ lw $a2, 0x28($v0) +/* C73CC4 80242844 0C00A720 */ jal atan2 +/* C73CC8 80242848 8C470030 */ lw $a3, 0x30($v0) +/* C73CCC 8024284C 4600A306 */ mov.s $f12, $f20 +/* C73CD0 80242850 0C00A70A */ jal get_clamped_angle_diff +/* C73CD4 80242854 46000386 */ mov.s $f14, $f0 +/* C73CD8 80242858 C6620078 */ lwc1 $f2, 0x78($s3) +/* C73CDC 8024285C 468010A0 */ cvt.s.w $f2, $f2 +/* C73CE0 80242860 46000005 */ abs.s $f0, $f0 +/* C73CE4 80242864 4600103C */ c.lt.s $f2, $f0 +/* C73CE8 80242868 00000000 */ nop +/* C73CEC 8024286C 45030001 */ bc1tl .L80242874 +/* C73CF0 80242870 0000882D */ daddu $s1, $zero, $zero +.L80242874: +/* C73CF4 80242874 8E820000 */ lw $v0, ($s4) +/* C73CF8 80242878 C600003C */ lwc1 $f0, 0x3c($s0) +/* C73CFC 8024287C C442002C */ lwc1 $f2, 0x2c($v0) +/* C73D00 80242880 860200A8 */ lh $v0, 0xa8($s0) +/* C73D04 80242884 46020001 */ sub.s $f0, $f0, $f2 +/* C73D08 80242888 44821000 */ mtc1 $v0, $f2 +/* C73D0C 8024288C 00000000 */ nop +/* C73D10 80242890 468010A1 */ cvt.d.w $f2, $f2 +/* C73D14 80242894 46221080 */ add.d $f2, $f2, $f2 +/* C73D18 80242898 46000005 */ abs.s $f0, $f0 +/* C73D1C 8024289C 46000021 */ cvt.d.s $f0, $f0 +/* C73D20 802428A0 4620103E */ c.le.d $f2, $f0 +/* C73D24 802428A4 00000000 */ nop +/* C73D28 802428A8 45030001 */ bc1tl .L802428B0 +/* C73D2C 802428AC 0000882D */ daddu $s1, $zero, $zero +.L802428B0: +/* C73D30 802428B0 3C038011 */ lui $v1, 0x8011 +/* C73D34 802428B4 8063EBB3 */ lb $v1, -0x144d($v1) +/* C73D38 802428B8 24020009 */ addiu $v0, $zero, 9 +/* C73D3C 802428BC 50620001 */ beql $v1, $v0, .L802428C4 +/* C73D40 802428C0 0000882D */ daddu $s1, $zero, $zero +.L802428C4: +/* C73D44 802428C4 24020007 */ addiu $v0, $zero, 7 +/* C73D48 802428C8 50620001 */ beql $v1, $v0, .L802428D0 +/* C73D4C 802428CC 0000882D */ daddu $s1, $zero, $zero +.L802428D0: +/* C73D50 802428D0 0220102D */ daddu $v0, $s1, $zero +/* C73D54 802428D4 8FBF0024 */ lw $ra, 0x24($sp) +/* C73D58 802428D8 8FB40020 */ lw $s4, 0x20($sp) +/* C73D5C 802428DC 8FB3001C */ lw $s3, 0x1c($sp) +/* C73D60 802428E0 8FB20018 */ lw $s2, 0x18($sp) +/* C73D64 802428E4 8FB10014 */ lw $s1, 0x14($sp) +/* C73D68 802428E8 8FB00010 */ lw $s0, 0x10($sp) +/* C73D6C 802428EC D7B40028 */ ldc1 $f20, 0x28($sp) +/* C73D70 802428F0 03E00008 */ jr $ra +/* C73D74 802428F4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8.s deleted file mode 100644 index fcb156b51d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428F8 -/* C73D78 802428F8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C73D7C 802428FC AFB40028 */ sw $s4, 0x28($sp) -/* C73D80 80242900 0080A02D */ daddu $s4, $a0, $zero -/* C73D84 80242904 AFBF002C */ sw $ra, 0x2c($sp) -/* C73D88 80242908 AFB30024 */ sw $s3, 0x24($sp) -/* C73D8C 8024290C AFB20020 */ sw $s2, 0x20($sp) -/* C73D90 80242910 AFB1001C */ sw $s1, 0x1c($sp) -/* C73D94 80242914 AFB00018 */ sw $s0, 0x18($sp) -/* C73D98 80242918 8E910148 */ lw $s1, 0x148($s4) -/* C73D9C 8024291C 86240008 */ lh $a0, 8($s1) -/* C73DA0 80242920 0C00EABB */ jal get_npc_unsafe -/* C73DA4 80242924 00A0802D */ daddu $s0, $a1, $zero -/* C73DA8 80242928 16000005 */ bnez $s0, .L80242940 -/* C73DAC 8024292C 0040902D */ daddu $s2, $v0, $zero -/* C73DB0 80242930 8E2200B0 */ lw $v0, 0xb0($s1) -/* C73DB4 80242934 30420004 */ andi $v0, $v0, 4 -/* C73DB8 80242938 10400015 */ beqz $v0, .L80242990 -/* C73DBC 8024293C 00000000 */ nop -.L80242940: -/* C73DC0 80242940 AE800070 */ sw $zero, 0x70($s4) -/* C73DC4 80242944 8E420000 */ lw $v0, ($s2) -/* C73DC8 80242948 3C031F30 */ lui $v1, 0x1f30 -/* C73DCC 8024294C A640008E */ sh $zero, 0x8e($s2) -/* C73DD0 80242950 34420102 */ ori $v0, $v0, 0x102 -/* C73DD4 80242954 AE420000 */ sw $v0, ($s2) -/* C73DD8 80242958 8E220000 */ lw $v0, ($s1) -/* C73DDC 8024295C 3C01C47A */ lui $at, 0xc47a -/* C73DE0 80242960 44810000 */ mtc1 $at, $f0 -/* C73DE4 80242964 00431025 */ or $v0, $v0, $v1 -/* C73DE8 80242968 AE220000 */ sw $v0, ($s1) -/* C73DEC 8024296C AE400038 */ sw $zero, 0x38($s2) -/* C73DF0 80242970 E640003C */ swc1 $f0, 0x3c($s2) -/* C73DF4 80242974 AE400040 */ sw $zero, 0x40($s2) -/* C73DF8 80242978 8E2300B0 */ lw $v1, 0xb0($s1) -/* C73DFC 8024297C 30620004 */ andi $v0, $v1, 4 -/* C73E00 80242980 10400003 */ beqz $v0, .L80242990 -/* C73E04 80242984 2402FFFB */ addiu $v0, $zero, -5 -/* C73E08 80242988 00621024 */ and $v0, $v1, $v0 -/* C73E0C 8024298C AE2200B0 */ sw $v0, 0xb0($s1) -.L80242990: -/* C73E10 80242990 8E930070 */ lw $s3, 0x70($s4) -/* C73E14 80242994 12600005 */ beqz $s3, .L802429AC -/* C73E18 80242998 24020001 */ addiu $v0, $zero, 1 -/* C73E1C 8024299C 12620048 */ beq $s3, $v0, .L80242AC0 -/* C73E20 802429A0 00000000 */ nop -/* C73E24 802429A4 08090ACD */ j .L80242B34 -/* C73E28 802429A8 00000000 */ nop -.L802429AC: -/* C73E2C 802429AC 86240008 */ lh $a0, 8($s1) -/* C73E30 802429B0 0C00FB3A */ jal get_enemy -/* C73E34 802429B4 2484FFFF */ addiu $a0, $a0, -1 -/* C73E38 802429B8 0040802D */ daddu $s0, $v0, $zero -/* C73E3C 802429BC 0C00EABB */ jal get_npc_unsafe -/* C73E40 802429C0 86040008 */ lh $a0, 8($s0) -/* C73E44 802429C4 24030001 */ addiu $v1, $zero, 1 -/* C73E48 802429C8 0040982D */ daddu $s3, $v0, $zero -/* C73E4C 802429CC A2230007 */ sb $v1, 7($s1) -/* C73E50 802429D0 8E03006C */ lw $v1, 0x6c($s0) -/* C73E54 802429D4 24020003 */ addiu $v0, $zero, 3 -/* C73E58 802429D8 14620056 */ bne $v1, $v0, .L80242B34 -/* C73E5C 802429DC 00000000 */ nop -/* C73E60 802429E0 8E2500A8 */ lw $a1, 0xa8($s1) -/* C73E64 802429E4 10A00003 */ beqz $a1, .L802429F4 -/* C73E68 802429E8 0260202D */ daddu $a0, $s3, $zero -/* C73E6C 802429EC 0C012530 */ jal func_800494C0 -/* C73E70 802429F0 0000302D */ daddu $a2, $zero, $zero -.L802429F4: -/* C73E74 802429F4 27A40010 */ addiu $a0, $sp, 0x10 -/* C73E78 802429F8 C6280070 */ lwc1 $f8, 0x70($s1) -/* C73E7C 802429FC 46804220 */ cvt.s.w $f8, $f8 -/* C73E80 80242A00 C6620034 */ lwc1 $f2, 0x34($s3) -/* C73E84 80242A04 3C014387 */ lui $at, 0x4387 -/* C73E88 80242A08 44810000 */ mtc1 $at, $f0 -/* C73E8C 80242A0C 44064000 */ mfc1 $a2, $f8 -/* C73E90 80242A10 46020001 */ sub.s $f0, $f0, $f2 -/* C73E94 80242A14 C6660038 */ lwc1 $f6, 0x38($s3) -/* C73E98 80242A18 C6640040 */ lwc1 $f4, 0x40($s3) -/* C73E9C 80242A1C 44070000 */ mfc1 $a3, $f0 -/* C73EA0 80242A20 27A50014 */ addiu $a1, $sp, 0x14 -/* C73EA4 80242A24 E7A60010 */ swc1 $f6, 0x10($sp) -/* C73EA8 80242A28 0C00A7E7 */ jal add_vec2D_polar -/* C73EAC 80242A2C E7A40014 */ swc1 $f4, 0x14($sp) -/* C73EB0 80242A30 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C73EB4 80242A34 4600020D */ trunc.w.s $f8, $f0 -/* C73EB8 80242A38 44024000 */ mfc1 $v0, $f8 -/* C73EBC 80242A3C E6400038 */ swc1 $f0, 0x38($s2) -/* C73EC0 80242A40 A6220010 */ sh $v0, 0x10($s1) -/* C73EC4 80242A44 C660003C */ lwc1 $f0, 0x3c($s3) -/* C73EC8 80242A48 C622006C */ lwc1 $f2, 0x6c($s1) -/* C73ECC 80242A4C 468010A0 */ cvt.s.w $f2, $f2 -/* C73ED0 80242A50 46020000 */ add.s $f0, $f0, $f2 -/* C73ED4 80242A54 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C73ED8 80242A58 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C73EDC 80242A5C E640003C */ swc1 $f0, 0x3c($s2) -/* C73EE0 80242A60 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C73EE4 80242A64 4600020D */ trunc.w.s $f8, $f0 -/* C73EE8 80242A68 44024000 */ mfc1 $v0, $f8 -/* C73EEC 80242A6C 00000000 */ nop -/* C73EF0 80242A70 A6220012 */ sh $v0, 0x12($s1) -/* C73EF4 80242A74 4600120D */ trunc.w.s $f8, $f2 -/* C73EF8 80242A78 44024000 */ mfc1 $v0, $f8 -/* C73EFC 80242A7C E6420040 */ swc1 $f2, 0x40($s2) -/* C73F00 80242A80 A6220014 */ sh $v0, 0x14($s1) -/* C73F04 80242A84 8C660028 */ lw $a2, 0x28($v1) -/* C73F08 80242A88 8C670030 */ lw $a3, 0x30($v1) -/* C73F0C 80242A8C C64C0038 */ lwc1 $f12, 0x38($s2) -/* C73F10 80242A90 0C00A720 */ jal atan2 -/* C73F14 80242A94 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C73F18 80242A98 3C03E0EF */ lui $v1, 0xe0ef -/* C73F1C 80242A9C E640000C */ swc1 $f0, 0xc($s2) -/* C73F20 80242AA0 8E220000 */ lw $v0, ($s1) -/* C73F24 80242AA4 3463FFFF */ ori $v1, $v1, 0xffff -/* C73F28 80242AA8 00431024 */ and $v0, $v0, $v1 -/* C73F2C 80242AAC AE220000 */ sw $v0, ($s1) -/* C73F30 80242AB0 24020001 */ addiu $v0, $zero, 1 -/* C73F34 80242AB4 A640008E */ sh $zero, 0x8e($s2) -/* C73F38 80242AB8 08090ACD */ j .L80242B34 -/* C73F3C 80242ABC AE820070 */ sw $v0, 0x70($s4) -.L80242AC0: -/* C73F40 80242AC0 86240008 */ lh $a0, 8($s1) -/* C73F44 80242AC4 0C00FB3A */ jal get_enemy -/* C73F48 80242AC8 2484FFFF */ addiu $a0, $a0, -1 -/* C73F4C 80242ACC 0040802D */ daddu $s0, $v0, $zero -/* C73F50 80242AD0 0C00EABB */ jal get_npc_unsafe -/* C73F54 80242AD4 86040008 */ lh $a0, 8($s0) -/* C73F58 80242AD8 9642008E */ lhu $v0, 0x8e($s2) -/* C73F5C 80242ADC 24420001 */ addiu $v0, $v0, 1 -/* C73F60 80242AE0 A642008E */ sh $v0, 0x8e($s2) -/* C73F64 80242AE4 00021400 */ sll $v0, $v0, 0x10 -/* C73F68 80242AE8 8E23007C */ lw $v1, 0x7c($s1) -/* C73F6C 80242AEC 00021403 */ sra $v0, $v0, 0x10 -/* C73F70 80242AF0 0043102A */ slt $v0, $v0, $v1 -/* C73F74 80242AF4 50400001 */ beql $v0, $zero, .L80242AFC -/* C73F78 80242AF8 A2200007 */ sb $zero, 7($s1) -.L80242AFC: -/* C73F7C 80242AFC 8E03006C */ lw $v1, 0x6c($s0) -/* C73F80 80242B00 24020004 */ addiu $v0, $zero, 4 -/* C73F84 80242B04 1462000B */ bne $v1, $v0, .L80242B34 -/* C73F88 80242B08 3C021F10 */ lui $v0, 0x1f10 -/* C73F8C 80242B0C 8E230000 */ lw $v1, ($s1) -/* C73F90 80242B10 3C01C47A */ lui $at, 0xc47a -/* C73F94 80242B14 44810000 */ mtc1 $at, $f0 -/* C73F98 80242B18 00621825 */ or $v1, $v1, $v0 -/* C73F9C 80242B1C AE230000 */ sw $v1, ($s1) -/* C73FA0 80242B20 AE400038 */ sw $zero, 0x38($s2) -/* C73FA4 80242B24 E640003C */ swc1 $f0, 0x3c($s2) -/* C73FA8 80242B28 AE400040 */ sw $zero, 0x40($s2) -/* C73FAC 80242B2C A2330007 */ sb $s3, 7($s1) -/* C73FB0 80242B30 AE800070 */ sw $zero, 0x70($s4) -.L80242B34: -/* C73FB4 80242B34 8FBF002C */ lw $ra, 0x2c($sp) -/* C73FB8 80242B38 8FB40028 */ lw $s4, 0x28($sp) -/* C73FBC 80242B3C 8FB30024 */ lw $s3, 0x24($sp) -/* C73FC0 80242B40 8FB20020 */ lw $s2, 0x20($sp) -/* C73FC4 80242B44 8FB1001C */ lw $s1, 0x1c($sp) -/* C73FC8 80242B48 8FB00018 */ lw $s0, 0x18($sp) -/* C73FCC 80242B4C 0000102D */ daddu $v0, $zero, $zero -/* C73FD0 80242B50 03E00008 */ jr $ra -/* C73FD4 80242B54 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s new file mode 100644 index 0000000000..343291d368 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802428F8_C73D78.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428F8_C73D78 +/* C73D78 802428F8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C73D7C 802428FC AFB40028 */ sw $s4, 0x28($sp) +/* C73D80 80242900 0080A02D */ daddu $s4, $a0, $zero +/* C73D84 80242904 AFBF002C */ sw $ra, 0x2c($sp) +/* C73D88 80242908 AFB30024 */ sw $s3, 0x24($sp) +/* C73D8C 8024290C AFB20020 */ sw $s2, 0x20($sp) +/* C73D90 80242910 AFB1001C */ sw $s1, 0x1c($sp) +/* C73D94 80242914 AFB00018 */ sw $s0, 0x18($sp) +/* C73D98 80242918 8E910148 */ lw $s1, 0x148($s4) +/* C73D9C 8024291C 86240008 */ lh $a0, 8($s1) +/* C73DA0 80242920 0C00EABB */ jal get_npc_unsafe +/* C73DA4 80242924 00A0802D */ daddu $s0, $a1, $zero +/* C73DA8 80242928 16000005 */ bnez $s0, .L80242940 +/* C73DAC 8024292C 0040902D */ daddu $s2, $v0, $zero +/* C73DB0 80242930 8E2200B0 */ lw $v0, 0xb0($s1) +/* C73DB4 80242934 30420004 */ andi $v0, $v0, 4 +/* C73DB8 80242938 10400015 */ beqz $v0, .L80242990 +/* C73DBC 8024293C 00000000 */ nop +.L80242940: +/* C73DC0 80242940 AE800070 */ sw $zero, 0x70($s4) +/* C73DC4 80242944 8E420000 */ lw $v0, ($s2) +/* C73DC8 80242948 3C031F30 */ lui $v1, 0x1f30 +/* C73DCC 8024294C A640008E */ sh $zero, 0x8e($s2) +/* C73DD0 80242950 34420102 */ ori $v0, $v0, 0x102 +/* C73DD4 80242954 AE420000 */ sw $v0, ($s2) +/* C73DD8 80242958 8E220000 */ lw $v0, ($s1) +/* C73DDC 8024295C 3C01C47A */ lui $at, 0xc47a +/* C73DE0 80242960 44810000 */ mtc1 $at, $f0 +/* C73DE4 80242964 00431025 */ or $v0, $v0, $v1 +/* C73DE8 80242968 AE220000 */ sw $v0, ($s1) +/* C73DEC 8024296C AE400038 */ sw $zero, 0x38($s2) +/* C73DF0 80242970 E640003C */ swc1 $f0, 0x3c($s2) +/* C73DF4 80242974 AE400040 */ sw $zero, 0x40($s2) +/* C73DF8 80242978 8E2300B0 */ lw $v1, 0xb0($s1) +/* C73DFC 8024297C 30620004 */ andi $v0, $v1, 4 +/* C73E00 80242980 10400003 */ beqz $v0, .L80242990 +/* C73E04 80242984 2402FFFB */ addiu $v0, $zero, -5 +/* C73E08 80242988 00621024 */ and $v0, $v1, $v0 +/* C73E0C 8024298C AE2200B0 */ sw $v0, 0xb0($s1) +.L80242990: +/* C73E10 80242990 8E930070 */ lw $s3, 0x70($s4) +/* C73E14 80242994 12600005 */ beqz $s3, .L802429AC +/* C73E18 80242998 24020001 */ addiu $v0, $zero, 1 +/* C73E1C 8024299C 12620048 */ beq $s3, $v0, .L80242AC0 +/* C73E20 802429A0 00000000 */ nop +/* C73E24 802429A4 08090ACD */ j .L80242B34 +/* C73E28 802429A8 00000000 */ nop +.L802429AC: +/* C73E2C 802429AC 86240008 */ lh $a0, 8($s1) +/* C73E30 802429B0 0C00FB3A */ jal get_enemy +/* C73E34 802429B4 2484FFFF */ addiu $a0, $a0, -1 +/* C73E38 802429B8 0040802D */ daddu $s0, $v0, $zero +/* C73E3C 802429BC 0C00EABB */ jal get_npc_unsafe +/* C73E40 802429C0 86040008 */ lh $a0, 8($s0) +/* C73E44 802429C4 24030001 */ addiu $v1, $zero, 1 +/* C73E48 802429C8 0040982D */ daddu $s3, $v0, $zero +/* C73E4C 802429CC A2230007 */ sb $v1, 7($s1) +/* C73E50 802429D0 8E03006C */ lw $v1, 0x6c($s0) +/* C73E54 802429D4 24020003 */ addiu $v0, $zero, 3 +/* C73E58 802429D8 14620056 */ bne $v1, $v0, .L80242B34 +/* C73E5C 802429DC 00000000 */ nop +/* C73E60 802429E0 8E2500A8 */ lw $a1, 0xa8($s1) +/* C73E64 802429E4 10A00003 */ beqz $a1, .L802429F4 +/* C73E68 802429E8 0260202D */ daddu $a0, $s3, $zero +/* C73E6C 802429EC 0C012530 */ jal func_800494C0 +/* C73E70 802429F0 0000302D */ daddu $a2, $zero, $zero +.L802429F4: +/* C73E74 802429F4 27A40010 */ addiu $a0, $sp, 0x10 +/* C73E78 802429F8 C6280070 */ lwc1 $f8, 0x70($s1) +/* C73E7C 802429FC 46804220 */ cvt.s.w $f8, $f8 +/* C73E80 80242A00 C6620034 */ lwc1 $f2, 0x34($s3) +/* C73E84 80242A04 3C014387 */ lui $at, 0x4387 +/* C73E88 80242A08 44810000 */ mtc1 $at, $f0 +/* C73E8C 80242A0C 44064000 */ mfc1 $a2, $f8 +/* C73E90 80242A10 46020001 */ sub.s $f0, $f0, $f2 +/* C73E94 80242A14 C6660038 */ lwc1 $f6, 0x38($s3) +/* C73E98 80242A18 C6640040 */ lwc1 $f4, 0x40($s3) +/* C73E9C 80242A1C 44070000 */ mfc1 $a3, $f0 +/* C73EA0 80242A20 27A50014 */ addiu $a1, $sp, 0x14 +/* C73EA4 80242A24 E7A60010 */ swc1 $f6, 0x10($sp) +/* C73EA8 80242A28 0C00A7E7 */ jal add_vec2D_polar +/* C73EAC 80242A2C E7A40014 */ swc1 $f4, 0x14($sp) +/* C73EB0 80242A30 C7A00010 */ lwc1 $f0, 0x10($sp) +/* C73EB4 80242A34 4600020D */ trunc.w.s $f8, $f0 +/* C73EB8 80242A38 44024000 */ mfc1 $v0, $f8 +/* C73EBC 80242A3C E6400038 */ swc1 $f0, 0x38($s2) +/* C73EC0 80242A40 A6220010 */ sh $v0, 0x10($s1) +/* C73EC4 80242A44 C660003C */ lwc1 $f0, 0x3c($s3) +/* C73EC8 80242A48 C622006C */ lwc1 $f2, 0x6c($s1) +/* C73ECC 80242A4C 468010A0 */ cvt.s.w $f2, $f2 +/* C73ED0 80242A50 46020000 */ add.s $f0, $f0, $f2 +/* C73ED4 80242A54 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) +/* C73ED8 80242A58 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) +/* C73EDC 80242A5C E640003C */ swc1 $f0, 0x3c($s2) +/* C73EE0 80242A60 C7A20014 */ lwc1 $f2, 0x14($sp) +/* C73EE4 80242A64 4600020D */ trunc.w.s $f8, $f0 +/* C73EE8 80242A68 44024000 */ mfc1 $v0, $f8 +/* C73EEC 80242A6C 00000000 */ nop +/* C73EF0 80242A70 A6220012 */ sh $v0, 0x12($s1) +/* C73EF4 80242A74 4600120D */ trunc.w.s $f8, $f2 +/* C73EF8 80242A78 44024000 */ mfc1 $v0, $f8 +/* C73EFC 80242A7C E6420040 */ swc1 $f2, 0x40($s2) +/* C73F00 80242A80 A6220014 */ sh $v0, 0x14($s1) +/* C73F04 80242A84 8C660028 */ lw $a2, 0x28($v1) +/* C73F08 80242A88 8C670030 */ lw $a3, 0x30($v1) +/* C73F0C 80242A8C C64C0038 */ lwc1 $f12, 0x38($s2) +/* C73F10 80242A90 0C00A720 */ jal atan2 +/* C73F14 80242A94 C64E0040 */ lwc1 $f14, 0x40($s2) +/* C73F18 80242A98 3C03E0EF */ lui $v1, 0xe0ef +/* C73F1C 80242A9C E640000C */ swc1 $f0, 0xc($s2) +/* C73F20 80242AA0 8E220000 */ lw $v0, ($s1) +/* C73F24 80242AA4 3463FFFF */ ori $v1, $v1, 0xffff +/* C73F28 80242AA8 00431024 */ and $v0, $v0, $v1 +/* C73F2C 80242AAC AE220000 */ sw $v0, ($s1) +/* C73F30 80242AB0 24020001 */ addiu $v0, $zero, 1 +/* C73F34 80242AB4 A640008E */ sh $zero, 0x8e($s2) +/* C73F38 80242AB8 08090ACD */ j .L80242B34 +/* C73F3C 80242ABC AE820070 */ sw $v0, 0x70($s4) +.L80242AC0: +/* C73F40 80242AC0 86240008 */ lh $a0, 8($s1) +/* C73F44 80242AC4 0C00FB3A */ jal get_enemy +/* C73F48 80242AC8 2484FFFF */ addiu $a0, $a0, -1 +/* C73F4C 80242ACC 0040802D */ daddu $s0, $v0, $zero +/* C73F50 80242AD0 0C00EABB */ jal get_npc_unsafe +/* C73F54 80242AD4 86040008 */ lh $a0, 8($s0) +/* C73F58 80242AD8 9642008E */ lhu $v0, 0x8e($s2) +/* C73F5C 80242ADC 24420001 */ addiu $v0, $v0, 1 +/* C73F60 80242AE0 A642008E */ sh $v0, 0x8e($s2) +/* C73F64 80242AE4 00021400 */ sll $v0, $v0, 0x10 +/* C73F68 80242AE8 8E23007C */ lw $v1, 0x7c($s1) +/* C73F6C 80242AEC 00021403 */ sra $v0, $v0, 0x10 +/* C73F70 80242AF0 0043102A */ slt $v0, $v0, $v1 +/* C73F74 80242AF4 50400001 */ beql $v0, $zero, .L80242AFC +/* C73F78 80242AF8 A2200007 */ sb $zero, 7($s1) +.L80242AFC: +/* C73F7C 80242AFC 8E03006C */ lw $v1, 0x6c($s0) +/* C73F80 80242B00 24020004 */ addiu $v0, $zero, 4 +/* C73F84 80242B04 1462000B */ bne $v1, $v0, .L80242B34 +/* C73F88 80242B08 3C021F10 */ lui $v0, 0x1f10 +/* C73F8C 80242B0C 8E230000 */ lw $v1, ($s1) +/* C73F90 80242B10 3C01C47A */ lui $at, 0xc47a +/* C73F94 80242B14 44810000 */ mtc1 $at, $f0 +/* C73F98 80242B18 00621825 */ or $v1, $v1, $v0 +/* C73F9C 80242B1C AE230000 */ sw $v1, ($s1) +/* C73FA0 80242B20 AE400038 */ sw $zero, 0x38($s2) +/* C73FA4 80242B24 E640003C */ swc1 $f0, 0x3c($s2) +/* C73FA8 80242B28 AE400040 */ sw $zero, 0x40($s2) +/* C73FAC 80242B2C A2330007 */ sb $s3, 7($s1) +/* C73FB0 80242B30 AE800070 */ sw $zero, 0x70($s4) +.L80242B34: +/* C73FB4 80242B34 8FBF002C */ lw $ra, 0x2c($sp) +/* C73FB8 80242B38 8FB40028 */ lw $s4, 0x28($sp) +/* C73FBC 80242B3C 8FB30024 */ lw $s3, 0x24($sp) +/* C73FC0 80242B40 8FB20020 */ lw $s2, 0x20($sp) +/* C73FC4 80242B44 8FB1001C */ lw $s1, 0x1c($sp) +/* C73FC8 80242B48 8FB00018 */ lw $s0, 0x18($sp) +/* C73FCC 80242B4C 0000102D */ daddu $v0, $zero, $zero +/* C73FD0 80242B50 03E00008 */ jr $ra +/* C73FD4 80242B54 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58.s deleted file mode 100644 index ee217f44c2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B58 -/* C73FD8 80242B58 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C73FDC 80242B5C AFB20038 */ sw $s2, 0x38($sp) -/* C73FE0 80242B60 0080902D */ daddu $s2, $a0, $zero -/* C73FE4 80242B64 AFBF0048 */ sw $ra, 0x48($sp) -/* C73FE8 80242B68 AFB50044 */ sw $s5, 0x44($sp) -/* C73FEC 80242B6C AFB40040 */ sw $s4, 0x40($sp) -/* C73FF0 80242B70 AFB3003C */ sw $s3, 0x3c($sp) -/* C73FF4 80242B74 AFB10034 */ sw $s1, 0x34($sp) -/* C73FF8 80242B78 AFB00030 */ sw $s0, 0x30($sp) -/* C73FFC 80242B7C 8E510148 */ lw $s1, 0x148($s2) -/* C74000 80242B80 86240008 */ lh $a0, 8($s1) -/* C74004 80242B84 0C00EABB */ jal get_npc_unsafe -/* C74008 80242B88 00A0802D */ daddu $s0, $a1, $zero -/* C7400C 80242B8C 8E43000C */ lw $v1, 0xc($s2) -/* C74010 80242B90 0240202D */ daddu $a0, $s2, $zero -/* C74014 80242B94 8C650000 */ lw $a1, ($v1) -/* C74018 80242B98 0C0B1EAF */ jal get_variable -/* C7401C 80242B9C 0040A82D */ daddu $s5, $v0, $zero -/* C74020 80242BA0 AFA00010 */ sw $zero, 0x10($sp) -/* C74024 80242BA4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C74028 80242BA8 8C630030 */ lw $v1, 0x30($v1) -/* C7402C 80242BAC AFA30014 */ sw $v1, 0x14($sp) -/* C74030 80242BB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C74034 80242BB4 8C63001C */ lw $v1, 0x1c($v1) -/* C74038 80242BB8 AFA30018 */ sw $v1, 0x18($sp) -/* C7403C 80242BBC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C74040 80242BC0 8C630024 */ lw $v1, 0x24($v1) -/* C74044 80242BC4 AFA3001C */ sw $v1, 0x1c($sp) -/* C74048 80242BC8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C7404C 80242BCC 8C630028 */ lw $v1, 0x28($v1) -/* C74050 80242BD0 27B40010 */ addiu $s4, $sp, 0x10 -/* C74054 80242BD4 AFA30020 */ sw $v1, 0x20($sp) -/* C74058 80242BD8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C7405C 80242BDC 3C014282 */ lui $at, 0x4282 -/* C74060 80242BE0 44810000 */ mtc1 $at, $f0 -/* C74064 80242BE4 8C63002C */ lw $v1, 0x2c($v1) -/* C74068 80242BE8 0040982D */ daddu $s3, $v0, $zero -/* C7406C 80242BEC E7A00028 */ swc1 $f0, 0x28($sp) -/* C74070 80242BF0 A7A0002C */ sh $zero, 0x2c($sp) -/* C74074 80242BF4 16000005 */ bnez $s0, .L80242C0C -/* C74078 80242BF8 AFA30024 */ sw $v1, 0x24($sp) -/* C7407C 80242BFC 8E2200B0 */ lw $v0, 0xb0($s1) -/* C74080 80242C00 30420004 */ andi $v0, $v0, 4 -/* C74084 80242C04 10400020 */ beqz $v0, .L80242C88 -/* C74088 80242C08 00000000 */ nop -.L80242C0C: -/* C7408C 80242C0C 2404F7FF */ addiu $a0, $zero, -0x801 -/* C74090 80242C10 AE400070 */ sw $zero, 0x70($s2) -/* C74094 80242C14 A6A0008E */ sh $zero, 0x8e($s5) -/* C74098 80242C18 8E2200CC */ lw $v0, 0xcc($s1) -/* C7409C 80242C1C 8EA30000 */ lw $v1, ($s5) -/* C740A0 80242C20 8C420000 */ lw $v0, ($v0) -/* C740A4 80242C24 00641824 */ and $v1, $v1, $a0 -/* C740A8 80242C28 AEA30000 */ sw $v1, ($s5) -/* C740AC 80242C2C AEA20028 */ sw $v0, 0x28($s5) -/* C740B0 80242C30 8E2200D0 */ lw $v0, 0xd0($s1) -/* C740B4 80242C34 8C420034 */ lw $v0, 0x34($v0) -/* C740B8 80242C38 54400005 */ bnel $v0, $zero, .L80242C50 -/* C740BC 80242C3C 2402FDFF */ addiu $v0, $zero, -0x201 -/* C740C0 80242C40 34620200 */ ori $v0, $v1, 0x200 -/* C740C4 80242C44 2403FFF7 */ addiu $v1, $zero, -9 -/* C740C8 80242C48 08090B16 */ j .L80242C58 -/* C740CC 80242C4C 00431024 */ and $v0, $v0, $v1 -.L80242C50: -/* C740D0 80242C50 00621024 */ and $v0, $v1, $v0 -/* C740D4 80242C54 34420008 */ ori $v0, $v0, 8 -.L80242C58: -/* C740D8 80242C58 AEA20000 */ sw $v0, ($s5) -/* C740DC 80242C5C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C740E0 80242C60 30420004 */ andi $v0, $v0, 4 -/* C740E4 80242C64 10400007 */ beqz $v0, .L80242C84 -/* C740E8 80242C68 24020063 */ addiu $v0, $zero, 0x63 -/* C740EC 80242C6C AE420070 */ sw $v0, 0x70($s2) -/* C740F0 80242C70 AE400074 */ sw $zero, 0x74($s2) -/* C740F4 80242C74 8E2200B0 */ lw $v0, 0xb0($s1) -/* C740F8 80242C78 2403FFFB */ addiu $v1, $zero, -5 -/* C740FC 80242C7C 00431024 */ and $v0, $v0, $v1 -/* C74100 80242C80 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242C84: -/* C74104 80242C84 AE20006C */ sw $zero, 0x6c($s1) -.L80242C88: -/* C74108 80242C88 8E420070 */ lw $v0, 0x70($s2) -/* C7410C 80242C8C 2842001E */ slti $v0, $v0, 0x1e -/* C74110 80242C90 10400009 */ beqz $v0, .L80242CB8 -/* C74114 80242C94 00000000 */ nop -/* C74118 80242C98 8E22006C */ lw $v0, 0x6c($s1) -/* C7411C 80242C9C 14400006 */ bnez $v0, .L80242CB8 -/* C74120 80242CA0 00000000 */ nop -/* C74124 80242CA4 0C0909D1 */ jal func_80242744 -/* C74128 80242CA8 0240202D */ daddu $a0, $s2, $zero -/* C7412C 80242CAC 10400002 */ beqz $v0, .L80242CB8 -/* C74130 80242CB0 2402001E */ addiu $v0, $zero, 0x1e -/* C74134 80242CB4 AE420070 */ sw $v0, 0x70($s2) -.L80242CB8: -/* C74138 80242CB8 8E430070 */ lw $v1, 0x70($s2) -/* C7413C 80242CBC 2C620064 */ sltiu $v0, $v1, 0x64 -/* C74140 80242CC0 10400048 */ beqz $v0, .L80242DE4 -/* C74144 80242CC4 00031080 */ sll $v0, $v1, 2 -/* C74148 80242CC8 3C018024 */ lui $at, 0x8024 -/* C7414C 80242CCC 00220821 */ addu $at, $at, $v0 -/* C74150 80242CD0 8C2256A0 */ lw $v0, 0x56a0($at) -/* C74154 80242CD4 00400008 */ jr $v0 -/* C74158 80242CD8 00000000 */ nop -/* C7415C 80242CDC 0240202D */ daddu $a0, $s2, $zero -/* C74160 80242CE0 0260282D */ daddu $a1, $s3, $zero -/* C74164 80242CE4 0C012568 */ jal func_800495A0 -/* C74168 80242CE8 0280302D */ daddu $a2, $s4, $zero -/* C7416C 80242CEC 0240202D */ daddu $a0, $s2, $zero -/* C74170 80242CF0 0260282D */ daddu $a1, $s3, $zero -/* C74174 80242CF4 0C0125AE */ jal func_800496B8 -/* C74178 80242CF8 0280302D */ daddu $a2, $s4, $zero -/* C7417C 80242CFC 08090B79 */ j .L80242DE4 -/* C74180 80242D00 00000000 */ nop -/* C74184 80242D04 0240202D */ daddu $a0, $s2, $zero -/* C74188 80242D08 0260282D */ daddu $a1, $s3, $zero -/* C7418C 80242D0C 0C0126D1 */ jal func_80049B44 -/* C74190 80242D10 0280302D */ daddu $a2, $s4, $zero -/* C74194 80242D14 0240202D */ daddu $a0, $s2, $zero -/* C74198 80242D18 0260282D */ daddu $a1, $s3, $zero -/* C7419C 80242D1C 0C012701 */ jal func_80049C04 -/* C741A0 80242D20 0280302D */ daddu $a2, $s4, $zero -/* C741A4 80242D24 08090B79 */ j .L80242DE4 -/* C741A8 80242D28 00000000 */ nop -/* C741AC 80242D2C 0240202D */ daddu $a0, $s2, $zero -/* C741B0 80242D30 0260282D */ daddu $a1, $s3, $zero -/* C741B4 80242D34 0C01278F */ jal func_80049E3C -/* C741B8 80242D38 0280302D */ daddu $a2, $s4, $zero -/* C741BC 80242D3C 0240202D */ daddu $a0, $s2, $zero -/* C741C0 80242D40 0260282D */ daddu $a1, $s3, $zero -/* C741C4 80242D44 0C0127B3 */ jal func_80049ECC -/* C741C8 80242D48 0280302D */ daddu $a2, $s4, $zero -/* C741CC 80242D4C 08090B79 */ j .L80242DE4 -/* C741D0 80242D50 00000000 */ nop -/* C741D4 80242D54 0240202D */ daddu $a0, $s2, $zero -/* C741D8 80242D58 0260282D */ daddu $a1, $s3, $zero -/* C741DC 80242D5C 0C0127DF */ jal func_80049F7C -/* C741E0 80242D60 0280302D */ daddu $a2, $s4, $zero -/* C741E4 80242D64 0240202D */ daddu $a0, $s2, $zero -/* C741E8 80242D68 0260282D */ daddu $a1, $s3, $zero -/* C741EC 80242D6C 0C012849 */ jal func_8004A124 -/* C741F0 80242D70 0280302D */ daddu $a2, $s4, $zero -/* C741F4 80242D74 08090B79 */ j .L80242DE4 -/* C741F8 80242D78 00000000 */ nop -/* C741FC 80242D7C 0240202D */ daddu $a0, $s2, $zero -/* C74200 80242D80 0260282D */ daddu $a1, $s3, $zero -/* C74204 80242D84 0C0128FA */ jal func_8004A3E8 -/* C74208 80242D88 0280302D */ daddu $a2, $s4, $zero -/* C7420C 80242D8C 08090B79 */ j .L80242DE4 -/* C74210 80242D90 00000000 */ nop -/* C74214 80242D94 0C09094F */ jal func_8024253C -/* C74218 80242D98 0240202D */ daddu $a0, $s2, $zero -/* C7421C 80242D9C 0C09096A */ jal func_802425A8 -/* C74220 80242DA0 0240202D */ daddu $a0, $s2, $zero -/* C74224 80242DA4 8E430070 */ lw $v1, 0x70($s2) -/* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 -/* C7422C 80242DAC 1462000D */ bne $v1, $v0, .L80242DE4 -/* C74230 80242DB0 00000000 */ nop -/* C74234 80242DB4 0C090986 */ jal func_80242618 -/* C74238 80242DB8 0240202D */ daddu $a0, $s2, $zero -/* C7423C 80242DBC 8E430070 */ lw $v1, 0x70($s2) -/* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 -/* C74244 80242DC4 14620007 */ bne $v1, $v0, .L80242DE4 -/* C74248 80242DC8 00000000 */ nop -/* C7424C 80242DCC 0C0909BC */ jal func_802426F0 -/* C74250 80242DD0 0240202D */ daddu $a0, $s2, $zero -/* C74254 80242DD4 08090B79 */ j .L80242DE4 -/* C74258 80242DD8 00000000 */ nop -/* C7425C 80242DDC 0C0129CF */ jal func_8004A73C -/* C74260 80242DE0 0240202D */ daddu $a0, $s2, $zero -.L80242DE4: -/* C74264 80242DE4 8FBF0048 */ lw $ra, 0x48($sp) -/* C74268 80242DE8 8FB50044 */ lw $s5, 0x44($sp) -/* C7426C 80242DEC 8FB40040 */ lw $s4, 0x40($sp) -/* C74270 80242DF0 8FB3003C */ lw $s3, 0x3c($sp) -/* C74274 80242DF4 8FB20038 */ lw $s2, 0x38($sp) -/* C74278 80242DF8 8FB10034 */ lw $s1, 0x34($sp) -/* C7427C 80242DFC 8FB00030 */ lw $s0, 0x30($sp) -/* C74280 80242E00 0000102D */ daddu $v0, $zero, $zero -/* C74284 80242E04 03E00008 */ jr $ra -/* C74288 80242E08 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s new file mode 100644 index 0000000000..2668f3505f --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242B58_C73FD8.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B58_C73FD8 +/* C73FD8 80242B58 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C73FDC 80242B5C AFB20038 */ sw $s2, 0x38($sp) +/* C73FE0 80242B60 0080902D */ daddu $s2, $a0, $zero +/* C73FE4 80242B64 AFBF0048 */ sw $ra, 0x48($sp) +/* C73FE8 80242B68 AFB50044 */ sw $s5, 0x44($sp) +/* C73FEC 80242B6C AFB40040 */ sw $s4, 0x40($sp) +/* C73FF0 80242B70 AFB3003C */ sw $s3, 0x3c($sp) +/* C73FF4 80242B74 AFB10034 */ sw $s1, 0x34($sp) +/* C73FF8 80242B78 AFB00030 */ sw $s0, 0x30($sp) +/* C73FFC 80242B7C 8E510148 */ lw $s1, 0x148($s2) +/* C74000 80242B80 86240008 */ lh $a0, 8($s1) +/* C74004 80242B84 0C00EABB */ jal get_npc_unsafe +/* C74008 80242B88 00A0802D */ daddu $s0, $a1, $zero +/* C7400C 80242B8C 8E43000C */ lw $v1, 0xc($s2) +/* C74010 80242B90 0240202D */ daddu $a0, $s2, $zero +/* C74014 80242B94 8C650000 */ lw $a1, ($v1) +/* C74018 80242B98 0C0B1EAF */ jal get_variable +/* C7401C 80242B9C 0040A82D */ daddu $s5, $v0, $zero +/* C74020 80242BA0 AFA00010 */ sw $zero, 0x10($sp) +/* C74024 80242BA4 8E2300D0 */ lw $v1, 0xd0($s1) +/* C74028 80242BA8 8C630030 */ lw $v1, 0x30($v1) +/* C7402C 80242BAC AFA30014 */ sw $v1, 0x14($sp) +/* C74030 80242BB0 8E2300D0 */ lw $v1, 0xd0($s1) +/* C74034 80242BB4 8C63001C */ lw $v1, 0x1c($v1) +/* C74038 80242BB8 AFA30018 */ sw $v1, 0x18($sp) +/* C7403C 80242BBC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C74040 80242BC0 8C630024 */ lw $v1, 0x24($v1) +/* C74044 80242BC4 AFA3001C */ sw $v1, 0x1c($sp) +/* C74048 80242BC8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C7404C 80242BCC 8C630028 */ lw $v1, 0x28($v1) +/* C74050 80242BD0 27B40010 */ addiu $s4, $sp, 0x10 +/* C74054 80242BD4 AFA30020 */ sw $v1, 0x20($sp) +/* C74058 80242BD8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C7405C 80242BDC 3C014282 */ lui $at, 0x4282 +/* C74060 80242BE0 44810000 */ mtc1 $at, $f0 +/* C74064 80242BE4 8C63002C */ lw $v1, 0x2c($v1) +/* C74068 80242BE8 0040982D */ daddu $s3, $v0, $zero +/* C7406C 80242BEC E7A00028 */ swc1 $f0, 0x28($sp) +/* C74070 80242BF0 A7A0002C */ sh $zero, 0x2c($sp) +/* C74074 80242BF4 16000005 */ bnez $s0, .L80242C0C +/* C74078 80242BF8 AFA30024 */ sw $v1, 0x24($sp) +/* C7407C 80242BFC 8E2200B0 */ lw $v0, 0xb0($s1) +/* C74080 80242C00 30420004 */ andi $v0, $v0, 4 +/* C74084 80242C04 10400020 */ beqz $v0, .L80242C88 +/* C74088 80242C08 00000000 */ nop +.L80242C0C: +/* C7408C 80242C0C 2404F7FF */ addiu $a0, $zero, -0x801 +/* C74090 80242C10 AE400070 */ sw $zero, 0x70($s2) +/* C74094 80242C14 A6A0008E */ sh $zero, 0x8e($s5) +/* C74098 80242C18 8E2200CC */ lw $v0, 0xcc($s1) +/* C7409C 80242C1C 8EA30000 */ lw $v1, ($s5) +/* C740A0 80242C20 8C420000 */ lw $v0, ($v0) +/* C740A4 80242C24 00641824 */ and $v1, $v1, $a0 +/* C740A8 80242C28 AEA30000 */ sw $v1, ($s5) +/* C740AC 80242C2C AEA20028 */ sw $v0, 0x28($s5) +/* C740B0 80242C30 8E2200D0 */ lw $v0, 0xd0($s1) +/* C740B4 80242C34 8C420034 */ lw $v0, 0x34($v0) +/* C740B8 80242C38 54400005 */ bnel $v0, $zero, .L80242C50 +/* C740BC 80242C3C 2402FDFF */ addiu $v0, $zero, -0x201 +/* C740C0 80242C40 34620200 */ ori $v0, $v1, 0x200 +/* C740C4 80242C44 2403FFF7 */ addiu $v1, $zero, -9 +/* C740C8 80242C48 08090B16 */ j .L80242C58 +/* C740CC 80242C4C 00431024 */ and $v0, $v0, $v1 +.L80242C50: +/* C740D0 80242C50 00621024 */ and $v0, $v1, $v0 +/* C740D4 80242C54 34420008 */ ori $v0, $v0, 8 +.L80242C58: +/* C740D8 80242C58 AEA20000 */ sw $v0, ($s5) +/* C740DC 80242C5C 8E2200B0 */ lw $v0, 0xb0($s1) +/* C740E0 80242C60 30420004 */ andi $v0, $v0, 4 +/* C740E4 80242C64 10400007 */ beqz $v0, .L80242C84 +/* C740E8 80242C68 24020063 */ addiu $v0, $zero, 0x63 +/* C740EC 80242C6C AE420070 */ sw $v0, 0x70($s2) +/* C740F0 80242C70 AE400074 */ sw $zero, 0x74($s2) +/* C740F4 80242C74 8E2200B0 */ lw $v0, 0xb0($s1) +/* C740F8 80242C78 2403FFFB */ addiu $v1, $zero, -5 +/* C740FC 80242C7C 00431024 */ and $v0, $v0, $v1 +/* C74100 80242C80 AE2200B0 */ sw $v0, 0xb0($s1) +.L80242C84: +/* C74104 80242C84 AE20006C */ sw $zero, 0x6c($s1) +.L80242C88: +/* C74108 80242C88 8E420070 */ lw $v0, 0x70($s2) +/* C7410C 80242C8C 2842001E */ slti $v0, $v0, 0x1e +/* C74110 80242C90 10400009 */ beqz $v0, .L80242CB8 +/* C74114 80242C94 00000000 */ nop +/* C74118 80242C98 8E22006C */ lw $v0, 0x6c($s1) +/* C7411C 80242C9C 14400006 */ bnez $v0, .L80242CB8 +/* C74120 80242CA0 00000000 */ nop +/* C74124 80242CA4 0C0909D1 */ jal func_80242744_C73BC4 +/* C74128 80242CA8 0240202D */ daddu $a0, $s2, $zero +/* C7412C 80242CAC 10400002 */ beqz $v0, .L80242CB8 +/* C74130 80242CB0 2402001E */ addiu $v0, $zero, 0x1e +/* C74134 80242CB4 AE420070 */ sw $v0, 0x70($s2) +.L80242CB8: +/* C74138 80242CB8 8E430070 */ lw $v1, 0x70($s2) +/* C7413C 80242CBC 2C620064 */ sltiu $v0, $v1, 0x64 +/* C74140 80242CC0 10400048 */ beqz $v0, .L80242DE4 +/* C74144 80242CC4 00031080 */ sll $v0, $v1, 2 +/* C74148 80242CC8 3C018024 */ lui $at, 0x8024 +/* C7414C 80242CCC 00220821 */ addu $at, $at, $v0 +/* C74150 80242CD0 8C2256A0 */ lw $v0, 0x56a0($at) +/* C74154 80242CD4 00400008 */ jr $v0 +/* C74158 80242CD8 00000000 */ nop +/* C7415C 80242CDC 0240202D */ daddu $a0, $s2, $zero +/* C74160 80242CE0 0260282D */ daddu $a1, $s3, $zero +/* C74164 80242CE4 0C012568 */ jal func_800495A0 +/* C74168 80242CE8 0280302D */ daddu $a2, $s4, $zero +/* C7416C 80242CEC 0240202D */ daddu $a0, $s2, $zero +/* C74170 80242CF0 0260282D */ daddu $a1, $s3, $zero +/* C74174 80242CF4 0C0125AE */ jal func_800496B8 +/* C74178 80242CF8 0280302D */ daddu $a2, $s4, $zero +/* C7417C 80242CFC 08090B79 */ j .L80242DE4 +/* C74180 80242D00 00000000 */ nop +/* C74184 80242D04 0240202D */ daddu $a0, $s2, $zero +/* C74188 80242D08 0260282D */ daddu $a1, $s3, $zero +/* C7418C 80242D0C 0C0126D1 */ jal func_80049B44 +/* C74190 80242D10 0280302D */ daddu $a2, $s4, $zero +/* C74194 80242D14 0240202D */ daddu $a0, $s2, $zero +/* C74198 80242D18 0260282D */ daddu $a1, $s3, $zero +/* C7419C 80242D1C 0C012701 */ jal func_80049C04 +/* C741A0 80242D20 0280302D */ daddu $a2, $s4, $zero +/* C741A4 80242D24 08090B79 */ j .L80242DE4 +/* C741A8 80242D28 00000000 */ nop +/* C741AC 80242D2C 0240202D */ daddu $a0, $s2, $zero +/* C741B0 80242D30 0260282D */ daddu $a1, $s3, $zero +/* C741B4 80242D34 0C01278F */ jal func_80049E3C +/* C741B8 80242D38 0280302D */ daddu $a2, $s4, $zero +/* C741BC 80242D3C 0240202D */ daddu $a0, $s2, $zero +/* C741C0 80242D40 0260282D */ daddu $a1, $s3, $zero +/* C741C4 80242D44 0C0127B3 */ jal func_80049ECC +/* C741C8 80242D48 0280302D */ daddu $a2, $s4, $zero +/* C741CC 80242D4C 08090B79 */ j .L80242DE4 +/* C741D0 80242D50 00000000 */ nop +/* C741D4 80242D54 0240202D */ daddu $a0, $s2, $zero +/* C741D8 80242D58 0260282D */ daddu $a1, $s3, $zero +/* C741DC 80242D5C 0C0127DF */ jal func_80049F7C +/* C741E0 80242D60 0280302D */ daddu $a2, $s4, $zero +/* C741E4 80242D64 0240202D */ daddu $a0, $s2, $zero +/* C741E8 80242D68 0260282D */ daddu $a1, $s3, $zero +/* C741EC 80242D6C 0C012849 */ jal func_8004A124 +/* C741F0 80242D70 0280302D */ daddu $a2, $s4, $zero +/* C741F4 80242D74 08090B79 */ j .L80242DE4 +/* C741F8 80242D78 00000000 */ nop +/* C741FC 80242D7C 0240202D */ daddu $a0, $s2, $zero +/* C74200 80242D80 0260282D */ daddu $a1, $s3, $zero +/* C74204 80242D84 0C0128FA */ jal func_8004A3E8 +/* C74208 80242D88 0280302D */ daddu $a2, $s4, $zero +/* C7420C 80242D8C 08090B79 */ j .L80242DE4 +/* C74210 80242D90 00000000 */ nop +/* C74214 80242D94 0C09094F */ jal func_8024253C_C739BC +/* C74218 80242D98 0240202D */ daddu $a0, $s2, $zero +/* C7421C 80242D9C 0C09096A */ jal func_802425A8_C73A28 +/* C74220 80242DA0 0240202D */ daddu $a0, $s2, $zero +/* C74224 80242DA4 8E430070 */ lw $v1, 0x70($s2) +/* C74228 80242DA8 24020020 */ addiu $v0, $zero, 0x20 +/* C7422C 80242DAC 1462000D */ bne $v1, $v0, .L80242DE4 +/* C74230 80242DB0 00000000 */ nop +/* C74234 80242DB4 0C090986 */ jal func_80242618_C73A98 +/* C74238 80242DB8 0240202D */ daddu $a0, $s2, $zero +/* C7423C 80242DBC 8E430070 */ lw $v1, 0x70($s2) +/* C74240 80242DC0 24020021 */ addiu $v0, $zero, 0x21 +/* C74244 80242DC4 14620007 */ bne $v1, $v0, .L80242DE4 +/* C74248 80242DC8 00000000 */ nop +/* C7424C 80242DCC 0C0909BC */ jal func_802426F0_C73B70 +/* C74250 80242DD0 0240202D */ daddu $a0, $s2, $zero +/* C74254 80242DD4 08090B79 */ j .L80242DE4 +/* C74258 80242DD8 00000000 */ nop +/* C7425C 80242DDC 0C0129CF */ jal func_8004A73C +/* C74260 80242DE0 0240202D */ daddu $a0, $s2, $zero +.L80242DE4: +/* C74264 80242DE4 8FBF0048 */ lw $ra, 0x48($sp) +/* C74268 80242DE8 8FB50044 */ lw $s5, 0x44($sp) +/* C7426C 80242DEC 8FB40040 */ lw $s4, 0x40($sp) +/* C74270 80242DF0 8FB3003C */ lw $s3, 0x3c($sp) +/* C74274 80242DF4 8FB20038 */ lw $s2, 0x38($sp) +/* C74278 80242DF8 8FB10034 */ lw $s1, 0x34($sp) +/* C7427C 80242DFC 8FB00030 */ lw $s0, 0x30($sp) +/* C74280 80242E00 0000102D */ daddu $v0, $zero, $zero +/* C74284 80242E04 03E00008 */ jr $ra +/* C74288 80242E08 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E0C.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E0C.s deleted file mode 100644 index 60260e8640..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E0C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E0C -/* C7428C 80242E0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C74290 80242E10 AFB10014 */ sw $s1, 0x14($sp) -/* C74294 80242E14 0080882D */ daddu $s1, $a0, $zero -/* C74298 80242E18 AFBF0018 */ sw $ra, 0x18($sp) -/* C7429C 80242E1C AFB00010 */ sw $s0, 0x10($sp) -/* C742A0 80242E20 8E300148 */ lw $s0, 0x148($s1) -/* C742A4 80242E24 0C00EABB */ jal get_npc_unsafe -/* C742A8 80242E28 86040008 */ lh $a0, 8($s0) -/* C742AC 80242E2C 0040202D */ daddu $a0, $v0, $zero -/* C742B0 80242E30 8482008E */ lh $v0, 0x8e($a0) -/* C742B4 80242E34 9483008E */ lhu $v1, 0x8e($a0) -/* C742B8 80242E38 18400003 */ blez $v0, .L80242E48 -/* C742BC 80242E3C 2462FFFF */ addiu $v0, $v1, -1 -/* C742C0 80242E40 08090B99 */ j .L80242E64 -/* C742C4 80242E44 A482008E */ sh $v0, 0x8e($a0) -.L80242E48: -/* C742C8 80242E48 8E0200CC */ lw $v0, 0xcc($s0) -/* C742CC 80242E4C AE00006C */ sw $zero, 0x6c($s0) -/* C742D0 80242E50 8C420000 */ lw $v0, ($v0) -/* C742D4 80242E54 AC820028 */ sw $v0, 0x28($a0) -/* C742D8 80242E58 24020001 */ addiu $v0, $zero, 1 -/* C742DC 80242E5C AE200074 */ sw $zero, 0x74($s1) -/* C742E0 80242E60 AE220070 */ sw $v0, 0x70($s1) -.L80242E64: -/* C742E4 80242E64 8FBF0018 */ lw $ra, 0x18($sp) -/* C742E8 80242E68 8FB10014 */ lw $s1, 0x14($sp) -/* C742EC 80242E6C 8FB00010 */ lw $s0, 0x10($sp) -/* C742F0 80242E70 03E00008 */ jr $ra -/* C742F4 80242E74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E0C_C7428C.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E0C_C7428C.s new file mode 100644 index 0000000000..ec8b82350c --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80242E0C_C7428C.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E0C_C7428C +/* C7428C 80242E0C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C74290 80242E10 AFB10014 */ sw $s1, 0x14($sp) +/* C74294 80242E14 0080882D */ daddu $s1, $a0, $zero +/* C74298 80242E18 AFBF0018 */ sw $ra, 0x18($sp) +/* C7429C 80242E1C AFB00010 */ sw $s0, 0x10($sp) +/* C742A0 80242E20 8E300148 */ lw $s0, 0x148($s1) +/* C742A4 80242E24 0C00EABB */ jal get_npc_unsafe +/* C742A8 80242E28 86040008 */ lh $a0, 8($s0) +/* C742AC 80242E2C 0040202D */ daddu $a0, $v0, $zero +/* C742B0 80242E30 8482008E */ lh $v0, 0x8e($a0) +/* C742B4 80242E34 9483008E */ lhu $v1, 0x8e($a0) +/* C742B8 80242E38 18400003 */ blez $v0, .L80242E48 +/* C742BC 80242E3C 2462FFFF */ addiu $v0, $v1, -1 +/* C742C0 80242E40 08090B99 */ j .L80242E64 +/* C742C4 80242E44 A482008E */ sh $v0, 0x8e($a0) +.L80242E48: +/* C742C8 80242E48 8E0200CC */ lw $v0, 0xcc($s0) +/* C742CC 80242E4C AE00006C */ sw $zero, 0x6c($s0) +/* C742D0 80242E50 8C420000 */ lw $v0, ($v0) +/* C742D4 80242E54 AC820028 */ sw $v0, 0x28($a0) +/* C742D8 80242E58 24020001 */ addiu $v0, $zero, 1 +/* C742DC 80242E5C AE200074 */ sw $zero, 0x74($s1) +/* C742E0 80242E60 AE220070 */ sw $v0, 0x70($s1) +.L80242E64: +/* C742E4 80242E64 8FBF0018 */ lw $ra, 0x18($sp) +/* C742E8 80242E68 8FB10014 */ lw $s1, 0x14($sp) +/* C742EC 80242E6C 8FB00010 */ lw $s0, 0x10($sp) +/* C742F0 80242E70 03E00008 */ jr $ra +/* C742F4 80242E74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4.s deleted file mode 100644 index d3e08361ed..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802439B4 -/* C74E34 802439B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C74E38 802439B8 AFB10014 */ sw $s1, 0x14($sp) -/* C74E3C 802439BC 0080882D */ daddu $s1, $a0, $zero -/* C74E40 802439C0 AFBF0018 */ sw $ra, 0x18($sp) -/* C74E44 802439C4 AFB00010 */ sw $s0, 0x10($sp) -/* C74E48 802439C8 8E300148 */ lw $s0, 0x148($s1) -/* C74E4C 802439CC 0C00EABB */ jal get_npc_unsafe -/* C74E50 802439D0 86040008 */ lh $a0, 8($s0) -/* C74E54 802439D4 0040202D */ daddu $a0, $v0, $zero -/* C74E58 802439D8 9482008E */ lhu $v0, 0x8e($a0) -/* C74E5C 802439DC 2442FFFF */ addiu $v0, $v0, -1 -/* C74E60 802439E0 A482008E */ sh $v0, 0x8e($a0) -/* C74E64 802439E4 00021400 */ sll $v0, $v0, 0x10 -/* C74E68 802439E8 8E030098 */ lw $v1, 0x98($s0) -/* C74E6C 802439EC 00021403 */ sra $v0, $v0, 0x10 -/* C74E70 802439F0 0062182A */ slt $v1, $v1, $v0 -/* C74E74 802439F4 14600005 */ bnez $v1, .L80243A0C -/* C74E78 802439F8 3C03E0EF */ lui $v1, 0xe0ef -/* C74E7C 802439FC 8E020000 */ lw $v0, ($s0) -/* C74E80 80243A00 3463FFFF */ ori $v1, $v1, 0xffff -/* C74E84 80243A04 00431024 */ and $v0, $v0, $v1 -/* C74E88 80243A08 AE020000 */ sw $v0, ($s0) -.L80243A0C: -/* C74E8C 80243A0C 8482008E */ lh $v0, 0x8e($a0) -/* C74E90 80243A10 14400007 */ bnez $v0, .L80243A30 -/* C74E94 80243A14 00000000 */ nop -/* C74E98 80243A18 8E0200CC */ lw $v0, 0xcc($s0) -/* C74E9C 80243A1C 8C420028 */ lw $v0, 0x28($v0) -/* C74EA0 80243A20 A480008E */ sh $zero, 0x8e($a0) -/* C74EA4 80243A24 AC820028 */ sw $v0, 0x28($a0) -/* C74EA8 80243A28 2402000C */ addiu $v0, $zero, 0xc -/* C74EAC 80243A2C AE220070 */ sw $v0, 0x70($s1) -.L80243A30: -/* C74EB0 80243A30 8FBF0018 */ lw $ra, 0x18($sp) -/* C74EB4 80243A34 8FB10014 */ lw $s1, 0x14($sp) -/* C74EB8 80243A38 8FB00010 */ lw $s0, 0x10($sp) -/* C74EBC 80243A3C 03E00008 */ jr $ra -/* C74EC0 80243A40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s new file mode 100644 index 0000000000..23dacd313e --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_802439B4_C74E34.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802439B4_C74E34 +/* C74E34 802439B4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C74E38 802439B8 AFB10014 */ sw $s1, 0x14($sp) +/* C74E3C 802439BC 0080882D */ daddu $s1, $a0, $zero +/* C74E40 802439C0 AFBF0018 */ sw $ra, 0x18($sp) +/* C74E44 802439C4 AFB00010 */ sw $s0, 0x10($sp) +/* C74E48 802439C8 8E300148 */ lw $s0, 0x148($s1) +/* C74E4C 802439CC 0C00EABB */ jal get_npc_unsafe +/* C74E50 802439D0 86040008 */ lh $a0, 8($s0) +/* C74E54 802439D4 0040202D */ daddu $a0, $v0, $zero +/* C74E58 802439D8 9482008E */ lhu $v0, 0x8e($a0) +/* C74E5C 802439DC 2442FFFF */ addiu $v0, $v0, -1 +/* C74E60 802439E0 A482008E */ sh $v0, 0x8e($a0) +/* C74E64 802439E4 00021400 */ sll $v0, $v0, 0x10 +/* C74E68 802439E8 8E030098 */ lw $v1, 0x98($s0) +/* C74E6C 802439EC 00021403 */ sra $v0, $v0, 0x10 +/* C74E70 802439F0 0062182A */ slt $v1, $v1, $v0 +/* C74E74 802439F4 14600005 */ bnez $v1, .L80243A0C +/* C74E78 802439F8 3C03E0EF */ lui $v1, 0xe0ef +/* C74E7C 802439FC 8E020000 */ lw $v0, ($s0) +/* C74E80 80243A00 3463FFFF */ ori $v1, $v1, 0xffff +/* C74E84 80243A04 00431024 */ and $v0, $v0, $v1 +/* C74E88 80243A08 AE020000 */ sw $v0, ($s0) +.L80243A0C: +/* C74E8C 80243A0C 8482008E */ lh $v0, 0x8e($a0) +/* C74E90 80243A10 14400007 */ bnez $v0, .L80243A30 +/* C74E94 80243A14 00000000 */ nop +/* C74E98 80243A18 8E0200CC */ lw $v0, 0xcc($s0) +/* C74E9C 80243A1C 8C420028 */ lw $v0, 0x28($v0) +/* C74EA0 80243A20 A480008E */ sh $zero, 0x8e($a0) +/* C74EA4 80243A24 AC820028 */ sw $v0, 0x28($a0) +/* C74EA8 80243A28 2402000C */ addiu $v0, $zero, 0xc +/* C74EAC 80243A2C AE220070 */ sw $v0, 0x70($s1) +.L80243A30: +/* C74EB0 80243A30 8FBF0018 */ lw $ra, 0x18($sp) +/* C74EB4 80243A34 8FB10014 */ lw $s1, 0x14($sp) +/* C74EB8 80243A38 8FB00010 */ lw $s0, 0x10($sp) +/* C74EBC 80243A3C 03E00008 */ jr $ra +/* C74EC0 80243A40 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44.s deleted file mode 100644 index 9751dbbb8f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243A44 -/* C74EC4 80243A44 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C74EC8 80243A48 AFB10034 */ sw $s1, 0x34($sp) -/* C74ECC 80243A4C 0080882D */ daddu $s1, $a0, $zero -/* C74ED0 80243A50 AFBF0038 */ sw $ra, 0x38($sp) -/* C74ED4 80243A54 AFB00030 */ sw $s0, 0x30($sp) -/* C74ED8 80243A58 8E300148 */ lw $s0, 0x148($s1) -/* C74EDC 80243A5C 0C00EABB */ jal get_npc_unsafe -/* C74EE0 80243A60 86040008 */ lh $a0, 8($s0) -/* C74EE4 80243A64 0040282D */ daddu $a1, $v0, $zero -/* C74EE8 80243A68 94A2008E */ lhu $v0, 0x8e($a1) -/* C74EEC 80243A6C 24420001 */ addiu $v0, $v0, 1 -/* C74EF0 80243A70 A4A2008E */ sh $v0, 0x8e($a1) -/* C74EF4 80243A74 00021400 */ sll $v0, $v0, 0x10 -/* C74EF8 80243A78 8E0300A0 */ lw $v1, 0xa0($s0) -/* C74EFC 80243A7C 00021403 */ sra $v0, $v0, 0x10 -/* C74F00 80243A80 14430004 */ bne $v0, $v1, .L80243A94 -/* C74F04 80243A84 00000000 */ nop -/* C74F08 80243A88 8E0200CC */ lw $v0, 0xcc($s0) -/* C74F0C 80243A8C 8C42002C */ lw $v0, 0x2c($v0) -/* C74F10 80243A90 ACA20028 */ sw $v0, 0x28($a1) -.L80243A94: -/* C74F14 80243A94 84A3008E */ lh $v1, 0x8e($a1) -/* C74F18 80243A98 8E0200A4 */ lw $v0, 0xa4($s0) -/* C74F1C 80243A9C 14620002 */ bne $v1, $v0, .L80243AA8 -/* C74F20 80243AA0 24020003 */ addiu $v0, $zero, 3 -/* C74F24 80243AA4 AE02006C */ sw $v0, 0x6c($s0) -.L80243AA8: -/* C74F28 80243AA8 84A2008E */ lh $v0, 0x8e($a1) -/* C74F2C 80243AAC 8E03009C */ lw $v1, 0x9c($s0) -/* C74F30 80243AB0 0043102A */ slt $v0, $v0, $v1 -/* C74F34 80243AB4 1440001E */ bnez $v0, .L80243B30 -/* C74F38 80243AB8 24020004 */ addiu $v0, $zero, 4 -/* C74F3C 80243ABC AE02006C */ sw $v0, 0x6c($s0) -/* C74F40 80243AC0 24020008 */ addiu $v0, $zero, 8 -/* C74F44 80243AC4 24040003 */ addiu $a0, $zero, 3 -/* C74F48 80243AC8 A4A2008E */ sh $v0, 0x8e($a1) -/* C74F4C 80243ACC 8E0200CC */ lw $v0, 0xcc($s0) -/* C74F50 80243AD0 84A300A8 */ lh $v1, 0xa8($a1) -/* C74F54 80243AD4 3C013F80 */ lui $at, 0x3f80 -/* C74F58 80243AD8 44810000 */ mtc1 $at, $f0 -/* C74F5C 80243ADC 3C014000 */ lui $at, 0x4000 -/* C74F60 80243AE0 44811000 */ mtc1 $at, $f2 -/* C74F64 80243AE4 3C01C1A0 */ lui $at, 0xc1a0 -/* C74F68 80243AE8 44812000 */ mtc1 $at, $f4 -/* C74F6C 80243AEC 44833000 */ mtc1 $v1, $f6 -/* C74F70 80243AF0 00000000 */ nop -/* C74F74 80243AF4 468031A0 */ cvt.s.w $f6, $f6 -/* C74F78 80243AF8 8C420000 */ lw $v0, ($v0) -/* C74F7C 80243AFC 44073000 */ mfc1 $a3, $f6 -/* C74F80 80243B00 0000302D */ daddu $a2, $zero, $zero -/* C74F84 80243B04 ACA20028 */ sw $v0, 0x28($a1) -/* C74F88 80243B08 2402000A */ addiu $v0, $zero, 0xa -/* C74F8C 80243B0C AFA2001C */ sw $v0, 0x1c($sp) -/* C74F90 80243B10 27A20028 */ addiu $v0, $sp, 0x28 -/* C74F94 80243B14 E7A00010 */ swc1 $f0, 0x10($sp) -/* C74F98 80243B18 E7A20014 */ swc1 $f2, 0x14($sp) -/* C74F9C 80243B1C E7A40018 */ swc1 $f4, 0x18($sp) -/* C74FA0 80243B20 0C01BFA4 */ jal fx_emote -/* C74FA4 80243B24 AFA20020 */ sw $v0, 0x20($sp) -/* C74FA8 80243B28 2402000D */ addiu $v0, $zero, 0xd -/* C74FAC 80243B2C AE220070 */ sw $v0, 0x70($s1) -.L80243B30: -/* C74FB0 80243B30 8FBF0038 */ lw $ra, 0x38($sp) -/* C74FB4 80243B34 8FB10034 */ lw $s1, 0x34($sp) -/* C74FB8 80243B38 8FB00030 */ lw $s0, 0x30($sp) -/* C74FBC 80243B3C 03E00008 */ jr $ra -/* C74FC0 80243B40 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s new file mode 100644 index 0000000000..3fbda8c828 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243A44_C74EC4.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243A44_C74EC4 +/* C74EC4 80243A44 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* C74EC8 80243A48 AFB10034 */ sw $s1, 0x34($sp) +/* C74ECC 80243A4C 0080882D */ daddu $s1, $a0, $zero +/* C74ED0 80243A50 AFBF0038 */ sw $ra, 0x38($sp) +/* C74ED4 80243A54 AFB00030 */ sw $s0, 0x30($sp) +/* C74ED8 80243A58 8E300148 */ lw $s0, 0x148($s1) +/* C74EDC 80243A5C 0C00EABB */ jal get_npc_unsafe +/* C74EE0 80243A60 86040008 */ lh $a0, 8($s0) +/* C74EE4 80243A64 0040282D */ daddu $a1, $v0, $zero +/* C74EE8 80243A68 94A2008E */ lhu $v0, 0x8e($a1) +/* C74EEC 80243A6C 24420001 */ addiu $v0, $v0, 1 +/* C74EF0 80243A70 A4A2008E */ sh $v0, 0x8e($a1) +/* C74EF4 80243A74 00021400 */ sll $v0, $v0, 0x10 +/* C74EF8 80243A78 8E0300A0 */ lw $v1, 0xa0($s0) +/* C74EFC 80243A7C 00021403 */ sra $v0, $v0, 0x10 +/* C74F00 80243A80 14430004 */ bne $v0, $v1, .L80243A94 +/* C74F04 80243A84 00000000 */ nop +/* C74F08 80243A88 8E0200CC */ lw $v0, 0xcc($s0) +/* C74F0C 80243A8C 8C42002C */ lw $v0, 0x2c($v0) +/* C74F10 80243A90 ACA20028 */ sw $v0, 0x28($a1) +.L80243A94: +/* C74F14 80243A94 84A3008E */ lh $v1, 0x8e($a1) +/* C74F18 80243A98 8E0200A4 */ lw $v0, 0xa4($s0) +/* C74F1C 80243A9C 14620002 */ bne $v1, $v0, .L80243AA8 +/* C74F20 80243AA0 24020003 */ addiu $v0, $zero, 3 +/* C74F24 80243AA4 AE02006C */ sw $v0, 0x6c($s0) +.L80243AA8: +/* C74F28 80243AA8 84A2008E */ lh $v0, 0x8e($a1) +/* C74F2C 80243AAC 8E03009C */ lw $v1, 0x9c($s0) +/* C74F30 80243AB0 0043102A */ slt $v0, $v0, $v1 +/* C74F34 80243AB4 1440001E */ bnez $v0, .L80243B30 +/* C74F38 80243AB8 24020004 */ addiu $v0, $zero, 4 +/* C74F3C 80243ABC AE02006C */ sw $v0, 0x6c($s0) +/* C74F40 80243AC0 24020008 */ addiu $v0, $zero, 8 +/* C74F44 80243AC4 24040003 */ addiu $a0, $zero, 3 +/* C74F48 80243AC8 A4A2008E */ sh $v0, 0x8e($a1) +/* C74F4C 80243ACC 8E0200CC */ lw $v0, 0xcc($s0) +/* C74F50 80243AD0 84A300A8 */ lh $v1, 0xa8($a1) +/* C74F54 80243AD4 3C013F80 */ lui $at, 0x3f80 +/* C74F58 80243AD8 44810000 */ mtc1 $at, $f0 +/* C74F5C 80243ADC 3C014000 */ lui $at, 0x4000 +/* C74F60 80243AE0 44811000 */ mtc1 $at, $f2 +/* C74F64 80243AE4 3C01C1A0 */ lui $at, 0xc1a0 +/* C74F68 80243AE8 44812000 */ mtc1 $at, $f4 +/* C74F6C 80243AEC 44833000 */ mtc1 $v1, $f6 +/* C74F70 80243AF0 00000000 */ nop +/* C74F74 80243AF4 468031A0 */ cvt.s.w $f6, $f6 +/* C74F78 80243AF8 8C420000 */ lw $v0, ($v0) +/* C74F7C 80243AFC 44073000 */ mfc1 $a3, $f6 +/* C74F80 80243B00 0000302D */ daddu $a2, $zero, $zero +/* C74F84 80243B04 ACA20028 */ sw $v0, 0x28($a1) +/* C74F88 80243B08 2402000A */ addiu $v0, $zero, 0xa +/* C74F8C 80243B0C AFA2001C */ sw $v0, 0x1c($sp) +/* C74F90 80243B10 27A20028 */ addiu $v0, $sp, 0x28 +/* C74F94 80243B14 E7A00010 */ swc1 $f0, 0x10($sp) +/* C74F98 80243B18 E7A20014 */ swc1 $f2, 0x14($sp) +/* C74F9C 80243B1C E7A40018 */ swc1 $f4, 0x18($sp) +/* C74FA0 80243B20 0C01BFA4 */ jal fx_emote +/* C74FA4 80243B24 AFA20020 */ sw $v0, 0x20($sp) +/* C74FA8 80243B28 2402000D */ addiu $v0, $zero, 0xd +/* C74FAC 80243B2C AE220070 */ sw $v0, 0x70($s1) +.L80243B30: +/* C74FB0 80243B30 8FBF0038 */ lw $ra, 0x38($sp) +/* C74FB4 80243B34 8FB10034 */ lw $s1, 0x34($sp) +/* C74FB8 80243B38 8FB00030 */ lw $s0, 0x30($sp) +/* C74FBC 80243B3C 03E00008 */ jr $ra +/* C74FC0 80243B40 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44.s deleted file mode 100644 index a24dc10fa2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243B44 -/* C74FC4 80243B44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C74FC8 80243B48 AFB10014 */ sw $s1, 0x14($sp) -/* C74FCC 80243B4C 0080882D */ daddu $s1, $a0, $zero -/* C74FD0 80243B50 AFBF0018 */ sw $ra, 0x18($sp) -/* C74FD4 80243B54 AFB00010 */ sw $s0, 0x10($sp) -/* C74FD8 80243B58 8E300148 */ lw $s0, 0x148($s1) -/* C74FDC 80243B5C 0C00EABB */ jal get_npc_unsafe -/* C74FE0 80243B60 86040008 */ lh $a0, 8($s0) -/* C74FE4 80243B64 0040182D */ daddu $v1, $v0, $zero -/* C74FE8 80243B68 9462008E */ lhu $v0, 0x8e($v1) -/* C74FEC 80243B6C 2442FFFF */ addiu $v0, $v0, -1 -/* C74FF0 80243B70 A462008E */ sh $v0, 0x8e($v1) -/* C74FF4 80243B74 00021400 */ sll $v0, $v0, 0x10 -/* C74FF8 80243B78 14400005 */ bnez $v0, .L80243B90 -/* C74FFC 80243B7C 00000000 */ nop -/* C75000 80243B80 960200AA */ lhu $v0, 0xaa($s0) -/* C75004 80243B84 A462008E */ sh $v0, 0x8e($v1) -/* C75008 80243B88 2402000E */ addiu $v0, $zero, 0xe -/* C7500C 80243B8C AE220070 */ sw $v0, 0x70($s1) -.L80243B90: -/* C75010 80243B90 8FBF0018 */ lw $ra, 0x18($sp) -/* C75014 80243B94 8FB10014 */ lw $s1, 0x14($sp) -/* C75018 80243B98 8FB00010 */ lw $s0, 0x10($sp) -/* C7501C 80243B9C 03E00008 */ jr $ra -/* C75020 80243BA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s new file mode 100644 index 0000000000..479209c8a6 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243B44_C74FC4.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243B44_C74FC4 +/* C74FC4 80243B44 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C74FC8 80243B48 AFB10014 */ sw $s1, 0x14($sp) +/* C74FCC 80243B4C 0080882D */ daddu $s1, $a0, $zero +/* C74FD0 80243B50 AFBF0018 */ sw $ra, 0x18($sp) +/* C74FD4 80243B54 AFB00010 */ sw $s0, 0x10($sp) +/* C74FD8 80243B58 8E300148 */ lw $s0, 0x148($s1) +/* C74FDC 80243B5C 0C00EABB */ jal get_npc_unsafe +/* C74FE0 80243B60 86040008 */ lh $a0, 8($s0) +/* C74FE4 80243B64 0040182D */ daddu $v1, $v0, $zero +/* C74FE8 80243B68 9462008E */ lhu $v0, 0x8e($v1) +/* C74FEC 80243B6C 2442FFFF */ addiu $v0, $v0, -1 +/* C74FF0 80243B70 A462008E */ sh $v0, 0x8e($v1) +/* C74FF4 80243B74 00021400 */ sll $v0, $v0, 0x10 +/* C74FF8 80243B78 14400005 */ bnez $v0, .L80243B90 +/* C74FFC 80243B7C 00000000 */ nop +/* C75000 80243B80 960200AA */ lhu $v0, 0xaa($s0) +/* C75004 80243B84 A462008E */ sh $v0, 0x8e($v1) +/* C75008 80243B88 2402000E */ addiu $v0, $zero, 0xe +/* C7500C 80243B8C AE220070 */ sw $v0, 0x70($s1) +.L80243B90: +/* C75010 80243B90 8FBF0018 */ lw $ra, 0x18($sp) +/* C75014 80243B94 8FB10014 */ lw $s1, 0x14($sp) +/* C75018 80243B98 8FB00010 */ lw $s0, 0x10($sp) +/* C7501C 80243B9C 03E00008 */ jr $ra +/* C75020 80243BA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90.s deleted file mode 100644 index c7b16aae9d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243C90 -/* C75110 80243C90 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C75114 80243C94 AFB20038 */ sw $s2, 0x38($sp) -/* C75118 80243C98 0080902D */ daddu $s2, $a0, $zero -/* C7511C 80243C9C AFBF0048 */ sw $ra, 0x48($sp) -/* C75120 80243CA0 AFB50044 */ sw $s5, 0x44($sp) -/* C75124 80243CA4 AFB40040 */ sw $s4, 0x40($sp) -/* C75128 80243CA8 AFB3003C */ sw $s3, 0x3c($sp) -/* C7512C 80243CAC AFB10034 */ sw $s1, 0x34($sp) -/* C75130 80243CB0 AFB00030 */ sw $s0, 0x30($sp) -/* C75134 80243CB4 8E510148 */ lw $s1, 0x148($s2) -/* C75138 80243CB8 86240008 */ lh $a0, 8($s1) -/* C7513C 80243CBC 0C00EABB */ jal get_npc_unsafe -/* C75140 80243CC0 00A0802D */ daddu $s0, $a1, $zero -/* C75144 80243CC4 8E43000C */ lw $v1, 0xc($s2) -/* C75148 80243CC8 0240202D */ daddu $a0, $s2, $zero -/* C7514C 80243CCC 8C650000 */ lw $a1, ($v1) -/* C75150 80243CD0 0C0B1EAF */ jal get_variable -/* C75154 80243CD4 0040A82D */ daddu $s5, $v0, $zero -/* C75158 80243CD8 AFA00010 */ sw $zero, 0x10($sp) -/* C7515C 80243CDC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C75160 80243CE0 8C630030 */ lw $v1, 0x30($v1) -/* C75164 80243CE4 AFA30014 */ sw $v1, 0x14($sp) -/* C75168 80243CE8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C7516C 80243CEC 8C63001C */ lw $v1, 0x1c($v1) -/* C75170 80243CF0 AFA30018 */ sw $v1, 0x18($sp) -/* C75174 80243CF4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C75178 80243CF8 8C630024 */ lw $v1, 0x24($v1) -/* C7517C 80243CFC AFA3001C */ sw $v1, 0x1c($sp) -/* C75180 80243D00 8E2300D0 */ lw $v1, 0xd0($s1) -/* C75184 80243D04 8C630028 */ lw $v1, 0x28($v1) -/* C75188 80243D08 27B40010 */ addiu $s4, $sp, 0x10 -/* C7518C 80243D0C AFA30020 */ sw $v1, 0x20($sp) -/* C75190 80243D10 8E2300D0 */ lw $v1, 0xd0($s1) -/* C75194 80243D14 3C014348 */ lui $at, 0x4348 -/* C75198 80243D18 44810000 */ mtc1 $at, $f0 -/* C7519C 80243D1C 8C63002C */ lw $v1, 0x2c($v1) -/* C751A0 80243D20 0040982D */ daddu $s3, $v0, $zero -/* C751A4 80243D24 E7A00028 */ swc1 $f0, 0x28($sp) -/* C751A8 80243D28 A7A0002C */ sh $zero, 0x2c($sp) -/* C751AC 80243D2C 16000005 */ bnez $s0, .L80243D44 -/* C751B0 80243D30 AFA30024 */ sw $v1, 0x24($sp) -/* C751B4 80243D34 8E2200B0 */ lw $v0, 0xb0($s1) -/* C751B8 80243D38 30420004 */ andi $v0, $v0, 4 -/* C751BC 80243D3C 10400011 */ beqz $v0, .L80243D84 -/* C751C0 80243D40 00000000 */ nop -.L80243D44: -/* C751C4 80243D44 AE400070 */ sw $zero, 0x70($s2) -/* C751C8 80243D48 A6A0008E */ sh $zero, 0x8e($s5) -/* C751CC 80243D4C 8E2200CC */ lw $v0, 0xcc($s1) -/* C751D0 80243D50 8C420000 */ lw $v0, ($v0) -/* C751D4 80243D54 AEA20028 */ sw $v0, 0x28($s5) -/* C751D8 80243D58 8E2200B0 */ lw $v0, 0xb0($s1) -/* C751DC 80243D5C 30420004 */ andi $v0, $v0, 4 -/* C751E0 80243D60 10400008 */ beqz $v0, .L80243D84 -/* C751E4 80243D64 AE20006C */ sw $zero, 0x6c($s1) -/* C751E8 80243D68 24020063 */ addiu $v0, $zero, 0x63 -/* C751EC 80243D6C AE420070 */ sw $v0, 0x70($s2) -/* C751F0 80243D70 AE400074 */ sw $zero, 0x74($s2) -/* C751F4 80243D74 8E2200B0 */ lw $v0, 0xb0($s1) -/* C751F8 80243D78 2403FFFB */ addiu $v1, $zero, -5 -/* C751FC 80243D7C 00431024 */ and $v0, $v0, $v1 -/* C75200 80243D80 AE2200B0 */ sw $v0, 0xb0($s1) -.L80243D84: -/* C75204 80243D84 8E430070 */ lw $v1, 0x70($s2) -/* C75208 80243D88 2410000B */ addiu $s0, $zero, 0xb -/* C7520C 80243D8C 1070002A */ beq $v1, $s0, .L80243E38 -/* C75210 80243D90 2862000C */ slti $v0, $v1, 0xc -/* C75214 80243D94 1040000D */ beqz $v0, .L80243DCC -/* C75218 80243D98 24020001 */ addiu $v0, $zero, 1 -/* C7521C 80243D9C 1062001A */ beq $v1, $v0, .L80243E08 -/* C75220 80243DA0 28620002 */ slti $v0, $v1, 2 -/* C75224 80243DA4 10400005 */ beqz $v0, .L80243DBC -/* C75228 80243DA8 2402000A */ addiu $v0, $zero, 0xa -/* C7522C 80243DAC 10600013 */ beqz $v1, .L80243DFC -/* C75230 80243DB0 0240202D */ daddu $a0, $s2, $zero -/* C75234 80243DB4 08090FAE */ j .L80243EB8 -/* C75238 80243DB8 00000000 */ nop -.L80243DBC: -/* C7523C 80243DBC 10620018 */ beq $v1, $v0, .L80243E20 -/* C75240 80243DC0 0240202D */ daddu $a0, $s2, $zero -/* C75244 80243DC4 08090FAE */ j .L80243EB8 -/* C75248 80243DC8 00000000 */ nop -.L80243DCC: -/* C7524C 80243DCC 2402000D */ addiu $v0, $zero, 0xd -/* C75250 80243DD0 10620029 */ beq $v1, $v0, .L80243E78 -/* C75254 80243DD4 0062102A */ slt $v0, $v1, $v0 -/* C75258 80243DD8 14400020 */ bnez $v0, .L80243E5C -/* C7525C 80243DDC 0240202D */ daddu $a0, $s2, $zero -/* C75260 80243DE0 2402000E */ addiu $v0, $zero, 0xe -/* C75264 80243DE4 1062002D */ beq $v1, $v0, .L80243E9C -/* C75268 80243DE8 24020063 */ addiu $v0, $zero, 0x63 -/* C7526C 80243DEC 10620030 */ beq $v1, $v0, .L80243EB0 -/* C75270 80243DF0 00000000 */ nop -/* C75274 80243DF4 08090FAE */ j .L80243EB8 -/* C75278 80243DF8 00000000 */ nop -.L80243DFC: -/* C7527C 80243DFC 0260282D */ daddu $a1, $s3, $zero -/* C75280 80243E00 0C090B83 */ jal func_80242E0C -/* C75284 80243E04 0280302D */ daddu $a2, $s4, $zero -.L80243E08: -/* C75288 80243E08 0240202D */ daddu $a0, $s2, $zero -/* C7528C 80243E0C 0260282D */ daddu $a1, $s3, $zero -/* C75290 80243E10 0C090B9E */ jal func_80242E78 -/* C75294 80243E14 0280302D */ daddu $a2, $s4, $zero -/* C75298 80243E18 08090FAE */ j .L80243EB8 -/* C7529C 80243E1C 00000000 */ nop -.L80243E20: -/* C752A0 80243E20 0260282D */ daddu $a1, $s3, $zero -/* C752A4 80243E24 0C090BDD */ jal func_80242F74 -/* C752A8 80243E28 0280302D */ daddu $a2, $s4, $zero -/* C752AC 80243E2C 8E420070 */ lw $v0, 0x70($s2) -/* C752B0 80243E30 14500021 */ bne $v0, $s0, .L80243EB8 -/* C752B4 80243E34 00000000 */ nop -.L80243E38: -/* C752B8 80243E38 0240202D */ daddu $a0, $s2, $zero -/* C752BC 80243E3C 0260282D */ daddu $a1, $s3, $zero -/* C752C0 80243E40 0C090E6D */ jal func_802439B4 -/* C752C4 80243E44 0280302D */ daddu $a2, $s4, $zero -/* C752C8 80243E48 8E430070 */ lw $v1, 0x70($s2) -/* C752CC 80243E4C 2402000C */ addiu $v0, $zero, 0xc -/* C752D0 80243E50 14620019 */ bne $v1, $v0, .L80243EB8 -/* C752D4 80243E54 00000000 */ nop -/* C752D8 80243E58 0240202D */ daddu $a0, $s2, $zero -.L80243E5C: -/* C752DC 80243E5C 0260282D */ daddu $a1, $s3, $zero -/* C752E0 80243E60 0C090E91 */ jal func_80243A44 -/* C752E4 80243E64 0280302D */ daddu $a2, $s4, $zero -/* C752E8 80243E68 8E430070 */ lw $v1, 0x70($s2) -/* C752EC 80243E6C 2402000D */ addiu $v0, $zero, 0xd -/* C752F0 80243E70 14620011 */ bne $v1, $v0, .L80243EB8 -/* C752F4 80243E74 00000000 */ nop -.L80243E78: -/* C752F8 80243E78 0240202D */ daddu $a0, $s2, $zero -/* C752FC 80243E7C 0260282D */ daddu $a1, $s3, $zero -/* C75300 80243E80 0C090ED1 */ jal func_80243B44 -/* C75304 80243E84 0280302D */ daddu $a2, $s4, $zero -/* C75308 80243E88 8E430070 */ lw $v1, 0x70($s2) -/* C7530C 80243E8C 2402000E */ addiu $v0, $zero, 0xe -/* C75310 80243E90 14620009 */ bne $v1, $v0, .L80243EB8 -/* C75314 80243E94 00000000 */ nop -/* C75318 80243E98 0240202D */ daddu $a0, $s2, $zero -.L80243E9C: -/* C7531C 80243E9C 0260282D */ daddu $a1, $s3, $zero -/* C75320 80243EA0 0C090EE9 */ jal func_80243BA4 -/* C75324 80243EA4 0280302D */ daddu $a2, $s4, $zero -/* C75328 80243EA8 08090FAE */ j .L80243EB8 -/* C7532C 80243EAC 00000000 */ nop -.L80243EB0: -/* C75330 80243EB0 0C0129CF */ jal func_8004A73C -/* C75334 80243EB4 0240202D */ daddu $a0, $s2, $zero -.L80243EB8: -/* C75338 80243EB8 8FBF0048 */ lw $ra, 0x48($sp) -/* C7533C 80243EBC 8FB50044 */ lw $s5, 0x44($sp) -/* C75340 80243EC0 8FB40040 */ lw $s4, 0x40($sp) -/* C75344 80243EC4 8FB3003C */ lw $s3, 0x3c($sp) -/* C75348 80243EC8 8FB20038 */ lw $s2, 0x38($sp) -/* C7534C 80243ECC 8FB10034 */ lw $s1, 0x34($sp) -/* C75350 80243ED0 8FB00030 */ lw $s0, 0x30($sp) -/* C75354 80243ED4 0000102D */ daddu $v0, $zero, $zero -/* C75358 80243ED8 03E00008 */ jr $ra -/* C7535C 80243EDC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s new file mode 100644 index 0000000000..17a97fc750 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243C90_C75110.s @@ -0,0 +1,165 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243C90_C75110 +/* C75110 80243C90 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C75114 80243C94 AFB20038 */ sw $s2, 0x38($sp) +/* C75118 80243C98 0080902D */ daddu $s2, $a0, $zero +/* C7511C 80243C9C AFBF0048 */ sw $ra, 0x48($sp) +/* C75120 80243CA0 AFB50044 */ sw $s5, 0x44($sp) +/* C75124 80243CA4 AFB40040 */ sw $s4, 0x40($sp) +/* C75128 80243CA8 AFB3003C */ sw $s3, 0x3c($sp) +/* C7512C 80243CAC AFB10034 */ sw $s1, 0x34($sp) +/* C75130 80243CB0 AFB00030 */ sw $s0, 0x30($sp) +/* C75134 80243CB4 8E510148 */ lw $s1, 0x148($s2) +/* C75138 80243CB8 86240008 */ lh $a0, 8($s1) +/* C7513C 80243CBC 0C00EABB */ jal get_npc_unsafe +/* C75140 80243CC0 00A0802D */ daddu $s0, $a1, $zero +/* C75144 80243CC4 8E43000C */ lw $v1, 0xc($s2) +/* C75148 80243CC8 0240202D */ daddu $a0, $s2, $zero +/* C7514C 80243CCC 8C650000 */ lw $a1, ($v1) +/* C75150 80243CD0 0C0B1EAF */ jal get_variable +/* C75154 80243CD4 0040A82D */ daddu $s5, $v0, $zero +/* C75158 80243CD8 AFA00010 */ sw $zero, 0x10($sp) +/* C7515C 80243CDC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C75160 80243CE0 8C630030 */ lw $v1, 0x30($v1) +/* C75164 80243CE4 AFA30014 */ sw $v1, 0x14($sp) +/* C75168 80243CE8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C7516C 80243CEC 8C63001C */ lw $v1, 0x1c($v1) +/* C75170 80243CF0 AFA30018 */ sw $v1, 0x18($sp) +/* C75174 80243CF4 8E2300D0 */ lw $v1, 0xd0($s1) +/* C75178 80243CF8 8C630024 */ lw $v1, 0x24($v1) +/* C7517C 80243CFC AFA3001C */ sw $v1, 0x1c($sp) +/* C75180 80243D00 8E2300D0 */ lw $v1, 0xd0($s1) +/* C75184 80243D04 8C630028 */ lw $v1, 0x28($v1) +/* C75188 80243D08 27B40010 */ addiu $s4, $sp, 0x10 +/* C7518C 80243D0C AFA30020 */ sw $v1, 0x20($sp) +/* C75190 80243D10 8E2300D0 */ lw $v1, 0xd0($s1) +/* C75194 80243D14 3C014348 */ lui $at, 0x4348 +/* C75198 80243D18 44810000 */ mtc1 $at, $f0 +/* C7519C 80243D1C 8C63002C */ lw $v1, 0x2c($v1) +/* C751A0 80243D20 0040982D */ daddu $s3, $v0, $zero +/* C751A4 80243D24 E7A00028 */ swc1 $f0, 0x28($sp) +/* C751A8 80243D28 A7A0002C */ sh $zero, 0x2c($sp) +/* C751AC 80243D2C 16000005 */ bnez $s0, .L80243D44 +/* C751B0 80243D30 AFA30024 */ sw $v1, 0x24($sp) +/* C751B4 80243D34 8E2200B0 */ lw $v0, 0xb0($s1) +/* C751B8 80243D38 30420004 */ andi $v0, $v0, 4 +/* C751BC 80243D3C 10400011 */ beqz $v0, .L80243D84 +/* C751C0 80243D40 00000000 */ nop +.L80243D44: +/* C751C4 80243D44 AE400070 */ sw $zero, 0x70($s2) +/* C751C8 80243D48 A6A0008E */ sh $zero, 0x8e($s5) +/* C751CC 80243D4C 8E2200CC */ lw $v0, 0xcc($s1) +/* C751D0 80243D50 8C420000 */ lw $v0, ($v0) +/* C751D4 80243D54 AEA20028 */ sw $v0, 0x28($s5) +/* C751D8 80243D58 8E2200B0 */ lw $v0, 0xb0($s1) +/* C751DC 80243D5C 30420004 */ andi $v0, $v0, 4 +/* C751E0 80243D60 10400008 */ beqz $v0, .L80243D84 +/* C751E4 80243D64 AE20006C */ sw $zero, 0x6c($s1) +/* C751E8 80243D68 24020063 */ addiu $v0, $zero, 0x63 +/* C751EC 80243D6C AE420070 */ sw $v0, 0x70($s2) +/* C751F0 80243D70 AE400074 */ sw $zero, 0x74($s2) +/* C751F4 80243D74 8E2200B0 */ lw $v0, 0xb0($s1) +/* C751F8 80243D78 2403FFFB */ addiu $v1, $zero, -5 +/* C751FC 80243D7C 00431024 */ and $v0, $v0, $v1 +/* C75200 80243D80 AE2200B0 */ sw $v0, 0xb0($s1) +.L80243D84: +/* C75204 80243D84 8E430070 */ lw $v1, 0x70($s2) +/* C75208 80243D88 2410000B */ addiu $s0, $zero, 0xb +/* C7520C 80243D8C 1070002A */ beq $v1, $s0, .L80243E38 +/* C75210 80243D90 2862000C */ slti $v0, $v1, 0xc +/* C75214 80243D94 1040000D */ beqz $v0, .L80243DCC +/* C75218 80243D98 24020001 */ addiu $v0, $zero, 1 +/* C7521C 80243D9C 1062001A */ beq $v1, $v0, .L80243E08 +/* C75220 80243DA0 28620002 */ slti $v0, $v1, 2 +/* C75224 80243DA4 10400005 */ beqz $v0, .L80243DBC +/* C75228 80243DA8 2402000A */ addiu $v0, $zero, 0xa +/* C7522C 80243DAC 10600013 */ beqz $v1, .L80243DFC +/* C75230 80243DB0 0240202D */ daddu $a0, $s2, $zero +/* C75234 80243DB4 08090FAE */ j .L80243EB8 +/* C75238 80243DB8 00000000 */ nop +.L80243DBC: +/* C7523C 80243DBC 10620018 */ beq $v1, $v0, .L80243E20 +/* C75240 80243DC0 0240202D */ daddu $a0, $s2, $zero +/* C75244 80243DC4 08090FAE */ j .L80243EB8 +/* C75248 80243DC8 00000000 */ nop +.L80243DCC: +/* C7524C 80243DCC 2402000D */ addiu $v0, $zero, 0xd +/* C75250 80243DD0 10620029 */ beq $v1, $v0, .L80243E78 +/* C75254 80243DD4 0062102A */ slt $v0, $v1, $v0 +/* C75258 80243DD8 14400020 */ bnez $v0, .L80243E5C +/* C7525C 80243DDC 0240202D */ daddu $a0, $s2, $zero +/* C75260 80243DE0 2402000E */ addiu $v0, $zero, 0xe +/* C75264 80243DE4 1062002D */ beq $v1, $v0, .L80243E9C +/* C75268 80243DE8 24020063 */ addiu $v0, $zero, 0x63 +/* C7526C 80243DEC 10620030 */ beq $v1, $v0, .L80243EB0 +/* C75270 80243DF0 00000000 */ nop +/* C75274 80243DF4 08090FAE */ j .L80243EB8 +/* C75278 80243DF8 00000000 */ nop +.L80243DFC: +/* C7527C 80243DFC 0260282D */ daddu $a1, $s3, $zero +/* C75280 80243E00 0C090B83 */ jal func_80242E0C_C7428C +/* C75284 80243E04 0280302D */ daddu $a2, $s4, $zero +.L80243E08: +/* C75288 80243E08 0240202D */ daddu $a0, $s2, $zero +/* C7528C 80243E0C 0260282D */ daddu $a1, $s3, $zero +/* C75290 80243E10 0C090B9E */ jal func_80242E78_C742F8 +/* C75294 80243E14 0280302D */ daddu $a2, $s4, $zero +/* C75298 80243E18 08090FAE */ j .L80243EB8 +/* C7529C 80243E1C 00000000 */ nop +.L80243E20: +/* C752A0 80243E20 0260282D */ daddu $a1, $s3, $zero +/* C752A4 80243E24 0C090BDD */ jal func_80242F74_C743F4 +/* C752A8 80243E28 0280302D */ daddu $a2, $s4, $zero +/* C752AC 80243E2C 8E420070 */ lw $v0, 0x70($s2) +/* C752B0 80243E30 14500021 */ bne $v0, $s0, .L80243EB8 +/* C752B4 80243E34 00000000 */ nop +.L80243E38: +/* C752B8 80243E38 0240202D */ daddu $a0, $s2, $zero +/* C752BC 80243E3C 0260282D */ daddu $a1, $s3, $zero +/* C752C0 80243E40 0C090E6D */ jal func_802439B4_C74E34 +/* C752C4 80243E44 0280302D */ daddu $a2, $s4, $zero +/* C752C8 80243E48 8E430070 */ lw $v1, 0x70($s2) +/* C752CC 80243E4C 2402000C */ addiu $v0, $zero, 0xc +/* C752D0 80243E50 14620019 */ bne $v1, $v0, .L80243EB8 +/* C752D4 80243E54 00000000 */ nop +/* C752D8 80243E58 0240202D */ daddu $a0, $s2, $zero +.L80243E5C: +/* C752DC 80243E5C 0260282D */ daddu $a1, $s3, $zero +/* C752E0 80243E60 0C090E91 */ jal func_80243A44_C74EC4 +/* C752E4 80243E64 0280302D */ daddu $a2, $s4, $zero +/* C752E8 80243E68 8E430070 */ lw $v1, 0x70($s2) +/* C752EC 80243E6C 2402000D */ addiu $v0, $zero, 0xd +/* C752F0 80243E70 14620011 */ bne $v1, $v0, .L80243EB8 +/* C752F4 80243E74 00000000 */ nop +.L80243E78: +/* C752F8 80243E78 0240202D */ daddu $a0, $s2, $zero +/* C752FC 80243E7C 0260282D */ daddu $a1, $s3, $zero +/* C75300 80243E80 0C090ED1 */ jal func_80243B44_C74FC4 +/* C75304 80243E84 0280302D */ daddu $a2, $s4, $zero +/* C75308 80243E88 8E430070 */ lw $v1, 0x70($s2) +/* C7530C 80243E8C 2402000E */ addiu $v0, $zero, 0xe +/* C75310 80243E90 14620009 */ bne $v1, $v0, .L80243EB8 +/* C75314 80243E94 00000000 */ nop +/* C75318 80243E98 0240202D */ daddu $a0, $s2, $zero +.L80243E9C: +/* C7531C 80243E9C 0260282D */ daddu $a1, $s3, $zero +/* C75320 80243EA0 0C090EE9 */ jal func_80243BA4_C75024 +/* C75324 80243EA4 0280302D */ daddu $a2, $s4, $zero +/* C75328 80243EA8 08090FAE */ j .L80243EB8 +/* C7532C 80243EAC 00000000 */ nop +.L80243EB0: +/* C75330 80243EB0 0C0129CF */ jal func_8004A73C +/* C75334 80243EB4 0240202D */ daddu $a0, $s2, $zero +.L80243EB8: +/* C75338 80243EB8 8FBF0048 */ lw $ra, 0x48($sp) +/* C7533C 80243EBC 8FB50044 */ lw $s5, 0x44($sp) +/* C75340 80243EC0 8FB40040 */ lw $s4, 0x40($sp) +/* C75344 80243EC4 8FB3003C */ lw $s3, 0x3c($sp) +/* C75348 80243EC8 8FB20038 */ lw $s2, 0x38($sp) +/* C7534C 80243ECC 8FB10034 */ lw $s1, 0x34($sp) +/* C75350 80243ED0 8FB00030 */ lw $s0, 0x30($sp) +/* C75354 80243ED4 0000102D */ daddu $v0, $zero, $zero +/* C75358 80243ED8 03E00008 */ jr $ra +/* C7535C 80243EDC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0.s deleted file mode 100644 index 5fe6e67925..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0.s +++ /dev/null @@ -1,158 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243EE0 -/* C75360 80243EE0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C75364 80243EE4 AFB00038 */ sw $s0, 0x38($sp) -/* C75368 80243EE8 0080802D */ daddu $s0, $a0, $zero -/* C7536C 80243EEC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* C75370 80243EF0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* C75374 80243EF4 AFB1003C */ sw $s1, 0x3c($sp) -/* C75378 80243EF8 3C118011 */ lui $s1, %hi(gPlayerData) -/* C7537C 80243EFC 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* C75380 80243F00 AFB20040 */ sw $s2, 0x40($sp) -/* C75384 80243F04 AFBF0044 */ sw $ra, 0x44($sp) -/* C75388 80243F08 F7B60050 */ sdc1 $f22, 0x50($sp) -/* C7538C 80243F0C F7B40048 */ sdc1 $f20, 0x48($sp) -/* C75390 80243F10 10A00004 */ beqz $a1, .L80243F24 -/* C75394 80243F14 0220902D */ daddu $s2, $s1, $zero -/* C75398 80243F18 240200FF */ addiu $v0, $zero, 0xff -/* C7539C 80243F1C AE020070 */ sw $v0, 0x70($s0) -/* C753A0 80243F20 AE000074 */ sw $zero, 0x74($s0) -.L80243F24: -/* C753A4 80243F24 24040001 */ addiu $a0, $zero, 1 -/* C753A8 80243F28 C460002C */ lwc1 $f0, 0x2c($v1) -/* C753AC 80243F2C 3C014100 */ lui $at, 0x4100 -/* C753B0 80243F30 44811000 */ mtc1 $at, $f2 -/* C753B4 80243F34 00000000 */ nop -/* C753B8 80243F38 46020000 */ add.s $f0, $f0, $f2 -/* C753BC 80243F3C C4620030 */ lwc1 $f2, 0x30($v1) -/* C753C0 80243F40 C4640028 */ lwc1 $f4, 0x28($v1) -/* C753C4 80243F44 4600118D */ trunc.w.s $f6, $f2 -/* C753C8 80243F48 E7A60010 */ swc1 $f6, 0x10($sp) -/* C753CC 80243F4C 4600218D */ trunc.w.s $f6, $f4 -/* C753D0 80243F50 44063000 */ mfc1 $a2, $f6 -/* C753D4 80243F54 4600018D */ trunc.w.s $f6, $f0 -/* C753D8 80243F58 44073000 */ mfc1 $a3, $f6 -/* C753DC 80243F5C 0C04DFB0 */ jal func_80137EC0 -/* C753E0 80243F60 0080282D */ daddu $a1, $a0, $zero -/* C753E4 80243F64 27A40028 */ addiu $a0, $sp, 0x28 -/* C753E8 80243F68 27A50029 */ addiu $a1, $sp, 0x29 -/* C753EC 80243F6C 27A6002A */ addiu $a2, $sp, 0x2a -/* C753F0 80243F70 27A7002B */ addiu $a3, $sp, 0x2b -/* C753F4 80243F74 27A2002C */ addiu $v0, $sp, 0x2c -/* C753F8 80243F78 AFA20010 */ sw $v0, 0x10($sp) -/* C753FC 80243F7C 27A2002D */ addiu $v0, $sp, 0x2d -/* C75400 80243F80 AFA20014 */ sw $v0, 0x14($sp) -/* C75404 80243F84 27A2002E */ addiu $v0, $sp, 0x2e -/* C75408 80243F88 AFA20018 */ sw $v0, 0x18($sp) -/* C7540C 80243F8C 27A20030 */ addiu $v0, $sp, 0x30 -/* C75410 80243F90 AFA2001C */ sw $v0, 0x1c($sp) -/* C75414 80243F94 27A20034 */ addiu $v0, $sp, 0x34 -/* C75418 80243F98 0C046FC5 */ jal func_8011BF14 -/* C7541C 80243F9C AFA20020 */ sw $v0, 0x20($sp) -/* C75420 80243FA0 240203E3 */ addiu $v0, $zero, 0x3e3 -/* C75424 80243FA4 8FA30030 */ lw $v1, 0x30($sp) -/* C75428 80243FA8 3C01428C */ lui $at, 0x428c -/* C7542C 80243FAC 44811000 */ mtc1 $at, $f2 -/* C75430 80243FB0 00431023 */ subu $v0, $v0, $v1 -/* C75434 80243FB4 44820000 */ mtc1 $v0, $f0 -/* C75438 80243FB8 00000000 */ nop -/* C7543C 80243FBC 46800020 */ cvt.s.w $f0, $f0 -/* C75440 80243FC0 46020001 */ sub.s $f0, $f0, $f2 -/* C75444 80243FC4 3C01437F */ lui $at, 0x437f -/* C75448 80243FC8 44812000 */ mtc1 $at, $f4 -/* C7544C 80243FCC 00000000 */ nop -/* C75450 80243FD0 46040002 */ mul.s $f0, $f0, $f4 -/* C75454 80243FD4 00000000 */ nop -/* C75458 80243FD8 3C0141F0 */ lui $at, 0x41f0 -/* C7545C 80243FDC 44811000 */ mtc1 $at, $f2 -/* C75460 80243FE0 00000000 */ nop -/* C75464 80243FE4 46020583 */ div.s $f22, $f0, $f2 -/* C75468 80243FE8 4616203C */ c.lt.s $f4, $f22 -/* C7546C 80243FEC 00000000 */ nop -/* C75470 80243FF0 45030001 */ bc1tl .L80243FF8 -/* C75474 80243FF4 46002586 */ mov.s $f22, $f4 -.L80243FF8: -/* C75478 80243FF8 4480A000 */ mtc1 $zero, $f20 -/* C7547C 80243FFC 00000000 */ nop -/* C75480 80244000 4614B03C */ c.lt.s $f22, $f20 -/* C75484 80244004 00000000 */ nop -/* C75488 80244008 45030001 */ bc1tl .L80244010 -/* C7548C 8024400C 4600A586 */ mov.s $f22, $f20 -.L80244010: -/* C75490 80244010 4614B032 */ c.eq.s $f22, $f20 -/* C75494 80244014 00000000 */ nop -/* C75498 80244018 45000007 */ bc1f .L80244038 -/* C7549C 8024401C 00000000 */ nop -/* C754A0 80244020 4405A000 */ mfc1 $a1, $f20 -/* C754A4 80244024 0C04E035 */ jal func_801380D4 -/* C754A8 80244028 24040001 */ addiu $a0, $zero, 1 -/* C754AC 8024402C 4405A000 */ mfc1 $a1, $f20 -/* C754B0 80244030 0809103C */ j .L802440F0 -/* C754B4 80244034 00000000 */ nop -.L80244038: -/* C754B8 80244038 3C028011 */ lui $v0, %hi(D_8010EBB0) -/* C754BC 8024403C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) -/* C754C0 80244040 10400012 */ beqz $v0, .L8024408C -/* C754C4 80244044 24020006 */ addiu $v0, $zero, 6 -/* C754C8 80244048 82230012 */ lb $v1, 0x12($s1) -/* C754CC 8024404C 14620022 */ bne $v1, $v0, .L802440D8 -/* C754D0 80244050 00000000 */ nop -/* C754D4 80244054 8E020074 */ lw $v0, 0x74($s0) -/* C754D8 80244058 14400004 */ bnez $v0, .L8024406C -/* C754DC 8024405C 24020001 */ addiu $v0, $zero, 1 -/* C754E0 80244060 AE020074 */ sw $v0, 0x74($s0) -/* C754E4 80244064 0C05272D */ jal play_sound -/* C754E8 80244068 24042011 */ addiu $a0, $zero, 0x2011 -.L8024406C: -/* C754EC 8024406C 8E020070 */ lw $v0, 0x70($s0) -/* C754F0 80244070 2442FFF8 */ addiu $v0, $v0, -8 -/* C754F4 80244074 AE020070 */ sw $v0, 0x70($s0) -/* C754F8 80244078 2842005A */ slti $v0, $v0, 0x5a -/* C754FC 8024407C 10400016 */ beqz $v0, .L802440D8 -/* C75500 80244080 2402005A */ addiu $v0, $zero, 0x5a -/* C75504 80244084 08091036 */ j .L802440D8 -/* C75508 80244088 AE020070 */ sw $v0, 0x70($s0) -.L8024408C: -/* C7550C 8024408C 82430012 */ lb $v1, 0x12($s2) -/* C75510 80244090 14620010 */ bne $v1, $v0, .L802440D4 -/* C75514 80244094 240200FF */ addiu $v0, $zero, 0xff -/* C75518 80244098 8E020074 */ lw $v0, 0x74($s0) -/* C7551C 8024409C 10400007 */ beqz $v0, .L802440BC -/* C75520 802440A0 00000000 */ nop -/* C75524 802440A4 8E020070 */ lw $v0, 0x70($s0) -/* C75528 802440A8 284200FF */ slti $v0, $v0, 0xff -/* C7552C 802440AC 10400003 */ beqz $v0, .L802440BC -/* C75530 802440B0 AE000074 */ sw $zero, 0x74($s0) -/* C75534 802440B4 0C05272D */ jal play_sound -/* C75538 802440B8 24042012 */ addiu $a0, $zero, 0x2012 -.L802440BC: -/* C7553C 802440BC 8E020070 */ lw $v0, 0x70($s0) -/* C75540 802440C0 24420008 */ addiu $v0, $v0, 8 -/* C75544 802440C4 AE020070 */ sw $v0, 0x70($s0) -/* C75548 802440C8 284200FF */ slti $v0, $v0, 0xff -/* C7554C 802440CC 14400002 */ bnez $v0, .L802440D8 -/* C75550 802440D0 240200FF */ addiu $v0, $zero, 0xff -.L802440D4: -/* C75554 802440D4 AE020070 */ sw $v0, 0x70($s0) -.L802440D8: -/* C75558 802440D8 C6060070 */ lwc1 $f6, 0x70($s0) -/* C7555C 802440DC 468031A0 */ cvt.s.w $f6, $f6 -/* C75560 802440E0 44053000 */ mfc1 $a1, $f6 -/* C75564 802440E4 0C04E035 */ jal func_801380D4 -/* C75568 802440E8 24040001 */ addiu $a0, $zero, 1 -/* C7556C 802440EC 4405B000 */ mfc1 $a1, $f22 -.L802440F0: -/* C75570 802440F0 0C04DF69 */ jal func_80137DA4 -/* C75574 802440F4 2404000B */ addiu $a0, $zero, 0xb -/* C75578 802440F8 0000102D */ daddu $v0, $zero, $zero -/* C7557C 802440FC 8FBF0044 */ lw $ra, 0x44($sp) -/* C75580 80244100 8FB20040 */ lw $s2, 0x40($sp) -/* C75584 80244104 8FB1003C */ lw $s1, 0x3c($sp) -/* C75588 80244108 8FB00038 */ lw $s0, 0x38($sp) -/* C7558C 8024410C D7B60050 */ ldc1 $f22, 0x50($sp) -/* C75590 80244110 D7B40048 */ ldc1 $f20, 0x48($sp) -/* C75594 80244114 03E00008 */ jr $ra -/* C75598 80244118 27BD0058 */ addiu $sp, $sp, 0x58 -/* C7559C 8024411C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s new file mode 100644 index 0000000000..323f7654e8 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_08/C71ED0/func_80243EE0_C75360.s @@ -0,0 +1,158 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243EE0_C75360 +/* C75360 80243EE0 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* C75364 80243EE4 AFB00038 */ sw $s0, 0x38($sp) +/* C75368 80243EE8 0080802D */ daddu $s0, $a0, $zero +/* C7536C 80243EEC 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* C75370 80243EF0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* C75374 80243EF4 AFB1003C */ sw $s1, 0x3c($sp) +/* C75378 80243EF8 3C118011 */ lui $s1, %hi(gPlayerData) +/* C7537C 80243EFC 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) +/* C75380 80243F00 AFB20040 */ sw $s2, 0x40($sp) +/* C75384 80243F04 AFBF0044 */ sw $ra, 0x44($sp) +/* C75388 80243F08 F7B60050 */ sdc1 $f22, 0x50($sp) +/* C7538C 80243F0C F7B40048 */ sdc1 $f20, 0x48($sp) +/* C75390 80243F10 10A00004 */ beqz $a1, .L80243F24 +/* C75394 80243F14 0220902D */ daddu $s2, $s1, $zero +/* C75398 80243F18 240200FF */ addiu $v0, $zero, 0xff +/* C7539C 80243F1C AE020070 */ sw $v0, 0x70($s0) +/* C753A0 80243F20 AE000074 */ sw $zero, 0x74($s0) +.L80243F24: +/* C753A4 80243F24 24040001 */ addiu $a0, $zero, 1 +/* C753A8 80243F28 C460002C */ lwc1 $f0, 0x2c($v1) +/* C753AC 80243F2C 3C014100 */ lui $at, 0x4100 +/* C753B0 80243F30 44811000 */ mtc1 $at, $f2 +/* C753B4 80243F34 00000000 */ nop +/* C753B8 80243F38 46020000 */ add.s $f0, $f0, $f2 +/* C753BC 80243F3C C4620030 */ lwc1 $f2, 0x30($v1) +/* C753C0 80243F40 C4640028 */ lwc1 $f4, 0x28($v1) +/* C753C4 80243F44 4600118D */ trunc.w.s $f6, $f2 +/* C753C8 80243F48 E7A60010 */ swc1 $f6, 0x10($sp) +/* C753CC 80243F4C 4600218D */ trunc.w.s $f6, $f4 +/* C753D0 80243F50 44063000 */ mfc1 $a2, $f6 +/* C753D4 80243F54 4600018D */ trunc.w.s $f6, $f0 +/* C753D8 80243F58 44073000 */ mfc1 $a3, $f6 +/* C753DC 80243F5C 0C04DFB0 */ jal func_80137EC0 +/* C753E0 80243F60 0080282D */ daddu $a1, $a0, $zero +/* C753E4 80243F64 27A40028 */ addiu $a0, $sp, 0x28 +/* C753E8 80243F68 27A50029 */ addiu $a1, $sp, 0x29 +/* C753EC 80243F6C 27A6002A */ addiu $a2, $sp, 0x2a +/* C753F0 80243F70 27A7002B */ addiu $a3, $sp, 0x2b +/* C753F4 80243F74 27A2002C */ addiu $v0, $sp, 0x2c +/* C753F8 80243F78 AFA20010 */ sw $v0, 0x10($sp) +/* C753FC 80243F7C 27A2002D */ addiu $v0, $sp, 0x2d +/* C75400 80243F80 AFA20014 */ sw $v0, 0x14($sp) +/* C75404 80243F84 27A2002E */ addiu $v0, $sp, 0x2e +/* C75408 80243F88 AFA20018 */ sw $v0, 0x18($sp) +/* C7540C 80243F8C 27A20030 */ addiu $v0, $sp, 0x30 +/* C75410 80243F90 AFA2001C */ sw $v0, 0x1c($sp) +/* C75414 80243F94 27A20034 */ addiu $v0, $sp, 0x34 +/* C75418 80243F98 0C046FC5 */ jal func_8011BF14 +/* C7541C 80243F9C AFA20020 */ sw $v0, 0x20($sp) +/* C75420 80243FA0 240203E3 */ addiu $v0, $zero, 0x3e3 +/* C75424 80243FA4 8FA30030 */ lw $v1, 0x30($sp) +/* C75428 80243FA8 3C01428C */ lui $at, 0x428c +/* C7542C 80243FAC 44811000 */ mtc1 $at, $f2 +/* C75430 80243FB0 00431023 */ subu $v0, $v0, $v1 +/* C75434 80243FB4 44820000 */ mtc1 $v0, $f0 +/* C75438 80243FB8 00000000 */ nop +/* C7543C 80243FBC 46800020 */ cvt.s.w $f0, $f0 +/* C75440 80243FC0 46020001 */ sub.s $f0, $f0, $f2 +/* C75444 80243FC4 3C01437F */ lui $at, 0x437f +/* C75448 80243FC8 44812000 */ mtc1 $at, $f4 +/* C7544C 80243FCC 00000000 */ nop +/* C75450 80243FD0 46040002 */ mul.s $f0, $f0, $f4 +/* C75454 80243FD4 00000000 */ nop +/* C75458 80243FD8 3C0141F0 */ lui $at, 0x41f0 +/* C7545C 80243FDC 44811000 */ mtc1 $at, $f2 +/* C75460 80243FE0 00000000 */ nop +/* C75464 80243FE4 46020583 */ div.s $f22, $f0, $f2 +/* C75468 80243FE8 4616203C */ c.lt.s $f4, $f22 +/* C7546C 80243FEC 00000000 */ nop +/* C75470 80243FF0 45030001 */ bc1tl .L80243FF8 +/* C75474 80243FF4 46002586 */ mov.s $f22, $f4 +.L80243FF8: +/* C75478 80243FF8 4480A000 */ mtc1 $zero, $f20 +/* C7547C 80243FFC 00000000 */ nop +/* C75480 80244000 4614B03C */ c.lt.s $f22, $f20 +/* C75484 80244004 00000000 */ nop +/* C75488 80244008 45030001 */ bc1tl .L80244010 +/* C7548C 8024400C 4600A586 */ mov.s $f22, $f20 +.L80244010: +/* C75490 80244010 4614B032 */ c.eq.s $f22, $f20 +/* C75494 80244014 00000000 */ nop +/* C75498 80244018 45000007 */ bc1f .L80244038 +/* C7549C 8024401C 00000000 */ nop +/* C754A0 80244020 4405A000 */ mfc1 $a1, $f20 +/* C754A4 80244024 0C04E035 */ jal func_801380D4 +/* C754A8 80244028 24040001 */ addiu $a0, $zero, 1 +/* C754AC 8024402C 4405A000 */ mfc1 $a1, $f20 +/* C754B0 80244030 0809103C */ j .L802440F0 +/* C754B4 80244034 00000000 */ nop +.L80244038: +/* C754B8 80244038 3C028011 */ lui $v0, %hi(D_8010EBB0) +/* C754BC 8024403C 8042EBB0 */ lb $v0, %lo(D_8010EBB0)($v0) +/* C754C0 80244040 10400012 */ beqz $v0, .L8024408C +/* C754C4 80244044 24020006 */ addiu $v0, $zero, 6 +/* C754C8 80244048 82230012 */ lb $v1, 0x12($s1) +/* C754CC 8024404C 14620022 */ bne $v1, $v0, .L802440D8 +/* C754D0 80244050 00000000 */ nop +/* C754D4 80244054 8E020074 */ lw $v0, 0x74($s0) +/* C754D8 80244058 14400004 */ bnez $v0, .L8024406C +/* C754DC 8024405C 24020001 */ addiu $v0, $zero, 1 +/* C754E0 80244060 AE020074 */ sw $v0, 0x74($s0) +/* C754E4 80244064 0C05272D */ jal play_sound +/* C754E8 80244068 24042011 */ addiu $a0, $zero, 0x2011 +.L8024406C: +/* C754EC 8024406C 8E020070 */ lw $v0, 0x70($s0) +/* C754F0 80244070 2442FFF8 */ addiu $v0, $v0, -8 +/* C754F4 80244074 AE020070 */ sw $v0, 0x70($s0) +/* C754F8 80244078 2842005A */ slti $v0, $v0, 0x5a +/* C754FC 8024407C 10400016 */ beqz $v0, .L802440D8 +/* C75500 80244080 2402005A */ addiu $v0, $zero, 0x5a +/* C75504 80244084 08091036 */ j .L802440D8 +/* C75508 80244088 AE020070 */ sw $v0, 0x70($s0) +.L8024408C: +/* C7550C 8024408C 82430012 */ lb $v1, 0x12($s2) +/* C75510 80244090 14620010 */ bne $v1, $v0, .L802440D4 +/* C75514 80244094 240200FF */ addiu $v0, $zero, 0xff +/* C75518 80244098 8E020074 */ lw $v0, 0x74($s0) +/* C7551C 8024409C 10400007 */ beqz $v0, .L802440BC +/* C75520 802440A0 00000000 */ nop +/* C75524 802440A4 8E020070 */ lw $v0, 0x70($s0) +/* C75528 802440A8 284200FF */ slti $v0, $v0, 0xff +/* C7552C 802440AC 10400003 */ beqz $v0, .L802440BC +/* C75530 802440B0 AE000074 */ sw $zero, 0x74($s0) +/* C75534 802440B4 0C05272D */ jal play_sound +/* C75538 802440B8 24042012 */ addiu $a0, $zero, 0x2012 +.L802440BC: +/* C7553C 802440BC 8E020070 */ lw $v0, 0x70($s0) +/* C75540 802440C0 24420008 */ addiu $v0, $v0, 8 +/* C75544 802440C4 AE020070 */ sw $v0, 0x70($s0) +/* C75548 802440C8 284200FF */ slti $v0, $v0, 0xff +/* C7554C 802440CC 14400002 */ bnez $v0, .L802440D8 +/* C75550 802440D0 240200FF */ addiu $v0, $zero, 0xff +.L802440D4: +/* C75554 802440D4 AE020070 */ sw $v0, 0x70($s0) +.L802440D8: +/* C75558 802440D8 C6060070 */ lwc1 $f6, 0x70($s0) +/* C7555C 802440DC 468031A0 */ cvt.s.w $f6, $f6 +/* C75560 802440E0 44053000 */ mfc1 $a1, $f6 +/* C75564 802440E4 0C04E035 */ jal func_801380D4 +/* C75568 802440E8 24040001 */ addiu $a0, $zero, 1 +/* C7556C 802440EC 4405B000 */ mfc1 $a1, $f22 +.L802440F0: +/* C75570 802440F0 0C04DF69 */ jal func_80137DA4 +/* C75574 802440F4 2404000B */ addiu $a0, $zero, 0xb +/* C75578 802440F8 0000102D */ daddu $v0, $zero, $zero +/* C7557C 802440FC 8FBF0044 */ lw $ra, 0x44($sp) +/* C75580 80244100 8FB20040 */ lw $s2, 0x40($sp) +/* C75584 80244104 8FB1003C */ lw $s1, 0x3c($sp) +/* C75588 80244108 8FB00038 */ lw $s0, 0x38($sp) +/* C7558C 8024410C D7B60050 */ ldc1 $f22, 0x50($sp) +/* C75590 80244110 D7B40048 */ ldc1 $f20, 0x48($sp) +/* C75594 80244114 03E00008 */ jr $ra +/* C75598 80244118 27BD0058 */ addiu $sp, $sp, 0x58 +/* C7559C 8024411C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s index 5ce44e9a5f..4dc454419d 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s @@ -27,7 +27,7 @@ glabel func_80240120_C76E00 /* C76E54 80240174 50400008 */ beql $v0, $zero, .L80240198 /* C76E58 80240178 26100001 */ addiu $s0, $s0, 1 /* C76E5C 8024017C 0200202D */ daddu $a0, $s0, $zero -/* C76E60 80240180 0C090035 */ jal func_802400D4 +/* C76E60 80240180 0C090035 */ jal func_802400D4_C76DB4 /* C76E64 80240184 00122C03 */ sra $a1, $s2, 0x10 /* C76E68 80240188 10540003 */ beq $v0, $s4, .L80240198 /* C76E6C 8024018C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s index a430692d79..70b1634e72 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_802401CC_C76EAC.s @@ -49,7 +49,7 @@ glabel func_802401CC_C76EAC /* C76F58 80240278 AE300108 */ sw $s0, 0x108($s1) /* C76F5C 8024027C 8C420000 */ lw $v0, ($v0) /* C76F60 80240280 02E0282D */ daddu $a1, $s7, $zero -/* C76F64 80240284 0C090035 */ jal func_802400D4 +/* C76F64 80240284 0C090035 */ jal func_802400D4_C76DB4 /* C76F68 80240288 AE220084 */ sw $v0, 0x84($s1) /* C76F6C 8024028C 0040202D */ daddu $a0, $v0, $zero /* C76F70 80240290 04800011 */ bltz $a0, .L802402D8 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88.s deleted file mode 100644 index e541877da2..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88.s +++ /dev/null @@ -1,99 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E88 -/* C77B68 80240E88 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77B6C 80240E8C AFB10014 */ sw $s1, 0x14($sp) -/* C77B70 80240E90 0080882D */ daddu $s1, $a0, $zero -/* C77B74 80240E94 AFBF001C */ sw $ra, 0x1c($sp) -/* C77B78 80240E98 AFB20018 */ sw $s2, 0x18($sp) -/* C77B7C 80240E9C AFB00010 */ sw $s0, 0x10($sp) -/* C77B80 80240EA0 8E22000C */ lw $v0, 0xc($s1) -/* C77B84 80240EA4 0C0B1EAF */ jal get_variable -/* C77B88 80240EA8 8C450000 */ lw $a1, ($v0) -/* C77B8C 80240EAC 8E23013C */ lw $v1, 0x13c($s1) -/* C77B90 80240EB0 8C720000 */ lw $s2, ($v1) -/* C77B94 80240EB4 C646000C */ lwc1 $f6, 0xc($s2) -/* C77B98 80240EB8 C6400000 */ lwc1 $f0, ($s2) -/* C77B9C 80240EBC 46003181 */ sub.s $f6, $f6, $f0 -/* C77BA0 80240EC0 3C01447A */ lui $at, 0x447a -/* C77BA4 80240EC4 44814000 */ mtc1 $at, $f8 -/* C77BA8 80240EC8 C6200084 */ lwc1 $f0, 0x84($s1) -/* C77BAC 80240ECC 46800020 */ cvt.s.w $f0, $f0 -/* C77BB0 80240ED0 46083183 */ div.s $f6, $f6, $f8 -/* C77BB4 80240ED4 46003182 */ mul.s $f6, $f6, $f0 -/* C77BB8 80240ED8 00000000 */ nop -/* C77BBC 80240EDC C6440010 */ lwc1 $f4, 0x10($s2) -/* C77BC0 80240EE0 C6420004 */ lwc1 $f2, 4($s2) -/* C77BC4 80240EE4 46022101 */ sub.s $f4, $f4, $f2 -/* C77BC8 80240EE8 C6420008 */ lwc1 $f2, 8($s2) -/* C77BCC 80240EEC C6400014 */ lwc1 $f0, 0x14($s2) -/* C77BD0 80240EF0 46020001 */ sub.s $f0, $f0, $f2 -/* C77BD4 80240EF4 46082103 */ div.s $f4, $f4, $f8 -/* C77BD8 80240EF8 C6220084 */ lwc1 $f2, 0x84($s1) -/* C77BDC 80240EFC 468010A0 */ cvt.s.w $f2, $f2 -/* C77BE0 80240F00 46022102 */ mul.s $f4, $f4, $f2 -/* C77BE4 80240F04 00000000 */ nop -/* C77BE8 80240F08 46080003 */ div.s $f0, $f0, $f8 -/* C77BEC 80240F0C 46020002 */ mul.s $f0, $f0, $f2 -/* C77BF0 80240F10 00000000 */ nop -/* C77BF4 80240F14 4600328D */ trunc.w.s $f10, $f6 -/* C77BF8 80240F18 E62A0098 */ swc1 $f10, 0x98($s1) -/* C77BFC 80240F1C 4600228D */ trunc.w.s $f10, $f4 -/* C77C00 80240F20 E62A009C */ swc1 $f10, 0x9c($s1) -/* C77C04 80240F24 4600028D */ trunc.w.s $f10, $f0 -/* C77C08 80240F28 1440002E */ bnez $v0, .L80240FE4 -/* C77C0C 80240F2C E62A00A0 */ swc1 $f10, 0xa0($s1) -/* C77C10 80240F30 0C00EAD2 */ jal get_npc_safe -/* C77C14 80240F34 2404FFFC */ addiu $a0, $zero, -4 -/* C77C18 80240F38 8E23008C */ lw $v1, 0x8c($s1) -/* C77C1C 80240F3C 8E240098 */ lw $a0, 0x98($s1) -/* C77C20 80240F40 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* C77C24 80240F44 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* C77C28 80240F48 00641821 */ addu $v1, $v1, $a0 -/* C77C2C 80240F4C 44830000 */ mtc1 $v1, $f0 -/* C77C30 80240F50 00000000 */ nop -/* C77C34 80240F54 46800020 */ cvt.s.w $f0, $f0 -/* C77C38 80240F58 E6000028 */ swc1 $f0, 0x28($s0) -/* C77C3C 80240F5C 8E230090 */ lw $v1, 0x90($s1) -/* C77C40 80240F60 8E24009C */ lw $a0, 0x9c($s1) -/* C77C44 80240F64 00641821 */ addu $v1, $v1, $a0 -/* C77C48 80240F68 44830000 */ mtc1 $v1, $f0 -/* C77C4C 80240F6C 00000000 */ nop -/* C77C50 80240F70 46800020 */ cvt.s.w $f0, $f0 -/* C77C54 80240F74 E600002C */ swc1 $f0, 0x2c($s0) -/* C77C58 80240F78 8E230094 */ lw $v1, 0x94($s1) -/* C77C5C 80240F7C 8E2400A0 */ lw $a0, 0xa0($s1) -/* C77C60 80240F80 00641821 */ addu $v1, $v1, $a0 -/* C77C64 80240F84 44830000 */ mtc1 $v1, $f0 -/* C77C68 80240F88 00000000 */ nop -/* C77C6C 80240F8C 46800020 */ cvt.s.w $f0, $f0 -/* C77C70 80240F90 E6000030 */ swc1 $f0, 0x30($s0) -/* C77C74 80240F94 C64C0000 */ lwc1 $f12, ($s2) -/* C77C78 80240F98 C64E0008 */ lwc1 $f14, 8($s2) -/* C77C7C 80240F9C 8E46000C */ lw $a2, 0xc($s2) -/* C77C80 80240FA0 8E470014 */ lw $a3, 0x14($s2) -/* C77C84 80240FA4 0C00A720 */ jal atan2 -/* C77C88 80240FA8 0040882D */ daddu $s1, $v0, $zero -/* C77C8C 80240FAC C6020028 */ lwc1 $f2, 0x28($s0) -/* C77C90 80240FB0 E6000080 */ swc1 $f0, 0x80($s0) -/* C77C94 80240FB4 E6220038 */ swc1 $f2, 0x38($s1) -/* C77C98 80240FB8 C600002C */ lwc1 $f0, 0x2c($s0) -/* C77C9C 80240FBC 3C014120 */ lui $at, 0x4120 -/* C77CA0 80240FC0 44811000 */ mtc1 $at, $f2 -/* C77CA4 80240FC4 00000000 */ nop -/* C77CA8 80240FC8 46020001 */ sub.s $f0, $f0, $f2 -/* C77CAC 80240FCC 3C0140A0 */ lui $at, 0x40a0 -/* C77CB0 80240FD0 44811000 */ mtc1 $at, $f2 -/* C77CB4 80240FD4 E620003C */ swc1 $f0, 0x3c($s1) -/* C77CB8 80240FD8 C6000030 */ lwc1 $f0, 0x30($s0) -/* C77CBC 80240FDC 46020001 */ sub.s $f0, $f0, $f2 -/* C77CC0 80240FE0 E6200040 */ swc1 $f0, 0x40($s1) -.L80240FE4: -/* C77CC4 80240FE4 8FBF001C */ lw $ra, 0x1c($sp) -/* C77CC8 80240FE8 8FB20018 */ lw $s2, 0x18($sp) -/* C77CCC 80240FEC 8FB10014 */ lw $s1, 0x14($sp) -/* C77CD0 80240FF0 8FB00010 */ lw $s0, 0x10($sp) -/* C77CD4 80240FF4 24020002 */ addiu $v0, $zero, 2 -/* C77CD8 80240FF8 03E00008 */ jr $ra -/* C77CDC 80240FFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88_C77B68.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88_C77B68.s new file mode 100644 index 0000000000..8ac330d065 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77A20/func_80240E88_C77B68.s @@ -0,0 +1,99 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E88_C77B68 +/* C77B68 80240E88 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C77B6C 80240E8C AFB10014 */ sw $s1, 0x14($sp) +/* C77B70 80240E90 0080882D */ daddu $s1, $a0, $zero +/* C77B74 80240E94 AFBF001C */ sw $ra, 0x1c($sp) +/* C77B78 80240E98 AFB20018 */ sw $s2, 0x18($sp) +/* C77B7C 80240E9C AFB00010 */ sw $s0, 0x10($sp) +/* C77B80 80240EA0 8E22000C */ lw $v0, 0xc($s1) +/* C77B84 80240EA4 0C0B1EAF */ jal get_variable +/* C77B88 80240EA8 8C450000 */ lw $a1, ($v0) +/* C77B8C 80240EAC 8E23013C */ lw $v1, 0x13c($s1) +/* C77B90 80240EB0 8C720000 */ lw $s2, ($v1) +/* C77B94 80240EB4 C646000C */ lwc1 $f6, 0xc($s2) +/* C77B98 80240EB8 C6400000 */ lwc1 $f0, ($s2) +/* C77B9C 80240EBC 46003181 */ sub.s $f6, $f6, $f0 +/* C77BA0 80240EC0 3C01447A */ lui $at, 0x447a +/* C77BA4 80240EC4 44814000 */ mtc1 $at, $f8 +/* C77BA8 80240EC8 C6200084 */ lwc1 $f0, 0x84($s1) +/* C77BAC 80240ECC 46800020 */ cvt.s.w $f0, $f0 +/* C77BB0 80240ED0 46083183 */ div.s $f6, $f6, $f8 +/* C77BB4 80240ED4 46003182 */ mul.s $f6, $f6, $f0 +/* C77BB8 80240ED8 00000000 */ nop +/* C77BBC 80240EDC C6440010 */ lwc1 $f4, 0x10($s2) +/* C77BC0 80240EE0 C6420004 */ lwc1 $f2, 4($s2) +/* C77BC4 80240EE4 46022101 */ sub.s $f4, $f4, $f2 +/* C77BC8 80240EE8 C6420008 */ lwc1 $f2, 8($s2) +/* C77BCC 80240EEC C6400014 */ lwc1 $f0, 0x14($s2) +/* C77BD0 80240EF0 46020001 */ sub.s $f0, $f0, $f2 +/* C77BD4 80240EF4 46082103 */ div.s $f4, $f4, $f8 +/* C77BD8 80240EF8 C6220084 */ lwc1 $f2, 0x84($s1) +/* C77BDC 80240EFC 468010A0 */ cvt.s.w $f2, $f2 +/* C77BE0 80240F00 46022102 */ mul.s $f4, $f4, $f2 +/* C77BE4 80240F04 00000000 */ nop +/* C77BE8 80240F08 46080003 */ div.s $f0, $f0, $f8 +/* C77BEC 80240F0C 46020002 */ mul.s $f0, $f0, $f2 +/* C77BF0 80240F10 00000000 */ nop +/* C77BF4 80240F14 4600328D */ trunc.w.s $f10, $f6 +/* C77BF8 80240F18 E62A0098 */ swc1 $f10, 0x98($s1) +/* C77BFC 80240F1C 4600228D */ trunc.w.s $f10, $f4 +/* C77C00 80240F20 E62A009C */ swc1 $f10, 0x9c($s1) +/* C77C04 80240F24 4600028D */ trunc.w.s $f10, $f0 +/* C77C08 80240F28 1440002E */ bnez $v0, .L80240FE4 +/* C77C0C 80240F2C E62A00A0 */ swc1 $f10, 0xa0($s1) +/* C77C10 80240F30 0C00EAD2 */ jal get_npc_safe +/* C77C14 80240F34 2404FFFC */ addiu $a0, $zero, -4 +/* C77C18 80240F38 8E23008C */ lw $v1, 0x8c($s1) +/* C77C1C 80240F3C 8E240098 */ lw $a0, 0x98($s1) +/* C77C20 80240F40 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* C77C24 80240F44 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* C77C28 80240F48 00641821 */ addu $v1, $v1, $a0 +/* C77C2C 80240F4C 44830000 */ mtc1 $v1, $f0 +/* C77C30 80240F50 00000000 */ nop +/* C77C34 80240F54 46800020 */ cvt.s.w $f0, $f0 +/* C77C38 80240F58 E6000028 */ swc1 $f0, 0x28($s0) +/* C77C3C 80240F5C 8E230090 */ lw $v1, 0x90($s1) +/* C77C40 80240F60 8E24009C */ lw $a0, 0x9c($s1) +/* C77C44 80240F64 00641821 */ addu $v1, $v1, $a0 +/* C77C48 80240F68 44830000 */ mtc1 $v1, $f0 +/* C77C4C 80240F6C 00000000 */ nop +/* C77C50 80240F70 46800020 */ cvt.s.w $f0, $f0 +/* C77C54 80240F74 E600002C */ swc1 $f0, 0x2c($s0) +/* C77C58 80240F78 8E230094 */ lw $v1, 0x94($s1) +/* C77C5C 80240F7C 8E2400A0 */ lw $a0, 0xa0($s1) +/* C77C60 80240F80 00641821 */ addu $v1, $v1, $a0 +/* C77C64 80240F84 44830000 */ mtc1 $v1, $f0 +/* C77C68 80240F88 00000000 */ nop +/* C77C6C 80240F8C 46800020 */ cvt.s.w $f0, $f0 +/* C77C70 80240F90 E6000030 */ swc1 $f0, 0x30($s0) +/* C77C74 80240F94 C64C0000 */ lwc1 $f12, ($s2) +/* C77C78 80240F98 C64E0008 */ lwc1 $f14, 8($s2) +/* C77C7C 80240F9C 8E46000C */ lw $a2, 0xc($s2) +/* C77C80 80240FA0 8E470014 */ lw $a3, 0x14($s2) +/* C77C84 80240FA4 0C00A720 */ jal atan2 +/* C77C88 80240FA8 0040882D */ daddu $s1, $v0, $zero +/* C77C8C 80240FAC C6020028 */ lwc1 $f2, 0x28($s0) +/* C77C90 80240FB0 E6000080 */ swc1 $f0, 0x80($s0) +/* C77C94 80240FB4 E6220038 */ swc1 $f2, 0x38($s1) +/* C77C98 80240FB8 C600002C */ lwc1 $f0, 0x2c($s0) +/* C77C9C 80240FBC 3C014120 */ lui $at, 0x4120 +/* C77CA0 80240FC0 44811000 */ mtc1 $at, $f2 +/* C77CA4 80240FC4 00000000 */ nop +/* C77CA8 80240FC8 46020001 */ sub.s $f0, $f0, $f2 +/* C77CAC 80240FCC 3C0140A0 */ lui $at, 0x40a0 +/* C77CB0 80240FD0 44811000 */ mtc1 $at, $f2 +/* C77CB4 80240FD4 E620003C */ swc1 $f0, 0x3c($s1) +/* C77CB8 80240FD8 C6000030 */ lwc1 $f0, 0x30($s0) +/* C77CBC 80240FDC 46020001 */ sub.s $f0, $f0, $f2 +/* C77CC0 80240FE0 E6200040 */ swc1 $f0, 0x40($s1) +.L80240FE4: +/* C77CC4 80240FE4 8FBF001C */ lw $ra, 0x1c($sp) +/* C77CC8 80240FE8 8FB20018 */ lw $s2, 0x18($sp) +/* C77CCC 80240FEC 8FB10014 */ lw $s1, 0x14($sp) +/* C77CD0 80240FF0 8FB00010 */ lw $s0, 0x10($sp) +/* C77CD4 80240FF4 24020002 */ addiu $v0, $zero, 2 +/* C77CD8 80240FF8 03E00008 */ jr $ra +/* C77CDC 80240FFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4.s deleted file mode 100644 index d1c3835fd4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D4 -/* C77EB4 802411D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C77EB8 802411D8 AFB10014 */ sw $s1, 0x14($sp) -/* C77EBC 802411DC 0080882D */ daddu $s1, $a0, $zero -/* C77EC0 802411E0 AFBF0018 */ sw $ra, 0x18($sp) -/* C77EC4 802411E4 AFB00010 */ sw $s0, 0x10($sp) -/* C77EC8 802411E8 8E300148 */ lw $s0, 0x148($s1) -/* C77ECC 802411EC 0C00EABB */ jal get_npc_unsafe -/* C77ED0 802411F0 86040008 */ lh $a0, 8($s0) -/* C77ED4 802411F4 9443008E */ lhu $v1, 0x8e($v0) -/* C77ED8 802411F8 2463FFFF */ addiu $v1, $v1, -1 -/* C77EDC 802411FC A443008E */ sh $v1, 0x8e($v0) -/* C77EE0 80241200 00031C00 */ sll $v1, $v1, 0x10 -/* C77EE4 80241204 1C600003 */ bgtz $v1, .L80241214 -/* C77EE8 80241208 2402000C */ addiu $v0, $zero, 0xc -/* C77EEC 8024120C AE00006C */ sw $zero, 0x6c($s0) -/* C77EF0 80241210 AE220070 */ sw $v0, 0x70($s1) -.L80241214: -/* C77EF4 80241214 8FBF0018 */ lw $ra, 0x18($sp) -/* C77EF8 80241218 8FB10014 */ lw $s1, 0x14($sp) -/* C77EFC 8024121C 8FB00010 */ lw $s0, 0x10($sp) -/* C77F00 80241220 03E00008 */ jr $ra -/* C77F04 80241224 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s new file mode 100644 index 0000000000..1ef9b9cc8d --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802411D4_C77EB4.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411D4_C77EB4 +/* C77EB4 802411D4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C77EB8 802411D8 AFB10014 */ sw $s1, 0x14($sp) +/* C77EBC 802411DC 0080882D */ daddu $s1, $a0, $zero +/* C77EC0 802411E0 AFBF0018 */ sw $ra, 0x18($sp) +/* C77EC4 802411E4 AFB00010 */ sw $s0, 0x10($sp) +/* C77EC8 802411E8 8E300148 */ lw $s0, 0x148($s1) +/* C77ECC 802411EC 0C00EABB */ jal get_npc_unsafe +/* C77ED0 802411F0 86040008 */ lh $a0, 8($s0) +/* C77ED4 802411F4 9443008E */ lhu $v1, 0x8e($v0) +/* C77ED8 802411F8 2463FFFF */ addiu $v1, $v1, -1 +/* C77EDC 802411FC A443008E */ sh $v1, 0x8e($v0) +/* C77EE0 80241200 00031C00 */ sll $v1, $v1, 0x10 +/* C77EE4 80241204 1C600003 */ bgtz $v1, .L80241214 +/* C77EE8 80241208 2402000C */ addiu $v0, $zero, 0xc +/* C77EEC 8024120C AE00006C */ sw $zero, 0x6c($s0) +/* C77EF0 80241210 AE220070 */ sw $v0, 0x70($s1) +.L80241214: +/* C77EF4 80241214 8FBF0018 */ lw $ra, 0x18($sp) +/* C77EF8 80241218 8FB10014 */ lw $s1, 0x14($sp) +/* C77EFC 8024121C 8FB00010 */ lw $s0, 0x10($sp) +/* C77F00 80241220 03E00008 */ jr $ra +/* C77F04 80241224 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC.s deleted file mode 100644 index fb5f645751..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413DC -/* C780BC 802413DC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C780C0 802413E0 AFB40028 */ sw $s4, 0x28($sp) -/* C780C4 802413E4 0080A02D */ daddu $s4, $a0, $zero -/* C780C8 802413E8 AFBF002C */ sw $ra, 0x2c($sp) -/* C780CC 802413EC AFB30024 */ sw $s3, 0x24($sp) -/* C780D0 802413F0 AFB20020 */ sw $s2, 0x20($sp) -/* C780D4 802413F4 AFB1001C */ sw $s1, 0x1c($sp) -/* C780D8 802413F8 AFB00018 */ sw $s0, 0x18($sp) -/* C780DC 802413FC 8E910148 */ lw $s1, 0x148($s4) -/* C780E0 80241400 86240008 */ lh $a0, 8($s1) -/* C780E4 80241404 0C00EABB */ jal get_npc_unsafe -/* C780E8 80241408 00A0802D */ daddu $s0, $a1, $zero -/* C780EC 8024140C 16000005 */ bnez $s0, .L80241424 -/* C780F0 80241410 0040902D */ daddu $s2, $v0, $zero -/* C780F4 80241414 8E2200B0 */ lw $v0, 0xb0($s1) -/* C780F8 80241418 30420004 */ andi $v0, $v0, 4 -/* C780FC 8024141C 10400015 */ beqz $v0, .L80241474 -/* C78100 80241420 00000000 */ nop -.L80241424: -/* C78104 80241424 AE800070 */ sw $zero, 0x70($s4) -/* C78108 80241428 8E420000 */ lw $v0, ($s2) -/* C7810C 8024142C 3C031F30 */ lui $v1, 0x1f30 -/* C78110 80241430 A640008E */ sh $zero, 0x8e($s2) -/* C78114 80241434 34420102 */ ori $v0, $v0, 0x102 -/* C78118 80241438 AE420000 */ sw $v0, ($s2) -/* C7811C 8024143C 8E220000 */ lw $v0, ($s1) -/* C78120 80241440 3C01C47A */ lui $at, 0xc47a -/* C78124 80241444 44810000 */ mtc1 $at, $f0 -/* C78128 80241448 00431025 */ or $v0, $v0, $v1 -/* C7812C 8024144C AE220000 */ sw $v0, ($s1) -/* C78130 80241450 AE400038 */ sw $zero, 0x38($s2) -/* C78134 80241454 E640003C */ swc1 $f0, 0x3c($s2) -/* C78138 80241458 AE400040 */ sw $zero, 0x40($s2) -/* C7813C 8024145C 8E2300B0 */ lw $v1, 0xb0($s1) -/* C78140 80241460 30620004 */ andi $v0, $v1, 4 -/* C78144 80241464 10400003 */ beqz $v0, .L80241474 -/* C78148 80241468 2402FFFB */ addiu $v0, $zero, -5 -/* C7814C 8024146C 00621024 */ and $v0, $v1, $v0 -/* C78150 80241470 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241474: -/* C78154 80241474 8E930070 */ lw $s3, 0x70($s4) -/* C78158 80241478 12600005 */ beqz $s3, .L80241490 -/* C7815C 8024147C 24020001 */ addiu $v0, $zero, 1 -/* C78160 80241480 12620048 */ beq $s3, $v0, .L802415A4 -/* C78164 80241484 00000000 */ nop -/* C78168 80241488 08090586 */ j .L80241618 -/* C7816C 8024148C 00000000 */ nop -.L80241490: -/* C78170 80241490 86240008 */ lh $a0, 8($s1) -/* C78174 80241494 0C00FB3A */ jal get_enemy -/* C78178 80241498 2484FFFF */ addiu $a0, $a0, -1 -/* C7817C 8024149C 0040802D */ daddu $s0, $v0, $zero -/* C78180 802414A0 0C00EABB */ jal get_npc_unsafe -/* C78184 802414A4 86040008 */ lh $a0, 8($s0) -/* C78188 802414A8 24030001 */ addiu $v1, $zero, 1 -/* C7818C 802414AC 0040982D */ daddu $s3, $v0, $zero -/* C78190 802414B0 A2230007 */ sb $v1, 7($s1) -/* C78194 802414B4 8E03006C */ lw $v1, 0x6c($s0) -/* C78198 802414B8 24020003 */ addiu $v0, $zero, 3 -/* C7819C 802414BC 14620056 */ bne $v1, $v0, .L80241618 -/* C781A0 802414C0 00000000 */ nop -/* C781A4 802414C4 8E2500A8 */ lw $a1, 0xa8($s1) -/* C781A8 802414C8 10A00003 */ beqz $a1, .L802414D8 -/* C781AC 802414CC 0260202D */ daddu $a0, $s3, $zero -/* C781B0 802414D0 0C012530 */ jal func_800494C0 -/* C781B4 802414D4 0000302D */ daddu $a2, $zero, $zero -.L802414D8: -/* C781B8 802414D8 27A40010 */ addiu $a0, $sp, 0x10 -/* C781BC 802414DC C6280070 */ lwc1 $f8, 0x70($s1) -/* C781C0 802414E0 46804220 */ cvt.s.w $f8, $f8 -/* C781C4 802414E4 C6620034 */ lwc1 $f2, 0x34($s3) -/* C781C8 802414E8 3C014387 */ lui $at, 0x4387 -/* C781CC 802414EC 44810000 */ mtc1 $at, $f0 -/* C781D0 802414F0 44064000 */ mfc1 $a2, $f8 -/* C781D4 802414F4 46020001 */ sub.s $f0, $f0, $f2 -/* C781D8 802414F8 C6660038 */ lwc1 $f6, 0x38($s3) -/* C781DC 802414FC C6640040 */ lwc1 $f4, 0x40($s3) -/* C781E0 80241500 44070000 */ mfc1 $a3, $f0 -/* C781E4 80241504 27A50014 */ addiu $a1, $sp, 0x14 -/* C781E8 80241508 E7A60010 */ swc1 $f6, 0x10($sp) -/* C781EC 8024150C 0C00A7E7 */ jal add_vec2D_polar -/* C781F0 80241510 E7A40014 */ swc1 $f4, 0x14($sp) -/* C781F4 80241514 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C781F8 80241518 4600020D */ trunc.w.s $f8, $f0 -/* C781FC 8024151C 44024000 */ mfc1 $v0, $f8 -/* C78200 80241520 E6400038 */ swc1 $f0, 0x38($s2) -/* C78204 80241524 A6220010 */ sh $v0, 0x10($s1) -/* C78208 80241528 C660003C */ lwc1 $f0, 0x3c($s3) -/* C7820C 8024152C C622006C */ lwc1 $f2, 0x6c($s1) -/* C78210 80241530 468010A0 */ cvt.s.w $f2, $f2 -/* C78214 80241534 46020000 */ add.s $f0, $f0, $f2 -/* C78218 80241538 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* C7821C 8024153C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* C78220 80241540 E640003C */ swc1 $f0, 0x3c($s2) -/* C78224 80241544 C7A20014 */ lwc1 $f2, 0x14($sp) -/* C78228 80241548 4600020D */ trunc.w.s $f8, $f0 -/* C7822C 8024154C 44024000 */ mfc1 $v0, $f8 -/* C78230 80241550 00000000 */ nop -/* C78234 80241554 A6220012 */ sh $v0, 0x12($s1) -/* C78238 80241558 4600120D */ trunc.w.s $f8, $f2 -/* C7823C 8024155C 44024000 */ mfc1 $v0, $f8 -/* C78240 80241560 E6420040 */ swc1 $f2, 0x40($s2) -/* C78244 80241564 A6220014 */ sh $v0, 0x14($s1) -/* C78248 80241568 8C660028 */ lw $a2, 0x28($v1) -/* C7824C 8024156C 8C670030 */ lw $a3, 0x30($v1) -/* C78250 80241570 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C78254 80241574 0C00A720 */ jal atan2 -/* C78258 80241578 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C7825C 8024157C 3C03E0EF */ lui $v1, 0xe0ef -/* C78260 80241580 E640000C */ swc1 $f0, 0xc($s2) -/* C78264 80241584 8E220000 */ lw $v0, ($s1) -/* C78268 80241588 3463FFFF */ ori $v1, $v1, 0xffff -/* C7826C 8024158C 00431024 */ and $v0, $v0, $v1 -/* C78270 80241590 AE220000 */ sw $v0, ($s1) -/* C78274 80241594 24020001 */ addiu $v0, $zero, 1 -/* C78278 80241598 A640008E */ sh $zero, 0x8e($s2) -/* C7827C 8024159C 08090586 */ j .L80241618 -/* C78280 802415A0 AE820070 */ sw $v0, 0x70($s4) -.L802415A4: -/* C78284 802415A4 86240008 */ lh $a0, 8($s1) -/* C78288 802415A8 0C00FB3A */ jal get_enemy -/* C7828C 802415AC 2484FFFF */ addiu $a0, $a0, -1 -/* C78290 802415B0 0040802D */ daddu $s0, $v0, $zero -/* C78294 802415B4 0C00EABB */ jal get_npc_unsafe -/* C78298 802415B8 86040008 */ lh $a0, 8($s0) -/* C7829C 802415BC 9642008E */ lhu $v0, 0x8e($s2) -/* C782A0 802415C0 24420001 */ addiu $v0, $v0, 1 -/* C782A4 802415C4 A642008E */ sh $v0, 0x8e($s2) -/* C782A8 802415C8 00021400 */ sll $v0, $v0, 0x10 -/* C782AC 802415CC 8E23007C */ lw $v1, 0x7c($s1) -/* C782B0 802415D0 00021403 */ sra $v0, $v0, 0x10 -/* C782B4 802415D4 0043102A */ slt $v0, $v0, $v1 -/* C782B8 802415D8 50400001 */ beql $v0, $zero, .L802415E0 -/* C782BC 802415DC A2200007 */ sb $zero, 7($s1) -.L802415E0: -/* C782C0 802415E0 8E03006C */ lw $v1, 0x6c($s0) -/* C782C4 802415E4 24020004 */ addiu $v0, $zero, 4 -/* C782C8 802415E8 1462000B */ bne $v1, $v0, .L80241618 -/* C782CC 802415EC 3C021F10 */ lui $v0, 0x1f10 -/* C782D0 802415F0 8E230000 */ lw $v1, ($s1) -/* C782D4 802415F4 3C01C47A */ lui $at, 0xc47a -/* C782D8 802415F8 44810000 */ mtc1 $at, $f0 -/* C782DC 802415FC 00621825 */ or $v1, $v1, $v0 -/* C782E0 80241600 AE230000 */ sw $v1, ($s1) -/* C782E4 80241604 AE400038 */ sw $zero, 0x38($s2) -/* C782E8 80241608 E640003C */ swc1 $f0, 0x3c($s2) -/* C782EC 8024160C AE400040 */ sw $zero, 0x40($s2) -/* C782F0 80241610 A2330007 */ sb $s3, 7($s1) -/* C782F4 80241614 AE800070 */ sw $zero, 0x70($s4) -.L80241618: -/* C782F8 80241618 8FBF002C */ lw $ra, 0x2c($sp) -/* C782FC 8024161C 8FB40028 */ lw $s4, 0x28($sp) -/* C78300 80241620 8FB30024 */ lw $s3, 0x24($sp) -/* C78304 80241624 8FB20020 */ lw $s2, 0x20($sp) -/* C78308 80241628 8FB1001C */ lw $s1, 0x1c($sp) -/* C7830C 8024162C 8FB00018 */ lw $s0, 0x18($sp) -/* C78310 80241630 0000102D */ daddu $v0, $zero, $zero -/* C78314 80241634 03E00008 */ jr $ra -/* C78318 80241638 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s new file mode 100644 index 0000000000..b9d22366f5 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802413DC_C780BC.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413DC_C780BC +/* C780BC 802413DC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C780C0 802413E0 AFB40028 */ sw $s4, 0x28($sp) +/* C780C4 802413E4 0080A02D */ daddu $s4, $a0, $zero +/* C780C8 802413E8 AFBF002C */ sw $ra, 0x2c($sp) +/* C780CC 802413EC AFB30024 */ sw $s3, 0x24($sp) +/* C780D0 802413F0 AFB20020 */ sw $s2, 0x20($sp) +/* C780D4 802413F4 AFB1001C */ sw $s1, 0x1c($sp) +/* C780D8 802413F8 AFB00018 */ sw $s0, 0x18($sp) +/* C780DC 802413FC 8E910148 */ lw $s1, 0x148($s4) +/* C780E0 80241400 86240008 */ lh $a0, 8($s1) +/* C780E4 80241404 0C00EABB */ jal get_npc_unsafe +/* C780E8 80241408 00A0802D */ daddu $s0, $a1, $zero +/* C780EC 8024140C 16000005 */ bnez $s0, .L80241424 +/* C780F0 80241410 0040902D */ daddu $s2, $v0, $zero +/* C780F4 80241414 8E2200B0 */ lw $v0, 0xb0($s1) +/* C780F8 80241418 30420004 */ andi $v0, $v0, 4 +/* C780FC 8024141C 10400015 */ beqz $v0, .L80241474 +/* C78100 80241420 00000000 */ nop +.L80241424: +/* C78104 80241424 AE800070 */ sw $zero, 0x70($s4) +/* C78108 80241428 8E420000 */ lw $v0, ($s2) +/* C7810C 8024142C 3C031F30 */ lui $v1, 0x1f30 +/* C78110 80241430 A640008E */ sh $zero, 0x8e($s2) +/* C78114 80241434 34420102 */ ori $v0, $v0, 0x102 +/* C78118 80241438 AE420000 */ sw $v0, ($s2) +/* C7811C 8024143C 8E220000 */ lw $v0, ($s1) +/* C78120 80241440 3C01C47A */ lui $at, 0xc47a +/* C78124 80241444 44810000 */ mtc1 $at, $f0 +/* C78128 80241448 00431025 */ or $v0, $v0, $v1 +/* C7812C 8024144C AE220000 */ sw $v0, ($s1) +/* C78130 80241450 AE400038 */ sw $zero, 0x38($s2) +/* C78134 80241454 E640003C */ swc1 $f0, 0x3c($s2) +/* C78138 80241458 AE400040 */ sw $zero, 0x40($s2) +/* C7813C 8024145C 8E2300B0 */ lw $v1, 0xb0($s1) +/* C78140 80241460 30620004 */ andi $v0, $v1, 4 +/* C78144 80241464 10400003 */ beqz $v0, .L80241474 +/* C78148 80241468 2402FFFB */ addiu $v0, $zero, -5 +/* C7814C 8024146C 00621024 */ and $v0, $v1, $v0 +/* C78150 80241470 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241474: +/* C78154 80241474 8E930070 */ lw $s3, 0x70($s4) +/* C78158 80241478 12600005 */ beqz $s3, .L80241490 +/* C7815C 8024147C 24020001 */ addiu $v0, $zero, 1 +/* C78160 80241480 12620048 */ beq $s3, $v0, .L802415A4 +/* C78164 80241484 00000000 */ nop +/* C78168 80241488 08090586 */ j .L80241618 +/* C7816C 8024148C 00000000 */ nop +.L80241490: +/* C78170 80241490 86240008 */ lh $a0, 8($s1) +/* C78174 80241494 0C00FB3A */ jal get_enemy +/* C78178 80241498 2484FFFF */ addiu $a0, $a0, -1 +/* C7817C 8024149C 0040802D */ daddu $s0, $v0, $zero +/* C78180 802414A0 0C00EABB */ jal get_npc_unsafe +/* C78184 802414A4 86040008 */ lh $a0, 8($s0) +/* C78188 802414A8 24030001 */ addiu $v1, $zero, 1 +/* C7818C 802414AC 0040982D */ daddu $s3, $v0, $zero +/* C78190 802414B0 A2230007 */ sb $v1, 7($s1) +/* C78194 802414B4 8E03006C */ lw $v1, 0x6c($s0) +/* C78198 802414B8 24020003 */ addiu $v0, $zero, 3 +/* C7819C 802414BC 14620056 */ bne $v1, $v0, .L80241618 +/* C781A0 802414C0 00000000 */ nop +/* C781A4 802414C4 8E2500A8 */ lw $a1, 0xa8($s1) +/* C781A8 802414C8 10A00003 */ beqz $a1, .L802414D8 +/* C781AC 802414CC 0260202D */ daddu $a0, $s3, $zero +/* C781B0 802414D0 0C012530 */ jal func_800494C0 +/* C781B4 802414D4 0000302D */ daddu $a2, $zero, $zero +.L802414D8: +/* C781B8 802414D8 27A40010 */ addiu $a0, $sp, 0x10 +/* C781BC 802414DC C6280070 */ lwc1 $f8, 0x70($s1) +/* C781C0 802414E0 46804220 */ cvt.s.w $f8, $f8 +/* C781C4 802414E4 C6620034 */ lwc1 $f2, 0x34($s3) +/* C781C8 802414E8 3C014387 */ lui $at, 0x4387 +/* C781CC 802414EC 44810000 */ mtc1 $at, $f0 +/* C781D0 802414F0 44064000 */ mfc1 $a2, $f8 +/* C781D4 802414F4 46020001 */ sub.s $f0, $f0, $f2 +/* C781D8 802414F8 C6660038 */ lwc1 $f6, 0x38($s3) +/* C781DC 802414FC C6640040 */ lwc1 $f4, 0x40($s3) +/* C781E0 80241500 44070000 */ mfc1 $a3, $f0 +/* C781E4 80241504 27A50014 */ addiu $a1, $sp, 0x14 +/* C781E8 80241508 E7A60010 */ swc1 $f6, 0x10($sp) +/* C781EC 8024150C 0C00A7E7 */ jal add_vec2D_polar +/* C781F0 80241510 E7A40014 */ swc1 $f4, 0x14($sp) +/* C781F4 80241514 C7A00010 */ lwc1 $f0, 0x10($sp) +/* C781F8 80241518 4600020D */ trunc.w.s $f8, $f0 +/* C781FC 8024151C 44024000 */ mfc1 $v0, $f8 +/* C78200 80241520 E6400038 */ swc1 $f0, 0x38($s2) +/* C78204 80241524 A6220010 */ sh $v0, 0x10($s1) +/* C78208 80241528 C660003C */ lwc1 $f0, 0x3c($s3) +/* C7820C 8024152C C622006C */ lwc1 $f2, 0x6c($s1) +/* C78210 80241530 468010A0 */ cvt.s.w $f2, $f2 +/* C78214 80241534 46020000 */ add.s $f0, $f0, $f2 +/* C78218 80241538 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) +/* C7821C 8024153C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) +/* C78220 80241540 E640003C */ swc1 $f0, 0x3c($s2) +/* C78224 80241544 C7A20014 */ lwc1 $f2, 0x14($sp) +/* C78228 80241548 4600020D */ trunc.w.s $f8, $f0 +/* C7822C 8024154C 44024000 */ mfc1 $v0, $f8 +/* C78230 80241550 00000000 */ nop +/* C78234 80241554 A6220012 */ sh $v0, 0x12($s1) +/* C78238 80241558 4600120D */ trunc.w.s $f8, $f2 +/* C7823C 8024155C 44024000 */ mfc1 $v0, $f8 +/* C78240 80241560 E6420040 */ swc1 $f2, 0x40($s2) +/* C78244 80241564 A6220014 */ sh $v0, 0x14($s1) +/* C78248 80241568 8C660028 */ lw $a2, 0x28($v1) +/* C7824C 8024156C 8C670030 */ lw $a3, 0x30($v1) +/* C78250 80241570 C64C0038 */ lwc1 $f12, 0x38($s2) +/* C78254 80241574 0C00A720 */ jal atan2 +/* C78258 80241578 C64E0040 */ lwc1 $f14, 0x40($s2) +/* C7825C 8024157C 3C03E0EF */ lui $v1, 0xe0ef +/* C78260 80241580 E640000C */ swc1 $f0, 0xc($s2) +/* C78264 80241584 8E220000 */ lw $v0, ($s1) +/* C78268 80241588 3463FFFF */ ori $v1, $v1, 0xffff +/* C7826C 8024158C 00431024 */ and $v0, $v0, $v1 +/* C78270 80241590 AE220000 */ sw $v0, ($s1) +/* C78274 80241594 24020001 */ addiu $v0, $zero, 1 +/* C78278 80241598 A640008E */ sh $zero, 0x8e($s2) +/* C7827C 8024159C 08090586 */ j .L80241618 +/* C78280 802415A0 AE820070 */ sw $v0, 0x70($s4) +.L802415A4: +/* C78284 802415A4 86240008 */ lh $a0, 8($s1) +/* C78288 802415A8 0C00FB3A */ jal get_enemy +/* C7828C 802415AC 2484FFFF */ addiu $a0, $a0, -1 +/* C78290 802415B0 0040802D */ daddu $s0, $v0, $zero +/* C78294 802415B4 0C00EABB */ jal get_npc_unsafe +/* C78298 802415B8 86040008 */ lh $a0, 8($s0) +/* C7829C 802415BC 9642008E */ lhu $v0, 0x8e($s2) +/* C782A0 802415C0 24420001 */ addiu $v0, $v0, 1 +/* C782A4 802415C4 A642008E */ sh $v0, 0x8e($s2) +/* C782A8 802415C8 00021400 */ sll $v0, $v0, 0x10 +/* C782AC 802415CC 8E23007C */ lw $v1, 0x7c($s1) +/* C782B0 802415D0 00021403 */ sra $v0, $v0, 0x10 +/* C782B4 802415D4 0043102A */ slt $v0, $v0, $v1 +/* C782B8 802415D8 50400001 */ beql $v0, $zero, .L802415E0 +/* C782BC 802415DC A2200007 */ sb $zero, 7($s1) +.L802415E0: +/* C782C0 802415E0 8E03006C */ lw $v1, 0x6c($s0) +/* C782C4 802415E4 24020004 */ addiu $v0, $zero, 4 +/* C782C8 802415E8 1462000B */ bne $v1, $v0, .L80241618 +/* C782CC 802415EC 3C021F10 */ lui $v0, 0x1f10 +/* C782D0 802415F0 8E230000 */ lw $v1, ($s1) +/* C782D4 802415F4 3C01C47A */ lui $at, 0xc47a +/* C782D8 802415F8 44810000 */ mtc1 $at, $f0 +/* C782DC 802415FC 00621825 */ or $v1, $v1, $v0 +/* C782E0 80241600 AE230000 */ sw $v1, ($s1) +/* C782E4 80241604 AE400038 */ sw $zero, 0x38($s2) +/* C782E8 80241608 E640003C */ swc1 $f0, 0x3c($s2) +/* C782EC 8024160C AE400040 */ sw $zero, 0x40($s2) +/* C782F0 80241610 A2330007 */ sb $s3, 7($s1) +/* C782F4 80241614 AE800070 */ sw $zero, 0x70($s4) +.L80241618: +/* C782F8 80241618 8FBF002C */ lw $ra, 0x2c($sp) +/* C782FC 8024161C 8FB40028 */ lw $s4, 0x28($sp) +/* C78300 80241620 8FB30024 */ lw $s3, 0x24($sp) +/* C78304 80241624 8FB20020 */ lw $s2, 0x20($sp) +/* C78308 80241628 8FB1001C */ lw $s1, 0x1c($sp) +/* C7830C 8024162C 8FB00018 */ lw $s0, 0x18($sp) +/* C78310 80241630 0000102D */ daddu $v0, $zero, $zero +/* C78314 80241634 03E00008 */ jr $ra +/* C78318 80241638 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C.s deleted file mode 100644 index 86bfb6ab26..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024163C -/* C7831C 8024163C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C78320 80241640 AFB20038 */ sw $s2, 0x38($sp) -/* C78324 80241644 0080902D */ daddu $s2, $a0, $zero -/* C78328 80241648 AFBF0048 */ sw $ra, 0x48($sp) -/* C7832C 8024164C AFB50044 */ sw $s5, 0x44($sp) -/* C78330 80241650 AFB40040 */ sw $s4, 0x40($sp) -/* C78334 80241654 AFB3003C */ sw $s3, 0x3c($sp) -/* C78338 80241658 AFB10034 */ sw $s1, 0x34($sp) -/* C7833C 8024165C AFB00030 */ sw $s0, 0x30($sp) -/* C78340 80241660 8E510148 */ lw $s1, 0x148($s2) -/* C78344 80241664 86240008 */ lh $a0, 8($s1) -/* C78348 80241668 0C00EABB */ jal get_npc_unsafe -/* C7834C 8024166C 00A0802D */ daddu $s0, $a1, $zero -/* C78350 80241670 8E43000C */ lw $v1, 0xc($s2) -/* C78354 80241674 0240202D */ daddu $a0, $s2, $zero -/* C78358 80241678 8C650000 */ lw $a1, ($v1) -/* C7835C 8024167C 0C0B1EAF */ jal get_variable -/* C78360 80241680 0040A82D */ daddu $s5, $v0, $zero -/* C78364 80241684 AFA00010 */ sw $zero, 0x10($sp) -/* C78368 80241688 8E2300D0 */ lw $v1, 0xd0($s1) -/* C7836C 8024168C 8C630030 */ lw $v1, 0x30($v1) -/* C78370 80241690 AFA30014 */ sw $v1, 0x14($sp) -/* C78374 80241694 8E2300D0 */ lw $v1, 0xd0($s1) -/* C78378 80241698 8C63001C */ lw $v1, 0x1c($v1) -/* C7837C 8024169C AFA30018 */ sw $v1, 0x18($sp) -/* C78380 802416A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C78384 802416A4 8C630024 */ lw $v1, 0x24($v1) -/* C78388 802416A8 AFA3001C */ sw $v1, 0x1c($sp) -/* C7838C 802416AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C78390 802416B0 8C630028 */ lw $v1, 0x28($v1) -/* C78394 802416B4 27B40010 */ addiu $s4, $sp, 0x10 -/* C78398 802416B8 AFA30020 */ sw $v1, 0x20($sp) -/* C7839C 802416BC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C783A0 802416C0 3C014282 */ lui $at, 0x4282 -/* C783A4 802416C4 44810000 */ mtc1 $at, $f0 -/* C783A8 802416C8 8C63002C */ lw $v1, 0x2c($v1) -/* C783AC 802416CC 0040982D */ daddu $s3, $v0, $zero -/* C783B0 802416D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* C783B4 802416D4 A7A0002C */ sh $zero, 0x2c($sp) -/* C783B8 802416D8 16000005 */ bnez $s0, .L802416F0 -/* C783BC 802416DC AFA30024 */ sw $v1, 0x24($sp) -/* C783C0 802416E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C783C4 802416E4 30420004 */ andi $v0, $v0, 4 -/* C783C8 802416E8 10400020 */ beqz $v0, .L8024176C -/* C783CC 802416EC 00000000 */ nop -.L802416F0: -/* C783D0 802416F0 2404F7FF */ addiu $a0, $zero, -0x801 -/* C783D4 802416F4 AE400070 */ sw $zero, 0x70($s2) -/* C783D8 802416F8 A6A0008E */ sh $zero, 0x8e($s5) -/* C783DC 802416FC 8E2200CC */ lw $v0, 0xcc($s1) -/* C783E0 80241700 8EA30000 */ lw $v1, ($s5) -/* C783E4 80241704 8C420000 */ lw $v0, ($v0) -/* C783E8 80241708 00641824 */ and $v1, $v1, $a0 -/* C783EC 8024170C AEA30000 */ sw $v1, ($s5) -/* C783F0 80241710 AEA20028 */ sw $v0, 0x28($s5) -/* C783F4 80241714 8E2200D0 */ lw $v0, 0xd0($s1) -/* C783F8 80241718 8C420034 */ lw $v0, 0x34($v0) -/* C783FC 8024171C 54400005 */ bnel $v0, $zero, .L80241734 -/* C78400 80241720 2402FDFF */ addiu $v0, $zero, -0x201 -/* C78404 80241724 34620200 */ ori $v0, $v1, 0x200 -/* C78408 80241728 2403FFF7 */ addiu $v1, $zero, -9 -/* C7840C 8024172C 080905CF */ j .L8024173C -/* C78410 80241730 00431024 */ and $v0, $v0, $v1 -.L80241734: -/* C78414 80241734 00621024 */ and $v0, $v1, $v0 -/* C78418 80241738 34420008 */ ori $v0, $v0, 8 -.L8024173C: -/* C7841C 8024173C AEA20000 */ sw $v0, ($s5) -/* C78420 80241740 8E2200B0 */ lw $v0, 0xb0($s1) -/* C78424 80241744 30420004 */ andi $v0, $v0, 4 -/* C78428 80241748 10400007 */ beqz $v0, .L80241768 -/* C7842C 8024174C 24020063 */ addiu $v0, $zero, 0x63 -/* C78430 80241750 AE420070 */ sw $v0, 0x70($s2) -/* C78434 80241754 AE400074 */ sw $zero, 0x74($s2) -/* C78438 80241758 8E2200B0 */ lw $v0, 0xb0($s1) -/* C7843C 8024175C 2403FFFB */ addiu $v1, $zero, -5 -/* C78440 80241760 00431024 */ and $v0, $v0, $v1 -/* C78444 80241764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241768: -/* C78448 80241768 AE20006C */ sw $zero, 0x6c($s1) -.L8024176C: -/* C7844C 8024176C 8E420070 */ lw $v0, 0x70($s2) -/* C78450 80241770 2842001E */ slti $v0, $v0, 0x1e -/* C78454 80241774 10400009 */ beqz $v0, .L8024179C -/* C78458 80241778 00000000 */ nop -/* C7845C 8024177C 8E22006C */ lw $v0, 0x6c($s1) -/* C78460 80241780 14400006 */ bnez $v0, .L8024179C -/* C78464 80241784 00000000 */ nop -/* C78468 80241788 0C09048A */ jal func_80241228 -/* C7846C 8024178C 0240202D */ daddu $a0, $s2, $zero -/* C78470 80241790 10400002 */ beqz $v0, .L8024179C -/* C78474 80241794 2402001E */ addiu $v0, $zero, 0x1e -/* C78478 80241798 AE420070 */ sw $v0, 0x70($s2) -.L8024179C: -/* C7847C 8024179C 8E430070 */ lw $v1, 0x70($s2) -/* C78480 802417A0 2C620064 */ sltiu $v0, $v1, 0x64 -/* C78484 802417A4 10400048 */ beqz $v0, .L802418C8 -/* C78488 802417A8 00031080 */ sll $v0, $v1, 2 -/* C7848C 802417AC 3C018024 */ lui $at, 0x8024 -/* C78490 802417B0 00220821 */ addu $at, $at, $v0 -/* C78494 802417B4 8C227278 */ lw $v0, 0x7278($at) -/* C78498 802417B8 00400008 */ jr $v0 -/* C7849C 802417BC 00000000 */ nop -/* C784A0 802417C0 0240202D */ daddu $a0, $s2, $zero -/* C784A4 802417C4 0260282D */ daddu $a1, $s3, $zero -/* C784A8 802417C8 0C012568 */ jal func_800495A0 -/* C784AC 802417CC 0280302D */ daddu $a2, $s4, $zero -/* C784B0 802417D0 0240202D */ daddu $a0, $s2, $zero -/* C784B4 802417D4 0260282D */ daddu $a1, $s3, $zero -/* C784B8 802417D8 0C0125AE */ jal func_800496B8 -/* C784BC 802417DC 0280302D */ daddu $a2, $s4, $zero -/* C784C0 802417E0 08090632 */ j .L802418C8 -/* C784C4 802417E4 00000000 */ nop -/* C784C8 802417E8 0240202D */ daddu $a0, $s2, $zero -/* C784CC 802417EC 0260282D */ daddu $a1, $s3, $zero -/* C784D0 802417F0 0C0126D1 */ jal func_80049B44 -/* C784D4 802417F4 0280302D */ daddu $a2, $s4, $zero -/* C784D8 802417F8 0240202D */ daddu $a0, $s2, $zero -/* C784DC 802417FC 0260282D */ daddu $a1, $s3, $zero -/* C784E0 80241800 0C012701 */ jal func_80049C04 -/* C784E4 80241804 0280302D */ daddu $a2, $s4, $zero -/* C784E8 80241808 08090632 */ j .L802418C8 -/* C784EC 8024180C 00000000 */ nop -/* C784F0 80241810 0240202D */ daddu $a0, $s2, $zero -/* C784F4 80241814 0260282D */ daddu $a1, $s3, $zero -/* C784F8 80241818 0C01278F */ jal func_80049E3C -/* C784FC 8024181C 0280302D */ daddu $a2, $s4, $zero -/* C78500 80241820 0240202D */ daddu $a0, $s2, $zero -/* C78504 80241824 0260282D */ daddu $a1, $s3, $zero -/* C78508 80241828 0C0127B3 */ jal func_80049ECC -/* C7850C 8024182C 0280302D */ daddu $a2, $s4, $zero -/* C78510 80241830 08090632 */ j .L802418C8 -/* C78514 80241834 00000000 */ nop -/* C78518 80241838 0240202D */ daddu $a0, $s2, $zero -/* C7851C 8024183C 0260282D */ daddu $a1, $s3, $zero -/* C78520 80241840 0C0127DF */ jal func_80049F7C -/* C78524 80241844 0280302D */ daddu $a2, $s4, $zero -/* C78528 80241848 0240202D */ daddu $a0, $s2, $zero -/* C7852C 8024184C 0260282D */ daddu $a1, $s3, $zero -/* C78530 80241850 0C012849 */ jal func_8004A124 -/* C78534 80241854 0280302D */ daddu $a2, $s4, $zero -/* C78538 80241858 08090632 */ j .L802418C8 -/* C7853C 8024185C 00000000 */ nop -/* C78540 80241860 0240202D */ daddu $a0, $s2, $zero -/* C78544 80241864 0260282D */ daddu $a1, $s3, $zero -/* C78548 80241868 0C0128FA */ jal func_8004A3E8 -/* C7854C 8024186C 0280302D */ daddu $a2, $s4, $zero -/* C78550 80241870 08090632 */ j .L802418C8 -/* C78554 80241874 00000000 */ nop -/* C78558 80241878 0C090408 */ jal func_80241020 -/* C7855C 8024187C 0240202D */ daddu $a0, $s2, $zero -/* C78560 80241880 0C090423 */ jal func_8024108C -/* C78564 80241884 0240202D */ daddu $a0, $s2, $zero -/* C78568 80241888 8E430070 */ lw $v1, 0x70($s2) -/* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 -/* C78570 80241890 1462000D */ bne $v1, $v0, .L802418C8 -/* C78574 80241894 00000000 */ nop -/* C78578 80241898 0C09043F */ jal func_802410FC -/* C7857C 8024189C 0240202D */ daddu $a0, $s2, $zero -/* C78580 802418A0 8E430070 */ lw $v1, 0x70($s2) -/* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 -/* C78588 802418A8 14620007 */ bne $v1, $v0, .L802418C8 -/* C7858C 802418AC 00000000 */ nop -/* C78590 802418B0 0C090475 */ jal func_802411D4 -/* C78594 802418B4 0240202D */ daddu $a0, $s2, $zero -/* C78598 802418B8 08090632 */ j .L802418C8 -/* C7859C 802418BC 00000000 */ nop -/* C785A0 802418C0 0C0129CF */ jal func_8004A73C -/* C785A4 802418C4 0240202D */ daddu $a0, $s2, $zero -.L802418C8: -/* C785A8 802418C8 8FBF0048 */ lw $ra, 0x48($sp) -/* C785AC 802418CC 8FB50044 */ lw $s5, 0x44($sp) -/* C785B0 802418D0 8FB40040 */ lw $s4, 0x40($sp) -/* C785B4 802418D4 8FB3003C */ lw $s3, 0x3c($sp) -/* C785B8 802418D8 8FB20038 */ lw $s2, 0x38($sp) -/* C785BC 802418DC 8FB10034 */ lw $s1, 0x34($sp) -/* C785C0 802418E0 8FB00030 */ lw $s0, 0x30($sp) -/* C785C4 802418E4 0000102D */ daddu $v0, $zero, $zero -/* C785C8 802418E8 03E00008 */ jr $ra -/* C785CC 802418EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s new file mode 100644 index 0000000000..af9d09b936 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024163C_C7831C.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024163C_C7831C +/* C7831C 8024163C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C78320 80241640 AFB20038 */ sw $s2, 0x38($sp) +/* C78324 80241644 0080902D */ daddu $s2, $a0, $zero +/* C78328 80241648 AFBF0048 */ sw $ra, 0x48($sp) +/* C7832C 8024164C AFB50044 */ sw $s5, 0x44($sp) +/* C78330 80241650 AFB40040 */ sw $s4, 0x40($sp) +/* C78334 80241654 AFB3003C */ sw $s3, 0x3c($sp) +/* C78338 80241658 AFB10034 */ sw $s1, 0x34($sp) +/* C7833C 8024165C AFB00030 */ sw $s0, 0x30($sp) +/* C78340 80241660 8E510148 */ lw $s1, 0x148($s2) +/* C78344 80241664 86240008 */ lh $a0, 8($s1) +/* C78348 80241668 0C00EABB */ jal get_npc_unsafe +/* C7834C 8024166C 00A0802D */ daddu $s0, $a1, $zero +/* C78350 80241670 8E43000C */ lw $v1, 0xc($s2) +/* C78354 80241674 0240202D */ daddu $a0, $s2, $zero +/* C78358 80241678 8C650000 */ lw $a1, ($v1) +/* C7835C 8024167C 0C0B1EAF */ jal get_variable +/* C78360 80241680 0040A82D */ daddu $s5, $v0, $zero +/* C78364 80241684 AFA00010 */ sw $zero, 0x10($sp) +/* C78368 80241688 8E2300D0 */ lw $v1, 0xd0($s1) +/* C7836C 8024168C 8C630030 */ lw $v1, 0x30($v1) +/* C78370 80241690 AFA30014 */ sw $v1, 0x14($sp) +/* C78374 80241694 8E2300D0 */ lw $v1, 0xd0($s1) +/* C78378 80241698 8C63001C */ lw $v1, 0x1c($v1) +/* C7837C 8024169C AFA30018 */ sw $v1, 0x18($sp) +/* C78380 802416A0 8E2300D0 */ lw $v1, 0xd0($s1) +/* C78384 802416A4 8C630024 */ lw $v1, 0x24($v1) +/* C78388 802416A8 AFA3001C */ sw $v1, 0x1c($sp) +/* C7838C 802416AC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C78390 802416B0 8C630028 */ lw $v1, 0x28($v1) +/* C78394 802416B4 27B40010 */ addiu $s4, $sp, 0x10 +/* C78398 802416B8 AFA30020 */ sw $v1, 0x20($sp) +/* C7839C 802416BC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C783A0 802416C0 3C014282 */ lui $at, 0x4282 +/* C783A4 802416C4 44810000 */ mtc1 $at, $f0 +/* C783A8 802416C8 8C63002C */ lw $v1, 0x2c($v1) +/* C783AC 802416CC 0040982D */ daddu $s3, $v0, $zero +/* C783B0 802416D0 E7A00028 */ swc1 $f0, 0x28($sp) +/* C783B4 802416D4 A7A0002C */ sh $zero, 0x2c($sp) +/* C783B8 802416D8 16000005 */ bnez $s0, .L802416F0 +/* C783BC 802416DC AFA30024 */ sw $v1, 0x24($sp) +/* C783C0 802416E0 8E2200B0 */ lw $v0, 0xb0($s1) +/* C783C4 802416E4 30420004 */ andi $v0, $v0, 4 +/* C783C8 802416E8 10400020 */ beqz $v0, .L8024176C +/* C783CC 802416EC 00000000 */ nop +.L802416F0: +/* C783D0 802416F0 2404F7FF */ addiu $a0, $zero, -0x801 +/* C783D4 802416F4 AE400070 */ sw $zero, 0x70($s2) +/* C783D8 802416F8 A6A0008E */ sh $zero, 0x8e($s5) +/* C783DC 802416FC 8E2200CC */ lw $v0, 0xcc($s1) +/* C783E0 80241700 8EA30000 */ lw $v1, ($s5) +/* C783E4 80241704 8C420000 */ lw $v0, ($v0) +/* C783E8 80241708 00641824 */ and $v1, $v1, $a0 +/* C783EC 8024170C AEA30000 */ sw $v1, ($s5) +/* C783F0 80241710 AEA20028 */ sw $v0, 0x28($s5) +/* C783F4 80241714 8E2200D0 */ lw $v0, 0xd0($s1) +/* C783F8 80241718 8C420034 */ lw $v0, 0x34($v0) +/* C783FC 8024171C 54400005 */ bnel $v0, $zero, .L80241734 +/* C78400 80241720 2402FDFF */ addiu $v0, $zero, -0x201 +/* C78404 80241724 34620200 */ ori $v0, $v1, 0x200 +/* C78408 80241728 2403FFF7 */ addiu $v1, $zero, -9 +/* C7840C 8024172C 080905CF */ j .L8024173C +/* C78410 80241730 00431024 */ and $v0, $v0, $v1 +.L80241734: +/* C78414 80241734 00621024 */ and $v0, $v1, $v0 +/* C78418 80241738 34420008 */ ori $v0, $v0, 8 +.L8024173C: +/* C7841C 8024173C AEA20000 */ sw $v0, ($s5) +/* C78420 80241740 8E2200B0 */ lw $v0, 0xb0($s1) +/* C78424 80241744 30420004 */ andi $v0, $v0, 4 +/* C78428 80241748 10400007 */ beqz $v0, .L80241768 +/* C7842C 8024174C 24020063 */ addiu $v0, $zero, 0x63 +/* C78430 80241750 AE420070 */ sw $v0, 0x70($s2) +/* C78434 80241754 AE400074 */ sw $zero, 0x74($s2) +/* C78438 80241758 8E2200B0 */ lw $v0, 0xb0($s1) +/* C7843C 8024175C 2403FFFB */ addiu $v1, $zero, -5 +/* C78440 80241760 00431024 */ and $v0, $v0, $v1 +/* C78444 80241764 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241768: +/* C78448 80241768 AE20006C */ sw $zero, 0x6c($s1) +.L8024176C: +/* C7844C 8024176C 8E420070 */ lw $v0, 0x70($s2) +/* C78450 80241770 2842001E */ slti $v0, $v0, 0x1e +/* C78454 80241774 10400009 */ beqz $v0, .L8024179C +/* C78458 80241778 00000000 */ nop +/* C7845C 8024177C 8E22006C */ lw $v0, 0x6c($s1) +/* C78460 80241780 14400006 */ bnez $v0, .L8024179C +/* C78464 80241784 00000000 */ nop +/* C78468 80241788 0C09048A */ jal func_80241228_C77F08 +/* C7846C 8024178C 0240202D */ daddu $a0, $s2, $zero +/* C78470 80241790 10400002 */ beqz $v0, .L8024179C +/* C78474 80241794 2402001E */ addiu $v0, $zero, 0x1e +/* C78478 80241798 AE420070 */ sw $v0, 0x70($s2) +.L8024179C: +/* C7847C 8024179C 8E430070 */ lw $v1, 0x70($s2) +/* C78480 802417A0 2C620064 */ sltiu $v0, $v1, 0x64 +/* C78484 802417A4 10400048 */ beqz $v0, .L802418C8 +/* C78488 802417A8 00031080 */ sll $v0, $v1, 2 +/* C7848C 802417AC 3C018024 */ lui $at, 0x8024 +/* C78490 802417B0 00220821 */ addu $at, $at, $v0 +/* C78494 802417B4 8C227278 */ lw $v0, 0x7278($at) +/* C78498 802417B8 00400008 */ jr $v0 +/* C7849C 802417BC 00000000 */ nop +/* C784A0 802417C0 0240202D */ daddu $a0, $s2, $zero +/* C784A4 802417C4 0260282D */ daddu $a1, $s3, $zero +/* C784A8 802417C8 0C012568 */ jal func_800495A0 +/* C784AC 802417CC 0280302D */ daddu $a2, $s4, $zero +/* C784B0 802417D0 0240202D */ daddu $a0, $s2, $zero +/* C784B4 802417D4 0260282D */ daddu $a1, $s3, $zero +/* C784B8 802417D8 0C0125AE */ jal func_800496B8 +/* C784BC 802417DC 0280302D */ daddu $a2, $s4, $zero +/* C784C0 802417E0 08090632 */ j .L802418C8 +/* C784C4 802417E4 00000000 */ nop +/* C784C8 802417E8 0240202D */ daddu $a0, $s2, $zero +/* C784CC 802417EC 0260282D */ daddu $a1, $s3, $zero +/* C784D0 802417F0 0C0126D1 */ jal func_80049B44 +/* C784D4 802417F4 0280302D */ daddu $a2, $s4, $zero +/* C784D8 802417F8 0240202D */ daddu $a0, $s2, $zero +/* C784DC 802417FC 0260282D */ daddu $a1, $s3, $zero +/* C784E0 80241800 0C012701 */ jal func_80049C04 +/* C784E4 80241804 0280302D */ daddu $a2, $s4, $zero +/* C784E8 80241808 08090632 */ j .L802418C8 +/* C784EC 8024180C 00000000 */ nop +/* C784F0 80241810 0240202D */ daddu $a0, $s2, $zero +/* C784F4 80241814 0260282D */ daddu $a1, $s3, $zero +/* C784F8 80241818 0C01278F */ jal func_80049E3C +/* C784FC 8024181C 0280302D */ daddu $a2, $s4, $zero +/* C78500 80241820 0240202D */ daddu $a0, $s2, $zero +/* C78504 80241824 0260282D */ daddu $a1, $s3, $zero +/* C78508 80241828 0C0127B3 */ jal func_80049ECC +/* C7850C 8024182C 0280302D */ daddu $a2, $s4, $zero +/* C78510 80241830 08090632 */ j .L802418C8 +/* C78514 80241834 00000000 */ nop +/* C78518 80241838 0240202D */ daddu $a0, $s2, $zero +/* C7851C 8024183C 0260282D */ daddu $a1, $s3, $zero +/* C78520 80241840 0C0127DF */ jal func_80049F7C +/* C78524 80241844 0280302D */ daddu $a2, $s4, $zero +/* C78528 80241848 0240202D */ daddu $a0, $s2, $zero +/* C7852C 8024184C 0260282D */ daddu $a1, $s3, $zero +/* C78530 80241850 0C012849 */ jal func_8004A124 +/* C78534 80241854 0280302D */ daddu $a2, $s4, $zero +/* C78538 80241858 08090632 */ j .L802418C8 +/* C7853C 8024185C 00000000 */ nop +/* C78540 80241860 0240202D */ daddu $a0, $s2, $zero +/* C78544 80241864 0260282D */ daddu $a1, $s3, $zero +/* C78548 80241868 0C0128FA */ jal func_8004A3E8 +/* C7854C 8024186C 0280302D */ daddu $a2, $s4, $zero +/* C78550 80241870 08090632 */ j .L802418C8 +/* C78554 80241874 00000000 */ nop +/* C78558 80241878 0C090408 */ jal func_80241020_C77D00 +/* C7855C 8024187C 0240202D */ daddu $a0, $s2, $zero +/* C78560 80241880 0C090423 */ jal func_8024108C_C77D6C +/* C78564 80241884 0240202D */ daddu $a0, $s2, $zero +/* C78568 80241888 8E430070 */ lw $v1, 0x70($s2) +/* C7856C 8024188C 24020020 */ addiu $v0, $zero, 0x20 +/* C78570 80241890 1462000D */ bne $v1, $v0, .L802418C8 +/* C78574 80241894 00000000 */ nop +/* C78578 80241898 0C09043F */ jal func_802410FC_C77DDC +/* C7857C 8024189C 0240202D */ daddu $a0, $s2, $zero +/* C78580 802418A0 8E430070 */ lw $v1, 0x70($s2) +/* C78584 802418A4 24020021 */ addiu $v0, $zero, 0x21 +/* C78588 802418A8 14620007 */ bne $v1, $v0, .L802418C8 +/* C7858C 802418AC 00000000 */ nop +/* C78590 802418B0 0C090475 */ jal func_802411D4_C77EB4 +/* C78594 802418B4 0240202D */ daddu $a0, $s2, $zero +/* C78598 802418B8 08090632 */ j .L802418C8 +/* C7859C 802418BC 00000000 */ nop +/* C785A0 802418C0 0C0129CF */ jal func_8004A73C +/* C785A4 802418C4 0240202D */ daddu $a0, $s2, $zero +.L802418C8: +/* C785A8 802418C8 8FBF0048 */ lw $ra, 0x48($sp) +/* C785AC 802418CC 8FB50044 */ lw $s5, 0x44($sp) +/* C785B0 802418D0 8FB40040 */ lw $s4, 0x40($sp) +/* C785B4 802418D4 8FB3003C */ lw $s3, 0x3c($sp) +/* C785B8 802418D8 8FB20038 */ lw $s2, 0x38($sp) +/* C785BC 802418DC 8FB10034 */ lw $s1, 0x34($sp) +/* C785C0 802418E0 8FB00030 */ lw $s0, 0x30($sp) +/* C785C4 802418E4 0000102D */ daddu $v0, $zero, $zero +/* C785C8 802418E8 03E00008 */ jr $ra +/* C785CC 802418EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C.s deleted file mode 100644 index 15079f891f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024195C -/* C7863C 8024195C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C78640 80241960 AFB3003C */ sw $s3, 0x3c($sp) -/* C78644 80241964 0080982D */ daddu $s3, $a0, $zero -/* C78648 80241968 AFBF0040 */ sw $ra, 0x40($sp) -/* C7864C 8024196C AFB20038 */ sw $s2, 0x38($sp) -/* C78650 80241970 AFB10034 */ sw $s1, 0x34($sp) -/* C78654 80241974 AFB00030 */ sw $s0, 0x30($sp) -/* C78658 80241978 8E720148 */ lw $s2, 0x148($s3) -/* C7865C 8024197C 00A0882D */ daddu $s1, $a1, $zero -/* C78660 80241980 86440008 */ lh $a0, 8($s2) -/* C78664 80241984 0C00EABB */ jal get_npc_unsafe -/* C78668 80241988 00C0802D */ daddu $s0, $a2, $zero -/* C7866C 8024198C 0200202D */ daddu $a0, $s0, $zero -/* C78670 80241990 0240282D */ daddu $a1, $s2, $zero -/* C78674 80241994 AFA00010 */ sw $zero, 0x10($sp) -/* C78678 80241998 8E26000C */ lw $a2, 0xc($s1) -/* C7867C 8024199C 8E270010 */ lw $a3, 0x10($s1) -/* C78680 802419A0 0C01242D */ jal func_800490B4 -/* C78684 802419A4 0040882D */ daddu $s1, $v0, $zero -/* C78688 802419A8 10400024 */ beqz $v0, .L80241A3C -/* C7868C 802419AC 0220202D */ daddu $a0, $s1, $zero -/* C78690 802419B0 24050322 */ addiu $a1, $zero, 0x322 -/* C78694 802419B4 0C012530 */ jal func_800494C0 -/* C78698 802419B8 0000302D */ daddu $a2, $zero, $zero -/* C7869C 802419BC 0000202D */ daddu $a0, $zero, $zero -/* C786A0 802419C0 0220282D */ daddu $a1, $s1, $zero -/* C786A4 802419C4 0000302D */ daddu $a2, $zero, $zero -/* C786A8 802419C8 2410000A */ addiu $s0, $zero, 0xa -/* C786AC 802419CC 862300A8 */ lh $v1, 0xa8($s1) -/* C786B0 802419D0 3C013F80 */ lui $at, 0x3f80 -/* C786B4 802419D4 44810000 */ mtc1 $at, $f0 -/* C786B8 802419D8 3C014000 */ lui $at, 0x4000 -/* C786BC 802419DC 44811000 */ mtc1 $at, $f2 -/* C786C0 802419E0 3C01C1A0 */ lui $at, 0xc1a0 -/* C786C4 802419E4 44812000 */ mtc1 $at, $f4 -/* C786C8 802419E8 44833000 */ mtc1 $v1, $f6 -/* C786CC 802419EC 00000000 */ nop -/* C786D0 802419F0 468031A0 */ cvt.s.w $f6, $f6 -/* C786D4 802419F4 44073000 */ mfc1 $a3, $f6 -/* C786D8 802419F8 27A20028 */ addiu $v0, $sp, 0x28 -/* C786DC 802419FC AFB0001C */ sw $s0, 0x1c($sp) -/* C786E0 80241A00 AFA20020 */ sw $v0, 0x20($sp) -/* C786E4 80241A04 E7A00010 */ swc1 $f0, 0x10($sp) -/* C786E8 80241A08 E7A20014 */ swc1 $f2, 0x14($sp) -/* C786EC 80241A0C 0C01BFA4 */ jal fx_emote -/* C786F0 80241A10 E7A40018 */ swc1 $f4, 0x18($sp) -/* C786F4 80241A14 0220202D */ daddu $a0, $s1, $zero -/* C786F8 80241A18 240502F4 */ addiu $a1, $zero, 0x2f4 -/* C786FC 80241A1C 0C012530 */ jal func_800494C0 -/* C78700 80241A20 3C060020 */ lui $a2, 0x20 -/* C78704 80241A24 8E4200CC */ lw $v0, 0xcc($s2) -/* C78708 80241A28 8C420020 */ lw $v0, 0x20($v0) -/* C7870C 80241A2C AE220028 */ sw $v0, 0x28($s1) -/* C78710 80241A30 9642008E */ lhu $v0, 0x8e($s2) -/* C78714 80241A34 A622008E */ sh $v0, 0x8e($s1) -/* C78718 80241A38 AE700070 */ sw $s0, 0x70($s3) -.L80241A3C: -/* C7871C 80241A3C 8FBF0040 */ lw $ra, 0x40($sp) -/* C78720 80241A40 8FB3003C */ lw $s3, 0x3c($sp) -/* C78724 80241A44 8FB20038 */ lw $s2, 0x38($sp) -/* C78728 80241A48 8FB10034 */ lw $s1, 0x34($sp) -/* C7872C 80241A4C 8FB00030 */ lw $s0, 0x30($sp) -/* C78730 80241A50 03E00008 */ jr $ra -/* C78734 80241A54 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s new file mode 100644 index 0000000000..7da236c512 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024195C_C7863C.s @@ -0,0 +1,68 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024195C_C7863C +/* C7863C 8024195C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C78640 80241960 AFB3003C */ sw $s3, 0x3c($sp) +/* C78644 80241964 0080982D */ daddu $s3, $a0, $zero +/* C78648 80241968 AFBF0040 */ sw $ra, 0x40($sp) +/* C7864C 8024196C AFB20038 */ sw $s2, 0x38($sp) +/* C78650 80241970 AFB10034 */ sw $s1, 0x34($sp) +/* C78654 80241974 AFB00030 */ sw $s0, 0x30($sp) +/* C78658 80241978 8E720148 */ lw $s2, 0x148($s3) +/* C7865C 8024197C 00A0882D */ daddu $s1, $a1, $zero +/* C78660 80241980 86440008 */ lh $a0, 8($s2) +/* C78664 80241984 0C00EABB */ jal get_npc_unsafe +/* C78668 80241988 00C0802D */ daddu $s0, $a2, $zero +/* C7866C 8024198C 0200202D */ daddu $a0, $s0, $zero +/* C78670 80241990 0240282D */ daddu $a1, $s2, $zero +/* C78674 80241994 AFA00010 */ sw $zero, 0x10($sp) +/* C78678 80241998 8E26000C */ lw $a2, 0xc($s1) +/* C7867C 8024199C 8E270010 */ lw $a3, 0x10($s1) +/* C78680 802419A0 0C01242D */ jal func_800490B4 +/* C78684 802419A4 0040882D */ daddu $s1, $v0, $zero +/* C78688 802419A8 10400024 */ beqz $v0, .L80241A3C +/* C7868C 802419AC 0220202D */ daddu $a0, $s1, $zero +/* C78690 802419B0 24050322 */ addiu $a1, $zero, 0x322 +/* C78694 802419B4 0C012530 */ jal func_800494C0 +/* C78698 802419B8 0000302D */ daddu $a2, $zero, $zero +/* C7869C 802419BC 0000202D */ daddu $a0, $zero, $zero +/* C786A0 802419C0 0220282D */ daddu $a1, $s1, $zero +/* C786A4 802419C4 0000302D */ daddu $a2, $zero, $zero +/* C786A8 802419C8 2410000A */ addiu $s0, $zero, 0xa +/* C786AC 802419CC 862300A8 */ lh $v1, 0xa8($s1) +/* C786B0 802419D0 3C013F80 */ lui $at, 0x3f80 +/* C786B4 802419D4 44810000 */ mtc1 $at, $f0 +/* C786B8 802419D8 3C014000 */ lui $at, 0x4000 +/* C786BC 802419DC 44811000 */ mtc1 $at, $f2 +/* C786C0 802419E0 3C01C1A0 */ lui $at, 0xc1a0 +/* C786C4 802419E4 44812000 */ mtc1 $at, $f4 +/* C786C8 802419E8 44833000 */ mtc1 $v1, $f6 +/* C786CC 802419EC 00000000 */ nop +/* C786D0 802419F0 468031A0 */ cvt.s.w $f6, $f6 +/* C786D4 802419F4 44073000 */ mfc1 $a3, $f6 +/* C786D8 802419F8 27A20028 */ addiu $v0, $sp, 0x28 +/* C786DC 802419FC AFB0001C */ sw $s0, 0x1c($sp) +/* C786E0 80241A00 AFA20020 */ sw $v0, 0x20($sp) +/* C786E4 80241A04 E7A00010 */ swc1 $f0, 0x10($sp) +/* C786E8 80241A08 E7A20014 */ swc1 $f2, 0x14($sp) +/* C786EC 80241A0C 0C01BFA4 */ jal fx_emote +/* C786F0 80241A10 E7A40018 */ swc1 $f4, 0x18($sp) +/* C786F4 80241A14 0220202D */ daddu $a0, $s1, $zero +/* C786F8 80241A18 240502F4 */ addiu $a1, $zero, 0x2f4 +/* C786FC 80241A1C 0C012530 */ jal func_800494C0 +/* C78700 80241A20 3C060020 */ lui $a2, 0x20 +/* C78704 80241A24 8E4200CC */ lw $v0, 0xcc($s2) +/* C78708 80241A28 8C420020 */ lw $v0, 0x20($v0) +/* C7870C 80241A2C AE220028 */ sw $v0, 0x28($s1) +/* C78710 80241A30 9642008E */ lhu $v0, 0x8e($s2) +/* C78714 80241A34 A622008E */ sh $v0, 0x8e($s1) +/* C78718 80241A38 AE700070 */ sw $s0, 0x70($s3) +.L80241A3C: +/* C7871C 80241A3C 8FBF0040 */ lw $ra, 0x40($sp) +/* C78720 80241A40 8FB3003C */ lw $s3, 0x3c($sp) +/* C78724 80241A44 8FB20038 */ lw $s2, 0x38($sp) +/* C78728 80241A48 8FB10034 */ lw $s1, 0x34($sp) +/* C7872C 80241A4C 8FB00030 */ lw $s0, 0x30($sp) +/* C78730 80241A50 03E00008 */ jr $ra +/* C78734 80241A54 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628.s deleted file mode 100644 index 450f72a6bd..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242628 -/* C79308 80242628 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7930C 8024262C AFB10014 */ sw $s1, 0x14($sp) -/* C79310 80242630 0080882D */ daddu $s1, $a0, $zero -/* C79314 80242634 AFBF0018 */ sw $ra, 0x18($sp) -/* C79318 80242638 AFB00010 */ sw $s0, 0x10($sp) -/* C7931C 8024263C 8E300148 */ lw $s0, 0x148($s1) -/* C79320 80242640 0C00EABB */ jal get_npc_unsafe -/* C79324 80242644 86040008 */ lh $a0, 8($s0) -/* C79328 80242648 0040182D */ daddu $v1, $v0, $zero -/* C7932C 8024264C 9462008E */ lhu $v0, 0x8e($v1) -/* C79330 80242650 2442FFFF */ addiu $v0, $v0, -1 -/* C79334 80242654 A462008E */ sh $v0, 0x8e($v1) -/* C79338 80242658 00021400 */ sll $v0, $v0, 0x10 -/* C7933C 8024265C 14400005 */ bnez $v0, .L80242674 -/* C79340 80242660 00000000 */ nop -/* C79344 80242664 960200AA */ lhu $v0, 0xaa($s0) -/* C79348 80242668 A462008E */ sh $v0, 0x8e($v1) -/* C7934C 8024266C 2402000E */ addiu $v0, $zero, 0xe -/* C79350 80242670 AE220070 */ sw $v0, 0x70($s1) -.L80242674: -/* C79354 80242674 8FBF0018 */ lw $ra, 0x18($sp) -/* C79358 80242678 8FB10014 */ lw $s1, 0x14($sp) -/* C7935C 8024267C 8FB00010 */ lw $s0, 0x10($sp) -/* C79360 80242680 03E00008 */ jr $ra -/* C79364 80242684 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s new file mode 100644 index 0000000000..3835919564 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242628_C79308.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242628_C79308 +/* C79308 80242628 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C7930C 8024262C AFB10014 */ sw $s1, 0x14($sp) +/* C79310 80242630 0080882D */ daddu $s1, $a0, $zero +/* C79314 80242634 AFBF0018 */ sw $ra, 0x18($sp) +/* C79318 80242638 AFB00010 */ sw $s0, 0x10($sp) +/* C7931C 8024263C 8E300148 */ lw $s0, 0x148($s1) +/* C79320 80242640 0C00EABB */ jal get_npc_unsafe +/* C79324 80242644 86040008 */ lh $a0, 8($s0) +/* C79328 80242648 0040182D */ daddu $v1, $v0, $zero +/* C7932C 8024264C 9462008E */ lhu $v0, 0x8e($v1) +/* C79330 80242650 2442FFFF */ addiu $v0, $v0, -1 +/* C79334 80242654 A462008E */ sh $v0, 0x8e($v1) +/* C79338 80242658 00021400 */ sll $v0, $v0, 0x10 +/* C7933C 8024265C 14400005 */ bnez $v0, .L80242674 +/* C79340 80242660 00000000 */ nop +/* C79344 80242664 960200AA */ lhu $v0, 0xaa($s0) +/* C79348 80242668 A462008E */ sh $v0, 0x8e($v1) +/* C7934C 8024266C 2402000E */ addiu $v0, $zero, 0xe +/* C79350 80242670 AE220070 */ sw $v0, 0x70($s1) +.L80242674: +/* C79354 80242674 8FBF0018 */ lw $ra, 0x18($sp) +/* C79358 80242678 8FB10014 */ lw $s1, 0x14($sp) +/* C7935C 8024267C 8FB00010 */ lw $s0, 0x10($sp) +/* C79360 80242680 03E00008 */ jr $ra +/* C79364 80242684 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688.s deleted file mode 100644 index d4ee64f023..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242688 -/* C79368 80242688 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C7936C 8024268C AFB40040 */ sw $s4, 0x40($sp) -/* C79370 80242690 0080A02D */ daddu $s4, $a0, $zero -/* C79374 80242694 AFBF0044 */ sw $ra, 0x44($sp) -/* C79378 80242698 AFB3003C */ sw $s3, 0x3c($sp) -/* C7937C 8024269C AFB20038 */ sw $s2, 0x38($sp) -/* C79380 802426A0 AFB10034 */ sw $s1, 0x34($sp) -/* C79384 802426A4 AFB00030 */ sw $s0, 0x30($sp) -/* C79388 802426A8 8E910148 */ lw $s1, 0x148($s4) -/* C7938C 802426AC 00A0902D */ daddu $s2, $a1, $zero -/* C79390 802426B0 86240008 */ lh $a0, 8($s1) -/* C79394 802426B4 0C00EABB */ jal get_npc_unsafe -/* C79398 802426B8 00C0982D */ daddu $s3, $a2, $zero -/* C7939C 802426BC 0040802D */ daddu $s0, $v0, $zero -/* C793A0 802426C0 9602008E */ lhu $v0, 0x8e($s0) -/* C793A4 802426C4 2442FFFF */ addiu $v0, $v0, -1 -/* C793A8 802426C8 A602008E */ sh $v0, 0x8e($s0) -/* C793AC 802426CC 00021400 */ sll $v0, $v0, 0x10 -/* C793B0 802426D0 14400020 */ bnez $v0, .L80242754 -/* C793B4 802426D4 0260202D */ daddu $a0, $s3, $zero -/* C793B8 802426D8 AFA00010 */ sw $zero, 0x10($sp) -/* C793BC 802426DC 8E46000C */ lw $a2, 0xc($s2) -/* C793C0 802426E0 8E470010 */ lw $a3, 0x10($s2) -/* C793C4 802426E4 0C01242D */ jal func_800490B4 -/* C793C8 802426E8 0220282D */ daddu $a1, $s1, $zero -/* C793CC 802426EC 54400018 */ bnel $v0, $zero, .L80242750 -/* C793D0 802426F0 A600008E */ sh $zero, 0x8e($s0) -/* C793D4 802426F4 24040002 */ addiu $a0, $zero, 2 -/* C793D8 802426F8 0200282D */ daddu $a1, $s0, $zero -/* C793DC 802426FC 0000302D */ daddu $a2, $zero, $zero -/* C793E0 80242700 860300A8 */ lh $v1, 0xa8($s0) -/* C793E4 80242704 3C013F80 */ lui $at, 0x3f80 -/* C793E8 80242708 44810000 */ mtc1 $at, $f0 -/* C793EC 8024270C 3C014000 */ lui $at, 0x4000 -/* C793F0 80242710 44811000 */ mtc1 $at, $f2 -/* C793F4 80242714 3C01C1A0 */ lui $at, 0xc1a0 -/* C793F8 80242718 44812000 */ mtc1 $at, $f4 -/* C793FC 8024271C 2402000F */ addiu $v0, $zero, 0xf -/* C79400 80242720 AFA2001C */ sw $v0, 0x1c($sp) -/* C79404 80242724 44833000 */ mtc1 $v1, $f6 -/* C79408 80242728 00000000 */ nop -/* C7940C 8024272C 468031A0 */ cvt.s.w $f6, $f6 -/* C79410 80242730 44073000 */ mfc1 $a3, $f6 -/* C79414 80242734 27A20028 */ addiu $v0, $sp, 0x28 -/* C79418 80242738 AFA20020 */ sw $v0, 0x20($sp) -/* C7941C 8024273C E7A00010 */ swc1 $f0, 0x10($sp) -/* C79420 80242740 E7A20014 */ swc1 $f2, 0x14($sp) -/* C79424 80242744 0C01BFA4 */ jal fx_emote -/* C79428 80242748 E7A40018 */ swc1 $f4, 0x18($sp) -/* C7942C 8024274C A600008E */ sh $zero, 0x8e($s0) -.L80242750: -/* C79430 80242750 AE800070 */ sw $zero, 0x70($s4) -.L80242754: -/* C79434 80242754 8FBF0044 */ lw $ra, 0x44($sp) -/* C79438 80242758 8FB40040 */ lw $s4, 0x40($sp) -/* C7943C 8024275C 8FB3003C */ lw $s3, 0x3c($sp) -/* C79440 80242760 8FB20038 */ lw $s2, 0x38($sp) -/* C79444 80242764 8FB10034 */ lw $s1, 0x34($sp) -/* C79448 80242768 8FB00030 */ lw $s0, 0x30($sp) -/* C7944C 8024276C 03E00008 */ jr $ra -/* C79450 80242770 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s new file mode 100644 index 0000000000..1340c41863 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242688_C79368.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242688_C79368 +/* C79368 80242688 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C7936C 8024268C AFB40040 */ sw $s4, 0x40($sp) +/* C79370 80242690 0080A02D */ daddu $s4, $a0, $zero +/* C79374 80242694 AFBF0044 */ sw $ra, 0x44($sp) +/* C79378 80242698 AFB3003C */ sw $s3, 0x3c($sp) +/* C7937C 8024269C AFB20038 */ sw $s2, 0x38($sp) +/* C79380 802426A0 AFB10034 */ sw $s1, 0x34($sp) +/* C79384 802426A4 AFB00030 */ sw $s0, 0x30($sp) +/* C79388 802426A8 8E910148 */ lw $s1, 0x148($s4) +/* C7938C 802426AC 00A0902D */ daddu $s2, $a1, $zero +/* C79390 802426B0 86240008 */ lh $a0, 8($s1) +/* C79394 802426B4 0C00EABB */ jal get_npc_unsafe +/* C79398 802426B8 00C0982D */ daddu $s3, $a2, $zero +/* C7939C 802426BC 0040802D */ daddu $s0, $v0, $zero +/* C793A0 802426C0 9602008E */ lhu $v0, 0x8e($s0) +/* C793A4 802426C4 2442FFFF */ addiu $v0, $v0, -1 +/* C793A8 802426C8 A602008E */ sh $v0, 0x8e($s0) +/* C793AC 802426CC 00021400 */ sll $v0, $v0, 0x10 +/* C793B0 802426D0 14400020 */ bnez $v0, .L80242754 +/* C793B4 802426D4 0260202D */ daddu $a0, $s3, $zero +/* C793B8 802426D8 AFA00010 */ sw $zero, 0x10($sp) +/* C793BC 802426DC 8E46000C */ lw $a2, 0xc($s2) +/* C793C0 802426E0 8E470010 */ lw $a3, 0x10($s2) +/* C793C4 802426E4 0C01242D */ jal func_800490B4 +/* C793C8 802426E8 0220282D */ daddu $a1, $s1, $zero +/* C793CC 802426EC 54400018 */ bnel $v0, $zero, .L80242750 +/* C793D0 802426F0 A600008E */ sh $zero, 0x8e($s0) +/* C793D4 802426F4 24040002 */ addiu $a0, $zero, 2 +/* C793D8 802426F8 0200282D */ daddu $a1, $s0, $zero +/* C793DC 802426FC 0000302D */ daddu $a2, $zero, $zero +/* C793E0 80242700 860300A8 */ lh $v1, 0xa8($s0) +/* C793E4 80242704 3C013F80 */ lui $at, 0x3f80 +/* C793E8 80242708 44810000 */ mtc1 $at, $f0 +/* C793EC 8024270C 3C014000 */ lui $at, 0x4000 +/* C793F0 80242710 44811000 */ mtc1 $at, $f2 +/* C793F4 80242714 3C01C1A0 */ lui $at, 0xc1a0 +/* C793F8 80242718 44812000 */ mtc1 $at, $f4 +/* C793FC 8024271C 2402000F */ addiu $v0, $zero, 0xf +/* C79400 80242720 AFA2001C */ sw $v0, 0x1c($sp) +/* C79404 80242724 44833000 */ mtc1 $v1, $f6 +/* C79408 80242728 00000000 */ nop +/* C7940C 8024272C 468031A0 */ cvt.s.w $f6, $f6 +/* C79410 80242730 44073000 */ mfc1 $a3, $f6 +/* C79414 80242734 27A20028 */ addiu $v0, $sp, 0x28 +/* C79418 80242738 AFA20020 */ sw $v0, 0x20($sp) +/* C7941C 8024273C E7A00010 */ swc1 $f0, 0x10($sp) +/* C79420 80242740 E7A20014 */ swc1 $f2, 0x14($sp) +/* C79424 80242744 0C01BFA4 */ jal fx_emote +/* C79428 80242748 E7A40018 */ swc1 $f4, 0x18($sp) +/* C7942C 8024274C A600008E */ sh $zero, 0x8e($s0) +.L80242750: +/* C79430 80242750 AE800070 */ sw $zero, 0x70($s4) +.L80242754: +/* C79434 80242754 8FBF0044 */ lw $ra, 0x44($sp) +/* C79438 80242758 8FB40040 */ lw $s4, 0x40($sp) +/* C7943C 8024275C 8FB3003C */ lw $s3, 0x3c($sp) +/* C79440 80242760 8FB20038 */ lw $s2, 0x38($sp) +/* C79444 80242764 8FB10034 */ lw $s1, 0x34($sp) +/* C79448 80242768 8FB00030 */ lw $s0, 0x30($sp) +/* C7944C 8024276C 03E00008 */ jr $ra +/* C79450 80242770 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774.s deleted file mode 100644 index 42a598f733..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242774 -/* C79454 80242774 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C79458 80242778 AFB20038 */ sw $s2, 0x38($sp) -/* C7945C 8024277C 0080902D */ daddu $s2, $a0, $zero -/* C79460 80242780 AFBF0048 */ sw $ra, 0x48($sp) -/* C79464 80242784 AFB50044 */ sw $s5, 0x44($sp) -/* C79468 80242788 AFB40040 */ sw $s4, 0x40($sp) -/* C7946C 8024278C AFB3003C */ sw $s3, 0x3c($sp) -/* C79470 80242790 AFB10034 */ sw $s1, 0x34($sp) -/* C79474 80242794 AFB00030 */ sw $s0, 0x30($sp) -/* C79478 80242798 8E510148 */ lw $s1, 0x148($s2) -/* C7947C 8024279C 86240008 */ lh $a0, 8($s1) -/* C79480 802427A0 0C00EABB */ jal get_npc_unsafe -/* C79484 802427A4 00A0802D */ daddu $s0, $a1, $zero -/* C79488 802427A8 8E43000C */ lw $v1, 0xc($s2) -/* C7948C 802427AC 0240202D */ daddu $a0, $s2, $zero -/* C79490 802427B0 8C650000 */ lw $a1, ($v1) -/* C79494 802427B4 0C0B1EAF */ jal get_variable -/* C79498 802427B8 0040A82D */ daddu $s5, $v0, $zero -/* C7949C 802427BC AFA00010 */ sw $zero, 0x10($sp) -/* C794A0 802427C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794A4 802427C4 8C630030 */ lw $v1, 0x30($v1) -/* C794A8 802427C8 AFA30014 */ sw $v1, 0x14($sp) -/* C794AC 802427CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794B0 802427D0 8C63001C */ lw $v1, 0x1c($v1) -/* C794B4 802427D4 AFA30018 */ sw $v1, 0x18($sp) -/* C794B8 802427D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794BC 802427DC 8C630024 */ lw $v1, 0x24($v1) -/* C794C0 802427E0 AFA3001C */ sw $v1, 0x1c($sp) -/* C794C4 802427E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794C8 802427E8 8C630028 */ lw $v1, 0x28($v1) -/* C794CC 802427EC 27B40010 */ addiu $s4, $sp, 0x10 -/* C794D0 802427F0 AFA30020 */ sw $v1, 0x20($sp) -/* C794D4 802427F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C794D8 802427F8 3C014348 */ lui $at, 0x4348 -/* C794DC 802427FC 44810000 */ mtc1 $at, $f0 -/* C794E0 80242800 8C63002C */ lw $v1, 0x2c($v1) -/* C794E4 80242804 0040982D */ daddu $s3, $v0, $zero -/* C794E8 80242808 E7A00028 */ swc1 $f0, 0x28($sp) -/* C794EC 8024280C A7A0002C */ sh $zero, 0x2c($sp) -/* C794F0 80242810 16000005 */ bnez $s0, .L80242828 -/* C794F4 80242814 AFA30024 */ sw $v1, 0x24($sp) -/* C794F8 80242818 8E2200B0 */ lw $v0, 0xb0($s1) -/* C794FC 8024281C 30420004 */ andi $v0, $v0, 4 -/* C79500 80242820 10400011 */ beqz $v0, .L80242868 -/* C79504 80242824 00000000 */ nop -.L80242828: -/* C79508 80242828 AE400070 */ sw $zero, 0x70($s2) -/* C7950C 8024282C A6A0008E */ sh $zero, 0x8e($s5) -/* C79510 80242830 8E2200CC */ lw $v0, 0xcc($s1) -/* C79514 80242834 8C420000 */ lw $v0, ($v0) -/* C79518 80242838 AEA20028 */ sw $v0, 0x28($s5) -/* C7951C 8024283C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79520 80242840 30420004 */ andi $v0, $v0, 4 -/* C79524 80242844 10400008 */ beqz $v0, .L80242868 -/* C79528 80242848 AE20006C */ sw $zero, 0x6c($s1) -/* C7952C 8024284C 24020063 */ addiu $v0, $zero, 0x63 -/* C79530 80242850 AE420070 */ sw $v0, 0x70($s2) -/* C79534 80242854 AE400074 */ sw $zero, 0x74($s2) -/* C79538 80242858 8E2200B0 */ lw $v0, 0xb0($s1) -/* C7953C 8024285C 2403FFFB */ addiu $v1, $zero, -5 -/* C79540 80242860 00431024 */ and $v0, $v0, $v1 -/* C79544 80242864 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242868: -/* C79548 80242868 8E430070 */ lw $v1, 0x70($s2) -/* C7954C 8024286C 2410000B */ addiu $s0, $zero, 0xb -/* C79550 80242870 1070002A */ beq $v1, $s0, .L8024291C -/* C79554 80242874 2862000C */ slti $v0, $v1, 0xc -/* C79558 80242878 1040000D */ beqz $v0, .L802428B0 -/* C7955C 8024287C 24020001 */ addiu $v0, $zero, 1 -/* C79560 80242880 1062001A */ beq $v1, $v0, .L802428EC -/* C79564 80242884 28620002 */ slti $v0, $v1, 2 -/* C79568 80242888 10400005 */ beqz $v0, .L802428A0 -/* C7956C 8024288C 2402000A */ addiu $v0, $zero, 0xa -/* C79570 80242890 10600013 */ beqz $v1, .L802428E0 -/* C79574 80242894 0240202D */ daddu $a0, $s2, $zero -/* C79578 80242898 08090A67 */ j .L8024299C -/* C7957C 8024289C 00000000 */ nop -.L802428A0: -/* C79580 802428A0 10620018 */ beq $v1, $v0, .L80242904 -/* C79584 802428A4 0240202D */ daddu $a0, $s2, $zero -/* C79588 802428A8 08090A67 */ j .L8024299C -/* C7958C 802428AC 00000000 */ nop -.L802428B0: -/* C79590 802428B0 2402000D */ addiu $v0, $zero, 0xd -/* C79594 802428B4 10620029 */ beq $v1, $v0, .L8024295C -/* C79598 802428B8 0062102A */ slt $v0, $v1, $v0 -/* C7959C 802428BC 14400020 */ bnez $v0, .L80242940 -/* C795A0 802428C0 0240202D */ daddu $a0, $s2, $zero -/* C795A4 802428C4 2402000E */ addiu $v0, $zero, 0xe -/* C795A8 802428C8 1062002D */ beq $v1, $v0, .L80242980 -/* C795AC 802428CC 24020063 */ addiu $v0, $zero, 0x63 -/* C795B0 802428D0 10620030 */ beq $v1, $v0, .L80242994 -/* C795B4 802428D4 00000000 */ nop -/* C795B8 802428D8 08090A67 */ j .L8024299C -/* C795BC 802428DC 00000000 */ nop -.L802428E0: -/* C795C0 802428E0 0260282D */ daddu $a1, $s3, $zero -/* C795C4 802428E4 0C09063C */ jal func_802418F0 -/* C795C8 802428E8 0280302D */ daddu $a2, $s4, $zero -.L802428EC: -/* C795CC 802428EC 0240202D */ daddu $a0, $s2, $zero -/* C795D0 802428F0 0260282D */ daddu $a1, $s3, $zero -/* C795D4 802428F4 0C090657 */ jal func_8024195C -/* C795D8 802428F8 0280302D */ daddu $a2, $s4, $zero -/* C795DC 802428FC 08090A67 */ j .L8024299C -/* C795E0 80242900 00000000 */ nop -.L80242904: -/* C795E4 80242904 0260282D */ daddu $a1, $s3, $zero -/* C795E8 80242908 0C090696 */ jal func_80241A58 -/* C795EC 8024290C 0280302D */ daddu $a2, $s4, $zero -/* C795F0 80242910 8E420070 */ lw $v0, 0x70($s2) -/* C795F4 80242914 14500021 */ bne $v0, $s0, .L8024299C -/* C795F8 80242918 00000000 */ nop -.L8024291C: -/* C795FC 8024291C 0240202D */ daddu $a0, $s2, $zero -/* C79600 80242920 0260282D */ daddu $a1, $s3, $zero -/* C79604 80242924 0C090926 */ jal func_80242498 -/* C79608 80242928 0280302D */ daddu $a2, $s4, $zero -/* C7960C 8024292C 8E430070 */ lw $v1, 0x70($s2) -/* C79610 80242930 2402000C */ addiu $v0, $zero, 0xc -/* C79614 80242934 14620019 */ bne $v1, $v0, .L8024299C -/* C79618 80242938 00000000 */ nop -/* C7961C 8024293C 0240202D */ daddu $a0, $s2, $zero -.L80242940: -/* C79620 80242940 0260282D */ daddu $a1, $s3, $zero -/* C79624 80242944 0C09094A */ jal func_80242528 -/* C79628 80242948 0280302D */ daddu $a2, $s4, $zero -/* C7962C 8024294C 8E430070 */ lw $v1, 0x70($s2) -/* C79630 80242950 2402000D */ addiu $v0, $zero, 0xd -/* C79634 80242954 14620011 */ bne $v1, $v0, .L8024299C -/* C79638 80242958 00000000 */ nop -.L8024295C: -/* C7963C 8024295C 0240202D */ daddu $a0, $s2, $zero -/* C79640 80242960 0260282D */ daddu $a1, $s3, $zero -/* C79644 80242964 0C09098A */ jal func_80242628 -/* C79648 80242968 0280302D */ daddu $a2, $s4, $zero -/* C7964C 8024296C 8E430070 */ lw $v1, 0x70($s2) -/* C79650 80242970 2402000E */ addiu $v0, $zero, 0xe -/* C79654 80242974 14620009 */ bne $v1, $v0, .L8024299C -/* C79658 80242978 00000000 */ nop -/* C7965C 8024297C 0240202D */ daddu $a0, $s2, $zero -.L80242980: -/* C79660 80242980 0260282D */ daddu $a1, $s3, $zero -/* C79664 80242984 0C0909A2 */ jal func_80242688 -/* C79668 80242988 0280302D */ daddu $a2, $s4, $zero -/* C7966C 8024298C 08090A67 */ j .L8024299C -/* C79670 80242990 00000000 */ nop -.L80242994: -/* C79674 80242994 0C0129CF */ jal func_8004A73C -/* C79678 80242998 0240202D */ daddu $a0, $s2, $zero -.L8024299C: -/* C7967C 8024299C 8FBF0048 */ lw $ra, 0x48($sp) -/* C79680 802429A0 8FB50044 */ lw $s5, 0x44($sp) -/* C79684 802429A4 8FB40040 */ lw $s4, 0x40($sp) -/* C79688 802429A8 8FB3003C */ lw $s3, 0x3c($sp) -/* C7968C 802429AC 8FB20038 */ lw $s2, 0x38($sp) -/* C79690 802429B0 8FB10034 */ lw $s1, 0x34($sp) -/* C79694 802429B4 8FB00030 */ lw $s0, 0x30($sp) -/* C79698 802429B8 0000102D */ daddu $v0, $zero, $zero -/* C7969C 802429BC 03E00008 */ jr $ra -/* C796A0 802429C0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s new file mode 100644 index 0000000000..0a2261c5c8 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242774_C79454.s @@ -0,0 +1,165 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242774_C79454 +/* C79454 80242774 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C79458 80242778 AFB20038 */ sw $s2, 0x38($sp) +/* C7945C 8024277C 0080902D */ daddu $s2, $a0, $zero +/* C79460 80242780 AFBF0048 */ sw $ra, 0x48($sp) +/* C79464 80242784 AFB50044 */ sw $s5, 0x44($sp) +/* C79468 80242788 AFB40040 */ sw $s4, 0x40($sp) +/* C7946C 8024278C AFB3003C */ sw $s3, 0x3c($sp) +/* C79470 80242790 AFB10034 */ sw $s1, 0x34($sp) +/* C79474 80242794 AFB00030 */ sw $s0, 0x30($sp) +/* C79478 80242798 8E510148 */ lw $s1, 0x148($s2) +/* C7947C 8024279C 86240008 */ lh $a0, 8($s1) +/* C79480 802427A0 0C00EABB */ jal get_npc_unsafe +/* C79484 802427A4 00A0802D */ daddu $s0, $a1, $zero +/* C79488 802427A8 8E43000C */ lw $v1, 0xc($s2) +/* C7948C 802427AC 0240202D */ daddu $a0, $s2, $zero +/* C79490 802427B0 8C650000 */ lw $a1, ($v1) +/* C79494 802427B4 0C0B1EAF */ jal get_variable +/* C79498 802427B8 0040A82D */ daddu $s5, $v0, $zero +/* C7949C 802427BC AFA00010 */ sw $zero, 0x10($sp) +/* C794A0 802427C0 8E2300D0 */ lw $v1, 0xd0($s1) +/* C794A4 802427C4 8C630030 */ lw $v1, 0x30($v1) +/* C794A8 802427C8 AFA30014 */ sw $v1, 0x14($sp) +/* C794AC 802427CC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C794B0 802427D0 8C63001C */ lw $v1, 0x1c($v1) +/* C794B4 802427D4 AFA30018 */ sw $v1, 0x18($sp) +/* C794B8 802427D8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C794BC 802427DC 8C630024 */ lw $v1, 0x24($v1) +/* C794C0 802427E0 AFA3001C */ sw $v1, 0x1c($sp) +/* C794C4 802427E4 8E2300D0 */ lw $v1, 0xd0($s1) +/* C794C8 802427E8 8C630028 */ lw $v1, 0x28($v1) +/* C794CC 802427EC 27B40010 */ addiu $s4, $sp, 0x10 +/* C794D0 802427F0 AFA30020 */ sw $v1, 0x20($sp) +/* C794D4 802427F4 8E2300D0 */ lw $v1, 0xd0($s1) +/* C794D8 802427F8 3C014348 */ lui $at, 0x4348 +/* C794DC 802427FC 44810000 */ mtc1 $at, $f0 +/* C794E0 80242800 8C63002C */ lw $v1, 0x2c($v1) +/* C794E4 80242804 0040982D */ daddu $s3, $v0, $zero +/* C794E8 80242808 E7A00028 */ swc1 $f0, 0x28($sp) +/* C794EC 8024280C A7A0002C */ sh $zero, 0x2c($sp) +/* C794F0 80242810 16000005 */ bnez $s0, .L80242828 +/* C794F4 80242814 AFA30024 */ sw $v1, 0x24($sp) +/* C794F8 80242818 8E2200B0 */ lw $v0, 0xb0($s1) +/* C794FC 8024281C 30420004 */ andi $v0, $v0, 4 +/* C79500 80242820 10400011 */ beqz $v0, .L80242868 +/* C79504 80242824 00000000 */ nop +.L80242828: +/* C79508 80242828 AE400070 */ sw $zero, 0x70($s2) +/* C7950C 8024282C A6A0008E */ sh $zero, 0x8e($s5) +/* C79510 80242830 8E2200CC */ lw $v0, 0xcc($s1) +/* C79514 80242834 8C420000 */ lw $v0, ($v0) +/* C79518 80242838 AEA20028 */ sw $v0, 0x28($s5) +/* C7951C 8024283C 8E2200B0 */ lw $v0, 0xb0($s1) +/* C79520 80242840 30420004 */ andi $v0, $v0, 4 +/* C79524 80242844 10400008 */ beqz $v0, .L80242868 +/* C79528 80242848 AE20006C */ sw $zero, 0x6c($s1) +/* C7952C 8024284C 24020063 */ addiu $v0, $zero, 0x63 +/* C79530 80242850 AE420070 */ sw $v0, 0x70($s2) +/* C79534 80242854 AE400074 */ sw $zero, 0x74($s2) +/* C79538 80242858 8E2200B0 */ lw $v0, 0xb0($s1) +/* C7953C 8024285C 2403FFFB */ addiu $v1, $zero, -5 +/* C79540 80242860 00431024 */ and $v0, $v0, $v1 +/* C79544 80242864 AE2200B0 */ sw $v0, 0xb0($s1) +.L80242868: +/* C79548 80242868 8E430070 */ lw $v1, 0x70($s2) +/* C7954C 8024286C 2410000B */ addiu $s0, $zero, 0xb +/* C79550 80242870 1070002A */ beq $v1, $s0, .L8024291C +/* C79554 80242874 2862000C */ slti $v0, $v1, 0xc +/* C79558 80242878 1040000D */ beqz $v0, .L802428B0 +/* C7955C 8024287C 24020001 */ addiu $v0, $zero, 1 +/* C79560 80242880 1062001A */ beq $v1, $v0, .L802428EC +/* C79564 80242884 28620002 */ slti $v0, $v1, 2 +/* C79568 80242888 10400005 */ beqz $v0, .L802428A0 +/* C7956C 8024288C 2402000A */ addiu $v0, $zero, 0xa +/* C79570 80242890 10600013 */ beqz $v1, .L802428E0 +/* C79574 80242894 0240202D */ daddu $a0, $s2, $zero +/* C79578 80242898 08090A67 */ j .L8024299C +/* C7957C 8024289C 00000000 */ nop +.L802428A0: +/* C79580 802428A0 10620018 */ beq $v1, $v0, .L80242904 +/* C79584 802428A4 0240202D */ daddu $a0, $s2, $zero +/* C79588 802428A8 08090A67 */ j .L8024299C +/* C7958C 802428AC 00000000 */ nop +.L802428B0: +/* C79590 802428B0 2402000D */ addiu $v0, $zero, 0xd +/* C79594 802428B4 10620029 */ beq $v1, $v0, .L8024295C +/* C79598 802428B8 0062102A */ slt $v0, $v1, $v0 +/* C7959C 802428BC 14400020 */ bnez $v0, .L80242940 +/* C795A0 802428C0 0240202D */ daddu $a0, $s2, $zero +/* C795A4 802428C4 2402000E */ addiu $v0, $zero, 0xe +/* C795A8 802428C8 1062002D */ beq $v1, $v0, .L80242980 +/* C795AC 802428CC 24020063 */ addiu $v0, $zero, 0x63 +/* C795B0 802428D0 10620030 */ beq $v1, $v0, .L80242994 +/* C795B4 802428D4 00000000 */ nop +/* C795B8 802428D8 08090A67 */ j .L8024299C +/* C795BC 802428DC 00000000 */ nop +.L802428E0: +/* C795C0 802428E0 0260282D */ daddu $a1, $s3, $zero +/* C795C4 802428E4 0C09063C */ jal func_802418F0_C785D0 +/* C795C8 802428E8 0280302D */ daddu $a2, $s4, $zero +.L802428EC: +/* C795CC 802428EC 0240202D */ daddu $a0, $s2, $zero +/* C795D0 802428F0 0260282D */ daddu $a1, $s3, $zero +/* C795D4 802428F4 0C090657 */ jal func_8024195C_C7863C +/* C795D8 802428F8 0280302D */ daddu $a2, $s4, $zero +/* C795DC 802428FC 08090A67 */ j .L8024299C +/* C795E0 80242900 00000000 */ nop +.L80242904: +/* C795E4 80242904 0260282D */ daddu $a1, $s3, $zero +/* C795E8 80242908 0C090696 */ jal func_80241A58_C78738 +/* C795EC 8024290C 0280302D */ daddu $a2, $s4, $zero +/* C795F0 80242910 8E420070 */ lw $v0, 0x70($s2) +/* C795F4 80242914 14500021 */ bne $v0, $s0, .L8024299C +/* C795F8 80242918 00000000 */ nop +.L8024291C: +/* C795FC 8024291C 0240202D */ daddu $a0, $s2, $zero +/* C79600 80242920 0260282D */ daddu $a1, $s3, $zero +/* C79604 80242924 0C090926 */ jal func_80242498_C79178 +/* C79608 80242928 0280302D */ daddu $a2, $s4, $zero +/* C7960C 8024292C 8E430070 */ lw $v1, 0x70($s2) +/* C79610 80242930 2402000C */ addiu $v0, $zero, 0xc +/* C79614 80242934 14620019 */ bne $v1, $v0, .L8024299C +/* C79618 80242938 00000000 */ nop +/* C7961C 8024293C 0240202D */ daddu $a0, $s2, $zero +.L80242940: +/* C79620 80242940 0260282D */ daddu $a1, $s3, $zero +/* C79624 80242944 0C09094A */ jal func_80242528_C79208 +/* C79628 80242948 0280302D */ daddu $a2, $s4, $zero +/* C7962C 8024294C 8E430070 */ lw $v1, 0x70($s2) +/* C79630 80242950 2402000D */ addiu $v0, $zero, 0xd +/* C79634 80242954 14620011 */ bne $v1, $v0, .L8024299C +/* C79638 80242958 00000000 */ nop +.L8024295C: +/* C7963C 8024295C 0240202D */ daddu $a0, $s2, $zero +/* C79640 80242960 0260282D */ daddu $a1, $s3, $zero +/* C79644 80242964 0C09098A */ jal func_80242628_C79308 +/* C79648 80242968 0280302D */ daddu $a2, $s4, $zero +/* C7964C 8024296C 8E430070 */ lw $v1, 0x70($s2) +/* C79650 80242970 2402000E */ addiu $v0, $zero, 0xe +/* C79654 80242974 14620009 */ bne $v1, $v0, .L8024299C +/* C79658 80242978 00000000 */ nop +/* C7965C 8024297C 0240202D */ daddu $a0, $s2, $zero +.L80242980: +/* C79660 80242980 0260282D */ daddu $a1, $s3, $zero +/* C79664 80242984 0C0909A2 */ jal func_80242688_C79368 +/* C79668 80242988 0280302D */ daddu $a2, $s4, $zero +/* C7966C 8024298C 08090A67 */ j .L8024299C +/* C79670 80242990 00000000 */ nop +.L80242994: +/* C79674 80242994 0C0129CF */ jal func_8004A73C +/* C79678 80242998 0240202D */ daddu $a0, $s2, $zero +.L8024299C: +/* C7967C 8024299C 8FBF0048 */ lw $ra, 0x48($sp) +/* C79680 802429A0 8FB50044 */ lw $s5, 0x44($sp) +/* C79684 802429A4 8FB40040 */ lw $s4, 0x40($sp) +/* C79688 802429A8 8FB3003C */ lw $s3, 0x3c($sp) +/* C7968C 802429AC 8FB20038 */ lw $s2, 0x38($sp) +/* C79690 802429B0 8FB10034 */ lw $s1, 0x34($sp) +/* C79694 802429B4 8FB00030 */ lw $s0, 0x30($sp) +/* C79698 802429B8 0000102D */ daddu $v0, $zero, $zero +/* C7969C 802429BC 03E00008 */ jr $ra +/* C796A0 802429C0 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802429C4.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802429C4.s deleted file mode 100644 index f8f1eb84bc..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802429C4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429C4 -/* C796A4 802429C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C796A8 802429C8 AFB20018 */ sw $s2, 0x18($sp) -/* C796AC 802429CC 0080902D */ daddu $s2, $a0, $zero -/* C796B0 802429D0 AFBF001C */ sw $ra, 0x1c($sp) -/* C796B4 802429D4 AFB10014 */ sw $s1, 0x14($sp) -/* C796B8 802429D8 AFB00010 */ sw $s0, 0x10($sp) -/* C796BC 802429DC 8E510148 */ lw $s1, 0x148($s2) -/* C796C0 802429E0 0C00EABB */ jal get_npc_unsafe -/* C796C4 802429E4 86240008 */ lh $a0, 8($s1) -/* C796C8 802429E8 0040802D */ daddu $s0, $v0, $zero -/* C796CC 802429EC 8E2300CC */ lw $v1, 0xcc($s1) -/* C796D0 802429F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C796D4 802429F4 8C630020 */ lw $v1, 0x20($v1) -/* C796D8 802429F8 AE030028 */ sw $v1, 0x28($s0) -/* C796DC 802429FC 96220076 */ lhu $v0, 0x76($s1) -/* C796E0 80242A00 A602008E */ sh $v0, 0x8e($s0) -/* C796E4 80242A04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C796E8 80242A08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C796EC 80242A0C C60E0040 */ lwc1 $f14, 0x40($s0) -/* C796F0 80242A10 8C460028 */ lw $a2, 0x28($v0) -/* C796F4 80242A14 0C00A720 */ jal atan2 -/* C796F8 80242A18 8C470030 */ lw $a3, 0x30($v0) -/* C796FC 80242A1C 2402000D */ addiu $v0, $zero, 0xd -/* C79700 80242A20 E600000C */ swc1 $f0, 0xc($s0) -/* C79704 80242A24 AE420070 */ sw $v0, 0x70($s2) -/* C79708 80242A28 8FBF001C */ lw $ra, 0x1c($sp) -/* C7970C 80242A2C 8FB20018 */ lw $s2, 0x18($sp) -/* C79710 80242A30 8FB10014 */ lw $s1, 0x14($sp) -/* C79714 80242A34 8FB00010 */ lw $s0, 0x10($sp) -/* C79718 80242A38 03E00008 */ jr $ra -/* C7971C 80242A3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802429C4_C796A4.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802429C4_C796A4.s new file mode 100644 index 0000000000..fbdd788d8d --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802429C4_C796A4.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429C4_C796A4 +/* C796A4 802429C4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C796A8 802429C8 AFB20018 */ sw $s2, 0x18($sp) +/* C796AC 802429CC 0080902D */ daddu $s2, $a0, $zero +/* C796B0 802429D0 AFBF001C */ sw $ra, 0x1c($sp) +/* C796B4 802429D4 AFB10014 */ sw $s1, 0x14($sp) +/* C796B8 802429D8 AFB00010 */ sw $s0, 0x10($sp) +/* C796BC 802429DC 8E510148 */ lw $s1, 0x148($s2) +/* C796C0 802429E0 0C00EABB */ jal get_npc_unsafe +/* C796C4 802429E4 86240008 */ lh $a0, 8($s1) +/* C796C8 802429E8 0040802D */ daddu $s0, $v0, $zero +/* C796CC 802429EC 8E2300CC */ lw $v1, 0xcc($s1) +/* C796D0 802429F0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C796D4 802429F4 8C630020 */ lw $v1, 0x20($v1) +/* C796D8 802429F8 AE030028 */ sw $v1, 0x28($s0) +/* C796DC 802429FC 96220076 */ lhu $v0, 0x76($s1) +/* C796E0 80242A00 A602008E */ sh $v0, 0x8e($s0) +/* C796E4 80242A04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C796E8 80242A08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C796EC 80242A0C C60E0040 */ lwc1 $f14, 0x40($s0) +/* C796F0 80242A10 8C460028 */ lw $a2, 0x28($v0) +/* C796F4 80242A14 0C00A720 */ jal atan2 +/* C796F8 80242A18 8C470030 */ lw $a3, 0x30($v0) +/* C796FC 80242A1C 2402000D */ addiu $v0, $zero, 0xd +/* C79700 80242A20 E600000C */ swc1 $f0, 0xc($s0) +/* C79704 80242A24 AE420070 */ sw $v0, 0x70($s2) +/* C79708 80242A28 8FBF001C */ lw $ra, 0x1c($sp) +/* C7970C 80242A2C 8FB20018 */ lw $s2, 0x18($sp) +/* C79710 80242A30 8FB10014 */ lw $s1, 0x14($sp) +/* C79714 80242A34 8FB00010 */ lw $s0, 0x10($sp) +/* C79718 80242A38 03E00008 */ jr $ra +/* C7971C 80242A3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40.s deleted file mode 100644 index 6b1330a868..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A40 -/* C79720 80242A40 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C79724 80242A44 AFB3001C */ sw $s3, 0x1c($sp) -/* C79728 80242A48 0080982D */ daddu $s3, $a0, $zero -/* C7972C 80242A4C AFBF0020 */ sw $ra, 0x20($sp) -/* C79730 80242A50 AFB20018 */ sw $s2, 0x18($sp) -/* C79734 80242A54 AFB10014 */ sw $s1, 0x14($sp) -/* C79738 80242A58 AFB00010 */ sw $s0, 0x10($sp) -/* C7973C 80242A5C 8E710148 */ lw $s1, 0x148($s3) -/* C79740 80242A60 86240008 */ lh $a0, 8($s1) -/* C79744 80242A64 0C00EABB */ jal get_npc_unsafe -/* C79748 80242A68 00A0902D */ daddu $s2, $a1, $zero -/* C7974C 80242A6C 0040802D */ daddu $s0, $v0, $zero -/* C79750 80242A70 8602008E */ lh $v0, 0x8e($s0) -/* C79754 80242A74 9603008E */ lhu $v1, 0x8e($s0) -/* C79758 80242A78 18400005 */ blez $v0, .L80242A90 -/* C7975C 80242A7C 2462FFFF */ addiu $v0, $v1, -1 -/* C79760 80242A80 A602008E */ sh $v0, 0x8e($s0) -/* C79764 80242A84 00021400 */ sll $v0, $v0, 0x10 -/* C79768 80242A88 1C400033 */ bgtz $v0, .L80242B58 -/* C7976C 80242A8C 00000000 */ nop -.L80242A90: -/* C79770 80242A90 8602008C */ lh $v0, 0x8c($s0) -/* C79774 80242A94 14400030 */ bnez $v0, .L80242B58 -/* C79778 80242A98 00000000 */ nop -/* C7977C 80242A9C 8E2200CC */ lw $v0, 0xcc($s1) -/* C79780 80242AA0 8C420024 */ lw $v0, 0x24($v0) -/* C79784 80242AA4 AE020028 */ sw $v0, 0x28($s0) -/* C79788 80242AA8 C6400018 */ lwc1 $f0, 0x18($s2) -/* C7978C 80242AAC E6000018 */ swc1 $f0, 0x18($s0) -/* C79790 80242AB0 8E230088 */ lw $v1, 0x88($s1) -/* C79794 80242AB4 24020005 */ addiu $v0, $zero, 5 -/* C79798 80242AB8 10620005 */ beq $v1, $v0, .L80242AD0 -/* C7979C 80242ABC 00000000 */ nop -/* C797A0 80242AC0 10600003 */ beqz $v1, .L80242AD0 -/* C797A4 80242AC4 24020001 */ addiu $v0, $zero, 1 -/* C797A8 80242AC8 14620006 */ bne $v1, $v0, .L80242AE4 -/* C797AC 80242ACC 00000000 */ nop -.L80242AD0: -/* C797B0 80242AD0 8E220084 */ lw $v0, 0x84($s1) -/* C797B4 80242AD4 00021FC2 */ srl $v1, $v0, 0x1f -/* C797B8 80242AD8 00431021 */ addu $v0, $v0, $v1 -/* C797BC 80242ADC 00021043 */ sra $v0, $v0, 1 -/* C797C0 80242AE0 A60200A8 */ sh $v0, 0xa8($s0) -.L80242AE4: -/* C797C4 80242AE4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C797C8 80242AE8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C797CC 80242AEC C60C0038 */ lwc1 $f12, 0x38($s0) -/* C797D0 80242AF0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C797D4 80242AF4 8C460028 */ lw $a2, 0x28($v0) -/* C797D8 80242AF8 0C00A7B5 */ jal dist2D -/* C797DC 80242AFC 8C470030 */ lw $a3, 0x30($v0) -/* C797E0 80242B00 C6020018 */ lwc1 $f2, 0x18($s0) -/* C797E4 80242B04 46020003 */ div.s $f0, $f0, $f2 -/* C797E8 80242B08 3C018024 */ lui $at, 0x8024 -/* C797EC 80242B0C D4227438 */ ldc1 $f2, 0x7438($at) -/* C797F0 80242B10 46000021 */ cvt.d.s $f0, $f0 -/* C797F4 80242B14 46220000 */ add.d $f0, $f0, $f2 -/* C797F8 80242B18 4620010D */ trunc.w.d $f4, $f0 -/* C797FC 80242B1C 44022000 */ mfc1 $v0, $f4 -/* C79800 80242B20 00000000 */ nop -/* C79804 80242B24 A602008E */ sh $v0, 0x8e($s0) -/* C79808 80242B28 00021400 */ sll $v0, $v0, 0x10 -/* C7980C 80242B2C 8E230078 */ lw $v1, 0x78($s1) -/* C79810 80242B30 00021403 */ sra $v0, $v0, 0x10 -/* C79814 80242B34 0043102A */ slt $v0, $v0, $v1 -/* C79818 80242B38 10400003 */ beqz $v0, .L80242B48 -/* C7981C 80242B3C 00000000 */ nop -/* C79820 80242B40 9622007A */ lhu $v0, 0x7a($s1) -/* C79824 80242B44 A602008E */ sh $v0, 0x8e($s0) -.L80242B48: -/* C79828 80242B48 8602008E */ lh $v0, 0x8e($s0) -/* C7982C 80242B4C AE22007C */ sw $v0, 0x7c($s1) -/* C79830 80242B50 2402000E */ addiu $v0, $zero, 0xe -/* C79834 80242B54 AE620070 */ sw $v0, 0x70($s3) -.L80242B58: -/* C79838 80242B58 8FBF0020 */ lw $ra, 0x20($sp) -/* C7983C 80242B5C 8FB3001C */ lw $s3, 0x1c($sp) -/* C79840 80242B60 8FB20018 */ lw $s2, 0x18($sp) -/* C79844 80242B64 8FB10014 */ lw $s1, 0x14($sp) -/* C79848 80242B68 8FB00010 */ lw $s0, 0x10($sp) -/* C7984C 80242B6C 03E00008 */ jr $ra -/* C79850 80242B70 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s new file mode 100644 index 0000000000..ee4eba08f8 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242A40_C79720.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A40_C79720 +/* C79720 80242A40 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C79724 80242A44 AFB3001C */ sw $s3, 0x1c($sp) +/* C79728 80242A48 0080982D */ daddu $s3, $a0, $zero +/* C7972C 80242A4C AFBF0020 */ sw $ra, 0x20($sp) +/* C79730 80242A50 AFB20018 */ sw $s2, 0x18($sp) +/* C79734 80242A54 AFB10014 */ sw $s1, 0x14($sp) +/* C79738 80242A58 AFB00010 */ sw $s0, 0x10($sp) +/* C7973C 80242A5C 8E710148 */ lw $s1, 0x148($s3) +/* C79740 80242A60 86240008 */ lh $a0, 8($s1) +/* C79744 80242A64 0C00EABB */ jal get_npc_unsafe +/* C79748 80242A68 00A0902D */ daddu $s2, $a1, $zero +/* C7974C 80242A6C 0040802D */ daddu $s0, $v0, $zero +/* C79750 80242A70 8602008E */ lh $v0, 0x8e($s0) +/* C79754 80242A74 9603008E */ lhu $v1, 0x8e($s0) +/* C79758 80242A78 18400005 */ blez $v0, .L80242A90 +/* C7975C 80242A7C 2462FFFF */ addiu $v0, $v1, -1 +/* C79760 80242A80 A602008E */ sh $v0, 0x8e($s0) +/* C79764 80242A84 00021400 */ sll $v0, $v0, 0x10 +/* C79768 80242A88 1C400033 */ bgtz $v0, .L80242B58 +/* C7976C 80242A8C 00000000 */ nop +.L80242A90: +/* C79770 80242A90 8602008C */ lh $v0, 0x8c($s0) +/* C79774 80242A94 14400030 */ bnez $v0, .L80242B58 +/* C79778 80242A98 00000000 */ nop +/* C7977C 80242A9C 8E2200CC */ lw $v0, 0xcc($s1) +/* C79780 80242AA0 8C420024 */ lw $v0, 0x24($v0) +/* C79784 80242AA4 AE020028 */ sw $v0, 0x28($s0) +/* C79788 80242AA8 C6400018 */ lwc1 $f0, 0x18($s2) +/* C7978C 80242AAC E6000018 */ swc1 $f0, 0x18($s0) +/* C79790 80242AB0 8E230088 */ lw $v1, 0x88($s1) +/* C79794 80242AB4 24020005 */ addiu $v0, $zero, 5 +/* C79798 80242AB8 10620005 */ beq $v1, $v0, .L80242AD0 +/* C7979C 80242ABC 00000000 */ nop +/* C797A0 80242AC0 10600003 */ beqz $v1, .L80242AD0 +/* C797A4 80242AC4 24020001 */ addiu $v0, $zero, 1 +/* C797A8 80242AC8 14620006 */ bne $v1, $v0, .L80242AE4 +/* C797AC 80242ACC 00000000 */ nop +.L80242AD0: +/* C797B0 80242AD0 8E220084 */ lw $v0, 0x84($s1) +/* C797B4 80242AD4 00021FC2 */ srl $v1, $v0, 0x1f +/* C797B8 80242AD8 00431021 */ addu $v0, $v0, $v1 +/* C797BC 80242ADC 00021043 */ sra $v0, $v0, 1 +/* C797C0 80242AE0 A60200A8 */ sh $v0, 0xa8($s0) +.L80242AE4: +/* C797C4 80242AE4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C797C8 80242AE8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C797CC 80242AEC C60C0038 */ lwc1 $f12, 0x38($s0) +/* C797D0 80242AF0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C797D4 80242AF4 8C460028 */ lw $a2, 0x28($v0) +/* C797D8 80242AF8 0C00A7B5 */ jal dist2D +/* C797DC 80242AFC 8C470030 */ lw $a3, 0x30($v0) +/* C797E0 80242B00 C6020018 */ lwc1 $f2, 0x18($s0) +/* C797E4 80242B04 46020003 */ div.s $f0, $f0, $f2 +/* C797E8 80242B08 3C018024 */ lui $at, 0x8024 +/* C797EC 80242B0C D4227438 */ ldc1 $f2, 0x7438($at) +/* C797F0 80242B10 46000021 */ cvt.d.s $f0, $f0 +/* C797F4 80242B14 46220000 */ add.d $f0, $f0, $f2 +/* C797F8 80242B18 4620010D */ trunc.w.d $f4, $f0 +/* C797FC 80242B1C 44022000 */ mfc1 $v0, $f4 +/* C79800 80242B20 00000000 */ nop +/* C79804 80242B24 A602008E */ sh $v0, 0x8e($s0) +/* C79808 80242B28 00021400 */ sll $v0, $v0, 0x10 +/* C7980C 80242B2C 8E230078 */ lw $v1, 0x78($s1) +/* C79810 80242B30 00021403 */ sra $v0, $v0, 0x10 +/* C79814 80242B34 0043102A */ slt $v0, $v0, $v1 +/* C79818 80242B38 10400003 */ beqz $v0, .L80242B48 +/* C7981C 80242B3C 00000000 */ nop +/* C79820 80242B40 9622007A */ lhu $v0, 0x7a($s1) +/* C79824 80242B44 A602008E */ sh $v0, 0x8e($s0) +.L80242B48: +/* C79828 80242B48 8602008E */ lh $v0, 0x8e($s0) +/* C7982C 80242B4C AE22007C */ sw $v0, 0x7c($s1) +/* C79830 80242B50 2402000E */ addiu $v0, $zero, 0xe +/* C79834 80242B54 AE620070 */ sw $v0, 0x70($s3) +.L80242B58: +/* C79838 80242B58 8FBF0020 */ lw $ra, 0x20($sp) +/* C7983C 80242B5C 8FB3001C */ lw $s3, 0x1c($sp) +/* C79840 80242B60 8FB20018 */ lw $s2, 0x18($sp) +/* C79844 80242B64 8FB10014 */ lw $s1, 0x14($sp) +/* C79848 80242B68 8FB00010 */ lw $s0, 0x10($sp) +/* C7984C 80242B6C 03E00008 */ jr $ra +/* C79850 80242B70 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242B74.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242B74.s deleted file mode 100644 index a2a855f715..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242B74.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B74 -/* C79854 80242B74 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C79858 80242B78 AFB3003C */ sw $s3, 0x3c($sp) -/* C7985C 80242B7C 0080982D */ daddu $s3, $a0, $zero -/* C79860 80242B80 AFBF0040 */ sw $ra, 0x40($sp) -/* C79864 80242B84 AFB20038 */ sw $s2, 0x38($sp) -/* C79868 80242B88 AFB10034 */ sw $s1, 0x34($sp) -/* C7986C 80242B8C AFB00030 */ sw $s0, 0x30($sp) -/* C79870 80242B90 8E710148 */ lw $s1, 0x148($s3) -/* C79874 80242B94 0C00EABB */ jal get_npc_unsafe -/* C79878 80242B98 86240008 */ lh $a0, 8($s1) -/* C7987C 80242B9C 0040802D */ daddu $s0, $v0, $zero -/* C79880 80242BA0 8E22007C */ lw $v0, 0x7c($s1) -/* C79884 80242BA4 8603008E */ lh $v1, 0x8e($s0) -/* C79888 80242BA8 2442FFFF */ addiu $v0, $v0, -1 -/* C7988C 80242BAC 14620012 */ bne $v1, $v0, .L80242BF8 -/* C79890 80242BB0 00000000 */ nop -/* C79894 80242BB4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C79898 80242BB8 4600020D */ trunc.w.s $f8, $f0 -/* C7989C 80242BBC 44024000 */ mfc1 $v0, $f8 -/* C798A0 80242BC0 00000000 */ nop -/* C798A4 80242BC4 A6220010 */ sh $v0, 0x10($s1) -/* C798A8 80242BC8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C798AC 80242BCC 4600020D */ trunc.w.s $f8, $f0 -/* C798B0 80242BD0 44024000 */ mfc1 $v0, $f8 -/* C798B4 80242BD4 00000000 */ nop -/* C798B8 80242BD8 A6220012 */ sh $v0, 0x12($s1) -/* C798BC 80242BDC C6000040 */ lwc1 $f0, 0x40($s0) -/* C798C0 80242BE0 24020001 */ addiu $v0, $zero, 1 -/* C798C4 80242BE4 A2220007 */ sb $v0, 7($s1) -/* C798C8 80242BE8 4600020D */ trunc.w.s $f8, $f0 -/* C798CC 80242BEC 44024000 */ mfc1 $v0, $f8 -/* C798D0 80242BF0 00000000 */ nop -/* C798D4 80242BF4 A6220014 */ sh $v0, 0x14($s1) -.L80242BF8: -/* C798D8 80242BF8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C798DC 80242BFC C602003C */ lwc1 $f2, 0x3c($s0) -/* C798E0 80242C00 C6040040 */ lwc1 $f4, 0x40($s0) -/* C798E4 80242C04 C6060018 */ lwc1 $f6, 0x18($s0) -/* C798E8 80242C08 E7A00020 */ swc1 $f0, 0x20($sp) -/* C798EC 80242C0C E7A20024 */ swc1 $f2, 0x24($sp) -/* C798F0 80242C10 E7A40028 */ swc1 $f4, 0x28($sp) -/* C798F4 80242C14 E7A60010 */ swc1 $f6, 0x10($sp) -/* C798F8 80242C18 C600000C */ lwc1 $f0, 0xc($s0) -/* C798FC 80242C1C E7A00014 */ swc1 $f0, 0x14($sp) -/* C79900 80242C20 860200A8 */ lh $v0, 0xa8($s0) -/* C79904 80242C24 27A50020 */ addiu $a1, $sp, 0x20 -/* C79908 80242C28 44820000 */ mtc1 $v0, $f0 -/* C7990C 80242C2C 00000000 */ nop -/* C79910 80242C30 46800020 */ cvt.s.w $f0, $f0 -/* C79914 80242C34 E7A00018 */ swc1 $f0, 0x18($sp) -/* C79918 80242C38 860200A6 */ lh $v0, 0xa6($s0) -/* C7991C 80242C3C 27A60024 */ addiu $a2, $sp, 0x24 -/* C79920 80242C40 44820000 */ mtc1 $v0, $f0 -/* C79924 80242C44 00000000 */ nop -/* C79928 80242C48 46800020 */ cvt.s.w $f0, $f0 -/* C7992C 80242C4C E7A0001C */ swc1 $f0, 0x1c($sp) -/* C79930 80242C50 8E040080 */ lw $a0, 0x80($s0) -/* C79934 80242C54 0C037711 */ jal func_800DDC44 -/* C79938 80242C58 27A70028 */ addiu $a3, $sp, 0x28 -/* C7993C 80242C5C 0040902D */ daddu $s2, $v0, $zero -/* C79940 80242C60 16400005 */ bnez $s2, .L80242C78 -/* C79944 80242C64 00000000 */ nop -/* C79948 80242C68 8E050018 */ lw $a1, 0x18($s0) -/* C7994C 80242C6C 8E06000C */ lw $a2, 0xc($s0) -/* C79950 80242C70 0C00EA95 */ jal npc_move_heading -/* C79954 80242C74 0200202D */ daddu $a0, $s0, $zero -.L80242C78: -/* C79958 80242C78 8602008E */ lh $v0, 0x8e($s0) -/* C7995C 80242C7C 9603008E */ lhu $v1, 0x8e($s0) -/* C79960 80242C80 18400007 */ blez $v0, .L80242CA0 -/* C79964 80242C84 2462FFFF */ addiu $v0, $v1, -1 -/* C79968 80242C88 A602008E */ sh $v0, 0x8e($s0) -/* C7996C 80242C8C 00021400 */ sll $v0, $v0, 0x10 -/* C79970 80242C90 18400003 */ blez $v0, .L80242CA0 -/* C79974 80242C94 00000000 */ nop -/* C79978 80242C98 12400008 */ beqz $s2, .L80242CBC -/* C7997C 80242C9C 00000000 */ nop -.L80242CA0: -/* C79980 80242CA0 8E2200CC */ lw $v0, 0xcc($s1) -/* C79984 80242CA4 A2200007 */ sb $zero, 7($s1) -/* C79988 80242CA8 8C420028 */ lw $v0, 0x28($v0) -/* C7998C 80242CAC A600008E */ sh $zero, 0x8e($s0) -/* C79990 80242CB0 AE020028 */ sw $v0, 0x28($s0) -/* C79994 80242CB4 2402000F */ addiu $v0, $zero, 0xf -/* C79998 80242CB8 AE620070 */ sw $v0, 0x70($s3) -.L80242CBC: -/* C7999C 80242CBC 8FBF0040 */ lw $ra, 0x40($sp) -/* C799A0 80242CC0 8FB3003C */ lw $s3, 0x3c($sp) -/* C799A4 80242CC4 8FB20038 */ lw $s2, 0x38($sp) -/* C799A8 80242CC8 8FB10034 */ lw $s1, 0x34($sp) -/* C799AC 80242CCC 8FB00030 */ lw $s0, 0x30($sp) -/* C799B0 80242CD0 03E00008 */ jr $ra -/* C799B4 80242CD4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242B74_C79854.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242B74_C79854.s new file mode 100644 index 0000000000..e1a3890878 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242B74_C79854.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B74_C79854 +/* C79854 80242B74 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C79858 80242B78 AFB3003C */ sw $s3, 0x3c($sp) +/* C7985C 80242B7C 0080982D */ daddu $s3, $a0, $zero +/* C79860 80242B80 AFBF0040 */ sw $ra, 0x40($sp) +/* C79864 80242B84 AFB20038 */ sw $s2, 0x38($sp) +/* C79868 80242B88 AFB10034 */ sw $s1, 0x34($sp) +/* C7986C 80242B8C AFB00030 */ sw $s0, 0x30($sp) +/* C79870 80242B90 8E710148 */ lw $s1, 0x148($s3) +/* C79874 80242B94 0C00EABB */ jal get_npc_unsafe +/* C79878 80242B98 86240008 */ lh $a0, 8($s1) +/* C7987C 80242B9C 0040802D */ daddu $s0, $v0, $zero +/* C79880 80242BA0 8E22007C */ lw $v0, 0x7c($s1) +/* C79884 80242BA4 8603008E */ lh $v1, 0x8e($s0) +/* C79888 80242BA8 2442FFFF */ addiu $v0, $v0, -1 +/* C7988C 80242BAC 14620012 */ bne $v1, $v0, .L80242BF8 +/* C79890 80242BB0 00000000 */ nop +/* C79894 80242BB4 C6000038 */ lwc1 $f0, 0x38($s0) +/* C79898 80242BB8 4600020D */ trunc.w.s $f8, $f0 +/* C7989C 80242BBC 44024000 */ mfc1 $v0, $f8 +/* C798A0 80242BC0 00000000 */ nop +/* C798A4 80242BC4 A6220010 */ sh $v0, 0x10($s1) +/* C798A8 80242BC8 C600003C */ lwc1 $f0, 0x3c($s0) +/* C798AC 80242BCC 4600020D */ trunc.w.s $f8, $f0 +/* C798B0 80242BD0 44024000 */ mfc1 $v0, $f8 +/* C798B4 80242BD4 00000000 */ nop +/* C798B8 80242BD8 A6220012 */ sh $v0, 0x12($s1) +/* C798BC 80242BDC C6000040 */ lwc1 $f0, 0x40($s0) +/* C798C0 80242BE0 24020001 */ addiu $v0, $zero, 1 +/* C798C4 80242BE4 A2220007 */ sb $v0, 7($s1) +/* C798C8 80242BE8 4600020D */ trunc.w.s $f8, $f0 +/* C798CC 80242BEC 44024000 */ mfc1 $v0, $f8 +/* C798D0 80242BF0 00000000 */ nop +/* C798D4 80242BF4 A6220014 */ sh $v0, 0x14($s1) +.L80242BF8: +/* C798D8 80242BF8 C6000038 */ lwc1 $f0, 0x38($s0) +/* C798DC 80242BFC C602003C */ lwc1 $f2, 0x3c($s0) +/* C798E0 80242C00 C6040040 */ lwc1 $f4, 0x40($s0) +/* C798E4 80242C04 C6060018 */ lwc1 $f6, 0x18($s0) +/* C798E8 80242C08 E7A00020 */ swc1 $f0, 0x20($sp) +/* C798EC 80242C0C E7A20024 */ swc1 $f2, 0x24($sp) +/* C798F0 80242C10 E7A40028 */ swc1 $f4, 0x28($sp) +/* C798F4 80242C14 E7A60010 */ swc1 $f6, 0x10($sp) +/* C798F8 80242C18 C600000C */ lwc1 $f0, 0xc($s0) +/* C798FC 80242C1C E7A00014 */ swc1 $f0, 0x14($sp) +/* C79900 80242C20 860200A8 */ lh $v0, 0xa8($s0) +/* C79904 80242C24 27A50020 */ addiu $a1, $sp, 0x20 +/* C79908 80242C28 44820000 */ mtc1 $v0, $f0 +/* C7990C 80242C2C 00000000 */ nop +/* C79910 80242C30 46800020 */ cvt.s.w $f0, $f0 +/* C79914 80242C34 E7A00018 */ swc1 $f0, 0x18($sp) +/* C79918 80242C38 860200A6 */ lh $v0, 0xa6($s0) +/* C7991C 80242C3C 27A60024 */ addiu $a2, $sp, 0x24 +/* C79920 80242C40 44820000 */ mtc1 $v0, $f0 +/* C79924 80242C44 00000000 */ nop +/* C79928 80242C48 46800020 */ cvt.s.w $f0, $f0 +/* C7992C 80242C4C E7A0001C */ swc1 $f0, 0x1c($sp) +/* C79930 80242C50 8E040080 */ lw $a0, 0x80($s0) +/* C79934 80242C54 0C037711 */ jal func_800DDC44 +/* C79938 80242C58 27A70028 */ addiu $a3, $sp, 0x28 +/* C7993C 80242C5C 0040902D */ daddu $s2, $v0, $zero +/* C79940 80242C60 16400005 */ bnez $s2, .L80242C78 +/* C79944 80242C64 00000000 */ nop +/* C79948 80242C68 8E050018 */ lw $a1, 0x18($s0) +/* C7994C 80242C6C 8E06000C */ lw $a2, 0xc($s0) +/* C79950 80242C70 0C00EA95 */ jal npc_move_heading +/* C79954 80242C74 0200202D */ daddu $a0, $s0, $zero +.L80242C78: +/* C79958 80242C78 8602008E */ lh $v0, 0x8e($s0) +/* C7995C 80242C7C 9603008E */ lhu $v1, 0x8e($s0) +/* C79960 80242C80 18400007 */ blez $v0, .L80242CA0 +/* C79964 80242C84 2462FFFF */ addiu $v0, $v1, -1 +/* C79968 80242C88 A602008E */ sh $v0, 0x8e($s0) +/* C7996C 80242C8C 00021400 */ sll $v0, $v0, 0x10 +/* C79970 80242C90 18400003 */ blez $v0, .L80242CA0 +/* C79974 80242C94 00000000 */ nop +/* C79978 80242C98 12400008 */ beqz $s2, .L80242CBC +/* C7997C 80242C9C 00000000 */ nop +.L80242CA0: +/* C79980 80242CA0 8E2200CC */ lw $v0, 0xcc($s1) +/* C79984 80242CA4 A2200007 */ sb $zero, 7($s1) +/* C79988 80242CA8 8C420028 */ lw $v0, 0x28($v0) +/* C7998C 80242CAC A600008E */ sh $zero, 0x8e($s0) +/* C79990 80242CB0 AE020028 */ sw $v0, 0x28($s0) +/* C79994 80242CB4 2402000F */ addiu $v0, $zero, 0xf +/* C79998 80242CB8 AE620070 */ sw $v0, 0x70($s3) +.L80242CBC: +/* C7999C 80242CBC 8FBF0040 */ lw $ra, 0x40($sp) +/* C799A0 80242CC0 8FB3003C */ lw $s3, 0x3c($sp) +/* C799A4 80242CC4 8FB20038 */ lw $s2, 0x38($sp) +/* C799A8 80242CC8 8FB10034 */ lw $s1, 0x34($sp) +/* C799AC 80242CCC 8FB00030 */ lw $s0, 0x30($sp) +/* C799B0 80242CD0 03E00008 */ jr $ra +/* C799B4 80242CD4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242CD8.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242CD8.s deleted file mode 100644 index 022f2e7578..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242CD8.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CD8 -/* C799B8 80242CD8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C799BC 80242CDC AFB10014 */ sw $s1, 0x14($sp) -/* C799C0 80242CE0 0080882D */ daddu $s1, $a0, $zero -/* C799C4 80242CE4 AFBF0018 */ sw $ra, 0x18($sp) -/* C799C8 80242CE8 AFB00010 */ sw $s0, 0x10($sp) -/* C799CC 80242CEC 8E300148 */ lw $s0, 0x148($s1) -/* C799D0 80242CF0 0C00EABB */ jal get_npc_unsafe -/* C799D4 80242CF4 86040008 */ lh $a0, 8($s0) -/* C799D8 80242CF8 0040202D */ daddu $a0, $v0, $zero -/* C799DC 80242CFC 9482008E */ lhu $v0, 0x8e($a0) -/* C799E0 80242D00 24030003 */ addiu $v1, $zero, 3 -/* C799E4 80242D04 24420001 */ addiu $v0, $v0, 1 -/* C799E8 80242D08 A482008E */ sh $v0, 0x8e($a0) -/* C799EC 80242D0C 00021400 */ sll $v0, $v0, 0x10 -/* C799F0 80242D10 00021403 */ sra $v0, $v0, 0x10 -/* C799F4 80242D14 14430003 */ bne $v0, $v1, .L80242D24 -/* C799F8 80242D18 00000000 */ nop -/* C799FC 80242D1C 96020086 */ lhu $v0, 0x86($s0) -/* C79A00 80242D20 A48200A8 */ sh $v0, 0xa8($a0) -.L80242D24: -/* C79A04 80242D24 8482008E */ lh $v0, 0x8e($a0) -/* C79A08 80242D28 8E030080 */ lw $v1, 0x80($s0) -/* C79A0C 80242D2C 0043102A */ slt $v0, $v0, $v1 -/* C79A10 80242D30 14400004 */ bnez $v0, .L80242D44 -/* C79A14 80242D34 00000000 */ nop -/* C79A18 80242D38 96020086 */ lhu $v0, 0x86($s0) -/* C79A1C 80242D3C A48200A8 */ sh $v0, 0xa8($a0) -/* C79A20 80242D40 AE200070 */ sw $zero, 0x70($s1) -.L80242D44: -/* C79A24 80242D44 8FBF0018 */ lw $ra, 0x18($sp) -/* C79A28 80242D48 8FB10014 */ lw $s1, 0x14($sp) -/* C79A2C 80242D4C 8FB00010 */ lw $s0, 0x10($sp) -/* C79A30 80242D50 03E00008 */ jr $ra -/* C79A34 80242D54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242CD8_C799B8.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242CD8_C799B8.s new file mode 100644 index 0000000000..f6caa0ac94 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242CD8_C799B8.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242CD8_C799B8 +/* C799B8 80242CD8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C799BC 80242CDC AFB10014 */ sw $s1, 0x14($sp) +/* C799C0 80242CE0 0080882D */ daddu $s1, $a0, $zero +/* C799C4 80242CE4 AFBF0018 */ sw $ra, 0x18($sp) +/* C799C8 80242CE8 AFB00010 */ sw $s0, 0x10($sp) +/* C799CC 80242CEC 8E300148 */ lw $s0, 0x148($s1) +/* C799D0 80242CF0 0C00EABB */ jal get_npc_unsafe +/* C799D4 80242CF4 86040008 */ lh $a0, 8($s0) +/* C799D8 80242CF8 0040202D */ daddu $a0, $v0, $zero +/* C799DC 80242CFC 9482008E */ lhu $v0, 0x8e($a0) +/* C799E0 80242D00 24030003 */ addiu $v1, $zero, 3 +/* C799E4 80242D04 24420001 */ addiu $v0, $v0, 1 +/* C799E8 80242D08 A482008E */ sh $v0, 0x8e($a0) +/* C799EC 80242D0C 00021400 */ sll $v0, $v0, 0x10 +/* C799F0 80242D10 00021403 */ sra $v0, $v0, 0x10 +/* C799F4 80242D14 14430003 */ bne $v0, $v1, .L80242D24 +/* C799F8 80242D18 00000000 */ nop +/* C799FC 80242D1C 96020086 */ lhu $v0, 0x86($s0) +/* C79A00 80242D20 A48200A8 */ sh $v0, 0xa8($a0) +.L80242D24: +/* C79A04 80242D24 8482008E */ lh $v0, 0x8e($a0) +/* C79A08 80242D28 8E030080 */ lw $v1, 0x80($s0) +/* C79A0C 80242D2C 0043102A */ slt $v0, $v0, $v1 +/* C79A10 80242D30 14400004 */ bnez $v0, .L80242D44 +/* C79A14 80242D34 00000000 */ nop +/* C79A18 80242D38 96020086 */ lhu $v0, 0x86($s0) +/* C79A1C 80242D3C A48200A8 */ sh $v0, 0xa8($a0) +/* C79A20 80242D40 AE200070 */ sw $zero, 0x70($s1) +.L80242D44: +/* C79A24 80242D44 8FBF0018 */ lw $ra, 0x18($sp) +/* C79A28 80242D48 8FB10014 */ lw $s1, 0x14($sp) +/* C79A2C 80242D4C 8FB00010 */ lw $s0, 0x10($sp) +/* C79A30 80242D50 03E00008 */ jr $ra +/* C79A34 80242D54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58.s deleted file mode 100644 index ce032bd700..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D58 -/* C79A38 80242D58 27BDFF90 */ addiu $sp, $sp, -0x70 -/* C79A3C 80242D5C AFB3005C */ sw $s3, 0x5c($sp) -/* C79A40 80242D60 0080982D */ daddu $s3, $a0, $zero -/* C79A44 80242D64 AFBF0068 */ sw $ra, 0x68($sp) -/* C79A48 80242D68 AFB50064 */ sw $s5, 0x64($sp) -/* C79A4C 80242D6C AFB40060 */ sw $s4, 0x60($sp) -/* C79A50 80242D70 AFB20058 */ sw $s2, 0x58($sp) -/* C79A54 80242D74 AFB10054 */ sw $s1, 0x54($sp) -/* C79A58 80242D78 AFB00050 */ sw $s0, 0x50($sp) -/* C79A5C 80242D7C 8E710148 */ lw $s1, 0x148($s3) -/* C79A60 80242D80 86240008 */ lh $a0, 8($s1) -/* C79A64 80242D84 0C00EABB */ jal get_npc_unsafe -/* C79A68 80242D88 00A0802D */ daddu $s0, $a1, $zero -/* C79A6C 80242D8C 8E63000C */ lw $v1, 0xc($s3) -/* C79A70 80242D90 0260202D */ daddu $a0, $s3, $zero -/* C79A74 80242D94 8C650000 */ lw $a1, ($v1) -/* C79A78 80242D98 0C0B1EAF */ jal get_variable -/* C79A7C 80242D9C 0040902D */ daddu $s2, $v0, $zero -/* C79A80 80242DA0 AFA00028 */ sw $zero, 0x28($sp) -/* C79A84 80242DA4 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79A88 80242DA8 8C630030 */ lw $v1, 0x30($v1) -/* C79A8C 80242DAC AFA3002C */ sw $v1, 0x2c($sp) -/* C79A90 80242DB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79A94 80242DB4 8C63001C */ lw $v1, 0x1c($v1) -/* C79A98 80242DB8 AFA30030 */ sw $v1, 0x30($sp) -/* C79A9C 80242DBC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79AA0 80242DC0 8C630024 */ lw $v1, 0x24($v1) -/* C79AA4 80242DC4 AFA30034 */ sw $v1, 0x34($sp) -/* C79AA8 80242DC8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79AAC 80242DCC 8C630028 */ lw $v1, 0x28($v1) -/* C79AB0 80242DD0 27B50028 */ addiu $s5, $sp, 0x28 -/* C79AB4 80242DD4 AFA30038 */ sw $v1, 0x38($sp) -/* C79AB8 80242DD8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C79ABC 80242DDC 3C0142C8 */ lui $at, 0x42c8 -/* C79AC0 80242DE0 44810000 */ mtc1 $at, $f0 -/* C79AC4 80242DE4 8C63002C */ lw $v1, 0x2c($v1) -/* C79AC8 80242DE8 0040A02D */ daddu $s4, $v0, $zero -/* C79ACC 80242DEC E7A00040 */ swc1 $f0, 0x40($sp) -/* C79AD0 80242DF0 A7A00044 */ sh $zero, 0x44($sp) -/* C79AD4 80242DF4 12000009 */ beqz $s0, .L80242E1C -/* C79AD8 80242DF8 AFA3003C */ sw $v1, 0x3c($sp) -/* C79ADC 80242DFC 864300A8 */ lh $v1, 0xa8($s2) -/* C79AE0 80242E00 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79AE4 80242E04 AE20008C */ sw $zero, 0x8c($s1) -/* C79AE8 80242E08 A22000B5 */ sb $zero, 0xb5($s1) -/* C79AEC 80242E0C 34420008 */ ori $v0, $v0, 8 -/* C79AF0 80242E10 AE230084 */ sw $v1, 0x84($s1) -/* C79AF4 80242E14 08090B8B */ j .L80242E2C -/* C79AF8 80242E18 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242E1C: -/* C79AFC 80242E1C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79B00 80242E20 30420004 */ andi $v0, $v0, 4 -/* C79B04 80242E24 10400047 */ beqz $v0, .L80242F44 -/* C79B08 80242E28 00000000 */ nop -.L80242E2C: -/* C79B0C 80242E2C AE600070 */ sw $zero, 0x70($s3) -/* C79B10 80242E30 A640008E */ sh $zero, 0x8e($s2) -/* C79B14 80242E34 8E2300CC */ lw $v1, 0xcc($s1) -/* C79B18 80242E38 2404F7FF */ addiu $a0, $zero, -0x801 -/* C79B1C 80242E3C A2200007 */ sb $zero, 7($s1) -/* C79B20 80242E40 8E420000 */ lw $v0, ($s2) -/* C79B24 80242E44 8C630000 */ lw $v1, ($v1) -/* C79B28 80242E48 00441024 */ and $v0, $v0, $a0 -/* C79B2C 80242E4C AE420000 */ sw $v0, ($s2) -/* C79B30 80242E50 AE430028 */ sw $v1, 0x28($s2) -/* C79B34 80242E54 96220086 */ lhu $v0, 0x86($s1) -/* C79B38 80242E58 A64200A8 */ sh $v0, 0xa8($s2) -/* C79B3C 80242E5C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C79B40 80242E60 AE200090 */ sw $zero, 0x90($s1) -/* C79B44 80242E64 8C420034 */ lw $v0, 0x34($v0) -/* C79B48 80242E68 14400006 */ bnez $v0, .L80242E84 -/* C79B4C 80242E6C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C79B50 80242E70 8E420000 */ lw $v0, ($s2) -/* C79B54 80242E74 2403FFF7 */ addiu $v1, $zero, -9 -/* C79B58 80242E78 34420200 */ ori $v0, $v0, 0x200 -/* C79B5C 80242E7C 08090BA4 */ j .L80242E90 -/* C79B60 80242E80 00431024 */ and $v0, $v0, $v1 -.L80242E84: -/* C79B64 80242E84 8E420000 */ lw $v0, ($s2) -/* C79B68 80242E88 00431024 */ and $v0, $v0, $v1 -/* C79B6C 80242E8C 34420008 */ ori $v0, $v0, 8 -.L80242E90: -/* C79B70 80242E90 AE420000 */ sw $v0, ($s2) -/* C79B74 80242E94 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79B78 80242E98 30420004 */ andi $v0, $v0, 4 -/* C79B7C 80242E9C 1040001E */ beqz $v0, .L80242F18 -/* C79B80 80242EA0 24040002 */ addiu $a0, $zero, 2 -/* C79B84 80242EA4 0240282D */ daddu $a1, $s2, $zero -/* C79B88 80242EA8 0000302D */ daddu $a2, $zero, $zero -/* C79B8C 80242EAC 24020063 */ addiu $v0, $zero, 0x63 -/* C79B90 80242EB0 AE620070 */ sw $v0, 0x70($s3) -/* C79B94 80242EB4 AE600074 */ sw $zero, 0x74($s3) -/* C79B98 80242EB8 864300A8 */ lh $v1, 0xa8($s2) -/* C79B9C 80242EBC 3C013F80 */ lui $at, 0x3f80 -/* C79BA0 80242EC0 44810000 */ mtc1 $at, $f0 -/* C79BA4 80242EC4 3C014000 */ lui $at, 0x4000 -/* C79BA8 80242EC8 44811000 */ mtc1 $at, $f2 -/* C79BAC 80242ECC 3C01C1A0 */ lui $at, 0xc1a0 -/* C79BB0 80242ED0 44812000 */ mtc1 $at, $f4 -/* C79BB4 80242ED4 24020028 */ addiu $v0, $zero, 0x28 -/* C79BB8 80242ED8 AFA2001C */ sw $v0, 0x1c($sp) -/* C79BBC 80242EDC 44833000 */ mtc1 $v1, $f6 -/* C79BC0 80242EE0 00000000 */ nop -/* C79BC4 80242EE4 468031A0 */ cvt.s.w $f6, $f6 -/* C79BC8 80242EE8 44073000 */ mfc1 $a3, $f6 -/* C79BCC 80242EEC 27A20048 */ addiu $v0, $sp, 0x48 -/* C79BD0 80242EF0 AFA20020 */ sw $v0, 0x20($sp) -/* C79BD4 80242EF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C79BD8 80242EF8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C79BDC 80242EFC 0C01BFA4 */ jal fx_emote -/* C79BE0 80242F00 E7A40018 */ swc1 $f4, 0x18($sp) -/* C79BE4 80242F04 8E2200B0 */ lw $v0, 0xb0($s1) -/* C79BE8 80242F08 2403FFFB */ addiu $v1, $zero, -5 -/* C79BEC 80242F0C 00431024 */ and $v0, $v0, $v1 -/* C79BF0 80242F10 08090BD1 */ j .L80242F44 -/* C79BF4 80242F14 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242F18: -/* C79BF8 80242F18 8E220000 */ lw $v0, ($s1) -/* C79BFC 80242F1C 3C034000 */ lui $v1, 0x4000 -/* C79C00 80242F20 00431024 */ and $v0, $v0, $v1 -/* C79C04 80242F24 10400007 */ beqz $v0, .L80242F44 -/* C79C08 80242F28 3C03BFFF */ lui $v1, 0xbfff -/* C79C0C 80242F2C 2402000C */ addiu $v0, $zero, 0xc -/* C79C10 80242F30 AE620070 */ sw $v0, 0x70($s3) -/* C79C14 80242F34 8E220000 */ lw $v0, ($s1) -/* C79C18 80242F38 3463FFFF */ ori $v1, $v1, 0xffff -/* C79C1C 80242F3C 00431024 */ and $v0, $v0, $v1 -/* C79C20 80242F40 AE220000 */ sw $v0, ($s1) -.L80242F44: -/* C79C24 80242F44 8E220090 */ lw $v0, 0x90($s1) -/* C79C28 80242F48 1840000C */ blez $v0, .L80242F7C -/* C79C2C 80242F4C 2442FFFF */ addiu $v0, $v0, -1 -/* C79C30 80242F50 14400087 */ bnez $v0, .L80243170 -/* C79C34 80242F54 AE220090 */ sw $v0, 0x90($s1) -/* C79C38 80242F58 3C03FFAA */ lui $v1, 0xffaa -/* C79C3C 80242F5C 8E420028 */ lw $v0, 0x28($s2) -/* C79C40 80242F60 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* C79C44 80242F64 00431021 */ addu $v0, $v0, $v1 -/* C79C48 80242F68 2C420002 */ sltiu $v0, $v0, 2 -/* C79C4C 80242F6C 10400003 */ beqz $v0, .L80242F7C -/* C79C50 80242F70 3C020055 */ lui $v0, 0x55 -/* C79C54 80242F74 3442000C */ ori $v0, $v0, 0xc -/* C79C58 80242F78 AE420028 */ sw $v0, 0x28($s2) -.L80242F7C: -/* C79C5C 80242F7C 8E630070 */ lw $v1, 0x70($s3) -/* C79C60 80242F80 2402000C */ addiu $v0, $zero, 0xc -/* C79C64 80242F84 10620048 */ beq $v1, $v0, .L802430A8 -/* C79C68 80242F88 2862000D */ slti $v0, $v1, 0xd -/* C79C6C 80242F8C 1040000F */ beqz $v0, .L80242FCC -/* C79C70 80242F90 24100001 */ addiu $s0, $zero, 1 -/* C79C74 80242F94 1070001E */ beq $v1, $s0, .L80243010 -/* C79C78 80242F98 28620002 */ slti $v0, $v1, 2 -/* C79C7C 80242F9C 10400005 */ beqz $v0, .L80242FB4 -/* C79C80 80242FA0 24020002 */ addiu $v0, $zero, 2 -/* C79C84 80242FA4 10600015 */ beqz $v1, .L80242FFC -/* C79C88 80242FA8 0260202D */ daddu $a0, $s3, $zero -/* C79C8C 80242FAC 08090C41 */ j .L80243104 -/* C79C90 80242FB0 00000000 */ nop -.L80242FB4: -/* C79C94 80242FB4 1062001C */ beq $v1, $v0, .L80243028 -/* C79C98 80242FB8 24020003 */ addiu $v0, $zero, 3 -/* C79C9C 80242FBC 10620035 */ beq $v1, $v0, .L80243094 -/* C79CA0 80242FC0 0260202D */ daddu $a0, $s3, $zero -/* C79CA4 80242FC4 08090C41 */ j .L80243104 -/* C79CA8 80242FC8 00000000 */ nop -.L80242FCC: -/* C79CAC 80242FCC 2402000E */ addiu $v0, $zero, 0xe -/* C79CB0 80242FD0 1062003F */ beq $v1, $v0, .L802430D0 -/* C79CB4 80242FD4 0062102A */ slt $v0, $v1, $v0 -/* C79CB8 80242FD8 14400038 */ bnez $v0, .L802430BC -/* C79CBC 80242FDC 0260202D */ daddu $a0, $s3, $zero -/* C79CC0 80242FE0 2402000F */ addiu $v0, $zero, 0xf -/* C79CC4 80242FE4 10620040 */ beq $v1, $v0, .L802430E8 -/* C79CC8 80242FE8 24020063 */ addiu $v0, $zero, 0x63 -/* C79CCC 80242FEC 10620043 */ beq $v1, $v0, .L802430FC -/* C79CD0 80242FF0 00000000 */ nop -/* C79CD4 80242FF4 08090C41 */ j .L80243104 -/* C79CD8 80242FF8 00000000 */ nop -.L80242FFC: -/* C79CDC 80242FFC 0280282D */ daddu $a1, $s4, $zero -/* C79CE0 80243000 0C012568 */ jal func_800495A0 -/* C79CE4 80243004 02A0302D */ daddu $a2, $s5, $zero -/* C79CE8 80243008 96220086 */ lhu $v0, 0x86($s1) -/* C79CEC 8024300C A64200A8 */ sh $v0, 0xa8($s2) -.L80243010: -/* C79CF0 80243010 0260202D */ daddu $a0, $s3, $zero -/* C79CF4 80243014 0280282D */ daddu $a1, $s4, $zero -/* C79CF8 80243018 0C0125AE */ jal func_800496B8 -/* C79CFC 8024301C 02A0302D */ daddu $a2, $s5, $zero -/* C79D00 80243020 08090C41 */ j .L80243104 -/* C79D04 80243024 00000000 */ nop -.L80243028: -/* C79D08 80243028 0260202D */ daddu $a0, $s3, $zero -/* C79D0C 8024302C 0280282D */ daddu $a1, $s4, $zero -/* C79D10 80243030 0C0126D1 */ jal func_80049B44 -/* C79D14 80243034 02A0302D */ daddu $a2, $s5, $zero -/* C79D18 80243038 8E230088 */ lw $v1, 0x88($s1) -/* C79D1C 8024303C 24020006 */ addiu $v0, $zero, 6 -/* C79D20 80243040 14620014 */ bne $v1, $v0, .L80243094 -/* C79D24 80243044 0260202D */ daddu $a0, $s3, $zero -/* C79D28 80243048 0C00A67F */ jal rand_int -/* C79D2C 8024304C 24040064 */ addiu $a0, $zero, 0x64 -/* C79D30 80243050 28420021 */ slti $v0, $v0, 0x21 -/* C79D34 80243054 5040000F */ beql $v0, $zero, .L80243094 -/* C79D38 80243058 0260202D */ daddu $a0, $s3, $zero -/* C79D3C 8024305C 8E22008C */ lw $v0, 0x8c($s1) -/* C79D40 80243060 10400005 */ beqz $v0, .L80243078 -/* C79D44 80243064 3C020055 */ lui $v0, 0x55 -/* C79D48 80243068 3442002F */ ori $v0, $v0, 0x2f -/* C79D4C 8024306C AE20008C */ sw $zero, 0x8c($s1) -/* C79D50 80243070 08090C21 */ j .L80243084 -/* C79D54 80243074 A22000B5 */ sb $zero, 0xb5($s1) -.L80243078: -/* C79D58 80243078 3442002E */ ori $v0, $v0, 0x2e -/* C79D5C 8024307C AE30008C */ sw $s0, 0x8c($s1) -/* C79D60 80243080 A23000B5 */ sb $s0, 0xb5($s1) -.L80243084: -/* C79D64 80243084 AE420028 */ sw $v0, 0x28($s2) -/* C79D68 80243088 24020007 */ addiu $v0, $zero, 7 -/* C79D6C 8024308C 08090C5C */ j .L80243170 -/* C79D70 80243090 AE220090 */ sw $v0, 0x90($s1) -.L80243094: -/* C79D74 80243094 0280282D */ daddu $a1, $s4, $zero -/* C79D78 80243098 0C012701 */ jal func_80049C04 -/* C79D7C 8024309C 02A0302D */ daddu $a2, $s5, $zero -/* C79D80 802430A0 08090C41 */ j .L80243104 -/* C79D84 802430A4 00000000 */ nop -.L802430A8: -/* C79D88 802430A8 0260202D */ daddu $a0, $s3, $zero -/* C79D8C 802430AC 0280282D */ daddu $a1, $s4, $zero -/* C79D90 802430B0 0C090A71 */ jal func_802429C4 -/* C79D94 802430B4 02A0302D */ daddu $a2, $s5, $zero -/* C79D98 802430B8 0260202D */ daddu $a0, $s3, $zero -.L802430BC: -/* C79D9C 802430BC 0280282D */ daddu $a1, $s4, $zero -/* C79DA0 802430C0 0C090A90 */ jal func_80242A40 -/* C79DA4 802430C4 02A0302D */ daddu $a2, $s5, $zero -/* C79DA8 802430C8 08090C41 */ j .L80243104 -/* C79DAC 802430CC 00000000 */ nop -.L802430D0: -/* C79DB0 802430D0 0260202D */ daddu $a0, $s3, $zero -/* C79DB4 802430D4 0280282D */ daddu $a1, $s4, $zero -/* C79DB8 802430D8 0C090ADD */ jal func_80242B74 -/* C79DBC 802430DC 02A0302D */ daddu $a2, $s5, $zero -/* C79DC0 802430E0 08090C41 */ j .L80243104 -/* C79DC4 802430E4 00000000 */ nop -.L802430E8: -/* C79DC8 802430E8 0280282D */ daddu $a1, $s4, $zero -/* C79DCC 802430EC 0C090B36 */ jal func_80242CD8 -/* C79DD0 802430F0 02A0302D */ daddu $a2, $s5, $zero -/* C79DD4 802430F4 08090C41 */ j .L80243104 -/* C79DD8 802430F8 00000000 */ nop -.L802430FC: -/* C79DDC 802430FC 0C0129CF */ jal func_8004A73C -/* C79DE0 80243100 0260202D */ daddu $a0, $s3, $zero -.L80243104: -/* C79DE4 80243104 8E230088 */ lw $v1, 0x88($s1) -/* C79DE8 80243108 24020006 */ addiu $v0, $zero, 6 -/* C79DEC 8024310C 14620019 */ bne $v1, $v0, .L80243174 -/* C79DF0 80243110 0000102D */ daddu $v0, $zero, $zero -/* C79DF4 80243114 8E22008C */ lw $v0, 0x8c($s1) -/* C79DF8 80243118 10400003 */ beqz $v0, .L80243128 -/* C79DFC 8024311C 24020001 */ addiu $v0, $zero, 1 -/* C79E00 80243120 08090C4B */ j .L8024312C -/* C79E04 80243124 A22200B5 */ sb $v0, 0xb5($s1) -.L80243128: -/* C79E08 80243128 A22000B5 */ sb $zero, 0xb5($s1) -.L8024312C: -/* C79E0C 8024312C 8E22008C */ lw $v0, 0x8c($s1) -/* C79E10 80243130 1040000F */ beqz $v0, .L80243170 -/* C79E14 80243134 3C03FFAA */ lui $v1, 0xffaa -/* C79E18 80243138 8E420028 */ lw $v0, 0x28($s2) -/* C79E1C 8024313C 3463FFFC */ ori $v1, $v1, 0xfffc -/* C79E20 80243140 00431821 */ addu $v1, $v0, $v1 -/* C79E24 80243144 2C620015 */ sltiu $v0, $v1, 0x15 -/* C79E28 80243148 10400009 */ beqz $v0, .L80243170 -/* C79E2C 8024314C 00031080 */ sll $v0, $v1, 2 -/* C79E30 80243150 3C018024 */ lui $at, 0x8024 -/* C79E34 80243154 00220821 */ addu $at, $at, $v0 -/* C79E38 80243158 8C227440 */ lw $v0, 0x7440($at) -/* C79E3C 8024315C 00400008 */ jr $v0 -/* C79E40 80243160 00000000 */ nop -/* C79E44 80243164 8E420028 */ lw $v0, 0x28($s2) -/* C79E48 80243168 24420001 */ addiu $v0, $v0, 1 -/* C79E4C 8024316C AE420028 */ sw $v0, 0x28($s2) -.L80243170: -/* C79E50 80243170 0000102D */ daddu $v0, $zero, $zero -.L80243174: -/* C79E54 80243174 8FBF0068 */ lw $ra, 0x68($sp) -/* C79E58 80243178 8FB50064 */ lw $s5, 0x64($sp) -/* C79E5C 8024317C 8FB40060 */ lw $s4, 0x60($sp) -/* C79E60 80243180 8FB3005C */ lw $s3, 0x5c($sp) -/* C79E64 80243184 8FB20058 */ lw $s2, 0x58($sp) -/* C79E68 80243188 8FB10054 */ lw $s1, 0x54($sp) -/* C79E6C 8024318C 8FB00050 */ lw $s0, 0x50($sp) -/* C79E70 80243190 03E00008 */ jr $ra -/* C79E74 80243194 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s new file mode 100644 index 0000000000..d58462a2fb --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80242D58_C79A38.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D58_C79A38 +/* C79A38 80242D58 27BDFF90 */ addiu $sp, $sp, -0x70 +/* C79A3C 80242D5C AFB3005C */ sw $s3, 0x5c($sp) +/* C79A40 80242D60 0080982D */ daddu $s3, $a0, $zero +/* C79A44 80242D64 AFBF0068 */ sw $ra, 0x68($sp) +/* C79A48 80242D68 AFB50064 */ sw $s5, 0x64($sp) +/* C79A4C 80242D6C AFB40060 */ sw $s4, 0x60($sp) +/* C79A50 80242D70 AFB20058 */ sw $s2, 0x58($sp) +/* C79A54 80242D74 AFB10054 */ sw $s1, 0x54($sp) +/* C79A58 80242D78 AFB00050 */ sw $s0, 0x50($sp) +/* C79A5C 80242D7C 8E710148 */ lw $s1, 0x148($s3) +/* C79A60 80242D80 86240008 */ lh $a0, 8($s1) +/* C79A64 80242D84 0C00EABB */ jal get_npc_unsafe +/* C79A68 80242D88 00A0802D */ daddu $s0, $a1, $zero +/* C79A6C 80242D8C 8E63000C */ lw $v1, 0xc($s3) +/* C79A70 80242D90 0260202D */ daddu $a0, $s3, $zero +/* C79A74 80242D94 8C650000 */ lw $a1, ($v1) +/* C79A78 80242D98 0C0B1EAF */ jal get_variable +/* C79A7C 80242D9C 0040902D */ daddu $s2, $v0, $zero +/* C79A80 80242DA0 AFA00028 */ sw $zero, 0x28($sp) +/* C79A84 80242DA4 8E2300D0 */ lw $v1, 0xd0($s1) +/* C79A88 80242DA8 8C630030 */ lw $v1, 0x30($v1) +/* C79A8C 80242DAC AFA3002C */ sw $v1, 0x2c($sp) +/* C79A90 80242DB0 8E2300D0 */ lw $v1, 0xd0($s1) +/* C79A94 80242DB4 8C63001C */ lw $v1, 0x1c($v1) +/* C79A98 80242DB8 AFA30030 */ sw $v1, 0x30($sp) +/* C79A9C 80242DBC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C79AA0 80242DC0 8C630024 */ lw $v1, 0x24($v1) +/* C79AA4 80242DC4 AFA30034 */ sw $v1, 0x34($sp) +/* C79AA8 80242DC8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C79AAC 80242DCC 8C630028 */ lw $v1, 0x28($v1) +/* C79AB0 80242DD0 27B50028 */ addiu $s5, $sp, 0x28 +/* C79AB4 80242DD4 AFA30038 */ sw $v1, 0x38($sp) +/* C79AB8 80242DD8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C79ABC 80242DDC 3C0142C8 */ lui $at, 0x42c8 +/* C79AC0 80242DE0 44810000 */ mtc1 $at, $f0 +/* C79AC4 80242DE4 8C63002C */ lw $v1, 0x2c($v1) +/* C79AC8 80242DE8 0040A02D */ daddu $s4, $v0, $zero +/* C79ACC 80242DEC E7A00040 */ swc1 $f0, 0x40($sp) +/* C79AD0 80242DF0 A7A00044 */ sh $zero, 0x44($sp) +/* C79AD4 80242DF4 12000009 */ beqz $s0, .L80242E1C +/* C79AD8 80242DF8 AFA3003C */ sw $v1, 0x3c($sp) +/* C79ADC 80242DFC 864300A8 */ lh $v1, 0xa8($s2) +/* C79AE0 80242E00 8E2200B0 */ lw $v0, 0xb0($s1) +/* C79AE4 80242E04 AE20008C */ sw $zero, 0x8c($s1) +/* C79AE8 80242E08 A22000B5 */ sb $zero, 0xb5($s1) +/* C79AEC 80242E0C 34420008 */ ori $v0, $v0, 8 +/* C79AF0 80242E10 AE230084 */ sw $v1, 0x84($s1) +/* C79AF4 80242E14 08090B8B */ j .L80242E2C +/* C79AF8 80242E18 AE2200B0 */ sw $v0, 0xb0($s1) +.L80242E1C: +/* C79AFC 80242E1C 8E2200B0 */ lw $v0, 0xb0($s1) +/* C79B00 80242E20 30420004 */ andi $v0, $v0, 4 +/* C79B04 80242E24 10400047 */ beqz $v0, .L80242F44 +/* C79B08 80242E28 00000000 */ nop +.L80242E2C: +/* C79B0C 80242E2C AE600070 */ sw $zero, 0x70($s3) +/* C79B10 80242E30 A640008E */ sh $zero, 0x8e($s2) +/* C79B14 80242E34 8E2300CC */ lw $v1, 0xcc($s1) +/* C79B18 80242E38 2404F7FF */ addiu $a0, $zero, -0x801 +/* C79B1C 80242E3C A2200007 */ sb $zero, 7($s1) +/* C79B20 80242E40 8E420000 */ lw $v0, ($s2) +/* C79B24 80242E44 8C630000 */ lw $v1, ($v1) +/* C79B28 80242E48 00441024 */ and $v0, $v0, $a0 +/* C79B2C 80242E4C AE420000 */ sw $v0, ($s2) +/* C79B30 80242E50 AE430028 */ sw $v1, 0x28($s2) +/* C79B34 80242E54 96220086 */ lhu $v0, 0x86($s1) +/* C79B38 80242E58 A64200A8 */ sh $v0, 0xa8($s2) +/* C79B3C 80242E5C 8E2200D0 */ lw $v0, 0xd0($s1) +/* C79B40 80242E60 AE200090 */ sw $zero, 0x90($s1) +/* C79B44 80242E64 8C420034 */ lw $v0, 0x34($v0) +/* C79B48 80242E68 14400006 */ bnez $v0, .L80242E84 +/* C79B4C 80242E6C 2403FDFF */ addiu $v1, $zero, -0x201 +/* C79B50 80242E70 8E420000 */ lw $v0, ($s2) +/* C79B54 80242E74 2403FFF7 */ addiu $v1, $zero, -9 +/* C79B58 80242E78 34420200 */ ori $v0, $v0, 0x200 +/* C79B5C 80242E7C 08090BA4 */ j .L80242E90 +/* C79B60 80242E80 00431024 */ and $v0, $v0, $v1 +.L80242E84: +/* C79B64 80242E84 8E420000 */ lw $v0, ($s2) +/* C79B68 80242E88 00431024 */ and $v0, $v0, $v1 +/* C79B6C 80242E8C 34420008 */ ori $v0, $v0, 8 +.L80242E90: +/* C79B70 80242E90 AE420000 */ sw $v0, ($s2) +/* C79B74 80242E94 8E2200B0 */ lw $v0, 0xb0($s1) +/* C79B78 80242E98 30420004 */ andi $v0, $v0, 4 +/* C79B7C 80242E9C 1040001E */ beqz $v0, .L80242F18 +/* C79B80 80242EA0 24040002 */ addiu $a0, $zero, 2 +/* C79B84 80242EA4 0240282D */ daddu $a1, $s2, $zero +/* C79B88 80242EA8 0000302D */ daddu $a2, $zero, $zero +/* C79B8C 80242EAC 24020063 */ addiu $v0, $zero, 0x63 +/* C79B90 80242EB0 AE620070 */ sw $v0, 0x70($s3) +/* C79B94 80242EB4 AE600074 */ sw $zero, 0x74($s3) +/* C79B98 80242EB8 864300A8 */ lh $v1, 0xa8($s2) +/* C79B9C 80242EBC 3C013F80 */ lui $at, 0x3f80 +/* C79BA0 80242EC0 44810000 */ mtc1 $at, $f0 +/* C79BA4 80242EC4 3C014000 */ lui $at, 0x4000 +/* C79BA8 80242EC8 44811000 */ mtc1 $at, $f2 +/* C79BAC 80242ECC 3C01C1A0 */ lui $at, 0xc1a0 +/* C79BB0 80242ED0 44812000 */ mtc1 $at, $f4 +/* C79BB4 80242ED4 24020028 */ addiu $v0, $zero, 0x28 +/* C79BB8 80242ED8 AFA2001C */ sw $v0, 0x1c($sp) +/* C79BBC 80242EDC 44833000 */ mtc1 $v1, $f6 +/* C79BC0 80242EE0 00000000 */ nop +/* C79BC4 80242EE4 468031A0 */ cvt.s.w $f6, $f6 +/* C79BC8 80242EE8 44073000 */ mfc1 $a3, $f6 +/* C79BCC 80242EEC 27A20048 */ addiu $v0, $sp, 0x48 +/* C79BD0 80242EF0 AFA20020 */ sw $v0, 0x20($sp) +/* C79BD4 80242EF4 E7A00010 */ swc1 $f0, 0x10($sp) +/* C79BD8 80242EF8 E7A20014 */ swc1 $f2, 0x14($sp) +/* C79BDC 80242EFC 0C01BFA4 */ jal fx_emote +/* C79BE0 80242F00 E7A40018 */ swc1 $f4, 0x18($sp) +/* C79BE4 80242F04 8E2200B0 */ lw $v0, 0xb0($s1) +/* C79BE8 80242F08 2403FFFB */ addiu $v1, $zero, -5 +/* C79BEC 80242F0C 00431024 */ and $v0, $v0, $v1 +/* C79BF0 80242F10 08090BD1 */ j .L80242F44 +/* C79BF4 80242F14 AE2200B0 */ sw $v0, 0xb0($s1) +.L80242F18: +/* C79BF8 80242F18 8E220000 */ lw $v0, ($s1) +/* C79BFC 80242F1C 3C034000 */ lui $v1, 0x4000 +/* C79C00 80242F20 00431024 */ and $v0, $v0, $v1 +/* C79C04 80242F24 10400007 */ beqz $v0, .L80242F44 +/* C79C08 80242F28 3C03BFFF */ lui $v1, 0xbfff +/* C79C0C 80242F2C 2402000C */ addiu $v0, $zero, 0xc +/* C79C10 80242F30 AE620070 */ sw $v0, 0x70($s3) +/* C79C14 80242F34 8E220000 */ lw $v0, ($s1) +/* C79C18 80242F38 3463FFFF */ ori $v1, $v1, 0xffff +/* C79C1C 80242F3C 00431024 */ and $v0, $v0, $v1 +/* C79C20 80242F40 AE220000 */ sw $v0, ($s1) +.L80242F44: +/* C79C24 80242F44 8E220090 */ lw $v0, 0x90($s1) +/* C79C28 80242F48 1840000C */ blez $v0, .L80242F7C +/* C79C2C 80242F4C 2442FFFF */ addiu $v0, $v0, -1 +/* C79C30 80242F50 14400087 */ bnez $v0, .L80243170 +/* C79C34 80242F54 AE220090 */ sw $v0, 0x90($s1) +/* C79C38 80242F58 3C03FFAA */ lui $v1, 0xffaa +/* C79C3C 80242F5C 8E420028 */ lw $v0, 0x28($s2) +/* C79C40 80242F60 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* C79C44 80242F64 00431021 */ addu $v0, $v0, $v1 +/* C79C48 80242F68 2C420002 */ sltiu $v0, $v0, 2 +/* C79C4C 80242F6C 10400003 */ beqz $v0, .L80242F7C +/* C79C50 80242F70 3C020055 */ lui $v0, 0x55 +/* C79C54 80242F74 3442000C */ ori $v0, $v0, 0xc +/* C79C58 80242F78 AE420028 */ sw $v0, 0x28($s2) +.L80242F7C: +/* C79C5C 80242F7C 8E630070 */ lw $v1, 0x70($s3) +/* C79C60 80242F80 2402000C */ addiu $v0, $zero, 0xc +/* C79C64 80242F84 10620048 */ beq $v1, $v0, .L802430A8 +/* C79C68 80242F88 2862000D */ slti $v0, $v1, 0xd +/* C79C6C 80242F8C 1040000F */ beqz $v0, .L80242FCC +/* C79C70 80242F90 24100001 */ addiu $s0, $zero, 1 +/* C79C74 80242F94 1070001E */ beq $v1, $s0, .L80243010 +/* C79C78 80242F98 28620002 */ slti $v0, $v1, 2 +/* C79C7C 80242F9C 10400005 */ beqz $v0, .L80242FB4 +/* C79C80 80242FA0 24020002 */ addiu $v0, $zero, 2 +/* C79C84 80242FA4 10600015 */ beqz $v1, .L80242FFC +/* C79C88 80242FA8 0260202D */ daddu $a0, $s3, $zero +/* C79C8C 80242FAC 08090C41 */ j .L80243104 +/* C79C90 80242FB0 00000000 */ nop +.L80242FB4: +/* C79C94 80242FB4 1062001C */ beq $v1, $v0, .L80243028 +/* C79C98 80242FB8 24020003 */ addiu $v0, $zero, 3 +/* C79C9C 80242FBC 10620035 */ beq $v1, $v0, .L80243094 +/* C79CA0 80242FC0 0260202D */ daddu $a0, $s3, $zero +/* C79CA4 80242FC4 08090C41 */ j .L80243104 +/* C79CA8 80242FC8 00000000 */ nop +.L80242FCC: +/* C79CAC 80242FCC 2402000E */ addiu $v0, $zero, 0xe +/* C79CB0 80242FD0 1062003F */ beq $v1, $v0, .L802430D0 +/* C79CB4 80242FD4 0062102A */ slt $v0, $v1, $v0 +/* C79CB8 80242FD8 14400038 */ bnez $v0, .L802430BC +/* C79CBC 80242FDC 0260202D */ daddu $a0, $s3, $zero +/* C79CC0 80242FE0 2402000F */ addiu $v0, $zero, 0xf +/* C79CC4 80242FE4 10620040 */ beq $v1, $v0, .L802430E8 +/* C79CC8 80242FE8 24020063 */ addiu $v0, $zero, 0x63 +/* C79CCC 80242FEC 10620043 */ beq $v1, $v0, .L802430FC +/* C79CD0 80242FF0 00000000 */ nop +/* C79CD4 80242FF4 08090C41 */ j .L80243104 +/* C79CD8 80242FF8 00000000 */ nop +.L80242FFC: +/* C79CDC 80242FFC 0280282D */ daddu $a1, $s4, $zero +/* C79CE0 80243000 0C012568 */ jal func_800495A0 +/* C79CE4 80243004 02A0302D */ daddu $a2, $s5, $zero +/* C79CE8 80243008 96220086 */ lhu $v0, 0x86($s1) +/* C79CEC 8024300C A64200A8 */ sh $v0, 0xa8($s2) +.L80243010: +/* C79CF0 80243010 0260202D */ daddu $a0, $s3, $zero +/* C79CF4 80243014 0280282D */ daddu $a1, $s4, $zero +/* C79CF8 80243018 0C0125AE */ jal func_800496B8 +/* C79CFC 8024301C 02A0302D */ daddu $a2, $s5, $zero +/* C79D00 80243020 08090C41 */ j .L80243104 +/* C79D04 80243024 00000000 */ nop +.L80243028: +/* C79D08 80243028 0260202D */ daddu $a0, $s3, $zero +/* C79D0C 8024302C 0280282D */ daddu $a1, $s4, $zero +/* C79D10 80243030 0C0126D1 */ jal func_80049B44 +/* C79D14 80243034 02A0302D */ daddu $a2, $s5, $zero +/* C79D18 80243038 8E230088 */ lw $v1, 0x88($s1) +/* C79D1C 8024303C 24020006 */ addiu $v0, $zero, 6 +/* C79D20 80243040 14620014 */ bne $v1, $v0, .L80243094 +/* C79D24 80243044 0260202D */ daddu $a0, $s3, $zero +/* C79D28 80243048 0C00A67F */ jal rand_int +/* C79D2C 8024304C 24040064 */ addiu $a0, $zero, 0x64 +/* C79D30 80243050 28420021 */ slti $v0, $v0, 0x21 +/* C79D34 80243054 5040000F */ beql $v0, $zero, .L80243094 +/* C79D38 80243058 0260202D */ daddu $a0, $s3, $zero +/* C79D3C 8024305C 8E22008C */ lw $v0, 0x8c($s1) +/* C79D40 80243060 10400005 */ beqz $v0, .L80243078 +/* C79D44 80243064 3C020055 */ lui $v0, 0x55 +/* C79D48 80243068 3442002F */ ori $v0, $v0, 0x2f +/* C79D4C 8024306C AE20008C */ sw $zero, 0x8c($s1) +/* C79D50 80243070 08090C21 */ j .L80243084 +/* C79D54 80243074 A22000B5 */ sb $zero, 0xb5($s1) +.L80243078: +/* C79D58 80243078 3442002E */ ori $v0, $v0, 0x2e +/* C79D5C 8024307C AE30008C */ sw $s0, 0x8c($s1) +/* C79D60 80243080 A23000B5 */ sb $s0, 0xb5($s1) +.L80243084: +/* C79D64 80243084 AE420028 */ sw $v0, 0x28($s2) +/* C79D68 80243088 24020007 */ addiu $v0, $zero, 7 +/* C79D6C 8024308C 08090C5C */ j .L80243170 +/* C79D70 80243090 AE220090 */ sw $v0, 0x90($s1) +.L80243094: +/* C79D74 80243094 0280282D */ daddu $a1, $s4, $zero +/* C79D78 80243098 0C012701 */ jal func_80049C04 +/* C79D7C 8024309C 02A0302D */ daddu $a2, $s5, $zero +/* C79D80 802430A0 08090C41 */ j .L80243104 +/* C79D84 802430A4 00000000 */ nop +.L802430A8: +/* C79D88 802430A8 0260202D */ daddu $a0, $s3, $zero +/* C79D8C 802430AC 0280282D */ daddu $a1, $s4, $zero +/* C79D90 802430B0 0C090A71 */ jal func_802429C4_C796A4 +/* C79D94 802430B4 02A0302D */ daddu $a2, $s5, $zero +/* C79D98 802430B8 0260202D */ daddu $a0, $s3, $zero +.L802430BC: +/* C79D9C 802430BC 0280282D */ daddu $a1, $s4, $zero +/* C79DA0 802430C0 0C090A90 */ jal func_80242A40_C79720 +/* C79DA4 802430C4 02A0302D */ daddu $a2, $s5, $zero +/* C79DA8 802430C8 08090C41 */ j .L80243104 +/* C79DAC 802430CC 00000000 */ nop +.L802430D0: +/* C79DB0 802430D0 0260202D */ daddu $a0, $s3, $zero +/* C79DB4 802430D4 0280282D */ daddu $a1, $s4, $zero +/* C79DB8 802430D8 0C090ADD */ jal func_80242B74_C79854 +/* C79DBC 802430DC 02A0302D */ daddu $a2, $s5, $zero +/* C79DC0 802430E0 08090C41 */ j .L80243104 +/* C79DC4 802430E4 00000000 */ nop +.L802430E8: +/* C79DC8 802430E8 0280282D */ daddu $a1, $s4, $zero +/* C79DCC 802430EC 0C090B36 */ jal func_80242CD8_C799B8 +/* C79DD0 802430F0 02A0302D */ daddu $a2, $s5, $zero +/* C79DD4 802430F4 08090C41 */ j .L80243104 +/* C79DD8 802430F8 00000000 */ nop +.L802430FC: +/* C79DDC 802430FC 0C0129CF */ jal func_8004A73C +/* C79DE0 80243100 0260202D */ daddu $a0, $s3, $zero +.L80243104: +/* C79DE4 80243104 8E230088 */ lw $v1, 0x88($s1) +/* C79DE8 80243108 24020006 */ addiu $v0, $zero, 6 +/* C79DEC 8024310C 14620019 */ bne $v1, $v0, .L80243174 +/* C79DF0 80243110 0000102D */ daddu $v0, $zero, $zero +/* C79DF4 80243114 8E22008C */ lw $v0, 0x8c($s1) +/* C79DF8 80243118 10400003 */ beqz $v0, .L80243128 +/* C79DFC 8024311C 24020001 */ addiu $v0, $zero, 1 +/* C79E00 80243120 08090C4B */ j .L8024312C +/* C79E04 80243124 A22200B5 */ sb $v0, 0xb5($s1) +.L80243128: +/* C79E08 80243128 A22000B5 */ sb $zero, 0xb5($s1) +.L8024312C: +/* C79E0C 8024312C 8E22008C */ lw $v0, 0x8c($s1) +/* C79E10 80243130 1040000F */ beqz $v0, .L80243170 +/* C79E14 80243134 3C03FFAA */ lui $v1, 0xffaa +/* C79E18 80243138 8E420028 */ lw $v0, 0x28($s2) +/* C79E1C 8024313C 3463FFFC */ ori $v1, $v1, 0xfffc +/* C79E20 80243140 00431821 */ addu $v1, $v0, $v1 +/* C79E24 80243144 2C620015 */ sltiu $v0, $v1, 0x15 +/* C79E28 80243148 10400009 */ beqz $v0, .L80243170 +/* C79E2C 8024314C 00031080 */ sll $v0, $v1, 2 +/* C79E30 80243150 3C018024 */ lui $at, 0x8024 +/* C79E34 80243154 00220821 */ addu $at, $at, $v0 +/* C79E38 80243158 8C227440 */ lw $v0, 0x7440($at) +/* C79E3C 8024315C 00400008 */ jr $v0 +/* C79E40 80243160 00000000 */ nop +/* C79E44 80243164 8E420028 */ lw $v0, 0x28($s2) +/* C79E48 80243168 24420001 */ addiu $v0, $v0, 1 +/* C79E4C 8024316C AE420028 */ sw $v0, 0x28($s2) +.L80243170: +/* C79E50 80243170 0000102D */ daddu $v0, $zero, $zero +.L80243174: +/* C79E54 80243174 8FBF0068 */ lw $ra, 0x68($sp) +/* C79E58 80243178 8FB50064 */ lw $s5, 0x64($sp) +/* C79E5C 8024317C 8FB40060 */ lw $s4, 0x60($sp) +/* C79E60 80243180 8FB3005C */ lw $s3, 0x5c($sp) +/* C79E64 80243184 8FB20058 */ lw $s2, 0x58($sp) +/* C79E68 80243188 8FB10054 */ lw $s1, 0x54($sp) +/* C79E6C 8024318C 8FB00050 */ lw $s0, 0x50($sp) +/* C79E70 80243190 03E00008 */ jr $ra +/* C79E74 80243194 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC.s deleted file mode 100644 index 2f7f04ca48..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802432AC -/* C79F8C 802432AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C79F90 802432B0 AFB00010 */ sw $s0, 0x10($sp) -/* C79F94 802432B4 3C108024 */ lui $s0, 0x8024 -/* C79F98 802432B8 26105250 */ addiu $s0, $s0, 0x5250 -/* C79F9C 802432BC AFBF0018 */ sw $ra, 0x18($sp) -/* C79FA0 802432C0 AFB10014 */ sw $s1, 0x14($sp) -/* C79FA4 802432C4 8E020000 */ lw $v0, ($s0) -/* C79FA8 802432C8 14400010 */ bnez $v0, .L8024330C -/* C79FAC 802432CC 0080882D */ daddu $s1, $a0, $zero -/* C79FB0 802432D0 0C00AB39 */ jal heap_malloc -/* C79FB4 802432D4 24040040 */ addiu $a0, $zero, 0x40 -/* C79FB8 802432D8 AE020000 */ sw $v0, ($s0) -/* C79FBC 802432DC 0000182D */ daddu $v1, $zero, $zero -/* C79FC0 802432E0 0040282D */ daddu $a1, $v0, $zero -/* C79FC4 802432E4 0220202D */ daddu $a0, $s1, $zero -.L802432E8: -/* C79FC8 802432E8 8C820084 */ lw $v0, 0x84($a0) -/* C79FCC 802432EC 24840004 */ addiu $a0, $a0, 4 -/* C79FD0 802432F0 24630001 */ addiu $v1, $v1, 1 -/* C79FD4 802432F4 ACA20000 */ sw $v0, ($a1) -/* C79FD8 802432F8 28620010 */ slti $v0, $v1, 0x10 -/* C79FDC 802432FC 1440FFFA */ bnez $v0, .L802432E8 -/* C79FE0 80243300 24A50004 */ addiu $a1, $a1, 4 -/* C79FE4 80243304 08090CD2 */ j .L80243348 -/* C79FE8 80243308 00000000 */ nop -.L8024330C: -/* C79FEC 8024330C 0000182D */ daddu $v1, $zero, $zero -/* C79FF0 80243310 0040282D */ daddu $a1, $v0, $zero -/* C79FF4 80243314 0220202D */ daddu $a0, $s1, $zero -.L80243318: -/* C79FF8 80243318 8CA20000 */ lw $v0, ($a1) -/* C79FFC 8024331C 24A50004 */ addiu $a1, $a1, 4 -/* C7A000 80243320 24630001 */ addiu $v1, $v1, 1 -/* C7A004 80243324 AC820084 */ sw $v0, 0x84($a0) -/* C7A008 80243328 28620010 */ slti $v0, $v1, 0x10 -/* C7A00C 8024332C 1440FFFA */ bnez $v0, .L80243318 -/* C7A010 80243330 24840004 */ addiu $a0, $a0, 4 -/* C7A014 80243334 3C108024 */ lui $s0, 0x8024 -/* C7A018 80243338 26105250 */ addiu $s0, $s0, 0x5250 -/* C7A01C 8024333C 0C00AB4B */ jal heap_free -/* C7A020 80243340 8E040000 */ lw $a0, ($s0) -/* C7A024 80243344 AE000000 */ sw $zero, ($s0) -.L80243348: -/* C7A028 80243348 8FBF0018 */ lw $ra, 0x18($sp) -/* C7A02C 8024334C 8FB10014 */ lw $s1, 0x14($sp) -/* C7A030 80243350 8FB00010 */ lw $s0, 0x10($sp) -/* C7A034 80243354 24020002 */ addiu $v0, $zero, 2 -/* C7A038 80243358 03E00008 */ jr $ra -/* C7A03C 8024335C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s new file mode 100644 index 0000000000..cc8ed5f290 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802432AC_C79F8C.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802432AC_C79F8C +/* C79F8C 802432AC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C79F90 802432B0 AFB00010 */ sw $s0, 0x10($sp) +/* C79F94 802432B4 3C108024 */ lui $s0, 0x8024 +/* C79F98 802432B8 26105250 */ addiu $s0, $s0, 0x5250 +/* C79F9C 802432BC AFBF0018 */ sw $ra, 0x18($sp) +/* C79FA0 802432C0 AFB10014 */ sw $s1, 0x14($sp) +/* C79FA4 802432C4 8E020000 */ lw $v0, ($s0) +/* C79FA8 802432C8 14400010 */ bnez $v0, .L8024330C +/* C79FAC 802432CC 0080882D */ daddu $s1, $a0, $zero +/* C79FB0 802432D0 0C00AB39 */ jal heap_malloc +/* C79FB4 802432D4 24040040 */ addiu $a0, $zero, 0x40 +/* C79FB8 802432D8 AE020000 */ sw $v0, ($s0) +/* C79FBC 802432DC 0000182D */ daddu $v1, $zero, $zero +/* C79FC0 802432E0 0040282D */ daddu $a1, $v0, $zero +/* C79FC4 802432E4 0220202D */ daddu $a0, $s1, $zero +.L802432E8: +/* C79FC8 802432E8 8C820084 */ lw $v0, 0x84($a0) +/* C79FCC 802432EC 24840004 */ addiu $a0, $a0, 4 +/* C79FD0 802432F0 24630001 */ addiu $v1, $v1, 1 +/* C79FD4 802432F4 ACA20000 */ sw $v0, ($a1) +/* C79FD8 802432F8 28620010 */ slti $v0, $v1, 0x10 +/* C79FDC 802432FC 1440FFFA */ bnez $v0, .L802432E8 +/* C79FE0 80243300 24A50004 */ addiu $a1, $a1, 4 +/* C79FE4 80243304 08090CD2 */ j .L80243348 +/* C79FE8 80243308 00000000 */ nop +.L8024330C: +/* C79FEC 8024330C 0000182D */ daddu $v1, $zero, $zero +/* C79FF0 80243310 0040282D */ daddu $a1, $v0, $zero +/* C79FF4 80243314 0220202D */ daddu $a0, $s1, $zero +.L80243318: +/* C79FF8 80243318 8CA20000 */ lw $v0, ($a1) +/* C79FFC 8024331C 24A50004 */ addiu $a1, $a1, 4 +/* C7A000 80243320 24630001 */ addiu $v1, $v1, 1 +/* C7A004 80243324 AC820084 */ sw $v0, 0x84($a0) +/* C7A008 80243328 28620010 */ slti $v0, $v1, 0x10 +/* C7A00C 8024332C 1440FFFA */ bnez $v0, .L80243318 +/* C7A010 80243330 24840004 */ addiu $a0, $a0, 4 +/* C7A014 80243334 3C108024 */ lui $s0, 0x8024 +/* C7A018 80243338 26105250 */ addiu $s0, $s0, 0x5250 +/* C7A01C 8024333C 0C00AB4B */ jal heap_free +/* C7A020 80243340 8E040000 */ lw $a0, ($s0) +/* C7A024 80243344 AE000000 */ sw $zero, ($s0) +.L80243348: +/* C7A028 80243348 8FBF0018 */ lw $ra, 0x18($sp) +/* C7A02C 8024334C 8FB10014 */ lw $s1, 0x14($sp) +/* C7A030 80243350 8FB00010 */ lw $s0, 0x10($sp) +/* C7A034 80243354 24020002 */ addiu $v0, $zero, 2 +/* C7A038 80243358 03E00008 */ jr $ra +/* C7A03C 8024335C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0.s deleted file mode 100644 index db10acc698..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435F0 -/* C7A2D0 802435F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7A2D4 802435F4 AFBF0010 */ sw $ra, 0x10($sp) -/* C7A2D8 802435F8 10A00003 */ beqz $a1, .L80243608 -/* C7A2DC 802435FC 8C86000C */ lw $a2, 0xc($a0) -/* C7A2E0 80243600 3C018024 */ lui $at, 0x8024 -/* C7A2E4 80243604 AC2052B4 */ sw $zero, 0x52b4($at) -.L80243608: -/* C7A2E8 80243608 3C038024 */ lui $v1, 0x8024 -/* C7A2EC 8024360C 246352B4 */ addiu $v1, $v1, 0x52b4 -/* C7A2F0 80243610 8C620000 */ lw $v0, ($v1) -/* C7A2F4 80243614 54400003 */ bnel $v0, $zero, .L80243624 -/* C7A2F8 80243618 AC600000 */ sw $zero, ($v1) -/* C7A2FC 8024361C 08090D8E */ j .L80243638 -/* C7A300 80243620 0000102D */ daddu $v0, $zero, $zero -.L80243624: -/* C7A304 80243624 8CC50000 */ lw $a1, ($a2) -/* C7A308 80243628 3C068024 */ lui $a2, 0x8024 -/* C7A30C 8024362C 0C0B2026 */ jal set_variable -/* C7A310 80243630 8CC652B8 */ lw $a2, 0x52b8($a2) -/* C7A314 80243634 24020002 */ addiu $v0, $zero, 2 -.L80243638: -/* C7A318 80243638 8FBF0010 */ lw $ra, 0x10($sp) -/* C7A31C 8024363C 03E00008 */ jr $ra -/* C7A320 80243640 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s new file mode 100644 index 0000000000..56fa334f09 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_802435F0_C7A2D0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435F0_C7A2D0 +/* C7A2D0 802435F0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C7A2D4 802435F4 AFBF0010 */ sw $ra, 0x10($sp) +/* C7A2D8 802435F8 10A00003 */ beqz $a1, .L80243608 +/* C7A2DC 802435FC 8C86000C */ lw $a2, 0xc($a0) +/* C7A2E0 80243600 3C018024 */ lui $at, 0x8024 +/* C7A2E4 80243604 AC2052B4 */ sw $zero, 0x52b4($at) +.L80243608: +/* C7A2E8 80243608 3C038024 */ lui $v1, 0x8024 +/* C7A2EC 8024360C 246352B4 */ addiu $v1, $v1, 0x52b4 +/* C7A2F0 80243610 8C620000 */ lw $v0, ($v1) +/* C7A2F4 80243614 54400003 */ bnel $v0, $zero, .L80243624 +/* C7A2F8 80243618 AC600000 */ sw $zero, ($v1) +/* C7A2FC 8024361C 08090D8E */ j .L80243638 +/* C7A300 80243620 0000102D */ daddu $v0, $zero, $zero +.L80243624: +/* C7A304 80243624 8CC50000 */ lw $a1, ($a2) +/* C7A308 80243628 3C068024 */ lui $a2, 0x8024 +/* C7A30C 8024362C 0C0B2026 */ jal set_variable +/* C7A310 80243630 8CC652B8 */ lw $a2, 0x52b8($a2) +/* C7A314 80243634 24020002 */ addiu $v0, $zero, 2 +.L80243638: +/* C7A318 80243638 8FBF0010 */ lw $ra, 0x10($sp) +/* C7A31C 8024363C 03E00008 */ jr $ra +/* C7A320 80243640 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C.s deleted file mode 100644 index 8bb893c54e..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024367C -/* C7A35C 8024367C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7A360 80243680 AFBF0010 */ sw $ra, 0x10($sp) -/* C7A364 80243684 8C82000C */ lw $v0, 0xc($a0) -/* C7A368 80243688 0C0B1EAF */ jal get_variable -/* C7A36C 8024368C 8C450000 */ lw $a1, ($v0) -/* C7A370 80243690 0040182D */ daddu $v1, $v0, $zero -/* C7A374 80243694 10600012 */ beqz $v1, .L802436E0 -/* C7A378 80243698 0000202D */ daddu $a0, $zero, $zero -/* C7A37C 8024369C 8C620000 */ lw $v0, ($v1) -/* C7A380 802436A0 5040000A */ beql $v0, $zero, .L802436CC -/* C7A384 802436A4 00041080 */ sll $v0, $a0, 2 -/* C7A388 802436A8 3C058024 */ lui $a1, 0x8024 -/* C7A38C 802436AC 24A574A0 */ addiu $a1, $a1, 0x74a0 -.L802436B0: -/* C7A390 802436B0 24630004 */ addiu $v1, $v1, 4 -/* C7A394 802436B4 24840001 */ addiu $a0, $a0, 1 -/* C7A398 802436B8 ACA20000 */ sw $v0, ($a1) -/* C7A39C 802436BC 8C620000 */ lw $v0, ($v1) -/* C7A3A0 802436C0 1440FFFB */ bnez $v0, .L802436B0 -/* C7A3A4 802436C4 24A50004 */ addiu $a1, $a1, 4 -/* C7A3A8 802436C8 00041080 */ sll $v0, $a0, 2 -.L802436CC: -/* C7A3AC 802436CC 3C018024 */ lui $at, 0x8024 -/* C7A3B0 802436D0 00220821 */ addu $at, $at, $v0 -/* C7A3B4 802436D4 AC2074A0 */ sw $zero, 0x74a0($at) -/* C7A3B8 802436D8 08090DC2 */ j .L80243708 -/* C7A3BC 802436DC 00000000 */ nop -.L802436E0: -/* C7A3C0 802436E0 3C038024 */ lui $v1, 0x8024 -/* C7A3C4 802436E4 246374A0 */ addiu $v1, $v1, 0x74a0 -/* C7A3C8 802436E8 0060282D */ daddu $a1, $v1, $zero -.L802436EC: -/* C7A3CC 802436EC 24820010 */ addiu $v0, $a0, 0x10 -/* C7A3D0 802436F0 AC620000 */ sw $v0, ($v1) -/* C7A3D4 802436F4 24630004 */ addiu $v1, $v1, 4 -/* C7A3D8 802436F8 24840001 */ addiu $a0, $a0, 1 -/* C7A3DC 802436FC 28820070 */ slti $v0, $a0, 0x70 -/* C7A3E0 80243700 1440FFFA */ bnez $v0, .L802436EC -/* C7A3E4 80243704 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80243708: -/* C7A3E8 80243708 8FBF0010 */ lw $ra, 0x10($sp) -/* C7A3EC 8024370C 24020002 */ addiu $v0, $zero, 2 -/* C7A3F0 80243710 03E00008 */ jr $ra -/* C7A3F4 80243714 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s new file mode 100644 index 0000000000..ab3e38e199 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_8024367C_C7A35C.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024367C_C7A35C +/* C7A35C 8024367C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C7A360 80243680 AFBF0010 */ sw $ra, 0x10($sp) +/* C7A364 80243684 8C82000C */ lw $v0, 0xc($a0) +/* C7A368 80243688 0C0B1EAF */ jal get_variable +/* C7A36C 8024368C 8C450000 */ lw $a1, ($v0) +/* C7A370 80243690 0040182D */ daddu $v1, $v0, $zero +/* C7A374 80243694 10600012 */ beqz $v1, .L802436E0 +/* C7A378 80243698 0000202D */ daddu $a0, $zero, $zero +/* C7A37C 8024369C 8C620000 */ lw $v0, ($v1) +/* C7A380 802436A0 5040000A */ beql $v0, $zero, .L802436CC +/* C7A384 802436A4 00041080 */ sll $v0, $a0, 2 +/* C7A388 802436A8 3C058024 */ lui $a1, 0x8024 +/* C7A38C 802436AC 24A574A0 */ addiu $a1, $a1, 0x74a0 +.L802436B0: +/* C7A390 802436B0 24630004 */ addiu $v1, $v1, 4 +/* C7A394 802436B4 24840001 */ addiu $a0, $a0, 1 +/* C7A398 802436B8 ACA20000 */ sw $v0, ($a1) +/* C7A39C 802436BC 8C620000 */ lw $v0, ($v1) +/* C7A3A0 802436C0 1440FFFB */ bnez $v0, .L802436B0 +/* C7A3A4 802436C4 24A50004 */ addiu $a1, $a1, 4 +/* C7A3A8 802436C8 00041080 */ sll $v0, $a0, 2 +.L802436CC: +/* C7A3AC 802436CC 3C018024 */ lui $at, 0x8024 +/* C7A3B0 802436D0 00220821 */ addu $at, $at, $v0 +/* C7A3B4 802436D4 AC2074A0 */ sw $zero, 0x74a0($at) +/* C7A3B8 802436D8 08090DC2 */ j .L80243708 +/* C7A3BC 802436DC 00000000 */ nop +.L802436E0: +/* C7A3C0 802436E0 3C038024 */ lui $v1, 0x8024 +/* C7A3C4 802436E4 246374A0 */ addiu $v1, $v1, 0x74a0 +/* C7A3C8 802436E8 0060282D */ daddu $a1, $v1, $zero +.L802436EC: +/* C7A3CC 802436EC 24820010 */ addiu $v0, $a0, 0x10 +/* C7A3D0 802436F0 AC620000 */ sw $v0, ($v1) +/* C7A3D4 802436F4 24630004 */ addiu $v1, $v1, 4 +/* C7A3D8 802436F8 24840001 */ addiu $a0, $a0, 1 +/* C7A3DC 802436FC 28820070 */ slti $v0, $a0, 0x70 +/* C7A3E0 80243700 1440FFFA */ bnez $v0, .L802436EC +/* C7A3E4 80243704 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80243708: +/* C7A3E8 80243708 8FBF0010 */ lw $ra, 0x10($sp) +/* C7A3EC 8024370C 24020002 */ addiu $v0, $zero, 2 +/* C7A3F0 80243710 03E00008 */ jr $ra +/* C7A3F4 80243714 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243718.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243718.s deleted file mode 100644 index 4c1126b9a4..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243718.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243718 -/* C7A3F8 80243718 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7A3FC 8024371C AFB10014 */ sw $s1, 0x14($sp) -/* C7A400 80243720 0080882D */ daddu $s1, $a0, $zero -/* C7A404 80243724 AFBF0018 */ sw $ra, 0x18($sp) -/* C7A408 80243728 AFB00010 */ sw $s0, 0x10($sp) -/* C7A40C 8024372C 8E30000C */ lw $s0, 0xc($s1) -/* C7A410 80243730 8E050000 */ lw $a1, ($s0) -/* C7A414 80243734 0C0B1EAF */ jal get_variable -/* C7A418 80243738 26100004 */ addiu $s0, $s0, 4 -/* C7A41C 8024373C AE22008C */ sw $v0, 0x8c($s1) -/* C7A420 80243740 8E050000 */ lw $a1, ($s0) -/* C7A424 80243744 26100004 */ addiu $s0, $s0, 4 -/* C7A428 80243748 0C0B1EAF */ jal get_variable -/* C7A42C 8024374C 0220202D */ daddu $a0, $s1, $zero -/* C7A430 80243750 AE220090 */ sw $v0, 0x90($s1) -/* C7A434 80243754 8E050000 */ lw $a1, ($s0) -/* C7A438 80243758 26100004 */ addiu $s0, $s0, 4 -/* C7A43C 8024375C 0C0B1EAF */ jal get_variable -/* C7A440 80243760 0220202D */ daddu $a0, $s1, $zero -/* C7A444 80243764 AE220094 */ sw $v0, 0x94($s1) -/* C7A448 80243768 8E050000 */ lw $a1, ($s0) -/* C7A44C 8024376C 26100004 */ addiu $s0, $s0, 4 -/* C7A450 80243770 0C0B1EAF */ jal get_variable -/* C7A454 80243774 0220202D */ daddu $a0, $s1, $zero -/* C7A458 80243778 AE220098 */ sw $v0, 0x98($s1) -/* C7A45C 8024377C 8E050000 */ lw $a1, ($s0) -/* C7A460 80243780 26100004 */ addiu $s0, $s0, 4 -/* C7A464 80243784 0C0B1EAF */ jal get_variable -/* C7A468 80243788 0220202D */ daddu $a0, $s1, $zero -/* C7A46C 8024378C AE22009C */ sw $v0, 0x9c($s1) -/* C7A470 80243790 8E050000 */ lw $a1, ($s0) -/* C7A474 80243794 26100004 */ addiu $s0, $s0, 4 -/* C7A478 80243798 0C0B1EAF */ jal get_variable -/* C7A47C 8024379C 0220202D */ daddu $a0, $s1, $zero -/* C7A480 802437A0 AE2200A0 */ sw $v0, 0xa0($s1) -/* C7A484 802437A4 8E050000 */ lw $a1, ($s0) -/* C7A488 802437A8 26100004 */ addiu $s0, $s0, 4 -/* C7A48C 802437AC 0C0B1EAF */ jal get_variable -/* C7A490 802437B0 0220202D */ daddu $a0, $s1, $zero -/* C7A494 802437B4 AE2200A4 */ sw $v0, 0xa4($s1) -/* C7A498 802437B8 8E050000 */ lw $a1, ($s0) -/* C7A49C 802437BC 26100004 */ addiu $s0, $s0, 4 -/* C7A4A0 802437C0 0C0B1EAF */ jal get_variable -/* C7A4A4 802437C4 0220202D */ daddu $a0, $s1, $zero -/* C7A4A8 802437C8 AE2200A8 */ sw $v0, 0xa8($s1) -/* C7A4AC 802437CC 8E050000 */ lw $a1, ($s0) -/* C7A4B0 802437D0 26100004 */ addiu $s0, $s0, 4 -/* C7A4B4 802437D4 0C0B1EAF */ jal get_variable -/* C7A4B8 802437D8 0220202D */ daddu $a0, $s1, $zero -/* C7A4BC 802437DC AE2200AC */ sw $v0, 0xac($s1) -/* C7A4C0 802437E0 8E050000 */ lw $a1, ($s0) -/* C7A4C4 802437E4 0C0B1EAF */ jal get_variable -/* C7A4C8 802437E8 0220202D */ daddu $a0, $s1, $zero -/* C7A4CC 802437EC AE2200B0 */ sw $v0, 0xb0($s1) -/* C7A4D0 802437F0 8FBF0018 */ lw $ra, 0x18($sp) -/* C7A4D4 802437F4 8FB10014 */ lw $s1, 0x14($sp) -/* C7A4D8 802437F8 8FB00010 */ lw $s0, 0x10($sp) -/* C7A4DC 802437FC 24020002 */ addiu $v0, $zero, 2 -/* C7A4E0 80243800 03E00008 */ jr $ra -/* C7A4E4 80243804 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243718_C7A3F8.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243718_C7A3F8.s new file mode 100644 index 0000000000..a06b03c524 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243718_C7A3F8.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243718_C7A3F8 +/* C7A3F8 80243718 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C7A3FC 8024371C AFB10014 */ sw $s1, 0x14($sp) +/* C7A400 80243720 0080882D */ daddu $s1, $a0, $zero +/* C7A404 80243724 AFBF0018 */ sw $ra, 0x18($sp) +/* C7A408 80243728 AFB00010 */ sw $s0, 0x10($sp) +/* C7A40C 8024372C 8E30000C */ lw $s0, 0xc($s1) +/* C7A410 80243730 8E050000 */ lw $a1, ($s0) +/* C7A414 80243734 0C0B1EAF */ jal get_variable +/* C7A418 80243738 26100004 */ addiu $s0, $s0, 4 +/* C7A41C 8024373C AE22008C */ sw $v0, 0x8c($s1) +/* C7A420 80243740 8E050000 */ lw $a1, ($s0) +/* C7A424 80243744 26100004 */ addiu $s0, $s0, 4 +/* C7A428 80243748 0C0B1EAF */ jal get_variable +/* C7A42C 8024374C 0220202D */ daddu $a0, $s1, $zero +/* C7A430 80243750 AE220090 */ sw $v0, 0x90($s1) +/* C7A434 80243754 8E050000 */ lw $a1, ($s0) +/* C7A438 80243758 26100004 */ addiu $s0, $s0, 4 +/* C7A43C 8024375C 0C0B1EAF */ jal get_variable +/* C7A440 80243760 0220202D */ daddu $a0, $s1, $zero +/* C7A444 80243764 AE220094 */ sw $v0, 0x94($s1) +/* C7A448 80243768 8E050000 */ lw $a1, ($s0) +/* C7A44C 8024376C 26100004 */ addiu $s0, $s0, 4 +/* C7A450 80243770 0C0B1EAF */ jal get_variable +/* C7A454 80243774 0220202D */ daddu $a0, $s1, $zero +/* C7A458 80243778 AE220098 */ sw $v0, 0x98($s1) +/* C7A45C 8024377C 8E050000 */ lw $a1, ($s0) +/* C7A460 80243780 26100004 */ addiu $s0, $s0, 4 +/* C7A464 80243784 0C0B1EAF */ jal get_variable +/* C7A468 80243788 0220202D */ daddu $a0, $s1, $zero +/* C7A46C 8024378C AE22009C */ sw $v0, 0x9c($s1) +/* C7A470 80243790 8E050000 */ lw $a1, ($s0) +/* C7A474 80243794 26100004 */ addiu $s0, $s0, 4 +/* C7A478 80243798 0C0B1EAF */ jal get_variable +/* C7A47C 8024379C 0220202D */ daddu $a0, $s1, $zero +/* C7A480 802437A0 AE2200A0 */ sw $v0, 0xa0($s1) +/* C7A484 802437A4 8E050000 */ lw $a1, ($s0) +/* C7A488 802437A8 26100004 */ addiu $s0, $s0, 4 +/* C7A48C 802437AC 0C0B1EAF */ jal get_variable +/* C7A490 802437B0 0220202D */ daddu $a0, $s1, $zero +/* C7A494 802437B4 AE2200A4 */ sw $v0, 0xa4($s1) +/* C7A498 802437B8 8E050000 */ lw $a1, ($s0) +/* C7A49C 802437BC 26100004 */ addiu $s0, $s0, 4 +/* C7A4A0 802437C0 0C0B1EAF */ jal get_variable +/* C7A4A4 802437C4 0220202D */ daddu $a0, $s1, $zero +/* C7A4A8 802437C8 AE2200A8 */ sw $v0, 0xa8($s1) +/* C7A4AC 802437CC 8E050000 */ lw $a1, ($s0) +/* C7A4B0 802437D0 26100004 */ addiu $s0, $s0, 4 +/* C7A4B4 802437D4 0C0B1EAF */ jal get_variable +/* C7A4B8 802437D8 0220202D */ daddu $a0, $s1, $zero +/* C7A4BC 802437DC AE2200AC */ sw $v0, 0xac($s1) +/* C7A4C0 802437E0 8E050000 */ lw $a1, ($s0) +/* C7A4C4 802437E4 0C0B1EAF */ jal get_variable +/* C7A4C8 802437E8 0220202D */ daddu $a0, $s1, $zero +/* C7A4CC 802437EC AE2200B0 */ sw $v0, 0xb0($s1) +/* C7A4D0 802437F0 8FBF0018 */ lw $ra, 0x18($sp) +/* C7A4D4 802437F4 8FB10014 */ lw $s1, 0x14($sp) +/* C7A4D8 802437F8 8FB00010 */ lw $s0, 0x10($sp) +/* C7A4DC 802437FC 24020002 */ addiu $v0, $zero, 2 +/* C7A4E0 80243800 03E00008 */ jr $ra +/* C7A4E4 80243804 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808.s deleted file mode 100644 index f140c49ba0..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243808 -/* C7A4E8 80243808 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C7A4EC 8024380C AFB1001C */ sw $s1, 0x1c($sp) -/* C7A4F0 80243810 0080882D */ daddu $s1, $a0, $zero -/* C7A4F4 80243814 AFBF0034 */ sw $ra, 0x34($sp) -/* C7A4F8 80243818 AFB60030 */ sw $s6, 0x30($sp) -/* C7A4FC 8024381C AFB5002C */ sw $s5, 0x2c($sp) -/* C7A500 80243820 AFB40028 */ sw $s4, 0x28($sp) -/* C7A504 80243824 AFB30024 */ sw $s3, 0x24($sp) -/* C7A508 80243828 AFB20020 */ sw $s2, 0x20($sp) -/* C7A50C 8024382C AFB00018 */ sw $s0, 0x18($sp) -/* C7A510 80243830 F7B60040 */ sdc1 $f22, 0x40($sp) -/* C7A514 80243834 F7B40038 */ sdc1 $f20, 0x38($sp) -/* C7A518 80243838 8E30000C */ lw $s0, 0xc($s1) -/* C7A51C 8024383C 8E160000 */ lw $s6, ($s0) -/* C7A520 80243840 26100004 */ addiu $s0, $s0, 4 -/* C7A524 80243844 0C0B1EAF */ jal get_variable -/* C7A528 80243848 02C0282D */ daddu $a1, $s6, $zero -/* C7A52C 8024384C 44820000 */ mtc1 $v0, $f0 -/* C7A530 80243850 00000000 */ nop -/* C7A534 80243854 46800020 */ cvt.s.w $f0, $f0 -/* C7A538 80243858 E7A00010 */ swc1 $f0, 0x10($sp) -/* C7A53C 8024385C 8E140000 */ lw $s4, ($s0) -/* C7A540 80243860 26100004 */ addiu $s0, $s0, 4 -/* C7A544 80243864 0220202D */ daddu $a0, $s1, $zero -/* C7A548 80243868 0C0B1EAF */ jal get_variable -/* C7A54C 8024386C 0280282D */ daddu $a1, $s4, $zero -/* C7A550 80243870 0220202D */ daddu $a0, $s1, $zero -/* C7A554 80243874 8E150000 */ lw $s5, ($s0) -/* C7A558 80243878 4482B000 */ mtc1 $v0, $f22 -/* C7A55C 8024387C 00000000 */ nop -/* C7A560 80243880 4680B5A0 */ cvt.s.w $f22, $f22 -/* C7A564 80243884 0C0B1EAF */ jal get_variable -/* C7A568 80243888 02A0282D */ daddu $a1, $s5, $zero -/* C7A56C 8024388C 2404FFFC */ addiu $a0, $zero, -4 -/* C7A570 80243890 44820000 */ mtc1 $v0, $f0 -/* C7A574 80243894 00000000 */ nop -/* C7A578 80243898 46800020 */ cvt.s.w $f0, $f0 -/* C7A57C 8024389C 0C00EABB */ jal get_npc_unsafe -/* C7A580 802438A0 E7A00014 */ swc1 $f0, 0x14($sp) -/* C7A584 802438A4 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* C7A588 802438A8 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* C7A58C 802438AC 3C014334 */ lui $at, 0x4334 -/* C7A590 802438B0 44816000 */ mtc1 $at, $f12 -/* C7A594 802438B4 00041880 */ sll $v1, $a0, 2 -/* C7A598 802438B8 00641821 */ addu $v1, $v1, $a0 -/* C7A59C 802438BC 00031880 */ sll $v1, $v1, 2 -/* C7A5A0 802438C0 00641823 */ subu $v1, $v1, $a0 -/* C7A5A4 802438C4 000320C0 */ sll $a0, $v1, 3 -/* C7A5A8 802438C8 00641821 */ addu $v1, $v1, $a0 -/* C7A5AC 802438CC 000318C0 */ sll $v1, $v1, 3 -/* C7A5B0 802438D0 3C01800B */ lui $at, 0x800b -/* C7A5B4 802438D4 00230821 */ addu $at, $at, $v1 -/* C7A5B8 802438D8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C7A5BC 802438DC 460C0300 */ add.s $f12, $f0, $f12 -/* C7A5C0 802438E0 0C00A6C9 */ jal clamp_angle -/* C7A5C4 802438E4 0040982D */ daddu $s3, $v0, $zero -/* C7A5C8 802438E8 27B00010 */ addiu $s0, $sp, 0x10 -/* C7A5CC 802438EC 0200202D */ daddu $a0, $s0, $zero -/* C7A5D0 802438F0 27B20014 */ addiu $s2, $sp, 0x14 -/* C7A5D4 802438F4 0240282D */ daddu $a1, $s2, $zero -/* C7A5D8 802438F8 3C064170 */ lui $a2, 0x4170 -/* C7A5DC 802438FC 8E67000C */ lw $a3, 0xc($s3) -/* C7A5E0 80243900 0C00A7E7 */ jal add_vec2D_polar -/* C7A5E4 80243904 46000506 */ mov.s $f20, $f0 -/* C7A5E8 80243908 0200202D */ daddu $a0, $s0, $zero -/* C7A5EC 8024390C 3C064120 */ lui $a2, 0x4120 -/* C7A5F0 80243910 4407A000 */ mfc1 $a3, $f20 -/* C7A5F4 80243914 0C00A7E7 */ jal add_vec2D_polar -/* C7A5F8 80243918 0240282D */ daddu $a1, $s2, $zero -/* C7A5FC 8024391C 0220202D */ daddu $a0, $s1, $zero -/* C7A600 80243920 C7A00010 */ lwc1 $f0, 0x10($sp) -/* C7A604 80243924 4600008D */ trunc.w.s $f2, $f0 -/* C7A608 80243928 44061000 */ mfc1 $a2, $f2 -/* C7A60C 8024392C 0C0B2026 */ jal set_variable -/* C7A610 80243930 02C0282D */ daddu $a1, $s6, $zero -/* C7A614 80243934 0220202D */ daddu $a0, $s1, $zero -/* C7A618 80243938 4600B08D */ trunc.w.s $f2, $f22 -/* C7A61C 8024393C 44061000 */ mfc1 $a2, $f2 -/* C7A620 80243940 0C0B2026 */ jal set_variable -/* C7A624 80243944 0280282D */ daddu $a1, $s4, $zero -/* C7A628 80243948 0220202D */ daddu $a0, $s1, $zero -/* C7A62C 8024394C C7A00014 */ lwc1 $f0, 0x14($sp) -/* C7A630 80243950 4600008D */ trunc.w.s $f2, $f0 -/* C7A634 80243954 44061000 */ mfc1 $a2, $f2 -/* C7A638 80243958 0C0B2026 */ jal set_variable -/* C7A63C 8024395C 02A0282D */ daddu $a1, $s5, $zero -/* C7A640 80243960 8FBF0034 */ lw $ra, 0x34($sp) -/* C7A644 80243964 8FB60030 */ lw $s6, 0x30($sp) -/* C7A648 80243968 8FB5002C */ lw $s5, 0x2c($sp) -/* C7A64C 8024396C 8FB40028 */ lw $s4, 0x28($sp) -/* C7A650 80243970 8FB30024 */ lw $s3, 0x24($sp) -/* C7A654 80243974 8FB20020 */ lw $s2, 0x20($sp) -/* C7A658 80243978 8FB1001C */ lw $s1, 0x1c($sp) -/* C7A65C 8024397C 8FB00018 */ lw $s0, 0x18($sp) -/* C7A660 80243980 D7B60040 */ ldc1 $f22, 0x40($sp) -/* C7A664 80243984 D7B40038 */ ldc1 $f20, 0x38($sp) -/* C7A668 80243988 24020002 */ addiu $v0, $zero, 2 -/* C7A66C 8024398C 03E00008 */ jr $ra -/* C7A670 80243990 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808_C7A4E8.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808_C7A4E8.s new file mode 100644 index 0000000000..077b45bf21 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243808_C7A4E8.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243808_C7A4E8 +/* C7A4E8 80243808 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C7A4EC 8024380C AFB1001C */ sw $s1, 0x1c($sp) +/* C7A4F0 80243810 0080882D */ daddu $s1, $a0, $zero +/* C7A4F4 80243814 AFBF0034 */ sw $ra, 0x34($sp) +/* C7A4F8 80243818 AFB60030 */ sw $s6, 0x30($sp) +/* C7A4FC 8024381C AFB5002C */ sw $s5, 0x2c($sp) +/* C7A500 80243820 AFB40028 */ sw $s4, 0x28($sp) +/* C7A504 80243824 AFB30024 */ sw $s3, 0x24($sp) +/* C7A508 80243828 AFB20020 */ sw $s2, 0x20($sp) +/* C7A50C 8024382C AFB00018 */ sw $s0, 0x18($sp) +/* C7A510 80243830 F7B60040 */ sdc1 $f22, 0x40($sp) +/* C7A514 80243834 F7B40038 */ sdc1 $f20, 0x38($sp) +/* C7A518 80243838 8E30000C */ lw $s0, 0xc($s1) +/* C7A51C 8024383C 8E160000 */ lw $s6, ($s0) +/* C7A520 80243840 26100004 */ addiu $s0, $s0, 4 +/* C7A524 80243844 0C0B1EAF */ jal get_variable +/* C7A528 80243848 02C0282D */ daddu $a1, $s6, $zero +/* C7A52C 8024384C 44820000 */ mtc1 $v0, $f0 +/* C7A530 80243850 00000000 */ nop +/* C7A534 80243854 46800020 */ cvt.s.w $f0, $f0 +/* C7A538 80243858 E7A00010 */ swc1 $f0, 0x10($sp) +/* C7A53C 8024385C 8E140000 */ lw $s4, ($s0) +/* C7A540 80243860 26100004 */ addiu $s0, $s0, 4 +/* C7A544 80243864 0220202D */ daddu $a0, $s1, $zero +/* C7A548 80243868 0C0B1EAF */ jal get_variable +/* C7A54C 8024386C 0280282D */ daddu $a1, $s4, $zero +/* C7A550 80243870 0220202D */ daddu $a0, $s1, $zero +/* C7A554 80243874 8E150000 */ lw $s5, ($s0) +/* C7A558 80243878 4482B000 */ mtc1 $v0, $f22 +/* C7A55C 8024387C 00000000 */ nop +/* C7A560 80243880 4680B5A0 */ cvt.s.w $f22, $f22 +/* C7A564 80243884 0C0B1EAF */ jal get_variable +/* C7A568 80243888 02A0282D */ daddu $a1, $s5, $zero +/* C7A56C 8024388C 2404FFFC */ addiu $a0, $zero, -4 +/* C7A570 80243890 44820000 */ mtc1 $v0, $f0 +/* C7A574 80243894 00000000 */ nop +/* C7A578 80243898 46800020 */ cvt.s.w $f0, $f0 +/* C7A57C 8024389C 0C00EABB */ jal get_npc_unsafe +/* C7A580 802438A0 E7A00014 */ swc1 $f0, 0x14($sp) +/* C7A584 802438A4 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* C7A588 802438A8 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* C7A58C 802438AC 3C014334 */ lui $at, 0x4334 +/* C7A590 802438B0 44816000 */ mtc1 $at, $f12 +/* C7A594 802438B4 00041880 */ sll $v1, $a0, 2 +/* C7A598 802438B8 00641821 */ addu $v1, $v1, $a0 +/* C7A59C 802438BC 00031880 */ sll $v1, $v1, 2 +/* C7A5A0 802438C0 00641823 */ subu $v1, $v1, $a0 +/* C7A5A4 802438C4 000320C0 */ sll $a0, $v1, 3 +/* C7A5A8 802438C8 00641821 */ addu $v1, $v1, $a0 +/* C7A5AC 802438CC 000318C0 */ sll $v1, $v1, 3 +/* C7A5B0 802438D0 3C01800B */ lui $at, 0x800b +/* C7A5B4 802438D4 00230821 */ addu $at, $at, $v1 +/* C7A5B8 802438D8 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* C7A5BC 802438DC 460C0300 */ add.s $f12, $f0, $f12 +/* C7A5C0 802438E0 0C00A6C9 */ jal clamp_angle +/* C7A5C4 802438E4 0040982D */ daddu $s3, $v0, $zero +/* C7A5C8 802438E8 27B00010 */ addiu $s0, $sp, 0x10 +/* C7A5CC 802438EC 0200202D */ daddu $a0, $s0, $zero +/* C7A5D0 802438F0 27B20014 */ addiu $s2, $sp, 0x14 +/* C7A5D4 802438F4 0240282D */ daddu $a1, $s2, $zero +/* C7A5D8 802438F8 3C064170 */ lui $a2, 0x4170 +/* C7A5DC 802438FC 8E67000C */ lw $a3, 0xc($s3) +/* C7A5E0 80243900 0C00A7E7 */ jal add_vec2D_polar +/* C7A5E4 80243904 46000506 */ mov.s $f20, $f0 +/* C7A5E8 80243908 0200202D */ daddu $a0, $s0, $zero +/* C7A5EC 8024390C 3C064120 */ lui $a2, 0x4120 +/* C7A5F0 80243910 4407A000 */ mfc1 $a3, $f20 +/* C7A5F4 80243914 0C00A7E7 */ jal add_vec2D_polar +/* C7A5F8 80243918 0240282D */ daddu $a1, $s2, $zero +/* C7A5FC 8024391C 0220202D */ daddu $a0, $s1, $zero +/* C7A600 80243920 C7A00010 */ lwc1 $f0, 0x10($sp) +/* C7A604 80243924 4600008D */ trunc.w.s $f2, $f0 +/* C7A608 80243928 44061000 */ mfc1 $a2, $f2 +/* C7A60C 8024392C 0C0B2026 */ jal set_variable +/* C7A610 80243930 02C0282D */ daddu $a1, $s6, $zero +/* C7A614 80243934 0220202D */ daddu $a0, $s1, $zero +/* C7A618 80243938 4600B08D */ trunc.w.s $f2, $f22 +/* C7A61C 8024393C 44061000 */ mfc1 $a2, $f2 +/* C7A620 80243940 0C0B2026 */ jal set_variable +/* C7A624 80243944 0280282D */ daddu $a1, $s4, $zero +/* C7A628 80243948 0220202D */ daddu $a0, $s1, $zero +/* C7A62C 8024394C C7A00014 */ lwc1 $f0, 0x14($sp) +/* C7A630 80243950 4600008D */ trunc.w.s $f2, $f0 +/* C7A634 80243954 44061000 */ mfc1 $a2, $f2 +/* C7A638 80243958 0C0B2026 */ jal set_variable +/* C7A63C 8024395C 02A0282D */ daddu $a1, $s5, $zero +/* C7A640 80243960 8FBF0034 */ lw $ra, 0x34($sp) +/* C7A644 80243964 8FB60030 */ lw $s6, 0x30($sp) +/* C7A648 80243968 8FB5002C */ lw $s5, 0x2c($sp) +/* C7A64C 8024396C 8FB40028 */ lw $s4, 0x28($sp) +/* C7A650 80243970 8FB30024 */ lw $s3, 0x24($sp) +/* C7A654 80243974 8FB20020 */ lw $s2, 0x20($sp) +/* C7A658 80243978 8FB1001C */ lw $s1, 0x1c($sp) +/* C7A65C 8024397C 8FB00018 */ lw $s0, 0x18($sp) +/* C7A660 80243980 D7B60040 */ ldc1 $f22, 0x40($sp) +/* C7A664 80243984 D7B40038 */ ldc1 $f20, 0x38($sp) +/* C7A668 80243988 24020002 */ addiu $v0, $zero, 2 +/* C7A66C 8024398C 03E00008 */ jr $ra +/* C7A670 80243990 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994.s deleted file mode 100644 index 2f031b276d..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243994 -/* C7A674 80243994 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C7A678 80243998 AFB00010 */ sw $s0, 0x10($sp) -/* C7A67C 8024399C 0080802D */ daddu $s0, $a0, $zero -/* C7A680 802439A0 AFBF0014 */ sw $ra, 0x14($sp) -/* C7A684 802439A4 0C00EABB */ jal get_npc_unsafe -/* C7A688 802439A8 8E04008C */ lw $a0, 0x8c($s0) -/* C7A68C 802439AC 0040282D */ daddu $a1, $v0, $zero -/* C7A690 802439B0 8E040094 */ lw $a0, 0x94($s0) -/* C7A694 802439B4 8CA30028 */ lw $v1, 0x28($a1) -/* C7A698 802439B8 ACA40028 */ sw $a0, 0x28($a1) -/* C7A69C 802439BC 8FBF0014 */ lw $ra, 0x14($sp) -/* C7A6A0 802439C0 8FB00010 */ lw $s0, 0x10($sp) -/* C7A6A4 802439C4 24020002 */ addiu $v0, $zero, 2 -/* C7A6A8 802439C8 3C018024 */ lui $at, 0x8024 -/* C7A6AC 802439CC AC237664 */ sw $v1, 0x7664($at) -/* C7A6B0 802439D0 03E00008 */ jr $ra -/* C7A6B4 802439D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s new file mode 100644 index 0000000000..d530510ae5 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C77D00/func_80243994_C7A674.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243994_C7A674 +/* C7A674 80243994 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C7A678 80243998 AFB00010 */ sw $s0, 0x10($sp) +/* C7A67C 8024399C 0080802D */ daddu $s0, $a0, $zero +/* C7A680 802439A0 AFBF0014 */ sw $ra, 0x14($sp) +/* C7A684 802439A4 0C00EABB */ jal get_npc_unsafe +/* C7A688 802439A8 8E04008C */ lw $a0, 0x8c($s0) +/* C7A68C 802439AC 0040282D */ daddu $a1, $v0, $zero +/* C7A690 802439B0 8E040094 */ lw $a0, 0x94($s0) +/* C7A694 802439B4 8CA30028 */ lw $v1, 0x28($a1) +/* C7A698 802439B8 ACA40028 */ sw $a0, 0x28($a1) +/* C7A69C 802439BC 8FBF0014 */ lw $ra, 0x14($sp) +/* C7A6A0 802439C0 8FB00010 */ lw $s0, 0x10($sp) +/* C7A6A4 802439C4 24020002 */ addiu $v0, $zero, 2 +/* C7A6A8 802439C8 3C018024 */ lui $at, 0x8024 +/* C7A6AC 802439CC AC237664 */ sw $v1, 0x7664($at) +/* C7A6B0 802439D0 03E00008 */ jr $ra +/* C7A6B4 802439D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC.s deleted file mode 100644 index 041adb87bf..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404EC -/* C7E66C 802404EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C7E670 802404F0 AFB00010 */ sw $s0, 0x10($sp) -/* C7E674 802404F4 0080802D */ daddu $s0, $a0, $zero -/* C7E678 802404F8 AFBF0014 */ sw $ra, 0x14($sp) -/* C7E67C 802404FC F7B40018 */ sdc1 $f20, 0x18($sp) -/* C7E680 80240500 C60C0090 */ lwc1 $f12, 0x90($s0) -/* C7E684 80240504 46806320 */ cvt.s.w $f12, $f12 -/* C7E688 80240508 3C018024 */ lui $at, 0x8024 -/* C7E68C 8024050C D4342000 */ ldc1 $f20, 0x2000($at) -/* C7E690 80240510 46006307 */ neg.s $f12, $f12 -/* C7E694 80240514 46006321 */ cvt.d.s $f12, $f12 -/* C7E698 80240518 46346301 */ sub.d $f12, $f12, $f20 -/* C7E69C 8024051C 0C00A8D4 */ jal cos_deg -/* C7E6A0 80240520 46206320 */ cvt.s.d $f12, $f12 -/* C7E6A4 80240524 3C014008 */ lui $at, 0x4008 -/* C7E6A8 80240528 44811800 */ mtc1 $at, $f3 -/* C7E6AC 8024052C 44801000 */ mtc1 $zero, $f2 -/* C7E6B0 80240530 46000021 */ cvt.d.s $f0, $f0 -/* C7E6B4 80240534 46220002 */ mul.d $f0, $f0, $f2 -/* C7E6B8 80240538 00000000 */ nop -/* C7E6BC 8024053C C60C0090 */ lwc1 $f12, 0x90($s0) -/* C7E6C0 80240540 46806320 */ cvt.s.w $f12, $f12 -/* C7E6C4 80240544 46006307 */ neg.s $f12, $f12 -/* C7E6C8 80240548 46006321 */ cvt.d.s $f12, $f12 -/* C7E6CC 8024054C 46346301 */ sub.d $f12, $f12, $f20 -/* C7E6D0 80240550 3C018024 */ lui $at, 0x8024 -/* C7E6D4 80240554 D4222008 */ ldc1 $f2, 0x2008($at) -/* C7E6D8 80240558 46220001 */ sub.d $f0, $f0, $f2 -/* C7E6DC 8024055C 4620010D */ trunc.w.d $f4, $f0 -/* C7E6E0 80240560 E6040098 */ swc1 $f4, 0x98($s0) -/* C7E6E4 80240564 0C00A8BB */ jal sin_deg -/* C7E6E8 80240568 46206320 */ cvt.s.d $f12, $f12 -/* C7E6EC 8024056C 3C014014 */ lui $at, 0x4014 -/* C7E6F0 80240570 44811800 */ mtc1 $at, $f3 -/* C7E6F4 80240574 44801000 */ mtc1 $zero, $f2 -/* C7E6F8 80240578 46000021 */ cvt.d.s $f0, $f0 -/* C7E6FC 8024057C 46220002 */ mul.d $f0, $f0, $f2 -/* C7E700 80240580 00000000 */ nop -/* C7E704 80240584 4620010D */ trunc.w.d $f4, $f0 -/* C7E708 80240588 E604009C */ swc1 $f4, 0x9c($s0) -/* C7E70C 8024058C 8FBF0014 */ lw $ra, 0x14($sp) -/* C7E710 80240590 8FB00010 */ lw $s0, 0x10($sp) -/* C7E714 80240594 D7B40018 */ ldc1 $f20, 0x18($sp) -/* C7E718 80240598 24020002 */ addiu $v0, $zero, 2 -/* C7E71C 8024059C 03E00008 */ jr $ra -/* C7E720 802405A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s new file mode 100644 index 0000000000..4d43abe11f --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_802404EC_C7E66C.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404EC_C7E66C +/* C7E66C 802404EC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C7E670 802404F0 AFB00010 */ sw $s0, 0x10($sp) +/* C7E674 802404F4 0080802D */ daddu $s0, $a0, $zero +/* C7E678 802404F8 AFBF0014 */ sw $ra, 0x14($sp) +/* C7E67C 802404FC F7B40018 */ sdc1 $f20, 0x18($sp) +/* C7E680 80240500 C60C0090 */ lwc1 $f12, 0x90($s0) +/* C7E684 80240504 46806320 */ cvt.s.w $f12, $f12 +/* C7E688 80240508 3C018024 */ lui $at, 0x8024 +/* C7E68C 8024050C D4342000 */ ldc1 $f20, 0x2000($at) +/* C7E690 80240510 46006307 */ neg.s $f12, $f12 +/* C7E694 80240514 46006321 */ cvt.d.s $f12, $f12 +/* C7E698 80240518 46346301 */ sub.d $f12, $f12, $f20 +/* C7E69C 8024051C 0C00A8D4 */ jal cos_deg +/* C7E6A0 80240520 46206320 */ cvt.s.d $f12, $f12 +/* C7E6A4 80240524 3C014008 */ lui $at, 0x4008 +/* C7E6A8 80240528 44811800 */ mtc1 $at, $f3 +/* C7E6AC 8024052C 44801000 */ mtc1 $zero, $f2 +/* C7E6B0 80240530 46000021 */ cvt.d.s $f0, $f0 +/* C7E6B4 80240534 46220002 */ mul.d $f0, $f0, $f2 +/* C7E6B8 80240538 00000000 */ nop +/* C7E6BC 8024053C C60C0090 */ lwc1 $f12, 0x90($s0) +/* C7E6C0 80240540 46806320 */ cvt.s.w $f12, $f12 +/* C7E6C4 80240544 46006307 */ neg.s $f12, $f12 +/* C7E6C8 80240548 46006321 */ cvt.d.s $f12, $f12 +/* C7E6CC 8024054C 46346301 */ sub.d $f12, $f12, $f20 +/* C7E6D0 80240550 3C018024 */ lui $at, 0x8024 +/* C7E6D4 80240554 D4222008 */ ldc1 $f2, 0x2008($at) +/* C7E6D8 80240558 46220001 */ sub.d $f0, $f0, $f2 +/* C7E6DC 8024055C 4620010D */ trunc.w.d $f4, $f0 +/* C7E6E0 80240560 E6040098 */ swc1 $f4, 0x98($s0) +/* C7E6E4 80240564 0C00A8BB */ jal sin_deg +/* C7E6E8 80240568 46206320 */ cvt.s.d $f12, $f12 +/* C7E6EC 8024056C 3C014014 */ lui $at, 0x4014 +/* C7E6F0 80240570 44811800 */ mtc1 $at, $f3 +/* C7E6F4 80240574 44801000 */ mtc1 $zero, $f2 +/* C7E6F8 80240578 46000021 */ cvt.d.s $f0, $f0 +/* C7E6FC 8024057C 46220002 */ mul.d $f0, $f0, $f2 +/* C7E700 80240580 00000000 */ nop +/* C7E704 80240584 4620010D */ trunc.w.d $f4, $f0 +/* C7E708 80240588 E604009C */ swc1 $f4, 0x9c($s0) +/* C7E70C 8024058C 8FBF0014 */ lw $ra, 0x14($sp) +/* C7E710 80240590 8FB00010 */ lw $s0, 0x10($sp) +/* C7E714 80240594 D7B40018 */ ldc1 $f20, 0x18($sp) +/* C7E718 80240598 24020002 */ addiu $v0, $zero, 2 +/* C7E71C 8024059C 03E00008 */ jr $ra +/* C7E720 802405A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638.s deleted file mode 100644 index 08581e3dc6..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240638 -/* C7E7B8 80240638 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C7E7BC 8024063C AFB1001C */ sw $s1, 0x1c($sp) -/* C7E7C0 80240640 0080882D */ daddu $s1, $a0, $zero -/* C7E7C4 80240644 AFBF0020 */ sw $ra, 0x20($sp) -/* C7E7C8 80240648 AFB00018 */ sw $s0, 0x18($sp) -/* C7E7CC 8024064C 8E30000C */ lw $s0, 0xc($s1) -/* C7E7D0 80240650 8E050000 */ lw $a1, ($s0) -/* C7E7D4 80240654 0C0B1EAF */ jal get_variable -/* C7E7D8 80240658 26100004 */ addiu $s0, $s0, 4 -/* C7E7DC 8024065C AE220070 */ sw $v0, 0x70($s1) -/* C7E7E0 80240660 8E050000 */ lw $a1, ($s0) -/* C7E7E4 80240664 26100004 */ addiu $s0, $s0, 4 -/* C7E7E8 80240668 0C0B1EAF */ jal get_variable -/* C7E7EC 8024066C 0220202D */ daddu $a0, $s1, $zero -/* C7E7F0 80240670 AE220074 */ sw $v0, 0x74($s1) -/* C7E7F4 80240674 8E050000 */ lw $a1, ($s0) -/* C7E7F8 80240678 0C0B1EAF */ jal get_variable -/* C7E7FC 8024067C 0220202D */ daddu $a0, $s1, $zero -/* C7E800 80240680 24040052 */ addiu $a0, $zero, 0x52 -/* C7E804 80240684 0000282D */ daddu $a1, $zero, $zero -/* C7E808 80240688 C6200070 */ lwc1 $f0, 0x70($s1) -/* C7E80C 8024068C 46800020 */ cvt.s.w $f0, $f0 -/* C7E810 80240690 C6220074 */ lwc1 $f2, 0x74($s1) -/* C7E814 80240694 468010A0 */ cvt.s.w $f2, $f2 -/* C7E818 80240698 44060000 */ mfc1 $a2, $f0 -/* C7E81C 8024069C 44071000 */ mfc1 $a3, $f2 -/* C7E820 802406A0 44820000 */ mtc1 $v0, $f0 -/* C7E824 802406A4 00000000 */ nop -/* C7E828 802406A8 46800020 */ cvt.s.w $f0, $f0 -/* C7E82C 802406AC AE220078 */ sw $v0, 0x78($s1) -/* C7E830 802406B0 0C05267B */ jal func_801499EC -/* C7E834 802406B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C7E838 802406B8 8FBF0020 */ lw $ra, 0x20($sp) -/* C7E83C 802406BC 8FB1001C */ lw $s1, 0x1c($sp) -/* C7E840 802406C0 8FB00018 */ lw $s0, 0x18($sp) -/* C7E844 802406C4 24020002 */ addiu $v0, $zero, 2 -/* C7E848 802406C8 03E00008 */ jr $ra -/* C7E84C 802406CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s new file mode 100644 index 0000000000..2a9f254061 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_10/C7E4B0/func_80240638_C7E7B8.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240638_C7E7B8 +/* C7E7B8 80240638 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C7E7BC 8024063C AFB1001C */ sw $s1, 0x1c($sp) +/* C7E7C0 80240640 0080882D */ daddu $s1, $a0, $zero +/* C7E7C4 80240644 AFBF0020 */ sw $ra, 0x20($sp) +/* C7E7C8 80240648 AFB00018 */ sw $s0, 0x18($sp) +/* C7E7CC 8024064C 8E30000C */ lw $s0, 0xc($s1) +/* C7E7D0 80240650 8E050000 */ lw $a1, ($s0) +/* C7E7D4 80240654 0C0B1EAF */ jal get_variable +/* C7E7D8 80240658 26100004 */ addiu $s0, $s0, 4 +/* C7E7DC 8024065C AE220070 */ sw $v0, 0x70($s1) +/* C7E7E0 80240660 8E050000 */ lw $a1, ($s0) +/* C7E7E4 80240664 26100004 */ addiu $s0, $s0, 4 +/* C7E7E8 80240668 0C0B1EAF */ jal get_variable +/* C7E7EC 8024066C 0220202D */ daddu $a0, $s1, $zero +/* C7E7F0 80240670 AE220074 */ sw $v0, 0x74($s1) +/* C7E7F4 80240674 8E050000 */ lw $a1, ($s0) +/* C7E7F8 80240678 0C0B1EAF */ jal get_variable +/* C7E7FC 8024067C 0220202D */ daddu $a0, $s1, $zero +/* C7E800 80240680 24040052 */ addiu $a0, $zero, 0x52 +/* C7E804 80240684 0000282D */ daddu $a1, $zero, $zero +/* C7E808 80240688 C6200070 */ lwc1 $f0, 0x70($s1) +/* C7E80C 8024068C 46800020 */ cvt.s.w $f0, $f0 +/* C7E810 80240690 C6220074 */ lwc1 $f2, 0x74($s1) +/* C7E814 80240694 468010A0 */ cvt.s.w $f2, $f2 +/* C7E818 80240698 44060000 */ mfc1 $a2, $f0 +/* C7E81C 8024069C 44071000 */ mfc1 $a3, $f2 +/* C7E820 802406A0 44820000 */ mtc1 $v0, $f0 +/* C7E824 802406A4 00000000 */ nop +/* C7E828 802406A8 46800020 */ cvt.s.w $f0, $f0 +/* C7E82C 802406AC AE220078 */ sw $v0, 0x78($s1) +/* C7E830 802406B0 0C05267B */ jal func_801499EC +/* C7E834 802406B4 E7A00010 */ swc1 $f0, 0x10($sp) +/* C7E838 802406B8 8FBF0020 */ lw $ra, 0x20($sp) +/* C7E83C 802406BC 8FB1001C */ lw $s1, 0x1c($sp) +/* C7E840 802406C0 8FB00018 */ lw $s0, 0x18($sp) +/* C7E844 802406C4 24020002 */ addiu $v0, $zero, 2 +/* C7E848 802406C8 03E00008 */ jr $ra +/* C7E84C 802406CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C.s deleted file mode 100644 index af460f6733..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024103C -/* C811DC 8024103C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C811E0 80241040 AFB20018 */ sw $s2, 0x18($sp) -/* C811E4 80241044 0080902D */ daddu $s2, $a0, $zero -/* C811E8 80241048 AFBF001C */ sw $ra, 0x1c($sp) -/* C811EC 8024104C AFB10014 */ sw $s1, 0x14($sp) -/* C811F0 80241050 AFB00010 */ sw $s0, 0x10($sp) -/* C811F4 80241054 8E510148 */ lw $s1, 0x148($s2) -/* C811F8 80241058 0C00EABB */ jal get_npc_unsafe -/* C811FC 8024105C 86240008 */ lh $a0, 8($s1) -/* C81200 80241060 0040802D */ daddu $s0, $v0, $zero -/* C81204 80241064 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81208 80241068 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C8120C 8024106C C60C0038 */ lwc1 $f12, 0x38($s0) -/* C81210 80241070 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C81214 80241074 A600008E */ sh $zero, 0x8e($s0) -/* C81218 80241078 8C460028 */ lw $a2, 0x28($v0) -/* C8121C 8024107C 0C00A720 */ jal atan2 -/* C81220 80241080 8C470030 */ lw $a3, 0x30($v0) -/* C81224 80241084 E600000C */ swc1 $f0, 0xc($s0) -/* C81228 80241088 8E2200CC */ lw $v0, 0xcc($s1) -/* C8122C 8024108C 8C420020 */ lw $v0, 0x20($v0) -/* C81230 80241090 AE020028 */ sw $v0, 0x28($s0) -/* C81234 80241094 2402000B */ addiu $v0, $zero, 0xb -/* C81238 80241098 AE420070 */ sw $v0, 0x70($s2) -/* C8123C 8024109C 8FBF001C */ lw $ra, 0x1c($sp) -/* C81240 802410A0 8FB20018 */ lw $s2, 0x18($sp) -/* C81244 802410A4 8FB10014 */ lw $s1, 0x14($sp) -/* C81248 802410A8 8FB00010 */ lw $s0, 0x10($sp) -/* C8124C 802410AC 03E00008 */ jr $ra -/* C81250 802410B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C_C811DC.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C_C811DC.s new file mode 100644 index 0000000000..377a1fdfcf --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024103C_C811DC.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024103C_C811DC +/* C811DC 8024103C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C811E0 80241040 AFB20018 */ sw $s2, 0x18($sp) +/* C811E4 80241044 0080902D */ daddu $s2, $a0, $zero +/* C811E8 80241048 AFBF001C */ sw $ra, 0x1c($sp) +/* C811EC 8024104C AFB10014 */ sw $s1, 0x14($sp) +/* C811F0 80241050 AFB00010 */ sw $s0, 0x10($sp) +/* C811F4 80241054 8E510148 */ lw $s1, 0x148($s2) +/* C811F8 80241058 0C00EABB */ jal get_npc_unsafe +/* C811FC 8024105C 86240008 */ lh $a0, 8($s1) +/* C81200 80241060 0040802D */ daddu $s0, $v0, $zero +/* C81204 80241064 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C81208 80241068 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C8120C 8024106C C60C0038 */ lwc1 $f12, 0x38($s0) +/* C81210 80241070 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C81214 80241074 A600008E */ sh $zero, 0x8e($s0) +/* C81218 80241078 8C460028 */ lw $a2, 0x28($v0) +/* C8121C 8024107C 0C00A720 */ jal atan2 +/* C81220 80241080 8C470030 */ lw $a3, 0x30($v0) +/* C81224 80241084 E600000C */ swc1 $f0, 0xc($s0) +/* C81228 80241088 8E2200CC */ lw $v0, 0xcc($s1) +/* C8122C 8024108C 8C420020 */ lw $v0, 0x20($v0) +/* C81230 80241090 AE020028 */ sw $v0, 0x28($s0) +/* C81234 80241094 2402000B */ addiu $v0, $zero, 0xb +/* C81238 80241098 AE420070 */ sw $v0, 0x70($s2) +/* C8123C 8024109C 8FBF001C */ lw $ra, 0x1c($sp) +/* C81240 802410A0 8FB20018 */ lw $s2, 0x18($sp) +/* C81244 802410A4 8FB10014 */ lw $s1, 0x14($sp) +/* C81248 802410A8 8FB00010 */ lw $s0, 0x10($sp) +/* C8124C 802410AC 03E00008 */ jr $ra +/* C81250 802410B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254.s deleted file mode 100644 index 16e1137bc7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241254 -/* C813F4 80241254 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C813F8 80241258 AFB00010 */ sw $s0, 0x10($sp) -/* C813FC 8024125C 0080802D */ daddu $s0, $a0, $zero -/* C81400 80241260 AFBF0014 */ sw $ra, 0x14($sp) -/* C81404 80241264 8E020148 */ lw $v0, 0x148($s0) -/* C81408 80241268 0C00EABB */ jal get_npc_unsafe -/* C8140C 8024126C 84440008 */ lh $a0, 8($v0) -/* C81410 80241270 0040202D */ daddu $a0, $v0, $zero -/* C81414 80241274 8482008E */ lh $v0, 0x8e($a0) -/* C81418 80241278 9483008E */ lhu $v1, 0x8e($a0) -/* C8141C 8024127C 18400005 */ blez $v0, .L80241294 -/* C81420 80241280 2462FFFF */ addiu $v0, $v1, -1 -/* C81424 80241284 A482008E */ sh $v0, 0x8e($a0) -/* C81428 80241288 00021400 */ sll $v0, $v0, 0x10 -/* C8142C 8024128C 1C400006 */ bgtz $v0, .L802412A8 -/* C81430 80241290 00000000 */ nop -.L80241294: -/* C81434 80241294 8482008C */ lh $v0, 0x8c($a0) -/* C81438 80241298 14400003 */ bnez $v0, .L802412A8 -/* C8143C 8024129C 2402000E */ addiu $v0, $zero, 0xe -/* C81440 802412A0 A480008E */ sh $zero, 0x8e($a0) -/* C81444 802412A4 AE020070 */ sw $v0, 0x70($s0) -.L802412A8: -/* C81448 802412A8 8FBF0014 */ lw $ra, 0x14($sp) -/* C8144C 802412AC 8FB00010 */ lw $s0, 0x10($sp) -/* C81450 802412B0 03E00008 */ jr $ra -/* C81454 802412B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s new file mode 100644 index 0000000000..0f9bf167da --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241254_C813F4.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241254_C813F4 +/* C813F4 80241254 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C813F8 80241258 AFB00010 */ sw $s0, 0x10($sp) +/* C813FC 8024125C 0080802D */ daddu $s0, $a0, $zero +/* C81400 80241260 AFBF0014 */ sw $ra, 0x14($sp) +/* C81404 80241264 8E020148 */ lw $v0, 0x148($s0) +/* C81408 80241268 0C00EABB */ jal get_npc_unsafe +/* C8140C 8024126C 84440008 */ lh $a0, 8($v0) +/* C81410 80241270 0040202D */ daddu $a0, $v0, $zero +/* C81414 80241274 8482008E */ lh $v0, 0x8e($a0) +/* C81418 80241278 9483008E */ lhu $v1, 0x8e($a0) +/* C8141C 8024127C 18400005 */ blez $v0, .L80241294 +/* C81420 80241280 2462FFFF */ addiu $v0, $v1, -1 +/* C81424 80241284 A482008E */ sh $v0, 0x8e($a0) +/* C81428 80241288 00021400 */ sll $v0, $v0, 0x10 +/* C8142C 8024128C 1C400006 */ bgtz $v0, .L802412A8 +/* C81430 80241290 00000000 */ nop +.L80241294: +/* C81434 80241294 8482008C */ lh $v0, 0x8c($a0) +/* C81438 80241298 14400003 */ bnez $v0, .L802412A8 +/* C8143C 8024129C 2402000E */ addiu $v0, $zero, 0xe +/* C81440 802412A0 A480008E */ sh $zero, 0x8e($a0) +/* C81444 802412A4 AE020070 */ sw $v0, 0x70($s0) +.L802412A8: +/* C81448 802412A8 8FBF0014 */ lw $ra, 0x14($sp) +/* C8144C 802412AC 8FB00010 */ lw $s0, 0x10($sp) +/* C81450 802412B0 03E00008 */ jr $ra +/* C81454 802412B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8.s deleted file mode 100644 index 0e9ffd397c..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B8 -/* C81458 802412B8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C8145C 802412BC AFB20030 */ sw $s2, 0x30($sp) -/* C81460 802412C0 0080902D */ daddu $s2, $a0, $zero -/* C81464 802412C4 AFBF0038 */ sw $ra, 0x38($sp) -/* C81468 802412C8 AFB30034 */ sw $s3, 0x34($sp) -/* C8146C 802412CC AFB1002C */ sw $s1, 0x2c($sp) -/* C81470 802412D0 AFB00028 */ sw $s0, 0x28($sp) -/* C81474 802412D4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* C81478 802412D8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* C8147C 802412DC 8E510148 */ lw $s1, 0x148($s2) -/* C81480 802412E0 86240008 */ lh $a0, 8($s1) -/* C81484 802412E4 0C00EABB */ jal get_npc_unsafe -/* C81488 802412E8 00A0982D */ daddu $s3, $a1, $zero -/* C8148C 802412EC 0040802D */ daddu $s0, $v0, $zero -/* C81490 802412F0 0200202D */ daddu $a0, $s0, $zero -/* C81494 802412F4 C6220088 */ lwc1 $f2, 0x88($s1) -/* C81498 802412F8 468010A0 */ cvt.s.w $f2, $f2 -/* C8149C 802412FC 460010A1 */ cvt.d.s $f2, $f2 -/* C814A0 80241300 C604001C */ lwc1 $f4, 0x1c($s0) -/* C814A4 80241304 C6000014 */ lwc1 $f0, 0x14($s0) -/* C814A8 80241308 8E050018 */ lw $a1, 0x18($s0) -/* C814AC 8024130C 46002100 */ add.s $f4, $f4, $f0 -/* C814B0 80241310 8E06000C */ lw $a2, 0xc($s0) -/* C814B4 80241314 C6200078 */ lwc1 $f0, 0x78($s1) -/* C814B8 80241318 46800020 */ cvt.s.w $f0, $f0 -/* C814BC 8024131C E604001C */ swc1 $f4, 0x1c($s0) -/* C814C0 80241320 3C014059 */ lui $at, 0x4059 -/* C814C4 80241324 44812800 */ mtc1 $at, $f5 -/* C814C8 80241328 44802000 */ mtc1 $zero, $f4 -/* C814CC 8024132C 46000021 */ cvt.d.s $f0, $f0 -/* C814D0 80241330 46240003 */ div.d $f0, $f0, $f4 -/* C814D4 80241334 46200520 */ cvt.s.d $f20, $f0 -/* C814D8 80241338 46241083 */ div.d $f2, $f2, $f4 -/* C814DC 8024133C 0C00EA95 */ jal npc_move_heading -/* C814E0 80241340 462015A0 */ cvt.s.d $f22, $f2 -/* C814E4 80241344 C604001C */ lwc1 $f4, 0x1c($s0) -/* C814E8 80241348 44801000 */ mtc1 $zero, $f2 -/* C814EC 8024134C 44801800 */ mtc1 $zero, $f3 -/* C814F0 80241350 46002021 */ cvt.d.s $f0, $f4 -/* C814F4 80241354 4620103E */ c.le.d $f2, $f0 -/* C814F8 80241358 00000000 */ nop -/* C814FC 8024135C 45000030 */ bc1f .L80241420 -/* C81500 80241360 00000000 */ nop -/* C81504 80241364 C600003C */ lwc1 $f0, 0x3c($s0) -/* C81508 80241368 46040000 */ add.s $f0, $f0, $f4 -/* C8150C 8024136C E600003C */ swc1 $f0, 0x3c($s0) -/* C81510 80241370 8E2200CC */ lw $v0, 0xcc($s1) -/* C81514 80241374 8C420024 */ lw $v0, 0x24($v0) -/* C81518 80241378 AE020028 */ sw $v0, 0x28($s0) -/* C8151C 8024137C A2200007 */ sb $zero, 7($s1) -/* C81520 80241380 8E020000 */ lw $v0, ($s0) -/* C81524 80241384 30420008 */ andi $v0, $v0, 8 -/* C81528 80241388 14400011 */ bnez $v0, .L802413D0 -/* C8152C 8024138C 0000102D */ daddu $v0, $zero, $zero -/* C81530 80241390 27A50018 */ addiu $a1, $sp, 0x18 -/* C81534 80241394 27A6001C */ addiu $a2, $sp, 0x1c -/* C81538 80241398 C6000038 */ lwc1 $f0, 0x38($s0) -/* C8153C 8024139C C602003C */ lwc1 $f2, 0x3c($s0) -/* C81540 802413A0 C6040040 */ lwc1 $f4, 0x40($s0) -/* C81544 802413A4 3C01447A */ lui $at, 0x447a -/* C81548 802413A8 44813000 */ mtc1 $at, $f6 -/* C8154C 802413AC 27A20024 */ addiu $v0, $sp, 0x24 -/* C81550 802413B0 E7A00018 */ swc1 $f0, 0x18($sp) -/* C81554 802413B4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* C81558 802413B8 E7A40020 */ swc1 $f4, 0x20($sp) -/* C8155C 802413BC E7A60024 */ swc1 $f6, 0x24($sp) -/* C81560 802413C0 AFA20010 */ sw $v0, 0x10($sp) -/* C81564 802413C4 8E040080 */ lw $a0, 0x80($s0) -/* C81568 802413C8 0C0372DF */ jal func_800DCB7C -/* C8156C 802413CC 27A70020 */ addiu $a3, $sp, 0x20 -.L802413D0: -/* C81570 802413D0 1040000B */ beqz $v0, .L80241400 -/* C81574 802413D4 00000000 */ nop -/* C81578 802413D8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C8157C 802413DC 46140080 */ add.s $f2, $f0, $f20 -/* C81580 802413E0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C81584 802413E4 4600103E */ c.le.s $f2, $f0 -/* C81588 802413E8 00000000 */ nop -/* C8158C 802413EC 4500008D */ bc1f .L80241624 -/* C81590 802413F0 00000000 */ nop -/* C81594 802413F4 E602003C */ swc1 $f2, 0x3c($s0) -/* C81598 802413F8 08090589 */ j .L80241624 -/* C8159C 802413FC AE400070 */ sw $zero, 0x70($s2) -.L80241400: -/* C815A0 80241400 C602003C */ lwc1 $f2, 0x3c($s0) -/* C815A4 80241404 C6000064 */ lwc1 $f0, 0x64($s0) -/* C815A8 80241408 4602003E */ c.le.s $f0, $f2 -/* C815AC 8024140C 00000000 */ nop -/* C815B0 80241410 45030084 */ bc1tl .L80241624 -/* C815B4 80241414 AE400070 */ sw $zero, 0x70($s2) -/* C815B8 80241418 08090589 */ j .L80241624 -/* C815BC 8024141C 00000000 */ nop -.L80241420: -/* C815C0 80241420 4622003C */ c.lt.d $f0, $f2 -/* C815C4 80241424 00000000 */ nop -/* C815C8 80241428 4500007E */ bc1f .L80241624 -/* C815CC 8024142C 00000000 */ nop -/* C815D0 80241430 9602008E */ lhu $v0, 0x8e($s0) -/* C815D4 80241434 24420001 */ addiu $v0, $v0, 1 -/* C815D8 80241438 A602008E */ sh $v0, 0x8e($s0) -/* C815DC 8024143C 00021400 */ sll $v0, $v0, 0x10 -/* C815E0 80241440 8E630020 */ lw $v1, 0x20($s3) -/* C815E4 80241444 00021403 */ sra $v0, $v0, 0x10 -/* C815E8 80241448 0043102A */ slt $v0, $v0, $v1 -/* C815EC 8024144C 14400026 */ bnez $v0, .L802414E8 -/* C815F0 80241450 00000000 */ nop -/* C815F4 80241454 C60C0038 */ lwc1 $f12, 0x38($s0) -/* C815F8 80241458 C60E0040 */ lwc1 $f14, 0x40($s0) -/* C815FC 8024145C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81600 80241460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C81604 80241464 A600008E */ sh $zero, 0x8e($s0) -/* C81608 80241468 8C460028 */ lw $a2, 0x28($v0) -/* C8160C 8024146C 0C00A720 */ jal atan2 -/* C81610 80241470 8C470030 */ lw $a3, 0x30($v0) -/* C81614 80241474 46000506 */ mov.s $f20, $f0 -/* C81618 80241478 C60C000C */ lwc1 $f12, 0xc($s0) -/* C8161C 8024147C 0C00A70A */ jal get_clamped_angle_diff -/* C81620 80241480 4600A386 */ mov.s $f14, $f20 -/* C81624 80241484 46000086 */ mov.s $f2, $f0 -/* C81628 80241488 8E62001C */ lw $v0, 0x1c($s3) -/* C8162C 8024148C 46001005 */ abs.s $f0, $f2 -/* C81630 80241490 44822000 */ mtc1 $v0, $f4 -/* C81634 80241494 00000000 */ nop -/* C81638 80241498 46802120 */ cvt.s.w $f4, $f4 -/* C8163C 8024149C 4600203C */ c.lt.s $f4, $f0 -/* C81640 802414A0 00000000 */ nop -/* C81644 802414A4 4500000D */ bc1f .L802414DC -/* C81648 802414A8 00000000 */ nop -/* C8164C 802414AC 44800000 */ mtc1 $zero, $f0 -/* C81650 802414B0 C614000C */ lwc1 $f20, 0xc($s0) -/* C81654 802414B4 4600103C */ c.lt.s $f2, $f0 -/* C81658 802414B8 00000000 */ nop -/* C8165C 802414BC 45000006 */ bc1f .L802414D8 -/* C81660 802414C0 00021023 */ negu $v0, $v0 -/* C81664 802414C4 44820000 */ mtc1 $v0, $f0 -/* C81668 802414C8 00000000 */ nop -/* C8166C 802414CC 46800020 */ cvt.s.w $f0, $f0 -/* C81670 802414D0 08090537 */ j .L802414DC -/* C81674 802414D4 4600A500 */ add.s $f20, $f20, $f0 -.L802414D8: -/* C81678 802414D8 4604A500 */ add.s $f20, $f20, $f4 -.L802414DC: -/* C8167C 802414DC 0C00A6C9 */ jal clamp_angle -/* C81680 802414E0 4600A306 */ mov.s $f12, $f20 -/* C81684 802414E4 E600000C */ swc1 $f0, 0xc($s0) -.L802414E8: -/* C81688 802414E8 8E020000 */ lw $v0, ($s0) -/* C8168C 802414EC 30420008 */ andi $v0, $v0, 8 -/* C81690 802414F0 1040000A */ beqz $v0, .L8024151C -/* C81694 802414F4 27A50018 */ addiu $a1, $sp, 0x18 -/* C81698 802414F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* C8169C 802414FC C600001C */ lwc1 $f0, 0x1c($s0) -/* C816A0 80241500 46001080 */ add.s $f2, $f2, $f0 -/* C816A4 80241504 4616103C */ c.lt.s $f2, $f22 -/* C816A8 80241508 00000000 */ nop -/* C816AC 8024150C 45020045 */ bc1fl .L80241624 -/* C816B0 80241510 E602003C */ swc1 $f2, 0x3c($s0) -/* C816B4 80241514 08090588 */ j .L80241620 -/* C816B8 80241518 E616003C */ swc1 $f22, 0x3c($s0) -.L8024151C: -/* C816BC 8024151C C6000038 */ lwc1 $f0, 0x38($s0) -/* C816C0 80241520 27A6001C */ addiu $a2, $sp, 0x1c -/* C816C4 80241524 E7A00018 */ swc1 $f0, 0x18($sp) -/* C816C8 80241528 860200A8 */ lh $v0, 0xa8($s0) -/* C816CC 8024152C C600001C */ lwc1 $f0, 0x1c($s0) -/* C816D0 80241530 C604003C */ lwc1 $f4, 0x3c($s0) -/* C816D4 80241534 44821000 */ mtc1 $v0, $f2 -/* C816D8 80241538 00000000 */ nop -/* C816DC 8024153C 468010A0 */ cvt.s.w $f2, $f2 -/* C816E0 80241540 46000005 */ abs.s $f0, $f0 -/* C816E4 80241544 46020000 */ add.s $f0, $f0, $f2 -/* C816E8 80241548 C6060040 */ lwc1 $f6, 0x40($s0) -/* C816EC 8024154C 27A20024 */ addiu $v0, $sp, 0x24 -/* C816F0 80241550 46022100 */ add.s $f4, $f4, $f2 -/* C816F4 80241554 3C014024 */ lui $at, 0x4024 -/* C816F8 80241558 44811800 */ mtc1 $at, $f3 -/* C816FC 8024155C 44801000 */ mtc1 $zero, $f2 -/* C81700 80241560 46000021 */ cvt.d.s $f0, $f0 -/* C81704 80241564 46220000 */ add.d $f0, $f0, $f2 -/* C81708 80241568 E7A60020 */ swc1 $f6, 0x20($sp) -/* C8170C 8024156C E7A4001C */ swc1 $f4, 0x1c($sp) -/* C81710 80241570 46200020 */ cvt.s.d $f0, $f0 -/* C81714 80241574 E7A00024 */ swc1 $f0, 0x24($sp) -/* C81718 80241578 AFA20010 */ sw $v0, 0x10($sp) -/* C8171C 8024157C 8E040080 */ lw $a0, 0x80($s0) -/* C81720 80241580 0C0372DF */ jal func_800DCB7C -/* C81724 80241584 27A70020 */ addiu $a3, $sp, 0x20 -/* C81728 80241588 10400015 */ beqz $v0, .L802415E0 -/* C8172C 8024158C 00000000 */ nop -/* C81730 80241590 860200A8 */ lh $v0, 0xa8($s0) -/* C81734 80241594 C604001C */ lwc1 $f4, 0x1c($s0) -/* C81738 80241598 44820000 */ mtc1 $v0, $f0 -/* C8173C 8024159C 00000000 */ nop -/* C81740 802415A0 46800020 */ cvt.s.w $f0, $f0 -/* C81744 802415A4 46002085 */ abs.s $f2, $f4 -/* C81748 802415A8 46020000 */ add.s $f0, $f0, $f2 -/* C8174C 802415AC C7A20024 */ lwc1 $f2, 0x24($sp) -/* C81750 802415B0 4600103E */ c.le.s $f2, $f0 -/* C81754 802415B4 00000000 */ nop -/* C81758 802415B8 45000005 */ bc1f .L802415D0 -/* C8175C 802415BC 00000000 */ nop -/* C81760 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* C81764 802415C4 AE00001C */ sw $zero, 0x1c($s0) -/* C81768 802415C8 08090589 */ j .L80241624 -/* C8176C 802415CC E600003C */ swc1 $f0, 0x3c($s0) -.L802415D0: -/* C81770 802415D0 C600003C */ lwc1 $f0, 0x3c($s0) -/* C81774 802415D4 46040000 */ add.s $f0, $f0, $f4 -/* C81778 802415D8 08090589 */ j .L80241624 -/* C8177C 802415DC E600003C */ swc1 $f0, 0x3c($s0) -.L802415E0: -/* C81780 802415E0 C606003C */ lwc1 $f6, 0x3c($s0) -/* C81784 802415E4 860200A8 */ lh $v0, 0xa8($s0) -/* C81788 802415E8 46163081 */ sub.s $f2, $f6, $f22 -/* C8178C 802415EC 44820000 */ mtc1 $v0, $f0 -/* C81790 802415F0 00000000 */ nop -/* C81794 802415F4 46800020 */ cvt.s.w $f0, $f0 -/* C81798 802415F8 46001080 */ add.s $f2, $f2, $f0 -/* C8179C 802415FC C604001C */ lwc1 $f4, 0x1c($s0) -/* C817A0 80241600 46002005 */ abs.s $f0, $f4 -/* C817A4 80241604 4602003C */ c.lt.s $f0, $f2 -/* C817A8 80241608 00000000 */ nop -/* C817AC 8024160C 45020005 */ bc1fl .L80241624 -/* C817B0 80241610 AE00001C */ sw $zero, 0x1c($s0) -/* C817B4 80241614 46043000 */ add.s $f0, $f6, $f4 -/* C817B8 80241618 08090589 */ j .L80241624 -/* C817BC 8024161C E600003C */ swc1 $f0, 0x3c($s0) -.L80241620: -/* C817C0 80241620 AE00001C */ sw $zero, 0x1c($s0) -.L80241624: -/* C817C4 80241624 8FBF0038 */ lw $ra, 0x38($sp) -/* C817C8 80241628 8FB30034 */ lw $s3, 0x34($sp) -/* C817CC 8024162C 8FB20030 */ lw $s2, 0x30($sp) -/* C817D0 80241630 8FB1002C */ lw $s1, 0x2c($sp) -/* C817D4 80241634 8FB00028 */ lw $s0, 0x28($sp) -/* C817D8 80241638 D7B60048 */ ldc1 $f22, 0x48($sp) -/* C817DC 8024163C D7B40040 */ ldc1 $f20, 0x40($sp) -/* C817E0 80241640 03E00008 */ jr $ra -/* C817E4 80241644 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s new file mode 100644 index 0000000000..6ac701e4a0 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_802412B8_C81458.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412B8_C81458 +/* C81458 802412B8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C8145C 802412BC AFB20030 */ sw $s2, 0x30($sp) +/* C81460 802412C0 0080902D */ daddu $s2, $a0, $zero +/* C81464 802412C4 AFBF0038 */ sw $ra, 0x38($sp) +/* C81468 802412C8 AFB30034 */ sw $s3, 0x34($sp) +/* C8146C 802412CC AFB1002C */ sw $s1, 0x2c($sp) +/* C81470 802412D0 AFB00028 */ sw $s0, 0x28($sp) +/* C81474 802412D4 F7B60048 */ sdc1 $f22, 0x48($sp) +/* C81478 802412D8 F7B40040 */ sdc1 $f20, 0x40($sp) +/* C8147C 802412DC 8E510148 */ lw $s1, 0x148($s2) +/* C81480 802412E0 86240008 */ lh $a0, 8($s1) +/* C81484 802412E4 0C00EABB */ jal get_npc_unsafe +/* C81488 802412E8 00A0982D */ daddu $s3, $a1, $zero +/* C8148C 802412EC 0040802D */ daddu $s0, $v0, $zero +/* C81490 802412F0 0200202D */ daddu $a0, $s0, $zero +/* C81494 802412F4 C6220088 */ lwc1 $f2, 0x88($s1) +/* C81498 802412F8 468010A0 */ cvt.s.w $f2, $f2 +/* C8149C 802412FC 460010A1 */ cvt.d.s $f2, $f2 +/* C814A0 80241300 C604001C */ lwc1 $f4, 0x1c($s0) +/* C814A4 80241304 C6000014 */ lwc1 $f0, 0x14($s0) +/* C814A8 80241308 8E050018 */ lw $a1, 0x18($s0) +/* C814AC 8024130C 46002100 */ add.s $f4, $f4, $f0 +/* C814B0 80241310 8E06000C */ lw $a2, 0xc($s0) +/* C814B4 80241314 C6200078 */ lwc1 $f0, 0x78($s1) +/* C814B8 80241318 46800020 */ cvt.s.w $f0, $f0 +/* C814BC 8024131C E604001C */ swc1 $f4, 0x1c($s0) +/* C814C0 80241320 3C014059 */ lui $at, 0x4059 +/* C814C4 80241324 44812800 */ mtc1 $at, $f5 +/* C814C8 80241328 44802000 */ mtc1 $zero, $f4 +/* C814CC 8024132C 46000021 */ cvt.d.s $f0, $f0 +/* C814D0 80241330 46240003 */ div.d $f0, $f0, $f4 +/* C814D4 80241334 46200520 */ cvt.s.d $f20, $f0 +/* C814D8 80241338 46241083 */ div.d $f2, $f2, $f4 +/* C814DC 8024133C 0C00EA95 */ jal npc_move_heading +/* C814E0 80241340 462015A0 */ cvt.s.d $f22, $f2 +/* C814E4 80241344 C604001C */ lwc1 $f4, 0x1c($s0) +/* C814E8 80241348 44801000 */ mtc1 $zero, $f2 +/* C814EC 8024134C 44801800 */ mtc1 $zero, $f3 +/* C814F0 80241350 46002021 */ cvt.d.s $f0, $f4 +/* C814F4 80241354 4620103E */ c.le.d $f2, $f0 +/* C814F8 80241358 00000000 */ nop +/* C814FC 8024135C 45000030 */ bc1f .L80241420 +/* C81500 80241360 00000000 */ nop +/* C81504 80241364 C600003C */ lwc1 $f0, 0x3c($s0) +/* C81508 80241368 46040000 */ add.s $f0, $f0, $f4 +/* C8150C 8024136C E600003C */ swc1 $f0, 0x3c($s0) +/* C81510 80241370 8E2200CC */ lw $v0, 0xcc($s1) +/* C81514 80241374 8C420024 */ lw $v0, 0x24($v0) +/* C81518 80241378 AE020028 */ sw $v0, 0x28($s0) +/* C8151C 8024137C A2200007 */ sb $zero, 7($s1) +/* C81520 80241380 8E020000 */ lw $v0, ($s0) +/* C81524 80241384 30420008 */ andi $v0, $v0, 8 +/* C81528 80241388 14400011 */ bnez $v0, .L802413D0 +/* C8152C 8024138C 0000102D */ daddu $v0, $zero, $zero +/* C81530 80241390 27A50018 */ addiu $a1, $sp, 0x18 +/* C81534 80241394 27A6001C */ addiu $a2, $sp, 0x1c +/* C81538 80241398 C6000038 */ lwc1 $f0, 0x38($s0) +/* C8153C 8024139C C602003C */ lwc1 $f2, 0x3c($s0) +/* C81540 802413A0 C6040040 */ lwc1 $f4, 0x40($s0) +/* C81544 802413A4 3C01447A */ lui $at, 0x447a +/* C81548 802413A8 44813000 */ mtc1 $at, $f6 +/* C8154C 802413AC 27A20024 */ addiu $v0, $sp, 0x24 +/* C81550 802413B0 E7A00018 */ swc1 $f0, 0x18($sp) +/* C81554 802413B4 E7A2001C */ swc1 $f2, 0x1c($sp) +/* C81558 802413B8 E7A40020 */ swc1 $f4, 0x20($sp) +/* C8155C 802413BC E7A60024 */ swc1 $f6, 0x24($sp) +/* C81560 802413C0 AFA20010 */ sw $v0, 0x10($sp) +/* C81564 802413C4 8E040080 */ lw $a0, 0x80($s0) +/* C81568 802413C8 0C0372DF */ jal func_800DCB7C +/* C8156C 802413CC 27A70020 */ addiu $a3, $sp, 0x20 +.L802413D0: +/* C81570 802413D0 1040000B */ beqz $v0, .L80241400 +/* C81574 802413D4 00000000 */ nop +/* C81578 802413D8 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* C8157C 802413DC 46140080 */ add.s $f2, $f0, $f20 +/* C81580 802413E0 C600003C */ lwc1 $f0, 0x3c($s0) +/* C81584 802413E4 4600103E */ c.le.s $f2, $f0 +/* C81588 802413E8 00000000 */ nop +/* C8158C 802413EC 4500008D */ bc1f .L80241624 +/* C81590 802413F0 00000000 */ nop +/* C81594 802413F4 E602003C */ swc1 $f2, 0x3c($s0) +/* C81598 802413F8 08090589 */ j .L80241624 +/* C8159C 802413FC AE400070 */ sw $zero, 0x70($s2) +.L80241400: +/* C815A0 80241400 C602003C */ lwc1 $f2, 0x3c($s0) +/* C815A4 80241404 C6000064 */ lwc1 $f0, 0x64($s0) +/* C815A8 80241408 4602003E */ c.le.s $f0, $f2 +/* C815AC 8024140C 00000000 */ nop +/* C815B0 80241410 45030084 */ bc1tl .L80241624 +/* C815B4 80241414 AE400070 */ sw $zero, 0x70($s2) +/* C815B8 80241418 08090589 */ j .L80241624 +/* C815BC 8024141C 00000000 */ nop +.L80241420: +/* C815C0 80241420 4622003C */ c.lt.d $f0, $f2 +/* C815C4 80241424 00000000 */ nop +/* C815C8 80241428 4500007E */ bc1f .L80241624 +/* C815CC 8024142C 00000000 */ nop +/* C815D0 80241430 9602008E */ lhu $v0, 0x8e($s0) +/* C815D4 80241434 24420001 */ addiu $v0, $v0, 1 +/* C815D8 80241438 A602008E */ sh $v0, 0x8e($s0) +/* C815DC 8024143C 00021400 */ sll $v0, $v0, 0x10 +/* C815E0 80241440 8E630020 */ lw $v1, 0x20($s3) +/* C815E4 80241444 00021403 */ sra $v0, $v0, 0x10 +/* C815E8 80241448 0043102A */ slt $v0, $v0, $v1 +/* C815EC 8024144C 14400026 */ bnez $v0, .L802414E8 +/* C815F0 80241450 00000000 */ nop +/* C815F4 80241454 C60C0038 */ lwc1 $f12, 0x38($s0) +/* C815F8 80241458 C60E0040 */ lwc1 $f14, 0x40($s0) +/* C815FC 8024145C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C81600 80241460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C81604 80241464 A600008E */ sh $zero, 0x8e($s0) +/* C81608 80241468 8C460028 */ lw $a2, 0x28($v0) +/* C8160C 8024146C 0C00A720 */ jal atan2 +/* C81610 80241470 8C470030 */ lw $a3, 0x30($v0) +/* C81614 80241474 46000506 */ mov.s $f20, $f0 +/* C81618 80241478 C60C000C */ lwc1 $f12, 0xc($s0) +/* C8161C 8024147C 0C00A70A */ jal get_clamped_angle_diff +/* C81620 80241480 4600A386 */ mov.s $f14, $f20 +/* C81624 80241484 46000086 */ mov.s $f2, $f0 +/* C81628 80241488 8E62001C */ lw $v0, 0x1c($s3) +/* C8162C 8024148C 46001005 */ abs.s $f0, $f2 +/* C81630 80241490 44822000 */ mtc1 $v0, $f4 +/* C81634 80241494 00000000 */ nop +/* C81638 80241498 46802120 */ cvt.s.w $f4, $f4 +/* C8163C 8024149C 4600203C */ c.lt.s $f4, $f0 +/* C81640 802414A0 00000000 */ nop +/* C81644 802414A4 4500000D */ bc1f .L802414DC +/* C81648 802414A8 00000000 */ nop +/* C8164C 802414AC 44800000 */ mtc1 $zero, $f0 +/* C81650 802414B0 C614000C */ lwc1 $f20, 0xc($s0) +/* C81654 802414B4 4600103C */ c.lt.s $f2, $f0 +/* C81658 802414B8 00000000 */ nop +/* C8165C 802414BC 45000006 */ bc1f .L802414D8 +/* C81660 802414C0 00021023 */ negu $v0, $v0 +/* C81664 802414C4 44820000 */ mtc1 $v0, $f0 +/* C81668 802414C8 00000000 */ nop +/* C8166C 802414CC 46800020 */ cvt.s.w $f0, $f0 +/* C81670 802414D0 08090537 */ j .L802414DC +/* C81674 802414D4 4600A500 */ add.s $f20, $f20, $f0 +.L802414D8: +/* C81678 802414D8 4604A500 */ add.s $f20, $f20, $f4 +.L802414DC: +/* C8167C 802414DC 0C00A6C9 */ jal clamp_angle +/* C81680 802414E0 4600A306 */ mov.s $f12, $f20 +/* C81684 802414E4 E600000C */ swc1 $f0, 0xc($s0) +.L802414E8: +/* C81688 802414E8 8E020000 */ lw $v0, ($s0) +/* C8168C 802414EC 30420008 */ andi $v0, $v0, 8 +/* C81690 802414F0 1040000A */ beqz $v0, .L8024151C +/* C81694 802414F4 27A50018 */ addiu $a1, $sp, 0x18 +/* C81698 802414F8 C602003C */ lwc1 $f2, 0x3c($s0) +/* C8169C 802414FC C600001C */ lwc1 $f0, 0x1c($s0) +/* C816A0 80241500 46001080 */ add.s $f2, $f2, $f0 +/* C816A4 80241504 4616103C */ c.lt.s $f2, $f22 +/* C816A8 80241508 00000000 */ nop +/* C816AC 8024150C 45020045 */ bc1fl .L80241624 +/* C816B0 80241510 E602003C */ swc1 $f2, 0x3c($s0) +/* C816B4 80241514 08090588 */ j .L80241620 +/* C816B8 80241518 E616003C */ swc1 $f22, 0x3c($s0) +.L8024151C: +/* C816BC 8024151C C6000038 */ lwc1 $f0, 0x38($s0) +/* C816C0 80241520 27A6001C */ addiu $a2, $sp, 0x1c +/* C816C4 80241524 E7A00018 */ swc1 $f0, 0x18($sp) +/* C816C8 80241528 860200A8 */ lh $v0, 0xa8($s0) +/* C816CC 8024152C C600001C */ lwc1 $f0, 0x1c($s0) +/* C816D0 80241530 C604003C */ lwc1 $f4, 0x3c($s0) +/* C816D4 80241534 44821000 */ mtc1 $v0, $f2 +/* C816D8 80241538 00000000 */ nop +/* C816DC 8024153C 468010A0 */ cvt.s.w $f2, $f2 +/* C816E0 80241540 46000005 */ abs.s $f0, $f0 +/* C816E4 80241544 46020000 */ add.s $f0, $f0, $f2 +/* C816E8 80241548 C6060040 */ lwc1 $f6, 0x40($s0) +/* C816EC 8024154C 27A20024 */ addiu $v0, $sp, 0x24 +/* C816F0 80241550 46022100 */ add.s $f4, $f4, $f2 +/* C816F4 80241554 3C014024 */ lui $at, 0x4024 +/* C816F8 80241558 44811800 */ mtc1 $at, $f3 +/* C816FC 8024155C 44801000 */ mtc1 $zero, $f2 +/* C81700 80241560 46000021 */ cvt.d.s $f0, $f0 +/* C81704 80241564 46220000 */ add.d $f0, $f0, $f2 +/* C81708 80241568 E7A60020 */ swc1 $f6, 0x20($sp) +/* C8170C 8024156C E7A4001C */ swc1 $f4, 0x1c($sp) +/* C81710 80241570 46200020 */ cvt.s.d $f0, $f0 +/* C81714 80241574 E7A00024 */ swc1 $f0, 0x24($sp) +/* C81718 80241578 AFA20010 */ sw $v0, 0x10($sp) +/* C8171C 8024157C 8E040080 */ lw $a0, 0x80($s0) +/* C81720 80241580 0C0372DF */ jal func_800DCB7C +/* C81724 80241584 27A70020 */ addiu $a3, $sp, 0x20 +/* C81728 80241588 10400015 */ beqz $v0, .L802415E0 +/* C8172C 8024158C 00000000 */ nop +/* C81730 80241590 860200A8 */ lh $v0, 0xa8($s0) +/* C81734 80241594 C604001C */ lwc1 $f4, 0x1c($s0) +/* C81738 80241598 44820000 */ mtc1 $v0, $f0 +/* C8173C 8024159C 00000000 */ nop +/* C81740 802415A0 46800020 */ cvt.s.w $f0, $f0 +/* C81744 802415A4 46002085 */ abs.s $f2, $f4 +/* C81748 802415A8 46020000 */ add.s $f0, $f0, $f2 +/* C8174C 802415AC C7A20024 */ lwc1 $f2, 0x24($sp) +/* C81750 802415B0 4600103E */ c.le.s $f2, $f0 +/* C81754 802415B4 00000000 */ nop +/* C81758 802415B8 45000005 */ bc1f .L802415D0 +/* C8175C 802415BC 00000000 */ nop +/* C81760 802415C0 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* C81764 802415C4 AE00001C */ sw $zero, 0x1c($s0) +/* C81768 802415C8 08090589 */ j .L80241624 +/* C8176C 802415CC E600003C */ swc1 $f0, 0x3c($s0) +.L802415D0: +/* C81770 802415D0 C600003C */ lwc1 $f0, 0x3c($s0) +/* C81774 802415D4 46040000 */ add.s $f0, $f0, $f4 +/* C81778 802415D8 08090589 */ j .L80241624 +/* C8177C 802415DC E600003C */ swc1 $f0, 0x3c($s0) +.L802415E0: +/* C81780 802415E0 C606003C */ lwc1 $f6, 0x3c($s0) +/* C81784 802415E4 860200A8 */ lh $v0, 0xa8($s0) +/* C81788 802415E8 46163081 */ sub.s $f2, $f6, $f22 +/* C8178C 802415EC 44820000 */ mtc1 $v0, $f0 +/* C81790 802415F0 00000000 */ nop +/* C81794 802415F4 46800020 */ cvt.s.w $f0, $f0 +/* C81798 802415F8 46001080 */ add.s $f2, $f2, $f0 +/* C8179C 802415FC C604001C */ lwc1 $f4, 0x1c($s0) +/* C817A0 80241600 46002005 */ abs.s $f0, $f4 +/* C817A4 80241604 4602003C */ c.lt.s $f0, $f2 +/* C817A8 80241608 00000000 */ nop +/* C817AC 8024160C 45020005 */ bc1fl .L80241624 +/* C817B0 80241610 AE00001C */ sw $zero, 0x1c($s0) +/* C817B4 80241614 46043000 */ add.s $f0, $f6, $f4 +/* C817B8 80241618 08090589 */ j .L80241624 +/* C817BC 8024161C E600003C */ swc1 $f0, 0x3c($s0) +.L80241620: +/* C817C0 80241620 AE00001C */ sw $zero, 0x1c($s0) +.L80241624: +/* C817C4 80241624 8FBF0038 */ lw $ra, 0x38($sp) +/* C817C8 80241628 8FB30034 */ lw $s3, 0x34($sp) +/* C817CC 8024162C 8FB20030 */ lw $s2, 0x30($sp) +/* C817D0 80241630 8FB1002C */ lw $s1, 0x2c($sp) +/* C817D4 80241634 8FB00028 */ lw $s0, 0x28($sp) +/* C817D8 80241638 D7B60048 */ ldc1 $f22, 0x48($sp) +/* C817DC 8024163C D7B40040 */ ldc1 $f20, 0x40($sp) +/* C817E0 80241640 03E00008 */ jr $ra +/* C817E4 80241644 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C.s deleted file mode 100644 index fcbe870ef1..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024176C -/* C8190C 8024176C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C81910 80241770 AFB40040 */ sw $s4, 0x40($sp) -/* C81914 80241774 0080A02D */ daddu $s4, $a0, $zero -/* C81918 80241778 AFBF0048 */ sw $ra, 0x48($sp) -/* C8191C 8024177C AFB50044 */ sw $s5, 0x44($sp) -/* C81920 80241780 AFB3003C */ sw $s3, 0x3c($sp) -/* C81924 80241784 AFB20038 */ sw $s2, 0x38($sp) -/* C81928 80241788 AFB10034 */ sw $s1, 0x34($sp) -/* C8192C 8024178C AFB00030 */ sw $s0, 0x30($sp) -/* C81930 80241790 8E920148 */ lw $s2, 0x148($s4) -/* C81934 80241794 86440008 */ lh $a0, 8($s2) -/* C81938 80241798 8E90000C */ lw $s0, 0xc($s4) -/* C8193C 8024179C 0C00EABB */ jal get_npc_unsafe -/* C81940 802417A0 00A0882D */ daddu $s1, $a1, $zero -/* C81944 802417A4 0280202D */ daddu $a0, $s4, $zero -/* C81948 802417A8 8E050000 */ lw $a1, ($s0) -/* C8194C 802417AC 0C0B1EAF */ jal get_variable -/* C81950 802417B0 0040A82D */ daddu $s5, $v0, $zero -/* C81954 802417B4 AFA00010 */ sw $zero, 0x10($sp) -/* C81958 802417B8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C8195C 802417BC 8C630030 */ lw $v1, 0x30($v1) -/* C81960 802417C0 AFA30014 */ sw $v1, 0x14($sp) -/* C81964 802417C4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81968 802417C8 8C63001C */ lw $v1, 0x1c($v1) -/* C8196C 802417CC AFA30018 */ sw $v1, 0x18($sp) -/* C81970 802417D0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81974 802417D4 8C630024 */ lw $v1, 0x24($v1) -/* C81978 802417D8 AFA3001C */ sw $v1, 0x1c($sp) -/* C8197C 802417DC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81980 802417E0 8C630028 */ lw $v1, 0x28($v1) -/* C81984 802417E4 27B30010 */ addiu $s3, $sp, 0x10 -/* C81988 802417E8 AFA30020 */ sw $v1, 0x20($sp) -/* C8198C 802417EC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81990 802417F0 3C0142F0 */ lui $at, 0x42f0 -/* C81994 802417F4 44810000 */ mtc1 $at, $f0 -/* C81998 802417F8 8C63002C */ lw $v1, 0x2c($v1) -/* C8199C 802417FC 0040802D */ daddu $s0, $v0, $zero -/* C819A0 80241800 E7A00028 */ swc1 $f0, 0x28($sp) -/* C819A4 80241804 A7A0002C */ sh $zero, 0x2c($sp) -/* C819A8 80241808 12200006 */ beqz $s1, .L80241824 -/* C819AC 8024180C AFA30024 */ sw $v1, 0x24($sp) -/* C819B0 80241810 02A0202D */ daddu $a0, $s5, $zero -/* C819B4 80241814 0240282D */ daddu $a1, $s2, $zero -/* C819B8 80241818 0280302D */ daddu $a2, $s4, $zero -/* C819BC 8024181C 0C090592 */ jal func_80241648 -/* C819C0 80241820 0200382D */ daddu $a3, $s0, $zero -.L80241824: -/* C819C4 80241824 2402FFFE */ addiu $v0, $zero, -2 -/* C819C8 80241828 A2A200AB */ sb $v0, 0xab($s5) -/* C819CC 8024182C 8E4300B0 */ lw $v1, 0xb0($s2) -/* C819D0 80241830 30620004 */ andi $v0, $v1, 4 -/* C819D4 80241834 10400007 */ beqz $v0, .L80241854 -/* C819D8 80241838 00000000 */ nop -/* C819DC 8024183C 824200B4 */ lb $v0, 0xb4($s2) -/* C819E0 80241840 1440003C */ bnez $v0, .L80241934 -/* C819E4 80241844 0000102D */ daddu $v0, $zero, $zero -/* C819E8 80241848 2402FFFB */ addiu $v0, $zero, -5 -/* C819EC 8024184C 00621024 */ and $v0, $v1, $v0 -/* C819F0 80241850 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241854: -/* C819F4 80241854 8E830070 */ lw $v1, 0x70($s4) -/* C819F8 80241858 2C62000F */ sltiu $v0, $v1, 0xf -/* C819FC 8024185C 10400034 */ beqz $v0, .L80241930 -/* C81A00 80241860 00031080 */ sll $v0, $v1, 2 -/* C81A04 80241864 3C018024 */ lui $at, 0x8024 -/* C81A08 80241868 00220821 */ addu $at, $at, $v0 -/* C81A0C 8024186C 8C225868 */ lw $v0, 0x5868($at) -/* C81A10 80241870 00400008 */ jr $v0 -/* C81A14 80241874 00000000 */ nop -/* C81A18 80241878 0280202D */ daddu $a0, $s4, $zero -/* C81A1C 8024187C 0200282D */ daddu $a1, $s0, $zero -/* C81A20 80241880 0C090118 */ jal func_80240460 -/* C81A24 80241884 0260302D */ daddu $a2, $s3, $zero -/* C81A28 80241888 0280202D */ daddu $a0, $s4, $zero -/* C81A2C 8024188C 0200282D */ daddu $a1, $s0, $zero -/* C81A30 80241890 0C090184 */ jal func_80240610 -/* C81A34 80241894 0260302D */ daddu $a2, $s3, $zero -/* C81A38 80241898 0809064D */ j .L80241934 -/* C81A3C 8024189C 0000102D */ daddu $v0, $zero, $zero -/* C81A40 802418A0 0280202D */ daddu $a0, $s4, $zero -/* C81A44 802418A4 0200282D */ daddu $a1, $s0, $zero -/* C81A48 802418A8 0C09030E */ jal func_80240C38 -/* C81A4C 802418AC 0260302D */ daddu $a2, $s3, $zero -/* C81A50 802418B0 0280202D */ daddu $a0, $s4, $zero -/* C81A54 802418B4 0200282D */ daddu $a1, $s0, $zero -/* C81A58 802418B8 0C09033E */ jal func_80240CF8 -/* C81A5C 802418BC 0260302D */ daddu $a2, $s3, $zero -/* C81A60 802418C0 0809064D */ j .L80241934 -/* C81A64 802418C4 0000102D */ daddu $v0, $zero, $zero -/* C81A68 802418C8 0280202D */ daddu $a0, $s4, $zero -/* C81A6C 802418CC 0200282D */ daddu $a1, $s0, $zero -/* C81A70 802418D0 0C09040F */ jal func_8024103C -/* C81A74 802418D4 0260302D */ daddu $a2, $s3, $zero -/* C81A78 802418D8 0280202D */ daddu $a0, $s4, $zero -/* C81A7C 802418DC 0200282D */ daddu $a1, $s0, $zero -/* C81A80 802418E0 0C09042D */ jal func_802410B4 -/* C81A84 802418E4 0260302D */ daddu $a2, $s3, $zero -/* C81A88 802418E8 0809064D */ j .L80241934 -/* C81A8C 802418EC 0000102D */ daddu $v0, $zero, $zero -/* C81A90 802418F0 0280202D */ daddu $a0, $s4, $zero -/* C81A94 802418F4 0200282D */ daddu $a1, $s0, $zero -/* C81A98 802418F8 0C090448 */ jal func_80241120 -/* C81A9C 802418FC 0260302D */ daddu $a2, $s3, $zero -/* C81AA0 80241900 0809064D */ j .L80241934 -/* C81AA4 80241904 0000102D */ daddu $v0, $zero, $zero -/* C81AA8 80241908 0280202D */ daddu $a0, $s4, $zero -/* C81AAC 8024190C 0200282D */ daddu $a1, $s0, $zero -/* C81AB0 80241910 0C090495 */ jal func_80241254 -/* C81AB4 80241914 0260302D */ daddu $a2, $s3, $zero -/* C81AB8 80241918 0809064D */ j .L80241934 -/* C81ABC 8024191C 0000102D */ daddu $v0, $zero, $zero -/* C81AC0 80241920 0280202D */ daddu $a0, $s4, $zero -/* C81AC4 80241924 0200282D */ daddu $a1, $s0, $zero -/* C81AC8 80241928 0C0904AE */ jal func_802412B8 -/* C81ACC 8024192C 0260302D */ daddu $a2, $s3, $zero -.L80241930: -/* C81AD0 80241930 0000102D */ daddu $v0, $zero, $zero -.L80241934: -/* C81AD4 80241934 8FBF0048 */ lw $ra, 0x48($sp) -/* C81AD8 80241938 8FB50044 */ lw $s5, 0x44($sp) -/* C81ADC 8024193C 8FB40040 */ lw $s4, 0x40($sp) -/* C81AE0 80241940 8FB3003C */ lw $s3, 0x3c($sp) -/* C81AE4 80241944 8FB20038 */ lw $s2, 0x38($sp) -/* C81AE8 80241948 8FB10034 */ lw $s1, 0x34($sp) -/* C81AEC 8024194C 8FB00030 */ lw $s0, 0x30($sp) -/* C81AF0 80241950 03E00008 */ jr $ra -/* C81AF4 80241954 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s new file mode 100644 index 0000000000..07362dc1c8 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_8024176C_C8190C.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024176C_C8190C +/* C8190C 8024176C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C81910 80241770 AFB40040 */ sw $s4, 0x40($sp) +/* C81914 80241774 0080A02D */ daddu $s4, $a0, $zero +/* C81918 80241778 AFBF0048 */ sw $ra, 0x48($sp) +/* C8191C 8024177C AFB50044 */ sw $s5, 0x44($sp) +/* C81920 80241780 AFB3003C */ sw $s3, 0x3c($sp) +/* C81924 80241784 AFB20038 */ sw $s2, 0x38($sp) +/* C81928 80241788 AFB10034 */ sw $s1, 0x34($sp) +/* C8192C 8024178C AFB00030 */ sw $s0, 0x30($sp) +/* C81930 80241790 8E920148 */ lw $s2, 0x148($s4) +/* C81934 80241794 86440008 */ lh $a0, 8($s2) +/* C81938 80241798 8E90000C */ lw $s0, 0xc($s4) +/* C8193C 8024179C 0C00EABB */ jal get_npc_unsafe +/* C81940 802417A0 00A0882D */ daddu $s1, $a1, $zero +/* C81944 802417A4 0280202D */ daddu $a0, $s4, $zero +/* C81948 802417A8 8E050000 */ lw $a1, ($s0) +/* C8194C 802417AC 0C0B1EAF */ jal get_variable +/* C81950 802417B0 0040A82D */ daddu $s5, $v0, $zero +/* C81954 802417B4 AFA00010 */ sw $zero, 0x10($sp) +/* C81958 802417B8 8E4300D0 */ lw $v1, 0xd0($s2) +/* C8195C 802417BC 8C630030 */ lw $v1, 0x30($v1) +/* C81960 802417C0 AFA30014 */ sw $v1, 0x14($sp) +/* C81964 802417C4 8E4300D0 */ lw $v1, 0xd0($s2) +/* C81968 802417C8 8C63001C */ lw $v1, 0x1c($v1) +/* C8196C 802417CC AFA30018 */ sw $v1, 0x18($sp) +/* C81970 802417D0 8E4300D0 */ lw $v1, 0xd0($s2) +/* C81974 802417D4 8C630024 */ lw $v1, 0x24($v1) +/* C81978 802417D8 AFA3001C */ sw $v1, 0x1c($sp) +/* C8197C 802417DC 8E4300D0 */ lw $v1, 0xd0($s2) +/* C81980 802417E0 8C630028 */ lw $v1, 0x28($v1) +/* C81984 802417E4 27B30010 */ addiu $s3, $sp, 0x10 +/* C81988 802417E8 AFA30020 */ sw $v1, 0x20($sp) +/* C8198C 802417EC 8E4300D0 */ lw $v1, 0xd0($s2) +/* C81990 802417F0 3C0142F0 */ lui $at, 0x42f0 +/* C81994 802417F4 44810000 */ mtc1 $at, $f0 +/* C81998 802417F8 8C63002C */ lw $v1, 0x2c($v1) +/* C8199C 802417FC 0040802D */ daddu $s0, $v0, $zero +/* C819A0 80241800 E7A00028 */ swc1 $f0, 0x28($sp) +/* C819A4 80241804 A7A0002C */ sh $zero, 0x2c($sp) +/* C819A8 80241808 12200006 */ beqz $s1, .L80241824 +/* C819AC 8024180C AFA30024 */ sw $v1, 0x24($sp) +/* C819B0 80241810 02A0202D */ daddu $a0, $s5, $zero +/* C819B4 80241814 0240282D */ daddu $a1, $s2, $zero +/* C819B8 80241818 0280302D */ daddu $a2, $s4, $zero +/* C819BC 8024181C 0C090592 */ jal func_80241648_C817E8 +/* C819C0 80241820 0200382D */ daddu $a3, $s0, $zero +.L80241824: +/* C819C4 80241824 2402FFFE */ addiu $v0, $zero, -2 +/* C819C8 80241828 A2A200AB */ sb $v0, 0xab($s5) +/* C819CC 8024182C 8E4300B0 */ lw $v1, 0xb0($s2) +/* C819D0 80241830 30620004 */ andi $v0, $v1, 4 +/* C819D4 80241834 10400007 */ beqz $v0, .L80241854 +/* C819D8 80241838 00000000 */ nop +/* C819DC 8024183C 824200B4 */ lb $v0, 0xb4($s2) +/* C819E0 80241840 1440003C */ bnez $v0, .L80241934 +/* C819E4 80241844 0000102D */ daddu $v0, $zero, $zero +/* C819E8 80241848 2402FFFB */ addiu $v0, $zero, -5 +/* C819EC 8024184C 00621024 */ and $v0, $v1, $v0 +/* C819F0 80241850 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241854: +/* C819F4 80241854 8E830070 */ lw $v1, 0x70($s4) +/* C819F8 80241858 2C62000F */ sltiu $v0, $v1, 0xf +/* C819FC 8024185C 10400034 */ beqz $v0, .L80241930 +/* C81A00 80241860 00031080 */ sll $v0, $v1, 2 +/* C81A04 80241864 3C018024 */ lui $at, 0x8024 +/* C81A08 80241868 00220821 */ addu $at, $at, $v0 +/* C81A0C 8024186C 8C225868 */ lw $v0, 0x5868($at) +/* C81A10 80241870 00400008 */ jr $v0 +/* C81A14 80241874 00000000 */ nop +/* C81A18 80241878 0280202D */ daddu $a0, $s4, $zero +/* C81A1C 8024187C 0200282D */ daddu $a1, $s0, $zero +/* C81A20 80241880 0C090118 */ jal func_80240460_C80600 +/* C81A24 80241884 0260302D */ daddu $a2, $s3, $zero +/* C81A28 80241888 0280202D */ daddu $a0, $s4, $zero +/* C81A2C 8024188C 0200282D */ daddu $a1, $s0, $zero +/* C81A30 80241890 0C090184 */ jal func_80240610_C807B0 +/* C81A34 80241894 0260302D */ daddu $a2, $s3, $zero +/* C81A38 80241898 0809064D */ j .L80241934 +/* C81A3C 8024189C 0000102D */ daddu $v0, $zero, $zero +/* C81A40 802418A0 0280202D */ daddu $a0, $s4, $zero +/* C81A44 802418A4 0200282D */ daddu $a1, $s0, $zero +/* C81A48 802418A8 0C09030E */ jal func_80240C38_C80DD8 +/* C81A4C 802418AC 0260302D */ daddu $a2, $s3, $zero +/* C81A50 802418B0 0280202D */ daddu $a0, $s4, $zero +/* C81A54 802418B4 0200282D */ daddu $a1, $s0, $zero +/* C81A58 802418B8 0C09033E */ jal func_80240CF8_C80E98 +/* C81A5C 802418BC 0260302D */ daddu $a2, $s3, $zero +/* C81A60 802418C0 0809064D */ j .L80241934 +/* C81A64 802418C4 0000102D */ daddu $v0, $zero, $zero +/* C81A68 802418C8 0280202D */ daddu $a0, $s4, $zero +/* C81A6C 802418CC 0200282D */ daddu $a1, $s0, $zero +/* C81A70 802418D0 0C09040F */ jal func_8024103C_C811DC +/* C81A74 802418D4 0260302D */ daddu $a2, $s3, $zero +/* C81A78 802418D8 0280202D */ daddu $a0, $s4, $zero +/* C81A7C 802418DC 0200282D */ daddu $a1, $s0, $zero +/* C81A80 802418E0 0C09042D */ jal func_802410B4_C81254 +/* C81A84 802418E4 0260302D */ daddu $a2, $s3, $zero +/* C81A88 802418E8 0809064D */ j .L80241934 +/* C81A8C 802418EC 0000102D */ daddu $v0, $zero, $zero +/* C81A90 802418F0 0280202D */ daddu $a0, $s4, $zero +/* C81A94 802418F4 0200282D */ daddu $a1, $s0, $zero +/* C81A98 802418F8 0C090448 */ jal func_80241120_C812C0 +/* C81A9C 802418FC 0260302D */ daddu $a2, $s3, $zero +/* C81AA0 80241900 0809064D */ j .L80241934 +/* C81AA4 80241904 0000102D */ daddu $v0, $zero, $zero +/* C81AA8 80241908 0280202D */ daddu $a0, $s4, $zero +/* C81AAC 8024190C 0200282D */ daddu $a1, $s0, $zero +/* C81AB0 80241910 0C090495 */ jal func_80241254_C813F4 +/* C81AB4 80241914 0260302D */ daddu $a2, $s3, $zero +/* C81AB8 80241918 0809064D */ j .L80241934 +/* C81ABC 8024191C 0000102D */ daddu $v0, $zero, $zero +/* C81AC0 80241920 0280202D */ daddu $a0, $s4, $zero +/* C81AC4 80241924 0200282D */ daddu $a1, $s0, $zero +/* C81AC8 80241928 0C0904AE */ jal func_802412B8_C81458 +/* C81ACC 8024192C 0260302D */ daddu $a2, $s3, $zero +.L80241930: +/* C81AD0 80241930 0000102D */ daddu $v0, $zero, $zero +.L80241934: +/* C81AD4 80241934 8FBF0048 */ lw $ra, 0x48($sp) +/* C81AD8 80241938 8FB50044 */ lw $s5, 0x44($sp) +/* C81ADC 8024193C 8FB40040 */ lw $s4, 0x40($sp) +/* C81AE0 80241940 8FB3003C */ lw $s3, 0x3c($sp) +/* C81AE4 80241944 8FB20038 */ lw $s2, 0x38($sp) +/* C81AE8 80241948 8FB10034 */ lw $s1, 0x34($sp) +/* C81AEC 8024194C 8FB00030 */ lw $s0, 0x30($sp) +/* C81AF0 80241950 03E00008 */ jr $ra +/* C81AF4 80241954 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958.s deleted file mode 100644 index ed314a781f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241958 -/* C81AF8 80241958 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C81AFC 8024195C AFB3001C */ sw $s3, 0x1c($sp) -/* C81B00 80241960 0080982D */ daddu $s3, $a0, $zero -/* C81B04 80241964 AFBF0020 */ sw $ra, 0x20($sp) -/* C81B08 80241968 AFB20018 */ sw $s2, 0x18($sp) -/* C81B0C 8024196C AFB10014 */ sw $s1, 0x14($sp) -/* C81B10 80241970 AFB00010 */ sw $s0, 0x10($sp) -/* C81B14 80241974 F7B40028 */ sdc1 $f20, 0x28($sp) -/* C81B18 80241978 8E710148 */ lw $s1, 0x148($s3) -/* C81B1C 8024197C 86240008 */ lh $a0, 8($s1) -/* C81B20 80241980 0C00EABB */ jal get_npc_unsafe -/* C81B24 80241984 00A0802D */ daddu $s0, $a1, $zero -/* C81B28 80241988 8E040020 */ lw $a0, 0x20($s0) -/* C81B2C 8024198C 0040902D */ daddu $s2, $v0, $zero -/* C81B30 80241990 00041FC2 */ srl $v1, $a0, 0x1f -/* C81B34 80241994 00832021 */ addu $a0, $a0, $v1 -/* C81B38 80241998 00042043 */ sra $a0, $a0, 1 -/* C81B3C 8024199C 0C00A67F */ jal rand_int -/* C81B40 802419A0 24840001 */ addiu $a0, $a0, 1 -/* C81B44 802419A4 8E030020 */ lw $v1, 0x20($s0) -/* C81B48 802419A8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* C81B4C 802419AC 000327C2 */ srl $a0, $v1, 0x1f -/* C81B50 802419B0 00641821 */ addu $v1, $v1, $a0 -/* C81B54 802419B4 00031843 */ sra $v1, $v1, 1 -/* C81B58 802419B8 00621821 */ addu $v1, $v1, $v0 -/* C81B5C 802419BC A643008E */ sh $v1, 0x8e($s2) -/* C81B60 802419C0 8E2200CC */ lw $v0, 0xcc($s1) -/* C81B64 802419C4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* C81B68 802419C8 8C42000C */ lw $v0, 0xc($v0) -/* C81B6C 802419CC AE420028 */ sw $v0, 0x28($s2) -/* C81B70 802419D0 C6000018 */ lwc1 $f0, 0x18($s0) -/* C81B74 802419D4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81B78 802419D8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C81B7C 802419DC E6400018 */ swc1 $f0, 0x18($s2) -/* C81B80 802419E0 8C460028 */ lw $a2, 0x28($v0) -/* C81B84 802419E4 0C00A720 */ jal atan2 -/* C81B88 802419E8 8C470030 */ lw $a3, 0x30($v0) -/* C81B8C 802419EC 46000506 */ mov.s $f20, $f0 -/* C81B90 802419F0 C64C000C */ lwc1 $f12, 0xc($s2) -/* C81B94 802419F4 0C00A70A */ jal get_clamped_angle_diff -/* C81B98 802419F8 4600A386 */ mov.s $f14, $f20 -/* C81B9C 802419FC 46000086 */ mov.s $f2, $f0 -/* C81BA0 80241A00 8E02001C */ lw $v0, 0x1c($s0) -/* C81BA4 80241A04 46001005 */ abs.s $f0, $f2 -/* C81BA8 80241A08 44822000 */ mtc1 $v0, $f4 -/* C81BAC 80241A0C 00000000 */ nop -/* C81BB0 80241A10 46802120 */ cvt.s.w $f4, $f4 -/* C81BB4 80241A14 4600203C */ c.lt.s $f4, $f0 -/* C81BB8 80241A18 00000000 */ nop -/* C81BBC 80241A1C 4500000D */ bc1f .L80241A54 -/* C81BC0 80241A20 00000000 */ nop -/* C81BC4 80241A24 44800000 */ mtc1 $zero, $f0 -/* C81BC8 80241A28 C654000C */ lwc1 $f20, 0xc($s2) -/* C81BCC 80241A2C 4600103C */ c.lt.s $f2, $f0 -/* C81BD0 80241A30 00000000 */ nop -/* C81BD4 80241A34 45000006 */ bc1f .L80241A50 -/* C81BD8 80241A38 00021023 */ negu $v0, $v0 -/* C81BDC 80241A3C 44820000 */ mtc1 $v0, $f0 -/* C81BE0 80241A40 00000000 */ nop -/* C81BE4 80241A44 46800020 */ cvt.s.w $f0, $f0 -/* C81BE8 80241A48 08090695 */ j .L80241A54 -/* C81BEC 80241A4C 4600A500 */ add.s $f20, $f20, $f0 -.L80241A50: -/* C81BF0 80241A50 4604A500 */ add.s $f20, $f20, $f4 -.L80241A54: -/* C81BF4 80241A54 0C00A6C9 */ jal clamp_angle -/* C81BF8 80241A58 4600A306 */ mov.s $f12, $f20 -/* C81BFC 80241A5C 2402000D */ addiu $v0, $zero, 0xd -/* C81C00 80241A60 E640000C */ swc1 $f0, 0xc($s2) -/* C81C04 80241A64 AE620070 */ sw $v0, 0x70($s3) -/* C81C08 80241A68 8FBF0020 */ lw $ra, 0x20($sp) -/* C81C0C 80241A6C 8FB3001C */ lw $s3, 0x1c($sp) -/* C81C10 80241A70 8FB20018 */ lw $s2, 0x18($sp) -/* C81C14 80241A74 8FB10014 */ lw $s1, 0x14($sp) -/* C81C18 80241A78 8FB00010 */ lw $s0, 0x10($sp) -/* C81C1C 80241A7C D7B40028 */ ldc1 $f20, 0x28($sp) -/* C81C20 80241A80 03E00008 */ jr $ra -/* C81C24 80241A84 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958_C81AF8.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958_C81AF8.s new file mode 100644 index 0000000000..56382a959d --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241958_C81AF8.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241958_C81AF8 +/* C81AF8 80241958 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C81AFC 8024195C AFB3001C */ sw $s3, 0x1c($sp) +/* C81B00 80241960 0080982D */ daddu $s3, $a0, $zero +/* C81B04 80241964 AFBF0020 */ sw $ra, 0x20($sp) +/* C81B08 80241968 AFB20018 */ sw $s2, 0x18($sp) +/* C81B0C 8024196C AFB10014 */ sw $s1, 0x14($sp) +/* C81B10 80241970 AFB00010 */ sw $s0, 0x10($sp) +/* C81B14 80241974 F7B40028 */ sdc1 $f20, 0x28($sp) +/* C81B18 80241978 8E710148 */ lw $s1, 0x148($s3) +/* C81B1C 8024197C 86240008 */ lh $a0, 8($s1) +/* C81B20 80241980 0C00EABB */ jal get_npc_unsafe +/* C81B24 80241984 00A0802D */ daddu $s0, $a1, $zero +/* C81B28 80241988 8E040020 */ lw $a0, 0x20($s0) +/* C81B2C 8024198C 0040902D */ daddu $s2, $v0, $zero +/* C81B30 80241990 00041FC2 */ srl $v1, $a0, 0x1f +/* C81B34 80241994 00832021 */ addu $a0, $a0, $v1 +/* C81B38 80241998 00042043 */ sra $a0, $a0, 1 +/* C81B3C 8024199C 0C00A67F */ jal rand_int +/* C81B40 802419A0 24840001 */ addiu $a0, $a0, 1 +/* C81B44 802419A4 8E030020 */ lw $v1, 0x20($s0) +/* C81B48 802419A8 C64C0038 */ lwc1 $f12, 0x38($s2) +/* C81B4C 802419AC 000327C2 */ srl $a0, $v1, 0x1f +/* C81B50 802419B0 00641821 */ addu $v1, $v1, $a0 +/* C81B54 802419B4 00031843 */ sra $v1, $v1, 1 +/* C81B58 802419B8 00621821 */ addu $v1, $v1, $v0 +/* C81B5C 802419BC A643008E */ sh $v1, 0x8e($s2) +/* C81B60 802419C0 8E2200CC */ lw $v0, 0xcc($s1) +/* C81B64 802419C4 C64E0040 */ lwc1 $f14, 0x40($s2) +/* C81B68 802419C8 8C42000C */ lw $v0, 0xc($v0) +/* C81B6C 802419CC AE420028 */ sw $v0, 0x28($s2) +/* C81B70 802419D0 C6000018 */ lwc1 $f0, 0x18($s0) +/* C81B74 802419D4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C81B78 802419D8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C81B7C 802419DC E6400018 */ swc1 $f0, 0x18($s2) +/* C81B80 802419E0 8C460028 */ lw $a2, 0x28($v0) +/* C81B84 802419E4 0C00A720 */ jal atan2 +/* C81B88 802419E8 8C470030 */ lw $a3, 0x30($v0) +/* C81B8C 802419EC 46000506 */ mov.s $f20, $f0 +/* C81B90 802419F0 C64C000C */ lwc1 $f12, 0xc($s2) +/* C81B94 802419F4 0C00A70A */ jal get_clamped_angle_diff +/* C81B98 802419F8 4600A386 */ mov.s $f14, $f20 +/* C81B9C 802419FC 46000086 */ mov.s $f2, $f0 +/* C81BA0 80241A00 8E02001C */ lw $v0, 0x1c($s0) +/* C81BA4 80241A04 46001005 */ abs.s $f0, $f2 +/* C81BA8 80241A08 44822000 */ mtc1 $v0, $f4 +/* C81BAC 80241A0C 00000000 */ nop +/* C81BB0 80241A10 46802120 */ cvt.s.w $f4, $f4 +/* C81BB4 80241A14 4600203C */ c.lt.s $f4, $f0 +/* C81BB8 80241A18 00000000 */ nop +/* C81BBC 80241A1C 4500000D */ bc1f .L80241A54 +/* C81BC0 80241A20 00000000 */ nop +/* C81BC4 80241A24 44800000 */ mtc1 $zero, $f0 +/* C81BC8 80241A28 C654000C */ lwc1 $f20, 0xc($s2) +/* C81BCC 80241A2C 4600103C */ c.lt.s $f2, $f0 +/* C81BD0 80241A30 00000000 */ nop +/* C81BD4 80241A34 45000006 */ bc1f .L80241A50 +/* C81BD8 80241A38 00021023 */ negu $v0, $v0 +/* C81BDC 80241A3C 44820000 */ mtc1 $v0, $f0 +/* C81BE0 80241A40 00000000 */ nop +/* C81BE4 80241A44 46800020 */ cvt.s.w $f0, $f0 +/* C81BE8 80241A48 08090695 */ j .L80241A54 +/* C81BEC 80241A4C 4600A500 */ add.s $f20, $f20, $f0 +.L80241A50: +/* C81BF0 80241A50 4604A500 */ add.s $f20, $f20, $f4 +.L80241A54: +/* C81BF4 80241A54 0C00A6C9 */ jal clamp_angle +/* C81BF8 80241A58 4600A306 */ mov.s $f12, $f20 +/* C81BFC 80241A5C 2402000D */ addiu $v0, $zero, 0xd +/* C81C00 80241A60 E640000C */ swc1 $f0, 0xc($s2) +/* C81C04 80241A64 AE620070 */ sw $v0, 0x70($s3) +/* C81C08 80241A68 8FBF0020 */ lw $ra, 0x20($sp) +/* C81C0C 80241A6C 8FB3001C */ lw $s3, 0x1c($sp) +/* C81C10 80241A70 8FB20018 */ lw $s2, 0x18($sp) +/* C81C14 80241A74 8FB10014 */ lw $s1, 0x14($sp) +/* C81C18 80241A78 8FB00010 */ lw $s0, 0x10($sp) +/* C81C1C 80241A7C D7B40028 */ ldc1 $f20, 0x28($sp) +/* C81C20 80241A80 03E00008 */ jr $ra +/* C81C24 80241A84 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88.s deleted file mode 100644 index 9edbf1d71c..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88.s +++ /dev/null @@ -1,172 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A88 -/* C81C28 80241A88 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* C81C2C 80241A8C AFB3004C */ sw $s3, 0x4c($sp) -/* C81C30 80241A90 0080982D */ daddu $s3, $a0, $zero -/* C81C34 80241A94 AFBF0050 */ sw $ra, 0x50($sp) -/* C81C38 80241A98 AFB20048 */ sw $s2, 0x48($sp) -/* C81C3C 80241A9C AFB10044 */ sw $s1, 0x44($sp) -/* C81C40 80241AA0 AFB00040 */ sw $s0, 0x40($sp) -/* C81C44 80241AA4 8E720148 */ lw $s2, 0x148($s3) -/* C81C48 80241AA8 00A0882D */ daddu $s1, $a1, $zero -/* C81C4C 80241AAC 86440008 */ lh $a0, 8($s2) -/* C81C50 80241AB0 0C00EABB */ jal get_npc_unsafe -/* C81C54 80241AB4 00C0802D */ daddu $s0, $a2, $zero -/* C81C58 80241AB8 0200202D */ daddu $a0, $s0, $zero -/* C81C5C 80241ABC 0240282D */ daddu $a1, $s2, $zero -/* C81C60 80241AC0 24030001 */ addiu $v1, $zero, 1 -/* C81C64 80241AC4 AFA30010 */ sw $v1, 0x10($sp) -/* C81C68 80241AC8 8E260024 */ lw $a2, 0x24($s1) -/* C81C6C 80241ACC 8E270028 */ lw $a3, 0x28($s1) -/* C81C70 80241AD0 0C01242D */ jal func_800490B4 -/* C81C74 80241AD4 0040802D */ daddu $s0, $v0, $zero -/* C81C78 80241AD8 14400020 */ bnez $v0, .L80241B5C -/* C81C7C 80241ADC 24040002 */ addiu $a0, $zero, 2 -/* C81C80 80241AE0 0200282D */ daddu $a1, $s0, $zero -/* C81C84 80241AE4 0000302D */ daddu $a2, $zero, $zero -/* C81C88 80241AE8 860300A8 */ lh $v1, 0xa8($s0) -/* C81C8C 80241AEC 3C013F80 */ lui $at, 0x3f80 -/* C81C90 80241AF0 44810000 */ mtc1 $at, $f0 -/* C81C94 80241AF4 3C014000 */ lui $at, 0x4000 -/* C81C98 80241AF8 44811000 */ mtc1 $at, $f2 -/* C81C9C 80241AFC 3C01C1A0 */ lui $at, 0xc1a0 -/* C81CA0 80241B00 44812000 */ mtc1 $at, $f4 -/* C81CA4 80241B04 2402000F */ addiu $v0, $zero, 0xf -/* C81CA8 80241B08 AFA2001C */ sw $v0, 0x1c($sp) -/* C81CAC 80241B0C 44834000 */ mtc1 $v1, $f8 -/* C81CB0 80241B10 00000000 */ nop -/* C81CB4 80241B14 46804220 */ cvt.s.w $f8, $f8 -/* C81CB8 80241B18 44074000 */ mfc1 $a3, $f8 -/* C81CBC 80241B1C 27A20028 */ addiu $v0, $sp, 0x28 -/* C81CC0 80241B20 AFA20020 */ sw $v0, 0x20($sp) -/* C81CC4 80241B24 E7A00010 */ swc1 $f0, 0x10($sp) -/* C81CC8 80241B28 E7A20014 */ swc1 $f2, 0x14($sp) -/* C81CCC 80241B2C 0C01BFA4 */ jal fx_emote -/* C81CD0 80241B30 E7A40018 */ swc1 $f4, 0x18($sp) -/* C81CD4 80241B34 8E4200CC */ lw $v0, 0xcc($s2) -/* C81CD8 80241B38 8C430000 */ lw $v1, ($v0) -/* C81CDC 80241B3C 2402001E */ addiu $v0, $zero, 0x1e -/* C81CE0 80241B40 A602008E */ sh $v0, 0x8e($s0) -/* C81CE4 80241B44 24020014 */ addiu $v0, $zero, 0x14 -/* C81CE8 80241B48 AE030028 */ sw $v1, 0x28($s0) -/* C81CEC 80241B4C AE620070 */ sw $v0, 0x70($s3) -/* C81CF0 80241B50 2402001E */ addiu $v0, $zero, 0x1e -/* C81CF4 80241B54 0809073B */ j .L80241CEC -/* C81CF8 80241B58 AE420090 */ sw $v0, 0x90($s2) -.L80241B5C: -/* C81CFC 80241B5C 8E050018 */ lw $a1, 0x18($s0) -/* C81D00 80241B60 8E06000C */ lw $a2, 0xc($s0) -/* C81D04 80241B64 0C00EA95 */ jal npc_move_heading -/* C81D08 80241B68 0200202D */ daddu $a0, $s0, $zero -/* C81D0C 80241B6C 8E020000 */ lw $v0, ($s0) -/* C81D10 80241B70 30420008 */ andi $v0, $v0, 8 -/* C81D14 80241B74 14400028 */ bnez $v0, .L80241C18 -/* C81D18 80241B78 0000882D */ daddu $s1, $zero, $zero -/* C81D1C 80241B7C 27A5002C */ addiu $a1, $sp, 0x2c -/* C81D20 80241B80 27A60030 */ addiu $a2, $sp, 0x30 -/* C81D24 80241B84 860200A8 */ lh $v0, 0xa8($s0) -/* C81D28 80241B88 C6000038 */ lwc1 $f0, 0x38($s0) -/* C81D2C 80241B8C 44821000 */ mtc1 $v0, $f2 -/* C81D30 80241B90 00000000 */ nop -/* C81D34 80241B94 468010A0 */ cvt.s.w $f2, $f2 -/* C81D38 80241B98 E7A0002C */ swc1 $f0, 0x2c($sp) -/* C81D3C 80241B9C 860200A8 */ lh $v0, 0xa8($s0) -/* C81D40 80241BA0 C604003C */ lwc1 $f4, 0x3c($s0) -/* C81D44 80241BA4 C6060040 */ lwc1 $f6, 0x40($s0) -/* C81D48 80241BA8 44820000 */ mtc1 $v0, $f0 -/* C81D4C 80241BAC 00000000 */ nop -/* C81D50 80241BB0 46800021 */ cvt.d.w $f0, $f0 -/* C81D54 80241BB4 46022100 */ add.s $f4, $f4, $f2 -/* C81D58 80241BB8 3C014008 */ lui $at, 0x4008 -/* C81D5C 80241BBC 44811800 */ mtc1 $at, $f3 -/* C81D60 80241BC0 44801000 */ mtc1 $zero, $f2 -/* C81D64 80241BC4 27A20038 */ addiu $v0, $sp, 0x38 -/* C81D68 80241BC8 46220000 */ add.d $f0, $f0, $f2 -/* C81D6C 80241BCC E7A60034 */ swc1 $f6, 0x34($sp) -/* C81D70 80241BD0 E7A40030 */ swc1 $f4, 0x30($sp) -/* C81D74 80241BD4 46200020 */ cvt.s.d $f0, $f0 -/* C81D78 80241BD8 E7A00038 */ swc1 $f0, 0x38($sp) -/* C81D7C 80241BDC AFA20010 */ sw $v0, 0x10($sp) -/* C81D80 80241BE0 8E040080 */ lw $a0, 0x80($s0) -/* C81D84 80241BE4 0C0372DF */ jal func_800DCB7C -/* C81D88 80241BE8 27A70034 */ addiu $a3, $sp, 0x34 -/* C81D8C 80241BEC 1040000A */ beqz $v0, .L80241C18 -/* C81D90 80241BF0 00000000 */ nop -/* C81D94 80241BF4 860200A8 */ lh $v0, 0xa8($s0) -/* C81D98 80241BF8 C7A20038 */ lwc1 $f2, 0x38($sp) -/* C81D9C 80241BFC 44820000 */ mtc1 $v0, $f0 -/* C81DA0 80241C00 00000000 */ nop -/* C81DA4 80241C04 46800020 */ cvt.s.w $f0, $f0 -/* C81DA8 80241C08 4600103C */ c.lt.s $f2, $f0 -/* C81DAC 80241C0C 00000000 */ nop -/* C81DB0 80241C10 45030001 */ bc1tl .L80241C18 -/* C81DB4 80241C14 24110001 */ addiu $s1, $zero, 1 -.L80241C18: -/* C81DB8 80241C18 12200008 */ beqz $s1, .L80241C3C -/* C81DBC 80241C1C 00000000 */ nop -/* C81DC0 80241C20 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C81DC4 80241C24 3C013FF0 */ lui $at, 0x3ff0 -/* C81DC8 80241C28 44811800 */ mtc1 $at, $f3 -/* C81DCC 80241C2C 44801000 */ mtc1 $zero, $f2 -/* C81DD0 80241C30 46000021 */ cvt.d.s $f0, $f0 -/* C81DD4 80241C34 08090731 */ j .L80241CC4 -/* C81DD8 80241C38 46220000 */ add.d $f0, $f0, $f2 -.L80241C3C: -/* C81DDC 80241C3C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C81DE0 80241C40 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C81DE4 80241C44 3C014018 */ lui $at, 0x4018 -/* C81DE8 80241C48 44811800 */ mtc1 $at, $f3 -/* C81DEC 80241C4C 44801000 */ mtc1 $zero, $f2 -/* C81DF0 80241C50 C440002C */ lwc1 $f0, 0x2c($v0) -/* C81DF4 80241C54 C604003C */ lwc1 $f4, 0x3c($s0) -/* C81DF8 80241C58 46000021 */ cvt.d.s $f0, $f0 -/* C81DFC 80241C5C 46220000 */ add.d $f0, $f0, $f2 -/* C81E00 80241C60 46002121 */ cvt.d.s $f4, $f4 -/* C81E04 80241C64 46202001 */ sub.d $f0, $f4, $f0 -/* C81E08 80241C68 462001A0 */ cvt.s.d $f6, $f0 -/* C81E0C 80241C6C 44800000 */ mtc1 $zero, $f0 -/* C81E10 80241C70 44800800 */ mtc1 $zero, $f1 -/* C81E14 80241C74 460030A1 */ cvt.d.s $f2, $f6 -/* C81E18 80241C78 4620103C */ c.lt.d $f2, $f0 -/* C81E1C 80241C7C 00000000 */ nop -/* C81E20 80241C80 45010009 */ bc1t .L80241CA8 -/* C81E24 80241C84 00000000 */ nop -/* C81E28 80241C88 3C014010 */ lui $at, 0x4010 -/* C81E2C 80241C8C 44810800 */ mtc1 $at, $f1 -/* C81E30 80241C90 44800000 */ mtc1 $zero, $f0 -/* C81E34 80241C94 00000000 */ nop -/* C81E38 80241C98 4622003C */ c.lt.d $f0, $f2 -/* C81E3C 80241C9C 00000000 */ nop -/* C81E40 80241CA0 4500000A */ bc1f .L80241CCC -/* C81E44 80241CA4 00000000 */ nop -.L80241CA8: -/* C81E48 80241CA8 3C018024 */ lui $at, 0x8024 -/* C81E4C 80241CAC D42258A8 */ ldc1 $f2, 0x58a8($at) -/* C81E50 80241CB0 46003187 */ neg.s $f6, $f6 -/* C81E54 80241CB4 46003021 */ cvt.d.s $f0, $f6 -/* C81E58 80241CB8 46220002 */ mul.d $f0, $f0, $f2 -/* C81E5C 80241CBC 00000000 */ nop -/* C81E60 80241CC0 46202000 */ add.d $f0, $f4, $f0 -.L80241CC4: -/* C81E64 80241CC4 46200020 */ cvt.s.d $f0, $f0 -/* C81E68 80241CC8 E600003C */ swc1 $f0, 0x3c($s0) -.L80241CCC: -/* C81E6C 80241CCC 8602008E */ lh $v0, 0x8e($s0) -/* C81E70 80241CD0 9603008E */ lhu $v1, 0x8e($s0) -/* C81E74 80241CD4 18400003 */ blez $v0, .L80241CE4 -/* C81E78 80241CD8 2462FFFF */ addiu $v0, $v1, -1 -/* C81E7C 80241CDC 0809073B */ j .L80241CEC -/* C81E80 80241CE0 A602008E */ sh $v0, 0x8e($s0) -.L80241CE4: -/* C81E84 80241CE4 2402000C */ addiu $v0, $zero, 0xc -/* C81E88 80241CE8 AE620070 */ sw $v0, 0x70($s3) -.L80241CEC: -/* C81E8C 80241CEC 8FBF0050 */ lw $ra, 0x50($sp) -/* C81E90 80241CF0 8FB3004C */ lw $s3, 0x4c($sp) -/* C81E94 80241CF4 8FB20048 */ lw $s2, 0x48($sp) -/* C81E98 80241CF8 8FB10044 */ lw $s1, 0x44($sp) -/* C81E9C 80241CFC 8FB00040 */ lw $s0, 0x40($sp) -/* C81EA0 80241D00 03E00008 */ jr $ra -/* C81EA4 80241D04 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s new file mode 100644 index 0000000000..192c06fd91 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241A88_C81C28.s @@ -0,0 +1,172 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A88_C81C28 +/* C81C28 80241A88 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* C81C2C 80241A8C AFB3004C */ sw $s3, 0x4c($sp) +/* C81C30 80241A90 0080982D */ daddu $s3, $a0, $zero +/* C81C34 80241A94 AFBF0050 */ sw $ra, 0x50($sp) +/* C81C38 80241A98 AFB20048 */ sw $s2, 0x48($sp) +/* C81C3C 80241A9C AFB10044 */ sw $s1, 0x44($sp) +/* C81C40 80241AA0 AFB00040 */ sw $s0, 0x40($sp) +/* C81C44 80241AA4 8E720148 */ lw $s2, 0x148($s3) +/* C81C48 80241AA8 00A0882D */ daddu $s1, $a1, $zero +/* C81C4C 80241AAC 86440008 */ lh $a0, 8($s2) +/* C81C50 80241AB0 0C00EABB */ jal get_npc_unsafe +/* C81C54 80241AB4 00C0802D */ daddu $s0, $a2, $zero +/* C81C58 80241AB8 0200202D */ daddu $a0, $s0, $zero +/* C81C5C 80241ABC 0240282D */ daddu $a1, $s2, $zero +/* C81C60 80241AC0 24030001 */ addiu $v1, $zero, 1 +/* C81C64 80241AC4 AFA30010 */ sw $v1, 0x10($sp) +/* C81C68 80241AC8 8E260024 */ lw $a2, 0x24($s1) +/* C81C6C 80241ACC 8E270028 */ lw $a3, 0x28($s1) +/* C81C70 80241AD0 0C01242D */ jal func_800490B4 +/* C81C74 80241AD4 0040802D */ daddu $s0, $v0, $zero +/* C81C78 80241AD8 14400020 */ bnez $v0, .L80241B5C +/* C81C7C 80241ADC 24040002 */ addiu $a0, $zero, 2 +/* C81C80 80241AE0 0200282D */ daddu $a1, $s0, $zero +/* C81C84 80241AE4 0000302D */ daddu $a2, $zero, $zero +/* C81C88 80241AE8 860300A8 */ lh $v1, 0xa8($s0) +/* C81C8C 80241AEC 3C013F80 */ lui $at, 0x3f80 +/* C81C90 80241AF0 44810000 */ mtc1 $at, $f0 +/* C81C94 80241AF4 3C014000 */ lui $at, 0x4000 +/* C81C98 80241AF8 44811000 */ mtc1 $at, $f2 +/* C81C9C 80241AFC 3C01C1A0 */ lui $at, 0xc1a0 +/* C81CA0 80241B00 44812000 */ mtc1 $at, $f4 +/* C81CA4 80241B04 2402000F */ addiu $v0, $zero, 0xf +/* C81CA8 80241B08 AFA2001C */ sw $v0, 0x1c($sp) +/* C81CAC 80241B0C 44834000 */ mtc1 $v1, $f8 +/* C81CB0 80241B10 00000000 */ nop +/* C81CB4 80241B14 46804220 */ cvt.s.w $f8, $f8 +/* C81CB8 80241B18 44074000 */ mfc1 $a3, $f8 +/* C81CBC 80241B1C 27A20028 */ addiu $v0, $sp, 0x28 +/* C81CC0 80241B20 AFA20020 */ sw $v0, 0x20($sp) +/* C81CC4 80241B24 E7A00010 */ swc1 $f0, 0x10($sp) +/* C81CC8 80241B28 E7A20014 */ swc1 $f2, 0x14($sp) +/* C81CCC 80241B2C 0C01BFA4 */ jal fx_emote +/* C81CD0 80241B30 E7A40018 */ swc1 $f4, 0x18($sp) +/* C81CD4 80241B34 8E4200CC */ lw $v0, 0xcc($s2) +/* C81CD8 80241B38 8C430000 */ lw $v1, ($v0) +/* C81CDC 80241B3C 2402001E */ addiu $v0, $zero, 0x1e +/* C81CE0 80241B40 A602008E */ sh $v0, 0x8e($s0) +/* C81CE4 80241B44 24020014 */ addiu $v0, $zero, 0x14 +/* C81CE8 80241B48 AE030028 */ sw $v1, 0x28($s0) +/* C81CEC 80241B4C AE620070 */ sw $v0, 0x70($s3) +/* C81CF0 80241B50 2402001E */ addiu $v0, $zero, 0x1e +/* C81CF4 80241B54 0809073B */ j .L80241CEC +/* C81CF8 80241B58 AE420090 */ sw $v0, 0x90($s2) +.L80241B5C: +/* C81CFC 80241B5C 8E050018 */ lw $a1, 0x18($s0) +/* C81D00 80241B60 8E06000C */ lw $a2, 0xc($s0) +/* C81D04 80241B64 0C00EA95 */ jal npc_move_heading +/* C81D08 80241B68 0200202D */ daddu $a0, $s0, $zero +/* C81D0C 80241B6C 8E020000 */ lw $v0, ($s0) +/* C81D10 80241B70 30420008 */ andi $v0, $v0, 8 +/* C81D14 80241B74 14400028 */ bnez $v0, .L80241C18 +/* C81D18 80241B78 0000882D */ daddu $s1, $zero, $zero +/* C81D1C 80241B7C 27A5002C */ addiu $a1, $sp, 0x2c +/* C81D20 80241B80 27A60030 */ addiu $a2, $sp, 0x30 +/* C81D24 80241B84 860200A8 */ lh $v0, 0xa8($s0) +/* C81D28 80241B88 C6000038 */ lwc1 $f0, 0x38($s0) +/* C81D2C 80241B8C 44821000 */ mtc1 $v0, $f2 +/* C81D30 80241B90 00000000 */ nop +/* C81D34 80241B94 468010A0 */ cvt.s.w $f2, $f2 +/* C81D38 80241B98 E7A0002C */ swc1 $f0, 0x2c($sp) +/* C81D3C 80241B9C 860200A8 */ lh $v0, 0xa8($s0) +/* C81D40 80241BA0 C604003C */ lwc1 $f4, 0x3c($s0) +/* C81D44 80241BA4 C6060040 */ lwc1 $f6, 0x40($s0) +/* C81D48 80241BA8 44820000 */ mtc1 $v0, $f0 +/* C81D4C 80241BAC 00000000 */ nop +/* C81D50 80241BB0 46800021 */ cvt.d.w $f0, $f0 +/* C81D54 80241BB4 46022100 */ add.s $f4, $f4, $f2 +/* C81D58 80241BB8 3C014008 */ lui $at, 0x4008 +/* C81D5C 80241BBC 44811800 */ mtc1 $at, $f3 +/* C81D60 80241BC0 44801000 */ mtc1 $zero, $f2 +/* C81D64 80241BC4 27A20038 */ addiu $v0, $sp, 0x38 +/* C81D68 80241BC8 46220000 */ add.d $f0, $f0, $f2 +/* C81D6C 80241BCC E7A60034 */ swc1 $f6, 0x34($sp) +/* C81D70 80241BD0 E7A40030 */ swc1 $f4, 0x30($sp) +/* C81D74 80241BD4 46200020 */ cvt.s.d $f0, $f0 +/* C81D78 80241BD8 E7A00038 */ swc1 $f0, 0x38($sp) +/* C81D7C 80241BDC AFA20010 */ sw $v0, 0x10($sp) +/* C81D80 80241BE0 8E040080 */ lw $a0, 0x80($s0) +/* C81D84 80241BE4 0C0372DF */ jal func_800DCB7C +/* C81D88 80241BE8 27A70034 */ addiu $a3, $sp, 0x34 +/* C81D8C 80241BEC 1040000A */ beqz $v0, .L80241C18 +/* C81D90 80241BF0 00000000 */ nop +/* C81D94 80241BF4 860200A8 */ lh $v0, 0xa8($s0) +/* C81D98 80241BF8 C7A20038 */ lwc1 $f2, 0x38($sp) +/* C81D9C 80241BFC 44820000 */ mtc1 $v0, $f0 +/* C81DA0 80241C00 00000000 */ nop +/* C81DA4 80241C04 46800020 */ cvt.s.w $f0, $f0 +/* C81DA8 80241C08 4600103C */ c.lt.s $f2, $f0 +/* C81DAC 80241C0C 00000000 */ nop +/* C81DB0 80241C10 45030001 */ bc1tl .L80241C18 +/* C81DB4 80241C14 24110001 */ addiu $s1, $zero, 1 +.L80241C18: +/* C81DB8 80241C18 12200008 */ beqz $s1, .L80241C3C +/* C81DBC 80241C1C 00000000 */ nop +/* C81DC0 80241C20 C7A00030 */ lwc1 $f0, 0x30($sp) +/* C81DC4 80241C24 3C013FF0 */ lui $at, 0x3ff0 +/* C81DC8 80241C28 44811800 */ mtc1 $at, $f3 +/* C81DCC 80241C2C 44801000 */ mtc1 $zero, $f2 +/* C81DD0 80241C30 46000021 */ cvt.d.s $f0, $f0 +/* C81DD4 80241C34 08090731 */ j .L80241CC4 +/* C81DD8 80241C38 46220000 */ add.d $f0, $f0, $f2 +.L80241C3C: +/* C81DDC 80241C3C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C81DE0 80241C40 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C81DE4 80241C44 3C014018 */ lui $at, 0x4018 +/* C81DE8 80241C48 44811800 */ mtc1 $at, $f3 +/* C81DEC 80241C4C 44801000 */ mtc1 $zero, $f2 +/* C81DF0 80241C50 C440002C */ lwc1 $f0, 0x2c($v0) +/* C81DF4 80241C54 C604003C */ lwc1 $f4, 0x3c($s0) +/* C81DF8 80241C58 46000021 */ cvt.d.s $f0, $f0 +/* C81DFC 80241C5C 46220000 */ add.d $f0, $f0, $f2 +/* C81E00 80241C60 46002121 */ cvt.d.s $f4, $f4 +/* C81E04 80241C64 46202001 */ sub.d $f0, $f4, $f0 +/* C81E08 80241C68 462001A0 */ cvt.s.d $f6, $f0 +/* C81E0C 80241C6C 44800000 */ mtc1 $zero, $f0 +/* C81E10 80241C70 44800800 */ mtc1 $zero, $f1 +/* C81E14 80241C74 460030A1 */ cvt.d.s $f2, $f6 +/* C81E18 80241C78 4620103C */ c.lt.d $f2, $f0 +/* C81E1C 80241C7C 00000000 */ nop +/* C81E20 80241C80 45010009 */ bc1t .L80241CA8 +/* C81E24 80241C84 00000000 */ nop +/* C81E28 80241C88 3C014010 */ lui $at, 0x4010 +/* C81E2C 80241C8C 44810800 */ mtc1 $at, $f1 +/* C81E30 80241C90 44800000 */ mtc1 $zero, $f0 +/* C81E34 80241C94 00000000 */ nop +/* C81E38 80241C98 4622003C */ c.lt.d $f0, $f2 +/* C81E3C 80241C9C 00000000 */ nop +/* C81E40 80241CA0 4500000A */ bc1f .L80241CCC +/* C81E44 80241CA4 00000000 */ nop +.L80241CA8: +/* C81E48 80241CA8 3C018024 */ lui $at, 0x8024 +/* C81E4C 80241CAC D42258A8 */ ldc1 $f2, 0x58a8($at) +/* C81E50 80241CB0 46003187 */ neg.s $f6, $f6 +/* C81E54 80241CB4 46003021 */ cvt.d.s $f0, $f6 +/* C81E58 80241CB8 46220002 */ mul.d $f0, $f0, $f2 +/* C81E5C 80241CBC 00000000 */ nop +/* C81E60 80241CC0 46202000 */ add.d $f0, $f4, $f0 +.L80241CC4: +/* C81E64 80241CC4 46200020 */ cvt.s.d $f0, $f0 +/* C81E68 80241CC8 E600003C */ swc1 $f0, 0x3c($s0) +.L80241CCC: +/* C81E6C 80241CCC 8602008E */ lh $v0, 0x8e($s0) +/* C81E70 80241CD0 9603008E */ lhu $v1, 0x8e($s0) +/* C81E74 80241CD4 18400003 */ blez $v0, .L80241CE4 +/* C81E78 80241CD8 2462FFFF */ addiu $v0, $v1, -1 +/* C81E7C 80241CDC 0809073B */ j .L80241CEC +/* C81E80 80241CE0 A602008E */ sh $v0, 0x8e($s0) +.L80241CE4: +/* C81E84 80241CE4 2402000C */ addiu $v0, $zero, 0xc +/* C81E88 80241CE8 AE620070 */ sw $v0, 0x70($s3) +.L80241CEC: +/* C81E8C 80241CEC 8FBF0050 */ lw $ra, 0x50($sp) +/* C81E90 80241CF0 8FB3004C */ lw $s3, 0x4c($sp) +/* C81E94 80241CF4 8FB20048 */ lw $s2, 0x48($sp) +/* C81E98 80241CF8 8FB10044 */ lw $s1, 0x44($sp) +/* C81E9C 80241CFC 8FB00040 */ lw $s0, 0x40($sp) +/* C81EA0 80241D00 03E00008 */ jr $ra +/* C81EA4 80241D04 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64.s deleted file mode 100644 index 90008c2927..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64.s +++ /dev/null @@ -1,130 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D64 -/* C81F04 80241D64 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* C81F08 80241D68 AFB40040 */ sw $s4, 0x40($sp) -/* C81F0C 80241D6C 0080A02D */ daddu $s4, $a0, $zero -/* C81F10 80241D70 AFBF0048 */ sw $ra, 0x48($sp) -/* C81F14 80241D74 AFB50044 */ sw $s5, 0x44($sp) -/* C81F18 80241D78 AFB3003C */ sw $s3, 0x3c($sp) -/* C81F1C 80241D7C AFB20038 */ sw $s2, 0x38($sp) -/* C81F20 80241D80 AFB10034 */ sw $s1, 0x34($sp) -/* C81F24 80241D84 AFB00030 */ sw $s0, 0x30($sp) -/* C81F28 80241D88 8E920148 */ lw $s2, 0x148($s4) -/* C81F2C 80241D8C 86440008 */ lh $a0, 8($s2) -/* C81F30 80241D90 8E90000C */ lw $s0, 0xc($s4) -/* C81F34 80241D94 0C00EABB */ jal get_npc_unsafe -/* C81F38 80241D98 00A0882D */ daddu $s1, $a1, $zero -/* C81F3C 80241D9C 0280202D */ daddu $a0, $s4, $zero -/* C81F40 80241DA0 8E050000 */ lw $a1, ($s0) -/* C81F44 80241DA4 0C0B1EAF */ jal get_variable -/* C81F48 80241DA8 0040A82D */ daddu $s5, $v0, $zero -/* C81F4C 80241DAC AFA00010 */ sw $zero, 0x10($sp) -/* C81F50 80241DB0 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F54 80241DB4 8C630030 */ lw $v1, 0x30($v1) -/* C81F58 80241DB8 AFA30014 */ sw $v1, 0x14($sp) -/* C81F5C 80241DBC 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F60 80241DC0 8C63001C */ lw $v1, 0x1c($v1) -/* C81F64 80241DC4 AFA30018 */ sw $v1, 0x18($sp) -/* C81F68 80241DC8 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F6C 80241DCC 8C630024 */ lw $v1, 0x24($v1) -/* C81F70 80241DD0 AFA3001C */ sw $v1, 0x1c($sp) -/* C81F74 80241DD4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F78 80241DD8 8C630028 */ lw $v1, 0x28($v1) -/* C81F7C 80241DDC 27B30010 */ addiu $s3, $sp, 0x10 -/* C81F80 80241DE0 AFA30020 */ sw $v1, 0x20($sp) -/* C81F84 80241DE4 8E4300D0 */ lw $v1, 0xd0($s2) -/* C81F88 80241DE8 3C0142F0 */ lui $at, 0x42f0 -/* C81F8C 80241DEC 44810000 */ mtc1 $at, $f0 -/* C81F90 80241DF0 8C63002C */ lw $v1, 0x2c($v1) -/* C81F94 80241DF4 0040802D */ daddu $s0, $v0, $zero -/* C81F98 80241DF8 E7A00028 */ swc1 $f0, 0x28($sp) -/* C81F9C 80241DFC A7A0002C */ sh $zero, 0x2c($sp) -/* C81FA0 80241E00 12200007 */ beqz $s1, .L80241E20 -/* C81FA4 80241E04 AFA30024 */ sw $v1, 0x24($sp) -/* C81FA8 80241E08 02A0202D */ daddu $a0, $s5, $zero -/* C81FAC 80241E0C 0240282D */ daddu $a1, $s2, $zero -/* C81FB0 80241E10 0280302D */ daddu $a2, $s4, $zero -/* C81FB4 80241E14 0C090592 */ jal func_80241648 -/* C81FB8 80241E18 0200382D */ daddu $a3, $s0, $zero -/* C81FBC 80241E1C AE800070 */ sw $zero, 0x70($s4) -.L80241E20: -/* C81FC0 80241E20 2402FFFE */ addiu $v0, $zero, -2 -/* C81FC4 80241E24 A2A200AB */ sb $v0, 0xab($s5) -/* C81FC8 80241E28 8E4300B0 */ lw $v1, 0xb0($s2) -/* C81FCC 80241E2C 30620004 */ andi $v0, $v1, 4 -/* C81FD0 80241E30 10400007 */ beqz $v0, .L80241E50 -/* C81FD4 80241E34 00000000 */ nop -/* C81FD8 80241E38 824200B4 */ lb $v0, 0xb4($s2) -/* C81FDC 80241E3C 1440003A */ bnez $v0, .L80241F28 -/* C81FE0 80241E40 0000102D */ daddu $v0, $zero, $zero -/* C81FE4 80241E44 2402FFFB */ addiu $v0, $zero, -5 -/* C81FE8 80241E48 00621024 */ and $v0, $v1, $v0 -/* C81FEC 80241E4C AE4200B0 */ sw $v0, 0xb0($s2) -.L80241E50: -/* C81FF0 80241E50 8E830070 */ lw $v1, 0x70($s4) -/* C81FF4 80241E54 2C620015 */ sltiu $v0, $v1, 0x15 -/* C81FF8 80241E58 10400032 */ beqz $v0, .L80241F24 -/* C81FFC 80241E5C 00031080 */ sll $v0, $v1, 2 -/* C82000 80241E60 3C018024 */ lui $at, 0x8024 -/* C82004 80241E64 00220821 */ addu $at, $at, $v0 -/* C82008 80241E68 8C2258B0 */ lw $v0, 0x58b0($at) -/* C8200C 80241E6C 00400008 */ jr $v0 -/* C82010 80241E70 00000000 */ nop -/* C82014 80241E74 0280202D */ daddu $a0, $s4, $zero -/* C82018 80241E78 0200282D */ daddu $a1, $s0, $zero -/* C8201C 80241E7C 0C090118 */ jal func_80240460 -/* C82020 80241E80 0260302D */ daddu $a2, $s3, $zero -/* C82024 80241E84 0280202D */ daddu $a0, $s4, $zero -/* C82028 80241E88 0200282D */ daddu $a1, $s0, $zero -/* C8202C 80241E8C 0C090184 */ jal func_80240610 -/* C82030 80241E90 0260302D */ daddu $a2, $s3, $zero -/* C82034 80241E94 080907CA */ j .L80241F28 -/* C82038 80241E98 0000102D */ daddu $v0, $zero, $zero -/* C8203C 80241E9C 0280202D */ daddu $a0, $s4, $zero -/* C82040 80241EA0 0200282D */ daddu $a1, $s0, $zero -/* C82044 80241EA4 0C09030E */ jal func_80240C38 -/* C82048 80241EA8 0260302D */ daddu $a2, $s3, $zero -/* C8204C 80241EAC 0280202D */ daddu $a0, $s4, $zero -/* C82050 80241EB0 0200282D */ daddu $a1, $s0, $zero -/* C82054 80241EB4 0C09033E */ jal func_80240CF8 -/* C82058 80241EB8 0260302D */ daddu $a2, $s3, $zero -/* C8205C 80241EBC 080907CA */ j .L80241F28 -/* C82060 80241EC0 0000102D */ daddu $v0, $zero, $zero -/* C82064 80241EC4 0280202D */ daddu $a0, $s4, $zero -/* C82068 80241EC8 0200282D */ daddu $a1, $s0, $zero -/* C8206C 80241ECC 0C09040F */ jal func_8024103C -/* C82070 80241ED0 0260302D */ daddu $a2, $s3, $zero -/* C82074 80241ED4 0280202D */ daddu $a0, $s4, $zero -/* C82078 80241ED8 0200282D */ daddu $a1, $s0, $zero -/* C8207C 80241EDC 0C09042D */ jal func_802410B4 -/* C82080 80241EE0 0260302D */ daddu $a2, $s3, $zero -/* C82084 80241EE4 080907CA */ j .L80241F28 -/* C82088 80241EE8 0000102D */ daddu $v0, $zero, $zero -/* C8208C 80241EEC 0280202D */ daddu $a0, $s4, $zero -/* C82090 80241EF0 0200282D */ daddu $a1, $s0, $zero -/* C82094 80241EF4 0C090656 */ jal func_80241958 -/* C82098 80241EF8 0260302D */ daddu $a2, $s3, $zero -/* C8209C 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* C820A0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* C820A4 80241F04 0C0906A2 */ jal func_80241A88 -/* C820A8 80241F08 0260302D */ daddu $a2, $s3, $zero -/* C820AC 80241F0C 080907CA */ j .L80241F28 -/* C820B0 80241F10 0000102D */ daddu $v0, $zero, $zero -/* C820B4 80241F14 0280202D */ daddu $a0, $s4, $zero -/* C820B8 80241F18 0200282D */ daddu $a1, $s0, $zero -/* C820BC 80241F1C 0C090742 */ jal func_80241D08 -/* C820C0 80241F20 0260302D */ daddu $a2, $s3, $zero -.L80241F24: -/* C820C4 80241F24 0000102D */ daddu $v0, $zero, $zero -.L80241F28: -/* C820C8 80241F28 8FBF0048 */ lw $ra, 0x48($sp) -/* C820CC 80241F2C 8FB50044 */ lw $s5, 0x44($sp) -/* C820D0 80241F30 8FB40040 */ lw $s4, 0x40($sp) -/* C820D4 80241F34 8FB3003C */ lw $s3, 0x3c($sp) -/* C820D8 80241F38 8FB20038 */ lw $s2, 0x38($sp) -/* C820DC 80241F3C 8FB10034 */ lw $s1, 0x34($sp) -/* C820E0 80241F40 8FB00030 */ lw $s0, 0x30($sp) -/* C820E4 80241F44 03E00008 */ jr $ra -/* C820E8 80241F48 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s new file mode 100644 index 0000000000..699797c083 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C80600/func_80241D64_C81F04.s @@ -0,0 +1,130 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D64_C81F04 +/* C81F04 80241D64 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* C81F08 80241D68 AFB40040 */ sw $s4, 0x40($sp) +/* C81F0C 80241D6C 0080A02D */ daddu $s4, $a0, $zero +/* C81F10 80241D70 AFBF0048 */ sw $ra, 0x48($sp) +/* C81F14 80241D74 AFB50044 */ sw $s5, 0x44($sp) +/* C81F18 80241D78 AFB3003C */ sw $s3, 0x3c($sp) +/* C81F1C 80241D7C AFB20038 */ sw $s2, 0x38($sp) +/* C81F20 80241D80 AFB10034 */ sw $s1, 0x34($sp) +/* C81F24 80241D84 AFB00030 */ sw $s0, 0x30($sp) +/* C81F28 80241D88 8E920148 */ lw $s2, 0x148($s4) +/* C81F2C 80241D8C 86440008 */ lh $a0, 8($s2) +/* C81F30 80241D90 8E90000C */ lw $s0, 0xc($s4) +/* C81F34 80241D94 0C00EABB */ jal get_npc_unsafe +/* C81F38 80241D98 00A0882D */ daddu $s1, $a1, $zero +/* C81F3C 80241D9C 0280202D */ daddu $a0, $s4, $zero +/* C81F40 80241DA0 8E050000 */ lw $a1, ($s0) +/* C81F44 80241DA4 0C0B1EAF */ jal get_variable +/* C81F48 80241DA8 0040A82D */ daddu $s5, $v0, $zero +/* C81F4C 80241DAC AFA00010 */ sw $zero, 0x10($sp) +/* C81F50 80241DB0 8E4300D0 */ lw $v1, 0xd0($s2) +/* C81F54 80241DB4 8C630030 */ lw $v1, 0x30($v1) +/* C81F58 80241DB8 AFA30014 */ sw $v1, 0x14($sp) +/* C81F5C 80241DBC 8E4300D0 */ lw $v1, 0xd0($s2) +/* C81F60 80241DC0 8C63001C */ lw $v1, 0x1c($v1) +/* C81F64 80241DC4 AFA30018 */ sw $v1, 0x18($sp) +/* C81F68 80241DC8 8E4300D0 */ lw $v1, 0xd0($s2) +/* C81F6C 80241DCC 8C630024 */ lw $v1, 0x24($v1) +/* C81F70 80241DD0 AFA3001C */ sw $v1, 0x1c($sp) +/* C81F74 80241DD4 8E4300D0 */ lw $v1, 0xd0($s2) +/* C81F78 80241DD8 8C630028 */ lw $v1, 0x28($v1) +/* C81F7C 80241DDC 27B30010 */ addiu $s3, $sp, 0x10 +/* C81F80 80241DE0 AFA30020 */ sw $v1, 0x20($sp) +/* C81F84 80241DE4 8E4300D0 */ lw $v1, 0xd0($s2) +/* C81F88 80241DE8 3C0142F0 */ lui $at, 0x42f0 +/* C81F8C 80241DEC 44810000 */ mtc1 $at, $f0 +/* C81F90 80241DF0 8C63002C */ lw $v1, 0x2c($v1) +/* C81F94 80241DF4 0040802D */ daddu $s0, $v0, $zero +/* C81F98 80241DF8 E7A00028 */ swc1 $f0, 0x28($sp) +/* C81F9C 80241DFC A7A0002C */ sh $zero, 0x2c($sp) +/* C81FA0 80241E00 12200007 */ beqz $s1, .L80241E20 +/* C81FA4 80241E04 AFA30024 */ sw $v1, 0x24($sp) +/* C81FA8 80241E08 02A0202D */ daddu $a0, $s5, $zero +/* C81FAC 80241E0C 0240282D */ daddu $a1, $s2, $zero +/* C81FB0 80241E10 0280302D */ daddu $a2, $s4, $zero +/* C81FB4 80241E14 0C090592 */ jal func_80241648_C817E8 +/* C81FB8 80241E18 0200382D */ daddu $a3, $s0, $zero +/* C81FBC 80241E1C AE800070 */ sw $zero, 0x70($s4) +.L80241E20: +/* C81FC0 80241E20 2402FFFE */ addiu $v0, $zero, -2 +/* C81FC4 80241E24 A2A200AB */ sb $v0, 0xab($s5) +/* C81FC8 80241E28 8E4300B0 */ lw $v1, 0xb0($s2) +/* C81FCC 80241E2C 30620004 */ andi $v0, $v1, 4 +/* C81FD0 80241E30 10400007 */ beqz $v0, .L80241E50 +/* C81FD4 80241E34 00000000 */ nop +/* C81FD8 80241E38 824200B4 */ lb $v0, 0xb4($s2) +/* C81FDC 80241E3C 1440003A */ bnez $v0, .L80241F28 +/* C81FE0 80241E40 0000102D */ daddu $v0, $zero, $zero +/* C81FE4 80241E44 2402FFFB */ addiu $v0, $zero, -5 +/* C81FE8 80241E48 00621024 */ and $v0, $v1, $v0 +/* C81FEC 80241E4C AE4200B0 */ sw $v0, 0xb0($s2) +.L80241E50: +/* C81FF0 80241E50 8E830070 */ lw $v1, 0x70($s4) +/* C81FF4 80241E54 2C620015 */ sltiu $v0, $v1, 0x15 +/* C81FF8 80241E58 10400032 */ beqz $v0, .L80241F24 +/* C81FFC 80241E5C 00031080 */ sll $v0, $v1, 2 +/* C82000 80241E60 3C018024 */ lui $at, 0x8024 +/* C82004 80241E64 00220821 */ addu $at, $at, $v0 +/* C82008 80241E68 8C2258B0 */ lw $v0, 0x58b0($at) +/* C8200C 80241E6C 00400008 */ jr $v0 +/* C82010 80241E70 00000000 */ nop +/* C82014 80241E74 0280202D */ daddu $a0, $s4, $zero +/* C82018 80241E78 0200282D */ daddu $a1, $s0, $zero +/* C8201C 80241E7C 0C090118 */ jal func_80240460_C80600 +/* C82020 80241E80 0260302D */ daddu $a2, $s3, $zero +/* C82024 80241E84 0280202D */ daddu $a0, $s4, $zero +/* C82028 80241E88 0200282D */ daddu $a1, $s0, $zero +/* C8202C 80241E8C 0C090184 */ jal func_80240610_C807B0 +/* C82030 80241E90 0260302D */ daddu $a2, $s3, $zero +/* C82034 80241E94 080907CA */ j .L80241F28 +/* C82038 80241E98 0000102D */ daddu $v0, $zero, $zero +/* C8203C 80241E9C 0280202D */ daddu $a0, $s4, $zero +/* C82040 80241EA0 0200282D */ daddu $a1, $s0, $zero +/* C82044 80241EA4 0C09030E */ jal func_80240C38_C80DD8 +/* C82048 80241EA8 0260302D */ daddu $a2, $s3, $zero +/* C8204C 80241EAC 0280202D */ daddu $a0, $s4, $zero +/* C82050 80241EB0 0200282D */ daddu $a1, $s0, $zero +/* C82054 80241EB4 0C09033E */ jal func_80240CF8_C80E98 +/* C82058 80241EB8 0260302D */ daddu $a2, $s3, $zero +/* C8205C 80241EBC 080907CA */ j .L80241F28 +/* C82060 80241EC0 0000102D */ daddu $v0, $zero, $zero +/* C82064 80241EC4 0280202D */ daddu $a0, $s4, $zero +/* C82068 80241EC8 0200282D */ daddu $a1, $s0, $zero +/* C8206C 80241ECC 0C09040F */ jal func_8024103C_C811DC +/* C82070 80241ED0 0260302D */ daddu $a2, $s3, $zero +/* C82074 80241ED4 0280202D */ daddu $a0, $s4, $zero +/* C82078 80241ED8 0200282D */ daddu $a1, $s0, $zero +/* C8207C 80241EDC 0C09042D */ jal func_802410B4_C81254 +/* C82080 80241EE0 0260302D */ daddu $a2, $s3, $zero +/* C82084 80241EE4 080907CA */ j .L80241F28 +/* C82088 80241EE8 0000102D */ daddu $v0, $zero, $zero +/* C8208C 80241EEC 0280202D */ daddu $a0, $s4, $zero +/* C82090 80241EF0 0200282D */ daddu $a1, $s0, $zero +/* C82094 80241EF4 0C090656 */ jal func_80241958_C81AF8 +/* C82098 80241EF8 0260302D */ daddu $a2, $s3, $zero +/* C8209C 80241EFC 0280202D */ daddu $a0, $s4, $zero +/* C820A0 80241F00 0200282D */ daddu $a1, $s0, $zero +/* C820A4 80241F04 0C0906A2 */ jal func_80241A88_C81C28 +/* C820A8 80241F08 0260302D */ daddu $a2, $s3, $zero +/* C820AC 80241F0C 080907CA */ j .L80241F28 +/* C820B0 80241F10 0000102D */ daddu $v0, $zero, $zero +/* C820B4 80241F14 0280202D */ daddu $a0, $s4, $zero +/* C820B8 80241F18 0200282D */ daddu $a1, $s0, $zero +/* C820BC 80241F1C 0C090742 */ jal func_80241D08_C81EA8 +/* C820C0 80241F20 0260302D */ daddu $a2, $s3, $zero +.L80241F24: +/* C820C4 80241F24 0000102D */ daddu $v0, $zero, $zero +.L80241F28: +/* C820C8 80241F28 8FBF0048 */ lw $ra, 0x48($sp) +/* C820CC 80241F2C 8FB50044 */ lw $s5, 0x44($sp) +/* C820D0 80241F30 8FB40040 */ lw $s4, 0x40($sp) +/* C820D4 80241F34 8FB3003C */ lw $s3, 0x3c($sp) +/* C820D8 80241F38 8FB20038 */ lw $s2, 0x38($sp) +/* C820DC 80241F3C 8FB10034 */ lw $s1, 0x34($sp) +/* C820E0 80241F40 8FB00030 */ lw $s0, 0x30($sp) +/* C820E4 80241F44 03E00008 */ jr $ra +/* C820E8 80241F48 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC.s deleted file mode 100644 index 37d9bf9d26..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403EC -/* C85E9C 802403EC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* C85EA0 802403F0 AFB10034 */ sw $s1, 0x34($sp) -/* C85EA4 802403F4 0080882D */ daddu $s1, $a0, $zero -/* C85EA8 802403F8 AFBF0038 */ sw $ra, 0x38($sp) -/* C85EAC 802403FC AFB00030 */ sw $s0, 0x30($sp) -/* C85EB0 80240400 8E300148 */ lw $s0, 0x148($s1) -/* C85EB4 80240404 0C00EABB */ jal get_npc_unsafe -/* C85EB8 80240408 86040008 */ lh $a0, 8($s0) -/* C85EBC 8024040C 0040282D */ daddu $a1, $v0, $zero -/* C85EC0 80240410 94A2008E */ lhu $v0, 0x8e($a1) -/* C85EC4 80240414 2442FFFF */ addiu $v0, $v0, -1 -/* C85EC8 80240418 A4A2008E */ sh $v0, 0x8e($a1) -/* C85ECC 8024041C 00021400 */ sll $v0, $v0, 0x10 -/* C85ED0 80240420 1C400023 */ bgtz $v0, .L802404B0 -/* C85ED4 80240424 24020004 */ addiu $v0, $zero, 4 -/* C85ED8 80240428 8E0300CC */ lw $v1, 0xcc($s0) -/* C85EDC 8024042C AE02006C */ sw $v0, 0x6c($s0) -/* C85EE0 80240430 8C620000 */ lw $v0, ($v1) -/* C85EE4 80240434 ACA20028 */ sw $v0, 0x28($a1) -/* C85EE8 80240438 9602007A */ lhu $v0, 0x7a($s0) -/* C85EEC 8024043C A4A2008E */ sh $v0, 0x8e($a1) -/* C85EF0 80240440 8E020078 */ lw $v0, 0x78($s0) -/* C85EF4 80240444 28420008 */ slti $v0, $v0, 8 -/* C85EF8 80240448 14400018 */ bnez $v0, .L802404AC -/* C85EFC 8024044C 24020021 */ addiu $v0, $zero, 0x21 -/* C85F00 80240450 24040003 */ addiu $a0, $zero, 3 -/* C85F04 80240454 27A30028 */ addiu $v1, $sp, 0x28 -/* C85F08 80240458 84A700A8 */ lh $a3, 0xa8($a1) -/* C85F0C 8024045C 3C013F80 */ lui $at, 0x3f80 -/* C85F10 80240460 44810000 */ mtc1 $at, $f0 -/* C85F14 80240464 3C014000 */ lui $at, 0x4000 -/* C85F18 80240468 44811000 */ mtc1 $at, $f2 -/* C85F1C 8024046C 3C01C1A0 */ lui $at, 0xc1a0 -/* C85F20 80240470 44812000 */ mtc1 $at, $f4 -/* C85F24 80240474 44873000 */ mtc1 $a3, $f6 -/* C85F28 80240478 00000000 */ nop -/* C85F2C 8024047C 468031A0 */ cvt.s.w $f6, $f6 -/* C85F30 80240480 E7A00010 */ swc1 $f0, 0x10($sp) -/* C85F34 80240484 E7A20014 */ swc1 $f2, 0x14($sp) -/* C85F38 80240488 E7A40018 */ swc1 $f4, 0x18($sp) -/* C85F3C 8024048C 8E020078 */ lw $v0, 0x78($s0) -/* C85F40 80240490 44073000 */ mfc1 $a3, $f6 -/* C85F44 80240494 0000302D */ daddu $a2, $zero, $zero -/* C85F48 80240498 AFA30020 */ sw $v1, 0x20($sp) -/* C85F4C 8024049C 2442FFFF */ addiu $v0, $v0, -1 -/* C85F50 802404A0 0C01BFA4 */ jal fx_emote -/* C85F54 802404A4 AFA2001C */ sw $v0, 0x1c($sp) -/* C85F58 802404A8 24020021 */ addiu $v0, $zero, 0x21 -.L802404AC: -/* C85F5C 802404AC AE220070 */ sw $v0, 0x70($s1) -.L802404B0: -/* C85F60 802404B0 8FBF0038 */ lw $ra, 0x38($sp) -/* C85F64 802404B4 8FB10034 */ lw $s1, 0x34($sp) -/* C85F68 802404B8 8FB00030 */ lw $s0, 0x30($sp) -/* C85F6C 802404BC 03E00008 */ jr $ra -/* C85F70 802404C0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s new file mode 100644 index 0000000000..b1d78022d8 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_802403EC_C85E9C.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403EC_C85E9C +/* C85E9C 802403EC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* C85EA0 802403F0 AFB10034 */ sw $s1, 0x34($sp) +/* C85EA4 802403F4 0080882D */ daddu $s1, $a0, $zero +/* C85EA8 802403F8 AFBF0038 */ sw $ra, 0x38($sp) +/* C85EAC 802403FC AFB00030 */ sw $s0, 0x30($sp) +/* C85EB0 80240400 8E300148 */ lw $s0, 0x148($s1) +/* C85EB4 80240404 0C00EABB */ jal get_npc_unsafe +/* C85EB8 80240408 86040008 */ lh $a0, 8($s0) +/* C85EBC 8024040C 0040282D */ daddu $a1, $v0, $zero +/* C85EC0 80240410 94A2008E */ lhu $v0, 0x8e($a1) +/* C85EC4 80240414 2442FFFF */ addiu $v0, $v0, -1 +/* C85EC8 80240418 A4A2008E */ sh $v0, 0x8e($a1) +/* C85ECC 8024041C 00021400 */ sll $v0, $v0, 0x10 +/* C85ED0 80240420 1C400023 */ bgtz $v0, .L802404B0 +/* C85ED4 80240424 24020004 */ addiu $v0, $zero, 4 +/* C85ED8 80240428 8E0300CC */ lw $v1, 0xcc($s0) +/* C85EDC 8024042C AE02006C */ sw $v0, 0x6c($s0) +/* C85EE0 80240430 8C620000 */ lw $v0, ($v1) +/* C85EE4 80240434 ACA20028 */ sw $v0, 0x28($a1) +/* C85EE8 80240438 9602007A */ lhu $v0, 0x7a($s0) +/* C85EEC 8024043C A4A2008E */ sh $v0, 0x8e($a1) +/* C85EF0 80240440 8E020078 */ lw $v0, 0x78($s0) +/* C85EF4 80240444 28420008 */ slti $v0, $v0, 8 +/* C85EF8 80240448 14400018 */ bnez $v0, .L802404AC +/* C85EFC 8024044C 24020021 */ addiu $v0, $zero, 0x21 +/* C85F00 80240450 24040003 */ addiu $a0, $zero, 3 +/* C85F04 80240454 27A30028 */ addiu $v1, $sp, 0x28 +/* C85F08 80240458 84A700A8 */ lh $a3, 0xa8($a1) +/* C85F0C 8024045C 3C013F80 */ lui $at, 0x3f80 +/* C85F10 80240460 44810000 */ mtc1 $at, $f0 +/* C85F14 80240464 3C014000 */ lui $at, 0x4000 +/* C85F18 80240468 44811000 */ mtc1 $at, $f2 +/* C85F1C 8024046C 3C01C1A0 */ lui $at, 0xc1a0 +/* C85F20 80240470 44812000 */ mtc1 $at, $f4 +/* C85F24 80240474 44873000 */ mtc1 $a3, $f6 +/* C85F28 80240478 00000000 */ nop +/* C85F2C 8024047C 468031A0 */ cvt.s.w $f6, $f6 +/* C85F30 80240480 E7A00010 */ swc1 $f0, 0x10($sp) +/* C85F34 80240484 E7A20014 */ swc1 $f2, 0x14($sp) +/* C85F38 80240488 E7A40018 */ swc1 $f4, 0x18($sp) +/* C85F3C 8024048C 8E020078 */ lw $v0, 0x78($s0) +/* C85F40 80240490 44073000 */ mfc1 $a3, $f6 +/* C85F44 80240494 0000302D */ daddu $a2, $zero, $zero +/* C85F48 80240498 AFA30020 */ sw $v1, 0x20($sp) +/* C85F4C 8024049C 2442FFFF */ addiu $v0, $v0, -1 +/* C85F50 802404A0 0C01BFA4 */ jal fx_emote +/* C85F54 802404A4 AFA2001C */ sw $v0, 0x1c($sp) +/* C85F58 802404A8 24020021 */ addiu $v0, $zero, 0x21 +.L802404AC: +/* C85F5C 802404AC AE220070 */ sw $v0, 0x70($s1) +.L802404B0: +/* C85F60 802404B0 8FBF0038 */ lw $ra, 0x38($sp) +/* C85F64 802404B4 8FB10034 */ lw $s1, 0x34($sp) +/* C85F68 802404B8 8FB00030 */ lw $s0, 0x30($sp) +/* C85F6C 802404BC 03E00008 */ jr $ra +/* C85F70 802404C0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s index 866fa80ace..fc31e9207a 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_8024092C_C863DC.s @@ -90,7 +90,7 @@ glabel func_8024092C_C863DC /* C8651C 80240A6C 8E22006C */ lw $v0, 0x6c($s1) /* C86520 80240A70 14400006 */ bnez $v0, .L80240A8C /* C86524 80240A74 00000000 */ nop -/* C86528 80240A78 0C090146 */ jal func_80240518 +/* C86528 80240A78 0C090146 */ jal func_80240518_C85FC8 /* C8652C 80240A7C 0240202D */ daddu $a0, $s2, $zero /* C86530 80240A80 10400002 */ beqz $v0, .L80240A8C /* C86534 80240A84 2402001E */ addiu $v0, $zero, 0x1e @@ -151,7 +151,7 @@ glabel func_8024092C_C863DC /* C8660C 80240B5C 0280302D */ daddu $a2, $s4, $zero /* C86610 80240B60 080902EE */ j .L80240BB8 /* C86614 80240B64 00000000 */ nop -/* C86618 80240B68 0C0900C4 */ jal func_80240310 +/* C86618 80240B68 0C0900C4 */ jal func_80240310_C85DC0 /* C8661C 80240B6C 0240202D */ daddu $a0, $s2, $zero /* C86620 80240B70 0C0900DF */ jal func_8024037C_C85E2C /* C86624 80240B74 0240202D */ daddu $a0, $s2, $zero @@ -159,13 +159,13 @@ glabel func_8024092C_C863DC /* C8662C 80240B7C 24020020 */ addiu $v0, $zero, 0x20 /* C86630 80240B80 1462000D */ bne $v1, $v0, .L80240BB8 /* C86634 80240B84 00000000 */ nop -/* C86638 80240B88 0C0900FB */ jal func_802403EC +/* C86638 80240B88 0C0900FB */ jal func_802403EC_C85E9C /* C8663C 80240B8C 0240202D */ daddu $a0, $s2, $zero /* C86640 80240B90 8E430070 */ lw $v1, 0x70($s2) /* C86644 80240B94 24020021 */ addiu $v0, $zero, 0x21 /* C86648 80240B98 14620007 */ bne $v1, $v0, .L80240BB8 /* C8664C 80240B9C 00000000 */ nop -/* C86650 80240BA0 0C090131 */ jal func_802404C4 +/* C86650 80240BA0 0C090131 */ jal func_802404C4_C85F74 /* C86654 80240BA4 0240202D */ daddu $a0, $s2, $zero /* C86658 80240BA8 080902EE */ j .L80240BB8 /* C8665C 80240BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48.s deleted file mode 100644 index 3f267fdeb3..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D48 -/* C867F8 80240D48 27BDFF80 */ addiu $sp, $sp, -0x80 -/* C867FC 80240D4C AFBF0064 */ sw $ra, 0x64($sp) -/* C86800 80240D50 AFBE0060 */ sw $fp, 0x60($sp) -/* C86804 80240D54 AFB7005C */ sw $s7, 0x5c($sp) -/* C86808 80240D58 AFB60058 */ sw $s6, 0x58($sp) -/* C8680C 80240D5C AFB50054 */ sw $s5, 0x54($sp) -/* C86810 80240D60 AFB40050 */ sw $s4, 0x50($sp) -/* C86814 80240D64 AFB3004C */ sw $s3, 0x4c($sp) -/* C86818 80240D68 AFB20048 */ sw $s2, 0x48($sp) -/* C8681C 80240D6C AFB10044 */ sw $s1, 0x44($sp) -/* C86820 80240D70 AFB00040 */ sw $s0, 0x40($sp) -/* C86824 80240D74 F7B80078 */ sdc1 $f24, 0x78($sp) -/* C86828 80240D78 F7B60070 */ sdc1 $f22, 0x70($sp) -/* C8682C 80240D7C F7B40068 */ sdc1 $f20, 0x68($sp) -/* C86830 80240D80 AFA40080 */ sw $a0, 0x80($sp) -/* C86834 80240D84 8C960148 */ lw $s6, 0x148($a0) -/* C86838 80240D88 00C0902D */ daddu $s2, $a2, $zero -/* C8683C 80240D8C 86C40008 */ lh $a0, 8($s6) -/* C86840 80240D90 0C00EABB */ jal get_npc_unsafe -/* C86844 80240D94 0000B82D */ daddu $s7, $zero, $zero -/* C86848 80240D98 0040882D */ daddu $s1, $v0, $zero -/* C8684C 80240D9C 9622008E */ lhu $v0, 0x8e($s1) -/* C86850 80240DA0 2442FFFF */ addiu $v0, $v0, -1 -/* C86854 80240DA4 A622008E */ sh $v0, 0x8e($s1) -/* C86858 80240DA8 00021400 */ sll $v0, $v0, 0x10 -/* C8685C 80240DAC 8EC30090 */ lw $v1, 0x90($s6) -/* C86860 80240DB0 00021403 */ sra $v0, $v0, 0x10 -/* C86864 80240DB4 0062182A */ slt $v1, $v1, $v0 -/* C86868 80240DB8 14600005 */ bnez $v1, .L80240DD0 -/* C8686C 80240DBC 02E0F02D */ daddu $fp, $s7, $zero -/* C86870 80240DC0 8EC20000 */ lw $v0, ($s6) -/* C86874 80240DC4 3C031F10 */ lui $v1, 0x1f10 -/* C86878 80240DC8 00431025 */ or $v0, $v0, $v1 -/* C8687C 80240DCC AEC20000 */ sw $v0, ($s6) -.L80240DD0: -/* C86880 80240DD0 8622008E */ lh $v0, 0x8e($s1) -/* C86884 80240DD4 1440025D */ bnez $v0, .L8024174C -/* C86888 80240DD8 00000000 */ nop -/* C8688C 80240DDC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C86890 80240DE0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C86894 80240DE4 0C00A6C9 */ jal clamp_angle -/* C86898 80240DE8 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* C8689C 80240DEC 3C014334 */ lui $at, 0x4334 -/* C868A0 80240DF0 44811000 */ mtc1 $at, $f2 -/* C868A4 80240DF4 00000000 */ nop -/* C868A8 80240DF8 4602003C */ c.lt.s $f0, $f2 -/* C868AC 80240DFC 00000000 */ nop -/* C868B0 80240E00 45000011 */ bc1f .L80240E48 -/* C868B4 80240E04 00000000 */ nop -/* C868B8 80240E08 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C868BC 80240E0C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C868C0 80240E10 3C0142B4 */ lui $at, 0x42b4 -/* C868C4 80240E14 44816000 */ mtc1 $at, $f12 -/* C868C8 80240E18 00031080 */ sll $v0, $v1, 2 -/* C868CC 80240E1C 00431021 */ addu $v0, $v0, $v1 -/* C868D0 80240E20 00021080 */ sll $v0, $v0, 2 -/* C868D4 80240E24 00431023 */ subu $v0, $v0, $v1 -/* C868D8 80240E28 000218C0 */ sll $v1, $v0, 3 -/* C868DC 80240E2C 00431021 */ addu $v0, $v0, $v1 -/* C868E0 80240E30 000210C0 */ sll $v0, $v0, 3 -/* C868E4 80240E34 3C01800B */ lui $at, 0x800b -/* C868E8 80240E38 00220821 */ addu $at, $at, $v0 -/* C868EC 80240E3C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C868F0 80240E40 080903A1 */ j .L80240E84 -/* C868F4 80240E44 460C0301 */ sub.s $f12, $f0, $f12 -.L80240E48: -/* C868F8 80240E48 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* C868FC 80240E4C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* C86900 80240E50 3C0142B4 */ lui $at, 0x42b4 -/* C86904 80240E54 44816000 */ mtc1 $at, $f12 -/* C86908 80240E58 00031080 */ sll $v0, $v1, 2 -/* C8690C 80240E5C 00431021 */ addu $v0, $v0, $v1 -/* C86910 80240E60 00021080 */ sll $v0, $v0, 2 -/* C86914 80240E64 00431023 */ subu $v0, $v0, $v1 -/* C86918 80240E68 000218C0 */ sll $v1, $v0, 3 -/* C8691C 80240E6C 00431021 */ addu $v0, $v0, $v1 -/* C86920 80240E70 000210C0 */ sll $v0, $v0, 3 -/* C86924 80240E74 3C01800B */ lui $at, 0x800b -/* C86928 80240E78 00220821 */ addu $at, $at, $v0 -/* C8692C 80240E7C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* C86930 80240E80 460C0300 */ add.s $f12, $f0, $f12 -.L80240E84: -/* C86934 80240E84 0C00A6C9 */ jal clamp_angle -/* C86938 80240E88 00000000 */ nop -/* C8693C 80240E8C 46000586 */ mov.s $f22, $f0 -/* C86940 80240E90 3C014334 */ lui $at, 0x4334 -/* C86944 80240E94 44816000 */ mtc1 $at, $f12 -/* C86948 80240E98 0C00A6C9 */ jal clamp_angle -/* C8694C 80240E9C 460CB300 */ add.s $f12, $f22, $f12 -/* C86950 80240EA0 8EC20088 */ lw $v0, 0x88($s6) -/* C86954 80240EA4 14400010 */ bnez $v0, .L80240EE8 -/* C86958 80240EA8 46000606 */ mov.s $f24, $f0 -/* C8695C 80240EAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C86960 80240EB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C86964 80240EB4 804300B4 */ lb $v1, 0xb4($v0) -/* C86968 80240EB8 3C014200 */ lui $at, 0x4200 -/* C8696C 80240EBC 4481A000 */ mtc1 $at, $f20 -/* C86970 80240EC0 10600016 */ beqz $v1, .L80240F1C -/* C86974 80240EC4 24020001 */ addiu $v0, $zero, 1 -/* C86978 80240EC8 3C0142C8 */ lui $at, 0x42c8 -/* C8697C 80240ECC 4481A000 */ mtc1 $at, $f20 -/* C86980 80240ED0 14620013 */ bne $v1, $v0, .L80240F20 -/* C86984 80240ED4 26300038 */ addiu $s0, $s1, 0x38 -/* C86988 80240ED8 3C0142B4 */ lui $at, 0x42b4 -/* C8698C 80240EDC 4481A000 */ mtc1 $at, $f20 -/* C86990 80240EE0 080903C9 */ j .L80240F24 -/* C86994 80240EE4 0200202D */ daddu $a0, $s0, $zero -.L80240EE8: -/* C86998 80240EE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C8699C 80240EEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C869A0 80240EF0 804300B4 */ lb $v1, 0xb4($v0) -/* C869A4 80240EF4 3C014218 */ lui $at, 0x4218 -/* C869A8 80240EF8 4481A000 */ mtc1 $at, $f20 -/* C869AC 80240EFC 10600007 */ beqz $v1, .L80240F1C -/* C869B0 80240F00 24020001 */ addiu $v0, $zero, 1 -/* C869B4 80240F04 3C0142B4 */ lui $at, 0x42b4 -/* C869B8 80240F08 4481A000 */ mtc1 $at, $f20 -/* C869BC 80240F0C 14620004 */ bne $v1, $v0, .L80240F20 -/* C869C0 80240F10 26300038 */ addiu $s0, $s1, 0x38 -/* C869C4 80240F14 3C014296 */ lui $at, 0x4296 -/* C869C8 80240F18 4481A000 */ mtc1 $at, $f20 -.L80240F1C: -/* C869CC 80240F1C 26300038 */ addiu $s0, $s1, 0x38 -.L80240F20: -/* C869D0 80240F20 0200202D */ daddu $a0, $s0, $zero -.L80240F24: -/* C869D4 80240F24 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* C869D8 80240F28 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* C869DC 80240F2C 4407C000 */ mfc1 $a3, $f24 -/* C869E0 80240F30 862200A6 */ lh $v0, 0xa6($s1) -/* C869E4 80240F34 8EA30000 */ lw $v1, ($s5) -/* C869E8 80240F38 44824000 */ mtc1 $v0, $f8 -/* C869EC 80240F3C 00000000 */ nop -/* C869F0 80240F40 46804220 */ cvt.s.w $f8, $f8 -/* C869F4 80240F44 C4600028 */ lwc1 $f0, 0x28($v1) -/* C869F8 80240F48 44064000 */ mfc1 $a2, $f8 -/* C869FC 80240F4C 26330040 */ addiu $s3, $s1, 0x40 -/* C86A00 80240F50 E6200038 */ swc1 $f0, 0x38($s1) -/* C86A04 80240F54 C4600030 */ lwc1 $f0, 0x30($v1) -/* C86A08 80240F58 0260282D */ daddu $a1, $s3, $zero -/* C86A0C 80240F5C 0C00A7E7 */ jal add_vec2D_polar -/* C86A10 80240F60 E6200040 */ swc1 $f0, 0x40($s1) -/* C86A14 80240F64 862200A6 */ lh $v0, 0xa6($s1) -/* C86A18 80240F68 44820000 */ mtc1 $v0, $f0 -/* C86A1C 80240F6C 00000000 */ nop -/* C86A20 80240F70 46800020 */ cvt.s.w $f0, $f0 -/* C86A24 80240F74 4600A000 */ add.s $f0, $f20, $f0 -/* C86A28 80240F78 4406B000 */ mfc1 $a2, $f22 -/* C86A2C 80240F7C 44050000 */ mfc1 $a1, $f0 -/* C86A30 80240F80 0C00EA95 */ jal npc_move_heading -/* C86A34 80240F84 0220202D */ daddu $a0, $s1, $zero -/* C86A38 80240F88 8EC20088 */ lw $v0, 0x88($s6) -/* C86A3C 80240F8C 1440005D */ bnez $v0, .L80241104 -/* C86A40 80240F90 00000000 */ nop -/* C86A44 80240F94 C6200038 */ lwc1 $f0, 0x38($s1) -/* C86A48 80240F98 3C018024 */ lui $at, 0x8024 -/* C86A4C 80240F9C D4246538 */ ldc1 $f4, 0x6538($at) -/* C86A50 80240FA0 46000021 */ cvt.d.s $f0, $f0 -/* C86A54 80240FA4 4620203C */ c.lt.d $f4, $f0 -/* C86A58 80240FA8 00000000 */ nop -/* C86A5C 80240FAC 45000005 */ bc1f .L80240FC4 -/* C86A60 80240FB0 00000000 */ nop -/* C86A64 80240FB4 3C0143BE */ lui $at, 0x43be -/* C86A68 80240FB8 44810000 */ mtc1 $at, $f0 -/* C86A6C 80240FBC 00000000 */ nop -/* C86A70 80240FC0 E6200038 */ swc1 $f0, 0x38($s1) -.L80240FC4: -/* C86A74 80240FC4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C86A78 80240FC8 3C018024 */ lui $at, 0x8024 -/* C86A7C 80240FCC D4226540 */ ldc1 $f2, 0x6540($at) -/* C86A80 80240FD0 46000021 */ cvt.d.s $f0, $f0 -/* C86A84 80240FD4 4622003C */ c.lt.d $f0, $f2 -/* C86A88 80240FD8 00000000 */ nop -/* C86A8C 80240FDC 45000005 */ bc1f .L80240FF4 -/* C86A90 80240FE0 00000000 */ nop -/* C86A94 80240FE4 3C01C3BE */ lui $at, 0xc3be -/* C86A98 80240FE8 44810000 */ mtc1 $at, $f0 -/* C86A9C 80240FEC 00000000 */ nop -/* C86AA0 80240FF0 E6200038 */ swc1 $f0, 0x38($s1) -.L80240FF4: -/* C86AA4 80240FF4 C6200040 */ lwc1 $f0, 0x40($s1) -/* C86AA8 80240FF8 46000021 */ cvt.d.s $f0, $f0 -/* C86AAC 80240FFC 4620203C */ c.lt.d $f4, $f0 -/* C86AB0 80241000 00000000 */ nop -/* C86AB4 80241004 45000005 */ bc1f .L8024101C -/* C86AB8 80241008 00000000 */ nop -/* C86ABC 8024100C 3C0143BE */ lui $at, 0x43be -/* C86AC0 80241010 44810000 */ mtc1 $at, $f0 -/* C86AC4 80241014 00000000 */ nop -/* C86AC8 80241018 E6200040 */ swc1 $f0, 0x40($s1) -.L8024101C: -/* C86ACC 8024101C C6200040 */ lwc1 $f0, 0x40($s1) -/* C86AD0 80241020 46000021 */ cvt.d.s $f0, $f0 -/* C86AD4 80241024 4622003C */ c.lt.d $f0, $f2 -/* C86AD8 80241028 00000000 */ nop -/* C86ADC 8024102C 45000005 */ bc1f .L80241044 -/* C86AE0 80241030 00000000 */ nop -/* C86AE4 80241034 3C01C3BE */ lui $at, 0xc3be -/* C86AE8 80241038 44810000 */ mtc1 $at, $f0 -/* C86AEC 8024103C 00000000 */ nop -/* C86AF0 80241040 E6200040 */ swc1 $f0, 0x40($s1) -.L80241044: -/* C86AF4 80241044 C6220038 */ lwc1 $f2, 0x38($s1) -/* C86AF8 80241048 46021082 */ mul.s $f2, $f2, $f2 -/* C86AFC 8024104C 00000000 */ nop -/* C86B00 80241050 C6200040 */ lwc1 $f0, 0x40($s1) -/* C86B04 80241054 46000002 */ mul.s $f0, $f0, $f0 -/* C86B08 80241058 00000000 */ nop -/* C86B0C 8024105C 46001300 */ add.s $f12, $f2, $f0 -/* C86B10 80241060 46006004 */ sqrt.s $f0, $f12 -/* C86B14 80241064 46000032 */ c.eq.s $f0, $f0 -/* C86B18 80241068 00000000 */ nop -/* C86B1C 8024106C 45010003 */ bc1t .L8024107C -/* C86B20 80241070 00000000 */ nop -/* C86B24 80241074 0C0187BC */ jal sqrtf -/* C86B28 80241078 00000000 */ nop -.L8024107C: -/* C86B2C 8024107C 8E260038 */ lw $a2, 0x38($s1) -/* C86B30 80241080 8E270040 */ lw $a3, 0x40($s1) -/* C86B34 80241084 4480A000 */ mtc1 $zero, $f20 -/* C86B38 80241088 E7A00038 */ swc1 $f0, 0x38($sp) -/* C86B3C 8024108C 4600A306 */ mov.s $f12, $f20 -/* C86B40 80241090 0C00A720 */ jal atan2 -/* C86B44 80241094 4600A386 */ mov.s $f14, $f20 -/* C86B48 80241098 46000586 */ mov.s $f22, $f0 -/* C86B4C 8024109C C7A20038 */ lwc1 $f2, 0x38($sp) -/* C86B50 802410A0 3C018024 */ lui $at, 0x8024 -/* C86B54 802410A4 D4206548 */ ldc1 $f0, 0x6548($at) -/* C86B58 802410A8 460010A1 */ cvt.d.s $f2, $f2 -/* C86B5C 802410AC 4620103C */ c.lt.d $f2, $f0 -/* C86B60 802410B0 00000000 */ nop -/* C86B64 802410B4 45000004 */ bc1f .L802410C8 -/* C86B68 802410B8 0200202D */ daddu $a0, $s0, $zero -/* C86B6C 802410BC 3C064398 */ lui $a2, 0x4398 -/* C86B70 802410C0 0809043A */ j .L802410E8 -/* C86B74 802410C4 34C68000 */ ori $a2, $a2, 0x8000 -.L802410C8: -/* C86B78 802410C8 3C018024 */ lui $at, 0x8024 -/* C86B7C 802410CC D4206550 */ ldc1 $f0, 0x6550($at) -/* C86B80 802410D0 4622003C */ c.lt.d $f0, $f2 -/* C86B84 802410D4 00000000 */ nop -/* C86B88 802410D8 450000FA */ bc1f .L802414C4 -/* C86B8C 802410DC 00000000 */ nop -/* C86B90 802410E0 3C0643BB */ lui $a2, 0x43bb -/* C86B94 802410E4 34C68000 */ ori $a2, $a2, 0x8000 -.L802410E8: -/* C86B98 802410E8 4407B000 */ mfc1 $a3, $f22 -/* C86B9C 802410EC 0260282D */ daddu $a1, $s3, $zero -/* C86BA0 802410F0 E6340038 */ swc1 $f20, 0x38($s1) -/* C86BA4 802410F4 0C00A7E7 */ jal add_vec2D_polar -/* C86BA8 802410F8 E6340040 */ swc1 $f20, 0x40($s1) -/* C86BAC 802410FC 08090531 */ j .L802414C4 -/* C86BB0 80241100 00000000 */ nop -.L80241104: -/* C86BB4 80241104 8E220000 */ lw $v0, ($s1) -/* C86BB8 80241108 30420040 */ andi $v0, $v0, 0x40 -/* C86BBC 8024110C 144000B0 */ bnez $v0, .L802413D0 -/* C86BC0 80241110 27A50020 */ addiu $a1, $sp, 0x20 -/* C86BC4 80241114 27B40020 */ addiu $s4, $sp, 0x20 -/* C86BC8 80241118 0280282D */ daddu $a1, $s4, $zero -/* C86BCC 8024111C 27B30024 */ addiu $s3, $sp, 0x24 -/* C86BD0 80241120 8EA20000 */ lw $v0, ($s5) -/* C86BD4 80241124 3C014032 */ lui $at, 0x4032 -/* C86BD8 80241128 44811800 */ mtc1 $at, $f3 -/* C86BDC 8024112C 44801000 */ mtc1 $zero, $f2 -/* C86BE0 80241130 C440002C */ lwc1 $f0, 0x2c($v0) -/* C86BE4 80241134 C4460028 */ lwc1 $f6, 0x28($v0) -/* C86BE8 80241138 C4440030 */ lwc1 $f4, 0x30($v0) -/* C86BEC 8024113C 46000021 */ cvt.d.s $f0, $f0 -/* C86BF0 80241140 46220000 */ add.d $f0, $f0, $f2 -/* C86BF4 80241144 E7A60020 */ swc1 $f6, 0x20($sp) -/* C86BF8 80241148 E7A40028 */ swc1 $f4, 0x28($sp) -/* C86BFC 8024114C 46200020 */ cvt.s.d $f0, $f0 -/* C86C00 80241150 E7A00024 */ swc1 $f0, 0x24($sp) -/* C86C04 80241154 E7B40010 */ swc1 $f20, 0x10($sp) -/* C86C08 80241158 E7B60014 */ swc1 $f22, 0x14($sp) -/* C86C0C 8024115C 862200A8 */ lh $v0, 0xa8($s1) -/* C86C10 80241160 0260302D */ daddu $a2, $s3, $zero -/* C86C14 80241164 44820000 */ mtc1 $v0, $f0 -/* C86C18 80241168 00000000 */ nop -/* C86C1C 8024116C 46800020 */ cvt.s.w $f0, $f0 -/* C86C20 80241170 E7A00018 */ swc1 $f0, 0x18($sp) -/* C86C24 80241174 862200A6 */ lh $v0, 0xa6($s1) -/* C86C28 80241178 27B00028 */ addiu $s0, $sp, 0x28 -/* C86C2C 8024117C 44820000 */ mtc1 $v0, $f0 -/* C86C30 80241180 00000000 */ nop -/* C86C34 80241184 46800020 */ cvt.s.w $f0, $f0 -/* C86C38 80241188 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C86C3C 8024118C 8E240080 */ lw $a0, 0x80($s1) -/* C86C40 80241190 0C037711 */ jal func_800DDC44 -/* C86C44 80241194 0200382D */ daddu $a3, $s0, $zero -/* C86C48 80241198 104000CA */ beqz $v0, .L802414C4 -/* C86C4C 8024119C 0280282D */ daddu $a1, $s4, $zero -/* C86C50 802411A0 8EA20000 */ lw $v0, ($s5) -/* C86C54 802411A4 3C018024 */ lui $at, 0x8024 -/* C86C58 802411A8 D4226558 */ ldc1 $f2, 0x6558($at) -/* C86C5C 802411AC C440002C */ lwc1 $f0, 0x2c($v0) -/* C86C60 802411B0 C4460028 */ lwc1 $f6, 0x28($v0) -/* C86C64 802411B4 C4440030 */ lwc1 $f4, 0x30($v0) -/* C86C68 802411B8 46000021 */ cvt.d.s $f0, $f0 -/* C86C6C 802411BC 46220000 */ add.d $f0, $f0, $f2 -/* C86C70 802411C0 E7A60020 */ swc1 $f6, 0x20($sp) -/* C86C74 802411C4 E7A40028 */ swc1 $f4, 0x28($sp) -/* C86C78 802411C8 46200020 */ cvt.s.d $f0, $f0 -/* C86C7C 802411CC E7A00024 */ swc1 $f0, 0x24($sp) -/* C86C80 802411D0 E7B40010 */ swc1 $f20, 0x10($sp) -/* C86C84 802411D4 E7B60014 */ swc1 $f22, 0x14($sp) -/* C86C88 802411D8 862200A8 */ lh $v0, 0xa8($s1) -/* C86C8C 802411DC 44820000 */ mtc1 $v0, $f0 -/* C86C90 802411E0 00000000 */ nop -/* C86C94 802411E4 46800020 */ cvt.s.w $f0, $f0 -/* C86C98 802411E8 E7A00018 */ swc1 $f0, 0x18($sp) -/* C86C9C 802411EC 862200A6 */ lh $v0, 0xa6($s1) -/* C86CA0 802411F0 0260302D */ daddu $a2, $s3, $zero -/* C86CA4 802411F4 44820000 */ mtc1 $v0, $f0 -/* C86CA8 802411F8 00000000 */ nop -/* C86CAC 802411FC 46800020 */ cvt.s.w $f0, $f0 -/* C86CB0 80241200 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C86CB4 80241204 8E240080 */ lw $a0, 0x80($s1) -/* C86CB8 80241208 0C037711 */ jal func_800DDC44 -/* C86CBC 8024120C 0200382D */ daddu $a3, $s0, $zero -/* C86CC0 80241210 27A5002C */ addiu $a1, $sp, 0x2c -/* C86CC4 80241214 27A60030 */ addiu $a2, $sp, 0x30 -/* C86CC8 80241218 27A70034 */ addiu $a3, $sp, 0x34 -/* C86CCC 8024121C 27A30038 */ addiu $v1, $sp, 0x38 -/* C86CD0 80241220 C6220038 */ lwc1 $f2, 0x38($s1) -/* C86CD4 80241224 C620003C */ lwc1 $f0, 0x3c($s1) -/* C86CD8 80241228 3C014348 */ lui $at, 0x4348 -/* C86CDC 8024122C 44813000 */ mtc1 $at, $f6 -/* C86CE0 80241230 46000021 */ cvt.d.s $f0, $f0 -/* C86CE4 80241234 E7A2002C */ swc1 $f2, 0x2c($sp) -/* C86CE8 80241238 3C014059 */ lui $at, 0x4059 -/* C86CEC 8024123C 44811800 */ mtc1 $at, $f3 -/* C86CF0 80241240 44801000 */ mtc1 $zero, $f2 -/* C86CF4 80241244 C6240040 */ lwc1 $f4, 0x40($s1) -/* C86CF8 80241248 46220000 */ add.d $f0, $f0, $f2 -/* C86CFC 8024124C E7A60038 */ swc1 $f6, 0x38($sp) -/* C86D00 80241250 E7A40034 */ swc1 $f4, 0x34($sp) -/* C86D04 80241254 46200020 */ cvt.s.d $f0, $f0 -/* C86D08 80241258 E7A00030 */ swc1 $f0, 0x30($sp) -/* C86D0C 8024125C AFA30010 */ sw $v1, 0x10($sp) -/* C86D10 80241260 8E240080 */ lw $a0, 0x80($s1) -/* C86D14 80241264 0C0372DF */ jal func_800DCB7C -/* C86D18 80241268 0040802D */ daddu $s0, $v0, $zero -/* C86D1C 8024126C 1600001C */ bnez $s0, .L802412E0 -/* C86D20 80241270 00000000 */ nop -/* C86D24 80241274 1040001A */ beqz $v0, .L802412E0 -/* C86D28 80241278 00000000 */ nop -/* C86D2C 8024127C C7A20038 */ lwc1 $f2, 0x38($sp) -/* C86D30 80241280 3C014054 */ lui $at, 0x4054 -/* C86D34 80241284 44810800 */ mtc1 $at, $f1 -/* C86D38 80241288 44800000 */ mtc1 $zero, $f0 -/* C86D3C 8024128C 460010A1 */ cvt.d.s $f2, $f2 -/* C86D40 80241290 4622003C */ c.lt.d $f0, $f2 -/* C86D44 80241294 00000000 */ nop -/* C86D48 80241298 45000011 */ bc1f .L802412E0 -/* C86D4C 8024129C 00000000 */ nop -/* C86D50 802412A0 3C01405E */ lui $at, 0x405e -/* C86D54 802412A4 44810800 */ mtc1 $at, $f1 -/* C86D58 802412A8 44800000 */ mtc1 $zero, $f0 -/* C86D5C 802412AC 00000000 */ nop -/* C86D60 802412B0 4620103C */ c.lt.d $f2, $f0 -/* C86D64 802412B4 00000000 */ nop -/* C86D68 802412B8 45000009 */ bc1f .L802412E0 -/* C86D6C 802412BC 00000000 */ nop -/* C86D70 802412C0 C622003C */ lwc1 $f2, 0x3c($s1) -/* C86D74 802412C4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* C86D78 802412C8 46001032 */ c.eq.s $f2, $f0 -/* C86D7C 802412CC 00000000 */ nop -/* C86D80 802412D0 45010003 */ bc1t .L802412E0 -/* C86D84 802412D4 00000000 */ nop -/* C86D88 802412D8 08090531 */ j .L802414C4 -/* C86D8C 802412DC 241E0001 */ addiu $fp, $zero, 1 -.L802412E0: -/* C86D90 802412E0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* C86D94 802412E4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* C86D98 802412E8 8E020000 */ lw $v0, ($s0) -/* C86D9C 802412EC 3C014024 */ lui $at, 0x4024 -/* C86DA0 802412F0 44811800 */ mtc1 $at, $f3 -/* C86DA4 802412F4 44801000 */ mtc1 $zero, $f2 -/* C86DA8 802412F8 C440002C */ lwc1 $f0, 0x2c($v0) -/* C86DAC 802412FC C4460028 */ lwc1 $f6, 0x28($v0) -/* C86DB0 80241300 C4440030 */ lwc1 $f4, 0x30($v0) -/* C86DB4 80241304 46000021 */ cvt.d.s $f0, $f0 -/* C86DB8 80241308 46220000 */ add.d $f0, $f0, $f2 -/* C86DBC 8024130C E7A60020 */ swc1 $f6, 0x20($sp) -/* C86DC0 80241310 E7A40028 */ swc1 $f4, 0x28($sp) -/* C86DC4 80241314 46200020 */ cvt.s.d $f0, $f0 -/* C86DC8 80241318 E7A00024 */ swc1 $f0, 0x24($sp) -/* C86DCC 8024131C E7B40010 */ swc1 $f20, 0x10($sp) -/* C86DD0 80241320 E7B60014 */ swc1 $f22, 0x14($sp) -/* C86DD4 80241324 862200A8 */ lh $v0, 0xa8($s1) -/* C86DD8 80241328 27A50020 */ addiu $a1, $sp, 0x20 -/* C86DDC 8024132C 44820000 */ mtc1 $v0, $f0 -/* C86DE0 80241330 00000000 */ nop -/* C86DE4 80241334 46800020 */ cvt.s.w $f0, $f0 -/* C86DE8 80241338 E7A00018 */ swc1 $f0, 0x18($sp) -/* C86DEC 8024133C 862200A6 */ lh $v0, 0xa6($s1) -/* C86DF0 80241340 27A60024 */ addiu $a2, $sp, 0x24 -/* C86DF4 80241344 44820000 */ mtc1 $v0, $f0 -/* C86DF8 80241348 00000000 */ nop -/* C86DFC 8024134C 46800020 */ cvt.s.w $f0, $f0 -/* C86E00 80241350 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C86E04 80241354 8E240080 */ lw $a0, 0x80($s1) -/* C86E08 80241358 0C037711 */ jal func_800DDC44 -/* C86E0C 8024135C 27A70028 */ addiu $a3, $sp, 0x28 -/* C86E10 80241360 8FA60020 */ lw $a2, 0x20($sp) -/* C86E14 80241364 8E020000 */ lw $v0, ($s0) -/* C86E18 80241368 8FA70028 */ lw $a3, 0x28($sp) -/* C86E1C 8024136C C44C0028 */ lwc1 $f12, 0x28($v0) -/* C86E20 80241370 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C86E24 80241374 0C00A7B5 */ jal dist2D -/* C86E28 80241378 24170001 */ addiu $s7, $zero, 1 -/* C86E2C 8024137C 46000506 */ mov.s $f20, $f0 -/* C86E30 80241380 8E030000 */ lw $v1, ($s0) -/* C86E34 80241384 862200A6 */ lh $v0, 0xa6($s1) -/* C86E38 80241388 4407C000 */ mfc1 $a3, $f24 -/* C86E3C 8024138C 44824000 */ mtc1 $v0, $f8 -/* C86E40 80241390 00000000 */ nop -/* C86E44 80241394 46804220 */ cvt.s.w $f8, $f8 -/* C86E48 80241398 C4600028 */ lwc1 $f0, 0x28($v1) -/* C86E4C 8024139C 44064000 */ mfc1 $a2, $f8 -/* C86E50 802413A0 26240038 */ addiu $a0, $s1, 0x38 -/* C86E54 802413A4 E6200038 */ swc1 $f0, 0x38($s1) -/* C86E58 802413A8 C4600030 */ lwc1 $f0, 0x30($v1) -/* C86E5C 802413AC 26250040 */ addiu $a1, $s1, 0x40 -/* C86E60 802413B0 0C00A7E7 */ jal add_vec2D_polar -/* C86E64 802413B4 E6200040 */ swc1 $f0, 0x40($s1) -/* C86E68 802413B8 862200A6 */ lh $v0, 0xa6($s1) -/* C86E6C 802413BC 44820000 */ mtc1 $v0, $f0 -/* C86E70 802413C0 00000000 */ nop -/* C86E74 802413C4 46800020 */ cvt.s.w $f0, $f0 -/* C86E78 802413C8 0809052D */ j .L802414B4 -/* C86E7C 802413CC 4600A500 */ add.s $f20, $f20, $f0 -.L802413D0: -/* C86E80 802413D0 8EA20000 */ lw $v0, ($s5) -/* C86E84 802413D4 3C014032 */ lui $at, 0x4032 -/* C86E88 802413D8 44811800 */ mtc1 $at, $f3 -/* C86E8C 802413DC 44801000 */ mtc1 $zero, $f2 -/* C86E90 802413E0 C440002C */ lwc1 $f0, 0x2c($v0) -/* C86E94 802413E4 C4460028 */ lwc1 $f6, 0x28($v0) -/* C86E98 802413E8 C4440030 */ lwc1 $f4, 0x30($v0) -/* C86E9C 802413EC 46000021 */ cvt.d.s $f0, $f0 -/* C86EA0 802413F0 46220000 */ add.d $f0, $f0, $f2 -/* C86EA4 802413F4 E7A60020 */ swc1 $f6, 0x20($sp) -/* C86EA8 802413F8 E7A40028 */ swc1 $f4, 0x28($sp) -/* C86EAC 802413FC 46200020 */ cvt.s.d $f0, $f0 -/* C86EB0 80241400 E7A00024 */ swc1 $f0, 0x24($sp) -/* C86EB4 80241404 E7B40010 */ swc1 $f20, 0x10($sp) -/* C86EB8 80241408 E7B60014 */ swc1 $f22, 0x14($sp) -/* C86EBC 8024140C 862200A8 */ lh $v0, 0xa8($s1) -/* C86EC0 80241410 44820000 */ mtc1 $v0, $f0 -/* C86EC4 80241414 00000000 */ nop -/* C86EC8 80241418 46800020 */ cvt.s.w $f0, $f0 -/* C86ECC 8024141C E7A00018 */ swc1 $f0, 0x18($sp) -/* C86ED0 80241420 862200A6 */ lh $v0, 0xa6($s1) -/* C86ED4 80241424 27A60024 */ addiu $a2, $sp, 0x24 -/* C86ED8 80241428 44820000 */ mtc1 $v0, $f0 -/* C86EDC 8024142C 00000000 */ nop -/* C86EE0 80241430 46800020 */ cvt.s.w $f0, $f0 -/* C86EE4 80241434 E7A0001C */ swc1 $f0, 0x1c($sp) -/* C86EE8 80241438 8E240080 */ lw $a0, 0x80($s1) -/* C86EEC 8024143C 0C037711 */ jal func_800DDC44 -/* C86EF0 80241440 27A70028 */ addiu $a3, $sp, 0x28 -/* C86EF4 80241444 1040001F */ beqz $v0, .L802414C4 -/* C86EF8 80241448 00000000 */ nop -/* C86EFC 8024144C 8FA60020 */ lw $a2, 0x20($sp) -/* C86F00 80241450 8EA20000 */ lw $v0, ($s5) -/* C86F04 80241454 8FA70028 */ lw $a3, 0x28($sp) -/* C86F08 80241458 C44C0028 */ lwc1 $f12, 0x28($v0) -/* C86F0C 8024145C 0C00A7B5 */ jal dist2D -/* C86F10 80241460 C44E0030 */ lwc1 $f14, 0x30($v0) -/* C86F14 80241464 46000506 */ mov.s $f20, $f0 -/* C86F18 80241468 8EA30000 */ lw $v1, ($s5) -/* C86F1C 8024146C 862200A6 */ lh $v0, 0xa6($s1) -/* C86F20 80241470 4407C000 */ mfc1 $a3, $f24 -/* C86F24 80241474 44824000 */ mtc1 $v0, $f8 -/* C86F28 80241478 00000000 */ nop -/* C86F2C 8024147C 46804220 */ cvt.s.w $f8, $f8 -/* C86F30 80241480 C4600028 */ lwc1 $f0, 0x28($v1) -/* C86F34 80241484 44064000 */ mfc1 $a2, $f8 -/* C86F38 80241488 0200202D */ daddu $a0, $s0, $zero -/* C86F3C 8024148C E6200038 */ swc1 $f0, 0x38($s1) -/* C86F40 80241490 C4600030 */ lwc1 $f0, 0x30($v1) -/* C86F44 80241494 0260282D */ daddu $a1, $s3, $zero -/* C86F48 80241498 0C00A7E7 */ jal add_vec2D_polar -/* C86F4C 8024149C E6200040 */ swc1 $f0, 0x40($s1) -/* C86F50 802414A0 862200A6 */ lh $v0, 0xa6($s1) -/* C86F54 802414A4 44820000 */ mtc1 $v0, $f0 -/* C86F58 802414A8 00000000 */ nop -/* C86F5C 802414AC 46800020 */ cvt.s.w $f0, $f0 -/* C86F60 802414B0 4600A500 */ add.s $f20, $f20, $f0 -.L802414B4: -/* C86F64 802414B4 4406B000 */ mfc1 $a2, $f22 -/* C86F68 802414B8 4405A000 */ mfc1 $a1, $f20 -/* C86F6C 802414BC 0C00EA95 */ jal npc_move_heading -/* C86F70 802414C0 0220202D */ daddu $a0, $s1, $zero -.L802414C4: -/* C86F74 802414C4 C6400008 */ lwc1 $f0, 8($s2) -/* C86F78 802414C8 46800020 */ cvt.s.w $f0, $f0 -/* C86F7C 802414CC 44050000 */ mfc1 $a1, $f0 -/* C86F80 802414D0 C640000C */ lwc1 $f0, 0xc($s2) -/* C86F84 802414D4 46800020 */ cvt.s.w $f0, $f0 -/* C86F88 802414D8 44060000 */ mfc1 $a2, $f0 -/* C86F8C 802414DC C6200040 */ lwc1 $f0, 0x40($s1) -/* C86F90 802414E0 26300038 */ addiu $s0, $s1, 0x38 -/* C86F94 802414E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C86F98 802414E8 C6400010 */ lwc1 $f0, 0x10($s2) -/* C86F9C 802414EC 46800020 */ cvt.s.w $f0, $f0 -/* C86FA0 802414F0 E7A00014 */ swc1 $f0, 0x14($sp) -/* C86FA4 802414F4 C6400014 */ lwc1 $f0, 0x14($s2) -/* C86FA8 802414F8 46800020 */ cvt.s.w $f0, $f0 -/* C86FAC 802414FC E7A00018 */ swc1 $f0, 0x18($sp) -/* C86FB0 80241500 8E440004 */ lw $a0, 4($s2) -/* C86FB4 80241504 8E270038 */ lw $a3, 0x38($s1) -/* C86FB8 80241508 0C0123F5 */ jal is_point_within_region -/* C86FBC 8024150C 26330040 */ addiu $s3, $s1, 0x40 -/* C86FC0 80241510 1040005A */ beqz $v0, .L8024167C -/* C86FC4 80241514 00000000 */ nop -/* C86FC8 80241518 8E430004 */ lw $v1, 4($s2) -/* C86FCC 8024151C 10600005 */ beqz $v1, .L80241534 -/* C86FD0 80241520 24020001 */ addiu $v0, $zero, 1 -/* C86FD4 80241524 10620029 */ beq $v1, $v0, .L802415CC -/* C86FD8 80241528 00000000 */ nop -/* C86FDC 8024152C 0809059F */ j .L8024167C -/* C86FE0 80241530 00000000 */ nop -.L80241534: -/* C86FE4 80241534 C6480008 */ lwc1 $f8, 8($s2) -/* C86FE8 80241538 46804220 */ cvt.s.w $f8, $f8 -/* C86FEC 8024153C 44064000 */ mfc1 $a2, $f8 -/* C86FF0 80241540 C648000C */ lwc1 $f8, 0xc($s2) -/* C86FF4 80241544 46804220 */ cvt.s.w $f8, $f8 -/* C86FF8 80241548 C62C0038 */ lwc1 $f12, 0x38($s1) -/* C86FFC 8024154C C62E0040 */ lwc1 $f14, 0x40($s1) -/* C87000 80241550 44074000 */ mfc1 $a3, $f8 -/* C87004 80241554 0C00A7B5 */ jal dist2D -/* C87008 80241558 00000000 */ nop -/* C8700C 8024155C C6420010 */ lwc1 $f2, 0x10($s2) -/* C87010 80241560 468010A0 */ cvt.s.w $f2, $f2 -/* C87014 80241564 4600103C */ c.lt.s $f2, $f0 -/* C87018 80241568 00000000 */ nop -/* C8701C 8024156C 45000043 */ bc1f .L8024167C -/* C87020 80241570 E7A00038 */ swc1 $f0, 0x38($sp) -/* C87024 80241574 C64C0008 */ lwc1 $f12, 8($s2) -/* C87028 80241578 46806320 */ cvt.s.w $f12, $f12 -/* C8702C 8024157C 8E260038 */ lw $a2, 0x38($s1) -/* C87030 80241580 8E270040 */ lw $a3, 0x40($s1) -/* C87034 80241584 C64E000C */ lwc1 $f14, 0xc($s2) -/* C87038 80241588 0C00A720 */ jal atan2 -/* C8703C 8024158C 468073A0 */ cvt.s.w $f14, $f14 -/* C87040 80241590 0200202D */ daddu $a0, $s0, $zero -/* C87044 80241594 44070000 */ mfc1 $a3, $f0 -/* C87048 80241598 C6400008 */ lwc1 $f0, 8($s2) -/* C8704C 8024159C 46800020 */ cvt.s.w $f0, $f0 -/* C87050 802415A0 E6200038 */ swc1 $f0, 0x38($s1) -/* C87054 802415A4 C640000C */ lwc1 $f0, 0xc($s2) -/* C87058 802415A8 46800020 */ cvt.s.w $f0, $f0 -/* C8705C 802415AC E6200040 */ swc1 $f0, 0x40($s1) -/* C87060 802415B0 C6480010 */ lwc1 $f8, 0x10($s2) -/* C87064 802415B4 46804220 */ cvt.s.w $f8, $f8 -/* C87068 802415B8 44064000 */ mfc1 $a2, $f8 -/* C8706C 802415BC 0C00A7E7 */ jal add_vec2D_polar -/* C87070 802415C0 0260282D */ daddu $a1, $s3, $zero -/* C87074 802415C4 0809059F */ j .L8024167C -/* C87078 802415C8 00000000 */ nop -.L802415CC: -/* C8707C 802415CC 8E420008 */ lw $v0, 8($s2) -/* C87080 802415D0 8E430010 */ lw $v1, 0x10($s2) -/* C87084 802415D4 C6200038 */ lwc1 $f0, 0x38($s1) -/* C87088 802415D8 00431021 */ addu $v0, $v0, $v1 -/* C8708C 802415DC 44821000 */ mtc1 $v0, $f2 -/* C87090 802415E0 00000000 */ nop -/* C87094 802415E4 468010A0 */ cvt.s.w $f2, $f2 -/* C87098 802415E8 4600103C */ c.lt.s $f2, $f0 -/* C8709C 802415EC 00000000 */ nop -/* C870A0 802415F0 45030001 */ bc1tl .L802415F8 -/* C870A4 802415F4 E6220038 */ swc1 $f2, 0x38($s1) -.L802415F8: -/* C870A8 802415F8 8E420008 */ lw $v0, 8($s2) -/* C870AC 802415FC 8E430010 */ lw $v1, 0x10($s2) -/* C870B0 80241600 C6200038 */ lwc1 $f0, 0x38($s1) -/* C870B4 80241604 00431023 */ subu $v0, $v0, $v1 -/* C870B8 80241608 44821000 */ mtc1 $v0, $f2 -/* C870BC 8024160C 00000000 */ nop -/* C870C0 80241610 468010A0 */ cvt.s.w $f2, $f2 -/* C870C4 80241614 4602003C */ c.lt.s $f0, $f2 -/* C870C8 80241618 00000000 */ nop -/* C870CC 8024161C 45030001 */ bc1tl .L80241624 -/* C870D0 80241620 E6220038 */ swc1 $f2, 0x38($s1) -.L80241624: -/* C870D4 80241624 8E42000C */ lw $v0, 0xc($s2) -/* C870D8 80241628 8E430014 */ lw $v1, 0x14($s2) -/* C870DC 8024162C C6200040 */ lwc1 $f0, 0x40($s1) -/* C870E0 80241630 00431021 */ addu $v0, $v0, $v1 -/* C870E4 80241634 44821000 */ mtc1 $v0, $f2 -/* C870E8 80241638 00000000 */ nop -/* C870EC 8024163C 468010A0 */ cvt.s.w $f2, $f2 -/* C870F0 80241640 4600103C */ c.lt.s $f2, $f0 -/* C870F4 80241644 00000000 */ nop -/* C870F8 80241648 45030001 */ bc1tl .L80241650 -/* C870FC 8024164C E6220040 */ swc1 $f2, 0x40($s1) -.L80241650: -/* C87100 80241650 8E42000C */ lw $v0, 0xc($s2) -/* C87104 80241654 8E430014 */ lw $v1, 0x14($s2) -/* C87108 80241658 C6200040 */ lwc1 $f0, 0x40($s1) -/* C8710C 8024165C 00431023 */ subu $v0, $v0, $v1 -/* C87110 80241660 44821000 */ mtc1 $v0, $f2 -/* C87114 80241664 00000000 */ nop -/* C87118 80241668 468010A0 */ cvt.s.w $f2, $f2 -/* C8711C 8024166C 4602003C */ c.lt.s $f0, $f2 -/* C87120 80241670 00000000 */ nop -/* C87124 80241674 45030001 */ bc1tl .L8024167C -/* C87128 80241678 E6220040 */ swc1 $f2, 0x40($s1) -.L8024167C: -/* C8712C 8024167C 16E0001F */ bnez $s7, .L802416FC -/* C87130 80241680 00000000 */ nop -/* C87134 80241684 8E220000 */ lw $v0, ($s1) -/* C87138 80241688 30420008 */ andi $v0, $v0, 8 -/* C8713C 8024168C 10400003 */ beqz $v0, .L8024169C -/* C87140 80241690 27A50020 */ addiu $a1, $sp, 0x20 -/* C87144 80241694 13C00019 */ beqz $fp, .L802416FC -/* C87148 80241698 00000000 */ nop -.L8024169C: -/* C8714C 8024169C 27A60024 */ addiu $a2, $sp, 0x24 -/* C87150 802416A0 27A20038 */ addiu $v0, $sp, 0x38 -/* C87154 802416A4 C6220038 */ lwc1 $f2, 0x38($s1) -/* C87158 802416A8 C620003C */ lwc1 $f0, 0x3c($s1) -/* C8715C 802416AC 3C0143C8 */ lui $at, 0x43c8 -/* C87160 802416B0 44813000 */ mtc1 $at, $f6 -/* C87164 802416B4 46000021 */ cvt.d.s $f0, $f0 -/* C87168 802416B8 E7A20020 */ swc1 $f2, 0x20($sp) -/* C8716C 802416BC 3C018024 */ lui $at, 0x8024 -/* C87170 802416C0 D4226560 */ ldc1 $f2, 0x6560($at) -/* C87174 802416C4 C6240040 */ lwc1 $f4, 0x40($s1) -/* C87178 802416C8 46220000 */ add.d $f0, $f0, $f2 -/* C8717C 802416CC E7A60038 */ swc1 $f6, 0x38($sp) -/* C87180 802416D0 E7A40028 */ swc1 $f4, 0x28($sp) -/* C87184 802416D4 46200020 */ cvt.s.d $f0, $f0 -/* C87188 802416D8 E7A00024 */ swc1 $f0, 0x24($sp) -/* C8718C 802416DC AFA20010 */ sw $v0, 0x10($sp) -/* C87190 802416E0 8E240080 */ lw $a0, 0x80($s1) -/* C87194 802416E4 0C0372DF */ jal func_800DCB7C -/* C87198 802416E8 27A70028 */ addiu $a3, $sp, 0x28 -/* C8719C 802416EC 10400003 */ beqz $v0, .L802416FC -/* C871A0 802416F0 00000000 */ nop -/* C871A4 802416F4 C7A00024 */ lwc1 $f0, 0x24($sp) -/* C871A8 802416F8 E620003C */ swc1 $f0, 0x3c($s1) -.L802416FC: -/* C871AC 802416FC C62C0038 */ lwc1 $f12, 0x38($s1) -/* C871B0 80241700 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* C871B4 80241704 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* C871B8 80241708 C62E0040 */ lwc1 $f14, 0x40($s1) -/* C871BC 8024170C 8C460028 */ lw $a2, 0x28($v0) -/* C871C0 80241710 0C00A720 */ jal atan2 -/* C871C4 80241714 8C470030 */ lw $a3, 0x30($v0) -/* C871C8 80241718 0220202D */ daddu $a0, $s1, $zero -/* C871CC 8024171C 24050321 */ addiu $a1, $zero, 0x321 -/* C871D0 80241720 0000302D */ daddu $a2, $zero, $zero -/* C871D4 80241724 0C012530 */ jal func_800494C0 -/* C871D8 80241728 E620000C */ swc1 $f0, 0xc($s1) -/* C871DC 8024172C 8EC200CC */ lw $v0, 0xcc($s6) -/* C871E0 80241730 8C420024 */ lw $v0, 0x24($v0) -/* C871E4 80241734 AE220028 */ sw $v0, 0x28($s1) -/* C871E8 80241738 96C20096 */ lhu $v0, 0x96($s6) -/* C871EC 8024173C A622008E */ sh $v0, 0x8e($s1) -/* C871F0 80241740 8FA80080 */ lw $t0, 0x80($sp) -/* C871F4 80241744 2402000B */ addiu $v0, $zero, 0xb -/* C871F8 80241748 AD020070 */ sw $v0, 0x70($t0) -.L8024174C: -/* C871FC 8024174C 8FBF0064 */ lw $ra, 0x64($sp) -/* C87200 80241750 8FBE0060 */ lw $fp, 0x60($sp) -/* C87204 80241754 8FB7005C */ lw $s7, 0x5c($sp) -/* C87208 80241758 8FB60058 */ lw $s6, 0x58($sp) -/* C8720C 8024175C 8FB50054 */ lw $s5, 0x54($sp) -/* C87210 80241760 8FB40050 */ lw $s4, 0x50($sp) -/* C87214 80241764 8FB3004C */ lw $s3, 0x4c($sp) -/* C87218 80241768 8FB20048 */ lw $s2, 0x48($sp) -/* C8721C 8024176C 8FB10044 */ lw $s1, 0x44($sp) -/* C87220 80241770 8FB00040 */ lw $s0, 0x40($sp) -/* C87224 80241774 D7B80078 */ ldc1 $f24, 0x78($sp) -/* C87228 80241778 D7B60070 */ ldc1 $f22, 0x70($sp) -/* C8722C 8024177C D7B40068 */ ldc1 $f20, 0x68($sp) -/* C87230 80241780 03E00008 */ jr $ra -/* C87234 80241784 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s new file mode 100644 index 0000000000..9f777cef70 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80240D48_C867F8.s @@ -0,0 +1,688 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D48_C867F8 +/* C867F8 80240D48 27BDFF80 */ addiu $sp, $sp, -0x80 +/* C867FC 80240D4C AFBF0064 */ sw $ra, 0x64($sp) +/* C86800 80240D50 AFBE0060 */ sw $fp, 0x60($sp) +/* C86804 80240D54 AFB7005C */ sw $s7, 0x5c($sp) +/* C86808 80240D58 AFB60058 */ sw $s6, 0x58($sp) +/* C8680C 80240D5C AFB50054 */ sw $s5, 0x54($sp) +/* C86810 80240D60 AFB40050 */ sw $s4, 0x50($sp) +/* C86814 80240D64 AFB3004C */ sw $s3, 0x4c($sp) +/* C86818 80240D68 AFB20048 */ sw $s2, 0x48($sp) +/* C8681C 80240D6C AFB10044 */ sw $s1, 0x44($sp) +/* C86820 80240D70 AFB00040 */ sw $s0, 0x40($sp) +/* C86824 80240D74 F7B80078 */ sdc1 $f24, 0x78($sp) +/* C86828 80240D78 F7B60070 */ sdc1 $f22, 0x70($sp) +/* C8682C 80240D7C F7B40068 */ sdc1 $f20, 0x68($sp) +/* C86830 80240D80 AFA40080 */ sw $a0, 0x80($sp) +/* C86834 80240D84 8C960148 */ lw $s6, 0x148($a0) +/* C86838 80240D88 00C0902D */ daddu $s2, $a2, $zero +/* C8683C 80240D8C 86C40008 */ lh $a0, 8($s6) +/* C86840 80240D90 0C00EABB */ jal get_npc_unsafe +/* C86844 80240D94 0000B82D */ daddu $s7, $zero, $zero +/* C86848 80240D98 0040882D */ daddu $s1, $v0, $zero +/* C8684C 80240D9C 9622008E */ lhu $v0, 0x8e($s1) +/* C86850 80240DA0 2442FFFF */ addiu $v0, $v0, -1 +/* C86854 80240DA4 A622008E */ sh $v0, 0x8e($s1) +/* C86858 80240DA8 00021400 */ sll $v0, $v0, 0x10 +/* C8685C 80240DAC 8EC30090 */ lw $v1, 0x90($s6) +/* C86860 80240DB0 00021403 */ sra $v0, $v0, 0x10 +/* C86864 80240DB4 0062182A */ slt $v1, $v1, $v0 +/* C86868 80240DB8 14600005 */ bnez $v1, .L80240DD0 +/* C8686C 80240DBC 02E0F02D */ daddu $fp, $s7, $zero +/* C86870 80240DC0 8EC20000 */ lw $v0, ($s6) +/* C86874 80240DC4 3C031F10 */ lui $v1, 0x1f10 +/* C86878 80240DC8 00431025 */ or $v0, $v0, $v1 +/* C8687C 80240DCC AEC20000 */ sw $v0, ($s6) +.L80240DD0: +/* C86880 80240DD0 8622008E */ lh $v0, 0x8e($s1) +/* C86884 80240DD4 1440025D */ bnez $v0, .L8024174C +/* C86888 80240DD8 00000000 */ nop +/* C8688C 80240DDC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C86890 80240DE0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C86894 80240DE4 0C00A6C9 */ jal clamp_angle +/* C86898 80240DE8 C44C00A8 */ lwc1 $f12, 0xa8($v0) +/* C8689C 80240DEC 3C014334 */ lui $at, 0x4334 +/* C868A0 80240DF0 44811000 */ mtc1 $at, $f2 +/* C868A4 80240DF4 00000000 */ nop +/* C868A8 80240DF8 4602003C */ c.lt.s $f0, $f2 +/* C868AC 80240DFC 00000000 */ nop +/* C868B0 80240E00 45000011 */ bc1f .L80240E48 +/* C868B4 80240E04 00000000 */ nop +/* C868B8 80240E08 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* C868BC 80240E0C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* C868C0 80240E10 3C0142B4 */ lui $at, 0x42b4 +/* C868C4 80240E14 44816000 */ mtc1 $at, $f12 +/* C868C8 80240E18 00031080 */ sll $v0, $v1, 2 +/* C868CC 80240E1C 00431021 */ addu $v0, $v0, $v1 +/* C868D0 80240E20 00021080 */ sll $v0, $v0, 2 +/* C868D4 80240E24 00431023 */ subu $v0, $v0, $v1 +/* C868D8 80240E28 000218C0 */ sll $v1, $v0, 3 +/* C868DC 80240E2C 00431021 */ addu $v0, $v0, $v1 +/* C868E0 80240E30 000210C0 */ sll $v0, $v0, 3 +/* C868E4 80240E34 3C01800B */ lui $at, 0x800b +/* C868E8 80240E38 00220821 */ addu $at, $at, $v0 +/* C868EC 80240E3C C4201DEC */ lwc1 $f0, 0x1dec($at) +/* C868F0 80240E40 080903A1 */ j .L80240E84 +/* C868F4 80240E44 460C0301 */ sub.s $f12, $f0, $f12 +.L80240E48: +/* C868F8 80240E48 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* C868FC 80240E4C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* C86900 80240E50 3C0142B4 */ lui $at, 0x42b4 +/* C86904 80240E54 44816000 */ mtc1 $at, $f12 +/* C86908 80240E58 00031080 */ sll $v0, $v1, 2 +/* C8690C 80240E5C 00431021 */ addu $v0, $v0, $v1 +/* C86910 80240E60 00021080 */ sll $v0, $v0, 2 +/* C86914 80240E64 00431023 */ subu $v0, $v0, $v1 +/* C86918 80240E68 000218C0 */ sll $v1, $v0, 3 +/* C8691C 80240E6C 00431021 */ addu $v0, $v0, $v1 +/* C86920 80240E70 000210C0 */ sll $v0, $v0, 3 +/* C86924 80240E74 3C01800B */ lui $at, 0x800b +/* C86928 80240E78 00220821 */ addu $at, $at, $v0 +/* C8692C 80240E7C C4201DEC */ lwc1 $f0, 0x1dec($at) +/* C86930 80240E80 460C0300 */ add.s $f12, $f0, $f12 +.L80240E84: +/* C86934 80240E84 0C00A6C9 */ jal clamp_angle +/* C86938 80240E88 00000000 */ nop +/* C8693C 80240E8C 46000586 */ mov.s $f22, $f0 +/* C86940 80240E90 3C014334 */ lui $at, 0x4334 +/* C86944 80240E94 44816000 */ mtc1 $at, $f12 +/* C86948 80240E98 0C00A6C9 */ jal clamp_angle +/* C8694C 80240E9C 460CB300 */ add.s $f12, $f22, $f12 +/* C86950 80240EA0 8EC20088 */ lw $v0, 0x88($s6) +/* C86954 80240EA4 14400010 */ bnez $v0, .L80240EE8 +/* C86958 80240EA8 46000606 */ mov.s $f24, $f0 +/* C8695C 80240EAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C86960 80240EB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C86964 80240EB4 804300B4 */ lb $v1, 0xb4($v0) +/* C86968 80240EB8 3C014200 */ lui $at, 0x4200 +/* C8696C 80240EBC 4481A000 */ mtc1 $at, $f20 +/* C86970 80240EC0 10600016 */ beqz $v1, .L80240F1C +/* C86974 80240EC4 24020001 */ addiu $v0, $zero, 1 +/* C86978 80240EC8 3C0142C8 */ lui $at, 0x42c8 +/* C8697C 80240ECC 4481A000 */ mtc1 $at, $f20 +/* C86980 80240ED0 14620013 */ bne $v1, $v0, .L80240F20 +/* C86984 80240ED4 26300038 */ addiu $s0, $s1, 0x38 +/* C86988 80240ED8 3C0142B4 */ lui $at, 0x42b4 +/* C8698C 80240EDC 4481A000 */ mtc1 $at, $f20 +/* C86990 80240EE0 080903C9 */ j .L80240F24 +/* C86994 80240EE4 0200202D */ daddu $a0, $s0, $zero +.L80240EE8: +/* C86998 80240EE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C8699C 80240EEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C869A0 80240EF0 804300B4 */ lb $v1, 0xb4($v0) +/* C869A4 80240EF4 3C014218 */ lui $at, 0x4218 +/* C869A8 80240EF8 4481A000 */ mtc1 $at, $f20 +/* C869AC 80240EFC 10600007 */ beqz $v1, .L80240F1C +/* C869B0 80240F00 24020001 */ addiu $v0, $zero, 1 +/* C869B4 80240F04 3C0142B4 */ lui $at, 0x42b4 +/* C869B8 80240F08 4481A000 */ mtc1 $at, $f20 +/* C869BC 80240F0C 14620004 */ bne $v1, $v0, .L80240F20 +/* C869C0 80240F10 26300038 */ addiu $s0, $s1, 0x38 +/* C869C4 80240F14 3C014296 */ lui $at, 0x4296 +/* C869C8 80240F18 4481A000 */ mtc1 $at, $f20 +.L80240F1C: +/* C869CC 80240F1C 26300038 */ addiu $s0, $s1, 0x38 +.L80240F20: +/* C869D0 80240F20 0200202D */ daddu $a0, $s0, $zero +.L80240F24: +/* C869D4 80240F24 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) +/* C869D8 80240F28 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) +/* C869DC 80240F2C 4407C000 */ mfc1 $a3, $f24 +/* C869E0 80240F30 862200A6 */ lh $v0, 0xa6($s1) +/* C869E4 80240F34 8EA30000 */ lw $v1, ($s5) +/* C869E8 80240F38 44824000 */ mtc1 $v0, $f8 +/* C869EC 80240F3C 00000000 */ nop +/* C869F0 80240F40 46804220 */ cvt.s.w $f8, $f8 +/* C869F4 80240F44 C4600028 */ lwc1 $f0, 0x28($v1) +/* C869F8 80240F48 44064000 */ mfc1 $a2, $f8 +/* C869FC 80240F4C 26330040 */ addiu $s3, $s1, 0x40 +/* C86A00 80240F50 E6200038 */ swc1 $f0, 0x38($s1) +/* C86A04 80240F54 C4600030 */ lwc1 $f0, 0x30($v1) +/* C86A08 80240F58 0260282D */ daddu $a1, $s3, $zero +/* C86A0C 80240F5C 0C00A7E7 */ jal add_vec2D_polar +/* C86A10 80240F60 E6200040 */ swc1 $f0, 0x40($s1) +/* C86A14 80240F64 862200A6 */ lh $v0, 0xa6($s1) +/* C86A18 80240F68 44820000 */ mtc1 $v0, $f0 +/* C86A1C 80240F6C 00000000 */ nop +/* C86A20 80240F70 46800020 */ cvt.s.w $f0, $f0 +/* C86A24 80240F74 4600A000 */ add.s $f0, $f20, $f0 +/* C86A28 80240F78 4406B000 */ mfc1 $a2, $f22 +/* C86A2C 80240F7C 44050000 */ mfc1 $a1, $f0 +/* C86A30 80240F80 0C00EA95 */ jal npc_move_heading +/* C86A34 80240F84 0220202D */ daddu $a0, $s1, $zero +/* C86A38 80240F88 8EC20088 */ lw $v0, 0x88($s6) +/* C86A3C 80240F8C 1440005D */ bnez $v0, .L80241104 +/* C86A40 80240F90 00000000 */ nop +/* C86A44 80240F94 C6200038 */ lwc1 $f0, 0x38($s1) +/* C86A48 80240F98 3C018024 */ lui $at, 0x8024 +/* C86A4C 80240F9C D4246538 */ ldc1 $f4, 0x6538($at) +/* C86A50 80240FA0 46000021 */ cvt.d.s $f0, $f0 +/* C86A54 80240FA4 4620203C */ c.lt.d $f4, $f0 +/* C86A58 80240FA8 00000000 */ nop +/* C86A5C 80240FAC 45000005 */ bc1f .L80240FC4 +/* C86A60 80240FB0 00000000 */ nop +/* C86A64 80240FB4 3C0143BE */ lui $at, 0x43be +/* C86A68 80240FB8 44810000 */ mtc1 $at, $f0 +/* C86A6C 80240FBC 00000000 */ nop +/* C86A70 80240FC0 E6200038 */ swc1 $f0, 0x38($s1) +.L80240FC4: +/* C86A74 80240FC4 C6200038 */ lwc1 $f0, 0x38($s1) +/* C86A78 80240FC8 3C018024 */ lui $at, 0x8024 +/* C86A7C 80240FCC D4226540 */ ldc1 $f2, 0x6540($at) +/* C86A80 80240FD0 46000021 */ cvt.d.s $f0, $f0 +/* C86A84 80240FD4 4622003C */ c.lt.d $f0, $f2 +/* C86A88 80240FD8 00000000 */ nop +/* C86A8C 80240FDC 45000005 */ bc1f .L80240FF4 +/* C86A90 80240FE0 00000000 */ nop +/* C86A94 80240FE4 3C01C3BE */ lui $at, 0xc3be +/* C86A98 80240FE8 44810000 */ mtc1 $at, $f0 +/* C86A9C 80240FEC 00000000 */ nop +/* C86AA0 80240FF0 E6200038 */ swc1 $f0, 0x38($s1) +.L80240FF4: +/* C86AA4 80240FF4 C6200040 */ lwc1 $f0, 0x40($s1) +/* C86AA8 80240FF8 46000021 */ cvt.d.s $f0, $f0 +/* C86AAC 80240FFC 4620203C */ c.lt.d $f4, $f0 +/* C86AB0 80241000 00000000 */ nop +/* C86AB4 80241004 45000005 */ bc1f .L8024101C +/* C86AB8 80241008 00000000 */ nop +/* C86ABC 8024100C 3C0143BE */ lui $at, 0x43be +/* C86AC0 80241010 44810000 */ mtc1 $at, $f0 +/* C86AC4 80241014 00000000 */ nop +/* C86AC8 80241018 E6200040 */ swc1 $f0, 0x40($s1) +.L8024101C: +/* C86ACC 8024101C C6200040 */ lwc1 $f0, 0x40($s1) +/* C86AD0 80241020 46000021 */ cvt.d.s $f0, $f0 +/* C86AD4 80241024 4622003C */ c.lt.d $f0, $f2 +/* C86AD8 80241028 00000000 */ nop +/* C86ADC 8024102C 45000005 */ bc1f .L80241044 +/* C86AE0 80241030 00000000 */ nop +/* C86AE4 80241034 3C01C3BE */ lui $at, 0xc3be +/* C86AE8 80241038 44810000 */ mtc1 $at, $f0 +/* C86AEC 8024103C 00000000 */ nop +/* C86AF0 80241040 E6200040 */ swc1 $f0, 0x40($s1) +.L80241044: +/* C86AF4 80241044 C6220038 */ lwc1 $f2, 0x38($s1) +/* C86AF8 80241048 46021082 */ mul.s $f2, $f2, $f2 +/* C86AFC 8024104C 00000000 */ nop +/* C86B00 80241050 C6200040 */ lwc1 $f0, 0x40($s1) +/* C86B04 80241054 46000002 */ mul.s $f0, $f0, $f0 +/* C86B08 80241058 00000000 */ nop +/* C86B0C 8024105C 46001300 */ add.s $f12, $f2, $f0 +/* C86B10 80241060 46006004 */ sqrt.s $f0, $f12 +/* C86B14 80241064 46000032 */ c.eq.s $f0, $f0 +/* C86B18 80241068 00000000 */ nop +/* C86B1C 8024106C 45010003 */ bc1t .L8024107C +/* C86B20 80241070 00000000 */ nop +/* C86B24 80241074 0C0187BC */ jal sqrtf +/* C86B28 80241078 00000000 */ nop +.L8024107C: +/* C86B2C 8024107C 8E260038 */ lw $a2, 0x38($s1) +/* C86B30 80241080 8E270040 */ lw $a3, 0x40($s1) +/* C86B34 80241084 4480A000 */ mtc1 $zero, $f20 +/* C86B38 80241088 E7A00038 */ swc1 $f0, 0x38($sp) +/* C86B3C 8024108C 4600A306 */ mov.s $f12, $f20 +/* C86B40 80241090 0C00A720 */ jal atan2 +/* C86B44 80241094 4600A386 */ mov.s $f14, $f20 +/* C86B48 80241098 46000586 */ mov.s $f22, $f0 +/* C86B4C 8024109C C7A20038 */ lwc1 $f2, 0x38($sp) +/* C86B50 802410A0 3C018024 */ lui $at, 0x8024 +/* C86B54 802410A4 D4206548 */ ldc1 $f0, 0x6548($at) +/* C86B58 802410A8 460010A1 */ cvt.d.s $f2, $f2 +/* C86B5C 802410AC 4620103C */ c.lt.d $f2, $f0 +/* C86B60 802410B0 00000000 */ nop +/* C86B64 802410B4 45000004 */ bc1f .L802410C8 +/* C86B68 802410B8 0200202D */ daddu $a0, $s0, $zero +/* C86B6C 802410BC 3C064398 */ lui $a2, 0x4398 +/* C86B70 802410C0 0809043A */ j .L802410E8 +/* C86B74 802410C4 34C68000 */ ori $a2, $a2, 0x8000 +.L802410C8: +/* C86B78 802410C8 3C018024 */ lui $at, 0x8024 +/* C86B7C 802410CC D4206550 */ ldc1 $f0, 0x6550($at) +/* C86B80 802410D0 4622003C */ c.lt.d $f0, $f2 +/* C86B84 802410D4 00000000 */ nop +/* C86B88 802410D8 450000FA */ bc1f .L802414C4 +/* C86B8C 802410DC 00000000 */ nop +/* C86B90 802410E0 3C0643BB */ lui $a2, 0x43bb +/* C86B94 802410E4 34C68000 */ ori $a2, $a2, 0x8000 +.L802410E8: +/* C86B98 802410E8 4407B000 */ mfc1 $a3, $f22 +/* C86B9C 802410EC 0260282D */ daddu $a1, $s3, $zero +/* C86BA0 802410F0 E6340038 */ swc1 $f20, 0x38($s1) +/* C86BA4 802410F4 0C00A7E7 */ jal add_vec2D_polar +/* C86BA8 802410F8 E6340040 */ swc1 $f20, 0x40($s1) +/* C86BAC 802410FC 08090531 */ j .L802414C4 +/* C86BB0 80241100 00000000 */ nop +.L80241104: +/* C86BB4 80241104 8E220000 */ lw $v0, ($s1) +/* C86BB8 80241108 30420040 */ andi $v0, $v0, 0x40 +/* C86BBC 8024110C 144000B0 */ bnez $v0, .L802413D0 +/* C86BC0 80241110 27A50020 */ addiu $a1, $sp, 0x20 +/* C86BC4 80241114 27B40020 */ addiu $s4, $sp, 0x20 +/* C86BC8 80241118 0280282D */ daddu $a1, $s4, $zero +/* C86BCC 8024111C 27B30024 */ addiu $s3, $sp, 0x24 +/* C86BD0 80241120 8EA20000 */ lw $v0, ($s5) +/* C86BD4 80241124 3C014032 */ lui $at, 0x4032 +/* C86BD8 80241128 44811800 */ mtc1 $at, $f3 +/* C86BDC 8024112C 44801000 */ mtc1 $zero, $f2 +/* C86BE0 80241130 C440002C */ lwc1 $f0, 0x2c($v0) +/* C86BE4 80241134 C4460028 */ lwc1 $f6, 0x28($v0) +/* C86BE8 80241138 C4440030 */ lwc1 $f4, 0x30($v0) +/* C86BEC 8024113C 46000021 */ cvt.d.s $f0, $f0 +/* C86BF0 80241140 46220000 */ add.d $f0, $f0, $f2 +/* C86BF4 80241144 E7A60020 */ swc1 $f6, 0x20($sp) +/* C86BF8 80241148 E7A40028 */ swc1 $f4, 0x28($sp) +/* C86BFC 8024114C 46200020 */ cvt.s.d $f0, $f0 +/* C86C00 80241150 E7A00024 */ swc1 $f0, 0x24($sp) +/* C86C04 80241154 E7B40010 */ swc1 $f20, 0x10($sp) +/* C86C08 80241158 E7B60014 */ swc1 $f22, 0x14($sp) +/* C86C0C 8024115C 862200A8 */ lh $v0, 0xa8($s1) +/* C86C10 80241160 0260302D */ daddu $a2, $s3, $zero +/* C86C14 80241164 44820000 */ mtc1 $v0, $f0 +/* C86C18 80241168 00000000 */ nop +/* C86C1C 8024116C 46800020 */ cvt.s.w $f0, $f0 +/* C86C20 80241170 E7A00018 */ swc1 $f0, 0x18($sp) +/* C86C24 80241174 862200A6 */ lh $v0, 0xa6($s1) +/* C86C28 80241178 27B00028 */ addiu $s0, $sp, 0x28 +/* C86C2C 8024117C 44820000 */ mtc1 $v0, $f0 +/* C86C30 80241180 00000000 */ nop +/* C86C34 80241184 46800020 */ cvt.s.w $f0, $f0 +/* C86C38 80241188 E7A0001C */ swc1 $f0, 0x1c($sp) +/* C86C3C 8024118C 8E240080 */ lw $a0, 0x80($s1) +/* C86C40 80241190 0C037711 */ jal func_800DDC44 +/* C86C44 80241194 0200382D */ daddu $a3, $s0, $zero +/* C86C48 80241198 104000CA */ beqz $v0, .L802414C4 +/* C86C4C 8024119C 0280282D */ daddu $a1, $s4, $zero +/* C86C50 802411A0 8EA20000 */ lw $v0, ($s5) +/* C86C54 802411A4 3C018024 */ lui $at, 0x8024 +/* C86C58 802411A8 D4226558 */ ldc1 $f2, 0x6558($at) +/* C86C5C 802411AC C440002C */ lwc1 $f0, 0x2c($v0) +/* C86C60 802411B0 C4460028 */ lwc1 $f6, 0x28($v0) +/* C86C64 802411B4 C4440030 */ lwc1 $f4, 0x30($v0) +/* C86C68 802411B8 46000021 */ cvt.d.s $f0, $f0 +/* C86C6C 802411BC 46220000 */ add.d $f0, $f0, $f2 +/* C86C70 802411C0 E7A60020 */ swc1 $f6, 0x20($sp) +/* C86C74 802411C4 E7A40028 */ swc1 $f4, 0x28($sp) +/* C86C78 802411C8 46200020 */ cvt.s.d $f0, $f0 +/* C86C7C 802411CC E7A00024 */ swc1 $f0, 0x24($sp) +/* C86C80 802411D0 E7B40010 */ swc1 $f20, 0x10($sp) +/* C86C84 802411D4 E7B60014 */ swc1 $f22, 0x14($sp) +/* C86C88 802411D8 862200A8 */ lh $v0, 0xa8($s1) +/* C86C8C 802411DC 44820000 */ mtc1 $v0, $f0 +/* C86C90 802411E0 00000000 */ nop +/* C86C94 802411E4 46800020 */ cvt.s.w $f0, $f0 +/* C86C98 802411E8 E7A00018 */ swc1 $f0, 0x18($sp) +/* C86C9C 802411EC 862200A6 */ lh $v0, 0xa6($s1) +/* C86CA0 802411F0 0260302D */ daddu $a2, $s3, $zero +/* C86CA4 802411F4 44820000 */ mtc1 $v0, $f0 +/* C86CA8 802411F8 00000000 */ nop +/* C86CAC 802411FC 46800020 */ cvt.s.w $f0, $f0 +/* C86CB0 80241200 E7A0001C */ swc1 $f0, 0x1c($sp) +/* C86CB4 80241204 8E240080 */ lw $a0, 0x80($s1) +/* C86CB8 80241208 0C037711 */ jal func_800DDC44 +/* C86CBC 8024120C 0200382D */ daddu $a3, $s0, $zero +/* C86CC0 80241210 27A5002C */ addiu $a1, $sp, 0x2c +/* C86CC4 80241214 27A60030 */ addiu $a2, $sp, 0x30 +/* C86CC8 80241218 27A70034 */ addiu $a3, $sp, 0x34 +/* C86CCC 8024121C 27A30038 */ addiu $v1, $sp, 0x38 +/* C86CD0 80241220 C6220038 */ lwc1 $f2, 0x38($s1) +/* C86CD4 80241224 C620003C */ lwc1 $f0, 0x3c($s1) +/* C86CD8 80241228 3C014348 */ lui $at, 0x4348 +/* C86CDC 8024122C 44813000 */ mtc1 $at, $f6 +/* C86CE0 80241230 46000021 */ cvt.d.s $f0, $f0 +/* C86CE4 80241234 E7A2002C */ swc1 $f2, 0x2c($sp) +/* C86CE8 80241238 3C014059 */ lui $at, 0x4059 +/* C86CEC 8024123C 44811800 */ mtc1 $at, $f3 +/* C86CF0 80241240 44801000 */ mtc1 $zero, $f2 +/* C86CF4 80241244 C6240040 */ lwc1 $f4, 0x40($s1) +/* C86CF8 80241248 46220000 */ add.d $f0, $f0, $f2 +/* C86CFC 8024124C E7A60038 */ swc1 $f6, 0x38($sp) +/* C86D00 80241250 E7A40034 */ swc1 $f4, 0x34($sp) +/* C86D04 80241254 46200020 */ cvt.s.d $f0, $f0 +/* C86D08 80241258 E7A00030 */ swc1 $f0, 0x30($sp) +/* C86D0C 8024125C AFA30010 */ sw $v1, 0x10($sp) +/* C86D10 80241260 8E240080 */ lw $a0, 0x80($s1) +/* C86D14 80241264 0C0372DF */ jal func_800DCB7C +/* C86D18 80241268 0040802D */ daddu $s0, $v0, $zero +/* C86D1C 8024126C 1600001C */ bnez $s0, .L802412E0 +/* C86D20 80241270 00000000 */ nop +/* C86D24 80241274 1040001A */ beqz $v0, .L802412E0 +/* C86D28 80241278 00000000 */ nop +/* C86D2C 8024127C C7A20038 */ lwc1 $f2, 0x38($sp) +/* C86D30 80241280 3C014054 */ lui $at, 0x4054 +/* C86D34 80241284 44810800 */ mtc1 $at, $f1 +/* C86D38 80241288 44800000 */ mtc1 $zero, $f0 +/* C86D3C 8024128C 460010A1 */ cvt.d.s $f2, $f2 +/* C86D40 80241290 4622003C */ c.lt.d $f0, $f2 +/* C86D44 80241294 00000000 */ nop +/* C86D48 80241298 45000011 */ bc1f .L802412E0 +/* C86D4C 8024129C 00000000 */ nop +/* C86D50 802412A0 3C01405E */ lui $at, 0x405e +/* C86D54 802412A4 44810800 */ mtc1 $at, $f1 +/* C86D58 802412A8 44800000 */ mtc1 $zero, $f0 +/* C86D5C 802412AC 00000000 */ nop +/* C86D60 802412B0 4620103C */ c.lt.d $f2, $f0 +/* C86D64 802412B4 00000000 */ nop +/* C86D68 802412B8 45000009 */ bc1f .L802412E0 +/* C86D6C 802412BC 00000000 */ nop +/* C86D70 802412C0 C622003C */ lwc1 $f2, 0x3c($s1) +/* C86D74 802412C4 C7A00030 */ lwc1 $f0, 0x30($sp) +/* C86D78 802412C8 46001032 */ c.eq.s $f2, $f0 +/* C86D7C 802412CC 00000000 */ nop +/* C86D80 802412D0 45010003 */ bc1t .L802412E0 +/* C86D84 802412D4 00000000 */ nop +/* C86D88 802412D8 08090531 */ j .L802414C4 +/* C86D8C 802412DC 241E0001 */ addiu $fp, $zero, 1 +.L802412E0: +/* C86D90 802412E0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) +/* C86D94 802412E4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) +/* C86D98 802412E8 8E020000 */ lw $v0, ($s0) +/* C86D9C 802412EC 3C014024 */ lui $at, 0x4024 +/* C86DA0 802412F0 44811800 */ mtc1 $at, $f3 +/* C86DA4 802412F4 44801000 */ mtc1 $zero, $f2 +/* C86DA8 802412F8 C440002C */ lwc1 $f0, 0x2c($v0) +/* C86DAC 802412FC C4460028 */ lwc1 $f6, 0x28($v0) +/* C86DB0 80241300 C4440030 */ lwc1 $f4, 0x30($v0) +/* C86DB4 80241304 46000021 */ cvt.d.s $f0, $f0 +/* C86DB8 80241308 46220000 */ add.d $f0, $f0, $f2 +/* C86DBC 8024130C E7A60020 */ swc1 $f6, 0x20($sp) +/* C86DC0 80241310 E7A40028 */ swc1 $f4, 0x28($sp) +/* C86DC4 80241314 46200020 */ cvt.s.d $f0, $f0 +/* C86DC8 80241318 E7A00024 */ swc1 $f0, 0x24($sp) +/* C86DCC 8024131C E7B40010 */ swc1 $f20, 0x10($sp) +/* C86DD0 80241320 E7B60014 */ swc1 $f22, 0x14($sp) +/* C86DD4 80241324 862200A8 */ lh $v0, 0xa8($s1) +/* C86DD8 80241328 27A50020 */ addiu $a1, $sp, 0x20 +/* C86DDC 8024132C 44820000 */ mtc1 $v0, $f0 +/* C86DE0 80241330 00000000 */ nop +/* C86DE4 80241334 46800020 */ cvt.s.w $f0, $f0 +/* C86DE8 80241338 E7A00018 */ swc1 $f0, 0x18($sp) +/* C86DEC 8024133C 862200A6 */ lh $v0, 0xa6($s1) +/* C86DF0 80241340 27A60024 */ addiu $a2, $sp, 0x24 +/* C86DF4 80241344 44820000 */ mtc1 $v0, $f0 +/* C86DF8 80241348 00000000 */ nop +/* C86DFC 8024134C 46800020 */ cvt.s.w $f0, $f0 +/* C86E00 80241350 E7A0001C */ swc1 $f0, 0x1c($sp) +/* C86E04 80241354 8E240080 */ lw $a0, 0x80($s1) +/* C86E08 80241358 0C037711 */ jal func_800DDC44 +/* C86E0C 8024135C 27A70028 */ addiu $a3, $sp, 0x28 +/* C86E10 80241360 8FA60020 */ lw $a2, 0x20($sp) +/* C86E14 80241364 8E020000 */ lw $v0, ($s0) +/* C86E18 80241368 8FA70028 */ lw $a3, 0x28($sp) +/* C86E1C 8024136C C44C0028 */ lwc1 $f12, 0x28($v0) +/* C86E20 80241370 C44E0030 */ lwc1 $f14, 0x30($v0) +/* C86E24 80241374 0C00A7B5 */ jal dist2D +/* C86E28 80241378 24170001 */ addiu $s7, $zero, 1 +/* C86E2C 8024137C 46000506 */ mov.s $f20, $f0 +/* C86E30 80241380 8E030000 */ lw $v1, ($s0) +/* C86E34 80241384 862200A6 */ lh $v0, 0xa6($s1) +/* C86E38 80241388 4407C000 */ mfc1 $a3, $f24 +/* C86E3C 8024138C 44824000 */ mtc1 $v0, $f8 +/* C86E40 80241390 00000000 */ nop +/* C86E44 80241394 46804220 */ cvt.s.w $f8, $f8 +/* C86E48 80241398 C4600028 */ lwc1 $f0, 0x28($v1) +/* C86E4C 8024139C 44064000 */ mfc1 $a2, $f8 +/* C86E50 802413A0 26240038 */ addiu $a0, $s1, 0x38 +/* C86E54 802413A4 E6200038 */ swc1 $f0, 0x38($s1) +/* C86E58 802413A8 C4600030 */ lwc1 $f0, 0x30($v1) +/* C86E5C 802413AC 26250040 */ addiu $a1, $s1, 0x40 +/* C86E60 802413B0 0C00A7E7 */ jal add_vec2D_polar +/* C86E64 802413B4 E6200040 */ swc1 $f0, 0x40($s1) +/* C86E68 802413B8 862200A6 */ lh $v0, 0xa6($s1) +/* C86E6C 802413BC 44820000 */ mtc1 $v0, $f0 +/* C86E70 802413C0 00000000 */ nop +/* C86E74 802413C4 46800020 */ cvt.s.w $f0, $f0 +/* C86E78 802413C8 0809052D */ j .L802414B4 +/* C86E7C 802413CC 4600A500 */ add.s $f20, $f20, $f0 +.L802413D0: +/* C86E80 802413D0 8EA20000 */ lw $v0, ($s5) +/* C86E84 802413D4 3C014032 */ lui $at, 0x4032 +/* C86E88 802413D8 44811800 */ mtc1 $at, $f3 +/* C86E8C 802413DC 44801000 */ mtc1 $zero, $f2 +/* C86E90 802413E0 C440002C */ lwc1 $f0, 0x2c($v0) +/* C86E94 802413E4 C4460028 */ lwc1 $f6, 0x28($v0) +/* C86E98 802413E8 C4440030 */ lwc1 $f4, 0x30($v0) +/* C86E9C 802413EC 46000021 */ cvt.d.s $f0, $f0 +/* C86EA0 802413F0 46220000 */ add.d $f0, $f0, $f2 +/* C86EA4 802413F4 E7A60020 */ swc1 $f6, 0x20($sp) +/* C86EA8 802413F8 E7A40028 */ swc1 $f4, 0x28($sp) +/* C86EAC 802413FC 46200020 */ cvt.s.d $f0, $f0 +/* C86EB0 80241400 E7A00024 */ swc1 $f0, 0x24($sp) +/* C86EB4 80241404 E7B40010 */ swc1 $f20, 0x10($sp) +/* C86EB8 80241408 E7B60014 */ swc1 $f22, 0x14($sp) +/* C86EBC 8024140C 862200A8 */ lh $v0, 0xa8($s1) +/* C86EC0 80241410 44820000 */ mtc1 $v0, $f0 +/* C86EC4 80241414 00000000 */ nop +/* C86EC8 80241418 46800020 */ cvt.s.w $f0, $f0 +/* C86ECC 8024141C E7A00018 */ swc1 $f0, 0x18($sp) +/* C86ED0 80241420 862200A6 */ lh $v0, 0xa6($s1) +/* C86ED4 80241424 27A60024 */ addiu $a2, $sp, 0x24 +/* C86ED8 80241428 44820000 */ mtc1 $v0, $f0 +/* C86EDC 8024142C 00000000 */ nop +/* C86EE0 80241430 46800020 */ cvt.s.w $f0, $f0 +/* C86EE4 80241434 E7A0001C */ swc1 $f0, 0x1c($sp) +/* C86EE8 80241438 8E240080 */ lw $a0, 0x80($s1) +/* C86EEC 8024143C 0C037711 */ jal func_800DDC44 +/* C86EF0 80241440 27A70028 */ addiu $a3, $sp, 0x28 +/* C86EF4 80241444 1040001F */ beqz $v0, .L802414C4 +/* C86EF8 80241448 00000000 */ nop +/* C86EFC 8024144C 8FA60020 */ lw $a2, 0x20($sp) +/* C86F00 80241450 8EA20000 */ lw $v0, ($s5) +/* C86F04 80241454 8FA70028 */ lw $a3, 0x28($sp) +/* C86F08 80241458 C44C0028 */ lwc1 $f12, 0x28($v0) +/* C86F0C 8024145C 0C00A7B5 */ jal dist2D +/* C86F10 80241460 C44E0030 */ lwc1 $f14, 0x30($v0) +/* C86F14 80241464 46000506 */ mov.s $f20, $f0 +/* C86F18 80241468 8EA30000 */ lw $v1, ($s5) +/* C86F1C 8024146C 862200A6 */ lh $v0, 0xa6($s1) +/* C86F20 80241470 4407C000 */ mfc1 $a3, $f24 +/* C86F24 80241474 44824000 */ mtc1 $v0, $f8 +/* C86F28 80241478 00000000 */ nop +/* C86F2C 8024147C 46804220 */ cvt.s.w $f8, $f8 +/* C86F30 80241480 C4600028 */ lwc1 $f0, 0x28($v1) +/* C86F34 80241484 44064000 */ mfc1 $a2, $f8 +/* C86F38 80241488 0200202D */ daddu $a0, $s0, $zero +/* C86F3C 8024148C E6200038 */ swc1 $f0, 0x38($s1) +/* C86F40 80241490 C4600030 */ lwc1 $f0, 0x30($v1) +/* C86F44 80241494 0260282D */ daddu $a1, $s3, $zero +/* C86F48 80241498 0C00A7E7 */ jal add_vec2D_polar +/* C86F4C 8024149C E6200040 */ swc1 $f0, 0x40($s1) +/* C86F50 802414A0 862200A6 */ lh $v0, 0xa6($s1) +/* C86F54 802414A4 44820000 */ mtc1 $v0, $f0 +/* C86F58 802414A8 00000000 */ nop +/* C86F5C 802414AC 46800020 */ cvt.s.w $f0, $f0 +/* C86F60 802414B0 4600A500 */ add.s $f20, $f20, $f0 +.L802414B4: +/* C86F64 802414B4 4406B000 */ mfc1 $a2, $f22 +/* C86F68 802414B8 4405A000 */ mfc1 $a1, $f20 +/* C86F6C 802414BC 0C00EA95 */ jal npc_move_heading +/* C86F70 802414C0 0220202D */ daddu $a0, $s1, $zero +.L802414C4: +/* C86F74 802414C4 C6400008 */ lwc1 $f0, 8($s2) +/* C86F78 802414C8 46800020 */ cvt.s.w $f0, $f0 +/* C86F7C 802414CC 44050000 */ mfc1 $a1, $f0 +/* C86F80 802414D0 C640000C */ lwc1 $f0, 0xc($s2) +/* C86F84 802414D4 46800020 */ cvt.s.w $f0, $f0 +/* C86F88 802414D8 44060000 */ mfc1 $a2, $f0 +/* C86F8C 802414DC C6200040 */ lwc1 $f0, 0x40($s1) +/* C86F90 802414E0 26300038 */ addiu $s0, $s1, 0x38 +/* C86F94 802414E4 E7A00010 */ swc1 $f0, 0x10($sp) +/* C86F98 802414E8 C6400010 */ lwc1 $f0, 0x10($s2) +/* C86F9C 802414EC 46800020 */ cvt.s.w $f0, $f0 +/* C86FA0 802414F0 E7A00014 */ swc1 $f0, 0x14($sp) +/* C86FA4 802414F4 C6400014 */ lwc1 $f0, 0x14($s2) +/* C86FA8 802414F8 46800020 */ cvt.s.w $f0, $f0 +/* C86FAC 802414FC E7A00018 */ swc1 $f0, 0x18($sp) +/* C86FB0 80241500 8E440004 */ lw $a0, 4($s2) +/* C86FB4 80241504 8E270038 */ lw $a3, 0x38($s1) +/* C86FB8 80241508 0C0123F5 */ jal is_point_within_region +/* C86FBC 8024150C 26330040 */ addiu $s3, $s1, 0x40 +/* C86FC0 80241510 1040005A */ beqz $v0, .L8024167C +/* C86FC4 80241514 00000000 */ nop +/* C86FC8 80241518 8E430004 */ lw $v1, 4($s2) +/* C86FCC 8024151C 10600005 */ beqz $v1, .L80241534 +/* C86FD0 80241520 24020001 */ addiu $v0, $zero, 1 +/* C86FD4 80241524 10620029 */ beq $v1, $v0, .L802415CC +/* C86FD8 80241528 00000000 */ nop +/* C86FDC 8024152C 0809059F */ j .L8024167C +/* C86FE0 80241530 00000000 */ nop +.L80241534: +/* C86FE4 80241534 C6480008 */ lwc1 $f8, 8($s2) +/* C86FE8 80241538 46804220 */ cvt.s.w $f8, $f8 +/* C86FEC 8024153C 44064000 */ mfc1 $a2, $f8 +/* C86FF0 80241540 C648000C */ lwc1 $f8, 0xc($s2) +/* C86FF4 80241544 46804220 */ cvt.s.w $f8, $f8 +/* C86FF8 80241548 C62C0038 */ lwc1 $f12, 0x38($s1) +/* C86FFC 8024154C C62E0040 */ lwc1 $f14, 0x40($s1) +/* C87000 80241550 44074000 */ mfc1 $a3, $f8 +/* C87004 80241554 0C00A7B5 */ jal dist2D +/* C87008 80241558 00000000 */ nop +/* C8700C 8024155C C6420010 */ lwc1 $f2, 0x10($s2) +/* C87010 80241560 468010A0 */ cvt.s.w $f2, $f2 +/* C87014 80241564 4600103C */ c.lt.s $f2, $f0 +/* C87018 80241568 00000000 */ nop +/* C8701C 8024156C 45000043 */ bc1f .L8024167C +/* C87020 80241570 E7A00038 */ swc1 $f0, 0x38($sp) +/* C87024 80241574 C64C0008 */ lwc1 $f12, 8($s2) +/* C87028 80241578 46806320 */ cvt.s.w $f12, $f12 +/* C8702C 8024157C 8E260038 */ lw $a2, 0x38($s1) +/* C87030 80241580 8E270040 */ lw $a3, 0x40($s1) +/* C87034 80241584 C64E000C */ lwc1 $f14, 0xc($s2) +/* C87038 80241588 0C00A720 */ jal atan2 +/* C8703C 8024158C 468073A0 */ cvt.s.w $f14, $f14 +/* C87040 80241590 0200202D */ daddu $a0, $s0, $zero +/* C87044 80241594 44070000 */ mfc1 $a3, $f0 +/* C87048 80241598 C6400008 */ lwc1 $f0, 8($s2) +/* C8704C 8024159C 46800020 */ cvt.s.w $f0, $f0 +/* C87050 802415A0 E6200038 */ swc1 $f0, 0x38($s1) +/* C87054 802415A4 C640000C */ lwc1 $f0, 0xc($s2) +/* C87058 802415A8 46800020 */ cvt.s.w $f0, $f0 +/* C8705C 802415AC E6200040 */ swc1 $f0, 0x40($s1) +/* C87060 802415B0 C6480010 */ lwc1 $f8, 0x10($s2) +/* C87064 802415B4 46804220 */ cvt.s.w $f8, $f8 +/* C87068 802415B8 44064000 */ mfc1 $a2, $f8 +/* C8706C 802415BC 0C00A7E7 */ jal add_vec2D_polar +/* C87070 802415C0 0260282D */ daddu $a1, $s3, $zero +/* C87074 802415C4 0809059F */ j .L8024167C +/* C87078 802415C8 00000000 */ nop +.L802415CC: +/* C8707C 802415CC 8E420008 */ lw $v0, 8($s2) +/* C87080 802415D0 8E430010 */ lw $v1, 0x10($s2) +/* C87084 802415D4 C6200038 */ lwc1 $f0, 0x38($s1) +/* C87088 802415D8 00431021 */ addu $v0, $v0, $v1 +/* C8708C 802415DC 44821000 */ mtc1 $v0, $f2 +/* C87090 802415E0 00000000 */ nop +/* C87094 802415E4 468010A0 */ cvt.s.w $f2, $f2 +/* C87098 802415E8 4600103C */ c.lt.s $f2, $f0 +/* C8709C 802415EC 00000000 */ nop +/* C870A0 802415F0 45030001 */ bc1tl .L802415F8 +/* C870A4 802415F4 E6220038 */ swc1 $f2, 0x38($s1) +.L802415F8: +/* C870A8 802415F8 8E420008 */ lw $v0, 8($s2) +/* C870AC 802415FC 8E430010 */ lw $v1, 0x10($s2) +/* C870B0 80241600 C6200038 */ lwc1 $f0, 0x38($s1) +/* C870B4 80241604 00431023 */ subu $v0, $v0, $v1 +/* C870B8 80241608 44821000 */ mtc1 $v0, $f2 +/* C870BC 8024160C 00000000 */ nop +/* C870C0 80241610 468010A0 */ cvt.s.w $f2, $f2 +/* C870C4 80241614 4602003C */ c.lt.s $f0, $f2 +/* C870C8 80241618 00000000 */ nop +/* C870CC 8024161C 45030001 */ bc1tl .L80241624 +/* C870D0 80241620 E6220038 */ swc1 $f2, 0x38($s1) +.L80241624: +/* C870D4 80241624 8E42000C */ lw $v0, 0xc($s2) +/* C870D8 80241628 8E430014 */ lw $v1, 0x14($s2) +/* C870DC 8024162C C6200040 */ lwc1 $f0, 0x40($s1) +/* C870E0 80241630 00431021 */ addu $v0, $v0, $v1 +/* C870E4 80241634 44821000 */ mtc1 $v0, $f2 +/* C870E8 80241638 00000000 */ nop +/* C870EC 8024163C 468010A0 */ cvt.s.w $f2, $f2 +/* C870F0 80241640 4600103C */ c.lt.s $f2, $f0 +/* C870F4 80241644 00000000 */ nop +/* C870F8 80241648 45030001 */ bc1tl .L80241650 +/* C870FC 8024164C E6220040 */ swc1 $f2, 0x40($s1) +.L80241650: +/* C87100 80241650 8E42000C */ lw $v0, 0xc($s2) +/* C87104 80241654 8E430014 */ lw $v1, 0x14($s2) +/* C87108 80241658 C6200040 */ lwc1 $f0, 0x40($s1) +/* C8710C 8024165C 00431023 */ subu $v0, $v0, $v1 +/* C87110 80241660 44821000 */ mtc1 $v0, $f2 +/* C87114 80241664 00000000 */ nop +/* C87118 80241668 468010A0 */ cvt.s.w $f2, $f2 +/* C8711C 8024166C 4602003C */ c.lt.s $f0, $f2 +/* C87120 80241670 00000000 */ nop +/* C87124 80241674 45030001 */ bc1tl .L8024167C +/* C87128 80241678 E6220040 */ swc1 $f2, 0x40($s1) +.L8024167C: +/* C8712C 8024167C 16E0001F */ bnez $s7, .L802416FC +/* C87130 80241680 00000000 */ nop +/* C87134 80241684 8E220000 */ lw $v0, ($s1) +/* C87138 80241688 30420008 */ andi $v0, $v0, 8 +/* C8713C 8024168C 10400003 */ beqz $v0, .L8024169C +/* C87140 80241690 27A50020 */ addiu $a1, $sp, 0x20 +/* C87144 80241694 13C00019 */ beqz $fp, .L802416FC +/* C87148 80241698 00000000 */ nop +.L8024169C: +/* C8714C 8024169C 27A60024 */ addiu $a2, $sp, 0x24 +/* C87150 802416A0 27A20038 */ addiu $v0, $sp, 0x38 +/* C87154 802416A4 C6220038 */ lwc1 $f2, 0x38($s1) +/* C87158 802416A8 C620003C */ lwc1 $f0, 0x3c($s1) +/* C8715C 802416AC 3C0143C8 */ lui $at, 0x43c8 +/* C87160 802416B0 44813000 */ mtc1 $at, $f6 +/* C87164 802416B4 46000021 */ cvt.d.s $f0, $f0 +/* C87168 802416B8 E7A20020 */ swc1 $f2, 0x20($sp) +/* C8716C 802416BC 3C018024 */ lui $at, 0x8024 +/* C87170 802416C0 D4226560 */ ldc1 $f2, 0x6560($at) +/* C87174 802416C4 C6240040 */ lwc1 $f4, 0x40($s1) +/* C87178 802416C8 46220000 */ add.d $f0, $f0, $f2 +/* C8717C 802416CC E7A60038 */ swc1 $f6, 0x38($sp) +/* C87180 802416D0 E7A40028 */ swc1 $f4, 0x28($sp) +/* C87184 802416D4 46200020 */ cvt.s.d $f0, $f0 +/* C87188 802416D8 E7A00024 */ swc1 $f0, 0x24($sp) +/* C8718C 802416DC AFA20010 */ sw $v0, 0x10($sp) +/* C87190 802416E0 8E240080 */ lw $a0, 0x80($s1) +/* C87194 802416E4 0C0372DF */ jal func_800DCB7C +/* C87198 802416E8 27A70028 */ addiu $a3, $sp, 0x28 +/* C8719C 802416EC 10400003 */ beqz $v0, .L802416FC +/* C871A0 802416F0 00000000 */ nop +/* C871A4 802416F4 C7A00024 */ lwc1 $f0, 0x24($sp) +/* C871A8 802416F8 E620003C */ swc1 $f0, 0x3c($s1) +.L802416FC: +/* C871AC 802416FC C62C0038 */ lwc1 $f12, 0x38($s1) +/* C871B0 80241700 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* C871B4 80241704 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* C871B8 80241708 C62E0040 */ lwc1 $f14, 0x40($s1) +/* C871BC 8024170C 8C460028 */ lw $a2, 0x28($v0) +/* C871C0 80241710 0C00A720 */ jal atan2 +/* C871C4 80241714 8C470030 */ lw $a3, 0x30($v0) +/* C871C8 80241718 0220202D */ daddu $a0, $s1, $zero +/* C871CC 8024171C 24050321 */ addiu $a1, $zero, 0x321 +/* C871D0 80241720 0000302D */ daddu $a2, $zero, $zero +/* C871D4 80241724 0C012530 */ jal func_800494C0 +/* C871D8 80241728 E620000C */ swc1 $f0, 0xc($s1) +/* C871DC 8024172C 8EC200CC */ lw $v0, 0xcc($s6) +/* C871E0 80241730 8C420024 */ lw $v0, 0x24($v0) +/* C871E4 80241734 AE220028 */ sw $v0, 0x28($s1) +/* C871E8 80241738 96C20096 */ lhu $v0, 0x96($s6) +/* C871EC 8024173C A622008E */ sh $v0, 0x8e($s1) +/* C871F0 80241740 8FA80080 */ lw $t0, 0x80($sp) +/* C871F4 80241744 2402000B */ addiu $v0, $zero, 0xb +/* C871F8 80241748 AD020070 */ sw $v0, 0x70($t0) +.L8024174C: +/* C871FC 8024174C 8FBF0064 */ lw $ra, 0x64($sp) +/* C87200 80241750 8FBE0060 */ lw $fp, 0x60($sp) +/* C87204 80241754 8FB7005C */ lw $s7, 0x5c($sp) +/* C87208 80241758 8FB60058 */ lw $s6, 0x58($sp) +/* C8720C 8024175C 8FB50054 */ lw $s5, 0x54($sp) +/* C87210 80241760 8FB40050 */ lw $s4, 0x50($sp) +/* C87214 80241764 8FB3004C */ lw $s3, 0x4c($sp) +/* C87218 80241768 8FB20048 */ lw $s2, 0x48($sp) +/* C8721C 8024176C 8FB10044 */ lw $s1, 0x44($sp) +/* C87220 80241770 8FB00040 */ lw $s0, 0x40($sp) +/* C87224 80241774 D7B80078 */ ldc1 $f24, 0x78($sp) +/* C87228 80241778 D7B60070 */ ldc1 $f22, 0x70($sp) +/* C8722C 8024177C D7B40068 */ ldc1 $f20, 0x68($sp) +/* C87230 80241780 03E00008 */ jr $ra +/* C87234 80241784 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s index fc34ece226..a911be0931 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241A64_C87514.s @@ -99,18 +99,18 @@ glabel func_80241A64_C87514 /* C8767C 80241BCC 00000000 */ nop .L80241BD0: /* C87680 80241BD0 0260282D */ daddu $a1, $s3, $zero -/* C87684 80241BD4 0C0902F8 */ jal func_80240BE0 +/* C87684 80241BD4 0C0902F8 */ jal func_80240BE0_C86690 /* C87688 80241BD8 0280302D */ daddu $a2, $s4, $zero .L80241BDC: /* C8768C 80241BDC 0240202D */ daddu $a0, $s2, $zero /* C87690 80241BE0 0260282D */ daddu $a1, $s3, $zero -/* C87694 80241BE4 0C090313 */ jal func_80240C4C +/* C87694 80241BE4 0C090313 */ jal func_80240C4C_C866FC /* C87698 80241BE8 0280302D */ daddu $a2, $s4, $zero /* C8769C 80241BEC 08090723 */ j .L80241C8C /* C876A0 80241BF0 00000000 */ nop .L80241BF4: /* C876A4 80241BF4 0260282D */ daddu $a1, $s3, $zero -/* C876A8 80241BF8 0C090352 */ jal func_80240D48 +/* C876A8 80241BF8 0C090352 */ jal func_80240D48_C867F8 /* C876AC 80241BFC 0280302D */ daddu $a2, $s4, $zero /* C876B0 80241C00 8E420070 */ lw $v0, 0x70($s2) /* C876B4 80241C04 14500021 */ bne $v0, $s0, .L80241C8C @@ -118,7 +118,7 @@ glabel func_80241A64_C87514 .L80241C0C: /* C876BC 80241C0C 0240202D */ daddu $a0, $s2, $zero /* C876C0 80241C10 0260282D */ daddu $a1, $s3, $zero -/* C876C4 80241C14 0C0905E2 */ jal func_80241788 +/* C876C4 80241C14 0C0905E2 */ jal func_80241788_C87238 /* C876C8 80241C18 0280302D */ daddu $a2, $s4, $zero /* C876CC 80241C1C 8E430070 */ lw $v1, 0x70($s2) /* C876D0 80241C20 2402000C */ addiu $v0, $zero, 0xc @@ -127,7 +127,7 @@ glabel func_80241A64_C87514 /* C876DC 80241C2C 0240202D */ daddu $a0, $s2, $zero .L80241C30: /* C876E0 80241C30 0260282D */ daddu $a1, $s3, $zero -/* C876E4 80241C34 0C090606 */ jal func_80241818 +/* C876E4 80241C34 0C090606 */ jal func_80241818_C872C8 /* C876E8 80241C38 0280302D */ daddu $a2, $s4, $zero /* C876EC 80241C3C 8E430070 */ lw $v1, 0x70($s2) /* C876F0 80241C40 2402000D */ addiu $v0, $zero, 0xd @@ -136,7 +136,7 @@ glabel func_80241A64_C87514 .L80241C4C: /* C876FC 80241C4C 0240202D */ daddu $a0, $s2, $zero /* C87700 80241C50 0260282D */ daddu $a1, $s3, $zero -/* C87704 80241C54 0C090646 */ jal func_80241918 +/* C87704 80241C54 0C090646 */ jal func_80241918_C873C8 /* C87708 80241C58 0280302D */ daddu $a2, $s4, $zero /* C8770C 80241C5C 8E430070 */ lw $v1, 0x70($s2) /* C87710 80241C60 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80241A64_C87514 /* C8771C 80241C6C 0240202D */ daddu $a0, $s2, $zero .L80241C70: /* C87720 80241C70 0260282D */ daddu $a1, $s3, $zero -/* C87724 80241C74 0C09065E */ jal func_80241978 +/* C87724 80241C74 0C09065E */ jal func_80241978_C87428 /* C87728 80241C78 0280302D */ daddu $a2, $s4, $zero /* C8772C 80241C7C 08090723 */ j .L80241C8C /* C87730 80241C80 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241E64.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241E64.s deleted file mode 100644 index 20ce0f3ed8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241E64.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E64 -/* C87914 80241E64 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* C87918 80241E68 AFB3003C */ sw $s3, 0x3c($sp) -/* C8791C 80241E6C 0080982D */ daddu $s3, $a0, $zero -/* C87920 80241E70 AFBF0040 */ sw $ra, 0x40($sp) -/* C87924 80241E74 AFB20038 */ sw $s2, 0x38($sp) -/* C87928 80241E78 AFB10034 */ sw $s1, 0x34($sp) -/* C8792C 80241E7C AFB00030 */ sw $s0, 0x30($sp) -/* C87930 80241E80 8E710148 */ lw $s1, 0x148($s3) -/* C87934 80241E84 0C00EABB */ jal get_npc_unsafe -/* C87938 80241E88 86240008 */ lh $a0, 8($s1) -/* C8793C 80241E8C 0040802D */ daddu $s0, $v0, $zero -/* C87940 80241E90 8E22007C */ lw $v0, 0x7c($s1) -/* C87944 80241E94 8603008E */ lh $v1, 0x8e($s0) -/* C87948 80241E98 2442FFFF */ addiu $v0, $v0, -1 -/* C8794C 80241E9C 14620012 */ bne $v1, $v0, .L80241EE8 -/* C87950 80241EA0 00000000 */ nop -/* C87954 80241EA4 C6000038 */ lwc1 $f0, 0x38($s0) -/* C87958 80241EA8 4600020D */ trunc.w.s $f8, $f0 -/* C8795C 80241EAC 44024000 */ mfc1 $v0, $f8 -/* C87960 80241EB0 00000000 */ nop -/* C87964 80241EB4 A6220010 */ sh $v0, 0x10($s1) -/* C87968 80241EB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* C8796C 80241EBC 4600020D */ trunc.w.s $f8, $f0 -/* C87970 80241EC0 44024000 */ mfc1 $v0, $f8 -/* C87974 80241EC4 00000000 */ nop -/* C87978 80241EC8 A6220012 */ sh $v0, 0x12($s1) -/* C8797C 80241ECC C6000040 */ lwc1 $f0, 0x40($s0) -/* C87980 80241ED0 24020001 */ addiu $v0, $zero, 1 -/* C87984 80241ED4 A2220007 */ sb $v0, 7($s1) -/* C87988 80241ED8 4600020D */ trunc.w.s $f8, $f0 -/* C8798C 80241EDC 44024000 */ mfc1 $v0, $f8 -/* C87990 80241EE0 00000000 */ nop -/* C87994 80241EE4 A6220014 */ sh $v0, 0x14($s1) -.L80241EE8: -/* C87998 80241EE8 C6000038 */ lwc1 $f0, 0x38($s0) -/* C8799C 80241EEC C602003C */ lwc1 $f2, 0x3c($s0) -/* C879A0 80241EF0 C6040040 */ lwc1 $f4, 0x40($s0) -/* C879A4 80241EF4 C6060018 */ lwc1 $f6, 0x18($s0) -/* C879A8 80241EF8 E7A00020 */ swc1 $f0, 0x20($sp) -/* C879AC 80241EFC E7A20024 */ swc1 $f2, 0x24($sp) -/* C879B0 80241F00 E7A40028 */ swc1 $f4, 0x28($sp) -/* C879B4 80241F04 E7A60010 */ swc1 $f6, 0x10($sp) -/* C879B8 80241F08 C600000C */ lwc1 $f0, 0xc($s0) -/* C879BC 80241F0C E7A00014 */ swc1 $f0, 0x14($sp) -/* C879C0 80241F10 860200A8 */ lh $v0, 0xa8($s0) -/* C879C4 80241F14 27A50020 */ addiu $a1, $sp, 0x20 -/* C879C8 80241F18 44820000 */ mtc1 $v0, $f0 -/* C879CC 80241F1C 00000000 */ nop -/* C879D0 80241F20 46800020 */ cvt.s.w $f0, $f0 -/* C879D4 80241F24 E7A00018 */ swc1 $f0, 0x18($sp) -/* C879D8 80241F28 860200A6 */ lh $v0, 0xa6($s0) -/* C879DC 80241F2C 27A60024 */ addiu $a2, $sp, 0x24 -/* C879E0 80241F30 44820000 */ mtc1 $v0, $f0 -/* C879E4 80241F34 00000000 */ nop -/* C879E8 80241F38 46800020 */ cvt.s.w $f0, $f0 -/* C879EC 80241F3C E7A0001C */ swc1 $f0, 0x1c($sp) -/* C879F0 80241F40 8E040080 */ lw $a0, 0x80($s0) -/* C879F4 80241F44 0C037711 */ jal func_800DDC44 -/* C879F8 80241F48 27A70028 */ addiu $a3, $sp, 0x28 -/* C879FC 80241F4C 0040902D */ daddu $s2, $v0, $zero -/* C87A00 80241F50 16400005 */ bnez $s2, .L80241F68 -/* C87A04 80241F54 00000000 */ nop -/* C87A08 80241F58 8E050018 */ lw $a1, 0x18($s0) -/* C87A0C 80241F5C 8E06000C */ lw $a2, 0xc($s0) -/* C87A10 80241F60 0C00EA95 */ jal npc_move_heading -/* C87A14 80241F64 0200202D */ daddu $a0, $s0, $zero -.L80241F68: -/* C87A18 80241F68 8602008E */ lh $v0, 0x8e($s0) -/* C87A1C 80241F6C 9603008E */ lhu $v1, 0x8e($s0) -/* C87A20 80241F70 18400007 */ blez $v0, .L80241F90 -/* C87A24 80241F74 2462FFFF */ addiu $v0, $v1, -1 -/* C87A28 80241F78 A602008E */ sh $v0, 0x8e($s0) -/* C87A2C 80241F7C 00021400 */ sll $v0, $v0, 0x10 -/* C87A30 80241F80 18400003 */ blez $v0, .L80241F90 -/* C87A34 80241F84 00000000 */ nop -/* C87A38 80241F88 12400008 */ beqz $s2, .L80241FAC -/* C87A3C 80241F8C 00000000 */ nop -.L80241F90: -/* C87A40 80241F90 8E2200CC */ lw $v0, 0xcc($s1) -/* C87A44 80241F94 A2200007 */ sb $zero, 7($s1) -/* C87A48 80241F98 8C420028 */ lw $v0, 0x28($v0) -/* C87A4C 80241F9C A600008E */ sh $zero, 0x8e($s0) -/* C87A50 80241FA0 AE020028 */ sw $v0, 0x28($s0) -/* C87A54 80241FA4 2402000F */ addiu $v0, $zero, 0xf -/* C87A58 80241FA8 AE620070 */ sw $v0, 0x70($s3) -.L80241FAC: -/* C87A5C 80241FAC 8FBF0040 */ lw $ra, 0x40($sp) -/* C87A60 80241FB0 8FB3003C */ lw $s3, 0x3c($sp) -/* C87A64 80241FB4 8FB20038 */ lw $s2, 0x38($sp) -/* C87A68 80241FB8 8FB10034 */ lw $s1, 0x34($sp) -/* C87A6C 80241FBC 8FB00030 */ lw $s0, 0x30($sp) -/* C87A70 80241FC0 03E00008 */ jr $ra -/* C87A74 80241FC4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241E64_C87914.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241E64_C87914.s new file mode 100644 index 0000000000..e2b65c3a70 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80241E64_C87914.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E64_C87914 +/* C87914 80241E64 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* C87918 80241E68 AFB3003C */ sw $s3, 0x3c($sp) +/* C8791C 80241E6C 0080982D */ daddu $s3, $a0, $zero +/* C87920 80241E70 AFBF0040 */ sw $ra, 0x40($sp) +/* C87924 80241E74 AFB20038 */ sw $s2, 0x38($sp) +/* C87928 80241E78 AFB10034 */ sw $s1, 0x34($sp) +/* C8792C 80241E7C AFB00030 */ sw $s0, 0x30($sp) +/* C87930 80241E80 8E710148 */ lw $s1, 0x148($s3) +/* C87934 80241E84 0C00EABB */ jal get_npc_unsafe +/* C87938 80241E88 86240008 */ lh $a0, 8($s1) +/* C8793C 80241E8C 0040802D */ daddu $s0, $v0, $zero +/* C87940 80241E90 8E22007C */ lw $v0, 0x7c($s1) +/* C87944 80241E94 8603008E */ lh $v1, 0x8e($s0) +/* C87948 80241E98 2442FFFF */ addiu $v0, $v0, -1 +/* C8794C 80241E9C 14620012 */ bne $v1, $v0, .L80241EE8 +/* C87950 80241EA0 00000000 */ nop +/* C87954 80241EA4 C6000038 */ lwc1 $f0, 0x38($s0) +/* C87958 80241EA8 4600020D */ trunc.w.s $f8, $f0 +/* C8795C 80241EAC 44024000 */ mfc1 $v0, $f8 +/* C87960 80241EB0 00000000 */ nop +/* C87964 80241EB4 A6220010 */ sh $v0, 0x10($s1) +/* C87968 80241EB8 C600003C */ lwc1 $f0, 0x3c($s0) +/* C8796C 80241EBC 4600020D */ trunc.w.s $f8, $f0 +/* C87970 80241EC0 44024000 */ mfc1 $v0, $f8 +/* C87974 80241EC4 00000000 */ nop +/* C87978 80241EC8 A6220012 */ sh $v0, 0x12($s1) +/* C8797C 80241ECC C6000040 */ lwc1 $f0, 0x40($s0) +/* C87980 80241ED0 24020001 */ addiu $v0, $zero, 1 +/* C87984 80241ED4 A2220007 */ sb $v0, 7($s1) +/* C87988 80241ED8 4600020D */ trunc.w.s $f8, $f0 +/* C8798C 80241EDC 44024000 */ mfc1 $v0, $f8 +/* C87990 80241EE0 00000000 */ nop +/* C87994 80241EE4 A6220014 */ sh $v0, 0x14($s1) +.L80241EE8: +/* C87998 80241EE8 C6000038 */ lwc1 $f0, 0x38($s0) +/* C8799C 80241EEC C602003C */ lwc1 $f2, 0x3c($s0) +/* C879A0 80241EF0 C6040040 */ lwc1 $f4, 0x40($s0) +/* C879A4 80241EF4 C6060018 */ lwc1 $f6, 0x18($s0) +/* C879A8 80241EF8 E7A00020 */ swc1 $f0, 0x20($sp) +/* C879AC 80241EFC E7A20024 */ swc1 $f2, 0x24($sp) +/* C879B0 80241F00 E7A40028 */ swc1 $f4, 0x28($sp) +/* C879B4 80241F04 E7A60010 */ swc1 $f6, 0x10($sp) +/* C879B8 80241F08 C600000C */ lwc1 $f0, 0xc($s0) +/* C879BC 80241F0C E7A00014 */ swc1 $f0, 0x14($sp) +/* C879C0 80241F10 860200A8 */ lh $v0, 0xa8($s0) +/* C879C4 80241F14 27A50020 */ addiu $a1, $sp, 0x20 +/* C879C8 80241F18 44820000 */ mtc1 $v0, $f0 +/* C879CC 80241F1C 00000000 */ nop +/* C879D0 80241F20 46800020 */ cvt.s.w $f0, $f0 +/* C879D4 80241F24 E7A00018 */ swc1 $f0, 0x18($sp) +/* C879D8 80241F28 860200A6 */ lh $v0, 0xa6($s0) +/* C879DC 80241F2C 27A60024 */ addiu $a2, $sp, 0x24 +/* C879E0 80241F30 44820000 */ mtc1 $v0, $f0 +/* C879E4 80241F34 00000000 */ nop +/* C879E8 80241F38 46800020 */ cvt.s.w $f0, $f0 +/* C879EC 80241F3C E7A0001C */ swc1 $f0, 0x1c($sp) +/* C879F0 80241F40 8E040080 */ lw $a0, 0x80($s0) +/* C879F4 80241F44 0C037711 */ jal func_800DDC44 +/* C879F8 80241F48 27A70028 */ addiu $a3, $sp, 0x28 +/* C879FC 80241F4C 0040902D */ daddu $s2, $v0, $zero +/* C87A00 80241F50 16400005 */ bnez $s2, .L80241F68 +/* C87A04 80241F54 00000000 */ nop +/* C87A08 80241F58 8E050018 */ lw $a1, 0x18($s0) +/* C87A0C 80241F5C 8E06000C */ lw $a2, 0xc($s0) +/* C87A10 80241F60 0C00EA95 */ jal npc_move_heading +/* C87A14 80241F64 0200202D */ daddu $a0, $s0, $zero +.L80241F68: +/* C87A18 80241F68 8602008E */ lh $v0, 0x8e($s0) +/* C87A1C 80241F6C 9603008E */ lhu $v1, 0x8e($s0) +/* C87A20 80241F70 18400007 */ blez $v0, .L80241F90 +/* C87A24 80241F74 2462FFFF */ addiu $v0, $v1, -1 +/* C87A28 80241F78 A602008E */ sh $v0, 0x8e($s0) +/* C87A2C 80241F7C 00021400 */ sll $v0, $v0, 0x10 +/* C87A30 80241F80 18400003 */ blez $v0, .L80241F90 +/* C87A34 80241F84 00000000 */ nop +/* C87A38 80241F88 12400008 */ beqz $s2, .L80241FAC +/* C87A3C 80241F8C 00000000 */ nop +.L80241F90: +/* C87A40 80241F90 8E2200CC */ lw $v0, 0xcc($s1) +/* C87A44 80241F94 A2200007 */ sb $zero, 7($s1) +/* C87A48 80241F98 8C420028 */ lw $v0, 0x28($v0) +/* C87A4C 80241F9C A600008E */ sh $zero, 0x8e($s0) +/* C87A50 80241FA0 AE020028 */ sw $v0, 0x28($s0) +/* C87A54 80241FA4 2402000F */ addiu $v0, $zero, 0xf +/* C87A58 80241FA8 AE620070 */ sw $v0, 0x70($s3) +.L80241FAC: +/* C87A5C 80241FAC 8FBF0040 */ lw $ra, 0x40($sp) +/* C87A60 80241FB0 8FB3003C */ lw $s3, 0x3c($sp) +/* C87A64 80241FB4 8FB20038 */ lw $s2, 0x38($sp) +/* C87A68 80241FB8 8FB10034 */ lw $s1, 0x34($sp) +/* C87A6C 80241FBC 8FB00030 */ lw $s0, 0x30($sp) +/* C87A70 80241FC0 03E00008 */ jr $ra +/* C87A74 80241FC4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048.s deleted file mode 100644 index 09812c5ee5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242048 -/* C87AF8 80242048 27BDFF90 */ addiu $sp, $sp, -0x70 -/* C87AFC 8024204C AFB3005C */ sw $s3, 0x5c($sp) -/* C87B00 80242050 0080982D */ daddu $s3, $a0, $zero -/* C87B04 80242054 AFBF0068 */ sw $ra, 0x68($sp) -/* C87B08 80242058 AFB50064 */ sw $s5, 0x64($sp) -/* C87B0C 8024205C AFB40060 */ sw $s4, 0x60($sp) -/* C87B10 80242060 AFB20058 */ sw $s2, 0x58($sp) -/* C87B14 80242064 AFB10054 */ sw $s1, 0x54($sp) -/* C87B18 80242068 AFB00050 */ sw $s0, 0x50($sp) -/* C87B1C 8024206C 8E710148 */ lw $s1, 0x148($s3) -/* C87B20 80242070 86240008 */ lh $a0, 8($s1) -/* C87B24 80242074 0C00EABB */ jal get_npc_unsafe -/* C87B28 80242078 00A0802D */ daddu $s0, $a1, $zero -/* C87B2C 8024207C 8E63000C */ lw $v1, 0xc($s3) -/* C87B30 80242080 0260202D */ daddu $a0, $s3, $zero -/* C87B34 80242084 8C650000 */ lw $a1, ($v1) -/* C87B38 80242088 0C0B1EAF */ jal get_variable -/* C87B3C 8024208C 0040902D */ daddu $s2, $v0, $zero -/* C87B40 80242090 AFA00028 */ sw $zero, 0x28($sp) -/* C87B44 80242094 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B48 80242098 8C630030 */ lw $v1, 0x30($v1) -/* C87B4C 8024209C AFA3002C */ sw $v1, 0x2c($sp) -/* C87B50 802420A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B54 802420A4 8C63001C */ lw $v1, 0x1c($v1) -/* C87B58 802420A8 AFA30030 */ sw $v1, 0x30($sp) -/* C87B5C 802420AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B60 802420B0 8C630024 */ lw $v1, 0x24($v1) -/* C87B64 802420B4 AFA30034 */ sw $v1, 0x34($sp) -/* C87B68 802420B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B6C 802420BC 8C630028 */ lw $v1, 0x28($v1) -/* C87B70 802420C0 27B50028 */ addiu $s5, $sp, 0x28 -/* C87B74 802420C4 AFA30038 */ sw $v1, 0x38($sp) -/* C87B78 802420C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* C87B7C 802420CC 3C0142C8 */ lui $at, 0x42c8 -/* C87B80 802420D0 44810000 */ mtc1 $at, $f0 -/* C87B84 802420D4 8C63002C */ lw $v1, 0x2c($v1) -/* C87B88 802420D8 0040A02D */ daddu $s4, $v0, $zero -/* C87B8C 802420DC E7A00040 */ swc1 $f0, 0x40($sp) -/* C87B90 802420E0 A7A00044 */ sh $zero, 0x44($sp) -/* C87B94 802420E4 12000009 */ beqz $s0, .L8024210C -/* C87B98 802420E8 AFA3003C */ sw $v1, 0x3c($sp) -/* C87B9C 802420EC 864300A8 */ lh $v1, 0xa8($s2) -/* C87BA0 802420F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* C87BA4 802420F4 AE20008C */ sw $zero, 0x8c($s1) -/* C87BA8 802420F8 A22000B5 */ sb $zero, 0xb5($s1) -/* C87BAC 802420FC 34420008 */ ori $v0, $v0, 8 -/* C87BB0 80242100 AE230084 */ sw $v1, 0x84($s1) -/* C87BB4 80242104 08090847 */ j .L8024211C -/* C87BB8 80242108 AE2200B0 */ sw $v0, 0xb0($s1) -.L8024210C: -/* C87BBC 8024210C 8E2200B0 */ lw $v0, 0xb0($s1) -/* C87BC0 80242110 30420004 */ andi $v0, $v0, 4 -/* C87BC4 80242114 10400047 */ beqz $v0, .L80242234 -/* C87BC8 80242118 00000000 */ nop -.L8024211C: -/* C87BCC 8024211C AE600070 */ sw $zero, 0x70($s3) -/* C87BD0 80242120 A640008E */ sh $zero, 0x8e($s2) -/* C87BD4 80242124 8E2300CC */ lw $v1, 0xcc($s1) -/* C87BD8 80242128 2404F7FF */ addiu $a0, $zero, -0x801 -/* C87BDC 8024212C A2200007 */ sb $zero, 7($s1) -/* C87BE0 80242130 8E420000 */ lw $v0, ($s2) -/* C87BE4 80242134 8C630000 */ lw $v1, ($v1) -/* C87BE8 80242138 00441024 */ and $v0, $v0, $a0 -/* C87BEC 8024213C AE420000 */ sw $v0, ($s2) -/* C87BF0 80242140 AE430028 */ sw $v1, 0x28($s2) -/* C87BF4 80242144 96220086 */ lhu $v0, 0x86($s1) -/* C87BF8 80242148 A64200A8 */ sh $v0, 0xa8($s2) -/* C87BFC 8024214C 8E2200D0 */ lw $v0, 0xd0($s1) -/* C87C00 80242150 AE200090 */ sw $zero, 0x90($s1) -/* C87C04 80242154 8C420034 */ lw $v0, 0x34($v0) -/* C87C08 80242158 14400006 */ bnez $v0, .L80242174 -/* C87C0C 8024215C 2403FDFF */ addiu $v1, $zero, -0x201 -/* C87C10 80242160 8E420000 */ lw $v0, ($s2) -/* C87C14 80242164 2403FFF7 */ addiu $v1, $zero, -9 -/* C87C18 80242168 34420200 */ ori $v0, $v0, 0x200 -/* C87C1C 8024216C 08090860 */ j .L80242180 -/* C87C20 80242170 00431024 */ and $v0, $v0, $v1 -.L80242174: -/* C87C24 80242174 8E420000 */ lw $v0, ($s2) -/* C87C28 80242178 00431024 */ and $v0, $v0, $v1 -/* C87C2C 8024217C 34420008 */ ori $v0, $v0, 8 -.L80242180: -/* C87C30 80242180 AE420000 */ sw $v0, ($s2) -/* C87C34 80242184 8E2200B0 */ lw $v0, 0xb0($s1) -/* C87C38 80242188 30420004 */ andi $v0, $v0, 4 -/* C87C3C 8024218C 1040001E */ beqz $v0, .L80242208 -/* C87C40 80242190 24040002 */ addiu $a0, $zero, 2 -/* C87C44 80242194 0240282D */ daddu $a1, $s2, $zero -/* C87C48 80242198 0000302D */ daddu $a2, $zero, $zero -/* C87C4C 8024219C 24020063 */ addiu $v0, $zero, 0x63 -/* C87C50 802421A0 AE620070 */ sw $v0, 0x70($s3) -/* C87C54 802421A4 AE600074 */ sw $zero, 0x74($s3) -/* C87C58 802421A8 864300A8 */ lh $v1, 0xa8($s2) -/* C87C5C 802421AC 3C013F80 */ lui $at, 0x3f80 -/* C87C60 802421B0 44810000 */ mtc1 $at, $f0 -/* C87C64 802421B4 3C014000 */ lui $at, 0x4000 -/* C87C68 802421B8 44811000 */ mtc1 $at, $f2 -/* C87C6C 802421BC 3C01C1A0 */ lui $at, 0xc1a0 -/* C87C70 802421C0 44812000 */ mtc1 $at, $f4 -/* C87C74 802421C4 24020028 */ addiu $v0, $zero, 0x28 -/* C87C78 802421C8 AFA2001C */ sw $v0, 0x1c($sp) -/* C87C7C 802421CC 44833000 */ mtc1 $v1, $f6 -/* C87C80 802421D0 00000000 */ nop -/* C87C84 802421D4 468031A0 */ cvt.s.w $f6, $f6 -/* C87C88 802421D8 44073000 */ mfc1 $a3, $f6 -/* C87C8C 802421DC 27A20048 */ addiu $v0, $sp, 0x48 -/* C87C90 802421E0 AFA20020 */ sw $v0, 0x20($sp) -/* C87C94 802421E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* C87C98 802421E8 E7A20014 */ swc1 $f2, 0x14($sp) -/* C87C9C 802421EC 0C01BFA4 */ jal fx_emote -/* C87CA0 802421F0 E7A40018 */ swc1 $f4, 0x18($sp) -/* C87CA4 802421F4 8E2200B0 */ lw $v0, 0xb0($s1) -/* C87CA8 802421F8 2403FFFB */ addiu $v1, $zero, -5 -/* C87CAC 802421FC 00431024 */ and $v0, $v0, $v1 -/* C87CB0 80242200 0809088D */ j .L80242234 -/* C87CB4 80242204 AE2200B0 */ sw $v0, 0xb0($s1) -.L80242208: -/* C87CB8 80242208 8E220000 */ lw $v0, ($s1) -/* C87CBC 8024220C 3C034000 */ lui $v1, 0x4000 -/* C87CC0 80242210 00431024 */ and $v0, $v0, $v1 -/* C87CC4 80242214 10400007 */ beqz $v0, .L80242234 -/* C87CC8 80242218 3C03BFFF */ lui $v1, 0xbfff -/* C87CCC 8024221C 2402000C */ addiu $v0, $zero, 0xc -/* C87CD0 80242220 AE620070 */ sw $v0, 0x70($s3) -/* C87CD4 80242224 8E220000 */ lw $v0, ($s1) -/* C87CD8 80242228 3463FFFF */ ori $v1, $v1, 0xffff -/* C87CDC 8024222C 00431024 */ and $v0, $v0, $v1 -/* C87CE0 80242230 AE220000 */ sw $v0, ($s1) -.L80242234: -/* C87CE4 80242234 8E220090 */ lw $v0, 0x90($s1) -/* C87CE8 80242238 1840000C */ blez $v0, .L8024226C -/* C87CEC 8024223C 2442FFFF */ addiu $v0, $v0, -1 -/* C87CF0 80242240 14400087 */ bnez $v0, .L80242460 -/* C87CF4 80242244 AE220090 */ sw $v0, 0x90($s1) -/* C87CF8 80242248 3C03FFAA */ lui $v1, 0xffaa -/* C87CFC 8024224C 8E420028 */ lw $v0, 0x28($s2) -/* C87D00 80242250 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* C87D04 80242254 00431021 */ addu $v0, $v0, $v1 -/* C87D08 80242258 2C420002 */ sltiu $v0, $v0, 2 -/* C87D0C 8024225C 10400003 */ beqz $v0, .L8024226C -/* C87D10 80242260 3C020055 */ lui $v0, 0x55 -/* C87D14 80242264 3442000C */ ori $v0, $v0, 0xc -/* C87D18 80242268 AE420028 */ sw $v0, 0x28($s2) -.L8024226C: -/* C87D1C 8024226C 8E630070 */ lw $v1, 0x70($s3) -/* C87D20 80242270 2402000C */ addiu $v0, $zero, 0xc -/* C87D24 80242274 10620048 */ beq $v1, $v0, .L80242398 -/* C87D28 80242278 2862000D */ slti $v0, $v1, 0xd -/* C87D2C 8024227C 1040000F */ beqz $v0, .L802422BC -/* C87D30 80242280 24100001 */ addiu $s0, $zero, 1 -/* C87D34 80242284 1070001E */ beq $v1, $s0, .L80242300 -/* C87D38 80242288 28620002 */ slti $v0, $v1, 2 -/* C87D3C 8024228C 10400005 */ beqz $v0, .L802422A4 -/* C87D40 80242290 24020002 */ addiu $v0, $zero, 2 -/* C87D44 80242294 10600015 */ beqz $v1, .L802422EC -/* C87D48 80242298 0260202D */ daddu $a0, $s3, $zero -/* C87D4C 8024229C 080908FD */ j .L802423F4 -/* C87D50 802422A0 00000000 */ nop -.L802422A4: -/* C87D54 802422A4 1062001C */ beq $v1, $v0, .L80242318 -/* C87D58 802422A8 24020003 */ addiu $v0, $zero, 3 -/* C87D5C 802422AC 10620035 */ beq $v1, $v0, .L80242384 -/* C87D60 802422B0 0260202D */ daddu $a0, $s3, $zero -/* C87D64 802422B4 080908FD */ j .L802423F4 -/* C87D68 802422B8 00000000 */ nop -.L802422BC: -/* C87D6C 802422BC 2402000E */ addiu $v0, $zero, 0xe -/* C87D70 802422C0 1062003F */ beq $v1, $v0, .L802423C0 -/* C87D74 802422C4 0062102A */ slt $v0, $v1, $v0 -/* C87D78 802422C8 14400038 */ bnez $v0, .L802423AC -/* C87D7C 802422CC 0260202D */ daddu $a0, $s3, $zero -/* C87D80 802422D0 2402000F */ addiu $v0, $zero, 0xf -/* C87D84 802422D4 10620040 */ beq $v1, $v0, .L802423D8 -/* C87D88 802422D8 24020063 */ addiu $v0, $zero, 0x63 -/* C87D8C 802422DC 10620043 */ beq $v1, $v0, .L802423EC -/* C87D90 802422E0 00000000 */ nop -/* C87D94 802422E4 080908FD */ j .L802423F4 -/* C87D98 802422E8 00000000 */ nop -.L802422EC: -/* C87D9C 802422EC 0280282D */ daddu $a1, $s4, $zero -/* C87DA0 802422F0 0C012568 */ jal func_800495A0 -/* C87DA4 802422F4 02A0302D */ daddu $a2, $s5, $zero -/* C87DA8 802422F8 96220086 */ lhu $v0, 0x86($s1) -/* C87DAC 802422FC A64200A8 */ sh $v0, 0xa8($s2) -.L80242300: -/* C87DB0 80242300 0260202D */ daddu $a0, $s3, $zero -/* C87DB4 80242304 0280282D */ daddu $a1, $s4, $zero -/* C87DB8 80242308 0C0125AE */ jal func_800496B8 -/* C87DBC 8024230C 02A0302D */ daddu $a2, $s5, $zero -/* C87DC0 80242310 080908FD */ j .L802423F4 -/* C87DC4 80242314 00000000 */ nop -.L80242318: -/* C87DC8 80242318 0260202D */ daddu $a0, $s3, $zero -/* C87DCC 8024231C 0280282D */ daddu $a1, $s4, $zero -/* C87DD0 80242320 0C0126D1 */ jal func_80049B44 -/* C87DD4 80242324 02A0302D */ daddu $a2, $s5, $zero -/* C87DD8 80242328 8E230088 */ lw $v1, 0x88($s1) -/* C87DDC 8024232C 24020006 */ addiu $v0, $zero, 6 -/* C87DE0 80242330 14620014 */ bne $v1, $v0, .L80242384 -/* C87DE4 80242334 0260202D */ daddu $a0, $s3, $zero -/* C87DE8 80242338 0C00A67F */ jal rand_int -/* C87DEC 8024233C 24040064 */ addiu $a0, $zero, 0x64 -/* C87DF0 80242340 28420021 */ slti $v0, $v0, 0x21 -/* C87DF4 80242344 5040000F */ beql $v0, $zero, .L80242384 -/* C87DF8 80242348 0260202D */ daddu $a0, $s3, $zero -/* C87DFC 8024234C 8E22008C */ lw $v0, 0x8c($s1) -/* C87E00 80242350 10400005 */ beqz $v0, .L80242368 -/* C87E04 80242354 3C020055 */ lui $v0, 0x55 -/* C87E08 80242358 3442002F */ ori $v0, $v0, 0x2f -/* C87E0C 8024235C AE20008C */ sw $zero, 0x8c($s1) -/* C87E10 80242360 080908DD */ j .L80242374 -/* C87E14 80242364 A22000B5 */ sb $zero, 0xb5($s1) -.L80242368: -/* C87E18 80242368 3442002E */ ori $v0, $v0, 0x2e -/* C87E1C 8024236C AE30008C */ sw $s0, 0x8c($s1) -/* C87E20 80242370 A23000B5 */ sb $s0, 0xb5($s1) -.L80242374: -/* C87E24 80242374 AE420028 */ sw $v0, 0x28($s2) -/* C87E28 80242378 24020007 */ addiu $v0, $zero, 7 -/* C87E2C 8024237C 08090918 */ j .L80242460 -/* C87E30 80242380 AE220090 */ sw $v0, 0x90($s1) -.L80242384: -/* C87E34 80242384 0280282D */ daddu $a1, $s4, $zero -/* C87E38 80242388 0C012701 */ jal func_80049C04 -/* C87E3C 8024238C 02A0302D */ daddu $a2, $s5, $zero -/* C87E40 80242390 080908FD */ j .L802423F4 -/* C87E44 80242394 00000000 */ nop -.L80242398: -/* C87E48 80242398 0260202D */ daddu $a0, $s3, $zero -/* C87E4C 8024239C 0280282D */ daddu $a1, $s4, $zero -/* C87E50 802423A0 0C09072D */ jal func_80241CB4 -/* C87E54 802423A4 02A0302D */ daddu $a2, $s5, $zero -/* C87E58 802423A8 0260202D */ daddu $a0, $s3, $zero -.L802423AC: -/* C87E5C 802423AC 0280282D */ daddu $a1, $s4, $zero -/* C87E60 802423B0 0C09074C */ jal func_80241D30 -/* C87E64 802423B4 02A0302D */ daddu $a2, $s5, $zero -/* C87E68 802423B8 080908FD */ j .L802423F4 -/* C87E6C 802423BC 00000000 */ nop -.L802423C0: -/* C87E70 802423C0 0260202D */ daddu $a0, $s3, $zero -/* C87E74 802423C4 0280282D */ daddu $a1, $s4, $zero -/* C87E78 802423C8 0C090799 */ jal func_80241E64 -/* C87E7C 802423CC 02A0302D */ daddu $a2, $s5, $zero -/* C87E80 802423D0 080908FD */ j .L802423F4 -/* C87E84 802423D4 00000000 */ nop -.L802423D8: -/* C87E88 802423D8 0280282D */ daddu $a1, $s4, $zero -/* C87E8C 802423DC 0C0907F2 */ jal func_80241FC8 -/* C87E90 802423E0 02A0302D */ daddu $a2, $s5, $zero -/* C87E94 802423E4 080908FD */ j .L802423F4 -/* C87E98 802423E8 00000000 */ nop -.L802423EC: -/* C87E9C 802423EC 0C0129CF */ jal func_8004A73C -/* C87EA0 802423F0 0260202D */ daddu $a0, $s3, $zero -.L802423F4: -/* C87EA4 802423F4 8E230088 */ lw $v1, 0x88($s1) -/* C87EA8 802423F8 24020006 */ addiu $v0, $zero, 6 -/* C87EAC 802423FC 14620019 */ bne $v1, $v0, .L80242464 -/* C87EB0 80242400 0000102D */ daddu $v0, $zero, $zero -/* C87EB4 80242404 8E22008C */ lw $v0, 0x8c($s1) -/* C87EB8 80242408 10400003 */ beqz $v0, .L80242418 -/* C87EBC 8024240C 24020001 */ addiu $v0, $zero, 1 -/* C87EC0 80242410 08090907 */ j .L8024241C -/* C87EC4 80242414 A22200B5 */ sb $v0, 0xb5($s1) -.L80242418: -/* C87EC8 80242418 A22000B5 */ sb $zero, 0xb5($s1) -.L8024241C: -/* C87ECC 8024241C 8E22008C */ lw $v0, 0x8c($s1) -/* C87ED0 80242420 1040000F */ beqz $v0, .L80242460 -/* C87ED4 80242424 3C03FFAA */ lui $v1, 0xffaa -/* C87ED8 80242428 8E420028 */ lw $v0, 0x28($s2) -/* C87EDC 8024242C 3463FFFC */ ori $v1, $v1, 0xfffc -/* C87EE0 80242430 00431821 */ addu $v1, $v0, $v1 -/* C87EE4 80242434 2C620015 */ sltiu $v0, $v1, 0x15 -/* C87EE8 80242438 10400009 */ beqz $v0, .L80242460 -/* C87EEC 8024243C 00031080 */ sll $v0, $v1, 2 -/* C87EF0 80242440 3C018024 */ lui $at, 0x8024 -/* C87EF4 80242444 00220821 */ addu $at, $at, $v0 -/* C87EF8 80242448 8C226570 */ lw $v0, 0x6570($at) -/* C87EFC 8024244C 00400008 */ jr $v0 -/* C87F00 80242450 00000000 */ nop -/* C87F04 80242454 8E420028 */ lw $v0, 0x28($s2) -/* C87F08 80242458 24420001 */ addiu $v0, $v0, 1 -/* C87F0C 8024245C AE420028 */ sw $v0, 0x28($s2) -.L80242460: -/* C87F10 80242460 0000102D */ daddu $v0, $zero, $zero -.L80242464: -/* C87F14 80242464 8FBF0068 */ lw $ra, 0x68($sp) -/* C87F18 80242468 8FB50064 */ lw $s5, 0x64($sp) -/* C87F1C 8024246C 8FB40060 */ lw $s4, 0x60($sp) -/* C87F20 80242470 8FB3005C */ lw $s3, 0x5c($sp) -/* C87F24 80242474 8FB20058 */ lw $s2, 0x58($sp) -/* C87F28 80242478 8FB10054 */ lw $s1, 0x54($sp) -/* C87F2C 8024247C 8FB00050 */ lw $s0, 0x50($sp) -/* C87F30 80242480 03E00008 */ jr $ra -/* C87F34 80242484 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s new file mode 100644 index 0000000000..865fdb1614 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C85DC0/func_80242048_C87AF8.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242048_C87AF8 +/* C87AF8 80242048 27BDFF90 */ addiu $sp, $sp, -0x70 +/* C87AFC 8024204C AFB3005C */ sw $s3, 0x5c($sp) +/* C87B00 80242050 0080982D */ daddu $s3, $a0, $zero +/* C87B04 80242054 AFBF0068 */ sw $ra, 0x68($sp) +/* C87B08 80242058 AFB50064 */ sw $s5, 0x64($sp) +/* C87B0C 8024205C AFB40060 */ sw $s4, 0x60($sp) +/* C87B10 80242060 AFB20058 */ sw $s2, 0x58($sp) +/* C87B14 80242064 AFB10054 */ sw $s1, 0x54($sp) +/* C87B18 80242068 AFB00050 */ sw $s0, 0x50($sp) +/* C87B1C 8024206C 8E710148 */ lw $s1, 0x148($s3) +/* C87B20 80242070 86240008 */ lh $a0, 8($s1) +/* C87B24 80242074 0C00EABB */ jal get_npc_unsafe +/* C87B28 80242078 00A0802D */ daddu $s0, $a1, $zero +/* C87B2C 8024207C 8E63000C */ lw $v1, 0xc($s3) +/* C87B30 80242080 0260202D */ daddu $a0, $s3, $zero +/* C87B34 80242084 8C650000 */ lw $a1, ($v1) +/* C87B38 80242088 0C0B1EAF */ jal get_variable +/* C87B3C 8024208C 0040902D */ daddu $s2, $v0, $zero +/* C87B40 80242090 AFA00028 */ sw $zero, 0x28($sp) +/* C87B44 80242094 8E2300D0 */ lw $v1, 0xd0($s1) +/* C87B48 80242098 8C630030 */ lw $v1, 0x30($v1) +/* C87B4C 8024209C AFA3002C */ sw $v1, 0x2c($sp) +/* C87B50 802420A0 8E2300D0 */ lw $v1, 0xd0($s1) +/* C87B54 802420A4 8C63001C */ lw $v1, 0x1c($v1) +/* C87B58 802420A8 AFA30030 */ sw $v1, 0x30($sp) +/* C87B5C 802420AC 8E2300D0 */ lw $v1, 0xd0($s1) +/* C87B60 802420B0 8C630024 */ lw $v1, 0x24($v1) +/* C87B64 802420B4 AFA30034 */ sw $v1, 0x34($sp) +/* C87B68 802420B8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C87B6C 802420BC 8C630028 */ lw $v1, 0x28($v1) +/* C87B70 802420C0 27B50028 */ addiu $s5, $sp, 0x28 +/* C87B74 802420C4 AFA30038 */ sw $v1, 0x38($sp) +/* C87B78 802420C8 8E2300D0 */ lw $v1, 0xd0($s1) +/* C87B7C 802420CC 3C0142C8 */ lui $at, 0x42c8 +/* C87B80 802420D0 44810000 */ mtc1 $at, $f0 +/* C87B84 802420D4 8C63002C */ lw $v1, 0x2c($v1) +/* C87B88 802420D8 0040A02D */ daddu $s4, $v0, $zero +/* C87B8C 802420DC E7A00040 */ swc1 $f0, 0x40($sp) +/* C87B90 802420E0 A7A00044 */ sh $zero, 0x44($sp) +/* C87B94 802420E4 12000009 */ beqz $s0, .L8024210C +/* C87B98 802420E8 AFA3003C */ sw $v1, 0x3c($sp) +/* C87B9C 802420EC 864300A8 */ lh $v1, 0xa8($s2) +/* C87BA0 802420F0 8E2200B0 */ lw $v0, 0xb0($s1) +/* C87BA4 802420F4 AE20008C */ sw $zero, 0x8c($s1) +/* C87BA8 802420F8 A22000B5 */ sb $zero, 0xb5($s1) +/* C87BAC 802420FC 34420008 */ ori $v0, $v0, 8 +/* C87BB0 80242100 AE230084 */ sw $v1, 0x84($s1) +/* C87BB4 80242104 08090847 */ j .L8024211C +/* C87BB8 80242108 AE2200B0 */ sw $v0, 0xb0($s1) +.L8024210C: +/* C87BBC 8024210C 8E2200B0 */ lw $v0, 0xb0($s1) +/* C87BC0 80242110 30420004 */ andi $v0, $v0, 4 +/* C87BC4 80242114 10400047 */ beqz $v0, .L80242234 +/* C87BC8 80242118 00000000 */ nop +.L8024211C: +/* C87BCC 8024211C AE600070 */ sw $zero, 0x70($s3) +/* C87BD0 80242120 A640008E */ sh $zero, 0x8e($s2) +/* C87BD4 80242124 8E2300CC */ lw $v1, 0xcc($s1) +/* C87BD8 80242128 2404F7FF */ addiu $a0, $zero, -0x801 +/* C87BDC 8024212C A2200007 */ sb $zero, 7($s1) +/* C87BE0 80242130 8E420000 */ lw $v0, ($s2) +/* C87BE4 80242134 8C630000 */ lw $v1, ($v1) +/* C87BE8 80242138 00441024 */ and $v0, $v0, $a0 +/* C87BEC 8024213C AE420000 */ sw $v0, ($s2) +/* C87BF0 80242140 AE430028 */ sw $v1, 0x28($s2) +/* C87BF4 80242144 96220086 */ lhu $v0, 0x86($s1) +/* C87BF8 80242148 A64200A8 */ sh $v0, 0xa8($s2) +/* C87BFC 8024214C 8E2200D0 */ lw $v0, 0xd0($s1) +/* C87C00 80242150 AE200090 */ sw $zero, 0x90($s1) +/* C87C04 80242154 8C420034 */ lw $v0, 0x34($v0) +/* C87C08 80242158 14400006 */ bnez $v0, .L80242174 +/* C87C0C 8024215C 2403FDFF */ addiu $v1, $zero, -0x201 +/* C87C10 80242160 8E420000 */ lw $v0, ($s2) +/* C87C14 80242164 2403FFF7 */ addiu $v1, $zero, -9 +/* C87C18 80242168 34420200 */ ori $v0, $v0, 0x200 +/* C87C1C 8024216C 08090860 */ j .L80242180 +/* C87C20 80242170 00431024 */ and $v0, $v0, $v1 +.L80242174: +/* C87C24 80242174 8E420000 */ lw $v0, ($s2) +/* C87C28 80242178 00431024 */ and $v0, $v0, $v1 +/* C87C2C 8024217C 34420008 */ ori $v0, $v0, 8 +.L80242180: +/* C87C30 80242180 AE420000 */ sw $v0, ($s2) +/* C87C34 80242184 8E2200B0 */ lw $v0, 0xb0($s1) +/* C87C38 80242188 30420004 */ andi $v0, $v0, 4 +/* C87C3C 8024218C 1040001E */ beqz $v0, .L80242208 +/* C87C40 80242190 24040002 */ addiu $a0, $zero, 2 +/* C87C44 80242194 0240282D */ daddu $a1, $s2, $zero +/* C87C48 80242198 0000302D */ daddu $a2, $zero, $zero +/* C87C4C 8024219C 24020063 */ addiu $v0, $zero, 0x63 +/* C87C50 802421A0 AE620070 */ sw $v0, 0x70($s3) +/* C87C54 802421A4 AE600074 */ sw $zero, 0x74($s3) +/* C87C58 802421A8 864300A8 */ lh $v1, 0xa8($s2) +/* C87C5C 802421AC 3C013F80 */ lui $at, 0x3f80 +/* C87C60 802421B0 44810000 */ mtc1 $at, $f0 +/* C87C64 802421B4 3C014000 */ lui $at, 0x4000 +/* C87C68 802421B8 44811000 */ mtc1 $at, $f2 +/* C87C6C 802421BC 3C01C1A0 */ lui $at, 0xc1a0 +/* C87C70 802421C0 44812000 */ mtc1 $at, $f4 +/* C87C74 802421C4 24020028 */ addiu $v0, $zero, 0x28 +/* C87C78 802421C8 AFA2001C */ sw $v0, 0x1c($sp) +/* C87C7C 802421CC 44833000 */ mtc1 $v1, $f6 +/* C87C80 802421D0 00000000 */ nop +/* C87C84 802421D4 468031A0 */ cvt.s.w $f6, $f6 +/* C87C88 802421D8 44073000 */ mfc1 $a3, $f6 +/* C87C8C 802421DC 27A20048 */ addiu $v0, $sp, 0x48 +/* C87C90 802421E0 AFA20020 */ sw $v0, 0x20($sp) +/* C87C94 802421E4 E7A00010 */ swc1 $f0, 0x10($sp) +/* C87C98 802421E8 E7A20014 */ swc1 $f2, 0x14($sp) +/* C87C9C 802421EC 0C01BFA4 */ jal fx_emote +/* C87CA0 802421F0 E7A40018 */ swc1 $f4, 0x18($sp) +/* C87CA4 802421F4 8E2200B0 */ lw $v0, 0xb0($s1) +/* C87CA8 802421F8 2403FFFB */ addiu $v1, $zero, -5 +/* C87CAC 802421FC 00431024 */ and $v0, $v0, $v1 +/* C87CB0 80242200 0809088D */ j .L80242234 +/* C87CB4 80242204 AE2200B0 */ sw $v0, 0xb0($s1) +.L80242208: +/* C87CB8 80242208 8E220000 */ lw $v0, ($s1) +/* C87CBC 8024220C 3C034000 */ lui $v1, 0x4000 +/* C87CC0 80242210 00431024 */ and $v0, $v0, $v1 +/* C87CC4 80242214 10400007 */ beqz $v0, .L80242234 +/* C87CC8 80242218 3C03BFFF */ lui $v1, 0xbfff +/* C87CCC 8024221C 2402000C */ addiu $v0, $zero, 0xc +/* C87CD0 80242220 AE620070 */ sw $v0, 0x70($s3) +/* C87CD4 80242224 8E220000 */ lw $v0, ($s1) +/* C87CD8 80242228 3463FFFF */ ori $v1, $v1, 0xffff +/* C87CDC 8024222C 00431024 */ and $v0, $v0, $v1 +/* C87CE0 80242230 AE220000 */ sw $v0, ($s1) +.L80242234: +/* C87CE4 80242234 8E220090 */ lw $v0, 0x90($s1) +/* C87CE8 80242238 1840000C */ blez $v0, .L8024226C +/* C87CEC 8024223C 2442FFFF */ addiu $v0, $v0, -1 +/* C87CF0 80242240 14400087 */ bnez $v0, .L80242460 +/* C87CF4 80242244 AE220090 */ sw $v0, 0x90($s1) +/* C87CF8 80242248 3C03FFAA */ lui $v1, 0xffaa +/* C87CFC 8024224C 8E420028 */ lw $v0, 0x28($s2) +/* C87D00 80242250 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* C87D04 80242254 00431021 */ addu $v0, $v0, $v1 +/* C87D08 80242258 2C420002 */ sltiu $v0, $v0, 2 +/* C87D0C 8024225C 10400003 */ beqz $v0, .L8024226C +/* C87D10 80242260 3C020055 */ lui $v0, 0x55 +/* C87D14 80242264 3442000C */ ori $v0, $v0, 0xc +/* C87D18 80242268 AE420028 */ sw $v0, 0x28($s2) +.L8024226C: +/* C87D1C 8024226C 8E630070 */ lw $v1, 0x70($s3) +/* C87D20 80242270 2402000C */ addiu $v0, $zero, 0xc +/* C87D24 80242274 10620048 */ beq $v1, $v0, .L80242398 +/* C87D28 80242278 2862000D */ slti $v0, $v1, 0xd +/* C87D2C 8024227C 1040000F */ beqz $v0, .L802422BC +/* C87D30 80242280 24100001 */ addiu $s0, $zero, 1 +/* C87D34 80242284 1070001E */ beq $v1, $s0, .L80242300 +/* C87D38 80242288 28620002 */ slti $v0, $v1, 2 +/* C87D3C 8024228C 10400005 */ beqz $v0, .L802422A4 +/* C87D40 80242290 24020002 */ addiu $v0, $zero, 2 +/* C87D44 80242294 10600015 */ beqz $v1, .L802422EC +/* C87D48 80242298 0260202D */ daddu $a0, $s3, $zero +/* C87D4C 8024229C 080908FD */ j .L802423F4 +/* C87D50 802422A0 00000000 */ nop +.L802422A4: +/* C87D54 802422A4 1062001C */ beq $v1, $v0, .L80242318 +/* C87D58 802422A8 24020003 */ addiu $v0, $zero, 3 +/* C87D5C 802422AC 10620035 */ beq $v1, $v0, .L80242384 +/* C87D60 802422B0 0260202D */ daddu $a0, $s3, $zero +/* C87D64 802422B4 080908FD */ j .L802423F4 +/* C87D68 802422B8 00000000 */ nop +.L802422BC: +/* C87D6C 802422BC 2402000E */ addiu $v0, $zero, 0xe +/* C87D70 802422C0 1062003F */ beq $v1, $v0, .L802423C0 +/* C87D74 802422C4 0062102A */ slt $v0, $v1, $v0 +/* C87D78 802422C8 14400038 */ bnez $v0, .L802423AC +/* C87D7C 802422CC 0260202D */ daddu $a0, $s3, $zero +/* C87D80 802422D0 2402000F */ addiu $v0, $zero, 0xf +/* C87D84 802422D4 10620040 */ beq $v1, $v0, .L802423D8 +/* C87D88 802422D8 24020063 */ addiu $v0, $zero, 0x63 +/* C87D8C 802422DC 10620043 */ beq $v1, $v0, .L802423EC +/* C87D90 802422E0 00000000 */ nop +/* C87D94 802422E4 080908FD */ j .L802423F4 +/* C87D98 802422E8 00000000 */ nop +.L802422EC: +/* C87D9C 802422EC 0280282D */ daddu $a1, $s4, $zero +/* C87DA0 802422F0 0C012568 */ jal func_800495A0 +/* C87DA4 802422F4 02A0302D */ daddu $a2, $s5, $zero +/* C87DA8 802422F8 96220086 */ lhu $v0, 0x86($s1) +/* C87DAC 802422FC A64200A8 */ sh $v0, 0xa8($s2) +.L80242300: +/* C87DB0 80242300 0260202D */ daddu $a0, $s3, $zero +/* C87DB4 80242304 0280282D */ daddu $a1, $s4, $zero +/* C87DB8 80242308 0C0125AE */ jal func_800496B8 +/* C87DBC 8024230C 02A0302D */ daddu $a2, $s5, $zero +/* C87DC0 80242310 080908FD */ j .L802423F4 +/* C87DC4 80242314 00000000 */ nop +.L80242318: +/* C87DC8 80242318 0260202D */ daddu $a0, $s3, $zero +/* C87DCC 8024231C 0280282D */ daddu $a1, $s4, $zero +/* C87DD0 80242320 0C0126D1 */ jal func_80049B44 +/* C87DD4 80242324 02A0302D */ daddu $a2, $s5, $zero +/* C87DD8 80242328 8E230088 */ lw $v1, 0x88($s1) +/* C87DDC 8024232C 24020006 */ addiu $v0, $zero, 6 +/* C87DE0 80242330 14620014 */ bne $v1, $v0, .L80242384 +/* C87DE4 80242334 0260202D */ daddu $a0, $s3, $zero +/* C87DE8 80242338 0C00A67F */ jal rand_int +/* C87DEC 8024233C 24040064 */ addiu $a0, $zero, 0x64 +/* C87DF0 80242340 28420021 */ slti $v0, $v0, 0x21 +/* C87DF4 80242344 5040000F */ beql $v0, $zero, .L80242384 +/* C87DF8 80242348 0260202D */ daddu $a0, $s3, $zero +/* C87DFC 8024234C 8E22008C */ lw $v0, 0x8c($s1) +/* C87E00 80242350 10400005 */ beqz $v0, .L80242368 +/* C87E04 80242354 3C020055 */ lui $v0, 0x55 +/* C87E08 80242358 3442002F */ ori $v0, $v0, 0x2f +/* C87E0C 8024235C AE20008C */ sw $zero, 0x8c($s1) +/* C87E10 80242360 080908DD */ j .L80242374 +/* C87E14 80242364 A22000B5 */ sb $zero, 0xb5($s1) +.L80242368: +/* C87E18 80242368 3442002E */ ori $v0, $v0, 0x2e +/* C87E1C 8024236C AE30008C */ sw $s0, 0x8c($s1) +/* C87E20 80242370 A23000B5 */ sb $s0, 0xb5($s1) +.L80242374: +/* C87E24 80242374 AE420028 */ sw $v0, 0x28($s2) +/* C87E28 80242378 24020007 */ addiu $v0, $zero, 7 +/* C87E2C 8024237C 08090918 */ j .L80242460 +/* C87E30 80242380 AE220090 */ sw $v0, 0x90($s1) +.L80242384: +/* C87E34 80242384 0280282D */ daddu $a1, $s4, $zero +/* C87E38 80242388 0C012701 */ jal func_80049C04 +/* C87E3C 8024238C 02A0302D */ daddu $a2, $s5, $zero +/* C87E40 80242390 080908FD */ j .L802423F4 +/* C87E44 80242394 00000000 */ nop +.L80242398: +/* C87E48 80242398 0260202D */ daddu $a0, $s3, $zero +/* C87E4C 8024239C 0280282D */ daddu $a1, $s4, $zero +/* C87E50 802423A0 0C09072D */ jal func_80241CB4_C87764 +/* C87E54 802423A4 02A0302D */ daddu $a2, $s5, $zero +/* C87E58 802423A8 0260202D */ daddu $a0, $s3, $zero +.L802423AC: +/* C87E5C 802423AC 0280282D */ daddu $a1, $s4, $zero +/* C87E60 802423B0 0C09074C */ jal func_80241D30_C877E0 +/* C87E64 802423B4 02A0302D */ daddu $a2, $s5, $zero +/* C87E68 802423B8 080908FD */ j .L802423F4 +/* C87E6C 802423BC 00000000 */ nop +.L802423C0: +/* C87E70 802423C0 0260202D */ daddu $a0, $s3, $zero +/* C87E74 802423C4 0280282D */ daddu $a1, $s4, $zero +/* C87E78 802423C8 0C090799 */ jal func_80241E64_C87914 +/* C87E7C 802423CC 02A0302D */ daddu $a2, $s5, $zero +/* C87E80 802423D0 080908FD */ j .L802423F4 +/* C87E84 802423D4 00000000 */ nop +.L802423D8: +/* C87E88 802423D8 0280282D */ daddu $a1, $s4, $zero +/* C87E8C 802423DC 0C0907F2 */ jal func_80241FC8_C87A78 +/* C87E90 802423E0 02A0302D */ daddu $a2, $s5, $zero +/* C87E94 802423E4 080908FD */ j .L802423F4 +/* C87E98 802423E8 00000000 */ nop +.L802423EC: +/* C87E9C 802423EC 0C0129CF */ jal func_8004A73C +/* C87EA0 802423F0 0260202D */ daddu $a0, $s3, $zero +.L802423F4: +/* C87EA4 802423F4 8E230088 */ lw $v1, 0x88($s1) +/* C87EA8 802423F8 24020006 */ addiu $v0, $zero, 6 +/* C87EAC 802423FC 14620019 */ bne $v1, $v0, .L80242464 +/* C87EB0 80242400 0000102D */ daddu $v0, $zero, $zero +/* C87EB4 80242404 8E22008C */ lw $v0, 0x8c($s1) +/* C87EB8 80242408 10400003 */ beqz $v0, .L80242418 +/* C87EBC 8024240C 24020001 */ addiu $v0, $zero, 1 +/* C87EC0 80242410 08090907 */ j .L8024241C +/* C87EC4 80242414 A22200B5 */ sb $v0, 0xb5($s1) +.L80242418: +/* C87EC8 80242418 A22000B5 */ sb $zero, 0xb5($s1) +.L8024241C: +/* C87ECC 8024241C 8E22008C */ lw $v0, 0x8c($s1) +/* C87ED0 80242420 1040000F */ beqz $v0, .L80242460 +/* C87ED4 80242424 3C03FFAA */ lui $v1, 0xffaa +/* C87ED8 80242428 8E420028 */ lw $v0, 0x28($s2) +/* C87EDC 8024242C 3463FFFC */ ori $v1, $v1, 0xfffc +/* C87EE0 80242430 00431821 */ addu $v1, $v0, $v1 +/* C87EE4 80242434 2C620015 */ sltiu $v0, $v1, 0x15 +/* C87EE8 80242438 10400009 */ beqz $v0, .L80242460 +/* C87EEC 8024243C 00031080 */ sll $v0, $v1, 2 +/* C87EF0 80242440 3C018024 */ lui $at, 0x8024 +/* C87EF4 80242444 00220821 */ addu $at, $at, $v0 +/* C87EF8 80242448 8C226570 */ lw $v0, 0x6570($at) +/* C87EFC 8024244C 00400008 */ jr $v0 +/* C87F00 80242450 00000000 */ nop +/* C87F04 80242454 8E420028 */ lw $v0, 0x28($s2) +/* C87F08 80242458 24420001 */ addiu $v0, $v0, 1 +/* C87F0C 8024245C AE420028 */ sw $v0, 0x28($s2) +.L80242460: +/* C87F10 80242460 0000102D */ daddu $v0, $zero, $zero +.L80242464: +/* C87F14 80242464 8FBF0068 */ lw $ra, 0x68($sp) +/* C87F18 80242468 8FB50064 */ lw $s5, 0x64($sp) +/* C87F1C 8024246C 8FB40060 */ lw $s4, 0x60($sp) +/* C87F20 80242470 8FB3005C */ lw $s3, 0x5c($sp) +/* C87F24 80242474 8FB20058 */ lw $s2, 0x58($sp) +/* C87F28 80242478 8FB10054 */ lw $s1, 0x54($sp) +/* C87F2C 8024247C 8FB00050 */ lw $s0, 0x50($sp) +/* C87F30 80242480 03E00008 */ jr $ra +/* C87F34 80242484 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C.s deleted file mode 100644 index 602e720b87..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D4C -/* C887FC 80242D4C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* C88800 80242D50 AFB00028 */ sw $s0, 0x28($sp) -/* C88804 80242D54 0080802D */ daddu $s0, $a0, $zero -/* C88808 80242D58 AFBF002C */ sw $ra, 0x2c($sp) -/* C8880C 80242D5C C6000084 */ lwc1 $f0, 0x84($s0) -/* C88810 80242D60 46800020 */ cvt.s.w $f0, $f0 -/* C88814 80242D64 E7A00018 */ swc1 $f0, 0x18($sp) -/* C88818 80242D68 C600008C */ lwc1 $f0, 0x8c($s0) -/* C8881C 80242D6C 46800020 */ cvt.s.w $f0, $f0 -/* C88820 80242D70 27A20024 */ addiu $v0, $sp, 0x24 -/* C88824 80242D74 3C040001 */ lui $a0, 1 -/* C88828 80242D78 27A50018 */ addiu $a1, $sp, 0x18 -/* C8882C 80242D7C 27A6001C */ addiu $a2, $sp, 0x1c -/* C88830 80242D80 3C0144FA */ lui $at, 0x44fa -/* C88834 80242D84 44811000 */ mtc1 $at, $f2 -/* C88838 80242D88 27A70020 */ addiu $a3, $sp, 0x20 -/* C8883C 80242D8C E7A0001C */ swc1 $f0, 0x1c($sp) -/* C88840 80242D90 AFA00020 */ sw $zero, 0x20($sp) -/* C88844 80242D94 E7A20024 */ swc1 $f2, 0x24($sp) -/* C88848 80242D98 0C0372DF */ jal func_800DCB7C -/* C8884C 80242D9C AFA20010 */ sw $v0, 0x10($sp) -/* C88850 80242DA0 1040000B */ beqz $v0, .L80242DD0 -/* C88854 80242DA4 00000000 */ nop -/* C88858 80242DA8 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* C8885C 80242DAC 3C01425C */ lui $at, 0x425c -/* C88860 80242DB0 44810000 */ mtc1 $at, $f0 -/* C88864 80242DB4 00000000 */ nop -/* C88868 80242DB8 46001080 */ add.s $f2, $f2, $f0 -/* C8886C 80242DBC C7A00018 */ lwc1 $f0, 0x18($sp) -/* C88870 80242DC0 4600010D */ trunc.w.s $f4, $f0 -/* C88874 80242DC4 E6040084 */ swc1 $f4, 0x84($s0) -/* C88878 80242DC8 4600110D */ trunc.w.s $f4, $f2 -/* C8887C 80242DCC E604008C */ swc1 $f4, 0x8c($s0) -.L80242DD0: -/* C88880 80242DD0 8FBF002C */ lw $ra, 0x2c($sp) -/* C88884 80242DD4 8FB00028 */ lw $s0, 0x28($sp) -/* C88888 80242DD8 24020002 */ addiu $v0, $zero, 2 -/* C8888C 80242DDC 03E00008 */ jr $ra -/* C88890 80242DE0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s new file mode 100644 index 0000000000..271ef72118 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242D4C_C887FC.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D4C_C887FC +/* C887FC 80242D4C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* C88800 80242D50 AFB00028 */ sw $s0, 0x28($sp) +/* C88804 80242D54 0080802D */ daddu $s0, $a0, $zero +/* C88808 80242D58 AFBF002C */ sw $ra, 0x2c($sp) +/* C8880C 80242D5C C6000084 */ lwc1 $f0, 0x84($s0) +/* C88810 80242D60 46800020 */ cvt.s.w $f0, $f0 +/* C88814 80242D64 E7A00018 */ swc1 $f0, 0x18($sp) +/* C88818 80242D68 C600008C */ lwc1 $f0, 0x8c($s0) +/* C8881C 80242D6C 46800020 */ cvt.s.w $f0, $f0 +/* C88820 80242D70 27A20024 */ addiu $v0, $sp, 0x24 +/* C88824 80242D74 3C040001 */ lui $a0, 1 +/* C88828 80242D78 27A50018 */ addiu $a1, $sp, 0x18 +/* C8882C 80242D7C 27A6001C */ addiu $a2, $sp, 0x1c +/* C88830 80242D80 3C0144FA */ lui $at, 0x44fa +/* C88834 80242D84 44811000 */ mtc1 $at, $f2 +/* C88838 80242D88 27A70020 */ addiu $a3, $sp, 0x20 +/* C8883C 80242D8C E7A0001C */ swc1 $f0, 0x1c($sp) +/* C88840 80242D90 AFA00020 */ sw $zero, 0x20($sp) +/* C88844 80242D94 E7A20024 */ swc1 $f2, 0x24($sp) +/* C88848 80242D98 0C0372DF */ jal func_800DCB7C +/* C8884C 80242D9C AFA20010 */ sw $v0, 0x10($sp) +/* C88850 80242DA0 1040000B */ beqz $v0, .L80242DD0 +/* C88854 80242DA4 00000000 */ nop +/* C88858 80242DA8 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* C8885C 80242DAC 3C01425C */ lui $at, 0x425c +/* C88860 80242DB0 44810000 */ mtc1 $at, $f0 +/* C88864 80242DB4 00000000 */ nop +/* C88868 80242DB8 46001080 */ add.s $f2, $f2, $f0 +/* C8886C 80242DBC C7A00018 */ lwc1 $f0, 0x18($sp) +/* C88870 80242DC0 4600010D */ trunc.w.s $f4, $f0 +/* C88874 80242DC4 E6040084 */ swc1 $f4, 0x84($s0) +/* C88878 80242DC8 4600110D */ trunc.w.s $f4, $f2 +/* C8887C 80242DCC E604008C */ swc1 $f4, 0x8c($s0) +.L80242DD0: +/* C88880 80242DD0 8FBF002C */ lw $ra, 0x2c($sp) +/* C88884 80242DD4 8FB00028 */ lw $s0, 0x28($sp) +/* C88888 80242DD8 24020002 */ addiu $v0, $zero, 2 +/* C8888C 80242DDC 03E00008 */ jr $ra +/* C88890 80242DE0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4.s deleted file mode 100644 index 20f0e10e05..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DE4 -/* C88894 80242DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C88898 80242DE8 AFB00010 */ sw $s0, 0x10($sp) -/* C8889C 80242DEC 0080802D */ daddu $s0, $a0, $zero -/* C888A0 80242DF0 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* C888A4 80242DF4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* C888A8 80242DF8 AFBF0014 */ sw $ra, 0x14($sp) -/* C888AC 80242DFC C4400028 */ lwc1 $f0, 0x28($v0) -/* C888B0 80242E00 C6020084 */ lwc1 $f2, 0x84($s0) -/* C888B4 80242E04 468010A0 */ cvt.s.w $f2, $f2 -/* C888B8 80242E08 46001081 */ sub.s $f2, $f2, $f0 -/* C888BC 80242E0C 46021082 */ mul.s $f2, $f2, $f2 -/* C888C0 80242E10 00000000 */ nop -/* C888C4 80242E14 C440002C */ lwc1 $f0, 0x2c($v0) -/* C888C8 80242E18 C604008C */ lwc1 $f4, 0x8c($s0) -/* C888CC 80242E1C 46802120 */ cvt.s.w $f4, $f4 -/* C888D0 80242E20 46002101 */ sub.s $f4, $f4, $f0 -/* C888D4 80242E24 46042102 */ mul.s $f4, $f4, $f4 -/* C888D8 80242E28 00000000 */ nop -/* C888DC 80242E2C C4460030 */ lwc1 $f6, 0x30($v0) -/* C888E0 80242E30 44800000 */ mtc1 $zero, $f0 -/* C888E4 80242E34 00000000 */ nop -/* C888E8 80242E38 46060001 */ sub.s $f0, $f0, $f6 -/* C888EC 80242E3C 46000002 */ mul.s $f0, $f0, $f0 -/* C888F0 80242E40 00000000 */ nop -/* C888F4 80242E44 46041080 */ add.s $f2, $f2, $f4 -/* C888F8 80242E48 46001300 */ add.s $f12, $f2, $f0 -/* C888FC 80242E4C 46006004 */ sqrt.s $f0, $f12 -/* C88900 80242E50 46000032 */ c.eq.s $f0, $f0 -/* C88904 80242E54 00000000 */ nop -/* C88908 80242E58 45010003 */ bc1t .L80242E68 -/* C8890C 80242E5C 00000000 */ nop -/* C88910 80242E60 0C0187BC */ jal sqrtf -/* C88914 80242E64 00000000 */ nop -.L80242E68: -/* C88918 80242E68 4600020D */ trunc.w.s $f8, $f0 -/* C8891C 80242E6C E6080094 */ swc1 $f8, 0x94($s0) -/* C88920 80242E70 8FBF0014 */ lw $ra, 0x14($sp) -/* C88924 80242E74 8FB00010 */ lw $s0, 0x10($sp) -/* C88928 80242E78 24020002 */ addiu $v0, $zero, 2 -/* C8892C 80242E7C 03E00008 */ jr $ra -/* C88930 80242E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s new file mode 100644 index 0000000000..136cc4f560 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80242DE4_C88894.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242DE4_C88894 +/* C88894 80242DE4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C88898 80242DE8 AFB00010 */ sw $s0, 0x10($sp) +/* C8889C 80242DEC 0080802D */ daddu $s0, $a0, $zero +/* C888A0 80242DF0 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* C888A4 80242DF4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* C888A8 80242DF8 AFBF0014 */ sw $ra, 0x14($sp) +/* C888AC 80242DFC C4400028 */ lwc1 $f0, 0x28($v0) +/* C888B0 80242E00 C6020084 */ lwc1 $f2, 0x84($s0) +/* C888B4 80242E04 468010A0 */ cvt.s.w $f2, $f2 +/* C888B8 80242E08 46001081 */ sub.s $f2, $f2, $f0 +/* C888BC 80242E0C 46021082 */ mul.s $f2, $f2, $f2 +/* C888C0 80242E10 00000000 */ nop +/* C888C4 80242E14 C440002C */ lwc1 $f0, 0x2c($v0) +/* C888C8 80242E18 C604008C */ lwc1 $f4, 0x8c($s0) +/* C888CC 80242E1C 46802120 */ cvt.s.w $f4, $f4 +/* C888D0 80242E20 46002101 */ sub.s $f4, $f4, $f0 +/* C888D4 80242E24 46042102 */ mul.s $f4, $f4, $f4 +/* C888D8 80242E28 00000000 */ nop +/* C888DC 80242E2C C4460030 */ lwc1 $f6, 0x30($v0) +/* C888E0 80242E30 44800000 */ mtc1 $zero, $f0 +/* C888E4 80242E34 00000000 */ nop +/* C888E8 80242E38 46060001 */ sub.s $f0, $f0, $f6 +/* C888EC 80242E3C 46000002 */ mul.s $f0, $f0, $f0 +/* C888F0 80242E40 00000000 */ nop +/* C888F4 80242E44 46041080 */ add.s $f2, $f2, $f4 +/* C888F8 80242E48 46001300 */ add.s $f12, $f2, $f0 +/* C888FC 80242E4C 46006004 */ sqrt.s $f0, $f12 +/* C88900 80242E50 46000032 */ c.eq.s $f0, $f0 +/* C88904 80242E54 00000000 */ nop +/* C88908 80242E58 45010003 */ bc1t .L80242E68 +/* C8890C 80242E5C 00000000 */ nop +/* C88910 80242E60 0C0187BC */ jal sqrtf +/* C88914 80242E64 00000000 */ nop +.L80242E68: +/* C88918 80242E68 4600020D */ trunc.w.s $f8, $f0 +/* C8891C 80242E6C E6080094 */ swc1 $f8, 0x94($s0) +/* C88920 80242E70 8FBF0014 */ lw $ra, 0x14($sp) +/* C88924 80242E74 8FB00010 */ lw $s0, 0x10($sp) +/* C88928 80242E78 24020002 */ addiu $v0, $zero, 2 +/* C8892C 80242E7C 03E00008 */ jr $ra +/* C88930 80242E80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004.s deleted file mode 100644 index bef4035f8f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243004 -/* C88AB4 80243004 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C88AB8 80243008 AFB1001C */ sw $s1, 0x1c($sp) -/* C88ABC 8024300C 0080882D */ daddu $s1, $a0, $zero -/* C88AC0 80243010 AFBF0020 */ sw $ra, 0x20($sp) -/* C88AC4 80243014 AFB00018 */ sw $s0, 0x18($sp) -/* C88AC8 80243018 8E30000C */ lw $s0, 0xc($s1) -/* C88ACC 8024301C 8E050000 */ lw $a1, ($s0) -/* C88AD0 80243020 0C0B1EAF */ jal get_variable -/* C88AD4 80243024 26100004 */ addiu $s0, $s0, 4 -/* C88AD8 80243028 AE220070 */ sw $v0, 0x70($s1) -/* C88ADC 8024302C 8E050000 */ lw $a1, ($s0) -/* C88AE0 80243030 26100004 */ addiu $s0, $s0, 4 -/* C88AE4 80243034 0C0B1EAF */ jal get_variable -/* C88AE8 80243038 0220202D */ daddu $a0, $s1, $zero -/* C88AEC 8024303C AE220074 */ sw $v0, 0x74($s1) -/* C88AF0 80243040 8E050000 */ lw $a1, ($s0) -/* C88AF4 80243044 0C0B1EAF */ jal get_variable -/* C88AF8 80243048 0220202D */ daddu $a0, $s1, $zero -/* C88AFC 8024304C 24040052 */ addiu $a0, $zero, 0x52 -/* C88B00 80243050 0000282D */ daddu $a1, $zero, $zero -/* C88B04 80243054 C6200070 */ lwc1 $f0, 0x70($s1) -/* C88B08 80243058 46800020 */ cvt.s.w $f0, $f0 -/* C88B0C 8024305C C6220074 */ lwc1 $f2, 0x74($s1) -/* C88B10 80243060 468010A0 */ cvt.s.w $f2, $f2 -/* C88B14 80243064 44060000 */ mfc1 $a2, $f0 -/* C88B18 80243068 44071000 */ mfc1 $a3, $f2 -/* C88B1C 8024306C 44820000 */ mtc1 $v0, $f0 -/* C88B20 80243070 00000000 */ nop -/* C88B24 80243074 46800020 */ cvt.s.w $f0, $f0 -/* C88B28 80243078 AE220078 */ sw $v0, 0x78($s1) -/* C88B2C 8024307C 0C05267B */ jal func_801499EC -/* C88B30 80243080 E7A00010 */ swc1 $f0, 0x10($sp) -/* C88B34 80243084 8FBF0020 */ lw $ra, 0x20($sp) -/* C88B38 80243088 8FB1001C */ lw $s1, 0x1c($sp) -/* C88B3C 8024308C 8FB00018 */ lw $s0, 0x18($sp) -/* C88B40 80243090 24020002 */ addiu $v0, $zero, 2 -/* C88B44 80243094 03E00008 */ jr $ra -/* C88B48 80243098 27BD0028 */ addiu $sp, $sp, 0x28 -/* C88B4C 8024309C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s new file mode 100644 index 0000000000..1d78acf359 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_17/C887B0/func_80243004_C88AB4.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243004_C88AB4 +/* C88AB4 80243004 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C88AB8 80243008 AFB1001C */ sw $s1, 0x1c($sp) +/* C88ABC 8024300C 0080882D */ daddu $s1, $a0, $zero +/* C88AC0 80243010 AFBF0020 */ sw $ra, 0x20($sp) +/* C88AC4 80243014 AFB00018 */ sw $s0, 0x18($sp) +/* C88AC8 80243018 8E30000C */ lw $s0, 0xc($s1) +/* C88ACC 8024301C 8E050000 */ lw $a1, ($s0) +/* C88AD0 80243020 0C0B1EAF */ jal get_variable +/* C88AD4 80243024 26100004 */ addiu $s0, $s0, 4 +/* C88AD8 80243028 AE220070 */ sw $v0, 0x70($s1) +/* C88ADC 8024302C 8E050000 */ lw $a1, ($s0) +/* C88AE0 80243030 26100004 */ addiu $s0, $s0, 4 +/* C88AE4 80243034 0C0B1EAF */ jal get_variable +/* C88AE8 80243038 0220202D */ daddu $a0, $s1, $zero +/* C88AEC 8024303C AE220074 */ sw $v0, 0x74($s1) +/* C88AF0 80243040 8E050000 */ lw $a1, ($s0) +/* C88AF4 80243044 0C0B1EAF */ jal get_variable +/* C88AF8 80243048 0220202D */ daddu $a0, $s1, $zero +/* C88AFC 8024304C 24040052 */ addiu $a0, $zero, 0x52 +/* C88B00 80243050 0000282D */ daddu $a1, $zero, $zero +/* C88B04 80243054 C6200070 */ lwc1 $f0, 0x70($s1) +/* C88B08 80243058 46800020 */ cvt.s.w $f0, $f0 +/* C88B0C 8024305C C6220074 */ lwc1 $f2, 0x74($s1) +/* C88B10 80243060 468010A0 */ cvt.s.w $f2, $f2 +/* C88B14 80243064 44060000 */ mfc1 $a2, $f0 +/* C88B18 80243068 44071000 */ mfc1 $a3, $f2 +/* C88B1C 8024306C 44820000 */ mtc1 $v0, $f0 +/* C88B20 80243070 00000000 */ nop +/* C88B24 80243074 46800020 */ cvt.s.w $f0, $f0 +/* C88B28 80243078 AE220078 */ sw $v0, 0x78($s1) +/* C88B2C 8024307C 0C05267B */ jal func_801499EC +/* C88B30 80243080 E7A00010 */ swc1 $f0, 0x10($sp) +/* C88B34 80243084 8FBF0020 */ lw $ra, 0x20($sp) +/* C88B38 80243088 8FB1001C */ lw $s1, 0x1c($sp) +/* C88B3C 8024308C 8FB00018 */ lw $s0, 0x18($sp) +/* C88B40 80243090 24020002 */ addiu $v0, $zero, 2 +/* C88B44 80243094 03E00008 */ jr $ra +/* C88B48 80243098 27BD0028 */ addiu $sp, $sp, 0x28 +/* C88B4C 8024309C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8.s deleted file mode 100644 index 31f94f1a09..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8.s +++ /dev/null @@ -1,272 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B8 -/* C8E068 802404B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8E06C 802404BC AFBF0020 */ sw $ra, 0x20($sp) -/* C8E070 802404C0 AFB1001C */ sw $s1, 0x1c($sp) -/* C8E074 802404C4 AFB00018 */ sw $s0, 0x18($sp) -/* C8E078 802404C8 8C910084 */ lw $s1, 0x84($a0) -/* C8E07C 802404CC 86230044 */ lh $v1, 0x44($s1) -/* C8E080 802404D0 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* C8E084 802404D4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* C8E088 802404D8 2C620005 */ sltiu $v0, $v1, 5 -/* C8E08C 802404DC 1040008A */ beqz $v0, .L80240708 -/* C8E090 802404E0 00031080 */ sll $v0, $v1, 2 -/* C8E094 802404E4 3C018025 */ lui $at, 0x8025 -/* C8E098 802404E8 00220821 */ addu $at, $at, $v0 -/* C8E09C 802404EC 8C228340 */ lw $v0, -0x7cc0($at) -/* C8E0A0 802404F0 00400008 */ jr $v0 -/* C8E0A4 802404F4 00000000 */ nop -/* C8E0A8 802404F8 8E22003C */ lw $v0, 0x3c($s1) -/* C8E0AC 802404FC 86270046 */ lh $a3, 0x46($s1) -/* C8E0B0 80240500 AFA20010 */ sw $v0, 0x10($sp) -/* C8E0B4 80240504 8E250010 */ lw $a1, 0x10($s1) -/* C8E0B8 80240508 8E26001C */ lw $a2, 0x1c($s1) -/* C8E0BC 8024050C 0C00A8ED */ jal update_lerp -/* C8E0C0 80240510 24040005 */ addiu $a0, $zero, 5 -/* C8E0C4 80240514 86270046 */ lh $a3, 0x46($s1) -/* C8E0C8 80240518 8E22003C */ lw $v0, 0x3c($s1) -/* C8E0CC 8024051C E6200004 */ swc1 $f0, 4($s1) -/* C8E0D0 80240520 AFA20010 */ sw $v0, 0x10($sp) -/* C8E0D4 80240524 8E25000C */ lw $a1, 0xc($s1) -/* C8E0D8 80240528 8E260018 */ lw $a2, 0x18($s1) -/* C8E0DC 8024052C 0C00A8ED */ jal update_lerp -/* C8E0E0 80240530 0000202D */ daddu $a0, $zero, $zero -/* C8E0E4 80240534 86270046 */ lh $a3, 0x46($s1) -/* C8E0E8 80240538 8E22003C */ lw $v0, 0x3c($s1) -/* C8E0EC 8024053C E6200000 */ swc1 $f0, ($s1) -/* C8E0F0 80240540 AFA20010 */ sw $v0, 0x10($sp) -/* C8E0F4 80240544 8E250014 */ lw $a1, 0x14($s1) -/* C8E0F8 80240548 8E260020 */ lw $a2, 0x20($s1) -/* C8E0FC 8024054C 0C00A8ED */ jal update_lerp -/* C8E100 80240550 0000202D */ daddu $a0, $zero, $zero -/* C8E104 80240554 8E220050 */ lw $v0, 0x50($s1) -/* C8E108 80240558 E6200008 */ swc1 $f0, 8($s1) -/* C8E10C 8024055C C6200000 */ lwc1 $f0, ($s1) -/* C8E110 80240560 8C42000C */ lw $v0, 0xc($v0) -/* C8E114 80240564 E4400008 */ swc1 $f0, 8($v0) -/* C8E118 80240568 8E220050 */ lw $v0, 0x50($s1) -/* C8E11C 8024056C C6200004 */ lwc1 $f0, 4($s1) -/* C8E120 80240570 8C42000C */ lw $v0, 0xc($v0) -/* C8E124 80240574 E440000C */ swc1 $f0, 0xc($v0) -/* C8E128 80240578 8E220050 */ lw $v0, 0x50($s1) -/* C8E12C 8024057C C6200008 */ lwc1 $f0, 8($s1) -/* C8E130 80240580 8C42000C */ lw $v0, 0xc($v0) -/* C8E134 80240584 E4400010 */ swc1 $f0, 0x10($v0) -/* C8E138 80240588 96220046 */ lhu $v0, 0x46($s1) -/* C8E13C 8024058C 8E23003C */ lw $v1, 0x3c($s1) -/* C8E140 80240590 24420001 */ addiu $v0, $v0, 1 -/* C8E144 80240594 A6220046 */ sh $v0, 0x46($s1) -/* C8E148 80240598 00021400 */ sll $v0, $v0, 0x10 -/* C8E14C 8024059C 00021403 */ sra $v0, $v0, 0x10 -/* C8E150 802405A0 0043102A */ slt $v0, $v0, $v1 -/* C8E154 802405A4 14400058 */ bnez $v0, .L80240708 -/* C8E158 802405A8 24020001 */ addiu $v0, $zero, 1 -/* C8E15C 802405AC A6220044 */ sh $v0, 0x44($s1) -/* C8E160 802405B0 080901C2 */ j .L80240708 -/* C8E164 802405B4 A6200046 */ sh $zero, 0x46($s1) -/* C8E168 802405B8 96220046 */ lhu $v0, 0x46($s1) -/* C8E16C 802405BC 24420001 */ addiu $v0, $v0, 1 -/* C8E170 802405C0 A6220046 */ sh $v0, 0x46($s1) -/* C8E174 802405C4 00021400 */ sll $v0, $v0, 0x10 -/* C8E178 802405C8 00021403 */ sra $v0, $v0, 0x10 -/* C8E17C 802405CC 2842003C */ slti $v0, $v0, 0x3c -/* C8E180 802405D0 1440004D */ bnez $v0, .L80240708 -/* C8E184 802405D4 24020002 */ addiu $v0, $zero, 2 -/* C8E188 802405D8 8E230050 */ lw $v1, 0x50($s1) -/* C8E18C 802405DC A6220044 */ sh $v0, 0x44($s1) -/* C8E190 802405E0 A6200046 */ sh $zero, 0x46($s1) -/* C8E194 802405E4 8C63000C */ lw $v1, 0xc($v1) -/* C8E198 802405E8 24020001 */ addiu $v0, $zero, 1 -/* C8E19C 802405EC AC620070 */ sw $v0, 0x70($v1) -/* C8E1A0 802405F0 8E220050 */ lw $v0, 0x50($s1) -/* C8E1A4 802405F4 8C42000C */ lw $v0, 0xc($v0) -/* C8E1A8 802405F8 080901C2 */ j .L80240708 -/* C8E1AC 802405FC AC400074 */ sw $zero, 0x74($v0) -/* C8E1B0 80240600 96220046 */ lhu $v0, 0x46($s1) -/* C8E1B4 80240604 24420001 */ addiu $v0, $v0, 1 -/* C8E1B8 80240608 A6220046 */ sh $v0, 0x46($s1) -/* C8E1BC 8024060C 00021400 */ sll $v0, $v0, 0x10 -/* C8E1C0 80240610 00021403 */ sra $v0, $v0, 0x10 -/* C8E1C4 80240614 2842003C */ slti $v0, $v0, 0x3c -/* C8E1C8 80240618 1440003B */ bnez $v0, .L80240708 -/* C8E1CC 8024061C 00000000 */ nop -/* C8E1D0 80240620 3C013F80 */ lui $at, 0x3f80 -/* C8E1D4 80240624 44810000 */ mtc1 $at, $f0 -/* C8E1D8 80240628 AFA00014 */ sw $zero, 0x14($sp) -/* C8E1DC 8024062C E7A00010 */ swc1 $f0, 0x10($sp) -/* C8E1E0 80240630 8E250018 */ lw $a1, 0x18($s1) -/* C8E1E4 80240634 8E26001C */ lw $a2, 0x1c($s1) -/* C8E1E8 80240638 8E270020 */ lw $a3, 0x20($s1) -/* C8E1EC 8024063C 0C01C9AC */ jal func_800726B0 -/* C8E1F0 80240640 24040001 */ addiu $a0, $zero, 1 -/* C8E1F4 80240644 AE220054 */ sw $v0, 0x54($s1) -/* C8E1F8 80240648 8C43000C */ lw $v1, 0xc($v0) -/* C8E1FC 8024064C 9222003B */ lbu $v0, 0x3b($s1) -/* C8E200 80240650 A0620034 */ sb $v0, 0x34($v1) -/* C8E204 80240654 8E220054 */ lw $v0, 0x54($s1) -/* C8E208 80240658 8C42000C */ lw $v0, 0xc($v0) -/* C8E20C 8024065C AC400020 */ sw $zero, 0x20($v0) -/* C8E210 80240660 8E250018 */ lw $a1, 0x18($s1) -/* C8E214 80240664 8E260028 */ lw $a2, 0x28($s1) -/* C8E218 80240668 8E270020 */ lw $a3, 0x20($s1) -/* C8E21C 8024066C 0C044898 */ jal create_shadow_type -/* C8E220 80240670 0000202D */ daddu $a0, $zero, $zero -/* C8E224 80240674 3C014210 */ lui $at, 0x4210 -/* C8E228 80240678 44810000 */ mtc1 $at, $f0 -/* C8E22C 8024067C AE220040 */ sw $v0, 0x40($s1) -/* C8E230 80240680 24020003 */ addiu $v0, $zero, 3 -/* C8E234 80240684 A6220044 */ sh $v0, 0x44($s1) -/* C8E238 80240688 24020001 */ addiu $v0, $zero, 1 -/* C8E23C 8024068C A6200046 */ sh $zero, 0x46($s1) -/* C8E240 80240690 AE20002C */ sw $zero, 0x2c($s1) -/* C8E244 80240694 A6220048 */ sh $v0, 0x48($s1) -/* C8E248 80240698 080901C2 */ j .L80240708 -/* C8E24C 8024069C E6200030 */ swc1 $f0, 0x30($s1) -/* C8E250 802406A0 0000202D */ daddu $a0, $zero, $zero -/* C8E254 802406A4 3C054210 */ lui $a1, 0x4210 -/* C8E258 802406A8 3C064198 */ lui $a2, 0x4198 -/* C8E25C 802406AC 86270046 */ lh $a3, 0x46($s1) -/* C8E260 802406B0 24020078 */ addiu $v0, $zero, 0x78 -/* C8E264 802406B4 0C00A8ED */ jal update_lerp -/* C8E268 802406B8 AFA20010 */ sw $v0, 0x10($sp) -/* C8E26C 802406BC 96220046 */ lhu $v0, 0x46($s1) -/* C8E270 802406C0 E6200030 */ swc1 $f0, 0x30($s1) -/* C8E274 802406C4 24420001 */ addiu $v0, $v0, 1 -/* C8E278 802406C8 A6220046 */ sh $v0, 0x46($s1) -/* C8E27C 802406CC 00021400 */ sll $v0, $v0, 0x10 -/* C8E280 802406D0 00021403 */ sra $v0, $v0, 0x10 -/* C8E284 802406D4 28420078 */ slti $v0, $v0, 0x78 -/* C8E288 802406D8 1440000B */ bnez $v0, .L80240708 -/* C8E28C 802406DC 24030001 */ addiu $v1, $zero, 1 -/* C8E290 802406E0 C620002C */ lwc1 $f0, 0x2c($s1) -/* C8E294 802406E4 24020002 */ addiu $v0, $zero, 2 -/* C8E298 802406E8 A6220048 */ sh $v0, 0x48($s1) -/* C8E29C 802406EC 24020004 */ addiu $v0, $zero, 4 -/* C8E2A0 802406F0 A620004C */ sh $zero, 0x4c($s1) -/* C8E2A4 802406F4 A623004A */ sh $v1, 0x4a($s1) -/* C8E2A8 802406F8 A623004E */ sh $v1, 0x4e($s1) -/* C8E2AC 802406FC A6220044 */ sh $v0, 0x44($s1) -/* C8E2B0 80240700 A6200046 */ sh $zero, 0x46($s1) -/* C8E2B4 80240704 E6200034 */ swc1 $f0, 0x34($s1) -.L80240708: -/* C8E2B8 80240708 8623004A */ lh $v1, 0x4a($s1) -/* C8E2BC 8024070C 24020001 */ addiu $v0, $zero, 1 -/* C8E2C0 80240710 10620005 */ beq $v1, $v0, .L80240728 -/* C8E2C4 80240714 24020002 */ addiu $v0, $zero, 2 -/* C8E2C8 80240718 1062001E */ beq $v1, $v0, .L80240794 -/* C8E2CC 8024071C 00000000 */ nop -/* C8E2D0 80240720 0809020F */ j .L8024083C -/* C8E2D4 80240724 00000000 */ nop -.L80240728: -/* C8E2D8 80240728 8627004C */ lh $a3, 0x4c($s1) -/* C8E2DC 8024072C 24100078 */ addiu $s0, $zero, 0x78 -/* C8E2E0 80240730 AFB00010 */ sw $s0, 0x10($sp) -/* C8E2E4 80240734 8E250034 */ lw $a1, 0x34($s1) -/* C8E2E8 80240738 3C0644B4 */ lui $a2, 0x44b4 -/* C8E2EC 8024073C 0C00A8ED */ jal update_lerp -/* C8E2F0 80240740 24040004 */ addiu $a0, $zero, 4 -/* C8E2F4 80240744 8627004C */ lh $a3, 0x4c($s1) -/* C8E2F8 80240748 E620002C */ swc1 $f0, 0x2c($s1) -/* C8E2FC 8024074C AFB00010 */ sw $s0, 0x10($sp) -/* C8E300 80240750 8E25001C */ lw $a1, 0x1c($s1) -/* C8E304 80240754 8E260024 */ lw $a2, 0x24($s1) -/* C8E308 80240758 0C00A8ED */ jal update_lerp -/* C8E30C 8024075C 2404000A */ addiu $a0, $zero, 0xa -/* C8E310 80240760 9622004C */ lhu $v0, 0x4c($s1) -/* C8E314 80240764 E6200004 */ swc1 $f0, 4($s1) -/* C8E318 80240768 24420001 */ addiu $v0, $v0, 1 -/* C8E31C 8024076C A622004C */ sh $v0, 0x4c($s1) -/* C8E320 80240770 00021400 */ sll $v0, $v0, 0x10 -/* C8E324 80240774 00021403 */ sra $v0, $v0, 0x10 -/* C8E328 80240778 0050102A */ slt $v0, $v0, $s0 -/* C8E32C 8024077C 1440002F */ bnez $v0, .L8024083C -/* C8E330 80240780 2402010E */ addiu $v0, $zero, 0x10e -/* C8E334 80240784 A622004C */ sh $v0, 0x4c($s1) -/* C8E338 80240788 24020002 */ addiu $v0, $zero, 2 -/* C8E33C 8024078C 0809020E */ j .L80240838 -/* C8E340 80240790 A622004A */ sh $v0, 0x4a($s1) -.L80240794: -/* C8E344 80240794 8622004C */ lh $v0, 0x4c($s1) -/* C8E348 80240798 44826000 */ mtc1 $v0, $f12 -/* C8E34C 8024079C 00000000 */ nop -/* C8E350 802407A0 0C00A8BB */ jal sin_deg -/* C8E354 802407A4 46806320 */ cvt.s.w $f12, $f12 -/* C8E358 802407A8 3C013F80 */ lui $at, 0x3f80 -/* C8E35C 802407AC 44811000 */ mtc1 $at, $f2 -/* C8E360 802407B0 00000000 */ nop -/* C8E364 802407B4 46020000 */ add.s $f0, $f0, $f2 -/* C8E368 802407B8 46000000 */ add.s $f0, $f0, $f0 -/* C8E36C 802407BC C6220024 */ lwc1 $f2, 0x24($s1) -/* C8E370 802407C0 8622004C */ lh $v0, 0x4c($s1) -/* C8E374 802407C4 46001080 */ add.s $f2, $f2, $f0 -/* C8E378 802407C8 24420008 */ addiu $v0, $v0, 8 -/* C8E37C 802407CC 44826000 */ mtc1 $v0, $f12 -/* C8E380 802407D0 00000000 */ nop -/* C8E384 802407D4 46806320 */ cvt.s.w $f12, $f12 -/* C8E388 802407D8 0C00A6C9 */ jal clamp_angle -/* C8E38C 802407DC E6220004 */ swc1 $f2, 4($s1) -/* C8E390 802407E0 4600010D */ trunc.w.s $f4, $f0 -/* C8E394 802407E4 44022000 */ mfc1 $v0, $f4 -/* C8E398 802407E8 C6200004 */ lwc1 $f0, 4($s1) -/* C8E39C 802407EC A622004C */ sh $v0, 0x4c($s1) -/* C8E3A0 802407F0 C60C0028 */ lwc1 $f12, 0x28($s0) -/* C8E3A4 802407F4 8E060030 */ lw $a2, 0x30($s0) -/* C8E3A8 802407F8 3C0141A0 */ lui $at, 0x41a0 -/* C8E3AC 802407FC 44817000 */ mtc1 $at, $f14 -/* C8E3B0 80240800 E7A00010 */ swc1 $f0, 0x10($sp) -/* C8E3B4 80240804 C602002C */ lwc1 $f2, 0x2c($s0) -/* C8E3B8 80240808 C6200008 */ lwc1 $f0, 8($s1) -/* C8E3BC 8024080C E7A00014 */ swc1 $f0, 0x14($sp) -/* C8E3C0 80240810 8E270000 */ lw $a3, ($s1) -/* C8E3C4 80240814 0C00A7CB */ jal dist3D -/* C8E3C8 80240818 460E1380 */ add.s $f14, $f2, $f14 -/* C8E3CC 8024081C 3C0141F0 */ lui $at, 0x41f0 -/* C8E3D0 80240820 44811000 */ mtc1 $at, $f2 -/* C8E3D4 80240824 00000000 */ nop -/* C8E3D8 80240828 4600103C */ c.lt.s $f2, $f0 -/* C8E3DC 8024082C 00000000 */ nop -/* C8E3E0 80240830 45010002 */ bc1t .L8024083C -/* C8E3E4 80240834 24020003 */ addiu $v0, $zero, 3 -.L80240838: -/* C8E3E8 80240838 A622004E */ sh $v0, 0x4e($s1) -.L8024083C: -/* C8E3EC 8024083C 86230048 */ lh $v1, 0x48($s1) -/* C8E3F0 80240840 24020001 */ addiu $v0, $zero, 1 -/* C8E3F4 80240844 10620005 */ beq $v1, $v0, .L8024085C -/* C8E3F8 80240848 24020002 */ addiu $v0, $zero, 2 -/* C8E3FC 8024084C 10620008 */ beq $v1, $v0, .L80240870 -/* C8E400 80240850 00000000 */ nop -/* C8E404 80240854 0809022C */ j .L802408B0 -/* C8E408 80240858 00000000 */ nop -.L8024085C: -/* C8E40C 8024085C C620002C */ lwc1 $f0, 0x2c($s1) -/* C8E410 80240860 C62C0030 */ lwc1 $f12, 0x30($s1) -/* C8E414 80240864 0C00A6C9 */ jal clamp_angle -/* C8E418 80240868 460C0300 */ add.s $f12, $f0, $f12 -/* C8E41C 8024086C E620002C */ swc1 $f0, 0x2c($s1) -.L80240870: -/* C8E420 80240870 8E220054 */ lw $v0, 0x54($s1) -/* C8E424 80240874 C620002C */ lwc1 $f0, 0x2c($s1) -/* C8E428 80240878 8C42000C */ lw $v0, 0xc($v0) -/* C8E42C 8024087C E4400024 */ swc1 $f0, 0x24($v0) -/* C8E430 80240880 8E220054 */ lw $v0, 0x54($s1) -/* C8E434 80240884 C6200018 */ lwc1 $f0, 0x18($s1) -/* C8E438 80240888 8C42000C */ lw $v0, 0xc($v0) -/* C8E43C 8024088C E4400004 */ swc1 $f0, 4($v0) -/* C8E440 80240890 8E220054 */ lw $v0, 0x54($s1) -/* C8E444 80240894 C6200004 */ lwc1 $f0, 4($s1) -/* C8E448 80240898 8C42000C */ lw $v0, 0xc($v0) -/* C8E44C 8024089C E4400008 */ swc1 $f0, 8($v0) -/* C8E450 802408A0 8E220054 */ lw $v0, 0x54($s1) -/* C8E454 802408A4 C6200020 */ lwc1 $f0, 0x20($s1) -/* C8E458 802408A8 8C42000C */ lw $v0, 0xc($v0) -/* C8E45C 802408AC E440000C */ swc1 $f0, 0xc($v0) -.L802408B0: -/* C8E460 802408B0 8FBF0020 */ lw $ra, 0x20($sp) -/* C8E464 802408B4 8FB1001C */ lw $s1, 0x1c($sp) -/* C8E468 802408B8 8FB00018 */ lw $s0, 0x18($sp) -/* C8E46C 802408BC 0000102D */ daddu $v0, $zero, $zero -/* C8E470 802408C0 03E00008 */ jr $ra -/* C8E474 802408C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s new file mode 100644 index 0000000000..594461b6f1 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802404B8_C8E068.s @@ -0,0 +1,272 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404B8_C8E068 +/* C8E068 802404B8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C8E06C 802404BC AFBF0020 */ sw $ra, 0x20($sp) +/* C8E070 802404C0 AFB1001C */ sw $s1, 0x1c($sp) +/* C8E074 802404C4 AFB00018 */ sw $s0, 0x18($sp) +/* C8E078 802404C8 8C910084 */ lw $s1, 0x84($a0) +/* C8E07C 802404CC 86230044 */ lh $v1, 0x44($s1) +/* C8E080 802404D0 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* C8E084 802404D4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* C8E088 802404D8 2C620005 */ sltiu $v0, $v1, 5 +/* C8E08C 802404DC 1040008A */ beqz $v0, .L80240708 +/* C8E090 802404E0 00031080 */ sll $v0, $v1, 2 +/* C8E094 802404E4 3C018025 */ lui $at, 0x8025 +/* C8E098 802404E8 00220821 */ addu $at, $at, $v0 +/* C8E09C 802404EC 8C228340 */ lw $v0, -0x7cc0($at) +/* C8E0A0 802404F0 00400008 */ jr $v0 +/* C8E0A4 802404F4 00000000 */ nop +/* C8E0A8 802404F8 8E22003C */ lw $v0, 0x3c($s1) +/* C8E0AC 802404FC 86270046 */ lh $a3, 0x46($s1) +/* C8E0B0 80240500 AFA20010 */ sw $v0, 0x10($sp) +/* C8E0B4 80240504 8E250010 */ lw $a1, 0x10($s1) +/* C8E0B8 80240508 8E26001C */ lw $a2, 0x1c($s1) +/* C8E0BC 8024050C 0C00A8ED */ jal update_lerp +/* C8E0C0 80240510 24040005 */ addiu $a0, $zero, 5 +/* C8E0C4 80240514 86270046 */ lh $a3, 0x46($s1) +/* C8E0C8 80240518 8E22003C */ lw $v0, 0x3c($s1) +/* C8E0CC 8024051C E6200004 */ swc1 $f0, 4($s1) +/* C8E0D0 80240520 AFA20010 */ sw $v0, 0x10($sp) +/* C8E0D4 80240524 8E25000C */ lw $a1, 0xc($s1) +/* C8E0D8 80240528 8E260018 */ lw $a2, 0x18($s1) +/* C8E0DC 8024052C 0C00A8ED */ jal update_lerp +/* C8E0E0 80240530 0000202D */ daddu $a0, $zero, $zero +/* C8E0E4 80240534 86270046 */ lh $a3, 0x46($s1) +/* C8E0E8 80240538 8E22003C */ lw $v0, 0x3c($s1) +/* C8E0EC 8024053C E6200000 */ swc1 $f0, ($s1) +/* C8E0F0 80240540 AFA20010 */ sw $v0, 0x10($sp) +/* C8E0F4 80240544 8E250014 */ lw $a1, 0x14($s1) +/* C8E0F8 80240548 8E260020 */ lw $a2, 0x20($s1) +/* C8E0FC 8024054C 0C00A8ED */ jal update_lerp +/* C8E100 80240550 0000202D */ daddu $a0, $zero, $zero +/* C8E104 80240554 8E220050 */ lw $v0, 0x50($s1) +/* C8E108 80240558 E6200008 */ swc1 $f0, 8($s1) +/* C8E10C 8024055C C6200000 */ lwc1 $f0, ($s1) +/* C8E110 80240560 8C42000C */ lw $v0, 0xc($v0) +/* C8E114 80240564 E4400008 */ swc1 $f0, 8($v0) +/* C8E118 80240568 8E220050 */ lw $v0, 0x50($s1) +/* C8E11C 8024056C C6200004 */ lwc1 $f0, 4($s1) +/* C8E120 80240570 8C42000C */ lw $v0, 0xc($v0) +/* C8E124 80240574 E440000C */ swc1 $f0, 0xc($v0) +/* C8E128 80240578 8E220050 */ lw $v0, 0x50($s1) +/* C8E12C 8024057C C6200008 */ lwc1 $f0, 8($s1) +/* C8E130 80240580 8C42000C */ lw $v0, 0xc($v0) +/* C8E134 80240584 E4400010 */ swc1 $f0, 0x10($v0) +/* C8E138 80240588 96220046 */ lhu $v0, 0x46($s1) +/* C8E13C 8024058C 8E23003C */ lw $v1, 0x3c($s1) +/* C8E140 80240590 24420001 */ addiu $v0, $v0, 1 +/* C8E144 80240594 A6220046 */ sh $v0, 0x46($s1) +/* C8E148 80240598 00021400 */ sll $v0, $v0, 0x10 +/* C8E14C 8024059C 00021403 */ sra $v0, $v0, 0x10 +/* C8E150 802405A0 0043102A */ slt $v0, $v0, $v1 +/* C8E154 802405A4 14400058 */ bnez $v0, .L80240708 +/* C8E158 802405A8 24020001 */ addiu $v0, $zero, 1 +/* C8E15C 802405AC A6220044 */ sh $v0, 0x44($s1) +/* C8E160 802405B0 080901C2 */ j .L80240708 +/* C8E164 802405B4 A6200046 */ sh $zero, 0x46($s1) +/* C8E168 802405B8 96220046 */ lhu $v0, 0x46($s1) +/* C8E16C 802405BC 24420001 */ addiu $v0, $v0, 1 +/* C8E170 802405C0 A6220046 */ sh $v0, 0x46($s1) +/* C8E174 802405C4 00021400 */ sll $v0, $v0, 0x10 +/* C8E178 802405C8 00021403 */ sra $v0, $v0, 0x10 +/* C8E17C 802405CC 2842003C */ slti $v0, $v0, 0x3c +/* C8E180 802405D0 1440004D */ bnez $v0, .L80240708 +/* C8E184 802405D4 24020002 */ addiu $v0, $zero, 2 +/* C8E188 802405D8 8E230050 */ lw $v1, 0x50($s1) +/* C8E18C 802405DC A6220044 */ sh $v0, 0x44($s1) +/* C8E190 802405E0 A6200046 */ sh $zero, 0x46($s1) +/* C8E194 802405E4 8C63000C */ lw $v1, 0xc($v1) +/* C8E198 802405E8 24020001 */ addiu $v0, $zero, 1 +/* C8E19C 802405EC AC620070 */ sw $v0, 0x70($v1) +/* C8E1A0 802405F0 8E220050 */ lw $v0, 0x50($s1) +/* C8E1A4 802405F4 8C42000C */ lw $v0, 0xc($v0) +/* C8E1A8 802405F8 080901C2 */ j .L80240708 +/* C8E1AC 802405FC AC400074 */ sw $zero, 0x74($v0) +/* C8E1B0 80240600 96220046 */ lhu $v0, 0x46($s1) +/* C8E1B4 80240604 24420001 */ addiu $v0, $v0, 1 +/* C8E1B8 80240608 A6220046 */ sh $v0, 0x46($s1) +/* C8E1BC 8024060C 00021400 */ sll $v0, $v0, 0x10 +/* C8E1C0 80240610 00021403 */ sra $v0, $v0, 0x10 +/* C8E1C4 80240614 2842003C */ slti $v0, $v0, 0x3c +/* C8E1C8 80240618 1440003B */ bnez $v0, .L80240708 +/* C8E1CC 8024061C 00000000 */ nop +/* C8E1D0 80240620 3C013F80 */ lui $at, 0x3f80 +/* C8E1D4 80240624 44810000 */ mtc1 $at, $f0 +/* C8E1D8 80240628 AFA00014 */ sw $zero, 0x14($sp) +/* C8E1DC 8024062C E7A00010 */ swc1 $f0, 0x10($sp) +/* C8E1E0 80240630 8E250018 */ lw $a1, 0x18($s1) +/* C8E1E4 80240634 8E26001C */ lw $a2, 0x1c($s1) +/* C8E1E8 80240638 8E270020 */ lw $a3, 0x20($s1) +/* C8E1EC 8024063C 0C01C9AC */ jal func_800726B0 +/* C8E1F0 80240640 24040001 */ addiu $a0, $zero, 1 +/* C8E1F4 80240644 AE220054 */ sw $v0, 0x54($s1) +/* C8E1F8 80240648 8C43000C */ lw $v1, 0xc($v0) +/* C8E1FC 8024064C 9222003B */ lbu $v0, 0x3b($s1) +/* C8E200 80240650 A0620034 */ sb $v0, 0x34($v1) +/* C8E204 80240654 8E220054 */ lw $v0, 0x54($s1) +/* C8E208 80240658 8C42000C */ lw $v0, 0xc($v0) +/* C8E20C 8024065C AC400020 */ sw $zero, 0x20($v0) +/* C8E210 80240660 8E250018 */ lw $a1, 0x18($s1) +/* C8E214 80240664 8E260028 */ lw $a2, 0x28($s1) +/* C8E218 80240668 8E270020 */ lw $a3, 0x20($s1) +/* C8E21C 8024066C 0C044898 */ jal create_shadow_type +/* C8E220 80240670 0000202D */ daddu $a0, $zero, $zero +/* C8E224 80240674 3C014210 */ lui $at, 0x4210 +/* C8E228 80240678 44810000 */ mtc1 $at, $f0 +/* C8E22C 8024067C AE220040 */ sw $v0, 0x40($s1) +/* C8E230 80240680 24020003 */ addiu $v0, $zero, 3 +/* C8E234 80240684 A6220044 */ sh $v0, 0x44($s1) +/* C8E238 80240688 24020001 */ addiu $v0, $zero, 1 +/* C8E23C 8024068C A6200046 */ sh $zero, 0x46($s1) +/* C8E240 80240690 AE20002C */ sw $zero, 0x2c($s1) +/* C8E244 80240694 A6220048 */ sh $v0, 0x48($s1) +/* C8E248 80240698 080901C2 */ j .L80240708 +/* C8E24C 8024069C E6200030 */ swc1 $f0, 0x30($s1) +/* C8E250 802406A0 0000202D */ daddu $a0, $zero, $zero +/* C8E254 802406A4 3C054210 */ lui $a1, 0x4210 +/* C8E258 802406A8 3C064198 */ lui $a2, 0x4198 +/* C8E25C 802406AC 86270046 */ lh $a3, 0x46($s1) +/* C8E260 802406B0 24020078 */ addiu $v0, $zero, 0x78 +/* C8E264 802406B4 0C00A8ED */ jal update_lerp +/* C8E268 802406B8 AFA20010 */ sw $v0, 0x10($sp) +/* C8E26C 802406BC 96220046 */ lhu $v0, 0x46($s1) +/* C8E270 802406C0 E6200030 */ swc1 $f0, 0x30($s1) +/* C8E274 802406C4 24420001 */ addiu $v0, $v0, 1 +/* C8E278 802406C8 A6220046 */ sh $v0, 0x46($s1) +/* C8E27C 802406CC 00021400 */ sll $v0, $v0, 0x10 +/* C8E280 802406D0 00021403 */ sra $v0, $v0, 0x10 +/* C8E284 802406D4 28420078 */ slti $v0, $v0, 0x78 +/* C8E288 802406D8 1440000B */ bnez $v0, .L80240708 +/* C8E28C 802406DC 24030001 */ addiu $v1, $zero, 1 +/* C8E290 802406E0 C620002C */ lwc1 $f0, 0x2c($s1) +/* C8E294 802406E4 24020002 */ addiu $v0, $zero, 2 +/* C8E298 802406E8 A6220048 */ sh $v0, 0x48($s1) +/* C8E29C 802406EC 24020004 */ addiu $v0, $zero, 4 +/* C8E2A0 802406F0 A620004C */ sh $zero, 0x4c($s1) +/* C8E2A4 802406F4 A623004A */ sh $v1, 0x4a($s1) +/* C8E2A8 802406F8 A623004E */ sh $v1, 0x4e($s1) +/* C8E2AC 802406FC A6220044 */ sh $v0, 0x44($s1) +/* C8E2B0 80240700 A6200046 */ sh $zero, 0x46($s1) +/* C8E2B4 80240704 E6200034 */ swc1 $f0, 0x34($s1) +.L80240708: +/* C8E2B8 80240708 8623004A */ lh $v1, 0x4a($s1) +/* C8E2BC 8024070C 24020001 */ addiu $v0, $zero, 1 +/* C8E2C0 80240710 10620005 */ beq $v1, $v0, .L80240728 +/* C8E2C4 80240714 24020002 */ addiu $v0, $zero, 2 +/* C8E2C8 80240718 1062001E */ beq $v1, $v0, .L80240794 +/* C8E2CC 8024071C 00000000 */ nop +/* C8E2D0 80240720 0809020F */ j .L8024083C +/* C8E2D4 80240724 00000000 */ nop +.L80240728: +/* C8E2D8 80240728 8627004C */ lh $a3, 0x4c($s1) +/* C8E2DC 8024072C 24100078 */ addiu $s0, $zero, 0x78 +/* C8E2E0 80240730 AFB00010 */ sw $s0, 0x10($sp) +/* C8E2E4 80240734 8E250034 */ lw $a1, 0x34($s1) +/* C8E2E8 80240738 3C0644B4 */ lui $a2, 0x44b4 +/* C8E2EC 8024073C 0C00A8ED */ jal update_lerp +/* C8E2F0 80240740 24040004 */ addiu $a0, $zero, 4 +/* C8E2F4 80240744 8627004C */ lh $a3, 0x4c($s1) +/* C8E2F8 80240748 E620002C */ swc1 $f0, 0x2c($s1) +/* C8E2FC 8024074C AFB00010 */ sw $s0, 0x10($sp) +/* C8E300 80240750 8E25001C */ lw $a1, 0x1c($s1) +/* C8E304 80240754 8E260024 */ lw $a2, 0x24($s1) +/* C8E308 80240758 0C00A8ED */ jal update_lerp +/* C8E30C 8024075C 2404000A */ addiu $a0, $zero, 0xa +/* C8E310 80240760 9622004C */ lhu $v0, 0x4c($s1) +/* C8E314 80240764 E6200004 */ swc1 $f0, 4($s1) +/* C8E318 80240768 24420001 */ addiu $v0, $v0, 1 +/* C8E31C 8024076C A622004C */ sh $v0, 0x4c($s1) +/* C8E320 80240770 00021400 */ sll $v0, $v0, 0x10 +/* C8E324 80240774 00021403 */ sra $v0, $v0, 0x10 +/* C8E328 80240778 0050102A */ slt $v0, $v0, $s0 +/* C8E32C 8024077C 1440002F */ bnez $v0, .L8024083C +/* C8E330 80240780 2402010E */ addiu $v0, $zero, 0x10e +/* C8E334 80240784 A622004C */ sh $v0, 0x4c($s1) +/* C8E338 80240788 24020002 */ addiu $v0, $zero, 2 +/* C8E33C 8024078C 0809020E */ j .L80240838 +/* C8E340 80240790 A622004A */ sh $v0, 0x4a($s1) +.L80240794: +/* C8E344 80240794 8622004C */ lh $v0, 0x4c($s1) +/* C8E348 80240798 44826000 */ mtc1 $v0, $f12 +/* C8E34C 8024079C 00000000 */ nop +/* C8E350 802407A0 0C00A8BB */ jal sin_deg +/* C8E354 802407A4 46806320 */ cvt.s.w $f12, $f12 +/* C8E358 802407A8 3C013F80 */ lui $at, 0x3f80 +/* C8E35C 802407AC 44811000 */ mtc1 $at, $f2 +/* C8E360 802407B0 00000000 */ nop +/* C8E364 802407B4 46020000 */ add.s $f0, $f0, $f2 +/* C8E368 802407B8 46000000 */ add.s $f0, $f0, $f0 +/* C8E36C 802407BC C6220024 */ lwc1 $f2, 0x24($s1) +/* C8E370 802407C0 8622004C */ lh $v0, 0x4c($s1) +/* C8E374 802407C4 46001080 */ add.s $f2, $f2, $f0 +/* C8E378 802407C8 24420008 */ addiu $v0, $v0, 8 +/* C8E37C 802407CC 44826000 */ mtc1 $v0, $f12 +/* C8E380 802407D0 00000000 */ nop +/* C8E384 802407D4 46806320 */ cvt.s.w $f12, $f12 +/* C8E388 802407D8 0C00A6C9 */ jal clamp_angle +/* C8E38C 802407DC E6220004 */ swc1 $f2, 4($s1) +/* C8E390 802407E0 4600010D */ trunc.w.s $f4, $f0 +/* C8E394 802407E4 44022000 */ mfc1 $v0, $f4 +/* C8E398 802407E8 C6200004 */ lwc1 $f0, 4($s1) +/* C8E39C 802407EC A622004C */ sh $v0, 0x4c($s1) +/* C8E3A0 802407F0 C60C0028 */ lwc1 $f12, 0x28($s0) +/* C8E3A4 802407F4 8E060030 */ lw $a2, 0x30($s0) +/* C8E3A8 802407F8 3C0141A0 */ lui $at, 0x41a0 +/* C8E3AC 802407FC 44817000 */ mtc1 $at, $f14 +/* C8E3B0 80240800 E7A00010 */ swc1 $f0, 0x10($sp) +/* C8E3B4 80240804 C602002C */ lwc1 $f2, 0x2c($s0) +/* C8E3B8 80240808 C6200008 */ lwc1 $f0, 8($s1) +/* C8E3BC 8024080C E7A00014 */ swc1 $f0, 0x14($sp) +/* C8E3C0 80240810 8E270000 */ lw $a3, ($s1) +/* C8E3C4 80240814 0C00A7CB */ jal dist3D +/* C8E3C8 80240818 460E1380 */ add.s $f14, $f2, $f14 +/* C8E3CC 8024081C 3C0141F0 */ lui $at, 0x41f0 +/* C8E3D0 80240820 44811000 */ mtc1 $at, $f2 +/* C8E3D4 80240824 00000000 */ nop +/* C8E3D8 80240828 4600103C */ c.lt.s $f2, $f0 +/* C8E3DC 8024082C 00000000 */ nop +/* C8E3E0 80240830 45010002 */ bc1t .L8024083C +/* C8E3E4 80240834 24020003 */ addiu $v0, $zero, 3 +.L80240838: +/* C8E3E8 80240838 A622004E */ sh $v0, 0x4e($s1) +.L8024083C: +/* C8E3EC 8024083C 86230048 */ lh $v1, 0x48($s1) +/* C8E3F0 80240840 24020001 */ addiu $v0, $zero, 1 +/* C8E3F4 80240844 10620005 */ beq $v1, $v0, .L8024085C +/* C8E3F8 80240848 24020002 */ addiu $v0, $zero, 2 +/* C8E3FC 8024084C 10620008 */ beq $v1, $v0, .L80240870 +/* C8E400 80240850 00000000 */ nop +/* C8E404 80240854 0809022C */ j .L802408B0 +/* C8E408 80240858 00000000 */ nop +.L8024085C: +/* C8E40C 8024085C C620002C */ lwc1 $f0, 0x2c($s1) +/* C8E410 80240860 C62C0030 */ lwc1 $f12, 0x30($s1) +/* C8E414 80240864 0C00A6C9 */ jal clamp_angle +/* C8E418 80240868 460C0300 */ add.s $f12, $f0, $f12 +/* C8E41C 8024086C E620002C */ swc1 $f0, 0x2c($s1) +.L80240870: +/* C8E420 80240870 8E220054 */ lw $v0, 0x54($s1) +/* C8E424 80240874 C620002C */ lwc1 $f0, 0x2c($s1) +/* C8E428 80240878 8C42000C */ lw $v0, 0xc($v0) +/* C8E42C 8024087C E4400024 */ swc1 $f0, 0x24($v0) +/* C8E430 80240880 8E220054 */ lw $v0, 0x54($s1) +/* C8E434 80240884 C6200018 */ lwc1 $f0, 0x18($s1) +/* C8E438 80240888 8C42000C */ lw $v0, 0xc($v0) +/* C8E43C 8024088C E4400004 */ swc1 $f0, 4($v0) +/* C8E440 80240890 8E220054 */ lw $v0, 0x54($s1) +/* C8E444 80240894 C6200004 */ lwc1 $f0, 4($s1) +/* C8E448 80240898 8C42000C */ lw $v0, 0xc($v0) +/* C8E44C 8024089C E4400008 */ swc1 $f0, 8($v0) +/* C8E450 802408A0 8E220054 */ lw $v0, 0x54($s1) +/* C8E454 802408A4 C6200020 */ lwc1 $f0, 0x20($s1) +/* C8E458 802408A8 8C42000C */ lw $v0, 0xc($v0) +/* C8E45C 802408AC E440000C */ swc1 $f0, 0xc($v0) +.L802408B0: +/* C8E460 802408B0 8FBF0020 */ lw $ra, 0x20($sp) +/* C8E464 802408B4 8FB1001C */ lw $s1, 0x1c($sp) +/* C8E468 802408B8 8FB00018 */ lw $s0, 0x18($sp) +/* C8E46C 802408BC 0000102D */ daddu $v0, $zero, $zero +/* C8E470 802408C0 03E00008 */ jr $ra +/* C8E474 802408C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802408C8.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802408C8.s deleted file mode 100644 index 3f906face8..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802408C8.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408C8 -/* C8E478 802408C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8E47C 802408CC AFB00010 */ sw $s0, 0x10($sp) -/* C8E480 802408D0 0080802D */ daddu $s0, $a0, $zero -/* C8E484 802408D4 AFBF0014 */ sw $ra, 0x14($sp) -/* C8E488 802408D8 8E02000C */ lw $v0, 0xc($s0) -/* C8E48C 802408DC 0C0B1EAF */ jal get_variable -/* C8E490 802408E0 8C450000 */ lw $a1, ($v0) -/* C8E494 802408E4 8E030084 */ lw $v1, 0x84($s0) -/* C8E498 802408E8 8FBF0014 */ lw $ra, 0x14($sp) -/* C8E49C 802408EC 8463004E */ lh $v1, 0x4e($v1) -/* C8E4A0 802408F0 8FB00010 */ lw $s0, 0x10($sp) -/* C8E4A4 802408F4 00621826 */ xor $v1, $v1, $v0 -/* C8E4A8 802408F8 2C630001 */ sltiu $v1, $v1, 1 -/* C8E4AC 802408FC 00031040 */ sll $v0, $v1, 1 -/* C8E4B0 80240900 03E00008 */ jr $ra -/* C8E4B4 80240904 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802408C8_C8E478.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802408C8_C8E478.s new file mode 100644 index 0000000000..17dcc05472 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_802408C8_C8E478.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408C8_C8E478 +/* C8E478 802408C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C8E47C 802408CC AFB00010 */ sw $s0, 0x10($sp) +/* C8E480 802408D0 0080802D */ daddu $s0, $a0, $zero +/* C8E484 802408D4 AFBF0014 */ sw $ra, 0x14($sp) +/* C8E488 802408D8 8E02000C */ lw $v0, 0xc($s0) +/* C8E48C 802408DC 0C0B1EAF */ jal get_variable +/* C8E490 802408E0 8C450000 */ lw $a1, ($v0) +/* C8E494 802408E4 8E030084 */ lw $v1, 0x84($s0) +/* C8E498 802408E8 8FBF0014 */ lw $ra, 0x14($sp) +/* C8E49C 802408EC 8463004E */ lh $v1, 0x4e($v1) +/* C8E4A0 802408F0 8FB00010 */ lw $s0, 0x10($sp) +/* C8E4A4 802408F4 00621826 */ xor $v1, $v1, $v0 +/* C8E4A8 802408F8 2C630001 */ sltiu $v1, $v1, 1 +/* C8E4AC 802408FC 00031040 */ sll $v0, $v1, 1 +/* C8E4B0 80240900 03E00008 */ jr $ra +/* C8E4B4 80240904 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8.s deleted file mode 100644 index 84ac689a98..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD8 -/* C8E888 80240CD8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* C8E88C 80240CDC AFB10014 */ sw $s1, 0x14($sp) -/* C8E890 80240CE0 0080882D */ daddu $s1, $a0, $zero -/* C8E894 80240CE4 AFBF0020 */ sw $ra, 0x20($sp) -/* C8E898 80240CE8 AFB3001C */ sw $s3, 0x1c($sp) -/* C8E89C 80240CEC AFB20018 */ sw $s2, 0x18($sp) -/* C8E8A0 80240CF0 AFB00010 */ sw $s0, 0x10($sp) -/* C8E8A4 80240CF4 8E30000C */ lw $s0, 0xc($s1) -/* C8E8A8 80240CF8 8E050000 */ lw $a1, ($s0) -/* C8E8AC 80240CFC 0C0B1EAF */ jal get_variable -/* C8E8B0 80240D00 26100004 */ addiu $s0, $s0, 4 -/* C8E8B4 80240D04 8E050000 */ lw $a1, ($s0) -/* C8E8B8 80240D08 26100004 */ addiu $s0, $s0, 4 -/* C8E8BC 80240D0C 0220202D */ daddu $a0, $s1, $zero -/* C8E8C0 80240D10 0C0B1EAF */ jal get_variable -/* C8E8C4 80240D14 0040982D */ daddu $s3, $v0, $zero -/* C8E8C8 80240D18 8E050000 */ lw $a1, ($s0) -/* C8E8CC 80240D1C 26100004 */ addiu $s0, $s0, 4 -/* C8E8D0 80240D20 0220202D */ daddu $a0, $s1, $zero -/* C8E8D4 80240D24 0C0B1EAF */ jal get_variable -/* C8E8D8 80240D28 0040902D */ daddu $s2, $v0, $zero -/* C8E8DC 80240D2C 8E050000 */ lw $a1, ($s0) -/* C8E8E0 80240D30 26100004 */ addiu $s0, $s0, 4 -/* C8E8E4 80240D34 0C0B1EAF */ jal get_variable -/* C8E8E8 80240D38 0220202D */ daddu $a0, $s1, $zero -/* C8E8EC 80240D3C 8E050000 */ lw $a1, ($s0) -/* C8E8F0 80240D40 0C0B1EAF */ jal get_variable -/* C8E8F4 80240D44 0220202D */ daddu $a0, $s1, $zero -/* C8E8F8 80240D48 0000202D */ daddu $a0, $zero, $zero -/* C8E8FC 80240D4C 3C05FD05 */ lui $a1, 0xfd05 -/* C8E900 80240D50 34A50F80 */ ori $a1, $a1, 0xf80 -/* C8E904 80240D54 0C0B1EAF */ jal get_variable -/* C8E908 80240D58 0040802D */ daddu $s0, $v0, $zero -/* C8E90C 80240D5C 00131900 */ sll $v1, $s3, 4 -/* C8E910 80240D60 00731823 */ subu $v1, $v1, $s3 -/* C8E914 80240D64 00031940 */ sll $v1, $v1, 5 -/* C8E918 80240D68 00431821 */ addu $v1, $v0, $v1 -/* C8E91C 80240D6C 24020002 */ addiu $v0, $zero, 2 -/* C8E920 80240D70 00529004 */ sllv $s2, $s2, $v0 -/* C8E924 80240D74 00721821 */ addu $v1, $v1, $s2 -/* C8E928 80240D78 44900000 */ mtc1 $s0, $f0 -/* C8E92C 80240D7C 00000000 */ nop -/* C8E930 80240D80 46800020 */ cvt.s.w $f0, $f0 -/* C8E934 80240D84 E460006C */ swc1 $f0, 0x6c($v1) -/* C8E938 80240D88 8FBF0020 */ lw $ra, 0x20($sp) -/* C8E93C 80240D8C 8FB3001C */ lw $s3, 0x1c($sp) -/* C8E940 80240D90 8FB20018 */ lw $s2, 0x18($sp) -/* C8E944 80240D94 8FB10014 */ lw $s1, 0x14($sp) -/* C8E948 80240D98 8FB00010 */ lw $s0, 0x10($sp) -/* C8E94C 80240D9C 03E00008 */ jr $ra -/* C8E950 80240DA0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8_C8E888.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8_C8E888.s new file mode 100644 index 0000000000..fedab255fd --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240CD8_C8E888.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CD8_C8E888 +/* C8E888 80240CD8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* C8E88C 80240CDC AFB10014 */ sw $s1, 0x14($sp) +/* C8E890 80240CE0 0080882D */ daddu $s1, $a0, $zero +/* C8E894 80240CE4 AFBF0020 */ sw $ra, 0x20($sp) +/* C8E898 80240CE8 AFB3001C */ sw $s3, 0x1c($sp) +/* C8E89C 80240CEC AFB20018 */ sw $s2, 0x18($sp) +/* C8E8A0 80240CF0 AFB00010 */ sw $s0, 0x10($sp) +/* C8E8A4 80240CF4 8E30000C */ lw $s0, 0xc($s1) +/* C8E8A8 80240CF8 8E050000 */ lw $a1, ($s0) +/* C8E8AC 80240CFC 0C0B1EAF */ jal get_variable +/* C8E8B0 80240D00 26100004 */ addiu $s0, $s0, 4 +/* C8E8B4 80240D04 8E050000 */ lw $a1, ($s0) +/* C8E8B8 80240D08 26100004 */ addiu $s0, $s0, 4 +/* C8E8BC 80240D0C 0220202D */ daddu $a0, $s1, $zero +/* C8E8C0 80240D10 0C0B1EAF */ jal get_variable +/* C8E8C4 80240D14 0040982D */ daddu $s3, $v0, $zero +/* C8E8C8 80240D18 8E050000 */ lw $a1, ($s0) +/* C8E8CC 80240D1C 26100004 */ addiu $s0, $s0, 4 +/* C8E8D0 80240D20 0220202D */ daddu $a0, $s1, $zero +/* C8E8D4 80240D24 0C0B1EAF */ jal get_variable +/* C8E8D8 80240D28 0040902D */ daddu $s2, $v0, $zero +/* C8E8DC 80240D2C 8E050000 */ lw $a1, ($s0) +/* C8E8E0 80240D30 26100004 */ addiu $s0, $s0, 4 +/* C8E8E4 80240D34 0C0B1EAF */ jal get_variable +/* C8E8E8 80240D38 0220202D */ daddu $a0, $s1, $zero +/* C8E8EC 80240D3C 8E050000 */ lw $a1, ($s0) +/* C8E8F0 80240D40 0C0B1EAF */ jal get_variable +/* C8E8F4 80240D44 0220202D */ daddu $a0, $s1, $zero +/* C8E8F8 80240D48 0000202D */ daddu $a0, $zero, $zero +/* C8E8FC 80240D4C 3C05FD05 */ lui $a1, 0xfd05 +/* C8E900 80240D50 34A50F80 */ ori $a1, $a1, 0xf80 +/* C8E904 80240D54 0C0B1EAF */ jal get_variable +/* C8E908 80240D58 0040802D */ daddu $s0, $v0, $zero +/* C8E90C 80240D5C 00131900 */ sll $v1, $s3, 4 +/* C8E910 80240D60 00731823 */ subu $v1, $v1, $s3 +/* C8E914 80240D64 00031940 */ sll $v1, $v1, 5 +/* C8E918 80240D68 00431821 */ addu $v1, $v0, $v1 +/* C8E91C 80240D6C 24020002 */ addiu $v0, $zero, 2 +/* C8E920 80240D70 00529004 */ sllv $s2, $s2, $v0 +/* C8E924 80240D74 00721821 */ addu $v1, $v1, $s2 +/* C8E928 80240D78 44900000 */ mtc1 $s0, $f0 +/* C8E92C 80240D7C 00000000 */ nop +/* C8E930 80240D80 46800020 */ cvt.s.w $f0, $f0 +/* C8E934 80240D84 E460006C */ swc1 $f0, 0x6c($v1) +/* C8E938 80240D88 8FBF0020 */ lw $ra, 0x20($sp) +/* C8E93C 80240D8C 8FB3001C */ lw $s3, 0x1c($sp) +/* C8E940 80240D90 8FB20018 */ lw $s2, 0x18($sp) +/* C8E944 80240D94 8FB10014 */ lw $s1, 0x14($sp) +/* C8E948 80240D98 8FB00010 */ lw $s0, 0x10($sp) +/* C8E94C 80240D9C 03E00008 */ jr $ra +/* C8E950 80240DA0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C.s deleted file mode 100644 index a96a08115b..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C.s +++ /dev/null @@ -1,385 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E2C -/* C8E9DC 80240E2C 27BDFF70 */ addiu $sp, $sp, -0x90 -/* C8E9E0 80240E30 3C038025 */ lui $v1, 0x8025 -/* C8E9E4 80240E34 8C638380 */ lw $v1, -0x7c80($v1) -/* C8E9E8 80240E38 2402FFFF */ addiu $v0, $zero, -1 -/* C8E9EC 80240E3C AFBF005C */ sw $ra, 0x5c($sp) -/* C8E9F0 80240E40 AFBE0058 */ sw $fp, 0x58($sp) -/* C8E9F4 80240E44 AFB70054 */ sw $s7, 0x54($sp) -/* C8E9F8 80240E48 AFB60050 */ sw $s6, 0x50($sp) -/* C8E9FC 80240E4C AFB5004C */ sw $s5, 0x4c($sp) -/* C8EA00 80240E50 AFB40048 */ sw $s4, 0x48($sp) -/* C8EA04 80240E54 AFB30044 */ sw $s3, 0x44($sp) -/* C8EA08 80240E58 AFB20040 */ sw $s2, 0x40($sp) -/* C8EA0C 80240E5C AFB1003C */ sw $s1, 0x3c($sp) -/* C8EA10 80240E60 AFB00038 */ sw $s0, 0x38($sp) -/* C8EA14 80240E64 F7BE0088 */ sdc1 $f30, 0x88($sp) -/* C8EA18 80240E68 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* C8EA1C 80240E6C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* C8EA20 80240E70 F7B80070 */ sdc1 $f24, 0x70($sp) -/* C8EA24 80240E74 F7B60068 */ sdc1 $f22, 0x68($sp) -/* C8EA28 80240E78 1062013F */ beq $v1, $v0, .L80241378 -/* C8EA2C 80240E7C F7B40060 */ sdc1 $f20, 0x60($sp) -/* C8EA30 80240E80 1460005E */ bnez $v1, .L80240FFC -/* C8EA34 80240E84 0000382D */ daddu $a3, $zero, $zero -/* C8EA38 80240E88 00E0802D */ daddu $s0, $a3, $zero -/* C8EA3C 80240E8C 3C0142B4 */ lui $at, 0x42b4 -/* C8EA40 80240E90 4481E000 */ mtc1 $at, $f28 -/* C8EA44 80240E94 3C014334 */ lui $at, 0x4334 -/* C8EA48 80240E98 4481D000 */ mtc1 $at, $f26 -/* C8EA4C 80240E9C 3C0143B4 */ lui $at, 0x43b4 -/* C8EA50 80240EA0 4481A000 */ mtc1 $at, $f20 -/* C8EA54 80240EA4 3C01C334 */ lui $at, 0xc334 -/* C8EA58 80240EA8 4481B000 */ mtc1 $at, $f22 -.L80240EAC: -/* C8EA5C 80240EAC 0000202D */ daddu $a0, $zero, $zero -/* C8EA60 80240EB0 3C05FD05 */ lui $a1, 0xfd05 -/* C8EA64 80240EB4 34A50F80 */ ori $a1, $a1, 0xf80 -/* C8EA68 80240EB8 0C0B1EAF */ jal get_variable -/* C8EA6C 80240EBC AFA70030 */ sw $a3, 0x30($sp) -/* C8EA70 80240EC0 00502021 */ addu $a0, $v0, $s0 -/* C8EA74 80240EC4 8FA70030 */ lw $a3, 0x30($sp) -/* C8EA78 80240EC8 24020001 */ addiu $v0, $zero, 1 -/* C8EA7C 80240ECC 10E20011 */ beq $a3, $v0, .L80240F14 -/* C8EA80 80240ED0 28E20002 */ slti $v0, $a3, 2 -/* C8EA84 80240ED4 50400005 */ beql $v0, $zero, .L80240EEC -/* C8EA88 80240ED8 24020002 */ addiu $v0, $zero, 2 -/* C8EA8C 80240EDC 10E00009 */ beqz $a3, .L80240F04 -/* C8EA90 80240EE0 00000000 */ nop -/* C8EA94 80240EE4 080904DE */ j .L80241378 -/* 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 -.L80240F04: -/* C8EAB4 80240F04 3C014120 */ lui $at, 0x4120 -/* C8EAB8 80240F08 4481C000 */ mtc1 $at, $f24 -/* C8EABC 80240F0C 080903CA */ j .L80240F28 -/* C8EAC0 80240F10 24140009 */ addiu $s4, $zero, 9 -.L80240F14: -/* C8EAC4 80240F14 080903C8 */ j .L80240F20 -/* C8EAC8 80240F18 24140007 */ addiu $s4, $zero, 7 -.L80240F1C: -/* C8EACC 80240F1C 24140007 */ addiu $s4, $zero, 7 -.L80240F20: -/* C8EAD0 80240F20 3C014100 */ lui $at, 0x4100 -/* C8EAD4 80240F24 4481C000 */ mtc1 $at, $f24 -.L80240F28: -/* C8EAD8 80240F28 0000882D */ daddu $s1, $zero, $zero -/* C8EADC 80240F2C AC940090 */ sw $s4, 0x90($a0) -/* C8EAE0 80240F30 1A800027 */ blez $s4, .L80240FD0 -/* C8EAE4 80240F34 E4980094 */ swc1 $f24, 0x94($a0) -/* C8EAE8 80240F38 2686FFFF */ addiu $a2, $s4, -1 -/* C8EAEC 80240F3C 0080182D */ daddu $v1, $a0, $zero -/* C8EAF0 80240F40 24050004 */ addiu $a1, $zero, 4 -/* C8EAF4 80240F44 3C013FE0 */ lui $at, 0x3fe0 -/* C8EAF8 80240F48 44814800 */ mtc1 $at, $f9 -/* C8EAFC 80240F4C 44804000 */ mtc1 $zero, $f8 -/* C8EB00 80240F50 3C018025 */ lui $at, 0x8025 -/* C8EB04 80240F54 D4268370 */ ldc1 $f6, -0x7c90($at) -.L80240F58: -/* C8EB08 80240F58 16260004 */ bne $s1, $a2, .L80240F6C -/* C8EB0C 80240F5C 00851021 */ addu $v0, $a0, $a1 -/* C8EB10 80240F60 C460006C */ lwc1 $f0, 0x6c($v1) -/* C8EB14 80240F64 080903EE */ j .L80240FB8 -/* C8EB18 80240F68 461C0000 */ add.s $f0, $f0, $f28 -.L80240F6C: -/* C8EB1C 80240F6C C460006C */ lwc1 $f0, 0x6c($v1) -/* 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 -/* C8EB30 80240F80 45000003 */ bc1f .L80240F90 -/* 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 -/* 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 -/* C8EB60 80240FB0 46260000 */ add.d $f0, $f0, $f6 -/* C8EB64 80240FB4 46200020 */ cvt.s.d $f0, $f0 -.L80240FB8: -/* C8EB68 80240FB8 E460006C */ swc1 $f0, 0x6c($v1) -/* C8EB6C 80240FBC 24630004 */ addiu $v1, $v1, 4 -/* C8EB70 80240FC0 26310001 */ addiu $s1, $s1, 1 -/* C8EB74 80240FC4 0234102A */ slt $v0, $s1, $s4 -/* C8EB78 80240FC8 1440FFE3 */ bnez $v0, .L80240F58 -/* C8EB7C 80240FCC 24A50004 */ addiu $a1, $a1, 4 -.L80240FD0: -/* C8EB80 80240FD0 0C0902C0 */ jal func_80240B00 -/* C8EB84 80240FD4 AFA70030 */ sw $a3, 0x30($sp) -/* C8EB88 80240FD8 8FA70030 */ lw $a3, 0x30($sp) -/* C8EB8C 80240FDC 24E70001 */ addiu $a3, $a3, 1 -/* C8EB90 80240FE0 28E20004 */ slti $v0, $a3, 4 -/* C8EB94 80240FE4 1440FFB1 */ bnez $v0, .L80240EAC -/* C8EB98 80240FE8 261001E0 */ addiu $s0, $s0, 0x1e0 -/* C8EB9C 80240FEC 24020001 */ addiu $v0, $zero, 1 -/* C8EBA0 80240FF0 3C018025 */ lui $at, 0x8025 -/* C8EBA4 80240FF4 AC228380 */ sw $v0, -0x7c80($at) -/* C8EBA8 80240FF8 0000382D */ daddu $a3, $zero, $zero -.L80240FFC: -/* C8EBAC 80240FFC 3C02800A */ lui $v0, 0x800a -/* C8EBB0 80241000 2442A66C */ addiu $v0, $v0, -0x5994 -/* C8EBB4 80241004 0040402D */ daddu $t0, $v0, $zero -/* C8EBB8 80241008 3C090100 */ lui $t1, 0x100 -/* C8EBBC 8024100C 35294008 */ ori $t1, $t1, 0x4008 -/* C8EBC0 80241010 AFA90018 */ sw $t1, 0x18($sp) -/* C8EBC4 80241014 3C090602 */ lui $t1, 0x602 -/* C8EBC8 80241018 35290004 */ ori $t1, $t1, 4 -/* C8EBCC 8024101C AFA9001C */ sw $t1, 0x1c($sp) -/* C8EBD0 80241020 AFA00020 */ sw $zero, 0x20($sp) -/* C8EBD4 80241024 8D030000 */ lw $v1, ($t0) -/* C8EBD8 80241028 3C02E700 */ lui $v0, 0xe700 -/* C8EBDC 8024102C 0060202D */ daddu $a0, $v1, $zero -/* C8EBE0 80241030 24630008 */ addiu $v1, $v1, 8 -/* C8EBE4 80241034 AD030000 */ sw $v1, ($t0) -/* C8EBE8 80241038 AC820000 */ sw $v0, ($a0) -/* C8EBEC 8024103C 24620008 */ addiu $v0, $v1, 8 -/* C8EBF0 80241040 AC800004 */ sw $zero, 4($a0) -/* C8EBF4 80241044 AD020000 */ sw $v0, ($t0) -/* C8EBF8 80241048 3C02DE00 */ lui $v0, 0xde00 -/* C8EBFC 8024104C AC620000 */ sw $v0, ($v1) -/* C8EC00 80241050 3C028024 */ lui $v0, 0x8024 -/* C8EC04 80241054 24423AD8 */ addiu $v0, $v0, 0x3ad8 -/* C8EC08 80241058 AC620004 */ sw $v0, 4($v1) -.L8024105C: -/* C8EC0C 8024105C 0000202D */ daddu $a0, $zero, $zero -/* C8EC10 80241060 3C05FD05 */ lui $a1, 0xfd05 -/* C8EC14 80241064 34A50F80 */ ori $a1, $a1, 0xf80 -/* C8EC18 80241068 AFA70030 */ sw $a3, 0x30($sp) -/* C8EC1C 8024106C 0C0B1EAF */ jal get_variable -/* C8EC20 80241070 AFA80034 */ sw $t0, 0x34($sp) -/* C8EC24 80241074 0000882D */ daddu $s1, $zero, $zero -/* C8EC28 80241078 8FA90020 */ lw $t1, 0x20($sp) -/* C8EC2C 8024107C 8FA80034 */ lw $t0, 0x34($sp) -/* C8EC30 80241080 0049A821 */ addu $s5, $v0, $t1 -/* C8EC34 80241084 3C02DE01 */ lui $v0, 0xde01 -/* C8EC38 80241088 C6B80094 */ lwc1 $f24, 0x94($s5) -/* C8EC3C 8024108C 8D040000 */ lw $a0, ($t0) -/* C8EC40 80241090 8EB40090 */ lw $s4, 0x90($s5) -/* C8EC44 80241094 24890008 */ addiu $t1, $a0, 8 -/* C8EC48 80241098 AFA90010 */ sw $t1, 0x10($sp) -/* C8EC4C 8024109C 8EA601DC */ lw $a2, 0x1dc($s5) -/* C8EC50 802410A0 AC820000 */ sw $v0, ($a0) -/* C8EC54 802410A4 00061940 */ sll $v1, $a2, 5 -/* C8EC58 802410A8 24620008 */ addiu $v0, $v1, 8 -/* C8EC5C 802410AC 00821021 */ addu $v0, $a0, $v0 -/* C8EC60 802410B0 01231821 */ addu $v1, $t1, $v1 -/* C8EC64 802410B4 AC820004 */ sw $v0, 4($a0) -/* C8EC68 802410B8 AD030000 */ sw $v1, ($t0) -/* C8EC6C 802410BC 8FA70030 */ lw $a3, 0x30($sp) -/* C8EC70 802410C0 18C00088 */ blez $a2, .L802412E4 -/* C8EC74 802410C4 0120982D */ daddu $s3, $t1, $zero -/* C8EC78 802410C8 2682FFFF */ addiu $v0, $s4, -1 -/* C8EC7C 802410CC 00021080 */ sll $v0, $v0, 2 -/* C8EC80 802410D0 02A21021 */ addu $v0, $s5, $v0 -/* C8EC84 802410D4 AFA20014 */ sw $v0, 0x14($sp) -/* C8EC88 802410D8 0220282D */ daddu $a1, $s1, $zero -/* C8EC8C 802410DC 0220F02D */ daddu $fp, $s1, $zero -/* C8EC90 802410E0 0220B82D */ daddu $s7, $s1, $zero -/* C8EC94 802410E4 0220B02D */ daddu $s6, $s1, $zero -/* C8EC98 802410E8 02A0902D */ daddu $s2, $s5, $zero -/* C8EC9C 802410EC 24900016 */ addiu $s0, $a0, 0x16 -.L802410F0: -/* C8ECA0 802410F0 44911000 */ mtc1 $s1, $f2 -/* C8ECA4 802410F4 00000000 */ nop -/* C8ECA8 802410F8 468010A0 */ cvt.s.w $f2, $f2 -/* C8ECAC 802410FC 44940000 */ mtc1 $s4, $f0 -/* C8ECB0 80241100 00000000 */ nop -/* C8ECB4 80241104 46800020 */ cvt.s.w $f0, $f0 -/* C8ECB8 80241108 46001082 */ mul.s $f2, $f2, $f0 -/* C8ECBC 8024110C 00000000 */ nop -/* C8ECC0 80241110 44860000 */ mtc1 $a2, $f0 -/* 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) -/* C8ECD4 80241124 C65E00A0 */ lwc1 $f30, 0xa0($s2) -/* 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 -/* C8ECE8 80241138 44840000 */ mtc1 $a0, $f0 -/* 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 -/* C8ECFC 8024114C 14400005 */ bnez $v0, .L80241164 -/* C8ED00 80241150 46001181 */ sub.s $f6, $f2, $f0 -/* C8ED04 80241154 8FA90014 */ lw $t1, 0x14($sp) -/* C8ED08 80241158 C536006C */ lwc1 $f22, 0x6c($t1) -/* C8ED0C 8024115C 0809047C */ j .L802411F0 -/* C8ED10 80241160 4600B306 */ mov.s $f12, $f22 -.L80241164: -/* C8ED14 80241164 00031080 */ sll $v0, $v1, 2 -/* C8ED18 80241168 02A21021 */ addu $v0, $s5, $v0 -/* C8ED1C 8024116C C444006C */ lwc1 $f4, 0x6c($v0) -/* C8ED20 80241170 00041080 */ sll $v0, $a0, 2 -/* C8ED24 80241174 02A21021 */ addu $v0, $s5, $v0 -/* C8ED28 80241178 C44C006C */ lwc1 $f12, 0x6c($v0) -/* C8ED2C 8024117C 460C2081 */ sub.s $f2, $f4, $f12 -/* C8ED30 80241180 3C014334 */ lui $at, 0x4334 -/* C8ED34 80241184 44810000 */ mtc1 $at, $f0 -/* C8ED38 80241188 00000000 */ nop -/* C8ED3C 8024118C 4602003C */ c.lt.s $f0, $f2 -/* C8ED40 80241190 00000000 */ nop -/* C8ED44 80241194 45000006 */ bc1f .L802411B0 -/* C8ED48 80241198 00000000 */ nop -/* C8ED4C 8024119C 3C0143B4 */ lui $at, 0x43b4 -/* C8ED50 802411A0 44815000 */ mtc1 $at, $f10 -/* 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 -/* C8ED6C 802411BC 4600103C */ c.lt.s $f2, $f0 -/* 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 -/* 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 -/* C8ED98 802411E8 460C0580 */ add.s $f22, $f0, $f12 -/* C8ED9C 802411EC 4600B306 */ mov.s $f12, $f22 -.L802411F0: -/* C8EDA0 802411F0 AFA50028 */ sw $a1, 0x28($sp) -/* C8EDA4 802411F4 AFA6002C */ sw $a2, 0x2c($sp) -/* C8EDA8 802411F8 AFA70030 */ sw $a3, 0x30($sp) -/* 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 -/* 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 -/* C8EDD0 80241220 4614D100 */ add.s $f4, $f26, $f20 -/* C8EDD4 80241224 4600E080 */ add.s $f2, $f28, $f0 -/* C8EDD8 80241228 4614D501 */ sub.s $f20, $f26, $f20 -/* C8EDDC 8024122C 2652000C */ addiu $s2, $s2, 0xc -/* C8EDE0 80241230 26310001 */ addiu $s1, $s1, 1 -/* 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 -/* C8EDF4 80241244 A6620000 */ sh $v0, ($s3) -/* C8EDF8 80241248 4600128D */ trunc.w.s $f10, $f2 -/* C8EDFC 8024124C 44025000 */ mfc1 $v0, $f10 -/* C8EE00 80241250 4600F28D */ trunc.w.s $f10, $f30 -/* C8EE04 80241254 44035000 */ mfc1 $v1, $f10 -/* C8EE08 80241258 26730010 */ addiu $s3, $s3, 0x10 -/* C8EE0C 8024125C A602FFF4 */ sh $v0, -0xc($s0) -/* C8EE10 80241260 A603FFF6 */ sh $v1, -0xa($s0) -/* C8EE14 80241264 A616FFFA */ sh $s6, -6($s0) -/* C8EE18 80241268 A600FFFC */ sh $zero, -4($s0) -/* C8EE1C 8024126C A217FFFE */ sb $s7, -2($s0) -/* C8EE20 80241270 A21EFFFF */ sb $fp, -1($s0) -/* C8EE24 80241274 8FA50028 */ lw $a1, 0x28($sp) -/* C8EE28 80241278 4600A28D */ trunc.w.s $f10, $f20 -/* C8EE2C 8024127C 44025000 */ mfc1 $v0, $f10 -/* C8EE30 80241280 A2050000 */ sb $a1, ($s0) -/* C8EE34 80241284 26100010 */ addiu $s0, $s0, 0x10 -/* C8EE38 80241288 A6620000 */ sh $v0, ($s3) -/* C8EE3C 8024128C 4600028D */ trunc.w.s $f10, $f0 -/* C8EE40 80241290 44025000 */ mfc1 $v0, $f10 -/* 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) -/* C8EE54 802412A4 A616FFFA */ sh $s6, -6($s0) -/* C8EE58 802412A8 A602FFFC */ sh $v0, -4($s0) -/* C8EE5C 802412AC A217FFFE */ sb $s7, -2($s0) -/* C8EE60 802412B0 A21EFFFF */ sb $fp, -1($s0) -/* C8EE64 802412B4 A2050000 */ sb $a1, ($s0) -/* C8EE68 802412B8 26100010 */ addiu $s0, $s0, 0x10 -/* C8EE6C 802412BC 26730010 */ addiu $s3, $s3, 0x10 -/* C8EE70 802412C0 24A5001E */ addiu $a1, $a1, 0x1e -/* C8EE74 802412C4 27DE0078 */ addiu $fp, $fp, 0x78 -/* C8EE78 802412C8 26F70032 */ addiu $s7, $s7, 0x32 -/* C8EE7C 802412CC 8FA6002C */ lw $a2, 0x2c($sp) -/* C8EE80 802412D0 8FA70030 */ lw $a3, 0x30($sp) -/* C8EE84 802412D4 8FA80034 */ lw $t0, 0x34($sp) -/* C8EE88 802412D8 0226102A */ slt $v0, $s1, $a2 -/* C8EE8C 802412DC 1440FF84 */ bnez $v0, .L802410F0 -/* C8EE90 802412E0 26D60140 */ addiu $s6, $s6, 0x140 -.L802412E4: -/* C8EE94 802412E4 24C5FFFF */ addiu $a1, $a2, -1 -/* C8EE98 802412E8 18A00014 */ blez $a1, .L8024133C -/* C8EE9C 802412EC 0000882D */ daddu $s1, $zero, $zero -/* C8EEA0 802412F0 3C060002 */ lui $a2, 2 -/* C8EEA4 802412F4 34C60406 */ ori $a2, $a2, 0x406 -/* C8EEA8 802412F8 8FA40010 */ lw $a0, 0x10($sp) -.L802412FC: -/* C8EEAC 802412FC 8D030000 */ lw $v1, ($t0) -/* C8EEB0 80241300 26310001 */ addiu $s1, $s1, 1 -/* C8EEB4 80241304 0060102D */ daddu $v0, $v1, $zero -/* C8EEB8 80241308 24630008 */ addiu $v1, $v1, 8 -/* C8EEBC 8024130C AC440004 */ sw $a0, 4($v0) -/* C8EEC0 80241310 AD030000 */ sw $v1, ($t0) -/* C8EEC4 80241314 8FA90018 */ lw $t1, 0x18($sp) -/* C8EEC8 80241318 24840020 */ addiu $a0, $a0, 0x20 -/* C8EECC 8024131C AC490000 */ sw $t1, ($v0) -/* C8EED0 80241320 24620008 */ addiu $v0, $v1, 8 -/* C8EED4 80241324 AD020000 */ sw $v0, ($t0) -/* C8EED8 80241328 8FA9001C */ lw $t1, 0x1c($sp) -/* C8EEDC 8024132C 0225102A */ slt $v0, $s1, $a1 -/* C8EEE0 80241330 AC660004 */ sw $a2, 4($v1) -/* C8EEE4 80241334 1440FFF1 */ bnez $v0, .L802412FC -/* C8EEE8 80241338 AC690000 */ sw $t1, ($v1) -.L8024133C: -/* C8EEEC 8024133C 24E70001 */ addiu $a3, $a3, 1 -/* C8EEF0 80241340 8FA90020 */ lw $t1, 0x20($sp) -/* C8EEF4 80241344 28E20004 */ slti $v0, $a3, 4 -/* 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, 0x800a -/* C8EF08 80241358 2463A66C */ addiu $v1, $v1, -0x5994 -/* C8EF0C 8024135C 8C620000 */ lw $v0, ($v1) -/* C8EF10 80241360 0040202D */ daddu $a0, $v0, $zero -/* C8EF14 80241364 24420008 */ addiu $v0, $v0, 8 -/* C8EF18 80241368 AC620000 */ sw $v0, ($v1) -/* C8EF1C 8024136C 3C02E700 */ lui $v0, 0xe700 -/* C8EF20 80241370 AC820000 */ sw $v0, ($a0) -/* C8EF24 80241374 AC800004 */ sw $zero, 4($a0) -.L80241378: -/* C8EF28 80241378 8FBF005C */ lw $ra, 0x5c($sp) -/* C8EF2C 8024137C 8FBE0058 */ lw $fp, 0x58($sp) -/* C8EF30 80241380 8FB70054 */ lw $s7, 0x54($sp) -/* C8EF34 80241384 8FB60050 */ lw $s6, 0x50($sp) -/* C8EF38 80241388 8FB5004C */ lw $s5, 0x4c($sp) -/* C8EF3C 8024138C 8FB40048 */ lw $s4, 0x48($sp) -/* C8EF40 80241390 8FB30044 */ lw $s3, 0x44($sp) -/* C8EF44 80241394 8FB20040 */ lw $s2, 0x40($sp) -/* C8EF48 80241398 8FB1003C */ lw $s1, 0x3c($sp) -/* C8EF4C 8024139C 8FB00038 */ lw $s0, 0x38($sp) -/* C8EF50 802413A0 D7BE0088 */ ldc1 $f30, 0x88($sp) -/* C8EF54 802413A4 D7BC0080 */ ldc1 $f28, 0x80($sp) -/* C8EF58 802413A8 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* C8EF5C 802413AC D7B80070 */ ldc1 $f24, 0x70($sp) -/* C8EF60 802413B0 D7B60068 */ ldc1 $f22, 0x68($sp) -/* C8EF64 802413B4 D7B40060 */ ldc1 $f20, 0x60($sp) -/* C8EF68 802413B8 03E00008 */ jr $ra -/* C8EF6C 802413BC 27BD0090 */ addiu $sp, $sp, 0x90 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 new file mode 100644 index 0000000000..87587e2f93 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80240E2C_C8E9DC.s @@ -0,0 +1,385 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E2C_C8E9DC +/* C8E9DC 80240E2C 27BDFF70 */ addiu $sp, $sp, -0x90 +/* C8E9E0 80240E30 3C038025 */ lui $v1, 0x8025 +/* C8E9E4 80240E34 8C638380 */ lw $v1, -0x7c80($v1) +/* C8E9E8 80240E38 2402FFFF */ addiu $v0, $zero, -1 +/* C8E9EC 80240E3C AFBF005C */ sw $ra, 0x5c($sp) +/* C8E9F0 80240E40 AFBE0058 */ sw $fp, 0x58($sp) +/* C8E9F4 80240E44 AFB70054 */ sw $s7, 0x54($sp) +/* C8E9F8 80240E48 AFB60050 */ sw $s6, 0x50($sp) +/* C8E9FC 80240E4C AFB5004C */ sw $s5, 0x4c($sp) +/* C8EA00 80240E50 AFB40048 */ sw $s4, 0x48($sp) +/* C8EA04 80240E54 AFB30044 */ sw $s3, 0x44($sp) +/* C8EA08 80240E58 AFB20040 */ sw $s2, 0x40($sp) +/* C8EA0C 80240E5C AFB1003C */ sw $s1, 0x3c($sp) +/* C8EA10 80240E60 AFB00038 */ sw $s0, 0x38($sp) +/* C8EA14 80240E64 F7BE0088 */ sdc1 $f30, 0x88($sp) +/* C8EA18 80240E68 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* C8EA1C 80240E6C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* C8EA20 80240E70 F7B80070 */ sdc1 $f24, 0x70($sp) +/* C8EA24 80240E74 F7B60068 */ sdc1 $f22, 0x68($sp) +/* C8EA28 80240E78 1062013F */ beq $v1, $v0, .L80241378 +/* C8EA2C 80240E7C F7B40060 */ sdc1 $f20, 0x60($sp) +/* C8EA30 80240E80 1460005E */ bnez $v1, .L80240FFC +/* C8EA34 80240E84 0000382D */ daddu $a3, $zero, $zero +/* C8EA38 80240E88 00E0802D */ daddu $s0, $a3, $zero +/* C8EA3C 80240E8C 3C0142B4 */ lui $at, 0x42b4 +/* C8EA40 80240E90 4481E000 */ mtc1 $at, $f28 +/* C8EA44 80240E94 3C014334 */ lui $at, 0x4334 +/* C8EA48 80240E98 4481D000 */ mtc1 $at, $f26 +/* C8EA4C 80240E9C 3C0143B4 */ lui $at, 0x43b4 +/* C8EA50 80240EA0 4481A000 */ mtc1 $at, $f20 +/* C8EA54 80240EA4 3C01C334 */ lui $at, 0xc334 +/* C8EA58 80240EA8 4481B000 */ mtc1 $at, $f22 +.L80240EAC: +/* C8EA5C 80240EAC 0000202D */ daddu $a0, $zero, $zero +/* C8EA60 80240EB0 3C05FD05 */ lui $a1, 0xfd05 +/* C8EA64 80240EB4 34A50F80 */ ori $a1, $a1, 0xf80 +/* C8EA68 80240EB8 0C0B1EAF */ jal get_variable +/* C8EA6C 80240EBC AFA70030 */ sw $a3, 0x30($sp) +/* C8EA70 80240EC0 00502021 */ addu $a0, $v0, $s0 +/* C8EA74 80240EC4 8FA70030 */ lw $a3, 0x30($sp) +/* C8EA78 80240EC8 24020001 */ addiu $v0, $zero, 1 +/* C8EA7C 80240ECC 10E20011 */ beq $a3, $v0, .L80240F14 +/* C8EA80 80240ED0 28E20002 */ slti $v0, $a3, 2 +/* C8EA84 80240ED4 50400005 */ beql $v0, $zero, .L80240EEC +/* C8EA88 80240ED8 24020002 */ addiu $v0, $zero, 2 +/* C8EA8C 80240EDC 10E00009 */ beqz $a3, .L80240F04 +/* C8EA90 80240EE0 00000000 */ nop +/* C8EA94 80240EE4 080904DE */ j .L80241378 +/* 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 +.L80240F04: +/* C8EAB4 80240F04 3C014120 */ lui $at, 0x4120 +/* C8EAB8 80240F08 4481C000 */ mtc1 $at, $f24 +/* C8EABC 80240F0C 080903CA */ j .L80240F28 +/* C8EAC0 80240F10 24140009 */ addiu $s4, $zero, 9 +.L80240F14: +/* C8EAC4 80240F14 080903C8 */ j .L80240F20 +/* C8EAC8 80240F18 24140007 */ addiu $s4, $zero, 7 +.L80240F1C: +/* C8EACC 80240F1C 24140007 */ addiu $s4, $zero, 7 +.L80240F20: +/* C8EAD0 80240F20 3C014100 */ lui $at, 0x4100 +/* C8EAD4 80240F24 4481C000 */ mtc1 $at, $f24 +.L80240F28: +/* C8EAD8 80240F28 0000882D */ daddu $s1, $zero, $zero +/* C8EADC 80240F2C AC940090 */ sw $s4, 0x90($a0) +/* C8EAE0 80240F30 1A800027 */ blez $s4, .L80240FD0 +/* C8EAE4 80240F34 E4980094 */ swc1 $f24, 0x94($a0) +/* C8EAE8 80240F38 2686FFFF */ addiu $a2, $s4, -1 +/* C8EAEC 80240F3C 0080182D */ daddu $v1, $a0, $zero +/* C8EAF0 80240F40 24050004 */ addiu $a1, $zero, 4 +/* C8EAF4 80240F44 3C013FE0 */ lui $at, 0x3fe0 +/* C8EAF8 80240F48 44814800 */ mtc1 $at, $f9 +/* C8EAFC 80240F4C 44804000 */ mtc1 $zero, $f8 +/* C8EB00 80240F50 3C018025 */ lui $at, 0x8025 +/* C8EB04 80240F54 D4268370 */ ldc1 $f6, -0x7c90($at) +.L80240F58: +/* C8EB08 80240F58 16260004 */ bne $s1, $a2, .L80240F6C +/* C8EB0C 80240F5C 00851021 */ addu $v0, $a0, $a1 +/* C8EB10 80240F60 C460006C */ lwc1 $f0, 0x6c($v1) +/* C8EB14 80240F64 080903EE */ j .L80240FB8 +/* C8EB18 80240F68 461C0000 */ add.s $f0, $f0, $f28 +.L80240F6C: +/* C8EB1C 80240F6C C460006C */ lwc1 $f0, 0x6c($v1) +/* 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 +/* C8EB30 80240F80 45000003 */ bc1f .L80240F90 +/* 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 +/* 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 +/* C8EB60 80240FB0 46260000 */ add.d $f0, $f0, $f6 +/* C8EB64 80240FB4 46200020 */ cvt.s.d $f0, $f0 +.L80240FB8: +/* C8EB68 80240FB8 E460006C */ swc1 $f0, 0x6c($v1) +/* C8EB6C 80240FBC 24630004 */ addiu $v1, $v1, 4 +/* C8EB70 80240FC0 26310001 */ addiu $s1, $s1, 1 +/* C8EB74 80240FC4 0234102A */ slt $v0, $s1, $s4 +/* C8EB78 80240FC8 1440FFE3 */ bnez $v0, .L80240F58 +/* C8EB7C 80240FCC 24A50004 */ addiu $a1, $a1, 4 +.L80240FD0: +/* C8EB80 80240FD0 0C0902C0 */ jal func_80240B00_C8E6B0 +/* C8EB84 80240FD4 AFA70030 */ sw $a3, 0x30($sp) +/* C8EB88 80240FD8 8FA70030 */ lw $a3, 0x30($sp) +/* C8EB8C 80240FDC 24E70001 */ addiu $a3, $a3, 1 +/* C8EB90 80240FE0 28E20004 */ slti $v0, $a3, 4 +/* C8EB94 80240FE4 1440FFB1 */ bnez $v0, .L80240EAC +/* C8EB98 80240FE8 261001E0 */ addiu $s0, $s0, 0x1e0 +/* C8EB9C 80240FEC 24020001 */ addiu $v0, $zero, 1 +/* C8EBA0 80240FF0 3C018025 */ lui $at, 0x8025 +/* C8EBA4 80240FF4 AC228380 */ sw $v0, -0x7c80($at) +/* C8EBA8 80240FF8 0000382D */ daddu $a3, $zero, $zero +.L80240FFC: +/* C8EBAC 80240FFC 3C02800A */ lui $v0, 0x800a +/* C8EBB0 80241000 2442A66C */ addiu $v0, $v0, -0x5994 +/* C8EBB4 80241004 0040402D */ daddu $t0, $v0, $zero +/* C8EBB8 80241008 3C090100 */ lui $t1, 0x100 +/* C8EBBC 8024100C 35294008 */ ori $t1, $t1, 0x4008 +/* C8EBC0 80241010 AFA90018 */ sw $t1, 0x18($sp) +/* C8EBC4 80241014 3C090602 */ lui $t1, 0x602 +/* C8EBC8 80241018 35290004 */ ori $t1, $t1, 4 +/* C8EBCC 8024101C AFA9001C */ sw $t1, 0x1c($sp) +/* C8EBD0 80241020 AFA00020 */ sw $zero, 0x20($sp) +/* C8EBD4 80241024 8D030000 */ lw $v1, ($t0) +/* C8EBD8 80241028 3C02E700 */ lui $v0, 0xe700 +/* C8EBDC 8024102C 0060202D */ daddu $a0, $v1, $zero +/* C8EBE0 80241030 24630008 */ addiu $v1, $v1, 8 +/* C8EBE4 80241034 AD030000 */ sw $v1, ($t0) +/* C8EBE8 80241038 AC820000 */ sw $v0, ($a0) +/* C8EBEC 8024103C 24620008 */ addiu $v0, $v1, 8 +/* C8EBF0 80241040 AC800004 */ sw $zero, 4($a0) +/* C8EBF4 80241044 AD020000 */ sw $v0, ($t0) +/* C8EBF8 80241048 3C02DE00 */ lui $v0, 0xde00 +/* C8EBFC 8024104C AC620000 */ sw $v0, ($v1) +/* C8EC00 80241050 3C028024 */ lui $v0, 0x8024 +/* C8EC04 80241054 24423AD8 */ addiu $v0, $v0, 0x3ad8 +/* C8EC08 80241058 AC620004 */ sw $v0, 4($v1) +.L8024105C: +/* C8EC0C 8024105C 0000202D */ daddu $a0, $zero, $zero +/* C8EC10 80241060 3C05FD05 */ lui $a1, 0xfd05 +/* C8EC14 80241064 34A50F80 */ ori $a1, $a1, 0xf80 +/* C8EC18 80241068 AFA70030 */ sw $a3, 0x30($sp) +/* C8EC1C 8024106C 0C0B1EAF */ jal get_variable +/* C8EC20 80241070 AFA80034 */ sw $t0, 0x34($sp) +/* C8EC24 80241074 0000882D */ daddu $s1, $zero, $zero +/* C8EC28 80241078 8FA90020 */ lw $t1, 0x20($sp) +/* C8EC2C 8024107C 8FA80034 */ lw $t0, 0x34($sp) +/* C8EC30 80241080 0049A821 */ addu $s5, $v0, $t1 +/* C8EC34 80241084 3C02DE01 */ lui $v0, 0xde01 +/* C8EC38 80241088 C6B80094 */ lwc1 $f24, 0x94($s5) +/* C8EC3C 8024108C 8D040000 */ lw $a0, ($t0) +/* C8EC40 80241090 8EB40090 */ lw $s4, 0x90($s5) +/* C8EC44 80241094 24890008 */ addiu $t1, $a0, 8 +/* C8EC48 80241098 AFA90010 */ sw $t1, 0x10($sp) +/* C8EC4C 8024109C 8EA601DC */ lw $a2, 0x1dc($s5) +/* C8EC50 802410A0 AC820000 */ sw $v0, ($a0) +/* C8EC54 802410A4 00061940 */ sll $v1, $a2, 5 +/* C8EC58 802410A8 24620008 */ addiu $v0, $v1, 8 +/* C8EC5C 802410AC 00821021 */ addu $v0, $a0, $v0 +/* C8EC60 802410B0 01231821 */ addu $v1, $t1, $v1 +/* C8EC64 802410B4 AC820004 */ sw $v0, 4($a0) +/* C8EC68 802410B8 AD030000 */ sw $v1, ($t0) +/* C8EC6C 802410BC 8FA70030 */ lw $a3, 0x30($sp) +/* C8EC70 802410C0 18C00088 */ blez $a2, .L802412E4 +/* C8EC74 802410C4 0120982D */ daddu $s3, $t1, $zero +/* C8EC78 802410C8 2682FFFF */ addiu $v0, $s4, -1 +/* C8EC7C 802410CC 00021080 */ sll $v0, $v0, 2 +/* C8EC80 802410D0 02A21021 */ addu $v0, $s5, $v0 +/* C8EC84 802410D4 AFA20014 */ sw $v0, 0x14($sp) +/* C8EC88 802410D8 0220282D */ daddu $a1, $s1, $zero +/* C8EC8C 802410DC 0220F02D */ daddu $fp, $s1, $zero +/* C8EC90 802410E0 0220B82D */ daddu $s7, $s1, $zero +/* C8EC94 802410E4 0220B02D */ daddu $s6, $s1, $zero +/* C8EC98 802410E8 02A0902D */ daddu $s2, $s5, $zero +/* C8EC9C 802410EC 24900016 */ addiu $s0, $a0, 0x16 +.L802410F0: +/* C8ECA0 802410F0 44911000 */ mtc1 $s1, $f2 +/* C8ECA4 802410F4 00000000 */ nop +/* C8ECA8 802410F8 468010A0 */ cvt.s.w $f2, $f2 +/* C8ECAC 802410FC 44940000 */ mtc1 $s4, $f0 +/* C8ECB0 80241100 00000000 */ nop +/* C8ECB4 80241104 46800020 */ cvt.s.w $f0, $f0 +/* C8ECB8 80241108 46001082 */ mul.s $f2, $f2, $f0 +/* C8ECBC 8024110C 00000000 */ nop +/* C8ECC0 80241110 44860000 */ mtc1 $a2, $f0 +/* 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) +/* C8ECD4 80241124 C65E00A0 */ lwc1 $f30, 0xa0($s2) +/* 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 +/* C8ECE8 80241138 44840000 */ mtc1 $a0, $f0 +/* 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 +/* C8ECFC 8024114C 14400005 */ bnez $v0, .L80241164 +/* C8ED00 80241150 46001181 */ sub.s $f6, $f2, $f0 +/* C8ED04 80241154 8FA90014 */ lw $t1, 0x14($sp) +/* C8ED08 80241158 C536006C */ lwc1 $f22, 0x6c($t1) +/* C8ED0C 8024115C 0809047C */ j .L802411F0 +/* C8ED10 80241160 4600B306 */ mov.s $f12, $f22 +.L80241164: +/* C8ED14 80241164 00031080 */ sll $v0, $v1, 2 +/* C8ED18 80241168 02A21021 */ addu $v0, $s5, $v0 +/* C8ED1C 8024116C C444006C */ lwc1 $f4, 0x6c($v0) +/* C8ED20 80241170 00041080 */ sll $v0, $a0, 2 +/* C8ED24 80241174 02A21021 */ addu $v0, $s5, $v0 +/* C8ED28 80241178 C44C006C */ lwc1 $f12, 0x6c($v0) +/* C8ED2C 8024117C 460C2081 */ sub.s $f2, $f4, $f12 +/* C8ED30 80241180 3C014334 */ lui $at, 0x4334 +/* C8ED34 80241184 44810000 */ mtc1 $at, $f0 +/* C8ED38 80241188 00000000 */ nop +/* C8ED3C 8024118C 4602003C */ c.lt.s $f0, $f2 +/* C8ED40 80241190 00000000 */ nop +/* C8ED44 80241194 45000006 */ bc1f .L802411B0 +/* C8ED48 80241198 00000000 */ nop +/* C8ED4C 8024119C 3C0143B4 */ lui $at, 0x43b4 +/* C8ED50 802411A0 44815000 */ mtc1 $at, $f10 +/* 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 +/* C8ED6C 802411BC 4600103C */ c.lt.s $f2, $f0 +/* 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 +/* 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 +/* C8ED98 802411E8 460C0580 */ add.s $f22, $f0, $f12 +/* C8ED9C 802411EC 4600B306 */ mov.s $f12, $f22 +.L802411F0: +/* C8EDA0 802411F0 AFA50028 */ sw $a1, 0x28($sp) +/* C8EDA4 802411F4 AFA6002C */ sw $a2, 0x2c($sp) +/* C8EDA8 802411F8 AFA70030 */ sw $a3, 0x30($sp) +/* 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 +/* 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 +/* C8EDD0 80241220 4614D100 */ add.s $f4, $f26, $f20 +/* C8EDD4 80241224 4600E080 */ add.s $f2, $f28, $f0 +/* C8EDD8 80241228 4614D501 */ sub.s $f20, $f26, $f20 +/* C8EDDC 8024122C 2652000C */ addiu $s2, $s2, 0xc +/* C8EDE0 80241230 26310001 */ addiu $s1, $s1, 1 +/* 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 +/* C8EDF4 80241244 A6620000 */ sh $v0, ($s3) +/* C8EDF8 80241248 4600128D */ trunc.w.s $f10, $f2 +/* C8EDFC 8024124C 44025000 */ mfc1 $v0, $f10 +/* C8EE00 80241250 4600F28D */ trunc.w.s $f10, $f30 +/* C8EE04 80241254 44035000 */ mfc1 $v1, $f10 +/* C8EE08 80241258 26730010 */ addiu $s3, $s3, 0x10 +/* C8EE0C 8024125C A602FFF4 */ sh $v0, -0xc($s0) +/* C8EE10 80241260 A603FFF6 */ sh $v1, -0xa($s0) +/* C8EE14 80241264 A616FFFA */ sh $s6, -6($s0) +/* C8EE18 80241268 A600FFFC */ sh $zero, -4($s0) +/* C8EE1C 8024126C A217FFFE */ sb $s7, -2($s0) +/* C8EE20 80241270 A21EFFFF */ sb $fp, -1($s0) +/* C8EE24 80241274 8FA50028 */ lw $a1, 0x28($sp) +/* C8EE28 80241278 4600A28D */ trunc.w.s $f10, $f20 +/* C8EE2C 8024127C 44025000 */ mfc1 $v0, $f10 +/* C8EE30 80241280 A2050000 */ sb $a1, ($s0) +/* C8EE34 80241284 26100010 */ addiu $s0, $s0, 0x10 +/* C8EE38 80241288 A6620000 */ sh $v0, ($s3) +/* C8EE3C 8024128C 4600028D */ trunc.w.s $f10, $f0 +/* C8EE40 80241290 44025000 */ mfc1 $v0, $f10 +/* 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) +/* C8EE54 802412A4 A616FFFA */ sh $s6, -6($s0) +/* C8EE58 802412A8 A602FFFC */ sh $v0, -4($s0) +/* C8EE5C 802412AC A217FFFE */ sb $s7, -2($s0) +/* C8EE60 802412B0 A21EFFFF */ sb $fp, -1($s0) +/* C8EE64 802412B4 A2050000 */ sb $a1, ($s0) +/* C8EE68 802412B8 26100010 */ addiu $s0, $s0, 0x10 +/* C8EE6C 802412BC 26730010 */ addiu $s3, $s3, 0x10 +/* C8EE70 802412C0 24A5001E */ addiu $a1, $a1, 0x1e +/* C8EE74 802412C4 27DE0078 */ addiu $fp, $fp, 0x78 +/* C8EE78 802412C8 26F70032 */ addiu $s7, $s7, 0x32 +/* C8EE7C 802412CC 8FA6002C */ lw $a2, 0x2c($sp) +/* C8EE80 802412D0 8FA70030 */ lw $a3, 0x30($sp) +/* C8EE84 802412D4 8FA80034 */ lw $t0, 0x34($sp) +/* C8EE88 802412D8 0226102A */ slt $v0, $s1, $a2 +/* C8EE8C 802412DC 1440FF84 */ bnez $v0, .L802410F0 +/* C8EE90 802412E0 26D60140 */ addiu $s6, $s6, 0x140 +.L802412E4: +/* C8EE94 802412E4 24C5FFFF */ addiu $a1, $a2, -1 +/* C8EE98 802412E8 18A00014 */ blez $a1, .L8024133C +/* C8EE9C 802412EC 0000882D */ daddu $s1, $zero, $zero +/* C8EEA0 802412F0 3C060002 */ lui $a2, 2 +/* C8EEA4 802412F4 34C60406 */ ori $a2, $a2, 0x406 +/* C8EEA8 802412F8 8FA40010 */ lw $a0, 0x10($sp) +.L802412FC: +/* C8EEAC 802412FC 8D030000 */ lw $v1, ($t0) +/* C8EEB0 80241300 26310001 */ addiu $s1, $s1, 1 +/* C8EEB4 80241304 0060102D */ daddu $v0, $v1, $zero +/* C8EEB8 80241308 24630008 */ addiu $v1, $v1, 8 +/* C8EEBC 8024130C AC440004 */ sw $a0, 4($v0) +/* C8EEC0 80241310 AD030000 */ sw $v1, ($t0) +/* C8EEC4 80241314 8FA90018 */ lw $t1, 0x18($sp) +/* C8EEC8 80241318 24840020 */ addiu $a0, $a0, 0x20 +/* C8EECC 8024131C AC490000 */ sw $t1, ($v0) +/* C8EED0 80241320 24620008 */ addiu $v0, $v1, 8 +/* C8EED4 80241324 AD020000 */ sw $v0, ($t0) +/* C8EED8 80241328 8FA9001C */ lw $t1, 0x1c($sp) +/* C8EEDC 8024132C 0225102A */ slt $v0, $s1, $a1 +/* C8EEE0 80241330 AC660004 */ sw $a2, 4($v1) +/* C8EEE4 80241334 1440FFF1 */ bnez $v0, .L802412FC +/* C8EEE8 80241338 AC690000 */ sw $t1, ($v1) +.L8024133C: +/* C8EEEC 8024133C 24E70001 */ addiu $a3, $a3, 1 +/* C8EEF0 80241340 8FA90020 */ lw $t1, 0x20($sp) +/* C8EEF4 80241344 28E20004 */ slti $v0, $a3, 4 +/* 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, 0x800a +/* C8EF08 80241358 2463A66C */ addiu $v1, $v1, -0x5994 +/* C8EF0C 8024135C 8C620000 */ lw $v0, ($v1) +/* C8EF10 80241360 0040202D */ daddu $a0, $v0, $zero +/* C8EF14 80241364 24420008 */ addiu $v0, $v0, 8 +/* C8EF18 80241368 AC620000 */ sw $v0, ($v1) +/* C8EF1C 8024136C 3C02E700 */ lui $v0, 0xe700 +/* C8EF20 80241370 AC820000 */ sw $v0, ($a0) +/* C8EF24 80241374 AC800004 */ sw $zero, 4($a0) +.L80241378: +/* C8EF28 80241378 8FBF005C */ lw $ra, 0x5c($sp) +/* C8EF2C 8024137C 8FBE0058 */ lw $fp, 0x58($sp) +/* C8EF30 80241380 8FB70054 */ lw $s7, 0x54($sp) +/* C8EF34 80241384 8FB60050 */ lw $s6, 0x50($sp) +/* C8EF38 80241388 8FB5004C */ lw $s5, 0x4c($sp) +/* C8EF3C 8024138C 8FB40048 */ lw $s4, 0x48($sp) +/* C8EF40 80241390 8FB30044 */ lw $s3, 0x44($sp) +/* C8EF44 80241394 8FB20040 */ lw $s2, 0x40($sp) +/* C8EF48 80241398 8FB1003C */ lw $s1, 0x3c($sp) +/* C8EF4C 8024139C 8FB00038 */ lw $s0, 0x38($sp) +/* C8EF50 802413A0 D7BE0088 */ ldc1 $f30, 0x88($sp) +/* C8EF54 802413A4 D7BC0080 */ ldc1 $f28, 0x80($sp) +/* C8EF58 802413A8 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* C8EF5C 802413AC D7B80070 */ ldc1 $f24, 0x70($sp) +/* C8EF60 802413B0 D7B60068 */ ldc1 $f22, 0x68($sp) +/* C8EF64 802413B4 D7B40060 */ ldc1 $f20, 0x60($sp) +/* C8EF68 802413B8 03E00008 */ jr $ra +/* C8EF6C 802413BC 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C.s deleted file mode 100644 index 11482248e7..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024140C -/* C8EFBC 8024140C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8EFC0 80241410 AFB00010 */ sw $s0, 0x10($sp) -/* C8EFC4 80241414 0080802D */ daddu $s0, $a0, $zero -/* C8EFC8 80241418 AFBF0014 */ sw $ra, 0x14($sp) -/* C8EFCC 8024141C 0C00AB39 */ jal heap_malloc -/* C8EFD0 80241420 24040780 */ addiu $a0, $zero, 0x780 -/* C8EFD4 80241424 0200202D */ daddu $a0, $s0, $zero -/* C8EFD8 80241428 3C05FD05 */ lui $a1, 0xfd05 -/* C8EFDC 8024142C 34A50F80 */ ori $a1, $a1, 0xf80 -/* C8EFE0 80241430 0C0B2026 */ jal set_variable -/* C8EFE4 80241434 0040302D */ daddu $a2, $v0, $zero -/* C8EFE8 80241438 2402FFFF */ addiu $v0, $zero, -1 -/* C8EFEC 8024143C 3C058024 */ lui $a1, 0x8024 -/* C8EFF0 80241440 24A513C0 */ addiu $a1, $a1, 0x13c0 -/* C8EFF4 80241444 3C018025 */ lui $at, 0x8025 -/* C8EFF8 80241448 AC228380 */ sw $v0, -0x7c80($at) -/* C8EFFC 8024144C 0C048C56 */ jal bind_dynamic_entity_3 -/* C8F000 80241450 0000202D */ daddu $a0, $zero, $zero -/* C8F004 80241454 8FBF0014 */ lw $ra, 0x14($sp) -/* C8F008 80241458 8FB00010 */ lw $s0, 0x10($sp) -/* C8F00C 8024145C 24020002 */ addiu $v0, $zero, 2 -/* C8F010 80241460 03E00008 */ jr $ra -/* C8F014 80241464 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s new file mode 100644 index 0000000000..9afaa37ab8 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_8024140C_C8EFBC.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024140C_C8EFBC +/* C8EFBC 8024140C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C8EFC0 80241410 AFB00010 */ sw $s0, 0x10($sp) +/* C8EFC4 80241414 0080802D */ daddu $s0, $a0, $zero +/* C8EFC8 80241418 AFBF0014 */ sw $ra, 0x14($sp) +/* C8EFCC 8024141C 0C00AB39 */ jal heap_malloc +/* C8EFD0 80241420 24040780 */ addiu $a0, $zero, 0x780 +/* C8EFD4 80241424 0200202D */ daddu $a0, $s0, $zero +/* C8EFD8 80241428 3C05FD05 */ lui $a1, 0xfd05 +/* C8EFDC 8024142C 34A50F80 */ ori $a1, $a1, 0xf80 +/* C8EFE0 80241430 0C0B2026 */ jal set_variable +/* C8EFE4 80241434 0040302D */ daddu $a2, $v0, $zero +/* C8EFE8 80241438 2402FFFF */ addiu $v0, $zero, -1 +/* C8EFEC 8024143C 3C058024 */ lui $a1, 0x8024 +/* C8EFF0 80241440 24A513C0 */ addiu $a1, $a1, 0x13c0 +/* C8EFF4 80241444 3C018025 */ lui $at, 0x8025 +/* C8EFF8 80241448 AC228380 */ sw $v0, -0x7c80($at) +/* C8EFFC 8024144C 0C048C56 */ jal bind_dynamic_entity_3 +/* C8F000 80241450 0000202D */ daddu $a0, $zero, $zero +/* C8F004 80241454 8FBF0014 */ lw $ra, 0x14($sp) +/* C8F008 80241458 8FB00010 */ lw $s0, 0x10($sp) +/* C8F00C 8024145C 24020002 */ addiu $v0, $zero, 2 +/* C8F010 80241460 03E00008 */ jr $ra +/* C8F014 80241464 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468.s deleted file mode 100644 index e75b445fff..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241468 -/* C8F018 80241468 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8F01C 8024146C AFB00010 */ sw $s0, 0x10($sp) -/* C8F020 80241470 3C108024 */ lui $s0, 0x8024 -/* C8F024 80241474 26103D74 */ addiu $s0, $s0, 0x3d74 -/* C8F028 80241478 AFBF0018 */ sw $ra, 0x18($sp) -/* C8F02C 8024147C AFB10014 */ sw $s1, 0x14($sp) -/* C8F030 80241480 8E020000 */ lw $v0, ($s0) -/* C8F034 80241484 14400010 */ bnez $v0, .L802414C8 -/* C8F038 80241488 0080882D */ daddu $s1, $a0, $zero -/* C8F03C 8024148C 0C00AB39 */ jal heap_malloc -/* C8F040 80241490 24040040 */ addiu $a0, $zero, 0x40 -/* C8F044 80241494 AE020000 */ sw $v0, ($s0) -/* C8F048 80241498 0000182D */ daddu $v1, $zero, $zero -/* C8F04C 8024149C 0040282D */ daddu $a1, $v0, $zero -/* C8F050 802414A0 0220202D */ daddu $a0, $s1, $zero -.L802414A4: -/* C8F054 802414A4 8C820084 */ lw $v0, 0x84($a0) -/* C8F058 802414A8 24840004 */ addiu $a0, $a0, 4 -/* C8F05C 802414AC 24630001 */ addiu $v1, $v1, 1 -/* C8F060 802414B0 ACA20000 */ sw $v0, ($a1) -/* C8F064 802414B4 28620010 */ slti $v0, $v1, 0x10 -/* C8F068 802414B8 1440FFFA */ bnez $v0, .L802414A4 -/* C8F06C 802414BC 24A50004 */ addiu $a1, $a1, 4 -/* C8F070 802414C0 08090541 */ j .L80241504 -/* C8F074 802414C4 00000000 */ nop -.L802414C8: -/* C8F078 802414C8 0000182D */ daddu $v1, $zero, $zero -/* C8F07C 802414CC 0040282D */ daddu $a1, $v0, $zero -/* C8F080 802414D0 0220202D */ daddu $a0, $s1, $zero -.L802414D4: -/* C8F084 802414D4 8CA20000 */ lw $v0, ($a1) -/* C8F088 802414D8 24A50004 */ addiu $a1, $a1, 4 -/* C8F08C 802414DC 24630001 */ addiu $v1, $v1, 1 -/* C8F090 802414E0 AC820084 */ sw $v0, 0x84($a0) -/* C8F094 802414E4 28620010 */ slti $v0, $v1, 0x10 -/* C8F098 802414E8 1440FFFA */ bnez $v0, .L802414D4 -/* C8F09C 802414EC 24840004 */ addiu $a0, $a0, 4 -/* C8F0A0 802414F0 3C108024 */ lui $s0, 0x8024 -/* C8F0A4 802414F4 26103D74 */ addiu $s0, $s0, 0x3d74 -/* C8F0A8 802414F8 0C00AB4B */ jal heap_free -/* C8F0AC 802414FC 8E040000 */ lw $a0, ($s0) -/* C8F0B0 80241500 AE000000 */ sw $zero, ($s0) -.L80241504: -/* C8F0B4 80241504 8FBF0018 */ lw $ra, 0x18($sp) -/* C8F0B8 80241508 8FB10014 */ lw $s1, 0x14($sp) -/* C8F0BC 8024150C 8FB00010 */ lw $s0, 0x10($sp) -/* C8F0C0 80241510 24020002 */ addiu $v0, $zero, 2 -/* C8F0C4 80241514 03E00008 */ jr $ra -/* C8F0C8 80241518 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s new file mode 100644 index 0000000000..6a198429c1 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241468_C8F018.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241468_C8F018 +/* C8F018 80241468 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C8F01C 8024146C AFB00010 */ sw $s0, 0x10($sp) +/* C8F020 80241470 3C108024 */ lui $s0, 0x8024 +/* C8F024 80241474 26103D74 */ addiu $s0, $s0, 0x3d74 +/* C8F028 80241478 AFBF0018 */ sw $ra, 0x18($sp) +/* C8F02C 8024147C AFB10014 */ sw $s1, 0x14($sp) +/* C8F030 80241480 8E020000 */ lw $v0, ($s0) +/* C8F034 80241484 14400010 */ bnez $v0, .L802414C8 +/* C8F038 80241488 0080882D */ daddu $s1, $a0, $zero +/* C8F03C 8024148C 0C00AB39 */ jal heap_malloc +/* C8F040 80241490 24040040 */ addiu $a0, $zero, 0x40 +/* C8F044 80241494 AE020000 */ sw $v0, ($s0) +/* C8F048 80241498 0000182D */ daddu $v1, $zero, $zero +/* C8F04C 8024149C 0040282D */ daddu $a1, $v0, $zero +/* C8F050 802414A0 0220202D */ daddu $a0, $s1, $zero +.L802414A4: +/* C8F054 802414A4 8C820084 */ lw $v0, 0x84($a0) +/* C8F058 802414A8 24840004 */ addiu $a0, $a0, 4 +/* C8F05C 802414AC 24630001 */ addiu $v1, $v1, 1 +/* C8F060 802414B0 ACA20000 */ sw $v0, ($a1) +/* C8F064 802414B4 28620010 */ slti $v0, $v1, 0x10 +/* C8F068 802414B8 1440FFFA */ bnez $v0, .L802414A4 +/* C8F06C 802414BC 24A50004 */ addiu $a1, $a1, 4 +/* C8F070 802414C0 08090541 */ j .L80241504 +/* C8F074 802414C4 00000000 */ nop +.L802414C8: +/* C8F078 802414C8 0000182D */ daddu $v1, $zero, $zero +/* C8F07C 802414CC 0040282D */ daddu $a1, $v0, $zero +/* C8F080 802414D0 0220202D */ daddu $a0, $s1, $zero +.L802414D4: +/* C8F084 802414D4 8CA20000 */ lw $v0, ($a1) +/* C8F088 802414D8 24A50004 */ addiu $a1, $a1, 4 +/* C8F08C 802414DC 24630001 */ addiu $v1, $v1, 1 +/* C8F090 802414E0 AC820084 */ sw $v0, 0x84($a0) +/* C8F094 802414E4 28620010 */ slti $v0, $v1, 0x10 +/* C8F098 802414E8 1440FFFA */ bnez $v0, .L802414D4 +/* C8F09C 802414EC 24840004 */ addiu $a0, $a0, 4 +/* C8F0A0 802414F0 3C108024 */ lui $s0, 0x8024 +/* C8F0A4 802414F4 26103D74 */ addiu $s0, $s0, 0x3d74 +/* C8F0A8 802414F8 0C00AB4B */ jal heap_free +/* C8F0AC 802414FC 8E040000 */ lw $a0, ($s0) +/* C8F0B0 80241500 AE000000 */ sw $zero, ($s0) +.L80241504: +/* C8F0B4 80241504 8FBF0018 */ lw $ra, 0x18($sp) +/* C8F0B8 80241508 8FB10014 */ lw $s1, 0x14($sp) +/* C8F0BC 8024150C 8FB00010 */ lw $s0, 0x10($sp) +/* C8F0C0 80241510 24020002 */ addiu $v0, $zero, 2 +/* C8F0C4 80241514 03E00008 */ jr $ra +/* C8F0C8 80241518 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838.s deleted file mode 100644 index 41659d353f..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241838 -/* C8F3E8 80241838 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8F3EC 8024183C AFBF0010 */ sw $ra, 0x10($sp) -/* C8F3F0 80241840 8C82000C */ lw $v0, 0xc($a0) -/* C8F3F4 80241844 0C0B1EAF */ jal get_variable -/* C8F3F8 80241848 8C450000 */ lw $a1, ($v0) -/* C8F3FC 8024184C 0040182D */ daddu $v1, $v0, $zero -/* C8F400 80241850 10600012 */ beqz $v1, .L8024189C -/* C8F404 80241854 0000202D */ daddu $a0, $zero, $zero -/* C8F408 80241858 8C620000 */ lw $v0, ($v1) -/* C8F40C 8024185C 5040000A */ beql $v0, $zero, .L80241888 -/* C8F410 80241860 00041080 */ sll $v0, $a0, 2 -/* C8F414 80241864 3C058025 */ lui $a1, 0x8025 -/* C8F418 80241868 24A58388 */ addiu $a1, $a1, -0x7c78 -.L8024186C: -/* C8F41C 8024186C 24630004 */ addiu $v1, $v1, 4 -/* C8F420 80241870 24840001 */ addiu $a0, $a0, 1 -/* C8F424 80241874 ACA20000 */ sw $v0, ($a1) -/* C8F428 80241878 8C620000 */ lw $v0, ($v1) -/* C8F42C 8024187C 1440FFFB */ bnez $v0, .L8024186C -/* C8F430 80241880 24A50004 */ addiu $a1, $a1, 4 -/* C8F434 80241884 00041080 */ sll $v0, $a0, 2 -.L80241888: -/* C8F438 80241888 3C018025 */ lui $at, 0x8025 -/* C8F43C 8024188C 00220821 */ addu $at, $at, $v0 -/* C8F440 80241890 AC208388 */ sw $zero, -0x7c78($at) -/* C8F444 80241894 08090631 */ j .L802418C4 -/* C8F448 80241898 00000000 */ nop -.L8024189C: -/* C8F44C 8024189C 3C038025 */ lui $v1, 0x8025 -/* C8F450 802418A0 24638388 */ addiu $v1, $v1, -0x7c78 -/* C8F454 802418A4 0060282D */ daddu $a1, $v1, $zero -.L802418A8: -/* C8F458 802418A8 24820010 */ addiu $v0, $a0, 0x10 -/* C8F45C 802418AC AC620000 */ sw $v0, ($v1) -/* C8F460 802418B0 24630004 */ addiu $v1, $v1, 4 -/* C8F464 802418B4 24840001 */ addiu $a0, $a0, 1 -/* C8F468 802418B8 28820070 */ slti $v0, $a0, 0x70 -/* C8F46C 802418BC 1440FFFA */ bnez $v0, .L802418A8 -/* C8F470 802418C0 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802418C4: -/* C8F474 802418C4 8FBF0010 */ lw $ra, 0x10($sp) -/* C8F478 802418C8 24020002 */ addiu $v0, $zero, 2 -/* C8F47C 802418CC 03E00008 */ jr $ra -/* C8F480 802418D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s new file mode 100644 index 0000000000..2aa1d1db01 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241838_C8F3E8.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241838_C8F3E8 +/* C8F3E8 80241838 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C8F3EC 8024183C AFBF0010 */ sw $ra, 0x10($sp) +/* C8F3F0 80241840 8C82000C */ lw $v0, 0xc($a0) +/* C8F3F4 80241844 0C0B1EAF */ jal get_variable +/* C8F3F8 80241848 8C450000 */ lw $a1, ($v0) +/* C8F3FC 8024184C 0040182D */ daddu $v1, $v0, $zero +/* C8F400 80241850 10600012 */ beqz $v1, .L8024189C +/* C8F404 80241854 0000202D */ daddu $a0, $zero, $zero +/* C8F408 80241858 8C620000 */ lw $v0, ($v1) +/* C8F40C 8024185C 5040000A */ beql $v0, $zero, .L80241888 +/* C8F410 80241860 00041080 */ sll $v0, $a0, 2 +/* C8F414 80241864 3C058025 */ lui $a1, 0x8025 +/* C8F418 80241868 24A58388 */ addiu $a1, $a1, -0x7c78 +.L8024186C: +/* C8F41C 8024186C 24630004 */ addiu $v1, $v1, 4 +/* C8F420 80241870 24840001 */ addiu $a0, $a0, 1 +/* C8F424 80241874 ACA20000 */ sw $v0, ($a1) +/* C8F428 80241878 8C620000 */ lw $v0, ($v1) +/* C8F42C 8024187C 1440FFFB */ bnez $v0, .L8024186C +/* C8F430 80241880 24A50004 */ addiu $a1, $a1, 4 +/* C8F434 80241884 00041080 */ sll $v0, $a0, 2 +.L80241888: +/* C8F438 80241888 3C018025 */ lui $at, 0x8025 +/* C8F43C 8024188C 00220821 */ addu $at, $at, $v0 +/* C8F440 80241890 AC208388 */ sw $zero, -0x7c78($at) +/* C8F444 80241894 08090631 */ j .L802418C4 +/* C8F448 80241898 00000000 */ nop +.L8024189C: +/* C8F44C 8024189C 3C038025 */ lui $v1, 0x8025 +/* C8F450 802418A0 24638388 */ addiu $v1, $v1, -0x7c78 +/* C8F454 802418A4 0060282D */ daddu $a1, $v1, $zero +.L802418A8: +/* C8F458 802418A8 24820010 */ addiu $v0, $a0, 0x10 +/* C8F45C 802418AC AC620000 */ sw $v0, ($v1) +/* C8F460 802418B0 24630004 */ addiu $v1, $v1, 4 +/* C8F464 802418B4 24840001 */ addiu $a0, $a0, 1 +/* C8F468 802418B8 28820070 */ slti $v0, $a0, 0x70 +/* C8F46C 802418BC 1440FFFA */ bnez $v0, .L802418A8 +/* C8F470 802418C0 ACA001C0 */ sw $zero, 0x1c0($a1) +.L802418C4: +/* C8F474 802418C4 8FBF0010 */ lw $ra, 0x10($sp) +/* C8F478 802418C8 24020002 */ addiu $v0, $zero, 2 +/* C8F47C 802418CC 03E00008 */ jr $ra +/* C8F480 802418D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94.s deleted file mode 100644 index 7bb0040c79..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B94 -/* C8F744 80241B94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C8F748 80241B98 AFBF0010 */ sw $ra, 0x10($sp) -/* C8F74C 80241B9C 0C00EABB */ jal get_npc_unsafe -/* C8F750 80241BA0 8C84008C */ lw $a0, 0x8c($a0) -/* C8F754 80241BA4 3C038025 */ lui $v1, 0x8025 -/* C8F758 80241BA8 8C63854C */ lw $v1, -0x7ab4($v1) -/* C8F75C 80241BAC AC430028 */ sw $v1, 0x28($v0) -/* C8F760 80241BB0 8FBF0010 */ lw $ra, 0x10($sp) -/* C8F764 80241BB4 24020002 */ addiu $v0, $zero, 2 -/* C8F768 80241BB8 03E00008 */ jr $ra -/* C8F76C 80241BBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s new file mode 100644 index 0000000000..594fcdc083 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241B94_C8F744.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B94_C8F744 +/* C8F744 80241B94 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* C8F748 80241B98 AFBF0010 */ sw $ra, 0x10($sp) +/* C8F74C 80241B9C 0C00EABB */ jal get_npc_unsafe +/* C8F750 80241BA0 8C84008C */ lw $a0, 0x8c($a0) +/* C8F754 80241BA4 3C038025 */ lui $v1, 0x8025 +/* C8F758 80241BA8 8C63854C */ lw $v1, -0x7ab4($v1) +/* C8F75C 80241BAC AC430028 */ sw $v1, 0x28($v0) +/* C8F760 80241BB0 8FBF0010 */ lw $ra, 0x10($sp) +/* C8F764 80241BB4 24020002 */ addiu $v0, $zero, 2 +/* C8F768 80241BB8 03E00008 */ jr $ra +/* C8F76C 80241BBC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0.s deleted file mode 100644 index 070f712f96..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BC0 -/* C8F770 80241BC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* C8F774 80241BC4 AFB10014 */ sw $s1, 0x14($sp) -/* C8F778 80241BC8 0080882D */ daddu $s1, $a0, $zero -/* C8F77C 80241BCC AFBF0018 */ sw $ra, 0x18($sp) -/* C8F780 80241BD0 AFB00010 */ sw $s0, 0x10($sp) -/* C8F784 80241BD4 8E30000C */ lw $s0, 0xc($s1) -/* C8F788 80241BD8 8E050000 */ lw $a1, ($s0) -/* C8F78C 80241BDC 0C0B1EAF */ jal get_variable -/* C8F790 80241BE0 26100004 */ addiu $s0, $s0, 4 -/* C8F794 80241BE4 0220202D */ daddu $a0, $s1, $zero -/* C8F798 80241BE8 8E050000 */ lw $a1, ($s0) -/* C8F79C 80241BEC 0C0B1EAF */ jal get_variable -/* C8F7A0 80241BF0 0040802D */ daddu $s0, $v0, $zero -/* C8F7A4 80241BF4 0040202D */ daddu $a0, $v0, $zero -/* C8F7A8 80241BF8 24020001 */ addiu $v0, $zero, 1 -/* C8F7AC 80241BFC 12020019 */ beq $s0, $v0, .L80241C64 -/* C8F7B0 80241C00 2A020002 */ slti $v0, $s0, 2 -/* C8F7B4 80241C04 10400005 */ beqz $v0, .L80241C1C -/* C8F7B8 80241C08 24020002 */ addiu $v0, $zero, 2 -/* C8F7BC 80241C0C 12000009 */ beqz $s0, .L80241C34 -/* C8F7C0 80241C10 00041840 */ sll $v1, $a0, 1 -/* C8F7C4 80241C14 08090743 */ j .L80241D0C -/* C8F7C8 80241C18 00000000 */ nop -.L80241C1C: -/* C8F7CC 80241C1C 1202001F */ beq $s0, $v0, .L80241C9C -/* C8F7D0 80241C20 24020003 */ addiu $v0, $zero, 3 -/* C8F7D4 80241C24 1202002B */ beq $s0, $v0, .L80241CD4 -/* C8F7D8 80241C28 3C068020 */ lui $a2, 0x8020 -/* C8F7DC 80241C2C 08090743 */ j .L80241D0C -/* C8F7E0 80241C30 00000000 */ nop -.L80241C34: -/* C8F7E4 80241C34 3C028024 */ lui $v0, 0x8024 -/* C8F7E8 80241C38 24423BB8 */ addiu $v0, $v0, 0x3bb8 -/* C8F7EC 80241C3C 00641821 */ addu $v1, $v1, $a0 -/* C8F7F0 80241C40 00032080 */ sll $a0, $v1, 2 -/* C8F7F4 80241C44 00822021 */ addu $a0, $a0, $v0 -/* C8F7F8 80241C48 24630001 */ addiu $v1, $v1, 1 -/* C8F7FC 80241C4C 00031880 */ sll $v1, $v1, 2 -/* C8F800 80241C50 00621821 */ addu $v1, $v1, $v0 -/* C8F804 80241C54 8C840000 */ lw $a0, ($a0) -/* C8F808 80241C58 8C650000 */ lw $a1, ($v1) -/* C8F80C 80241C5C 08090741 */ j .L80241D04 -/* C8F810 80241C60 3C068020 */ lui $a2, 0x8020 -.L80241C64: -/* C8F814 80241C64 3C068020 */ lui $a2, 0x8020 -/* C8F818 80241C68 3C028024 */ lui $v0, 0x8024 -/* C8F81C 80241C6C 24423BB8 */ addiu $v0, $v0, 0x3bb8 -/* C8F820 80241C70 00041840 */ sll $v1, $a0, 1 -/* C8F824 80241C74 00641821 */ addu $v1, $v1, $a0 -/* C8F828 80241C78 00032080 */ sll $a0, $v1, 2 -/* C8F82C 80241C7C 00822021 */ addu $a0, $a0, $v0 -/* C8F830 80241C80 24630001 */ addiu $v1, $v1, 1 -/* C8F834 80241C84 00031880 */ sll $v1, $v1, 2 -/* C8F838 80241C88 00621821 */ addu $v1, $v1, $v0 -/* C8F83C 80241C8C 8C840000 */ lw $a0, ($a0) -/* C8F840 80241C90 8C650000 */ lw $a1, ($v1) -/* C8F844 80241C94 08090741 */ j .L80241D04 -/* C8F848 80241C98 34C64000 */ ori $a2, $a2, 0x4000 -.L80241C9C: -/* C8F84C 80241C9C 3C068020 */ lui $a2, 0x8020 -/* C8F850 80241CA0 3C028024 */ lui $v0, 0x8024 -/* C8F854 80241CA4 24423BB8 */ addiu $v0, $v0, 0x3bb8 -/* C8F858 80241CA8 00041840 */ sll $v1, $a0, 1 -/* C8F85C 80241CAC 00641821 */ addu $v1, $v1, $a0 -/* C8F860 80241CB0 00032080 */ sll $a0, $v1, 2 -/* C8F864 80241CB4 00822021 */ addu $a0, $a0, $v0 -/* C8F868 80241CB8 24630001 */ addiu $v1, $v1, 1 -/* C8F86C 80241CBC 00031880 */ sll $v1, $v1, 2 -/* C8F870 80241CC0 00621821 */ addu $v1, $v1, $v0 -/* C8F874 80241CC4 8C840000 */ lw $a0, ($a0) -/* C8F878 80241CC8 8C650000 */ lw $a1, ($v1) -/* C8F87C 80241CCC 08090741 */ j .L80241D04 -/* C8F880 80241CD0 34C67000 */ ori $a2, $a2, 0x7000 -.L80241CD4: -/* C8F884 80241CD4 3C028024 */ lui $v0, 0x8024 -/* C8F888 80241CD8 24423BB8 */ addiu $v0, $v0, 0x3bb8 -/* C8F88C 80241CDC 00041840 */ sll $v1, $a0, 1 -/* C8F890 80241CE0 00641821 */ addu $v1, $v1, $a0 -/* C8F894 80241CE4 00032080 */ sll $a0, $v1, 2 -/* C8F898 80241CE8 00822021 */ addu $a0, $a0, $v0 -/* C8F89C 80241CEC 24630001 */ addiu $v1, $v1, 1 -/* C8F8A0 80241CF0 00031880 */ sll $v1, $v1, 2 -/* C8F8A4 80241CF4 00621821 */ addu $v1, $v1, $v0 -/* C8F8A8 80241CF8 8C840000 */ lw $a0, ($a0) -/* C8F8AC 80241CFC 8C650000 */ lw $a1, ($v1) -/* C8F8B0 80241D00 34C6A000 */ ori $a2, $a2, 0xa000 -.L80241D04: -/* C8F8B4 80241D04 0C00A5CF */ jal dma_copy -/* C8F8B8 80241D08 00000000 */ nop -.L80241D0C: -/* C8F8BC 80241D0C 8FBF0018 */ lw $ra, 0x18($sp) -/* C8F8C0 80241D10 8FB10014 */ lw $s1, 0x14($sp) -/* C8F8C4 80241D14 8FB00010 */ lw $s0, 0x10($sp) -/* C8F8C8 80241D18 24020002 */ addiu $v0, $zero, 2 -/* C8F8CC 80241D1C 03E00008 */ jr $ra -/* C8F8D0 80241D20 27BD0020 */ addiu $sp, $sp, 0x20 -/* C8F8D4 80241D24 00000000 */ nop -/* C8F8D8 80241D28 00000000 */ nop -/* C8F8DC 80241D2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s new file mode 100644 index 0000000000..dc53419231 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_19/C8DBB0/func_80241BC0_C8F770.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BC0_C8F770 +/* C8F770 80241BC0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* C8F774 80241BC4 AFB10014 */ sw $s1, 0x14($sp) +/* C8F778 80241BC8 0080882D */ daddu $s1, $a0, $zero +/* C8F77C 80241BCC AFBF0018 */ sw $ra, 0x18($sp) +/* C8F780 80241BD0 AFB00010 */ sw $s0, 0x10($sp) +/* C8F784 80241BD4 8E30000C */ lw $s0, 0xc($s1) +/* C8F788 80241BD8 8E050000 */ lw $a1, ($s0) +/* C8F78C 80241BDC 0C0B1EAF */ jal get_variable +/* C8F790 80241BE0 26100004 */ addiu $s0, $s0, 4 +/* C8F794 80241BE4 0220202D */ daddu $a0, $s1, $zero +/* C8F798 80241BE8 8E050000 */ lw $a1, ($s0) +/* C8F79C 80241BEC 0C0B1EAF */ jal get_variable +/* C8F7A0 80241BF0 0040802D */ daddu $s0, $v0, $zero +/* C8F7A4 80241BF4 0040202D */ daddu $a0, $v0, $zero +/* C8F7A8 80241BF8 24020001 */ addiu $v0, $zero, 1 +/* C8F7AC 80241BFC 12020019 */ beq $s0, $v0, .L80241C64 +/* C8F7B0 80241C00 2A020002 */ slti $v0, $s0, 2 +/* C8F7B4 80241C04 10400005 */ beqz $v0, .L80241C1C +/* C8F7B8 80241C08 24020002 */ addiu $v0, $zero, 2 +/* C8F7BC 80241C0C 12000009 */ beqz $s0, .L80241C34 +/* C8F7C0 80241C10 00041840 */ sll $v1, $a0, 1 +/* C8F7C4 80241C14 08090743 */ j .L80241D0C +/* C8F7C8 80241C18 00000000 */ nop +.L80241C1C: +/* C8F7CC 80241C1C 1202001F */ beq $s0, $v0, .L80241C9C +/* C8F7D0 80241C20 24020003 */ addiu $v0, $zero, 3 +/* C8F7D4 80241C24 1202002B */ beq $s0, $v0, .L80241CD4 +/* C8F7D8 80241C28 3C068020 */ lui $a2, 0x8020 +/* C8F7DC 80241C2C 08090743 */ j .L80241D0C +/* C8F7E0 80241C30 00000000 */ nop +.L80241C34: +/* C8F7E4 80241C34 3C028024 */ lui $v0, 0x8024 +/* C8F7E8 80241C38 24423BB8 */ addiu $v0, $v0, 0x3bb8 +/* C8F7EC 80241C3C 00641821 */ addu $v1, $v1, $a0 +/* C8F7F0 80241C40 00032080 */ sll $a0, $v1, 2 +/* C8F7F4 80241C44 00822021 */ addu $a0, $a0, $v0 +/* C8F7F8 80241C48 24630001 */ addiu $v1, $v1, 1 +/* C8F7FC 80241C4C 00031880 */ sll $v1, $v1, 2 +/* C8F800 80241C50 00621821 */ addu $v1, $v1, $v0 +/* C8F804 80241C54 8C840000 */ lw $a0, ($a0) +/* C8F808 80241C58 8C650000 */ lw $a1, ($v1) +/* C8F80C 80241C5C 08090741 */ j .L80241D04 +/* C8F810 80241C60 3C068020 */ lui $a2, 0x8020 +.L80241C64: +/* C8F814 80241C64 3C068020 */ lui $a2, 0x8020 +/* C8F818 80241C68 3C028024 */ lui $v0, 0x8024 +/* C8F81C 80241C6C 24423BB8 */ addiu $v0, $v0, 0x3bb8 +/* C8F820 80241C70 00041840 */ sll $v1, $a0, 1 +/* C8F824 80241C74 00641821 */ addu $v1, $v1, $a0 +/* C8F828 80241C78 00032080 */ sll $a0, $v1, 2 +/* C8F82C 80241C7C 00822021 */ addu $a0, $a0, $v0 +/* C8F830 80241C80 24630001 */ addiu $v1, $v1, 1 +/* C8F834 80241C84 00031880 */ sll $v1, $v1, 2 +/* C8F838 80241C88 00621821 */ addu $v1, $v1, $v0 +/* C8F83C 80241C8C 8C840000 */ lw $a0, ($a0) +/* C8F840 80241C90 8C650000 */ lw $a1, ($v1) +/* C8F844 80241C94 08090741 */ j .L80241D04 +/* C8F848 80241C98 34C64000 */ ori $a2, $a2, 0x4000 +.L80241C9C: +/* C8F84C 80241C9C 3C068020 */ lui $a2, 0x8020 +/* C8F850 80241CA0 3C028024 */ lui $v0, 0x8024 +/* C8F854 80241CA4 24423BB8 */ addiu $v0, $v0, 0x3bb8 +/* C8F858 80241CA8 00041840 */ sll $v1, $a0, 1 +/* C8F85C 80241CAC 00641821 */ addu $v1, $v1, $a0 +/* C8F860 80241CB0 00032080 */ sll $a0, $v1, 2 +/* C8F864 80241CB4 00822021 */ addu $a0, $a0, $v0 +/* C8F868 80241CB8 24630001 */ addiu $v1, $v1, 1 +/* C8F86C 80241CBC 00031880 */ sll $v1, $v1, 2 +/* C8F870 80241CC0 00621821 */ addu $v1, $v1, $v0 +/* C8F874 80241CC4 8C840000 */ lw $a0, ($a0) +/* C8F878 80241CC8 8C650000 */ lw $a1, ($v1) +/* C8F87C 80241CCC 08090741 */ j .L80241D04 +/* C8F880 80241CD0 34C67000 */ ori $a2, $a2, 0x7000 +.L80241CD4: +/* C8F884 80241CD4 3C028024 */ lui $v0, 0x8024 +/* C8F888 80241CD8 24423BB8 */ addiu $v0, $v0, 0x3bb8 +/* C8F88C 80241CDC 00041840 */ sll $v1, $a0, 1 +/* C8F890 80241CE0 00641821 */ addu $v1, $v1, $a0 +/* C8F894 80241CE4 00032080 */ sll $a0, $v1, 2 +/* C8F898 80241CE8 00822021 */ addu $a0, $a0, $v0 +/* C8F89C 80241CEC 24630001 */ addiu $v1, $v1, 1 +/* C8F8A0 80241CF0 00031880 */ sll $v1, $v1, 2 +/* C8F8A4 80241CF4 00621821 */ addu $v1, $v1, $v0 +/* C8F8A8 80241CF8 8C840000 */ lw $a0, ($a0) +/* C8F8AC 80241CFC 8C650000 */ lw $a1, ($v1) +/* C8F8B0 80241D00 34C6A000 */ ori $a2, $a2, 0xa000 +.L80241D04: +/* C8F8B4 80241D04 0C00A5CF */ jal dma_copy +/* C8F8B8 80241D08 00000000 */ nop +.L80241D0C: +/* C8F8BC 80241D0C 8FBF0018 */ lw $ra, 0x18($sp) +/* C8F8C0 80241D10 8FB10014 */ lw $s1, 0x14($sp) +/* C8F8C4 80241D14 8FB00010 */ lw $s0, 0x10($sp) +/* C8F8C8 80241D18 24020002 */ addiu $v0, $zero, 2 +/* C8F8CC 80241D1C 03E00008 */ jr $ra +/* C8F8D0 80241D20 27BD0020 */ addiu $sp, $sp, 0x20 +/* C8F8D4 80241D24 00000000 */ nop +/* C8F8D8 80241D28 00000000 */ nop +/* C8F8DC 80241D2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504.s deleted file mode 100644 index b3ba9c7ce5..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240504 -/* C9C804 80240504 3C03800B */ lui $v1, %hi(gCameras) -/* C9C808 80240508 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* C9C80C 8024050C 94620002 */ lhu $v0, 2($v1) -/* C9C810 80240510 3042FFFE */ andi $v0, $v0, 0xfffe -/* C9C814 80240514 A4620002 */ sh $v0, 2($v1) -/* C9C818 80240518 03E00008 */ jr $ra -/* C9C81C 8024051C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s new file mode 100644 index 0000000000..c63af71641 --- /dev/null +++ b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240504_C9C804 +/* C9C804 80240504 3C03800B */ lui $v1, %hi(gCameras) +/* C9C808 80240508 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* C9C80C 8024050C 94620002 */ lhu $v0, 2($v1) +/* C9C810 80240510 3042FFFE */ andi $v0, $v0, 0xfffe +/* C9C814 80240514 A4620002 */ sh $v0, 2($v1) +/* C9C818 80240518 03E00008 */ jr $ra +/* C9C81C 8024051C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020.s deleted file mode 100644 index 2eca48214c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020 -/* 7EAD30 80240020 3C028016 */ lui $v0, 0x8016 -/* 7EAD34 80240024 8442A552 */ lh $v0, -0x5aae($v0) -/* 7EAD38 80240028 AC820084 */ sw $v0, 0x84($a0) -/* 7EAD3C 8024002C 03E00008 */ jr $ra -/* 7EAD40 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020_7EAD30.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020_7EAD30.s new file mode 100644 index 0000000000..df242a882a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240020_7EAD30.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240020_7EAD30 +/* 7EAD30 80240020 3C028016 */ lui $v0, 0x8016 +/* 7EAD34 80240024 8442A552 */ lh $v0, -0x5aae($v0) +/* 7EAD38 80240028 AC820084 */ sw $v0, 0x84($a0) +/* 7EAD3C 8024002C 03E00008 */ jr $ra +/* 7EAD40 80240030 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240034.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240034.s deleted file mode 100644 index eba7758b4b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240034.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240034 -/* 7EAD44 80240034 3C038016 */ lui $v1, 0x8016 -/* 7EAD48 80240038 8463A552 */ lh $v1, -0x5aae($v1) -/* 7EAD4C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EAD50 80240040 AFB00010 */ sw $s0, 0x10($sp) -/* 7EAD54 80240044 0080802D */ daddu $s0, $a0, $zero -/* 7EAD58 80240048 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EAD5C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) -/* 7EAD60 80240050 10620003 */ beq $v1, $v0, .L80240060 -/* 7EAD64 80240054 24020002 */ addiu $v0, $zero, 2 -/* 7EAD68 80240058 08090038 */ j .L802400E0 -/* 7EAD6C 8024005C AE000084 */ sw $zero, 0x84($s0) -.L80240060: -/* 7EAD70 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 7EAD74 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 7EAD78 80240068 80620040 */ lb $v0, 0x40($v1) -/* 7EAD7C 8024006C 80670044 */ lb $a3, 0x44($v1) -/* 7EAD80 80240070 04420001 */ bltzl $v0, .L80240078 -/* 7EAD84 80240074 00021023 */ negu $v0, $v0 -.L80240078: -/* 7EAD88 80240078 14400003 */ bnez $v0, .L80240088 -/* 7EAD8C 8024007C 00000000 */ nop -/* 7EAD90 80240080 50E00017 */ beql $a3, $zero, .L802400E0 -/* 7EAD94 80240084 0000102D */ daddu $v0, $zero, $zero -.L80240088: -/* 7EAD98 80240088 44822000 */ mtc1 $v0, $f4 -/* 7EAD9C 8024008C 00000000 */ nop -/* 7EADA0 80240090 46802120 */ cvt.s.w $f4, $f4 -/* 7EADA4 80240094 44062000 */ mfc1 $a2, $f4 -/* 7EADA8 80240098 44872000 */ mtc1 $a3, $f4 -/* 7EADAC 8024009C 00000000 */ nop -/* 7EADB0 802400A0 46802120 */ cvt.s.w $f4, $f4 -/* 7EADB4 802400A4 44806000 */ mtc1 $zero, $f12 -/* 7EADB8 802400A8 44072000 */ mfc1 $a3, $f4 -/* 7EADBC 802400AC 0C00A720 */ jal atan2 -/* 7EADC0 802400B0 46006386 */ mov.s $f14, $f12 -/* 7EADC4 802400B4 3C014270 */ lui $at, 0x4270 -/* 7EADC8 802400B8 44811000 */ mtc1 $at, $f2 -/* 7EADCC 802400BC 00000000 */ nop -/* 7EADD0 802400C0 4602003C */ c.lt.s $f0, $f2 -/* 7EADD4 802400C4 00000000 */ nop -/* 7EADD8 802400C8 45000004 */ bc1f .L802400DC -/* 7EADDC 802400CC 24020001 */ addiu $v0, $zero, 1 -/* 7EADE0 802400D0 AE020084 */ sw $v0, 0x84($s0) -/* 7EADE4 802400D4 08090038 */ j .L802400E0 -/* 7EADE8 802400D8 24020002 */ addiu $v0, $zero, 2 -.L802400DC: -/* 7EADEC 802400DC 0000102D */ daddu $v0, $zero, $zero -.L802400E0: -/* 7EADF0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EADF4 802400E4 8FB00010 */ lw $s0, 0x10($sp) -/* 7EADF8 802400E8 03E00008 */ jr $ra -/* 7EADFC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240034_7EAD44.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240034_7EAD44.s new file mode 100644 index 0000000000..ebd4294c92 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240034_7EAD44.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240034_7EAD44 +/* 7EAD44 80240034 3C038016 */ lui $v1, 0x8016 +/* 7EAD48 80240038 8463A552 */ lh $v1, -0x5aae($v1) +/* 7EAD4C 8024003C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EAD50 80240040 AFB00010 */ sw $s0, 0x10($sp) +/* 7EAD54 80240044 0080802D */ daddu $s0, $a0, $zero +/* 7EAD58 80240048 AFBF0014 */ sw $ra, 0x14($sp) +/* 7EAD5C 8024004C 8E0200B0 */ lw $v0, 0xb0($s0) +/* 7EAD60 80240050 10620003 */ beq $v1, $v0, .L80240060 +/* 7EAD64 80240054 24020002 */ addiu $v0, $zero, 2 +/* 7EAD68 80240058 08090038 */ j .L802400E0 +/* 7EAD6C 8024005C AE000084 */ sw $zero, 0x84($s0) +.L80240060: +/* 7EAD70 80240060 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 7EAD74 80240064 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 7EAD78 80240068 80620040 */ lb $v0, 0x40($v1) +/* 7EAD7C 8024006C 80670044 */ lb $a3, 0x44($v1) +/* 7EAD80 80240070 04420001 */ bltzl $v0, .L80240078 +/* 7EAD84 80240074 00021023 */ negu $v0, $v0 +.L80240078: +/* 7EAD88 80240078 14400003 */ bnez $v0, .L80240088 +/* 7EAD8C 8024007C 00000000 */ nop +/* 7EAD90 80240080 50E00017 */ beql $a3, $zero, .L802400E0 +/* 7EAD94 80240084 0000102D */ daddu $v0, $zero, $zero +.L80240088: +/* 7EAD98 80240088 44822000 */ mtc1 $v0, $f4 +/* 7EAD9C 8024008C 00000000 */ nop +/* 7EADA0 80240090 46802120 */ cvt.s.w $f4, $f4 +/* 7EADA4 80240094 44062000 */ mfc1 $a2, $f4 +/* 7EADA8 80240098 44872000 */ mtc1 $a3, $f4 +/* 7EADAC 8024009C 00000000 */ nop +/* 7EADB0 802400A0 46802120 */ cvt.s.w $f4, $f4 +/* 7EADB4 802400A4 44806000 */ mtc1 $zero, $f12 +/* 7EADB8 802400A8 44072000 */ mfc1 $a3, $f4 +/* 7EADBC 802400AC 0C00A720 */ jal atan2 +/* 7EADC0 802400B0 46006386 */ mov.s $f14, $f12 +/* 7EADC4 802400B4 3C014270 */ lui $at, 0x4270 +/* 7EADC8 802400B8 44811000 */ mtc1 $at, $f2 +/* 7EADCC 802400BC 00000000 */ nop +/* 7EADD0 802400C0 4602003C */ c.lt.s $f0, $f2 +/* 7EADD4 802400C4 00000000 */ nop +/* 7EADD8 802400C8 45000004 */ bc1f .L802400DC +/* 7EADDC 802400CC 24020001 */ addiu $v0, $zero, 1 +/* 7EADE0 802400D0 AE020084 */ sw $v0, 0x84($s0) +/* 7EADE4 802400D4 08090038 */ j .L802400E0 +/* 7EADE8 802400D8 24020002 */ addiu $v0, $zero, 2 +.L802400DC: +/* 7EADEC 802400DC 0000102D */ daddu $v0, $zero, $zero +.L802400E0: +/* 7EADF0 802400E0 8FBF0014 */ lw $ra, 0x14($sp) +/* 7EADF4 802400E4 8FB00010 */ lw $s0, 0x10($sp) +/* 7EADF8 802400E8 03E00008 */ jr $ra +/* 7EADFC 802400EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0.s deleted file mode 100644 index 97b1bb56fb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400F0 -/* 7EAE00 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EAE04 802400F4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EAE08 802400F8 0080882D */ daddu $s1, $a0, $zero -/* 7EAE0C 802400FC AFBF001C */ sw $ra, 0x1c($sp) -/* 7EAE10 80240100 AFB20018 */ sw $s2, 0x18($sp) -/* 7EAE14 80240104 0C016AFA */ jal get_current_map_header -/* 7EAE18 80240108 AFB00010 */ sw $s0, 0x10($sp) -/* 7EAE1C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* 7EAE20 80240110 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE24 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 7EAE28 80240118 0C0B1EAF */ jal get_variable -/* 7EAE2C 8024011C 0040902D */ daddu $s2, $v0, $zero -/* 7EAE30 80240120 0220202D */ daddu $a0, $s1, $zero -/* 7EAE34 80240124 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE38 80240128 8E430014 */ lw $v1, 0x14($s2) -/* 7EAE3C 8024012C 00028100 */ sll $s0, $v0, 4 -/* 7EAE40 80240130 02031821 */ addu $v1, $s0, $v1 -/* 7EAE44 80240134 C4600000 */ lwc1 $f0, ($v1) -/* 7EAE48 80240138 4600008D */ trunc.w.s $f2, $f0 -/* 7EAE4C 8024013C 44061000 */ mfc1 $a2, $f2 -/* 7EAE50 80240140 0C0B2026 */ jal set_variable -/* 7EAE54 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 7EAE58 80240148 0220202D */ daddu $a0, $s1, $zero -/* 7EAE5C 8024014C 8E420014 */ lw $v0, 0x14($s2) -/* 7EAE60 80240150 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE64 80240154 02021021 */ addu $v0, $s0, $v0 -/* 7EAE68 80240158 C4400004 */ lwc1 $f0, 4($v0) -/* 7EAE6C 8024015C 4600008D */ trunc.w.s $f2, $f0 -/* 7EAE70 80240160 44061000 */ mfc1 $a2, $f2 -/* 7EAE74 80240164 0C0B2026 */ jal set_variable -/* 7EAE78 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 7EAE7C 8024016C 0220202D */ daddu $a0, $s1, $zero -/* 7EAE80 80240170 8E420014 */ lw $v0, 0x14($s2) -/* 7EAE84 80240174 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAE88 80240178 02021021 */ addu $v0, $s0, $v0 -/* 7EAE8C 8024017C C4400008 */ lwc1 $f0, 8($v0) -/* 7EAE90 80240180 4600008D */ trunc.w.s $f2, $f0 -/* 7EAE94 80240184 44061000 */ mfc1 $a2, $f2 -/* 7EAE98 80240188 0C0B2026 */ jal set_variable -/* 7EAE9C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 7EAEA0 80240190 0220202D */ daddu $a0, $s1, $zero -/* 7EAEA4 80240194 8E420014 */ lw $v0, 0x14($s2) -/* 7EAEA8 80240198 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAEAC 8024019C 02028021 */ addu $s0, $s0, $v0 -/* 7EAEB0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) -/* 7EAEB4 802401A4 4600008D */ trunc.w.s $f2, $f0 -/* 7EAEB8 802401A8 44061000 */ mfc1 $a2, $f2 -/* 7EAEBC 802401AC 0C0B2026 */ jal set_variable -/* 7EAEC0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 7EAEC4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 7EAEC8 802401B8 8FB20018 */ lw $s2, 0x18($sp) -/* 7EAECC 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 7EAED0 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 7EAED4 802401C4 24020002 */ addiu $v0, $zero, 2 -/* 7EAED8 802401C8 03E00008 */ jr $ra -/* 7EAEDC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s new file mode 100644 index 0000000000..4b63ee8ecc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802400F0_7EAE00.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400F0_7EAE00 +/* 7EAE00 802400F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EAE04 802400F4 AFB10014 */ sw $s1, 0x14($sp) +/* 7EAE08 802400F8 0080882D */ daddu $s1, $a0, $zero +/* 7EAE0C 802400FC AFBF001C */ sw $ra, 0x1c($sp) +/* 7EAE10 80240100 AFB20018 */ sw $s2, 0x18($sp) +/* 7EAE14 80240104 0C016AFA */ jal get_current_map_header +/* 7EAE18 80240108 AFB00010 */ sw $s0, 0x10($sp) +/* 7EAE1C 8024010C 0220202D */ daddu $a0, $s1, $zero +/* 7EAE20 80240110 3C05FE36 */ lui $a1, 0xfe36 +/* 7EAE24 80240114 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 7EAE28 80240118 0C0B1EAF */ jal get_variable +/* 7EAE2C 8024011C 0040902D */ daddu $s2, $v0, $zero +/* 7EAE30 80240120 0220202D */ daddu $a0, $s1, $zero +/* 7EAE34 80240124 3C05FE36 */ lui $a1, 0xfe36 +/* 7EAE38 80240128 8E430014 */ lw $v1, 0x14($s2) +/* 7EAE3C 8024012C 00028100 */ sll $s0, $v0, 4 +/* 7EAE40 80240130 02031821 */ addu $v1, $s0, $v1 +/* 7EAE44 80240134 C4600000 */ lwc1 $f0, ($v1) +/* 7EAE48 80240138 4600008D */ trunc.w.s $f2, $f0 +/* 7EAE4C 8024013C 44061000 */ mfc1 $a2, $f2 +/* 7EAE50 80240140 0C0B2026 */ jal set_variable +/* 7EAE54 80240144 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 7EAE58 80240148 0220202D */ daddu $a0, $s1, $zero +/* 7EAE5C 8024014C 8E420014 */ lw $v0, 0x14($s2) +/* 7EAE60 80240150 3C05FE36 */ lui $a1, 0xfe36 +/* 7EAE64 80240154 02021021 */ addu $v0, $s0, $v0 +/* 7EAE68 80240158 C4400004 */ lwc1 $f0, 4($v0) +/* 7EAE6C 8024015C 4600008D */ trunc.w.s $f2, $f0 +/* 7EAE70 80240160 44061000 */ mfc1 $a2, $f2 +/* 7EAE74 80240164 0C0B2026 */ jal set_variable +/* 7EAE78 80240168 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 7EAE7C 8024016C 0220202D */ daddu $a0, $s1, $zero +/* 7EAE80 80240170 8E420014 */ lw $v0, 0x14($s2) +/* 7EAE84 80240174 3C05FE36 */ lui $a1, 0xfe36 +/* 7EAE88 80240178 02021021 */ addu $v0, $s0, $v0 +/* 7EAE8C 8024017C C4400008 */ lwc1 $f0, 8($v0) +/* 7EAE90 80240180 4600008D */ trunc.w.s $f2, $f0 +/* 7EAE94 80240184 44061000 */ mfc1 $a2, $f2 +/* 7EAE98 80240188 0C0B2026 */ jal set_variable +/* 7EAE9C 8024018C 34A53C83 */ ori $a1, $a1, 0x3c83 +/* 7EAEA0 80240190 0220202D */ daddu $a0, $s1, $zero +/* 7EAEA4 80240194 8E420014 */ lw $v0, 0x14($s2) +/* 7EAEA8 80240198 3C05FE36 */ lui $a1, 0xfe36 +/* 7EAEAC 8024019C 02028021 */ addu $s0, $s0, $v0 +/* 7EAEB0 802401A0 C600000C */ lwc1 $f0, 0xc($s0) +/* 7EAEB4 802401A4 4600008D */ trunc.w.s $f2, $f0 +/* 7EAEB8 802401A8 44061000 */ mfc1 $a2, $f2 +/* 7EAEBC 802401AC 0C0B2026 */ jal set_variable +/* 7EAEC0 802401B0 34A53C84 */ ori $a1, $a1, 0x3c84 +/* 7EAEC4 802401B4 8FBF001C */ lw $ra, 0x1c($sp) +/* 7EAEC8 802401B8 8FB20018 */ lw $s2, 0x18($sp) +/* 7EAECC 802401BC 8FB10014 */ lw $s1, 0x14($sp) +/* 7EAED0 802401C0 8FB00010 */ lw $s0, 0x10($sp) +/* 7EAED4 802401C4 24020002 */ addiu $v0, $zero, 2 +/* 7EAED8 802401C8 03E00008 */ jr $ra +/* 7EAEDC 802401CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0.s deleted file mode 100644 index 1f1cf7cfe0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D0 -/* 7EAEE0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 7EAEE4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 7EAEE8 802401D8 3C014334 */ lui $at, 0x4334 -/* 7EAEEC 802401DC 44816000 */ mtc1 $at, $f12 -/* 7EAEF0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EAEF4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EAEF8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* 7EAEFC 802401EC 00031080 */ sll $v0, $v1, 2 -/* 7EAF00 802401F0 00431021 */ addu $v0, $v0, $v1 -/* 7EAF04 802401F4 00021080 */ sll $v0, $v0, 2 -/* 7EAF08 802401F8 00431023 */ subu $v0, $v0, $v1 -/* 7EAF0C 802401FC 000218C0 */ sll $v1, $v0, 3 -/* 7EAF10 80240200 00431021 */ addu $v0, $v0, $v1 -/* 7EAF14 80240204 000210C0 */ sll $v0, $v0, 3 -/* 7EAF18 80240208 3C01800B */ lui $at, 0x800b -/* 7EAF1C 8024020C 00220821 */ addu $at, $at, $v0 -/* 7EAF20 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 7EAF24 80240214 460C0300 */ add.s $f12, $f0, $f12 -/* 7EAF28 80240218 0C00A6C9 */ jal clamp_angle -/* 7EAF2C 8024021C 0080802D */ daddu $s0, $a0, $zero -/* 7EAF30 80240220 4600008D */ trunc.w.s $f2, $f0 -/* 7EAF34 80240224 E6020084 */ swc1 $f2, 0x84($s0) -/* 7EAF38 80240228 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EAF3C 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* 7EAF40 80240230 24020002 */ addiu $v0, $zero, 2 -/* 7EAF44 80240234 03E00008 */ jr $ra -/* 7EAF48 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0_7EAEE0.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0_7EAEE0.s new file mode 100644 index 0000000000..5e9f75e40e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802401D0_7EAEE0.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401D0_7EAEE0 +/* 7EAEE0 802401D0 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 7EAEE4 802401D4 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 7EAEE8 802401D8 3C014334 */ lui $at, 0x4334 +/* 7EAEEC 802401DC 44816000 */ mtc1 $at, $f12 +/* 7EAEF0 802401E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EAEF4 802401E4 AFBF0014 */ sw $ra, 0x14($sp) +/* 7EAEF8 802401E8 AFB00010 */ sw $s0, 0x10($sp) +/* 7EAEFC 802401EC 00031080 */ sll $v0, $v1, 2 +/* 7EAF00 802401F0 00431021 */ addu $v0, $v0, $v1 +/* 7EAF04 802401F4 00021080 */ sll $v0, $v0, 2 +/* 7EAF08 802401F8 00431023 */ subu $v0, $v0, $v1 +/* 7EAF0C 802401FC 000218C0 */ sll $v1, $v0, 3 +/* 7EAF10 80240200 00431021 */ addu $v0, $v0, $v1 +/* 7EAF14 80240204 000210C0 */ sll $v0, $v0, 3 +/* 7EAF18 80240208 3C01800B */ lui $at, 0x800b +/* 7EAF1C 8024020C 00220821 */ addu $at, $at, $v0 +/* 7EAF20 80240210 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 7EAF24 80240214 460C0300 */ add.s $f12, $f0, $f12 +/* 7EAF28 80240218 0C00A6C9 */ jal clamp_angle +/* 7EAF2C 8024021C 0080802D */ daddu $s0, $a0, $zero +/* 7EAF30 80240220 4600008D */ trunc.w.s $f2, $f0 +/* 7EAF34 80240224 E6020084 */ swc1 $f2, 0x84($s0) +/* 7EAF38 80240228 8FBF0014 */ lw $ra, 0x14($sp) +/* 7EAF3C 8024022C 8FB00010 */ lw $s0, 0x10($sp) +/* 7EAF40 80240230 24020002 */ addiu $v0, $zero, 2 +/* 7EAF44 80240234 03E00008 */ jr $ra +/* 7EAF48 80240238 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_8024023C.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_8024023C.s deleted file mode 100644 index 97aa294043..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_8024023C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024023C -/* 7EAF4C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7EAF50 80240240 AFB00018 */ sw $s0, 0x18($sp) -/* 7EAF54 80240244 0080802D */ daddu $s0, $a0, $zero -/* 7EAF58 80240248 AFBF001C */ sw $ra, 0x1c($sp) -/* 7EAF5C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 7EAF60 80240250 8E02000C */ lw $v0, 0xc($s0) -/* 7EAF64 80240254 0C0B210B */ jal get_float_variable -/* 7EAF68 80240258 8C450000 */ lw $a1, ($v0) -/* 7EAF6C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 -/* 7EAF70 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 7EAF74 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 7EAF78 80240268 44060000 */ mfc1 $a2, $f0 -/* 7EAF7C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) -/* 7EAF80 80240270 C4420030 */ lwc1 $f2, 0x30($v0) -/* 7EAF84 80240274 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7EAF88 80240278 E7A20014 */ swc1 $f2, 0x14($sp) -/* 7EAF8C 8024027C 8C470080 */ lw $a3, 0x80($v0) -/* 7EAF90 80240280 C454002C */ lwc1 $f20, 0x2c($v0) -/* 7EAF94 80240284 0C00A7E7 */ jal add_vec2D_polar -/* 7EAF98 80240288 27A50014 */ addiu $a1, $sp, 0x14 -/* 7EAF9C 8024028C 0200202D */ daddu $a0, $s0, $zero -/* 7EAFA0 80240290 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAFA4 80240294 8FA60010 */ lw $a2, 0x10($sp) -/* 7EAFA8 80240298 0C0B2190 */ jal set_float_variable -/* 7EAFAC 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 7EAFB0 802402A0 0200202D */ daddu $a0, $s0, $zero -/* 7EAFB4 802402A4 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAFB8 802402A8 4406A000 */ mfc1 $a2, $f20 -/* 7EAFBC 802402AC 0C0B2190 */ jal set_float_variable -/* 7EAFC0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 7EAFC4 802402B4 0200202D */ daddu $a0, $s0, $zero -/* 7EAFC8 802402B8 3C05FE36 */ lui $a1, 0xfe36 -/* 7EAFCC 802402BC 8FA60014 */ lw $a2, 0x14($sp) -/* 7EAFD0 802402C0 0C0B2190 */ jal set_float_variable -/* 7EAFD4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 7EAFD8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) -/* 7EAFDC 802402CC 8FB00018 */ lw $s0, 0x18($sp) -/* 7EAFE0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 7EAFE4 802402D4 24020002 */ addiu $v0, $zero, 2 -/* 7EAFE8 802402D8 03E00008 */ jr $ra -/* 7EAFEC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_8024023C_7EAF4C.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_8024023C_7EAF4C.s new file mode 100644 index 0000000000..1b64c3dd18 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_8024023C_7EAF4C.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024023C_7EAF4C +/* 7EAF4C 8024023C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7EAF50 80240240 AFB00018 */ sw $s0, 0x18($sp) +/* 7EAF54 80240244 0080802D */ daddu $s0, $a0, $zero +/* 7EAF58 80240248 AFBF001C */ sw $ra, 0x1c($sp) +/* 7EAF5C 8024024C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 7EAF60 80240250 8E02000C */ lw $v0, 0xc($s0) +/* 7EAF64 80240254 0C0B210B */ jal get_float_variable +/* 7EAF68 80240258 8C450000 */ lw $a1, ($v0) +/* 7EAF6C 8024025C 27A40010 */ addiu $a0, $sp, 0x10 +/* 7EAF70 80240260 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 7EAF74 80240264 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 7EAF78 80240268 44060000 */ mfc1 $a2, $f0 +/* 7EAF7C 8024026C C4400028 */ lwc1 $f0, 0x28($v0) +/* 7EAF80 80240270 C4420030 */ lwc1 $f2, 0x30($v0) +/* 7EAF84 80240274 E7A00010 */ swc1 $f0, 0x10($sp) +/* 7EAF88 80240278 E7A20014 */ swc1 $f2, 0x14($sp) +/* 7EAF8C 8024027C 8C470080 */ lw $a3, 0x80($v0) +/* 7EAF90 80240280 C454002C */ lwc1 $f20, 0x2c($v0) +/* 7EAF94 80240284 0C00A7E7 */ jal add_vec2D_polar +/* 7EAF98 80240288 27A50014 */ addiu $a1, $sp, 0x14 +/* 7EAF9C 8024028C 0200202D */ daddu $a0, $s0, $zero +/* 7EAFA0 80240290 3C05FE36 */ lui $a1, 0xfe36 +/* 7EAFA4 80240294 8FA60010 */ lw $a2, 0x10($sp) +/* 7EAFA8 80240298 0C0B2190 */ jal set_float_variable +/* 7EAFAC 8024029C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 7EAFB0 802402A0 0200202D */ daddu $a0, $s0, $zero +/* 7EAFB4 802402A4 3C05FE36 */ lui $a1, 0xfe36 +/* 7EAFB8 802402A8 4406A000 */ mfc1 $a2, $f20 +/* 7EAFBC 802402AC 0C0B2190 */ jal set_float_variable +/* 7EAFC0 802402B0 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 7EAFC4 802402B4 0200202D */ daddu $a0, $s0, $zero +/* 7EAFC8 802402B8 3C05FE36 */ lui $a1, 0xfe36 +/* 7EAFCC 802402BC 8FA60014 */ lw $a2, 0x14($sp) +/* 7EAFD0 802402C0 0C0B2190 */ jal set_float_variable +/* 7EAFD4 802402C4 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 7EAFD8 802402C8 8FBF001C */ lw $ra, 0x1c($sp) +/* 7EAFDC 802402CC 8FB00018 */ lw $s0, 0x18($sp) +/* 7EAFE0 802402D0 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 7EAFE4 802402D4 24020002 */ addiu $v0, $zero, 2 +/* 7EAFE8 802402D8 03E00008 */ jr $ra +/* 7EAFEC 802402DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0.s deleted file mode 100644 index 05992c97ad..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0 -/* 7EAFF0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EAFF4 802402E4 AFB00010 */ sw $s0, 0x10($sp) -/* 7EAFF8 802402E8 0080802D */ daddu $s0, $a0, $zero -/* 7EAFFC 802402EC AFBF0014 */ sw $ra, 0x14($sp) -/* 7EB000 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) -/* 7EB004 802402F4 8E020088 */ lw $v0, 0x88($s0) -/* 7EB008 802402F8 00621821 */ addu $v1, $v1, $v0 -/* 7EB00C 802402FC 04610004 */ bgez $v1, .L80240310 -/* 7EB010 80240300 AE0300A8 */ sw $v1, 0xa8($s0) -/* 7EB014 80240304 3C020002 */ lui $v0, 2 -/* 7EB018 80240308 080900C8 */ j .L80240320 -/* 7EB01C 8024030C 00621021 */ addu $v0, $v1, $v0 -.L80240310: -/* 7EB020 80240310 3C040002 */ lui $a0, 2 -/* 7EB024 80240314 0083102A */ slt $v0, $a0, $v1 -/* 7EB028 80240318 10400002 */ beqz $v0, .L80240324 -/* 7EB02C 8024031C 00641023 */ subu $v0, $v1, $a0 -.L80240320: -/* 7EB030 80240320 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240324: -/* 7EB034 80240324 8E0300AC */ lw $v1, 0xac($s0) -/* 7EB038 80240328 8E02008C */ lw $v0, 0x8c($s0) -/* 7EB03C 8024032C 00621821 */ addu $v1, $v1, $v0 -/* 7EB040 80240330 04610004 */ bgez $v1, .L80240344 -/* 7EB044 80240334 AE0300AC */ sw $v1, 0xac($s0) -/* 7EB048 80240338 3C020002 */ lui $v0, 2 -/* 7EB04C 8024033C 080900D5 */ j .L80240354 -/* 7EB050 80240340 00621021 */ addu $v0, $v1, $v0 -.L80240344: -/* 7EB054 80240344 3C040002 */ lui $a0, 2 -/* 7EB058 80240348 0083102A */ slt $v0, $a0, $v1 -/* 7EB05C 8024034C 10400002 */ beqz $v0, .L80240358 -/* 7EB060 80240350 00641023 */ subu $v0, $v1, $a0 -.L80240354: -/* 7EB064 80240354 AE0200AC */ sw $v0, 0xac($s0) -.L80240358: -/* 7EB068 80240358 8E0300B0 */ lw $v1, 0xb0($s0) -/* 7EB06C 8024035C 8E020090 */ lw $v0, 0x90($s0) -/* 7EB070 80240360 00621821 */ addu $v1, $v1, $v0 -/* 7EB074 80240364 04610004 */ bgez $v1, .L80240378 -/* 7EB078 80240368 AE0300B0 */ sw $v1, 0xb0($s0) -/* 7EB07C 8024036C 3C020002 */ lui $v0, 2 -/* 7EB080 80240370 080900E2 */ j .L80240388 -/* 7EB084 80240374 00621021 */ addu $v0, $v1, $v0 -.L80240378: -/* 7EB088 80240378 3C040002 */ lui $a0, 2 -/* 7EB08C 8024037C 0083102A */ slt $v0, $a0, $v1 -/* 7EB090 80240380 10400002 */ beqz $v0, .L8024038C -/* 7EB094 80240384 00641023 */ subu $v0, $v1, $a0 -.L80240388: -/* 7EB098 80240388 AE0200B0 */ sw $v0, 0xb0($s0) -.L8024038C: -/* 7EB09C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) -/* 7EB0A0 80240390 8E020094 */ lw $v0, 0x94($s0) -/* 7EB0A4 80240394 00621821 */ addu $v1, $v1, $v0 -/* 7EB0A8 80240398 04610004 */ bgez $v1, .L802403AC -/* 7EB0AC 8024039C AE0300B4 */ sw $v1, 0xb4($s0) -/* 7EB0B0 802403A0 3C020002 */ lui $v0, 2 -/* 7EB0B4 802403A4 080900EF */ j .L802403BC -/* 7EB0B8 802403A8 00621021 */ addu $v0, $v1, $v0 -.L802403AC: -/* 7EB0BC 802403AC 3C040002 */ lui $a0, 2 -/* 7EB0C0 802403B0 0083102A */ slt $v0, $a0, $v1 -/* 7EB0C4 802403B4 10400002 */ beqz $v0, .L802403C0 -/* 7EB0C8 802403B8 00641023 */ subu $v0, $v1, $a0 -.L802403BC: -/* 7EB0CC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) -.L802403C0: -/* 7EB0D0 802403C0 8E040084 */ lw $a0, 0x84($s0) -/* 7EB0D4 802403C4 0C046F07 */ jal set_main_pan_u -/* 7EB0D8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) -/* 7EB0DC 802403CC 8E040084 */ lw $a0, 0x84($s0) -/* 7EB0E0 802403D0 0C046F0D */ jal set_main_pan_v -/* 7EB0E4 802403D4 8E0500AC */ lw $a1, 0xac($s0) -/* 7EB0E8 802403D8 8E040084 */ lw $a0, 0x84($s0) -/* 7EB0EC 802403DC 0C046F13 */ jal set_aux_pan_u -/* 7EB0F0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) -/* 7EB0F4 802403E4 8E040084 */ lw $a0, 0x84($s0) -/* 7EB0F8 802403E8 0C046F19 */ jal set_aux_pan_v -/* 7EB0FC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) -/* 7EB100 802403F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EB104 802403F4 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB108 802403F8 0000102D */ daddu $v0, $zero, $zero -/* 7EB10C 802403FC 03E00008 */ jr $ra -/* 7EB110 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0_7EAFF0.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0_7EAFF0.s new file mode 100644 index 0000000000..0e26f8e8f5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802402E0_7EAFF0.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402E0_7EAFF0 +/* 7EAFF0 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EAFF4 802402E4 AFB00010 */ sw $s0, 0x10($sp) +/* 7EAFF8 802402E8 0080802D */ daddu $s0, $a0, $zero +/* 7EAFFC 802402EC AFBF0014 */ sw $ra, 0x14($sp) +/* 7EB000 802402F0 8E0300A8 */ lw $v1, 0xa8($s0) +/* 7EB004 802402F4 8E020088 */ lw $v0, 0x88($s0) +/* 7EB008 802402F8 00621821 */ addu $v1, $v1, $v0 +/* 7EB00C 802402FC 04610004 */ bgez $v1, .L80240310 +/* 7EB010 80240300 AE0300A8 */ sw $v1, 0xa8($s0) +/* 7EB014 80240304 3C020002 */ lui $v0, 2 +/* 7EB018 80240308 080900C8 */ j .L80240320 +/* 7EB01C 8024030C 00621021 */ addu $v0, $v1, $v0 +.L80240310: +/* 7EB020 80240310 3C040002 */ lui $a0, 2 +/* 7EB024 80240314 0083102A */ slt $v0, $a0, $v1 +/* 7EB028 80240318 10400002 */ beqz $v0, .L80240324 +/* 7EB02C 8024031C 00641023 */ subu $v0, $v1, $a0 +.L80240320: +/* 7EB030 80240320 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240324: +/* 7EB034 80240324 8E0300AC */ lw $v1, 0xac($s0) +/* 7EB038 80240328 8E02008C */ lw $v0, 0x8c($s0) +/* 7EB03C 8024032C 00621821 */ addu $v1, $v1, $v0 +/* 7EB040 80240330 04610004 */ bgez $v1, .L80240344 +/* 7EB044 80240334 AE0300AC */ sw $v1, 0xac($s0) +/* 7EB048 80240338 3C020002 */ lui $v0, 2 +/* 7EB04C 8024033C 080900D5 */ j .L80240354 +/* 7EB050 80240340 00621021 */ addu $v0, $v1, $v0 +.L80240344: +/* 7EB054 80240344 3C040002 */ lui $a0, 2 +/* 7EB058 80240348 0083102A */ slt $v0, $a0, $v1 +/* 7EB05C 8024034C 10400002 */ beqz $v0, .L80240358 +/* 7EB060 80240350 00641023 */ subu $v0, $v1, $a0 +.L80240354: +/* 7EB064 80240354 AE0200AC */ sw $v0, 0xac($s0) +.L80240358: +/* 7EB068 80240358 8E0300B0 */ lw $v1, 0xb0($s0) +/* 7EB06C 8024035C 8E020090 */ lw $v0, 0x90($s0) +/* 7EB070 80240360 00621821 */ addu $v1, $v1, $v0 +/* 7EB074 80240364 04610004 */ bgez $v1, .L80240378 +/* 7EB078 80240368 AE0300B0 */ sw $v1, 0xb0($s0) +/* 7EB07C 8024036C 3C020002 */ lui $v0, 2 +/* 7EB080 80240370 080900E2 */ j .L80240388 +/* 7EB084 80240374 00621021 */ addu $v0, $v1, $v0 +.L80240378: +/* 7EB088 80240378 3C040002 */ lui $a0, 2 +/* 7EB08C 8024037C 0083102A */ slt $v0, $a0, $v1 +/* 7EB090 80240380 10400002 */ beqz $v0, .L8024038C +/* 7EB094 80240384 00641023 */ subu $v0, $v1, $a0 +.L80240388: +/* 7EB098 80240388 AE0200B0 */ sw $v0, 0xb0($s0) +.L8024038C: +/* 7EB09C 8024038C 8E0300B4 */ lw $v1, 0xb4($s0) +/* 7EB0A0 80240390 8E020094 */ lw $v0, 0x94($s0) +/* 7EB0A4 80240394 00621821 */ addu $v1, $v1, $v0 +/* 7EB0A8 80240398 04610004 */ bgez $v1, .L802403AC +/* 7EB0AC 8024039C AE0300B4 */ sw $v1, 0xb4($s0) +/* 7EB0B0 802403A0 3C020002 */ lui $v0, 2 +/* 7EB0B4 802403A4 080900EF */ j .L802403BC +/* 7EB0B8 802403A8 00621021 */ addu $v0, $v1, $v0 +.L802403AC: +/* 7EB0BC 802403AC 3C040002 */ lui $a0, 2 +/* 7EB0C0 802403B0 0083102A */ slt $v0, $a0, $v1 +/* 7EB0C4 802403B4 10400002 */ beqz $v0, .L802403C0 +/* 7EB0C8 802403B8 00641023 */ subu $v0, $v1, $a0 +.L802403BC: +/* 7EB0CC 802403BC AE0200B4 */ sw $v0, 0xb4($s0) +.L802403C0: +/* 7EB0D0 802403C0 8E040084 */ lw $a0, 0x84($s0) +/* 7EB0D4 802403C4 0C046F07 */ jal set_main_pan_u +/* 7EB0D8 802403C8 8E0500A8 */ lw $a1, 0xa8($s0) +/* 7EB0DC 802403CC 8E040084 */ lw $a0, 0x84($s0) +/* 7EB0E0 802403D0 0C046F0D */ jal set_main_pan_v +/* 7EB0E4 802403D4 8E0500AC */ lw $a1, 0xac($s0) +/* 7EB0E8 802403D8 8E040084 */ lw $a0, 0x84($s0) +/* 7EB0EC 802403DC 0C046F13 */ jal set_aux_pan_u +/* 7EB0F0 802403E0 8E0500B0 */ lw $a1, 0xb0($s0) +/* 7EB0F4 802403E4 8E040084 */ lw $a0, 0x84($s0) +/* 7EB0F8 802403E8 0C046F19 */ jal set_aux_pan_v +/* 7EB0FC 802403EC 8E0500B4 */ lw $a1, 0xb4($s0) +/* 7EB100 802403F0 8FBF0014 */ lw $ra, 0x14($sp) +/* 7EB104 802403F4 8FB00010 */ lw $s0, 0x10($sp) +/* 7EB108 802403F8 0000102D */ daddu $v0, $zero, $zero +/* 7EB10C 802403FC 03E00008 */ jr $ra +/* 7EB110 80240400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404.s deleted file mode 100644 index a4a7ed83c3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404 -/* 7EB114 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EB118 80240408 AFB00010 */ sw $s0, 0x10($sp) -/* 7EB11C 8024040C 0080802D */ daddu $s0, $a0, $zero -/* 7EB120 80240410 10A00005 */ beqz $a1, .L80240428 -/* 7EB124 80240414 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EB128 80240418 AE000070 */ sw $zero, 0x70($s0) -/* 7EB12C 8024041C AE000074 */ sw $zero, 0x74($s0) -/* 7EB130 80240420 AE000078 */ sw $zero, 0x78($s0) -/* 7EB134 80240424 AE00007C */ sw $zero, 0x7c($s0) -.L80240428: -/* 7EB138 80240428 8E020070 */ lw $v0, 0x70($s0) -/* 7EB13C 8024042C 1440000E */ bnez $v0, .L80240468 -/* 7EB140 80240430 00000000 */ nop -/* 7EB144 80240434 8E0300A8 */ lw $v1, 0xa8($s0) -/* 7EB148 80240438 8E020088 */ lw $v0, 0x88($s0) -/* 7EB14C 8024043C 00621821 */ addu $v1, $v1, $v0 -/* 7EB150 80240440 04610004 */ bgez $v1, .L80240454 -/* 7EB154 80240444 AE0300A8 */ sw $v1, 0xa8($s0) -/* 7EB158 80240448 3C020002 */ lui $v0, 2 -/* 7EB15C 8024044C 08090119 */ j .L80240464 -/* 7EB160 80240450 00621021 */ addu $v0, $v1, $v0 -.L80240454: -/* 7EB164 80240454 3C040002 */ lui $a0, 2 -/* 7EB168 80240458 0083102A */ slt $v0, $a0, $v1 -/* 7EB16C 8024045C 10400002 */ beqz $v0, .L80240468 -/* 7EB170 80240460 00641023 */ subu $v0, $v1, $a0 -.L80240464: -/* 7EB174 80240464 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240468: -/* 7EB178 80240468 8E020074 */ lw $v0, 0x74($s0) -/* 7EB17C 8024046C 1440000E */ bnez $v0, .L802404A8 -/* 7EB180 80240470 00000000 */ nop -/* 7EB184 80240474 8E0300AC */ lw $v1, 0xac($s0) -/* 7EB188 80240478 8E02008C */ lw $v0, 0x8c($s0) -/* 7EB18C 8024047C 00621821 */ addu $v1, $v1, $v0 -/* 7EB190 80240480 04610004 */ bgez $v1, .L80240494 -/* 7EB194 80240484 AE0300AC */ sw $v1, 0xac($s0) -/* 7EB198 80240488 3C020002 */ lui $v0, 2 -/* 7EB19C 8024048C 08090129 */ j .L802404A4 -/* 7EB1A0 80240490 00621021 */ addu $v0, $v1, $v0 -.L80240494: -/* 7EB1A4 80240494 3C040002 */ lui $a0, 2 -/* 7EB1A8 80240498 0083102A */ slt $v0, $a0, $v1 -/* 7EB1AC 8024049C 10400002 */ beqz $v0, .L802404A8 -/* 7EB1B0 802404A0 00641023 */ subu $v0, $v1, $a0 -.L802404A4: -/* 7EB1B4 802404A4 AE0200AC */ sw $v0, 0xac($s0) -.L802404A8: -/* 7EB1B8 802404A8 8E020078 */ lw $v0, 0x78($s0) -/* 7EB1BC 802404AC 1440000E */ bnez $v0, .L802404E8 -/* 7EB1C0 802404B0 00000000 */ nop -/* 7EB1C4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 7EB1C8 802404B8 8E020090 */ lw $v0, 0x90($s0) -/* 7EB1CC 802404BC 00621821 */ addu $v1, $v1, $v0 -/* 7EB1D0 802404C0 04610004 */ bgez $v1, .L802404D4 -/* 7EB1D4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 7EB1D8 802404C8 3C020002 */ lui $v0, 2 -/* 7EB1DC 802404CC 08090139 */ j .L802404E4 -/* 7EB1E0 802404D0 00621021 */ addu $v0, $v1, $v0 -.L802404D4: -/* 7EB1E4 802404D4 3C040002 */ lui $a0, 2 -/* 7EB1E8 802404D8 0083102A */ slt $v0, $a0, $v1 -/* 7EB1EC 802404DC 10400002 */ beqz $v0, .L802404E8 -/* 7EB1F0 802404E0 00641023 */ subu $v0, $v1, $a0 -.L802404E4: -/* 7EB1F4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) -.L802404E8: -/* 7EB1F8 802404E8 8E02007C */ lw $v0, 0x7c($s0) -/* 7EB1FC 802404EC 1440000E */ bnez $v0, .L80240528 -/* 7EB200 802404F0 00000000 */ nop -/* 7EB204 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) -/* 7EB208 802404F8 8E020094 */ lw $v0, 0x94($s0) -/* 7EB20C 802404FC 00621821 */ addu $v1, $v1, $v0 -/* 7EB210 80240500 04610004 */ bgez $v1, .L80240514 -/* 7EB214 80240504 AE0300B4 */ sw $v1, 0xb4($s0) -/* 7EB218 80240508 3C020002 */ lui $v0, 2 -/* 7EB21C 8024050C 08090149 */ j .L80240524 -/* 7EB220 80240510 00621021 */ addu $v0, $v1, $v0 -.L80240514: -/* 7EB224 80240514 3C040002 */ lui $a0, 2 -/* 7EB228 80240518 0083102A */ slt $v0, $a0, $v1 -/* 7EB22C 8024051C 10400002 */ beqz $v0, .L80240528 -/* 7EB230 80240520 00641023 */ subu $v0, $v1, $a0 -.L80240524: -/* 7EB234 80240524 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240528: -/* 7EB238 80240528 8E040084 */ lw $a0, 0x84($s0) -/* 7EB23C 8024052C 0C046F07 */ jal set_main_pan_u -/* 7EB240 80240530 8E0500A8 */ lw $a1, 0xa8($s0) -/* 7EB244 80240534 8E040084 */ lw $a0, 0x84($s0) -/* 7EB248 80240538 0C046F0D */ jal set_main_pan_v -/* 7EB24C 8024053C 8E0500AC */ lw $a1, 0xac($s0) -/* 7EB250 80240540 8E040084 */ lw $a0, 0x84($s0) -/* 7EB254 80240544 0C046F13 */ jal set_aux_pan_u -/* 7EB258 80240548 8E0500B0 */ lw $a1, 0xb0($s0) -/* 7EB25C 8024054C 8E040084 */ lw $a0, 0x84($s0) -/* 7EB260 80240550 0C046F19 */ jal set_aux_pan_v -/* 7EB264 80240554 8E0500B4 */ lw $a1, 0xb4($s0) -/* 7EB268 80240558 8E020070 */ lw $v0, 0x70($s0) -/* 7EB26C 8024055C 8E030078 */ lw $v1, 0x78($s0) -/* 7EB270 80240560 8E040098 */ lw $a0, 0x98($s0) -/* 7EB274 80240564 24420001 */ addiu $v0, $v0, 1 -/* 7EB278 80240568 AE020070 */ sw $v0, 0x70($s0) -/* 7EB27C 8024056C 8E020074 */ lw $v0, 0x74($s0) -/* 7EB280 80240570 24630001 */ addiu $v1, $v1, 1 -/* 7EB284 80240574 AE030078 */ sw $v1, 0x78($s0) -/* 7EB288 80240578 8E030070 */ lw $v1, 0x70($s0) -/* 7EB28C 8024057C 24420001 */ addiu $v0, $v0, 1 -/* 7EB290 80240580 AE020074 */ sw $v0, 0x74($s0) -/* 7EB294 80240584 8E02007C */ lw $v0, 0x7c($s0) -/* 7EB298 80240588 0064182A */ slt $v1, $v1, $a0 -/* 7EB29C 8024058C 24420001 */ addiu $v0, $v0, 1 -/* 7EB2A0 80240590 14600002 */ bnez $v1, .L8024059C -/* 7EB2A4 80240594 AE02007C */ sw $v0, 0x7c($s0) -/* 7EB2A8 80240598 AE000070 */ sw $zero, 0x70($s0) -.L8024059C: -/* 7EB2AC 8024059C 8E020074 */ lw $v0, 0x74($s0) -/* 7EB2B0 802405A0 8E03009C */ lw $v1, 0x9c($s0) -/* 7EB2B4 802405A4 0043102A */ slt $v0, $v0, $v1 -/* 7EB2B8 802405A8 50400001 */ beql $v0, $zero, .L802405B0 -/* 7EB2BC 802405AC AE000074 */ sw $zero, 0x74($s0) -.L802405B0: -/* 7EB2C0 802405B0 8E020078 */ lw $v0, 0x78($s0) -/* 7EB2C4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 7EB2C8 802405B8 0043102A */ slt $v0, $v0, $v1 -/* 7EB2CC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 -/* 7EB2D0 802405C0 AE000078 */ sw $zero, 0x78($s0) -.L802405C4: -/* 7EB2D4 802405C4 8E02007C */ lw $v0, 0x7c($s0) -/* 7EB2D8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 7EB2DC 802405CC 0043102A */ slt $v0, $v0, $v1 -/* 7EB2E0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 -/* 7EB2E4 802405D4 AE00007C */ sw $zero, 0x7c($s0) -.L802405D8: -/* 7EB2E8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EB2EC 802405DC 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB2F0 802405E0 0000102D */ daddu $v0, $zero, $zero -/* 7EB2F4 802405E4 03E00008 */ jr $ra -/* 7EB2F8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404_7EB114.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404_7EB114.s new file mode 100644 index 0000000000..d4234e4601 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240404_7EB114.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240404_7EB114 +/* 7EB114 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EB118 80240408 AFB00010 */ sw $s0, 0x10($sp) +/* 7EB11C 8024040C 0080802D */ daddu $s0, $a0, $zero +/* 7EB120 80240410 10A00005 */ beqz $a1, .L80240428 +/* 7EB124 80240414 AFBF0014 */ sw $ra, 0x14($sp) +/* 7EB128 80240418 AE000070 */ sw $zero, 0x70($s0) +/* 7EB12C 8024041C AE000074 */ sw $zero, 0x74($s0) +/* 7EB130 80240420 AE000078 */ sw $zero, 0x78($s0) +/* 7EB134 80240424 AE00007C */ sw $zero, 0x7c($s0) +.L80240428: +/* 7EB138 80240428 8E020070 */ lw $v0, 0x70($s0) +/* 7EB13C 8024042C 1440000E */ bnez $v0, .L80240468 +/* 7EB140 80240430 00000000 */ nop +/* 7EB144 80240434 8E0300A8 */ lw $v1, 0xa8($s0) +/* 7EB148 80240438 8E020088 */ lw $v0, 0x88($s0) +/* 7EB14C 8024043C 00621821 */ addu $v1, $v1, $v0 +/* 7EB150 80240440 04610004 */ bgez $v1, .L80240454 +/* 7EB154 80240444 AE0300A8 */ sw $v1, 0xa8($s0) +/* 7EB158 80240448 3C020002 */ lui $v0, 2 +/* 7EB15C 8024044C 08090119 */ j .L80240464 +/* 7EB160 80240450 00621021 */ addu $v0, $v1, $v0 +.L80240454: +/* 7EB164 80240454 3C040002 */ lui $a0, 2 +/* 7EB168 80240458 0083102A */ slt $v0, $a0, $v1 +/* 7EB16C 8024045C 10400002 */ beqz $v0, .L80240468 +/* 7EB170 80240460 00641023 */ subu $v0, $v1, $a0 +.L80240464: +/* 7EB174 80240464 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240468: +/* 7EB178 80240468 8E020074 */ lw $v0, 0x74($s0) +/* 7EB17C 8024046C 1440000E */ bnez $v0, .L802404A8 +/* 7EB180 80240470 00000000 */ nop +/* 7EB184 80240474 8E0300AC */ lw $v1, 0xac($s0) +/* 7EB188 80240478 8E02008C */ lw $v0, 0x8c($s0) +/* 7EB18C 8024047C 00621821 */ addu $v1, $v1, $v0 +/* 7EB190 80240480 04610004 */ bgez $v1, .L80240494 +/* 7EB194 80240484 AE0300AC */ sw $v1, 0xac($s0) +/* 7EB198 80240488 3C020002 */ lui $v0, 2 +/* 7EB19C 8024048C 08090129 */ j .L802404A4 +/* 7EB1A0 80240490 00621021 */ addu $v0, $v1, $v0 +.L80240494: +/* 7EB1A4 80240494 3C040002 */ lui $a0, 2 +/* 7EB1A8 80240498 0083102A */ slt $v0, $a0, $v1 +/* 7EB1AC 8024049C 10400002 */ beqz $v0, .L802404A8 +/* 7EB1B0 802404A0 00641023 */ subu $v0, $v1, $a0 +.L802404A4: +/* 7EB1B4 802404A4 AE0200AC */ sw $v0, 0xac($s0) +.L802404A8: +/* 7EB1B8 802404A8 8E020078 */ lw $v0, 0x78($s0) +/* 7EB1BC 802404AC 1440000E */ bnez $v0, .L802404E8 +/* 7EB1C0 802404B0 00000000 */ nop +/* 7EB1C4 802404B4 8E0300B0 */ lw $v1, 0xb0($s0) +/* 7EB1C8 802404B8 8E020090 */ lw $v0, 0x90($s0) +/* 7EB1CC 802404BC 00621821 */ addu $v1, $v1, $v0 +/* 7EB1D0 802404C0 04610004 */ bgez $v1, .L802404D4 +/* 7EB1D4 802404C4 AE0300B0 */ sw $v1, 0xb0($s0) +/* 7EB1D8 802404C8 3C020002 */ lui $v0, 2 +/* 7EB1DC 802404CC 08090139 */ j .L802404E4 +/* 7EB1E0 802404D0 00621021 */ addu $v0, $v1, $v0 +.L802404D4: +/* 7EB1E4 802404D4 3C040002 */ lui $a0, 2 +/* 7EB1E8 802404D8 0083102A */ slt $v0, $a0, $v1 +/* 7EB1EC 802404DC 10400002 */ beqz $v0, .L802404E8 +/* 7EB1F0 802404E0 00641023 */ subu $v0, $v1, $a0 +.L802404E4: +/* 7EB1F4 802404E4 AE0200B0 */ sw $v0, 0xb0($s0) +.L802404E8: +/* 7EB1F8 802404E8 8E02007C */ lw $v0, 0x7c($s0) +/* 7EB1FC 802404EC 1440000E */ bnez $v0, .L80240528 +/* 7EB200 802404F0 00000000 */ nop +/* 7EB204 802404F4 8E0300B4 */ lw $v1, 0xb4($s0) +/* 7EB208 802404F8 8E020094 */ lw $v0, 0x94($s0) +/* 7EB20C 802404FC 00621821 */ addu $v1, $v1, $v0 +/* 7EB210 80240500 04610004 */ bgez $v1, .L80240514 +/* 7EB214 80240504 AE0300B4 */ sw $v1, 0xb4($s0) +/* 7EB218 80240508 3C020002 */ lui $v0, 2 +/* 7EB21C 8024050C 08090149 */ j .L80240524 +/* 7EB220 80240510 00621021 */ addu $v0, $v1, $v0 +.L80240514: +/* 7EB224 80240514 3C040002 */ lui $a0, 2 +/* 7EB228 80240518 0083102A */ slt $v0, $a0, $v1 +/* 7EB22C 8024051C 10400002 */ beqz $v0, .L80240528 +/* 7EB230 80240520 00641023 */ subu $v0, $v1, $a0 +.L80240524: +/* 7EB234 80240524 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240528: +/* 7EB238 80240528 8E040084 */ lw $a0, 0x84($s0) +/* 7EB23C 8024052C 0C046F07 */ jal set_main_pan_u +/* 7EB240 80240530 8E0500A8 */ lw $a1, 0xa8($s0) +/* 7EB244 80240534 8E040084 */ lw $a0, 0x84($s0) +/* 7EB248 80240538 0C046F0D */ jal set_main_pan_v +/* 7EB24C 8024053C 8E0500AC */ lw $a1, 0xac($s0) +/* 7EB250 80240540 8E040084 */ lw $a0, 0x84($s0) +/* 7EB254 80240544 0C046F13 */ jal set_aux_pan_u +/* 7EB258 80240548 8E0500B0 */ lw $a1, 0xb0($s0) +/* 7EB25C 8024054C 8E040084 */ lw $a0, 0x84($s0) +/* 7EB260 80240550 0C046F19 */ jal set_aux_pan_v +/* 7EB264 80240554 8E0500B4 */ lw $a1, 0xb4($s0) +/* 7EB268 80240558 8E020070 */ lw $v0, 0x70($s0) +/* 7EB26C 8024055C 8E030078 */ lw $v1, 0x78($s0) +/* 7EB270 80240560 8E040098 */ lw $a0, 0x98($s0) +/* 7EB274 80240564 24420001 */ addiu $v0, $v0, 1 +/* 7EB278 80240568 AE020070 */ sw $v0, 0x70($s0) +/* 7EB27C 8024056C 8E020074 */ lw $v0, 0x74($s0) +/* 7EB280 80240570 24630001 */ addiu $v1, $v1, 1 +/* 7EB284 80240574 AE030078 */ sw $v1, 0x78($s0) +/* 7EB288 80240578 8E030070 */ lw $v1, 0x70($s0) +/* 7EB28C 8024057C 24420001 */ addiu $v0, $v0, 1 +/* 7EB290 80240580 AE020074 */ sw $v0, 0x74($s0) +/* 7EB294 80240584 8E02007C */ lw $v0, 0x7c($s0) +/* 7EB298 80240588 0064182A */ slt $v1, $v1, $a0 +/* 7EB29C 8024058C 24420001 */ addiu $v0, $v0, 1 +/* 7EB2A0 80240590 14600002 */ bnez $v1, .L8024059C +/* 7EB2A4 80240594 AE02007C */ sw $v0, 0x7c($s0) +/* 7EB2A8 80240598 AE000070 */ sw $zero, 0x70($s0) +.L8024059C: +/* 7EB2AC 8024059C 8E020074 */ lw $v0, 0x74($s0) +/* 7EB2B0 802405A0 8E03009C */ lw $v1, 0x9c($s0) +/* 7EB2B4 802405A4 0043102A */ slt $v0, $v0, $v1 +/* 7EB2B8 802405A8 50400001 */ beql $v0, $zero, .L802405B0 +/* 7EB2BC 802405AC AE000074 */ sw $zero, 0x74($s0) +.L802405B0: +/* 7EB2C0 802405B0 8E020078 */ lw $v0, 0x78($s0) +/* 7EB2C4 802405B4 8E0300A0 */ lw $v1, 0xa0($s0) +/* 7EB2C8 802405B8 0043102A */ slt $v0, $v0, $v1 +/* 7EB2CC 802405BC 50400001 */ beql $v0, $zero, .L802405C4 +/* 7EB2D0 802405C0 AE000078 */ sw $zero, 0x78($s0) +.L802405C4: +/* 7EB2D4 802405C4 8E02007C */ lw $v0, 0x7c($s0) +/* 7EB2D8 802405C8 8E0300A4 */ lw $v1, 0xa4($s0) +/* 7EB2DC 802405CC 0043102A */ slt $v0, $v0, $v1 +/* 7EB2E0 802405D0 50400001 */ beql $v0, $zero, .L802405D8 +/* 7EB2E4 802405D4 AE00007C */ sw $zero, 0x7c($s0) +.L802405D8: +/* 7EB2E8 802405D8 8FBF0014 */ lw $ra, 0x14($sp) +/* 7EB2EC 802405DC 8FB00010 */ lw $s0, 0x10($sp) +/* 7EB2F0 802405E0 0000102D */ daddu $v0, $zero, $zero +/* 7EB2F4 802405E4 03E00008 */ jr $ra +/* 7EB2F8 802405E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802405EC.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802405EC.s deleted file mode 100644 index e1e0b961e6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802405EC.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405EC -/* 7EB2FC 802405EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7EB300 802405F0 AFBF0020 */ sw $ra, 0x20($sp) -/* 7EB304 802405F4 8C82000C */ lw $v0, 0xc($a0) -/* 7EB308 802405F8 0C0B1EAF */ jal get_variable -/* 7EB30C 802405FC 8C450000 */ lw $a1, ($v0) -/* 7EB310 80240600 0040202D */ daddu $a0, $v0, $zero -/* 7EB314 80240604 27A50010 */ addiu $a1, $sp, 0x10 -/* 7EB318 80240608 27A60014 */ addiu $a2, $sp, 0x14 -/* 7EB31C 8024060C 0C016F84 */ jal get_collider_center -/* 7EB320 80240610 27A70018 */ addiu $a3, $sp, 0x18 -/* 7EB324 80240614 8FBF0020 */ lw $ra, 0x20($sp) -/* 7EB328 80240618 24020002 */ addiu $v0, $zero, 2 -/* 7EB32C 8024061C 03E00008 */ jr $ra -/* 7EB330 80240620 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802405EC_7EB2FC.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802405EC_7EB2FC.s new file mode 100644 index 0000000000..f9ea8fdf07 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802405EC_7EB2FC.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405EC_7EB2FC +/* 7EB2FC 802405EC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7EB300 802405F0 AFBF0020 */ sw $ra, 0x20($sp) +/* 7EB304 802405F4 8C82000C */ lw $v0, 0xc($a0) +/* 7EB308 802405F8 0C0B1EAF */ jal get_variable +/* 7EB30C 802405FC 8C450000 */ lw $a1, ($v0) +/* 7EB310 80240600 0040202D */ daddu $a0, $v0, $zero +/* 7EB314 80240604 27A50010 */ addiu $a1, $sp, 0x10 +/* 7EB318 80240608 27A60014 */ addiu $a2, $sp, 0x14 +/* 7EB31C 8024060C 0C016F84 */ jal get_collider_center +/* 7EB320 80240610 27A70018 */ addiu $a3, $sp, 0x18 +/* 7EB324 80240614 8FBF0020 */ lw $ra, 0x20($sp) +/* 7EB328 80240618 24020002 */ addiu $v0, $zero, 2 +/* 7EB32C 8024061C 03E00008 */ jr $ra +/* 7EB330 80240620 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240624.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240624.s deleted file mode 100644 index 1627aee442..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240624.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240624 -/* 7EB334 80240624 03E00008 */ jr $ra -/* 7EB338 80240628 24020002 */ addiu $v0, $zero, 2 -/* 7EB33C 8024062C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240624_7EB334.s b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240624_7EB334.s new file mode 100644 index 0000000000..36555f109c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240624_7EB334.s @@ -0,0 +1,7 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240624_7EB334 +/* 7EB334 80240624 03E00008 */ jr $ra +/* 7EB338 80240628 24020002 */ addiu $v0, $zero, 2 +/* 7EB33C 8024062C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630.s deleted file mode 100644 index 2b967d3c6e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240630 -/* 7EB340 80240630 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EB344 80240634 AFB00010 */ sw $s0, 0x10($sp) -/* 7EB348 80240638 3C108024 */ lui $s0, 0x8024 -/* 7EB34C 8024063C 26105DC0 */ addiu $s0, $s0, 0x5dc0 -/* 7EB350 80240640 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EB354 80240644 AFB10014 */ sw $s1, 0x14($sp) -/* 7EB358 80240648 8E020000 */ lw $v0, ($s0) -/* 7EB35C 8024064C 14400010 */ bnez $v0, .L80240690 -/* 7EB360 80240650 0080882D */ daddu $s1, $a0, $zero -/* 7EB364 80240654 0C00AB39 */ jal heap_malloc -/* 7EB368 80240658 24040040 */ addiu $a0, $zero, 0x40 -/* 7EB36C 8024065C AE020000 */ sw $v0, ($s0) -/* 7EB370 80240660 0000182D */ daddu $v1, $zero, $zero -/* 7EB374 80240664 0040282D */ daddu $a1, $v0, $zero -/* 7EB378 80240668 0220202D */ daddu $a0, $s1, $zero -.L8024066C: -/* 7EB37C 8024066C 8C820084 */ lw $v0, 0x84($a0) -/* 7EB380 80240670 24840004 */ addiu $a0, $a0, 4 -/* 7EB384 80240674 24630001 */ addiu $v1, $v1, 1 -/* 7EB388 80240678 ACA20000 */ sw $v0, ($a1) -/* 7EB38C 8024067C 28620010 */ slti $v0, $v1, 0x10 -/* 7EB390 80240680 1440FFFA */ bnez $v0, .L8024066C -/* 7EB394 80240684 24A50004 */ addiu $a1, $a1, 4 -/* 7EB398 80240688 080901B3 */ j .L802406CC -/* 7EB39C 8024068C 00000000 */ nop -.L80240690: -/* 7EB3A0 80240690 0000182D */ daddu $v1, $zero, $zero -/* 7EB3A4 80240694 0040282D */ daddu $a1, $v0, $zero -/* 7EB3A8 80240698 0220202D */ daddu $a0, $s1, $zero -.L8024069C: -/* 7EB3AC 8024069C 8CA20000 */ lw $v0, ($a1) -/* 7EB3B0 802406A0 24A50004 */ addiu $a1, $a1, 4 -/* 7EB3B4 802406A4 24630001 */ addiu $v1, $v1, 1 -/* 7EB3B8 802406A8 AC820084 */ sw $v0, 0x84($a0) -/* 7EB3BC 802406AC 28620010 */ slti $v0, $v1, 0x10 -/* 7EB3C0 802406B0 1440FFFA */ bnez $v0, .L8024069C -/* 7EB3C4 802406B4 24840004 */ addiu $a0, $a0, 4 -/* 7EB3C8 802406B8 3C108024 */ lui $s0, 0x8024 -/* 7EB3CC 802406BC 26105DC0 */ addiu $s0, $s0, 0x5dc0 -/* 7EB3D0 802406C0 0C00AB4B */ jal heap_free -/* 7EB3D4 802406C4 8E040000 */ lw $a0, ($s0) -/* 7EB3D8 802406C8 AE000000 */ sw $zero, ($s0) -.L802406CC: -/* 7EB3DC 802406CC 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EB3E0 802406D0 8FB10014 */ lw $s1, 0x14($sp) -/* 7EB3E4 802406D4 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB3E8 802406D8 24020002 */ addiu $v0, $zero, 2 -/* 7EB3EC 802406DC 03E00008 */ jr $ra -/* 7EB3F0 802406E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s new file mode 100644 index 0000000000..51e4494438 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240630_7EB340.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240630_7EB340 +/* 7EB340 80240630 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EB344 80240634 AFB00010 */ sw $s0, 0x10($sp) +/* 7EB348 80240638 3C108024 */ lui $s0, 0x8024 +/* 7EB34C 8024063C 26105DC0 */ addiu $s0, $s0, 0x5dc0 +/* 7EB350 80240640 AFBF0018 */ sw $ra, 0x18($sp) +/* 7EB354 80240644 AFB10014 */ sw $s1, 0x14($sp) +/* 7EB358 80240648 8E020000 */ lw $v0, ($s0) +/* 7EB35C 8024064C 14400010 */ bnez $v0, .L80240690 +/* 7EB360 80240650 0080882D */ daddu $s1, $a0, $zero +/* 7EB364 80240654 0C00AB39 */ jal heap_malloc +/* 7EB368 80240658 24040040 */ addiu $a0, $zero, 0x40 +/* 7EB36C 8024065C AE020000 */ sw $v0, ($s0) +/* 7EB370 80240660 0000182D */ daddu $v1, $zero, $zero +/* 7EB374 80240664 0040282D */ daddu $a1, $v0, $zero +/* 7EB378 80240668 0220202D */ daddu $a0, $s1, $zero +.L8024066C: +/* 7EB37C 8024066C 8C820084 */ lw $v0, 0x84($a0) +/* 7EB380 80240670 24840004 */ addiu $a0, $a0, 4 +/* 7EB384 80240674 24630001 */ addiu $v1, $v1, 1 +/* 7EB388 80240678 ACA20000 */ sw $v0, ($a1) +/* 7EB38C 8024067C 28620010 */ slti $v0, $v1, 0x10 +/* 7EB390 80240680 1440FFFA */ bnez $v0, .L8024066C +/* 7EB394 80240684 24A50004 */ addiu $a1, $a1, 4 +/* 7EB398 80240688 080901B3 */ j .L802406CC +/* 7EB39C 8024068C 00000000 */ nop +.L80240690: +/* 7EB3A0 80240690 0000182D */ daddu $v1, $zero, $zero +/* 7EB3A4 80240694 0040282D */ daddu $a1, $v0, $zero +/* 7EB3A8 80240698 0220202D */ daddu $a0, $s1, $zero +.L8024069C: +/* 7EB3AC 8024069C 8CA20000 */ lw $v0, ($a1) +/* 7EB3B0 802406A0 24A50004 */ addiu $a1, $a1, 4 +/* 7EB3B4 802406A4 24630001 */ addiu $v1, $v1, 1 +/* 7EB3B8 802406A8 AC820084 */ sw $v0, 0x84($a0) +/* 7EB3BC 802406AC 28620010 */ slti $v0, $v1, 0x10 +/* 7EB3C0 802406B0 1440FFFA */ bnez $v0, .L8024069C +/* 7EB3C4 802406B4 24840004 */ addiu $a0, $a0, 4 +/* 7EB3C8 802406B8 3C108024 */ lui $s0, 0x8024 +/* 7EB3CC 802406BC 26105DC0 */ addiu $s0, $s0, 0x5dc0 +/* 7EB3D0 802406C0 0C00AB4B */ jal heap_free +/* 7EB3D4 802406C4 8E040000 */ lw $a0, ($s0) +/* 7EB3D8 802406C8 AE000000 */ sw $zero, ($s0) +.L802406CC: +/* 7EB3DC 802406CC 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EB3E0 802406D0 8FB10014 */ lw $s1, 0x14($sp) +/* 7EB3E4 802406D4 8FB00010 */ lw $s0, 0x10($sp) +/* 7EB3E8 802406D8 24020002 */ addiu $v0, $zero, 2 +/* 7EB3EC 802406DC 03E00008 */ jr $ra +/* 7EB3F0 802406E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748.s deleted file mode 100644 index e31039568b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240748 -/* 7EB458 80240748 24020001 */ addiu $v0, $zero, 1 -/* 7EB45C 8024074C 3C018015 */ lui $at, %hi(D_80151310) -/* 7EB460 80240750 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 7EB464 80240754 03E00008 */ jr $ra -/* 7EB468 80240758 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s new file mode 100644 index 0000000000..ad4d76513b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240748_7EB458 +/* 7EB458 80240748 24020001 */ addiu $v0, $zero, 1 +/* 7EB45C 8024074C 3C018015 */ lui $at, %hi(D_80151310) +/* 7EB460 80240750 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* 7EB464 80240754 03E00008 */ jr $ra +/* 7EB468 80240758 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C.s deleted file mode 100644 index 94929c6020..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024075C -/* 7EB46C 8024075C 3C018015 */ lui $at, %hi(D_80151310) -/* 7EB470 80240760 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 7EB474 80240764 03E00008 */ jr $ra -/* 7EB478 80240768 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s new file mode 100644 index 0000000000..ab1858da37 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024075C_7EB46C +/* 7EB46C 8024075C 3C018015 */ lui $at, %hi(D_80151310) +/* 7EB470 80240760 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* 7EB474 80240764 03E00008 */ jr $ra +/* 7EB478 80240768 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C.s deleted file mode 100644 index c2167ba35b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024076C -/* 7EB47C 8024076C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7EB480 80240770 AFB10024 */ sw $s1, 0x24($sp) -/* 7EB484 80240774 0080882D */ daddu $s1, $a0, $zero -/* 7EB488 80240778 3C05F840 */ lui $a1, 0xf840 -/* 7EB48C 8024077C AFBF0044 */ sw $ra, 0x44($sp) -/* 7EB490 80240780 AFBE0040 */ sw $fp, 0x40($sp) -/* 7EB494 80240784 AFB7003C */ sw $s7, 0x3c($sp) -/* 7EB498 80240788 AFB60038 */ sw $s6, 0x38($sp) -/* 7EB49C 8024078C AFB50034 */ sw $s5, 0x34($sp) -/* 7EB4A0 80240790 AFB40030 */ sw $s4, 0x30($sp) -/* 7EB4A4 80240794 AFB3002C */ sw $s3, 0x2c($sp) -/* 7EB4A8 80240798 AFB20028 */ sw $s2, 0x28($sp) -/* 7EB4AC 8024079C AFB00020 */ sw $s0, 0x20($sp) -/* 7EB4B0 802407A0 8E3E0148 */ lw $fp, 0x148($s1) -/* 7EB4B4 802407A4 0C0B1EAF */ jal get_variable -/* 7EB4B8 802407A8 34A56268 */ ori $a1, $a1, 0x6268 -/* 7EB4BC 802407AC 0040802D */ daddu $s0, $v0, $zero -/* 7EB4C0 802407B0 0220202D */ daddu $a0, $s1, $zero -/* 7EB4C4 802407B4 3C05F840 */ lui $a1, 0xf840 -/* 7EB4C8 802407B8 0C0B1EAF */ jal get_variable -/* 7EB4CC 802407BC 34A56269 */ ori $a1, $a1, 0x6269 -/* 7EB4D0 802407C0 0040B82D */ daddu $s7, $v0, $zero -/* 7EB4D4 802407C4 0220202D */ daddu $a0, $s1, $zero -/* 7EB4D8 802407C8 3C05F5DE */ lui $a1, 0xf5de -/* 7EB4DC 802407CC 0C0B1EAF */ jal get_variable -/* 7EB4E0 802407D0 34A502DE */ ori $a1, $a1, 0x2de -/* 7EB4E4 802407D4 0040B02D */ daddu $s6, $v0, $zero -/* 7EB4E8 802407D8 0220202D */ daddu $a0, $s1, $zero -/* 7EB4EC 802407DC 3C05F5DE */ lui $a1, 0xf5de -/* 7EB4F0 802407E0 0C0B1EAF */ jal get_variable -/* 7EB4F4 802407E4 34A502DF */ ori $a1, $a1, 0x2df -/* 7EB4F8 802407E8 0040A82D */ daddu $s5, $v0, $zero -/* 7EB4FC 802407EC 93D3006D */ lbu $s3, 0x6d($fp) -/* 7EB500 802407F0 32C2FFFF */ andi $v0, $s6, 0xffff -/* 7EB504 802407F4 A7B30010 */ sh $s3, 0x10($sp) -/* 7EB508 802407F8 93D2006E */ lbu $s2, 0x6e($fp) -/* 7EB50C 802407FC 93C7006F */ lbu $a3, 0x6f($fp) -/* 7EB510 80240800 3274FFFF */ andi $s4, $s3, 0xffff -/* 7EB514 80240804 12820003 */ beq $s4, $v0, .L80240814 -/* 7EB518 80240808 A7A7001E */ sh $a3, 0x1e($sp) -/* 7EB51C 8024080C 0000B82D */ daddu $s7, $zero, $zero -/* 7EB520 80240810 02E0802D */ daddu $s0, $s7, $zero -.L80240814: -/* 7EB524 80240814 3202FFFF */ andi $v0, $s0, 0xffff -/* 7EB528 80240818 14400016 */ bnez $v0, .L80240874 -/* 7EB52C 8024081C 0220202D */ daddu $a0, $s1, $zero -/* 7EB530 80240820 0C00A67F */ jal rand_int -/* 7EB534 80240824 24040064 */ addiu $a0, $zero, 0x64 -/* 7EB538 80240828 2842001E */ slti $v0, $v0, 0x1e -/* 7EB53C 8024082C 10400011 */ beqz $v0, .L80240874 -/* 7EB540 80240830 0220202D */ daddu $a0, $s1, $zero -/* 7EB544 80240834 0C00A67F */ jal rand_int -/* 7EB548 80240838 2644FFFF */ addiu $a0, $s2, -1 -/* 7EB54C 8024083C 0040A82D */ daddu $s5, $v0, $zero -/* 7EB550 80240840 0260B02D */ daddu $s6, $s3, $zero -/* 7EB554 80240844 0220202D */ daddu $a0, $s1, $zero -/* 7EB558 80240848 3C05F5DE */ lui $a1, 0xf5de -/* 7EB55C 8024084C 34A502DE */ ori $a1, $a1, 0x2de -/* 7EB560 80240850 0C0B2026 */ jal set_variable -/* 7EB564 80240854 0280302D */ daddu $a2, $s4, $zero -/* 7EB568 80240858 0220202D */ daddu $a0, $s1, $zero -/* 7EB56C 8024085C 3C05F5DE */ lui $a1, 0xf5de -/* 7EB570 80240860 34A502DF */ ori $a1, $a1, 0x2df -/* 7EB574 80240864 0C0B2026 */ jal set_variable -/* 7EB578 80240868 32A6FFFF */ andi $a2, $s5, 0xffff -/* 7EB57C 8024086C 24100001 */ addiu $s0, $zero, 1 -/* 7EB580 80240870 0220202D */ daddu $a0, $s1, $zero -.L80240874: -/* 7EB584 80240874 3C05F840 */ lui $a1, 0xf840 -/* 7EB588 80240878 34A56268 */ ori $a1, $a1, 0x6268 -/* 7EB58C 8024087C 0C0B2026 */ jal set_variable -/* 7EB590 80240880 3206FFFF */ andi $a2, $s0, 0xffff -/* 7EB594 80240884 0220202D */ daddu $a0, $s1, $zero -/* 7EB598 80240888 3C05F840 */ lui $a1, 0xf840 -/* 7EB59C 8024088C 34A56269 */ ori $a1, $a1, 0x6269 -/* 7EB5A0 80240890 0C0B2026 */ jal set_variable -/* 7EB5A4 80240894 32E6FFFF */ andi $a2, $s7, 0xffff -/* 7EB5A8 80240898 0000202D */ daddu $a0, $zero, $zero -/* 7EB5AC 8024089C 3C05F5DE */ lui $a1, 0xf5de -/* 7EB5B0 802408A0 0C0B1EAF */ jal get_variable -/* 7EB5B4 802408A4 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 7EB5B8 802408A8 0000202D */ daddu $a0, $zero, $zero -/* 7EB5BC 802408AC 3C05F5DE */ lui $a1, 0xf5de -/* 7EB5C0 802408B0 34A50180 */ ori $a1, $a1, 0x180 -/* 7EB5C4 802408B4 0C0B1EAF */ jal get_variable -/* 7EB5C8 802408B8 0040802D */ daddu $s0, $v0, $zero -/* 7EB5CC 802408BC 0040282D */ daddu $a1, $v0, $zero -/* 7EB5D0 802408C0 0000182D */ daddu $v1, $zero, $zero -/* 7EB5D4 802408C4 3C068024 */ lui $a2, 0x8024 -/* 7EB5D8 802408C8 24C65E64 */ addiu $a2, $a2, 0x5e64 -/* 7EB5DC 802408CC 00C0202D */ daddu $a0, $a2, $zero -.L802408D0: -/* 7EB5E0 802408D0 8C820000 */ lw $v0, ($a0) -/* 7EB5E4 802408D4 00A2102A */ slt $v0, $a1, $v0 -/* 7EB5E8 802408D8 14400006 */ bnez $v0, .L802408F4 -/* 7EB5EC 802408DC 000310C0 */ sll $v0, $v1, 3 -/* 7EB5F0 802408E0 24630001 */ addiu $v1, $v1, 1 -/* 7EB5F4 802408E4 28620008 */ slti $v0, $v1, 8 -/* 7EB5F8 802408E8 1440FFF9 */ bnez $v0, .L802408D0 -/* 7EB5FC 802408EC 24840008 */ addiu $a0, $a0, 8 -/* 7EB600 802408F0 000310C0 */ sll $v0, $v1, 3 -.L802408F4: -/* 7EB604 802408F4 00461021 */ addu $v0, $v0, $a2 -/* 7EB608 802408F8 8C420004 */ lw $v0, 4($v0) -/* 7EB60C 802408FC 97A30010 */ lhu $v1, 0x10($sp) -/* 7EB610 80240900 0202202A */ slt $a0, $s0, $v0 -/* 7EB614 80240904 32C2FFFF */ andi $v0, $s6, 0xffff -/* 7EB618 80240908 14620008 */ bne $v1, $v0, .L8024092C -/* 7EB61C 8024090C 32A2FFFF */ andi $v0, $s5, 0xffff -/* 7EB620 80240910 97A7001E */ lhu $a3, 0x1e($sp) -/* 7EB624 80240914 14E20005 */ bne $a3, $v0, .L8024092C -/* 7EB628 80240918 32E2FFFF */ andi $v0, $s7, 0xffff -/* 7EB62C 8024091C 14400003 */ bnez $v0, .L8024092C -/* 7EB630 80240920 00000000 */ nop -/* 7EB634 80240924 14800008 */ bnez $a0, .L80240948 -/* 7EB638 80240928 24020001 */ addiu $v0, $zero, 1 -.L8024092C: -/* 7EB63C 8024092C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7EB640 80240930 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7EB644 80240934 80420075 */ lb $v0, 0x75($v0) -/* 7EB648 80240938 10400005 */ beqz $v0, .L80240950 -/* 7EB64C 8024093C 00000000 */ nop -/* 7EB650 80240940 10800003 */ beqz $a0, .L80240950 -/* 7EB654 80240944 24020001 */ addiu $v0, $zero, 1 -.L80240948: -/* 7EB658 80240948 08090257 */ j .L8024095C -/* 7EB65C 8024094C AE220084 */ sw $v0, 0x84($s1) -.L80240950: -/* 7EB660 80240950 0C00F9EB */ jal kill_enemy -/* 7EB664 80240954 03C0202D */ daddu $a0, $fp, $zero -/* 7EB668 80240958 AE200084 */ sw $zero, 0x84($s1) -.L8024095C: -/* 7EB66C 8024095C 8FBF0044 */ lw $ra, 0x44($sp) -/* 7EB670 80240960 8FBE0040 */ lw $fp, 0x40($sp) -/* 7EB674 80240964 8FB7003C */ lw $s7, 0x3c($sp) -/* 7EB678 80240968 8FB60038 */ lw $s6, 0x38($sp) -/* 7EB67C 8024096C 8FB50034 */ lw $s5, 0x34($sp) -/* 7EB680 80240970 8FB40030 */ lw $s4, 0x30($sp) -/* 7EB684 80240974 8FB3002C */ lw $s3, 0x2c($sp) -/* 7EB688 80240978 8FB20028 */ lw $s2, 0x28($sp) -/* 7EB68C 8024097C 8FB10024 */ lw $s1, 0x24($sp) -/* 7EB690 80240980 8FB00020 */ lw $s0, 0x20($sp) -/* 7EB694 80240984 24020002 */ addiu $v0, $zero, 2 -/* 7EB698 80240988 03E00008 */ jr $ra -/* 7EB69C 8024098C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s new file mode 100644 index 0000000000..59ae4e91b5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024076C_7EB47C.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024076C_7EB47C +/* 7EB47C 8024076C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 7EB480 80240770 AFB10024 */ sw $s1, 0x24($sp) +/* 7EB484 80240774 0080882D */ daddu $s1, $a0, $zero +/* 7EB488 80240778 3C05F840 */ lui $a1, 0xf840 +/* 7EB48C 8024077C AFBF0044 */ sw $ra, 0x44($sp) +/* 7EB490 80240780 AFBE0040 */ sw $fp, 0x40($sp) +/* 7EB494 80240784 AFB7003C */ sw $s7, 0x3c($sp) +/* 7EB498 80240788 AFB60038 */ sw $s6, 0x38($sp) +/* 7EB49C 8024078C AFB50034 */ sw $s5, 0x34($sp) +/* 7EB4A0 80240790 AFB40030 */ sw $s4, 0x30($sp) +/* 7EB4A4 80240794 AFB3002C */ sw $s3, 0x2c($sp) +/* 7EB4A8 80240798 AFB20028 */ sw $s2, 0x28($sp) +/* 7EB4AC 8024079C AFB00020 */ sw $s0, 0x20($sp) +/* 7EB4B0 802407A0 8E3E0148 */ lw $fp, 0x148($s1) +/* 7EB4B4 802407A4 0C0B1EAF */ jal get_variable +/* 7EB4B8 802407A8 34A56268 */ ori $a1, $a1, 0x6268 +/* 7EB4BC 802407AC 0040802D */ daddu $s0, $v0, $zero +/* 7EB4C0 802407B0 0220202D */ daddu $a0, $s1, $zero +/* 7EB4C4 802407B4 3C05F840 */ lui $a1, 0xf840 +/* 7EB4C8 802407B8 0C0B1EAF */ jal get_variable +/* 7EB4CC 802407BC 34A56269 */ ori $a1, $a1, 0x6269 +/* 7EB4D0 802407C0 0040B82D */ daddu $s7, $v0, $zero +/* 7EB4D4 802407C4 0220202D */ daddu $a0, $s1, $zero +/* 7EB4D8 802407C8 3C05F5DE */ lui $a1, 0xf5de +/* 7EB4DC 802407CC 0C0B1EAF */ jal get_variable +/* 7EB4E0 802407D0 34A502DE */ ori $a1, $a1, 0x2de +/* 7EB4E4 802407D4 0040B02D */ daddu $s6, $v0, $zero +/* 7EB4E8 802407D8 0220202D */ daddu $a0, $s1, $zero +/* 7EB4EC 802407DC 3C05F5DE */ lui $a1, 0xf5de +/* 7EB4F0 802407E0 0C0B1EAF */ jal get_variable +/* 7EB4F4 802407E4 34A502DF */ ori $a1, $a1, 0x2df +/* 7EB4F8 802407E8 0040A82D */ daddu $s5, $v0, $zero +/* 7EB4FC 802407EC 93D3006D */ lbu $s3, 0x6d($fp) +/* 7EB500 802407F0 32C2FFFF */ andi $v0, $s6, 0xffff +/* 7EB504 802407F4 A7B30010 */ sh $s3, 0x10($sp) +/* 7EB508 802407F8 93D2006E */ lbu $s2, 0x6e($fp) +/* 7EB50C 802407FC 93C7006F */ lbu $a3, 0x6f($fp) +/* 7EB510 80240800 3274FFFF */ andi $s4, $s3, 0xffff +/* 7EB514 80240804 12820003 */ beq $s4, $v0, .L80240814 +/* 7EB518 80240808 A7A7001E */ sh $a3, 0x1e($sp) +/* 7EB51C 8024080C 0000B82D */ daddu $s7, $zero, $zero +/* 7EB520 80240810 02E0802D */ daddu $s0, $s7, $zero +.L80240814: +/* 7EB524 80240814 3202FFFF */ andi $v0, $s0, 0xffff +/* 7EB528 80240818 14400016 */ bnez $v0, .L80240874 +/* 7EB52C 8024081C 0220202D */ daddu $a0, $s1, $zero +/* 7EB530 80240820 0C00A67F */ jal rand_int +/* 7EB534 80240824 24040064 */ addiu $a0, $zero, 0x64 +/* 7EB538 80240828 2842001E */ slti $v0, $v0, 0x1e +/* 7EB53C 8024082C 10400011 */ beqz $v0, .L80240874 +/* 7EB540 80240830 0220202D */ daddu $a0, $s1, $zero +/* 7EB544 80240834 0C00A67F */ jal rand_int +/* 7EB548 80240838 2644FFFF */ addiu $a0, $s2, -1 +/* 7EB54C 8024083C 0040A82D */ daddu $s5, $v0, $zero +/* 7EB550 80240840 0260B02D */ daddu $s6, $s3, $zero +/* 7EB554 80240844 0220202D */ daddu $a0, $s1, $zero +/* 7EB558 80240848 3C05F5DE */ lui $a1, 0xf5de +/* 7EB55C 8024084C 34A502DE */ ori $a1, $a1, 0x2de +/* 7EB560 80240850 0C0B2026 */ jal set_variable +/* 7EB564 80240854 0280302D */ daddu $a2, $s4, $zero +/* 7EB568 80240858 0220202D */ daddu $a0, $s1, $zero +/* 7EB56C 8024085C 3C05F5DE */ lui $a1, 0xf5de +/* 7EB570 80240860 34A502DF */ ori $a1, $a1, 0x2df +/* 7EB574 80240864 0C0B2026 */ jal set_variable +/* 7EB578 80240868 32A6FFFF */ andi $a2, $s5, 0xffff +/* 7EB57C 8024086C 24100001 */ addiu $s0, $zero, 1 +/* 7EB580 80240870 0220202D */ daddu $a0, $s1, $zero +.L80240874: +/* 7EB584 80240874 3C05F840 */ lui $a1, 0xf840 +/* 7EB588 80240878 34A56268 */ ori $a1, $a1, 0x6268 +/* 7EB58C 8024087C 0C0B2026 */ jal set_variable +/* 7EB590 80240880 3206FFFF */ andi $a2, $s0, 0xffff +/* 7EB594 80240884 0220202D */ daddu $a0, $s1, $zero +/* 7EB598 80240888 3C05F840 */ lui $a1, 0xf840 +/* 7EB59C 8024088C 34A56269 */ ori $a1, $a1, 0x6269 +/* 7EB5A0 80240890 0C0B2026 */ jal set_variable +/* 7EB5A4 80240894 32E6FFFF */ andi $a2, $s7, 0xffff +/* 7EB5A8 80240898 0000202D */ daddu $a0, $zero, $zero +/* 7EB5AC 8024089C 3C05F5DE */ lui $a1, 0xf5de +/* 7EB5B0 802408A0 0C0B1EAF */ jal get_variable +/* 7EB5B4 802408A4 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 7EB5B8 802408A8 0000202D */ daddu $a0, $zero, $zero +/* 7EB5BC 802408AC 3C05F5DE */ lui $a1, 0xf5de +/* 7EB5C0 802408B0 34A50180 */ ori $a1, $a1, 0x180 +/* 7EB5C4 802408B4 0C0B1EAF */ jal get_variable +/* 7EB5C8 802408B8 0040802D */ daddu $s0, $v0, $zero +/* 7EB5CC 802408BC 0040282D */ daddu $a1, $v0, $zero +/* 7EB5D0 802408C0 0000182D */ daddu $v1, $zero, $zero +/* 7EB5D4 802408C4 3C068024 */ lui $a2, 0x8024 +/* 7EB5D8 802408C8 24C65E64 */ addiu $a2, $a2, 0x5e64 +/* 7EB5DC 802408CC 00C0202D */ daddu $a0, $a2, $zero +.L802408D0: +/* 7EB5E0 802408D0 8C820000 */ lw $v0, ($a0) +/* 7EB5E4 802408D4 00A2102A */ slt $v0, $a1, $v0 +/* 7EB5E8 802408D8 14400006 */ bnez $v0, .L802408F4 +/* 7EB5EC 802408DC 000310C0 */ sll $v0, $v1, 3 +/* 7EB5F0 802408E0 24630001 */ addiu $v1, $v1, 1 +/* 7EB5F4 802408E4 28620008 */ slti $v0, $v1, 8 +/* 7EB5F8 802408E8 1440FFF9 */ bnez $v0, .L802408D0 +/* 7EB5FC 802408EC 24840008 */ addiu $a0, $a0, 8 +/* 7EB600 802408F0 000310C0 */ sll $v0, $v1, 3 +.L802408F4: +/* 7EB604 802408F4 00461021 */ addu $v0, $v0, $a2 +/* 7EB608 802408F8 8C420004 */ lw $v0, 4($v0) +/* 7EB60C 802408FC 97A30010 */ lhu $v1, 0x10($sp) +/* 7EB610 80240900 0202202A */ slt $a0, $s0, $v0 +/* 7EB614 80240904 32C2FFFF */ andi $v0, $s6, 0xffff +/* 7EB618 80240908 14620008 */ bne $v1, $v0, .L8024092C +/* 7EB61C 8024090C 32A2FFFF */ andi $v0, $s5, 0xffff +/* 7EB620 80240910 97A7001E */ lhu $a3, 0x1e($sp) +/* 7EB624 80240914 14E20005 */ bne $a3, $v0, .L8024092C +/* 7EB628 80240918 32E2FFFF */ andi $v0, $s7, 0xffff +/* 7EB62C 8024091C 14400003 */ bnez $v0, .L8024092C +/* 7EB630 80240920 00000000 */ nop +/* 7EB634 80240924 14800008 */ bnez $a0, .L80240948 +/* 7EB638 80240928 24020001 */ addiu $v0, $zero, 1 +.L8024092C: +/* 7EB63C 8024092C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7EB640 80240930 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7EB644 80240934 80420075 */ lb $v0, 0x75($v0) +/* 7EB648 80240938 10400005 */ beqz $v0, .L80240950 +/* 7EB64C 8024093C 00000000 */ nop +/* 7EB650 80240940 10800003 */ beqz $a0, .L80240950 +/* 7EB654 80240944 24020001 */ addiu $v0, $zero, 1 +.L80240948: +/* 7EB658 80240948 08090257 */ j .L8024095C +/* 7EB65C 8024094C AE220084 */ sw $v0, 0x84($s1) +.L80240950: +/* 7EB660 80240950 0C00F9EB */ jal kill_enemy +/* 7EB664 80240954 03C0202D */ daddu $a0, $fp, $zero +/* 7EB668 80240958 AE200084 */ sw $zero, 0x84($s1) +.L8024095C: +/* 7EB66C 8024095C 8FBF0044 */ lw $ra, 0x44($sp) +/* 7EB670 80240960 8FBE0040 */ lw $fp, 0x40($sp) +/* 7EB674 80240964 8FB7003C */ lw $s7, 0x3c($sp) +/* 7EB678 80240968 8FB60038 */ lw $s6, 0x38($sp) +/* 7EB67C 8024096C 8FB50034 */ lw $s5, 0x34($sp) +/* 7EB680 80240970 8FB40030 */ lw $s4, 0x30($sp) +/* 7EB684 80240974 8FB3002C */ lw $s3, 0x2c($sp) +/* 7EB688 80240978 8FB20028 */ lw $s2, 0x28($sp) +/* 7EB68C 8024097C 8FB10024 */ lw $s1, 0x24($sp) +/* 7EB690 80240980 8FB00020 */ lw $s0, 0x20($sp) +/* 7EB694 80240984 24020002 */ addiu $v0, $zero, 2 +/* 7EB698 80240988 03E00008 */ jr $ra +/* 7EB69C 8024098C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990.s deleted file mode 100644 index a0488032b9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240990 -/* 7EB6A0 80240990 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EB6A4 80240994 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EB6A8 80240998 AFB00010 */ sw $s0, 0x10($sp) -/* 7EB6AC 8024099C 0C00EABB */ jal get_npc_unsafe -/* 7EB6B0 802409A0 8C84014C */ lw $a0, 0x14c($a0) -/* 7EB6B4 802409A4 24040008 */ addiu $a0, $zero, 8 -/* 7EB6B8 802409A8 0040802D */ daddu $s0, $v0, $zero -/* 7EB6BC 802409AC 3C028024 */ lui $v0, 0x8024 -/* 7EB6C0 802409B0 244209FC */ addiu $v0, $v0, 0x9fc -/* 7EB6C4 802409B4 0C00AB39 */ jal heap_malloc -/* 7EB6C8 802409B8 AE020008 */ sw $v0, 8($s0) -/* 7EB6CC 802409BC 0040182D */ daddu $v1, $v0, $zero -/* 7EB6D0 802409C0 AE030020 */ sw $v1, 0x20($s0) -/* 7EB6D4 802409C4 AC600000 */ sw $zero, ($v1) -/* 7EB6D8 802409C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EB6DC 802409CC 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB6E0 802409D0 24020001 */ addiu $v0, $zero, 1 -/* 7EB6E4 802409D4 03E00008 */ jr $ra -/* 7EB6E8 802409D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s new file mode 100644 index 0000000000..310725a703 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240990_7EB6A0.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240990_7EB6A0 +/* 7EB6A0 80240990 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EB6A4 80240994 AFBF0014 */ sw $ra, 0x14($sp) +/* 7EB6A8 80240998 AFB00010 */ sw $s0, 0x10($sp) +/* 7EB6AC 8024099C 0C00EABB */ jal get_npc_unsafe +/* 7EB6B0 802409A0 8C84014C */ lw $a0, 0x14c($a0) +/* 7EB6B4 802409A4 24040008 */ addiu $a0, $zero, 8 +/* 7EB6B8 802409A8 0040802D */ daddu $s0, $v0, $zero +/* 7EB6BC 802409AC 3C028024 */ lui $v0, 0x8024 +/* 7EB6C0 802409B0 244209FC */ addiu $v0, $v0, 0x9fc +/* 7EB6C4 802409B4 0C00AB39 */ jal heap_malloc +/* 7EB6C8 802409B8 AE020008 */ sw $v0, 8($s0) +/* 7EB6CC 802409BC 0040182D */ daddu $v1, $v0, $zero +/* 7EB6D0 802409C0 AE030020 */ sw $v1, 0x20($s0) +/* 7EB6D4 802409C4 AC600000 */ sw $zero, ($v1) +/* 7EB6D8 802409C8 8FBF0014 */ lw $ra, 0x14($sp) +/* 7EB6DC 802409CC 8FB00010 */ lw $s0, 0x10($sp) +/* 7EB6E0 802409D0 24020001 */ addiu $v0, $zero, 1 +/* 7EB6E4 802409D4 03E00008 */ jr $ra +/* 7EB6E8 802409D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC.s deleted file mode 100644 index 8dc0c582df..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409DC -/* 7EB6EC 802409DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EB6F0 802409E0 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EB6F4 802409E4 0C00EABB */ jal get_npc_unsafe -/* 7EB6F8 802409E8 8C84014C */ lw $a0, 0x14c($a0) -/* 7EB6FC 802409EC 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EB700 802409F0 0000102D */ daddu $v0, $zero, $zero -/* 7EB704 802409F4 03E00008 */ jr $ra -/* 7EB708 802409F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s new file mode 100644 index 0000000000..fbb4a7a24c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409DC_7EB6EC +/* 7EB6EC 802409DC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EB6F0 802409E0 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EB6F4 802409E4 0C00EABB */ jal get_npc_unsafe +/* 7EB6F8 802409E8 8C84014C */ lw $a0, 0x14c($a0) +/* 7EB6FC 802409EC 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EB700 802409F0 0000102D */ daddu $v0, $zero, $zero +/* 7EB704 802409F4 03E00008 */ jr $ra +/* 7EB708 802409F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC.s deleted file mode 100644 index e48caf4b61..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409FC -/* 7EB70C 802409FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EB710 80240A00 3C03800A */ lui $v1, 0x800a -/* 7EB714 80240A04 8463A634 */ lh $v1, -0x59cc($v1) -/* 7EB718 80240A08 3C05800B */ lui $a1, %hi(gCameras) -/* 7EB71C 80240A0C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 7EB720 80240A10 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EB724 80240A14 00031080 */ sll $v0, $v1, 2 -/* 7EB728 80240A18 00431021 */ addu $v0, $v0, $v1 -/* 7EB72C 80240A1C 00021080 */ sll $v0, $v0, 2 -/* 7EB730 80240A20 00431023 */ subu $v0, $v0, $v1 -/* 7EB734 80240A24 000218C0 */ sll $v1, $v0, 3 -/* 7EB738 80240A28 00431021 */ addu $v0, $v0, $v1 -/* 7EB73C 80240A2C 8C830020 */ lw $v1, 0x20($a0) -/* 7EB740 80240A30 000210C0 */ sll $v0, $v0, 3 -/* 7EB744 80240A34 8C630000 */ lw $v1, ($v1) -/* 7EB748 80240A38 30630001 */ andi $v1, $v1, 1 -/* 7EB74C 80240A3C 10600004 */ beqz $v1, .L80240A50 -/* 7EB750 80240A40 00451021 */ addu $v0, $v0, $a1 -/* 7EB754 80240A44 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 7EB758 80240A48 0C00A6C9 */ jal clamp_angle -/* 7EB75C 80240A4C 46006307 */ neg.s $f12, $f12 -.L80240A50: -/* 7EB760 80240A50 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EB764 80240A54 03E00008 */ jr $ra -/* 7EB768 80240A58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s new file mode 100644 index 0000000000..97fbd0d5f4 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409FC_7EB70C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409FC_7EB70C +/* 7EB70C 802409FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EB710 80240A00 3C03800A */ lui $v1, 0x800a +/* 7EB714 80240A04 8463A634 */ lh $v1, -0x59cc($v1) +/* 7EB718 80240A08 3C05800B */ lui $a1, %hi(gCameras) +/* 7EB71C 80240A0C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 7EB720 80240A10 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EB724 80240A14 00031080 */ sll $v0, $v1, 2 +/* 7EB728 80240A18 00431021 */ addu $v0, $v0, $v1 +/* 7EB72C 80240A1C 00021080 */ sll $v0, $v0, 2 +/* 7EB730 80240A20 00431023 */ subu $v0, $v0, $v1 +/* 7EB734 80240A24 000218C0 */ sll $v1, $v0, 3 +/* 7EB738 80240A28 00431021 */ addu $v0, $v0, $v1 +/* 7EB73C 80240A2C 8C830020 */ lw $v1, 0x20($a0) +/* 7EB740 80240A30 000210C0 */ sll $v0, $v0, 3 +/* 7EB744 80240A34 8C630000 */ lw $v1, ($v1) +/* 7EB748 80240A38 30630001 */ andi $v1, $v1, 1 +/* 7EB74C 80240A3C 10600004 */ beqz $v1, .L80240A50 +/* 7EB750 80240A40 00451021 */ addu $v0, $v0, $a1 +/* 7EB754 80240A44 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 7EB758 80240A48 0C00A6C9 */ jal clamp_angle +/* 7EB75C 80240A4C 46006307 */ neg.s $f12, $f12 +.L80240A50: +/* 7EB760 80240A50 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EB764 80240A54 03E00008 */ jr $ra +/* 7EB768 80240A58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C.s deleted file mode 100644 index 6e92a3e238..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A5C -/* 7EB76C 80240A5C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7EB770 80240A60 AFB10014 */ sw $s1, 0x14($sp) -/* 7EB774 80240A64 0080882D */ daddu $s1, $a0, $zero -/* 7EB778 80240A68 AFBF0024 */ sw $ra, 0x24($sp) -/* 7EB77C 80240A6C AFB40020 */ sw $s4, 0x20($sp) -/* 7EB780 80240A70 AFB3001C */ sw $s3, 0x1c($sp) -/* 7EB784 80240A74 AFB20018 */ sw $s2, 0x18($sp) -/* 7EB788 80240A78 10A00033 */ beqz $a1, .L80240B48 -/* 7EB78C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* 7EB790 80240A80 0C04760B */ jal func_8011D82C -/* 7EB794 80240A84 24040001 */ addiu $a0, $zero, 1 -/* 7EB798 80240A88 0000202D */ daddu $a0, $zero, $zero -/* 7EB79C 80240A8C 0080282D */ daddu $a1, $a0, $zero -/* 7EB7A0 80240A90 0080302D */ daddu $a2, $a0, $zero -/* 7EB7A4 80240A94 0080382D */ daddu $a3, $a0, $zero -/* 7EB7A8 80240A98 0080802D */ daddu $s0, $a0, $zero -/* 7EB7AC 80240A9C 2414FFFC */ addiu $s4, $zero, -4 -/* 7EB7B0 80240AA0 24130006 */ addiu $s3, $zero, 6 -/* 7EB7B4 80240AA4 3C120080 */ lui $s2, 0x80 -/* 7EB7B8 80240AA8 3C038015 */ lui $v1, 0x8015 -/* 7EB7BC 80240AAC 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 7EB7C0 80240AB0 24020001 */ addiu $v0, $zero, 1 -/* 7EB7C4 80240AB4 0C046F97 */ jal set_background_color_blend -/* 7EB7C8 80240AB8 A0620000 */ sb $v0, ($v1) -.L80240ABC: -/* 7EB7CC 80240ABC 0C00E2B7 */ jal get_npc_by_index -/* 7EB7D0 80240AC0 0200202D */ daddu $a0, $s0, $zero -/* 7EB7D4 80240AC4 0040202D */ daddu $a0, $v0, $zero -/* 7EB7D8 80240AC8 5080000B */ beql $a0, $zero, .L80240AF8 -/* 7EB7DC 80240ACC 26100001 */ addiu $s0, $s0, 1 -/* 7EB7E0 80240AD0 8C820000 */ lw $v0, ($a0) -/* 7EB7E4 80240AD4 50400008 */ beql $v0, $zero, .L80240AF8 -/* 7EB7E8 80240AD8 26100001 */ addiu $s0, $s0, 1 -/* 7EB7EC 80240ADC 808300A4 */ lb $v1, 0xa4($a0) -/* 7EB7F0 80240AE0 10740005 */ beq $v1, $s4, .L80240AF8 -/* 7EB7F4 80240AE4 26100001 */ addiu $s0, $s0, 1 -/* 7EB7F8 80240AE8 10730003 */ beq $v1, $s3, .L80240AF8 -/* 7EB7FC 80240AEC 00000000 */ nop -/* 7EB800 80240AF0 00521025 */ or $v0, $v0, $s2 -/* 7EB804 80240AF4 AC820000 */ sw $v0, ($a0) -.L80240AF8: -/* 7EB808 80240AF8 2A020040 */ slti $v0, $s0, 0x40 -/* 7EB80C 80240AFC 1440FFEF */ bnez $v0, .L80240ABC -/* 7EB810 80240B00 00000000 */ nop -/* 7EB814 80240B04 0000802D */ daddu $s0, $zero, $zero -/* 7EB818 80240B08 3C120800 */ lui $s2, 0x800 -.L80240B0C: -/* 7EB81C 80240B0C 0C04C3D6 */ jal get_item_entity -/* 7EB820 80240B10 0200202D */ daddu $a0, $s0, $zero -/* 7EB824 80240B14 0040182D */ daddu $v1, $v0, $zero -/* 7EB828 80240B18 10600007 */ beqz $v1, .L80240B38 -/* 7EB82C 80240B1C 26100001 */ addiu $s0, $s0, 1 -/* 7EB830 80240B20 8C640000 */ lw $a0, ($v1) -/* 7EB834 80240B24 30820010 */ andi $v0, $a0, 0x10 -/* 7EB838 80240B28 10400003 */ beqz $v0, .L80240B38 -/* 7EB83C 80240B2C 00000000 */ nop -/* 7EB840 80240B30 00921025 */ or $v0, $a0, $s2 -/* 7EB844 80240B34 AC620000 */ sw $v0, ($v1) -.L80240B38: -/* 7EB848 80240B38 2A020100 */ slti $v0, $s0, 0x100 -/* 7EB84C 80240B3C 1440FFF3 */ bnez $v0, .L80240B0C -/* 7EB850 80240B40 00000000 */ nop -/* 7EB854 80240B44 AE200070 */ sw $zero, 0x70($s1) -.L80240B48: -/* 7EB858 80240B48 8E220070 */ lw $v0, 0x70($s1) -/* 7EB85C 80240B4C 24420008 */ addiu $v0, $v0, 8 -/* 7EB860 80240B50 AE220070 */ sw $v0, 0x70($s1) -/* 7EB864 80240B54 28420100 */ slti $v0, $v0, 0x100 -/* 7EB868 80240B58 14400003 */ bnez $v0, .L80240B68 -/* 7EB86C 80240B5C 0000202D */ daddu $a0, $zero, $zero -/* 7EB870 80240B60 240200FF */ addiu $v0, $zero, 0xff -/* 7EB874 80240B64 AE220070 */ sw $v0, 0x70($s1) -.L80240B68: -/* 7EB878 80240B68 0080282D */ daddu $a1, $a0, $zero -/* 7EB87C 80240B6C 92270073 */ lbu $a3, 0x73($s1) -/* 7EB880 80240B70 0C046F97 */ jal set_background_color_blend -/* 7EB884 80240B74 0080302D */ daddu $a2, $a0, $zero -/* 7EB888 80240B78 8E220070 */ lw $v0, 0x70($s1) -/* 7EB88C 80240B7C 8FBF0024 */ lw $ra, 0x24($sp) -/* 7EB890 80240B80 8FB40020 */ lw $s4, 0x20($sp) -/* 7EB894 80240B84 8FB3001C */ lw $s3, 0x1c($sp) -/* 7EB898 80240B88 8FB20018 */ lw $s2, 0x18($sp) -/* 7EB89C 80240B8C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EB8A0 80240B90 8FB00010 */ lw $s0, 0x10($sp) -/* 7EB8A4 80240B94 384200FF */ xori $v0, $v0, 0xff -/* 7EB8A8 80240B98 2C420001 */ sltiu $v0, $v0, 1 -/* 7EB8AC 80240B9C 00021040 */ sll $v0, $v0, 1 -/* 7EB8B0 80240BA0 03E00008 */ jr $ra -/* 7EB8B4 80240BA4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s new file mode 100644 index 0000000000..237de0f32b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240A5C_7EB76C.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A5C_7EB76C +/* 7EB76C 80240A5C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7EB770 80240A60 AFB10014 */ sw $s1, 0x14($sp) +/* 7EB774 80240A64 0080882D */ daddu $s1, $a0, $zero +/* 7EB778 80240A68 AFBF0024 */ sw $ra, 0x24($sp) +/* 7EB77C 80240A6C AFB40020 */ sw $s4, 0x20($sp) +/* 7EB780 80240A70 AFB3001C */ sw $s3, 0x1c($sp) +/* 7EB784 80240A74 AFB20018 */ sw $s2, 0x18($sp) +/* 7EB788 80240A78 10A00033 */ beqz $a1, .L80240B48 +/* 7EB78C 80240A7C AFB00010 */ sw $s0, 0x10($sp) +/* 7EB790 80240A80 0C04760B */ jal func_8011D82C +/* 7EB794 80240A84 24040001 */ addiu $a0, $zero, 1 +/* 7EB798 80240A88 0000202D */ daddu $a0, $zero, $zero +/* 7EB79C 80240A8C 0080282D */ daddu $a1, $a0, $zero +/* 7EB7A0 80240A90 0080302D */ daddu $a2, $a0, $zero +/* 7EB7A4 80240A94 0080382D */ daddu $a3, $a0, $zero +/* 7EB7A8 80240A98 0080802D */ daddu $s0, $a0, $zero +/* 7EB7AC 80240A9C 2414FFFC */ addiu $s4, $zero, -4 +/* 7EB7B0 80240AA0 24130006 */ addiu $s3, $zero, 6 +/* 7EB7B4 80240AA4 3C120080 */ lui $s2, 0x80 +/* 7EB7B8 80240AA8 3C038015 */ lui $v1, 0x8015 +/* 7EB7BC 80240AAC 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 7EB7C0 80240AB0 24020001 */ addiu $v0, $zero, 1 +/* 7EB7C4 80240AB4 0C046F97 */ jal set_background_color_blend +/* 7EB7C8 80240AB8 A0620000 */ sb $v0, ($v1) +.L80240ABC: +/* 7EB7CC 80240ABC 0C00E2B7 */ jal get_npc_by_index +/* 7EB7D0 80240AC0 0200202D */ daddu $a0, $s0, $zero +/* 7EB7D4 80240AC4 0040202D */ daddu $a0, $v0, $zero +/* 7EB7D8 80240AC8 5080000B */ beql $a0, $zero, .L80240AF8 +/* 7EB7DC 80240ACC 26100001 */ addiu $s0, $s0, 1 +/* 7EB7E0 80240AD0 8C820000 */ lw $v0, ($a0) +/* 7EB7E4 80240AD4 50400008 */ beql $v0, $zero, .L80240AF8 +/* 7EB7E8 80240AD8 26100001 */ addiu $s0, $s0, 1 +/* 7EB7EC 80240ADC 808300A4 */ lb $v1, 0xa4($a0) +/* 7EB7F0 80240AE0 10740005 */ beq $v1, $s4, .L80240AF8 +/* 7EB7F4 80240AE4 26100001 */ addiu $s0, $s0, 1 +/* 7EB7F8 80240AE8 10730003 */ beq $v1, $s3, .L80240AF8 +/* 7EB7FC 80240AEC 00000000 */ nop +/* 7EB800 80240AF0 00521025 */ or $v0, $v0, $s2 +/* 7EB804 80240AF4 AC820000 */ sw $v0, ($a0) +.L80240AF8: +/* 7EB808 80240AF8 2A020040 */ slti $v0, $s0, 0x40 +/* 7EB80C 80240AFC 1440FFEF */ bnez $v0, .L80240ABC +/* 7EB810 80240B00 00000000 */ nop +/* 7EB814 80240B04 0000802D */ daddu $s0, $zero, $zero +/* 7EB818 80240B08 3C120800 */ lui $s2, 0x800 +.L80240B0C: +/* 7EB81C 80240B0C 0C04C3D6 */ jal get_item_entity +/* 7EB820 80240B10 0200202D */ daddu $a0, $s0, $zero +/* 7EB824 80240B14 0040182D */ daddu $v1, $v0, $zero +/* 7EB828 80240B18 10600007 */ beqz $v1, .L80240B38 +/* 7EB82C 80240B1C 26100001 */ addiu $s0, $s0, 1 +/* 7EB830 80240B20 8C640000 */ lw $a0, ($v1) +/* 7EB834 80240B24 30820010 */ andi $v0, $a0, 0x10 +/* 7EB838 80240B28 10400003 */ beqz $v0, .L80240B38 +/* 7EB83C 80240B2C 00000000 */ nop +/* 7EB840 80240B30 00921025 */ or $v0, $a0, $s2 +/* 7EB844 80240B34 AC620000 */ sw $v0, ($v1) +.L80240B38: +/* 7EB848 80240B38 2A020100 */ slti $v0, $s0, 0x100 +/* 7EB84C 80240B3C 1440FFF3 */ bnez $v0, .L80240B0C +/* 7EB850 80240B40 00000000 */ nop +/* 7EB854 80240B44 AE200070 */ sw $zero, 0x70($s1) +.L80240B48: +/* 7EB858 80240B48 8E220070 */ lw $v0, 0x70($s1) +/* 7EB85C 80240B4C 24420008 */ addiu $v0, $v0, 8 +/* 7EB860 80240B50 AE220070 */ sw $v0, 0x70($s1) +/* 7EB864 80240B54 28420100 */ slti $v0, $v0, 0x100 +/* 7EB868 80240B58 14400003 */ bnez $v0, .L80240B68 +/* 7EB86C 80240B5C 0000202D */ daddu $a0, $zero, $zero +/* 7EB870 80240B60 240200FF */ addiu $v0, $zero, 0xff +/* 7EB874 80240B64 AE220070 */ sw $v0, 0x70($s1) +.L80240B68: +/* 7EB878 80240B68 0080282D */ daddu $a1, $a0, $zero +/* 7EB87C 80240B6C 92270073 */ lbu $a3, 0x73($s1) +/* 7EB880 80240B70 0C046F97 */ jal set_background_color_blend +/* 7EB884 80240B74 0080302D */ daddu $a2, $a0, $zero +/* 7EB888 80240B78 8E220070 */ lw $v0, 0x70($s1) +/* 7EB88C 80240B7C 8FBF0024 */ lw $ra, 0x24($sp) +/* 7EB890 80240B80 8FB40020 */ lw $s4, 0x20($sp) +/* 7EB894 80240B84 8FB3001C */ lw $s3, 0x1c($sp) +/* 7EB898 80240B88 8FB20018 */ lw $s2, 0x18($sp) +/* 7EB89C 80240B8C 8FB10014 */ lw $s1, 0x14($sp) +/* 7EB8A0 80240B90 8FB00010 */ lw $s0, 0x10($sp) +/* 7EB8A4 80240B94 384200FF */ xori $v0, $v0, 0xff +/* 7EB8A8 80240B98 2C420001 */ sltiu $v0, $v0, 1 +/* 7EB8AC 80240B9C 00021040 */ sll $v0, $v0, 1 +/* 7EB8B0 80240BA0 03E00008 */ jr $ra +/* 7EB8B4 80240BA4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8.s deleted file mode 100644 index 346a0b274e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BA8 -/* 7EB8B8 80240BA8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7EB8BC 80240BAC AFB00010 */ sw $s0, 0x10($sp) -/* 7EB8C0 80240BB0 0080802D */ daddu $s0, $a0, $zero -/* 7EB8C4 80240BB4 AFBF0020 */ sw $ra, 0x20($sp) -/* 7EB8C8 80240BB8 AFB3001C */ sw $s3, 0x1c($sp) -/* 7EB8CC 80240BBC AFB20018 */ sw $s2, 0x18($sp) -/* 7EB8D0 80240BC0 10A00009 */ beqz $a1, .L80240BE8 -/* 7EB8D4 80240BC4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EB8D8 80240BC8 0000202D */ daddu $a0, $zero, $zero -/* 7EB8DC 80240BCC 0080282D */ daddu $a1, $a0, $zero -/* 7EB8E0 80240BD0 0080302D */ daddu $a2, $a0, $zero -/* 7EB8E4 80240BD4 0C046F97 */ jal set_background_color_blend -/* 7EB8E8 80240BD8 240700FF */ addiu $a3, $zero, 0xff -/* 7EB8EC 80240BDC 240200FF */ addiu $v0, $zero, 0xff -/* 7EB8F0 80240BE0 AE020070 */ sw $v0, 0x70($s0) -/* 7EB8F4 80240BE4 AE000074 */ sw $zero, 0x74($s0) -.L80240BE8: -/* 7EB8F8 80240BE8 8E020070 */ lw $v0, 0x70($s0) -/* 7EB8FC 80240BEC 2442FFF8 */ addiu $v0, $v0, -8 -/* 7EB900 80240BF0 04410002 */ bgez $v0, .L80240BFC -/* 7EB904 80240BF4 AE020070 */ sw $v0, 0x70($s0) -/* 7EB908 80240BF8 AE000070 */ sw $zero, 0x70($s0) -.L80240BFC: -/* 7EB90C 80240BFC 0000202D */ daddu $a0, $zero, $zero -/* 7EB910 80240C00 0080282D */ daddu $a1, $a0, $zero -/* 7EB914 80240C04 92070073 */ lbu $a3, 0x73($s0) -/* 7EB918 80240C08 0C046F97 */ jal set_background_color_blend -/* 7EB91C 80240C0C 0080302D */ daddu $a2, $a0, $zero -/* 7EB920 80240C10 8E020070 */ lw $v0, 0x70($s0) -/* 7EB924 80240C14 14400006 */ bnez $v0, .L80240C30 -/* 7EB928 80240C18 00000000 */ nop -/* 7EB92C 80240C1C 8E020074 */ lw $v0, 0x74($s0) -/* 7EB930 80240C20 14400003 */ bnez $v0, .L80240C30 -/* 7EB934 80240C24 24020001 */ addiu $v0, $zero, 1 -/* 7EB938 80240C28 0809033F */ j .L80240CFC -/* 7EB93C 80240C2C AE020074 */ sw $v0, 0x74($s0) -.L80240C30: -/* 7EB940 80240C30 8E030074 */ lw $v1, 0x74($s0) -/* 7EB944 80240C34 24020001 */ addiu $v0, $zero, 1 -/* 7EB948 80240C38 14620031 */ bne $v1, $v0, .L80240D00 -/* 7EB94C 80240C3C 0000102D */ daddu $v0, $zero, $zero -/* 7EB950 80240C40 0C04760B */ jal func_8011D82C -/* 7EB954 80240C44 0000202D */ daddu $a0, $zero, $zero -/* 7EB958 80240C48 0000802D */ daddu $s0, $zero, $zero -/* 7EB95C 80240C4C 2413FFFC */ addiu $s3, $zero, -4 -/* 7EB960 80240C50 24120006 */ addiu $s2, $zero, 6 -/* 7EB964 80240C54 3C11FF7F */ lui $s1, 0xff7f -/* 7EB968 80240C58 3C028015 */ lui $v0, 0x8015 -/* 7EB96C 80240C5C 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 7EB970 80240C60 3631FFFF */ ori $s1, $s1, 0xffff -/* 7EB974 80240C64 A0400000 */ sb $zero, ($v0) -.L80240C68: -/* 7EB978 80240C68 0C00E2B7 */ jal get_npc_by_index -/* 7EB97C 80240C6C 0200202D */ daddu $a0, $s0, $zero -/* 7EB980 80240C70 0040202D */ daddu $a0, $v0, $zero -/* 7EB984 80240C74 5080000B */ beql $a0, $zero, .L80240CA4 -/* 7EB988 80240C78 26100001 */ addiu $s0, $s0, 1 -/* 7EB98C 80240C7C 8C820000 */ lw $v0, ($a0) -/* 7EB990 80240C80 50400008 */ beql $v0, $zero, .L80240CA4 -/* 7EB994 80240C84 26100001 */ addiu $s0, $s0, 1 -/* 7EB998 80240C88 808300A4 */ lb $v1, 0xa4($a0) -/* 7EB99C 80240C8C 10730005 */ beq $v1, $s3, .L80240CA4 -/* 7EB9A0 80240C90 26100001 */ addiu $s0, $s0, 1 -/* 7EB9A4 80240C94 10720003 */ beq $v1, $s2, .L80240CA4 -/* 7EB9A8 80240C98 00000000 */ nop -/* 7EB9AC 80240C9C 00511024 */ and $v0, $v0, $s1 -/* 7EB9B0 80240CA0 AC820000 */ sw $v0, ($a0) -.L80240CA4: -/* 7EB9B4 80240CA4 2A020040 */ slti $v0, $s0, 0x40 -/* 7EB9B8 80240CA8 1440FFEF */ bnez $v0, .L80240C68 -/* 7EB9BC 80240CAC 00000000 */ nop -/* 7EB9C0 80240CB0 0000802D */ daddu $s0, $zero, $zero -/* 7EB9C4 80240CB4 3C11F7FF */ lui $s1, 0xf7ff -/* 7EB9C8 80240CB8 3631FFFF */ ori $s1, $s1, 0xffff -.L80240CBC: -/* 7EB9CC 80240CBC 0C04C3D6 */ jal get_item_entity -/* 7EB9D0 80240CC0 0200202D */ daddu $a0, $s0, $zero -/* 7EB9D4 80240CC4 0040182D */ daddu $v1, $v0, $zero -/* 7EB9D8 80240CC8 10600007 */ beqz $v1, .L80240CE8 -/* 7EB9DC 80240CCC 26100001 */ addiu $s0, $s0, 1 -/* 7EB9E0 80240CD0 8C640000 */ lw $a0, ($v1) -/* 7EB9E4 80240CD4 30820010 */ andi $v0, $a0, 0x10 -/* 7EB9E8 80240CD8 10400003 */ beqz $v0, .L80240CE8 -/* 7EB9EC 80240CDC 00000000 */ nop -/* 7EB9F0 80240CE0 00911024 */ and $v0, $a0, $s1 -/* 7EB9F4 80240CE4 AC620000 */ sw $v0, ($v1) -.L80240CE8: -/* 7EB9F8 80240CE8 2A020100 */ slti $v0, $s0, 0x100 -/* 7EB9FC 80240CEC 1440FFF3 */ bnez $v0, .L80240CBC -/* 7EBA00 80240CF0 24020002 */ addiu $v0, $zero, 2 -/* 7EBA04 80240CF4 08090340 */ j .L80240D00 -/* 7EBA08 80240CF8 00000000 */ nop -.L80240CFC: -/* 7EBA0C 80240CFC 0000102D */ daddu $v0, $zero, $zero -.L80240D00: -/* 7EBA10 80240D00 8FBF0020 */ lw $ra, 0x20($sp) -/* 7EBA14 80240D04 8FB3001C */ lw $s3, 0x1c($sp) -/* 7EBA18 80240D08 8FB20018 */ lw $s2, 0x18($sp) -/* 7EBA1C 80240D0C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EBA20 80240D10 8FB00010 */ lw $s0, 0x10($sp) -/* 7EBA24 80240D14 03E00008 */ jr $ra -/* 7EBA28 80240D18 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s new file mode 100644 index 0000000000..fb17887694 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240BA8_7EB8B8.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BA8_7EB8B8 +/* 7EB8B8 80240BA8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7EB8BC 80240BAC AFB00010 */ sw $s0, 0x10($sp) +/* 7EB8C0 80240BB0 0080802D */ daddu $s0, $a0, $zero +/* 7EB8C4 80240BB4 AFBF0020 */ sw $ra, 0x20($sp) +/* 7EB8C8 80240BB8 AFB3001C */ sw $s3, 0x1c($sp) +/* 7EB8CC 80240BBC AFB20018 */ sw $s2, 0x18($sp) +/* 7EB8D0 80240BC0 10A00009 */ beqz $a1, .L80240BE8 +/* 7EB8D4 80240BC4 AFB10014 */ sw $s1, 0x14($sp) +/* 7EB8D8 80240BC8 0000202D */ daddu $a0, $zero, $zero +/* 7EB8DC 80240BCC 0080282D */ daddu $a1, $a0, $zero +/* 7EB8E0 80240BD0 0080302D */ daddu $a2, $a0, $zero +/* 7EB8E4 80240BD4 0C046F97 */ jal set_background_color_blend +/* 7EB8E8 80240BD8 240700FF */ addiu $a3, $zero, 0xff +/* 7EB8EC 80240BDC 240200FF */ addiu $v0, $zero, 0xff +/* 7EB8F0 80240BE0 AE020070 */ sw $v0, 0x70($s0) +/* 7EB8F4 80240BE4 AE000074 */ sw $zero, 0x74($s0) +.L80240BE8: +/* 7EB8F8 80240BE8 8E020070 */ lw $v0, 0x70($s0) +/* 7EB8FC 80240BEC 2442FFF8 */ addiu $v0, $v0, -8 +/* 7EB900 80240BF0 04410002 */ bgez $v0, .L80240BFC +/* 7EB904 80240BF4 AE020070 */ sw $v0, 0x70($s0) +/* 7EB908 80240BF8 AE000070 */ sw $zero, 0x70($s0) +.L80240BFC: +/* 7EB90C 80240BFC 0000202D */ daddu $a0, $zero, $zero +/* 7EB910 80240C00 0080282D */ daddu $a1, $a0, $zero +/* 7EB914 80240C04 92070073 */ lbu $a3, 0x73($s0) +/* 7EB918 80240C08 0C046F97 */ jal set_background_color_blend +/* 7EB91C 80240C0C 0080302D */ daddu $a2, $a0, $zero +/* 7EB920 80240C10 8E020070 */ lw $v0, 0x70($s0) +/* 7EB924 80240C14 14400006 */ bnez $v0, .L80240C30 +/* 7EB928 80240C18 00000000 */ nop +/* 7EB92C 80240C1C 8E020074 */ lw $v0, 0x74($s0) +/* 7EB930 80240C20 14400003 */ bnez $v0, .L80240C30 +/* 7EB934 80240C24 24020001 */ addiu $v0, $zero, 1 +/* 7EB938 80240C28 0809033F */ j .L80240CFC +/* 7EB93C 80240C2C AE020074 */ sw $v0, 0x74($s0) +.L80240C30: +/* 7EB940 80240C30 8E030074 */ lw $v1, 0x74($s0) +/* 7EB944 80240C34 24020001 */ addiu $v0, $zero, 1 +/* 7EB948 80240C38 14620031 */ bne $v1, $v0, .L80240D00 +/* 7EB94C 80240C3C 0000102D */ daddu $v0, $zero, $zero +/* 7EB950 80240C40 0C04760B */ jal func_8011D82C +/* 7EB954 80240C44 0000202D */ daddu $a0, $zero, $zero +/* 7EB958 80240C48 0000802D */ daddu $s0, $zero, $zero +/* 7EB95C 80240C4C 2413FFFC */ addiu $s3, $zero, -4 +/* 7EB960 80240C50 24120006 */ addiu $s2, $zero, 6 +/* 7EB964 80240C54 3C11FF7F */ lui $s1, 0xff7f +/* 7EB968 80240C58 3C028015 */ lui $v0, 0x8015 +/* 7EB96C 80240C5C 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 7EB970 80240C60 3631FFFF */ ori $s1, $s1, 0xffff +/* 7EB974 80240C64 A0400000 */ sb $zero, ($v0) +.L80240C68: +/* 7EB978 80240C68 0C00E2B7 */ jal get_npc_by_index +/* 7EB97C 80240C6C 0200202D */ daddu $a0, $s0, $zero +/* 7EB980 80240C70 0040202D */ daddu $a0, $v0, $zero +/* 7EB984 80240C74 5080000B */ beql $a0, $zero, .L80240CA4 +/* 7EB988 80240C78 26100001 */ addiu $s0, $s0, 1 +/* 7EB98C 80240C7C 8C820000 */ lw $v0, ($a0) +/* 7EB990 80240C80 50400008 */ beql $v0, $zero, .L80240CA4 +/* 7EB994 80240C84 26100001 */ addiu $s0, $s0, 1 +/* 7EB998 80240C88 808300A4 */ lb $v1, 0xa4($a0) +/* 7EB99C 80240C8C 10730005 */ beq $v1, $s3, .L80240CA4 +/* 7EB9A0 80240C90 26100001 */ addiu $s0, $s0, 1 +/* 7EB9A4 80240C94 10720003 */ beq $v1, $s2, .L80240CA4 +/* 7EB9A8 80240C98 00000000 */ nop +/* 7EB9AC 80240C9C 00511024 */ and $v0, $v0, $s1 +/* 7EB9B0 80240CA0 AC820000 */ sw $v0, ($a0) +.L80240CA4: +/* 7EB9B4 80240CA4 2A020040 */ slti $v0, $s0, 0x40 +/* 7EB9B8 80240CA8 1440FFEF */ bnez $v0, .L80240C68 +/* 7EB9BC 80240CAC 00000000 */ nop +/* 7EB9C0 80240CB0 0000802D */ daddu $s0, $zero, $zero +/* 7EB9C4 80240CB4 3C11F7FF */ lui $s1, 0xf7ff +/* 7EB9C8 80240CB8 3631FFFF */ ori $s1, $s1, 0xffff +.L80240CBC: +/* 7EB9CC 80240CBC 0C04C3D6 */ jal get_item_entity +/* 7EB9D0 80240CC0 0200202D */ daddu $a0, $s0, $zero +/* 7EB9D4 80240CC4 0040182D */ daddu $v1, $v0, $zero +/* 7EB9D8 80240CC8 10600007 */ beqz $v1, .L80240CE8 +/* 7EB9DC 80240CCC 26100001 */ addiu $s0, $s0, 1 +/* 7EB9E0 80240CD0 8C640000 */ lw $a0, ($v1) +/* 7EB9E4 80240CD4 30820010 */ andi $v0, $a0, 0x10 +/* 7EB9E8 80240CD8 10400003 */ beqz $v0, .L80240CE8 +/* 7EB9EC 80240CDC 00000000 */ nop +/* 7EB9F0 80240CE0 00911024 */ and $v0, $a0, $s1 +/* 7EB9F4 80240CE4 AC620000 */ sw $v0, ($v1) +.L80240CE8: +/* 7EB9F8 80240CE8 2A020100 */ slti $v0, $s0, 0x100 +/* 7EB9FC 80240CEC 1440FFF3 */ bnez $v0, .L80240CBC +/* 7EBA00 80240CF0 24020002 */ addiu $v0, $zero, 2 +/* 7EBA04 80240CF4 08090340 */ j .L80240D00 +/* 7EBA08 80240CF8 00000000 */ nop +.L80240CFC: +/* 7EBA0C 80240CFC 0000102D */ daddu $v0, $zero, $zero +.L80240D00: +/* 7EBA10 80240D00 8FBF0020 */ lw $ra, 0x20($sp) +/* 7EBA14 80240D04 8FB3001C */ lw $s3, 0x1c($sp) +/* 7EBA18 80240D08 8FB20018 */ lw $s2, 0x18($sp) +/* 7EBA1C 80240D0C 8FB10014 */ lw $s1, 0x14($sp) +/* 7EBA20 80240D10 8FB00010 */ lw $s0, 0x10($sp) +/* 7EBA24 80240D14 03E00008 */ jr $ra +/* 7EBA28 80240D18 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C.s deleted file mode 100644 index 51ce9f43d8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D1C -/* 7EBA2C 80240D1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EBA30 80240D20 AFB00010 */ sw $s0, 0x10($sp) -/* 7EBA34 80240D24 3C108011 */ lui $s0, %hi(gPlayerData) -/* 7EBA38 80240D28 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 7EBA3C 80240D2C AFBF0018 */ sw $ra, 0x18($sp) -/* 7EBA40 80240D30 AFB10014 */ sw $s1, 0x14($sp) -/* 7EBA44 80240D34 960302C0 */ lhu $v1, 0x2c0($s0) -/* 7EBA48 80240D38 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 7EBA4C 80240D3C 10400003 */ beqz $v0, .L80240D4C -/* 7EBA50 80240D40 0080882D */ daddu $s1, $a0, $zero -/* 7EBA54 80240D44 24620001 */ addiu $v0, $v1, 1 -/* 7EBA58 80240D48 A60202C0 */ sh $v0, 0x2c0($s0) -.L80240D4C: -/* 7EBA5C 80240D4C 3C05F5DE */ lui $a1, 0xf5de -/* 7EBA60 80240D50 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 7EBA64 80240D54 0C0B1EAF */ jal get_variable -/* 7EBA68 80240D58 0000202D */ daddu $a0, $zero, $zero -/* 7EBA6C 80240D5C 3C038024 */ lui $v1, 0x8024 -/* 7EBA70 80240D60 00621821 */ addu $v1, $v1, $v0 -/* 7EBA74 80240D64 90635E24 */ lbu $v1, 0x5e24($v1) -/* 7EBA78 80240D68 8E220084 */ lw $v0, 0x84($s1) -/* 7EBA7C 80240D6C 54430006 */ bnel $v0, $v1, .L80240D88 -/* 7EBA80 80240D70 AE200084 */ sw $zero, 0x84($s1) -/* 7EBA84 80240D74 24020001 */ addiu $v0, $zero, 1 -/* 7EBA88 80240D78 AE220084 */ sw $v0, 0x84($s1) -/* 7EBA8C 80240D7C 960202C2 */ lhu $v0, 0x2c2($s0) -/* 7EBA90 80240D80 24420001 */ addiu $v0, $v0, 1 -/* 7EBA94 80240D84 A60202C2 */ sh $v0, 0x2c2($s0) -.L80240D88: -/* 7EBA98 80240D88 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EBA9C 80240D8C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EBAA0 80240D90 8FB00010 */ lw $s0, 0x10($sp) -/* 7EBAA4 80240D94 24020002 */ addiu $v0, $zero, 2 -/* 7EBAA8 80240D98 03E00008 */ jr $ra -/* 7EBAAC 80240D9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C_7EBA2C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C_7EBA2C.s new file mode 100644 index 0000000000..78b467d12a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240D1C_7EBA2C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D1C_7EBA2C +/* 7EBA2C 80240D1C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EBA30 80240D20 AFB00010 */ sw $s0, 0x10($sp) +/* 7EBA34 80240D24 3C108011 */ lui $s0, %hi(gPlayerData) +/* 7EBA38 80240D28 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 7EBA3C 80240D2C AFBF0018 */ sw $ra, 0x18($sp) +/* 7EBA40 80240D30 AFB10014 */ sw $s1, 0x14($sp) +/* 7EBA44 80240D34 960302C0 */ lhu $v1, 0x2c0($s0) +/* 7EBA48 80240D38 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 7EBA4C 80240D3C 10400003 */ beqz $v0, .L80240D4C +/* 7EBA50 80240D40 0080882D */ daddu $s1, $a0, $zero +/* 7EBA54 80240D44 24620001 */ addiu $v0, $v1, 1 +/* 7EBA58 80240D48 A60202C0 */ sh $v0, 0x2c0($s0) +.L80240D4C: +/* 7EBA5C 80240D4C 3C05F5DE */ lui $a1, 0xf5de +/* 7EBA60 80240D50 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 7EBA64 80240D54 0C0B1EAF */ jal get_variable +/* 7EBA68 80240D58 0000202D */ daddu $a0, $zero, $zero +/* 7EBA6C 80240D5C 3C038024 */ lui $v1, 0x8024 +/* 7EBA70 80240D60 00621821 */ addu $v1, $v1, $v0 +/* 7EBA74 80240D64 90635E24 */ lbu $v1, 0x5e24($v1) +/* 7EBA78 80240D68 8E220084 */ lw $v0, 0x84($s1) +/* 7EBA7C 80240D6C 54430006 */ bnel $v0, $v1, .L80240D88 +/* 7EBA80 80240D70 AE200084 */ sw $zero, 0x84($s1) +/* 7EBA84 80240D74 24020001 */ addiu $v0, $zero, 1 +/* 7EBA88 80240D78 AE220084 */ sw $v0, 0x84($s1) +/* 7EBA8C 80240D7C 960202C2 */ lhu $v0, 0x2c2($s0) +/* 7EBA90 80240D80 24420001 */ addiu $v0, $v0, 1 +/* 7EBA94 80240D84 A60202C2 */ sh $v0, 0x2c2($s0) +.L80240D88: +/* 7EBA98 80240D88 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EBA9C 80240D8C 8FB10014 */ lw $s1, 0x14($sp) +/* 7EBAA0 80240D90 8FB00010 */ lw $s0, 0x10($sp) +/* 7EBAA4 80240D94 24020002 */ addiu $v0, $zero, 2 +/* 7EBAA8 80240D98 03E00008 */ jr $ra +/* 7EBAAC 80240D9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0.s deleted file mode 100644 index 11e965cb2b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA0 -/* 7EBAB0 80240DA0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7EBAB4 80240DA4 AFB1001C */ sw $s1, 0x1c($sp) -/* 7EBAB8 80240DA8 AFBF0020 */ sw $ra, 0x20($sp) -/* 7EBABC 80240DAC AFB00018 */ sw $s0, 0x18($sp) -/* 7EBAC0 80240DB0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 7EBAC4 80240DB4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 7EBAC8 80240DB8 10A00060 */ beqz $a1, .L80240F3C -/* 7EBACC 80240DBC 0080882D */ daddu $s1, $a0, $zero -/* 7EBAD0 80240DC0 3C05F4AC */ lui $a1, 0xf4ac -/* 7EBAD4 80240DC4 0C0B1EAF */ jal get_variable -/* 7EBAD8 80240DC8 34A5D481 */ ori $a1, $a1, 0xd481 -/* 7EBADC 80240DCC 0220202D */ daddu $a0, $s1, $zero -/* 7EBAE0 80240DD0 3C05F4AC */ lui $a1, 0xf4ac -/* 7EBAE4 80240DD4 4482B000 */ mtc1 $v0, $f22 -/* 7EBAE8 80240DD8 00000000 */ nop -/* 7EBAEC 80240DDC 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7EBAF0 80240DE0 0C0B1EAF */ jal get_variable -/* 7EBAF4 80240DE4 34A5D482 */ ori $a1, $a1, 0xd482 -/* 7EBAF8 80240DE8 0220202D */ daddu $a0, $s1, $zero -/* 7EBAFC 80240DEC 3C05F4AC */ lui $a1, 0xf4ac -/* 7EBB00 80240DF0 4482A000 */ mtc1 $v0, $f20 -/* 7EBB04 80240DF4 00000000 */ nop -/* 7EBB08 80240DF8 4680A520 */ cvt.s.w $f20, $f20 -/* 7EBB0C 80240DFC 0C0B1EAF */ jal get_variable -/* 7EBB10 80240E00 34A5D483 */ ori $a1, $a1, 0xd483 -/* 7EBB14 80240E04 44821000 */ mtc1 $v0, $f2 -/* 7EBB18 80240E08 00000000 */ nop -/* 7EBB1C 80240E0C 468010A0 */ cvt.s.w $f2, $f2 -/* 7EBB20 80240E10 4405B000 */ mfc1 $a1, $f22 -/* 7EBB24 80240E14 4406A000 */ mfc1 $a2, $f20 -/* 7EBB28 80240E18 44071000 */ mfc1 $a3, $f2 -/* 7EBB2C 80240E1C 0C01C574 */ jal func_800715D0 -/* 7EBB30 80240E20 0000202D */ daddu $a0, $zero, $zero -/* 7EBB34 80240E24 0220202D */ daddu $a0, $s1, $zero -/* 7EBB38 80240E28 3C05F4AC */ lui $a1, 0xf4ac -/* 7EBB3C 80240E2C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 7EBB40 80240E30 3C108025 */ lui $s0, 0x8025 -/* 7EBB44 80240E34 26105B90 */ addiu $s0, $s0, 0x5b90 -/* 7EBB48 80240E38 0C0B1EAF */ jal get_variable -/* 7EBB4C 80240E3C AE020000 */ sw $v0, ($s0) -/* 7EBB50 80240E40 0220202D */ daddu $a0, $s1, $zero -/* 7EBB54 80240E44 3C05F4AC */ lui $a1, 0xf4ac -/* 7EBB58 80240E48 4482B000 */ mtc1 $v0, $f22 -/* 7EBB5C 80240E4C 00000000 */ nop -/* 7EBB60 80240E50 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7EBB64 80240E54 0C0B1EAF */ jal get_variable -/* 7EBB68 80240E58 34A5D482 */ ori $a1, $a1, 0xd482 -/* 7EBB6C 80240E5C 0220202D */ daddu $a0, $s1, $zero -/* 7EBB70 80240E60 3C05F4AC */ lui $a1, 0xf4ac -/* 7EBB74 80240E64 4482A000 */ mtc1 $v0, $f20 -/* 7EBB78 80240E68 00000000 */ nop -/* 7EBB7C 80240E6C 4680A520 */ cvt.s.w $f20, $f20 -/* 7EBB80 80240E70 0C0B1EAF */ jal get_variable -/* 7EBB84 80240E74 34A5D483 */ ori $a1, $a1, 0xd483 -/* 7EBB88 80240E78 44821000 */ mtc1 $v0, $f2 -/* 7EBB8C 80240E7C 00000000 */ nop -/* 7EBB90 80240E80 468010A0 */ cvt.s.w $f2, $f2 -/* 7EBB94 80240E84 4405B000 */ mfc1 $a1, $f22 -/* 7EBB98 80240E88 4406A000 */ mfc1 $a2, $f20 -/* 7EBB9C 80240E8C 44071000 */ mfc1 $a3, $f2 -/* 7EBBA0 80240E90 0C01C604 */ jal func_80071810 -/* 7EBBA4 80240E94 0000202D */ daddu $a0, $zero, $zero -/* 7EBBA8 80240E98 0220202D */ daddu $a0, $s1, $zero -/* 7EBBAC 80240E9C 3C05F4AC */ lui $a1, 0xf4ac -/* 7EBBB0 80240EA0 3C018025 */ lui $at, 0x8025 -/* 7EBBB4 80240EA4 AC225B94 */ sw $v0, 0x5b94($at) -/* 7EBBB8 80240EA8 0C0B1EAF */ jal get_variable -/* 7EBBBC 80240EAC 34A5D481 */ ori $a1, $a1, 0xd481 -/* 7EBBC0 80240EB0 0220202D */ daddu $a0, $s1, $zero -/* 7EBBC4 80240EB4 3C05F4AC */ lui $a1, 0xf4ac -/* 7EBBC8 80240EB8 4482B000 */ mtc1 $v0, $f22 -/* 7EBBCC 80240EBC 00000000 */ nop -/* 7EBBD0 80240EC0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7EBBD4 80240EC4 0C0B1EAF */ jal get_variable -/* 7EBBD8 80240EC8 34A5D482 */ ori $a1, $a1, 0xd482 -/* 7EBBDC 80240ECC 0220202D */ daddu $a0, $s1, $zero -/* 7EBBE0 80240ED0 3C05F4AC */ lui $a1, 0xf4ac -/* 7EBBE4 80240ED4 4482A000 */ mtc1 $v0, $f20 -/* 7EBBE8 80240ED8 00000000 */ nop -/* 7EBBEC 80240EDC 4680A520 */ cvt.s.w $f20, $f20 -/* 7EBBF0 80240EE0 0C0B1EAF */ jal get_variable -/* 7EBBF4 80240EE4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 7EBBF8 80240EE8 44821000 */ mtc1 $v0, $f2 -/* 7EBBFC 80240EEC 00000000 */ nop -/* 7EBC00 80240EF0 468010A0 */ cvt.s.w $f2, $f2 -/* 7EBC04 80240EF4 4405B000 */ mfc1 $a1, $f22 -/* 7EBC08 80240EF8 4406A000 */ mfc1 $a2, $f20 -/* 7EBC0C 80240EFC 3C013F80 */ lui $at, 0x3f80 -/* 7EBC10 80240F00 44810000 */ mtc1 $at, $f0 -/* 7EBC14 80240F04 44071000 */ mfc1 $a3, $f2 -/* 7EBC18 80240F08 0000202D */ daddu $a0, $zero, $zero -/* 7EBC1C 80240F0C AFA00014 */ sw $zero, 0x14($sp) -/* 7EBC20 80240F10 0C01CA24 */ jal func_80072890 -/* 7EBC24 80240F14 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7EBC28 80240F18 8E030000 */ lw $v1, ($s0) -/* 7EBC2C 80240F1C 8C64000C */ lw $a0, 0xc($v1) -/* 7EBC30 80240F20 3C018025 */ lui $at, 0x8025 -/* 7EBC34 80240F24 AC225B98 */ sw $v0, 0x5b98($at) -/* 7EBC38 80240F28 AC800018 */ sw $zero, 0x18($a0) -/* 7EBC3C 80240F2C AC800020 */ sw $zero, 0x20($a0) -/* 7EBC40 80240F30 AC800024 */ sw $zero, 0x24($a0) -/* 7EBC44 80240F34 AC800028 */ sw $zero, 0x28($a0) -/* 7EBC48 80240F38 AC80001C */ sw $zero, 0x1c($a0) -.L80240F3C: -/* 7EBC4C 80240F3C 3C028025 */ lui $v0, 0x8025 -/* 7EBC50 80240F40 8C425B90 */ lw $v0, 0x5b90($v0) -/* 7EBC54 80240F44 8C44000C */ lw $a0, 0xc($v0) -/* 7EBC58 80240F48 8C820020 */ lw $v0, 0x20($a0) -/* 7EBC5C 80240F4C 8C830028 */ lw $v1, 0x28($a0) -/* 7EBC60 80240F50 2442000A */ addiu $v0, $v0, 0xa -/* 7EBC64 80240F54 AC820020 */ sw $v0, 0x20($a0) -/* 7EBC68 80240F58 8C820024 */ lw $v0, 0x24($a0) -/* 7EBC6C 80240F5C 2463000A */ addiu $v1, $v1, 0xa -/* 7EBC70 80240F60 AC830028 */ sw $v1, 0x28($a0) -/* 7EBC74 80240F64 8C830018 */ lw $v1, 0x18($a0) -/* 7EBC78 80240F68 2442000A */ addiu $v0, $v0, 0xa -/* 7EBC7C 80240F6C AC820024 */ sw $v0, 0x24($a0) -/* 7EBC80 80240F70 8C82001C */ lw $v0, 0x1c($a0) -/* 7EBC84 80240F74 2463000A */ addiu $v1, $v1, 0xa -/* 7EBC88 80240F78 AC830018 */ sw $v1, 0x18($a0) -/* 7EBC8C 80240F7C 286300FF */ slti $v1, $v1, 0xff -/* 7EBC90 80240F80 2442000A */ addiu $v0, $v0, 0xa -/* 7EBC94 80240F84 AC82001C */ sw $v0, 0x1c($a0) -/* 7EBC98 80240F88 14600004 */ bnez $v1, .L80240F9C -/* 7EBC9C 80240F8C 0000102D */ daddu $v0, $zero, $zero -/* 7EBCA0 80240F90 240200FF */ addiu $v0, $zero, 0xff -/* 7EBCA4 80240F94 AC820018 */ sw $v0, 0x18($a0) -/* 7EBCA8 80240F98 24020002 */ addiu $v0, $zero, 2 -.L80240F9C: -/* 7EBCAC 80240F9C 8FBF0020 */ lw $ra, 0x20($sp) -/* 7EBCB0 80240FA0 8FB1001C */ lw $s1, 0x1c($sp) -/* 7EBCB4 80240FA4 8FB00018 */ lw $s0, 0x18($sp) -/* 7EBCB8 80240FA8 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 7EBCBC 80240FAC D7B40028 */ ldc1 $f20, 0x28($sp) -/* 7EBCC0 80240FB0 03E00008 */ jr $ra -/* 7EBCC4 80240FB4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s new file mode 100644 index 0000000000..05ce9b631e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240DA0_7EBAB0.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DA0_7EBAB0 +/* 7EBAB0 80240DA0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 7EBAB4 80240DA4 AFB1001C */ sw $s1, 0x1c($sp) +/* 7EBAB8 80240DA8 AFBF0020 */ sw $ra, 0x20($sp) +/* 7EBABC 80240DAC AFB00018 */ sw $s0, 0x18($sp) +/* 7EBAC0 80240DB0 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 7EBAC4 80240DB4 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 7EBAC8 80240DB8 10A00060 */ beqz $a1, .L80240F3C +/* 7EBACC 80240DBC 0080882D */ daddu $s1, $a0, $zero +/* 7EBAD0 80240DC0 3C05F4AC */ lui $a1, 0xf4ac +/* 7EBAD4 80240DC4 0C0B1EAF */ jal get_variable +/* 7EBAD8 80240DC8 34A5D481 */ ori $a1, $a1, 0xd481 +/* 7EBADC 80240DCC 0220202D */ daddu $a0, $s1, $zero +/* 7EBAE0 80240DD0 3C05F4AC */ lui $a1, 0xf4ac +/* 7EBAE4 80240DD4 4482B000 */ mtc1 $v0, $f22 +/* 7EBAE8 80240DD8 00000000 */ nop +/* 7EBAEC 80240DDC 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7EBAF0 80240DE0 0C0B1EAF */ jal get_variable +/* 7EBAF4 80240DE4 34A5D482 */ ori $a1, $a1, 0xd482 +/* 7EBAF8 80240DE8 0220202D */ daddu $a0, $s1, $zero +/* 7EBAFC 80240DEC 3C05F4AC */ lui $a1, 0xf4ac +/* 7EBB00 80240DF0 4482A000 */ mtc1 $v0, $f20 +/* 7EBB04 80240DF4 00000000 */ nop +/* 7EBB08 80240DF8 4680A520 */ cvt.s.w $f20, $f20 +/* 7EBB0C 80240DFC 0C0B1EAF */ jal get_variable +/* 7EBB10 80240E00 34A5D483 */ ori $a1, $a1, 0xd483 +/* 7EBB14 80240E04 44821000 */ mtc1 $v0, $f2 +/* 7EBB18 80240E08 00000000 */ nop +/* 7EBB1C 80240E0C 468010A0 */ cvt.s.w $f2, $f2 +/* 7EBB20 80240E10 4405B000 */ mfc1 $a1, $f22 +/* 7EBB24 80240E14 4406A000 */ mfc1 $a2, $f20 +/* 7EBB28 80240E18 44071000 */ mfc1 $a3, $f2 +/* 7EBB2C 80240E1C 0C01C574 */ jal func_800715D0 +/* 7EBB30 80240E20 0000202D */ daddu $a0, $zero, $zero +/* 7EBB34 80240E24 0220202D */ daddu $a0, $s1, $zero +/* 7EBB38 80240E28 3C05F4AC */ lui $a1, 0xf4ac +/* 7EBB3C 80240E2C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 7EBB40 80240E30 3C108025 */ lui $s0, 0x8025 +/* 7EBB44 80240E34 26105B90 */ addiu $s0, $s0, 0x5b90 +/* 7EBB48 80240E38 0C0B1EAF */ jal get_variable +/* 7EBB4C 80240E3C AE020000 */ sw $v0, ($s0) +/* 7EBB50 80240E40 0220202D */ daddu $a0, $s1, $zero +/* 7EBB54 80240E44 3C05F4AC */ lui $a1, 0xf4ac +/* 7EBB58 80240E48 4482B000 */ mtc1 $v0, $f22 +/* 7EBB5C 80240E4C 00000000 */ nop +/* 7EBB60 80240E50 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7EBB64 80240E54 0C0B1EAF */ jal get_variable +/* 7EBB68 80240E58 34A5D482 */ ori $a1, $a1, 0xd482 +/* 7EBB6C 80240E5C 0220202D */ daddu $a0, $s1, $zero +/* 7EBB70 80240E60 3C05F4AC */ lui $a1, 0xf4ac +/* 7EBB74 80240E64 4482A000 */ mtc1 $v0, $f20 +/* 7EBB78 80240E68 00000000 */ nop +/* 7EBB7C 80240E6C 4680A520 */ cvt.s.w $f20, $f20 +/* 7EBB80 80240E70 0C0B1EAF */ jal get_variable +/* 7EBB84 80240E74 34A5D483 */ ori $a1, $a1, 0xd483 +/* 7EBB88 80240E78 44821000 */ mtc1 $v0, $f2 +/* 7EBB8C 80240E7C 00000000 */ nop +/* 7EBB90 80240E80 468010A0 */ cvt.s.w $f2, $f2 +/* 7EBB94 80240E84 4405B000 */ mfc1 $a1, $f22 +/* 7EBB98 80240E88 4406A000 */ mfc1 $a2, $f20 +/* 7EBB9C 80240E8C 44071000 */ mfc1 $a3, $f2 +/* 7EBBA0 80240E90 0C01C604 */ jal func_80071810 +/* 7EBBA4 80240E94 0000202D */ daddu $a0, $zero, $zero +/* 7EBBA8 80240E98 0220202D */ daddu $a0, $s1, $zero +/* 7EBBAC 80240E9C 3C05F4AC */ lui $a1, 0xf4ac +/* 7EBBB0 80240EA0 3C018025 */ lui $at, 0x8025 +/* 7EBBB4 80240EA4 AC225B94 */ sw $v0, 0x5b94($at) +/* 7EBBB8 80240EA8 0C0B1EAF */ jal get_variable +/* 7EBBBC 80240EAC 34A5D481 */ ori $a1, $a1, 0xd481 +/* 7EBBC0 80240EB0 0220202D */ daddu $a0, $s1, $zero +/* 7EBBC4 80240EB4 3C05F4AC */ lui $a1, 0xf4ac +/* 7EBBC8 80240EB8 4482B000 */ mtc1 $v0, $f22 +/* 7EBBCC 80240EBC 00000000 */ nop +/* 7EBBD0 80240EC0 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7EBBD4 80240EC4 0C0B1EAF */ jal get_variable +/* 7EBBD8 80240EC8 34A5D482 */ ori $a1, $a1, 0xd482 +/* 7EBBDC 80240ECC 0220202D */ daddu $a0, $s1, $zero +/* 7EBBE0 80240ED0 3C05F4AC */ lui $a1, 0xf4ac +/* 7EBBE4 80240ED4 4482A000 */ mtc1 $v0, $f20 +/* 7EBBE8 80240ED8 00000000 */ nop +/* 7EBBEC 80240EDC 4680A520 */ cvt.s.w $f20, $f20 +/* 7EBBF0 80240EE0 0C0B1EAF */ jal get_variable +/* 7EBBF4 80240EE4 34A5D483 */ ori $a1, $a1, 0xd483 +/* 7EBBF8 80240EE8 44821000 */ mtc1 $v0, $f2 +/* 7EBBFC 80240EEC 00000000 */ nop +/* 7EBC00 80240EF0 468010A0 */ cvt.s.w $f2, $f2 +/* 7EBC04 80240EF4 4405B000 */ mfc1 $a1, $f22 +/* 7EBC08 80240EF8 4406A000 */ mfc1 $a2, $f20 +/* 7EBC0C 80240EFC 3C013F80 */ lui $at, 0x3f80 +/* 7EBC10 80240F00 44810000 */ mtc1 $at, $f0 +/* 7EBC14 80240F04 44071000 */ mfc1 $a3, $f2 +/* 7EBC18 80240F08 0000202D */ daddu $a0, $zero, $zero +/* 7EBC1C 80240F0C AFA00014 */ sw $zero, 0x14($sp) +/* 7EBC20 80240F10 0C01CA24 */ jal func_80072890 +/* 7EBC24 80240F14 E7A00010 */ swc1 $f0, 0x10($sp) +/* 7EBC28 80240F18 8E030000 */ lw $v1, ($s0) +/* 7EBC2C 80240F1C 8C64000C */ lw $a0, 0xc($v1) +/* 7EBC30 80240F20 3C018025 */ lui $at, 0x8025 +/* 7EBC34 80240F24 AC225B98 */ sw $v0, 0x5b98($at) +/* 7EBC38 80240F28 AC800018 */ sw $zero, 0x18($a0) +/* 7EBC3C 80240F2C AC800020 */ sw $zero, 0x20($a0) +/* 7EBC40 80240F30 AC800024 */ sw $zero, 0x24($a0) +/* 7EBC44 80240F34 AC800028 */ sw $zero, 0x28($a0) +/* 7EBC48 80240F38 AC80001C */ sw $zero, 0x1c($a0) +.L80240F3C: +/* 7EBC4C 80240F3C 3C028025 */ lui $v0, 0x8025 +/* 7EBC50 80240F40 8C425B90 */ lw $v0, 0x5b90($v0) +/* 7EBC54 80240F44 8C44000C */ lw $a0, 0xc($v0) +/* 7EBC58 80240F48 8C820020 */ lw $v0, 0x20($a0) +/* 7EBC5C 80240F4C 8C830028 */ lw $v1, 0x28($a0) +/* 7EBC60 80240F50 2442000A */ addiu $v0, $v0, 0xa +/* 7EBC64 80240F54 AC820020 */ sw $v0, 0x20($a0) +/* 7EBC68 80240F58 8C820024 */ lw $v0, 0x24($a0) +/* 7EBC6C 80240F5C 2463000A */ addiu $v1, $v1, 0xa +/* 7EBC70 80240F60 AC830028 */ sw $v1, 0x28($a0) +/* 7EBC74 80240F64 8C830018 */ lw $v1, 0x18($a0) +/* 7EBC78 80240F68 2442000A */ addiu $v0, $v0, 0xa +/* 7EBC7C 80240F6C AC820024 */ sw $v0, 0x24($a0) +/* 7EBC80 80240F70 8C82001C */ lw $v0, 0x1c($a0) +/* 7EBC84 80240F74 2463000A */ addiu $v1, $v1, 0xa +/* 7EBC88 80240F78 AC830018 */ sw $v1, 0x18($a0) +/* 7EBC8C 80240F7C 286300FF */ slti $v1, $v1, 0xff +/* 7EBC90 80240F80 2442000A */ addiu $v0, $v0, 0xa +/* 7EBC94 80240F84 AC82001C */ sw $v0, 0x1c($a0) +/* 7EBC98 80240F88 14600004 */ bnez $v1, .L80240F9C +/* 7EBC9C 80240F8C 0000102D */ daddu $v0, $zero, $zero +/* 7EBCA0 80240F90 240200FF */ addiu $v0, $zero, 0xff +/* 7EBCA4 80240F94 AC820018 */ sw $v0, 0x18($a0) +/* 7EBCA8 80240F98 24020002 */ addiu $v0, $zero, 2 +.L80240F9C: +/* 7EBCAC 80240F9C 8FBF0020 */ lw $ra, 0x20($sp) +/* 7EBCB0 80240FA0 8FB1001C */ lw $s1, 0x1c($sp) +/* 7EBCB4 80240FA4 8FB00018 */ lw $s0, 0x18($sp) +/* 7EBCB8 80240FA8 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 7EBCBC 80240FAC D7B40028 */ ldc1 $f20, 0x28($sp) +/* 7EBCC0 80240FB0 03E00008 */ jr $ra +/* 7EBCC4 80240FB4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8.s deleted file mode 100644 index cfb7958307..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FB8 -/* 7EBCC8 80240FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EBCCC 80240FBC 10A0000B */ beqz $a1, .L80240FEC -/* 7EBCD0 80240FC0 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EBCD4 80240FC4 3C038025 */ lui $v1, 0x8025 -/* 7EBCD8 80240FC8 8C635B94 */ lw $v1, 0x5b94($v1) -/* 7EBCDC 80240FCC 8C620000 */ lw $v0, ($v1) -/* 7EBCE0 80240FD0 3C048025 */ lui $a0, 0x8025 -/* 7EBCE4 80240FD4 8C845B98 */ lw $a0, 0x5b98($a0) -/* 7EBCE8 80240FD8 34420010 */ ori $v0, $v0, 0x10 -/* 7EBCEC 80240FDC AC620000 */ sw $v0, ($v1) -/* 7EBCF0 80240FE0 8C820000 */ lw $v0, ($a0) -/* 7EBCF4 80240FE4 34420010 */ ori $v0, $v0, 0x10 -/* 7EBCF8 80240FE8 AC820000 */ sw $v0, ($a0) -.L80240FEC: -/* 7EBCFC 80240FEC 3C048025 */ lui $a0, 0x8025 -/* 7EBD00 80240FF0 8C845B90 */ lw $a0, 0x5b90($a0) -/* 7EBD04 80240FF4 8C85000C */ lw $a1, 0xc($a0) -/* 7EBD08 80240FF8 8CA20018 */ lw $v0, 0x18($a1) -/* 7EBD0C 80240FFC 8CA30020 */ lw $v1, 0x20($a1) -/* 7EBD10 80241000 2442FFF6 */ addiu $v0, $v0, -0xa -/* 7EBD14 80241004 ACA20018 */ sw $v0, 0x18($a1) -/* 7EBD18 80241008 8CA20024 */ lw $v0, 0x24($a1) -/* 7EBD1C 8024100C 2463FFF6 */ addiu $v1, $v1, -0xa -/* 7EBD20 80241010 ACA30020 */ sw $v1, 0x20($a1) -/* 7EBD24 80241014 8CA30028 */ lw $v1, 0x28($a1) -/* 7EBD28 80241018 2442FFF6 */ addiu $v0, $v0, -0xa -/* 7EBD2C 8024101C ACA20024 */ sw $v0, 0x24($a1) -/* 7EBD30 80241020 8CA2001C */ lw $v0, 0x1c($a1) -/* 7EBD34 80241024 2463FFF6 */ addiu $v1, $v1, -0xa -/* 7EBD38 80241028 ACA30028 */ sw $v1, 0x28($a1) -/* 7EBD3C 8024102C 8CA30018 */ lw $v1, 0x18($a1) -/* 7EBD40 80241030 2442FFF6 */ addiu $v0, $v0, -0xa -/* 7EBD44 80241034 18600003 */ blez $v1, .L80241044 -/* 7EBD48 80241038 ACA2001C */ sw $v0, 0x1c($a1) -/* 7EBD4C 8024103C 08090418 */ j .L80241060 -/* 7EBD50 80241040 0000102D */ daddu $v0, $zero, $zero -.L80241044: -/* 7EBD54 80241044 0C016914 */ jal remove_effect -/* 7EBD58 80241048 ACA00018 */ sw $zero, 0x18($a1) -/* 7EBD5C 8024104C 3C048025 */ lui $a0, 0x8025 -/* 7EBD60 80241050 8C845B70 */ lw $a0, 0x5b70($a0) -/* 7EBD64 80241054 0C048D70 */ jal func_801235C0 -/* 7EBD68 80241058 00000000 */ nop -/* 7EBD6C 8024105C 24020002 */ addiu $v0, $zero, 2 -.L80241060: -/* 7EBD70 80241060 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EBD74 80241064 03E00008 */ jr $ra -/* 7EBD78 80241068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s new file mode 100644 index 0000000000..53e4982c25 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240FB8_7EBCC8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FB8_7EBCC8 +/* 7EBCC8 80240FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EBCCC 80240FBC 10A0000B */ beqz $a1, .L80240FEC +/* 7EBCD0 80240FC0 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EBCD4 80240FC4 3C038025 */ lui $v1, 0x8025 +/* 7EBCD8 80240FC8 8C635B94 */ lw $v1, 0x5b94($v1) +/* 7EBCDC 80240FCC 8C620000 */ lw $v0, ($v1) +/* 7EBCE0 80240FD0 3C048025 */ lui $a0, 0x8025 +/* 7EBCE4 80240FD4 8C845B98 */ lw $a0, 0x5b98($a0) +/* 7EBCE8 80240FD8 34420010 */ ori $v0, $v0, 0x10 +/* 7EBCEC 80240FDC AC620000 */ sw $v0, ($v1) +/* 7EBCF0 80240FE0 8C820000 */ lw $v0, ($a0) +/* 7EBCF4 80240FE4 34420010 */ ori $v0, $v0, 0x10 +/* 7EBCF8 80240FE8 AC820000 */ sw $v0, ($a0) +.L80240FEC: +/* 7EBCFC 80240FEC 3C048025 */ lui $a0, 0x8025 +/* 7EBD00 80240FF0 8C845B90 */ lw $a0, 0x5b90($a0) +/* 7EBD04 80240FF4 8C85000C */ lw $a1, 0xc($a0) +/* 7EBD08 80240FF8 8CA20018 */ lw $v0, 0x18($a1) +/* 7EBD0C 80240FFC 8CA30020 */ lw $v1, 0x20($a1) +/* 7EBD10 80241000 2442FFF6 */ addiu $v0, $v0, -0xa +/* 7EBD14 80241004 ACA20018 */ sw $v0, 0x18($a1) +/* 7EBD18 80241008 8CA20024 */ lw $v0, 0x24($a1) +/* 7EBD1C 8024100C 2463FFF6 */ addiu $v1, $v1, -0xa +/* 7EBD20 80241010 ACA30020 */ sw $v1, 0x20($a1) +/* 7EBD24 80241014 8CA30028 */ lw $v1, 0x28($a1) +/* 7EBD28 80241018 2442FFF6 */ addiu $v0, $v0, -0xa +/* 7EBD2C 8024101C ACA20024 */ sw $v0, 0x24($a1) +/* 7EBD30 80241020 8CA2001C */ lw $v0, 0x1c($a1) +/* 7EBD34 80241024 2463FFF6 */ addiu $v1, $v1, -0xa +/* 7EBD38 80241028 ACA30028 */ sw $v1, 0x28($a1) +/* 7EBD3C 8024102C 8CA30018 */ lw $v1, 0x18($a1) +/* 7EBD40 80241030 2442FFF6 */ addiu $v0, $v0, -0xa +/* 7EBD44 80241034 18600003 */ blez $v1, .L80241044 +/* 7EBD48 80241038 ACA2001C */ sw $v0, 0x1c($a1) +/* 7EBD4C 8024103C 08090418 */ j .L80241060 +/* 7EBD50 80241040 0000102D */ daddu $v0, $zero, $zero +.L80241044: +/* 7EBD54 80241044 0C016914 */ jal remove_effect +/* 7EBD58 80241048 ACA00018 */ sw $zero, 0x18($a1) +/* 7EBD5C 8024104C 3C048025 */ lui $a0, 0x8025 +/* 7EBD60 80241050 8C845B70 */ lw $a0, 0x5b70($a0) +/* 7EBD64 80241054 0C048D70 */ jal func_801235C0 +/* 7EBD68 80241058 00000000 */ nop +/* 7EBD6C 8024105C 24020002 */ addiu $v0, $zero, 2 +.L80241060: +/* 7EBD70 80241060 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EBD74 80241064 03E00008 */ jr $ra +/* 7EBD78 80241068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C.s deleted file mode 100644 index 407eee6329..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024106C -/* 7EBD7C 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EBD80 80241070 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EBD84 80241074 8C82000C */ lw $v0, 0xc($a0) -/* 7EBD88 80241078 0C0B1EAF */ jal get_variable -/* 7EBD8C 8024107C 8C450000 */ lw $a1, ($v0) -/* 7EBD90 80241080 3C038025 */ lui $v1, 0x8025 -/* 7EBD94 80241084 8C635B90 */ lw $v1, 0x5b90($v1) -/* 7EBD98 80241088 8C63000C */ lw $v1, 0xc($v1) -/* 7EBD9C 8024108C AC620034 */ sw $v0, 0x34($v1) -/* 7EBDA0 80241090 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EBDA4 80241094 24020002 */ addiu $v0, $zero, 2 -/* 7EBDA8 80241098 03E00008 */ jr $ra -/* 7EBDAC 8024109C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C_7EBD7C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C_7EBD7C.s new file mode 100644 index 0000000000..e8556c9b02 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024106C_7EBD7C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024106C_7EBD7C +/* 7EBD7C 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EBD80 80241070 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EBD84 80241074 8C82000C */ lw $v0, 0xc($a0) +/* 7EBD88 80241078 0C0B1EAF */ jal get_variable +/* 7EBD8C 8024107C 8C450000 */ lw $a1, ($v0) +/* 7EBD90 80241080 3C038025 */ lui $v1, 0x8025 +/* 7EBD94 80241084 8C635B90 */ lw $v1, 0x5b90($v1) +/* 7EBD98 80241088 8C63000C */ lw $v1, 0xc($v1) +/* 7EBD9C 8024108C AC620034 */ sw $v0, 0x34($v1) +/* 7EBDA0 80241090 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EBDA4 80241094 24020002 */ addiu $v0, $zero, 2 +/* 7EBDA8 80241098 03E00008 */ jr $ra +/* 7EBDAC 8024109C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0.s deleted file mode 100644 index 12ddfe6b53..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410A0 -/* 7EBDB0 802410A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EBDB4 802410A4 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EBDB8 802410A8 8C82000C */ lw $v0, 0xc($a0) -/* 7EBDBC 802410AC 0C0B1EAF */ jal get_variable -/* 7EBDC0 802410B0 8C450000 */ lw $a1, ($v0) -/* 7EBDC4 802410B4 0040202D */ daddu $a0, $v0, $zero -/* 7EBDC8 802410B8 3C028025 */ lui $v0, 0x8025 -/* 7EBDCC 802410BC 8C425B90 */ lw $v0, 0x5b90($v0) -/* 7EBDD0 802410C0 24030001 */ addiu $v1, $zero, 1 -/* 7EBDD4 802410C4 8C45000C */ lw $a1, 0xc($v0) -/* 7EBDD8 802410C8 1083000D */ beq $a0, $v1, .L80241100 -/* 7EBDDC 802410CC 28820002 */ slti $v0, $a0, 2 -/* 7EBDE0 802410D0 10400005 */ beqz $v0, .L802410E8 -/* 7EBDE4 802410D4 24020002 */ addiu $v0, $zero, 2 -/* 7EBDE8 802410D8 10800007 */ beqz $a0, .L802410F8 -/* 7EBDEC 802410DC 240200C0 */ addiu $v0, $zero, 0xc0 -/* 7EBDF0 802410E0 08090444 */ j .L80241110 -/* 7EBDF4 802410E4 ACA00038 */ sw $zero, 0x38($a1) -.L802410E8: -/* 7EBDF8 802410E8 10820008 */ beq $a0, $v0, .L8024110C -/* 7EBDFC 802410EC 24020040 */ addiu $v0, $zero, 0x40 -/* 7EBE00 802410F0 08090444 */ j .L80241110 -/* 7EBE04 802410F4 ACA00038 */ sw $zero, 0x38($a1) -.L802410F8: -/* 7EBE08 802410F8 08090444 */ j .L80241110 -/* 7EBE0C 802410FC ACA20038 */ sw $v0, 0x38($a1) -.L80241100: -/* 7EBE10 80241100 24020080 */ addiu $v0, $zero, 0x80 -/* 7EBE14 80241104 08090444 */ j .L80241110 -/* 7EBE18 80241108 ACA20038 */ sw $v0, 0x38($a1) -.L8024110C: -/* 7EBE1C 8024110C ACA20038 */ sw $v0, 0x38($a1) -.L80241110: -/* 7EBE20 80241110 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EBE24 80241114 24020002 */ addiu $v0, $zero, 2 -/* 7EBE28 80241118 03E00008 */ jr $ra -/* 7EBE2C 8024111C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0_7EBDB0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0_7EBDB0.s new file mode 100644 index 0000000000..d52ea2fb76 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802410A0_7EBDB0.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410A0_7EBDB0 +/* 7EBDB0 802410A0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EBDB4 802410A4 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EBDB8 802410A8 8C82000C */ lw $v0, 0xc($a0) +/* 7EBDBC 802410AC 0C0B1EAF */ jal get_variable +/* 7EBDC0 802410B0 8C450000 */ lw $a1, ($v0) +/* 7EBDC4 802410B4 0040202D */ daddu $a0, $v0, $zero +/* 7EBDC8 802410B8 3C028025 */ lui $v0, 0x8025 +/* 7EBDCC 802410BC 8C425B90 */ lw $v0, 0x5b90($v0) +/* 7EBDD0 802410C0 24030001 */ addiu $v1, $zero, 1 +/* 7EBDD4 802410C4 8C45000C */ lw $a1, 0xc($v0) +/* 7EBDD8 802410C8 1083000D */ beq $a0, $v1, .L80241100 +/* 7EBDDC 802410CC 28820002 */ slti $v0, $a0, 2 +/* 7EBDE0 802410D0 10400005 */ beqz $v0, .L802410E8 +/* 7EBDE4 802410D4 24020002 */ addiu $v0, $zero, 2 +/* 7EBDE8 802410D8 10800007 */ beqz $a0, .L802410F8 +/* 7EBDEC 802410DC 240200C0 */ addiu $v0, $zero, 0xc0 +/* 7EBDF0 802410E0 08090444 */ j .L80241110 +/* 7EBDF4 802410E4 ACA00038 */ sw $zero, 0x38($a1) +.L802410E8: +/* 7EBDF8 802410E8 10820008 */ beq $a0, $v0, .L8024110C +/* 7EBDFC 802410EC 24020040 */ addiu $v0, $zero, 0x40 +/* 7EBE00 802410F0 08090444 */ j .L80241110 +/* 7EBE04 802410F4 ACA00038 */ sw $zero, 0x38($a1) +.L802410F8: +/* 7EBE08 802410F8 08090444 */ j .L80241110 +/* 7EBE0C 802410FC ACA20038 */ sw $v0, 0x38($a1) +.L80241100: +/* 7EBE10 80241100 24020080 */ addiu $v0, $zero, 0x80 +/* 7EBE14 80241104 08090444 */ j .L80241110 +/* 7EBE18 80241108 ACA20038 */ sw $v0, 0x38($a1) +.L8024110C: +/* 7EBE1C 8024110C ACA20038 */ sw $v0, 0x38($a1) +.L80241110: +/* 7EBE20 80241110 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EBE24 80241114 24020002 */ addiu $v0, $zero, 2 +/* 7EBE28 80241118 03E00008 */ jr $ra +/* 7EBE2C 8024111C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120.s deleted file mode 100644 index fd47a525a6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241120 -/* 7EBE30 80241120 3C028025 */ lui $v0, 0x8025 -/* 7EBE34 80241124 8C425B98 */ lw $v0, 0x5b98($v0) -/* 7EBE38 80241128 8C42000C */ lw $v0, 0xc($v0) -/* 7EBE3C 8024112C AC40001C */ sw $zero, 0x1c($v0) -/* 7EBE40 80241130 03E00008 */ jr $ra -/* 7EBE44 80241134 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120_7EBE30.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120_7EBE30.s new file mode 100644 index 0000000000..53f1500e50 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241120_7EBE30.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241120_7EBE30 +/* 7EBE30 80241120 3C028025 */ lui $v0, 0x8025 +/* 7EBE34 80241124 8C425B98 */ lw $v0, 0x5b98($v0) +/* 7EBE38 80241128 8C42000C */ lw $v0, 0xc($v0) +/* 7EBE3C 8024112C AC40001C */ sw $zero, 0x1c($v0) +/* 7EBE40 80241130 03E00008 */ jr $ra +/* 7EBE44 80241134 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138.s deleted file mode 100644 index 68c8472f5c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241138 -/* 7EBE48 80241138 3C028025 */ lui $v0, 0x8025 -/* 7EBE4C 8024113C 8C425B98 */ lw $v0, 0x5b98($v0) -/* 7EBE50 80241140 8C43000C */ lw $v1, 0xc($v0) -/* 7EBE54 80241144 24020001 */ addiu $v0, $zero, 1 -/* 7EBE58 80241148 AC62001C */ sw $v0, 0x1c($v1) -/* 7EBE5C 8024114C 03E00008 */ jr $ra -/* 7EBE60 80241150 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138_7EBE48.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138_7EBE48.s new file mode 100644 index 0000000000..a9d51ba431 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241138_7EBE48.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241138_7EBE48 +/* 7EBE48 80241138 3C028025 */ lui $v0, 0x8025 +/* 7EBE4C 8024113C 8C425B98 */ lw $v0, 0x5b98($v0) +/* 7EBE50 80241140 8C43000C */ lw $v1, 0xc($v0) +/* 7EBE54 80241144 24020001 */ addiu $v0, $zero, 1 +/* 7EBE58 80241148 AC62001C */ sw $v0, 0x1c($v1) +/* 7EBE5C 8024114C 03E00008 */ jr $ra +/* 7EBE60 80241150 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154.s deleted file mode 100644 index 2a3332e723..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241154 -/* 7EBE64 80241154 3C028025 */ lui $v0, 0x8025 -/* 7EBE68 80241158 8C425B98 */ lw $v0, 0x5b98($v0) -/* 7EBE6C 8024115C 8C43000C */ lw $v1, 0xc($v0) -/* 7EBE70 80241160 24020002 */ addiu $v0, $zero, 2 -/* 7EBE74 80241164 03E00008 */ jr $ra -/* 7EBE78 80241168 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154_7EBE64.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154_7EBE64.s new file mode 100644 index 0000000000..56518ab4fc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241154_7EBE64.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241154_7EBE64 +/* 7EBE64 80241154 3C028025 */ lui $v0, 0x8025 +/* 7EBE68 80241158 8C425B98 */ lw $v0, 0x5b98($v0) +/* 7EBE6C 8024115C 8C43000C */ lw $v1, 0xc($v0) +/* 7EBE70 80241160 24020002 */ addiu $v0, $zero, 2 +/* 7EBE74 80241164 03E00008 */ jr $ra +/* 7EBE78 80241168 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C.s deleted file mode 100644 index 20f72298c5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024116C -/* 7EBE7C 8024116C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EBE80 80241170 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7EBE84 80241174 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7EBE88 80241178 3C05FE36 */ lui $a1, 0xfe36 -/* 7EBE8C 8024117C AFBF0010 */ sw $ra, 0x10($sp) -/* 7EBE90 80241180 80460075 */ lb $a2, 0x75($v0) -/* 7EBE94 80241184 0C0B2026 */ jal set_variable -/* 7EBE98 80241188 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 7EBE9C 8024118C 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EBEA0 80241190 24020002 */ addiu $v0, $zero, 2 -/* 7EBEA4 80241194 03E00008 */ jr $ra -/* 7EBEA8 80241198 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s new file mode 100644 index 0000000000..d7ffbd5013 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024116C_7EBE7C +/* 7EBE7C 8024116C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EBE80 80241170 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 7EBE84 80241174 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 7EBE88 80241178 3C05FE36 */ lui $a1, 0xfe36 +/* 7EBE8C 8024117C AFBF0010 */ sw $ra, 0x10($sp) +/* 7EBE90 80241180 80460075 */ lb $a2, 0x75($v0) +/* 7EBE94 80241184 0C0B2026 */ jal set_variable +/* 7EBE98 80241188 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 7EBE9C 8024118C 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EBEA0 80241190 24020002 */ addiu $v0, $zero, 2 +/* 7EBEA4 80241194 03E00008 */ jr $ra +/* 7EBEA8 80241198 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C.s deleted file mode 100644 index 9c92466858..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024119C -/* 7EBEAC 8024119C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EBEB0 802411A0 AFB10014 */ sw $s1, 0x14($sp) -/* 7EBEB4 802411A4 0080882D */ daddu $s1, $a0, $zero -/* 7EBEB8 802411A8 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EBEBC 802411AC AFB00010 */ sw $s0, 0x10($sp) -/* 7EBEC0 802411B0 8E30000C */ lw $s0, 0xc($s1) -/* 7EBEC4 802411B4 8E050000 */ lw $a1, ($s0) -/* 7EBEC8 802411B8 0C0B1EAF */ jal get_variable -/* 7EBECC 802411BC 26100004 */ addiu $s0, $s0, 4 -/* 7EBED0 802411C0 0220202D */ daddu $a0, $s1, $zero -/* 7EBED4 802411C4 8E050000 */ lw $a1, ($s0) -/* 7EBED8 802411C8 0C0B210B */ jal get_float_variable -/* 7EBEDC 802411CC 0040802D */ daddu $s0, $v0, $zero -/* 7EBEE0 802411D0 24020002 */ addiu $v0, $zero, 2 -/* 7EBEE4 802411D4 00501804 */ sllv $v1, $s0, $v0 -/* 7EBEE8 802411D8 00701821 */ addu $v1, $v1, $s0 -/* 7EBEEC 802411DC 00431804 */ sllv $v1, $v1, $v0 -/* 7EBEF0 802411E0 00701823 */ subu $v1, $v1, $s0 -/* 7EBEF4 802411E4 000320C0 */ sll $a0, $v1, 3 -/* 7EBEF8 802411E8 00641821 */ addu $v1, $v1, $a0 -/* 7EBEFC 802411EC 000318C0 */ sll $v1, $v1, 3 -/* 7EBF00 802411F0 3C01800B */ lui $at, 0x800b -/* 7EBF04 802411F4 00230821 */ addu $at, $at, $v1 -/* 7EBF08 802411F8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 7EBF0C 802411FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EBF10 80241200 8FB10014 */ lw $s1, 0x14($sp) -/* 7EBF14 80241204 8FB00010 */ lw $s0, 0x10($sp) -/* 7EBF18 80241208 03E00008 */ jr $ra -/* 7EBF1C 8024120C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s new file mode 100644 index 0000000000..eb859083fc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024119C_7EBEAC +/* 7EBEAC 8024119C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EBEB0 802411A0 AFB10014 */ sw $s1, 0x14($sp) +/* 7EBEB4 802411A4 0080882D */ daddu $s1, $a0, $zero +/* 7EBEB8 802411A8 AFBF0018 */ sw $ra, 0x18($sp) +/* 7EBEBC 802411AC AFB00010 */ sw $s0, 0x10($sp) +/* 7EBEC0 802411B0 8E30000C */ lw $s0, 0xc($s1) +/* 7EBEC4 802411B4 8E050000 */ lw $a1, ($s0) +/* 7EBEC8 802411B8 0C0B1EAF */ jal get_variable +/* 7EBECC 802411BC 26100004 */ addiu $s0, $s0, 4 +/* 7EBED0 802411C0 0220202D */ daddu $a0, $s1, $zero +/* 7EBED4 802411C4 8E050000 */ lw $a1, ($s0) +/* 7EBED8 802411C8 0C0B210B */ jal get_float_variable +/* 7EBEDC 802411CC 0040802D */ daddu $s0, $v0, $zero +/* 7EBEE0 802411D0 24020002 */ addiu $v0, $zero, 2 +/* 7EBEE4 802411D4 00501804 */ sllv $v1, $s0, $v0 +/* 7EBEE8 802411D8 00701821 */ addu $v1, $v1, $s0 +/* 7EBEEC 802411DC 00431804 */ sllv $v1, $v1, $v0 +/* 7EBEF0 802411E0 00701823 */ subu $v1, $v1, $s0 +/* 7EBEF4 802411E4 000320C0 */ sll $a0, $v1, 3 +/* 7EBEF8 802411E8 00641821 */ addu $v1, $v1, $a0 +/* 7EBEFC 802411EC 000318C0 */ sll $v1, $v1, 3 +/* 7EBF00 802411F0 3C01800B */ lui $at, 0x800b +/* 7EBF04 802411F4 00230821 */ addu $at, $at, $v1 +/* 7EBF08 802411F8 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 7EBF0C 802411FC 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EBF10 80241200 8FB10014 */ lw $s1, 0x14($sp) +/* 7EBF14 80241204 8FB00010 */ lw $s0, 0x10($sp) +/* 7EBF18 80241208 03E00008 */ jr $ra +/* 7EBF1C 8024120C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210.s deleted file mode 100644 index e5f6878ad0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210 -/* 7EBF20 80241210 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EBF24 80241214 AFB10014 */ sw $s1, 0x14($sp) -/* 7EBF28 80241218 0080882D */ daddu $s1, $a0, $zero -/* 7EBF2C 8024121C AFBF0018 */ sw $ra, 0x18($sp) -/* 7EBF30 80241220 AFB00010 */ sw $s0, 0x10($sp) -/* 7EBF34 80241224 8E30000C */ lw $s0, 0xc($s1) -/* 7EBF38 80241228 8E050000 */ lw $a1, ($s0) -/* 7EBF3C 8024122C 0C0B1EAF */ jal get_variable -/* 7EBF40 80241230 26100004 */ addiu $s0, $s0, 4 -/* 7EBF44 80241234 00021880 */ sll $v1, $v0, 2 -/* 7EBF48 80241238 00621821 */ addu $v1, $v1, $v0 -/* 7EBF4C 8024123C 00031880 */ sll $v1, $v1, 2 -/* 7EBF50 80241240 00621823 */ subu $v1, $v1, $v0 -/* 7EBF54 80241244 000310C0 */ sll $v0, $v1, 3 -/* 7EBF58 80241248 00621821 */ addu $v1, $v1, $v0 -/* 7EBF5C 8024124C 000318C0 */ sll $v1, $v1, 3 -/* 7EBF60 80241250 3C01800B */ lui $at, 0x800b -/* 7EBF64 80241254 00230821 */ addu $at, $at, $v1 -/* 7EBF68 80241258 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 7EBF6C 8024125C 3C014480 */ lui $at, 0x4480 -/* 7EBF70 80241260 44810000 */ mtc1 $at, $f0 -/* 7EBF74 80241264 00000000 */ nop -/* 7EBF78 80241268 46001082 */ mul.s $f2, $f2, $f0 -/* 7EBF7C 8024126C 00000000 */ nop -/* 7EBF80 80241270 3C01CD5B */ lui $at, 0xcd5b -/* 7EBF84 80241274 34215858 */ ori $at, $at, 0x5858 -/* 7EBF88 80241278 44810000 */ mtc1 $at, $f0 -/* 7EBF8C 8024127C 00000000 */ nop -/* 7EBF90 80241280 46001080 */ add.s $f2, $f2, $f0 -/* 7EBF94 80241284 8E050000 */ lw $a1, ($s0) -/* 7EBF98 80241288 4600110D */ trunc.w.s $f4, $f2 -/* 7EBF9C 8024128C 44062000 */ mfc1 $a2, $f4 -/* 7EBFA0 80241290 0C0B2026 */ jal set_variable -/* 7EBFA4 80241294 0220202D */ daddu $a0, $s1, $zero -/* 7EBFA8 80241298 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EBFAC 8024129C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EBFB0 802412A0 8FB00010 */ lw $s0, 0x10($sp) -/* 7EBFB4 802412A4 24020002 */ addiu $v0, $zero, 2 -/* 7EBFB8 802412A8 03E00008 */ jr $ra -/* 7EBFBC 802412AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s new file mode 100644 index 0000000000..7548e188d1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241210_7EBF20 +/* 7EBF20 80241210 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EBF24 80241214 AFB10014 */ sw $s1, 0x14($sp) +/* 7EBF28 80241218 0080882D */ daddu $s1, $a0, $zero +/* 7EBF2C 8024121C AFBF0018 */ sw $ra, 0x18($sp) +/* 7EBF30 80241220 AFB00010 */ sw $s0, 0x10($sp) +/* 7EBF34 80241224 8E30000C */ lw $s0, 0xc($s1) +/* 7EBF38 80241228 8E050000 */ lw $a1, ($s0) +/* 7EBF3C 8024122C 0C0B1EAF */ jal get_variable +/* 7EBF40 80241230 26100004 */ addiu $s0, $s0, 4 +/* 7EBF44 80241234 00021880 */ sll $v1, $v0, 2 +/* 7EBF48 80241238 00621821 */ addu $v1, $v1, $v0 +/* 7EBF4C 8024123C 00031880 */ sll $v1, $v1, 2 +/* 7EBF50 80241240 00621823 */ subu $v1, $v1, $v0 +/* 7EBF54 80241244 000310C0 */ sll $v0, $v1, 3 +/* 7EBF58 80241248 00621821 */ addu $v1, $v1, $v0 +/* 7EBF5C 8024124C 000318C0 */ sll $v1, $v1, 3 +/* 7EBF60 80241250 3C01800B */ lui $at, 0x800b +/* 7EBF64 80241254 00230821 */ addu $at, $at, $v1 +/* 7EBF68 80241258 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 7EBF6C 8024125C 3C014480 */ lui $at, 0x4480 +/* 7EBF70 80241260 44810000 */ mtc1 $at, $f0 +/* 7EBF74 80241264 00000000 */ nop +/* 7EBF78 80241268 46001082 */ mul.s $f2, $f2, $f0 +/* 7EBF7C 8024126C 00000000 */ nop +/* 7EBF80 80241270 3C01CD5B */ lui $at, 0xcd5b +/* 7EBF84 80241274 34215858 */ ori $at, $at, 0x5858 +/* 7EBF88 80241278 44810000 */ mtc1 $at, $f0 +/* 7EBF8C 8024127C 00000000 */ nop +/* 7EBF90 80241280 46001080 */ add.s $f2, $f2, $f0 +/* 7EBF94 80241284 8E050000 */ lw $a1, ($s0) +/* 7EBF98 80241288 4600110D */ trunc.w.s $f4, $f2 +/* 7EBF9C 8024128C 44062000 */ mfc1 $a2, $f4 +/* 7EBFA0 80241290 0C0B2026 */ jal set_variable +/* 7EBFA4 80241294 0220202D */ daddu $a0, $s1, $zero +/* 7EBFA8 80241298 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EBFAC 8024129C 8FB10014 */ lw $s1, 0x14($sp) +/* 7EBFB0 802412A0 8FB00010 */ lw $s0, 0x10($sp) +/* 7EBFB4 802412A4 24020002 */ addiu $v0, $zero, 2 +/* 7EBFB8 802412A8 03E00008 */ jr $ra +/* 7EBFBC 802412AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0.s deleted file mode 100644 index f0f074b686..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B0 -/* 7EBFC0 802412B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7EBFC4 802412B4 AFB20018 */ sw $s2, 0x18($sp) -/* 7EBFC8 802412B8 0080902D */ daddu $s2, $a0, $zero -/* 7EBFCC 802412BC AFBF0030 */ sw $ra, 0x30($sp) -/* 7EBFD0 802412C0 AFB7002C */ sw $s7, 0x2c($sp) -/* 7EBFD4 802412C4 AFB60028 */ sw $s6, 0x28($sp) -/* 7EBFD8 802412C8 AFB50024 */ sw $s5, 0x24($sp) -/* 7EBFDC 802412CC AFB40020 */ sw $s4, 0x20($sp) -/* 7EBFE0 802412D0 AFB3001C */ sw $s3, 0x1c($sp) -/* 7EBFE4 802412D4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EBFE8 802412D8 AFB00010 */ sw $s0, 0x10($sp) -/* 7EBFEC 802412DC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 7EBFF0 802412E0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 7EBFF4 802412E4 8E50000C */ lw $s0, 0xc($s2) -/* 7EBFF8 802412E8 8E050000 */ lw $a1, ($s0) -/* 7EBFFC 802412EC 0C0B1EAF */ jal get_variable -/* 7EC000 802412F0 26100004 */ addiu $s0, $s0, 4 -/* 7EC004 802412F4 8E050000 */ lw $a1, ($s0) -/* 7EC008 802412F8 26100004 */ addiu $s0, $s0, 4 -/* 7EC00C 802412FC 0240202D */ daddu $a0, $s2, $zero -/* 7EC010 80241300 0C0B1EAF */ jal get_variable -/* 7EC014 80241304 0040B82D */ daddu $s7, $v0, $zero -/* 7EC018 80241308 8E050000 */ lw $a1, ($s0) -/* 7EC01C 8024130C 26100004 */ addiu $s0, $s0, 4 -/* 7EC020 80241310 0240202D */ daddu $a0, $s2, $zero -/* 7EC024 80241314 0C0B1EAF */ jal get_variable -/* 7EC028 80241318 0040B02D */ daddu $s6, $v0, $zero -/* 7EC02C 8024131C 0240202D */ daddu $a0, $s2, $zero -/* 7EC030 80241320 3C05F4AC */ lui $a1, 0xf4ac -/* 7EC034 80241324 34A5D481 */ ori $a1, $a1, 0xd481 -/* 7EC038 80241328 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 7EC03C 8024132C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 7EC040 80241330 8E140000 */ lw $s4, ($s0) -/* 7EC044 80241334 00061880 */ sll $v1, $a2, 2 -/* 7EC048 80241338 00661821 */ addu $v1, $v1, $a2 -/* 7EC04C 8024133C 00031880 */ sll $v1, $v1, 2 -/* 7EC050 80241340 00661823 */ subu $v1, $v1, $a2 -/* 7EC054 80241344 000330C0 */ sll $a2, $v1, 3 -/* 7EC058 80241348 00661821 */ addu $v1, $v1, $a2 -/* 7EC05C 8024134C 000318C0 */ sll $v1, $v1, 3 -/* 7EC060 80241350 3C01800B */ lui $at, 0x800b -/* 7EC064 80241354 00230821 */ addu $at, $at, $v1 -/* 7EC068 80241358 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 7EC06C 8024135C 8E150004 */ lw $s5, 4($s0) -/* 7EC070 80241360 4600010D */ trunc.w.s $f4, $f0 -/* 7EC074 80241364 44112000 */ mfc1 $s1, $f4 -/* 7EC078 80241368 0C0B1EAF */ jal get_variable -/* 7EC07C 8024136C 0040982D */ daddu $s3, $v0, $zero -/* 7EC080 80241370 4491B000 */ mtc1 $s1, $f22 -/* 7EC084 80241374 00000000 */ nop -/* 7EC088 80241378 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7EC08C 8024137C 4600B306 */ mov.s $f12, $f22 -/* 7EC090 80241380 0C00A8D4 */ jal cos_deg -/* 7EC094 80241384 0040802D */ daddu $s0, $v0, $zero -/* 7EC098 80241388 4493A000 */ mtc1 $s3, $f20 -/* 7EC09C 8024138C 00000000 */ nop -/* 7EC0A0 80241390 4680A520 */ cvt.s.w $f20, $f20 -/* 7EC0A4 80241394 4600A002 */ mul.s $f0, $f20, $f0 -/* 7EC0A8 80241398 00000000 */ nop -/* 7EC0AC 8024139C 0240202D */ daddu $a0, $s2, $zero -/* 7EC0B0 802413A0 44901000 */ mtc1 $s0, $f2 -/* 7EC0B4 802413A4 00000000 */ nop -/* 7EC0B8 802413A8 468010A0 */ cvt.s.w $f2, $f2 -/* 7EC0BC 802413AC 46001081 */ sub.s $f2, $f2, $f0 -/* 7EC0C0 802413B0 3C05F4AC */ lui $a1, 0xf4ac -/* 7EC0C4 802413B4 4600110D */ trunc.w.s $f4, $f2 -/* 7EC0C8 802413B8 44102000 */ mfc1 $s0, $f4 -/* 7EC0CC 802413BC 0C0B1EAF */ jal get_variable -/* 7EC0D0 802413C0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 7EC0D4 802413C4 4600B306 */ mov.s $f12, $f22 -/* 7EC0D8 802413C8 0C00A8BB */ jal sin_deg -/* 7EC0DC 802413CC 0040882D */ daddu $s1, $v0, $zero -/* 7EC0E0 802413D0 4600A502 */ mul.s $f20, $f20, $f0 -/* 7EC0E4 802413D4 00000000 */ nop -/* 7EC0E8 802413D8 0240202D */ daddu $a0, $s2, $zero -/* 7EC0EC 802413DC 44910000 */ mtc1 $s1, $f0 -/* 7EC0F0 802413E0 00000000 */ nop -/* 7EC0F4 802413E4 46800020 */ cvt.s.w $f0, $f0 -/* 7EC0F8 802413E8 46140001 */ sub.s $f0, $f0, $f20 -/* 7EC0FC 802413EC 0280282D */ daddu $a1, $s4, $zero -/* 7EC100 802413F0 02173023 */ subu $a2, $s0, $s7 -/* 7EC104 802413F4 4600010D */ trunc.w.s $f4, $f0 -/* 7EC108 802413F8 44102000 */ mfc1 $s0, $f4 -/* 7EC10C 802413FC 0C0B2026 */ jal set_variable -/* 7EC110 80241400 02168023 */ subu $s0, $s0, $s6 -/* 7EC114 80241404 0240202D */ daddu $a0, $s2, $zero -/* 7EC118 80241408 02A0282D */ daddu $a1, $s5, $zero -/* 7EC11C 8024140C 0C0B2026 */ jal set_variable -/* 7EC120 80241410 0200302D */ daddu $a2, $s0, $zero -/* 7EC124 80241414 8FBF0030 */ lw $ra, 0x30($sp) -/* 7EC128 80241418 8FB7002C */ lw $s7, 0x2c($sp) -/* 7EC12C 8024141C 8FB60028 */ lw $s6, 0x28($sp) -/* 7EC130 80241420 8FB50024 */ lw $s5, 0x24($sp) -/* 7EC134 80241424 8FB40020 */ lw $s4, 0x20($sp) -/* 7EC138 80241428 8FB3001C */ lw $s3, 0x1c($sp) -/* 7EC13C 8024142C 8FB20018 */ lw $s2, 0x18($sp) -/* 7EC140 80241430 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC144 80241434 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC148 80241438 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 7EC14C 8024143C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 7EC150 80241440 24020002 */ addiu $v0, $zero, 2 -/* 7EC154 80241444 03E00008 */ jr $ra -/* 7EC158 80241448 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s new file mode 100644 index 0000000000..1eced077b2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412B0_7EBFC0 +/* 7EBFC0 802412B0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 7EBFC4 802412B4 AFB20018 */ sw $s2, 0x18($sp) +/* 7EBFC8 802412B8 0080902D */ daddu $s2, $a0, $zero +/* 7EBFCC 802412BC AFBF0030 */ sw $ra, 0x30($sp) +/* 7EBFD0 802412C0 AFB7002C */ sw $s7, 0x2c($sp) +/* 7EBFD4 802412C4 AFB60028 */ sw $s6, 0x28($sp) +/* 7EBFD8 802412C8 AFB50024 */ sw $s5, 0x24($sp) +/* 7EBFDC 802412CC AFB40020 */ sw $s4, 0x20($sp) +/* 7EBFE0 802412D0 AFB3001C */ sw $s3, 0x1c($sp) +/* 7EBFE4 802412D4 AFB10014 */ sw $s1, 0x14($sp) +/* 7EBFE8 802412D8 AFB00010 */ sw $s0, 0x10($sp) +/* 7EBFEC 802412DC F7B60040 */ sdc1 $f22, 0x40($sp) +/* 7EBFF0 802412E0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 7EBFF4 802412E4 8E50000C */ lw $s0, 0xc($s2) +/* 7EBFF8 802412E8 8E050000 */ lw $a1, ($s0) +/* 7EBFFC 802412EC 0C0B1EAF */ jal get_variable +/* 7EC000 802412F0 26100004 */ addiu $s0, $s0, 4 +/* 7EC004 802412F4 8E050000 */ lw $a1, ($s0) +/* 7EC008 802412F8 26100004 */ addiu $s0, $s0, 4 +/* 7EC00C 802412FC 0240202D */ daddu $a0, $s2, $zero +/* 7EC010 80241300 0C0B1EAF */ jal get_variable +/* 7EC014 80241304 0040B82D */ daddu $s7, $v0, $zero +/* 7EC018 80241308 8E050000 */ lw $a1, ($s0) +/* 7EC01C 8024130C 26100004 */ addiu $s0, $s0, 4 +/* 7EC020 80241310 0240202D */ daddu $a0, $s2, $zero +/* 7EC024 80241314 0C0B1EAF */ jal get_variable +/* 7EC028 80241318 0040B02D */ daddu $s6, $v0, $zero +/* 7EC02C 8024131C 0240202D */ daddu $a0, $s2, $zero +/* 7EC030 80241320 3C05F4AC */ lui $a1, 0xf4ac +/* 7EC034 80241324 34A5D481 */ ori $a1, $a1, 0xd481 +/* 7EC038 80241328 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* 7EC03C 8024132C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* 7EC040 80241330 8E140000 */ lw $s4, ($s0) +/* 7EC044 80241334 00061880 */ sll $v1, $a2, 2 +/* 7EC048 80241338 00661821 */ addu $v1, $v1, $a2 +/* 7EC04C 8024133C 00031880 */ sll $v1, $v1, 2 +/* 7EC050 80241340 00661823 */ subu $v1, $v1, $a2 +/* 7EC054 80241344 000330C0 */ sll $a2, $v1, 3 +/* 7EC058 80241348 00661821 */ addu $v1, $v1, $a2 +/* 7EC05C 8024134C 000318C0 */ sll $v1, $v1, 3 +/* 7EC060 80241350 3C01800B */ lui $at, 0x800b +/* 7EC064 80241354 00230821 */ addu $at, $at, $v1 +/* 7EC068 80241358 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 7EC06C 8024135C 8E150004 */ lw $s5, 4($s0) +/* 7EC070 80241360 4600010D */ trunc.w.s $f4, $f0 +/* 7EC074 80241364 44112000 */ mfc1 $s1, $f4 +/* 7EC078 80241368 0C0B1EAF */ jal get_variable +/* 7EC07C 8024136C 0040982D */ daddu $s3, $v0, $zero +/* 7EC080 80241370 4491B000 */ mtc1 $s1, $f22 +/* 7EC084 80241374 00000000 */ nop +/* 7EC088 80241378 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7EC08C 8024137C 4600B306 */ mov.s $f12, $f22 +/* 7EC090 80241380 0C00A8D4 */ jal cos_deg +/* 7EC094 80241384 0040802D */ daddu $s0, $v0, $zero +/* 7EC098 80241388 4493A000 */ mtc1 $s3, $f20 +/* 7EC09C 8024138C 00000000 */ nop +/* 7EC0A0 80241390 4680A520 */ cvt.s.w $f20, $f20 +/* 7EC0A4 80241394 4600A002 */ mul.s $f0, $f20, $f0 +/* 7EC0A8 80241398 00000000 */ nop +/* 7EC0AC 8024139C 0240202D */ daddu $a0, $s2, $zero +/* 7EC0B0 802413A0 44901000 */ mtc1 $s0, $f2 +/* 7EC0B4 802413A4 00000000 */ nop +/* 7EC0B8 802413A8 468010A0 */ cvt.s.w $f2, $f2 +/* 7EC0BC 802413AC 46001081 */ sub.s $f2, $f2, $f0 +/* 7EC0C0 802413B0 3C05F4AC */ lui $a1, 0xf4ac +/* 7EC0C4 802413B4 4600110D */ trunc.w.s $f4, $f2 +/* 7EC0C8 802413B8 44102000 */ mfc1 $s0, $f4 +/* 7EC0CC 802413BC 0C0B1EAF */ jal get_variable +/* 7EC0D0 802413C0 34A5D483 */ ori $a1, $a1, 0xd483 +/* 7EC0D4 802413C4 4600B306 */ mov.s $f12, $f22 +/* 7EC0D8 802413C8 0C00A8BB */ jal sin_deg +/* 7EC0DC 802413CC 0040882D */ daddu $s1, $v0, $zero +/* 7EC0E0 802413D0 4600A502 */ mul.s $f20, $f20, $f0 +/* 7EC0E4 802413D4 00000000 */ nop +/* 7EC0E8 802413D8 0240202D */ daddu $a0, $s2, $zero +/* 7EC0EC 802413DC 44910000 */ mtc1 $s1, $f0 +/* 7EC0F0 802413E0 00000000 */ nop +/* 7EC0F4 802413E4 46800020 */ cvt.s.w $f0, $f0 +/* 7EC0F8 802413E8 46140001 */ sub.s $f0, $f0, $f20 +/* 7EC0FC 802413EC 0280282D */ daddu $a1, $s4, $zero +/* 7EC100 802413F0 02173023 */ subu $a2, $s0, $s7 +/* 7EC104 802413F4 4600010D */ trunc.w.s $f4, $f0 +/* 7EC108 802413F8 44102000 */ mfc1 $s0, $f4 +/* 7EC10C 802413FC 0C0B2026 */ jal set_variable +/* 7EC110 80241400 02168023 */ subu $s0, $s0, $s6 +/* 7EC114 80241404 0240202D */ daddu $a0, $s2, $zero +/* 7EC118 80241408 02A0282D */ daddu $a1, $s5, $zero +/* 7EC11C 8024140C 0C0B2026 */ jal set_variable +/* 7EC120 80241410 0200302D */ daddu $a2, $s0, $zero +/* 7EC124 80241414 8FBF0030 */ lw $ra, 0x30($sp) +/* 7EC128 80241418 8FB7002C */ lw $s7, 0x2c($sp) +/* 7EC12C 8024141C 8FB60028 */ lw $s6, 0x28($sp) +/* 7EC130 80241420 8FB50024 */ lw $s5, 0x24($sp) +/* 7EC134 80241424 8FB40020 */ lw $s4, 0x20($sp) +/* 7EC138 80241428 8FB3001C */ lw $s3, 0x1c($sp) +/* 7EC13C 8024142C 8FB20018 */ lw $s2, 0x18($sp) +/* 7EC140 80241430 8FB10014 */ lw $s1, 0x14($sp) +/* 7EC144 80241434 8FB00010 */ lw $s0, 0x10($sp) +/* 7EC148 80241438 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 7EC14C 8024143C D7B40038 */ ldc1 $f20, 0x38($sp) +/* 7EC150 80241440 24020002 */ addiu $v0, $zero, 2 +/* 7EC154 80241444 03E00008 */ jr $ra +/* 7EC158 80241448 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C.s deleted file mode 100644 index d8948daed4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024144C -/* 7EC15C 8024144C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 7EC160 80241450 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 7EC164 80241454 10A00002 */ beqz $a1, .L80241460 -/* 7EC168 80241458 2402003C */ addiu $v0, $zero, 0x3c -/* 7EC16C 8024145C AC820070 */ sw $v0, 0x70($a0) -.L80241460: -/* 7EC170 80241460 C4620080 */ lwc1 $f2, 0x80($v1) -/* 7EC174 80241464 3C0141F0 */ lui $at, 0x41f0 -/* 7EC178 80241468 44810000 */ mtc1 $at, $f0 -/* 7EC17C 8024146C 00000000 */ nop -/* 7EC180 80241470 46001000 */ add.s $f0, $f2, $f0 -/* 7EC184 80241474 3C0143B4 */ lui $at, 0x43b4 -/* 7EC188 80241478 44811000 */ mtc1 $at, $f2 -/* 7EC18C 8024147C 00000000 */ nop -/* 7EC190 80241480 4600103E */ c.le.s $f2, $f0 -/* 7EC194 80241484 00000000 */ nop -/* 7EC198 80241488 45000003 */ bc1f .L80241498 -/* 7EC19C 8024148C E4600080 */ swc1 $f0, 0x80($v1) -/* 7EC1A0 80241490 46020001 */ sub.s $f0, $f0, $f2 -/* 7EC1A4 80241494 E4600080 */ swc1 $f0, 0x80($v1) -.L80241498: -/* 7EC1A8 80241498 8C820070 */ lw $v0, 0x70($a0) -/* 7EC1AC 8024149C 2442FFFF */ addiu $v0, $v0, -1 -/* 7EC1B0 802414A0 AC820070 */ sw $v0, 0x70($a0) -/* 7EC1B4 802414A4 000217C3 */ sra $v0, $v0, 0x1f -/* 7EC1B8 802414A8 03E00008 */ jr $ra -/* 7EC1BC 802414AC 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s new file mode 100644 index 0000000000..7d0fd6b7af --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024144C_7EC15C +/* 7EC15C 8024144C 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 7EC160 80241450 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 7EC164 80241454 10A00002 */ beqz $a1, .L80241460 +/* 7EC168 80241458 2402003C */ addiu $v0, $zero, 0x3c +/* 7EC16C 8024145C AC820070 */ sw $v0, 0x70($a0) +.L80241460: +/* 7EC170 80241460 C4620080 */ lwc1 $f2, 0x80($v1) +/* 7EC174 80241464 3C0141F0 */ lui $at, 0x41f0 +/* 7EC178 80241468 44810000 */ mtc1 $at, $f0 +/* 7EC17C 8024146C 00000000 */ nop +/* 7EC180 80241470 46001000 */ add.s $f0, $f2, $f0 +/* 7EC184 80241474 3C0143B4 */ lui $at, 0x43b4 +/* 7EC188 80241478 44811000 */ mtc1 $at, $f2 +/* 7EC18C 8024147C 00000000 */ nop +/* 7EC190 80241480 4600103E */ c.le.s $f2, $f0 +/* 7EC194 80241484 00000000 */ nop +/* 7EC198 80241488 45000003 */ bc1f .L80241498 +/* 7EC19C 8024148C E4600080 */ swc1 $f0, 0x80($v1) +/* 7EC1A0 80241490 46020001 */ sub.s $f0, $f0, $f2 +/* 7EC1A4 80241494 E4600080 */ swc1 $f0, 0x80($v1) +.L80241498: +/* 7EC1A8 80241498 8C820070 */ lw $v0, 0x70($a0) +/* 7EC1AC 8024149C 2442FFFF */ addiu $v0, $v0, -1 +/* 7EC1B0 802414A0 AC820070 */ sw $v0, 0x70($a0) +/* 7EC1B4 802414A4 000217C3 */ sra $v0, $v0, 0x1f +/* 7EC1B8 802414A8 03E00008 */ jr $ra +/* 7EC1BC 802414AC 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0.s deleted file mode 100644 index b5f053e679..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414B0 -/* 7EC1C0 802414B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EC1C4 802414B4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EC1C8 802414B8 0080882D */ daddu $s1, $a0, $zero -/* 7EC1CC 802414BC AFB00010 */ sw $s0, 0x10($sp) -/* 7EC1D0 802414C0 00A0802D */ daddu $s0, $a1, $zero -/* 7EC1D4 802414C4 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EC1D8 802414C8 0C00EABB */ jal get_npc_unsafe -/* 7EC1DC 802414CC 2404FFFC */ addiu $a0, $zero, -4 -/* 7EC1E0 802414D0 12000003 */ beqz $s0, .L802414E0 -/* 7EC1E4 802414D4 0040182D */ daddu $v1, $v0, $zero -/* 7EC1E8 802414D8 2402003C */ addiu $v0, $zero, 0x3c -/* 7EC1EC 802414DC AE220070 */ sw $v0, 0x70($s1) -.L802414E0: -/* 7EC1F0 802414E0 C462000C */ lwc1 $f2, 0xc($v1) -/* 7EC1F4 802414E4 3C0141F0 */ lui $at, 0x41f0 -/* 7EC1F8 802414E8 44810000 */ mtc1 $at, $f0 -/* 7EC1FC 802414EC 00000000 */ nop -/* 7EC200 802414F0 46001000 */ add.s $f0, $f2, $f0 -/* 7EC204 802414F4 3C0143B4 */ lui $at, 0x43b4 -/* 7EC208 802414F8 44811000 */ mtc1 $at, $f2 -/* 7EC20C 802414FC 00000000 */ nop -/* 7EC210 80241500 4600103E */ c.le.s $f2, $f0 -/* 7EC214 80241504 00000000 */ nop -/* 7EC218 80241508 45000003 */ bc1f .L80241518 -/* 7EC21C 8024150C E460000C */ swc1 $f0, 0xc($v1) -/* 7EC220 80241510 46020001 */ sub.s $f0, $f0, $f2 -/* 7EC224 80241514 E460000C */ swc1 $f0, 0xc($v1) -.L80241518: -/* 7EC228 80241518 8E230070 */ lw $v1, 0x70($s1) -/* 7EC22C 8024151C 2463FFFF */ addiu $v1, $v1, -1 -/* 7EC230 80241520 000317C3 */ sra $v0, $v1, 0x1f -/* 7EC234 80241524 AE230070 */ sw $v1, 0x70($s1) -/* 7EC238 80241528 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EC23C 8024152C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC240 80241530 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC244 80241534 30420002 */ andi $v0, $v0, 2 -/* 7EC248 80241538 03E00008 */ jr $ra -/* 7EC24C 8024153C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s new file mode 100644 index 0000000000..7cf24cd05d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414B0_7EC1C0 +/* 7EC1C0 802414B0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EC1C4 802414B4 AFB10014 */ sw $s1, 0x14($sp) +/* 7EC1C8 802414B8 0080882D */ daddu $s1, $a0, $zero +/* 7EC1CC 802414BC AFB00010 */ sw $s0, 0x10($sp) +/* 7EC1D0 802414C0 00A0802D */ daddu $s0, $a1, $zero +/* 7EC1D4 802414C4 AFBF0018 */ sw $ra, 0x18($sp) +/* 7EC1D8 802414C8 0C00EABB */ jal get_npc_unsafe +/* 7EC1DC 802414CC 2404FFFC */ addiu $a0, $zero, -4 +/* 7EC1E0 802414D0 12000003 */ beqz $s0, .L802414E0 +/* 7EC1E4 802414D4 0040182D */ daddu $v1, $v0, $zero +/* 7EC1E8 802414D8 2402003C */ addiu $v0, $zero, 0x3c +/* 7EC1EC 802414DC AE220070 */ sw $v0, 0x70($s1) +.L802414E0: +/* 7EC1F0 802414E0 C462000C */ lwc1 $f2, 0xc($v1) +/* 7EC1F4 802414E4 3C0141F0 */ lui $at, 0x41f0 +/* 7EC1F8 802414E8 44810000 */ mtc1 $at, $f0 +/* 7EC1FC 802414EC 00000000 */ nop +/* 7EC200 802414F0 46001000 */ add.s $f0, $f2, $f0 +/* 7EC204 802414F4 3C0143B4 */ lui $at, 0x43b4 +/* 7EC208 802414F8 44811000 */ mtc1 $at, $f2 +/* 7EC20C 802414FC 00000000 */ nop +/* 7EC210 80241500 4600103E */ c.le.s $f2, $f0 +/* 7EC214 80241504 00000000 */ nop +/* 7EC218 80241508 45000003 */ bc1f .L80241518 +/* 7EC21C 8024150C E460000C */ swc1 $f0, 0xc($v1) +/* 7EC220 80241510 46020001 */ sub.s $f0, $f0, $f2 +/* 7EC224 80241514 E460000C */ swc1 $f0, 0xc($v1) +.L80241518: +/* 7EC228 80241518 8E230070 */ lw $v1, 0x70($s1) +/* 7EC22C 8024151C 2463FFFF */ addiu $v1, $v1, -1 +/* 7EC230 80241520 000317C3 */ sra $v0, $v1, 0x1f +/* 7EC234 80241524 AE230070 */ sw $v1, 0x70($s1) +/* 7EC238 80241528 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EC23C 8024152C 8FB10014 */ lw $s1, 0x14($sp) +/* 7EC240 80241530 8FB00010 */ lw $s0, 0x10($sp) +/* 7EC244 80241534 30420002 */ andi $v0, $v0, 2 +/* 7EC248 80241538 03E00008 */ jr $ra +/* 7EC24C 8024153C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540.s deleted file mode 100644 index 5fd7a1bf82..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241540 -/* 7EC250 80241540 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7EC254 80241544 AFB10014 */ sw $s1, 0x14($sp) -/* 7EC258 80241548 0080882D */ daddu $s1, $a0, $zero -/* 7EC25C 8024154C AFB00010 */ sw $s0, 0x10($sp) -/* 7EC260 80241550 00A0802D */ daddu $s0, $a1, $zero -/* 7EC264 80241554 AFBF001C */ sw $ra, 0x1c($sp) -/* 7EC268 80241558 AFB20018 */ sw $s2, 0x18($sp) -/* 7EC26C 8024155C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 7EC270 80241560 0C00EABB */ jal get_npc_unsafe -/* 7EC274 80241564 2404FFFC */ addiu $a0, $zero, -4 -/* 7EC278 80241568 12000017 */ beqz $s0, .L802415C8 -/* 7EC27C 8024156C 0040902D */ daddu $s2, $v0, $zero -/* 7EC280 80241570 0220202D */ daddu $a0, $s1, $zero -/* 7EC284 80241574 3C05FE36 */ lui $a1, 0xfe36 -/* 7EC288 80241578 0C0B210B */ jal get_float_variable -/* 7EC28C 8024157C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 7EC290 80241580 0220202D */ daddu $a0, $s1, $zero -/* 7EC294 80241584 3C05FE36 */ lui $a1, 0xfe36 -/* 7EC298 80241588 3C014270 */ lui $at, 0x4270 -/* 7EC29C 8024158C 4481A000 */ mtc1 $at, $f20 -/* 7EC2A0 80241590 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 7EC2A4 80241594 46140003 */ div.s $f0, $f0, $f20 -/* 7EC2A8 80241598 0C0B210B */ jal get_float_variable -/* 7EC2AC 8024159C E6200074 */ swc1 $f0, 0x74($s1) -/* 7EC2B0 802415A0 0220202D */ daddu $a0, $s1, $zero -/* 7EC2B4 802415A4 3C05FE36 */ lui $a1, 0xfe36 -/* 7EC2B8 802415A8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 7EC2BC 802415AC 46140003 */ div.s $f0, $f0, $f20 -/* 7EC2C0 802415B0 0C0B210B */ jal get_float_variable -/* 7EC2C4 802415B4 E6200078 */ swc1 $f0, 0x78($s1) -/* 7EC2C8 802415B8 46140003 */ div.s $f0, $f0, $f20 -/* 7EC2CC 802415BC 2402003C */ addiu $v0, $zero, 0x3c -/* 7EC2D0 802415C0 E620007C */ swc1 $f0, 0x7c($s1) -/* 7EC2D4 802415C4 AE220070 */ sw $v0, 0x70($s1) -.L802415C8: -/* 7EC2D8 802415C8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 7EC2DC 802415CC C6220074 */ lwc1 $f2, 0x74($s1) -/* 7EC2E0 802415D0 46020000 */ add.s $f0, $f0, $f2 -/* 7EC2E4 802415D4 E6400038 */ swc1 $f0, 0x38($s2) -/* 7EC2E8 802415D8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 7EC2EC 802415DC C6220078 */ lwc1 $f2, 0x78($s1) -/* 7EC2F0 802415E0 46020000 */ add.s $f0, $f0, $f2 -/* 7EC2F4 802415E4 E640003C */ swc1 $f0, 0x3c($s2) -/* 7EC2F8 802415E8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 7EC2FC 802415EC C622007C */ lwc1 $f2, 0x7c($s1) -/* 7EC300 802415F0 46020000 */ add.s $f0, $f0, $f2 -/* 7EC304 802415F4 E6400040 */ swc1 $f0, 0x40($s2) -/* 7EC308 802415F8 8E230070 */ lw $v1, 0x70($s1) -/* 7EC30C 802415FC 2463FFFF */ addiu $v1, $v1, -1 -/* 7EC310 80241600 2C620001 */ sltiu $v0, $v1, 1 -/* 7EC314 80241604 AE230070 */ sw $v1, 0x70($s1) -/* 7EC318 80241608 8FBF001C */ lw $ra, 0x1c($sp) -/* 7EC31C 8024160C 8FB20018 */ lw $s2, 0x18($sp) -/* 7EC320 80241610 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC324 80241614 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC328 80241618 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 7EC32C 8024161C 00021040 */ sll $v0, $v0, 1 -/* 7EC330 80241620 03E00008 */ jr $ra -/* 7EC334 80241624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s new file mode 100644 index 0000000000..6bf81c6c08 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241540_7EC250 +/* 7EC250 80241540 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7EC254 80241544 AFB10014 */ sw $s1, 0x14($sp) +/* 7EC258 80241548 0080882D */ daddu $s1, $a0, $zero +/* 7EC25C 8024154C AFB00010 */ sw $s0, 0x10($sp) +/* 7EC260 80241550 00A0802D */ daddu $s0, $a1, $zero +/* 7EC264 80241554 AFBF001C */ sw $ra, 0x1c($sp) +/* 7EC268 80241558 AFB20018 */ sw $s2, 0x18($sp) +/* 7EC26C 8024155C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 7EC270 80241560 0C00EABB */ jal get_npc_unsafe +/* 7EC274 80241564 2404FFFC */ addiu $a0, $zero, -4 +/* 7EC278 80241568 12000017 */ beqz $s0, .L802415C8 +/* 7EC27C 8024156C 0040902D */ daddu $s2, $v0, $zero +/* 7EC280 80241570 0220202D */ daddu $a0, $s1, $zero +/* 7EC284 80241574 3C05FE36 */ lui $a1, 0xfe36 +/* 7EC288 80241578 0C0B210B */ jal get_float_variable +/* 7EC28C 8024157C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 7EC290 80241580 0220202D */ daddu $a0, $s1, $zero +/* 7EC294 80241584 3C05FE36 */ lui $a1, 0xfe36 +/* 7EC298 80241588 3C014270 */ lui $at, 0x4270 +/* 7EC29C 8024158C 4481A000 */ mtc1 $at, $f20 +/* 7EC2A0 80241590 34A53C85 */ ori $a1, $a1, 0x3c85 +/* 7EC2A4 80241594 46140003 */ div.s $f0, $f0, $f20 +/* 7EC2A8 80241598 0C0B210B */ jal get_float_variable +/* 7EC2AC 8024159C E6200074 */ swc1 $f0, 0x74($s1) +/* 7EC2B0 802415A0 0220202D */ daddu $a0, $s1, $zero +/* 7EC2B4 802415A4 3C05FE36 */ lui $a1, 0xfe36 +/* 7EC2B8 802415A8 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 7EC2BC 802415AC 46140003 */ div.s $f0, $f0, $f20 +/* 7EC2C0 802415B0 0C0B210B */ jal get_float_variable +/* 7EC2C4 802415B4 E6200078 */ swc1 $f0, 0x78($s1) +/* 7EC2C8 802415B8 46140003 */ div.s $f0, $f0, $f20 +/* 7EC2CC 802415BC 2402003C */ addiu $v0, $zero, 0x3c +/* 7EC2D0 802415C0 E620007C */ swc1 $f0, 0x7c($s1) +/* 7EC2D4 802415C4 AE220070 */ sw $v0, 0x70($s1) +.L802415C8: +/* 7EC2D8 802415C8 C6400038 */ lwc1 $f0, 0x38($s2) +/* 7EC2DC 802415CC C6220074 */ lwc1 $f2, 0x74($s1) +/* 7EC2E0 802415D0 46020000 */ add.s $f0, $f0, $f2 +/* 7EC2E4 802415D4 E6400038 */ swc1 $f0, 0x38($s2) +/* 7EC2E8 802415D8 C640003C */ lwc1 $f0, 0x3c($s2) +/* 7EC2EC 802415DC C6220078 */ lwc1 $f2, 0x78($s1) +/* 7EC2F0 802415E0 46020000 */ add.s $f0, $f0, $f2 +/* 7EC2F4 802415E4 E640003C */ swc1 $f0, 0x3c($s2) +/* 7EC2F8 802415E8 C6400040 */ lwc1 $f0, 0x40($s2) +/* 7EC2FC 802415EC C622007C */ lwc1 $f2, 0x7c($s1) +/* 7EC300 802415F0 46020000 */ add.s $f0, $f0, $f2 +/* 7EC304 802415F4 E6400040 */ swc1 $f0, 0x40($s2) +/* 7EC308 802415F8 8E230070 */ lw $v1, 0x70($s1) +/* 7EC30C 802415FC 2463FFFF */ addiu $v1, $v1, -1 +/* 7EC310 80241600 2C620001 */ sltiu $v0, $v1, 1 +/* 7EC314 80241604 AE230070 */ sw $v1, 0x70($s1) +/* 7EC318 80241608 8FBF001C */ lw $ra, 0x1c($sp) +/* 7EC31C 8024160C 8FB20018 */ lw $s2, 0x18($sp) +/* 7EC320 80241610 8FB10014 */ lw $s1, 0x14($sp) +/* 7EC324 80241614 8FB00010 */ lw $s0, 0x10($sp) +/* 7EC328 80241618 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 7EC32C 8024161C 00021040 */ sll $v0, $v0, 1 +/* 7EC330 80241620 03E00008 */ jr $ra +/* 7EC334 80241624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628.s deleted file mode 100644 index acad20b4dd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241628 -/* 7EC338 80241628 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EC33C 8024162C 3C058025 */ lui $a1, 0x8025 -/* 7EC340 80241630 8CA55B88 */ lw $a1, 0x5b88($a1) -/* 7EC344 80241634 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EC348 80241638 0C0B1EAF */ jal get_variable -/* 7EC34C 8024163C 0000202D */ daddu $a0, $zero, $zero -/* 7EC350 80241640 0040182D */ daddu $v1, $v0, $zero -/* 7EC354 80241644 24020001 */ addiu $v0, $zero, 1 -/* 7EC358 80241648 14620006 */ bne $v1, $v0, .L80241664 -/* 7EC35C 8024164C 24020002 */ addiu $v0, $zero, 2 -/* 7EC360 80241650 44800000 */ mtc1 $zero, $f0 -/* 7EC364 80241654 00000000 */ nop -/* 7EC368 80241658 44050000 */ mfc1 $a1, $f0 -/* 7EC36C 8024165C 0809059F */ j .L8024167C -/* 7EC370 80241660 0000202D */ daddu $a0, $zero, $zero -.L80241664: -/* 7EC374 80241664 14620008 */ bne $v1, $v0, .L80241688 -/* 7EC378 80241668 24040001 */ addiu $a0, $zero, 1 -/* 7EC37C 8024166C 44800000 */ mtc1 $zero, $f0 -/* 7EC380 80241670 00000000 */ nop -/* 7EC384 80241674 44050000 */ mfc1 $a1, $f0 -/* 7EC388 80241678 00000000 */ nop -.L8024167C: -/* 7EC38C 8024167C 00A0302D */ daddu $a2, $a1, $zero -/* 7EC390 80241680 0C01C5A4 */ jal func_80071690 -/* 7EC394 80241684 00A0382D */ daddu $a3, $a1, $zero -.L80241688: -/* 7EC398 80241688 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EC39C 8024168C 03E00008 */ jr $ra -/* 7EC3A0 80241690 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s new file mode 100644 index 0000000000..e304b78e9e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241628_7EC338.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241628_7EC338 +/* 7EC338 80241628 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EC33C 8024162C 3C058025 */ lui $a1, 0x8025 +/* 7EC340 80241630 8CA55B88 */ lw $a1, 0x5b88($a1) +/* 7EC344 80241634 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EC348 80241638 0C0B1EAF */ jal get_variable +/* 7EC34C 8024163C 0000202D */ daddu $a0, $zero, $zero +/* 7EC350 80241640 0040182D */ daddu $v1, $v0, $zero +/* 7EC354 80241644 24020001 */ addiu $v0, $zero, 1 +/* 7EC358 80241648 14620006 */ bne $v1, $v0, .L80241664 +/* 7EC35C 8024164C 24020002 */ addiu $v0, $zero, 2 +/* 7EC360 80241650 44800000 */ mtc1 $zero, $f0 +/* 7EC364 80241654 00000000 */ nop +/* 7EC368 80241658 44050000 */ mfc1 $a1, $f0 +/* 7EC36C 8024165C 0809059F */ j .L8024167C +/* 7EC370 80241660 0000202D */ daddu $a0, $zero, $zero +.L80241664: +/* 7EC374 80241664 14620008 */ bne $v1, $v0, .L80241688 +/* 7EC378 80241668 24040001 */ addiu $a0, $zero, 1 +/* 7EC37C 8024166C 44800000 */ mtc1 $zero, $f0 +/* 7EC380 80241670 00000000 */ nop +/* 7EC384 80241674 44050000 */ mfc1 $a1, $f0 +/* 7EC388 80241678 00000000 */ nop +.L8024167C: +/* 7EC38C 8024167C 00A0302D */ daddu $a2, $a1, $zero +/* 7EC390 80241680 0C01C5A4 */ jal func_80071690 +/* 7EC394 80241684 00A0382D */ daddu $a3, $a1, $zero +.L80241688: +/* 7EC398 80241688 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EC39C 8024168C 03E00008 */ jr $ra +/* 7EC3A0 80241690 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694.s deleted file mode 100644 index ebf78a077a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241694 -/* 7EC3A4 80241694 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EC3A8 80241698 3C058024 */ lui $a1, 0x8024 -/* 7EC3AC 8024169C 24A51628 */ addiu $a1, $a1, 0x1628 -/* 7EC3B0 802416A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EC3B4 802416A4 0C048C8F */ jal bind_dynamic_entity_7 -/* 7EC3B8 802416A8 0000202D */ daddu $a0, $zero, $zero -/* 7EC3BC 802416AC 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EC3C0 802416B0 3C018025 */ lui $at, 0x8025 -/* 7EC3C4 802416B4 AC225B70 */ sw $v0, 0x5b70($at) -/* 7EC3C8 802416B8 24020002 */ addiu $v0, $zero, 2 -/* 7EC3CC 802416BC 03E00008 */ jr $ra -/* 7EC3D0 802416C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s new file mode 100644 index 0000000000..8eecc3f068 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241694_7EC3A4.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241694_7EC3A4 +/* 7EC3A4 80241694 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EC3A8 80241698 3C058024 */ lui $a1, 0x8024 +/* 7EC3AC 8024169C 24A51628 */ addiu $a1, $a1, 0x1628 +/* 7EC3B0 802416A0 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EC3B4 802416A4 0C048C8F */ jal bind_dynamic_entity_7 +/* 7EC3B8 802416A8 0000202D */ daddu $a0, $zero, $zero +/* 7EC3BC 802416AC 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EC3C0 802416B0 3C018025 */ lui $at, 0x8025 +/* 7EC3C4 802416B4 AC225B70 */ sw $v0, 0x5b70($at) +/* 7EC3C8 802416B8 24020002 */ addiu $v0, $zero, 2 +/* 7EC3CC 802416BC 03E00008 */ jr $ra +/* 7EC3D0 802416C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0.s deleted file mode 100644 index d4c501c6fb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418F0 -/* 7EC600 802418F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EC604 802418F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EC608 802418F8 10A00003 */ beqz $a1, .L80241908 -/* 7EC60C 802418FC 8C86000C */ lw $a2, 0xc($a0) -/* 7EC610 80241900 3C018025 */ lui $at, 0x8025 -/* 7EC614 80241904 AC2083E8 */ sw $zero, -0x7c18($at) -.L80241908: -/* 7EC618 80241908 3C038025 */ lui $v1, 0x8025 -/* 7EC61C 8024190C 246383E8 */ addiu $v1, $v1, -0x7c18 -/* 7EC620 80241910 8C620000 */ lw $v0, ($v1) -/* 7EC624 80241914 54400003 */ bnel $v0, $zero, .L80241924 -/* 7EC628 80241918 AC600000 */ sw $zero, ($v1) -/* 7EC62C 8024191C 0809064E */ j .L80241938 -/* 7EC630 80241920 0000102D */ daddu $v0, $zero, $zero -.L80241924: -/* 7EC634 80241924 8CC50000 */ lw $a1, ($a2) -/* 7EC638 80241928 3C068025 */ lui $a2, 0x8025 -/* 7EC63C 8024192C 0C0B2026 */ jal set_variable -/* 7EC640 80241930 8CC683EC */ lw $a2, -0x7c14($a2) -/* 7EC644 80241934 24020002 */ addiu $v0, $zero, 2 -.L80241938: -/* 7EC648 80241938 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EC64C 8024193C 03E00008 */ jr $ra -/* 7EC650 80241940 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s new file mode 100644 index 0000000000..31316d329d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802418F0_7EC600.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418F0_7EC600 +/* 7EC600 802418F0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EC604 802418F4 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EC608 802418F8 10A00003 */ beqz $a1, .L80241908 +/* 7EC60C 802418FC 8C86000C */ lw $a2, 0xc($a0) +/* 7EC610 80241900 3C018025 */ lui $at, 0x8025 +/* 7EC614 80241904 AC2083E8 */ sw $zero, -0x7c18($at) +.L80241908: +/* 7EC618 80241908 3C038025 */ lui $v1, 0x8025 +/* 7EC61C 8024190C 246383E8 */ addiu $v1, $v1, -0x7c18 +/* 7EC620 80241910 8C620000 */ lw $v0, ($v1) +/* 7EC624 80241914 54400003 */ bnel $v0, $zero, .L80241924 +/* 7EC628 80241918 AC600000 */ sw $zero, ($v1) +/* 7EC62C 8024191C 0809064E */ j .L80241938 +/* 7EC630 80241920 0000102D */ daddu $v0, $zero, $zero +.L80241924: +/* 7EC634 80241924 8CC50000 */ lw $a1, ($a2) +/* 7EC638 80241928 3C068025 */ lui $a2, 0x8025 +/* 7EC63C 8024192C 0C0B2026 */ jal set_variable +/* 7EC640 80241930 8CC683EC */ lw $a2, -0x7c14($a2) +/* 7EC644 80241934 24020002 */ addiu $v0, $zero, 2 +.L80241938: +/* 7EC648 80241938 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EC64C 8024193C 03E00008 */ jr $ra +/* 7EC650 80241940 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944.s deleted file mode 100644 index 516fdfd2d5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241944 -/* 7EC654 80241944 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EC658 80241948 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EC65C 8024194C 8C82000C */ lw $v0, 0xc($a0) -/* 7EC660 80241950 0C0B1EAF */ jal get_variable -/* 7EC664 80241954 8C450000 */ lw $a1, ($v0) -/* 7EC668 80241958 3C018025 */ lui $at, 0x8025 -/* 7EC66C 8024195C AC2283EC */ sw $v0, -0x7c14($at) -/* 7EC670 80241960 24020002 */ addiu $v0, $zero, 2 -/* 7EC674 80241964 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EC678 80241968 24030001 */ addiu $v1, $zero, 1 -/* 7EC67C 8024196C 3C018025 */ lui $at, 0x8025 -/* 7EC680 80241970 AC2383E8 */ sw $v1, -0x7c18($at) -/* 7EC684 80241974 03E00008 */ jr $ra -/* 7EC688 80241978 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s new file mode 100644 index 0000000000..c6e7166936 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241944_7EC654.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241944_7EC654 +/* 7EC654 80241944 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EC658 80241948 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EC65C 8024194C 8C82000C */ lw $v0, 0xc($a0) +/* 7EC660 80241950 0C0B1EAF */ jal get_variable +/* 7EC664 80241954 8C450000 */ lw $a1, ($v0) +/* 7EC668 80241958 3C018025 */ lui $at, 0x8025 +/* 7EC66C 8024195C AC2283EC */ sw $v0, -0x7c14($at) +/* 7EC670 80241960 24020002 */ addiu $v0, $zero, 2 +/* 7EC674 80241964 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EC678 80241968 24030001 */ addiu $v1, $zero, 1 +/* 7EC67C 8024196C 3C018025 */ lui $at, 0x8025 +/* 7EC680 80241970 AC2383E8 */ sw $v1, -0x7c18($at) +/* 7EC684 80241974 03E00008 */ jr $ra +/* 7EC688 80241978 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C.s deleted file mode 100644 index 11ad0a1c2f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024197C -/* 7EC68C 8024197C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EC690 80241980 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EC694 80241984 8C82000C */ lw $v0, 0xc($a0) -/* 7EC698 80241988 0C0B1EAF */ jal get_variable -/* 7EC69C 8024198C 8C450000 */ lw $a1, ($v0) -/* 7EC6A0 80241990 0040182D */ daddu $v1, $v0, $zero -/* 7EC6A4 80241994 10600012 */ beqz $v1, .L802419E0 -/* 7EC6A8 80241998 0000202D */ daddu $a0, $zero, $zero -/* 7EC6AC 8024199C 8C620000 */ lw $v0, ($v1) -/* 7EC6B0 802419A0 5040000A */ beql $v0, $zero, .L802419CC -/* 7EC6B4 802419A4 00041080 */ sll $v0, $a0, 2 -/* 7EC6B8 802419A8 3C058025 */ lui $a1, 0x8025 -/* 7EC6BC 802419AC 24A55BA0 */ addiu $a1, $a1, 0x5ba0 -.L802419B0: -/* 7EC6C0 802419B0 24630004 */ addiu $v1, $v1, 4 -/* 7EC6C4 802419B4 24840001 */ addiu $a0, $a0, 1 -/* 7EC6C8 802419B8 ACA20000 */ sw $v0, ($a1) -/* 7EC6CC 802419BC 8C620000 */ lw $v0, ($v1) -/* 7EC6D0 802419C0 1440FFFB */ bnez $v0, .L802419B0 -/* 7EC6D4 802419C4 24A50004 */ addiu $a1, $a1, 4 -/* 7EC6D8 802419C8 00041080 */ sll $v0, $a0, 2 -.L802419CC: -/* 7EC6DC 802419CC 3C018025 */ lui $at, 0x8025 -/* 7EC6E0 802419D0 00220821 */ addu $at, $at, $v0 -/* 7EC6E4 802419D4 AC205BA0 */ sw $zero, 0x5ba0($at) -/* 7EC6E8 802419D8 08090682 */ j .L80241A08 -/* 7EC6EC 802419DC 00000000 */ nop -.L802419E0: -/* 7EC6F0 802419E0 3C038025 */ lui $v1, 0x8025 -/* 7EC6F4 802419E4 24635BA0 */ addiu $v1, $v1, 0x5ba0 -/* 7EC6F8 802419E8 0060282D */ daddu $a1, $v1, $zero -.L802419EC: -/* 7EC6FC 802419EC 24820010 */ addiu $v0, $a0, 0x10 -/* 7EC700 802419F0 AC620000 */ sw $v0, ($v1) -/* 7EC704 802419F4 24630004 */ addiu $v1, $v1, 4 -/* 7EC708 802419F8 24840001 */ addiu $a0, $a0, 1 -/* 7EC70C 802419FC 28820070 */ slti $v0, $a0, 0x70 -/* 7EC710 80241A00 1440FFFA */ bnez $v0, .L802419EC -/* 7EC714 80241A04 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241A08: -/* 7EC718 80241A08 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EC71C 80241A0C 24020002 */ addiu $v0, $zero, 2 -/* 7EC720 80241A10 03E00008 */ jr $ra -/* 7EC724 80241A14 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s new file mode 100644 index 0000000000..5bb1a5483c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024197C_7EC68C.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024197C_7EC68C +/* 7EC68C 8024197C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EC690 80241980 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EC694 80241984 8C82000C */ lw $v0, 0xc($a0) +/* 7EC698 80241988 0C0B1EAF */ jal get_variable +/* 7EC69C 8024198C 8C450000 */ lw $a1, ($v0) +/* 7EC6A0 80241990 0040182D */ daddu $v1, $v0, $zero +/* 7EC6A4 80241994 10600012 */ beqz $v1, .L802419E0 +/* 7EC6A8 80241998 0000202D */ daddu $a0, $zero, $zero +/* 7EC6AC 8024199C 8C620000 */ lw $v0, ($v1) +/* 7EC6B0 802419A0 5040000A */ beql $v0, $zero, .L802419CC +/* 7EC6B4 802419A4 00041080 */ sll $v0, $a0, 2 +/* 7EC6B8 802419A8 3C058025 */ lui $a1, 0x8025 +/* 7EC6BC 802419AC 24A55BA0 */ addiu $a1, $a1, 0x5ba0 +.L802419B0: +/* 7EC6C0 802419B0 24630004 */ addiu $v1, $v1, 4 +/* 7EC6C4 802419B4 24840001 */ addiu $a0, $a0, 1 +/* 7EC6C8 802419B8 ACA20000 */ sw $v0, ($a1) +/* 7EC6CC 802419BC 8C620000 */ lw $v0, ($v1) +/* 7EC6D0 802419C0 1440FFFB */ bnez $v0, .L802419B0 +/* 7EC6D4 802419C4 24A50004 */ addiu $a1, $a1, 4 +/* 7EC6D8 802419C8 00041080 */ sll $v0, $a0, 2 +.L802419CC: +/* 7EC6DC 802419CC 3C018025 */ lui $at, 0x8025 +/* 7EC6E0 802419D0 00220821 */ addu $at, $at, $v0 +/* 7EC6E4 802419D4 AC205BA0 */ sw $zero, 0x5ba0($at) +/* 7EC6E8 802419D8 08090682 */ j .L80241A08 +/* 7EC6EC 802419DC 00000000 */ nop +.L802419E0: +/* 7EC6F0 802419E0 3C038025 */ lui $v1, 0x8025 +/* 7EC6F4 802419E4 24635BA0 */ addiu $v1, $v1, 0x5ba0 +/* 7EC6F8 802419E8 0060282D */ daddu $a1, $v1, $zero +.L802419EC: +/* 7EC6FC 802419EC 24820010 */ addiu $v0, $a0, 0x10 +/* 7EC700 802419F0 AC620000 */ sw $v0, ($v1) +/* 7EC704 802419F4 24630004 */ addiu $v1, $v1, 4 +/* 7EC708 802419F8 24840001 */ addiu $a0, $a0, 1 +/* 7EC70C 802419FC 28820070 */ slti $v0, $a0, 0x70 +/* 7EC710 80241A00 1440FFFA */ bnez $v0, .L802419EC +/* 7EC714 80241A04 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80241A08: +/* 7EC718 80241A08 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EC71C 80241A0C 24020002 */ addiu $v0, $zero, 2 +/* 7EC720 80241A10 03E00008 */ jr $ra +/* 7EC724 80241A14 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18.s deleted file mode 100644 index e1be7d2951..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A18 -/* 7EC728 80241A18 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EC72C 80241A1C AFBF0010 */ sw $ra, 0x10($sp) -/* 7EC730 80241A20 8C82000C */ lw $v0, 0xc($a0) -/* 7EC734 80241A24 0C0B1EAF */ jal get_variable -/* 7EC738 80241A28 8C450000 */ lw $a1, ($v0) -/* 7EC73C 80241A2C 0040182D */ daddu $v1, $v0, $zero -/* 7EC740 80241A30 10600012 */ beqz $v1, .L80241A7C -/* 7EC744 80241A34 0000202D */ daddu $a0, $zero, $zero -/* 7EC748 80241A38 8C620000 */ lw $v0, ($v1) -/* 7EC74C 80241A3C 5040000A */ beql $v0, $zero, .L80241A68 -/* 7EC750 80241A40 00041080 */ sll $v0, $a0, 2 -/* 7EC754 80241A44 3C058025 */ lui $a1, 0x8025 -/* 7EC758 80241A48 24A55D68 */ addiu $a1, $a1, 0x5d68 -.L80241A4C: -/* 7EC75C 80241A4C 24630004 */ addiu $v1, $v1, 4 -/* 7EC760 80241A50 24840001 */ addiu $a0, $a0, 1 -/* 7EC764 80241A54 ACA20000 */ sw $v0, ($a1) -/* 7EC768 80241A58 8C620000 */ lw $v0, ($v1) -/* 7EC76C 80241A5C 1440FFFB */ bnez $v0, .L80241A4C -/* 7EC770 80241A60 24A50004 */ addiu $a1, $a1, 4 -/* 7EC774 80241A64 00041080 */ sll $v0, $a0, 2 -.L80241A68: -/* 7EC778 80241A68 3C018025 */ lui $at, 0x8025 -/* 7EC77C 80241A6C 00220821 */ addu $at, $at, $v0 -/* 7EC780 80241A70 AC205D68 */ sw $zero, 0x5d68($at) -/* 7EC784 80241A74 080906A9 */ j .L80241AA4 -/* 7EC788 80241A78 00000000 */ nop -.L80241A7C: -/* 7EC78C 80241A7C 3C038025 */ lui $v1, 0x8025 -/* 7EC790 80241A80 24635D68 */ addiu $v1, $v1, 0x5d68 -/* 7EC794 80241A84 0060282D */ daddu $a1, $v1, $zero -.L80241A88: -/* 7EC798 80241A88 24820080 */ addiu $v0, $a0, 0x80 -/* 7EC79C 80241A8C AC620000 */ sw $v0, ($v1) -/* 7EC7A0 80241A90 24630004 */ addiu $v1, $v1, 4 -/* 7EC7A4 80241A94 24840001 */ addiu $a0, $a0, 1 -/* 7EC7A8 80241A98 2882005B */ slti $v0, $a0, 0x5b -/* 7EC7AC 80241A9C 1440FFFA */ bnez $v0, .L80241A88 -/* 7EC7B0 80241AA0 ACA0016C */ sw $zero, 0x16c($a1) -.L80241AA4: -/* 7EC7B4 80241AA4 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EC7B8 80241AA8 24020002 */ addiu $v0, $zero, 2 -/* 7EC7BC 80241AAC 03E00008 */ jr $ra -/* 7EC7C0 80241AB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s new file mode 100644 index 0000000000..5ce03ef0a4 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241A18_7EC728.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A18_7EC728 +/* 7EC728 80241A18 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EC72C 80241A1C AFBF0010 */ sw $ra, 0x10($sp) +/* 7EC730 80241A20 8C82000C */ lw $v0, 0xc($a0) +/* 7EC734 80241A24 0C0B1EAF */ jal get_variable +/* 7EC738 80241A28 8C450000 */ lw $a1, ($v0) +/* 7EC73C 80241A2C 0040182D */ daddu $v1, $v0, $zero +/* 7EC740 80241A30 10600012 */ beqz $v1, .L80241A7C +/* 7EC744 80241A34 0000202D */ daddu $a0, $zero, $zero +/* 7EC748 80241A38 8C620000 */ lw $v0, ($v1) +/* 7EC74C 80241A3C 5040000A */ beql $v0, $zero, .L80241A68 +/* 7EC750 80241A40 00041080 */ sll $v0, $a0, 2 +/* 7EC754 80241A44 3C058025 */ lui $a1, 0x8025 +/* 7EC758 80241A48 24A55D68 */ addiu $a1, $a1, 0x5d68 +.L80241A4C: +/* 7EC75C 80241A4C 24630004 */ addiu $v1, $v1, 4 +/* 7EC760 80241A50 24840001 */ addiu $a0, $a0, 1 +/* 7EC764 80241A54 ACA20000 */ sw $v0, ($a1) +/* 7EC768 80241A58 8C620000 */ lw $v0, ($v1) +/* 7EC76C 80241A5C 1440FFFB */ bnez $v0, .L80241A4C +/* 7EC770 80241A60 24A50004 */ addiu $a1, $a1, 4 +/* 7EC774 80241A64 00041080 */ sll $v0, $a0, 2 +.L80241A68: +/* 7EC778 80241A68 3C018025 */ lui $at, 0x8025 +/* 7EC77C 80241A6C 00220821 */ addu $at, $at, $v0 +/* 7EC780 80241A70 AC205D68 */ sw $zero, 0x5d68($at) +/* 7EC784 80241A74 080906A9 */ j .L80241AA4 +/* 7EC788 80241A78 00000000 */ nop +.L80241A7C: +/* 7EC78C 80241A7C 3C038025 */ lui $v1, 0x8025 +/* 7EC790 80241A80 24635D68 */ addiu $v1, $v1, 0x5d68 +/* 7EC794 80241A84 0060282D */ daddu $a1, $v1, $zero +.L80241A88: +/* 7EC798 80241A88 24820080 */ addiu $v0, $a0, 0x80 +/* 7EC79C 80241A8C AC620000 */ sw $v0, ($v1) +/* 7EC7A0 80241A90 24630004 */ addiu $v1, $v1, 4 +/* 7EC7A4 80241A94 24840001 */ addiu $a0, $a0, 1 +/* 7EC7A8 80241A98 2882005B */ slti $v0, $a0, 0x5b +/* 7EC7AC 80241A9C 1440FFFA */ bnez $v0, .L80241A88 +/* 7EC7B0 80241AA0 ACA0016C */ sw $zero, 0x16c($a1) +.L80241AA4: +/* 7EC7B4 80241AA4 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EC7B8 80241AA8 24020002 */ addiu $v0, $zero, 2 +/* 7EC7BC 80241AAC 03E00008 */ jr $ra +/* 7EC7C0 80241AB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241AB4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241AB4.s deleted file mode 100644 index f5f8374848..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241AB4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AB4 -/* 7EC7C4 80241AB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EC7C8 80241AB8 AFB10014 */ sw $s1, 0x14($sp) -/* 7EC7CC 80241ABC 0080882D */ daddu $s1, $a0, $zero -/* 7EC7D0 80241AC0 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EC7D4 80241AC4 AFB00010 */ sw $s0, 0x10($sp) -/* 7EC7D8 80241AC8 8E30000C */ lw $s0, 0xc($s1) -/* 7EC7DC 80241ACC 8E050000 */ lw $a1, ($s0) -/* 7EC7E0 80241AD0 0C0B1EAF */ jal get_variable -/* 7EC7E4 80241AD4 26100004 */ addiu $s0, $s0, 4 -/* 7EC7E8 80241AD8 AE22008C */ sw $v0, 0x8c($s1) -/* 7EC7EC 80241ADC 8E050000 */ lw $a1, ($s0) -/* 7EC7F0 80241AE0 26100004 */ addiu $s0, $s0, 4 -/* 7EC7F4 80241AE4 0C0B1EAF */ jal get_variable -/* 7EC7F8 80241AE8 0220202D */ daddu $a0, $s1, $zero -/* 7EC7FC 80241AEC AE220090 */ sw $v0, 0x90($s1) -/* 7EC800 80241AF0 8E050000 */ lw $a1, ($s0) -/* 7EC804 80241AF4 26100004 */ addiu $s0, $s0, 4 -/* 7EC808 80241AF8 0C0B1EAF */ jal get_variable -/* 7EC80C 80241AFC 0220202D */ daddu $a0, $s1, $zero -/* 7EC810 80241B00 AE220094 */ sw $v0, 0x94($s1) -/* 7EC814 80241B04 8E050000 */ lw $a1, ($s0) -/* 7EC818 80241B08 26100004 */ addiu $s0, $s0, 4 -/* 7EC81C 80241B0C 0C0B1EAF */ jal get_variable -/* 7EC820 80241B10 0220202D */ daddu $a0, $s1, $zero -/* 7EC824 80241B14 AE220098 */ sw $v0, 0x98($s1) -/* 7EC828 80241B18 8E050000 */ lw $a1, ($s0) -/* 7EC82C 80241B1C 26100004 */ addiu $s0, $s0, 4 -/* 7EC830 80241B20 0C0B1EAF */ jal get_variable -/* 7EC834 80241B24 0220202D */ daddu $a0, $s1, $zero -/* 7EC838 80241B28 AE22009C */ sw $v0, 0x9c($s1) -/* 7EC83C 80241B2C 8E050000 */ lw $a1, ($s0) -/* 7EC840 80241B30 26100004 */ addiu $s0, $s0, 4 -/* 7EC844 80241B34 0C0B1EAF */ jal get_variable -/* 7EC848 80241B38 0220202D */ daddu $a0, $s1, $zero -/* 7EC84C 80241B3C AE2200A0 */ sw $v0, 0xa0($s1) -/* 7EC850 80241B40 8E050000 */ lw $a1, ($s0) -/* 7EC854 80241B44 26100004 */ addiu $s0, $s0, 4 -/* 7EC858 80241B48 0C0B1EAF */ jal get_variable -/* 7EC85C 80241B4C 0220202D */ daddu $a0, $s1, $zero -/* 7EC860 80241B50 AE2200A4 */ sw $v0, 0xa4($s1) -/* 7EC864 80241B54 8E050000 */ lw $a1, ($s0) -/* 7EC868 80241B58 26100004 */ addiu $s0, $s0, 4 -/* 7EC86C 80241B5C 0C0B1EAF */ jal get_variable -/* 7EC870 80241B60 0220202D */ daddu $a0, $s1, $zero -/* 7EC874 80241B64 AE2200A8 */ sw $v0, 0xa8($s1) -/* 7EC878 80241B68 8E050000 */ lw $a1, ($s0) -/* 7EC87C 80241B6C 26100004 */ addiu $s0, $s0, 4 -/* 7EC880 80241B70 0C0B1EAF */ jal get_variable -/* 7EC884 80241B74 0220202D */ daddu $a0, $s1, $zero -/* 7EC888 80241B78 AE2200AC */ sw $v0, 0xac($s1) -/* 7EC88C 80241B7C 8E050000 */ lw $a1, ($s0) -/* 7EC890 80241B80 0C0B1EAF */ jal get_variable -/* 7EC894 80241B84 0220202D */ daddu $a0, $s1, $zero -/* 7EC898 80241B88 AE2200B0 */ sw $v0, 0xb0($s1) -/* 7EC89C 80241B8C 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EC8A0 80241B90 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC8A4 80241B94 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC8A8 80241B98 24020002 */ addiu $v0, $zero, 2 -/* 7EC8AC 80241B9C 03E00008 */ jr $ra -/* 7EC8B0 80241BA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241AB4_7EC7C4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241AB4_7EC7C4.s new file mode 100644 index 0000000000..d31d5d8f33 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241AB4_7EC7C4.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AB4_7EC7C4 +/* 7EC7C4 80241AB4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EC7C8 80241AB8 AFB10014 */ sw $s1, 0x14($sp) +/* 7EC7CC 80241ABC 0080882D */ daddu $s1, $a0, $zero +/* 7EC7D0 80241AC0 AFBF0018 */ sw $ra, 0x18($sp) +/* 7EC7D4 80241AC4 AFB00010 */ sw $s0, 0x10($sp) +/* 7EC7D8 80241AC8 8E30000C */ lw $s0, 0xc($s1) +/* 7EC7DC 80241ACC 8E050000 */ lw $a1, ($s0) +/* 7EC7E0 80241AD0 0C0B1EAF */ jal get_variable +/* 7EC7E4 80241AD4 26100004 */ addiu $s0, $s0, 4 +/* 7EC7E8 80241AD8 AE22008C */ sw $v0, 0x8c($s1) +/* 7EC7EC 80241ADC 8E050000 */ lw $a1, ($s0) +/* 7EC7F0 80241AE0 26100004 */ addiu $s0, $s0, 4 +/* 7EC7F4 80241AE4 0C0B1EAF */ jal get_variable +/* 7EC7F8 80241AE8 0220202D */ daddu $a0, $s1, $zero +/* 7EC7FC 80241AEC AE220090 */ sw $v0, 0x90($s1) +/* 7EC800 80241AF0 8E050000 */ lw $a1, ($s0) +/* 7EC804 80241AF4 26100004 */ addiu $s0, $s0, 4 +/* 7EC808 80241AF8 0C0B1EAF */ jal get_variable +/* 7EC80C 80241AFC 0220202D */ daddu $a0, $s1, $zero +/* 7EC810 80241B00 AE220094 */ sw $v0, 0x94($s1) +/* 7EC814 80241B04 8E050000 */ lw $a1, ($s0) +/* 7EC818 80241B08 26100004 */ addiu $s0, $s0, 4 +/* 7EC81C 80241B0C 0C0B1EAF */ jal get_variable +/* 7EC820 80241B10 0220202D */ daddu $a0, $s1, $zero +/* 7EC824 80241B14 AE220098 */ sw $v0, 0x98($s1) +/* 7EC828 80241B18 8E050000 */ lw $a1, ($s0) +/* 7EC82C 80241B1C 26100004 */ addiu $s0, $s0, 4 +/* 7EC830 80241B20 0C0B1EAF */ jal get_variable +/* 7EC834 80241B24 0220202D */ daddu $a0, $s1, $zero +/* 7EC838 80241B28 AE22009C */ sw $v0, 0x9c($s1) +/* 7EC83C 80241B2C 8E050000 */ lw $a1, ($s0) +/* 7EC840 80241B30 26100004 */ addiu $s0, $s0, 4 +/* 7EC844 80241B34 0C0B1EAF */ jal get_variable +/* 7EC848 80241B38 0220202D */ daddu $a0, $s1, $zero +/* 7EC84C 80241B3C AE2200A0 */ sw $v0, 0xa0($s1) +/* 7EC850 80241B40 8E050000 */ lw $a1, ($s0) +/* 7EC854 80241B44 26100004 */ addiu $s0, $s0, 4 +/* 7EC858 80241B48 0C0B1EAF */ jal get_variable +/* 7EC85C 80241B4C 0220202D */ daddu $a0, $s1, $zero +/* 7EC860 80241B50 AE2200A4 */ sw $v0, 0xa4($s1) +/* 7EC864 80241B54 8E050000 */ lw $a1, ($s0) +/* 7EC868 80241B58 26100004 */ addiu $s0, $s0, 4 +/* 7EC86C 80241B5C 0C0B1EAF */ jal get_variable +/* 7EC870 80241B60 0220202D */ daddu $a0, $s1, $zero +/* 7EC874 80241B64 AE2200A8 */ sw $v0, 0xa8($s1) +/* 7EC878 80241B68 8E050000 */ lw $a1, ($s0) +/* 7EC87C 80241B6C 26100004 */ addiu $s0, $s0, 4 +/* 7EC880 80241B70 0C0B1EAF */ jal get_variable +/* 7EC884 80241B74 0220202D */ daddu $a0, $s1, $zero +/* 7EC888 80241B78 AE2200AC */ sw $v0, 0xac($s1) +/* 7EC88C 80241B7C 8E050000 */ lw $a1, ($s0) +/* 7EC890 80241B80 0C0B1EAF */ jal get_variable +/* 7EC894 80241B84 0220202D */ daddu $a0, $s1, $zero +/* 7EC898 80241B88 AE2200B0 */ sw $v0, 0xb0($s1) +/* 7EC89C 80241B8C 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EC8A0 80241B90 8FB10014 */ lw $s1, 0x14($sp) +/* 7EC8A4 80241B94 8FB00010 */ lw $s0, 0x10($sp) +/* 7EC8A8 80241B98 24020002 */ addiu $v0, $zero, 2 +/* 7EC8AC 80241B9C 03E00008 */ jr $ra +/* 7EC8B0 80241BA0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4.s deleted file mode 100644 index f3ecfe1c82..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BA4 -/* 7EC8B4 80241BA4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7EC8B8 80241BA8 AFB1001C */ sw $s1, 0x1c($sp) -/* 7EC8BC 80241BAC 0080882D */ daddu $s1, $a0, $zero -/* 7EC8C0 80241BB0 AFBF0034 */ sw $ra, 0x34($sp) -/* 7EC8C4 80241BB4 AFB60030 */ sw $s6, 0x30($sp) -/* 7EC8C8 80241BB8 AFB5002C */ sw $s5, 0x2c($sp) -/* 7EC8CC 80241BBC AFB40028 */ sw $s4, 0x28($sp) -/* 7EC8D0 80241BC0 AFB30024 */ sw $s3, 0x24($sp) -/* 7EC8D4 80241BC4 AFB20020 */ sw $s2, 0x20($sp) -/* 7EC8D8 80241BC8 AFB00018 */ sw $s0, 0x18($sp) -/* 7EC8DC 80241BCC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 7EC8E0 80241BD0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 7EC8E4 80241BD4 8E30000C */ lw $s0, 0xc($s1) -/* 7EC8E8 80241BD8 8E160000 */ lw $s6, ($s0) -/* 7EC8EC 80241BDC 26100004 */ addiu $s0, $s0, 4 -/* 7EC8F0 80241BE0 0C0B1EAF */ jal get_variable -/* 7EC8F4 80241BE4 02C0282D */ daddu $a1, $s6, $zero -/* 7EC8F8 80241BE8 44820000 */ mtc1 $v0, $f0 -/* 7EC8FC 80241BEC 00000000 */ nop -/* 7EC900 80241BF0 46800020 */ cvt.s.w $f0, $f0 -/* 7EC904 80241BF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7EC908 80241BF8 8E140000 */ lw $s4, ($s0) -/* 7EC90C 80241BFC 26100004 */ addiu $s0, $s0, 4 -/* 7EC910 80241C00 0220202D */ daddu $a0, $s1, $zero -/* 7EC914 80241C04 0C0B1EAF */ jal get_variable -/* 7EC918 80241C08 0280282D */ daddu $a1, $s4, $zero -/* 7EC91C 80241C0C 0220202D */ daddu $a0, $s1, $zero -/* 7EC920 80241C10 8E150000 */ lw $s5, ($s0) -/* 7EC924 80241C14 4482B000 */ mtc1 $v0, $f22 -/* 7EC928 80241C18 00000000 */ nop -/* 7EC92C 80241C1C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7EC930 80241C20 0C0B1EAF */ jal get_variable -/* 7EC934 80241C24 02A0282D */ daddu $a1, $s5, $zero -/* 7EC938 80241C28 2404FFFC */ addiu $a0, $zero, -4 -/* 7EC93C 80241C2C 44820000 */ mtc1 $v0, $f0 -/* 7EC940 80241C30 00000000 */ nop -/* 7EC944 80241C34 46800020 */ cvt.s.w $f0, $f0 -/* 7EC948 80241C38 0C00EABB */ jal get_npc_unsafe -/* 7EC94C 80241C3C E7A00014 */ swc1 $f0, 0x14($sp) -/* 7EC950 80241C40 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 7EC954 80241C44 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 7EC958 80241C48 3C014334 */ lui $at, 0x4334 -/* 7EC95C 80241C4C 44816000 */ mtc1 $at, $f12 -/* 7EC960 80241C50 00041880 */ sll $v1, $a0, 2 -/* 7EC964 80241C54 00641821 */ addu $v1, $v1, $a0 -/* 7EC968 80241C58 00031880 */ sll $v1, $v1, 2 -/* 7EC96C 80241C5C 00641823 */ subu $v1, $v1, $a0 -/* 7EC970 80241C60 000320C0 */ sll $a0, $v1, 3 -/* 7EC974 80241C64 00641821 */ addu $v1, $v1, $a0 -/* 7EC978 80241C68 000318C0 */ sll $v1, $v1, 3 -/* 7EC97C 80241C6C 3C01800B */ lui $at, 0x800b -/* 7EC980 80241C70 00230821 */ addu $at, $at, $v1 -/* 7EC984 80241C74 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 7EC988 80241C78 460C0300 */ add.s $f12, $f0, $f12 -/* 7EC98C 80241C7C 0C00A6C9 */ jal clamp_angle -/* 7EC990 80241C80 0040982D */ daddu $s3, $v0, $zero -/* 7EC994 80241C84 27B00010 */ addiu $s0, $sp, 0x10 -/* 7EC998 80241C88 0200202D */ daddu $a0, $s0, $zero -/* 7EC99C 80241C8C 27B20014 */ addiu $s2, $sp, 0x14 -/* 7EC9A0 80241C90 0240282D */ daddu $a1, $s2, $zero -/* 7EC9A4 80241C94 3C064170 */ lui $a2, 0x4170 -/* 7EC9A8 80241C98 8E67000C */ lw $a3, 0xc($s3) -/* 7EC9AC 80241C9C 0C00A7E7 */ jal add_vec2D_polar -/* 7EC9B0 80241CA0 46000506 */ mov.s $f20, $f0 -/* 7EC9B4 80241CA4 0200202D */ daddu $a0, $s0, $zero -/* 7EC9B8 80241CA8 3C064120 */ lui $a2, 0x4120 -/* 7EC9BC 80241CAC 4407A000 */ mfc1 $a3, $f20 -/* 7EC9C0 80241CB0 0C00A7E7 */ jal add_vec2D_polar -/* 7EC9C4 80241CB4 0240282D */ daddu $a1, $s2, $zero -/* 7EC9C8 80241CB8 0220202D */ daddu $a0, $s1, $zero -/* 7EC9CC 80241CBC C7A00010 */ lwc1 $f0, 0x10($sp) -/* 7EC9D0 80241CC0 4600008D */ trunc.w.s $f2, $f0 -/* 7EC9D4 80241CC4 44061000 */ mfc1 $a2, $f2 -/* 7EC9D8 80241CC8 0C0B2026 */ jal set_variable -/* 7EC9DC 80241CCC 02C0282D */ daddu $a1, $s6, $zero -/* 7EC9E0 80241CD0 0220202D */ daddu $a0, $s1, $zero -/* 7EC9E4 80241CD4 4600B08D */ trunc.w.s $f2, $f22 -/* 7EC9E8 80241CD8 44061000 */ mfc1 $a2, $f2 -/* 7EC9EC 80241CDC 0C0B2026 */ jal set_variable -/* 7EC9F0 80241CE0 0280282D */ daddu $a1, $s4, $zero -/* 7EC9F4 80241CE4 0220202D */ daddu $a0, $s1, $zero -/* 7EC9F8 80241CE8 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 7EC9FC 80241CEC 4600008D */ trunc.w.s $f2, $f0 -/* 7ECA00 80241CF0 44061000 */ mfc1 $a2, $f2 -/* 7ECA04 80241CF4 0C0B2026 */ jal set_variable -/* 7ECA08 80241CF8 02A0282D */ daddu $a1, $s5, $zero -/* 7ECA0C 80241CFC 8FBF0034 */ lw $ra, 0x34($sp) -/* 7ECA10 80241D00 8FB60030 */ lw $s6, 0x30($sp) -/* 7ECA14 80241D04 8FB5002C */ lw $s5, 0x2c($sp) -/* 7ECA18 80241D08 8FB40028 */ lw $s4, 0x28($sp) -/* 7ECA1C 80241D0C 8FB30024 */ lw $s3, 0x24($sp) -/* 7ECA20 80241D10 8FB20020 */ lw $s2, 0x20($sp) -/* 7ECA24 80241D14 8FB1001C */ lw $s1, 0x1c($sp) -/* 7ECA28 80241D18 8FB00018 */ lw $s0, 0x18($sp) -/* 7ECA2C 80241D1C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 7ECA30 80241D20 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 7ECA34 80241D24 24020002 */ addiu $v0, $zero, 2 -/* 7ECA38 80241D28 03E00008 */ jr $ra -/* 7ECA3C 80241D2C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4_7EC8B4.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4_7EC8B4.s new file mode 100644 index 0000000000..393fac07bc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241BA4_7EC8B4.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BA4_7EC8B4 +/* 7EC8B4 80241BA4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 7EC8B8 80241BA8 AFB1001C */ sw $s1, 0x1c($sp) +/* 7EC8BC 80241BAC 0080882D */ daddu $s1, $a0, $zero +/* 7EC8C0 80241BB0 AFBF0034 */ sw $ra, 0x34($sp) +/* 7EC8C4 80241BB4 AFB60030 */ sw $s6, 0x30($sp) +/* 7EC8C8 80241BB8 AFB5002C */ sw $s5, 0x2c($sp) +/* 7EC8CC 80241BBC AFB40028 */ sw $s4, 0x28($sp) +/* 7EC8D0 80241BC0 AFB30024 */ sw $s3, 0x24($sp) +/* 7EC8D4 80241BC4 AFB20020 */ sw $s2, 0x20($sp) +/* 7EC8D8 80241BC8 AFB00018 */ sw $s0, 0x18($sp) +/* 7EC8DC 80241BCC F7B60040 */ sdc1 $f22, 0x40($sp) +/* 7EC8E0 80241BD0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 7EC8E4 80241BD4 8E30000C */ lw $s0, 0xc($s1) +/* 7EC8E8 80241BD8 8E160000 */ lw $s6, ($s0) +/* 7EC8EC 80241BDC 26100004 */ addiu $s0, $s0, 4 +/* 7EC8F0 80241BE0 0C0B1EAF */ jal get_variable +/* 7EC8F4 80241BE4 02C0282D */ daddu $a1, $s6, $zero +/* 7EC8F8 80241BE8 44820000 */ mtc1 $v0, $f0 +/* 7EC8FC 80241BEC 00000000 */ nop +/* 7EC900 80241BF0 46800020 */ cvt.s.w $f0, $f0 +/* 7EC904 80241BF4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 7EC908 80241BF8 8E140000 */ lw $s4, ($s0) +/* 7EC90C 80241BFC 26100004 */ addiu $s0, $s0, 4 +/* 7EC910 80241C00 0220202D */ daddu $a0, $s1, $zero +/* 7EC914 80241C04 0C0B1EAF */ jal get_variable +/* 7EC918 80241C08 0280282D */ daddu $a1, $s4, $zero +/* 7EC91C 80241C0C 0220202D */ daddu $a0, $s1, $zero +/* 7EC920 80241C10 8E150000 */ lw $s5, ($s0) +/* 7EC924 80241C14 4482B000 */ mtc1 $v0, $f22 +/* 7EC928 80241C18 00000000 */ nop +/* 7EC92C 80241C1C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7EC930 80241C20 0C0B1EAF */ jal get_variable +/* 7EC934 80241C24 02A0282D */ daddu $a1, $s5, $zero +/* 7EC938 80241C28 2404FFFC */ addiu $a0, $zero, -4 +/* 7EC93C 80241C2C 44820000 */ mtc1 $v0, $f0 +/* 7EC940 80241C30 00000000 */ nop +/* 7EC944 80241C34 46800020 */ cvt.s.w $f0, $f0 +/* 7EC948 80241C38 0C00EABB */ jal get_npc_unsafe +/* 7EC94C 80241C3C E7A00014 */ swc1 $f0, 0x14($sp) +/* 7EC950 80241C40 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 7EC954 80241C44 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 7EC958 80241C48 3C014334 */ lui $at, 0x4334 +/* 7EC95C 80241C4C 44816000 */ mtc1 $at, $f12 +/* 7EC960 80241C50 00041880 */ sll $v1, $a0, 2 +/* 7EC964 80241C54 00641821 */ addu $v1, $v1, $a0 +/* 7EC968 80241C58 00031880 */ sll $v1, $v1, 2 +/* 7EC96C 80241C5C 00641823 */ subu $v1, $v1, $a0 +/* 7EC970 80241C60 000320C0 */ sll $a0, $v1, 3 +/* 7EC974 80241C64 00641821 */ addu $v1, $v1, $a0 +/* 7EC978 80241C68 000318C0 */ sll $v1, $v1, 3 +/* 7EC97C 80241C6C 3C01800B */ lui $at, 0x800b +/* 7EC980 80241C70 00230821 */ addu $at, $at, $v1 +/* 7EC984 80241C74 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 7EC988 80241C78 460C0300 */ add.s $f12, $f0, $f12 +/* 7EC98C 80241C7C 0C00A6C9 */ jal clamp_angle +/* 7EC990 80241C80 0040982D */ daddu $s3, $v0, $zero +/* 7EC994 80241C84 27B00010 */ addiu $s0, $sp, 0x10 +/* 7EC998 80241C88 0200202D */ daddu $a0, $s0, $zero +/* 7EC99C 80241C8C 27B20014 */ addiu $s2, $sp, 0x14 +/* 7EC9A0 80241C90 0240282D */ daddu $a1, $s2, $zero +/* 7EC9A4 80241C94 3C064170 */ lui $a2, 0x4170 +/* 7EC9A8 80241C98 8E67000C */ lw $a3, 0xc($s3) +/* 7EC9AC 80241C9C 0C00A7E7 */ jal add_vec2D_polar +/* 7EC9B0 80241CA0 46000506 */ mov.s $f20, $f0 +/* 7EC9B4 80241CA4 0200202D */ daddu $a0, $s0, $zero +/* 7EC9B8 80241CA8 3C064120 */ lui $a2, 0x4120 +/* 7EC9BC 80241CAC 4407A000 */ mfc1 $a3, $f20 +/* 7EC9C0 80241CB0 0C00A7E7 */ jal add_vec2D_polar +/* 7EC9C4 80241CB4 0240282D */ daddu $a1, $s2, $zero +/* 7EC9C8 80241CB8 0220202D */ daddu $a0, $s1, $zero +/* 7EC9CC 80241CBC C7A00010 */ lwc1 $f0, 0x10($sp) +/* 7EC9D0 80241CC0 4600008D */ trunc.w.s $f2, $f0 +/* 7EC9D4 80241CC4 44061000 */ mfc1 $a2, $f2 +/* 7EC9D8 80241CC8 0C0B2026 */ jal set_variable +/* 7EC9DC 80241CCC 02C0282D */ daddu $a1, $s6, $zero +/* 7EC9E0 80241CD0 0220202D */ daddu $a0, $s1, $zero +/* 7EC9E4 80241CD4 4600B08D */ trunc.w.s $f2, $f22 +/* 7EC9E8 80241CD8 44061000 */ mfc1 $a2, $f2 +/* 7EC9EC 80241CDC 0C0B2026 */ jal set_variable +/* 7EC9F0 80241CE0 0280282D */ daddu $a1, $s4, $zero +/* 7EC9F4 80241CE4 0220202D */ daddu $a0, $s1, $zero +/* 7EC9F8 80241CE8 C7A00014 */ lwc1 $f0, 0x14($sp) +/* 7EC9FC 80241CEC 4600008D */ trunc.w.s $f2, $f0 +/* 7ECA00 80241CF0 44061000 */ mfc1 $a2, $f2 +/* 7ECA04 80241CF4 0C0B2026 */ jal set_variable +/* 7ECA08 80241CF8 02A0282D */ daddu $a1, $s5, $zero +/* 7ECA0C 80241CFC 8FBF0034 */ lw $ra, 0x34($sp) +/* 7ECA10 80241D00 8FB60030 */ lw $s6, 0x30($sp) +/* 7ECA14 80241D04 8FB5002C */ lw $s5, 0x2c($sp) +/* 7ECA18 80241D08 8FB40028 */ lw $s4, 0x28($sp) +/* 7ECA1C 80241D0C 8FB30024 */ lw $s3, 0x24($sp) +/* 7ECA20 80241D10 8FB20020 */ lw $s2, 0x20($sp) +/* 7ECA24 80241D14 8FB1001C */ lw $s1, 0x1c($sp) +/* 7ECA28 80241D18 8FB00018 */ lw $s0, 0x18($sp) +/* 7ECA2C 80241D1C D7B60040 */ ldc1 $f22, 0x40($sp) +/* 7ECA30 80241D20 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 7ECA34 80241D24 24020002 */ addiu $v0, $zero, 2 +/* 7ECA38 80241D28 03E00008 */ jr $ra +/* 7ECA3C 80241D2C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30.s deleted file mode 100644 index 31edb247d7..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D30 -/* 7ECA40 80241D30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7ECA44 80241D34 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECA48 80241D38 0080802D */ daddu $s0, $a0, $zero -/* 7ECA4C 80241D3C AFBF0014 */ sw $ra, 0x14($sp) -/* 7ECA50 80241D40 0C00EABB */ jal get_npc_unsafe -/* 7ECA54 80241D44 8E04008C */ lw $a0, 0x8c($s0) -/* 7ECA58 80241D48 0040282D */ daddu $a1, $v0, $zero -/* 7ECA5C 80241D4C 8E040094 */ lw $a0, 0x94($s0) -/* 7ECA60 80241D50 8CA30028 */ lw $v1, 0x28($a1) -/* 7ECA64 80241D54 ACA40028 */ sw $a0, 0x28($a1) -/* 7ECA68 80241D58 8FBF0014 */ lw $ra, 0x14($sp) -/* 7ECA6C 80241D5C 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECA70 80241D60 24020002 */ addiu $v0, $zero, 2 -/* 7ECA74 80241D64 3C018025 */ lui $at, 0x8025 -/* 7ECA78 80241D68 AC235ED8 */ sw $v1, 0x5ed8($at) -/* 7ECA7C 80241D6C 03E00008 */ jr $ra -/* 7ECA80 80241D70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s new file mode 100644 index 0000000000..f5465103be --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D30_7ECA40.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D30_7ECA40 +/* 7ECA40 80241D30 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7ECA44 80241D34 AFB00010 */ sw $s0, 0x10($sp) +/* 7ECA48 80241D38 0080802D */ daddu $s0, $a0, $zero +/* 7ECA4C 80241D3C AFBF0014 */ sw $ra, 0x14($sp) +/* 7ECA50 80241D40 0C00EABB */ jal get_npc_unsafe +/* 7ECA54 80241D44 8E04008C */ lw $a0, 0x8c($s0) +/* 7ECA58 80241D48 0040282D */ daddu $a1, $v0, $zero +/* 7ECA5C 80241D4C 8E040094 */ lw $a0, 0x94($s0) +/* 7ECA60 80241D50 8CA30028 */ lw $v1, 0x28($a1) +/* 7ECA64 80241D54 ACA40028 */ sw $a0, 0x28($a1) +/* 7ECA68 80241D58 8FBF0014 */ lw $ra, 0x14($sp) +/* 7ECA6C 80241D5C 8FB00010 */ lw $s0, 0x10($sp) +/* 7ECA70 80241D60 24020002 */ addiu $v0, $zero, 2 +/* 7ECA74 80241D64 3C018025 */ lui $at, 0x8025 +/* 7ECA78 80241D68 AC235ED8 */ sw $v1, 0x5ed8($at) +/* 7ECA7C 80241D6C 03E00008 */ jr $ra +/* 7ECA80 80241D70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74.s deleted file mode 100644 index 9613d7b0e6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D74 -/* 7ECA84 80241D74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7ECA88 80241D78 AFBF0010 */ sw $ra, 0x10($sp) -/* 7ECA8C 80241D7C 0C00EABB */ jal get_npc_unsafe -/* 7ECA90 80241D80 8C84008C */ lw $a0, 0x8c($a0) -/* 7ECA94 80241D84 3C038025 */ lui $v1, 0x8025 -/* 7ECA98 80241D88 8C635ED8 */ lw $v1, 0x5ed8($v1) -/* 7ECA9C 80241D8C AC430028 */ sw $v1, 0x28($v0) -/* 7ECAA0 80241D90 8FBF0010 */ lw $ra, 0x10($sp) -/* 7ECAA4 80241D94 24020002 */ addiu $v0, $zero, 2 -/* 7ECAA8 80241D98 03E00008 */ jr $ra -/* 7ECAAC 80241D9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s new file mode 100644 index 0000000000..5cb40f3f9b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241D74_7ECA84.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D74_7ECA84 +/* 7ECA84 80241D74 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7ECA88 80241D78 AFBF0010 */ sw $ra, 0x10($sp) +/* 7ECA8C 80241D7C 0C00EABB */ jal get_npc_unsafe +/* 7ECA90 80241D80 8C84008C */ lw $a0, 0x8c($a0) +/* 7ECA94 80241D84 3C038025 */ lui $v1, 0x8025 +/* 7ECA98 80241D88 8C635ED8 */ lw $v1, 0x5ed8($v1) +/* 7ECA9C 80241D8C AC430028 */ sw $v1, 0x28($v0) +/* 7ECAA0 80241D90 8FBF0010 */ lw $ra, 0x10($sp) +/* 7ECAA4 80241D94 24020002 */ addiu $v0, $zero, 2 +/* 7ECAA8 80241D98 03E00008 */ jr $ra +/* 7ECAAC 80241D9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0.s deleted file mode 100644 index 563c490b07..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DA0 -/* 7ECAB0 80241DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7ECAB4 80241DA4 AFB20018 */ sw $s2, 0x18($sp) -/* 7ECAB8 80241DA8 0080902D */ daddu $s2, $a0, $zero -/* 7ECABC 80241DAC AFB10014 */ sw $s1, 0x14($sp) -/* 7ECAC0 80241DB0 3C118025 */ lui $s1, 0x8025 -/* 7ECAC4 80241DB4 26318F18 */ addiu $s1, $s1, -0x70e8 -/* 7ECAC8 80241DB8 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECACC 80241DBC 0000802D */ daddu $s0, $zero, $zero -/* 7ECAD0 80241DC0 AFBF001C */ sw $ra, 0x1c($sp) -/* 7ECAD4 80241DC4 26100001 */ addiu $s0, $s0, 1 -.L80241DC8: -/* 7ECAD8 80241DC8 8E250010 */ lw $a1, 0x10($s1) -/* 7ECADC 80241DCC 26310014 */ addiu $s1, $s1, 0x14 -/* 7ECAE0 80241DD0 0240202D */ daddu $a0, $s2, $zero -/* 7ECAE4 80241DD4 0C0B2026 */ jal set_variable -/* 7ECAE8 80241DD8 0000302D */ daddu $a2, $zero, $zero -/* 7ECAEC 80241DDC 2E020024 */ sltiu $v0, $s0, 0x24 -/* 7ECAF0 80241DE0 1440FFF9 */ bnez $v0, .L80241DC8 -/* 7ECAF4 80241DE4 26100001 */ addiu $s0, $s0, 1 -/* 7ECAF8 80241DE8 8FBF001C */ lw $ra, 0x1c($sp) -/* 7ECAFC 80241DEC 8FB20018 */ lw $s2, 0x18($sp) -/* 7ECB00 80241DF0 8FB10014 */ lw $s1, 0x14($sp) -/* 7ECB04 80241DF4 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECB08 80241DF8 24020002 */ addiu $v0, $zero, 2 -/* 7ECB0C 80241DFC 03E00008 */ jr $ra -/* 7ECB10 80241E00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s new file mode 100644 index 0000000000..987773c95d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241DA0_7ECAB0.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DA0_7ECAB0 +/* 7ECAB0 80241DA0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7ECAB4 80241DA4 AFB20018 */ sw $s2, 0x18($sp) +/* 7ECAB8 80241DA8 0080902D */ daddu $s2, $a0, $zero +/* 7ECABC 80241DAC AFB10014 */ sw $s1, 0x14($sp) +/* 7ECAC0 80241DB0 3C118025 */ lui $s1, 0x8025 +/* 7ECAC4 80241DB4 26318F18 */ addiu $s1, $s1, -0x70e8 +/* 7ECAC8 80241DB8 AFB00010 */ sw $s0, 0x10($sp) +/* 7ECACC 80241DBC 0000802D */ daddu $s0, $zero, $zero +/* 7ECAD0 80241DC0 AFBF001C */ sw $ra, 0x1c($sp) +/* 7ECAD4 80241DC4 26100001 */ addiu $s0, $s0, 1 +.L80241DC8: +/* 7ECAD8 80241DC8 8E250010 */ lw $a1, 0x10($s1) +/* 7ECADC 80241DCC 26310014 */ addiu $s1, $s1, 0x14 +/* 7ECAE0 80241DD0 0240202D */ daddu $a0, $s2, $zero +/* 7ECAE4 80241DD4 0C0B2026 */ jal set_variable +/* 7ECAE8 80241DD8 0000302D */ daddu $a2, $zero, $zero +/* 7ECAEC 80241DDC 2E020024 */ sltiu $v0, $s0, 0x24 +/* 7ECAF0 80241DE0 1440FFF9 */ bnez $v0, .L80241DC8 +/* 7ECAF4 80241DE4 26100001 */ addiu $s0, $s0, 1 +/* 7ECAF8 80241DE8 8FBF001C */ lw $ra, 0x1c($sp) +/* 7ECAFC 80241DEC 8FB20018 */ lw $s2, 0x18($sp) +/* 7ECB00 80241DF0 8FB10014 */ lw $s1, 0x14($sp) +/* 7ECB04 80241DF4 8FB00010 */ lw $s0, 0x10($sp) +/* 7ECB08 80241DF8 24020002 */ addiu $v0, $zero, 2 +/* 7ECB0C 80241DFC 03E00008 */ jr $ra +/* 7ECB10 80241E00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04.s deleted file mode 100644 index 49bb7adee2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E04 -/* 7ECB14 80241E04 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7ECB18 80241E08 AFB20018 */ sw $s2, 0x18($sp) -/* 7ECB1C 80241E0C 0080902D */ daddu $s2, $a0, $zero -/* 7ECB20 80241E10 AFB10014 */ sw $s1, 0x14($sp) -/* 7ECB24 80241E14 0000882D */ daddu $s1, $zero, $zero -/* 7ECB28 80241E18 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECB2C 80241E1C 3C108025 */ lui $s0, 0x8025 -/* 7ECB30 80241E20 26108F20 */ addiu $s0, $s0, -0x70e0 -/* 7ECB34 80241E24 AFBF001C */ sw $ra, 0x1c($sp) -/* 7ECB38 80241E28 0240202D */ daddu $a0, $s2, $zero -.L80241E2C: -/* 7ECB3C 80241E2C 3C05F5DE */ lui $a1, 0xf5de -/* 7ECB40 80241E30 0C0B1EAF */ jal get_variable -/* 7ECB44 80241E34 34A50180 */ ori $a1, $a1, 0x180 -/* 7ECB48 80241E38 0240202D */ daddu $a0, $s2, $zero -/* 7ECB4C 80241E3C 26310001 */ addiu $s1, $s1, 1 -/* 7ECB50 80241E40 8E050000 */ lw $a1, ($s0) -/* 7ECB54 80241E44 8E03FFFC */ lw $v1, -4($s0) -/* 7ECB58 80241E48 26100014 */ addiu $s0, $s0, 0x14 -/* 7ECB5C 80241E4C 0043102A */ slt $v0, $v0, $v1 -/* 7ECB60 80241E50 0C0B2026 */ jal set_variable -/* 7ECB64 80241E54 38460001 */ xori $a2, $v0, 1 -/* 7ECB68 80241E58 2E220024 */ sltiu $v0, $s1, 0x24 -/* 7ECB6C 80241E5C 1440FFF3 */ bnez $v0, .L80241E2C -/* 7ECB70 80241E60 0240202D */ daddu $a0, $s2, $zero -/* 7ECB74 80241E64 8FBF001C */ lw $ra, 0x1c($sp) -/* 7ECB78 80241E68 8FB20018 */ lw $s2, 0x18($sp) -/* 7ECB7C 80241E6C 8FB10014 */ lw $s1, 0x14($sp) -/* 7ECB80 80241E70 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECB84 80241E74 24020002 */ addiu $v0, $zero, 2 -/* 7ECB88 80241E78 03E00008 */ jr $ra -/* 7ECB8C 80241E7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s new file mode 100644 index 0000000000..242d0959b1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E04_7ECB14.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E04_7ECB14 +/* 7ECB14 80241E04 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7ECB18 80241E08 AFB20018 */ sw $s2, 0x18($sp) +/* 7ECB1C 80241E0C 0080902D */ daddu $s2, $a0, $zero +/* 7ECB20 80241E10 AFB10014 */ sw $s1, 0x14($sp) +/* 7ECB24 80241E14 0000882D */ daddu $s1, $zero, $zero +/* 7ECB28 80241E18 AFB00010 */ sw $s0, 0x10($sp) +/* 7ECB2C 80241E1C 3C108025 */ lui $s0, 0x8025 +/* 7ECB30 80241E20 26108F20 */ addiu $s0, $s0, -0x70e0 +/* 7ECB34 80241E24 AFBF001C */ sw $ra, 0x1c($sp) +/* 7ECB38 80241E28 0240202D */ daddu $a0, $s2, $zero +.L80241E2C: +/* 7ECB3C 80241E2C 3C05F5DE */ lui $a1, 0xf5de +/* 7ECB40 80241E30 0C0B1EAF */ jal get_variable +/* 7ECB44 80241E34 34A50180 */ ori $a1, $a1, 0x180 +/* 7ECB48 80241E38 0240202D */ daddu $a0, $s2, $zero +/* 7ECB4C 80241E3C 26310001 */ addiu $s1, $s1, 1 +/* 7ECB50 80241E40 8E050000 */ lw $a1, ($s0) +/* 7ECB54 80241E44 8E03FFFC */ lw $v1, -4($s0) +/* 7ECB58 80241E48 26100014 */ addiu $s0, $s0, 0x14 +/* 7ECB5C 80241E4C 0043102A */ slt $v0, $v0, $v1 +/* 7ECB60 80241E50 0C0B2026 */ jal set_variable +/* 7ECB64 80241E54 38460001 */ xori $a2, $v0, 1 +/* 7ECB68 80241E58 2E220024 */ sltiu $v0, $s1, 0x24 +/* 7ECB6C 80241E5C 1440FFF3 */ bnez $v0, .L80241E2C +/* 7ECB70 80241E60 0240202D */ daddu $a0, $s2, $zero +/* 7ECB74 80241E64 8FBF001C */ lw $ra, 0x1c($sp) +/* 7ECB78 80241E68 8FB20018 */ lw $s2, 0x18($sp) +/* 7ECB7C 80241E6C 8FB10014 */ lw $s1, 0x14($sp) +/* 7ECB80 80241E70 8FB00010 */ lw $s0, 0x10($sp) +/* 7ECB84 80241E74 24020002 */ addiu $v0, $zero, 2 +/* 7ECB88 80241E78 03E00008 */ jr $ra +/* 7ECB8C 80241E7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80.s deleted file mode 100644 index 2edc75247d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E80 -/* 7ECB90 80241E80 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7ECB94 80241E84 AFB40020 */ sw $s4, 0x20($sp) -/* 7ECB98 80241E88 0080A02D */ daddu $s4, $a0, $zero -/* 7ECB9C 80241E8C AFB3001C */ sw $s3, 0x1c($sp) -/* 7ECBA0 80241E90 3C138025 */ lui $s3, 0x8025 -/* 7ECBA4 80241E94 26738F18 */ addiu $s3, $s3, -0x70e8 -/* 7ECBA8 80241E98 AFB50024 */ sw $s5, 0x24($sp) -/* 7ECBAC 80241E9C 0000A82D */ daddu $s5, $zero, $zero -/* 7ECBB0 80241EA0 AFB20018 */ sw $s2, 0x18($sp) -/* 7ECBB4 80241EA4 02A0902D */ daddu $s2, $s5, $zero -/* 7ECBB8 80241EA8 AFB10014 */ sw $s1, 0x14($sp) -/* 7ECBBC 80241EAC 02A0882D */ daddu $s1, $s5, $zero -/* 7ECBC0 80241EB0 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECBC4 80241EB4 26700010 */ addiu $s0, $s3, 0x10 -/* 7ECBC8 80241EB8 AFBF002C */ sw $ra, 0x2c($sp) -/* 7ECBCC 80241EBC AFB60028 */ sw $s6, 0x28($sp) -.L80241EC0: -/* 7ECBD0 80241EC0 8E05FFF8 */ lw $a1, -8($s0) -/* 7ECBD4 80241EC4 0C0B1EAF */ jal get_variable -/* 7ECBD8 80241EC8 0280202D */ daddu $a0, $s4, $zero -/* 7ECBDC 80241ECC 5040000E */ beql $v0, $zero, .L80241F08 -/* 7ECBE0 80241ED0 26310001 */ addiu $s1, $s1, 1 -/* 7ECBE4 80241ED4 8E05FFFC */ lw $a1, -4($s0) -/* 7ECBE8 80241ED8 0C0B1EAF */ jal get_variable -/* 7ECBEC 80241EDC 0280202D */ daddu $a0, $s4, $zero -/* 7ECBF0 80241EE0 14400003 */ bnez $v0, .L80241EF0 -/* 7ECBF4 80241EE4 00000000 */ nop -/* 7ECBF8 80241EE8 080907C6 */ j .L80241F18 -/* 7ECBFC 80241EEC 24150001 */ addiu $s5, $zero, 1 -.L80241EF0: -/* 7ECC00 80241EF0 8E050000 */ lw $a1, ($s0) -/* 7ECC04 80241EF4 0C0B1EAF */ jal get_variable -/* 7ECC08 80241EF8 0280202D */ daddu $a0, $s4, $zero -/* 7ECC0C 80241EFC 50400001 */ beql $v0, $zero, .L80241F04 -/* 7ECC10 80241F00 26520001 */ addiu $s2, $s2, 1 -.L80241F04: -/* 7ECC14 80241F04 26310001 */ addiu $s1, $s1, 1 -.L80241F08: -/* 7ECC18 80241F08 26100014 */ addiu $s0, $s0, 0x14 -/* 7ECC1C 80241F0C 2E220024 */ sltiu $v0, $s1, 0x24 -/* 7ECC20 80241F10 1440FFEB */ bnez $v0, .L80241EC0 -/* 7ECC24 80241F14 26730014 */ addiu $s3, $s3, 0x14 -.L80241F18: -/* 7ECC28 80241F18 56A0001F */ bnel $s5, $zero, .L80241F98 -/* 7ECC2C 80241F1C AE910084 */ sw $s1, 0x84($s4) -/* 7ECC30 80241F20 3C138025 */ lui $s3, 0x8025 -/* 7ECC34 80241F24 26738F18 */ addiu $s3, $s3, -0x70e8 -/* 7ECC38 80241F28 1240001A */ beqz $s2, .L80241F94 -/* 7ECC3C 80241F2C 0000882D */ daddu $s1, $zero, $zero -/* 7ECC40 80241F30 0C00A67F */ jal rand_int -/* 7ECC44 80241F34 2644FFFF */ addiu $a0, $s2, -1 -/* 7ECC48 80241F38 0040B02D */ daddu $s6, $v0, $zero -/* 7ECC4C 80241F3C 0220902D */ daddu $s2, $s1, $zero -/* 7ECC50 80241F40 02A0882D */ daddu $s1, $s5, $zero -/* 7ECC54 80241F44 26700010 */ addiu $s0, $s3, 0x10 -.L80241F48: -/* 7ECC58 80241F48 8E05FFF8 */ lw $a1, -8($s0) -/* 7ECC5C 80241F4C 0C0B1EAF */ jal get_variable -/* 7ECC60 80241F50 0280202D */ daddu $a0, $s4, $zero -/* 7ECC64 80241F54 5040000B */ beql $v0, $zero, .L80241F84 -/* 7ECC68 80241F58 26310001 */ addiu $s1, $s1, 1 -/* 7ECC6C 80241F5C 8E050000 */ lw $a1, ($s0) -/* 7ECC70 80241F60 0C0B1EAF */ jal get_variable -/* 7ECC74 80241F64 0280202D */ daddu $a0, $s4, $zero -/* 7ECC78 80241F68 54400006 */ bnel $v0, $zero, .L80241F84 -/* 7ECC7C 80241F6C 26310001 */ addiu $s1, $s1, 1 -/* 7ECC80 80241F70 0240102D */ daddu $v0, $s2, $zero -/* 7ECC84 80241F74 0056102A */ slt $v0, $v0, $s6 -/* 7ECC88 80241F78 10400006 */ beqz $v0, .L80241F94 -/* 7ECC8C 80241F7C 26520001 */ addiu $s2, $s2, 1 -/* 7ECC90 80241F80 26310001 */ addiu $s1, $s1, 1 -.L80241F84: -/* 7ECC94 80241F84 26100014 */ addiu $s0, $s0, 0x14 -/* 7ECC98 80241F88 2E220024 */ sltiu $v0, $s1, 0x24 -/* 7ECC9C 80241F8C 1440FFEE */ bnez $v0, .L80241F48 -/* 7ECCA0 80241F90 26730014 */ addiu $s3, $s3, 0x14 -.L80241F94: -/* 7ECCA4 80241F94 AE910084 */ sw $s1, 0x84($s4) -.L80241F98: -/* 7ECCA8 80241F98 8E620000 */ lw $v0, ($s3) -/* 7ECCAC 80241F9C 0280202D */ daddu $a0, $s4, $zero -/* 7ECCB0 80241FA0 AE95008C */ sw $s5, 0x8c($s4) -/* 7ECCB4 80241FA4 AE820088 */ sw $v0, 0x88($s4) -/* 7ECCB8 80241FA8 8E65000C */ lw $a1, 0xc($s3) -/* 7ECCBC 80241FAC 0C0B2026 */ jal set_variable -/* 7ECCC0 80241FB0 24060001 */ addiu $a2, $zero, 1 -/* 7ECCC4 80241FB4 0280202D */ daddu $a0, $s4, $zero -/* 7ECCC8 80241FB8 8E650010 */ lw $a1, 0x10($s3) -/* 7ECCCC 80241FBC 0C0B2026 */ jal set_variable -/* 7ECCD0 80241FC0 24060001 */ addiu $a2, $zero, 1 -/* 7ECCD4 80241FC4 8FBF002C */ lw $ra, 0x2c($sp) -/* 7ECCD8 80241FC8 8FB60028 */ lw $s6, 0x28($sp) -/* 7ECCDC 80241FCC 8FB50024 */ lw $s5, 0x24($sp) -/* 7ECCE0 80241FD0 8FB40020 */ lw $s4, 0x20($sp) -/* 7ECCE4 80241FD4 8FB3001C */ lw $s3, 0x1c($sp) -/* 7ECCE8 80241FD8 8FB20018 */ lw $s2, 0x18($sp) -/* 7ECCEC 80241FDC 8FB10014 */ lw $s1, 0x14($sp) -/* 7ECCF0 80241FE0 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECCF4 80241FE4 24020002 */ addiu $v0, $zero, 2 -/* 7ECCF8 80241FE8 03E00008 */ jr $ra -/* 7ECCFC 80241FEC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s new file mode 100644 index 0000000000..dc1a5b8033 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241E80_7ECB90.s @@ -0,0 +1,105 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E80_7ECB90 +/* 7ECB90 80241E80 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 7ECB94 80241E84 AFB40020 */ sw $s4, 0x20($sp) +/* 7ECB98 80241E88 0080A02D */ daddu $s4, $a0, $zero +/* 7ECB9C 80241E8C AFB3001C */ sw $s3, 0x1c($sp) +/* 7ECBA0 80241E90 3C138025 */ lui $s3, 0x8025 +/* 7ECBA4 80241E94 26738F18 */ addiu $s3, $s3, -0x70e8 +/* 7ECBA8 80241E98 AFB50024 */ sw $s5, 0x24($sp) +/* 7ECBAC 80241E9C 0000A82D */ daddu $s5, $zero, $zero +/* 7ECBB0 80241EA0 AFB20018 */ sw $s2, 0x18($sp) +/* 7ECBB4 80241EA4 02A0902D */ daddu $s2, $s5, $zero +/* 7ECBB8 80241EA8 AFB10014 */ sw $s1, 0x14($sp) +/* 7ECBBC 80241EAC 02A0882D */ daddu $s1, $s5, $zero +/* 7ECBC0 80241EB0 AFB00010 */ sw $s0, 0x10($sp) +/* 7ECBC4 80241EB4 26700010 */ addiu $s0, $s3, 0x10 +/* 7ECBC8 80241EB8 AFBF002C */ sw $ra, 0x2c($sp) +/* 7ECBCC 80241EBC AFB60028 */ sw $s6, 0x28($sp) +.L80241EC0: +/* 7ECBD0 80241EC0 8E05FFF8 */ lw $a1, -8($s0) +/* 7ECBD4 80241EC4 0C0B1EAF */ jal get_variable +/* 7ECBD8 80241EC8 0280202D */ daddu $a0, $s4, $zero +/* 7ECBDC 80241ECC 5040000E */ beql $v0, $zero, .L80241F08 +/* 7ECBE0 80241ED0 26310001 */ addiu $s1, $s1, 1 +/* 7ECBE4 80241ED4 8E05FFFC */ lw $a1, -4($s0) +/* 7ECBE8 80241ED8 0C0B1EAF */ jal get_variable +/* 7ECBEC 80241EDC 0280202D */ daddu $a0, $s4, $zero +/* 7ECBF0 80241EE0 14400003 */ bnez $v0, .L80241EF0 +/* 7ECBF4 80241EE4 00000000 */ nop +/* 7ECBF8 80241EE8 080907C6 */ j .L80241F18 +/* 7ECBFC 80241EEC 24150001 */ addiu $s5, $zero, 1 +.L80241EF0: +/* 7ECC00 80241EF0 8E050000 */ lw $a1, ($s0) +/* 7ECC04 80241EF4 0C0B1EAF */ jal get_variable +/* 7ECC08 80241EF8 0280202D */ daddu $a0, $s4, $zero +/* 7ECC0C 80241EFC 50400001 */ beql $v0, $zero, .L80241F04 +/* 7ECC10 80241F00 26520001 */ addiu $s2, $s2, 1 +.L80241F04: +/* 7ECC14 80241F04 26310001 */ addiu $s1, $s1, 1 +.L80241F08: +/* 7ECC18 80241F08 26100014 */ addiu $s0, $s0, 0x14 +/* 7ECC1C 80241F0C 2E220024 */ sltiu $v0, $s1, 0x24 +/* 7ECC20 80241F10 1440FFEB */ bnez $v0, .L80241EC0 +/* 7ECC24 80241F14 26730014 */ addiu $s3, $s3, 0x14 +.L80241F18: +/* 7ECC28 80241F18 56A0001F */ bnel $s5, $zero, .L80241F98 +/* 7ECC2C 80241F1C AE910084 */ sw $s1, 0x84($s4) +/* 7ECC30 80241F20 3C138025 */ lui $s3, 0x8025 +/* 7ECC34 80241F24 26738F18 */ addiu $s3, $s3, -0x70e8 +/* 7ECC38 80241F28 1240001A */ beqz $s2, .L80241F94 +/* 7ECC3C 80241F2C 0000882D */ daddu $s1, $zero, $zero +/* 7ECC40 80241F30 0C00A67F */ jal rand_int +/* 7ECC44 80241F34 2644FFFF */ addiu $a0, $s2, -1 +/* 7ECC48 80241F38 0040B02D */ daddu $s6, $v0, $zero +/* 7ECC4C 80241F3C 0220902D */ daddu $s2, $s1, $zero +/* 7ECC50 80241F40 02A0882D */ daddu $s1, $s5, $zero +/* 7ECC54 80241F44 26700010 */ addiu $s0, $s3, 0x10 +.L80241F48: +/* 7ECC58 80241F48 8E05FFF8 */ lw $a1, -8($s0) +/* 7ECC5C 80241F4C 0C0B1EAF */ jal get_variable +/* 7ECC60 80241F50 0280202D */ daddu $a0, $s4, $zero +/* 7ECC64 80241F54 5040000B */ beql $v0, $zero, .L80241F84 +/* 7ECC68 80241F58 26310001 */ addiu $s1, $s1, 1 +/* 7ECC6C 80241F5C 8E050000 */ lw $a1, ($s0) +/* 7ECC70 80241F60 0C0B1EAF */ jal get_variable +/* 7ECC74 80241F64 0280202D */ daddu $a0, $s4, $zero +/* 7ECC78 80241F68 54400006 */ bnel $v0, $zero, .L80241F84 +/* 7ECC7C 80241F6C 26310001 */ addiu $s1, $s1, 1 +/* 7ECC80 80241F70 0240102D */ daddu $v0, $s2, $zero +/* 7ECC84 80241F74 0056102A */ slt $v0, $v0, $s6 +/* 7ECC88 80241F78 10400006 */ beqz $v0, .L80241F94 +/* 7ECC8C 80241F7C 26520001 */ addiu $s2, $s2, 1 +/* 7ECC90 80241F80 26310001 */ addiu $s1, $s1, 1 +.L80241F84: +/* 7ECC94 80241F84 26100014 */ addiu $s0, $s0, 0x14 +/* 7ECC98 80241F88 2E220024 */ sltiu $v0, $s1, 0x24 +/* 7ECC9C 80241F8C 1440FFEE */ bnez $v0, .L80241F48 +/* 7ECCA0 80241F90 26730014 */ addiu $s3, $s3, 0x14 +.L80241F94: +/* 7ECCA4 80241F94 AE910084 */ sw $s1, 0x84($s4) +.L80241F98: +/* 7ECCA8 80241F98 8E620000 */ lw $v0, ($s3) +/* 7ECCAC 80241F9C 0280202D */ daddu $a0, $s4, $zero +/* 7ECCB0 80241FA0 AE95008C */ sw $s5, 0x8c($s4) +/* 7ECCB4 80241FA4 AE820088 */ sw $v0, 0x88($s4) +/* 7ECCB8 80241FA8 8E65000C */ lw $a1, 0xc($s3) +/* 7ECCBC 80241FAC 0C0B2026 */ jal set_variable +/* 7ECCC0 80241FB0 24060001 */ addiu $a2, $zero, 1 +/* 7ECCC4 80241FB4 0280202D */ daddu $a0, $s4, $zero +/* 7ECCC8 80241FB8 8E650010 */ lw $a1, 0x10($s3) +/* 7ECCCC 80241FBC 0C0B2026 */ jal set_variable +/* 7ECCD0 80241FC0 24060001 */ addiu $a2, $zero, 1 +/* 7ECCD4 80241FC4 8FBF002C */ lw $ra, 0x2c($sp) +/* 7ECCD8 80241FC8 8FB60028 */ lw $s6, 0x28($sp) +/* 7ECCDC 80241FCC 8FB50024 */ lw $s5, 0x24($sp) +/* 7ECCE0 80241FD0 8FB40020 */ lw $s4, 0x20($sp) +/* 7ECCE4 80241FD4 8FB3001C */ lw $s3, 0x1c($sp) +/* 7ECCE8 80241FD8 8FB20018 */ lw $s2, 0x18($sp) +/* 7ECCEC 80241FDC 8FB10014 */ lw $s1, 0x14($sp) +/* 7ECCF0 80241FE0 8FB00010 */ lw $s0, 0x10($sp) +/* 7ECCF4 80241FE4 24020002 */ addiu $v0, $zero, 2 +/* 7ECCF8 80241FE8 03E00008 */ jr $ra +/* 7ECCFC 80241FEC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0.s deleted file mode 100644 index 6fe4d558c5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FF0 -/* 7ECD00 80241FF0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7ECD04 80241FF4 AFB3001C */ sw $s3, 0x1c($sp) -/* 7ECD08 80241FF8 0080982D */ daddu $s3, $a0, $zero -/* 7ECD0C 80241FFC AFB20018 */ sw $s2, 0x18($sp) -/* 7ECD10 80242000 0000902D */ daddu $s2, $zero, $zero -/* 7ECD14 80242004 AFB10014 */ sw $s1, 0x14($sp) -/* 7ECD18 80242008 0240882D */ daddu $s1, $s2, $zero -/* 7ECD1C 8024200C AFB00010 */ sw $s0, 0x10($sp) -/* 7ECD20 80242010 3C108025 */ lui $s0, 0x8025 -/* 7ECD24 80242014 26108F28 */ addiu $s0, $s0, -0x70d8 -/* 7ECD28 80242018 AFBF0020 */ sw $ra, 0x20($sp) -.L8024201C: -/* 7ECD2C 8024201C 8E05FFF8 */ lw $a1, -8($s0) -/* 7ECD30 80242020 0C0B1EAF */ jal get_variable -/* 7ECD34 80242024 0260202D */ daddu $a0, $s3, $zero -/* 7ECD38 80242028 50400007 */ beql $v0, $zero, .L80242048 -/* 7ECD3C 8024202C 26310001 */ addiu $s1, $s1, 1 -/* 7ECD40 80242030 8E050000 */ lw $a1, ($s0) -/* 7ECD44 80242034 0C0B1EAF */ jal get_variable -/* 7ECD48 80242038 0260202D */ daddu $a0, $s3, $zero -/* 7ECD4C 8024203C 50400001 */ beql $v0, $zero, .L80242044 -/* 7ECD50 80242040 26520001 */ addiu $s2, $s2, 1 -.L80242044: -/* 7ECD54 80242044 26310001 */ addiu $s1, $s1, 1 -.L80242048: -/* 7ECD58 80242048 2E220024 */ sltiu $v0, $s1, 0x24 -/* 7ECD5C 8024204C 1440FFF3 */ bnez $v0, .L8024201C -/* 7ECD60 80242050 26100014 */ addiu $s0, $s0, 0x14 -/* 7ECD64 80242054 AE720084 */ sw $s2, 0x84($s3) -/* 7ECD68 80242058 8FBF0020 */ lw $ra, 0x20($sp) -/* 7ECD6C 8024205C 8FB3001C */ lw $s3, 0x1c($sp) -/* 7ECD70 80242060 8FB20018 */ lw $s2, 0x18($sp) -/* 7ECD74 80242064 8FB10014 */ lw $s1, 0x14($sp) -/* 7ECD78 80242068 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECD7C 8024206C 24020002 */ addiu $v0, $zero, 2 -/* 7ECD80 80242070 03E00008 */ jr $ra -/* 7ECD84 80242074 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s new file mode 100644 index 0000000000..b147176401 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241FF0_7ECD00.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FF0_7ECD00 +/* 7ECD00 80241FF0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7ECD04 80241FF4 AFB3001C */ sw $s3, 0x1c($sp) +/* 7ECD08 80241FF8 0080982D */ daddu $s3, $a0, $zero +/* 7ECD0C 80241FFC AFB20018 */ sw $s2, 0x18($sp) +/* 7ECD10 80242000 0000902D */ daddu $s2, $zero, $zero +/* 7ECD14 80242004 AFB10014 */ sw $s1, 0x14($sp) +/* 7ECD18 80242008 0240882D */ daddu $s1, $s2, $zero +/* 7ECD1C 8024200C AFB00010 */ sw $s0, 0x10($sp) +/* 7ECD20 80242010 3C108025 */ lui $s0, 0x8025 +/* 7ECD24 80242014 26108F28 */ addiu $s0, $s0, -0x70d8 +/* 7ECD28 80242018 AFBF0020 */ sw $ra, 0x20($sp) +.L8024201C: +/* 7ECD2C 8024201C 8E05FFF8 */ lw $a1, -8($s0) +/* 7ECD30 80242020 0C0B1EAF */ jal get_variable +/* 7ECD34 80242024 0260202D */ daddu $a0, $s3, $zero +/* 7ECD38 80242028 50400007 */ beql $v0, $zero, .L80242048 +/* 7ECD3C 8024202C 26310001 */ addiu $s1, $s1, 1 +/* 7ECD40 80242030 8E050000 */ lw $a1, ($s0) +/* 7ECD44 80242034 0C0B1EAF */ jal get_variable +/* 7ECD48 80242038 0260202D */ daddu $a0, $s3, $zero +/* 7ECD4C 8024203C 50400001 */ beql $v0, $zero, .L80242044 +/* 7ECD50 80242040 26520001 */ addiu $s2, $s2, 1 +.L80242044: +/* 7ECD54 80242044 26310001 */ addiu $s1, $s1, 1 +.L80242048: +/* 7ECD58 80242048 2E220024 */ sltiu $v0, $s1, 0x24 +/* 7ECD5C 8024204C 1440FFF3 */ bnez $v0, .L8024201C +/* 7ECD60 80242050 26100014 */ addiu $s0, $s0, 0x14 +/* 7ECD64 80242054 AE720084 */ sw $s2, 0x84($s3) +/* 7ECD68 80242058 8FBF0020 */ lw $ra, 0x20($sp) +/* 7ECD6C 8024205C 8FB3001C */ lw $s3, 0x1c($sp) +/* 7ECD70 80242060 8FB20018 */ lw $s2, 0x18($sp) +/* 7ECD74 80242064 8FB10014 */ lw $s1, 0x14($sp) +/* 7ECD78 80242068 8FB00010 */ lw $s0, 0x10($sp) +/* 7ECD7C 8024206C 24020002 */ addiu $v0, $zero, 2 +/* 7ECD80 80242070 03E00008 */ jr $ra +/* 7ECD84 80242074 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078.s deleted file mode 100644 index 2ebd247b31..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242078 -/* 7ECD88 80242078 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7ECD8C 8024207C AFB10014 */ sw $s1, 0x14($sp) -/* 7ECD90 80242080 0080882D */ daddu $s1, $a0, $zero -/* 7ECD94 80242084 AFBF0018 */ sw $ra, 0x18($sp) -/* 7ECD98 80242088 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECD9C 8024208C F7B80030 */ sdc1 $f24, 0x30($sp) -/* 7ECDA0 80242090 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 7ECDA4 80242094 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 7ECDA8 80242098 8E30000C */ lw $s0, 0xc($s1) -/* 7ECDAC 8024209C 8E050000 */ lw $a1, ($s0) -/* 7ECDB0 802420A0 0C0B1EAF */ jal get_variable -/* 7ECDB4 802420A4 26100004 */ addiu $s0, $s0, 4 -/* 7ECDB8 802420A8 8E050000 */ lw $a1, ($s0) -/* 7ECDBC 802420AC 26100004 */ addiu $s0, $s0, 4 -/* 7ECDC0 802420B0 4482C000 */ mtc1 $v0, $f24 -/* 7ECDC4 802420B4 00000000 */ nop -/* 7ECDC8 802420B8 4680C620 */ cvt.s.w $f24, $f24 -/* 7ECDCC 802420BC 0C0B1EAF */ jal get_variable -/* 7ECDD0 802420C0 0220202D */ daddu $a0, $s1, $zero -/* 7ECDD4 802420C4 8E050000 */ lw $a1, ($s0) -/* 7ECDD8 802420C8 26100004 */ addiu $s0, $s0, 4 -/* 7ECDDC 802420CC 4482B000 */ mtc1 $v0, $f22 -/* 7ECDE0 802420D0 00000000 */ nop -/* 7ECDE4 802420D4 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7ECDE8 802420D8 0C0B1EAF */ jal get_variable -/* 7ECDEC 802420DC 0220202D */ daddu $a0, $s1, $zero -/* 7ECDF0 802420E0 8E050000 */ lw $a1, ($s0) -/* 7ECDF4 802420E4 4482A000 */ mtc1 $v0, $f20 -/* 7ECDF8 802420E8 00000000 */ nop -/* 7ECDFC 802420EC 4680A520 */ cvt.s.w $f20, $f20 -/* 7ECE00 802420F0 0C0B1EAF */ jal get_variable -/* 7ECE04 802420F4 0220202D */ daddu $a0, $s1, $zero -/* 7ECE08 802420F8 44820000 */ mtc1 $v0, $f0 -/* 7ECE0C 802420FC 00000000 */ nop -/* 7ECE10 80242100 46800020 */ cvt.s.w $f0, $f0 -/* 7ECE14 80242104 46160001 */ sub.s $f0, $f0, $f22 -/* 7ECE18 80242108 4618A501 */ sub.s $f20, $f20, $f24 -/* 7ECE1C 8024210C 46140003 */ div.s $f0, $f0, $f20 -/* 7ECE20 80242110 46180602 */ mul.s $f24, $f0, $f24 -/* 7ECE24 80242114 00000000 */ nop -/* 7ECE28 80242118 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 7ECE2C 8024211C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 7ECE30 80242120 C4420028 */ lwc1 $f2, 0x28($v0) -/* 7ECE34 80242124 46020002 */ mul.s $f0, $f0, $f2 -/* 7ECE38 80242128 00000000 */ nop -/* 7ECE3C 8024212C 4618B581 */ sub.s $f22, $f22, $f24 -/* 7ECE40 80242130 46160000 */ add.s $f0, $f0, $f22 -/* 7ECE44 80242134 C4420030 */ lwc1 $f2, 0x30($v0) -/* 7ECE48 80242138 4600103C */ c.lt.s $f2, $f0 -/* 7ECE4C 8024213C 00000000 */ nop -/* 7ECE50 80242140 45000003 */ bc1f .L80242150 -/* 7ECE54 80242144 24020001 */ addiu $v0, $zero, 1 -/* 7ECE58 80242148 08090855 */ j .L80242154 -/* 7ECE5C 8024214C AE200084 */ sw $zero, 0x84($s1) -.L80242150: -/* 7ECE60 80242150 AE220084 */ sw $v0, 0x84($s1) -.L80242154: -/* 7ECE64 80242154 8FBF0018 */ lw $ra, 0x18($sp) -/* 7ECE68 80242158 8FB10014 */ lw $s1, 0x14($sp) -/* 7ECE6C 8024215C 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECE70 80242160 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 7ECE74 80242164 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 7ECE78 80242168 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 7ECE7C 8024216C 24020002 */ addiu $v0, $zero, 2 -/* 7ECE80 80242170 03E00008 */ jr $ra -/* 7ECE84 80242174 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s new file mode 100644 index 0000000000..5592ea8fd1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242078_7ECD88 +/* 7ECD88 80242078 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 7ECD8C 8024207C AFB10014 */ sw $s1, 0x14($sp) +/* 7ECD90 80242080 0080882D */ daddu $s1, $a0, $zero +/* 7ECD94 80242084 AFBF0018 */ sw $ra, 0x18($sp) +/* 7ECD98 80242088 AFB00010 */ sw $s0, 0x10($sp) +/* 7ECD9C 8024208C F7B80030 */ sdc1 $f24, 0x30($sp) +/* 7ECDA0 80242090 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 7ECDA4 80242094 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 7ECDA8 80242098 8E30000C */ lw $s0, 0xc($s1) +/* 7ECDAC 8024209C 8E050000 */ lw $a1, ($s0) +/* 7ECDB0 802420A0 0C0B1EAF */ jal get_variable +/* 7ECDB4 802420A4 26100004 */ addiu $s0, $s0, 4 +/* 7ECDB8 802420A8 8E050000 */ lw $a1, ($s0) +/* 7ECDBC 802420AC 26100004 */ addiu $s0, $s0, 4 +/* 7ECDC0 802420B0 4482C000 */ mtc1 $v0, $f24 +/* 7ECDC4 802420B4 00000000 */ nop +/* 7ECDC8 802420B8 4680C620 */ cvt.s.w $f24, $f24 +/* 7ECDCC 802420BC 0C0B1EAF */ jal get_variable +/* 7ECDD0 802420C0 0220202D */ daddu $a0, $s1, $zero +/* 7ECDD4 802420C4 8E050000 */ lw $a1, ($s0) +/* 7ECDD8 802420C8 26100004 */ addiu $s0, $s0, 4 +/* 7ECDDC 802420CC 4482B000 */ mtc1 $v0, $f22 +/* 7ECDE0 802420D0 00000000 */ nop +/* 7ECDE4 802420D4 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7ECDE8 802420D8 0C0B1EAF */ jal get_variable +/* 7ECDEC 802420DC 0220202D */ daddu $a0, $s1, $zero +/* 7ECDF0 802420E0 8E050000 */ lw $a1, ($s0) +/* 7ECDF4 802420E4 4482A000 */ mtc1 $v0, $f20 +/* 7ECDF8 802420E8 00000000 */ nop +/* 7ECDFC 802420EC 4680A520 */ cvt.s.w $f20, $f20 +/* 7ECE00 802420F0 0C0B1EAF */ jal get_variable +/* 7ECE04 802420F4 0220202D */ daddu $a0, $s1, $zero +/* 7ECE08 802420F8 44820000 */ mtc1 $v0, $f0 +/* 7ECE0C 802420FC 00000000 */ nop +/* 7ECE10 80242100 46800020 */ cvt.s.w $f0, $f0 +/* 7ECE14 80242104 46160001 */ sub.s $f0, $f0, $f22 +/* 7ECE18 80242108 4618A501 */ sub.s $f20, $f20, $f24 +/* 7ECE1C 8024210C 46140003 */ div.s $f0, $f0, $f20 +/* 7ECE20 80242110 46180602 */ mul.s $f24, $f0, $f24 +/* 7ECE24 80242114 00000000 */ nop +/* 7ECE28 80242118 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 7ECE2C 8024211C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 7ECE30 80242120 C4420028 */ lwc1 $f2, 0x28($v0) +/* 7ECE34 80242124 46020002 */ mul.s $f0, $f0, $f2 +/* 7ECE38 80242128 00000000 */ nop +/* 7ECE3C 8024212C 4618B581 */ sub.s $f22, $f22, $f24 +/* 7ECE40 80242130 46160000 */ add.s $f0, $f0, $f22 +/* 7ECE44 80242134 C4420030 */ lwc1 $f2, 0x30($v0) +/* 7ECE48 80242138 4600103C */ c.lt.s $f2, $f0 +/* 7ECE4C 8024213C 00000000 */ nop +/* 7ECE50 80242140 45000003 */ bc1f .L80242150 +/* 7ECE54 80242144 24020001 */ addiu $v0, $zero, 1 +/* 7ECE58 80242148 08090855 */ j .L80242154 +/* 7ECE5C 8024214C AE200084 */ sw $zero, 0x84($s1) +.L80242150: +/* 7ECE60 80242150 AE220084 */ sw $v0, 0x84($s1) +.L80242154: +/* 7ECE64 80242154 8FBF0018 */ lw $ra, 0x18($sp) +/* 7ECE68 80242158 8FB10014 */ lw $s1, 0x14($sp) +/* 7ECE6C 8024215C 8FB00010 */ lw $s0, 0x10($sp) +/* 7ECE70 80242160 D7B80030 */ ldc1 $f24, 0x30($sp) +/* 7ECE74 80242164 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 7ECE78 80242168 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 7ECE7C 8024216C 24020002 */ addiu $v0, $zero, 2 +/* 7ECE80 80242170 03E00008 */ jr $ra +/* 7ECE84 80242174 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178.s deleted file mode 100644 index cb2c4a97e5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242178 -/* 7ECE88 80242178 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7ECE8C 8024217C 3C05F5DE */ lui $a1, 0xf5de -/* 7ECE90 80242180 AFBF0014 */ sw $ra, 0x14($sp) -/* 7ECE94 80242184 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECE98 80242188 8C900148 */ lw $s0, 0x148($a0) -/* 7ECE9C 8024218C 0C0B1EAF */ jal get_variable -/* 7ECEA0 80242190 34A5019C */ ori $a1, $a1, 0x19c -/* 7ECEA4 80242194 82030004 */ lb $v1, 4($s0) -/* 7ECEA8 80242198 00021080 */ sll $v0, $v0, 2 -/* 7ECEAC 8024219C 00031880 */ sll $v1, $v1, 2 -/* 7ECEB0 802421A0 3C04800B */ lui $a0, 0x800b -/* 7ECEB4 802421A4 00832021 */ addu $a0, $a0, $v1 -/* 7ECEB8 802421A8 8C840F38 */ lw $a0, 0xf38($a0) -/* 7ECEBC 802421AC 3C038025 */ lui $v1, 0x8025 -/* 7ECEC0 802421B0 00621821 */ addu $v1, $v1, $v0 -/* 7ECEC4 802421B4 9463A632 */ lhu $v1, -0x59ce($v1) -/* 7ECEC8 802421B8 A4830044 */ sh $v1, 0x44($a0) -/* 7ECECC 802421BC 8FBF0014 */ lw $ra, 0x14($sp) -/* 7ECED0 802421C0 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECED4 802421C4 24020002 */ addiu $v0, $zero, 2 -/* 7ECED8 802421C8 03E00008 */ jr $ra -/* 7ECEDC 802421CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s new file mode 100644 index 0000000000..b57040463b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242178_7ECE88.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242178_7ECE88 +/* 7ECE88 80242178 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7ECE8C 8024217C 3C05F5DE */ lui $a1, 0xf5de +/* 7ECE90 80242180 AFBF0014 */ sw $ra, 0x14($sp) +/* 7ECE94 80242184 AFB00010 */ sw $s0, 0x10($sp) +/* 7ECE98 80242188 8C900148 */ lw $s0, 0x148($a0) +/* 7ECE9C 8024218C 0C0B1EAF */ jal get_variable +/* 7ECEA0 80242190 34A5019C */ ori $a1, $a1, 0x19c +/* 7ECEA4 80242194 82030004 */ lb $v1, 4($s0) +/* 7ECEA8 80242198 00021080 */ sll $v0, $v0, 2 +/* 7ECEAC 8024219C 00031880 */ sll $v1, $v1, 2 +/* 7ECEB0 802421A0 3C04800B */ lui $a0, 0x800b +/* 7ECEB4 802421A4 00832021 */ addu $a0, $a0, $v1 +/* 7ECEB8 802421A8 8C840F38 */ lw $a0, 0xf38($a0) +/* 7ECEBC 802421AC 3C038025 */ lui $v1, 0x8025 +/* 7ECEC0 802421B0 00621821 */ addu $v1, $v1, $v0 +/* 7ECEC4 802421B4 9463A632 */ lhu $v1, -0x59ce($v1) +/* 7ECEC8 802421B8 A4830044 */ sh $v1, 0x44($a0) +/* 7ECECC 802421BC 8FBF0014 */ lw $ra, 0x14($sp) +/* 7ECED0 802421C0 8FB00010 */ lw $s0, 0x10($sp) +/* 7ECED4 802421C4 24020002 */ addiu $v0, $zero, 2 +/* 7ECED8 802421C8 03E00008 */ jr $ra +/* 7ECEDC 802421CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802421D0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802421D0.s deleted file mode 100644 index ba56f52681..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802421D0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421D0 -/* 7ECEE0 802421D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7ECEE4 802421D4 2404008A */ addiu $a0, $zero, 0x8a -/* 7ECEE8 802421D8 2405FFFF */ addiu $a1, $zero, -1 -/* 7ECEEC 802421DC 24060001 */ addiu $a2, $zero, 1 -/* 7ECEF0 802421E0 AFBF0010 */ sw $ra, 0x10($sp) -/* 7ECEF4 802421E4 0C046E54 */ jal func_8011B950 -/* 7ECEF8 802421E8 00C0382D */ daddu $a3, $a2, $zero -/* 7ECEFC 802421EC 0000202D */ daddu $a0, $zero, $zero -/* 7ECF00 802421F0 0080282D */ daddu $a1, $a0, $zero -/* 7ECF04 802421F4 0080302D */ daddu $a2, $a0, $zero -/* 7ECF08 802421F8 0C046F97 */ jal set_background_color_blend -/* 7ECF0C 802421FC 240700FF */ addiu $a3, $zero, 0xff -/* 7ECF10 80242200 3C02800B */ lui $v0, %hi(gCameras) -/* 7ECF14 80242204 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 7ECF18 80242208 A440002C */ sh $zero, 0x2c($v0) -/* 7ECF1C 8024220C A440002E */ sh $zero, 0x2e($v0) -/* 7ECF20 80242210 A4400030 */ sh $zero, 0x30($v0) -/* 7ECF24 80242214 8FBF0010 */ lw $ra, 0x10($sp) -/* 7ECF28 80242218 24020002 */ addiu $v0, $zero, 2 -/* 7ECF2C 8024221C 03E00008 */ jr $ra -/* 7ECF30 80242220 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802421D0_7ECEE0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802421D0_7ECEE0.s new file mode 100644 index 0000000000..783ed8a82c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802421D0_7ECEE0.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421D0_7ECEE0 +/* 7ECEE0 802421D0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7ECEE4 802421D4 2404008A */ addiu $a0, $zero, 0x8a +/* 7ECEE8 802421D8 2405FFFF */ addiu $a1, $zero, -1 +/* 7ECEEC 802421DC 24060001 */ addiu $a2, $zero, 1 +/* 7ECEF0 802421E0 AFBF0010 */ sw $ra, 0x10($sp) +/* 7ECEF4 802421E4 0C046E54 */ jal func_8011B950 +/* 7ECEF8 802421E8 00C0382D */ daddu $a3, $a2, $zero +/* 7ECEFC 802421EC 0000202D */ daddu $a0, $zero, $zero +/* 7ECF00 802421F0 0080282D */ daddu $a1, $a0, $zero +/* 7ECF04 802421F4 0080302D */ daddu $a2, $a0, $zero +/* 7ECF08 802421F8 0C046F97 */ jal set_background_color_blend +/* 7ECF0C 802421FC 240700FF */ addiu $a3, $zero, 0xff +/* 7ECF10 80242200 3C02800B */ lui $v0, %hi(gCameras) +/* 7ECF14 80242204 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* 7ECF18 80242208 A440002C */ sh $zero, 0x2c($v0) +/* 7ECF1C 8024220C A440002E */ sh $zero, 0x2e($v0) +/* 7ECF20 80242210 A4400030 */ sh $zero, 0x30($v0) +/* 7ECF24 80242214 8FBF0010 */ lw $ra, 0x10($sp) +/* 7ECF28 80242218 24020002 */ addiu $v0, $zero, 2 +/* 7ECF2C 8024221C 03E00008 */ jr $ra +/* 7ECF30 80242220 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224.s deleted file mode 100644 index ec6f65c5fb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242224 -/* 7ECF34 80242224 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7ECF38 80242228 24020001 */ addiu $v0, $zero, 1 -/* 7ECF3C 8024222C AFBF0010 */ sw $ra, 0x10($sp) -/* 7ECF40 80242230 3C018011 */ lui $at, 0x8011 -/* 7ECF44 80242234 A022F292 */ sb $v0, -0xd6e($at) -/* 7ECF48 80242238 0C03A6DB */ jal sync_status_menu -/* 7ECF4C 8024223C 00000000 */ nop -/* 7ECF50 80242240 8FBF0010 */ lw $ra, 0x10($sp) -/* 7ECF54 80242244 24020002 */ addiu $v0, $zero, 2 -/* 7ECF58 80242248 03E00008 */ jr $ra -/* 7ECF5C 8024224C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s new file mode 100644 index 0000000000..34b66ddccc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242224_7ECF34 +/* 7ECF34 80242224 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7ECF38 80242228 24020001 */ addiu $v0, $zero, 1 +/* 7ECF3C 8024222C AFBF0010 */ sw $ra, 0x10($sp) +/* 7ECF40 80242230 3C018011 */ lui $at, 0x8011 +/* 7ECF44 80242234 A022F292 */ sb $v0, -0xd6e($at) +/* 7ECF48 80242238 0C03A6DB */ jal sync_status_menu +/* 7ECF4C 8024223C 00000000 */ nop +/* 7ECF50 80242240 8FBF0010 */ lw $ra, 0x10($sp) +/* 7ECF54 80242244 24020002 */ addiu $v0, $zero, 2 +/* 7ECF58 80242248 03E00008 */ jr $ra +/* 7ECF5C 8024224C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242250.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242250.s deleted file mode 100644 index 5286173967..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242250.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242250 -/* 7ECF60 80242250 3C038011 */ lui $v1, %hi(gPlayerData) -/* 7ECF64 80242254 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 7ECF68 80242258 8C6202BC */ lw $v0, 0x2bc($v1) -/* 7ECF6C 8024225C 8C630324 */ lw $v1, 0x324($v1) -/* 7ECF70 80242260 00431023 */ subu $v0, $v0, $v1 -/* 7ECF74 80242264 3C0391A2 */ lui $v1, 0x91a2 -/* 7ECF78 80242268 3463B3C5 */ ori $v1, $v1, 0xb3c5 -/* 7ECF7C 8024226C 00430019 */ multu $v0, $v1 -/* 7ECF80 80242270 8C830084 */ lw $v1, 0x84($a0) -/* 7ECF84 80242274 00002810 */ mfhi $a1 -/* 7ECF88 80242278 000512C2 */ srl $v0, $a1, 0xb -/* 7ECF8C 8024227C 0043102A */ slt $v0, $v0, $v1 -/* 7ECF90 80242280 AC820084 */ sw $v0, 0x84($a0) -/* 7ECF94 80242284 03E00008 */ jr $ra -/* 7ECF98 80242288 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242250_7ECF60.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242250_7ECF60.s new file mode 100644 index 0000000000..c66c61d16b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242250_7ECF60.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242250_7ECF60 +/* 7ECF60 80242250 3C038011 */ lui $v1, %hi(gPlayerData) +/* 7ECF64 80242254 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 7ECF68 80242258 8C6202BC */ lw $v0, 0x2bc($v1) +/* 7ECF6C 8024225C 8C630324 */ lw $v1, 0x324($v1) +/* 7ECF70 80242260 00431023 */ subu $v0, $v0, $v1 +/* 7ECF74 80242264 3C0391A2 */ lui $v1, 0x91a2 +/* 7ECF78 80242268 3463B3C5 */ ori $v1, $v1, 0xb3c5 +/* 7ECF7C 8024226C 00430019 */ multu $v0, $v1 +/* 7ECF80 80242270 8C830084 */ lw $v1, 0x84($a0) +/* 7ECF84 80242274 00002810 */ mfhi $a1 +/* 7ECF88 80242278 000512C2 */ srl $v0, $a1, 0xb +/* 7ECF8C 8024227C 0043102A */ slt $v0, $v0, $v1 +/* 7ECF90 80242280 AC820084 */ sw $v0, 0x84($a0) +/* 7ECF94 80242284 03E00008 */ jr $ra +/* 7ECF98 80242288 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C.s deleted file mode 100644 index 0c983d891d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024228C -/* 7ECF9C 8024228C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7ECFA0 80242290 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECFA4 80242294 AFBF0014 */ sw $ra, 0x14($sp) -/* 7ECFA8 80242298 0C039D7B */ jal get_item_count -/* 7ECFAC 8024229C 0080802D */ daddu $s0, $a0, $zero -/* 7ECFB0 802422A0 AE020084 */ sw $v0, 0x84($s0) -/* 7ECFB4 802422A4 8FBF0014 */ lw $ra, 0x14($sp) -/* 7ECFB8 802422A8 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECFBC 802422AC 24020002 */ addiu $v0, $zero, 2 -/* 7ECFC0 802422B0 03E00008 */ jr $ra -/* 7ECFC4 802422B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7ECFC8 802422B8 00000000 */ nop -/* 7ECFCC 802422BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C_7ECF9C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C_7ECF9C.s new file mode 100644 index 0000000000..e74e2ad263 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024228C_7ECF9C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024228C_7ECF9C +/* 7ECF9C 8024228C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7ECFA0 80242290 AFB00010 */ sw $s0, 0x10($sp) +/* 7ECFA4 80242294 AFBF0014 */ sw $ra, 0x14($sp) +/* 7ECFA8 80242298 0C039D7B */ jal get_item_count +/* 7ECFAC 8024229C 0080802D */ daddu $s0, $a0, $zero +/* 7ECFB0 802422A0 AE020084 */ sw $v0, 0x84($s0) +/* 7ECFB4 802422A4 8FBF0014 */ lw $ra, 0x14($sp) +/* 7ECFB8 802422A8 8FB00010 */ lw $s0, 0x10($sp) +/* 7ECFBC 802422AC 24020002 */ addiu $v0, $zero, 2 +/* 7ECFC0 802422B0 03E00008 */ jr $ra +/* 7ECFC4 802422B4 27BD0018 */ addiu $sp, $sp, 0x18 +/* 7ECFC8 802422B8 00000000 */ nop +/* 7ECFCC 802422BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0.s b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0.s deleted file mode 100644 index 77f370f26a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422C0 -/* 7ECFD0 802422C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7ECFD4 802422C4 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECFD8 802422C8 0080802D */ daddu $s0, $a0, $zero -/* 7ECFDC 802422CC AFB20018 */ sw $s2, 0x18($sp) -/* 7ECFE0 802422D0 AFBF001C */ sw $ra, 0x1c($sp) -/* 7ECFE4 802422D4 AFB10014 */ sw $s1, 0x14($sp) -/* 7ECFE8 802422D8 8E02000C */ lw $v0, 0xc($s0) -/* 7ECFEC 802422DC 10A00008 */ beqz $a1, .L80242300 -/* 7ECFF0 802422E0 0000902D */ daddu $s2, $zero, $zero -/* 7ECFF4 802422E4 8C450000 */ lw $a1, ($v0) -/* 7ECFF8 802422E8 0C0B1EAF */ jal get_variable -/* 7ECFFC 802422EC 00000000 */ nop -/* 7ED000 802422F0 AE020070 */ sw $v0, 0x70($s0) -/* 7ED004 802422F4 AE000074 */ sw $zero, 0x74($s0) -/* 7ED008 802422F8 8C420014 */ lw $v0, 0x14($v0) -/* 7ED00C 802422FC AE020078 */ sw $v0, 0x78($s0) -.L80242300: -/* 7ED010 80242300 8E050078 */ lw $a1, 0x78($s0) -/* 7ED014 80242304 8E110070 */ lw $s1, 0x70($s0) -/* 7ED018 80242308 0C0B1EAF */ jal get_variable -/* 7ED01C 8024230C 0200202D */ daddu $a0, $s0, $zero -/* 7ED020 80242310 10400006 */ beqz $v0, .L8024232C -/* 7ED024 80242314 24030002 */ addiu $v1, $zero, 2 -/* 7ED028 80242318 8E020074 */ lw $v0, 0x74($s0) -/* 7ED02C 8024231C 10430027 */ beq $v0, $v1, .L802423BC -/* 7ED030 80242320 00000000 */ nop -/* 7ED034 80242324 080908EE */ j .L802423B8 -/* 7ED038 80242328 AE030074 */ sw $v1, 0x74($s0) -.L8024232C: -/* 7ED03C 8024232C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 7ED040 80242330 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 7ED044 80242334 8E260000 */ lw $a2, ($s1) -/* 7ED048 80242338 8E270004 */ lw $a3, 4($s1) -/* 7ED04C 8024233C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 7ED050 80242340 0C00A7B5 */ jal dist2D -/* 7ED054 80242344 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 7ED058 80242348 8E030074 */ lw $v1, 0x74($s0) -/* 7ED05C 8024234C 24040001 */ addiu $a0, $zero, 1 -/* 7ED060 80242350 10640013 */ beq $v1, $a0, .L802423A0 -/* 7ED064 80242354 46000086 */ mov.s $f2, $f0 -/* 7ED068 80242358 28620002 */ slti $v0, $v1, 2 -/* 7ED06C 8024235C 50400005 */ beql $v0, $zero, .L80242374 -/* 7ED070 80242360 24020002 */ addiu $v0, $zero, 2 -/* 7ED074 80242364 10600007 */ beqz $v1, .L80242384 -/* 7ED078 80242368 00000000 */ nop -/* 7ED07C 8024236C 080908EF */ j .L802423BC -/* 7ED080 80242370 00000000 */ nop -.L80242374: -/* 7ED084 80242374 50620010 */ beql $v1, $v0, .L802423B8 -/* 7ED088 80242378 AE040074 */ sw $a0, 0x74($s0) -/* 7ED08C 8024237C 080908EF */ j .L802423BC -/* 7ED090 80242380 00000000 */ nop -.L80242384: -/* 7ED094 80242384 C6200008 */ lwc1 $f0, 8($s1) -/* 7ED098 80242388 4600103C */ c.lt.s $f2, $f0 -/* 7ED09C 8024238C 00000000 */ nop -/* 7ED0A0 80242390 4500000A */ bc1f .L802423BC -/* 7ED0A4 80242394 00000000 */ nop -/* 7ED0A8 80242398 080908EE */ j .L802423B8 -/* 7ED0AC 8024239C AE040074 */ sw $a0, 0x74($s0) -.L802423A0: -/* 7ED0B0 802423A0 C620000C */ lwc1 $f0, 0xc($s1) -/* 7ED0B4 802423A4 4602003C */ c.lt.s $f0, $f2 -/* 7ED0B8 802423A8 00000000 */ nop -/* 7ED0BC 802423AC 45000003 */ bc1f .L802423BC -/* 7ED0C0 802423B0 00000000 */ nop -/* 7ED0C4 802423B4 AE000074 */ sw $zero, 0x74($s0) -.L802423B8: -/* 7ED0C8 802423B8 24120001 */ addiu $s2, $zero, 1 -.L802423BC: -/* 7ED0CC 802423BC 12400005 */ beqz $s2, .L802423D4 -/* 7ED0D0 802423C0 00000000 */ nop -/* 7ED0D4 802423C4 8E250010 */ lw $a1, 0x10($s1) -/* 7ED0D8 802423C8 86060076 */ lh $a2, 0x76($s0) -/* 7ED0DC 802423CC 0C052A95 */ jal func_8014AA54 -/* 7ED0E0 802423D0 0000202D */ daddu $a0, $zero, $zero -.L802423D4: -/* 7ED0E4 802423D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 7ED0E8 802423D8 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED0EC 802423DC 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED0F0 802423E0 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED0F4 802423E4 0000102D */ daddu $v0, $zero, $zero -/* 7ED0F8 802423E8 03E00008 */ jr $ra -/* 7ED0FC 802423EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s new file mode 100644 index 0000000000..40364bb9e2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802422C0_7ECFD0.s @@ -0,0 +1,88 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422C0_7ECFD0 +/* 7ECFD0 802422C0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7ECFD4 802422C4 AFB00010 */ sw $s0, 0x10($sp) +/* 7ECFD8 802422C8 0080802D */ daddu $s0, $a0, $zero +/* 7ECFDC 802422CC AFB20018 */ sw $s2, 0x18($sp) +/* 7ECFE0 802422D0 AFBF001C */ sw $ra, 0x1c($sp) +/* 7ECFE4 802422D4 AFB10014 */ sw $s1, 0x14($sp) +/* 7ECFE8 802422D8 8E02000C */ lw $v0, 0xc($s0) +/* 7ECFEC 802422DC 10A00008 */ beqz $a1, .L80242300 +/* 7ECFF0 802422E0 0000902D */ daddu $s2, $zero, $zero +/* 7ECFF4 802422E4 8C450000 */ lw $a1, ($v0) +/* 7ECFF8 802422E8 0C0B1EAF */ jal get_variable +/* 7ECFFC 802422EC 00000000 */ nop +/* 7ED000 802422F0 AE020070 */ sw $v0, 0x70($s0) +/* 7ED004 802422F4 AE000074 */ sw $zero, 0x74($s0) +/* 7ED008 802422F8 8C420014 */ lw $v0, 0x14($v0) +/* 7ED00C 802422FC AE020078 */ sw $v0, 0x78($s0) +.L80242300: +/* 7ED010 80242300 8E050078 */ lw $a1, 0x78($s0) +/* 7ED014 80242304 8E110070 */ lw $s1, 0x70($s0) +/* 7ED018 80242308 0C0B1EAF */ jal get_variable +/* 7ED01C 8024230C 0200202D */ daddu $a0, $s0, $zero +/* 7ED020 80242310 10400006 */ beqz $v0, .L8024232C +/* 7ED024 80242314 24030002 */ addiu $v1, $zero, 2 +/* 7ED028 80242318 8E020074 */ lw $v0, 0x74($s0) +/* 7ED02C 8024231C 10430027 */ beq $v0, $v1, .L802423BC +/* 7ED030 80242320 00000000 */ nop +/* 7ED034 80242324 080908EE */ j .L802423B8 +/* 7ED038 80242328 AE030074 */ sw $v1, 0x74($s0) +.L8024232C: +/* 7ED03C 8024232C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 7ED040 80242330 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 7ED044 80242334 8E260000 */ lw $a2, ($s1) +/* 7ED048 80242338 8E270004 */ lw $a3, 4($s1) +/* 7ED04C 8024233C C44C0028 */ lwc1 $f12, 0x28($v0) +/* 7ED050 80242340 0C00A7B5 */ jal dist2D +/* 7ED054 80242344 C44E0030 */ lwc1 $f14, 0x30($v0) +/* 7ED058 80242348 8E030074 */ lw $v1, 0x74($s0) +/* 7ED05C 8024234C 24040001 */ addiu $a0, $zero, 1 +/* 7ED060 80242350 10640013 */ beq $v1, $a0, .L802423A0 +/* 7ED064 80242354 46000086 */ mov.s $f2, $f0 +/* 7ED068 80242358 28620002 */ slti $v0, $v1, 2 +/* 7ED06C 8024235C 50400005 */ beql $v0, $zero, .L80242374 +/* 7ED070 80242360 24020002 */ addiu $v0, $zero, 2 +/* 7ED074 80242364 10600007 */ beqz $v1, .L80242384 +/* 7ED078 80242368 00000000 */ nop +/* 7ED07C 8024236C 080908EF */ j .L802423BC +/* 7ED080 80242370 00000000 */ nop +.L80242374: +/* 7ED084 80242374 50620010 */ beql $v1, $v0, .L802423B8 +/* 7ED088 80242378 AE040074 */ sw $a0, 0x74($s0) +/* 7ED08C 8024237C 080908EF */ j .L802423BC +/* 7ED090 80242380 00000000 */ nop +.L80242384: +/* 7ED094 80242384 C6200008 */ lwc1 $f0, 8($s1) +/* 7ED098 80242388 4600103C */ c.lt.s $f2, $f0 +/* 7ED09C 8024238C 00000000 */ nop +/* 7ED0A0 80242390 4500000A */ bc1f .L802423BC +/* 7ED0A4 80242394 00000000 */ nop +/* 7ED0A8 80242398 080908EE */ j .L802423B8 +/* 7ED0AC 8024239C AE040074 */ sw $a0, 0x74($s0) +.L802423A0: +/* 7ED0B0 802423A0 C620000C */ lwc1 $f0, 0xc($s1) +/* 7ED0B4 802423A4 4602003C */ c.lt.s $f0, $f2 +/* 7ED0B8 802423A8 00000000 */ nop +/* 7ED0BC 802423AC 45000003 */ bc1f .L802423BC +/* 7ED0C0 802423B0 00000000 */ nop +/* 7ED0C4 802423B4 AE000074 */ sw $zero, 0x74($s0) +.L802423B8: +/* 7ED0C8 802423B8 24120001 */ addiu $s2, $zero, 1 +.L802423BC: +/* 7ED0CC 802423BC 12400005 */ beqz $s2, .L802423D4 +/* 7ED0D0 802423C0 00000000 */ nop +/* 7ED0D4 802423C4 8E250010 */ lw $a1, 0x10($s1) +/* 7ED0D8 802423C8 86060076 */ lh $a2, 0x76($s0) +/* 7ED0DC 802423CC 0C052A95 */ jal func_8014AA54 +/* 7ED0E0 802423D0 0000202D */ daddu $a0, $zero, $zero +.L802423D4: +/* 7ED0E4 802423D4 8FBF001C */ lw $ra, 0x1c($sp) +/* 7ED0E8 802423D8 8FB20018 */ lw $s2, 0x18($sp) +/* 7ED0EC 802423DC 8FB10014 */ lw $s1, 0x14($sp) +/* 7ED0F0 802423E0 8FB00010 */ lw $s0, 0x10($sp) +/* 7ED0F4 802423E4 0000102D */ daddu $v0, $zero, $zero +/* 7ED0F8 802423E8 03E00008 */ jr $ra +/* 7ED0FC 802423EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0.s b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0.s deleted file mode 100644 index 368a827593..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0.s +++ /dev/null @@ -1,100 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423F0 -/* 7ED100 802423F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7ED104 802423F4 AFB20018 */ sw $s2, 0x18($sp) -/* 7ED108 802423F8 3C12E200 */ lui $s2, 0xe200 -/* 7ED10C 802423FC 36521D00 */ ori $s2, $s2, 0x1d00 -/* 7ED110 80242400 AFB3001C */ sw $s3, 0x1c($sp) -/* 7ED114 80242404 3C13E200 */ lui $s3, 0xe200 -/* 7ED118 80242408 3673001C */ ori $s3, $s3, 0x1c -/* 7ED11C 8024240C 3C060F0A */ lui $a2, 0xf0a -/* 7ED120 80242410 34C64010 */ ori $a2, $a2, 0x4010 -/* 7ED124 80242414 3C08FCFF */ lui $t0, 0xfcff -/* 7ED128 80242418 3508FFFF */ ori $t0, $t0, 0xffff -/* 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, 0x800a -/* 7ED13C 8024242C 2610A66C */ addiu $s0, $s0, -0x5994 -/* 7ED140 80242430 240400D6 */ addiu $a0, $zero, 0xd6 -/* 7ED144 80242434 24030004 */ addiu $v1, $zero, 4 -/* 7ED148 80242438 AFBF0020 */ sw $ra, 0x20($sp) -/* 7ED14C 8024243C AFB10014 */ sw $s1, 0x14($sp) -/* 7ED150 80242440 8E020000 */ lw $v0, ($s0) -/* 7ED154 80242444 3C11E700 */ lui $s1, 0xe700 -/* 7ED158 80242448 0040282D */ daddu $a1, $v0, $zero -/* 7ED15C 8024244C 24420008 */ addiu $v0, $v0, 8 -/* 7ED160 80242450 AE020000 */ sw $v0, ($s0) -/* 7ED164 80242454 ACA30004 */ sw $v1, 4($a1) -/* 7ED168 80242458 24430008 */ addiu $v1, $v0, 8 -/* 7ED16C 8024245C ACB20000 */ sw $s2, ($a1) -/* 7ED170 80242460 AE030000 */ sw $v1, ($s0) -/* 7ED174 80242464 3C03EE00 */ lui $v1, 0xee00 -/* 7ED178 80242468 AC430000 */ sw $v1, ($v0) -/* 7ED17C 8024246C 3C037FF0 */ lui $v1, 0x7ff0 -/* 7ED180 80242470 AC430004 */ sw $v1, 4($v0) -/* 7ED184 80242474 24430010 */ addiu $v1, $v0, 0x10 -/* 7ED188 80242478 AE030000 */ sw $v1, ($s0) -/* 7ED18C 8024247C 24430018 */ addiu $v1, $v0, 0x18 -/* 7ED190 80242480 AC530008 */ sw $s3, 8($v0) -/* 7ED194 80242484 AC46000C */ sw $a2, 0xc($v0) -/* 7ED198 80242488 AE030000 */ sw $v1, ($s0) -/* 7ED19C 8024248C 24430020 */ addiu $v1, $v0, 0x20 -/* 7ED1A0 80242490 AC480010 */ sw $t0, 0x10($v0) -/* 7ED1A4 80242494 AC470014 */ sw $a3, 0x14($v0) -/* 7ED1A8 80242498 AE030000 */ sw $v1, ($s0) -/* 7ED1AC 8024249C 3C03FA00 */ lui $v1, 0xfa00 -/* 7ED1B0 802424A0 AC430018 */ sw $v1, 0x18($v0) -/* 7ED1B4 802424A4 34038000 */ ori $v1, $zero, 0x8000 -/* 7ED1B8 802424A8 AC43001C */ sw $v1, 0x1c($v0) -/* 7ED1BC 802424AC 24430028 */ addiu $v1, $v0, 0x28 -/* 7ED1C0 802424B0 AE030000 */ sw $v1, ($s0) -/* 7ED1C4 802424B4 AC510020 */ sw $s1, 0x20($v0) -/* 7ED1C8 802424B8 0C046C04 */ jal get_model_list_index_from_tree_index -/* 7ED1CC 802424BC AC400024 */ sw $zero, 0x24($v0) -/* 7ED1D0 802424C0 0C046B4C */ jal get_model_from_list_index -/* 7ED1D4 802424C4 0040202D */ daddu $a0, $v0, $zero -/* 7ED1D8 802424C8 3C07E300 */ lui $a3, 0xe300 -/* 7ED1DC 802424CC 34E70A01 */ ori $a3, $a3, 0xa01 -/* 7ED1E0 802424D0 3C080C18 */ lui $t0, 0xc18 -/* 7ED1E4 802424D4 350849D8 */ ori $t0, $t0, 0x49d8 -/* 7ED1E8 802424D8 0200202D */ daddu $a0, $s0, $zero -/* 7ED1EC 802424DC 8E030000 */ lw $v1, ($s0) -/* 7ED1F0 802424E0 3C05DE00 */ lui $a1, 0xde00 -/* 7ED1F4 802424E4 0060302D */ daddu $a2, $v1, $zero -/* 7ED1F8 802424E8 24630008 */ addiu $v1, $v1, 8 -/* 7ED1FC 802424EC AC830000 */ sw $v1, ($a0) -/* 7ED200 802424F0 ACC50000 */ sw $a1, ($a2) -/* 7ED204 802424F4 24650008 */ addiu $a1, $v1, 8 -/* 7ED208 802424F8 AC850000 */ sw $a1, ($a0) -/* 7ED20C 802424FC 8C450008 */ lw $a1, 8($v0) -/* 7ED210 80242500 24620010 */ addiu $v0, $v1, 0x10 -/* 7ED214 80242504 AC820000 */ sw $v0, ($a0) -/* 7ED218 80242508 8CA50004 */ lw $a1, 4($a1) -/* 7ED21C 8024250C 24620018 */ addiu $v0, $v1, 0x18 -/* 7ED220 80242510 AC820000 */ sw $v0, ($a0) -/* 7ED224 80242514 8CA50000 */ lw $a1, ($a1) -/* 7ED228 80242518 24620020 */ addiu $v0, $v1, 0x20 -/* 7ED22C 8024251C AC820000 */ sw $v0, ($a0) -/* 7ED230 80242520 3C020010 */ lui $v0, 0x10 -/* 7ED234 80242524 ACC50004 */ sw $a1, 4($a2) -/* 7ED238 80242528 240500D6 */ addiu $a1, $zero, 0xd6 -/* 7ED23C 8024252C AC710000 */ sw $s1, ($v1) -/* 7ED240 80242530 AC600004 */ sw $zero, 4($v1) -/* 7ED244 80242534 AC670008 */ sw $a3, 8($v1) -/* 7ED248 80242538 AC62000C */ sw $v0, 0xc($v1) -/* 7ED24C 8024253C AC720010 */ sw $s2, 0x10($v1) -/* 7ED250 80242540 AC600014 */ sw $zero, 0x14($v1) -/* 7ED254 80242544 AC730018 */ sw $s3, 0x18($v1) -/* 7ED258 80242548 0C0475CB */ jal func_8011D72C -/* 7ED25C 8024254C AC68001C */ sw $t0, 0x1c($v1) -/* 7ED260 80242550 8FBF0020 */ lw $ra, 0x20($sp) -/* 7ED264 80242554 8FB3001C */ lw $s3, 0x1c($sp) -/* 7ED268 80242558 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED26C 8024255C 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED270 80242560 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED274 80242564 03E00008 */ jr $ra -/* 7ED278 80242568 27BD0028 */ addiu $sp, $sp, 0x28 -/* 7ED27C 8024256C 00000000 */ nop 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 new file mode 100644 index 0000000000..171c7a04d9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ECFD0/func_802423F0_7ED100.s @@ -0,0 +1,100 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423F0_7ED100 +/* 7ED100 802423F0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7ED104 802423F4 AFB20018 */ sw $s2, 0x18($sp) +/* 7ED108 802423F8 3C12E200 */ lui $s2, 0xe200 +/* 7ED10C 802423FC 36521D00 */ ori $s2, $s2, 0x1d00 +/* 7ED110 80242400 AFB3001C */ sw $s3, 0x1c($sp) +/* 7ED114 80242404 3C13E200 */ lui $s3, 0xe200 +/* 7ED118 80242408 3673001C */ ori $s3, $s3, 0x1c +/* 7ED11C 8024240C 3C060F0A */ lui $a2, 0xf0a +/* 7ED120 80242410 34C64010 */ ori $a2, $a2, 0x4010 +/* 7ED124 80242414 3C08FCFF */ lui $t0, 0xfcff +/* 7ED128 80242418 3508FFFF */ ori $t0, $t0, 0xffff +/* 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, 0x800a +/* 7ED13C 8024242C 2610A66C */ addiu $s0, $s0, -0x5994 +/* 7ED140 80242430 240400D6 */ addiu $a0, $zero, 0xd6 +/* 7ED144 80242434 24030004 */ addiu $v1, $zero, 4 +/* 7ED148 80242438 AFBF0020 */ sw $ra, 0x20($sp) +/* 7ED14C 8024243C AFB10014 */ sw $s1, 0x14($sp) +/* 7ED150 80242440 8E020000 */ lw $v0, ($s0) +/* 7ED154 80242444 3C11E700 */ lui $s1, 0xe700 +/* 7ED158 80242448 0040282D */ daddu $a1, $v0, $zero +/* 7ED15C 8024244C 24420008 */ addiu $v0, $v0, 8 +/* 7ED160 80242450 AE020000 */ sw $v0, ($s0) +/* 7ED164 80242454 ACA30004 */ sw $v1, 4($a1) +/* 7ED168 80242458 24430008 */ addiu $v1, $v0, 8 +/* 7ED16C 8024245C ACB20000 */ sw $s2, ($a1) +/* 7ED170 80242460 AE030000 */ sw $v1, ($s0) +/* 7ED174 80242464 3C03EE00 */ lui $v1, 0xee00 +/* 7ED178 80242468 AC430000 */ sw $v1, ($v0) +/* 7ED17C 8024246C 3C037FF0 */ lui $v1, 0x7ff0 +/* 7ED180 80242470 AC430004 */ sw $v1, 4($v0) +/* 7ED184 80242474 24430010 */ addiu $v1, $v0, 0x10 +/* 7ED188 80242478 AE030000 */ sw $v1, ($s0) +/* 7ED18C 8024247C 24430018 */ addiu $v1, $v0, 0x18 +/* 7ED190 80242480 AC530008 */ sw $s3, 8($v0) +/* 7ED194 80242484 AC46000C */ sw $a2, 0xc($v0) +/* 7ED198 80242488 AE030000 */ sw $v1, ($s0) +/* 7ED19C 8024248C 24430020 */ addiu $v1, $v0, 0x20 +/* 7ED1A0 80242490 AC480010 */ sw $t0, 0x10($v0) +/* 7ED1A4 80242494 AC470014 */ sw $a3, 0x14($v0) +/* 7ED1A8 80242498 AE030000 */ sw $v1, ($s0) +/* 7ED1AC 8024249C 3C03FA00 */ lui $v1, 0xfa00 +/* 7ED1B0 802424A0 AC430018 */ sw $v1, 0x18($v0) +/* 7ED1B4 802424A4 34038000 */ ori $v1, $zero, 0x8000 +/* 7ED1B8 802424A8 AC43001C */ sw $v1, 0x1c($v0) +/* 7ED1BC 802424AC 24430028 */ addiu $v1, $v0, 0x28 +/* 7ED1C0 802424B0 AE030000 */ sw $v1, ($s0) +/* 7ED1C4 802424B4 AC510020 */ sw $s1, 0x20($v0) +/* 7ED1C8 802424B8 0C046C04 */ jal get_model_list_index_from_tree_index +/* 7ED1CC 802424BC AC400024 */ sw $zero, 0x24($v0) +/* 7ED1D0 802424C0 0C046B4C */ jal get_model_from_list_index +/* 7ED1D4 802424C4 0040202D */ daddu $a0, $v0, $zero +/* 7ED1D8 802424C8 3C07E300 */ lui $a3, 0xe300 +/* 7ED1DC 802424CC 34E70A01 */ ori $a3, $a3, 0xa01 +/* 7ED1E0 802424D0 3C080C18 */ lui $t0, 0xc18 +/* 7ED1E4 802424D4 350849D8 */ ori $t0, $t0, 0x49d8 +/* 7ED1E8 802424D8 0200202D */ daddu $a0, $s0, $zero +/* 7ED1EC 802424DC 8E030000 */ lw $v1, ($s0) +/* 7ED1F0 802424E0 3C05DE00 */ lui $a1, 0xde00 +/* 7ED1F4 802424E4 0060302D */ daddu $a2, $v1, $zero +/* 7ED1F8 802424E8 24630008 */ addiu $v1, $v1, 8 +/* 7ED1FC 802424EC AC830000 */ sw $v1, ($a0) +/* 7ED200 802424F0 ACC50000 */ sw $a1, ($a2) +/* 7ED204 802424F4 24650008 */ addiu $a1, $v1, 8 +/* 7ED208 802424F8 AC850000 */ sw $a1, ($a0) +/* 7ED20C 802424FC 8C450008 */ lw $a1, 8($v0) +/* 7ED210 80242500 24620010 */ addiu $v0, $v1, 0x10 +/* 7ED214 80242504 AC820000 */ sw $v0, ($a0) +/* 7ED218 80242508 8CA50004 */ lw $a1, 4($a1) +/* 7ED21C 8024250C 24620018 */ addiu $v0, $v1, 0x18 +/* 7ED220 80242510 AC820000 */ sw $v0, ($a0) +/* 7ED224 80242514 8CA50000 */ lw $a1, ($a1) +/* 7ED228 80242518 24620020 */ addiu $v0, $v1, 0x20 +/* 7ED22C 8024251C AC820000 */ sw $v0, ($a0) +/* 7ED230 80242520 3C020010 */ lui $v0, 0x10 +/* 7ED234 80242524 ACC50004 */ sw $a1, 4($a2) +/* 7ED238 80242528 240500D6 */ addiu $a1, $zero, 0xd6 +/* 7ED23C 8024252C AC710000 */ sw $s1, ($v1) +/* 7ED240 80242530 AC600004 */ sw $zero, 4($v1) +/* 7ED244 80242534 AC670008 */ sw $a3, 8($v1) +/* 7ED248 80242538 AC62000C */ sw $v0, 0xc($v1) +/* 7ED24C 8024253C AC720010 */ sw $s2, 0x10($v1) +/* 7ED250 80242540 AC600014 */ sw $zero, 0x14($v1) +/* 7ED254 80242544 AC730018 */ sw $s3, 0x18($v1) +/* 7ED258 80242548 0C0475CB */ jal func_8011D72C +/* 7ED25C 8024254C AC68001C */ sw $t0, 0x1c($v1) +/* 7ED260 80242550 8FBF0020 */ lw $ra, 0x20($sp) +/* 7ED264 80242554 8FB3001C */ lw $s3, 0x1c($sp) +/* 7ED268 80242558 8FB20018 */ lw $s2, 0x18($sp) +/* 7ED26C 8024255C 8FB10014 */ lw $s1, 0x14($sp) +/* 7ED270 80242560 8FB00010 */ lw $s0, 0x10($sp) +/* 7ED274 80242564 03E00008 */ jr $ra +/* 7ED278 80242568 27BD0028 */ addiu $sp, $sp, 0x28 +/* 7ED27C 8024256C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570.s deleted file mode 100644 index 9c1debb197..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242570 -/* 7ED280 80242570 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7ED284 80242574 AFB50024 */ sw $s5, 0x24($sp) -/* 7ED288 80242578 0080A82D */ daddu $s5, $a0, $zero -/* 7ED28C 8024257C AFBF002C */ sw $ra, 0x2c($sp) -/* 7ED290 80242580 AFB60028 */ sw $s6, 0x28($sp) -/* 7ED294 80242584 AFB40020 */ sw $s4, 0x20($sp) -/* 7ED298 80242588 AFB3001C */ sw $s3, 0x1c($sp) -/* 7ED29C 8024258C AFB20018 */ sw $s2, 0x18($sp) -/* 7ED2A0 80242590 AFB10014 */ sw $s1, 0x14($sp) -/* 7ED2A4 80242594 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED2A8 80242598 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 7ED2AC 8024259C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 7ED2B0 802425A0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 7ED2B4 802425A4 8EB30148 */ lw $s3, 0x148($s5) -/* 7ED2B8 802425A8 86640008 */ lh $a0, 8($s3) -/* 7ED2BC 802425AC 0C00EABB */ jal get_npc_unsafe -/* 7ED2C0 802425B0 00A0B02D */ daddu $s6, $a1, $zero -/* 7ED2C4 802425B4 0040A02D */ daddu $s4, $v0, $zero -/* 7ED2C8 802425B8 AEA00074 */ sw $zero, 0x74($s5) -/* 7ED2CC 802425BC C6980038 */ lwc1 $f24, 0x38($s4) -/* 7ED2D0 802425C0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 7ED2D4 802425C4 0000902D */ daddu $s2, $zero, $zero -/* 7ED2D8 802425C8 AEA00078 */ sw $zero, 0x78($s5) -/* 7ED2DC 802425CC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 7ED2E0 802425D0 8C620000 */ lw $v0, ($v1) -/* 7ED2E4 802425D4 3C0146FF */ lui $at, 0x46ff -/* 7ED2E8 802425D8 3421FE00 */ ori $at, $at, 0xfe00 -/* 7ED2EC 802425DC 4481A000 */ mtc1 $at, $f20 -/* 7ED2F0 802425E0 18400018 */ blez $v0, .L80242644 -/* 7ED2F4 802425E4 0240802D */ daddu $s0, $s2, $zero -/* 7ED2F8 802425E8 0240882D */ daddu $s1, $s2, $zero -.L802425EC: -/* 7ED2FC 802425EC 02231021 */ addu $v0, $s1, $v1 -/* 7ED300 802425F0 4600C306 */ mov.s $f12, $f24 -/* 7ED304 802425F4 C4440004 */ lwc1 $f4, 4($v0) -/* 7ED308 802425F8 46802120 */ cvt.s.w $f4, $f4 -/* 7ED30C 802425FC 44062000 */ mfc1 $a2, $f4 -/* 7ED310 80242600 C444000C */ lwc1 $f4, 0xc($v0) -/* 7ED314 80242604 46802120 */ cvt.s.w $f4, $f4 -/* 7ED318 80242608 44072000 */ mfc1 $a3, $f4 -/* 7ED31C 8024260C 0C00A7B5 */ jal dist2D -/* 7ED320 80242610 4600B386 */ mov.s $f14, $f22 -/* 7ED324 80242614 4614003C */ c.lt.s $f0, $f20 -/* 7ED328 80242618 00000000 */ nop -/* 7ED32C 8024261C 45000003 */ bc1f .L8024262C -/* 7ED330 80242620 2631000C */ addiu $s1, $s1, 0xc -/* 7ED334 80242624 46000506 */ mov.s $f20, $f0 -/* 7ED338 80242628 AEB20078 */ sw $s2, 0x78($s5) -.L8024262C: -/* 7ED33C 8024262C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 7ED340 80242630 26100001 */ addiu $s0, $s0, 1 -/* 7ED344 80242634 8C620000 */ lw $v0, ($v1) -/* 7ED348 80242638 0202102A */ slt $v0, $s0, $v0 -/* 7ED34C 8024263C 1440FFEB */ bnez $v0, .L802425EC -/* 7ED350 80242640 26520001 */ addiu $s2, $s2, 1 -.L80242644: -/* 7ED354 80242644 8E6200CC */ lw $v0, 0xcc($s3) -/* 7ED358 80242648 8C420004 */ lw $v0, 4($v0) -/* 7ED35C 8024264C AE820028 */ sw $v0, 0x28($s4) -/* 7ED360 80242650 8E6200D0 */ lw $v0, 0xd0($s3) -/* 7ED364 80242654 8C42007C */ lw $v0, 0x7c($v0) -/* 7ED368 80242658 04410004 */ bgez $v0, .L8024266C -/* 7ED36C 8024265C 00000000 */ nop -/* 7ED370 80242660 C6C00000 */ lwc1 $f0, ($s6) -/* 7ED374 80242664 080909A3 */ j .L8024268C -/* 7ED378 80242668 E6800018 */ swc1 $f0, 0x18($s4) -.L8024266C: -/* 7ED37C 8024266C 3C018025 */ lui $at, 0x8025 -/* 7ED380 80242670 D42259C0 */ ldc1 $f2, 0x59c0($at) -/* 7ED384 80242674 44820000 */ mtc1 $v0, $f0 -/* 7ED388 80242678 00000000 */ nop -/* 7ED38C 8024267C 46800021 */ cvt.d.w $f0, $f0 -/* 7ED390 80242680 46220003 */ div.d $f0, $f0, $f2 -/* 7ED394 80242684 46200020 */ cvt.s.d $f0, $f0 -/* 7ED398 80242688 E6800018 */ swc1 $f0, 0x18($s4) -.L8024268C: -/* 7ED39C 8024268C 24020001 */ addiu $v0, $zero, 1 -/* 7ED3A0 80242690 AEA20070 */ sw $v0, 0x70($s5) -/* 7ED3A4 80242694 8FBF002C */ lw $ra, 0x2c($sp) -/* 7ED3A8 80242698 8FB60028 */ lw $s6, 0x28($sp) -/* 7ED3AC 8024269C 8FB50024 */ lw $s5, 0x24($sp) -/* 7ED3B0 802426A0 8FB40020 */ lw $s4, 0x20($sp) -/* 7ED3B4 802426A4 8FB3001C */ lw $s3, 0x1c($sp) -/* 7ED3B8 802426A8 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED3BC 802426AC 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED3C0 802426B0 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED3C4 802426B4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 7ED3C8 802426B8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 7ED3CC 802426BC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 7ED3D0 802426C0 03E00008 */ jr $ra -/* 7ED3D4 802426C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s new file mode 100644 index 0000000000..061c060748 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242570_7ED280.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242570_7ED280 +/* 7ED280 80242570 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 7ED284 80242574 AFB50024 */ sw $s5, 0x24($sp) +/* 7ED288 80242578 0080A82D */ daddu $s5, $a0, $zero +/* 7ED28C 8024257C AFBF002C */ sw $ra, 0x2c($sp) +/* 7ED290 80242580 AFB60028 */ sw $s6, 0x28($sp) +/* 7ED294 80242584 AFB40020 */ sw $s4, 0x20($sp) +/* 7ED298 80242588 AFB3001C */ sw $s3, 0x1c($sp) +/* 7ED29C 8024258C AFB20018 */ sw $s2, 0x18($sp) +/* 7ED2A0 80242590 AFB10014 */ sw $s1, 0x14($sp) +/* 7ED2A4 80242594 AFB00010 */ sw $s0, 0x10($sp) +/* 7ED2A8 80242598 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 7ED2AC 8024259C F7B60038 */ sdc1 $f22, 0x38($sp) +/* 7ED2B0 802425A0 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 7ED2B4 802425A4 8EB30148 */ lw $s3, 0x148($s5) +/* 7ED2B8 802425A8 86640008 */ lh $a0, 8($s3) +/* 7ED2BC 802425AC 0C00EABB */ jal get_npc_unsafe +/* 7ED2C0 802425B0 00A0B02D */ daddu $s6, $a1, $zero +/* 7ED2C4 802425B4 0040A02D */ daddu $s4, $v0, $zero +/* 7ED2C8 802425B8 AEA00074 */ sw $zero, 0x74($s5) +/* 7ED2CC 802425BC C6980038 */ lwc1 $f24, 0x38($s4) +/* 7ED2D0 802425C0 C6960040 */ lwc1 $f22, 0x40($s4) +/* 7ED2D4 802425C4 0000902D */ daddu $s2, $zero, $zero +/* 7ED2D8 802425C8 AEA00078 */ sw $zero, 0x78($s5) +/* 7ED2DC 802425CC 8E6300D0 */ lw $v1, 0xd0($s3) +/* 7ED2E0 802425D0 8C620000 */ lw $v0, ($v1) +/* 7ED2E4 802425D4 3C0146FF */ lui $at, 0x46ff +/* 7ED2E8 802425D8 3421FE00 */ ori $at, $at, 0xfe00 +/* 7ED2EC 802425DC 4481A000 */ mtc1 $at, $f20 +/* 7ED2F0 802425E0 18400018 */ blez $v0, .L80242644 +/* 7ED2F4 802425E4 0240802D */ daddu $s0, $s2, $zero +/* 7ED2F8 802425E8 0240882D */ daddu $s1, $s2, $zero +.L802425EC: +/* 7ED2FC 802425EC 02231021 */ addu $v0, $s1, $v1 +/* 7ED300 802425F0 4600C306 */ mov.s $f12, $f24 +/* 7ED304 802425F4 C4440004 */ lwc1 $f4, 4($v0) +/* 7ED308 802425F8 46802120 */ cvt.s.w $f4, $f4 +/* 7ED30C 802425FC 44062000 */ mfc1 $a2, $f4 +/* 7ED310 80242600 C444000C */ lwc1 $f4, 0xc($v0) +/* 7ED314 80242604 46802120 */ cvt.s.w $f4, $f4 +/* 7ED318 80242608 44072000 */ mfc1 $a3, $f4 +/* 7ED31C 8024260C 0C00A7B5 */ jal dist2D +/* 7ED320 80242610 4600B386 */ mov.s $f14, $f22 +/* 7ED324 80242614 4614003C */ c.lt.s $f0, $f20 +/* 7ED328 80242618 00000000 */ nop +/* 7ED32C 8024261C 45000003 */ bc1f .L8024262C +/* 7ED330 80242620 2631000C */ addiu $s1, $s1, 0xc +/* 7ED334 80242624 46000506 */ mov.s $f20, $f0 +/* 7ED338 80242628 AEB20078 */ sw $s2, 0x78($s5) +.L8024262C: +/* 7ED33C 8024262C 8E6300D0 */ lw $v1, 0xd0($s3) +/* 7ED340 80242630 26100001 */ addiu $s0, $s0, 1 +/* 7ED344 80242634 8C620000 */ lw $v0, ($v1) +/* 7ED348 80242638 0202102A */ slt $v0, $s0, $v0 +/* 7ED34C 8024263C 1440FFEB */ bnez $v0, .L802425EC +/* 7ED350 80242640 26520001 */ addiu $s2, $s2, 1 +.L80242644: +/* 7ED354 80242644 8E6200CC */ lw $v0, 0xcc($s3) +/* 7ED358 80242648 8C420004 */ lw $v0, 4($v0) +/* 7ED35C 8024264C AE820028 */ sw $v0, 0x28($s4) +/* 7ED360 80242650 8E6200D0 */ lw $v0, 0xd0($s3) +/* 7ED364 80242654 8C42007C */ lw $v0, 0x7c($v0) +/* 7ED368 80242658 04410004 */ bgez $v0, .L8024266C +/* 7ED36C 8024265C 00000000 */ nop +/* 7ED370 80242660 C6C00000 */ lwc1 $f0, ($s6) +/* 7ED374 80242664 080909A3 */ j .L8024268C +/* 7ED378 80242668 E6800018 */ swc1 $f0, 0x18($s4) +.L8024266C: +/* 7ED37C 8024266C 3C018025 */ lui $at, 0x8025 +/* 7ED380 80242670 D42259C0 */ ldc1 $f2, 0x59c0($at) +/* 7ED384 80242674 44820000 */ mtc1 $v0, $f0 +/* 7ED388 80242678 00000000 */ nop +/* 7ED38C 8024267C 46800021 */ cvt.d.w $f0, $f0 +/* 7ED390 80242680 46220003 */ div.d $f0, $f0, $f2 +/* 7ED394 80242684 46200020 */ cvt.s.d $f0, $f0 +/* 7ED398 80242688 E6800018 */ swc1 $f0, 0x18($s4) +.L8024268C: +/* 7ED39C 8024268C 24020001 */ addiu $v0, $zero, 1 +/* 7ED3A0 80242690 AEA20070 */ sw $v0, 0x70($s5) +/* 7ED3A4 80242694 8FBF002C */ lw $ra, 0x2c($sp) +/* 7ED3A8 80242698 8FB60028 */ lw $s6, 0x28($sp) +/* 7ED3AC 8024269C 8FB50024 */ lw $s5, 0x24($sp) +/* 7ED3B0 802426A0 8FB40020 */ lw $s4, 0x20($sp) +/* 7ED3B4 802426A4 8FB3001C */ lw $s3, 0x1c($sp) +/* 7ED3B8 802426A8 8FB20018 */ lw $s2, 0x18($sp) +/* 7ED3BC 802426AC 8FB10014 */ lw $s1, 0x14($sp) +/* 7ED3C0 802426B0 8FB00010 */ lw $s0, 0x10($sp) +/* 7ED3C4 802426B4 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 7ED3C8 802426B8 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 7ED3CC 802426BC D7B40030 */ ldc1 $f20, 0x30($sp) +/* 7ED3D0 802426C0 03E00008 */ jr $ra +/* 7ED3D4 802426C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8.s deleted file mode 100644 index 3a355692f4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426C8 -/* 7ED3D8 802426C8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 7ED3DC 802426CC AFB20038 */ sw $s2, 0x38($sp) -/* 7ED3E0 802426D0 0080902D */ daddu $s2, $a0, $zero -/* 7ED3E4 802426D4 AFBF0044 */ sw $ra, 0x44($sp) -/* 7ED3E8 802426D8 AFB40040 */ sw $s4, 0x40($sp) -/* 7ED3EC 802426DC AFB3003C */ sw $s3, 0x3c($sp) -/* 7ED3F0 802426E0 AFB10034 */ sw $s1, 0x34($sp) -/* 7ED3F4 802426E4 AFB00030 */ sw $s0, 0x30($sp) -/* 7ED3F8 802426E8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 7ED3FC 802426EC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 7ED400 802426F0 8E510148 */ lw $s1, 0x148($s2) -/* 7ED404 802426F4 00A0982D */ daddu $s3, $a1, $zero -/* 7ED408 802426F8 86240008 */ lh $a0, 8($s1) -/* 7ED40C 802426FC 0C00EABB */ jal get_npc_unsafe -/* 7ED410 80242700 00C0A02D */ daddu $s4, $a2, $zero -/* 7ED414 80242704 8E630014 */ lw $v1, 0x14($s3) -/* 7ED418 80242708 04600030 */ bltz $v1, .L802427CC -/* 7ED41C 8024270C 0040802D */ daddu $s0, $v0, $zero -/* 7ED420 80242710 8E420074 */ lw $v0, 0x74($s2) -/* 7ED424 80242714 1C40002C */ bgtz $v0, .L802427C8 -/* 7ED428 80242718 2442FFFF */ addiu $v0, $v0, -1 -/* 7ED42C 8024271C 0280202D */ daddu $a0, $s4, $zero -/* 7ED430 80242720 AE430074 */ sw $v1, 0x74($s2) -/* 7ED434 80242724 AFA00010 */ sw $zero, 0x10($sp) -/* 7ED438 80242728 8E66000C */ lw $a2, 0xc($s3) -/* 7ED43C 8024272C 8E670010 */ lw $a3, 0x10($s3) -/* 7ED440 80242730 0C01242D */ jal func_800490B4 -/* 7ED444 80242734 0220282D */ daddu $a1, $s1, $zero -/* 7ED448 80242738 10400021 */ beqz $v0, .L802427C0 -/* 7ED44C 8024273C 0000202D */ daddu $a0, $zero, $zero -/* 7ED450 80242740 0200282D */ daddu $a1, $s0, $zero -/* 7ED454 80242744 0000302D */ daddu $a2, $zero, $zero -/* 7ED458 80242748 860300A8 */ lh $v1, 0xa8($s0) -/* 7ED45C 8024274C 3C013F80 */ lui $at, 0x3f80 -/* 7ED460 80242750 44810000 */ mtc1 $at, $f0 -/* 7ED464 80242754 3C014000 */ lui $at, 0x4000 -/* 7ED468 80242758 44811000 */ mtc1 $at, $f2 -/* 7ED46C 8024275C 3C01C1A0 */ lui $at, 0xc1a0 -/* 7ED470 80242760 44812000 */ mtc1 $at, $f4 -/* 7ED474 80242764 2402000F */ addiu $v0, $zero, 0xf -/* 7ED478 80242768 AFA2001C */ sw $v0, 0x1c($sp) -/* 7ED47C 8024276C 44833000 */ mtc1 $v1, $f6 -/* 7ED480 80242770 00000000 */ nop -/* 7ED484 80242774 468031A0 */ cvt.s.w $f6, $f6 -/* 7ED488 80242778 44073000 */ mfc1 $a3, $f6 -/* 7ED48C 8024277C 27A20028 */ addiu $v0, $sp, 0x28 -/* 7ED490 80242780 AFA20020 */ sw $v0, 0x20($sp) -/* 7ED494 80242784 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7ED498 80242788 E7A20014 */ swc1 $f2, 0x14($sp) -/* 7ED49C 8024278C 0C01BFA4 */ jal fx_emote -/* 7ED4A0 80242790 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7ED4A4 80242794 0200202D */ daddu $a0, $s0, $zero -/* 7ED4A8 80242798 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 7ED4AC 8024279C 0C012530 */ jal func_800494C0 -/* 7ED4B0 802427A0 3C060020 */ lui $a2, 0x20 -/* 7ED4B4 802427A4 8E220018 */ lw $v0, 0x18($s1) -/* 7ED4B8 802427A8 9442002A */ lhu $v0, 0x2a($v0) -/* 7ED4BC 802427AC 30420001 */ andi $v0, $v0, 1 -/* 7ED4C0 802427B0 14400064 */ bnez $v0, .L80242944 -/* 7ED4C4 802427B4 2402000A */ addiu $v0, $zero, 0xa -/* 7ED4C8 802427B8 08090A51 */ j .L80242944 -/* 7ED4CC 802427BC 2402000C */ addiu $v0, $zero, 0xc -.L802427C0: -/* 7ED4D0 802427C0 8E420074 */ lw $v0, 0x74($s2) -/* 7ED4D4 802427C4 2442FFFF */ addiu $v0, $v0, -1 -.L802427C8: -/* 7ED4D8 802427C8 AE420074 */ sw $v0, 0x74($s2) -.L802427CC: -/* 7ED4DC 802427CC 8602008C */ lh $v0, 0x8c($s0) -/* 7ED4E0 802427D0 1440005D */ bnez $v0, .L80242948 -/* 7ED4E4 802427D4 00000000 */ nop -/* 7ED4E8 802427D8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 7ED4EC 802427DC 3C014010 */ lui $at, 0x4010 -/* 7ED4F0 802427E0 44811800 */ mtc1 $at, $f3 -/* 7ED4F4 802427E4 44801000 */ mtc1 $zero, $f2 -/* 7ED4F8 802427E8 46000021 */ cvt.d.s $f0, $f0 -/* 7ED4FC 802427EC 4622003C */ c.lt.d $f0, $f2 -/* 7ED500 802427F0 00000000 */ nop -/* 7ED504 802427F4 45000003 */ bc1f .L80242804 -/* 7ED508 802427F8 0200202D */ daddu $a0, $s0, $zero -/* 7ED50C 802427FC 08090A02 */ j .L80242808 -/* 7ED510 80242800 0000282D */ daddu $a1, $zero, $zero -.L80242804: -/* 7ED514 80242804 24050001 */ addiu $a1, $zero, 1 -.L80242808: -/* 7ED518 80242808 0C00F598 */ jal func_8003D660 -/* 7ED51C 8024280C 00000000 */ nop -/* 7ED520 80242810 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 7ED524 80242814 8E430078 */ lw $v1, 0x78($s2) -/* 7ED528 80242818 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 7ED52C 8024281C 00031040 */ sll $v0, $v1, 1 -/* 7ED530 80242820 00431021 */ addu $v0, $v0, $v1 -/* 7ED534 80242824 8E2300D0 */ lw $v1, 0xd0($s1) -/* 7ED538 80242828 00021080 */ sll $v0, $v0, 2 -/* 7ED53C 8024282C 00431021 */ addu $v0, $v0, $v1 -/* 7ED540 80242830 C4560004 */ lwc1 $f22, 4($v0) -/* 7ED544 80242834 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7ED548 80242838 C454000C */ lwc1 $f20, 0xc($v0) -/* 7ED54C 8024283C 4680A520 */ cvt.s.w $f20, $f20 -/* 7ED550 80242840 4406B000 */ mfc1 $a2, $f22 -/* 7ED554 80242844 4407A000 */ mfc1 $a3, $f20 -/* 7ED558 80242848 0C00A720 */ jal atan2 -/* 7ED55C 8024284C 00000000 */ nop -/* 7ED560 80242850 8E050018 */ lw $a1, 0x18($s0) -/* 7ED564 80242854 44060000 */ mfc1 $a2, $f0 -/* 7ED568 80242858 0200202D */ daddu $a0, $s0, $zero -/* 7ED56C 8024285C 0C00EA95 */ jal npc_move_heading -/* 7ED570 80242860 AE06000C */ sw $a2, 0xc($s0) -/* 7ED574 80242864 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 7ED578 80242868 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 7ED57C 8024286C 4406B000 */ mfc1 $a2, $f22 -/* 7ED580 80242870 4407A000 */ mfc1 $a3, $f20 -/* 7ED584 80242874 0C00A7B5 */ jal dist2D -/* 7ED588 80242878 00000000 */ nop -/* 7ED58C 8024287C C6020018 */ lwc1 $f2, 0x18($s0) -/* 7ED590 80242880 4602003E */ c.le.s $f0, $f2 -/* 7ED594 80242884 00000000 */ nop -/* 7ED598 80242888 4500002F */ bc1f .L80242948 -/* 7ED59C 8024288C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 7ED5A0 80242890 24020002 */ addiu $v0, $zero, 2 -/* 7ED5A4 80242894 0C00A67F */ jal rand_int -/* 7ED5A8 80242898 AE420070 */ sw $v0, 0x70($s2) -/* 7ED5AC 8024289C 3C035555 */ lui $v1, 0x5555 -/* 7ED5B0 802428A0 34635556 */ ori $v1, $v1, 0x5556 -/* 7ED5B4 802428A4 00430018 */ mult $v0, $v1 -/* 7ED5B8 802428A8 000227C3 */ sra $a0, $v0, 0x1f -/* 7ED5BC 802428AC 00004010 */ mfhi $t0 -/* 7ED5C0 802428B0 01042023 */ subu $a0, $t0, $a0 -/* 7ED5C4 802428B4 00041840 */ sll $v1, $a0, 1 -/* 7ED5C8 802428B8 00641821 */ addu $v1, $v1, $a0 -/* 7ED5CC 802428BC 00431023 */ subu $v0, $v0, $v1 -/* 7ED5D0 802428C0 24430002 */ addiu $v1, $v0, 2 -/* 7ED5D4 802428C4 AE430074 */ sw $v1, 0x74($s2) -/* 7ED5D8 802428C8 8E62002C */ lw $v0, 0x2c($s3) -/* 7ED5DC 802428CC 18400009 */ blez $v0, .L802428F4 -/* 7ED5E0 802428D0 24020004 */ addiu $v0, $zero, 4 -/* 7ED5E4 802428D4 8E620004 */ lw $v0, 4($s3) -/* 7ED5E8 802428D8 18400006 */ blez $v0, .L802428F4 -/* 7ED5EC 802428DC 24020004 */ addiu $v0, $zero, 4 -/* 7ED5F0 802428E0 8E620008 */ lw $v0, 8($s3) -/* 7ED5F4 802428E4 18400003 */ blez $v0, .L802428F4 -/* 7ED5F8 802428E8 24020004 */ addiu $v0, $zero, 4 -/* 7ED5FC 802428EC 14600002 */ bnez $v1, .L802428F8 -/* 7ED600 802428F0 00000000 */ nop -.L802428F4: -/* 7ED604 802428F4 AE420070 */ sw $v0, 0x70($s2) -.L802428F8: -/* 7ED608 802428F8 0C00A67F */ jal rand_int -/* 7ED60C 802428FC 24042710 */ addiu $a0, $zero, 0x2710 -/* 7ED610 80242900 3C0351EB */ lui $v1, 0x51eb -/* 7ED614 80242904 3463851F */ ori $v1, $v1, 0x851f -/* 7ED618 80242908 00430018 */ mult $v0, $v1 -/* 7ED61C 8024290C 00021FC3 */ sra $v1, $v0, 0x1f -/* 7ED620 80242910 00004010 */ mfhi $t0 -/* 7ED624 80242914 00082143 */ sra $a0, $t0, 5 -/* 7ED628 80242918 00832023 */ subu $a0, $a0, $v1 -/* 7ED62C 8024291C 00041840 */ sll $v1, $a0, 1 -/* 7ED630 80242920 00641821 */ addu $v1, $v1, $a0 -/* 7ED634 80242924 000318C0 */ sll $v1, $v1, 3 -/* 7ED638 80242928 00641821 */ addu $v1, $v1, $a0 -/* 7ED63C 8024292C 00031880 */ sll $v1, $v1, 2 -/* 7ED640 80242930 8E640004 */ lw $a0, 4($s3) -/* 7ED644 80242934 00431023 */ subu $v0, $v0, $v1 -/* 7ED648 80242938 0044102A */ slt $v0, $v0, $a0 -/* 7ED64C 8024293C 10400002 */ beqz $v0, .L80242948 -/* 7ED650 80242940 24020004 */ addiu $v0, $zero, 4 -.L80242944: -/* 7ED654 80242944 AE420070 */ sw $v0, 0x70($s2) -.L80242948: -/* 7ED658 80242948 8FBF0044 */ lw $ra, 0x44($sp) -/* 7ED65C 8024294C 8FB40040 */ lw $s4, 0x40($sp) -/* 7ED660 80242950 8FB3003C */ lw $s3, 0x3c($sp) -/* 7ED664 80242954 8FB20038 */ lw $s2, 0x38($sp) -/* 7ED668 80242958 8FB10034 */ lw $s1, 0x34($sp) -/* 7ED66C 8024295C 8FB00030 */ lw $s0, 0x30($sp) -/* 7ED670 80242960 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 7ED674 80242964 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 7ED678 80242968 03E00008 */ jr $ra -/* 7ED67C 8024296C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s new file mode 100644 index 0000000000..cde133a0c5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802426C8_7ED3D8.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426C8_7ED3D8 +/* 7ED3D8 802426C8 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* 7ED3DC 802426CC AFB20038 */ sw $s2, 0x38($sp) +/* 7ED3E0 802426D0 0080902D */ daddu $s2, $a0, $zero +/* 7ED3E4 802426D4 AFBF0044 */ sw $ra, 0x44($sp) +/* 7ED3E8 802426D8 AFB40040 */ sw $s4, 0x40($sp) +/* 7ED3EC 802426DC AFB3003C */ sw $s3, 0x3c($sp) +/* 7ED3F0 802426E0 AFB10034 */ sw $s1, 0x34($sp) +/* 7ED3F4 802426E4 AFB00030 */ sw $s0, 0x30($sp) +/* 7ED3F8 802426E8 F7B60050 */ sdc1 $f22, 0x50($sp) +/* 7ED3FC 802426EC F7B40048 */ sdc1 $f20, 0x48($sp) +/* 7ED400 802426F0 8E510148 */ lw $s1, 0x148($s2) +/* 7ED404 802426F4 00A0982D */ daddu $s3, $a1, $zero +/* 7ED408 802426F8 86240008 */ lh $a0, 8($s1) +/* 7ED40C 802426FC 0C00EABB */ jal get_npc_unsafe +/* 7ED410 80242700 00C0A02D */ daddu $s4, $a2, $zero +/* 7ED414 80242704 8E630014 */ lw $v1, 0x14($s3) +/* 7ED418 80242708 04600030 */ bltz $v1, .L802427CC +/* 7ED41C 8024270C 0040802D */ daddu $s0, $v0, $zero +/* 7ED420 80242710 8E420074 */ lw $v0, 0x74($s2) +/* 7ED424 80242714 1C40002C */ bgtz $v0, .L802427C8 +/* 7ED428 80242718 2442FFFF */ addiu $v0, $v0, -1 +/* 7ED42C 8024271C 0280202D */ daddu $a0, $s4, $zero +/* 7ED430 80242720 AE430074 */ sw $v1, 0x74($s2) +/* 7ED434 80242724 AFA00010 */ sw $zero, 0x10($sp) +/* 7ED438 80242728 8E66000C */ lw $a2, 0xc($s3) +/* 7ED43C 8024272C 8E670010 */ lw $a3, 0x10($s3) +/* 7ED440 80242730 0C01242D */ jal func_800490B4 +/* 7ED444 80242734 0220282D */ daddu $a1, $s1, $zero +/* 7ED448 80242738 10400021 */ beqz $v0, .L802427C0 +/* 7ED44C 8024273C 0000202D */ daddu $a0, $zero, $zero +/* 7ED450 80242740 0200282D */ daddu $a1, $s0, $zero +/* 7ED454 80242744 0000302D */ daddu $a2, $zero, $zero +/* 7ED458 80242748 860300A8 */ lh $v1, 0xa8($s0) +/* 7ED45C 8024274C 3C013F80 */ lui $at, 0x3f80 +/* 7ED460 80242750 44810000 */ mtc1 $at, $f0 +/* 7ED464 80242754 3C014000 */ lui $at, 0x4000 +/* 7ED468 80242758 44811000 */ mtc1 $at, $f2 +/* 7ED46C 8024275C 3C01C1A0 */ lui $at, 0xc1a0 +/* 7ED470 80242760 44812000 */ mtc1 $at, $f4 +/* 7ED474 80242764 2402000F */ addiu $v0, $zero, 0xf +/* 7ED478 80242768 AFA2001C */ sw $v0, 0x1c($sp) +/* 7ED47C 8024276C 44833000 */ mtc1 $v1, $f6 +/* 7ED480 80242770 00000000 */ nop +/* 7ED484 80242774 468031A0 */ cvt.s.w $f6, $f6 +/* 7ED488 80242778 44073000 */ mfc1 $a3, $f6 +/* 7ED48C 8024277C 27A20028 */ addiu $v0, $sp, 0x28 +/* 7ED490 80242780 AFA20020 */ sw $v0, 0x20($sp) +/* 7ED494 80242784 E7A00010 */ swc1 $f0, 0x10($sp) +/* 7ED498 80242788 E7A20014 */ swc1 $f2, 0x14($sp) +/* 7ED49C 8024278C 0C01BFA4 */ jal fx_emote +/* 7ED4A0 80242790 E7A40018 */ swc1 $f4, 0x18($sp) +/* 7ED4A4 80242794 0200202D */ daddu $a0, $s0, $zero +/* 7ED4A8 80242798 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 7ED4AC 8024279C 0C012530 */ jal func_800494C0 +/* 7ED4B0 802427A0 3C060020 */ lui $a2, 0x20 +/* 7ED4B4 802427A4 8E220018 */ lw $v0, 0x18($s1) +/* 7ED4B8 802427A8 9442002A */ lhu $v0, 0x2a($v0) +/* 7ED4BC 802427AC 30420001 */ andi $v0, $v0, 1 +/* 7ED4C0 802427B0 14400064 */ bnez $v0, .L80242944 +/* 7ED4C4 802427B4 2402000A */ addiu $v0, $zero, 0xa +/* 7ED4C8 802427B8 08090A51 */ j .L80242944 +/* 7ED4CC 802427BC 2402000C */ addiu $v0, $zero, 0xc +.L802427C0: +/* 7ED4D0 802427C0 8E420074 */ lw $v0, 0x74($s2) +/* 7ED4D4 802427C4 2442FFFF */ addiu $v0, $v0, -1 +.L802427C8: +/* 7ED4D8 802427C8 AE420074 */ sw $v0, 0x74($s2) +.L802427CC: +/* 7ED4DC 802427CC 8602008C */ lh $v0, 0x8c($s0) +/* 7ED4E0 802427D0 1440005D */ bnez $v0, .L80242948 +/* 7ED4E4 802427D4 00000000 */ nop +/* 7ED4E8 802427D8 C6000018 */ lwc1 $f0, 0x18($s0) +/* 7ED4EC 802427DC 3C014010 */ lui $at, 0x4010 +/* 7ED4F0 802427E0 44811800 */ mtc1 $at, $f3 +/* 7ED4F4 802427E4 44801000 */ mtc1 $zero, $f2 +/* 7ED4F8 802427E8 46000021 */ cvt.d.s $f0, $f0 +/* 7ED4FC 802427EC 4622003C */ c.lt.d $f0, $f2 +/* 7ED500 802427F0 00000000 */ nop +/* 7ED504 802427F4 45000003 */ bc1f .L80242804 +/* 7ED508 802427F8 0200202D */ daddu $a0, $s0, $zero +/* 7ED50C 802427FC 08090A02 */ j .L80242808 +/* 7ED510 80242800 0000282D */ daddu $a1, $zero, $zero +.L80242804: +/* 7ED514 80242804 24050001 */ addiu $a1, $zero, 1 +.L80242808: +/* 7ED518 80242808 0C00F598 */ jal func_8003D660 +/* 7ED51C 8024280C 00000000 */ nop +/* 7ED520 80242810 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 7ED524 80242814 8E430078 */ lw $v1, 0x78($s2) +/* 7ED528 80242818 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 7ED52C 8024281C 00031040 */ sll $v0, $v1, 1 +/* 7ED530 80242820 00431021 */ addu $v0, $v0, $v1 +/* 7ED534 80242824 8E2300D0 */ lw $v1, 0xd0($s1) +/* 7ED538 80242828 00021080 */ sll $v0, $v0, 2 +/* 7ED53C 8024282C 00431021 */ addu $v0, $v0, $v1 +/* 7ED540 80242830 C4560004 */ lwc1 $f22, 4($v0) +/* 7ED544 80242834 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7ED548 80242838 C454000C */ lwc1 $f20, 0xc($v0) +/* 7ED54C 8024283C 4680A520 */ cvt.s.w $f20, $f20 +/* 7ED550 80242840 4406B000 */ mfc1 $a2, $f22 +/* 7ED554 80242844 4407A000 */ mfc1 $a3, $f20 +/* 7ED558 80242848 0C00A720 */ jal atan2 +/* 7ED55C 8024284C 00000000 */ nop +/* 7ED560 80242850 8E050018 */ lw $a1, 0x18($s0) +/* 7ED564 80242854 44060000 */ mfc1 $a2, $f0 +/* 7ED568 80242858 0200202D */ daddu $a0, $s0, $zero +/* 7ED56C 8024285C 0C00EA95 */ jal npc_move_heading +/* 7ED570 80242860 AE06000C */ sw $a2, 0xc($s0) +/* 7ED574 80242864 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 7ED578 80242868 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 7ED57C 8024286C 4406B000 */ mfc1 $a2, $f22 +/* 7ED580 80242870 4407A000 */ mfc1 $a3, $f20 +/* 7ED584 80242874 0C00A7B5 */ jal dist2D +/* 7ED588 80242878 00000000 */ nop +/* 7ED58C 8024287C C6020018 */ lwc1 $f2, 0x18($s0) +/* 7ED590 80242880 4602003E */ c.le.s $f0, $f2 +/* 7ED594 80242884 00000000 */ nop +/* 7ED598 80242888 4500002F */ bc1f .L80242948 +/* 7ED59C 8024288C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 7ED5A0 80242890 24020002 */ addiu $v0, $zero, 2 +/* 7ED5A4 80242894 0C00A67F */ jal rand_int +/* 7ED5A8 80242898 AE420070 */ sw $v0, 0x70($s2) +/* 7ED5AC 8024289C 3C035555 */ lui $v1, 0x5555 +/* 7ED5B0 802428A0 34635556 */ ori $v1, $v1, 0x5556 +/* 7ED5B4 802428A4 00430018 */ mult $v0, $v1 +/* 7ED5B8 802428A8 000227C3 */ sra $a0, $v0, 0x1f +/* 7ED5BC 802428AC 00004010 */ mfhi $t0 +/* 7ED5C0 802428B0 01042023 */ subu $a0, $t0, $a0 +/* 7ED5C4 802428B4 00041840 */ sll $v1, $a0, 1 +/* 7ED5C8 802428B8 00641821 */ addu $v1, $v1, $a0 +/* 7ED5CC 802428BC 00431023 */ subu $v0, $v0, $v1 +/* 7ED5D0 802428C0 24430002 */ addiu $v1, $v0, 2 +/* 7ED5D4 802428C4 AE430074 */ sw $v1, 0x74($s2) +/* 7ED5D8 802428C8 8E62002C */ lw $v0, 0x2c($s3) +/* 7ED5DC 802428CC 18400009 */ blez $v0, .L802428F4 +/* 7ED5E0 802428D0 24020004 */ addiu $v0, $zero, 4 +/* 7ED5E4 802428D4 8E620004 */ lw $v0, 4($s3) +/* 7ED5E8 802428D8 18400006 */ blez $v0, .L802428F4 +/* 7ED5EC 802428DC 24020004 */ addiu $v0, $zero, 4 +/* 7ED5F0 802428E0 8E620008 */ lw $v0, 8($s3) +/* 7ED5F4 802428E4 18400003 */ blez $v0, .L802428F4 +/* 7ED5F8 802428E8 24020004 */ addiu $v0, $zero, 4 +/* 7ED5FC 802428EC 14600002 */ bnez $v1, .L802428F8 +/* 7ED600 802428F0 00000000 */ nop +.L802428F4: +/* 7ED604 802428F4 AE420070 */ sw $v0, 0x70($s2) +.L802428F8: +/* 7ED608 802428F8 0C00A67F */ jal rand_int +/* 7ED60C 802428FC 24042710 */ addiu $a0, $zero, 0x2710 +/* 7ED610 80242900 3C0351EB */ lui $v1, 0x51eb +/* 7ED614 80242904 3463851F */ ori $v1, $v1, 0x851f +/* 7ED618 80242908 00430018 */ mult $v0, $v1 +/* 7ED61C 8024290C 00021FC3 */ sra $v1, $v0, 0x1f +/* 7ED620 80242910 00004010 */ mfhi $t0 +/* 7ED624 80242914 00082143 */ sra $a0, $t0, 5 +/* 7ED628 80242918 00832023 */ subu $a0, $a0, $v1 +/* 7ED62C 8024291C 00041840 */ sll $v1, $a0, 1 +/* 7ED630 80242920 00641821 */ addu $v1, $v1, $a0 +/* 7ED634 80242924 000318C0 */ sll $v1, $v1, 3 +/* 7ED638 80242928 00641821 */ addu $v1, $v1, $a0 +/* 7ED63C 8024292C 00031880 */ sll $v1, $v1, 2 +/* 7ED640 80242930 8E640004 */ lw $a0, 4($s3) +/* 7ED644 80242934 00431023 */ subu $v0, $v0, $v1 +/* 7ED648 80242938 0044102A */ slt $v0, $v0, $a0 +/* 7ED64C 8024293C 10400002 */ beqz $v0, .L80242948 +/* 7ED650 80242940 24020004 */ addiu $v0, $zero, 4 +.L80242944: +/* 7ED654 80242944 AE420070 */ sw $v0, 0x70($s2) +.L80242948: +/* 7ED658 80242948 8FBF0044 */ lw $ra, 0x44($sp) +/* 7ED65C 8024294C 8FB40040 */ lw $s4, 0x40($sp) +/* 7ED660 80242950 8FB3003C */ lw $s3, 0x3c($sp) +/* 7ED664 80242954 8FB20038 */ lw $s2, 0x38($sp) +/* 7ED668 80242958 8FB10034 */ lw $s1, 0x34($sp) +/* 7ED66C 8024295C 8FB00030 */ lw $s0, 0x30($sp) +/* 7ED670 80242960 D7B60050 */ ldc1 $f22, 0x50($sp) +/* 7ED674 80242964 D7B40048 */ ldc1 $f20, 0x48($sp) +/* 7ED678 80242968 03E00008 */ jr $ra +/* 7ED67C 8024296C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970.s deleted file mode 100644 index 70f8f48c3c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242970 -/* 7ED680 80242970 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7ED684 80242974 AFB3001C */ sw $s3, 0x1c($sp) -/* 7ED688 80242978 0080982D */ daddu $s3, $a0, $zero -/* 7ED68C 8024297C AFBF0020 */ sw $ra, 0x20($sp) -/* 7ED690 80242980 AFB20018 */ sw $s2, 0x18($sp) -/* 7ED694 80242984 AFB10014 */ sw $s1, 0x14($sp) -/* 7ED698 80242988 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED69C 8024298C 8E720148 */ lw $s2, 0x148($s3) -/* 7ED6A0 80242990 86440008 */ lh $a0, 8($s2) -/* 7ED6A4 80242994 0C00EABB */ jal get_npc_unsafe -/* 7ED6A8 80242998 00A0882D */ daddu $s1, $a1, $zero -/* 7ED6AC 8024299C 8E240008 */ lw $a0, 8($s1) -/* 7ED6B0 802429A0 0040802D */ daddu $s0, $v0, $zero -/* 7ED6B4 802429A4 00041FC2 */ srl $v1, $a0, 0x1f -/* 7ED6B8 802429A8 00832021 */ addu $a0, $a0, $v1 -/* 7ED6BC 802429AC 00042043 */ sra $a0, $a0, 1 -/* 7ED6C0 802429B0 0C00A67F */ jal rand_int -/* 7ED6C4 802429B4 24840001 */ addiu $a0, $a0, 1 -/* 7ED6C8 802429B8 8E230008 */ lw $v1, 8($s1) -/* 7ED6CC 802429BC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 7ED6D0 802429C0 00032FC2 */ srl $a1, $v1, 0x1f -/* 7ED6D4 802429C4 00651821 */ addu $v1, $v1, $a1 -/* 7ED6D8 802429C8 00031843 */ sra $v1, $v1, 1 -/* 7ED6DC 802429CC 00621821 */ addu $v1, $v1, $v0 -/* 7ED6E0 802429D0 0C00A67F */ jal rand_int -/* 7ED6E4 802429D4 A603008E */ sh $v1, 0x8e($s0) -/* 7ED6E8 802429D8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 7ED6EC 802429DC 44820000 */ mtc1 $v0, $f0 -/* 7ED6F0 802429E0 00000000 */ nop -/* 7ED6F4 802429E4 46800020 */ cvt.s.w $f0, $f0 -/* 7ED6F8 802429E8 46006300 */ add.s $f12, $f12, $f0 -/* 7ED6FC 802429EC 3C0142B4 */ lui $at, 0x42b4 -/* 7ED700 802429F0 44810000 */ mtc1 $at, $f0 -/* 7ED704 802429F4 0C00A6C9 */ jal clamp_angle -/* 7ED708 802429F8 46006301 */ sub.s $f12, $f12, $f0 -/* 7ED70C 802429FC E600000C */ swc1 $f0, 0xc($s0) -/* 7ED710 80242A00 8E4200CC */ lw $v0, 0xcc($s2) -/* 7ED714 80242A04 8C420000 */ lw $v0, ($v0) -/* 7ED718 80242A08 AE020028 */ sw $v0, 0x28($s0) -/* 7ED71C 80242A0C 24020003 */ addiu $v0, $zero, 3 -/* 7ED720 80242A10 AE620070 */ sw $v0, 0x70($s3) -/* 7ED724 80242A14 8FBF0020 */ lw $ra, 0x20($sp) -/* 7ED728 80242A18 8FB3001C */ lw $s3, 0x1c($sp) -/* 7ED72C 80242A1C 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED730 80242A20 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED734 80242A24 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED738 80242A28 03E00008 */ jr $ra -/* 7ED73C 80242A2C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s new file mode 100644 index 0000000000..1cd908fcbe --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242970_7ED680.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242970_7ED680 +/* 7ED680 80242970 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 7ED684 80242974 AFB3001C */ sw $s3, 0x1c($sp) +/* 7ED688 80242978 0080982D */ daddu $s3, $a0, $zero +/* 7ED68C 8024297C AFBF0020 */ sw $ra, 0x20($sp) +/* 7ED690 80242980 AFB20018 */ sw $s2, 0x18($sp) +/* 7ED694 80242984 AFB10014 */ sw $s1, 0x14($sp) +/* 7ED698 80242988 AFB00010 */ sw $s0, 0x10($sp) +/* 7ED69C 8024298C 8E720148 */ lw $s2, 0x148($s3) +/* 7ED6A0 80242990 86440008 */ lh $a0, 8($s2) +/* 7ED6A4 80242994 0C00EABB */ jal get_npc_unsafe +/* 7ED6A8 80242998 00A0882D */ daddu $s1, $a1, $zero +/* 7ED6AC 8024299C 8E240008 */ lw $a0, 8($s1) +/* 7ED6B0 802429A0 0040802D */ daddu $s0, $v0, $zero +/* 7ED6B4 802429A4 00041FC2 */ srl $v1, $a0, 0x1f +/* 7ED6B8 802429A8 00832021 */ addu $a0, $a0, $v1 +/* 7ED6BC 802429AC 00042043 */ sra $a0, $a0, 1 +/* 7ED6C0 802429B0 0C00A67F */ jal rand_int +/* 7ED6C4 802429B4 24840001 */ addiu $a0, $a0, 1 +/* 7ED6C8 802429B8 8E230008 */ lw $v1, 8($s1) +/* 7ED6CC 802429BC 240400B4 */ addiu $a0, $zero, 0xb4 +/* 7ED6D0 802429C0 00032FC2 */ srl $a1, $v1, 0x1f +/* 7ED6D4 802429C4 00651821 */ addu $v1, $v1, $a1 +/* 7ED6D8 802429C8 00031843 */ sra $v1, $v1, 1 +/* 7ED6DC 802429CC 00621821 */ addu $v1, $v1, $v0 +/* 7ED6E0 802429D0 0C00A67F */ jal rand_int +/* 7ED6E4 802429D4 A603008E */ sh $v1, 0x8e($s0) +/* 7ED6E8 802429D8 C60C000C */ lwc1 $f12, 0xc($s0) +/* 7ED6EC 802429DC 44820000 */ mtc1 $v0, $f0 +/* 7ED6F0 802429E0 00000000 */ nop +/* 7ED6F4 802429E4 46800020 */ cvt.s.w $f0, $f0 +/* 7ED6F8 802429E8 46006300 */ add.s $f12, $f12, $f0 +/* 7ED6FC 802429EC 3C0142B4 */ lui $at, 0x42b4 +/* 7ED700 802429F0 44810000 */ mtc1 $at, $f0 +/* 7ED704 802429F4 0C00A6C9 */ jal clamp_angle +/* 7ED708 802429F8 46006301 */ sub.s $f12, $f12, $f0 +/* 7ED70C 802429FC E600000C */ swc1 $f0, 0xc($s0) +/* 7ED710 80242A00 8E4200CC */ lw $v0, 0xcc($s2) +/* 7ED714 80242A04 8C420000 */ lw $v0, ($v0) +/* 7ED718 80242A08 AE020028 */ sw $v0, 0x28($s0) +/* 7ED71C 80242A0C 24020003 */ addiu $v0, $zero, 3 +/* 7ED720 80242A10 AE620070 */ sw $v0, 0x70($s3) +/* 7ED724 80242A14 8FBF0020 */ lw $ra, 0x20($sp) +/* 7ED728 80242A18 8FB3001C */ lw $s3, 0x1c($sp) +/* 7ED72C 80242A1C 8FB20018 */ lw $s2, 0x18($sp) +/* 7ED730 80242A20 8FB10014 */ lw $s1, 0x14($sp) +/* 7ED734 80242A24 8FB00010 */ lw $s0, 0x10($sp) +/* 7ED738 80242A28 03E00008 */ jr $ra +/* 7ED73C 80242A2C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30.s deleted file mode 100644 index 8ab40a9d8f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A30 -/* 7ED740 80242A30 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7ED744 80242A34 AFB40040 */ sw $s4, 0x40($sp) -/* 7ED748 80242A38 0080A02D */ daddu $s4, $a0, $zero -/* 7ED74C 80242A3C AFBF0044 */ sw $ra, 0x44($sp) -/* 7ED750 80242A40 AFB3003C */ sw $s3, 0x3c($sp) -/* 7ED754 80242A44 AFB20038 */ sw $s2, 0x38($sp) -/* 7ED758 80242A48 AFB10034 */ sw $s1, 0x34($sp) -/* 7ED75C 80242A4C AFB00030 */ sw $s0, 0x30($sp) -/* 7ED760 80242A50 8E910148 */ lw $s1, 0x148($s4) -/* 7ED764 80242A54 00A0902D */ daddu $s2, $a1, $zero -/* 7ED768 80242A58 86240008 */ lh $a0, 8($s1) -/* 7ED76C 80242A5C 0C00EABB */ jal get_npc_unsafe -/* 7ED770 80242A60 00C0982D */ daddu $s3, $a2, $zero -/* 7ED774 80242A64 8E430014 */ lw $v1, 0x14($s2) -/* 7ED778 80242A68 04600031 */ bltz $v1, .L80242B30 -/* 7ED77C 80242A6C 0040802D */ daddu $s0, $v0, $zero -/* 7ED780 80242A70 0260202D */ daddu $a0, $s3, $zero -/* 7ED784 80242A74 AFA00010 */ sw $zero, 0x10($sp) -/* 7ED788 80242A78 8E460024 */ lw $a2, 0x24($s2) -/* 7ED78C 80242A7C 8E470028 */ lw $a3, 0x28($s2) -/* 7ED790 80242A80 0C01242D */ jal func_800490B4 -/* 7ED794 80242A84 0220282D */ daddu $a1, $s1, $zero -/* 7ED798 80242A88 10400029 */ beqz $v0, .L80242B30 -/* 7ED79C 80242A8C 0000202D */ daddu $a0, $zero, $zero -/* 7ED7A0 80242A90 0200282D */ daddu $a1, $s0, $zero -/* 7ED7A4 80242A94 0000302D */ daddu $a2, $zero, $zero -/* 7ED7A8 80242A98 860300A8 */ lh $v1, 0xa8($s0) -/* 7ED7AC 80242A9C 3C013F80 */ lui $at, 0x3f80 -/* 7ED7B0 80242AA0 44810000 */ mtc1 $at, $f0 -/* 7ED7B4 80242AA4 3C014000 */ lui $at, 0x4000 -/* 7ED7B8 80242AA8 44811000 */ mtc1 $at, $f2 -/* 7ED7BC 80242AAC 3C01C1A0 */ lui $at, 0xc1a0 -/* 7ED7C0 80242AB0 44812000 */ mtc1 $at, $f4 -/* 7ED7C4 80242AB4 2402000F */ addiu $v0, $zero, 0xf -/* 7ED7C8 80242AB8 AFA2001C */ sw $v0, 0x1c($sp) -/* 7ED7CC 80242ABC 44833000 */ mtc1 $v1, $f6 -/* 7ED7D0 80242AC0 00000000 */ nop -/* 7ED7D4 80242AC4 468031A0 */ cvt.s.w $f6, $f6 -/* 7ED7D8 80242AC8 44073000 */ mfc1 $a3, $f6 -/* 7ED7DC 80242ACC 27A20028 */ addiu $v0, $sp, 0x28 -/* 7ED7E0 80242AD0 AFA20020 */ sw $v0, 0x20($sp) -/* 7ED7E4 80242AD4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 7ED7E8 80242AD8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 7ED7EC 80242ADC 0C01BFA4 */ jal fx_emote -/* 7ED7F0 80242AE0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7ED7F4 80242AE4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 7ED7F8 80242AE8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 7ED7FC 80242AEC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 7ED800 80242AF0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 7ED804 80242AF4 8C460028 */ lw $a2, 0x28($v0) -/* 7ED808 80242AF8 0C00A720 */ jal atan2 -/* 7ED80C 80242AFC 8C470030 */ lw $a3, 0x30($v0) -/* 7ED810 80242B00 0200202D */ daddu $a0, $s0, $zero -/* 7ED814 80242B04 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 7ED818 80242B08 3C060020 */ lui $a2, 0x20 -/* 7ED81C 80242B0C 0C012530 */ jal func_800494C0 -/* 7ED820 80242B10 E480000C */ swc1 $f0, 0xc($a0) -/* 7ED824 80242B14 8E220018 */ lw $v0, 0x18($s1) -/* 7ED828 80242B18 9442002A */ lhu $v0, 0x2a($v0) -/* 7ED82C 80242B1C 30420001 */ andi $v0, $v0, 1 -/* 7ED830 80242B20 14400029 */ bnez $v0, .L80242BC8 -/* 7ED834 80242B24 2402000A */ addiu $v0, $zero, 0xa -/* 7ED838 80242B28 08090AF2 */ j .L80242BC8 -/* 7ED83C 80242B2C 2402000C */ addiu $v0, $zero, 0xc -.L80242B30: -/* 7ED840 80242B30 8602008C */ lh $v0, 0x8c($s0) -/* 7ED844 80242B34 14400025 */ bnez $v0, .L80242BCC -/* 7ED848 80242B38 00000000 */ nop -/* 7ED84C 80242B3C 9602008E */ lhu $v0, 0x8e($s0) -/* 7ED850 80242B40 2442FFFF */ addiu $v0, $v0, -1 -/* 7ED854 80242B44 A602008E */ sh $v0, 0x8e($s0) -/* 7ED858 80242B48 00021400 */ sll $v0, $v0, 0x10 -/* 7ED85C 80242B4C 1440001F */ bnez $v0, .L80242BCC -/* 7ED860 80242B50 00000000 */ nop -/* 7ED864 80242B54 8E820074 */ lw $v0, 0x74($s4) -/* 7ED868 80242B58 2442FFFF */ addiu $v0, $v0, -1 -/* 7ED86C 80242B5C 10400019 */ beqz $v0, .L80242BC4 -/* 7ED870 80242B60 AE820074 */ sw $v0, 0x74($s4) -/* 7ED874 80242B64 8E220018 */ lw $v0, 0x18($s1) -/* 7ED878 80242B68 9442002A */ lhu $v0, 0x2a($v0) -/* 7ED87C 80242B6C 30420010 */ andi $v0, $v0, 0x10 -/* 7ED880 80242B70 14400007 */ bnez $v0, .L80242B90 -/* 7ED884 80242B74 00000000 */ nop -/* 7ED888 80242B78 C600000C */ lwc1 $f0, 0xc($s0) -/* 7ED88C 80242B7C 3C014334 */ lui $at, 0x4334 -/* 7ED890 80242B80 44816000 */ mtc1 $at, $f12 -/* 7ED894 80242B84 0C00A6C9 */ jal clamp_angle -/* 7ED898 80242B88 460C0300 */ add.s $f12, $f0, $f12 -/* 7ED89C 80242B8C E600000C */ swc1 $f0, 0xc($s0) -.L80242B90: -/* 7ED8A0 80242B90 8E440008 */ lw $a0, 8($s2) -/* 7ED8A4 80242B94 000417C2 */ srl $v0, $a0, 0x1f -/* 7ED8A8 80242B98 00822021 */ addu $a0, $a0, $v0 -/* 7ED8AC 80242B9C 00042043 */ sra $a0, $a0, 1 -/* 7ED8B0 80242BA0 0C00A67F */ jal rand_int -/* 7ED8B4 80242BA4 24840001 */ addiu $a0, $a0, 1 -/* 7ED8B8 80242BA8 8E430008 */ lw $v1, 8($s2) -/* 7ED8BC 80242BAC 000327C2 */ srl $a0, $v1, 0x1f -/* 7ED8C0 80242BB0 00641821 */ addu $v1, $v1, $a0 -/* 7ED8C4 80242BB4 00031843 */ sra $v1, $v1, 1 -/* 7ED8C8 80242BB8 00621821 */ addu $v1, $v1, $v0 -/* 7ED8CC 80242BBC 08090AF3 */ j .L80242BCC -/* 7ED8D0 80242BC0 A603008E */ sh $v1, 0x8e($s0) -.L80242BC4: -/* 7ED8D4 80242BC4 24020004 */ addiu $v0, $zero, 4 -.L80242BC8: -/* 7ED8D8 80242BC8 AE820070 */ sw $v0, 0x70($s4) -.L80242BCC: -/* 7ED8DC 80242BCC 8FBF0044 */ lw $ra, 0x44($sp) -/* 7ED8E0 80242BD0 8FB40040 */ lw $s4, 0x40($sp) -/* 7ED8E4 80242BD4 8FB3003C */ lw $s3, 0x3c($sp) -/* 7ED8E8 80242BD8 8FB20038 */ lw $s2, 0x38($sp) -/* 7ED8EC 80242BDC 8FB10034 */ lw $s1, 0x34($sp) -/* 7ED8F0 80242BE0 8FB00030 */ lw $s0, 0x30($sp) -/* 7ED8F4 80242BE4 03E00008 */ jr $ra -/* 7ED8F8 80242BE8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s new file mode 100644 index 0000000000..93fca594e1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242A30_7ED740.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A30_7ED740 +/* 7ED740 80242A30 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 7ED744 80242A34 AFB40040 */ sw $s4, 0x40($sp) +/* 7ED748 80242A38 0080A02D */ daddu $s4, $a0, $zero +/* 7ED74C 80242A3C AFBF0044 */ sw $ra, 0x44($sp) +/* 7ED750 80242A40 AFB3003C */ sw $s3, 0x3c($sp) +/* 7ED754 80242A44 AFB20038 */ sw $s2, 0x38($sp) +/* 7ED758 80242A48 AFB10034 */ sw $s1, 0x34($sp) +/* 7ED75C 80242A4C AFB00030 */ sw $s0, 0x30($sp) +/* 7ED760 80242A50 8E910148 */ lw $s1, 0x148($s4) +/* 7ED764 80242A54 00A0902D */ daddu $s2, $a1, $zero +/* 7ED768 80242A58 86240008 */ lh $a0, 8($s1) +/* 7ED76C 80242A5C 0C00EABB */ jal get_npc_unsafe +/* 7ED770 80242A60 00C0982D */ daddu $s3, $a2, $zero +/* 7ED774 80242A64 8E430014 */ lw $v1, 0x14($s2) +/* 7ED778 80242A68 04600031 */ bltz $v1, .L80242B30 +/* 7ED77C 80242A6C 0040802D */ daddu $s0, $v0, $zero +/* 7ED780 80242A70 0260202D */ daddu $a0, $s3, $zero +/* 7ED784 80242A74 AFA00010 */ sw $zero, 0x10($sp) +/* 7ED788 80242A78 8E460024 */ lw $a2, 0x24($s2) +/* 7ED78C 80242A7C 8E470028 */ lw $a3, 0x28($s2) +/* 7ED790 80242A80 0C01242D */ jal func_800490B4 +/* 7ED794 80242A84 0220282D */ daddu $a1, $s1, $zero +/* 7ED798 80242A88 10400029 */ beqz $v0, .L80242B30 +/* 7ED79C 80242A8C 0000202D */ daddu $a0, $zero, $zero +/* 7ED7A0 80242A90 0200282D */ daddu $a1, $s0, $zero +/* 7ED7A4 80242A94 0000302D */ daddu $a2, $zero, $zero +/* 7ED7A8 80242A98 860300A8 */ lh $v1, 0xa8($s0) +/* 7ED7AC 80242A9C 3C013F80 */ lui $at, 0x3f80 +/* 7ED7B0 80242AA0 44810000 */ mtc1 $at, $f0 +/* 7ED7B4 80242AA4 3C014000 */ lui $at, 0x4000 +/* 7ED7B8 80242AA8 44811000 */ mtc1 $at, $f2 +/* 7ED7BC 80242AAC 3C01C1A0 */ lui $at, 0xc1a0 +/* 7ED7C0 80242AB0 44812000 */ mtc1 $at, $f4 +/* 7ED7C4 80242AB4 2402000F */ addiu $v0, $zero, 0xf +/* 7ED7C8 80242AB8 AFA2001C */ sw $v0, 0x1c($sp) +/* 7ED7CC 80242ABC 44833000 */ mtc1 $v1, $f6 +/* 7ED7D0 80242AC0 00000000 */ nop +/* 7ED7D4 80242AC4 468031A0 */ cvt.s.w $f6, $f6 +/* 7ED7D8 80242AC8 44073000 */ mfc1 $a3, $f6 +/* 7ED7DC 80242ACC 27A20028 */ addiu $v0, $sp, 0x28 +/* 7ED7E0 80242AD0 AFA20020 */ sw $v0, 0x20($sp) +/* 7ED7E4 80242AD4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 7ED7E8 80242AD8 E7A20014 */ swc1 $f2, 0x14($sp) +/* 7ED7EC 80242ADC 0C01BFA4 */ jal fx_emote +/* 7ED7F0 80242AE0 E7A40018 */ swc1 $f4, 0x18($sp) +/* 7ED7F4 80242AE4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 7ED7F8 80242AE8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 7ED7FC 80242AEC C60C0038 */ lwc1 $f12, 0x38($s0) +/* 7ED800 80242AF0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 7ED804 80242AF4 8C460028 */ lw $a2, 0x28($v0) +/* 7ED808 80242AF8 0C00A720 */ jal atan2 +/* 7ED80C 80242AFC 8C470030 */ lw $a3, 0x30($v0) +/* 7ED810 80242B00 0200202D */ daddu $a0, $s0, $zero +/* 7ED814 80242B04 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 7ED818 80242B08 3C060020 */ lui $a2, 0x20 +/* 7ED81C 80242B0C 0C012530 */ jal func_800494C0 +/* 7ED820 80242B10 E480000C */ swc1 $f0, 0xc($a0) +/* 7ED824 80242B14 8E220018 */ lw $v0, 0x18($s1) +/* 7ED828 80242B18 9442002A */ lhu $v0, 0x2a($v0) +/* 7ED82C 80242B1C 30420001 */ andi $v0, $v0, 1 +/* 7ED830 80242B20 14400029 */ bnez $v0, .L80242BC8 +/* 7ED834 80242B24 2402000A */ addiu $v0, $zero, 0xa +/* 7ED838 80242B28 08090AF2 */ j .L80242BC8 +/* 7ED83C 80242B2C 2402000C */ addiu $v0, $zero, 0xc +.L80242B30: +/* 7ED840 80242B30 8602008C */ lh $v0, 0x8c($s0) +/* 7ED844 80242B34 14400025 */ bnez $v0, .L80242BCC +/* 7ED848 80242B38 00000000 */ nop +/* 7ED84C 80242B3C 9602008E */ lhu $v0, 0x8e($s0) +/* 7ED850 80242B40 2442FFFF */ addiu $v0, $v0, -1 +/* 7ED854 80242B44 A602008E */ sh $v0, 0x8e($s0) +/* 7ED858 80242B48 00021400 */ sll $v0, $v0, 0x10 +/* 7ED85C 80242B4C 1440001F */ bnez $v0, .L80242BCC +/* 7ED860 80242B50 00000000 */ nop +/* 7ED864 80242B54 8E820074 */ lw $v0, 0x74($s4) +/* 7ED868 80242B58 2442FFFF */ addiu $v0, $v0, -1 +/* 7ED86C 80242B5C 10400019 */ beqz $v0, .L80242BC4 +/* 7ED870 80242B60 AE820074 */ sw $v0, 0x74($s4) +/* 7ED874 80242B64 8E220018 */ lw $v0, 0x18($s1) +/* 7ED878 80242B68 9442002A */ lhu $v0, 0x2a($v0) +/* 7ED87C 80242B6C 30420010 */ andi $v0, $v0, 0x10 +/* 7ED880 80242B70 14400007 */ bnez $v0, .L80242B90 +/* 7ED884 80242B74 00000000 */ nop +/* 7ED888 80242B78 C600000C */ lwc1 $f0, 0xc($s0) +/* 7ED88C 80242B7C 3C014334 */ lui $at, 0x4334 +/* 7ED890 80242B80 44816000 */ mtc1 $at, $f12 +/* 7ED894 80242B84 0C00A6C9 */ jal clamp_angle +/* 7ED898 80242B88 460C0300 */ add.s $f12, $f0, $f12 +/* 7ED89C 80242B8C E600000C */ swc1 $f0, 0xc($s0) +.L80242B90: +/* 7ED8A0 80242B90 8E440008 */ lw $a0, 8($s2) +/* 7ED8A4 80242B94 000417C2 */ srl $v0, $a0, 0x1f +/* 7ED8A8 80242B98 00822021 */ addu $a0, $a0, $v0 +/* 7ED8AC 80242B9C 00042043 */ sra $a0, $a0, 1 +/* 7ED8B0 80242BA0 0C00A67F */ jal rand_int +/* 7ED8B4 80242BA4 24840001 */ addiu $a0, $a0, 1 +/* 7ED8B8 80242BA8 8E430008 */ lw $v1, 8($s2) +/* 7ED8BC 80242BAC 000327C2 */ srl $a0, $v1, 0x1f +/* 7ED8C0 80242BB0 00641821 */ addu $v1, $v1, $a0 +/* 7ED8C4 80242BB4 00031843 */ sra $v1, $v1, 1 +/* 7ED8C8 80242BB8 00621821 */ addu $v1, $v1, $v0 +/* 7ED8CC 80242BBC 08090AF3 */ j .L80242BCC +/* 7ED8D0 80242BC0 A603008E */ sh $v1, 0x8e($s0) +.L80242BC4: +/* 7ED8D4 80242BC4 24020004 */ addiu $v0, $zero, 4 +.L80242BC8: +/* 7ED8D8 80242BC8 AE820070 */ sw $v0, 0x70($s4) +.L80242BCC: +/* 7ED8DC 80242BCC 8FBF0044 */ lw $ra, 0x44($sp) +/* 7ED8E0 80242BD0 8FB40040 */ lw $s4, 0x40($sp) +/* 7ED8E4 80242BD4 8FB3003C */ lw $s3, 0x3c($sp) +/* 7ED8E8 80242BD8 8FB20038 */ lw $s2, 0x38($sp) +/* 7ED8EC 80242BDC 8FB10034 */ lw $s1, 0x34($sp) +/* 7ED8F0 80242BE0 8FB00030 */ lw $s0, 0x30($sp) +/* 7ED8F4 80242BE4 03E00008 */ jr $ra +/* 7ED8F8 80242BE8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC.s deleted file mode 100644 index d716f512ff..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BEC -/* 7ED8FC 80242BEC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7ED900 80242BF0 AFB10014 */ sw $s1, 0x14($sp) -/* 7ED904 80242BF4 0080882D */ daddu $s1, $a0, $zero -/* 7ED908 80242BF8 AFBF001C */ sw $ra, 0x1c($sp) -/* 7ED90C 80242BFC AFB20018 */ sw $s2, 0x18($sp) -/* 7ED910 80242C00 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED914 80242C04 8E300148 */ lw $s0, 0x148($s1) -/* 7ED918 80242C08 86040008 */ lh $a0, 8($s0) -/* 7ED91C 80242C0C 0C00EABB */ jal get_npc_unsafe -/* 7ED920 80242C10 00A0902D */ daddu $s2, $a1, $zero -/* 7ED924 80242C14 8E230078 */ lw $v1, 0x78($s1) -/* 7ED928 80242C18 24630001 */ addiu $v1, $v1, 1 -/* 7ED92C 80242C1C AE230078 */ sw $v1, 0x78($s1) -/* 7ED930 80242C20 8E0400D0 */ lw $a0, 0xd0($s0) -/* 7ED934 80242C24 8C840000 */ lw $a0, ($a0) -/* 7ED938 80242C28 0064182A */ slt $v1, $v1, $a0 -/* 7ED93C 80242C2C 14600002 */ bnez $v1, .L80242C38 -/* 7ED940 80242C30 0040282D */ daddu $a1, $v0, $zero -/* 7ED944 80242C34 AE200078 */ sw $zero, 0x78($s1) -.L80242C38: -/* 7ED948 80242C38 8E0200CC */ lw $v0, 0xcc($s0) -/* 7ED94C 80242C3C 8C420004 */ lw $v0, 4($v0) -/* 7ED950 80242C40 ACA20028 */ sw $v0, 0x28($a1) -/* 7ED954 80242C44 8E0200D0 */ lw $v0, 0xd0($s0) -/* 7ED958 80242C48 8C42007C */ lw $v0, 0x7c($v0) -/* 7ED95C 80242C4C 04410004 */ bgez $v0, .L80242C60 -/* 7ED960 80242C50 00000000 */ nop -/* 7ED964 80242C54 C6400000 */ lwc1 $f0, ($s2) -/* 7ED968 80242C58 08090B20 */ j .L80242C80 -/* 7ED96C 80242C5C E4A00018 */ swc1 $f0, 0x18($a1) -.L80242C60: -/* 7ED970 80242C60 3C018025 */ lui $at, 0x8025 -/* 7ED974 80242C64 D42259C8 */ ldc1 $f2, 0x59c8($at) -/* 7ED978 80242C68 44820000 */ mtc1 $v0, $f0 -/* 7ED97C 80242C6C 00000000 */ nop -/* 7ED980 80242C70 46800021 */ cvt.d.w $f0, $f0 -/* 7ED984 80242C74 46220003 */ div.d $f0, $f0, $f2 -/* 7ED988 80242C78 46200020 */ cvt.s.d $f0, $f0 -/* 7ED98C 80242C7C E4A00018 */ swc1 $f0, 0x18($a1) -.L80242C80: -/* 7ED990 80242C80 24020001 */ addiu $v0, $zero, 1 -/* 7ED994 80242C84 AE220070 */ sw $v0, 0x70($s1) -/* 7ED998 80242C88 8FBF001C */ lw $ra, 0x1c($sp) -/* 7ED99C 80242C8C 8FB20018 */ lw $s2, 0x18($sp) -/* 7ED9A0 80242C90 8FB10014 */ lw $s1, 0x14($sp) -/* 7ED9A4 80242C94 8FB00010 */ lw $s0, 0x10($sp) -/* 7ED9A8 80242C98 03E00008 */ jr $ra -/* 7ED9AC 80242C9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s new file mode 100644 index 0000000000..d70ce866d4 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242BEC_7ED8FC.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242BEC_7ED8FC +/* 7ED8FC 80242BEC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7ED900 80242BF0 AFB10014 */ sw $s1, 0x14($sp) +/* 7ED904 80242BF4 0080882D */ daddu $s1, $a0, $zero +/* 7ED908 80242BF8 AFBF001C */ sw $ra, 0x1c($sp) +/* 7ED90C 80242BFC AFB20018 */ sw $s2, 0x18($sp) +/* 7ED910 80242C00 AFB00010 */ sw $s0, 0x10($sp) +/* 7ED914 80242C04 8E300148 */ lw $s0, 0x148($s1) +/* 7ED918 80242C08 86040008 */ lh $a0, 8($s0) +/* 7ED91C 80242C0C 0C00EABB */ jal get_npc_unsafe +/* 7ED920 80242C10 00A0902D */ daddu $s2, $a1, $zero +/* 7ED924 80242C14 8E230078 */ lw $v1, 0x78($s1) +/* 7ED928 80242C18 24630001 */ addiu $v1, $v1, 1 +/* 7ED92C 80242C1C AE230078 */ sw $v1, 0x78($s1) +/* 7ED930 80242C20 8E0400D0 */ lw $a0, 0xd0($s0) +/* 7ED934 80242C24 8C840000 */ lw $a0, ($a0) +/* 7ED938 80242C28 0064182A */ slt $v1, $v1, $a0 +/* 7ED93C 80242C2C 14600002 */ bnez $v1, .L80242C38 +/* 7ED940 80242C30 0040282D */ daddu $a1, $v0, $zero +/* 7ED944 80242C34 AE200078 */ sw $zero, 0x78($s1) +.L80242C38: +/* 7ED948 80242C38 8E0200CC */ lw $v0, 0xcc($s0) +/* 7ED94C 80242C3C 8C420004 */ lw $v0, 4($v0) +/* 7ED950 80242C40 ACA20028 */ sw $v0, 0x28($a1) +/* 7ED954 80242C44 8E0200D0 */ lw $v0, 0xd0($s0) +/* 7ED958 80242C48 8C42007C */ lw $v0, 0x7c($v0) +/* 7ED95C 80242C4C 04410004 */ bgez $v0, .L80242C60 +/* 7ED960 80242C50 00000000 */ nop +/* 7ED964 80242C54 C6400000 */ lwc1 $f0, ($s2) +/* 7ED968 80242C58 08090B20 */ j .L80242C80 +/* 7ED96C 80242C5C E4A00018 */ swc1 $f0, 0x18($a1) +.L80242C60: +/* 7ED970 80242C60 3C018025 */ lui $at, 0x8025 +/* 7ED974 80242C64 D42259C8 */ ldc1 $f2, 0x59c8($at) +/* 7ED978 80242C68 44820000 */ mtc1 $v0, $f0 +/* 7ED97C 80242C6C 00000000 */ nop +/* 7ED980 80242C70 46800021 */ cvt.d.w $f0, $f0 +/* 7ED984 80242C74 46220003 */ div.d $f0, $f0, $f2 +/* 7ED988 80242C78 46200020 */ cvt.s.d $f0, $f0 +/* 7ED98C 80242C7C E4A00018 */ swc1 $f0, 0x18($a1) +.L80242C80: +/* 7ED990 80242C80 24020001 */ addiu $v0, $zero, 1 +/* 7ED994 80242C84 AE220070 */ sw $v0, 0x70($s1) +/* 7ED998 80242C88 8FBF001C */ lw $ra, 0x1c($sp) +/* 7ED99C 80242C8C 8FB20018 */ lw $s2, 0x18($sp) +/* 7ED9A0 80242C90 8FB10014 */ lw $s1, 0x14($sp) +/* 7ED9A4 80242C94 8FB00010 */ lw $s0, 0x10($sp) +/* 7ED9A8 80242C98 03E00008 */ jr $ra +/* 7ED9AC 80242C9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0.s deleted file mode 100644 index 78cd3836e9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CA0 -/* 7ED9B0 80242CA0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7ED9B4 80242CA4 AFB10014 */ sw $s1, 0x14($sp) -/* 7ED9B8 80242CA8 0080882D */ daddu $s1, $a0, $zero -/* 7ED9BC 80242CAC AFBF0018 */ sw $ra, 0x18($sp) -/* 7ED9C0 80242CB0 AFB00010 */ sw $s0, 0x10($sp) -/* 7ED9C4 80242CB4 8E300148 */ lw $s0, 0x148($s1) -/* 7ED9C8 80242CB8 0C00EABB */ jal get_npc_unsafe -/* 7ED9CC 80242CBC 86040008 */ lh $a0, 8($s0) -/* 7ED9D0 80242CC0 8E0300CC */ lw $v1, 0xcc($s0) -/* 7ED9D4 80242CC4 3C014120 */ lui $at, 0x4120 -/* 7ED9D8 80242CC8 44812000 */ mtc1 $at, $f4 -/* 7ED9DC 80242CCC 3C014000 */ lui $at, 0x4000 -/* 7ED9E0 80242CD0 44810000 */ mtc1 $at, $f0 -/* 7ED9E4 80242CD4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 7ED9E8 80242CD8 8C640010 */ lw $a0, 0x10($v1) -/* 7ED9EC 80242CDC 8C430000 */ lw $v1, ($v0) -/* 7ED9F0 80242CE0 E444001C */ swc1 $f4, 0x1c($v0) -/* 7ED9F4 80242CE4 E4400014 */ swc1 $f0, 0x14($v0) -/* 7ED9F8 80242CE8 E4420064 */ swc1 $f2, 0x64($v0) -/* 7ED9FC 80242CEC 34630800 */ ori $v1, $v1, 0x800 -/* 7EDA00 80242CF0 AC430000 */ sw $v1, ($v0) -/* 7EDA04 80242CF4 AC440028 */ sw $a0, 0x28($v0) -/* 7EDA08 80242CF8 2402000B */ addiu $v0, $zero, 0xb -/* 7EDA0C 80242CFC AE220070 */ sw $v0, 0x70($s1) -/* 7EDA10 80242D00 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EDA14 80242D04 8FB10014 */ lw $s1, 0x14($sp) -/* 7EDA18 80242D08 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDA1C 80242D0C 03E00008 */ jr $ra -/* 7EDA20 80242D10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0_7ED9B0.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0_7ED9B0.s new file mode 100644 index 0000000000..242b8a3e0d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242CA0_7ED9B0.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242CA0_7ED9B0 +/* 7ED9B0 80242CA0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7ED9B4 80242CA4 AFB10014 */ sw $s1, 0x14($sp) +/* 7ED9B8 80242CA8 0080882D */ daddu $s1, $a0, $zero +/* 7ED9BC 80242CAC AFBF0018 */ sw $ra, 0x18($sp) +/* 7ED9C0 80242CB0 AFB00010 */ sw $s0, 0x10($sp) +/* 7ED9C4 80242CB4 8E300148 */ lw $s0, 0x148($s1) +/* 7ED9C8 80242CB8 0C00EABB */ jal get_npc_unsafe +/* 7ED9CC 80242CBC 86040008 */ lh $a0, 8($s0) +/* 7ED9D0 80242CC0 8E0300CC */ lw $v1, 0xcc($s0) +/* 7ED9D4 80242CC4 3C014120 */ lui $at, 0x4120 +/* 7ED9D8 80242CC8 44812000 */ mtc1 $at, $f4 +/* 7ED9DC 80242CCC 3C014000 */ lui $at, 0x4000 +/* 7ED9E0 80242CD0 44810000 */ mtc1 $at, $f0 +/* 7ED9E4 80242CD4 C442003C */ lwc1 $f2, 0x3c($v0) +/* 7ED9E8 80242CD8 8C640010 */ lw $a0, 0x10($v1) +/* 7ED9EC 80242CDC 8C430000 */ lw $v1, ($v0) +/* 7ED9F0 80242CE0 E444001C */ swc1 $f4, 0x1c($v0) +/* 7ED9F4 80242CE4 E4400014 */ swc1 $f0, 0x14($v0) +/* 7ED9F8 80242CE8 E4420064 */ swc1 $f2, 0x64($v0) +/* 7ED9FC 80242CEC 34630800 */ ori $v1, $v1, 0x800 +/* 7EDA00 80242CF0 AC430000 */ sw $v1, ($v0) +/* 7EDA04 80242CF4 AC440028 */ sw $a0, 0x28($v0) +/* 7EDA08 80242CF8 2402000B */ addiu $v0, $zero, 0xb +/* 7EDA0C 80242CFC AE220070 */ sw $v0, 0x70($s1) +/* 7EDA10 80242D00 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EDA14 80242D04 8FB10014 */ lw $s1, 0x14($sp) +/* 7EDA18 80242D08 8FB00010 */ lw $s0, 0x10($sp) +/* 7EDA1C 80242D0C 03E00008 */ jr $ra +/* 7EDA20 80242D10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14.s deleted file mode 100644 index a4c222c417..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D14 -/* 7EDA24 80242D14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EDA28 80242D18 AFB00010 */ sw $s0, 0x10($sp) -/* 7EDA2C 80242D1C 0080802D */ daddu $s0, $a0, $zero -/* 7EDA30 80242D20 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EDA34 80242D24 8E020148 */ lw $v0, 0x148($s0) -/* 7EDA38 80242D28 0C00EABB */ jal get_npc_unsafe -/* 7EDA3C 80242D2C 84440008 */ lh $a0, 8($v0) -/* 7EDA40 80242D30 0040202D */ daddu $a0, $v0, $zero -/* 7EDA44 80242D34 C482003C */ lwc1 $f2, 0x3c($a0) -/* 7EDA48 80242D38 C480001C */ lwc1 $f0, 0x1c($a0) -/* 7EDA4C 80242D3C 46001080 */ add.s $f2, $f2, $f0 -/* 7EDA50 80242D40 C4840014 */ lwc1 $f4, 0x14($a0) -/* 7EDA54 80242D44 46040001 */ sub.s $f0, $f0, $f4 -/* 7EDA58 80242D48 C4840064 */ lwc1 $f4, 0x64($a0) -/* 7EDA5C 80242D4C 4602203C */ c.lt.s $f4, $f2 -/* 7EDA60 80242D50 E482003C */ swc1 $f2, 0x3c($a0) -/* 7EDA64 80242D54 45010009 */ bc1t .L80242D7C -/* 7EDA68 80242D58 E480001C */ swc1 $f0, 0x1c($a0) -/* 7EDA6C 80242D5C 8C820000 */ lw $v0, ($a0) -/* 7EDA70 80242D60 2403F7FF */ addiu $v1, $zero, -0x801 -/* 7EDA74 80242D64 E484003C */ swc1 $f4, 0x3c($a0) -/* 7EDA78 80242D68 AC80001C */ sw $zero, 0x1c($a0) -/* 7EDA7C 80242D6C 00431024 */ and $v0, $v0, $v1 -/* 7EDA80 80242D70 AC820000 */ sw $v0, ($a0) -/* 7EDA84 80242D74 2402000C */ addiu $v0, $zero, 0xc -/* 7EDA88 80242D78 AE020070 */ sw $v0, 0x70($s0) -.L80242D7C: -/* 7EDA8C 80242D7C 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EDA90 80242D80 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDA94 80242D84 03E00008 */ jr $ra -/* 7EDA98 80242D88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14_7EDA24.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14_7EDA24.s new file mode 100644 index 0000000000..4a74e1dbdf --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D14_7EDA24.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D14_7EDA24 +/* 7EDA24 80242D14 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EDA28 80242D18 AFB00010 */ sw $s0, 0x10($sp) +/* 7EDA2C 80242D1C 0080802D */ daddu $s0, $a0, $zero +/* 7EDA30 80242D20 AFBF0014 */ sw $ra, 0x14($sp) +/* 7EDA34 80242D24 8E020148 */ lw $v0, 0x148($s0) +/* 7EDA38 80242D28 0C00EABB */ jal get_npc_unsafe +/* 7EDA3C 80242D2C 84440008 */ lh $a0, 8($v0) +/* 7EDA40 80242D30 0040202D */ daddu $a0, $v0, $zero +/* 7EDA44 80242D34 C482003C */ lwc1 $f2, 0x3c($a0) +/* 7EDA48 80242D38 C480001C */ lwc1 $f0, 0x1c($a0) +/* 7EDA4C 80242D3C 46001080 */ add.s $f2, $f2, $f0 +/* 7EDA50 80242D40 C4840014 */ lwc1 $f4, 0x14($a0) +/* 7EDA54 80242D44 46040001 */ sub.s $f0, $f0, $f4 +/* 7EDA58 80242D48 C4840064 */ lwc1 $f4, 0x64($a0) +/* 7EDA5C 80242D4C 4602203C */ c.lt.s $f4, $f2 +/* 7EDA60 80242D50 E482003C */ swc1 $f2, 0x3c($a0) +/* 7EDA64 80242D54 45010009 */ bc1t .L80242D7C +/* 7EDA68 80242D58 E480001C */ swc1 $f0, 0x1c($a0) +/* 7EDA6C 80242D5C 8C820000 */ lw $v0, ($a0) +/* 7EDA70 80242D60 2403F7FF */ addiu $v1, $zero, -0x801 +/* 7EDA74 80242D64 E484003C */ swc1 $f4, 0x3c($a0) +/* 7EDA78 80242D68 AC80001C */ sw $zero, 0x1c($a0) +/* 7EDA7C 80242D6C 00431024 */ and $v0, $v0, $v1 +/* 7EDA80 80242D70 AC820000 */ sw $v0, ($a0) +/* 7EDA84 80242D74 2402000C */ addiu $v0, $zero, 0xc +/* 7EDA88 80242D78 AE020070 */ sw $v0, 0x70($s0) +.L80242D7C: +/* 7EDA8C 80242D7C 8FBF0014 */ lw $ra, 0x14($sp) +/* 7EDA90 80242D80 8FB00010 */ lw $s0, 0x10($sp) +/* 7EDA94 80242D84 03E00008 */ jr $ra +/* 7EDA98 80242D88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C.s deleted file mode 100644 index 1e432f37ad..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D8C -/* 7EDA9C 80242D8C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 7EDAA0 80242D90 AFB3001C */ sw $s3, 0x1c($sp) -/* 7EDAA4 80242D94 0080982D */ daddu $s3, $a0, $zero -/* 7EDAA8 80242D98 AFBF0020 */ sw $ra, 0x20($sp) -/* 7EDAAC 80242D9C AFB20018 */ sw $s2, 0x18($sp) -/* 7EDAB0 80242DA0 AFB10014 */ sw $s1, 0x14($sp) -/* 7EDAB4 80242DA4 AFB00010 */ sw $s0, 0x10($sp) -/* 7EDAB8 80242DA8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 7EDABC 80242DAC 8E710148 */ lw $s1, 0x148($s3) -/* 7EDAC0 80242DB0 86240008 */ lh $a0, 8($s1) -/* 7EDAC4 80242DB4 0C00EABB */ jal get_npc_unsafe -/* 7EDAC8 80242DB8 00A0802D */ daddu $s0, $a1, $zero -/* 7EDACC 80242DBC 8E040020 */ lw $a0, 0x20($s0) -/* 7EDAD0 80242DC0 0040902D */ daddu $s2, $v0, $zero -/* 7EDAD4 80242DC4 00041FC2 */ srl $v1, $a0, 0x1f -/* 7EDAD8 80242DC8 00832021 */ addu $a0, $a0, $v1 -/* 7EDADC 80242DCC 00042043 */ sra $a0, $a0, 1 -/* 7EDAE0 80242DD0 0C00A67F */ jal rand_int -/* 7EDAE4 80242DD4 24840001 */ addiu $a0, $a0, 1 -/* 7EDAE8 80242DD8 8E030020 */ lw $v1, 0x20($s0) -/* 7EDAEC 80242DDC C64C0038 */ lwc1 $f12, 0x38($s2) -/* 7EDAF0 80242DE0 000327C2 */ srl $a0, $v1, 0x1f -/* 7EDAF4 80242DE4 00641821 */ addu $v1, $v1, $a0 -/* 7EDAF8 80242DE8 00031843 */ sra $v1, $v1, 1 -/* 7EDAFC 80242DEC 00621821 */ addu $v1, $v1, $v0 -/* 7EDB00 80242DF0 A643008E */ sh $v1, 0x8e($s2) -/* 7EDB04 80242DF4 8E2200CC */ lw $v0, 0xcc($s1) -/* 7EDB08 80242DF8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 7EDB0C 80242DFC 8C42000C */ lw $v0, 0xc($v0) -/* 7EDB10 80242E00 AE420028 */ sw $v0, 0x28($s2) -/* 7EDB14 80242E04 C6000018 */ lwc1 $f0, 0x18($s0) -/* 7EDB18 80242E08 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 7EDB1C 80242E0C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 7EDB20 80242E10 E6400018 */ swc1 $f0, 0x18($s2) -/* 7EDB24 80242E14 8C460028 */ lw $a2, 0x28($v0) -/* 7EDB28 80242E18 0C00A720 */ jal atan2 -/* 7EDB2C 80242E1C 8C470030 */ lw $a3, 0x30($v0) -/* 7EDB30 80242E20 46000506 */ mov.s $f20, $f0 -/* 7EDB34 80242E24 C64C000C */ lwc1 $f12, 0xc($s2) -/* 7EDB38 80242E28 0C00A70A */ jal get_clamped_angle_diff -/* 7EDB3C 80242E2C 4600A386 */ mov.s $f14, $f20 -/* 7EDB40 80242E30 46000086 */ mov.s $f2, $f0 -/* 7EDB44 80242E34 8E02001C */ lw $v0, 0x1c($s0) -/* 7EDB48 80242E38 46001005 */ abs.s $f0, $f2 -/* 7EDB4C 80242E3C 44822000 */ mtc1 $v0, $f4 -/* 7EDB50 80242E40 00000000 */ nop -/* 7EDB54 80242E44 46802120 */ cvt.s.w $f4, $f4 -/* 7EDB58 80242E48 4600203C */ c.lt.s $f4, $f0 -/* 7EDB5C 80242E4C 00000000 */ nop -/* 7EDB60 80242E50 4500000D */ bc1f .L80242E88 -/* 7EDB64 80242E54 00000000 */ nop -/* 7EDB68 80242E58 44800000 */ mtc1 $zero, $f0 -/* 7EDB6C 80242E5C C654000C */ lwc1 $f20, 0xc($s2) -/* 7EDB70 80242E60 4600103C */ c.lt.s $f2, $f0 -/* 7EDB74 80242E64 00000000 */ nop -/* 7EDB78 80242E68 45000006 */ bc1f .L80242E84 -/* 7EDB7C 80242E6C 00021023 */ negu $v0, $v0 -/* 7EDB80 80242E70 44820000 */ mtc1 $v0, $f0 -/* 7EDB84 80242E74 00000000 */ nop -/* 7EDB88 80242E78 46800020 */ cvt.s.w $f0, $f0 -/* 7EDB8C 80242E7C 08090BA2 */ j .L80242E88 -/* 7EDB90 80242E80 4600A500 */ add.s $f20, $f20, $f0 -.L80242E84: -/* 7EDB94 80242E84 4604A500 */ add.s $f20, $f20, $f4 -.L80242E88: -/* 7EDB98 80242E88 0C00A6C9 */ jal clamp_angle -/* 7EDB9C 80242E8C 4600A306 */ mov.s $f12, $f20 -/* 7EDBA0 80242E90 2402000D */ addiu $v0, $zero, 0xd -/* 7EDBA4 80242E94 E640000C */ swc1 $f0, 0xc($s2) -/* 7EDBA8 80242E98 AE620070 */ sw $v0, 0x70($s3) -/* 7EDBAC 80242E9C 8FBF0020 */ lw $ra, 0x20($sp) -/* 7EDBB0 80242EA0 8FB3001C */ lw $s3, 0x1c($sp) -/* 7EDBB4 80242EA4 8FB20018 */ lw $s2, 0x18($sp) -/* 7EDBB8 80242EA8 8FB10014 */ lw $s1, 0x14($sp) -/* 7EDBBC 80242EAC 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDBC0 80242EB0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 7EDBC4 80242EB4 03E00008 */ jr $ra -/* 7EDBC8 80242EB8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C_7EDA9C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C_7EDA9C.s new file mode 100644 index 0000000000..922e0bb3e3 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242D8C_7EDA9C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D8C_7EDA9C +/* 7EDA9C 80242D8C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 7EDAA0 80242D90 AFB3001C */ sw $s3, 0x1c($sp) +/* 7EDAA4 80242D94 0080982D */ daddu $s3, $a0, $zero +/* 7EDAA8 80242D98 AFBF0020 */ sw $ra, 0x20($sp) +/* 7EDAAC 80242D9C AFB20018 */ sw $s2, 0x18($sp) +/* 7EDAB0 80242DA0 AFB10014 */ sw $s1, 0x14($sp) +/* 7EDAB4 80242DA4 AFB00010 */ sw $s0, 0x10($sp) +/* 7EDAB8 80242DA8 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 7EDABC 80242DAC 8E710148 */ lw $s1, 0x148($s3) +/* 7EDAC0 80242DB0 86240008 */ lh $a0, 8($s1) +/* 7EDAC4 80242DB4 0C00EABB */ jal get_npc_unsafe +/* 7EDAC8 80242DB8 00A0802D */ daddu $s0, $a1, $zero +/* 7EDACC 80242DBC 8E040020 */ lw $a0, 0x20($s0) +/* 7EDAD0 80242DC0 0040902D */ daddu $s2, $v0, $zero +/* 7EDAD4 80242DC4 00041FC2 */ srl $v1, $a0, 0x1f +/* 7EDAD8 80242DC8 00832021 */ addu $a0, $a0, $v1 +/* 7EDADC 80242DCC 00042043 */ sra $a0, $a0, 1 +/* 7EDAE0 80242DD0 0C00A67F */ jal rand_int +/* 7EDAE4 80242DD4 24840001 */ addiu $a0, $a0, 1 +/* 7EDAE8 80242DD8 8E030020 */ lw $v1, 0x20($s0) +/* 7EDAEC 80242DDC C64C0038 */ lwc1 $f12, 0x38($s2) +/* 7EDAF0 80242DE0 000327C2 */ srl $a0, $v1, 0x1f +/* 7EDAF4 80242DE4 00641821 */ addu $v1, $v1, $a0 +/* 7EDAF8 80242DE8 00031843 */ sra $v1, $v1, 1 +/* 7EDAFC 80242DEC 00621821 */ addu $v1, $v1, $v0 +/* 7EDB00 80242DF0 A643008E */ sh $v1, 0x8e($s2) +/* 7EDB04 80242DF4 8E2200CC */ lw $v0, 0xcc($s1) +/* 7EDB08 80242DF8 C64E0040 */ lwc1 $f14, 0x40($s2) +/* 7EDB0C 80242DFC 8C42000C */ lw $v0, 0xc($v0) +/* 7EDB10 80242E00 AE420028 */ sw $v0, 0x28($s2) +/* 7EDB14 80242E04 C6000018 */ lwc1 $f0, 0x18($s0) +/* 7EDB18 80242E08 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 7EDB1C 80242E0C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 7EDB20 80242E10 E6400018 */ swc1 $f0, 0x18($s2) +/* 7EDB24 80242E14 8C460028 */ lw $a2, 0x28($v0) +/* 7EDB28 80242E18 0C00A720 */ jal atan2 +/* 7EDB2C 80242E1C 8C470030 */ lw $a3, 0x30($v0) +/* 7EDB30 80242E20 46000506 */ mov.s $f20, $f0 +/* 7EDB34 80242E24 C64C000C */ lwc1 $f12, 0xc($s2) +/* 7EDB38 80242E28 0C00A70A */ jal get_clamped_angle_diff +/* 7EDB3C 80242E2C 4600A386 */ mov.s $f14, $f20 +/* 7EDB40 80242E30 46000086 */ mov.s $f2, $f0 +/* 7EDB44 80242E34 8E02001C */ lw $v0, 0x1c($s0) +/* 7EDB48 80242E38 46001005 */ abs.s $f0, $f2 +/* 7EDB4C 80242E3C 44822000 */ mtc1 $v0, $f4 +/* 7EDB50 80242E40 00000000 */ nop +/* 7EDB54 80242E44 46802120 */ cvt.s.w $f4, $f4 +/* 7EDB58 80242E48 4600203C */ c.lt.s $f4, $f0 +/* 7EDB5C 80242E4C 00000000 */ nop +/* 7EDB60 80242E50 4500000D */ bc1f .L80242E88 +/* 7EDB64 80242E54 00000000 */ nop +/* 7EDB68 80242E58 44800000 */ mtc1 $zero, $f0 +/* 7EDB6C 80242E5C C654000C */ lwc1 $f20, 0xc($s2) +/* 7EDB70 80242E60 4600103C */ c.lt.s $f2, $f0 +/* 7EDB74 80242E64 00000000 */ nop +/* 7EDB78 80242E68 45000006 */ bc1f .L80242E84 +/* 7EDB7C 80242E6C 00021023 */ negu $v0, $v0 +/* 7EDB80 80242E70 44820000 */ mtc1 $v0, $f0 +/* 7EDB84 80242E74 00000000 */ nop +/* 7EDB88 80242E78 46800020 */ cvt.s.w $f0, $f0 +/* 7EDB8C 80242E7C 08090BA2 */ j .L80242E88 +/* 7EDB90 80242E80 4600A500 */ add.s $f20, $f20, $f0 +.L80242E84: +/* 7EDB94 80242E84 4604A500 */ add.s $f20, $f20, $f4 +.L80242E88: +/* 7EDB98 80242E88 0C00A6C9 */ jal clamp_angle +/* 7EDB9C 80242E8C 4600A306 */ mov.s $f12, $f20 +/* 7EDBA0 80242E90 2402000D */ addiu $v0, $zero, 0xd +/* 7EDBA4 80242E94 E640000C */ swc1 $f0, 0xc($s2) +/* 7EDBA8 80242E98 AE620070 */ sw $v0, 0x70($s3) +/* 7EDBAC 80242E9C 8FBF0020 */ lw $ra, 0x20($sp) +/* 7EDBB0 80242EA0 8FB3001C */ lw $s3, 0x1c($sp) +/* 7EDBB4 80242EA4 8FB20018 */ lw $s2, 0x18($sp) +/* 7EDBB8 80242EA8 8FB10014 */ lw $s1, 0x14($sp) +/* 7EDBBC 80242EAC 8FB00010 */ lw $s0, 0x10($sp) +/* 7EDBC0 80242EB0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 7EDBC4 80242EB4 03E00008 */ jr $ra +/* 7EDBC8 80242EB8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC.s deleted file mode 100644 index 21c8cda638..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242EBC -/* 7EDBCC 80242EBC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7EDBD0 80242EC0 AFB3003C */ sw $s3, 0x3c($sp) -/* 7EDBD4 80242EC4 0080982D */ daddu $s3, $a0, $zero -/* 7EDBD8 80242EC8 AFBF0040 */ sw $ra, 0x40($sp) -/* 7EDBDC 80242ECC AFB20038 */ sw $s2, 0x38($sp) -/* 7EDBE0 80242ED0 AFB10034 */ sw $s1, 0x34($sp) -/* 7EDBE4 80242ED4 AFB00030 */ sw $s0, 0x30($sp) -/* 7EDBE8 80242ED8 8E720148 */ lw $s2, 0x148($s3) -/* 7EDBEC 80242EDC 00A0882D */ daddu $s1, $a1, $zero -/* 7EDBF0 80242EE0 86440008 */ lh $a0, 8($s2) -/* 7EDBF4 80242EE4 0C00EABB */ jal get_npc_unsafe -/* 7EDBF8 80242EE8 00C0802D */ daddu $s0, $a2, $zero -/* 7EDBFC 80242EEC 0200202D */ daddu $a0, $s0, $zero -/* 7EDC00 80242EF0 0240282D */ daddu $a1, $s2, $zero -/* 7EDC04 80242EF4 24030001 */ addiu $v1, $zero, 1 -/* 7EDC08 80242EF8 AFA30010 */ sw $v1, 0x10($sp) -/* 7EDC0C 80242EFC 8E260024 */ lw $a2, 0x24($s1) -/* 7EDC10 80242F00 8E270028 */ lw $a3, 0x28($s1) -/* 7EDC14 80242F04 0C01242D */ jal func_800490B4 -/* 7EDC18 80242F08 0040802D */ daddu $s0, $v0, $zero -/* 7EDC1C 80242F0C 1440001E */ bnez $v0, .L80242F88 -/* 7EDC20 80242F10 0200202D */ daddu $a0, $s0, $zero -/* 7EDC24 80242F14 24040002 */ addiu $a0, $zero, 2 -/* 7EDC28 80242F18 0200282D */ daddu $a1, $s0, $zero -/* 7EDC2C 80242F1C 0000302D */ daddu $a2, $zero, $zero -/* 7EDC30 80242F20 860300A8 */ lh $v1, 0xa8($s0) -/* 7EDC34 80242F24 3C013F80 */ lui $at, 0x3f80 -/* 7EDC38 80242F28 44810000 */ mtc1 $at, $f0 -/* 7EDC3C 80242F2C 3C014000 */ lui $at, 0x4000 -/* 7EDC40 80242F30 44811000 */ mtc1 $at, $f2 -/* 7EDC44 80242F34 3C01C1A0 */ lui $at, 0xc1a0 -/* 7EDC48 80242F38 44812000 */ mtc1 $at, $f4 -/* 7EDC4C 80242F3C 2402000F */ addiu $v0, $zero, 0xf -/* 7EDC50 80242F40 AFA2001C */ sw $v0, 0x1c($sp) -/* 7EDC54 80242F44 44833000 */ mtc1 $v1, $f6 -/* 7EDC58 80242F48 00000000 */ nop -/* 7EDC5C 80242F4C 468031A0 */ cvt.s.w $f6, $f6 -/* 7EDC60 80242F50 44073000 */ mfc1 $a3, $f6 -/* 7EDC64 80242F54 27A20028 */ addiu $v0, $sp, 0x28 -/* 7EDC68 80242F58 AFA20020 */ sw $v0, 0x20($sp) -/* 7EDC6C 80242F5C E7A00010 */ swc1 $f0, 0x10($sp) -/* 7EDC70 80242F60 E7A20014 */ swc1 $f2, 0x14($sp) -/* 7EDC74 80242F64 0C01BFA4 */ jal fx_emote -/* 7EDC78 80242F68 E7A40018 */ swc1 $f4, 0x18($sp) -/* 7EDC7C 80242F6C 8E4200CC */ lw $v0, 0xcc($s2) -/* 7EDC80 80242F70 8C430000 */ lw $v1, ($v0) -/* 7EDC84 80242F74 24020019 */ addiu $v0, $zero, 0x19 -/* 7EDC88 80242F78 A602008E */ sh $v0, 0x8e($s0) -/* 7EDC8C 80242F7C 2402000E */ addiu $v0, $zero, 0xe -/* 7EDC90 80242F80 08090BEF */ j .L80242FBC -/* 7EDC94 80242F84 AE030028 */ sw $v1, 0x28($s0) -.L80242F88: -/* 7EDC98 80242F88 0C00F598 */ jal func_8003D660 -/* 7EDC9C 80242F8C 24050001 */ addiu $a1, $zero, 1 -/* 7EDCA0 80242F90 8E050018 */ lw $a1, 0x18($s0) -/* 7EDCA4 80242F94 8E06000C */ lw $a2, 0xc($s0) -/* 7EDCA8 80242F98 0C00EA95 */ jal npc_move_heading -/* 7EDCAC 80242F9C 0200202D */ daddu $a0, $s0, $zero -/* 7EDCB0 80242FA0 8602008E */ lh $v0, 0x8e($s0) -/* 7EDCB4 80242FA4 9603008E */ lhu $v1, 0x8e($s0) -/* 7EDCB8 80242FA8 18400003 */ blez $v0, .L80242FB8 -/* 7EDCBC 80242FAC 2462FFFF */ addiu $v0, $v1, -1 -/* 7EDCC0 80242FB0 08090BF0 */ j .L80242FC0 -/* 7EDCC4 80242FB4 A602008E */ sh $v0, 0x8e($s0) -.L80242FB8: -/* 7EDCC8 80242FB8 2402000C */ addiu $v0, $zero, 0xc -.L80242FBC: -/* 7EDCCC 80242FBC AE620070 */ sw $v0, 0x70($s3) -.L80242FC0: -/* 7EDCD0 80242FC0 8FBF0040 */ lw $ra, 0x40($sp) -/* 7EDCD4 80242FC4 8FB3003C */ lw $s3, 0x3c($sp) -/* 7EDCD8 80242FC8 8FB20038 */ lw $s2, 0x38($sp) -/* 7EDCDC 80242FCC 8FB10034 */ lw $s1, 0x34($sp) -/* 7EDCE0 80242FD0 8FB00030 */ lw $s0, 0x30($sp) -/* 7EDCE4 80242FD4 03E00008 */ jr $ra -/* 7EDCE8 80242FD8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s new file mode 100644 index 0000000000..c0676f7e6b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242EBC_7EDBCC.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242EBC_7EDBCC +/* 7EDBCC 80242EBC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 7EDBD0 80242EC0 AFB3003C */ sw $s3, 0x3c($sp) +/* 7EDBD4 80242EC4 0080982D */ daddu $s3, $a0, $zero +/* 7EDBD8 80242EC8 AFBF0040 */ sw $ra, 0x40($sp) +/* 7EDBDC 80242ECC AFB20038 */ sw $s2, 0x38($sp) +/* 7EDBE0 80242ED0 AFB10034 */ sw $s1, 0x34($sp) +/* 7EDBE4 80242ED4 AFB00030 */ sw $s0, 0x30($sp) +/* 7EDBE8 80242ED8 8E720148 */ lw $s2, 0x148($s3) +/* 7EDBEC 80242EDC 00A0882D */ daddu $s1, $a1, $zero +/* 7EDBF0 80242EE0 86440008 */ lh $a0, 8($s2) +/* 7EDBF4 80242EE4 0C00EABB */ jal get_npc_unsafe +/* 7EDBF8 80242EE8 00C0802D */ daddu $s0, $a2, $zero +/* 7EDBFC 80242EEC 0200202D */ daddu $a0, $s0, $zero +/* 7EDC00 80242EF0 0240282D */ daddu $a1, $s2, $zero +/* 7EDC04 80242EF4 24030001 */ addiu $v1, $zero, 1 +/* 7EDC08 80242EF8 AFA30010 */ sw $v1, 0x10($sp) +/* 7EDC0C 80242EFC 8E260024 */ lw $a2, 0x24($s1) +/* 7EDC10 80242F00 8E270028 */ lw $a3, 0x28($s1) +/* 7EDC14 80242F04 0C01242D */ jal func_800490B4 +/* 7EDC18 80242F08 0040802D */ daddu $s0, $v0, $zero +/* 7EDC1C 80242F0C 1440001E */ bnez $v0, .L80242F88 +/* 7EDC20 80242F10 0200202D */ daddu $a0, $s0, $zero +/* 7EDC24 80242F14 24040002 */ addiu $a0, $zero, 2 +/* 7EDC28 80242F18 0200282D */ daddu $a1, $s0, $zero +/* 7EDC2C 80242F1C 0000302D */ daddu $a2, $zero, $zero +/* 7EDC30 80242F20 860300A8 */ lh $v1, 0xa8($s0) +/* 7EDC34 80242F24 3C013F80 */ lui $at, 0x3f80 +/* 7EDC38 80242F28 44810000 */ mtc1 $at, $f0 +/* 7EDC3C 80242F2C 3C014000 */ lui $at, 0x4000 +/* 7EDC40 80242F30 44811000 */ mtc1 $at, $f2 +/* 7EDC44 80242F34 3C01C1A0 */ lui $at, 0xc1a0 +/* 7EDC48 80242F38 44812000 */ mtc1 $at, $f4 +/* 7EDC4C 80242F3C 2402000F */ addiu $v0, $zero, 0xf +/* 7EDC50 80242F40 AFA2001C */ sw $v0, 0x1c($sp) +/* 7EDC54 80242F44 44833000 */ mtc1 $v1, $f6 +/* 7EDC58 80242F48 00000000 */ nop +/* 7EDC5C 80242F4C 468031A0 */ cvt.s.w $f6, $f6 +/* 7EDC60 80242F50 44073000 */ mfc1 $a3, $f6 +/* 7EDC64 80242F54 27A20028 */ addiu $v0, $sp, 0x28 +/* 7EDC68 80242F58 AFA20020 */ sw $v0, 0x20($sp) +/* 7EDC6C 80242F5C E7A00010 */ swc1 $f0, 0x10($sp) +/* 7EDC70 80242F60 E7A20014 */ swc1 $f2, 0x14($sp) +/* 7EDC74 80242F64 0C01BFA4 */ jal fx_emote +/* 7EDC78 80242F68 E7A40018 */ swc1 $f4, 0x18($sp) +/* 7EDC7C 80242F6C 8E4200CC */ lw $v0, 0xcc($s2) +/* 7EDC80 80242F70 8C430000 */ lw $v1, ($v0) +/* 7EDC84 80242F74 24020019 */ addiu $v0, $zero, 0x19 +/* 7EDC88 80242F78 A602008E */ sh $v0, 0x8e($s0) +/* 7EDC8C 80242F7C 2402000E */ addiu $v0, $zero, 0xe +/* 7EDC90 80242F80 08090BEF */ j .L80242FBC +/* 7EDC94 80242F84 AE030028 */ sw $v1, 0x28($s0) +.L80242F88: +/* 7EDC98 80242F88 0C00F598 */ jal func_8003D660 +/* 7EDC9C 80242F8C 24050001 */ addiu $a1, $zero, 1 +/* 7EDCA0 80242F90 8E050018 */ lw $a1, 0x18($s0) +/* 7EDCA4 80242F94 8E06000C */ lw $a2, 0xc($s0) +/* 7EDCA8 80242F98 0C00EA95 */ jal npc_move_heading +/* 7EDCAC 80242F9C 0200202D */ daddu $a0, $s0, $zero +/* 7EDCB0 80242FA0 8602008E */ lh $v0, 0x8e($s0) +/* 7EDCB4 80242FA4 9603008E */ lhu $v1, 0x8e($s0) +/* 7EDCB8 80242FA8 18400003 */ blez $v0, .L80242FB8 +/* 7EDCBC 80242FAC 2462FFFF */ addiu $v0, $v1, -1 +/* 7EDCC0 80242FB0 08090BF0 */ j .L80242FC0 +/* 7EDCC4 80242FB4 A602008E */ sh $v0, 0x8e($s0) +.L80242FB8: +/* 7EDCC8 80242FB8 2402000C */ addiu $v0, $zero, 0xc +.L80242FBC: +/* 7EDCCC 80242FBC AE620070 */ sw $v0, 0x70($s3) +.L80242FC0: +/* 7EDCD0 80242FC0 8FBF0040 */ lw $ra, 0x40($sp) +/* 7EDCD4 80242FC4 8FB3003C */ lw $s3, 0x3c($sp) +/* 7EDCD8 80242FC8 8FB20038 */ lw $s2, 0x38($sp) +/* 7EDCDC 80242FCC 8FB10034 */ lw $s1, 0x34($sp) +/* 7EDCE0 80242FD0 8FB00030 */ lw $s0, 0x30($sp) +/* 7EDCE4 80242FD4 03E00008 */ jr $ra +/* 7EDCE8 80242FD8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC.s deleted file mode 100644 index fcf984e498..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FDC -/* 7EDCEC 80242FDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EDCF0 80242FE0 AFB10014 */ sw $s1, 0x14($sp) -/* 7EDCF4 80242FE4 0080882D */ daddu $s1, $a0, $zero -/* 7EDCF8 80242FE8 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EDCFC 80242FEC AFB00010 */ sw $s0, 0x10($sp) -/* 7EDD00 80242FF0 8E300148 */ lw $s0, 0x148($s1) -/* 7EDD04 80242FF4 0C00EABB */ jal get_npc_unsafe -/* 7EDD08 80242FF8 86040008 */ lh $a0, 8($s0) -/* 7EDD0C 80242FFC 9443008E */ lhu $v1, 0x8e($v0) -/* 7EDD10 80243000 2463FFFF */ addiu $v1, $v1, -1 -/* 7EDD14 80243004 A443008E */ sh $v1, 0x8e($v0) -/* 7EDD18 80243008 00031C00 */ sll $v1, $v1, 0x10 -/* 7EDD1C 8024300C 14600008 */ bnez $v1, .L80243030 -/* 7EDD20 80243010 00000000 */ nop -/* 7EDD24 80243014 8E0200B0 */ lw $v0, 0xb0($s0) -/* 7EDD28 80243018 30420080 */ andi $v0, $v0, 0x80 -/* 7EDD2C 8024301C 10400003 */ beqz $v0, .L8024302C -/* 7EDD30 80243020 2402000F */ addiu $v0, $zero, 0xf -/* 7EDD34 80243024 08090C0C */ j .L80243030 -/* 7EDD38 80243028 AE220070 */ sw $v0, 0x70($s1) -.L8024302C: -/* 7EDD3C 8024302C AE200070 */ sw $zero, 0x70($s1) -.L80243030: -/* 7EDD40 80243030 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EDD44 80243034 8FB10014 */ lw $s1, 0x14($sp) -/* 7EDD48 80243038 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDD4C 8024303C 03E00008 */ jr $ra -/* 7EDD50 80243040 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s new file mode 100644 index 0000000000..9d2bfc7d91 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80242FDC_7EDCEC.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242FDC_7EDCEC +/* 7EDCEC 80242FDC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EDCF0 80242FE0 AFB10014 */ sw $s1, 0x14($sp) +/* 7EDCF4 80242FE4 0080882D */ daddu $s1, $a0, $zero +/* 7EDCF8 80242FE8 AFBF0018 */ sw $ra, 0x18($sp) +/* 7EDCFC 80242FEC AFB00010 */ sw $s0, 0x10($sp) +/* 7EDD00 80242FF0 8E300148 */ lw $s0, 0x148($s1) +/* 7EDD04 80242FF4 0C00EABB */ jal get_npc_unsafe +/* 7EDD08 80242FF8 86040008 */ lh $a0, 8($s0) +/* 7EDD0C 80242FFC 9443008E */ lhu $v1, 0x8e($v0) +/* 7EDD10 80243000 2463FFFF */ addiu $v1, $v1, -1 +/* 7EDD14 80243004 A443008E */ sh $v1, 0x8e($v0) +/* 7EDD18 80243008 00031C00 */ sll $v1, $v1, 0x10 +/* 7EDD1C 8024300C 14600008 */ bnez $v1, .L80243030 +/* 7EDD20 80243010 00000000 */ nop +/* 7EDD24 80243014 8E0200B0 */ lw $v0, 0xb0($s0) +/* 7EDD28 80243018 30420080 */ andi $v0, $v0, 0x80 +/* 7EDD2C 8024301C 10400003 */ beqz $v0, .L8024302C +/* 7EDD30 80243020 2402000F */ addiu $v0, $zero, 0xf +/* 7EDD34 80243024 08090C0C */ j .L80243030 +/* 7EDD38 80243028 AE220070 */ sw $v0, 0x70($s1) +.L8024302C: +/* 7EDD3C 8024302C AE200070 */ sw $zero, 0x70($s1) +.L80243030: +/* 7EDD40 80243030 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EDD44 80243034 8FB10014 */ lw $s1, 0x14($sp) +/* 7EDD48 80243038 8FB00010 */ lw $s0, 0x10($sp) +/* 7EDD4C 8024303C 03E00008 */ jr $ra +/* 7EDD50 80243040 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044.s deleted file mode 100644 index 2a86a460c8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243044 -/* 7EDD54 80243044 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EDD58 80243048 AFB10014 */ sw $s1, 0x14($sp) -/* 7EDD5C 8024304C 0080882D */ daddu $s1, $a0, $zero -/* 7EDD60 80243050 AFBF001C */ sw $ra, 0x1c($sp) -/* 7EDD64 80243054 AFB20018 */ sw $s2, 0x18($sp) -/* 7EDD68 80243058 AFB00010 */ sw $s0, 0x10($sp) -/* 7EDD6C 8024305C 8E300148 */ lw $s0, 0x148($s1) -/* 7EDD70 80243060 86040008 */ lh $a0, 8($s0) -/* 7EDD74 80243064 0C00EABB */ jal get_npc_unsafe -/* 7EDD78 80243068 00A0902D */ daddu $s2, $a1, $zero -/* 7EDD7C 8024306C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 7EDD80 80243070 8E240078 */ lw $a0, 0x78($s1) -/* 7EDD84 80243074 8C630000 */ lw $v1, ($v1) -/* 7EDD88 80243078 0083182A */ slt $v1, $a0, $v1 -/* 7EDD8C 8024307C 10600013 */ beqz $v1, .L802430CC -/* 7EDD90 80243080 0040302D */ daddu $a2, $v0, $zero -/* 7EDD94 80243084 00041040 */ sll $v0, $a0, 1 -/* 7EDD98 80243088 00441021 */ addu $v0, $v0, $a0 -/* 7EDD9C 8024308C 00022880 */ sll $a1, $v0, 2 -.L80243090: -/* 7EDDA0 80243090 8E0300D0 */ lw $v1, 0xd0($s0) -/* 7EDDA4 80243094 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 7EDDA8 80243098 00A31021 */ addu $v0, $a1, $v1 -/* 7EDDAC 8024309C C4400008 */ lwc1 $f0, 8($v0) -/* 7EDDB0 802430A0 46800020 */ cvt.s.w $f0, $f0 -/* 7EDDB4 802430A4 4602003E */ c.le.s $f0, $f2 -/* 7EDDB8 802430A8 00000000 */ nop -/* 7EDDBC 802430AC 45020003 */ bc1fl .L802430BC -/* 7EDDC0 802430B0 24840001 */ addiu $a0, $a0, 1 -/* 7EDDC4 802430B4 08090C33 */ j .L802430CC -/* 7EDDC8 802430B8 AE240078 */ sw $a0, 0x78($s1) -.L802430BC: -/* 7EDDCC 802430BC 8C620000 */ lw $v0, ($v1) -/* 7EDDD0 802430C0 0082102A */ slt $v0, $a0, $v0 -/* 7EDDD4 802430C4 1440FFF2 */ bnez $v0, .L80243090 -/* 7EDDD8 802430C8 24A5000C */ addiu $a1, $a1, 0xc -.L802430CC: -/* 7EDDDC 802430CC C6400000 */ lwc1 $f0, ($s2) -/* 7EDDE0 802430D0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 7EDDE4 802430D4 8E0200CC */ lw $v0, 0xcc($s0) -/* 7EDDE8 802430D8 8C420004 */ lw $v0, 4($v0) -/* 7EDDEC 802430DC ACC20028 */ sw $v0, 0x28($a2) -/* 7EDDF0 802430E0 24020001 */ addiu $v0, $zero, 1 -/* 7EDDF4 802430E4 AE200074 */ sw $zero, 0x74($s1) -/* 7EDDF8 802430E8 AE220070 */ sw $v0, 0x70($s1) -/* 7EDDFC 802430EC 8FBF001C */ lw $ra, 0x1c($sp) -/* 7EDE00 802430F0 8FB20018 */ lw $s2, 0x18($sp) -/* 7EDE04 802430F4 8FB10014 */ lw $s1, 0x14($sp) -/* 7EDE08 802430F8 8FB00010 */ lw $s0, 0x10($sp) -/* 7EDE0C 802430FC 03E00008 */ jr $ra -/* 7EDE10 80243100 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s new file mode 100644 index 0000000000..093a055d7d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243044_7EDD54.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243044_7EDD54 +/* 7EDD54 80243044 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EDD58 80243048 AFB10014 */ sw $s1, 0x14($sp) +/* 7EDD5C 8024304C 0080882D */ daddu $s1, $a0, $zero +/* 7EDD60 80243050 AFBF001C */ sw $ra, 0x1c($sp) +/* 7EDD64 80243054 AFB20018 */ sw $s2, 0x18($sp) +/* 7EDD68 80243058 AFB00010 */ sw $s0, 0x10($sp) +/* 7EDD6C 8024305C 8E300148 */ lw $s0, 0x148($s1) +/* 7EDD70 80243060 86040008 */ lh $a0, 8($s0) +/* 7EDD74 80243064 0C00EABB */ jal get_npc_unsafe +/* 7EDD78 80243068 00A0902D */ daddu $s2, $a1, $zero +/* 7EDD7C 8024306C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 7EDD80 80243070 8E240078 */ lw $a0, 0x78($s1) +/* 7EDD84 80243074 8C630000 */ lw $v1, ($v1) +/* 7EDD88 80243078 0083182A */ slt $v1, $a0, $v1 +/* 7EDD8C 8024307C 10600013 */ beqz $v1, .L802430CC +/* 7EDD90 80243080 0040302D */ daddu $a2, $v0, $zero +/* 7EDD94 80243084 00041040 */ sll $v0, $a0, 1 +/* 7EDD98 80243088 00441021 */ addu $v0, $v0, $a0 +/* 7EDD9C 8024308C 00022880 */ sll $a1, $v0, 2 +.L80243090: +/* 7EDDA0 80243090 8E0300D0 */ lw $v1, 0xd0($s0) +/* 7EDDA4 80243094 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* 7EDDA8 80243098 00A31021 */ addu $v0, $a1, $v1 +/* 7EDDAC 8024309C C4400008 */ lwc1 $f0, 8($v0) +/* 7EDDB0 802430A0 46800020 */ cvt.s.w $f0, $f0 +/* 7EDDB4 802430A4 4602003E */ c.le.s $f0, $f2 +/* 7EDDB8 802430A8 00000000 */ nop +/* 7EDDBC 802430AC 45020003 */ bc1fl .L802430BC +/* 7EDDC0 802430B0 24840001 */ addiu $a0, $a0, 1 +/* 7EDDC4 802430B4 08090C33 */ j .L802430CC +/* 7EDDC8 802430B8 AE240078 */ sw $a0, 0x78($s1) +.L802430BC: +/* 7EDDCC 802430BC 8C620000 */ lw $v0, ($v1) +/* 7EDDD0 802430C0 0082102A */ slt $v0, $a0, $v0 +/* 7EDDD4 802430C4 1440FFF2 */ bnez $v0, .L80243090 +/* 7EDDD8 802430C8 24A5000C */ addiu $a1, $a1, 0xc +.L802430CC: +/* 7EDDDC 802430CC C6400000 */ lwc1 $f0, ($s2) +/* 7EDDE0 802430D0 E4C00018 */ swc1 $f0, 0x18($a2) +/* 7EDDE4 802430D4 8E0200CC */ lw $v0, 0xcc($s0) +/* 7EDDE8 802430D8 8C420004 */ lw $v0, 4($v0) +/* 7EDDEC 802430DC ACC20028 */ sw $v0, 0x28($a2) +/* 7EDDF0 802430E0 24020001 */ addiu $v0, $zero, 1 +/* 7EDDF4 802430E4 AE200074 */ sw $zero, 0x74($s1) +/* 7EDDF8 802430E8 AE220070 */ sw $v0, 0x70($s1) +/* 7EDDFC 802430EC 8FBF001C */ lw $ra, 0x1c($sp) +/* 7EDE00 802430F0 8FB20018 */ lw $s2, 0x18($sp) +/* 7EDE04 802430F4 8FB10014 */ lw $s1, 0x14($sp) +/* 7EDE08 802430F8 8FB00010 */ lw $s0, 0x10($sp) +/* 7EDE0C 802430FC 03E00008 */ jr $ra +/* 7EDE10 80243100 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104.s deleted file mode 100644 index 8591720f35..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243104 -/* 7EDE14 80243104 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 7EDE18 80243108 AFB40058 */ sw $s4, 0x58($sp) -/* 7EDE1C 8024310C 0080A02D */ daddu $s4, $a0, $zero -/* 7EDE20 80243110 AFBF0060 */ sw $ra, 0x60($sp) -/* 7EDE24 80243114 AFB5005C */ sw $s5, 0x5c($sp) -/* 7EDE28 80243118 AFB30054 */ sw $s3, 0x54($sp) -/* 7EDE2C 8024311C AFB20050 */ sw $s2, 0x50($sp) -/* 7EDE30 80243120 AFB1004C */ sw $s1, 0x4c($sp) -/* 7EDE34 80243124 AFB00048 */ sw $s0, 0x48($sp) -/* 7EDE38 80243128 8E910148 */ lw $s1, 0x148($s4) -/* 7EDE3C 8024312C 86240008 */ lh $a0, 8($s1) -/* 7EDE40 80243130 0C00EABB */ jal get_npc_unsafe -/* 7EDE44 80243134 00A0802D */ daddu $s0, $a1, $zero -/* 7EDE48 80243138 8E83000C */ lw $v1, 0xc($s4) -/* 7EDE4C 8024313C 0280202D */ daddu $a0, $s4, $zero -/* 7EDE50 80243140 8C650000 */ lw $a1, ($v1) -/* 7EDE54 80243144 0C0B1EAF */ jal get_variable -/* 7EDE58 80243148 0040902D */ daddu $s2, $v0, $zero -/* 7EDE5C 8024314C AFA00018 */ sw $zero, 0x18($sp) -/* 7EDE60 80243150 8E2300D0 */ lw $v1, 0xd0($s1) -/* 7EDE64 80243154 8C630094 */ lw $v1, 0x94($v1) -/* 7EDE68 80243158 AFA3001C */ sw $v1, 0x1c($sp) -/* 7EDE6C 8024315C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 7EDE70 80243160 8C630080 */ lw $v1, 0x80($v1) -/* 7EDE74 80243164 AFA30020 */ sw $v1, 0x20($sp) -/* 7EDE78 80243168 8E2300D0 */ lw $v1, 0xd0($s1) -/* 7EDE7C 8024316C 8C630088 */ lw $v1, 0x88($v1) -/* 7EDE80 80243170 AFA30024 */ sw $v1, 0x24($sp) -/* 7EDE84 80243174 8E2300D0 */ lw $v1, 0xd0($s1) -/* 7EDE88 80243178 8C63008C */ lw $v1, 0x8c($v1) -/* 7EDE8C 8024317C 27B50018 */ addiu $s5, $sp, 0x18 -/* 7EDE90 80243180 AFA30028 */ sw $v1, 0x28($sp) -/* 7EDE94 80243184 8E2300D0 */ lw $v1, 0xd0($s1) -/* 7EDE98 80243188 3C014282 */ lui $at, 0x4282 -/* 7EDE9C 8024318C 44810000 */ mtc1 $at, $f0 -/* 7EDEA0 80243190 8C630090 */ lw $v1, 0x90($v1) -/* 7EDEA4 80243194 0040982D */ daddu $s3, $v0, $zero -/* 7EDEA8 80243198 E7A00030 */ swc1 $f0, 0x30($sp) -/* 7EDEAC 8024319C A7A00034 */ sh $zero, 0x34($sp) -/* 7EDEB0 802431A0 16000005 */ bnez $s0, .L802431B8 -/* 7EDEB4 802431A4 AFA3002C */ sw $v1, 0x2c($sp) -/* 7EDEB8 802431A8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 7EDEBC 802431AC 30420004 */ andi $v0, $v0, 4 -/* 7EDEC0 802431B0 10400044 */ beqz $v0, .L802432C4 -/* 7EDEC4 802431B4 00000000 */ nop -.L802431B8: -/* 7EDEC8 802431B8 2404F7FF */ addiu $a0, $zero, -0x801 -/* 7EDECC 802431BC AE800070 */ sw $zero, 0x70($s4) -/* 7EDED0 802431C0 A640008E */ sh $zero, 0x8e($s2) -/* 7EDED4 802431C4 8E2200CC */ lw $v0, 0xcc($s1) -/* 7EDED8 802431C8 8E430000 */ lw $v1, ($s2) -/* 7EDEDC 802431CC 8C420000 */ lw $v0, ($v0) -/* 7EDEE0 802431D0 00641824 */ and $v1, $v1, $a0 -/* 7EDEE4 802431D4 AE430000 */ sw $v1, ($s2) -/* 7EDEE8 802431D8 AE420028 */ sw $v0, 0x28($s2) -/* 7EDEEC 802431DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 7EDEF0 802431E0 8C420098 */ lw $v0, 0x98($v0) -/* 7EDEF4 802431E4 54400005 */ bnel $v0, $zero, .L802431FC -/* 7EDEF8 802431E8 2402FDFF */ addiu $v0, $zero, -0x201 -/* 7EDEFC 802431EC 34620200 */ ori $v0, $v1, 0x200 -/* 7EDF00 802431F0 2403FFF7 */ addiu $v1, $zero, -9 -/* 7EDF04 802431F4 08090C81 */ j .L80243204 -/* 7EDF08 802431F8 00431024 */ and $v0, $v0, $v1 -.L802431FC: -/* 7EDF0C 802431FC 00621024 */ and $v0, $v1, $v0 -/* 7EDF10 80243200 34420008 */ ori $v0, $v0, 8 -.L80243204: -/* 7EDF14 80243204 AE420000 */ sw $v0, ($s2) -/* 7EDF18 80243208 8E2200B0 */ lw $v0, 0xb0($s1) -/* 7EDF1C 8024320C 30420004 */ andi $v0, $v0, 4 -/* 7EDF20 80243210 10400008 */ beqz $v0, .L80243234 -/* 7EDF24 80243214 24020063 */ addiu $v0, $zero, 0x63 -/* 7EDF28 80243218 AE820070 */ sw $v0, 0x70($s4) -/* 7EDF2C 8024321C AE800074 */ sw $zero, 0x74($s4) -/* 7EDF30 80243220 8E2200B0 */ lw $v0, 0xb0($s1) -/* 7EDF34 80243224 2403FFFB */ addiu $v1, $zero, -5 -/* 7EDF38 80243228 00431024 */ and $v0, $v0, $v1 -/* 7EDF3C 8024322C 08090C98 */ j .L80243260 -/* 7EDF40 80243230 AE2200B0 */ sw $v0, 0xb0($s1) -.L80243234: -/* 7EDF44 80243234 8E220000 */ lw $v0, ($s1) -/* 7EDF48 80243238 3C034000 */ lui $v1, 0x4000 -/* 7EDF4C 8024323C 00431024 */ and $v0, $v0, $v1 -/* 7EDF50 80243240 10400007 */ beqz $v0, .L80243260 -/* 7EDF54 80243244 3C03BFFF */ lui $v1, 0xbfff -/* 7EDF58 80243248 2402000C */ addiu $v0, $zero, 0xc -/* 7EDF5C 8024324C AE820070 */ sw $v0, 0x70($s4) -/* 7EDF60 80243250 8E220000 */ lw $v0, ($s1) -/* 7EDF64 80243254 3463FFFF */ ori $v1, $v1, 0xffff -/* 7EDF68 80243258 00431024 */ and $v0, $v0, $v1 -/* 7EDF6C 8024325C AE220000 */ sw $v0, ($s1) -.L80243260: -/* 7EDF70 80243260 27A50038 */ addiu $a1, $sp, 0x38 -/* 7EDF74 80243264 27A6003C */ addiu $a2, $sp, 0x3c -/* 7EDF78 80243268 C6400038 */ lwc1 $f0, 0x38($s2) -/* 7EDF7C 8024326C 864200A8 */ lh $v0, 0xa8($s2) -/* 7EDF80 80243270 3C0142C8 */ lui $at, 0x42c8 -/* 7EDF84 80243274 44812000 */ mtc1 $at, $f4 -/* 7EDF88 80243278 44823000 */ mtc1 $v0, $f6 -/* 7EDF8C 8024327C 00000000 */ nop -/* 7EDF90 80243280 468031A0 */ cvt.s.w $f6, $f6 -/* 7EDF94 80243284 27A20044 */ addiu $v0, $sp, 0x44 -/* 7EDF98 80243288 E7A00038 */ swc1 $f0, 0x38($sp) -/* 7EDF9C 8024328C C640003C */ lwc1 $f0, 0x3c($s2) -/* 7EDFA0 80243290 C6420040 */ lwc1 $f2, 0x40($s2) -/* 7EDFA4 80243294 46060000 */ add.s $f0, $f0, $f6 -/* 7EDFA8 80243298 E7A40044 */ swc1 $f4, 0x44($sp) -/* 7EDFAC 8024329C E7A20040 */ swc1 $f2, 0x40($sp) -/* 7EDFB0 802432A0 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 7EDFB4 802432A4 AFA20010 */ sw $v0, 0x10($sp) -/* 7EDFB8 802432A8 8E440080 */ lw $a0, 0x80($s2) -/* 7EDFBC 802432AC 0C0372DF */ jal func_800DCB7C -/* 7EDFC0 802432B0 27A70040 */ addiu $a3, $sp, 0x40 -/* 7EDFC4 802432B4 10400003 */ beqz $v0, .L802432C4 -/* 7EDFC8 802432B8 00000000 */ nop -/* 7EDFCC 802432BC C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 7EDFD0 802432C0 E640003C */ swc1 $f0, 0x3c($s2) -.L802432C4: -/* 7EDFD4 802432C4 8E830070 */ lw $v1, 0x70($s4) -/* 7EDFD8 802432C8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 7EDFDC 802432CC 10400042 */ beqz $v0, .L802433D8 -/* 7EDFE0 802432D0 00031080 */ sll $v0, $v1, 2 -/* 7EDFE4 802432D4 3C018025 */ lui $at, 0x8025 -/* 7EDFE8 802432D8 00220821 */ addu $at, $at, $v0 -/* 7EDFEC 802432DC 8C2259D0 */ lw $v0, 0x59d0($at) -/* 7EDFF0 802432E0 00400008 */ jr $v0 -/* 7EDFF4 802432E4 00000000 */ nop -/* 7EDFF8 802432E8 0280202D */ daddu $a0, $s4, $zero -/* 7EDFFC 802432EC 0260282D */ daddu $a1, $s3, $zero -/* 7EE000 802432F0 0C09095C */ jal func_80242570 -/* 7EE004 802432F4 02A0302D */ daddu $a2, $s5, $zero -/* 7EE008 802432F8 0280202D */ daddu $a0, $s4, $zero -/* 7EE00C 802432FC 0260282D */ daddu $a1, $s3, $zero -/* 7EE010 80243300 0C0909B2 */ jal func_802426C8 -/* 7EE014 80243304 02A0302D */ daddu $a2, $s5, $zero -/* 7EE018 80243308 08090CF6 */ j .L802433D8 -/* 7EE01C 8024330C 00000000 */ nop -/* 7EE020 80243310 0280202D */ daddu $a0, $s4, $zero -/* 7EE024 80243314 0260282D */ daddu $a1, $s3, $zero -/* 7EE028 80243318 0C090A5C */ jal func_80242970 -/* 7EE02C 8024331C 02A0302D */ daddu $a2, $s5, $zero -/* 7EE030 80243320 0280202D */ daddu $a0, $s4, $zero -/* 7EE034 80243324 0260282D */ daddu $a1, $s3, $zero -/* 7EE038 80243328 0C090A8C */ jal func_80242A30 -/* 7EE03C 8024332C 02A0302D */ daddu $a2, $s5, $zero -/* 7EE040 80243330 08090CF6 */ j .L802433D8 -/* 7EE044 80243334 00000000 */ nop -/* 7EE048 80243338 0280202D */ daddu $a0, $s4, $zero -/* 7EE04C 8024333C 0260282D */ daddu $a1, $s3, $zero -/* 7EE050 80243340 0C090AFB */ jal func_80242BEC -/* 7EE054 80243344 02A0302D */ daddu $a2, $s5, $zero -/* 7EE058 80243348 08090CF6 */ j .L802433D8 -/* 7EE05C 8024334C 00000000 */ nop -/* 7EE060 80243350 0280202D */ daddu $a0, $s4, $zero -/* 7EE064 80243354 0260282D */ daddu $a1, $s3, $zero -/* 7EE068 80243358 0C090B28 */ jal func_80242CA0 -/* 7EE06C 8024335C 02A0302D */ daddu $a2, $s5, $zero -/* 7EE070 80243360 0280202D */ daddu $a0, $s4, $zero -/* 7EE074 80243364 0260282D */ daddu $a1, $s3, $zero -/* 7EE078 80243368 0C090B45 */ jal func_80242D14 -/* 7EE07C 8024336C 02A0302D */ daddu $a2, $s5, $zero -/* 7EE080 80243370 08090CF6 */ j .L802433D8 -/* 7EE084 80243374 00000000 */ nop -/* 7EE088 80243378 0280202D */ daddu $a0, $s4, $zero -/* 7EE08C 8024337C 0260282D */ daddu $a1, $s3, $zero -/* 7EE090 80243380 0C090B63 */ jal func_80242D8C -/* 7EE094 80243384 02A0302D */ daddu $a2, $s5, $zero -/* 7EE098 80243388 0280202D */ daddu $a0, $s4, $zero -/* 7EE09C 8024338C 0260282D */ daddu $a1, $s3, $zero -/* 7EE0A0 80243390 0C090BAF */ jal func_80242EBC -/* 7EE0A4 80243394 02A0302D */ daddu $a2, $s5, $zero -/* 7EE0A8 80243398 08090CF6 */ j .L802433D8 -/* 7EE0AC 8024339C 00000000 */ nop -/* 7EE0B0 802433A0 0280202D */ daddu $a0, $s4, $zero -/* 7EE0B4 802433A4 0260282D */ daddu $a1, $s3, $zero -/* 7EE0B8 802433A8 0C090BF7 */ jal func_80242FDC -/* 7EE0BC 802433AC 02A0302D */ daddu $a2, $s5, $zero -/* 7EE0C0 802433B0 08090CF6 */ j .L802433D8 -/* 7EE0C4 802433B4 00000000 */ nop -/* 7EE0C8 802433B8 0280202D */ daddu $a0, $s4, $zero -/* 7EE0CC 802433BC 0260282D */ daddu $a1, $s3, $zero -/* 7EE0D0 802433C0 0C090C11 */ jal func_80243044 -/* 7EE0D4 802433C4 02A0302D */ daddu $a2, $s5, $zero -/* 7EE0D8 802433C8 08090CF6 */ j .L802433D8 -/* 7EE0DC 802433CC 00000000 */ nop -/* 7EE0E0 802433D0 0C0129CF */ jal func_8004A73C -/* 7EE0E4 802433D4 0280202D */ daddu $a0, $s4, $zero -.L802433D8: -/* 7EE0E8 802433D8 8FBF0060 */ lw $ra, 0x60($sp) -/* 7EE0EC 802433DC 8FB5005C */ lw $s5, 0x5c($sp) -/* 7EE0F0 802433E0 8FB40058 */ lw $s4, 0x58($sp) -/* 7EE0F4 802433E4 8FB30054 */ lw $s3, 0x54($sp) -/* 7EE0F8 802433E8 8FB20050 */ lw $s2, 0x50($sp) -/* 7EE0FC 802433EC 8FB1004C */ lw $s1, 0x4c($sp) -/* 7EE100 802433F0 8FB00048 */ lw $s0, 0x48($sp) -/* 7EE104 802433F4 0000102D */ daddu $v0, $zero, $zero -/* 7EE108 802433F8 03E00008 */ jr $ra -/* 7EE10C 802433FC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s new file mode 100644 index 0000000000..604f0404ce --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243104_7EDE14.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243104_7EDE14 +/* 7EDE14 80243104 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 7EDE18 80243108 AFB40058 */ sw $s4, 0x58($sp) +/* 7EDE1C 8024310C 0080A02D */ daddu $s4, $a0, $zero +/* 7EDE20 80243110 AFBF0060 */ sw $ra, 0x60($sp) +/* 7EDE24 80243114 AFB5005C */ sw $s5, 0x5c($sp) +/* 7EDE28 80243118 AFB30054 */ sw $s3, 0x54($sp) +/* 7EDE2C 8024311C AFB20050 */ sw $s2, 0x50($sp) +/* 7EDE30 80243120 AFB1004C */ sw $s1, 0x4c($sp) +/* 7EDE34 80243124 AFB00048 */ sw $s0, 0x48($sp) +/* 7EDE38 80243128 8E910148 */ lw $s1, 0x148($s4) +/* 7EDE3C 8024312C 86240008 */ lh $a0, 8($s1) +/* 7EDE40 80243130 0C00EABB */ jal get_npc_unsafe +/* 7EDE44 80243134 00A0802D */ daddu $s0, $a1, $zero +/* 7EDE48 80243138 8E83000C */ lw $v1, 0xc($s4) +/* 7EDE4C 8024313C 0280202D */ daddu $a0, $s4, $zero +/* 7EDE50 80243140 8C650000 */ lw $a1, ($v1) +/* 7EDE54 80243144 0C0B1EAF */ jal get_variable +/* 7EDE58 80243148 0040902D */ daddu $s2, $v0, $zero +/* 7EDE5C 8024314C AFA00018 */ sw $zero, 0x18($sp) +/* 7EDE60 80243150 8E2300D0 */ lw $v1, 0xd0($s1) +/* 7EDE64 80243154 8C630094 */ lw $v1, 0x94($v1) +/* 7EDE68 80243158 AFA3001C */ sw $v1, 0x1c($sp) +/* 7EDE6C 8024315C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 7EDE70 80243160 8C630080 */ lw $v1, 0x80($v1) +/* 7EDE74 80243164 AFA30020 */ sw $v1, 0x20($sp) +/* 7EDE78 80243168 8E2300D0 */ lw $v1, 0xd0($s1) +/* 7EDE7C 8024316C 8C630088 */ lw $v1, 0x88($v1) +/* 7EDE80 80243170 AFA30024 */ sw $v1, 0x24($sp) +/* 7EDE84 80243174 8E2300D0 */ lw $v1, 0xd0($s1) +/* 7EDE88 80243178 8C63008C */ lw $v1, 0x8c($v1) +/* 7EDE8C 8024317C 27B50018 */ addiu $s5, $sp, 0x18 +/* 7EDE90 80243180 AFA30028 */ sw $v1, 0x28($sp) +/* 7EDE94 80243184 8E2300D0 */ lw $v1, 0xd0($s1) +/* 7EDE98 80243188 3C014282 */ lui $at, 0x4282 +/* 7EDE9C 8024318C 44810000 */ mtc1 $at, $f0 +/* 7EDEA0 80243190 8C630090 */ lw $v1, 0x90($v1) +/* 7EDEA4 80243194 0040982D */ daddu $s3, $v0, $zero +/* 7EDEA8 80243198 E7A00030 */ swc1 $f0, 0x30($sp) +/* 7EDEAC 8024319C A7A00034 */ sh $zero, 0x34($sp) +/* 7EDEB0 802431A0 16000005 */ bnez $s0, .L802431B8 +/* 7EDEB4 802431A4 AFA3002C */ sw $v1, 0x2c($sp) +/* 7EDEB8 802431A8 8E2200B0 */ lw $v0, 0xb0($s1) +/* 7EDEBC 802431AC 30420004 */ andi $v0, $v0, 4 +/* 7EDEC0 802431B0 10400044 */ beqz $v0, .L802432C4 +/* 7EDEC4 802431B4 00000000 */ nop +.L802431B8: +/* 7EDEC8 802431B8 2404F7FF */ addiu $a0, $zero, -0x801 +/* 7EDECC 802431BC AE800070 */ sw $zero, 0x70($s4) +/* 7EDED0 802431C0 A640008E */ sh $zero, 0x8e($s2) +/* 7EDED4 802431C4 8E2200CC */ lw $v0, 0xcc($s1) +/* 7EDED8 802431C8 8E430000 */ lw $v1, ($s2) +/* 7EDEDC 802431CC 8C420000 */ lw $v0, ($v0) +/* 7EDEE0 802431D0 00641824 */ and $v1, $v1, $a0 +/* 7EDEE4 802431D4 AE430000 */ sw $v1, ($s2) +/* 7EDEE8 802431D8 AE420028 */ sw $v0, 0x28($s2) +/* 7EDEEC 802431DC 8E2200D0 */ lw $v0, 0xd0($s1) +/* 7EDEF0 802431E0 8C420098 */ lw $v0, 0x98($v0) +/* 7EDEF4 802431E4 54400005 */ bnel $v0, $zero, .L802431FC +/* 7EDEF8 802431E8 2402FDFF */ addiu $v0, $zero, -0x201 +/* 7EDEFC 802431EC 34620200 */ ori $v0, $v1, 0x200 +/* 7EDF00 802431F0 2403FFF7 */ addiu $v1, $zero, -9 +/* 7EDF04 802431F4 08090C81 */ j .L80243204 +/* 7EDF08 802431F8 00431024 */ and $v0, $v0, $v1 +.L802431FC: +/* 7EDF0C 802431FC 00621024 */ and $v0, $v1, $v0 +/* 7EDF10 80243200 34420008 */ ori $v0, $v0, 8 +.L80243204: +/* 7EDF14 80243204 AE420000 */ sw $v0, ($s2) +/* 7EDF18 80243208 8E2200B0 */ lw $v0, 0xb0($s1) +/* 7EDF1C 8024320C 30420004 */ andi $v0, $v0, 4 +/* 7EDF20 80243210 10400008 */ beqz $v0, .L80243234 +/* 7EDF24 80243214 24020063 */ addiu $v0, $zero, 0x63 +/* 7EDF28 80243218 AE820070 */ sw $v0, 0x70($s4) +/* 7EDF2C 8024321C AE800074 */ sw $zero, 0x74($s4) +/* 7EDF30 80243220 8E2200B0 */ lw $v0, 0xb0($s1) +/* 7EDF34 80243224 2403FFFB */ addiu $v1, $zero, -5 +/* 7EDF38 80243228 00431024 */ and $v0, $v0, $v1 +/* 7EDF3C 8024322C 08090C98 */ j .L80243260 +/* 7EDF40 80243230 AE2200B0 */ sw $v0, 0xb0($s1) +.L80243234: +/* 7EDF44 80243234 8E220000 */ lw $v0, ($s1) +/* 7EDF48 80243238 3C034000 */ lui $v1, 0x4000 +/* 7EDF4C 8024323C 00431024 */ and $v0, $v0, $v1 +/* 7EDF50 80243240 10400007 */ beqz $v0, .L80243260 +/* 7EDF54 80243244 3C03BFFF */ lui $v1, 0xbfff +/* 7EDF58 80243248 2402000C */ addiu $v0, $zero, 0xc +/* 7EDF5C 8024324C AE820070 */ sw $v0, 0x70($s4) +/* 7EDF60 80243250 8E220000 */ lw $v0, ($s1) +/* 7EDF64 80243254 3463FFFF */ ori $v1, $v1, 0xffff +/* 7EDF68 80243258 00431024 */ and $v0, $v0, $v1 +/* 7EDF6C 8024325C AE220000 */ sw $v0, ($s1) +.L80243260: +/* 7EDF70 80243260 27A50038 */ addiu $a1, $sp, 0x38 +/* 7EDF74 80243264 27A6003C */ addiu $a2, $sp, 0x3c +/* 7EDF78 80243268 C6400038 */ lwc1 $f0, 0x38($s2) +/* 7EDF7C 8024326C 864200A8 */ lh $v0, 0xa8($s2) +/* 7EDF80 80243270 3C0142C8 */ lui $at, 0x42c8 +/* 7EDF84 80243274 44812000 */ mtc1 $at, $f4 +/* 7EDF88 80243278 44823000 */ mtc1 $v0, $f6 +/* 7EDF8C 8024327C 00000000 */ nop +/* 7EDF90 80243280 468031A0 */ cvt.s.w $f6, $f6 +/* 7EDF94 80243284 27A20044 */ addiu $v0, $sp, 0x44 +/* 7EDF98 80243288 E7A00038 */ swc1 $f0, 0x38($sp) +/* 7EDF9C 8024328C C640003C */ lwc1 $f0, 0x3c($s2) +/* 7EDFA0 80243290 C6420040 */ lwc1 $f2, 0x40($s2) +/* 7EDFA4 80243294 46060000 */ add.s $f0, $f0, $f6 +/* 7EDFA8 80243298 E7A40044 */ swc1 $f4, 0x44($sp) +/* 7EDFAC 8024329C E7A20040 */ swc1 $f2, 0x40($sp) +/* 7EDFB0 802432A0 E7A0003C */ swc1 $f0, 0x3c($sp) +/* 7EDFB4 802432A4 AFA20010 */ sw $v0, 0x10($sp) +/* 7EDFB8 802432A8 8E440080 */ lw $a0, 0x80($s2) +/* 7EDFBC 802432AC 0C0372DF */ jal func_800DCB7C +/* 7EDFC0 802432B0 27A70040 */ addiu $a3, $sp, 0x40 +/* 7EDFC4 802432B4 10400003 */ beqz $v0, .L802432C4 +/* 7EDFC8 802432B8 00000000 */ nop +/* 7EDFCC 802432BC C7A0003C */ lwc1 $f0, 0x3c($sp) +/* 7EDFD0 802432C0 E640003C */ swc1 $f0, 0x3c($s2) +.L802432C4: +/* 7EDFD4 802432C4 8E830070 */ lw $v1, 0x70($s4) +/* 7EDFD8 802432C8 2C620064 */ sltiu $v0, $v1, 0x64 +/* 7EDFDC 802432CC 10400042 */ beqz $v0, .L802433D8 +/* 7EDFE0 802432D0 00031080 */ sll $v0, $v1, 2 +/* 7EDFE4 802432D4 3C018025 */ lui $at, 0x8025 +/* 7EDFE8 802432D8 00220821 */ addu $at, $at, $v0 +/* 7EDFEC 802432DC 8C2259D0 */ lw $v0, 0x59d0($at) +/* 7EDFF0 802432E0 00400008 */ jr $v0 +/* 7EDFF4 802432E4 00000000 */ nop +/* 7EDFF8 802432E8 0280202D */ daddu $a0, $s4, $zero +/* 7EDFFC 802432EC 0260282D */ daddu $a1, $s3, $zero +/* 7EE000 802432F0 0C09095C */ jal func_80242570_7ED280 +/* 7EE004 802432F4 02A0302D */ daddu $a2, $s5, $zero +/* 7EE008 802432F8 0280202D */ daddu $a0, $s4, $zero +/* 7EE00C 802432FC 0260282D */ daddu $a1, $s3, $zero +/* 7EE010 80243300 0C0909B2 */ jal func_802426C8_7ED3D8 +/* 7EE014 80243304 02A0302D */ daddu $a2, $s5, $zero +/* 7EE018 80243308 08090CF6 */ j .L802433D8 +/* 7EE01C 8024330C 00000000 */ nop +/* 7EE020 80243310 0280202D */ daddu $a0, $s4, $zero +/* 7EE024 80243314 0260282D */ daddu $a1, $s3, $zero +/* 7EE028 80243318 0C090A5C */ jal func_80242970_7ED680 +/* 7EE02C 8024331C 02A0302D */ daddu $a2, $s5, $zero +/* 7EE030 80243320 0280202D */ daddu $a0, $s4, $zero +/* 7EE034 80243324 0260282D */ daddu $a1, $s3, $zero +/* 7EE038 80243328 0C090A8C */ jal func_80242A30_7ED740 +/* 7EE03C 8024332C 02A0302D */ daddu $a2, $s5, $zero +/* 7EE040 80243330 08090CF6 */ j .L802433D8 +/* 7EE044 80243334 00000000 */ nop +/* 7EE048 80243338 0280202D */ daddu $a0, $s4, $zero +/* 7EE04C 8024333C 0260282D */ daddu $a1, $s3, $zero +/* 7EE050 80243340 0C090AFB */ jal func_80242BEC_7ED8FC +/* 7EE054 80243344 02A0302D */ daddu $a2, $s5, $zero +/* 7EE058 80243348 08090CF6 */ j .L802433D8 +/* 7EE05C 8024334C 00000000 */ nop +/* 7EE060 80243350 0280202D */ daddu $a0, $s4, $zero +/* 7EE064 80243354 0260282D */ daddu $a1, $s3, $zero +/* 7EE068 80243358 0C090B28 */ jal func_80242CA0_7ED9B0 +/* 7EE06C 8024335C 02A0302D */ daddu $a2, $s5, $zero +/* 7EE070 80243360 0280202D */ daddu $a0, $s4, $zero +/* 7EE074 80243364 0260282D */ daddu $a1, $s3, $zero +/* 7EE078 80243368 0C090B45 */ jal func_80242D14_7EDA24 +/* 7EE07C 8024336C 02A0302D */ daddu $a2, $s5, $zero +/* 7EE080 80243370 08090CF6 */ j .L802433D8 +/* 7EE084 80243374 00000000 */ nop +/* 7EE088 80243378 0280202D */ daddu $a0, $s4, $zero +/* 7EE08C 8024337C 0260282D */ daddu $a1, $s3, $zero +/* 7EE090 80243380 0C090B63 */ jal func_80242D8C_7EDA9C +/* 7EE094 80243384 02A0302D */ daddu $a2, $s5, $zero +/* 7EE098 80243388 0280202D */ daddu $a0, $s4, $zero +/* 7EE09C 8024338C 0260282D */ daddu $a1, $s3, $zero +/* 7EE0A0 80243390 0C090BAF */ jal func_80242EBC_7EDBCC +/* 7EE0A4 80243394 02A0302D */ daddu $a2, $s5, $zero +/* 7EE0A8 80243398 08090CF6 */ j .L802433D8 +/* 7EE0AC 8024339C 00000000 */ nop +/* 7EE0B0 802433A0 0280202D */ daddu $a0, $s4, $zero +/* 7EE0B4 802433A4 0260282D */ daddu $a1, $s3, $zero +/* 7EE0B8 802433A8 0C090BF7 */ jal func_80242FDC_7EDCEC +/* 7EE0BC 802433AC 02A0302D */ daddu $a2, $s5, $zero +/* 7EE0C0 802433B0 08090CF6 */ j .L802433D8 +/* 7EE0C4 802433B4 00000000 */ nop +/* 7EE0C8 802433B8 0280202D */ daddu $a0, $s4, $zero +/* 7EE0CC 802433BC 0260282D */ daddu $a1, $s3, $zero +/* 7EE0D0 802433C0 0C090C11 */ jal func_80243044_7EDD54 +/* 7EE0D4 802433C4 02A0302D */ daddu $a2, $s5, $zero +/* 7EE0D8 802433C8 08090CF6 */ j .L802433D8 +/* 7EE0DC 802433CC 00000000 */ nop +/* 7EE0E0 802433D0 0C0129CF */ jal func_8004A73C +/* 7EE0E4 802433D4 0280202D */ daddu $a0, $s4, $zero +.L802433D8: +/* 7EE0E8 802433D8 8FBF0060 */ lw $ra, 0x60($sp) +/* 7EE0EC 802433DC 8FB5005C */ lw $s5, 0x5c($sp) +/* 7EE0F0 802433E0 8FB40058 */ lw $s4, 0x58($sp) +/* 7EE0F4 802433E4 8FB30054 */ lw $s3, 0x54($sp) +/* 7EE0F8 802433E8 8FB20050 */ lw $s2, 0x50($sp) +/* 7EE0FC 802433EC 8FB1004C */ lw $s1, 0x4c($sp) +/* 7EE100 802433F0 8FB00048 */ lw $s0, 0x48($sp) +/* 7EE104 802433F4 0000102D */ daddu $v0, $zero, $zero +/* 7EE108 802433F8 03E00008 */ jr $ra +/* 7EE10C 802433FC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400.s deleted file mode 100644 index a7bd815a15..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243400 -/* 7EE110 80243400 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EE114 80243404 AFB00010 */ sw $s0, 0x10($sp) -/* 7EE118 80243408 3C108025 */ lui $s0, 0x8025 -/* 7EE11C 8024340C 2610ECE8 */ addiu $s0, $s0, -0x1318 -/* 7EE120 80243410 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EE124 80243414 AFB10014 */ sw $s1, 0x14($sp) -/* 7EE128 80243418 8E020000 */ lw $v0, ($s0) -/* 7EE12C 8024341C 14400010 */ bnez $v0, .L80243460 -/* 7EE130 80243420 0080882D */ daddu $s1, $a0, $zero -/* 7EE134 80243424 0C00AB39 */ jal heap_malloc -/* 7EE138 80243428 24040040 */ addiu $a0, $zero, 0x40 -/* 7EE13C 8024342C AE020000 */ sw $v0, ($s0) -/* 7EE140 80243430 0000182D */ daddu $v1, $zero, $zero -/* 7EE144 80243434 0040282D */ daddu $a1, $v0, $zero -/* 7EE148 80243438 0220202D */ daddu $a0, $s1, $zero -.L8024343C: -/* 7EE14C 8024343C 8C820084 */ lw $v0, 0x84($a0) -/* 7EE150 80243440 24840004 */ addiu $a0, $a0, 4 -/* 7EE154 80243444 24630001 */ addiu $v1, $v1, 1 -/* 7EE158 80243448 ACA20000 */ sw $v0, ($a1) -/* 7EE15C 8024344C 28620010 */ slti $v0, $v1, 0x10 -/* 7EE160 80243450 1440FFFA */ bnez $v0, .L8024343C -/* 7EE164 80243454 24A50004 */ addiu $a1, $a1, 4 -/* 7EE168 80243458 08090D27 */ j .L8024349C -/* 7EE16C 8024345C 00000000 */ nop -.L80243460: -/* 7EE170 80243460 0000182D */ daddu $v1, $zero, $zero -/* 7EE174 80243464 0040282D */ daddu $a1, $v0, $zero -/* 7EE178 80243468 0220202D */ daddu $a0, $s1, $zero -.L8024346C: -/* 7EE17C 8024346C 8CA20000 */ lw $v0, ($a1) -/* 7EE180 80243470 24A50004 */ addiu $a1, $a1, 4 -/* 7EE184 80243474 24630001 */ addiu $v1, $v1, 1 -/* 7EE188 80243478 AC820084 */ sw $v0, 0x84($a0) -/* 7EE18C 8024347C 28620010 */ slti $v0, $v1, 0x10 -/* 7EE190 80243480 1440FFFA */ bnez $v0, .L8024346C -/* 7EE194 80243484 24840004 */ addiu $a0, $a0, 4 -/* 7EE198 80243488 3C108025 */ lui $s0, 0x8025 -/* 7EE19C 8024348C 2610ECE8 */ addiu $s0, $s0, -0x1318 -/* 7EE1A0 80243490 0C00AB4B */ jal heap_free -/* 7EE1A4 80243494 8E040000 */ lw $a0, ($s0) -/* 7EE1A8 80243498 AE000000 */ sw $zero, ($s0) -.L8024349C: -/* 7EE1AC 8024349C 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EE1B0 802434A0 8FB10014 */ lw $s1, 0x14($sp) -/* 7EE1B4 802434A4 8FB00010 */ lw $s0, 0x10($sp) -/* 7EE1B8 802434A8 24020002 */ addiu $v0, $zero, 2 -/* 7EE1BC 802434AC 03E00008 */ jr $ra -/* 7EE1C0 802434B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s new file mode 100644 index 0000000000..d3fc6622e1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243400_7EE110.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243400_7EE110 +/* 7EE110 80243400 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EE114 80243404 AFB00010 */ sw $s0, 0x10($sp) +/* 7EE118 80243408 3C108025 */ lui $s0, 0x8025 +/* 7EE11C 8024340C 2610ECE8 */ addiu $s0, $s0, -0x1318 +/* 7EE120 80243410 AFBF0018 */ sw $ra, 0x18($sp) +/* 7EE124 80243414 AFB10014 */ sw $s1, 0x14($sp) +/* 7EE128 80243418 8E020000 */ lw $v0, ($s0) +/* 7EE12C 8024341C 14400010 */ bnez $v0, .L80243460 +/* 7EE130 80243420 0080882D */ daddu $s1, $a0, $zero +/* 7EE134 80243424 0C00AB39 */ jal heap_malloc +/* 7EE138 80243428 24040040 */ addiu $a0, $zero, 0x40 +/* 7EE13C 8024342C AE020000 */ sw $v0, ($s0) +/* 7EE140 80243430 0000182D */ daddu $v1, $zero, $zero +/* 7EE144 80243434 0040282D */ daddu $a1, $v0, $zero +/* 7EE148 80243438 0220202D */ daddu $a0, $s1, $zero +.L8024343C: +/* 7EE14C 8024343C 8C820084 */ lw $v0, 0x84($a0) +/* 7EE150 80243440 24840004 */ addiu $a0, $a0, 4 +/* 7EE154 80243444 24630001 */ addiu $v1, $v1, 1 +/* 7EE158 80243448 ACA20000 */ sw $v0, ($a1) +/* 7EE15C 8024344C 28620010 */ slti $v0, $v1, 0x10 +/* 7EE160 80243450 1440FFFA */ bnez $v0, .L8024343C +/* 7EE164 80243454 24A50004 */ addiu $a1, $a1, 4 +/* 7EE168 80243458 08090D27 */ j .L8024349C +/* 7EE16C 8024345C 00000000 */ nop +.L80243460: +/* 7EE170 80243460 0000182D */ daddu $v1, $zero, $zero +/* 7EE174 80243464 0040282D */ daddu $a1, $v0, $zero +/* 7EE178 80243468 0220202D */ daddu $a0, $s1, $zero +.L8024346C: +/* 7EE17C 8024346C 8CA20000 */ lw $v0, ($a1) +/* 7EE180 80243470 24A50004 */ addiu $a1, $a1, 4 +/* 7EE184 80243474 24630001 */ addiu $v1, $v1, 1 +/* 7EE188 80243478 AC820084 */ sw $v0, 0x84($a0) +/* 7EE18C 8024347C 28620010 */ slti $v0, $v1, 0x10 +/* 7EE190 80243480 1440FFFA */ bnez $v0, .L8024346C +/* 7EE194 80243484 24840004 */ addiu $a0, $a0, 4 +/* 7EE198 80243488 3C108025 */ lui $s0, 0x8025 +/* 7EE19C 8024348C 2610ECE8 */ addiu $s0, $s0, -0x1318 +/* 7EE1A0 80243490 0C00AB4B */ jal heap_free +/* 7EE1A4 80243494 8E040000 */ lw $a0, ($s0) +/* 7EE1A8 80243498 AE000000 */ sw $zero, ($s0) +.L8024349C: +/* 7EE1AC 8024349C 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EE1B0 802434A0 8FB10014 */ lw $s1, 0x14($sp) +/* 7EE1B4 802434A4 8FB00010 */ lw $s0, 0x10($sp) +/* 7EE1B8 802434A8 24020002 */ addiu $v0, $zero, 2 +/* 7EE1BC 802434AC 03E00008 */ jr $ra +/* 7EE1C0 802434B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744.s deleted file mode 100644 index 95502c50e7..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243744 -/* 7EE454 80243744 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EE458 80243748 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EE45C 8024374C 10A00003 */ beqz $a1, .L8024375C -/* 7EE460 80243750 8C86000C */ lw $a2, 0xc($a0) -/* 7EE464 80243754 3C018025 */ lui $at, 0x8025 -/* 7EE468 80243758 AC20ED4C */ sw $zero, -0x12b4($at) -.L8024375C: -/* 7EE46C 8024375C 3C038025 */ lui $v1, 0x8025 -/* 7EE470 80243760 2463ED4C */ addiu $v1, $v1, -0x12b4 -/* 7EE474 80243764 8C620000 */ lw $v0, ($v1) -/* 7EE478 80243768 54400003 */ bnel $v0, $zero, .L80243778 -/* 7EE47C 8024376C AC600000 */ sw $zero, ($v1) -/* 7EE480 80243770 08090DE3 */ j .L8024378C -/* 7EE484 80243774 0000102D */ daddu $v0, $zero, $zero -.L80243778: -/* 7EE488 80243778 8CC50000 */ lw $a1, ($a2) -/* 7EE48C 8024377C 3C068025 */ lui $a2, 0x8025 -/* 7EE490 80243780 0C0B2026 */ jal set_variable -/* 7EE494 80243784 8CC6ED50 */ lw $a2, -0x12b0($a2) -/* 7EE498 80243788 24020002 */ addiu $v0, $zero, 2 -.L8024378C: -/* 7EE49C 8024378C 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EE4A0 80243790 03E00008 */ jr $ra -/* 7EE4A4 80243794 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s new file mode 100644 index 0000000000..37a1173b8b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243744_7EE454.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243744_7EE454 +/* 7EE454 80243744 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EE458 80243748 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EE45C 8024374C 10A00003 */ beqz $a1, .L8024375C +/* 7EE460 80243750 8C86000C */ lw $a2, 0xc($a0) +/* 7EE464 80243754 3C018025 */ lui $at, 0x8025 +/* 7EE468 80243758 AC20ED4C */ sw $zero, -0x12b4($at) +.L8024375C: +/* 7EE46C 8024375C 3C038025 */ lui $v1, 0x8025 +/* 7EE470 80243760 2463ED4C */ addiu $v1, $v1, -0x12b4 +/* 7EE474 80243764 8C620000 */ lw $v0, ($v1) +/* 7EE478 80243768 54400003 */ bnel $v0, $zero, .L80243778 +/* 7EE47C 8024376C AC600000 */ sw $zero, ($v1) +/* 7EE480 80243770 08090DE3 */ j .L8024378C +/* 7EE484 80243774 0000102D */ daddu $v0, $zero, $zero +.L80243778: +/* 7EE488 80243778 8CC50000 */ lw $a1, ($a2) +/* 7EE48C 8024377C 3C068025 */ lui $a2, 0x8025 +/* 7EE490 80243780 0C0B2026 */ jal set_variable +/* 7EE494 80243784 8CC6ED50 */ lw $a2, -0x12b0($a2) +/* 7EE498 80243788 24020002 */ addiu $v0, $zero, 2 +.L8024378C: +/* 7EE49C 8024378C 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EE4A0 80243790 03E00008 */ jr $ra +/* 7EE4A4 80243794 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798.s deleted file mode 100644 index b94b748f72..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243798 -/* 7EE4A8 80243798 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EE4AC 8024379C AFBF0010 */ sw $ra, 0x10($sp) -/* 7EE4B0 802437A0 8C82000C */ lw $v0, 0xc($a0) -/* 7EE4B4 802437A4 0C0B1EAF */ jal get_variable -/* 7EE4B8 802437A8 8C450000 */ lw $a1, ($v0) -/* 7EE4BC 802437AC 3C018025 */ lui $at, 0x8025 -/* 7EE4C0 802437B0 AC22ED50 */ sw $v0, -0x12b0($at) -/* 7EE4C4 802437B4 24020002 */ addiu $v0, $zero, 2 -/* 7EE4C8 802437B8 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EE4CC 802437BC 24030001 */ addiu $v1, $zero, 1 -/* 7EE4D0 802437C0 3C018025 */ lui $at, 0x8025 -/* 7EE4D4 802437C4 AC23ED4C */ sw $v1, -0x12b4($at) -/* 7EE4D8 802437C8 03E00008 */ jr $ra -/* 7EE4DC 802437CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s new file mode 100644 index 0000000000..de41ffce4f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243798_7EE4A8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243798_7EE4A8 +/* 7EE4A8 80243798 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EE4AC 8024379C AFBF0010 */ sw $ra, 0x10($sp) +/* 7EE4B0 802437A0 8C82000C */ lw $v0, 0xc($a0) +/* 7EE4B4 802437A4 0C0B1EAF */ jal get_variable +/* 7EE4B8 802437A8 8C450000 */ lw $a1, ($v0) +/* 7EE4BC 802437AC 3C018025 */ lui $at, 0x8025 +/* 7EE4C0 802437B0 AC22ED50 */ sw $v0, -0x12b0($at) +/* 7EE4C4 802437B4 24020002 */ addiu $v0, $zero, 2 +/* 7EE4C8 802437B8 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EE4CC 802437BC 24030001 */ addiu $v1, $zero, 1 +/* 7EE4D0 802437C0 3C018025 */ lui $at, 0x8025 +/* 7EE4D4 802437C4 AC23ED4C */ sw $v1, -0x12b4($at) +/* 7EE4D8 802437C8 03E00008 */ jr $ra +/* 7EE4DC 802437CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0.s deleted file mode 100644 index 1d81d21a60..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437D0 -/* 7EE4E0 802437D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EE4E4 802437D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EE4E8 802437D8 8C82000C */ lw $v0, 0xc($a0) -/* 7EE4EC 802437DC 0C0B1EAF */ jal get_variable -/* 7EE4F0 802437E0 8C450000 */ lw $a1, ($v0) -/* 7EE4F4 802437E4 0040182D */ daddu $v1, $v0, $zero -/* 7EE4F8 802437E8 10600012 */ beqz $v1, .L80243834 -/* 7EE4FC 802437EC 0000202D */ daddu $a0, $zero, $zero -/* 7EE500 802437F0 8C620000 */ lw $v0, ($v1) -/* 7EE504 802437F4 5040000A */ beql $v0, $zero, .L80243820 -/* 7EE508 802437F8 00041080 */ sll $v0, $a0, 2 -/* 7EE50C 802437FC 3C058025 */ lui $a1, 0x8025 -/* 7EE510 80243800 24A55EE0 */ addiu $a1, $a1, 0x5ee0 -.L80243804: -/* 7EE514 80243804 24630004 */ addiu $v1, $v1, 4 -/* 7EE518 80243808 24840001 */ addiu $a0, $a0, 1 -/* 7EE51C 8024380C ACA20000 */ sw $v0, ($a1) -/* 7EE520 80243810 8C620000 */ lw $v0, ($v1) -/* 7EE524 80243814 1440FFFB */ bnez $v0, .L80243804 -/* 7EE528 80243818 24A50004 */ addiu $a1, $a1, 4 -/* 7EE52C 8024381C 00041080 */ sll $v0, $a0, 2 -.L80243820: -/* 7EE530 80243820 3C018025 */ lui $at, 0x8025 -/* 7EE534 80243824 00220821 */ addu $at, $at, $v0 -/* 7EE538 80243828 AC205EE0 */ sw $zero, 0x5ee0($at) -/* 7EE53C 8024382C 08090E17 */ j .L8024385C -/* 7EE540 80243830 00000000 */ nop -.L80243834: -/* 7EE544 80243834 3C038025 */ lui $v1, 0x8025 -/* 7EE548 80243838 24635EE0 */ addiu $v1, $v1, 0x5ee0 -/* 7EE54C 8024383C 0060282D */ daddu $a1, $v1, $zero -.L80243840: -/* 7EE550 80243840 24820010 */ addiu $v0, $a0, 0x10 -/* 7EE554 80243844 AC620000 */ sw $v0, ($v1) -/* 7EE558 80243848 24630004 */ addiu $v1, $v1, 4 -/* 7EE55C 8024384C 24840001 */ addiu $a0, $a0, 1 -/* 7EE560 80243850 28820070 */ slti $v0, $a0, 0x70 -/* 7EE564 80243854 1440FFFA */ bnez $v0, .L80243840 -/* 7EE568 80243858 ACA001C0 */ sw $zero, 0x1c0($a1) -.L8024385C: -/* 7EE56C 8024385C 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EE570 80243860 24020002 */ addiu $v0, $zero, 2 -/* 7EE574 80243864 03E00008 */ jr $ra -/* 7EE578 80243868 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s new file mode 100644 index 0000000000..75c1dcee1a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_802437D0_7EE4E0.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802437D0_7EE4E0 +/* 7EE4E0 802437D0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EE4E4 802437D4 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EE4E8 802437D8 8C82000C */ lw $v0, 0xc($a0) +/* 7EE4EC 802437DC 0C0B1EAF */ jal get_variable +/* 7EE4F0 802437E0 8C450000 */ lw $a1, ($v0) +/* 7EE4F4 802437E4 0040182D */ daddu $v1, $v0, $zero +/* 7EE4F8 802437E8 10600012 */ beqz $v1, .L80243834 +/* 7EE4FC 802437EC 0000202D */ daddu $a0, $zero, $zero +/* 7EE500 802437F0 8C620000 */ lw $v0, ($v1) +/* 7EE504 802437F4 5040000A */ beql $v0, $zero, .L80243820 +/* 7EE508 802437F8 00041080 */ sll $v0, $a0, 2 +/* 7EE50C 802437FC 3C058025 */ lui $a1, 0x8025 +/* 7EE510 80243800 24A55EE0 */ addiu $a1, $a1, 0x5ee0 +.L80243804: +/* 7EE514 80243804 24630004 */ addiu $v1, $v1, 4 +/* 7EE518 80243808 24840001 */ addiu $a0, $a0, 1 +/* 7EE51C 8024380C ACA20000 */ sw $v0, ($a1) +/* 7EE520 80243810 8C620000 */ lw $v0, ($v1) +/* 7EE524 80243814 1440FFFB */ bnez $v0, .L80243804 +/* 7EE528 80243818 24A50004 */ addiu $a1, $a1, 4 +/* 7EE52C 8024381C 00041080 */ sll $v0, $a0, 2 +.L80243820: +/* 7EE530 80243820 3C018025 */ lui $at, 0x8025 +/* 7EE534 80243824 00220821 */ addu $at, $at, $v0 +/* 7EE538 80243828 AC205EE0 */ sw $zero, 0x5ee0($at) +/* 7EE53C 8024382C 08090E17 */ j .L8024385C +/* 7EE540 80243830 00000000 */ nop +.L80243834: +/* 7EE544 80243834 3C038025 */ lui $v1, 0x8025 +/* 7EE548 80243838 24635EE0 */ addiu $v1, $v1, 0x5ee0 +/* 7EE54C 8024383C 0060282D */ daddu $a1, $v1, $zero +.L80243840: +/* 7EE550 80243840 24820010 */ addiu $v0, $a0, 0x10 +/* 7EE554 80243844 AC620000 */ sw $v0, ($v1) +/* 7EE558 80243848 24630004 */ addiu $v1, $v1, 4 +/* 7EE55C 8024384C 24840001 */ addiu $a0, $a0, 1 +/* 7EE560 80243850 28820070 */ slti $v0, $a0, 0x70 +/* 7EE564 80243854 1440FFFA */ bnez $v0, .L80243840 +/* 7EE568 80243858 ACA001C0 */ sw $zero, 0x1c0($a1) +.L8024385C: +/* 7EE56C 8024385C 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EE570 80243860 24020002 */ addiu $v0, $zero, 2 +/* 7EE574 80243864 03E00008 */ jr $ra +/* 7EE578 80243868 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024386C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024386C.s deleted file mode 100644 index 255cf4bc9b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024386C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024386C -/* 7EE57C 8024386C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EE580 80243870 AFB10014 */ sw $s1, 0x14($sp) -/* 7EE584 80243874 0080882D */ daddu $s1, $a0, $zero -/* 7EE588 80243878 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EE58C 8024387C AFB00010 */ sw $s0, 0x10($sp) -/* 7EE590 80243880 8E30000C */ lw $s0, 0xc($s1) -/* 7EE594 80243884 8E050000 */ lw $a1, ($s0) -/* 7EE598 80243888 0C0B1EAF */ jal get_variable -/* 7EE59C 8024388C 26100004 */ addiu $s0, $s0, 4 -/* 7EE5A0 80243890 AE22008C */ sw $v0, 0x8c($s1) -/* 7EE5A4 80243894 8E050000 */ lw $a1, ($s0) -/* 7EE5A8 80243898 26100004 */ addiu $s0, $s0, 4 -/* 7EE5AC 8024389C 0C0B1EAF */ jal get_variable -/* 7EE5B0 802438A0 0220202D */ daddu $a0, $s1, $zero -/* 7EE5B4 802438A4 AE220090 */ sw $v0, 0x90($s1) -/* 7EE5B8 802438A8 8E050000 */ lw $a1, ($s0) -/* 7EE5BC 802438AC 26100004 */ addiu $s0, $s0, 4 -/* 7EE5C0 802438B0 0C0B1EAF */ jal get_variable -/* 7EE5C4 802438B4 0220202D */ daddu $a0, $s1, $zero -/* 7EE5C8 802438B8 AE220094 */ sw $v0, 0x94($s1) -/* 7EE5CC 802438BC 8E050000 */ lw $a1, ($s0) -/* 7EE5D0 802438C0 26100004 */ addiu $s0, $s0, 4 -/* 7EE5D4 802438C4 0C0B1EAF */ jal get_variable -/* 7EE5D8 802438C8 0220202D */ daddu $a0, $s1, $zero -/* 7EE5DC 802438CC AE220098 */ sw $v0, 0x98($s1) -/* 7EE5E0 802438D0 8E050000 */ lw $a1, ($s0) -/* 7EE5E4 802438D4 26100004 */ addiu $s0, $s0, 4 -/* 7EE5E8 802438D8 0C0B1EAF */ jal get_variable -/* 7EE5EC 802438DC 0220202D */ daddu $a0, $s1, $zero -/* 7EE5F0 802438E0 AE22009C */ sw $v0, 0x9c($s1) -/* 7EE5F4 802438E4 8E050000 */ lw $a1, ($s0) -/* 7EE5F8 802438E8 26100004 */ addiu $s0, $s0, 4 -/* 7EE5FC 802438EC 0C0B1EAF */ jal get_variable -/* 7EE600 802438F0 0220202D */ daddu $a0, $s1, $zero -/* 7EE604 802438F4 AE2200A0 */ sw $v0, 0xa0($s1) -/* 7EE608 802438F8 8E050000 */ lw $a1, ($s0) -/* 7EE60C 802438FC 26100004 */ addiu $s0, $s0, 4 -/* 7EE610 80243900 0C0B1EAF */ jal get_variable -/* 7EE614 80243904 0220202D */ daddu $a0, $s1, $zero -/* 7EE618 80243908 AE2200A4 */ sw $v0, 0xa4($s1) -/* 7EE61C 8024390C 8E050000 */ lw $a1, ($s0) -/* 7EE620 80243910 26100004 */ addiu $s0, $s0, 4 -/* 7EE624 80243914 0C0B1EAF */ jal get_variable -/* 7EE628 80243918 0220202D */ daddu $a0, $s1, $zero -/* 7EE62C 8024391C AE2200A8 */ sw $v0, 0xa8($s1) -/* 7EE630 80243920 8E050000 */ lw $a1, ($s0) -/* 7EE634 80243924 26100004 */ addiu $s0, $s0, 4 -/* 7EE638 80243928 0C0B1EAF */ jal get_variable -/* 7EE63C 8024392C 0220202D */ daddu $a0, $s1, $zero -/* 7EE640 80243930 AE2200AC */ sw $v0, 0xac($s1) -/* 7EE644 80243934 8E050000 */ lw $a1, ($s0) -/* 7EE648 80243938 0C0B1EAF */ jal get_variable -/* 7EE64C 8024393C 0220202D */ daddu $a0, $s1, $zero -/* 7EE650 80243940 AE2200B0 */ sw $v0, 0xb0($s1) -/* 7EE654 80243944 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EE658 80243948 8FB10014 */ lw $s1, 0x14($sp) -/* 7EE65C 8024394C 8FB00010 */ lw $s0, 0x10($sp) -/* 7EE660 80243950 24020002 */ addiu $v0, $zero, 2 -/* 7EE664 80243954 03E00008 */ jr $ra -/* 7EE668 80243958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024386C_7EE57C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024386C_7EE57C.s new file mode 100644 index 0000000000..d98cc678db --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024386C_7EE57C.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024386C_7EE57C +/* 7EE57C 8024386C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7EE580 80243870 AFB10014 */ sw $s1, 0x14($sp) +/* 7EE584 80243874 0080882D */ daddu $s1, $a0, $zero +/* 7EE588 80243878 AFBF0018 */ sw $ra, 0x18($sp) +/* 7EE58C 8024387C AFB00010 */ sw $s0, 0x10($sp) +/* 7EE590 80243880 8E30000C */ lw $s0, 0xc($s1) +/* 7EE594 80243884 8E050000 */ lw $a1, ($s0) +/* 7EE598 80243888 0C0B1EAF */ jal get_variable +/* 7EE59C 8024388C 26100004 */ addiu $s0, $s0, 4 +/* 7EE5A0 80243890 AE22008C */ sw $v0, 0x8c($s1) +/* 7EE5A4 80243894 8E050000 */ lw $a1, ($s0) +/* 7EE5A8 80243898 26100004 */ addiu $s0, $s0, 4 +/* 7EE5AC 8024389C 0C0B1EAF */ jal get_variable +/* 7EE5B0 802438A0 0220202D */ daddu $a0, $s1, $zero +/* 7EE5B4 802438A4 AE220090 */ sw $v0, 0x90($s1) +/* 7EE5B8 802438A8 8E050000 */ lw $a1, ($s0) +/* 7EE5BC 802438AC 26100004 */ addiu $s0, $s0, 4 +/* 7EE5C0 802438B0 0C0B1EAF */ jal get_variable +/* 7EE5C4 802438B4 0220202D */ daddu $a0, $s1, $zero +/* 7EE5C8 802438B8 AE220094 */ sw $v0, 0x94($s1) +/* 7EE5CC 802438BC 8E050000 */ lw $a1, ($s0) +/* 7EE5D0 802438C0 26100004 */ addiu $s0, $s0, 4 +/* 7EE5D4 802438C4 0C0B1EAF */ jal get_variable +/* 7EE5D8 802438C8 0220202D */ daddu $a0, $s1, $zero +/* 7EE5DC 802438CC AE220098 */ sw $v0, 0x98($s1) +/* 7EE5E0 802438D0 8E050000 */ lw $a1, ($s0) +/* 7EE5E4 802438D4 26100004 */ addiu $s0, $s0, 4 +/* 7EE5E8 802438D8 0C0B1EAF */ jal get_variable +/* 7EE5EC 802438DC 0220202D */ daddu $a0, $s1, $zero +/* 7EE5F0 802438E0 AE22009C */ sw $v0, 0x9c($s1) +/* 7EE5F4 802438E4 8E050000 */ lw $a1, ($s0) +/* 7EE5F8 802438E8 26100004 */ addiu $s0, $s0, 4 +/* 7EE5FC 802438EC 0C0B1EAF */ jal get_variable +/* 7EE600 802438F0 0220202D */ daddu $a0, $s1, $zero +/* 7EE604 802438F4 AE2200A0 */ sw $v0, 0xa0($s1) +/* 7EE608 802438F8 8E050000 */ lw $a1, ($s0) +/* 7EE60C 802438FC 26100004 */ addiu $s0, $s0, 4 +/* 7EE610 80243900 0C0B1EAF */ jal get_variable +/* 7EE614 80243904 0220202D */ daddu $a0, $s1, $zero +/* 7EE618 80243908 AE2200A4 */ sw $v0, 0xa4($s1) +/* 7EE61C 8024390C 8E050000 */ lw $a1, ($s0) +/* 7EE620 80243910 26100004 */ addiu $s0, $s0, 4 +/* 7EE624 80243914 0C0B1EAF */ jal get_variable +/* 7EE628 80243918 0220202D */ daddu $a0, $s1, $zero +/* 7EE62C 8024391C AE2200A8 */ sw $v0, 0xa8($s1) +/* 7EE630 80243920 8E050000 */ lw $a1, ($s0) +/* 7EE634 80243924 26100004 */ addiu $s0, $s0, 4 +/* 7EE638 80243928 0C0B1EAF */ jal get_variable +/* 7EE63C 8024392C 0220202D */ daddu $a0, $s1, $zero +/* 7EE640 80243930 AE2200AC */ sw $v0, 0xac($s1) +/* 7EE644 80243934 8E050000 */ lw $a1, ($s0) +/* 7EE648 80243938 0C0B1EAF */ jal get_variable +/* 7EE64C 8024393C 0220202D */ daddu $a0, $s1, $zero +/* 7EE650 80243940 AE2200B0 */ sw $v0, 0xb0($s1) +/* 7EE654 80243944 8FBF0018 */ lw $ra, 0x18($sp) +/* 7EE658 80243948 8FB10014 */ lw $s1, 0x14($sp) +/* 7EE65C 8024394C 8FB00010 */ lw $s0, 0x10($sp) +/* 7EE660 80243950 24020002 */ addiu $v0, $zero, 2 +/* 7EE664 80243954 03E00008 */ jr $ra +/* 7EE668 80243958 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C.s deleted file mode 100644 index a2b8cd5f94..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024395C -/* 7EE66C 8024395C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7EE670 80243960 AFB1001C */ sw $s1, 0x1c($sp) -/* 7EE674 80243964 0080882D */ daddu $s1, $a0, $zero -/* 7EE678 80243968 AFBF0034 */ sw $ra, 0x34($sp) -/* 7EE67C 8024396C AFB60030 */ sw $s6, 0x30($sp) -/* 7EE680 80243970 AFB5002C */ sw $s5, 0x2c($sp) -/* 7EE684 80243974 AFB40028 */ sw $s4, 0x28($sp) -/* 7EE688 80243978 AFB30024 */ sw $s3, 0x24($sp) -/* 7EE68C 8024397C AFB20020 */ sw $s2, 0x20($sp) -/* 7EE690 80243980 AFB00018 */ sw $s0, 0x18($sp) -/* 7EE694 80243984 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 7EE698 80243988 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 7EE69C 8024398C 8E30000C */ lw $s0, 0xc($s1) -/* 7EE6A0 80243990 8E160000 */ lw $s6, ($s0) -/* 7EE6A4 80243994 26100004 */ addiu $s0, $s0, 4 -/* 7EE6A8 80243998 0C0B1EAF */ jal get_variable -/* 7EE6AC 8024399C 02C0282D */ daddu $a1, $s6, $zero -/* 7EE6B0 802439A0 44820000 */ mtc1 $v0, $f0 -/* 7EE6B4 802439A4 00000000 */ nop -/* 7EE6B8 802439A8 46800020 */ cvt.s.w $f0, $f0 -/* 7EE6BC 802439AC E7A00010 */ swc1 $f0, 0x10($sp) -/* 7EE6C0 802439B0 8E140000 */ lw $s4, ($s0) -/* 7EE6C4 802439B4 26100004 */ addiu $s0, $s0, 4 -/* 7EE6C8 802439B8 0220202D */ daddu $a0, $s1, $zero -/* 7EE6CC 802439BC 0C0B1EAF */ jal get_variable -/* 7EE6D0 802439C0 0280282D */ daddu $a1, $s4, $zero -/* 7EE6D4 802439C4 0220202D */ daddu $a0, $s1, $zero -/* 7EE6D8 802439C8 8E150000 */ lw $s5, ($s0) -/* 7EE6DC 802439CC 4482B000 */ mtc1 $v0, $f22 -/* 7EE6E0 802439D0 00000000 */ nop -/* 7EE6E4 802439D4 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7EE6E8 802439D8 0C0B1EAF */ jal get_variable -/* 7EE6EC 802439DC 02A0282D */ daddu $a1, $s5, $zero -/* 7EE6F0 802439E0 2404FFFC */ addiu $a0, $zero, -4 -/* 7EE6F4 802439E4 44820000 */ mtc1 $v0, $f0 -/* 7EE6F8 802439E8 00000000 */ nop -/* 7EE6FC 802439EC 46800020 */ cvt.s.w $f0, $f0 -/* 7EE700 802439F0 0C00EABB */ jal get_npc_unsafe -/* 7EE704 802439F4 E7A00014 */ swc1 $f0, 0x14($sp) -/* 7EE708 802439F8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 7EE70C 802439FC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 7EE710 80243A00 3C014334 */ lui $at, 0x4334 -/* 7EE714 80243A04 44816000 */ mtc1 $at, $f12 -/* 7EE718 80243A08 00041880 */ sll $v1, $a0, 2 -/* 7EE71C 80243A0C 00641821 */ addu $v1, $v1, $a0 -/* 7EE720 80243A10 00031880 */ sll $v1, $v1, 2 -/* 7EE724 80243A14 00641823 */ subu $v1, $v1, $a0 -/* 7EE728 80243A18 000320C0 */ sll $a0, $v1, 3 -/* 7EE72C 80243A1C 00641821 */ addu $v1, $v1, $a0 -/* 7EE730 80243A20 000318C0 */ sll $v1, $v1, 3 -/* 7EE734 80243A24 3C01800B */ lui $at, 0x800b -/* 7EE738 80243A28 00230821 */ addu $at, $at, $v1 -/* 7EE73C 80243A2C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 7EE740 80243A30 460C0300 */ add.s $f12, $f0, $f12 -/* 7EE744 80243A34 0C00A6C9 */ jal clamp_angle -/* 7EE748 80243A38 0040982D */ daddu $s3, $v0, $zero -/* 7EE74C 80243A3C 27B00010 */ addiu $s0, $sp, 0x10 -/* 7EE750 80243A40 0200202D */ daddu $a0, $s0, $zero -/* 7EE754 80243A44 27B20014 */ addiu $s2, $sp, 0x14 -/* 7EE758 80243A48 0240282D */ daddu $a1, $s2, $zero -/* 7EE75C 80243A4C 3C064170 */ lui $a2, 0x4170 -/* 7EE760 80243A50 8E67000C */ lw $a3, 0xc($s3) -/* 7EE764 80243A54 0C00A7E7 */ jal add_vec2D_polar -/* 7EE768 80243A58 46000506 */ mov.s $f20, $f0 -/* 7EE76C 80243A5C 0200202D */ daddu $a0, $s0, $zero -/* 7EE770 80243A60 3C064120 */ lui $a2, 0x4120 -/* 7EE774 80243A64 4407A000 */ mfc1 $a3, $f20 -/* 7EE778 80243A68 0C00A7E7 */ jal add_vec2D_polar -/* 7EE77C 80243A6C 0240282D */ daddu $a1, $s2, $zero -/* 7EE780 80243A70 0220202D */ daddu $a0, $s1, $zero -/* 7EE784 80243A74 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 7EE788 80243A78 4600008D */ trunc.w.s $f2, $f0 -/* 7EE78C 80243A7C 44061000 */ mfc1 $a2, $f2 -/* 7EE790 80243A80 0C0B2026 */ jal set_variable -/* 7EE794 80243A84 02C0282D */ daddu $a1, $s6, $zero -/* 7EE798 80243A88 0220202D */ daddu $a0, $s1, $zero -/* 7EE79C 80243A8C 4600B08D */ trunc.w.s $f2, $f22 -/* 7EE7A0 80243A90 44061000 */ mfc1 $a2, $f2 -/* 7EE7A4 80243A94 0C0B2026 */ jal set_variable -/* 7EE7A8 80243A98 0280282D */ daddu $a1, $s4, $zero -/* 7EE7AC 80243A9C 0220202D */ daddu $a0, $s1, $zero -/* 7EE7B0 80243AA0 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 7EE7B4 80243AA4 4600008D */ trunc.w.s $f2, $f0 -/* 7EE7B8 80243AA8 44061000 */ mfc1 $a2, $f2 -/* 7EE7BC 80243AAC 0C0B2026 */ jal set_variable -/* 7EE7C0 80243AB0 02A0282D */ daddu $a1, $s5, $zero -/* 7EE7C4 80243AB4 8FBF0034 */ lw $ra, 0x34($sp) -/* 7EE7C8 80243AB8 8FB60030 */ lw $s6, 0x30($sp) -/* 7EE7CC 80243ABC 8FB5002C */ lw $s5, 0x2c($sp) -/* 7EE7D0 80243AC0 8FB40028 */ lw $s4, 0x28($sp) -/* 7EE7D4 80243AC4 8FB30024 */ lw $s3, 0x24($sp) -/* 7EE7D8 80243AC8 8FB20020 */ lw $s2, 0x20($sp) -/* 7EE7DC 80243ACC 8FB1001C */ lw $s1, 0x1c($sp) -/* 7EE7E0 80243AD0 8FB00018 */ lw $s0, 0x18($sp) -/* 7EE7E4 80243AD4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 7EE7E8 80243AD8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 7EE7EC 80243ADC 24020002 */ addiu $v0, $zero, 2 -/* 7EE7F0 80243AE0 03E00008 */ jr $ra -/* 7EE7F4 80243AE4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C_7EE66C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C_7EE66C.s new file mode 100644 index 0000000000..6b24721d0e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_8024395C_7EE66C.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024395C_7EE66C +/* 7EE66C 8024395C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 7EE670 80243960 AFB1001C */ sw $s1, 0x1c($sp) +/* 7EE674 80243964 0080882D */ daddu $s1, $a0, $zero +/* 7EE678 80243968 AFBF0034 */ sw $ra, 0x34($sp) +/* 7EE67C 8024396C AFB60030 */ sw $s6, 0x30($sp) +/* 7EE680 80243970 AFB5002C */ sw $s5, 0x2c($sp) +/* 7EE684 80243974 AFB40028 */ sw $s4, 0x28($sp) +/* 7EE688 80243978 AFB30024 */ sw $s3, 0x24($sp) +/* 7EE68C 8024397C AFB20020 */ sw $s2, 0x20($sp) +/* 7EE690 80243980 AFB00018 */ sw $s0, 0x18($sp) +/* 7EE694 80243984 F7B60040 */ sdc1 $f22, 0x40($sp) +/* 7EE698 80243988 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 7EE69C 8024398C 8E30000C */ lw $s0, 0xc($s1) +/* 7EE6A0 80243990 8E160000 */ lw $s6, ($s0) +/* 7EE6A4 80243994 26100004 */ addiu $s0, $s0, 4 +/* 7EE6A8 80243998 0C0B1EAF */ jal get_variable +/* 7EE6AC 8024399C 02C0282D */ daddu $a1, $s6, $zero +/* 7EE6B0 802439A0 44820000 */ mtc1 $v0, $f0 +/* 7EE6B4 802439A4 00000000 */ nop +/* 7EE6B8 802439A8 46800020 */ cvt.s.w $f0, $f0 +/* 7EE6BC 802439AC E7A00010 */ swc1 $f0, 0x10($sp) +/* 7EE6C0 802439B0 8E140000 */ lw $s4, ($s0) +/* 7EE6C4 802439B4 26100004 */ addiu $s0, $s0, 4 +/* 7EE6C8 802439B8 0220202D */ daddu $a0, $s1, $zero +/* 7EE6CC 802439BC 0C0B1EAF */ jal get_variable +/* 7EE6D0 802439C0 0280282D */ daddu $a1, $s4, $zero +/* 7EE6D4 802439C4 0220202D */ daddu $a0, $s1, $zero +/* 7EE6D8 802439C8 8E150000 */ lw $s5, ($s0) +/* 7EE6DC 802439CC 4482B000 */ mtc1 $v0, $f22 +/* 7EE6E0 802439D0 00000000 */ nop +/* 7EE6E4 802439D4 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7EE6E8 802439D8 0C0B1EAF */ jal get_variable +/* 7EE6EC 802439DC 02A0282D */ daddu $a1, $s5, $zero +/* 7EE6F0 802439E0 2404FFFC */ addiu $a0, $zero, -4 +/* 7EE6F4 802439E4 44820000 */ mtc1 $v0, $f0 +/* 7EE6F8 802439E8 00000000 */ nop +/* 7EE6FC 802439EC 46800020 */ cvt.s.w $f0, $f0 +/* 7EE700 802439F0 0C00EABB */ jal get_npc_unsafe +/* 7EE704 802439F4 E7A00014 */ swc1 $f0, 0x14($sp) +/* 7EE708 802439F8 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 7EE70C 802439FC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 7EE710 80243A00 3C014334 */ lui $at, 0x4334 +/* 7EE714 80243A04 44816000 */ mtc1 $at, $f12 +/* 7EE718 80243A08 00041880 */ sll $v1, $a0, 2 +/* 7EE71C 80243A0C 00641821 */ addu $v1, $v1, $a0 +/* 7EE720 80243A10 00031880 */ sll $v1, $v1, 2 +/* 7EE724 80243A14 00641823 */ subu $v1, $v1, $a0 +/* 7EE728 80243A18 000320C0 */ sll $a0, $v1, 3 +/* 7EE72C 80243A1C 00641821 */ addu $v1, $v1, $a0 +/* 7EE730 80243A20 000318C0 */ sll $v1, $v1, 3 +/* 7EE734 80243A24 3C01800B */ lui $at, 0x800b +/* 7EE738 80243A28 00230821 */ addu $at, $at, $v1 +/* 7EE73C 80243A2C C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 7EE740 80243A30 460C0300 */ add.s $f12, $f0, $f12 +/* 7EE744 80243A34 0C00A6C9 */ jal clamp_angle +/* 7EE748 80243A38 0040982D */ daddu $s3, $v0, $zero +/* 7EE74C 80243A3C 27B00010 */ addiu $s0, $sp, 0x10 +/* 7EE750 80243A40 0200202D */ daddu $a0, $s0, $zero +/* 7EE754 80243A44 27B20014 */ addiu $s2, $sp, 0x14 +/* 7EE758 80243A48 0240282D */ daddu $a1, $s2, $zero +/* 7EE75C 80243A4C 3C064170 */ lui $a2, 0x4170 +/* 7EE760 80243A50 8E67000C */ lw $a3, 0xc($s3) +/* 7EE764 80243A54 0C00A7E7 */ jal add_vec2D_polar +/* 7EE768 80243A58 46000506 */ mov.s $f20, $f0 +/* 7EE76C 80243A5C 0200202D */ daddu $a0, $s0, $zero +/* 7EE770 80243A60 3C064120 */ lui $a2, 0x4120 +/* 7EE774 80243A64 4407A000 */ mfc1 $a3, $f20 +/* 7EE778 80243A68 0C00A7E7 */ jal add_vec2D_polar +/* 7EE77C 80243A6C 0240282D */ daddu $a1, $s2, $zero +/* 7EE780 80243A70 0220202D */ daddu $a0, $s1, $zero +/* 7EE784 80243A74 C7A00010 */ lwc1 $f0, 0x10($sp) +/* 7EE788 80243A78 4600008D */ trunc.w.s $f2, $f0 +/* 7EE78C 80243A7C 44061000 */ mfc1 $a2, $f2 +/* 7EE790 80243A80 0C0B2026 */ jal set_variable +/* 7EE794 80243A84 02C0282D */ daddu $a1, $s6, $zero +/* 7EE798 80243A88 0220202D */ daddu $a0, $s1, $zero +/* 7EE79C 80243A8C 4600B08D */ trunc.w.s $f2, $f22 +/* 7EE7A0 80243A90 44061000 */ mfc1 $a2, $f2 +/* 7EE7A4 80243A94 0C0B2026 */ jal set_variable +/* 7EE7A8 80243A98 0280282D */ daddu $a1, $s4, $zero +/* 7EE7AC 80243A9C 0220202D */ daddu $a0, $s1, $zero +/* 7EE7B0 80243AA0 C7A00014 */ lwc1 $f0, 0x14($sp) +/* 7EE7B4 80243AA4 4600008D */ trunc.w.s $f2, $f0 +/* 7EE7B8 80243AA8 44061000 */ mfc1 $a2, $f2 +/* 7EE7BC 80243AAC 0C0B2026 */ jal set_variable +/* 7EE7C0 80243AB0 02A0282D */ daddu $a1, $s5, $zero +/* 7EE7C4 80243AB4 8FBF0034 */ lw $ra, 0x34($sp) +/* 7EE7C8 80243AB8 8FB60030 */ lw $s6, 0x30($sp) +/* 7EE7CC 80243ABC 8FB5002C */ lw $s5, 0x2c($sp) +/* 7EE7D0 80243AC0 8FB40028 */ lw $s4, 0x28($sp) +/* 7EE7D4 80243AC4 8FB30024 */ lw $s3, 0x24($sp) +/* 7EE7D8 80243AC8 8FB20020 */ lw $s2, 0x20($sp) +/* 7EE7DC 80243ACC 8FB1001C */ lw $s1, 0x1c($sp) +/* 7EE7E0 80243AD0 8FB00018 */ lw $s0, 0x18($sp) +/* 7EE7E4 80243AD4 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 7EE7E8 80243AD8 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 7EE7EC 80243ADC 24020002 */ addiu $v0, $zero, 2 +/* 7EE7F0 80243AE0 03E00008 */ jr $ra +/* 7EE7F4 80243AE4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8.s deleted file mode 100644 index c51b595339..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243AE8 -/* 7EE7F8 80243AE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EE7FC 80243AEC AFB00010 */ sw $s0, 0x10($sp) -/* 7EE800 80243AF0 0080802D */ daddu $s0, $a0, $zero -/* 7EE804 80243AF4 AFBF0014 */ sw $ra, 0x14($sp) -/* 7EE808 80243AF8 0C00EABB */ jal get_npc_unsafe -/* 7EE80C 80243AFC 8E04008C */ lw $a0, 0x8c($s0) -/* 7EE810 80243B00 0040282D */ daddu $a1, $v0, $zero -/* 7EE814 80243B04 8E040094 */ lw $a0, 0x94($s0) -/* 7EE818 80243B08 8CA30028 */ lw $v1, 0x28($a1) -/* 7EE81C 80243B0C ACA40028 */ sw $a0, 0x28($a1) -/* 7EE820 80243B10 8FBF0014 */ lw $ra, 0x14($sp) -/* 7EE824 80243B14 8FB00010 */ lw $s0, 0x10($sp) -/* 7EE828 80243B18 24020002 */ addiu $v0, $zero, 2 -/* 7EE82C 80243B1C 3C018025 */ lui $at, 0x8025 -/* 7EE830 80243B20 AC2360A4 */ sw $v1, 0x60a4($at) -/* 7EE834 80243B24 03E00008 */ jr $ra -/* 7EE838 80243B28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s new file mode 100644 index 0000000000..c01490f9e8 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243AE8_7EE7F8.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243AE8_7EE7F8 +/* 7EE7F8 80243AE8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EE7FC 80243AEC AFB00010 */ sw $s0, 0x10($sp) +/* 7EE800 80243AF0 0080802D */ daddu $s0, $a0, $zero +/* 7EE804 80243AF4 AFBF0014 */ sw $ra, 0x14($sp) +/* 7EE808 80243AF8 0C00EABB */ jal get_npc_unsafe +/* 7EE80C 80243AFC 8E04008C */ lw $a0, 0x8c($s0) +/* 7EE810 80243B00 0040282D */ daddu $a1, $v0, $zero +/* 7EE814 80243B04 8E040094 */ lw $a0, 0x94($s0) +/* 7EE818 80243B08 8CA30028 */ lw $v1, 0x28($a1) +/* 7EE81C 80243B0C ACA40028 */ sw $a0, 0x28($a1) +/* 7EE820 80243B10 8FBF0014 */ lw $ra, 0x14($sp) +/* 7EE824 80243B14 8FB00010 */ lw $s0, 0x10($sp) +/* 7EE828 80243B18 24020002 */ addiu $v0, $zero, 2 +/* 7EE82C 80243B1C 3C018025 */ lui $at, 0x8025 +/* 7EE830 80243B20 AC2360A4 */ sw $v1, 0x60a4($at) +/* 7EE834 80243B24 03E00008 */ jr $ra +/* 7EE838 80243B28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C.s deleted file mode 100644 index 70c9763750..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243B2C -/* 7EE83C 80243B2C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EE840 80243B30 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EE844 80243B34 0C00EABB */ jal get_npc_unsafe -/* 7EE848 80243B38 8C84008C */ lw $a0, 0x8c($a0) -/* 7EE84C 80243B3C 3C038025 */ lui $v1, 0x8025 -/* 7EE850 80243B40 8C6360A4 */ lw $v1, 0x60a4($v1) -/* 7EE854 80243B44 AC430028 */ sw $v1, 0x28($v0) -/* 7EE858 80243B48 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EE85C 80243B4C 24020002 */ addiu $v0, $zero, 2 -/* 7EE860 80243B50 03E00008 */ jr $ra -/* 7EE864 80243B54 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7EE868 80243B58 00000000 */ nop -/* 7EE86C 80243B5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s new file mode 100644 index 0000000000..28cc587af6 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_00/7ED280/func_80243B2C_7EE83C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243B2C_7EE83C +/* 7EE83C 80243B2C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7EE840 80243B30 AFBF0010 */ sw $ra, 0x10($sp) +/* 7EE844 80243B34 0C00EABB */ jal get_npc_unsafe +/* 7EE848 80243B38 8C84008C */ lw $a0, 0x8c($a0) +/* 7EE84C 80243B3C 3C038025 */ lui $v1, 0x8025 +/* 7EE850 80243B40 8C6360A4 */ lw $v1, 0x60a4($v1) +/* 7EE854 80243B44 AC430028 */ sw $v1, 0x28($v0) +/* 7EE858 80243B48 8FBF0010 */ lw $ra, 0x10($sp) +/* 7EE85C 80243B4C 24020002 */ addiu $v0, $zero, 2 +/* 7EE860 80243B50 03E00008 */ jr $ra +/* 7EE864 80243B54 27BD0018 */ addiu $sp, $sp, 0x18 +/* 7EE868 80243B58 00000000 */ nop +/* 7EE86C 80243B5C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044.s b/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044.s deleted file mode 100644 index 1bd34c5163..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240044 -/* 8008C4 80240044 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8008C8 80240048 AFBF0018 */ sw $ra, 0x18($sp) -/* 8008CC 8024004C AFB10014 */ sw $s1, 0x14($sp) -/* 8008D0 80240050 AFB00010 */ sw $s0, 0x10($sp) -/* 8008D4 80240054 8C82000C */ lw $v0, 0xc($a0) -/* 8008D8 80240058 0C0B1EAF */ jal get_variable -/* 8008DC 8024005C 8C450000 */ lw $a1, ($v0) -/* 8008E0 80240060 0000202D */ daddu $a0, $zero, $zero -/* 8008E4 80240064 3C05FD05 */ lui $a1, 0xfd05 -/* 8008E8 80240068 34A50F82 */ ori $a1, $a1, 0xf82 -/* 8008EC 8024006C 0C0B1EAF */ jal get_variable -/* 8008F0 80240070 0040802D */ daddu $s0, $v0, $zero -/* 8008F4 80240074 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8008F8 80240078 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8008FC 8024007C 24050040 */ addiu $a1, $zero, 0x40 -/* 800900 80240080 8C640140 */ lw $a0, 0x140($v1) -/* 800904 80240084 00101900 */ sll $v1, $s0, 4 -/* 800908 80240088 00641821 */ addu $v1, $v1, $a0 -/* 80090C 8024008C 8C640000 */ lw $a0, ($v1) -/* 800910 80240090 0C04D052 */ jal set_item_entity_flags -/* 800914 80240094 0040882D */ daddu $s1, $v0, $zero -/* 800918 80240098 0000202D */ daddu $a0, $zero, $zero -/* 80091C 8024009C 00108080 */ sll $s0, $s0, 2 -/* 800920 802400A0 02118021 */ addu $s0, $s0, $s1 -/* 800924 802400A4 8E050000 */ lw $a1, ($s0) -/* 800928 802400A8 0C0B2026 */ jal set_variable -/* 80092C 802400AC 24060001 */ addiu $a2, $zero, 1 -/* 800930 802400B0 8FBF0018 */ lw $ra, 0x18($sp) -/* 800934 802400B4 8FB10014 */ lw $s1, 0x14($sp) -/* 800938 802400B8 8FB00010 */ lw $s0, 0x10($sp) -/* 80093C 802400BC 24020002 */ addiu $v0, $zero, 2 -/* 800940 802400C0 03E00008 */ jr $ra -/* 800944 802400C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s b/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s new file mode 100644 index 0000000000..feadb69b5c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240044_8008C4 +/* 8008C4 80240044 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8008C8 80240048 AFBF0018 */ sw $ra, 0x18($sp) +/* 8008CC 8024004C AFB10014 */ sw $s1, 0x14($sp) +/* 8008D0 80240050 AFB00010 */ sw $s0, 0x10($sp) +/* 8008D4 80240054 8C82000C */ lw $v0, 0xc($a0) +/* 8008D8 80240058 0C0B1EAF */ jal get_variable +/* 8008DC 8024005C 8C450000 */ lw $a1, ($v0) +/* 8008E0 80240060 0000202D */ daddu $a0, $zero, $zero +/* 8008E4 80240064 3C05FD05 */ lui $a1, 0xfd05 +/* 8008E8 80240068 34A50F82 */ ori $a1, $a1, 0xf82 +/* 8008EC 8024006C 0C0B1EAF */ jal get_variable +/* 8008F0 80240070 0040802D */ daddu $s0, $v0, $zero +/* 8008F4 80240074 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 8008F8 80240078 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 8008FC 8024007C 24050040 */ addiu $a1, $zero, 0x40 +/* 800900 80240080 8C640140 */ lw $a0, 0x140($v1) +/* 800904 80240084 00101900 */ sll $v1, $s0, 4 +/* 800908 80240088 00641821 */ addu $v1, $v1, $a0 +/* 80090C 8024008C 8C640000 */ lw $a0, ($v1) +/* 800910 80240090 0C04D052 */ jal set_item_entity_flags +/* 800914 80240094 0040882D */ daddu $s1, $v0, $zero +/* 800918 80240098 0000202D */ daddu $a0, $zero, $zero +/* 80091C 8024009C 00108080 */ sll $s0, $s0, 2 +/* 800920 802400A0 02118021 */ addu $s0, $s0, $s1 +/* 800924 802400A4 8E050000 */ lw $a1, ($s0) +/* 800928 802400A8 0C0B2026 */ jal set_variable +/* 80092C 802400AC 24060001 */ addiu $a2, $zero, 1 +/* 800930 802400B0 8FBF0018 */ lw $ra, 0x18($sp) +/* 800934 802400B4 8FB10014 */ lw $s1, 0x14($sp) +/* 800938 802400B8 8FB00010 */ lw $s0, 0x10($sp) +/* 80093C 802400BC 24020002 */ addiu $v0, $zero, 2 +/* 800940 802400C0 03E00008 */ jr $ra +/* 800944 802400C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0.s b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0.s deleted file mode 100644 index 7dda338dfd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403C0 -/* 800C40 802403C0 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* 800C44 802403C4 3C028007 */ lui $v0, %hi(gCurrentCameraID) -/* 800C48 802403C8 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) -/* 800C4C 802403CC 3C01C248 */ lui $at, 0xc248 -/* 800C50 802403D0 44813000 */ mtc1 $at, $f6 -/* 800C54 802403D4 3C01427C */ lui $at, 0x427c -/* 800C58 802403D8 44811000 */ mtc1 $at, $f2 -/* 800C5C 802403DC 3C0142BE */ lui $at, 0x42be -/* 800C60 802403E0 44812000 */ mtc1 $at, $f4 -/* 800C64 802403E4 3C0141F8 */ lui $at, 0x41f8 -/* 800C68 802403E8 44814000 */ mtc1 $at, $f8 -/* 800C6C 802403EC 3C04800B */ lui $a0, %hi(gCameras) -/* 800C70 802403F0 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* 800C74 802403F4 AFBF00B4 */ sw $ra, 0xb4($sp) -/* 800C78 802403F8 AFB000B0 */ sw $s0, 0xb0($sp) -/* 800C7C 802403FC 00021880 */ sll $v1, $v0, 2 -/* 800C80 80240400 00621821 */ addu $v1, $v1, $v0 -/* 800C84 80240404 00031880 */ sll $v1, $v1, 2 -/* 800C88 80240408 00621823 */ subu $v1, $v1, $v0 -/* 800C8C 8024040C 000310C0 */ sll $v0, $v1, 3 -/* 800C90 80240410 00621821 */ addu $v1, $v1, $v0 -/* 800C94 80240414 000318C0 */ sll $v1, $v1, 3 -/* 800C98 80240418 00641821 */ addu $v1, $v1, $a0 -/* 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, 0x800a -/* 800CAC 8024042C 2610A674 */ addiu $s0, $s0, -0x598c -/* 800CB0 80240430 E7A00014 */ swc1 $f0, 0x14($sp) -/* 800CB4 80240434 C4600048 */ lwc1 $f0, 0x48($v1) -/* 800CB8 80240438 27A50090 */ addiu $a1, $sp, 0x90 -/* 800CBC 8024043C E7A00018 */ swc1 $f0, 0x18($sp) -/* 800CC0 80240440 C460004C */ lwc1 $f0, 0x4c($v1) -/* 800CC4 80240444 3C048025 */ lui $a0, 0x8025 -/* 800CC8 80240448 24848420 */ addiu $a0, $a0, -0x7be0 -/* 800CCC 8024044C E7A0001C */ swc1 $f0, 0x1c($sp) -/* 800CD0 80240450 8C820000 */ lw $v0, ($a0) -/* 800CD4 80240454 C46A0050 */ lwc1 $f10, 0x50($v1) -/* 800CD8 80240458 3C013F80 */ lui $at, 0x3f80 -/* 800CDC 8024045C 44810000 */ mtc1 $at, $f0 -/* 800CE0 80240460 24420001 */ addiu $v0, $v0, 1 -/* 800CE4 80240464 AC820000 */ sw $v0, ($a0) -/* 800CE8 80240468 24020040 */ addiu $v0, $zero, 0x40 -/* 800CEC 8024046C 27A40050 */ addiu $a0, $sp, 0x50 -/* 800CF0 80240470 AFA00024 */ sw $zero, 0x24($sp) -/* 800CF4 80240474 E7A00028 */ swc1 $f0, 0x28($sp) -/* 800CF8 80240478 AFA0002C */ sw $zero, 0x2c($sp) -/* 800CFC 8024047C E7A60030 */ swc1 $f6, 0x30($sp) -/* 800D00 80240480 E7A20034 */ swc1 $f2, 0x34($sp) -/* 800D04 80240484 E7A40038 */ swc1 $f4, 0x38($sp) -/* 800D08 80240488 E7A8003C */ swc1 $f8, 0x3c($sp) -/* 800D0C 8024048C E7A20040 */ swc1 $f2, 0x40($sp) -/* 800D10 80240490 E7A40044 */ swc1 $f4, 0x44($sp) -/* 800D14 80240494 AFA20048 */ sw $v0, 0x48($sp) -/* 800D18 80240498 AFA2004C */ sw $v0, 0x4c($sp) -/* 800D1C 8024049C E7AA0020 */ swc1 $f10, 0x20($sp) -/* 800D20 802404A0 8E060000 */ lw $a2, ($s0) -/* 800D24 802404A4 8C67003C */ lw $a3, 0x3c($v1) -/* 800D28 802404A8 0C018A30 */ jal guLookAtHiliteF -/* 800D2C 802404AC 24C60020 */ addiu $a2, $a2, 0x20 -/* 800D30 802404B0 3C03DC08 */ lui $v1, 0xdc08 -/* 800D34 802404B4 3463000A */ ori $v1, $v1, 0xa -/* 800D38 802404B8 3C07DC08 */ lui $a3, 0xdc08 -/* 800D3C 802404BC 34E7030A */ ori $a3, $a3, 0x30a -/* 800D40 802404C0 3C0AD700 */ lui $t2, 0xd700 -/* 800D44 802404C4 354A0002 */ ori $t2, $t2, 2 -/* 800D48 802404C8 3C091000 */ lui $t1, 0x1000 -/* 800D4C 802404CC 35291000 */ ori $t1, $t1, 0x1000 -/* 800D50 802404D0 3C08D9FF */ lui $t0, 0xd9ff -/* 800D54 802404D4 3C06800A */ lui $a2, 0x800a -/* 800D58 802404D8 24C6A66C */ addiu $a2, $a2, -0x5994 -/* 800D5C 802404DC 3508FFFF */ ori $t0, $t0, 0xffff -/* 800D60 802404E0 8CC50000 */ lw $a1, ($a2) -/* 800D64 802404E4 8E040000 */ lw $a0, ($s0) -/* 800D68 802404E8 00A0102D */ daddu $v0, $a1, $zero -/* 800D6C 802404EC 24A50008 */ addiu $a1, $a1, 8 -/* 800D70 802404F0 ACC50000 */ sw $a1, ($a2) -/* 800D74 802404F4 AC430000 */ sw $v1, ($v0) -/* 800D78 802404F8 AC440004 */ sw $a0, 4($v0) -/* 800D7C 802404FC 24A20008 */ addiu $v0, $a1, 8 -/* 800D80 80240500 ACC20000 */ sw $v0, ($a2) -/* 800D84 80240504 24820010 */ addiu $v0, $a0, 0x10 -/* 800D88 80240508 24A30010 */ addiu $v1, $a1, 0x10 -/* 800D8C 8024050C ACA70000 */ sw $a3, ($a1) -/* 800D90 80240510 ACA20004 */ sw $v0, 4($a1) -/* 800D94 80240514 8C820020 */ lw $v0, 0x20($a0) -/* 800D98 80240518 3C07F200 */ lui $a3, 0xf200 -/* 800D9C 8024051C ACC30000 */ sw $v1, ($a2) -/* 800DA0 80240520 8C830024 */ lw $v1, 0x24($a0) -/* 800DA4 80240524 30420FFF */ andi $v0, $v0, 0xfff -/* 800DA8 80240528 00021300 */ sll $v0, $v0, 0xc -/* 800DAC 8024052C 30630FFF */ andi $v1, $v1, 0xfff -/* 800DB0 80240530 00671825 */ or $v1, $v1, $a3 -/* 800DB4 80240534 00431025 */ or $v0, $v0, $v1 -/* 800DB8 80240538 ACA20008 */ sw $v0, 8($a1) -/* 800DBC 8024053C 8C820020 */ lw $v0, 0x20($a0) -/* 800DC0 80240540 24A30018 */ addiu $v1, $a1, 0x18 -/* 800DC4 80240544 ACC30000 */ sw $v1, ($a2) -/* 800DC8 80240548 8C830024 */ lw $v1, 0x24($a0) -/* 800DCC 8024054C 244200FC */ addiu $v0, $v0, 0xfc -/* 800DD0 80240550 30420FFF */ andi $v0, $v0, 0xfff -/* 800DD4 80240554 00021300 */ sll $v0, $v0, 0xc -/* 800DD8 80240558 246300FC */ addiu $v1, $v1, 0xfc -/* 800DDC 8024055C 30630FFF */ andi $v1, $v1, 0xfff -/* 800DE0 80240560 00431025 */ or $v0, $v0, $v1 -/* 800DE4 80240564 ACA2000C */ sw $v0, 0xc($a1) -/* 800DE8 80240568 8C830028 */ lw $v1, 0x28($a0) -/* 800DEC 8024056C 24A20020 */ addiu $v0, $a1, 0x20 -/* 800DF0 80240570 ACC20000 */ sw $v0, ($a2) -/* 800DF4 80240574 8C82002C */ lw $v0, 0x2c($a0) -/* 800DF8 80240578 30630FFF */ andi $v1, $v1, 0xfff -/* 800DFC 8024057C 00031B00 */ sll $v1, $v1, 0xc -/* 800E00 80240580 30420FFF */ andi $v0, $v0, 0xfff -/* 800E04 80240584 00471025 */ or $v0, $v0, $a3 -/* 800E08 80240588 00621825 */ or $v1, $v1, $v0 -/* 800E0C 8024058C ACA30010 */ sw $v1, 0x10($a1) -/* 800E10 80240590 8C830028 */ lw $v1, 0x28($a0) -/* 800E14 80240594 8C84002C */ lw $a0, 0x2c($a0) -/* 800E18 80240598 24A20028 */ addiu $v0, $a1, 0x28 -/* 800E1C 8024059C ACC20000 */ sw $v0, ($a2) -/* 800E20 802405A0 3C020004 */ lui $v0, 4 -/* 800E24 802405A4 ACA20024 */ sw $v0, 0x24($a1) -/* 800E28 802405A8 3C020100 */ lui $v0, 0x100 -/* 800E2C 802405AC ACAA0018 */ sw $t2, 0x18($a1) -/* 800E30 802405B0 ACA9001C */ sw $t1, 0x1c($a1) -/* 800E34 802405B4 ACA80020 */ sw $t0, 0x20($a1) -/* 800E38 802405B8 246300FC */ addiu $v1, $v1, 0xfc -/* 800E3C 802405BC 30630FFF */ andi $v1, $v1, 0xfff -/* 800E40 802405C0 00031B00 */ sll $v1, $v1, 0xc -/* 800E44 802405C4 248400FC */ addiu $a0, $a0, 0xfc -/* 800E48 802405C8 30840FFF */ andi $a0, $a0, 0xfff -/* 800E4C 802405CC 00822025 */ or $a0, $a0, $v0 -/* 800E50 802405D0 00641825 */ or $v1, $v1, $a0 -/* 800E54 802405D4 ACA30014 */ sw $v1, 0x14($a1) -/* 800E58 802405D8 8FBF00B4 */ lw $ra, 0xb4($sp) -/* 800E5C 802405DC 8FB000B0 */ lw $s0, 0xb0($sp) -/* 800E60 802405E0 03E00008 */ jr $ra -/* 800E64 802405E4 27BD00B8 */ addiu $sp, $sp, 0xb8 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 new file mode 100644 index 0000000000..5b2041552f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802403C0_800C40.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403C0_800C40 +/* 800C40 802403C0 27BDFF48 */ addiu $sp, $sp, -0xb8 +/* 800C44 802403C4 3C028007 */ lui $v0, %hi(gCurrentCameraID) +/* 800C48 802403C8 8C427410 */ lw $v0, %lo(gCurrentCameraID)($v0) +/* 800C4C 802403CC 3C01C248 */ lui $at, 0xc248 +/* 800C50 802403D0 44813000 */ mtc1 $at, $f6 +/* 800C54 802403D4 3C01427C */ lui $at, 0x427c +/* 800C58 802403D8 44811000 */ mtc1 $at, $f2 +/* 800C5C 802403DC 3C0142BE */ lui $at, 0x42be +/* 800C60 802403E0 44812000 */ mtc1 $at, $f4 +/* 800C64 802403E4 3C0141F8 */ lui $at, 0x41f8 +/* 800C68 802403E8 44814000 */ mtc1 $at, $f8 +/* 800C6C 802403EC 3C04800B */ lui $a0, %hi(gCameras) +/* 800C70 802403F0 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* 800C74 802403F4 AFBF00B4 */ sw $ra, 0xb4($sp) +/* 800C78 802403F8 AFB000B0 */ sw $s0, 0xb0($sp) +/* 800C7C 802403FC 00021880 */ sll $v1, $v0, 2 +/* 800C80 80240400 00621821 */ addu $v1, $v1, $v0 +/* 800C84 80240404 00031880 */ sll $v1, $v1, 2 +/* 800C88 80240408 00621823 */ subu $v1, $v1, $v0 +/* 800C8C 8024040C 000310C0 */ sll $v0, $v1, 3 +/* 800C90 80240410 00621821 */ addu $v1, $v1, $v0 +/* 800C94 80240414 000318C0 */ sll $v1, $v1, 3 +/* 800C98 80240418 00641821 */ addu $v1, $v1, $a0 +/* 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, 0x800a +/* 800CAC 8024042C 2610A674 */ addiu $s0, $s0, -0x598c +/* 800CB0 80240430 E7A00014 */ swc1 $f0, 0x14($sp) +/* 800CB4 80240434 C4600048 */ lwc1 $f0, 0x48($v1) +/* 800CB8 80240438 27A50090 */ addiu $a1, $sp, 0x90 +/* 800CBC 8024043C E7A00018 */ swc1 $f0, 0x18($sp) +/* 800CC0 80240440 C460004C */ lwc1 $f0, 0x4c($v1) +/* 800CC4 80240444 3C048025 */ lui $a0, 0x8025 +/* 800CC8 80240448 24848420 */ addiu $a0, $a0, -0x7be0 +/* 800CCC 8024044C E7A0001C */ swc1 $f0, 0x1c($sp) +/* 800CD0 80240450 8C820000 */ lw $v0, ($a0) +/* 800CD4 80240454 C46A0050 */ lwc1 $f10, 0x50($v1) +/* 800CD8 80240458 3C013F80 */ lui $at, 0x3f80 +/* 800CDC 8024045C 44810000 */ mtc1 $at, $f0 +/* 800CE0 80240460 24420001 */ addiu $v0, $v0, 1 +/* 800CE4 80240464 AC820000 */ sw $v0, ($a0) +/* 800CE8 80240468 24020040 */ addiu $v0, $zero, 0x40 +/* 800CEC 8024046C 27A40050 */ addiu $a0, $sp, 0x50 +/* 800CF0 80240470 AFA00024 */ sw $zero, 0x24($sp) +/* 800CF4 80240474 E7A00028 */ swc1 $f0, 0x28($sp) +/* 800CF8 80240478 AFA0002C */ sw $zero, 0x2c($sp) +/* 800CFC 8024047C E7A60030 */ swc1 $f6, 0x30($sp) +/* 800D00 80240480 E7A20034 */ swc1 $f2, 0x34($sp) +/* 800D04 80240484 E7A40038 */ swc1 $f4, 0x38($sp) +/* 800D08 80240488 E7A8003C */ swc1 $f8, 0x3c($sp) +/* 800D0C 8024048C E7A20040 */ swc1 $f2, 0x40($sp) +/* 800D10 80240490 E7A40044 */ swc1 $f4, 0x44($sp) +/* 800D14 80240494 AFA20048 */ sw $v0, 0x48($sp) +/* 800D18 80240498 AFA2004C */ sw $v0, 0x4c($sp) +/* 800D1C 8024049C E7AA0020 */ swc1 $f10, 0x20($sp) +/* 800D20 802404A0 8E060000 */ lw $a2, ($s0) +/* 800D24 802404A4 8C67003C */ lw $a3, 0x3c($v1) +/* 800D28 802404A8 0C018A30 */ jal guLookAtHiliteF +/* 800D2C 802404AC 24C60020 */ addiu $a2, $a2, 0x20 +/* 800D30 802404B0 3C03DC08 */ lui $v1, 0xdc08 +/* 800D34 802404B4 3463000A */ ori $v1, $v1, 0xa +/* 800D38 802404B8 3C07DC08 */ lui $a3, 0xdc08 +/* 800D3C 802404BC 34E7030A */ ori $a3, $a3, 0x30a +/* 800D40 802404C0 3C0AD700 */ lui $t2, 0xd700 +/* 800D44 802404C4 354A0002 */ ori $t2, $t2, 2 +/* 800D48 802404C8 3C091000 */ lui $t1, 0x1000 +/* 800D4C 802404CC 35291000 */ ori $t1, $t1, 0x1000 +/* 800D50 802404D0 3C08D9FF */ lui $t0, 0xd9ff +/* 800D54 802404D4 3C06800A */ lui $a2, 0x800a +/* 800D58 802404D8 24C6A66C */ addiu $a2, $a2, -0x5994 +/* 800D5C 802404DC 3508FFFF */ ori $t0, $t0, 0xffff +/* 800D60 802404E0 8CC50000 */ lw $a1, ($a2) +/* 800D64 802404E4 8E040000 */ lw $a0, ($s0) +/* 800D68 802404E8 00A0102D */ daddu $v0, $a1, $zero +/* 800D6C 802404EC 24A50008 */ addiu $a1, $a1, 8 +/* 800D70 802404F0 ACC50000 */ sw $a1, ($a2) +/* 800D74 802404F4 AC430000 */ sw $v1, ($v0) +/* 800D78 802404F8 AC440004 */ sw $a0, 4($v0) +/* 800D7C 802404FC 24A20008 */ addiu $v0, $a1, 8 +/* 800D80 80240500 ACC20000 */ sw $v0, ($a2) +/* 800D84 80240504 24820010 */ addiu $v0, $a0, 0x10 +/* 800D88 80240508 24A30010 */ addiu $v1, $a1, 0x10 +/* 800D8C 8024050C ACA70000 */ sw $a3, ($a1) +/* 800D90 80240510 ACA20004 */ sw $v0, 4($a1) +/* 800D94 80240514 8C820020 */ lw $v0, 0x20($a0) +/* 800D98 80240518 3C07F200 */ lui $a3, 0xf200 +/* 800D9C 8024051C ACC30000 */ sw $v1, ($a2) +/* 800DA0 80240520 8C830024 */ lw $v1, 0x24($a0) +/* 800DA4 80240524 30420FFF */ andi $v0, $v0, 0xfff +/* 800DA8 80240528 00021300 */ sll $v0, $v0, 0xc +/* 800DAC 8024052C 30630FFF */ andi $v1, $v1, 0xfff +/* 800DB0 80240530 00671825 */ or $v1, $v1, $a3 +/* 800DB4 80240534 00431025 */ or $v0, $v0, $v1 +/* 800DB8 80240538 ACA20008 */ sw $v0, 8($a1) +/* 800DBC 8024053C 8C820020 */ lw $v0, 0x20($a0) +/* 800DC0 80240540 24A30018 */ addiu $v1, $a1, 0x18 +/* 800DC4 80240544 ACC30000 */ sw $v1, ($a2) +/* 800DC8 80240548 8C830024 */ lw $v1, 0x24($a0) +/* 800DCC 8024054C 244200FC */ addiu $v0, $v0, 0xfc +/* 800DD0 80240550 30420FFF */ andi $v0, $v0, 0xfff +/* 800DD4 80240554 00021300 */ sll $v0, $v0, 0xc +/* 800DD8 80240558 246300FC */ addiu $v1, $v1, 0xfc +/* 800DDC 8024055C 30630FFF */ andi $v1, $v1, 0xfff +/* 800DE0 80240560 00431025 */ or $v0, $v0, $v1 +/* 800DE4 80240564 ACA2000C */ sw $v0, 0xc($a1) +/* 800DE8 80240568 8C830028 */ lw $v1, 0x28($a0) +/* 800DEC 8024056C 24A20020 */ addiu $v0, $a1, 0x20 +/* 800DF0 80240570 ACC20000 */ sw $v0, ($a2) +/* 800DF4 80240574 8C82002C */ lw $v0, 0x2c($a0) +/* 800DF8 80240578 30630FFF */ andi $v1, $v1, 0xfff +/* 800DFC 8024057C 00031B00 */ sll $v1, $v1, 0xc +/* 800E00 80240580 30420FFF */ andi $v0, $v0, 0xfff +/* 800E04 80240584 00471025 */ or $v0, $v0, $a3 +/* 800E08 80240588 00621825 */ or $v1, $v1, $v0 +/* 800E0C 8024058C ACA30010 */ sw $v1, 0x10($a1) +/* 800E10 80240590 8C830028 */ lw $v1, 0x28($a0) +/* 800E14 80240594 8C84002C */ lw $a0, 0x2c($a0) +/* 800E18 80240598 24A20028 */ addiu $v0, $a1, 0x28 +/* 800E1C 8024059C ACC20000 */ sw $v0, ($a2) +/* 800E20 802405A0 3C020004 */ lui $v0, 4 +/* 800E24 802405A4 ACA20024 */ sw $v0, 0x24($a1) +/* 800E28 802405A8 3C020100 */ lui $v0, 0x100 +/* 800E2C 802405AC ACAA0018 */ sw $t2, 0x18($a1) +/* 800E30 802405B0 ACA9001C */ sw $t1, 0x1c($a1) +/* 800E34 802405B4 ACA80020 */ sw $t0, 0x20($a1) +/* 800E38 802405B8 246300FC */ addiu $v1, $v1, 0xfc +/* 800E3C 802405BC 30630FFF */ andi $v1, $v1, 0xfff +/* 800E40 802405C0 00031B00 */ sll $v1, $v1, 0xc +/* 800E44 802405C4 248400FC */ addiu $a0, $a0, 0xfc +/* 800E48 802405C8 30840FFF */ andi $a0, $a0, 0xfff +/* 800E4C 802405CC 00822025 */ or $a0, $a0, $v0 +/* 800E50 802405D0 00641825 */ or $v1, $v1, $a0 +/* 800E54 802405D4 ACA30014 */ sw $v1, 0x14($a1) +/* 800E58 802405D8 8FBF00B4 */ lw $ra, 0xb4($sp) +/* 800E5C 802405DC 8FB000B0 */ lw $s0, 0xb0($sp) +/* 800E60 802405E0 03E00008 */ jr $ra +/* 800E64 802405E4 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8.s b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8.s deleted file mode 100644 index 2eb58860f7..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E8 -/* 800E68 802405E8 3C05D9FB */ lui $a1, 0xd9fb -/* 800E6C 802405EC 3C04800A */ lui $a0, 0x800a -/* 800E70 802405F0 2484A66C */ addiu $a0, $a0, -0x5994 -/* 800E74 802405F4 8C820000 */ lw $v0, ($a0) -/* 800E78 802405F8 34A5FFFF */ ori $a1, $a1, 0xffff -/* 800E7C 802405FC 0040182D */ daddu $v1, $v0, $zero -/* 800E80 80240600 24420008 */ addiu $v0, $v0, 8 -/* 800E84 80240604 AC820000 */ sw $v0, ($a0) -/* 800E88 80240608 AC650000 */ sw $a1, ($v1) -/* 800E8C 8024060C AC600004 */ sw $zero, 4($v1) -/* 800E90 80240610 24430008 */ addiu $v1, $v0, 8 -/* 800E94 80240614 AC830000 */ sw $v1, ($a0) -/* 800E98 80240618 3C03DF00 */ lui $v1, 0xdf00 -/* 800E9C 8024061C AC430000 */ sw $v1, ($v0) -/* 800EA0 80240620 03E00008 */ jr $ra -/* 800EA4 80240624 AC400004 */ sw $zero, 4($v0) 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 new file mode 100644 index 0000000000..50e9e95e5b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_802405E8_800E68.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405E8_800E68 +/* 800E68 802405E8 3C05D9FB */ lui $a1, 0xd9fb +/* 800E6C 802405EC 3C04800A */ lui $a0, 0x800a +/* 800E70 802405F0 2484A66C */ addiu $a0, $a0, -0x5994 +/* 800E74 802405F4 8C820000 */ lw $v0, ($a0) +/* 800E78 802405F8 34A5FFFF */ ori $a1, $a1, 0xffff +/* 800E7C 802405FC 0040182D */ daddu $v1, $v0, $zero +/* 800E80 80240600 24420008 */ addiu $v0, $v0, 8 +/* 800E84 80240604 AC820000 */ sw $v0, ($a0) +/* 800E88 80240608 AC650000 */ sw $a1, ($v1) +/* 800E8C 8024060C AC600004 */ sw $zero, 4($v1) +/* 800E90 80240610 24430008 */ addiu $v1, $v0, 8 +/* 800E94 80240614 AC830000 */ sw $v1, ($a0) +/* 800E98 80240618 3C03DF00 */ lui $v1, 0xdf00 +/* 800E9C 8024061C AC430000 */ sw $v1, ($v0) +/* 800EA0 80240620 03E00008 */ jr $ra +/* 800EA4 80240624 AC400004 */ sw $zero, 4($v0) diff --git a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628.s b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628.s deleted file mode 100644 index bd419a1b75..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628.s +++ /dev/null @@ -1,557 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240628 -/* 800EA8 80240628 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 800EAC 8024062C 2404002F */ addiu $a0, $zero, 0x2f -/* 800EB0 80240630 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 800EB4 80240634 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 800EB8 80240638 3C05800B */ lui $a1, %hi(gCameras) -/* 800EBC 8024063C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 800EC0 80240640 AFBF005C */ sw $ra, 0x5c($sp) -/* 800EC4 80240644 AFBE0058 */ sw $fp, 0x58($sp) -/* 800EC8 80240648 AFB70054 */ sw $s7, 0x54($sp) -/* 800ECC 8024064C AFB60050 */ sw $s6, 0x50($sp) -/* 800ED0 80240650 AFB5004C */ sw $s5, 0x4c($sp) -/* 800ED4 80240654 AFB40048 */ sw $s4, 0x48($sp) -/* 800ED8 80240658 AFB30044 */ sw $s3, 0x44($sp) -/* 800EDC 8024065C AFB20040 */ sw $s2, 0x40($sp) -/* 800EE0 80240660 AFB1003C */ sw $s1, 0x3c($sp) -/* 800EE4 80240664 AFB00038 */ sw $s0, 0x38($sp) -/* 800EE8 80240668 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 800EEC 8024066C F7B40060 */ sdc1 $f20, 0x60($sp) -/* 800EF0 80240670 00031080 */ sll $v0, $v1, 2 -/* 800EF4 80240674 00431021 */ addu $v0, $v0, $v1 -/* 800EF8 80240678 00021080 */ sll $v0, $v0, 2 -/* 800EFC 8024067C 00431023 */ subu $v0, $v0, $v1 -/* 800F00 80240680 000218C0 */ sll $v1, $v0, 3 -/* 800F04 80240684 00431021 */ addu $v0, $v0, $v1 -/* 800F08 80240688 000210C0 */ sll $v0, $v0, 3 -/* 800F0C 8024068C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 800F10 80240690 00458021 */ addu $s0, $v0, $a1 -/* 800F14 80240694 0C046B4C */ jal get_model_from_list_index -/* 800F18 80240698 0040202D */ daddu $a0, $v0, $zero -/* 800F1C 8024069C 27A30028 */ addiu $v1, $sp, 0x28 -/* 800F20 802406A0 AFA30014 */ sw $v1, 0x14($sp) -/* 800F24 802406A4 27A3002C */ addiu $v1, $sp, 0x2c -/* 800F28 802406A8 AFA30018 */ sw $v1, 0x18($sp) -/* 800F2C 802406AC 27A30030 */ addiu $v1, $sp, 0x30 -/* 800F30 802406B0 AFA3001C */ sw $v1, 0x1c($sp) -/* 800F34 802406B4 27A30034 */ addiu $v1, $sp, 0x34 -/* 800F38 802406B8 3C013F80 */ lui $at, 0x3f80 -/* 800F3C 802406BC 4481A000 */ mtc1 $at, $f20 -/* 800F40 802406C0 0040A82D */ daddu $s5, $v0, $zero -/* 800F44 802406C4 AFA30020 */ sw $v1, 0x20($sp) -/* 800F48 802406C8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 800F4C 802406CC 8EA50098 */ lw $a1, 0x98($s5) -/* 800F50 802406D0 8EA6009C */ lw $a2, 0x9c($s5) -/* 800F54 802406D4 8EA700A0 */ lw $a3, 0xa0($s5) -/* 800F58 802406D8 0C00A588 */ jal transform_point -/* 800F5C 802406DC 260400D4 */ addiu $a0, $s0, 0xd4 -/* 800F60 802406E0 C7A40034 */ lwc1 $f4, 0x34($sp) -/* 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 -/* 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 -/* 800F90 80240710 C7A20028 */ lwc1 $f2, 0x28($sp) -/* 800F94 80240714 46041282 */ mul.s $f10, $f2, $f4 -/* 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 -/* 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 -/* 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 -/* 800FDC 8024075C 468010A0 */ cvt.s.w $f2, $f2 -/* 800FE0 80240760 46025002 */ mul.s $f0, $f10, $f2 -/* 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 -/* 800FF8 80240778 46040502 */ mul.s $f20, $f0, $f4 -/* 800FFC 8024077C 00000000 */ nop -/* 801000 80240780 8604000C */ lh $a0, 0xc($s0) -/* 801004 80240784 44841000 */ mtc1 $a0, $f2 -/* 801008 80240788 00000000 */ nop -/* 80100C 8024078C 468010A0 */ cvt.s.w $f2, $f2 -/* 801010 80240790 46023002 */ mul.s $f0, $f6, $f2 -/* 801014 80240794 00000000 */ nop -/* 801018 80240798 46020000 */ add.s $f0, $f0, $f2 -/* 80101C 8024079C 46040582 */ mul.s $f22, $f0, $f4 -/* 801020 802407A0 00000000 */ nop -/* 801024 802407A4 4600A086 */ mov.s $f2, $f20 -/* 801028 802407A8 4608A03C */ c.lt.s $f20, $f8 -/* 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 -/* 801048 802407C8 4600103C */ c.lt.s $f2, $f0 -/* 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 -/* 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 -/* 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 -/* 801084 80240804 46800020 */ cvt.s.w $f0, $f0 -/* 801088 80240808 4614003E */ c.le.s $f0, $f20 -/* 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 -/* 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 -/* 8010B0 80240830 46800020 */ cvt.s.w $f0, $f0 -/* 8010B4 80240834 4616003E */ c.le.s $f0, $f22 -/* 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 -/* 8010CC 8024084C 4680B5A0 */ cvt.s.w $f22, $f22 -.L80240850: -/* 8010D0 80240850 3C05E300 */ lui $a1, 0xe300 -/* 8010D4 80240854 34A50A01 */ ori $a1, $a1, 0xa01 -/* 8010D8 80240858 3C13E200 */ lui $s3, 0xe200 -/* 8010DC 8024085C 3673001C */ ori $s3, $s3, 0x1c -/* 8010E0 80240860 3C060F0A */ lui $a2, 0xf0a -/* 8010E4 80240864 34C64010 */ ori $a2, $a2, 0x4010 -/* 8010E8 80240868 3C12FF10 */ lui $s2, 0xff10 -/* 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, 0x800a -/* 8010FC 8024087C 2694A66C */ addiu $s4, $s4, -0x5994 -/* 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 -/* 801118 80240898 46800020 */ cvt.s.w $f0, $f0 -/* 80111C 8024089C 0220182D */ daddu $v1, $s1, $zero -/* 801120 802408A0 26310008 */ addiu $s1, $s1, 8 -/* 801124 802408A4 86020010 */ lh $v0, 0x10($s0) -/* 801128 802408A8 4600A500 */ add.s $f20, $f20, $f0 -/* 80112C 802408AC AE910000 */ sw $s1, ($s4) -/* 801130 802408B0 AC650000 */ sw $a1, ($v1) -/* 801134 802408B4 AC600004 */ sw $zero, 4($v1) -/* 801138 802408B8 44820000 */ mtc1 $v0, $f0 -/* 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) -/* 80114C 802408CC 26220010 */ addiu $v0, $s1, 0x10 -/* 801150 802408D0 4600B580 */ add.s $f22, $f22, $f0 -/* 801154 802408D4 AE330000 */ sw $s3, ($s1) -/* 801158 802408D8 AE260004 */ sw $a2, 4($s1) -/* 80115C 802408DC AE820000 */ sw $v0, ($s4) -/* 801160 802408E0 0C0187A4 */ jal osVirtualToPhysical -/* 801164 802408E4 AE320008 */ sw $s2, 8($s1) -/* 801168 802408E8 3C03FFFD */ lui $v1, 0xfffd -/* 80116C 802408EC 3463FEFF */ ori $v1, $v1, 0xfeff -/* 801170 802408F0 3C05F8F0 */ lui $a1, 0xf8f0 -/* 801174 802408F4 3C1E800A */ lui $fp, 0x800a -/* 801178 802408F8 27DEA64C */ addiu $fp, $fp, -0x59b4 -/* 80117C 802408FC 34A5F000 */ ori $a1, $a1, 0xf000 -/* 801180 80240900 8E900000 */ lw $s0, ($s4) -/* 801184 80240904 8FC40000 */ lw $a0, ($fp) -/* 801188 80240908 3C16E700 */ lui $s6, 0xe700 -/* 80118C 8024090C AE22000C */ sw $v0, 0xc($s1) -/* 801190 80240910 0200102D */ daddu $v0, $s0, $zero -/* 801194 80240914 26100008 */ addiu $s0, $s0, 8 -/* 801198 80240918 AE900000 */ sw $s0, ($s4) -/* 80119C 8024091C AC570000 */ sw $s7, ($v0) -/* 8011A0 80240920 AC430004 */ sw $v1, 4($v0) -/* 8011A4 80240924 26020008 */ addiu $v0, $s0, 8 -/* 8011A8 80240928 AE820000 */ sw $v0, ($s4) -/* 8011AC 8024092C 3C02FA00 */ lui $v0, 0xfa00 -/* 8011B0 80240930 AE020000 */ sw $v0, ($s0) -/* 8011B4 80240934 26020010 */ addiu $v0, $s0, 0x10 -/* 8011B8 80240938 AE050004 */ sw $a1, 4($s0) -/* 8011BC 8024093C AE820000 */ sw $v0, ($s4) -/* 8011C0 80240940 3C02DE00 */ lui $v0, 0xde00 -/* 8011C4 80240944 AE160008 */ sw $s6, 8($s0) -/* 8011C8 80240948 AE00000C */ sw $zero, 0xc($s0) -/* 8011CC 8024094C AE020010 */ sw $v0, 0x10($s0) -/* 8011D0 80240950 8EA30008 */ lw $v1, 8($s5) -/* 8011D4 80240954 26020018 */ addiu $v0, $s0, 0x18 -/* 8011D8 80240958 AE820000 */ sw $v0, ($s4) -/* 8011DC 8024095C 8C630004 */ lw $v1, 4($v1) -/* 8011E0 80240960 26020020 */ addiu $v0, $s0, 0x20 -/* 8011E4 80240964 AE820000 */ sw $v0, ($s4) -/* 8011E8 80240968 8C630000 */ lw $v1, ($v1) -/* 8011EC 8024096C 26020028 */ addiu $v0, $s0, 0x28 -/* 8011F0 80240970 AE820000 */ sw $v0, ($s4) -/* 8011F4 80240974 AE160018 */ sw $s6, 0x18($s0) -/* 8011F8 80240978 AE00001C */ sw $zero, 0x1c($s0) -/* 8011FC 8024097C AE120020 */ sw $s2, 0x20($s0) -/* 801200 80240980 0C0187A4 */ jal osVirtualToPhysical -/* 801204 80240984 AE030014 */ sw $v1, 0x14($s0) -/* 801208 80240988 3C04E200 */ lui $a0, 0xe200 -/* 80120C 8024098C 34841D00 */ ori $a0, $a0, 0x1d00 -/* 801210 80240990 3C050055 */ lui $a1, 0x55 -/* 801214 80240994 34A52E10 */ ori $a1, $a1, 0x2e10 -/* 801218 80240998 3C06E300 */ lui $a2, 0xe300 -/* 80121C 8024099C 34C61201 */ ori $a2, $a2, 0x1201 -/* 801220 802409A0 3C07E300 */ lui $a3, 0xe300 -/* 801224 802409A4 34E70C00 */ ori $a3, $a3, 0xc00 -/* 801228 802409A8 3C08D700 */ lui $t0, 0xd700 -/* 80122C 802409AC 35080002 */ ori $t0, $t0, 2 -/* 801230 802409B0 3C09E300 */ lui $t1, 0xe300 -/* 801234 802409B4 35291001 */ ori $t1, $t1, 0x1001 -/* 801238 802409B8 3C0AE300 */ lui $t2, 0xe300 -/* 80123C 802409BC 354A0D01 */ ori $t2, $t2, 0xd01 -/* 801240 802409C0 3C0BE300 */ lui $t3, 0xe300 -/* 801244 802409C4 8E910000 */ lw $s1, ($s4) -/* 801248 802409C8 356B0F00 */ ori $t3, $t3, 0xf00 -/* 80124C 802409CC AE020024 */ sw $v0, 0x24($s0) -/* 801250 802409D0 24020004 */ addiu $v0, $zero, 4 -/* 801254 802409D4 3C013D00 */ lui $at, 0x3d00 -/* 801258 802409D8 44810000 */ mtc1 $at, $f0 -/* 80125C 802409DC 3C014200 */ lui $at, 0x4200 -/* 801260 802409E0 44811000 */ mtc1 $at, $f2 -/* 801264 802409E4 0220182D */ daddu $v1, $s1, $zero -/* 801268 802409E8 26310008 */ addiu $s1, $s1, 8 -/* 80126C 802409EC AE910000 */ sw $s1, ($s4) -/* 801270 802409F0 AC620004 */ sw $v0, 4($v1) -/* 801274 802409F4 26220008 */ addiu $v0, $s1, 8 -/* 801278 802409F8 AC640000 */ sw $a0, ($v1) -/* 80127C 802409FC AE820000 */ sw $v0, ($s4) -/* 801280 80240A00 3C02EE00 */ lui $v0, 0xee00 -/* 801284 80240A04 AE220000 */ sw $v0, ($s1) -/* 801288 80240A08 3C027FDE */ lui $v0, 0x7fde -/* 80128C 80240A0C AE220004 */ sw $v0, 4($s1) -/* 801290 80240A10 26220010 */ addiu $v0, $s1, 0x10 -/* 801294 80240A14 AE820000 */ sw $v0, ($s4) -/* 801298 80240A18 26220018 */ addiu $v0, $s1, 0x18 -/* 80129C 80240A1C AE330008 */ sw $s3, 8($s1) -/* 8012A0 80240A20 AE25000C */ sw $a1, 0xc($s1) -/* 8012A4 80240A24 AE820000 */ sw $v0, ($s4) -/* 8012A8 80240A28 26220020 */ addiu $v0, $s1, 0x20 -/* 8012AC 80240A2C AE260010 */ sw $a2, 0x10($s1) -/* 8012B0 80240A30 AE200014 */ sw $zero, 0x14($s1) -/* 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 -/* 8012C4 80240A44 AE270018 */ sw $a3, 0x18($s1) -/* 8012C8 80240A48 AE20001C */ sw $zero, 0x1c($s1) -/* 8012CC 80240A4C AE820000 */ sw $v0, ($s4) -/* 8012D0 80240A50 2402FFFF */ addiu $v0, $zero, -1 -/* 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 -/* 8012E4 80240A64 AE280020 */ sw $t0, 0x20($s1) -/* 8012E8 80240A68 AE820000 */ sw $v0, ($s4) -/* 8012EC 80240A6C 26220038 */ addiu $v0, $s1, 0x38 -/* 8012F0 80240A70 AE290028 */ sw $t1, 0x28($s1) -/* 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 -/* 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 -/* 80131C 80240A9C 3C014100 */ lui $at, 0x4100 -/* 801320 80240AA0 44811000 */ mtc1 $at, $f2 -/* 801324 80240AA4 26220048 */ addiu $v0, $s1, 0x48 -/* 801328 80240AA8 AE2B0038 */ sw $t3, 0x38($s1) -/* 80132C 80240AAC AE20003C */ sw $zero, 0x3c($s1) -/* 801330 80240AB0 46022101 */ sub.s $f4, $f4, $f2 -/* 801334 80240AB4 AE820000 */ sw $v0, ($s4) -/* 801338 80240AB8 AE360040 */ sw $s6, 0x40($s1) -/* 80133C 80240ABC 46020001 */ sub.s $f0, $f0, $f2 -/* 801340 80240AC0 4600230D */ trunc.w.s $f12, $f4 -/* 801344 80240AC4 44106000 */ mfc1 $s0, $f12 -/* 801348 80240AC8 4600030D */ trunc.w.s $f12, $f0 -/* 80134C 80240ACC 44126000 */ mfc1 $s2, $f12 -/* 801350 80240AD0 060000AF */ bltz $s0, .L80240D90 -/* 801354 80240AD4 AE200044 */ sw $zero, 0x44($s1) -/* 801358 80240AD8 064000AD */ bltz $s2, .L80240D90 -/* 80135C 80240ADC 26020028 */ addiu $v0, $s0, 0x28 -/* 801360 80240AE0 28420140 */ slti $v0, $v0, 0x140 -/* 801364 80240AE4 104000AA */ beqz $v0, .L80240D90 -/* 801368 80240AE8 26420028 */ addiu $v0, $s2, 0x28 -/* 80136C 80240AEC 284200F0 */ slti $v0, $v0, 0xf0 -/* 801370 80240AF0 104000A7 */ beqz $v0, .L80240D90 -/* 801374 80240AF4 3C03FD10 */ lui $v1, 0xfd10 -/* 801378 80240AF8 3463013F */ ori $v1, $v1, 0x13f -/* 80137C 80240AFC 8FC40000 */ lw $a0, ($fp) -/* 801380 80240B00 26220050 */ addiu $v0, $s1, 0x50 -/* 801384 80240B04 AE820000 */ sw $v0, ($s4) -/* 801388 80240B08 0C0187A4 */ jal osVirtualToPhysical -/* 80138C 80240B0C AE230048 */ sw $v1, 0x48($s1) -/* 801390 80240B10 3C08F510 */ lui $t0, 0xf510 -/* 801394 80240B14 35081000 */ ori $t0, $t0, 0x1000 -/* 801398 80240B18 3C040701 */ lui $a0, 0x701 -/* 80139C 80240B1C 34844050 */ ori $a0, $a0, 0x4050 -/* 8013A0 80240B20 3C090001 */ lui $t1, 1 -/* 8013A4 80240B24 35294050 */ ori $t1, $t1, 0x4050 -/* 8013A8 80240B28 3C0AFFFC */ lui $t2, 0xfffc -/* 8013AC 80240B2C 354AFE7F */ ori $t2, $t2, 0xfe7f -/* 8013B0 80240B30 00102880 */ sll $a1, $s0, 2 -/* 8013B4 80240B34 30A50FFF */ andi $a1, $a1, 0xfff -/* 8013B8 80240B38 00052B00 */ sll $a1, $a1, 0xc -/* 8013BC 80240B3C 00123880 */ sll $a3, $s2, 2 -/* 8013C0 80240B40 30E70FFF */ andi $a3, $a3, 0xfff -/* 8013C4 80240B44 2646001F */ addiu $a2, $s2, 0x1f -/* 8013C8 80240B48 00063080 */ sll $a2, $a2, 2 -/* 8013CC 80240B4C 8E830000 */ lw $v1, ($s4) -/* 8013D0 80240B50 30C60FFF */ andi $a2, $a2, 0xfff -/* 8013D4 80240B54 AE22004C */ sw $v0, 0x4c($s1) -/* 8013D8 80240B58 0060102D */ daddu $v0, $v1, $zero -/* 8013DC 80240B5C 24630008 */ addiu $v1, $v1, 8 -/* 8013E0 80240B60 AE830000 */ sw $v1, ($s4) -/* 8013E4 80240B64 AC480000 */ sw $t0, ($v0) -/* 8013E8 80240B68 AC440004 */ sw $a0, 4($v0) -/* 8013EC 80240B6C 24620008 */ addiu $v0, $v1, 8 -/* 8013F0 80240B70 AE820000 */ sw $v0, ($s4) -/* 8013F4 80240B74 3C02E600 */ lui $v0, 0xe600 -/* 8013F8 80240B78 AC620000 */ sw $v0, ($v1) -/* 8013FC 80240B7C 24620010 */ addiu $v0, $v1, 0x10 -/* 801400 80240B80 AC600004 */ sw $zero, 4($v1) -/* 801404 80240B84 AE820000 */ sw $v0, ($s4) -/* 801408 80240B88 3C02F400 */ lui $v0, 0xf400 -/* 80140C 80240B8C 00E21025 */ or $v0, $a3, $v0 -/* 801410 80240B90 00A21025 */ or $v0, $a1, $v0 -/* 801414 80240B94 2604001F */ addiu $a0, $s0, 0x1f -/* 801418 80240B98 00042080 */ sll $a0, $a0, 2 -/* 80141C 80240B9C 30840FFF */ andi $a0, $a0, 0xfff -/* 801420 80240BA0 00042300 */ sll $a0, $a0, 0xc -/* 801424 80240BA4 AC620008 */ sw $v0, 8($v1) -/* 801428 80240BA8 3C020700 */ lui $v0, 0x700 -/* 80142C 80240BAC 00C21025 */ or $v0, $a2, $v0 -/* 801430 80240BB0 00821025 */ or $v0, $a0, $v0 -/* 801434 80240BB4 AC62000C */ sw $v0, 0xc($v1) -/* 801438 80240BB8 24620018 */ addiu $v0, $v1, 0x18 -/* 80143C 80240BBC AE820000 */ sw $v0, ($s4) -/* 801440 80240BC0 24620020 */ addiu $v0, $v1, 0x20 -/* 801444 80240BC4 AC760010 */ sw $s6, 0x10($v1) -/* 801448 80240BC8 AC600014 */ sw $zero, 0x14($v1) -/* 80144C 80240BCC AE820000 */ sw $v0, ($s4) -/* 801450 80240BD0 24620028 */ addiu $v0, $v1, 0x28 -/* 801454 80240BD4 AC680018 */ sw $t0, 0x18($v1) -/* 801458 80240BD8 AC69001C */ sw $t1, 0x1c($v1) -/* 80145C 80240BDC AE820000 */ sw $v0, ($s4) -/* 801460 80240BE0 3C02F200 */ lui $v0, 0xf200 -/* 801464 80240BE4 00E23825 */ or $a3, $a3, $v0 -/* 801468 80240BE8 00A72825 */ or $a1, $a1, $a3 -/* 80146C 80240BEC 00862025 */ or $a0, $a0, $a2 -/* 801470 80240BF0 24620030 */ addiu $v0, $v1, 0x30 -/* 801474 80240BF4 AC650020 */ sw $a1, 0x20($v1) -/* 801478 80240BF8 AC640024 */ sw $a0, 0x24($v1) -/* 80147C 80240BFC AE820000 */ sw $v0, ($s4) -/* 801480 80240C00 AC770028 */ sw $s7, 0x28($v1) -/* 801484 80240C04 AC6A002C */ sw $t2, 0x2c($v1) -/* 801488 80240C08 24630038 */ addiu $v1, $v1, 0x38 -/* 80148C 80240C0C 0040202D */ daddu $a0, $v0, $zero -/* 801490 80240C10 26020018 */ addiu $v0, $s0, 0x18 -/* 801494 80240C14 00021480 */ sll $v0, $v0, 0x12 -/* 801498 80240C18 00021403 */ sra $v0, $v0, 0x10 -/* 80149C 80240C1C 18400006 */ blez $v0, .L80240C38 -/* 8014A0 80240C20 AE830000 */ sw $v1, ($s4) -/* 8014A4 80240C24 30420FFF */ andi $v0, $v0, 0xfff -/* 8014A8 80240C28 00021300 */ sll $v0, $v0, 0xc -/* 8014AC 80240C2C 3C03E400 */ lui $v1, 0xe400 -/* 8014B0 80240C30 0809030F */ j .L80240C3C -/* 8014B4 80240C34 00431825 */ or $v1, $v0, $v1 -.L80240C38: -/* 8014B8 80240C38 3C03E400 */ lui $v1, 0xe400 -.L80240C3C: -/* 8014BC 80240C3C 26420018 */ addiu $v0, $s2, 0x18 -/* 8014C0 80240C40 00021480 */ sll $v0, $v0, 0x12 -/* 8014C4 80240C44 00021403 */ sra $v0, $v0, 0x10 -/* 8014C8 80240C48 18400004 */ blez $v0, .L80240C5C -/* 8014CC 80240C4C AC830000 */ sw $v1, ($a0) -/* 8014D0 80240C50 30420FFF */ andi $v0, $v0, 0xfff -/* 8014D4 80240C54 00621025 */ or $v0, $v1, $v0 -/* 8014D8 80240C58 AC820000 */ sw $v0, ($a0) -.L80240C5C: -/* 8014DC 80240C5C 2602FFF8 */ addiu $v0, $s0, -8 -/* 8014E0 80240C60 00021480 */ sll $v0, $v0, 0x12 -/* 8014E4 80240C64 00021403 */ sra $v0, $v0, 0x10 -/* 8014E8 80240C68 18400004 */ blez $v0, .L80240C7C -/* 8014EC 80240C6C 24840004 */ addiu $a0, $a0, 4 -/* 8014F0 80240C70 30420FFF */ andi $v0, $v0, 0xfff -/* 8014F4 80240C74 08090320 */ j .L80240C80 -/* 8014F8 80240C78 00021B00 */ sll $v1, $v0, 0xc -.L80240C7C: -/* 8014FC 80240C7C 0000182D */ daddu $v1, $zero, $zero -.L80240C80: -/* 801500 80240C80 2642FFF8 */ addiu $v0, $s2, -8 -/* 801504 80240C84 00021480 */ sll $v0, $v0, 0x12 -/* 801508 80240C88 00021403 */ sra $v0, $v0, 0x10 -/* 80150C 80240C8C 18400004 */ blez $v0, .L80240CA0 -/* 801510 80240C90 AC830000 */ sw $v1, ($a0) -/* 801514 80240C94 30420FFF */ andi $v0, $v0, 0xfff -/* 801518 80240C98 00621025 */ or $v0, $v1, $v0 -/* 80151C 80240C9C AC820000 */ sw $v0, ($a0) -.L80240CA0: -/* 801520 80240CA0 3C03800A */ lui $v1, 0x800a -/* 801524 80240CA4 2463A66C */ addiu $v1, $v1, -0x5994 -/* 801528 80240CA8 8C620000 */ lw $v0, ($v1) -/* 80152C 80240CAC 0040202D */ daddu $a0, $v0, $zero -/* 801530 80240CB0 24420008 */ addiu $v0, $v0, 8 -/* 801534 80240CB4 AC620000 */ sw $v0, ($v1) -/* 801538 80240CB8 3C02E100 */ lui $v0, 0xe100 -/* 80153C 80240CBC AC820000 */ sw $v0, ($a0) -/* 801540 80240CC0 3242001F */ andi $v0, $s2, 0x1f -/* 801544 80240CC4 00023140 */ sll $a2, $v0, 5 -/* 801548 80240CC8 3202001F */ andi $v0, $s0, 0x1f -/* 80154C 80240CCC 00022940 */ sll $a1, $v0, 5 -/* 801550 80240CD0 2602FFF8 */ addiu $v0, $s0, -8 -/* 801554 80240CD4 00021480 */ sll $v0, $v0, 0x12 -/* 801558 80240CD8 00021C03 */ sra $v1, $v0, 0x10 -/* 80155C 80240CDC 0461000D */ bgez $v1, .L80240D14 -/* 801560 80240CE0 24840004 */ addiu $a0, $a0, 4 -/* 801564 80240CE4 00031040 */ sll $v0, $v1, 1 -/* 801568 80240CE8 00431021 */ addu $v0, $v0, $v1 -/* 80156C 80240CEC 00021080 */ sll $v0, $v0, 2 -/* 801570 80240CF0 00431023 */ subu $v0, $v0, $v1 -/* 801574 80240CF4 00021100 */ sll $v0, $v0, 4 -/* 801578 80240CF8 00431023 */ subu $v0, $v0, $v1 -/* 80157C 80240CFC 00021143 */ sra $v0, $v0, 5 -/* 801580 80240D00 5C400001 */ bgtzl $v0, .L80240D08 -/* 801584 80240D04 0000102D */ daddu $v0, $zero, $zero -.L80240D08: -/* 801588 80240D08 00A21023 */ subu $v0, $a1, $v0 -/* 80158C 80240D0C 08090346 */ j .L80240D18 -/* 801590 80240D10 00022C00 */ sll $a1, $v0, 0x10 -.L80240D14: -/* 801594 80240D14 00052C00 */ sll $a1, $a1, 0x10 -.L80240D18: -/* 801598 80240D18 2643FFF8 */ addiu $v1, $s2, -8 -/* 80159C 80240D1C 00031080 */ sll $v0, $v1, 2 -/* 8015A0 80240D20 0441000F */ bgez $v0, .L80240D60 -/* 8015A4 80240D24 00A61025 */ or $v0, $a1, $a2 -/* 8015A8 80240D28 00031C80 */ sll $v1, $v1, 0x12 -/* 8015AC 80240D2C 00031C03 */ sra $v1, $v1, 0x10 -/* 8015B0 80240D30 00031040 */ sll $v0, $v1, 1 -/* 8015B4 80240D34 00431021 */ addu $v0, $v0, $v1 -/* 8015B8 80240D38 00021080 */ sll $v0, $v0, 2 -/* 8015BC 80240D3C 00431023 */ subu $v0, $v0, $v1 -/* 8015C0 80240D40 00021100 */ sll $v0, $v0, 4 -/* 8015C4 80240D44 00431023 */ subu $v0, $v0, $v1 -/* 8015C8 80240D48 00021143 */ sra $v0, $v0, 5 -/* 8015CC 80240D4C 5C400001 */ bgtzl $v0, .L80240D54 -/* 8015D0 80240D50 0000102D */ daddu $v0, $zero, $zero -.L80240D54: -/* 8015D4 80240D54 00C21023 */ subu $v0, $a2, $v0 -/* 8015D8 80240D58 3042FFFF */ andi $v0, $v0, 0xffff -/* 8015DC 80240D5C 00A21025 */ or $v0, $a1, $v0 -.L80240D60: -/* 8015E0 80240D60 AC820000 */ sw $v0, ($a0) -/* 8015E4 80240D64 3C0502BC */ lui $a1, 0x2bc -/* 8015E8 80240D68 3C03800A */ lui $v1, 0x800a -/* 8015EC 80240D6C 2463A66C */ addiu $v1, $v1, -0x5994 -/* 8015F0 80240D70 8C620000 */ lw $v0, ($v1) -/* 8015F4 80240D74 34A502BC */ ori $a1, $a1, 0x2bc -/* 8015F8 80240D78 0040202D */ daddu $a0, $v0, $zero -/* 8015FC 80240D7C 24420008 */ addiu $v0, $v0, 8 -/* 801600 80240D80 AC620000 */ sw $v0, ($v1) -/* 801604 80240D84 3C02F100 */ lui $v0, 0xf100 -/* 801608 80240D88 AC820000 */ sw $v0, ($a0) -/* 80160C 80240D8C AC850004 */ sw $a1, 4($a0) -.L80240D90: -/* 801610 80240D90 3C06E200 */ lui $a2, 0xe200 -/* 801614 80240D94 34C61D00 */ ori $a2, $a2, 0x1d00 -/* 801618 80240D98 3C09E200 */ lui $t1, 0xe200 -/* 80161C 80240D9C 3529001C */ ori $t1, $t1, 0x1c -/* 801620 80240DA0 3C070050 */ lui $a3, 0x50 -/* 801624 80240DA4 34E749D8 */ ori $a3, $a3, 0x49d8 -/* 801628 80240DA8 3C0AFCFF */ lui $t2, 0xfcff -/* 80162C 80240DAC 354AFFFF */ ori $t2, $t2, 0xffff -/* 801630 80240DB0 3C08FFFE */ lui $t0, 0xfffe -/* 801634 80240DB4 3508793C */ ori $t0, $t0, 0x793c -/* 801638 80240DB8 3C0BE300 */ lui $t3, 0xe300 -/* 80163C 80240DBC 3C04800A */ lui $a0, 0x800a -/* 801640 80240DC0 2484A66C */ addiu $a0, $a0, -0x5994 -/* 801644 80240DC4 356B0C00 */ ori $t3, $t3, 0xc00 -/* 801648 80240DC8 8C820000 */ lw $v0, ($a0) -/* 80164C 80240DCC 3C03E700 */ lui $v1, 0xe700 -/* 801650 80240DD0 0040282D */ daddu $a1, $v0, $zero -/* 801654 80240DD4 24420008 */ addiu $v0, $v0, 8 -/* 801658 80240DD8 AC820000 */ sw $v0, ($a0) -/* 80165C 80240DDC ACA30000 */ sw $v1, ($a1) -/* 801660 80240DE0 24430008 */ addiu $v1, $v0, 8 -/* 801664 80240DE4 ACA00004 */ sw $zero, 4($a1) -/* 801668 80240DE8 AC830000 */ sw $v1, ($a0) -/* 80166C 80240DEC 24430010 */ addiu $v1, $v0, 0x10 -/* 801670 80240DF0 AC460000 */ sw $a2, ($v0) -/* 801674 80240DF4 AC400004 */ sw $zero, 4($v0) -/* 801678 80240DF8 AC830000 */ sw $v1, ($a0) -/* 80167C 80240DFC 24430018 */ addiu $v1, $v0, 0x18 -/* 801680 80240E00 AC490008 */ sw $t1, 8($v0) -/* 801684 80240E04 AC47000C */ sw $a3, 0xc($v0) -/* 801688 80240E08 AC830000 */ sw $v1, ($a0) -/* 80168C 80240E0C 24430020 */ addiu $v1, $v0, 0x20 -/* 801690 80240E10 AC4A0010 */ sw $t2, 0x10($v0) -/* 801694 80240E14 AC480014 */ sw $t0, 0x14($v0) -/* 801698 80240E18 AC830000 */ sw $v1, ($a0) -/* 80169C 80240E1C 3C030008 */ lui $v1, 8 -/* 8016A0 80240E20 AC43001C */ sw $v1, 0x1c($v0) -/* 8016A4 80240E24 24430028 */ addiu $v1, $v0, 0x28 -/* 8016A8 80240E28 AC4B0018 */ sw $t3, 0x18($v0) -/* 8016AC 80240E2C AC830000 */ sw $v1, ($a0) -/* 8016B0 80240E30 3C03D700 */ lui $v1, 0xd700 -/* 8016B4 80240E34 AC430020 */ sw $v1, 0x20($v0) -/* 8016B8 80240E38 2403FFFF */ addiu $v1, $zero, -1 -/* 8016BC 80240E3C AC430024 */ sw $v1, 0x24($v0) -.L80240E40: -/* 8016C0 80240E40 8FBF005C */ lw $ra, 0x5c($sp) -/* 8016C4 80240E44 8FBE0058 */ lw $fp, 0x58($sp) -/* 8016C8 80240E48 8FB70054 */ lw $s7, 0x54($sp) -/* 8016CC 80240E4C 8FB60050 */ lw $s6, 0x50($sp) -/* 8016D0 80240E50 8FB5004C */ lw $s5, 0x4c($sp) -/* 8016D4 80240E54 8FB40048 */ lw $s4, 0x48($sp) -/* 8016D8 80240E58 8FB30044 */ lw $s3, 0x44($sp) -/* 8016DC 80240E5C 8FB20040 */ lw $s2, 0x40($sp) -/* 8016E0 80240E60 8FB1003C */ lw $s1, 0x3c($sp) -/* 8016E4 80240E64 8FB00038 */ lw $s0, 0x38($sp) -/* 8016E8 80240E68 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 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 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 new file mode 100644 index 0000000000..94a3c6c788 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/800C40/func_80240628_800EA8.s @@ -0,0 +1,557 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240628_800EA8 +/* 800EA8 80240628 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 800EAC 8024062C 2404002F */ addiu $a0, $zero, 0x2f +/* 800EB0 80240630 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 800EB4 80240634 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 800EB8 80240638 3C05800B */ lui $a1, %hi(gCameras) +/* 800EBC 8024063C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 800EC0 80240640 AFBF005C */ sw $ra, 0x5c($sp) +/* 800EC4 80240644 AFBE0058 */ sw $fp, 0x58($sp) +/* 800EC8 80240648 AFB70054 */ sw $s7, 0x54($sp) +/* 800ECC 8024064C AFB60050 */ sw $s6, 0x50($sp) +/* 800ED0 80240650 AFB5004C */ sw $s5, 0x4c($sp) +/* 800ED4 80240654 AFB40048 */ sw $s4, 0x48($sp) +/* 800ED8 80240658 AFB30044 */ sw $s3, 0x44($sp) +/* 800EDC 8024065C AFB20040 */ sw $s2, 0x40($sp) +/* 800EE0 80240660 AFB1003C */ sw $s1, 0x3c($sp) +/* 800EE4 80240664 AFB00038 */ sw $s0, 0x38($sp) +/* 800EE8 80240668 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 800EEC 8024066C F7B40060 */ sdc1 $f20, 0x60($sp) +/* 800EF0 80240670 00031080 */ sll $v0, $v1, 2 +/* 800EF4 80240674 00431021 */ addu $v0, $v0, $v1 +/* 800EF8 80240678 00021080 */ sll $v0, $v0, 2 +/* 800EFC 8024067C 00431023 */ subu $v0, $v0, $v1 +/* 800F00 80240680 000218C0 */ sll $v1, $v0, 3 +/* 800F04 80240684 00431021 */ addu $v0, $v0, $v1 +/* 800F08 80240688 000210C0 */ sll $v0, $v0, 3 +/* 800F0C 8024068C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 800F10 80240690 00458021 */ addu $s0, $v0, $a1 +/* 800F14 80240694 0C046B4C */ jal get_model_from_list_index +/* 800F18 80240698 0040202D */ daddu $a0, $v0, $zero +/* 800F1C 8024069C 27A30028 */ addiu $v1, $sp, 0x28 +/* 800F20 802406A0 AFA30014 */ sw $v1, 0x14($sp) +/* 800F24 802406A4 27A3002C */ addiu $v1, $sp, 0x2c +/* 800F28 802406A8 AFA30018 */ sw $v1, 0x18($sp) +/* 800F2C 802406AC 27A30030 */ addiu $v1, $sp, 0x30 +/* 800F30 802406B0 AFA3001C */ sw $v1, 0x1c($sp) +/* 800F34 802406B4 27A30034 */ addiu $v1, $sp, 0x34 +/* 800F38 802406B8 3C013F80 */ lui $at, 0x3f80 +/* 800F3C 802406BC 4481A000 */ mtc1 $at, $f20 +/* 800F40 802406C0 0040A82D */ daddu $s5, $v0, $zero +/* 800F44 802406C4 AFA30020 */ sw $v1, 0x20($sp) +/* 800F48 802406C8 E7B40010 */ swc1 $f20, 0x10($sp) +/* 800F4C 802406CC 8EA50098 */ lw $a1, 0x98($s5) +/* 800F50 802406D0 8EA6009C */ lw $a2, 0x9c($s5) +/* 800F54 802406D4 8EA700A0 */ lw $a3, 0xa0($s5) +/* 800F58 802406D8 0C00A588 */ jal transform_point +/* 800F5C 802406DC 260400D4 */ addiu $a0, $s0, 0xd4 +/* 800F60 802406E0 C7A40034 */ lwc1 $f4, 0x34($sp) +/* 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 +/* 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 +/* 800F90 80240710 C7A20028 */ lwc1 $f2, 0x28($sp) +/* 800F94 80240714 46041282 */ mul.s $f10, $f2, $f4 +/* 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 +/* 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 +/* 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 +/* 800FDC 8024075C 468010A0 */ cvt.s.w $f2, $f2 +/* 800FE0 80240760 46025002 */ mul.s $f0, $f10, $f2 +/* 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 +/* 800FF8 80240778 46040502 */ mul.s $f20, $f0, $f4 +/* 800FFC 8024077C 00000000 */ nop +/* 801000 80240780 8604000C */ lh $a0, 0xc($s0) +/* 801004 80240784 44841000 */ mtc1 $a0, $f2 +/* 801008 80240788 00000000 */ nop +/* 80100C 8024078C 468010A0 */ cvt.s.w $f2, $f2 +/* 801010 80240790 46023002 */ mul.s $f0, $f6, $f2 +/* 801014 80240794 00000000 */ nop +/* 801018 80240798 46020000 */ add.s $f0, $f0, $f2 +/* 80101C 8024079C 46040582 */ mul.s $f22, $f0, $f4 +/* 801020 802407A0 00000000 */ nop +/* 801024 802407A4 4600A086 */ mov.s $f2, $f20 +/* 801028 802407A8 4608A03C */ c.lt.s $f20, $f8 +/* 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 +/* 801048 802407C8 4600103C */ c.lt.s $f2, $f0 +/* 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 +/* 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 +/* 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 +/* 801084 80240804 46800020 */ cvt.s.w $f0, $f0 +/* 801088 80240808 4614003E */ c.le.s $f0, $f20 +/* 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 +/* 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 +/* 8010B0 80240830 46800020 */ cvt.s.w $f0, $f0 +/* 8010B4 80240834 4616003E */ c.le.s $f0, $f22 +/* 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 +/* 8010CC 8024084C 4680B5A0 */ cvt.s.w $f22, $f22 +.L80240850: +/* 8010D0 80240850 3C05E300 */ lui $a1, 0xe300 +/* 8010D4 80240854 34A50A01 */ ori $a1, $a1, 0xa01 +/* 8010D8 80240858 3C13E200 */ lui $s3, 0xe200 +/* 8010DC 8024085C 3673001C */ ori $s3, $s3, 0x1c +/* 8010E0 80240860 3C060F0A */ lui $a2, 0xf0a +/* 8010E4 80240864 34C64010 */ ori $a2, $a2, 0x4010 +/* 8010E8 80240868 3C12FF10 */ lui $s2, 0xff10 +/* 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, 0x800a +/* 8010FC 8024087C 2694A66C */ addiu $s4, $s4, -0x5994 +/* 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 +/* 801118 80240898 46800020 */ cvt.s.w $f0, $f0 +/* 80111C 8024089C 0220182D */ daddu $v1, $s1, $zero +/* 801120 802408A0 26310008 */ addiu $s1, $s1, 8 +/* 801124 802408A4 86020010 */ lh $v0, 0x10($s0) +/* 801128 802408A8 4600A500 */ add.s $f20, $f20, $f0 +/* 80112C 802408AC AE910000 */ sw $s1, ($s4) +/* 801130 802408B0 AC650000 */ sw $a1, ($v1) +/* 801134 802408B4 AC600004 */ sw $zero, 4($v1) +/* 801138 802408B8 44820000 */ mtc1 $v0, $f0 +/* 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) +/* 80114C 802408CC 26220010 */ addiu $v0, $s1, 0x10 +/* 801150 802408D0 4600B580 */ add.s $f22, $f22, $f0 +/* 801154 802408D4 AE330000 */ sw $s3, ($s1) +/* 801158 802408D8 AE260004 */ sw $a2, 4($s1) +/* 80115C 802408DC AE820000 */ sw $v0, ($s4) +/* 801160 802408E0 0C0187A4 */ jal osVirtualToPhysical +/* 801164 802408E4 AE320008 */ sw $s2, 8($s1) +/* 801168 802408E8 3C03FFFD */ lui $v1, 0xfffd +/* 80116C 802408EC 3463FEFF */ ori $v1, $v1, 0xfeff +/* 801170 802408F0 3C05F8F0 */ lui $a1, 0xf8f0 +/* 801174 802408F4 3C1E800A */ lui $fp, 0x800a +/* 801178 802408F8 27DEA64C */ addiu $fp, $fp, -0x59b4 +/* 80117C 802408FC 34A5F000 */ ori $a1, $a1, 0xf000 +/* 801180 80240900 8E900000 */ lw $s0, ($s4) +/* 801184 80240904 8FC40000 */ lw $a0, ($fp) +/* 801188 80240908 3C16E700 */ lui $s6, 0xe700 +/* 80118C 8024090C AE22000C */ sw $v0, 0xc($s1) +/* 801190 80240910 0200102D */ daddu $v0, $s0, $zero +/* 801194 80240914 26100008 */ addiu $s0, $s0, 8 +/* 801198 80240918 AE900000 */ sw $s0, ($s4) +/* 80119C 8024091C AC570000 */ sw $s7, ($v0) +/* 8011A0 80240920 AC430004 */ sw $v1, 4($v0) +/* 8011A4 80240924 26020008 */ addiu $v0, $s0, 8 +/* 8011A8 80240928 AE820000 */ sw $v0, ($s4) +/* 8011AC 8024092C 3C02FA00 */ lui $v0, 0xfa00 +/* 8011B0 80240930 AE020000 */ sw $v0, ($s0) +/* 8011B4 80240934 26020010 */ addiu $v0, $s0, 0x10 +/* 8011B8 80240938 AE050004 */ sw $a1, 4($s0) +/* 8011BC 8024093C AE820000 */ sw $v0, ($s4) +/* 8011C0 80240940 3C02DE00 */ lui $v0, 0xde00 +/* 8011C4 80240944 AE160008 */ sw $s6, 8($s0) +/* 8011C8 80240948 AE00000C */ sw $zero, 0xc($s0) +/* 8011CC 8024094C AE020010 */ sw $v0, 0x10($s0) +/* 8011D0 80240950 8EA30008 */ lw $v1, 8($s5) +/* 8011D4 80240954 26020018 */ addiu $v0, $s0, 0x18 +/* 8011D8 80240958 AE820000 */ sw $v0, ($s4) +/* 8011DC 8024095C 8C630004 */ lw $v1, 4($v1) +/* 8011E0 80240960 26020020 */ addiu $v0, $s0, 0x20 +/* 8011E4 80240964 AE820000 */ sw $v0, ($s4) +/* 8011E8 80240968 8C630000 */ lw $v1, ($v1) +/* 8011EC 8024096C 26020028 */ addiu $v0, $s0, 0x28 +/* 8011F0 80240970 AE820000 */ sw $v0, ($s4) +/* 8011F4 80240974 AE160018 */ sw $s6, 0x18($s0) +/* 8011F8 80240978 AE00001C */ sw $zero, 0x1c($s0) +/* 8011FC 8024097C AE120020 */ sw $s2, 0x20($s0) +/* 801200 80240980 0C0187A4 */ jal osVirtualToPhysical +/* 801204 80240984 AE030014 */ sw $v1, 0x14($s0) +/* 801208 80240988 3C04E200 */ lui $a0, 0xe200 +/* 80120C 8024098C 34841D00 */ ori $a0, $a0, 0x1d00 +/* 801210 80240990 3C050055 */ lui $a1, 0x55 +/* 801214 80240994 34A52E10 */ ori $a1, $a1, 0x2e10 +/* 801218 80240998 3C06E300 */ lui $a2, 0xe300 +/* 80121C 8024099C 34C61201 */ ori $a2, $a2, 0x1201 +/* 801220 802409A0 3C07E300 */ lui $a3, 0xe300 +/* 801224 802409A4 34E70C00 */ ori $a3, $a3, 0xc00 +/* 801228 802409A8 3C08D700 */ lui $t0, 0xd700 +/* 80122C 802409AC 35080002 */ ori $t0, $t0, 2 +/* 801230 802409B0 3C09E300 */ lui $t1, 0xe300 +/* 801234 802409B4 35291001 */ ori $t1, $t1, 0x1001 +/* 801238 802409B8 3C0AE300 */ lui $t2, 0xe300 +/* 80123C 802409BC 354A0D01 */ ori $t2, $t2, 0xd01 +/* 801240 802409C0 3C0BE300 */ lui $t3, 0xe300 +/* 801244 802409C4 8E910000 */ lw $s1, ($s4) +/* 801248 802409C8 356B0F00 */ ori $t3, $t3, 0xf00 +/* 80124C 802409CC AE020024 */ sw $v0, 0x24($s0) +/* 801250 802409D0 24020004 */ addiu $v0, $zero, 4 +/* 801254 802409D4 3C013D00 */ lui $at, 0x3d00 +/* 801258 802409D8 44810000 */ mtc1 $at, $f0 +/* 80125C 802409DC 3C014200 */ lui $at, 0x4200 +/* 801260 802409E0 44811000 */ mtc1 $at, $f2 +/* 801264 802409E4 0220182D */ daddu $v1, $s1, $zero +/* 801268 802409E8 26310008 */ addiu $s1, $s1, 8 +/* 80126C 802409EC AE910000 */ sw $s1, ($s4) +/* 801270 802409F0 AC620004 */ sw $v0, 4($v1) +/* 801274 802409F4 26220008 */ addiu $v0, $s1, 8 +/* 801278 802409F8 AC640000 */ sw $a0, ($v1) +/* 80127C 802409FC AE820000 */ sw $v0, ($s4) +/* 801280 80240A00 3C02EE00 */ lui $v0, 0xee00 +/* 801284 80240A04 AE220000 */ sw $v0, ($s1) +/* 801288 80240A08 3C027FDE */ lui $v0, 0x7fde +/* 80128C 80240A0C AE220004 */ sw $v0, 4($s1) +/* 801290 80240A10 26220010 */ addiu $v0, $s1, 0x10 +/* 801294 80240A14 AE820000 */ sw $v0, ($s4) +/* 801298 80240A18 26220018 */ addiu $v0, $s1, 0x18 +/* 80129C 80240A1C AE330008 */ sw $s3, 8($s1) +/* 8012A0 80240A20 AE25000C */ sw $a1, 0xc($s1) +/* 8012A4 80240A24 AE820000 */ sw $v0, ($s4) +/* 8012A8 80240A28 26220020 */ addiu $v0, $s1, 0x20 +/* 8012AC 80240A2C AE260010 */ sw $a2, 0x10($s1) +/* 8012B0 80240A30 AE200014 */ sw $zero, 0x14($s1) +/* 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 +/* 8012C4 80240A44 AE270018 */ sw $a3, 0x18($s1) +/* 8012C8 80240A48 AE20001C */ sw $zero, 0x1c($s1) +/* 8012CC 80240A4C AE820000 */ sw $v0, ($s4) +/* 8012D0 80240A50 2402FFFF */ addiu $v0, $zero, -1 +/* 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 +/* 8012E4 80240A64 AE280020 */ sw $t0, 0x20($s1) +/* 8012E8 80240A68 AE820000 */ sw $v0, ($s4) +/* 8012EC 80240A6C 26220038 */ addiu $v0, $s1, 0x38 +/* 8012F0 80240A70 AE290028 */ sw $t1, 0x28($s1) +/* 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 +/* 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 +/* 80131C 80240A9C 3C014100 */ lui $at, 0x4100 +/* 801320 80240AA0 44811000 */ mtc1 $at, $f2 +/* 801324 80240AA4 26220048 */ addiu $v0, $s1, 0x48 +/* 801328 80240AA8 AE2B0038 */ sw $t3, 0x38($s1) +/* 80132C 80240AAC AE20003C */ sw $zero, 0x3c($s1) +/* 801330 80240AB0 46022101 */ sub.s $f4, $f4, $f2 +/* 801334 80240AB4 AE820000 */ sw $v0, ($s4) +/* 801338 80240AB8 AE360040 */ sw $s6, 0x40($s1) +/* 80133C 80240ABC 46020001 */ sub.s $f0, $f0, $f2 +/* 801340 80240AC0 4600230D */ trunc.w.s $f12, $f4 +/* 801344 80240AC4 44106000 */ mfc1 $s0, $f12 +/* 801348 80240AC8 4600030D */ trunc.w.s $f12, $f0 +/* 80134C 80240ACC 44126000 */ mfc1 $s2, $f12 +/* 801350 80240AD0 060000AF */ bltz $s0, .L80240D90 +/* 801354 80240AD4 AE200044 */ sw $zero, 0x44($s1) +/* 801358 80240AD8 064000AD */ bltz $s2, .L80240D90 +/* 80135C 80240ADC 26020028 */ addiu $v0, $s0, 0x28 +/* 801360 80240AE0 28420140 */ slti $v0, $v0, 0x140 +/* 801364 80240AE4 104000AA */ beqz $v0, .L80240D90 +/* 801368 80240AE8 26420028 */ addiu $v0, $s2, 0x28 +/* 80136C 80240AEC 284200F0 */ slti $v0, $v0, 0xf0 +/* 801370 80240AF0 104000A7 */ beqz $v0, .L80240D90 +/* 801374 80240AF4 3C03FD10 */ lui $v1, 0xfd10 +/* 801378 80240AF8 3463013F */ ori $v1, $v1, 0x13f +/* 80137C 80240AFC 8FC40000 */ lw $a0, ($fp) +/* 801380 80240B00 26220050 */ addiu $v0, $s1, 0x50 +/* 801384 80240B04 AE820000 */ sw $v0, ($s4) +/* 801388 80240B08 0C0187A4 */ jal osVirtualToPhysical +/* 80138C 80240B0C AE230048 */ sw $v1, 0x48($s1) +/* 801390 80240B10 3C08F510 */ lui $t0, 0xf510 +/* 801394 80240B14 35081000 */ ori $t0, $t0, 0x1000 +/* 801398 80240B18 3C040701 */ lui $a0, 0x701 +/* 80139C 80240B1C 34844050 */ ori $a0, $a0, 0x4050 +/* 8013A0 80240B20 3C090001 */ lui $t1, 1 +/* 8013A4 80240B24 35294050 */ ori $t1, $t1, 0x4050 +/* 8013A8 80240B28 3C0AFFFC */ lui $t2, 0xfffc +/* 8013AC 80240B2C 354AFE7F */ ori $t2, $t2, 0xfe7f +/* 8013B0 80240B30 00102880 */ sll $a1, $s0, 2 +/* 8013B4 80240B34 30A50FFF */ andi $a1, $a1, 0xfff +/* 8013B8 80240B38 00052B00 */ sll $a1, $a1, 0xc +/* 8013BC 80240B3C 00123880 */ sll $a3, $s2, 2 +/* 8013C0 80240B40 30E70FFF */ andi $a3, $a3, 0xfff +/* 8013C4 80240B44 2646001F */ addiu $a2, $s2, 0x1f +/* 8013C8 80240B48 00063080 */ sll $a2, $a2, 2 +/* 8013CC 80240B4C 8E830000 */ lw $v1, ($s4) +/* 8013D0 80240B50 30C60FFF */ andi $a2, $a2, 0xfff +/* 8013D4 80240B54 AE22004C */ sw $v0, 0x4c($s1) +/* 8013D8 80240B58 0060102D */ daddu $v0, $v1, $zero +/* 8013DC 80240B5C 24630008 */ addiu $v1, $v1, 8 +/* 8013E0 80240B60 AE830000 */ sw $v1, ($s4) +/* 8013E4 80240B64 AC480000 */ sw $t0, ($v0) +/* 8013E8 80240B68 AC440004 */ sw $a0, 4($v0) +/* 8013EC 80240B6C 24620008 */ addiu $v0, $v1, 8 +/* 8013F0 80240B70 AE820000 */ sw $v0, ($s4) +/* 8013F4 80240B74 3C02E600 */ lui $v0, 0xe600 +/* 8013F8 80240B78 AC620000 */ sw $v0, ($v1) +/* 8013FC 80240B7C 24620010 */ addiu $v0, $v1, 0x10 +/* 801400 80240B80 AC600004 */ sw $zero, 4($v1) +/* 801404 80240B84 AE820000 */ sw $v0, ($s4) +/* 801408 80240B88 3C02F400 */ lui $v0, 0xf400 +/* 80140C 80240B8C 00E21025 */ or $v0, $a3, $v0 +/* 801410 80240B90 00A21025 */ or $v0, $a1, $v0 +/* 801414 80240B94 2604001F */ addiu $a0, $s0, 0x1f +/* 801418 80240B98 00042080 */ sll $a0, $a0, 2 +/* 80141C 80240B9C 30840FFF */ andi $a0, $a0, 0xfff +/* 801420 80240BA0 00042300 */ sll $a0, $a0, 0xc +/* 801424 80240BA4 AC620008 */ sw $v0, 8($v1) +/* 801428 80240BA8 3C020700 */ lui $v0, 0x700 +/* 80142C 80240BAC 00C21025 */ or $v0, $a2, $v0 +/* 801430 80240BB0 00821025 */ or $v0, $a0, $v0 +/* 801434 80240BB4 AC62000C */ sw $v0, 0xc($v1) +/* 801438 80240BB8 24620018 */ addiu $v0, $v1, 0x18 +/* 80143C 80240BBC AE820000 */ sw $v0, ($s4) +/* 801440 80240BC0 24620020 */ addiu $v0, $v1, 0x20 +/* 801444 80240BC4 AC760010 */ sw $s6, 0x10($v1) +/* 801448 80240BC8 AC600014 */ sw $zero, 0x14($v1) +/* 80144C 80240BCC AE820000 */ sw $v0, ($s4) +/* 801450 80240BD0 24620028 */ addiu $v0, $v1, 0x28 +/* 801454 80240BD4 AC680018 */ sw $t0, 0x18($v1) +/* 801458 80240BD8 AC69001C */ sw $t1, 0x1c($v1) +/* 80145C 80240BDC AE820000 */ sw $v0, ($s4) +/* 801460 80240BE0 3C02F200 */ lui $v0, 0xf200 +/* 801464 80240BE4 00E23825 */ or $a3, $a3, $v0 +/* 801468 80240BE8 00A72825 */ or $a1, $a1, $a3 +/* 80146C 80240BEC 00862025 */ or $a0, $a0, $a2 +/* 801470 80240BF0 24620030 */ addiu $v0, $v1, 0x30 +/* 801474 80240BF4 AC650020 */ sw $a1, 0x20($v1) +/* 801478 80240BF8 AC640024 */ sw $a0, 0x24($v1) +/* 80147C 80240BFC AE820000 */ sw $v0, ($s4) +/* 801480 80240C00 AC770028 */ sw $s7, 0x28($v1) +/* 801484 80240C04 AC6A002C */ sw $t2, 0x2c($v1) +/* 801488 80240C08 24630038 */ addiu $v1, $v1, 0x38 +/* 80148C 80240C0C 0040202D */ daddu $a0, $v0, $zero +/* 801490 80240C10 26020018 */ addiu $v0, $s0, 0x18 +/* 801494 80240C14 00021480 */ sll $v0, $v0, 0x12 +/* 801498 80240C18 00021403 */ sra $v0, $v0, 0x10 +/* 80149C 80240C1C 18400006 */ blez $v0, .L80240C38 +/* 8014A0 80240C20 AE830000 */ sw $v1, ($s4) +/* 8014A4 80240C24 30420FFF */ andi $v0, $v0, 0xfff +/* 8014A8 80240C28 00021300 */ sll $v0, $v0, 0xc +/* 8014AC 80240C2C 3C03E400 */ lui $v1, 0xe400 +/* 8014B0 80240C30 0809030F */ j .L80240C3C +/* 8014B4 80240C34 00431825 */ or $v1, $v0, $v1 +.L80240C38: +/* 8014B8 80240C38 3C03E400 */ lui $v1, 0xe400 +.L80240C3C: +/* 8014BC 80240C3C 26420018 */ addiu $v0, $s2, 0x18 +/* 8014C0 80240C40 00021480 */ sll $v0, $v0, 0x12 +/* 8014C4 80240C44 00021403 */ sra $v0, $v0, 0x10 +/* 8014C8 80240C48 18400004 */ blez $v0, .L80240C5C +/* 8014CC 80240C4C AC830000 */ sw $v1, ($a0) +/* 8014D0 80240C50 30420FFF */ andi $v0, $v0, 0xfff +/* 8014D4 80240C54 00621025 */ or $v0, $v1, $v0 +/* 8014D8 80240C58 AC820000 */ sw $v0, ($a0) +.L80240C5C: +/* 8014DC 80240C5C 2602FFF8 */ addiu $v0, $s0, -8 +/* 8014E0 80240C60 00021480 */ sll $v0, $v0, 0x12 +/* 8014E4 80240C64 00021403 */ sra $v0, $v0, 0x10 +/* 8014E8 80240C68 18400004 */ blez $v0, .L80240C7C +/* 8014EC 80240C6C 24840004 */ addiu $a0, $a0, 4 +/* 8014F0 80240C70 30420FFF */ andi $v0, $v0, 0xfff +/* 8014F4 80240C74 08090320 */ j .L80240C80 +/* 8014F8 80240C78 00021B00 */ sll $v1, $v0, 0xc +.L80240C7C: +/* 8014FC 80240C7C 0000182D */ daddu $v1, $zero, $zero +.L80240C80: +/* 801500 80240C80 2642FFF8 */ addiu $v0, $s2, -8 +/* 801504 80240C84 00021480 */ sll $v0, $v0, 0x12 +/* 801508 80240C88 00021403 */ sra $v0, $v0, 0x10 +/* 80150C 80240C8C 18400004 */ blez $v0, .L80240CA0 +/* 801510 80240C90 AC830000 */ sw $v1, ($a0) +/* 801514 80240C94 30420FFF */ andi $v0, $v0, 0xfff +/* 801518 80240C98 00621025 */ or $v0, $v1, $v0 +/* 80151C 80240C9C AC820000 */ sw $v0, ($a0) +.L80240CA0: +/* 801520 80240CA0 3C03800A */ lui $v1, 0x800a +/* 801524 80240CA4 2463A66C */ addiu $v1, $v1, -0x5994 +/* 801528 80240CA8 8C620000 */ lw $v0, ($v1) +/* 80152C 80240CAC 0040202D */ daddu $a0, $v0, $zero +/* 801530 80240CB0 24420008 */ addiu $v0, $v0, 8 +/* 801534 80240CB4 AC620000 */ sw $v0, ($v1) +/* 801538 80240CB8 3C02E100 */ lui $v0, 0xe100 +/* 80153C 80240CBC AC820000 */ sw $v0, ($a0) +/* 801540 80240CC0 3242001F */ andi $v0, $s2, 0x1f +/* 801544 80240CC4 00023140 */ sll $a2, $v0, 5 +/* 801548 80240CC8 3202001F */ andi $v0, $s0, 0x1f +/* 80154C 80240CCC 00022940 */ sll $a1, $v0, 5 +/* 801550 80240CD0 2602FFF8 */ addiu $v0, $s0, -8 +/* 801554 80240CD4 00021480 */ sll $v0, $v0, 0x12 +/* 801558 80240CD8 00021C03 */ sra $v1, $v0, 0x10 +/* 80155C 80240CDC 0461000D */ bgez $v1, .L80240D14 +/* 801560 80240CE0 24840004 */ addiu $a0, $a0, 4 +/* 801564 80240CE4 00031040 */ sll $v0, $v1, 1 +/* 801568 80240CE8 00431021 */ addu $v0, $v0, $v1 +/* 80156C 80240CEC 00021080 */ sll $v0, $v0, 2 +/* 801570 80240CF0 00431023 */ subu $v0, $v0, $v1 +/* 801574 80240CF4 00021100 */ sll $v0, $v0, 4 +/* 801578 80240CF8 00431023 */ subu $v0, $v0, $v1 +/* 80157C 80240CFC 00021143 */ sra $v0, $v0, 5 +/* 801580 80240D00 5C400001 */ bgtzl $v0, .L80240D08 +/* 801584 80240D04 0000102D */ daddu $v0, $zero, $zero +.L80240D08: +/* 801588 80240D08 00A21023 */ subu $v0, $a1, $v0 +/* 80158C 80240D0C 08090346 */ j .L80240D18 +/* 801590 80240D10 00022C00 */ sll $a1, $v0, 0x10 +.L80240D14: +/* 801594 80240D14 00052C00 */ sll $a1, $a1, 0x10 +.L80240D18: +/* 801598 80240D18 2643FFF8 */ addiu $v1, $s2, -8 +/* 80159C 80240D1C 00031080 */ sll $v0, $v1, 2 +/* 8015A0 80240D20 0441000F */ bgez $v0, .L80240D60 +/* 8015A4 80240D24 00A61025 */ or $v0, $a1, $a2 +/* 8015A8 80240D28 00031C80 */ sll $v1, $v1, 0x12 +/* 8015AC 80240D2C 00031C03 */ sra $v1, $v1, 0x10 +/* 8015B0 80240D30 00031040 */ sll $v0, $v1, 1 +/* 8015B4 80240D34 00431021 */ addu $v0, $v0, $v1 +/* 8015B8 80240D38 00021080 */ sll $v0, $v0, 2 +/* 8015BC 80240D3C 00431023 */ subu $v0, $v0, $v1 +/* 8015C0 80240D40 00021100 */ sll $v0, $v0, 4 +/* 8015C4 80240D44 00431023 */ subu $v0, $v0, $v1 +/* 8015C8 80240D48 00021143 */ sra $v0, $v0, 5 +/* 8015CC 80240D4C 5C400001 */ bgtzl $v0, .L80240D54 +/* 8015D0 80240D50 0000102D */ daddu $v0, $zero, $zero +.L80240D54: +/* 8015D4 80240D54 00C21023 */ subu $v0, $a2, $v0 +/* 8015D8 80240D58 3042FFFF */ andi $v0, $v0, 0xffff +/* 8015DC 80240D5C 00A21025 */ or $v0, $a1, $v0 +.L80240D60: +/* 8015E0 80240D60 AC820000 */ sw $v0, ($a0) +/* 8015E4 80240D64 3C0502BC */ lui $a1, 0x2bc +/* 8015E8 80240D68 3C03800A */ lui $v1, 0x800a +/* 8015EC 80240D6C 2463A66C */ addiu $v1, $v1, -0x5994 +/* 8015F0 80240D70 8C620000 */ lw $v0, ($v1) +/* 8015F4 80240D74 34A502BC */ ori $a1, $a1, 0x2bc +/* 8015F8 80240D78 0040202D */ daddu $a0, $v0, $zero +/* 8015FC 80240D7C 24420008 */ addiu $v0, $v0, 8 +/* 801600 80240D80 AC620000 */ sw $v0, ($v1) +/* 801604 80240D84 3C02F100 */ lui $v0, 0xf100 +/* 801608 80240D88 AC820000 */ sw $v0, ($a0) +/* 80160C 80240D8C AC850004 */ sw $a1, 4($a0) +.L80240D90: +/* 801610 80240D90 3C06E200 */ lui $a2, 0xe200 +/* 801614 80240D94 34C61D00 */ ori $a2, $a2, 0x1d00 +/* 801618 80240D98 3C09E200 */ lui $t1, 0xe200 +/* 80161C 80240D9C 3529001C */ ori $t1, $t1, 0x1c +/* 801620 80240DA0 3C070050 */ lui $a3, 0x50 +/* 801624 80240DA4 34E749D8 */ ori $a3, $a3, 0x49d8 +/* 801628 80240DA8 3C0AFCFF */ lui $t2, 0xfcff +/* 80162C 80240DAC 354AFFFF */ ori $t2, $t2, 0xffff +/* 801630 80240DB0 3C08FFFE */ lui $t0, 0xfffe +/* 801634 80240DB4 3508793C */ ori $t0, $t0, 0x793c +/* 801638 80240DB8 3C0BE300 */ lui $t3, 0xe300 +/* 80163C 80240DBC 3C04800A */ lui $a0, 0x800a +/* 801640 80240DC0 2484A66C */ addiu $a0, $a0, -0x5994 +/* 801644 80240DC4 356B0C00 */ ori $t3, $t3, 0xc00 +/* 801648 80240DC8 8C820000 */ lw $v0, ($a0) +/* 80164C 80240DCC 3C03E700 */ lui $v1, 0xe700 +/* 801650 80240DD0 0040282D */ daddu $a1, $v0, $zero +/* 801654 80240DD4 24420008 */ addiu $v0, $v0, 8 +/* 801658 80240DD8 AC820000 */ sw $v0, ($a0) +/* 80165C 80240DDC ACA30000 */ sw $v1, ($a1) +/* 801660 80240DE0 24430008 */ addiu $v1, $v0, 8 +/* 801664 80240DE4 ACA00004 */ sw $zero, 4($a1) +/* 801668 80240DE8 AC830000 */ sw $v1, ($a0) +/* 80166C 80240DEC 24430010 */ addiu $v1, $v0, 0x10 +/* 801670 80240DF0 AC460000 */ sw $a2, ($v0) +/* 801674 80240DF4 AC400004 */ sw $zero, 4($v0) +/* 801678 80240DF8 AC830000 */ sw $v1, ($a0) +/* 80167C 80240DFC 24430018 */ addiu $v1, $v0, 0x18 +/* 801680 80240E00 AC490008 */ sw $t1, 8($v0) +/* 801684 80240E04 AC47000C */ sw $a3, 0xc($v0) +/* 801688 80240E08 AC830000 */ sw $v1, ($a0) +/* 80168C 80240E0C 24430020 */ addiu $v1, $v0, 0x20 +/* 801690 80240E10 AC4A0010 */ sw $t2, 0x10($v0) +/* 801694 80240E14 AC480014 */ sw $t0, 0x14($v0) +/* 801698 80240E18 AC830000 */ sw $v1, ($a0) +/* 80169C 80240E1C 3C030008 */ lui $v1, 8 +/* 8016A0 80240E20 AC43001C */ sw $v1, 0x1c($v0) +/* 8016A4 80240E24 24430028 */ addiu $v1, $v0, 0x28 +/* 8016A8 80240E28 AC4B0018 */ sw $t3, 0x18($v0) +/* 8016AC 80240E2C AC830000 */ sw $v1, ($a0) +/* 8016B0 80240E30 3C03D700 */ lui $v1, 0xd700 +/* 8016B4 80240E34 AC430020 */ sw $v1, 0x20($v0) +/* 8016B8 80240E38 2403FFFF */ addiu $v1, $zero, -1 +/* 8016BC 80240E3C AC430024 */ sw $v1, 0x24($v0) +.L80240E40: +/* 8016C0 80240E40 8FBF005C */ lw $ra, 0x5c($sp) +/* 8016C4 80240E44 8FBE0058 */ lw $fp, 0x58($sp) +/* 8016C8 80240E48 8FB70054 */ lw $s7, 0x54($sp) +/* 8016CC 80240E4C 8FB60050 */ lw $s6, 0x50($sp) +/* 8016D0 80240E50 8FB5004C */ lw $s5, 0x4c($sp) +/* 8016D4 80240E54 8FB40048 */ lw $s4, 0x48($sp) +/* 8016D8 80240E58 8FB30044 */ lw $s3, 0x44($sp) +/* 8016DC 80240E5C 8FB20040 */ lw $s2, 0x40($sp) +/* 8016E0 80240E60 8FB1003C */ lw $s1, 0x3c($sp) +/* 8016E4 80240E64 8FB00038 */ lw $s0, 0x38($sp) +/* 8016E8 80240E68 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 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 diff --git a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80.s b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80.s deleted file mode 100644 index 390f3e16ce..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80 -/* 801700 80240E80 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 801704 80240E84 AFB00010 */ sw $s0, 0x10($sp) -/* 801708 80240E88 0080802D */ daddu $s0, $a0, $zero -/* 80170C 80240E8C 3C05F5DE */ lui $a1, 0xf5de -/* 801710 80240E90 AFBF0014 */ sw $ra, 0x14($sp) -/* 801714 80240E94 0C0B1EAF */ jal get_variable -/* 801718 80240E98 34A502DD */ ori $a1, $a1, 0x2dd -/* 80171C 80240E9C 3C048025 */ lui $a0, 0x8025 -/* 801720 80240EA0 248485E8 */ addiu $a0, $a0, -0x7a18 -/* 801724 80240EA4 00021840 */ sll $v1, $v0, 1 -/* 801728 80240EA8 00621821 */ addu $v1, $v1, $v0 -/* 80172C 80240EAC 00031880 */ sll $v1, $v1, 2 -/* 801730 80240EB0 00641821 */ addu $v1, $v1, $a0 -/* 801734 80240EB4 8C620000 */ lw $v0, ($v1) -/* 801738 80240EB8 AE020084 */ sw $v0, 0x84($s0) -/* 80173C 80240EBC 8C630004 */ lw $v1, 4($v1) -/* 801740 80240EC0 AE030088 */ sw $v1, 0x88($s0) -/* 801744 80240EC4 8FBF0014 */ lw $ra, 0x14($sp) -/* 801748 80240EC8 8FB00010 */ lw $s0, 0x10($sp) -/* 80174C 80240ECC 24020002 */ addiu $v0, $zero, 2 -/* 801750 80240ED0 03E00008 */ jr $ra -/* 801754 80240ED4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s new file mode 100644 index 0000000000..7efb4ee1c9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240E80_801700.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E80_801700 +/* 801700 80240E80 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 801704 80240E84 AFB00010 */ sw $s0, 0x10($sp) +/* 801708 80240E88 0080802D */ daddu $s0, $a0, $zero +/* 80170C 80240E8C 3C05F5DE */ lui $a1, 0xf5de +/* 801710 80240E90 AFBF0014 */ sw $ra, 0x14($sp) +/* 801714 80240E94 0C0B1EAF */ jal get_variable +/* 801718 80240E98 34A502DD */ ori $a1, $a1, 0x2dd +/* 80171C 80240E9C 3C048025 */ lui $a0, 0x8025 +/* 801720 80240EA0 248485E8 */ addiu $a0, $a0, -0x7a18 +/* 801724 80240EA4 00021840 */ sll $v1, $v0, 1 +/* 801728 80240EA8 00621821 */ addu $v1, $v1, $v0 +/* 80172C 80240EAC 00031880 */ sll $v1, $v1, 2 +/* 801730 80240EB0 00641821 */ addu $v1, $v1, $a0 +/* 801734 80240EB4 8C620000 */ lw $v0, ($v1) +/* 801738 80240EB8 AE020084 */ sw $v0, 0x84($s0) +/* 80173C 80240EBC 8C630004 */ lw $v1, 4($v1) +/* 801740 80240EC0 AE030088 */ sw $v1, 0x88($s0) +/* 801744 80240EC4 8FBF0014 */ lw $ra, 0x14($sp) +/* 801748 80240EC8 8FB00010 */ lw $s0, 0x10($sp) +/* 80174C 80240ECC 24020002 */ addiu $v0, $zero, 2 +/* 801750 80240ED0 03E00008 */ jr $ra +/* 801754 80240ED4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8.s b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8.s deleted file mode 100644 index c598bf5178..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ED8 -/* 801758 80240ED8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 80175C 80240EDC AFB00010 */ sw $s0, 0x10($sp) -/* 801760 80240EE0 0080802D */ daddu $s0, $a0, $zero -/* 801764 80240EE4 3C05F5DE */ lui $a1, 0xf5de -/* 801768 80240EE8 AFBF0014 */ sw $ra, 0x14($sp) -/* 80176C 80240EEC 0C0B1EAF */ jal get_variable -/* 801770 80240EF0 34A50180 */ ori $a1, $a1, 0x180 -/* 801774 80240EF4 0040202D */ daddu $a0, $v0, $zero -/* 801778 80240EF8 3C038025 */ lui $v1, 0x8025 -/* 80177C 80240EFC 24638714 */ addiu $v1, $v1, -0x78ec -/* 801780 80240F00 24060019 */ addiu $a2, $zero, 0x19 -.L80240F04: -/* 801784 80240F04 8C620008 */ lw $v0, 8($v1) -/* 801788 80240F08 0082102A */ slt $v0, $a0, $v0 -/* 80178C 80240F0C 50400005 */ beql $v0, $zero, .L80240F24 -/* 801790 80240F10 0200202D */ daddu $a0, $s0, $zero -/* 801794 80240F14 24C6FFFF */ addiu $a2, $a2, -1 -/* 801798 80240F18 04C1FFFA */ bgez $a2, .L80240F04 -/* 80179C 80240F1C 2463FFF4 */ addiu $v1, $v1, -0xc -/* 8017A0 80240F20 0200202D */ daddu $a0, $s0, $zero -.L80240F24: -/* 8017A4 80240F24 3C05F5DE */ lui $a1, 0xf5de -/* 8017A8 80240F28 0C0B2026 */ jal set_variable -/* 8017AC 80240F2C 34A502DD */ ori $a1, $a1, 0x2dd -/* 8017B0 80240F30 8FBF0014 */ lw $ra, 0x14($sp) -/* 8017B4 80240F34 8FB00010 */ lw $s0, 0x10($sp) -/* 8017B8 80240F38 24020002 */ addiu $v0, $zero, 2 -/* 8017BC 80240F3C 03E00008 */ jr $ra -/* 8017C0 80240F40 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8017C4 80240F44 00000000 */ nop -/* 8017C8 80240F48 00000000 */ nop -/* 8017CC 80240F4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s new file mode 100644 index 0000000000..55491c68ba --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/801700/func_80240ED8_801758.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240ED8_801758 +/* 801758 80240ED8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 80175C 80240EDC AFB00010 */ sw $s0, 0x10($sp) +/* 801760 80240EE0 0080802D */ daddu $s0, $a0, $zero +/* 801764 80240EE4 3C05F5DE */ lui $a1, 0xf5de +/* 801768 80240EE8 AFBF0014 */ sw $ra, 0x14($sp) +/* 80176C 80240EEC 0C0B1EAF */ jal get_variable +/* 801770 80240EF0 34A50180 */ ori $a1, $a1, 0x180 +/* 801774 80240EF4 0040202D */ daddu $a0, $v0, $zero +/* 801778 80240EF8 3C038025 */ lui $v1, 0x8025 +/* 80177C 80240EFC 24638714 */ addiu $v1, $v1, -0x78ec +/* 801780 80240F00 24060019 */ addiu $a2, $zero, 0x19 +.L80240F04: +/* 801784 80240F04 8C620008 */ lw $v0, 8($v1) +/* 801788 80240F08 0082102A */ slt $v0, $a0, $v0 +/* 80178C 80240F0C 50400005 */ beql $v0, $zero, .L80240F24 +/* 801790 80240F10 0200202D */ daddu $a0, $s0, $zero +/* 801794 80240F14 24C6FFFF */ addiu $a2, $a2, -1 +/* 801798 80240F18 04C1FFFA */ bgez $a2, .L80240F04 +/* 80179C 80240F1C 2463FFF4 */ addiu $v1, $v1, -0xc +/* 8017A0 80240F20 0200202D */ daddu $a0, $s0, $zero +.L80240F24: +/* 8017A4 80240F24 3C05F5DE */ lui $a1, 0xf5de +/* 8017A8 80240F28 0C0B2026 */ jal set_variable +/* 8017AC 80240F2C 34A502DD */ ori $a1, $a1, 0x2dd +/* 8017B0 80240F30 8FBF0014 */ lw $ra, 0x14($sp) +/* 8017B4 80240F34 8FB00010 */ lw $s0, 0x10($sp) +/* 8017B8 80240F38 24020002 */ addiu $v0, $zero, 2 +/* 8017BC 80240F3C 03E00008 */ jr $ra +/* 8017C0 80240F40 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8017C4 80240F44 00000000 */ nop +/* 8017C8 80240F48 00000000 */ nop +/* 8017CC 80240F4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50.s deleted file mode 100644 index 229f3c8429..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F50 -/* 8017D0 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8017D4 80240F54 AFB00010 */ sw $s0, 0x10($sp) -/* 8017D8 80240F58 0080802D */ daddu $s0, $a0, $zero -/* 8017DC 80240F5C AFB20018 */ sw $s2, 0x18($sp) -/* 8017E0 80240F60 AFBF001C */ sw $ra, 0x1c($sp) -/* 8017E4 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* 8017E8 80240F68 8E02000C */ lw $v0, 0xc($s0) -/* 8017EC 80240F6C 10A00008 */ beqz $a1, .L80240F90 -/* 8017F0 80240F70 0000902D */ daddu $s2, $zero, $zero -/* 8017F4 80240F74 8C450000 */ lw $a1, ($v0) -/* 8017F8 80240F78 0C0B1EAF */ jal get_variable -/* 8017FC 80240F7C 00000000 */ nop -/* 801800 80240F80 AE020070 */ sw $v0, 0x70($s0) -/* 801804 80240F84 AE000074 */ sw $zero, 0x74($s0) -/* 801808 80240F88 8C420014 */ lw $v0, 0x14($v0) -/* 80180C 80240F8C AE020078 */ sw $v0, 0x78($s0) -.L80240F90: -/* 801810 80240F90 8E050078 */ lw $a1, 0x78($s0) -/* 801814 80240F94 8E110070 */ lw $s1, 0x70($s0) -/* 801818 80240F98 0C0B1EAF */ jal get_variable -/* 80181C 80240F9C 0200202D */ daddu $a0, $s0, $zero -/* 801820 80240FA0 10400006 */ beqz $v0, .L80240FBC -/* 801824 80240FA4 24030002 */ addiu $v1, $zero, 2 -/* 801828 80240FA8 8E020074 */ lw $v0, 0x74($s0) -/* 80182C 80240FAC 10430027 */ beq $v0, $v1, .L8024104C -/* 801830 80240FB0 00000000 */ nop -/* 801834 80240FB4 08090412 */ j .L80241048 -/* 801838 80240FB8 AE030074 */ sw $v1, 0x74($s0) -.L80240FBC: -/* 80183C 80240FBC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 801840 80240FC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 801844 80240FC4 8E260000 */ lw $a2, ($s1) -/* 801848 80240FC8 8E270004 */ lw $a3, 4($s1) -/* 80184C 80240FCC C44C0028 */ lwc1 $f12, 0x28($v0) -/* 801850 80240FD0 0C00A7B5 */ jal dist2D -/* 801854 80240FD4 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 801858 80240FD8 8E030074 */ lw $v1, 0x74($s0) -/* 80185C 80240FDC 24040001 */ addiu $a0, $zero, 1 -/* 801860 80240FE0 10640013 */ beq $v1, $a0, .L80241030 -/* 801864 80240FE4 46000086 */ mov.s $f2, $f0 -/* 801868 80240FE8 28620002 */ slti $v0, $v1, 2 -/* 80186C 80240FEC 50400005 */ beql $v0, $zero, .L80241004 -/* 801870 80240FF0 24020002 */ addiu $v0, $zero, 2 -/* 801874 80240FF4 10600007 */ beqz $v1, .L80241014 -/* 801878 80240FF8 00000000 */ nop -/* 80187C 80240FFC 08090413 */ j .L8024104C -/* 801880 80241000 00000000 */ nop -.L80241004: -/* 801884 80241004 50620010 */ beql $v1, $v0, .L80241048 -/* 801888 80241008 AE040074 */ sw $a0, 0x74($s0) -/* 80188C 8024100C 08090413 */ j .L8024104C -/* 801890 80241010 00000000 */ nop -.L80241014: -/* 801894 80241014 C6200008 */ lwc1 $f0, 8($s1) -/* 801898 80241018 4600103C */ c.lt.s $f2, $f0 -/* 80189C 8024101C 00000000 */ nop -/* 8018A0 80241020 4500000A */ bc1f .L8024104C -/* 8018A4 80241024 00000000 */ nop -/* 8018A8 80241028 08090412 */ j .L80241048 -/* 8018AC 8024102C AE040074 */ sw $a0, 0x74($s0) -.L80241030: -/* 8018B0 80241030 C620000C */ lwc1 $f0, 0xc($s1) -/* 8018B4 80241034 4602003C */ c.lt.s $f0, $f2 -/* 8018B8 80241038 00000000 */ nop -/* 8018BC 8024103C 45000003 */ bc1f .L8024104C -/* 8018C0 80241040 00000000 */ nop -/* 8018C4 80241044 AE000074 */ sw $zero, 0x74($s0) -.L80241048: -/* 8018C8 80241048 24120001 */ addiu $s2, $zero, 1 -.L8024104C: -/* 8018CC 8024104C 12400005 */ beqz $s2, .L80241064 -/* 8018D0 80241050 00000000 */ nop -/* 8018D4 80241054 8E250010 */ lw $a1, 0x10($s1) -/* 8018D8 80241058 86060076 */ lh $a2, 0x76($s0) -/* 8018DC 8024105C 0C052A95 */ jal func_8014AA54 -/* 8018E0 80241060 0000202D */ daddu $a0, $zero, $zero -.L80241064: -/* 8018E4 80241064 8FBF001C */ lw $ra, 0x1c($sp) -/* 8018E8 80241068 8FB20018 */ lw $s2, 0x18($sp) -/* 8018EC 8024106C 8FB10014 */ lw $s1, 0x14($sp) -/* 8018F0 80241070 8FB00010 */ lw $s0, 0x10($sp) -/* 8018F4 80241074 0000102D */ daddu $v0, $zero, $zero -/* 8018F8 80241078 03E00008 */ jr $ra -/* 8018FC 8024107C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s new file mode 100644 index 0000000000..7cac02a655 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80240F50_8017D0.s @@ -0,0 +1,88 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F50_8017D0 +/* 8017D0 80240F50 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8017D4 80240F54 AFB00010 */ sw $s0, 0x10($sp) +/* 8017D8 80240F58 0080802D */ daddu $s0, $a0, $zero +/* 8017DC 80240F5C AFB20018 */ sw $s2, 0x18($sp) +/* 8017E0 80240F60 AFBF001C */ sw $ra, 0x1c($sp) +/* 8017E4 80240F64 AFB10014 */ sw $s1, 0x14($sp) +/* 8017E8 80240F68 8E02000C */ lw $v0, 0xc($s0) +/* 8017EC 80240F6C 10A00008 */ beqz $a1, .L80240F90 +/* 8017F0 80240F70 0000902D */ daddu $s2, $zero, $zero +/* 8017F4 80240F74 8C450000 */ lw $a1, ($v0) +/* 8017F8 80240F78 0C0B1EAF */ jal get_variable +/* 8017FC 80240F7C 00000000 */ nop +/* 801800 80240F80 AE020070 */ sw $v0, 0x70($s0) +/* 801804 80240F84 AE000074 */ sw $zero, 0x74($s0) +/* 801808 80240F88 8C420014 */ lw $v0, 0x14($v0) +/* 80180C 80240F8C AE020078 */ sw $v0, 0x78($s0) +.L80240F90: +/* 801810 80240F90 8E050078 */ lw $a1, 0x78($s0) +/* 801814 80240F94 8E110070 */ lw $s1, 0x70($s0) +/* 801818 80240F98 0C0B1EAF */ jal get_variable +/* 80181C 80240F9C 0200202D */ daddu $a0, $s0, $zero +/* 801820 80240FA0 10400006 */ beqz $v0, .L80240FBC +/* 801824 80240FA4 24030002 */ addiu $v1, $zero, 2 +/* 801828 80240FA8 8E020074 */ lw $v0, 0x74($s0) +/* 80182C 80240FAC 10430027 */ beq $v0, $v1, .L8024104C +/* 801830 80240FB0 00000000 */ nop +/* 801834 80240FB4 08090412 */ j .L80241048 +/* 801838 80240FB8 AE030074 */ sw $v1, 0x74($s0) +.L80240FBC: +/* 80183C 80240FBC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 801840 80240FC0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 801844 80240FC4 8E260000 */ lw $a2, ($s1) +/* 801848 80240FC8 8E270004 */ lw $a3, 4($s1) +/* 80184C 80240FCC C44C0028 */ lwc1 $f12, 0x28($v0) +/* 801850 80240FD0 0C00A7B5 */ jal dist2D +/* 801854 80240FD4 C44E0030 */ lwc1 $f14, 0x30($v0) +/* 801858 80240FD8 8E030074 */ lw $v1, 0x74($s0) +/* 80185C 80240FDC 24040001 */ addiu $a0, $zero, 1 +/* 801860 80240FE0 10640013 */ beq $v1, $a0, .L80241030 +/* 801864 80240FE4 46000086 */ mov.s $f2, $f0 +/* 801868 80240FE8 28620002 */ slti $v0, $v1, 2 +/* 80186C 80240FEC 50400005 */ beql $v0, $zero, .L80241004 +/* 801870 80240FF0 24020002 */ addiu $v0, $zero, 2 +/* 801874 80240FF4 10600007 */ beqz $v1, .L80241014 +/* 801878 80240FF8 00000000 */ nop +/* 80187C 80240FFC 08090413 */ j .L8024104C +/* 801880 80241000 00000000 */ nop +.L80241004: +/* 801884 80241004 50620010 */ beql $v1, $v0, .L80241048 +/* 801888 80241008 AE040074 */ sw $a0, 0x74($s0) +/* 80188C 8024100C 08090413 */ j .L8024104C +/* 801890 80241010 00000000 */ nop +.L80241014: +/* 801894 80241014 C6200008 */ lwc1 $f0, 8($s1) +/* 801898 80241018 4600103C */ c.lt.s $f2, $f0 +/* 80189C 8024101C 00000000 */ nop +/* 8018A0 80241020 4500000A */ bc1f .L8024104C +/* 8018A4 80241024 00000000 */ nop +/* 8018A8 80241028 08090412 */ j .L80241048 +/* 8018AC 8024102C AE040074 */ sw $a0, 0x74($s0) +.L80241030: +/* 8018B0 80241030 C620000C */ lwc1 $f0, 0xc($s1) +/* 8018B4 80241034 4602003C */ c.lt.s $f0, $f2 +/* 8018B8 80241038 00000000 */ nop +/* 8018BC 8024103C 45000003 */ bc1f .L8024104C +/* 8018C0 80241040 00000000 */ nop +/* 8018C4 80241044 AE000074 */ sw $zero, 0x74($s0) +.L80241048: +/* 8018C8 80241048 24120001 */ addiu $s2, $zero, 1 +.L8024104C: +/* 8018CC 8024104C 12400005 */ beqz $s2, .L80241064 +/* 8018D0 80241050 00000000 */ nop +/* 8018D4 80241054 8E250010 */ lw $a1, 0x10($s1) +/* 8018D8 80241058 86060076 */ lh $a2, 0x76($s0) +/* 8018DC 8024105C 0C052A95 */ jal func_8014AA54 +/* 8018E0 80241060 0000202D */ daddu $a0, $zero, $zero +.L80241064: +/* 8018E4 80241064 8FBF001C */ lw $ra, 0x1c($sp) +/* 8018E8 80241068 8FB20018 */ lw $s2, 0x18($sp) +/* 8018EC 8024106C 8FB10014 */ lw $s1, 0x14($sp) +/* 8018F0 80241070 8FB00010 */ lw $s0, 0x10($sp) +/* 8018F4 80241074 0000102D */ daddu $v0, $zero, $zero +/* 8018F8 80241078 03E00008 */ jr $ra +/* 8018FC 8024107C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080.s deleted file mode 100644 index 4263e1cffe..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241080 -/* 801900 80241080 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 801904 80241084 AFB50024 */ sw $s5, 0x24($sp) -/* 801908 80241088 0080A82D */ daddu $s5, $a0, $zero -/* 80190C 8024108C AFBF002C */ sw $ra, 0x2c($sp) -/* 801910 80241090 AFB60028 */ sw $s6, 0x28($sp) -/* 801914 80241094 AFB40020 */ sw $s4, 0x20($sp) -/* 801918 80241098 AFB3001C */ sw $s3, 0x1c($sp) -/* 80191C 8024109C AFB20018 */ sw $s2, 0x18($sp) -/* 801920 802410A0 AFB10014 */ sw $s1, 0x14($sp) -/* 801924 802410A4 AFB00010 */ sw $s0, 0x10($sp) -/* 801928 802410A8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 80192C 802410AC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 801930 802410B0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 801934 802410B4 8EB30148 */ lw $s3, 0x148($s5) -/* 801938 802410B8 86640008 */ lh $a0, 8($s3) -/* 80193C 802410BC 0C00EABB */ jal get_npc_unsafe -/* 801940 802410C0 00A0B02D */ daddu $s6, $a1, $zero -/* 801944 802410C4 0040A02D */ daddu $s4, $v0, $zero -/* 801948 802410C8 AEA00074 */ sw $zero, 0x74($s5) -/* 80194C 802410CC C6980038 */ lwc1 $f24, 0x38($s4) -/* 801950 802410D0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 801954 802410D4 0000902D */ daddu $s2, $zero, $zero -/* 801958 802410D8 AEA00078 */ sw $zero, 0x78($s5) -/* 80195C 802410DC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 801960 802410E0 8C620000 */ lw $v0, ($v1) -/* 801964 802410E4 3C0146FF */ lui $at, 0x46ff -/* 801968 802410E8 3421FE00 */ ori $at, $at, 0xfe00 -/* 80196C 802410EC 4481A000 */ mtc1 $at, $f20 -/* 801970 802410F0 18400018 */ blez $v0, .L80241154 -/* 801974 802410F4 0240802D */ daddu $s0, $s2, $zero -/* 801978 802410F8 0240882D */ daddu $s1, $s2, $zero -.L802410FC: -/* 80197C 802410FC 02231021 */ addu $v0, $s1, $v1 -/* 801980 80241100 4600C306 */ mov.s $f12, $f24 -/* 801984 80241104 C4440004 */ lwc1 $f4, 4($v0) -/* 801988 80241108 46802120 */ cvt.s.w $f4, $f4 -/* 80198C 8024110C 44062000 */ mfc1 $a2, $f4 -/* 801990 80241110 C444000C */ lwc1 $f4, 0xc($v0) -/* 801994 80241114 46802120 */ cvt.s.w $f4, $f4 -/* 801998 80241118 44072000 */ mfc1 $a3, $f4 -/* 80199C 8024111C 0C00A7B5 */ jal dist2D -/* 8019A0 80241120 4600B386 */ mov.s $f14, $f22 -/* 8019A4 80241124 4614003C */ c.lt.s $f0, $f20 -/* 8019A8 80241128 00000000 */ nop -/* 8019AC 8024112C 45000003 */ bc1f .L8024113C -/* 8019B0 80241130 2631000C */ addiu $s1, $s1, 0xc -/* 8019B4 80241134 46000506 */ mov.s $f20, $f0 -/* 8019B8 80241138 AEB20078 */ sw $s2, 0x78($s5) -.L8024113C: -/* 8019BC 8024113C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 8019C0 80241140 26100001 */ addiu $s0, $s0, 1 -/* 8019C4 80241144 8C620000 */ lw $v0, ($v1) -/* 8019C8 80241148 0202102A */ slt $v0, $s0, $v0 -/* 8019CC 8024114C 1440FFEB */ bnez $v0, .L802410FC -/* 8019D0 80241150 26520001 */ addiu $s2, $s2, 1 -.L80241154: -/* 8019D4 80241154 8E6200CC */ lw $v0, 0xcc($s3) -/* 8019D8 80241158 8C420004 */ lw $v0, 4($v0) -/* 8019DC 8024115C AE820028 */ sw $v0, 0x28($s4) -/* 8019E0 80241160 8E6200D0 */ lw $v0, 0xd0($s3) -/* 8019E4 80241164 8C42007C */ lw $v0, 0x7c($v0) -/* 8019E8 80241168 04410004 */ bgez $v0, .L8024117C -/* 8019EC 8024116C 00000000 */ nop -/* 8019F0 80241170 C6C00000 */ lwc1 $f0, ($s6) -/* 8019F4 80241174 08090467 */ j .L8024119C -/* 8019F8 80241178 E6800018 */ swc1 $f0, 0x18($s4) -.L8024117C: -/* 8019FC 8024117C 3C018026 */ lui $at, 0x8026 -/* 801A00 80241180 D42226E0 */ ldc1 $f2, 0x26e0($at) -/* 801A04 80241184 44820000 */ mtc1 $v0, $f0 -/* 801A08 80241188 00000000 */ nop -/* 801A0C 8024118C 46800021 */ cvt.d.w $f0, $f0 -/* 801A10 80241190 46220003 */ div.d $f0, $f0, $f2 -/* 801A14 80241194 46200020 */ cvt.s.d $f0, $f0 -/* 801A18 80241198 E6800018 */ swc1 $f0, 0x18($s4) -.L8024119C: -/* 801A1C 8024119C 24020001 */ addiu $v0, $zero, 1 -/* 801A20 802411A0 AEA20070 */ sw $v0, 0x70($s5) -/* 801A24 802411A4 8FBF002C */ lw $ra, 0x2c($sp) -/* 801A28 802411A8 8FB60028 */ lw $s6, 0x28($sp) -/* 801A2C 802411AC 8FB50024 */ lw $s5, 0x24($sp) -/* 801A30 802411B0 8FB40020 */ lw $s4, 0x20($sp) -/* 801A34 802411B4 8FB3001C */ lw $s3, 0x1c($sp) -/* 801A38 802411B8 8FB20018 */ lw $s2, 0x18($sp) -/* 801A3C 802411BC 8FB10014 */ lw $s1, 0x14($sp) -/* 801A40 802411C0 8FB00010 */ lw $s0, 0x10($sp) -/* 801A44 802411C4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 801A48 802411C8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 801A4C 802411CC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 801A50 802411D0 03E00008 */ jr $ra -/* 801A54 802411D4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s new file mode 100644 index 0000000000..27293983ea --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241080_801900.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241080_801900 +/* 801900 80241080 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 801904 80241084 AFB50024 */ sw $s5, 0x24($sp) +/* 801908 80241088 0080A82D */ daddu $s5, $a0, $zero +/* 80190C 8024108C AFBF002C */ sw $ra, 0x2c($sp) +/* 801910 80241090 AFB60028 */ sw $s6, 0x28($sp) +/* 801914 80241094 AFB40020 */ sw $s4, 0x20($sp) +/* 801918 80241098 AFB3001C */ sw $s3, 0x1c($sp) +/* 80191C 8024109C AFB20018 */ sw $s2, 0x18($sp) +/* 801920 802410A0 AFB10014 */ sw $s1, 0x14($sp) +/* 801924 802410A4 AFB00010 */ sw $s0, 0x10($sp) +/* 801928 802410A8 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 80192C 802410AC F7B60038 */ sdc1 $f22, 0x38($sp) +/* 801930 802410B0 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 801934 802410B4 8EB30148 */ lw $s3, 0x148($s5) +/* 801938 802410B8 86640008 */ lh $a0, 8($s3) +/* 80193C 802410BC 0C00EABB */ jal get_npc_unsafe +/* 801940 802410C0 00A0B02D */ daddu $s6, $a1, $zero +/* 801944 802410C4 0040A02D */ daddu $s4, $v0, $zero +/* 801948 802410C8 AEA00074 */ sw $zero, 0x74($s5) +/* 80194C 802410CC C6980038 */ lwc1 $f24, 0x38($s4) +/* 801950 802410D0 C6960040 */ lwc1 $f22, 0x40($s4) +/* 801954 802410D4 0000902D */ daddu $s2, $zero, $zero +/* 801958 802410D8 AEA00078 */ sw $zero, 0x78($s5) +/* 80195C 802410DC 8E6300D0 */ lw $v1, 0xd0($s3) +/* 801960 802410E0 8C620000 */ lw $v0, ($v1) +/* 801964 802410E4 3C0146FF */ lui $at, 0x46ff +/* 801968 802410E8 3421FE00 */ ori $at, $at, 0xfe00 +/* 80196C 802410EC 4481A000 */ mtc1 $at, $f20 +/* 801970 802410F0 18400018 */ blez $v0, .L80241154 +/* 801974 802410F4 0240802D */ daddu $s0, $s2, $zero +/* 801978 802410F8 0240882D */ daddu $s1, $s2, $zero +.L802410FC: +/* 80197C 802410FC 02231021 */ addu $v0, $s1, $v1 +/* 801980 80241100 4600C306 */ mov.s $f12, $f24 +/* 801984 80241104 C4440004 */ lwc1 $f4, 4($v0) +/* 801988 80241108 46802120 */ cvt.s.w $f4, $f4 +/* 80198C 8024110C 44062000 */ mfc1 $a2, $f4 +/* 801990 80241110 C444000C */ lwc1 $f4, 0xc($v0) +/* 801994 80241114 46802120 */ cvt.s.w $f4, $f4 +/* 801998 80241118 44072000 */ mfc1 $a3, $f4 +/* 80199C 8024111C 0C00A7B5 */ jal dist2D +/* 8019A0 80241120 4600B386 */ mov.s $f14, $f22 +/* 8019A4 80241124 4614003C */ c.lt.s $f0, $f20 +/* 8019A8 80241128 00000000 */ nop +/* 8019AC 8024112C 45000003 */ bc1f .L8024113C +/* 8019B0 80241130 2631000C */ addiu $s1, $s1, 0xc +/* 8019B4 80241134 46000506 */ mov.s $f20, $f0 +/* 8019B8 80241138 AEB20078 */ sw $s2, 0x78($s5) +.L8024113C: +/* 8019BC 8024113C 8E6300D0 */ lw $v1, 0xd0($s3) +/* 8019C0 80241140 26100001 */ addiu $s0, $s0, 1 +/* 8019C4 80241144 8C620000 */ lw $v0, ($v1) +/* 8019C8 80241148 0202102A */ slt $v0, $s0, $v0 +/* 8019CC 8024114C 1440FFEB */ bnez $v0, .L802410FC +/* 8019D0 80241150 26520001 */ addiu $s2, $s2, 1 +.L80241154: +/* 8019D4 80241154 8E6200CC */ lw $v0, 0xcc($s3) +/* 8019D8 80241158 8C420004 */ lw $v0, 4($v0) +/* 8019DC 8024115C AE820028 */ sw $v0, 0x28($s4) +/* 8019E0 80241160 8E6200D0 */ lw $v0, 0xd0($s3) +/* 8019E4 80241164 8C42007C */ lw $v0, 0x7c($v0) +/* 8019E8 80241168 04410004 */ bgez $v0, .L8024117C +/* 8019EC 8024116C 00000000 */ nop +/* 8019F0 80241170 C6C00000 */ lwc1 $f0, ($s6) +/* 8019F4 80241174 08090467 */ j .L8024119C +/* 8019F8 80241178 E6800018 */ swc1 $f0, 0x18($s4) +.L8024117C: +/* 8019FC 8024117C 3C018026 */ lui $at, 0x8026 +/* 801A00 80241180 D42226E0 */ ldc1 $f2, 0x26e0($at) +/* 801A04 80241184 44820000 */ mtc1 $v0, $f0 +/* 801A08 80241188 00000000 */ nop +/* 801A0C 8024118C 46800021 */ cvt.d.w $f0, $f0 +/* 801A10 80241190 46220003 */ div.d $f0, $f0, $f2 +/* 801A14 80241194 46200020 */ cvt.s.d $f0, $f0 +/* 801A18 80241198 E6800018 */ swc1 $f0, 0x18($s4) +.L8024119C: +/* 801A1C 8024119C 24020001 */ addiu $v0, $zero, 1 +/* 801A20 802411A0 AEA20070 */ sw $v0, 0x70($s5) +/* 801A24 802411A4 8FBF002C */ lw $ra, 0x2c($sp) +/* 801A28 802411A8 8FB60028 */ lw $s6, 0x28($sp) +/* 801A2C 802411AC 8FB50024 */ lw $s5, 0x24($sp) +/* 801A30 802411B0 8FB40020 */ lw $s4, 0x20($sp) +/* 801A34 802411B4 8FB3001C */ lw $s3, 0x1c($sp) +/* 801A38 802411B8 8FB20018 */ lw $s2, 0x18($sp) +/* 801A3C 802411BC 8FB10014 */ lw $s1, 0x14($sp) +/* 801A40 802411C0 8FB00010 */ lw $s0, 0x10($sp) +/* 801A44 802411C4 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 801A48 802411C8 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 801A4C 802411CC D7B40030 */ ldc1 $f20, 0x30($sp) +/* 801A50 802411D0 03E00008 */ jr $ra +/* 801A54 802411D4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8.s deleted file mode 100644 index 86db40ab4c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411D8 -/* 801A58 802411D8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 801A5C 802411DC AFB20038 */ sw $s2, 0x38($sp) -/* 801A60 802411E0 0080902D */ daddu $s2, $a0, $zero -/* 801A64 802411E4 AFBF0044 */ sw $ra, 0x44($sp) -/* 801A68 802411E8 AFB40040 */ sw $s4, 0x40($sp) -/* 801A6C 802411EC AFB3003C */ sw $s3, 0x3c($sp) -/* 801A70 802411F0 AFB10034 */ sw $s1, 0x34($sp) -/* 801A74 802411F4 AFB00030 */ sw $s0, 0x30($sp) -/* 801A78 802411F8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 801A7C 802411FC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 801A80 80241200 8E510148 */ lw $s1, 0x148($s2) -/* 801A84 80241204 00A0982D */ daddu $s3, $a1, $zero -/* 801A88 80241208 86240008 */ lh $a0, 8($s1) -/* 801A8C 8024120C 0C00EABB */ jal get_npc_unsafe -/* 801A90 80241210 00C0A02D */ daddu $s4, $a2, $zero -/* 801A94 80241214 8E630014 */ lw $v1, 0x14($s3) -/* 801A98 80241218 04600030 */ bltz $v1, .L802412DC -/* 801A9C 8024121C 0040802D */ daddu $s0, $v0, $zero -/* 801AA0 80241220 8E420074 */ lw $v0, 0x74($s2) -/* 801AA4 80241224 1C40002C */ bgtz $v0, .L802412D8 -/* 801AA8 80241228 2442FFFF */ addiu $v0, $v0, -1 -/* 801AAC 8024122C 0280202D */ daddu $a0, $s4, $zero -/* 801AB0 80241230 AE430074 */ sw $v1, 0x74($s2) -/* 801AB4 80241234 AFA00010 */ sw $zero, 0x10($sp) -/* 801AB8 80241238 8E66000C */ lw $a2, 0xc($s3) -/* 801ABC 8024123C 8E670010 */ lw $a3, 0x10($s3) -/* 801AC0 80241240 0C01242D */ jal func_800490B4 -/* 801AC4 80241244 0220282D */ daddu $a1, $s1, $zero -/* 801AC8 80241248 10400021 */ beqz $v0, .L802412D0 -/* 801ACC 8024124C 0000202D */ daddu $a0, $zero, $zero -/* 801AD0 80241250 0200282D */ daddu $a1, $s0, $zero -/* 801AD4 80241254 0000302D */ daddu $a2, $zero, $zero -/* 801AD8 80241258 860300A8 */ lh $v1, 0xa8($s0) -/* 801ADC 8024125C 3C013F80 */ lui $at, 0x3f80 -/* 801AE0 80241260 44810000 */ mtc1 $at, $f0 -/* 801AE4 80241264 3C014000 */ lui $at, 0x4000 -/* 801AE8 80241268 44811000 */ mtc1 $at, $f2 -/* 801AEC 8024126C 3C01C1A0 */ lui $at, 0xc1a0 -/* 801AF0 80241270 44812000 */ mtc1 $at, $f4 -/* 801AF4 80241274 2402000F */ addiu $v0, $zero, 0xf -/* 801AF8 80241278 AFA2001C */ sw $v0, 0x1c($sp) -/* 801AFC 8024127C 44833000 */ mtc1 $v1, $f6 -/* 801B00 80241280 00000000 */ nop -/* 801B04 80241284 468031A0 */ cvt.s.w $f6, $f6 -/* 801B08 80241288 44073000 */ mfc1 $a3, $f6 -/* 801B0C 8024128C 27A20028 */ addiu $v0, $sp, 0x28 -/* 801B10 80241290 AFA20020 */ sw $v0, 0x20($sp) -/* 801B14 80241294 E7A00010 */ swc1 $f0, 0x10($sp) -/* 801B18 80241298 E7A20014 */ swc1 $f2, 0x14($sp) -/* 801B1C 8024129C 0C01BFA4 */ jal fx_emote -/* 801B20 802412A0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 801B24 802412A4 0200202D */ daddu $a0, $s0, $zero -/* 801B28 802412A8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 801B2C 802412AC 0C012530 */ jal func_800494C0 -/* 801B30 802412B0 3C060020 */ lui $a2, 0x20 -/* 801B34 802412B4 8E220018 */ lw $v0, 0x18($s1) -/* 801B38 802412B8 9442002A */ lhu $v0, 0x2a($v0) -/* 801B3C 802412BC 30420001 */ andi $v0, $v0, 1 -/* 801B40 802412C0 14400064 */ bnez $v0, .L80241454 -/* 801B44 802412C4 2402000A */ addiu $v0, $zero, 0xa -/* 801B48 802412C8 08090515 */ j .L80241454 -/* 801B4C 802412CC 2402000C */ addiu $v0, $zero, 0xc -.L802412D0: -/* 801B50 802412D0 8E420074 */ lw $v0, 0x74($s2) -/* 801B54 802412D4 2442FFFF */ addiu $v0, $v0, -1 -.L802412D8: -/* 801B58 802412D8 AE420074 */ sw $v0, 0x74($s2) -.L802412DC: -/* 801B5C 802412DC 8602008C */ lh $v0, 0x8c($s0) -/* 801B60 802412E0 1440005D */ bnez $v0, .L80241458 -/* 801B64 802412E4 00000000 */ nop -/* 801B68 802412E8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 801B6C 802412EC 3C014010 */ lui $at, 0x4010 -/* 801B70 802412F0 44811800 */ mtc1 $at, $f3 -/* 801B74 802412F4 44801000 */ mtc1 $zero, $f2 -/* 801B78 802412F8 46000021 */ cvt.d.s $f0, $f0 -/* 801B7C 802412FC 4622003C */ c.lt.d $f0, $f2 -/* 801B80 80241300 00000000 */ nop -/* 801B84 80241304 45000003 */ bc1f .L80241314 -/* 801B88 80241308 0200202D */ daddu $a0, $s0, $zero -/* 801B8C 8024130C 080904C6 */ j .L80241318 -/* 801B90 80241310 0000282D */ daddu $a1, $zero, $zero -.L80241314: -/* 801B94 80241314 24050001 */ addiu $a1, $zero, 1 -.L80241318: -/* 801B98 80241318 0C00F598 */ jal func_8003D660 -/* 801B9C 8024131C 00000000 */ nop -/* 801BA0 80241320 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 801BA4 80241324 8E430078 */ lw $v1, 0x78($s2) -/* 801BA8 80241328 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 801BAC 8024132C 00031040 */ sll $v0, $v1, 1 -/* 801BB0 80241330 00431021 */ addu $v0, $v0, $v1 -/* 801BB4 80241334 8E2300D0 */ lw $v1, 0xd0($s1) -/* 801BB8 80241338 00021080 */ sll $v0, $v0, 2 -/* 801BBC 8024133C 00431021 */ addu $v0, $v0, $v1 -/* 801BC0 80241340 C4560004 */ lwc1 $f22, 4($v0) -/* 801BC4 80241344 4680B5A0 */ cvt.s.w $f22, $f22 -/* 801BC8 80241348 C454000C */ lwc1 $f20, 0xc($v0) -/* 801BCC 8024134C 4680A520 */ cvt.s.w $f20, $f20 -/* 801BD0 80241350 4406B000 */ mfc1 $a2, $f22 -/* 801BD4 80241354 4407A000 */ mfc1 $a3, $f20 -/* 801BD8 80241358 0C00A720 */ jal atan2 -/* 801BDC 8024135C 00000000 */ nop -/* 801BE0 80241360 8E050018 */ lw $a1, 0x18($s0) -/* 801BE4 80241364 44060000 */ mfc1 $a2, $f0 -/* 801BE8 80241368 0200202D */ daddu $a0, $s0, $zero -/* 801BEC 8024136C 0C00EA95 */ jal npc_move_heading -/* 801BF0 80241370 AE06000C */ sw $a2, 0xc($s0) -/* 801BF4 80241374 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 801BF8 80241378 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 801BFC 8024137C 4406B000 */ mfc1 $a2, $f22 -/* 801C00 80241380 4407A000 */ mfc1 $a3, $f20 -/* 801C04 80241384 0C00A7B5 */ jal dist2D -/* 801C08 80241388 00000000 */ nop -/* 801C0C 8024138C C6020018 */ lwc1 $f2, 0x18($s0) -/* 801C10 80241390 4602003E */ c.le.s $f0, $f2 -/* 801C14 80241394 00000000 */ nop -/* 801C18 80241398 4500002F */ bc1f .L80241458 -/* 801C1C 8024139C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 801C20 802413A0 24020002 */ addiu $v0, $zero, 2 -/* 801C24 802413A4 0C00A67F */ jal rand_int -/* 801C28 802413A8 AE420070 */ sw $v0, 0x70($s2) -/* 801C2C 802413AC 3C035555 */ lui $v1, 0x5555 -/* 801C30 802413B0 34635556 */ ori $v1, $v1, 0x5556 -/* 801C34 802413B4 00430018 */ mult $v0, $v1 -/* 801C38 802413B8 000227C3 */ sra $a0, $v0, 0x1f -/* 801C3C 802413BC 00004010 */ mfhi $t0 -/* 801C40 802413C0 01042023 */ subu $a0, $t0, $a0 -/* 801C44 802413C4 00041840 */ sll $v1, $a0, 1 -/* 801C48 802413C8 00641821 */ addu $v1, $v1, $a0 -/* 801C4C 802413CC 00431023 */ subu $v0, $v0, $v1 -/* 801C50 802413D0 24430002 */ addiu $v1, $v0, 2 -/* 801C54 802413D4 AE430074 */ sw $v1, 0x74($s2) -/* 801C58 802413D8 8E62002C */ lw $v0, 0x2c($s3) -/* 801C5C 802413DC 18400009 */ blez $v0, .L80241404 -/* 801C60 802413E0 24020004 */ addiu $v0, $zero, 4 -/* 801C64 802413E4 8E620004 */ lw $v0, 4($s3) -/* 801C68 802413E8 18400006 */ blez $v0, .L80241404 -/* 801C6C 802413EC 24020004 */ addiu $v0, $zero, 4 -/* 801C70 802413F0 8E620008 */ lw $v0, 8($s3) -/* 801C74 802413F4 18400003 */ blez $v0, .L80241404 -/* 801C78 802413F8 24020004 */ addiu $v0, $zero, 4 -/* 801C7C 802413FC 14600002 */ bnez $v1, .L80241408 -/* 801C80 80241400 00000000 */ nop -.L80241404: -/* 801C84 80241404 AE420070 */ sw $v0, 0x70($s2) -.L80241408: -/* 801C88 80241408 0C00A67F */ jal rand_int -/* 801C8C 8024140C 24042710 */ addiu $a0, $zero, 0x2710 -/* 801C90 80241410 3C0351EB */ lui $v1, 0x51eb -/* 801C94 80241414 3463851F */ ori $v1, $v1, 0x851f -/* 801C98 80241418 00430018 */ mult $v0, $v1 -/* 801C9C 8024141C 00021FC3 */ sra $v1, $v0, 0x1f -/* 801CA0 80241420 00004010 */ mfhi $t0 -/* 801CA4 80241424 00082143 */ sra $a0, $t0, 5 -/* 801CA8 80241428 00832023 */ subu $a0, $a0, $v1 -/* 801CAC 8024142C 00041840 */ sll $v1, $a0, 1 -/* 801CB0 80241430 00641821 */ addu $v1, $v1, $a0 -/* 801CB4 80241434 000318C0 */ sll $v1, $v1, 3 -/* 801CB8 80241438 00641821 */ addu $v1, $v1, $a0 -/* 801CBC 8024143C 00031880 */ sll $v1, $v1, 2 -/* 801CC0 80241440 8E640004 */ lw $a0, 4($s3) -/* 801CC4 80241444 00431023 */ subu $v0, $v0, $v1 -/* 801CC8 80241448 0044102A */ slt $v0, $v0, $a0 -/* 801CCC 8024144C 10400002 */ beqz $v0, .L80241458 -/* 801CD0 80241450 24020004 */ addiu $v0, $zero, 4 -.L80241454: -/* 801CD4 80241454 AE420070 */ sw $v0, 0x70($s2) -.L80241458: -/* 801CD8 80241458 8FBF0044 */ lw $ra, 0x44($sp) -/* 801CDC 8024145C 8FB40040 */ lw $s4, 0x40($sp) -/* 801CE0 80241460 8FB3003C */ lw $s3, 0x3c($sp) -/* 801CE4 80241464 8FB20038 */ lw $s2, 0x38($sp) -/* 801CE8 80241468 8FB10034 */ lw $s1, 0x34($sp) -/* 801CEC 8024146C 8FB00030 */ lw $s0, 0x30($sp) -/* 801CF0 80241470 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 801CF4 80241474 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 801CF8 80241478 03E00008 */ jr $ra -/* 801CFC 8024147C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s new file mode 100644 index 0000000000..03f25c840d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802411D8_801A58.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411D8_801A58 +/* 801A58 802411D8 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* 801A5C 802411DC AFB20038 */ sw $s2, 0x38($sp) +/* 801A60 802411E0 0080902D */ daddu $s2, $a0, $zero +/* 801A64 802411E4 AFBF0044 */ sw $ra, 0x44($sp) +/* 801A68 802411E8 AFB40040 */ sw $s4, 0x40($sp) +/* 801A6C 802411EC AFB3003C */ sw $s3, 0x3c($sp) +/* 801A70 802411F0 AFB10034 */ sw $s1, 0x34($sp) +/* 801A74 802411F4 AFB00030 */ sw $s0, 0x30($sp) +/* 801A78 802411F8 F7B60050 */ sdc1 $f22, 0x50($sp) +/* 801A7C 802411FC F7B40048 */ sdc1 $f20, 0x48($sp) +/* 801A80 80241200 8E510148 */ lw $s1, 0x148($s2) +/* 801A84 80241204 00A0982D */ daddu $s3, $a1, $zero +/* 801A88 80241208 86240008 */ lh $a0, 8($s1) +/* 801A8C 8024120C 0C00EABB */ jal get_npc_unsafe +/* 801A90 80241210 00C0A02D */ daddu $s4, $a2, $zero +/* 801A94 80241214 8E630014 */ lw $v1, 0x14($s3) +/* 801A98 80241218 04600030 */ bltz $v1, .L802412DC +/* 801A9C 8024121C 0040802D */ daddu $s0, $v0, $zero +/* 801AA0 80241220 8E420074 */ lw $v0, 0x74($s2) +/* 801AA4 80241224 1C40002C */ bgtz $v0, .L802412D8 +/* 801AA8 80241228 2442FFFF */ addiu $v0, $v0, -1 +/* 801AAC 8024122C 0280202D */ daddu $a0, $s4, $zero +/* 801AB0 80241230 AE430074 */ sw $v1, 0x74($s2) +/* 801AB4 80241234 AFA00010 */ sw $zero, 0x10($sp) +/* 801AB8 80241238 8E66000C */ lw $a2, 0xc($s3) +/* 801ABC 8024123C 8E670010 */ lw $a3, 0x10($s3) +/* 801AC0 80241240 0C01242D */ jal func_800490B4 +/* 801AC4 80241244 0220282D */ daddu $a1, $s1, $zero +/* 801AC8 80241248 10400021 */ beqz $v0, .L802412D0 +/* 801ACC 8024124C 0000202D */ daddu $a0, $zero, $zero +/* 801AD0 80241250 0200282D */ daddu $a1, $s0, $zero +/* 801AD4 80241254 0000302D */ daddu $a2, $zero, $zero +/* 801AD8 80241258 860300A8 */ lh $v1, 0xa8($s0) +/* 801ADC 8024125C 3C013F80 */ lui $at, 0x3f80 +/* 801AE0 80241260 44810000 */ mtc1 $at, $f0 +/* 801AE4 80241264 3C014000 */ lui $at, 0x4000 +/* 801AE8 80241268 44811000 */ mtc1 $at, $f2 +/* 801AEC 8024126C 3C01C1A0 */ lui $at, 0xc1a0 +/* 801AF0 80241270 44812000 */ mtc1 $at, $f4 +/* 801AF4 80241274 2402000F */ addiu $v0, $zero, 0xf +/* 801AF8 80241278 AFA2001C */ sw $v0, 0x1c($sp) +/* 801AFC 8024127C 44833000 */ mtc1 $v1, $f6 +/* 801B00 80241280 00000000 */ nop +/* 801B04 80241284 468031A0 */ cvt.s.w $f6, $f6 +/* 801B08 80241288 44073000 */ mfc1 $a3, $f6 +/* 801B0C 8024128C 27A20028 */ addiu $v0, $sp, 0x28 +/* 801B10 80241290 AFA20020 */ sw $v0, 0x20($sp) +/* 801B14 80241294 E7A00010 */ swc1 $f0, 0x10($sp) +/* 801B18 80241298 E7A20014 */ swc1 $f2, 0x14($sp) +/* 801B1C 8024129C 0C01BFA4 */ jal fx_emote +/* 801B20 802412A0 E7A40018 */ swc1 $f4, 0x18($sp) +/* 801B24 802412A4 0200202D */ daddu $a0, $s0, $zero +/* 801B28 802412A8 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 801B2C 802412AC 0C012530 */ jal func_800494C0 +/* 801B30 802412B0 3C060020 */ lui $a2, 0x20 +/* 801B34 802412B4 8E220018 */ lw $v0, 0x18($s1) +/* 801B38 802412B8 9442002A */ lhu $v0, 0x2a($v0) +/* 801B3C 802412BC 30420001 */ andi $v0, $v0, 1 +/* 801B40 802412C0 14400064 */ bnez $v0, .L80241454 +/* 801B44 802412C4 2402000A */ addiu $v0, $zero, 0xa +/* 801B48 802412C8 08090515 */ j .L80241454 +/* 801B4C 802412CC 2402000C */ addiu $v0, $zero, 0xc +.L802412D0: +/* 801B50 802412D0 8E420074 */ lw $v0, 0x74($s2) +/* 801B54 802412D4 2442FFFF */ addiu $v0, $v0, -1 +.L802412D8: +/* 801B58 802412D8 AE420074 */ sw $v0, 0x74($s2) +.L802412DC: +/* 801B5C 802412DC 8602008C */ lh $v0, 0x8c($s0) +/* 801B60 802412E0 1440005D */ bnez $v0, .L80241458 +/* 801B64 802412E4 00000000 */ nop +/* 801B68 802412E8 C6000018 */ lwc1 $f0, 0x18($s0) +/* 801B6C 802412EC 3C014010 */ lui $at, 0x4010 +/* 801B70 802412F0 44811800 */ mtc1 $at, $f3 +/* 801B74 802412F4 44801000 */ mtc1 $zero, $f2 +/* 801B78 802412F8 46000021 */ cvt.d.s $f0, $f0 +/* 801B7C 802412FC 4622003C */ c.lt.d $f0, $f2 +/* 801B80 80241300 00000000 */ nop +/* 801B84 80241304 45000003 */ bc1f .L80241314 +/* 801B88 80241308 0200202D */ daddu $a0, $s0, $zero +/* 801B8C 8024130C 080904C6 */ j .L80241318 +/* 801B90 80241310 0000282D */ daddu $a1, $zero, $zero +.L80241314: +/* 801B94 80241314 24050001 */ addiu $a1, $zero, 1 +.L80241318: +/* 801B98 80241318 0C00F598 */ jal func_8003D660 +/* 801B9C 8024131C 00000000 */ nop +/* 801BA0 80241320 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 801BA4 80241324 8E430078 */ lw $v1, 0x78($s2) +/* 801BA8 80241328 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 801BAC 8024132C 00031040 */ sll $v0, $v1, 1 +/* 801BB0 80241330 00431021 */ addu $v0, $v0, $v1 +/* 801BB4 80241334 8E2300D0 */ lw $v1, 0xd0($s1) +/* 801BB8 80241338 00021080 */ sll $v0, $v0, 2 +/* 801BBC 8024133C 00431021 */ addu $v0, $v0, $v1 +/* 801BC0 80241340 C4560004 */ lwc1 $f22, 4($v0) +/* 801BC4 80241344 4680B5A0 */ cvt.s.w $f22, $f22 +/* 801BC8 80241348 C454000C */ lwc1 $f20, 0xc($v0) +/* 801BCC 8024134C 4680A520 */ cvt.s.w $f20, $f20 +/* 801BD0 80241350 4406B000 */ mfc1 $a2, $f22 +/* 801BD4 80241354 4407A000 */ mfc1 $a3, $f20 +/* 801BD8 80241358 0C00A720 */ jal atan2 +/* 801BDC 8024135C 00000000 */ nop +/* 801BE0 80241360 8E050018 */ lw $a1, 0x18($s0) +/* 801BE4 80241364 44060000 */ mfc1 $a2, $f0 +/* 801BE8 80241368 0200202D */ daddu $a0, $s0, $zero +/* 801BEC 8024136C 0C00EA95 */ jal npc_move_heading +/* 801BF0 80241370 AE06000C */ sw $a2, 0xc($s0) +/* 801BF4 80241374 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 801BF8 80241378 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 801BFC 8024137C 4406B000 */ mfc1 $a2, $f22 +/* 801C00 80241380 4407A000 */ mfc1 $a3, $f20 +/* 801C04 80241384 0C00A7B5 */ jal dist2D +/* 801C08 80241388 00000000 */ nop +/* 801C0C 8024138C C6020018 */ lwc1 $f2, 0x18($s0) +/* 801C10 80241390 4602003E */ c.le.s $f0, $f2 +/* 801C14 80241394 00000000 */ nop +/* 801C18 80241398 4500002F */ bc1f .L80241458 +/* 801C1C 8024139C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 801C20 802413A0 24020002 */ addiu $v0, $zero, 2 +/* 801C24 802413A4 0C00A67F */ jal rand_int +/* 801C28 802413A8 AE420070 */ sw $v0, 0x70($s2) +/* 801C2C 802413AC 3C035555 */ lui $v1, 0x5555 +/* 801C30 802413B0 34635556 */ ori $v1, $v1, 0x5556 +/* 801C34 802413B4 00430018 */ mult $v0, $v1 +/* 801C38 802413B8 000227C3 */ sra $a0, $v0, 0x1f +/* 801C3C 802413BC 00004010 */ mfhi $t0 +/* 801C40 802413C0 01042023 */ subu $a0, $t0, $a0 +/* 801C44 802413C4 00041840 */ sll $v1, $a0, 1 +/* 801C48 802413C8 00641821 */ addu $v1, $v1, $a0 +/* 801C4C 802413CC 00431023 */ subu $v0, $v0, $v1 +/* 801C50 802413D0 24430002 */ addiu $v1, $v0, 2 +/* 801C54 802413D4 AE430074 */ sw $v1, 0x74($s2) +/* 801C58 802413D8 8E62002C */ lw $v0, 0x2c($s3) +/* 801C5C 802413DC 18400009 */ blez $v0, .L80241404 +/* 801C60 802413E0 24020004 */ addiu $v0, $zero, 4 +/* 801C64 802413E4 8E620004 */ lw $v0, 4($s3) +/* 801C68 802413E8 18400006 */ blez $v0, .L80241404 +/* 801C6C 802413EC 24020004 */ addiu $v0, $zero, 4 +/* 801C70 802413F0 8E620008 */ lw $v0, 8($s3) +/* 801C74 802413F4 18400003 */ blez $v0, .L80241404 +/* 801C78 802413F8 24020004 */ addiu $v0, $zero, 4 +/* 801C7C 802413FC 14600002 */ bnez $v1, .L80241408 +/* 801C80 80241400 00000000 */ nop +.L80241404: +/* 801C84 80241404 AE420070 */ sw $v0, 0x70($s2) +.L80241408: +/* 801C88 80241408 0C00A67F */ jal rand_int +/* 801C8C 8024140C 24042710 */ addiu $a0, $zero, 0x2710 +/* 801C90 80241410 3C0351EB */ lui $v1, 0x51eb +/* 801C94 80241414 3463851F */ ori $v1, $v1, 0x851f +/* 801C98 80241418 00430018 */ mult $v0, $v1 +/* 801C9C 8024141C 00021FC3 */ sra $v1, $v0, 0x1f +/* 801CA0 80241420 00004010 */ mfhi $t0 +/* 801CA4 80241424 00082143 */ sra $a0, $t0, 5 +/* 801CA8 80241428 00832023 */ subu $a0, $a0, $v1 +/* 801CAC 8024142C 00041840 */ sll $v1, $a0, 1 +/* 801CB0 80241430 00641821 */ addu $v1, $v1, $a0 +/* 801CB4 80241434 000318C0 */ sll $v1, $v1, 3 +/* 801CB8 80241438 00641821 */ addu $v1, $v1, $a0 +/* 801CBC 8024143C 00031880 */ sll $v1, $v1, 2 +/* 801CC0 80241440 8E640004 */ lw $a0, 4($s3) +/* 801CC4 80241444 00431023 */ subu $v0, $v0, $v1 +/* 801CC8 80241448 0044102A */ slt $v0, $v0, $a0 +/* 801CCC 8024144C 10400002 */ beqz $v0, .L80241458 +/* 801CD0 80241450 24020004 */ addiu $v0, $zero, 4 +.L80241454: +/* 801CD4 80241454 AE420070 */ sw $v0, 0x70($s2) +.L80241458: +/* 801CD8 80241458 8FBF0044 */ lw $ra, 0x44($sp) +/* 801CDC 8024145C 8FB40040 */ lw $s4, 0x40($sp) +/* 801CE0 80241460 8FB3003C */ lw $s3, 0x3c($sp) +/* 801CE4 80241464 8FB20038 */ lw $s2, 0x38($sp) +/* 801CE8 80241468 8FB10034 */ lw $s1, 0x34($sp) +/* 801CEC 8024146C 8FB00030 */ lw $s0, 0x30($sp) +/* 801CF0 80241470 D7B60050 */ ldc1 $f22, 0x50($sp) +/* 801CF4 80241474 D7B40048 */ ldc1 $f20, 0x48($sp) +/* 801CF8 80241478 03E00008 */ jr $ra +/* 801CFC 8024147C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480.s deleted file mode 100644 index c761ba3c49..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241480 -/* 801D00 80241480 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 801D04 80241484 AFB3001C */ sw $s3, 0x1c($sp) -/* 801D08 80241488 0080982D */ daddu $s3, $a0, $zero -/* 801D0C 8024148C AFBF0020 */ sw $ra, 0x20($sp) -/* 801D10 80241490 AFB20018 */ sw $s2, 0x18($sp) -/* 801D14 80241494 AFB10014 */ sw $s1, 0x14($sp) -/* 801D18 80241498 AFB00010 */ sw $s0, 0x10($sp) -/* 801D1C 8024149C 8E720148 */ lw $s2, 0x148($s3) -/* 801D20 802414A0 86440008 */ lh $a0, 8($s2) -/* 801D24 802414A4 0C00EABB */ jal get_npc_unsafe -/* 801D28 802414A8 00A0882D */ daddu $s1, $a1, $zero -/* 801D2C 802414AC 8E240008 */ lw $a0, 8($s1) -/* 801D30 802414B0 0040802D */ daddu $s0, $v0, $zero -/* 801D34 802414B4 00041FC2 */ srl $v1, $a0, 0x1f -/* 801D38 802414B8 00832021 */ addu $a0, $a0, $v1 -/* 801D3C 802414BC 00042043 */ sra $a0, $a0, 1 -/* 801D40 802414C0 0C00A67F */ jal rand_int -/* 801D44 802414C4 24840001 */ addiu $a0, $a0, 1 -/* 801D48 802414C8 8E230008 */ lw $v1, 8($s1) -/* 801D4C 802414CC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 801D50 802414D0 00032FC2 */ srl $a1, $v1, 0x1f -/* 801D54 802414D4 00651821 */ addu $v1, $v1, $a1 -/* 801D58 802414D8 00031843 */ sra $v1, $v1, 1 -/* 801D5C 802414DC 00621821 */ addu $v1, $v1, $v0 -/* 801D60 802414E0 0C00A67F */ jal rand_int -/* 801D64 802414E4 A603008E */ sh $v1, 0x8e($s0) -/* 801D68 802414E8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 801D6C 802414EC 44820000 */ mtc1 $v0, $f0 -/* 801D70 802414F0 00000000 */ nop -/* 801D74 802414F4 46800020 */ cvt.s.w $f0, $f0 -/* 801D78 802414F8 46006300 */ add.s $f12, $f12, $f0 -/* 801D7C 802414FC 3C0142B4 */ lui $at, 0x42b4 -/* 801D80 80241500 44810000 */ mtc1 $at, $f0 -/* 801D84 80241504 0C00A6C9 */ jal clamp_angle -/* 801D88 80241508 46006301 */ sub.s $f12, $f12, $f0 -/* 801D8C 8024150C E600000C */ swc1 $f0, 0xc($s0) -/* 801D90 80241510 8E4200CC */ lw $v0, 0xcc($s2) -/* 801D94 80241514 8C420000 */ lw $v0, ($v0) -/* 801D98 80241518 AE020028 */ sw $v0, 0x28($s0) -/* 801D9C 8024151C 24020003 */ addiu $v0, $zero, 3 -/* 801DA0 80241520 AE620070 */ sw $v0, 0x70($s3) -/* 801DA4 80241524 8FBF0020 */ lw $ra, 0x20($sp) -/* 801DA8 80241528 8FB3001C */ lw $s3, 0x1c($sp) -/* 801DAC 8024152C 8FB20018 */ lw $s2, 0x18($sp) -/* 801DB0 80241530 8FB10014 */ lw $s1, 0x14($sp) -/* 801DB4 80241534 8FB00010 */ lw $s0, 0x10($sp) -/* 801DB8 80241538 03E00008 */ jr $ra -/* 801DBC 8024153C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s new file mode 100644 index 0000000000..d5c06ee3e2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241480_801D00.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241480_801D00 +/* 801D00 80241480 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 801D04 80241484 AFB3001C */ sw $s3, 0x1c($sp) +/* 801D08 80241488 0080982D */ daddu $s3, $a0, $zero +/* 801D0C 8024148C AFBF0020 */ sw $ra, 0x20($sp) +/* 801D10 80241490 AFB20018 */ sw $s2, 0x18($sp) +/* 801D14 80241494 AFB10014 */ sw $s1, 0x14($sp) +/* 801D18 80241498 AFB00010 */ sw $s0, 0x10($sp) +/* 801D1C 8024149C 8E720148 */ lw $s2, 0x148($s3) +/* 801D20 802414A0 86440008 */ lh $a0, 8($s2) +/* 801D24 802414A4 0C00EABB */ jal get_npc_unsafe +/* 801D28 802414A8 00A0882D */ daddu $s1, $a1, $zero +/* 801D2C 802414AC 8E240008 */ lw $a0, 8($s1) +/* 801D30 802414B0 0040802D */ daddu $s0, $v0, $zero +/* 801D34 802414B4 00041FC2 */ srl $v1, $a0, 0x1f +/* 801D38 802414B8 00832021 */ addu $a0, $a0, $v1 +/* 801D3C 802414BC 00042043 */ sra $a0, $a0, 1 +/* 801D40 802414C0 0C00A67F */ jal rand_int +/* 801D44 802414C4 24840001 */ addiu $a0, $a0, 1 +/* 801D48 802414C8 8E230008 */ lw $v1, 8($s1) +/* 801D4C 802414CC 240400B4 */ addiu $a0, $zero, 0xb4 +/* 801D50 802414D0 00032FC2 */ srl $a1, $v1, 0x1f +/* 801D54 802414D4 00651821 */ addu $v1, $v1, $a1 +/* 801D58 802414D8 00031843 */ sra $v1, $v1, 1 +/* 801D5C 802414DC 00621821 */ addu $v1, $v1, $v0 +/* 801D60 802414E0 0C00A67F */ jal rand_int +/* 801D64 802414E4 A603008E */ sh $v1, 0x8e($s0) +/* 801D68 802414E8 C60C000C */ lwc1 $f12, 0xc($s0) +/* 801D6C 802414EC 44820000 */ mtc1 $v0, $f0 +/* 801D70 802414F0 00000000 */ nop +/* 801D74 802414F4 46800020 */ cvt.s.w $f0, $f0 +/* 801D78 802414F8 46006300 */ add.s $f12, $f12, $f0 +/* 801D7C 802414FC 3C0142B4 */ lui $at, 0x42b4 +/* 801D80 80241500 44810000 */ mtc1 $at, $f0 +/* 801D84 80241504 0C00A6C9 */ jal clamp_angle +/* 801D88 80241508 46006301 */ sub.s $f12, $f12, $f0 +/* 801D8C 8024150C E600000C */ swc1 $f0, 0xc($s0) +/* 801D90 80241510 8E4200CC */ lw $v0, 0xcc($s2) +/* 801D94 80241514 8C420000 */ lw $v0, ($v0) +/* 801D98 80241518 AE020028 */ sw $v0, 0x28($s0) +/* 801D9C 8024151C 24020003 */ addiu $v0, $zero, 3 +/* 801DA0 80241520 AE620070 */ sw $v0, 0x70($s3) +/* 801DA4 80241524 8FBF0020 */ lw $ra, 0x20($sp) +/* 801DA8 80241528 8FB3001C */ lw $s3, 0x1c($sp) +/* 801DAC 8024152C 8FB20018 */ lw $s2, 0x18($sp) +/* 801DB0 80241530 8FB10014 */ lw $s1, 0x14($sp) +/* 801DB4 80241534 8FB00010 */ lw $s0, 0x10($sp) +/* 801DB8 80241538 03E00008 */ jr $ra +/* 801DBC 8024153C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC.s deleted file mode 100644 index 9146ac018a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416FC -/* 801F7C 802416FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 801F80 80241700 AFB10014 */ sw $s1, 0x14($sp) -/* 801F84 80241704 0080882D */ daddu $s1, $a0, $zero -/* 801F88 80241708 AFBF001C */ sw $ra, 0x1c($sp) -/* 801F8C 8024170C AFB20018 */ sw $s2, 0x18($sp) -/* 801F90 80241710 AFB00010 */ sw $s0, 0x10($sp) -/* 801F94 80241714 8E300148 */ lw $s0, 0x148($s1) -/* 801F98 80241718 86040008 */ lh $a0, 8($s0) -/* 801F9C 8024171C 0C00EABB */ jal get_npc_unsafe -/* 801FA0 80241720 00A0902D */ daddu $s2, $a1, $zero -/* 801FA4 80241724 8E230078 */ lw $v1, 0x78($s1) -/* 801FA8 80241728 24630001 */ addiu $v1, $v1, 1 -/* 801FAC 8024172C AE230078 */ sw $v1, 0x78($s1) -/* 801FB0 80241730 8E0400D0 */ lw $a0, 0xd0($s0) -/* 801FB4 80241734 8C840000 */ lw $a0, ($a0) -/* 801FB8 80241738 0064182A */ slt $v1, $v1, $a0 -/* 801FBC 8024173C 14600002 */ bnez $v1, .L80241748 -/* 801FC0 80241740 0040282D */ daddu $a1, $v0, $zero -/* 801FC4 80241744 AE200078 */ sw $zero, 0x78($s1) -.L80241748: -/* 801FC8 80241748 8E0200CC */ lw $v0, 0xcc($s0) -/* 801FCC 8024174C 8C420004 */ lw $v0, 4($v0) -/* 801FD0 80241750 ACA20028 */ sw $v0, 0x28($a1) -/* 801FD4 80241754 8E0200D0 */ lw $v0, 0xd0($s0) -/* 801FD8 80241758 8C42007C */ lw $v0, 0x7c($v0) -/* 801FDC 8024175C 04410004 */ bgez $v0, .L80241770 -/* 801FE0 80241760 00000000 */ nop -/* 801FE4 80241764 C6400000 */ lwc1 $f0, ($s2) -/* 801FE8 80241768 080905E4 */ j .L80241790 -/* 801FEC 8024176C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241770: -/* 801FF0 80241770 3C018026 */ lui $at, 0x8026 -/* 801FF4 80241774 D42226E8 */ ldc1 $f2, 0x26e8($at) -/* 801FF8 80241778 44820000 */ mtc1 $v0, $f0 -/* 801FFC 8024177C 00000000 */ nop -/* 802000 80241780 46800021 */ cvt.d.w $f0, $f0 -/* 802004 80241784 46220003 */ div.d $f0, $f0, $f2 -/* 802008 80241788 46200020 */ cvt.s.d $f0, $f0 -/* 80200C 8024178C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241790: -/* 802010 80241790 24020001 */ addiu $v0, $zero, 1 -/* 802014 80241794 AE220070 */ sw $v0, 0x70($s1) -/* 802018 80241798 8FBF001C */ lw $ra, 0x1c($sp) -/* 80201C 8024179C 8FB20018 */ lw $s2, 0x18($sp) -/* 802020 802417A0 8FB10014 */ lw $s1, 0x14($sp) -/* 802024 802417A4 8FB00010 */ lw $s0, 0x10($sp) -/* 802028 802417A8 03E00008 */ jr $ra -/* 80202C 802417AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s new file mode 100644 index 0000000000..a7e4a93abb --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802416FC_801F7C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416FC_801F7C +/* 801F7C 802416FC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 801F80 80241700 AFB10014 */ sw $s1, 0x14($sp) +/* 801F84 80241704 0080882D */ daddu $s1, $a0, $zero +/* 801F88 80241708 AFBF001C */ sw $ra, 0x1c($sp) +/* 801F8C 8024170C AFB20018 */ sw $s2, 0x18($sp) +/* 801F90 80241710 AFB00010 */ sw $s0, 0x10($sp) +/* 801F94 80241714 8E300148 */ lw $s0, 0x148($s1) +/* 801F98 80241718 86040008 */ lh $a0, 8($s0) +/* 801F9C 8024171C 0C00EABB */ jal get_npc_unsafe +/* 801FA0 80241720 00A0902D */ daddu $s2, $a1, $zero +/* 801FA4 80241724 8E230078 */ lw $v1, 0x78($s1) +/* 801FA8 80241728 24630001 */ addiu $v1, $v1, 1 +/* 801FAC 8024172C AE230078 */ sw $v1, 0x78($s1) +/* 801FB0 80241730 8E0400D0 */ lw $a0, 0xd0($s0) +/* 801FB4 80241734 8C840000 */ lw $a0, ($a0) +/* 801FB8 80241738 0064182A */ slt $v1, $v1, $a0 +/* 801FBC 8024173C 14600002 */ bnez $v1, .L80241748 +/* 801FC0 80241740 0040282D */ daddu $a1, $v0, $zero +/* 801FC4 80241744 AE200078 */ sw $zero, 0x78($s1) +.L80241748: +/* 801FC8 80241748 8E0200CC */ lw $v0, 0xcc($s0) +/* 801FCC 8024174C 8C420004 */ lw $v0, 4($v0) +/* 801FD0 80241750 ACA20028 */ sw $v0, 0x28($a1) +/* 801FD4 80241754 8E0200D0 */ lw $v0, 0xd0($s0) +/* 801FD8 80241758 8C42007C */ lw $v0, 0x7c($v0) +/* 801FDC 8024175C 04410004 */ bgez $v0, .L80241770 +/* 801FE0 80241760 00000000 */ nop +/* 801FE4 80241764 C6400000 */ lwc1 $f0, ($s2) +/* 801FE8 80241768 080905E4 */ j .L80241790 +/* 801FEC 8024176C E4A00018 */ swc1 $f0, 0x18($a1) +.L80241770: +/* 801FF0 80241770 3C018026 */ lui $at, 0x8026 +/* 801FF4 80241774 D42226E8 */ ldc1 $f2, 0x26e8($at) +/* 801FF8 80241778 44820000 */ mtc1 $v0, $f0 +/* 801FFC 8024177C 00000000 */ nop +/* 802000 80241780 46800021 */ cvt.d.w $f0, $f0 +/* 802004 80241784 46220003 */ div.d $f0, $f0, $f2 +/* 802008 80241788 46200020 */ cvt.s.d $f0, $f0 +/* 80200C 8024178C E4A00018 */ swc1 $f0, 0x18($a1) +.L80241790: +/* 802010 80241790 24020001 */ addiu $v0, $zero, 1 +/* 802014 80241794 AE220070 */ sw $v0, 0x70($s1) +/* 802018 80241798 8FBF001C */ lw $ra, 0x1c($sp) +/* 80201C 8024179C 8FB20018 */ lw $s2, 0x18($sp) +/* 802020 802417A0 8FB10014 */ lw $s1, 0x14($sp) +/* 802024 802417A4 8FB00010 */ lw $s0, 0x10($sp) +/* 802028 802417A8 03E00008 */ jr $ra +/* 80202C 802417AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0.s deleted file mode 100644 index a161b6b8b2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417B0 -/* 802030 802417B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 802034 802417B4 AFB10014 */ sw $s1, 0x14($sp) -/* 802038 802417B8 0080882D */ daddu $s1, $a0, $zero -/* 80203C 802417BC AFBF0018 */ sw $ra, 0x18($sp) -/* 802040 802417C0 AFB00010 */ sw $s0, 0x10($sp) -/* 802044 802417C4 8E300148 */ lw $s0, 0x148($s1) -/* 802048 802417C8 0C00EABB */ jal get_npc_unsafe -/* 80204C 802417CC 86040008 */ lh $a0, 8($s0) -/* 802050 802417D0 8E0300CC */ lw $v1, 0xcc($s0) -/* 802054 802417D4 3C014120 */ lui $at, 0x4120 -/* 802058 802417D8 44812000 */ mtc1 $at, $f4 -/* 80205C 802417DC 3C014000 */ lui $at, 0x4000 -/* 802060 802417E0 44810000 */ mtc1 $at, $f0 -/* 802064 802417E4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 802068 802417E8 8C640010 */ lw $a0, 0x10($v1) -/* 80206C 802417EC 8C430000 */ lw $v1, ($v0) -/* 802070 802417F0 E444001C */ swc1 $f4, 0x1c($v0) -/* 802074 802417F4 E4400014 */ swc1 $f0, 0x14($v0) -/* 802078 802417F8 E4420064 */ swc1 $f2, 0x64($v0) -/* 80207C 802417FC 34630800 */ ori $v1, $v1, 0x800 -/* 802080 80241800 AC430000 */ sw $v1, ($v0) -/* 802084 80241804 AC440028 */ sw $a0, 0x28($v0) -/* 802088 80241808 2402000B */ addiu $v0, $zero, 0xb -/* 80208C 8024180C AE220070 */ sw $v0, 0x70($s1) -/* 802090 80241810 8FBF0018 */ lw $ra, 0x18($sp) -/* 802094 80241814 8FB10014 */ lw $s1, 0x14($sp) -/* 802098 80241818 8FB00010 */ lw $s0, 0x10($sp) -/* 80209C 8024181C 03E00008 */ jr $ra -/* 8020A0 80241820 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0_802030.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0_802030.s new file mode 100644 index 0000000000..ff679d7876 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802417B0_802030.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417B0_802030 +/* 802030 802417B0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 802034 802417B4 AFB10014 */ sw $s1, 0x14($sp) +/* 802038 802417B8 0080882D */ daddu $s1, $a0, $zero +/* 80203C 802417BC AFBF0018 */ sw $ra, 0x18($sp) +/* 802040 802417C0 AFB00010 */ sw $s0, 0x10($sp) +/* 802044 802417C4 8E300148 */ lw $s0, 0x148($s1) +/* 802048 802417C8 0C00EABB */ jal get_npc_unsafe +/* 80204C 802417CC 86040008 */ lh $a0, 8($s0) +/* 802050 802417D0 8E0300CC */ lw $v1, 0xcc($s0) +/* 802054 802417D4 3C014120 */ lui $at, 0x4120 +/* 802058 802417D8 44812000 */ mtc1 $at, $f4 +/* 80205C 802417DC 3C014000 */ lui $at, 0x4000 +/* 802060 802417E0 44810000 */ mtc1 $at, $f0 +/* 802064 802417E4 C442003C */ lwc1 $f2, 0x3c($v0) +/* 802068 802417E8 8C640010 */ lw $a0, 0x10($v1) +/* 80206C 802417EC 8C430000 */ lw $v1, ($v0) +/* 802070 802417F0 E444001C */ swc1 $f4, 0x1c($v0) +/* 802074 802417F4 E4400014 */ swc1 $f0, 0x14($v0) +/* 802078 802417F8 E4420064 */ swc1 $f2, 0x64($v0) +/* 80207C 802417FC 34630800 */ ori $v1, $v1, 0x800 +/* 802080 80241800 AC430000 */ sw $v1, ($v0) +/* 802084 80241804 AC440028 */ sw $a0, 0x28($v0) +/* 802088 80241808 2402000B */ addiu $v0, $zero, 0xb +/* 80208C 8024180C AE220070 */ sw $v0, 0x70($s1) +/* 802090 80241810 8FBF0018 */ lw $ra, 0x18($sp) +/* 802094 80241814 8FB10014 */ lw $s1, 0x14($sp) +/* 802098 80241818 8FB00010 */ lw $s0, 0x10($sp) +/* 80209C 8024181C 03E00008 */ jr $ra +/* 8020A0 80241820 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824.s deleted file mode 100644 index b97cfadf83..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241824 -/* 8020A4 80241824 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8020A8 80241828 AFB00010 */ sw $s0, 0x10($sp) -/* 8020AC 8024182C 0080802D */ daddu $s0, $a0, $zero -/* 8020B0 80241830 AFBF0014 */ sw $ra, 0x14($sp) -/* 8020B4 80241834 8E020148 */ lw $v0, 0x148($s0) -/* 8020B8 80241838 0C00EABB */ jal get_npc_unsafe -/* 8020BC 8024183C 84440008 */ lh $a0, 8($v0) -/* 8020C0 80241840 0040202D */ daddu $a0, $v0, $zero -/* 8020C4 80241844 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8020C8 80241848 C480001C */ lwc1 $f0, 0x1c($a0) -/* 8020CC 8024184C 46001080 */ add.s $f2, $f2, $f0 -/* 8020D0 80241850 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8020D4 80241854 46040001 */ sub.s $f0, $f0, $f4 -/* 8020D8 80241858 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8020DC 8024185C 4602203C */ c.lt.s $f4, $f2 -/* 8020E0 80241860 E482003C */ swc1 $f2, 0x3c($a0) -/* 8020E4 80241864 45010009 */ bc1t .L8024188C -/* 8020E8 80241868 E480001C */ swc1 $f0, 0x1c($a0) -/* 8020EC 8024186C 8C820000 */ lw $v0, ($a0) -/* 8020F0 80241870 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8020F4 80241874 E484003C */ swc1 $f4, 0x3c($a0) -/* 8020F8 80241878 AC80001C */ sw $zero, 0x1c($a0) -/* 8020FC 8024187C 00431024 */ and $v0, $v0, $v1 -/* 802100 80241880 AC820000 */ sw $v0, ($a0) -/* 802104 80241884 2402000C */ addiu $v0, $zero, 0xc -/* 802108 80241888 AE020070 */ sw $v0, 0x70($s0) -.L8024188C: -/* 80210C 8024188C 8FBF0014 */ lw $ra, 0x14($sp) -/* 802110 80241890 8FB00010 */ lw $s0, 0x10($sp) -/* 802114 80241894 03E00008 */ jr $ra -/* 802118 80241898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824_8020A4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824_8020A4.s new file mode 100644 index 0000000000..bf2f0ac025 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241824_8020A4.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241824_8020A4 +/* 8020A4 80241824 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8020A8 80241828 AFB00010 */ sw $s0, 0x10($sp) +/* 8020AC 8024182C 0080802D */ daddu $s0, $a0, $zero +/* 8020B0 80241830 AFBF0014 */ sw $ra, 0x14($sp) +/* 8020B4 80241834 8E020148 */ lw $v0, 0x148($s0) +/* 8020B8 80241838 0C00EABB */ jal get_npc_unsafe +/* 8020BC 8024183C 84440008 */ lh $a0, 8($v0) +/* 8020C0 80241840 0040202D */ daddu $a0, $v0, $zero +/* 8020C4 80241844 C482003C */ lwc1 $f2, 0x3c($a0) +/* 8020C8 80241848 C480001C */ lwc1 $f0, 0x1c($a0) +/* 8020CC 8024184C 46001080 */ add.s $f2, $f2, $f0 +/* 8020D0 80241850 C4840014 */ lwc1 $f4, 0x14($a0) +/* 8020D4 80241854 46040001 */ sub.s $f0, $f0, $f4 +/* 8020D8 80241858 C4840064 */ lwc1 $f4, 0x64($a0) +/* 8020DC 8024185C 4602203C */ c.lt.s $f4, $f2 +/* 8020E0 80241860 E482003C */ swc1 $f2, 0x3c($a0) +/* 8020E4 80241864 45010009 */ bc1t .L8024188C +/* 8020E8 80241868 E480001C */ swc1 $f0, 0x1c($a0) +/* 8020EC 8024186C 8C820000 */ lw $v0, ($a0) +/* 8020F0 80241870 2403F7FF */ addiu $v1, $zero, -0x801 +/* 8020F4 80241874 E484003C */ swc1 $f4, 0x3c($a0) +/* 8020F8 80241878 AC80001C */ sw $zero, 0x1c($a0) +/* 8020FC 8024187C 00431024 */ and $v0, $v0, $v1 +/* 802100 80241880 AC820000 */ sw $v0, ($a0) +/* 802104 80241884 2402000C */ addiu $v0, $zero, 0xc +/* 802108 80241888 AE020070 */ sw $v0, 0x70($s0) +.L8024188C: +/* 80210C 8024188C 8FBF0014 */ lw $ra, 0x14($sp) +/* 802110 80241890 8FB00010 */ lw $s0, 0x10($sp) +/* 802114 80241894 03E00008 */ jr $ra +/* 802118 80241898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C.s deleted file mode 100644 index 20014fcdbc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024189C -/* 80211C 8024189C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 802120 802418A0 AFB3001C */ sw $s3, 0x1c($sp) -/* 802124 802418A4 0080982D */ daddu $s3, $a0, $zero -/* 802128 802418A8 AFBF0020 */ sw $ra, 0x20($sp) -/* 80212C 802418AC AFB20018 */ sw $s2, 0x18($sp) -/* 802130 802418B0 AFB10014 */ sw $s1, 0x14($sp) -/* 802134 802418B4 AFB00010 */ sw $s0, 0x10($sp) -/* 802138 802418B8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 80213C 802418BC 8E710148 */ lw $s1, 0x148($s3) -/* 802140 802418C0 86240008 */ lh $a0, 8($s1) -/* 802144 802418C4 0C00EABB */ jal get_npc_unsafe -/* 802148 802418C8 00A0802D */ daddu $s0, $a1, $zero -/* 80214C 802418CC 8E040020 */ lw $a0, 0x20($s0) -/* 802150 802418D0 0040902D */ daddu $s2, $v0, $zero -/* 802154 802418D4 00041FC2 */ srl $v1, $a0, 0x1f -/* 802158 802418D8 00832021 */ addu $a0, $a0, $v1 -/* 80215C 802418DC 00042043 */ sra $a0, $a0, 1 -/* 802160 802418E0 0C00A67F */ jal rand_int -/* 802164 802418E4 24840001 */ addiu $a0, $a0, 1 -/* 802168 802418E8 8E030020 */ lw $v1, 0x20($s0) -/* 80216C 802418EC C64C0038 */ lwc1 $f12, 0x38($s2) -/* 802170 802418F0 000327C2 */ srl $a0, $v1, 0x1f -/* 802174 802418F4 00641821 */ addu $v1, $v1, $a0 -/* 802178 802418F8 00031843 */ sra $v1, $v1, 1 -/* 80217C 802418FC 00621821 */ addu $v1, $v1, $v0 -/* 802180 80241900 A643008E */ sh $v1, 0x8e($s2) -/* 802184 80241904 8E2200CC */ lw $v0, 0xcc($s1) -/* 802188 80241908 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 80218C 8024190C 8C42000C */ lw $v0, 0xc($v0) -/* 802190 80241910 AE420028 */ sw $v0, 0x28($s2) -/* 802194 80241914 C6000018 */ lwc1 $f0, 0x18($s0) -/* 802198 80241918 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 80219C 8024191C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8021A0 80241920 E6400018 */ swc1 $f0, 0x18($s2) -/* 8021A4 80241924 8C460028 */ lw $a2, 0x28($v0) -/* 8021A8 80241928 0C00A720 */ jal atan2 -/* 8021AC 8024192C 8C470030 */ lw $a3, 0x30($v0) -/* 8021B0 80241930 46000506 */ mov.s $f20, $f0 -/* 8021B4 80241934 C64C000C */ lwc1 $f12, 0xc($s2) -/* 8021B8 80241938 0C00A70A */ jal get_clamped_angle_diff -/* 8021BC 8024193C 4600A386 */ mov.s $f14, $f20 -/* 8021C0 80241940 46000086 */ mov.s $f2, $f0 -/* 8021C4 80241944 8E02001C */ lw $v0, 0x1c($s0) -/* 8021C8 80241948 46001005 */ abs.s $f0, $f2 -/* 8021CC 8024194C 44822000 */ mtc1 $v0, $f4 -/* 8021D0 80241950 00000000 */ nop -/* 8021D4 80241954 46802120 */ cvt.s.w $f4, $f4 -/* 8021D8 80241958 4600203C */ c.lt.s $f4, $f0 -/* 8021DC 8024195C 00000000 */ nop -/* 8021E0 80241960 4500000D */ bc1f .L80241998 -/* 8021E4 80241964 00000000 */ nop -/* 8021E8 80241968 44800000 */ mtc1 $zero, $f0 -/* 8021EC 8024196C C654000C */ lwc1 $f20, 0xc($s2) -/* 8021F0 80241970 4600103C */ c.lt.s $f2, $f0 -/* 8021F4 80241974 00000000 */ nop -/* 8021F8 80241978 45000006 */ bc1f .L80241994 -/* 8021FC 8024197C 00021023 */ negu $v0, $v0 -/* 802200 80241980 44820000 */ mtc1 $v0, $f0 -/* 802204 80241984 00000000 */ nop -/* 802208 80241988 46800020 */ cvt.s.w $f0, $f0 -/* 80220C 8024198C 08090666 */ j .L80241998 -/* 802210 80241990 4600A500 */ add.s $f20, $f20, $f0 -.L80241994: -/* 802214 80241994 4604A500 */ add.s $f20, $f20, $f4 -.L80241998: -/* 802218 80241998 0C00A6C9 */ jal clamp_angle -/* 80221C 8024199C 4600A306 */ mov.s $f12, $f20 -/* 802220 802419A0 2402000D */ addiu $v0, $zero, 0xd -/* 802224 802419A4 E640000C */ swc1 $f0, 0xc($s2) -/* 802228 802419A8 AE620070 */ sw $v0, 0x70($s3) -/* 80222C 802419AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 802230 802419B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 802234 802419B4 8FB20018 */ lw $s2, 0x18($sp) -/* 802238 802419B8 8FB10014 */ lw $s1, 0x14($sp) -/* 80223C 802419BC 8FB00010 */ lw $s0, 0x10($sp) -/* 802240 802419C0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 802244 802419C4 03E00008 */ jr $ra -/* 802248 802419C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C_80211C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C_80211C.s new file mode 100644 index 0000000000..af53535c9f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024189C_80211C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024189C_80211C +/* 80211C 8024189C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 802120 802418A0 AFB3001C */ sw $s3, 0x1c($sp) +/* 802124 802418A4 0080982D */ daddu $s3, $a0, $zero +/* 802128 802418A8 AFBF0020 */ sw $ra, 0x20($sp) +/* 80212C 802418AC AFB20018 */ sw $s2, 0x18($sp) +/* 802130 802418B0 AFB10014 */ sw $s1, 0x14($sp) +/* 802134 802418B4 AFB00010 */ sw $s0, 0x10($sp) +/* 802138 802418B8 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 80213C 802418BC 8E710148 */ lw $s1, 0x148($s3) +/* 802140 802418C0 86240008 */ lh $a0, 8($s1) +/* 802144 802418C4 0C00EABB */ jal get_npc_unsafe +/* 802148 802418C8 00A0802D */ daddu $s0, $a1, $zero +/* 80214C 802418CC 8E040020 */ lw $a0, 0x20($s0) +/* 802150 802418D0 0040902D */ daddu $s2, $v0, $zero +/* 802154 802418D4 00041FC2 */ srl $v1, $a0, 0x1f +/* 802158 802418D8 00832021 */ addu $a0, $a0, $v1 +/* 80215C 802418DC 00042043 */ sra $a0, $a0, 1 +/* 802160 802418E0 0C00A67F */ jal rand_int +/* 802164 802418E4 24840001 */ addiu $a0, $a0, 1 +/* 802168 802418E8 8E030020 */ lw $v1, 0x20($s0) +/* 80216C 802418EC C64C0038 */ lwc1 $f12, 0x38($s2) +/* 802170 802418F0 000327C2 */ srl $a0, $v1, 0x1f +/* 802174 802418F4 00641821 */ addu $v1, $v1, $a0 +/* 802178 802418F8 00031843 */ sra $v1, $v1, 1 +/* 80217C 802418FC 00621821 */ addu $v1, $v1, $v0 +/* 802180 80241900 A643008E */ sh $v1, 0x8e($s2) +/* 802184 80241904 8E2200CC */ lw $v0, 0xcc($s1) +/* 802188 80241908 C64E0040 */ lwc1 $f14, 0x40($s2) +/* 80218C 8024190C 8C42000C */ lw $v0, 0xc($v0) +/* 802190 80241910 AE420028 */ sw $v0, 0x28($s2) +/* 802194 80241914 C6000018 */ lwc1 $f0, 0x18($s0) +/* 802198 80241918 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 80219C 8024191C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8021A0 80241920 E6400018 */ swc1 $f0, 0x18($s2) +/* 8021A4 80241924 8C460028 */ lw $a2, 0x28($v0) +/* 8021A8 80241928 0C00A720 */ jal atan2 +/* 8021AC 8024192C 8C470030 */ lw $a3, 0x30($v0) +/* 8021B0 80241930 46000506 */ mov.s $f20, $f0 +/* 8021B4 80241934 C64C000C */ lwc1 $f12, 0xc($s2) +/* 8021B8 80241938 0C00A70A */ jal get_clamped_angle_diff +/* 8021BC 8024193C 4600A386 */ mov.s $f14, $f20 +/* 8021C0 80241940 46000086 */ mov.s $f2, $f0 +/* 8021C4 80241944 8E02001C */ lw $v0, 0x1c($s0) +/* 8021C8 80241948 46001005 */ abs.s $f0, $f2 +/* 8021CC 8024194C 44822000 */ mtc1 $v0, $f4 +/* 8021D0 80241950 00000000 */ nop +/* 8021D4 80241954 46802120 */ cvt.s.w $f4, $f4 +/* 8021D8 80241958 4600203C */ c.lt.s $f4, $f0 +/* 8021DC 8024195C 00000000 */ nop +/* 8021E0 80241960 4500000D */ bc1f .L80241998 +/* 8021E4 80241964 00000000 */ nop +/* 8021E8 80241968 44800000 */ mtc1 $zero, $f0 +/* 8021EC 8024196C C654000C */ lwc1 $f20, 0xc($s2) +/* 8021F0 80241970 4600103C */ c.lt.s $f2, $f0 +/* 8021F4 80241974 00000000 */ nop +/* 8021F8 80241978 45000006 */ bc1f .L80241994 +/* 8021FC 8024197C 00021023 */ negu $v0, $v0 +/* 802200 80241980 44820000 */ mtc1 $v0, $f0 +/* 802204 80241984 00000000 */ nop +/* 802208 80241988 46800020 */ cvt.s.w $f0, $f0 +/* 80220C 8024198C 08090666 */ j .L80241998 +/* 802210 80241990 4600A500 */ add.s $f20, $f20, $f0 +.L80241994: +/* 802214 80241994 4604A500 */ add.s $f20, $f20, $f4 +.L80241998: +/* 802218 80241998 0C00A6C9 */ jal clamp_angle +/* 80221C 8024199C 4600A306 */ mov.s $f12, $f20 +/* 802220 802419A0 2402000D */ addiu $v0, $zero, 0xd +/* 802224 802419A4 E640000C */ swc1 $f0, 0xc($s2) +/* 802228 802419A8 AE620070 */ sw $v0, 0x70($s3) +/* 80222C 802419AC 8FBF0020 */ lw $ra, 0x20($sp) +/* 802230 802419B0 8FB3001C */ lw $s3, 0x1c($sp) +/* 802234 802419B4 8FB20018 */ lw $s2, 0x18($sp) +/* 802238 802419B8 8FB10014 */ lw $s1, 0x14($sp) +/* 80223C 802419BC 8FB00010 */ lw $s0, 0x10($sp) +/* 802240 802419C0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 802244 802419C4 03E00008 */ jr $ra +/* 802248 802419C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC.s deleted file mode 100644 index dbd9860aa2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419CC -/* 80224C 802419CC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 802250 802419D0 AFB3003C */ sw $s3, 0x3c($sp) -/* 802254 802419D4 0080982D */ daddu $s3, $a0, $zero -/* 802258 802419D8 AFBF0040 */ sw $ra, 0x40($sp) -/* 80225C 802419DC AFB20038 */ sw $s2, 0x38($sp) -/* 802260 802419E0 AFB10034 */ sw $s1, 0x34($sp) -/* 802264 802419E4 AFB00030 */ sw $s0, 0x30($sp) -/* 802268 802419E8 8E720148 */ lw $s2, 0x148($s3) -/* 80226C 802419EC 00A0882D */ daddu $s1, $a1, $zero -/* 802270 802419F0 86440008 */ lh $a0, 8($s2) -/* 802274 802419F4 0C00EABB */ jal get_npc_unsafe -/* 802278 802419F8 00C0802D */ daddu $s0, $a2, $zero -/* 80227C 802419FC 0200202D */ daddu $a0, $s0, $zero -/* 802280 80241A00 0240282D */ daddu $a1, $s2, $zero -/* 802284 80241A04 24030001 */ addiu $v1, $zero, 1 -/* 802288 80241A08 AFA30010 */ sw $v1, 0x10($sp) -/* 80228C 80241A0C 8E260024 */ lw $a2, 0x24($s1) -/* 802290 80241A10 8E270028 */ lw $a3, 0x28($s1) -/* 802294 80241A14 0C01242D */ jal func_800490B4 -/* 802298 80241A18 0040802D */ daddu $s0, $v0, $zero -/* 80229C 80241A1C 1440001E */ bnez $v0, .L80241A98 -/* 8022A0 80241A20 0200202D */ daddu $a0, $s0, $zero -/* 8022A4 80241A24 24040002 */ addiu $a0, $zero, 2 -/* 8022A8 80241A28 0200282D */ daddu $a1, $s0, $zero -/* 8022AC 80241A2C 0000302D */ daddu $a2, $zero, $zero -/* 8022B0 80241A30 860300A8 */ lh $v1, 0xa8($s0) -/* 8022B4 80241A34 3C013F80 */ lui $at, 0x3f80 -/* 8022B8 80241A38 44810000 */ mtc1 $at, $f0 -/* 8022BC 80241A3C 3C014000 */ lui $at, 0x4000 -/* 8022C0 80241A40 44811000 */ mtc1 $at, $f2 -/* 8022C4 80241A44 3C01C1A0 */ lui $at, 0xc1a0 -/* 8022C8 80241A48 44812000 */ mtc1 $at, $f4 -/* 8022CC 80241A4C 2402000F */ addiu $v0, $zero, 0xf -/* 8022D0 80241A50 AFA2001C */ sw $v0, 0x1c($sp) -/* 8022D4 80241A54 44833000 */ mtc1 $v1, $f6 -/* 8022D8 80241A58 00000000 */ nop -/* 8022DC 80241A5C 468031A0 */ cvt.s.w $f6, $f6 -/* 8022E0 80241A60 44073000 */ mfc1 $a3, $f6 -/* 8022E4 80241A64 27A20028 */ addiu $v0, $sp, 0x28 -/* 8022E8 80241A68 AFA20020 */ sw $v0, 0x20($sp) -/* 8022EC 80241A6C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8022F0 80241A70 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8022F4 80241A74 0C01BFA4 */ jal fx_emote -/* 8022F8 80241A78 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8022FC 80241A7C 8E4200CC */ lw $v0, 0xcc($s2) -/* 802300 80241A80 8C430000 */ lw $v1, ($v0) -/* 802304 80241A84 24020019 */ addiu $v0, $zero, 0x19 -/* 802308 80241A88 A602008E */ sh $v0, 0x8e($s0) -/* 80230C 80241A8C 2402000E */ addiu $v0, $zero, 0xe -/* 802310 80241A90 080906B3 */ j .L80241ACC -/* 802314 80241A94 AE030028 */ sw $v1, 0x28($s0) -.L80241A98: -/* 802318 80241A98 0C00F598 */ jal func_8003D660 -/* 80231C 80241A9C 24050001 */ addiu $a1, $zero, 1 -/* 802320 80241AA0 8E050018 */ lw $a1, 0x18($s0) -/* 802324 80241AA4 8E06000C */ lw $a2, 0xc($s0) -/* 802328 80241AA8 0C00EA95 */ jal npc_move_heading -/* 80232C 80241AAC 0200202D */ daddu $a0, $s0, $zero -/* 802330 80241AB0 8602008E */ lh $v0, 0x8e($s0) -/* 802334 80241AB4 9603008E */ lhu $v1, 0x8e($s0) -/* 802338 80241AB8 18400003 */ blez $v0, .L80241AC8 -/* 80233C 80241ABC 2462FFFF */ addiu $v0, $v1, -1 -/* 802340 80241AC0 080906B4 */ j .L80241AD0 -/* 802344 80241AC4 A602008E */ sh $v0, 0x8e($s0) -.L80241AC8: -/* 802348 80241AC8 2402000C */ addiu $v0, $zero, 0xc -.L80241ACC: -/* 80234C 80241ACC AE620070 */ sw $v0, 0x70($s3) -.L80241AD0: -/* 802350 80241AD0 8FBF0040 */ lw $ra, 0x40($sp) -/* 802354 80241AD4 8FB3003C */ lw $s3, 0x3c($sp) -/* 802358 80241AD8 8FB20038 */ lw $s2, 0x38($sp) -/* 80235C 80241ADC 8FB10034 */ lw $s1, 0x34($sp) -/* 802360 80241AE0 8FB00030 */ lw $s0, 0x30($sp) -/* 802364 80241AE4 03E00008 */ jr $ra -/* 802368 80241AE8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s new file mode 100644 index 0000000000..869667f3cb --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802419CC_80224C.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419CC_80224C +/* 80224C 802419CC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 802250 802419D0 AFB3003C */ sw $s3, 0x3c($sp) +/* 802254 802419D4 0080982D */ daddu $s3, $a0, $zero +/* 802258 802419D8 AFBF0040 */ sw $ra, 0x40($sp) +/* 80225C 802419DC AFB20038 */ sw $s2, 0x38($sp) +/* 802260 802419E0 AFB10034 */ sw $s1, 0x34($sp) +/* 802264 802419E4 AFB00030 */ sw $s0, 0x30($sp) +/* 802268 802419E8 8E720148 */ lw $s2, 0x148($s3) +/* 80226C 802419EC 00A0882D */ daddu $s1, $a1, $zero +/* 802270 802419F0 86440008 */ lh $a0, 8($s2) +/* 802274 802419F4 0C00EABB */ jal get_npc_unsafe +/* 802278 802419F8 00C0802D */ daddu $s0, $a2, $zero +/* 80227C 802419FC 0200202D */ daddu $a0, $s0, $zero +/* 802280 80241A00 0240282D */ daddu $a1, $s2, $zero +/* 802284 80241A04 24030001 */ addiu $v1, $zero, 1 +/* 802288 80241A08 AFA30010 */ sw $v1, 0x10($sp) +/* 80228C 80241A0C 8E260024 */ lw $a2, 0x24($s1) +/* 802290 80241A10 8E270028 */ lw $a3, 0x28($s1) +/* 802294 80241A14 0C01242D */ jal func_800490B4 +/* 802298 80241A18 0040802D */ daddu $s0, $v0, $zero +/* 80229C 80241A1C 1440001E */ bnez $v0, .L80241A98 +/* 8022A0 80241A20 0200202D */ daddu $a0, $s0, $zero +/* 8022A4 80241A24 24040002 */ addiu $a0, $zero, 2 +/* 8022A8 80241A28 0200282D */ daddu $a1, $s0, $zero +/* 8022AC 80241A2C 0000302D */ daddu $a2, $zero, $zero +/* 8022B0 80241A30 860300A8 */ lh $v1, 0xa8($s0) +/* 8022B4 80241A34 3C013F80 */ lui $at, 0x3f80 +/* 8022B8 80241A38 44810000 */ mtc1 $at, $f0 +/* 8022BC 80241A3C 3C014000 */ lui $at, 0x4000 +/* 8022C0 80241A40 44811000 */ mtc1 $at, $f2 +/* 8022C4 80241A44 3C01C1A0 */ lui $at, 0xc1a0 +/* 8022C8 80241A48 44812000 */ mtc1 $at, $f4 +/* 8022CC 80241A4C 2402000F */ addiu $v0, $zero, 0xf +/* 8022D0 80241A50 AFA2001C */ sw $v0, 0x1c($sp) +/* 8022D4 80241A54 44833000 */ mtc1 $v1, $f6 +/* 8022D8 80241A58 00000000 */ nop +/* 8022DC 80241A5C 468031A0 */ cvt.s.w $f6, $f6 +/* 8022E0 80241A60 44073000 */ mfc1 $a3, $f6 +/* 8022E4 80241A64 27A20028 */ addiu $v0, $sp, 0x28 +/* 8022E8 80241A68 AFA20020 */ sw $v0, 0x20($sp) +/* 8022EC 80241A6C E7A00010 */ swc1 $f0, 0x10($sp) +/* 8022F0 80241A70 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8022F4 80241A74 0C01BFA4 */ jal fx_emote +/* 8022F8 80241A78 E7A40018 */ swc1 $f4, 0x18($sp) +/* 8022FC 80241A7C 8E4200CC */ lw $v0, 0xcc($s2) +/* 802300 80241A80 8C430000 */ lw $v1, ($v0) +/* 802304 80241A84 24020019 */ addiu $v0, $zero, 0x19 +/* 802308 80241A88 A602008E */ sh $v0, 0x8e($s0) +/* 80230C 80241A8C 2402000E */ addiu $v0, $zero, 0xe +/* 802310 80241A90 080906B3 */ j .L80241ACC +/* 802314 80241A94 AE030028 */ sw $v1, 0x28($s0) +.L80241A98: +/* 802318 80241A98 0C00F598 */ jal func_8003D660 +/* 80231C 80241A9C 24050001 */ addiu $a1, $zero, 1 +/* 802320 80241AA0 8E050018 */ lw $a1, 0x18($s0) +/* 802324 80241AA4 8E06000C */ lw $a2, 0xc($s0) +/* 802328 80241AA8 0C00EA95 */ jal npc_move_heading +/* 80232C 80241AAC 0200202D */ daddu $a0, $s0, $zero +/* 802330 80241AB0 8602008E */ lh $v0, 0x8e($s0) +/* 802334 80241AB4 9603008E */ lhu $v1, 0x8e($s0) +/* 802338 80241AB8 18400003 */ blez $v0, .L80241AC8 +/* 80233C 80241ABC 2462FFFF */ addiu $v0, $v1, -1 +/* 802340 80241AC0 080906B4 */ j .L80241AD0 +/* 802344 80241AC4 A602008E */ sh $v0, 0x8e($s0) +.L80241AC8: +/* 802348 80241AC8 2402000C */ addiu $v0, $zero, 0xc +.L80241ACC: +/* 80234C 80241ACC AE620070 */ sw $v0, 0x70($s3) +.L80241AD0: +/* 802350 80241AD0 8FBF0040 */ lw $ra, 0x40($sp) +/* 802354 80241AD4 8FB3003C */ lw $s3, 0x3c($sp) +/* 802358 80241AD8 8FB20038 */ lw $s2, 0x38($sp) +/* 80235C 80241ADC 8FB10034 */ lw $s1, 0x34($sp) +/* 802360 80241AE0 8FB00030 */ lw $s0, 0x30($sp) +/* 802364 80241AE4 03E00008 */ jr $ra +/* 802368 80241AE8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC.s deleted file mode 100644 index ffbd8facf6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AEC -/* 80236C 80241AEC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 802370 80241AF0 AFB10014 */ sw $s1, 0x14($sp) -/* 802374 80241AF4 0080882D */ daddu $s1, $a0, $zero -/* 802378 80241AF8 AFBF0018 */ sw $ra, 0x18($sp) -/* 80237C 80241AFC AFB00010 */ sw $s0, 0x10($sp) -/* 802380 80241B00 8E300148 */ lw $s0, 0x148($s1) -/* 802384 80241B04 0C00EABB */ jal get_npc_unsafe -/* 802388 80241B08 86040008 */ lh $a0, 8($s0) -/* 80238C 80241B0C 9443008E */ lhu $v1, 0x8e($v0) -/* 802390 80241B10 2463FFFF */ addiu $v1, $v1, -1 -/* 802394 80241B14 A443008E */ sh $v1, 0x8e($v0) -/* 802398 80241B18 00031C00 */ sll $v1, $v1, 0x10 -/* 80239C 80241B1C 14600008 */ bnez $v1, .L80241B40 -/* 8023A0 80241B20 00000000 */ nop -/* 8023A4 80241B24 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8023A8 80241B28 30420080 */ andi $v0, $v0, 0x80 -/* 8023AC 80241B2C 10400003 */ beqz $v0, .L80241B3C -/* 8023B0 80241B30 2402000F */ addiu $v0, $zero, 0xf -/* 8023B4 80241B34 080906D0 */ j .L80241B40 -/* 8023B8 80241B38 AE220070 */ sw $v0, 0x70($s1) -.L80241B3C: -/* 8023BC 80241B3C AE200070 */ sw $zero, 0x70($s1) -.L80241B40: -/* 8023C0 80241B40 8FBF0018 */ lw $ra, 0x18($sp) -/* 8023C4 80241B44 8FB10014 */ lw $s1, 0x14($sp) -/* 8023C8 80241B48 8FB00010 */ lw $s0, 0x10($sp) -/* 8023CC 80241B4C 03E00008 */ jr $ra -/* 8023D0 80241B50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s new file mode 100644 index 0000000000..de12a6ac4a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241AEC_80236C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AEC_80236C +/* 80236C 80241AEC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 802370 80241AF0 AFB10014 */ sw $s1, 0x14($sp) +/* 802374 80241AF4 0080882D */ daddu $s1, $a0, $zero +/* 802378 80241AF8 AFBF0018 */ sw $ra, 0x18($sp) +/* 80237C 80241AFC AFB00010 */ sw $s0, 0x10($sp) +/* 802380 80241B00 8E300148 */ lw $s0, 0x148($s1) +/* 802384 80241B04 0C00EABB */ jal get_npc_unsafe +/* 802388 80241B08 86040008 */ lh $a0, 8($s0) +/* 80238C 80241B0C 9443008E */ lhu $v1, 0x8e($v0) +/* 802390 80241B10 2463FFFF */ addiu $v1, $v1, -1 +/* 802394 80241B14 A443008E */ sh $v1, 0x8e($v0) +/* 802398 80241B18 00031C00 */ sll $v1, $v1, 0x10 +/* 80239C 80241B1C 14600008 */ bnez $v1, .L80241B40 +/* 8023A0 80241B20 00000000 */ nop +/* 8023A4 80241B24 8E0200B0 */ lw $v0, 0xb0($s0) +/* 8023A8 80241B28 30420080 */ andi $v0, $v0, 0x80 +/* 8023AC 80241B2C 10400003 */ beqz $v0, .L80241B3C +/* 8023B0 80241B30 2402000F */ addiu $v0, $zero, 0xf +/* 8023B4 80241B34 080906D0 */ j .L80241B40 +/* 8023B8 80241B38 AE220070 */ sw $v0, 0x70($s1) +.L80241B3C: +/* 8023BC 80241B3C AE200070 */ sw $zero, 0x70($s1) +.L80241B40: +/* 8023C0 80241B40 8FBF0018 */ lw $ra, 0x18($sp) +/* 8023C4 80241B44 8FB10014 */ lw $s1, 0x14($sp) +/* 8023C8 80241B48 8FB00010 */ lw $s0, 0x10($sp) +/* 8023CC 80241B4C 03E00008 */ jr $ra +/* 8023D0 80241B50 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54.s deleted file mode 100644 index 465809f4c7..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B54 -/* 8023D4 80241B54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8023D8 80241B58 AFB10014 */ sw $s1, 0x14($sp) -/* 8023DC 80241B5C 0080882D */ daddu $s1, $a0, $zero -/* 8023E0 80241B60 AFBF001C */ sw $ra, 0x1c($sp) -/* 8023E4 80241B64 AFB20018 */ sw $s2, 0x18($sp) -/* 8023E8 80241B68 AFB00010 */ sw $s0, 0x10($sp) -/* 8023EC 80241B6C 8E300148 */ lw $s0, 0x148($s1) -/* 8023F0 80241B70 86040008 */ lh $a0, 8($s0) -/* 8023F4 80241B74 0C00EABB */ jal get_npc_unsafe -/* 8023F8 80241B78 00A0902D */ daddu $s2, $a1, $zero -/* 8023FC 80241B7C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 802400 80241B80 8E240078 */ lw $a0, 0x78($s1) -/* 802404 80241B84 8C630000 */ lw $v1, ($v1) -/* 802408 80241B88 0083182A */ slt $v1, $a0, $v1 -/* 80240C 80241B8C 10600013 */ beqz $v1, .L80241BDC -/* 802410 80241B90 0040302D */ daddu $a2, $v0, $zero -/* 802414 80241B94 00041040 */ sll $v0, $a0, 1 -/* 802418 80241B98 00441021 */ addu $v0, $v0, $a0 -/* 80241C 80241B9C 00022880 */ sll $a1, $v0, 2 -.L80241BA0: -/* 802420 80241BA0 8E0300D0 */ lw $v1, 0xd0($s0) -/* 802424 80241BA4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 802428 80241BA8 00A31021 */ addu $v0, $a1, $v1 -/* 80242C 80241BAC C4400008 */ lwc1 $f0, 8($v0) -/* 802430 80241BB0 46800020 */ cvt.s.w $f0, $f0 -/* 802434 80241BB4 4602003E */ c.le.s $f0, $f2 -/* 802438 80241BB8 00000000 */ nop -/* 80243C 80241BBC 45020003 */ bc1fl .L80241BCC -/* 802440 80241BC0 24840001 */ addiu $a0, $a0, 1 -/* 802444 80241BC4 080906F7 */ j .L80241BDC -/* 802448 80241BC8 AE240078 */ sw $a0, 0x78($s1) -.L80241BCC: -/* 80244C 80241BCC 8C620000 */ lw $v0, ($v1) -/* 802450 80241BD0 0082102A */ slt $v0, $a0, $v0 -/* 802454 80241BD4 1440FFF2 */ bnez $v0, .L80241BA0 -/* 802458 80241BD8 24A5000C */ addiu $a1, $a1, 0xc -.L80241BDC: -/* 80245C 80241BDC C6400000 */ lwc1 $f0, ($s2) -/* 802460 80241BE0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 802464 80241BE4 8E0200CC */ lw $v0, 0xcc($s0) -/* 802468 80241BE8 8C420004 */ lw $v0, 4($v0) -/* 80246C 80241BEC ACC20028 */ sw $v0, 0x28($a2) -/* 802470 80241BF0 24020001 */ addiu $v0, $zero, 1 -/* 802474 80241BF4 AE200074 */ sw $zero, 0x74($s1) -/* 802478 80241BF8 AE220070 */ sw $v0, 0x70($s1) -/* 80247C 80241BFC 8FBF001C */ lw $ra, 0x1c($sp) -/* 802480 80241C00 8FB20018 */ lw $s2, 0x18($sp) -/* 802484 80241C04 8FB10014 */ lw $s1, 0x14($sp) -/* 802488 80241C08 8FB00010 */ lw $s0, 0x10($sp) -/* 80248C 80241C0C 03E00008 */ jr $ra -/* 802490 80241C10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s new file mode 100644 index 0000000000..de6f326f56 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241B54_8023D4.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B54_8023D4 +/* 8023D4 80241B54 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8023D8 80241B58 AFB10014 */ sw $s1, 0x14($sp) +/* 8023DC 80241B5C 0080882D */ daddu $s1, $a0, $zero +/* 8023E0 80241B60 AFBF001C */ sw $ra, 0x1c($sp) +/* 8023E4 80241B64 AFB20018 */ sw $s2, 0x18($sp) +/* 8023E8 80241B68 AFB00010 */ sw $s0, 0x10($sp) +/* 8023EC 80241B6C 8E300148 */ lw $s0, 0x148($s1) +/* 8023F0 80241B70 86040008 */ lh $a0, 8($s0) +/* 8023F4 80241B74 0C00EABB */ jal get_npc_unsafe +/* 8023F8 80241B78 00A0902D */ daddu $s2, $a1, $zero +/* 8023FC 80241B7C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 802400 80241B80 8E240078 */ lw $a0, 0x78($s1) +/* 802404 80241B84 8C630000 */ lw $v1, ($v1) +/* 802408 80241B88 0083182A */ slt $v1, $a0, $v1 +/* 80240C 80241B8C 10600013 */ beqz $v1, .L80241BDC +/* 802410 80241B90 0040302D */ daddu $a2, $v0, $zero +/* 802414 80241B94 00041040 */ sll $v0, $a0, 1 +/* 802418 80241B98 00441021 */ addu $v0, $v0, $a0 +/* 80241C 80241B9C 00022880 */ sll $a1, $v0, 2 +.L80241BA0: +/* 802420 80241BA0 8E0300D0 */ lw $v1, 0xd0($s0) +/* 802424 80241BA4 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* 802428 80241BA8 00A31021 */ addu $v0, $a1, $v1 +/* 80242C 80241BAC C4400008 */ lwc1 $f0, 8($v0) +/* 802430 80241BB0 46800020 */ cvt.s.w $f0, $f0 +/* 802434 80241BB4 4602003E */ c.le.s $f0, $f2 +/* 802438 80241BB8 00000000 */ nop +/* 80243C 80241BBC 45020003 */ bc1fl .L80241BCC +/* 802440 80241BC0 24840001 */ addiu $a0, $a0, 1 +/* 802444 80241BC4 080906F7 */ j .L80241BDC +/* 802448 80241BC8 AE240078 */ sw $a0, 0x78($s1) +.L80241BCC: +/* 80244C 80241BCC 8C620000 */ lw $v0, ($v1) +/* 802450 80241BD0 0082102A */ slt $v0, $a0, $v0 +/* 802454 80241BD4 1440FFF2 */ bnez $v0, .L80241BA0 +/* 802458 80241BD8 24A5000C */ addiu $a1, $a1, 0xc +.L80241BDC: +/* 80245C 80241BDC C6400000 */ lwc1 $f0, ($s2) +/* 802460 80241BE0 E4C00018 */ swc1 $f0, 0x18($a2) +/* 802464 80241BE4 8E0200CC */ lw $v0, 0xcc($s0) +/* 802468 80241BE8 8C420004 */ lw $v0, 4($v0) +/* 80246C 80241BEC ACC20028 */ sw $v0, 0x28($a2) +/* 802470 80241BF0 24020001 */ addiu $v0, $zero, 1 +/* 802474 80241BF4 AE200074 */ sw $zero, 0x74($s1) +/* 802478 80241BF8 AE220070 */ sw $v0, 0x70($s1) +/* 80247C 80241BFC 8FBF001C */ lw $ra, 0x1c($sp) +/* 802480 80241C00 8FB20018 */ lw $s2, 0x18($sp) +/* 802484 80241C04 8FB10014 */ lw $s1, 0x14($sp) +/* 802488 80241C08 8FB00010 */ lw $s0, 0x10($sp) +/* 80248C 80241C0C 03E00008 */ jr $ra +/* 802490 80241C10 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14.s deleted file mode 100644 index 0aad724a49..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C14 -/* 802494 80241C14 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 802498 80241C18 AFB40058 */ sw $s4, 0x58($sp) -/* 80249C 80241C1C 0080A02D */ daddu $s4, $a0, $zero -/* 8024A0 80241C20 AFBF0060 */ sw $ra, 0x60($sp) -/* 8024A4 80241C24 AFB5005C */ sw $s5, 0x5c($sp) -/* 8024A8 80241C28 AFB30054 */ sw $s3, 0x54($sp) -/* 8024AC 80241C2C AFB20050 */ sw $s2, 0x50($sp) -/* 8024B0 80241C30 AFB1004C */ sw $s1, 0x4c($sp) -/* 8024B4 80241C34 AFB00048 */ sw $s0, 0x48($sp) -/* 8024B8 80241C38 8E910148 */ lw $s1, 0x148($s4) -/* 8024BC 80241C3C 86240008 */ lh $a0, 8($s1) -/* 8024C0 80241C40 0C00EABB */ jal get_npc_unsafe -/* 8024C4 80241C44 00A0802D */ daddu $s0, $a1, $zero -/* 8024C8 80241C48 8E83000C */ lw $v1, 0xc($s4) -/* 8024CC 80241C4C 0280202D */ daddu $a0, $s4, $zero -/* 8024D0 80241C50 8C650000 */ lw $a1, ($v1) -/* 8024D4 80241C54 0C0B1EAF */ jal get_variable -/* 8024D8 80241C58 0040902D */ daddu $s2, $v0, $zero -/* 8024DC 80241C5C AFA00018 */ sw $zero, 0x18($sp) -/* 8024E0 80241C60 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8024E4 80241C64 8C630094 */ lw $v1, 0x94($v1) -/* 8024E8 80241C68 AFA3001C */ sw $v1, 0x1c($sp) -/* 8024EC 80241C6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8024F0 80241C70 8C630080 */ lw $v1, 0x80($v1) -/* 8024F4 80241C74 AFA30020 */ sw $v1, 0x20($sp) -/* 8024F8 80241C78 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8024FC 80241C7C 8C630088 */ lw $v1, 0x88($v1) -/* 802500 80241C80 AFA30024 */ sw $v1, 0x24($sp) -/* 802504 80241C84 8E2300D0 */ lw $v1, 0xd0($s1) -/* 802508 80241C88 8C63008C */ lw $v1, 0x8c($v1) -/* 80250C 80241C8C 27B50018 */ addiu $s5, $sp, 0x18 -/* 802510 80241C90 AFA30028 */ sw $v1, 0x28($sp) -/* 802514 80241C94 8E2300D0 */ lw $v1, 0xd0($s1) -/* 802518 80241C98 3C014282 */ lui $at, 0x4282 -/* 80251C 80241C9C 44810000 */ mtc1 $at, $f0 -/* 802520 80241CA0 8C630090 */ lw $v1, 0x90($v1) -/* 802524 80241CA4 0040982D */ daddu $s3, $v0, $zero -/* 802528 80241CA8 E7A00030 */ swc1 $f0, 0x30($sp) -/* 80252C 80241CAC A7A00034 */ sh $zero, 0x34($sp) -/* 802530 80241CB0 16000005 */ bnez $s0, .L80241CC8 -/* 802534 80241CB4 AFA3002C */ sw $v1, 0x2c($sp) -/* 802538 80241CB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 80253C 80241CBC 30420004 */ andi $v0, $v0, 4 -/* 802540 80241CC0 10400044 */ beqz $v0, .L80241DD4 -/* 802544 80241CC4 00000000 */ nop -.L80241CC8: -/* 802548 80241CC8 2404F7FF */ addiu $a0, $zero, -0x801 -/* 80254C 80241CCC AE800070 */ sw $zero, 0x70($s4) -/* 802550 80241CD0 A640008E */ sh $zero, 0x8e($s2) -/* 802554 80241CD4 8E2200CC */ lw $v0, 0xcc($s1) -/* 802558 80241CD8 8E430000 */ lw $v1, ($s2) -/* 80255C 80241CDC 8C420000 */ lw $v0, ($v0) -/* 802560 80241CE0 00641824 */ and $v1, $v1, $a0 -/* 802564 80241CE4 AE430000 */ sw $v1, ($s2) -/* 802568 80241CE8 AE420028 */ sw $v0, 0x28($s2) -/* 80256C 80241CEC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 802570 80241CF0 8C420098 */ lw $v0, 0x98($v0) -/* 802574 80241CF4 54400005 */ bnel $v0, $zero, .L80241D0C -/* 802578 80241CF8 2402FDFF */ addiu $v0, $zero, -0x201 -/* 80257C 80241CFC 34620200 */ ori $v0, $v1, 0x200 -/* 802580 80241D00 2403FFF7 */ addiu $v1, $zero, -9 -/* 802584 80241D04 08090745 */ j .L80241D14 -/* 802588 80241D08 00431024 */ and $v0, $v0, $v1 -.L80241D0C: -/* 80258C 80241D0C 00621024 */ and $v0, $v1, $v0 -/* 802590 80241D10 34420008 */ ori $v0, $v0, 8 -.L80241D14: -/* 802594 80241D14 AE420000 */ sw $v0, ($s2) -/* 802598 80241D18 8E2200B0 */ lw $v0, 0xb0($s1) -/* 80259C 80241D1C 30420004 */ andi $v0, $v0, 4 -/* 8025A0 80241D20 10400008 */ beqz $v0, .L80241D44 -/* 8025A4 80241D24 24020063 */ addiu $v0, $zero, 0x63 -/* 8025A8 80241D28 AE820070 */ sw $v0, 0x70($s4) -/* 8025AC 80241D2C AE800074 */ sw $zero, 0x74($s4) -/* 8025B0 80241D30 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8025B4 80241D34 2403FFFB */ addiu $v1, $zero, -5 -/* 8025B8 80241D38 00431024 */ and $v0, $v0, $v1 -/* 8025BC 80241D3C 0809075C */ j .L80241D70 -/* 8025C0 80241D40 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241D44: -/* 8025C4 80241D44 8E220000 */ lw $v0, ($s1) -/* 8025C8 80241D48 3C034000 */ lui $v1, 0x4000 -/* 8025CC 80241D4C 00431024 */ and $v0, $v0, $v1 -/* 8025D0 80241D50 10400007 */ beqz $v0, .L80241D70 -/* 8025D4 80241D54 3C03BFFF */ lui $v1, 0xbfff -/* 8025D8 80241D58 2402000C */ addiu $v0, $zero, 0xc -/* 8025DC 80241D5C AE820070 */ sw $v0, 0x70($s4) -/* 8025E0 80241D60 8E220000 */ lw $v0, ($s1) -/* 8025E4 80241D64 3463FFFF */ ori $v1, $v1, 0xffff -/* 8025E8 80241D68 00431024 */ and $v0, $v0, $v1 -/* 8025EC 80241D6C AE220000 */ sw $v0, ($s1) -.L80241D70: -/* 8025F0 80241D70 27A50038 */ addiu $a1, $sp, 0x38 -/* 8025F4 80241D74 27A6003C */ addiu $a2, $sp, 0x3c -/* 8025F8 80241D78 C6400038 */ lwc1 $f0, 0x38($s2) -/* 8025FC 80241D7C 864200A8 */ lh $v0, 0xa8($s2) -/* 802600 80241D80 3C0142C8 */ lui $at, 0x42c8 -/* 802604 80241D84 44812000 */ mtc1 $at, $f4 -/* 802608 80241D88 44823000 */ mtc1 $v0, $f6 -/* 80260C 80241D8C 00000000 */ nop -/* 802610 80241D90 468031A0 */ cvt.s.w $f6, $f6 -/* 802614 80241D94 27A20044 */ addiu $v0, $sp, 0x44 -/* 802618 80241D98 E7A00038 */ swc1 $f0, 0x38($sp) -/* 80261C 80241D9C C640003C */ lwc1 $f0, 0x3c($s2) -/* 802620 80241DA0 C6420040 */ lwc1 $f2, 0x40($s2) -/* 802624 80241DA4 46060000 */ add.s $f0, $f0, $f6 -/* 802628 80241DA8 E7A40044 */ swc1 $f4, 0x44($sp) -/* 80262C 80241DAC E7A20040 */ swc1 $f2, 0x40($sp) -/* 802630 80241DB0 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 802634 80241DB4 AFA20010 */ sw $v0, 0x10($sp) -/* 802638 80241DB8 8E440080 */ lw $a0, 0x80($s2) -/* 80263C 80241DBC 0C0372DF */ jal func_800DCB7C -/* 802640 80241DC0 27A70040 */ addiu $a3, $sp, 0x40 -/* 802644 80241DC4 10400003 */ beqz $v0, .L80241DD4 -/* 802648 80241DC8 00000000 */ nop -/* 80264C 80241DCC C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 802650 80241DD0 E640003C */ swc1 $f0, 0x3c($s2) -.L80241DD4: -/* 802654 80241DD4 8E830070 */ lw $v1, 0x70($s4) -/* 802658 80241DD8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 80265C 80241DDC 10400042 */ beqz $v0, .L80241EE8 -/* 802660 80241DE0 00031080 */ sll $v0, $v1, 2 -/* 802664 80241DE4 3C018026 */ lui $at, 0x8026 -/* 802668 80241DE8 00220821 */ addu $at, $at, $v0 -/* 80266C 80241DEC 8C2226F0 */ lw $v0, 0x26f0($at) -/* 802670 80241DF0 00400008 */ jr $v0 -/* 802674 80241DF4 00000000 */ nop -/* 802678 80241DF8 0280202D */ daddu $a0, $s4, $zero -/* 80267C 80241DFC 0260282D */ daddu $a1, $s3, $zero -/* 802680 80241E00 0C090420 */ jal func_80241080 -/* 802684 80241E04 02A0302D */ daddu $a2, $s5, $zero -/* 802688 80241E08 0280202D */ daddu $a0, $s4, $zero -/* 80268C 80241E0C 0260282D */ daddu $a1, $s3, $zero -/* 802690 80241E10 0C090476 */ jal func_802411D8 -/* 802694 80241E14 02A0302D */ daddu $a2, $s5, $zero -/* 802698 80241E18 080907BA */ j .L80241EE8 -/* 80269C 80241E1C 00000000 */ nop -/* 8026A0 80241E20 0280202D */ daddu $a0, $s4, $zero -/* 8026A4 80241E24 0260282D */ daddu $a1, $s3, $zero -/* 8026A8 80241E28 0C090520 */ jal func_80241480 -/* 8026AC 80241E2C 02A0302D */ daddu $a2, $s5, $zero -/* 8026B0 80241E30 0280202D */ daddu $a0, $s4, $zero -/* 8026B4 80241E34 0260282D */ daddu $a1, $s3, $zero -/* 8026B8 80241E38 0C090550 */ jal func_80241540 -/* 8026BC 80241E3C 02A0302D */ daddu $a2, $s5, $zero -/* 8026C0 80241E40 080907BA */ j .L80241EE8 -/* 8026C4 80241E44 00000000 */ nop -/* 8026C8 80241E48 0280202D */ daddu $a0, $s4, $zero -/* 8026CC 80241E4C 0260282D */ daddu $a1, $s3, $zero -/* 8026D0 80241E50 0C0905BF */ jal func_802416FC -/* 8026D4 80241E54 02A0302D */ daddu $a2, $s5, $zero -/* 8026D8 80241E58 080907BA */ j .L80241EE8 -/* 8026DC 80241E5C 00000000 */ nop -/* 8026E0 80241E60 0280202D */ daddu $a0, $s4, $zero -/* 8026E4 80241E64 0260282D */ daddu $a1, $s3, $zero -/* 8026E8 80241E68 0C0905EC */ jal func_802417B0 -/* 8026EC 80241E6C 02A0302D */ daddu $a2, $s5, $zero -/* 8026F0 80241E70 0280202D */ daddu $a0, $s4, $zero -/* 8026F4 80241E74 0260282D */ daddu $a1, $s3, $zero -/* 8026F8 80241E78 0C090609 */ jal func_80241824 -/* 8026FC 80241E7C 02A0302D */ daddu $a2, $s5, $zero -/* 802700 80241E80 080907BA */ j .L80241EE8 -/* 802704 80241E84 00000000 */ nop -/* 802708 80241E88 0280202D */ daddu $a0, $s4, $zero -/* 80270C 80241E8C 0260282D */ daddu $a1, $s3, $zero -/* 802710 80241E90 0C090627 */ jal func_8024189C -/* 802714 80241E94 02A0302D */ daddu $a2, $s5, $zero -/* 802718 80241E98 0280202D */ daddu $a0, $s4, $zero -/* 80271C 80241E9C 0260282D */ daddu $a1, $s3, $zero -/* 802720 80241EA0 0C090673 */ jal func_802419CC -/* 802724 80241EA4 02A0302D */ daddu $a2, $s5, $zero -/* 802728 80241EA8 080907BA */ j .L80241EE8 -/* 80272C 80241EAC 00000000 */ nop -/* 802730 80241EB0 0280202D */ daddu $a0, $s4, $zero -/* 802734 80241EB4 0260282D */ daddu $a1, $s3, $zero -/* 802738 80241EB8 0C0906BB */ jal func_80241AEC -/* 80273C 80241EBC 02A0302D */ daddu $a2, $s5, $zero -/* 802740 80241EC0 080907BA */ j .L80241EE8 -/* 802744 80241EC4 00000000 */ nop -/* 802748 80241EC8 0280202D */ daddu $a0, $s4, $zero -/* 80274C 80241ECC 0260282D */ daddu $a1, $s3, $zero -/* 802750 80241ED0 0C0906D5 */ jal func_80241B54 -/* 802754 80241ED4 02A0302D */ daddu $a2, $s5, $zero -/* 802758 80241ED8 080907BA */ j .L80241EE8 -/* 80275C 80241EDC 00000000 */ nop -/* 802760 80241EE0 0C0129CF */ jal func_8004A73C -/* 802764 80241EE4 0280202D */ daddu $a0, $s4, $zero -.L80241EE8: -/* 802768 80241EE8 8FBF0060 */ lw $ra, 0x60($sp) -/* 80276C 80241EEC 8FB5005C */ lw $s5, 0x5c($sp) -/* 802770 80241EF0 8FB40058 */ lw $s4, 0x58($sp) -/* 802774 80241EF4 8FB30054 */ lw $s3, 0x54($sp) -/* 802778 80241EF8 8FB20050 */ lw $s2, 0x50($sp) -/* 80277C 80241EFC 8FB1004C */ lw $s1, 0x4c($sp) -/* 802780 80241F00 8FB00048 */ lw $s0, 0x48($sp) -/* 802784 80241F04 0000102D */ daddu $v0, $zero, $zero -/* 802788 80241F08 03E00008 */ jr $ra -/* 80278C 80241F0C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s new file mode 100644 index 0000000000..a21dd82c7f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241C14_802494.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C14_802494 +/* 802494 80241C14 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 802498 80241C18 AFB40058 */ sw $s4, 0x58($sp) +/* 80249C 80241C1C 0080A02D */ daddu $s4, $a0, $zero +/* 8024A0 80241C20 AFBF0060 */ sw $ra, 0x60($sp) +/* 8024A4 80241C24 AFB5005C */ sw $s5, 0x5c($sp) +/* 8024A8 80241C28 AFB30054 */ sw $s3, 0x54($sp) +/* 8024AC 80241C2C AFB20050 */ sw $s2, 0x50($sp) +/* 8024B0 80241C30 AFB1004C */ sw $s1, 0x4c($sp) +/* 8024B4 80241C34 AFB00048 */ sw $s0, 0x48($sp) +/* 8024B8 80241C38 8E910148 */ lw $s1, 0x148($s4) +/* 8024BC 80241C3C 86240008 */ lh $a0, 8($s1) +/* 8024C0 80241C40 0C00EABB */ jal get_npc_unsafe +/* 8024C4 80241C44 00A0802D */ daddu $s0, $a1, $zero +/* 8024C8 80241C48 8E83000C */ lw $v1, 0xc($s4) +/* 8024CC 80241C4C 0280202D */ daddu $a0, $s4, $zero +/* 8024D0 80241C50 8C650000 */ lw $a1, ($v1) +/* 8024D4 80241C54 0C0B1EAF */ jal get_variable +/* 8024D8 80241C58 0040902D */ daddu $s2, $v0, $zero +/* 8024DC 80241C5C AFA00018 */ sw $zero, 0x18($sp) +/* 8024E0 80241C60 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8024E4 80241C64 8C630094 */ lw $v1, 0x94($v1) +/* 8024E8 80241C68 AFA3001C */ sw $v1, 0x1c($sp) +/* 8024EC 80241C6C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8024F0 80241C70 8C630080 */ lw $v1, 0x80($v1) +/* 8024F4 80241C74 AFA30020 */ sw $v1, 0x20($sp) +/* 8024F8 80241C78 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8024FC 80241C7C 8C630088 */ lw $v1, 0x88($v1) +/* 802500 80241C80 AFA30024 */ sw $v1, 0x24($sp) +/* 802504 80241C84 8E2300D0 */ lw $v1, 0xd0($s1) +/* 802508 80241C88 8C63008C */ lw $v1, 0x8c($v1) +/* 80250C 80241C8C 27B50018 */ addiu $s5, $sp, 0x18 +/* 802510 80241C90 AFA30028 */ sw $v1, 0x28($sp) +/* 802514 80241C94 8E2300D0 */ lw $v1, 0xd0($s1) +/* 802518 80241C98 3C014282 */ lui $at, 0x4282 +/* 80251C 80241C9C 44810000 */ mtc1 $at, $f0 +/* 802520 80241CA0 8C630090 */ lw $v1, 0x90($v1) +/* 802524 80241CA4 0040982D */ daddu $s3, $v0, $zero +/* 802528 80241CA8 E7A00030 */ swc1 $f0, 0x30($sp) +/* 80252C 80241CAC A7A00034 */ sh $zero, 0x34($sp) +/* 802530 80241CB0 16000005 */ bnez $s0, .L80241CC8 +/* 802534 80241CB4 AFA3002C */ sw $v1, 0x2c($sp) +/* 802538 80241CB8 8E2200B0 */ lw $v0, 0xb0($s1) +/* 80253C 80241CBC 30420004 */ andi $v0, $v0, 4 +/* 802540 80241CC0 10400044 */ beqz $v0, .L80241DD4 +/* 802544 80241CC4 00000000 */ nop +.L80241CC8: +/* 802548 80241CC8 2404F7FF */ addiu $a0, $zero, -0x801 +/* 80254C 80241CCC AE800070 */ sw $zero, 0x70($s4) +/* 802550 80241CD0 A640008E */ sh $zero, 0x8e($s2) +/* 802554 80241CD4 8E2200CC */ lw $v0, 0xcc($s1) +/* 802558 80241CD8 8E430000 */ lw $v1, ($s2) +/* 80255C 80241CDC 8C420000 */ lw $v0, ($v0) +/* 802560 80241CE0 00641824 */ and $v1, $v1, $a0 +/* 802564 80241CE4 AE430000 */ sw $v1, ($s2) +/* 802568 80241CE8 AE420028 */ sw $v0, 0x28($s2) +/* 80256C 80241CEC 8E2200D0 */ lw $v0, 0xd0($s1) +/* 802570 80241CF0 8C420098 */ lw $v0, 0x98($v0) +/* 802574 80241CF4 54400005 */ bnel $v0, $zero, .L80241D0C +/* 802578 80241CF8 2402FDFF */ addiu $v0, $zero, -0x201 +/* 80257C 80241CFC 34620200 */ ori $v0, $v1, 0x200 +/* 802580 80241D00 2403FFF7 */ addiu $v1, $zero, -9 +/* 802584 80241D04 08090745 */ j .L80241D14 +/* 802588 80241D08 00431024 */ and $v0, $v0, $v1 +.L80241D0C: +/* 80258C 80241D0C 00621024 */ and $v0, $v1, $v0 +/* 802590 80241D10 34420008 */ ori $v0, $v0, 8 +.L80241D14: +/* 802594 80241D14 AE420000 */ sw $v0, ($s2) +/* 802598 80241D18 8E2200B0 */ lw $v0, 0xb0($s1) +/* 80259C 80241D1C 30420004 */ andi $v0, $v0, 4 +/* 8025A0 80241D20 10400008 */ beqz $v0, .L80241D44 +/* 8025A4 80241D24 24020063 */ addiu $v0, $zero, 0x63 +/* 8025A8 80241D28 AE820070 */ sw $v0, 0x70($s4) +/* 8025AC 80241D2C AE800074 */ sw $zero, 0x74($s4) +/* 8025B0 80241D30 8E2200B0 */ lw $v0, 0xb0($s1) +/* 8025B4 80241D34 2403FFFB */ addiu $v1, $zero, -5 +/* 8025B8 80241D38 00431024 */ and $v0, $v0, $v1 +/* 8025BC 80241D3C 0809075C */ j .L80241D70 +/* 8025C0 80241D40 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241D44: +/* 8025C4 80241D44 8E220000 */ lw $v0, ($s1) +/* 8025C8 80241D48 3C034000 */ lui $v1, 0x4000 +/* 8025CC 80241D4C 00431024 */ and $v0, $v0, $v1 +/* 8025D0 80241D50 10400007 */ beqz $v0, .L80241D70 +/* 8025D4 80241D54 3C03BFFF */ lui $v1, 0xbfff +/* 8025D8 80241D58 2402000C */ addiu $v0, $zero, 0xc +/* 8025DC 80241D5C AE820070 */ sw $v0, 0x70($s4) +/* 8025E0 80241D60 8E220000 */ lw $v0, ($s1) +/* 8025E4 80241D64 3463FFFF */ ori $v1, $v1, 0xffff +/* 8025E8 80241D68 00431024 */ and $v0, $v0, $v1 +/* 8025EC 80241D6C AE220000 */ sw $v0, ($s1) +.L80241D70: +/* 8025F0 80241D70 27A50038 */ addiu $a1, $sp, 0x38 +/* 8025F4 80241D74 27A6003C */ addiu $a2, $sp, 0x3c +/* 8025F8 80241D78 C6400038 */ lwc1 $f0, 0x38($s2) +/* 8025FC 80241D7C 864200A8 */ lh $v0, 0xa8($s2) +/* 802600 80241D80 3C0142C8 */ lui $at, 0x42c8 +/* 802604 80241D84 44812000 */ mtc1 $at, $f4 +/* 802608 80241D88 44823000 */ mtc1 $v0, $f6 +/* 80260C 80241D8C 00000000 */ nop +/* 802610 80241D90 468031A0 */ cvt.s.w $f6, $f6 +/* 802614 80241D94 27A20044 */ addiu $v0, $sp, 0x44 +/* 802618 80241D98 E7A00038 */ swc1 $f0, 0x38($sp) +/* 80261C 80241D9C C640003C */ lwc1 $f0, 0x3c($s2) +/* 802620 80241DA0 C6420040 */ lwc1 $f2, 0x40($s2) +/* 802624 80241DA4 46060000 */ add.s $f0, $f0, $f6 +/* 802628 80241DA8 E7A40044 */ swc1 $f4, 0x44($sp) +/* 80262C 80241DAC E7A20040 */ swc1 $f2, 0x40($sp) +/* 802630 80241DB0 E7A0003C */ swc1 $f0, 0x3c($sp) +/* 802634 80241DB4 AFA20010 */ sw $v0, 0x10($sp) +/* 802638 80241DB8 8E440080 */ lw $a0, 0x80($s2) +/* 80263C 80241DBC 0C0372DF */ jal func_800DCB7C +/* 802640 80241DC0 27A70040 */ addiu $a3, $sp, 0x40 +/* 802644 80241DC4 10400003 */ beqz $v0, .L80241DD4 +/* 802648 80241DC8 00000000 */ nop +/* 80264C 80241DCC C7A0003C */ lwc1 $f0, 0x3c($sp) +/* 802650 80241DD0 E640003C */ swc1 $f0, 0x3c($s2) +.L80241DD4: +/* 802654 80241DD4 8E830070 */ lw $v1, 0x70($s4) +/* 802658 80241DD8 2C620064 */ sltiu $v0, $v1, 0x64 +/* 80265C 80241DDC 10400042 */ beqz $v0, .L80241EE8 +/* 802660 80241DE0 00031080 */ sll $v0, $v1, 2 +/* 802664 80241DE4 3C018026 */ lui $at, 0x8026 +/* 802668 80241DE8 00220821 */ addu $at, $at, $v0 +/* 80266C 80241DEC 8C2226F0 */ lw $v0, 0x26f0($at) +/* 802670 80241DF0 00400008 */ jr $v0 +/* 802674 80241DF4 00000000 */ nop +/* 802678 80241DF8 0280202D */ daddu $a0, $s4, $zero +/* 80267C 80241DFC 0260282D */ daddu $a1, $s3, $zero +/* 802680 80241E00 0C090420 */ jal func_80241080_801900 +/* 802684 80241E04 02A0302D */ daddu $a2, $s5, $zero +/* 802688 80241E08 0280202D */ daddu $a0, $s4, $zero +/* 80268C 80241E0C 0260282D */ daddu $a1, $s3, $zero +/* 802690 80241E10 0C090476 */ jal func_802411D8_801A58 +/* 802694 80241E14 02A0302D */ daddu $a2, $s5, $zero +/* 802698 80241E18 080907BA */ j .L80241EE8 +/* 80269C 80241E1C 00000000 */ nop +/* 8026A0 80241E20 0280202D */ daddu $a0, $s4, $zero +/* 8026A4 80241E24 0260282D */ daddu $a1, $s3, $zero +/* 8026A8 80241E28 0C090520 */ jal func_80241480_801D00 +/* 8026AC 80241E2C 02A0302D */ daddu $a2, $s5, $zero +/* 8026B0 80241E30 0280202D */ daddu $a0, $s4, $zero +/* 8026B4 80241E34 0260282D */ daddu $a1, $s3, $zero +/* 8026B8 80241E38 0C090550 */ jal func_80241540_801DC0 +/* 8026BC 80241E3C 02A0302D */ daddu $a2, $s5, $zero +/* 8026C0 80241E40 080907BA */ j .L80241EE8 +/* 8026C4 80241E44 00000000 */ nop +/* 8026C8 80241E48 0280202D */ daddu $a0, $s4, $zero +/* 8026CC 80241E4C 0260282D */ daddu $a1, $s3, $zero +/* 8026D0 80241E50 0C0905BF */ jal func_802416FC_801F7C +/* 8026D4 80241E54 02A0302D */ daddu $a2, $s5, $zero +/* 8026D8 80241E58 080907BA */ j .L80241EE8 +/* 8026DC 80241E5C 00000000 */ nop +/* 8026E0 80241E60 0280202D */ daddu $a0, $s4, $zero +/* 8026E4 80241E64 0260282D */ daddu $a1, $s3, $zero +/* 8026E8 80241E68 0C0905EC */ jal func_802417B0_802030 +/* 8026EC 80241E6C 02A0302D */ daddu $a2, $s5, $zero +/* 8026F0 80241E70 0280202D */ daddu $a0, $s4, $zero +/* 8026F4 80241E74 0260282D */ daddu $a1, $s3, $zero +/* 8026F8 80241E78 0C090609 */ jal func_80241824_8020A4 +/* 8026FC 80241E7C 02A0302D */ daddu $a2, $s5, $zero +/* 802700 80241E80 080907BA */ j .L80241EE8 +/* 802704 80241E84 00000000 */ nop +/* 802708 80241E88 0280202D */ daddu $a0, $s4, $zero +/* 80270C 80241E8C 0260282D */ daddu $a1, $s3, $zero +/* 802710 80241E90 0C090627 */ jal func_8024189C_80211C +/* 802714 80241E94 02A0302D */ daddu $a2, $s5, $zero +/* 802718 80241E98 0280202D */ daddu $a0, $s4, $zero +/* 80271C 80241E9C 0260282D */ daddu $a1, $s3, $zero +/* 802720 80241EA0 0C090673 */ jal func_802419CC_80224C +/* 802724 80241EA4 02A0302D */ daddu $a2, $s5, $zero +/* 802728 80241EA8 080907BA */ j .L80241EE8 +/* 80272C 80241EAC 00000000 */ nop +/* 802730 80241EB0 0280202D */ daddu $a0, $s4, $zero +/* 802734 80241EB4 0260282D */ daddu $a1, $s3, $zero +/* 802738 80241EB8 0C0906BB */ jal func_80241AEC_80236C +/* 80273C 80241EBC 02A0302D */ daddu $a2, $s5, $zero +/* 802740 80241EC0 080907BA */ j .L80241EE8 +/* 802744 80241EC4 00000000 */ nop +/* 802748 80241EC8 0280202D */ daddu $a0, $s4, $zero +/* 80274C 80241ECC 0260282D */ daddu $a1, $s3, $zero +/* 802750 80241ED0 0C0906D5 */ jal func_80241B54_8023D4 +/* 802754 80241ED4 02A0302D */ daddu $a2, $s5, $zero +/* 802758 80241ED8 080907BA */ j .L80241EE8 +/* 80275C 80241EDC 00000000 */ nop +/* 802760 80241EE0 0C0129CF */ jal func_8004A73C +/* 802764 80241EE4 0280202D */ daddu $a0, $s4, $zero +.L80241EE8: +/* 802768 80241EE8 8FBF0060 */ lw $ra, 0x60($sp) +/* 80276C 80241EEC 8FB5005C */ lw $s5, 0x5c($sp) +/* 802770 80241EF0 8FB40058 */ lw $s4, 0x58($sp) +/* 802774 80241EF4 8FB30054 */ lw $s3, 0x54($sp) +/* 802778 80241EF8 8FB20050 */ lw $s2, 0x50($sp) +/* 80277C 80241EFC 8FB1004C */ lw $s1, 0x4c($sp) +/* 802780 80241F00 8FB00048 */ lw $s0, 0x48($sp) +/* 802784 80241F04 0000102D */ daddu $v0, $zero, $zero +/* 802788 80241F08 03E00008 */ jr $ra +/* 80278C 80241F0C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10.s deleted file mode 100644 index deea3353e1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F10 -/* 802790 80241F10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 802794 80241F14 AFB00010 */ sw $s0, 0x10($sp) -/* 802798 80241F18 3C108025 */ lui $s0, 0x8025 -/* 80279C 80241F1C 26108C30 */ addiu $s0, $s0, -0x73d0 -/* 8027A0 80241F20 AFBF0018 */ sw $ra, 0x18($sp) -/* 8027A4 80241F24 AFB10014 */ sw $s1, 0x14($sp) -/* 8027A8 80241F28 8E020000 */ lw $v0, ($s0) -/* 8027AC 80241F2C 14400010 */ bnez $v0, .L80241F70 -/* 8027B0 80241F30 0080882D */ daddu $s1, $a0, $zero -/* 8027B4 80241F34 0C00AB39 */ jal heap_malloc -/* 8027B8 80241F38 24040040 */ addiu $a0, $zero, 0x40 -/* 8027BC 80241F3C AE020000 */ sw $v0, ($s0) -/* 8027C0 80241F40 0000182D */ daddu $v1, $zero, $zero -/* 8027C4 80241F44 0040282D */ daddu $a1, $v0, $zero -/* 8027C8 80241F48 0220202D */ daddu $a0, $s1, $zero -.L80241F4C: -/* 8027CC 80241F4C 8C820084 */ lw $v0, 0x84($a0) -/* 8027D0 80241F50 24840004 */ addiu $a0, $a0, 4 -/* 8027D4 80241F54 24630001 */ addiu $v1, $v1, 1 -/* 8027D8 80241F58 ACA20000 */ sw $v0, ($a1) -/* 8027DC 80241F5C 28620010 */ slti $v0, $v1, 0x10 -/* 8027E0 80241F60 1440FFFA */ bnez $v0, .L80241F4C -/* 8027E4 80241F64 24A50004 */ addiu $a1, $a1, 4 -/* 8027E8 80241F68 080907EB */ j .L80241FAC -/* 8027EC 80241F6C 00000000 */ nop -.L80241F70: -/* 8027F0 80241F70 0000182D */ daddu $v1, $zero, $zero -/* 8027F4 80241F74 0040282D */ daddu $a1, $v0, $zero -/* 8027F8 80241F78 0220202D */ daddu $a0, $s1, $zero -.L80241F7C: -/* 8027FC 80241F7C 8CA20000 */ lw $v0, ($a1) -/* 802800 80241F80 24A50004 */ addiu $a1, $a1, 4 -/* 802804 80241F84 24630001 */ addiu $v1, $v1, 1 -/* 802808 80241F88 AC820084 */ sw $v0, 0x84($a0) -/* 80280C 80241F8C 28620010 */ slti $v0, $v1, 0x10 -/* 802810 80241F90 1440FFFA */ bnez $v0, .L80241F7C -/* 802814 80241F94 24840004 */ addiu $a0, $a0, 4 -/* 802818 80241F98 3C108025 */ lui $s0, 0x8025 -/* 80281C 80241F9C 26108C30 */ addiu $s0, $s0, -0x73d0 -/* 802820 80241FA0 0C00AB4B */ jal heap_free -/* 802824 80241FA4 8E040000 */ lw $a0, ($s0) -/* 802828 80241FA8 AE000000 */ sw $zero, ($s0) -.L80241FAC: -/* 80282C 80241FAC 8FBF0018 */ lw $ra, 0x18($sp) -/* 802830 80241FB0 8FB10014 */ lw $s1, 0x14($sp) -/* 802834 80241FB4 8FB00010 */ lw $s0, 0x10($sp) -/* 802838 80241FB8 24020002 */ addiu $v0, $zero, 2 -/* 80283C 80241FBC 03E00008 */ jr $ra -/* 802840 80241FC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s new file mode 100644 index 0000000000..2c56b777b9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80241F10_802790.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F10_802790 +/* 802790 80241F10 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 802794 80241F14 AFB00010 */ sw $s0, 0x10($sp) +/* 802798 80241F18 3C108025 */ lui $s0, 0x8025 +/* 80279C 80241F1C 26108C30 */ addiu $s0, $s0, -0x73d0 +/* 8027A0 80241F20 AFBF0018 */ sw $ra, 0x18($sp) +/* 8027A4 80241F24 AFB10014 */ sw $s1, 0x14($sp) +/* 8027A8 80241F28 8E020000 */ lw $v0, ($s0) +/* 8027AC 80241F2C 14400010 */ bnez $v0, .L80241F70 +/* 8027B0 80241F30 0080882D */ daddu $s1, $a0, $zero +/* 8027B4 80241F34 0C00AB39 */ jal heap_malloc +/* 8027B8 80241F38 24040040 */ addiu $a0, $zero, 0x40 +/* 8027BC 80241F3C AE020000 */ sw $v0, ($s0) +/* 8027C0 80241F40 0000182D */ daddu $v1, $zero, $zero +/* 8027C4 80241F44 0040282D */ daddu $a1, $v0, $zero +/* 8027C8 80241F48 0220202D */ daddu $a0, $s1, $zero +.L80241F4C: +/* 8027CC 80241F4C 8C820084 */ lw $v0, 0x84($a0) +/* 8027D0 80241F50 24840004 */ addiu $a0, $a0, 4 +/* 8027D4 80241F54 24630001 */ addiu $v1, $v1, 1 +/* 8027D8 80241F58 ACA20000 */ sw $v0, ($a1) +/* 8027DC 80241F5C 28620010 */ slti $v0, $v1, 0x10 +/* 8027E0 80241F60 1440FFFA */ bnez $v0, .L80241F4C +/* 8027E4 80241F64 24A50004 */ addiu $a1, $a1, 4 +/* 8027E8 80241F68 080907EB */ j .L80241FAC +/* 8027EC 80241F6C 00000000 */ nop +.L80241F70: +/* 8027F0 80241F70 0000182D */ daddu $v1, $zero, $zero +/* 8027F4 80241F74 0040282D */ daddu $a1, $v0, $zero +/* 8027F8 80241F78 0220202D */ daddu $a0, $s1, $zero +.L80241F7C: +/* 8027FC 80241F7C 8CA20000 */ lw $v0, ($a1) +/* 802800 80241F80 24A50004 */ addiu $a1, $a1, 4 +/* 802804 80241F84 24630001 */ addiu $v1, $v1, 1 +/* 802808 80241F88 AC820084 */ sw $v0, 0x84($a0) +/* 80280C 80241F8C 28620010 */ slti $v0, $v1, 0x10 +/* 802810 80241F90 1440FFFA */ bnez $v0, .L80241F7C +/* 802814 80241F94 24840004 */ addiu $a0, $a0, 4 +/* 802818 80241F98 3C108025 */ lui $s0, 0x8025 +/* 80281C 80241F9C 26108C30 */ addiu $s0, $s0, -0x73d0 +/* 802820 80241FA0 0C00AB4B */ jal heap_free +/* 802824 80241FA4 8E040000 */ lw $a0, ($s0) +/* 802828 80241FA8 AE000000 */ sw $zero, ($s0) +.L80241FAC: +/* 80282C 80241FAC 8FBF0018 */ lw $ra, 0x18($sp) +/* 802830 80241FB0 8FB10014 */ lw $s1, 0x14($sp) +/* 802834 80241FB4 8FB00010 */ lw $s0, 0x10($sp) +/* 802838 80241FB8 24020002 */ addiu $v0, $zero, 2 +/* 80283C 80241FBC 03E00008 */ jr $ra +/* 802840 80241FC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028.s deleted file mode 100644 index c210aee5d1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242028 -/* 8028A8 80242028 24020001 */ addiu $v0, $zero, 1 -/* 8028AC 8024202C 3C018015 */ lui $at, %hi(D_80151310) -/* 8028B0 80242030 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 8028B4 80242034 03E00008 */ jr $ra -/* 8028B8 80242038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s new file mode 100644 index 0000000000..dee90ec51a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242028_8028A8 +/* 8028A8 80242028 24020001 */ addiu $v0, $zero, 1 +/* 8028AC 8024202C 3C018015 */ lui $at, %hi(D_80151310) +/* 8028B0 80242030 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* 8028B4 80242034 03E00008 */ jr $ra +/* 8028B8 80242038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C.s deleted file mode 100644 index ef7790fa75..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024203C -/* 8028BC 8024203C 3C018015 */ lui $at, %hi(D_80151310) -/* 8028C0 80242040 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 8028C4 80242044 03E00008 */ jr $ra -/* 8028C8 80242048 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s new file mode 100644 index 0000000000..d88bf7c134 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024203C_8028BC +/* 8028BC 8024203C 3C018015 */ lui $at, %hi(D_80151310) +/* 8028C0 80242040 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* 8028C4 80242044 03E00008 */ jr $ra +/* 8028C8 80242048 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C.s deleted file mode 100644 index c3d797feee..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024204C -/* 8028CC 8024204C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8028D0 80242050 AFB10024 */ sw $s1, 0x24($sp) -/* 8028D4 80242054 0080882D */ daddu $s1, $a0, $zero -/* 8028D8 80242058 3C05F840 */ lui $a1, 0xf840 -/* 8028DC 8024205C AFBF0044 */ sw $ra, 0x44($sp) -/* 8028E0 80242060 AFBE0040 */ sw $fp, 0x40($sp) -/* 8028E4 80242064 AFB7003C */ sw $s7, 0x3c($sp) -/* 8028E8 80242068 AFB60038 */ sw $s6, 0x38($sp) -/* 8028EC 8024206C AFB50034 */ sw $s5, 0x34($sp) -/* 8028F0 80242070 AFB40030 */ sw $s4, 0x30($sp) -/* 8028F4 80242074 AFB3002C */ sw $s3, 0x2c($sp) -/* 8028F8 80242078 AFB20028 */ sw $s2, 0x28($sp) -/* 8028FC 8024207C AFB00020 */ sw $s0, 0x20($sp) -/* 802900 80242080 8E3E0148 */ lw $fp, 0x148($s1) -/* 802904 80242084 0C0B1EAF */ jal get_variable -/* 802908 80242088 34A56268 */ ori $a1, $a1, 0x6268 -/* 80290C 8024208C 0040802D */ daddu $s0, $v0, $zero -/* 802910 80242090 0220202D */ daddu $a0, $s1, $zero -/* 802914 80242094 3C05F840 */ lui $a1, 0xf840 -/* 802918 80242098 0C0B1EAF */ jal get_variable -/* 80291C 8024209C 34A56269 */ ori $a1, $a1, 0x6269 -/* 802920 802420A0 0040B82D */ daddu $s7, $v0, $zero -/* 802924 802420A4 0220202D */ daddu $a0, $s1, $zero -/* 802928 802420A8 3C05F5DE */ lui $a1, 0xf5de -/* 80292C 802420AC 0C0B1EAF */ jal get_variable -/* 802930 802420B0 34A502DE */ ori $a1, $a1, 0x2de -/* 802934 802420B4 0040B02D */ daddu $s6, $v0, $zero -/* 802938 802420B8 0220202D */ daddu $a0, $s1, $zero -/* 80293C 802420BC 3C05F5DE */ lui $a1, 0xf5de -/* 802940 802420C0 0C0B1EAF */ jal get_variable -/* 802944 802420C4 34A502DF */ ori $a1, $a1, 0x2df -/* 802948 802420C8 0040A82D */ daddu $s5, $v0, $zero -/* 80294C 802420CC 93D3006D */ lbu $s3, 0x6d($fp) -/* 802950 802420D0 32C2FFFF */ andi $v0, $s6, 0xffff -/* 802954 802420D4 A7B30010 */ sh $s3, 0x10($sp) -/* 802958 802420D8 93D2006E */ lbu $s2, 0x6e($fp) -/* 80295C 802420DC 93C7006F */ lbu $a3, 0x6f($fp) -/* 802960 802420E0 3274FFFF */ andi $s4, $s3, 0xffff -/* 802964 802420E4 12820003 */ beq $s4, $v0, .L802420F4 -/* 802968 802420E8 A7A7001E */ sh $a3, 0x1e($sp) -/* 80296C 802420EC 0000B82D */ daddu $s7, $zero, $zero -/* 802970 802420F0 02E0802D */ daddu $s0, $s7, $zero -.L802420F4: -/* 802974 802420F4 3202FFFF */ andi $v0, $s0, 0xffff -/* 802978 802420F8 14400016 */ bnez $v0, .L80242154 -/* 80297C 802420FC 0220202D */ daddu $a0, $s1, $zero -/* 802980 80242100 0C00A67F */ jal rand_int -/* 802984 80242104 24040064 */ addiu $a0, $zero, 0x64 -/* 802988 80242108 2842001E */ slti $v0, $v0, 0x1e -/* 80298C 8024210C 10400011 */ beqz $v0, .L80242154 -/* 802990 80242110 0220202D */ daddu $a0, $s1, $zero -/* 802994 80242114 0C00A67F */ jal rand_int -/* 802998 80242118 2644FFFF */ addiu $a0, $s2, -1 -/* 80299C 8024211C 0040A82D */ daddu $s5, $v0, $zero -/* 8029A0 80242120 0260B02D */ daddu $s6, $s3, $zero -/* 8029A4 80242124 0220202D */ daddu $a0, $s1, $zero -/* 8029A8 80242128 3C05F5DE */ lui $a1, 0xf5de -/* 8029AC 8024212C 34A502DE */ ori $a1, $a1, 0x2de -/* 8029B0 80242130 0C0B2026 */ jal set_variable -/* 8029B4 80242134 0280302D */ daddu $a2, $s4, $zero -/* 8029B8 80242138 0220202D */ daddu $a0, $s1, $zero -/* 8029BC 8024213C 3C05F5DE */ lui $a1, 0xf5de -/* 8029C0 80242140 34A502DF */ ori $a1, $a1, 0x2df -/* 8029C4 80242144 0C0B2026 */ jal set_variable -/* 8029C8 80242148 32A6FFFF */ andi $a2, $s5, 0xffff -/* 8029CC 8024214C 24100001 */ addiu $s0, $zero, 1 -/* 8029D0 80242150 0220202D */ daddu $a0, $s1, $zero -.L80242154: -/* 8029D4 80242154 3C05F840 */ lui $a1, 0xf840 -/* 8029D8 80242158 34A56268 */ ori $a1, $a1, 0x6268 -/* 8029DC 8024215C 0C0B2026 */ jal set_variable -/* 8029E0 80242160 3206FFFF */ andi $a2, $s0, 0xffff -/* 8029E4 80242164 0220202D */ daddu $a0, $s1, $zero -/* 8029E8 80242168 3C05F840 */ lui $a1, 0xf840 -/* 8029EC 8024216C 34A56269 */ ori $a1, $a1, 0x6269 -/* 8029F0 80242170 0C0B2026 */ jal set_variable -/* 8029F4 80242174 32E6FFFF */ andi $a2, $s7, 0xffff -/* 8029F8 80242178 0000202D */ daddu $a0, $zero, $zero -/* 8029FC 8024217C 3C05F5DE */ lui $a1, 0xf5de -/* 802A00 80242180 0C0B1EAF */ jal get_variable -/* 802A04 80242184 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 802A08 80242188 0000202D */ daddu $a0, $zero, $zero -/* 802A0C 8024218C 3C05F5DE */ lui $a1, 0xf5de -/* 802A10 80242190 34A50180 */ ori $a1, $a1, 0x180 -/* 802A14 80242194 0C0B1EAF */ jal get_variable -/* 802A18 80242198 0040802D */ daddu $s0, $v0, $zero -/* 802A1C 8024219C 0040282D */ daddu $a1, $v0, $zero -/* 802A20 802421A0 0000182D */ daddu $v1, $zero, $zero -/* 802A24 802421A4 3C068025 */ lui $a2, 0x8025 -/* 802A28 802421A8 24C68CD4 */ addiu $a2, $a2, -0x732c -/* 802A2C 802421AC 00C0202D */ daddu $a0, $a2, $zero -.L802421B0: -/* 802A30 802421B0 8C820000 */ lw $v0, ($a0) -/* 802A34 802421B4 00A2102A */ slt $v0, $a1, $v0 -/* 802A38 802421B8 14400006 */ bnez $v0, .L802421D4 -/* 802A3C 802421BC 000310C0 */ sll $v0, $v1, 3 -/* 802A40 802421C0 24630001 */ addiu $v1, $v1, 1 -/* 802A44 802421C4 28620008 */ slti $v0, $v1, 8 -/* 802A48 802421C8 1440FFF9 */ bnez $v0, .L802421B0 -/* 802A4C 802421CC 24840008 */ addiu $a0, $a0, 8 -/* 802A50 802421D0 000310C0 */ sll $v0, $v1, 3 -.L802421D4: -/* 802A54 802421D4 00461021 */ addu $v0, $v0, $a2 -/* 802A58 802421D8 8C420004 */ lw $v0, 4($v0) -/* 802A5C 802421DC 97A30010 */ lhu $v1, 0x10($sp) -/* 802A60 802421E0 0202202A */ slt $a0, $s0, $v0 -/* 802A64 802421E4 32C2FFFF */ andi $v0, $s6, 0xffff -/* 802A68 802421E8 14620008 */ bne $v1, $v0, .L8024220C -/* 802A6C 802421EC 32A2FFFF */ andi $v0, $s5, 0xffff -/* 802A70 802421F0 97A7001E */ lhu $a3, 0x1e($sp) -/* 802A74 802421F4 14E20005 */ bne $a3, $v0, .L8024220C -/* 802A78 802421F8 32E2FFFF */ andi $v0, $s7, 0xffff -/* 802A7C 802421FC 14400003 */ bnez $v0, .L8024220C -/* 802A80 80242200 00000000 */ nop -/* 802A84 80242204 14800008 */ bnez $a0, .L80242228 -/* 802A88 80242208 24020001 */ addiu $v0, $zero, 1 -.L8024220C: -/* 802A8C 8024220C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 802A90 80242210 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 802A94 80242214 80420075 */ lb $v0, 0x75($v0) -/* 802A98 80242218 10400005 */ beqz $v0, .L80242230 -/* 802A9C 8024221C 00000000 */ nop -/* 802AA0 80242220 10800003 */ beqz $a0, .L80242230 -/* 802AA4 80242224 24020001 */ addiu $v0, $zero, 1 -.L80242228: -/* 802AA8 80242228 0809088F */ j .L8024223C -/* 802AAC 8024222C AE220084 */ sw $v0, 0x84($s1) -.L80242230: -/* 802AB0 80242230 0C00F9EB */ jal kill_enemy -/* 802AB4 80242234 03C0202D */ daddu $a0, $fp, $zero -/* 802AB8 80242238 AE200084 */ sw $zero, 0x84($s1) -.L8024223C: -/* 802ABC 8024223C 8FBF0044 */ lw $ra, 0x44($sp) -/* 802AC0 80242240 8FBE0040 */ lw $fp, 0x40($sp) -/* 802AC4 80242244 8FB7003C */ lw $s7, 0x3c($sp) -/* 802AC8 80242248 8FB60038 */ lw $s6, 0x38($sp) -/* 802ACC 8024224C 8FB50034 */ lw $s5, 0x34($sp) -/* 802AD0 80242250 8FB40030 */ lw $s4, 0x30($sp) -/* 802AD4 80242254 8FB3002C */ lw $s3, 0x2c($sp) -/* 802AD8 80242258 8FB20028 */ lw $s2, 0x28($sp) -/* 802ADC 8024225C 8FB10024 */ lw $s1, 0x24($sp) -/* 802AE0 80242260 8FB00020 */ lw $s0, 0x20($sp) -/* 802AE4 80242264 24020002 */ addiu $v0, $zero, 2 -/* 802AE8 80242268 03E00008 */ jr $ra -/* 802AEC 8024226C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s new file mode 100644 index 0000000000..3db95b2f19 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024204C_8028CC.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024204C_8028CC +/* 8028CC 8024204C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8028D0 80242050 AFB10024 */ sw $s1, 0x24($sp) +/* 8028D4 80242054 0080882D */ daddu $s1, $a0, $zero +/* 8028D8 80242058 3C05F840 */ lui $a1, 0xf840 +/* 8028DC 8024205C AFBF0044 */ sw $ra, 0x44($sp) +/* 8028E0 80242060 AFBE0040 */ sw $fp, 0x40($sp) +/* 8028E4 80242064 AFB7003C */ sw $s7, 0x3c($sp) +/* 8028E8 80242068 AFB60038 */ sw $s6, 0x38($sp) +/* 8028EC 8024206C AFB50034 */ sw $s5, 0x34($sp) +/* 8028F0 80242070 AFB40030 */ sw $s4, 0x30($sp) +/* 8028F4 80242074 AFB3002C */ sw $s3, 0x2c($sp) +/* 8028F8 80242078 AFB20028 */ sw $s2, 0x28($sp) +/* 8028FC 8024207C AFB00020 */ sw $s0, 0x20($sp) +/* 802900 80242080 8E3E0148 */ lw $fp, 0x148($s1) +/* 802904 80242084 0C0B1EAF */ jal get_variable +/* 802908 80242088 34A56268 */ ori $a1, $a1, 0x6268 +/* 80290C 8024208C 0040802D */ daddu $s0, $v0, $zero +/* 802910 80242090 0220202D */ daddu $a0, $s1, $zero +/* 802914 80242094 3C05F840 */ lui $a1, 0xf840 +/* 802918 80242098 0C0B1EAF */ jal get_variable +/* 80291C 8024209C 34A56269 */ ori $a1, $a1, 0x6269 +/* 802920 802420A0 0040B82D */ daddu $s7, $v0, $zero +/* 802924 802420A4 0220202D */ daddu $a0, $s1, $zero +/* 802928 802420A8 3C05F5DE */ lui $a1, 0xf5de +/* 80292C 802420AC 0C0B1EAF */ jal get_variable +/* 802930 802420B0 34A502DE */ ori $a1, $a1, 0x2de +/* 802934 802420B4 0040B02D */ daddu $s6, $v0, $zero +/* 802938 802420B8 0220202D */ daddu $a0, $s1, $zero +/* 80293C 802420BC 3C05F5DE */ lui $a1, 0xf5de +/* 802940 802420C0 0C0B1EAF */ jal get_variable +/* 802944 802420C4 34A502DF */ ori $a1, $a1, 0x2df +/* 802948 802420C8 0040A82D */ daddu $s5, $v0, $zero +/* 80294C 802420CC 93D3006D */ lbu $s3, 0x6d($fp) +/* 802950 802420D0 32C2FFFF */ andi $v0, $s6, 0xffff +/* 802954 802420D4 A7B30010 */ sh $s3, 0x10($sp) +/* 802958 802420D8 93D2006E */ lbu $s2, 0x6e($fp) +/* 80295C 802420DC 93C7006F */ lbu $a3, 0x6f($fp) +/* 802960 802420E0 3274FFFF */ andi $s4, $s3, 0xffff +/* 802964 802420E4 12820003 */ beq $s4, $v0, .L802420F4 +/* 802968 802420E8 A7A7001E */ sh $a3, 0x1e($sp) +/* 80296C 802420EC 0000B82D */ daddu $s7, $zero, $zero +/* 802970 802420F0 02E0802D */ daddu $s0, $s7, $zero +.L802420F4: +/* 802974 802420F4 3202FFFF */ andi $v0, $s0, 0xffff +/* 802978 802420F8 14400016 */ bnez $v0, .L80242154 +/* 80297C 802420FC 0220202D */ daddu $a0, $s1, $zero +/* 802980 80242100 0C00A67F */ jal rand_int +/* 802984 80242104 24040064 */ addiu $a0, $zero, 0x64 +/* 802988 80242108 2842001E */ slti $v0, $v0, 0x1e +/* 80298C 8024210C 10400011 */ beqz $v0, .L80242154 +/* 802990 80242110 0220202D */ daddu $a0, $s1, $zero +/* 802994 80242114 0C00A67F */ jal rand_int +/* 802998 80242118 2644FFFF */ addiu $a0, $s2, -1 +/* 80299C 8024211C 0040A82D */ daddu $s5, $v0, $zero +/* 8029A0 80242120 0260B02D */ daddu $s6, $s3, $zero +/* 8029A4 80242124 0220202D */ daddu $a0, $s1, $zero +/* 8029A8 80242128 3C05F5DE */ lui $a1, 0xf5de +/* 8029AC 8024212C 34A502DE */ ori $a1, $a1, 0x2de +/* 8029B0 80242130 0C0B2026 */ jal set_variable +/* 8029B4 80242134 0280302D */ daddu $a2, $s4, $zero +/* 8029B8 80242138 0220202D */ daddu $a0, $s1, $zero +/* 8029BC 8024213C 3C05F5DE */ lui $a1, 0xf5de +/* 8029C0 80242140 34A502DF */ ori $a1, $a1, 0x2df +/* 8029C4 80242144 0C0B2026 */ jal set_variable +/* 8029C8 80242148 32A6FFFF */ andi $a2, $s5, 0xffff +/* 8029CC 8024214C 24100001 */ addiu $s0, $zero, 1 +/* 8029D0 80242150 0220202D */ daddu $a0, $s1, $zero +.L80242154: +/* 8029D4 80242154 3C05F840 */ lui $a1, 0xf840 +/* 8029D8 80242158 34A56268 */ ori $a1, $a1, 0x6268 +/* 8029DC 8024215C 0C0B2026 */ jal set_variable +/* 8029E0 80242160 3206FFFF */ andi $a2, $s0, 0xffff +/* 8029E4 80242164 0220202D */ daddu $a0, $s1, $zero +/* 8029E8 80242168 3C05F840 */ lui $a1, 0xf840 +/* 8029EC 8024216C 34A56269 */ ori $a1, $a1, 0x6269 +/* 8029F0 80242170 0C0B2026 */ jal set_variable +/* 8029F4 80242174 32E6FFFF */ andi $a2, $s7, 0xffff +/* 8029F8 80242178 0000202D */ daddu $a0, $zero, $zero +/* 8029FC 8024217C 3C05F5DE */ lui $a1, 0xf5de +/* 802A00 80242180 0C0B1EAF */ jal get_variable +/* 802A04 80242184 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 802A08 80242188 0000202D */ daddu $a0, $zero, $zero +/* 802A0C 8024218C 3C05F5DE */ lui $a1, 0xf5de +/* 802A10 80242190 34A50180 */ ori $a1, $a1, 0x180 +/* 802A14 80242194 0C0B1EAF */ jal get_variable +/* 802A18 80242198 0040802D */ daddu $s0, $v0, $zero +/* 802A1C 8024219C 0040282D */ daddu $a1, $v0, $zero +/* 802A20 802421A0 0000182D */ daddu $v1, $zero, $zero +/* 802A24 802421A4 3C068025 */ lui $a2, 0x8025 +/* 802A28 802421A8 24C68CD4 */ addiu $a2, $a2, -0x732c +/* 802A2C 802421AC 00C0202D */ daddu $a0, $a2, $zero +.L802421B0: +/* 802A30 802421B0 8C820000 */ lw $v0, ($a0) +/* 802A34 802421B4 00A2102A */ slt $v0, $a1, $v0 +/* 802A38 802421B8 14400006 */ bnez $v0, .L802421D4 +/* 802A3C 802421BC 000310C0 */ sll $v0, $v1, 3 +/* 802A40 802421C0 24630001 */ addiu $v1, $v1, 1 +/* 802A44 802421C4 28620008 */ slti $v0, $v1, 8 +/* 802A48 802421C8 1440FFF9 */ bnez $v0, .L802421B0 +/* 802A4C 802421CC 24840008 */ addiu $a0, $a0, 8 +/* 802A50 802421D0 000310C0 */ sll $v0, $v1, 3 +.L802421D4: +/* 802A54 802421D4 00461021 */ addu $v0, $v0, $a2 +/* 802A58 802421D8 8C420004 */ lw $v0, 4($v0) +/* 802A5C 802421DC 97A30010 */ lhu $v1, 0x10($sp) +/* 802A60 802421E0 0202202A */ slt $a0, $s0, $v0 +/* 802A64 802421E4 32C2FFFF */ andi $v0, $s6, 0xffff +/* 802A68 802421E8 14620008 */ bne $v1, $v0, .L8024220C +/* 802A6C 802421EC 32A2FFFF */ andi $v0, $s5, 0xffff +/* 802A70 802421F0 97A7001E */ lhu $a3, 0x1e($sp) +/* 802A74 802421F4 14E20005 */ bne $a3, $v0, .L8024220C +/* 802A78 802421F8 32E2FFFF */ andi $v0, $s7, 0xffff +/* 802A7C 802421FC 14400003 */ bnez $v0, .L8024220C +/* 802A80 80242200 00000000 */ nop +/* 802A84 80242204 14800008 */ bnez $a0, .L80242228 +/* 802A88 80242208 24020001 */ addiu $v0, $zero, 1 +.L8024220C: +/* 802A8C 8024220C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 802A90 80242210 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 802A94 80242214 80420075 */ lb $v0, 0x75($v0) +/* 802A98 80242218 10400005 */ beqz $v0, .L80242230 +/* 802A9C 8024221C 00000000 */ nop +/* 802AA0 80242220 10800003 */ beqz $a0, .L80242230 +/* 802AA4 80242224 24020001 */ addiu $v0, $zero, 1 +.L80242228: +/* 802AA8 80242228 0809088F */ j .L8024223C +/* 802AAC 8024222C AE220084 */ sw $v0, 0x84($s1) +.L80242230: +/* 802AB0 80242230 0C00F9EB */ jal kill_enemy +/* 802AB4 80242234 03C0202D */ daddu $a0, $fp, $zero +/* 802AB8 80242238 AE200084 */ sw $zero, 0x84($s1) +.L8024223C: +/* 802ABC 8024223C 8FBF0044 */ lw $ra, 0x44($sp) +/* 802AC0 80242240 8FBE0040 */ lw $fp, 0x40($sp) +/* 802AC4 80242244 8FB7003C */ lw $s7, 0x3c($sp) +/* 802AC8 80242248 8FB60038 */ lw $s6, 0x38($sp) +/* 802ACC 8024224C 8FB50034 */ lw $s5, 0x34($sp) +/* 802AD0 80242250 8FB40030 */ lw $s4, 0x30($sp) +/* 802AD4 80242254 8FB3002C */ lw $s3, 0x2c($sp) +/* 802AD8 80242258 8FB20028 */ lw $s2, 0x28($sp) +/* 802ADC 8024225C 8FB10024 */ lw $s1, 0x24($sp) +/* 802AE0 80242260 8FB00020 */ lw $s0, 0x20($sp) +/* 802AE4 80242264 24020002 */ addiu $v0, $zero, 2 +/* 802AE8 80242268 03E00008 */ jr $ra +/* 802AEC 8024226C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270.s deleted file mode 100644 index d7a112358a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242270 -/* 802AF0 80242270 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 802AF4 80242274 AFBF0014 */ sw $ra, 0x14($sp) -/* 802AF8 80242278 AFB00010 */ sw $s0, 0x10($sp) -/* 802AFC 8024227C 0C00EABB */ jal get_npc_unsafe -/* 802B00 80242280 8C84014C */ lw $a0, 0x14c($a0) -/* 802B04 80242284 24040008 */ addiu $a0, $zero, 8 -/* 802B08 80242288 0040802D */ daddu $s0, $v0, $zero -/* 802B0C 8024228C 3C028024 */ lui $v0, 0x8024 -/* 802B10 80242290 244222DC */ addiu $v0, $v0, 0x22dc -/* 802B14 80242294 0C00AB39 */ jal heap_malloc -/* 802B18 80242298 AE020008 */ sw $v0, 8($s0) -/* 802B1C 8024229C 0040182D */ daddu $v1, $v0, $zero -/* 802B20 802422A0 AE030020 */ sw $v1, 0x20($s0) -/* 802B24 802422A4 AC600000 */ sw $zero, ($v1) -/* 802B28 802422A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 802B2C 802422AC 8FB00010 */ lw $s0, 0x10($sp) -/* 802B30 802422B0 24020001 */ addiu $v0, $zero, 1 -/* 802B34 802422B4 03E00008 */ jr $ra -/* 802B38 802422B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s new file mode 100644 index 0000000000..7bdf355749 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242270_802AF0.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242270_802AF0 +/* 802AF0 80242270 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 802AF4 80242274 AFBF0014 */ sw $ra, 0x14($sp) +/* 802AF8 80242278 AFB00010 */ sw $s0, 0x10($sp) +/* 802AFC 8024227C 0C00EABB */ jal get_npc_unsafe +/* 802B00 80242280 8C84014C */ lw $a0, 0x14c($a0) +/* 802B04 80242284 24040008 */ addiu $a0, $zero, 8 +/* 802B08 80242288 0040802D */ daddu $s0, $v0, $zero +/* 802B0C 8024228C 3C028024 */ lui $v0, 0x8024 +/* 802B10 80242290 244222DC */ addiu $v0, $v0, 0x22dc +/* 802B14 80242294 0C00AB39 */ jal heap_malloc +/* 802B18 80242298 AE020008 */ sw $v0, 8($s0) +/* 802B1C 8024229C 0040182D */ daddu $v1, $v0, $zero +/* 802B20 802422A0 AE030020 */ sw $v1, 0x20($s0) +/* 802B24 802422A4 AC600000 */ sw $zero, ($v1) +/* 802B28 802422A8 8FBF0014 */ lw $ra, 0x14($sp) +/* 802B2C 802422AC 8FB00010 */ lw $s0, 0x10($sp) +/* 802B30 802422B0 24020001 */ addiu $v0, $zero, 1 +/* 802B34 802422B4 03E00008 */ jr $ra +/* 802B38 802422B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC.s deleted file mode 100644 index 956ba24e03..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422BC -/* 802B3C 802422BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 802B40 802422C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 802B44 802422C4 0C00EABB */ jal get_npc_unsafe -/* 802B48 802422C8 8C84014C */ lw $a0, 0x14c($a0) -/* 802B4C 802422CC 8FBF0010 */ lw $ra, 0x10($sp) -/* 802B50 802422D0 0000102D */ daddu $v0, $zero, $zero -/* 802B54 802422D4 03E00008 */ jr $ra -/* 802B58 802422D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s new file mode 100644 index 0000000000..807a032753 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422BC_802B3C +/* 802B3C 802422BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 802B40 802422C0 AFBF0010 */ sw $ra, 0x10($sp) +/* 802B44 802422C4 0C00EABB */ jal get_npc_unsafe +/* 802B48 802422C8 8C84014C */ lw $a0, 0x14c($a0) +/* 802B4C 802422CC 8FBF0010 */ lw $ra, 0x10($sp) +/* 802B50 802422D0 0000102D */ daddu $v0, $zero, $zero +/* 802B54 802422D4 03E00008 */ jr $ra +/* 802B58 802422D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC.s deleted file mode 100644 index 79623bf576..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422DC -/* 802B5C 802422DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 802B60 802422E0 3C03800A */ lui $v1, 0x800a -/* 802B64 802422E4 8463A634 */ lh $v1, -0x59cc($v1) -/* 802B68 802422E8 3C05800B */ lui $a1, %hi(gCameras) -/* 802B6C 802422EC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 802B70 802422F0 AFBF0010 */ sw $ra, 0x10($sp) -/* 802B74 802422F4 00031080 */ sll $v0, $v1, 2 -/* 802B78 802422F8 00431021 */ addu $v0, $v0, $v1 -/* 802B7C 802422FC 00021080 */ sll $v0, $v0, 2 -/* 802B80 80242300 00431023 */ subu $v0, $v0, $v1 -/* 802B84 80242304 000218C0 */ sll $v1, $v0, 3 -/* 802B88 80242308 00431021 */ addu $v0, $v0, $v1 -/* 802B8C 8024230C 8C830020 */ lw $v1, 0x20($a0) -/* 802B90 80242310 000210C0 */ sll $v0, $v0, 3 -/* 802B94 80242314 8C630000 */ lw $v1, ($v1) -/* 802B98 80242318 30630001 */ andi $v1, $v1, 1 -/* 802B9C 8024231C 10600004 */ beqz $v1, .L80242330 -/* 802BA0 80242320 00451021 */ addu $v0, $v0, $a1 -/* 802BA4 80242324 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 802BA8 80242328 0C00A6C9 */ jal clamp_angle -/* 802BAC 8024232C 46006307 */ neg.s $f12, $f12 -.L80242330: -/* 802BB0 80242330 8FBF0010 */ lw $ra, 0x10($sp) -/* 802BB4 80242334 03E00008 */ jr $ra -/* 802BB8 80242338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s new file mode 100644 index 0000000000..6ad481c87e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422DC_802B5C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422DC_802B5C +/* 802B5C 802422DC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 802B60 802422E0 3C03800A */ lui $v1, 0x800a +/* 802B64 802422E4 8463A634 */ lh $v1, -0x59cc($v1) +/* 802B68 802422E8 3C05800B */ lui $a1, %hi(gCameras) +/* 802B6C 802422EC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 802B70 802422F0 AFBF0010 */ sw $ra, 0x10($sp) +/* 802B74 802422F4 00031080 */ sll $v0, $v1, 2 +/* 802B78 802422F8 00431021 */ addu $v0, $v0, $v1 +/* 802B7C 802422FC 00021080 */ sll $v0, $v0, 2 +/* 802B80 80242300 00431023 */ subu $v0, $v0, $v1 +/* 802B84 80242304 000218C0 */ sll $v1, $v0, 3 +/* 802B88 80242308 00431021 */ addu $v0, $v0, $v1 +/* 802B8C 8024230C 8C830020 */ lw $v1, 0x20($a0) +/* 802B90 80242310 000210C0 */ sll $v0, $v0, 3 +/* 802B94 80242314 8C630000 */ lw $v1, ($v1) +/* 802B98 80242318 30630001 */ andi $v1, $v1, 1 +/* 802B9C 8024231C 10600004 */ beqz $v1, .L80242330 +/* 802BA0 80242320 00451021 */ addu $v0, $v0, $a1 +/* 802BA4 80242324 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 802BA8 80242328 0C00A6C9 */ jal clamp_angle +/* 802BAC 8024232C 46006307 */ neg.s $f12, $f12 +.L80242330: +/* 802BB0 80242330 8FBF0010 */ lw $ra, 0x10($sp) +/* 802BB4 80242334 03E00008 */ jr $ra +/* 802BB8 80242338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C.s deleted file mode 100644 index 0d83414633..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024233C -/* 802BBC 8024233C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 802BC0 80242340 AFB10014 */ sw $s1, 0x14($sp) -/* 802BC4 80242344 0080882D */ daddu $s1, $a0, $zero -/* 802BC8 80242348 AFBF0024 */ sw $ra, 0x24($sp) -/* 802BCC 8024234C AFB40020 */ sw $s4, 0x20($sp) -/* 802BD0 80242350 AFB3001C */ sw $s3, 0x1c($sp) -/* 802BD4 80242354 AFB20018 */ sw $s2, 0x18($sp) -/* 802BD8 80242358 10A00033 */ beqz $a1, .L80242428 -/* 802BDC 8024235C AFB00010 */ sw $s0, 0x10($sp) -/* 802BE0 80242360 0C04760B */ jal func_8011D82C -/* 802BE4 80242364 24040001 */ addiu $a0, $zero, 1 -/* 802BE8 80242368 0000202D */ daddu $a0, $zero, $zero -/* 802BEC 8024236C 0080282D */ daddu $a1, $a0, $zero -/* 802BF0 80242370 0080302D */ daddu $a2, $a0, $zero -/* 802BF4 80242374 0080382D */ daddu $a3, $a0, $zero -/* 802BF8 80242378 0080802D */ daddu $s0, $a0, $zero -/* 802BFC 8024237C 2414FFFC */ addiu $s4, $zero, -4 -/* 802C00 80242380 24130005 */ addiu $s3, $zero, 5 -/* 802C04 80242384 3C120080 */ lui $s2, 0x80 -/* 802C08 80242388 3C038015 */ lui $v1, 0x8015 -/* 802C0C 8024238C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 802C10 80242390 24020001 */ addiu $v0, $zero, 1 -/* 802C14 80242394 0C046F97 */ jal set_background_color_blend -/* 802C18 80242398 A0620000 */ sb $v0, ($v1) -.L8024239C: -/* 802C1C 8024239C 0C00E2B7 */ jal get_npc_by_index -/* 802C20 802423A0 0200202D */ daddu $a0, $s0, $zero -/* 802C24 802423A4 0040202D */ daddu $a0, $v0, $zero -/* 802C28 802423A8 5080000B */ beql $a0, $zero, .L802423D8 -/* 802C2C 802423AC 26100001 */ addiu $s0, $s0, 1 -/* 802C30 802423B0 8C820000 */ lw $v0, ($a0) -/* 802C34 802423B4 50400008 */ beql $v0, $zero, .L802423D8 -/* 802C38 802423B8 26100001 */ addiu $s0, $s0, 1 -/* 802C3C 802423BC 808300A4 */ lb $v1, 0xa4($a0) -/* 802C40 802423C0 10740005 */ beq $v1, $s4, .L802423D8 -/* 802C44 802423C4 26100001 */ addiu $s0, $s0, 1 -/* 802C48 802423C8 10730003 */ beq $v1, $s3, .L802423D8 -/* 802C4C 802423CC 00000000 */ nop -/* 802C50 802423D0 00521025 */ or $v0, $v0, $s2 -/* 802C54 802423D4 AC820000 */ sw $v0, ($a0) -.L802423D8: -/* 802C58 802423D8 2A020040 */ slti $v0, $s0, 0x40 -/* 802C5C 802423DC 1440FFEF */ bnez $v0, .L8024239C -/* 802C60 802423E0 00000000 */ nop -/* 802C64 802423E4 0000802D */ daddu $s0, $zero, $zero -/* 802C68 802423E8 3C120800 */ lui $s2, 0x800 -.L802423EC: -/* 802C6C 802423EC 0C04C3D6 */ jal get_item_entity -/* 802C70 802423F0 0200202D */ daddu $a0, $s0, $zero -/* 802C74 802423F4 0040182D */ daddu $v1, $v0, $zero -/* 802C78 802423F8 10600007 */ beqz $v1, .L80242418 -/* 802C7C 802423FC 26100001 */ addiu $s0, $s0, 1 -/* 802C80 80242400 8C640000 */ lw $a0, ($v1) -/* 802C84 80242404 30820010 */ andi $v0, $a0, 0x10 -/* 802C88 80242408 10400003 */ beqz $v0, .L80242418 -/* 802C8C 8024240C 00000000 */ nop -/* 802C90 80242410 00921025 */ or $v0, $a0, $s2 -/* 802C94 80242414 AC620000 */ sw $v0, ($v1) -.L80242418: -/* 802C98 80242418 2A020100 */ slti $v0, $s0, 0x100 -/* 802C9C 8024241C 1440FFF3 */ bnez $v0, .L802423EC -/* 802CA0 80242420 00000000 */ nop -/* 802CA4 80242424 AE200070 */ sw $zero, 0x70($s1) -.L80242428: -/* 802CA8 80242428 8E220070 */ lw $v0, 0x70($s1) -/* 802CAC 8024242C 24420008 */ addiu $v0, $v0, 8 -/* 802CB0 80242430 AE220070 */ sw $v0, 0x70($s1) -/* 802CB4 80242434 28420100 */ slti $v0, $v0, 0x100 -/* 802CB8 80242438 14400003 */ bnez $v0, .L80242448 -/* 802CBC 8024243C 0000202D */ daddu $a0, $zero, $zero -/* 802CC0 80242440 240200FF */ addiu $v0, $zero, 0xff -/* 802CC4 80242444 AE220070 */ sw $v0, 0x70($s1) -.L80242448: -/* 802CC8 80242448 0080282D */ daddu $a1, $a0, $zero -/* 802CCC 8024244C 92270073 */ lbu $a3, 0x73($s1) -/* 802CD0 80242450 0C046F97 */ jal set_background_color_blend -/* 802CD4 80242454 0080302D */ daddu $a2, $a0, $zero -/* 802CD8 80242458 8E220070 */ lw $v0, 0x70($s1) -/* 802CDC 8024245C 8FBF0024 */ lw $ra, 0x24($sp) -/* 802CE0 80242460 8FB40020 */ lw $s4, 0x20($sp) -/* 802CE4 80242464 8FB3001C */ lw $s3, 0x1c($sp) -/* 802CE8 80242468 8FB20018 */ lw $s2, 0x18($sp) -/* 802CEC 8024246C 8FB10014 */ lw $s1, 0x14($sp) -/* 802CF0 80242470 8FB00010 */ lw $s0, 0x10($sp) -/* 802CF4 80242474 384200FF */ xori $v0, $v0, 0xff -/* 802CF8 80242478 2C420001 */ sltiu $v0, $v0, 1 -/* 802CFC 8024247C 00021040 */ sll $v0, $v0, 1 -/* 802D00 80242480 03E00008 */ jr $ra -/* 802D04 80242484 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s new file mode 100644 index 0000000000..2ac659374f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024233C_802BBC.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024233C_802BBC +/* 802BBC 8024233C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 802BC0 80242340 AFB10014 */ sw $s1, 0x14($sp) +/* 802BC4 80242344 0080882D */ daddu $s1, $a0, $zero +/* 802BC8 80242348 AFBF0024 */ sw $ra, 0x24($sp) +/* 802BCC 8024234C AFB40020 */ sw $s4, 0x20($sp) +/* 802BD0 80242350 AFB3001C */ sw $s3, 0x1c($sp) +/* 802BD4 80242354 AFB20018 */ sw $s2, 0x18($sp) +/* 802BD8 80242358 10A00033 */ beqz $a1, .L80242428 +/* 802BDC 8024235C AFB00010 */ sw $s0, 0x10($sp) +/* 802BE0 80242360 0C04760B */ jal func_8011D82C +/* 802BE4 80242364 24040001 */ addiu $a0, $zero, 1 +/* 802BE8 80242368 0000202D */ daddu $a0, $zero, $zero +/* 802BEC 8024236C 0080282D */ daddu $a1, $a0, $zero +/* 802BF0 80242370 0080302D */ daddu $a2, $a0, $zero +/* 802BF4 80242374 0080382D */ daddu $a3, $a0, $zero +/* 802BF8 80242378 0080802D */ daddu $s0, $a0, $zero +/* 802BFC 8024237C 2414FFFC */ addiu $s4, $zero, -4 +/* 802C00 80242380 24130005 */ addiu $s3, $zero, 5 +/* 802C04 80242384 3C120080 */ lui $s2, 0x80 +/* 802C08 80242388 3C038015 */ lui $v1, 0x8015 +/* 802C0C 8024238C 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 802C10 80242390 24020001 */ addiu $v0, $zero, 1 +/* 802C14 80242394 0C046F97 */ jal set_background_color_blend +/* 802C18 80242398 A0620000 */ sb $v0, ($v1) +.L8024239C: +/* 802C1C 8024239C 0C00E2B7 */ jal get_npc_by_index +/* 802C20 802423A0 0200202D */ daddu $a0, $s0, $zero +/* 802C24 802423A4 0040202D */ daddu $a0, $v0, $zero +/* 802C28 802423A8 5080000B */ beql $a0, $zero, .L802423D8 +/* 802C2C 802423AC 26100001 */ addiu $s0, $s0, 1 +/* 802C30 802423B0 8C820000 */ lw $v0, ($a0) +/* 802C34 802423B4 50400008 */ beql $v0, $zero, .L802423D8 +/* 802C38 802423B8 26100001 */ addiu $s0, $s0, 1 +/* 802C3C 802423BC 808300A4 */ lb $v1, 0xa4($a0) +/* 802C40 802423C0 10740005 */ beq $v1, $s4, .L802423D8 +/* 802C44 802423C4 26100001 */ addiu $s0, $s0, 1 +/* 802C48 802423C8 10730003 */ beq $v1, $s3, .L802423D8 +/* 802C4C 802423CC 00000000 */ nop +/* 802C50 802423D0 00521025 */ or $v0, $v0, $s2 +/* 802C54 802423D4 AC820000 */ sw $v0, ($a0) +.L802423D8: +/* 802C58 802423D8 2A020040 */ slti $v0, $s0, 0x40 +/* 802C5C 802423DC 1440FFEF */ bnez $v0, .L8024239C +/* 802C60 802423E0 00000000 */ nop +/* 802C64 802423E4 0000802D */ daddu $s0, $zero, $zero +/* 802C68 802423E8 3C120800 */ lui $s2, 0x800 +.L802423EC: +/* 802C6C 802423EC 0C04C3D6 */ jal get_item_entity +/* 802C70 802423F0 0200202D */ daddu $a0, $s0, $zero +/* 802C74 802423F4 0040182D */ daddu $v1, $v0, $zero +/* 802C78 802423F8 10600007 */ beqz $v1, .L80242418 +/* 802C7C 802423FC 26100001 */ addiu $s0, $s0, 1 +/* 802C80 80242400 8C640000 */ lw $a0, ($v1) +/* 802C84 80242404 30820010 */ andi $v0, $a0, 0x10 +/* 802C88 80242408 10400003 */ beqz $v0, .L80242418 +/* 802C8C 8024240C 00000000 */ nop +/* 802C90 80242410 00921025 */ or $v0, $a0, $s2 +/* 802C94 80242414 AC620000 */ sw $v0, ($v1) +.L80242418: +/* 802C98 80242418 2A020100 */ slti $v0, $s0, 0x100 +/* 802C9C 8024241C 1440FFF3 */ bnez $v0, .L802423EC +/* 802CA0 80242420 00000000 */ nop +/* 802CA4 80242424 AE200070 */ sw $zero, 0x70($s1) +.L80242428: +/* 802CA8 80242428 8E220070 */ lw $v0, 0x70($s1) +/* 802CAC 8024242C 24420008 */ addiu $v0, $v0, 8 +/* 802CB0 80242430 AE220070 */ sw $v0, 0x70($s1) +/* 802CB4 80242434 28420100 */ slti $v0, $v0, 0x100 +/* 802CB8 80242438 14400003 */ bnez $v0, .L80242448 +/* 802CBC 8024243C 0000202D */ daddu $a0, $zero, $zero +/* 802CC0 80242440 240200FF */ addiu $v0, $zero, 0xff +/* 802CC4 80242444 AE220070 */ sw $v0, 0x70($s1) +.L80242448: +/* 802CC8 80242448 0080282D */ daddu $a1, $a0, $zero +/* 802CCC 8024244C 92270073 */ lbu $a3, 0x73($s1) +/* 802CD0 80242450 0C046F97 */ jal set_background_color_blend +/* 802CD4 80242454 0080302D */ daddu $a2, $a0, $zero +/* 802CD8 80242458 8E220070 */ lw $v0, 0x70($s1) +/* 802CDC 8024245C 8FBF0024 */ lw $ra, 0x24($sp) +/* 802CE0 80242460 8FB40020 */ lw $s4, 0x20($sp) +/* 802CE4 80242464 8FB3001C */ lw $s3, 0x1c($sp) +/* 802CE8 80242468 8FB20018 */ lw $s2, 0x18($sp) +/* 802CEC 8024246C 8FB10014 */ lw $s1, 0x14($sp) +/* 802CF0 80242470 8FB00010 */ lw $s0, 0x10($sp) +/* 802CF4 80242474 384200FF */ xori $v0, $v0, 0xff +/* 802CF8 80242478 2C420001 */ sltiu $v0, $v0, 1 +/* 802CFC 8024247C 00021040 */ sll $v0, $v0, 1 +/* 802D00 80242480 03E00008 */ jr $ra +/* 802D04 80242484 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488.s deleted file mode 100644 index 11a386d45e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242488 -/* 802D08 80242488 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 802D0C 8024248C AFB00010 */ sw $s0, 0x10($sp) -/* 802D10 80242490 0080802D */ daddu $s0, $a0, $zero -/* 802D14 80242494 AFBF0020 */ sw $ra, 0x20($sp) -/* 802D18 80242498 AFB3001C */ sw $s3, 0x1c($sp) -/* 802D1C 8024249C AFB20018 */ sw $s2, 0x18($sp) -/* 802D20 802424A0 10A00009 */ beqz $a1, .L802424C8 -/* 802D24 802424A4 AFB10014 */ sw $s1, 0x14($sp) -/* 802D28 802424A8 0000202D */ daddu $a0, $zero, $zero -/* 802D2C 802424AC 0080282D */ daddu $a1, $a0, $zero -/* 802D30 802424B0 0080302D */ daddu $a2, $a0, $zero -/* 802D34 802424B4 0C046F97 */ jal set_background_color_blend -/* 802D38 802424B8 240700FF */ addiu $a3, $zero, 0xff -/* 802D3C 802424BC 240200FF */ addiu $v0, $zero, 0xff -/* 802D40 802424C0 AE020070 */ sw $v0, 0x70($s0) -/* 802D44 802424C4 AE000074 */ sw $zero, 0x74($s0) -.L802424C8: -/* 802D48 802424C8 8E020070 */ lw $v0, 0x70($s0) -/* 802D4C 802424CC 2442FFF8 */ addiu $v0, $v0, -8 -/* 802D50 802424D0 04410002 */ bgez $v0, .L802424DC -/* 802D54 802424D4 AE020070 */ sw $v0, 0x70($s0) -/* 802D58 802424D8 AE000070 */ sw $zero, 0x70($s0) -.L802424DC: -/* 802D5C 802424DC 0000202D */ daddu $a0, $zero, $zero -/* 802D60 802424E0 0080282D */ daddu $a1, $a0, $zero -/* 802D64 802424E4 92070073 */ lbu $a3, 0x73($s0) -/* 802D68 802424E8 0C046F97 */ jal set_background_color_blend -/* 802D6C 802424EC 0080302D */ daddu $a2, $a0, $zero -/* 802D70 802424F0 8E020070 */ lw $v0, 0x70($s0) -/* 802D74 802424F4 14400006 */ bnez $v0, .L80242510 -/* 802D78 802424F8 00000000 */ nop -/* 802D7C 802424FC 8E020074 */ lw $v0, 0x74($s0) -/* 802D80 80242500 14400003 */ bnez $v0, .L80242510 -/* 802D84 80242504 24020001 */ addiu $v0, $zero, 1 -/* 802D88 80242508 08090977 */ j .L802425DC -/* 802D8C 8024250C AE020074 */ sw $v0, 0x74($s0) -.L80242510: -/* 802D90 80242510 8E030074 */ lw $v1, 0x74($s0) -/* 802D94 80242514 24020001 */ addiu $v0, $zero, 1 -/* 802D98 80242518 14620031 */ bne $v1, $v0, .L802425E0 -/* 802D9C 8024251C 0000102D */ daddu $v0, $zero, $zero -/* 802DA0 80242520 0C04760B */ jal func_8011D82C -/* 802DA4 80242524 0000202D */ daddu $a0, $zero, $zero -/* 802DA8 80242528 0000802D */ daddu $s0, $zero, $zero -/* 802DAC 8024252C 2413FFFC */ addiu $s3, $zero, -4 -/* 802DB0 80242530 24120005 */ addiu $s2, $zero, 5 -/* 802DB4 80242534 3C11FF7F */ lui $s1, 0xff7f -/* 802DB8 80242538 3C028015 */ lui $v0, 0x8015 -/* 802DBC 8024253C 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 802DC0 80242540 3631FFFF */ ori $s1, $s1, 0xffff -/* 802DC4 80242544 A0400000 */ sb $zero, ($v0) -.L80242548: -/* 802DC8 80242548 0C00E2B7 */ jal get_npc_by_index -/* 802DCC 8024254C 0200202D */ daddu $a0, $s0, $zero -/* 802DD0 80242550 0040202D */ daddu $a0, $v0, $zero -/* 802DD4 80242554 5080000B */ beql $a0, $zero, .L80242584 -/* 802DD8 80242558 26100001 */ addiu $s0, $s0, 1 -/* 802DDC 8024255C 8C820000 */ lw $v0, ($a0) -/* 802DE0 80242560 50400008 */ beql $v0, $zero, .L80242584 -/* 802DE4 80242564 26100001 */ addiu $s0, $s0, 1 -/* 802DE8 80242568 808300A4 */ lb $v1, 0xa4($a0) -/* 802DEC 8024256C 10730005 */ beq $v1, $s3, .L80242584 -/* 802DF0 80242570 26100001 */ addiu $s0, $s0, 1 -/* 802DF4 80242574 10720003 */ beq $v1, $s2, .L80242584 -/* 802DF8 80242578 00000000 */ nop -/* 802DFC 8024257C 00511024 */ and $v0, $v0, $s1 -/* 802E00 80242580 AC820000 */ sw $v0, ($a0) -.L80242584: -/* 802E04 80242584 2A020040 */ slti $v0, $s0, 0x40 -/* 802E08 80242588 1440FFEF */ bnez $v0, .L80242548 -/* 802E0C 8024258C 00000000 */ nop -/* 802E10 80242590 0000802D */ daddu $s0, $zero, $zero -/* 802E14 80242594 3C11F7FF */ lui $s1, 0xf7ff -/* 802E18 80242598 3631FFFF */ ori $s1, $s1, 0xffff -.L8024259C: -/* 802E1C 8024259C 0C04C3D6 */ jal get_item_entity -/* 802E20 802425A0 0200202D */ daddu $a0, $s0, $zero -/* 802E24 802425A4 0040182D */ daddu $v1, $v0, $zero -/* 802E28 802425A8 10600007 */ beqz $v1, .L802425C8 -/* 802E2C 802425AC 26100001 */ addiu $s0, $s0, 1 -/* 802E30 802425B0 8C640000 */ lw $a0, ($v1) -/* 802E34 802425B4 30820010 */ andi $v0, $a0, 0x10 -/* 802E38 802425B8 10400003 */ beqz $v0, .L802425C8 -/* 802E3C 802425BC 00000000 */ nop -/* 802E40 802425C0 00911024 */ and $v0, $a0, $s1 -/* 802E44 802425C4 AC620000 */ sw $v0, ($v1) -.L802425C8: -/* 802E48 802425C8 2A020100 */ slti $v0, $s0, 0x100 -/* 802E4C 802425CC 1440FFF3 */ bnez $v0, .L8024259C -/* 802E50 802425D0 24020002 */ addiu $v0, $zero, 2 -/* 802E54 802425D4 08090978 */ j .L802425E0 -/* 802E58 802425D8 00000000 */ nop -.L802425DC: -/* 802E5C 802425DC 0000102D */ daddu $v0, $zero, $zero -.L802425E0: -/* 802E60 802425E0 8FBF0020 */ lw $ra, 0x20($sp) -/* 802E64 802425E4 8FB3001C */ lw $s3, 0x1c($sp) -/* 802E68 802425E8 8FB20018 */ lw $s2, 0x18($sp) -/* 802E6C 802425EC 8FB10014 */ lw $s1, 0x14($sp) -/* 802E70 802425F0 8FB00010 */ lw $s0, 0x10($sp) -/* 802E74 802425F4 03E00008 */ jr $ra -/* 802E78 802425F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s new file mode 100644 index 0000000000..a4d4c5c7e2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242488_802D08.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242488_802D08 +/* 802D08 80242488 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 802D0C 8024248C AFB00010 */ sw $s0, 0x10($sp) +/* 802D10 80242490 0080802D */ daddu $s0, $a0, $zero +/* 802D14 80242494 AFBF0020 */ sw $ra, 0x20($sp) +/* 802D18 80242498 AFB3001C */ sw $s3, 0x1c($sp) +/* 802D1C 8024249C AFB20018 */ sw $s2, 0x18($sp) +/* 802D20 802424A0 10A00009 */ beqz $a1, .L802424C8 +/* 802D24 802424A4 AFB10014 */ sw $s1, 0x14($sp) +/* 802D28 802424A8 0000202D */ daddu $a0, $zero, $zero +/* 802D2C 802424AC 0080282D */ daddu $a1, $a0, $zero +/* 802D30 802424B0 0080302D */ daddu $a2, $a0, $zero +/* 802D34 802424B4 0C046F97 */ jal set_background_color_blend +/* 802D38 802424B8 240700FF */ addiu $a3, $zero, 0xff +/* 802D3C 802424BC 240200FF */ addiu $v0, $zero, 0xff +/* 802D40 802424C0 AE020070 */ sw $v0, 0x70($s0) +/* 802D44 802424C4 AE000074 */ sw $zero, 0x74($s0) +.L802424C8: +/* 802D48 802424C8 8E020070 */ lw $v0, 0x70($s0) +/* 802D4C 802424CC 2442FFF8 */ addiu $v0, $v0, -8 +/* 802D50 802424D0 04410002 */ bgez $v0, .L802424DC +/* 802D54 802424D4 AE020070 */ sw $v0, 0x70($s0) +/* 802D58 802424D8 AE000070 */ sw $zero, 0x70($s0) +.L802424DC: +/* 802D5C 802424DC 0000202D */ daddu $a0, $zero, $zero +/* 802D60 802424E0 0080282D */ daddu $a1, $a0, $zero +/* 802D64 802424E4 92070073 */ lbu $a3, 0x73($s0) +/* 802D68 802424E8 0C046F97 */ jal set_background_color_blend +/* 802D6C 802424EC 0080302D */ daddu $a2, $a0, $zero +/* 802D70 802424F0 8E020070 */ lw $v0, 0x70($s0) +/* 802D74 802424F4 14400006 */ bnez $v0, .L80242510 +/* 802D78 802424F8 00000000 */ nop +/* 802D7C 802424FC 8E020074 */ lw $v0, 0x74($s0) +/* 802D80 80242500 14400003 */ bnez $v0, .L80242510 +/* 802D84 80242504 24020001 */ addiu $v0, $zero, 1 +/* 802D88 80242508 08090977 */ j .L802425DC +/* 802D8C 8024250C AE020074 */ sw $v0, 0x74($s0) +.L80242510: +/* 802D90 80242510 8E030074 */ lw $v1, 0x74($s0) +/* 802D94 80242514 24020001 */ addiu $v0, $zero, 1 +/* 802D98 80242518 14620031 */ bne $v1, $v0, .L802425E0 +/* 802D9C 8024251C 0000102D */ daddu $v0, $zero, $zero +/* 802DA0 80242520 0C04760B */ jal func_8011D82C +/* 802DA4 80242524 0000202D */ daddu $a0, $zero, $zero +/* 802DA8 80242528 0000802D */ daddu $s0, $zero, $zero +/* 802DAC 8024252C 2413FFFC */ addiu $s3, $zero, -4 +/* 802DB0 80242530 24120005 */ addiu $s2, $zero, 5 +/* 802DB4 80242534 3C11FF7F */ lui $s1, 0xff7f +/* 802DB8 80242538 3C028015 */ lui $v0, 0x8015 +/* 802DBC 8024253C 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 802DC0 80242540 3631FFFF */ ori $s1, $s1, 0xffff +/* 802DC4 80242544 A0400000 */ sb $zero, ($v0) +.L80242548: +/* 802DC8 80242548 0C00E2B7 */ jal get_npc_by_index +/* 802DCC 8024254C 0200202D */ daddu $a0, $s0, $zero +/* 802DD0 80242550 0040202D */ daddu $a0, $v0, $zero +/* 802DD4 80242554 5080000B */ beql $a0, $zero, .L80242584 +/* 802DD8 80242558 26100001 */ addiu $s0, $s0, 1 +/* 802DDC 8024255C 8C820000 */ lw $v0, ($a0) +/* 802DE0 80242560 50400008 */ beql $v0, $zero, .L80242584 +/* 802DE4 80242564 26100001 */ addiu $s0, $s0, 1 +/* 802DE8 80242568 808300A4 */ lb $v1, 0xa4($a0) +/* 802DEC 8024256C 10730005 */ beq $v1, $s3, .L80242584 +/* 802DF0 80242570 26100001 */ addiu $s0, $s0, 1 +/* 802DF4 80242574 10720003 */ beq $v1, $s2, .L80242584 +/* 802DF8 80242578 00000000 */ nop +/* 802DFC 8024257C 00511024 */ and $v0, $v0, $s1 +/* 802E00 80242580 AC820000 */ sw $v0, ($a0) +.L80242584: +/* 802E04 80242584 2A020040 */ slti $v0, $s0, 0x40 +/* 802E08 80242588 1440FFEF */ bnez $v0, .L80242548 +/* 802E0C 8024258C 00000000 */ nop +/* 802E10 80242590 0000802D */ daddu $s0, $zero, $zero +/* 802E14 80242594 3C11F7FF */ lui $s1, 0xf7ff +/* 802E18 80242598 3631FFFF */ ori $s1, $s1, 0xffff +.L8024259C: +/* 802E1C 8024259C 0C04C3D6 */ jal get_item_entity +/* 802E20 802425A0 0200202D */ daddu $a0, $s0, $zero +/* 802E24 802425A4 0040182D */ daddu $v1, $v0, $zero +/* 802E28 802425A8 10600007 */ beqz $v1, .L802425C8 +/* 802E2C 802425AC 26100001 */ addiu $s0, $s0, 1 +/* 802E30 802425B0 8C640000 */ lw $a0, ($v1) +/* 802E34 802425B4 30820010 */ andi $v0, $a0, 0x10 +/* 802E38 802425B8 10400003 */ beqz $v0, .L802425C8 +/* 802E3C 802425BC 00000000 */ nop +/* 802E40 802425C0 00911024 */ and $v0, $a0, $s1 +/* 802E44 802425C4 AC620000 */ sw $v0, ($v1) +.L802425C8: +/* 802E48 802425C8 2A020100 */ slti $v0, $s0, 0x100 +/* 802E4C 802425CC 1440FFF3 */ bnez $v0, .L8024259C +/* 802E50 802425D0 24020002 */ addiu $v0, $zero, 2 +/* 802E54 802425D4 08090978 */ j .L802425E0 +/* 802E58 802425D8 00000000 */ nop +.L802425DC: +/* 802E5C 802425DC 0000102D */ daddu $v0, $zero, $zero +.L802425E0: +/* 802E60 802425E0 8FBF0020 */ lw $ra, 0x20($sp) +/* 802E64 802425E4 8FB3001C */ lw $s3, 0x1c($sp) +/* 802E68 802425E8 8FB20018 */ lw $s2, 0x18($sp) +/* 802E6C 802425EC 8FB10014 */ lw $s1, 0x14($sp) +/* 802E70 802425F0 8FB00010 */ lw $s0, 0x10($sp) +/* 802E74 802425F4 03E00008 */ jr $ra +/* 802E78 802425F8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC.s deleted file mode 100644 index c70cb2099a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425FC -/* 802E7C 802425FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 802E80 80242600 AFB00010 */ sw $s0, 0x10($sp) -/* 802E84 80242604 3C108011 */ lui $s0, %hi(gPlayerData) -/* 802E88 80242608 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 802E8C 8024260C AFBF0018 */ sw $ra, 0x18($sp) -/* 802E90 80242610 AFB10014 */ sw $s1, 0x14($sp) -/* 802E94 80242614 960302C0 */ lhu $v1, 0x2c0($s0) -/* 802E98 80242618 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 802E9C 8024261C 10400003 */ beqz $v0, .L8024262C -/* 802EA0 80242620 0080882D */ daddu $s1, $a0, $zero -/* 802EA4 80242624 24620001 */ addiu $v0, $v1, 1 -/* 802EA8 80242628 A60202C0 */ sh $v0, 0x2c0($s0) -.L8024262C: -/* 802EAC 8024262C 3C05F5DE */ lui $a1, 0xf5de -/* 802EB0 80242630 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 802EB4 80242634 0C0B1EAF */ jal get_variable -/* 802EB8 80242638 0000202D */ daddu $a0, $zero, $zero -/* 802EBC 8024263C 3C038025 */ lui $v1, 0x8025 -/* 802EC0 80242640 00621821 */ addu $v1, $v1, $v0 -/* 802EC4 80242644 90638C94 */ lbu $v1, -0x736c($v1) -/* 802EC8 80242648 8E220084 */ lw $v0, 0x84($s1) -/* 802ECC 8024264C 54430006 */ bnel $v0, $v1, .L80242668 -/* 802ED0 80242650 AE200084 */ sw $zero, 0x84($s1) -/* 802ED4 80242654 24020001 */ addiu $v0, $zero, 1 -/* 802ED8 80242658 AE220084 */ sw $v0, 0x84($s1) -/* 802EDC 8024265C 960202C2 */ lhu $v0, 0x2c2($s0) -/* 802EE0 80242660 24420001 */ addiu $v0, $v0, 1 -/* 802EE4 80242664 A60202C2 */ sh $v0, 0x2c2($s0) -.L80242668: -/* 802EE8 80242668 8FBF0018 */ lw $ra, 0x18($sp) -/* 802EEC 8024266C 8FB10014 */ lw $s1, 0x14($sp) -/* 802EF0 80242670 8FB00010 */ lw $s0, 0x10($sp) -/* 802EF4 80242674 24020002 */ addiu $v0, $zero, 2 -/* 802EF8 80242678 03E00008 */ jr $ra -/* 802EFC 8024267C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC_802E7C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC_802E7C.s new file mode 100644 index 0000000000..008e4346ef --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802425FC_802E7C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425FC_802E7C +/* 802E7C 802425FC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 802E80 80242600 AFB00010 */ sw $s0, 0x10($sp) +/* 802E84 80242604 3C108011 */ lui $s0, %hi(gPlayerData) +/* 802E88 80242608 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 802E8C 8024260C AFBF0018 */ sw $ra, 0x18($sp) +/* 802E90 80242610 AFB10014 */ sw $s1, 0x14($sp) +/* 802E94 80242614 960302C0 */ lhu $v1, 0x2c0($s0) +/* 802E98 80242618 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 802E9C 8024261C 10400003 */ beqz $v0, .L8024262C +/* 802EA0 80242620 0080882D */ daddu $s1, $a0, $zero +/* 802EA4 80242624 24620001 */ addiu $v0, $v1, 1 +/* 802EA8 80242628 A60202C0 */ sh $v0, 0x2c0($s0) +.L8024262C: +/* 802EAC 8024262C 3C05F5DE */ lui $a1, 0xf5de +/* 802EB0 80242630 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 802EB4 80242634 0C0B1EAF */ jal get_variable +/* 802EB8 80242638 0000202D */ daddu $a0, $zero, $zero +/* 802EBC 8024263C 3C038025 */ lui $v1, 0x8025 +/* 802EC0 80242640 00621821 */ addu $v1, $v1, $v0 +/* 802EC4 80242644 90638C94 */ lbu $v1, -0x736c($v1) +/* 802EC8 80242648 8E220084 */ lw $v0, 0x84($s1) +/* 802ECC 8024264C 54430006 */ bnel $v0, $v1, .L80242668 +/* 802ED0 80242650 AE200084 */ sw $zero, 0x84($s1) +/* 802ED4 80242654 24020001 */ addiu $v0, $zero, 1 +/* 802ED8 80242658 AE220084 */ sw $v0, 0x84($s1) +/* 802EDC 8024265C 960202C2 */ lhu $v0, 0x2c2($s0) +/* 802EE0 80242660 24420001 */ addiu $v0, $v0, 1 +/* 802EE4 80242664 A60202C2 */ sh $v0, 0x2c2($s0) +.L80242668: +/* 802EE8 80242668 8FBF0018 */ lw $ra, 0x18($sp) +/* 802EEC 8024266C 8FB10014 */ lw $s1, 0x14($sp) +/* 802EF0 80242670 8FB00010 */ lw $s0, 0x10($sp) +/* 802EF4 80242674 24020002 */ addiu $v0, $zero, 2 +/* 802EF8 80242678 03E00008 */ jr $ra +/* 802EFC 8024267C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680.s deleted file mode 100644 index 86cdccbf88..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242680 -/* 802F00 80242680 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 802F04 80242684 AFB1001C */ sw $s1, 0x1c($sp) -/* 802F08 80242688 AFBF0020 */ sw $ra, 0x20($sp) -/* 802F0C 8024268C AFB00018 */ sw $s0, 0x18($sp) -/* 802F10 80242690 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 802F14 80242694 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 802F18 80242698 10A00060 */ beqz $a1, .L8024281C -/* 802F1C 8024269C 0080882D */ daddu $s1, $a0, $zero -/* 802F20 802426A0 3C05F4AC */ lui $a1, 0xf4ac -/* 802F24 802426A4 0C0B1EAF */ jal get_variable -/* 802F28 802426A8 34A5D481 */ ori $a1, $a1, 0xd481 -/* 802F2C 802426AC 0220202D */ daddu $a0, $s1, $zero -/* 802F30 802426B0 3C05F4AC */ lui $a1, 0xf4ac -/* 802F34 802426B4 4482B000 */ mtc1 $v0, $f22 -/* 802F38 802426B8 00000000 */ nop -/* 802F3C 802426BC 4680B5A0 */ cvt.s.w $f22, $f22 -/* 802F40 802426C0 0C0B1EAF */ jal get_variable -/* 802F44 802426C4 34A5D482 */ ori $a1, $a1, 0xd482 -/* 802F48 802426C8 0220202D */ daddu $a0, $s1, $zero -/* 802F4C 802426CC 3C05F4AC */ lui $a1, 0xf4ac -/* 802F50 802426D0 4482A000 */ mtc1 $v0, $f20 -/* 802F54 802426D4 00000000 */ nop -/* 802F58 802426D8 4680A520 */ cvt.s.w $f20, $f20 -/* 802F5C 802426DC 0C0B1EAF */ jal get_variable -/* 802F60 802426E0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 802F64 802426E4 44821000 */ mtc1 $v0, $f2 -/* 802F68 802426E8 00000000 */ nop -/* 802F6C 802426EC 468010A0 */ cvt.s.w $f2, $f2 -/* 802F70 802426F0 4405B000 */ mfc1 $a1, $f22 -/* 802F74 802426F4 4406A000 */ mfc1 $a2, $f20 -/* 802F78 802426F8 44071000 */ mfc1 $a3, $f2 -/* 802F7C 802426FC 0C01C574 */ jal func_800715D0 -/* 802F80 80242700 0000202D */ daddu $a0, $zero, $zero -/* 802F84 80242704 0220202D */ daddu $a0, $s1, $zero -/* 802F88 80242708 3C05F4AC */ lui $a1, 0xf4ac -/* 802F8C 8024270C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 802F90 80242710 3C108026 */ lui $s0, 0x8026 -/* 802F94 80242714 26102A60 */ addiu $s0, $s0, 0x2a60 -/* 802F98 80242718 0C0B1EAF */ jal get_variable -/* 802F9C 8024271C AE020000 */ sw $v0, ($s0) -/* 802FA0 80242720 0220202D */ daddu $a0, $s1, $zero -/* 802FA4 80242724 3C05F4AC */ lui $a1, 0xf4ac -/* 802FA8 80242728 4482B000 */ mtc1 $v0, $f22 -/* 802FAC 8024272C 00000000 */ nop -/* 802FB0 80242730 4680B5A0 */ cvt.s.w $f22, $f22 -/* 802FB4 80242734 0C0B1EAF */ jal get_variable -/* 802FB8 80242738 34A5D482 */ ori $a1, $a1, 0xd482 -/* 802FBC 8024273C 0220202D */ daddu $a0, $s1, $zero -/* 802FC0 80242740 3C05F4AC */ lui $a1, 0xf4ac -/* 802FC4 80242744 4482A000 */ mtc1 $v0, $f20 -/* 802FC8 80242748 00000000 */ nop -/* 802FCC 8024274C 4680A520 */ cvt.s.w $f20, $f20 -/* 802FD0 80242750 0C0B1EAF */ jal get_variable -/* 802FD4 80242754 34A5D483 */ ori $a1, $a1, 0xd483 -/* 802FD8 80242758 44821000 */ mtc1 $v0, $f2 -/* 802FDC 8024275C 00000000 */ nop -/* 802FE0 80242760 468010A0 */ cvt.s.w $f2, $f2 -/* 802FE4 80242764 4405B000 */ mfc1 $a1, $f22 -/* 802FE8 80242768 4406A000 */ mfc1 $a2, $f20 -/* 802FEC 8024276C 44071000 */ mfc1 $a3, $f2 -/* 802FF0 80242770 0C01C604 */ jal func_80071810 -/* 802FF4 80242774 0000202D */ daddu $a0, $zero, $zero -/* 802FF8 80242778 0220202D */ daddu $a0, $s1, $zero -/* 802FFC 8024277C 3C05F4AC */ lui $a1, 0xf4ac -/* 803000 80242780 3C018026 */ lui $at, 0x8026 -/* 803004 80242784 AC222A64 */ sw $v0, 0x2a64($at) -/* 803008 80242788 0C0B1EAF */ jal get_variable -/* 80300C 8024278C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 803010 80242790 0220202D */ daddu $a0, $s1, $zero -/* 803014 80242794 3C05F4AC */ lui $a1, 0xf4ac -/* 803018 80242798 4482B000 */ mtc1 $v0, $f22 -/* 80301C 8024279C 00000000 */ nop -/* 803020 802427A0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 803024 802427A4 0C0B1EAF */ jal get_variable -/* 803028 802427A8 34A5D482 */ ori $a1, $a1, 0xd482 -/* 80302C 802427AC 0220202D */ daddu $a0, $s1, $zero -/* 803030 802427B0 3C05F4AC */ lui $a1, 0xf4ac -/* 803034 802427B4 4482A000 */ mtc1 $v0, $f20 -/* 803038 802427B8 00000000 */ nop -/* 80303C 802427BC 4680A520 */ cvt.s.w $f20, $f20 -/* 803040 802427C0 0C0B1EAF */ jal get_variable -/* 803044 802427C4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 803048 802427C8 44821000 */ mtc1 $v0, $f2 -/* 80304C 802427CC 00000000 */ nop -/* 803050 802427D0 468010A0 */ cvt.s.w $f2, $f2 -/* 803054 802427D4 4405B000 */ mfc1 $a1, $f22 -/* 803058 802427D8 4406A000 */ mfc1 $a2, $f20 -/* 80305C 802427DC 3C013F80 */ lui $at, 0x3f80 -/* 803060 802427E0 44810000 */ mtc1 $at, $f0 -/* 803064 802427E4 44071000 */ mfc1 $a3, $f2 -/* 803068 802427E8 0000202D */ daddu $a0, $zero, $zero -/* 80306C 802427EC AFA00014 */ sw $zero, 0x14($sp) -/* 803070 802427F0 0C01CA24 */ jal func_80072890 -/* 803074 802427F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 803078 802427F8 8E030000 */ lw $v1, ($s0) -/* 80307C 802427FC 8C64000C */ lw $a0, 0xc($v1) -/* 803080 80242800 3C018026 */ lui $at, 0x8026 -/* 803084 80242804 AC222A68 */ sw $v0, 0x2a68($at) -/* 803088 80242808 AC800018 */ sw $zero, 0x18($a0) -/* 80308C 8024280C AC800020 */ sw $zero, 0x20($a0) -/* 803090 80242810 AC800024 */ sw $zero, 0x24($a0) -/* 803094 80242814 AC800028 */ sw $zero, 0x28($a0) -/* 803098 80242818 AC80001C */ sw $zero, 0x1c($a0) -.L8024281C: -/* 80309C 8024281C 3C028026 */ lui $v0, 0x8026 -/* 8030A0 80242820 8C422A60 */ lw $v0, 0x2a60($v0) -/* 8030A4 80242824 8C44000C */ lw $a0, 0xc($v0) -/* 8030A8 80242828 8C820020 */ lw $v0, 0x20($a0) -/* 8030AC 8024282C 8C830028 */ lw $v1, 0x28($a0) -/* 8030B0 80242830 2442000A */ addiu $v0, $v0, 0xa -/* 8030B4 80242834 AC820020 */ sw $v0, 0x20($a0) -/* 8030B8 80242838 8C820024 */ lw $v0, 0x24($a0) -/* 8030BC 8024283C 2463000A */ addiu $v1, $v1, 0xa -/* 8030C0 80242840 AC830028 */ sw $v1, 0x28($a0) -/* 8030C4 80242844 8C830018 */ lw $v1, 0x18($a0) -/* 8030C8 80242848 2442000A */ addiu $v0, $v0, 0xa -/* 8030CC 8024284C AC820024 */ sw $v0, 0x24($a0) -/* 8030D0 80242850 8C82001C */ lw $v0, 0x1c($a0) -/* 8030D4 80242854 2463000A */ addiu $v1, $v1, 0xa -/* 8030D8 80242858 AC830018 */ sw $v1, 0x18($a0) -/* 8030DC 8024285C 286300FF */ slti $v1, $v1, 0xff -/* 8030E0 80242860 2442000A */ addiu $v0, $v0, 0xa -/* 8030E4 80242864 AC82001C */ sw $v0, 0x1c($a0) -/* 8030E8 80242868 14600004 */ bnez $v1, .L8024287C -/* 8030EC 8024286C 0000102D */ daddu $v0, $zero, $zero -/* 8030F0 80242870 240200FF */ addiu $v0, $zero, 0xff -/* 8030F4 80242874 AC820018 */ sw $v0, 0x18($a0) -/* 8030F8 80242878 24020002 */ addiu $v0, $zero, 2 -.L8024287C: -/* 8030FC 8024287C 8FBF0020 */ lw $ra, 0x20($sp) -/* 803100 80242880 8FB1001C */ lw $s1, 0x1c($sp) -/* 803104 80242884 8FB00018 */ lw $s0, 0x18($sp) -/* 803108 80242888 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 80310C 8024288C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 803110 80242890 03E00008 */ jr $ra -/* 803114 80242894 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s new file mode 100644 index 0000000000..fdd262e53c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242680_802F00.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242680_802F00 +/* 802F00 80242680 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 802F04 80242684 AFB1001C */ sw $s1, 0x1c($sp) +/* 802F08 80242688 AFBF0020 */ sw $ra, 0x20($sp) +/* 802F0C 8024268C AFB00018 */ sw $s0, 0x18($sp) +/* 802F10 80242690 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 802F14 80242694 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 802F18 80242698 10A00060 */ beqz $a1, .L8024281C +/* 802F1C 8024269C 0080882D */ daddu $s1, $a0, $zero +/* 802F20 802426A0 3C05F4AC */ lui $a1, 0xf4ac +/* 802F24 802426A4 0C0B1EAF */ jal get_variable +/* 802F28 802426A8 34A5D481 */ ori $a1, $a1, 0xd481 +/* 802F2C 802426AC 0220202D */ daddu $a0, $s1, $zero +/* 802F30 802426B0 3C05F4AC */ lui $a1, 0xf4ac +/* 802F34 802426B4 4482B000 */ mtc1 $v0, $f22 +/* 802F38 802426B8 00000000 */ nop +/* 802F3C 802426BC 4680B5A0 */ cvt.s.w $f22, $f22 +/* 802F40 802426C0 0C0B1EAF */ jal get_variable +/* 802F44 802426C4 34A5D482 */ ori $a1, $a1, 0xd482 +/* 802F48 802426C8 0220202D */ daddu $a0, $s1, $zero +/* 802F4C 802426CC 3C05F4AC */ lui $a1, 0xf4ac +/* 802F50 802426D0 4482A000 */ mtc1 $v0, $f20 +/* 802F54 802426D4 00000000 */ nop +/* 802F58 802426D8 4680A520 */ cvt.s.w $f20, $f20 +/* 802F5C 802426DC 0C0B1EAF */ jal get_variable +/* 802F60 802426E0 34A5D483 */ ori $a1, $a1, 0xd483 +/* 802F64 802426E4 44821000 */ mtc1 $v0, $f2 +/* 802F68 802426E8 00000000 */ nop +/* 802F6C 802426EC 468010A0 */ cvt.s.w $f2, $f2 +/* 802F70 802426F0 4405B000 */ mfc1 $a1, $f22 +/* 802F74 802426F4 4406A000 */ mfc1 $a2, $f20 +/* 802F78 802426F8 44071000 */ mfc1 $a3, $f2 +/* 802F7C 802426FC 0C01C574 */ jal func_800715D0 +/* 802F80 80242700 0000202D */ daddu $a0, $zero, $zero +/* 802F84 80242704 0220202D */ daddu $a0, $s1, $zero +/* 802F88 80242708 3C05F4AC */ lui $a1, 0xf4ac +/* 802F8C 8024270C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 802F90 80242710 3C108026 */ lui $s0, 0x8026 +/* 802F94 80242714 26102A60 */ addiu $s0, $s0, 0x2a60 +/* 802F98 80242718 0C0B1EAF */ jal get_variable +/* 802F9C 8024271C AE020000 */ sw $v0, ($s0) +/* 802FA0 80242720 0220202D */ daddu $a0, $s1, $zero +/* 802FA4 80242724 3C05F4AC */ lui $a1, 0xf4ac +/* 802FA8 80242728 4482B000 */ mtc1 $v0, $f22 +/* 802FAC 8024272C 00000000 */ nop +/* 802FB0 80242730 4680B5A0 */ cvt.s.w $f22, $f22 +/* 802FB4 80242734 0C0B1EAF */ jal get_variable +/* 802FB8 80242738 34A5D482 */ ori $a1, $a1, 0xd482 +/* 802FBC 8024273C 0220202D */ daddu $a0, $s1, $zero +/* 802FC0 80242740 3C05F4AC */ lui $a1, 0xf4ac +/* 802FC4 80242744 4482A000 */ mtc1 $v0, $f20 +/* 802FC8 80242748 00000000 */ nop +/* 802FCC 8024274C 4680A520 */ cvt.s.w $f20, $f20 +/* 802FD0 80242750 0C0B1EAF */ jal get_variable +/* 802FD4 80242754 34A5D483 */ ori $a1, $a1, 0xd483 +/* 802FD8 80242758 44821000 */ mtc1 $v0, $f2 +/* 802FDC 8024275C 00000000 */ nop +/* 802FE0 80242760 468010A0 */ cvt.s.w $f2, $f2 +/* 802FE4 80242764 4405B000 */ mfc1 $a1, $f22 +/* 802FE8 80242768 4406A000 */ mfc1 $a2, $f20 +/* 802FEC 8024276C 44071000 */ mfc1 $a3, $f2 +/* 802FF0 80242770 0C01C604 */ jal func_80071810 +/* 802FF4 80242774 0000202D */ daddu $a0, $zero, $zero +/* 802FF8 80242778 0220202D */ daddu $a0, $s1, $zero +/* 802FFC 8024277C 3C05F4AC */ lui $a1, 0xf4ac +/* 803000 80242780 3C018026 */ lui $at, 0x8026 +/* 803004 80242784 AC222A64 */ sw $v0, 0x2a64($at) +/* 803008 80242788 0C0B1EAF */ jal get_variable +/* 80300C 8024278C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 803010 80242790 0220202D */ daddu $a0, $s1, $zero +/* 803014 80242794 3C05F4AC */ lui $a1, 0xf4ac +/* 803018 80242798 4482B000 */ mtc1 $v0, $f22 +/* 80301C 8024279C 00000000 */ nop +/* 803020 802427A0 4680B5A0 */ cvt.s.w $f22, $f22 +/* 803024 802427A4 0C0B1EAF */ jal get_variable +/* 803028 802427A8 34A5D482 */ ori $a1, $a1, 0xd482 +/* 80302C 802427AC 0220202D */ daddu $a0, $s1, $zero +/* 803030 802427B0 3C05F4AC */ lui $a1, 0xf4ac +/* 803034 802427B4 4482A000 */ mtc1 $v0, $f20 +/* 803038 802427B8 00000000 */ nop +/* 80303C 802427BC 4680A520 */ cvt.s.w $f20, $f20 +/* 803040 802427C0 0C0B1EAF */ jal get_variable +/* 803044 802427C4 34A5D483 */ ori $a1, $a1, 0xd483 +/* 803048 802427C8 44821000 */ mtc1 $v0, $f2 +/* 80304C 802427CC 00000000 */ nop +/* 803050 802427D0 468010A0 */ cvt.s.w $f2, $f2 +/* 803054 802427D4 4405B000 */ mfc1 $a1, $f22 +/* 803058 802427D8 4406A000 */ mfc1 $a2, $f20 +/* 80305C 802427DC 3C013F80 */ lui $at, 0x3f80 +/* 803060 802427E0 44810000 */ mtc1 $at, $f0 +/* 803064 802427E4 44071000 */ mfc1 $a3, $f2 +/* 803068 802427E8 0000202D */ daddu $a0, $zero, $zero +/* 80306C 802427EC AFA00014 */ sw $zero, 0x14($sp) +/* 803070 802427F0 0C01CA24 */ jal func_80072890 +/* 803074 802427F4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 803078 802427F8 8E030000 */ lw $v1, ($s0) +/* 80307C 802427FC 8C64000C */ lw $a0, 0xc($v1) +/* 803080 80242800 3C018026 */ lui $at, 0x8026 +/* 803084 80242804 AC222A68 */ sw $v0, 0x2a68($at) +/* 803088 80242808 AC800018 */ sw $zero, 0x18($a0) +/* 80308C 8024280C AC800020 */ sw $zero, 0x20($a0) +/* 803090 80242810 AC800024 */ sw $zero, 0x24($a0) +/* 803094 80242814 AC800028 */ sw $zero, 0x28($a0) +/* 803098 80242818 AC80001C */ sw $zero, 0x1c($a0) +.L8024281C: +/* 80309C 8024281C 3C028026 */ lui $v0, 0x8026 +/* 8030A0 80242820 8C422A60 */ lw $v0, 0x2a60($v0) +/* 8030A4 80242824 8C44000C */ lw $a0, 0xc($v0) +/* 8030A8 80242828 8C820020 */ lw $v0, 0x20($a0) +/* 8030AC 8024282C 8C830028 */ lw $v1, 0x28($a0) +/* 8030B0 80242830 2442000A */ addiu $v0, $v0, 0xa +/* 8030B4 80242834 AC820020 */ sw $v0, 0x20($a0) +/* 8030B8 80242838 8C820024 */ lw $v0, 0x24($a0) +/* 8030BC 8024283C 2463000A */ addiu $v1, $v1, 0xa +/* 8030C0 80242840 AC830028 */ sw $v1, 0x28($a0) +/* 8030C4 80242844 8C830018 */ lw $v1, 0x18($a0) +/* 8030C8 80242848 2442000A */ addiu $v0, $v0, 0xa +/* 8030CC 8024284C AC820024 */ sw $v0, 0x24($a0) +/* 8030D0 80242850 8C82001C */ lw $v0, 0x1c($a0) +/* 8030D4 80242854 2463000A */ addiu $v1, $v1, 0xa +/* 8030D8 80242858 AC830018 */ sw $v1, 0x18($a0) +/* 8030DC 8024285C 286300FF */ slti $v1, $v1, 0xff +/* 8030E0 80242860 2442000A */ addiu $v0, $v0, 0xa +/* 8030E4 80242864 AC82001C */ sw $v0, 0x1c($a0) +/* 8030E8 80242868 14600004 */ bnez $v1, .L8024287C +/* 8030EC 8024286C 0000102D */ daddu $v0, $zero, $zero +/* 8030F0 80242870 240200FF */ addiu $v0, $zero, 0xff +/* 8030F4 80242874 AC820018 */ sw $v0, 0x18($a0) +/* 8030F8 80242878 24020002 */ addiu $v0, $zero, 2 +.L8024287C: +/* 8030FC 8024287C 8FBF0020 */ lw $ra, 0x20($sp) +/* 803100 80242880 8FB1001C */ lw $s1, 0x1c($sp) +/* 803104 80242884 8FB00018 */ lw $s0, 0x18($sp) +/* 803108 80242888 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 80310C 8024288C D7B40028 */ ldc1 $f20, 0x28($sp) +/* 803110 80242890 03E00008 */ jr $ra +/* 803114 80242894 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898.s deleted file mode 100644 index d224d62e6c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242898 -/* 803118 80242898 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 80311C 8024289C 10A0000B */ beqz $a1, .L802428CC -/* 803120 802428A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 803124 802428A4 3C038026 */ lui $v1, 0x8026 -/* 803128 802428A8 8C632A64 */ lw $v1, 0x2a64($v1) -/* 80312C 802428AC 8C620000 */ lw $v0, ($v1) -/* 803130 802428B0 3C048026 */ lui $a0, 0x8026 -/* 803134 802428B4 8C842A68 */ lw $a0, 0x2a68($a0) -/* 803138 802428B8 34420010 */ ori $v0, $v0, 0x10 -/* 80313C 802428BC AC620000 */ sw $v0, ($v1) -/* 803140 802428C0 8C820000 */ lw $v0, ($a0) -/* 803144 802428C4 34420010 */ ori $v0, $v0, 0x10 -/* 803148 802428C8 AC820000 */ sw $v0, ($a0) -.L802428CC: -/* 80314C 802428CC 3C048026 */ lui $a0, 0x8026 -/* 803150 802428D0 8C842A60 */ lw $a0, 0x2a60($a0) -/* 803154 802428D4 8C85000C */ lw $a1, 0xc($a0) -/* 803158 802428D8 8CA20018 */ lw $v0, 0x18($a1) -/* 80315C 802428DC 8CA30020 */ lw $v1, 0x20($a1) -/* 803160 802428E0 2442FFF6 */ addiu $v0, $v0, -0xa -/* 803164 802428E4 ACA20018 */ sw $v0, 0x18($a1) -/* 803168 802428E8 8CA20024 */ lw $v0, 0x24($a1) -/* 80316C 802428EC 2463FFF6 */ addiu $v1, $v1, -0xa -/* 803170 802428F0 ACA30020 */ sw $v1, 0x20($a1) -/* 803174 802428F4 8CA30028 */ lw $v1, 0x28($a1) -/* 803178 802428F8 2442FFF6 */ addiu $v0, $v0, -0xa -/* 80317C 802428FC ACA20024 */ sw $v0, 0x24($a1) -/* 803180 80242900 8CA2001C */ lw $v0, 0x1c($a1) -/* 803184 80242904 2463FFF6 */ addiu $v1, $v1, -0xa -/* 803188 80242908 ACA30028 */ sw $v1, 0x28($a1) -/* 80318C 8024290C 8CA30018 */ lw $v1, 0x18($a1) -/* 803190 80242910 2442FFF6 */ addiu $v0, $v0, -0xa -/* 803194 80242914 18600003 */ blez $v1, .L80242924 -/* 803198 80242918 ACA2001C */ sw $v0, 0x1c($a1) -/* 80319C 8024291C 08090A50 */ j .L80242940 -/* 8031A0 80242920 0000102D */ daddu $v0, $zero, $zero -.L80242924: -/* 8031A4 80242924 0C016914 */ jal remove_effect -/* 8031A8 80242928 ACA00018 */ sw $zero, 0x18($a1) -/* 8031AC 8024292C 3C048026 */ lui $a0, 0x8026 -/* 8031B0 80242930 8C842A40 */ lw $a0, 0x2a40($a0) -/* 8031B4 80242934 0C048D70 */ jal func_801235C0 -/* 8031B8 80242938 00000000 */ nop -/* 8031BC 8024293C 24020002 */ addiu $v0, $zero, 2 -.L80242940: -/* 8031C0 80242940 8FBF0010 */ lw $ra, 0x10($sp) -/* 8031C4 80242944 03E00008 */ jr $ra -/* 8031C8 80242948 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s new file mode 100644 index 0000000000..255a5ede7d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242898_803118.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242898_803118 +/* 803118 80242898 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 80311C 8024289C 10A0000B */ beqz $a1, .L802428CC +/* 803120 802428A0 AFBF0010 */ sw $ra, 0x10($sp) +/* 803124 802428A4 3C038026 */ lui $v1, 0x8026 +/* 803128 802428A8 8C632A64 */ lw $v1, 0x2a64($v1) +/* 80312C 802428AC 8C620000 */ lw $v0, ($v1) +/* 803130 802428B0 3C048026 */ lui $a0, 0x8026 +/* 803134 802428B4 8C842A68 */ lw $a0, 0x2a68($a0) +/* 803138 802428B8 34420010 */ ori $v0, $v0, 0x10 +/* 80313C 802428BC AC620000 */ sw $v0, ($v1) +/* 803140 802428C0 8C820000 */ lw $v0, ($a0) +/* 803144 802428C4 34420010 */ ori $v0, $v0, 0x10 +/* 803148 802428C8 AC820000 */ sw $v0, ($a0) +.L802428CC: +/* 80314C 802428CC 3C048026 */ lui $a0, 0x8026 +/* 803150 802428D0 8C842A60 */ lw $a0, 0x2a60($a0) +/* 803154 802428D4 8C85000C */ lw $a1, 0xc($a0) +/* 803158 802428D8 8CA20018 */ lw $v0, 0x18($a1) +/* 80315C 802428DC 8CA30020 */ lw $v1, 0x20($a1) +/* 803160 802428E0 2442FFF6 */ addiu $v0, $v0, -0xa +/* 803164 802428E4 ACA20018 */ sw $v0, 0x18($a1) +/* 803168 802428E8 8CA20024 */ lw $v0, 0x24($a1) +/* 80316C 802428EC 2463FFF6 */ addiu $v1, $v1, -0xa +/* 803170 802428F0 ACA30020 */ sw $v1, 0x20($a1) +/* 803174 802428F4 8CA30028 */ lw $v1, 0x28($a1) +/* 803178 802428F8 2442FFF6 */ addiu $v0, $v0, -0xa +/* 80317C 802428FC ACA20024 */ sw $v0, 0x24($a1) +/* 803180 80242900 8CA2001C */ lw $v0, 0x1c($a1) +/* 803184 80242904 2463FFF6 */ addiu $v1, $v1, -0xa +/* 803188 80242908 ACA30028 */ sw $v1, 0x28($a1) +/* 80318C 8024290C 8CA30018 */ lw $v1, 0x18($a1) +/* 803190 80242910 2442FFF6 */ addiu $v0, $v0, -0xa +/* 803194 80242914 18600003 */ blez $v1, .L80242924 +/* 803198 80242918 ACA2001C */ sw $v0, 0x1c($a1) +/* 80319C 8024291C 08090A50 */ j .L80242940 +/* 8031A0 80242920 0000102D */ daddu $v0, $zero, $zero +.L80242924: +/* 8031A4 80242924 0C016914 */ jal remove_effect +/* 8031A8 80242928 ACA00018 */ sw $zero, 0x18($a1) +/* 8031AC 8024292C 3C048026 */ lui $a0, 0x8026 +/* 8031B0 80242930 8C842A40 */ lw $a0, 0x2a40($a0) +/* 8031B4 80242934 0C048D70 */ jal func_801235C0 +/* 8031B8 80242938 00000000 */ nop +/* 8031BC 8024293C 24020002 */ addiu $v0, $zero, 2 +.L80242940: +/* 8031C0 80242940 8FBF0010 */ lw $ra, 0x10($sp) +/* 8031C4 80242944 03E00008 */ jr $ra +/* 8031C8 80242948 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C.s deleted file mode 100644 index 35d91a5b2c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024294C -/* 8031CC 8024294C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8031D0 80242950 AFBF0010 */ sw $ra, 0x10($sp) -/* 8031D4 80242954 8C82000C */ lw $v0, 0xc($a0) -/* 8031D8 80242958 0C0B1EAF */ jal get_variable -/* 8031DC 8024295C 8C450000 */ lw $a1, ($v0) -/* 8031E0 80242960 3C038026 */ lui $v1, 0x8026 -/* 8031E4 80242964 8C632A60 */ lw $v1, 0x2a60($v1) -/* 8031E8 80242968 8C63000C */ lw $v1, 0xc($v1) -/* 8031EC 8024296C AC620034 */ sw $v0, 0x34($v1) -/* 8031F0 80242970 8FBF0010 */ lw $ra, 0x10($sp) -/* 8031F4 80242974 24020002 */ addiu $v0, $zero, 2 -/* 8031F8 80242978 03E00008 */ jr $ra -/* 8031FC 8024297C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C_8031CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C_8031CC.s new file mode 100644 index 0000000000..169a692dd6 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024294C_8031CC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024294C_8031CC +/* 8031CC 8024294C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8031D0 80242950 AFBF0010 */ sw $ra, 0x10($sp) +/* 8031D4 80242954 8C82000C */ lw $v0, 0xc($a0) +/* 8031D8 80242958 0C0B1EAF */ jal get_variable +/* 8031DC 8024295C 8C450000 */ lw $a1, ($v0) +/* 8031E0 80242960 3C038026 */ lui $v1, 0x8026 +/* 8031E4 80242964 8C632A60 */ lw $v1, 0x2a60($v1) +/* 8031E8 80242968 8C63000C */ lw $v1, 0xc($v1) +/* 8031EC 8024296C AC620034 */ sw $v0, 0x34($v1) +/* 8031F0 80242970 8FBF0010 */ lw $ra, 0x10($sp) +/* 8031F4 80242974 24020002 */ addiu $v0, $zero, 2 +/* 8031F8 80242978 03E00008 */ jr $ra +/* 8031FC 8024297C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980.s deleted file mode 100644 index ceec8575d8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242980 -/* 803200 80242980 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 803204 80242984 AFBF0010 */ sw $ra, 0x10($sp) -/* 803208 80242988 8C82000C */ lw $v0, 0xc($a0) -/* 80320C 8024298C 0C0B1EAF */ jal get_variable -/* 803210 80242990 8C450000 */ lw $a1, ($v0) -/* 803214 80242994 0040202D */ daddu $a0, $v0, $zero -/* 803218 80242998 3C028026 */ lui $v0, 0x8026 -/* 80321C 8024299C 8C422A60 */ lw $v0, 0x2a60($v0) -/* 803220 802429A0 24030001 */ addiu $v1, $zero, 1 -/* 803224 802429A4 8C45000C */ lw $a1, 0xc($v0) -/* 803228 802429A8 1083000D */ beq $a0, $v1, .L802429E0 -/* 80322C 802429AC 28820002 */ slti $v0, $a0, 2 -/* 803230 802429B0 10400005 */ beqz $v0, .L802429C8 -/* 803234 802429B4 24020002 */ addiu $v0, $zero, 2 -/* 803238 802429B8 10800007 */ beqz $a0, .L802429D8 -/* 80323C 802429BC 240200C0 */ addiu $v0, $zero, 0xc0 -/* 803240 802429C0 08090A7C */ j .L802429F0 -/* 803244 802429C4 ACA00038 */ sw $zero, 0x38($a1) -.L802429C8: -/* 803248 802429C8 10820008 */ beq $a0, $v0, .L802429EC -/* 80324C 802429CC 24020040 */ addiu $v0, $zero, 0x40 -/* 803250 802429D0 08090A7C */ j .L802429F0 -/* 803254 802429D4 ACA00038 */ sw $zero, 0x38($a1) -.L802429D8: -/* 803258 802429D8 08090A7C */ j .L802429F0 -/* 80325C 802429DC ACA20038 */ sw $v0, 0x38($a1) -.L802429E0: -/* 803260 802429E0 24020080 */ addiu $v0, $zero, 0x80 -/* 803264 802429E4 08090A7C */ j .L802429F0 -/* 803268 802429E8 ACA20038 */ sw $v0, 0x38($a1) -.L802429EC: -/* 80326C 802429EC ACA20038 */ sw $v0, 0x38($a1) -.L802429F0: -/* 803270 802429F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 803274 802429F4 24020002 */ addiu $v0, $zero, 2 -/* 803278 802429F8 03E00008 */ jr $ra -/* 80327C 802429FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980_803200.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980_803200.s new file mode 100644 index 0000000000..34f9a4235a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242980_803200.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242980_803200 +/* 803200 80242980 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 803204 80242984 AFBF0010 */ sw $ra, 0x10($sp) +/* 803208 80242988 8C82000C */ lw $v0, 0xc($a0) +/* 80320C 8024298C 0C0B1EAF */ jal get_variable +/* 803210 80242990 8C450000 */ lw $a1, ($v0) +/* 803214 80242994 0040202D */ daddu $a0, $v0, $zero +/* 803218 80242998 3C028026 */ lui $v0, 0x8026 +/* 80321C 8024299C 8C422A60 */ lw $v0, 0x2a60($v0) +/* 803220 802429A0 24030001 */ addiu $v1, $zero, 1 +/* 803224 802429A4 8C45000C */ lw $a1, 0xc($v0) +/* 803228 802429A8 1083000D */ beq $a0, $v1, .L802429E0 +/* 80322C 802429AC 28820002 */ slti $v0, $a0, 2 +/* 803230 802429B0 10400005 */ beqz $v0, .L802429C8 +/* 803234 802429B4 24020002 */ addiu $v0, $zero, 2 +/* 803238 802429B8 10800007 */ beqz $a0, .L802429D8 +/* 80323C 802429BC 240200C0 */ addiu $v0, $zero, 0xc0 +/* 803240 802429C0 08090A7C */ j .L802429F0 +/* 803244 802429C4 ACA00038 */ sw $zero, 0x38($a1) +.L802429C8: +/* 803248 802429C8 10820008 */ beq $a0, $v0, .L802429EC +/* 80324C 802429CC 24020040 */ addiu $v0, $zero, 0x40 +/* 803250 802429D0 08090A7C */ j .L802429F0 +/* 803254 802429D4 ACA00038 */ sw $zero, 0x38($a1) +.L802429D8: +/* 803258 802429D8 08090A7C */ j .L802429F0 +/* 80325C 802429DC ACA20038 */ sw $v0, 0x38($a1) +.L802429E0: +/* 803260 802429E0 24020080 */ addiu $v0, $zero, 0x80 +/* 803264 802429E4 08090A7C */ j .L802429F0 +/* 803268 802429E8 ACA20038 */ sw $v0, 0x38($a1) +.L802429EC: +/* 80326C 802429EC ACA20038 */ sw $v0, 0x38($a1) +.L802429F0: +/* 803270 802429F0 8FBF0010 */ lw $ra, 0x10($sp) +/* 803274 802429F4 24020002 */ addiu $v0, $zero, 2 +/* 803278 802429F8 03E00008 */ jr $ra +/* 80327C 802429FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00.s deleted file mode 100644 index 1fdb47b3a7..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A00 -/* 803280 80242A00 3C028026 */ lui $v0, 0x8026 -/* 803284 80242A04 8C422A68 */ lw $v0, 0x2a68($v0) -/* 803288 80242A08 8C42000C */ lw $v0, 0xc($v0) -/* 80328C 80242A0C AC40001C */ sw $zero, 0x1c($v0) -/* 803290 80242A10 03E00008 */ jr $ra -/* 803294 80242A14 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00_803280.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00_803280.s new file mode 100644 index 0000000000..7df9a2c8b5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A00_803280.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A00_803280 +/* 803280 80242A00 3C028026 */ lui $v0, 0x8026 +/* 803284 80242A04 8C422A68 */ lw $v0, 0x2a68($v0) +/* 803288 80242A08 8C42000C */ lw $v0, 0xc($v0) +/* 80328C 80242A0C AC40001C */ sw $zero, 0x1c($v0) +/* 803290 80242A10 03E00008 */ jr $ra +/* 803294 80242A14 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18.s deleted file mode 100644 index c8d941f07c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A18 -/* 803298 80242A18 3C028026 */ lui $v0, 0x8026 -/* 80329C 80242A1C 8C422A68 */ lw $v0, 0x2a68($v0) -/* 8032A0 80242A20 8C43000C */ lw $v1, 0xc($v0) -/* 8032A4 80242A24 24020001 */ addiu $v0, $zero, 1 -/* 8032A8 80242A28 AC62001C */ sw $v0, 0x1c($v1) -/* 8032AC 80242A2C 03E00008 */ jr $ra -/* 8032B0 80242A30 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18_803298.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18_803298.s new file mode 100644 index 0000000000..eef7c9ecd0 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A18_803298.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A18_803298 +/* 803298 80242A18 3C028026 */ lui $v0, 0x8026 +/* 80329C 80242A1C 8C422A68 */ lw $v0, 0x2a68($v0) +/* 8032A0 80242A20 8C43000C */ lw $v1, 0xc($v0) +/* 8032A4 80242A24 24020001 */ addiu $v0, $zero, 1 +/* 8032A8 80242A28 AC62001C */ sw $v0, 0x1c($v1) +/* 8032AC 80242A2C 03E00008 */ jr $ra +/* 8032B0 80242A30 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34.s deleted file mode 100644 index 4674fec0f9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A34 -/* 8032B4 80242A34 3C028026 */ lui $v0, 0x8026 -/* 8032B8 80242A38 8C422A68 */ lw $v0, 0x2a68($v0) -/* 8032BC 80242A3C 8C43000C */ lw $v1, 0xc($v0) -/* 8032C0 80242A40 24020002 */ addiu $v0, $zero, 2 -/* 8032C4 80242A44 03E00008 */ jr $ra -/* 8032C8 80242A48 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34_8032B4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34_8032B4.s new file mode 100644 index 0000000000..6f72c86550 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A34_8032B4.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A34_8032B4 +/* 8032B4 80242A34 3C028026 */ lui $v0, 0x8026 +/* 8032B8 80242A38 8C422A68 */ lw $v0, 0x2a68($v0) +/* 8032BC 80242A3C 8C43000C */ lw $v1, 0xc($v0) +/* 8032C0 80242A40 24020002 */ addiu $v0, $zero, 2 +/* 8032C4 80242A44 03E00008 */ jr $ra +/* 8032C8 80242A48 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C.s deleted file mode 100644 index d9a4ef2b4e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A4C -/* 8032CC 80242A4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8032D0 80242A50 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8032D4 80242A54 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8032D8 80242A58 3C05FE36 */ lui $a1, 0xfe36 -/* 8032DC 80242A5C AFBF0010 */ sw $ra, 0x10($sp) -/* 8032E0 80242A60 80460075 */ lb $a2, 0x75($v0) -/* 8032E4 80242A64 0C0B2026 */ jal set_variable -/* 8032E8 80242A68 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8032EC 80242A6C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8032F0 80242A70 24020002 */ addiu $v0, $zero, 2 -/* 8032F4 80242A74 03E00008 */ jr $ra -/* 8032F8 80242A78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s new file mode 100644 index 0000000000..883819a6bd --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A4C_8032CC +/* 8032CC 80242A4C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8032D0 80242A50 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 8032D4 80242A54 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 8032D8 80242A58 3C05FE36 */ lui $a1, 0xfe36 +/* 8032DC 80242A5C AFBF0010 */ sw $ra, 0x10($sp) +/* 8032E0 80242A60 80460075 */ lb $a2, 0x75($v0) +/* 8032E4 80242A64 0C0B2026 */ jal set_variable +/* 8032E8 80242A68 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8032EC 80242A6C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8032F0 80242A70 24020002 */ addiu $v0, $zero, 2 +/* 8032F4 80242A74 03E00008 */ jr $ra +/* 8032F8 80242A78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C.s deleted file mode 100644 index 7ea1740a88..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A7C -/* 8032FC 80242A7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803300 80242A80 AFB10014 */ sw $s1, 0x14($sp) -/* 803304 80242A84 0080882D */ daddu $s1, $a0, $zero -/* 803308 80242A88 AFBF0018 */ sw $ra, 0x18($sp) -/* 80330C 80242A8C AFB00010 */ sw $s0, 0x10($sp) -/* 803310 80242A90 8E30000C */ lw $s0, 0xc($s1) -/* 803314 80242A94 8E050000 */ lw $a1, ($s0) -/* 803318 80242A98 0C0B1EAF */ jal get_variable -/* 80331C 80242A9C 26100004 */ addiu $s0, $s0, 4 -/* 803320 80242AA0 0220202D */ daddu $a0, $s1, $zero -/* 803324 80242AA4 8E050000 */ lw $a1, ($s0) -/* 803328 80242AA8 0C0B210B */ jal get_float_variable -/* 80332C 80242AAC 0040802D */ daddu $s0, $v0, $zero -/* 803330 80242AB0 24020002 */ addiu $v0, $zero, 2 -/* 803334 80242AB4 00501804 */ sllv $v1, $s0, $v0 -/* 803338 80242AB8 00701821 */ addu $v1, $v1, $s0 -/* 80333C 80242ABC 00431804 */ sllv $v1, $v1, $v0 -/* 803340 80242AC0 00701823 */ subu $v1, $v1, $s0 -/* 803344 80242AC4 000320C0 */ sll $a0, $v1, 3 -/* 803348 80242AC8 00641821 */ addu $v1, $v1, $a0 -/* 80334C 80242ACC 000318C0 */ sll $v1, $v1, 3 -/* 803350 80242AD0 3C01800B */ lui $at, 0x800b -/* 803354 80242AD4 00230821 */ addu $at, $at, $v1 -/* 803358 80242AD8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 80335C 80242ADC 8FBF0018 */ lw $ra, 0x18($sp) -/* 803360 80242AE0 8FB10014 */ lw $s1, 0x14($sp) -/* 803364 80242AE4 8FB00010 */ lw $s0, 0x10($sp) -/* 803368 80242AE8 03E00008 */ jr $ra -/* 80336C 80242AEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s new file mode 100644 index 0000000000..ce062d8b5f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A7C_8032FC +/* 8032FC 80242A7C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 803300 80242A80 AFB10014 */ sw $s1, 0x14($sp) +/* 803304 80242A84 0080882D */ daddu $s1, $a0, $zero +/* 803308 80242A88 AFBF0018 */ sw $ra, 0x18($sp) +/* 80330C 80242A8C AFB00010 */ sw $s0, 0x10($sp) +/* 803310 80242A90 8E30000C */ lw $s0, 0xc($s1) +/* 803314 80242A94 8E050000 */ lw $a1, ($s0) +/* 803318 80242A98 0C0B1EAF */ jal get_variable +/* 80331C 80242A9C 26100004 */ addiu $s0, $s0, 4 +/* 803320 80242AA0 0220202D */ daddu $a0, $s1, $zero +/* 803324 80242AA4 8E050000 */ lw $a1, ($s0) +/* 803328 80242AA8 0C0B210B */ jal get_float_variable +/* 80332C 80242AAC 0040802D */ daddu $s0, $v0, $zero +/* 803330 80242AB0 24020002 */ addiu $v0, $zero, 2 +/* 803334 80242AB4 00501804 */ sllv $v1, $s0, $v0 +/* 803338 80242AB8 00701821 */ addu $v1, $v1, $s0 +/* 80333C 80242ABC 00431804 */ sllv $v1, $v1, $v0 +/* 803340 80242AC0 00701823 */ subu $v1, $v1, $s0 +/* 803344 80242AC4 000320C0 */ sll $a0, $v1, 3 +/* 803348 80242AC8 00641821 */ addu $v1, $v1, $a0 +/* 80334C 80242ACC 000318C0 */ sll $v1, $v1, 3 +/* 803350 80242AD0 3C01800B */ lui $at, 0x800b +/* 803354 80242AD4 00230821 */ addu $at, $at, $v1 +/* 803358 80242AD8 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 80335C 80242ADC 8FBF0018 */ lw $ra, 0x18($sp) +/* 803360 80242AE0 8FB10014 */ lw $s1, 0x14($sp) +/* 803364 80242AE4 8FB00010 */ lw $s0, 0x10($sp) +/* 803368 80242AE8 03E00008 */ jr $ra +/* 80336C 80242AEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0.s deleted file mode 100644 index 7afabc274f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AF0 -/* 803370 80242AF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803374 80242AF4 AFB10014 */ sw $s1, 0x14($sp) -/* 803378 80242AF8 0080882D */ daddu $s1, $a0, $zero -/* 80337C 80242AFC AFBF0018 */ sw $ra, 0x18($sp) -/* 803380 80242B00 AFB00010 */ sw $s0, 0x10($sp) -/* 803384 80242B04 8E30000C */ lw $s0, 0xc($s1) -/* 803388 80242B08 8E050000 */ lw $a1, ($s0) -/* 80338C 80242B0C 0C0B1EAF */ jal get_variable -/* 803390 80242B10 26100004 */ addiu $s0, $s0, 4 -/* 803394 80242B14 00021880 */ sll $v1, $v0, 2 -/* 803398 80242B18 00621821 */ addu $v1, $v1, $v0 -/* 80339C 80242B1C 00031880 */ sll $v1, $v1, 2 -/* 8033A0 80242B20 00621823 */ subu $v1, $v1, $v0 -/* 8033A4 80242B24 000310C0 */ sll $v0, $v1, 3 -/* 8033A8 80242B28 00621821 */ addu $v1, $v1, $v0 -/* 8033AC 80242B2C 000318C0 */ sll $v1, $v1, 3 -/* 8033B0 80242B30 3C01800B */ lui $at, 0x800b -/* 8033B4 80242B34 00230821 */ addu $at, $at, $v1 -/* 8033B8 80242B38 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8033BC 80242B3C 3C014480 */ lui $at, 0x4480 -/* 8033C0 80242B40 44810000 */ mtc1 $at, $f0 -/* 8033C4 80242B44 00000000 */ nop -/* 8033C8 80242B48 46001082 */ mul.s $f2, $f2, $f0 -/* 8033CC 80242B4C 00000000 */ nop -/* 8033D0 80242B50 3C01CD5B */ lui $at, 0xcd5b -/* 8033D4 80242B54 34215858 */ ori $at, $at, 0x5858 -/* 8033D8 80242B58 44810000 */ mtc1 $at, $f0 -/* 8033DC 80242B5C 00000000 */ nop -/* 8033E0 80242B60 46001080 */ add.s $f2, $f2, $f0 -/* 8033E4 80242B64 8E050000 */ lw $a1, ($s0) -/* 8033E8 80242B68 4600110D */ trunc.w.s $f4, $f2 -/* 8033EC 80242B6C 44062000 */ mfc1 $a2, $f4 -/* 8033F0 80242B70 0C0B2026 */ jal set_variable -/* 8033F4 80242B74 0220202D */ daddu $a0, $s1, $zero -/* 8033F8 80242B78 8FBF0018 */ lw $ra, 0x18($sp) -/* 8033FC 80242B7C 8FB10014 */ lw $s1, 0x14($sp) -/* 803400 80242B80 8FB00010 */ lw $s0, 0x10($sp) -/* 803404 80242B84 24020002 */ addiu $v0, $zero, 2 -/* 803408 80242B88 03E00008 */ jr $ra -/* 80340C 80242B8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s new file mode 100644 index 0000000000..fc08cf671d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242AF0_803370 +/* 803370 80242AF0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 803374 80242AF4 AFB10014 */ sw $s1, 0x14($sp) +/* 803378 80242AF8 0080882D */ daddu $s1, $a0, $zero +/* 80337C 80242AFC AFBF0018 */ sw $ra, 0x18($sp) +/* 803380 80242B00 AFB00010 */ sw $s0, 0x10($sp) +/* 803384 80242B04 8E30000C */ lw $s0, 0xc($s1) +/* 803388 80242B08 8E050000 */ lw $a1, ($s0) +/* 80338C 80242B0C 0C0B1EAF */ jal get_variable +/* 803390 80242B10 26100004 */ addiu $s0, $s0, 4 +/* 803394 80242B14 00021880 */ sll $v1, $v0, 2 +/* 803398 80242B18 00621821 */ addu $v1, $v1, $v0 +/* 80339C 80242B1C 00031880 */ sll $v1, $v1, 2 +/* 8033A0 80242B20 00621823 */ subu $v1, $v1, $v0 +/* 8033A4 80242B24 000310C0 */ sll $v0, $v1, 3 +/* 8033A8 80242B28 00621821 */ addu $v1, $v1, $v0 +/* 8033AC 80242B2C 000318C0 */ sll $v1, $v1, 3 +/* 8033B0 80242B30 3C01800B */ lui $at, 0x800b +/* 8033B4 80242B34 00230821 */ addu $at, $at, $v1 +/* 8033B8 80242B38 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 8033BC 80242B3C 3C014480 */ lui $at, 0x4480 +/* 8033C0 80242B40 44810000 */ mtc1 $at, $f0 +/* 8033C4 80242B44 00000000 */ nop +/* 8033C8 80242B48 46001082 */ mul.s $f2, $f2, $f0 +/* 8033CC 80242B4C 00000000 */ nop +/* 8033D0 80242B50 3C01CD5B */ lui $at, 0xcd5b +/* 8033D4 80242B54 34215858 */ ori $at, $at, 0x5858 +/* 8033D8 80242B58 44810000 */ mtc1 $at, $f0 +/* 8033DC 80242B5C 00000000 */ nop +/* 8033E0 80242B60 46001080 */ add.s $f2, $f2, $f0 +/* 8033E4 80242B64 8E050000 */ lw $a1, ($s0) +/* 8033E8 80242B68 4600110D */ trunc.w.s $f4, $f2 +/* 8033EC 80242B6C 44062000 */ mfc1 $a2, $f4 +/* 8033F0 80242B70 0C0B2026 */ jal set_variable +/* 8033F4 80242B74 0220202D */ daddu $a0, $s1, $zero +/* 8033F8 80242B78 8FBF0018 */ lw $ra, 0x18($sp) +/* 8033FC 80242B7C 8FB10014 */ lw $s1, 0x14($sp) +/* 803400 80242B80 8FB00010 */ lw $s0, 0x10($sp) +/* 803404 80242B84 24020002 */ addiu $v0, $zero, 2 +/* 803408 80242B88 03E00008 */ jr $ra +/* 80340C 80242B8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90.s deleted file mode 100644 index fcd9113dca..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B90 -/* 803410 80242B90 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 803414 80242B94 AFB20018 */ sw $s2, 0x18($sp) -/* 803418 80242B98 0080902D */ daddu $s2, $a0, $zero -/* 80341C 80242B9C AFBF0030 */ sw $ra, 0x30($sp) -/* 803420 80242BA0 AFB7002C */ sw $s7, 0x2c($sp) -/* 803424 80242BA4 AFB60028 */ sw $s6, 0x28($sp) -/* 803428 80242BA8 AFB50024 */ sw $s5, 0x24($sp) -/* 80342C 80242BAC AFB40020 */ sw $s4, 0x20($sp) -/* 803430 80242BB0 AFB3001C */ sw $s3, 0x1c($sp) -/* 803434 80242BB4 AFB10014 */ sw $s1, 0x14($sp) -/* 803438 80242BB8 AFB00010 */ sw $s0, 0x10($sp) -/* 80343C 80242BBC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 803440 80242BC0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 803444 80242BC4 8E50000C */ lw $s0, 0xc($s2) -/* 803448 80242BC8 8E050000 */ lw $a1, ($s0) -/* 80344C 80242BCC 0C0B1EAF */ jal get_variable -/* 803450 80242BD0 26100004 */ addiu $s0, $s0, 4 -/* 803454 80242BD4 8E050000 */ lw $a1, ($s0) -/* 803458 80242BD8 26100004 */ addiu $s0, $s0, 4 -/* 80345C 80242BDC 0240202D */ daddu $a0, $s2, $zero -/* 803460 80242BE0 0C0B1EAF */ jal get_variable -/* 803464 80242BE4 0040B82D */ daddu $s7, $v0, $zero -/* 803468 80242BE8 8E050000 */ lw $a1, ($s0) -/* 80346C 80242BEC 26100004 */ addiu $s0, $s0, 4 -/* 803470 80242BF0 0240202D */ daddu $a0, $s2, $zero -/* 803474 80242BF4 0C0B1EAF */ jal get_variable -/* 803478 80242BF8 0040B02D */ daddu $s6, $v0, $zero -/* 80347C 80242BFC 0240202D */ daddu $a0, $s2, $zero -/* 803480 80242C00 3C05F4AC */ lui $a1, 0xf4ac -/* 803484 80242C04 34A5D481 */ ori $a1, $a1, 0xd481 -/* 803488 80242C08 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 80348C 80242C0C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 803490 80242C10 8E140000 */ lw $s4, ($s0) -/* 803494 80242C14 00061880 */ sll $v1, $a2, 2 -/* 803498 80242C18 00661821 */ addu $v1, $v1, $a2 -/* 80349C 80242C1C 00031880 */ sll $v1, $v1, 2 -/* 8034A0 80242C20 00661823 */ subu $v1, $v1, $a2 -/* 8034A4 80242C24 000330C0 */ sll $a2, $v1, 3 -/* 8034A8 80242C28 00661821 */ addu $v1, $v1, $a2 -/* 8034AC 80242C2C 000318C0 */ sll $v1, $v1, 3 -/* 8034B0 80242C30 3C01800B */ lui $at, 0x800b -/* 8034B4 80242C34 00230821 */ addu $at, $at, $v1 -/* 8034B8 80242C38 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8034BC 80242C3C 8E150004 */ lw $s5, 4($s0) -/* 8034C0 80242C40 4600010D */ trunc.w.s $f4, $f0 -/* 8034C4 80242C44 44112000 */ mfc1 $s1, $f4 -/* 8034C8 80242C48 0C0B1EAF */ jal get_variable -/* 8034CC 80242C4C 0040982D */ daddu $s3, $v0, $zero -/* 8034D0 80242C50 4491B000 */ mtc1 $s1, $f22 -/* 8034D4 80242C54 00000000 */ nop -/* 8034D8 80242C58 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8034DC 80242C5C 4600B306 */ mov.s $f12, $f22 -/* 8034E0 80242C60 0C00A8D4 */ jal cos_deg -/* 8034E4 80242C64 0040802D */ daddu $s0, $v0, $zero -/* 8034E8 80242C68 4493A000 */ mtc1 $s3, $f20 -/* 8034EC 80242C6C 00000000 */ nop -/* 8034F0 80242C70 4680A520 */ cvt.s.w $f20, $f20 -/* 8034F4 80242C74 4600A002 */ mul.s $f0, $f20, $f0 -/* 8034F8 80242C78 00000000 */ nop -/* 8034FC 80242C7C 0240202D */ daddu $a0, $s2, $zero -/* 803500 80242C80 44901000 */ mtc1 $s0, $f2 -/* 803504 80242C84 00000000 */ nop -/* 803508 80242C88 468010A0 */ cvt.s.w $f2, $f2 -/* 80350C 80242C8C 46001081 */ sub.s $f2, $f2, $f0 -/* 803510 80242C90 3C05F4AC */ lui $a1, 0xf4ac -/* 803514 80242C94 4600110D */ trunc.w.s $f4, $f2 -/* 803518 80242C98 44102000 */ mfc1 $s0, $f4 -/* 80351C 80242C9C 0C0B1EAF */ jal get_variable -/* 803520 80242CA0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 803524 80242CA4 4600B306 */ mov.s $f12, $f22 -/* 803528 80242CA8 0C00A8BB */ jal sin_deg -/* 80352C 80242CAC 0040882D */ daddu $s1, $v0, $zero -/* 803530 80242CB0 4600A502 */ mul.s $f20, $f20, $f0 -/* 803534 80242CB4 00000000 */ nop -/* 803538 80242CB8 0240202D */ daddu $a0, $s2, $zero -/* 80353C 80242CBC 44910000 */ mtc1 $s1, $f0 -/* 803540 80242CC0 00000000 */ nop -/* 803544 80242CC4 46800020 */ cvt.s.w $f0, $f0 -/* 803548 80242CC8 46140001 */ sub.s $f0, $f0, $f20 -/* 80354C 80242CCC 0280282D */ daddu $a1, $s4, $zero -/* 803550 80242CD0 02173023 */ subu $a2, $s0, $s7 -/* 803554 80242CD4 4600010D */ trunc.w.s $f4, $f0 -/* 803558 80242CD8 44102000 */ mfc1 $s0, $f4 -/* 80355C 80242CDC 0C0B2026 */ jal set_variable -/* 803560 80242CE0 02168023 */ subu $s0, $s0, $s6 -/* 803564 80242CE4 0240202D */ daddu $a0, $s2, $zero -/* 803568 80242CE8 02A0282D */ daddu $a1, $s5, $zero -/* 80356C 80242CEC 0C0B2026 */ jal set_variable -/* 803570 80242CF0 0200302D */ daddu $a2, $s0, $zero -/* 803574 80242CF4 8FBF0030 */ lw $ra, 0x30($sp) -/* 803578 80242CF8 8FB7002C */ lw $s7, 0x2c($sp) -/* 80357C 80242CFC 8FB60028 */ lw $s6, 0x28($sp) -/* 803580 80242D00 8FB50024 */ lw $s5, 0x24($sp) -/* 803584 80242D04 8FB40020 */ lw $s4, 0x20($sp) -/* 803588 80242D08 8FB3001C */ lw $s3, 0x1c($sp) -/* 80358C 80242D0C 8FB20018 */ lw $s2, 0x18($sp) -/* 803590 80242D10 8FB10014 */ lw $s1, 0x14($sp) -/* 803594 80242D14 8FB00010 */ lw $s0, 0x10($sp) -/* 803598 80242D18 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 80359C 80242D1C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8035A0 80242D20 24020002 */ addiu $v0, $zero, 2 -/* 8035A4 80242D24 03E00008 */ jr $ra -/* 8035A8 80242D28 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s new file mode 100644 index 0000000000..536996d9dc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B90_803410 +/* 803410 80242B90 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 803414 80242B94 AFB20018 */ sw $s2, 0x18($sp) +/* 803418 80242B98 0080902D */ daddu $s2, $a0, $zero +/* 80341C 80242B9C AFBF0030 */ sw $ra, 0x30($sp) +/* 803420 80242BA0 AFB7002C */ sw $s7, 0x2c($sp) +/* 803424 80242BA4 AFB60028 */ sw $s6, 0x28($sp) +/* 803428 80242BA8 AFB50024 */ sw $s5, 0x24($sp) +/* 80342C 80242BAC AFB40020 */ sw $s4, 0x20($sp) +/* 803430 80242BB0 AFB3001C */ sw $s3, 0x1c($sp) +/* 803434 80242BB4 AFB10014 */ sw $s1, 0x14($sp) +/* 803438 80242BB8 AFB00010 */ sw $s0, 0x10($sp) +/* 80343C 80242BBC F7B60040 */ sdc1 $f22, 0x40($sp) +/* 803440 80242BC0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 803444 80242BC4 8E50000C */ lw $s0, 0xc($s2) +/* 803448 80242BC8 8E050000 */ lw $a1, ($s0) +/* 80344C 80242BCC 0C0B1EAF */ jal get_variable +/* 803450 80242BD0 26100004 */ addiu $s0, $s0, 4 +/* 803454 80242BD4 8E050000 */ lw $a1, ($s0) +/* 803458 80242BD8 26100004 */ addiu $s0, $s0, 4 +/* 80345C 80242BDC 0240202D */ daddu $a0, $s2, $zero +/* 803460 80242BE0 0C0B1EAF */ jal get_variable +/* 803464 80242BE4 0040B82D */ daddu $s7, $v0, $zero +/* 803468 80242BE8 8E050000 */ lw $a1, ($s0) +/* 80346C 80242BEC 26100004 */ addiu $s0, $s0, 4 +/* 803470 80242BF0 0240202D */ daddu $a0, $s2, $zero +/* 803474 80242BF4 0C0B1EAF */ jal get_variable +/* 803478 80242BF8 0040B02D */ daddu $s6, $v0, $zero +/* 80347C 80242BFC 0240202D */ daddu $a0, $s2, $zero +/* 803480 80242C00 3C05F4AC */ lui $a1, 0xf4ac +/* 803484 80242C04 34A5D481 */ ori $a1, $a1, 0xd481 +/* 803488 80242C08 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* 80348C 80242C0C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* 803490 80242C10 8E140000 */ lw $s4, ($s0) +/* 803494 80242C14 00061880 */ sll $v1, $a2, 2 +/* 803498 80242C18 00661821 */ addu $v1, $v1, $a2 +/* 80349C 80242C1C 00031880 */ sll $v1, $v1, 2 +/* 8034A0 80242C20 00661823 */ subu $v1, $v1, $a2 +/* 8034A4 80242C24 000330C0 */ sll $a2, $v1, 3 +/* 8034A8 80242C28 00661821 */ addu $v1, $v1, $a2 +/* 8034AC 80242C2C 000318C0 */ sll $v1, $v1, 3 +/* 8034B0 80242C30 3C01800B */ lui $at, 0x800b +/* 8034B4 80242C34 00230821 */ addu $at, $at, $v1 +/* 8034B8 80242C38 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 8034BC 80242C3C 8E150004 */ lw $s5, 4($s0) +/* 8034C0 80242C40 4600010D */ trunc.w.s $f4, $f0 +/* 8034C4 80242C44 44112000 */ mfc1 $s1, $f4 +/* 8034C8 80242C48 0C0B1EAF */ jal get_variable +/* 8034CC 80242C4C 0040982D */ daddu $s3, $v0, $zero +/* 8034D0 80242C50 4491B000 */ mtc1 $s1, $f22 +/* 8034D4 80242C54 00000000 */ nop +/* 8034D8 80242C58 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8034DC 80242C5C 4600B306 */ mov.s $f12, $f22 +/* 8034E0 80242C60 0C00A8D4 */ jal cos_deg +/* 8034E4 80242C64 0040802D */ daddu $s0, $v0, $zero +/* 8034E8 80242C68 4493A000 */ mtc1 $s3, $f20 +/* 8034EC 80242C6C 00000000 */ nop +/* 8034F0 80242C70 4680A520 */ cvt.s.w $f20, $f20 +/* 8034F4 80242C74 4600A002 */ mul.s $f0, $f20, $f0 +/* 8034F8 80242C78 00000000 */ nop +/* 8034FC 80242C7C 0240202D */ daddu $a0, $s2, $zero +/* 803500 80242C80 44901000 */ mtc1 $s0, $f2 +/* 803504 80242C84 00000000 */ nop +/* 803508 80242C88 468010A0 */ cvt.s.w $f2, $f2 +/* 80350C 80242C8C 46001081 */ sub.s $f2, $f2, $f0 +/* 803510 80242C90 3C05F4AC */ lui $a1, 0xf4ac +/* 803514 80242C94 4600110D */ trunc.w.s $f4, $f2 +/* 803518 80242C98 44102000 */ mfc1 $s0, $f4 +/* 80351C 80242C9C 0C0B1EAF */ jal get_variable +/* 803520 80242CA0 34A5D483 */ ori $a1, $a1, 0xd483 +/* 803524 80242CA4 4600B306 */ mov.s $f12, $f22 +/* 803528 80242CA8 0C00A8BB */ jal sin_deg +/* 80352C 80242CAC 0040882D */ daddu $s1, $v0, $zero +/* 803530 80242CB0 4600A502 */ mul.s $f20, $f20, $f0 +/* 803534 80242CB4 00000000 */ nop +/* 803538 80242CB8 0240202D */ daddu $a0, $s2, $zero +/* 80353C 80242CBC 44910000 */ mtc1 $s1, $f0 +/* 803540 80242CC0 00000000 */ nop +/* 803544 80242CC4 46800020 */ cvt.s.w $f0, $f0 +/* 803548 80242CC8 46140001 */ sub.s $f0, $f0, $f20 +/* 80354C 80242CCC 0280282D */ daddu $a1, $s4, $zero +/* 803550 80242CD0 02173023 */ subu $a2, $s0, $s7 +/* 803554 80242CD4 4600010D */ trunc.w.s $f4, $f0 +/* 803558 80242CD8 44102000 */ mfc1 $s0, $f4 +/* 80355C 80242CDC 0C0B2026 */ jal set_variable +/* 803560 80242CE0 02168023 */ subu $s0, $s0, $s6 +/* 803564 80242CE4 0240202D */ daddu $a0, $s2, $zero +/* 803568 80242CE8 02A0282D */ daddu $a1, $s5, $zero +/* 80356C 80242CEC 0C0B2026 */ jal set_variable +/* 803570 80242CF0 0200302D */ daddu $a2, $s0, $zero +/* 803574 80242CF4 8FBF0030 */ lw $ra, 0x30($sp) +/* 803578 80242CF8 8FB7002C */ lw $s7, 0x2c($sp) +/* 80357C 80242CFC 8FB60028 */ lw $s6, 0x28($sp) +/* 803580 80242D00 8FB50024 */ lw $s5, 0x24($sp) +/* 803584 80242D04 8FB40020 */ lw $s4, 0x20($sp) +/* 803588 80242D08 8FB3001C */ lw $s3, 0x1c($sp) +/* 80358C 80242D0C 8FB20018 */ lw $s2, 0x18($sp) +/* 803590 80242D10 8FB10014 */ lw $s1, 0x14($sp) +/* 803594 80242D14 8FB00010 */ lw $s0, 0x10($sp) +/* 803598 80242D18 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 80359C 80242D1C D7B40038 */ ldc1 $f20, 0x38($sp) +/* 8035A0 80242D20 24020002 */ addiu $v0, $zero, 2 +/* 8035A4 80242D24 03E00008 */ jr $ra +/* 8035A8 80242D28 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C.s deleted file mode 100644 index ed377a7092..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D2C -/* 8035AC 80242D2C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8035B0 80242D30 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8035B4 80242D34 10A00002 */ beqz $a1, .L80242D40 -/* 8035B8 80242D38 2402003C */ addiu $v0, $zero, 0x3c -/* 8035BC 80242D3C AC820070 */ sw $v0, 0x70($a0) -.L80242D40: -/* 8035C0 80242D40 C4620080 */ lwc1 $f2, 0x80($v1) -/* 8035C4 80242D44 3C0141F0 */ lui $at, 0x41f0 -/* 8035C8 80242D48 44810000 */ mtc1 $at, $f0 -/* 8035CC 80242D4C 00000000 */ nop -/* 8035D0 80242D50 46001000 */ add.s $f0, $f2, $f0 -/* 8035D4 80242D54 3C0143B4 */ lui $at, 0x43b4 -/* 8035D8 80242D58 44811000 */ mtc1 $at, $f2 -/* 8035DC 80242D5C 00000000 */ nop -/* 8035E0 80242D60 4600103E */ c.le.s $f2, $f0 -/* 8035E4 80242D64 00000000 */ nop -/* 8035E8 80242D68 45000003 */ bc1f .L80242D78 -/* 8035EC 80242D6C E4600080 */ swc1 $f0, 0x80($v1) -/* 8035F0 80242D70 46020001 */ sub.s $f0, $f0, $f2 -/* 8035F4 80242D74 E4600080 */ swc1 $f0, 0x80($v1) -.L80242D78: -/* 8035F8 80242D78 8C820070 */ lw $v0, 0x70($a0) -/* 8035FC 80242D7C 2442FFFF */ addiu $v0, $v0, -1 -/* 803600 80242D80 AC820070 */ sw $v0, 0x70($a0) -/* 803604 80242D84 000217C3 */ sra $v0, $v0, 0x1f -/* 803608 80242D88 03E00008 */ jr $ra -/* 80360C 80242D8C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s new file mode 100644 index 0000000000..bde9819489 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D2C_8035AC +/* 8035AC 80242D2C 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 8035B0 80242D30 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 8035B4 80242D34 10A00002 */ beqz $a1, .L80242D40 +/* 8035B8 80242D38 2402003C */ addiu $v0, $zero, 0x3c +/* 8035BC 80242D3C AC820070 */ sw $v0, 0x70($a0) +.L80242D40: +/* 8035C0 80242D40 C4620080 */ lwc1 $f2, 0x80($v1) +/* 8035C4 80242D44 3C0141F0 */ lui $at, 0x41f0 +/* 8035C8 80242D48 44810000 */ mtc1 $at, $f0 +/* 8035CC 80242D4C 00000000 */ nop +/* 8035D0 80242D50 46001000 */ add.s $f0, $f2, $f0 +/* 8035D4 80242D54 3C0143B4 */ lui $at, 0x43b4 +/* 8035D8 80242D58 44811000 */ mtc1 $at, $f2 +/* 8035DC 80242D5C 00000000 */ nop +/* 8035E0 80242D60 4600103E */ c.le.s $f2, $f0 +/* 8035E4 80242D64 00000000 */ nop +/* 8035E8 80242D68 45000003 */ bc1f .L80242D78 +/* 8035EC 80242D6C E4600080 */ swc1 $f0, 0x80($v1) +/* 8035F0 80242D70 46020001 */ sub.s $f0, $f0, $f2 +/* 8035F4 80242D74 E4600080 */ swc1 $f0, 0x80($v1) +.L80242D78: +/* 8035F8 80242D78 8C820070 */ lw $v0, 0x70($a0) +/* 8035FC 80242D7C 2442FFFF */ addiu $v0, $v0, -1 +/* 803600 80242D80 AC820070 */ sw $v0, 0x70($a0) +/* 803604 80242D84 000217C3 */ sra $v0, $v0, 0x1f +/* 803608 80242D88 03E00008 */ jr $ra +/* 80360C 80242D8C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90.s deleted file mode 100644 index 732e97f368..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D90 -/* 803610 80242D90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803614 80242D94 AFB10014 */ sw $s1, 0x14($sp) -/* 803618 80242D98 0080882D */ daddu $s1, $a0, $zero -/* 80361C 80242D9C AFB00010 */ sw $s0, 0x10($sp) -/* 803620 80242DA0 00A0802D */ daddu $s0, $a1, $zero -/* 803624 80242DA4 AFBF0018 */ sw $ra, 0x18($sp) -/* 803628 80242DA8 0C00EABB */ jal get_npc_unsafe -/* 80362C 80242DAC 2404FFFC */ addiu $a0, $zero, -4 -/* 803630 80242DB0 12000003 */ beqz $s0, .L80242DC0 -/* 803634 80242DB4 0040182D */ daddu $v1, $v0, $zero -/* 803638 80242DB8 2402003C */ addiu $v0, $zero, 0x3c -/* 80363C 80242DBC AE220070 */ sw $v0, 0x70($s1) -.L80242DC0: -/* 803640 80242DC0 C462000C */ lwc1 $f2, 0xc($v1) -/* 803644 80242DC4 3C0141F0 */ lui $at, 0x41f0 -/* 803648 80242DC8 44810000 */ mtc1 $at, $f0 -/* 80364C 80242DCC 00000000 */ nop -/* 803650 80242DD0 46001000 */ add.s $f0, $f2, $f0 -/* 803654 80242DD4 3C0143B4 */ lui $at, 0x43b4 -/* 803658 80242DD8 44811000 */ mtc1 $at, $f2 -/* 80365C 80242DDC 00000000 */ nop -/* 803660 80242DE0 4600103E */ c.le.s $f2, $f0 -/* 803664 80242DE4 00000000 */ nop -/* 803668 80242DE8 45000003 */ bc1f .L80242DF8 -/* 80366C 80242DEC E460000C */ swc1 $f0, 0xc($v1) -/* 803670 80242DF0 46020001 */ sub.s $f0, $f0, $f2 -/* 803674 80242DF4 E460000C */ swc1 $f0, 0xc($v1) -.L80242DF8: -/* 803678 80242DF8 8E230070 */ lw $v1, 0x70($s1) -/* 80367C 80242DFC 2463FFFF */ addiu $v1, $v1, -1 -/* 803680 80242E00 000317C3 */ sra $v0, $v1, 0x1f -/* 803684 80242E04 AE230070 */ sw $v1, 0x70($s1) -/* 803688 80242E08 8FBF0018 */ lw $ra, 0x18($sp) -/* 80368C 80242E0C 8FB10014 */ lw $s1, 0x14($sp) -/* 803690 80242E10 8FB00010 */ lw $s0, 0x10($sp) -/* 803694 80242E14 30420002 */ andi $v0, $v0, 2 -/* 803698 80242E18 03E00008 */ jr $ra -/* 80369C 80242E1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s new file mode 100644 index 0000000000..9d627a7f31 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242D90_803610 +/* 803610 80242D90 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 803614 80242D94 AFB10014 */ sw $s1, 0x14($sp) +/* 803618 80242D98 0080882D */ daddu $s1, $a0, $zero +/* 80361C 80242D9C AFB00010 */ sw $s0, 0x10($sp) +/* 803620 80242DA0 00A0802D */ daddu $s0, $a1, $zero +/* 803624 80242DA4 AFBF0018 */ sw $ra, 0x18($sp) +/* 803628 80242DA8 0C00EABB */ jal get_npc_unsafe +/* 80362C 80242DAC 2404FFFC */ addiu $a0, $zero, -4 +/* 803630 80242DB0 12000003 */ beqz $s0, .L80242DC0 +/* 803634 80242DB4 0040182D */ daddu $v1, $v0, $zero +/* 803638 80242DB8 2402003C */ addiu $v0, $zero, 0x3c +/* 80363C 80242DBC AE220070 */ sw $v0, 0x70($s1) +.L80242DC0: +/* 803640 80242DC0 C462000C */ lwc1 $f2, 0xc($v1) +/* 803644 80242DC4 3C0141F0 */ lui $at, 0x41f0 +/* 803648 80242DC8 44810000 */ mtc1 $at, $f0 +/* 80364C 80242DCC 00000000 */ nop +/* 803650 80242DD0 46001000 */ add.s $f0, $f2, $f0 +/* 803654 80242DD4 3C0143B4 */ lui $at, 0x43b4 +/* 803658 80242DD8 44811000 */ mtc1 $at, $f2 +/* 80365C 80242DDC 00000000 */ nop +/* 803660 80242DE0 4600103E */ c.le.s $f2, $f0 +/* 803664 80242DE4 00000000 */ nop +/* 803668 80242DE8 45000003 */ bc1f .L80242DF8 +/* 80366C 80242DEC E460000C */ swc1 $f0, 0xc($v1) +/* 803670 80242DF0 46020001 */ sub.s $f0, $f0, $f2 +/* 803674 80242DF4 E460000C */ swc1 $f0, 0xc($v1) +.L80242DF8: +/* 803678 80242DF8 8E230070 */ lw $v1, 0x70($s1) +/* 80367C 80242DFC 2463FFFF */ addiu $v1, $v1, -1 +/* 803680 80242E00 000317C3 */ sra $v0, $v1, 0x1f +/* 803684 80242E04 AE230070 */ sw $v1, 0x70($s1) +/* 803688 80242E08 8FBF0018 */ lw $ra, 0x18($sp) +/* 80368C 80242E0C 8FB10014 */ lw $s1, 0x14($sp) +/* 803690 80242E10 8FB00010 */ lw $s0, 0x10($sp) +/* 803694 80242E14 30420002 */ andi $v0, $v0, 2 +/* 803698 80242E18 03E00008 */ jr $ra +/* 80369C 80242E1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20.s deleted file mode 100644 index f6c9f972dc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E20 -/* 8036A0 80242E20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8036A4 80242E24 AFB10014 */ sw $s1, 0x14($sp) -/* 8036A8 80242E28 0080882D */ daddu $s1, $a0, $zero -/* 8036AC 80242E2C AFB00010 */ sw $s0, 0x10($sp) -/* 8036B0 80242E30 00A0802D */ daddu $s0, $a1, $zero -/* 8036B4 80242E34 AFBF001C */ sw $ra, 0x1c($sp) -/* 8036B8 80242E38 AFB20018 */ sw $s2, 0x18($sp) -/* 8036BC 80242E3C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8036C0 80242E40 0C00EABB */ jal get_npc_unsafe -/* 8036C4 80242E44 2404FFFC */ addiu $a0, $zero, -4 -/* 8036C8 80242E48 12000017 */ beqz $s0, .L80242EA8 -/* 8036CC 80242E4C 0040902D */ daddu $s2, $v0, $zero -/* 8036D0 80242E50 0220202D */ daddu $a0, $s1, $zero -/* 8036D4 80242E54 3C05FE36 */ lui $a1, 0xfe36 -/* 8036D8 80242E58 0C0B210B */ jal get_float_variable -/* 8036DC 80242E5C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8036E0 80242E60 0220202D */ daddu $a0, $s1, $zero -/* 8036E4 80242E64 3C05FE36 */ lui $a1, 0xfe36 -/* 8036E8 80242E68 3C014270 */ lui $at, 0x4270 -/* 8036EC 80242E6C 4481A000 */ mtc1 $at, $f20 -/* 8036F0 80242E70 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 8036F4 80242E74 46140003 */ div.s $f0, $f0, $f20 -/* 8036F8 80242E78 0C0B210B */ jal get_float_variable -/* 8036FC 80242E7C E6200074 */ swc1 $f0, 0x74($s1) -/* 803700 80242E80 0220202D */ daddu $a0, $s1, $zero -/* 803704 80242E84 3C05FE36 */ lui $a1, 0xfe36 -/* 803708 80242E88 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 80370C 80242E8C 46140003 */ div.s $f0, $f0, $f20 -/* 803710 80242E90 0C0B210B */ jal get_float_variable -/* 803714 80242E94 E6200078 */ swc1 $f0, 0x78($s1) -/* 803718 80242E98 46140003 */ div.s $f0, $f0, $f20 -/* 80371C 80242E9C 2402003C */ addiu $v0, $zero, 0x3c -/* 803720 80242EA0 E620007C */ swc1 $f0, 0x7c($s1) -/* 803724 80242EA4 AE220070 */ sw $v0, 0x70($s1) -.L80242EA8: -/* 803728 80242EA8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 80372C 80242EAC C6220074 */ lwc1 $f2, 0x74($s1) -/* 803730 80242EB0 46020000 */ add.s $f0, $f0, $f2 -/* 803734 80242EB4 E6400038 */ swc1 $f0, 0x38($s2) -/* 803738 80242EB8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 80373C 80242EBC C6220078 */ lwc1 $f2, 0x78($s1) -/* 803740 80242EC0 46020000 */ add.s $f0, $f0, $f2 -/* 803744 80242EC4 E640003C */ swc1 $f0, 0x3c($s2) -/* 803748 80242EC8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 80374C 80242ECC C622007C */ lwc1 $f2, 0x7c($s1) -/* 803750 80242ED0 46020000 */ add.s $f0, $f0, $f2 -/* 803754 80242ED4 E6400040 */ swc1 $f0, 0x40($s2) -/* 803758 80242ED8 8E230070 */ lw $v1, 0x70($s1) -/* 80375C 80242EDC 2463FFFF */ addiu $v1, $v1, -1 -/* 803760 80242EE0 2C620001 */ sltiu $v0, $v1, 1 -/* 803764 80242EE4 AE230070 */ sw $v1, 0x70($s1) -/* 803768 80242EE8 8FBF001C */ lw $ra, 0x1c($sp) -/* 80376C 80242EEC 8FB20018 */ lw $s2, 0x18($sp) -/* 803770 80242EF0 8FB10014 */ lw $s1, 0x14($sp) -/* 803774 80242EF4 8FB00010 */ lw $s0, 0x10($sp) -/* 803778 80242EF8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 80377C 80242EFC 00021040 */ sll $v0, $v0, 1 -/* 803780 80242F00 03E00008 */ jr $ra -/* 803784 80242F04 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s new file mode 100644 index 0000000000..7dedd216dc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E20_8036A0 +/* 8036A0 80242E20 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8036A4 80242E24 AFB10014 */ sw $s1, 0x14($sp) +/* 8036A8 80242E28 0080882D */ daddu $s1, $a0, $zero +/* 8036AC 80242E2C AFB00010 */ sw $s0, 0x10($sp) +/* 8036B0 80242E30 00A0802D */ daddu $s0, $a1, $zero +/* 8036B4 80242E34 AFBF001C */ sw $ra, 0x1c($sp) +/* 8036B8 80242E38 AFB20018 */ sw $s2, 0x18($sp) +/* 8036BC 80242E3C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8036C0 80242E40 0C00EABB */ jal get_npc_unsafe +/* 8036C4 80242E44 2404FFFC */ addiu $a0, $zero, -4 +/* 8036C8 80242E48 12000017 */ beqz $s0, .L80242EA8 +/* 8036CC 80242E4C 0040902D */ daddu $s2, $v0, $zero +/* 8036D0 80242E50 0220202D */ daddu $a0, $s1, $zero +/* 8036D4 80242E54 3C05FE36 */ lui $a1, 0xfe36 +/* 8036D8 80242E58 0C0B210B */ jal get_float_variable +/* 8036DC 80242E5C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8036E0 80242E60 0220202D */ daddu $a0, $s1, $zero +/* 8036E4 80242E64 3C05FE36 */ lui $a1, 0xfe36 +/* 8036E8 80242E68 3C014270 */ lui $at, 0x4270 +/* 8036EC 80242E6C 4481A000 */ mtc1 $at, $f20 +/* 8036F0 80242E70 34A53C85 */ ori $a1, $a1, 0x3c85 +/* 8036F4 80242E74 46140003 */ div.s $f0, $f0, $f20 +/* 8036F8 80242E78 0C0B210B */ jal get_float_variable +/* 8036FC 80242E7C E6200074 */ swc1 $f0, 0x74($s1) +/* 803700 80242E80 0220202D */ daddu $a0, $s1, $zero +/* 803704 80242E84 3C05FE36 */ lui $a1, 0xfe36 +/* 803708 80242E88 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 80370C 80242E8C 46140003 */ div.s $f0, $f0, $f20 +/* 803710 80242E90 0C0B210B */ jal get_float_variable +/* 803714 80242E94 E6200078 */ swc1 $f0, 0x78($s1) +/* 803718 80242E98 46140003 */ div.s $f0, $f0, $f20 +/* 80371C 80242E9C 2402003C */ addiu $v0, $zero, 0x3c +/* 803720 80242EA0 E620007C */ swc1 $f0, 0x7c($s1) +/* 803724 80242EA4 AE220070 */ sw $v0, 0x70($s1) +.L80242EA8: +/* 803728 80242EA8 C6400038 */ lwc1 $f0, 0x38($s2) +/* 80372C 80242EAC C6220074 */ lwc1 $f2, 0x74($s1) +/* 803730 80242EB0 46020000 */ add.s $f0, $f0, $f2 +/* 803734 80242EB4 E6400038 */ swc1 $f0, 0x38($s2) +/* 803738 80242EB8 C640003C */ lwc1 $f0, 0x3c($s2) +/* 80373C 80242EBC C6220078 */ lwc1 $f2, 0x78($s1) +/* 803740 80242EC0 46020000 */ add.s $f0, $f0, $f2 +/* 803744 80242EC4 E640003C */ swc1 $f0, 0x3c($s2) +/* 803748 80242EC8 C6400040 */ lwc1 $f0, 0x40($s2) +/* 80374C 80242ECC C622007C */ lwc1 $f2, 0x7c($s1) +/* 803750 80242ED0 46020000 */ add.s $f0, $f0, $f2 +/* 803754 80242ED4 E6400040 */ swc1 $f0, 0x40($s2) +/* 803758 80242ED8 8E230070 */ lw $v1, 0x70($s1) +/* 80375C 80242EDC 2463FFFF */ addiu $v1, $v1, -1 +/* 803760 80242EE0 2C620001 */ sltiu $v0, $v1, 1 +/* 803764 80242EE4 AE230070 */ sw $v1, 0x70($s1) +/* 803768 80242EE8 8FBF001C */ lw $ra, 0x1c($sp) +/* 80376C 80242EEC 8FB20018 */ lw $s2, 0x18($sp) +/* 803770 80242EF0 8FB10014 */ lw $s1, 0x14($sp) +/* 803774 80242EF4 8FB00010 */ lw $s0, 0x10($sp) +/* 803778 80242EF8 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 80377C 80242EFC 00021040 */ sll $v0, $v0, 1 +/* 803780 80242F00 03E00008 */ jr $ra +/* 803784 80242F04 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08.s deleted file mode 100644 index 51087330f4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F08 -/* 803788 80242F08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 80378C 80242F0C 3C058026 */ lui $a1, 0x8026 -/* 803790 80242F10 8CA52A58 */ lw $a1, 0x2a58($a1) -/* 803794 80242F14 AFBF0010 */ sw $ra, 0x10($sp) -/* 803798 80242F18 0C0B1EAF */ jal get_variable -/* 80379C 80242F1C 0000202D */ daddu $a0, $zero, $zero -/* 8037A0 80242F20 0040182D */ daddu $v1, $v0, $zero -/* 8037A4 80242F24 24020001 */ addiu $v0, $zero, 1 -/* 8037A8 80242F28 14620006 */ bne $v1, $v0, .L80242F44 -/* 8037AC 80242F2C 24020002 */ addiu $v0, $zero, 2 -/* 8037B0 80242F30 44800000 */ mtc1 $zero, $f0 -/* 8037B4 80242F34 00000000 */ nop -/* 8037B8 80242F38 44050000 */ mfc1 $a1, $f0 -/* 8037BC 80242F3C 08090BD7 */ j .L80242F5C -/* 8037C0 80242F40 0000202D */ daddu $a0, $zero, $zero -.L80242F44: -/* 8037C4 80242F44 14620008 */ bne $v1, $v0, .L80242F68 -/* 8037C8 80242F48 24040001 */ addiu $a0, $zero, 1 -/* 8037CC 80242F4C 44800000 */ mtc1 $zero, $f0 -/* 8037D0 80242F50 00000000 */ nop -/* 8037D4 80242F54 44050000 */ mfc1 $a1, $f0 -/* 8037D8 80242F58 00000000 */ nop -.L80242F5C: -/* 8037DC 80242F5C 00A0302D */ daddu $a2, $a1, $zero -/* 8037E0 80242F60 0C01C5A4 */ jal func_80071690 -/* 8037E4 80242F64 00A0382D */ daddu $a3, $a1, $zero -.L80242F68: -/* 8037E8 80242F68 8FBF0010 */ lw $ra, 0x10($sp) -/* 8037EC 80242F6C 03E00008 */ jr $ra -/* 8037F0 80242F70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s new file mode 100644 index 0000000000..dc6ecc7305 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F08_803788.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F08_803788 +/* 803788 80242F08 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 80378C 80242F0C 3C058026 */ lui $a1, 0x8026 +/* 803790 80242F10 8CA52A58 */ lw $a1, 0x2a58($a1) +/* 803794 80242F14 AFBF0010 */ sw $ra, 0x10($sp) +/* 803798 80242F18 0C0B1EAF */ jal get_variable +/* 80379C 80242F1C 0000202D */ daddu $a0, $zero, $zero +/* 8037A0 80242F20 0040182D */ daddu $v1, $v0, $zero +/* 8037A4 80242F24 24020001 */ addiu $v0, $zero, 1 +/* 8037A8 80242F28 14620006 */ bne $v1, $v0, .L80242F44 +/* 8037AC 80242F2C 24020002 */ addiu $v0, $zero, 2 +/* 8037B0 80242F30 44800000 */ mtc1 $zero, $f0 +/* 8037B4 80242F34 00000000 */ nop +/* 8037B8 80242F38 44050000 */ mfc1 $a1, $f0 +/* 8037BC 80242F3C 08090BD7 */ j .L80242F5C +/* 8037C0 80242F40 0000202D */ daddu $a0, $zero, $zero +.L80242F44: +/* 8037C4 80242F44 14620008 */ bne $v1, $v0, .L80242F68 +/* 8037C8 80242F48 24040001 */ addiu $a0, $zero, 1 +/* 8037CC 80242F4C 44800000 */ mtc1 $zero, $f0 +/* 8037D0 80242F50 00000000 */ nop +/* 8037D4 80242F54 44050000 */ mfc1 $a1, $f0 +/* 8037D8 80242F58 00000000 */ nop +.L80242F5C: +/* 8037DC 80242F5C 00A0302D */ daddu $a2, $a1, $zero +/* 8037E0 80242F60 0C01C5A4 */ jal func_80071690 +/* 8037E4 80242F64 00A0382D */ daddu $a3, $a1, $zero +.L80242F68: +/* 8037E8 80242F68 8FBF0010 */ lw $ra, 0x10($sp) +/* 8037EC 80242F6C 03E00008 */ jr $ra +/* 8037F0 80242F70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74.s deleted file mode 100644 index 7038623428..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F74 -/* 8037F4 80242F74 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8037F8 80242F78 3C058024 */ lui $a1, 0x8024 -/* 8037FC 80242F7C 24A52F08 */ addiu $a1, $a1, 0x2f08 -/* 803800 80242F80 AFBF0010 */ sw $ra, 0x10($sp) -/* 803804 80242F84 0C048C8F */ jal bind_dynamic_entity_7 -/* 803808 80242F88 0000202D */ daddu $a0, $zero, $zero -/* 80380C 80242F8C 8FBF0010 */ lw $ra, 0x10($sp) -/* 803810 80242F90 3C018026 */ lui $at, 0x8026 -/* 803814 80242F94 AC222A40 */ sw $v0, 0x2a40($at) -/* 803818 80242F98 24020002 */ addiu $v0, $zero, 2 -/* 80381C 80242F9C 03E00008 */ jr $ra -/* 803820 80242FA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s new file mode 100644 index 0000000000..9b557f86ac --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242F74_8037F4.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F74_8037F4 +/* 8037F4 80242F74 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8037F8 80242F78 3C058024 */ lui $a1, 0x8024 +/* 8037FC 80242F7C 24A52F08 */ addiu $a1, $a1, 0x2f08 +/* 803800 80242F80 AFBF0010 */ sw $ra, 0x10($sp) +/* 803804 80242F84 0C048C8F */ jal bind_dynamic_entity_7 +/* 803808 80242F88 0000202D */ daddu $a0, $zero, $zero +/* 80380C 80242F8C 8FBF0010 */ lw $ra, 0x10($sp) +/* 803810 80242F90 3C018026 */ lui $at, 0x8026 +/* 803814 80242F94 AC222A40 */ sw $v0, 0x2a40($at) +/* 803818 80242F98 24020002 */ addiu $v0, $zero, 2 +/* 80381C 80242F9C 03E00008 */ jr $ra +/* 803820 80242FA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4.s deleted file mode 100644 index 2780f4f13f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4.s +++ /dev/null @@ -1,251 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FA4 -/* 803824 80242FA4 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* 803828 80242FA8 0000202D */ daddu $a0, $zero, $zero -/* 80382C 80242FAC 3C05FD05 */ lui $a1, 0xfd05 -/* 803830 80242FB0 AFBF00DC */ sw $ra, 0xdc($sp) -/* 803834 80242FB4 AFB600D8 */ sw $s6, 0xd8($sp) -/* 803838 80242FB8 AFB500D4 */ sw $s5, 0xd4($sp) -/* 80383C 80242FBC AFB400D0 */ sw $s4, 0xd0($sp) -/* 803840 80242FC0 AFB300CC */ sw $s3, 0xcc($sp) -/* 803844 80242FC4 AFB200C8 */ sw $s2, 0xc8($sp) -/* 803848 80242FC8 AFB100C4 */ sw $s1, 0xc4($sp) -/* 80384C 80242FCC AFB000C0 */ sw $s0, 0xc0($sp) -/* 803850 80242FD0 F7B600E8 */ sdc1 $f22, 0xe8($sp) -/* 803854 80242FD4 F7B400E0 */ sdc1 $f20, 0xe0($sp) -/* 803858 80242FD8 0C0B1EAF */ jal get_variable -/* 80385C 80242FDC 34A50F8A */ ori $a1, $a1, 0xf8a -/* 803860 80242FE0 3C07E300 */ lui $a3, 0xe300 -/* 803864 80242FE4 34E70A01 */ ori $a3, $a3, 0xa01 -/* 803868 80242FE8 3C08D9C0 */ lui $t0, 0xd9c0 -/* 80386C 80242FEC 3508F9FB */ ori $t0, $t0, 0xf9fb -/* 803870 80242FF0 3C0AD9FF */ lui $t2, 0xd9ff -/* 803874 80242FF4 354AFFFF */ ori $t2, $t2, 0xffff -/* 803878 80242FF8 3C090020 */ lui $t1, 0x20 -/* 80387C 80242FFC 35290005 */ ori $t1, $t1, 5 -/* 803880 80243000 3C0BD700 */ lui $t3, 0xd700 -/* 803884 80243004 356B0002 */ ori $t3, $t3, 2 -/* 803888 80243008 3C0CE300 */ lui $t4, 0xe300 -/* 80388C 8024300C 358C0F00 */ ori $t4, $t4, 0xf00 -/* 803890 80243010 3C0DE300 */ lui $t5, 0xe300 -/* 803894 80243014 35AD0C00 */ ori $t5, $t5, 0xc00 -/* 803898 80243018 3C0EE300 */ lui $t6, 0xe300 -/* 80389C 8024301C 35CE1201 */ ori $t6, $t6, 0x1201 -/* 8038A0 80243020 3C0FE300 */ lui $t7, 0xe300 -/* 8038A4 80243024 35EF1801 */ ori $t7, $t7, 0x1801 -/* 8038A8 80243028 3C10E300 */ lui $s0, 0xe300 -/* 8038AC 8024302C 36100D01 */ ori $s0, $s0, 0xd01 -/* 8038B0 80243030 3C12E300 */ lui $s2, 0xe300 -/* 8038B4 80243034 36521402 */ ori $s2, $s2, 0x1402 -/* 8038B8 80243038 3C14E300 */ lui $s4, 0xe300 -/* 8038BC 8024303C 36941700 */ ori $s4, $s4, 0x1700 -/* 8038C0 80243040 3C15E200 */ lui $s5, 0xe200 -/* 8038C4 80243044 36B51E01 */ ori $s5, $s5, 0x1e01 -/* 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, 0x800a -/* 8038D8 80243058 2631A66C */ addiu $s1, $s1, -0x5994 -/* 8038DC 8024305C 36D61630 */ ori $s6, $s6, 0x1630 -/* 8038E0 80243060 3C05E700 */ lui $a1, 0xe700 -/* 8038E4 80243064 8E230000 */ lw $v1, ($s1) -/* 8038E8 80243068 4480A000 */ mtc1 $zero, $f20 -/* 8038EC 8024306C 0060302D */ daddu $a2, $v1, $zero -/* 8038F0 80243070 24630008 */ addiu $v1, $v1, 8 -/* 8038F4 80243074 AE230000 */ sw $v1, ($s1) -/* 8038F8 80243078 ACC50000 */ sw $a1, ($a2) -/* 8038FC 8024307C 24650008 */ addiu $a1, $v1, 8 -/* 803900 80243080 ACC00004 */ sw $zero, 4($a2) -/* 803904 80243084 AE250000 */ sw $a1, ($s1) -/* 803908 80243088 24650010 */ addiu $a1, $v1, 0x10 -/* 80390C 8024308C AC670000 */ sw $a3, ($v1) -/* 803910 80243090 AC600004 */ sw $zero, 4($v1) -/* 803914 80243094 AE250000 */ sw $a1, ($s1) -/* 803918 80243098 24650018 */ addiu $a1, $v1, 0x18 -/* 80391C 8024309C AC680008 */ sw $t0, 8($v1) -/* 803920 802430A0 AC60000C */ sw $zero, 0xc($v1) -/* 803924 802430A4 AE250000 */ sw $a1, ($s1) -/* 803928 802430A8 24650020 */ addiu $a1, $v1, 0x20 -/* 80392C 802430AC AC6A0010 */ sw $t2, 0x10($v1) -/* 803930 802430B0 AC690014 */ sw $t1, 0x14($v1) -/* 803934 802430B4 AE250000 */ sw $a1, ($s1) -/* 803938 802430B8 2405FFFF */ addiu $a1, $zero, -1 -/* 80393C 802430BC AC65001C */ sw $a1, 0x1c($v1) -/* 803940 802430C0 24650028 */ addiu $a1, $v1, 0x28 -/* 803944 802430C4 AC6B0018 */ sw $t3, 0x18($v1) -/* 803948 802430C8 AE250000 */ sw $a1, ($s1) -/* 80394C 802430CC 24650030 */ addiu $a1, $v1, 0x30 -/* 803950 802430D0 AC6C0020 */ sw $t4, 0x20($v1) -/* 803954 802430D4 AC600024 */ sw $zero, 0x24($v1) -/* 803958 802430D8 AE250000 */ sw $a1, ($s1) -/* 80395C 802430DC 3C050008 */ lui $a1, 8 -/* 803960 802430E0 AC65002C */ sw $a1, 0x2c($v1) -/* 803964 802430E4 24650038 */ addiu $a1, $v1, 0x38 -/* 803968 802430E8 AC6D0028 */ sw $t5, 0x28($v1) -/* 80396C 802430EC AE250000 */ sw $a1, ($s1) -/* 803970 802430F0 24052000 */ addiu $a1, $zero, 0x2000 -/* 803974 802430F4 AC650034 */ sw $a1, 0x34($v1) -/* 803978 802430F8 24650040 */ addiu $a1, $v1, 0x40 -/* 80397C 802430FC AC6E0030 */ sw $t6, 0x30($v1) -/* 803980 80243100 AE250000 */ sw $a1, ($s1) -/* 803984 80243104 240500C0 */ addiu $a1, $zero, 0xc0 -/* 803988 80243108 AC65003C */ sw $a1, 0x3c($v1) -/* 80398C 8024310C 24650048 */ addiu $a1, $v1, 0x48 -/* 803990 80243110 AC6F0038 */ sw $t7, 0x38($v1) -/* 803994 80243114 AE250000 */ sw $a1, ($s1) -/* 803998 80243118 24650050 */ addiu $a1, $v1, 0x50 -/* 80399C 8024311C AC700040 */ sw $s0, 0x40($v1) -/* 8039A0 80243120 AC600044 */ sw $zero, 0x44($v1) -/* 8039A4 80243124 AE250000 */ sw $a1, ($s1) -/* 8039A8 80243128 24050C00 */ addiu $a1, $zero, 0xc00 -/* 8039AC 8024312C AC720048 */ sw $s2, 0x48($v1) -/* 8039B0 80243130 0040902D */ daddu $s2, $v0, $zero -/* 8039B4 80243134 24620058 */ addiu $v0, $v1, 0x58 -/* 8039B8 80243138 AC65004C */ sw $a1, 0x4c($v1) -/* 8039BC 8024313C AC740050 */ sw $s4, 0x50($v1) -/* 8039C0 80243140 AC600054 */ sw $zero, 0x54($v1) -/* 8039C4 80243144 AC750058 */ sw $s5, 0x58($v1) -/* 8039C8 80243148 AC60005C */ sw $zero, 0x5c($v1) -/* 8039CC 8024314C 8E450010 */ lw $a1, 0x10($s2) -/* 8039D0 80243150 8E460014 */ lw $a2, 0x14($s2) -/* 8039D4 80243154 8E470018 */ lw $a3, 0x18($s2) -/* 8039D8 80243158 24630060 */ addiu $v1, $v1, 0x60 -/* 8039DC 8024315C AE220000 */ sw $v0, ($s1) -/* 8039E0 80243160 0C019E40 */ jal guTranslateF -/* 8039E4 80243164 AE230000 */ sw $v1, ($s1) -/* 8039E8 80243168 27B00080 */ addiu $s0, $sp, 0x80 -/* 8039EC 8024316C E7B40010 */ swc1 $f20, 0x10($sp) -/* 8039F0 80243170 8E450020 */ lw $a1, 0x20($s2) -/* 8039F4 80243174 3C013F80 */ lui $at, 0x3f80 -/* 8039F8 80243178 4481B000 */ mtc1 $at, $f22 -/* 8039FC 8024317C 4406A000 */ mfc1 $a2, $f20 -/* 803A00 80243180 4407B000 */ mfc1 $a3, $f22 -/* 803A04 80243184 0C019EC8 */ jal guRotateF -/* 803A08 80243188 0200202D */ daddu $a0, $s0, $zero -/* 803A0C 8024318C 0200202D */ daddu $a0, $s0, $zero -/* 803A10 80243190 0260282D */ daddu $a1, $s3, $zero -/* 803A14 80243194 0C019D80 */ jal guMtxCatF -/* 803A18 80243198 0260302D */ daddu $a2, $s3, $zero -/* 803A1C 8024319C E7B60010 */ swc1 $f22, 0x10($sp) -/* 803A20 802431A0 8E450024 */ lw $a1, 0x24($s2) -/* 803A24 802431A4 4406A000 */ mfc1 $a2, $f20 -/* 803A28 802431A8 4407A000 */ mfc1 $a3, $f20 -/* 803A2C 802431AC 0C019EC8 */ jal guRotateF -/* 803A30 802431B0 0200202D */ daddu $a0, $s0, $zero -/* 803A34 802431B4 0200202D */ daddu $a0, $s0, $zero -/* 803A38 802431B8 0260282D */ daddu $a1, $s3, $zero -/* 803A3C 802431BC 0C019D80 */ jal guMtxCatF -/* 803A40 802431C0 0260302D */ daddu $a2, $s3, $zero -/* 803A44 802431C4 E7B40010 */ swc1 $f20, 0x10($sp) -/* 803A48 802431C8 8E45001C */ lw $a1, 0x1c($s2) -/* 803A4C 802431CC 4406B000 */ mfc1 $a2, $f22 -/* 803A50 802431D0 4407A000 */ mfc1 $a3, $f20 -/* 803A54 802431D4 0C019EC8 */ jal guRotateF -/* 803A58 802431D8 0200202D */ daddu $a0, $s0, $zero -/* 803A5C 802431DC 0200202D */ daddu $a0, $s0, $zero -/* 803A60 802431E0 0260282D */ daddu $a1, $s3, $zero -/* 803A64 802431E4 0C019D80 */ jal guMtxCatF -/* 803A68 802431E8 0260302D */ daddu $a2, $s3, $zero -/* 803A6C 802431EC 8E450028 */ lw $a1, 0x28($s2) -/* 803A70 802431F0 8E46002C */ lw $a2, 0x2c($s2) -/* 803A74 802431F4 8E470030 */ lw $a3, 0x30($s2) -/* 803A78 802431F8 0C019DF0 */ jal guScaleF -/* 803A7C 802431FC 0200202D */ daddu $a0, $s0, $zero -/* 803A80 80243200 0200202D */ daddu $a0, $s0, $zero -/* 803A84 80243204 0260282D */ daddu $a1, $s3, $zero -/* 803A88 80243208 0C019D80 */ jal guMtxCatF -/* 803A8C 8024320C 0260302D */ daddu $a2, $s3, $zero -/* 803A90 80243210 0260202D */ daddu $a0, $s3, $zero -/* 803A94 80243214 3C108007 */ lui $s0, 0x8007 -/* 803A98 80243218 261041F0 */ addiu $s0, $s0, 0x41f0 -/* 803A9C 8024321C 3C14800A */ lui $s4, 0x800a -/* 803AA0 80243220 2694A674 */ addiu $s4, $s4, -0x598c -/* 803AA4 80243224 96050000 */ lhu $a1, ($s0) -/* 803AA8 80243228 8E820000 */ lw $v0, ($s4) -/* 803AAC 8024322C 00052980 */ sll $a1, $a1, 6 -/* 803AB0 80243230 00B62821 */ addu $a1, $a1, $s6 -/* 803AB4 80243234 0C019D40 */ jal guMtxF2L -/* 803AB8 80243238 00452821 */ addu $a1, $v0, $a1 -/* 803ABC 8024323C 3C02DA38 */ lui $v0, 0xda38 -/* 803AC0 80243240 34420002 */ ori $v0, $v0, 2 -/* 803AC4 80243244 27A40030 */ addiu $a0, $sp, 0x30 -/* 803AC8 80243248 8E270000 */ lw $a3, ($s1) -/* 803ACC 8024324C 96080000 */ lhu $t0, ($s0) -/* 803AD0 80243250 00E0282D */ daddu $a1, $a3, $zero -/* 803AD4 80243254 ACA20000 */ sw $v0, ($a1) -/* 803AD8 80243258 3102FFFF */ andi $v0, $t0, 0xffff -/* 803ADC 8024325C 00021180 */ sll $v0, $v0, 6 -/* 803AE0 80243260 00561021 */ addu $v0, $v0, $s6 -/* 803AE4 80243264 8E830000 */ lw $v1, ($s4) -/* 803AE8 80243268 24E70008 */ addiu $a3, $a3, 8 -/* 803AEC 8024326C 00621821 */ addu $v1, $v1, $v0 -/* 803AF0 80243270 3C028000 */ lui $v0, 0x8000 -/* 803AF4 80243274 00621821 */ addu $v1, $v1, $v0 -/* 803AF8 80243278 ACA30004 */ sw $v1, 4($a1) -/* 803AFC 8024327C 8E450008 */ lw $a1, 8($s2) -/* 803B00 80243280 8E46000C */ lw $a2, 0xc($s2) -/* 803B04 80243284 25080001 */ addiu $t0, $t0, 1 -/* 803B08 80243288 AE270000 */ sw $a3, ($s1) -/* 803B0C 8024328C 0C0B7811 */ jal func_802DE044 -/* 803B10 80243290 A6080000 */ sh $t0, ($s0) -/* 803B14 80243294 8FA30030 */ lw $v1, 0x30($sp) -/* 803B18 80243298 8FA40034 */ lw $a0, 0x34($sp) -/* 803B1C 8024329C 97A2003A */ lhu $v0, 0x3a($sp) -/* 803B20 802432A0 3C013F00 */ lui $at, 0x3f00 -/* 803B24 802432A4 44811000 */ mtc1 $at, $f2 -/* 803B28 802432A8 27A50018 */ addiu $a1, $sp, 0x18 -/* 803B2C 802432AC A7A20020 */ sh $v0, 0x20($sp) -/* 803B30 802432B0 3042FFFF */ andi $v0, $v0, 0xffff -/* 803B34 802432B4 44820000 */ mtc1 $v0, $f0 -/* 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) -/* 803B48 802432C8 E6400034 */ swc1 $f0, 0x34($s2) -/* 803B4C 802432CC 97A2003E */ lhu $v0, 0x3e($sp) -/* 803B50 802432D0 0000302D */ daddu $a2, $zero, $zero -/* 803B54 802432D4 A7A20022 */ sh $v0, 0x22($sp) -/* 803B58 802432D8 3042FFFF */ andi $v0, $v0, 0xffff -/* 803B5C 802432DC 44820000 */ mtc1 $v0, $f0 -/* 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 -/* 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 -/* 803B98 80243318 00021023 */ negu $v0, $v0 -/* 803B9C 8024331C A7A20024 */ sh $v0, 0x24($sp) -/* 803BA0 80243320 8E440000 */ lw $a0, ($s2) -/* 803BA4 80243324 0C04EBDC */ jal func_8013AF70 -/* 803BA8 80243328 0260382D */ daddu $a3, $s3, $zero -/* 803BAC 8024332C 3C04D838 */ lui $a0, 0xd838 -/* 803BB0 80243330 8E220000 */ lw $v0, ($s1) -/* 803BB4 80243334 34840002 */ ori $a0, $a0, 2 -/* 803BB8 80243338 0040182D */ daddu $v1, $v0, $zero -/* 803BBC 8024333C 24420008 */ addiu $v0, $v0, 8 -/* 803BC0 80243340 AE220000 */ sw $v0, ($s1) -/* 803BC4 80243344 24020040 */ addiu $v0, $zero, 0x40 -/* 803BC8 80243348 AC640000 */ sw $a0, ($v1) -/* 803BCC 8024334C AC620004 */ sw $v0, 4($v1) -/* 803BD0 80243350 8FBF00DC */ lw $ra, 0xdc($sp) -/* 803BD4 80243354 8FB600D8 */ lw $s6, 0xd8($sp) -/* 803BD8 80243358 8FB500D4 */ lw $s5, 0xd4($sp) -/* 803BDC 8024335C 8FB400D0 */ lw $s4, 0xd0($sp) -/* 803BE0 80243360 8FB300CC */ lw $s3, 0xcc($sp) -/* 803BE4 80243364 8FB200C8 */ lw $s2, 0xc8($sp) -/* 803BE8 80243368 8FB100C4 */ lw $s1, 0xc4($sp) -/* 803BEC 8024336C 8FB000C0 */ lw $s0, 0xc0($sp) -/* 803BF0 80243370 D7B600E8 */ ldc1 $f22, 0xe8($sp) -/* 803BF4 80243374 D7B400E0 */ ldc1 $f20, 0xe0($sp) -/* 803BF8 80243378 03E00008 */ jr $ra -/* 803BFC 8024337C 27BD00F0 */ addiu $sp, $sp, 0xf0 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 new file mode 100644 index 0000000000..bcdc15d253 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242FA4_803824.s @@ -0,0 +1,251 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242FA4_803824 +/* 803824 80242FA4 27BDFF10 */ addiu $sp, $sp, -0xf0 +/* 803828 80242FA8 0000202D */ daddu $a0, $zero, $zero +/* 80382C 80242FAC 3C05FD05 */ lui $a1, 0xfd05 +/* 803830 80242FB0 AFBF00DC */ sw $ra, 0xdc($sp) +/* 803834 80242FB4 AFB600D8 */ sw $s6, 0xd8($sp) +/* 803838 80242FB8 AFB500D4 */ sw $s5, 0xd4($sp) +/* 80383C 80242FBC AFB400D0 */ sw $s4, 0xd0($sp) +/* 803840 80242FC0 AFB300CC */ sw $s3, 0xcc($sp) +/* 803844 80242FC4 AFB200C8 */ sw $s2, 0xc8($sp) +/* 803848 80242FC8 AFB100C4 */ sw $s1, 0xc4($sp) +/* 80384C 80242FCC AFB000C0 */ sw $s0, 0xc0($sp) +/* 803850 80242FD0 F7B600E8 */ sdc1 $f22, 0xe8($sp) +/* 803854 80242FD4 F7B400E0 */ sdc1 $f20, 0xe0($sp) +/* 803858 80242FD8 0C0B1EAF */ jal get_variable +/* 80385C 80242FDC 34A50F8A */ ori $a1, $a1, 0xf8a +/* 803860 80242FE0 3C07E300 */ lui $a3, 0xe300 +/* 803864 80242FE4 34E70A01 */ ori $a3, $a3, 0xa01 +/* 803868 80242FE8 3C08D9C0 */ lui $t0, 0xd9c0 +/* 80386C 80242FEC 3508F9FB */ ori $t0, $t0, 0xf9fb +/* 803870 80242FF0 3C0AD9FF */ lui $t2, 0xd9ff +/* 803874 80242FF4 354AFFFF */ ori $t2, $t2, 0xffff +/* 803878 80242FF8 3C090020 */ lui $t1, 0x20 +/* 80387C 80242FFC 35290005 */ ori $t1, $t1, 5 +/* 803880 80243000 3C0BD700 */ lui $t3, 0xd700 +/* 803884 80243004 356B0002 */ ori $t3, $t3, 2 +/* 803888 80243008 3C0CE300 */ lui $t4, 0xe300 +/* 80388C 8024300C 358C0F00 */ ori $t4, $t4, 0xf00 +/* 803890 80243010 3C0DE300 */ lui $t5, 0xe300 +/* 803894 80243014 35AD0C00 */ ori $t5, $t5, 0xc00 +/* 803898 80243018 3C0EE300 */ lui $t6, 0xe300 +/* 80389C 8024301C 35CE1201 */ ori $t6, $t6, 0x1201 +/* 8038A0 80243020 3C0FE300 */ lui $t7, 0xe300 +/* 8038A4 80243024 35EF1801 */ ori $t7, $t7, 0x1801 +/* 8038A8 80243028 3C10E300 */ lui $s0, 0xe300 +/* 8038AC 8024302C 36100D01 */ ori $s0, $s0, 0xd01 +/* 8038B0 80243030 3C12E300 */ lui $s2, 0xe300 +/* 8038B4 80243034 36521402 */ ori $s2, $s2, 0x1402 +/* 8038B8 80243038 3C14E300 */ lui $s4, 0xe300 +/* 8038BC 8024303C 36941700 */ ori $s4, $s4, 0x1700 +/* 8038C0 80243040 3C15E200 */ lui $s5, 0xe200 +/* 8038C4 80243044 36B51E01 */ ori $s5, $s5, 0x1e01 +/* 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, 0x800a +/* 8038D8 80243058 2631A66C */ addiu $s1, $s1, -0x5994 +/* 8038DC 8024305C 36D61630 */ ori $s6, $s6, 0x1630 +/* 8038E0 80243060 3C05E700 */ lui $a1, 0xe700 +/* 8038E4 80243064 8E230000 */ lw $v1, ($s1) +/* 8038E8 80243068 4480A000 */ mtc1 $zero, $f20 +/* 8038EC 8024306C 0060302D */ daddu $a2, $v1, $zero +/* 8038F0 80243070 24630008 */ addiu $v1, $v1, 8 +/* 8038F4 80243074 AE230000 */ sw $v1, ($s1) +/* 8038F8 80243078 ACC50000 */ sw $a1, ($a2) +/* 8038FC 8024307C 24650008 */ addiu $a1, $v1, 8 +/* 803900 80243080 ACC00004 */ sw $zero, 4($a2) +/* 803904 80243084 AE250000 */ sw $a1, ($s1) +/* 803908 80243088 24650010 */ addiu $a1, $v1, 0x10 +/* 80390C 8024308C AC670000 */ sw $a3, ($v1) +/* 803910 80243090 AC600004 */ sw $zero, 4($v1) +/* 803914 80243094 AE250000 */ sw $a1, ($s1) +/* 803918 80243098 24650018 */ addiu $a1, $v1, 0x18 +/* 80391C 8024309C AC680008 */ sw $t0, 8($v1) +/* 803920 802430A0 AC60000C */ sw $zero, 0xc($v1) +/* 803924 802430A4 AE250000 */ sw $a1, ($s1) +/* 803928 802430A8 24650020 */ addiu $a1, $v1, 0x20 +/* 80392C 802430AC AC6A0010 */ sw $t2, 0x10($v1) +/* 803930 802430B0 AC690014 */ sw $t1, 0x14($v1) +/* 803934 802430B4 AE250000 */ sw $a1, ($s1) +/* 803938 802430B8 2405FFFF */ addiu $a1, $zero, -1 +/* 80393C 802430BC AC65001C */ sw $a1, 0x1c($v1) +/* 803940 802430C0 24650028 */ addiu $a1, $v1, 0x28 +/* 803944 802430C4 AC6B0018 */ sw $t3, 0x18($v1) +/* 803948 802430C8 AE250000 */ sw $a1, ($s1) +/* 80394C 802430CC 24650030 */ addiu $a1, $v1, 0x30 +/* 803950 802430D0 AC6C0020 */ sw $t4, 0x20($v1) +/* 803954 802430D4 AC600024 */ sw $zero, 0x24($v1) +/* 803958 802430D8 AE250000 */ sw $a1, ($s1) +/* 80395C 802430DC 3C050008 */ lui $a1, 8 +/* 803960 802430E0 AC65002C */ sw $a1, 0x2c($v1) +/* 803964 802430E4 24650038 */ addiu $a1, $v1, 0x38 +/* 803968 802430E8 AC6D0028 */ sw $t5, 0x28($v1) +/* 80396C 802430EC AE250000 */ sw $a1, ($s1) +/* 803970 802430F0 24052000 */ addiu $a1, $zero, 0x2000 +/* 803974 802430F4 AC650034 */ sw $a1, 0x34($v1) +/* 803978 802430F8 24650040 */ addiu $a1, $v1, 0x40 +/* 80397C 802430FC AC6E0030 */ sw $t6, 0x30($v1) +/* 803980 80243100 AE250000 */ sw $a1, ($s1) +/* 803984 80243104 240500C0 */ addiu $a1, $zero, 0xc0 +/* 803988 80243108 AC65003C */ sw $a1, 0x3c($v1) +/* 80398C 8024310C 24650048 */ addiu $a1, $v1, 0x48 +/* 803990 80243110 AC6F0038 */ sw $t7, 0x38($v1) +/* 803994 80243114 AE250000 */ sw $a1, ($s1) +/* 803998 80243118 24650050 */ addiu $a1, $v1, 0x50 +/* 80399C 8024311C AC700040 */ sw $s0, 0x40($v1) +/* 8039A0 80243120 AC600044 */ sw $zero, 0x44($v1) +/* 8039A4 80243124 AE250000 */ sw $a1, ($s1) +/* 8039A8 80243128 24050C00 */ addiu $a1, $zero, 0xc00 +/* 8039AC 8024312C AC720048 */ sw $s2, 0x48($v1) +/* 8039B0 80243130 0040902D */ daddu $s2, $v0, $zero +/* 8039B4 80243134 24620058 */ addiu $v0, $v1, 0x58 +/* 8039B8 80243138 AC65004C */ sw $a1, 0x4c($v1) +/* 8039BC 8024313C AC740050 */ sw $s4, 0x50($v1) +/* 8039C0 80243140 AC600054 */ sw $zero, 0x54($v1) +/* 8039C4 80243144 AC750058 */ sw $s5, 0x58($v1) +/* 8039C8 80243148 AC60005C */ sw $zero, 0x5c($v1) +/* 8039CC 8024314C 8E450010 */ lw $a1, 0x10($s2) +/* 8039D0 80243150 8E460014 */ lw $a2, 0x14($s2) +/* 8039D4 80243154 8E470018 */ lw $a3, 0x18($s2) +/* 8039D8 80243158 24630060 */ addiu $v1, $v1, 0x60 +/* 8039DC 8024315C AE220000 */ sw $v0, ($s1) +/* 8039E0 80243160 0C019E40 */ jal guTranslateF +/* 8039E4 80243164 AE230000 */ sw $v1, ($s1) +/* 8039E8 80243168 27B00080 */ addiu $s0, $sp, 0x80 +/* 8039EC 8024316C E7B40010 */ swc1 $f20, 0x10($sp) +/* 8039F0 80243170 8E450020 */ lw $a1, 0x20($s2) +/* 8039F4 80243174 3C013F80 */ lui $at, 0x3f80 +/* 8039F8 80243178 4481B000 */ mtc1 $at, $f22 +/* 8039FC 8024317C 4406A000 */ mfc1 $a2, $f20 +/* 803A00 80243180 4407B000 */ mfc1 $a3, $f22 +/* 803A04 80243184 0C019EC8 */ jal guRotateF +/* 803A08 80243188 0200202D */ daddu $a0, $s0, $zero +/* 803A0C 8024318C 0200202D */ daddu $a0, $s0, $zero +/* 803A10 80243190 0260282D */ daddu $a1, $s3, $zero +/* 803A14 80243194 0C019D80 */ jal guMtxCatF +/* 803A18 80243198 0260302D */ daddu $a2, $s3, $zero +/* 803A1C 8024319C E7B60010 */ swc1 $f22, 0x10($sp) +/* 803A20 802431A0 8E450024 */ lw $a1, 0x24($s2) +/* 803A24 802431A4 4406A000 */ mfc1 $a2, $f20 +/* 803A28 802431A8 4407A000 */ mfc1 $a3, $f20 +/* 803A2C 802431AC 0C019EC8 */ jal guRotateF +/* 803A30 802431B0 0200202D */ daddu $a0, $s0, $zero +/* 803A34 802431B4 0200202D */ daddu $a0, $s0, $zero +/* 803A38 802431B8 0260282D */ daddu $a1, $s3, $zero +/* 803A3C 802431BC 0C019D80 */ jal guMtxCatF +/* 803A40 802431C0 0260302D */ daddu $a2, $s3, $zero +/* 803A44 802431C4 E7B40010 */ swc1 $f20, 0x10($sp) +/* 803A48 802431C8 8E45001C */ lw $a1, 0x1c($s2) +/* 803A4C 802431CC 4406B000 */ mfc1 $a2, $f22 +/* 803A50 802431D0 4407A000 */ mfc1 $a3, $f20 +/* 803A54 802431D4 0C019EC8 */ jal guRotateF +/* 803A58 802431D8 0200202D */ daddu $a0, $s0, $zero +/* 803A5C 802431DC 0200202D */ daddu $a0, $s0, $zero +/* 803A60 802431E0 0260282D */ daddu $a1, $s3, $zero +/* 803A64 802431E4 0C019D80 */ jal guMtxCatF +/* 803A68 802431E8 0260302D */ daddu $a2, $s3, $zero +/* 803A6C 802431EC 8E450028 */ lw $a1, 0x28($s2) +/* 803A70 802431F0 8E46002C */ lw $a2, 0x2c($s2) +/* 803A74 802431F4 8E470030 */ lw $a3, 0x30($s2) +/* 803A78 802431F8 0C019DF0 */ jal guScaleF +/* 803A7C 802431FC 0200202D */ daddu $a0, $s0, $zero +/* 803A80 80243200 0200202D */ daddu $a0, $s0, $zero +/* 803A84 80243204 0260282D */ daddu $a1, $s3, $zero +/* 803A88 80243208 0C019D80 */ jal guMtxCatF +/* 803A8C 8024320C 0260302D */ daddu $a2, $s3, $zero +/* 803A90 80243210 0260202D */ daddu $a0, $s3, $zero +/* 803A94 80243214 3C108007 */ lui $s0, 0x8007 +/* 803A98 80243218 261041F0 */ addiu $s0, $s0, 0x41f0 +/* 803A9C 8024321C 3C14800A */ lui $s4, 0x800a +/* 803AA0 80243220 2694A674 */ addiu $s4, $s4, -0x598c +/* 803AA4 80243224 96050000 */ lhu $a1, ($s0) +/* 803AA8 80243228 8E820000 */ lw $v0, ($s4) +/* 803AAC 8024322C 00052980 */ sll $a1, $a1, 6 +/* 803AB0 80243230 00B62821 */ addu $a1, $a1, $s6 +/* 803AB4 80243234 0C019D40 */ jal guMtxF2L +/* 803AB8 80243238 00452821 */ addu $a1, $v0, $a1 +/* 803ABC 8024323C 3C02DA38 */ lui $v0, 0xda38 +/* 803AC0 80243240 34420002 */ ori $v0, $v0, 2 +/* 803AC4 80243244 27A40030 */ addiu $a0, $sp, 0x30 +/* 803AC8 80243248 8E270000 */ lw $a3, ($s1) +/* 803ACC 8024324C 96080000 */ lhu $t0, ($s0) +/* 803AD0 80243250 00E0282D */ daddu $a1, $a3, $zero +/* 803AD4 80243254 ACA20000 */ sw $v0, ($a1) +/* 803AD8 80243258 3102FFFF */ andi $v0, $t0, 0xffff +/* 803ADC 8024325C 00021180 */ sll $v0, $v0, 6 +/* 803AE0 80243260 00561021 */ addu $v0, $v0, $s6 +/* 803AE4 80243264 8E830000 */ lw $v1, ($s4) +/* 803AE8 80243268 24E70008 */ addiu $a3, $a3, 8 +/* 803AEC 8024326C 00621821 */ addu $v1, $v1, $v0 +/* 803AF0 80243270 3C028000 */ lui $v0, 0x8000 +/* 803AF4 80243274 00621821 */ addu $v1, $v1, $v0 +/* 803AF8 80243278 ACA30004 */ sw $v1, 4($a1) +/* 803AFC 8024327C 8E450008 */ lw $a1, 8($s2) +/* 803B00 80243280 8E46000C */ lw $a2, 0xc($s2) +/* 803B04 80243284 25080001 */ addiu $t0, $t0, 1 +/* 803B08 80243288 AE270000 */ sw $a3, ($s1) +/* 803B0C 8024328C 0C0B7811 */ jal func_802DE044 +/* 803B10 80243290 A6080000 */ sh $t0, ($s0) +/* 803B14 80243294 8FA30030 */ lw $v1, 0x30($sp) +/* 803B18 80243298 8FA40034 */ lw $a0, 0x34($sp) +/* 803B1C 8024329C 97A2003A */ lhu $v0, 0x3a($sp) +/* 803B20 802432A0 3C013F00 */ lui $at, 0x3f00 +/* 803B24 802432A4 44811000 */ mtc1 $at, $f2 +/* 803B28 802432A8 27A50018 */ addiu $a1, $sp, 0x18 +/* 803B2C 802432AC A7A20020 */ sh $v0, 0x20($sp) +/* 803B30 802432B0 3042FFFF */ andi $v0, $v0, 0xffff +/* 803B34 802432B4 44820000 */ mtc1 $v0, $f0 +/* 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) +/* 803B48 802432C8 E6400034 */ swc1 $f0, 0x34($s2) +/* 803B4C 802432CC 97A2003E */ lhu $v0, 0x3e($sp) +/* 803B50 802432D0 0000302D */ daddu $a2, $zero, $zero +/* 803B54 802432D4 A7A20022 */ sh $v0, 0x22($sp) +/* 803B58 802432D8 3042FFFF */ andi $v0, $v0, 0xffff +/* 803B5C 802432DC 44820000 */ mtc1 $v0, $f0 +/* 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 +/* 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 +/* 803B98 80243318 00021023 */ negu $v0, $v0 +/* 803B9C 8024331C A7A20024 */ sh $v0, 0x24($sp) +/* 803BA0 80243320 8E440000 */ lw $a0, ($s2) +/* 803BA4 80243324 0C04EBDC */ jal func_8013AF70 +/* 803BA8 80243328 0260382D */ daddu $a3, $s3, $zero +/* 803BAC 8024332C 3C04D838 */ lui $a0, 0xd838 +/* 803BB0 80243330 8E220000 */ lw $v0, ($s1) +/* 803BB4 80243334 34840002 */ ori $a0, $a0, 2 +/* 803BB8 80243338 0040182D */ daddu $v1, $v0, $zero +/* 803BBC 8024333C 24420008 */ addiu $v0, $v0, 8 +/* 803BC0 80243340 AE220000 */ sw $v0, ($s1) +/* 803BC4 80243344 24020040 */ addiu $v0, $zero, 0x40 +/* 803BC8 80243348 AC640000 */ sw $a0, ($v1) +/* 803BCC 8024334C AC620004 */ sw $v0, 4($v1) +/* 803BD0 80243350 8FBF00DC */ lw $ra, 0xdc($sp) +/* 803BD4 80243354 8FB600D8 */ lw $s6, 0xd8($sp) +/* 803BD8 80243358 8FB500D4 */ lw $s5, 0xd4($sp) +/* 803BDC 8024335C 8FB400D0 */ lw $s4, 0xd0($sp) +/* 803BE0 80243360 8FB300CC */ lw $s3, 0xcc($sp) +/* 803BE4 80243364 8FB200C8 */ lw $s2, 0xc8($sp) +/* 803BE8 80243368 8FB100C4 */ lw $s1, 0xc4($sp) +/* 803BEC 8024336C 8FB000C0 */ lw $s0, 0xc0($sp) +/* 803BF0 80243370 D7B600E8 */ ldc1 $f22, 0xe8($sp) +/* 803BF4 80243374 D7B400E0 */ ldc1 $f20, 0xe0($sp) +/* 803BF8 80243378 03E00008 */ jr $ra +/* 803BFC 8024337C 27BD00F0 */ addiu $sp, $sp, 0xf0 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494.s deleted file mode 100644 index e337eb0af9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243494 -/* 803D14 80243494 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803D18 80243498 AFB10014 */ sw $s1, 0x14($sp) -/* 803D1C 8024349C 0080882D */ daddu $s1, $a0, $zero -/* 803D20 802434A0 0000202D */ daddu $a0, $zero, $zero -/* 803D24 802434A4 3C05FD05 */ lui $a1, 0xfd05 -/* 803D28 802434A8 34A50F8A */ ori $a1, $a1, 0xf8a -/* 803D2C 802434AC AFBF0018 */ sw $ra, 0x18($sp) -/* 803D30 802434B0 0C0B1EAF */ jal get_variable -/* 803D34 802434B4 AFB00010 */ sw $s0, 0x10($sp) -/* 803D38 802434B8 0040802D */ daddu $s0, $v0, $zero -/* 803D3C 802434BC 0C04EA15 */ jal func_8013A854 -/* 803D40 802434C0 8E040000 */ lw $a0, ($s0) -/* 803D44 802434C4 0C048D70 */ jal func_801235C0 -/* 803D48 802434C8 8E040004 */ lw $a0, 4($s0) -/* 803D4C 802434CC 0C00AB4B */ jal heap_free -/* 803D50 802434D0 0200202D */ daddu $a0, $s0, $zero -/* 803D54 802434D4 0220202D */ daddu $a0, $s1, $zero -/* 803D58 802434D8 3C05FD05 */ lui $a1, 0xfd05 -/* 803D5C 802434DC 34A50F8A */ ori $a1, $a1, 0xf8a -/* 803D60 802434E0 0C0B2026 */ jal set_variable -/* 803D64 802434E4 0000302D */ daddu $a2, $zero, $zero -/* 803D68 802434E8 8FBF0018 */ lw $ra, 0x18($sp) -/* 803D6C 802434EC 8FB10014 */ lw $s1, 0x14($sp) -/* 803D70 802434F0 8FB00010 */ lw $s0, 0x10($sp) -/* 803D74 802434F4 24020002 */ addiu $v0, $zero, 2 -/* 803D78 802434F8 03E00008 */ jr $ra -/* 803D7C 802434FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s new file mode 100644 index 0000000000..709fca6334 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243494_803D14.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243494_803D14 +/* 803D14 80243494 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 803D18 80243498 AFB10014 */ sw $s1, 0x14($sp) +/* 803D1C 8024349C 0080882D */ daddu $s1, $a0, $zero +/* 803D20 802434A0 0000202D */ daddu $a0, $zero, $zero +/* 803D24 802434A4 3C05FD05 */ lui $a1, 0xfd05 +/* 803D28 802434A8 34A50F8A */ ori $a1, $a1, 0xf8a +/* 803D2C 802434AC AFBF0018 */ sw $ra, 0x18($sp) +/* 803D30 802434B0 0C0B1EAF */ jal get_variable +/* 803D34 802434B4 AFB00010 */ sw $s0, 0x10($sp) +/* 803D38 802434B8 0040802D */ daddu $s0, $v0, $zero +/* 803D3C 802434BC 0C04EA15 */ jal func_8013A854 +/* 803D40 802434C0 8E040000 */ lw $a0, ($s0) +/* 803D44 802434C4 0C048D70 */ jal func_801235C0 +/* 803D48 802434C8 8E040004 */ lw $a0, 4($s0) +/* 803D4C 802434CC 0C00AB4B */ jal heap_free +/* 803D50 802434D0 0200202D */ daddu $a0, $s0, $zero +/* 803D54 802434D4 0220202D */ daddu $a0, $s1, $zero +/* 803D58 802434D8 3C05FD05 */ lui $a1, 0xfd05 +/* 803D5C 802434DC 34A50F8A */ ori $a1, $a1, 0xf8a +/* 803D60 802434E0 0C0B2026 */ jal set_variable +/* 803D64 802434E4 0000302D */ daddu $a2, $zero, $zero +/* 803D68 802434E8 8FBF0018 */ lw $ra, 0x18($sp) +/* 803D6C 802434EC 8FB10014 */ lw $s1, 0x14($sp) +/* 803D70 802434F0 8FB00010 */ lw $s0, 0x10($sp) +/* 803D74 802434F4 24020002 */ addiu $v0, $zero, 2 +/* 803D78 802434F8 03E00008 */ jr $ra +/* 803D7C 802434FC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500.s deleted file mode 100644 index d0df79af7c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243500 -/* 803D80 80243500 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803D84 80243504 AFB10014 */ sw $s1, 0x14($sp) -/* 803D88 80243508 0080882D */ daddu $s1, $a0, $zero -/* 803D8C 8024350C AFBF001C */ sw $ra, 0x1c($sp) -/* 803D90 80243510 AFB20018 */ sw $s2, 0x18($sp) -/* 803D94 80243514 AFB00010 */ sw $s0, 0x10($sp) -/* 803D98 80243518 8E30000C */ lw $s0, 0xc($s1) -/* 803D9C 8024351C 8E050000 */ lw $a1, ($s0) -/* 803DA0 80243520 0C0B210B */ jal get_float_variable -/* 803DA4 80243524 26100004 */ addiu $s0, $s0, 4 -/* 803DA8 80243528 8E050000 */ lw $a1, ($s0) -/* 803DAC 8024352C 26100004 */ addiu $s0, $s0, 4 -/* 803DB0 80243530 4600008D */ trunc.w.s $f2, $f0 -/* 803DB4 80243534 44121000 */ mfc1 $s2, $f2 -/* 803DB8 80243538 0C0B210B */ jal get_float_variable -/* 803DBC 8024353C 0220202D */ daddu $a0, $s1, $zero -/* 803DC0 80243540 0220202D */ daddu $a0, $s1, $zero -/* 803DC4 80243544 8E050000 */ lw $a1, ($s0) -/* 803DC8 80243548 4600008D */ trunc.w.s $f2, $f0 -/* 803DCC 8024354C 44111000 */ mfc1 $s1, $f2 -/* 803DD0 80243550 0C0B210B */ jal get_float_variable -/* 803DD4 80243554 00000000 */ nop -/* 803DD8 80243558 0000202D */ daddu $a0, $zero, $zero -/* 803DDC 8024355C 3C05FD05 */ lui $a1, 0xfd05 -/* 803DE0 80243560 4600008D */ trunc.w.s $f2, $f0 -/* 803DE4 80243564 44101000 */ mfc1 $s0, $f2 -/* 803DE8 80243568 0C0B1EAF */ jal get_variable -/* 803DEC 8024356C 34A50F8A */ ori $a1, $a1, 0xf8a -/* 803DF0 80243570 0040182D */ daddu $v1, $v0, $zero -/* 803DF4 80243574 44920000 */ mtc1 $s2, $f0 -/* 803DF8 80243578 00000000 */ nop -/* 803DFC 8024357C 46800020 */ cvt.s.w $f0, $f0 -/* 803E00 80243580 E4600010 */ swc1 $f0, 0x10($v1) -/* 803E04 80243584 44910000 */ mtc1 $s1, $f0 -/* 803E08 80243588 00000000 */ nop -/* 803E0C 8024358C 46800020 */ cvt.s.w $f0, $f0 -/* 803E10 80243590 E4600014 */ swc1 $f0, 0x14($v1) -/* 803E14 80243594 44900000 */ mtc1 $s0, $f0 -/* 803E18 80243598 00000000 */ nop -/* 803E1C 8024359C 46800020 */ cvt.s.w $f0, $f0 -/* 803E20 802435A0 E4600018 */ swc1 $f0, 0x18($v1) -/* 803E24 802435A4 8FBF001C */ lw $ra, 0x1c($sp) -/* 803E28 802435A8 8FB20018 */ lw $s2, 0x18($sp) -/* 803E2C 802435AC 8FB10014 */ lw $s1, 0x14($sp) -/* 803E30 802435B0 8FB00010 */ lw $s0, 0x10($sp) -/* 803E34 802435B4 24020002 */ addiu $v0, $zero, 2 -/* 803E38 802435B8 03E00008 */ jr $ra -/* 803E3C 802435BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s new file mode 100644 index 0000000000..077403361a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243500_803D80.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243500_803D80 +/* 803D80 80243500 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 803D84 80243504 AFB10014 */ sw $s1, 0x14($sp) +/* 803D88 80243508 0080882D */ daddu $s1, $a0, $zero +/* 803D8C 8024350C AFBF001C */ sw $ra, 0x1c($sp) +/* 803D90 80243510 AFB20018 */ sw $s2, 0x18($sp) +/* 803D94 80243514 AFB00010 */ sw $s0, 0x10($sp) +/* 803D98 80243518 8E30000C */ lw $s0, 0xc($s1) +/* 803D9C 8024351C 8E050000 */ lw $a1, ($s0) +/* 803DA0 80243520 0C0B210B */ jal get_float_variable +/* 803DA4 80243524 26100004 */ addiu $s0, $s0, 4 +/* 803DA8 80243528 8E050000 */ lw $a1, ($s0) +/* 803DAC 8024352C 26100004 */ addiu $s0, $s0, 4 +/* 803DB0 80243530 4600008D */ trunc.w.s $f2, $f0 +/* 803DB4 80243534 44121000 */ mfc1 $s2, $f2 +/* 803DB8 80243538 0C0B210B */ jal get_float_variable +/* 803DBC 8024353C 0220202D */ daddu $a0, $s1, $zero +/* 803DC0 80243540 0220202D */ daddu $a0, $s1, $zero +/* 803DC4 80243544 8E050000 */ lw $a1, ($s0) +/* 803DC8 80243548 4600008D */ trunc.w.s $f2, $f0 +/* 803DCC 8024354C 44111000 */ mfc1 $s1, $f2 +/* 803DD0 80243550 0C0B210B */ jal get_float_variable +/* 803DD4 80243554 00000000 */ nop +/* 803DD8 80243558 0000202D */ daddu $a0, $zero, $zero +/* 803DDC 8024355C 3C05FD05 */ lui $a1, 0xfd05 +/* 803DE0 80243560 4600008D */ trunc.w.s $f2, $f0 +/* 803DE4 80243564 44101000 */ mfc1 $s0, $f2 +/* 803DE8 80243568 0C0B1EAF */ jal get_variable +/* 803DEC 8024356C 34A50F8A */ ori $a1, $a1, 0xf8a +/* 803DF0 80243570 0040182D */ daddu $v1, $v0, $zero +/* 803DF4 80243574 44920000 */ mtc1 $s2, $f0 +/* 803DF8 80243578 00000000 */ nop +/* 803DFC 8024357C 46800020 */ cvt.s.w $f0, $f0 +/* 803E00 80243580 E4600010 */ swc1 $f0, 0x10($v1) +/* 803E04 80243584 44910000 */ mtc1 $s1, $f0 +/* 803E08 80243588 00000000 */ nop +/* 803E0C 8024358C 46800020 */ cvt.s.w $f0, $f0 +/* 803E10 80243590 E4600014 */ swc1 $f0, 0x14($v1) +/* 803E14 80243594 44900000 */ mtc1 $s0, $f0 +/* 803E18 80243598 00000000 */ nop +/* 803E1C 8024359C 46800020 */ cvt.s.w $f0, $f0 +/* 803E20 802435A0 E4600018 */ swc1 $f0, 0x18($v1) +/* 803E24 802435A4 8FBF001C */ lw $ra, 0x1c($sp) +/* 803E28 802435A8 8FB20018 */ lw $s2, 0x18($sp) +/* 803E2C 802435AC 8FB10014 */ lw $s1, 0x14($sp) +/* 803E30 802435B0 8FB00010 */ lw $s0, 0x10($sp) +/* 803E34 802435B4 24020002 */ addiu $v0, $zero, 2 +/* 803E38 802435B8 03E00008 */ jr $ra +/* 803E3C 802435BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0.s deleted file mode 100644 index 00b7a93e8c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435C0 -/* 803E40 802435C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803E44 802435C4 AFB10014 */ sw $s1, 0x14($sp) -/* 803E48 802435C8 0080882D */ daddu $s1, $a0, $zero -/* 803E4C 802435CC AFBF001C */ sw $ra, 0x1c($sp) -/* 803E50 802435D0 AFB20018 */ sw $s2, 0x18($sp) -/* 803E54 802435D4 AFB00010 */ sw $s0, 0x10($sp) -/* 803E58 802435D8 8E30000C */ lw $s0, 0xc($s1) -/* 803E5C 802435DC 8E050000 */ lw $a1, ($s0) -/* 803E60 802435E0 0C0B210B */ jal get_float_variable -/* 803E64 802435E4 26100004 */ addiu $s0, $s0, 4 -/* 803E68 802435E8 8E050000 */ lw $a1, ($s0) -/* 803E6C 802435EC 26100004 */ addiu $s0, $s0, 4 -/* 803E70 802435F0 4600008D */ trunc.w.s $f2, $f0 -/* 803E74 802435F4 44121000 */ mfc1 $s2, $f2 -/* 803E78 802435F8 0C0B210B */ jal get_float_variable -/* 803E7C 802435FC 0220202D */ daddu $a0, $s1, $zero -/* 803E80 80243600 0220202D */ daddu $a0, $s1, $zero -/* 803E84 80243604 8E050000 */ lw $a1, ($s0) -/* 803E88 80243608 4600008D */ trunc.w.s $f2, $f0 -/* 803E8C 8024360C 44111000 */ mfc1 $s1, $f2 -/* 803E90 80243610 0C0B210B */ jal get_float_variable -/* 803E94 80243614 00000000 */ nop -/* 803E98 80243618 0000202D */ daddu $a0, $zero, $zero -/* 803E9C 8024361C 3C05FD05 */ lui $a1, 0xfd05 -/* 803EA0 80243620 4600008D */ trunc.w.s $f2, $f0 -/* 803EA4 80243624 44101000 */ mfc1 $s0, $f2 -/* 803EA8 80243628 0C0B1EAF */ jal get_variable -/* 803EAC 8024362C 34A50F8A */ ori $a1, $a1, 0xf8a -/* 803EB0 80243630 0040182D */ daddu $v1, $v0, $zero -/* 803EB4 80243634 44920000 */ mtc1 $s2, $f0 -/* 803EB8 80243638 00000000 */ nop -/* 803EBC 8024363C 46800020 */ cvt.s.w $f0, $f0 -/* 803EC0 80243640 E460001C */ swc1 $f0, 0x1c($v1) -/* 803EC4 80243644 44910000 */ mtc1 $s1, $f0 -/* 803EC8 80243648 00000000 */ nop -/* 803ECC 8024364C 46800020 */ cvt.s.w $f0, $f0 -/* 803ED0 80243650 E4600020 */ swc1 $f0, 0x20($v1) -/* 803ED4 80243654 44900000 */ mtc1 $s0, $f0 -/* 803ED8 80243658 00000000 */ nop -/* 803EDC 8024365C 46800020 */ cvt.s.w $f0, $f0 -/* 803EE0 80243660 E4600024 */ swc1 $f0, 0x24($v1) -/* 803EE4 80243664 8FBF001C */ lw $ra, 0x1c($sp) -/* 803EE8 80243668 8FB20018 */ lw $s2, 0x18($sp) -/* 803EEC 8024366C 8FB10014 */ lw $s1, 0x14($sp) -/* 803EF0 80243670 8FB00010 */ lw $s0, 0x10($sp) -/* 803EF4 80243674 24020002 */ addiu $v0, $zero, 2 -/* 803EF8 80243678 03E00008 */ jr $ra -/* 803EFC 8024367C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s new file mode 100644 index 0000000000..bcddbfa4bd --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802435C0_803E40.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435C0_803E40 +/* 803E40 802435C0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 803E44 802435C4 AFB10014 */ sw $s1, 0x14($sp) +/* 803E48 802435C8 0080882D */ daddu $s1, $a0, $zero +/* 803E4C 802435CC AFBF001C */ sw $ra, 0x1c($sp) +/* 803E50 802435D0 AFB20018 */ sw $s2, 0x18($sp) +/* 803E54 802435D4 AFB00010 */ sw $s0, 0x10($sp) +/* 803E58 802435D8 8E30000C */ lw $s0, 0xc($s1) +/* 803E5C 802435DC 8E050000 */ lw $a1, ($s0) +/* 803E60 802435E0 0C0B210B */ jal get_float_variable +/* 803E64 802435E4 26100004 */ addiu $s0, $s0, 4 +/* 803E68 802435E8 8E050000 */ lw $a1, ($s0) +/* 803E6C 802435EC 26100004 */ addiu $s0, $s0, 4 +/* 803E70 802435F0 4600008D */ trunc.w.s $f2, $f0 +/* 803E74 802435F4 44121000 */ mfc1 $s2, $f2 +/* 803E78 802435F8 0C0B210B */ jal get_float_variable +/* 803E7C 802435FC 0220202D */ daddu $a0, $s1, $zero +/* 803E80 80243600 0220202D */ daddu $a0, $s1, $zero +/* 803E84 80243604 8E050000 */ lw $a1, ($s0) +/* 803E88 80243608 4600008D */ trunc.w.s $f2, $f0 +/* 803E8C 8024360C 44111000 */ mfc1 $s1, $f2 +/* 803E90 80243610 0C0B210B */ jal get_float_variable +/* 803E94 80243614 00000000 */ nop +/* 803E98 80243618 0000202D */ daddu $a0, $zero, $zero +/* 803E9C 8024361C 3C05FD05 */ lui $a1, 0xfd05 +/* 803EA0 80243620 4600008D */ trunc.w.s $f2, $f0 +/* 803EA4 80243624 44101000 */ mfc1 $s0, $f2 +/* 803EA8 80243628 0C0B1EAF */ jal get_variable +/* 803EAC 8024362C 34A50F8A */ ori $a1, $a1, 0xf8a +/* 803EB0 80243630 0040182D */ daddu $v1, $v0, $zero +/* 803EB4 80243634 44920000 */ mtc1 $s2, $f0 +/* 803EB8 80243638 00000000 */ nop +/* 803EBC 8024363C 46800020 */ cvt.s.w $f0, $f0 +/* 803EC0 80243640 E460001C */ swc1 $f0, 0x1c($v1) +/* 803EC4 80243644 44910000 */ mtc1 $s1, $f0 +/* 803EC8 80243648 00000000 */ nop +/* 803ECC 8024364C 46800020 */ cvt.s.w $f0, $f0 +/* 803ED0 80243650 E4600020 */ swc1 $f0, 0x20($v1) +/* 803ED4 80243654 44900000 */ mtc1 $s0, $f0 +/* 803ED8 80243658 00000000 */ nop +/* 803EDC 8024365C 46800020 */ cvt.s.w $f0, $f0 +/* 803EE0 80243660 E4600024 */ swc1 $f0, 0x24($v1) +/* 803EE4 80243664 8FBF001C */ lw $ra, 0x1c($sp) +/* 803EE8 80243668 8FB20018 */ lw $s2, 0x18($sp) +/* 803EEC 8024366C 8FB10014 */ lw $s1, 0x14($sp) +/* 803EF0 80243670 8FB00010 */ lw $s0, 0x10($sp) +/* 803EF4 80243674 24020002 */ addiu $v0, $zero, 2 +/* 803EF8 80243678 03E00008 */ jr $ra +/* 803EFC 8024367C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680.s deleted file mode 100644 index 08efbe6f08..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243680 -/* 803F00 80243680 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803F04 80243684 AFB10014 */ sw $s1, 0x14($sp) -/* 803F08 80243688 0080882D */ daddu $s1, $a0, $zero -/* 803F0C 8024368C AFBF001C */ sw $ra, 0x1c($sp) -/* 803F10 80243690 AFB20018 */ sw $s2, 0x18($sp) -/* 803F14 80243694 AFB00010 */ sw $s0, 0x10($sp) -/* 803F18 80243698 8E30000C */ lw $s0, 0xc($s1) -/* 803F1C 8024369C 8E050000 */ lw $a1, ($s0) -/* 803F20 802436A0 0C0B210B */ jal get_float_variable -/* 803F24 802436A4 26100004 */ addiu $s0, $s0, 4 -/* 803F28 802436A8 8E050000 */ lw $a1, ($s0) -/* 803F2C 802436AC 26100004 */ addiu $s0, $s0, 4 -/* 803F30 802436B0 4600008D */ trunc.w.s $f2, $f0 -/* 803F34 802436B4 44121000 */ mfc1 $s2, $f2 -/* 803F38 802436B8 0C0B210B */ jal get_float_variable -/* 803F3C 802436BC 0220202D */ daddu $a0, $s1, $zero -/* 803F40 802436C0 0220202D */ daddu $a0, $s1, $zero -/* 803F44 802436C4 8E050000 */ lw $a1, ($s0) -/* 803F48 802436C8 4600008D */ trunc.w.s $f2, $f0 -/* 803F4C 802436CC 44111000 */ mfc1 $s1, $f2 -/* 803F50 802436D0 0C0B210B */ jal get_float_variable -/* 803F54 802436D4 00000000 */ nop -/* 803F58 802436D8 0000202D */ daddu $a0, $zero, $zero -/* 803F5C 802436DC 3C05FD05 */ lui $a1, 0xfd05 -/* 803F60 802436E0 4600008D */ trunc.w.s $f2, $f0 -/* 803F64 802436E4 44101000 */ mfc1 $s0, $f2 -/* 803F68 802436E8 0C0B1EAF */ jal get_variable -/* 803F6C 802436EC 34A50F8A */ ori $a1, $a1, 0xf8a -/* 803F70 802436F0 0040182D */ daddu $v1, $v0, $zero -/* 803F74 802436F4 44920000 */ mtc1 $s2, $f0 -/* 803F78 802436F8 00000000 */ nop -/* 803F7C 802436FC 46800020 */ cvt.s.w $f0, $f0 -/* 803F80 80243700 E4600028 */ swc1 $f0, 0x28($v1) -/* 803F84 80243704 44910000 */ mtc1 $s1, $f0 -/* 803F88 80243708 00000000 */ nop -/* 803F8C 8024370C 46800020 */ cvt.s.w $f0, $f0 -/* 803F90 80243710 E460002C */ swc1 $f0, 0x2c($v1) -/* 803F94 80243714 44900000 */ mtc1 $s0, $f0 -/* 803F98 80243718 00000000 */ nop -/* 803F9C 8024371C 46800020 */ cvt.s.w $f0, $f0 -/* 803FA0 80243720 E4600030 */ swc1 $f0, 0x30($v1) -/* 803FA4 80243724 8FBF001C */ lw $ra, 0x1c($sp) -/* 803FA8 80243728 8FB20018 */ lw $s2, 0x18($sp) -/* 803FAC 8024372C 8FB10014 */ lw $s1, 0x14($sp) -/* 803FB0 80243730 8FB00010 */ lw $s0, 0x10($sp) -/* 803FB4 80243734 24020002 */ addiu $v0, $zero, 2 -/* 803FB8 80243738 03E00008 */ jr $ra -/* 803FBC 8024373C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s new file mode 100644 index 0000000000..dce928a3dd --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243680_803F00.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243680_803F00 +/* 803F00 80243680 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 803F04 80243684 AFB10014 */ sw $s1, 0x14($sp) +/* 803F08 80243688 0080882D */ daddu $s1, $a0, $zero +/* 803F0C 8024368C AFBF001C */ sw $ra, 0x1c($sp) +/* 803F10 80243690 AFB20018 */ sw $s2, 0x18($sp) +/* 803F14 80243694 AFB00010 */ sw $s0, 0x10($sp) +/* 803F18 80243698 8E30000C */ lw $s0, 0xc($s1) +/* 803F1C 8024369C 8E050000 */ lw $a1, ($s0) +/* 803F20 802436A0 0C0B210B */ jal get_float_variable +/* 803F24 802436A4 26100004 */ addiu $s0, $s0, 4 +/* 803F28 802436A8 8E050000 */ lw $a1, ($s0) +/* 803F2C 802436AC 26100004 */ addiu $s0, $s0, 4 +/* 803F30 802436B0 4600008D */ trunc.w.s $f2, $f0 +/* 803F34 802436B4 44121000 */ mfc1 $s2, $f2 +/* 803F38 802436B8 0C0B210B */ jal get_float_variable +/* 803F3C 802436BC 0220202D */ daddu $a0, $s1, $zero +/* 803F40 802436C0 0220202D */ daddu $a0, $s1, $zero +/* 803F44 802436C4 8E050000 */ lw $a1, ($s0) +/* 803F48 802436C8 4600008D */ trunc.w.s $f2, $f0 +/* 803F4C 802436CC 44111000 */ mfc1 $s1, $f2 +/* 803F50 802436D0 0C0B210B */ jal get_float_variable +/* 803F54 802436D4 00000000 */ nop +/* 803F58 802436D8 0000202D */ daddu $a0, $zero, $zero +/* 803F5C 802436DC 3C05FD05 */ lui $a1, 0xfd05 +/* 803F60 802436E0 4600008D */ trunc.w.s $f2, $f0 +/* 803F64 802436E4 44101000 */ mfc1 $s0, $f2 +/* 803F68 802436E8 0C0B1EAF */ jal get_variable +/* 803F6C 802436EC 34A50F8A */ ori $a1, $a1, 0xf8a +/* 803F70 802436F0 0040182D */ daddu $v1, $v0, $zero +/* 803F74 802436F4 44920000 */ mtc1 $s2, $f0 +/* 803F78 802436F8 00000000 */ nop +/* 803F7C 802436FC 46800020 */ cvt.s.w $f0, $f0 +/* 803F80 80243700 E4600028 */ swc1 $f0, 0x28($v1) +/* 803F84 80243704 44910000 */ mtc1 $s1, $f0 +/* 803F88 80243708 00000000 */ nop +/* 803F8C 8024370C 46800020 */ cvt.s.w $f0, $f0 +/* 803F90 80243710 E460002C */ swc1 $f0, 0x2c($v1) +/* 803F94 80243714 44900000 */ mtc1 $s0, $f0 +/* 803F98 80243718 00000000 */ nop +/* 803F9C 8024371C 46800020 */ cvt.s.w $f0, $f0 +/* 803FA0 80243720 E4600030 */ swc1 $f0, 0x30($v1) +/* 803FA4 80243724 8FBF001C */ lw $ra, 0x1c($sp) +/* 803FA8 80243728 8FB20018 */ lw $s2, 0x18($sp) +/* 803FAC 8024372C 8FB10014 */ lw $s1, 0x14($sp) +/* 803FB0 80243730 8FB00010 */ lw $s0, 0x10($sp) +/* 803FB4 80243734 24020002 */ addiu $v0, $zero, 2 +/* 803FB8 80243738 03E00008 */ jr $ra +/* 803FBC 8024373C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243740.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243740.s deleted file mode 100644 index cb3cf27404..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243740.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243740 -/* 803FC0 80243740 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803FC4 80243744 AFB10014 */ sw $s1, 0x14($sp) -/* 803FC8 80243748 0080882D */ daddu $s1, $a0, $zero -/* 803FCC 8024374C AFBF0018 */ sw $ra, 0x18($sp) -/* 803FD0 80243750 AFB00010 */ sw $s0, 0x10($sp) -/* 803FD4 80243754 8E30000C */ lw $s0, 0xc($s1) -/* 803FD8 80243758 8E050000 */ lw $a1, ($s0) -/* 803FDC 8024375C 0C0B1EAF */ jal get_variable -/* 803FE0 80243760 26100004 */ addiu $s0, $s0, 4 -/* 803FE4 80243764 0220202D */ daddu $a0, $s1, $zero -/* 803FE8 80243768 8E050000 */ lw $a1, ($s0) -/* 803FEC 8024376C 0C0B1EAF */ jal get_variable -/* 803FF0 80243770 0040882D */ daddu $s1, $v0, $zero -/* 803FF4 80243774 0000202D */ daddu $a0, $zero, $zero -/* 803FF8 80243778 3C05FD05 */ lui $a1, 0xfd05 -/* 803FFC 8024377C 34A50F8A */ ori $a1, $a1, 0xf8a -/* 804000 80243780 0C0B1EAF */ jal get_variable -/* 804004 80243784 0040802D */ daddu $s0, $v0, $zero -/* 804008 80243788 0040182D */ daddu $v1, $v0, $zero -/* 80400C 8024378C AC710008 */ sw $s1, 8($v1) -/* 804010 80243790 AC70000C */ sw $s0, 0xc($v1) -/* 804014 80243794 8FBF0018 */ lw $ra, 0x18($sp) -/* 804018 80243798 8FB10014 */ lw $s1, 0x14($sp) -/* 80401C 8024379C 8FB00010 */ lw $s0, 0x10($sp) -/* 804020 802437A0 24020002 */ addiu $v0, $zero, 2 -/* 804024 802437A4 03E00008 */ jr $ra -/* 804028 802437A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243740_803FC0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243740_803FC0.s new file mode 100644 index 0000000000..16cd7eb6cc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243740_803FC0.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243740_803FC0 +/* 803FC0 80243740 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 803FC4 80243744 AFB10014 */ sw $s1, 0x14($sp) +/* 803FC8 80243748 0080882D */ daddu $s1, $a0, $zero +/* 803FCC 8024374C AFBF0018 */ sw $ra, 0x18($sp) +/* 803FD0 80243750 AFB00010 */ sw $s0, 0x10($sp) +/* 803FD4 80243754 8E30000C */ lw $s0, 0xc($s1) +/* 803FD8 80243758 8E050000 */ lw $a1, ($s0) +/* 803FDC 8024375C 0C0B1EAF */ jal get_variable +/* 803FE0 80243760 26100004 */ addiu $s0, $s0, 4 +/* 803FE4 80243764 0220202D */ daddu $a0, $s1, $zero +/* 803FE8 80243768 8E050000 */ lw $a1, ($s0) +/* 803FEC 8024376C 0C0B1EAF */ jal get_variable +/* 803FF0 80243770 0040882D */ daddu $s1, $v0, $zero +/* 803FF4 80243774 0000202D */ daddu $a0, $zero, $zero +/* 803FF8 80243778 3C05FD05 */ lui $a1, 0xfd05 +/* 803FFC 8024377C 34A50F8A */ ori $a1, $a1, 0xf8a +/* 804000 80243780 0C0B1EAF */ jal get_variable +/* 804004 80243784 0040802D */ daddu $s0, $v0, $zero +/* 804008 80243788 0040182D */ daddu $v1, $v0, $zero +/* 80400C 8024378C AC710008 */ sw $s1, 8($v1) +/* 804010 80243790 AC70000C */ sw $s0, 0xc($v1) +/* 804014 80243794 8FBF0018 */ lw $ra, 0x18($sp) +/* 804018 80243798 8FB10014 */ lw $s1, 0x14($sp) +/* 80401C 8024379C 8FB00010 */ lw $s0, 0x10($sp) +/* 804020 802437A0 24020002 */ addiu $v0, $zero, 2 +/* 804024 802437A4 03E00008 */ jr $ra +/* 804028 802437A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC.s deleted file mode 100644 index 193721161e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437AC -/* 80402C 802437AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804030 802437B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 804034 802437B4 0C03A625 */ jal func_800E9894 -/* 804038 802437B8 00000000 */ nop -/* 80403C 802437BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 804040 802437C0 24020002 */ addiu $v0, $zero, 2 -/* 804044 802437C4 03E00008 */ jr $ra -/* 804048 802437C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s new file mode 100644 index 0000000000..6f7e6b9fce --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802437AC_80402C +/* 80402C 802437AC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 804030 802437B0 AFBF0010 */ sw $ra, 0x10($sp) +/* 804034 802437B4 0C03A625 */ jal func_800E9894 +/* 804038 802437B8 00000000 */ nop +/* 80403C 802437BC 8FBF0010 */ lw $ra, 0x10($sp) +/* 804040 802437C0 24020002 */ addiu $v0, $zero, 2 +/* 804044 802437C4 03E00008 */ jr $ra +/* 804048 802437C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC.s deleted file mode 100644 index 0cde9b431a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437CC -/* 80404C 802437CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804050 802437D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 804054 802437D4 0C03A631 */ jal func_800E98C4 -/* 804058 802437D8 00000000 */ nop -/* 80405C 802437DC 0C03A6DB */ jal sync_status_menu -/* 804060 802437E0 00000000 */ nop -/* 804064 802437E4 8FBF0010 */ lw $ra, 0x10($sp) -/* 804068 802437E8 24020002 */ addiu $v0, $zero, 2 -/* 80406C 802437EC 03E00008 */ jr $ra -/* 804070 802437F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s new file mode 100644 index 0000000000..f08b379a6a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802437CC_80404C +/* 80404C 802437CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 804050 802437D0 AFBF0010 */ sw $ra, 0x10($sp) +/* 804054 802437D4 0C03A631 */ jal func_800E98C4 +/* 804058 802437D8 00000000 */ nop +/* 80405C 802437DC 0C03A6DB */ jal sync_status_menu +/* 804060 802437E0 00000000 */ nop +/* 804064 802437E4 8FBF0010 */ lw $ra, 0x10($sp) +/* 804068 802437E8 24020002 */ addiu $v0, $zero, 2 +/* 80406C 802437EC 03E00008 */ jr $ra +/* 804070 802437F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870.s deleted file mode 100644 index 4b07a3bfdf..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243870 -/* 8040F0 80243870 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8040F4 80243874 AFB10014 */ sw $s1, 0x14($sp) -/* 8040F8 80243878 0080882D */ daddu $s1, $a0, $zero -/* 8040FC 8024387C AFBF0018 */ sw $ra, 0x18($sp) -/* 804100 80243880 AFB00010 */ sw $s0, 0x10($sp) -/* 804104 80243884 8E30000C */ lw $s0, 0xc($s1) -/* 804108 80243888 8E050000 */ lw $a1, ($s0) -/* 80410C 8024388C 0C0B1EAF */ jal get_variable -/* 804110 80243890 26100004 */ addiu $s0, $s0, 4 -/* 804114 80243894 0220202D */ daddu $a0, $s1, $zero -/* 804118 80243898 8E050000 */ lw $a1, ($s0) -/* 80411C 8024389C 0C0B1EAF */ jal get_variable -/* 804120 802438A0 0040802D */ daddu $s0, $v0, $zero -/* 804124 802438A4 44820000 */ mtc1 $v0, $f0 -/* 804128 802438A8 00000000 */ nop -/* 80412C 802438AC 46800020 */ cvt.s.w $f0, $f0 -/* 804130 802438B0 24020002 */ addiu $v0, $zero, 2 -/* 804134 802438B4 00501804 */ sllv $v1, $s0, $v0 -/* 804138 802438B8 00701821 */ addu $v1, $v1, $s0 -/* 80413C 802438BC 00431804 */ sllv $v1, $v1, $v0 -/* 804140 802438C0 00701823 */ subu $v1, $v1, $s0 -/* 804144 802438C4 000320C0 */ sll $a0, $v1, 3 -/* 804148 802438C8 00641821 */ addu $v1, $v1, $a0 -/* 80414C 802438CC 000318C0 */ sll $v1, $v1, 3 -/* 804150 802438D0 3C01800B */ lui $at, 0x800b -/* 804154 802438D4 00230821 */ addu $at, $at, $v1 -/* 804158 802438D8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 80415C 802438DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 804160 802438E0 8FB10014 */ lw $s1, 0x14($sp) -/* 804164 802438E4 8FB00010 */ lw $s0, 0x10($sp) -/* 804168 802438E8 03E00008 */ jr $ra -/* 80416C 802438EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s new file mode 100644 index 0000000000..99b884632c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243870_8040F0.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243870_8040F0 +/* 8040F0 80243870 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8040F4 80243874 AFB10014 */ sw $s1, 0x14($sp) +/* 8040F8 80243878 0080882D */ daddu $s1, $a0, $zero +/* 8040FC 8024387C AFBF0018 */ sw $ra, 0x18($sp) +/* 804100 80243880 AFB00010 */ sw $s0, 0x10($sp) +/* 804104 80243884 8E30000C */ lw $s0, 0xc($s1) +/* 804108 80243888 8E050000 */ lw $a1, ($s0) +/* 80410C 8024388C 0C0B1EAF */ jal get_variable +/* 804110 80243890 26100004 */ addiu $s0, $s0, 4 +/* 804114 80243894 0220202D */ daddu $a0, $s1, $zero +/* 804118 80243898 8E050000 */ lw $a1, ($s0) +/* 80411C 8024389C 0C0B1EAF */ jal get_variable +/* 804120 802438A0 0040802D */ daddu $s0, $v0, $zero +/* 804124 802438A4 44820000 */ mtc1 $v0, $f0 +/* 804128 802438A8 00000000 */ nop +/* 80412C 802438AC 46800020 */ cvt.s.w $f0, $f0 +/* 804130 802438B0 24020002 */ addiu $v0, $zero, 2 +/* 804134 802438B4 00501804 */ sllv $v1, $s0, $v0 +/* 804138 802438B8 00701821 */ addu $v1, $v1, $s0 +/* 80413C 802438BC 00431804 */ sllv $v1, $v1, $v0 +/* 804140 802438C0 00701823 */ subu $v1, $v1, $s0 +/* 804144 802438C4 000320C0 */ sll $a0, $v1, 3 +/* 804148 802438C8 00641821 */ addu $v1, $v1, $a0 +/* 80414C 802438CC 000318C0 */ sll $v1, $v1, 3 +/* 804150 802438D0 3C01800B */ lui $at, 0x800b +/* 804154 802438D4 00230821 */ addu $at, $at, $v1 +/* 804158 802438D8 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 80415C 802438DC 8FBF0018 */ lw $ra, 0x18($sp) +/* 804160 802438E0 8FB10014 */ lw $s1, 0x14($sp) +/* 804164 802438E4 8FB00010 */ lw $s0, 0x10($sp) +/* 804168 802438E8 03E00008 */ jr $ra +/* 80416C 802438EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0.s deleted file mode 100644 index 01940b5005..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802438F0 -/* 804170 802438F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804174 802438F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 804178 802438F8 8C82000C */ lw $v0, 0xc($a0) -/* 80417C 802438FC 0C0B1EAF */ jal get_variable -/* 804180 80243900 8C450000 */ lw $a1, ($v0) -/* 804184 80243904 0C0B1059 */ jal does_script_exist -/* 804188 80243908 0040202D */ daddu $a0, $v0, $zero -/* 80418C 8024390C 2C420001 */ sltiu $v0, $v0, 1 -/* 804190 80243910 8FBF0010 */ lw $ra, 0x10($sp) -/* 804194 80243914 00021040 */ sll $v0, $v0, 1 -/* 804198 80243918 03E00008 */ jr $ra -/* 80419C 8024391C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s new file mode 100644 index 0000000000..6e3b37c95c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802438F0_804170 +/* 804170 802438F0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 804174 802438F4 AFBF0010 */ sw $ra, 0x10($sp) +/* 804178 802438F8 8C82000C */ lw $v0, 0xc($a0) +/* 80417C 802438FC 0C0B1EAF */ jal get_variable +/* 804180 80243900 8C450000 */ lw $a1, ($v0) +/* 804184 80243904 0C0B1059 */ jal does_script_exist +/* 804188 80243908 0040202D */ daddu $a0, $v0, $zero +/* 80418C 8024390C 2C420001 */ sltiu $v0, $v0, 1 +/* 804190 80243910 8FBF0010 */ lw $ra, 0x10($sp) +/* 804194 80243914 00021040 */ sll $v0, $v0, 1 +/* 804198 80243918 03E00008 */ jr $ra +/* 80419C 8024391C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920.s deleted file mode 100644 index 25fb039f2c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243920 -/* 8041A0 80243920 3C028011 */ lui $v0, 0x8011 -/* 8041A4 80243924 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 8041A8 80243928 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8041AC 8024392C 10400003 */ beqz $v0, .L8024393C -/* 8041B0 80243930 AFBF0010 */ sw $ra, 0x10($sp) -/* 8041B4 80243934 0C03AE06 */ jal partner_suspend_ability_script -/* 8041B8 80243938 00000000 */ nop -.L8024393C: -/* 8041BC 8024393C 24020002 */ addiu $v0, $zero, 2 -/* 8041C0 80243940 8FBF0010 */ lw $ra, 0x10($sp) -/* 8041C4 80243944 03E00008 */ jr $ra -/* 8041C8 80243948 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s new file mode 100644 index 0000000000..a8c07f81d2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243920_8041A0 +/* 8041A0 80243920 3C028011 */ lui $v0, 0x8011 +/* 8041A4 80243924 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 8041A8 80243928 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8041AC 8024392C 10400003 */ beqz $v0, .L8024393C +/* 8041B0 80243930 AFBF0010 */ sw $ra, 0x10($sp) +/* 8041B4 80243934 0C03AE06 */ jal partner_suspend_ability_script +/* 8041B8 80243938 00000000 */ nop +.L8024393C: +/* 8041BC 8024393C 24020002 */ addiu $v0, $zero, 2 +/* 8041C0 80243940 8FBF0010 */ lw $ra, 0x10($sp) +/* 8041C4 80243944 03E00008 */ jr $ra +/* 8041C8 80243948 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C.s deleted file mode 100644 index cf5d942dd4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024394C -/* 8041CC 8024394C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8041D0 80243950 AFBF0010 */ sw $ra, 0x10($sp) -/* 8041D4 80243954 0C03AE18 */ jal partner_resume_ability_script -/* 8041D8 80243958 00000000 */ nop -/* 8041DC 8024395C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8041E0 80243960 24020002 */ addiu $v0, $zero, 2 -/* 8041E4 80243964 03E00008 */ jr $ra -/* 8041E8 80243968 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s new file mode 100644 index 0000000000..d35da2544a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024394C_8041CC +/* 8041CC 8024394C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8041D0 80243950 AFBF0010 */ sw $ra, 0x10($sp) +/* 8041D4 80243954 0C03AE18 */ jal partner_resume_ability_script +/* 8041D8 80243958 00000000 */ nop +/* 8041DC 8024395C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8041E0 80243960 24020002 */ addiu $v0, $zero, 2 +/* 8041E4 80243964 03E00008 */ jr $ra +/* 8041E8 80243968 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C.s deleted file mode 100644 index 1ee14e9043..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024396C -/* 8041EC 8024396C 3C058011 */ lui $a1, %hi(gPlayerData) -/* 8041F0 80243970 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 8041F4 80243974 AC800088 */ sw $zero, 0x88($a0) -/* 8041F8 80243978 80A30003 */ lb $v1, 3($a1) -/* 8041FC 8024397C 80A20002 */ lb $v0, 2($a1) -/* 804200 80243980 1462000B */ bne $v1, $v0, .L802439B0 -/* 804204 80243984 00A0302D */ daddu $a2, $a1, $zero -/* 804208 80243988 80A30006 */ lb $v1, 6($a1) -/* 80420C 8024398C 80A20005 */ lb $v0, 5($a1) -/* 804210 80243990 14620007 */ bne $v1, $v0, .L802439B0 -/* 804214 80243994 00000000 */ nop -/* 804218 80243998 80C2028E */ lb $v0, 0x28e($a2) -/* 80421C 8024399C 84C30290 */ lh $v1, 0x290($a2) -/* 804220 802439A0 00021200 */ sll $v0, $v0, 8 -/* 804224 802439A4 14620004 */ bne $v1, $v0, .L802439B8 -/* 804228 802439A8 24020001 */ addiu $v0, $zero, 1 -/* 80422C 802439AC AC820088 */ sw $v0, 0x88($a0) -.L802439B0: -/* 804230 802439B0 03E00008 */ jr $ra -/* 804234 802439B4 24020002 */ addiu $v0, $zero, 2 -.L802439B8: -/* 804238 802439B8 03E00008 */ jr $ra -/* 80423C 802439BC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s new file mode 100644 index 0000000000..ba0c455a83 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024396C_8041EC.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024396C_8041EC +/* 8041EC 8024396C 3C058011 */ lui $a1, %hi(gPlayerData) +/* 8041F0 80243970 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* 8041F4 80243974 AC800088 */ sw $zero, 0x88($a0) +/* 8041F8 80243978 80A30003 */ lb $v1, 3($a1) +/* 8041FC 8024397C 80A20002 */ lb $v0, 2($a1) +/* 804200 80243980 1462000B */ bne $v1, $v0, .L802439B0 +/* 804204 80243984 00A0302D */ daddu $a2, $a1, $zero +/* 804208 80243988 80A30006 */ lb $v1, 6($a1) +/* 80420C 8024398C 80A20005 */ lb $v0, 5($a1) +/* 804210 80243990 14620007 */ bne $v1, $v0, .L802439B0 +/* 804214 80243994 00000000 */ nop +/* 804218 80243998 80C2028E */ lb $v0, 0x28e($a2) +/* 80421C 8024399C 84C30290 */ lh $v1, 0x290($a2) +/* 804220 802439A0 00021200 */ sll $v0, $v0, 8 +/* 804224 802439A4 14620004 */ bne $v1, $v0, .L802439B8 +/* 804228 802439A8 24020001 */ addiu $v0, $zero, 1 +/* 80422C 802439AC AC820088 */ sw $v0, 0x88($a0) +.L802439B0: +/* 804230 802439B0 03E00008 */ jr $ra +/* 804234 802439B4 24020002 */ addiu $v0, $zero, 2 +.L802439B8: +/* 804238 802439B8 03E00008 */ jr $ra +/* 80423C 802439BC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0.s deleted file mode 100644 index 81149160ee..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802439C0 -/* 804240 802439C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 804244 802439C4 AFB10014 */ sw $s1, 0x14($sp) -/* 804248 802439C8 0080882D */ daddu $s1, $a0, $zero -/* 80424C 802439CC AFBF001C */ sw $ra, 0x1c($sp) -/* 804250 802439D0 AFB20018 */ sw $s2, 0x18($sp) -/* 804254 802439D4 AFB00010 */ sw $s0, 0x10($sp) -/* 804258 802439D8 8E30000C */ lw $s0, 0xc($s1) -/* 80425C 802439DC 8E050000 */ lw $a1, ($s0) -/* 804260 802439E0 0C0B1EAF */ jal get_variable -/* 804264 802439E4 26100004 */ addiu $s0, $s0, 4 -/* 804268 802439E8 8E050000 */ lw $a1, ($s0) -/* 80426C 802439EC 26100004 */ addiu $s0, $s0, 4 -/* 804270 802439F0 0220202D */ daddu $a0, $s1, $zero -/* 804274 802439F4 0C0B1EAF */ jal get_variable -/* 804278 802439F8 0040902D */ daddu $s2, $v0, $zero -/* 80427C 802439FC 0220202D */ daddu $a0, $s1, $zero -/* 804280 80243A00 8E050000 */ lw $a1, ($s0) -/* 804284 80243A04 0C0B1EAF */ jal get_variable -/* 804288 80243A08 0040802D */ daddu $s0, $v0, $zero -/* 80428C 80243A0C 0000202D */ daddu $a0, $zero, $zero -/* 804290 80243A10 324500FF */ andi $a1, $s2, 0xff -/* 804294 80243A14 320600FF */ andi $a2, $s0, 0xff -/* 804298 80243A18 0C04DF84 */ jal func_80137E10 -/* 80429C 80243A1C 304700FF */ andi $a3, $v0, 0xff -/* 8042A0 80243A20 8FBF001C */ lw $ra, 0x1c($sp) -/* 8042A4 80243A24 8FB20018 */ lw $s2, 0x18($sp) -/* 8042A8 80243A28 8FB10014 */ lw $s1, 0x14($sp) -/* 8042AC 80243A2C 8FB00010 */ lw $s0, 0x10($sp) -/* 8042B0 80243A30 24020002 */ addiu $v0, $zero, 2 -/* 8042B4 80243A34 03E00008 */ jr $ra -/* 8042B8 80243A38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s new file mode 100644 index 0000000000..3c748dc99b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802439C0_804240.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802439C0_804240 +/* 804240 802439C0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 804244 802439C4 AFB10014 */ sw $s1, 0x14($sp) +/* 804248 802439C8 0080882D */ daddu $s1, $a0, $zero +/* 80424C 802439CC AFBF001C */ sw $ra, 0x1c($sp) +/* 804250 802439D0 AFB20018 */ sw $s2, 0x18($sp) +/* 804254 802439D4 AFB00010 */ sw $s0, 0x10($sp) +/* 804258 802439D8 8E30000C */ lw $s0, 0xc($s1) +/* 80425C 802439DC 8E050000 */ lw $a1, ($s0) +/* 804260 802439E0 0C0B1EAF */ jal get_variable +/* 804264 802439E4 26100004 */ addiu $s0, $s0, 4 +/* 804268 802439E8 8E050000 */ lw $a1, ($s0) +/* 80426C 802439EC 26100004 */ addiu $s0, $s0, 4 +/* 804270 802439F0 0220202D */ daddu $a0, $s1, $zero +/* 804274 802439F4 0C0B1EAF */ jal get_variable +/* 804278 802439F8 0040902D */ daddu $s2, $v0, $zero +/* 80427C 802439FC 0220202D */ daddu $a0, $s1, $zero +/* 804280 80243A00 8E050000 */ lw $a1, ($s0) +/* 804284 80243A04 0C0B1EAF */ jal get_variable +/* 804288 80243A08 0040802D */ daddu $s0, $v0, $zero +/* 80428C 80243A0C 0000202D */ daddu $a0, $zero, $zero +/* 804290 80243A10 324500FF */ andi $a1, $s2, 0xff +/* 804294 80243A14 320600FF */ andi $a2, $s0, 0xff +/* 804298 80243A18 0C04DF84 */ jal func_80137E10 +/* 80429C 80243A1C 304700FF */ andi $a3, $v0, 0xff +/* 8042A0 80243A20 8FBF001C */ lw $ra, 0x1c($sp) +/* 8042A4 80243A24 8FB20018 */ lw $s2, 0x18($sp) +/* 8042A8 80243A28 8FB10014 */ lw $s1, 0x14($sp) +/* 8042AC 80243A2C 8FB00010 */ lw $s0, 0x10($sp) +/* 8042B0 80243A30 24020002 */ addiu $v0, $zero, 2 +/* 8042B4 80243A34 03E00008 */ jr $ra +/* 8042B8 80243A38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C.s deleted file mode 100644 index 51a43c093c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243A3C -/* 8042BC 80243A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8042C0 80243A40 AFBF0010 */ sw $ra, 0x10($sp) -/* 8042C4 80243A44 8C82000C */ lw $v0, 0xc($a0) -/* 8042C8 80243A48 3C068011 */ lui $a2, 0x8011 -/* 8042CC 80243A4C 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 8042D0 80243A50 0C0B2026 */ jal set_variable -/* 8042D4 80243A54 8C450000 */ lw $a1, ($v0) -/* 8042D8 80243A58 0C03AC5A */ jal func_800EB168 -/* 8042DC 80243A5C 0000202D */ daddu $a0, $zero, $zero -/* 8042E0 80243A60 8FBF0010 */ lw $ra, 0x10($sp) -/* 8042E4 80243A64 24020002 */ addiu $v0, $zero, 2 -/* 8042E8 80243A68 03E00008 */ jr $ra -/* 8042EC 80243A6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s new file mode 100644 index 0000000000..da4540da2d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243A3C_8042BC +/* 8042BC 80243A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8042C0 80243A40 AFBF0010 */ sw $ra, 0x10($sp) +/* 8042C4 80243A44 8C82000C */ lw $v0, 0xc($a0) +/* 8042C8 80243A48 3C068011 */ lui $a2, 0x8011 +/* 8042CC 80243A4C 80C6F2A2 */ lb $a2, -0xd5e($a2) +/* 8042D0 80243A50 0C0B2026 */ jal set_variable +/* 8042D4 80243A54 8C450000 */ lw $a1, ($v0) +/* 8042D8 80243A58 0C03AC5A */ jal func_800EB168 +/* 8042DC 80243A5C 0000202D */ daddu $a0, $zero, $zero +/* 8042E0 80243A60 8FBF0010 */ lw $ra, 0x10($sp) +/* 8042E4 80243A64 24020002 */ addiu $v0, $zero, 2 +/* 8042E8 80243A68 03E00008 */ jr $ra +/* 8042EC 80243A6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70.s deleted file mode 100644 index c3fa20b742..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243A70 -/* 8042F0 80243A70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8042F4 80243A74 AFBF0010 */ sw $ra, 0x10($sp) -/* 8042F8 80243A78 8C82000C */ lw $v0, 0xc($a0) -/* 8042FC 80243A7C 0C0B1EAF */ jal get_variable -/* 804300 80243A80 8C450000 */ lw $a1, ($v0) -/* 804304 80243A84 00021600 */ sll $v0, $v0, 0x18 -/* 804308 80243A88 0C03AC5A */ jal func_800EB168 -/* 80430C 80243A8C 00022603 */ sra $a0, $v0, 0x18 -/* 804310 80243A90 8FBF0010 */ lw $ra, 0x10($sp) -/* 804314 80243A94 24020002 */ addiu $v0, $zero, 2 -/* 804318 80243A98 03E00008 */ jr $ra -/* 80431C 80243A9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s new file mode 100644 index 0000000000..1defd7a02d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243A70_8042F0 +/* 8042F0 80243A70 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8042F4 80243A74 AFBF0010 */ sw $ra, 0x10($sp) +/* 8042F8 80243A78 8C82000C */ lw $v0, 0xc($a0) +/* 8042FC 80243A7C 0C0B1EAF */ jal get_variable +/* 804300 80243A80 8C450000 */ lw $a1, ($v0) +/* 804304 80243A84 00021600 */ sll $v0, $v0, 0x18 +/* 804308 80243A88 0C03AC5A */ jal func_800EB168 +/* 80430C 80243A8C 00022603 */ sra $a0, $v0, 0x18 +/* 804310 80243A90 8FBF0010 */ lw $ra, 0x10($sp) +/* 804314 80243A94 24020002 */ addiu $v0, $zero, 2 +/* 804318 80243A98 03E00008 */ jr $ra +/* 80431C 80243A9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0.s deleted file mode 100644 index 2868102017..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243AA0 -/* 804320 80243AA0 03E00008 */ jr $ra -/* 804324 80243AA4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s new file mode 100644 index 0000000000..6db024c51e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243AA0_804320 +/* 804320 80243AA0 03E00008 */ jr $ra +/* 804324 80243AA4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4.s deleted file mode 100644 index 7416a79ba3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243CD4 -/* 804554 80243CD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804558 80243CD8 AFBF0010 */ sw $ra, 0x10($sp) -/* 80455C 80243CDC 10A00003 */ beqz $a1, .L80243CEC -/* 804560 80243CE0 8C86000C */ lw $a2, 0xc($a0) -/* 804564 80243CE4 3C018025 */ lui $at, 0x8025 -/* 804568 80243CE8 AC20D944 */ sw $zero, -0x26bc($at) -.L80243CEC: -/* 80456C 80243CEC 3C038025 */ lui $v1, 0x8025 -/* 804570 80243CF0 2463D944 */ addiu $v1, $v1, -0x26bc -/* 804574 80243CF4 8C620000 */ lw $v0, ($v1) -/* 804578 80243CF8 54400003 */ bnel $v0, $zero, .L80243D08 -/* 80457C 80243CFC AC600000 */ sw $zero, ($v1) -/* 804580 80243D00 08090F47 */ j .L80243D1C -/* 804584 80243D04 0000102D */ daddu $v0, $zero, $zero -.L80243D08: -/* 804588 80243D08 8CC50000 */ lw $a1, ($a2) -/* 80458C 80243D0C 3C068025 */ lui $a2, 0x8025 -/* 804590 80243D10 0C0B2026 */ jal set_variable -/* 804594 80243D14 8CC6D948 */ lw $a2, -0x26b8($a2) -/* 804598 80243D18 24020002 */ addiu $v0, $zero, 2 -.L80243D1C: -/* 80459C 80243D1C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8045A0 80243D20 03E00008 */ jr $ra -/* 8045A4 80243D24 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s new file mode 100644 index 0000000000..542bd801c7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243CD4_804554.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243CD4_804554 +/* 804554 80243CD4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 804558 80243CD8 AFBF0010 */ sw $ra, 0x10($sp) +/* 80455C 80243CDC 10A00003 */ beqz $a1, .L80243CEC +/* 804560 80243CE0 8C86000C */ lw $a2, 0xc($a0) +/* 804564 80243CE4 3C018025 */ lui $at, 0x8025 +/* 804568 80243CE8 AC20D944 */ sw $zero, -0x26bc($at) +.L80243CEC: +/* 80456C 80243CEC 3C038025 */ lui $v1, 0x8025 +/* 804570 80243CF0 2463D944 */ addiu $v1, $v1, -0x26bc +/* 804574 80243CF4 8C620000 */ lw $v0, ($v1) +/* 804578 80243CF8 54400003 */ bnel $v0, $zero, .L80243D08 +/* 80457C 80243CFC AC600000 */ sw $zero, ($v1) +/* 804580 80243D00 08090F47 */ j .L80243D1C +/* 804584 80243D04 0000102D */ daddu $v0, $zero, $zero +.L80243D08: +/* 804588 80243D08 8CC50000 */ lw $a1, ($a2) +/* 80458C 80243D0C 3C068025 */ lui $a2, 0x8025 +/* 804590 80243D10 0C0B2026 */ jal set_variable +/* 804594 80243D14 8CC6D948 */ lw $a2, -0x26b8($a2) +/* 804598 80243D18 24020002 */ addiu $v0, $zero, 2 +.L80243D1C: +/* 80459C 80243D1C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8045A0 80243D20 03E00008 */ jr $ra +/* 8045A4 80243D24 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28.s deleted file mode 100644 index 4dad0694cd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243D28 -/* 8045A8 80243D28 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8045AC 80243D2C AFBF0010 */ sw $ra, 0x10($sp) -/* 8045B0 80243D30 8C82000C */ lw $v0, 0xc($a0) -/* 8045B4 80243D34 0C0B1EAF */ jal get_variable -/* 8045B8 80243D38 8C450000 */ lw $a1, ($v0) -/* 8045BC 80243D3C 3C018025 */ lui $at, 0x8025 -/* 8045C0 80243D40 AC22D948 */ sw $v0, -0x26b8($at) -/* 8045C4 80243D44 24020002 */ addiu $v0, $zero, 2 -/* 8045C8 80243D48 8FBF0010 */ lw $ra, 0x10($sp) -/* 8045CC 80243D4C 24030001 */ addiu $v1, $zero, 1 -/* 8045D0 80243D50 3C018025 */ lui $at, 0x8025 -/* 8045D4 80243D54 AC23D944 */ sw $v1, -0x26bc($at) -/* 8045D8 80243D58 03E00008 */ jr $ra -/* 8045DC 80243D5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28_8045A8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28_8045A8.s new file mode 100644 index 0000000000..1dbcf4832e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D28_8045A8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243D28_8045A8 +/* 8045A8 80243D28 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8045AC 80243D2C AFBF0010 */ sw $ra, 0x10($sp) +/* 8045B0 80243D30 8C82000C */ lw $v0, 0xc($a0) +/* 8045B4 80243D34 0C0B1EAF */ jal get_variable +/* 8045B8 80243D38 8C450000 */ lw $a1, ($v0) +/* 8045BC 80243D3C 3C018025 */ lui $at, 0x8025 +/* 8045C0 80243D40 AC22D948 */ sw $v0, -0x26b8($at) +/* 8045C4 80243D44 24020002 */ addiu $v0, $zero, 2 +/* 8045C8 80243D48 8FBF0010 */ lw $ra, 0x10($sp) +/* 8045CC 80243D4C 24030001 */ addiu $v1, $zero, 1 +/* 8045D0 80243D50 3C018025 */ lui $at, 0x8025 +/* 8045D4 80243D54 AC23D944 */ sw $v1, -0x26bc($at) +/* 8045D8 80243D58 03E00008 */ jr $ra +/* 8045DC 80243D5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60.s deleted file mode 100644 index b7bff50cb2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243D60 -/* 8045E0 80243D60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8045E4 80243D64 AFBF0010 */ sw $ra, 0x10($sp) -/* 8045E8 80243D68 8C82000C */ lw $v0, 0xc($a0) -/* 8045EC 80243D6C 0C0B1EAF */ jal get_variable -/* 8045F0 80243D70 8C450000 */ lw $a1, ($v0) -/* 8045F4 80243D74 0040182D */ daddu $v1, $v0, $zero -/* 8045F8 80243D78 10600012 */ beqz $v1, .L80243DC4 -/* 8045FC 80243D7C 0000202D */ daddu $a0, $zero, $zero -/* 804600 80243D80 8C620000 */ lw $v0, ($v1) -/* 804604 80243D84 5040000A */ beql $v0, $zero, .L80243DB0 -/* 804608 80243D88 00041080 */ sll $v0, $a0, 2 -/* 80460C 80243D8C 3C058026 */ lui $a1, 0x8026 -/* 804610 80243D90 24A52A70 */ addiu $a1, $a1, 0x2a70 -.L80243D94: -/* 804614 80243D94 24630004 */ addiu $v1, $v1, 4 -/* 804618 80243D98 24840001 */ addiu $a0, $a0, 1 -/* 80461C 80243D9C ACA20000 */ sw $v0, ($a1) -/* 804620 80243DA0 8C620000 */ lw $v0, ($v1) -/* 804624 80243DA4 1440FFFB */ bnez $v0, .L80243D94 -/* 804628 80243DA8 24A50004 */ addiu $a1, $a1, 4 -/* 80462C 80243DAC 00041080 */ sll $v0, $a0, 2 -.L80243DB0: -/* 804630 80243DB0 3C018026 */ lui $at, 0x8026 -/* 804634 80243DB4 00220821 */ addu $at, $at, $v0 -/* 804638 80243DB8 AC202A70 */ sw $zero, 0x2a70($at) -/* 80463C 80243DBC 08090F7B */ j .L80243DEC -/* 804640 80243DC0 00000000 */ nop -.L80243DC4: -/* 804644 80243DC4 3C038026 */ lui $v1, 0x8026 -/* 804648 80243DC8 24632A70 */ addiu $v1, $v1, 0x2a70 -/* 80464C 80243DCC 0060282D */ daddu $a1, $v1, $zero -.L80243DD0: -/* 804650 80243DD0 24820010 */ addiu $v0, $a0, 0x10 -/* 804654 80243DD4 AC620000 */ sw $v0, ($v1) -/* 804658 80243DD8 24630004 */ addiu $v1, $v1, 4 -/* 80465C 80243DDC 24840001 */ addiu $a0, $a0, 1 -/* 804660 80243DE0 28820070 */ slti $v0, $a0, 0x70 -/* 804664 80243DE4 1440FFFA */ bnez $v0, .L80243DD0 -/* 804668 80243DE8 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80243DEC: -/* 80466C 80243DEC 8FBF0010 */ lw $ra, 0x10($sp) -/* 804670 80243DF0 24020002 */ addiu $v0, $zero, 2 -/* 804674 80243DF4 03E00008 */ jr $ra -/* 804678 80243DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s new file mode 100644 index 0000000000..1797b6b9f8 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243D60_8045E0.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243D60_8045E0 +/* 8045E0 80243D60 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8045E4 80243D64 AFBF0010 */ sw $ra, 0x10($sp) +/* 8045E8 80243D68 8C82000C */ lw $v0, 0xc($a0) +/* 8045EC 80243D6C 0C0B1EAF */ jal get_variable +/* 8045F0 80243D70 8C450000 */ lw $a1, ($v0) +/* 8045F4 80243D74 0040182D */ daddu $v1, $v0, $zero +/* 8045F8 80243D78 10600012 */ beqz $v1, .L80243DC4 +/* 8045FC 80243D7C 0000202D */ daddu $a0, $zero, $zero +/* 804600 80243D80 8C620000 */ lw $v0, ($v1) +/* 804604 80243D84 5040000A */ beql $v0, $zero, .L80243DB0 +/* 804608 80243D88 00041080 */ sll $v0, $a0, 2 +/* 80460C 80243D8C 3C058026 */ lui $a1, 0x8026 +/* 804610 80243D90 24A52A70 */ addiu $a1, $a1, 0x2a70 +.L80243D94: +/* 804614 80243D94 24630004 */ addiu $v1, $v1, 4 +/* 804618 80243D98 24840001 */ addiu $a0, $a0, 1 +/* 80461C 80243D9C ACA20000 */ sw $v0, ($a1) +/* 804620 80243DA0 8C620000 */ lw $v0, ($v1) +/* 804624 80243DA4 1440FFFB */ bnez $v0, .L80243D94 +/* 804628 80243DA8 24A50004 */ addiu $a1, $a1, 4 +/* 80462C 80243DAC 00041080 */ sll $v0, $a0, 2 +.L80243DB0: +/* 804630 80243DB0 3C018026 */ lui $at, 0x8026 +/* 804634 80243DB4 00220821 */ addu $at, $at, $v0 +/* 804638 80243DB8 AC202A70 */ sw $zero, 0x2a70($at) +/* 80463C 80243DBC 08090F7B */ j .L80243DEC +/* 804640 80243DC0 00000000 */ nop +.L80243DC4: +/* 804644 80243DC4 3C038026 */ lui $v1, 0x8026 +/* 804648 80243DC8 24632A70 */ addiu $v1, $v1, 0x2a70 +/* 80464C 80243DCC 0060282D */ daddu $a1, $v1, $zero +.L80243DD0: +/* 804650 80243DD0 24820010 */ addiu $v0, $a0, 0x10 +/* 804654 80243DD4 AC620000 */ sw $v0, ($v1) +/* 804658 80243DD8 24630004 */ addiu $v1, $v1, 4 +/* 80465C 80243DDC 24840001 */ addiu $a0, $a0, 1 +/* 804660 80243DE0 28820070 */ slti $v0, $a0, 0x70 +/* 804664 80243DE4 1440FFFA */ bnez $v0, .L80243DD0 +/* 804668 80243DE8 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80243DEC: +/* 80466C 80243DEC 8FBF0010 */ lw $ra, 0x10($sp) +/* 804670 80243DF0 24020002 */ addiu $v0, $zero, 2 +/* 804674 80243DF4 03E00008 */ jr $ra +/* 804678 80243DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243DFC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243DFC.s deleted file mode 100644 index 815e846b69..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243DFC.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243DFC -/* 80467C 80243DFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 804680 80243E00 AFB10014 */ sw $s1, 0x14($sp) -/* 804684 80243E04 0080882D */ daddu $s1, $a0, $zero -/* 804688 80243E08 AFBF0018 */ sw $ra, 0x18($sp) -/* 80468C 80243E0C AFB00010 */ sw $s0, 0x10($sp) -/* 804690 80243E10 8E30000C */ lw $s0, 0xc($s1) -/* 804694 80243E14 8E050000 */ lw $a1, ($s0) -/* 804698 80243E18 0C0B1EAF */ jal get_variable -/* 80469C 80243E1C 26100004 */ addiu $s0, $s0, 4 -/* 8046A0 80243E20 AE22008C */ sw $v0, 0x8c($s1) -/* 8046A4 80243E24 8E050000 */ lw $a1, ($s0) -/* 8046A8 80243E28 26100004 */ addiu $s0, $s0, 4 -/* 8046AC 80243E2C 0C0B1EAF */ jal get_variable -/* 8046B0 80243E30 0220202D */ daddu $a0, $s1, $zero -/* 8046B4 80243E34 AE220090 */ sw $v0, 0x90($s1) -/* 8046B8 80243E38 8E050000 */ lw $a1, ($s0) -/* 8046BC 80243E3C 26100004 */ addiu $s0, $s0, 4 -/* 8046C0 80243E40 0C0B1EAF */ jal get_variable -/* 8046C4 80243E44 0220202D */ daddu $a0, $s1, $zero -/* 8046C8 80243E48 AE220094 */ sw $v0, 0x94($s1) -/* 8046CC 80243E4C 8E050000 */ lw $a1, ($s0) -/* 8046D0 80243E50 26100004 */ addiu $s0, $s0, 4 -/* 8046D4 80243E54 0C0B1EAF */ jal get_variable -/* 8046D8 80243E58 0220202D */ daddu $a0, $s1, $zero -/* 8046DC 80243E5C AE220098 */ sw $v0, 0x98($s1) -/* 8046E0 80243E60 8E050000 */ lw $a1, ($s0) -/* 8046E4 80243E64 26100004 */ addiu $s0, $s0, 4 -/* 8046E8 80243E68 0C0B1EAF */ jal get_variable -/* 8046EC 80243E6C 0220202D */ daddu $a0, $s1, $zero -/* 8046F0 80243E70 AE22009C */ sw $v0, 0x9c($s1) -/* 8046F4 80243E74 8E050000 */ lw $a1, ($s0) -/* 8046F8 80243E78 26100004 */ addiu $s0, $s0, 4 -/* 8046FC 80243E7C 0C0B1EAF */ jal get_variable -/* 804700 80243E80 0220202D */ daddu $a0, $s1, $zero -/* 804704 80243E84 AE2200A0 */ sw $v0, 0xa0($s1) -/* 804708 80243E88 8E050000 */ lw $a1, ($s0) -/* 80470C 80243E8C 26100004 */ addiu $s0, $s0, 4 -/* 804710 80243E90 0C0B1EAF */ jal get_variable -/* 804714 80243E94 0220202D */ daddu $a0, $s1, $zero -/* 804718 80243E98 AE2200A4 */ sw $v0, 0xa4($s1) -/* 80471C 80243E9C 8E050000 */ lw $a1, ($s0) -/* 804720 80243EA0 26100004 */ addiu $s0, $s0, 4 -/* 804724 80243EA4 0C0B1EAF */ jal get_variable -/* 804728 80243EA8 0220202D */ daddu $a0, $s1, $zero -/* 80472C 80243EAC AE2200A8 */ sw $v0, 0xa8($s1) -/* 804730 80243EB0 8E050000 */ lw $a1, ($s0) -/* 804734 80243EB4 26100004 */ addiu $s0, $s0, 4 -/* 804738 80243EB8 0C0B1EAF */ jal get_variable -/* 80473C 80243EBC 0220202D */ daddu $a0, $s1, $zero -/* 804740 80243EC0 AE2200AC */ sw $v0, 0xac($s1) -/* 804744 80243EC4 8E050000 */ lw $a1, ($s0) -/* 804748 80243EC8 0C0B1EAF */ jal get_variable -/* 80474C 80243ECC 0220202D */ daddu $a0, $s1, $zero -/* 804750 80243ED0 AE2200B0 */ sw $v0, 0xb0($s1) -/* 804754 80243ED4 8FBF0018 */ lw $ra, 0x18($sp) -/* 804758 80243ED8 8FB10014 */ lw $s1, 0x14($sp) -/* 80475C 80243EDC 8FB00010 */ lw $s0, 0x10($sp) -/* 804760 80243EE0 24020002 */ addiu $v0, $zero, 2 -/* 804764 80243EE4 03E00008 */ jr $ra -/* 804768 80243EE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243DFC_80467C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243DFC_80467C.s new file mode 100644 index 0000000000..029702e759 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243DFC_80467C.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243DFC_80467C +/* 80467C 80243DFC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 804680 80243E00 AFB10014 */ sw $s1, 0x14($sp) +/* 804684 80243E04 0080882D */ daddu $s1, $a0, $zero +/* 804688 80243E08 AFBF0018 */ sw $ra, 0x18($sp) +/* 80468C 80243E0C AFB00010 */ sw $s0, 0x10($sp) +/* 804690 80243E10 8E30000C */ lw $s0, 0xc($s1) +/* 804694 80243E14 8E050000 */ lw $a1, ($s0) +/* 804698 80243E18 0C0B1EAF */ jal get_variable +/* 80469C 80243E1C 26100004 */ addiu $s0, $s0, 4 +/* 8046A0 80243E20 AE22008C */ sw $v0, 0x8c($s1) +/* 8046A4 80243E24 8E050000 */ lw $a1, ($s0) +/* 8046A8 80243E28 26100004 */ addiu $s0, $s0, 4 +/* 8046AC 80243E2C 0C0B1EAF */ jal get_variable +/* 8046B0 80243E30 0220202D */ daddu $a0, $s1, $zero +/* 8046B4 80243E34 AE220090 */ sw $v0, 0x90($s1) +/* 8046B8 80243E38 8E050000 */ lw $a1, ($s0) +/* 8046BC 80243E3C 26100004 */ addiu $s0, $s0, 4 +/* 8046C0 80243E40 0C0B1EAF */ jal get_variable +/* 8046C4 80243E44 0220202D */ daddu $a0, $s1, $zero +/* 8046C8 80243E48 AE220094 */ sw $v0, 0x94($s1) +/* 8046CC 80243E4C 8E050000 */ lw $a1, ($s0) +/* 8046D0 80243E50 26100004 */ addiu $s0, $s0, 4 +/* 8046D4 80243E54 0C0B1EAF */ jal get_variable +/* 8046D8 80243E58 0220202D */ daddu $a0, $s1, $zero +/* 8046DC 80243E5C AE220098 */ sw $v0, 0x98($s1) +/* 8046E0 80243E60 8E050000 */ lw $a1, ($s0) +/* 8046E4 80243E64 26100004 */ addiu $s0, $s0, 4 +/* 8046E8 80243E68 0C0B1EAF */ jal get_variable +/* 8046EC 80243E6C 0220202D */ daddu $a0, $s1, $zero +/* 8046F0 80243E70 AE22009C */ sw $v0, 0x9c($s1) +/* 8046F4 80243E74 8E050000 */ lw $a1, ($s0) +/* 8046F8 80243E78 26100004 */ addiu $s0, $s0, 4 +/* 8046FC 80243E7C 0C0B1EAF */ jal get_variable +/* 804700 80243E80 0220202D */ daddu $a0, $s1, $zero +/* 804704 80243E84 AE2200A0 */ sw $v0, 0xa0($s1) +/* 804708 80243E88 8E050000 */ lw $a1, ($s0) +/* 80470C 80243E8C 26100004 */ addiu $s0, $s0, 4 +/* 804710 80243E90 0C0B1EAF */ jal get_variable +/* 804714 80243E94 0220202D */ daddu $a0, $s1, $zero +/* 804718 80243E98 AE2200A4 */ sw $v0, 0xa4($s1) +/* 80471C 80243E9C 8E050000 */ lw $a1, ($s0) +/* 804720 80243EA0 26100004 */ addiu $s0, $s0, 4 +/* 804724 80243EA4 0C0B1EAF */ jal get_variable +/* 804728 80243EA8 0220202D */ daddu $a0, $s1, $zero +/* 80472C 80243EAC AE2200A8 */ sw $v0, 0xa8($s1) +/* 804730 80243EB0 8E050000 */ lw $a1, ($s0) +/* 804734 80243EB4 26100004 */ addiu $s0, $s0, 4 +/* 804738 80243EB8 0C0B1EAF */ jal get_variable +/* 80473C 80243EBC 0220202D */ daddu $a0, $s1, $zero +/* 804740 80243EC0 AE2200AC */ sw $v0, 0xac($s1) +/* 804744 80243EC4 8E050000 */ lw $a1, ($s0) +/* 804748 80243EC8 0C0B1EAF */ jal get_variable +/* 80474C 80243ECC 0220202D */ daddu $a0, $s1, $zero +/* 804750 80243ED0 AE2200B0 */ sw $v0, 0xb0($s1) +/* 804754 80243ED4 8FBF0018 */ lw $ra, 0x18($sp) +/* 804758 80243ED8 8FB10014 */ lw $s1, 0x14($sp) +/* 80475C 80243EDC 8FB00010 */ lw $s0, 0x10($sp) +/* 804760 80243EE0 24020002 */ addiu $v0, $zero, 2 +/* 804764 80243EE4 03E00008 */ jr $ra +/* 804768 80243EE8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078.s deleted file mode 100644 index d9c5341c99..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244078 -/* 8048F8 80244078 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8048FC 8024407C AFB00010 */ sw $s0, 0x10($sp) -/* 804900 80244080 0080802D */ daddu $s0, $a0, $zero -/* 804904 80244084 AFBF0014 */ sw $ra, 0x14($sp) -/* 804908 80244088 0C00EABB */ jal get_npc_unsafe -/* 80490C 8024408C 8E04008C */ lw $a0, 0x8c($s0) -/* 804910 80244090 0040282D */ daddu $a1, $v0, $zero -/* 804914 80244094 8E040094 */ lw $a0, 0x94($s0) -/* 804918 80244098 8CA30028 */ lw $v1, 0x28($a1) -/* 80491C 8024409C ACA40028 */ sw $a0, 0x28($a1) -/* 804920 802440A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 804924 802440A4 8FB00010 */ lw $s0, 0x10($sp) -/* 804928 802440A8 24020002 */ addiu $v0, $zero, 2 -/* 80492C 802440AC 3C018026 */ lui $at, 0x8026 -/* 804930 802440B0 AC232C34 */ sw $v1, 0x2c34($at) -/* 804934 802440B4 03E00008 */ jr $ra -/* 804938 802440B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s new file mode 100644 index 0000000000..12f8207463 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244078_8048F8.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244078_8048F8 +/* 8048F8 80244078 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8048FC 8024407C AFB00010 */ sw $s0, 0x10($sp) +/* 804900 80244080 0080802D */ daddu $s0, $a0, $zero +/* 804904 80244084 AFBF0014 */ sw $ra, 0x14($sp) +/* 804908 80244088 0C00EABB */ jal get_npc_unsafe +/* 80490C 8024408C 8E04008C */ lw $a0, 0x8c($s0) +/* 804910 80244090 0040282D */ daddu $a1, $v0, $zero +/* 804914 80244094 8E040094 */ lw $a0, 0x94($s0) +/* 804918 80244098 8CA30028 */ lw $v1, 0x28($a1) +/* 80491C 8024409C ACA40028 */ sw $a0, 0x28($a1) +/* 804920 802440A0 8FBF0014 */ lw $ra, 0x14($sp) +/* 804924 802440A4 8FB00010 */ lw $s0, 0x10($sp) +/* 804928 802440A8 24020002 */ addiu $v0, $zero, 2 +/* 80492C 802440AC 3C018026 */ lui $at, 0x8026 +/* 804930 802440B0 AC232C34 */ sw $v1, 0x2c34($at) +/* 804934 802440B4 03E00008 */ jr $ra +/* 804938 802440B8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8.s deleted file mode 100644 index 9a188c5520..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802440E8 -/* 804968 802440E8 3C028011 */ lui $v0, 0x8011 -/* 80496C 802440EC 8442F29C */ lh $v0, -0xd64($v0) -/* 804970 802440F0 AC820084 */ sw $v0, 0x84($a0) -/* 804974 802440F4 03E00008 */ jr $ra -/* 804978 802440F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s new file mode 100644 index 0000000000..198bddddb5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802440E8_804968 +/* 804968 802440E8 3C028011 */ lui $v0, 0x8011 +/* 80496C 802440EC 8442F29C */ lh $v0, -0xd64($v0) +/* 804970 802440F0 AC820084 */ sw $v0, 0x84($a0) +/* 804974 802440F4 03E00008 */ jr $ra +/* 804978 802440F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440FC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440FC.s deleted file mode 100644 index 4da49bdab6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440FC.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802440FC -/* 80497C 802440FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 804980 80244100 AFB00018 */ sw $s0, 0x18($sp) -/* 804984 80244104 0080802D */ daddu $s0, $a0, $zero -/* 804988 80244108 10A00022 */ beqz $a1, .L80244194 -/* 80498C 8024410C AFBF001C */ sw $ra, 0x1c($sp) -/* 804990 80244110 0C046C04 */ jal get_model_list_index_from_tree_index -/* 804994 80244114 2404002B */ addiu $a0, $zero, 0x2b -/* 804998 80244118 0C046B4C */ jal get_model_from_list_index -/* 80499C 8024411C 0040202D */ daddu $a0, $v0, $zero -/* 8049A0 80244120 0040202D */ daddu $a0, $v0, $zero -/* 8049A4 80244124 2405FFFF */ addiu $a1, $zero, -1 -/* 8049A8 80244128 0C046F1F */ jal func_8011BC7C -/* 8049AC 8024412C 24060003 */ addiu $a2, $zero, 3 -/* 8049B0 80244130 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8049B4 80244134 2404002A */ addiu $a0, $zero, 0x2a -/* 8049B8 80244138 0C046B4C */ jal get_model_from_list_index -/* 8049BC 8024413C 0040202D */ daddu $a0, $v0, $zero -/* 8049C0 80244140 0040202D */ daddu $a0, $v0, $zero -/* 8049C4 80244144 2405FFFF */ addiu $a1, $zero, -1 -/* 8049C8 80244148 0C046F1F */ jal func_8011BC7C -/* 8049CC 8024414C 24060003 */ addiu $a2, $zero, 3 -/* 8049D0 80244150 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8049D4 80244154 24040029 */ addiu $a0, $zero, 0x29 -/* 8049D8 80244158 0C046B4C */ jal get_model_from_list_index -/* 8049DC 8024415C 0040202D */ daddu $a0, $v0, $zero -/* 8049E0 80244160 0040202D */ daddu $a0, $v0, $zero -/* 8049E4 80244164 2405FFFF */ addiu $a1, $zero, -1 -/* 8049E8 80244168 0C046F1F */ jal func_8011BC7C -/* 8049EC 8024416C 24060003 */ addiu $a2, $zero, 3 -/* 8049F0 80244170 240400FF */ addiu $a0, $zero, 0xff -/* 8049F4 80244174 0080282D */ daddu $a1, $a0, $zero -/* 8049F8 80244178 0080302D */ daddu $a2, $a0, $zero -/* 8049FC 8024417C 0000382D */ daddu $a3, $zero, $zero -/* 804A00 80244180 AFA00010 */ sw $zero, 0x10($sp) -/* 804A04 80244184 0C046FE6 */ jal func_8011BF98 -/* 804A08 80244188 AFA00014 */ sw $zero, 0x14($sp) -/* 804A0C 8024418C 240200FF */ addiu $v0, $zero, 0xff -/* 804A10 80244190 AE020070 */ sw $v0, 0x70($s0) -.L80244194: -/* 804A14 80244194 8E020070 */ lw $v0, 0x70($s0) -/* 804A18 80244198 2442FFFC */ addiu $v0, $v0, -4 -/* 804A1C 8024419C AE020070 */ sw $v0, 0x70($s0) -/* 804A20 802441A0 28420040 */ slti $v0, $v0, 0x40 -/* 804A24 802441A4 10400002 */ beqz $v0, .L802441B0 -/* 804A28 802441A8 24020040 */ addiu $v0, $zero, 0x40 -/* 804A2C 802441AC AE020070 */ sw $v0, 0x70($s0) -.L802441B0: -/* 804A30 802441B0 92040073 */ lbu $a0, 0x73($s0) -/* 804A34 802441B4 0000382D */ daddu $a3, $zero, $zero -/* 804A38 802441B8 AFA00010 */ sw $zero, 0x10($sp) -/* 804A3C 802441BC AFA00014 */ sw $zero, 0x14($sp) -/* 804A40 802441C0 0080282D */ daddu $a1, $a0, $zero -/* 804A44 802441C4 0C046FE6 */ jal func_8011BF98 -/* 804A48 802441C8 0080302D */ daddu $a2, $a0, $zero -/* 804A4C 802441CC 8E020070 */ lw $v0, 0x70($s0) -/* 804A50 802441D0 8FBF001C */ lw $ra, 0x1c($sp) -/* 804A54 802441D4 8FB00018 */ lw $s0, 0x18($sp) -/* 804A58 802441D8 38420040 */ xori $v0, $v0, 0x40 -/* 804A5C 802441DC 2C420001 */ sltiu $v0, $v0, 1 -/* 804A60 802441E0 00021040 */ sll $v0, $v0, 1 -/* 804A64 802441E4 03E00008 */ jr $ra -/* 804A68 802441E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440FC_80497C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440FC_80497C.s new file mode 100644 index 0000000000..185531a84f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440FC_80497C.s @@ -0,0 +1,66 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802440FC_80497C +/* 80497C 802440FC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 804980 80244100 AFB00018 */ sw $s0, 0x18($sp) +/* 804984 80244104 0080802D */ daddu $s0, $a0, $zero +/* 804988 80244108 10A00022 */ beqz $a1, .L80244194 +/* 80498C 8024410C AFBF001C */ sw $ra, 0x1c($sp) +/* 804990 80244110 0C046C04 */ jal get_model_list_index_from_tree_index +/* 804994 80244114 2404002B */ addiu $a0, $zero, 0x2b +/* 804998 80244118 0C046B4C */ jal get_model_from_list_index +/* 80499C 8024411C 0040202D */ daddu $a0, $v0, $zero +/* 8049A0 80244120 0040202D */ daddu $a0, $v0, $zero +/* 8049A4 80244124 2405FFFF */ addiu $a1, $zero, -1 +/* 8049A8 80244128 0C046F1F */ jal func_8011BC7C +/* 8049AC 8024412C 24060003 */ addiu $a2, $zero, 3 +/* 8049B0 80244130 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8049B4 80244134 2404002A */ addiu $a0, $zero, 0x2a +/* 8049B8 80244138 0C046B4C */ jal get_model_from_list_index +/* 8049BC 8024413C 0040202D */ daddu $a0, $v0, $zero +/* 8049C0 80244140 0040202D */ daddu $a0, $v0, $zero +/* 8049C4 80244144 2405FFFF */ addiu $a1, $zero, -1 +/* 8049C8 80244148 0C046F1F */ jal func_8011BC7C +/* 8049CC 8024414C 24060003 */ addiu $a2, $zero, 3 +/* 8049D0 80244150 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8049D4 80244154 24040029 */ addiu $a0, $zero, 0x29 +/* 8049D8 80244158 0C046B4C */ jal get_model_from_list_index +/* 8049DC 8024415C 0040202D */ daddu $a0, $v0, $zero +/* 8049E0 80244160 0040202D */ daddu $a0, $v0, $zero +/* 8049E4 80244164 2405FFFF */ addiu $a1, $zero, -1 +/* 8049E8 80244168 0C046F1F */ jal func_8011BC7C +/* 8049EC 8024416C 24060003 */ addiu $a2, $zero, 3 +/* 8049F0 80244170 240400FF */ addiu $a0, $zero, 0xff +/* 8049F4 80244174 0080282D */ daddu $a1, $a0, $zero +/* 8049F8 80244178 0080302D */ daddu $a2, $a0, $zero +/* 8049FC 8024417C 0000382D */ daddu $a3, $zero, $zero +/* 804A00 80244180 AFA00010 */ sw $zero, 0x10($sp) +/* 804A04 80244184 0C046FE6 */ jal func_8011BF98 +/* 804A08 80244188 AFA00014 */ sw $zero, 0x14($sp) +/* 804A0C 8024418C 240200FF */ addiu $v0, $zero, 0xff +/* 804A10 80244190 AE020070 */ sw $v0, 0x70($s0) +.L80244194: +/* 804A14 80244194 8E020070 */ lw $v0, 0x70($s0) +/* 804A18 80244198 2442FFFC */ addiu $v0, $v0, -4 +/* 804A1C 8024419C AE020070 */ sw $v0, 0x70($s0) +/* 804A20 802441A0 28420040 */ slti $v0, $v0, 0x40 +/* 804A24 802441A4 10400002 */ beqz $v0, .L802441B0 +/* 804A28 802441A8 24020040 */ addiu $v0, $zero, 0x40 +/* 804A2C 802441AC AE020070 */ sw $v0, 0x70($s0) +.L802441B0: +/* 804A30 802441B0 92040073 */ lbu $a0, 0x73($s0) +/* 804A34 802441B4 0000382D */ daddu $a3, $zero, $zero +/* 804A38 802441B8 AFA00010 */ sw $zero, 0x10($sp) +/* 804A3C 802441BC AFA00014 */ sw $zero, 0x14($sp) +/* 804A40 802441C0 0080282D */ daddu $a1, $a0, $zero +/* 804A44 802441C4 0C046FE6 */ jal func_8011BF98 +/* 804A48 802441C8 0080302D */ daddu $a2, $a0, $zero +/* 804A4C 802441CC 8E020070 */ lw $v0, 0x70($s0) +/* 804A50 802441D0 8FBF001C */ lw $ra, 0x1c($sp) +/* 804A54 802441D4 8FB00018 */ lw $s0, 0x18($sp) +/* 804A58 802441D8 38420040 */ xori $v0, $v0, 0x40 +/* 804A5C 802441DC 2C420001 */ sltiu $v0, $v0, 1 +/* 804A60 802441E0 00021040 */ sll $v0, $v0, 1 +/* 804A64 802441E4 03E00008 */ jr $ra +/* 804A68 802441E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC.s deleted file mode 100644 index 790aa1c8c0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802441EC -/* 804A6C 802441EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 804A70 802441F0 AFB00018 */ sw $s0, 0x18($sp) -/* 804A74 802441F4 0080802D */ daddu $s0, $a0, $zero -/* 804A78 802441F8 10A00005 */ beqz $a1, .L80244210 -/* 804A7C 802441FC AFBF001C */ sw $ra, 0x1c($sp) -/* 804A80 80244200 24020040 */ addiu $v0, $zero, 0x40 -/* 804A84 80244204 AE020070 */ sw $v0, 0x70($s0) -/* 804A88 80244208 AE020078 */ sw $v0, 0x78($s0) -/* 804A8C 8024420C AE000074 */ sw $zero, 0x74($s0) -.L80244210: -/* 804A90 80244210 8E020074 */ lw $v0, 0x74($s0) -/* 804A94 80244214 1440001A */ bnez $v0, .L80244280 -/* 804A98 80244218 00000000 */ nop -/* 804A9C 8024421C 8E020070 */ lw $v0, 0x70($s0) -/* 804AA0 80244220 24420004 */ addiu $v0, $v0, 4 -/* 804AA4 80244224 AE020070 */ sw $v0, 0x70($s0) -/* 804AA8 80244228 8E020078 */ lw $v0, 0x78($s0) -/* 804AAC 8024422C 8E030070 */ lw $v1, 0x70($s0) -/* 804AB0 80244230 24420004 */ addiu $v0, $v0, 4 -/* 804AB4 80244234 28630080 */ slti $v1, $v1, 0x80 -/* 804AB8 80244238 14600003 */ bnez $v1, .L80244248 -/* 804ABC 8024423C AE020078 */ sw $v0, 0x78($s0) -/* 804AC0 80244240 2402007F */ addiu $v0, $zero, 0x7f -/* 804AC4 80244244 AE020070 */ sw $v0, 0x70($s0) -.L80244248: -/* 804AC8 80244248 8E020078 */ lw $v0, 0x78($s0) -/* 804ACC 8024424C 28420080 */ slti $v0, $v0, 0x80 -/* 804AD0 80244250 14400002 */ bnez $v0, .L8024425C -/* 804AD4 80244254 2402007F */ addiu $v0, $zero, 0x7f -/* 804AD8 80244258 AE020078 */ sw $v0, 0x78($s0) -.L8024425C: -/* 804ADC 8024425C 8E030070 */ lw $v1, 0x70($s0) -/* 804AE0 80244260 2402007F */ addiu $v0, $zero, 0x7f -/* 804AE4 80244264 14620014 */ bne $v1, $v0, .L802442B8 -/* 804AE8 80244268 00000000 */ nop -/* 804AEC 8024426C 8E020078 */ lw $v0, 0x78($s0) -/* 804AF0 80244270 14430011 */ bne $v0, $v1, .L802442B8 -/* 804AF4 80244274 24020001 */ addiu $v0, $zero, 1 -/* 804AF8 80244278 080910AE */ j .L802442B8 -/* 804AFC 8024427C AE020074 */ sw $v0, 0x74($s0) -.L80244280: -/* 804B00 80244280 8E020070 */ lw $v0, 0x70($s0) -/* 804B04 80244284 2442FFFC */ addiu $v0, $v0, -4 -/* 804B08 80244288 AE020070 */ sw $v0, 0x70($s0) -/* 804B0C 8024428C 8E020078 */ lw $v0, 0x78($s0) -/* 804B10 80244290 8E030070 */ lw $v1, 0x70($s0) -/* 804B14 80244294 2442FFFC */ addiu $v0, $v0, -4 -/* 804B18 80244298 28630040 */ slti $v1, $v1, 0x40 -/* 804B1C 8024429C 10600003 */ beqz $v1, .L802442AC -/* 804B20 802442A0 AE020078 */ sw $v0, 0x78($s0) -/* 804B24 802442A4 24020040 */ addiu $v0, $zero, 0x40 -/* 804B28 802442A8 AE020070 */ sw $v0, 0x70($s0) -.L802442AC: -/* 804B2C 802442AC 8E020078 */ lw $v0, 0x78($s0) -/* 804B30 802442B0 04420001 */ bltzl $v0, .L802442B8 -/* 804B34 802442B4 AE000078 */ sw $zero, 0x78($s0) -.L802442B8: -/* 804B38 802442B8 92040073 */ lbu $a0, 0x73($s0) -/* 804B3C 802442BC 9207007B */ lbu $a3, 0x7b($s0) -/* 804B40 802442C0 0080282D */ daddu $a1, $a0, $zero -/* 804B44 802442C4 AFA70010 */ sw $a3, 0x10($sp) -/* 804B48 802442C8 9202007B */ lbu $v0, 0x7b($s0) -/* 804B4C 802442CC 0080302D */ daddu $a2, $a0, $zero -/* 804B50 802442D0 0C046FE6 */ jal func_8011BF98 -/* 804B54 802442D4 AFA20014 */ sw $v0, 0x14($sp) -/* 804B58 802442D8 8E030070 */ lw $v1, 0x70($s0) -/* 804B5C 802442DC 24020040 */ addiu $v0, $zero, 0x40 -/* 804B60 802442E0 14620005 */ bne $v1, $v0, .L802442F8 -/* 804B64 802442E4 0000102D */ daddu $v0, $zero, $zero -/* 804B68 802442E8 8E030078 */ lw $v1, 0x78($s0) -/* 804B6C 802442EC 10600002 */ beqz $v1, .L802442F8 -/* 804B70 802442F0 24020002 */ addiu $v0, $zero, 2 -/* 804B74 802442F4 0000102D */ daddu $v0, $zero, $zero -.L802442F8: -/* 804B78 802442F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 804B7C 802442FC 8FB00018 */ lw $s0, 0x18($sp) -/* 804B80 80244300 03E00008 */ jr $ra -/* 804B84 80244304 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC_804A6C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC_804A6C.s new file mode 100644 index 0000000000..0268adbf29 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802441EC_804A6C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802441EC_804A6C +/* 804A6C 802441EC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 804A70 802441F0 AFB00018 */ sw $s0, 0x18($sp) +/* 804A74 802441F4 0080802D */ daddu $s0, $a0, $zero +/* 804A78 802441F8 10A00005 */ beqz $a1, .L80244210 +/* 804A7C 802441FC AFBF001C */ sw $ra, 0x1c($sp) +/* 804A80 80244200 24020040 */ addiu $v0, $zero, 0x40 +/* 804A84 80244204 AE020070 */ sw $v0, 0x70($s0) +/* 804A88 80244208 AE020078 */ sw $v0, 0x78($s0) +/* 804A8C 8024420C AE000074 */ sw $zero, 0x74($s0) +.L80244210: +/* 804A90 80244210 8E020074 */ lw $v0, 0x74($s0) +/* 804A94 80244214 1440001A */ bnez $v0, .L80244280 +/* 804A98 80244218 00000000 */ nop +/* 804A9C 8024421C 8E020070 */ lw $v0, 0x70($s0) +/* 804AA0 80244220 24420004 */ addiu $v0, $v0, 4 +/* 804AA4 80244224 AE020070 */ sw $v0, 0x70($s0) +/* 804AA8 80244228 8E020078 */ lw $v0, 0x78($s0) +/* 804AAC 8024422C 8E030070 */ lw $v1, 0x70($s0) +/* 804AB0 80244230 24420004 */ addiu $v0, $v0, 4 +/* 804AB4 80244234 28630080 */ slti $v1, $v1, 0x80 +/* 804AB8 80244238 14600003 */ bnez $v1, .L80244248 +/* 804ABC 8024423C AE020078 */ sw $v0, 0x78($s0) +/* 804AC0 80244240 2402007F */ addiu $v0, $zero, 0x7f +/* 804AC4 80244244 AE020070 */ sw $v0, 0x70($s0) +.L80244248: +/* 804AC8 80244248 8E020078 */ lw $v0, 0x78($s0) +/* 804ACC 8024424C 28420080 */ slti $v0, $v0, 0x80 +/* 804AD0 80244250 14400002 */ bnez $v0, .L8024425C +/* 804AD4 80244254 2402007F */ addiu $v0, $zero, 0x7f +/* 804AD8 80244258 AE020078 */ sw $v0, 0x78($s0) +.L8024425C: +/* 804ADC 8024425C 8E030070 */ lw $v1, 0x70($s0) +/* 804AE0 80244260 2402007F */ addiu $v0, $zero, 0x7f +/* 804AE4 80244264 14620014 */ bne $v1, $v0, .L802442B8 +/* 804AE8 80244268 00000000 */ nop +/* 804AEC 8024426C 8E020078 */ lw $v0, 0x78($s0) +/* 804AF0 80244270 14430011 */ bne $v0, $v1, .L802442B8 +/* 804AF4 80244274 24020001 */ addiu $v0, $zero, 1 +/* 804AF8 80244278 080910AE */ j .L802442B8 +/* 804AFC 8024427C AE020074 */ sw $v0, 0x74($s0) +.L80244280: +/* 804B00 80244280 8E020070 */ lw $v0, 0x70($s0) +/* 804B04 80244284 2442FFFC */ addiu $v0, $v0, -4 +/* 804B08 80244288 AE020070 */ sw $v0, 0x70($s0) +/* 804B0C 8024428C 8E020078 */ lw $v0, 0x78($s0) +/* 804B10 80244290 8E030070 */ lw $v1, 0x70($s0) +/* 804B14 80244294 2442FFFC */ addiu $v0, $v0, -4 +/* 804B18 80244298 28630040 */ slti $v1, $v1, 0x40 +/* 804B1C 8024429C 10600003 */ beqz $v1, .L802442AC +/* 804B20 802442A0 AE020078 */ sw $v0, 0x78($s0) +/* 804B24 802442A4 24020040 */ addiu $v0, $zero, 0x40 +/* 804B28 802442A8 AE020070 */ sw $v0, 0x70($s0) +.L802442AC: +/* 804B2C 802442AC 8E020078 */ lw $v0, 0x78($s0) +/* 804B30 802442B0 04420001 */ bltzl $v0, .L802442B8 +/* 804B34 802442B4 AE000078 */ sw $zero, 0x78($s0) +.L802442B8: +/* 804B38 802442B8 92040073 */ lbu $a0, 0x73($s0) +/* 804B3C 802442BC 9207007B */ lbu $a3, 0x7b($s0) +/* 804B40 802442C0 0080282D */ daddu $a1, $a0, $zero +/* 804B44 802442C4 AFA70010 */ sw $a3, 0x10($sp) +/* 804B48 802442C8 9202007B */ lbu $v0, 0x7b($s0) +/* 804B4C 802442CC 0080302D */ daddu $a2, $a0, $zero +/* 804B50 802442D0 0C046FE6 */ jal func_8011BF98 +/* 804B54 802442D4 AFA20014 */ sw $v0, 0x14($sp) +/* 804B58 802442D8 8E030070 */ lw $v1, 0x70($s0) +/* 804B5C 802442DC 24020040 */ addiu $v0, $zero, 0x40 +/* 804B60 802442E0 14620005 */ bne $v1, $v0, .L802442F8 +/* 804B64 802442E4 0000102D */ daddu $v0, $zero, $zero +/* 804B68 802442E8 8E030078 */ lw $v1, 0x78($s0) +/* 804B6C 802442EC 10600002 */ beqz $v1, .L802442F8 +/* 804B70 802442F0 24020002 */ addiu $v0, $zero, 2 +/* 804B74 802442F4 0000102D */ daddu $v0, $zero, $zero +.L802442F8: +/* 804B78 802442F8 8FBF001C */ lw $ra, 0x1c($sp) +/* 804B7C 802442FC 8FB00018 */ lw $s0, 0x18($sp) +/* 804B80 80244300 03E00008 */ jr $ra +/* 804B84 80244304 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244308.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244308.s deleted file mode 100644 index 57320f48be..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244308.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244308 -/* 804B88 80244308 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 804B8C 8024430C AFB00018 */ sw $s0, 0x18($sp) -/* 804B90 80244310 0080802D */ daddu $s0, $a0, $zero -/* 804B94 80244314 10A00003 */ beqz $a1, .L80244324 -/* 804B98 80244318 AFBF001C */ sw $ra, 0x1c($sp) -/* 804B9C 8024431C 24020040 */ addiu $v0, $zero, 0x40 -/* 804BA0 80244320 AE020070 */ sw $v0, 0x70($s0) -.L80244324: -/* 804BA4 80244324 8E020070 */ lw $v0, 0x70($s0) -/* 804BA8 80244328 24420004 */ addiu $v0, $v0, 4 -/* 804BAC 8024432C AE020070 */ sw $v0, 0x70($s0) -/* 804BB0 80244330 28420100 */ slti $v0, $v0, 0x100 -/* 804BB4 80244334 14400002 */ bnez $v0, .L80244340 -/* 804BB8 80244338 240200FF */ addiu $v0, $zero, 0xff -/* 804BBC 8024433C AE020070 */ sw $v0, 0x70($s0) -.L80244340: -/* 804BC0 80244340 92040073 */ lbu $a0, 0x73($s0) -/* 804BC4 80244344 0000382D */ daddu $a3, $zero, $zero -/* 804BC8 80244348 AFA00010 */ sw $zero, 0x10($sp) -/* 804BCC 8024434C AFA00014 */ sw $zero, 0x14($sp) -/* 804BD0 80244350 0080282D */ daddu $a1, $a0, $zero -/* 804BD4 80244354 0C046FE6 */ jal func_8011BF98 -/* 804BD8 80244358 0080302D */ daddu $a2, $a0, $zero -/* 804BDC 8024435C 8E030070 */ lw $v1, 0x70($s0) -/* 804BE0 80244360 240200FF */ addiu $v0, $zero, 0xff -/* 804BE4 80244364 1462001A */ bne $v1, $v0, .L802443D0 -/* 804BE8 80244368 0000102D */ daddu $v0, $zero, $zero -/* 804BEC 8024436C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 804BF0 80244370 2404002B */ addiu $a0, $zero, 0x2b -/* 804BF4 80244374 0C046B4C */ jal get_model_from_list_index -/* 804BF8 80244378 0040202D */ daddu $a0, $v0, $zero -/* 804BFC 8024437C 0040202D */ daddu $a0, $v0, $zero -/* 804C00 80244380 2405FFFF */ addiu $a1, $zero, -1 -/* 804C04 80244384 0C046F1F */ jal func_8011BC7C -/* 804C08 80244388 0000302D */ daddu $a2, $zero, $zero -/* 804C0C 8024438C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 804C10 80244390 2404002A */ addiu $a0, $zero, 0x2a -/* 804C14 80244394 0C046B4C */ jal get_model_from_list_index -/* 804C18 80244398 0040202D */ daddu $a0, $v0, $zero -/* 804C1C 8024439C 0040202D */ daddu $a0, $v0, $zero -/* 804C20 802443A0 2405FFFF */ addiu $a1, $zero, -1 -/* 804C24 802443A4 0C046F1F */ jal func_8011BC7C -/* 804C28 802443A8 0000302D */ daddu $a2, $zero, $zero -/* 804C2C 802443AC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 804C30 802443B0 24040029 */ addiu $a0, $zero, 0x29 -/* 804C34 802443B4 0C046B4C */ jal get_model_from_list_index -/* 804C38 802443B8 0040202D */ daddu $a0, $v0, $zero -/* 804C3C 802443BC 0040202D */ daddu $a0, $v0, $zero -/* 804C40 802443C0 2405FFFF */ addiu $a1, $zero, -1 -/* 804C44 802443C4 0C046F1F */ jal func_8011BC7C -/* 804C48 802443C8 0000302D */ daddu $a2, $zero, $zero -/* 804C4C 802443CC 24020002 */ addiu $v0, $zero, 2 -.L802443D0: -/* 804C50 802443D0 8FBF001C */ lw $ra, 0x1c($sp) -/* 804C54 802443D4 8FB00018 */ lw $s0, 0x18($sp) -/* 804C58 802443D8 03E00008 */ jr $ra -/* 804C5C 802443DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244308_804B88.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244308_804B88.s new file mode 100644 index 0000000000..4483459bc4 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244308_804B88.s @@ -0,0 +1,61 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244308_804B88 +/* 804B88 80244308 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 804B8C 8024430C AFB00018 */ sw $s0, 0x18($sp) +/* 804B90 80244310 0080802D */ daddu $s0, $a0, $zero +/* 804B94 80244314 10A00003 */ beqz $a1, .L80244324 +/* 804B98 80244318 AFBF001C */ sw $ra, 0x1c($sp) +/* 804B9C 8024431C 24020040 */ addiu $v0, $zero, 0x40 +/* 804BA0 80244320 AE020070 */ sw $v0, 0x70($s0) +.L80244324: +/* 804BA4 80244324 8E020070 */ lw $v0, 0x70($s0) +/* 804BA8 80244328 24420004 */ addiu $v0, $v0, 4 +/* 804BAC 8024432C AE020070 */ sw $v0, 0x70($s0) +/* 804BB0 80244330 28420100 */ slti $v0, $v0, 0x100 +/* 804BB4 80244334 14400002 */ bnez $v0, .L80244340 +/* 804BB8 80244338 240200FF */ addiu $v0, $zero, 0xff +/* 804BBC 8024433C AE020070 */ sw $v0, 0x70($s0) +.L80244340: +/* 804BC0 80244340 92040073 */ lbu $a0, 0x73($s0) +/* 804BC4 80244344 0000382D */ daddu $a3, $zero, $zero +/* 804BC8 80244348 AFA00010 */ sw $zero, 0x10($sp) +/* 804BCC 8024434C AFA00014 */ sw $zero, 0x14($sp) +/* 804BD0 80244350 0080282D */ daddu $a1, $a0, $zero +/* 804BD4 80244354 0C046FE6 */ jal func_8011BF98 +/* 804BD8 80244358 0080302D */ daddu $a2, $a0, $zero +/* 804BDC 8024435C 8E030070 */ lw $v1, 0x70($s0) +/* 804BE0 80244360 240200FF */ addiu $v0, $zero, 0xff +/* 804BE4 80244364 1462001A */ bne $v1, $v0, .L802443D0 +/* 804BE8 80244368 0000102D */ daddu $v0, $zero, $zero +/* 804BEC 8024436C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 804BF0 80244370 2404002B */ addiu $a0, $zero, 0x2b +/* 804BF4 80244374 0C046B4C */ jal get_model_from_list_index +/* 804BF8 80244378 0040202D */ daddu $a0, $v0, $zero +/* 804BFC 8024437C 0040202D */ daddu $a0, $v0, $zero +/* 804C00 80244380 2405FFFF */ addiu $a1, $zero, -1 +/* 804C04 80244384 0C046F1F */ jal func_8011BC7C +/* 804C08 80244388 0000302D */ daddu $a2, $zero, $zero +/* 804C0C 8024438C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 804C10 80244390 2404002A */ addiu $a0, $zero, 0x2a +/* 804C14 80244394 0C046B4C */ jal get_model_from_list_index +/* 804C18 80244398 0040202D */ daddu $a0, $v0, $zero +/* 804C1C 8024439C 0040202D */ daddu $a0, $v0, $zero +/* 804C20 802443A0 2405FFFF */ addiu $a1, $zero, -1 +/* 804C24 802443A4 0C046F1F */ jal func_8011BC7C +/* 804C28 802443A8 0000302D */ daddu $a2, $zero, $zero +/* 804C2C 802443AC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 804C30 802443B0 24040029 */ addiu $a0, $zero, 0x29 +/* 804C34 802443B4 0C046B4C */ jal get_model_from_list_index +/* 804C38 802443B8 0040202D */ daddu $a0, $v0, $zero +/* 804C3C 802443BC 0040202D */ daddu $a0, $v0, $zero +/* 804C40 802443C0 2405FFFF */ addiu $a1, $zero, -1 +/* 804C44 802443C4 0C046F1F */ jal func_8011BC7C +/* 804C48 802443C8 0000302D */ daddu $a2, $zero, $zero +/* 804C4C 802443CC 24020002 */ addiu $v0, $zero, 2 +.L802443D0: +/* 804C50 802443D0 8FBF001C */ lw $ra, 0x1c($sp) +/* 804C54 802443D4 8FB00018 */ lw $s0, 0x18($sp) +/* 804C58 802443D8 03E00008 */ jr $ra +/* 804C5C 802443DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0.s deleted file mode 100644 index 0960662630..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0.s +++ /dev/null @@ -1,189 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802443E0 -/* 804C60 802443E0 27BDFF08 */ addiu $sp, $sp, -0xf8 -/* 804C64 802443E4 AFB300B4 */ sw $s3, 0xb4($sp) -/* 804C68 802443E8 AFBF00C0 */ sw $ra, 0xc0($sp) -/* 804C6C 802443EC AFB500BC */ sw $s5, 0xbc($sp) -/* 804C70 802443F0 AFB400B8 */ sw $s4, 0xb8($sp) -/* 804C74 802443F4 AFB200B0 */ sw $s2, 0xb0($sp) -/* 804C78 802443F8 AFB100AC */ sw $s1, 0xac($sp) -/* 804C7C 802443FC AFB000A8 */ sw $s0, 0xa8($sp) -/* 804C80 80244400 F7BE00F0 */ sdc1 $f30, 0xf0($sp) -/* 804C84 80244404 F7BC00E8 */ sdc1 $f28, 0xe8($sp) -/* 804C88 80244408 F7BA00E0 */ sdc1 $f26, 0xe0($sp) -/* 804C8C 8024440C F7B800D8 */ sdc1 $f24, 0xd8($sp) -/* 804C90 80244410 F7B600D0 */ sdc1 $f22, 0xd0($sp) -/* 804C94 80244414 F7B400C8 */ sdc1 $f20, 0xc8($sp) -/* 804C98 80244418 10A00011 */ beqz $a1, .L80244460 -/* 804C9C 8024441C 0080982D */ daddu $s3, $a0, $zero -/* 804CA0 80244420 3C05F4AC */ lui $a1, 0xf4ac -/* 804CA4 80244424 34A5D483 */ ori $a1, $a1, 0xd483 -/* 804CA8 80244428 240200B4 */ addiu $v0, $zero, 0xb4 -/* 804CAC 8024442C 0C0B1EAF */ jal get_variable -/* 804CB0 80244430 AE620070 */ sw $v0, 0x70($s3) -/* 804CB4 80244434 0260202D */ daddu $a0, $s3, $zero -/* 804CB8 80244438 3C05F4AC */ lui $a1, 0xf4ac -/* 804CBC 8024443C 34A5D484 */ ori $a1, $a1, 0xd484 -/* 804CC0 80244440 0C0B1EAF */ jal get_variable -/* 804CC4 80244444 AE620074 */ sw $v0, 0x74($s3) -/* 804CC8 80244448 0260202D */ daddu $a0, $s3, $zero -/* 804CCC 8024444C 3C05F4AC */ lui $a1, 0xf4ac -/* 804CD0 80244450 34A5D485 */ ori $a1, $a1, 0xd485 -/* 804CD4 80244454 0C0B1EAF */ jal get_variable -/* 804CD8 80244458 AE620078 */ sw $v0, 0x78($s3) -/* 804CDC 8024445C AE62007C */ sw $v0, 0x7c($s3) -.L80244460: -/* 804CE0 80244460 0000882D */ daddu $s1, $zero, $zero -/* 804CE4 80244464 8E620074 */ lw $v0, 0x74($s3) -/* 804CE8 80244468 3C014120 */ lui $at, 0x4120 -/* 804CEC 8024446C 4481A000 */ mtc1 $at, $f20 -/* 804CF0 80244470 27B00028 */ addiu $s0, $sp, 0x28 -/* 804CF4 80244474 AFA20018 */ sw $v0, 0x18($sp) -/* 804CF8 80244478 8E620078 */ lw $v0, 0x78($s3) -/* 804CFC 8024447C 3C15800B */ lui $s5, %hi(gCameras) -/* 804D00 80244480 26B51D80 */ addiu $s5, $s5, %lo(gCameras) -/* 804D04 80244484 AFA2001C */ sw $v0, 0x1c($sp) -/* 804D08 80244488 8E62007C */ lw $v0, 0x7c($s3) -/* 804D0C 8024448C AFA20020 */ sw $v0, 0x20($sp) -/* 804D10 80244490 C66C0070 */ lwc1 $f12, 0x70($s3) -/* 804D14 80244494 46806320 */ cvt.s.w $f12, $f12 -/* 804D18 80244498 0C00A8BB */ jal sin_deg -/* 804D1C 8024449C 27B20068 */ addiu $s2, $sp, 0x68 -/* 804D20 802444A0 46140002 */ mul.s $f0, $f0, $f20 -/* 804D24 802444A4 00000000 */ nop -/* 804D28 802444A8 0220A02D */ daddu $s4, $s1, $zero -/* 804D2C 802444AC C66C0070 */ lwc1 $f12, 0x70($s3) -/* 804D30 802444B0 46806320 */ cvt.s.w $f12, $f12 -/* 804D34 802444B4 4480B000 */ mtc1 $zero, $f22 -/* 804D38 802444B8 3C013F80 */ lui $at, 0x3f80 -/* 804D3C 802444BC 4481D000 */ mtc1 $at, $f26 -/* 804D40 802444C0 0C00A8BB */ jal sin_deg -/* 804D44 802444C4 46140780 */ add.s $f30, $f0, $f20 -/* 804D48 802444C8 3C0141C8 */ lui $at, 0x41c8 -/* 804D4C 802444CC 44811000 */ mtc1 $at, $f2 -/* 804D50 802444D0 8E630070 */ lw $v1, 0x70($s3) -/* 804D54 802444D4 46020002 */ mul.s $f0, $f0, $f2 -/* 804D58 802444D8 00000000 */ nop -/* 804D5C 802444DC 00031080 */ sll $v0, $v1, 2 -/* 804D60 802444E0 00431021 */ addu $v0, $v0, $v1 -/* 804D64 802444E4 00021040 */ sll $v0, $v0, 1 -/* 804D68 802444E8 4482C000 */ mtc1 $v0, $f24 -/* 804D6C 802444EC 00000000 */ nop -/* 804D70 802444F0 4680C620 */ cvt.s.w $f24, $f24 -/* 804D74 802444F4 46140700 */ add.s $f28, $f0, $f20 -.L802444F8: -/* 804D78 802444F8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 804D7C 802444FC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 804D80 80244500 4406B000 */ mfc1 $a2, $f22 -/* 804D84 80244504 00031080 */ sll $v0, $v1, 2 -/* 804D88 80244508 00431021 */ addu $v0, $v0, $v1 -/* 804D8C 8024450C 00021080 */ sll $v0, $v0, 2 -/* 804D90 80244510 00431023 */ subu $v0, $v0, $v1 -/* 804D94 80244514 000218C0 */ sll $v1, $v0, 3 -/* 804D98 80244518 00431021 */ addu $v0, $v0, $v1 -/* 804D9C 8024451C 000210C0 */ sll $v0, $v0, 3 -/* 804DA0 80244520 00551021 */ addu $v0, $v0, $s5 -/* 804DA4 80244524 C440006C */ lwc1 $f0, 0x6c($v0) -/* 804DA8 80244528 4407D000 */ mfc1 $a3, $f26 -/* 804DAC 8024452C 46000007 */ neg.s $f0, $f0 -/* 804DB0 80244530 44050000 */ mfc1 $a1, $f0 -/* 804DB4 80244534 0200202D */ daddu $a0, $s0, $zero -/* 804DB8 80244538 0C019EC8 */ jal guRotateF -/* 804DBC 8024453C E7B60010 */ swc1 $f22, 0x10($sp) -/* 804DC0 80244540 44942000 */ mtc1 $s4, $f4 -/* 804DC4 80244544 00000000 */ nop -/* 804DC8 80244548 46802120 */ cvt.s.w $f4, $f4 -/* 804DCC 8024454C 4406B000 */ mfc1 $a2, $f22 -/* 804DD0 80244550 4407B000 */ mfc1 $a3, $f22 -/* 804DD4 80244554 44052000 */ mfc1 $a1, $f4 -/* 804DD8 80244558 0240202D */ daddu $a0, $s2, $zero -/* 804DDC 8024455C 0C019EC8 */ jal guRotateF -/* 804DE0 80244560 E7BA0010 */ swc1 $f26, 0x10($sp) -/* 804DE4 80244564 0240202D */ daddu $a0, $s2, $zero -/* 804DE8 80244568 0200282D */ daddu $a1, $s0, $zero -/* 804DEC 8024456C 0C019D80 */ jal guMtxCatF -/* 804DF0 80244570 0200302D */ daddu $a2, $s0, $zero -/* 804DF4 80244574 0C00A8BB */ jal sin_deg -/* 804DF8 80244578 4600C306 */ mov.s $f12, $f24 -/* 804DFC 8024457C 4600F502 */ mul.s $f20, $f30, $f0 -/* 804E00 80244580 00000000 */ nop -/* 804E04 80244584 0C00A8D4 */ jal cos_deg -/* 804E08 80244588 4600C306 */ mov.s $f12, $f24 -/* 804E0C 8024458C 4600E002 */ mul.s $f0, $f28, $f0 -/* 804E10 80244590 00000000 */ nop -/* 804E14 80244594 4407B000 */ mfc1 $a3, $f22 -/* 804E18 80244598 44060000 */ mfc1 $a2, $f0 -/* 804E1C 8024459C 4405A000 */ mfc1 $a1, $f20 -/* 804E20 802445A0 0C019E40 */ jal guTranslateF -/* 804E24 802445A4 0240202D */ daddu $a0, $s2, $zero -/* 804E28 802445A8 0240202D */ daddu $a0, $s2, $zero -/* 804E2C 802445AC 0200282D */ daddu $a1, $s0, $zero -/* 804E30 802445B0 0C019D80 */ jal guMtxCatF -/* 804E34 802445B4 0200302D */ daddu $a2, $s0, $zero -/* 804E38 802445B8 00111880 */ sll $v1, $s1, 2 -/* 804E3C 802445BC 27A40018 */ addiu $a0, $sp, 0x18 -/* 804E40 802445C0 00831821 */ addu $v1, $a0, $v1 -/* 804E44 802445C4 8C620000 */ lw $v0, ($v1) -/* 804E48 802445C8 C7A00058 */ lwc1 $f0, 0x58($sp) -/* 804E4C 802445CC 8C42000C */ lw $v0, 0xc($v0) -/* 804E50 802445D0 E4400010 */ swc1 $f0, 0x10($v0) -/* 804E54 802445D4 8C620000 */ lw $v0, ($v1) -/* 804E58 802445D8 C7A0005C */ lwc1 $f0, 0x5c($sp) -/* 804E5C 802445DC 8C42000C */ lw $v0, 0xc($v0) -/* 804E60 802445E0 E4400014 */ swc1 $f0, 0x14($v0) -/* 804E64 802445E4 8C620000 */ lw $v0, ($v1) -/* 804E68 802445E8 C7A00060 */ lwc1 $f0, 0x60($sp) -/* 804E6C 802445EC 8C42000C */ lw $v0, 0xc($v0) -/* 804E70 802445F0 26310001 */ addiu $s1, $s1, 1 -/* 804E74 802445F4 E4400018 */ swc1 $f0, 0x18($v0) -/* 804E78 802445F8 2A220003 */ slti $v0, $s1, 3 -/* 804E7C 802445FC 1440FFBE */ bnez $v0, .L802444F8 -/* 804E80 80244600 26940078 */ addiu $s4, $s4, 0x78 -/* 804E84 80244604 8E620070 */ lw $v0, 0x70($s3) -/* 804E88 80244608 2442FFFF */ addiu $v0, $v0, -1 -/* 804E8C 8024460C AE620070 */ sw $v0, 0x70($s3) -/* 804E90 80244610 28420010 */ slti $v0, $v0, 0x10 -/* 804E94 80244614 1040000A */ beqz $v0, .L80244640 -/* 804E98 80244618 00000000 */ nop -/* 804E9C 8024461C 0000882D */ daddu $s1, $zero, $zero -.L80244620: -/* 804EA0 80244620 8C820000 */ lw $v0, ($a0) -/* 804EA4 80244624 8C43000C */ lw $v1, 0xc($v0) -/* 804EA8 80244628 8E620070 */ lw $v0, 0x70($s3) -/* 804EAC 8024462C 26310001 */ addiu $s1, $s1, 1 -/* 804EB0 80244630 AC62004C */ sw $v0, 0x4c($v1) -/* 804EB4 80244634 2A220003 */ slti $v0, $s1, 3 -/* 804EB8 80244638 1440FFF9 */ bnez $v0, .L80244620 -/* 804EBC 8024463C 24840004 */ addiu $a0, $a0, 4 -.L80244640: -/* 804EC0 80244640 8E620070 */ lw $v0, 0x70($s3) -/* 804EC4 80244644 0441000A */ bgez $v0, .L80244670 -/* 804EC8 80244648 0000102D */ daddu $v0, $zero, $zero -/* 804ECC 8024464C 0000882D */ daddu $s1, $zero, $zero -/* 804ED0 80244650 27B00018 */ addiu $s0, $sp, 0x18 -.L80244654: -/* 804ED4 80244654 8E040000 */ lw $a0, ($s0) -/* 804ED8 80244658 26100004 */ addiu $s0, $s0, 4 -/* 804EDC 8024465C 0C016914 */ jal remove_effect -/* 804EE0 80244660 26310001 */ addiu $s1, $s1, 1 -/* 804EE4 80244664 2A220003 */ slti $v0, $s1, 3 -/* 804EE8 80244668 1440FFFA */ bnez $v0, .L80244654 -/* 804EEC 8024466C 24020002 */ addiu $v0, $zero, 2 -.L80244670: -/* 804EF0 80244670 8FBF00C0 */ lw $ra, 0xc0($sp) -/* 804EF4 80244674 8FB500BC */ lw $s5, 0xbc($sp) -/* 804EF8 80244678 8FB400B8 */ lw $s4, 0xb8($sp) -/* 804EFC 8024467C 8FB300B4 */ lw $s3, 0xb4($sp) -/* 804F00 80244680 8FB200B0 */ lw $s2, 0xb0($sp) -/* 804F04 80244684 8FB100AC */ lw $s1, 0xac($sp) -/* 804F08 80244688 8FB000A8 */ lw $s0, 0xa8($sp) -/* 804F0C 8024468C D7BE00F0 */ ldc1 $f30, 0xf0($sp) -/* 804F10 80244690 D7BC00E8 */ ldc1 $f28, 0xe8($sp) -/* 804F14 80244694 D7BA00E0 */ ldc1 $f26, 0xe0($sp) -/* 804F18 80244698 D7B800D8 */ ldc1 $f24, 0xd8($sp) -/* 804F1C 8024469C D7B600D0 */ ldc1 $f22, 0xd0($sp) -/* 804F20 802446A0 D7B400C8 */ ldc1 $f20, 0xc8($sp) -/* 804F24 802446A4 03E00008 */ jr $ra -/* 804F28 802446A8 27BD00F8 */ addiu $sp, $sp, 0xf8 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s new file mode 100644 index 0000000000..2649ea7cd5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802443E0_804C60.s @@ -0,0 +1,189 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802443E0_804C60 +/* 804C60 802443E0 27BDFF08 */ addiu $sp, $sp, -0xf8 +/* 804C64 802443E4 AFB300B4 */ sw $s3, 0xb4($sp) +/* 804C68 802443E8 AFBF00C0 */ sw $ra, 0xc0($sp) +/* 804C6C 802443EC AFB500BC */ sw $s5, 0xbc($sp) +/* 804C70 802443F0 AFB400B8 */ sw $s4, 0xb8($sp) +/* 804C74 802443F4 AFB200B0 */ sw $s2, 0xb0($sp) +/* 804C78 802443F8 AFB100AC */ sw $s1, 0xac($sp) +/* 804C7C 802443FC AFB000A8 */ sw $s0, 0xa8($sp) +/* 804C80 80244400 F7BE00F0 */ sdc1 $f30, 0xf0($sp) +/* 804C84 80244404 F7BC00E8 */ sdc1 $f28, 0xe8($sp) +/* 804C88 80244408 F7BA00E0 */ sdc1 $f26, 0xe0($sp) +/* 804C8C 8024440C F7B800D8 */ sdc1 $f24, 0xd8($sp) +/* 804C90 80244410 F7B600D0 */ sdc1 $f22, 0xd0($sp) +/* 804C94 80244414 F7B400C8 */ sdc1 $f20, 0xc8($sp) +/* 804C98 80244418 10A00011 */ beqz $a1, .L80244460 +/* 804C9C 8024441C 0080982D */ daddu $s3, $a0, $zero +/* 804CA0 80244420 3C05F4AC */ lui $a1, 0xf4ac +/* 804CA4 80244424 34A5D483 */ ori $a1, $a1, 0xd483 +/* 804CA8 80244428 240200B4 */ addiu $v0, $zero, 0xb4 +/* 804CAC 8024442C 0C0B1EAF */ jal get_variable +/* 804CB0 80244430 AE620070 */ sw $v0, 0x70($s3) +/* 804CB4 80244434 0260202D */ daddu $a0, $s3, $zero +/* 804CB8 80244438 3C05F4AC */ lui $a1, 0xf4ac +/* 804CBC 8024443C 34A5D484 */ ori $a1, $a1, 0xd484 +/* 804CC0 80244440 0C0B1EAF */ jal get_variable +/* 804CC4 80244444 AE620074 */ sw $v0, 0x74($s3) +/* 804CC8 80244448 0260202D */ daddu $a0, $s3, $zero +/* 804CCC 8024444C 3C05F4AC */ lui $a1, 0xf4ac +/* 804CD0 80244450 34A5D485 */ ori $a1, $a1, 0xd485 +/* 804CD4 80244454 0C0B1EAF */ jal get_variable +/* 804CD8 80244458 AE620078 */ sw $v0, 0x78($s3) +/* 804CDC 8024445C AE62007C */ sw $v0, 0x7c($s3) +.L80244460: +/* 804CE0 80244460 0000882D */ daddu $s1, $zero, $zero +/* 804CE4 80244464 8E620074 */ lw $v0, 0x74($s3) +/* 804CE8 80244468 3C014120 */ lui $at, 0x4120 +/* 804CEC 8024446C 4481A000 */ mtc1 $at, $f20 +/* 804CF0 80244470 27B00028 */ addiu $s0, $sp, 0x28 +/* 804CF4 80244474 AFA20018 */ sw $v0, 0x18($sp) +/* 804CF8 80244478 8E620078 */ lw $v0, 0x78($s3) +/* 804CFC 8024447C 3C15800B */ lui $s5, %hi(gCameras) +/* 804D00 80244480 26B51D80 */ addiu $s5, $s5, %lo(gCameras) +/* 804D04 80244484 AFA2001C */ sw $v0, 0x1c($sp) +/* 804D08 80244488 8E62007C */ lw $v0, 0x7c($s3) +/* 804D0C 8024448C AFA20020 */ sw $v0, 0x20($sp) +/* 804D10 80244490 C66C0070 */ lwc1 $f12, 0x70($s3) +/* 804D14 80244494 46806320 */ cvt.s.w $f12, $f12 +/* 804D18 80244498 0C00A8BB */ jal sin_deg +/* 804D1C 8024449C 27B20068 */ addiu $s2, $sp, 0x68 +/* 804D20 802444A0 46140002 */ mul.s $f0, $f0, $f20 +/* 804D24 802444A4 00000000 */ nop +/* 804D28 802444A8 0220A02D */ daddu $s4, $s1, $zero +/* 804D2C 802444AC C66C0070 */ lwc1 $f12, 0x70($s3) +/* 804D30 802444B0 46806320 */ cvt.s.w $f12, $f12 +/* 804D34 802444B4 4480B000 */ mtc1 $zero, $f22 +/* 804D38 802444B8 3C013F80 */ lui $at, 0x3f80 +/* 804D3C 802444BC 4481D000 */ mtc1 $at, $f26 +/* 804D40 802444C0 0C00A8BB */ jal sin_deg +/* 804D44 802444C4 46140780 */ add.s $f30, $f0, $f20 +/* 804D48 802444C8 3C0141C8 */ lui $at, 0x41c8 +/* 804D4C 802444CC 44811000 */ mtc1 $at, $f2 +/* 804D50 802444D0 8E630070 */ lw $v1, 0x70($s3) +/* 804D54 802444D4 46020002 */ mul.s $f0, $f0, $f2 +/* 804D58 802444D8 00000000 */ nop +/* 804D5C 802444DC 00031080 */ sll $v0, $v1, 2 +/* 804D60 802444E0 00431021 */ addu $v0, $v0, $v1 +/* 804D64 802444E4 00021040 */ sll $v0, $v0, 1 +/* 804D68 802444E8 4482C000 */ mtc1 $v0, $f24 +/* 804D6C 802444EC 00000000 */ nop +/* 804D70 802444F0 4680C620 */ cvt.s.w $f24, $f24 +/* 804D74 802444F4 46140700 */ add.s $f28, $f0, $f20 +.L802444F8: +/* 804D78 802444F8 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 804D7C 802444FC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 804D80 80244500 4406B000 */ mfc1 $a2, $f22 +/* 804D84 80244504 00031080 */ sll $v0, $v1, 2 +/* 804D88 80244508 00431021 */ addu $v0, $v0, $v1 +/* 804D8C 8024450C 00021080 */ sll $v0, $v0, 2 +/* 804D90 80244510 00431023 */ subu $v0, $v0, $v1 +/* 804D94 80244514 000218C0 */ sll $v1, $v0, 3 +/* 804D98 80244518 00431021 */ addu $v0, $v0, $v1 +/* 804D9C 8024451C 000210C0 */ sll $v0, $v0, 3 +/* 804DA0 80244520 00551021 */ addu $v0, $v0, $s5 +/* 804DA4 80244524 C440006C */ lwc1 $f0, 0x6c($v0) +/* 804DA8 80244528 4407D000 */ mfc1 $a3, $f26 +/* 804DAC 8024452C 46000007 */ neg.s $f0, $f0 +/* 804DB0 80244530 44050000 */ mfc1 $a1, $f0 +/* 804DB4 80244534 0200202D */ daddu $a0, $s0, $zero +/* 804DB8 80244538 0C019EC8 */ jal guRotateF +/* 804DBC 8024453C E7B60010 */ swc1 $f22, 0x10($sp) +/* 804DC0 80244540 44942000 */ mtc1 $s4, $f4 +/* 804DC4 80244544 00000000 */ nop +/* 804DC8 80244548 46802120 */ cvt.s.w $f4, $f4 +/* 804DCC 8024454C 4406B000 */ mfc1 $a2, $f22 +/* 804DD0 80244550 4407B000 */ mfc1 $a3, $f22 +/* 804DD4 80244554 44052000 */ mfc1 $a1, $f4 +/* 804DD8 80244558 0240202D */ daddu $a0, $s2, $zero +/* 804DDC 8024455C 0C019EC8 */ jal guRotateF +/* 804DE0 80244560 E7BA0010 */ swc1 $f26, 0x10($sp) +/* 804DE4 80244564 0240202D */ daddu $a0, $s2, $zero +/* 804DE8 80244568 0200282D */ daddu $a1, $s0, $zero +/* 804DEC 8024456C 0C019D80 */ jal guMtxCatF +/* 804DF0 80244570 0200302D */ daddu $a2, $s0, $zero +/* 804DF4 80244574 0C00A8BB */ jal sin_deg +/* 804DF8 80244578 4600C306 */ mov.s $f12, $f24 +/* 804DFC 8024457C 4600F502 */ mul.s $f20, $f30, $f0 +/* 804E00 80244580 00000000 */ nop +/* 804E04 80244584 0C00A8D4 */ jal cos_deg +/* 804E08 80244588 4600C306 */ mov.s $f12, $f24 +/* 804E0C 8024458C 4600E002 */ mul.s $f0, $f28, $f0 +/* 804E10 80244590 00000000 */ nop +/* 804E14 80244594 4407B000 */ mfc1 $a3, $f22 +/* 804E18 80244598 44060000 */ mfc1 $a2, $f0 +/* 804E1C 8024459C 4405A000 */ mfc1 $a1, $f20 +/* 804E20 802445A0 0C019E40 */ jal guTranslateF +/* 804E24 802445A4 0240202D */ daddu $a0, $s2, $zero +/* 804E28 802445A8 0240202D */ daddu $a0, $s2, $zero +/* 804E2C 802445AC 0200282D */ daddu $a1, $s0, $zero +/* 804E30 802445B0 0C019D80 */ jal guMtxCatF +/* 804E34 802445B4 0200302D */ daddu $a2, $s0, $zero +/* 804E38 802445B8 00111880 */ sll $v1, $s1, 2 +/* 804E3C 802445BC 27A40018 */ addiu $a0, $sp, 0x18 +/* 804E40 802445C0 00831821 */ addu $v1, $a0, $v1 +/* 804E44 802445C4 8C620000 */ lw $v0, ($v1) +/* 804E48 802445C8 C7A00058 */ lwc1 $f0, 0x58($sp) +/* 804E4C 802445CC 8C42000C */ lw $v0, 0xc($v0) +/* 804E50 802445D0 E4400010 */ swc1 $f0, 0x10($v0) +/* 804E54 802445D4 8C620000 */ lw $v0, ($v1) +/* 804E58 802445D8 C7A0005C */ lwc1 $f0, 0x5c($sp) +/* 804E5C 802445DC 8C42000C */ lw $v0, 0xc($v0) +/* 804E60 802445E0 E4400014 */ swc1 $f0, 0x14($v0) +/* 804E64 802445E4 8C620000 */ lw $v0, ($v1) +/* 804E68 802445E8 C7A00060 */ lwc1 $f0, 0x60($sp) +/* 804E6C 802445EC 8C42000C */ lw $v0, 0xc($v0) +/* 804E70 802445F0 26310001 */ addiu $s1, $s1, 1 +/* 804E74 802445F4 E4400018 */ swc1 $f0, 0x18($v0) +/* 804E78 802445F8 2A220003 */ slti $v0, $s1, 3 +/* 804E7C 802445FC 1440FFBE */ bnez $v0, .L802444F8 +/* 804E80 80244600 26940078 */ addiu $s4, $s4, 0x78 +/* 804E84 80244604 8E620070 */ lw $v0, 0x70($s3) +/* 804E88 80244608 2442FFFF */ addiu $v0, $v0, -1 +/* 804E8C 8024460C AE620070 */ sw $v0, 0x70($s3) +/* 804E90 80244610 28420010 */ slti $v0, $v0, 0x10 +/* 804E94 80244614 1040000A */ beqz $v0, .L80244640 +/* 804E98 80244618 00000000 */ nop +/* 804E9C 8024461C 0000882D */ daddu $s1, $zero, $zero +.L80244620: +/* 804EA0 80244620 8C820000 */ lw $v0, ($a0) +/* 804EA4 80244624 8C43000C */ lw $v1, 0xc($v0) +/* 804EA8 80244628 8E620070 */ lw $v0, 0x70($s3) +/* 804EAC 8024462C 26310001 */ addiu $s1, $s1, 1 +/* 804EB0 80244630 AC62004C */ sw $v0, 0x4c($v1) +/* 804EB4 80244634 2A220003 */ slti $v0, $s1, 3 +/* 804EB8 80244638 1440FFF9 */ bnez $v0, .L80244620 +/* 804EBC 8024463C 24840004 */ addiu $a0, $a0, 4 +.L80244640: +/* 804EC0 80244640 8E620070 */ lw $v0, 0x70($s3) +/* 804EC4 80244644 0441000A */ bgez $v0, .L80244670 +/* 804EC8 80244648 0000102D */ daddu $v0, $zero, $zero +/* 804ECC 8024464C 0000882D */ daddu $s1, $zero, $zero +/* 804ED0 80244650 27B00018 */ addiu $s0, $sp, 0x18 +.L80244654: +/* 804ED4 80244654 8E040000 */ lw $a0, ($s0) +/* 804ED8 80244658 26100004 */ addiu $s0, $s0, 4 +/* 804EDC 8024465C 0C016914 */ jal remove_effect +/* 804EE0 80244660 26310001 */ addiu $s1, $s1, 1 +/* 804EE4 80244664 2A220003 */ slti $v0, $s1, 3 +/* 804EE8 80244668 1440FFFA */ bnez $v0, .L80244654 +/* 804EEC 8024466C 24020002 */ addiu $v0, $zero, 2 +.L80244670: +/* 804EF0 80244670 8FBF00C0 */ lw $ra, 0xc0($sp) +/* 804EF4 80244674 8FB500BC */ lw $s5, 0xbc($sp) +/* 804EF8 80244678 8FB400B8 */ lw $s4, 0xb8($sp) +/* 804EFC 8024467C 8FB300B4 */ lw $s3, 0xb4($sp) +/* 804F00 80244680 8FB200B0 */ lw $s2, 0xb0($sp) +/* 804F04 80244684 8FB100AC */ lw $s1, 0xac($sp) +/* 804F08 80244688 8FB000A8 */ lw $s0, 0xa8($sp) +/* 804F0C 8024468C D7BE00F0 */ ldc1 $f30, 0xf0($sp) +/* 804F10 80244690 D7BC00E8 */ ldc1 $f28, 0xe8($sp) +/* 804F14 80244694 D7BA00E0 */ ldc1 $f26, 0xe0($sp) +/* 804F18 80244698 D7B800D8 */ ldc1 $f24, 0xd8($sp) +/* 804F1C 8024469C D7B600D0 */ ldc1 $f22, 0xd0($sp) +/* 804F20 802446A0 D7B400C8 */ ldc1 $f20, 0xc8($sp) +/* 804F24 802446A4 03E00008 */ jr $ra +/* 804F28 802446A8 27BD00F8 */ addiu $sp, $sp, 0xf8 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446AC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446AC.s deleted file mode 100644 index a53d3dbba9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446AC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802446AC -/* 804F2C 802446AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804F30 802446B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 804F34 802446B4 8C82000C */ lw $v0, 0xc($a0) -/* 804F38 802446B8 0C0B1EAF */ jal get_variable -/* 804F3C 802446BC 8C450000 */ lw $a1, ($v0) -/* 804F40 802446C0 8C44000C */ lw $a0, 0xc($v0) -/* 804F44 802446C4 8C83001C */ lw $v1, 0x1c($a0) -/* 804F48 802446C8 24630001 */ addiu $v1, $v1, 1 -/* 804F4C 802446CC AC83001C */ sw $v1, 0x1c($a0) -/* 804F50 802446D0 8FBF0010 */ lw $ra, 0x10($sp) -/* 804F54 802446D4 24020002 */ addiu $v0, $zero, 2 -/* 804F58 802446D8 03E00008 */ jr $ra -/* 804F5C 802446DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446AC_804F2C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446AC_804F2C.s new file mode 100644 index 0000000000..e7d6762653 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446AC_804F2C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802446AC_804F2C +/* 804F2C 802446AC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 804F30 802446B0 AFBF0010 */ sw $ra, 0x10($sp) +/* 804F34 802446B4 8C82000C */ lw $v0, 0xc($a0) +/* 804F38 802446B8 0C0B1EAF */ jal get_variable +/* 804F3C 802446BC 8C450000 */ lw $a1, ($v0) +/* 804F40 802446C0 8C44000C */ lw $a0, 0xc($v0) +/* 804F44 802446C4 8C83001C */ lw $v1, 0x1c($a0) +/* 804F48 802446C8 24630001 */ addiu $v1, $v1, 1 +/* 804F4C 802446CC AC83001C */ sw $v1, 0x1c($a0) +/* 804F50 802446D0 8FBF0010 */ lw $ra, 0x10($sp) +/* 804F54 802446D4 24020002 */ addiu $v0, $zero, 2 +/* 804F58 802446D8 03E00008 */ jr $ra +/* 804F5C 802446DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0.s deleted file mode 100644 index 2ba36f7254..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802446E0 -/* 804F60 802446E0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 804F64 802446E4 AFB10014 */ sw $s1, 0x14($sp) -/* 804F68 802446E8 0080882D */ daddu $s1, $a0, $zero -/* 804F6C 802446EC AFBF0018 */ sw $ra, 0x18($sp) -/* 804F70 802446F0 AFB00010 */ sw $s0, 0x10($sp) -/* 804F74 802446F4 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 804F78 802446F8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 804F7C 802446FC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 804F80 80244700 8E30000C */ lw $s0, 0xc($s1) -/* 804F84 80244704 8E050000 */ lw $a1, ($s0) -/* 804F88 80244708 0C0B1EAF */ jal get_variable -/* 804F8C 8024470C 26100004 */ addiu $s0, $s0, 4 -/* 804F90 80244710 8E050000 */ lw $a1, ($s0) -/* 804F94 80244714 26100004 */ addiu $s0, $s0, 4 -/* 804F98 80244718 4482C000 */ mtc1 $v0, $f24 -/* 804F9C 8024471C 00000000 */ nop -/* 804FA0 80244720 4680C620 */ cvt.s.w $f24, $f24 -/* 804FA4 80244724 0C0B1EAF */ jal get_variable -/* 804FA8 80244728 0220202D */ daddu $a0, $s1, $zero -/* 804FAC 8024472C 8E050000 */ lw $a1, ($s0) -/* 804FB0 80244730 26100004 */ addiu $s0, $s0, 4 -/* 804FB4 80244734 4482B000 */ mtc1 $v0, $f22 -/* 804FB8 80244738 00000000 */ nop -/* 804FBC 8024473C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 804FC0 80244740 0C0B1EAF */ jal get_variable -/* 804FC4 80244744 0220202D */ daddu $a0, $s1, $zero -/* 804FC8 80244748 8E050000 */ lw $a1, ($s0) -/* 804FCC 8024474C 4482A000 */ mtc1 $v0, $f20 -/* 804FD0 80244750 00000000 */ nop -/* 804FD4 80244754 4680A520 */ cvt.s.w $f20, $f20 -/* 804FD8 80244758 0C0B1EAF */ jal get_variable -/* 804FDC 8024475C 0220202D */ daddu $a0, $s1, $zero -/* 804FE0 80244760 44820000 */ mtc1 $v0, $f0 -/* 804FE4 80244764 00000000 */ nop -/* 804FE8 80244768 46800020 */ cvt.s.w $f0, $f0 -/* 804FEC 8024476C 46160001 */ sub.s $f0, $f0, $f22 -/* 804FF0 80244770 4618A501 */ sub.s $f20, $f20, $f24 -/* 804FF4 80244774 46140003 */ div.s $f0, $f0, $f20 -/* 804FF8 80244778 46180602 */ mul.s $f24, $f0, $f24 -/* 804FFC 8024477C 00000000 */ nop -/* 805000 80244780 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 805004 80244784 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 805008 80244788 C4420028 */ lwc1 $f2, 0x28($v0) -/* 80500C 8024478C 46020002 */ mul.s $f0, $f0, $f2 -/* 805010 80244790 00000000 */ nop -/* 805014 80244794 4618B581 */ sub.s $f22, $f22, $f24 -/* 805018 80244798 46160000 */ add.s $f0, $f0, $f22 -/* 80501C 8024479C C4420030 */ lwc1 $f2, 0x30($v0) -/* 805020 802447A0 4600103C */ c.lt.s $f2, $f0 -/* 805024 802447A4 00000000 */ nop -/* 805028 802447A8 45000003 */ bc1f .L802447B8 -/* 80502C 802447AC 24020001 */ addiu $v0, $zero, 1 -/* 805030 802447B0 080911EF */ j .L802447BC -/* 805034 802447B4 AE200084 */ sw $zero, 0x84($s1) -.L802447B8: -/* 805038 802447B8 AE220084 */ sw $v0, 0x84($s1) -.L802447BC: -/* 80503C 802447BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 805040 802447C0 8FB10014 */ lw $s1, 0x14($sp) -/* 805044 802447C4 8FB00010 */ lw $s0, 0x10($sp) -/* 805048 802447C8 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 80504C 802447CC D7B60028 */ ldc1 $f22, 0x28($sp) -/* 805050 802447D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 805054 802447D4 24020002 */ addiu $v0, $zero, 2 -/* 805058 802447D8 03E00008 */ jr $ra -/* 80505C 802447DC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s new file mode 100644 index 0000000000..5daf4f046b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802446E0_804F60 +/* 804F60 802446E0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 804F64 802446E4 AFB10014 */ sw $s1, 0x14($sp) +/* 804F68 802446E8 0080882D */ daddu $s1, $a0, $zero +/* 804F6C 802446EC AFBF0018 */ sw $ra, 0x18($sp) +/* 804F70 802446F0 AFB00010 */ sw $s0, 0x10($sp) +/* 804F74 802446F4 F7B80030 */ sdc1 $f24, 0x30($sp) +/* 804F78 802446F8 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 804F7C 802446FC F7B40020 */ sdc1 $f20, 0x20($sp) +/* 804F80 80244700 8E30000C */ lw $s0, 0xc($s1) +/* 804F84 80244704 8E050000 */ lw $a1, ($s0) +/* 804F88 80244708 0C0B1EAF */ jal get_variable +/* 804F8C 8024470C 26100004 */ addiu $s0, $s0, 4 +/* 804F90 80244710 8E050000 */ lw $a1, ($s0) +/* 804F94 80244714 26100004 */ addiu $s0, $s0, 4 +/* 804F98 80244718 4482C000 */ mtc1 $v0, $f24 +/* 804F9C 8024471C 00000000 */ nop +/* 804FA0 80244720 4680C620 */ cvt.s.w $f24, $f24 +/* 804FA4 80244724 0C0B1EAF */ jal get_variable +/* 804FA8 80244728 0220202D */ daddu $a0, $s1, $zero +/* 804FAC 8024472C 8E050000 */ lw $a1, ($s0) +/* 804FB0 80244730 26100004 */ addiu $s0, $s0, 4 +/* 804FB4 80244734 4482B000 */ mtc1 $v0, $f22 +/* 804FB8 80244738 00000000 */ nop +/* 804FBC 8024473C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 804FC0 80244740 0C0B1EAF */ jal get_variable +/* 804FC4 80244744 0220202D */ daddu $a0, $s1, $zero +/* 804FC8 80244748 8E050000 */ lw $a1, ($s0) +/* 804FCC 8024474C 4482A000 */ mtc1 $v0, $f20 +/* 804FD0 80244750 00000000 */ nop +/* 804FD4 80244754 4680A520 */ cvt.s.w $f20, $f20 +/* 804FD8 80244758 0C0B1EAF */ jal get_variable +/* 804FDC 8024475C 0220202D */ daddu $a0, $s1, $zero +/* 804FE0 80244760 44820000 */ mtc1 $v0, $f0 +/* 804FE4 80244764 00000000 */ nop +/* 804FE8 80244768 46800020 */ cvt.s.w $f0, $f0 +/* 804FEC 8024476C 46160001 */ sub.s $f0, $f0, $f22 +/* 804FF0 80244770 4618A501 */ sub.s $f20, $f20, $f24 +/* 804FF4 80244774 46140003 */ div.s $f0, $f0, $f20 +/* 804FF8 80244778 46180602 */ mul.s $f24, $f0, $f24 +/* 804FFC 8024477C 00000000 */ nop +/* 805000 80244780 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 805004 80244784 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 805008 80244788 C4420028 */ lwc1 $f2, 0x28($v0) +/* 80500C 8024478C 46020002 */ mul.s $f0, $f0, $f2 +/* 805010 80244790 00000000 */ nop +/* 805014 80244794 4618B581 */ sub.s $f22, $f22, $f24 +/* 805018 80244798 46160000 */ add.s $f0, $f0, $f22 +/* 80501C 8024479C C4420030 */ lwc1 $f2, 0x30($v0) +/* 805020 802447A0 4600103C */ c.lt.s $f2, $f0 +/* 805024 802447A4 00000000 */ nop +/* 805028 802447A8 45000003 */ bc1f .L802447B8 +/* 80502C 802447AC 24020001 */ addiu $v0, $zero, 1 +/* 805030 802447B0 080911EF */ j .L802447BC +/* 805034 802447B4 AE200084 */ sw $zero, 0x84($s1) +.L802447B8: +/* 805038 802447B8 AE220084 */ sw $v0, 0x84($s1) +.L802447BC: +/* 80503C 802447BC 8FBF0018 */ lw $ra, 0x18($sp) +/* 805040 802447C0 8FB10014 */ lw $s1, 0x14($sp) +/* 805044 802447C4 8FB00010 */ lw $s0, 0x10($sp) +/* 805048 802447C8 D7B80030 */ ldc1 $f24, 0x30($sp) +/* 80504C 802447CC D7B60028 */ ldc1 $f22, 0x28($sp) +/* 805050 802447D0 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 805054 802447D4 24020002 */ addiu $v0, $zero, 2 +/* 805058 802447D8 03E00008 */ jr $ra +/* 80505C 802447DC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0.s deleted file mode 100644 index bd34db3635..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802447E0 -/* 805060 802447E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805064 802447E4 AFB00010 */ sw $s0, 0x10($sp) -/* 805068 802447E8 0080802D */ daddu $s0, $a0, $zero -/* 80506C 802447EC 10A00002 */ beqz $a1, .L802447F8 -/* 805070 802447F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 805074 802447F4 AE000074 */ sw $zero, 0x74($s0) -.L802447F8: -/* 805078 802447F8 8E020074 */ lw $v0, 0x74($s0) -/* 80507C 802447FC 2442000A */ addiu $v0, $v0, 0xa -/* 805080 80244800 AE020074 */ sw $v0, 0x74($s0) -/* 805084 80244804 28420100 */ slti $v0, $v0, 0x100 -/* 805088 80244808 14400002 */ bnez $v0, .L80244814 -/* 80508C 8024480C 240200FF */ addiu $v0, $zero, 0xff -/* 805090 80244810 AE020074 */ sw $v0, 0x74($s0) -.L80244814: -/* 805094 80244814 C6000074 */ lwc1 $f0, 0x74($s0) -/* 805098 80244818 46800020 */ cvt.s.w $f0, $f0 -/* 80509C 8024481C 44050000 */ mfc1 $a1, $f0 -/* 8050A0 80244820 0C04DF62 */ jal func_80137D88 -/* 8050A4 80244824 0000202D */ daddu $a0, $zero, $zero -/* 8050A8 80244828 8E020074 */ lw $v0, 0x74($s0) -/* 8050AC 8024482C 8FBF0014 */ lw $ra, 0x14($sp) -/* 8050B0 80244830 8FB00010 */ lw $s0, 0x10($sp) -/* 8050B4 80244834 384200FF */ xori $v0, $v0, 0xff -/* 8050B8 80244838 2C420001 */ sltiu $v0, $v0, 1 -/* 8050BC 8024483C 00021040 */ sll $v0, $v0, 1 -/* 8050C0 80244840 03E00008 */ jr $ra -/* 8050C4 80244844 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0_805060.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0_805060.s new file mode 100644 index 0000000000..1410a02a9a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802447E0_805060.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802447E0_805060 +/* 805060 802447E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 805064 802447E4 AFB00010 */ sw $s0, 0x10($sp) +/* 805068 802447E8 0080802D */ daddu $s0, $a0, $zero +/* 80506C 802447EC 10A00002 */ beqz $a1, .L802447F8 +/* 805070 802447F0 AFBF0014 */ sw $ra, 0x14($sp) +/* 805074 802447F4 AE000074 */ sw $zero, 0x74($s0) +.L802447F8: +/* 805078 802447F8 8E020074 */ lw $v0, 0x74($s0) +/* 80507C 802447FC 2442000A */ addiu $v0, $v0, 0xa +/* 805080 80244800 AE020074 */ sw $v0, 0x74($s0) +/* 805084 80244804 28420100 */ slti $v0, $v0, 0x100 +/* 805088 80244808 14400002 */ bnez $v0, .L80244814 +/* 80508C 8024480C 240200FF */ addiu $v0, $zero, 0xff +/* 805090 80244810 AE020074 */ sw $v0, 0x74($s0) +.L80244814: +/* 805094 80244814 C6000074 */ lwc1 $f0, 0x74($s0) +/* 805098 80244818 46800020 */ cvt.s.w $f0, $f0 +/* 80509C 8024481C 44050000 */ mfc1 $a1, $f0 +/* 8050A0 80244820 0C04DF62 */ jal func_80137D88 +/* 8050A4 80244824 0000202D */ daddu $a0, $zero, $zero +/* 8050A8 80244828 8E020074 */ lw $v0, 0x74($s0) +/* 8050AC 8024482C 8FBF0014 */ lw $ra, 0x14($sp) +/* 8050B0 80244830 8FB00010 */ lw $s0, 0x10($sp) +/* 8050B4 80244834 384200FF */ xori $v0, $v0, 0xff +/* 8050B8 80244838 2C420001 */ sltiu $v0, $v0, 1 +/* 8050BC 8024483C 00021040 */ sll $v0, $v0, 1 +/* 8050C0 80244840 03E00008 */ jr $ra +/* 8050C4 80244844 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848.s deleted file mode 100644 index 9023759692..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244848 -/* 8050C8 80244848 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8050CC 8024484C 10A00003 */ beqz $a1, .L8024485C -/* 8050D0 80244850 AFBF0010 */ sw $ra, 0x10($sp) -/* 8050D4 80244854 240200FF */ addiu $v0, $zero, 0xff -/* 8050D8 80244858 AC820074 */ sw $v0, 0x74($a0) -.L8024485C: -/* 8050DC 8024485C 8C820074 */ lw $v0, 0x74($a0) -/* 8050E0 80244860 2442FFF6 */ addiu $v0, $v0, -0xa -/* 8050E4 80244864 18400009 */ blez $v0, .L8024488C -/* 8050E8 80244868 AC820074 */ sw $v0, 0x74($a0) -/* 8050EC 8024486C 44820000 */ mtc1 $v0, $f0 -/* 8050F0 80244870 00000000 */ nop -/* 8050F4 80244874 46800020 */ cvt.s.w $f0, $f0 -/* 8050F8 80244878 44050000 */ mfc1 $a1, $f0 -/* 8050FC 8024487C 0C04DF62 */ jal func_80137D88 -/* 805100 80244880 0000202D */ daddu $a0, $zero, $zero -/* 805104 80244884 08091225 */ j .L80244894 -/* 805108 80244888 0000102D */ daddu $v0, $zero, $zero -.L8024488C: -/* 80510C 8024488C AC800074 */ sw $zero, 0x74($a0) -/* 805110 80244890 24020002 */ addiu $v0, $zero, 2 -.L80244894: -/* 805114 80244894 8FBF0010 */ lw $ra, 0x10($sp) -/* 805118 80244898 03E00008 */ jr $ra -/* 80511C 8024489C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s new file mode 100644 index 0000000000..5a7f51c694 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244848_8050C8.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244848_8050C8 +/* 8050C8 80244848 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8050CC 8024484C 10A00003 */ beqz $a1, .L8024485C +/* 8050D0 80244850 AFBF0010 */ sw $ra, 0x10($sp) +/* 8050D4 80244854 240200FF */ addiu $v0, $zero, 0xff +/* 8050D8 80244858 AC820074 */ sw $v0, 0x74($a0) +.L8024485C: +/* 8050DC 8024485C 8C820074 */ lw $v0, 0x74($a0) +/* 8050E0 80244860 2442FFF6 */ addiu $v0, $v0, -0xa +/* 8050E4 80244864 18400009 */ blez $v0, .L8024488C +/* 8050E8 80244868 AC820074 */ sw $v0, 0x74($a0) +/* 8050EC 8024486C 44820000 */ mtc1 $v0, $f0 +/* 8050F0 80244870 00000000 */ nop +/* 8050F4 80244874 46800020 */ cvt.s.w $f0, $f0 +/* 8050F8 80244878 44050000 */ mfc1 $a1, $f0 +/* 8050FC 8024487C 0C04DF62 */ jal func_80137D88 +/* 805100 80244880 0000202D */ daddu $a0, $zero, $zero +/* 805104 80244884 08091225 */ j .L80244894 +/* 805108 80244888 0000102D */ daddu $v0, $zero, $zero +.L8024488C: +/* 80510C 8024488C AC800074 */ sw $zero, 0x74($a0) +/* 805110 80244890 24020002 */ addiu $v0, $zero, 2 +.L80244894: +/* 805114 80244894 8FBF0010 */ lw $ra, 0x10($sp) +/* 805118 80244898 03E00008 */ jr $ra +/* 80511C 8024489C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802448A0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802448A0.s deleted file mode 100644 index 832d9e60dc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802448A0.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802448A0 -/* 805120 802448A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805124 802448A4 AFB00010 */ sw $s0, 0x10($sp) -/* 805128 802448A8 0080802D */ daddu $s0, $a0, $zero -/* 80512C 802448AC 10A0000A */ beqz $a1, .L802448D8 -/* 805130 802448B0 AFBF0014 */ sw $ra, 0x14($sp) -/* 805134 802448B4 8E020084 */ lw $v0, 0x84($s0) -/* 805138 802448B8 54400007 */ bnel $v0, $zero, .L802448D8 -/* 80513C 802448BC AE000070 */ sw $zero, 0x70($s0) -/* 805140 802448C0 960400C2 */ lhu $a0, 0xc2($s0) -/* 805144 802448C4 2405FFFF */ addiu $a1, $zero, -1 -/* 805148 802448C8 24060001 */ addiu $a2, $zero, 1 -/* 80514C 802448CC 0C046E54 */ jal func_8011B950 -/* 805150 802448D0 00C0382D */ daddu $a3, $a2, $zero -/* 805154 802448D4 AE000070 */ sw $zero, 0x70($s0) -.L802448D8: -/* 805158 802448D8 8E020070 */ lw $v0, 0x70($s0) -/* 80515C 802448DC 24420020 */ addiu $v0, $v0, 0x20 -/* 805160 802448E0 AE020070 */ sw $v0, 0x70($s0) -/* 805164 802448E4 28420100 */ slti $v0, $v0, 0x100 -/* 805168 802448E8 14400002 */ bnez $v0, .L802448F4 -/* 80516C 802448EC 240200FF */ addiu $v0, $zero, 0xff -/* 805170 802448F0 AE020070 */ sw $v0, 0x70($s0) -.L802448F4: -/* 805174 802448F4 8E020084 */ lw $v0, 0x84($s0) -/* 805178 802448F8 14400004 */ bnez $v0, .L8024490C -/* 80517C 802448FC 240200FF */ addiu $v0, $zero, 0xff -/* 805180 80244900 8E020070 */ lw $v0, 0x70($s0) -/* 805184 80244904 08091246 */ j .L80244918 -/* 805188 80244908 0000202D */ daddu $a0, $zero, $zero -.L8024490C: -/* 80518C 8024490C 8E030070 */ lw $v1, 0x70($s0) -/* 805190 80244910 00431023 */ subu $v0, $v0, $v1 -/* 805194 80244914 0000202D */ daddu $a0, $zero, $zero -.L80244918: -/* 805198 80244918 0080282D */ daddu $a1, $a0, $zero -/* 80519C 8024491C 0080302D */ daddu $a2, $a0, $zero -/* 8051A0 80244920 0C046F97 */ jal set_background_color_blend -/* 8051A4 80244924 304700FF */ andi $a3, $v0, 0xff -/* 8051A8 80244928 3C02800B */ lui $v0, %hi(gCameras) -/* 8051AC 8024492C 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 8051B0 80244930 A440002C */ sh $zero, 0x2c($v0) -/* 8051B4 80244934 A440002E */ sh $zero, 0x2e($v0) -/* 8051B8 80244938 A4400030 */ sh $zero, 0x30($v0) -/* 8051BC 8024493C 8E020070 */ lw $v0, 0x70($s0) -/* 8051C0 80244940 284200FF */ slti $v0, $v0, 0xff -/* 8051C4 80244944 1440000B */ bnez $v0, .L80244974 -/* 8051C8 80244948 0000102D */ daddu $v0, $zero, $zero -/* 8051CC 8024494C 8E030084 */ lw $v1, 0x84($s0) -/* 8051D0 80244950 24020003 */ addiu $v0, $zero, 3 -/* 8051D4 80244954 14620007 */ bne $v1, $v0, .L80244974 -/* 8051D8 80244958 24020002 */ addiu $v0, $zero, 2 -/* 8051DC 8024495C 960400C2 */ lhu $a0, 0xc2($s0) -/* 8051E0 80244960 2405FFFF */ addiu $a1, $zero, -1 -/* 8051E4 80244964 0000302D */ daddu $a2, $zero, $zero -/* 8051E8 80244968 0C046E54 */ jal func_8011B950 -/* 8051EC 8024496C 24070001 */ addiu $a3, $zero, 1 -/* 8051F0 80244970 24020002 */ addiu $v0, $zero, 2 -.L80244974: -/* 8051F4 80244974 8FBF0014 */ lw $ra, 0x14($sp) -/* 8051F8 80244978 8FB00010 */ lw $s0, 0x10($sp) -/* 8051FC 8024497C 03E00008 */ jr $ra -/* 805200 80244980 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802448A0_805120.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802448A0_805120.s new file mode 100644 index 0000000000..b9558bbb69 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802448A0_805120.s @@ -0,0 +1,66 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802448A0_805120 +/* 805120 802448A0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 805124 802448A4 AFB00010 */ sw $s0, 0x10($sp) +/* 805128 802448A8 0080802D */ daddu $s0, $a0, $zero +/* 80512C 802448AC 10A0000A */ beqz $a1, .L802448D8 +/* 805130 802448B0 AFBF0014 */ sw $ra, 0x14($sp) +/* 805134 802448B4 8E020084 */ lw $v0, 0x84($s0) +/* 805138 802448B8 54400007 */ bnel $v0, $zero, .L802448D8 +/* 80513C 802448BC AE000070 */ sw $zero, 0x70($s0) +/* 805140 802448C0 960400C2 */ lhu $a0, 0xc2($s0) +/* 805144 802448C4 2405FFFF */ addiu $a1, $zero, -1 +/* 805148 802448C8 24060001 */ addiu $a2, $zero, 1 +/* 80514C 802448CC 0C046E54 */ jal func_8011B950 +/* 805150 802448D0 00C0382D */ daddu $a3, $a2, $zero +/* 805154 802448D4 AE000070 */ sw $zero, 0x70($s0) +.L802448D8: +/* 805158 802448D8 8E020070 */ lw $v0, 0x70($s0) +/* 80515C 802448DC 24420020 */ addiu $v0, $v0, 0x20 +/* 805160 802448E0 AE020070 */ sw $v0, 0x70($s0) +/* 805164 802448E4 28420100 */ slti $v0, $v0, 0x100 +/* 805168 802448E8 14400002 */ bnez $v0, .L802448F4 +/* 80516C 802448EC 240200FF */ addiu $v0, $zero, 0xff +/* 805170 802448F0 AE020070 */ sw $v0, 0x70($s0) +.L802448F4: +/* 805174 802448F4 8E020084 */ lw $v0, 0x84($s0) +/* 805178 802448F8 14400004 */ bnez $v0, .L8024490C +/* 80517C 802448FC 240200FF */ addiu $v0, $zero, 0xff +/* 805180 80244900 8E020070 */ lw $v0, 0x70($s0) +/* 805184 80244904 08091246 */ j .L80244918 +/* 805188 80244908 0000202D */ daddu $a0, $zero, $zero +.L8024490C: +/* 80518C 8024490C 8E030070 */ lw $v1, 0x70($s0) +/* 805190 80244910 00431023 */ subu $v0, $v0, $v1 +/* 805194 80244914 0000202D */ daddu $a0, $zero, $zero +.L80244918: +/* 805198 80244918 0080282D */ daddu $a1, $a0, $zero +/* 80519C 8024491C 0080302D */ daddu $a2, $a0, $zero +/* 8051A0 80244920 0C046F97 */ jal set_background_color_blend +/* 8051A4 80244924 304700FF */ andi $a3, $v0, 0xff +/* 8051A8 80244928 3C02800B */ lui $v0, %hi(gCameras) +/* 8051AC 8024492C 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* 8051B0 80244930 A440002C */ sh $zero, 0x2c($v0) +/* 8051B4 80244934 A440002E */ sh $zero, 0x2e($v0) +/* 8051B8 80244938 A4400030 */ sh $zero, 0x30($v0) +/* 8051BC 8024493C 8E020070 */ lw $v0, 0x70($s0) +/* 8051C0 80244940 284200FF */ slti $v0, $v0, 0xff +/* 8051C4 80244944 1440000B */ bnez $v0, .L80244974 +/* 8051C8 80244948 0000102D */ daddu $v0, $zero, $zero +/* 8051CC 8024494C 8E030084 */ lw $v1, 0x84($s0) +/* 8051D0 80244950 24020003 */ addiu $v0, $zero, 3 +/* 8051D4 80244954 14620007 */ bne $v1, $v0, .L80244974 +/* 8051D8 80244958 24020002 */ addiu $v0, $zero, 2 +/* 8051DC 8024495C 960400C2 */ lhu $a0, 0xc2($s0) +/* 8051E0 80244960 2405FFFF */ addiu $a1, $zero, -1 +/* 8051E4 80244964 0000302D */ daddu $a2, $zero, $zero +/* 8051E8 80244968 0C046E54 */ jal func_8011B950 +/* 8051EC 8024496C 24070001 */ addiu $a3, $zero, 1 +/* 8051F0 80244970 24020002 */ addiu $v0, $zero, 2 +.L80244974: +/* 8051F4 80244974 8FBF0014 */ lw $ra, 0x14($sp) +/* 8051F8 80244978 8FB00010 */ lw $s0, 0x10($sp) +/* 8051FC 8024497C 03E00008 */ jr $ra +/* 805200 80244980 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244984.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244984.s deleted file mode 100644 index 42fe6c4f2e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244984.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244984 -/* 805204 80244984 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 805208 80244988 AFB3001C */ sw $s3, 0x1c($sp) -/* 80520C 8024498C 0080982D */ daddu $s3, $a0, $zero -/* 805210 80244990 AFB20018 */ sw $s2, 0x18($sp) -/* 805214 80244994 3C12F840 */ lui $s2, 0xf840 -/* 805218 80244998 36526200 */ ori $s2, $s2, 0x6200 -/* 80521C 8024499C AFB10014 */ sw $s1, 0x14($sp) -/* 805220 802449A0 0000882D */ daddu $s1, $zero, $zero -/* 805224 802449A4 AFB00010 */ sw $s0, 0x10($sp) -/* 805228 802449A8 0220802D */ daddu $s0, $s1, $zero -/* 80522C 802449AC AFBF0020 */ sw $ra, 0x20($sp) -/* 805230 802449B0 0000202D */ daddu $a0, $zero, $zero -.L802449B4: -/* 805234 802449B4 0C0B1EAF */ jal get_variable -/* 805238 802449B8 02502821 */ addu $a1, $s2, $s0 -/* 80523C 802449BC 50400001 */ beql $v0, $zero, .L802449C4 -/* 805240 802449C0 26310001 */ addiu $s1, $s1, 1 -.L802449C4: -/* 805244 802449C4 26100001 */ addiu $s0, $s0, 1 -/* 805248 802449C8 2A020010 */ slti $v0, $s0, 0x10 -/* 80524C 802449CC 1440FFF9 */ bnez $v0, .L802449B4 -/* 805250 802449D0 0000202D */ daddu $a0, $zero, $zero -/* 805254 802449D4 AE710084 */ sw $s1, 0x84($s3) -/* 805258 802449D8 8FBF0020 */ lw $ra, 0x20($sp) -/* 80525C 802449DC 8FB3001C */ lw $s3, 0x1c($sp) -/* 805260 802449E0 8FB20018 */ lw $s2, 0x18($sp) -/* 805264 802449E4 8FB10014 */ lw $s1, 0x14($sp) -/* 805268 802449E8 8FB00010 */ lw $s0, 0x10($sp) -/* 80526C 802449EC 24020002 */ addiu $v0, $zero, 2 -/* 805270 802449F0 03E00008 */ jr $ra -/* 805274 802449F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244984_805204.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244984_805204.s new file mode 100644 index 0000000000..c877d7336b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244984_805204.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244984_805204 +/* 805204 80244984 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 805208 80244988 AFB3001C */ sw $s3, 0x1c($sp) +/* 80520C 8024498C 0080982D */ daddu $s3, $a0, $zero +/* 805210 80244990 AFB20018 */ sw $s2, 0x18($sp) +/* 805214 80244994 3C12F840 */ lui $s2, 0xf840 +/* 805218 80244998 36526200 */ ori $s2, $s2, 0x6200 +/* 80521C 8024499C AFB10014 */ sw $s1, 0x14($sp) +/* 805220 802449A0 0000882D */ daddu $s1, $zero, $zero +/* 805224 802449A4 AFB00010 */ sw $s0, 0x10($sp) +/* 805228 802449A8 0220802D */ daddu $s0, $s1, $zero +/* 80522C 802449AC AFBF0020 */ sw $ra, 0x20($sp) +/* 805230 802449B0 0000202D */ daddu $a0, $zero, $zero +.L802449B4: +/* 805234 802449B4 0C0B1EAF */ jal get_variable +/* 805238 802449B8 02502821 */ addu $a1, $s2, $s0 +/* 80523C 802449BC 50400001 */ beql $v0, $zero, .L802449C4 +/* 805240 802449C0 26310001 */ addiu $s1, $s1, 1 +.L802449C4: +/* 805244 802449C4 26100001 */ addiu $s0, $s0, 1 +/* 805248 802449C8 2A020010 */ slti $v0, $s0, 0x10 +/* 80524C 802449CC 1440FFF9 */ bnez $v0, .L802449B4 +/* 805250 802449D0 0000202D */ daddu $a0, $zero, $zero +/* 805254 802449D4 AE710084 */ sw $s1, 0x84($s3) +/* 805258 802449D8 8FBF0020 */ lw $ra, 0x20($sp) +/* 80525C 802449DC 8FB3001C */ lw $s3, 0x1c($sp) +/* 805260 802449E0 8FB20018 */ lw $s2, 0x18($sp) +/* 805264 802449E4 8FB10014 */ lw $s1, 0x14($sp) +/* 805268 802449E8 8FB00010 */ lw $s0, 0x10($sp) +/* 80526C 802449EC 24020002 */ addiu $v0, $zero, 2 +/* 805270 802449F0 03E00008 */ jr $ra +/* 805274 802449F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8.s deleted file mode 100644 index 4ad9eb8b8b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8.s +++ /dev/null @@ -1,113 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802449F8 -/* 805278 802449F8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 80527C 802449FC AFB00010 */ sw $s0, 0x10($sp) -/* 805280 80244A00 0080802D */ daddu $s0, $a0, $zero -/* 805284 80244A04 0000202D */ daddu $a0, $zero, $zero -/* 805288 80244A08 3C05FD05 */ lui $a1, 0xfd05 -/* 80528C 80244A0C AFBF0024 */ sw $ra, 0x24($sp) -/* 805290 80244A10 AFB40020 */ sw $s4, 0x20($sp) -/* 805294 80244A14 AFB3001C */ sw $s3, 0x1c($sp) -/* 805298 80244A18 AFB20018 */ sw $s2, 0x18($sp) -/* 80529C 80244A1C AFB10014 */ sw $s1, 0x14($sp) -/* 8052A0 80244A20 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8052A4 80244A24 0C0B1EAF */ jal get_variable -/* 8052A8 80244A28 34A50F81 */ ori $a1, $a1, 0xf81 -/* 8052AC 80244A2C 0000202D */ daddu $a0, $zero, $zero -/* 8052B0 80244A30 3C05FD05 */ lui $a1, 0xfd05 -/* 8052B4 80244A34 34A50F80 */ ori $a1, $a1, 0xf80 -/* 8052B8 80244A38 0C0B1EAF */ jal get_variable -/* 8052BC 80244A3C 00029823 */ negu $s3, $v0 -/* 8052C0 80244A40 24040002 */ addiu $a0, $zero, 2 -/* 8052C4 80244A44 8E1100A0 */ lw $s1, 0xa0($s0) -/* 8052C8 80244A48 0C00FB3A */ jal get_enemy -/* 8052CC 80244A4C 0040A02D */ daddu $s4, $v0, $zero -/* 8052D0 80244A50 4493A000 */ mtc1 $s3, $f20 -/* 8052D4 80244A54 00000000 */ nop -/* 8052D8 80244A58 4680A520 */ cvt.s.w $f20, $f20 -/* 8052DC 80244A5C 3C014334 */ lui $at, 0x4334 -/* 8052E0 80244A60 44810000 */ mtc1 $at, $f0 -/* 8052E4 80244A64 3C014049 */ lui $at, 0x4049 -/* 8052E8 80244A68 34210FD8 */ ori $at, $at, 0xfd8 -/* 8052EC 80244A6C 44811000 */ mtc1 $at, $f2 -/* 8052F0 80244A70 4600A503 */ div.s $f20, $f20, $f0 -/* 8052F4 80244A74 4602A502 */ mul.s $f20, $f20, $f2 -/* 8052F8 80244A78 00000000 */ nop -/* 8052FC 80244A7C 0040902D */ daddu $s2, $v0, $zero -/* 805300 80244A80 0C00A85B */ jal sin_rad -/* 805304 80244A84 4600A306 */ mov.s $f12, $f20 -/* 805308 80244A88 4600A306 */ mov.s $f12, $f20 -/* 80530C 80244A8C 0C00A874 */ jal cos_rad -/* 805310 80244A90 46000506 */ mov.s $f20, $f0 -/* 805314 80244A94 C6060084 */ lwc1 $f6, 0x84($s0) -/* 805318 80244A98 468031A0 */ cvt.s.w $f6, $f6 -/* 80531C 80244A9C 46003102 */ mul.s $f4, $f6, $f0 -/* 805320 80244AA0 00000000 */ nop -/* 805324 80244AA4 C6020088 */ lwc1 $f2, 0x88($s0) -/* 805328 80244AA8 468010A0 */ cvt.s.w $f2, $f2 -/* 80532C 80244AAC 46141202 */ mul.s $f8, $f2, $f20 -/* 805330 80244AB0 00000000 */ nop -/* 805334 80244AB4 46143182 */ mul.s $f6, $f6, $f20 -/* 805338 80244AB8 00000000 */ nop -/* 80533C 80244ABC 46001082 */ mul.s $f2, $f2, $f0 -/* 805340 80244AC0 00000000 */ nop -/* 805344 80244AC4 46082101 */ sub.s $f4, $f4, $f8 -/* 805348 80244AC8 8E02008C */ lw $v0, 0x8c($s0) -/* 80534C 80244ACC 46023180 */ add.s $f6, $f6, $f2 -/* 805350 80244AD0 4600228D */ trunc.w.s $f10, $f4 -/* 805354 80244AD4 44035000 */ mfc1 $v1, $f10 -/* 805358 80244AD8 00000000 */ nop -/* 80535C 80244ADC 00431021 */ addu $v0, $v0, $v1 -/* 805360 80244AE0 AE020094 */ sw $v0, 0x94($s0) -/* 805364 80244AE4 8E020090 */ lw $v0, 0x90($s0) -/* 805368 80244AE8 4600328D */ trunc.w.s $f10, $f6 -/* 80536C 80244AEC 44035000 */ mfc1 $v1, $f10 -/* 805370 80244AF0 00000000 */ nop -/* 805374 80244AF4 00431021 */ addu $v0, $v0, $v1 -/* 805378 80244AF8 16600009 */ bnez $s3, .L80244B20 -/* 80537C 80244AFC AE020098 */ sw $v0, 0x98($s0) -/* 805380 80244B00 3C0200A7 */ lui $v0, 0xa7 -/* 805384 80244B04 34420001 */ ori $v0, $v0, 1 -/* 805388 80244B08 3C03F7FF */ lui $v1, 0xf7ff -/* 80538C 80244B0C AE220028 */ sw $v0, 0x28($s1) -/* 805390 80244B10 8E420000 */ lw $v0, ($s2) -/* 805394 80244B14 3463FFFF */ ori $v1, $v1, 0xffff -/* 805398 80244B18 080912CE */ j .L80244B38 -/* 80539C 80244B1C 00431024 */ and $v0, $v0, $v1 -.L80244B20: -/* 8053A0 80244B20 3C0200A7 */ lui $v0, 0xa7 -/* 8053A4 80244B24 34420002 */ ori $v0, $v0, 2 -/* 8053A8 80244B28 AE220028 */ sw $v0, 0x28($s1) -/* 8053AC 80244B2C 8E420000 */ lw $v0, ($s2) -/* 8053B0 80244B30 3C030800 */ lui $v1, 0x800 -/* 8053B4 80244B34 00431025 */ or $v0, $v0, $v1 -.L80244B38: -/* 8053B8 80244B38 AE420000 */ sw $v0, ($s2) -/* 8053BC 80244B3C 2402FFC4 */ addiu $v0, $zero, -0x3c -/* 8053C0 80244B40 16620004 */ bne $s3, $v0, .L80244B54 -/* 8053C4 80244B44 2403FFFD */ addiu $v1, $zero, -3 -/* 8053C8 80244B48 8E220000 */ lw $v0, ($s1) -/* 8053CC 80244B4C 080912D7 */ j .L80244B5C -/* 8053D0 80244B50 34420002 */ ori $v0, $v0, 2 -.L80244B54: -/* 8053D4 80244B54 8E220000 */ lw $v0, ($s1) -/* 8053D8 80244B58 00431024 */ and $v0, $v0, $v1 -.L80244B5C: -/* 8053DC 80244B5C 12800004 */ beqz $s4, .L80244B70 -/* 8053E0 80244B60 AE220000 */ sw $v0, ($s1) -/* 8053E4 80244B64 3C0200A7 */ lui $v0, 0xa7 -/* 8053E8 80244B68 34420006 */ ori $v0, $v0, 6 -/* 8053EC 80244B6C AE220028 */ sw $v0, 0x28($s1) -.L80244B70: -/* 8053F0 80244B70 8FBF0024 */ lw $ra, 0x24($sp) -/* 8053F4 80244B74 8FB40020 */ lw $s4, 0x20($sp) -/* 8053F8 80244B78 8FB3001C */ lw $s3, 0x1c($sp) -/* 8053FC 80244B7C 8FB20018 */ lw $s2, 0x18($sp) -/* 805400 80244B80 8FB10014 */ lw $s1, 0x14($sp) -/* 805404 80244B84 8FB00010 */ lw $s0, 0x10($sp) -/* 805408 80244B88 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 80540C 80244B8C 24020002 */ addiu $v0, $zero, 2 -/* 805410 80244B90 03E00008 */ jr $ra -/* 805414 80244B94 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s new file mode 100644 index 0000000000..b61a403d3a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802449F8_805278.s @@ -0,0 +1,113 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802449F8_805278 +/* 805278 802449F8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 80527C 802449FC AFB00010 */ sw $s0, 0x10($sp) +/* 805280 80244A00 0080802D */ daddu $s0, $a0, $zero +/* 805284 80244A04 0000202D */ daddu $a0, $zero, $zero +/* 805288 80244A08 3C05FD05 */ lui $a1, 0xfd05 +/* 80528C 80244A0C AFBF0024 */ sw $ra, 0x24($sp) +/* 805290 80244A10 AFB40020 */ sw $s4, 0x20($sp) +/* 805294 80244A14 AFB3001C */ sw $s3, 0x1c($sp) +/* 805298 80244A18 AFB20018 */ sw $s2, 0x18($sp) +/* 80529C 80244A1C AFB10014 */ sw $s1, 0x14($sp) +/* 8052A0 80244A20 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8052A4 80244A24 0C0B1EAF */ jal get_variable +/* 8052A8 80244A28 34A50F81 */ ori $a1, $a1, 0xf81 +/* 8052AC 80244A2C 0000202D */ daddu $a0, $zero, $zero +/* 8052B0 80244A30 3C05FD05 */ lui $a1, 0xfd05 +/* 8052B4 80244A34 34A50F80 */ ori $a1, $a1, 0xf80 +/* 8052B8 80244A38 0C0B1EAF */ jal get_variable +/* 8052BC 80244A3C 00029823 */ negu $s3, $v0 +/* 8052C0 80244A40 24040002 */ addiu $a0, $zero, 2 +/* 8052C4 80244A44 8E1100A0 */ lw $s1, 0xa0($s0) +/* 8052C8 80244A48 0C00FB3A */ jal get_enemy +/* 8052CC 80244A4C 0040A02D */ daddu $s4, $v0, $zero +/* 8052D0 80244A50 4493A000 */ mtc1 $s3, $f20 +/* 8052D4 80244A54 00000000 */ nop +/* 8052D8 80244A58 4680A520 */ cvt.s.w $f20, $f20 +/* 8052DC 80244A5C 3C014334 */ lui $at, 0x4334 +/* 8052E0 80244A60 44810000 */ mtc1 $at, $f0 +/* 8052E4 80244A64 3C014049 */ lui $at, 0x4049 +/* 8052E8 80244A68 34210FD8 */ ori $at, $at, 0xfd8 +/* 8052EC 80244A6C 44811000 */ mtc1 $at, $f2 +/* 8052F0 80244A70 4600A503 */ div.s $f20, $f20, $f0 +/* 8052F4 80244A74 4602A502 */ mul.s $f20, $f20, $f2 +/* 8052F8 80244A78 00000000 */ nop +/* 8052FC 80244A7C 0040902D */ daddu $s2, $v0, $zero +/* 805300 80244A80 0C00A85B */ jal sin_rad +/* 805304 80244A84 4600A306 */ mov.s $f12, $f20 +/* 805308 80244A88 4600A306 */ mov.s $f12, $f20 +/* 80530C 80244A8C 0C00A874 */ jal cos_rad +/* 805310 80244A90 46000506 */ mov.s $f20, $f0 +/* 805314 80244A94 C6060084 */ lwc1 $f6, 0x84($s0) +/* 805318 80244A98 468031A0 */ cvt.s.w $f6, $f6 +/* 80531C 80244A9C 46003102 */ mul.s $f4, $f6, $f0 +/* 805320 80244AA0 00000000 */ nop +/* 805324 80244AA4 C6020088 */ lwc1 $f2, 0x88($s0) +/* 805328 80244AA8 468010A0 */ cvt.s.w $f2, $f2 +/* 80532C 80244AAC 46141202 */ mul.s $f8, $f2, $f20 +/* 805330 80244AB0 00000000 */ nop +/* 805334 80244AB4 46143182 */ mul.s $f6, $f6, $f20 +/* 805338 80244AB8 00000000 */ nop +/* 80533C 80244ABC 46001082 */ mul.s $f2, $f2, $f0 +/* 805340 80244AC0 00000000 */ nop +/* 805344 80244AC4 46082101 */ sub.s $f4, $f4, $f8 +/* 805348 80244AC8 8E02008C */ lw $v0, 0x8c($s0) +/* 80534C 80244ACC 46023180 */ add.s $f6, $f6, $f2 +/* 805350 80244AD0 4600228D */ trunc.w.s $f10, $f4 +/* 805354 80244AD4 44035000 */ mfc1 $v1, $f10 +/* 805358 80244AD8 00000000 */ nop +/* 80535C 80244ADC 00431021 */ addu $v0, $v0, $v1 +/* 805360 80244AE0 AE020094 */ sw $v0, 0x94($s0) +/* 805364 80244AE4 8E020090 */ lw $v0, 0x90($s0) +/* 805368 80244AE8 4600328D */ trunc.w.s $f10, $f6 +/* 80536C 80244AEC 44035000 */ mfc1 $v1, $f10 +/* 805370 80244AF0 00000000 */ nop +/* 805374 80244AF4 00431021 */ addu $v0, $v0, $v1 +/* 805378 80244AF8 16600009 */ bnez $s3, .L80244B20 +/* 80537C 80244AFC AE020098 */ sw $v0, 0x98($s0) +/* 805380 80244B00 3C0200A7 */ lui $v0, 0xa7 +/* 805384 80244B04 34420001 */ ori $v0, $v0, 1 +/* 805388 80244B08 3C03F7FF */ lui $v1, 0xf7ff +/* 80538C 80244B0C AE220028 */ sw $v0, 0x28($s1) +/* 805390 80244B10 8E420000 */ lw $v0, ($s2) +/* 805394 80244B14 3463FFFF */ ori $v1, $v1, 0xffff +/* 805398 80244B18 080912CE */ j .L80244B38 +/* 80539C 80244B1C 00431024 */ and $v0, $v0, $v1 +.L80244B20: +/* 8053A0 80244B20 3C0200A7 */ lui $v0, 0xa7 +/* 8053A4 80244B24 34420002 */ ori $v0, $v0, 2 +/* 8053A8 80244B28 AE220028 */ sw $v0, 0x28($s1) +/* 8053AC 80244B2C 8E420000 */ lw $v0, ($s2) +/* 8053B0 80244B30 3C030800 */ lui $v1, 0x800 +/* 8053B4 80244B34 00431025 */ or $v0, $v0, $v1 +.L80244B38: +/* 8053B8 80244B38 AE420000 */ sw $v0, ($s2) +/* 8053BC 80244B3C 2402FFC4 */ addiu $v0, $zero, -0x3c +/* 8053C0 80244B40 16620004 */ bne $s3, $v0, .L80244B54 +/* 8053C4 80244B44 2403FFFD */ addiu $v1, $zero, -3 +/* 8053C8 80244B48 8E220000 */ lw $v0, ($s1) +/* 8053CC 80244B4C 080912D7 */ j .L80244B5C +/* 8053D0 80244B50 34420002 */ ori $v0, $v0, 2 +.L80244B54: +/* 8053D4 80244B54 8E220000 */ lw $v0, ($s1) +/* 8053D8 80244B58 00431024 */ and $v0, $v0, $v1 +.L80244B5C: +/* 8053DC 80244B5C 12800004 */ beqz $s4, .L80244B70 +/* 8053E0 80244B60 AE220000 */ sw $v0, ($s1) +/* 8053E4 80244B64 3C0200A7 */ lui $v0, 0xa7 +/* 8053E8 80244B68 34420006 */ ori $v0, $v0, 6 +/* 8053EC 80244B6C AE220028 */ sw $v0, 0x28($s1) +.L80244B70: +/* 8053F0 80244B70 8FBF0024 */ lw $ra, 0x24($sp) +/* 8053F4 80244B74 8FB40020 */ lw $s4, 0x20($sp) +/* 8053F8 80244B78 8FB3001C */ lw $s3, 0x1c($sp) +/* 8053FC 80244B7C 8FB20018 */ lw $s2, 0x18($sp) +/* 805400 80244B80 8FB10014 */ lw $s1, 0x14($sp) +/* 805404 80244B84 8FB00010 */ lw $s0, 0x10($sp) +/* 805408 80244B88 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 80540C 80244B8C 24020002 */ addiu $v0, $zero, 2 +/* 805410 80244B90 03E00008 */ jr $ra +/* 805414 80244B94 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68.s deleted file mode 100644 index e713baf942..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244D68 -/* 8055E8 80244D68 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8055EC 80244D6C AFBF0010 */ sw $ra, 0x10($sp) -/* 8055F0 80244D70 0000202D */ daddu $a0, $zero, $zero -/* 8055F4 80244D74 3C05F840 */ lui $a1, 0xf840 -/* 8055F8 80244D78 0C0B1EAF */ jal get_variable -/* 8055FC 80244D7C 34A55C84 */ ori $a1, $a1, 0x5c84 -/* 805600 80244D80 14400008 */ bnez $v0, .L80244DA4 -/* 805604 80244D84 0000202D */ daddu $a0, $zero, $zero -/* 805608 80244D88 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 80560C 80244D8C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 805610 80244D90 8C420140 */ lw $v0, 0x140($v0) -/* 805614 80244D94 8C440000 */ lw $a0, ($v0) -/* 805618 80244D98 0C04D052 */ jal set_item_entity_flags -/* 80561C 80244D9C 24050040 */ addiu $a1, $zero, 0x40 -/* 805620 80244DA0 0000202D */ daddu $a0, $zero, $zero -.L80244DA4: -/* 805624 80244DA4 3C05F840 */ lui $a1, 0xf840 -/* 805628 80244DA8 0C0B1EAF */ jal get_variable -/* 80562C 80244DAC 34A55C85 */ ori $a1, $a1, 0x5c85 -/* 805630 80244DB0 14400008 */ bnez $v0, .L80244DD4 -/* 805634 80244DB4 0000202D */ daddu $a0, $zero, $zero -/* 805638 80244DB8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 80563C 80244DBC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 805640 80244DC0 8C420140 */ lw $v0, 0x140($v0) -/* 805644 80244DC4 8C440010 */ lw $a0, 0x10($v0) -/* 805648 80244DC8 0C04D052 */ jal set_item_entity_flags -/* 80564C 80244DCC 24050040 */ addiu $a1, $zero, 0x40 -/* 805650 80244DD0 0000202D */ daddu $a0, $zero, $zero -.L80244DD4: -/* 805654 80244DD4 3C05F840 */ lui $a1, 0xf840 -/* 805658 80244DD8 0C0B1EAF */ jal get_variable -/* 80565C 80244DDC 34A55C86 */ ori $a1, $a1, 0x5c86 -/* 805660 80244DE0 14400007 */ bnez $v0, .L80244E00 -/* 805664 80244DE4 00000000 */ nop -/* 805668 80244DE8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 80566C 80244DEC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 805670 80244DF0 8C420140 */ lw $v0, 0x140($v0) -/* 805674 80244DF4 8C440020 */ lw $a0, 0x20($v0) -/* 805678 80244DF8 0C04D052 */ jal set_item_entity_flags -/* 80567C 80244DFC 24050040 */ addiu $a1, $zero, 0x40 -.L80244E00: -/* 805680 80244E00 8FBF0010 */ lw $ra, 0x10($sp) -/* 805684 80244E04 24020002 */ addiu $v0, $zero, 2 -/* 805688 80244E08 03E00008 */ jr $ra -/* 80568C 80244E0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68_8055E8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68_8055E8.s new file mode 100644 index 0000000000..4d0fd467f6 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244D68_8055E8.s @@ -0,0 +1,49 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244D68_8055E8 +/* 8055E8 80244D68 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8055EC 80244D6C AFBF0010 */ sw $ra, 0x10($sp) +/* 8055F0 80244D70 0000202D */ daddu $a0, $zero, $zero +/* 8055F4 80244D74 3C05F840 */ lui $a1, 0xf840 +/* 8055F8 80244D78 0C0B1EAF */ jal get_variable +/* 8055FC 80244D7C 34A55C84 */ ori $a1, $a1, 0x5c84 +/* 805600 80244D80 14400008 */ bnez $v0, .L80244DA4 +/* 805604 80244D84 0000202D */ daddu $a0, $zero, $zero +/* 805608 80244D88 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 80560C 80244D8C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 805610 80244D90 8C420140 */ lw $v0, 0x140($v0) +/* 805614 80244D94 8C440000 */ lw $a0, ($v0) +/* 805618 80244D98 0C04D052 */ jal set_item_entity_flags +/* 80561C 80244D9C 24050040 */ addiu $a1, $zero, 0x40 +/* 805620 80244DA0 0000202D */ daddu $a0, $zero, $zero +.L80244DA4: +/* 805624 80244DA4 3C05F840 */ lui $a1, 0xf840 +/* 805628 80244DA8 0C0B1EAF */ jal get_variable +/* 80562C 80244DAC 34A55C85 */ ori $a1, $a1, 0x5c85 +/* 805630 80244DB0 14400008 */ bnez $v0, .L80244DD4 +/* 805634 80244DB4 0000202D */ daddu $a0, $zero, $zero +/* 805638 80244DB8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 80563C 80244DBC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 805640 80244DC0 8C420140 */ lw $v0, 0x140($v0) +/* 805644 80244DC4 8C440010 */ lw $a0, 0x10($v0) +/* 805648 80244DC8 0C04D052 */ jal set_item_entity_flags +/* 80564C 80244DCC 24050040 */ addiu $a1, $zero, 0x40 +/* 805650 80244DD0 0000202D */ daddu $a0, $zero, $zero +.L80244DD4: +/* 805654 80244DD4 3C05F840 */ lui $a1, 0xf840 +/* 805658 80244DD8 0C0B1EAF */ jal get_variable +/* 80565C 80244DDC 34A55C86 */ ori $a1, $a1, 0x5c86 +/* 805660 80244DE0 14400007 */ bnez $v0, .L80244E00 +/* 805664 80244DE4 00000000 */ nop +/* 805668 80244DE8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 80566C 80244DEC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 805670 80244DF0 8C420140 */ lw $v0, 0x140($v0) +/* 805674 80244DF4 8C440020 */ lw $a0, 0x20($v0) +/* 805678 80244DF8 0C04D052 */ jal set_item_entity_flags +/* 80567C 80244DFC 24050040 */ addiu $a1, $zero, 0x40 +.L80244E00: +/* 805680 80244E00 8FBF0010 */ lw $ra, 0x10($sp) +/* 805684 80244E04 24020002 */ addiu $v0, $zero, 2 +/* 805688 80244E08 03E00008 */ jr $ra +/* 80568C 80244E0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10.s deleted file mode 100644 index 1774fbb425..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244E10 -/* 805690 80244E10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805694 80244E14 AFB00010 */ sw $s0, 0x10($sp) -/* 805698 80244E18 0080802D */ daddu $s0, $a0, $zero -/* 80569C 80244E1C AFBF0014 */ sw $ra, 0x14($sp) -/* 8056A0 80244E20 8E02000C */ lw $v0, 0xc($s0) -/* 8056A4 80244E24 0C0B1EAF */ jal get_variable -/* 8056A8 80244E28 8C450000 */ lw $a1, ($v0) -/* 8056AC 80244E2C C6000084 */ lwc1 $f0, 0x84($s0) -/* 8056B0 80244E30 46800020 */ cvt.s.w $f0, $f0 -/* 8056B4 80244E34 00021100 */ sll $v0, $v0, 4 -/* 8056B8 80244E38 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8056BC 80244E3C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8056C0 80244E40 44050000 */ mfc1 $a1, $f0 -/* 8056C4 80244E44 C6000088 */ lwc1 $f0, 0x88($s0) -/* 8056C8 80244E48 46800020 */ cvt.s.w $f0, $f0 -/* 8056CC 80244E4C 8C630140 */ lw $v1, 0x140($v1) -/* 8056D0 80244E50 44060000 */ mfc1 $a2, $f0 -/* 8056D4 80244E54 00431021 */ addu $v0, $v0, $v1 -/* 8056D8 80244E58 8E03008C */ lw $v1, 0x8c($s0) -/* 8056DC 80244E5C 8C440000 */ lw $a0, ($v0) -/* 8056E0 80244E60 24630006 */ addiu $v1, $v1, 6 -/* 8056E4 80244E64 44830000 */ mtc1 $v1, $f0 -/* 8056E8 80244E68 00000000 */ nop -/* 8056EC 80244E6C 46800020 */ cvt.s.w $f0, $f0 -/* 8056F0 80244E70 44070000 */ mfc1 $a3, $f0 -/* 8056F4 80244E74 0C04D083 */ jal set_item_entity_position -/* 8056F8 80244E78 00000000 */ nop -/* 8056FC 80244E7C 8FBF0014 */ lw $ra, 0x14($sp) -/* 805700 80244E80 8FB00010 */ lw $s0, 0x10($sp) -/* 805704 80244E84 24020002 */ addiu $v0, $zero, 2 -/* 805708 80244E88 03E00008 */ jr $ra -/* 80570C 80244E8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s new file mode 100644 index 0000000000..c86e9ccc3c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E10_805690.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244E10_805690 +/* 805690 80244E10 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 805694 80244E14 AFB00010 */ sw $s0, 0x10($sp) +/* 805698 80244E18 0080802D */ daddu $s0, $a0, $zero +/* 80569C 80244E1C AFBF0014 */ sw $ra, 0x14($sp) +/* 8056A0 80244E20 8E02000C */ lw $v0, 0xc($s0) +/* 8056A4 80244E24 0C0B1EAF */ jal get_variable +/* 8056A8 80244E28 8C450000 */ lw $a1, ($v0) +/* 8056AC 80244E2C C6000084 */ lwc1 $f0, 0x84($s0) +/* 8056B0 80244E30 46800020 */ cvt.s.w $f0, $f0 +/* 8056B4 80244E34 00021100 */ sll $v0, $v0, 4 +/* 8056B8 80244E38 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 8056BC 80244E3C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 8056C0 80244E40 44050000 */ mfc1 $a1, $f0 +/* 8056C4 80244E44 C6000088 */ lwc1 $f0, 0x88($s0) +/* 8056C8 80244E48 46800020 */ cvt.s.w $f0, $f0 +/* 8056CC 80244E4C 8C630140 */ lw $v1, 0x140($v1) +/* 8056D0 80244E50 44060000 */ mfc1 $a2, $f0 +/* 8056D4 80244E54 00431021 */ addu $v0, $v0, $v1 +/* 8056D8 80244E58 8E03008C */ lw $v1, 0x8c($s0) +/* 8056DC 80244E5C 8C440000 */ lw $a0, ($v0) +/* 8056E0 80244E60 24630006 */ addiu $v1, $v1, 6 +/* 8056E4 80244E64 44830000 */ mtc1 $v1, $f0 +/* 8056E8 80244E68 00000000 */ nop +/* 8056EC 80244E6C 46800020 */ cvt.s.w $f0, $f0 +/* 8056F0 80244E70 44070000 */ mfc1 $a3, $f0 +/* 8056F4 80244E74 0C04D083 */ jal set_item_entity_position +/* 8056F8 80244E78 00000000 */ nop +/* 8056FC 80244E7C 8FBF0014 */ lw $ra, 0x14($sp) +/* 805700 80244E80 8FB00010 */ lw $s0, 0x10($sp) +/* 805704 80244E84 24020002 */ addiu $v0, $zero, 2 +/* 805708 80244E88 03E00008 */ jr $ra +/* 80570C 80244E8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90.s deleted file mode 100644 index 70accc0ac3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244E90 -/* 805710 80244E90 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 805714 80244E94 AFB60028 */ sw $s6, 0x28($sp) -/* 805718 80244E98 0080B02D */ daddu $s6, $a0, $zero -/* 80571C 80244E9C AFB50024 */ sw $s5, 0x24($sp) -/* 805720 80244EA0 3C158011 */ lui $s5, %hi(gPlayerData) -/* 805724 80244EA4 26B5F290 */ addiu $s5, $s5, %lo(gPlayerData) -/* 805728 80244EA8 AFB20018 */ sw $s2, 0x18($sp) -/* 80572C 80244EAC 2412FFFF */ addiu $s2, $zero, -1 -/* 805730 80244EB0 AFB00010 */ sw $s0, 0x10($sp) -/* 805734 80244EB4 0000802D */ daddu $s0, $zero, $zero -/* 805738 80244EB8 AFB40020 */ sw $s4, 0x20($sp) -/* 80573C 80244EBC 3C14F840 */ lui $s4, 0xf840 -/* 805740 80244EC0 36945C19 */ ori $s4, $s4, 0x5c19 -/* 805744 80244EC4 AFB3001C */ sw $s3, 0x1c($sp) -/* 805748 80244EC8 3C13F840 */ lui $s3, 0xf840 -/* 80574C 80244ECC 36735C2C */ ori $s3, $s3, 0x5c2c -/* 805750 80244ED0 AFB10014 */ sw $s1, 0x14($sp) -/* 805754 80244ED4 3C118025 */ lui $s1, 0x8025 -/* 805758 80244ED8 26316ADC */ addiu $s1, $s1, 0x6adc -/* 80575C 80244EDC AFBF002C */ sw $ra, 0x2c($sp) -.L80244EE0: -/* 805760 80244EE0 8E220000 */ lw $v0, ($s1) -/* 805764 80244EE4 000210C0 */ sll $v0, $v0, 3 -/* 805768 80244EE8 02A21021 */ addu $v0, $s5, $v0 -/* 80576C 80244EEC 90420014 */ lbu $v0, 0x14($v0) -/* 805770 80244EF0 1040000A */ beqz $v0, .L80244F1C -/* 805774 80244EF4 0000202D */ daddu $a0, $zero, $zero -/* 805778 80244EF8 0C0B1EAF */ jal get_variable -/* 80577C 80244EFC 02142821 */ addu $a1, $s0, $s4 -/* 805780 80244F00 10400006 */ beqz $v0, .L80244F1C -/* 805784 80244F04 0000202D */ daddu $a0, $zero, $zero -/* 805788 80244F08 0C0B1EAF */ jal get_variable -/* 80578C 80244F0C 02132821 */ addu $a1, $s0, $s3 -/* 805790 80244F10 10400006 */ beqz $v0, .L80244F2C -/* 805794 80244F14 24120001 */ addiu $s2, $zero, 1 -/* 805798 80244F18 0000902D */ daddu $s2, $zero, $zero -.L80244F1C: -/* 80579C 80244F1C 26100001 */ addiu $s0, $s0, 1 -/* 8057A0 80244F20 2E020013 */ sltiu $v0, $s0, 0x13 -/* 8057A4 80244F24 1440FFEE */ bnez $v0, .L80244EE0 -/* 8057A8 80244F28 26310014 */ addiu $s1, $s1, 0x14 -.L80244F2C: -/* 8057AC 80244F2C AED20084 */ sw $s2, 0x84($s6) -/* 8057B0 80244F30 8FBF002C */ lw $ra, 0x2c($sp) -/* 8057B4 80244F34 8FB60028 */ lw $s6, 0x28($sp) -/* 8057B8 80244F38 8FB50024 */ lw $s5, 0x24($sp) -/* 8057BC 80244F3C 8FB40020 */ lw $s4, 0x20($sp) -/* 8057C0 80244F40 8FB3001C */ lw $s3, 0x1c($sp) -/* 8057C4 80244F44 8FB20018 */ lw $s2, 0x18($sp) -/* 8057C8 80244F48 8FB10014 */ lw $s1, 0x14($sp) -/* 8057CC 80244F4C 8FB00010 */ lw $s0, 0x10($sp) -/* 8057D0 80244F50 24020002 */ addiu $v0, $zero, 2 -/* 8057D4 80244F54 03E00008 */ jr $ra -/* 8057D8 80244F58 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s new file mode 100644 index 0000000000..fc8c76449d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244E90_805710.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244E90_805710 +/* 805710 80244E90 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 805714 80244E94 AFB60028 */ sw $s6, 0x28($sp) +/* 805718 80244E98 0080B02D */ daddu $s6, $a0, $zero +/* 80571C 80244E9C AFB50024 */ sw $s5, 0x24($sp) +/* 805720 80244EA0 3C158011 */ lui $s5, %hi(gPlayerData) +/* 805724 80244EA4 26B5F290 */ addiu $s5, $s5, %lo(gPlayerData) +/* 805728 80244EA8 AFB20018 */ sw $s2, 0x18($sp) +/* 80572C 80244EAC 2412FFFF */ addiu $s2, $zero, -1 +/* 805730 80244EB0 AFB00010 */ sw $s0, 0x10($sp) +/* 805734 80244EB4 0000802D */ daddu $s0, $zero, $zero +/* 805738 80244EB8 AFB40020 */ sw $s4, 0x20($sp) +/* 80573C 80244EBC 3C14F840 */ lui $s4, 0xf840 +/* 805740 80244EC0 36945C19 */ ori $s4, $s4, 0x5c19 +/* 805744 80244EC4 AFB3001C */ sw $s3, 0x1c($sp) +/* 805748 80244EC8 3C13F840 */ lui $s3, 0xf840 +/* 80574C 80244ECC 36735C2C */ ori $s3, $s3, 0x5c2c +/* 805750 80244ED0 AFB10014 */ sw $s1, 0x14($sp) +/* 805754 80244ED4 3C118025 */ lui $s1, 0x8025 +/* 805758 80244ED8 26316ADC */ addiu $s1, $s1, 0x6adc +/* 80575C 80244EDC AFBF002C */ sw $ra, 0x2c($sp) +.L80244EE0: +/* 805760 80244EE0 8E220000 */ lw $v0, ($s1) +/* 805764 80244EE4 000210C0 */ sll $v0, $v0, 3 +/* 805768 80244EE8 02A21021 */ addu $v0, $s5, $v0 +/* 80576C 80244EEC 90420014 */ lbu $v0, 0x14($v0) +/* 805770 80244EF0 1040000A */ beqz $v0, .L80244F1C +/* 805774 80244EF4 0000202D */ daddu $a0, $zero, $zero +/* 805778 80244EF8 0C0B1EAF */ jal get_variable +/* 80577C 80244EFC 02142821 */ addu $a1, $s0, $s4 +/* 805780 80244F00 10400006 */ beqz $v0, .L80244F1C +/* 805784 80244F04 0000202D */ daddu $a0, $zero, $zero +/* 805788 80244F08 0C0B1EAF */ jal get_variable +/* 80578C 80244F0C 02132821 */ addu $a1, $s0, $s3 +/* 805790 80244F10 10400006 */ beqz $v0, .L80244F2C +/* 805794 80244F14 24120001 */ addiu $s2, $zero, 1 +/* 805798 80244F18 0000902D */ daddu $s2, $zero, $zero +.L80244F1C: +/* 80579C 80244F1C 26100001 */ addiu $s0, $s0, 1 +/* 8057A0 80244F20 2E020013 */ sltiu $v0, $s0, 0x13 +/* 8057A4 80244F24 1440FFEE */ bnez $v0, .L80244EE0 +/* 8057A8 80244F28 26310014 */ addiu $s1, $s1, 0x14 +.L80244F2C: +/* 8057AC 80244F2C AED20084 */ sw $s2, 0x84($s6) +/* 8057B0 80244F30 8FBF002C */ lw $ra, 0x2c($sp) +/* 8057B4 80244F34 8FB60028 */ lw $s6, 0x28($sp) +/* 8057B8 80244F38 8FB50024 */ lw $s5, 0x24($sp) +/* 8057BC 80244F3C 8FB40020 */ lw $s4, 0x20($sp) +/* 8057C0 80244F40 8FB3001C */ lw $s3, 0x1c($sp) +/* 8057C4 80244F44 8FB20018 */ lw $s2, 0x18($sp) +/* 8057C8 80244F48 8FB10014 */ lw $s1, 0x14($sp) +/* 8057CC 80244F4C 8FB00010 */ lw $s0, 0x10($sp) +/* 8057D0 80244F50 24020002 */ addiu $v0, $zero, 2 +/* 8057D4 80244F54 03E00008 */ jr $ra +/* 8057D8 80244F58 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C.s deleted file mode 100644 index 30e2750c1d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244F5C -/* 8057DC 80244F5C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8057E0 80244F60 AFB50024 */ sw $s5, 0x24($sp) -/* 8057E4 80244F64 0080A82D */ daddu $s5, $a0, $zero -/* 8057E8 80244F68 AFB10014 */ sw $s1, 0x14($sp) -/* 8057EC 80244F6C 0000882D */ daddu $s1, $zero, $zero -/* 8057F0 80244F70 AFB00010 */ sw $s0, 0x10($sp) -/* 8057F4 80244F74 0220802D */ daddu $s0, $s1, $zero -/* 8057F8 80244F78 AFB40020 */ sw $s4, 0x20($sp) -/* 8057FC 80244F7C 3C14F840 */ lui $s4, 0xf840 -/* 805800 80244F80 36945C19 */ ori $s4, $s4, 0x5c19 -/* 805804 80244F84 AFB3001C */ sw $s3, 0x1c($sp) -/* 805808 80244F88 3C13F840 */ lui $s3, 0xf840 -/* 80580C 80244F8C 36735C2C */ ori $s3, $s3, 0x5c2c -/* 805810 80244F90 AFB20018 */ sw $s2, 0x18($sp) -/* 805814 80244F94 3C128025 */ lui $s2, 0x8025 -/* 805818 80244F98 26526ADC */ addiu $s2, $s2, 0x6adc -/* 80581C 80244F9C AFBF0028 */ sw $ra, 0x28($sp) -.L80244FA0: -/* 805820 80244FA0 8E420000 */ lw $v0, ($s2) -/* 805824 80244FA4 5455000F */ bnel $v0, $s5, .L80244FE4 -/* 805828 80244FA8 26100001 */ addiu $s0, $s0, 1 -/* 80582C 80244FAC 0000202D */ daddu $a0, $zero, $zero -/* 805830 80244FB0 0C0B1EAF */ jal get_variable -/* 805834 80244FB4 02142821 */ addu $a1, $s0, $s4 -/* 805838 80244FB8 5040000A */ beql $v0, $zero, .L80244FE4 -/* 80583C 80244FBC 26100001 */ addiu $s0, $s0, 1 -/* 805840 80244FC0 52200001 */ beql $s1, $zero, .L80244FC8 -/* 805844 80244FC4 24110001 */ addiu $s1, $zero, 1 -.L80244FC8: -/* 805848 80244FC8 0000202D */ daddu $a0, $zero, $zero -/* 80584C 80244FCC 0C0B1EAF */ jal get_variable -/* 805850 80244FD0 02132821 */ addu $a1, $s0, $s3 -/* 805854 80244FD4 14400003 */ bnez $v0, .L80244FE4 -/* 805858 80244FD8 26100001 */ addiu $s0, $s0, 1 -/* 80585C 80244FDC 080913FC */ j .L80244FF0 -/* 805860 80244FE0 24110002 */ addiu $s1, $zero, 2 -.L80244FE4: -/* 805864 80244FE4 2E020013 */ sltiu $v0, $s0, 0x13 -/* 805868 80244FE8 1440FFED */ bnez $v0, .L80244FA0 -/* 80586C 80244FEC 26520014 */ addiu $s2, $s2, 0x14 -.L80244FF0: -/* 805870 80244FF0 0220102D */ daddu $v0, $s1, $zero -/* 805874 80244FF4 8FBF0028 */ lw $ra, 0x28($sp) -/* 805878 80244FF8 8FB50024 */ lw $s5, 0x24($sp) -/* 80587C 80244FFC 8FB40020 */ lw $s4, 0x20($sp) -/* 805880 80245000 8FB3001C */ lw $s3, 0x1c($sp) -/* 805884 80245004 8FB20018 */ lw $s2, 0x18($sp) -/* 805888 80245008 8FB10014 */ lw $s1, 0x14($sp) -/* 80588C 8024500C 8FB00010 */ lw $s0, 0x10($sp) -/* 805890 80245010 03E00008 */ jr $ra -/* 805894 80245014 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s new file mode 100644 index 0000000000..74548a9584 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80244F5C_8057DC.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244F5C_8057DC +/* 8057DC 80244F5C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8057E0 80244F60 AFB50024 */ sw $s5, 0x24($sp) +/* 8057E4 80244F64 0080A82D */ daddu $s5, $a0, $zero +/* 8057E8 80244F68 AFB10014 */ sw $s1, 0x14($sp) +/* 8057EC 80244F6C 0000882D */ daddu $s1, $zero, $zero +/* 8057F0 80244F70 AFB00010 */ sw $s0, 0x10($sp) +/* 8057F4 80244F74 0220802D */ daddu $s0, $s1, $zero +/* 8057F8 80244F78 AFB40020 */ sw $s4, 0x20($sp) +/* 8057FC 80244F7C 3C14F840 */ lui $s4, 0xf840 +/* 805800 80244F80 36945C19 */ ori $s4, $s4, 0x5c19 +/* 805804 80244F84 AFB3001C */ sw $s3, 0x1c($sp) +/* 805808 80244F88 3C13F840 */ lui $s3, 0xf840 +/* 80580C 80244F8C 36735C2C */ ori $s3, $s3, 0x5c2c +/* 805810 80244F90 AFB20018 */ sw $s2, 0x18($sp) +/* 805814 80244F94 3C128025 */ lui $s2, 0x8025 +/* 805818 80244F98 26526ADC */ addiu $s2, $s2, 0x6adc +/* 80581C 80244F9C AFBF0028 */ sw $ra, 0x28($sp) +.L80244FA0: +/* 805820 80244FA0 8E420000 */ lw $v0, ($s2) +/* 805824 80244FA4 5455000F */ bnel $v0, $s5, .L80244FE4 +/* 805828 80244FA8 26100001 */ addiu $s0, $s0, 1 +/* 80582C 80244FAC 0000202D */ daddu $a0, $zero, $zero +/* 805830 80244FB0 0C0B1EAF */ jal get_variable +/* 805834 80244FB4 02142821 */ addu $a1, $s0, $s4 +/* 805838 80244FB8 5040000A */ beql $v0, $zero, .L80244FE4 +/* 80583C 80244FBC 26100001 */ addiu $s0, $s0, 1 +/* 805840 80244FC0 52200001 */ beql $s1, $zero, .L80244FC8 +/* 805844 80244FC4 24110001 */ addiu $s1, $zero, 1 +.L80244FC8: +/* 805848 80244FC8 0000202D */ daddu $a0, $zero, $zero +/* 80584C 80244FCC 0C0B1EAF */ jal get_variable +/* 805850 80244FD0 02132821 */ addu $a1, $s0, $s3 +/* 805854 80244FD4 14400003 */ bnez $v0, .L80244FE4 +/* 805858 80244FD8 26100001 */ addiu $s0, $s0, 1 +/* 80585C 80244FDC 080913FC */ j .L80244FF0 +/* 805860 80244FE0 24110002 */ addiu $s1, $zero, 2 +.L80244FE4: +/* 805864 80244FE4 2E020013 */ sltiu $v0, $s0, 0x13 +/* 805868 80244FE8 1440FFED */ bnez $v0, .L80244FA0 +/* 80586C 80244FEC 26520014 */ addiu $s2, $s2, 0x14 +.L80244FF0: +/* 805870 80244FF0 0220102D */ daddu $v0, $s1, $zero +/* 805874 80244FF4 8FBF0028 */ lw $ra, 0x28($sp) +/* 805878 80244FF8 8FB50024 */ lw $s5, 0x24($sp) +/* 80587C 80244FFC 8FB40020 */ lw $s4, 0x20($sp) +/* 805880 80245000 8FB3001C */ lw $s3, 0x1c($sp) +/* 805884 80245004 8FB20018 */ lw $s2, 0x18($sp) +/* 805888 80245008 8FB10014 */ lw $s1, 0x14($sp) +/* 80588C 8024500C 8FB00010 */ lw $s0, 0x10($sp) +/* 805890 80245010 03E00008 */ jr $ra +/* 805894 80245014 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018.s deleted file mode 100644 index 43c5d57eea..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245018 -/* 805898 80245018 3C018026 */ lui $at, 0x8026 -/* 80589C 8024501C AC202F68 */ sw $zero, 0x2f68($at) -/* 8058A0 80245020 03E00008 */ jr $ra -/* 8058A4 80245024 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018_805898.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018_805898.s new file mode 100644 index 0000000000..5e3dcf1c3e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245018_805898.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245018_805898 +/* 805898 80245018 3C018026 */ lui $at, 0x8026 +/* 80589C 8024501C AC202F68 */ sw $zero, 0x2f68($at) +/* 8058A0 80245020 03E00008 */ jr $ra +/* 8058A4 80245024 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028.s deleted file mode 100644 index 064fdce949..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245028 -/* 8058A8 80245028 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8058AC 8024502C AFB70034 */ sw $s7, 0x34($sp) -/* 8058B0 80245030 0080B82D */ daddu $s7, $a0, $zero -/* 8058B4 80245034 AFBE0038 */ sw $fp, 0x38($sp) -/* 8058B8 80245038 3C1E8026 */ lui $fp, 0x8026 -/* 8058BC 8024503C 27DE2C38 */ addiu $fp, $fp, 0x2c38 -/* 8058C0 80245040 AFBF003C */ sw $ra, 0x3c($sp) -/* 8058C4 80245044 AFB60030 */ sw $s6, 0x30($sp) -/* 8058C8 80245048 AFB5002C */ sw $s5, 0x2c($sp) -/* 8058CC 8024504C AFB40028 */ sw $s4, 0x28($sp) -/* 8058D0 80245050 AFB30024 */ sw $s3, 0x24($sp) -/* 8058D4 80245054 AFB20020 */ sw $s2, 0x20($sp) -/* 8058D8 80245058 AFB1001C */ sw $s1, 0x1c($sp) -/* 8058DC 8024505C 10A00045 */ beqz $a1, .L80245174 -/* 8058E0 80245060 AFB00018 */ sw $s0, 0x18($sp) -/* 8058E4 80245064 0000B02D */ daddu $s6, $zero, $zero -/* 8058E8 80245068 24150001 */ addiu $s5, $zero, 1 -/* 8058EC 8024506C 02A0282D */ daddu $a1, $s5, $zero -/* 8058F0 80245070 3C148009 */ lui $s4, 0x8009 -/* 8058F4 80245074 2694EEC4 */ addiu $s4, $s4, -0x113c -/* 8058F8 80245078 03C0882D */ daddu $s1, $fp, $zero -.L8024507C: -/* 8058FC 8024507C 8E900000 */ lw $s0, ($s4) -/* 805900 80245080 3C068011 */ lui $a2, %hi(gPlayerData) -/* 805904 80245084 24C6F290 */ addiu $a2, $a2, %lo(gPlayerData) -/* 805908 80245088 001010C0 */ sll $v0, $s0, 3 -/* 80590C 8024508C 00C29821 */ addu $s3, $a2, $v0 -/* 805910 80245090 92620014 */ lbu $v0, 0x14($s3) -/* 805914 80245094 50400027 */ beql $v0, $zero, .L80245134 -/* 805918 80245098 26B50001 */ addiu $s5, $s5, 1 -/* 80591C 8024509C 24060005 */ addiu $a2, $zero, 5 -/* 805920 802450A0 52060024 */ beql $s0, $a2, .L80245134 -/* 805924 802450A4 26B50001 */ addiu $s5, $s5, 1 -/* 805928 802450A8 0200202D */ daddu $a0, $s0, $zero -/* 80592C 802450AC 00101100 */ sll $v0, $s0, 4 -/* 805930 802450B0 3C068009 */ lui $a2, 0x8009 -/* 805934 802450B4 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* 805938 802450B8 00469021 */ addu $s2, $v0, $a2 -/* 80593C 802450BC 0C0913D7 */ jal func_80244F5C -/* 805940 802450C0 AFA50010 */ sw $a1, 0x10($sp) -/* 805944 802450C4 0040182D */ daddu $v1, $v0, $zero -/* 805948 802450C8 8FA50010 */ lw $a1, 0x10($sp) -/* 80594C 802450CC 50600019 */ beql $v1, $zero, .L80245134 -/* 805950 802450D0 26B50001 */ addiu $s5, $s5, 1 -/* 805954 802450D4 00102080 */ sll $a0, $s0, 2 -/* 805958 802450D8 3C06800F */ lui $a2, 0x800f -/* 80595C 802450DC 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* 805960 802450E0 00861021 */ addu $v0, $a0, $a2 -/* 805964 802450E4 8C420000 */ lw $v0, ($v0) -/* 805968 802450E8 AE300108 */ sw $s0, 0x108($s1) -/* 80596C 802450EC AE25018C */ sw $a1, 0x18c($s1) -/* 805970 802450F0 AE220000 */ sw $v0, ($s1) -/* 805974 802450F4 8E420000 */ lw $v0, ($s2) -/* 805978 802450F8 AE220084 */ sw $v0, 0x84($s1) -/* 80597C 802450FC 8E420008 */ lw $v0, 8($s2) -/* 805980 80245100 AE220294 */ sw $v0, 0x294($s1) -/* 805984 80245104 82620015 */ lb $v0, 0x15($s3) -/* 805988 80245108 14650007 */ bne $v1, $a1, .L80245128 -/* 80598C 8024510C AE220210 */ sw $v0, 0x210($s1) -/* 805990 80245110 3C06800F */ lui $a2, 0x800f -/* 805994 80245114 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* 805998 80245118 00861021 */ addu $v0, $a0, $a2 -/* 80599C 8024511C AE20018C */ sw $zero, 0x18c($s1) -/* 8059A0 80245120 8C420000 */ lw $v0, ($v0) -/* 8059A4 80245124 AE220000 */ sw $v0, ($s1) -.L80245128: -/* 8059A8 80245128 26310004 */ addiu $s1, $s1, 4 -/* 8059AC 8024512C 26D60001 */ addiu $s6, $s6, 1 -/* 8059B0 80245130 26B50001 */ addiu $s5, $s5, 1 -.L80245134: -/* 8059B4 80245134 2AA2000C */ slti $v0, $s5, 0xc -/* 8059B8 80245138 1440FFD0 */ bnez $v0, .L8024507C -/* 8059BC 8024513C 26940004 */ addiu $s4, $s4, 4 -/* 8059C0 80245140 03C0202D */ daddu $a0, $fp, $zero -/* 8059C4 80245144 3C038026 */ lui $v1, 0x8026 -/* 8059C8 80245148 8C632F68 */ lw $v1, 0x2f68($v1) -/* 8059CC 8024514C 2402000D */ addiu $v0, $zero, 0xd -/* 8059D0 80245150 AFC20318 */ sw $v0, 0x318($fp) -/* 8059D4 80245154 AFD60324 */ sw $s6, 0x324($fp) -/* 8059D8 80245158 0C03D390 */ jal func_800F4E40 -/* 8059DC 8024515C AFC30328 */ sw $v1, 0x328($fp) -/* 8059E0 80245160 0C03A631 */ jal func_800E98C4 -/* 8059E4 80245164 00000000 */ nop -/* 8059E8 80245168 0C03A5EE */ jal func_800E97B8 -/* 8059EC 8024516C 00000000 */ nop -/* 8059F0 80245170 AEE00070 */ sw $zero, 0x70($s7) -.L80245174: -/* 8059F4 80245174 8EE20070 */ lw $v0, 0x70($s7) -/* 8059F8 80245178 14400008 */ bnez $v0, .L8024519C -/* 8059FC 8024517C 24420001 */ addiu $v0, $v0, 1 -/* 805A00 80245180 87C2032C */ lh $v0, 0x32c($fp) -/* 805A04 80245184 10400009 */ beqz $v0, .L802451AC -/* 805A08 80245188 AEE20074 */ sw $v0, 0x74($s7) -/* 805A0C 8024518C 0C03C4EC */ jal func_800F13B0 -/* 805A10 80245190 00000000 */ nop -/* 805A14 80245194 8EE20070 */ lw $v0, 0x70($s7) -/* 805A18 80245198 24420001 */ addiu $v0, $v0, 1 -.L8024519C: -/* 805A1C 8024519C AEE20070 */ sw $v0, 0x70($s7) -/* 805A20 802451A0 28420014 */ slti $v0, $v0, 0x14 -/* 805A24 802451A4 10400003 */ beqz $v0, .L802451B4 -/* 805A28 802451A8 00000000 */ nop -.L802451AC: -/* 805A2C 802451AC 0809147F */ j .L802451FC -/* 805A30 802451B0 0000102D */ daddu $v0, $zero, $zero -.L802451B4: -/* 805A34 802451B4 0C03C54E */ jal func_800F1538 -/* 805A38 802451B8 00000000 */ nop -/* 805A3C 802451BC 8EE30074 */ lw $v1, 0x74($s7) -/* 805A40 802451C0 240200FF */ addiu $v0, $zero, 0xff -/* 805A44 802451C4 1062000A */ beq $v1, $v0, .L802451F0 -/* 805A48 802451C8 2462FFFF */ addiu $v0, $v1, -1 -/* 805A4C 802451CC 00021080 */ sll $v0, $v0, 2 -/* 805A50 802451D0 03C21021 */ addu $v0, $fp, $v0 -/* 805A54 802451D4 8C500108 */ lw $s0, 0x108($v0) -/* 805A58 802451D8 24020002 */ addiu $v0, $zero, 2 -/* 805A5C 802451DC 2463FFFF */ addiu $v1, $v1, -1 -/* 805A60 802451E0 3C018026 */ lui $at, 0x8026 -/* 805A64 802451E4 AC232F68 */ sw $v1, 0x2f68($at) -/* 805A68 802451E8 0809147F */ j .L802451FC -/* 805A6C 802451EC AEF00088 */ sw $s0, 0x88($s7) -.L802451F0: -/* 805A70 802451F0 2402FFFF */ addiu $v0, $zero, -1 -/* 805A74 802451F4 AEE20088 */ sw $v0, 0x88($s7) -/* 805A78 802451F8 24020002 */ addiu $v0, $zero, 2 -.L802451FC: -/* 805A7C 802451FC 8FBF003C */ lw $ra, 0x3c($sp) -/* 805A80 80245200 8FBE0038 */ lw $fp, 0x38($sp) -/* 805A84 80245204 8FB70034 */ lw $s7, 0x34($sp) -/* 805A88 80245208 8FB60030 */ lw $s6, 0x30($sp) -/* 805A8C 8024520C 8FB5002C */ lw $s5, 0x2c($sp) -/* 805A90 80245210 8FB40028 */ lw $s4, 0x28($sp) -/* 805A94 80245214 8FB30024 */ lw $s3, 0x24($sp) -/* 805A98 80245218 8FB20020 */ lw $s2, 0x20($sp) -/* 805A9C 8024521C 8FB1001C */ lw $s1, 0x1c($sp) -/* 805AA0 80245220 8FB00018 */ lw $s0, 0x18($sp) -/* 805AA4 80245224 03E00008 */ jr $ra -/* 805AA8 80245228 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s new file mode 100644 index 0000000000..9598b2a6a7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245028_8058A8.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245028_8058A8 +/* 8058A8 80245028 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 8058AC 8024502C AFB70034 */ sw $s7, 0x34($sp) +/* 8058B0 80245030 0080B82D */ daddu $s7, $a0, $zero +/* 8058B4 80245034 AFBE0038 */ sw $fp, 0x38($sp) +/* 8058B8 80245038 3C1E8026 */ lui $fp, 0x8026 +/* 8058BC 8024503C 27DE2C38 */ addiu $fp, $fp, 0x2c38 +/* 8058C0 80245040 AFBF003C */ sw $ra, 0x3c($sp) +/* 8058C4 80245044 AFB60030 */ sw $s6, 0x30($sp) +/* 8058C8 80245048 AFB5002C */ sw $s5, 0x2c($sp) +/* 8058CC 8024504C AFB40028 */ sw $s4, 0x28($sp) +/* 8058D0 80245050 AFB30024 */ sw $s3, 0x24($sp) +/* 8058D4 80245054 AFB20020 */ sw $s2, 0x20($sp) +/* 8058D8 80245058 AFB1001C */ sw $s1, 0x1c($sp) +/* 8058DC 8024505C 10A00045 */ beqz $a1, .L80245174 +/* 8058E0 80245060 AFB00018 */ sw $s0, 0x18($sp) +/* 8058E4 80245064 0000B02D */ daddu $s6, $zero, $zero +/* 8058E8 80245068 24150001 */ addiu $s5, $zero, 1 +/* 8058EC 8024506C 02A0282D */ daddu $a1, $s5, $zero +/* 8058F0 80245070 3C148009 */ lui $s4, 0x8009 +/* 8058F4 80245074 2694EEC4 */ addiu $s4, $s4, -0x113c +/* 8058F8 80245078 03C0882D */ daddu $s1, $fp, $zero +.L8024507C: +/* 8058FC 8024507C 8E900000 */ lw $s0, ($s4) +/* 805900 80245080 3C068011 */ lui $a2, %hi(gPlayerData) +/* 805904 80245084 24C6F290 */ addiu $a2, $a2, %lo(gPlayerData) +/* 805908 80245088 001010C0 */ sll $v0, $s0, 3 +/* 80590C 8024508C 00C29821 */ addu $s3, $a2, $v0 +/* 805910 80245090 92620014 */ lbu $v0, 0x14($s3) +/* 805914 80245094 50400027 */ beql $v0, $zero, .L80245134 +/* 805918 80245098 26B50001 */ addiu $s5, $s5, 1 +/* 80591C 8024509C 24060005 */ addiu $a2, $zero, 5 +/* 805920 802450A0 52060024 */ beql $s0, $a2, .L80245134 +/* 805924 802450A4 26B50001 */ addiu $s5, $s5, 1 +/* 805928 802450A8 0200202D */ daddu $a0, $s0, $zero +/* 80592C 802450AC 00101100 */ sll $v0, $s0, 4 +/* 805930 802450B0 3C068009 */ lui $a2, 0x8009 +/* 805934 802450B4 24C6EF20 */ addiu $a2, $a2, -0x10e0 +/* 805938 802450B8 00469021 */ addu $s2, $v0, $a2 +/* 80593C 802450BC 0C0913D7 */ jal func_80244F5C_8057DC +/* 805940 802450C0 AFA50010 */ sw $a1, 0x10($sp) +/* 805944 802450C4 0040182D */ daddu $v1, $v0, $zero +/* 805948 802450C8 8FA50010 */ lw $a1, 0x10($sp) +/* 80594C 802450CC 50600019 */ beql $v1, $zero, .L80245134 +/* 805950 802450D0 26B50001 */ addiu $s5, $s5, 1 +/* 805954 802450D4 00102080 */ sll $a0, $s0, 2 +/* 805958 802450D8 3C06800F */ lui $a2, 0x800f +/* 80595C 802450DC 24C67F00 */ addiu $a2, $a2, 0x7f00 +/* 805960 802450E0 00861021 */ addu $v0, $a0, $a2 +/* 805964 802450E4 8C420000 */ lw $v0, ($v0) +/* 805968 802450E8 AE300108 */ sw $s0, 0x108($s1) +/* 80596C 802450EC AE25018C */ sw $a1, 0x18c($s1) +/* 805970 802450F0 AE220000 */ sw $v0, ($s1) +/* 805974 802450F4 8E420000 */ lw $v0, ($s2) +/* 805978 802450F8 AE220084 */ sw $v0, 0x84($s1) +/* 80597C 802450FC 8E420008 */ lw $v0, 8($s2) +/* 805980 80245100 AE220294 */ sw $v0, 0x294($s1) +/* 805984 80245104 82620015 */ lb $v0, 0x15($s3) +/* 805988 80245108 14650007 */ bne $v1, $a1, .L80245128 +/* 80598C 8024510C AE220210 */ sw $v0, 0x210($s1) +/* 805990 80245110 3C06800F */ lui $a2, 0x800f +/* 805994 80245114 24C67F40 */ addiu $a2, $a2, 0x7f40 +/* 805998 80245118 00861021 */ addu $v0, $a0, $a2 +/* 80599C 8024511C AE20018C */ sw $zero, 0x18c($s1) +/* 8059A0 80245120 8C420000 */ lw $v0, ($v0) +/* 8059A4 80245124 AE220000 */ sw $v0, ($s1) +.L80245128: +/* 8059A8 80245128 26310004 */ addiu $s1, $s1, 4 +/* 8059AC 8024512C 26D60001 */ addiu $s6, $s6, 1 +/* 8059B0 80245130 26B50001 */ addiu $s5, $s5, 1 +.L80245134: +/* 8059B4 80245134 2AA2000C */ slti $v0, $s5, 0xc +/* 8059B8 80245138 1440FFD0 */ bnez $v0, .L8024507C +/* 8059BC 8024513C 26940004 */ addiu $s4, $s4, 4 +/* 8059C0 80245140 03C0202D */ daddu $a0, $fp, $zero +/* 8059C4 80245144 3C038026 */ lui $v1, 0x8026 +/* 8059C8 80245148 8C632F68 */ lw $v1, 0x2f68($v1) +/* 8059CC 8024514C 2402000D */ addiu $v0, $zero, 0xd +/* 8059D0 80245150 AFC20318 */ sw $v0, 0x318($fp) +/* 8059D4 80245154 AFD60324 */ sw $s6, 0x324($fp) +/* 8059D8 80245158 0C03D390 */ jal func_800F4E40 +/* 8059DC 8024515C AFC30328 */ sw $v1, 0x328($fp) +/* 8059E0 80245160 0C03A631 */ jal func_800E98C4 +/* 8059E4 80245164 00000000 */ nop +/* 8059E8 80245168 0C03A5EE */ jal func_800E97B8 +/* 8059EC 8024516C 00000000 */ nop +/* 8059F0 80245170 AEE00070 */ sw $zero, 0x70($s7) +.L80245174: +/* 8059F4 80245174 8EE20070 */ lw $v0, 0x70($s7) +/* 8059F8 80245178 14400008 */ bnez $v0, .L8024519C +/* 8059FC 8024517C 24420001 */ addiu $v0, $v0, 1 +/* 805A00 80245180 87C2032C */ lh $v0, 0x32c($fp) +/* 805A04 80245184 10400009 */ beqz $v0, .L802451AC +/* 805A08 80245188 AEE20074 */ sw $v0, 0x74($s7) +/* 805A0C 8024518C 0C03C4EC */ jal func_800F13B0 +/* 805A10 80245190 00000000 */ nop +/* 805A14 80245194 8EE20070 */ lw $v0, 0x70($s7) +/* 805A18 80245198 24420001 */ addiu $v0, $v0, 1 +.L8024519C: +/* 805A1C 8024519C AEE20070 */ sw $v0, 0x70($s7) +/* 805A20 802451A0 28420014 */ slti $v0, $v0, 0x14 +/* 805A24 802451A4 10400003 */ beqz $v0, .L802451B4 +/* 805A28 802451A8 00000000 */ nop +.L802451AC: +/* 805A2C 802451AC 0809147F */ j .L802451FC +/* 805A30 802451B0 0000102D */ daddu $v0, $zero, $zero +.L802451B4: +/* 805A34 802451B4 0C03C54E */ jal func_800F1538 +/* 805A38 802451B8 00000000 */ nop +/* 805A3C 802451BC 8EE30074 */ lw $v1, 0x74($s7) +/* 805A40 802451C0 240200FF */ addiu $v0, $zero, 0xff +/* 805A44 802451C4 1062000A */ beq $v1, $v0, .L802451F0 +/* 805A48 802451C8 2462FFFF */ addiu $v0, $v1, -1 +/* 805A4C 802451CC 00021080 */ sll $v0, $v0, 2 +/* 805A50 802451D0 03C21021 */ addu $v0, $fp, $v0 +/* 805A54 802451D4 8C500108 */ lw $s0, 0x108($v0) +/* 805A58 802451D8 24020002 */ addiu $v0, $zero, 2 +/* 805A5C 802451DC 2463FFFF */ addiu $v1, $v1, -1 +/* 805A60 802451E0 3C018026 */ lui $at, 0x8026 +/* 805A64 802451E4 AC232F68 */ sw $v1, 0x2f68($at) +/* 805A68 802451E8 0809147F */ j .L802451FC +/* 805A6C 802451EC AEF00088 */ sw $s0, 0x88($s7) +.L802451F0: +/* 805A70 802451F0 2402FFFF */ addiu $v0, $zero, -1 +/* 805A74 802451F4 AEE20088 */ sw $v0, 0x88($s7) +/* 805A78 802451F8 24020002 */ addiu $v0, $zero, 2 +.L802451FC: +/* 805A7C 802451FC 8FBF003C */ lw $ra, 0x3c($sp) +/* 805A80 80245200 8FBE0038 */ lw $fp, 0x38($sp) +/* 805A84 80245204 8FB70034 */ lw $s7, 0x34($sp) +/* 805A88 80245208 8FB60030 */ lw $s6, 0x30($sp) +/* 805A8C 8024520C 8FB5002C */ lw $s5, 0x2c($sp) +/* 805A90 80245210 8FB40028 */ lw $s4, 0x28($sp) +/* 805A94 80245214 8FB30024 */ lw $s3, 0x24($sp) +/* 805A98 80245218 8FB20020 */ lw $s2, 0x20($sp) +/* 805A9C 8024521C 8FB1001C */ lw $s1, 0x1c($sp) +/* 805AA0 80245220 8FB00018 */ lw $s0, 0x18($sp) +/* 805AA4 80245224 03E00008 */ jr $ra +/* 805AA8 80245228 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C.s deleted file mode 100644 index 316e1fa0b9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C.s +++ /dev/null @@ -1,148 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024522C -/* 805AAC 8024522C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 805AB0 80245230 AFB5002C */ sw $s5, 0x2c($sp) -/* 805AB4 80245234 0080A82D */ daddu $s5, $a0, $zero -/* 805AB8 80245238 AFBF003C */ sw $ra, 0x3c($sp) -/* 805ABC 8024523C AFBE0038 */ sw $fp, 0x38($sp) -/* 805AC0 80245240 AFB70034 */ sw $s7, 0x34($sp) -/* 805AC4 80245244 AFB60030 */ sw $s6, 0x30($sp) -/* 805AC8 80245248 AFB40028 */ sw $s4, 0x28($sp) -/* 805ACC 8024524C AFB30024 */ sw $s3, 0x24($sp) -/* 805AD0 80245250 AFB20020 */ sw $s2, 0x20($sp) -/* 805AD4 80245254 AFB1001C */ sw $s1, 0x1c($sp) -/* 805AD8 80245258 AFB00018 */ sw $s0, 0x18($sp) -/* 805ADC 8024525C 8EA700AC */ lw $a3, 0xac($s5) -/* 805AE0 80245260 3C168026 */ lui $s6, 0x8026 -/* 805AE4 80245264 26D62C38 */ addiu $s6, $s6, 0x2c38 -/* 805AE8 80245268 10A0003D */ beqz $a1, .L80245360 -/* 805AEC 8024526C AFA70010 */ sw $a3, 0x10($sp) -/* 805AF0 80245270 0000A02D */ daddu $s4, $zero, $zero -/* 805AF4 80245274 0280982D */ daddu $s3, $s4, $zero -/* 805AF8 80245278 3C1EF840 */ lui $fp, 0xf840 -/* 805AFC 8024527C 37DE5C19 */ ori $fp, $fp, 0x5c19 -/* 805B00 80245280 3C17F840 */ lui $s7, 0xf840 -/* 805B04 80245284 36F75C2C */ ori $s7, $s7, 0x5c2c -/* 805B08 80245288 3C128025 */ lui $s2, 0x8025 -/* 805B0C 8024528C 26526ADC */ addiu $s2, $s2, 0x6adc -/* 805B10 80245290 02C0882D */ daddu $s1, $s6, $zero -.L80245294: -/* 805B14 80245294 0000202D */ daddu $a0, $zero, $zero -/* 805B18 80245298 0C0B1EAF */ jal get_variable -/* 805B1C 8024529C 027E2821 */ addu $a1, $s3, $fp -/* 805B20 802452A0 0000202D */ daddu $a0, $zero, $zero -/* 805B24 802452A4 02772821 */ addu $a1, $s3, $s7 -/* 805B28 802452A8 0C0B1EAF */ jal get_variable -/* 805B2C 802452AC 0040802D */ daddu $s0, $v0, $zero -/* 805B30 802452B0 1200001C */ beqz $s0, .L80245324 -/* 805B34 802452B4 0040202D */ daddu $a0, $v0, $zero -/* 805B38 802452B8 8E420000 */ lw $v0, ($s2) -/* 805B3C 802452BC 8FA70010 */ lw $a3, 0x10($sp) -/* 805B40 802452C0 54E20019 */ bnel $a3, $v0, .L80245328 -/* 805B44 802452C4 26730001 */ addiu $s3, $s3, 1 -/* 805B48 802452C8 3C028009 */ lui $v0, 0x8009 -/* 805B4C 802452CC 84428364 */ lh $v0, -0x7c9c($v0) -/* 805B50 802452D0 3C078009 */ lui $a3, 0x8009 -/* 805B54 802452D4 24E7A680 */ addiu $a3, $a3, -0x5980 -/* 805B58 802452D8 AE330108 */ sw $s3, 0x108($s1) -/* 805B5C 802452DC 8E430008 */ lw $v1, 8($s2) -/* 805B60 802452E0 000210C0 */ sll $v0, $v0, 3 -/* 805B64 802452E4 AE230084 */ sw $v1, 0x84($s1) -/* 805B68 802452E8 8E43000C */ lw $v1, 0xc($s2) -/* 805B6C 802452EC 00471021 */ addu $v0, $v0, $a3 -/* 805B70 802452F0 AE200210 */ sw $zero, 0x210($s1) -/* 805B74 802452F4 10800005 */ beqz $a0, .L8024530C -/* 805B78 802452F8 AE230294 */ sw $v1, 0x294($s1) -/* 805B7C 802452FC 8C420004 */ lw $v0, 4($v0) -/* 805B80 80245300 AE20018C */ sw $zero, 0x18c($s1) -/* 805B84 80245304 080914C7 */ j .L8024531C -/* 805B88 80245308 AE220000 */ sw $v0, ($s1) -.L8024530C: -/* 805B8C 8024530C 8C430000 */ lw $v1, ($v0) -/* 805B90 80245310 24020001 */ addiu $v0, $zero, 1 -/* 805B94 80245314 AE22018C */ sw $v0, 0x18c($s1) -/* 805B98 80245318 AE230000 */ sw $v1, ($s1) -.L8024531C: -/* 805B9C 8024531C 26310004 */ addiu $s1, $s1, 4 -/* 805BA0 80245320 26940001 */ addiu $s4, $s4, 1 -.L80245324: -/* 805BA4 80245324 26730001 */ addiu $s3, $s3, 1 -.L80245328: -/* 805BA8 80245328 2E620013 */ sltiu $v0, $s3, 0x13 -/* 805BAC 8024532C 1440FFD9 */ bnez $v0, .L80245294 -/* 805BB0 80245330 26520014 */ addiu $s2, $s2, 0x14 -/* 805BB4 80245334 02C0202D */ daddu $a0, $s6, $zero -/* 805BB8 80245338 24020008 */ addiu $v0, $zero, 8 -/* 805BBC 8024533C AEC20318 */ sw $v0, 0x318($s6) -/* 805BC0 80245340 AED40324 */ sw $s4, 0x324($s6) -/* 805BC4 80245344 0C03D390 */ jal func_800F4E40 -/* 805BC8 80245348 AEC00328 */ sw $zero, 0x328($s6) -/* 805BCC 8024534C 0C03A631 */ jal func_800E98C4 -/* 805BD0 80245350 00000000 */ nop -/* 805BD4 80245354 0C03A5EE */ jal func_800E97B8 -/* 805BD8 80245358 00000000 */ nop -/* 805BDC 8024535C AEA00070 */ sw $zero, 0x70($s5) -.L80245360: -/* 805BE0 80245360 8EA20070 */ lw $v0, 0x70($s5) -/* 805BE4 80245364 14400008 */ bnez $v0, .L80245388 -/* 805BE8 80245368 24420001 */ addiu $v0, $v0, 1 -/* 805BEC 8024536C 86C2032C */ lh $v0, 0x32c($s6) -/* 805BF0 80245370 10400009 */ beqz $v0, .L80245398 -/* 805BF4 80245374 AEA20074 */ sw $v0, 0x74($s5) -/* 805BF8 80245378 0C03C4EC */ jal func_800F13B0 -/* 805BFC 8024537C 00000000 */ nop -/* 805C00 80245380 8EA20070 */ lw $v0, 0x70($s5) -/* 805C04 80245384 24420001 */ addiu $v0, $v0, 1 -.L80245388: -/* 805C08 80245388 AEA20070 */ sw $v0, 0x70($s5) -/* 805C0C 8024538C 28420014 */ slti $v0, $v0, 0x14 -/* 805C10 80245390 10400003 */ beqz $v0, .L802453A0 -/* 805C14 80245394 00000000 */ nop -.L80245398: -/* 805C18 80245398 08091504 */ j .L80245410 -/* 805C1C 8024539C 0000102D */ daddu $v0, $zero, $zero -.L802453A0: -/* 805C20 802453A0 0C03C54E */ jal func_800F1538 -/* 805C24 802453A4 00000000 */ nop -/* 805C28 802453A8 8EA40074 */ lw $a0, 0x74($s5) -/* 805C2C 802453AC 240200FF */ addiu $v0, $zero, 0xff -/* 805C30 802453B0 10820014 */ beq $a0, $v0, .L80245404 -/* 805C34 802453B4 3C03F840 */ lui $v1, 0xf840 -/* 805C38 802453B8 34635C2C */ ori $v1, $v1, 0x5c2c -/* 805C3C 802453BC 2482FFFF */ addiu $v0, $a0, -1 -/* 805C40 802453C0 00021080 */ sll $v0, $v0, 2 -/* 805C44 802453C4 02C21021 */ addu $v0, $s6, $v0 -/* 805C48 802453C8 0000202D */ daddu $a0, $zero, $zero -/* 805C4C 802453CC 8C450108 */ lw $a1, 0x108($v0) -/* 805C50 802453D0 24060001 */ addiu $a2, $zero, 1 -/* 805C54 802453D4 00051080 */ sll $v0, $a1, 2 -/* 805C58 802453D8 00451021 */ addu $v0, $v0, $a1 -/* 805C5C 802453DC 00021080 */ sll $v0, $v0, 2 -/* 805C60 802453E0 AEA50088 */ sw $a1, 0x88($s5) -/* 805C64 802453E4 3C018025 */ lui $at, 0x8025 -/* 805C68 802453E8 00220821 */ addu $at, $at, $v0 -/* 805C6C 802453EC 8C226AEC */ lw $v0, 0x6aec($at) -/* 805C70 802453F0 00A32821 */ addu $a1, $a1, $v1 -/* 805C74 802453F4 0C0B2026 */ jal set_variable -/* 805C78 802453F8 AEA20084 */ sw $v0, 0x84($s5) -/* 805C7C 802453FC 08091504 */ j .L80245410 -/* 805C80 80245400 24020002 */ addiu $v0, $zero, 2 -.L80245404: -/* 805C84 80245404 2402FFFF */ addiu $v0, $zero, -1 -/* 805C88 80245408 AEA20088 */ sw $v0, 0x88($s5) -/* 805C8C 8024540C 24020002 */ addiu $v0, $zero, 2 -.L80245410: -/* 805C90 80245410 8FBF003C */ lw $ra, 0x3c($sp) -/* 805C94 80245414 8FBE0038 */ lw $fp, 0x38($sp) -/* 805C98 80245418 8FB70034 */ lw $s7, 0x34($sp) -/* 805C9C 8024541C 8FB60030 */ lw $s6, 0x30($sp) -/* 805CA0 80245420 8FB5002C */ lw $s5, 0x2c($sp) -/* 805CA4 80245424 8FB40028 */ lw $s4, 0x28($sp) -/* 805CA8 80245428 8FB30024 */ lw $s3, 0x24($sp) -/* 805CAC 8024542C 8FB20020 */ lw $s2, 0x20($sp) -/* 805CB0 80245430 8FB1001C */ lw $s1, 0x1c($sp) -/* 805CB4 80245434 8FB00018 */ lw $s0, 0x18($sp) -/* 805CB8 80245438 03E00008 */ jr $ra -/* 805CBC 8024543C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s new file mode 100644 index 0000000000..1927b1c282 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024522C_805AAC.s @@ -0,0 +1,148 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024522C_805AAC +/* 805AAC 8024522C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 805AB0 80245230 AFB5002C */ sw $s5, 0x2c($sp) +/* 805AB4 80245234 0080A82D */ daddu $s5, $a0, $zero +/* 805AB8 80245238 AFBF003C */ sw $ra, 0x3c($sp) +/* 805ABC 8024523C AFBE0038 */ sw $fp, 0x38($sp) +/* 805AC0 80245240 AFB70034 */ sw $s7, 0x34($sp) +/* 805AC4 80245244 AFB60030 */ sw $s6, 0x30($sp) +/* 805AC8 80245248 AFB40028 */ sw $s4, 0x28($sp) +/* 805ACC 8024524C AFB30024 */ sw $s3, 0x24($sp) +/* 805AD0 80245250 AFB20020 */ sw $s2, 0x20($sp) +/* 805AD4 80245254 AFB1001C */ sw $s1, 0x1c($sp) +/* 805AD8 80245258 AFB00018 */ sw $s0, 0x18($sp) +/* 805ADC 8024525C 8EA700AC */ lw $a3, 0xac($s5) +/* 805AE0 80245260 3C168026 */ lui $s6, 0x8026 +/* 805AE4 80245264 26D62C38 */ addiu $s6, $s6, 0x2c38 +/* 805AE8 80245268 10A0003D */ beqz $a1, .L80245360 +/* 805AEC 8024526C AFA70010 */ sw $a3, 0x10($sp) +/* 805AF0 80245270 0000A02D */ daddu $s4, $zero, $zero +/* 805AF4 80245274 0280982D */ daddu $s3, $s4, $zero +/* 805AF8 80245278 3C1EF840 */ lui $fp, 0xf840 +/* 805AFC 8024527C 37DE5C19 */ ori $fp, $fp, 0x5c19 +/* 805B00 80245280 3C17F840 */ lui $s7, 0xf840 +/* 805B04 80245284 36F75C2C */ ori $s7, $s7, 0x5c2c +/* 805B08 80245288 3C128025 */ lui $s2, 0x8025 +/* 805B0C 8024528C 26526ADC */ addiu $s2, $s2, 0x6adc +/* 805B10 80245290 02C0882D */ daddu $s1, $s6, $zero +.L80245294: +/* 805B14 80245294 0000202D */ daddu $a0, $zero, $zero +/* 805B18 80245298 0C0B1EAF */ jal get_variable +/* 805B1C 8024529C 027E2821 */ addu $a1, $s3, $fp +/* 805B20 802452A0 0000202D */ daddu $a0, $zero, $zero +/* 805B24 802452A4 02772821 */ addu $a1, $s3, $s7 +/* 805B28 802452A8 0C0B1EAF */ jal get_variable +/* 805B2C 802452AC 0040802D */ daddu $s0, $v0, $zero +/* 805B30 802452B0 1200001C */ beqz $s0, .L80245324 +/* 805B34 802452B4 0040202D */ daddu $a0, $v0, $zero +/* 805B38 802452B8 8E420000 */ lw $v0, ($s2) +/* 805B3C 802452BC 8FA70010 */ lw $a3, 0x10($sp) +/* 805B40 802452C0 54E20019 */ bnel $a3, $v0, .L80245328 +/* 805B44 802452C4 26730001 */ addiu $s3, $s3, 1 +/* 805B48 802452C8 3C028009 */ lui $v0, 0x8009 +/* 805B4C 802452CC 84428364 */ lh $v0, -0x7c9c($v0) +/* 805B50 802452D0 3C078009 */ lui $a3, 0x8009 +/* 805B54 802452D4 24E7A680 */ addiu $a3, $a3, -0x5980 +/* 805B58 802452D8 AE330108 */ sw $s3, 0x108($s1) +/* 805B5C 802452DC 8E430008 */ lw $v1, 8($s2) +/* 805B60 802452E0 000210C0 */ sll $v0, $v0, 3 +/* 805B64 802452E4 AE230084 */ sw $v1, 0x84($s1) +/* 805B68 802452E8 8E43000C */ lw $v1, 0xc($s2) +/* 805B6C 802452EC 00471021 */ addu $v0, $v0, $a3 +/* 805B70 802452F0 AE200210 */ sw $zero, 0x210($s1) +/* 805B74 802452F4 10800005 */ beqz $a0, .L8024530C +/* 805B78 802452F8 AE230294 */ sw $v1, 0x294($s1) +/* 805B7C 802452FC 8C420004 */ lw $v0, 4($v0) +/* 805B80 80245300 AE20018C */ sw $zero, 0x18c($s1) +/* 805B84 80245304 080914C7 */ j .L8024531C +/* 805B88 80245308 AE220000 */ sw $v0, ($s1) +.L8024530C: +/* 805B8C 8024530C 8C430000 */ lw $v1, ($v0) +/* 805B90 80245310 24020001 */ addiu $v0, $zero, 1 +/* 805B94 80245314 AE22018C */ sw $v0, 0x18c($s1) +/* 805B98 80245318 AE230000 */ sw $v1, ($s1) +.L8024531C: +/* 805B9C 8024531C 26310004 */ addiu $s1, $s1, 4 +/* 805BA0 80245320 26940001 */ addiu $s4, $s4, 1 +.L80245324: +/* 805BA4 80245324 26730001 */ addiu $s3, $s3, 1 +.L80245328: +/* 805BA8 80245328 2E620013 */ sltiu $v0, $s3, 0x13 +/* 805BAC 8024532C 1440FFD9 */ bnez $v0, .L80245294 +/* 805BB0 80245330 26520014 */ addiu $s2, $s2, 0x14 +/* 805BB4 80245334 02C0202D */ daddu $a0, $s6, $zero +/* 805BB8 80245338 24020008 */ addiu $v0, $zero, 8 +/* 805BBC 8024533C AEC20318 */ sw $v0, 0x318($s6) +/* 805BC0 80245340 AED40324 */ sw $s4, 0x324($s6) +/* 805BC4 80245344 0C03D390 */ jal func_800F4E40 +/* 805BC8 80245348 AEC00328 */ sw $zero, 0x328($s6) +/* 805BCC 8024534C 0C03A631 */ jal func_800E98C4 +/* 805BD0 80245350 00000000 */ nop +/* 805BD4 80245354 0C03A5EE */ jal func_800E97B8 +/* 805BD8 80245358 00000000 */ nop +/* 805BDC 8024535C AEA00070 */ sw $zero, 0x70($s5) +.L80245360: +/* 805BE0 80245360 8EA20070 */ lw $v0, 0x70($s5) +/* 805BE4 80245364 14400008 */ bnez $v0, .L80245388 +/* 805BE8 80245368 24420001 */ addiu $v0, $v0, 1 +/* 805BEC 8024536C 86C2032C */ lh $v0, 0x32c($s6) +/* 805BF0 80245370 10400009 */ beqz $v0, .L80245398 +/* 805BF4 80245374 AEA20074 */ sw $v0, 0x74($s5) +/* 805BF8 80245378 0C03C4EC */ jal func_800F13B0 +/* 805BFC 8024537C 00000000 */ nop +/* 805C00 80245380 8EA20070 */ lw $v0, 0x70($s5) +/* 805C04 80245384 24420001 */ addiu $v0, $v0, 1 +.L80245388: +/* 805C08 80245388 AEA20070 */ sw $v0, 0x70($s5) +/* 805C0C 8024538C 28420014 */ slti $v0, $v0, 0x14 +/* 805C10 80245390 10400003 */ beqz $v0, .L802453A0 +/* 805C14 80245394 00000000 */ nop +.L80245398: +/* 805C18 80245398 08091504 */ j .L80245410 +/* 805C1C 8024539C 0000102D */ daddu $v0, $zero, $zero +.L802453A0: +/* 805C20 802453A0 0C03C54E */ jal func_800F1538 +/* 805C24 802453A4 00000000 */ nop +/* 805C28 802453A8 8EA40074 */ lw $a0, 0x74($s5) +/* 805C2C 802453AC 240200FF */ addiu $v0, $zero, 0xff +/* 805C30 802453B0 10820014 */ beq $a0, $v0, .L80245404 +/* 805C34 802453B4 3C03F840 */ lui $v1, 0xf840 +/* 805C38 802453B8 34635C2C */ ori $v1, $v1, 0x5c2c +/* 805C3C 802453BC 2482FFFF */ addiu $v0, $a0, -1 +/* 805C40 802453C0 00021080 */ sll $v0, $v0, 2 +/* 805C44 802453C4 02C21021 */ addu $v0, $s6, $v0 +/* 805C48 802453C8 0000202D */ daddu $a0, $zero, $zero +/* 805C4C 802453CC 8C450108 */ lw $a1, 0x108($v0) +/* 805C50 802453D0 24060001 */ addiu $a2, $zero, 1 +/* 805C54 802453D4 00051080 */ sll $v0, $a1, 2 +/* 805C58 802453D8 00451021 */ addu $v0, $v0, $a1 +/* 805C5C 802453DC 00021080 */ sll $v0, $v0, 2 +/* 805C60 802453E0 AEA50088 */ sw $a1, 0x88($s5) +/* 805C64 802453E4 3C018025 */ lui $at, 0x8025 +/* 805C68 802453E8 00220821 */ addu $at, $at, $v0 +/* 805C6C 802453EC 8C226AEC */ lw $v0, 0x6aec($at) +/* 805C70 802453F0 00A32821 */ addu $a1, $a1, $v1 +/* 805C74 802453F4 0C0B2026 */ jal set_variable +/* 805C78 802453F8 AEA20084 */ sw $v0, 0x84($s5) +/* 805C7C 802453FC 08091504 */ j .L80245410 +/* 805C80 80245400 24020002 */ addiu $v0, $zero, 2 +.L80245404: +/* 805C84 80245404 2402FFFF */ addiu $v0, $zero, -1 +/* 805C88 80245408 AEA20088 */ sw $v0, 0x88($s5) +/* 805C8C 8024540C 24020002 */ addiu $v0, $zero, 2 +.L80245410: +/* 805C90 80245410 8FBF003C */ lw $ra, 0x3c($sp) +/* 805C94 80245414 8FBE0038 */ lw $fp, 0x38($sp) +/* 805C98 80245418 8FB70034 */ lw $s7, 0x34($sp) +/* 805C9C 8024541C 8FB60030 */ lw $s6, 0x30($sp) +/* 805CA0 80245420 8FB5002C */ lw $s5, 0x2c($sp) +/* 805CA4 80245424 8FB40028 */ lw $s4, 0x28($sp) +/* 805CA8 80245428 8FB30024 */ lw $s3, 0x24($sp) +/* 805CAC 8024542C 8FB20020 */ lw $s2, 0x20($sp) +/* 805CB0 80245430 8FB1001C */ lw $s1, 0x1c($sp) +/* 805CB4 80245434 8FB00018 */ lw $s0, 0x18($sp) +/* 805CB8 80245438 03E00008 */ jr $ra +/* 805CBC 8024543C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488.s deleted file mode 100644 index 9fc942e730..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245488 -/* 805D08 80245488 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805D0C 8024548C AFBF0010 */ sw $ra, 0x10($sp) -/* 805D10 80245490 8C82000C */ lw $v0, 0xc($a0) -/* 805D14 80245494 0C0B1EAF */ jal get_variable -/* 805D18 80245498 8C450000 */ lw $a1, ($v0) -/* 805D1C 8024549C 8FBF0010 */ lw $ra, 0x10($sp) -/* 805D20 802454A0 3C018026 */ lui $at, 0x8026 -/* 805D24 802454A4 AC228404 */ sw $v0, -0x7bfc($at) -/* 805D28 802454A8 24020002 */ addiu $v0, $zero, 2 -/* 805D2C 802454AC 03E00008 */ jr $ra -/* 805D30 802454B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488_805D08.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488_805D08.s new file mode 100644 index 0000000000..a41a822f7c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245488_805D08.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245488_805D08 +/* 805D08 80245488 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 805D0C 8024548C AFBF0010 */ sw $ra, 0x10($sp) +/* 805D10 80245490 8C82000C */ lw $v0, 0xc($a0) +/* 805D14 80245494 0C0B1EAF */ jal get_variable +/* 805D18 80245498 8C450000 */ lw $a1, ($v0) +/* 805D1C 8024549C 8FBF0010 */ lw $ra, 0x10($sp) +/* 805D20 802454A0 3C018026 */ lui $at, 0x8026 +/* 805D24 802454A4 AC228404 */ sw $v0, -0x7bfc($at) +/* 805D28 802454A8 24020002 */ addiu $v0, $zero, 2 +/* 805D2C 802454AC 03E00008 */ jr $ra +/* 805D30 802454B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4.s deleted file mode 100644 index 505484d3ee..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802454B4 -/* 805D34 802454B4 3C06FCFF */ lui $a2, 0xfcff -/* 805D38 802454B8 34C6C7FF */ ori $a2, $a2, 0xc7ff -/* 805D3C 802454BC 3C05FF8F */ lui $a1, 0xff8f -/* 805D40 802454C0 3C04800A */ lui $a0, 0x800a -/* 805D44 802454C4 2484A66C */ addiu $a0, $a0, -0x5994 -/* 805D48 802454C8 8C820000 */ lw $v0, ($a0) -/* 805D4C 802454CC 34A57FBF */ ori $a1, $a1, 0x7fbf -/* 805D50 802454D0 0040182D */ daddu $v1, $v0, $zero -/* 805D54 802454D4 24420008 */ addiu $v0, $v0, 8 -/* 805D58 802454D8 AC820000 */ sw $v0, ($a0) -/* 805D5C 802454DC AC660000 */ sw $a2, ($v1) -/* 805D60 802454E0 AC650004 */ sw $a1, 4($v1) -/* 805D64 802454E4 24430008 */ addiu $v1, $v0, 8 -/* 805D68 802454E8 AC830000 */ sw $v1, ($a0) -/* 805D6C 802454EC 3C048026 */ lui $a0, 0x8026 -/* 805D70 802454F0 90848407 */ lbu $a0, -0x7bf9($a0) -/* 805D74 802454F4 3C03FA00 */ lui $v1, 0xfa00 -/* 805D78 802454F8 AC430000 */ sw $v1, ($v0) -/* 805D7C 802454FC 03E00008 */ jr $ra -/* 805D80 80245500 AC440004 */ sw $a0, 4($v0) 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 new file mode 100644 index 0000000000..a3fbea0ffd --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802454B4_805D34.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +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, 0x800a +/* 805D44 802454C4 2484A66C */ addiu $a0, $a0, -0x5994 +/* 805D48 802454C8 8C820000 */ lw $v0, ($a0) +/* 805D4C 802454CC 34A57FBF */ ori $a1, $a1, 0x7fbf +/* 805D50 802454D0 0040182D */ daddu $v1, $v0, $zero +/* 805D54 802454D4 24420008 */ addiu $v0, $v0, 8 +/* 805D58 802454D8 AC820000 */ sw $v0, ($a0) +/* 805D5C 802454DC AC660000 */ sw $a2, ($v1) +/* 805D60 802454E0 AC650004 */ sw $a1, 4($v1) +/* 805D64 802454E4 24430008 */ addiu $v1, $v0, 8 +/* 805D68 802454E8 AC830000 */ sw $v1, ($a0) +/* 805D6C 802454EC 3C048026 */ lui $a0, 0x8026 +/* 805D70 802454F0 90848407 */ lbu $a0, -0x7bf9($a0) +/* 805D74 802454F4 3C03FA00 */ lui $v1, 0xfa00 +/* 805D78 802454F8 AC430000 */ sw $v1, ($v0) +/* 805D7C 802454FC 03E00008 */ jr $ra +/* 805D80 80245500 AC440004 */ sw $a0, 4($v0) diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504.s deleted file mode 100644 index 154423b75c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245504 -/* 805D84 80245504 3C0141A0 */ lui $at, 0x41a0 -/* 805D88 80245508 44816000 */ mtc1 $at, $f12 -/* 805D8C 8024550C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805D90 80245510 AFBF0010 */ sw $ra, 0x10($sp) -/* 805D94 80245514 0C03BCE5 */ jal func_800EF394 -/* 805D98 80245518 00000000 */ nop -/* 805D9C 8024551C 8FBF0010 */ lw $ra, 0x10($sp) -/* 805DA0 80245520 24020002 */ addiu $v0, $zero, 2 -/* 805DA4 80245524 03E00008 */ jr $ra -/* 805DA8 80245528 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s new file mode 100644 index 0000000000..3ff47e1923 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245504_805D84 +/* 805D84 80245504 3C0141A0 */ lui $at, 0x41a0 +/* 805D88 80245508 44816000 */ mtc1 $at, $f12 +/* 805D8C 8024550C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 805D90 80245510 AFBF0010 */ sw $ra, 0x10($sp) +/* 805D94 80245514 0C03BCE5 */ jal func_800EF394 +/* 805D98 80245518 00000000 */ nop +/* 805D9C 8024551C 8FBF0010 */ lw $ra, 0x10($sp) +/* 805DA0 80245520 24020002 */ addiu $v0, $zero, 2 +/* 805DA4 80245524 03E00008 */ jr $ra +/* 805DA8 80245528 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C.s deleted file mode 100644 index c1002423b2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024552C -/* 805DAC 8024552C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805DB0 80245530 AFBF0010 */ sw $ra, 0x10($sp) -/* 805DB4 80245534 0C03BCE9 */ jal func_800EF3A4 -/* 805DB8 80245538 00000000 */ nop -/* 805DBC 8024553C 8FBF0010 */ lw $ra, 0x10($sp) -/* 805DC0 80245540 24020002 */ addiu $v0, $zero, 2 -/* 805DC4 80245544 03E00008 */ jr $ra -/* 805DC8 80245548 27BD0018 */ addiu $sp, $sp, 0x18 -/* 805DCC 8024554C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s new file mode 100644 index 0000000000..0bc23d492d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024552C_805DAC +/* 805DAC 8024552C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 805DB0 80245530 AFBF0010 */ sw $ra, 0x10($sp) +/* 805DB4 80245534 0C03BCE9 */ jal func_800EF3A4 +/* 805DB8 80245538 00000000 */ nop +/* 805DBC 8024553C 8FBF0010 */ lw $ra, 0x10($sp) +/* 805DC0 80245540 24020002 */ addiu $v0, $zero, 2 +/* 805DC4 80245544 03E00008 */ jr $ra +/* 805DC8 80245548 27BD0018 */ addiu $sp, $sp, 0x18 +/* 805DCC 8024554C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550.s deleted file mode 100644 index af324f043a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245550 -/* 805DD0 80245550 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 805DD4 80245554 AFB50024 */ sw $s5, 0x24($sp) -/* 805DD8 80245558 0080A82D */ daddu $s5, $a0, $zero -/* 805DDC 8024555C AFBF002C */ sw $ra, 0x2c($sp) -/* 805DE0 80245560 AFB60028 */ sw $s6, 0x28($sp) -/* 805DE4 80245564 AFB40020 */ sw $s4, 0x20($sp) -/* 805DE8 80245568 AFB3001C */ sw $s3, 0x1c($sp) -/* 805DEC 8024556C AFB20018 */ sw $s2, 0x18($sp) -/* 805DF0 80245570 AFB10014 */ sw $s1, 0x14($sp) -/* 805DF4 80245574 AFB00010 */ sw $s0, 0x10($sp) -/* 805DF8 80245578 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 805DFC 8024557C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 805E00 80245580 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 805E04 80245584 8EB30148 */ lw $s3, 0x148($s5) -/* 805E08 80245588 86640008 */ lh $a0, 8($s3) -/* 805E0C 8024558C 0C00EABB */ jal get_npc_unsafe -/* 805E10 80245590 00A0B02D */ daddu $s6, $a1, $zero -/* 805E14 80245594 0040A02D */ daddu $s4, $v0, $zero -/* 805E18 80245598 AEA00074 */ sw $zero, 0x74($s5) -/* 805E1C 8024559C C6980038 */ lwc1 $f24, 0x38($s4) -/* 805E20 802455A0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 805E24 802455A4 0000902D */ daddu $s2, $zero, $zero -/* 805E28 802455A8 AEA00078 */ sw $zero, 0x78($s5) -/* 805E2C 802455AC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 805E30 802455B0 8C620000 */ lw $v0, ($v1) -/* 805E34 802455B4 3C0146FF */ lui $at, 0x46ff -/* 805E38 802455B8 3421FE00 */ ori $at, $at, 0xfe00 -/* 805E3C 802455BC 4481A000 */ mtc1 $at, $f20 -/* 805E40 802455C0 18400018 */ blez $v0, .L80245624 -/* 805E44 802455C4 0240802D */ daddu $s0, $s2, $zero -/* 805E48 802455C8 0240882D */ daddu $s1, $s2, $zero -.L802455CC: -/* 805E4C 802455CC 02231021 */ addu $v0, $s1, $v1 -/* 805E50 802455D0 4600C306 */ mov.s $f12, $f24 -/* 805E54 802455D4 C4440004 */ lwc1 $f4, 4($v0) -/* 805E58 802455D8 46802120 */ cvt.s.w $f4, $f4 -/* 805E5C 802455DC 44062000 */ mfc1 $a2, $f4 -/* 805E60 802455E0 C444000C */ lwc1 $f4, 0xc($v0) -/* 805E64 802455E4 46802120 */ cvt.s.w $f4, $f4 -/* 805E68 802455E8 44072000 */ mfc1 $a3, $f4 -/* 805E6C 802455EC 0C00A7B5 */ jal dist2D -/* 805E70 802455F0 4600B386 */ mov.s $f14, $f22 -/* 805E74 802455F4 4614003C */ c.lt.s $f0, $f20 -/* 805E78 802455F8 00000000 */ nop -/* 805E7C 802455FC 45000003 */ bc1f .L8024560C -/* 805E80 80245600 2631000C */ addiu $s1, $s1, 0xc -/* 805E84 80245604 46000506 */ mov.s $f20, $f0 -/* 805E88 80245608 AEB20078 */ sw $s2, 0x78($s5) -.L8024560C: -/* 805E8C 8024560C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 805E90 80245610 26100001 */ addiu $s0, $s0, 1 -/* 805E94 80245614 8C620000 */ lw $v0, ($v1) -/* 805E98 80245618 0202102A */ slt $v0, $s0, $v0 -/* 805E9C 8024561C 1440FFEB */ bnez $v0, .L802455CC -/* 805EA0 80245620 26520001 */ addiu $s2, $s2, 1 -.L80245624: -/* 805EA4 80245624 8E6200CC */ lw $v0, 0xcc($s3) -/* 805EA8 80245628 8C420004 */ lw $v0, 4($v0) -/* 805EAC 8024562C AE820028 */ sw $v0, 0x28($s4) -/* 805EB0 80245630 8E6200D0 */ lw $v0, 0xd0($s3) -/* 805EB4 80245634 8C42007C */ lw $v0, 0x7c($v0) -/* 805EB8 80245638 04410004 */ bgez $v0, .L8024564C -/* 805EBC 8024563C 00000000 */ nop -/* 805EC0 80245640 C6C00000 */ lwc1 $f0, ($s6) -/* 805EC4 80245644 0809159B */ j .L8024566C -/* 805EC8 80245648 E6800018 */ swc1 $f0, 0x18($s4) -.L8024564C: -/* 805ECC 8024564C 3C018026 */ lui $at, 0x8026 -/* 805ED0 80245650 D4222890 */ ldc1 $f2, 0x2890($at) -/* 805ED4 80245654 44820000 */ mtc1 $v0, $f0 -/* 805ED8 80245658 00000000 */ nop -/* 805EDC 8024565C 46800021 */ cvt.d.w $f0, $f0 -/* 805EE0 80245660 46220003 */ div.d $f0, $f0, $f2 -/* 805EE4 80245664 46200020 */ cvt.s.d $f0, $f0 -/* 805EE8 80245668 E6800018 */ swc1 $f0, 0x18($s4) -.L8024566C: -/* 805EEC 8024566C 24020001 */ addiu $v0, $zero, 1 -/* 805EF0 80245670 AEA20070 */ sw $v0, 0x70($s5) -/* 805EF4 80245674 8FBF002C */ lw $ra, 0x2c($sp) -/* 805EF8 80245678 8FB60028 */ lw $s6, 0x28($sp) -/* 805EFC 8024567C 8FB50024 */ lw $s5, 0x24($sp) -/* 805F00 80245680 8FB40020 */ lw $s4, 0x20($sp) -/* 805F04 80245684 8FB3001C */ lw $s3, 0x1c($sp) -/* 805F08 80245688 8FB20018 */ lw $s2, 0x18($sp) -/* 805F0C 8024568C 8FB10014 */ lw $s1, 0x14($sp) -/* 805F10 80245690 8FB00010 */ lw $s0, 0x10($sp) -/* 805F14 80245694 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 805F18 80245698 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 805F1C 8024569C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 805F20 802456A0 03E00008 */ jr $ra -/* 805F24 802456A4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s new file mode 100644 index 0000000000..5883d09ab0 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245550_805DD0.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245550_805DD0 +/* 805DD0 80245550 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 805DD4 80245554 AFB50024 */ sw $s5, 0x24($sp) +/* 805DD8 80245558 0080A82D */ daddu $s5, $a0, $zero +/* 805DDC 8024555C AFBF002C */ sw $ra, 0x2c($sp) +/* 805DE0 80245560 AFB60028 */ sw $s6, 0x28($sp) +/* 805DE4 80245564 AFB40020 */ sw $s4, 0x20($sp) +/* 805DE8 80245568 AFB3001C */ sw $s3, 0x1c($sp) +/* 805DEC 8024556C AFB20018 */ sw $s2, 0x18($sp) +/* 805DF0 80245570 AFB10014 */ sw $s1, 0x14($sp) +/* 805DF4 80245574 AFB00010 */ sw $s0, 0x10($sp) +/* 805DF8 80245578 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 805DFC 8024557C F7B60038 */ sdc1 $f22, 0x38($sp) +/* 805E00 80245580 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 805E04 80245584 8EB30148 */ lw $s3, 0x148($s5) +/* 805E08 80245588 86640008 */ lh $a0, 8($s3) +/* 805E0C 8024558C 0C00EABB */ jal get_npc_unsafe +/* 805E10 80245590 00A0B02D */ daddu $s6, $a1, $zero +/* 805E14 80245594 0040A02D */ daddu $s4, $v0, $zero +/* 805E18 80245598 AEA00074 */ sw $zero, 0x74($s5) +/* 805E1C 8024559C C6980038 */ lwc1 $f24, 0x38($s4) +/* 805E20 802455A0 C6960040 */ lwc1 $f22, 0x40($s4) +/* 805E24 802455A4 0000902D */ daddu $s2, $zero, $zero +/* 805E28 802455A8 AEA00078 */ sw $zero, 0x78($s5) +/* 805E2C 802455AC 8E6300D0 */ lw $v1, 0xd0($s3) +/* 805E30 802455B0 8C620000 */ lw $v0, ($v1) +/* 805E34 802455B4 3C0146FF */ lui $at, 0x46ff +/* 805E38 802455B8 3421FE00 */ ori $at, $at, 0xfe00 +/* 805E3C 802455BC 4481A000 */ mtc1 $at, $f20 +/* 805E40 802455C0 18400018 */ blez $v0, .L80245624 +/* 805E44 802455C4 0240802D */ daddu $s0, $s2, $zero +/* 805E48 802455C8 0240882D */ daddu $s1, $s2, $zero +.L802455CC: +/* 805E4C 802455CC 02231021 */ addu $v0, $s1, $v1 +/* 805E50 802455D0 4600C306 */ mov.s $f12, $f24 +/* 805E54 802455D4 C4440004 */ lwc1 $f4, 4($v0) +/* 805E58 802455D8 46802120 */ cvt.s.w $f4, $f4 +/* 805E5C 802455DC 44062000 */ mfc1 $a2, $f4 +/* 805E60 802455E0 C444000C */ lwc1 $f4, 0xc($v0) +/* 805E64 802455E4 46802120 */ cvt.s.w $f4, $f4 +/* 805E68 802455E8 44072000 */ mfc1 $a3, $f4 +/* 805E6C 802455EC 0C00A7B5 */ jal dist2D +/* 805E70 802455F0 4600B386 */ mov.s $f14, $f22 +/* 805E74 802455F4 4614003C */ c.lt.s $f0, $f20 +/* 805E78 802455F8 00000000 */ nop +/* 805E7C 802455FC 45000003 */ bc1f .L8024560C +/* 805E80 80245600 2631000C */ addiu $s1, $s1, 0xc +/* 805E84 80245604 46000506 */ mov.s $f20, $f0 +/* 805E88 80245608 AEB20078 */ sw $s2, 0x78($s5) +.L8024560C: +/* 805E8C 8024560C 8E6300D0 */ lw $v1, 0xd0($s3) +/* 805E90 80245610 26100001 */ addiu $s0, $s0, 1 +/* 805E94 80245614 8C620000 */ lw $v0, ($v1) +/* 805E98 80245618 0202102A */ slt $v0, $s0, $v0 +/* 805E9C 8024561C 1440FFEB */ bnez $v0, .L802455CC +/* 805EA0 80245620 26520001 */ addiu $s2, $s2, 1 +.L80245624: +/* 805EA4 80245624 8E6200CC */ lw $v0, 0xcc($s3) +/* 805EA8 80245628 8C420004 */ lw $v0, 4($v0) +/* 805EAC 8024562C AE820028 */ sw $v0, 0x28($s4) +/* 805EB0 80245630 8E6200D0 */ lw $v0, 0xd0($s3) +/* 805EB4 80245634 8C42007C */ lw $v0, 0x7c($v0) +/* 805EB8 80245638 04410004 */ bgez $v0, .L8024564C +/* 805EBC 8024563C 00000000 */ nop +/* 805EC0 80245640 C6C00000 */ lwc1 $f0, ($s6) +/* 805EC4 80245644 0809159B */ j .L8024566C +/* 805EC8 80245648 E6800018 */ swc1 $f0, 0x18($s4) +.L8024564C: +/* 805ECC 8024564C 3C018026 */ lui $at, 0x8026 +/* 805ED0 80245650 D4222890 */ ldc1 $f2, 0x2890($at) +/* 805ED4 80245654 44820000 */ mtc1 $v0, $f0 +/* 805ED8 80245658 00000000 */ nop +/* 805EDC 8024565C 46800021 */ cvt.d.w $f0, $f0 +/* 805EE0 80245660 46220003 */ div.d $f0, $f0, $f2 +/* 805EE4 80245664 46200020 */ cvt.s.d $f0, $f0 +/* 805EE8 80245668 E6800018 */ swc1 $f0, 0x18($s4) +.L8024566C: +/* 805EEC 8024566C 24020001 */ addiu $v0, $zero, 1 +/* 805EF0 80245670 AEA20070 */ sw $v0, 0x70($s5) +/* 805EF4 80245674 8FBF002C */ lw $ra, 0x2c($sp) +/* 805EF8 80245678 8FB60028 */ lw $s6, 0x28($sp) +/* 805EFC 8024567C 8FB50024 */ lw $s5, 0x24($sp) +/* 805F00 80245680 8FB40020 */ lw $s4, 0x20($sp) +/* 805F04 80245684 8FB3001C */ lw $s3, 0x1c($sp) +/* 805F08 80245688 8FB20018 */ lw $s2, 0x18($sp) +/* 805F0C 8024568C 8FB10014 */ lw $s1, 0x14($sp) +/* 805F10 80245690 8FB00010 */ lw $s0, 0x10($sp) +/* 805F14 80245694 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 805F18 80245698 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 805F1C 8024569C D7B40030 */ ldc1 $f20, 0x30($sp) +/* 805F20 802456A0 03E00008 */ jr $ra +/* 805F24 802456A4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8.s deleted file mode 100644 index 8f027d149d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802456A8 -/* 805F28 802456A8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 805F2C 802456AC AFB20038 */ sw $s2, 0x38($sp) -/* 805F30 802456B0 0080902D */ daddu $s2, $a0, $zero -/* 805F34 802456B4 AFBF0044 */ sw $ra, 0x44($sp) -/* 805F38 802456B8 AFB40040 */ sw $s4, 0x40($sp) -/* 805F3C 802456BC AFB3003C */ sw $s3, 0x3c($sp) -/* 805F40 802456C0 AFB10034 */ sw $s1, 0x34($sp) -/* 805F44 802456C4 AFB00030 */ sw $s0, 0x30($sp) -/* 805F48 802456C8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 805F4C 802456CC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 805F50 802456D0 8E510148 */ lw $s1, 0x148($s2) -/* 805F54 802456D4 00A0982D */ daddu $s3, $a1, $zero -/* 805F58 802456D8 86240008 */ lh $a0, 8($s1) -/* 805F5C 802456DC 0C00EABB */ jal get_npc_unsafe -/* 805F60 802456E0 00C0A02D */ daddu $s4, $a2, $zero -/* 805F64 802456E4 8E630014 */ lw $v1, 0x14($s3) -/* 805F68 802456E8 04600030 */ bltz $v1, .L802457AC -/* 805F6C 802456EC 0040802D */ daddu $s0, $v0, $zero -/* 805F70 802456F0 8E420074 */ lw $v0, 0x74($s2) -/* 805F74 802456F4 1C40002C */ bgtz $v0, .L802457A8 -/* 805F78 802456F8 2442FFFF */ addiu $v0, $v0, -1 -/* 805F7C 802456FC 0280202D */ daddu $a0, $s4, $zero -/* 805F80 80245700 AE430074 */ sw $v1, 0x74($s2) -/* 805F84 80245704 AFA00010 */ sw $zero, 0x10($sp) -/* 805F88 80245708 8E66000C */ lw $a2, 0xc($s3) -/* 805F8C 8024570C 8E670010 */ lw $a3, 0x10($s3) -/* 805F90 80245710 0C01242D */ jal func_800490B4 -/* 805F94 80245714 0220282D */ daddu $a1, $s1, $zero -/* 805F98 80245718 10400021 */ beqz $v0, .L802457A0 -/* 805F9C 8024571C 0000202D */ daddu $a0, $zero, $zero -/* 805FA0 80245720 0200282D */ daddu $a1, $s0, $zero -/* 805FA4 80245724 0000302D */ daddu $a2, $zero, $zero -/* 805FA8 80245728 860300A8 */ lh $v1, 0xa8($s0) -/* 805FAC 8024572C 3C013F80 */ lui $at, 0x3f80 -/* 805FB0 80245730 44810000 */ mtc1 $at, $f0 -/* 805FB4 80245734 3C014000 */ lui $at, 0x4000 -/* 805FB8 80245738 44811000 */ mtc1 $at, $f2 -/* 805FBC 8024573C 3C01C1A0 */ lui $at, 0xc1a0 -/* 805FC0 80245740 44812000 */ mtc1 $at, $f4 -/* 805FC4 80245744 2402000F */ addiu $v0, $zero, 0xf -/* 805FC8 80245748 AFA2001C */ sw $v0, 0x1c($sp) -/* 805FCC 8024574C 44833000 */ mtc1 $v1, $f6 -/* 805FD0 80245750 00000000 */ nop -/* 805FD4 80245754 468031A0 */ cvt.s.w $f6, $f6 -/* 805FD8 80245758 44073000 */ mfc1 $a3, $f6 -/* 805FDC 8024575C 27A20028 */ addiu $v0, $sp, 0x28 -/* 805FE0 80245760 AFA20020 */ sw $v0, 0x20($sp) -/* 805FE4 80245764 E7A00010 */ swc1 $f0, 0x10($sp) -/* 805FE8 80245768 E7A20014 */ swc1 $f2, 0x14($sp) -/* 805FEC 8024576C 0C01BFA4 */ jal fx_emote -/* 805FF0 80245770 E7A40018 */ swc1 $f4, 0x18($sp) -/* 805FF4 80245774 0200202D */ daddu $a0, $s0, $zero -/* 805FF8 80245778 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 805FFC 8024577C 0C012530 */ jal func_800494C0 -/* 806000 80245780 3C060020 */ lui $a2, 0x20 -/* 806004 80245784 8E220018 */ lw $v0, 0x18($s1) -/* 806008 80245788 9442002A */ lhu $v0, 0x2a($v0) -/* 80600C 8024578C 30420001 */ andi $v0, $v0, 1 -/* 806010 80245790 14400064 */ bnez $v0, .L80245924 -/* 806014 80245794 2402000A */ addiu $v0, $zero, 0xa -/* 806018 80245798 08091649 */ j .L80245924 -/* 80601C 8024579C 2402000C */ addiu $v0, $zero, 0xc -.L802457A0: -/* 806020 802457A0 8E420074 */ lw $v0, 0x74($s2) -/* 806024 802457A4 2442FFFF */ addiu $v0, $v0, -1 -.L802457A8: -/* 806028 802457A8 AE420074 */ sw $v0, 0x74($s2) -.L802457AC: -/* 80602C 802457AC 8602008C */ lh $v0, 0x8c($s0) -/* 806030 802457B0 1440005D */ bnez $v0, .L80245928 -/* 806034 802457B4 00000000 */ nop -/* 806038 802457B8 C6000018 */ lwc1 $f0, 0x18($s0) -/* 80603C 802457BC 3C014010 */ lui $at, 0x4010 -/* 806040 802457C0 44811800 */ mtc1 $at, $f3 -/* 806044 802457C4 44801000 */ mtc1 $zero, $f2 -/* 806048 802457C8 46000021 */ cvt.d.s $f0, $f0 -/* 80604C 802457CC 4622003C */ c.lt.d $f0, $f2 -/* 806050 802457D0 00000000 */ nop -/* 806054 802457D4 45000003 */ bc1f .L802457E4 -/* 806058 802457D8 0200202D */ daddu $a0, $s0, $zero -/* 80605C 802457DC 080915FA */ j .L802457E8 -/* 806060 802457E0 0000282D */ daddu $a1, $zero, $zero -.L802457E4: -/* 806064 802457E4 24050001 */ addiu $a1, $zero, 1 -.L802457E8: -/* 806068 802457E8 0C00F598 */ jal func_8003D660 -/* 80606C 802457EC 00000000 */ nop -/* 806070 802457F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 806074 802457F4 8E430078 */ lw $v1, 0x78($s2) -/* 806078 802457F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 80607C 802457FC 00031040 */ sll $v0, $v1, 1 -/* 806080 80245800 00431021 */ addu $v0, $v0, $v1 -/* 806084 80245804 8E2300D0 */ lw $v1, 0xd0($s1) -/* 806088 80245808 00021080 */ sll $v0, $v0, 2 -/* 80608C 8024580C 00431021 */ addu $v0, $v0, $v1 -/* 806090 80245810 C4560004 */ lwc1 $f22, 4($v0) -/* 806094 80245814 4680B5A0 */ cvt.s.w $f22, $f22 -/* 806098 80245818 C454000C */ lwc1 $f20, 0xc($v0) -/* 80609C 8024581C 4680A520 */ cvt.s.w $f20, $f20 -/* 8060A0 80245820 4406B000 */ mfc1 $a2, $f22 -/* 8060A4 80245824 4407A000 */ mfc1 $a3, $f20 -/* 8060A8 80245828 0C00A720 */ jal atan2 -/* 8060AC 8024582C 00000000 */ nop -/* 8060B0 80245830 8E050018 */ lw $a1, 0x18($s0) -/* 8060B4 80245834 44060000 */ mfc1 $a2, $f0 -/* 8060B8 80245838 0200202D */ daddu $a0, $s0, $zero -/* 8060BC 8024583C 0C00EA95 */ jal npc_move_heading -/* 8060C0 80245840 AE06000C */ sw $a2, 0xc($s0) -/* 8060C4 80245844 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8060C8 80245848 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8060CC 8024584C 4406B000 */ mfc1 $a2, $f22 -/* 8060D0 80245850 4407A000 */ mfc1 $a3, $f20 -/* 8060D4 80245854 0C00A7B5 */ jal dist2D -/* 8060D8 80245858 00000000 */ nop -/* 8060DC 8024585C C6020018 */ lwc1 $f2, 0x18($s0) -/* 8060E0 80245860 4602003E */ c.le.s $f0, $f2 -/* 8060E4 80245864 00000000 */ nop -/* 8060E8 80245868 4500002F */ bc1f .L80245928 -/* 8060EC 8024586C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 8060F0 80245870 24020002 */ addiu $v0, $zero, 2 -/* 8060F4 80245874 0C00A67F */ jal rand_int -/* 8060F8 80245878 AE420070 */ sw $v0, 0x70($s2) -/* 8060FC 8024587C 3C035555 */ lui $v1, 0x5555 -/* 806100 80245880 34635556 */ ori $v1, $v1, 0x5556 -/* 806104 80245884 00430018 */ mult $v0, $v1 -/* 806108 80245888 000227C3 */ sra $a0, $v0, 0x1f -/* 80610C 8024588C 00004010 */ mfhi $t0 -/* 806110 80245890 01042023 */ subu $a0, $t0, $a0 -/* 806114 80245894 00041840 */ sll $v1, $a0, 1 -/* 806118 80245898 00641821 */ addu $v1, $v1, $a0 -/* 80611C 8024589C 00431023 */ subu $v0, $v0, $v1 -/* 806120 802458A0 24430002 */ addiu $v1, $v0, 2 -/* 806124 802458A4 AE430074 */ sw $v1, 0x74($s2) -/* 806128 802458A8 8E62002C */ lw $v0, 0x2c($s3) -/* 80612C 802458AC 18400009 */ blez $v0, .L802458D4 -/* 806130 802458B0 24020004 */ addiu $v0, $zero, 4 -/* 806134 802458B4 8E620004 */ lw $v0, 4($s3) -/* 806138 802458B8 18400006 */ blez $v0, .L802458D4 -/* 80613C 802458BC 24020004 */ addiu $v0, $zero, 4 -/* 806140 802458C0 8E620008 */ lw $v0, 8($s3) -/* 806144 802458C4 18400003 */ blez $v0, .L802458D4 -/* 806148 802458C8 24020004 */ addiu $v0, $zero, 4 -/* 80614C 802458CC 14600002 */ bnez $v1, .L802458D8 -/* 806150 802458D0 00000000 */ nop -.L802458D4: -/* 806154 802458D4 AE420070 */ sw $v0, 0x70($s2) -.L802458D8: -/* 806158 802458D8 0C00A67F */ jal rand_int -/* 80615C 802458DC 24042710 */ addiu $a0, $zero, 0x2710 -/* 806160 802458E0 3C0351EB */ lui $v1, 0x51eb -/* 806164 802458E4 3463851F */ ori $v1, $v1, 0x851f -/* 806168 802458E8 00430018 */ mult $v0, $v1 -/* 80616C 802458EC 00021FC3 */ sra $v1, $v0, 0x1f -/* 806170 802458F0 00004010 */ mfhi $t0 -/* 806174 802458F4 00082143 */ sra $a0, $t0, 5 -/* 806178 802458F8 00832023 */ subu $a0, $a0, $v1 -/* 80617C 802458FC 00041840 */ sll $v1, $a0, 1 -/* 806180 80245900 00641821 */ addu $v1, $v1, $a0 -/* 806184 80245904 000318C0 */ sll $v1, $v1, 3 -/* 806188 80245908 00641821 */ addu $v1, $v1, $a0 -/* 80618C 8024590C 00031880 */ sll $v1, $v1, 2 -/* 806190 80245910 8E640004 */ lw $a0, 4($s3) -/* 806194 80245914 00431023 */ subu $v0, $v0, $v1 -/* 806198 80245918 0044102A */ slt $v0, $v0, $a0 -/* 80619C 8024591C 10400002 */ beqz $v0, .L80245928 -/* 8061A0 80245920 24020004 */ addiu $v0, $zero, 4 -.L80245924: -/* 8061A4 80245924 AE420070 */ sw $v0, 0x70($s2) -.L80245928: -/* 8061A8 80245928 8FBF0044 */ lw $ra, 0x44($sp) -/* 8061AC 8024592C 8FB40040 */ lw $s4, 0x40($sp) -/* 8061B0 80245930 8FB3003C */ lw $s3, 0x3c($sp) -/* 8061B4 80245934 8FB20038 */ lw $s2, 0x38($sp) -/* 8061B8 80245938 8FB10034 */ lw $s1, 0x34($sp) -/* 8061BC 8024593C 8FB00030 */ lw $s0, 0x30($sp) -/* 8061C0 80245940 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 8061C4 80245944 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 8061C8 80245948 03E00008 */ jr $ra -/* 8061CC 8024594C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s new file mode 100644 index 0000000000..77c4bb7801 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802456A8_805F28.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802456A8_805F28 +/* 805F28 802456A8 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* 805F2C 802456AC AFB20038 */ sw $s2, 0x38($sp) +/* 805F30 802456B0 0080902D */ daddu $s2, $a0, $zero +/* 805F34 802456B4 AFBF0044 */ sw $ra, 0x44($sp) +/* 805F38 802456B8 AFB40040 */ sw $s4, 0x40($sp) +/* 805F3C 802456BC AFB3003C */ sw $s3, 0x3c($sp) +/* 805F40 802456C0 AFB10034 */ sw $s1, 0x34($sp) +/* 805F44 802456C4 AFB00030 */ sw $s0, 0x30($sp) +/* 805F48 802456C8 F7B60050 */ sdc1 $f22, 0x50($sp) +/* 805F4C 802456CC F7B40048 */ sdc1 $f20, 0x48($sp) +/* 805F50 802456D0 8E510148 */ lw $s1, 0x148($s2) +/* 805F54 802456D4 00A0982D */ daddu $s3, $a1, $zero +/* 805F58 802456D8 86240008 */ lh $a0, 8($s1) +/* 805F5C 802456DC 0C00EABB */ jal get_npc_unsafe +/* 805F60 802456E0 00C0A02D */ daddu $s4, $a2, $zero +/* 805F64 802456E4 8E630014 */ lw $v1, 0x14($s3) +/* 805F68 802456E8 04600030 */ bltz $v1, .L802457AC +/* 805F6C 802456EC 0040802D */ daddu $s0, $v0, $zero +/* 805F70 802456F0 8E420074 */ lw $v0, 0x74($s2) +/* 805F74 802456F4 1C40002C */ bgtz $v0, .L802457A8 +/* 805F78 802456F8 2442FFFF */ addiu $v0, $v0, -1 +/* 805F7C 802456FC 0280202D */ daddu $a0, $s4, $zero +/* 805F80 80245700 AE430074 */ sw $v1, 0x74($s2) +/* 805F84 80245704 AFA00010 */ sw $zero, 0x10($sp) +/* 805F88 80245708 8E66000C */ lw $a2, 0xc($s3) +/* 805F8C 8024570C 8E670010 */ lw $a3, 0x10($s3) +/* 805F90 80245710 0C01242D */ jal func_800490B4 +/* 805F94 80245714 0220282D */ daddu $a1, $s1, $zero +/* 805F98 80245718 10400021 */ beqz $v0, .L802457A0 +/* 805F9C 8024571C 0000202D */ daddu $a0, $zero, $zero +/* 805FA0 80245720 0200282D */ daddu $a1, $s0, $zero +/* 805FA4 80245724 0000302D */ daddu $a2, $zero, $zero +/* 805FA8 80245728 860300A8 */ lh $v1, 0xa8($s0) +/* 805FAC 8024572C 3C013F80 */ lui $at, 0x3f80 +/* 805FB0 80245730 44810000 */ mtc1 $at, $f0 +/* 805FB4 80245734 3C014000 */ lui $at, 0x4000 +/* 805FB8 80245738 44811000 */ mtc1 $at, $f2 +/* 805FBC 8024573C 3C01C1A0 */ lui $at, 0xc1a0 +/* 805FC0 80245740 44812000 */ mtc1 $at, $f4 +/* 805FC4 80245744 2402000F */ addiu $v0, $zero, 0xf +/* 805FC8 80245748 AFA2001C */ sw $v0, 0x1c($sp) +/* 805FCC 8024574C 44833000 */ mtc1 $v1, $f6 +/* 805FD0 80245750 00000000 */ nop +/* 805FD4 80245754 468031A0 */ cvt.s.w $f6, $f6 +/* 805FD8 80245758 44073000 */ mfc1 $a3, $f6 +/* 805FDC 8024575C 27A20028 */ addiu $v0, $sp, 0x28 +/* 805FE0 80245760 AFA20020 */ sw $v0, 0x20($sp) +/* 805FE4 80245764 E7A00010 */ swc1 $f0, 0x10($sp) +/* 805FE8 80245768 E7A20014 */ swc1 $f2, 0x14($sp) +/* 805FEC 8024576C 0C01BFA4 */ jal fx_emote +/* 805FF0 80245770 E7A40018 */ swc1 $f4, 0x18($sp) +/* 805FF4 80245774 0200202D */ daddu $a0, $s0, $zero +/* 805FF8 80245778 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 805FFC 8024577C 0C012530 */ jal func_800494C0 +/* 806000 80245780 3C060020 */ lui $a2, 0x20 +/* 806004 80245784 8E220018 */ lw $v0, 0x18($s1) +/* 806008 80245788 9442002A */ lhu $v0, 0x2a($v0) +/* 80600C 8024578C 30420001 */ andi $v0, $v0, 1 +/* 806010 80245790 14400064 */ bnez $v0, .L80245924 +/* 806014 80245794 2402000A */ addiu $v0, $zero, 0xa +/* 806018 80245798 08091649 */ j .L80245924 +/* 80601C 8024579C 2402000C */ addiu $v0, $zero, 0xc +.L802457A0: +/* 806020 802457A0 8E420074 */ lw $v0, 0x74($s2) +/* 806024 802457A4 2442FFFF */ addiu $v0, $v0, -1 +.L802457A8: +/* 806028 802457A8 AE420074 */ sw $v0, 0x74($s2) +.L802457AC: +/* 80602C 802457AC 8602008C */ lh $v0, 0x8c($s0) +/* 806030 802457B0 1440005D */ bnez $v0, .L80245928 +/* 806034 802457B4 00000000 */ nop +/* 806038 802457B8 C6000018 */ lwc1 $f0, 0x18($s0) +/* 80603C 802457BC 3C014010 */ lui $at, 0x4010 +/* 806040 802457C0 44811800 */ mtc1 $at, $f3 +/* 806044 802457C4 44801000 */ mtc1 $zero, $f2 +/* 806048 802457C8 46000021 */ cvt.d.s $f0, $f0 +/* 80604C 802457CC 4622003C */ c.lt.d $f0, $f2 +/* 806050 802457D0 00000000 */ nop +/* 806054 802457D4 45000003 */ bc1f .L802457E4 +/* 806058 802457D8 0200202D */ daddu $a0, $s0, $zero +/* 80605C 802457DC 080915FA */ j .L802457E8 +/* 806060 802457E0 0000282D */ daddu $a1, $zero, $zero +.L802457E4: +/* 806064 802457E4 24050001 */ addiu $a1, $zero, 1 +.L802457E8: +/* 806068 802457E8 0C00F598 */ jal func_8003D660 +/* 80606C 802457EC 00000000 */ nop +/* 806070 802457F0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 806074 802457F4 8E430078 */ lw $v1, 0x78($s2) +/* 806078 802457F8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 80607C 802457FC 00031040 */ sll $v0, $v1, 1 +/* 806080 80245800 00431021 */ addu $v0, $v0, $v1 +/* 806084 80245804 8E2300D0 */ lw $v1, 0xd0($s1) +/* 806088 80245808 00021080 */ sll $v0, $v0, 2 +/* 80608C 8024580C 00431021 */ addu $v0, $v0, $v1 +/* 806090 80245810 C4560004 */ lwc1 $f22, 4($v0) +/* 806094 80245814 4680B5A0 */ cvt.s.w $f22, $f22 +/* 806098 80245818 C454000C */ lwc1 $f20, 0xc($v0) +/* 80609C 8024581C 4680A520 */ cvt.s.w $f20, $f20 +/* 8060A0 80245820 4406B000 */ mfc1 $a2, $f22 +/* 8060A4 80245824 4407A000 */ mfc1 $a3, $f20 +/* 8060A8 80245828 0C00A720 */ jal atan2 +/* 8060AC 8024582C 00000000 */ nop +/* 8060B0 80245830 8E050018 */ lw $a1, 0x18($s0) +/* 8060B4 80245834 44060000 */ mfc1 $a2, $f0 +/* 8060B8 80245838 0200202D */ daddu $a0, $s0, $zero +/* 8060BC 8024583C 0C00EA95 */ jal npc_move_heading +/* 8060C0 80245840 AE06000C */ sw $a2, 0xc($s0) +/* 8060C4 80245844 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8060C8 80245848 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8060CC 8024584C 4406B000 */ mfc1 $a2, $f22 +/* 8060D0 80245850 4407A000 */ mfc1 $a3, $f20 +/* 8060D4 80245854 0C00A7B5 */ jal dist2D +/* 8060D8 80245858 00000000 */ nop +/* 8060DC 8024585C C6020018 */ lwc1 $f2, 0x18($s0) +/* 8060E0 80245860 4602003E */ c.le.s $f0, $f2 +/* 8060E4 80245864 00000000 */ nop +/* 8060E8 80245868 4500002F */ bc1f .L80245928 +/* 8060EC 8024586C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 8060F0 80245870 24020002 */ addiu $v0, $zero, 2 +/* 8060F4 80245874 0C00A67F */ jal rand_int +/* 8060F8 80245878 AE420070 */ sw $v0, 0x70($s2) +/* 8060FC 8024587C 3C035555 */ lui $v1, 0x5555 +/* 806100 80245880 34635556 */ ori $v1, $v1, 0x5556 +/* 806104 80245884 00430018 */ mult $v0, $v1 +/* 806108 80245888 000227C3 */ sra $a0, $v0, 0x1f +/* 80610C 8024588C 00004010 */ mfhi $t0 +/* 806110 80245890 01042023 */ subu $a0, $t0, $a0 +/* 806114 80245894 00041840 */ sll $v1, $a0, 1 +/* 806118 80245898 00641821 */ addu $v1, $v1, $a0 +/* 80611C 8024589C 00431023 */ subu $v0, $v0, $v1 +/* 806120 802458A0 24430002 */ addiu $v1, $v0, 2 +/* 806124 802458A4 AE430074 */ sw $v1, 0x74($s2) +/* 806128 802458A8 8E62002C */ lw $v0, 0x2c($s3) +/* 80612C 802458AC 18400009 */ blez $v0, .L802458D4 +/* 806130 802458B0 24020004 */ addiu $v0, $zero, 4 +/* 806134 802458B4 8E620004 */ lw $v0, 4($s3) +/* 806138 802458B8 18400006 */ blez $v0, .L802458D4 +/* 80613C 802458BC 24020004 */ addiu $v0, $zero, 4 +/* 806140 802458C0 8E620008 */ lw $v0, 8($s3) +/* 806144 802458C4 18400003 */ blez $v0, .L802458D4 +/* 806148 802458C8 24020004 */ addiu $v0, $zero, 4 +/* 80614C 802458CC 14600002 */ bnez $v1, .L802458D8 +/* 806150 802458D0 00000000 */ nop +.L802458D4: +/* 806154 802458D4 AE420070 */ sw $v0, 0x70($s2) +.L802458D8: +/* 806158 802458D8 0C00A67F */ jal rand_int +/* 80615C 802458DC 24042710 */ addiu $a0, $zero, 0x2710 +/* 806160 802458E0 3C0351EB */ lui $v1, 0x51eb +/* 806164 802458E4 3463851F */ ori $v1, $v1, 0x851f +/* 806168 802458E8 00430018 */ mult $v0, $v1 +/* 80616C 802458EC 00021FC3 */ sra $v1, $v0, 0x1f +/* 806170 802458F0 00004010 */ mfhi $t0 +/* 806174 802458F4 00082143 */ sra $a0, $t0, 5 +/* 806178 802458F8 00832023 */ subu $a0, $a0, $v1 +/* 80617C 802458FC 00041840 */ sll $v1, $a0, 1 +/* 806180 80245900 00641821 */ addu $v1, $v1, $a0 +/* 806184 80245904 000318C0 */ sll $v1, $v1, 3 +/* 806188 80245908 00641821 */ addu $v1, $v1, $a0 +/* 80618C 8024590C 00031880 */ sll $v1, $v1, 2 +/* 806190 80245910 8E640004 */ lw $a0, 4($s3) +/* 806194 80245914 00431023 */ subu $v0, $v0, $v1 +/* 806198 80245918 0044102A */ slt $v0, $v0, $a0 +/* 80619C 8024591C 10400002 */ beqz $v0, .L80245928 +/* 8061A0 80245920 24020004 */ addiu $v0, $zero, 4 +.L80245924: +/* 8061A4 80245924 AE420070 */ sw $v0, 0x70($s2) +.L80245928: +/* 8061A8 80245928 8FBF0044 */ lw $ra, 0x44($sp) +/* 8061AC 8024592C 8FB40040 */ lw $s4, 0x40($sp) +/* 8061B0 80245930 8FB3003C */ lw $s3, 0x3c($sp) +/* 8061B4 80245934 8FB20038 */ lw $s2, 0x38($sp) +/* 8061B8 80245938 8FB10034 */ lw $s1, 0x34($sp) +/* 8061BC 8024593C 8FB00030 */ lw $s0, 0x30($sp) +/* 8061C0 80245940 D7B60050 */ ldc1 $f22, 0x50($sp) +/* 8061C4 80245944 D7B40048 */ ldc1 $f20, 0x48($sp) +/* 8061C8 80245948 03E00008 */ jr $ra +/* 8061CC 8024594C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950.s deleted file mode 100644 index 9b0e7e4639..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245950 -/* 8061D0 80245950 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8061D4 80245954 AFB3001C */ sw $s3, 0x1c($sp) -/* 8061D8 80245958 0080982D */ daddu $s3, $a0, $zero -/* 8061DC 8024595C AFBF0020 */ sw $ra, 0x20($sp) -/* 8061E0 80245960 AFB20018 */ sw $s2, 0x18($sp) -/* 8061E4 80245964 AFB10014 */ sw $s1, 0x14($sp) -/* 8061E8 80245968 AFB00010 */ sw $s0, 0x10($sp) -/* 8061EC 8024596C 8E720148 */ lw $s2, 0x148($s3) -/* 8061F0 80245970 86440008 */ lh $a0, 8($s2) -/* 8061F4 80245974 0C00EABB */ jal get_npc_unsafe -/* 8061F8 80245978 00A0882D */ daddu $s1, $a1, $zero -/* 8061FC 8024597C 8E240008 */ lw $a0, 8($s1) -/* 806200 80245980 0040802D */ daddu $s0, $v0, $zero -/* 806204 80245984 00041FC2 */ srl $v1, $a0, 0x1f -/* 806208 80245988 00832021 */ addu $a0, $a0, $v1 -/* 80620C 8024598C 00042043 */ sra $a0, $a0, 1 -/* 806210 80245990 0C00A67F */ jal rand_int -/* 806214 80245994 24840001 */ addiu $a0, $a0, 1 -/* 806218 80245998 8E230008 */ lw $v1, 8($s1) -/* 80621C 8024599C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 806220 802459A0 00032FC2 */ srl $a1, $v1, 0x1f -/* 806224 802459A4 00651821 */ addu $v1, $v1, $a1 -/* 806228 802459A8 00031843 */ sra $v1, $v1, 1 -/* 80622C 802459AC 00621821 */ addu $v1, $v1, $v0 -/* 806230 802459B0 0C00A67F */ jal rand_int -/* 806234 802459B4 A603008E */ sh $v1, 0x8e($s0) -/* 806238 802459B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 80623C 802459BC 44820000 */ mtc1 $v0, $f0 -/* 806240 802459C0 00000000 */ nop -/* 806244 802459C4 46800020 */ cvt.s.w $f0, $f0 -/* 806248 802459C8 46006300 */ add.s $f12, $f12, $f0 -/* 80624C 802459CC 3C0142B4 */ lui $at, 0x42b4 -/* 806250 802459D0 44810000 */ mtc1 $at, $f0 -/* 806254 802459D4 0C00A6C9 */ jal clamp_angle -/* 806258 802459D8 46006301 */ sub.s $f12, $f12, $f0 -/* 80625C 802459DC E600000C */ swc1 $f0, 0xc($s0) -/* 806260 802459E0 8E4200CC */ lw $v0, 0xcc($s2) -/* 806264 802459E4 8C420000 */ lw $v0, ($v0) -/* 806268 802459E8 AE020028 */ sw $v0, 0x28($s0) -/* 80626C 802459EC 24020003 */ addiu $v0, $zero, 3 -/* 806270 802459F0 AE620070 */ sw $v0, 0x70($s3) -/* 806274 802459F4 8FBF0020 */ lw $ra, 0x20($sp) -/* 806278 802459F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 80627C 802459FC 8FB20018 */ lw $s2, 0x18($sp) -/* 806280 80245A00 8FB10014 */ lw $s1, 0x14($sp) -/* 806284 80245A04 8FB00010 */ lw $s0, 0x10($sp) -/* 806288 80245A08 03E00008 */ jr $ra -/* 80628C 80245A0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s new file mode 100644 index 0000000000..e42425150f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245950_8061D0.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245950_8061D0 +/* 8061D0 80245950 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8061D4 80245954 AFB3001C */ sw $s3, 0x1c($sp) +/* 8061D8 80245958 0080982D */ daddu $s3, $a0, $zero +/* 8061DC 8024595C AFBF0020 */ sw $ra, 0x20($sp) +/* 8061E0 80245960 AFB20018 */ sw $s2, 0x18($sp) +/* 8061E4 80245964 AFB10014 */ sw $s1, 0x14($sp) +/* 8061E8 80245968 AFB00010 */ sw $s0, 0x10($sp) +/* 8061EC 8024596C 8E720148 */ lw $s2, 0x148($s3) +/* 8061F0 80245970 86440008 */ lh $a0, 8($s2) +/* 8061F4 80245974 0C00EABB */ jal get_npc_unsafe +/* 8061F8 80245978 00A0882D */ daddu $s1, $a1, $zero +/* 8061FC 8024597C 8E240008 */ lw $a0, 8($s1) +/* 806200 80245980 0040802D */ daddu $s0, $v0, $zero +/* 806204 80245984 00041FC2 */ srl $v1, $a0, 0x1f +/* 806208 80245988 00832021 */ addu $a0, $a0, $v1 +/* 80620C 8024598C 00042043 */ sra $a0, $a0, 1 +/* 806210 80245990 0C00A67F */ jal rand_int +/* 806214 80245994 24840001 */ addiu $a0, $a0, 1 +/* 806218 80245998 8E230008 */ lw $v1, 8($s1) +/* 80621C 8024599C 240400B4 */ addiu $a0, $zero, 0xb4 +/* 806220 802459A0 00032FC2 */ srl $a1, $v1, 0x1f +/* 806224 802459A4 00651821 */ addu $v1, $v1, $a1 +/* 806228 802459A8 00031843 */ sra $v1, $v1, 1 +/* 80622C 802459AC 00621821 */ addu $v1, $v1, $v0 +/* 806230 802459B0 0C00A67F */ jal rand_int +/* 806234 802459B4 A603008E */ sh $v1, 0x8e($s0) +/* 806238 802459B8 C60C000C */ lwc1 $f12, 0xc($s0) +/* 80623C 802459BC 44820000 */ mtc1 $v0, $f0 +/* 806240 802459C0 00000000 */ nop +/* 806244 802459C4 46800020 */ cvt.s.w $f0, $f0 +/* 806248 802459C8 46006300 */ add.s $f12, $f12, $f0 +/* 80624C 802459CC 3C0142B4 */ lui $at, 0x42b4 +/* 806250 802459D0 44810000 */ mtc1 $at, $f0 +/* 806254 802459D4 0C00A6C9 */ jal clamp_angle +/* 806258 802459D8 46006301 */ sub.s $f12, $f12, $f0 +/* 80625C 802459DC E600000C */ swc1 $f0, 0xc($s0) +/* 806260 802459E0 8E4200CC */ lw $v0, 0xcc($s2) +/* 806264 802459E4 8C420000 */ lw $v0, ($v0) +/* 806268 802459E8 AE020028 */ sw $v0, 0x28($s0) +/* 80626C 802459EC 24020003 */ addiu $v0, $zero, 3 +/* 806270 802459F0 AE620070 */ sw $v0, 0x70($s3) +/* 806274 802459F4 8FBF0020 */ lw $ra, 0x20($sp) +/* 806278 802459F8 8FB3001C */ lw $s3, 0x1c($sp) +/* 80627C 802459FC 8FB20018 */ lw $s2, 0x18($sp) +/* 806280 80245A00 8FB10014 */ lw $s1, 0x14($sp) +/* 806284 80245A04 8FB00010 */ lw $s0, 0x10($sp) +/* 806288 80245A08 03E00008 */ jr $ra +/* 80628C 80245A0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10.s deleted file mode 100644 index a25cb34e66..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245A10 -/* 806290 80245A10 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 806294 80245A14 AFB40040 */ sw $s4, 0x40($sp) -/* 806298 80245A18 0080A02D */ daddu $s4, $a0, $zero -/* 80629C 80245A1C AFBF0044 */ sw $ra, 0x44($sp) -/* 8062A0 80245A20 AFB3003C */ sw $s3, 0x3c($sp) -/* 8062A4 80245A24 AFB20038 */ sw $s2, 0x38($sp) -/* 8062A8 80245A28 AFB10034 */ sw $s1, 0x34($sp) -/* 8062AC 80245A2C AFB00030 */ sw $s0, 0x30($sp) -/* 8062B0 80245A30 8E910148 */ lw $s1, 0x148($s4) -/* 8062B4 80245A34 00A0902D */ daddu $s2, $a1, $zero -/* 8062B8 80245A38 86240008 */ lh $a0, 8($s1) -/* 8062BC 80245A3C 0C00EABB */ jal get_npc_unsafe -/* 8062C0 80245A40 00C0982D */ daddu $s3, $a2, $zero -/* 8062C4 80245A44 8E430014 */ lw $v1, 0x14($s2) -/* 8062C8 80245A48 04600031 */ bltz $v1, .L80245B10 -/* 8062CC 80245A4C 0040802D */ daddu $s0, $v0, $zero -/* 8062D0 80245A50 0260202D */ daddu $a0, $s3, $zero -/* 8062D4 80245A54 AFA00010 */ sw $zero, 0x10($sp) -/* 8062D8 80245A58 8E460024 */ lw $a2, 0x24($s2) -/* 8062DC 80245A5C 8E470028 */ lw $a3, 0x28($s2) -/* 8062E0 80245A60 0C01242D */ jal func_800490B4 -/* 8062E4 80245A64 0220282D */ daddu $a1, $s1, $zero -/* 8062E8 80245A68 10400029 */ beqz $v0, .L80245B10 -/* 8062EC 80245A6C 0000202D */ daddu $a0, $zero, $zero -/* 8062F0 80245A70 0200282D */ daddu $a1, $s0, $zero -/* 8062F4 80245A74 0000302D */ daddu $a2, $zero, $zero -/* 8062F8 80245A78 860300A8 */ lh $v1, 0xa8($s0) -/* 8062FC 80245A7C 3C013F80 */ lui $at, 0x3f80 -/* 806300 80245A80 44810000 */ mtc1 $at, $f0 -/* 806304 80245A84 3C014000 */ lui $at, 0x4000 -/* 806308 80245A88 44811000 */ mtc1 $at, $f2 -/* 80630C 80245A8C 3C01C1A0 */ lui $at, 0xc1a0 -/* 806310 80245A90 44812000 */ mtc1 $at, $f4 -/* 806314 80245A94 2402000F */ addiu $v0, $zero, 0xf -/* 806318 80245A98 AFA2001C */ sw $v0, 0x1c($sp) -/* 80631C 80245A9C 44833000 */ mtc1 $v1, $f6 -/* 806320 80245AA0 00000000 */ nop -/* 806324 80245AA4 468031A0 */ cvt.s.w $f6, $f6 -/* 806328 80245AA8 44073000 */ mfc1 $a3, $f6 -/* 80632C 80245AAC 27A20028 */ addiu $v0, $sp, 0x28 -/* 806330 80245AB0 AFA20020 */ sw $v0, 0x20($sp) -/* 806334 80245AB4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 806338 80245AB8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 80633C 80245ABC 0C01BFA4 */ jal fx_emote -/* 806340 80245AC0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 806344 80245AC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 806348 80245AC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 80634C 80245ACC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 806350 80245AD0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 806354 80245AD4 8C460028 */ lw $a2, 0x28($v0) -/* 806358 80245AD8 0C00A720 */ jal atan2 -/* 80635C 80245ADC 8C470030 */ lw $a3, 0x30($v0) -/* 806360 80245AE0 0200202D */ daddu $a0, $s0, $zero -/* 806364 80245AE4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 806368 80245AE8 3C060020 */ lui $a2, 0x20 -/* 80636C 80245AEC 0C012530 */ jal func_800494C0 -/* 806370 80245AF0 E480000C */ swc1 $f0, 0xc($a0) -/* 806374 80245AF4 8E220018 */ lw $v0, 0x18($s1) -/* 806378 80245AF8 9442002A */ lhu $v0, 0x2a($v0) -/* 80637C 80245AFC 30420001 */ andi $v0, $v0, 1 -/* 806380 80245B00 14400029 */ bnez $v0, .L80245BA8 -/* 806384 80245B04 2402000A */ addiu $v0, $zero, 0xa -/* 806388 80245B08 080916EA */ j .L80245BA8 -/* 80638C 80245B0C 2402000C */ addiu $v0, $zero, 0xc -.L80245B10: -/* 806390 80245B10 8602008C */ lh $v0, 0x8c($s0) -/* 806394 80245B14 14400025 */ bnez $v0, .L80245BAC -/* 806398 80245B18 00000000 */ nop -/* 80639C 80245B1C 9602008E */ lhu $v0, 0x8e($s0) -/* 8063A0 80245B20 2442FFFF */ addiu $v0, $v0, -1 -/* 8063A4 80245B24 A602008E */ sh $v0, 0x8e($s0) -/* 8063A8 80245B28 00021400 */ sll $v0, $v0, 0x10 -/* 8063AC 80245B2C 1440001F */ bnez $v0, .L80245BAC -/* 8063B0 80245B30 00000000 */ nop -/* 8063B4 80245B34 8E820074 */ lw $v0, 0x74($s4) -/* 8063B8 80245B38 2442FFFF */ addiu $v0, $v0, -1 -/* 8063BC 80245B3C 10400019 */ beqz $v0, .L80245BA4 -/* 8063C0 80245B40 AE820074 */ sw $v0, 0x74($s4) -/* 8063C4 80245B44 8E220018 */ lw $v0, 0x18($s1) -/* 8063C8 80245B48 9442002A */ lhu $v0, 0x2a($v0) -/* 8063CC 80245B4C 30420010 */ andi $v0, $v0, 0x10 -/* 8063D0 80245B50 14400007 */ bnez $v0, .L80245B70 -/* 8063D4 80245B54 00000000 */ nop -/* 8063D8 80245B58 C600000C */ lwc1 $f0, 0xc($s0) -/* 8063DC 80245B5C 3C014334 */ lui $at, 0x4334 -/* 8063E0 80245B60 44816000 */ mtc1 $at, $f12 -/* 8063E4 80245B64 0C00A6C9 */ jal clamp_angle -/* 8063E8 80245B68 460C0300 */ add.s $f12, $f0, $f12 -/* 8063EC 80245B6C E600000C */ swc1 $f0, 0xc($s0) -.L80245B70: -/* 8063F0 80245B70 8E440008 */ lw $a0, 8($s2) -/* 8063F4 80245B74 000417C2 */ srl $v0, $a0, 0x1f -/* 8063F8 80245B78 00822021 */ addu $a0, $a0, $v0 -/* 8063FC 80245B7C 00042043 */ sra $a0, $a0, 1 -/* 806400 80245B80 0C00A67F */ jal rand_int -/* 806404 80245B84 24840001 */ addiu $a0, $a0, 1 -/* 806408 80245B88 8E430008 */ lw $v1, 8($s2) -/* 80640C 80245B8C 000327C2 */ srl $a0, $v1, 0x1f -/* 806410 80245B90 00641821 */ addu $v1, $v1, $a0 -/* 806414 80245B94 00031843 */ sra $v1, $v1, 1 -/* 806418 80245B98 00621821 */ addu $v1, $v1, $v0 -/* 80641C 80245B9C 080916EB */ j .L80245BAC -/* 806420 80245BA0 A603008E */ sh $v1, 0x8e($s0) -.L80245BA4: -/* 806424 80245BA4 24020004 */ addiu $v0, $zero, 4 -.L80245BA8: -/* 806428 80245BA8 AE820070 */ sw $v0, 0x70($s4) -.L80245BAC: -/* 80642C 80245BAC 8FBF0044 */ lw $ra, 0x44($sp) -/* 806430 80245BB0 8FB40040 */ lw $s4, 0x40($sp) -/* 806434 80245BB4 8FB3003C */ lw $s3, 0x3c($sp) -/* 806438 80245BB8 8FB20038 */ lw $s2, 0x38($sp) -/* 80643C 80245BBC 8FB10034 */ lw $s1, 0x34($sp) -/* 806440 80245BC0 8FB00030 */ lw $s0, 0x30($sp) -/* 806444 80245BC4 03E00008 */ jr $ra -/* 806448 80245BC8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s new file mode 100644 index 0000000000..f0a9d1de10 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245A10_806290.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245A10_806290 +/* 806290 80245A10 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 806294 80245A14 AFB40040 */ sw $s4, 0x40($sp) +/* 806298 80245A18 0080A02D */ daddu $s4, $a0, $zero +/* 80629C 80245A1C AFBF0044 */ sw $ra, 0x44($sp) +/* 8062A0 80245A20 AFB3003C */ sw $s3, 0x3c($sp) +/* 8062A4 80245A24 AFB20038 */ sw $s2, 0x38($sp) +/* 8062A8 80245A28 AFB10034 */ sw $s1, 0x34($sp) +/* 8062AC 80245A2C AFB00030 */ sw $s0, 0x30($sp) +/* 8062B0 80245A30 8E910148 */ lw $s1, 0x148($s4) +/* 8062B4 80245A34 00A0902D */ daddu $s2, $a1, $zero +/* 8062B8 80245A38 86240008 */ lh $a0, 8($s1) +/* 8062BC 80245A3C 0C00EABB */ jal get_npc_unsafe +/* 8062C0 80245A40 00C0982D */ daddu $s3, $a2, $zero +/* 8062C4 80245A44 8E430014 */ lw $v1, 0x14($s2) +/* 8062C8 80245A48 04600031 */ bltz $v1, .L80245B10 +/* 8062CC 80245A4C 0040802D */ daddu $s0, $v0, $zero +/* 8062D0 80245A50 0260202D */ daddu $a0, $s3, $zero +/* 8062D4 80245A54 AFA00010 */ sw $zero, 0x10($sp) +/* 8062D8 80245A58 8E460024 */ lw $a2, 0x24($s2) +/* 8062DC 80245A5C 8E470028 */ lw $a3, 0x28($s2) +/* 8062E0 80245A60 0C01242D */ jal func_800490B4 +/* 8062E4 80245A64 0220282D */ daddu $a1, $s1, $zero +/* 8062E8 80245A68 10400029 */ beqz $v0, .L80245B10 +/* 8062EC 80245A6C 0000202D */ daddu $a0, $zero, $zero +/* 8062F0 80245A70 0200282D */ daddu $a1, $s0, $zero +/* 8062F4 80245A74 0000302D */ daddu $a2, $zero, $zero +/* 8062F8 80245A78 860300A8 */ lh $v1, 0xa8($s0) +/* 8062FC 80245A7C 3C013F80 */ lui $at, 0x3f80 +/* 806300 80245A80 44810000 */ mtc1 $at, $f0 +/* 806304 80245A84 3C014000 */ lui $at, 0x4000 +/* 806308 80245A88 44811000 */ mtc1 $at, $f2 +/* 80630C 80245A8C 3C01C1A0 */ lui $at, 0xc1a0 +/* 806310 80245A90 44812000 */ mtc1 $at, $f4 +/* 806314 80245A94 2402000F */ addiu $v0, $zero, 0xf +/* 806318 80245A98 AFA2001C */ sw $v0, 0x1c($sp) +/* 80631C 80245A9C 44833000 */ mtc1 $v1, $f6 +/* 806320 80245AA0 00000000 */ nop +/* 806324 80245AA4 468031A0 */ cvt.s.w $f6, $f6 +/* 806328 80245AA8 44073000 */ mfc1 $a3, $f6 +/* 80632C 80245AAC 27A20028 */ addiu $v0, $sp, 0x28 +/* 806330 80245AB0 AFA20020 */ sw $v0, 0x20($sp) +/* 806334 80245AB4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 806338 80245AB8 E7A20014 */ swc1 $f2, 0x14($sp) +/* 80633C 80245ABC 0C01BFA4 */ jal fx_emote +/* 806340 80245AC0 E7A40018 */ swc1 $f4, 0x18($sp) +/* 806344 80245AC4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 806348 80245AC8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 80634C 80245ACC C60C0038 */ lwc1 $f12, 0x38($s0) +/* 806350 80245AD0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 806354 80245AD4 8C460028 */ lw $a2, 0x28($v0) +/* 806358 80245AD8 0C00A720 */ jal atan2 +/* 80635C 80245ADC 8C470030 */ lw $a3, 0x30($v0) +/* 806360 80245AE0 0200202D */ daddu $a0, $s0, $zero +/* 806364 80245AE4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 806368 80245AE8 3C060020 */ lui $a2, 0x20 +/* 80636C 80245AEC 0C012530 */ jal func_800494C0 +/* 806370 80245AF0 E480000C */ swc1 $f0, 0xc($a0) +/* 806374 80245AF4 8E220018 */ lw $v0, 0x18($s1) +/* 806378 80245AF8 9442002A */ lhu $v0, 0x2a($v0) +/* 80637C 80245AFC 30420001 */ andi $v0, $v0, 1 +/* 806380 80245B00 14400029 */ bnez $v0, .L80245BA8 +/* 806384 80245B04 2402000A */ addiu $v0, $zero, 0xa +/* 806388 80245B08 080916EA */ j .L80245BA8 +/* 80638C 80245B0C 2402000C */ addiu $v0, $zero, 0xc +.L80245B10: +/* 806390 80245B10 8602008C */ lh $v0, 0x8c($s0) +/* 806394 80245B14 14400025 */ bnez $v0, .L80245BAC +/* 806398 80245B18 00000000 */ nop +/* 80639C 80245B1C 9602008E */ lhu $v0, 0x8e($s0) +/* 8063A0 80245B20 2442FFFF */ addiu $v0, $v0, -1 +/* 8063A4 80245B24 A602008E */ sh $v0, 0x8e($s0) +/* 8063A8 80245B28 00021400 */ sll $v0, $v0, 0x10 +/* 8063AC 80245B2C 1440001F */ bnez $v0, .L80245BAC +/* 8063B0 80245B30 00000000 */ nop +/* 8063B4 80245B34 8E820074 */ lw $v0, 0x74($s4) +/* 8063B8 80245B38 2442FFFF */ addiu $v0, $v0, -1 +/* 8063BC 80245B3C 10400019 */ beqz $v0, .L80245BA4 +/* 8063C0 80245B40 AE820074 */ sw $v0, 0x74($s4) +/* 8063C4 80245B44 8E220018 */ lw $v0, 0x18($s1) +/* 8063C8 80245B48 9442002A */ lhu $v0, 0x2a($v0) +/* 8063CC 80245B4C 30420010 */ andi $v0, $v0, 0x10 +/* 8063D0 80245B50 14400007 */ bnez $v0, .L80245B70 +/* 8063D4 80245B54 00000000 */ nop +/* 8063D8 80245B58 C600000C */ lwc1 $f0, 0xc($s0) +/* 8063DC 80245B5C 3C014334 */ lui $at, 0x4334 +/* 8063E0 80245B60 44816000 */ mtc1 $at, $f12 +/* 8063E4 80245B64 0C00A6C9 */ jal clamp_angle +/* 8063E8 80245B68 460C0300 */ add.s $f12, $f0, $f12 +/* 8063EC 80245B6C E600000C */ swc1 $f0, 0xc($s0) +.L80245B70: +/* 8063F0 80245B70 8E440008 */ lw $a0, 8($s2) +/* 8063F4 80245B74 000417C2 */ srl $v0, $a0, 0x1f +/* 8063F8 80245B78 00822021 */ addu $a0, $a0, $v0 +/* 8063FC 80245B7C 00042043 */ sra $a0, $a0, 1 +/* 806400 80245B80 0C00A67F */ jal rand_int +/* 806404 80245B84 24840001 */ addiu $a0, $a0, 1 +/* 806408 80245B88 8E430008 */ lw $v1, 8($s2) +/* 80640C 80245B8C 000327C2 */ srl $a0, $v1, 0x1f +/* 806410 80245B90 00641821 */ addu $v1, $v1, $a0 +/* 806414 80245B94 00031843 */ sra $v1, $v1, 1 +/* 806418 80245B98 00621821 */ addu $v1, $v1, $v0 +/* 80641C 80245B9C 080916EB */ j .L80245BAC +/* 806420 80245BA0 A603008E */ sh $v1, 0x8e($s0) +.L80245BA4: +/* 806424 80245BA4 24020004 */ addiu $v0, $zero, 4 +.L80245BA8: +/* 806428 80245BA8 AE820070 */ sw $v0, 0x70($s4) +.L80245BAC: +/* 80642C 80245BAC 8FBF0044 */ lw $ra, 0x44($sp) +/* 806430 80245BB0 8FB40040 */ lw $s4, 0x40($sp) +/* 806434 80245BB4 8FB3003C */ lw $s3, 0x3c($sp) +/* 806438 80245BB8 8FB20038 */ lw $s2, 0x38($sp) +/* 80643C 80245BBC 8FB10034 */ lw $s1, 0x34($sp) +/* 806440 80245BC0 8FB00030 */ lw $s0, 0x30($sp) +/* 806444 80245BC4 03E00008 */ jr $ra +/* 806448 80245BC8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC.s deleted file mode 100644 index 4fc8fa7491..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245BCC -/* 80644C 80245BCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 806450 80245BD0 AFB10014 */ sw $s1, 0x14($sp) -/* 806454 80245BD4 0080882D */ daddu $s1, $a0, $zero -/* 806458 80245BD8 AFBF001C */ sw $ra, 0x1c($sp) -/* 80645C 80245BDC AFB20018 */ sw $s2, 0x18($sp) -/* 806460 80245BE0 AFB00010 */ sw $s0, 0x10($sp) -/* 806464 80245BE4 8E300148 */ lw $s0, 0x148($s1) -/* 806468 80245BE8 86040008 */ lh $a0, 8($s0) -/* 80646C 80245BEC 0C00EABB */ jal get_npc_unsafe -/* 806470 80245BF0 00A0902D */ daddu $s2, $a1, $zero -/* 806474 80245BF4 8E230078 */ lw $v1, 0x78($s1) -/* 806478 80245BF8 24630001 */ addiu $v1, $v1, 1 -/* 80647C 80245BFC AE230078 */ sw $v1, 0x78($s1) -/* 806480 80245C00 8E0400D0 */ lw $a0, 0xd0($s0) -/* 806484 80245C04 8C840000 */ lw $a0, ($a0) -/* 806488 80245C08 0064182A */ slt $v1, $v1, $a0 -/* 80648C 80245C0C 14600002 */ bnez $v1, .L80245C18 -/* 806490 80245C10 0040282D */ daddu $a1, $v0, $zero -/* 806494 80245C14 AE200078 */ sw $zero, 0x78($s1) -.L80245C18: -/* 806498 80245C18 8E0200CC */ lw $v0, 0xcc($s0) -/* 80649C 80245C1C 8C420004 */ lw $v0, 4($v0) -/* 8064A0 80245C20 ACA20028 */ sw $v0, 0x28($a1) -/* 8064A4 80245C24 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8064A8 80245C28 8C42007C */ lw $v0, 0x7c($v0) -/* 8064AC 80245C2C 04410004 */ bgez $v0, .L80245C40 -/* 8064B0 80245C30 00000000 */ nop -/* 8064B4 80245C34 C6400000 */ lwc1 $f0, ($s2) -/* 8064B8 80245C38 08091718 */ j .L80245C60 -/* 8064BC 80245C3C E4A00018 */ swc1 $f0, 0x18($a1) -.L80245C40: -/* 8064C0 80245C40 3C018026 */ lui $at, 0x8026 -/* 8064C4 80245C44 D4222898 */ ldc1 $f2, 0x2898($at) -/* 8064C8 80245C48 44820000 */ mtc1 $v0, $f0 -/* 8064CC 80245C4C 00000000 */ nop -/* 8064D0 80245C50 46800021 */ cvt.d.w $f0, $f0 -/* 8064D4 80245C54 46220003 */ div.d $f0, $f0, $f2 -/* 8064D8 80245C58 46200020 */ cvt.s.d $f0, $f0 -/* 8064DC 80245C5C E4A00018 */ swc1 $f0, 0x18($a1) -.L80245C60: -/* 8064E0 80245C60 24020001 */ addiu $v0, $zero, 1 -/* 8064E4 80245C64 AE220070 */ sw $v0, 0x70($s1) -/* 8064E8 80245C68 8FBF001C */ lw $ra, 0x1c($sp) -/* 8064EC 80245C6C 8FB20018 */ lw $s2, 0x18($sp) -/* 8064F0 80245C70 8FB10014 */ lw $s1, 0x14($sp) -/* 8064F4 80245C74 8FB00010 */ lw $s0, 0x10($sp) -/* 8064F8 80245C78 03E00008 */ jr $ra -/* 8064FC 80245C7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s new file mode 100644 index 0000000000..73542040cc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245BCC_80644C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245BCC_80644C +/* 80644C 80245BCC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 806450 80245BD0 AFB10014 */ sw $s1, 0x14($sp) +/* 806454 80245BD4 0080882D */ daddu $s1, $a0, $zero +/* 806458 80245BD8 AFBF001C */ sw $ra, 0x1c($sp) +/* 80645C 80245BDC AFB20018 */ sw $s2, 0x18($sp) +/* 806460 80245BE0 AFB00010 */ sw $s0, 0x10($sp) +/* 806464 80245BE4 8E300148 */ lw $s0, 0x148($s1) +/* 806468 80245BE8 86040008 */ lh $a0, 8($s0) +/* 80646C 80245BEC 0C00EABB */ jal get_npc_unsafe +/* 806470 80245BF0 00A0902D */ daddu $s2, $a1, $zero +/* 806474 80245BF4 8E230078 */ lw $v1, 0x78($s1) +/* 806478 80245BF8 24630001 */ addiu $v1, $v1, 1 +/* 80647C 80245BFC AE230078 */ sw $v1, 0x78($s1) +/* 806480 80245C00 8E0400D0 */ lw $a0, 0xd0($s0) +/* 806484 80245C04 8C840000 */ lw $a0, ($a0) +/* 806488 80245C08 0064182A */ slt $v1, $v1, $a0 +/* 80648C 80245C0C 14600002 */ bnez $v1, .L80245C18 +/* 806490 80245C10 0040282D */ daddu $a1, $v0, $zero +/* 806494 80245C14 AE200078 */ sw $zero, 0x78($s1) +.L80245C18: +/* 806498 80245C18 8E0200CC */ lw $v0, 0xcc($s0) +/* 80649C 80245C1C 8C420004 */ lw $v0, 4($v0) +/* 8064A0 80245C20 ACA20028 */ sw $v0, 0x28($a1) +/* 8064A4 80245C24 8E0200D0 */ lw $v0, 0xd0($s0) +/* 8064A8 80245C28 8C42007C */ lw $v0, 0x7c($v0) +/* 8064AC 80245C2C 04410004 */ bgez $v0, .L80245C40 +/* 8064B0 80245C30 00000000 */ nop +/* 8064B4 80245C34 C6400000 */ lwc1 $f0, ($s2) +/* 8064B8 80245C38 08091718 */ j .L80245C60 +/* 8064BC 80245C3C E4A00018 */ swc1 $f0, 0x18($a1) +.L80245C40: +/* 8064C0 80245C40 3C018026 */ lui $at, 0x8026 +/* 8064C4 80245C44 D4222898 */ ldc1 $f2, 0x2898($at) +/* 8064C8 80245C48 44820000 */ mtc1 $v0, $f0 +/* 8064CC 80245C4C 00000000 */ nop +/* 8064D0 80245C50 46800021 */ cvt.d.w $f0, $f0 +/* 8064D4 80245C54 46220003 */ div.d $f0, $f0, $f2 +/* 8064D8 80245C58 46200020 */ cvt.s.d $f0, $f0 +/* 8064DC 80245C5C E4A00018 */ swc1 $f0, 0x18($a1) +.L80245C60: +/* 8064E0 80245C60 24020001 */ addiu $v0, $zero, 1 +/* 8064E4 80245C64 AE220070 */ sw $v0, 0x70($s1) +/* 8064E8 80245C68 8FBF001C */ lw $ra, 0x1c($sp) +/* 8064EC 80245C6C 8FB20018 */ lw $s2, 0x18($sp) +/* 8064F0 80245C70 8FB10014 */ lw $s1, 0x14($sp) +/* 8064F4 80245C74 8FB00010 */ lw $s0, 0x10($sp) +/* 8064F8 80245C78 03E00008 */ jr $ra +/* 8064FC 80245C7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80.s deleted file mode 100644 index 9bfa1eda5c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245C80 -/* 806500 80245C80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 806504 80245C84 AFB10014 */ sw $s1, 0x14($sp) -/* 806508 80245C88 0080882D */ daddu $s1, $a0, $zero -/* 80650C 80245C8C AFBF0018 */ sw $ra, 0x18($sp) -/* 806510 80245C90 AFB00010 */ sw $s0, 0x10($sp) -/* 806514 80245C94 8E300148 */ lw $s0, 0x148($s1) -/* 806518 80245C98 0C00EABB */ jal get_npc_unsafe -/* 80651C 80245C9C 86040008 */ lh $a0, 8($s0) -/* 806520 80245CA0 8E0300CC */ lw $v1, 0xcc($s0) -/* 806524 80245CA4 3C014120 */ lui $at, 0x4120 -/* 806528 80245CA8 44812000 */ mtc1 $at, $f4 -/* 80652C 80245CAC 3C014000 */ lui $at, 0x4000 -/* 806530 80245CB0 44810000 */ mtc1 $at, $f0 -/* 806534 80245CB4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 806538 80245CB8 8C640010 */ lw $a0, 0x10($v1) -/* 80653C 80245CBC 8C430000 */ lw $v1, ($v0) -/* 806540 80245CC0 E444001C */ swc1 $f4, 0x1c($v0) -/* 806544 80245CC4 E4400014 */ swc1 $f0, 0x14($v0) -/* 806548 80245CC8 E4420064 */ swc1 $f2, 0x64($v0) -/* 80654C 80245CCC 34630800 */ ori $v1, $v1, 0x800 -/* 806550 80245CD0 AC430000 */ sw $v1, ($v0) -/* 806554 80245CD4 AC440028 */ sw $a0, 0x28($v0) -/* 806558 80245CD8 2402000B */ addiu $v0, $zero, 0xb -/* 80655C 80245CDC AE220070 */ sw $v0, 0x70($s1) -/* 806560 80245CE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 806564 80245CE4 8FB10014 */ lw $s1, 0x14($sp) -/* 806568 80245CE8 8FB00010 */ lw $s0, 0x10($sp) -/* 80656C 80245CEC 03E00008 */ jr $ra -/* 806570 80245CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80_806500.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80_806500.s new file mode 100644 index 0000000000..8ad4bafcaf --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245C80_806500.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245C80_806500 +/* 806500 80245C80 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 806504 80245C84 AFB10014 */ sw $s1, 0x14($sp) +/* 806508 80245C88 0080882D */ daddu $s1, $a0, $zero +/* 80650C 80245C8C AFBF0018 */ sw $ra, 0x18($sp) +/* 806510 80245C90 AFB00010 */ sw $s0, 0x10($sp) +/* 806514 80245C94 8E300148 */ lw $s0, 0x148($s1) +/* 806518 80245C98 0C00EABB */ jal get_npc_unsafe +/* 80651C 80245C9C 86040008 */ lh $a0, 8($s0) +/* 806520 80245CA0 8E0300CC */ lw $v1, 0xcc($s0) +/* 806524 80245CA4 3C014120 */ lui $at, 0x4120 +/* 806528 80245CA8 44812000 */ mtc1 $at, $f4 +/* 80652C 80245CAC 3C014000 */ lui $at, 0x4000 +/* 806530 80245CB0 44810000 */ mtc1 $at, $f0 +/* 806534 80245CB4 C442003C */ lwc1 $f2, 0x3c($v0) +/* 806538 80245CB8 8C640010 */ lw $a0, 0x10($v1) +/* 80653C 80245CBC 8C430000 */ lw $v1, ($v0) +/* 806540 80245CC0 E444001C */ swc1 $f4, 0x1c($v0) +/* 806544 80245CC4 E4400014 */ swc1 $f0, 0x14($v0) +/* 806548 80245CC8 E4420064 */ swc1 $f2, 0x64($v0) +/* 80654C 80245CCC 34630800 */ ori $v1, $v1, 0x800 +/* 806550 80245CD0 AC430000 */ sw $v1, ($v0) +/* 806554 80245CD4 AC440028 */ sw $a0, 0x28($v0) +/* 806558 80245CD8 2402000B */ addiu $v0, $zero, 0xb +/* 80655C 80245CDC AE220070 */ sw $v0, 0x70($s1) +/* 806560 80245CE0 8FBF0018 */ lw $ra, 0x18($sp) +/* 806564 80245CE4 8FB10014 */ lw $s1, 0x14($sp) +/* 806568 80245CE8 8FB00010 */ lw $s0, 0x10($sp) +/* 80656C 80245CEC 03E00008 */ jr $ra +/* 806570 80245CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4.s deleted file mode 100644 index d4614faa65..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245CF4 -/* 806574 80245CF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 806578 80245CF8 AFB00010 */ sw $s0, 0x10($sp) -/* 80657C 80245CFC 0080802D */ daddu $s0, $a0, $zero -/* 806580 80245D00 AFBF0014 */ sw $ra, 0x14($sp) -/* 806584 80245D04 8E020148 */ lw $v0, 0x148($s0) -/* 806588 80245D08 0C00EABB */ jal get_npc_unsafe -/* 80658C 80245D0C 84440008 */ lh $a0, 8($v0) -/* 806590 80245D10 0040202D */ daddu $a0, $v0, $zero -/* 806594 80245D14 C482003C */ lwc1 $f2, 0x3c($a0) -/* 806598 80245D18 C480001C */ lwc1 $f0, 0x1c($a0) -/* 80659C 80245D1C 46001080 */ add.s $f2, $f2, $f0 -/* 8065A0 80245D20 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8065A4 80245D24 46040001 */ sub.s $f0, $f0, $f4 -/* 8065A8 80245D28 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8065AC 80245D2C 4602203C */ c.lt.s $f4, $f2 -/* 8065B0 80245D30 E482003C */ swc1 $f2, 0x3c($a0) -/* 8065B4 80245D34 45010009 */ bc1t .L80245D5C -/* 8065B8 80245D38 E480001C */ swc1 $f0, 0x1c($a0) -/* 8065BC 80245D3C 8C820000 */ lw $v0, ($a0) -/* 8065C0 80245D40 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8065C4 80245D44 E484003C */ swc1 $f4, 0x3c($a0) -/* 8065C8 80245D48 AC80001C */ sw $zero, 0x1c($a0) -/* 8065CC 80245D4C 00431024 */ and $v0, $v0, $v1 -/* 8065D0 80245D50 AC820000 */ sw $v0, ($a0) -/* 8065D4 80245D54 2402000C */ addiu $v0, $zero, 0xc -/* 8065D8 80245D58 AE020070 */ sw $v0, 0x70($s0) -.L80245D5C: -/* 8065DC 80245D5C 8FBF0014 */ lw $ra, 0x14($sp) -/* 8065E0 80245D60 8FB00010 */ lw $s0, 0x10($sp) -/* 8065E4 80245D64 03E00008 */ jr $ra -/* 8065E8 80245D68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4_806574.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4_806574.s new file mode 100644 index 0000000000..fca8e6aa05 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245CF4_806574.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245CF4_806574 +/* 806574 80245CF4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 806578 80245CF8 AFB00010 */ sw $s0, 0x10($sp) +/* 80657C 80245CFC 0080802D */ daddu $s0, $a0, $zero +/* 806580 80245D00 AFBF0014 */ sw $ra, 0x14($sp) +/* 806584 80245D04 8E020148 */ lw $v0, 0x148($s0) +/* 806588 80245D08 0C00EABB */ jal get_npc_unsafe +/* 80658C 80245D0C 84440008 */ lh $a0, 8($v0) +/* 806590 80245D10 0040202D */ daddu $a0, $v0, $zero +/* 806594 80245D14 C482003C */ lwc1 $f2, 0x3c($a0) +/* 806598 80245D18 C480001C */ lwc1 $f0, 0x1c($a0) +/* 80659C 80245D1C 46001080 */ add.s $f2, $f2, $f0 +/* 8065A0 80245D20 C4840014 */ lwc1 $f4, 0x14($a0) +/* 8065A4 80245D24 46040001 */ sub.s $f0, $f0, $f4 +/* 8065A8 80245D28 C4840064 */ lwc1 $f4, 0x64($a0) +/* 8065AC 80245D2C 4602203C */ c.lt.s $f4, $f2 +/* 8065B0 80245D30 E482003C */ swc1 $f2, 0x3c($a0) +/* 8065B4 80245D34 45010009 */ bc1t .L80245D5C +/* 8065B8 80245D38 E480001C */ swc1 $f0, 0x1c($a0) +/* 8065BC 80245D3C 8C820000 */ lw $v0, ($a0) +/* 8065C0 80245D40 2403F7FF */ addiu $v1, $zero, -0x801 +/* 8065C4 80245D44 E484003C */ swc1 $f4, 0x3c($a0) +/* 8065C8 80245D48 AC80001C */ sw $zero, 0x1c($a0) +/* 8065CC 80245D4C 00431024 */ and $v0, $v0, $v1 +/* 8065D0 80245D50 AC820000 */ sw $v0, ($a0) +/* 8065D4 80245D54 2402000C */ addiu $v0, $zero, 0xc +/* 8065D8 80245D58 AE020070 */ sw $v0, 0x70($s0) +.L80245D5C: +/* 8065DC 80245D5C 8FBF0014 */ lw $ra, 0x14($sp) +/* 8065E0 80245D60 8FB00010 */ lw $s0, 0x10($sp) +/* 8065E4 80245D64 03E00008 */ jr $ra +/* 8065E8 80245D68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C.s deleted file mode 100644 index eead033281..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245D6C -/* 8065EC 80245D6C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8065F0 80245D70 AFB3001C */ sw $s3, 0x1c($sp) -/* 8065F4 80245D74 0080982D */ daddu $s3, $a0, $zero -/* 8065F8 80245D78 AFBF0020 */ sw $ra, 0x20($sp) -/* 8065FC 80245D7C AFB20018 */ sw $s2, 0x18($sp) -/* 806600 80245D80 AFB10014 */ sw $s1, 0x14($sp) -/* 806604 80245D84 AFB00010 */ sw $s0, 0x10($sp) -/* 806608 80245D88 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 80660C 80245D8C 8E710148 */ lw $s1, 0x148($s3) -/* 806610 80245D90 86240008 */ lh $a0, 8($s1) -/* 806614 80245D94 0C00EABB */ jal get_npc_unsafe -/* 806618 80245D98 00A0802D */ daddu $s0, $a1, $zero -/* 80661C 80245D9C 8E040020 */ lw $a0, 0x20($s0) -/* 806620 80245DA0 0040902D */ daddu $s2, $v0, $zero -/* 806624 80245DA4 00041FC2 */ srl $v1, $a0, 0x1f -/* 806628 80245DA8 00832021 */ addu $a0, $a0, $v1 -/* 80662C 80245DAC 00042043 */ sra $a0, $a0, 1 -/* 806630 80245DB0 0C00A67F */ jal rand_int -/* 806634 80245DB4 24840001 */ addiu $a0, $a0, 1 -/* 806638 80245DB8 8E030020 */ lw $v1, 0x20($s0) -/* 80663C 80245DBC C64C0038 */ lwc1 $f12, 0x38($s2) -/* 806640 80245DC0 000327C2 */ srl $a0, $v1, 0x1f -/* 806644 80245DC4 00641821 */ addu $v1, $v1, $a0 -/* 806648 80245DC8 00031843 */ sra $v1, $v1, 1 -/* 80664C 80245DCC 00621821 */ addu $v1, $v1, $v0 -/* 806650 80245DD0 A643008E */ sh $v1, 0x8e($s2) -/* 806654 80245DD4 8E2200CC */ lw $v0, 0xcc($s1) -/* 806658 80245DD8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 80665C 80245DDC 8C42000C */ lw $v0, 0xc($v0) -/* 806660 80245DE0 AE420028 */ sw $v0, 0x28($s2) -/* 806664 80245DE4 C6000018 */ lwc1 $f0, 0x18($s0) -/* 806668 80245DE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 80666C 80245DEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 806670 80245DF0 E6400018 */ swc1 $f0, 0x18($s2) -/* 806674 80245DF4 8C460028 */ lw $a2, 0x28($v0) -/* 806678 80245DF8 0C00A720 */ jal atan2 -/* 80667C 80245DFC 8C470030 */ lw $a3, 0x30($v0) -/* 806680 80245E00 46000506 */ mov.s $f20, $f0 -/* 806684 80245E04 C64C000C */ lwc1 $f12, 0xc($s2) -/* 806688 80245E08 0C00A70A */ jal get_clamped_angle_diff -/* 80668C 80245E0C 4600A386 */ mov.s $f14, $f20 -/* 806690 80245E10 46000086 */ mov.s $f2, $f0 -/* 806694 80245E14 8E02001C */ lw $v0, 0x1c($s0) -/* 806698 80245E18 46001005 */ abs.s $f0, $f2 -/* 80669C 80245E1C 44822000 */ mtc1 $v0, $f4 -/* 8066A0 80245E20 00000000 */ nop -/* 8066A4 80245E24 46802120 */ cvt.s.w $f4, $f4 -/* 8066A8 80245E28 4600203C */ c.lt.s $f4, $f0 -/* 8066AC 80245E2C 00000000 */ nop -/* 8066B0 80245E30 4500000D */ bc1f .L80245E68 -/* 8066B4 80245E34 00000000 */ nop -/* 8066B8 80245E38 44800000 */ mtc1 $zero, $f0 -/* 8066BC 80245E3C C654000C */ lwc1 $f20, 0xc($s2) -/* 8066C0 80245E40 4600103C */ c.lt.s $f2, $f0 -/* 8066C4 80245E44 00000000 */ nop -/* 8066C8 80245E48 45000006 */ bc1f .L80245E64 -/* 8066CC 80245E4C 00021023 */ negu $v0, $v0 -/* 8066D0 80245E50 44820000 */ mtc1 $v0, $f0 -/* 8066D4 80245E54 00000000 */ nop -/* 8066D8 80245E58 46800020 */ cvt.s.w $f0, $f0 -/* 8066DC 80245E5C 0809179A */ j .L80245E68 -/* 8066E0 80245E60 4600A500 */ add.s $f20, $f20, $f0 -.L80245E64: -/* 8066E4 80245E64 4604A500 */ add.s $f20, $f20, $f4 -.L80245E68: -/* 8066E8 80245E68 0C00A6C9 */ jal clamp_angle -/* 8066EC 80245E6C 4600A306 */ mov.s $f12, $f20 -/* 8066F0 80245E70 2402000D */ addiu $v0, $zero, 0xd -/* 8066F4 80245E74 E640000C */ swc1 $f0, 0xc($s2) -/* 8066F8 80245E78 AE620070 */ sw $v0, 0x70($s3) -/* 8066FC 80245E7C 8FBF0020 */ lw $ra, 0x20($sp) -/* 806700 80245E80 8FB3001C */ lw $s3, 0x1c($sp) -/* 806704 80245E84 8FB20018 */ lw $s2, 0x18($sp) -/* 806708 80245E88 8FB10014 */ lw $s1, 0x14($sp) -/* 80670C 80245E8C 8FB00010 */ lw $s0, 0x10($sp) -/* 806710 80245E90 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 806714 80245E94 03E00008 */ jr $ra -/* 806718 80245E98 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C_8065EC.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C_8065EC.s new file mode 100644 index 0000000000..332014a703 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245D6C_8065EC.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245D6C_8065EC +/* 8065EC 80245D6C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8065F0 80245D70 AFB3001C */ sw $s3, 0x1c($sp) +/* 8065F4 80245D74 0080982D */ daddu $s3, $a0, $zero +/* 8065F8 80245D78 AFBF0020 */ sw $ra, 0x20($sp) +/* 8065FC 80245D7C AFB20018 */ sw $s2, 0x18($sp) +/* 806600 80245D80 AFB10014 */ sw $s1, 0x14($sp) +/* 806604 80245D84 AFB00010 */ sw $s0, 0x10($sp) +/* 806608 80245D88 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 80660C 80245D8C 8E710148 */ lw $s1, 0x148($s3) +/* 806610 80245D90 86240008 */ lh $a0, 8($s1) +/* 806614 80245D94 0C00EABB */ jal get_npc_unsafe +/* 806618 80245D98 00A0802D */ daddu $s0, $a1, $zero +/* 80661C 80245D9C 8E040020 */ lw $a0, 0x20($s0) +/* 806620 80245DA0 0040902D */ daddu $s2, $v0, $zero +/* 806624 80245DA4 00041FC2 */ srl $v1, $a0, 0x1f +/* 806628 80245DA8 00832021 */ addu $a0, $a0, $v1 +/* 80662C 80245DAC 00042043 */ sra $a0, $a0, 1 +/* 806630 80245DB0 0C00A67F */ jal rand_int +/* 806634 80245DB4 24840001 */ addiu $a0, $a0, 1 +/* 806638 80245DB8 8E030020 */ lw $v1, 0x20($s0) +/* 80663C 80245DBC C64C0038 */ lwc1 $f12, 0x38($s2) +/* 806640 80245DC0 000327C2 */ srl $a0, $v1, 0x1f +/* 806644 80245DC4 00641821 */ addu $v1, $v1, $a0 +/* 806648 80245DC8 00031843 */ sra $v1, $v1, 1 +/* 80664C 80245DCC 00621821 */ addu $v1, $v1, $v0 +/* 806650 80245DD0 A643008E */ sh $v1, 0x8e($s2) +/* 806654 80245DD4 8E2200CC */ lw $v0, 0xcc($s1) +/* 806658 80245DD8 C64E0040 */ lwc1 $f14, 0x40($s2) +/* 80665C 80245DDC 8C42000C */ lw $v0, 0xc($v0) +/* 806660 80245DE0 AE420028 */ sw $v0, 0x28($s2) +/* 806664 80245DE4 C6000018 */ lwc1 $f0, 0x18($s0) +/* 806668 80245DE8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 80666C 80245DEC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 806670 80245DF0 E6400018 */ swc1 $f0, 0x18($s2) +/* 806674 80245DF4 8C460028 */ lw $a2, 0x28($v0) +/* 806678 80245DF8 0C00A720 */ jal atan2 +/* 80667C 80245DFC 8C470030 */ lw $a3, 0x30($v0) +/* 806680 80245E00 46000506 */ mov.s $f20, $f0 +/* 806684 80245E04 C64C000C */ lwc1 $f12, 0xc($s2) +/* 806688 80245E08 0C00A70A */ jal get_clamped_angle_diff +/* 80668C 80245E0C 4600A386 */ mov.s $f14, $f20 +/* 806690 80245E10 46000086 */ mov.s $f2, $f0 +/* 806694 80245E14 8E02001C */ lw $v0, 0x1c($s0) +/* 806698 80245E18 46001005 */ abs.s $f0, $f2 +/* 80669C 80245E1C 44822000 */ mtc1 $v0, $f4 +/* 8066A0 80245E20 00000000 */ nop +/* 8066A4 80245E24 46802120 */ cvt.s.w $f4, $f4 +/* 8066A8 80245E28 4600203C */ c.lt.s $f4, $f0 +/* 8066AC 80245E2C 00000000 */ nop +/* 8066B0 80245E30 4500000D */ bc1f .L80245E68 +/* 8066B4 80245E34 00000000 */ nop +/* 8066B8 80245E38 44800000 */ mtc1 $zero, $f0 +/* 8066BC 80245E3C C654000C */ lwc1 $f20, 0xc($s2) +/* 8066C0 80245E40 4600103C */ c.lt.s $f2, $f0 +/* 8066C4 80245E44 00000000 */ nop +/* 8066C8 80245E48 45000006 */ bc1f .L80245E64 +/* 8066CC 80245E4C 00021023 */ negu $v0, $v0 +/* 8066D0 80245E50 44820000 */ mtc1 $v0, $f0 +/* 8066D4 80245E54 00000000 */ nop +/* 8066D8 80245E58 46800020 */ cvt.s.w $f0, $f0 +/* 8066DC 80245E5C 0809179A */ j .L80245E68 +/* 8066E0 80245E60 4600A500 */ add.s $f20, $f20, $f0 +.L80245E64: +/* 8066E4 80245E64 4604A500 */ add.s $f20, $f20, $f4 +.L80245E68: +/* 8066E8 80245E68 0C00A6C9 */ jal clamp_angle +/* 8066EC 80245E6C 4600A306 */ mov.s $f12, $f20 +/* 8066F0 80245E70 2402000D */ addiu $v0, $zero, 0xd +/* 8066F4 80245E74 E640000C */ swc1 $f0, 0xc($s2) +/* 8066F8 80245E78 AE620070 */ sw $v0, 0x70($s3) +/* 8066FC 80245E7C 8FBF0020 */ lw $ra, 0x20($sp) +/* 806700 80245E80 8FB3001C */ lw $s3, 0x1c($sp) +/* 806704 80245E84 8FB20018 */ lw $s2, 0x18($sp) +/* 806708 80245E88 8FB10014 */ lw $s1, 0x14($sp) +/* 80670C 80245E8C 8FB00010 */ lw $s0, 0x10($sp) +/* 806710 80245E90 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 806714 80245E94 03E00008 */ jr $ra +/* 806718 80245E98 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C.s deleted file mode 100644 index cfaabc2763..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245E9C -/* 80671C 80245E9C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 806720 80245EA0 AFB3003C */ sw $s3, 0x3c($sp) -/* 806724 80245EA4 0080982D */ daddu $s3, $a0, $zero -/* 806728 80245EA8 AFBF0040 */ sw $ra, 0x40($sp) -/* 80672C 80245EAC AFB20038 */ sw $s2, 0x38($sp) -/* 806730 80245EB0 AFB10034 */ sw $s1, 0x34($sp) -/* 806734 80245EB4 AFB00030 */ sw $s0, 0x30($sp) -/* 806738 80245EB8 8E720148 */ lw $s2, 0x148($s3) -/* 80673C 80245EBC 00A0882D */ daddu $s1, $a1, $zero -/* 806740 80245EC0 86440008 */ lh $a0, 8($s2) -/* 806744 80245EC4 0C00EABB */ jal get_npc_unsafe -/* 806748 80245EC8 00C0802D */ daddu $s0, $a2, $zero -/* 80674C 80245ECC 0200202D */ daddu $a0, $s0, $zero -/* 806750 80245ED0 0240282D */ daddu $a1, $s2, $zero -/* 806754 80245ED4 24030001 */ addiu $v1, $zero, 1 -/* 806758 80245ED8 AFA30010 */ sw $v1, 0x10($sp) -/* 80675C 80245EDC 8E260024 */ lw $a2, 0x24($s1) -/* 806760 80245EE0 8E270028 */ lw $a3, 0x28($s1) -/* 806764 80245EE4 0C01242D */ jal func_800490B4 -/* 806768 80245EE8 0040802D */ daddu $s0, $v0, $zero -/* 80676C 80245EEC 1440001E */ bnez $v0, .L80245F68 -/* 806770 80245EF0 0200202D */ daddu $a0, $s0, $zero -/* 806774 80245EF4 24040002 */ addiu $a0, $zero, 2 -/* 806778 80245EF8 0200282D */ daddu $a1, $s0, $zero -/* 80677C 80245EFC 0000302D */ daddu $a2, $zero, $zero -/* 806780 80245F00 860300A8 */ lh $v1, 0xa8($s0) -/* 806784 80245F04 3C013F80 */ lui $at, 0x3f80 -/* 806788 80245F08 44810000 */ mtc1 $at, $f0 -/* 80678C 80245F0C 3C014000 */ lui $at, 0x4000 -/* 806790 80245F10 44811000 */ mtc1 $at, $f2 -/* 806794 80245F14 3C01C1A0 */ lui $at, 0xc1a0 -/* 806798 80245F18 44812000 */ mtc1 $at, $f4 -/* 80679C 80245F1C 2402000F */ addiu $v0, $zero, 0xf -/* 8067A0 80245F20 AFA2001C */ sw $v0, 0x1c($sp) -/* 8067A4 80245F24 44833000 */ mtc1 $v1, $f6 -/* 8067A8 80245F28 00000000 */ nop -/* 8067AC 80245F2C 468031A0 */ cvt.s.w $f6, $f6 -/* 8067B0 80245F30 44073000 */ mfc1 $a3, $f6 -/* 8067B4 80245F34 27A20028 */ addiu $v0, $sp, 0x28 -/* 8067B8 80245F38 AFA20020 */ sw $v0, 0x20($sp) -/* 8067BC 80245F3C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8067C0 80245F40 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8067C4 80245F44 0C01BFA4 */ jal fx_emote -/* 8067C8 80245F48 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8067CC 80245F4C 8E4200CC */ lw $v0, 0xcc($s2) -/* 8067D0 80245F50 8C430000 */ lw $v1, ($v0) -/* 8067D4 80245F54 24020019 */ addiu $v0, $zero, 0x19 -/* 8067D8 80245F58 A602008E */ sh $v0, 0x8e($s0) -/* 8067DC 80245F5C 2402000E */ addiu $v0, $zero, 0xe -/* 8067E0 80245F60 080917E7 */ j .L80245F9C -/* 8067E4 80245F64 AE030028 */ sw $v1, 0x28($s0) -.L80245F68: -/* 8067E8 80245F68 0C00F598 */ jal func_8003D660 -/* 8067EC 80245F6C 24050001 */ addiu $a1, $zero, 1 -/* 8067F0 80245F70 8E050018 */ lw $a1, 0x18($s0) -/* 8067F4 80245F74 8E06000C */ lw $a2, 0xc($s0) -/* 8067F8 80245F78 0C00EA95 */ jal npc_move_heading -/* 8067FC 80245F7C 0200202D */ daddu $a0, $s0, $zero -/* 806800 80245F80 8602008E */ lh $v0, 0x8e($s0) -/* 806804 80245F84 9603008E */ lhu $v1, 0x8e($s0) -/* 806808 80245F88 18400003 */ blez $v0, .L80245F98 -/* 80680C 80245F8C 2462FFFF */ addiu $v0, $v1, -1 -/* 806810 80245F90 080917E8 */ j .L80245FA0 -/* 806814 80245F94 A602008E */ sh $v0, 0x8e($s0) -.L80245F98: -/* 806818 80245F98 2402000C */ addiu $v0, $zero, 0xc -.L80245F9C: -/* 80681C 80245F9C AE620070 */ sw $v0, 0x70($s3) -.L80245FA0: -/* 806820 80245FA0 8FBF0040 */ lw $ra, 0x40($sp) -/* 806824 80245FA4 8FB3003C */ lw $s3, 0x3c($sp) -/* 806828 80245FA8 8FB20038 */ lw $s2, 0x38($sp) -/* 80682C 80245FAC 8FB10034 */ lw $s1, 0x34($sp) -/* 806830 80245FB0 8FB00030 */ lw $s0, 0x30($sp) -/* 806834 80245FB4 03E00008 */ jr $ra -/* 806838 80245FB8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s new file mode 100644 index 0000000000..d5d36758cb --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245E9C_80671C.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245E9C_80671C +/* 80671C 80245E9C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 806720 80245EA0 AFB3003C */ sw $s3, 0x3c($sp) +/* 806724 80245EA4 0080982D */ daddu $s3, $a0, $zero +/* 806728 80245EA8 AFBF0040 */ sw $ra, 0x40($sp) +/* 80672C 80245EAC AFB20038 */ sw $s2, 0x38($sp) +/* 806730 80245EB0 AFB10034 */ sw $s1, 0x34($sp) +/* 806734 80245EB4 AFB00030 */ sw $s0, 0x30($sp) +/* 806738 80245EB8 8E720148 */ lw $s2, 0x148($s3) +/* 80673C 80245EBC 00A0882D */ daddu $s1, $a1, $zero +/* 806740 80245EC0 86440008 */ lh $a0, 8($s2) +/* 806744 80245EC4 0C00EABB */ jal get_npc_unsafe +/* 806748 80245EC8 00C0802D */ daddu $s0, $a2, $zero +/* 80674C 80245ECC 0200202D */ daddu $a0, $s0, $zero +/* 806750 80245ED0 0240282D */ daddu $a1, $s2, $zero +/* 806754 80245ED4 24030001 */ addiu $v1, $zero, 1 +/* 806758 80245ED8 AFA30010 */ sw $v1, 0x10($sp) +/* 80675C 80245EDC 8E260024 */ lw $a2, 0x24($s1) +/* 806760 80245EE0 8E270028 */ lw $a3, 0x28($s1) +/* 806764 80245EE4 0C01242D */ jal func_800490B4 +/* 806768 80245EE8 0040802D */ daddu $s0, $v0, $zero +/* 80676C 80245EEC 1440001E */ bnez $v0, .L80245F68 +/* 806770 80245EF0 0200202D */ daddu $a0, $s0, $zero +/* 806774 80245EF4 24040002 */ addiu $a0, $zero, 2 +/* 806778 80245EF8 0200282D */ daddu $a1, $s0, $zero +/* 80677C 80245EFC 0000302D */ daddu $a2, $zero, $zero +/* 806780 80245F00 860300A8 */ lh $v1, 0xa8($s0) +/* 806784 80245F04 3C013F80 */ lui $at, 0x3f80 +/* 806788 80245F08 44810000 */ mtc1 $at, $f0 +/* 80678C 80245F0C 3C014000 */ lui $at, 0x4000 +/* 806790 80245F10 44811000 */ mtc1 $at, $f2 +/* 806794 80245F14 3C01C1A0 */ lui $at, 0xc1a0 +/* 806798 80245F18 44812000 */ mtc1 $at, $f4 +/* 80679C 80245F1C 2402000F */ addiu $v0, $zero, 0xf +/* 8067A0 80245F20 AFA2001C */ sw $v0, 0x1c($sp) +/* 8067A4 80245F24 44833000 */ mtc1 $v1, $f6 +/* 8067A8 80245F28 00000000 */ nop +/* 8067AC 80245F2C 468031A0 */ cvt.s.w $f6, $f6 +/* 8067B0 80245F30 44073000 */ mfc1 $a3, $f6 +/* 8067B4 80245F34 27A20028 */ addiu $v0, $sp, 0x28 +/* 8067B8 80245F38 AFA20020 */ sw $v0, 0x20($sp) +/* 8067BC 80245F3C E7A00010 */ swc1 $f0, 0x10($sp) +/* 8067C0 80245F40 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8067C4 80245F44 0C01BFA4 */ jal fx_emote +/* 8067C8 80245F48 E7A40018 */ swc1 $f4, 0x18($sp) +/* 8067CC 80245F4C 8E4200CC */ lw $v0, 0xcc($s2) +/* 8067D0 80245F50 8C430000 */ lw $v1, ($v0) +/* 8067D4 80245F54 24020019 */ addiu $v0, $zero, 0x19 +/* 8067D8 80245F58 A602008E */ sh $v0, 0x8e($s0) +/* 8067DC 80245F5C 2402000E */ addiu $v0, $zero, 0xe +/* 8067E0 80245F60 080917E7 */ j .L80245F9C +/* 8067E4 80245F64 AE030028 */ sw $v1, 0x28($s0) +.L80245F68: +/* 8067E8 80245F68 0C00F598 */ jal func_8003D660 +/* 8067EC 80245F6C 24050001 */ addiu $a1, $zero, 1 +/* 8067F0 80245F70 8E050018 */ lw $a1, 0x18($s0) +/* 8067F4 80245F74 8E06000C */ lw $a2, 0xc($s0) +/* 8067F8 80245F78 0C00EA95 */ jal npc_move_heading +/* 8067FC 80245F7C 0200202D */ daddu $a0, $s0, $zero +/* 806800 80245F80 8602008E */ lh $v0, 0x8e($s0) +/* 806804 80245F84 9603008E */ lhu $v1, 0x8e($s0) +/* 806808 80245F88 18400003 */ blez $v0, .L80245F98 +/* 80680C 80245F8C 2462FFFF */ addiu $v0, $v1, -1 +/* 806810 80245F90 080917E8 */ j .L80245FA0 +/* 806814 80245F94 A602008E */ sh $v0, 0x8e($s0) +.L80245F98: +/* 806818 80245F98 2402000C */ addiu $v0, $zero, 0xc +.L80245F9C: +/* 80681C 80245F9C AE620070 */ sw $v0, 0x70($s3) +.L80245FA0: +/* 806820 80245FA0 8FBF0040 */ lw $ra, 0x40($sp) +/* 806824 80245FA4 8FB3003C */ lw $s3, 0x3c($sp) +/* 806828 80245FA8 8FB20038 */ lw $s2, 0x38($sp) +/* 80682C 80245FAC 8FB10034 */ lw $s1, 0x34($sp) +/* 806830 80245FB0 8FB00030 */ lw $s0, 0x30($sp) +/* 806834 80245FB4 03E00008 */ jr $ra +/* 806838 80245FB8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC.s deleted file mode 100644 index 39dd38cfee..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245FBC -/* 80683C 80245FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 806840 80245FC0 AFB10014 */ sw $s1, 0x14($sp) -/* 806844 80245FC4 0080882D */ daddu $s1, $a0, $zero -/* 806848 80245FC8 AFBF0018 */ sw $ra, 0x18($sp) -/* 80684C 80245FCC AFB00010 */ sw $s0, 0x10($sp) -/* 806850 80245FD0 8E300148 */ lw $s0, 0x148($s1) -/* 806854 80245FD4 0C00EABB */ jal get_npc_unsafe -/* 806858 80245FD8 86040008 */ lh $a0, 8($s0) -/* 80685C 80245FDC 9443008E */ lhu $v1, 0x8e($v0) -/* 806860 80245FE0 2463FFFF */ addiu $v1, $v1, -1 -/* 806864 80245FE4 A443008E */ sh $v1, 0x8e($v0) -/* 806868 80245FE8 00031C00 */ sll $v1, $v1, 0x10 -/* 80686C 80245FEC 14600008 */ bnez $v1, .L80246010 -/* 806870 80245FF0 00000000 */ nop -/* 806874 80245FF4 8E0200B0 */ lw $v0, 0xb0($s0) -/* 806878 80245FF8 30420080 */ andi $v0, $v0, 0x80 -/* 80687C 80245FFC 10400003 */ beqz $v0, .L8024600C -/* 806880 80246000 2402000F */ addiu $v0, $zero, 0xf -/* 806884 80246004 08091804 */ j .L80246010 -/* 806888 80246008 AE220070 */ sw $v0, 0x70($s1) -.L8024600C: -/* 80688C 8024600C AE200070 */ sw $zero, 0x70($s1) -.L80246010: -/* 806890 80246010 8FBF0018 */ lw $ra, 0x18($sp) -/* 806894 80246014 8FB10014 */ lw $s1, 0x14($sp) -/* 806898 80246018 8FB00010 */ lw $s0, 0x10($sp) -/* 80689C 8024601C 03E00008 */ jr $ra -/* 8068A0 80246020 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s new file mode 100644 index 0000000000..c776e4d6dc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80245FBC_80683C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80245FBC_80683C +/* 80683C 80245FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 806840 80245FC0 AFB10014 */ sw $s1, 0x14($sp) +/* 806844 80245FC4 0080882D */ daddu $s1, $a0, $zero +/* 806848 80245FC8 AFBF0018 */ sw $ra, 0x18($sp) +/* 80684C 80245FCC AFB00010 */ sw $s0, 0x10($sp) +/* 806850 80245FD0 8E300148 */ lw $s0, 0x148($s1) +/* 806854 80245FD4 0C00EABB */ jal get_npc_unsafe +/* 806858 80245FD8 86040008 */ lh $a0, 8($s0) +/* 80685C 80245FDC 9443008E */ lhu $v1, 0x8e($v0) +/* 806860 80245FE0 2463FFFF */ addiu $v1, $v1, -1 +/* 806864 80245FE4 A443008E */ sh $v1, 0x8e($v0) +/* 806868 80245FE8 00031C00 */ sll $v1, $v1, 0x10 +/* 80686C 80245FEC 14600008 */ bnez $v1, .L80246010 +/* 806870 80245FF0 00000000 */ nop +/* 806874 80245FF4 8E0200B0 */ lw $v0, 0xb0($s0) +/* 806878 80245FF8 30420080 */ andi $v0, $v0, 0x80 +/* 80687C 80245FFC 10400003 */ beqz $v0, .L8024600C +/* 806880 80246000 2402000F */ addiu $v0, $zero, 0xf +/* 806884 80246004 08091804 */ j .L80246010 +/* 806888 80246008 AE220070 */ sw $v0, 0x70($s1) +.L8024600C: +/* 80688C 8024600C AE200070 */ sw $zero, 0x70($s1) +.L80246010: +/* 806890 80246010 8FBF0018 */ lw $ra, 0x18($sp) +/* 806894 80246014 8FB10014 */ lw $s1, 0x14($sp) +/* 806898 80246018 8FB00010 */ lw $s0, 0x10($sp) +/* 80689C 8024601C 03E00008 */ jr $ra +/* 8068A0 80246020 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024.s deleted file mode 100644 index 96987d4e97..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80246024 -/* 8068A4 80246024 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8068A8 80246028 AFB10014 */ sw $s1, 0x14($sp) -/* 8068AC 8024602C 0080882D */ daddu $s1, $a0, $zero -/* 8068B0 80246030 AFBF001C */ sw $ra, 0x1c($sp) -/* 8068B4 80246034 AFB20018 */ sw $s2, 0x18($sp) -/* 8068B8 80246038 AFB00010 */ sw $s0, 0x10($sp) -/* 8068BC 8024603C 8E300148 */ lw $s0, 0x148($s1) -/* 8068C0 80246040 86040008 */ lh $a0, 8($s0) -/* 8068C4 80246044 0C00EABB */ jal get_npc_unsafe -/* 8068C8 80246048 00A0902D */ daddu $s2, $a1, $zero -/* 8068CC 8024604C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 8068D0 80246050 8E240078 */ lw $a0, 0x78($s1) -/* 8068D4 80246054 8C630000 */ lw $v1, ($v1) -/* 8068D8 80246058 0083182A */ slt $v1, $a0, $v1 -/* 8068DC 8024605C 10600013 */ beqz $v1, .L802460AC -/* 8068E0 80246060 0040302D */ daddu $a2, $v0, $zero -/* 8068E4 80246064 00041040 */ sll $v0, $a0, 1 -/* 8068E8 80246068 00441021 */ addu $v0, $v0, $a0 -/* 8068EC 8024606C 00022880 */ sll $a1, $v0, 2 -.L80246070: -/* 8068F0 80246070 8E0300D0 */ lw $v1, 0xd0($s0) -/* 8068F4 80246074 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 8068F8 80246078 00A31021 */ addu $v0, $a1, $v1 -/* 8068FC 8024607C C4400008 */ lwc1 $f0, 8($v0) -/* 806900 80246080 46800020 */ cvt.s.w $f0, $f0 -/* 806904 80246084 4602003E */ c.le.s $f0, $f2 -/* 806908 80246088 00000000 */ nop -/* 80690C 8024608C 45020003 */ bc1fl .L8024609C -/* 806910 80246090 24840001 */ addiu $a0, $a0, 1 -/* 806914 80246094 0809182B */ j .L802460AC -/* 806918 80246098 AE240078 */ sw $a0, 0x78($s1) -.L8024609C: -/* 80691C 8024609C 8C620000 */ lw $v0, ($v1) -/* 806920 802460A0 0082102A */ slt $v0, $a0, $v0 -/* 806924 802460A4 1440FFF2 */ bnez $v0, .L80246070 -/* 806928 802460A8 24A5000C */ addiu $a1, $a1, 0xc -.L802460AC: -/* 80692C 802460AC C6400000 */ lwc1 $f0, ($s2) -/* 806930 802460B0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 806934 802460B4 8E0200CC */ lw $v0, 0xcc($s0) -/* 806938 802460B8 8C420004 */ lw $v0, 4($v0) -/* 80693C 802460BC ACC20028 */ sw $v0, 0x28($a2) -/* 806940 802460C0 24020001 */ addiu $v0, $zero, 1 -/* 806944 802460C4 AE200074 */ sw $zero, 0x74($s1) -/* 806948 802460C8 AE220070 */ sw $v0, 0x70($s1) -/* 80694C 802460CC 8FBF001C */ lw $ra, 0x1c($sp) -/* 806950 802460D0 8FB20018 */ lw $s2, 0x18($sp) -/* 806954 802460D4 8FB10014 */ lw $s1, 0x14($sp) -/* 806958 802460D8 8FB00010 */ lw $s0, 0x10($sp) -/* 80695C 802460DC 03E00008 */ jr $ra -/* 806960 802460E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s new file mode 100644 index 0000000000..db7fe2872a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_80246024_8068A4.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80246024_8068A4 +/* 8068A4 80246024 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8068A8 80246028 AFB10014 */ sw $s1, 0x14($sp) +/* 8068AC 8024602C 0080882D */ daddu $s1, $a0, $zero +/* 8068B0 80246030 AFBF001C */ sw $ra, 0x1c($sp) +/* 8068B4 80246034 AFB20018 */ sw $s2, 0x18($sp) +/* 8068B8 80246038 AFB00010 */ sw $s0, 0x10($sp) +/* 8068BC 8024603C 8E300148 */ lw $s0, 0x148($s1) +/* 8068C0 80246040 86040008 */ lh $a0, 8($s0) +/* 8068C4 80246044 0C00EABB */ jal get_npc_unsafe +/* 8068C8 80246048 00A0902D */ daddu $s2, $a1, $zero +/* 8068CC 8024604C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 8068D0 80246050 8E240078 */ lw $a0, 0x78($s1) +/* 8068D4 80246054 8C630000 */ lw $v1, ($v1) +/* 8068D8 80246058 0083182A */ slt $v1, $a0, $v1 +/* 8068DC 8024605C 10600013 */ beqz $v1, .L802460AC +/* 8068E0 80246060 0040302D */ daddu $a2, $v0, $zero +/* 8068E4 80246064 00041040 */ sll $v0, $a0, 1 +/* 8068E8 80246068 00441021 */ addu $v0, $v0, $a0 +/* 8068EC 8024606C 00022880 */ sll $a1, $v0, 2 +.L80246070: +/* 8068F0 80246070 8E0300D0 */ lw $v1, 0xd0($s0) +/* 8068F4 80246074 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* 8068F8 80246078 00A31021 */ addu $v0, $a1, $v1 +/* 8068FC 8024607C C4400008 */ lwc1 $f0, 8($v0) +/* 806900 80246080 46800020 */ cvt.s.w $f0, $f0 +/* 806904 80246084 4602003E */ c.le.s $f0, $f2 +/* 806908 80246088 00000000 */ nop +/* 80690C 8024608C 45020003 */ bc1fl .L8024609C +/* 806910 80246090 24840001 */ addiu $a0, $a0, 1 +/* 806914 80246094 0809182B */ j .L802460AC +/* 806918 80246098 AE240078 */ sw $a0, 0x78($s1) +.L8024609C: +/* 80691C 8024609C 8C620000 */ lw $v0, ($v1) +/* 806920 802460A0 0082102A */ slt $v0, $a0, $v0 +/* 806924 802460A4 1440FFF2 */ bnez $v0, .L80246070 +/* 806928 802460A8 24A5000C */ addiu $a1, $a1, 0xc +.L802460AC: +/* 80692C 802460AC C6400000 */ lwc1 $f0, ($s2) +/* 806930 802460B0 E4C00018 */ swc1 $f0, 0x18($a2) +/* 806934 802460B4 8E0200CC */ lw $v0, 0xcc($s0) +/* 806938 802460B8 8C420004 */ lw $v0, 4($v0) +/* 80693C 802460BC ACC20028 */ sw $v0, 0x28($a2) +/* 806940 802460C0 24020001 */ addiu $v0, $zero, 1 +/* 806944 802460C4 AE200074 */ sw $zero, 0x74($s1) +/* 806948 802460C8 AE220070 */ sw $v0, 0x70($s1) +/* 80694C 802460CC 8FBF001C */ lw $ra, 0x1c($sp) +/* 806950 802460D0 8FB20018 */ lw $s2, 0x18($sp) +/* 806954 802460D4 8FB10014 */ lw $s1, 0x14($sp) +/* 806958 802460D8 8FB00010 */ lw $s0, 0x10($sp) +/* 80695C 802460DC 03E00008 */ jr $ra +/* 806960 802460E0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4.s deleted file mode 100644 index a252116bc1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802460E4 -/* 806964 802460E4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 806968 802460E8 AFB40058 */ sw $s4, 0x58($sp) -/* 80696C 802460EC 0080A02D */ daddu $s4, $a0, $zero -/* 806970 802460F0 AFBF0060 */ sw $ra, 0x60($sp) -/* 806974 802460F4 AFB5005C */ sw $s5, 0x5c($sp) -/* 806978 802460F8 AFB30054 */ sw $s3, 0x54($sp) -/* 80697C 802460FC AFB20050 */ sw $s2, 0x50($sp) -/* 806980 80246100 AFB1004C */ sw $s1, 0x4c($sp) -/* 806984 80246104 AFB00048 */ sw $s0, 0x48($sp) -/* 806988 80246108 8E910148 */ lw $s1, 0x148($s4) -/* 80698C 8024610C 86240008 */ lh $a0, 8($s1) -/* 806990 80246110 0C00EABB */ jal get_npc_unsafe -/* 806994 80246114 00A0802D */ daddu $s0, $a1, $zero -/* 806998 80246118 8E83000C */ lw $v1, 0xc($s4) -/* 80699C 8024611C 0280202D */ daddu $a0, $s4, $zero -/* 8069A0 80246120 8C650000 */ lw $a1, ($v1) -/* 8069A4 80246124 0C0B1EAF */ jal get_variable -/* 8069A8 80246128 0040902D */ daddu $s2, $v0, $zero -/* 8069AC 8024612C AFA00018 */ sw $zero, 0x18($sp) -/* 8069B0 80246130 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8069B4 80246134 8C630094 */ lw $v1, 0x94($v1) -/* 8069B8 80246138 AFA3001C */ sw $v1, 0x1c($sp) -/* 8069BC 8024613C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8069C0 80246140 8C630080 */ lw $v1, 0x80($v1) -/* 8069C4 80246144 AFA30020 */ sw $v1, 0x20($sp) -/* 8069C8 80246148 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8069CC 8024614C 8C630088 */ lw $v1, 0x88($v1) -/* 8069D0 80246150 AFA30024 */ sw $v1, 0x24($sp) -/* 8069D4 80246154 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8069D8 80246158 8C63008C */ lw $v1, 0x8c($v1) -/* 8069DC 8024615C 27B50018 */ addiu $s5, $sp, 0x18 -/* 8069E0 80246160 AFA30028 */ sw $v1, 0x28($sp) -/* 8069E4 80246164 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8069E8 80246168 3C014282 */ lui $at, 0x4282 -/* 8069EC 8024616C 44810000 */ mtc1 $at, $f0 -/* 8069F0 80246170 8C630090 */ lw $v1, 0x90($v1) -/* 8069F4 80246174 0040982D */ daddu $s3, $v0, $zero -/* 8069F8 80246178 E7A00030 */ swc1 $f0, 0x30($sp) -/* 8069FC 8024617C A7A00034 */ sh $zero, 0x34($sp) -/* 806A00 80246180 16000005 */ bnez $s0, .L80246198 -/* 806A04 80246184 AFA3002C */ sw $v1, 0x2c($sp) -/* 806A08 80246188 8E2200B0 */ lw $v0, 0xb0($s1) -/* 806A0C 8024618C 30420004 */ andi $v0, $v0, 4 -/* 806A10 80246190 10400044 */ beqz $v0, .L802462A4 -/* 806A14 80246194 00000000 */ nop -.L80246198: -/* 806A18 80246198 2404F7FF */ addiu $a0, $zero, -0x801 -/* 806A1C 8024619C AE800070 */ sw $zero, 0x70($s4) -/* 806A20 802461A0 A640008E */ sh $zero, 0x8e($s2) -/* 806A24 802461A4 8E2200CC */ lw $v0, 0xcc($s1) -/* 806A28 802461A8 8E430000 */ lw $v1, ($s2) -/* 806A2C 802461AC 8C420000 */ lw $v0, ($v0) -/* 806A30 802461B0 00641824 */ and $v1, $v1, $a0 -/* 806A34 802461B4 AE430000 */ sw $v1, ($s2) -/* 806A38 802461B8 AE420028 */ sw $v0, 0x28($s2) -/* 806A3C 802461BC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 806A40 802461C0 8C420098 */ lw $v0, 0x98($v0) -/* 806A44 802461C4 54400005 */ bnel $v0, $zero, .L802461DC -/* 806A48 802461C8 2402FDFF */ addiu $v0, $zero, -0x201 -/* 806A4C 802461CC 34620200 */ ori $v0, $v1, 0x200 -/* 806A50 802461D0 2403FFF7 */ addiu $v1, $zero, -9 -/* 806A54 802461D4 08091879 */ j .L802461E4 -/* 806A58 802461D8 00431024 */ and $v0, $v0, $v1 -.L802461DC: -/* 806A5C 802461DC 00621024 */ and $v0, $v1, $v0 -/* 806A60 802461E0 34420008 */ ori $v0, $v0, 8 -.L802461E4: -/* 806A64 802461E4 AE420000 */ sw $v0, ($s2) -/* 806A68 802461E8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 806A6C 802461EC 30420004 */ andi $v0, $v0, 4 -/* 806A70 802461F0 10400008 */ beqz $v0, .L80246214 -/* 806A74 802461F4 24020063 */ addiu $v0, $zero, 0x63 -/* 806A78 802461F8 AE820070 */ sw $v0, 0x70($s4) -/* 806A7C 802461FC AE800074 */ sw $zero, 0x74($s4) -/* 806A80 80246200 8E2200B0 */ lw $v0, 0xb0($s1) -/* 806A84 80246204 2403FFFB */ addiu $v1, $zero, -5 -/* 806A88 80246208 00431024 */ and $v0, $v0, $v1 -/* 806A8C 8024620C 08091890 */ j .L80246240 -/* 806A90 80246210 AE2200B0 */ sw $v0, 0xb0($s1) -.L80246214: -/* 806A94 80246214 8E220000 */ lw $v0, ($s1) -/* 806A98 80246218 3C034000 */ lui $v1, 0x4000 -/* 806A9C 8024621C 00431024 */ and $v0, $v0, $v1 -/* 806AA0 80246220 10400007 */ beqz $v0, .L80246240 -/* 806AA4 80246224 3C03BFFF */ lui $v1, 0xbfff -/* 806AA8 80246228 2402000C */ addiu $v0, $zero, 0xc -/* 806AAC 8024622C AE820070 */ sw $v0, 0x70($s4) -/* 806AB0 80246230 8E220000 */ lw $v0, ($s1) -/* 806AB4 80246234 3463FFFF */ ori $v1, $v1, 0xffff -/* 806AB8 80246238 00431024 */ and $v0, $v0, $v1 -/* 806ABC 8024623C AE220000 */ sw $v0, ($s1) -.L80246240: -/* 806AC0 80246240 27A50038 */ addiu $a1, $sp, 0x38 -/* 806AC4 80246244 27A6003C */ addiu $a2, $sp, 0x3c -/* 806AC8 80246248 C6400038 */ lwc1 $f0, 0x38($s2) -/* 806ACC 8024624C 864200A8 */ lh $v0, 0xa8($s2) -/* 806AD0 80246250 3C0142C8 */ lui $at, 0x42c8 -/* 806AD4 80246254 44812000 */ mtc1 $at, $f4 -/* 806AD8 80246258 44823000 */ mtc1 $v0, $f6 -/* 806ADC 8024625C 00000000 */ nop -/* 806AE0 80246260 468031A0 */ cvt.s.w $f6, $f6 -/* 806AE4 80246264 27A20044 */ addiu $v0, $sp, 0x44 -/* 806AE8 80246268 E7A00038 */ swc1 $f0, 0x38($sp) -/* 806AEC 8024626C C640003C */ lwc1 $f0, 0x3c($s2) -/* 806AF0 80246270 C6420040 */ lwc1 $f2, 0x40($s2) -/* 806AF4 80246274 46060000 */ add.s $f0, $f0, $f6 -/* 806AF8 80246278 E7A40044 */ swc1 $f4, 0x44($sp) -/* 806AFC 8024627C E7A20040 */ swc1 $f2, 0x40($sp) -/* 806B00 80246280 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 806B04 80246284 AFA20010 */ sw $v0, 0x10($sp) -/* 806B08 80246288 8E440080 */ lw $a0, 0x80($s2) -/* 806B0C 8024628C 0C0372DF */ jal func_800DCB7C -/* 806B10 80246290 27A70040 */ addiu $a3, $sp, 0x40 -/* 806B14 80246294 10400003 */ beqz $v0, .L802462A4 -/* 806B18 80246298 00000000 */ nop -/* 806B1C 8024629C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 806B20 802462A0 E640003C */ swc1 $f0, 0x3c($s2) -.L802462A4: -/* 806B24 802462A4 8E830070 */ lw $v1, 0x70($s4) -/* 806B28 802462A8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 806B2C 802462AC 10400042 */ beqz $v0, .L802463B8 -/* 806B30 802462B0 00031080 */ sll $v0, $v1, 2 -/* 806B34 802462B4 3C018026 */ lui $at, 0x8026 -/* 806B38 802462B8 00220821 */ addu $at, $at, $v0 -/* 806B3C 802462BC 8C2228A0 */ lw $v0, 0x28a0($at) -/* 806B40 802462C0 00400008 */ jr $v0 -/* 806B44 802462C4 00000000 */ nop -/* 806B48 802462C8 0280202D */ daddu $a0, $s4, $zero -/* 806B4C 802462CC 0260282D */ daddu $a1, $s3, $zero -/* 806B50 802462D0 0C091554 */ jal func_80245550 -/* 806B54 802462D4 02A0302D */ daddu $a2, $s5, $zero -/* 806B58 802462D8 0280202D */ daddu $a0, $s4, $zero -/* 806B5C 802462DC 0260282D */ daddu $a1, $s3, $zero -/* 806B60 802462E0 0C0915AA */ jal func_802456A8 -/* 806B64 802462E4 02A0302D */ daddu $a2, $s5, $zero -/* 806B68 802462E8 080918EE */ j .L802463B8 -/* 806B6C 802462EC 00000000 */ nop -/* 806B70 802462F0 0280202D */ daddu $a0, $s4, $zero -/* 806B74 802462F4 0260282D */ daddu $a1, $s3, $zero -/* 806B78 802462F8 0C091654 */ jal func_80245950 -/* 806B7C 802462FC 02A0302D */ daddu $a2, $s5, $zero -/* 806B80 80246300 0280202D */ daddu $a0, $s4, $zero -/* 806B84 80246304 0260282D */ daddu $a1, $s3, $zero -/* 806B88 80246308 0C091684 */ jal func_80245A10 -/* 806B8C 8024630C 02A0302D */ daddu $a2, $s5, $zero -/* 806B90 80246310 080918EE */ j .L802463B8 -/* 806B94 80246314 00000000 */ nop -/* 806B98 80246318 0280202D */ daddu $a0, $s4, $zero -/* 806B9C 8024631C 0260282D */ daddu $a1, $s3, $zero -/* 806BA0 80246320 0C0916F3 */ jal func_80245BCC -/* 806BA4 80246324 02A0302D */ daddu $a2, $s5, $zero -/* 806BA8 80246328 080918EE */ j .L802463B8 -/* 806BAC 8024632C 00000000 */ nop -/* 806BB0 80246330 0280202D */ daddu $a0, $s4, $zero -/* 806BB4 80246334 0260282D */ daddu $a1, $s3, $zero -/* 806BB8 80246338 0C091720 */ jal func_80245C80 -/* 806BBC 8024633C 02A0302D */ daddu $a2, $s5, $zero -/* 806BC0 80246340 0280202D */ daddu $a0, $s4, $zero -/* 806BC4 80246344 0260282D */ daddu $a1, $s3, $zero -/* 806BC8 80246348 0C09173D */ jal func_80245CF4 -/* 806BCC 8024634C 02A0302D */ daddu $a2, $s5, $zero -/* 806BD0 80246350 080918EE */ j .L802463B8 -/* 806BD4 80246354 00000000 */ nop -/* 806BD8 80246358 0280202D */ daddu $a0, $s4, $zero -/* 806BDC 8024635C 0260282D */ daddu $a1, $s3, $zero -/* 806BE0 80246360 0C09175B */ jal func_80245D6C -/* 806BE4 80246364 02A0302D */ daddu $a2, $s5, $zero -/* 806BE8 80246368 0280202D */ daddu $a0, $s4, $zero -/* 806BEC 8024636C 0260282D */ daddu $a1, $s3, $zero -/* 806BF0 80246370 0C0917A7 */ jal func_80245E9C -/* 806BF4 80246374 02A0302D */ daddu $a2, $s5, $zero -/* 806BF8 80246378 080918EE */ j .L802463B8 -/* 806BFC 8024637C 00000000 */ nop -/* 806C00 80246380 0280202D */ daddu $a0, $s4, $zero -/* 806C04 80246384 0260282D */ daddu $a1, $s3, $zero -/* 806C08 80246388 0C0917EF */ jal func_80245FBC -/* 806C0C 8024638C 02A0302D */ daddu $a2, $s5, $zero -/* 806C10 80246390 080918EE */ j .L802463B8 -/* 806C14 80246394 00000000 */ nop -/* 806C18 80246398 0280202D */ daddu $a0, $s4, $zero -/* 806C1C 8024639C 0260282D */ daddu $a1, $s3, $zero -/* 806C20 802463A0 0C091809 */ jal func_80246024 -/* 806C24 802463A4 02A0302D */ daddu $a2, $s5, $zero -/* 806C28 802463A8 080918EE */ j .L802463B8 -/* 806C2C 802463AC 00000000 */ nop -/* 806C30 802463B0 0C0129CF */ jal func_8004A73C -/* 806C34 802463B4 0280202D */ daddu $a0, $s4, $zero -.L802463B8: -/* 806C38 802463B8 8FBF0060 */ lw $ra, 0x60($sp) -/* 806C3C 802463BC 8FB5005C */ lw $s5, 0x5c($sp) -/* 806C40 802463C0 8FB40058 */ lw $s4, 0x58($sp) -/* 806C44 802463C4 8FB30054 */ lw $s3, 0x54($sp) -/* 806C48 802463C8 8FB20050 */ lw $s2, 0x50($sp) -/* 806C4C 802463CC 8FB1004C */ lw $s1, 0x4c($sp) -/* 806C50 802463D0 8FB00048 */ lw $s0, 0x48($sp) -/* 806C54 802463D4 0000102D */ daddu $v0, $zero, $zero -/* 806C58 802463D8 03E00008 */ jr $ra -/* 806C5C 802463DC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s new file mode 100644 index 0000000000..f76272a2e1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802460E4_806964.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802460E4_806964 +/* 806964 802460E4 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 806968 802460E8 AFB40058 */ sw $s4, 0x58($sp) +/* 80696C 802460EC 0080A02D */ daddu $s4, $a0, $zero +/* 806970 802460F0 AFBF0060 */ sw $ra, 0x60($sp) +/* 806974 802460F4 AFB5005C */ sw $s5, 0x5c($sp) +/* 806978 802460F8 AFB30054 */ sw $s3, 0x54($sp) +/* 80697C 802460FC AFB20050 */ sw $s2, 0x50($sp) +/* 806980 80246100 AFB1004C */ sw $s1, 0x4c($sp) +/* 806984 80246104 AFB00048 */ sw $s0, 0x48($sp) +/* 806988 80246108 8E910148 */ lw $s1, 0x148($s4) +/* 80698C 8024610C 86240008 */ lh $a0, 8($s1) +/* 806990 80246110 0C00EABB */ jal get_npc_unsafe +/* 806994 80246114 00A0802D */ daddu $s0, $a1, $zero +/* 806998 80246118 8E83000C */ lw $v1, 0xc($s4) +/* 80699C 8024611C 0280202D */ daddu $a0, $s4, $zero +/* 8069A0 80246120 8C650000 */ lw $a1, ($v1) +/* 8069A4 80246124 0C0B1EAF */ jal get_variable +/* 8069A8 80246128 0040902D */ daddu $s2, $v0, $zero +/* 8069AC 8024612C AFA00018 */ sw $zero, 0x18($sp) +/* 8069B0 80246130 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8069B4 80246134 8C630094 */ lw $v1, 0x94($v1) +/* 8069B8 80246138 AFA3001C */ sw $v1, 0x1c($sp) +/* 8069BC 8024613C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8069C0 80246140 8C630080 */ lw $v1, 0x80($v1) +/* 8069C4 80246144 AFA30020 */ sw $v1, 0x20($sp) +/* 8069C8 80246148 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8069CC 8024614C 8C630088 */ lw $v1, 0x88($v1) +/* 8069D0 80246150 AFA30024 */ sw $v1, 0x24($sp) +/* 8069D4 80246154 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8069D8 80246158 8C63008C */ lw $v1, 0x8c($v1) +/* 8069DC 8024615C 27B50018 */ addiu $s5, $sp, 0x18 +/* 8069E0 80246160 AFA30028 */ sw $v1, 0x28($sp) +/* 8069E4 80246164 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8069E8 80246168 3C014282 */ lui $at, 0x4282 +/* 8069EC 8024616C 44810000 */ mtc1 $at, $f0 +/* 8069F0 80246170 8C630090 */ lw $v1, 0x90($v1) +/* 8069F4 80246174 0040982D */ daddu $s3, $v0, $zero +/* 8069F8 80246178 E7A00030 */ swc1 $f0, 0x30($sp) +/* 8069FC 8024617C A7A00034 */ sh $zero, 0x34($sp) +/* 806A00 80246180 16000005 */ bnez $s0, .L80246198 +/* 806A04 80246184 AFA3002C */ sw $v1, 0x2c($sp) +/* 806A08 80246188 8E2200B0 */ lw $v0, 0xb0($s1) +/* 806A0C 8024618C 30420004 */ andi $v0, $v0, 4 +/* 806A10 80246190 10400044 */ beqz $v0, .L802462A4 +/* 806A14 80246194 00000000 */ nop +.L80246198: +/* 806A18 80246198 2404F7FF */ addiu $a0, $zero, -0x801 +/* 806A1C 8024619C AE800070 */ sw $zero, 0x70($s4) +/* 806A20 802461A0 A640008E */ sh $zero, 0x8e($s2) +/* 806A24 802461A4 8E2200CC */ lw $v0, 0xcc($s1) +/* 806A28 802461A8 8E430000 */ lw $v1, ($s2) +/* 806A2C 802461AC 8C420000 */ lw $v0, ($v0) +/* 806A30 802461B0 00641824 */ and $v1, $v1, $a0 +/* 806A34 802461B4 AE430000 */ sw $v1, ($s2) +/* 806A38 802461B8 AE420028 */ sw $v0, 0x28($s2) +/* 806A3C 802461BC 8E2200D0 */ lw $v0, 0xd0($s1) +/* 806A40 802461C0 8C420098 */ lw $v0, 0x98($v0) +/* 806A44 802461C4 54400005 */ bnel $v0, $zero, .L802461DC +/* 806A48 802461C8 2402FDFF */ addiu $v0, $zero, -0x201 +/* 806A4C 802461CC 34620200 */ ori $v0, $v1, 0x200 +/* 806A50 802461D0 2403FFF7 */ addiu $v1, $zero, -9 +/* 806A54 802461D4 08091879 */ j .L802461E4 +/* 806A58 802461D8 00431024 */ and $v0, $v0, $v1 +.L802461DC: +/* 806A5C 802461DC 00621024 */ and $v0, $v1, $v0 +/* 806A60 802461E0 34420008 */ ori $v0, $v0, 8 +.L802461E4: +/* 806A64 802461E4 AE420000 */ sw $v0, ($s2) +/* 806A68 802461E8 8E2200B0 */ lw $v0, 0xb0($s1) +/* 806A6C 802461EC 30420004 */ andi $v0, $v0, 4 +/* 806A70 802461F0 10400008 */ beqz $v0, .L80246214 +/* 806A74 802461F4 24020063 */ addiu $v0, $zero, 0x63 +/* 806A78 802461F8 AE820070 */ sw $v0, 0x70($s4) +/* 806A7C 802461FC AE800074 */ sw $zero, 0x74($s4) +/* 806A80 80246200 8E2200B0 */ lw $v0, 0xb0($s1) +/* 806A84 80246204 2403FFFB */ addiu $v1, $zero, -5 +/* 806A88 80246208 00431024 */ and $v0, $v0, $v1 +/* 806A8C 8024620C 08091890 */ j .L80246240 +/* 806A90 80246210 AE2200B0 */ sw $v0, 0xb0($s1) +.L80246214: +/* 806A94 80246214 8E220000 */ lw $v0, ($s1) +/* 806A98 80246218 3C034000 */ lui $v1, 0x4000 +/* 806A9C 8024621C 00431024 */ and $v0, $v0, $v1 +/* 806AA0 80246220 10400007 */ beqz $v0, .L80246240 +/* 806AA4 80246224 3C03BFFF */ lui $v1, 0xbfff +/* 806AA8 80246228 2402000C */ addiu $v0, $zero, 0xc +/* 806AAC 8024622C AE820070 */ sw $v0, 0x70($s4) +/* 806AB0 80246230 8E220000 */ lw $v0, ($s1) +/* 806AB4 80246234 3463FFFF */ ori $v1, $v1, 0xffff +/* 806AB8 80246238 00431024 */ and $v0, $v0, $v1 +/* 806ABC 8024623C AE220000 */ sw $v0, ($s1) +.L80246240: +/* 806AC0 80246240 27A50038 */ addiu $a1, $sp, 0x38 +/* 806AC4 80246244 27A6003C */ addiu $a2, $sp, 0x3c +/* 806AC8 80246248 C6400038 */ lwc1 $f0, 0x38($s2) +/* 806ACC 8024624C 864200A8 */ lh $v0, 0xa8($s2) +/* 806AD0 80246250 3C0142C8 */ lui $at, 0x42c8 +/* 806AD4 80246254 44812000 */ mtc1 $at, $f4 +/* 806AD8 80246258 44823000 */ mtc1 $v0, $f6 +/* 806ADC 8024625C 00000000 */ nop +/* 806AE0 80246260 468031A0 */ cvt.s.w $f6, $f6 +/* 806AE4 80246264 27A20044 */ addiu $v0, $sp, 0x44 +/* 806AE8 80246268 E7A00038 */ swc1 $f0, 0x38($sp) +/* 806AEC 8024626C C640003C */ lwc1 $f0, 0x3c($s2) +/* 806AF0 80246270 C6420040 */ lwc1 $f2, 0x40($s2) +/* 806AF4 80246274 46060000 */ add.s $f0, $f0, $f6 +/* 806AF8 80246278 E7A40044 */ swc1 $f4, 0x44($sp) +/* 806AFC 8024627C E7A20040 */ swc1 $f2, 0x40($sp) +/* 806B00 80246280 E7A0003C */ swc1 $f0, 0x3c($sp) +/* 806B04 80246284 AFA20010 */ sw $v0, 0x10($sp) +/* 806B08 80246288 8E440080 */ lw $a0, 0x80($s2) +/* 806B0C 8024628C 0C0372DF */ jal func_800DCB7C +/* 806B10 80246290 27A70040 */ addiu $a3, $sp, 0x40 +/* 806B14 80246294 10400003 */ beqz $v0, .L802462A4 +/* 806B18 80246298 00000000 */ nop +/* 806B1C 8024629C C7A0003C */ lwc1 $f0, 0x3c($sp) +/* 806B20 802462A0 E640003C */ swc1 $f0, 0x3c($s2) +.L802462A4: +/* 806B24 802462A4 8E830070 */ lw $v1, 0x70($s4) +/* 806B28 802462A8 2C620064 */ sltiu $v0, $v1, 0x64 +/* 806B2C 802462AC 10400042 */ beqz $v0, .L802463B8 +/* 806B30 802462B0 00031080 */ sll $v0, $v1, 2 +/* 806B34 802462B4 3C018026 */ lui $at, 0x8026 +/* 806B38 802462B8 00220821 */ addu $at, $at, $v0 +/* 806B3C 802462BC 8C2228A0 */ lw $v0, 0x28a0($at) +/* 806B40 802462C0 00400008 */ jr $v0 +/* 806B44 802462C4 00000000 */ nop +/* 806B48 802462C8 0280202D */ daddu $a0, $s4, $zero +/* 806B4C 802462CC 0260282D */ daddu $a1, $s3, $zero +/* 806B50 802462D0 0C091554 */ jal func_80245550_805DD0 +/* 806B54 802462D4 02A0302D */ daddu $a2, $s5, $zero +/* 806B58 802462D8 0280202D */ daddu $a0, $s4, $zero +/* 806B5C 802462DC 0260282D */ daddu $a1, $s3, $zero +/* 806B60 802462E0 0C0915AA */ jal func_802456A8_805F28 +/* 806B64 802462E4 02A0302D */ daddu $a2, $s5, $zero +/* 806B68 802462E8 080918EE */ j .L802463B8 +/* 806B6C 802462EC 00000000 */ nop +/* 806B70 802462F0 0280202D */ daddu $a0, $s4, $zero +/* 806B74 802462F4 0260282D */ daddu $a1, $s3, $zero +/* 806B78 802462F8 0C091654 */ jal func_80245950_8061D0 +/* 806B7C 802462FC 02A0302D */ daddu $a2, $s5, $zero +/* 806B80 80246300 0280202D */ daddu $a0, $s4, $zero +/* 806B84 80246304 0260282D */ daddu $a1, $s3, $zero +/* 806B88 80246308 0C091684 */ jal func_80245A10_806290 +/* 806B8C 8024630C 02A0302D */ daddu $a2, $s5, $zero +/* 806B90 80246310 080918EE */ j .L802463B8 +/* 806B94 80246314 00000000 */ nop +/* 806B98 80246318 0280202D */ daddu $a0, $s4, $zero +/* 806B9C 8024631C 0260282D */ daddu $a1, $s3, $zero +/* 806BA0 80246320 0C0916F3 */ jal func_80245BCC_80644C +/* 806BA4 80246324 02A0302D */ daddu $a2, $s5, $zero +/* 806BA8 80246328 080918EE */ j .L802463B8 +/* 806BAC 8024632C 00000000 */ nop +/* 806BB0 80246330 0280202D */ daddu $a0, $s4, $zero +/* 806BB4 80246334 0260282D */ daddu $a1, $s3, $zero +/* 806BB8 80246338 0C091720 */ jal func_80245C80_806500 +/* 806BBC 8024633C 02A0302D */ daddu $a2, $s5, $zero +/* 806BC0 80246340 0280202D */ daddu $a0, $s4, $zero +/* 806BC4 80246344 0260282D */ daddu $a1, $s3, $zero +/* 806BC8 80246348 0C09173D */ jal func_80245CF4_806574 +/* 806BCC 8024634C 02A0302D */ daddu $a2, $s5, $zero +/* 806BD0 80246350 080918EE */ j .L802463B8 +/* 806BD4 80246354 00000000 */ nop +/* 806BD8 80246358 0280202D */ daddu $a0, $s4, $zero +/* 806BDC 8024635C 0260282D */ daddu $a1, $s3, $zero +/* 806BE0 80246360 0C09175B */ jal func_80245D6C_8065EC +/* 806BE4 80246364 02A0302D */ daddu $a2, $s5, $zero +/* 806BE8 80246368 0280202D */ daddu $a0, $s4, $zero +/* 806BEC 8024636C 0260282D */ daddu $a1, $s3, $zero +/* 806BF0 80246370 0C0917A7 */ jal func_80245E9C_80671C +/* 806BF4 80246374 02A0302D */ daddu $a2, $s5, $zero +/* 806BF8 80246378 080918EE */ j .L802463B8 +/* 806BFC 8024637C 00000000 */ nop +/* 806C00 80246380 0280202D */ daddu $a0, $s4, $zero +/* 806C04 80246384 0260282D */ daddu $a1, $s3, $zero +/* 806C08 80246388 0C0917EF */ jal func_80245FBC_80683C +/* 806C0C 8024638C 02A0302D */ daddu $a2, $s5, $zero +/* 806C10 80246390 080918EE */ j .L802463B8 +/* 806C14 80246394 00000000 */ nop +/* 806C18 80246398 0280202D */ daddu $a0, $s4, $zero +/* 806C1C 8024639C 0260282D */ daddu $a1, $s3, $zero +/* 806C20 802463A0 0C091809 */ jal func_80246024_8068A4 +/* 806C24 802463A4 02A0302D */ daddu $a2, $s5, $zero +/* 806C28 802463A8 080918EE */ j .L802463B8 +/* 806C2C 802463AC 00000000 */ nop +/* 806C30 802463B0 0C0129CF */ jal func_8004A73C +/* 806C34 802463B4 0280202D */ daddu $a0, $s4, $zero +.L802463B8: +/* 806C38 802463B8 8FBF0060 */ lw $ra, 0x60($sp) +/* 806C3C 802463BC 8FB5005C */ lw $s5, 0x5c($sp) +/* 806C40 802463C0 8FB40058 */ lw $s4, 0x58($sp) +/* 806C44 802463C4 8FB30054 */ lw $s3, 0x54($sp) +/* 806C48 802463C8 8FB20050 */ lw $s2, 0x50($sp) +/* 806C4C 802463CC 8FB1004C */ lw $s1, 0x4c($sp) +/* 806C50 802463D0 8FB00048 */ lw $s0, 0x48($sp) +/* 806C54 802463D4 0000102D */ daddu $v0, $zero, $zero +/* 806C58 802463D8 03E00008 */ jr $ra +/* 806C5C 802463DC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0.s deleted file mode 100644 index 8034623e83..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802463E0 -/* 806C60 802463E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 806C64 802463E4 AFBF0010 */ sw $ra, 0x10($sp) -/* 806C68 802463E8 0000202D */ daddu $a0, $zero, $zero -/* 806C6C 802463EC 3C05F840 */ lui $a1, 0xf840 -/* 806C70 802463F0 0C0B1EAF */ jal get_variable -/* 806C74 802463F4 34A55C84 */ ori $a1, $a1, 0x5c84 -/* 806C78 802463F8 14400008 */ bnez $v0, .L8024641C -/* 806C7C 802463FC 0000202D */ daddu $a0, $zero, $zero -/* 806C80 80246400 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 806C84 80246404 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 806C88 80246408 8C420140 */ lw $v0, 0x140($v0) -/* 806C8C 8024640C 8C440000 */ lw $a0, ($v0) -/* 806C90 80246410 0C04D052 */ jal set_item_entity_flags -/* 806C94 80246414 24050040 */ addiu $a1, $zero, 0x40 -/* 806C98 80246418 0000202D */ daddu $a0, $zero, $zero -.L8024641C: -/* 806C9C 8024641C 3C05F840 */ lui $a1, 0xf840 -/* 806CA0 80246420 0C0B1EAF */ jal get_variable -/* 806CA4 80246424 34A55C85 */ ori $a1, $a1, 0x5c85 -/* 806CA8 80246428 14400008 */ bnez $v0, .L8024644C -/* 806CAC 8024642C 0000202D */ daddu $a0, $zero, $zero -/* 806CB0 80246430 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 806CB4 80246434 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 806CB8 80246438 8C420140 */ lw $v0, 0x140($v0) -/* 806CBC 8024643C 8C440010 */ lw $a0, 0x10($v0) -/* 806CC0 80246440 0C04D052 */ jal set_item_entity_flags -/* 806CC4 80246444 24050040 */ addiu $a1, $zero, 0x40 -/* 806CC8 80246448 0000202D */ daddu $a0, $zero, $zero -.L8024644C: -/* 806CCC 8024644C 3C05F840 */ lui $a1, 0xf840 -/* 806CD0 80246450 0C0B1EAF */ jal get_variable -/* 806CD4 80246454 34A55C86 */ ori $a1, $a1, 0x5c86 -/* 806CD8 80246458 14400007 */ bnez $v0, .L80246478 -/* 806CDC 8024645C 00000000 */ nop -/* 806CE0 80246460 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 806CE4 80246464 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 806CE8 80246468 8C420140 */ lw $v0, 0x140($v0) -/* 806CEC 8024646C 8C440020 */ lw $a0, 0x20($v0) -/* 806CF0 80246470 0C04D052 */ jal set_item_entity_flags -/* 806CF4 80246474 24050040 */ addiu $a1, $zero, 0x40 -.L80246478: -/* 806CF8 80246478 8FBF0010 */ lw $ra, 0x10($sp) -/* 806CFC 8024647C 24020002 */ addiu $v0, $zero, 2 -/* 806D00 80246480 03E00008 */ jr $ra -/* 806D04 80246484 27BD0018 */ addiu $sp, $sp, 0x18 -/* 806D08 80246488 00000000 */ nop -/* 806D0C 8024648C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0_806C60.s b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0_806C60.s new file mode 100644 index 0000000000..f525810206 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/805DD0/func_802463E0_806C60.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802463E0_806C60 +/* 806C60 802463E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 806C64 802463E4 AFBF0010 */ sw $ra, 0x10($sp) +/* 806C68 802463E8 0000202D */ daddu $a0, $zero, $zero +/* 806C6C 802463EC 3C05F840 */ lui $a1, 0xf840 +/* 806C70 802463F0 0C0B1EAF */ jal get_variable +/* 806C74 802463F4 34A55C84 */ ori $a1, $a1, 0x5c84 +/* 806C78 802463F8 14400008 */ bnez $v0, .L8024641C +/* 806C7C 802463FC 0000202D */ daddu $a0, $zero, $zero +/* 806C80 80246400 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 806C84 80246404 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 806C88 80246408 8C420140 */ lw $v0, 0x140($v0) +/* 806C8C 8024640C 8C440000 */ lw $a0, ($v0) +/* 806C90 80246410 0C04D052 */ jal set_item_entity_flags +/* 806C94 80246414 24050040 */ addiu $a1, $zero, 0x40 +/* 806C98 80246418 0000202D */ daddu $a0, $zero, $zero +.L8024641C: +/* 806C9C 8024641C 3C05F840 */ lui $a1, 0xf840 +/* 806CA0 80246420 0C0B1EAF */ jal get_variable +/* 806CA4 80246424 34A55C85 */ ori $a1, $a1, 0x5c85 +/* 806CA8 80246428 14400008 */ bnez $v0, .L8024644C +/* 806CAC 8024642C 0000202D */ daddu $a0, $zero, $zero +/* 806CB0 80246430 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 806CB4 80246434 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 806CB8 80246438 8C420140 */ lw $v0, 0x140($v0) +/* 806CBC 8024643C 8C440010 */ lw $a0, 0x10($v0) +/* 806CC0 80246440 0C04D052 */ jal set_item_entity_flags +/* 806CC4 80246444 24050040 */ addiu $a1, $zero, 0x40 +/* 806CC8 80246448 0000202D */ daddu $a0, $zero, $zero +.L8024644C: +/* 806CCC 8024644C 3C05F840 */ lui $a1, 0xf840 +/* 806CD0 80246450 0C0B1EAF */ jal get_variable +/* 806CD4 80246454 34A55C86 */ ori $a1, $a1, 0x5c86 +/* 806CD8 80246458 14400007 */ bnez $v0, .L80246478 +/* 806CDC 8024645C 00000000 */ nop +/* 806CE0 80246460 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 806CE4 80246464 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 806CE8 80246468 8C420140 */ lw $v0, 0x140($v0) +/* 806CEC 8024646C 8C440020 */ lw $a0, 0x20($v0) +/* 806CF0 80246470 0C04D052 */ jal set_item_entity_flags +/* 806CF4 80246474 24050040 */ addiu $a1, $zero, 0x40 +.L80246478: +/* 806CF8 80246478 8FBF0010 */ lw $ra, 0x10($sp) +/* 806CFC 8024647C 24020002 */ addiu $v0, $zero, 2 +/* 806D00 80246480 03E00008 */ jr $ra +/* 806D04 80246484 27BD0018 */ addiu $sp, $sp, 0x18 +/* 806D08 80246488 00000000 */ nop +/* 806D0C 8024648C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246490.s b/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246490.s deleted file mode 100644 index 289550a6c8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246490.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80246490 -/* 806D10 80246490 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 806D14 80246494 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 806D18 80246498 4485A000 */ mtc1 $a1, $f20 -/* 806D1C 8024649C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 806D20 802464A0 4486B000 */ mtc1 $a2, $f22 -/* 806D24 802464A4 AFB00010 */ sw $s0, 0x10($sp) -/* 806D28 802464A8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 806D2C 802464AC 4487C000 */ mtc1 $a3, $f24 -/* 806D30 802464B0 AFBF0014 */ sw $ra, 0x14($sp) -/* 806D34 802464B4 0C019D28 */ jal guMtxIdentF -/* 806D38 802464B8 0080802D */ daddu $s0, $a0, $zero -/* 806D3C 802464BC 4616A582 */ mul.s $f22, $f20, $f22 -/* 806D40 802464C0 00000000 */ nop -/* 806D44 802464C4 4618A502 */ mul.s $f20, $f20, $f24 -/* 806D48 802464C8 00000000 */ nop -/* 806D4C 802464CC 3C013F80 */ lui $at, 0x3f80 -/* 806D50 802464D0 44810000 */ mtc1 $at, $f0 -/* 806D54 802464D4 00000000 */ nop -/* 806D58 802464D8 E6000014 */ swc1 $f0, 0x14($s0) -/* 806D5C 802464DC E6160010 */ swc1 $f22, 0x10($s0) -/* 806D60 802464E0 E6140018 */ swc1 $f20, 0x18($s0) -/* 806D64 802464E4 8FBF0014 */ lw $ra, 0x14($sp) -/* 806D68 802464E8 8FB00010 */ lw $s0, 0x10($sp) -/* 806D6C 802464EC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 806D70 802464F0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 806D74 802464F4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 806D78 802464F8 03E00008 */ jr $ra -/* 806D7C 802464FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246490_806D10.s b/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246490_806D10.s new file mode 100644 index 0000000000..815f2025cb --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246490_806D10.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80246490_806D10 +/* 806D10 80246490 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 806D14 80246494 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 806D18 80246498 4485A000 */ mtc1 $a1, $f20 +/* 806D1C 8024649C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 806D20 802464A0 4486B000 */ mtc1 $a2, $f22 +/* 806D24 802464A4 AFB00010 */ sw $s0, 0x10($sp) +/* 806D28 802464A8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 806D2C 802464AC 4487C000 */ mtc1 $a3, $f24 +/* 806D30 802464B0 AFBF0014 */ sw $ra, 0x14($sp) +/* 806D34 802464B4 0C019D28 */ jal guMtxIdentF +/* 806D38 802464B8 0080802D */ daddu $s0, $a0, $zero +/* 806D3C 802464BC 4616A582 */ mul.s $f22, $f20, $f22 +/* 806D40 802464C0 00000000 */ nop +/* 806D44 802464C4 4618A502 */ mul.s $f20, $f20, $f24 +/* 806D48 802464C8 00000000 */ nop +/* 806D4C 802464CC 3C013F80 */ lui $at, 0x3f80 +/* 806D50 802464D0 44810000 */ mtc1 $at, $f0 +/* 806D54 802464D4 00000000 */ nop +/* 806D58 802464D8 E6000014 */ swc1 $f0, 0x14($s0) +/* 806D5C 802464DC E6160010 */ swc1 $f22, 0x10($s0) +/* 806D60 802464E0 E6140018 */ swc1 $f20, 0x18($s0) +/* 806D64 802464E4 8FBF0014 */ lw $ra, 0x14($sp) +/* 806D68 802464E8 8FB00010 */ lw $s0, 0x10($sp) +/* 806D6C 802464EC D7B80028 */ ldc1 $f24, 0x28($sp) +/* 806D70 802464F0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 806D74 802464F4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 806D78 802464F8 03E00008 */ jr $ra +/* 806D7C 802464FC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246500.s b/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246500.s deleted file mode 100644 index ec645dc659..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246500.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80246500 -/* 806D80 80246500 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 806D84 80246504 AFB10054 */ sw $s1, 0x54($sp) -/* 806D88 80246508 0080882D */ daddu $s1, $a0, $zero -/* 806D8C 8024650C AFBF005C */ sw $ra, 0x5c($sp) -/* 806D90 80246510 AFB20058 */ sw $s2, 0x58($sp) -/* 806D94 80246514 AFB00050 */ sw $s0, 0x50($sp) -/* 806D98 80246518 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 806D9C 8024651C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 806DA0 80246520 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 806DA4 80246524 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 806DA8 80246528 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 806DAC 8024652C 8E30000C */ lw $s0, 0xc($s1) -/* 806DB0 80246530 8E050000 */ lw $a1, ($s0) -/* 806DB4 80246534 0C0B1EAF */ jal get_variable -/* 806DB8 80246538 26100004 */ addiu $s0, $s0, 4 -/* 806DBC 8024653C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 806DC0 80246540 0040202D */ daddu $a0, $v0, $zero -/* 806DC4 80246544 8E050000 */ lw $a1, ($s0) -/* 806DC8 80246548 26100004 */ addiu $s0, $s0, 4 -/* 806DCC 8024654C 0220202D */ daddu $a0, $s1, $zero -/* 806DD0 80246550 0C0B210B */ jal get_float_variable -/* 806DD4 80246554 0040902D */ daddu $s2, $v0, $zero -/* 806DD8 80246558 8E050000 */ lw $a1, ($s0) -/* 806DDC 8024655C 26100004 */ addiu $s0, $s0, 4 -/* 806DE0 80246560 0220202D */ daddu $a0, $s1, $zero -/* 806DE4 80246564 0C0B210B */ jal get_float_variable -/* 806DE8 80246568 46000706 */ mov.s $f28, $f0 -/* 806DEC 8024656C 8E050000 */ lw $a1, ($s0) -/* 806DF0 80246570 26100004 */ addiu $s0, $s0, 4 -/* 806DF4 80246574 0220202D */ daddu $a0, $s1, $zero -/* 806DF8 80246578 0C0B210B */ jal get_float_variable -/* 806DFC 8024657C 46000686 */ mov.s $f26, $f0 -/* 806E00 80246580 0220202D */ daddu $a0, $s1, $zero -/* 806E04 80246584 8E050000 */ lw $a1, ($s0) -/* 806E08 80246588 0C0B210B */ jal get_float_variable -/* 806E0C 8024658C 46000586 */ mov.s $f22, $f0 -/* 806E10 80246590 0240202D */ daddu $a0, $s2, $zero -/* 806E14 80246594 0C046B4C */ jal get_model_from_list_index -/* 806E18 80246598 46000606 */ mov.s $f24, $f0 -/* 806E1C 8024659C 0040882D */ daddu $s1, $v0, $zero -/* 806E20 802465A0 96220000 */ lhu $v0, ($s1) -/* 806E24 802465A4 30420400 */ andi $v0, $v0, 0x400 -/* 806E28 802465A8 1440001E */ bnez $v0, .L80246624 -/* 806E2C 802465AC 26300058 */ addiu $s0, $s1, 0x58 -/* 806E30 802465B0 4480A000 */ mtc1 $zero, $f20 -/* 806E34 802465B4 4406B000 */ mfc1 $a2, $f22 -/* 806E38 802465B8 4405A000 */ mfc1 $a1, $f20 -/* 806E3C 802465BC 4407A000 */ mfc1 $a3, $f20 -/* 806E40 802465C0 0C019E40 */ jal guTranslateF -/* 806E44 802465C4 0200202D */ daddu $a0, $s0, $zero -/* 806E48 802465C8 4405E000 */ mfc1 $a1, $f28 -/* 806E4C 802465CC 4406D000 */ mfc1 $a2, $f26 -/* 806E50 802465D0 4407C000 */ mfc1 $a3, $f24 -/* 806E54 802465D4 0C091924 */ jal func_80246490 -/* 806E58 802465D8 27A40010 */ addiu $a0, $sp, 0x10 -/* 806E5C 802465DC 27A40010 */ addiu $a0, $sp, 0x10 -/* 806E60 802465E0 0200282D */ daddu $a1, $s0, $zero -/* 806E64 802465E4 0C019D80 */ jal guMtxCatF -/* 806E68 802465E8 0200302D */ daddu $a2, $s0, $zero -/* 806E6C 802465EC 27A40010 */ addiu $a0, $sp, 0x10 -/* 806E70 802465F0 4600B587 */ neg.s $f22, $f22 -/* 806E74 802465F4 4405A000 */ mfc1 $a1, $f20 -/* 806E78 802465F8 4406B000 */ mfc1 $a2, $f22 -/* 806E7C 802465FC 0C019E40 */ jal guTranslateF -/* 806E80 80246600 00A0382D */ daddu $a3, $a1, $zero -/* 806E84 80246604 27A40010 */ addiu $a0, $sp, 0x10 -/* 806E88 80246608 0200282D */ daddu $a1, $s0, $zero -/* 806E8C 8024660C 0C019D80 */ jal guMtxCatF -/* 806E90 80246610 00A0302D */ daddu $a2, $a1, $zero -/* 806E94 80246614 96220000 */ lhu $v0, ($s1) -/* 806E98 80246618 34421400 */ ori $v0, $v0, 0x1400 -/* 806E9C 8024661C 080919A7 */ j .L8024669C -/* 806EA0 80246620 A6220000 */ sh $v0, ($s1) -.L80246624: -/* 806EA4 80246624 4480A000 */ mtc1 $zero, $f20 -/* 806EA8 80246628 4406B000 */ mfc1 $a2, $f22 -/* 806EAC 8024662C 4405A000 */ mfc1 $a1, $f20 -/* 806EB0 80246630 4407A000 */ mfc1 $a3, $f20 -/* 806EB4 80246634 0C019E40 */ jal guTranslateF -/* 806EB8 80246638 27A40010 */ addiu $a0, $sp, 0x10 -/* 806EBC 8024663C 27A40010 */ addiu $a0, $sp, 0x10 -/* 806EC0 80246640 26300058 */ addiu $s0, $s1, 0x58 -/* 806EC4 80246644 0200282D */ daddu $a1, $s0, $zero -/* 806EC8 80246648 0C019D80 */ jal guMtxCatF -/* 806ECC 8024664C 0200302D */ daddu $a2, $s0, $zero -/* 806ED0 80246650 4405E000 */ mfc1 $a1, $f28 -/* 806ED4 80246654 4406D000 */ mfc1 $a2, $f26 -/* 806ED8 80246658 4407C000 */ mfc1 $a3, $f24 -/* 806EDC 8024665C 0C091924 */ jal func_80246490 -/* 806EE0 80246660 27A40010 */ addiu $a0, $sp, 0x10 -/* 806EE4 80246664 27A40010 */ addiu $a0, $sp, 0x10 -/* 806EE8 80246668 0200282D */ daddu $a1, $s0, $zero -/* 806EEC 8024666C 0C019D80 */ jal guMtxCatF -/* 806EF0 80246670 0200302D */ daddu $a2, $s0, $zero -/* 806EF4 80246674 27A40010 */ addiu $a0, $sp, 0x10 -/* 806EF8 80246678 4600B587 */ neg.s $f22, $f22 -/* 806EFC 8024667C 4405A000 */ mfc1 $a1, $f20 -/* 806F00 80246680 4406B000 */ mfc1 $a2, $f22 -/* 806F04 80246684 0C019E40 */ jal guTranslateF -/* 806F08 80246688 00A0382D */ daddu $a3, $a1, $zero -/* 806F0C 8024668C 27A40010 */ addiu $a0, $sp, 0x10 -/* 806F10 80246690 0200282D */ daddu $a1, $s0, $zero -/* 806F14 80246694 0C019D80 */ jal guMtxCatF -/* 806F18 80246698 00A0302D */ daddu $a2, $a1, $zero -.L8024669C: -/* 806F1C 8024669C 8FBF005C */ lw $ra, 0x5c($sp) -/* 806F20 802466A0 8FB20058 */ lw $s2, 0x58($sp) -/* 806F24 802466A4 8FB10054 */ lw $s1, 0x54($sp) -/* 806F28 802466A8 8FB00050 */ lw $s0, 0x50($sp) -/* 806F2C 802466AC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 806F30 802466B0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 806F34 802466B4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 806F38 802466B8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 806F3C 802466BC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 806F40 802466C0 24020002 */ addiu $v0, $zero, 2 -/* 806F44 802466C4 03E00008 */ jr $ra -/* 806F48 802466C8 27BD0088 */ addiu $sp, $sp, 0x88 -/* 806F4C 802466CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246500_806D80.s b/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246500_806D80.s new file mode 100644 index 0000000000..76c78b8a56 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_01/806D10/func_80246500_806D80.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80246500_806D80 +/* 806D80 80246500 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 806D84 80246504 AFB10054 */ sw $s1, 0x54($sp) +/* 806D88 80246508 0080882D */ daddu $s1, $a0, $zero +/* 806D8C 8024650C AFBF005C */ sw $ra, 0x5c($sp) +/* 806D90 80246510 AFB20058 */ sw $s2, 0x58($sp) +/* 806D94 80246514 AFB00050 */ sw $s0, 0x50($sp) +/* 806D98 80246518 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 806D9C 8024651C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 806DA0 80246520 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 806DA4 80246524 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 806DA8 80246528 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 806DAC 8024652C 8E30000C */ lw $s0, 0xc($s1) +/* 806DB0 80246530 8E050000 */ lw $a1, ($s0) +/* 806DB4 80246534 0C0B1EAF */ jal get_variable +/* 806DB8 80246538 26100004 */ addiu $s0, $s0, 4 +/* 806DBC 8024653C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 806DC0 80246540 0040202D */ daddu $a0, $v0, $zero +/* 806DC4 80246544 8E050000 */ lw $a1, ($s0) +/* 806DC8 80246548 26100004 */ addiu $s0, $s0, 4 +/* 806DCC 8024654C 0220202D */ daddu $a0, $s1, $zero +/* 806DD0 80246550 0C0B210B */ jal get_float_variable +/* 806DD4 80246554 0040902D */ daddu $s2, $v0, $zero +/* 806DD8 80246558 8E050000 */ lw $a1, ($s0) +/* 806DDC 8024655C 26100004 */ addiu $s0, $s0, 4 +/* 806DE0 80246560 0220202D */ daddu $a0, $s1, $zero +/* 806DE4 80246564 0C0B210B */ jal get_float_variable +/* 806DE8 80246568 46000706 */ mov.s $f28, $f0 +/* 806DEC 8024656C 8E050000 */ lw $a1, ($s0) +/* 806DF0 80246570 26100004 */ addiu $s0, $s0, 4 +/* 806DF4 80246574 0220202D */ daddu $a0, $s1, $zero +/* 806DF8 80246578 0C0B210B */ jal get_float_variable +/* 806DFC 8024657C 46000686 */ mov.s $f26, $f0 +/* 806E00 80246580 0220202D */ daddu $a0, $s1, $zero +/* 806E04 80246584 8E050000 */ lw $a1, ($s0) +/* 806E08 80246588 0C0B210B */ jal get_float_variable +/* 806E0C 8024658C 46000586 */ mov.s $f22, $f0 +/* 806E10 80246590 0240202D */ daddu $a0, $s2, $zero +/* 806E14 80246594 0C046B4C */ jal get_model_from_list_index +/* 806E18 80246598 46000606 */ mov.s $f24, $f0 +/* 806E1C 8024659C 0040882D */ daddu $s1, $v0, $zero +/* 806E20 802465A0 96220000 */ lhu $v0, ($s1) +/* 806E24 802465A4 30420400 */ andi $v0, $v0, 0x400 +/* 806E28 802465A8 1440001E */ bnez $v0, .L80246624 +/* 806E2C 802465AC 26300058 */ addiu $s0, $s1, 0x58 +/* 806E30 802465B0 4480A000 */ mtc1 $zero, $f20 +/* 806E34 802465B4 4406B000 */ mfc1 $a2, $f22 +/* 806E38 802465B8 4405A000 */ mfc1 $a1, $f20 +/* 806E3C 802465BC 4407A000 */ mfc1 $a3, $f20 +/* 806E40 802465C0 0C019E40 */ jal guTranslateF +/* 806E44 802465C4 0200202D */ daddu $a0, $s0, $zero +/* 806E48 802465C8 4405E000 */ mfc1 $a1, $f28 +/* 806E4C 802465CC 4406D000 */ mfc1 $a2, $f26 +/* 806E50 802465D0 4407C000 */ mfc1 $a3, $f24 +/* 806E54 802465D4 0C091924 */ jal func_80246490_806D10 +/* 806E58 802465D8 27A40010 */ addiu $a0, $sp, 0x10 +/* 806E5C 802465DC 27A40010 */ addiu $a0, $sp, 0x10 +/* 806E60 802465E0 0200282D */ daddu $a1, $s0, $zero +/* 806E64 802465E4 0C019D80 */ jal guMtxCatF +/* 806E68 802465E8 0200302D */ daddu $a2, $s0, $zero +/* 806E6C 802465EC 27A40010 */ addiu $a0, $sp, 0x10 +/* 806E70 802465F0 4600B587 */ neg.s $f22, $f22 +/* 806E74 802465F4 4405A000 */ mfc1 $a1, $f20 +/* 806E78 802465F8 4406B000 */ mfc1 $a2, $f22 +/* 806E7C 802465FC 0C019E40 */ jal guTranslateF +/* 806E80 80246600 00A0382D */ daddu $a3, $a1, $zero +/* 806E84 80246604 27A40010 */ addiu $a0, $sp, 0x10 +/* 806E88 80246608 0200282D */ daddu $a1, $s0, $zero +/* 806E8C 8024660C 0C019D80 */ jal guMtxCatF +/* 806E90 80246610 00A0302D */ daddu $a2, $a1, $zero +/* 806E94 80246614 96220000 */ lhu $v0, ($s1) +/* 806E98 80246618 34421400 */ ori $v0, $v0, 0x1400 +/* 806E9C 8024661C 080919A7 */ j .L8024669C +/* 806EA0 80246620 A6220000 */ sh $v0, ($s1) +.L80246624: +/* 806EA4 80246624 4480A000 */ mtc1 $zero, $f20 +/* 806EA8 80246628 4406B000 */ mfc1 $a2, $f22 +/* 806EAC 8024662C 4405A000 */ mfc1 $a1, $f20 +/* 806EB0 80246630 4407A000 */ mfc1 $a3, $f20 +/* 806EB4 80246634 0C019E40 */ jal guTranslateF +/* 806EB8 80246638 27A40010 */ addiu $a0, $sp, 0x10 +/* 806EBC 8024663C 27A40010 */ addiu $a0, $sp, 0x10 +/* 806EC0 80246640 26300058 */ addiu $s0, $s1, 0x58 +/* 806EC4 80246644 0200282D */ daddu $a1, $s0, $zero +/* 806EC8 80246648 0C019D80 */ jal guMtxCatF +/* 806ECC 8024664C 0200302D */ daddu $a2, $s0, $zero +/* 806ED0 80246650 4405E000 */ mfc1 $a1, $f28 +/* 806ED4 80246654 4406D000 */ mfc1 $a2, $f26 +/* 806ED8 80246658 4407C000 */ mfc1 $a3, $f24 +/* 806EDC 8024665C 0C091924 */ jal func_80246490_806D10 +/* 806EE0 80246660 27A40010 */ addiu $a0, $sp, 0x10 +/* 806EE4 80246664 27A40010 */ addiu $a0, $sp, 0x10 +/* 806EE8 80246668 0200282D */ daddu $a1, $s0, $zero +/* 806EEC 8024666C 0C019D80 */ jal guMtxCatF +/* 806EF0 80246670 0200302D */ daddu $a2, $s0, $zero +/* 806EF4 80246674 27A40010 */ addiu $a0, $sp, 0x10 +/* 806EF8 80246678 4600B587 */ neg.s $f22, $f22 +/* 806EFC 8024667C 4405A000 */ mfc1 $a1, $f20 +/* 806F00 80246680 4406B000 */ mfc1 $a2, $f22 +/* 806F04 80246684 0C019E40 */ jal guTranslateF +/* 806F08 80246688 00A0382D */ daddu $a3, $a1, $zero +/* 806F0C 8024668C 27A40010 */ addiu $a0, $sp, 0x10 +/* 806F10 80246690 0200282D */ daddu $a1, $s0, $zero +/* 806F14 80246694 0C019D80 */ jal guMtxCatF +/* 806F18 80246698 00A0302D */ daddu $a2, $a1, $zero +.L8024669C: +/* 806F1C 8024669C 8FBF005C */ lw $ra, 0x5c($sp) +/* 806F20 802466A0 8FB20058 */ lw $s2, 0x58($sp) +/* 806F24 802466A4 8FB10054 */ lw $s1, 0x54($sp) +/* 806F28 802466A8 8FB00050 */ lw $s0, 0x50($sp) +/* 806F2C 802466AC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 806F30 802466B0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 806F34 802466B4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 806F38 802466B8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 806F3C 802466BC D7B40060 */ ldc1 $f20, 0x60($sp) +/* 806F40 802466C0 24020002 */ addiu $v0, $zero, 2 +/* 806F44 802466C4 03E00008 */ jr $ra +/* 806F48 802466C8 27BD0088 */ addiu $sp, $sp, 0x88 +/* 806F4C 802466CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0.s b/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0.s deleted file mode 100644 index 84132943ad..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F0 -/* 8238B0 802405F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8238B4 802405F4 24040047 */ addiu $a0, $zero, 0x47 -/* 8238B8 802405F8 2405FFFF */ addiu $a1, $zero, -1 -/* 8238BC 802405FC 24060001 */ addiu $a2, $zero, 1 -/* 8238C0 80240600 00C0382D */ daddu $a3, $a2, $zero -/* 8238C4 80240604 AFBF001C */ sw $ra, 0x1c($sp) -/* 8238C8 80240608 AFB20018 */ sw $s2, 0x18($sp) -/* 8238CC 8024060C AFB10014 */ sw $s1, 0x14($sp) -/* 8238D0 80240610 0C046E54 */ jal func_8011B950 -/* 8238D4 80240614 AFB00010 */ sw $s0, 0x10($sp) -/* 8238D8 80240618 0000202D */ daddu $a0, $zero, $zero -/* 8238DC 8024061C 0080282D */ daddu $a1, $a0, $zero -/* 8238E0 80240620 0080302D */ daddu $a2, $a0, $zero -/* 8238E4 80240624 0C046F97 */ jal set_background_color_blend -/* 8238E8 80240628 240700FF */ addiu $a3, $zero, 0xff -/* 8238EC 8024062C 0000802D */ daddu $s0, $zero, $zero -/* 8238F0 80240630 2412FFFC */ addiu $s2, $zero, -4 -/* 8238F4 80240634 3C110080 */ lui $s1, 0x80 -/* 8238F8 80240638 3C02800B */ lui $v0, %hi(gCameras) -/* 8238FC 8024063C 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* 823900 80240640 A440002C */ sh $zero, 0x2c($v0) -/* 823904 80240644 A440002E */ sh $zero, 0x2e($v0) -/* 823908 80240648 A4400030 */ sh $zero, 0x30($v0) -.L8024064C: -/* 82390C 8024064C 0C00E2B7 */ jal get_npc_by_index -/* 823910 80240650 0200202D */ daddu $a0, $s0, $zero -/* 823914 80240654 0040182D */ daddu $v1, $v0, $zero -/* 823918 80240658 50600009 */ beql $v1, $zero, .L80240680 -/* 82391C 8024065C 26100001 */ addiu $s0, $s0, 1 -/* 823920 80240660 8C640000 */ lw $a0, ($v1) -/* 823924 80240664 10800006 */ beqz $a0, .L80240680 -/* 823928 80240668 26100001 */ addiu $s0, $s0, 1 -/* 82392C 8024066C 806200A4 */ lb $v0, 0xa4($v1) -/* 823930 80240670 10520003 */ beq $v0, $s2, .L80240680 -/* 823934 80240674 00000000 */ nop -/* 823938 80240678 00911025 */ or $v0, $a0, $s1 -/* 82393C 8024067C AC620000 */ sw $v0, ($v1) -.L80240680: -/* 823940 80240680 2A020040 */ slti $v0, $s0, 0x40 -/* 823944 80240684 1440FFF1 */ bnez $v0, .L8024064C -/* 823948 80240688 24020002 */ addiu $v0, $zero, 2 -/* 82394C 8024068C 8FBF001C */ lw $ra, 0x1c($sp) -/* 823950 80240690 8FB20018 */ lw $s2, 0x18($sp) -/* 823954 80240694 8FB10014 */ lw $s1, 0x14($sp) -/* 823958 80240698 8FB00010 */ lw $s0, 0x10($sp) -/* 82395C 8024069C 03E00008 */ jr $ra -/* 823960 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 823964 802406A4 00000000 */ nop -/* 823968 802406A8 00000000 */ nop -/* 82396C 802406AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0_8238B0.s b/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0_8238B0.s new file mode 100644 index 0000000000..0d2e401a3a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/8238B0/func_802405F0_8238B0.s @@ -0,0 +1,54 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405F0_8238B0 +/* 8238B0 802405F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8238B4 802405F4 24040047 */ addiu $a0, $zero, 0x47 +/* 8238B8 802405F8 2405FFFF */ addiu $a1, $zero, -1 +/* 8238BC 802405FC 24060001 */ addiu $a2, $zero, 1 +/* 8238C0 80240600 00C0382D */ daddu $a3, $a2, $zero +/* 8238C4 80240604 AFBF001C */ sw $ra, 0x1c($sp) +/* 8238C8 80240608 AFB20018 */ sw $s2, 0x18($sp) +/* 8238CC 8024060C AFB10014 */ sw $s1, 0x14($sp) +/* 8238D0 80240610 0C046E54 */ jal func_8011B950 +/* 8238D4 80240614 AFB00010 */ sw $s0, 0x10($sp) +/* 8238D8 80240618 0000202D */ daddu $a0, $zero, $zero +/* 8238DC 8024061C 0080282D */ daddu $a1, $a0, $zero +/* 8238E0 80240620 0080302D */ daddu $a2, $a0, $zero +/* 8238E4 80240624 0C046F97 */ jal set_background_color_blend +/* 8238E8 80240628 240700FF */ addiu $a3, $zero, 0xff +/* 8238EC 8024062C 0000802D */ daddu $s0, $zero, $zero +/* 8238F0 80240630 2412FFFC */ addiu $s2, $zero, -4 +/* 8238F4 80240634 3C110080 */ lui $s1, 0x80 +/* 8238F8 80240638 3C02800B */ lui $v0, %hi(gCameras) +/* 8238FC 8024063C 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* 823900 80240640 A440002C */ sh $zero, 0x2c($v0) +/* 823904 80240644 A440002E */ sh $zero, 0x2e($v0) +/* 823908 80240648 A4400030 */ sh $zero, 0x30($v0) +.L8024064C: +/* 82390C 8024064C 0C00E2B7 */ jal get_npc_by_index +/* 823910 80240650 0200202D */ daddu $a0, $s0, $zero +/* 823914 80240654 0040182D */ daddu $v1, $v0, $zero +/* 823918 80240658 50600009 */ beql $v1, $zero, .L80240680 +/* 82391C 8024065C 26100001 */ addiu $s0, $s0, 1 +/* 823920 80240660 8C640000 */ lw $a0, ($v1) +/* 823924 80240664 10800006 */ beqz $a0, .L80240680 +/* 823928 80240668 26100001 */ addiu $s0, $s0, 1 +/* 82392C 8024066C 806200A4 */ lb $v0, 0xa4($v1) +/* 823930 80240670 10520003 */ beq $v0, $s2, .L80240680 +/* 823934 80240674 00000000 */ nop +/* 823938 80240678 00911025 */ or $v0, $a0, $s1 +/* 82393C 8024067C AC620000 */ sw $v0, ($v1) +.L80240680: +/* 823940 80240680 2A020040 */ slti $v0, $s0, 0x40 +/* 823944 80240684 1440FFF1 */ bnez $v0, .L8024064C +/* 823948 80240688 24020002 */ addiu $v0, $zero, 2 +/* 82394C 8024068C 8FBF001C */ lw $ra, 0x1c($sp) +/* 823950 80240690 8FB20018 */ lw $s2, 0x18($sp) +/* 823954 80240694 8FB10014 */ lw $s1, 0x14($sp) +/* 823958 80240698 8FB00010 */ lw $s0, 0x10($sp) +/* 82395C 8024069C 03E00008 */ jr $ra +/* 823960 802406A0 27BD0020 */ addiu $sp, $sp, 0x20 +/* 823964 802406A4 00000000 */ nop +/* 823968 802406A8 00000000 */ nop +/* 82396C 802406AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823970/func_802406B0.s b/asm/nonmatchings/world/area_mac/mac_02/823970/func_802406B0.s deleted file mode 100644 index 21588f7b03..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823970/func_802406B0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406B0 -/* 823970 802406B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 823974 802406B4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 823978 802406B8 4485A000 */ mtc1 $a1, $f20 -/* 82397C 802406BC F7B60020 */ sdc1 $f22, 0x20($sp) -/* 823980 802406C0 4486B000 */ mtc1 $a2, $f22 -/* 823984 802406C4 AFB00010 */ sw $s0, 0x10($sp) -/* 823988 802406C8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 82398C 802406CC 4487C000 */ mtc1 $a3, $f24 -/* 823990 802406D0 AFBF0014 */ sw $ra, 0x14($sp) -/* 823994 802406D4 0C019D28 */ jal guMtxIdentF -/* 823998 802406D8 0080802D */ daddu $s0, $a0, $zero -/* 82399C 802406DC 4616A582 */ mul.s $f22, $f20, $f22 -/* 8239A0 802406E0 00000000 */ nop -/* 8239A4 802406E4 4618A502 */ mul.s $f20, $f20, $f24 -/* 8239A8 802406E8 00000000 */ nop -/* 8239AC 802406EC 3C013F80 */ lui $at, 0x3f80 -/* 8239B0 802406F0 44810000 */ mtc1 $at, $f0 -/* 8239B4 802406F4 00000000 */ nop -/* 8239B8 802406F8 E6000014 */ swc1 $f0, 0x14($s0) -/* 8239BC 802406FC E6160010 */ swc1 $f22, 0x10($s0) -/* 8239C0 80240700 E6140018 */ swc1 $f20, 0x18($s0) -/* 8239C4 80240704 8FBF0014 */ lw $ra, 0x14($sp) -/* 8239C8 80240708 8FB00010 */ lw $s0, 0x10($sp) -/* 8239CC 8024070C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 8239D0 80240710 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 8239D4 80240714 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 8239D8 80240718 03E00008 */ jr $ra -/* 8239DC 8024071C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823970/func_802406B0_823970.s b/asm/nonmatchings/world/area_mac/mac_02/823970/func_802406B0_823970.s new file mode 100644 index 0000000000..f4d6c0a5e9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823970/func_802406B0_823970.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406B0_823970 +/* 823970 802406B0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 823974 802406B4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 823978 802406B8 4485A000 */ mtc1 $a1, $f20 +/* 82397C 802406BC F7B60020 */ sdc1 $f22, 0x20($sp) +/* 823980 802406C0 4486B000 */ mtc1 $a2, $f22 +/* 823984 802406C4 AFB00010 */ sw $s0, 0x10($sp) +/* 823988 802406C8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 82398C 802406CC 4487C000 */ mtc1 $a3, $f24 +/* 823990 802406D0 AFBF0014 */ sw $ra, 0x14($sp) +/* 823994 802406D4 0C019D28 */ jal guMtxIdentF +/* 823998 802406D8 0080802D */ daddu $s0, $a0, $zero +/* 82399C 802406DC 4616A582 */ mul.s $f22, $f20, $f22 +/* 8239A0 802406E0 00000000 */ nop +/* 8239A4 802406E4 4618A502 */ mul.s $f20, $f20, $f24 +/* 8239A8 802406E8 00000000 */ nop +/* 8239AC 802406EC 3C013F80 */ lui $at, 0x3f80 +/* 8239B0 802406F0 44810000 */ mtc1 $at, $f0 +/* 8239B4 802406F4 00000000 */ nop +/* 8239B8 802406F8 E6000014 */ swc1 $f0, 0x14($s0) +/* 8239BC 802406FC E6160010 */ swc1 $f22, 0x10($s0) +/* 8239C0 80240700 E6140018 */ swc1 $f20, 0x18($s0) +/* 8239C4 80240704 8FBF0014 */ lw $ra, 0x14($sp) +/* 8239C8 80240708 8FB00010 */ lw $s0, 0x10($sp) +/* 8239CC 8024070C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 8239D0 80240710 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 8239D4 80240714 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 8239D8 80240718 03E00008 */ jr $ra +/* 8239DC 8024071C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823970/func_80240720.s b/asm/nonmatchings/world/area_mac/mac_02/823970/func_80240720.s deleted file mode 100644 index e8fbf17ed5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823970/func_80240720.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240720 -/* 8239E0 80240720 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 8239E4 80240724 AFB10054 */ sw $s1, 0x54($sp) -/* 8239E8 80240728 0080882D */ daddu $s1, $a0, $zero -/* 8239EC 8024072C AFBF005C */ sw $ra, 0x5c($sp) -/* 8239F0 80240730 AFB20058 */ sw $s2, 0x58($sp) -/* 8239F4 80240734 AFB00050 */ sw $s0, 0x50($sp) -/* 8239F8 80240738 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 8239FC 8024073C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 823A00 80240740 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 823A04 80240744 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 823A08 80240748 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 823A0C 8024074C 8E30000C */ lw $s0, 0xc($s1) -/* 823A10 80240750 8E050000 */ lw $a1, ($s0) -/* 823A14 80240754 0C0B1EAF */ jal get_variable -/* 823A18 80240758 26100004 */ addiu $s0, $s0, 4 -/* 823A1C 8024075C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 823A20 80240760 0040202D */ daddu $a0, $v0, $zero -/* 823A24 80240764 8E050000 */ lw $a1, ($s0) -/* 823A28 80240768 26100004 */ addiu $s0, $s0, 4 -/* 823A2C 8024076C 0220202D */ daddu $a0, $s1, $zero -/* 823A30 80240770 0C0B210B */ jal get_float_variable -/* 823A34 80240774 0040902D */ daddu $s2, $v0, $zero -/* 823A38 80240778 8E050000 */ lw $a1, ($s0) -/* 823A3C 8024077C 26100004 */ addiu $s0, $s0, 4 -/* 823A40 80240780 0220202D */ daddu $a0, $s1, $zero -/* 823A44 80240784 0C0B210B */ jal get_float_variable -/* 823A48 80240788 46000706 */ mov.s $f28, $f0 -/* 823A4C 8024078C 8E050000 */ lw $a1, ($s0) -/* 823A50 80240790 26100004 */ addiu $s0, $s0, 4 -/* 823A54 80240794 0220202D */ daddu $a0, $s1, $zero -/* 823A58 80240798 0C0B210B */ jal get_float_variable -/* 823A5C 8024079C 46000686 */ mov.s $f26, $f0 -/* 823A60 802407A0 0220202D */ daddu $a0, $s1, $zero -/* 823A64 802407A4 8E050000 */ lw $a1, ($s0) -/* 823A68 802407A8 0C0B210B */ jal get_float_variable -/* 823A6C 802407AC 46000586 */ mov.s $f22, $f0 -/* 823A70 802407B0 0240202D */ daddu $a0, $s2, $zero -/* 823A74 802407B4 0C046B4C */ jal get_model_from_list_index -/* 823A78 802407B8 46000606 */ mov.s $f24, $f0 -/* 823A7C 802407BC 0040882D */ daddu $s1, $v0, $zero -/* 823A80 802407C0 96220000 */ lhu $v0, ($s1) -/* 823A84 802407C4 30420400 */ andi $v0, $v0, 0x400 -/* 823A88 802407C8 1440001E */ bnez $v0, .L80240844 -/* 823A8C 802407CC 26300058 */ addiu $s0, $s1, 0x58 -/* 823A90 802407D0 4480A000 */ mtc1 $zero, $f20 -/* 823A94 802407D4 4406B000 */ mfc1 $a2, $f22 -/* 823A98 802407D8 4405A000 */ mfc1 $a1, $f20 -/* 823A9C 802407DC 4407A000 */ mfc1 $a3, $f20 -/* 823AA0 802407E0 0C019E40 */ jal guTranslateF -/* 823AA4 802407E4 0200202D */ daddu $a0, $s0, $zero -/* 823AA8 802407E8 4405E000 */ mfc1 $a1, $f28 -/* 823AAC 802407EC 4406D000 */ mfc1 $a2, $f26 -/* 823AB0 802407F0 4407C000 */ mfc1 $a3, $f24 -/* 823AB4 802407F4 0C0901AC */ jal func_802406B0 -/* 823AB8 802407F8 27A40010 */ addiu $a0, $sp, 0x10 -/* 823ABC 802407FC 27A40010 */ addiu $a0, $sp, 0x10 -/* 823AC0 80240800 0200282D */ daddu $a1, $s0, $zero -/* 823AC4 80240804 0C019D80 */ jal guMtxCatF -/* 823AC8 80240808 0200302D */ daddu $a2, $s0, $zero -/* 823ACC 8024080C 27A40010 */ addiu $a0, $sp, 0x10 -/* 823AD0 80240810 4600B587 */ neg.s $f22, $f22 -/* 823AD4 80240814 4405A000 */ mfc1 $a1, $f20 -/* 823AD8 80240818 4406B000 */ mfc1 $a2, $f22 -/* 823ADC 8024081C 0C019E40 */ jal guTranslateF -/* 823AE0 80240820 00A0382D */ daddu $a3, $a1, $zero -/* 823AE4 80240824 27A40010 */ addiu $a0, $sp, 0x10 -/* 823AE8 80240828 0200282D */ daddu $a1, $s0, $zero -/* 823AEC 8024082C 0C019D80 */ jal guMtxCatF -/* 823AF0 80240830 00A0302D */ daddu $a2, $a1, $zero -/* 823AF4 80240834 96220000 */ lhu $v0, ($s1) -/* 823AF8 80240838 34421400 */ ori $v0, $v0, 0x1400 -/* 823AFC 8024083C 0809022F */ j .L802408BC -/* 823B00 80240840 A6220000 */ sh $v0, ($s1) -.L80240844: -/* 823B04 80240844 4480A000 */ mtc1 $zero, $f20 -/* 823B08 80240848 4406B000 */ mfc1 $a2, $f22 -/* 823B0C 8024084C 4405A000 */ mfc1 $a1, $f20 -/* 823B10 80240850 4407A000 */ mfc1 $a3, $f20 -/* 823B14 80240854 0C019E40 */ jal guTranslateF -/* 823B18 80240858 27A40010 */ addiu $a0, $sp, 0x10 -/* 823B1C 8024085C 27A40010 */ addiu $a0, $sp, 0x10 -/* 823B20 80240860 26300058 */ addiu $s0, $s1, 0x58 -/* 823B24 80240864 0200282D */ daddu $a1, $s0, $zero -/* 823B28 80240868 0C019D80 */ jal guMtxCatF -/* 823B2C 8024086C 0200302D */ daddu $a2, $s0, $zero -/* 823B30 80240870 4405E000 */ mfc1 $a1, $f28 -/* 823B34 80240874 4406D000 */ mfc1 $a2, $f26 -/* 823B38 80240878 4407C000 */ mfc1 $a3, $f24 -/* 823B3C 8024087C 0C0901AC */ jal func_802406B0 -/* 823B40 80240880 27A40010 */ addiu $a0, $sp, 0x10 -/* 823B44 80240884 27A40010 */ addiu $a0, $sp, 0x10 -/* 823B48 80240888 0200282D */ daddu $a1, $s0, $zero -/* 823B4C 8024088C 0C019D80 */ jal guMtxCatF -/* 823B50 80240890 0200302D */ daddu $a2, $s0, $zero -/* 823B54 80240894 27A40010 */ addiu $a0, $sp, 0x10 -/* 823B58 80240898 4600B587 */ neg.s $f22, $f22 -/* 823B5C 8024089C 4405A000 */ mfc1 $a1, $f20 -/* 823B60 802408A0 4406B000 */ mfc1 $a2, $f22 -/* 823B64 802408A4 0C019E40 */ jal guTranslateF -/* 823B68 802408A8 00A0382D */ daddu $a3, $a1, $zero -/* 823B6C 802408AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 823B70 802408B0 0200282D */ daddu $a1, $s0, $zero -/* 823B74 802408B4 0C019D80 */ jal guMtxCatF -/* 823B78 802408B8 00A0302D */ daddu $a2, $a1, $zero -.L802408BC: -/* 823B7C 802408BC 8FBF005C */ lw $ra, 0x5c($sp) -/* 823B80 802408C0 8FB20058 */ lw $s2, 0x58($sp) -/* 823B84 802408C4 8FB10054 */ lw $s1, 0x54($sp) -/* 823B88 802408C8 8FB00050 */ lw $s0, 0x50($sp) -/* 823B8C 802408CC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 823B90 802408D0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 823B94 802408D4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 823B98 802408D8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 823B9C 802408DC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 823BA0 802408E0 24020002 */ addiu $v0, $zero, 2 -/* 823BA4 802408E4 03E00008 */ jr $ra -/* 823BA8 802408E8 27BD0088 */ addiu $sp, $sp, 0x88 -/* 823BAC 802408EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823970/func_80240720_8239E0.s b/asm/nonmatchings/world/area_mac/mac_02/823970/func_80240720_8239E0.s new file mode 100644 index 0000000000..b2720221d4 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823970/func_80240720_8239E0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240720_8239E0 +/* 8239E0 80240720 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 8239E4 80240724 AFB10054 */ sw $s1, 0x54($sp) +/* 8239E8 80240728 0080882D */ daddu $s1, $a0, $zero +/* 8239EC 8024072C AFBF005C */ sw $ra, 0x5c($sp) +/* 8239F0 80240730 AFB20058 */ sw $s2, 0x58($sp) +/* 8239F4 80240734 AFB00050 */ sw $s0, 0x50($sp) +/* 8239F8 80240738 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 8239FC 8024073C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 823A00 80240740 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 823A04 80240744 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 823A08 80240748 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 823A0C 8024074C 8E30000C */ lw $s0, 0xc($s1) +/* 823A10 80240750 8E050000 */ lw $a1, ($s0) +/* 823A14 80240754 0C0B1EAF */ jal get_variable +/* 823A18 80240758 26100004 */ addiu $s0, $s0, 4 +/* 823A1C 8024075C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 823A20 80240760 0040202D */ daddu $a0, $v0, $zero +/* 823A24 80240764 8E050000 */ lw $a1, ($s0) +/* 823A28 80240768 26100004 */ addiu $s0, $s0, 4 +/* 823A2C 8024076C 0220202D */ daddu $a0, $s1, $zero +/* 823A30 80240770 0C0B210B */ jal get_float_variable +/* 823A34 80240774 0040902D */ daddu $s2, $v0, $zero +/* 823A38 80240778 8E050000 */ lw $a1, ($s0) +/* 823A3C 8024077C 26100004 */ addiu $s0, $s0, 4 +/* 823A40 80240780 0220202D */ daddu $a0, $s1, $zero +/* 823A44 80240784 0C0B210B */ jal get_float_variable +/* 823A48 80240788 46000706 */ mov.s $f28, $f0 +/* 823A4C 8024078C 8E050000 */ lw $a1, ($s0) +/* 823A50 80240790 26100004 */ addiu $s0, $s0, 4 +/* 823A54 80240794 0220202D */ daddu $a0, $s1, $zero +/* 823A58 80240798 0C0B210B */ jal get_float_variable +/* 823A5C 8024079C 46000686 */ mov.s $f26, $f0 +/* 823A60 802407A0 0220202D */ daddu $a0, $s1, $zero +/* 823A64 802407A4 8E050000 */ lw $a1, ($s0) +/* 823A68 802407A8 0C0B210B */ jal get_float_variable +/* 823A6C 802407AC 46000586 */ mov.s $f22, $f0 +/* 823A70 802407B0 0240202D */ daddu $a0, $s2, $zero +/* 823A74 802407B4 0C046B4C */ jal get_model_from_list_index +/* 823A78 802407B8 46000606 */ mov.s $f24, $f0 +/* 823A7C 802407BC 0040882D */ daddu $s1, $v0, $zero +/* 823A80 802407C0 96220000 */ lhu $v0, ($s1) +/* 823A84 802407C4 30420400 */ andi $v0, $v0, 0x400 +/* 823A88 802407C8 1440001E */ bnez $v0, .L80240844 +/* 823A8C 802407CC 26300058 */ addiu $s0, $s1, 0x58 +/* 823A90 802407D0 4480A000 */ mtc1 $zero, $f20 +/* 823A94 802407D4 4406B000 */ mfc1 $a2, $f22 +/* 823A98 802407D8 4405A000 */ mfc1 $a1, $f20 +/* 823A9C 802407DC 4407A000 */ mfc1 $a3, $f20 +/* 823AA0 802407E0 0C019E40 */ jal guTranslateF +/* 823AA4 802407E4 0200202D */ daddu $a0, $s0, $zero +/* 823AA8 802407E8 4405E000 */ mfc1 $a1, $f28 +/* 823AAC 802407EC 4406D000 */ mfc1 $a2, $f26 +/* 823AB0 802407F0 4407C000 */ mfc1 $a3, $f24 +/* 823AB4 802407F4 0C0901AC */ jal func_802406B0_823970 +/* 823AB8 802407F8 27A40010 */ addiu $a0, $sp, 0x10 +/* 823ABC 802407FC 27A40010 */ addiu $a0, $sp, 0x10 +/* 823AC0 80240800 0200282D */ daddu $a1, $s0, $zero +/* 823AC4 80240804 0C019D80 */ jal guMtxCatF +/* 823AC8 80240808 0200302D */ daddu $a2, $s0, $zero +/* 823ACC 8024080C 27A40010 */ addiu $a0, $sp, 0x10 +/* 823AD0 80240810 4600B587 */ neg.s $f22, $f22 +/* 823AD4 80240814 4405A000 */ mfc1 $a1, $f20 +/* 823AD8 80240818 4406B000 */ mfc1 $a2, $f22 +/* 823ADC 8024081C 0C019E40 */ jal guTranslateF +/* 823AE0 80240820 00A0382D */ daddu $a3, $a1, $zero +/* 823AE4 80240824 27A40010 */ addiu $a0, $sp, 0x10 +/* 823AE8 80240828 0200282D */ daddu $a1, $s0, $zero +/* 823AEC 8024082C 0C019D80 */ jal guMtxCatF +/* 823AF0 80240830 00A0302D */ daddu $a2, $a1, $zero +/* 823AF4 80240834 96220000 */ lhu $v0, ($s1) +/* 823AF8 80240838 34421400 */ ori $v0, $v0, 0x1400 +/* 823AFC 8024083C 0809022F */ j .L802408BC +/* 823B00 80240840 A6220000 */ sh $v0, ($s1) +.L80240844: +/* 823B04 80240844 4480A000 */ mtc1 $zero, $f20 +/* 823B08 80240848 4406B000 */ mfc1 $a2, $f22 +/* 823B0C 8024084C 4405A000 */ mfc1 $a1, $f20 +/* 823B10 80240850 4407A000 */ mfc1 $a3, $f20 +/* 823B14 80240854 0C019E40 */ jal guTranslateF +/* 823B18 80240858 27A40010 */ addiu $a0, $sp, 0x10 +/* 823B1C 8024085C 27A40010 */ addiu $a0, $sp, 0x10 +/* 823B20 80240860 26300058 */ addiu $s0, $s1, 0x58 +/* 823B24 80240864 0200282D */ daddu $a1, $s0, $zero +/* 823B28 80240868 0C019D80 */ jal guMtxCatF +/* 823B2C 8024086C 0200302D */ daddu $a2, $s0, $zero +/* 823B30 80240870 4405E000 */ mfc1 $a1, $f28 +/* 823B34 80240874 4406D000 */ mfc1 $a2, $f26 +/* 823B38 80240878 4407C000 */ mfc1 $a3, $f24 +/* 823B3C 8024087C 0C0901AC */ jal func_802406B0_823970 +/* 823B40 80240880 27A40010 */ addiu $a0, $sp, 0x10 +/* 823B44 80240884 27A40010 */ addiu $a0, $sp, 0x10 +/* 823B48 80240888 0200282D */ daddu $a1, $s0, $zero +/* 823B4C 8024088C 0C019D80 */ jal guMtxCatF +/* 823B50 80240890 0200302D */ daddu $a2, $s0, $zero +/* 823B54 80240894 27A40010 */ addiu $a0, $sp, 0x10 +/* 823B58 80240898 4600B587 */ neg.s $f22, $f22 +/* 823B5C 8024089C 4405A000 */ mfc1 $a1, $f20 +/* 823B60 802408A0 4406B000 */ mfc1 $a2, $f22 +/* 823B64 802408A4 0C019E40 */ jal guTranslateF +/* 823B68 802408A8 00A0382D */ daddu $a3, $a1, $zero +/* 823B6C 802408AC 27A40010 */ addiu $a0, $sp, 0x10 +/* 823B70 802408B0 0200282D */ daddu $a1, $s0, $zero +/* 823B74 802408B4 0C019D80 */ jal guMtxCatF +/* 823B78 802408B8 00A0302D */ daddu $a2, $a1, $zero +.L802408BC: +/* 823B7C 802408BC 8FBF005C */ lw $ra, 0x5c($sp) +/* 823B80 802408C0 8FB20058 */ lw $s2, 0x58($sp) +/* 823B84 802408C4 8FB10054 */ lw $s1, 0x54($sp) +/* 823B88 802408C8 8FB00050 */ lw $s0, 0x50($sp) +/* 823B8C 802408CC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 823B90 802408D0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 823B94 802408D4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 823B98 802408D8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 823B9C 802408DC D7B40060 */ ldc1 $f20, 0x60($sp) +/* 823BA0 802408E0 24020002 */ addiu $v0, $zero, 2 +/* 823BA4 802408E4 03E00008 */ jr $ra +/* 823BA8 802408E8 27BD0088 */ addiu $sp, $sp, 0x88 +/* 823BAC 802408EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0.s b/asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0.s deleted file mode 100644 index cd405107eb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F0 -/* 823BB0 802408F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 823BB4 802408F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 823BB8 802408F8 0C04417A */ jal get_entity_by_index -/* 823BBC 802408FC 8C840084 */ lw $a0, 0x84($a0) -/* 823BC0 80240900 0040182D */ daddu $v1, $v0, $zero -/* 823BC4 80240904 8C640000 */ lw $a0, ($v1) -/* 823BC8 80240908 3C050010 */ lui $a1, 0x10 -/* 823BCC 8024090C 00852025 */ or $a0, $a0, $a1 -/* 823BD0 80240910 AC640000 */ sw $a0, ($v1) -/* 823BD4 80240914 8FBF0010 */ lw $ra, 0x10($sp) -/* 823BD8 80240918 24020002 */ addiu $v0, $zero, 2 -/* 823BDC 8024091C 03E00008 */ jr $ra -/* 823BE0 80240920 27BD0018 */ addiu $sp, $sp, 0x18 -/* 823BE4 80240924 00000000 */ nop -/* 823BE8 80240928 00000000 */ nop -/* 823BEC 8024092C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0_823BB0.s b/asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0_823BB0.s new file mode 100644 index 0000000000..f856334491 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BB0/func_802408F0_823BB0.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408F0_823BB0 +/* 823BB0 802408F0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 823BB4 802408F4 AFBF0010 */ sw $ra, 0x10($sp) +/* 823BB8 802408F8 0C04417A */ jal get_entity_by_index +/* 823BBC 802408FC 8C840084 */ lw $a0, 0x84($a0) +/* 823BC0 80240900 0040182D */ daddu $v1, $v0, $zero +/* 823BC4 80240904 8C640000 */ lw $a0, ($v1) +/* 823BC8 80240908 3C050010 */ lui $a1, 0x10 +/* 823BCC 8024090C 00852025 */ or $a0, $a0, $a1 +/* 823BD0 80240910 AC640000 */ sw $a0, ($v1) +/* 823BD4 80240914 8FBF0010 */ lw $ra, 0x10($sp) +/* 823BD8 80240918 24020002 */ addiu $v0, $zero, 2 +/* 823BDC 8024091C 03E00008 */ jr $ra +/* 823BE0 80240920 27BD0018 */ addiu $sp, $sp, 0x18 +/* 823BE4 80240924 00000000 */ nop +/* 823BE8 80240928 00000000 */ nop +/* 823BEC 8024092C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930.s deleted file mode 100644 index 76fc387541..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240930 -/* 823BF0 80240930 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 823BF4 80240934 AFB50024 */ sw $s5, 0x24($sp) -/* 823BF8 80240938 0080A82D */ daddu $s5, $a0, $zero -/* 823BFC 8024093C AFBF002C */ sw $ra, 0x2c($sp) -/* 823C00 80240940 AFB60028 */ sw $s6, 0x28($sp) -/* 823C04 80240944 AFB40020 */ sw $s4, 0x20($sp) -/* 823C08 80240948 AFB3001C */ sw $s3, 0x1c($sp) -/* 823C0C 8024094C AFB20018 */ sw $s2, 0x18($sp) -/* 823C10 80240950 AFB10014 */ sw $s1, 0x14($sp) -/* 823C14 80240954 AFB00010 */ sw $s0, 0x10($sp) -/* 823C18 80240958 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 823C1C 8024095C F7B60038 */ sdc1 $f22, 0x38($sp) -/* 823C20 80240960 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 823C24 80240964 8EB30148 */ lw $s3, 0x148($s5) -/* 823C28 80240968 86640008 */ lh $a0, 8($s3) -/* 823C2C 8024096C 0C00EABB */ jal get_npc_unsafe -/* 823C30 80240970 00A0B02D */ daddu $s6, $a1, $zero -/* 823C34 80240974 0040A02D */ daddu $s4, $v0, $zero -/* 823C38 80240978 AEA00074 */ sw $zero, 0x74($s5) -/* 823C3C 8024097C C6980038 */ lwc1 $f24, 0x38($s4) -/* 823C40 80240980 C6960040 */ lwc1 $f22, 0x40($s4) -/* 823C44 80240984 0000902D */ daddu $s2, $zero, $zero -/* 823C48 80240988 AEA00078 */ sw $zero, 0x78($s5) -/* 823C4C 8024098C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 823C50 80240990 8C620000 */ lw $v0, ($v1) -/* 823C54 80240994 3C0146FF */ lui $at, 0x46ff -/* 823C58 80240998 3421FE00 */ ori $at, $at, 0xfe00 -/* 823C5C 8024099C 4481A000 */ mtc1 $at, $f20 -/* 823C60 802409A0 18400018 */ blez $v0, .L80240A04 -/* 823C64 802409A4 0240802D */ daddu $s0, $s2, $zero -/* 823C68 802409A8 0240882D */ daddu $s1, $s2, $zero -.L802409AC: -/* 823C6C 802409AC 02231021 */ addu $v0, $s1, $v1 -/* 823C70 802409B0 4600C306 */ mov.s $f12, $f24 -/* 823C74 802409B4 C4440004 */ lwc1 $f4, 4($v0) -/* 823C78 802409B8 46802120 */ cvt.s.w $f4, $f4 -/* 823C7C 802409BC 44062000 */ mfc1 $a2, $f4 -/* 823C80 802409C0 C444000C */ lwc1 $f4, 0xc($v0) -/* 823C84 802409C4 46802120 */ cvt.s.w $f4, $f4 -/* 823C88 802409C8 44072000 */ mfc1 $a3, $f4 -/* 823C8C 802409CC 0C00A7B5 */ jal dist2D -/* 823C90 802409D0 4600B386 */ mov.s $f14, $f22 -/* 823C94 802409D4 4614003C */ c.lt.s $f0, $f20 -/* 823C98 802409D8 00000000 */ nop -/* 823C9C 802409DC 45000003 */ bc1f .L802409EC -/* 823CA0 802409E0 2631000C */ addiu $s1, $s1, 0xc -/* 823CA4 802409E4 46000506 */ mov.s $f20, $f0 -/* 823CA8 802409E8 AEB20078 */ sw $s2, 0x78($s5) -.L802409EC: -/* 823CAC 802409EC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 823CB0 802409F0 26100001 */ addiu $s0, $s0, 1 -/* 823CB4 802409F4 8C620000 */ lw $v0, ($v1) -/* 823CB8 802409F8 0202102A */ slt $v0, $s0, $v0 -/* 823CBC 802409FC 1440FFEB */ bnez $v0, .L802409AC -/* 823CC0 80240A00 26520001 */ addiu $s2, $s2, 1 -.L80240A04: -/* 823CC4 80240A04 8E6200CC */ lw $v0, 0xcc($s3) -/* 823CC8 80240A08 8C420004 */ lw $v0, 4($v0) -/* 823CCC 80240A0C AE820028 */ sw $v0, 0x28($s4) -/* 823CD0 80240A10 8E6200D0 */ lw $v0, 0xd0($s3) -/* 823CD4 80240A14 8C42007C */ lw $v0, 0x7c($v0) -/* 823CD8 80240A18 04410004 */ bgez $v0, .L80240A2C -/* 823CDC 80240A1C 00000000 */ nop -/* 823CE0 80240A20 C6C00000 */ lwc1 $f0, ($s6) -/* 823CE4 80240A24 08090293 */ j .L80240A4C -/* 823CE8 80240A28 E6800018 */ swc1 $f0, 0x18($s4) -.L80240A2C: -/* 823CEC 80240A2C 3C018025 */ lui $at, 0x8025 -/* 823CF0 80240A30 D422E200 */ ldc1 $f2, -0x1e00($at) -/* 823CF4 80240A34 44820000 */ mtc1 $v0, $f0 -/* 823CF8 80240A38 00000000 */ nop -/* 823CFC 80240A3C 46800021 */ cvt.d.w $f0, $f0 -/* 823D00 80240A40 46220003 */ div.d $f0, $f0, $f2 -/* 823D04 80240A44 46200020 */ cvt.s.d $f0, $f0 -/* 823D08 80240A48 E6800018 */ swc1 $f0, 0x18($s4) -.L80240A4C: -/* 823D0C 80240A4C 24020001 */ addiu $v0, $zero, 1 -/* 823D10 80240A50 AEA20070 */ sw $v0, 0x70($s5) -/* 823D14 80240A54 8FBF002C */ lw $ra, 0x2c($sp) -/* 823D18 80240A58 8FB60028 */ lw $s6, 0x28($sp) -/* 823D1C 80240A5C 8FB50024 */ lw $s5, 0x24($sp) -/* 823D20 80240A60 8FB40020 */ lw $s4, 0x20($sp) -/* 823D24 80240A64 8FB3001C */ lw $s3, 0x1c($sp) -/* 823D28 80240A68 8FB20018 */ lw $s2, 0x18($sp) -/* 823D2C 80240A6C 8FB10014 */ lw $s1, 0x14($sp) -/* 823D30 80240A70 8FB00010 */ lw $s0, 0x10($sp) -/* 823D34 80240A74 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 823D38 80240A78 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 823D3C 80240A7C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 823D40 80240A80 03E00008 */ jr $ra -/* 823D44 80240A84 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s new file mode 100644 index 0000000000..8fb7422c7d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240930_823BF0.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240930_823BF0 +/* 823BF0 80240930 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 823BF4 80240934 AFB50024 */ sw $s5, 0x24($sp) +/* 823BF8 80240938 0080A82D */ daddu $s5, $a0, $zero +/* 823BFC 8024093C AFBF002C */ sw $ra, 0x2c($sp) +/* 823C00 80240940 AFB60028 */ sw $s6, 0x28($sp) +/* 823C04 80240944 AFB40020 */ sw $s4, 0x20($sp) +/* 823C08 80240948 AFB3001C */ sw $s3, 0x1c($sp) +/* 823C0C 8024094C AFB20018 */ sw $s2, 0x18($sp) +/* 823C10 80240950 AFB10014 */ sw $s1, 0x14($sp) +/* 823C14 80240954 AFB00010 */ sw $s0, 0x10($sp) +/* 823C18 80240958 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 823C1C 8024095C F7B60038 */ sdc1 $f22, 0x38($sp) +/* 823C20 80240960 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 823C24 80240964 8EB30148 */ lw $s3, 0x148($s5) +/* 823C28 80240968 86640008 */ lh $a0, 8($s3) +/* 823C2C 8024096C 0C00EABB */ jal get_npc_unsafe +/* 823C30 80240970 00A0B02D */ daddu $s6, $a1, $zero +/* 823C34 80240974 0040A02D */ daddu $s4, $v0, $zero +/* 823C38 80240978 AEA00074 */ sw $zero, 0x74($s5) +/* 823C3C 8024097C C6980038 */ lwc1 $f24, 0x38($s4) +/* 823C40 80240980 C6960040 */ lwc1 $f22, 0x40($s4) +/* 823C44 80240984 0000902D */ daddu $s2, $zero, $zero +/* 823C48 80240988 AEA00078 */ sw $zero, 0x78($s5) +/* 823C4C 8024098C 8E6300D0 */ lw $v1, 0xd0($s3) +/* 823C50 80240990 8C620000 */ lw $v0, ($v1) +/* 823C54 80240994 3C0146FF */ lui $at, 0x46ff +/* 823C58 80240998 3421FE00 */ ori $at, $at, 0xfe00 +/* 823C5C 8024099C 4481A000 */ mtc1 $at, $f20 +/* 823C60 802409A0 18400018 */ blez $v0, .L80240A04 +/* 823C64 802409A4 0240802D */ daddu $s0, $s2, $zero +/* 823C68 802409A8 0240882D */ daddu $s1, $s2, $zero +.L802409AC: +/* 823C6C 802409AC 02231021 */ addu $v0, $s1, $v1 +/* 823C70 802409B0 4600C306 */ mov.s $f12, $f24 +/* 823C74 802409B4 C4440004 */ lwc1 $f4, 4($v0) +/* 823C78 802409B8 46802120 */ cvt.s.w $f4, $f4 +/* 823C7C 802409BC 44062000 */ mfc1 $a2, $f4 +/* 823C80 802409C0 C444000C */ lwc1 $f4, 0xc($v0) +/* 823C84 802409C4 46802120 */ cvt.s.w $f4, $f4 +/* 823C88 802409C8 44072000 */ mfc1 $a3, $f4 +/* 823C8C 802409CC 0C00A7B5 */ jal dist2D +/* 823C90 802409D0 4600B386 */ mov.s $f14, $f22 +/* 823C94 802409D4 4614003C */ c.lt.s $f0, $f20 +/* 823C98 802409D8 00000000 */ nop +/* 823C9C 802409DC 45000003 */ bc1f .L802409EC +/* 823CA0 802409E0 2631000C */ addiu $s1, $s1, 0xc +/* 823CA4 802409E4 46000506 */ mov.s $f20, $f0 +/* 823CA8 802409E8 AEB20078 */ sw $s2, 0x78($s5) +.L802409EC: +/* 823CAC 802409EC 8E6300D0 */ lw $v1, 0xd0($s3) +/* 823CB0 802409F0 26100001 */ addiu $s0, $s0, 1 +/* 823CB4 802409F4 8C620000 */ lw $v0, ($v1) +/* 823CB8 802409F8 0202102A */ slt $v0, $s0, $v0 +/* 823CBC 802409FC 1440FFEB */ bnez $v0, .L802409AC +/* 823CC0 80240A00 26520001 */ addiu $s2, $s2, 1 +.L80240A04: +/* 823CC4 80240A04 8E6200CC */ lw $v0, 0xcc($s3) +/* 823CC8 80240A08 8C420004 */ lw $v0, 4($v0) +/* 823CCC 80240A0C AE820028 */ sw $v0, 0x28($s4) +/* 823CD0 80240A10 8E6200D0 */ lw $v0, 0xd0($s3) +/* 823CD4 80240A14 8C42007C */ lw $v0, 0x7c($v0) +/* 823CD8 80240A18 04410004 */ bgez $v0, .L80240A2C +/* 823CDC 80240A1C 00000000 */ nop +/* 823CE0 80240A20 C6C00000 */ lwc1 $f0, ($s6) +/* 823CE4 80240A24 08090293 */ j .L80240A4C +/* 823CE8 80240A28 E6800018 */ swc1 $f0, 0x18($s4) +.L80240A2C: +/* 823CEC 80240A2C 3C018025 */ lui $at, 0x8025 +/* 823CF0 80240A30 D422E200 */ ldc1 $f2, -0x1e00($at) +/* 823CF4 80240A34 44820000 */ mtc1 $v0, $f0 +/* 823CF8 80240A38 00000000 */ nop +/* 823CFC 80240A3C 46800021 */ cvt.d.w $f0, $f0 +/* 823D00 80240A40 46220003 */ div.d $f0, $f0, $f2 +/* 823D04 80240A44 46200020 */ cvt.s.d $f0, $f0 +/* 823D08 80240A48 E6800018 */ swc1 $f0, 0x18($s4) +.L80240A4C: +/* 823D0C 80240A4C 24020001 */ addiu $v0, $zero, 1 +/* 823D10 80240A50 AEA20070 */ sw $v0, 0x70($s5) +/* 823D14 80240A54 8FBF002C */ lw $ra, 0x2c($sp) +/* 823D18 80240A58 8FB60028 */ lw $s6, 0x28($sp) +/* 823D1C 80240A5C 8FB50024 */ lw $s5, 0x24($sp) +/* 823D20 80240A60 8FB40020 */ lw $s4, 0x20($sp) +/* 823D24 80240A64 8FB3001C */ lw $s3, 0x1c($sp) +/* 823D28 80240A68 8FB20018 */ lw $s2, 0x18($sp) +/* 823D2C 80240A6C 8FB10014 */ lw $s1, 0x14($sp) +/* 823D30 80240A70 8FB00010 */ lw $s0, 0x10($sp) +/* 823D34 80240A74 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 823D38 80240A78 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 823D3C 80240A7C D7B40030 */ ldc1 $f20, 0x30($sp) +/* 823D40 80240A80 03E00008 */ jr $ra +/* 823D44 80240A84 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88.s deleted file mode 100644 index 83822eef5a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88.s +++ /dev/null @@ -1,183 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A88 -/* 823D48 80240A88 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 823D4C 80240A8C AFB20038 */ sw $s2, 0x38($sp) -/* 823D50 80240A90 0080902D */ daddu $s2, $a0, $zero -/* 823D54 80240A94 AFBF0044 */ sw $ra, 0x44($sp) -/* 823D58 80240A98 AFB40040 */ sw $s4, 0x40($sp) -/* 823D5C 80240A9C AFB3003C */ sw $s3, 0x3c($sp) -/* 823D60 80240AA0 AFB10034 */ sw $s1, 0x34($sp) -/* 823D64 80240AA4 AFB00030 */ sw $s0, 0x30($sp) -/* 823D68 80240AA8 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 823D6C 80240AAC F7B40048 */ sdc1 $f20, 0x48($sp) -/* 823D70 80240AB0 8E510148 */ lw $s1, 0x148($s2) -/* 823D74 80240AB4 00A0982D */ daddu $s3, $a1, $zero -/* 823D78 80240AB8 86240008 */ lh $a0, 8($s1) -/* 823D7C 80240ABC 0C00EABB */ jal get_npc_unsafe -/* 823D80 80240AC0 00C0A02D */ daddu $s4, $a2, $zero -/* 823D84 80240AC4 8E630014 */ lw $v1, 0x14($s3) -/* 823D88 80240AC8 04600030 */ bltz $v1, .L80240B8C -/* 823D8C 80240ACC 0040802D */ daddu $s0, $v0, $zero -/* 823D90 80240AD0 8E420074 */ lw $v0, 0x74($s2) -/* 823D94 80240AD4 1C40002C */ bgtz $v0, .L80240B88 -/* 823D98 80240AD8 2442FFFF */ addiu $v0, $v0, -1 -/* 823D9C 80240ADC 0280202D */ daddu $a0, $s4, $zero -/* 823DA0 80240AE0 AE430074 */ sw $v1, 0x74($s2) -/* 823DA4 80240AE4 AFA00010 */ sw $zero, 0x10($sp) -/* 823DA8 80240AE8 8E66000C */ lw $a2, 0xc($s3) -/* 823DAC 80240AEC 8E670010 */ lw $a3, 0x10($s3) -/* 823DB0 80240AF0 0C01242D */ jal func_800490B4 -/* 823DB4 80240AF4 0220282D */ daddu $a1, $s1, $zero -/* 823DB8 80240AF8 10400021 */ beqz $v0, .L80240B80 -/* 823DBC 80240AFC 0000202D */ daddu $a0, $zero, $zero -/* 823DC0 80240B00 0200282D */ daddu $a1, $s0, $zero -/* 823DC4 80240B04 0000302D */ daddu $a2, $zero, $zero -/* 823DC8 80240B08 860300A8 */ lh $v1, 0xa8($s0) -/* 823DCC 80240B0C 3C013F80 */ lui $at, 0x3f80 -/* 823DD0 80240B10 44810000 */ mtc1 $at, $f0 -/* 823DD4 80240B14 3C014000 */ lui $at, 0x4000 -/* 823DD8 80240B18 44811000 */ mtc1 $at, $f2 -/* 823DDC 80240B1C 3C01C1A0 */ lui $at, 0xc1a0 -/* 823DE0 80240B20 44812000 */ mtc1 $at, $f4 -/* 823DE4 80240B24 2402000F */ addiu $v0, $zero, 0xf -/* 823DE8 80240B28 AFA2001C */ sw $v0, 0x1c($sp) -/* 823DEC 80240B2C 44833000 */ mtc1 $v1, $f6 -/* 823DF0 80240B30 00000000 */ nop -/* 823DF4 80240B34 468031A0 */ cvt.s.w $f6, $f6 -/* 823DF8 80240B38 44073000 */ mfc1 $a3, $f6 -/* 823DFC 80240B3C 27A20028 */ addiu $v0, $sp, 0x28 -/* 823E00 80240B40 AFA20020 */ sw $v0, 0x20($sp) -/* 823E04 80240B44 E7A00010 */ swc1 $f0, 0x10($sp) -/* 823E08 80240B48 E7A20014 */ swc1 $f2, 0x14($sp) -/* 823E0C 80240B4C 0C01BFA4 */ jal fx_emote -/* 823E10 80240B50 E7A40018 */ swc1 $f4, 0x18($sp) -/* 823E14 80240B54 0200202D */ daddu $a0, $s0, $zero -/* 823E18 80240B58 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 823E1C 80240B5C 0C012530 */ jal func_800494C0 -/* 823E20 80240B60 3C060020 */ lui $a2, 0x20 -/* 823E24 80240B64 8E220018 */ lw $v0, 0x18($s1) -/* 823E28 80240B68 9442002A */ lhu $v0, 0x2a($v0) -/* 823E2C 80240B6C 30420001 */ andi $v0, $v0, 1 -/* 823E30 80240B70 14400064 */ bnez $v0, .L80240D04 -/* 823E34 80240B74 2402000A */ addiu $v0, $zero, 0xa -/* 823E38 80240B78 08090341 */ j .L80240D04 -/* 823E3C 80240B7C 2402000C */ addiu $v0, $zero, 0xc -.L80240B80: -/* 823E40 80240B80 8E420074 */ lw $v0, 0x74($s2) -/* 823E44 80240B84 2442FFFF */ addiu $v0, $v0, -1 -.L80240B88: -/* 823E48 80240B88 AE420074 */ sw $v0, 0x74($s2) -.L80240B8C: -/* 823E4C 80240B8C 8602008C */ lh $v0, 0x8c($s0) -/* 823E50 80240B90 1440005D */ bnez $v0, .L80240D08 -/* 823E54 80240B94 00000000 */ nop -/* 823E58 80240B98 C6000018 */ lwc1 $f0, 0x18($s0) -/* 823E5C 80240B9C 3C014010 */ lui $at, 0x4010 -/* 823E60 80240BA0 44811800 */ mtc1 $at, $f3 -/* 823E64 80240BA4 44801000 */ mtc1 $zero, $f2 -/* 823E68 80240BA8 46000021 */ cvt.d.s $f0, $f0 -/* 823E6C 80240BAC 4622003C */ c.lt.d $f0, $f2 -/* 823E70 80240BB0 00000000 */ nop -/* 823E74 80240BB4 45000003 */ bc1f .L80240BC4 -/* 823E78 80240BB8 0200202D */ daddu $a0, $s0, $zero -/* 823E7C 80240BBC 080902F2 */ j .L80240BC8 -/* 823E80 80240BC0 0000282D */ daddu $a1, $zero, $zero -.L80240BC4: -/* 823E84 80240BC4 24050001 */ addiu $a1, $zero, 1 -.L80240BC8: -/* 823E88 80240BC8 0C00F598 */ jal func_8003D660 -/* 823E8C 80240BCC 00000000 */ nop -/* 823E90 80240BD0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 823E94 80240BD4 8E430078 */ lw $v1, 0x78($s2) -/* 823E98 80240BD8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 823E9C 80240BDC 00031040 */ sll $v0, $v1, 1 -/* 823EA0 80240BE0 00431021 */ addu $v0, $v0, $v1 -/* 823EA4 80240BE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 823EA8 80240BE8 00021080 */ sll $v0, $v0, 2 -/* 823EAC 80240BEC 00431021 */ addu $v0, $v0, $v1 -/* 823EB0 80240BF0 C4560004 */ lwc1 $f22, 4($v0) -/* 823EB4 80240BF4 4680B5A0 */ cvt.s.w $f22, $f22 -/* 823EB8 80240BF8 C454000C */ lwc1 $f20, 0xc($v0) -/* 823EBC 80240BFC 4680A520 */ cvt.s.w $f20, $f20 -/* 823EC0 80240C00 4406B000 */ mfc1 $a2, $f22 -/* 823EC4 80240C04 4407A000 */ mfc1 $a3, $f20 -/* 823EC8 80240C08 0C00A720 */ jal atan2 -/* 823ECC 80240C0C 00000000 */ nop -/* 823ED0 80240C10 8E050018 */ lw $a1, 0x18($s0) -/* 823ED4 80240C14 44060000 */ mfc1 $a2, $f0 -/* 823ED8 80240C18 0200202D */ daddu $a0, $s0, $zero -/* 823EDC 80240C1C 0C00EA95 */ jal npc_move_heading -/* 823EE0 80240C20 AE06000C */ sw $a2, 0xc($s0) -/* 823EE4 80240C24 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 823EE8 80240C28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 823EEC 80240C2C 4406B000 */ mfc1 $a2, $f22 -/* 823EF0 80240C30 4407A000 */ mfc1 $a3, $f20 -/* 823EF4 80240C34 0C00A7B5 */ jal dist2D -/* 823EF8 80240C38 00000000 */ nop -/* 823EFC 80240C3C C6020018 */ lwc1 $f2, 0x18($s0) -/* 823F00 80240C40 4602003E */ c.le.s $f0, $f2 -/* 823F04 80240C44 00000000 */ nop -/* 823F08 80240C48 4500002F */ bc1f .L80240D08 -/* 823F0C 80240C4C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 823F10 80240C50 24020002 */ addiu $v0, $zero, 2 -/* 823F14 80240C54 0C00A67F */ jal rand_int -/* 823F18 80240C58 AE420070 */ sw $v0, 0x70($s2) -/* 823F1C 80240C5C 3C035555 */ lui $v1, 0x5555 -/* 823F20 80240C60 34635556 */ ori $v1, $v1, 0x5556 -/* 823F24 80240C64 00430018 */ mult $v0, $v1 -/* 823F28 80240C68 000227C3 */ sra $a0, $v0, 0x1f -/* 823F2C 80240C6C 00004010 */ mfhi $t0 -/* 823F30 80240C70 01042023 */ subu $a0, $t0, $a0 -/* 823F34 80240C74 00041840 */ sll $v1, $a0, 1 -/* 823F38 80240C78 00641821 */ addu $v1, $v1, $a0 -/* 823F3C 80240C7C 00431023 */ subu $v0, $v0, $v1 -/* 823F40 80240C80 24430002 */ addiu $v1, $v0, 2 -/* 823F44 80240C84 AE430074 */ sw $v1, 0x74($s2) -/* 823F48 80240C88 8E62002C */ lw $v0, 0x2c($s3) -/* 823F4C 80240C8C 18400009 */ blez $v0, .L80240CB4 -/* 823F50 80240C90 24020004 */ addiu $v0, $zero, 4 -/* 823F54 80240C94 8E620004 */ lw $v0, 4($s3) -/* 823F58 80240C98 18400006 */ blez $v0, .L80240CB4 -/* 823F5C 80240C9C 24020004 */ addiu $v0, $zero, 4 -/* 823F60 80240CA0 8E620008 */ lw $v0, 8($s3) -/* 823F64 80240CA4 18400003 */ blez $v0, .L80240CB4 -/* 823F68 80240CA8 24020004 */ addiu $v0, $zero, 4 -/* 823F6C 80240CAC 14600002 */ bnez $v1, .L80240CB8 -/* 823F70 80240CB0 00000000 */ nop -.L80240CB4: -/* 823F74 80240CB4 AE420070 */ sw $v0, 0x70($s2) -.L80240CB8: -/* 823F78 80240CB8 0C00A67F */ jal rand_int -/* 823F7C 80240CBC 24042710 */ addiu $a0, $zero, 0x2710 -/* 823F80 80240CC0 3C0351EB */ lui $v1, 0x51eb -/* 823F84 80240CC4 3463851F */ ori $v1, $v1, 0x851f -/* 823F88 80240CC8 00430018 */ mult $v0, $v1 -/* 823F8C 80240CCC 00021FC3 */ sra $v1, $v0, 0x1f -/* 823F90 80240CD0 00004010 */ mfhi $t0 -/* 823F94 80240CD4 00082143 */ sra $a0, $t0, 5 -/* 823F98 80240CD8 00832023 */ subu $a0, $a0, $v1 -/* 823F9C 80240CDC 00041840 */ sll $v1, $a0, 1 -/* 823FA0 80240CE0 00641821 */ addu $v1, $v1, $a0 -/* 823FA4 80240CE4 000318C0 */ sll $v1, $v1, 3 -/* 823FA8 80240CE8 00641821 */ addu $v1, $v1, $a0 -/* 823FAC 80240CEC 00031880 */ sll $v1, $v1, 2 -/* 823FB0 80240CF0 8E640004 */ lw $a0, 4($s3) -/* 823FB4 80240CF4 00431023 */ subu $v0, $v0, $v1 -/* 823FB8 80240CF8 0044102A */ slt $v0, $v0, $a0 -/* 823FBC 80240CFC 10400002 */ beqz $v0, .L80240D08 -/* 823FC0 80240D00 24020004 */ addiu $v0, $zero, 4 -.L80240D04: -/* 823FC4 80240D04 AE420070 */ sw $v0, 0x70($s2) -.L80240D08: -/* 823FC8 80240D08 8FBF0044 */ lw $ra, 0x44($sp) -/* 823FCC 80240D0C 8FB40040 */ lw $s4, 0x40($sp) -/* 823FD0 80240D10 8FB3003C */ lw $s3, 0x3c($sp) -/* 823FD4 80240D14 8FB20038 */ lw $s2, 0x38($sp) -/* 823FD8 80240D18 8FB10034 */ lw $s1, 0x34($sp) -/* 823FDC 80240D1C 8FB00030 */ lw $s0, 0x30($sp) -/* 823FE0 80240D20 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 823FE4 80240D24 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 823FE8 80240D28 03E00008 */ jr $ra -/* 823FEC 80240D2C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s new file mode 100644 index 0000000000..c214f1dbe3 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240A88_823D48.s @@ -0,0 +1,183 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A88_823D48 +/* 823D48 80240A88 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* 823D4C 80240A8C AFB20038 */ sw $s2, 0x38($sp) +/* 823D50 80240A90 0080902D */ daddu $s2, $a0, $zero +/* 823D54 80240A94 AFBF0044 */ sw $ra, 0x44($sp) +/* 823D58 80240A98 AFB40040 */ sw $s4, 0x40($sp) +/* 823D5C 80240A9C AFB3003C */ sw $s3, 0x3c($sp) +/* 823D60 80240AA0 AFB10034 */ sw $s1, 0x34($sp) +/* 823D64 80240AA4 AFB00030 */ sw $s0, 0x30($sp) +/* 823D68 80240AA8 F7B60050 */ sdc1 $f22, 0x50($sp) +/* 823D6C 80240AAC F7B40048 */ sdc1 $f20, 0x48($sp) +/* 823D70 80240AB0 8E510148 */ lw $s1, 0x148($s2) +/* 823D74 80240AB4 00A0982D */ daddu $s3, $a1, $zero +/* 823D78 80240AB8 86240008 */ lh $a0, 8($s1) +/* 823D7C 80240ABC 0C00EABB */ jal get_npc_unsafe +/* 823D80 80240AC0 00C0A02D */ daddu $s4, $a2, $zero +/* 823D84 80240AC4 8E630014 */ lw $v1, 0x14($s3) +/* 823D88 80240AC8 04600030 */ bltz $v1, .L80240B8C +/* 823D8C 80240ACC 0040802D */ daddu $s0, $v0, $zero +/* 823D90 80240AD0 8E420074 */ lw $v0, 0x74($s2) +/* 823D94 80240AD4 1C40002C */ bgtz $v0, .L80240B88 +/* 823D98 80240AD8 2442FFFF */ addiu $v0, $v0, -1 +/* 823D9C 80240ADC 0280202D */ daddu $a0, $s4, $zero +/* 823DA0 80240AE0 AE430074 */ sw $v1, 0x74($s2) +/* 823DA4 80240AE4 AFA00010 */ sw $zero, 0x10($sp) +/* 823DA8 80240AE8 8E66000C */ lw $a2, 0xc($s3) +/* 823DAC 80240AEC 8E670010 */ lw $a3, 0x10($s3) +/* 823DB0 80240AF0 0C01242D */ jal func_800490B4 +/* 823DB4 80240AF4 0220282D */ daddu $a1, $s1, $zero +/* 823DB8 80240AF8 10400021 */ beqz $v0, .L80240B80 +/* 823DBC 80240AFC 0000202D */ daddu $a0, $zero, $zero +/* 823DC0 80240B00 0200282D */ daddu $a1, $s0, $zero +/* 823DC4 80240B04 0000302D */ daddu $a2, $zero, $zero +/* 823DC8 80240B08 860300A8 */ lh $v1, 0xa8($s0) +/* 823DCC 80240B0C 3C013F80 */ lui $at, 0x3f80 +/* 823DD0 80240B10 44810000 */ mtc1 $at, $f0 +/* 823DD4 80240B14 3C014000 */ lui $at, 0x4000 +/* 823DD8 80240B18 44811000 */ mtc1 $at, $f2 +/* 823DDC 80240B1C 3C01C1A0 */ lui $at, 0xc1a0 +/* 823DE0 80240B20 44812000 */ mtc1 $at, $f4 +/* 823DE4 80240B24 2402000F */ addiu $v0, $zero, 0xf +/* 823DE8 80240B28 AFA2001C */ sw $v0, 0x1c($sp) +/* 823DEC 80240B2C 44833000 */ mtc1 $v1, $f6 +/* 823DF0 80240B30 00000000 */ nop +/* 823DF4 80240B34 468031A0 */ cvt.s.w $f6, $f6 +/* 823DF8 80240B38 44073000 */ mfc1 $a3, $f6 +/* 823DFC 80240B3C 27A20028 */ addiu $v0, $sp, 0x28 +/* 823E00 80240B40 AFA20020 */ sw $v0, 0x20($sp) +/* 823E04 80240B44 E7A00010 */ swc1 $f0, 0x10($sp) +/* 823E08 80240B48 E7A20014 */ swc1 $f2, 0x14($sp) +/* 823E0C 80240B4C 0C01BFA4 */ jal fx_emote +/* 823E10 80240B50 E7A40018 */ swc1 $f4, 0x18($sp) +/* 823E14 80240B54 0200202D */ daddu $a0, $s0, $zero +/* 823E18 80240B58 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 823E1C 80240B5C 0C012530 */ jal func_800494C0 +/* 823E20 80240B60 3C060020 */ lui $a2, 0x20 +/* 823E24 80240B64 8E220018 */ lw $v0, 0x18($s1) +/* 823E28 80240B68 9442002A */ lhu $v0, 0x2a($v0) +/* 823E2C 80240B6C 30420001 */ andi $v0, $v0, 1 +/* 823E30 80240B70 14400064 */ bnez $v0, .L80240D04 +/* 823E34 80240B74 2402000A */ addiu $v0, $zero, 0xa +/* 823E38 80240B78 08090341 */ j .L80240D04 +/* 823E3C 80240B7C 2402000C */ addiu $v0, $zero, 0xc +.L80240B80: +/* 823E40 80240B80 8E420074 */ lw $v0, 0x74($s2) +/* 823E44 80240B84 2442FFFF */ addiu $v0, $v0, -1 +.L80240B88: +/* 823E48 80240B88 AE420074 */ sw $v0, 0x74($s2) +.L80240B8C: +/* 823E4C 80240B8C 8602008C */ lh $v0, 0x8c($s0) +/* 823E50 80240B90 1440005D */ bnez $v0, .L80240D08 +/* 823E54 80240B94 00000000 */ nop +/* 823E58 80240B98 C6000018 */ lwc1 $f0, 0x18($s0) +/* 823E5C 80240B9C 3C014010 */ lui $at, 0x4010 +/* 823E60 80240BA0 44811800 */ mtc1 $at, $f3 +/* 823E64 80240BA4 44801000 */ mtc1 $zero, $f2 +/* 823E68 80240BA8 46000021 */ cvt.d.s $f0, $f0 +/* 823E6C 80240BAC 4622003C */ c.lt.d $f0, $f2 +/* 823E70 80240BB0 00000000 */ nop +/* 823E74 80240BB4 45000003 */ bc1f .L80240BC4 +/* 823E78 80240BB8 0200202D */ daddu $a0, $s0, $zero +/* 823E7C 80240BBC 080902F2 */ j .L80240BC8 +/* 823E80 80240BC0 0000282D */ daddu $a1, $zero, $zero +.L80240BC4: +/* 823E84 80240BC4 24050001 */ addiu $a1, $zero, 1 +.L80240BC8: +/* 823E88 80240BC8 0C00F598 */ jal func_8003D660 +/* 823E8C 80240BCC 00000000 */ nop +/* 823E90 80240BD0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 823E94 80240BD4 8E430078 */ lw $v1, 0x78($s2) +/* 823E98 80240BD8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 823E9C 80240BDC 00031040 */ sll $v0, $v1, 1 +/* 823EA0 80240BE0 00431021 */ addu $v0, $v0, $v1 +/* 823EA4 80240BE4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 823EA8 80240BE8 00021080 */ sll $v0, $v0, 2 +/* 823EAC 80240BEC 00431021 */ addu $v0, $v0, $v1 +/* 823EB0 80240BF0 C4560004 */ lwc1 $f22, 4($v0) +/* 823EB4 80240BF4 4680B5A0 */ cvt.s.w $f22, $f22 +/* 823EB8 80240BF8 C454000C */ lwc1 $f20, 0xc($v0) +/* 823EBC 80240BFC 4680A520 */ cvt.s.w $f20, $f20 +/* 823EC0 80240C00 4406B000 */ mfc1 $a2, $f22 +/* 823EC4 80240C04 4407A000 */ mfc1 $a3, $f20 +/* 823EC8 80240C08 0C00A720 */ jal atan2 +/* 823ECC 80240C0C 00000000 */ nop +/* 823ED0 80240C10 8E050018 */ lw $a1, 0x18($s0) +/* 823ED4 80240C14 44060000 */ mfc1 $a2, $f0 +/* 823ED8 80240C18 0200202D */ daddu $a0, $s0, $zero +/* 823EDC 80240C1C 0C00EA95 */ jal npc_move_heading +/* 823EE0 80240C20 AE06000C */ sw $a2, 0xc($s0) +/* 823EE4 80240C24 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 823EE8 80240C28 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 823EEC 80240C2C 4406B000 */ mfc1 $a2, $f22 +/* 823EF0 80240C30 4407A000 */ mfc1 $a3, $f20 +/* 823EF4 80240C34 0C00A7B5 */ jal dist2D +/* 823EF8 80240C38 00000000 */ nop +/* 823EFC 80240C3C C6020018 */ lwc1 $f2, 0x18($s0) +/* 823F00 80240C40 4602003E */ c.le.s $f0, $f2 +/* 823F04 80240C44 00000000 */ nop +/* 823F08 80240C48 4500002F */ bc1f .L80240D08 +/* 823F0C 80240C4C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 823F10 80240C50 24020002 */ addiu $v0, $zero, 2 +/* 823F14 80240C54 0C00A67F */ jal rand_int +/* 823F18 80240C58 AE420070 */ sw $v0, 0x70($s2) +/* 823F1C 80240C5C 3C035555 */ lui $v1, 0x5555 +/* 823F20 80240C60 34635556 */ ori $v1, $v1, 0x5556 +/* 823F24 80240C64 00430018 */ mult $v0, $v1 +/* 823F28 80240C68 000227C3 */ sra $a0, $v0, 0x1f +/* 823F2C 80240C6C 00004010 */ mfhi $t0 +/* 823F30 80240C70 01042023 */ subu $a0, $t0, $a0 +/* 823F34 80240C74 00041840 */ sll $v1, $a0, 1 +/* 823F38 80240C78 00641821 */ addu $v1, $v1, $a0 +/* 823F3C 80240C7C 00431023 */ subu $v0, $v0, $v1 +/* 823F40 80240C80 24430002 */ addiu $v1, $v0, 2 +/* 823F44 80240C84 AE430074 */ sw $v1, 0x74($s2) +/* 823F48 80240C88 8E62002C */ lw $v0, 0x2c($s3) +/* 823F4C 80240C8C 18400009 */ blez $v0, .L80240CB4 +/* 823F50 80240C90 24020004 */ addiu $v0, $zero, 4 +/* 823F54 80240C94 8E620004 */ lw $v0, 4($s3) +/* 823F58 80240C98 18400006 */ blez $v0, .L80240CB4 +/* 823F5C 80240C9C 24020004 */ addiu $v0, $zero, 4 +/* 823F60 80240CA0 8E620008 */ lw $v0, 8($s3) +/* 823F64 80240CA4 18400003 */ blez $v0, .L80240CB4 +/* 823F68 80240CA8 24020004 */ addiu $v0, $zero, 4 +/* 823F6C 80240CAC 14600002 */ bnez $v1, .L80240CB8 +/* 823F70 80240CB0 00000000 */ nop +.L80240CB4: +/* 823F74 80240CB4 AE420070 */ sw $v0, 0x70($s2) +.L80240CB8: +/* 823F78 80240CB8 0C00A67F */ jal rand_int +/* 823F7C 80240CBC 24042710 */ addiu $a0, $zero, 0x2710 +/* 823F80 80240CC0 3C0351EB */ lui $v1, 0x51eb +/* 823F84 80240CC4 3463851F */ ori $v1, $v1, 0x851f +/* 823F88 80240CC8 00430018 */ mult $v0, $v1 +/* 823F8C 80240CCC 00021FC3 */ sra $v1, $v0, 0x1f +/* 823F90 80240CD0 00004010 */ mfhi $t0 +/* 823F94 80240CD4 00082143 */ sra $a0, $t0, 5 +/* 823F98 80240CD8 00832023 */ subu $a0, $a0, $v1 +/* 823F9C 80240CDC 00041840 */ sll $v1, $a0, 1 +/* 823FA0 80240CE0 00641821 */ addu $v1, $v1, $a0 +/* 823FA4 80240CE4 000318C0 */ sll $v1, $v1, 3 +/* 823FA8 80240CE8 00641821 */ addu $v1, $v1, $a0 +/* 823FAC 80240CEC 00031880 */ sll $v1, $v1, 2 +/* 823FB0 80240CF0 8E640004 */ lw $a0, 4($s3) +/* 823FB4 80240CF4 00431023 */ subu $v0, $v0, $v1 +/* 823FB8 80240CF8 0044102A */ slt $v0, $v0, $a0 +/* 823FBC 80240CFC 10400002 */ beqz $v0, .L80240D08 +/* 823FC0 80240D00 24020004 */ addiu $v0, $zero, 4 +.L80240D04: +/* 823FC4 80240D04 AE420070 */ sw $v0, 0x70($s2) +.L80240D08: +/* 823FC8 80240D08 8FBF0044 */ lw $ra, 0x44($sp) +/* 823FCC 80240D0C 8FB40040 */ lw $s4, 0x40($sp) +/* 823FD0 80240D10 8FB3003C */ lw $s3, 0x3c($sp) +/* 823FD4 80240D14 8FB20038 */ lw $s2, 0x38($sp) +/* 823FD8 80240D18 8FB10034 */ lw $s1, 0x34($sp) +/* 823FDC 80240D1C 8FB00030 */ lw $s0, 0x30($sp) +/* 823FE0 80240D20 D7B60050 */ ldc1 $f22, 0x50($sp) +/* 823FE4 80240D24 D7B40048 */ ldc1 $f20, 0x48($sp) +/* 823FE8 80240D28 03E00008 */ jr $ra +/* 823FEC 80240D2C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30.s deleted file mode 100644 index 39403955fb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30 -/* 823FF0 80240D30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 823FF4 80240D34 AFB3001C */ sw $s3, 0x1c($sp) -/* 823FF8 80240D38 0080982D */ daddu $s3, $a0, $zero -/* 823FFC 80240D3C AFBF0020 */ sw $ra, 0x20($sp) -/* 824000 80240D40 AFB20018 */ sw $s2, 0x18($sp) -/* 824004 80240D44 AFB10014 */ sw $s1, 0x14($sp) -/* 824008 80240D48 AFB00010 */ sw $s0, 0x10($sp) -/* 82400C 80240D4C 8E720148 */ lw $s2, 0x148($s3) -/* 824010 80240D50 86440008 */ lh $a0, 8($s2) -/* 824014 80240D54 0C00EABB */ jal get_npc_unsafe -/* 824018 80240D58 00A0882D */ daddu $s1, $a1, $zero -/* 82401C 80240D5C 8E240008 */ lw $a0, 8($s1) -/* 824020 80240D60 0040802D */ daddu $s0, $v0, $zero -/* 824024 80240D64 00041FC2 */ srl $v1, $a0, 0x1f -/* 824028 80240D68 00832021 */ addu $a0, $a0, $v1 -/* 82402C 80240D6C 00042043 */ sra $a0, $a0, 1 -/* 824030 80240D70 0C00A67F */ jal rand_int -/* 824034 80240D74 24840001 */ addiu $a0, $a0, 1 -/* 824038 80240D78 8E230008 */ lw $v1, 8($s1) -/* 82403C 80240D7C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 824040 80240D80 00032FC2 */ srl $a1, $v1, 0x1f -/* 824044 80240D84 00651821 */ addu $v1, $v1, $a1 -/* 824048 80240D88 00031843 */ sra $v1, $v1, 1 -/* 82404C 80240D8C 00621821 */ addu $v1, $v1, $v0 -/* 824050 80240D90 0C00A67F */ jal rand_int -/* 824054 80240D94 A603008E */ sh $v1, 0x8e($s0) -/* 824058 80240D98 C60C000C */ lwc1 $f12, 0xc($s0) -/* 82405C 80240D9C 44820000 */ mtc1 $v0, $f0 -/* 824060 80240DA0 00000000 */ nop -/* 824064 80240DA4 46800020 */ cvt.s.w $f0, $f0 -/* 824068 80240DA8 46006300 */ add.s $f12, $f12, $f0 -/* 82406C 80240DAC 3C0142B4 */ lui $at, 0x42b4 -/* 824070 80240DB0 44810000 */ mtc1 $at, $f0 -/* 824074 80240DB4 0C00A6C9 */ jal clamp_angle -/* 824078 80240DB8 46006301 */ sub.s $f12, $f12, $f0 -/* 82407C 80240DBC E600000C */ swc1 $f0, 0xc($s0) -/* 824080 80240DC0 8E4200CC */ lw $v0, 0xcc($s2) -/* 824084 80240DC4 8C420000 */ lw $v0, ($v0) -/* 824088 80240DC8 AE020028 */ sw $v0, 0x28($s0) -/* 82408C 80240DCC 24020003 */ addiu $v0, $zero, 3 -/* 824090 80240DD0 AE620070 */ sw $v0, 0x70($s3) -/* 824094 80240DD4 8FBF0020 */ lw $ra, 0x20($sp) -/* 824098 80240DD8 8FB3001C */ lw $s3, 0x1c($sp) -/* 82409C 80240DDC 8FB20018 */ lw $s2, 0x18($sp) -/* 8240A0 80240DE0 8FB10014 */ lw $s1, 0x14($sp) -/* 8240A4 80240DE4 8FB00010 */ lw $s0, 0x10($sp) -/* 8240A8 80240DE8 03E00008 */ jr $ra -/* 8240AC 80240DEC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s new file mode 100644 index 0000000000..707e1674c8 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240D30_823FF0.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D30_823FF0 +/* 823FF0 80240D30 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 823FF4 80240D34 AFB3001C */ sw $s3, 0x1c($sp) +/* 823FF8 80240D38 0080982D */ daddu $s3, $a0, $zero +/* 823FFC 80240D3C AFBF0020 */ sw $ra, 0x20($sp) +/* 824000 80240D40 AFB20018 */ sw $s2, 0x18($sp) +/* 824004 80240D44 AFB10014 */ sw $s1, 0x14($sp) +/* 824008 80240D48 AFB00010 */ sw $s0, 0x10($sp) +/* 82400C 80240D4C 8E720148 */ lw $s2, 0x148($s3) +/* 824010 80240D50 86440008 */ lh $a0, 8($s2) +/* 824014 80240D54 0C00EABB */ jal get_npc_unsafe +/* 824018 80240D58 00A0882D */ daddu $s1, $a1, $zero +/* 82401C 80240D5C 8E240008 */ lw $a0, 8($s1) +/* 824020 80240D60 0040802D */ daddu $s0, $v0, $zero +/* 824024 80240D64 00041FC2 */ srl $v1, $a0, 0x1f +/* 824028 80240D68 00832021 */ addu $a0, $a0, $v1 +/* 82402C 80240D6C 00042043 */ sra $a0, $a0, 1 +/* 824030 80240D70 0C00A67F */ jal rand_int +/* 824034 80240D74 24840001 */ addiu $a0, $a0, 1 +/* 824038 80240D78 8E230008 */ lw $v1, 8($s1) +/* 82403C 80240D7C 240400B4 */ addiu $a0, $zero, 0xb4 +/* 824040 80240D80 00032FC2 */ srl $a1, $v1, 0x1f +/* 824044 80240D84 00651821 */ addu $v1, $v1, $a1 +/* 824048 80240D88 00031843 */ sra $v1, $v1, 1 +/* 82404C 80240D8C 00621821 */ addu $v1, $v1, $v0 +/* 824050 80240D90 0C00A67F */ jal rand_int +/* 824054 80240D94 A603008E */ sh $v1, 0x8e($s0) +/* 824058 80240D98 C60C000C */ lwc1 $f12, 0xc($s0) +/* 82405C 80240D9C 44820000 */ mtc1 $v0, $f0 +/* 824060 80240DA0 00000000 */ nop +/* 824064 80240DA4 46800020 */ cvt.s.w $f0, $f0 +/* 824068 80240DA8 46006300 */ add.s $f12, $f12, $f0 +/* 82406C 80240DAC 3C0142B4 */ lui $at, 0x42b4 +/* 824070 80240DB0 44810000 */ mtc1 $at, $f0 +/* 824074 80240DB4 0C00A6C9 */ jal clamp_angle +/* 824078 80240DB8 46006301 */ sub.s $f12, $f12, $f0 +/* 82407C 80240DBC E600000C */ swc1 $f0, 0xc($s0) +/* 824080 80240DC0 8E4200CC */ lw $v0, 0xcc($s2) +/* 824084 80240DC4 8C420000 */ lw $v0, ($v0) +/* 824088 80240DC8 AE020028 */ sw $v0, 0x28($s0) +/* 82408C 80240DCC 24020003 */ addiu $v0, $zero, 3 +/* 824090 80240DD0 AE620070 */ sw $v0, 0x70($s3) +/* 824094 80240DD4 8FBF0020 */ lw $ra, 0x20($sp) +/* 824098 80240DD8 8FB3001C */ lw $s3, 0x1c($sp) +/* 82409C 80240DDC 8FB20018 */ lw $s2, 0x18($sp) +/* 8240A0 80240DE0 8FB10014 */ lw $s1, 0x14($sp) +/* 8240A4 80240DE4 8FB00010 */ lw $s0, 0x10($sp) +/* 8240A8 80240DE8 03E00008 */ jr $ra +/* 8240AC 80240DEC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0.s deleted file mode 100644 index 851465a57a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DF0 -/* 8240B0 80240DF0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8240B4 80240DF4 AFB40040 */ sw $s4, 0x40($sp) -/* 8240B8 80240DF8 0080A02D */ daddu $s4, $a0, $zero -/* 8240BC 80240DFC AFBF0044 */ sw $ra, 0x44($sp) -/* 8240C0 80240E00 AFB3003C */ sw $s3, 0x3c($sp) -/* 8240C4 80240E04 AFB20038 */ sw $s2, 0x38($sp) -/* 8240C8 80240E08 AFB10034 */ sw $s1, 0x34($sp) -/* 8240CC 80240E0C AFB00030 */ sw $s0, 0x30($sp) -/* 8240D0 80240E10 8E910148 */ lw $s1, 0x148($s4) -/* 8240D4 80240E14 00A0902D */ daddu $s2, $a1, $zero -/* 8240D8 80240E18 86240008 */ lh $a0, 8($s1) -/* 8240DC 80240E1C 0C00EABB */ jal get_npc_unsafe -/* 8240E0 80240E20 00C0982D */ daddu $s3, $a2, $zero -/* 8240E4 80240E24 8E430014 */ lw $v1, 0x14($s2) -/* 8240E8 80240E28 04600031 */ bltz $v1, .L80240EF0 -/* 8240EC 80240E2C 0040802D */ daddu $s0, $v0, $zero -/* 8240F0 80240E30 0260202D */ daddu $a0, $s3, $zero -/* 8240F4 80240E34 AFA00010 */ sw $zero, 0x10($sp) -/* 8240F8 80240E38 8E460024 */ lw $a2, 0x24($s2) -/* 8240FC 80240E3C 8E470028 */ lw $a3, 0x28($s2) -/* 824100 80240E40 0C01242D */ jal func_800490B4 -/* 824104 80240E44 0220282D */ daddu $a1, $s1, $zero -/* 824108 80240E48 10400029 */ beqz $v0, .L80240EF0 -/* 82410C 80240E4C 0000202D */ daddu $a0, $zero, $zero -/* 824110 80240E50 0200282D */ daddu $a1, $s0, $zero -/* 824114 80240E54 0000302D */ daddu $a2, $zero, $zero -/* 824118 80240E58 860300A8 */ lh $v1, 0xa8($s0) -/* 82411C 80240E5C 3C013F80 */ lui $at, 0x3f80 -/* 824120 80240E60 44810000 */ mtc1 $at, $f0 -/* 824124 80240E64 3C014000 */ lui $at, 0x4000 -/* 824128 80240E68 44811000 */ mtc1 $at, $f2 -/* 82412C 80240E6C 3C01C1A0 */ lui $at, 0xc1a0 -/* 824130 80240E70 44812000 */ mtc1 $at, $f4 -/* 824134 80240E74 2402000F */ addiu $v0, $zero, 0xf -/* 824138 80240E78 AFA2001C */ sw $v0, 0x1c($sp) -/* 82413C 80240E7C 44833000 */ mtc1 $v1, $f6 -/* 824140 80240E80 00000000 */ nop -/* 824144 80240E84 468031A0 */ cvt.s.w $f6, $f6 -/* 824148 80240E88 44073000 */ mfc1 $a3, $f6 -/* 82414C 80240E8C 27A20028 */ addiu $v0, $sp, 0x28 -/* 824150 80240E90 AFA20020 */ sw $v0, 0x20($sp) -/* 824154 80240E94 E7A00010 */ swc1 $f0, 0x10($sp) -/* 824158 80240E98 E7A20014 */ swc1 $f2, 0x14($sp) -/* 82415C 80240E9C 0C01BFA4 */ jal fx_emote -/* 824160 80240EA0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 824164 80240EA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 824168 80240EA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 82416C 80240EAC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 824170 80240EB0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 824174 80240EB4 8C460028 */ lw $a2, 0x28($v0) -/* 824178 80240EB8 0C00A720 */ jal atan2 -/* 82417C 80240EBC 8C470030 */ lw $a3, 0x30($v0) -/* 824180 80240EC0 0200202D */ daddu $a0, $s0, $zero -/* 824184 80240EC4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 824188 80240EC8 3C060020 */ lui $a2, 0x20 -/* 82418C 80240ECC 0C012530 */ jal func_800494C0 -/* 824190 80240ED0 E480000C */ swc1 $f0, 0xc($a0) -/* 824194 80240ED4 8E220018 */ lw $v0, 0x18($s1) -/* 824198 80240ED8 9442002A */ lhu $v0, 0x2a($v0) -/* 82419C 80240EDC 30420001 */ andi $v0, $v0, 1 -/* 8241A0 80240EE0 14400029 */ bnez $v0, .L80240F88 -/* 8241A4 80240EE4 2402000A */ addiu $v0, $zero, 0xa -/* 8241A8 80240EE8 080903E2 */ j .L80240F88 -/* 8241AC 80240EEC 2402000C */ addiu $v0, $zero, 0xc -.L80240EF0: -/* 8241B0 80240EF0 8602008C */ lh $v0, 0x8c($s0) -/* 8241B4 80240EF4 14400025 */ bnez $v0, .L80240F8C -/* 8241B8 80240EF8 00000000 */ nop -/* 8241BC 80240EFC 9602008E */ lhu $v0, 0x8e($s0) -/* 8241C0 80240F00 2442FFFF */ addiu $v0, $v0, -1 -/* 8241C4 80240F04 A602008E */ sh $v0, 0x8e($s0) -/* 8241C8 80240F08 00021400 */ sll $v0, $v0, 0x10 -/* 8241CC 80240F0C 1440001F */ bnez $v0, .L80240F8C -/* 8241D0 80240F10 00000000 */ nop -/* 8241D4 80240F14 8E820074 */ lw $v0, 0x74($s4) -/* 8241D8 80240F18 2442FFFF */ addiu $v0, $v0, -1 -/* 8241DC 80240F1C 10400019 */ beqz $v0, .L80240F84 -/* 8241E0 80240F20 AE820074 */ sw $v0, 0x74($s4) -/* 8241E4 80240F24 8E220018 */ lw $v0, 0x18($s1) -/* 8241E8 80240F28 9442002A */ lhu $v0, 0x2a($v0) -/* 8241EC 80240F2C 30420010 */ andi $v0, $v0, 0x10 -/* 8241F0 80240F30 14400007 */ bnez $v0, .L80240F50 -/* 8241F4 80240F34 00000000 */ nop -/* 8241F8 80240F38 C600000C */ lwc1 $f0, 0xc($s0) -/* 8241FC 80240F3C 3C014334 */ lui $at, 0x4334 -/* 824200 80240F40 44816000 */ mtc1 $at, $f12 -/* 824204 80240F44 0C00A6C9 */ jal clamp_angle -/* 824208 80240F48 460C0300 */ add.s $f12, $f0, $f12 -/* 82420C 80240F4C E600000C */ swc1 $f0, 0xc($s0) -.L80240F50: -/* 824210 80240F50 8E440008 */ lw $a0, 8($s2) -/* 824214 80240F54 000417C2 */ srl $v0, $a0, 0x1f -/* 824218 80240F58 00822021 */ addu $a0, $a0, $v0 -/* 82421C 80240F5C 00042043 */ sra $a0, $a0, 1 -/* 824220 80240F60 0C00A67F */ jal rand_int -/* 824224 80240F64 24840001 */ addiu $a0, $a0, 1 -/* 824228 80240F68 8E430008 */ lw $v1, 8($s2) -/* 82422C 80240F6C 000327C2 */ srl $a0, $v1, 0x1f -/* 824230 80240F70 00641821 */ addu $v1, $v1, $a0 -/* 824234 80240F74 00031843 */ sra $v1, $v1, 1 -/* 824238 80240F78 00621821 */ addu $v1, $v1, $v0 -/* 82423C 80240F7C 080903E3 */ j .L80240F8C -/* 824240 80240F80 A603008E */ sh $v1, 0x8e($s0) -.L80240F84: -/* 824244 80240F84 24020004 */ addiu $v0, $zero, 4 -.L80240F88: -/* 824248 80240F88 AE820070 */ sw $v0, 0x70($s4) -.L80240F8C: -/* 82424C 80240F8C 8FBF0044 */ lw $ra, 0x44($sp) -/* 824250 80240F90 8FB40040 */ lw $s4, 0x40($sp) -/* 824254 80240F94 8FB3003C */ lw $s3, 0x3c($sp) -/* 824258 80240F98 8FB20038 */ lw $s2, 0x38($sp) -/* 82425C 80240F9C 8FB10034 */ lw $s1, 0x34($sp) -/* 824260 80240FA0 8FB00030 */ lw $s0, 0x30($sp) -/* 824264 80240FA4 03E00008 */ jr $ra -/* 824268 80240FA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s new file mode 100644 index 0000000000..bee1bf75a7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240DF0_8240B0.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DF0_8240B0 +/* 8240B0 80240DF0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8240B4 80240DF4 AFB40040 */ sw $s4, 0x40($sp) +/* 8240B8 80240DF8 0080A02D */ daddu $s4, $a0, $zero +/* 8240BC 80240DFC AFBF0044 */ sw $ra, 0x44($sp) +/* 8240C0 80240E00 AFB3003C */ sw $s3, 0x3c($sp) +/* 8240C4 80240E04 AFB20038 */ sw $s2, 0x38($sp) +/* 8240C8 80240E08 AFB10034 */ sw $s1, 0x34($sp) +/* 8240CC 80240E0C AFB00030 */ sw $s0, 0x30($sp) +/* 8240D0 80240E10 8E910148 */ lw $s1, 0x148($s4) +/* 8240D4 80240E14 00A0902D */ daddu $s2, $a1, $zero +/* 8240D8 80240E18 86240008 */ lh $a0, 8($s1) +/* 8240DC 80240E1C 0C00EABB */ jal get_npc_unsafe +/* 8240E0 80240E20 00C0982D */ daddu $s3, $a2, $zero +/* 8240E4 80240E24 8E430014 */ lw $v1, 0x14($s2) +/* 8240E8 80240E28 04600031 */ bltz $v1, .L80240EF0 +/* 8240EC 80240E2C 0040802D */ daddu $s0, $v0, $zero +/* 8240F0 80240E30 0260202D */ daddu $a0, $s3, $zero +/* 8240F4 80240E34 AFA00010 */ sw $zero, 0x10($sp) +/* 8240F8 80240E38 8E460024 */ lw $a2, 0x24($s2) +/* 8240FC 80240E3C 8E470028 */ lw $a3, 0x28($s2) +/* 824100 80240E40 0C01242D */ jal func_800490B4 +/* 824104 80240E44 0220282D */ daddu $a1, $s1, $zero +/* 824108 80240E48 10400029 */ beqz $v0, .L80240EF0 +/* 82410C 80240E4C 0000202D */ daddu $a0, $zero, $zero +/* 824110 80240E50 0200282D */ daddu $a1, $s0, $zero +/* 824114 80240E54 0000302D */ daddu $a2, $zero, $zero +/* 824118 80240E58 860300A8 */ lh $v1, 0xa8($s0) +/* 82411C 80240E5C 3C013F80 */ lui $at, 0x3f80 +/* 824120 80240E60 44810000 */ mtc1 $at, $f0 +/* 824124 80240E64 3C014000 */ lui $at, 0x4000 +/* 824128 80240E68 44811000 */ mtc1 $at, $f2 +/* 82412C 80240E6C 3C01C1A0 */ lui $at, 0xc1a0 +/* 824130 80240E70 44812000 */ mtc1 $at, $f4 +/* 824134 80240E74 2402000F */ addiu $v0, $zero, 0xf +/* 824138 80240E78 AFA2001C */ sw $v0, 0x1c($sp) +/* 82413C 80240E7C 44833000 */ mtc1 $v1, $f6 +/* 824140 80240E80 00000000 */ nop +/* 824144 80240E84 468031A0 */ cvt.s.w $f6, $f6 +/* 824148 80240E88 44073000 */ mfc1 $a3, $f6 +/* 82414C 80240E8C 27A20028 */ addiu $v0, $sp, 0x28 +/* 824150 80240E90 AFA20020 */ sw $v0, 0x20($sp) +/* 824154 80240E94 E7A00010 */ swc1 $f0, 0x10($sp) +/* 824158 80240E98 E7A20014 */ swc1 $f2, 0x14($sp) +/* 82415C 80240E9C 0C01BFA4 */ jal fx_emote +/* 824160 80240EA0 E7A40018 */ swc1 $f4, 0x18($sp) +/* 824164 80240EA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 824168 80240EA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 82416C 80240EAC C60C0038 */ lwc1 $f12, 0x38($s0) +/* 824170 80240EB0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 824174 80240EB4 8C460028 */ lw $a2, 0x28($v0) +/* 824178 80240EB8 0C00A720 */ jal atan2 +/* 82417C 80240EBC 8C470030 */ lw $a3, 0x30($v0) +/* 824180 80240EC0 0200202D */ daddu $a0, $s0, $zero +/* 824184 80240EC4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 824188 80240EC8 3C060020 */ lui $a2, 0x20 +/* 82418C 80240ECC 0C012530 */ jal func_800494C0 +/* 824190 80240ED0 E480000C */ swc1 $f0, 0xc($a0) +/* 824194 80240ED4 8E220018 */ lw $v0, 0x18($s1) +/* 824198 80240ED8 9442002A */ lhu $v0, 0x2a($v0) +/* 82419C 80240EDC 30420001 */ andi $v0, $v0, 1 +/* 8241A0 80240EE0 14400029 */ bnez $v0, .L80240F88 +/* 8241A4 80240EE4 2402000A */ addiu $v0, $zero, 0xa +/* 8241A8 80240EE8 080903E2 */ j .L80240F88 +/* 8241AC 80240EEC 2402000C */ addiu $v0, $zero, 0xc +.L80240EF0: +/* 8241B0 80240EF0 8602008C */ lh $v0, 0x8c($s0) +/* 8241B4 80240EF4 14400025 */ bnez $v0, .L80240F8C +/* 8241B8 80240EF8 00000000 */ nop +/* 8241BC 80240EFC 9602008E */ lhu $v0, 0x8e($s0) +/* 8241C0 80240F00 2442FFFF */ addiu $v0, $v0, -1 +/* 8241C4 80240F04 A602008E */ sh $v0, 0x8e($s0) +/* 8241C8 80240F08 00021400 */ sll $v0, $v0, 0x10 +/* 8241CC 80240F0C 1440001F */ bnez $v0, .L80240F8C +/* 8241D0 80240F10 00000000 */ nop +/* 8241D4 80240F14 8E820074 */ lw $v0, 0x74($s4) +/* 8241D8 80240F18 2442FFFF */ addiu $v0, $v0, -1 +/* 8241DC 80240F1C 10400019 */ beqz $v0, .L80240F84 +/* 8241E0 80240F20 AE820074 */ sw $v0, 0x74($s4) +/* 8241E4 80240F24 8E220018 */ lw $v0, 0x18($s1) +/* 8241E8 80240F28 9442002A */ lhu $v0, 0x2a($v0) +/* 8241EC 80240F2C 30420010 */ andi $v0, $v0, 0x10 +/* 8241F0 80240F30 14400007 */ bnez $v0, .L80240F50 +/* 8241F4 80240F34 00000000 */ nop +/* 8241F8 80240F38 C600000C */ lwc1 $f0, 0xc($s0) +/* 8241FC 80240F3C 3C014334 */ lui $at, 0x4334 +/* 824200 80240F40 44816000 */ mtc1 $at, $f12 +/* 824204 80240F44 0C00A6C9 */ jal clamp_angle +/* 824208 80240F48 460C0300 */ add.s $f12, $f0, $f12 +/* 82420C 80240F4C E600000C */ swc1 $f0, 0xc($s0) +.L80240F50: +/* 824210 80240F50 8E440008 */ lw $a0, 8($s2) +/* 824214 80240F54 000417C2 */ srl $v0, $a0, 0x1f +/* 824218 80240F58 00822021 */ addu $a0, $a0, $v0 +/* 82421C 80240F5C 00042043 */ sra $a0, $a0, 1 +/* 824220 80240F60 0C00A67F */ jal rand_int +/* 824224 80240F64 24840001 */ addiu $a0, $a0, 1 +/* 824228 80240F68 8E430008 */ lw $v1, 8($s2) +/* 82422C 80240F6C 000327C2 */ srl $a0, $v1, 0x1f +/* 824230 80240F70 00641821 */ addu $v1, $v1, $a0 +/* 824234 80240F74 00031843 */ sra $v1, $v1, 1 +/* 824238 80240F78 00621821 */ addu $v1, $v1, $v0 +/* 82423C 80240F7C 080903E3 */ j .L80240F8C +/* 824240 80240F80 A603008E */ sh $v1, 0x8e($s0) +.L80240F84: +/* 824244 80240F84 24020004 */ addiu $v0, $zero, 4 +.L80240F88: +/* 824248 80240F88 AE820070 */ sw $v0, 0x70($s4) +.L80240F8C: +/* 82424C 80240F8C 8FBF0044 */ lw $ra, 0x44($sp) +/* 824250 80240F90 8FB40040 */ lw $s4, 0x40($sp) +/* 824254 80240F94 8FB3003C */ lw $s3, 0x3c($sp) +/* 824258 80240F98 8FB20038 */ lw $s2, 0x38($sp) +/* 82425C 80240F9C 8FB10034 */ lw $s1, 0x34($sp) +/* 824260 80240FA0 8FB00030 */ lw $s0, 0x30($sp) +/* 824264 80240FA4 03E00008 */ jr $ra +/* 824268 80240FA8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC.s deleted file mode 100644 index 5d33772164..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FAC -/* 82426C 80240FAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824270 80240FB0 AFB10014 */ sw $s1, 0x14($sp) -/* 824274 80240FB4 0080882D */ daddu $s1, $a0, $zero -/* 824278 80240FB8 AFBF001C */ sw $ra, 0x1c($sp) -/* 82427C 80240FBC AFB20018 */ sw $s2, 0x18($sp) -/* 824280 80240FC0 AFB00010 */ sw $s0, 0x10($sp) -/* 824284 80240FC4 8E300148 */ lw $s0, 0x148($s1) -/* 824288 80240FC8 86040008 */ lh $a0, 8($s0) -/* 82428C 80240FCC 0C00EABB */ jal get_npc_unsafe -/* 824290 80240FD0 00A0902D */ daddu $s2, $a1, $zero -/* 824294 80240FD4 8E230078 */ lw $v1, 0x78($s1) -/* 824298 80240FD8 24630001 */ addiu $v1, $v1, 1 -/* 82429C 80240FDC AE230078 */ sw $v1, 0x78($s1) -/* 8242A0 80240FE0 8E0400D0 */ lw $a0, 0xd0($s0) -/* 8242A4 80240FE4 8C840000 */ lw $a0, ($a0) -/* 8242A8 80240FE8 0064182A */ slt $v1, $v1, $a0 -/* 8242AC 80240FEC 14600002 */ bnez $v1, .L80240FF8 -/* 8242B0 80240FF0 0040282D */ daddu $a1, $v0, $zero -/* 8242B4 80240FF4 AE200078 */ sw $zero, 0x78($s1) -.L80240FF8: -/* 8242B8 80240FF8 8E0200CC */ lw $v0, 0xcc($s0) -/* 8242BC 80240FFC 8C420004 */ lw $v0, 4($v0) -/* 8242C0 80241000 ACA20028 */ sw $v0, 0x28($a1) -/* 8242C4 80241004 8E0200D0 */ lw $v0, 0xd0($s0) -/* 8242C8 80241008 8C42007C */ lw $v0, 0x7c($v0) -/* 8242CC 8024100C 04410004 */ bgez $v0, .L80241020 -/* 8242D0 80241010 00000000 */ nop -/* 8242D4 80241014 C6400000 */ lwc1 $f0, ($s2) -/* 8242D8 80241018 08090410 */ j .L80241040 -/* 8242DC 8024101C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241020: -/* 8242E0 80241020 3C018025 */ lui $at, 0x8025 -/* 8242E4 80241024 D422E208 */ ldc1 $f2, -0x1df8($at) -/* 8242E8 80241028 44820000 */ mtc1 $v0, $f0 -/* 8242EC 8024102C 00000000 */ nop -/* 8242F0 80241030 46800021 */ cvt.d.w $f0, $f0 -/* 8242F4 80241034 46220003 */ div.d $f0, $f0, $f2 -/* 8242F8 80241038 46200020 */ cvt.s.d $f0, $f0 -/* 8242FC 8024103C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241040: -/* 824300 80241040 24020001 */ addiu $v0, $zero, 1 -/* 824304 80241044 AE220070 */ sw $v0, 0x70($s1) -/* 824308 80241048 8FBF001C */ lw $ra, 0x1c($sp) -/* 82430C 8024104C 8FB20018 */ lw $s2, 0x18($sp) -/* 824310 80241050 8FB10014 */ lw $s1, 0x14($sp) -/* 824314 80241054 8FB00010 */ lw $s0, 0x10($sp) -/* 824318 80241058 03E00008 */ jr $ra -/* 82431C 8024105C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s new file mode 100644 index 0000000000..2381b96110 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80240FAC_82426C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FAC_82426C +/* 82426C 80240FAC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 824270 80240FB0 AFB10014 */ sw $s1, 0x14($sp) +/* 824274 80240FB4 0080882D */ daddu $s1, $a0, $zero +/* 824278 80240FB8 AFBF001C */ sw $ra, 0x1c($sp) +/* 82427C 80240FBC AFB20018 */ sw $s2, 0x18($sp) +/* 824280 80240FC0 AFB00010 */ sw $s0, 0x10($sp) +/* 824284 80240FC4 8E300148 */ lw $s0, 0x148($s1) +/* 824288 80240FC8 86040008 */ lh $a0, 8($s0) +/* 82428C 80240FCC 0C00EABB */ jal get_npc_unsafe +/* 824290 80240FD0 00A0902D */ daddu $s2, $a1, $zero +/* 824294 80240FD4 8E230078 */ lw $v1, 0x78($s1) +/* 824298 80240FD8 24630001 */ addiu $v1, $v1, 1 +/* 82429C 80240FDC AE230078 */ sw $v1, 0x78($s1) +/* 8242A0 80240FE0 8E0400D0 */ lw $a0, 0xd0($s0) +/* 8242A4 80240FE4 8C840000 */ lw $a0, ($a0) +/* 8242A8 80240FE8 0064182A */ slt $v1, $v1, $a0 +/* 8242AC 80240FEC 14600002 */ bnez $v1, .L80240FF8 +/* 8242B0 80240FF0 0040282D */ daddu $a1, $v0, $zero +/* 8242B4 80240FF4 AE200078 */ sw $zero, 0x78($s1) +.L80240FF8: +/* 8242B8 80240FF8 8E0200CC */ lw $v0, 0xcc($s0) +/* 8242BC 80240FFC 8C420004 */ lw $v0, 4($v0) +/* 8242C0 80241000 ACA20028 */ sw $v0, 0x28($a1) +/* 8242C4 80241004 8E0200D0 */ lw $v0, 0xd0($s0) +/* 8242C8 80241008 8C42007C */ lw $v0, 0x7c($v0) +/* 8242CC 8024100C 04410004 */ bgez $v0, .L80241020 +/* 8242D0 80241010 00000000 */ nop +/* 8242D4 80241014 C6400000 */ lwc1 $f0, ($s2) +/* 8242D8 80241018 08090410 */ j .L80241040 +/* 8242DC 8024101C E4A00018 */ swc1 $f0, 0x18($a1) +.L80241020: +/* 8242E0 80241020 3C018025 */ lui $at, 0x8025 +/* 8242E4 80241024 D422E208 */ ldc1 $f2, -0x1df8($at) +/* 8242E8 80241028 44820000 */ mtc1 $v0, $f0 +/* 8242EC 8024102C 00000000 */ nop +/* 8242F0 80241030 46800021 */ cvt.d.w $f0, $f0 +/* 8242F4 80241034 46220003 */ div.d $f0, $f0, $f2 +/* 8242F8 80241038 46200020 */ cvt.s.d $f0, $f0 +/* 8242FC 8024103C E4A00018 */ swc1 $f0, 0x18($a1) +.L80241040: +/* 824300 80241040 24020001 */ addiu $v0, $zero, 1 +/* 824304 80241044 AE220070 */ sw $v0, 0x70($s1) +/* 824308 80241048 8FBF001C */ lw $ra, 0x1c($sp) +/* 82430C 8024104C 8FB20018 */ lw $s2, 0x18($sp) +/* 824310 80241050 8FB10014 */ lw $s1, 0x14($sp) +/* 824314 80241054 8FB00010 */ lw $s0, 0x10($sp) +/* 824318 80241058 03E00008 */ jr $ra +/* 82431C 8024105C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060.s deleted file mode 100644 index c646c62d21..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241060 -/* 824320 80241060 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824324 80241064 AFB10014 */ sw $s1, 0x14($sp) -/* 824328 80241068 0080882D */ daddu $s1, $a0, $zero -/* 82432C 8024106C AFBF0018 */ sw $ra, 0x18($sp) -/* 824330 80241070 AFB00010 */ sw $s0, 0x10($sp) -/* 824334 80241074 8E300148 */ lw $s0, 0x148($s1) -/* 824338 80241078 0C00EABB */ jal get_npc_unsafe -/* 82433C 8024107C 86040008 */ lh $a0, 8($s0) -/* 824340 80241080 8E0300CC */ lw $v1, 0xcc($s0) -/* 824344 80241084 3C014120 */ lui $at, 0x4120 -/* 824348 80241088 44812000 */ mtc1 $at, $f4 -/* 82434C 8024108C 3C014000 */ lui $at, 0x4000 -/* 824350 80241090 44810000 */ mtc1 $at, $f0 -/* 824354 80241094 C442003C */ lwc1 $f2, 0x3c($v0) -/* 824358 80241098 8C640010 */ lw $a0, 0x10($v1) -/* 82435C 8024109C 8C430000 */ lw $v1, ($v0) -/* 824360 802410A0 E444001C */ swc1 $f4, 0x1c($v0) -/* 824364 802410A4 E4400014 */ swc1 $f0, 0x14($v0) -/* 824368 802410A8 E4420064 */ swc1 $f2, 0x64($v0) -/* 82436C 802410AC 34630800 */ ori $v1, $v1, 0x800 -/* 824370 802410B0 AC430000 */ sw $v1, ($v0) -/* 824374 802410B4 AC440028 */ sw $a0, 0x28($v0) -/* 824378 802410B8 2402000B */ addiu $v0, $zero, 0xb -/* 82437C 802410BC AE220070 */ sw $v0, 0x70($s1) -/* 824380 802410C0 8FBF0018 */ lw $ra, 0x18($sp) -/* 824384 802410C4 8FB10014 */ lw $s1, 0x14($sp) -/* 824388 802410C8 8FB00010 */ lw $s0, 0x10($sp) -/* 82438C 802410CC 03E00008 */ jr $ra -/* 824390 802410D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060_824320.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060_824320.s new file mode 100644 index 0000000000..13af817cd2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241060_824320.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241060_824320 +/* 824320 80241060 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 824324 80241064 AFB10014 */ sw $s1, 0x14($sp) +/* 824328 80241068 0080882D */ daddu $s1, $a0, $zero +/* 82432C 8024106C AFBF0018 */ sw $ra, 0x18($sp) +/* 824330 80241070 AFB00010 */ sw $s0, 0x10($sp) +/* 824334 80241074 8E300148 */ lw $s0, 0x148($s1) +/* 824338 80241078 0C00EABB */ jal get_npc_unsafe +/* 82433C 8024107C 86040008 */ lh $a0, 8($s0) +/* 824340 80241080 8E0300CC */ lw $v1, 0xcc($s0) +/* 824344 80241084 3C014120 */ lui $at, 0x4120 +/* 824348 80241088 44812000 */ mtc1 $at, $f4 +/* 82434C 8024108C 3C014000 */ lui $at, 0x4000 +/* 824350 80241090 44810000 */ mtc1 $at, $f0 +/* 824354 80241094 C442003C */ lwc1 $f2, 0x3c($v0) +/* 824358 80241098 8C640010 */ lw $a0, 0x10($v1) +/* 82435C 8024109C 8C430000 */ lw $v1, ($v0) +/* 824360 802410A0 E444001C */ swc1 $f4, 0x1c($v0) +/* 824364 802410A4 E4400014 */ swc1 $f0, 0x14($v0) +/* 824368 802410A8 E4420064 */ swc1 $f2, 0x64($v0) +/* 82436C 802410AC 34630800 */ ori $v1, $v1, 0x800 +/* 824370 802410B0 AC430000 */ sw $v1, ($v0) +/* 824374 802410B4 AC440028 */ sw $a0, 0x28($v0) +/* 824378 802410B8 2402000B */ addiu $v0, $zero, 0xb +/* 82437C 802410BC AE220070 */ sw $v0, 0x70($s1) +/* 824380 802410C0 8FBF0018 */ lw $ra, 0x18($sp) +/* 824384 802410C4 8FB10014 */ lw $s1, 0x14($sp) +/* 824388 802410C8 8FB00010 */ lw $s0, 0x10($sp) +/* 82438C 802410CC 03E00008 */ jr $ra +/* 824390 802410D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4.s deleted file mode 100644 index 26c036fcb6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410D4 -/* 824394 802410D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 824398 802410D8 AFB00010 */ sw $s0, 0x10($sp) -/* 82439C 802410DC 0080802D */ daddu $s0, $a0, $zero -/* 8243A0 802410E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8243A4 802410E4 8E020148 */ lw $v0, 0x148($s0) -/* 8243A8 802410E8 0C00EABB */ jal get_npc_unsafe -/* 8243AC 802410EC 84440008 */ lh $a0, 8($v0) -/* 8243B0 802410F0 0040202D */ daddu $a0, $v0, $zero -/* 8243B4 802410F4 C482003C */ lwc1 $f2, 0x3c($a0) -/* 8243B8 802410F8 C480001C */ lwc1 $f0, 0x1c($a0) -/* 8243BC 802410FC 46001080 */ add.s $f2, $f2, $f0 -/* 8243C0 80241100 C4840014 */ lwc1 $f4, 0x14($a0) -/* 8243C4 80241104 46040001 */ sub.s $f0, $f0, $f4 -/* 8243C8 80241108 C4840064 */ lwc1 $f4, 0x64($a0) -/* 8243CC 8024110C 4602203C */ c.lt.s $f4, $f2 -/* 8243D0 80241110 E482003C */ swc1 $f2, 0x3c($a0) -/* 8243D4 80241114 45010009 */ bc1t .L8024113C -/* 8243D8 80241118 E480001C */ swc1 $f0, 0x1c($a0) -/* 8243DC 8024111C 8C820000 */ lw $v0, ($a0) -/* 8243E0 80241120 2403F7FF */ addiu $v1, $zero, -0x801 -/* 8243E4 80241124 E484003C */ swc1 $f4, 0x3c($a0) -/* 8243E8 80241128 AC80001C */ sw $zero, 0x1c($a0) -/* 8243EC 8024112C 00431024 */ and $v0, $v0, $v1 -/* 8243F0 80241130 AC820000 */ sw $v0, ($a0) -/* 8243F4 80241134 2402000C */ addiu $v0, $zero, 0xc -/* 8243F8 80241138 AE020070 */ sw $v0, 0x70($s0) -.L8024113C: -/* 8243FC 8024113C 8FBF0014 */ lw $ra, 0x14($sp) -/* 824400 80241140 8FB00010 */ lw $s0, 0x10($sp) -/* 824404 80241144 03E00008 */ jr $ra -/* 824408 80241148 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4_824394.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4_824394.s new file mode 100644 index 0000000000..1a64e1612b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802410D4_824394.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410D4_824394 +/* 824394 802410D4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 824398 802410D8 AFB00010 */ sw $s0, 0x10($sp) +/* 82439C 802410DC 0080802D */ daddu $s0, $a0, $zero +/* 8243A0 802410E0 AFBF0014 */ sw $ra, 0x14($sp) +/* 8243A4 802410E4 8E020148 */ lw $v0, 0x148($s0) +/* 8243A8 802410E8 0C00EABB */ jal get_npc_unsafe +/* 8243AC 802410EC 84440008 */ lh $a0, 8($v0) +/* 8243B0 802410F0 0040202D */ daddu $a0, $v0, $zero +/* 8243B4 802410F4 C482003C */ lwc1 $f2, 0x3c($a0) +/* 8243B8 802410F8 C480001C */ lwc1 $f0, 0x1c($a0) +/* 8243BC 802410FC 46001080 */ add.s $f2, $f2, $f0 +/* 8243C0 80241100 C4840014 */ lwc1 $f4, 0x14($a0) +/* 8243C4 80241104 46040001 */ sub.s $f0, $f0, $f4 +/* 8243C8 80241108 C4840064 */ lwc1 $f4, 0x64($a0) +/* 8243CC 8024110C 4602203C */ c.lt.s $f4, $f2 +/* 8243D0 80241110 E482003C */ swc1 $f2, 0x3c($a0) +/* 8243D4 80241114 45010009 */ bc1t .L8024113C +/* 8243D8 80241118 E480001C */ swc1 $f0, 0x1c($a0) +/* 8243DC 8024111C 8C820000 */ lw $v0, ($a0) +/* 8243E0 80241120 2403F7FF */ addiu $v1, $zero, -0x801 +/* 8243E4 80241124 E484003C */ swc1 $f4, 0x3c($a0) +/* 8243E8 80241128 AC80001C */ sw $zero, 0x1c($a0) +/* 8243EC 8024112C 00431024 */ and $v0, $v0, $v1 +/* 8243F0 80241130 AC820000 */ sw $v0, ($a0) +/* 8243F4 80241134 2402000C */ addiu $v0, $zero, 0xc +/* 8243F8 80241138 AE020070 */ sw $v0, 0x70($s0) +.L8024113C: +/* 8243FC 8024113C 8FBF0014 */ lw $ra, 0x14($sp) +/* 824400 80241140 8FB00010 */ lw $s0, 0x10($sp) +/* 824404 80241144 03E00008 */ jr $ra +/* 824408 80241148 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C.s deleted file mode 100644 index f64e8a03cb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024114C -/* 82440C 8024114C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 824410 80241150 AFB3001C */ sw $s3, 0x1c($sp) -/* 824414 80241154 0080982D */ daddu $s3, $a0, $zero -/* 824418 80241158 AFBF0020 */ sw $ra, 0x20($sp) -/* 82441C 8024115C AFB20018 */ sw $s2, 0x18($sp) -/* 824420 80241160 AFB10014 */ sw $s1, 0x14($sp) -/* 824424 80241164 AFB00010 */ sw $s0, 0x10($sp) -/* 824428 80241168 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 82442C 8024116C 8E710148 */ lw $s1, 0x148($s3) -/* 824430 80241170 86240008 */ lh $a0, 8($s1) -/* 824434 80241174 0C00EABB */ jal get_npc_unsafe -/* 824438 80241178 00A0802D */ daddu $s0, $a1, $zero -/* 82443C 8024117C 8E040020 */ lw $a0, 0x20($s0) -/* 824440 80241180 0040902D */ daddu $s2, $v0, $zero -/* 824444 80241184 00041FC2 */ srl $v1, $a0, 0x1f -/* 824448 80241188 00832021 */ addu $a0, $a0, $v1 -/* 82444C 8024118C 00042043 */ sra $a0, $a0, 1 -/* 824450 80241190 0C00A67F */ jal rand_int -/* 824454 80241194 24840001 */ addiu $a0, $a0, 1 -/* 824458 80241198 8E030020 */ lw $v1, 0x20($s0) -/* 82445C 8024119C C64C0038 */ lwc1 $f12, 0x38($s2) -/* 824460 802411A0 000327C2 */ srl $a0, $v1, 0x1f -/* 824464 802411A4 00641821 */ addu $v1, $v1, $a0 -/* 824468 802411A8 00031843 */ sra $v1, $v1, 1 -/* 82446C 802411AC 00621821 */ addu $v1, $v1, $v0 -/* 824470 802411B0 A643008E */ sh $v1, 0x8e($s2) -/* 824474 802411B4 8E2200CC */ lw $v0, 0xcc($s1) -/* 824478 802411B8 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 82447C 802411BC 8C42000C */ lw $v0, 0xc($v0) -/* 824480 802411C0 AE420028 */ sw $v0, 0x28($s2) -/* 824484 802411C4 C6000018 */ lwc1 $f0, 0x18($s0) -/* 824488 802411C8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 82448C 802411CC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 824490 802411D0 E6400018 */ swc1 $f0, 0x18($s2) -/* 824494 802411D4 8C460028 */ lw $a2, 0x28($v0) -/* 824498 802411D8 0C00A720 */ jal atan2 -/* 82449C 802411DC 8C470030 */ lw $a3, 0x30($v0) -/* 8244A0 802411E0 46000506 */ mov.s $f20, $f0 -/* 8244A4 802411E4 C64C000C */ lwc1 $f12, 0xc($s2) -/* 8244A8 802411E8 0C00A70A */ jal get_clamped_angle_diff -/* 8244AC 802411EC 4600A386 */ mov.s $f14, $f20 -/* 8244B0 802411F0 46000086 */ mov.s $f2, $f0 -/* 8244B4 802411F4 8E02001C */ lw $v0, 0x1c($s0) -/* 8244B8 802411F8 46001005 */ abs.s $f0, $f2 -/* 8244BC 802411FC 44822000 */ mtc1 $v0, $f4 -/* 8244C0 80241200 00000000 */ nop -/* 8244C4 80241204 46802120 */ cvt.s.w $f4, $f4 -/* 8244C8 80241208 4600203C */ c.lt.s $f4, $f0 -/* 8244CC 8024120C 00000000 */ nop -/* 8244D0 80241210 4500000D */ bc1f .L80241248 -/* 8244D4 80241214 00000000 */ nop -/* 8244D8 80241218 44800000 */ mtc1 $zero, $f0 -/* 8244DC 8024121C C654000C */ lwc1 $f20, 0xc($s2) -/* 8244E0 80241220 4600103C */ c.lt.s $f2, $f0 -/* 8244E4 80241224 00000000 */ nop -/* 8244E8 80241228 45000006 */ bc1f .L80241244 -/* 8244EC 8024122C 00021023 */ negu $v0, $v0 -/* 8244F0 80241230 44820000 */ mtc1 $v0, $f0 -/* 8244F4 80241234 00000000 */ nop -/* 8244F8 80241238 46800020 */ cvt.s.w $f0, $f0 -/* 8244FC 8024123C 08090492 */ j .L80241248 -/* 824500 80241240 4600A500 */ add.s $f20, $f20, $f0 -.L80241244: -/* 824504 80241244 4604A500 */ add.s $f20, $f20, $f4 -.L80241248: -/* 824508 80241248 0C00A6C9 */ jal clamp_angle -/* 82450C 8024124C 4600A306 */ mov.s $f12, $f20 -/* 824510 80241250 2402000D */ addiu $v0, $zero, 0xd -/* 824514 80241254 E640000C */ swc1 $f0, 0xc($s2) -/* 824518 80241258 AE620070 */ sw $v0, 0x70($s3) -/* 82451C 8024125C 8FBF0020 */ lw $ra, 0x20($sp) -/* 824520 80241260 8FB3001C */ lw $s3, 0x1c($sp) -/* 824524 80241264 8FB20018 */ lw $s2, 0x18($sp) -/* 824528 80241268 8FB10014 */ lw $s1, 0x14($sp) -/* 82452C 8024126C 8FB00010 */ lw $s0, 0x10($sp) -/* 824530 80241270 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 824534 80241274 03E00008 */ jr $ra -/* 824538 80241278 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C_82440C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C_82440C.s new file mode 100644 index 0000000000..780749088d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024114C_82440C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024114C_82440C +/* 82440C 8024114C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 824410 80241150 AFB3001C */ sw $s3, 0x1c($sp) +/* 824414 80241154 0080982D */ daddu $s3, $a0, $zero +/* 824418 80241158 AFBF0020 */ sw $ra, 0x20($sp) +/* 82441C 8024115C AFB20018 */ sw $s2, 0x18($sp) +/* 824420 80241160 AFB10014 */ sw $s1, 0x14($sp) +/* 824424 80241164 AFB00010 */ sw $s0, 0x10($sp) +/* 824428 80241168 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 82442C 8024116C 8E710148 */ lw $s1, 0x148($s3) +/* 824430 80241170 86240008 */ lh $a0, 8($s1) +/* 824434 80241174 0C00EABB */ jal get_npc_unsafe +/* 824438 80241178 00A0802D */ daddu $s0, $a1, $zero +/* 82443C 8024117C 8E040020 */ lw $a0, 0x20($s0) +/* 824440 80241180 0040902D */ daddu $s2, $v0, $zero +/* 824444 80241184 00041FC2 */ srl $v1, $a0, 0x1f +/* 824448 80241188 00832021 */ addu $a0, $a0, $v1 +/* 82444C 8024118C 00042043 */ sra $a0, $a0, 1 +/* 824450 80241190 0C00A67F */ jal rand_int +/* 824454 80241194 24840001 */ addiu $a0, $a0, 1 +/* 824458 80241198 8E030020 */ lw $v1, 0x20($s0) +/* 82445C 8024119C C64C0038 */ lwc1 $f12, 0x38($s2) +/* 824460 802411A0 000327C2 */ srl $a0, $v1, 0x1f +/* 824464 802411A4 00641821 */ addu $v1, $v1, $a0 +/* 824468 802411A8 00031843 */ sra $v1, $v1, 1 +/* 82446C 802411AC 00621821 */ addu $v1, $v1, $v0 +/* 824470 802411B0 A643008E */ sh $v1, 0x8e($s2) +/* 824474 802411B4 8E2200CC */ lw $v0, 0xcc($s1) +/* 824478 802411B8 C64E0040 */ lwc1 $f14, 0x40($s2) +/* 82447C 802411BC 8C42000C */ lw $v0, 0xc($v0) +/* 824480 802411C0 AE420028 */ sw $v0, 0x28($s2) +/* 824484 802411C4 C6000018 */ lwc1 $f0, 0x18($s0) +/* 824488 802411C8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 82448C 802411CC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 824490 802411D0 E6400018 */ swc1 $f0, 0x18($s2) +/* 824494 802411D4 8C460028 */ lw $a2, 0x28($v0) +/* 824498 802411D8 0C00A720 */ jal atan2 +/* 82449C 802411DC 8C470030 */ lw $a3, 0x30($v0) +/* 8244A0 802411E0 46000506 */ mov.s $f20, $f0 +/* 8244A4 802411E4 C64C000C */ lwc1 $f12, 0xc($s2) +/* 8244A8 802411E8 0C00A70A */ jal get_clamped_angle_diff +/* 8244AC 802411EC 4600A386 */ mov.s $f14, $f20 +/* 8244B0 802411F0 46000086 */ mov.s $f2, $f0 +/* 8244B4 802411F4 8E02001C */ lw $v0, 0x1c($s0) +/* 8244B8 802411F8 46001005 */ abs.s $f0, $f2 +/* 8244BC 802411FC 44822000 */ mtc1 $v0, $f4 +/* 8244C0 80241200 00000000 */ nop +/* 8244C4 80241204 46802120 */ cvt.s.w $f4, $f4 +/* 8244C8 80241208 4600203C */ c.lt.s $f4, $f0 +/* 8244CC 8024120C 00000000 */ nop +/* 8244D0 80241210 4500000D */ bc1f .L80241248 +/* 8244D4 80241214 00000000 */ nop +/* 8244D8 80241218 44800000 */ mtc1 $zero, $f0 +/* 8244DC 8024121C C654000C */ lwc1 $f20, 0xc($s2) +/* 8244E0 80241220 4600103C */ c.lt.s $f2, $f0 +/* 8244E4 80241224 00000000 */ nop +/* 8244E8 80241228 45000006 */ bc1f .L80241244 +/* 8244EC 8024122C 00021023 */ negu $v0, $v0 +/* 8244F0 80241230 44820000 */ mtc1 $v0, $f0 +/* 8244F4 80241234 00000000 */ nop +/* 8244F8 80241238 46800020 */ cvt.s.w $f0, $f0 +/* 8244FC 8024123C 08090492 */ j .L80241248 +/* 824500 80241240 4600A500 */ add.s $f20, $f20, $f0 +.L80241244: +/* 824504 80241244 4604A500 */ add.s $f20, $f20, $f4 +.L80241248: +/* 824508 80241248 0C00A6C9 */ jal clamp_angle +/* 82450C 8024124C 4600A306 */ mov.s $f12, $f20 +/* 824510 80241250 2402000D */ addiu $v0, $zero, 0xd +/* 824514 80241254 E640000C */ swc1 $f0, 0xc($s2) +/* 824518 80241258 AE620070 */ sw $v0, 0x70($s3) +/* 82451C 8024125C 8FBF0020 */ lw $ra, 0x20($sp) +/* 824520 80241260 8FB3001C */ lw $s3, 0x1c($sp) +/* 824524 80241264 8FB20018 */ lw $s2, 0x18($sp) +/* 824528 80241268 8FB10014 */ lw $s1, 0x14($sp) +/* 82452C 8024126C 8FB00010 */ lw $s0, 0x10($sp) +/* 824530 80241270 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 824534 80241274 03E00008 */ jr $ra +/* 824538 80241278 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C.s deleted file mode 100644 index b4882eb198..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024127C -/* 82453C 8024127C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 824540 80241280 AFB3003C */ sw $s3, 0x3c($sp) -/* 824544 80241284 0080982D */ daddu $s3, $a0, $zero -/* 824548 80241288 AFBF0040 */ sw $ra, 0x40($sp) -/* 82454C 8024128C AFB20038 */ sw $s2, 0x38($sp) -/* 824550 80241290 AFB10034 */ sw $s1, 0x34($sp) -/* 824554 80241294 AFB00030 */ sw $s0, 0x30($sp) -/* 824558 80241298 8E720148 */ lw $s2, 0x148($s3) -/* 82455C 8024129C 00A0882D */ daddu $s1, $a1, $zero -/* 824560 802412A0 86440008 */ lh $a0, 8($s2) -/* 824564 802412A4 0C00EABB */ jal get_npc_unsafe -/* 824568 802412A8 00C0802D */ daddu $s0, $a2, $zero -/* 82456C 802412AC 0200202D */ daddu $a0, $s0, $zero -/* 824570 802412B0 0240282D */ daddu $a1, $s2, $zero -/* 824574 802412B4 24030001 */ addiu $v1, $zero, 1 -/* 824578 802412B8 AFA30010 */ sw $v1, 0x10($sp) -/* 82457C 802412BC 8E260024 */ lw $a2, 0x24($s1) -/* 824580 802412C0 8E270028 */ lw $a3, 0x28($s1) -/* 824584 802412C4 0C01242D */ jal func_800490B4 -/* 824588 802412C8 0040802D */ daddu $s0, $v0, $zero -/* 82458C 802412CC 1440001E */ bnez $v0, .L80241348 -/* 824590 802412D0 0200202D */ daddu $a0, $s0, $zero -/* 824594 802412D4 24040002 */ addiu $a0, $zero, 2 -/* 824598 802412D8 0200282D */ daddu $a1, $s0, $zero -/* 82459C 802412DC 0000302D */ daddu $a2, $zero, $zero -/* 8245A0 802412E0 860300A8 */ lh $v1, 0xa8($s0) -/* 8245A4 802412E4 3C013F80 */ lui $at, 0x3f80 -/* 8245A8 802412E8 44810000 */ mtc1 $at, $f0 -/* 8245AC 802412EC 3C014000 */ lui $at, 0x4000 -/* 8245B0 802412F0 44811000 */ mtc1 $at, $f2 -/* 8245B4 802412F4 3C01C1A0 */ lui $at, 0xc1a0 -/* 8245B8 802412F8 44812000 */ mtc1 $at, $f4 -/* 8245BC 802412FC 2402000F */ addiu $v0, $zero, 0xf -/* 8245C0 80241300 AFA2001C */ sw $v0, 0x1c($sp) -/* 8245C4 80241304 44833000 */ mtc1 $v1, $f6 -/* 8245C8 80241308 00000000 */ nop -/* 8245CC 8024130C 468031A0 */ cvt.s.w $f6, $f6 -/* 8245D0 80241310 44073000 */ mfc1 $a3, $f6 -/* 8245D4 80241314 27A20028 */ addiu $v0, $sp, 0x28 -/* 8245D8 80241318 AFA20020 */ sw $v0, 0x20($sp) -/* 8245DC 8024131C E7A00010 */ swc1 $f0, 0x10($sp) -/* 8245E0 80241320 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8245E4 80241324 0C01BFA4 */ jal fx_emote -/* 8245E8 80241328 E7A40018 */ swc1 $f4, 0x18($sp) -/* 8245EC 8024132C 8E4200CC */ lw $v0, 0xcc($s2) -/* 8245F0 80241330 8C430000 */ lw $v1, ($v0) -/* 8245F4 80241334 24020019 */ addiu $v0, $zero, 0x19 -/* 8245F8 80241338 A602008E */ sh $v0, 0x8e($s0) -/* 8245FC 8024133C 2402000E */ addiu $v0, $zero, 0xe -/* 824600 80241340 080904DF */ j .L8024137C -/* 824604 80241344 AE030028 */ sw $v1, 0x28($s0) -.L80241348: -/* 824608 80241348 0C00F598 */ jal func_8003D660 -/* 82460C 8024134C 24050001 */ addiu $a1, $zero, 1 -/* 824610 80241350 8E050018 */ lw $a1, 0x18($s0) -/* 824614 80241354 8E06000C */ lw $a2, 0xc($s0) -/* 824618 80241358 0C00EA95 */ jal npc_move_heading -/* 82461C 8024135C 0200202D */ daddu $a0, $s0, $zero -/* 824620 80241360 8602008E */ lh $v0, 0x8e($s0) -/* 824624 80241364 9603008E */ lhu $v1, 0x8e($s0) -/* 824628 80241368 18400003 */ blez $v0, .L80241378 -/* 82462C 8024136C 2462FFFF */ addiu $v0, $v1, -1 -/* 824630 80241370 080904E0 */ j .L80241380 -/* 824634 80241374 A602008E */ sh $v0, 0x8e($s0) -.L80241378: -/* 824638 80241378 2402000C */ addiu $v0, $zero, 0xc -.L8024137C: -/* 82463C 8024137C AE620070 */ sw $v0, 0x70($s3) -.L80241380: -/* 824640 80241380 8FBF0040 */ lw $ra, 0x40($sp) -/* 824644 80241384 8FB3003C */ lw $s3, 0x3c($sp) -/* 824648 80241388 8FB20038 */ lw $s2, 0x38($sp) -/* 82464C 8024138C 8FB10034 */ lw $s1, 0x34($sp) -/* 824650 80241390 8FB00030 */ lw $s0, 0x30($sp) -/* 824654 80241394 03E00008 */ jr $ra -/* 824658 80241398 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s new file mode 100644 index 0000000000..57e6efe435 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024127C_82453C.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024127C_82453C +/* 82453C 8024127C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 824540 80241280 AFB3003C */ sw $s3, 0x3c($sp) +/* 824544 80241284 0080982D */ daddu $s3, $a0, $zero +/* 824548 80241288 AFBF0040 */ sw $ra, 0x40($sp) +/* 82454C 8024128C AFB20038 */ sw $s2, 0x38($sp) +/* 824550 80241290 AFB10034 */ sw $s1, 0x34($sp) +/* 824554 80241294 AFB00030 */ sw $s0, 0x30($sp) +/* 824558 80241298 8E720148 */ lw $s2, 0x148($s3) +/* 82455C 8024129C 00A0882D */ daddu $s1, $a1, $zero +/* 824560 802412A0 86440008 */ lh $a0, 8($s2) +/* 824564 802412A4 0C00EABB */ jal get_npc_unsafe +/* 824568 802412A8 00C0802D */ daddu $s0, $a2, $zero +/* 82456C 802412AC 0200202D */ daddu $a0, $s0, $zero +/* 824570 802412B0 0240282D */ daddu $a1, $s2, $zero +/* 824574 802412B4 24030001 */ addiu $v1, $zero, 1 +/* 824578 802412B8 AFA30010 */ sw $v1, 0x10($sp) +/* 82457C 802412BC 8E260024 */ lw $a2, 0x24($s1) +/* 824580 802412C0 8E270028 */ lw $a3, 0x28($s1) +/* 824584 802412C4 0C01242D */ jal func_800490B4 +/* 824588 802412C8 0040802D */ daddu $s0, $v0, $zero +/* 82458C 802412CC 1440001E */ bnez $v0, .L80241348 +/* 824590 802412D0 0200202D */ daddu $a0, $s0, $zero +/* 824594 802412D4 24040002 */ addiu $a0, $zero, 2 +/* 824598 802412D8 0200282D */ daddu $a1, $s0, $zero +/* 82459C 802412DC 0000302D */ daddu $a2, $zero, $zero +/* 8245A0 802412E0 860300A8 */ lh $v1, 0xa8($s0) +/* 8245A4 802412E4 3C013F80 */ lui $at, 0x3f80 +/* 8245A8 802412E8 44810000 */ mtc1 $at, $f0 +/* 8245AC 802412EC 3C014000 */ lui $at, 0x4000 +/* 8245B0 802412F0 44811000 */ mtc1 $at, $f2 +/* 8245B4 802412F4 3C01C1A0 */ lui $at, 0xc1a0 +/* 8245B8 802412F8 44812000 */ mtc1 $at, $f4 +/* 8245BC 802412FC 2402000F */ addiu $v0, $zero, 0xf +/* 8245C0 80241300 AFA2001C */ sw $v0, 0x1c($sp) +/* 8245C4 80241304 44833000 */ mtc1 $v1, $f6 +/* 8245C8 80241308 00000000 */ nop +/* 8245CC 8024130C 468031A0 */ cvt.s.w $f6, $f6 +/* 8245D0 80241310 44073000 */ mfc1 $a3, $f6 +/* 8245D4 80241314 27A20028 */ addiu $v0, $sp, 0x28 +/* 8245D8 80241318 AFA20020 */ sw $v0, 0x20($sp) +/* 8245DC 8024131C E7A00010 */ swc1 $f0, 0x10($sp) +/* 8245E0 80241320 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8245E4 80241324 0C01BFA4 */ jal fx_emote +/* 8245E8 80241328 E7A40018 */ swc1 $f4, 0x18($sp) +/* 8245EC 8024132C 8E4200CC */ lw $v0, 0xcc($s2) +/* 8245F0 80241330 8C430000 */ lw $v1, ($v0) +/* 8245F4 80241334 24020019 */ addiu $v0, $zero, 0x19 +/* 8245F8 80241338 A602008E */ sh $v0, 0x8e($s0) +/* 8245FC 8024133C 2402000E */ addiu $v0, $zero, 0xe +/* 824600 80241340 080904DF */ j .L8024137C +/* 824604 80241344 AE030028 */ sw $v1, 0x28($s0) +.L80241348: +/* 824608 80241348 0C00F598 */ jal func_8003D660 +/* 82460C 8024134C 24050001 */ addiu $a1, $zero, 1 +/* 824610 80241350 8E050018 */ lw $a1, 0x18($s0) +/* 824614 80241354 8E06000C */ lw $a2, 0xc($s0) +/* 824618 80241358 0C00EA95 */ jal npc_move_heading +/* 82461C 8024135C 0200202D */ daddu $a0, $s0, $zero +/* 824620 80241360 8602008E */ lh $v0, 0x8e($s0) +/* 824624 80241364 9603008E */ lhu $v1, 0x8e($s0) +/* 824628 80241368 18400003 */ blez $v0, .L80241378 +/* 82462C 8024136C 2462FFFF */ addiu $v0, $v1, -1 +/* 824630 80241370 080904E0 */ j .L80241380 +/* 824634 80241374 A602008E */ sh $v0, 0x8e($s0) +.L80241378: +/* 824638 80241378 2402000C */ addiu $v0, $zero, 0xc +.L8024137C: +/* 82463C 8024137C AE620070 */ sw $v0, 0x70($s3) +.L80241380: +/* 824640 80241380 8FBF0040 */ lw $ra, 0x40($sp) +/* 824644 80241384 8FB3003C */ lw $s3, 0x3c($sp) +/* 824648 80241388 8FB20038 */ lw $s2, 0x38($sp) +/* 82464C 8024138C 8FB10034 */ lw $s1, 0x34($sp) +/* 824650 80241390 8FB00030 */ lw $s0, 0x30($sp) +/* 824654 80241394 03E00008 */ jr $ra +/* 824658 80241398 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C.s deleted file mode 100644 index 4e968c00ce..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024139C -/* 82465C 8024139C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824660 802413A0 AFB10014 */ sw $s1, 0x14($sp) -/* 824664 802413A4 0080882D */ daddu $s1, $a0, $zero -/* 824668 802413A8 AFBF0018 */ sw $ra, 0x18($sp) -/* 82466C 802413AC AFB00010 */ sw $s0, 0x10($sp) -/* 824670 802413B0 8E300148 */ lw $s0, 0x148($s1) -/* 824674 802413B4 0C00EABB */ jal get_npc_unsafe -/* 824678 802413B8 86040008 */ lh $a0, 8($s0) -/* 82467C 802413BC 9443008E */ lhu $v1, 0x8e($v0) -/* 824680 802413C0 2463FFFF */ addiu $v1, $v1, -1 -/* 824684 802413C4 A443008E */ sh $v1, 0x8e($v0) -/* 824688 802413C8 00031C00 */ sll $v1, $v1, 0x10 -/* 82468C 802413CC 14600008 */ bnez $v1, .L802413F0 -/* 824690 802413D0 00000000 */ nop -/* 824694 802413D4 8E0200B0 */ lw $v0, 0xb0($s0) -/* 824698 802413D8 30420080 */ andi $v0, $v0, 0x80 -/* 82469C 802413DC 10400003 */ beqz $v0, .L802413EC -/* 8246A0 802413E0 2402000F */ addiu $v0, $zero, 0xf -/* 8246A4 802413E4 080904FC */ j .L802413F0 -/* 8246A8 802413E8 AE220070 */ sw $v0, 0x70($s1) -.L802413EC: -/* 8246AC 802413EC AE200070 */ sw $zero, 0x70($s1) -.L802413F0: -/* 8246B0 802413F0 8FBF0018 */ lw $ra, 0x18($sp) -/* 8246B4 802413F4 8FB10014 */ lw $s1, 0x14($sp) -/* 8246B8 802413F8 8FB00010 */ lw $s0, 0x10($sp) -/* 8246BC 802413FC 03E00008 */ jr $ra -/* 8246C0 80241400 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s new file mode 100644 index 0000000000..44357e1367 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024139C_82465C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024139C_82465C +/* 82465C 8024139C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 824660 802413A0 AFB10014 */ sw $s1, 0x14($sp) +/* 824664 802413A4 0080882D */ daddu $s1, $a0, $zero +/* 824668 802413A8 AFBF0018 */ sw $ra, 0x18($sp) +/* 82466C 802413AC AFB00010 */ sw $s0, 0x10($sp) +/* 824670 802413B0 8E300148 */ lw $s0, 0x148($s1) +/* 824674 802413B4 0C00EABB */ jal get_npc_unsafe +/* 824678 802413B8 86040008 */ lh $a0, 8($s0) +/* 82467C 802413BC 9443008E */ lhu $v1, 0x8e($v0) +/* 824680 802413C0 2463FFFF */ addiu $v1, $v1, -1 +/* 824684 802413C4 A443008E */ sh $v1, 0x8e($v0) +/* 824688 802413C8 00031C00 */ sll $v1, $v1, 0x10 +/* 82468C 802413CC 14600008 */ bnez $v1, .L802413F0 +/* 824690 802413D0 00000000 */ nop +/* 824694 802413D4 8E0200B0 */ lw $v0, 0xb0($s0) +/* 824698 802413D8 30420080 */ andi $v0, $v0, 0x80 +/* 82469C 802413DC 10400003 */ beqz $v0, .L802413EC +/* 8246A0 802413E0 2402000F */ addiu $v0, $zero, 0xf +/* 8246A4 802413E4 080904FC */ j .L802413F0 +/* 8246A8 802413E8 AE220070 */ sw $v0, 0x70($s1) +.L802413EC: +/* 8246AC 802413EC AE200070 */ sw $zero, 0x70($s1) +.L802413F0: +/* 8246B0 802413F0 8FBF0018 */ lw $ra, 0x18($sp) +/* 8246B4 802413F4 8FB10014 */ lw $s1, 0x14($sp) +/* 8246B8 802413F8 8FB00010 */ lw $s0, 0x10($sp) +/* 8246BC 802413FC 03E00008 */ jr $ra +/* 8246C0 80241400 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404.s deleted file mode 100644 index 8b125d1e61..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241404 -/* 8246C4 80241404 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8246C8 80241408 AFB10014 */ sw $s1, 0x14($sp) -/* 8246CC 8024140C 0080882D */ daddu $s1, $a0, $zero -/* 8246D0 80241410 AFBF001C */ sw $ra, 0x1c($sp) -/* 8246D4 80241414 AFB20018 */ sw $s2, 0x18($sp) -/* 8246D8 80241418 AFB00010 */ sw $s0, 0x10($sp) -/* 8246DC 8024141C 8E300148 */ lw $s0, 0x148($s1) -/* 8246E0 80241420 86040008 */ lh $a0, 8($s0) -/* 8246E4 80241424 0C00EABB */ jal get_npc_unsafe -/* 8246E8 80241428 00A0902D */ daddu $s2, $a1, $zero -/* 8246EC 8024142C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 8246F0 80241430 8E240078 */ lw $a0, 0x78($s1) -/* 8246F4 80241434 8C630000 */ lw $v1, ($v1) -/* 8246F8 80241438 0083182A */ slt $v1, $a0, $v1 -/* 8246FC 8024143C 10600013 */ beqz $v1, .L8024148C -/* 824700 80241440 0040302D */ daddu $a2, $v0, $zero -/* 824704 80241444 00041040 */ sll $v0, $a0, 1 -/* 824708 80241448 00441021 */ addu $v0, $v0, $a0 -/* 82470C 8024144C 00022880 */ sll $a1, $v0, 2 -.L80241450: -/* 824710 80241450 8E0300D0 */ lw $v1, 0xd0($s0) -/* 824714 80241454 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 824718 80241458 00A31021 */ addu $v0, $a1, $v1 -/* 82471C 8024145C C4400008 */ lwc1 $f0, 8($v0) -/* 824720 80241460 46800020 */ cvt.s.w $f0, $f0 -/* 824724 80241464 4602003E */ c.le.s $f0, $f2 -/* 824728 80241468 00000000 */ nop -/* 82472C 8024146C 45020003 */ bc1fl .L8024147C -/* 824730 80241470 24840001 */ addiu $a0, $a0, 1 -/* 824734 80241474 08090523 */ j .L8024148C -/* 824738 80241478 AE240078 */ sw $a0, 0x78($s1) -.L8024147C: -/* 82473C 8024147C 8C620000 */ lw $v0, ($v1) -/* 824740 80241480 0082102A */ slt $v0, $a0, $v0 -/* 824744 80241484 1440FFF2 */ bnez $v0, .L80241450 -/* 824748 80241488 24A5000C */ addiu $a1, $a1, 0xc -.L8024148C: -/* 82474C 8024148C C6400000 */ lwc1 $f0, ($s2) -/* 824750 80241490 E4C00018 */ swc1 $f0, 0x18($a2) -/* 824754 80241494 8E0200CC */ lw $v0, 0xcc($s0) -/* 824758 80241498 8C420004 */ lw $v0, 4($v0) -/* 82475C 8024149C ACC20028 */ sw $v0, 0x28($a2) -/* 824760 802414A0 24020001 */ addiu $v0, $zero, 1 -/* 824764 802414A4 AE200074 */ sw $zero, 0x74($s1) -/* 824768 802414A8 AE220070 */ sw $v0, 0x70($s1) -/* 82476C 802414AC 8FBF001C */ lw $ra, 0x1c($sp) -/* 824770 802414B0 8FB20018 */ lw $s2, 0x18($sp) -/* 824774 802414B4 8FB10014 */ lw $s1, 0x14($sp) -/* 824778 802414B8 8FB00010 */ lw $s0, 0x10($sp) -/* 82477C 802414BC 03E00008 */ jr $ra -/* 824780 802414C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s new file mode 100644 index 0000000000..79ff650799 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241404_8246C4.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241404_8246C4 +/* 8246C4 80241404 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8246C8 80241408 AFB10014 */ sw $s1, 0x14($sp) +/* 8246CC 8024140C 0080882D */ daddu $s1, $a0, $zero +/* 8246D0 80241410 AFBF001C */ sw $ra, 0x1c($sp) +/* 8246D4 80241414 AFB20018 */ sw $s2, 0x18($sp) +/* 8246D8 80241418 AFB00010 */ sw $s0, 0x10($sp) +/* 8246DC 8024141C 8E300148 */ lw $s0, 0x148($s1) +/* 8246E0 80241420 86040008 */ lh $a0, 8($s0) +/* 8246E4 80241424 0C00EABB */ jal get_npc_unsafe +/* 8246E8 80241428 00A0902D */ daddu $s2, $a1, $zero +/* 8246EC 8024142C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 8246F0 80241430 8E240078 */ lw $a0, 0x78($s1) +/* 8246F4 80241434 8C630000 */ lw $v1, ($v1) +/* 8246F8 80241438 0083182A */ slt $v1, $a0, $v1 +/* 8246FC 8024143C 10600013 */ beqz $v1, .L8024148C +/* 824700 80241440 0040302D */ daddu $a2, $v0, $zero +/* 824704 80241444 00041040 */ sll $v0, $a0, 1 +/* 824708 80241448 00441021 */ addu $v0, $v0, $a0 +/* 82470C 8024144C 00022880 */ sll $a1, $v0, 2 +.L80241450: +/* 824710 80241450 8E0300D0 */ lw $v1, 0xd0($s0) +/* 824714 80241454 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* 824718 80241458 00A31021 */ addu $v0, $a1, $v1 +/* 82471C 8024145C C4400008 */ lwc1 $f0, 8($v0) +/* 824720 80241460 46800020 */ cvt.s.w $f0, $f0 +/* 824724 80241464 4602003E */ c.le.s $f0, $f2 +/* 824728 80241468 00000000 */ nop +/* 82472C 8024146C 45020003 */ bc1fl .L8024147C +/* 824730 80241470 24840001 */ addiu $a0, $a0, 1 +/* 824734 80241474 08090523 */ j .L8024148C +/* 824738 80241478 AE240078 */ sw $a0, 0x78($s1) +.L8024147C: +/* 82473C 8024147C 8C620000 */ lw $v0, ($v1) +/* 824740 80241480 0082102A */ slt $v0, $a0, $v0 +/* 824744 80241484 1440FFF2 */ bnez $v0, .L80241450 +/* 824748 80241488 24A5000C */ addiu $a1, $a1, 0xc +.L8024148C: +/* 82474C 8024148C C6400000 */ lwc1 $f0, ($s2) +/* 824750 80241490 E4C00018 */ swc1 $f0, 0x18($a2) +/* 824754 80241494 8E0200CC */ lw $v0, 0xcc($s0) +/* 824758 80241498 8C420004 */ lw $v0, 4($v0) +/* 82475C 8024149C ACC20028 */ sw $v0, 0x28($a2) +/* 824760 802414A0 24020001 */ addiu $v0, $zero, 1 +/* 824764 802414A4 AE200074 */ sw $zero, 0x74($s1) +/* 824768 802414A8 AE220070 */ sw $v0, 0x70($s1) +/* 82476C 802414AC 8FBF001C */ lw $ra, 0x1c($sp) +/* 824770 802414B0 8FB20018 */ lw $s2, 0x18($sp) +/* 824774 802414B4 8FB10014 */ lw $s1, 0x14($sp) +/* 824778 802414B8 8FB00010 */ lw $s0, 0x10($sp) +/* 82477C 802414BC 03E00008 */ jr $ra +/* 824780 802414C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4.s deleted file mode 100644 index 5c07b014c5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414C4 -/* 824784 802414C4 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 824788 802414C8 AFB40058 */ sw $s4, 0x58($sp) -/* 82478C 802414CC 0080A02D */ daddu $s4, $a0, $zero -/* 824790 802414D0 AFBF0060 */ sw $ra, 0x60($sp) -/* 824794 802414D4 AFB5005C */ sw $s5, 0x5c($sp) -/* 824798 802414D8 AFB30054 */ sw $s3, 0x54($sp) -/* 82479C 802414DC AFB20050 */ sw $s2, 0x50($sp) -/* 8247A0 802414E0 AFB1004C */ sw $s1, 0x4c($sp) -/* 8247A4 802414E4 AFB00048 */ sw $s0, 0x48($sp) -/* 8247A8 802414E8 8E910148 */ lw $s1, 0x148($s4) -/* 8247AC 802414EC 86240008 */ lh $a0, 8($s1) -/* 8247B0 802414F0 0C00EABB */ jal get_npc_unsafe -/* 8247B4 802414F4 00A0802D */ daddu $s0, $a1, $zero -/* 8247B8 802414F8 8E83000C */ lw $v1, 0xc($s4) -/* 8247BC 802414FC 0280202D */ daddu $a0, $s4, $zero -/* 8247C0 80241500 8C650000 */ lw $a1, ($v1) -/* 8247C4 80241504 0C0B1EAF */ jal get_variable -/* 8247C8 80241508 0040902D */ daddu $s2, $v0, $zero -/* 8247CC 8024150C AFA00018 */ sw $zero, 0x18($sp) -/* 8247D0 80241510 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8247D4 80241514 8C630094 */ lw $v1, 0x94($v1) -/* 8247D8 80241518 AFA3001C */ sw $v1, 0x1c($sp) -/* 8247DC 8024151C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8247E0 80241520 8C630080 */ lw $v1, 0x80($v1) -/* 8247E4 80241524 AFA30020 */ sw $v1, 0x20($sp) -/* 8247E8 80241528 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8247EC 8024152C 8C630088 */ lw $v1, 0x88($v1) -/* 8247F0 80241530 AFA30024 */ sw $v1, 0x24($sp) -/* 8247F4 80241534 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8247F8 80241538 8C63008C */ lw $v1, 0x8c($v1) -/* 8247FC 8024153C 27B50018 */ addiu $s5, $sp, 0x18 -/* 824800 80241540 AFA30028 */ sw $v1, 0x28($sp) -/* 824804 80241544 8E2300D0 */ lw $v1, 0xd0($s1) -/* 824808 80241548 3C014282 */ lui $at, 0x4282 -/* 82480C 8024154C 44810000 */ mtc1 $at, $f0 -/* 824810 80241550 8C630090 */ lw $v1, 0x90($v1) -/* 824814 80241554 0040982D */ daddu $s3, $v0, $zero -/* 824818 80241558 E7A00030 */ swc1 $f0, 0x30($sp) -/* 82481C 8024155C A7A00034 */ sh $zero, 0x34($sp) -/* 824820 80241560 16000005 */ bnez $s0, .L80241578 -/* 824824 80241564 AFA3002C */ sw $v1, 0x2c($sp) -/* 824828 80241568 8E2200B0 */ lw $v0, 0xb0($s1) -/* 82482C 8024156C 30420004 */ andi $v0, $v0, 4 -/* 824830 80241570 10400044 */ beqz $v0, .L80241684 -/* 824834 80241574 00000000 */ nop -.L80241578: -/* 824838 80241578 2404F7FF */ addiu $a0, $zero, -0x801 -/* 82483C 8024157C AE800070 */ sw $zero, 0x70($s4) -/* 824840 80241580 A640008E */ sh $zero, 0x8e($s2) -/* 824844 80241584 8E2200CC */ lw $v0, 0xcc($s1) -/* 824848 80241588 8E430000 */ lw $v1, ($s2) -/* 82484C 8024158C 8C420000 */ lw $v0, ($v0) -/* 824850 80241590 00641824 */ and $v1, $v1, $a0 -/* 824854 80241594 AE430000 */ sw $v1, ($s2) -/* 824858 80241598 AE420028 */ sw $v0, 0x28($s2) -/* 82485C 8024159C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 824860 802415A0 8C420098 */ lw $v0, 0x98($v0) -/* 824864 802415A4 54400005 */ bnel $v0, $zero, .L802415BC -/* 824868 802415A8 2402FDFF */ addiu $v0, $zero, -0x201 -/* 82486C 802415AC 34620200 */ ori $v0, $v1, 0x200 -/* 824870 802415B0 2403FFF7 */ addiu $v1, $zero, -9 -/* 824874 802415B4 08090571 */ j .L802415C4 -/* 824878 802415B8 00431024 */ and $v0, $v0, $v1 -.L802415BC: -/* 82487C 802415BC 00621024 */ and $v0, $v1, $v0 -/* 824880 802415C0 34420008 */ ori $v0, $v0, 8 -.L802415C4: -/* 824884 802415C4 AE420000 */ sw $v0, ($s2) -/* 824888 802415C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 82488C 802415CC 30420004 */ andi $v0, $v0, 4 -/* 824890 802415D0 10400008 */ beqz $v0, .L802415F4 -/* 824894 802415D4 24020063 */ addiu $v0, $zero, 0x63 -/* 824898 802415D8 AE820070 */ sw $v0, 0x70($s4) -/* 82489C 802415DC AE800074 */ sw $zero, 0x74($s4) -/* 8248A0 802415E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8248A4 802415E4 2403FFFB */ addiu $v1, $zero, -5 -/* 8248A8 802415E8 00431024 */ and $v0, $v0, $v1 -/* 8248AC 802415EC 08090588 */ j .L80241620 -/* 8248B0 802415F0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802415F4: -/* 8248B4 802415F4 8E220000 */ lw $v0, ($s1) -/* 8248B8 802415F8 3C034000 */ lui $v1, 0x4000 -/* 8248BC 802415FC 00431024 */ and $v0, $v0, $v1 -/* 8248C0 80241600 10400007 */ beqz $v0, .L80241620 -/* 8248C4 80241604 3C03BFFF */ lui $v1, 0xbfff -/* 8248C8 80241608 2402000C */ addiu $v0, $zero, 0xc -/* 8248CC 8024160C AE820070 */ sw $v0, 0x70($s4) -/* 8248D0 80241610 8E220000 */ lw $v0, ($s1) -/* 8248D4 80241614 3463FFFF */ ori $v1, $v1, 0xffff -/* 8248D8 80241618 00431024 */ and $v0, $v0, $v1 -/* 8248DC 8024161C AE220000 */ sw $v0, ($s1) -.L80241620: -/* 8248E0 80241620 27A50038 */ addiu $a1, $sp, 0x38 -/* 8248E4 80241624 27A6003C */ addiu $a2, $sp, 0x3c -/* 8248E8 80241628 C6400038 */ lwc1 $f0, 0x38($s2) -/* 8248EC 8024162C 864200A8 */ lh $v0, 0xa8($s2) -/* 8248F0 80241630 3C0142C8 */ lui $at, 0x42c8 -/* 8248F4 80241634 44812000 */ mtc1 $at, $f4 -/* 8248F8 80241638 44823000 */ mtc1 $v0, $f6 -/* 8248FC 8024163C 00000000 */ nop -/* 824900 80241640 468031A0 */ cvt.s.w $f6, $f6 -/* 824904 80241644 27A20044 */ addiu $v0, $sp, 0x44 -/* 824908 80241648 E7A00038 */ swc1 $f0, 0x38($sp) -/* 82490C 8024164C C640003C */ lwc1 $f0, 0x3c($s2) -/* 824910 80241650 C6420040 */ lwc1 $f2, 0x40($s2) -/* 824914 80241654 46060000 */ add.s $f0, $f0, $f6 -/* 824918 80241658 E7A40044 */ swc1 $f4, 0x44($sp) -/* 82491C 8024165C E7A20040 */ swc1 $f2, 0x40($sp) -/* 824920 80241660 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 824924 80241664 AFA20010 */ sw $v0, 0x10($sp) -/* 824928 80241668 8E440080 */ lw $a0, 0x80($s2) -/* 82492C 8024166C 0C0372DF */ jal func_800DCB7C -/* 824930 80241670 27A70040 */ addiu $a3, $sp, 0x40 -/* 824934 80241674 10400003 */ beqz $v0, .L80241684 -/* 824938 80241678 00000000 */ nop -/* 82493C 8024167C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 824940 80241680 E640003C */ swc1 $f0, 0x3c($s2) -.L80241684: -/* 824944 80241684 8E830070 */ lw $v1, 0x70($s4) -/* 824948 80241688 2C620064 */ sltiu $v0, $v1, 0x64 -/* 82494C 8024168C 10400042 */ beqz $v0, .L80241798 -/* 824950 80241690 00031080 */ sll $v0, $v1, 2 -/* 824954 80241694 3C018025 */ lui $at, 0x8025 -/* 824958 80241698 00220821 */ addu $at, $at, $v0 -/* 82495C 8024169C 8C22E210 */ lw $v0, -0x1df0($at) -/* 824960 802416A0 00400008 */ jr $v0 -/* 824964 802416A4 00000000 */ nop -/* 824968 802416A8 0280202D */ daddu $a0, $s4, $zero -/* 82496C 802416AC 0260282D */ daddu $a1, $s3, $zero -/* 824970 802416B0 0C09024C */ jal func_80240930 -/* 824974 802416B4 02A0302D */ daddu $a2, $s5, $zero -/* 824978 802416B8 0280202D */ daddu $a0, $s4, $zero -/* 82497C 802416BC 0260282D */ daddu $a1, $s3, $zero -/* 824980 802416C0 0C0902A2 */ jal func_80240A88 -/* 824984 802416C4 02A0302D */ daddu $a2, $s5, $zero -/* 824988 802416C8 080905E6 */ j .L80241798 -/* 82498C 802416CC 00000000 */ nop -/* 824990 802416D0 0280202D */ daddu $a0, $s4, $zero -/* 824994 802416D4 0260282D */ daddu $a1, $s3, $zero -/* 824998 802416D8 0C09034C */ jal func_80240D30 -/* 82499C 802416DC 02A0302D */ daddu $a2, $s5, $zero -/* 8249A0 802416E0 0280202D */ daddu $a0, $s4, $zero -/* 8249A4 802416E4 0260282D */ daddu $a1, $s3, $zero -/* 8249A8 802416E8 0C09037C */ jal func_80240DF0 -/* 8249AC 802416EC 02A0302D */ daddu $a2, $s5, $zero -/* 8249B0 802416F0 080905E6 */ j .L80241798 -/* 8249B4 802416F4 00000000 */ nop -/* 8249B8 802416F8 0280202D */ daddu $a0, $s4, $zero -/* 8249BC 802416FC 0260282D */ daddu $a1, $s3, $zero -/* 8249C0 80241700 0C0903EB */ jal func_80240FAC -/* 8249C4 80241704 02A0302D */ daddu $a2, $s5, $zero -/* 8249C8 80241708 080905E6 */ j .L80241798 -/* 8249CC 8024170C 00000000 */ nop -/* 8249D0 80241710 0280202D */ daddu $a0, $s4, $zero -/* 8249D4 80241714 0260282D */ daddu $a1, $s3, $zero -/* 8249D8 80241718 0C090418 */ jal func_80241060 -/* 8249DC 8024171C 02A0302D */ daddu $a2, $s5, $zero -/* 8249E0 80241720 0280202D */ daddu $a0, $s4, $zero -/* 8249E4 80241724 0260282D */ daddu $a1, $s3, $zero -/* 8249E8 80241728 0C090435 */ jal func_802410D4 -/* 8249EC 8024172C 02A0302D */ daddu $a2, $s5, $zero -/* 8249F0 80241730 080905E6 */ j .L80241798 -/* 8249F4 80241734 00000000 */ nop -/* 8249F8 80241738 0280202D */ daddu $a0, $s4, $zero -/* 8249FC 8024173C 0260282D */ daddu $a1, $s3, $zero -/* 824A00 80241740 0C090453 */ jal func_8024114C -/* 824A04 80241744 02A0302D */ daddu $a2, $s5, $zero -/* 824A08 80241748 0280202D */ daddu $a0, $s4, $zero -/* 824A0C 8024174C 0260282D */ daddu $a1, $s3, $zero -/* 824A10 80241750 0C09049F */ jal func_8024127C -/* 824A14 80241754 02A0302D */ daddu $a2, $s5, $zero -/* 824A18 80241758 080905E6 */ j .L80241798 -/* 824A1C 8024175C 00000000 */ nop -/* 824A20 80241760 0280202D */ daddu $a0, $s4, $zero -/* 824A24 80241764 0260282D */ daddu $a1, $s3, $zero -/* 824A28 80241768 0C0904E7 */ jal func_8024139C -/* 824A2C 8024176C 02A0302D */ daddu $a2, $s5, $zero -/* 824A30 80241770 080905E6 */ j .L80241798 -/* 824A34 80241774 00000000 */ nop -/* 824A38 80241778 0280202D */ daddu $a0, $s4, $zero -/* 824A3C 8024177C 0260282D */ daddu $a1, $s3, $zero -/* 824A40 80241780 0C090501 */ jal func_80241404 -/* 824A44 80241784 02A0302D */ daddu $a2, $s5, $zero -/* 824A48 80241788 080905E6 */ j .L80241798 -/* 824A4C 8024178C 00000000 */ nop -/* 824A50 80241790 0C0129CF */ jal func_8004A73C -/* 824A54 80241794 0280202D */ daddu $a0, $s4, $zero -.L80241798: -/* 824A58 80241798 8FBF0060 */ lw $ra, 0x60($sp) -/* 824A5C 8024179C 8FB5005C */ lw $s5, 0x5c($sp) -/* 824A60 802417A0 8FB40058 */ lw $s4, 0x58($sp) -/* 824A64 802417A4 8FB30054 */ lw $s3, 0x54($sp) -/* 824A68 802417A8 8FB20050 */ lw $s2, 0x50($sp) -/* 824A6C 802417AC 8FB1004C */ lw $s1, 0x4c($sp) -/* 824A70 802417B0 8FB00048 */ lw $s0, 0x48($sp) -/* 824A74 802417B4 0000102D */ daddu $v0, $zero, $zero -/* 824A78 802417B8 03E00008 */ jr $ra -/* 824A7C 802417BC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s new file mode 100644 index 0000000000..be45d20fa9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802414C4_824784.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414C4_824784 +/* 824784 802414C4 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 824788 802414C8 AFB40058 */ sw $s4, 0x58($sp) +/* 82478C 802414CC 0080A02D */ daddu $s4, $a0, $zero +/* 824790 802414D0 AFBF0060 */ sw $ra, 0x60($sp) +/* 824794 802414D4 AFB5005C */ sw $s5, 0x5c($sp) +/* 824798 802414D8 AFB30054 */ sw $s3, 0x54($sp) +/* 82479C 802414DC AFB20050 */ sw $s2, 0x50($sp) +/* 8247A0 802414E0 AFB1004C */ sw $s1, 0x4c($sp) +/* 8247A4 802414E4 AFB00048 */ sw $s0, 0x48($sp) +/* 8247A8 802414E8 8E910148 */ lw $s1, 0x148($s4) +/* 8247AC 802414EC 86240008 */ lh $a0, 8($s1) +/* 8247B0 802414F0 0C00EABB */ jal get_npc_unsafe +/* 8247B4 802414F4 00A0802D */ daddu $s0, $a1, $zero +/* 8247B8 802414F8 8E83000C */ lw $v1, 0xc($s4) +/* 8247BC 802414FC 0280202D */ daddu $a0, $s4, $zero +/* 8247C0 80241500 8C650000 */ lw $a1, ($v1) +/* 8247C4 80241504 0C0B1EAF */ jal get_variable +/* 8247C8 80241508 0040902D */ daddu $s2, $v0, $zero +/* 8247CC 8024150C AFA00018 */ sw $zero, 0x18($sp) +/* 8247D0 80241510 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8247D4 80241514 8C630094 */ lw $v1, 0x94($v1) +/* 8247D8 80241518 AFA3001C */ sw $v1, 0x1c($sp) +/* 8247DC 8024151C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8247E0 80241520 8C630080 */ lw $v1, 0x80($v1) +/* 8247E4 80241524 AFA30020 */ sw $v1, 0x20($sp) +/* 8247E8 80241528 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8247EC 8024152C 8C630088 */ lw $v1, 0x88($v1) +/* 8247F0 80241530 AFA30024 */ sw $v1, 0x24($sp) +/* 8247F4 80241534 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8247F8 80241538 8C63008C */ lw $v1, 0x8c($v1) +/* 8247FC 8024153C 27B50018 */ addiu $s5, $sp, 0x18 +/* 824800 80241540 AFA30028 */ sw $v1, 0x28($sp) +/* 824804 80241544 8E2300D0 */ lw $v1, 0xd0($s1) +/* 824808 80241548 3C014282 */ lui $at, 0x4282 +/* 82480C 8024154C 44810000 */ mtc1 $at, $f0 +/* 824810 80241550 8C630090 */ lw $v1, 0x90($v1) +/* 824814 80241554 0040982D */ daddu $s3, $v0, $zero +/* 824818 80241558 E7A00030 */ swc1 $f0, 0x30($sp) +/* 82481C 8024155C A7A00034 */ sh $zero, 0x34($sp) +/* 824820 80241560 16000005 */ bnez $s0, .L80241578 +/* 824824 80241564 AFA3002C */ sw $v1, 0x2c($sp) +/* 824828 80241568 8E2200B0 */ lw $v0, 0xb0($s1) +/* 82482C 8024156C 30420004 */ andi $v0, $v0, 4 +/* 824830 80241570 10400044 */ beqz $v0, .L80241684 +/* 824834 80241574 00000000 */ nop +.L80241578: +/* 824838 80241578 2404F7FF */ addiu $a0, $zero, -0x801 +/* 82483C 8024157C AE800070 */ sw $zero, 0x70($s4) +/* 824840 80241580 A640008E */ sh $zero, 0x8e($s2) +/* 824844 80241584 8E2200CC */ lw $v0, 0xcc($s1) +/* 824848 80241588 8E430000 */ lw $v1, ($s2) +/* 82484C 8024158C 8C420000 */ lw $v0, ($v0) +/* 824850 80241590 00641824 */ and $v1, $v1, $a0 +/* 824854 80241594 AE430000 */ sw $v1, ($s2) +/* 824858 80241598 AE420028 */ sw $v0, 0x28($s2) +/* 82485C 8024159C 8E2200D0 */ lw $v0, 0xd0($s1) +/* 824860 802415A0 8C420098 */ lw $v0, 0x98($v0) +/* 824864 802415A4 54400005 */ bnel $v0, $zero, .L802415BC +/* 824868 802415A8 2402FDFF */ addiu $v0, $zero, -0x201 +/* 82486C 802415AC 34620200 */ ori $v0, $v1, 0x200 +/* 824870 802415B0 2403FFF7 */ addiu $v1, $zero, -9 +/* 824874 802415B4 08090571 */ j .L802415C4 +/* 824878 802415B8 00431024 */ and $v0, $v0, $v1 +.L802415BC: +/* 82487C 802415BC 00621024 */ and $v0, $v1, $v0 +/* 824880 802415C0 34420008 */ ori $v0, $v0, 8 +.L802415C4: +/* 824884 802415C4 AE420000 */ sw $v0, ($s2) +/* 824888 802415C8 8E2200B0 */ lw $v0, 0xb0($s1) +/* 82488C 802415CC 30420004 */ andi $v0, $v0, 4 +/* 824890 802415D0 10400008 */ beqz $v0, .L802415F4 +/* 824894 802415D4 24020063 */ addiu $v0, $zero, 0x63 +/* 824898 802415D8 AE820070 */ sw $v0, 0x70($s4) +/* 82489C 802415DC AE800074 */ sw $zero, 0x74($s4) +/* 8248A0 802415E0 8E2200B0 */ lw $v0, 0xb0($s1) +/* 8248A4 802415E4 2403FFFB */ addiu $v1, $zero, -5 +/* 8248A8 802415E8 00431024 */ and $v0, $v0, $v1 +/* 8248AC 802415EC 08090588 */ j .L80241620 +/* 8248B0 802415F0 AE2200B0 */ sw $v0, 0xb0($s1) +.L802415F4: +/* 8248B4 802415F4 8E220000 */ lw $v0, ($s1) +/* 8248B8 802415F8 3C034000 */ lui $v1, 0x4000 +/* 8248BC 802415FC 00431024 */ and $v0, $v0, $v1 +/* 8248C0 80241600 10400007 */ beqz $v0, .L80241620 +/* 8248C4 80241604 3C03BFFF */ lui $v1, 0xbfff +/* 8248C8 80241608 2402000C */ addiu $v0, $zero, 0xc +/* 8248CC 8024160C AE820070 */ sw $v0, 0x70($s4) +/* 8248D0 80241610 8E220000 */ lw $v0, ($s1) +/* 8248D4 80241614 3463FFFF */ ori $v1, $v1, 0xffff +/* 8248D8 80241618 00431024 */ and $v0, $v0, $v1 +/* 8248DC 8024161C AE220000 */ sw $v0, ($s1) +.L80241620: +/* 8248E0 80241620 27A50038 */ addiu $a1, $sp, 0x38 +/* 8248E4 80241624 27A6003C */ addiu $a2, $sp, 0x3c +/* 8248E8 80241628 C6400038 */ lwc1 $f0, 0x38($s2) +/* 8248EC 8024162C 864200A8 */ lh $v0, 0xa8($s2) +/* 8248F0 80241630 3C0142C8 */ lui $at, 0x42c8 +/* 8248F4 80241634 44812000 */ mtc1 $at, $f4 +/* 8248F8 80241638 44823000 */ mtc1 $v0, $f6 +/* 8248FC 8024163C 00000000 */ nop +/* 824900 80241640 468031A0 */ cvt.s.w $f6, $f6 +/* 824904 80241644 27A20044 */ addiu $v0, $sp, 0x44 +/* 824908 80241648 E7A00038 */ swc1 $f0, 0x38($sp) +/* 82490C 8024164C C640003C */ lwc1 $f0, 0x3c($s2) +/* 824910 80241650 C6420040 */ lwc1 $f2, 0x40($s2) +/* 824914 80241654 46060000 */ add.s $f0, $f0, $f6 +/* 824918 80241658 E7A40044 */ swc1 $f4, 0x44($sp) +/* 82491C 8024165C E7A20040 */ swc1 $f2, 0x40($sp) +/* 824920 80241660 E7A0003C */ swc1 $f0, 0x3c($sp) +/* 824924 80241664 AFA20010 */ sw $v0, 0x10($sp) +/* 824928 80241668 8E440080 */ lw $a0, 0x80($s2) +/* 82492C 8024166C 0C0372DF */ jal func_800DCB7C +/* 824930 80241670 27A70040 */ addiu $a3, $sp, 0x40 +/* 824934 80241674 10400003 */ beqz $v0, .L80241684 +/* 824938 80241678 00000000 */ nop +/* 82493C 8024167C C7A0003C */ lwc1 $f0, 0x3c($sp) +/* 824940 80241680 E640003C */ swc1 $f0, 0x3c($s2) +.L80241684: +/* 824944 80241684 8E830070 */ lw $v1, 0x70($s4) +/* 824948 80241688 2C620064 */ sltiu $v0, $v1, 0x64 +/* 82494C 8024168C 10400042 */ beqz $v0, .L80241798 +/* 824950 80241690 00031080 */ sll $v0, $v1, 2 +/* 824954 80241694 3C018025 */ lui $at, 0x8025 +/* 824958 80241698 00220821 */ addu $at, $at, $v0 +/* 82495C 8024169C 8C22E210 */ lw $v0, -0x1df0($at) +/* 824960 802416A0 00400008 */ jr $v0 +/* 824964 802416A4 00000000 */ nop +/* 824968 802416A8 0280202D */ daddu $a0, $s4, $zero +/* 82496C 802416AC 0260282D */ daddu $a1, $s3, $zero +/* 824970 802416B0 0C09024C */ jal func_80240930_823BF0 +/* 824974 802416B4 02A0302D */ daddu $a2, $s5, $zero +/* 824978 802416B8 0280202D */ daddu $a0, $s4, $zero +/* 82497C 802416BC 0260282D */ daddu $a1, $s3, $zero +/* 824980 802416C0 0C0902A2 */ jal func_80240A88_823D48 +/* 824984 802416C4 02A0302D */ daddu $a2, $s5, $zero +/* 824988 802416C8 080905E6 */ j .L80241798 +/* 82498C 802416CC 00000000 */ nop +/* 824990 802416D0 0280202D */ daddu $a0, $s4, $zero +/* 824994 802416D4 0260282D */ daddu $a1, $s3, $zero +/* 824998 802416D8 0C09034C */ jal func_80240D30_823FF0 +/* 82499C 802416DC 02A0302D */ daddu $a2, $s5, $zero +/* 8249A0 802416E0 0280202D */ daddu $a0, $s4, $zero +/* 8249A4 802416E4 0260282D */ daddu $a1, $s3, $zero +/* 8249A8 802416E8 0C09037C */ jal func_80240DF0_8240B0 +/* 8249AC 802416EC 02A0302D */ daddu $a2, $s5, $zero +/* 8249B0 802416F0 080905E6 */ j .L80241798 +/* 8249B4 802416F4 00000000 */ nop +/* 8249B8 802416F8 0280202D */ daddu $a0, $s4, $zero +/* 8249BC 802416FC 0260282D */ daddu $a1, $s3, $zero +/* 8249C0 80241700 0C0903EB */ jal func_80240FAC_82426C +/* 8249C4 80241704 02A0302D */ daddu $a2, $s5, $zero +/* 8249C8 80241708 080905E6 */ j .L80241798 +/* 8249CC 8024170C 00000000 */ nop +/* 8249D0 80241710 0280202D */ daddu $a0, $s4, $zero +/* 8249D4 80241714 0260282D */ daddu $a1, $s3, $zero +/* 8249D8 80241718 0C090418 */ jal func_80241060_824320 +/* 8249DC 8024171C 02A0302D */ daddu $a2, $s5, $zero +/* 8249E0 80241720 0280202D */ daddu $a0, $s4, $zero +/* 8249E4 80241724 0260282D */ daddu $a1, $s3, $zero +/* 8249E8 80241728 0C090435 */ jal func_802410D4_824394 +/* 8249EC 8024172C 02A0302D */ daddu $a2, $s5, $zero +/* 8249F0 80241730 080905E6 */ j .L80241798 +/* 8249F4 80241734 00000000 */ nop +/* 8249F8 80241738 0280202D */ daddu $a0, $s4, $zero +/* 8249FC 8024173C 0260282D */ daddu $a1, $s3, $zero +/* 824A00 80241740 0C090453 */ jal func_8024114C_82440C +/* 824A04 80241744 02A0302D */ daddu $a2, $s5, $zero +/* 824A08 80241748 0280202D */ daddu $a0, $s4, $zero +/* 824A0C 8024174C 0260282D */ daddu $a1, $s3, $zero +/* 824A10 80241750 0C09049F */ jal func_8024127C_82453C +/* 824A14 80241754 02A0302D */ daddu $a2, $s5, $zero +/* 824A18 80241758 080905E6 */ j .L80241798 +/* 824A1C 8024175C 00000000 */ nop +/* 824A20 80241760 0280202D */ daddu $a0, $s4, $zero +/* 824A24 80241764 0260282D */ daddu $a1, $s3, $zero +/* 824A28 80241768 0C0904E7 */ jal func_8024139C_82465C +/* 824A2C 8024176C 02A0302D */ daddu $a2, $s5, $zero +/* 824A30 80241770 080905E6 */ j .L80241798 +/* 824A34 80241774 00000000 */ nop +/* 824A38 80241778 0280202D */ daddu $a0, $s4, $zero +/* 824A3C 8024177C 0260282D */ daddu $a1, $s3, $zero +/* 824A40 80241780 0C090501 */ jal func_80241404_8246C4 +/* 824A44 80241784 02A0302D */ daddu $a2, $s5, $zero +/* 824A48 80241788 080905E6 */ j .L80241798 +/* 824A4C 8024178C 00000000 */ nop +/* 824A50 80241790 0C0129CF */ jal func_8004A73C +/* 824A54 80241794 0280202D */ daddu $a0, $s4, $zero +.L80241798: +/* 824A58 80241798 8FBF0060 */ lw $ra, 0x60($sp) +/* 824A5C 8024179C 8FB5005C */ lw $s5, 0x5c($sp) +/* 824A60 802417A0 8FB40058 */ lw $s4, 0x58($sp) +/* 824A64 802417A4 8FB30054 */ lw $s3, 0x54($sp) +/* 824A68 802417A8 8FB20050 */ lw $s2, 0x50($sp) +/* 824A6C 802417AC 8FB1004C */ lw $s1, 0x4c($sp) +/* 824A70 802417B0 8FB00048 */ lw $s0, 0x48($sp) +/* 824A74 802417B4 0000102D */ daddu $v0, $zero, $zero +/* 824A78 802417B8 03E00008 */ jr $ra +/* 824A7C 802417BC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0.s deleted file mode 100644 index f6da952a29..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C0 -/* 824A80 802417C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 824A84 802417C4 AFB00010 */ sw $s0, 0x10($sp) -/* 824A88 802417C8 3C108024 */ lui $s0, 0x8024 -/* 824A8C 802417CC 26106150 */ addiu $s0, $s0, 0x6150 -/* 824A90 802417D0 AFBF0018 */ sw $ra, 0x18($sp) -/* 824A94 802417D4 AFB10014 */ sw $s1, 0x14($sp) -/* 824A98 802417D8 8E020000 */ lw $v0, ($s0) -/* 824A9C 802417DC 14400010 */ bnez $v0, .L80241820 -/* 824AA0 802417E0 0080882D */ daddu $s1, $a0, $zero -/* 824AA4 802417E4 0C00AB39 */ jal heap_malloc -/* 824AA8 802417E8 24040040 */ addiu $a0, $zero, 0x40 -/* 824AAC 802417EC AE020000 */ sw $v0, ($s0) -/* 824AB0 802417F0 0000182D */ daddu $v1, $zero, $zero -/* 824AB4 802417F4 0040282D */ daddu $a1, $v0, $zero -/* 824AB8 802417F8 0220202D */ daddu $a0, $s1, $zero -.L802417FC: -/* 824ABC 802417FC 8C820084 */ lw $v0, 0x84($a0) -/* 824AC0 80241800 24840004 */ addiu $a0, $a0, 4 -/* 824AC4 80241804 24630001 */ addiu $v1, $v1, 1 -/* 824AC8 80241808 ACA20000 */ sw $v0, ($a1) -/* 824ACC 8024180C 28620010 */ slti $v0, $v1, 0x10 -/* 824AD0 80241810 1440FFFA */ bnez $v0, .L802417FC -/* 824AD4 80241814 24A50004 */ addiu $a1, $a1, 4 -/* 824AD8 80241818 08090617 */ j .L8024185C -/* 824ADC 8024181C 00000000 */ nop -.L80241820: -/* 824AE0 80241820 0000182D */ daddu $v1, $zero, $zero -/* 824AE4 80241824 0040282D */ daddu $a1, $v0, $zero -/* 824AE8 80241828 0220202D */ daddu $a0, $s1, $zero -.L8024182C: -/* 824AEC 8024182C 8CA20000 */ lw $v0, ($a1) -/* 824AF0 80241830 24A50004 */ addiu $a1, $a1, 4 -/* 824AF4 80241834 24630001 */ addiu $v1, $v1, 1 -/* 824AF8 80241838 AC820084 */ sw $v0, 0x84($a0) -/* 824AFC 8024183C 28620010 */ slti $v0, $v1, 0x10 -/* 824B00 80241840 1440FFFA */ bnez $v0, .L8024182C -/* 824B04 80241844 24840004 */ addiu $a0, $a0, 4 -/* 824B08 80241848 3C108024 */ lui $s0, 0x8024 -/* 824B0C 8024184C 26106150 */ addiu $s0, $s0, 0x6150 -/* 824B10 80241850 0C00AB4B */ jal heap_free -/* 824B14 80241854 8E040000 */ lw $a0, ($s0) -/* 824B18 80241858 AE000000 */ sw $zero, ($s0) -.L8024185C: -/* 824B1C 8024185C 8FBF0018 */ lw $ra, 0x18($sp) -/* 824B20 80241860 8FB10014 */ lw $s1, 0x14($sp) -/* 824B24 80241864 8FB00010 */ lw $s0, 0x10($sp) -/* 824B28 80241868 24020002 */ addiu $v0, $zero, 2 -/* 824B2C 8024186C 03E00008 */ jr $ra -/* 824B30 80241870 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s new file mode 100644 index 0000000000..029723422e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802417C0_824A80.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417C0_824A80 +/* 824A80 802417C0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 824A84 802417C4 AFB00010 */ sw $s0, 0x10($sp) +/* 824A88 802417C8 3C108024 */ lui $s0, 0x8024 +/* 824A8C 802417CC 26106150 */ addiu $s0, $s0, 0x6150 +/* 824A90 802417D0 AFBF0018 */ sw $ra, 0x18($sp) +/* 824A94 802417D4 AFB10014 */ sw $s1, 0x14($sp) +/* 824A98 802417D8 8E020000 */ lw $v0, ($s0) +/* 824A9C 802417DC 14400010 */ bnez $v0, .L80241820 +/* 824AA0 802417E0 0080882D */ daddu $s1, $a0, $zero +/* 824AA4 802417E4 0C00AB39 */ jal heap_malloc +/* 824AA8 802417E8 24040040 */ addiu $a0, $zero, 0x40 +/* 824AAC 802417EC AE020000 */ sw $v0, ($s0) +/* 824AB0 802417F0 0000182D */ daddu $v1, $zero, $zero +/* 824AB4 802417F4 0040282D */ daddu $a1, $v0, $zero +/* 824AB8 802417F8 0220202D */ daddu $a0, $s1, $zero +.L802417FC: +/* 824ABC 802417FC 8C820084 */ lw $v0, 0x84($a0) +/* 824AC0 80241800 24840004 */ addiu $a0, $a0, 4 +/* 824AC4 80241804 24630001 */ addiu $v1, $v1, 1 +/* 824AC8 80241808 ACA20000 */ sw $v0, ($a1) +/* 824ACC 8024180C 28620010 */ slti $v0, $v1, 0x10 +/* 824AD0 80241810 1440FFFA */ bnez $v0, .L802417FC +/* 824AD4 80241814 24A50004 */ addiu $a1, $a1, 4 +/* 824AD8 80241818 08090617 */ j .L8024185C +/* 824ADC 8024181C 00000000 */ nop +.L80241820: +/* 824AE0 80241820 0000182D */ daddu $v1, $zero, $zero +/* 824AE4 80241824 0040282D */ daddu $a1, $v0, $zero +/* 824AE8 80241828 0220202D */ daddu $a0, $s1, $zero +.L8024182C: +/* 824AEC 8024182C 8CA20000 */ lw $v0, ($a1) +/* 824AF0 80241830 24A50004 */ addiu $a1, $a1, 4 +/* 824AF4 80241834 24630001 */ addiu $v1, $v1, 1 +/* 824AF8 80241838 AC820084 */ sw $v0, 0x84($a0) +/* 824AFC 8024183C 28620010 */ slti $v0, $v1, 0x10 +/* 824B00 80241840 1440FFFA */ bnez $v0, .L8024182C +/* 824B04 80241844 24840004 */ addiu $a0, $a0, 4 +/* 824B08 80241848 3C108024 */ lui $s0, 0x8024 +/* 824B0C 8024184C 26106150 */ addiu $s0, $s0, 0x6150 +/* 824B10 80241850 0C00AB4B */ jal heap_free +/* 824B14 80241854 8E040000 */ lw $a0, ($s0) +/* 824B18 80241858 AE000000 */ sw $zero, ($s0) +.L8024185C: +/* 824B1C 8024185C 8FBF0018 */ lw $ra, 0x18($sp) +/* 824B20 80241860 8FB10014 */ lw $s1, 0x14($sp) +/* 824B24 80241864 8FB00010 */ lw $s0, 0x10($sp) +/* 824B28 80241868 24020002 */ addiu $v0, $zero, 2 +/* 824B2C 8024186C 03E00008 */ jr $ra +/* 824B30 80241870 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8.s deleted file mode 100644 index 3faa0cf932..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D8 -/* 824B98 802418D8 24020001 */ addiu $v0, $zero, 1 -/* 824B9C 802418DC 3C018015 */ lui $at, %hi(D_80151310) -/* 824BA0 802418E0 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 824BA4 802418E4 03E00008 */ jr $ra -/* 824BA8 802418E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s new file mode 100644 index 0000000000..1564a3e7d0 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418D8_824B98 +/* 824B98 802418D8 24020001 */ addiu $v0, $zero, 1 +/* 824B9C 802418DC 3C018015 */ lui $at, %hi(D_80151310) +/* 824BA0 802418E0 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* 824BA4 802418E4 03E00008 */ jr $ra +/* 824BA8 802418E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC.s deleted file mode 100644 index 2e281d4a15..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418EC -/* 824BAC 802418EC 3C018015 */ lui $at, %hi(D_80151310) -/* 824BB0 802418F0 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 824BB4 802418F4 03E00008 */ jr $ra -/* 824BB8 802418F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s new file mode 100644 index 0000000000..f5aeb9f695 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418EC_824BAC +/* 824BAC 802418EC 3C018015 */ lui $at, %hi(D_80151310) +/* 824BB0 802418F0 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* 824BB4 802418F4 03E00008 */ jr $ra +/* 824BB8 802418F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC.s deleted file mode 100644 index 1f8f1874f5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418FC -/* 824BBC 802418FC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 824BC0 80241900 AFB10024 */ sw $s1, 0x24($sp) -/* 824BC4 80241904 0080882D */ daddu $s1, $a0, $zero -/* 824BC8 80241908 3C05F840 */ lui $a1, 0xf840 -/* 824BCC 8024190C AFBF0044 */ sw $ra, 0x44($sp) -/* 824BD0 80241910 AFBE0040 */ sw $fp, 0x40($sp) -/* 824BD4 80241914 AFB7003C */ sw $s7, 0x3c($sp) -/* 824BD8 80241918 AFB60038 */ sw $s6, 0x38($sp) -/* 824BDC 8024191C AFB50034 */ sw $s5, 0x34($sp) -/* 824BE0 80241920 AFB40030 */ sw $s4, 0x30($sp) -/* 824BE4 80241924 AFB3002C */ sw $s3, 0x2c($sp) -/* 824BE8 80241928 AFB20028 */ sw $s2, 0x28($sp) -/* 824BEC 8024192C AFB00020 */ sw $s0, 0x20($sp) -/* 824BF0 80241930 8E3E0148 */ lw $fp, 0x148($s1) -/* 824BF4 80241934 0C0B1EAF */ jal get_variable -/* 824BF8 80241938 34A56268 */ ori $a1, $a1, 0x6268 -/* 824BFC 8024193C 0040802D */ daddu $s0, $v0, $zero -/* 824C00 80241940 0220202D */ daddu $a0, $s1, $zero -/* 824C04 80241944 3C05F840 */ lui $a1, 0xf840 -/* 824C08 80241948 0C0B1EAF */ jal get_variable -/* 824C0C 8024194C 34A56269 */ ori $a1, $a1, 0x6269 -/* 824C10 80241950 0040B82D */ daddu $s7, $v0, $zero -/* 824C14 80241954 0220202D */ daddu $a0, $s1, $zero -/* 824C18 80241958 3C05F5DE */ lui $a1, 0xf5de -/* 824C1C 8024195C 0C0B1EAF */ jal get_variable -/* 824C20 80241960 34A502DE */ ori $a1, $a1, 0x2de -/* 824C24 80241964 0040B02D */ daddu $s6, $v0, $zero -/* 824C28 80241968 0220202D */ daddu $a0, $s1, $zero -/* 824C2C 8024196C 3C05F5DE */ lui $a1, 0xf5de -/* 824C30 80241970 0C0B1EAF */ jal get_variable -/* 824C34 80241974 34A502DF */ ori $a1, $a1, 0x2df -/* 824C38 80241978 0040A82D */ daddu $s5, $v0, $zero -/* 824C3C 8024197C 93D3006D */ lbu $s3, 0x6d($fp) -/* 824C40 80241980 32C2FFFF */ andi $v0, $s6, 0xffff -/* 824C44 80241984 A7B30010 */ sh $s3, 0x10($sp) -/* 824C48 80241988 93D2006E */ lbu $s2, 0x6e($fp) -/* 824C4C 8024198C 93C7006F */ lbu $a3, 0x6f($fp) -/* 824C50 80241990 3274FFFF */ andi $s4, $s3, 0xffff -/* 824C54 80241994 12820003 */ beq $s4, $v0, .L802419A4 -/* 824C58 80241998 A7A7001E */ sh $a3, 0x1e($sp) -/* 824C5C 8024199C 0000B82D */ daddu $s7, $zero, $zero -/* 824C60 802419A0 02E0802D */ daddu $s0, $s7, $zero -.L802419A4: -/* 824C64 802419A4 3202FFFF */ andi $v0, $s0, 0xffff -/* 824C68 802419A8 14400016 */ bnez $v0, .L80241A04 -/* 824C6C 802419AC 0220202D */ daddu $a0, $s1, $zero -/* 824C70 802419B0 0C00A67F */ jal rand_int -/* 824C74 802419B4 24040064 */ addiu $a0, $zero, 0x64 -/* 824C78 802419B8 2842001E */ slti $v0, $v0, 0x1e -/* 824C7C 802419BC 10400011 */ beqz $v0, .L80241A04 -/* 824C80 802419C0 0220202D */ daddu $a0, $s1, $zero -/* 824C84 802419C4 0C00A67F */ jal rand_int -/* 824C88 802419C8 2644FFFF */ addiu $a0, $s2, -1 -/* 824C8C 802419CC 0040A82D */ daddu $s5, $v0, $zero -/* 824C90 802419D0 0260B02D */ daddu $s6, $s3, $zero -/* 824C94 802419D4 0220202D */ daddu $a0, $s1, $zero -/* 824C98 802419D8 3C05F5DE */ lui $a1, 0xf5de -/* 824C9C 802419DC 34A502DE */ ori $a1, $a1, 0x2de -/* 824CA0 802419E0 0C0B2026 */ jal set_variable -/* 824CA4 802419E4 0280302D */ daddu $a2, $s4, $zero -/* 824CA8 802419E8 0220202D */ daddu $a0, $s1, $zero -/* 824CAC 802419EC 3C05F5DE */ lui $a1, 0xf5de -/* 824CB0 802419F0 34A502DF */ ori $a1, $a1, 0x2df -/* 824CB4 802419F4 0C0B2026 */ jal set_variable -/* 824CB8 802419F8 32A6FFFF */ andi $a2, $s5, 0xffff -/* 824CBC 802419FC 24100001 */ addiu $s0, $zero, 1 -/* 824CC0 80241A00 0220202D */ daddu $a0, $s1, $zero -.L80241A04: -/* 824CC4 80241A04 3C05F840 */ lui $a1, 0xf840 -/* 824CC8 80241A08 34A56268 */ ori $a1, $a1, 0x6268 -/* 824CCC 80241A0C 0C0B2026 */ jal set_variable -/* 824CD0 80241A10 3206FFFF */ andi $a2, $s0, 0xffff -/* 824CD4 80241A14 0220202D */ daddu $a0, $s1, $zero -/* 824CD8 80241A18 3C05F840 */ lui $a1, 0xf840 -/* 824CDC 80241A1C 34A56269 */ ori $a1, $a1, 0x6269 -/* 824CE0 80241A20 0C0B2026 */ jal set_variable -/* 824CE4 80241A24 32E6FFFF */ andi $a2, $s7, 0xffff -/* 824CE8 80241A28 0000202D */ daddu $a0, $zero, $zero -/* 824CEC 80241A2C 3C05F5DE */ lui $a1, 0xf5de -/* 824CF0 80241A30 0C0B1EAF */ jal get_variable -/* 824CF4 80241A34 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 824CF8 80241A38 0000202D */ daddu $a0, $zero, $zero -/* 824CFC 80241A3C 3C05F5DE */ lui $a1, 0xf5de -/* 824D00 80241A40 34A50180 */ ori $a1, $a1, 0x180 -/* 824D04 80241A44 0C0B1EAF */ jal get_variable -/* 824D08 80241A48 0040802D */ daddu $s0, $v0, $zero -/* 824D0C 80241A4C 0040282D */ daddu $a1, $v0, $zero -/* 824D10 80241A50 0000182D */ daddu $v1, $zero, $zero -/* 824D14 80241A54 3C068024 */ lui $a2, 0x8024 -/* 824D18 80241A58 24C661F4 */ addiu $a2, $a2, 0x61f4 -/* 824D1C 80241A5C 00C0202D */ daddu $a0, $a2, $zero -.L80241A60: -/* 824D20 80241A60 8C820000 */ lw $v0, ($a0) -/* 824D24 80241A64 00A2102A */ slt $v0, $a1, $v0 -/* 824D28 80241A68 14400006 */ bnez $v0, .L80241A84 -/* 824D2C 80241A6C 000310C0 */ sll $v0, $v1, 3 -/* 824D30 80241A70 24630001 */ addiu $v1, $v1, 1 -/* 824D34 80241A74 28620008 */ slti $v0, $v1, 8 -/* 824D38 80241A78 1440FFF9 */ bnez $v0, .L80241A60 -/* 824D3C 80241A7C 24840008 */ addiu $a0, $a0, 8 -/* 824D40 80241A80 000310C0 */ sll $v0, $v1, 3 -.L80241A84: -/* 824D44 80241A84 00461021 */ addu $v0, $v0, $a2 -/* 824D48 80241A88 8C420004 */ lw $v0, 4($v0) -/* 824D4C 80241A8C 97A30010 */ lhu $v1, 0x10($sp) -/* 824D50 80241A90 0202202A */ slt $a0, $s0, $v0 -/* 824D54 80241A94 32C2FFFF */ andi $v0, $s6, 0xffff -/* 824D58 80241A98 14620008 */ bne $v1, $v0, .L80241ABC -/* 824D5C 80241A9C 32A2FFFF */ andi $v0, $s5, 0xffff -/* 824D60 80241AA0 97A7001E */ lhu $a3, 0x1e($sp) -/* 824D64 80241AA4 14E20005 */ bne $a3, $v0, .L80241ABC -/* 824D68 80241AA8 32E2FFFF */ andi $v0, $s7, 0xffff -/* 824D6C 80241AAC 14400003 */ bnez $v0, .L80241ABC -/* 824D70 80241AB0 00000000 */ nop -/* 824D74 80241AB4 14800008 */ bnez $a0, .L80241AD8 -/* 824D78 80241AB8 24020001 */ addiu $v0, $zero, 1 -.L80241ABC: -/* 824D7C 80241ABC 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 824D80 80241AC0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 824D84 80241AC4 80420075 */ lb $v0, 0x75($v0) -/* 824D88 80241AC8 10400005 */ beqz $v0, .L80241AE0 -/* 824D8C 80241ACC 00000000 */ nop -/* 824D90 80241AD0 10800003 */ beqz $a0, .L80241AE0 -/* 824D94 80241AD4 24020001 */ addiu $v0, $zero, 1 -.L80241AD8: -/* 824D98 80241AD8 080906BB */ j .L80241AEC -/* 824D9C 80241ADC AE220084 */ sw $v0, 0x84($s1) -.L80241AE0: -/* 824DA0 80241AE0 0C00F9EB */ jal kill_enemy -/* 824DA4 80241AE4 03C0202D */ daddu $a0, $fp, $zero -/* 824DA8 80241AE8 AE200084 */ sw $zero, 0x84($s1) -.L80241AEC: -/* 824DAC 80241AEC 8FBF0044 */ lw $ra, 0x44($sp) -/* 824DB0 80241AF0 8FBE0040 */ lw $fp, 0x40($sp) -/* 824DB4 80241AF4 8FB7003C */ lw $s7, 0x3c($sp) -/* 824DB8 80241AF8 8FB60038 */ lw $s6, 0x38($sp) -/* 824DBC 80241AFC 8FB50034 */ lw $s5, 0x34($sp) -/* 824DC0 80241B00 8FB40030 */ lw $s4, 0x30($sp) -/* 824DC4 80241B04 8FB3002C */ lw $s3, 0x2c($sp) -/* 824DC8 80241B08 8FB20028 */ lw $s2, 0x28($sp) -/* 824DCC 80241B0C 8FB10024 */ lw $s1, 0x24($sp) -/* 824DD0 80241B10 8FB00020 */ lw $s0, 0x20($sp) -/* 824DD4 80241B14 24020002 */ addiu $v0, $zero, 2 -/* 824DD8 80241B18 03E00008 */ jr $ra -/* 824DDC 80241B1C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s new file mode 100644 index 0000000000..0559311263 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418FC_824BBC.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418FC_824BBC +/* 824BBC 802418FC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 824BC0 80241900 AFB10024 */ sw $s1, 0x24($sp) +/* 824BC4 80241904 0080882D */ daddu $s1, $a0, $zero +/* 824BC8 80241908 3C05F840 */ lui $a1, 0xf840 +/* 824BCC 8024190C AFBF0044 */ sw $ra, 0x44($sp) +/* 824BD0 80241910 AFBE0040 */ sw $fp, 0x40($sp) +/* 824BD4 80241914 AFB7003C */ sw $s7, 0x3c($sp) +/* 824BD8 80241918 AFB60038 */ sw $s6, 0x38($sp) +/* 824BDC 8024191C AFB50034 */ sw $s5, 0x34($sp) +/* 824BE0 80241920 AFB40030 */ sw $s4, 0x30($sp) +/* 824BE4 80241924 AFB3002C */ sw $s3, 0x2c($sp) +/* 824BE8 80241928 AFB20028 */ sw $s2, 0x28($sp) +/* 824BEC 8024192C AFB00020 */ sw $s0, 0x20($sp) +/* 824BF0 80241930 8E3E0148 */ lw $fp, 0x148($s1) +/* 824BF4 80241934 0C0B1EAF */ jal get_variable +/* 824BF8 80241938 34A56268 */ ori $a1, $a1, 0x6268 +/* 824BFC 8024193C 0040802D */ daddu $s0, $v0, $zero +/* 824C00 80241940 0220202D */ daddu $a0, $s1, $zero +/* 824C04 80241944 3C05F840 */ lui $a1, 0xf840 +/* 824C08 80241948 0C0B1EAF */ jal get_variable +/* 824C0C 8024194C 34A56269 */ ori $a1, $a1, 0x6269 +/* 824C10 80241950 0040B82D */ daddu $s7, $v0, $zero +/* 824C14 80241954 0220202D */ daddu $a0, $s1, $zero +/* 824C18 80241958 3C05F5DE */ lui $a1, 0xf5de +/* 824C1C 8024195C 0C0B1EAF */ jal get_variable +/* 824C20 80241960 34A502DE */ ori $a1, $a1, 0x2de +/* 824C24 80241964 0040B02D */ daddu $s6, $v0, $zero +/* 824C28 80241968 0220202D */ daddu $a0, $s1, $zero +/* 824C2C 8024196C 3C05F5DE */ lui $a1, 0xf5de +/* 824C30 80241970 0C0B1EAF */ jal get_variable +/* 824C34 80241974 34A502DF */ ori $a1, $a1, 0x2df +/* 824C38 80241978 0040A82D */ daddu $s5, $v0, $zero +/* 824C3C 8024197C 93D3006D */ lbu $s3, 0x6d($fp) +/* 824C40 80241980 32C2FFFF */ andi $v0, $s6, 0xffff +/* 824C44 80241984 A7B30010 */ sh $s3, 0x10($sp) +/* 824C48 80241988 93D2006E */ lbu $s2, 0x6e($fp) +/* 824C4C 8024198C 93C7006F */ lbu $a3, 0x6f($fp) +/* 824C50 80241990 3274FFFF */ andi $s4, $s3, 0xffff +/* 824C54 80241994 12820003 */ beq $s4, $v0, .L802419A4 +/* 824C58 80241998 A7A7001E */ sh $a3, 0x1e($sp) +/* 824C5C 8024199C 0000B82D */ daddu $s7, $zero, $zero +/* 824C60 802419A0 02E0802D */ daddu $s0, $s7, $zero +.L802419A4: +/* 824C64 802419A4 3202FFFF */ andi $v0, $s0, 0xffff +/* 824C68 802419A8 14400016 */ bnez $v0, .L80241A04 +/* 824C6C 802419AC 0220202D */ daddu $a0, $s1, $zero +/* 824C70 802419B0 0C00A67F */ jal rand_int +/* 824C74 802419B4 24040064 */ addiu $a0, $zero, 0x64 +/* 824C78 802419B8 2842001E */ slti $v0, $v0, 0x1e +/* 824C7C 802419BC 10400011 */ beqz $v0, .L80241A04 +/* 824C80 802419C0 0220202D */ daddu $a0, $s1, $zero +/* 824C84 802419C4 0C00A67F */ jal rand_int +/* 824C88 802419C8 2644FFFF */ addiu $a0, $s2, -1 +/* 824C8C 802419CC 0040A82D */ daddu $s5, $v0, $zero +/* 824C90 802419D0 0260B02D */ daddu $s6, $s3, $zero +/* 824C94 802419D4 0220202D */ daddu $a0, $s1, $zero +/* 824C98 802419D8 3C05F5DE */ lui $a1, 0xf5de +/* 824C9C 802419DC 34A502DE */ ori $a1, $a1, 0x2de +/* 824CA0 802419E0 0C0B2026 */ jal set_variable +/* 824CA4 802419E4 0280302D */ daddu $a2, $s4, $zero +/* 824CA8 802419E8 0220202D */ daddu $a0, $s1, $zero +/* 824CAC 802419EC 3C05F5DE */ lui $a1, 0xf5de +/* 824CB0 802419F0 34A502DF */ ori $a1, $a1, 0x2df +/* 824CB4 802419F4 0C0B2026 */ jal set_variable +/* 824CB8 802419F8 32A6FFFF */ andi $a2, $s5, 0xffff +/* 824CBC 802419FC 24100001 */ addiu $s0, $zero, 1 +/* 824CC0 80241A00 0220202D */ daddu $a0, $s1, $zero +.L80241A04: +/* 824CC4 80241A04 3C05F840 */ lui $a1, 0xf840 +/* 824CC8 80241A08 34A56268 */ ori $a1, $a1, 0x6268 +/* 824CCC 80241A0C 0C0B2026 */ jal set_variable +/* 824CD0 80241A10 3206FFFF */ andi $a2, $s0, 0xffff +/* 824CD4 80241A14 0220202D */ daddu $a0, $s1, $zero +/* 824CD8 80241A18 3C05F840 */ lui $a1, 0xf840 +/* 824CDC 80241A1C 34A56269 */ ori $a1, $a1, 0x6269 +/* 824CE0 80241A20 0C0B2026 */ jal set_variable +/* 824CE4 80241A24 32E6FFFF */ andi $a2, $s7, 0xffff +/* 824CE8 80241A28 0000202D */ daddu $a0, $zero, $zero +/* 824CEC 80241A2C 3C05F5DE */ lui $a1, 0xf5de +/* 824CF0 80241A30 0C0B1EAF */ jal get_variable +/* 824CF4 80241A34 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 824CF8 80241A38 0000202D */ daddu $a0, $zero, $zero +/* 824CFC 80241A3C 3C05F5DE */ lui $a1, 0xf5de +/* 824D00 80241A40 34A50180 */ ori $a1, $a1, 0x180 +/* 824D04 80241A44 0C0B1EAF */ jal get_variable +/* 824D08 80241A48 0040802D */ daddu $s0, $v0, $zero +/* 824D0C 80241A4C 0040282D */ daddu $a1, $v0, $zero +/* 824D10 80241A50 0000182D */ daddu $v1, $zero, $zero +/* 824D14 80241A54 3C068024 */ lui $a2, 0x8024 +/* 824D18 80241A58 24C661F4 */ addiu $a2, $a2, 0x61f4 +/* 824D1C 80241A5C 00C0202D */ daddu $a0, $a2, $zero +.L80241A60: +/* 824D20 80241A60 8C820000 */ lw $v0, ($a0) +/* 824D24 80241A64 00A2102A */ slt $v0, $a1, $v0 +/* 824D28 80241A68 14400006 */ bnez $v0, .L80241A84 +/* 824D2C 80241A6C 000310C0 */ sll $v0, $v1, 3 +/* 824D30 80241A70 24630001 */ addiu $v1, $v1, 1 +/* 824D34 80241A74 28620008 */ slti $v0, $v1, 8 +/* 824D38 80241A78 1440FFF9 */ bnez $v0, .L80241A60 +/* 824D3C 80241A7C 24840008 */ addiu $a0, $a0, 8 +/* 824D40 80241A80 000310C0 */ sll $v0, $v1, 3 +.L80241A84: +/* 824D44 80241A84 00461021 */ addu $v0, $v0, $a2 +/* 824D48 80241A88 8C420004 */ lw $v0, 4($v0) +/* 824D4C 80241A8C 97A30010 */ lhu $v1, 0x10($sp) +/* 824D50 80241A90 0202202A */ slt $a0, $s0, $v0 +/* 824D54 80241A94 32C2FFFF */ andi $v0, $s6, 0xffff +/* 824D58 80241A98 14620008 */ bne $v1, $v0, .L80241ABC +/* 824D5C 80241A9C 32A2FFFF */ andi $v0, $s5, 0xffff +/* 824D60 80241AA0 97A7001E */ lhu $a3, 0x1e($sp) +/* 824D64 80241AA4 14E20005 */ bne $a3, $v0, .L80241ABC +/* 824D68 80241AA8 32E2FFFF */ andi $v0, $s7, 0xffff +/* 824D6C 80241AAC 14400003 */ bnez $v0, .L80241ABC +/* 824D70 80241AB0 00000000 */ nop +/* 824D74 80241AB4 14800008 */ bnez $a0, .L80241AD8 +/* 824D78 80241AB8 24020001 */ addiu $v0, $zero, 1 +.L80241ABC: +/* 824D7C 80241ABC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 824D80 80241AC0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 824D84 80241AC4 80420075 */ lb $v0, 0x75($v0) +/* 824D88 80241AC8 10400005 */ beqz $v0, .L80241AE0 +/* 824D8C 80241ACC 00000000 */ nop +/* 824D90 80241AD0 10800003 */ beqz $a0, .L80241AE0 +/* 824D94 80241AD4 24020001 */ addiu $v0, $zero, 1 +.L80241AD8: +/* 824D98 80241AD8 080906BB */ j .L80241AEC +/* 824D9C 80241ADC AE220084 */ sw $v0, 0x84($s1) +.L80241AE0: +/* 824DA0 80241AE0 0C00F9EB */ jal kill_enemy +/* 824DA4 80241AE4 03C0202D */ daddu $a0, $fp, $zero +/* 824DA8 80241AE8 AE200084 */ sw $zero, 0x84($s1) +.L80241AEC: +/* 824DAC 80241AEC 8FBF0044 */ lw $ra, 0x44($sp) +/* 824DB0 80241AF0 8FBE0040 */ lw $fp, 0x40($sp) +/* 824DB4 80241AF4 8FB7003C */ lw $s7, 0x3c($sp) +/* 824DB8 80241AF8 8FB60038 */ lw $s6, 0x38($sp) +/* 824DBC 80241AFC 8FB50034 */ lw $s5, 0x34($sp) +/* 824DC0 80241B00 8FB40030 */ lw $s4, 0x30($sp) +/* 824DC4 80241B04 8FB3002C */ lw $s3, 0x2c($sp) +/* 824DC8 80241B08 8FB20028 */ lw $s2, 0x28($sp) +/* 824DCC 80241B0C 8FB10024 */ lw $s1, 0x24($sp) +/* 824DD0 80241B10 8FB00020 */ lw $s0, 0x20($sp) +/* 824DD4 80241B14 24020002 */ addiu $v0, $zero, 2 +/* 824DD8 80241B18 03E00008 */ jr $ra +/* 824DDC 80241B1C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20.s deleted file mode 100644 index 3898db4405..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B20 -/* 824DE0 80241B20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 824DE4 80241B24 AFBF0014 */ sw $ra, 0x14($sp) -/* 824DE8 80241B28 AFB00010 */ sw $s0, 0x10($sp) -/* 824DEC 80241B2C 0C00EABB */ jal get_npc_unsafe -/* 824DF0 80241B30 8C84014C */ lw $a0, 0x14c($a0) -/* 824DF4 80241B34 24040008 */ addiu $a0, $zero, 8 -/* 824DF8 80241B38 0040802D */ daddu $s0, $v0, $zero -/* 824DFC 80241B3C 3C028024 */ lui $v0, 0x8024 -/* 824E00 80241B40 24421B8C */ addiu $v0, $v0, 0x1b8c -/* 824E04 80241B44 0C00AB39 */ jal heap_malloc -/* 824E08 80241B48 AE020008 */ sw $v0, 8($s0) -/* 824E0C 80241B4C 0040182D */ daddu $v1, $v0, $zero -/* 824E10 80241B50 AE030020 */ sw $v1, 0x20($s0) -/* 824E14 80241B54 AC600000 */ sw $zero, ($v1) -/* 824E18 80241B58 8FBF0014 */ lw $ra, 0x14($sp) -/* 824E1C 80241B5C 8FB00010 */ lw $s0, 0x10($sp) -/* 824E20 80241B60 24020001 */ addiu $v0, $zero, 1 -/* 824E24 80241B64 03E00008 */ jr $ra -/* 824E28 80241B68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s new file mode 100644 index 0000000000..5028313d7d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B20_824DE0.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B20_824DE0 +/* 824DE0 80241B20 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 824DE4 80241B24 AFBF0014 */ sw $ra, 0x14($sp) +/* 824DE8 80241B28 AFB00010 */ sw $s0, 0x10($sp) +/* 824DEC 80241B2C 0C00EABB */ jal get_npc_unsafe +/* 824DF0 80241B30 8C84014C */ lw $a0, 0x14c($a0) +/* 824DF4 80241B34 24040008 */ addiu $a0, $zero, 8 +/* 824DF8 80241B38 0040802D */ daddu $s0, $v0, $zero +/* 824DFC 80241B3C 3C028024 */ lui $v0, 0x8024 +/* 824E00 80241B40 24421B8C */ addiu $v0, $v0, 0x1b8c +/* 824E04 80241B44 0C00AB39 */ jal heap_malloc +/* 824E08 80241B48 AE020008 */ sw $v0, 8($s0) +/* 824E0C 80241B4C 0040182D */ daddu $v1, $v0, $zero +/* 824E10 80241B50 AE030020 */ sw $v1, 0x20($s0) +/* 824E14 80241B54 AC600000 */ sw $zero, ($v1) +/* 824E18 80241B58 8FBF0014 */ lw $ra, 0x14($sp) +/* 824E1C 80241B5C 8FB00010 */ lw $s0, 0x10($sp) +/* 824E20 80241B60 24020001 */ addiu $v0, $zero, 1 +/* 824E24 80241B64 03E00008 */ jr $ra +/* 824E28 80241B68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C.s deleted file mode 100644 index 96b33a7eff..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B6C -/* 824E2C 80241B6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 824E30 80241B70 AFBF0010 */ sw $ra, 0x10($sp) -/* 824E34 80241B74 0C00EABB */ jal get_npc_unsafe -/* 824E38 80241B78 8C84014C */ lw $a0, 0x14c($a0) -/* 824E3C 80241B7C 8FBF0010 */ lw $ra, 0x10($sp) -/* 824E40 80241B80 0000102D */ daddu $v0, $zero, $zero -/* 824E44 80241B84 03E00008 */ jr $ra -/* 824E48 80241B88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s new file mode 100644 index 0000000000..baac1be28c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B6C_824E2C +/* 824E2C 80241B6C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 824E30 80241B70 AFBF0010 */ sw $ra, 0x10($sp) +/* 824E34 80241B74 0C00EABB */ jal get_npc_unsafe +/* 824E38 80241B78 8C84014C */ lw $a0, 0x14c($a0) +/* 824E3C 80241B7C 8FBF0010 */ lw $ra, 0x10($sp) +/* 824E40 80241B80 0000102D */ daddu $v0, $zero, $zero +/* 824E44 80241B84 03E00008 */ jr $ra +/* 824E48 80241B88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C.s deleted file mode 100644 index a518554c91..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B8C -/* 824E4C 80241B8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 824E50 80241B90 3C03800A */ lui $v1, 0x800a -/* 824E54 80241B94 8463A634 */ lh $v1, -0x59cc($v1) -/* 824E58 80241B98 3C05800B */ lui $a1, %hi(gCameras) -/* 824E5C 80241B9C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 824E60 80241BA0 AFBF0010 */ sw $ra, 0x10($sp) -/* 824E64 80241BA4 00031080 */ sll $v0, $v1, 2 -/* 824E68 80241BA8 00431021 */ addu $v0, $v0, $v1 -/* 824E6C 80241BAC 00021080 */ sll $v0, $v0, 2 -/* 824E70 80241BB0 00431023 */ subu $v0, $v0, $v1 -/* 824E74 80241BB4 000218C0 */ sll $v1, $v0, 3 -/* 824E78 80241BB8 00431021 */ addu $v0, $v0, $v1 -/* 824E7C 80241BBC 8C830020 */ lw $v1, 0x20($a0) -/* 824E80 80241BC0 000210C0 */ sll $v0, $v0, 3 -/* 824E84 80241BC4 8C630000 */ lw $v1, ($v1) -/* 824E88 80241BC8 30630001 */ andi $v1, $v1, 1 -/* 824E8C 80241BCC 10600004 */ beqz $v1, .L80241BE0 -/* 824E90 80241BD0 00451021 */ addu $v0, $v0, $a1 -/* 824E94 80241BD4 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 824E98 80241BD8 0C00A6C9 */ jal clamp_angle -/* 824E9C 80241BDC 46006307 */ neg.s $f12, $f12 -.L80241BE0: -/* 824EA0 80241BE0 8FBF0010 */ lw $ra, 0x10($sp) -/* 824EA4 80241BE4 03E00008 */ jr $ra -/* 824EA8 80241BE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s new file mode 100644 index 0000000000..a87214c000 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B8C_824E4C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B8C_824E4C +/* 824E4C 80241B8C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 824E50 80241B90 3C03800A */ lui $v1, 0x800a +/* 824E54 80241B94 8463A634 */ lh $v1, -0x59cc($v1) +/* 824E58 80241B98 3C05800B */ lui $a1, %hi(gCameras) +/* 824E5C 80241B9C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 824E60 80241BA0 AFBF0010 */ sw $ra, 0x10($sp) +/* 824E64 80241BA4 00031080 */ sll $v0, $v1, 2 +/* 824E68 80241BA8 00431021 */ addu $v0, $v0, $v1 +/* 824E6C 80241BAC 00021080 */ sll $v0, $v0, 2 +/* 824E70 80241BB0 00431023 */ subu $v0, $v0, $v1 +/* 824E74 80241BB4 000218C0 */ sll $v1, $v0, 3 +/* 824E78 80241BB8 00431021 */ addu $v0, $v0, $v1 +/* 824E7C 80241BBC 8C830020 */ lw $v1, 0x20($a0) +/* 824E80 80241BC0 000210C0 */ sll $v0, $v0, 3 +/* 824E84 80241BC4 8C630000 */ lw $v1, ($v1) +/* 824E88 80241BC8 30630001 */ andi $v1, $v1, 1 +/* 824E8C 80241BCC 10600004 */ beqz $v1, .L80241BE0 +/* 824E90 80241BD0 00451021 */ addu $v0, $v0, $a1 +/* 824E94 80241BD4 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 824E98 80241BD8 0C00A6C9 */ jal clamp_angle +/* 824E9C 80241BDC 46006307 */ neg.s $f12, $f12 +.L80241BE0: +/* 824EA0 80241BE0 8FBF0010 */ lw $ra, 0x10($sp) +/* 824EA4 80241BE4 03E00008 */ jr $ra +/* 824EA8 80241BE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC.s deleted file mode 100644 index a4d6f480de..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BEC -/* 824EAC 80241BEC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 824EB0 80241BF0 AFB10014 */ sw $s1, 0x14($sp) -/* 824EB4 80241BF4 0080882D */ daddu $s1, $a0, $zero -/* 824EB8 80241BF8 AFBF0024 */ sw $ra, 0x24($sp) -/* 824EBC 80241BFC AFB40020 */ sw $s4, 0x20($sp) -/* 824EC0 80241C00 AFB3001C */ sw $s3, 0x1c($sp) -/* 824EC4 80241C04 AFB20018 */ sw $s2, 0x18($sp) -/* 824EC8 80241C08 10A00033 */ beqz $a1, .L80241CD8 -/* 824ECC 80241C0C AFB00010 */ sw $s0, 0x10($sp) -/* 824ED0 80241C10 0C04760B */ jal func_8011D82C -/* 824ED4 80241C14 24040001 */ addiu $a0, $zero, 1 -/* 824ED8 80241C18 0000202D */ daddu $a0, $zero, $zero -/* 824EDC 80241C1C 0080282D */ daddu $a1, $a0, $zero -/* 824EE0 80241C20 0080302D */ daddu $a2, $a0, $zero -/* 824EE4 80241C24 0080382D */ daddu $a3, $a0, $zero -/* 824EE8 80241C28 0080802D */ daddu $s0, $a0, $zero -/* 824EEC 80241C2C 2414FFFC */ addiu $s4, $zero, -4 -/* 824EF0 80241C30 2413000C */ addiu $s3, $zero, 0xc -/* 824EF4 80241C34 3C120080 */ lui $s2, 0x80 -/* 824EF8 80241C38 3C038015 */ lui $v1, 0x8015 -/* 824EFC 80241C3C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 824F00 80241C40 24020001 */ addiu $v0, $zero, 1 -/* 824F04 80241C44 0C046F97 */ jal set_background_color_blend -/* 824F08 80241C48 A0620000 */ sb $v0, ($v1) -.L80241C4C: -/* 824F0C 80241C4C 0C00E2B7 */ jal get_npc_by_index -/* 824F10 80241C50 0200202D */ daddu $a0, $s0, $zero -/* 824F14 80241C54 0040202D */ daddu $a0, $v0, $zero -/* 824F18 80241C58 5080000B */ beql $a0, $zero, .L80241C88 -/* 824F1C 80241C5C 26100001 */ addiu $s0, $s0, 1 -/* 824F20 80241C60 8C820000 */ lw $v0, ($a0) -/* 824F24 80241C64 50400008 */ beql $v0, $zero, .L80241C88 -/* 824F28 80241C68 26100001 */ addiu $s0, $s0, 1 -/* 824F2C 80241C6C 808300A4 */ lb $v1, 0xa4($a0) -/* 824F30 80241C70 10740005 */ beq $v1, $s4, .L80241C88 -/* 824F34 80241C74 26100001 */ addiu $s0, $s0, 1 -/* 824F38 80241C78 10730003 */ beq $v1, $s3, .L80241C88 -/* 824F3C 80241C7C 00000000 */ nop -/* 824F40 80241C80 00521025 */ or $v0, $v0, $s2 -/* 824F44 80241C84 AC820000 */ sw $v0, ($a0) -.L80241C88: -/* 824F48 80241C88 2A020040 */ slti $v0, $s0, 0x40 -/* 824F4C 80241C8C 1440FFEF */ bnez $v0, .L80241C4C -/* 824F50 80241C90 00000000 */ nop -/* 824F54 80241C94 0000802D */ daddu $s0, $zero, $zero -/* 824F58 80241C98 3C120800 */ lui $s2, 0x800 -.L80241C9C: -/* 824F5C 80241C9C 0C04C3D6 */ jal get_item_entity -/* 824F60 80241CA0 0200202D */ daddu $a0, $s0, $zero -/* 824F64 80241CA4 0040182D */ daddu $v1, $v0, $zero -/* 824F68 80241CA8 10600007 */ beqz $v1, .L80241CC8 -/* 824F6C 80241CAC 26100001 */ addiu $s0, $s0, 1 -/* 824F70 80241CB0 8C640000 */ lw $a0, ($v1) -/* 824F74 80241CB4 30820010 */ andi $v0, $a0, 0x10 -/* 824F78 80241CB8 10400003 */ beqz $v0, .L80241CC8 -/* 824F7C 80241CBC 00000000 */ nop -/* 824F80 80241CC0 00921025 */ or $v0, $a0, $s2 -/* 824F84 80241CC4 AC620000 */ sw $v0, ($v1) -.L80241CC8: -/* 824F88 80241CC8 2A020100 */ slti $v0, $s0, 0x100 -/* 824F8C 80241CCC 1440FFF3 */ bnez $v0, .L80241C9C -/* 824F90 80241CD0 00000000 */ nop -/* 824F94 80241CD4 AE200070 */ sw $zero, 0x70($s1) -.L80241CD8: -/* 824F98 80241CD8 8E220070 */ lw $v0, 0x70($s1) -/* 824F9C 80241CDC 24420008 */ addiu $v0, $v0, 8 -/* 824FA0 80241CE0 AE220070 */ sw $v0, 0x70($s1) -/* 824FA4 80241CE4 28420100 */ slti $v0, $v0, 0x100 -/* 824FA8 80241CE8 14400003 */ bnez $v0, .L80241CF8 -/* 824FAC 80241CEC 0000202D */ daddu $a0, $zero, $zero -/* 824FB0 80241CF0 240200FF */ addiu $v0, $zero, 0xff -/* 824FB4 80241CF4 AE220070 */ sw $v0, 0x70($s1) -.L80241CF8: -/* 824FB8 80241CF8 0080282D */ daddu $a1, $a0, $zero -/* 824FBC 80241CFC 92270073 */ lbu $a3, 0x73($s1) -/* 824FC0 80241D00 0C046F97 */ jal set_background_color_blend -/* 824FC4 80241D04 0080302D */ daddu $a2, $a0, $zero -/* 824FC8 80241D08 8E220070 */ lw $v0, 0x70($s1) -/* 824FCC 80241D0C 8FBF0024 */ lw $ra, 0x24($sp) -/* 824FD0 80241D10 8FB40020 */ lw $s4, 0x20($sp) -/* 824FD4 80241D14 8FB3001C */ lw $s3, 0x1c($sp) -/* 824FD8 80241D18 8FB20018 */ lw $s2, 0x18($sp) -/* 824FDC 80241D1C 8FB10014 */ lw $s1, 0x14($sp) -/* 824FE0 80241D20 8FB00010 */ lw $s0, 0x10($sp) -/* 824FE4 80241D24 384200FF */ xori $v0, $v0, 0xff -/* 824FE8 80241D28 2C420001 */ sltiu $v0, $v0, 1 -/* 824FEC 80241D2C 00021040 */ sll $v0, $v0, 1 -/* 824FF0 80241D30 03E00008 */ jr $ra -/* 824FF4 80241D34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s new file mode 100644 index 0000000000..ac182dd815 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241BEC_824EAC.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BEC_824EAC +/* 824EAC 80241BEC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 824EB0 80241BF0 AFB10014 */ sw $s1, 0x14($sp) +/* 824EB4 80241BF4 0080882D */ daddu $s1, $a0, $zero +/* 824EB8 80241BF8 AFBF0024 */ sw $ra, 0x24($sp) +/* 824EBC 80241BFC AFB40020 */ sw $s4, 0x20($sp) +/* 824EC0 80241C00 AFB3001C */ sw $s3, 0x1c($sp) +/* 824EC4 80241C04 AFB20018 */ sw $s2, 0x18($sp) +/* 824EC8 80241C08 10A00033 */ beqz $a1, .L80241CD8 +/* 824ECC 80241C0C AFB00010 */ sw $s0, 0x10($sp) +/* 824ED0 80241C10 0C04760B */ jal func_8011D82C +/* 824ED4 80241C14 24040001 */ addiu $a0, $zero, 1 +/* 824ED8 80241C18 0000202D */ daddu $a0, $zero, $zero +/* 824EDC 80241C1C 0080282D */ daddu $a1, $a0, $zero +/* 824EE0 80241C20 0080302D */ daddu $a2, $a0, $zero +/* 824EE4 80241C24 0080382D */ daddu $a3, $a0, $zero +/* 824EE8 80241C28 0080802D */ daddu $s0, $a0, $zero +/* 824EEC 80241C2C 2414FFFC */ addiu $s4, $zero, -4 +/* 824EF0 80241C30 2413000C */ addiu $s3, $zero, 0xc +/* 824EF4 80241C34 3C120080 */ lui $s2, 0x80 +/* 824EF8 80241C38 3C038015 */ lui $v1, 0x8015 +/* 824EFC 80241C3C 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 824F00 80241C40 24020001 */ addiu $v0, $zero, 1 +/* 824F04 80241C44 0C046F97 */ jal set_background_color_blend +/* 824F08 80241C48 A0620000 */ sb $v0, ($v1) +.L80241C4C: +/* 824F0C 80241C4C 0C00E2B7 */ jal get_npc_by_index +/* 824F10 80241C50 0200202D */ daddu $a0, $s0, $zero +/* 824F14 80241C54 0040202D */ daddu $a0, $v0, $zero +/* 824F18 80241C58 5080000B */ beql $a0, $zero, .L80241C88 +/* 824F1C 80241C5C 26100001 */ addiu $s0, $s0, 1 +/* 824F20 80241C60 8C820000 */ lw $v0, ($a0) +/* 824F24 80241C64 50400008 */ beql $v0, $zero, .L80241C88 +/* 824F28 80241C68 26100001 */ addiu $s0, $s0, 1 +/* 824F2C 80241C6C 808300A4 */ lb $v1, 0xa4($a0) +/* 824F30 80241C70 10740005 */ beq $v1, $s4, .L80241C88 +/* 824F34 80241C74 26100001 */ addiu $s0, $s0, 1 +/* 824F38 80241C78 10730003 */ beq $v1, $s3, .L80241C88 +/* 824F3C 80241C7C 00000000 */ nop +/* 824F40 80241C80 00521025 */ or $v0, $v0, $s2 +/* 824F44 80241C84 AC820000 */ sw $v0, ($a0) +.L80241C88: +/* 824F48 80241C88 2A020040 */ slti $v0, $s0, 0x40 +/* 824F4C 80241C8C 1440FFEF */ bnez $v0, .L80241C4C +/* 824F50 80241C90 00000000 */ nop +/* 824F54 80241C94 0000802D */ daddu $s0, $zero, $zero +/* 824F58 80241C98 3C120800 */ lui $s2, 0x800 +.L80241C9C: +/* 824F5C 80241C9C 0C04C3D6 */ jal get_item_entity +/* 824F60 80241CA0 0200202D */ daddu $a0, $s0, $zero +/* 824F64 80241CA4 0040182D */ daddu $v1, $v0, $zero +/* 824F68 80241CA8 10600007 */ beqz $v1, .L80241CC8 +/* 824F6C 80241CAC 26100001 */ addiu $s0, $s0, 1 +/* 824F70 80241CB0 8C640000 */ lw $a0, ($v1) +/* 824F74 80241CB4 30820010 */ andi $v0, $a0, 0x10 +/* 824F78 80241CB8 10400003 */ beqz $v0, .L80241CC8 +/* 824F7C 80241CBC 00000000 */ nop +/* 824F80 80241CC0 00921025 */ or $v0, $a0, $s2 +/* 824F84 80241CC4 AC620000 */ sw $v0, ($v1) +.L80241CC8: +/* 824F88 80241CC8 2A020100 */ slti $v0, $s0, 0x100 +/* 824F8C 80241CCC 1440FFF3 */ bnez $v0, .L80241C9C +/* 824F90 80241CD0 00000000 */ nop +/* 824F94 80241CD4 AE200070 */ sw $zero, 0x70($s1) +.L80241CD8: +/* 824F98 80241CD8 8E220070 */ lw $v0, 0x70($s1) +/* 824F9C 80241CDC 24420008 */ addiu $v0, $v0, 8 +/* 824FA0 80241CE0 AE220070 */ sw $v0, 0x70($s1) +/* 824FA4 80241CE4 28420100 */ slti $v0, $v0, 0x100 +/* 824FA8 80241CE8 14400003 */ bnez $v0, .L80241CF8 +/* 824FAC 80241CEC 0000202D */ daddu $a0, $zero, $zero +/* 824FB0 80241CF0 240200FF */ addiu $v0, $zero, 0xff +/* 824FB4 80241CF4 AE220070 */ sw $v0, 0x70($s1) +.L80241CF8: +/* 824FB8 80241CF8 0080282D */ daddu $a1, $a0, $zero +/* 824FBC 80241CFC 92270073 */ lbu $a3, 0x73($s1) +/* 824FC0 80241D00 0C046F97 */ jal set_background_color_blend +/* 824FC4 80241D04 0080302D */ daddu $a2, $a0, $zero +/* 824FC8 80241D08 8E220070 */ lw $v0, 0x70($s1) +/* 824FCC 80241D0C 8FBF0024 */ lw $ra, 0x24($sp) +/* 824FD0 80241D10 8FB40020 */ lw $s4, 0x20($sp) +/* 824FD4 80241D14 8FB3001C */ lw $s3, 0x1c($sp) +/* 824FD8 80241D18 8FB20018 */ lw $s2, 0x18($sp) +/* 824FDC 80241D1C 8FB10014 */ lw $s1, 0x14($sp) +/* 824FE0 80241D20 8FB00010 */ lw $s0, 0x10($sp) +/* 824FE4 80241D24 384200FF */ xori $v0, $v0, 0xff +/* 824FE8 80241D28 2C420001 */ sltiu $v0, $v0, 1 +/* 824FEC 80241D2C 00021040 */ sll $v0, $v0, 1 +/* 824FF0 80241D30 03E00008 */ jr $ra +/* 824FF4 80241D34 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38.s deleted file mode 100644 index 3a7dbc135b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D38 -/* 824FF8 80241D38 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 824FFC 80241D3C AFB00010 */ sw $s0, 0x10($sp) -/* 825000 80241D40 0080802D */ daddu $s0, $a0, $zero -/* 825004 80241D44 AFBF0020 */ sw $ra, 0x20($sp) -/* 825008 80241D48 AFB3001C */ sw $s3, 0x1c($sp) -/* 82500C 80241D4C AFB20018 */ sw $s2, 0x18($sp) -/* 825010 80241D50 10A00009 */ beqz $a1, .L80241D78 -/* 825014 80241D54 AFB10014 */ sw $s1, 0x14($sp) -/* 825018 80241D58 0000202D */ daddu $a0, $zero, $zero -/* 82501C 80241D5C 0080282D */ daddu $a1, $a0, $zero -/* 825020 80241D60 0080302D */ daddu $a2, $a0, $zero -/* 825024 80241D64 0C046F97 */ jal set_background_color_blend -/* 825028 80241D68 240700FF */ addiu $a3, $zero, 0xff -/* 82502C 80241D6C 240200FF */ addiu $v0, $zero, 0xff -/* 825030 80241D70 AE020070 */ sw $v0, 0x70($s0) -/* 825034 80241D74 AE000074 */ sw $zero, 0x74($s0) -.L80241D78: -/* 825038 80241D78 8E020070 */ lw $v0, 0x70($s0) -/* 82503C 80241D7C 2442FFF8 */ addiu $v0, $v0, -8 -/* 825040 80241D80 04410002 */ bgez $v0, .L80241D8C -/* 825044 80241D84 AE020070 */ sw $v0, 0x70($s0) -/* 825048 80241D88 AE000070 */ sw $zero, 0x70($s0) -.L80241D8C: -/* 82504C 80241D8C 0000202D */ daddu $a0, $zero, $zero -/* 825050 80241D90 0080282D */ daddu $a1, $a0, $zero -/* 825054 80241D94 92070073 */ lbu $a3, 0x73($s0) -/* 825058 80241D98 0C046F97 */ jal set_background_color_blend -/* 82505C 80241D9C 0080302D */ daddu $a2, $a0, $zero -/* 825060 80241DA0 8E020070 */ lw $v0, 0x70($s0) -/* 825064 80241DA4 14400006 */ bnez $v0, .L80241DC0 -/* 825068 80241DA8 00000000 */ nop -/* 82506C 80241DAC 8E020074 */ lw $v0, 0x74($s0) -/* 825070 80241DB0 14400003 */ bnez $v0, .L80241DC0 -/* 825074 80241DB4 24020001 */ addiu $v0, $zero, 1 -/* 825078 80241DB8 080907A3 */ j .L80241E8C -/* 82507C 80241DBC AE020074 */ sw $v0, 0x74($s0) -.L80241DC0: -/* 825080 80241DC0 8E030074 */ lw $v1, 0x74($s0) -/* 825084 80241DC4 24020001 */ addiu $v0, $zero, 1 -/* 825088 80241DC8 14620031 */ bne $v1, $v0, .L80241E90 -/* 82508C 80241DCC 0000102D */ daddu $v0, $zero, $zero -/* 825090 80241DD0 0C04760B */ jal func_8011D82C -/* 825094 80241DD4 0000202D */ daddu $a0, $zero, $zero -/* 825098 80241DD8 0000802D */ daddu $s0, $zero, $zero -/* 82509C 80241DDC 2413FFFC */ addiu $s3, $zero, -4 -/* 8250A0 80241DE0 2412000C */ addiu $s2, $zero, 0xc -/* 8250A4 80241DE4 3C11FF7F */ lui $s1, 0xff7f -/* 8250A8 80241DE8 3C028015 */ lui $v0, 0x8015 -/* 8250AC 80241DEC 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 8250B0 80241DF0 3631FFFF */ ori $s1, $s1, 0xffff -/* 8250B4 80241DF4 A0400000 */ sb $zero, ($v0) -.L80241DF8: -/* 8250B8 80241DF8 0C00E2B7 */ jal get_npc_by_index -/* 8250BC 80241DFC 0200202D */ daddu $a0, $s0, $zero -/* 8250C0 80241E00 0040202D */ daddu $a0, $v0, $zero -/* 8250C4 80241E04 5080000B */ beql $a0, $zero, .L80241E34 -/* 8250C8 80241E08 26100001 */ addiu $s0, $s0, 1 -/* 8250CC 80241E0C 8C820000 */ lw $v0, ($a0) -/* 8250D0 80241E10 50400008 */ beql $v0, $zero, .L80241E34 -/* 8250D4 80241E14 26100001 */ addiu $s0, $s0, 1 -/* 8250D8 80241E18 808300A4 */ lb $v1, 0xa4($a0) -/* 8250DC 80241E1C 10730005 */ beq $v1, $s3, .L80241E34 -/* 8250E0 80241E20 26100001 */ addiu $s0, $s0, 1 -/* 8250E4 80241E24 10720003 */ beq $v1, $s2, .L80241E34 -/* 8250E8 80241E28 00000000 */ nop -/* 8250EC 80241E2C 00511024 */ and $v0, $v0, $s1 -/* 8250F0 80241E30 AC820000 */ sw $v0, ($a0) -.L80241E34: -/* 8250F4 80241E34 2A020040 */ slti $v0, $s0, 0x40 -/* 8250F8 80241E38 1440FFEF */ bnez $v0, .L80241DF8 -/* 8250FC 80241E3C 00000000 */ nop -/* 825100 80241E40 0000802D */ daddu $s0, $zero, $zero -/* 825104 80241E44 3C11F7FF */ lui $s1, 0xf7ff -/* 825108 80241E48 3631FFFF */ ori $s1, $s1, 0xffff -.L80241E4C: -/* 82510C 80241E4C 0C04C3D6 */ jal get_item_entity -/* 825110 80241E50 0200202D */ daddu $a0, $s0, $zero -/* 825114 80241E54 0040182D */ daddu $v1, $v0, $zero -/* 825118 80241E58 10600007 */ beqz $v1, .L80241E78 -/* 82511C 80241E5C 26100001 */ addiu $s0, $s0, 1 -/* 825120 80241E60 8C640000 */ lw $a0, ($v1) -/* 825124 80241E64 30820010 */ andi $v0, $a0, 0x10 -/* 825128 80241E68 10400003 */ beqz $v0, .L80241E78 -/* 82512C 80241E6C 00000000 */ nop -/* 825130 80241E70 00911024 */ and $v0, $a0, $s1 -/* 825134 80241E74 AC620000 */ sw $v0, ($v1) -.L80241E78: -/* 825138 80241E78 2A020100 */ slti $v0, $s0, 0x100 -/* 82513C 80241E7C 1440FFF3 */ bnez $v0, .L80241E4C -/* 825140 80241E80 24020002 */ addiu $v0, $zero, 2 -/* 825144 80241E84 080907A4 */ j .L80241E90 -/* 825148 80241E88 00000000 */ nop -.L80241E8C: -/* 82514C 80241E8C 0000102D */ daddu $v0, $zero, $zero -.L80241E90: -/* 825150 80241E90 8FBF0020 */ lw $ra, 0x20($sp) -/* 825154 80241E94 8FB3001C */ lw $s3, 0x1c($sp) -/* 825158 80241E98 8FB20018 */ lw $s2, 0x18($sp) -/* 82515C 80241E9C 8FB10014 */ lw $s1, 0x14($sp) -/* 825160 80241EA0 8FB00010 */ lw $s0, 0x10($sp) -/* 825164 80241EA4 03E00008 */ jr $ra -/* 825168 80241EA8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s new file mode 100644 index 0000000000..5003597b26 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241D38_824FF8.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D38_824FF8 +/* 824FF8 80241D38 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 824FFC 80241D3C AFB00010 */ sw $s0, 0x10($sp) +/* 825000 80241D40 0080802D */ daddu $s0, $a0, $zero +/* 825004 80241D44 AFBF0020 */ sw $ra, 0x20($sp) +/* 825008 80241D48 AFB3001C */ sw $s3, 0x1c($sp) +/* 82500C 80241D4C AFB20018 */ sw $s2, 0x18($sp) +/* 825010 80241D50 10A00009 */ beqz $a1, .L80241D78 +/* 825014 80241D54 AFB10014 */ sw $s1, 0x14($sp) +/* 825018 80241D58 0000202D */ daddu $a0, $zero, $zero +/* 82501C 80241D5C 0080282D */ daddu $a1, $a0, $zero +/* 825020 80241D60 0080302D */ daddu $a2, $a0, $zero +/* 825024 80241D64 0C046F97 */ jal set_background_color_blend +/* 825028 80241D68 240700FF */ addiu $a3, $zero, 0xff +/* 82502C 80241D6C 240200FF */ addiu $v0, $zero, 0xff +/* 825030 80241D70 AE020070 */ sw $v0, 0x70($s0) +/* 825034 80241D74 AE000074 */ sw $zero, 0x74($s0) +.L80241D78: +/* 825038 80241D78 8E020070 */ lw $v0, 0x70($s0) +/* 82503C 80241D7C 2442FFF8 */ addiu $v0, $v0, -8 +/* 825040 80241D80 04410002 */ bgez $v0, .L80241D8C +/* 825044 80241D84 AE020070 */ sw $v0, 0x70($s0) +/* 825048 80241D88 AE000070 */ sw $zero, 0x70($s0) +.L80241D8C: +/* 82504C 80241D8C 0000202D */ daddu $a0, $zero, $zero +/* 825050 80241D90 0080282D */ daddu $a1, $a0, $zero +/* 825054 80241D94 92070073 */ lbu $a3, 0x73($s0) +/* 825058 80241D98 0C046F97 */ jal set_background_color_blend +/* 82505C 80241D9C 0080302D */ daddu $a2, $a0, $zero +/* 825060 80241DA0 8E020070 */ lw $v0, 0x70($s0) +/* 825064 80241DA4 14400006 */ bnez $v0, .L80241DC0 +/* 825068 80241DA8 00000000 */ nop +/* 82506C 80241DAC 8E020074 */ lw $v0, 0x74($s0) +/* 825070 80241DB0 14400003 */ bnez $v0, .L80241DC0 +/* 825074 80241DB4 24020001 */ addiu $v0, $zero, 1 +/* 825078 80241DB8 080907A3 */ j .L80241E8C +/* 82507C 80241DBC AE020074 */ sw $v0, 0x74($s0) +.L80241DC0: +/* 825080 80241DC0 8E030074 */ lw $v1, 0x74($s0) +/* 825084 80241DC4 24020001 */ addiu $v0, $zero, 1 +/* 825088 80241DC8 14620031 */ bne $v1, $v0, .L80241E90 +/* 82508C 80241DCC 0000102D */ daddu $v0, $zero, $zero +/* 825090 80241DD0 0C04760B */ jal func_8011D82C +/* 825094 80241DD4 0000202D */ daddu $a0, $zero, $zero +/* 825098 80241DD8 0000802D */ daddu $s0, $zero, $zero +/* 82509C 80241DDC 2413FFFC */ addiu $s3, $zero, -4 +/* 8250A0 80241DE0 2412000C */ addiu $s2, $zero, 0xc +/* 8250A4 80241DE4 3C11FF7F */ lui $s1, 0xff7f +/* 8250A8 80241DE8 3C028015 */ lui $v0, 0x8015 +/* 8250AC 80241DEC 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 8250B0 80241DF0 3631FFFF */ ori $s1, $s1, 0xffff +/* 8250B4 80241DF4 A0400000 */ sb $zero, ($v0) +.L80241DF8: +/* 8250B8 80241DF8 0C00E2B7 */ jal get_npc_by_index +/* 8250BC 80241DFC 0200202D */ daddu $a0, $s0, $zero +/* 8250C0 80241E00 0040202D */ daddu $a0, $v0, $zero +/* 8250C4 80241E04 5080000B */ beql $a0, $zero, .L80241E34 +/* 8250C8 80241E08 26100001 */ addiu $s0, $s0, 1 +/* 8250CC 80241E0C 8C820000 */ lw $v0, ($a0) +/* 8250D0 80241E10 50400008 */ beql $v0, $zero, .L80241E34 +/* 8250D4 80241E14 26100001 */ addiu $s0, $s0, 1 +/* 8250D8 80241E18 808300A4 */ lb $v1, 0xa4($a0) +/* 8250DC 80241E1C 10730005 */ beq $v1, $s3, .L80241E34 +/* 8250E0 80241E20 26100001 */ addiu $s0, $s0, 1 +/* 8250E4 80241E24 10720003 */ beq $v1, $s2, .L80241E34 +/* 8250E8 80241E28 00000000 */ nop +/* 8250EC 80241E2C 00511024 */ and $v0, $v0, $s1 +/* 8250F0 80241E30 AC820000 */ sw $v0, ($a0) +.L80241E34: +/* 8250F4 80241E34 2A020040 */ slti $v0, $s0, 0x40 +/* 8250F8 80241E38 1440FFEF */ bnez $v0, .L80241DF8 +/* 8250FC 80241E3C 00000000 */ nop +/* 825100 80241E40 0000802D */ daddu $s0, $zero, $zero +/* 825104 80241E44 3C11F7FF */ lui $s1, 0xf7ff +/* 825108 80241E48 3631FFFF */ ori $s1, $s1, 0xffff +.L80241E4C: +/* 82510C 80241E4C 0C04C3D6 */ jal get_item_entity +/* 825110 80241E50 0200202D */ daddu $a0, $s0, $zero +/* 825114 80241E54 0040182D */ daddu $v1, $v0, $zero +/* 825118 80241E58 10600007 */ beqz $v1, .L80241E78 +/* 82511C 80241E5C 26100001 */ addiu $s0, $s0, 1 +/* 825120 80241E60 8C640000 */ lw $a0, ($v1) +/* 825124 80241E64 30820010 */ andi $v0, $a0, 0x10 +/* 825128 80241E68 10400003 */ beqz $v0, .L80241E78 +/* 82512C 80241E6C 00000000 */ nop +/* 825130 80241E70 00911024 */ and $v0, $a0, $s1 +/* 825134 80241E74 AC620000 */ sw $v0, ($v1) +.L80241E78: +/* 825138 80241E78 2A020100 */ slti $v0, $s0, 0x100 +/* 82513C 80241E7C 1440FFF3 */ bnez $v0, .L80241E4C +/* 825140 80241E80 24020002 */ addiu $v0, $zero, 2 +/* 825144 80241E84 080907A4 */ j .L80241E90 +/* 825148 80241E88 00000000 */ nop +.L80241E8C: +/* 82514C 80241E8C 0000102D */ daddu $v0, $zero, $zero +.L80241E90: +/* 825150 80241E90 8FBF0020 */ lw $ra, 0x20($sp) +/* 825154 80241E94 8FB3001C */ lw $s3, 0x1c($sp) +/* 825158 80241E98 8FB20018 */ lw $s2, 0x18($sp) +/* 82515C 80241E9C 8FB10014 */ lw $s1, 0x14($sp) +/* 825160 80241EA0 8FB00010 */ lw $s0, 0x10($sp) +/* 825164 80241EA4 03E00008 */ jr $ra +/* 825168 80241EA8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC.s deleted file mode 100644 index a3d59e50d8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EAC -/* 82516C 80241EAC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 825170 80241EB0 AFB00010 */ sw $s0, 0x10($sp) -/* 825174 80241EB4 3C108011 */ lui $s0, %hi(gPlayerData) -/* 825178 80241EB8 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 82517C 80241EBC AFBF0018 */ sw $ra, 0x18($sp) -/* 825180 80241EC0 AFB10014 */ sw $s1, 0x14($sp) -/* 825184 80241EC4 960302C0 */ lhu $v1, 0x2c0($s0) -/* 825188 80241EC8 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 82518C 80241ECC 10400003 */ beqz $v0, .L80241EDC -/* 825190 80241ED0 0080882D */ daddu $s1, $a0, $zero -/* 825194 80241ED4 24620001 */ addiu $v0, $v1, 1 -/* 825198 80241ED8 A60202C0 */ sh $v0, 0x2c0($s0) -.L80241EDC: -/* 82519C 80241EDC 3C05F5DE */ lui $a1, 0xf5de -/* 8251A0 80241EE0 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 8251A4 80241EE4 0C0B1EAF */ jal get_variable -/* 8251A8 80241EE8 0000202D */ daddu $a0, $zero, $zero -/* 8251AC 80241EEC 3C038024 */ lui $v1, 0x8024 -/* 8251B0 80241EF0 00621821 */ addu $v1, $v1, $v0 -/* 8251B4 80241EF4 906361B4 */ lbu $v1, 0x61b4($v1) -/* 8251B8 80241EF8 8E220084 */ lw $v0, 0x84($s1) -/* 8251BC 80241EFC 54430006 */ bnel $v0, $v1, .L80241F18 -/* 8251C0 80241F00 AE200084 */ sw $zero, 0x84($s1) -/* 8251C4 80241F04 24020001 */ addiu $v0, $zero, 1 -/* 8251C8 80241F08 AE220084 */ sw $v0, 0x84($s1) -/* 8251CC 80241F0C 960202C2 */ lhu $v0, 0x2c2($s0) -/* 8251D0 80241F10 24420001 */ addiu $v0, $v0, 1 -/* 8251D4 80241F14 A60202C2 */ sh $v0, 0x2c2($s0) -.L80241F18: -/* 8251D8 80241F18 8FBF0018 */ lw $ra, 0x18($sp) -/* 8251DC 80241F1C 8FB10014 */ lw $s1, 0x14($sp) -/* 8251E0 80241F20 8FB00010 */ lw $s0, 0x10($sp) -/* 8251E4 80241F24 24020002 */ addiu $v0, $zero, 2 -/* 8251E8 80241F28 03E00008 */ jr $ra -/* 8251EC 80241F2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC_82516C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC_82516C.s new file mode 100644 index 0000000000..389e7f1e73 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241EAC_82516C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241EAC_82516C +/* 82516C 80241EAC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 825170 80241EB0 AFB00010 */ sw $s0, 0x10($sp) +/* 825174 80241EB4 3C108011 */ lui $s0, %hi(gPlayerData) +/* 825178 80241EB8 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 82517C 80241EBC AFBF0018 */ sw $ra, 0x18($sp) +/* 825180 80241EC0 AFB10014 */ sw $s1, 0x14($sp) +/* 825184 80241EC4 960302C0 */ lhu $v1, 0x2c0($s0) +/* 825188 80241EC8 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 82518C 80241ECC 10400003 */ beqz $v0, .L80241EDC +/* 825190 80241ED0 0080882D */ daddu $s1, $a0, $zero +/* 825194 80241ED4 24620001 */ addiu $v0, $v1, 1 +/* 825198 80241ED8 A60202C0 */ sh $v0, 0x2c0($s0) +.L80241EDC: +/* 82519C 80241EDC 3C05F5DE */ lui $a1, 0xf5de +/* 8251A0 80241EE0 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 8251A4 80241EE4 0C0B1EAF */ jal get_variable +/* 8251A8 80241EE8 0000202D */ daddu $a0, $zero, $zero +/* 8251AC 80241EEC 3C038024 */ lui $v1, 0x8024 +/* 8251B0 80241EF0 00621821 */ addu $v1, $v1, $v0 +/* 8251B4 80241EF4 906361B4 */ lbu $v1, 0x61b4($v1) +/* 8251B8 80241EF8 8E220084 */ lw $v0, 0x84($s1) +/* 8251BC 80241EFC 54430006 */ bnel $v0, $v1, .L80241F18 +/* 8251C0 80241F00 AE200084 */ sw $zero, 0x84($s1) +/* 8251C4 80241F04 24020001 */ addiu $v0, $zero, 1 +/* 8251C8 80241F08 AE220084 */ sw $v0, 0x84($s1) +/* 8251CC 80241F0C 960202C2 */ lhu $v0, 0x2c2($s0) +/* 8251D0 80241F10 24420001 */ addiu $v0, $v0, 1 +/* 8251D4 80241F14 A60202C2 */ sh $v0, 0x2c2($s0) +.L80241F18: +/* 8251D8 80241F18 8FBF0018 */ lw $ra, 0x18($sp) +/* 8251DC 80241F1C 8FB10014 */ lw $s1, 0x14($sp) +/* 8251E0 80241F20 8FB00010 */ lw $s0, 0x10($sp) +/* 8251E4 80241F24 24020002 */ addiu $v0, $zero, 2 +/* 8251E8 80241F28 03E00008 */ jr $ra +/* 8251EC 80241F2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30.s deleted file mode 100644 index e89b31d89b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F30 -/* 8251F0 80241F30 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8251F4 80241F34 AFB1001C */ sw $s1, 0x1c($sp) -/* 8251F8 80241F38 AFBF0020 */ sw $ra, 0x20($sp) -/* 8251FC 80241F3C AFB00018 */ sw $s0, 0x18($sp) -/* 825200 80241F40 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 825204 80241F44 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 825208 80241F48 10A00060 */ beqz $a1, .L802420CC -/* 82520C 80241F4C 0080882D */ daddu $s1, $a0, $zero -/* 825210 80241F50 3C05F4AC */ lui $a1, 0xf4ac -/* 825214 80241F54 0C0B1EAF */ jal get_variable -/* 825218 80241F58 34A5D481 */ ori $a1, $a1, 0xd481 -/* 82521C 80241F5C 0220202D */ daddu $a0, $s1, $zero -/* 825220 80241F60 3C05F4AC */ lui $a1, 0xf4ac -/* 825224 80241F64 4482B000 */ mtc1 $v0, $f22 -/* 825228 80241F68 00000000 */ nop -/* 82522C 80241F6C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 825230 80241F70 0C0B1EAF */ jal get_variable -/* 825234 80241F74 34A5D482 */ ori $a1, $a1, 0xd482 -/* 825238 80241F78 0220202D */ daddu $a0, $s1, $zero -/* 82523C 80241F7C 3C05F4AC */ lui $a1, 0xf4ac -/* 825240 80241F80 4482A000 */ mtc1 $v0, $f20 -/* 825244 80241F84 00000000 */ nop -/* 825248 80241F88 4680A520 */ cvt.s.w $f20, $f20 -/* 82524C 80241F8C 0C0B1EAF */ jal get_variable -/* 825250 80241F90 34A5D483 */ ori $a1, $a1, 0xd483 -/* 825254 80241F94 44821000 */ mtc1 $v0, $f2 -/* 825258 80241F98 00000000 */ nop -/* 82525C 80241F9C 468010A0 */ cvt.s.w $f2, $f2 -/* 825260 80241FA0 4405B000 */ mfc1 $a1, $f22 -/* 825264 80241FA4 4406A000 */ mfc1 $a2, $f20 -/* 825268 80241FA8 44071000 */ mfc1 $a3, $f2 -/* 82526C 80241FAC 0C01C574 */ jal func_800715D0 -/* 825270 80241FB0 0000202D */ daddu $a0, $zero, $zero -/* 825274 80241FB4 0220202D */ daddu $a0, $s1, $zero -/* 825278 80241FB8 3C05F4AC */ lui $a1, 0xf4ac -/* 82527C 80241FBC 34A5D481 */ ori $a1, $a1, 0xd481 -/* 825280 80241FC0 3C108025 */ lui $s0, 0x8025 -/* 825284 80241FC4 2610E560 */ addiu $s0, $s0, -0x1aa0 -/* 825288 80241FC8 0C0B1EAF */ jal get_variable -/* 82528C 80241FCC AE020000 */ sw $v0, ($s0) -/* 825290 80241FD0 0220202D */ daddu $a0, $s1, $zero -/* 825294 80241FD4 3C05F4AC */ lui $a1, 0xf4ac -/* 825298 80241FD8 4482B000 */ mtc1 $v0, $f22 -/* 82529C 80241FDC 00000000 */ nop -/* 8252A0 80241FE0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8252A4 80241FE4 0C0B1EAF */ jal get_variable -/* 8252A8 80241FE8 34A5D482 */ ori $a1, $a1, 0xd482 -/* 8252AC 80241FEC 0220202D */ daddu $a0, $s1, $zero -/* 8252B0 80241FF0 3C05F4AC */ lui $a1, 0xf4ac -/* 8252B4 80241FF4 4482A000 */ mtc1 $v0, $f20 -/* 8252B8 80241FF8 00000000 */ nop -/* 8252BC 80241FFC 4680A520 */ cvt.s.w $f20, $f20 -/* 8252C0 80242000 0C0B1EAF */ jal get_variable -/* 8252C4 80242004 34A5D483 */ ori $a1, $a1, 0xd483 -/* 8252C8 80242008 44821000 */ mtc1 $v0, $f2 -/* 8252CC 8024200C 00000000 */ nop -/* 8252D0 80242010 468010A0 */ cvt.s.w $f2, $f2 -/* 8252D4 80242014 4405B000 */ mfc1 $a1, $f22 -/* 8252D8 80242018 4406A000 */ mfc1 $a2, $f20 -/* 8252DC 8024201C 44071000 */ mfc1 $a3, $f2 -/* 8252E0 80242020 0C01C604 */ jal func_80071810 -/* 8252E4 80242024 0000202D */ daddu $a0, $zero, $zero -/* 8252E8 80242028 0220202D */ daddu $a0, $s1, $zero -/* 8252EC 8024202C 3C05F4AC */ lui $a1, 0xf4ac -/* 8252F0 80242030 3C018025 */ lui $at, 0x8025 -/* 8252F4 80242034 AC22E564 */ sw $v0, -0x1a9c($at) -/* 8252F8 80242038 0C0B1EAF */ jal get_variable -/* 8252FC 8024203C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 825300 80242040 0220202D */ daddu $a0, $s1, $zero -/* 825304 80242044 3C05F4AC */ lui $a1, 0xf4ac -/* 825308 80242048 4482B000 */ mtc1 $v0, $f22 -/* 82530C 8024204C 00000000 */ nop -/* 825310 80242050 4680B5A0 */ cvt.s.w $f22, $f22 -/* 825314 80242054 0C0B1EAF */ jal get_variable -/* 825318 80242058 34A5D482 */ ori $a1, $a1, 0xd482 -/* 82531C 8024205C 0220202D */ daddu $a0, $s1, $zero -/* 825320 80242060 3C05F4AC */ lui $a1, 0xf4ac -/* 825324 80242064 4482A000 */ mtc1 $v0, $f20 -/* 825328 80242068 00000000 */ nop -/* 82532C 8024206C 4680A520 */ cvt.s.w $f20, $f20 -/* 825330 80242070 0C0B1EAF */ jal get_variable -/* 825334 80242074 34A5D483 */ ori $a1, $a1, 0xd483 -/* 825338 80242078 44821000 */ mtc1 $v0, $f2 -/* 82533C 8024207C 00000000 */ nop -/* 825340 80242080 468010A0 */ cvt.s.w $f2, $f2 -/* 825344 80242084 4405B000 */ mfc1 $a1, $f22 -/* 825348 80242088 4406A000 */ mfc1 $a2, $f20 -/* 82534C 8024208C 3C013F80 */ lui $at, 0x3f80 -/* 825350 80242090 44810000 */ mtc1 $at, $f0 -/* 825354 80242094 44071000 */ mfc1 $a3, $f2 -/* 825358 80242098 0000202D */ daddu $a0, $zero, $zero -/* 82535C 8024209C AFA00014 */ sw $zero, 0x14($sp) -/* 825360 802420A0 0C01CA24 */ jal func_80072890 -/* 825364 802420A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 825368 802420A8 8E030000 */ lw $v1, ($s0) -/* 82536C 802420AC 8C64000C */ lw $a0, 0xc($v1) -/* 825370 802420B0 3C018025 */ lui $at, 0x8025 -/* 825374 802420B4 AC22E568 */ sw $v0, -0x1a98($at) -/* 825378 802420B8 AC800018 */ sw $zero, 0x18($a0) -/* 82537C 802420BC AC800020 */ sw $zero, 0x20($a0) -/* 825380 802420C0 AC800024 */ sw $zero, 0x24($a0) -/* 825384 802420C4 AC800028 */ sw $zero, 0x28($a0) -/* 825388 802420C8 AC80001C */ sw $zero, 0x1c($a0) -.L802420CC: -/* 82538C 802420CC 3C028025 */ lui $v0, 0x8025 -/* 825390 802420D0 8C42E560 */ lw $v0, -0x1aa0($v0) -/* 825394 802420D4 8C44000C */ lw $a0, 0xc($v0) -/* 825398 802420D8 8C820020 */ lw $v0, 0x20($a0) -/* 82539C 802420DC 8C830028 */ lw $v1, 0x28($a0) -/* 8253A0 802420E0 2442000A */ addiu $v0, $v0, 0xa -/* 8253A4 802420E4 AC820020 */ sw $v0, 0x20($a0) -/* 8253A8 802420E8 8C820024 */ lw $v0, 0x24($a0) -/* 8253AC 802420EC 2463000A */ addiu $v1, $v1, 0xa -/* 8253B0 802420F0 AC830028 */ sw $v1, 0x28($a0) -/* 8253B4 802420F4 8C830018 */ lw $v1, 0x18($a0) -/* 8253B8 802420F8 2442000A */ addiu $v0, $v0, 0xa -/* 8253BC 802420FC AC820024 */ sw $v0, 0x24($a0) -/* 8253C0 80242100 8C82001C */ lw $v0, 0x1c($a0) -/* 8253C4 80242104 2463000A */ addiu $v1, $v1, 0xa -/* 8253C8 80242108 AC830018 */ sw $v1, 0x18($a0) -/* 8253CC 8024210C 286300FF */ slti $v1, $v1, 0xff -/* 8253D0 80242110 2442000A */ addiu $v0, $v0, 0xa -/* 8253D4 80242114 AC82001C */ sw $v0, 0x1c($a0) -/* 8253D8 80242118 14600004 */ bnez $v1, .L8024212C -/* 8253DC 8024211C 0000102D */ daddu $v0, $zero, $zero -/* 8253E0 80242120 240200FF */ addiu $v0, $zero, 0xff -/* 8253E4 80242124 AC820018 */ sw $v0, 0x18($a0) -/* 8253E8 80242128 24020002 */ addiu $v0, $zero, 2 -.L8024212C: -/* 8253EC 8024212C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8253F0 80242130 8FB1001C */ lw $s1, 0x1c($sp) -/* 8253F4 80242134 8FB00018 */ lw $s0, 0x18($sp) -/* 8253F8 80242138 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8253FC 8024213C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 825400 80242140 03E00008 */ jr $ra -/* 825404 80242144 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s new file mode 100644 index 0000000000..57cbaf3fa1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241F30_8251F0.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F30_8251F0 +/* 8251F0 80241F30 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8251F4 80241F34 AFB1001C */ sw $s1, 0x1c($sp) +/* 8251F8 80241F38 AFBF0020 */ sw $ra, 0x20($sp) +/* 8251FC 80241F3C AFB00018 */ sw $s0, 0x18($sp) +/* 825200 80241F40 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 825204 80241F44 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 825208 80241F48 10A00060 */ beqz $a1, .L802420CC +/* 82520C 80241F4C 0080882D */ daddu $s1, $a0, $zero +/* 825210 80241F50 3C05F4AC */ lui $a1, 0xf4ac +/* 825214 80241F54 0C0B1EAF */ jal get_variable +/* 825218 80241F58 34A5D481 */ ori $a1, $a1, 0xd481 +/* 82521C 80241F5C 0220202D */ daddu $a0, $s1, $zero +/* 825220 80241F60 3C05F4AC */ lui $a1, 0xf4ac +/* 825224 80241F64 4482B000 */ mtc1 $v0, $f22 +/* 825228 80241F68 00000000 */ nop +/* 82522C 80241F6C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 825230 80241F70 0C0B1EAF */ jal get_variable +/* 825234 80241F74 34A5D482 */ ori $a1, $a1, 0xd482 +/* 825238 80241F78 0220202D */ daddu $a0, $s1, $zero +/* 82523C 80241F7C 3C05F4AC */ lui $a1, 0xf4ac +/* 825240 80241F80 4482A000 */ mtc1 $v0, $f20 +/* 825244 80241F84 00000000 */ nop +/* 825248 80241F88 4680A520 */ cvt.s.w $f20, $f20 +/* 82524C 80241F8C 0C0B1EAF */ jal get_variable +/* 825250 80241F90 34A5D483 */ ori $a1, $a1, 0xd483 +/* 825254 80241F94 44821000 */ mtc1 $v0, $f2 +/* 825258 80241F98 00000000 */ nop +/* 82525C 80241F9C 468010A0 */ cvt.s.w $f2, $f2 +/* 825260 80241FA0 4405B000 */ mfc1 $a1, $f22 +/* 825264 80241FA4 4406A000 */ mfc1 $a2, $f20 +/* 825268 80241FA8 44071000 */ mfc1 $a3, $f2 +/* 82526C 80241FAC 0C01C574 */ jal func_800715D0 +/* 825270 80241FB0 0000202D */ daddu $a0, $zero, $zero +/* 825274 80241FB4 0220202D */ daddu $a0, $s1, $zero +/* 825278 80241FB8 3C05F4AC */ lui $a1, 0xf4ac +/* 82527C 80241FBC 34A5D481 */ ori $a1, $a1, 0xd481 +/* 825280 80241FC0 3C108025 */ lui $s0, 0x8025 +/* 825284 80241FC4 2610E560 */ addiu $s0, $s0, -0x1aa0 +/* 825288 80241FC8 0C0B1EAF */ jal get_variable +/* 82528C 80241FCC AE020000 */ sw $v0, ($s0) +/* 825290 80241FD0 0220202D */ daddu $a0, $s1, $zero +/* 825294 80241FD4 3C05F4AC */ lui $a1, 0xf4ac +/* 825298 80241FD8 4482B000 */ mtc1 $v0, $f22 +/* 82529C 80241FDC 00000000 */ nop +/* 8252A0 80241FE0 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8252A4 80241FE4 0C0B1EAF */ jal get_variable +/* 8252A8 80241FE8 34A5D482 */ ori $a1, $a1, 0xd482 +/* 8252AC 80241FEC 0220202D */ daddu $a0, $s1, $zero +/* 8252B0 80241FF0 3C05F4AC */ lui $a1, 0xf4ac +/* 8252B4 80241FF4 4482A000 */ mtc1 $v0, $f20 +/* 8252B8 80241FF8 00000000 */ nop +/* 8252BC 80241FFC 4680A520 */ cvt.s.w $f20, $f20 +/* 8252C0 80242000 0C0B1EAF */ jal get_variable +/* 8252C4 80242004 34A5D483 */ ori $a1, $a1, 0xd483 +/* 8252C8 80242008 44821000 */ mtc1 $v0, $f2 +/* 8252CC 8024200C 00000000 */ nop +/* 8252D0 80242010 468010A0 */ cvt.s.w $f2, $f2 +/* 8252D4 80242014 4405B000 */ mfc1 $a1, $f22 +/* 8252D8 80242018 4406A000 */ mfc1 $a2, $f20 +/* 8252DC 8024201C 44071000 */ mfc1 $a3, $f2 +/* 8252E0 80242020 0C01C604 */ jal func_80071810 +/* 8252E4 80242024 0000202D */ daddu $a0, $zero, $zero +/* 8252E8 80242028 0220202D */ daddu $a0, $s1, $zero +/* 8252EC 8024202C 3C05F4AC */ lui $a1, 0xf4ac +/* 8252F0 80242030 3C018025 */ lui $at, 0x8025 +/* 8252F4 80242034 AC22E564 */ sw $v0, -0x1a9c($at) +/* 8252F8 80242038 0C0B1EAF */ jal get_variable +/* 8252FC 8024203C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 825300 80242040 0220202D */ daddu $a0, $s1, $zero +/* 825304 80242044 3C05F4AC */ lui $a1, 0xf4ac +/* 825308 80242048 4482B000 */ mtc1 $v0, $f22 +/* 82530C 8024204C 00000000 */ nop +/* 825310 80242050 4680B5A0 */ cvt.s.w $f22, $f22 +/* 825314 80242054 0C0B1EAF */ jal get_variable +/* 825318 80242058 34A5D482 */ ori $a1, $a1, 0xd482 +/* 82531C 8024205C 0220202D */ daddu $a0, $s1, $zero +/* 825320 80242060 3C05F4AC */ lui $a1, 0xf4ac +/* 825324 80242064 4482A000 */ mtc1 $v0, $f20 +/* 825328 80242068 00000000 */ nop +/* 82532C 8024206C 4680A520 */ cvt.s.w $f20, $f20 +/* 825330 80242070 0C0B1EAF */ jal get_variable +/* 825334 80242074 34A5D483 */ ori $a1, $a1, 0xd483 +/* 825338 80242078 44821000 */ mtc1 $v0, $f2 +/* 82533C 8024207C 00000000 */ nop +/* 825340 80242080 468010A0 */ cvt.s.w $f2, $f2 +/* 825344 80242084 4405B000 */ mfc1 $a1, $f22 +/* 825348 80242088 4406A000 */ mfc1 $a2, $f20 +/* 82534C 8024208C 3C013F80 */ lui $at, 0x3f80 +/* 825350 80242090 44810000 */ mtc1 $at, $f0 +/* 825354 80242094 44071000 */ mfc1 $a3, $f2 +/* 825358 80242098 0000202D */ daddu $a0, $zero, $zero +/* 82535C 8024209C AFA00014 */ sw $zero, 0x14($sp) +/* 825360 802420A0 0C01CA24 */ jal func_80072890 +/* 825364 802420A4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 825368 802420A8 8E030000 */ lw $v1, ($s0) +/* 82536C 802420AC 8C64000C */ lw $a0, 0xc($v1) +/* 825370 802420B0 3C018025 */ lui $at, 0x8025 +/* 825374 802420B4 AC22E568 */ sw $v0, -0x1a98($at) +/* 825378 802420B8 AC800018 */ sw $zero, 0x18($a0) +/* 82537C 802420BC AC800020 */ sw $zero, 0x20($a0) +/* 825380 802420C0 AC800024 */ sw $zero, 0x24($a0) +/* 825384 802420C4 AC800028 */ sw $zero, 0x28($a0) +/* 825388 802420C8 AC80001C */ sw $zero, 0x1c($a0) +.L802420CC: +/* 82538C 802420CC 3C028025 */ lui $v0, 0x8025 +/* 825390 802420D0 8C42E560 */ lw $v0, -0x1aa0($v0) +/* 825394 802420D4 8C44000C */ lw $a0, 0xc($v0) +/* 825398 802420D8 8C820020 */ lw $v0, 0x20($a0) +/* 82539C 802420DC 8C830028 */ lw $v1, 0x28($a0) +/* 8253A0 802420E0 2442000A */ addiu $v0, $v0, 0xa +/* 8253A4 802420E4 AC820020 */ sw $v0, 0x20($a0) +/* 8253A8 802420E8 8C820024 */ lw $v0, 0x24($a0) +/* 8253AC 802420EC 2463000A */ addiu $v1, $v1, 0xa +/* 8253B0 802420F0 AC830028 */ sw $v1, 0x28($a0) +/* 8253B4 802420F4 8C830018 */ lw $v1, 0x18($a0) +/* 8253B8 802420F8 2442000A */ addiu $v0, $v0, 0xa +/* 8253BC 802420FC AC820024 */ sw $v0, 0x24($a0) +/* 8253C0 80242100 8C82001C */ lw $v0, 0x1c($a0) +/* 8253C4 80242104 2463000A */ addiu $v1, $v1, 0xa +/* 8253C8 80242108 AC830018 */ sw $v1, 0x18($a0) +/* 8253CC 8024210C 286300FF */ slti $v1, $v1, 0xff +/* 8253D0 80242110 2442000A */ addiu $v0, $v0, 0xa +/* 8253D4 80242114 AC82001C */ sw $v0, 0x1c($a0) +/* 8253D8 80242118 14600004 */ bnez $v1, .L8024212C +/* 8253DC 8024211C 0000102D */ daddu $v0, $zero, $zero +/* 8253E0 80242120 240200FF */ addiu $v0, $zero, 0xff +/* 8253E4 80242124 AC820018 */ sw $v0, 0x18($a0) +/* 8253E8 80242128 24020002 */ addiu $v0, $zero, 2 +.L8024212C: +/* 8253EC 8024212C 8FBF0020 */ lw $ra, 0x20($sp) +/* 8253F0 80242130 8FB1001C */ lw $s1, 0x1c($sp) +/* 8253F4 80242134 8FB00018 */ lw $s0, 0x18($sp) +/* 8253F8 80242138 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 8253FC 8024213C D7B40028 */ ldc1 $f20, 0x28($sp) +/* 825400 80242140 03E00008 */ jr $ra +/* 825404 80242144 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148.s deleted file mode 100644 index 4174e5aa4f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242148 -/* 825408 80242148 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 82540C 8024214C 10A0000B */ beqz $a1, .L8024217C -/* 825410 80242150 AFBF0010 */ sw $ra, 0x10($sp) -/* 825414 80242154 3C038025 */ lui $v1, 0x8025 -/* 825418 80242158 8C63E564 */ lw $v1, -0x1a9c($v1) -/* 82541C 8024215C 8C620000 */ lw $v0, ($v1) -/* 825420 80242160 3C048025 */ lui $a0, 0x8025 -/* 825424 80242164 8C84E568 */ lw $a0, -0x1a98($a0) -/* 825428 80242168 34420010 */ ori $v0, $v0, 0x10 -/* 82542C 8024216C AC620000 */ sw $v0, ($v1) -/* 825430 80242170 8C820000 */ lw $v0, ($a0) -/* 825434 80242174 34420010 */ ori $v0, $v0, 0x10 -/* 825438 80242178 AC820000 */ sw $v0, ($a0) -.L8024217C: -/* 82543C 8024217C 3C048025 */ lui $a0, 0x8025 -/* 825440 80242180 8C84E560 */ lw $a0, -0x1aa0($a0) -/* 825444 80242184 8C85000C */ lw $a1, 0xc($a0) -/* 825448 80242188 8CA20018 */ lw $v0, 0x18($a1) -/* 82544C 8024218C 8CA30020 */ lw $v1, 0x20($a1) -/* 825450 80242190 2442FFF6 */ addiu $v0, $v0, -0xa -/* 825454 80242194 ACA20018 */ sw $v0, 0x18($a1) -/* 825458 80242198 8CA20024 */ lw $v0, 0x24($a1) -/* 82545C 8024219C 2463FFF6 */ addiu $v1, $v1, -0xa -/* 825460 802421A0 ACA30020 */ sw $v1, 0x20($a1) -/* 825464 802421A4 8CA30028 */ lw $v1, 0x28($a1) -/* 825468 802421A8 2442FFF6 */ addiu $v0, $v0, -0xa -/* 82546C 802421AC ACA20024 */ sw $v0, 0x24($a1) -/* 825470 802421B0 8CA2001C */ lw $v0, 0x1c($a1) -/* 825474 802421B4 2463FFF6 */ addiu $v1, $v1, -0xa -/* 825478 802421B8 ACA30028 */ sw $v1, 0x28($a1) -/* 82547C 802421BC 8CA30018 */ lw $v1, 0x18($a1) -/* 825480 802421C0 2442FFF6 */ addiu $v0, $v0, -0xa -/* 825484 802421C4 18600003 */ blez $v1, .L802421D4 -/* 825488 802421C8 ACA2001C */ sw $v0, 0x1c($a1) -/* 82548C 802421CC 0809087C */ j .L802421F0 -/* 825490 802421D0 0000102D */ daddu $v0, $zero, $zero -.L802421D4: -/* 825494 802421D4 0C016914 */ jal remove_effect -/* 825498 802421D8 ACA00018 */ sw $zero, 0x18($a1) -/* 82549C 802421DC 3C048025 */ lui $a0, 0x8025 -/* 8254A0 802421E0 8C84E540 */ lw $a0, -0x1ac0($a0) -/* 8254A4 802421E4 0C048D70 */ jal func_801235C0 -/* 8254A8 802421E8 00000000 */ nop -/* 8254AC 802421EC 24020002 */ addiu $v0, $zero, 2 -.L802421F0: -/* 8254B0 802421F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8254B4 802421F4 03E00008 */ jr $ra -/* 8254B8 802421F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s new file mode 100644 index 0000000000..a724899ea5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242148_825408.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242148_825408 +/* 825408 80242148 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 82540C 8024214C 10A0000B */ beqz $a1, .L8024217C +/* 825410 80242150 AFBF0010 */ sw $ra, 0x10($sp) +/* 825414 80242154 3C038025 */ lui $v1, 0x8025 +/* 825418 80242158 8C63E564 */ lw $v1, -0x1a9c($v1) +/* 82541C 8024215C 8C620000 */ lw $v0, ($v1) +/* 825420 80242160 3C048025 */ lui $a0, 0x8025 +/* 825424 80242164 8C84E568 */ lw $a0, -0x1a98($a0) +/* 825428 80242168 34420010 */ ori $v0, $v0, 0x10 +/* 82542C 8024216C AC620000 */ sw $v0, ($v1) +/* 825430 80242170 8C820000 */ lw $v0, ($a0) +/* 825434 80242174 34420010 */ ori $v0, $v0, 0x10 +/* 825438 80242178 AC820000 */ sw $v0, ($a0) +.L8024217C: +/* 82543C 8024217C 3C048025 */ lui $a0, 0x8025 +/* 825440 80242180 8C84E560 */ lw $a0, -0x1aa0($a0) +/* 825444 80242184 8C85000C */ lw $a1, 0xc($a0) +/* 825448 80242188 8CA20018 */ lw $v0, 0x18($a1) +/* 82544C 8024218C 8CA30020 */ lw $v1, 0x20($a1) +/* 825450 80242190 2442FFF6 */ addiu $v0, $v0, -0xa +/* 825454 80242194 ACA20018 */ sw $v0, 0x18($a1) +/* 825458 80242198 8CA20024 */ lw $v0, 0x24($a1) +/* 82545C 8024219C 2463FFF6 */ addiu $v1, $v1, -0xa +/* 825460 802421A0 ACA30020 */ sw $v1, 0x20($a1) +/* 825464 802421A4 8CA30028 */ lw $v1, 0x28($a1) +/* 825468 802421A8 2442FFF6 */ addiu $v0, $v0, -0xa +/* 82546C 802421AC ACA20024 */ sw $v0, 0x24($a1) +/* 825470 802421B0 8CA2001C */ lw $v0, 0x1c($a1) +/* 825474 802421B4 2463FFF6 */ addiu $v1, $v1, -0xa +/* 825478 802421B8 ACA30028 */ sw $v1, 0x28($a1) +/* 82547C 802421BC 8CA30018 */ lw $v1, 0x18($a1) +/* 825480 802421C0 2442FFF6 */ addiu $v0, $v0, -0xa +/* 825484 802421C4 18600003 */ blez $v1, .L802421D4 +/* 825488 802421C8 ACA2001C */ sw $v0, 0x1c($a1) +/* 82548C 802421CC 0809087C */ j .L802421F0 +/* 825490 802421D0 0000102D */ daddu $v0, $zero, $zero +.L802421D4: +/* 825494 802421D4 0C016914 */ jal remove_effect +/* 825498 802421D8 ACA00018 */ sw $zero, 0x18($a1) +/* 82549C 802421DC 3C048025 */ lui $a0, 0x8025 +/* 8254A0 802421E0 8C84E540 */ lw $a0, -0x1ac0($a0) +/* 8254A4 802421E4 0C048D70 */ jal func_801235C0 +/* 8254A8 802421E8 00000000 */ nop +/* 8254AC 802421EC 24020002 */ addiu $v0, $zero, 2 +.L802421F0: +/* 8254B0 802421F0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8254B4 802421F4 03E00008 */ jr $ra +/* 8254B8 802421F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC.s deleted file mode 100644 index 2a319516e2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421FC -/* 8254BC 802421FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8254C0 80242200 AFBF0010 */ sw $ra, 0x10($sp) -/* 8254C4 80242204 8C82000C */ lw $v0, 0xc($a0) -/* 8254C8 80242208 0C0B1EAF */ jal get_variable -/* 8254CC 8024220C 8C450000 */ lw $a1, ($v0) -/* 8254D0 80242210 3C038025 */ lui $v1, 0x8025 -/* 8254D4 80242214 8C63E560 */ lw $v1, -0x1aa0($v1) -/* 8254D8 80242218 8C63000C */ lw $v1, 0xc($v1) -/* 8254DC 8024221C AC620034 */ sw $v0, 0x34($v1) -/* 8254E0 80242220 8FBF0010 */ lw $ra, 0x10($sp) -/* 8254E4 80242224 24020002 */ addiu $v0, $zero, 2 -/* 8254E8 80242228 03E00008 */ jr $ra -/* 8254EC 8024222C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC_8254BC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC_8254BC.s new file mode 100644 index 0000000000..9260befec9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802421FC_8254BC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421FC_8254BC +/* 8254BC 802421FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8254C0 80242200 AFBF0010 */ sw $ra, 0x10($sp) +/* 8254C4 80242204 8C82000C */ lw $v0, 0xc($a0) +/* 8254C8 80242208 0C0B1EAF */ jal get_variable +/* 8254CC 8024220C 8C450000 */ lw $a1, ($v0) +/* 8254D0 80242210 3C038025 */ lui $v1, 0x8025 +/* 8254D4 80242214 8C63E560 */ lw $v1, -0x1aa0($v1) +/* 8254D8 80242218 8C63000C */ lw $v1, 0xc($v1) +/* 8254DC 8024221C AC620034 */ sw $v0, 0x34($v1) +/* 8254E0 80242220 8FBF0010 */ lw $ra, 0x10($sp) +/* 8254E4 80242224 24020002 */ addiu $v0, $zero, 2 +/* 8254E8 80242228 03E00008 */ jr $ra +/* 8254EC 8024222C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230.s deleted file mode 100644 index e41d896613..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242230 -/* 8254F0 80242230 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8254F4 80242234 AFBF0010 */ sw $ra, 0x10($sp) -/* 8254F8 80242238 8C82000C */ lw $v0, 0xc($a0) -/* 8254FC 8024223C 0C0B1EAF */ jal get_variable -/* 825500 80242240 8C450000 */ lw $a1, ($v0) -/* 825504 80242244 0040202D */ daddu $a0, $v0, $zero -/* 825508 80242248 3C028025 */ lui $v0, 0x8025 -/* 82550C 8024224C 8C42E560 */ lw $v0, -0x1aa0($v0) -/* 825510 80242250 24030001 */ addiu $v1, $zero, 1 -/* 825514 80242254 8C45000C */ lw $a1, 0xc($v0) -/* 825518 80242258 1083000D */ beq $a0, $v1, .L80242290 -/* 82551C 8024225C 28820002 */ slti $v0, $a0, 2 -/* 825520 80242260 10400005 */ beqz $v0, .L80242278 -/* 825524 80242264 24020002 */ addiu $v0, $zero, 2 -/* 825528 80242268 10800007 */ beqz $a0, .L80242288 -/* 82552C 8024226C 240200C0 */ addiu $v0, $zero, 0xc0 -/* 825530 80242270 080908A8 */ j .L802422A0 -/* 825534 80242274 ACA00038 */ sw $zero, 0x38($a1) -.L80242278: -/* 825538 80242278 10820008 */ beq $a0, $v0, .L8024229C -/* 82553C 8024227C 24020040 */ addiu $v0, $zero, 0x40 -/* 825540 80242280 080908A8 */ j .L802422A0 -/* 825544 80242284 ACA00038 */ sw $zero, 0x38($a1) -.L80242288: -/* 825548 80242288 080908A8 */ j .L802422A0 -/* 82554C 8024228C ACA20038 */ sw $v0, 0x38($a1) -.L80242290: -/* 825550 80242290 24020080 */ addiu $v0, $zero, 0x80 -/* 825554 80242294 080908A8 */ j .L802422A0 -/* 825558 80242298 ACA20038 */ sw $v0, 0x38($a1) -.L8024229C: -/* 82555C 8024229C ACA20038 */ sw $v0, 0x38($a1) -.L802422A0: -/* 825560 802422A0 8FBF0010 */ lw $ra, 0x10($sp) -/* 825564 802422A4 24020002 */ addiu $v0, $zero, 2 -/* 825568 802422A8 03E00008 */ jr $ra -/* 82556C 802422AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230_8254F0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230_8254F0.s new file mode 100644 index 0000000000..90f2340738 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242230_8254F0.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242230_8254F0 +/* 8254F0 80242230 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8254F4 80242234 AFBF0010 */ sw $ra, 0x10($sp) +/* 8254F8 80242238 8C82000C */ lw $v0, 0xc($a0) +/* 8254FC 8024223C 0C0B1EAF */ jal get_variable +/* 825500 80242240 8C450000 */ lw $a1, ($v0) +/* 825504 80242244 0040202D */ daddu $a0, $v0, $zero +/* 825508 80242248 3C028025 */ lui $v0, 0x8025 +/* 82550C 8024224C 8C42E560 */ lw $v0, -0x1aa0($v0) +/* 825510 80242250 24030001 */ addiu $v1, $zero, 1 +/* 825514 80242254 8C45000C */ lw $a1, 0xc($v0) +/* 825518 80242258 1083000D */ beq $a0, $v1, .L80242290 +/* 82551C 8024225C 28820002 */ slti $v0, $a0, 2 +/* 825520 80242260 10400005 */ beqz $v0, .L80242278 +/* 825524 80242264 24020002 */ addiu $v0, $zero, 2 +/* 825528 80242268 10800007 */ beqz $a0, .L80242288 +/* 82552C 8024226C 240200C0 */ addiu $v0, $zero, 0xc0 +/* 825530 80242270 080908A8 */ j .L802422A0 +/* 825534 80242274 ACA00038 */ sw $zero, 0x38($a1) +.L80242278: +/* 825538 80242278 10820008 */ beq $a0, $v0, .L8024229C +/* 82553C 8024227C 24020040 */ addiu $v0, $zero, 0x40 +/* 825540 80242280 080908A8 */ j .L802422A0 +/* 825544 80242284 ACA00038 */ sw $zero, 0x38($a1) +.L80242288: +/* 825548 80242288 080908A8 */ j .L802422A0 +/* 82554C 8024228C ACA20038 */ sw $v0, 0x38($a1) +.L80242290: +/* 825550 80242290 24020080 */ addiu $v0, $zero, 0x80 +/* 825554 80242294 080908A8 */ j .L802422A0 +/* 825558 80242298 ACA20038 */ sw $v0, 0x38($a1) +.L8024229C: +/* 82555C 8024229C ACA20038 */ sw $v0, 0x38($a1) +.L802422A0: +/* 825560 802422A0 8FBF0010 */ lw $ra, 0x10($sp) +/* 825564 802422A4 24020002 */ addiu $v0, $zero, 2 +/* 825568 802422A8 03E00008 */ jr $ra +/* 82556C 802422AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0.s deleted file mode 100644 index 64af921c5b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422B0 -/* 825570 802422B0 3C028025 */ lui $v0, 0x8025 -/* 825574 802422B4 8C42E568 */ lw $v0, -0x1a98($v0) -/* 825578 802422B8 8C42000C */ lw $v0, 0xc($v0) -/* 82557C 802422BC AC40001C */ sw $zero, 0x1c($v0) -/* 825580 802422C0 03E00008 */ jr $ra -/* 825584 802422C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0_825570.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0_825570.s new file mode 100644 index 0000000000..5c07911687 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422B0_825570.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422B0_825570 +/* 825570 802422B0 3C028025 */ lui $v0, 0x8025 +/* 825574 802422B4 8C42E568 */ lw $v0, -0x1a98($v0) +/* 825578 802422B8 8C42000C */ lw $v0, 0xc($v0) +/* 82557C 802422BC AC40001C */ sw $zero, 0x1c($v0) +/* 825580 802422C0 03E00008 */ jr $ra +/* 825584 802422C4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8.s deleted file mode 100644 index f8e7e07af2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422C8 -/* 825588 802422C8 3C028025 */ lui $v0, 0x8025 -/* 82558C 802422CC 8C42E568 */ lw $v0, -0x1a98($v0) -/* 825590 802422D0 8C43000C */ lw $v1, 0xc($v0) -/* 825594 802422D4 24020001 */ addiu $v0, $zero, 1 -/* 825598 802422D8 AC62001C */ sw $v0, 0x1c($v1) -/* 82559C 802422DC 03E00008 */ jr $ra -/* 8255A0 802422E0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8_825588.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8_825588.s new file mode 100644 index 0000000000..18fff2d562 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422C8_825588.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422C8_825588 +/* 825588 802422C8 3C028025 */ lui $v0, 0x8025 +/* 82558C 802422CC 8C42E568 */ lw $v0, -0x1a98($v0) +/* 825590 802422D0 8C43000C */ lw $v1, 0xc($v0) +/* 825594 802422D4 24020001 */ addiu $v0, $zero, 1 +/* 825598 802422D8 AC62001C */ sw $v0, 0x1c($v1) +/* 82559C 802422DC 03E00008 */ jr $ra +/* 8255A0 802422E0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4.s deleted file mode 100644 index 56c8a52edf..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422E4 -/* 8255A4 802422E4 3C028025 */ lui $v0, 0x8025 -/* 8255A8 802422E8 8C42E568 */ lw $v0, -0x1a98($v0) -/* 8255AC 802422EC 8C43000C */ lw $v1, 0xc($v0) -/* 8255B0 802422F0 24020002 */ addiu $v0, $zero, 2 -/* 8255B4 802422F4 03E00008 */ jr $ra -/* 8255B8 802422F8 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4_8255A4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4_8255A4.s new file mode 100644 index 0000000000..73ef327240 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422E4_8255A4.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422E4_8255A4 +/* 8255A4 802422E4 3C028025 */ lui $v0, 0x8025 +/* 8255A8 802422E8 8C42E568 */ lw $v0, -0x1a98($v0) +/* 8255AC 802422EC 8C43000C */ lw $v1, 0xc($v0) +/* 8255B0 802422F0 24020002 */ addiu $v0, $zero, 2 +/* 8255B4 802422F4 03E00008 */ jr $ra +/* 8255B8 802422F8 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC.s deleted file mode 100644 index 73b9d900dd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422FC -/* 8255BC 802422FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8255C0 80242300 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8255C4 80242304 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8255C8 80242308 3C05FE36 */ lui $a1, 0xfe36 -/* 8255CC 8024230C AFBF0010 */ sw $ra, 0x10($sp) -/* 8255D0 80242310 80460075 */ lb $a2, 0x75($v0) -/* 8255D4 80242314 0C0B2026 */ jal set_variable -/* 8255D8 80242318 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8255DC 8024231C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8255E0 80242320 24020002 */ addiu $v0, $zero, 2 -/* 8255E4 80242324 03E00008 */ jr $ra -/* 8255E8 80242328 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s new file mode 100644 index 0000000000..5725780ba2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422FC_8255BC +/* 8255BC 802422FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8255C0 80242300 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 8255C4 80242304 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 8255C8 80242308 3C05FE36 */ lui $a1, 0xfe36 +/* 8255CC 8024230C AFBF0010 */ sw $ra, 0x10($sp) +/* 8255D0 80242310 80460075 */ lb $a2, 0x75($v0) +/* 8255D4 80242314 0C0B2026 */ jal set_variable +/* 8255D8 80242318 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8255DC 8024231C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8255E0 80242320 24020002 */ addiu $v0, $zero, 2 +/* 8255E4 80242324 03E00008 */ jr $ra +/* 8255E8 80242328 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C.s deleted file mode 100644 index 93bf6143f6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024232C -/* 8255EC 8024232C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8255F0 80242330 AFB10014 */ sw $s1, 0x14($sp) -/* 8255F4 80242334 0080882D */ daddu $s1, $a0, $zero -/* 8255F8 80242338 AFBF0018 */ sw $ra, 0x18($sp) -/* 8255FC 8024233C AFB00010 */ sw $s0, 0x10($sp) -/* 825600 80242340 8E30000C */ lw $s0, 0xc($s1) -/* 825604 80242344 8E050000 */ lw $a1, ($s0) -/* 825608 80242348 0C0B1EAF */ jal get_variable -/* 82560C 8024234C 26100004 */ addiu $s0, $s0, 4 -/* 825610 80242350 0220202D */ daddu $a0, $s1, $zero -/* 825614 80242354 8E050000 */ lw $a1, ($s0) -/* 825618 80242358 0C0B210B */ jal get_float_variable -/* 82561C 8024235C 0040802D */ daddu $s0, $v0, $zero -/* 825620 80242360 24020002 */ addiu $v0, $zero, 2 -/* 825624 80242364 00501804 */ sllv $v1, $s0, $v0 -/* 825628 80242368 00701821 */ addu $v1, $v1, $s0 -/* 82562C 8024236C 00431804 */ sllv $v1, $v1, $v0 -/* 825630 80242370 00701823 */ subu $v1, $v1, $s0 -/* 825634 80242374 000320C0 */ sll $a0, $v1, 3 -/* 825638 80242378 00641821 */ addu $v1, $v1, $a0 -/* 82563C 8024237C 000318C0 */ sll $v1, $v1, 3 -/* 825640 80242380 3C01800B */ lui $at, 0x800b -/* 825644 80242384 00230821 */ addu $at, $at, $v1 -/* 825648 80242388 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 82564C 8024238C 8FBF0018 */ lw $ra, 0x18($sp) -/* 825650 80242390 8FB10014 */ lw $s1, 0x14($sp) -/* 825654 80242394 8FB00010 */ lw $s0, 0x10($sp) -/* 825658 80242398 03E00008 */ jr $ra -/* 82565C 8024239C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s new file mode 100644 index 0000000000..55cf81c536 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024232C_8255EC +/* 8255EC 8024232C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8255F0 80242330 AFB10014 */ sw $s1, 0x14($sp) +/* 8255F4 80242334 0080882D */ daddu $s1, $a0, $zero +/* 8255F8 80242338 AFBF0018 */ sw $ra, 0x18($sp) +/* 8255FC 8024233C AFB00010 */ sw $s0, 0x10($sp) +/* 825600 80242340 8E30000C */ lw $s0, 0xc($s1) +/* 825604 80242344 8E050000 */ lw $a1, ($s0) +/* 825608 80242348 0C0B1EAF */ jal get_variable +/* 82560C 8024234C 26100004 */ addiu $s0, $s0, 4 +/* 825610 80242350 0220202D */ daddu $a0, $s1, $zero +/* 825614 80242354 8E050000 */ lw $a1, ($s0) +/* 825618 80242358 0C0B210B */ jal get_float_variable +/* 82561C 8024235C 0040802D */ daddu $s0, $v0, $zero +/* 825620 80242360 24020002 */ addiu $v0, $zero, 2 +/* 825624 80242364 00501804 */ sllv $v1, $s0, $v0 +/* 825628 80242368 00701821 */ addu $v1, $v1, $s0 +/* 82562C 8024236C 00431804 */ sllv $v1, $v1, $v0 +/* 825630 80242370 00701823 */ subu $v1, $v1, $s0 +/* 825634 80242374 000320C0 */ sll $a0, $v1, 3 +/* 825638 80242378 00641821 */ addu $v1, $v1, $a0 +/* 82563C 8024237C 000318C0 */ sll $v1, $v1, 3 +/* 825640 80242380 3C01800B */ lui $at, 0x800b +/* 825644 80242384 00230821 */ addu $at, $at, $v1 +/* 825648 80242388 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 82564C 8024238C 8FBF0018 */ lw $ra, 0x18($sp) +/* 825650 80242390 8FB10014 */ lw $s1, 0x14($sp) +/* 825654 80242394 8FB00010 */ lw $s0, 0x10($sp) +/* 825658 80242398 03E00008 */ jr $ra +/* 82565C 8024239C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0.s deleted file mode 100644 index 486bb1e560..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423A0 -/* 825660 802423A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 825664 802423A4 AFB10014 */ sw $s1, 0x14($sp) -/* 825668 802423A8 0080882D */ daddu $s1, $a0, $zero -/* 82566C 802423AC AFBF0018 */ sw $ra, 0x18($sp) -/* 825670 802423B0 AFB00010 */ sw $s0, 0x10($sp) -/* 825674 802423B4 8E30000C */ lw $s0, 0xc($s1) -/* 825678 802423B8 8E050000 */ lw $a1, ($s0) -/* 82567C 802423BC 0C0B1EAF */ jal get_variable -/* 825680 802423C0 26100004 */ addiu $s0, $s0, 4 -/* 825684 802423C4 00021880 */ sll $v1, $v0, 2 -/* 825688 802423C8 00621821 */ addu $v1, $v1, $v0 -/* 82568C 802423CC 00031880 */ sll $v1, $v1, 2 -/* 825690 802423D0 00621823 */ subu $v1, $v1, $v0 -/* 825694 802423D4 000310C0 */ sll $v0, $v1, 3 -/* 825698 802423D8 00621821 */ addu $v1, $v1, $v0 -/* 82569C 802423DC 000318C0 */ sll $v1, $v1, 3 -/* 8256A0 802423E0 3C01800B */ lui $at, 0x800b -/* 8256A4 802423E4 00230821 */ addu $at, $at, $v1 -/* 8256A8 802423E8 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8256AC 802423EC 3C014480 */ lui $at, 0x4480 -/* 8256B0 802423F0 44810000 */ mtc1 $at, $f0 -/* 8256B4 802423F4 00000000 */ nop -/* 8256B8 802423F8 46001082 */ mul.s $f2, $f2, $f0 -/* 8256BC 802423FC 00000000 */ nop -/* 8256C0 80242400 3C01CD5B */ lui $at, 0xcd5b -/* 8256C4 80242404 34215858 */ ori $at, $at, 0x5858 -/* 8256C8 80242408 44810000 */ mtc1 $at, $f0 -/* 8256CC 8024240C 00000000 */ nop -/* 8256D0 80242410 46001080 */ add.s $f2, $f2, $f0 -/* 8256D4 80242414 8E050000 */ lw $a1, ($s0) -/* 8256D8 80242418 4600110D */ trunc.w.s $f4, $f2 -/* 8256DC 8024241C 44062000 */ mfc1 $a2, $f4 -/* 8256E0 80242420 0C0B2026 */ jal set_variable -/* 8256E4 80242424 0220202D */ daddu $a0, $s1, $zero -/* 8256E8 80242428 8FBF0018 */ lw $ra, 0x18($sp) -/* 8256EC 8024242C 8FB10014 */ lw $s1, 0x14($sp) -/* 8256F0 80242430 8FB00010 */ lw $s0, 0x10($sp) -/* 8256F4 80242434 24020002 */ addiu $v0, $zero, 2 -/* 8256F8 80242438 03E00008 */ jr $ra -/* 8256FC 8024243C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s new file mode 100644 index 0000000000..2c32392843 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423A0_825660 +/* 825660 802423A0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 825664 802423A4 AFB10014 */ sw $s1, 0x14($sp) +/* 825668 802423A8 0080882D */ daddu $s1, $a0, $zero +/* 82566C 802423AC AFBF0018 */ sw $ra, 0x18($sp) +/* 825670 802423B0 AFB00010 */ sw $s0, 0x10($sp) +/* 825674 802423B4 8E30000C */ lw $s0, 0xc($s1) +/* 825678 802423B8 8E050000 */ lw $a1, ($s0) +/* 82567C 802423BC 0C0B1EAF */ jal get_variable +/* 825680 802423C0 26100004 */ addiu $s0, $s0, 4 +/* 825684 802423C4 00021880 */ sll $v1, $v0, 2 +/* 825688 802423C8 00621821 */ addu $v1, $v1, $v0 +/* 82568C 802423CC 00031880 */ sll $v1, $v1, 2 +/* 825690 802423D0 00621823 */ subu $v1, $v1, $v0 +/* 825694 802423D4 000310C0 */ sll $v0, $v1, 3 +/* 825698 802423D8 00621821 */ addu $v1, $v1, $v0 +/* 82569C 802423DC 000318C0 */ sll $v1, $v1, 3 +/* 8256A0 802423E0 3C01800B */ lui $at, 0x800b +/* 8256A4 802423E4 00230821 */ addu $at, $at, $v1 +/* 8256A8 802423E8 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 8256AC 802423EC 3C014480 */ lui $at, 0x4480 +/* 8256B0 802423F0 44810000 */ mtc1 $at, $f0 +/* 8256B4 802423F4 00000000 */ nop +/* 8256B8 802423F8 46001082 */ mul.s $f2, $f2, $f0 +/* 8256BC 802423FC 00000000 */ nop +/* 8256C0 80242400 3C01CD5B */ lui $at, 0xcd5b +/* 8256C4 80242404 34215858 */ ori $at, $at, 0x5858 +/* 8256C8 80242408 44810000 */ mtc1 $at, $f0 +/* 8256CC 8024240C 00000000 */ nop +/* 8256D0 80242410 46001080 */ add.s $f2, $f2, $f0 +/* 8256D4 80242414 8E050000 */ lw $a1, ($s0) +/* 8256D8 80242418 4600110D */ trunc.w.s $f4, $f2 +/* 8256DC 8024241C 44062000 */ mfc1 $a2, $f4 +/* 8256E0 80242420 0C0B2026 */ jal set_variable +/* 8256E4 80242424 0220202D */ daddu $a0, $s1, $zero +/* 8256E8 80242428 8FBF0018 */ lw $ra, 0x18($sp) +/* 8256EC 8024242C 8FB10014 */ lw $s1, 0x14($sp) +/* 8256F0 80242430 8FB00010 */ lw $s0, 0x10($sp) +/* 8256F4 80242434 24020002 */ addiu $v0, $zero, 2 +/* 8256F8 80242438 03E00008 */ jr $ra +/* 8256FC 8024243C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440.s deleted file mode 100644 index c7417c2385..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242440 -/* 825700 80242440 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 825704 80242444 AFB20018 */ sw $s2, 0x18($sp) -/* 825708 80242448 0080902D */ daddu $s2, $a0, $zero -/* 82570C 8024244C AFBF0030 */ sw $ra, 0x30($sp) -/* 825710 80242450 AFB7002C */ sw $s7, 0x2c($sp) -/* 825714 80242454 AFB60028 */ sw $s6, 0x28($sp) -/* 825718 80242458 AFB50024 */ sw $s5, 0x24($sp) -/* 82571C 8024245C AFB40020 */ sw $s4, 0x20($sp) -/* 825720 80242460 AFB3001C */ sw $s3, 0x1c($sp) -/* 825724 80242464 AFB10014 */ sw $s1, 0x14($sp) -/* 825728 80242468 AFB00010 */ sw $s0, 0x10($sp) -/* 82572C 8024246C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 825730 80242470 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 825734 80242474 8E50000C */ lw $s0, 0xc($s2) -/* 825738 80242478 8E050000 */ lw $a1, ($s0) -/* 82573C 8024247C 0C0B1EAF */ jal get_variable -/* 825740 80242480 26100004 */ addiu $s0, $s0, 4 -/* 825744 80242484 8E050000 */ lw $a1, ($s0) -/* 825748 80242488 26100004 */ addiu $s0, $s0, 4 -/* 82574C 8024248C 0240202D */ daddu $a0, $s2, $zero -/* 825750 80242490 0C0B1EAF */ jal get_variable -/* 825754 80242494 0040B82D */ daddu $s7, $v0, $zero -/* 825758 80242498 8E050000 */ lw $a1, ($s0) -/* 82575C 8024249C 26100004 */ addiu $s0, $s0, 4 -/* 825760 802424A0 0240202D */ daddu $a0, $s2, $zero -/* 825764 802424A4 0C0B1EAF */ jal get_variable -/* 825768 802424A8 0040B02D */ daddu $s6, $v0, $zero -/* 82576C 802424AC 0240202D */ daddu $a0, $s2, $zero -/* 825770 802424B0 3C05F4AC */ lui $a1, 0xf4ac -/* 825774 802424B4 34A5D481 */ ori $a1, $a1, 0xd481 -/* 825778 802424B8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 82577C 802424BC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 825780 802424C0 8E140000 */ lw $s4, ($s0) -/* 825784 802424C4 00061880 */ sll $v1, $a2, 2 -/* 825788 802424C8 00661821 */ addu $v1, $v1, $a2 -/* 82578C 802424CC 00031880 */ sll $v1, $v1, 2 -/* 825790 802424D0 00661823 */ subu $v1, $v1, $a2 -/* 825794 802424D4 000330C0 */ sll $a2, $v1, 3 -/* 825798 802424D8 00661821 */ addu $v1, $v1, $a2 -/* 82579C 802424DC 000318C0 */ sll $v1, $v1, 3 -/* 8257A0 802424E0 3C01800B */ lui $at, 0x800b -/* 8257A4 802424E4 00230821 */ addu $at, $at, $v1 -/* 8257A8 802424E8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8257AC 802424EC 8E150004 */ lw $s5, 4($s0) -/* 8257B0 802424F0 4600010D */ trunc.w.s $f4, $f0 -/* 8257B4 802424F4 44112000 */ mfc1 $s1, $f4 -/* 8257B8 802424F8 0C0B1EAF */ jal get_variable -/* 8257BC 802424FC 0040982D */ daddu $s3, $v0, $zero -/* 8257C0 80242500 4491B000 */ mtc1 $s1, $f22 -/* 8257C4 80242504 00000000 */ nop -/* 8257C8 80242508 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8257CC 8024250C 4600B306 */ mov.s $f12, $f22 -/* 8257D0 80242510 0C00A8D4 */ jal cos_deg -/* 8257D4 80242514 0040802D */ daddu $s0, $v0, $zero -/* 8257D8 80242518 4493A000 */ mtc1 $s3, $f20 -/* 8257DC 8024251C 00000000 */ nop -/* 8257E0 80242520 4680A520 */ cvt.s.w $f20, $f20 -/* 8257E4 80242524 4600A002 */ mul.s $f0, $f20, $f0 -/* 8257E8 80242528 00000000 */ nop -/* 8257EC 8024252C 0240202D */ daddu $a0, $s2, $zero -/* 8257F0 80242530 44901000 */ mtc1 $s0, $f2 -/* 8257F4 80242534 00000000 */ nop -/* 8257F8 80242538 468010A0 */ cvt.s.w $f2, $f2 -/* 8257FC 8024253C 46001081 */ sub.s $f2, $f2, $f0 -/* 825800 80242540 3C05F4AC */ lui $a1, 0xf4ac -/* 825804 80242544 4600110D */ trunc.w.s $f4, $f2 -/* 825808 80242548 44102000 */ mfc1 $s0, $f4 -/* 82580C 8024254C 0C0B1EAF */ jal get_variable -/* 825810 80242550 34A5D483 */ ori $a1, $a1, 0xd483 -/* 825814 80242554 4600B306 */ mov.s $f12, $f22 -/* 825818 80242558 0C00A8BB */ jal sin_deg -/* 82581C 8024255C 0040882D */ daddu $s1, $v0, $zero -/* 825820 80242560 4600A502 */ mul.s $f20, $f20, $f0 -/* 825824 80242564 00000000 */ nop -/* 825828 80242568 0240202D */ daddu $a0, $s2, $zero -/* 82582C 8024256C 44910000 */ mtc1 $s1, $f0 -/* 825830 80242570 00000000 */ nop -/* 825834 80242574 46800020 */ cvt.s.w $f0, $f0 -/* 825838 80242578 46140001 */ sub.s $f0, $f0, $f20 -/* 82583C 8024257C 0280282D */ daddu $a1, $s4, $zero -/* 825840 80242580 02173023 */ subu $a2, $s0, $s7 -/* 825844 80242584 4600010D */ trunc.w.s $f4, $f0 -/* 825848 80242588 44102000 */ mfc1 $s0, $f4 -/* 82584C 8024258C 0C0B2026 */ jal set_variable -/* 825850 80242590 02168023 */ subu $s0, $s0, $s6 -/* 825854 80242594 0240202D */ daddu $a0, $s2, $zero -/* 825858 80242598 02A0282D */ daddu $a1, $s5, $zero -/* 82585C 8024259C 0C0B2026 */ jal set_variable -/* 825860 802425A0 0200302D */ daddu $a2, $s0, $zero -/* 825864 802425A4 8FBF0030 */ lw $ra, 0x30($sp) -/* 825868 802425A8 8FB7002C */ lw $s7, 0x2c($sp) -/* 82586C 802425AC 8FB60028 */ lw $s6, 0x28($sp) -/* 825870 802425B0 8FB50024 */ lw $s5, 0x24($sp) -/* 825874 802425B4 8FB40020 */ lw $s4, 0x20($sp) -/* 825878 802425B8 8FB3001C */ lw $s3, 0x1c($sp) -/* 82587C 802425BC 8FB20018 */ lw $s2, 0x18($sp) -/* 825880 802425C0 8FB10014 */ lw $s1, 0x14($sp) -/* 825884 802425C4 8FB00010 */ lw $s0, 0x10($sp) -/* 825888 802425C8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 82588C 802425CC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 825890 802425D0 24020002 */ addiu $v0, $zero, 2 -/* 825894 802425D4 03E00008 */ jr $ra -/* 825898 802425D8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s new file mode 100644 index 0000000000..dcba1d6f43 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242440_825700 +/* 825700 80242440 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 825704 80242444 AFB20018 */ sw $s2, 0x18($sp) +/* 825708 80242448 0080902D */ daddu $s2, $a0, $zero +/* 82570C 8024244C AFBF0030 */ sw $ra, 0x30($sp) +/* 825710 80242450 AFB7002C */ sw $s7, 0x2c($sp) +/* 825714 80242454 AFB60028 */ sw $s6, 0x28($sp) +/* 825718 80242458 AFB50024 */ sw $s5, 0x24($sp) +/* 82571C 8024245C AFB40020 */ sw $s4, 0x20($sp) +/* 825720 80242460 AFB3001C */ sw $s3, 0x1c($sp) +/* 825724 80242464 AFB10014 */ sw $s1, 0x14($sp) +/* 825728 80242468 AFB00010 */ sw $s0, 0x10($sp) +/* 82572C 8024246C F7B60040 */ sdc1 $f22, 0x40($sp) +/* 825730 80242470 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 825734 80242474 8E50000C */ lw $s0, 0xc($s2) +/* 825738 80242478 8E050000 */ lw $a1, ($s0) +/* 82573C 8024247C 0C0B1EAF */ jal get_variable +/* 825740 80242480 26100004 */ addiu $s0, $s0, 4 +/* 825744 80242484 8E050000 */ lw $a1, ($s0) +/* 825748 80242488 26100004 */ addiu $s0, $s0, 4 +/* 82574C 8024248C 0240202D */ daddu $a0, $s2, $zero +/* 825750 80242490 0C0B1EAF */ jal get_variable +/* 825754 80242494 0040B82D */ daddu $s7, $v0, $zero +/* 825758 80242498 8E050000 */ lw $a1, ($s0) +/* 82575C 8024249C 26100004 */ addiu $s0, $s0, 4 +/* 825760 802424A0 0240202D */ daddu $a0, $s2, $zero +/* 825764 802424A4 0C0B1EAF */ jal get_variable +/* 825768 802424A8 0040B02D */ daddu $s6, $v0, $zero +/* 82576C 802424AC 0240202D */ daddu $a0, $s2, $zero +/* 825770 802424B0 3C05F4AC */ lui $a1, 0xf4ac +/* 825774 802424B4 34A5D481 */ ori $a1, $a1, 0xd481 +/* 825778 802424B8 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* 82577C 802424BC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* 825780 802424C0 8E140000 */ lw $s4, ($s0) +/* 825784 802424C4 00061880 */ sll $v1, $a2, 2 +/* 825788 802424C8 00661821 */ addu $v1, $v1, $a2 +/* 82578C 802424CC 00031880 */ sll $v1, $v1, 2 +/* 825790 802424D0 00661823 */ subu $v1, $v1, $a2 +/* 825794 802424D4 000330C0 */ sll $a2, $v1, 3 +/* 825798 802424D8 00661821 */ addu $v1, $v1, $a2 +/* 82579C 802424DC 000318C0 */ sll $v1, $v1, 3 +/* 8257A0 802424E0 3C01800B */ lui $at, 0x800b +/* 8257A4 802424E4 00230821 */ addu $at, $at, $v1 +/* 8257A8 802424E8 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 8257AC 802424EC 8E150004 */ lw $s5, 4($s0) +/* 8257B0 802424F0 4600010D */ trunc.w.s $f4, $f0 +/* 8257B4 802424F4 44112000 */ mfc1 $s1, $f4 +/* 8257B8 802424F8 0C0B1EAF */ jal get_variable +/* 8257BC 802424FC 0040982D */ daddu $s3, $v0, $zero +/* 8257C0 80242500 4491B000 */ mtc1 $s1, $f22 +/* 8257C4 80242504 00000000 */ nop +/* 8257C8 80242508 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8257CC 8024250C 4600B306 */ mov.s $f12, $f22 +/* 8257D0 80242510 0C00A8D4 */ jal cos_deg +/* 8257D4 80242514 0040802D */ daddu $s0, $v0, $zero +/* 8257D8 80242518 4493A000 */ mtc1 $s3, $f20 +/* 8257DC 8024251C 00000000 */ nop +/* 8257E0 80242520 4680A520 */ cvt.s.w $f20, $f20 +/* 8257E4 80242524 4600A002 */ mul.s $f0, $f20, $f0 +/* 8257E8 80242528 00000000 */ nop +/* 8257EC 8024252C 0240202D */ daddu $a0, $s2, $zero +/* 8257F0 80242530 44901000 */ mtc1 $s0, $f2 +/* 8257F4 80242534 00000000 */ nop +/* 8257F8 80242538 468010A0 */ cvt.s.w $f2, $f2 +/* 8257FC 8024253C 46001081 */ sub.s $f2, $f2, $f0 +/* 825800 80242540 3C05F4AC */ lui $a1, 0xf4ac +/* 825804 80242544 4600110D */ trunc.w.s $f4, $f2 +/* 825808 80242548 44102000 */ mfc1 $s0, $f4 +/* 82580C 8024254C 0C0B1EAF */ jal get_variable +/* 825810 80242550 34A5D483 */ ori $a1, $a1, 0xd483 +/* 825814 80242554 4600B306 */ mov.s $f12, $f22 +/* 825818 80242558 0C00A8BB */ jal sin_deg +/* 82581C 8024255C 0040882D */ daddu $s1, $v0, $zero +/* 825820 80242560 4600A502 */ mul.s $f20, $f20, $f0 +/* 825824 80242564 00000000 */ nop +/* 825828 80242568 0240202D */ daddu $a0, $s2, $zero +/* 82582C 8024256C 44910000 */ mtc1 $s1, $f0 +/* 825830 80242570 00000000 */ nop +/* 825834 80242574 46800020 */ cvt.s.w $f0, $f0 +/* 825838 80242578 46140001 */ sub.s $f0, $f0, $f20 +/* 82583C 8024257C 0280282D */ daddu $a1, $s4, $zero +/* 825840 80242580 02173023 */ subu $a2, $s0, $s7 +/* 825844 80242584 4600010D */ trunc.w.s $f4, $f0 +/* 825848 80242588 44102000 */ mfc1 $s0, $f4 +/* 82584C 8024258C 0C0B2026 */ jal set_variable +/* 825850 80242590 02168023 */ subu $s0, $s0, $s6 +/* 825854 80242594 0240202D */ daddu $a0, $s2, $zero +/* 825858 80242598 02A0282D */ daddu $a1, $s5, $zero +/* 82585C 8024259C 0C0B2026 */ jal set_variable +/* 825860 802425A0 0200302D */ daddu $a2, $s0, $zero +/* 825864 802425A4 8FBF0030 */ lw $ra, 0x30($sp) +/* 825868 802425A8 8FB7002C */ lw $s7, 0x2c($sp) +/* 82586C 802425AC 8FB60028 */ lw $s6, 0x28($sp) +/* 825870 802425B0 8FB50024 */ lw $s5, 0x24($sp) +/* 825874 802425B4 8FB40020 */ lw $s4, 0x20($sp) +/* 825878 802425B8 8FB3001C */ lw $s3, 0x1c($sp) +/* 82587C 802425BC 8FB20018 */ lw $s2, 0x18($sp) +/* 825880 802425C0 8FB10014 */ lw $s1, 0x14($sp) +/* 825884 802425C4 8FB00010 */ lw $s0, 0x10($sp) +/* 825888 802425C8 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 82588C 802425CC D7B40038 */ ldc1 $f20, 0x38($sp) +/* 825890 802425D0 24020002 */ addiu $v0, $zero, 2 +/* 825894 802425D4 03E00008 */ jr $ra +/* 825898 802425D8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC.s deleted file mode 100644 index 919dfc8690..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425DC -/* 82589C 802425DC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8258A0 802425E0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8258A4 802425E4 10A00002 */ beqz $a1, .L802425F0 -/* 8258A8 802425E8 2402003C */ addiu $v0, $zero, 0x3c -/* 8258AC 802425EC AC820070 */ sw $v0, 0x70($a0) -.L802425F0: -/* 8258B0 802425F0 C4620080 */ lwc1 $f2, 0x80($v1) -/* 8258B4 802425F4 3C0141F0 */ lui $at, 0x41f0 -/* 8258B8 802425F8 44810000 */ mtc1 $at, $f0 -/* 8258BC 802425FC 00000000 */ nop -/* 8258C0 80242600 46001000 */ add.s $f0, $f2, $f0 -/* 8258C4 80242604 3C0143B4 */ lui $at, 0x43b4 -/* 8258C8 80242608 44811000 */ mtc1 $at, $f2 -/* 8258CC 8024260C 00000000 */ nop -/* 8258D0 80242610 4600103E */ c.le.s $f2, $f0 -/* 8258D4 80242614 00000000 */ nop -/* 8258D8 80242618 45000003 */ bc1f .L80242628 -/* 8258DC 8024261C E4600080 */ swc1 $f0, 0x80($v1) -/* 8258E0 80242620 46020001 */ sub.s $f0, $f0, $f2 -/* 8258E4 80242624 E4600080 */ swc1 $f0, 0x80($v1) -.L80242628: -/* 8258E8 80242628 8C820070 */ lw $v0, 0x70($a0) -/* 8258EC 8024262C 2442FFFF */ addiu $v0, $v0, -1 -/* 8258F0 80242630 AC820070 */ sw $v0, 0x70($a0) -/* 8258F4 80242634 000217C3 */ sra $v0, $v0, 0x1f -/* 8258F8 80242638 03E00008 */ jr $ra -/* 8258FC 8024263C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s new file mode 100644 index 0000000000..3f8c3cae87 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425DC_82589C +/* 82589C 802425DC 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 8258A0 802425E0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 8258A4 802425E4 10A00002 */ beqz $a1, .L802425F0 +/* 8258A8 802425E8 2402003C */ addiu $v0, $zero, 0x3c +/* 8258AC 802425EC AC820070 */ sw $v0, 0x70($a0) +.L802425F0: +/* 8258B0 802425F0 C4620080 */ lwc1 $f2, 0x80($v1) +/* 8258B4 802425F4 3C0141F0 */ lui $at, 0x41f0 +/* 8258B8 802425F8 44810000 */ mtc1 $at, $f0 +/* 8258BC 802425FC 00000000 */ nop +/* 8258C0 80242600 46001000 */ add.s $f0, $f2, $f0 +/* 8258C4 80242604 3C0143B4 */ lui $at, 0x43b4 +/* 8258C8 80242608 44811000 */ mtc1 $at, $f2 +/* 8258CC 8024260C 00000000 */ nop +/* 8258D0 80242610 4600103E */ c.le.s $f2, $f0 +/* 8258D4 80242614 00000000 */ nop +/* 8258D8 80242618 45000003 */ bc1f .L80242628 +/* 8258DC 8024261C E4600080 */ swc1 $f0, 0x80($v1) +/* 8258E0 80242620 46020001 */ sub.s $f0, $f0, $f2 +/* 8258E4 80242624 E4600080 */ swc1 $f0, 0x80($v1) +.L80242628: +/* 8258E8 80242628 8C820070 */ lw $v0, 0x70($a0) +/* 8258EC 8024262C 2442FFFF */ addiu $v0, $v0, -1 +/* 8258F0 80242630 AC820070 */ sw $v0, 0x70($a0) +/* 8258F4 80242634 000217C3 */ sra $v0, $v0, 0x1f +/* 8258F8 80242638 03E00008 */ jr $ra +/* 8258FC 8024263C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640.s deleted file mode 100644 index e810a12b2a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242640 -/* 825900 80242640 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 825904 80242644 AFB10014 */ sw $s1, 0x14($sp) -/* 825908 80242648 0080882D */ daddu $s1, $a0, $zero -/* 82590C 8024264C AFB00010 */ sw $s0, 0x10($sp) -/* 825910 80242650 00A0802D */ daddu $s0, $a1, $zero -/* 825914 80242654 AFBF0018 */ sw $ra, 0x18($sp) -/* 825918 80242658 0C00EABB */ jal get_npc_unsafe -/* 82591C 8024265C 2404FFFC */ addiu $a0, $zero, -4 -/* 825920 80242660 12000003 */ beqz $s0, .L80242670 -/* 825924 80242664 0040182D */ daddu $v1, $v0, $zero -/* 825928 80242668 2402003C */ addiu $v0, $zero, 0x3c -/* 82592C 8024266C AE220070 */ sw $v0, 0x70($s1) -.L80242670: -/* 825930 80242670 C462000C */ lwc1 $f2, 0xc($v1) -/* 825934 80242674 3C0141F0 */ lui $at, 0x41f0 -/* 825938 80242678 44810000 */ mtc1 $at, $f0 -/* 82593C 8024267C 00000000 */ nop -/* 825940 80242680 46001000 */ add.s $f0, $f2, $f0 -/* 825944 80242684 3C0143B4 */ lui $at, 0x43b4 -/* 825948 80242688 44811000 */ mtc1 $at, $f2 -/* 82594C 8024268C 00000000 */ nop -/* 825950 80242690 4600103E */ c.le.s $f2, $f0 -/* 825954 80242694 00000000 */ nop -/* 825958 80242698 45000003 */ bc1f .L802426A8 -/* 82595C 8024269C E460000C */ swc1 $f0, 0xc($v1) -/* 825960 802426A0 46020001 */ sub.s $f0, $f0, $f2 -/* 825964 802426A4 E460000C */ swc1 $f0, 0xc($v1) -.L802426A8: -/* 825968 802426A8 8E230070 */ lw $v1, 0x70($s1) -/* 82596C 802426AC 2463FFFF */ addiu $v1, $v1, -1 -/* 825970 802426B0 000317C3 */ sra $v0, $v1, 0x1f -/* 825974 802426B4 AE230070 */ sw $v1, 0x70($s1) -/* 825978 802426B8 8FBF0018 */ lw $ra, 0x18($sp) -/* 82597C 802426BC 8FB10014 */ lw $s1, 0x14($sp) -/* 825980 802426C0 8FB00010 */ lw $s0, 0x10($sp) -/* 825984 802426C4 30420002 */ andi $v0, $v0, 2 -/* 825988 802426C8 03E00008 */ jr $ra -/* 82598C 802426CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s new file mode 100644 index 0000000000..e150f1fbd5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242640_825900 +/* 825900 80242640 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 825904 80242644 AFB10014 */ sw $s1, 0x14($sp) +/* 825908 80242648 0080882D */ daddu $s1, $a0, $zero +/* 82590C 8024264C AFB00010 */ sw $s0, 0x10($sp) +/* 825910 80242650 00A0802D */ daddu $s0, $a1, $zero +/* 825914 80242654 AFBF0018 */ sw $ra, 0x18($sp) +/* 825918 80242658 0C00EABB */ jal get_npc_unsafe +/* 82591C 8024265C 2404FFFC */ addiu $a0, $zero, -4 +/* 825920 80242660 12000003 */ beqz $s0, .L80242670 +/* 825924 80242664 0040182D */ daddu $v1, $v0, $zero +/* 825928 80242668 2402003C */ addiu $v0, $zero, 0x3c +/* 82592C 8024266C AE220070 */ sw $v0, 0x70($s1) +.L80242670: +/* 825930 80242670 C462000C */ lwc1 $f2, 0xc($v1) +/* 825934 80242674 3C0141F0 */ lui $at, 0x41f0 +/* 825938 80242678 44810000 */ mtc1 $at, $f0 +/* 82593C 8024267C 00000000 */ nop +/* 825940 80242680 46001000 */ add.s $f0, $f2, $f0 +/* 825944 80242684 3C0143B4 */ lui $at, 0x43b4 +/* 825948 80242688 44811000 */ mtc1 $at, $f2 +/* 82594C 8024268C 00000000 */ nop +/* 825950 80242690 4600103E */ c.le.s $f2, $f0 +/* 825954 80242694 00000000 */ nop +/* 825958 80242698 45000003 */ bc1f .L802426A8 +/* 82595C 8024269C E460000C */ swc1 $f0, 0xc($v1) +/* 825960 802426A0 46020001 */ sub.s $f0, $f0, $f2 +/* 825964 802426A4 E460000C */ swc1 $f0, 0xc($v1) +.L802426A8: +/* 825968 802426A8 8E230070 */ lw $v1, 0x70($s1) +/* 82596C 802426AC 2463FFFF */ addiu $v1, $v1, -1 +/* 825970 802426B0 000317C3 */ sra $v0, $v1, 0x1f +/* 825974 802426B4 AE230070 */ sw $v1, 0x70($s1) +/* 825978 802426B8 8FBF0018 */ lw $ra, 0x18($sp) +/* 82597C 802426BC 8FB10014 */ lw $s1, 0x14($sp) +/* 825980 802426C0 8FB00010 */ lw $s0, 0x10($sp) +/* 825984 802426C4 30420002 */ andi $v0, $v0, 2 +/* 825988 802426C8 03E00008 */ jr $ra +/* 82598C 802426CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0.s deleted file mode 100644 index 5812b212ce..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426D0 -/* 825990 802426D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 825994 802426D4 AFB10014 */ sw $s1, 0x14($sp) -/* 825998 802426D8 0080882D */ daddu $s1, $a0, $zero -/* 82599C 802426DC AFB00010 */ sw $s0, 0x10($sp) -/* 8259A0 802426E0 00A0802D */ daddu $s0, $a1, $zero -/* 8259A4 802426E4 AFBF001C */ sw $ra, 0x1c($sp) -/* 8259A8 802426E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8259AC 802426EC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8259B0 802426F0 0C00EABB */ jal get_npc_unsafe -/* 8259B4 802426F4 2404FFFC */ addiu $a0, $zero, -4 -/* 8259B8 802426F8 12000017 */ beqz $s0, .L80242758 -/* 8259BC 802426FC 0040902D */ daddu $s2, $v0, $zero -/* 8259C0 80242700 0220202D */ daddu $a0, $s1, $zero -/* 8259C4 80242704 3C05FE36 */ lui $a1, 0xfe36 -/* 8259C8 80242708 0C0B210B */ jal get_float_variable -/* 8259CC 8024270C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8259D0 80242710 0220202D */ daddu $a0, $s1, $zero -/* 8259D4 80242714 3C05FE36 */ lui $a1, 0xfe36 -/* 8259D8 80242718 3C014270 */ lui $at, 0x4270 -/* 8259DC 8024271C 4481A000 */ mtc1 $at, $f20 -/* 8259E0 80242720 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 8259E4 80242724 46140003 */ div.s $f0, $f0, $f20 -/* 8259E8 80242728 0C0B210B */ jal get_float_variable -/* 8259EC 8024272C E6200074 */ swc1 $f0, 0x74($s1) -/* 8259F0 80242730 0220202D */ daddu $a0, $s1, $zero -/* 8259F4 80242734 3C05FE36 */ lui $a1, 0xfe36 -/* 8259F8 80242738 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8259FC 8024273C 46140003 */ div.s $f0, $f0, $f20 -/* 825A00 80242740 0C0B210B */ jal get_float_variable -/* 825A04 80242744 E6200078 */ swc1 $f0, 0x78($s1) -/* 825A08 80242748 46140003 */ div.s $f0, $f0, $f20 -/* 825A0C 8024274C 2402003C */ addiu $v0, $zero, 0x3c -/* 825A10 80242750 E620007C */ swc1 $f0, 0x7c($s1) -/* 825A14 80242754 AE220070 */ sw $v0, 0x70($s1) -.L80242758: -/* 825A18 80242758 C6400038 */ lwc1 $f0, 0x38($s2) -/* 825A1C 8024275C C6220074 */ lwc1 $f2, 0x74($s1) -/* 825A20 80242760 46020000 */ add.s $f0, $f0, $f2 -/* 825A24 80242764 E6400038 */ swc1 $f0, 0x38($s2) -/* 825A28 80242768 C640003C */ lwc1 $f0, 0x3c($s2) -/* 825A2C 8024276C C6220078 */ lwc1 $f2, 0x78($s1) -/* 825A30 80242770 46020000 */ add.s $f0, $f0, $f2 -/* 825A34 80242774 E640003C */ swc1 $f0, 0x3c($s2) -/* 825A38 80242778 C6400040 */ lwc1 $f0, 0x40($s2) -/* 825A3C 8024277C C622007C */ lwc1 $f2, 0x7c($s1) -/* 825A40 80242780 46020000 */ add.s $f0, $f0, $f2 -/* 825A44 80242784 E6400040 */ swc1 $f0, 0x40($s2) -/* 825A48 80242788 8E230070 */ lw $v1, 0x70($s1) -/* 825A4C 8024278C 2463FFFF */ addiu $v1, $v1, -1 -/* 825A50 80242790 2C620001 */ sltiu $v0, $v1, 1 -/* 825A54 80242794 AE230070 */ sw $v1, 0x70($s1) -/* 825A58 80242798 8FBF001C */ lw $ra, 0x1c($sp) -/* 825A5C 8024279C 8FB20018 */ lw $s2, 0x18($sp) -/* 825A60 802427A0 8FB10014 */ lw $s1, 0x14($sp) -/* 825A64 802427A4 8FB00010 */ lw $s0, 0x10($sp) -/* 825A68 802427A8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 825A6C 802427AC 00021040 */ sll $v0, $v0, 1 -/* 825A70 802427B0 03E00008 */ jr $ra -/* 825A74 802427B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s new file mode 100644 index 0000000000..f7c22a373e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426D0_825990 +/* 825990 802426D0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 825994 802426D4 AFB10014 */ sw $s1, 0x14($sp) +/* 825998 802426D8 0080882D */ daddu $s1, $a0, $zero +/* 82599C 802426DC AFB00010 */ sw $s0, 0x10($sp) +/* 8259A0 802426E0 00A0802D */ daddu $s0, $a1, $zero +/* 8259A4 802426E4 AFBF001C */ sw $ra, 0x1c($sp) +/* 8259A8 802426E8 AFB20018 */ sw $s2, 0x18($sp) +/* 8259AC 802426EC F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8259B0 802426F0 0C00EABB */ jal get_npc_unsafe +/* 8259B4 802426F4 2404FFFC */ addiu $a0, $zero, -4 +/* 8259B8 802426F8 12000017 */ beqz $s0, .L80242758 +/* 8259BC 802426FC 0040902D */ daddu $s2, $v0, $zero +/* 8259C0 80242700 0220202D */ daddu $a0, $s1, $zero +/* 8259C4 80242704 3C05FE36 */ lui $a1, 0xfe36 +/* 8259C8 80242708 0C0B210B */ jal get_float_variable +/* 8259CC 8024270C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8259D0 80242710 0220202D */ daddu $a0, $s1, $zero +/* 8259D4 80242714 3C05FE36 */ lui $a1, 0xfe36 +/* 8259D8 80242718 3C014270 */ lui $at, 0x4270 +/* 8259DC 8024271C 4481A000 */ mtc1 $at, $f20 +/* 8259E0 80242720 34A53C85 */ ori $a1, $a1, 0x3c85 +/* 8259E4 80242724 46140003 */ div.s $f0, $f0, $f20 +/* 8259E8 80242728 0C0B210B */ jal get_float_variable +/* 8259EC 8024272C E6200074 */ swc1 $f0, 0x74($s1) +/* 8259F0 80242730 0220202D */ daddu $a0, $s1, $zero +/* 8259F4 80242734 3C05FE36 */ lui $a1, 0xfe36 +/* 8259F8 80242738 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8259FC 8024273C 46140003 */ div.s $f0, $f0, $f20 +/* 825A00 80242740 0C0B210B */ jal get_float_variable +/* 825A04 80242744 E6200078 */ swc1 $f0, 0x78($s1) +/* 825A08 80242748 46140003 */ div.s $f0, $f0, $f20 +/* 825A0C 8024274C 2402003C */ addiu $v0, $zero, 0x3c +/* 825A10 80242750 E620007C */ swc1 $f0, 0x7c($s1) +/* 825A14 80242754 AE220070 */ sw $v0, 0x70($s1) +.L80242758: +/* 825A18 80242758 C6400038 */ lwc1 $f0, 0x38($s2) +/* 825A1C 8024275C C6220074 */ lwc1 $f2, 0x74($s1) +/* 825A20 80242760 46020000 */ add.s $f0, $f0, $f2 +/* 825A24 80242764 E6400038 */ swc1 $f0, 0x38($s2) +/* 825A28 80242768 C640003C */ lwc1 $f0, 0x3c($s2) +/* 825A2C 8024276C C6220078 */ lwc1 $f2, 0x78($s1) +/* 825A30 80242770 46020000 */ add.s $f0, $f0, $f2 +/* 825A34 80242774 E640003C */ swc1 $f0, 0x3c($s2) +/* 825A38 80242778 C6400040 */ lwc1 $f0, 0x40($s2) +/* 825A3C 8024277C C622007C */ lwc1 $f2, 0x7c($s1) +/* 825A40 80242780 46020000 */ add.s $f0, $f0, $f2 +/* 825A44 80242784 E6400040 */ swc1 $f0, 0x40($s2) +/* 825A48 80242788 8E230070 */ lw $v1, 0x70($s1) +/* 825A4C 8024278C 2463FFFF */ addiu $v1, $v1, -1 +/* 825A50 80242790 2C620001 */ sltiu $v0, $v1, 1 +/* 825A54 80242794 AE230070 */ sw $v1, 0x70($s1) +/* 825A58 80242798 8FBF001C */ lw $ra, 0x1c($sp) +/* 825A5C 8024279C 8FB20018 */ lw $s2, 0x18($sp) +/* 825A60 802427A0 8FB10014 */ lw $s1, 0x14($sp) +/* 825A64 802427A4 8FB00010 */ lw $s0, 0x10($sp) +/* 825A68 802427A8 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 825A6C 802427AC 00021040 */ sll $v0, $v0, 1 +/* 825A70 802427B0 03E00008 */ jr $ra +/* 825A74 802427B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8.s deleted file mode 100644 index 128507b42d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427B8 -/* 825A78 802427B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 825A7C 802427BC 3C058025 */ lui $a1, 0x8025 -/* 825A80 802427C0 8CA5E558 */ lw $a1, -0x1aa8($a1) -/* 825A84 802427C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 825A88 802427C8 0C0B1EAF */ jal get_variable -/* 825A8C 802427CC 0000202D */ daddu $a0, $zero, $zero -/* 825A90 802427D0 0040182D */ daddu $v1, $v0, $zero -/* 825A94 802427D4 24020001 */ addiu $v0, $zero, 1 -/* 825A98 802427D8 14620006 */ bne $v1, $v0, .L802427F4 -/* 825A9C 802427DC 24020002 */ addiu $v0, $zero, 2 -/* 825AA0 802427E0 44800000 */ mtc1 $zero, $f0 -/* 825AA4 802427E4 00000000 */ nop -/* 825AA8 802427E8 44050000 */ mfc1 $a1, $f0 -/* 825AAC 802427EC 08090A03 */ j .L8024280C -/* 825AB0 802427F0 0000202D */ daddu $a0, $zero, $zero -.L802427F4: -/* 825AB4 802427F4 14620008 */ bne $v1, $v0, .L80242818 -/* 825AB8 802427F8 24040001 */ addiu $a0, $zero, 1 -/* 825ABC 802427FC 44800000 */ mtc1 $zero, $f0 -/* 825AC0 80242800 00000000 */ nop -/* 825AC4 80242804 44050000 */ mfc1 $a1, $f0 -/* 825AC8 80242808 00000000 */ nop -.L8024280C: -/* 825ACC 8024280C 00A0302D */ daddu $a2, $a1, $zero -/* 825AD0 80242810 0C01C5A4 */ jal func_80071690 -/* 825AD4 80242814 00A0382D */ daddu $a3, $a1, $zero -.L80242818: -/* 825AD8 80242818 8FBF0010 */ lw $ra, 0x10($sp) -/* 825ADC 8024281C 03E00008 */ jr $ra -/* 825AE0 80242820 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s new file mode 100644 index 0000000000..496881ed55 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802427B8_825A78.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427B8_825A78 +/* 825A78 802427B8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 825A7C 802427BC 3C058025 */ lui $a1, 0x8025 +/* 825A80 802427C0 8CA5E558 */ lw $a1, -0x1aa8($a1) +/* 825A84 802427C4 AFBF0010 */ sw $ra, 0x10($sp) +/* 825A88 802427C8 0C0B1EAF */ jal get_variable +/* 825A8C 802427CC 0000202D */ daddu $a0, $zero, $zero +/* 825A90 802427D0 0040182D */ daddu $v1, $v0, $zero +/* 825A94 802427D4 24020001 */ addiu $v0, $zero, 1 +/* 825A98 802427D8 14620006 */ bne $v1, $v0, .L802427F4 +/* 825A9C 802427DC 24020002 */ addiu $v0, $zero, 2 +/* 825AA0 802427E0 44800000 */ mtc1 $zero, $f0 +/* 825AA4 802427E4 00000000 */ nop +/* 825AA8 802427E8 44050000 */ mfc1 $a1, $f0 +/* 825AAC 802427EC 08090A03 */ j .L8024280C +/* 825AB0 802427F0 0000202D */ daddu $a0, $zero, $zero +.L802427F4: +/* 825AB4 802427F4 14620008 */ bne $v1, $v0, .L80242818 +/* 825AB8 802427F8 24040001 */ addiu $a0, $zero, 1 +/* 825ABC 802427FC 44800000 */ mtc1 $zero, $f0 +/* 825AC0 80242800 00000000 */ nop +/* 825AC4 80242804 44050000 */ mfc1 $a1, $f0 +/* 825AC8 80242808 00000000 */ nop +.L8024280C: +/* 825ACC 8024280C 00A0302D */ daddu $a2, $a1, $zero +/* 825AD0 80242810 0C01C5A4 */ jal func_80071690 +/* 825AD4 80242814 00A0382D */ daddu $a3, $a1, $zero +.L80242818: +/* 825AD8 80242818 8FBF0010 */ lw $ra, 0x10($sp) +/* 825ADC 8024281C 03E00008 */ jr $ra +/* 825AE0 80242820 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824.s deleted file mode 100644 index 47856a50e0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242824 -/* 825AE4 80242824 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 825AE8 80242828 3C058024 */ lui $a1, 0x8024 -/* 825AEC 8024282C 24A527B8 */ addiu $a1, $a1, 0x27b8 -/* 825AF0 80242830 AFBF0010 */ sw $ra, 0x10($sp) -/* 825AF4 80242834 0C048C8F */ jal bind_dynamic_entity_7 -/* 825AF8 80242838 0000202D */ daddu $a0, $zero, $zero -/* 825AFC 8024283C 8FBF0010 */ lw $ra, 0x10($sp) -/* 825B00 80242840 3C018025 */ lui $at, 0x8025 -/* 825B04 80242844 AC22E540 */ sw $v0, -0x1ac0($at) -/* 825B08 80242848 24020002 */ addiu $v0, $zero, 2 -/* 825B0C 8024284C 03E00008 */ jr $ra -/* 825B10 80242850 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s new file mode 100644 index 0000000000..b5859fa678 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242824_825AE4.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242824_825AE4 +/* 825AE4 80242824 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 825AE8 80242828 3C058024 */ lui $a1, 0x8024 +/* 825AEC 8024282C 24A527B8 */ addiu $a1, $a1, 0x27b8 +/* 825AF0 80242830 AFBF0010 */ sw $ra, 0x10($sp) +/* 825AF4 80242834 0C048C8F */ jal bind_dynamic_entity_7 +/* 825AF8 80242838 0000202D */ daddu $a0, $zero, $zero +/* 825AFC 8024283C 8FBF0010 */ lw $ra, 0x10($sp) +/* 825B00 80242840 3C018025 */ lui $at, 0x8025 +/* 825B04 80242844 AC22E540 */ sw $v0, -0x1ac0($at) +/* 825B08 80242848 24020002 */ addiu $v0, $zero, 2 +/* 825B0C 8024284C 03E00008 */ jr $ra +/* 825B10 80242850 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80.s deleted file mode 100644 index ce2ab913f2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A80 -/* 825D40 80242A80 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 825D44 80242A84 AFBF0010 */ sw $ra, 0x10($sp) -/* 825D48 80242A88 10A00003 */ beqz $a1, .L80242A98 -/* 825D4C 80242A8C 8C86000C */ lw $a2, 0xc($a0) -/* 825D50 80242A90 3C018025 */ lui $at, 0x8025 -/* 825D54 80242A94 AC208778 */ sw $zero, -0x7888($at) -.L80242A98: -/* 825D58 80242A98 3C038025 */ lui $v1, 0x8025 -/* 825D5C 80242A9C 24638778 */ addiu $v1, $v1, -0x7888 -/* 825D60 80242AA0 8C620000 */ lw $v0, ($v1) -/* 825D64 80242AA4 54400003 */ bnel $v0, $zero, .L80242AB4 -/* 825D68 80242AA8 AC600000 */ sw $zero, ($v1) -/* 825D6C 80242AAC 08090AB2 */ j .L80242AC8 -/* 825D70 80242AB0 0000102D */ daddu $v0, $zero, $zero -.L80242AB4: -/* 825D74 80242AB4 8CC50000 */ lw $a1, ($a2) -/* 825D78 80242AB8 3C068025 */ lui $a2, 0x8025 -/* 825D7C 80242ABC 0C0B2026 */ jal set_variable -/* 825D80 80242AC0 8CC6877C */ lw $a2, -0x7884($a2) -/* 825D84 80242AC4 24020002 */ addiu $v0, $zero, 2 -.L80242AC8: -/* 825D88 80242AC8 8FBF0010 */ lw $ra, 0x10($sp) -/* 825D8C 80242ACC 03E00008 */ jr $ra -/* 825D90 80242AD0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s new file mode 100644 index 0000000000..ff64e21419 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242A80_825D40.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A80_825D40 +/* 825D40 80242A80 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 825D44 80242A84 AFBF0010 */ sw $ra, 0x10($sp) +/* 825D48 80242A88 10A00003 */ beqz $a1, .L80242A98 +/* 825D4C 80242A8C 8C86000C */ lw $a2, 0xc($a0) +/* 825D50 80242A90 3C018025 */ lui $at, 0x8025 +/* 825D54 80242A94 AC208778 */ sw $zero, -0x7888($at) +.L80242A98: +/* 825D58 80242A98 3C038025 */ lui $v1, 0x8025 +/* 825D5C 80242A9C 24638778 */ addiu $v1, $v1, -0x7888 +/* 825D60 80242AA0 8C620000 */ lw $v0, ($v1) +/* 825D64 80242AA4 54400003 */ bnel $v0, $zero, .L80242AB4 +/* 825D68 80242AA8 AC600000 */ sw $zero, ($v1) +/* 825D6C 80242AAC 08090AB2 */ j .L80242AC8 +/* 825D70 80242AB0 0000102D */ daddu $v0, $zero, $zero +.L80242AB4: +/* 825D74 80242AB4 8CC50000 */ lw $a1, ($a2) +/* 825D78 80242AB8 3C068025 */ lui $a2, 0x8025 +/* 825D7C 80242ABC 0C0B2026 */ jal set_variable +/* 825D80 80242AC0 8CC6877C */ lw $a2, -0x7884($a2) +/* 825D84 80242AC4 24020002 */ addiu $v0, $zero, 2 +.L80242AC8: +/* 825D88 80242AC8 8FBF0010 */ lw $ra, 0x10($sp) +/* 825D8C 80242ACC 03E00008 */ jr $ra +/* 825D90 80242AD0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4.s deleted file mode 100644 index 15c6755ed3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AD4 -/* 825D94 80242AD4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 825D98 80242AD8 AFBF0010 */ sw $ra, 0x10($sp) -/* 825D9C 80242ADC 8C82000C */ lw $v0, 0xc($a0) -/* 825DA0 80242AE0 0C0B1EAF */ jal get_variable -/* 825DA4 80242AE4 8C450000 */ lw $a1, ($v0) -/* 825DA8 80242AE8 3C018025 */ lui $at, 0x8025 -/* 825DAC 80242AEC AC22877C */ sw $v0, -0x7884($at) -/* 825DB0 80242AF0 24020002 */ addiu $v0, $zero, 2 -/* 825DB4 80242AF4 8FBF0010 */ lw $ra, 0x10($sp) -/* 825DB8 80242AF8 24030001 */ addiu $v1, $zero, 1 -/* 825DBC 80242AFC 3C018025 */ lui $at, 0x8025 -/* 825DC0 80242B00 AC238778 */ sw $v1, -0x7888($at) -/* 825DC4 80242B04 03E00008 */ jr $ra -/* 825DC8 80242B08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s new file mode 100644 index 0000000000..e815159a6a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242AD4_825D94.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242AD4_825D94 +/* 825D94 80242AD4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 825D98 80242AD8 AFBF0010 */ sw $ra, 0x10($sp) +/* 825D9C 80242ADC 8C82000C */ lw $v0, 0xc($a0) +/* 825DA0 80242AE0 0C0B1EAF */ jal get_variable +/* 825DA4 80242AE4 8C450000 */ lw $a1, ($v0) +/* 825DA8 80242AE8 3C018025 */ lui $at, 0x8025 +/* 825DAC 80242AEC AC22877C */ sw $v0, -0x7884($at) +/* 825DB0 80242AF0 24020002 */ addiu $v0, $zero, 2 +/* 825DB4 80242AF4 8FBF0010 */ lw $ra, 0x10($sp) +/* 825DB8 80242AF8 24030001 */ addiu $v1, $zero, 1 +/* 825DBC 80242AFC 3C018025 */ lui $at, 0x8025 +/* 825DC0 80242B00 AC238778 */ sw $v1, -0x7888($at) +/* 825DC4 80242B04 03E00008 */ jr $ra +/* 825DC8 80242B08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C.s deleted file mode 100644 index 3d9d5ecb39..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B0C -/* 825DCC 80242B0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 825DD0 80242B10 AFBF0010 */ sw $ra, 0x10($sp) -/* 825DD4 80242B14 8C82000C */ lw $v0, 0xc($a0) -/* 825DD8 80242B18 0C0B1EAF */ jal get_variable -/* 825DDC 80242B1C 8C450000 */ lw $a1, ($v0) -/* 825DE0 80242B20 0040182D */ daddu $v1, $v0, $zero -/* 825DE4 80242B24 10600012 */ beqz $v1, .L80242B70 -/* 825DE8 80242B28 0000202D */ daddu $a0, $zero, $zero -/* 825DEC 80242B2C 8C620000 */ lw $v0, ($v1) -/* 825DF0 80242B30 5040000A */ beql $v0, $zero, .L80242B5C -/* 825DF4 80242B34 00041080 */ sll $v0, $a0, 2 -/* 825DF8 80242B38 3C058025 */ lui $a1, 0x8025 -/* 825DFC 80242B3C 24A5E570 */ addiu $a1, $a1, -0x1a90 -.L80242B40: -/* 825E00 80242B40 24630004 */ addiu $v1, $v1, 4 -/* 825E04 80242B44 24840001 */ addiu $a0, $a0, 1 -/* 825E08 80242B48 ACA20000 */ sw $v0, ($a1) -/* 825E0C 80242B4C 8C620000 */ lw $v0, ($v1) -/* 825E10 80242B50 1440FFFB */ bnez $v0, .L80242B40 -/* 825E14 80242B54 24A50004 */ addiu $a1, $a1, 4 -/* 825E18 80242B58 00041080 */ sll $v0, $a0, 2 -.L80242B5C: -/* 825E1C 80242B5C 3C018025 */ lui $at, 0x8025 -/* 825E20 80242B60 00220821 */ addu $at, $at, $v0 -/* 825E24 80242B64 AC20E570 */ sw $zero, -0x1a90($at) -/* 825E28 80242B68 08090AE6 */ j .L80242B98 -/* 825E2C 80242B6C 00000000 */ nop -.L80242B70: -/* 825E30 80242B70 3C038025 */ lui $v1, 0x8025 -/* 825E34 80242B74 2463E570 */ addiu $v1, $v1, -0x1a90 -/* 825E38 80242B78 0060282D */ daddu $a1, $v1, $zero -.L80242B7C: -/* 825E3C 80242B7C 24820010 */ addiu $v0, $a0, 0x10 -/* 825E40 80242B80 AC620000 */ sw $v0, ($v1) -/* 825E44 80242B84 24630004 */ addiu $v1, $v1, 4 -/* 825E48 80242B88 24840001 */ addiu $a0, $a0, 1 -/* 825E4C 80242B8C 28820070 */ slti $v0, $a0, 0x70 -/* 825E50 80242B90 1440FFFA */ bnez $v0, .L80242B7C -/* 825E54 80242B94 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242B98: -/* 825E58 80242B98 8FBF0010 */ lw $ra, 0x10($sp) -/* 825E5C 80242B9C 24020002 */ addiu $v0, $zero, 2 -/* 825E60 80242BA0 03E00008 */ jr $ra -/* 825E64 80242BA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s new file mode 100644 index 0000000000..b97da38331 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242B0C_825DCC.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B0C_825DCC +/* 825DCC 80242B0C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 825DD0 80242B10 AFBF0010 */ sw $ra, 0x10($sp) +/* 825DD4 80242B14 8C82000C */ lw $v0, 0xc($a0) +/* 825DD8 80242B18 0C0B1EAF */ jal get_variable +/* 825DDC 80242B1C 8C450000 */ lw $a1, ($v0) +/* 825DE0 80242B20 0040182D */ daddu $v1, $v0, $zero +/* 825DE4 80242B24 10600012 */ beqz $v1, .L80242B70 +/* 825DE8 80242B28 0000202D */ daddu $a0, $zero, $zero +/* 825DEC 80242B2C 8C620000 */ lw $v0, ($v1) +/* 825DF0 80242B30 5040000A */ beql $v0, $zero, .L80242B5C +/* 825DF4 80242B34 00041080 */ sll $v0, $a0, 2 +/* 825DF8 80242B38 3C058025 */ lui $a1, 0x8025 +/* 825DFC 80242B3C 24A5E570 */ addiu $a1, $a1, -0x1a90 +.L80242B40: +/* 825E00 80242B40 24630004 */ addiu $v1, $v1, 4 +/* 825E04 80242B44 24840001 */ addiu $a0, $a0, 1 +/* 825E08 80242B48 ACA20000 */ sw $v0, ($a1) +/* 825E0C 80242B4C 8C620000 */ lw $v0, ($v1) +/* 825E10 80242B50 1440FFFB */ bnez $v0, .L80242B40 +/* 825E14 80242B54 24A50004 */ addiu $a1, $a1, 4 +/* 825E18 80242B58 00041080 */ sll $v0, $a0, 2 +.L80242B5C: +/* 825E1C 80242B5C 3C018025 */ lui $at, 0x8025 +/* 825E20 80242B60 00220821 */ addu $at, $at, $v0 +/* 825E24 80242B64 AC20E570 */ sw $zero, -0x1a90($at) +/* 825E28 80242B68 08090AE6 */ j .L80242B98 +/* 825E2C 80242B6C 00000000 */ nop +.L80242B70: +/* 825E30 80242B70 3C038025 */ lui $v1, 0x8025 +/* 825E34 80242B74 2463E570 */ addiu $v1, $v1, -0x1a90 +/* 825E38 80242B78 0060282D */ daddu $a1, $v1, $zero +.L80242B7C: +/* 825E3C 80242B7C 24820010 */ addiu $v0, $a0, 0x10 +/* 825E40 80242B80 AC620000 */ sw $v0, ($v1) +/* 825E44 80242B84 24630004 */ addiu $v1, $v1, 4 +/* 825E48 80242B88 24840001 */ addiu $a0, $a0, 1 +/* 825E4C 80242B8C 28820070 */ slti $v0, $a0, 0x70 +/* 825E50 80242B90 1440FFFA */ bnez $v0, .L80242B7C +/* 825E54 80242B94 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80242B98: +/* 825E58 80242B98 8FBF0010 */ lw $ra, 0x10($sp) +/* 825E5C 80242B9C 24020002 */ addiu $v0, $zero, 2 +/* 825E60 80242BA0 03E00008 */ jr $ra +/* 825E64 80242BA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44.s deleted file mode 100644 index 44170f389e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C44 -/* 825F04 80242C44 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 825F08 80242C48 AFB10014 */ sw $s1, 0x14($sp) -/* 825F0C 80242C4C 0080882D */ daddu $s1, $a0, $zero -/* 825F10 80242C50 AFBF0020 */ sw $ra, 0x20($sp) -/* 825F14 80242C54 AFB3001C */ sw $s3, 0x1c($sp) -/* 825F18 80242C58 AFB20018 */ sw $s2, 0x18($sp) -/* 825F1C 80242C5C AFB00010 */ sw $s0, 0x10($sp) -/* 825F20 80242C60 8E30000C */ lw $s0, 0xc($s1) -/* 825F24 80242C64 8E120000 */ lw $s2, ($s0) -/* 825F28 80242C68 26100004 */ addiu $s0, $s0, 4 -/* 825F2C 80242C6C 8E130000 */ lw $s3, ($s0) -/* 825F30 80242C70 26100004 */ addiu $s0, $s0, 4 -/* 825F34 80242C74 8E050000 */ lw $a1, ($s0) -/* 825F38 80242C78 0C0B1EAF */ jal get_variable -/* 825F3C 80242C7C 26100004 */ addiu $s0, $s0, 4 -/* 825F40 80242C80 0220202D */ daddu $a0, $s1, $zero -/* 825F44 80242C84 8E050000 */ lw $a1, ($s0) -/* 825F48 80242C88 0C0B1EAF */ jal get_variable -/* 825F4C 80242C8C 0040802D */ daddu $s0, $v0, $zero -/* 825F50 80242C90 0040282D */ daddu $a1, $v0, $zero -/* 825F54 80242C94 24020096 */ addiu $v0, $zero, 0x96 -/* 825F58 80242C98 1602001E */ bne $s0, $v0, .L80242D14 -/* 825F5C 80242C9C 0000202D */ daddu $a0, $zero, $zero -/* 825F60 80242CA0 0C00A67F */ jal rand_int -/* 825F64 80242CA4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 825F68 80242CA8 284201F4 */ slti $v0, $v0, 0x1f4 -/* 825F6C 80242CAC 10400003 */ beqz $v0, .L80242CBC -/* 825F70 80242CB0 0000802D */ daddu $s0, $zero, $zero -/* 825F74 80242CB4 08090B60 */ j .L80242D80 -/* 825F78 80242CB8 240600C2 */ addiu $a2, $zero, 0xc2 -.L80242CBC: -/* 825F7C 80242CBC 0C00A67F */ jal rand_int -/* 825F80 80242CC0 24042710 */ addiu $a0, $zero, 0x2710 -/* 825F84 80242CC4 3C03B216 */ lui $v1, 0xb216 -/* 825F88 80242CC8 346342C9 */ ori $v1, $v1, 0x42c9 -/* 825F8C 80242CCC 00430018 */ mult $v0, $v1 -/* 825F90 80242CD0 24100004 */ addiu $s0, $zero, 4 -/* 825F94 80242CD4 000227C3 */ sra $a0, $v0, 0x1f -/* 825F98 80242CD8 00003810 */ mfhi $a3 -/* 825F9C 80242CDC 00E21821 */ addu $v1, $a3, $v0 -/* 825FA0 80242CE0 02031807 */ srav $v1, $v1, $s0 -/* 825FA4 80242CE4 00642023 */ subu $a0, $v1, $a0 -/* 825FA8 80242CE8 00041840 */ sll $v1, $a0, 1 -/* 825FAC 80242CEC 00641821 */ addu $v1, $v1, $a0 -/* 825FB0 80242CF0 000318C0 */ sll $v1, $v1, 3 -/* 825FB4 80242CF4 00641823 */ subu $v1, $v1, $a0 -/* 825FB8 80242CF8 00432023 */ subu $a0, $v0, $v1 -/* 825FBC 80242CFC 00041080 */ sll $v0, $a0, 2 -/* 825FC0 80242D00 3C068025 */ lui $a2, 0x8025 -/* 825FC4 80242D04 00C23021 */ addu $a2, $a2, $v0 -/* 825FC8 80242D08 8CC6909C */ lw $a2, -0x6f64($a2) -/* 825FCC 80242D0C 08090B61 */ j .L80242D84 -/* 825FD0 80242D10 0220202D */ daddu $a0, $s1, $zero -.L80242D14: -/* 825FD4 80242D14 3C038025 */ lui $v1, 0x8025 -/* 825FD8 80242D18 24638A98 */ addiu $v1, $v1, -0x7568 -.L80242D1C: -/* 825FDC 80242D1C 8C620000 */ lw $v0, ($v1) -/* 825FE0 80242D20 10500006 */ beq $v0, $s0, .L80242D3C -/* 825FE4 80242D24 2882001D */ slti $v0, $a0, 0x1d -/* 825FE8 80242D28 24840001 */ addiu $a0, $a0, 1 -/* 825FEC 80242D2C 2882001D */ slti $v0, $a0, 0x1d -/* 825FF0 80242D30 1440FFFA */ bnez $v0, .L80242D1C -/* 825FF4 80242D34 24630004 */ addiu $v1, $v1, 4 -/* 825FF8 80242D38 2882001D */ slti $v0, $a0, 0x1d -.L80242D3C: -/* 825FFC 80242D3C 5040000A */ beql $v0, $zero, .L80242D68 -/* 826000 80242D40 0000202D */ daddu $a0, $zero, $zero -/* 826004 80242D44 10A00005 */ beqz $a1, .L80242D5C -/* 826008 80242D48 00000000 */ nop -/* 82600C 80242D4C 3C018025 */ lui $at, 0x8025 -/* 826010 80242D50 00240821 */ addu $at, $at, $a0 -/* 826014 80242D54 08090B5A */ j .L80242D68 -/* 826018 80242D58 80248CD0 */ lb $a0, -0x7330($at) -.L80242D5C: -/* 82601C 80242D5C 3C018025 */ lui $at, 0x8025 -/* 826020 80242D60 00240821 */ addu $at, $at, $a0 -/* 826024 80242D64 80248CB0 */ lb $a0, -0x7350($at) -.L80242D68: -/* 826028 80242D68 3C038025 */ lui $v1, 0x8025 -/* 82602C 80242D6C 24638B10 */ addiu $v1, $v1, -0x74f0 -/* 826030 80242D70 000410C0 */ sll $v0, $a0, 3 -/* 826034 80242D74 00431021 */ addu $v0, $v0, $v1 -/* 826038 80242D78 8C500000 */ lw $s0, ($v0) -/* 82603C 80242D7C 8C460004 */ lw $a2, 4($v0) -.L80242D80: -/* 826040 80242D80 0220202D */ daddu $a0, $s1, $zero -.L80242D84: -/* 826044 80242D84 0C0B2026 */ jal set_variable -/* 826048 80242D88 0240282D */ daddu $a1, $s2, $zero -/* 82604C 80242D8C 0220202D */ daddu $a0, $s1, $zero -/* 826050 80242D90 0260282D */ daddu $a1, $s3, $zero -/* 826054 80242D94 0C0B2026 */ jal set_variable -/* 826058 80242D98 0200302D */ daddu $a2, $s0, $zero -/* 82605C 80242D9C 8FBF0020 */ lw $ra, 0x20($sp) -/* 826060 80242DA0 8FB3001C */ lw $s3, 0x1c($sp) -/* 826064 80242DA4 8FB20018 */ lw $s2, 0x18($sp) -/* 826068 80242DA8 8FB10014 */ lw $s1, 0x14($sp) -/* 82606C 80242DAC 8FB00010 */ lw $s0, 0x10($sp) -/* 826070 80242DB0 24020002 */ addiu $v0, $zero, 2 -/* 826074 80242DB4 03E00008 */ jr $ra -/* 826078 80242DB8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s new file mode 100644 index 0000000000..a6368ab3b3 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242C44_825F04.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C44_825F04 +/* 825F04 80242C44 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 825F08 80242C48 AFB10014 */ sw $s1, 0x14($sp) +/* 825F0C 80242C4C 0080882D */ daddu $s1, $a0, $zero +/* 825F10 80242C50 AFBF0020 */ sw $ra, 0x20($sp) +/* 825F14 80242C54 AFB3001C */ sw $s3, 0x1c($sp) +/* 825F18 80242C58 AFB20018 */ sw $s2, 0x18($sp) +/* 825F1C 80242C5C AFB00010 */ sw $s0, 0x10($sp) +/* 825F20 80242C60 8E30000C */ lw $s0, 0xc($s1) +/* 825F24 80242C64 8E120000 */ lw $s2, ($s0) +/* 825F28 80242C68 26100004 */ addiu $s0, $s0, 4 +/* 825F2C 80242C6C 8E130000 */ lw $s3, ($s0) +/* 825F30 80242C70 26100004 */ addiu $s0, $s0, 4 +/* 825F34 80242C74 8E050000 */ lw $a1, ($s0) +/* 825F38 80242C78 0C0B1EAF */ jal get_variable +/* 825F3C 80242C7C 26100004 */ addiu $s0, $s0, 4 +/* 825F40 80242C80 0220202D */ daddu $a0, $s1, $zero +/* 825F44 80242C84 8E050000 */ lw $a1, ($s0) +/* 825F48 80242C88 0C0B1EAF */ jal get_variable +/* 825F4C 80242C8C 0040802D */ daddu $s0, $v0, $zero +/* 825F50 80242C90 0040282D */ daddu $a1, $v0, $zero +/* 825F54 80242C94 24020096 */ addiu $v0, $zero, 0x96 +/* 825F58 80242C98 1602001E */ bne $s0, $v0, .L80242D14 +/* 825F5C 80242C9C 0000202D */ daddu $a0, $zero, $zero +/* 825F60 80242CA0 0C00A67F */ jal rand_int +/* 825F64 80242CA4 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 825F68 80242CA8 284201F4 */ slti $v0, $v0, 0x1f4 +/* 825F6C 80242CAC 10400003 */ beqz $v0, .L80242CBC +/* 825F70 80242CB0 0000802D */ daddu $s0, $zero, $zero +/* 825F74 80242CB4 08090B60 */ j .L80242D80 +/* 825F78 80242CB8 240600C2 */ addiu $a2, $zero, 0xc2 +.L80242CBC: +/* 825F7C 80242CBC 0C00A67F */ jal rand_int +/* 825F80 80242CC0 24042710 */ addiu $a0, $zero, 0x2710 +/* 825F84 80242CC4 3C03B216 */ lui $v1, 0xb216 +/* 825F88 80242CC8 346342C9 */ ori $v1, $v1, 0x42c9 +/* 825F8C 80242CCC 00430018 */ mult $v0, $v1 +/* 825F90 80242CD0 24100004 */ addiu $s0, $zero, 4 +/* 825F94 80242CD4 000227C3 */ sra $a0, $v0, 0x1f +/* 825F98 80242CD8 00003810 */ mfhi $a3 +/* 825F9C 80242CDC 00E21821 */ addu $v1, $a3, $v0 +/* 825FA0 80242CE0 02031807 */ srav $v1, $v1, $s0 +/* 825FA4 80242CE4 00642023 */ subu $a0, $v1, $a0 +/* 825FA8 80242CE8 00041840 */ sll $v1, $a0, 1 +/* 825FAC 80242CEC 00641821 */ addu $v1, $v1, $a0 +/* 825FB0 80242CF0 000318C0 */ sll $v1, $v1, 3 +/* 825FB4 80242CF4 00641823 */ subu $v1, $v1, $a0 +/* 825FB8 80242CF8 00432023 */ subu $a0, $v0, $v1 +/* 825FBC 80242CFC 00041080 */ sll $v0, $a0, 2 +/* 825FC0 80242D00 3C068025 */ lui $a2, 0x8025 +/* 825FC4 80242D04 00C23021 */ addu $a2, $a2, $v0 +/* 825FC8 80242D08 8CC6909C */ lw $a2, -0x6f64($a2) +/* 825FCC 80242D0C 08090B61 */ j .L80242D84 +/* 825FD0 80242D10 0220202D */ daddu $a0, $s1, $zero +.L80242D14: +/* 825FD4 80242D14 3C038025 */ lui $v1, 0x8025 +/* 825FD8 80242D18 24638A98 */ addiu $v1, $v1, -0x7568 +.L80242D1C: +/* 825FDC 80242D1C 8C620000 */ lw $v0, ($v1) +/* 825FE0 80242D20 10500006 */ beq $v0, $s0, .L80242D3C +/* 825FE4 80242D24 2882001D */ slti $v0, $a0, 0x1d +/* 825FE8 80242D28 24840001 */ addiu $a0, $a0, 1 +/* 825FEC 80242D2C 2882001D */ slti $v0, $a0, 0x1d +/* 825FF0 80242D30 1440FFFA */ bnez $v0, .L80242D1C +/* 825FF4 80242D34 24630004 */ addiu $v1, $v1, 4 +/* 825FF8 80242D38 2882001D */ slti $v0, $a0, 0x1d +.L80242D3C: +/* 825FFC 80242D3C 5040000A */ beql $v0, $zero, .L80242D68 +/* 826000 80242D40 0000202D */ daddu $a0, $zero, $zero +/* 826004 80242D44 10A00005 */ beqz $a1, .L80242D5C +/* 826008 80242D48 00000000 */ nop +/* 82600C 80242D4C 3C018025 */ lui $at, 0x8025 +/* 826010 80242D50 00240821 */ addu $at, $at, $a0 +/* 826014 80242D54 08090B5A */ j .L80242D68 +/* 826018 80242D58 80248CD0 */ lb $a0, -0x7330($at) +.L80242D5C: +/* 82601C 80242D5C 3C018025 */ lui $at, 0x8025 +/* 826020 80242D60 00240821 */ addu $at, $at, $a0 +/* 826024 80242D64 80248CB0 */ lb $a0, -0x7350($at) +.L80242D68: +/* 826028 80242D68 3C038025 */ lui $v1, 0x8025 +/* 82602C 80242D6C 24638B10 */ addiu $v1, $v1, -0x74f0 +/* 826030 80242D70 000410C0 */ sll $v0, $a0, 3 +/* 826034 80242D74 00431021 */ addu $v0, $v0, $v1 +/* 826038 80242D78 8C500000 */ lw $s0, ($v0) +/* 82603C 80242D7C 8C460004 */ lw $a2, 4($v0) +.L80242D80: +/* 826040 80242D80 0220202D */ daddu $a0, $s1, $zero +.L80242D84: +/* 826044 80242D84 0C0B2026 */ jal set_variable +/* 826048 80242D88 0240282D */ daddu $a1, $s2, $zero +/* 82604C 80242D8C 0220202D */ daddu $a0, $s1, $zero +/* 826050 80242D90 0260282D */ daddu $a1, $s3, $zero +/* 826054 80242D94 0C0B2026 */ jal set_variable +/* 826058 80242D98 0200302D */ daddu $a2, $s0, $zero +/* 82605C 80242D9C 8FBF0020 */ lw $ra, 0x20($sp) +/* 826060 80242DA0 8FB3001C */ lw $s3, 0x1c($sp) +/* 826064 80242DA4 8FB20018 */ lw $s2, 0x18($sp) +/* 826068 80242DA8 8FB10014 */ lw $s1, 0x14($sp) +/* 82606C 80242DAC 8FB00010 */ lw $s0, 0x10($sp) +/* 826070 80242DB0 24020002 */ addiu $v0, $zero, 2 +/* 826074 80242DB4 03E00008 */ jr $ra +/* 826078 80242DB8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC.s deleted file mode 100644 index 7a34a21926..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DBC -/* 82607C 80242DBC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 826080 80242DC0 AFB10014 */ sw $s1, 0x14($sp) -/* 826084 80242DC4 0080882D */ daddu $s1, $a0, $zero -/* 826088 80242DC8 AFBF0020 */ sw $ra, 0x20($sp) -/* 82608C 80242DCC AFB3001C */ sw $s3, 0x1c($sp) -/* 826090 80242DD0 AFB20018 */ sw $s2, 0x18($sp) -/* 826094 80242DD4 AFB00010 */ sw $s0, 0x10($sp) -/* 826098 80242DD8 8E30000C */ lw $s0, 0xc($s1) -/* 82609C 80242DDC 8E120000 */ lw $s2, ($s0) -/* 8260A0 80242DE0 26100004 */ addiu $s0, $s0, 4 -/* 8260A4 80242DE4 8E130000 */ lw $s3, ($s0) -/* 8260A8 80242DE8 26100004 */ addiu $s0, $s0, 4 -/* 8260AC 80242DEC 8E050000 */ lw $a1, ($s0) -/* 8260B0 80242DF0 0C0B1EAF */ jal get_variable -/* 8260B4 80242DF4 26100004 */ addiu $s0, $s0, 4 -/* 8260B8 80242DF8 0220202D */ daddu $a0, $s1, $zero -/* 8260BC 80242DFC 8E050000 */ lw $a1, ($s0) -/* 8260C0 80242E00 0C0B1EAF */ jal get_variable -/* 8260C4 80242E04 0040802D */ daddu $s0, $v0, $zero -/* 8260C8 80242E08 0040302D */ daddu $a2, $v0, $zero -/* 8260CC 80242E0C 0000282D */ daddu $a1, $zero, $zero -/* 8260D0 80242E10 3C038025 */ lui $v1, 0x8025 -/* 8260D4 80242E14 24638A98 */ addiu $v1, $v1, -0x7568 -.L80242E18: -/* 8260D8 80242E18 8C620000 */ lw $v0, ($v1) -/* 8260DC 80242E1C 10500006 */ beq $v0, $s0, .L80242E38 -/* 8260E0 80242E20 0000202D */ daddu $a0, $zero, $zero -/* 8260E4 80242E24 24A50001 */ addiu $a1, $a1, 1 -/* 8260E8 80242E28 28A2001D */ slti $v0, $a1, 0x1d -/* 8260EC 80242E2C 1440FFFA */ bnez $v0, .L80242E18 -/* 8260F0 80242E30 24630004 */ addiu $v1, $v1, 4 -/* 8260F4 80242E34 0000202D */ daddu $a0, $zero, $zero -.L80242E38: -/* 8260F8 80242E38 3C038025 */ lui $v1, 0x8025 -/* 8260FC 80242E3C 24638A98 */ addiu $v1, $v1, -0x7568 -.L80242E40: -/* 826100 80242E40 8C620000 */ lw $v0, ($v1) -/* 826104 80242E44 10460006 */ beq $v0, $a2, .L80242E60 -/* 826108 80242E48 28A2001D */ slti $v0, $a1, 0x1d -/* 82610C 80242E4C 24840001 */ addiu $a0, $a0, 1 -/* 826110 80242E50 2882001D */ slti $v0, $a0, 0x1d -/* 826114 80242E54 1440FFFA */ bnez $v0, .L80242E40 -/* 826118 80242E58 24630004 */ addiu $v1, $v1, 4 -/* 82611C 80242E5C 28A2001D */ slti $v0, $a1, 0x1d -.L80242E60: -/* 826120 80242E60 10400013 */ beqz $v0, .L80242EB0 -/* 826124 80242E64 0000182D */ daddu $v1, $zero, $zero -/* 826128 80242E68 2882001D */ slti $v0, $a0, 0x1d -/* 82612C 80242E6C 10400010 */ beqz $v0, .L80242EB0 -/* 826130 80242E70 00A4102A */ slt $v0, $a1, $a0 -/* 826134 80242E74 10400006 */ beqz $v0, .L80242E90 -/* 826138 80242E78 000510C0 */ sll $v0, $a1, 3 -/* 82613C 80242E7C 00451023 */ subu $v0, $v0, $a1 -/* 826140 80242E80 00021080 */ sll $v0, $v0, 2 -/* 826144 80242E84 00451021 */ addu $v0, $v0, $a1 -/* 826148 80242E88 08090BA9 */ j .L80242EA4 -/* 82614C 80242E8C 00821021 */ addu $v0, $a0, $v0 -.L80242E90: -/* 826150 80242E90 000410C0 */ sll $v0, $a0, 3 -/* 826154 80242E94 00441023 */ subu $v0, $v0, $a0 -/* 826158 80242E98 00021080 */ sll $v0, $v0, 2 -/* 82615C 80242E9C 00441021 */ addu $v0, $v0, $a0 -/* 826160 80242EA0 00A21021 */ addu $v0, $a1, $v0 -.L80242EA4: -/* 826164 80242EA4 3C038025 */ lui $v1, 0x8025 -/* 826168 80242EA8 00621821 */ addu $v1, $v1, $v0 -/* 82616C 80242EAC 80638CF0 */ lb $v1, -0x7310($v1) -.L80242EB0: -/* 826170 80242EB0 04620001 */ bltzl $v1, .L80242EB8 -/* 826174 80242EB4 0000182D */ daddu $v1, $zero, $zero -.L80242EB8: -/* 826178 80242EB8 14600015 */ bnez $v1, .L80242F10 -/* 82617C 80242EBC 0220202D */ daddu $a0, $s1, $zero -/* 826180 80242EC0 3C048025 */ lui $a0, 0x8025 -/* 826184 80242EC4 2484903C */ addiu $a0, $a0, -0x6fc4 -/* 826188 80242EC8 24870060 */ addiu $a3, $a0, 0x60 -.L80242ECC: -/* 82618C 80242ECC 8C850000 */ lw $a1, ($a0) -/* 826190 80242ED0 14B00004 */ bne $a1, $s0, .L80242EE4 -/* 826194 80242ED4 00000000 */ nop -/* 826198 80242ED8 8C820004 */ lw $v0, 4($a0) -/* 82619C 80242EDC 10460006 */ beq $v0, $a2, .L80242EF8 -/* 8261A0 80242EE0 00000000 */ nop -.L80242EE4: -/* 8261A4 80242EE4 54A60006 */ bnel $a1, $a2, .L80242F00 -/* 8261A8 80242EE8 2484000C */ addiu $a0, $a0, 0xc -/* 8261AC 80242EEC 8C820004 */ lw $v0, 4($a0) -/* 8261B0 80242EF0 54500003 */ bnel $v0, $s0, .L80242F00 -/* 8261B4 80242EF4 2484000C */ addiu $a0, $a0, 0xc -.L80242EF8: -/* 8261B8 80242EF8 8C830008 */ lw $v1, 8($a0) -/* 8261BC 80242EFC 2484000C */ addiu $a0, $a0, 0xc -.L80242F00: -/* 8261C0 80242F00 0087102A */ slt $v0, $a0, $a3 -/* 8261C4 80242F04 1440FFF1 */ bnez $v0, .L80242ECC -/* 8261C8 80242F08 00000000 */ nop -/* 8261CC 80242F0C 0220202D */ daddu $a0, $s1, $zero -.L80242F10: -/* 8261D0 80242F10 3C028025 */ lui $v0, 0x8025 -/* 8261D4 80242F14 24428B10 */ addiu $v0, $v0, -0x74f0 -/* 8261D8 80242F18 000318C0 */ sll $v1, $v1, 3 -/* 8261DC 80242F1C 00621821 */ addu $v1, $v1, $v0 -/* 8261E0 80242F20 8C660004 */ lw $a2, 4($v1) -/* 8261E4 80242F24 8C700000 */ lw $s0, ($v1) -/* 8261E8 80242F28 0C0B2026 */ jal set_variable -/* 8261EC 80242F2C 0240282D */ daddu $a1, $s2, $zero -/* 8261F0 80242F30 0220202D */ daddu $a0, $s1, $zero -/* 8261F4 80242F34 0260282D */ daddu $a1, $s3, $zero -/* 8261F8 80242F38 0C0B2026 */ jal set_variable -/* 8261FC 80242F3C 0200302D */ daddu $a2, $s0, $zero -/* 826200 80242F40 8FBF0020 */ lw $ra, 0x20($sp) -/* 826204 80242F44 8FB3001C */ lw $s3, 0x1c($sp) -/* 826208 80242F48 8FB20018 */ lw $s2, 0x18($sp) -/* 82620C 80242F4C 8FB10014 */ lw $s1, 0x14($sp) -/* 826210 80242F50 8FB00010 */ lw $s0, 0x10($sp) -/* 826214 80242F54 24020002 */ addiu $v0, $zero, 2 -/* 826218 80242F58 03E00008 */ jr $ra -/* 82621C 80242F5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s new file mode 100644 index 0000000000..7e79bf5e5c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242DBC_82607C.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242DBC_82607C +/* 82607C 80242DBC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 826080 80242DC0 AFB10014 */ sw $s1, 0x14($sp) +/* 826084 80242DC4 0080882D */ daddu $s1, $a0, $zero +/* 826088 80242DC8 AFBF0020 */ sw $ra, 0x20($sp) +/* 82608C 80242DCC AFB3001C */ sw $s3, 0x1c($sp) +/* 826090 80242DD0 AFB20018 */ sw $s2, 0x18($sp) +/* 826094 80242DD4 AFB00010 */ sw $s0, 0x10($sp) +/* 826098 80242DD8 8E30000C */ lw $s0, 0xc($s1) +/* 82609C 80242DDC 8E120000 */ lw $s2, ($s0) +/* 8260A0 80242DE0 26100004 */ addiu $s0, $s0, 4 +/* 8260A4 80242DE4 8E130000 */ lw $s3, ($s0) +/* 8260A8 80242DE8 26100004 */ addiu $s0, $s0, 4 +/* 8260AC 80242DEC 8E050000 */ lw $a1, ($s0) +/* 8260B0 80242DF0 0C0B1EAF */ jal get_variable +/* 8260B4 80242DF4 26100004 */ addiu $s0, $s0, 4 +/* 8260B8 80242DF8 0220202D */ daddu $a0, $s1, $zero +/* 8260BC 80242DFC 8E050000 */ lw $a1, ($s0) +/* 8260C0 80242E00 0C0B1EAF */ jal get_variable +/* 8260C4 80242E04 0040802D */ daddu $s0, $v0, $zero +/* 8260C8 80242E08 0040302D */ daddu $a2, $v0, $zero +/* 8260CC 80242E0C 0000282D */ daddu $a1, $zero, $zero +/* 8260D0 80242E10 3C038025 */ lui $v1, 0x8025 +/* 8260D4 80242E14 24638A98 */ addiu $v1, $v1, -0x7568 +.L80242E18: +/* 8260D8 80242E18 8C620000 */ lw $v0, ($v1) +/* 8260DC 80242E1C 10500006 */ beq $v0, $s0, .L80242E38 +/* 8260E0 80242E20 0000202D */ daddu $a0, $zero, $zero +/* 8260E4 80242E24 24A50001 */ addiu $a1, $a1, 1 +/* 8260E8 80242E28 28A2001D */ slti $v0, $a1, 0x1d +/* 8260EC 80242E2C 1440FFFA */ bnez $v0, .L80242E18 +/* 8260F0 80242E30 24630004 */ addiu $v1, $v1, 4 +/* 8260F4 80242E34 0000202D */ daddu $a0, $zero, $zero +.L80242E38: +/* 8260F8 80242E38 3C038025 */ lui $v1, 0x8025 +/* 8260FC 80242E3C 24638A98 */ addiu $v1, $v1, -0x7568 +.L80242E40: +/* 826100 80242E40 8C620000 */ lw $v0, ($v1) +/* 826104 80242E44 10460006 */ beq $v0, $a2, .L80242E60 +/* 826108 80242E48 28A2001D */ slti $v0, $a1, 0x1d +/* 82610C 80242E4C 24840001 */ addiu $a0, $a0, 1 +/* 826110 80242E50 2882001D */ slti $v0, $a0, 0x1d +/* 826114 80242E54 1440FFFA */ bnez $v0, .L80242E40 +/* 826118 80242E58 24630004 */ addiu $v1, $v1, 4 +/* 82611C 80242E5C 28A2001D */ slti $v0, $a1, 0x1d +.L80242E60: +/* 826120 80242E60 10400013 */ beqz $v0, .L80242EB0 +/* 826124 80242E64 0000182D */ daddu $v1, $zero, $zero +/* 826128 80242E68 2882001D */ slti $v0, $a0, 0x1d +/* 82612C 80242E6C 10400010 */ beqz $v0, .L80242EB0 +/* 826130 80242E70 00A4102A */ slt $v0, $a1, $a0 +/* 826134 80242E74 10400006 */ beqz $v0, .L80242E90 +/* 826138 80242E78 000510C0 */ sll $v0, $a1, 3 +/* 82613C 80242E7C 00451023 */ subu $v0, $v0, $a1 +/* 826140 80242E80 00021080 */ sll $v0, $v0, 2 +/* 826144 80242E84 00451021 */ addu $v0, $v0, $a1 +/* 826148 80242E88 08090BA9 */ j .L80242EA4 +/* 82614C 80242E8C 00821021 */ addu $v0, $a0, $v0 +.L80242E90: +/* 826150 80242E90 000410C0 */ sll $v0, $a0, 3 +/* 826154 80242E94 00441023 */ subu $v0, $v0, $a0 +/* 826158 80242E98 00021080 */ sll $v0, $v0, 2 +/* 82615C 80242E9C 00441021 */ addu $v0, $v0, $a0 +/* 826160 80242EA0 00A21021 */ addu $v0, $a1, $v0 +.L80242EA4: +/* 826164 80242EA4 3C038025 */ lui $v1, 0x8025 +/* 826168 80242EA8 00621821 */ addu $v1, $v1, $v0 +/* 82616C 80242EAC 80638CF0 */ lb $v1, -0x7310($v1) +.L80242EB0: +/* 826170 80242EB0 04620001 */ bltzl $v1, .L80242EB8 +/* 826174 80242EB4 0000182D */ daddu $v1, $zero, $zero +.L80242EB8: +/* 826178 80242EB8 14600015 */ bnez $v1, .L80242F10 +/* 82617C 80242EBC 0220202D */ daddu $a0, $s1, $zero +/* 826180 80242EC0 3C048025 */ lui $a0, 0x8025 +/* 826184 80242EC4 2484903C */ addiu $a0, $a0, -0x6fc4 +/* 826188 80242EC8 24870060 */ addiu $a3, $a0, 0x60 +.L80242ECC: +/* 82618C 80242ECC 8C850000 */ lw $a1, ($a0) +/* 826190 80242ED0 14B00004 */ bne $a1, $s0, .L80242EE4 +/* 826194 80242ED4 00000000 */ nop +/* 826198 80242ED8 8C820004 */ lw $v0, 4($a0) +/* 82619C 80242EDC 10460006 */ beq $v0, $a2, .L80242EF8 +/* 8261A0 80242EE0 00000000 */ nop +.L80242EE4: +/* 8261A4 80242EE4 54A60006 */ bnel $a1, $a2, .L80242F00 +/* 8261A8 80242EE8 2484000C */ addiu $a0, $a0, 0xc +/* 8261AC 80242EEC 8C820004 */ lw $v0, 4($a0) +/* 8261B0 80242EF0 54500003 */ bnel $v0, $s0, .L80242F00 +/* 8261B4 80242EF4 2484000C */ addiu $a0, $a0, 0xc +.L80242EF8: +/* 8261B8 80242EF8 8C830008 */ lw $v1, 8($a0) +/* 8261BC 80242EFC 2484000C */ addiu $a0, $a0, 0xc +.L80242F00: +/* 8261C0 80242F00 0087102A */ slt $v0, $a0, $a3 +/* 8261C4 80242F04 1440FFF1 */ bnez $v0, .L80242ECC +/* 8261C8 80242F08 00000000 */ nop +/* 8261CC 80242F0C 0220202D */ daddu $a0, $s1, $zero +.L80242F10: +/* 8261D0 80242F10 3C028025 */ lui $v0, 0x8025 +/* 8261D4 80242F14 24428B10 */ addiu $v0, $v0, -0x74f0 +/* 8261D8 80242F18 000318C0 */ sll $v1, $v1, 3 +/* 8261DC 80242F1C 00621821 */ addu $v1, $v1, $v0 +/* 8261E0 80242F20 8C660004 */ lw $a2, 4($v1) +/* 8261E4 80242F24 8C700000 */ lw $s0, ($v1) +/* 8261E8 80242F28 0C0B2026 */ jal set_variable +/* 8261EC 80242F2C 0240282D */ daddu $a1, $s2, $zero +/* 8261F0 80242F30 0220202D */ daddu $a0, $s1, $zero +/* 8261F4 80242F34 0260282D */ daddu $a1, $s3, $zero +/* 8261F8 80242F38 0C0B2026 */ jal set_variable +/* 8261FC 80242F3C 0200302D */ daddu $a2, $s0, $zero +/* 826200 80242F40 8FBF0020 */ lw $ra, 0x20($sp) +/* 826204 80242F44 8FB3001C */ lw $s3, 0x1c($sp) +/* 826208 80242F48 8FB20018 */ lw $s2, 0x18($sp) +/* 82620C 80242F4C 8FB10014 */ lw $s1, 0x14($sp) +/* 826210 80242F50 8FB00010 */ lw $s0, 0x10($sp) +/* 826214 80242F54 24020002 */ addiu $v0, $zero, 2 +/* 826218 80242F58 03E00008 */ jr $ra +/* 82621C 80242F5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60.s deleted file mode 100644 index 3e7b0dbeee..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F60 -/* 826220 80242F60 27BDFE48 */ addiu $sp, $sp, -0x1b8 -/* 826224 80242F64 AFBF01B0 */ sw $ra, 0x1b0($sp) -/* 826228 80242F68 8C82000C */ lw $v0, 0xc($a0) -/* 82622C 80242F6C 0C0B1EAF */ jal get_variable -/* 826230 80242F70 8C450000 */ lw $a1, ($v0) -/* 826234 80242F74 0040302D */ daddu $a2, $v0, $zero -/* 826238 80242F78 27A30010 */ addiu $v1, $sp, 0x10 -/* 82623C 80242F7C 3C028025 */ lui $v0, 0x8025 -/* 826240 80242F80 2442E3A0 */ addiu $v0, $v0, -0x1c60 -/* 826244 80242F84 244400D0 */ addiu $a0, $v0, 0xd0 -.L80242F88: -/* 826248 80242F88 8C470000 */ lw $a3, ($v0) -/* 82624C 80242F8C 8C480004 */ lw $t0, 4($v0) -/* 826250 80242F90 8C490008 */ lw $t1, 8($v0) -/* 826254 80242F94 8C4A000C */ lw $t2, 0xc($v0) -/* 826258 80242F98 AC670000 */ sw $a3, ($v1) -/* 82625C 80242F9C AC680004 */ sw $t0, 4($v1) -/* 826260 80242FA0 AC690008 */ sw $t1, 8($v1) -/* 826264 80242FA4 AC6A000C */ sw $t2, 0xc($v1) -/* 826268 80242FA8 24420010 */ addiu $v0, $v0, 0x10 -/* 82626C 80242FAC 1444FFF6 */ bne $v0, $a0, .L80242F88 -/* 826270 80242FB0 24630010 */ addiu $v1, $v1, 0x10 -/* 826274 80242FB4 27A300E0 */ addiu $v1, $sp, 0xe0 -/* 826278 80242FB8 3C028025 */ lui $v0, 0x8025 -/* 82627C 80242FBC 2442E470 */ addiu $v0, $v0, -0x1b90 -/* 826280 80242FC0 244400D0 */ addiu $a0, $v0, 0xd0 -.L80242FC4: -/* 826284 80242FC4 8C470000 */ lw $a3, ($v0) -/* 826288 80242FC8 8C480004 */ lw $t0, 4($v0) -/* 82628C 80242FCC 8C490008 */ lw $t1, 8($v0) -/* 826290 80242FD0 8C4A000C */ lw $t2, 0xc($v0) -/* 826294 80242FD4 AC670000 */ sw $a3, ($v1) -/* 826298 80242FD8 AC680004 */ sw $t0, 4($v1) -/* 82629C 80242FDC AC690008 */ sw $t1, 8($v1) -/* 8262A0 80242FE0 AC6A000C */ sw $t2, 0xc($v1) -/* 8262A4 80242FE4 24420010 */ addiu $v0, $v0, 0x10 -/* 8262A8 80242FE8 1444FFF6 */ bne $v0, $a0, .L80242FC4 -/* 8262AC 80242FEC 24630010 */ addiu $v1, $v1, 0x10 -/* 8262B0 80242FF0 0000202D */ daddu $a0, $zero, $zero -/* 8262B4 80242FF4 27A500E0 */ addiu $a1, $sp, 0xe0 -/* 8262B8 80242FF8 27A30010 */ addiu $v1, $sp, 0x10 -.L80242FFC: -/* 8262BC 80242FFC 8C620000 */ lw $v0, ($v1) -/* 8262C0 80243000 54C20007 */ bnel $a2, $v0, .L80243020 -/* 8262C4 80243004 24A50004 */ addiu $a1, $a1, 4 -/* 8262C8 80243008 0000202D */ daddu $a0, $zero, $zero -/* 8262CC 8024300C 8CA50000 */ lw $a1, ($a1) -/* 8262D0 80243010 0C0B2026 */ jal set_variable -/* 8262D4 80243014 24060001 */ addiu $a2, $zero, 1 -/* 8262D8 80243018 08090C0C */ j .L80243030 -/* 8262DC 8024301C 00000000 */ nop -.L80243020: -/* 8262E0 80243020 24840001 */ addiu $a0, $a0, 1 -/* 8262E4 80243024 28820034 */ slti $v0, $a0, 0x34 -/* 8262E8 80243028 1440FFF4 */ bnez $v0, .L80242FFC -/* 8262EC 8024302C 24630004 */ addiu $v1, $v1, 4 -.L80243030: -/* 8262F0 80243030 8FBF01B0 */ lw $ra, 0x1b0($sp) -/* 8262F4 80243034 24020002 */ addiu $v0, $zero, 2 -/* 8262F8 80243038 03E00008 */ jr $ra -/* 8262FC 8024303C 27BD01B8 */ addiu $sp, $sp, 0x1b8 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s new file mode 100644 index 0000000000..6425a40326 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242F60_826220.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F60_826220 +/* 826220 80242F60 27BDFE48 */ addiu $sp, $sp, -0x1b8 +/* 826224 80242F64 AFBF01B0 */ sw $ra, 0x1b0($sp) +/* 826228 80242F68 8C82000C */ lw $v0, 0xc($a0) +/* 82622C 80242F6C 0C0B1EAF */ jal get_variable +/* 826230 80242F70 8C450000 */ lw $a1, ($v0) +/* 826234 80242F74 0040302D */ daddu $a2, $v0, $zero +/* 826238 80242F78 27A30010 */ addiu $v1, $sp, 0x10 +/* 82623C 80242F7C 3C028025 */ lui $v0, 0x8025 +/* 826240 80242F80 2442E3A0 */ addiu $v0, $v0, -0x1c60 +/* 826244 80242F84 244400D0 */ addiu $a0, $v0, 0xd0 +.L80242F88: +/* 826248 80242F88 8C470000 */ lw $a3, ($v0) +/* 82624C 80242F8C 8C480004 */ lw $t0, 4($v0) +/* 826250 80242F90 8C490008 */ lw $t1, 8($v0) +/* 826254 80242F94 8C4A000C */ lw $t2, 0xc($v0) +/* 826258 80242F98 AC670000 */ sw $a3, ($v1) +/* 82625C 80242F9C AC680004 */ sw $t0, 4($v1) +/* 826260 80242FA0 AC690008 */ sw $t1, 8($v1) +/* 826264 80242FA4 AC6A000C */ sw $t2, 0xc($v1) +/* 826268 80242FA8 24420010 */ addiu $v0, $v0, 0x10 +/* 82626C 80242FAC 1444FFF6 */ bne $v0, $a0, .L80242F88 +/* 826270 80242FB0 24630010 */ addiu $v1, $v1, 0x10 +/* 826274 80242FB4 27A300E0 */ addiu $v1, $sp, 0xe0 +/* 826278 80242FB8 3C028025 */ lui $v0, 0x8025 +/* 82627C 80242FBC 2442E470 */ addiu $v0, $v0, -0x1b90 +/* 826280 80242FC0 244400D0 */ addiu $a0, $v0, 0xd0 +.L80242FC4: +/* 826284 80242FC4 8C470000 */ lw $a3, ($v0) +/* 826288 80242FC8 8C480004 */ lw $t0, 4($v0) +/* 82628C 80242FCC 8C490008 */ lw $t1, 8($v0) +/* 826290 80242FD0 8C4A000C */ lw $t2, 0xc($v0) +/* 826294 80242FD4 AC670000 */ sw $a3, ($v1) +/* 826298 80242FD8 AC680004 */ sw $t0, 4($v1) +/* 82629C 80242FDC AC690008 */ sw $t1, 8($v1) +/* 8262A0 80242FE0 AC6A000C */ sw $t2, 0xc($v1) +/* 8262A4 80242FE4 24420010 */ addiu $v0, $v0, 0x10 +/* 8262A8 80242FE8 1444FFF6 */ bne $v0, $a0, .L80242FC4 +/* 8262AC 80242FEC 24630010 */ addiu $v1, $v1, 0x10 +/* 8262B0 80242FF0 0000202D */ daddu $a0, $zero, $zero +/* 8262B4 80242FF4 27A500E0 */ addiu $a1, $sp, 0xe0 +/* 8262B8 80242FF8 27A30010 */ addiu $v1, $sp, 0x10 +.L80242FFC: +/* 8262BC 80242FFC 8C620000 */ lw $v0, ($v1) +/* 8262C0 80243000 54C20007 */ bnel $a2, $v0, .L80243020 +/* 8262C4 80243004 24A50004 */ addiu $a1, $a1, 4 +/* 8262C8 80243008 0000202D */ daddu $a0, $zero, $zero +/* 8262CC 8024300C 8CA50000 */ lw $a1, ($a1) +/* 8262D0 80243010 0C0B2026 */ jal set_variable +/* 8262D4 80243014 24060001 */ addiu $a2, $zero, 1 +/* 8262D8 80243018 08090C0C */ j .L80243030 +/* 8262DC 8024301C 00000000 */ nop +.L80243020: +/* 8262E0 80243020 24840001 */ addiu $a0, $a0, 1 +/* 8262E4 80243024 28820034 */ slti $v0, $a0, 0x34 +/* 8262E8 80243028 1440FFF4 */ bnez $v0, .L80242FFC +/* 8262EC 8024302C 24630004 */ addiu $v1, $v1, 4 +.L80243030: +/* 8262F0 80243030 8FBF01B0 */ lw $ra, 0x1b0($sp) +/* 8262F4 80243034 24020002 */ addiu $v0, $zero, 2 +/* 8262F8 80243038 03E00008 */ jr $ra +/* 8262FC 8024303C 27BD01B8 */ addiu $sp, $sp, 0x1b8 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040.s deleted file mode 100644 index e15691782e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243040 -/* 826300 80243040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 826304 80243044 AFB00010 */ sw $s0, 0x10($sp) -/* 826308 80243048 0080802D */ daddu $s0, $a0, $zero -/* 82630C 8024304C AFBF0018 */ sw $ra, 0x18($sp) -/* 826310 80243050 AFB10014 */ sw $s1, 0x14($sp) -/* 826314 80243054 8E02000C */ lw $v0, 0xc($s0) -/* 826318 80243058 0C039D7B */ jal get_item_count -/* 82631C 8024305C 8C510000 */ lw $s1, ($v0) -/* 826320 80243060 0200202D */ daddu $a0, $s0, $zero -/* 826324 80243064 0040302D */ daddu $a2, $v0, $zero -/* 826328 80243068 0C0B2026 */ jal set_variable -/* 82632C 8024306C 0220282D */ daddu $a1, $s1, $zero -/* 826330 80243070 8FBF0018 */ lw $ra, 0x18($sp) -/* 826334 80243074 8FB10014 */ lw $s1, 0x14($sp) -/* 826338 80243078 8FB00010 */ lw $s0, 0x10($sp) -/* 82633C 8024307C 24020002 */ addiu $v0, $zero, 2 -/* 826340 80243080 03E00008 */ jr $ra -/* 826344 80243084 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040_826300.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040_826300.s new file mode 100644 index 0000000000..485b78d416 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243040_826300.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243040_826300 +/* 826300 80243040 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 826304 80243044 AFB00010 */ sw $s0, 0x10($sp) +/* 826308 80243048 0080802D */ daddu $s0, $a0, $zero +/* 82630C 8024304C AFBF0018 */ sw $ra, 0x18($sp) +/* 826310 80243050 AFB10014 */ sw $s1, 0x14($sp) +/* 826314 80243054 8E02000C */ lw $v0, 0xc($s0) +/* 826318 80243058 0C039D7B */ jal get_item_count +/* 82631C 8024305C 8C510000 */ lw $s1, ($v0) +/* 826320 80243060 0200202D */ daddu $a0, $s0, $zero +/* 826324 80243064 0040302D */ daddu $a2, $v0, $zero +/* 826328 80243068 0C0B2026 */ jal set_variable +/* 82632C 8024306C 0220282D */ daddu $a1, $s1, $zero +/* 826330 80243070 8FBF0018 */ lw $ra, 0x18($sp) +/* 826334 80243074 8FB10014 */ lw $s1, 0x14($sp) +/* 826338 80243078 8FB00010 */ lw $s0, 0x10($sp) +/* 82633C 8024307C 24020002 */ addiu $v0, $zero, 2 +/* 826340 80243080 03E00008 */ jr $ra +/* 826344 80243084 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088.s deleted file mode 100644 index 97bca3ec21..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243088 -/* 826348 80243088 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 82634C 8024308C AFB00010 */ sw $s0, 0x10($sp) -/* 826350 80243090 0080802D */ daddu $s0, $a0, $zero -/* 826354 80243094 AFBF0018 */ sw $ra, 0x18($sp) -/* 826358 80243098 AFB10014 */ sw $s1, 0x14($sp) -/* 82635C 8024309C 8E02000C */ lw $v0, 0xc($s0) -/* 826360 802430A0 0C039D88 */ jal get_item_empty_count -/* 826364 802430A4 8C510000 */ lw $s1, ($v0) -/* 826368 802430A8 0200202D */ daddu $a0, $s0, $zero -/* 82636C 802430AC 0040302D */ daddu $a2, $v0, $zero -/* 826370 802430B0 0C0B2026 */ jal set_variable -/* 826374 802430B4 0220282D */ daddu $a1, $s1, $zero -/* 826378 802430B8 8FBF0018 */ lw $ra, 0x18($sp) -/* 82637C 802430BC 8FB10014 */ lw $s1, 0x14($sp) -/* 826380 802430C0 8FB00010 */ lw $s0, 0x10($sp) -/* 826384 802430C4 24020002 */ addiu $v0, $zero, 2 -/* 826388 802430C8 03E00008 */ jr $ra -/* 82638C 802430CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088_826348.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088_826348.s new file mode 100644 index 0000000000..39b6fd9c8a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80243088_826348.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243088_826348 +/* 826348 80243088 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 82634C 8024308C AFB00010 */ sw $s0, 0x10($sp) +/* 826350 80243090 0080802D */ daddu $s0, $a0, $zero +/* 826354 80243094 AFBF0018 */ sw $ra, 0x18($sp) +/* 826358 80243098 AFB10014 */ sw $s1, 0x14($sp) +/* 82635C 8024309C 8E02000C */ lw $v0, 0xc($s0) +/* 826360 802430A0 0C039D88 */ jal get_item_empty_count +/* 826364 802430A4 8C510000 */ lw $s1, ($v0) +/* 826368 802430A8 0200202D */ daddu $a0, $s0, $zero +/* 82636C 802430AC 0040302D */ daddu $a2, $v0, $zero +/* 826370 802430B0 0C0B2026 */ jal set_variable +/* 826374 802430B4 0220282D */ daddu $a1, $s1, $zero +/* 826378 802430B8 8FBF0018 */ lw $ra, 0x18($sp) +/* 82637C 802430BC 8FB10014 */ lw $s1, 0x14($sp) +/* 826380 802430C0 8FB00010 */ lw $s0, 0x10($sp) +/* 826384 802430C4 24020002 */ addiu $v0, $zero, 2 +/* 826388 802430C8 03E00008 */ jr $ra +/* 82638C 802430CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0.s deleted file mode 100644 index 326df4e379..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430D0 -/* 826390 802430D0 2404005A */ addiu $a0, $zero, 0x5a -/* 826394 802430D4 3C038025 */ lui $v1, 0x8025 -/* 826398 802430D8 2463EA10 */ addiu $v1, $v1, -0x15f0 -/* 82639C 802430DC 240200DA */ addiu $v0, $zero, 0xda -.L802430E0: -/* 8263A0 802430E0 AC620000 */ sw $v0, ($v1) -/* 8263A4 802430E4 2463FFFC */ addiu $v1, $v1, -4 -/* 8263A8 802430E8 2484FFFF */ addiu $a0, $a0, -1 -/* 8263AC 802430EC 0481FFFC */ bgez $a0, .L802430E0 -/* 8263B0 802430F0 2442FFFF */ addiu $v0, $v0, -1 -/* 8263B4 802430F4 3C018025 */ lui $at, 0x8025 -/* 8263B8 802430F8 AC20EA14 */ sw $zero, -0x15ec($at) -/* 8263BC 802430FC 03E00008 */ jr $ra -/* 8263C0 80243100 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0_826390.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0_826390.s new file mode 100644 index 0000000000..f3b380879d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802430D0_826390.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802430D0_826390 +/* 826390 802430D0 2404005A */ addiu $a0, $zero, 0x5a +/* 826394 802430D4 3C038025 */ lui $v1, 0x8025 +/* 826398 802430D8 2463EA10 */ addiu $v1, $v1, -0x15f0 +/* 82639C 802430DC 240200DA */ addiu $v0, $zero, 0xda +.L802430E0: +/* 8263A0 802430E0 AC620000 */ sw $v0, ($v1) +/* 8263A4 802430E4 2463FFFC */ addiu $v1, $v1, -4 +/* 8263A8 802430E8 2484FFFF */ addiu $a0, $a0, -1 +/* 8263AC 802430EC 0481FFFC */ bgez $a0, .L802430E0 +/* 8263B0 802430F0 2442FFFF */ addiu $v0, $v0, -1 +/* 8263B4 802430F4 3C018025 */ lui $at, 0x8025 +/* 8263B8 802430F8 AC20EA14 */ sw $zero, -0x15ec($at) +/* 8263BC 802430FC 03E00008 */ jr $ra +/* 8263C0 80243100 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4.s deleted file mode 100644 index 4affccbb8b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431F4 -/* 8264B4 802431F4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8264B8 802431F8 AFB1001C */ sw $s1, 0x1c($sp) -/* 8264BC 802431FC 0080882D */ daddu $s1, $a0, $zero -/* 8264C0 80243200 AFBF0034 */ sw $ra, 0x34($sp) -/* 8264C4 80243204 AFB60030 */ sw $s6, 0x30($sp) -/* 8264C8 80243208 AFB5002C */ sw $s5, 0x2c($sp) -/* 8264CC 8024320C AFB40028 */ sw $s4, 0x28($sp) -/* 8264D0 80243210 AFB30024 */ sw $s3, 0x24($sp) -/* 8264D4 80243214 AFB20020 */ sw $s2, 0x20($sp) -/* 8264D8 80243218 AFB00018 */ sw $s0, 0x18($sp) -/* 8264DC 8024321C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8264E0 80243220 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8264E4 80243224 8E30000C */ lw $s0, 0xc($s1) -/* 8264E8 80243228 8E160000 */ lw $s6, ($s0) -/* 8264EC 8024322C 26100004 */ addiu $s0, $s0, 4 -/* 8264F0 80243230 0C0B1EAF */ jal get_variable -/* 8264F4 80243234 02C0282D */ daddu $a1, $s6, $zero -/* 8264F8 80243238 44820000 */ mtc1 $v0, $f0 -/* 8264FC 8024323C 00000000 */ nop -/* 826500 80243240 46800020 */ cvt.s.w $f0, $f0 -/* 826504 80243244 E7A00010 */ swc1 $f0, 0x10($sp) -/* 826508 80243248 8E140000 */ lw $s4, ($s0) -/* 82650C 8024324C 26100004 */ addiu $s0, $s0, 4 -/* 826510 80243250 0220202D */ daddu $a0, $s1, $zero -/* 826514 80243254 0C0B1EAF */ jal get_variable -/* 826518 80243258 0280282D */ daddu $a1, $s4, $zero -/* 82651C 8024325C 0220202D */ daddu $a0, $s1, $zero -/* 826520 80243260 8E150000 */ lw $s5, ($s0) -/* 826524 80243264 4482B000 */ mtc1 $v0, $f22 -/* 826528 80243268 00000000 */ nop -/* 82652C 8024326C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 826530 80243270 0C0B1EAF */ jal get_variable -/* 826534 80243274 02A0282D */ daddu $a1, $s5, $zero -/* 826538 80243278 2404FFFC */ addiu $a0, $zero, -4 -/* 82653C 8024327C 44820000 */ mtc1 $v0, $f0 -/* 826540 80243280 00000000 */ nop -/* 826544 80243284 46800020 */ cvt.s.w $f0, $f0 -/* 826548 80243288 0C00EABB */ jal get_npc_unsafe -/* 82654C 8024328C E7A00014 */ swc1 $f0, 0x14($sp) -/* 826550 80243290 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 826554 80243294 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 826558 80243298 3C014334 */ lui $at, 0x4334 -/* 82655C 8024329C 44816000 */ mtc1 $at, $f12 -/* 826560 802432A0 00041880 */ sll $v1, $a0, 2 -/* 826564 802432A4 00641821 */ addu $v1, $v1, $a0 -/* 826568 802432A8 00031880 */ sll $v1, $v1, 2 -/* 82656C 802432AC 00641823 */ subu $v1, $v1, $a0 -/* 826570 802432B0 000320C0 */ sll $a0, $v1, 3 -/* 826574 802432B4 00641821 */ addu $v1, $v1, $a0 -/* 826578 802432B8 000318C0 */ sll $v1, $v1, 3 -/* 82657C 802432BC 3C01800B */ lui $at, 0x800b -/* 826580 802432C0 00230821 */ addu $at, $at, $v1 -/* 826584 802432C4 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 826588 802432C8 460C0300 */ add.s $f12, $f0, $f12 -/* 82658C 802432CC 0C00A6C9 */ jal clamp_angle -/* 826590 802432D0 0040982D */ daddu $s3, $v0, $zero -/* 826594 802432D4 27B00010 */ addiu $s0, $sp, 0x10 -/* 826598 802432D8 0200202D */ daddu $a0, $s0, $zero -/* 82659C 802432DC 27B20014 */ addiu $s2, $sp, 0x14 -/* 8265A0 802432E0 0240282D */ daddu $a1, $s2, $zero -/* 8265A4 802432E4 3C064170 */ lui $a2, 0x4170 -/* 8265A8 802432E8 8E67000C */ lw $a3, 0xc($s3) -/* 8265AC 802432EC 0C00A7E7 */ jal add_vec2D_polar -/* 8265B0 802432F0 46000506 */ mov.s $f20, $f0 -/* 8265B4 802432F4 0200202D */ daddu $a0, $s0, $zero -/* 8265B8 802432F8 3C064120 */ lui $a2, 0x4120 -/* 8265BC 802432FC 4407A000 */ mfc1 $a3, $f20 -/* 8265C0 80243300 0C00A7E7 */ jal add_vec2D_polar -/* 8265C4 80243304 0240282D */ daddu $a1, $s2, $zero -/* 8265C8 80243308 0220202D */ daddu $a0, $s1, $zero -/* 8265CC 8024330C C7A00010 */ lwc1 $f0, 0x10($sp) -/* 8265D0 80243310 4600008D */ trunc.w.s $f2, $f0 -/* 8265D4 80243314 44061000 */ mfc1 $a2, $f2 -/* 8265D8 80243318 0C0B2026 */ jal set_variable -/* 8265DC 8024331C 02C0282D */ daddu $a1, $s6, $zero -/* 8265E0 80243320 0220202D */ daddu $a0, $s1, $zero -/* 8265E4 80243324 4600B08D */ trunc.w.s $f2, $f22 -/* 8265E8 80243328 44061000 */ mfc1 $a2, $f2 -/* 8265EC 8024332C 0C0B2026 */ jal set_variable -/* 8265F0 80243330 0280282D */ daddu $a1, $s4, $zero -/* 8265F4 80243334 0220202D */ daddu $a0, $s1, $zero -/* 8265F8 80243338 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 8265FC 8024333C 4600008D */ trunc.w.s $f2, $f0 -/* 826600 80243340 44061000 */ mfc1 $a2, $f2 -/* 826604 80243344 0C0B2026 */ jal set_variable -/* 826608 80243348 02A0282D */ daddu $a1, $s5, $zero -/* 82660C 8024334C 8FBF0034 */ lw $ra, 0x34($sp) -/* 826610 80243350 8FB60030 */ lw $s6, 0x30($sp) -/* 826614 80243354 8FB5002C */ lw $s5, 0x2c($sp) -/* 826618 80243358 8FB40028 */ lw $s4, 0x28($sp) -/* 82661C 8024335C 8FB30024 */ lw $s3, 0x24($sp) -/* 826620 80243360 8FB20020 */ lw $s2, 0x20($sp) -/* 826624 80243364 8FB1001C */ lw $s1, 0x1c($sp) -/* 826628 80243368 8FB00018 */ lw $s0, 0x18($sp) -/* 82662C 8024336C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 826630 80243370 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 826634 80243374 24020002 */ addiu $v0, $zero, 2 -/* 826638 80243378 03E00008 */ jr $ra -/* 82663C 8024337C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4_8264B4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4_8264B4.s new file mode 100644 index 0000000000..794c4a7964 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802431F4_8264B4.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802431F4_8264B4 +/* 8264B4 802431F4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8264B8 802431F8 AFB1001C */ sw $s1, 0x1c($sp) +/* 8264BC 802431FC 0080882D */ daddu $s1, $a0, $zero +/* 8264C0 80243200 AFBF0034 */ sw $ra, 0x34($sp) +/* 8264C4 80243204 AFB60030 */ sw $s6, 0x30($sp) +/* 8264C8 80243208 AFB5002C */ sw $s5, 0x2c($sp) +/* 8264CC 8024320C AFB40028 */ sw $s4, 0x28($sp) +/* 8264D0 80243210 AFB30024 */ sw $s3, 0x24($sp) +/* 8264D4 80243214 AFB20020 */ sw $s2, 0x20($sp) +/* 8264D8 80243218 AFB00018 */ sw $s0, 0x18($sp) +/* 8264DC 8024321C F7B60040 */ sdc1 $f22, 0x40($sp) +/* 8264E0 80243220 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 8264E4 80243224 8E30000C */ lw $s0, 0xc($s1) +/* 8264E8 80243228 8E160000 */ lw $s6, ($s0) +/* 8264EC 8024322C 26100004 */ addiu $s0, $s0, 4 +/* 8264F0 80243230 0C0B1EAF */ jal get_variable +/* 8264F4 80243234 02C0282D */ daddu $a1, $s6, $zero +/* 8264F8 80243238 44820000 */ mtc1 $v0, $f0 +/* 8264FC 8024323C 00000000 */ nop +/* 826500 80243240 46800020 */ cvt.s.w $f0, $f0 +/* 826504 80243244 E7A00010 */ swc1 $f0, 0x10($sp) +/* 826508 80243248 8E140000 */ lw $s4, ($s0) +/* 82650C 8024324C 26100004 */ addiu $s0, $s0, 4 +/* 826510 80243250 0220202D */ daddu $a0, $s1, $zero +/* 826514 80243254 0C0B1EAF */ jal get_variable +/* 826518 80243258 0280282D */ daddu $a1, $s4, $zero +/* 82651C 8024325C 0220202D */ daddu $a0, $s1, $zero +/* 826520 80243260 8E150000 */ lw $s5, ($s0) +/* 826524 80243264 4482B000 */ mtc1 $v0, $f22 +/* 826528 80243268 00000000 */ nop +/* 82652C 8024326C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 826530 80243270 0C0B1EAF */ jal get_variable +/* 826534 80243274 02A0282D */ daddu $a1, $s5, $zero +/* 826538 80243278 2404FFFC */ addiu $a0, $zero, -4 +/* 82653C 8024327C 44820000 */ mtc1 $v0, $f0 +/* 826540 80243280 00000000 */ nop +/* 826544 80243284 46800020 */ cvt.s.w $f0, $f0 +/* 826548 80243288 0C00EABB */ jal get_npc_unsafe +/* 82654C 8024328C E7A00014 */ swc1 $f0, 0x14($sp) +/* 826550 80243290 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 826554 80243294 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 826558 80243298 3C014334 */ lui $at, 0x4334 +/* 82655C 8024329C 44816000 */ mtc1 $at, $f12 +/* 826560 802432A0 00041880 */ sll $v1, $a0, 2 +/* 826564 802432A4 00641821 */ addu $v1, $v1, $a0 +/* 826568 802432A8 00031880 */ sll $v1, $v1, 2 +/* 82656C 802432AC 00641823 */ subu $v1, $v1, $a0 +/* 826570 802432B0 000320C0 */ sll $a0, $v1, 3 +/* 826574 802432B4 00641821 */ addu $v1, $v1, $a0 +/* 826578 802432B8 000318C0 */ sll $v1, $v1, 3 +/* 82657C 802432BC 3C01800B */ lui $at, 0x800b +/* 826580 802432C0 00230821 */ addu $at, $at, $v1 +/* 826584 802432C4 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 826588 802432C8 460C0300 */ add.s $f12, $f0, $f12 +/* 82658C 802432CC 0C00A6C9 */ jal clamp_angle +/* 826590 802432D0 0040982D */ daddu $s3, $v0, $zero +/* 826594 802432D4 27B00010 */ addiu $s0, $sp, 0x10 +/* 826598 802432D8 0200202D */ daddu $a0, $s0, $zero +/* 82659C 802432DC 27B20014 */ addiu $s2, $sp, 0x14 +/* 8265A0 802432E0 0240282D */ daddu $a1, $s2, $zero +/* 8265A4 802432E4 3C064170 */ lui $a2, 0x4170 +/* 8265A8 802432E8 8E67000C */ lw $a3, 0xc($s3) +/* 8265AC 802432EC 0C00A7E7 */ jal add_vec2D_polar +/* 8265B0 802432F0 46000506 */ mov.s $f20, $f0 +/* 8265B4 802432F4 0200202D */ daddu $a0, $s0, $zero +/* 8265B8 802432F8 3C064120 */ lui $a2, 0x4120 +/* 8265BC 802432FC 4407A000 */ mfc1 $a3, $f20 +/* 8265C0 80243300 0C00A7E7 */ jal add_vec2D_polar +/* 8265C4 80243304 0240282D */ daddu $a1, $s2, $zero +/* 8265C8 80243308 0220202D */ daddu $a0, $s1, $zero +/* 8265CC 8024330C C7A00010 */ lwc1 $f0, 0x10($sp) +/* 8265D0 80243310 4600008D */ trunc.w.s $f2, $f0 +/* 8265D4 80243314 44061000 */ mfc1 $a2, $f2 +/* 8265D8 80243318 0C0B2026 */ jal set_variable +/* 8265DC 8024331C 02C0282D */ daddu $a1, $s6, $zero +/* 8265E0 80243320 0220202D */ daddu $a0, $s1, $zero +/* 8265E4 80243324 4600B08D */ trunc.w.s $f2, $f22 +/* 8265E8 80243328 44061000 */ mfc1 $a2, $f2 +/* 8265EC 8024332C 0C0B2026 */ jal set_variable +/* 8265F0 80243330 0280282D */ daddu $a1, $s4, $zero +/* 8265F4 80243334 0220202D */ daddu $a0, $s1, $zero +/* 8265F8 80243338 C7A00014 */ lwc1 $f0, 0x14($sp) +/* 8265FC 8024333C 4600008D */ trunc.w.s $f2, $f0 +/* 826600 80243340 44061000 */ mfc1 $a2, $f2 +/* 826604 80243344 0C0B2026 */ jal set_variable +/* 826608 80243348 02A0282D */ daddu $a1, $s5, $zero +/* 82660C 8024334C 8FBF0034 */ lw $ra, 0x34($sp) +/* 826610 80243350 8FB60030 */ lw $s6, 0x30($sp) +/* 826614 80243354 8FB5002C */ lw $s5, 0x2c($sp) +/* 826618 80243358 8FB40028 */ lw $s4, 0x28($sp) +/* 82661C 8024335C 8FB30024 */ lw $s3, 0x24($sp) +/* 826620 80243360 8FB20020 */ lw $s2, 0x20($sp) +/* 826624 80243364 8FB1001C */ lw $s1, 0x1c($sp) +/* 826628 80243368 8FB00018 */ lw $s0, 0x18($sp) +/* 82662C 8024336C D7B60040 */ ldc1 $f22, 0x40($sp) +/* 826630 80243370 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 826634 80243374 24020002 */ addiu $v0, $zero, 2 +/* 826638 80243378 03E00008 */ jr $ra +/* 82663C 8024337C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4.s deleted file mode 100644 index 61230fb7aa..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433C4 -/* 826684 802433C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 826688 802433C8 AFBF0010 */ sw $ra, 0x10($sp) -/* 82668C 802433CC 0C00EABB */ jal get_npc_unsafe -/* 826690 802433D0 8C84008C */ lw $a0, 0x8c($a0) -/* 826694 802433D4 3C038025 */ lui $v1, 0x8025 -/* 826698 802433D8 8C63EA18 */ lw $v1, -0x15e8($v1) -/* 82669C 802433DC AC430028 */ sw $v1, 0x28($v0) -/* 8266A0 802433E0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8266A4 802433E4 24020002 */ addiu $v0, $zero, 2 -/* 8266A8 802433E8 03E00008 */ jr $ra -/* 8266AC 802433EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s new file mode 100644 index 0000000000..349a9f113b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433C4_826684.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802433C4_826684 +/* 826684 802433C4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 826688 802433C8 AFBF0010 */ sw $ra, 0x10($sp) +/* 82668C 802433CC 0C00EABB */ jal get_npc_unsafe +/* 826690 802433D0 8C84008C */ lw $a0, 0x8c($a0) +/* 826694 802433D4 3C038025 */ lui $v1, 0x8025 +/* 826698 802433D8 8C63EA18 */ lw $v1, -0x15e8($v1) +/* 82669C 802433DC AC430028 */ sw $v1, 0x28($v0) +/* 8266A0 802433E0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8266A4 802433E4 24020002 */ addiu $v0, $zero, 2 +/* 8266A8 802433E8 03E00008 */ jr $ra +/* 8266AC 802433EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0.s deleted file mode 100644 index 6f08051143..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433F0 -/* 8266B0 802433F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8266B4 802433F4 AFB00010 */ sw $s0, 0x10($sp) -/* 8266B8 802433F8 0080802D */ daddu $s0, $a0, $zero -/* 8266BC 802433FC AFB20018 */ sw $s2, 0x18($sp) -/* 8266C0 80243400 AFBF001C */ sw $ra, 0x1c($sp) -/* 8266C4 80243404 AFB10014 */ sw $s1, 0x14($sp) -/* 8266C8 80243408 8E02000C */ lw $v0, 0xc($s0) -/* 8266CC 8024340C 10A00008 */ beqz $a1, .L80243430 -/* 8266D0 80243410 0000902D */ daddu $s2, $zero, $zero -/* 8266D4 80243414 8C450000 */ lw $a1, ($v0) -/* 8266D8 80243418 0C0B1EAF */ jal get_variable -/* 8266DC 8024341C 00000000 */ nop -/* 8266E0 80243420 AE020070 */ sw $v0, 0x70($s0) -/* 8266E4 80243424 AE000074 */ sw $zero, 0x74($s0) -/* 8266E8 80243428 8C420014 */ lw $v0, 0x14($v0) -/* 8266EC 8024342C AE020078 */ sw $v0, 0x78($s0) -.L80243430: -/* 8266F0 80243430 8E050078 */ lw $a1, 0x78($s0) -/* 8266F4 80243434 8E110070 */ lw $s1, 0x70($s0) -/* 8266F8 80243438 0C0B1EAF */ jal get_variable -/* 8266FC 8024343C 0200202D */ daddu $a0, $s0, $zero -/* 826700 80243440 10400006 */ beqz $v0, .L8024345C -/* 826704 80243444 24030002 */ addiu $v1, $zero, 2 -/* 826708 80243448 8E020074 */ lw $v0, 0x74($s0) -/* 82670C 8024344C 10430027 */ beq $v0, $v1, .L802434EC -/* 826710 80243450 00000000 */ nop -/* 826714 80243454 08090D3A */ j .L802434E8 -/* 826718 80243458 AE030074 */ sw $v1, 0x74($s0) -.L8024345C: -/* 82671C 8024345C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 826720 80243460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 826724 80243464 8E260000 */ lw $a2, ($s1) -/* 826728 80243468 8E270004 */ lw $a3, 4($s1) -/* 82672C 8024346C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 826730 80243470 0C00A7B5 */ jal dist2D -/* 826734 80243474 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 826738 80243478 8E030074 */ lw $v1, 0x74($s0) -/* 82673C 8024347C 24040001 */ addiu $a0, $zero, 1 -/* 826740 80243480 10640013 */ beq $v1, $a0, .L802434D0 -/* 826744 80243484 46000086 */ mov.s $f2, $f0 -/* 826748 80243488 28620002 */ slti $v0, $v1, 2 -/* 82674C 8024348C 50400005 */ beql $v0, $zero, .L802434A4 -/* 826750 80243490 24020002 */ addiu $v0, $zero, 2 -/* 826754 80243494 10600007 */ beqz $v1, .L802434B4 -/* 826758 80243498 00000000 */ nop -/* 82675C 8024349C 08090D3B */ j .L802434EC -/* 826760 802434A0 00000000 */ nop -.L802434A4: -/* 826764 802434A4 50620010 */ beql $v1, $v0, .L802434E8 -/* 826768 802434A8 AE040074 */ sw $a0, 0x74($s0) -/* 82676C 802434AC 08090D3B */ j .L802434EC -/* 826770 802434B0 00000000 */ nop -.L802434B4: -/* 826774 802434B4 C6200008 */ lwc1 $f0, 8($s1) -/* 826778 802434B8 4600103C */ c.lt.s $f2, $f0 -/* 82677C 802434BC 00000000 */ nop -/* 826780 802434C0 4500000A */ bc1f .L802434EC -/* 826784 802434C4 00000000 */ nop -/* 826788 802434C8 08090D3A */ j .L802434E8 -/* 82678C 802434CC AE040074 */ sw $a0, 0x74($s0) -.L802434D0: -/* 826790 802434D0 C620000C */ lwc1 $f0, 0xc($s1) -/* 826794 802434D4 4602003C */ c.lt.s $f0, $f2 -/* 826798 802434D8 00000000 */ nop -/* 82679C 802434DC 45000003 */ bc1f .L802434EC -/* 8267A0 802434E0 00000000 */ nop -/* 8267A4 802434E4 AE000074 */ sw $zero, 0x74($s0) -.L802434E8: -/* 8267A8 802434E8 24120001 */ addiu $s2, $zero, 1 -.L802434EC: -/* 8267AC 802434EC 12400005 */ beqz $s2, .L80243504 -/* 8267B0 802434F0 00000000 */ nop -/* 8267B4 802434F4 8E250010 */ lw $a1, 0x10($s1) -/* 8267B8 802434F8 86060076 */ lh $a2, 0x76($s0) -/* 8267BC 802434FC 0C052A95 */ jal func_8014AA54 -/* 8267C0 80243500 0000202D */ daddu $a0, $zero, $zero -.L80243504: -/* 8267C4 80243504 8FBF001C */ lw $ra, 0x1c($sp) -/* 8267C8 80243508 8FB20018 */ lw $s2, 0x18($sp) -/* 8267CC 8024350C 8FB10014 */ lw $s1, 0x14($sp) -/* 8267D0 80243510 8FB00010 */ lw $s0, 0x10($sp) -/* 8267D4 80243514 0000102D */ daddu $v0, $zero, $zero -/* 8267D8 80243518 03E00008 */ jr $ra -/* 8267DC 8024351C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s new file mode 100644 index 0000000000..81488fff85 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802433F0_8266B0.s @@ -0,0 +1,88 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802433F0_8266B0 +/* 8266B0 802433F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8266B4 802433F4 AFB00010 */ sw $s0, 0x10($sp) +/* 8266B8 802433F8 0080802D */ daddu $s0, $a0, $zero +/* 8266BC 802433FC AFB20018 */ sw $s2, 0x18($sp) +/* 8266C0 80243400 AFBF001C */ sw $ra, 0x1c($sp) +/* 8266C4 80243404 AFB10014 */ sw $s1, 0x14($sp) +/* 8266C8 80243408 8E02000C */ lw $v0, 0xc($s0) +/* 8266CC 8024340C 10A00008 */ beqz $a1, .L80243430 +/* 8266D0 80243410 0000902D */ daddu $s2, $zero, $zero +/* 8266D4 80243414 8C450000 */ lw $a1, ($v0) +/* 8266D8 80243418 0C0B1EAF */ jal get_variable +/* 8266DC 8024341C 00000000 */ nop +/* 8266E0 80243420 AE020070 */ sw $v0, 0x70($s0) +/* 8266E4 80243424 AE000074 */ sw $zero, 0x74($s0) +/* 8266E8 80243428 8C420014 */ lw $v0, 0x14($v0) +/* 8266EC 8024342C AE020078 */ sw $v0, 0x78($s0) +.L80243430: +/* 8266F0 80243430 8E050078 */ lw $a1, 0x78($s0) +/* 8266F4 80243434 8E110070 */ lw $s1, 0x70($s0) +/* 8266F8 80243438 0C0B1EAF */ jal get_variable +/* 8266FC 8024343C 0200202D */ daddu $a0, $s0, $zero +/* 826700 80243440 10400006 */ beqz $v0, .L8024345C +/* 826704 80243444 24030002 */ addiu $v1, $zero, 2 +/* 826708 80243448 8E020074 */ lw $v0, 0x74($s0) +/* 82670C 8024344C 10430027 */ beq $v0, $v1, .L802434EC +/* 826710 80243450 00000000 */ nop +/* 826714 80243454 08090D3A */ j .L802434E8 +/* 826718 80243458 AE030074 */ sw $v1, 0x74($s0) +.L8024345C: +/* 82671C 8024345C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 826720 80243460 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 826724 80243464 8E260000 */ lw $a2, ($s1) +/* 826728 80243468 8E270004 */ lw $a3, 4($s1) +/* 82672C 8024346C C44C0028 */ lwc1 $f12, 0x28($v0) +/* 826730 80243470 0C00A7B5 */ jal dist2D +/* 826734 80243474 C44E0030 */ lwc1 $f14, 0x30($v0) +/* 826738 80243478 8E030074 */ lw $v1, 0x74($s0) +/* 82673C 8024347C 24040001 */ addiu $a0, $zero, 1 +/* 826740 80243480 10640013 */ beq $v1, $a0, .L802434D0 +/* 826744 80243484 46000086 */ mov.s $f2, $f0 +/* 826748 80243488 28620002 */ slti $v0, $v1, 2 +/* 82674C 8024348C 50400005 */ beql $v0, $zero, .L802434A4 +/* 826750 80243490 24020002 */ addiu $v0, $zero, 2 +/* 826754 80243494 10600007 */ beqz $v1, .L802434B4 +/* 826758 80243498 00000000 */ nop +/* 82675C 8024349C 08090D3B */ j .L802434EC +/* 826760 802434A0 00000000 */ nop +.L802434A4: +/* 826764 802434A4 50620010 */ beql $v1, $v0, .L802434E8 +/* 826768 802434A8 AE040074 */ sw $a0, 0x74($s0) +/* 82676C 802434AC 08090D3B */ j .L802434EC +/* 826770 802434B0 00000000 */ nop +.L802434B4: +/* 826774 802434B4 C6200008 */ lwc1 $f0, 8($s1) +/* 826778 802434B8 4600103C */ c.lt.s $f2, $f0 +/* 82677C 802434BC 00000000 */ nop +/* 826780 802434C0 4500000A */ bc1f .L802434EC +/* 826784 802434C4 00000000 */ nop +/* 826788 802434C8 08090D3A */ j .L802434E8 +/* 82678C 802434CC AE040074 */ sw $a0, 0x74($s0) +.L802434D0: +/* 826790 802434D0 C620000C */ lwc1 $f0, 0xc($s1) +/* 826794 802434D4 4602003C */ c.lt.s $f0, $f2 +/* 826798 802434D8 00000000 */ nop +/* 82679C 802434DC 45000003 */ bc1f .L802434EC +/* 8267A0 802434E0 00000000 */ nop +/* 8267A4 802434E4 AE000074 */ sw $zero, 0x74($s0) +.L802434E8: +/* 8267A8 802434E8 24120001 */ addiu $s2, $zero, 1 +.L802434EC: +/* 8267AC 802434EC 12400005 */ beqz $s2, .L80243504 +/* 8267B0 802434F0 00000000 */ nop +/* 8267B4 802434F4 8E250010 */ lw $a1, 0x10($s1) +/* 8267B8 802434F8 86060076 */ lh $a2, 0x76($s0) +/* 8267BC 802434FC 0C052A95 */ jal func_8014AA54 +/* 8267C0 80243500 0000202D */ daddu $a0, $zero, $zero +.L80243504: +/* 8267C4 80243504 8FBF001C */ lw $ra, 0x1c($sp) +/* 8267C8 80243508 8FB20018 */ lw $s2, 0x18($sp) +/* 8267CC 8024350C 8FB10014 */ lw $s1, 0x14($sp) +/* 8267D0 80243510 8FB00010 */ lw $s0, 0x10($sp) +/* 8267D4 80243514 0000102D */ daddu $v0, $zero, $zero +/* 8267D8 80243518 03E00008 */ jr $ra +/* 8267DC 8024351C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320.s deleted file mode 100644 index 1f6e628453..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320.s +++ /dev/null @@ -1,105 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320 -/* 831B20 80240320 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 831B24 80240324 AFB20018 */ sw $s2, 0x18($sp) -/* 831B28 80240328 0080902D */ daddu $s2, $a0, $zero -/* 831B2C 8024032C AFBF0028 */ sw $ra, 0x28($sp) -/* 831B30 80240330 AFB50024 */ sw $s5, 0x24($sp) -/* 831B34 80240334 AFB40020 */ sw $s4, 0x20($sp) -/* 831B38 80240338 AFB3001C */ sw $s3, 0x1c($sp) -/* 831B3C 8024033C AFB10014 */ sw $s1, 0x14($sp) -/* 831B40 80240340 AFB00010 */ sw $s0, 0x10($sp) -/* 831B44 80240344 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 831B48 80240348 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 831B4C 8024034C F7B40030 */ sdc1 $f20, 0x30($sp) -/* 831B50 80240350 8E50000C */ lw $s0, 0xc($s2) -/* 831B54 80240354 8E140000 */ lw $s4, ($s0) -/* 831B58 80240358 26100004 */ addiu $s0, $s0, 4 -/* 831B5C 8024035C 0C0B1EAF */ jal get_variable -/* 831B60 80240360 0280282D */ daddu $a1, $s4, $zero -/* 831B64 80240364 0040982D */ daddu $s3, $v0, $zero -/* 831B68 80240368 8E150000 */ lw $s5, ($s0) -/* 831B6C 8024036C 26100004 */ addiu $s0, $s0, 4 -/* 831B70 80240370 8E050000 */ lw $a1, ($s0) -/* 831B74 80240374 26100004 */ addiu $s0, $s0, 4 -/* 831B78 80240378 0C0B210B */ jal get_float_variable -/* 831B7C 8024037C 0240202D */ daddu $a0, $s2, $zero -/* 831B80 80240380 8E050000 */ lw $a1, ($s0) -/* 831B84 80240384 26100004 */ addiu $s0, $s0, 4 -/* 831B88 80240388 0240202D */ daddu $a0, $s2, $zero -/* 831B8C 8024038C 0C0B210B */ jal get_float_variable -/* 831B90 80240390 46000606 */ mov.s $f24, $f0 -/* 831B94 80240394 8E050000 */ lw $a1, ($s0) -/* 831B98 80240398 26100004 */ addiu $s0, $s0, 4 -/* 831B9C 8024039C 0240202D */ daddu $a0, $s2, $zero -/* 831BA0 802403A0 0C0B1EAF */ jal get_variable -/* 831BA4 802403A4 46000506 */ mov.s $f20, $f0 -/* 831BA8 802403A8 8E050000 */ lw $a1, ($s0) -/* 831BAC 802403AC 26100004 */ addiu $s0, $s0, 4 -/* 831BB0 802403B0 0240202D */ daddu $a0, $s2, $zero -/* 831BB4 802403B4 0C0B1EAF */ jal get_variable -/* 831BB8 802403B8 0040882D */ daddu $s1, $v0, $zero -/* 831BBC 802403BC 0240202D */ daddu $a0, $s2, $zero -/* 831BC0 802403C0 8E050000 */ lw $a1, ($s0) -/* 831BC4 802403C4 0C0B210B */ jal get_float_variable -/* 831BC8 802403C8 0040802D */ daddu $s0, $v0, $zero -/* 831BCC 802403CC 3C014334 */ lui $at, 0x4334 -/* 831BD0 802403D0 44811000 */ mtc1 $at, $f2 -/* 831BD4 802403D4 3C014049 */ lui $at, 0x4049 -/* 831BD8 802403D8 34210FD8 */ ori $at, $at, 0xfd8 -/* 831BDC 802403DC 44812000 */ mtc1 $at, $f4 -/* 831BE0 802403E0 46020003 */ div.s $f0, $f0, $f2 -/* 831BE4 802403E4 46040582 */ mul.s $f22, $f0, $f4 -/* 831BE8 802403E8 00000000 */ nop -/* 831BEC 802403EC 4618A501 */ sub.s $f20, $f20, $f24 -/* 831BF0 802403F0 3C013F00 */ lui $at, 0x3f00 -/* 831BF4 802403F4 44810000 */ mtc1 $at, $f0 -/* 831BF8 802403F8 00000000 */ nop -/* 831BFC 802403FC 4600A502 */ mul.s $f20, $f20, $f0 -/* 831C00 80240400 00000000 */ nop -/* 831C04 80240404 12000007 */ beqz $s0, .L80240424 -/* 831C08 80240408 0233102A */ slt $v0, $s1, $s3 -/* 831C0C 8024040C 10400005 */ beqz $v0, .L80240424 -/* 831C10 80240410 0240202D */ daddu $a0, $s2, $zero -/* 831C14 80240414 0220982D */ daddu $s3, $s1, $zero -/* 831C18 80240418 0280282D */ daddu $a1, $s4, $zero -/* 831C1C 8024041C 0C0B2026 */ jal set_variable -/* 831C20 80240420 0220302D */ daddu $a2, $s1, $zero -.L80240424: -/* 831C24 80240424 3C014049 */ lui $at, 0x4049 -/* 831C28 80240428 34210FD8 */ ori $at, $at, 0xfd8 -/* 831C2C 8024042C 44810000 */ mtc1 $at, $f0 -/* 831C30 80240430 44936000 */ mtc1 $s3, $f12 -/* 831C34 80240434 00000000 */ nop -/* 831C38 80240438 46806320 */ cvt.s.w $f12, $f12 -/* 831C3C 8024043C 46006302 */ mul.s $f12, $f12, $f0 -/* 831C40 80240440 00000000 */ nop -/* 831C44 80240444 44910000 */ mtc1 $s1, $f0 -/* 831C48 80240448 00000000 */ nop -/* 831C4C 8024044C 46800020 */ cvt.s.w $f0, $f0 -/* 831C50 80240450 46006303 */ div.s $f12, $f12, $f0 -/* 831C54 80240454 0C00A874 */ jal cos_rad -/* 831C58 80240458 46166300 */ add.s $f12, $f12, $f22 -/* 831C5C 8024045C 4600A002 */ mul.s $f0, $f20, $f0 -/* 831C60 80240460 00000000 */ nop -/* 831C64 80240464 4614C080 */ add.s $f2, $f24, $f20 -/* 831C68 80240468 46001081 */ sub.s $f2, $f2, $f0 -/* 831C6C 8024046C 0240202D */ daddu $a0, $s2, $zero -/* 831C70 80240470 44061000 */ mfc1 $a2, $f2 -/* 831C74 80240474 0C0B2190 */ jal set_float_variable -/* 831C78 80240478 02A0282D */ daddu $a1, $s5, $zero -/* 831C7C 8024047C 8FBF0028 */ lw $ra, 0x28($sp) -/* 831C80 80240480 8FB50024 */ lw $s5, 0x24($sp) -/* 831C84 80240484 8FB40020 */ lw $s4, 0x20($sp) -/* 831C88 80240488 8FB3001C */ lw $s3, 0x1c($sp) -/* 831C8C 8024048C 8FB20018 */ lw $s2, 0x18($sp) -/* 831C90 80240490 8FB10014 */ lw $s1, 0x14($sp) -/* 831C94 80240494 8FB00010 */ lw $s0, 0x10($sp) -/* 831C98 80240498 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 831C9C 8024049C D7B60038 */ ldc1 $f22, 0x38($sp) -/* 831CA0 802404A0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 831CA4 802404A4 24020002 */ addiu $v0, $zero, 2 -/* 831CA8 802404A8 03E00008 */ jr $ra -/* 831CAC 802404AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320_831B20.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320_831B20.s new file mode 100644 index 0000000000..4c8d50ada9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240320_831B20.s @@ -0,0 +1,105 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240320_831B20 +/* 831B20 80240320 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 831B24 80240324 AFB20018 */ sw $s2, 0x18($sp) +/* 831B28 80240328 0080902D */ daddu $s2, $a0, $zero +/* 831B2C 8024032C AFBF0028 */ sw $ra, 0x28($sp) +/* 831B30 80240330 AFB50024 */ sw $s5, 0x24($sp) +/* 831B34 80240334 AFB40020 */ sw $s4, 0x20($sp) +/* 831B38 80240338 AFB3001C */ sw $s3, 0x1c($sp) +/* 831B3C 8024033C AFB10014 */ sw $s1, 0x14($sp) +/* 831B40 80240340 AFB00010 */ sw $s0, 0x10($sp) +/* 831B44 80240344 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 831B48 80240348 F7B60038 */ sdc1 $f22, 0x38($sp) +/* 831B4C 8024034C F7B40030 */ sdc1 $f20, 0x30($sp) +/* 831B50 80240350 8E50000C */ lw $s0, 0xc($s2) +/* 831B54 80240354 8E140000 */ lw $s4, ($s0) +/* 831B58 80240358 26100004 */ addiu $s0, $s0, 4 +/* 831B5C 8024035C 0C0B1EAF */ jal get_variable +/* 831B60 80240360 0280282D */ daddu $a1, $s4, $zero +/* 831B64 80240364 0040982D */ daddu $s3, $v0, $zero +/* 831B68 80240368 8E150000 */ lw $s5, ($s0) +/* 831B6C 8024036C 26100004 */ addiu $s0, $s0, 4 +/* 831B70 80240370 8E050000 */ lw $a1, ($s0) +/* 831B74 80240374 26100004 */ addiu $s0, $s0, 4 +/* 831B78 80240378 0C0B210B */ jal get_float_variable +/* 831B7C 8024037C 0240202D */ daddu $a0, $s2, $zero +/* 831B80 80240380 8E050000 */ lw $a1, ($s0) +/* 831B84 80240384 26100004 */ addiu $s0, $s0, 4 +/* 831B88 80240388 0240202D */ daddu $a0, $s2, $zero +/* 831B8C 8024038C 0C0B210B */ jal get_float_variable +/* 831B90 80240390 46000606 */ mov.s $f24, $f0 +/* 831B94 80240394 8E050000 */ lw $a1, ($s0) +/* 831B98 80240398 26100004 */ addiu $s0, $s0, 4 +/* 831B9C 8024039C 0240202D */ daddu $a0, $s2, $zero +/* 831BA0 802403A0 0C0B1EAF */ jal get_variable +/* 831BA4 802403A4 46000506 */ mov.s $f20, $f0 +/* 831BA8 802403A8 8E050000 */ lw $a1, ($s0) +/* 831BAC 802403AC 26100004 */ addiu $s0, $s0, 4 +/* 831BB0 802403B0 0240202D */ daddu $a0, $s2, $zero +/* 831BB4 802403B4 0C0B1EAF */ jal get_variable +/* 831BB8 802403B8 0040882D */ daddu $s1, $v0, $zero +/* 831BBC 802403BC 0240202D */ daddu $a0, $s2, $zero +/* 831BC0 802403C0 8E050000 */ lw $a1, ($s0) +/* 831BC4 802403C4 0C0B210B */ jal get_float_variable +/* 831BC8 802403C8 0040802D */ daddu $s0, $v0, $zero +/* 831BCC 802403CC 3C014334 */ lui $at, 0x4334 +/* 831BD0 802403D0 44811000 */ mtc1 $at, $f2 +/* 831BD4 802403D4 3C014049 */ lui $at, 0x4049 +/* 831BD8 802403D8 34210FD8 */ ori $at, $at, 0xfd8 +/* 831BDC 802403DC 44812000 */ mtc1 $at, $f4 +/* 831BE0 802403E0 46020003 */ div.s $f0, $f0, $f2 +/* 831BE4 802403E4 46040582 */ mul.s $f22, $f0, $f4 +/* 831BE8 802403E8 00000000 */ nop +/* 831BEC 802403EC 4618A501 */ sub.s $f20, $f20, $f24 +/* 831BF0 802403F0 3C013F00 */ lui $at, 0x3f00 +/* 831BF4 802403F4 44810000 */ mtc1 $at, $f0 +/* 831BF8 802403F8 00000000 */ nop +/* 831BFC 802403FC 4600A502 */ mul.s $f20, $f20, $f0 +/* 831C00 80240400 00000000 */ nop +/* 831C04 80240404 12000007 */ beqz $s0, .L80240424 +/* 831C08 80240408 0233102A */ slt $v0, $s1, $s3 +/* 831C0C 8024040C 10400005 */ beqz $v0, .L80240424 +/* 831C10 80240410 0240202D */ daddu $a0, $s2, $zero +/* 831C14 80240414 0220982D */ daddu $s3, $s1, $zero +/* 831C18 80240418 0280282D */ daddu $a1, $s4, $zero +/* 831C1C 8024041C 0C0B2026 */ jal set_variable +/* 831C20 80240420 0220302D */ daddu $a2, $s1, $zero +.L80240424: +/* 831C24 80240424 3C014049 */ lui $at, 0x4049 +/* 831C28 80240428 34210FD8 */ ori $at, $at, 0xfd8 +/* 831C2C 8024042C 44810000 */ mtc1 $at, $f0 +/* 831C30 80240430 44936000 */ mtc1 $s3, $f12 +/* 831C34 80240434 00000000 */ nop +/* 831C38 80240438 46806320 */ cvt.s.w $f12, $f12 +/* 831C3C 8024043C 46006302 */ mul.s $f12, $f12, $f0 +/* 831C40 80240440 00000000 */ nop +/* 831C44 80240444 44910000 */ mtc1 $s1, $f0 +/* 831C48 80240448 00000000 */ nop +/* 831C4C 8024044C 46800020 */ cvt.s.w $f0, $f0 +/* 831C50 80240450 46006303 */ div.s $f12, $f12, $f0 +/* 831C54 80240454 0C00A874 */ jal cos_rad +/* 831C58 80240458 46166300 */ add.s $f12, $f12, $f22 +/* 831C5C 8024045C 4600A002 */ mul.s $f0, $f20, $f0 +/* 831C60 80240460 00000000 */ nop +/* 831C64 80240464 4614C080 */ add.s $f2, $f24, $f20 +/* 831C68 80240468 46001081 */ sub.s $f2, $f2, $f0 +/* 831C6C 8024046C 0240202D */ daddu $a0, $s2, $zero +/* 831C70 80240470 44061000 */ mfc1 $a2, $f2 +/* 831C74 80240474 0C0B2190 */ jal set_float_variable +/* 831C78 80240478 02A0282D */ daddu $a1, $s5, $zero +/* 831C7C 8024047C 8FBF0028 */ lw $ra, 0x28($sp) +/* 831C80 80240480 8FB50024 */ lw $s5, 0x24($sp) +/* 831C84 80240484 8FB40020 */ lw $s4, 0x20($sp) +/* 831C88 80240488 8FB3001C */ lw $s3, 0x1c($sp) +/* 831C8C 8024048C 8FB20018 */ lw $s2, 0x18($sp) +/* 831C90 80240490 8FB10014 */ lw $s1, 0x14($sp) +/* 831C94 80240494 8FB00010 */ lw $s0, 0x10($sp) +/* 831C98 80240498 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 831C9C 8024049C D7B60038 */ ldc1 $f22, 0x38($sp) +/* 831CA0 802404A0 D7B40030 */ ldc1 $f20, 0x30($sp) +/* 831CA4 802404A4 24020002 */ addiu $v0, $zero, 2 +/* 831CA8 802404A8 03E00008 */ jr $ra +/* 831CAC 802404AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8.s deleted file mode 100644 index 20b873d5ae..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C8 -/* 831DC8 802405C8 24020001 */ addiu $v0, $zero, 1 -/* 831DCC 802405CC 3C018015 */ lui $at, %hi(D_80151310) -/* 831DD0 802405D0 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 831DD4 802405D4 03E00008 */ jr $ra -/* 831DD8 802405D8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s new file mode 100644 index 0000000000..0d0b173707 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405C8_831DC8 +/* 831DC8 802405C8 24020001 */ addiu $v0, $zero, 1 +/* 831DCC 802405CC 3C018015 */ lui $at, %hi(D_80151310) +/* 831DD0 802405D0 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* 831DD4 802405D4 03E00008 */ jr $ra +/* 831DD8 802405D8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC.s deleted file mode 100644 index 12a1cc9e9b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC -/* 831DDC 802405DC 3C018015 */ lui $at, %hi(D_80151310) -/* 831DE0 802405E0 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 831DE4 802405E4 03E00008 */ jr $ra -/* 831DE8 802405E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s new file mode 100644 index 0000000000..e57f03e92f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405DC_831DDC +/* 831DDC 802405DC 3C018015 */ lui $at, %hi(D_80151310) +/* 831DE0 802405E0 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* 831DE4 802405E4 03E00008 */ jr $ra +/* 831DE8 802405E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810.s deleted file mode 100644 index 9ac6701f6c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240810 -/* 832010 80240810 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832014 80240814 AFBF0014 */ sw $ra, 0x14($sp) -/* 832018 80240818 AFB00010 */ sw $s0, 0x10($sp) -/* 83201C 8024081C 0C00EABB */ jal get_npc_unsafe -/* 832020 80240820 8C84014C */ lw $a0, 0x14c($a0) -/* 832024 80240824 24040008 */ addiu $a0, $zero, 8 -/* 832028 80240828 0040802D */ daddu $s0, $v0, $zero -/* 83202C 8024082C 3C028024 */ lui $v0, 0x8024 -/* 832030 80240830 2442087C */ addiu $v0, $v0, 0x87c -/* 832034 80240834 0C00AB39 */ jal heap_malloc -/* 832038 80240838 AE020008 */ sw $v0, 8($s0) -/* 83203C 8024083C 0040182D */ daddu $v1, $v0, $zero -/* 832040 80240840 AE030020 */ sw $v1, 0x20($s0) -/* 832044 80240844 AC600000 */ sw $zero, ($v1) -/* 832048 80240848 8FBF0014 */ lw $ra, 0x14($sp) -/* 83204C 8024084C 8FB00010 */ lw $s0, 0x10($sp) -/* 832050 80240850 24020001 */ addiu $v0, $zero, 1 -/* 832054 80240854 03E00008 */ jr $ra -/* 832058 80240858 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s new file mode 100644 index 0000000000..e546115914 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240810_832010.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240810_832010 +/* 832010 80240810 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 832014 80240814 AFBF0014 */ sw $ra, 0x14($sp) +/* 832018 80240818 AFB00010 */ sw $s0, 0x10($sp) +/* 83201C 8024081C 0C00EABB */ jal get_npc_unsafe +/* 832020 80240820 8C84014C */ lw $a0, 0x14c($a0) +/* 832024 80240824 24040008 */ addiu $a0, $zero, 8 +/* 832028 80240828 0040802D */ daddu $s0, $v0, $zero +/* 83202C 8024082C 3C028024 */ lui $v0, 0x8024 +/* 832030 80240830 2442087C */ addiu $v0, $v0, 0x87c +/* 832034 80240834 0C00AB39 */ jal heap_malloc +/* 832038 80240838 AE020008 */ sw $v0, 8($s0) +/* 83203C 8024083C 0040182D */ daddu $v1, $v0, $zero +/* 832040 80240840 AE030020 */ sw $v1, 0x20($s0) +/* 832044 80240844 AC600000 */ sw $zero, ($v1) +/* 832048 80240848 8FBF0014 */ lw $ra, 0x14($sp) +/* 83204C 8024084C 8FB00010 */ lw $s0, 0x10($sp) +/* 832050 80240850 24020001 */ addiu $v0, $zero, 1 +/* 832054 80240854 03E00008 */ jr $ra +/* 832058 80240858 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C.s deleted file mode 100644 index 415638c681..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024085C -/* 83205C 8024085C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832060 80240860 AFBF0010 */ sw $ra, 0x10($sp) -/* 832064 80240864 0C00EABB */ jal get_npc_unsafe -/* 832068 80240868 8C84014C */ lw $a0, 0x14c($a0) -/* 83206C 8024086C 8FBF0010 */ lw $ra, 0x10($sp) -/* 832070 80240870 0000102D */ daddu $v0, $zero, $zero -/* 832074 80240874 03E00008 */ jr $ra -/* 832078 80240878 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s new file mode 100644 index 0000000000..db0206c019 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024085C_83205C +/* 83205C 8024085C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 832060 80240860 AFBF0010 */ sw $ra, 0x10($sp) +/* 832064 80240864 0C00EABB */ jal get_npc_unsafe +/* 832068 80240868 8C84014C */ lw $a0, 0x14c($a0) +/* 83206C 8024086C 8FBF0010 */ lw $ra, 0x10($sp) +/* 832070 80240870 0000102D */ daddu $v0, $zero, $zero +/* 832074 80240874 03E00008 */ jr $ra +/* 832078 80240878 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C.s deleted file mode 100644 index cba5f2c0b3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024087C -/* 83207C 8024087C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832080 80240880 3C03800A */ lui $v1, 0x800a -/* 832084 80240884 8463A634 */ lh $v1, -0x59cc($v1) -/* 832088 80240888 3C05800B */ lui $a1, %hi(gCameras) -/* 83208C 8024088C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 832090 80240890 AFBF0010 */ sw $ra, 0x10($sp) -/* 832094 80240894 00031080 */ sll $v0, $v1, 2 -/* 832098 80240898 00431021 */ addu $v0, $v0, $v1 -/* 83209C 8024089C 00021080 */ sll $v0, $v0, 2 -/* 8320A0 802408A0 00431023 */ subu $v0, $v0, $v1 -/* 8320A4 802408A4 000218C0 */ sll $v1, $v0, 3 -/* 8320A8 802408A8 00431021 */ addu $v0, $v0, $v1 -/* 8320AC 802408AC 8C830020 */ lw $v1, 0x20($a0) -/* 8320B0 802408B0 000210C0 */ sll $v0, $v0, 3 -/* 8320B4 802408B4 8C630000 */ lw $v1, ($v1) -/* 8320B8 802408B8 30630001 */ andi $v1, $v1, 1 -/* 8320BC 802408BC 10600004 */ beqz $v1, .L802408D0 -/* 8320C0 802408C0 00451021 */ addu $v0, $v0, $a1 -/* 8320C4 802408C4 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 8320C8 802408C8 0C00A6C9 */ jal clamp_angle -/* 8320CC 802408CC 46006307 */ neg.s $f12, $f12 -.L802408D0: -/* 8320D0 802408D0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8320D4 802408D4 03E00008 */ jr $ra -/* 8320D8 802408D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s new file mode 100644 index 0000000000..a7b06782ce --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024087C_83207C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024087C_83207C +/* 83207C 8024087C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 832080 80240880 3C03800A */ lui $v1, 0x800a +/* 832084 80240884 8463A634 */ lh $v1, -0x59cc($v1) +/* 832088 80240888 3C05800B */ lui $a1, %hi(gCameras) +/* 83208C 8024088C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 832090 80240890 AFBF0010 */ sw $ra, 0x10($sp) +/* 832094 80240894 00031080 */ sll $v0, $v1, 2 +/* 832098 80240898 00431021 */ addu $v0, $v0, $v1 +/* 83209C 8024089C 00021080 */ sll $v0, $v0, 2 +/* 8320A0 802408A0 00431023 */ subu $v0, $v0, $v1 +/* 8320A4 802408A4 000218C0 */ sll $v1, $v0, 3 +/* 8320A8 802408A8 00431021 */ addu $v0, $v0, $v1 +/* 8320AC 802408AC 8C830020 */ lw $v1, 0x20($a0) +/* 8320B0 802408B0 000210C0 */ sll $v0, $v0, 3 +/* 8320B4 802408B4 8C630000 */ lw $v1, ($v1) +/* 8320B8 802408B8 30630001 */ andi $v1, $v1, 1 +/* 8320BC 802408BC 10600004 */ beqz $v1, .L802408D0 +/* 8320C0 802408C0 00451021 */ addu $v0, $v0, $a1 +/* 8320C4 802408C4 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 8320C8 802408C8 0C00A6C9 */ jal clamp_angle +/* 8320CC 802408CC 46006307 */ neg.s $f12, $f12 +.L802408D0: +/* 8320D0 802408D0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8320D4 802408D4 03E00008 */ jr $ra +/* 8320D8 802408D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC.s deleted file mode 100644 index a68bd81b4b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408DC -/* 8320DC 802408DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8320E0 802408E0 AFB10014 */ sw $s1, 0x14($sp) -/* 8320E4 802408E4 0080882D */ daddu $s1, $a0, $zero -/* 8320E8 802408E8 AFBF0024 */ sw $ra, 0x24($sp) -/* 8320EC 802408EC AFB40020 */ sw $s4, 0x20($sp) -/* 8320F0 802408F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 8320F4 802408F4 AFB20018 */ sw $s2, 0x18($sp) -/* 8320F8 802408F8 10A00033 */ beqz $a1, .L802409C8 -/* 8320FC 802408FC AFB00010 */ sw $s0, 0x10($sp) -/* 832100 80240900 0C04760B */ jal func_8011D82C -/* 832104 80240904 24040001 */ addiu $a0, $zero, 1 -/* 832108 80240908 0000202D */ daddu $a0, $zero, $zero -/* 83210C 8024090C 0080282D */ daddu $a1, $a0, $zero -/* 832110 80240910 0080302D */ daddu $a2, $a0, $zero -/* 832114 80240914 0080382D */ daddu $a3, $a0, $zero -/* 832118 80240918 0080802D */ daddu $s0, $a0, $zero -/* 83211C 8024091C 2414FFFC */ addiu $s4, $zero, -4 -/* 832120 80240920 24130017 */ addiu $s3, $zero, 0x17 -/* 832124 80240924 3C120080 */ lui $s2, 0x80 -/* 832128 80240928 3C038015 */ lui $v1, 0x8015 -/* 83212C 8024092C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 832130 80240930 24020001 */ addiu $v0, $zero, 1 -/* 832134 80240934 0C046F97 */ jal set_background_color_blend -/* 832138 80240938 A0620000 */ sb $v0, ($v1) -.L8024093C: -/* 83213C 8024093C 0C00E2B7 */ jal get_npc_by_index -/* 832140 80240940 0200202D */ daddu $a0, $s0, $zero -/* 832144 80240944 0040202D */ daddu $a0, $v0, $zero -/* 832148 80240948 5080000B */ beql $a0, $zero, .L80240978 -/* 83214C 8024094C 26100001 */ addiu $s0, $s0, 1 -/* 832150 80240950 8C820000 */ lw $v0, ($a0) -/* 832154 80240954 50400008 */ beql $v0, $zero, .L80240978 -/* 832158 80240958 26100001 */ addiu $s0, $s0, 1 -/* 83215C 8024095C 808300A4 */ lb $v1, 0xa4($a0) -/* 832160 80240960 10740005 */ beq $v1, $s4, .L80240978 -/* 832164 80240964 26100001 */ addiu $s0, $s0, 1 -/* 832168 80240968 10730003 */ beq $v1, $s3, .L80240978 -/* 83216C 8024096C 00000000 */ nop -/* 832170 80240970 00521025 */ or $v0, $v0, $s2 -/* 832174 80240974 AC820000 */ sw $v0, ($a0) -.L80240978: -/* 832178 80240978 2A020040 */ slti $v0, $s0, 0x40 -/* 83217C 8024097C 1440FFEF */ bnez $v0, .L8024093C -/* 832180 80240980 00000000 */ nop -/* 832184 80240984 0000802D */ daddu $s0, $zero, $zero -/* 832188 80240988 3C120800 */ lui $s2, 0x800 -.L8024098C: -/* 83218C 8024098C 0C04C3D6 */ jal get_item_entity -/* 832190 80240990 0200202D */ daddu $a0, $s0, $zero -/* 832194 80240994 0040182D */ daddu $v1, $v0, $zero -/* 832198 80240998 10600007 */ beqz $v1, .L802409B8 -/* 83219C 8024099C 26100001 */ addiu $s0, $s0, 1 -/* 8321A0 802409A0 8C640000 */ lw $a0, ($v1) -/* 8321A4 802409A4 30820010 */ andi $v0, $a0, 0x10 -/* 8321A8 802409A8 10400003 */ beqz $v0, .L802409B8 -/* 8321AC 802409AC 00000000 */ nop -/* 8321B0 802409B0 00921025 */ or $v0, $a0, $s2 -/* 8321B4 802409B4 AC620000 */ sw $v0, ($v1) -.L802409B8: -/* 8321B8 802409B8 2A020100 */ slti $v0, $s0, 0x100 -/* 8321BC 802409BC 1440FFF3 */ bnez $v0, .L8024098C -/* 8321C0 802409C0 00000000 */ nop -/* 8321C4 802409C4 AE200070 */ sw $zero, 0x70($s1) -.L802409C8: -/* 8321C8 802409C8 8E220070 */ lw $v0, 0x70($s1) -/* 8321CC 802409CC 24420008 */ addiu $v0, $v0, 8 -/* 8321D0 802409D0 AE220070 */ sw $v0, 0x70($s1) -/* 8321D4 802409D4 28420100 */ slti $v0, $v0, 0x100 -/* 8321D8 802409D8 14400003 */ bnez $v0, .L802409E8 -/* 8321DC 802409DC 0000202D */ daddu $a0, $zero, $zero -/* 8321E0 802409E0 240200FF */ addiu $v0, $zero, 0xff -/* 8321E4 802409E4 AE220070 */ sw $v0, 0x70($s1) -.L802409E8: -/* 8321E8 802409E8 0080282D */ daddu $a1, $a0, $zero -/* 8321EC 802409EC 92270073 */ lbu $a3, 0x73($s1) -/* 8321F0 802409F0 0C046F97 */ jal set_background_color_blend -/* 8321F4 802409F4 0080302D */ daddu $a2, $a0, $zero -/* 8321F8 802409F8 8E220070 */ lw $v0, 0x70($s1) -/* 8321FC 802409FC 8FBF0024 */ lw $ra, 0x24($sp) -/* 832200 80240A00 8FB40020 */ lw $s4, 0x20($sp) -/* 832204 80240A04 8FB3001C */ lw $s3, 0x1c($sp) -/* 832208 80240A08 8FB20018 */ lw $s2, 0x18($sp) -/* 83220C 80240A0C 8FB10014 */ lw $s1, 0x14($sp) -/* 832210 80240A10 8FB00010 */ lw $s0, 0x10($sp) -/* 832214 80240A14 384200FF */ xori $v0, $v0, 0xff -/* 832218 80240A18 2C420001 */ sltiu $v0, $v0, 1 -/* 83221C 80240A1C 00021040 */ sll $v0, $v0, 1 -/* 832220 80240A20 03E00008 */ jr $ra -/* 832224 80240A24 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s new file mode 100644 index 0000000000..d867fe70e1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802408DC_8320DC.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408DC_8320DC +/* 8320DC 802408DC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8320E0 802408E0 AFB10014 */ sw $s1, 0x14($sp) +/* 8320E4 802408E4 0080882D */ daddu $s1, $a0, $zero +/* 8320E8 802408E8 AFBF0024 */ sw $ra, 0x24($sp) +/* 8320EC 802408EC AFB40020 */ sw $s4, 0x20($sp) +/* 8320F0 802408F0 AFB3001C */ sw $s3, 0x1c($sp) +/* 8320F4 802408F4 AFB20018 */ sw $s2, 0x18($sp) +/* 8320F8 802408F8 10A00033 */ beqz $a1, .L802409C8 +/* 8320FC 802408FC AFB00010 */ sw $s0, 0x10($sp) +/* 832100 80240900 0C04760B */ jal func_8011D82C +/* 832104 80240904 24040001 */ addiu $a0, $zero, 1 +/* 832108 80240908 0000202D */ daddu $a0, $zero, $zero +/* 83210C 8024090C 0080282D */ daddu $a1, $a0, $zero +/* 832110 80240910 0080302D */ daddu $a2, $a0, $zero +/* 832114 80240914 0080382D */ daddu $a3, $a0, $zero +/* 832118 80240918 0080802D */ daddu $s0, $a0, $zero +/* 83211C 8024091C 2414FFFC */ addiu $s4, $zero, -4 +/* 832120 80240920 24130017 */ addiu $s3, $zero, 0x17 +/* 832124 80240924 3C120080 */ lui $s2, 0x80 +/* 832128 80240928 3C038015 */ lui $v1, 0x8015 +/* 83212C 8024092C 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 832130 80240930 24020001 */ addiu $v0, $zero, 1 +/* 832134 80240934 0C046F97 */ jal set_background_color_blend +/* 832138 80240938 A0620000 */ sb $v0, ($v1) +.L8024093C: +/* 83213C 8024093C 0C00E2B7 */ jal get_npc_by_index +/* 832140 80240940 0200202D */ daddu $a0, $s0, $zero +/* 832144 80240944 0040202D */ daddu $a0, $v0, $zero +/* 832148 80240948 5080000B */ beql $a0, $zero, .L80240978 +/* 83214C 8024094C 26100001 */ addiu $s0, $s0, 1 +/* 832150 80240950 8C820000 */ lw $v0, ($a0) +/* 832154 80240954 50400008 */ beql $v0, $zero, .L80240978 +/* 832158 80240958 26100001 */ addiu $s0, $s0, 1 +/* 83215C 8024095C 808300A4 */ lb $v1, 0xa4($a0) +/* 832160 80240960 10740005 */ beq $v1, $s4, .L80240978 +/* 832164 80240964 26100001 */ addiu $s0, $s0, 1 +/* 832168 80240968 10730003 */ beq $v1, $s3, .L80240978 +/* 83216C 8024096C 00000000 */ nop +/* 832170 80240970 00521025 */ or $v0, $v0, $s2 +/* 832174 80240974 AC820000 */ sw $v0, ($a0) +.L80240978: +/* 832178 80240978 2A020040 */ slti $v0, $s0, 0x40 +/* 83217C 8024097C 1440FFEF */ bnez $v0, .L8024093C +/* 832180 80240980 00000000 */ nop +/* 832184 80240984 0000802D */ daddu $s0, $zero, $zero +/* 832188 80240988 3C120800 */ lui $s2, 0x800 +.L8024098C: +/* 83218C 8024098C 0C04C3D6 */ jal get_item_entity +/* 832190 80240990 0200202D */ daddu $a0, $s0, $zero +/* 832194 80240994 0040182D */ daddu $v1, $v0, $zero +/* 832198 80240998 10600007 */ beqz $v1, .L802409B8 +/* 83219C 8024099C 26100001 */ addiu $s0, $s0, 1 +/* 8321A0 802409A0 8C640000 */ lw $a0, ($v1) +/* 8321A4 802409A4 30820010 */ andi $v0, $a0, 0x10 +/* 8321A8 802409A8 10400003 */ beqz $v0, .L802409B8 +/* 8321AC 802409AC 00000000 */ nop +/* 8321B0 802409B0 00921025 */ or $v0, $a0, $s2 +/* 8321B4 802409B4 AC620000 */ sw $v0, ($v1) +.L802409B8: +/* 8321B8 802409B8 2A020100 */ slti $v0, $s0, 0x100 +/* 8321BC 802409BC 1440FFF3 */ bnez $v0, .L8024098C +/* 8321C0 802409C0 00000000 */ nop +/* 8321C4 802409C4 AE200070 */ sw $zero, 0x70($s1) +.L802409C8: +/* 8321C8 802409C8 8E220070 */ lw $v0, 0x70($s1) +/* 8321CC 802409CC 24420008 */ addiu $v0, $v0, 8 +/* 8321D0 802409D0 AE220070 */ sw $v0, 0x70($s1) +/* 8321D4 802409D4 28420100 */ slti $v0, $v0, 0x100 +/* 8321D8 802409D8 14400003 */ bnez $v0, .L802409E8 +/* 8321DC 802409DC 0000202D */ daddu $a0, $zero, $zero +/* 8321E0 802409E0 240200FF */ addiu $v0, $zero, 0xff +/* 8321E4 802409E4 AE220070 */ sw $v0, 0x70($s1) +.L802409E8: +/* 8321E8 802409E8 0080282D */ daddu $a1, $a0, $zero +/* 8321EC 802409EC 92270073 */ lbu $a3, 0x73($s1) +/* 8321F0 802409F0 0C046F97 */ jal set_background_color_blend +/* 8321F4 802409F4 0080302D */ daddu $a2, $a0, $zero +/* 8321F8 802409F8 8E220070 */ lw $v0, 0x70($s1) +/* 8321FC 802409FC 8FBF0024 */ lw $ra, 0x24($sp) +/* 832200 80240A00 8FB40020 */ lw $s4, 0x20($sp) +/* 832204 80240A04 8FB3001C */ lw $s3, 0x1c($sp) +/* 832208 80240A08 8FB20018 */ lw $s2, 0x18($sp) +/* 83220C 80240A0C 8FB10014 */ lw $s1, 0x14($sp) +/* 832210 80240A10 8FB00010 */ lw $s0, 0x10($sp) +/* 832214 80240A14 384200FF */ xori $v0, $v0, 0xff +/* 832218 80240A18 2C420001 */ sltiu $v0, $v0, 1 +/* 83221C 80240A1C 00021040 */ sll $v0, $v0, 1 +/* 832220 80240A20 03E00008 */ jr $ra +/* 832224 80240A24 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28.s deleted file mode 100644 index 52ce58c3d8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A28 -/* 832228 80240A28 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 83222C 80240A2C AFB00010 */ sw $s0, 0x10($sp) -/* 832230 80240A30 0080802D */ daddu $s0, $a0, $zero -/* 832234 80240A34 AFBF0020 */ sw $ra, 0x20($sp) -/* 832238 80240A38 AFB3001C */ sw $s3, 0x1c($sp) -/* 83223C 80240A3C AFB20018 */ sw $s2, 0x18($sp) -/* 832240 80240A40 10A00009 */ beqz $a1, .L80240A68 -/* 832244 80240A44 AFB10014 */ sw $s1, 0x14($sp) -/* 832248 80240A48 0000202D */ daddu $a0, $zero, $zero -/* 83224C 80240A4C 0080282D */ daddu $a1, $a0, $zero -/* 832250 80240A50 0080302D */ daddu $a2, $a0, $zero -/* 832254 80240A54 0C046F97 */ jal set_background_color_blend -/* 832258 80240A58 240700FF */ addiu $a3, $zero, 0xff -/* 83225C 80240A5C 240200FF */ addiu $v0, $zero, 0xff -/* 832260 80240A60 AE020070 */ sw $v0, 0x70($s0) -/* 832264 80240A64 AE000074 */ sw $zero, 0x74($s0) -.L80240A68: -/* 832268 80240A68 8E020070 */ lw $v0, 0x70($s0) -/* 83226C 80240A6C 2442FFF8 */ addiu $v0, $v0, -8 -/* 832270 80240A70 04410002 */ bgez $v0, .L80240A7C -/* 832274 80240A74 AE020070 */ sw $v0, 0x70($s0) -/* 832278 80240A78 AE000070 */ sw $zero, 0x70($s0) -.L80240A7C: -/* 83227C 80240A7C 0000202D */ daddu $a0, $zero, $zero -/* 832280 80240A80 0080282D */ daddu $a1, $a0, $zero -/* 832284 80240A84 92070073 */ lbu $a3, 0x73($s0) -/* 832288 80240A88 0C046F97 */ jal set_background_color_blend -/* 83228C 80240A8C 0080302D */ daddu $a2, $a0, $zero -/* 832290 80240A90 8E020070 */ lw $v0, 0x70($s0) -/* 832294 80240A94 14400006 */ bnez $v0, .L80240AB0 -/* 832298 80240A98 00000000 */ nop -/* 83229C 80240A9C 8E020074 */ lw $v0, 0x74($s0) -/* 8322A0 80240AA0 14400003 */ bnez $v0, .L80240AB0 -/* 8322A4 80240AA4 24020001 */ addiu $v0, $zero, 1 -/* 8322A8 80240AA8 080902DF */ j .L80240B7C -/* 8322AC 80240AAC AE020074 */ sw $v0, 0x74($s0) -.L80240AB0: -/* 8322B0 80240AB0 8E030074 */ lw $v1, 0x74($s0) -/* 8322B4 80240AB4 24020001 */ addiu $v0, $zero, 1 -/* 8322B8 80240AB8 14620031 */ bne $v1, $v0, .L80240B80 -/* 8322BC 80240ABC 0000102D */ daddu $v0, $zero, $zero -/* 8322C0 80240AC0 0C04760B */ jal func_8011D82C -/* 8322C4 80240AC4 0000202D */ daddu $a0, $zero, $zero -/* 8322C8 80240AC8 0000802D */ daddu $s0, $zero, $zero -/* 8322CC 80240ACC 2413FFFC */ addiu $s3, $zero, -4 -/* 8322D0 80240AD0 24120017 */ addiu $s2, $zero, 0x17 -/* 8322D4 80240AD4 3C11FF7F */ lui $s1, 0xff7f -/* 8322D8 80240AD8 3C028015 */ lui $v0, 0x8015 -/* 8322DC 80240ADC 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 8322E0 80240AE0 3631FFFF */ ori $s1, $s1, 0xffff -/* 8322E4 80240AE4 A0400000 */ sb $zero, ($v0) -.L80240AE8: -/* 8322E8 80240AE8 0C00E2B7 */ jal get_npc_by_index -/* 8322EC 80240AEC 0200202D */ daddu $a0, $s0, $zero -/* 8322F0 80240AF0 0040202D */ daddu $a0, $v0, $zero -/* 8322F4 80240AF4 5080000B */ beql $a0, $zero, .L80240B24 -/* 8322F8 80240AF8 26100001 */ addiu $s0, $s0, 1 -/* 8322FC 80240AFC 8C820000 */ lw $v0, ($a0) -/* 832300 80240B00 50400008 */ beql $v0, $zero, .L80240B24 -/* 832304 80240B04 26100001 */ addiu $s0, $s0, 1 -/* 832308 80240B08 808300A4 */ lb $v1, 0xa4($a0) -/* 83230C 80240B0C 10730005 */ beq $v1, $s3, .L80240B24 -/* 832310 80240B10 26100001 */ addiu $s0, $s0, 1 -/* 832314 80240B14 10720003 */ beq $v1, $s2, .L80240B24 -/* 832318 80240B18 00000000 */ nop -/* 83231C 80240B1C 00511024 */ and $v0, $v0, $s1 -/* 832320 80240B20 AC820000 */ sw $v0, ($a0) -.L80240B24: -/* 832324 80240B24 2A020040 */ slti $v0, $s0, 0x40 -/* 832328 80240B28 1440FFEF */ bnez $v0, .L80240AE8 -/* 83232C 80240B2C 00000000 */ nop -/* 832330 80240B30 0000802D */ daddu $s0, $zero, $zero -/* 832334 80240B34 3C11F7FF */ lui $s1, 0xf7ff -/* 832338 80240B38 3631FFFF */ ori $s1, $s1, 0xffff -.L80240B3C: -/* 83233C 80240B3C 0C04C3D6 */ jal get_item_entity -/* 832340 80240B40 0200202D */ daddu $a0, $s0, $zero -/* 832344 80240B44 0040182D */ daddu $v1, $v0, $zero -/* 832348 80240B48 10600007 */ beqz $v1, .L80240B68 -/* 83234C 80240B4C 26100001 */ addiu $s0, $s0, 1 -/* 832350 80240B50 8C640000 */ lw $a0, ($v1) -/* 832354 80240B54 30820010 */ andi $v0, $a0, 0x10 -/* 832358 80240B58 10400003 */ beqz $v0, .L80240B68 -/* 83235C 80240B5C 00000000 */ nop -/* 832360 80240B60 00911024 */ and $v0, $a0, $s1 -/* 832364 80240B64 AC620000 */ sw $v0, ($v1) -.L80240B68: -/* 832368 80240B68 2A020100 */ slti $v0, $s0, 0x100 -/* 83236C 80240B6C 1440FFF3 */ bnez $v0, .L80240B3C -/* 832370 80240B70 24020002 */ addiu $v0, $zero, 2 -/* 832374 80240B74 080902E0 */ j .L80240B80 -/* 832378 80240B78 00000000 */ nop -.L80240B7C: -/* 83237C 80240B7C 0000102D */ daddu $v0, $zero, $zero -.L80240B80: -/* 832380 80240B80 8FBF0020 */ lw $ra, 0x20($sp) -/* 832384 80240B84 8FB3001C */ lw $s3, 0x1c($sp) -/* 832388 80240B88 8FB20018 */ lw $s2, 0x18($sp) -/* 83238C 80240B8C 8FB10014 */ lw $s1, 0x14($sp) -/* 832390 80240B90 8FB00010 */ lw $s0, 0x10($sp) -/* 832394 80240B94 03E00008 */ jr $ra -/* 832398 80240B98 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s new file mode 100644 index 0000000000..c3fb06cc4e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240A28_832228.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A28_832228 +/* 832228 80240A28 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 83222C 80240A2C AFB00010 */ sw $s0, 0x10($sp) +/* 832230 80240A30 0080802D */ daddu $s0, $a0, $zero +/* 832234 80240A34 AFBF0020 */ sw $ra, 0x20($sp) +/* 832238 80240A38 AFB3001C */ sw $s3, 0x1c($sp) +/* 83223C 80240A3C AFB20018 */ sw $s2, 0x18($sp) +/* 832240 80240A40 10A00009 */ beqz $a1, .L80240A68 +/* 832244 80240A44 AFB10014 */ sw $s1, 0x14($sp) +/* 832248 80240A48 0000202D */ daddu $a0, $zero, $zero +/* 83224C 80240A4C 0080282D */ daddu $a1, $a0, $zero +/* 832250 80240A50 0080302D */ daddu $a2, $a0, $zero +/* 832254 80240A54 0C046F97 */ jal set_background_color_blend +/* 832258 80240A58 240700FF */ addiu $a3, $zero, 0xff +/* 83225C 80240A5C 240200FF */ addiu $v0, $zero, 0xff +/* 832260 80240A60 AE020070 */ sw $v0, 0x70($s0) +/* 832264 80240A64 AE000074 */ sw $zero, 0x74($s0) +.L80240A68: +/* 832268 80240A68 8E020070 */ lw $v0, 0x70($s0) +/* 83226C 80240A6C 2442FFF8 */ addiu $v0, $v0, -8 +/* 832270 80240A70 04410002 */ bgez $v0, .L80240A7C +/* 832274 80240A74 AE020070 */ sw $v0, 0x70($s0) +/* 832278 80240A78 AE000070 */ sw $zero, 0x70($s0) +.L80240A7C: +/* 83227C 80240A7C 0000202D */ daddu $a0, $zero, $zero +/* 832280 80240A80 0080282D */ daddu $a1, $a0, $zero +/* 832284 80240A84 92070073 */ lbu $a3, 0x73($s0) +/* 832288 80240A88 0C046F97 */ jal set_background_color_blend +/* 83228C 80240A8C 0080302D */ daddu $a2, $a0, $zero +/* 832290 80240A90 8E020070 */ lw $v0, 0x70($s0) +/* 832294 80240A94 14400006 */ bnez $v0, .L80240AB0 +/* 832298 80240A98 00000000 */ nop +/* 83229C 80240A9C 8E020074 */ lw $v0, 0x74($s0) +/* 8322A0 80240AA0 14400003 */ bnez $v0, .L80240AB0 +/* 8322A4 80240AA4 24020001 */ addiu $v0, $zero, 1 +/* 8322A8 80240AA8 080902DF */ j .L80240B7C +/* 8322AC 80240AAC AE020074 */ sw $v0, 0x74($s0) +.L80240AB0: +/* 8322B0 80240AB0 8E030074 */ lw $v1, 0x74($s0) +/* 8322B4 80240AB4 24020001 */ addiu $v0, $zero, 1 +/* 8322B8 80240AB8 14620031 */ bne $v1, $v0, .L80240B80 +/* 8322BC 80240ABC 0000102D */ daddu $v0, $zero, $zero +/* 8322C0 80240AC0 0C04760B */ jal func_8011D82C +/* 8322C4 80240AC4 0000202D */ daddu $a0, $zero, $zero +/* 8322C8 80240AC8 0000802D */ daddu $s0, $zero, $zero +/* 8322CC 80240ACC 2413FFFC */ addiu $s3, $zero, -4 +/* 8322D0 80240AD0 24120017 */ addiu $s2, $zero, 0x17 +/* 8322D4 80240AD4 3C11FF7F */ lui $s1, 0xff7f +/* 8322D8 80240AD8 3C028015 */ lui $v0, 0x8015 +/* 8322DC 80240ADC 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 8322E0 80240AE0 3631FFFF */ ori $s1, $s1, 0xffff +/* 8322E4 80240AE4 A0400000 */ sb $zero, ($v0) +.L80240AE8: +/* 8322E8 80240AE8 0C00E2B7 */ jal get_npc_by_index +/* 8322EC 80240AEC 0200202D */ daddu $a0, $s0, $zero +/* 8322F0 80240AF0 0040202D */ daddu $a0, $v0, $zero +/* 8322F4 80240AF4 5080000B */ beql $a0, $zero, .L80240B24 +/* 8322F8 80240AF8 26100001 */ addiu $s0, $s0, 1 +/* 8322FC 80240AFC 8C820000 */ lw $v0, ($a0) +/* 832300 80240B00 50400008 */ beql $v0, $zero, .L80240B24 +/* 832304 80240B04 26100001 */ addiu $s0, $s0, 1 +/* 832308 80240B08 808300A4 */ lb $v1, 0xa4($a0) +/* 83230C 80240B0C 10730005 */ beq $v1, $s3, .L80240B24 +/* 832310 80240B10 26100001 */ addiu $s0, $s0, 1 +/* 832314 80240B14 10720003 */ beq $v1, $s2, .L80240B24 +/* 832318 80240B18 00000000 */ nop +/* 83231C 80240B1C 00511024 */ and $v0, $v0, $s1 +/* 832320 80240B20 AC820000 */ sw $v0, ($a0) +.L80240B24: +/* 832324 80240B24 2A020040 */ slti $v0, $s0, 0x40 +/* 832328 80240B28 1440FFEF */ bnez $v0, .L80240AE8 +/* 83232C 80240B2C 00000000 */ nop +/* 832330 80240B30 0000802D */ daddu $s0, $zero, $zero +/* 832334 80240B34 3C11F7FF */ lui $s1, 0xf7ff +/* 832338 80240B38 3631FFFF */ ori $s1, $s1, 0xffff +.L80240B3C: +/* 83233C 80240B3C 0C04C3D6 */ jal get_item_entity +/* 832340 80240B40 0200202D */ daddu $a0, $s0, $zero +/* 832344 80240B44 0040182D */ daddu $v1, $v0, $zero +/* 832348 80240B48 10600007 */ beqz $v1, .L80240B68 +/* 83234C 80240B4C 26100001 */ addiu $s0, $s0, 1 +/* 832350 80240B50 8C640000 */ lw $a0, ($v1) +/* 832354 80240B54 30820010 */ andi $v0, $a0, 0x10 +/* 832358 80240B58 10400003 */ beqz $v0, .L80240B68 +/* 83235C 80240B5C 00000000 */ nop +/* 832360 80240B60 00911024 */ and $v0, $a0, $s1 +/* 832364 80240B64 AC620000 */ sw $v0, ($v1) +.L80240B68: +/* 832368 80240B68 2A020100 */ slti $v0, $s0, 0x100 +/* 83236C 80240B6C 1440FFF3 */ bnez $v0, .L80240B3C +/* 832370 80240B70 24020002 */ addiu $v0, $zero, 2 +/* 832374 80240B74 080902E0 */ j .L80240B80 +/* 832378 80240B78 00000000 */ nop +.L80240B7C: +/* 83237C 80240B7C 0000102D */ daddu $v0, $zero, $zero +.L80240B80: +/* 832380 80240B80 8FBF0020 */ lw $ra, 0x20($sp) +/* 832384 80240B84 8FB3001C */ lw $s3, 0x1c($sp) +/* 832388 80240B88 8FB20018 */ lw $s2, 0x18($sp) +/* 83238C 80240B8C 8FB10014 */ lw $s1, 0x14($sp) +/* 832390 80240B90 8FB00010 */ lw $s0, 0x10($sp) +/* 832394 80240B94 03E00008 */ jr $ra +/* 832398 80240B98 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C.s deleted file mode 100644 index 56367eaa98..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B9C -/* 83239C 80240B9C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8323A0 80240BA0 AFB00010 */ sw $s0, 0x10($sp) -/* 8323A4 80240BA4 3C108011 */ lui $s0, %hi(gPlayerData) -/* 8323A8 80240BA8 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 8323AC 80240BAC AFBF0018 */ sw $ra, 0x18($sp) -/* 8323B0 80240BB0 AFB10014 */ sw $s1, 0x14($sp) -/* 8323B4 80240BB4 960302C0 */ lhu $v1, 0x2c0($s0) -/* 8323B8 80240BB8 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 8323BC 80240BBC 10400003 */ beqz $v0, .L80240BCC -/* 8323C0 80240BC0 0080882D */ daddu $s1, $a0, $zero -/* 8323C4 80240BC4 24620001 */ addiu $v0, $v1, 1 -/* 8323C8 80240BC8 A60202C0 */ sh $v0, 0x2c0($s0) -.L80240BCC: -/* 8323CC 80240BCC 3C05F5DE */ lui $a1, 0xf5de -/* 8323D0 80240BD0 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 8323D4 80240BD4 0C0B1EAF */ jal get_variable -/* 8323D8 80240BD8 0000202D */ daddu $a0, $zero, $zero -/* 8323DC 80240BDC 3C038024 */ lui $v1, 0x8024 -/* 8323E0 80240BE0 00621821 */ addu $v1, $v1, $v0 -/* 8323E4 80240BE4 906366A8 */ lbu $v1, 0x66a8($v1) -/* 8323E8 80240BE8 8E220084 */ lw $v0, 0x84($s1) -/* 8323EC 80240BEC 54430006 */ bnel $v0, $v1, .L80240C08 -/* 8323F0 80240BF0 AE200084 */ sw $zero, 0x84($s1) -/* 8323F4 80240BF4 24020001 */ addiu $v0, $zero, 1 -/* 8323F8 80240BF8 AE220084 */ sw $v0, 0x84($s1) -/* 8323FC 80240BFC 960202C2 */ lhu $v0, 0x2c2($s0) -/* 832400 80240C00 24420001 */ addiu $v0, $v0, 1 -/* 832404 80240C04 A60202C2 */ sh $v0, 0x2c2($s0) -.L80240C08: -/* 832408 80240C08 8FBF0018 */ lw $ra, 0x18($sp) -/* 83240C 80240C0C 8FB10014 */ lw $s1, 0x14($sp) -/* 832410 80240C10 8FB00010 */ lw $s0, 0x10($sp) -/* 832414 80240C14 24020002 */ addiu $v0, $zero, 2 -/* 832418 80240C18 03E00008 */ jr $ra -/* 83241C 80240C1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C_83239C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C_83239C.s new file mode 100644 index 0000000000..2899fb1d9b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240B9C_83239C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B9C_83239C +/* 83239C 80240B9C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8323A0 80240BA0 AFB00010 */ sw $s0, 0x10($sp) +/* 8323A4 80240BA4 3C108011 */ lui $s0, %hi(gPlayerData) +/* 8323A8 80240BA8 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 8323AC 80240BAC AFBF0018 */ sw $ra, 0x18($sp) +/* 8323B0 80240BB0 AFB10014 */ sw $s1, 0x14($sp) +/* 8323B4 80240BB4 960302C0 */ lhu $v1, 0x2c0($s0) +/* 8323B8 80240BB8 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 8323BC 80240BBC 10400003 */ beqz $v0, .L80240BCC +/* 8323C0 80240BC0 0080882D */ daddu $s1, $a0, $zero +/* 8323C4 80240BC4 24620001 */ addiu $v0, $v1, 1 +/* 8323C8 80240BC8 A60202C0 */ sh $v0, 0x2c0($s0) +.L80240BCC: +/* 8323CC 80240BCC 3C05F5DE */ lui $a1, 0xf5de +/* 8323D0 80240BD0 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 8323D4 80240BD4 0C0B1EAF */ jal get_variable +/* 8323D8 80240BD8 0000202D */ daddu $a0, $zero, $zero +/* 8323DC 80240BDC 3C038024 */ lui $v1, 0x8024 +/* 8323E0 80240BE0 00621821 */ addu $v1, $v1, $v0 +/* 8323E4 80240BE4 906366A8 */ lbu $v1, 0x66a8($v1) +/* 8323E8 80240BE8 8E220084 */ lw $v0, 0x84($s1) +/* 8323EC 80240BEC 54430006 */ bnel $v0, $v1, .L80240C08 +/* 8323F0 80240BF0 AE200084 */ sw $zero, 0x84($s1) +/* 8323F4 80240BF4 24020001 */ addiu $v0, $zero, 1 +/* 8323F8 80240BF8 AE220084 */ sw $v0, 0x84($s1) +/* 8323FC 80240BFC 960202C2 */ lhu $v0, 0x2c2($s0) +/* 832400 80240C00 24420001 */ addiu $v0, $v0, 1 +/* 832404 80240C04 A60202C2 */ sh $v0, 0x2c2($s0) +.L80240C08: +/* 832408 80240C08 8FBF0018 */ lw $ra, 0x18($sp) +/* 83240C 80240C0C 8FB10014 */ lw $s1, 0x14($sp) +/* 832410 80240C10 8FB00010 */ lw $s0, 0x10($sp) +/* 832414 80240C14 24020002 */ addiu $v0, $zero, 2 +/* 832418 80240C18 03E00008 */ jr $ra +/* 83241C 80240C1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20.s deleted file mode 100644 index 5693c0c9ec..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C20 -/* 832420 80240C20 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 832424 80240C24 AFB1001C */ sw $s1, 0x1c($sp) -/* 832428 80240C28 AFBF0020 */ sw $ra, 0x20($sp) -/* 83242C 80240C2C AFB00018 */ sw $s0, 0x18($sp) -/* 832430 80240C30 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 832434 80240C34 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 832438 80240C38 10A00060 */ beqz $a1, .L80240DBC -/* 83243C 80240C3C 0080882D */ daddu $s1, $a0, $zero -/* 832440 80240C40 3C05F4AC */ lui $a1, 0xf4ac -/* 832444 80240C44 0C0B1EAF */ jal get_variable -/* 832448 80240C48 34A5D481 */ ori $a1, $a1, 0xd481 -/* 83244C 80240C4C 0220202D */ daddu $a0, $s1, $zero -/* 832450 80240C50 3C05F4AC */ lui $a1, 0xf4ac -/* 832454 80240C54 4482B000 */ mtc1 $v0, $f22 -/* 832458 80240C58 00000000 */ nop -/* 83245C 80240C5C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 832460 80240C60 0C0B1EAF */ jal get_variable -/* 832464 80240C64 34A5D482 */ ori $a1, $a1, 0xd482 -/* 832468 80240C68 0220202D */ daddu $a0, $s1, $zero -/* 83246C 80240C6C 3C05F4AC */ lui $a1, 0xf4ac -/* 832470 80240C70 4482A000 */ mtc1 $v0, $f20 -/* 832474 80240C74 00000000 */ nop -/* 832478 80240C78 4680A520 */ cvt.s.w $f20, $f20 -/* 83247C 80240C7C 0C0B1EAF */ jal get_variable -/* 832480 80240C80 34A5D483 */ ori $a1, $a1, 0xd483 -/* 832484 80240C84 44821000 */ mtc1 $v0, $f2 -/* 832488 80240C88 00000000 */ nop -/* 83248C 80240C8C 468010A0 */ cvt.s.w $f2, $f2 -/* 832490 80240C90 4405B000 */ mfc1 $a1, $f22 -/* 832494 80240C94 4406A000 */ mfc1 $a2, $f20 -/* 832498 80240C98 44071000 */ mfc1 $a3, $f2 -/* 83249C 80240C9C 0C01C574 */ jal func_800715D0 -/* 8324A0 80240CA0 0000202D */ daddu $a0, $zero, $zero -/* 8324A4 80240CA4 0220202D */ daddu $a0, $s1, $zero -/* 8324A8 80240CA8 3C05F4AC */ lui $a1, 0xf4ac -/* 8324AC 80240CAC 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8324B0 80240CB0 3C108025 */ lui $s0, %hi(ForceCloseMessageBox) -/* 8324B4 80240CB4 261013F0 */ addiu $s0, $s0, %lo(ForceCloseMessageBox) -/* 8324B8 80240CB8 0C0B1EAF */ jal get_variable -/* 8324BC 80240CBC AE020000 */ sw $v0, ($s0) -/* 8324C0 80240CC0 0220202D */ daddu $a0, $s1, $zero -/* 8324C4 80240CC4 3C05F4AC */ lui $a1, 0xf4ac -/* 8324C8 80240CC8 4482B000 */ mtc1 $v0, $f22 -/* 8324CC 80240CCC 00000000 */ nop -/* 8324D0 80240CD0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8324D4 80240CD4 0C0B1EAF */ jal get_variable -/* 8324D8 80240CD8 34A5D482 */ ori $a1, $a1, 0xd482 -/* 8324DC 80240CDC 0220202D */ daddu $a0, $s1, $zero -/* 8324E0 80240CE0 3C05F4AC */ lui $a1, 0xf4ac -/* 8324E4 80240CE4 4482A000 */ mtc1 $v0, $f20 -/* 8324E8 80240CE8 00000000 */ nop -/* 8324EC 80240CEC 4680A520 */ cvt.s.w $f20, $f20 -/* 8324F0 80240CF0 0C0B1EAF */ jal get_variable -/* 8324F4 80240CF4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 8324F8 80240CF8 44821000 */ mtc1 $v0, $f2 -/* 8324FC 80240CFC 00000000 */ nop -/* 832500 80240D00 468010A0 */ cvt.s.w $f2, $f2 -/* 832504 80240D04 4405B000 */ mfc1 $a1, $f22 -/* 832508 80240D08 4406A000 */ mfc1 $a2, $f20 -/* 83250C 80240D0C 44071000 */ mfc1 $a3, $f2 -/* 832510 80240D10 0C01C604 */ jal func_80071810 -/* 832514 80240D14 0000202D */ daddu $a0, $zero, $zero -/* 832518 80240D18 0220202D */ daddu $a0, $s1, $zero -/* 83251C 80240D1C 3C05F4AC */ lui $a1, 0xf4ac -/* 832520 80240D20 3C018025 */ lui $at, 0x8025 -/* 832524 80240D24 AC2213F4 */ sw $v0, 0x13f4($at) -/* 832528 80240D28 0C0B1EAF */ jal get_variable -/* 83252C 80240D2C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 832530 80240D30 0220202D */ daddu $a0, $s1, $zero -/* 832534 80240D34 3C05F4AC */ lui $a1, 0xf4ac -/* 832538 80240D38 4482B000 */ mtc1 $v0, $f22 -/* 83253C 80240D3C 00000000 */ nop -/* 832540 80240D40 4680B5A0 */ cvt.s.w $f22, $f22 -/* 832544 80240D44 0C0B1EAF */ jal get_variable -/* 832548 80240D48 34A5D482 */ ori $a1, $a1, 0xd482 -/* 83254C 80240D4C 0220202D */ daddu $a0, $s1, $zero -/* 832550 80240D50 3C05F4AC */ lui $a1, 0xf4ac -/* 832554 80240D54 4482A000 */ mtc1 $v0, $f20 -/* 832558 80240D58 00000000 */ nop -/* 83255C 80240D5C 4680A520 */ cvt.s.w $f20, $f20 -/* 832560 80240D60 0C0B1EAF */ jal get_variable -/* 832564 80240D64 34A5D483 */ ori $a1, $a1, 0xd483 -/* 832568 80240D68 44821000 */ mtc1 $v0, $f2 -/* 83256C 80240D6C 00000000 */ nop -/* 832570 80240D70 468010A0 */ cvt.s.w $f2, $f2 -/* 832574 80240D74 4405B000 */ mfc1 $a1, $f22 -/* 832578 80240D78 4406A000 */ mfc1 $a2, $f20 -/* 83257C 80240D7C 3C013F80 */ lui $at, 0x3f80 -/* 832580 80240D80 44810000 */ mtc1 $at, $f0 -/* 832584 80240D84 44071000 */ mfc1 $a3, $f2 -/* 832588 80240D88 0000202D */ daddu $a0, $zero, $zero -/* 83258C 80240D8C AFA00014 */ sw $zero, 0x14($sp) -/* 832590 80240D90 0C01CA24 */ jal func_80072890 -/* 832594 80240D94 E7A00010 */ swc1 $f0, 0x10($sp) -/* 832598 80240D98 8E030000 */ lw $v1, ($s0) -/* 83259C 80240D9C 8C64000C */ lw $a0, 0xc($v1) -/* 8325A0 80240DA0 3C018025 */ lui $at, 0x8025 -/* 8325A4 80240DA4 AC2213F8 */ sw $v0, 0x13f8($at) -/* 8325A8 80240DA8 AC800018 */ sw $zero, 0x18($a0) -/* 8325AC 80240DAC AC800020 */ sw $zero, 0x20($a0) -/* 8325B0 80240DB0 AC800024 */ sw $zero, 0x24($a0) -/* 8325B4 80240DB4 AC800028 */ sw $zero, 0x28($a0) -/* 8325B8 80240DB8 AC80001C */ sw $zero, 0x1c($a0) -.L80240DBC: -/* 8325BC 80240DBC 3C028025 */ lui $v0, %hi(ForceCloseMessageBox) -/* 8325C0 80240DC0 8C4213F0 */ lw $v0, %lo(ForceCloseMessageBox)($v0) -/* 8325C4 80240DC4 8C44000C */ lw $a0, 0xc($v0) -/* 8325C8 80240DC8 8C820020 */ lw $v0, 0x20($a0) -/* 8325CC 80240DCC 8C830028 */ lw $v1, 0x28($a0) -/* 8325D0 80240DD0 2442000A */ addiu $v0, $v0, 0xa -/* 8325D4 80240DD4 AC820020 */ sw $v0, 0x20($a0) -/* 8325D8 80240DD8 8C820024 */ lw $v0, 0x24($a0) -/* 8325DC 80240DDC 2463000A */ addiu $v1, $v1, 0xa -/* 8325E0 80240DE0 AC830028 */ sw $v1, 0x28($a0) -/* 8325E4 80240DE4 8C830018 */ lw $v1, 0x18($a0) -/* 8325E8 80240DE8 2442000A */ addiu $v0, $v0, 0xa -/* 8325EC 80240DEC AC820024 */ sw $v0, 0x24($a0) -/* 8325F0 80240DF0 8C82001C */ lw $v0, 0x1c($a0) -/* 8325F4 80240DF4 2463000A */ addiu $v1, $v1, 0xa -/* 8325F8 80240DF8 AC830018 */ sw $v1, 0x18($a0) -/* 8325FC 80240DFC 286300FF */ slti $v1, $v1, 0xff -/* 832600 80240E00 2442000A */ addiu $v0, $v0, 0xa -/* 832604 80240E04 AC82001C */ sw $v0, 0x1c($a0) -/* 832608 80240E08 14600004 */ bnez $v1, .L80240E1C -/* 83260C 80240E0C 0000102D */ daddu $v0, $zero, $zero -/* 832610 80240E10 240200FF */ addiu $v0, $zero, 0xff -/* 832614 80240E14 AC820018 */ sw $v0, 0x18($a0) -/* 832618 80240E18 24020002 */ addiu $v0, $zero, 2 -.L80240E1C: -/* 83261C 80240E1C 8FBF0020 */ lw $ra, 0x20($sp) -/* 832620 80240E20 8FB1001C */ lw $s1, 0x1c($sp) -/* 832624 80240E24 8FB00018 */ lw $s0, 0x18($sp) -/* 832628 80240E28 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 83262C 80240E2C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 832630 80240E30 03E00008 */ jr $ra -/* 832634 80240E34 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s new file mode 100644 index 0000000000..e949687777 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240C20_832420.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C20_832420 +/* 832420 80240C20 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 832424 80240C24 AFB1001C */ sw $s1, 0x1c($sp) +/* 832428 80240C28 AFBF0020 */ sw $ra, 0x20($sp) +/* 83242C 80240C2C AFB00018 */ sw $s0, 0x18($sp) +/* 832430 80240C30 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 832434 80240C34 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 832438 80240C38 10A00060 */ beqz $a1, .L80240DBC +/* 83243C 80240C3C 0080882D */ daddu $s1, $a0, $zero +/* 832440 80240C40 3C05F4AC */ lui $a1, 0xf4ac +/* 832444 80240C44 0C0B1EAF */ jal get_variable +/* 832448 80240C48 34A5D481 */ ori $a1, $a1, 0xd481 +/* 83244C 80240C4C 0220202D */ daddu $a0, $s1, $zero +/* 832450 80240C50 3C05F4AC */ lui $a1, 0xf4ac +/* 832454 80240C54 4482B000 */ mtc1 $v0, $f22 +/* 832458 80240C58 00000000 */ nop +/* 83245C 80240C5C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 832460 80240C60 0C0B1EAF */ jal get_variable +/* 832464 80240C64 34A5D482 */ ori $a1, $a1, 0xd482 +/* 832468 80240C68 0220202D */ daddu $a0, $s1, $zero +/* 83246C 80240C6C 3C05F4AC */ lui $a1, 0xf4ac +/* 832470 80240C70 4482A000 */ mtc1 $v0, $f20 +/* 832474 80240C74 00000000 */ nop +/* 832478 80240C78 4680A520 */ cvt.s.w $f20, $f20 +/* 83247C 80240C7C 0C0B1EAF */ jal get_variable +/* 832480 80240C80 34A5D483 */ ori $a1, $a1, 0xd483 +/* 832484 80240C84 44821000 */ mtc1 $v0, $f2 +/* 832488 80240C88 00000000 */ nop +/* 83248C 80240C8C 468010A0 */ cvt.s.w $f2, $f2 +/* 832490 80240C90 4405B000 */ mfc1 $a1, $f22 +/* 832494 80240C94 4406A000 */ mfc1 $a2, $f20 +/* 832498 80240C98 44071000 */ mfc1 $a3, $f2 +/* 83249C 80240C9C 0C01C574 */ jal func_800715D0 +/* 8324A0 80240CA0 0000202D */ daddu $a0, $zero, $zero +/* 8324A4 80240CA4 0220202D */ daddu $a0, $s1, $zero +/* 8324A8 80240CA8 3C05F4AC */ lui $a1, 0xf4ac +/* 8324AC 80240CAC 34A5D481 */ ori $a1, $a1, 0xd481 +/* 8324B0 80240CB0 3C108025 */ lui $s0, %hi(ForceCloseMessageBox) +/* 8324B4 80240CB4 261013F0 */ addiu $s0, $s0, %lo(ForceCloseMessageBox) +/* 8324B8 80240CB8 0C0B1EAF */ jal get_variable +/* 8324BC 80240CBC AE020000 */ sw $v0, ($s0) +/* 8324C0 80240CC0 0220202D */ daddu $a0, $s1, $zero +/* 8324C4 80240CC4 3C05F4AC */ lui $a1, 0xf4ac +/* 8324C8 80240CC8 4482B000 */ mtc1 $v0, $f22 +/* 8324CC 80240CCC 00000000 */ nop +/* 8324D0 80240CD0 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8324D4 80240CD4 0C0B1EAF */ jal get_variable +/* 8324D8 80240CD8 34A5D482 */ ori $a1, $a1, 0xd482 +/* 8324DC 80240CDC 0220202D */ daddu $a0, $s1, $zero +/* 8324E0 80240CE0 3C05F4AC */ lui $a1, 0xf4ac +/* 8324E4 80240CE4 4482A000 */ mtc1 $v0, $f20 +/* 8324E8 80240CE8 00000000 */ nop +/* 8324EC 80240CEC 4680A520 */ cvt.s.w $f20, $f20 +/* 8324F0 80240CF0 0C0B1EAF */ jal get_variable +/* 8324F4 80240CF4 34A5D483 */ ori $a1, $a1, 0xd483 +/* 8324F8 80240CF8 44821000 */ mtc1 $v0, $f2 +/* 8324FC 80240CFC 00000000 */ nop +/* 832500 80240D00 468010A0 */ cvt.s.w $f2, $f2 +/* 832504 80240D04 4405B000 */ mfc1 $a1, $f22 +/* 832508 80240D08 4406A000 */ mfc1 $a2, $f20 +/* 83250C 80240D0C 44071000 */ mfc1 $a3, $f2 +/* 832510 80240D10 0C01C604 */ jal func_80071810 +/* 832514 80240D14 0000202D */ daddu $a0, $zero, $zero +/* 832518 80240D18 0220202D */ daddu $a0, $s1, $zero +/* 83251C 80240D1C 3C05F4AC */ lui $a1, 0xf4ac +/* 832520 80240D20 3C018025 */ lui $at, 0x8025 +/* 832524 80240D24 AC2213F4 */ sw $v0, 0x13f4($at) +/* 832528 80240D28 0C0B1EAF */ jal get_variable +/* 83252C 80240D2C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 832530 80240D30 0220202D */ daddu $a0, $s1, $zero +/* 832534 80240D34 3C05F4AC */ lui $a1, 0xf4ac +/* 832538 80240D38 4482B000 */ mtc1 $v0, $f22 +/* 83253C 80240D3C 00000000 */ nop +/* 832540 80240D40 4680B5A0 */ cvt.s.w $f22, $f22 +/* 832544 80240D44 0C0B1EAF */ jal get_variable +/* 832548 80240D48 34A5D482 */ ori $a1, $a1, 0xd482 +/* 83254C 80240D4C 0220202D */ daddu $a0, $s1, $zero +/* 832550 80240D50 3C05F4AC */ lui $a1, 0xf4ac +/* 832554 80240D54 4482A000 */ mtc1 $v0, $f20 +/* 832558 80240D58 00000000 */ nop +/* 83255C 80240D5C 4680A520 */ cvt.s.w $f20, $f20 +/* 832560 80240D60 0C0B1EAF */ jal get_variable +/* 832564 80240D64 34A5D483 */ ori $a1, $a1, 0xd483 +/* 832568 80240D68 44821000 */ mtc1 $v0, $f2 +/* 83256C 80240D6C 00000000 */ nop +/* 832570 80240D70 468010A0 */ cvt.s.w $f2, $f2 +/* 832574 80240D74 4405B000 */ mfc1 $a1, $f22 +/* 832578 80240D78 4406A000 */ mfc1 $a2, $f20 +/* 83257C 80240D7C 3C013F80 */ lui $at, 0x3f80 +/* 832580 80240D80 44810000 */ mtc1 $at, $f0 +/* 832584 80240D84 44071000 */ mfc1 $a3, $f2 +/* 832588 80240D88 0000202D */ daddu $a0, $zero, $zero +/* 83258C 80240D8C AFA00014 */ sw $zero, 0x14($sp) +/* 832590 80240D90 0C01CA24 */ jal func_80072890 +/* 832594 80240D94 E7A00010 */ swc1 $f0, 0x10($sp) +/* 832598 80240D98 8E030000 */ lw $v1, ($s0) +/* 83259C 80240D9C 8C64000C */ lw $a0, 0xc($v1) +/* 8325A0 80240DA0 3C018025 */ lui $at, 0x8025 +/* 8325A4 80240DA4 AC2213F8 */ sw $v0, 0x13f8($at) +/* 8325A8 80240DA8 AC800018 */ sw $zero, 0x18($a0) +/* 8325AC 80240DAC AC800020 */ sw $zero, 0x20($a0) +/* 8325B0 80240DB0 AC800024 */ sw $zero, 0x24($a0) +/* 8325B4 80240DB4 AC800028 */ sw $zero, 0x28($a0) +/* 8325B8 80240DB8 AC80001C */ sw $zero, 0x1c($a0) +.L80240DBC: +/* 8325BC 80240DBC 3C028025 */ lui $v0, %hi(ForceCloseMessageBox) +/* 8325C0 80240DC0 8C4213F0 */ lw $v0, %lo(ForceCloseMessageBox)($v0) +/* 8325C4 80240DC4 8C44000C */ lw $a0, 0xc($v0) +/* 8325C8 80240DC8 8C820020 */ lw $v0, 0x20($a0) +/* 8325CC 80240DCC 8C830028 */ lw $v1, 0x28($a0) +/* 8325D0 80240DD0 2442000A */ addiu $v0, $v0, 0xa +/* 8325D4 80240DD4 AC820020 */ sw $v0, 0x20($a0) +/* 8325D8 80240DD8 8C820024 */ lw $v0, 0x24($a0) +/* 8325DC 80240DDC 2463000A */ addiu $v1, $v1, 0xa +/* 8325E0 80240DE0 AC830028 */ sw $v1, 0x28($a0) +/* 8325E4 80240DE4 8C830018 */ lw $v1, 0x18($a0) +/* 8325E8 80240DE8 2442000A */ addiu $v0, $v0, 0xa +/* 8325EC 80240DEC AC820024 */ sw $v0, 0x24($a0) +/* 8325F0 80240DF0 8C82001C */ lw $v0, 0x1c($a0) +/* 8325F4 80240DF4 2463000A */ addiu $v1, $v1, 0xa +/* 8325F8 80240DF8 AC830018 */ sw $v1, 0x18($a0) +/* 8325FC 80240DFC 286300FF */ slti $v1, $v1, 0xff +/* 832600 80240E00 2442000A */ addiu $v0, $v0, 0xa +/* 832604 80240E04 AC82001C */ sw $v0, 0x1c($a0) +/* 832608 80240E08 14600004 */ bnez $v1, .L80240E1C +/* 83260C 80240E0C 0000102D */ daddu $v0, $zero, $zero +/* 832610 80240E10 240200FF */ addiu $v0, $zero, 0xff +/* 832614 80240E14 AC820018 */ sw $v0, 0x18($a0) +/* 832618 80240E18 24020002 */ addiu $v0, $zero, 2 +.L80240E1C: +/* 83261C 80240E1C 8FBF0020 */ lw $ra, 0x20($sp) +/* 832620 80240E20 8FB1001C */ lw $s1, 0x1c($sp) +/* 832624 80240E24 8FB00018 */ lw $s0, 0x18($sp) +/* 832628 80240E28 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 83262C 80240E2C D7B40028 */ ldc1 $f20, 0x28($sp) +/* 832630 80240E30 03E00008 */ jr $ra +/* 832634 80240E34 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38.s deleted file mode 100644 index f16fd35b36..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E38 -/* 832638 80240E38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 83263C 80240E3C 10A0000B */ beqz $a1, .L80240E6C -/* 832640 80240E40 AFBF0010 */ sw $ra, 0x10($sp) -/* 832644 80240E44 3C038025 */ lui $v1, 0x8025 -/* 832648 80240E48 8C6313F4 */ lw $v1, 0x13f4($v1) -/* 83264C 80240E4C 8C620000 */ lw $v0, ($v1) -/* 832650 80240E50 3C048025 */ lui $a0, 0x8025 -/* 832654 80240E54 8C8413F8 */ lw $a0, 0x13f8($a0) -/* 832658 80240E58 34420010 */ ori $v0, $v0, 0x10 -/* 83265C 80240E5C AC620000 */ sw $v0, ($v1) -/* 832660 80240E60 8C820000 */ lw $v0, ($a0) -/* 832664 80240E64 34420010 */ ori $v0, $v0, 0x10 -/* 832668 80240E68 AC820000 */ sw $v0, ($a0) -.L80240E6C: -/* 83266C 80240E6C 3C048025 */ lui $a0, %hi(ForceCloseMessageBox) -/* 832670 80240E70 8C8413F0 */ lw $a0, %lo(ForceCloseMessageBox)($a0) -/* 832674 80240E74 8C85000C */ lw $a1, 0xc($a0) -/* 832678 80240E78 8CA20018 */ lw $v0, 0x18($a1) -/* 83267C 80240E7C 8CA30020 */ lw $v1, 0x20($a1) -/* 832680 80240E80 2442FFF6 */ addiu $v0, $v0, -0xa -/* 832684 80240E84 ACA20018 */ sw $v0, 0x18($a1) -/* 832688 80240E88 8CA20024 */ lw $v0, 0x24($a1) -/* 83268C 80240E8C 2463FFF6 */ addiu $v1, $v1, -0xa -/* 832690 80240E90 ACA30020 */ sw $v1, 0x20($a1) -/* 832694 80240E94 8CA30028 */ lw $v1, 0x28($a1) -/* 832698 80240E98 2442FFF6 */ addiu $v0, $v0, -0xa -/* 83269C 80240E9C ACA20024 */ sw $v0, 0x24($a1) -/* 8326A0 80240EA0 8CA2001C */ lw $v0, 0x1c($a1) -/* 8326A4 80240EA4 2463FFF6 */ addiu $v1, $v1, -0xa -/* 8326A8 80240EA8 ACA30028 */ sw $v1, 0x28($a1) -/* 8326AC 80240EAC 8CA30018 */ lw $v1, 0x18($a1) -/* 8326B0 80240EB0 2442FFF6 */ addiu $v0, $v0, -0xa -/* 8326B4 80240EB4 18600003 */ blez $v1, .L80240EC4 -/* 8326B8 80240EB8 ACA2001C */ sw $v0, 0x1c($a1) -/* 8326BC 80240EBC 080903B8 */ j .L80240EE0 -/* 8326C0 80240EC0 0000102D */ daddu $v0, $zero, $zero -.L80240EC4: -/* 8326C4 80240EC4 0C016914 */ jal remove_effect -/* 8326C8 80240EC8 ACA00018 */ sw $zero, 0x18($a1) -/* 8326CC 80240ECC 3C048025 */ lui $a0, 0x8025 -/* 8326D0 80240ED0 8C8413D0 */ lw $a0, 0x13d0($a0) -/* 8326D4 80240ED4 0C048D70 */ jal func_801235C0 -/* 8326D8 80240ED8 00000000 */ nop -/* 8326DC 80240EDC 24020002 */ addiu $v0, $zero, 2 -.L80240EE0: -/* 8326E0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8326E4 80240EE4 03E00008 */ jr $ra -/* 8326E8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s new file mode 100644 index 0000000000..102a9bb4b2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240E38_832638.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E38_832638 +/* 832638 80240E38 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 83263C 80240E3C 10A0000B */ beqz $a1, .L80240E6C +/* 832640 80240E40 AFBF0010 */ sw $ra, 0x10($sp) +/* 832644 80240E44 3C038025 */ lui $v1, 0x8025 +/* 832648 80240E48 8C6313F4 */ lw $v1, 0x13f4($v1) +/* 83264C 80240E4C 8C620000 */ lw $v0, ($v1) +/* 832650 80240E50 3C048025 */ lui $a0, 0x8025 +/* 832654 80240E54 8C8413F8 */ lw $a0, 0x13f8($a0) +/* 832658 80240E58 34420010 */ ori $v0, $v0, 0x10 +/* 83265C 80240E5C AC620000 */ sw $v0, ($v1) +/* 832660 80240E60 8C820000 */ lw $v0, ($a0) +/* 832664 80240E64 34420010 */ ori $v0, $v0, 0x10 +/* 832668 80240E68 AC820000 */ sw $v0, ($a0) +.L80240E6C: +/* 83266C 80240E6C 3C048025 */ lui $a0, %hi(ForceCloseMessageBox) +/* 832670 80240E70 8C8413F0 */ lw $a0, %lo(ForceCloseMessageBox)($a0) +/* 832674 80240E74 8C85000C */ lw $a1, 0xc($a0) +/* 832678 80240E78 8CA20018 */ lw $v0, 0x18($a1) +/* 83267C 80240E7C 8CA30020 */ lw $v1, 0x20($a1) +/* 832680 80240E80 2442FFF6 */ addiu $v0, $v0, -0xa +/* 832684 80240E84 ACA20018 */ sw $v0, 0x18($a1) +/* 832688 80240E88 8CA20024 */ lw $v0, 0x24($a1) +/* 83268C 80240E8C 2463FFF6 */ addiu $v1, $v1, -0xa +/* 832690 80240E90 ACA30020 */ sw $v1, 0x20($a1) +/* 832694 80240E94 8CA30028 */ lw $v1, 0x28($a1) +/* 832698 80240E98 2442FFF6 */ addiu $v0, $v0, -0xa +/* 83269C 80240E9C ACA20024 */ sw $v0, 0x24($a1) +/* 8326A0 80240EA0 8CA2001C */ lw $v0, 0x1c($a1) +/* 8326A4 80240EA4 2463FFF6 */ addiu $v1, $v1, -0xa +/* 8326A8 80240EA8 ACA30028 */ sw $v1, 0x28($a1) +/* 8326AC 80240EAC 8CA30018 */ lw $v1, 0x18($a1) +/* 8326B0 80240EB0 2442FFF6 */ addiu $v0, $v0, -0xa +/* 8326B4 80240EB4 18600003 */ blez $v1, .L80240EC4 +/* 8326B8 80240EB8 ACA2001C */ sw $v0, 0x1c($a1) +/* 8326BC 80240EBC 080903B8 */ j .L80240EE0 +/* 8326C0 80240EC0 0000102D */ daddu $v0, $zero, $zero +.L80240EC4: +/* 8326C4 80240EC4 0C016914 */ jal remove_effect +/* 8326C8 80240EC8 ACA00018 */ sw $zero, 0x18($a1) +/* 8326CC 80240ECC 3C048025 */ lui $a0, 0x8025 +/* 8326D0 80240ED0 8C8413D0 */ lw $a0, 0x13d0($a0) +/* 8326D4 80240ED4 0C048D70 */ jal func_801235C0 +/* 8326D8 80240ED8 00000000 */ nop +/* 8326DC 80240EDC 24020002 */ addiu $v0, $zero, 2 +.L80240EE0: +/* 8326E0 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) +/* 8326E4 80240EE4 03E00008 */ jr $ra +/* 8326E8 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240EEC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240EEC.s deleted file mode 100644 index c4ae2e07e2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240EEC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EEC -/* 8326EC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8326F0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8326F4 80240EF4 8C82000C */ lw $v0, 0xc($a0) -/* 8326F8 80240EF8 0C0B1EAF */ jal get_variable -/* 8326FC 80240EFC 8C450000 */ lw $a1, ($v0) -/* 832700 80240F00 3C038025 */ lui $v1, %hi(ForceCloseMessageBox) -/* 832704 80240F04 8C6313F0 */ lw $v1, %lo(ForceCloseMessageBox)($v1) -/* 832708 80240F08 8C63000C */ lw $v1, 0xc($v1) -/* 83270C 80240F0C AC620034 */ sw $v0, 0x34($v1) -/* 832710 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* 832714 80240F14 24020002 */ addiu $v0, $zero, 2 -/* 832718 80240F18 03E00008 */ jr $ra -/* 83271C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240EEC_8326EC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240EEC_8326EC.s new file mode 100644 index 0000000000..e85b0ee677 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240EEC_8326EC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EEC_8326EC +/* 8326EC 80240EEC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8326F0 80240EF0 AFBF0010 */ sw $ra, 0x10($sp) +/* 8326F4 80240EF4 8C82000C */ lw $v0, 0xc($a0) +/* 8326F8 80240EF8 0C0B1EAF */ jal get_variable +/* 8326FC 80240EFC 8C450000 */ lw $a1, ($v0) +/* 832700 80240F00 3C038025 */ lui $v1, %hi(ForceCloseMessageBox) +/* 832704 80240F04 8C6313F0 */ lw $v1, %lo(ForceCloseMessageBox)($v1) +/* 832708 80240F08 8C63000C */ lw $v1, 0xc($v1) +/* 83270C 80240F0C AC620034 */ sw $v0, 0x34($v1) +/* 832710 80240F10 8FBF0010 */ lw $ra, 0x10($sp) +/* 832714 80240F14 24020002 */ addiu $v0, $zero, 2 +/* 832718 80240F18 03E00008 */ jr $ra +/* 83271C 80240F1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240F20.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240F20.s deleted file mode 100644 index c9ef3b1e29..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240F20.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F20 -/* 832720 80240F20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832724 80240F24 AFBF0010 */ sw $ra, 0x10($sp) -/* 832728 80240F28 8C82000C */ lw $v0, 0xc($a0) -/* 83272C 80240F2C 0C0B1EAF */ jal get_variable -/* 832730 80240F30 8C450000 */ lw $a1, ($v0) -/* 832734 80240F34 0040202D */ daddu $a0, $v0, $zero -/* 832738 80240F38 3C028025 */ lui $v0, %hi(ForceCloseMessageBox) -/* 83273C 80240F3C 8C4213F0 */ lw $v0, %lo(ForceCloseMessageBox)($v0) -/* 832740 80240F40 24030001 */ addiu $v1, $zero, 1 -/* 832744 80240F44 8C45000C */ lw $a1, 0xc($v0) -/* 832748 80240F48 1083000D */ beq $a0, $v1, .L80240F80 -/* 83274C 80240F4C 28820002 */ slti $v0, $a0, 2 -/* 832750 80240F50 10400005 */ beqz $v0, .L80240F68 -/* 832754 80240F54 24020002 */ addiu $v0, $zero, 2 -/* 832758 80240F58 10800007 */ beqz $a0, .L80240F78 -/* 83275C 80240F5C 240200C0 */ addiu $v0, $zero, 0xc0 -/* 832760 80240F60 080903E4 */ j .L80240F90 -/* 832764 80240F64 ACA00038 */ sw $zero, 0x38($a1) -.L80240F68: -/* 832768 80240F68 10820008 */ beq $a0, $v0, .L80240F8C -/* 83276C 80240F6C 24020040 */ addiu $v0, $zero, 0x40 -/* 832770 80240F70 080903E4 */ j .L80240F90 -/* 832774 80240F74 ACA00038 */ sw $zero, 0x38($a1) -.L80240F78: -/* 832778 80240F78 080903E4 */ j .L80240F90 -/* 83277C 80240F7C ACA20038 */ sw $v0, 0x38($a1) -.L80240F80: -/* 832780 80240F80 24020080 */ addiu $v0, $zero, 0x80 -/* 832784 80240F84 080903E4 */ j .L80240F90 -/* 832788 80240F88 ACA20038 */ sw $v0, 0x38($a1) -.L80240F8C: -/* 83278C 80240F8C ACA20038 */ sw $v0, 0x38($a1) -.L80240F90: -/* 832790 80240F90 8FBF0010 */ lw $ra, 0x10($sp) -/* 832794 80240F94 24020002 */ addiu $v0, $zero, 2 -/* 832798 80240F98 03E00008 */ jr $ra -/* 83279C 80240F9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240F20_832720.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240F20_832720.s new file mode 100644 index 0000000000..1ba3064275 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240F20_832720.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F20_832720 +/* 832720 80240F20 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 832724 80240F24 AFBF0010 */ sw $ra, 0x10($sp) +/* 832728 80240F28 8C82000C */ lw $v0, 0xc($a0) +/* 83272C 80240F2C 0C0B1EAF */ jal get_variable +/* 832730 80240F30 8C450000 */ lw $a1, ($v0) +/* 832734 80240F34 0040202D */ daddu $a0, $v0, $zero +/* 832738 80240F38 3C028025 */ lui $v0, %hi(ForceCloseMessageBox) +/* 83273C 80240F3C 8C4213F0 */ lw $v0, %lo(ForceCloseMessageBox)($v0) +/* 832740 80240F40 24030001 */ addiu $v1, $zero, 1 +/* 832744 80240F44 8C45000C */ lw $a1, 0xc($v0) +/* 832748 80240F48 1083000D */ beq $a0, $v1, .L80240F80 +/* 83274C 80240F4C 28820002 */ slti $v0, $a0, 2 +/* 832750 80240F50 10400005 */ beqz $v0, .L80240F68 +/* 832754 80240F54 24020002 */ addiu $v0, $zero, 2 +/* 832758 80240F58 10800007 */ beqz $a0, .L80240F78 +/* 83275C 80240F5C 240200C0 */ addiu $v0, $zero, 0xc0 +/* 832760 80240F60 080903E4 */ j .L80240F90 +/* 832764 80240F64 ACA00038 */ sw $zero, 0x38($a1) +.L80240F68: +/* 832768 80240F68 10820008 */ beq $a0, $v0, .L80240F8C +/* 83276C 80240F6C 24020040 */ addiu $v0, $zero, 0x40 +/* 832770 80240F70 080903E4 */ j .L80240F90 +/* 832774 80240F74 ACA00038 */ sw $zero, 0x38($a1) +.L80240F78: +/* 832778 80240F78 080903E4 */ j .L80240F90 +/* 83277C 80240F7C ACA20038 */ sw $v0, 0x38($a1) +.L80240F80: +/* 832780 80240F80 24020080 */ addiu $v0, $zero, 0x80 +/* 832784 80240F84 080903E4 */ j .L80240F90 +/* 832788 80240F88 ACA20038 */ sw $v0, 0x38($a1) +.L80240F8C: +/* 83278C 80240F8C ACA20038 */ sw $v0, 0x38($a1) +.L80240F90: +/* 832790 80240F90 8FBF0010 */ lw $ra, 0x10($sp) +/* 832794 80240F94 24020002 */ addiu $v0, $zero, 2 +/* 832798 80240F98 03E00008 */ jr $ra +/* 83279C 80240F9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0.s deleted file mode 100644 index ddf7c30f22..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FA0 -/* 8327A0 80240FA0 3C028025 */ lui $v0, 0x8025 -/* 8327A4 80240FA4 8C4213F8 */ lw $v0, 0x13f8($v0) -/* 8327A8 80240FA8 8C42000C */ lw $v0, 0xc($v0) -/* 8327AC 80240FAC AC40001C */ sw $zero, 0x1c($v0) -/* 8327B0 80240FB0 03E00008 */ jr $ra -/* 8327B4 80240FB4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0_8327A0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0_8327A0.s new file mode 100644 index 0000000000..3b9bde87a9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FA0_8327A0.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FA0_8327A0 +/* 8327A0 80240FA0 3C028025 */ lui $v0, 0x8025 +/* 8327A4 80240FA4 8C4213F8 */ lw $v0, 0x13f8($v0) +/* 8327A8 80240FA8 8C42000C */ lw $v0, 0xc($v0) +/* 8327AC 80240FAC AC40001C */ sw $zero, 0x1c($v0) +/* 8327B0 80240FB0 03E00008 */ jr $ra +/* 8327B4 80240FB4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4.s deleted file mode 100644 index cbecddb616..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD4 -/* 8327D4 80240FD4 3C028025 */ lui $v0, 0x8025 -/* 8327D8 80240FD8 8C4213F8 */ lw $v0, 0x13f8($v0) -/* 8327DC 80240FDC 8C43000C */ lw $v1, 0xc($v0) -/* 8327E0 80240FE0 24020002 */ addiu $v0, $zero, 2 -/* 8327E4 80240FE4 03E00008 */ jr $ra -/* 8327E8 80240FE8 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4_8327D4.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4_8327D4.s new file mode 100644 index 0000000000..4235da9fb1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FD4_8327D4.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FD4_8327D4 +/* 8327D4 80240FD4 3C028025 */ lui $v0, 0x8025 +/* 8327D8 80240FD8 8C4213F8 */ lw $v0, 0x13f8($v0) +/* 8327DC 80240FDC 8C43000C */ lw $v1, 0xc($v0) +/* 8327E0 80240FE0 24020002 */ addiu $v0, $zero, 2 +/* 8327E4 80240FE4 03E00008 */ jr $ra +/* 8327E8 80240FE8 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC.s deleted file mode 100644 index a394c4b7b3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FEC -/* 8327EC 80240FEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8327F0 80240FF0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8327F4 80240FF4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8327F8 80240FF8 3C05FE36 */ lui $a1, 0xfe36 -/* 8327FC 80240FFC AFBF0010 */ sw $ra, 0x10($sp) -/* 832800 80241000 80460075 */ lb $a2, 0x75($v0) -/* 832804 80241004 0C0B2026 */ jal set_variable -/* 832808 80241008 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 83280C 8024100C 8FBF0010 */ lw $ra, 0x10($sp) -/* 832810 80241010 24020002 */ addiu $v0, $zero, 2 -/* 832814 80241014 03E00008 */ jr $ra -/* 832818 80241018 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s new file mode 100644 index 0000000000..4949f1e384 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FEC_8327EC +/* 8327EC 80240FEC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8327F0 80240FF0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 8327F4 80240FF4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 8327F8 80240FF8 3C05FE36 */ lui $a1, 0xfe36 +/* 8327FC 80240FFC AFBF0010 */ sw $ra, 0x10($sp) +/* 832800 80241000 80460075 */ lb $a2, 0x75($v0) +/* 832804 80241004 0C0B2026 */ jal set_variable +/* 832808 80241008 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 83280C 8024100C 8FBF0010 */ lw $ra, 0x10($sp) +/* 832810 80241010 24020002 */ addiu $v0, $zero, 2 +/* 832814 80241014 03E00008 */ jr $ra +/* 832818 80241018 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C.s deleted file mode 100644 index a78f171586..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024101C -/* 83281C 8024101C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 832820 80241020 AFB10014 */ sw $s1, 0x14($sp) -/* 832824 80241024 0080882D */ daddu $s1, $a0, $zero -/* 832828 80241028 AFBF0018 */ sw $ra, 0x18($sp) -/* 83282C 8024102C AFB00010 */ sw $s0, 0x10($sp) -/* 832830 80241030 8E30000C */ lw $s0, 0xc($s1) -/* 832834 80241034 8E050000 */ lw $a1, ($s0) -/* 832838 80241038 0C0B1EAF */ jal get_variable -/* 83283C 8024103C 26100004 */ addiu $s0, $s0, 4 -/* 832840 80241040 0220202D */ daddu $a0, $s1, $zero -/* 832844 80241044 8E050000 */ lw $a1, ($s0) -/* 832848 80241048 0C0B210B */ jal get_float_variable -/* 83284C 8024104C 0040802D */ daddu $s0, $v0, $zero -/* 832850 80241050 24020002 */ addiu $v0, $zero, 2 -/* 832854 80241054 00501804 */ sllv $v1, $s0, $v0 -/* 832858 80241058 00701821 */ addu $v1, $v1, $s0 -/* 83285C 8024105C 00431804 */ sllv $v1, $v1, $v0 -/* 832860 80241060 00701823 */ subu $v1, $v1, $s0 -/* 832864 80241064 000320C0 */ sll $a0, $v1, 3 -/* 832868 80241068 00641821 */ addu $v1, $v1, $a0 -/* 83286C 8024106C 000318C0 */ sll $v1, $v1, 3 -/* 832870 80241070 3C01800B */ lui $at, 0x800b -/* 832874 80241074 00230821 */ addu $at, $at, $v1 -/* 832878 80241078 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 83287C 8024107C 8FBF0018 */ lw $ra, 0x18($sp) -/* 832880 80241080 8FB10014 */ lw $s1, 0x14($sp) -/* 832884 80241084 8FB00010 */ lw $s0, 0x10($sp) -/* 832888 80241088 03E00008 */ jr $ra -/* 83288C 8024108C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s new file mode 100644 index 0000000000..3a04e9fd08 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024101C_83281C +/* 83281C 8024101C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 832820 80241020 AFB10014 */ sw $s1, 0x14($sp) +/* 832824 80241024 0080882D */ daddu $s1, $a0, $zero +/* 832828 80241028 AFBF0018 */ sw $ra, 0x18($sp) +/* 83282C 8024102C AFB00010 */ sw $s0, 0x10($sp) +/* 832830 80241030 8E30000C */ lw $s0, 0xc($s1) +/* 832834 80241034 8E050000 */ lw $a1, ($s0) +/* 832838 80241038 0C0B1EAF */ jal get_variable +/* 83283C 8024103C 26100004 */ addiu $s0, $s0, 4 +/* 832840 80241040 0220202D */ daddu $a0, $s1, $zero +/* 832844 80241044 8E050000 */ lw $a1, ($s0) +/* 832848 80241048 0C0B210B */ jal get_float_variable +/* 83284C 8024104C 0040802D */ daddu $s0, $v0, $zero +/* 832850 80241050 24020002 */ addiu $v0, $zero, 2 +/* 832854 80241054 00501804 */ sllv $v1, $s0, $v0 +/* 832858 80241058 00701821 */ addu $v1, $v1, $s0 +/* 83285C 8024105C 00431804 */ sllv $v1, $v1, $v0 +/* 832860 80241060 00701823 */ subu $v1, $v1, $s0 +/* 832864 80241064 000320C0 */ sll $a0, $v1, 3 +/* 832868 80241068 00641821 */ addu $v1, $v1, $a0 +/* 83286C 8024106C 000318C0 */ sll $v1, $v1, 3 +/* 832870 80241070 3C01800B */ lui $at, 0x800b +/* 832874 80241074 00230821 */ addu $at, $at, $v1 +/* 832878 80241078 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 83287C 8024107C 8FBF0018 */ lw $ra, 0x18($sp) +/* 832880 80241080 8FB10014 */ lw $s1, 0x14($sp) +/* 832884 80241084 8FB00010 */ lw $s0, 0x10($sp) +/* 832888 80241088 03E00008 */ jr $ra +/* 83288C 8024108C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090.s deleted file mode 100644 index e2330f632b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241090 -/* 832890 80241090 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 832894 80241094 AFB10014 */ sw $s1, 0x14($sp) -/* 832898 80241098 0080882D */ daddu $s1, $a0, $zero -/* 83289C 8024109C AFBF0018 */ sw $ra, 0x18($sp) -/* 8328A0 802410A0 AFB00010 */ sw $s0, 0x10($sp) -/* 8328A4 802410A4 8E30000C */ lw $s0, 0xc($s1) -/* 8328A8 802410A8 8E050000 */ lw $a1, ($s0) -/* 8328AC 802410AC 0C0B1EAF */ jal get_variable -/* 8328B0 802410B0 26100004 */ addiu $s0, $s0, 4 -/* 8328B4 802410B4 00021880 */ sll $v1, $v0, 2 -/* 8328B8 802410B8 00621821 */ addu $v1, $v1, $v0 -/* 8328BC 802410BC 00031880 */ sll $v1, $v1, 2 -/* 8328C0 802410C0 00621823 */ subu $v1, $v1, $v0 -/* 8328C4 802410C4 000310C0 */ sll $v0, $v1, 3 -/* 8328C8 802410C8 00621821 */ addu $v1, $v1, $v0 -/* 8328CC 802410CC 000318C0 */ sll $v1, $v1, 3 -/* 8328D0 802410D0 3C01800B */ lui $at, 0x800b -/* 8328D4 802410D4 00230821 */ addu $at, $at, $v1 -/* 8328D8 802410D8 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8328DC 802410DC 3C014480 */ lui $at, 0x4480 -/* 8328E0 802410E0 44810000 */ mtc1 $at, $f0 -/* 8328E4 802410E4 00000000 */ nop -/* 8328E8 802410E8 46001082 */ mul.s $f2, $f2, $f0 -/* 8328EC 802410EC 00000000 */ nop -/* 8328F0 802410F0 3C01CD5B */ lui $at, 0xcd5b -/* 8328F4 802410F4 34215858 */ ori $at, $at, 0x5858 -/* 8328F8 802410F8 44810000 */ mtc1 $at, $f0 -/* 8328FC 802410FC 00000000 */ nop -/* 832900 80241100 46001080 */ add.s $f2, $f2, $f0 -/* 832904 80241104 8E050000 */ lw $a1, ($s0) -/* 832908 80241108 4600110D */ trunc.w.s $f4, $f2 -/* 83290C 8024110C 44062000 */ mfc1 $a2, $f4 -/* 832910 80241110 0C0B2026 */ jal set_variable -/* 832914 80241114 0220202D */ daddu $a0, $s1, $zero -/* 832918 80241118 8FBF0018 */ lw $ra, 0x18($sp) -/* 83291C 8024111C 8FB10014 */ lw $s1, 0x14($sp) -/* 832920 80241120 8FB00010 */ lw $s0, 0x10($sp) -/* 832924 80241124 24020002 */ addiu $v0, $zero, 2 -/* 832928 80241128 03E00008 */ jr $ra -/* 83292C 8024112C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s new file mode 100644 index 0000000000..80edc7ca7c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241090_832890 +/* 832890 80241090 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 832894 80241094 AFB10014 */ sw $s1, 0x14($sp) +/* 832898 80241098 0080882D */ daddu $s1, $a0, $zero +/* 83289C 8024109C AFBF0018 */ sw $ra, 0x18($sp) +/* 8328A0 802410A0 AFB00010 */ sw $s0, 0x10($sp) +/* 8328A4 802410A4 8E30000C */ lw $s0, 0xc($s1) +/* 8328A8 802410A8 8E050000 */ lw $a1, ($s0) +/* 8328AC 802410AC 0C0B1EAF */ jal get_variable +/* 8328B0 802410B0 26100004 */ addiu $s0, $s0, 4 +/* 8328B4 802410B4 00021880 */ sll $v1, $v0, 2 +/* 8328B8 802410B8 00621821 */ addu $v1, $v1, $v0 +/* 8328BC 802410BC 00031880 */ sll $v1, $v1, 2 +/* 8328C0 802410C0 00621823 */ subu $v1, $v1, $v0 +/* 8328C4 802410C4 000310C0 */ sll $v0, $v1, 3 +/* 8328C8 802410C8 00621821 */ addu $v1, $v1, $v0 +/* 8328CC 802410CC 000318C0 */ sll $v1, $v1, 3 +/* 8328D0 802410D0 3C01800B */ lui $at, 0x800b +/* 8328D4 802410D4 00230821 */ addu $at, $at, $v1 +/* 8328D8 802410D8 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 8328DC 802410DC 3C014480 */ lui $at, 0x4480 +/* 8328E0 802410E0 44810000 */ mtc1 $at, $f0 +/* 8328E4 802410E4 00000000 */ nop +/* 8328E8 802410E8 46001082 */ mul.s $f2, $f2, $f0 +/* 8328EC 802410EC 00000000 */ nop +/* 8328F0 802410F0 3C01CD5B */ lui $at, 0xcd5b +/* 8328F4 802410F4 34215858 */ ori $at, $at, 0x5858 +/* 8328F8 802410F8 44810000 */ mtc1 $at, $f0 +/* 8328FC 802410FC 00000000 */ nop +/* 832900 80241100 46001080 */ add.s $f2, $f2, $f0 +/* 832904 80241104 8E050000 */ lw $a1, ($s0) +/* 832908 80241108 4600110D */ trunc.w.s $f4, $f2 +/* 83290C 8024110C 44062000 */ mfc1 $a2, $f4 +/* 832910 80241110 0C0B2026 */ jal set_variable +/* 832914 80241114 0220202D */ daddu $a0, $s1, $zero +/* 832918 80241118 8FBF0018 */ lw $ra, 0x18($sp) +/* 83291C 8024111C 8FB10014 */ lw $s1, 0x14($sp) +/* 832920 80241120 8FB00010 */ lw $s0, 0x10($sp) +/* 832924 80241124 24020002 */ addiu $v0, $zero, 2 +/* 832928 80241128 03E00008 */ jr $ra +/* 83292C 8024112C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130.s deleted file mode 100644 index b47e749da1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241130 -/* 832930 80241130 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 832934 80241134 AFB20018 */ sw $s2, 0x18($sp) -/* 832938 80241138 0080902D */ daddu $s2, $a0, $zero -/* 83293C 8024113C AFBF0030 */ sw $ra, 0x30($sp) -/* 832940 80241140 AFB7002C */ sw $s7, 0x2c($sp) -/* 832944 80241144 AFB60028 */ sw $s6, 0x28($sp) -/* 832948 80241148 AFB50024 */ sw $s5, 0x24($sp) -/* 83294C 8024114C AFB40020 */ sw $s4, 0x20($sp) -/* 832950 80241150 AFB3001C */ sw $s3, 0x1c($sp) -/* 832954 80241154 AFB10014 */ sw $s1, 0x14($sp) -/* 832958 80241158 AFB00010 */ sw $s0, 0x10($sp) -/* 83295C 8024115C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 832960 80241160 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 832964 80241164 8E50000C */ lw $s0, 0xc($s2) -/* 832968 80241168 8E050000 */ lw $a1, ($s0) -/* 83296C 8024116C 0C0B1EAF */ jal get_variable -/* 832970 80241170 26100004 */ addiu $s0, $s0, 4 -/* 832974 80241174 8E050000 */ lw $a1, ($s0) -/* 832978 80241178 26100004 */ addiu $s0, $s0, 4 -/* 83297C 8024117C 0240202D */ daddu $a0, $s2, $zero -/* 832980 80241180 0C0B1EAF */ jal get_variable -/* 832984 80241184 0040B82D */ daddu $s7, $v0, $zero -/* 832988 80241188 8E050000 */ lw $a1, ($s0) -/* 83298C 8024118C 26100004 */ addiu $s0, $s0, 4 -/* 832990 80241190 0240202D */ daddu $a0, $s2, $zero -/* 832994 80241194 0C0B1EAF */ jal get_variable -/* 832998 80241198 0040B02D */ daddu $s6, $v0, $zero -/* 83299C 8024119C 0240202D */ daddu $a0, $s2, $zero -/* 8329A0 802411A0 3C05F4AC */ lui $a1, 0xf4ac -/* 8329A4 802411A4 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8329A8 802411A8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 8329AC 802411AC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 8329B0 802411B0 8E140000 */ lw $s4, ($s0) -/* 8329B4 802411B4 00061880 */ sll $v1, $a2, 2 -/* 8329B8 802411B8 00661821 */ addu $v1, $v1, $a2 -/* 8329BC 802411BC 00031880 */ sll $v1, $v1, 2 -/* 8329C0 802411C0 00661823 */ subu $v1, $v1, $a2 -/* 8329C4 802411C4 000330C0 */ sll $a2, $v1, 3 -/* 8329C8 802411C8 00661821 */ addu $v1, $v1, $a2 -/* 8329CC 802411CC 000318C0 */ sll $v1, $v1, 3 -/* 8329D0 802411D0 3C01800B */ lui $at, 0x800b -/* 8329D4 802411D4 00230821 */ addu $at, $at, $v1 -/* 8329D8 802411D8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8329DC 802411DC 8E150004 */ lw $s5, 4($s0) -/* 8329E0 802411E0 4600010D */ trunc.w.s $f4, $f0 -/* 8329E4 802411E4 44112000 */ mfc1 $s1, $f4 -/* 8329E8 802411E8 0C0B1EAF */ jal get_variable -/* 8329EC 802411EC 0040982D */ daddu $s3, $v0, $zero -/* 8329F0 802411F0 4491B000 */ mtc1 $s1, $f22 -/* 8329F4 802411F4 00000000 */ nop -/* 8329F8 802411F8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8329FC 802411FC 4600B306 */ mov.s $f12, $f22 -/* 832A00 80241200 0C00A8D4 */ jal cos_deg -/* 832A04 80241204 0040802D */ daddu $s0, $v0, $zero -/* 832A08 80241208 4493A000 */ mtc1 $s3, $f20 -/* 832A0C 8024120C 00000000 */ nop -/* 832A10 80241210 4680A520 */ cvt.s.w $f20, $f20 -/* 832A14 80241214 4600A002 */ mul.s $f0, $f20, $f0 -/* 832A18 80241218 00000000 */ nop -/* 832A1C 8024121C 0240202D */ daddu $a0, $s2, $zero -/* 832A20 80241220 44901000 */ mtc1 $s0, $f2 -/* 832A24 80241224 00000000 */ nop -/* 832A28 80241228 468010A0 */ cvt.s.w $f2, $f2 -/* 832A2C 8024122C 46001081 */ sub.s $f2, $f2, $f0 -/* 832A30 80241230 3C05F4AC */ lui $a1, 0xf4ac -/* 832A34 80241234 4600110D */ trunc.w.s $f4, $f2 -/* 832A38 80241238 44102000 */ mfc1 $s0, $f4 -/* 832A3C 8024123C 0C0B1EAF */ jal get_variable -/* 832A40 80241240 34A5D483 */ ori $a1, $a1, 0xd483 -/* 832A44 80241244 4600B306 */ mov.s $f12, $f22 -/* 832A48 80241248 0C00A8BB */ jal sin_deg -/* 832A4C 8024124C 0040882D */ daddu $s1, $v0, $zero -/* 832A50 80241250 4600A502 */ mul.s $f20, $f20, $f0 -/* 832A54 80241254 00000000 */ nop -/* 832A58 80241258 0240202D */ daddu $a0, $s2, $zero -/* 832A5C 8024125C 44910000 */ mtc1 $s1, $f0 -/* 832A60 80241260 00000000 */ nop -/* 832A64 80241264 46800020 */ cvt.s.w $f0, $f0 -/* 832A68 80241268 46140001 */ sub.s $f0, $f0, $f20 -/* 832A6C 8024126C 0280282D */ daddu $a1, $s4, $zero -/* 832A70 80241270 02173023 */ subu $a2, $s0, $s7 -/* 832A74 80241274 4600010D */ trunc.w.s $f4, $f0 -/* 832A78 80241278 44102000 */ mfc1 $s0, $f4 -/* 832A7C 8024127C 0C0B2026 */ jal set_variable -/* 832A80 80241280 02168023 */ subu $s0, $s0, $s6 -/* 832A84 80241284 0240202D */ daddu $a0, $s2, $zero -/* 832A88 80241288 02A0282D */ daddu $a1, $s5, $zero -/* 832A8C 8024128C 0C0B2026 */ jal set_variable -/* 832A90 80241290 0200302D */ daddu $a2, $s0, $zero -/* 832A94 80241294 8FBF0030 */ lw $ra, 0x30($sp) -/* 832A98 80241298 8FB7002C */ lw $s7, 0x2c($sp) -/* 832A9C 8024129C 8FB60028 */ lw $s6, 0x28($sp) -/* 832AA0 802412A0 8FB50024 */ lw $s5, 0x24($sp) -/* 832AA4 802412A4 8FB40020 */ lw $s4, 0x20($sp) -/* 832AA8 802412A8 8FB3001C */ lw $s3, 0x1c($sp) -/* 832AAC 802412AC 8FB20018 */ lw $s2, 0x18($sp) -/* 832AB0 802412B0 8FB10014 */ lw $s1, 0x14($sp) -/* 832AB4 802412B4 8FB00010 */ lw $s0, 0x10($sp) -/* 832AB8 802412B8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 832ABC 802412BC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 832AC0 802412C0 24020002 */ addiu $v0, $zero, 2 -/* 832AC4 802412C4 03E00008 */ jr $ra -/* 832AC8 802412C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s new file mode 100644 index 0000000000..4806014e37 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241130_832930 +/* 832930 80241130 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 832934 80241134 AFB20018 */ sw $s2, 0x18($sp) +/* 832938 80241138 0080902D */ daddu $s2, $a0, $zero +/* 83293C 8024113C AFBF0030 */ sw $ra, 0x30($sp) +/* 832940 80241140 AFB7002C */ sw $s7, 0x2c($sp) +/* 832944 80241144 AFB60028 */ sw $s6, 0x28($sp) +/* 832948 80241148 AFB50024 */ sw $s5, 0x24($sp) +/* 83294C 8024114C AFB40020 */ sw $s4, 0x20($sp) +/* 832950 80241150 AFB3001C */ sw $s3, 0x1c($sp) +/* 832954 80241154 AFB10014 */ sw $s1, 0x14($sp) +/* 832958 80241158 AFB00010 */ sw $s0, 0x10($sp) +/* 83295C 8024115C F7B60040 */ sdc1 $f22, 0x40($sp) +/* 832960 80241160 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 832964 80241164 8E50000C */ lw $s0, 0xc($s2) +/* 832968 80241168 8E050000 */ lw $a1, ($s0) +/* 83296C 8024116C 0C0B1EAF */ jal get_variable +/* 832970 80241170 26100004 */ addiu $s0, $s0, 4 +/* 832974 80241174 8E050000 */ lw $a1, ($s0) +/* 832978 80241178 26100004 */ addiu $s0, $s0, 4 +/* 83297C 8024117C 0240202D */ daddu $a0, $s2, $zero +/* 832980 80241180 0C0B1EAF */ jal get_variable +/* 832984 80241184 0040B82D */ daddu $s7, $v0, $zero +/* 832988 80241188 8E050000 */ lw $a1, ($s0) +/* 83298C 8024118C 26100004 */ addiu $s0, $s0, 4 +/* 832990 80241190 0240202D */ daddu $a0, $s2, $zero +/* 832994 80241194 0C0B1EAF */ jal get_variable +/* 832998 80241198 0040B02D */ daddu $s6, $v0, $zero +/* 83299C 8024119C 0240202D */ daddu $a0, $s2, $zero +/* 8329A0 802411A0 3C05F4AC */ lui $a1, 0xf4ac +/* 8329A4 802411A4 34A5D481 */ ori $a1, $a1, 0xd481 +/* 8329A8 802411A8 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* 8329AC 802411AC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* 8329B0 802411B0 8E140000 */ lw $s4, ($s0) +/* 8329B4 802411B4 00061880 */ sll $v1, $a2, 2 +/* 8329B8 802411B8 00661821 */ addu $v1, $v1, $a2 +/* 8329BC 802411BC 00031880 */ sll $v1, $v1, 2 +/* 8329C0 802411C0 00661823 */ subu $v1, $v1, $a2 +/* 8329C4 802411C4 000330C0 */ sll $a2, $v1, 3 +/* 8329C8 802411C8 00661821 */ addu $v1, $v1, $a2 +/* 8329CC 802411CC 000318C0 */ sll $v1, $v1, 3 +/* 8329D0 802411D0 3C01800B */ lui $at, 0x800b +/* 8329D4 802411D4 00230821 */ addu $at, $at, $v1 +/* 8329D8 802411D8 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 8329DC 802411DC 8E150004 */ lw $s5, 4($s0) +/* 8329E0 802411E0 4600010D */ trunc.w.s $f4, $f0 +/* 8329E4 802411E4 44112000 */ mfc1 $s1, $f4 +/* 8329E8 802411E8 0C0B1EAF */ jal get_variable +/* 8329EC 802411EC 0040982D */ daddu $s3, $v0, $zero +/* 8329F0 802411F0 4491B000 */ mtc1 $s1, $f22 +/* 8329F4 802411F4 00000000 */ nop +/* 8329F8 802411F8 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8329FC 802411FC 4600B306 */ mov.s $f12, $f22 +/* 832A00 80241200 0C00A8D4 */ jal cos_deg +/* 832A04 80241204 0040802D */ daddu $s0, $v0, $zero +/* 832A08 80241208 4493A000 */ mtc1 $s3, $f20 +/* 832A0C 8024120C 00000000 */ nop +/* 832A10 80241210 4680A520 */ cvt.s.w $f20, $f20 +/* 832A14 80241214 4600A002 */ mul.s $f0, $f20, $f0 +/* 832A18 80241218 00000000 */ nop +/* 832A1C 8024121C 0240202D */ daddu $a0, $s2, $zero +/* 832A20 80241220 44901000 */ mtc1 $s0, $f2 +/* 832A24 80241224 00000000 */ nop +/* 832A28 80241228 468010A0 */ cvt.s.w $f2, $f2 +/* 832A2C 8024122C 46001081 */ sub.s $f2, $f2, $f0 +/* 832A30 80241230 3C05F4AC */ lui $a1, 0xf4ac +/* 832A34 80241234 4600110D */ trunc.w.s $f4, $f2 +/* 832A38 80241238 44102000 */ mfc1 $s0, $f4 +/* 832A3C 8024123C 0C0B1EAF */ jal get_variable +/* 832A40 80241240 34A5D483 */ ori $a1, $a1, 0xd483 +/* 832A44 80241244 4600B306 */ mov.s $f12, $f22 +/* 832A48 80241248 0C00A8BB */ jal sin_deg +/* 832A4C 8024124C 0040882D */ daddu $s1, $v0, $zero +/* 832A50 80241250 4600A502 */ mul.s $f20, $f20, $f0 +/* 832A54 80241254 00000000 */ nop +/* 832A58 80241258 0240202D */ daddu $a0, $s2, $zero +/* 832A5C 8024125C 44910000 */ mtc1 $s1, $f0 +/* 832A60 80241260 00000000 */ nop +/* 832A64 80241264 46800020 */ cvt.s.w $f0, $f0 +/* 832A68 80241268 46140001 */ sub.s $f0, $f0, $f20 +/* 832A6C 8024126C 0280282D */ daddu $a1, $s4, $zero +/* 832A70 80241270 02173023 */ subu $a2, $s0, $s7 +/* 832A74 80241274 4600010D */ trunc.w.s $f4, $f0 +/* 832A78 80241278 44102000 */ mfc1 $s0, $f4 +/* 832A7C 8024127C 0C0B2026 */ jal set_variable +/* 832A80 80241280 02168023 */ subu $s0, $s0, $s6 +/* 832A84 80241284 0240202D */ daddu $a0, $s2, $zero +/* 832A88 80241288 02A0282D */ daddu $a1, $s5, $zero +/* 832A8C 8024128C 0C0B2026 */ jal set_variable +/* 832A90 80241290 0200302D */ daddu $a2, $s0, $zero +/* 832A94 80241294 8FBF0030 */ lw $ra, 0x30($sp) +/* 832A98 80241298 8FB7002C */ lw $s7, 0x2c($sp) +/* 832A9C 8024129C 8FB60028 */ lw $s6, 0x28($sp) +/* 832AA0 802412A0 8FB50024 */ lw $s5, 0x24($sp) +/* 832AA4 802412A4 8FB40020 */ lw $s4, 0x20($sp) +/* 832AA8 802412A8 8FB3001C */ lw $s3, 0x1c($sp) +/* 832AAC 802412AC 8FB20018 */ lw $s2, 0x18($sp) +/* 832AB0 802412B0 8FB10014 */ lw $s1, 0x14($sp) +/* 832AB4 802412B4 8FB00010 */ lw $s0, 0x10($sp) +/* 832AB8 802412B8 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 832ABC 802412BC D7B40038 */ ldc1 $f20, 0x38($sp) +/* 832AC0 802412C0 24020002 */ addiu $v0, $zero, 2 +/* 832AC4 802412C4 03E00008 */ jr $ra +/* 832AC8 802412C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC.s deleted file mode 100644 index f4590db1b1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412CC -/* 832ACC 802412CC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 832AD0 802412D0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 832AD4 802412D4 10A00002 */ beqz $a1, .L802412E0 -/* 832AD8 802412D8 2402003C */ addiu $v0, $zero, 0x3c -/* 832ADC 802412DC AC820070 */ sw $v0, 0x70($a0) -.L802412E0: -/* 832AE0 802412E0 C4620080 */ lwc1 $f2, 0x80($v1) -/* 832AE4 802412E4 3C0141F0 */ lui $at, 0x41f0 -/* 832AE8 802412E8 44810000 */ mtc1 $at, $f0 -/* 832AEC 802412EC 00000000 */ nop -/* 832AF0 802412F0 46001000 */ add.s $f0, $f2, $f0 -/* 832AF4 802412F4 3C0143B4 */ lui $at, 0x43b4 -/* 832AF8 802412F8 44811000 */ mtc1 $at, $f2 -/* 832AFC 802412FC 00000000 */ nop -/* 832B00 80241300 4600103E */ c.le.s $f2, $f0 -/* 832B04 80241304 00000000 */ nop -/* 832B08 80241308 45000003 */ bc1f .L80241318 -/* 832B0C 8024130C E4600080 */ swc1 $f0, 0x80($v1) -/* 832B10 80241310 46020001 */ sub.s $f0, $f0, $f2 -/* 832B14 80241314 E4600080 */ swc1 $f0, 0x80($v1) -.L80241318: -/* 832B18 80241318 8C820070 */ lw $v0, 0x70($a0) -/* 832B1C 8024131C 2442FFFF */ addiu $v0, $v0, -1 -/* 832B20 80241320 AC820070 */ sw $v0, 0x70($a0) -/* 832B24 80241324 000217C3 */ sra $v0, $v0, 0x1f -/* 832B28 80241328 03E00008 */ jr $ra -/* 832B2C 8024132C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s new file mode 100644 index 0000000000..57be333cb8 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412CC_832ACC +/* 832ACC 802412CC 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 832AD0 802412D0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 832AD4 802412D4 10A00002 */ beqz $a1, .L802412E0 +/* 832AD8 802412D8 2402003C */ addiu $v0, $zero, 0x3c +/* 832ADC 802412DC AC820070 */ sw $v0, 0x70($a0) +.L802412E0: +/* 832AE0 802412E0 C4620080 */ lwc1 $f2, 0x80($v1) +/* 832AE4 802412E4 3C0141F0 */ lui $at, 0x41f0 +/* 832AE8 802412E8 44810000 */ mtc1 $at, $f0 +/* 832AEC 802412EC 00000000 */ nop +/* 832AF0 802412F0 46001000 */ add.s $f0, $f2, $f0 +/* 832AF4 802412F4 3C0143B4 */ lui $at, 0x43b4 +/* 832AF8 802412F8 44811000 */ mtc1 $at, $f2 +/* 832AFC 802412FC 00000000 */ nop +/* 832B00 80241300 4600103E */ c.le.s $f2, $f0 +/* 832B04 80241304 00000000 */ nop +/* 832B08 80241308 45000003 */ bc1f .L80241318 +/* 832B0C 8024130C E4600080 */ swc1 $f0, 0x80($v1) +/* 832B10 80241310 46020001 */ sub.s $f0, $f0, $f2 +/* 832B14 80241314 E4600080 */ swc1 $f0, 0x80($v1) +.L80241318: +/* 832B18 80241318 8C820070 */ lw $v0, 0x70($a0) +/* 832B1C 8024131C 2442FFFF */ addiu $v0, $v0, -1 +/* 832B20 80241320 AC820070 */ sw $v0, 0x70($a0) +/* 832B24 80241324 000217C3 */ sra $v0, $v0, 0x1f +/* 832B28 80241328 03E00008 */ jr $ra +/* 832B2C 8024132C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330.s deleted file mode 100644 index ea91392b2d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241330 -/* 832B30 80241330 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 832B34 80241334 AFB10014 */ sw $s1, 0x14($sp) -/* 832B38 80241338 0080882D */ daddu $s1, $a0, $zero -/* 832B3C 8024133C AFB00010 */ sw $s0, 0x10($sp) -/* 832B40 80241340 00A0802D */ daddu $s0, $a1, $zero -/* 832B44 80241344 AFBF0018 */ sw $ra, 0x18($sp) -/* 832B48 80241348 0C00EABB */ jal get_npc_unsafe -/* 832B4C 8024134C 2404FFFC */ addiu $a0, $zero, -4 -/* 832B50 80241350 12000003 */ beqz $s0, .L80241360 -/* 832B54 80241354 0040182D */ daddu $v1, $v0, $zero -/* 832B58 80241358 2402003C */ addiu $v0, $zero, 0x3c -/* 832B5C 8024135C AE220070 */ sw $v0, 0x70($s1) -.L80241360: -/* 832B60 80241360 C462000C */ lwc1 $f2, 0xc($v1) -/* 832B64 80241364 3C0141F0 */ lui $at, 0x41f0 -/* 832B68 80241368 44810000 */ mtc1 $at, $f0 -/* 832B6C 8024136C 00000000 */ nop -/* 832B70 80241370 46001000 */ add.s $f0, $f2, $f0 -/* 832B74 80241374 3C0143B4 */ lui $at, 0x43b4 -/* 832B78 80241378 44811000 */ mtc1 $at, $f2 -/* 832B7C 8024137C 00000000 */ nop -/* 832B80 80241380 4600103E */ c.le.s $f2, $f0 -/* 832B84 80241384 00000000 */ nop -/* 832B88 80241388 45000003 */ bc1f .L80241398 -/* 832B8C 8024138C E460000C */ swc1 $f0, 0xc($v1) -/* 832B90 80241390 46020001 */ sub.s $f0, $f0, $f2 -/* 832B94 80241394 E460000C */ swc1 $f0, 0xc($v1) -.L80241398: -/* 832B98 80241398 8E230070 */ lw $v1, 0x70($s1) -/* 832B9C 8024139C 2463FFFF */ addiu $v1, $v1, -1 -/* 832BA0 802413A0 000317C3 */ sra $v0, $v1, 0x1f -/* 832BA4 802413A4 AE230070 */ sw $v1, 0x70($s1) -/* 832BA8 802413A8 8FBF0018 */ lw $ra, 0x18($sp) -/* 832BAC 802413AC 8FB10014 */ lw $s1, 0x14($sp) -/* 832BB0 802413B0 8FB00010 */ lw $s0, 0x10($sp) -/* 832BB4 802413B4 30420002 */ andi $v0, $v0, 2 -/* 832BB8 802413B8 03E00008 */ jr $ra -/* 832BBC 802413BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s new file mode 100644 index 0000000000..4f4864ebad --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241330_832B30 +/* 832B30 80241330 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 832B34 80241334 AFB10014 */ sw $s1, 0x14($sp) +/* 832B38 80241338 0080882D */ daddu $s1, $a0, $zero +/* 832B3C 8024133C AFB00010 */ sw $s0, 0x10($sp) +/* 832B40 80241340 00A0802D */ daddu $s0, $a1, $zero +/* 832B44 80241344 AFBF0018 */ sw $ra, 0x18($sp) +/* 832B48 80241348 0C00EABB */ jal get_npc_unsafe +/* 832B4C 8024134C 2404FFFC */ addiu $a0, $zero, -4 +/* 832B50 80241350 12000003 */ beqz $s0, .L80241360 +/* 832B54 80241354 0040182D */ daddu $v1, $v0, $zero +/* 832B58 80241358 2402003C */ addiu $v0, $zero, 0x3c +/* 832B5C 8024135C AE220070 */ sw $v0, 0x70($s1) +.L80241360: +/* 832B60 80241360 C462000C */ lwc1 $f2, 0xc($v1) +/* 832B64 80241364 3C0141F0 */ lui $at, 0x41f0 +/* 832B68 80241368 44810000 */ mtc1 $at, $f0 +/* 832B6C 8024136C 00000000 */ nop +/* 832B70 80241370 46001000 */ add.s $f0, $f2, $f0 +/* 832B74 80241374 3C0143B4 */ lui $at, 0x43b4 +/* 832B78 80241378 44811000 */ mtc1 $at, $f2 +/* 832B7C 8024137C 00000000 */ nop +/* 832B80 80241380 4600103E */ c.le.s $f2, $f0 +/* 832B84 80241384 00000000 */ nop +/* 832B88 80241388 45000003 */ bc1f .L80241398 +/* 832B8C 8024138C E460000C */ swc1 $f0, 0xc($v1) +/* 832B90 80241390 46020001 */ sub.s $f0, $f0, $f2 +/* 832B94 80241394 E460000C */ swc1 $f0, 0xc($v1) +.L80241398: +/* 832B98 80241398 8E230070 */ lw $v1, 0x70($s1) +/* 832B9C 8024139C 2463FFFF */ addiu $v1, $v1, -1 +/* 832BA0 802413A0 000317C3 */ sra $v0, $v1, 0x1f +/* 832BA4 802413A4 AE230070 */ sw $v1, 0x70($s1) +/* 832BA8 802413A8 8FBF0018 */ lw $ra, 0x18($sp) +/* 832BAC 802413AC 8FB10014 */ lw $s1, 0x14($sp) +/* 832BB0 802413B0 8FB00010 */ lw $s0, 0x10($sp) +/* 832BB4 802413B4 30420002 */ andi $v0, $v0, 2 +/* 832BB8 802413B8 03E00008 */ jr $ra +/* 832BBC 802413BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0.s deleted file mode 100644 index 12a6455820..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413C0 -/* 832BC0 802413C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 832BC4 802413C4 AFB10014 */ sw $s1, 0x14($sp) -/* 832BC8 802413C8 0080882D */ daddu $s1, $a0, $zero -/* 832BCC 802413CC AFB00010 */ sw $s0, 0x10($sp) -/* 832BD0 802413D0 00A0802D */ daddu $s0, $a1, $zero -/* 832BD4 802413D4 AFBF001C */ sw $ra, 0x1c($sp) -/* 832BD8 802413D8 AFB20018 */ sw $s2, 0x18($sp) -/* 832BDC 802413DC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 832BE0 802413E0 0C00EABB */ jal get_npc_unsafe -/* 832BE4 802413E4 2404FFFC */ addiu $a0, $zero, -4 -/* 832BE8 802413E8 12000017 */ beqz $s0, .L80241448 -/* 832BEC 802413EC 0040902D */ daddu $s2, $v0, $zero -/* 832BF0 802413F0 0220202D */ daddu $a0, $s1, $zero -/* 832BF4 802413F4 3C05FE36 */ lui $a1, 0xfe36 -/* 832BF8 802413F8 0C0B210B */ jal get_float_variable -/* 832BFC 802413FC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 832C00 80241400 0220202D */ daddu $a0, $s1, $zero -/* 832C04 80241404 3C05FE36 */ lui $a1, 0xfe36 -/* 832C08 80241408 3C014270 */ lui $at, 0x4270 -/* 832C0C 8024140C 4481A000 */ mtc1 $at, $f20 -/* 832C10 80241410 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 832C14 80241414 46140003 */ div.s $f0, $f0, $f20 -/* 832C18 80241418 0C0B210B */ jal get_float_variable -/* 832C1C 8024141C E6200074 */ swc1 $f0, 0x74($s1) -/* 832C20 80241420 0220202D */ daddu $a0, $s1, $zero -/* 832C24 80241424 3C05FE36 */ lui $a1, 0xfe36 -/* 832C28 80241428 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 832C2C 8024142C 46140003 */ div.s $f0, $f0, $f20 -/* 832C30 80241430 0C0B210B */ jal get_float_variable -/* 832C34 80241434 E6200078 */ swc1 $f0, 0x78($s1) -/* 832C38 80241438 46140003 */ div.s $f0, $f0, $f20 -/* 832C3C 8024143C 2402003C */ addiu $v0, $zero, 0x3c -/* 832C40 80241440 E620007C */ swc1 $f0, 0x7c($s1) -/* 832C44 80241444 AE220070 */ sw $v0, 0x70($s1) -.L80241448: -/* 832C48 80241448 C6400038 */ lwc1 $f0, 0x38($s2) -/* 832C4C 8024144C C6220074 */ lwc1 $f2, 0x74($s1) -/* 832C50 80241450 46020000 */ add.s $f0, $f0, $f2 -/* 832C54 80241454 E6400038 */ swc1 $f0, 0x38($s2) -/* 832C58 80241458 C640003C */ lwc1 $f0, 0x3c($s2) -/* 832C5C 8024145C C6220078 */ lwc1 $f2, 0x78($s1) -/* 832C60 80241460 46020000 */ add.s $f0, $f0, $f2 -/* 832C64 80241464 E640003C */ swc1 $f0, 0x3c($s2) -/* 832C68 80241468 C6400040 */ lwc1 $f0, 0x40($s2) -/* 832C6C 8024146C C622007C */ lwc1 $f2, 0x7c($s1) -/* 832C70 80241470 46020000 */ add.s $f0, $f0, $f2 -/* 832C74 80241474 E6400040 */ swc1 $f0, 0x40($s2) -/* 832C78 80241478 8E230070 */ lw $v1, 0x70($s1) -/* 832C7C 8024147C 2463FFFF */ addiu $v1, $v1, -1 -/* 832C80 80241480 2C620001 */ sltiu $v0, $v1, 1 -/* 832C84 80241484 AE230070 */ sw $v1, 0x70($s1) -/* 832C88 80241488 8FBF001C */ lw $ra, 0x1c($sp) -/* 832C8C 8024148C 8FB20018 */ lw $s2, 0x18($sp) -/* 832C90 80241490 8FB10014 */ lw $s1, 0x14($sp) -/* 832C94 80241494 8FB00010 */ lw $s0, 0x10($sp) -/* 832C98 80241498 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 832C9C 8024149C 00021040 */ sll $v0, $v0, 1 -/* 832CA0 802414A0 03E00008 */ jr $ra -/* 832CA4 802414A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s new file mode 100644 index 0000000000..63ba3c5753 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413C0_832BC0 +/* 832BC0 802413C0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 832BC4 802413C4 AFB10014 */ sw $s1, 0x14($sp) +/* 832BC8 802413C8 0080882D */ daddu $s1, $a0, $zero +/* 832BCC 802413CC AFB00010 */ sw $s0, 0x10($sp) +/* 832BD0 802413D0 00A0802D */ daddu $s0, $a1, $zero +/* 832BD4 802413D4 AFBF001C */ sw $ra, 0x1c($sp) +/* 832BD8 802413D8 AFB20018 */ sw $s2, 0x18($sp) +/* 832BDC 802413DC F7B40020 */ sdc1 $f20, 0x20($sp) +/* 832BE0 802413E0 0C00EABB */ jal get_npc_unsafe +/* 832BE4 802413E4 2404FFFC */ addiu $a0, $zero, -4 +/* 832BE8 802413E8 12000017 */ beqz $s0, .L80241448 +/* 832BEC 802413EC 0040902D */ daddu $s2, $v0, $zero +/* 832BF0 802413F0 0220202D */ daddu $a0, $s1, $zero +/* 832BF4 802413F4 3C05FE36 */ lui $a1, 0xfe36 +/* 832BF8 802413F8 0C0B210B */ jal get_float_variable +/* 832BFC 802413FC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 832C00 80241400 0220202D */ daddu $a0, $s1, $zero +/* 832C04 80241404 3C05FE36 */ lui $a1, 0xfe36 +/* 832C08 80241408 3C014270 */ lui $at, 0x4270 +/* 832C0C 8024140C 4481A000 */ mtc1 $at, $f20 +/* 832C10 80241410 34A53C85 */ ori $a1, $a1, 0x3c85 +/* 832C14 80241414 46140003 */ div.s $f0, $f0, $f20 +/* 832C18 80241418 0C0B210B */ jal get_float_variable +/* 832C1C 8024141C E6200074 */ swc1 $f0, 0x74($s1) +/* 832C20 80241420 0220202D */ daddu $a0, $s1, $zero +/* 832C24 80241424 3C05FE36 */ lui $a1, 0xfe36 +/* 832C28 80241428 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 832C2C 8024142C 46140003 */ div.s $f0, $f0, $f20 +/* 832C30 80241430 0C0B210B */ jal get_float_variable +/* 832C34 80241434 E6200078 */ swc1 $f0, 0x78($s1) +/* 832C38 80241438 46140003 */ div.s $f0, $f0, $f20 +/* 832C3C 8024143C 2402003C */ addiu $v0, $zero, 0x3c +/* 832C40 80241440 E620007C */ swc1 $f0, 0x7c($s1) +/* 832C44 80241444 AE220070 */ sw $v0, 0x70($s1) +.L80241448: +/* 832C48 80241448 C6400038 */ lwc1 $f0, 0x38($s2) +/* 832C4C 8024144C C6220074 */ lwc1 $f2, 0x74($s1) +/* 832C50 80241450 46020000 */ add.s $f0, $f0, $f2 +/* 832C54 80241454 E6400038 */ swc1 $f0, 0x38($s2) +/* 832C58 80241458 C640003C */ lwc1 $f0, 0x3c($s2) +/* 832C5C 8024145C C6220078 */ lwc1 $f2, 0x78($s1) +/* 832C60 80241460 46020000 */ add.s $f0, $f0, $f2 +/* 832C64 80241464 E640003C */ swc1 $f0, 0x3c($s2) +/* 832C68 80241468 C6400040 */ lwc1 $f0, 0x40($s2) +/* 832C6C 8024146C C622007C */ lwc1 $f2, 0x7c($s1) +/* 832C70 80241470 46020000 */ add.s $f0, $f0, $f2 +/* 832C74 80241474 E6400040 */ swc1 $f0, 0x40($s2) +/* 832C78 80241478 8E230070 */ lw $v1, 0x70($s1) +/* 832C7C 8024147C 2463FFFF */ addiu $v1, $v1, -1 +/* 832C80 80241480 2C620001 */ sltiu $v0, $v1, 1 +/* 832C84 80241484 AE230070 */ sw $v1, 0x70($s1) +/* 832C88 80241488 8FBF001C */ lw $ra, 0x1c($sp) +/* 832C8C 8024148C 8FB20018 */ lw $s2, 0x18($sp) +/* 832C90 80241490 8FB10014 */ lw $s1, 0x14($sp) +/* 832C94 80241494 8FB00010 */ lw $s0, 0x10($sp) +/* 832C98 80241498 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 832C9C 8024149C 00021040 */ sll $v0, $v0, 1 +/* 832CA0 802414A0 03E00008 */ jr $ra +/* 832CA4 802414A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8.s deleted file mode 100644 index d1e88ca54a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414A8 -/* 832CA8 802414A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832CAC 802414AC 3C058025 */ lui $a1, 0x8025 -/* 832CB0 802414B0 8CA513E8 */ lw $a1, 0x13e8($a1) -/* 832CB4 802414B4 AFBF0010 */ sw $ra, 0x10($sp) -/* 832CB8 802414B8 0C0B1EAF */ jal get_variable -/* 832CBC 802414BC 0000202D */ daddu $a0, $zero, $zero -/* 832CC0 802414C0 0040182D */ daddu $v1, $v0, $zero -/* 832CC4 802414C4 24020001 */ addiu $v0, $zero, 1 -/* 832CC8 802414C8 14620006 */ bne $v1, $v0, .L802414E4 -/* 832CCC 802414CC 24020002 */ addiu $v0, $zero, 2 -/* 832CD0 802414D0 44800000 */ mtc1 $zero, $f0 -/* 832CD4 802414D4 00000000 */ nop -/* 832CD8 802414D8 44050000 */ mfc1 $a1, $f0 -/* 832CDC 802414DC 0809053F */ j .L802414FC -/* 832CE0 802414E0 0000202D */ daddu $a0, $zero, $zero -.L802414E4: -/* 832CE4 802414E4 14620008 */ bne $v1, $v0, .L80241508 -/* 832CE8 802414E8 24040001 */ addiu $a0, $zero, 1 -/* 832CEC 802414EC 44800000 */ mtc1 $zero, $f0 -/* 832CF0 802414F0 00000000 */ nop -/* 832CF4 802414F4 44050000 */ mfc1 $a1, $f0 -/* 832CF8 802414F8 00000000 */ nop -.L802414FC: -/* 832CFC 802414FC 00A0302D */ daddu $a2, $a1, $zero -/* 832D00 80241500 0C01C5A4 */ jal func_80071690 -/* 832D04 80241504 00A0382D */ daddu $a3, $a1, $zero -.L80241508: -/* 832D08 80241508 8FBF0010 */ lw $ra, 0x10($sp) -/* 832D0C 8024150C 03E00008 */ jr $ra -/* 832D10 80241510 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s new file mode 100644 index 0000000000..3a1166c421 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802414A8_832CA8.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414A8_832CA8 +/* 832CA8 802414A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 832CAC 802414AC 3C058025 */ lui $a1, 0x8025 +/* 832CB0 802414B0 8CA513E8 */ lw $a1, 0x13e8($a1) +/* 832CB4 802414B4 AFBF0010 */ sw $ra, 0x10($sp) +/* 832CB8 802414B8 0C0B1EAF */ jal get_variable +/* 832CBC 802414BC 0000202D */ daddu $a0, $zero, $zero +/* 832CC0 802414C0 0040182D */ daddu $v1, $v0, $zero +/* 832CC4 802414C4 24020001 */ addiu $v0, $zero, 1 +/* 832CC8 802414C8 14620006 */ bne $v1, $v0, .L802414E4 +/* 832CCC 802414CC 24020002 */ addiu $v0, $zero, 2 +/* 832CD0 802414D0 44800000 */ mtc1 $zero, $f0 +/* 832CD4 802414D4 00000000 */ nop +/* 832CD8 802414D8 44050000 */ mfc1 $a1, $f0 +/* 832CDC 802414DC 0809053F */ j .L802414FC +/* 832CE0 802414E0 0000202D */ daddu $a0, $zero, $zero +.L802414E4: +/* 832CE4 802414E4 14620008 */ bne $v1, $v0, .L80241508 +/* 832CE8 802414E8 24040001 */ addiu $a0, $zero, 1 +/* 832CEC 802414EC 44800000 */ mtc1 $zero, $f0 +/* 832CF0 802414F0 00000000 */ nop +/* 832CF4 802414F4 44050000 */ mfc1 $a1, $f0 +/* 832CF8 802414F8 00000000 */ nop +.L802414FC: +/* 832CFC 802414FC 00A0302D */ daddu $a2, $a1, $zero +/* 832D00 80241500 0C01C5A4 */ jal func_80071690 +/* 832D04 80241504 00A0382D */ daddu $a3, $a1, $zero +.L80241508: +/* 832D08 80241508 8FBF0010 */ lw $ra, 0x10($sp) +/* 832D0C 8024150C 03E00008 */ jr $ra +/* 832D10 80241510 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514.s deleted file mode 100644 index 63bfd1c4ea..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241514 -/* 832D14 80241514 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832D18 80241518 3C058024 */ lui $a1, 0x8024 -/* 832D1C 8024151C 24A514A8 */ addiu $a1, $a1, 0x14a8 -/* 832D20 80241520 AFBF0010 */ sw $ra, 0x10($sp) -/* 832D24 80241524 0C048C8F */ jal bind_dynamic_entity_7 -/* 832D28 80241528 0000202D */ daddu $a0, $zero, $zero -/* 832D2C 8024152C 8FBF0010 */ lw $ra, 0x10($sp) -/* 832D30 80241530 3C018025 */ lui $at, 0x8025 -/* 832D34 80241534 AC2213D0 */ sw $v0, 0x13d0($at) -/* 832D38 80241538 24020002 */ addiu $v0, $zero, 2 -/* 832D3C 8024153C 03E00008 */ jr $ra -/* 832D40 80241540 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s new file mode 100644 index 0000000000..a8dbeefe0e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241514_832D14.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241514_832D14 +/* 832D14 80241514 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 832D18 80241518 3C058024 */ lui $a1, 0x8024 +/* 832D1C 8024151C 24A514A8 */ addiu $a1, $a1, 0x14a8 +/* 832D20 80241520 AFBF0010 */ sw $ra, 0x10($sp) +/* 832D24 80241524 0C048C8F */ jal bind_dynamic_entity_7 +/* 832D28 80241528 0000202D */ daddu $a0, $zero, $zero +/* 832D2C 8024152C 8FBF0010 */ lw $ra, 0x10($sp) +/* 832D30 80241530 3C018025 */ lui $at, 0x8025 +/* 832D34 80241534 AC2213D0 */ sw $v0, 0x13d0($at) +/* 832D38 80241538 24020002 */ addiu $v0, $zero, 2 +/* 832D3C 8024153C 03E00008 */ jr $ra +/* 832D40 80241540 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770.s deleted file mode 100644 index 418f54fe93..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241770 -/* 832F70 80241770 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832F74 80241774 AFBF0010 */ sw $ra, 0x10($sp) -/* 832F78 80241778 10A00003 */ beqz $a1, .L80241788 -/* 832F7C 8024177C 8C86000C */ lw $a2, 0xc($a0) -/* 832F80 80241780 3C018025 */ lui $at, 0x8025 -/* 832F84 80241784 AC208C6C */ sw $zero, -0x7394($at) -.L80241788: -/* 832F88 80241788 3C038025 */ lui $v1, 0x8025 -/* 832F8C 8024178C 24638C6C */ addiu $v1, $v1, -0x7394 -/* 832F90 80241790 8C620000 */ lw $v0, ($v1) -/* 832F94 80241794 54400003 */ bnel $v0, $zero, .L802417A4 -/* 832F98 80241798 AC600000 */ sw $zero, ($v1) -/* 832F9C 8024179C 080905EE */ j .L802417B8 -/* 832FA0 802417A0 0000102D */ daddu $v0, $zero, $zero -.L802417A4: -/* 832FA4 802417A4 8CC50000 */ lw $a1, ($a2) -/* 832FA8 802417A8 3C068025 */ lui $a2, 0x8025 -/* 832FAC 802417AC 0C0B2026 */ jal set_variable -/* 832FB0 802417B0 8CC68C70 */ lw $a2, -0x7390($a2) -/* 832FB4 802417B4 24020002 */ addiu $v0, $zero, 2 -.L802417B8: -/* 832FB8 802417B8 8FBF0010 */ lw $ra, 0x10($sp) -/* 832FBC 802417BC 03E00008 */ jr $ra -/* 832FC0 802417C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s new file mode 100644 index 0000000000..d2c09d6979 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241770_832F70.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241770_832F70 +/* 832F70 80241770 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 832F74 80241774 AFBF0010 */ sw $ra, 0x10($sp) +/* 832F78 80241778 10A00003 */ beqz $a1, .L80241788 +/* 832F7C 8024177C 8C86000C */ lw $a2, 0xc($a0) +/* 832F80 80241780 3C018025 */ lui $at, 0x8025 +/* 832F84 80241784 AC208C6C */ sw $zero, -0x7394($at) +.L80241788: +/* 832F88 80241788 3C038025 */ lui $v1, 0x8025 +/* 832F8C 8024178C 24638C6C */ addiu $v1, $v1, -0x7394 +/* 832F90 80241790 8C620000 */ lw $v0, ($v1) +/* 832F94 80241794 54400003 */ bnel $v0, $zero, .L802417A4 +/* 832F98 80241798 AC600000 */ sw $zero, ($v1) +/* 832F9C 8024179C 080905EE */ j .L802417B8 +/* 832FA0 802417A0 0000102D */ daddu $v0, $zero, $zero +.L802417A4: +/* 832FA4 802417A4 8CC50000 */ lw $a1, ($a2) +/* 832FA8 802417A8 3C068025 */ lui $a2, 0x8025 +/* 832FAC 802417AC 0C0B2026 */ jal set_variable +/* 832FB0 802417B0 8CC68C70 */ lw $a2, -0x7390($a2) +/* 832FB4 802417B4 24020002 */ addiu $v0, $zero, 2 +.L802417B8: +/* 832FB8 802417B8 8FBF0010 */ lw $ra, 0x10($sp) +/* 832FBC 802417BC 03E00008 */ jr $ra +/* 832FC0 802417C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4.s deleted file mode 100644 index 351f23c426..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417C4 -/* 832FC4 802417C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832FC8 802417C8 AFBF0010 */ sw $ra, 0x10($sp) -/* 832FCC 802417CC 8C82000C */ lw $v0, 0xc($a0) -/* 832FD0 802417D0 0C0B1EAF */ jal get_variable -/* 832FD4 802417D4 8C450000 */ lw $a1, ($v0) -/* 832FD8 802417D8 3C018025 */ lui $at, 0x8025 -/* 832FDC 802417DC AC228C70 */ sw $v0, -0x7390($at) -/* 832FE0 802417E0 24020002 */ addiu $v0, $zero, 2 -/* 832FE4 802417E4 8FBF0010 */ lw $ra, 0x10($sp) -/* 832FE8 802417E8 24030001 */ addiu $v1, $zero, 1 -/* 832FEC 802417EC 3C018025 */ lui $at, 0x8025 -/* 832FF0 802417F0 AC238C6C */ sw $v1, -0x7394($at) -/* 832FF4 802417F4 03E00008 */ jr $ra -/* 832FF8 802417F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s new file mode 100644 index 0000000000..c1590917fd --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417C4_832FC4.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417C4_832FC4 +/* 832FC4 802417C4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 832FC8 802417C8 AFBF0010 */ sw $ra, 0x10($sp) +/* 832FCC 802417CC 8C82000C */ lw $v0, 0xc($a0) +/* 832FD0 802417D0 0C0B1EAF */ jal get_variable +/* 832FD4 802417D4 8C450000 */ lw $a1, ($v0) +/* 832FD8 802417D8 3C018025 */ lui $at, 0x8025 +/* 832FDC 802417DC AC228C70 */ sw $v0, -0x7390($at) +/* 832FE0 802417E0 24020002 */ addiu $v0, $zero, 2 +/* 832FE4 802417E4 8FBF0010 */ lw $ra, 0x10($sp) +/* 832FE8 802417E8 24030001 */ addiu $v1, $zero, 1 +/* 832FEC 802417EC 3C018025 */ lui $at, 0x8025 +/* 832FF0 802417F0 AC238C6C */ sw $v1, -0x7394($at) +/* 832FF4 802417F4 03E00008 */ jr $ra +/* 832FF8 802417F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC.s deleted file mode 100644 index bd0a149bdb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417FC -/* 832FFC 802417FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 833000 80241800 AFBF0010 */ sw $ra, 0x10($sp) -/* 833004 80241804 8C82000C */ lw $v0, 0xc($a0) -/* 833008 80241808 0C0B1EAF */ jal get_variable -/* 83300C 8024180C 8C450000 */ lw $a1, ($v0) -/* 833010 80241810 0040182D */ daddu $v1, $v0, $zero -/* 833014 80241814 10600012 */ beqz $v1, .L80241860 -/* 833018 80241818 0000202D */ daddu $a0, $zero, $zero -/* 83301C 8024181C 8C620000 */ lw $v0, ($v1) -/* 833020 80241820 5040000A */ beql $v0, $zero, .L8024184C -/* 833024 80241824 00041080 */ sll $v0, $a0, 2 -/* 833028 80241828 3C058025 */ lui $a1, 0x8025 -/* 83302C 8024182C 24A51400 */ addiu $a1, $a1, 0x1400 -.L80241830: -/* 833030 80241830 24630004 */ addiu $v1, $v1, 4 -/* 833034 80241834 24840001 */ addiu $a0, $a0, 1 -/* 833038 80241838 ACA20000 */ sw $v0, ($a1) -/* 83303C 8024183C 8C620000 */ lw $v0, ($v1) -/* 833040 80241840 1440FFFB */ bnez $v0, .L80241830 -/* 833044 80241844 24A50004 */ addiu $a1, $a1, 4 -/* 833048 80241848 00041080 */ sll $v0, $a0, 2 -.L8024184C: -/* 83304C 8024184C 3C018025 */ lui $at, 0x8025 -/* 833050 80241850 00220821 */ addu $at, $at, $v0 -/* 833054 80241854 AC201400 */ sw $zero, 0x1400($at) -/* 833058 80241858 08090622 */ j .L80241888 -/* 83305C 8024185C 00000000 */ nop -.L80241860: -/* 833060 80241860 3C038025 */ lui $v1, 0x8025 -/* 833064 80241864 24631400 */ addiu $v1, $v1, 0x1400 -/* 833068 80241868 0060282D */ daddu $a1, $v1, $zero -.L8024186C: -/* 83306C 8024186C 24820010 */ addiu $v0, $a0, 0x10 -/* 833070 80241870 AC620000 */ sw $v0, ($v1) -/* 833074 80241874 24630004 */ addiu $v1, $v1, 4 -/* 833078 80241878 24840001 */ addiu $a0, $a0, 1 -/* 83307C 8024187C 28820070 */ slti $v0, $a0, 0x70 -/* 833080 80241880 1440FFFA */ bnez $v0, .L8024186C -/* 833084 80241884 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241888: -/* 833088 80241888 8FBF0010 */ lw $ra, 0x10($sp) -/* 83308C 8024188C 24020002 */ addiu $v0, $zero, 2 -/* 833090 80241890 03E00008 */ jr $ra -/* 833094 80241894 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s new file mode 100644 index 0000000000..99a93e78ff --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802417FC_832FFC.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417FC_832FFC +/* 832FFC 802417FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 833000 80241800 AFBF0010 */ sw $ra, 0x10($sp) +/* 833004 80241804 8C82000C */ lw $v0, 0xc($a0) +/* 833008 80241808 0C0B1EAF */ jal get_variable +/* 83300C 8024180C 8C450000 */ lw $a1, ($v0) +/* 833010 80241810 0040182D */ daddu $v1, $v0, $zero +/* 833014 80241814 10600012 */ beqz $v1, .L80241860 +/* 833018 80241818 0000202D */ daddu $a0, $zero, $zero +/* 83301C 8024181C 8C620000 */ lw $v0, ($v1) +/* 833020 80241820 5040000A */ beql $v0, $zero, .L8024184C +/* 833024 80241824 00041080 */ sll $v0, $a0, 2 +/* 833028 80241828 3C058025 */ lui $a1, 0x8025 +/* 83302C 8024182C 24A51400 */ addiu $a1, $a1, 0x1400 +.L80241830: +/* 833030 80241830 24630004 */ addiu $v1, $v1, 4 +/* 833034 80241834 24840001 */ addiu $a0, $a0, 1 +/* 833038 80241838 ACA20000 */ sw $v0, ($a1) +/* 83303C 8024183C 8C620000 */ lw $v0, ($v1) +/* 833040 80241840 1440FFFB */ bnez $v0, .L80241830 +/* 833044 80241844 24A50004 */ addiu $a1, $a1, 4 +/* 833048 80241848 00041080 */ sll $v0, $a0, 2 +.L8024184C: +/* 83304C 8024184C 3C018025 */ lui $at, 0x8025 +/* 833050 80241850 00220821 */ addu $at, $at, $v0 +/* 833054 80241854 AC201400 */ sw $zero, 0x1400($at) +/* 833058 80241858 08090622 */ j .L80241888 +/* 83305C 8024185C 00000000 */ nop +.L80241860: +/* 833060 80241860 3C038025 */ lui $v1, 0x8025 +/* 833064 80241864 24631400 */ addiu $v1, $v1, 0x1400 +/* 833068 80241868 0060282D */ daddu $a1, $v1, $zero +.L8024186C: +/* 83306C 8024186C 24820010 */ addiu $v0, $a0, 0x10 +/* 833070 80241870 AC620000 */ sw $v0, ($v1) +/* 833074 80241874 24630004 */ addiu $v1, $v1, 4 +/* 833078 80241878 24840001 */ addiu $a0, $a0, 1 +/* 83307C 8024187C 28820070 */ slti $v0, $a0, 0x70 +/* 833080 80241880 1440FFFA */ bnez $v0, .L8024186C +/* 833084 80241884 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80241888: +/* 833088 80241888 8FBF0010 */ lw $ra, 0x10($sp) +/* 83308C 8024188C 24020002 */ addiu $v0, $zero, 2 +/* 833090 80241890 03E00008 */ jr $ra +/* 833094 80241894 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241898.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241898.s deleted file mode 100644 index 296afc840b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241898.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241898 -/* 833098 80241898 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 83309C 8024189C AFB10014 */ sw $s1, 0x14($sp) -/* 8330A0 802418A0 0080882D */ daddu $s1, $a0, $zero -/* 8330A4 802418A4 AFBF0018 */ sw $ra, 0x18($sp) -/* 8330A8 802418A8 AFB00010 */ sw $s0, 0x10($sp) -/* 8330AC 802418AC 8E30000C */ lw $s0, 0xc($s1) -/* 8330B0 802418B0 8E050000 */ lw $a1, ($s0) -/* 8330B4 802418B4 0C0B1EAF */ jal get_variable -/* 8330B8 802418B8 26100004 */ addiu $s0, $s0, 4 -/* 8330BC 802418BC AE22008C */ sw $v0, 0x8c($s1) -/* 8330C0 802418C0 8E050000 */ lw $a1, ($s0) -/* 8330C4 802418C4 26100004 */ addiu $s0, $s0, 4 -/* 8330C8 802418C8 0C0B1EAF */ jal get_variable -/* 8330CC 802418CC 0220202D */ daddu $a0, $s1, $zero -/* 8330D0 802418D0 AE220090 */ sw $v0, 0x90($s1) -/* 8330D4 802418D4 8E050000 */ lw $a1, ($s0) -/* 8330D8 802418D8 26100004 */ addiu $s0, $s0, 4 -/* 8330DC 802418DC 0C0B1EAF */ jal get_variable -/* 8330E0 802418E0 0220202D */ daddu $a0, $s1, $zero -/* 8330E4 802418E4 AE220094 */ sw $v0, 0x94($s1) -/* 8330E8 802418E8 8E050000 */ lw $a1, ($s0) -/* 8330EC 802418EC 26100004 */ addiu $s0, $s0, 4 -/* 8330F0 802418F0 0C0B1EAF */ jal get_variable -/* 8330F4 802418F4 0220202D */ daddu $a0, $s1, $zero -/* 8330F8 802418F8 AE220098 */ sw $v0, 0x98($s1) -/* 8330FC 802418FC 8E050000 */ lw $a1, ($s0) -/* 833100 80241900 26100004 */ addiu $s0, $s0, 4 -/* 833104 80241904 0C0B1EAF */ jal get_variable -/* 833108 80241908 0220202D */ daddu $a0, $s1, $zero -/* 83310C 8024190C AE22009C */ sw $v0, 0x9c($s1) -/* 833110 80241910 8E050000 */ lw $a1, ($s0) -/* 833114 80241914 26100004 */ addiu $s0, $s0, 4 -/* 833118 80241918 0C0B1EAF */ jal get_variable -/* 83311C 8024191C 0220202D */ daddu $a0, $s1, $zero -/* 833120 80241920 AE2200A0 */ sw $v0, 0xa0($s1) -/* 833124 80241924 8E050000 */ lw $a1, ($s0) -/* 833128 80241928 26100004 */ addiu $s0, $s0, 4 -/* 83312C 8024192C 0C0B1EAF */ jal get_variable -/* 833130 80241930 0220202D */ daddu $a0, $s1, $zero -/* 833134 80241934 AE2200A4 */ sw $v0, 0xa4($s1) -/* 833138 80241938 8E050000 */ lw $a1, ($s0) -/* 83313C 8024193C 26100004 */ addiu $s0, $s0, 4 -/* 833140 80241940 0C0B1EAF */ jal get_variable -/* 833144 80241944 0220202D */ daddu $a0, $s1, $zero -/* 833148 80241948 AE2200A8 */ sw $v0, 0xa8($s1) -/* 83314C 8024194C 8E050000 */ lw $a1, ($s0) -/* 833150 80241950 26100004 */ addiu $s0, $s0, 4 -/* 833154 80241954 0C0B1EAF */ jal get_variable -/* 833158 80241958 0220202D */ daddu $a0, $s1, $zero -/* 83315C 8024195C AE2200AC */ sw $v0, 0xac($s1) -/* 833160 80241960 8E050000 */ lw $a1, ($s0) -/* 833164 80241964 0C0B1EAF */ jal get_variable -/* 833168 80241968 0220202D */ daddu $a0, $s1, $zero -/* 83316C 8024196C AE2200B0 */ sw $v0, 0xb0($s1) -/* 833170 80241970 8FBF0018 */ lw $ra, 0x18($sp) -/* 833174 80241974 8FB10014 */ lw $s1, 0x14($sp) -/* 833178 80241978 8FB00010 */ lw $s0, 0x10($sp) -/* 83317C 8024197C 24020002 */ addiu $v0, $zero, 2 -/* 833180 80241980 03E00008 */ jr $ra -/* 833184 80241984 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241898_833098.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241898_833098.s new file mode 100644 index 0000000000..aa4f2d188f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241898_833098.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241898_833098 +/* 833098 80241898 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 83309C 8024189C AFB10014 */ sw $s1, 0x14($sp) +/* 8330A0 802418A0 0080882D */ daddu $s1, $a0, $zero +/* 8330A4 802418A4 AFBF0018 */ sw $ra, 0x18($sp) +/* 8330A8 802418A8 AFB00010 */ sw $s0, 0x10($sp) +/* 8330AC 802418AC 8E30000C */ lw $s0, 0xc($s1) +/* 8330B0 802418B0 8E050000 */ lw $a1, ($s0) +/* 8330B4 802418B4 0C0B1EAF */ jal get_variable +/* 8330B8 802418B8 26100004 */ addiu $s0, $s0, 4 +/* 8330BC 802418BC AE22008C */ sw $v0, 0x8c($s1) +/* 8330C0 802418C0 8E050000 */ lw $a1, ($s0) +/* 8330C4 802418C4 26100004 */ addiu $s0, $s0, 4 +/* 8330C8 802418C8 0C0B1EAF */ jal get_variable +/* 8330CC 802418CC 0220202D */ daddu $a0, $s1, $zero +/* 8330D0 802418D0 AE220090 */ sw $v0, 0x90($s1) +/* 8330D4 802418D4 8E050000 */ lw $a1, ($s0) +/* 8330D8 802418D8 26100004 */ addiu $s0, $s0, 4 +/* 8330DC 802418DC 0C0B1EAF */ jal get_variable +/* 8330E0 802418E0 0220202D */ daddu $a0, $s1, $zero +/* 8330E4 802418E4 AE220094 */ sw $v0, 0x94($s1) +/* 8330E8 802418E8 8E050000 */ lw $a1, ($s0) +/* 8330EC 802418EC 26100004 */ addiu $s0, $s0, 4 +/* 8330F0 802418F0 0C0B1EAF */ jal get_variable +/* 8330F4 802418F4 0220202D */ daddu $a0, $s1, $zero +/* 8330F8 802418F8 AE220098 */ sw $v0, 0x98($s1) +/* 8330FC 802418FC 8E050000 */ lw $a1, ($s0) +/* 833100 80241900 26100004 */ addiu $s0, $s0, 4 +/* 833104 80241904 0C0B1EAF */ jal get_variable +/* 833108 80241908 0220202D */ daddu $a0, $s1, $zero +/* 83310C 8024190C AE22009C */ sw $v0, 0x9c($s1) +/* 833110 80241910 8E050000 */ lw $a1, ($s0) +/* 833114 80241914 26100004 */ addiu $s0, $s0, 4 +/* 833118 80241918 0C0B1EAF */ jal get_variable +/* 83311C 8024191C 0220202D */ daddu $a0, $s1, $zero +/* 833120 80241920 AE2200A0 */ sw $v0, 0xa0($s1) +/* 833124 80241924 8E050000 */ lw $a1, ($s0) +/* 833128 80241928 26100004 */ addiu $s0, $s0, 4 +/* 83312C 8024192C 0C0B1EAF */ jal get_variable +/* 833130 80241930 0220202D */ daddu $a0, $s1, $zero +/* 833134 80241934 AE2200A4 */ sw $v0, 0xa4($s1) +/* 833138 80241938 8E050000 */ lw $a1, ($s0) +/* 83313C 8024193C 26100004 */ addiu $s0, $s0, 4 +/* 833140 80241940 0C0B1EAF */ jal get_variable +/* 833144 80241944 0220202D */ daddu $a0, $s1, $zero +/* 833148 80241948 AE2200A8 */ sw $v0, 0xa8($s1) +/* 83314C 8024194C 8E050000 */ lw $a1, ($s0) +/* 833150 80241950 26100004 */ addiu $s0, $s0, 4 +/* 833154 80241954 0C0B1EAF */ jal get_variable +/* 833158 80241958 0220202D */ daddu $a0, $s1, $zero +/* 83315C 8024195C AE2200AC */ sw $v0, 0xac($s1) +/* 833160 80241960 8E050000 */ lw $a1, ($s0) +/* 833164 80241964 0C0B1EAF */ jal get_variable +/* 833168 80241968 0220202D */ daddu $a0, $s1, $zero +/* 83316C 8024196C AE2200B0 */ sw $v0, 0xb0($s1) +/* 833170 80241970 8FBF0018 */ lw $ra, 0x18($sp) +/* 833174 80241974 8FB10014 */ lw $s1, 0x14($sp) +/* 833178 80241978 8FB00010 */ lw $s0, 0x10($sp) +/* 83317C 8024197C 24020002 */ addiu $v0, $zero, 2 +/* 833180 80241980 03E00008 */ jr $ra +/* 833184 80241984 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988.s deleted file mode 100644 index 2df681c1fb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241988 -/* 833188 80241988 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 83318C 8024198C AFB1001C */ sw $s1, 0x1c($sp) -/* 833190 80241990 0080882D */ daddu $s1, $a0, $zero -/* 833194 80241994 AFBF0034 */ sw $ra, 0x34($sp) -/* 833198 80241998 AFB60030 */ sw $s6, 0x30($sp) -/* 83319C 8024199C AFB5002C */ sw $s5, 0x2c($sp) -/* 8331A0 802419A0 AFB40028 */ sw $s4, 0x28($sp) -/* 8331A4 802419A4 AFB30024 */ sw $s3, 0x24($sp) -/* 8331A8 802419A8 AFB20020 */ sw $s2, 0x20($sp) -/* 8331AC 802419AC AFB00018 */ sw $s0, 0x18($sp) -/* 8331B0 802419B0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8331B4 802419B4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8331B8 802419B8 8E30000C */ lw $s0, 0xc($s1) -/* 8331BC 802419BC 8E160000 */ lw $s6, ($s0) -/* 8331C0 802419C0 26100004 */ addiu $s0, $s0, 4 -/* 8331C4 802419C4 0C0B1EAF */ jal get_variable -/* 8331C8 802419C8 02C0282D */ daddu $a1, $s6, $zero -/* 8331CC 802419CC 44820000 */ mtc1 $v0, $f0 -/* 8331D0 802419D0 00000000 */ nop -/* 8331D4 802419D4 46800020 */ cvt.s.w $f0, $f0 -/* 8331D8 802419D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8331DC 802419DC 8E140000 */ lw $s4, ($s0) -/* 8331E0 802419E0 26100004 */ addiu $s0, $s0, 4 -/* 8331E4 802419E4 0220202D */ daddu $a0, $s1, $zero -/* 8331E8 802419E8 0C0B1EAF */ jal get_variable -/* 8331EC 802419EC 0280282D */ daddu $a1, $s4, $zero -/* 8331F0 802419F0 0220202D */ daddu $a0, $s1, $zero -/* 8331F4 802419F4 8E150000 */ lw $s5, ($s0) -/* 8331F8 802419F8 4482B000 */ mtc1 $v0, $f22 -/* 8331FC 802419FC 00000000 */ nop -/* 833200 80241A00 4680B5A0 */ cvt.s.w $f22, $f22 -/* 833204 80241A04 0C0B1EAF */ jal get_variable -/* 833208 80241A08 02A0282D */ daddu $a1, $s5, $zero -/* 83320C 80241A0C 2404FFFC */ addiu $a0, $zero, -4 -/* 833210 80241A10 44820000 */ mtc1 $v0, $f0 -/* 833214 80241A14 00000000 */ nop -/* 833218 80241A18 46800020 */ cvt.s.w $f0, $f0 -/* 83321C 80241A1C 0C00EABB */ jal get_npc_unsafe -/* 833220 80241A20 E7A00014 */ swc1 $f0, 0x14($sp) -/* 833224 80241A24 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 833228 80241A28 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 83322C 80241A2C 3C014334 */ lui $at, 0x4334 -/* 833230 80241A30 44816000 */ mtc1 $at, $f12 -/* 833234 80241A34 00041880 */ sll $v1, $a0, 2 -/* 833238 80241A38 00641821 */ addu $v1, $v1, $a0 -/* 83323C 80241A3C 00031880 */ sll $v1, $v1, 2 -/* 833240 80241A40 00641823 */ subu $v1, $v1, $a0 -/* 833244 80241A44 000320C0 */ sll $a0, $v1, 3 -/* 833248 80241A48 00641821 */ addu $v1, $v1, $a0 -/* 83324C 80241A4C 000318C0 */ sll $v1, $v1, 3 -/* 833250 80241A50 3C01800B */ lui $at, 0x800b -/* 833254 80241A54 00230821 */ addu $at, $at, $v1 -/* 833258 80241A58 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 83325C 80241A5C 460C0300 */ add.s $f12, $f0, $f12 -/* 833260 80241A60 0C00A6C9 */ jal clamp_angle -/* 833264 80241A64 0040982D */ daddu $s3, $v0, $zero -/* 833268 80241A68 27B00010 */ addiu $s0, $sp, 0x10 -/* 83326C 80241A6C 0200202D */ daddu $a0, $s0, $zero -/* 833270 80241A70 27B20014 */ addiu $s2, $sp, 0x14 -/* 833274 80241A74 0240282D */ daddu $a1, $s2, $zero -/* 833278 80241A78 3C064170 */ lui $a2, 0x4170 -/* 83327C 80241A7C 8E67000C */ lw $a3, 0xc($s3) -/* 833280 80241A80 0C00A7E7 */ jal add_vec2D_polar -/* 833284 80241A84 46000506 */ mov.s $f20, $f0 -/* 833288 80241A88 0200202D */ daddu $a0, $s0, $zero -/* 83328C 80241A8C 3C064120 */ lui $a2, 0x4120 -/* 833290 80241A90 4407A000 */ mfc1 $a3, $f20 -/* 833294 80241A94 0C00A7E7 */ jal add_vec2D_polar -/* 833298 80241A98 0240282D */ daddu $a1, $s2, $zero -/* 83329C 80241A9C 0220202D */ daddu $a0, $s1, $zero -/* 8332A0 80241AA0 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 8332A4 80241AA4 4600008D */ trunc.w.s $f2, $f0 -/* 8332A8 80241AA8 44061000 */ mfc1 $a2, $f2 -/* 8332AC 80241AAC 0C0B2026 */ jal set_variable -/* 8332B0 80241AB0 02C0282D */ daddu $a1, $s6, $zero -/* 8332B4 80241AB4 0220202D */ daddu $a0, $s1, $zero -/* 8332B8 80241AB8 4600B08D */ trunc.w.s $f2, $f22 -/* 8332BC 80241ABC 44061000 */ mfc1 $a2, $f2 -/* 8332C0 80241AC0 0C0B2026 */ jal set_variable -/* 8332C4 80241AC4 0280282D */ daddu $a1, $s4, $zero -/* 8332C8 80241AC8 0220202D */ daddu $a0, $s1, $zero -/* 8332CC 80241ACC C7A00014 */ lwc1 $f0, 0x14($sp) -/* 8332D0 80241AD0 4600008D */ trunc.w.s $f2, $f0 -/* 8332D4 80241AD4 44061000 */ mfc1 $a2, $f2 -/* 8332D8 80241AD8 0C0B2026 */ jal set_variable -/* 8332DC 80241ADC 02A0282D */ daddu $a1, $s5, $zero -/* 8332E0 80241AE0 8FBF0034 */ lw $ra, 0x34($sp) -/* 8332E4 80241AE4 8FB60030 */ lw $s6, 0x30($sp) -/* 8332E8 80241AE8 8FB5002C */ lw $s5, 0x2c($sp) -/* 8332EC 80241AEC 8FB40028 */ lw $s4, 0x28($sp) -/* 8332F0 80241AF0 8FB30024 */ lw $s3, 0x24($sp) -/* 8332F4 80241AF4 8FB20020 */ lw $s2, 0x20($sp) -/* 8332F8 80241AF8 8FB1001C */ lw $s1, 0x1c($sp) -/* 8332FC 80241AFC 8FB00018 */ lw $s0, 0x18($sp) -/* 833300 80241B00 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 833304 80241B04 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 833308 80241B08 24020002 */ addiu $v0, $zero, 2 -/* 83330C 80241B0C 03E00008 */ jr $ra -/* 833310 80241B10 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988_833188.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988_833188.s new file mode 100644 index 0000000000..def6eaf5f0 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241988_833188.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241988_833188 +/* 833188 80241988 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 83318C 8024198C AFB1001C */ sw $s1, 0x1c($sp) +/* 833190 80241990 0080882D */ daddu $s1, $a0, $zero +/* 833194 80241994 AFBF0034 */ sw $ra, 0x34($sp) +/* 833198 80241998 AFB60030 */ sw $s6, 0x30($sp) +/* 83319C 8024199C AFB5002C */ sw $s5, 0x2c($sp) +/* 8331A0 802419A0 AFB40028 */ sw $s4, 0x28($sp) +/* 8331A4 802419A4 AFB30024 */ sw $s3, 0x24($sp) +/* 8331A8 802419A8 AFB20020 */ sw $s2, 0x20($sp) +/* 8331AC 802419AC AFB00018 */ sw $s0, 0x18($sp) +/* 8331B0 802419B0 F7B60040 */ sdc1 $f22, 0x40($sp) +/* 8331B4 802419B4 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 8331B8 802419B8 8E30000C */ lw $s0, 0xc($s1) +/* 8331BC 802419BC 8E160000 */ lw $s6, ($s0) +/* 8331C0 802419C0 26100004 */ addiu $s0, $s0, 4 +/* 8331C4 802419C4 0C0B1EAF */ jal get_variable +/* 8331C8 802419C8 02C0282D */ daddu $a1, $s6, $zero +/* 8331CC 802419CC 44820000 */ mtc1 $v0, $f0 +/* 8331D0 802419D0 00000000 */ nop +/* 8331D4 802419D4 46800020 */ cvt.s.w $f0, $f0 +/* 8331D8 802419D8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8331DC 802419DC 8E140000 */ lw $s4, ($s0) +/* 8331E0 802419E0 26100004 */ addiu $s0, $s0, 4 +/* 8331E4 802419E4 0220202D */ daddu $a0, $s1, $zero +/* 8331E8 802419E8 0C0B1EAF */ jal get_variable +/* 8331EC 802419EC 0280282D */ daddu $a1, $s4, $zero +/* 8331F0 802419F0 0220202D */ daddu $a0, $s1, $zero +/* 8331F4 802419F4 8E150000 */ lw $s5, ($s0) +/* 8331F8 802419F8 4482B000 */ mtc1 $v0, $f22 +/* 8331FC 802419FC 00000000 */ nop +/* 833200 80241A00 4680B5A0 */ cvt.s.w $f22, $f22 +/* 833204 80241A04 0C0B1EAF */ jal get_variable +/* 833208 80241A08 02A0282D */ daddu $a1, $s5, $zero +/* 83320C 80241A0C 2404FFFC */ addiu $a0, $zero, -4 +/* 833210 80241A10 44820000 */ mtc1 $v0, $f0 +/* 833214 80241A14 00000000 */ nop +/* 833218 80241A18 46800020 */ cvt.s.w $f0, $f0 +/* 83321C 80241A1C 0C00EABB */ jal get_npc_unsafe +/* 833220 80241A20 E7A00014 */ swc1 $f0, 0x14($sp) +/* 833224 80241A24 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 833228 80241A28 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 83322C 80241A2C 3C014334 */ lui $at, 0x4334 +/* 833230 80241A30 44816000 */ mtc1 $at, $f12 +/* 833234 80241A34 00041880 */ sll $v1, $a0, 2 +/* 833238 80241A38 00641821 */ addu $v1, $v1, $a0 +/* 83323C 80241A3C 00031880 */ sll $v1, $v1, 2 +/* 833240 80241A40 00641823 */ subu $v1, $v1, $a0 +/* 833244 80241A44 000320C0 */ sll $a0, $v1, 3 +/* 833248 80241A48 00641821 */ addu $v1, $v1, $a0 +/* 83324C 80241A4C 000318C0 */ sll $v1, $v1, 3 +/* 833250 80241A50 3C01800B */ lui $at, 0x800b +/* 833254 80241A54 00230821 */ addu $at, $at, $v1 +/* 833258 80241A58 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 83325C 80241A5C 460C0300 */ add.s $f12, $f0, $f12 +/* 833260 80241A60 0C00A6C9 */ jal clamp_angle +/* 833264 80241A64 0040982D */ daddu $s3, $v0, $zero +/* 833268 80241A68 27B00010 */ addiu $s0, $sp, 0x10 +/* 83326C 80241A6C 0200202D */ daddu $a0, $s0, $zero +/* 833270 80241A70 27B20014 */ addiu $s2, $sp, 0x14 +/* 833274 80241A74 0240282D */ daddu $a1, $s2, $zero +/* 833278 80241A78 3C064170 */ lui $a2, 0x4170 +/* 83327C 80241A7C 8E67000C */ lw $a3, 0xc($s3) +/* 833280 80241A80 0C00A7E7 */ jal add_vec2D_polar +/* 833284 80241A84 46000506 */ mov.s $f20, $f0 +/* 833288 80241A88 0200202D */ daddu $a0, $s0, $zero +/* 83328C 80241A8C 3C064120 */ lui $a2, 0x4120 +/* 833290 80241A90 4407A000 */ mfc1 $a3, $f20 +/* 833294 80241A94 0C00A7E7 */ jal add_vec2D_polar +/* 833298 80241A98 0240282D */ daddu $a1, $s2, $zero +/* 83329C 80241A9C 0220202D */ daddu $a0, $s1, $zero +/* 8332A0 80241AA0 C7A00010 */ lwc1 $f0, 0x10($sp) +/* 8332A4 80241AA4 4600008D */ trunc.w.s $f2, $f0 +/* 8332A8 80241AA8 44061000 */ mfc1 $a2, $f2 +/* 8332AC 80241AAC 0C0B2026 */ jal set_variable +/* 8332B0 80241AB0 02C0282D */ daddu $a1, $s6, $zero +/* 8332B4 80241AB4 0220202D */ daddu $a0, $s1, $zero +/* 8332B8 80241AB8 4600B08D */ trunc.w.s $f2, $f22 +/* 8332BC 80241ABC 44061000 */ mfc1 $a2, $f2 +/* 8332C0 80241AC0 0C0B2026 */ jal set_variable +/* 8332C4 80241AC4 0280282D */ daddu $a1, $s4, $zero +/* 8332C8 80241AC8 0220202D */ daddu $a0, $s1, $zero +/* 8332CC 80241ACC C7A00014 */ lwc1 $f0, 0x14($sp) +/* 8332D0 80241AD0 4600008D */ trunc.w.s $f2, $f0 +/* 8332D4 80241AD4 44061000 */ mfc1 $a2, $f2 +/* 8332D8 80241AD8 0C0B2026 */ jal set_variable +/* 8332DC 80241ADC 02A0282D */ daddu $a1, $s5, $zero +/* 8332E0 80241AE0 8FBF0034 */ lw $ra, 0x34($sp) +/* 8332E4 80241AE4 8FB60030 */ lw $s6, 0x30($sp) +/* 8332E8 80241AE8 8FB5002C */ lw $s5, 0x2c($sp) +/* 8332EC 80241AEC 8FB40028 */ lw $s4, 0x28($sp) +/* 8332F0 80241AF0 8FB30024 */ lw $s3, 0x24($sp) +/* 8332F4 80241AF4 8FB20020 */ lw $s2, 0x20($sp) +/* 8332F8 80241AF8 8FB1001C */ lw $s1, 0x1c($sp) +/* 8332FC 80241AFC 8FB00018 */ lw $s0, 0x18($sp) +/* 833300 80241B00 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 833304 80241B04 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 833308 80241B08 24020002 */ addiu $v0, $zero, 2 +/* 83330C 80241B0C 03E00008 */ jr $ra +/* 833310 80241B10 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58.s deleted file mode 100644 index 82205df1ea..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B58 -/* 833358 80241B58 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 83335C 80241B5C AFBF0010 */ sw $ra, 0x10($sp) -/* 833360 80241B60 0C00EABB */ jal get_npc_unsafe -/* 833364 80241B64 8C84008C */ lw $a0, 0x8c($a0) -/* 833368 80241B68 3C038025 */ lui $v1, 0x8025 -/* 83336C 80241B6C 8C6315C4 */ lw $v1, 0x15c4($v1) -/* 833370 80241B70 AC430028 */ sw $v1, 0x28($v0) -/* 833374 80241B74 8FBF0010 */ lw $ra, 0x10($sp) -/* 833378 80241B78 24020002 */ addiu $v0, $zero, 2 -/* 83337C 80241B7C 03E00008 */ jr $ra -/* 833380 80241B80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s new file mode 100644 index 0000000000..a9acb60cde --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B58_833358.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B58_833358 +/* 833358 80241B58 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 83335C 80241B5C AFBF0010 */ sw $ra, 0x10($sp) +/* 833360 80241B60 0C00EABB */ jal get_npc_unsafe +/* 833364 80241B64 8C84008C */ lw $a0, 0x8c($a0) +/* 833368 80241B68 3C038025 */ lui $v1, 0x8025 +/* 83336C 80241B6C 8C6315C4 */ lw $v1, 0x15c4($v1) +/* 833370 80241B70 AC430028 */ sw $v1, 0x28($v0) +/* 833374 80241B74 8FBF0010 */ lw $ra, 0x10($sp) +/* 833378 80241B78 24020002 */ addiu $v0, $zero, 2 +/* 83337C 80241B7C 03E00008 */ jr $ra +/* 833380 80241B80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B84.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B84.s deleted file mode 100644 index f161074cb0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B84.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B84 -/* 833384 80241B84 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 833388 80241B88 AFB00010 */ sw $s0, 0x10($sp) -/* 83338C 80241B8C 0080802D */ daddu $s0, $a0, $zero -/* 833390 80241B90 3C05F5DE */ lui $a1, 0xf5de -/* 833394 80241B94 AFBF0014 */ sw $ra, 0x14($sp) -/* 833398 80241B98 0C0B1EAF */ jal get_variable -/* 83339C 80241B9C 34A5019D */ ori $a1, $a1, 0x19d -/* 8333A0 80241BA0 54400003 */ bnel $v0, $zero, .L80241BB0 -/* 8333A4 80241BA4 3C05F5DE */ lui $a1, 0xf5de -/* 8333A8 80241BA8 080906F0 */ j .L80241BC0 -/* 8333AC 80241BAC 2402FFFF */ addiu $v0, $zero, -1 -.L80241BB0: -/* 8333B0 80241BB0 34A5019D */ ori $a1, $a1, 0x19d -/* 8333B4 80241BB4 0200202D */ daddu $a0, $s0, $zero -/* 8333B8 80241BB8 0C0B1EAF */ jal get_variable -/* 8333BC 80241BBC 00452821 */ addu $a1, $v0, $a1 -.L80241BC0: -/* 8333C0 80241BC0 AE020084 */ sw $v0, 0x84($s0) -/* 8333C4 80241BC4 8FBF0014 */ lw $ra, 0x14($sp) -/* 8333C8 80241BC8 8FB00010 */ lw $s0, 0x10($sp) -/* 8333CC 80241BCC 24020002 */ addiu $v0, $zero, 2 -/* 8333D0 80241BD0 03E00008 */ jr $ra -/* 8333D4 80241BD4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B84_833384.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B84_833384.s new file mode 100644 index 0000000000..8fd9ca0c78 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241B84_833384.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B84_833384 +/* 833384 80241B84 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 833388 80241B88 AFB00010 */ sw $s0, 0x10($sp) +/* 83338C 80241B8C 0080802D */ daddu $s0, $a0, $zero +/* 833390 80241B90 3C05F5DE */ lui $a1, 0xf5de +/* 833394 80241B94 AFBF0014 */ sw $ra, 0x14($sp) +/* 833398 80241B98 0C0B1EAF */ jal get_variable +/* 83339C 80241B9C 34A5019D */ ori $a1, $a1, 0x19d +/* 8333A0 80241BA0 54400003 */ bnel $v0, $zero, .L80241BB0 +/* 8333A4 80241BA4 3C05F5DE */ lui $a1, 0xf5de +/* 8333A8 80241BA8 080906F0 */ j .L80241BC0 +/* 8333AC 80241BAC 2402FFFF */ addiu $v0, $zero, -1 +.L80241BB0: +/* 8333B0 80241BB0 34A5019D */ ori $a1, $a1, 0x19d +/* 8333B4 80241BB4 0200202D */ daddu $a0, $s0, $zero +/* 8333B8 80241BB8 0C0B1EAF */ jal get_variable +/* 8333BC 80241BBC 00452821 */ addu $a1, $v0, $a1 +.L80241BC0: +/* 8333C0 80241BC0 AE020084 */ sw $v0, 0x84($s0) +/* 8333C4 80241BC4 8FBF0014 */ lw $ra, 0x14($sp) +/* 8333C8 80241BC8 8FB00010 */ lw $s0, 0x10($sp) +/* 8333CC 80241BCC 24020002 */ addiu $v0, $zero, 2 +/* 8333D0 80241BD0 03E00008 */ jr $ra +/* 8333D4 80241BD4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8.s deleted file mode 100644 index d87d37f9a2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BD8 -/* 8333D8 80241BD8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8333DC 80241BDC AFB10014 */ sw $s1, 0x14($sp) -/* 8333E0 80241BE0 0080882D */ daddu $s1, $a0, $zero -/* 8333E4 80241BE4 3C05FD05 */ lui $a1, 0xfd05 -/* 8333E8 80241BE8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8333EC 80241BEC AFB3001C */ sw $s3, 0x1c($sp) -/* 8333F0 80241BF0 AFB20018 */ sw $s2, 0x18($sp) -/* 8333F4 80241BF4 AFB00010 */ sw $s0, 0x10($sp) -/* 8333F8 80241BF8 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8333FC 80241BFC F7B60030 */ sdc1 $f22, 0x30($sp) -/* 833400 80241C00 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 833404 80241C04 0C0B1EAF */ jal get_variable -/* 833408 80241C08 34A50F82 */ ori $a1, $a1, 0xf82 -/* 83340C 80241C0C 0220202D */ daddu $a0, $s1, $zero -/* 833410 80241C10 8E30000C */ lw $s0, 0xc($s1) -/* 833414 80241C14 0040982D */ daddu $s3, $v0, $zero -/* 833418 80241C18 8E050000 */ lw $a1, ($s0) -/* 83341C 80241C1C 0C0B1EAF */ jal get_variable -/* 833420 80241C20 26100004 */ addiu $s0, $s0, 4 -/* 833424 80241C24 8E050000 */ lw $a1, ($s0) -/* 833428 80241C28 26100004 */ addiu $s0, $s0, 4 -/* 83342C 80241C2C 0220202D */ daddu $a0, $s1, $zero -/* 833430 80241C30 0C0B1EAF */ jal get_variable -/* 833434 80241C34 0040902D */ daddu $s2, $v0, $zero -/* 833438 80241C38 8E050000 */ lw $a1, ($s0) -/* 83343C 80241C3C 26100004 */ addiu $s0, $s0, 4 -/* 833440 80241C40 4482C000 */ mtc1 $v0, $f24 -/* 833444 80241C44 00000000 */ nop -/* 833448 80241C48 4680C620 */ cvt.s.w $f24, $f24 -/* 83344C 80241C4C 0C0B1EAF */ jal get_variable -/* 833450 80241C50 0220202D */ daddu $a0, $s1, $zero -/* 833454 80241C54 8E050000 */ lw $a1, ($s0) -/* 833458 80241C58 26100004 */ addiu $s0, $s0, 4 -/* 83345C 80241C5C 4482B000 */ mtc1 $v0, $f22 -/* 833460 80241C60 00000000 */ nop -/* 833464 80241C64 4680B5A0 */ cvt.s.w $f22, $f22 -/* 833468 80241C68 0C0B1EAF */ jal get_variable -/* 83346C 80241C6C 0220202D */ daddu $a0, $s1, $zero -/* 833470 80241C70 8E050000 */ lw $a1, ($s0) -/* 833474 80241C74 4482A000 */ mtc1 $v0, $f20 -/* 833478 80241C78 00000000 */ nop -/* 83347C 80241C7C 4680A520 */ cvt.s.w $f20, $f20 -/* 833480 80241C80 0C0B1EAF */ jal get_variable -/* 833484 80241C84 0220202D */ daddu $a0, $s1, $zero -/* 833488 80241C88 8E63000C */ lw $v1, 0xc($s3) -/* 83348C 80241C8C 00129080 */ sll $s2, $s2, 2 -/* 833490 80241C90 00721821 */ addu $v1, $v1, $s2 -/* 833494 80241C94 E4780034 */ swc1 $f24, 0x34($v1) -/* 833498 80241C98 8E63000C */ lw $v1, 0xc($s3) -/* 83349C 80241C9C 00721821 */ addu $v1, $v1, $s2 -/* 8334A0 80241CA0 E4760060 */ swc1 $f22, 0x60($v1) -/* 8334A4 80241CA4 8E63000C */ lw $v1, 0xc($s3) -/* 8334A8 80241CA8 00721821 */ addu $v1, $v1, $s2 -/* 8334AC 80241CAC E474008C */ swc1 $f20, 0x8c($v1) -/* 8334B0 80241CB0 8E63000C */ lw $v1, 0xc($s3) -/* 8334B4 80241CB4 44820000 */ mtc1 $v0, $f0 -/* 8334B8 80241CB8 00000000 */ nop -/* 8334BC 80241CBC 46800020 */ cvt.s.w $f0, $f0 -/* 8334C0 80241CC0 00721821 */ addu $v1, $v1, $s2 -/* 8334C4 80241CC4 E46000B8 */ swc1 $f0, 0xb8($v1) -/* 8334C8 80241CC8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8334CC 80241CCC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8334D0 80241CD0 8FB20018 */ lw $s2, 0x18($sp) -/* 8334D4 80241CD4 8FB10014 */ lw $s1, 0x14($sp) -/* 8334D8 80241CD8 8FB00010 */ lw $s0, 0x10($sp) -/* 8334DC 80241CDC D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8334E0 80241CE0 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8334E4 80241CE4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8334E8 80241CE8 24020002 */ addiu $v0, $zero, 2 -/* 8334EC 80241CEC 03E00008 */ jr $ra -/* 8334F0 80241CF0 27BD0040 */ addiu $sp, $sp, 0x40 -/* 8334F4 80241CF4 00000000 */ nop -/* 8334F8 80241CF8 00000000 */ nop -/* 8334FC 80241CFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s new file mode 100644 index 0000000000..0052310d4c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241BD8_8333D8.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BD8_8333D8 +/* 8333D8 80241BD8 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 8333DC 80241BDC AFB10014 */ sw $s1, 0x14($sp) +/* 8333E0 80241BE0 0080882D */ daddu $s1, $a0, $zero +/* 8333E4 80241BE4 3C05FD05 */ lui $a1, 0xfd05 +/* 8333E8 80241BE8 AFBF0020 */ sw $ra, 0x20($sp) +/* 8333EC 80241BEC AFB3001C */ sw $s3, 0x1c($sp) +/* 8333F0 80241BF0 AFB20018 */ sw $s2, 0x18($sp) +/* 8333F4 80241BF4 AFB00010 */ sw $s0, 0x10($sp) +/* 8333F8 80241BF8 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 8333FC 80241BFC F7B60030 */ sdc1 $f22, 0x30($sp) +/* 833400 80241C00 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 833404 80241C04 0C0B1EAF */ jal get_variable +/* 833408 80241C08 34A50F82 */ ori $a1, $a1, 0xf82 +/* 83340C 80241C0C 0220202D */ daddu $a0, $s1, $zero +/* 833410 80241C10 8E30000C */ lw $s0, 0xc($s1) +/* 833414 80241C14 0040982D */ daddu $s3, $v0, $zero +/* 833418 80241C18 8E050000 */ lw $a1, ($s0) +/* 83341C 80241C1C 0C0B1EAF */ jal get_variable +/* 833420 80241C20 26100004 */ addiu $s0, $s0, 4 +/* 833424 80241C24 8E050000 */ lw $a1, ($s0) +/* 833428 80241C28 26100004 */ addiu $s0, $s0, 4 +/* 83342C 80241C2C 0220202D */ daddu $a0, $s1, $zero +/* 833430 80241C30 0C0B1EAF */ jal get_variable +/* 833434 80241C34 0040902D */ daddu $s2, $v0, $zero +/* 833438 80241C38 8E050000 */ lw $a1, ($s0) +/* 83343C 80241C3C 26100004 */ addiu $s0, $s0, 4 +/* 833440 80241C40 4482C000 */ mtc1 $v0, $f24 +/* 833444 80241C44 00000000 */ nop +/* 833448 80241C48 4680C620 */ cvt.s.w $f24, $f24 +/* 83344C 80241C4C 0C0B1EAF */ jal get_variable +/* 833450 80241C50 0220202D */ daddu $a0, $s1, $zero +/* 833454 80241C54 8E050000 */ lw $a1, ($s0) +/* 833458 80241C58 26100004 */ addiu $s0, $s0, 4 +/* 83345C 80241C5C 4482B000 */ mtc1 $v0, $f22 +/* 833460 80241C60 00000000 */ nop +/* 833464 80241C64 4680B5A0 */ cvt.s.w $f22, $f22 +/* 833468 80241C68 0C0B1EAF */ jal get_variable +/* 83346C 80241C6C 0220202D */ daddu $a0, $s1, $zero +/* 833470 80241C70 8E050000 */ lw $a1, ($s0) +/* 833474 80241C74 4482A000 */ mtc1 $v0, $f20 +/* 833478 80241C78 00000000 */ nop +/* 83347C 80241C7C 4680A520 */ cvt.s.w $f20, $f20 +/* 833480 80241C80 0C0B1EAF */ jal get_variable +/* 833484 80241C84 0220202D */ daddu $a0, $s1, $zero +/* 833488 80241C88 8E63000C */ lw $v1, 0xc($s3) +/* 83348C 80241C8C 00129080 */ sll $s2, $s2, 2 +/* 833490 80241C90 00721821 */ addu $v1, $v1, $s2 +/* 833494 80241C94 E4780034 */ swc1 $f24, 0x34($v1) +/* 833498 80241C98 8E63000C */ lw $v1, 0xc($s3) +/* 83349C 80241C9C 00721821 */ addu $v1, $v1, $s2 +/* 8334A0 80241CA0 E4760060 */ swc1 $f22, 0x60($v1) +/* 8334A4 80241CA4 8E63000C */ lw $v1, 0xc($s3) +/* 8334A8 80241CA8 00721821 */ addu $v1, $v1, $s2 +/* 8334AC 80241CAC E474008C */ swc1 $f20, 0x8c($v1) +/* 8334B0 80241CB0 8E63000C */ lw $v1, 0xc($s3) +/* 8334B4 80241CB4 44820000 */ mtc1 $v0, $f0 +/* 8334B8 80241CB8 00000000 */ nop +/* 8334BC 80241CBC 46800020 */ cvt.s.w $f0, $f0 +/* 8334C0 80241CC0 00721821 */ addu $v1, $v1, $s2 +/* 8334C4 80241CC4 E46000B8 */ swc1 $f0, 0xb8($v1) +/* 8334C8 80241CC8 8FBF0020 */ lw $ra, 0x20($sp) +/* 8334CC 80241CCC 8FB3001C */ lw $s3, 0x1c($sp) +/* 8334D0 80241CD0 8FB20018 */ lw $s2, 0x18($sp) +/* 8334D4 80241CD4 8FB10014 */ lw $s1, 0x14($sp) +/* 8334D8 80241CD8 8FB00010 */ lw $s0, 0x10($sp) +/* 8334DC 80241CDC D7B80038 */ ldc1 $f24, 0x38($sp) +/* 8334E0 80241CE0 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 8334E4 80241CE4 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8334E8 80241CE8 24020002 */ addiu $v0, $zero, 2 +/* 8334EC 80241CEC 03E00008 */ jr $ra +/* 8334F0 80241CF0 27BD0040 */ addiu $sp, $sp, 0x40 +/* 8334F4 80241CF4 00000000 */ nop +/* 8334F8 80241CF8 00000000 */ nop +/* 8334FC 80241CFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D00.s b/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D00.s deleted file mode 100644 index 36d920a8fa..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D00.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D00 -/* 833500 80241D00 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 833504 80241D04 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 833508 80241D08 4485A000 */ mtc1 $a1, $f20 -/* 83350C 80241D0C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 833510 80241D10 4486B000 */ mtc1 $a2, $f22 -/* 833514 80241D14 AFB00010 */ sw $s0, 0x10($sp) -/* 833518 80241D18 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 83351C 80241D1C 4487C000 */ mtc1 $a3, $f24 -/* 833520 80241D20 AFBF0014 */ sw $ra, 0x14($sp) -/* 833524 80241D24 0C019D28 */ jal guMtxIdentF -/* 833528 80241D28 0080802D */ daddu $s0, $a0, $zero -/* 83352C 80241D2C 4616A582 */ mul.s $f22, $f20, $f22 -/* 833530 80241D30 00000000 */ nop -/* 833534 80241D34 4618A502 */ mul.s $f20, $f20, $f24 -/* 833538 80241D38 00000000 */ nop -/* 83353C 80241D3C 3C013F80 */ lui $at, 0x3f80 -/* 833540 80241D40 44810000 */ mtc1 $at, $f0 -/* 833544 80241D44 00000000 */ nop -/* 833548 80241D48 E6000014 */ swc1 $f0, 0x14($s0) -/* 83354C 80241D4C E6160010 */ swc1 $f22, 0x10($s0) -/* 833550 80241D50 E6140018 */ swc1 $f20, 0x18($s0) -/* 833554 80241D54 8FBF0014 */ lw $ra, 0x14($sp) -/* 833558 80241D58 8FB00010 */ lw $s0, 0x10($sp) -/* 83355C 80241D5C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 833560 80241D60 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 833564 80241D64 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 833568 80241D68 03E00008 */ jr $ra -/* 83356C 80241D6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D00_833500.s b/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D00_833500.s new file mode 100644 index 0000000000..849f65a0f6 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D00_833500.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D00_833500 +/* 833500 80241D00 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 833504 80241D04 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 833508 80241D08 4485A000 */ mtc1 $a1, $f20 +/* 83350C 80241D0C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 833510 80241D10 4486B000 */ mtc1 $a2, $f22 +/* 833514 80241D14 AFB00010 */ sw $s0, 0x10($sp) +/* 833518 80241D18 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 83351C 80241D1C 4487C000 */ mtc1 $a3, $f24 +/* 833520 80241D20 AFBF0014 */ sw $ra, 0x14($sp) +/* 833524 80241D24 0C019D28 */ jal guMtxIdentF +/* 833528 80241D28 0080802D */ daddu $s0, $a0, $zero +/* 83352C 80241D2C 4616A582 */ mul.s $f22, $f20, $f22 +/* 833530 80241D30 00000000 */ nop +/* 833534 80241D34 4618A502 */ mul.s $f20, $f20, $f24 +/* 833538 80241D38 00000000 */ nop +/* 83353C 80241D3C 3C013F80 */ lui $at, 0x3f80 +/* 833540 80241D40 44810000 */ mtc1 $at, $f0 +/* 833544 80241D44 00000000 */ nop +/* 833548 80241D48 E6000014 */ swc1 $f0, 0x14($s0) +/* 83354C 80241D4C E6160010 */ swc1 $f22, 0x10($s0) +/* 833550 80241D50 E6140018 */ swc1 $f20, 0x18($s0) +/* 833554 80241D54 8FBF0014 */ lw $ra, 0x14($sp) +/* 833558 80241D58 8FB00010 */ lw $s0, 0x10($sp) +/* 83355C 80241D5C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 833560 80241D60 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 833564 80241D64 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 833568 80241D68 03E00008 */ jr $ra +/* 83356C 80241D6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D70.s b/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D70.s deleted file mode 100644 index e59ce46d54..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D70.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D70 -/* 833570 80241D70 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 833574 80241D74 AFB10054 */ sw $s1, 0x54($sp) -/* 833578 80241D78 0080882D */ daddu $s1, $a0, $zero -/* 83357C 80241D7C AFBF005C */ sw $ra, 0x5c($sp) -/* 833580 80241D80 AFB20058 */ sw $s2, 0x58($sp) -/* 833584 80241D84 AFB00050 */ sw $s0, 0x50($sp) -/* 833588 80241D88 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 83358C 80241D8C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 833590 80241D90 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 833594 80241D94 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 833598 80241D98 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 83359C 80241D9C 8E30000C */ lw $s0, 0xc($s1) -/* 8335A0 80241DA0 8E050000 */ lw $a1, ($s0) -/* 8335A4 80241DA4 0C0B1EAF */ jal get_variable -/* 8335A8 80241DA8 26100004 */ addiu $s0, $s0, 4 -/* 8335AC 80241DAC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8335B0 80241DB0 0040202D */ daddu $a0, $v0, $zero -/* 8335B4 80241DB4 8E050000 */ lw $a1, ($s0) -/* 8335B8 80241DB8 26100004 */ addiu $s0, $s0, 4 -/* 8335BC 80241DBC 0220202D */ daddu $a0, $s1, $zero -/* 8335C0 80241DC0 0C0B210B */ jal get_float_variable -/* 8335C4 80241DC4 0040902D */ daddu $s2, $v0, $zero -/* 8335C8 80241DC8 8E050000 */ lw $a1, ($s0) -/* 8335CC 80241DCC 26100004 */ addiu $s0, $s0, 4 -/* 8335D0 80241DD0 0220202D */ daddu $a0, $s1, $zero -/* 8335D4 80241DD4 0C0B210B */ jal get_float_variable -/* 8335D8 80241DD8 46000706 */ mov.s $f28, $f0 -/* 8335DC 80241DDC 8E050000 */ lw $a1, ($s0) -/* 8335E0 80241DE0 26100004 */ addiu $s0, $s0, 4 -/* 8335E4 80241DE4 0220202D */ daddu $a0, $s1, $zero -/* 8335E8 80241DE8 0C0B210B */ jal get_float_variable -/* 8335EC 80241DEC 46000686 */ mov.s $f26, $f0 -/* 8335F0 80241DF0 0220202D */ daddu $a0, $s1, $zero -/* 8335F4 80241DF4 8E050000 */ lw $a1, ($s0) -/* 8335F8 80241DF8 0C0B210B */ jal get_float_variable -/* 8335FC 80241DFC 46000586 */ mov.s $f22, $f0 -/* 833600 80241E00 0240202D */ daddu $a0, $s2, $zero -/* 833604 80241E04 0C046B4C */ jal get_model_from_list_index -/* 833608 80241E08 46000606 */ mov.s $f24, $f0 -/* 83360C 80241E0C 0040882D */ daddu $s1, $v0, $zero -/* 833610 80241E10 96220000 */ lhu $v0, ($s1) -/* 833614 80241E14 30420400 */ andi $v0, $v0, 0x400 -/* 833618 80241E18 1440001E */ bnez $v0, .L80241E94 -/* 83361C 80241E1C 26300058 */ addiu $s0, $s1, 0x58 -/* 833620 80241E20 4480A000 */ mtc1 $zero, $f20 -/* 833624 80241E24 4406B000 */ mfc1 $a2, $f22 -/* 833628 80241E28 4405A000 */ mfc1 $a1, $f20 -/* 83362C 80241E2C 4407A000 */ mfc1 $a3, $f20 -/* 833630 80241E30 0C019E40 */ jal guTranslateF -/* 833634 80241E34 0200202D */ daddu $a0, $s0, $zero -/* 833638 80241E38 4405E000 */ mfc1 $a1, $f28 -/* 83363C 80241E3C 4406D000 */ mfc1 $a2, $f26 -/* 833640 80241E40 4407C000 */ mfc1 $a3, $f24 -/* 833644 80241E44 0C090740 */ jal func_80241D00 -/* 833648 80241E48 27A40010 */ addiu $a0, $sp, 0x10 -/* 83364C 80241E4C 27A40010 */ addiu $a0, $sp, 0x10 -/* 833650 80241E50 0200282D */ daddu $a1, $s0, $zero -/* 833654 80241E54 0C019D80 */ jal guMtxCatF -/* 833658 80241E58 0200302D */ daddu $a2, $s0, $zero -/* 83365C 80241E5C 27A40010 */ addiu $a0, $sp, 0x10 -/* 833660 80241E60 4600B587 */ neg.s $f22, $f22 -/* 833664 80241E64 4405A000 */ mfc1 $a1, $f20 -/* 833668 80241E68 4406B000 */ mfc1 $a2, $f22 -/* 83366C 80241E6C 0C019E40 */ jal guTranslateF -/* 833670 80241E70 00A0382D */ daddu $a3, $a1, $zero -/* 833674 80241E74 27A40010 */ addiu $a0, $sp, 0x10 -/* 833678 80241E78 0200282D */ daddu $a1, $s0, $zero -/* 83367C 80241E7C 0C019D80 */ jal guMtxCatF -/* 833680 80241E80 00A0302D */ daddu $a2, $a1, $zero -/* 833684 80241E84 96220000 */ lhu $v0, ($s1) -/* 833688 80241E88 34421400 */ ori $v0, $v0, 0x1400 -/* 83368C 80241E8C 080907C3 */ j .L80241F0C -/* 833690 80241E90 A6220000 */ sh $v0, ($s1) -.L80241E94: -/* 833694 80241E94 4480A000 */ mtc1 $zero, $f20 -/* 833698 80241E98 4406B000 */ mfc1 $a2, $f22 -/* 83369C 80241E9C 4405A000 */ mfc1 $a1, $f20 -/* 8336A0 80241EA0 4407A000 */ mfc1 $a3, $f20 -/* 8336A4 80241EA4 0C019E40 */ jal guTranslateF -/* 8336A8 80241EA8 27A40010 */ addiu $a0, $sp, 0x10 -/* 8336AC 80241EAC 27A40010 */ addiu $a0, $sp, 0x10 -/* 8336B0 80241EB0 26300058 */ addiu $s0, $s1, 0x58 -/* 8336B4 80241EB4 0200282D */ daddu $a1, $s0, $zero -/* 8336B8 80241EB8 0C019D80 */ jal guMtxCatF -/* 8336BC 80241EBC 0200302D */ daddu $a2, $s0, $zero -/* 8336C0 80241EC0 4405E000 */ mfc1 $a1, $f28 -/* 8336C4 80241EC4 4406D000 */ mfc1 $a2, $f26 -/* 8336C8 80241EC8 4407C000 */ mfc1 $a3, $f24 -/* 8336CC 80241ECC 0C090740 */ jal func_80241D00 -/* 8336D0 80241ED0 27A40010 */ addiu $a0, $sp, 0x10 -/* 8336D4 80241ED4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8336D8 80241ED8 0200282D */ daddu $a1, $s0, $zero -/* 8336DC 80241EDC 0C019D80 */ jal guMtxCatF -/* 8336E0 80241EE0 0200302D */ daddu $a2, $s0, $zero -/* 8336E4 80241EE4 27A40010 */ addiu $a0, $sp, 0x10 -/* 8336E8 80241EE8 4600B587 */ neg.s $f22, $f22 -/* 8336EC 80241EEC 4405A000 */ mfc1 $a1, $f20 -/* 8336F0 80241EF0 4406B000 */ mfc1 $a2, $f22 -/* 8336F4 80241EF4 0C019E40 */ jal guTranslateF -/* 8336F8 80241EF8 00A0382D */ daddu $a3, $a1, $zero -/* 8336FC 80241EFC 27A40010 */ addiu $a0, $sp, 0x10 -/* 833700 80241F00 0200282D */ daddu $a1, $s0, $zero -/* 833704 80241F04 0C019D80 */ jal guMtxCatF -/* 833708 80241F08 00A0302D */ daddu $a2, $a1, $zero -.L80241F0C: -/* 83370C 80241F0C 8FBF005C */ lw $ra, 0x5c($sp) -/* 833710 80241F10 8FB20058 */ lw $s2, 0x58($sp) -/* 833714 80241F14 8FB10054 */ lw $s1, 0x54($sp) -/* 833718 80241F18 8FB00050 */ lw $s0, 0x50($sp) -/* 83371C 80241F1C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 833720 80241F20 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 833724 80241F24 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 833728 80241F28 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 83372C 80241F2C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 833730 80241F30 24020002 */ addiu $v0, $zero, 2 -/* 833734 80241F34 03E00008 */ jr $ra -/* 833738 80241F38 27BD0088 */ addiu $sp, $sp, 0x88 -/* 83373C 80241F3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D70_833570.s b/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D70_833570.s new file mode 100644 index 0000000000..629938b4f9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833500/func_80241D70_833570.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D70_833570 +/* 833570 80241D70 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 833574 80241D74 AFB10054 */ sw $s1, 0x54($sp) +/* 833578 80241D78 0080882D */ daddu $s1, $a0, $zero +/* 83357C 80241D7C AFBF005C */ sw $ra, 0x5c($sp) +/* 833580 80241D80 AFB20058 */ sw $s2, 0x58($sp) +/* 833584 80241D84 AFB00050 */ sw $s0, 0x50($sp) +/* 833588 80241D88 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 83358C 80241D8C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 833590 80241D90 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 833594 80241D94 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 833598 80241D98 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 83359C 80241D9C 8E30000C */ lw $s0, 0xc($s1) +/* 8335A0 80241DA0 8E050000 */ lw $a1, ($s0) +/* 8335A4 80241DA4 0C0B1EAF */ jal get_variable +/* 8335A8 80241DA8 26100004 */ addiu $s0, $s0, 4 +/* 8335AC 80241DAC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8335B0 80241DB0 0040202D */ daddu $a0, $v0, $zero +/* 8335B4 80241DB4 8E050000 */ lw $a1, ($s0) +/* 8335B8 80241DB8 26100004 */ addiu $s0, $s0, 4 +/* 8335BC 80241DBC 0220202D */ daddu $a0, $s1, $zero +/* 8335C0 80241DC0 0C0B210B */ jal get_float_variable +/* 8335C4 80241DC4 0040902D */ daddu $s2, $v0, $zero +/* 8335C8 80241DC8 8E050000 */ lw $a1, ($s0) +/* 8335CC 80241DCC 26100004 */ addiu $s0, $s0, 4 +/* 8335D0 80241DD0 0220202D */ daddu $a0, $s1, $zero +/* 8335D4 80241DD4 0C0B210B */ jal get_float_variable +/* 8335D8 80241DD8 46000706 */ mov.s $f28, $f0 +/* 8335DC 80241DDC 8E050000 */ lw $a1, ($s0) +/* 8335E0 80241DE0 26100004 */ addiu $s0, $s0, 4 +/* 8335E4 80241DE4 0220202D */ daddu $a0, $s1, $zero +/* 8335E8 80241DE8 0C0B210B */ jal get_float_variable +/* 8335EC 80241DEC 46000686 */ mov.s $f26, $f0 +/* 8335F0 80241DF0 0220202D */ daddu $a0, $s1, $zero +/* 8335F4 80241DF4 8E050000 */ lw $a1, ($s0) +/* 8335F8 80241DF8 0C0B210B */ jal get_float_variable +/* 8335FC 80241DFC 46000586 */ mov.s $f22, $f0 +/* 833600 80241E00 0240202D */ daddu $a0, $s2, $zero +/* 833604 80241E04 0C046B4C */ jal get_model_from_list_index +/* 833608 80241E08 46000606 */ mov.s $f24, $f0 +/* 83360C 80241E0C 0040882D */ daddu $s1, $v0, $zero +/* 833610 80241E10 96220000 */ lhu $v0, ($s1) +/* 833614 80241E14 30420400 */ andi $v0, $v0, 0x400 +/* 833618 80241E18 1440001E */ bnez $v0, .L80241E94 +/* 83361C 80241E1C 26300058 */ addiu $s0, $s1, 0x58 +/* 833620 80241E20 4480A000 */ mtc1 $zero, $f20 +/* 833624 80241E24 4406B000 */ mfc1 $a2, $f22 +/* 833628 80241E28 4405A000 */ mfc1 $a1, $f20 +/* 83362C 80241E2C 4407A000 */ mfc1 $a3, $f20 +/* 833630 80241E30 0C019E40 */ jal guTranslateF +/* 833634 80241E34 0200202D */ daddu $a0, $s0, $zero +/* 833638 80241E38 4405E000 */ mfc1 $a1, $f28 +/* 83363C 80241E3C 4406D000 */ mfc1 $a2, $f26 +/* 833640 80241E40 4407C000 */ mfc1 $a3, $f24 +/* 833644 80241E44 0C090740 */ jal func_80241D00_833500 +/* 833648 80241E48 27A40010 */ addiu $a0, $sp, 0x10 +/* 83364C 80241E4C 27A40010 */ addiu $a0, $sp, 0x10 +/* 833650 80241E50 0200282D */ daddu $a1, $s0, $zero +/* 833654 80241E54 0C019D80 */ jal guMtxCatF +/* 833658 80241E58 0200302D */ daddu $a2, $s0, $zero +/* 83365C 80241E5C 27A40010 */ addiu $a0, $sp, 0x10 +/* 833660 80241E60 4600B587 */ neg.s $f22, $f22 +/* 833664 80241E64 4405A000 */ mfc1 $a1, $f20 +/* 833668 80241E68 4406B000 */ mfc1 $a2, $f22 +/* 83366C 80241E6C 0C019E40 */ jal guTranslateF +/* 833670 80241E70 00A0382D */ daddu $a3, $a1, $zero +/* 833674 80241E74 27A40010 */ addiu $a0, $sp, 0x10 +/* 833678 80241E78 0200282D */ daddu $a1, $s0, $zero +/* 83367C 80241E7C 0C019D80 */ jal guMtxCatF +/* 833680 80241E80 00A0302D */ daddu $a2, $a1, $zero +/* 833684 80241E84 96220000 */ lhu $v0, ($s1) +/* 833688 80241E88 34421400 */ ori $v0, $v0, 0x1400 +/* 83368C 80241E8C 080907C3 */ j .L80241F0C +/* 833690 80241E90 A6220000 */ sh $v0, ($s1) +.L80241E94: +/* 833694 80241E94 4480A000 */ mtc1 $zero, $f20 +/* 833698 80241E98 4406B000 */ mfc1 $a2, $f22 +/* 83369C 80241E9C 4405A000 */ mfc1 $a1, $f20 +/* 8336A0 80241EA0 4407A000 */ mfc1 $a3, $f20 +/* 8336A4 80241EA4 0C019E40 */ jal guTranslateF +/* 8336A8 80241EA8 27A40010 */ addiu $a0, $sp, 0x10 +/* 8336AC 80241EAC 27A40010 */ addiu $a0, $sp, 0x10 +/* 8336B0 80241EB0 26300058 */ addiu $s0, $s1, 0x58 +/* 8336B4 80241EB4 0200282D */ daddu $a1, $s0, $zero +/* 8336B8 80241EB8 0C019D80 */ jal guMtxCatF +/* 8336BC 80241EBC 0200302D */ daddu $a2, $s0, $zero +/* 8336C0 80241EC0 4405E000 */ mfc1 $a1, $f28 +/* 8336C4 80241EC4 4406D000 */ mfc1 $a2, $f26 +/* 8336C8 80241EC8 4407C000 */ mfc1 $a3, $f24 +/* 8336CC 80241ECC 0C090740 */ jal func_80241D00_833500 +/* 8336D0 80241ED0 27A40010 */ addiu $a0, $sp, 0x10 +/* 8336D4 80241ED4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8336D8 80241ED8 0200282D */ daddu $a1, $s0, $zero +/* 8336DC 80241EDC 0C019D80 */ jal guMtxCatF +/* 8336E0 80241EE0 0200302D */ daddu $a2, $s0, $zero +/* 8336E4 80241EE4 27A40010 */ addiu $a0, $sp, 0x10 +/* 8336E8 80241EE8 4600B587 */ neg.s $f22, $f22 +/* 8336EC 80241EEC 4405A000 */ mfc1 $a1, $f20 +/* 8336F0 80241EF0 4406B000 */ mfc1 $a2, $f22 +/* 8336F4 80241EF4 0C019E40 */ jal guTranslateF +/* 8336F8 80241EF8 00A0382D */ daddu $a3, $a1, $zero +/* 8336FC 80241EFC 27A40010 */ addiu $a0, $sp, 0x10 +/* 833700 80241F00 0200282D */ daddu $a1, $s0, $zero +/* 833704 80241F04 0C019D80 */ jal guMtxCatF +/* 833708 80241F08 00A0302D */ daddu $a2, $a1, $zero +.L80241F0C: +/* 83370C 80241F0C 8FBF005C */ lw $ra, 0x5c($sp) +/* 833710 80241F10 8FB20058 */ lw $s2, 0x58($sp) +/* 833714 80241F14 8FB10054 */ lw $s1, 0x54($sp) +/* 833718 80241F18 8FB00050 */ lw $s0, 0x50($sp) +/* 83371C 80241F1C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 833720 80241F20 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 833724 80241F24 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 833728 80241F28 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 83372C 80241F2C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 833730 80241F30 24020002 */ addiu $v0, $zero, 2 +/* 833734 80241F34 03E00008 */ jr $ra +/* 833738 80241F38 27BD0088 */ addiu $sp, $sp, 0x88 +/* 83373C 80241F3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F40.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F40.s deleted file mode 100644 index 159eb4ec3f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F40.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F40 -/* 833740 80241F40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 833744 80241F44 AFBF0010 */ sw $ra, 0x10($sp) -/* 833748 80241F48 8C82000C */ lw $v0, 0xc($a0) -/* 83374C 80241F4C 3C068016 */ lui $a2, 0x8016 -/* 833750 80241F50 84C6A552 */ lh $a2, -0x5aae($a2) -/* 833754 80241F54 0C0B2026 */ jal set_variable -/* 833758 80241F58 8C450000 */ lw $a1, ($v0) -/* 83375C 80241F5C 8FBF0010 */ lw $ra, 0x10($sp) -/* 833760 80241F60 24020002 */ addiu $v0, $zero, 2 -/* 833764 80241F64 03E00008 */ jr $ra -/* 833768 80241F68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F40_833740.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F40_833740.s new file mode 100644 index 0000000000..c380d955e7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F40_833740.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F40_833740 +/* 833740 80241F40 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 833744 80241F44 AFBF0010 */ sw $ra, 0x10($sp) +/* 833748 80241F48 8C82000C */ lw $v0, 0xc($a0) +/* 83374C 80241F4C 3C068016 */ lui $a2, 0x8016 +/* 833750 80241F50 84C6A552 */ lh $a2, -0x5aae($a2) +/* 833754 80241F54 0C0B2026 */ jal set_variable +/* 833758 80241F58 8C450000 */ lw $a1, ($v0) +/* 83375C 80241F5C 8FBF0010 */ lw $ra, 0x10($sp) +/* 833760 80241F60 24020002 */ addiu $v0, $zero, 2 +/* 833764 80241F64 03E00008 */ jr $ra +/* 833768 80241F68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C.s deleted file mode 100644 index 3d496755b9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F6C -/* 83376C 80241F6C 3C028011 */ lui $v0, 0x8011 -/* 833770 80241F70 8442F29C */ lh $v0, -0xd64($v0) -/* 833774 80241F74 AC820084 */ sw $v0, 0x84($a0) -/* 833778 80241F78 03E00008 */ jr $ra -/* 83377C 80241F7C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s new file mode 100644 index 0000000000..f8b4208bfe --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F6C_83376C +/* 83376C 80241F6C 3C028011 */ lui $v0, 0x8011 +/* 833770 80241F70 8442F29C */ lh $v0, -0xd64($v0) +/* 833774 80241F74 AC820084 */ sw $v0, 0x84($a0) +/* 833778 80241F78 03E00008 */ jr $ra +/* 83377C 80241F7C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80.s deleted file mode 100644 index b7836bd755..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F80 -/* 833780 80241F80 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 833784 80241F84 AFBF0010 */ sw $ra, 0x10($sp) -/* 833788 80241F88 0C03A5B2 */ jal func_800E96C8 -/* 83378C 80241F8C 00000000 */ nop -/* 833790 80241F90 8FBF0010 */ lw $ra, 0x10($sp) -/* 833794 80241F94 24020002 */ addiu $v0, $zero, 2 -/* 833798 80241F98 03E00008 */ jr $ra -/* 83379C 80241F9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s new file mode 100644 index 0000000000..37f5b52f2c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F80_833780.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F80_833780 +/* 833780 80241F80 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 833784 80241F84 AFBF0010 */ sw $ra, 0x10($sp) +/* 833788 80241F88 0C03A5B2 */ jal func_800E96C8 +/* 83378C 80241F8C 00000000 */ nop +/* 833790 80241F90 8FBF0010 */ lw $ra, 0x10($sp) +/* 833794 80241F94 24020002 */ addiu $v0, $zero, 2 +/* 833798 80241F98 03E00008 */ jr $ra +/* 83379C 80241F9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0.s deleted file mode 100644 index 1b0a839023..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FA0 -/* 8337A0 80241FA0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8337A4 80241FA4 AFB00010 */ sw $s0, 0x10($sp) -/* 8337A8 80241FA8 0080802D */ daddu $s0, $a0, $zero -/* 8337AC 80241FAC 3C030DB5 */ lui $v1, 0xdb5 -/* 8337B0 80241FB0 34638580 */ ori $v1, $v1, 0x8580 -/* 8337B4 80241FB4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8337B8 80241FB8 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 8337BC 80241FBC F7B40018 */ sdc1 $f20, 0x18($sp) -/* 8337C0 80241FC0 8E02008C */ lw $v0, 0x8c($s0) -/* 8337C4 80241FC4 3C013A80 */ lui $at, 0x3a80 -/* 8337C8 80241FC8 44816000 */ mtc1 $at, $f12 -/* 8337CC 80241FCC 00431021 */ addu $v0, $v0, $v1 -/* 8337D0 80241FD0 4482B000 */ mtc1 $v0, $f22 -/* 8337D4 80241FD4 00000000 */ nop -/* 8337D8 80241FD8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8337DC 80241FDC 460CB302 */ mul.s $f12, $f22, $f12 -/* 8337E0 80241FE0 0C00A6C9 */ jal clamp_angle -/* 8337E4 80241FE4 00000000 */ nop -/* 8337E8 80241FE8 46000586 */ mov.s $f22, $f0 -/* 8337EC 80241FEC 3C0142DC */ lui $at, 0x42dc -/* 8337F0 80241FF0 4481A000 */ mtc1 $at, $f20 -/* 8337F4 80241FF4 0C00A8BB */ jal sin_deg -/* 8337F8 80241FF8 4600B306 */ mov.s $f12, $f22 -/* 8337FC 80241FFC 46140002 */ mul.s $f0, $f0, $f20 -/* 833800 80242000 00000000 */ nop -/* 833804 80242004 3C014327 */ lui $at, 0x4327 -/* 833808 80242008 44811000 */ mtc1 $at, $f2 -/* 83380C 8024200C 00000000 */ nop -/* 833810 80242010 46020000 */ add.s $f0, $f0, $f2 -/* 833814 80242014 24020055 */ addiu $v0, $zero, 0x55 -/* 833818 80242018 AE020090 */ sw $v0, 0x90($s0) -/* 83381C 8024201C 4600010D */ trunc.w.s $f4, $f0 -/* 833820 80242020 E604008C */ swc1 $f4, 0x8c($s0) -/* 833824 80242024 0C00A8D4 */ jal cos_deg -/* 833828 80242028 4600B306 */ mov.s $f12, $f22 -/* 83382C 8024202C 46140002 */ mul.s $f0, $f0, $f20 -/* 833830 80242030 00000000 */ nop -/* 833834 80242034 3C01C3AB */ lui $at, 0xc3ab -/* 833838 80242038 3421E000 */ ori $at, $at, 0xe000 -/* 83383C 8024203C 44811000 */ mtc1 $at, $f2 -/* 833840 80242040 00000000 */ nop -/* 833844 80242044 46001081 */ sub.s $f2, $f2, $f0 -/* 833848 80242048 4600110D */ trunc.w.s $f4, $f2 -/* 83384C 8024204C E6040094 */ swc1 $f4, 0x94($s0) -/* 833850 80242050 8FBF0014 */ lw $ra, 0x14($sp) -/* 833854 80242054 8FB00010 */ lw $s0, 0x10($sp) -/* 833858 80242058 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 83385C 8024205C D7B40018 */ ldc1 $f20, 0x18($sp) -/* 833860 80242060 24020002 */ addiu $v0, $zero, 2 -/* 833864 80242064 03E00008 */ jr $ra -/* 833868 80242068 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0_8337A0.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0_8337A0.s new file mode 100644 index 0000000000..84a2509855 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241FA0_8337A0.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FA0_8337A0 +/* 8337A0 80241FA0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8337A4 80241FA4 AFB00010 */ sw $s0, 0x10($sp) +/* 8337A8 80241FA8 0080802D */ daddu $s0, $a0, $zero +/* 8337AC 80241FAC 3C030DB5 */ lui $v1, 0xdb5 +/* 8337B0 80241FB0 34638580 */ ori $v1, $v1, 0x8580 +/* 8337B4 80241FB4 AFBF0014 */ sw $ra, 0x14($sp) +/* 8337B8 80241FB8 F7B60020 */ sdc1 $f22, 0x20($sp) +/* 8337BC 80241FBC F7B40018 */ sdc1 $f20, 0x18($sp) +/* 8337C0 80241FC0 8E02008C */ lw $v0, 0x8c($s0) +/* 8337C4 80241FC4 3C013A80 */ lui $at, 0x3a80 +/* 8337C8 80241FC8 44816000 */ mtc1 $at, $f12 +/* 8337CC 80241FCC 00431021 */ addu $v0, $v0, $v1 +/* 8337D0 80241FD0 4482B000 */ mtc1 $v0, $f22 +/* 8337D4 80241FD4 00000000 */ nop +/* 8337D8 80241FD8 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8337DC 80241FDC 460CB302 */ mul.s $f12, $f22, $f12 +/* 8337E0 80241FE0 0C00A6C9 */ jal clamp_angle +/* 8337E4 80241FE4 00000000 */ nop +/* 8337E8 80241FE8 46000586 */ mov.s $f22, $f0 +/* 8337EC 80241FEC 3C0142DC */ lui $at, 0x42dc +/* 8337F0 80241FF0 4481A000 */ mtc1 $at, $f20 +/* 8337F4 80241FF4 0C00A8BB */ jal sin_deg +/* 8337F8 80241FF8 4600B306 */ mov.s $f12, $f22 +/* 8337FC 80241FFC 46140002 */ mul.s $f0, $f0, $f20 +/* 833800 80242000 00000000 */ nop +/* 833804 80242004 3C014327 */ lui $at, 0x4327 +/* 833808 80242008 44811000 */ mtc1 $at, $f2 +/* 83380C 8024200C 00000000 */ nop +/* 833810 80242010 46020000 */ add.s $f0, $f0, $f2 +/* 833814 80242014 24020055 */ addiu $v0, $zero, 0x55 +/* 833818 80242018 AE020090 */ sw $v0, 0x90($s0) +/* 83381C 8024201C 4600010D */ trunc.w.s $f4, $f0 +/* 833820 80242020 E604008C */ swc1 $f4, 0x8c($s0) +/* 833824 80242024 0C00A8D4 */ jal cos_deg +/* 833828 80242028 4600B306 */ mov.s $f12, $f22 +/* 83382C 8024202C 46140002 */ mul.s $f0, $f0, $f20 +/* 833830 80242030 00000000 */ nop +/* 833834 80242034 3C01C3AB */ lui $at, 0xc3ab +/* 833838 80242038 3421E000 */ ori $at, $at, 0xe000 +/* 83383C 8024203C 44811000 */ mtc1 $at, $f2 +/* 833840 80242040 00000000 */ nop +/* 833844 80242044 46001081 */ sub.s $f2, $f2, $f0 +/* 833848 80242048 4600110D */ trunc.w.s $f4, $f2 +/* 83384C 8024204C E6040094 */ swc1 $f4, 0x94($s0) +/* 833850 80242050 8FBF0014 */ lw $ra, 0x14($sp) +/* 833854 80242054 8FB00010 */ lw $s0, 0x10($sp) +/* 833858 80242058 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 83385C 8024205C D7B40018 */ ldc1 $f20, 0x18($sp) +/* 833860 80242060 24020002 */ addiu $v0, $zero, 2 +/* 833864 80242064 03E00008 */ jr $ra +/* 833868 80242068 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C.s deleted file mode 100644 index 9cfe1e28eb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C.s +++ /dev/null @@ -1,101 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024206C -/* 83386C 8024206C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 833870 80242070 AFB00018 */ sw $s0, 0x18($sp) -/* 833874 80242074 0080802D */ daddu $s0, $a0, $zero -/* 833878 80242078 AFB40028 */ sw $s4, 0x28($sp) -/* 83387C 8024207C 3C14F5DE */ lui $s4, 0xf5de -/* 833880 80242080 3694019E */ ori $s4, $s4, 0x19e -/* 833884 80242084 0000202D */ daddu $a0, $zero, $zero -/* 833888 80242088 3C05F5DE */ lui $a1, 0xf5de -/* 83388C 8024208C AFBF0030 */ sw $ra, 0x30($sp) -/* 833890 80242090 AFB5002C */ sw $s5, 0x2c($sp) -/* 833894 80242094 AFB30024 */ sw $s3, 0x24($sp) -/* 833898 80242098 AFB20020 */ sw $s2, 0x20($sp) -/* 83389C 8024209C AFB1001C */ sw $s1, 0x1c($sp) -/* 8338A0 802420A0 F7B80048 */ sdc1 $f24, 0x48($sp) -/* 8338A4 802420A4 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8338A8 802420A8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8338AC 802420AC 0C0B1EAF */ jal get_variable -/* 8338B0 802420B0 34A5019D */ ori $a1, $a1, 0x19d -/* 8338B4 802420B4 0000202D */ daddu $a0, $zero, $zero -/* 8338B8 802420B8 44800000 */ mtc1 $zero, $f0 -/* 8338BC 802420BC 0080882D */ daddu $s1, $a0, $zero -/* 8338C0 802420C0 44050000 */ mfc1 $a1, $f0 -/* 8338C4 802420C4 0040982D */ daddu $s3, $v0, $zero -/* 8338C8 802420C8 AFA00014 */ sw $zero, 0x14($sp) -/* 8338CC 802420CC 00A0302D */ daddu $a2, $a1, $zero -/* 8338D0 802420D0 00A0382D */ daddu $a3, $a1, $zero -/* 8338D4 802420D4 0C01C9C4 */ jal func_80072710 -/* 8338D8 802420D8 AFA50010 */ sw $a1, 0x10($sp) -/* 8338DC 802420DC 0200202D */ daddu $a0, $s0, $zero -/* 8338E0 802420E0 3C05FD05 */ lui $a1, 0xfd05 -/* 8338E4 802420E4 34A50F82 */ ori $a1, $a1, 0xf82 -/* 8338E8 802420E8 0040802D */ daddu $s0, $v0, $zero -/* 8338EC 802420EC 0C0B2026 */ jal set_variable -/* 8338F0 802420F0 0200302D */ daddu $a2, $s0, $zero -/* 8338F4 802420F4 1A60002F */ blez $s3, .L802421B4 -/* 8338F8 802420F8 24150002 */ addiu $s5, $zero, 2 -/* 8338FC 802420FC 2412012C */ addiu $s2, $zero, 0x12c -/* 833900 80242100 3C0141A0 */ lui $at, 0x41a0 -/* 833904 80242104 4481C000 */ mtc1 $at, $f24 -/* 833908 80242108 3C01C334 */ lui $at, 0xc334 -/* 83390C 8024210C 4481B000 */ mtc1 $at, $f22 -/* 833910 80242110 3C014387 */ lui $at, 0x4387 -/* 833914 80242114 4481A000 */ mtc1 $at, $f20 -.L80242118: -/* 833918 80242118 0000202D */ daddu $a0, $zero, $zero -/* 83391C 8024211C 0C0B1EAF */ jal get_variable -/* 833920 80242120 02912821 */ addu $a1, $s4, $s1 -/* 833924 80242124 8E03000C */ lw $v1, 0xc($s0) -/* 833928 80242128 00112080 */ sll $a0, $s1, 2 -/* 83392C 8024212C 00711821 */ addu $v1, $v1, $s1 -/* 833930 80242130 A06200E4 */ sb $v0, 0xe4($v1) -/* 833934 80242134 8E02000C */ lw $v0, 0xc($s0) -/* 833938 80242138 44920000 */ mtc1 $s2, $f0 -/* 83393C 8024213C 00000000 */ nop -/* 833940 80242140 46800020 */ cvt.s.w $f0, $f0 -/* 833944 80242144 00441021 */ addu $v0, $v0, $a0 -/* 833948 80242148 E4400034 */ swc1 $f0, 0x34($v0) -/* 83394C 8024214C 8E02000C */ lw $v0, 0xc($s0) -/* 833950 80242150 00441021 */ addu $v0, $v0, $a0 -/* 833954 80242154 E4580060 */ swc1 $f24, 0x60($v0) -/* 833958 80242158 8E02000C */ lw $v0, 0xc($s0) -/* 83395C 8024215C 00441021 */ addu $v0, $v0, $a0 -/* 833960 80242160 E456008C */ swc1 $f22, 0x8c($v0) -/* 833964 80242164 8E02000C */ lw $v0, 0xc($s0) -/* 833968 80242168 00441021 */ addu $v0, $v0, $a0 -/* 83396C 8024216C E45400B8 */ swc1 $f20, 0xb8($v0) -/* 833970 80242170 8E03000C */ lw $v1, 0xc($s0) -/* 833974 80242174 00641821 */ addu $v1, $v1, $a0 -/* 833978 80242178 8C620008 */ lw $v0, 8($v1) -/* 83397C 8024217C 34420001 */ ori $v0, $v0, 1 -/* 833980 80242180 AC620008 */ sw $v0, 8($v1) -/* 833984 80242184 8E03000C */ lw $v1, 0xc($s0) -/* 833988 80242188 00641821 */ addu $v1, $v1, $a0 -/* 83398C 8024218C 8C620008 */ lw $v0, 8($v1) -/* 833990 80242190 34420002 */ ori $v0, $v0, 2 -/* 833994 80242194 AC620008 */ sw $v0, 8($v1) -/* 833998 80242198 8E02000C */ lw $v0, 0xc($s0) -/* 83399C 8024219C 00511021 */ addu $v0, $v0, $s1 -/* 8339A0 802421A0 26310001 */ addiu $s1, $s1, 1 -/* 8339A4 802421A4 A05500EF */ sb $s5, 0xef($v0) -/* 8339A8 802421A8 0233102A */ slt $v0, $s1, $s3 -/* 8339AC 802421AC 1440FFDA */ bnez $v0, .L80242118 -/* 8339B0 802421B0 2652001E */ addiu $s2, $s2, 0x1e -.L802421B4: -/* 8339B4 802421B4 8FBF0030 */ lw $ra, 0x30($sp) -/* 8339B8 802421B8 8FB5002C */ lw $s5, 0x2c($sp) -/* 8339BC 802421BC 8FB40028 */ lw $s4, 0x28($sp) -/* 8339C0 802421C0 8FB30024 */ lw $s3, 0x24($sp) -/* 8339C4 802421C4 8FB20020 */ lw $s2, 0x20($sp) -/* 8339C8 802421C8 8FB1001C */ lw $s1, 0x1c($sp) -/* 8339CC 802421CC 8FB00018 */ lw $s0, 0x18($sp) -/* 8339D0 802421D0 D7B80048 */ ldc1 $f24, 0x48($sp) -/* 8339D4 802421D4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 8339D8 802421D8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8339DC 802421DC 24020002 */ addiu $v0, $zero, 2 -/* 8339E0 802421E0 03E00008 */ jr $ra -/* 8339E4 802421E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s new file mode 100644 index 0000000000..13b529499e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_8024206C_83386C.s @@ -0,0 +1,101 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024206C_83386C +/* 83386C 8024206C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 833870 80242070 AFB00018 */ sw $s0, 0x18($sp) +/* 833874 80242074 0080802D */ daddu $s0, $a0, $zero +/* 833878 80242078 AFB40028 */ sw $s4, 0x28($sp) +/* 83387C 8024207C 3C14F5DE */ lui $s4, 0xf5de +/* 833880 80242080 3694019E */ ori $s4, $s4, 0x19e +/* 833884 80242084 0000202D */ daddu $a0, $zero, $zero +/* 833888 80242088 3C05F5DE */ lui $a1, 0xf5de +/* 83388C 8024208C AFBF0030 */ sw $ra, 0x30($sp) +/* 833890 80242090 AFB5002C */ sw $s5, 0x2c($sp) +/* 833894 80242094 AFB30024 */ sw $s3, 0x24($sp) +/* 833898 80242098 AFB20020 */ sw $s2, 0x20($sp) +/* 83389C 8024209C AFB1001C */ sw $s1, 0x1c($sp) +/* 8338A0 802420A0 F7B80048 */ sdc1 $f24, 0x48($sp) +/* 8338A4 802420A4 F7B60040 */ sdc1 $f22, 0x40($sp) +/* 8338A8 802420A8 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 8338AC 802420AC 0C0B1EAF */ jal get_variable +/* 8338B0 802420B0 34A5019D */ ori $a1, $a1, 0x19d +/* 8338B4 802420B4 0000202D */ daddu $a0, $zero, $zero +/* 8338B8 802420B8 44800000 */ mtc1 $zero, $f0 +/* 8338BC 802420BC 0080882D */ daddu $s1, $a0, $zero +/* 8338C0 802420C0 44050000 */ mfc1 $a1, $f0 +/* 8338C4 802420C4 0040982D */ daddu $s3, $v0, $zero +/* 8338C8 802420C8 AFA00014 */ sw $zero, 0x14($sp) +/* 8338CC 802420CC 00A0302D */ daddu $a2, $a1, $zero +/* 8338D0 802420D0 00A0382D */ daddu $a3, $a1, $zero +/* 8338D4 802420D4 0C01C9C4 */ jal func_80072710 +/* 8338D8 802420D8 AFA50010 */ sw $a1, 0x10($sp) +/* 8338DC 802420DC 0200202D */ daddu $a0, $s0, $zero +/* 8338E0 802420E0 3C05FD05 */ lui $a1, 0xfd05 +/* 8338E4 802420E4 34A50F82 */ ori $a1, $a1, 0xf82 +/* 8338E8 802420E8 0040802D */ daddu $s0, $v0, $zero +/* 8338EC 802420EC 0C0B2026 */ jal set_variable +/* 8338F0 802420F0 0200302D */ daddu $a2, $s0, $zero +/* 8338F4 802420F4 1A60002F */ blez $s3, .L802421B4 +/* 8338F8 802420F8 24150002 */ addiu $s5, $zero, 2 +/* 8338FC 802420FC 2412012C */ addiu $s2, $zero, 0x12c +/* 833900 80242100 3C0141A0 */ lui $at, 0x41a0 +/* 833904 80242104 4481C000 */ mtc1 $at, $f24 +/* 833908 80242108 3C01C334 */ lui $at, 0xc334 +/* 83390C 8024210C 4481B000 */ mtc1 $at, $f22 +/* 833910 80242110 3C014387 */ lui $at, 0x4387 +/* 833914 80242114 4481A000 */ mtc1 $at, $f20 +.L80242118: +/* 833918 80242118 0000202D */ daddu $a0, $zero, $zero +/* 83391C 8024211C 0C0B1EAF */ jal get_variable +/* 833920 80242120 02912821 */ addu $a1, $s4, $s1 +/* 833924 80242124 8E03000C */ lw $v1, 0xc($s0) +/* 833928 80242128 00112080 */ sll $a0, $s1, 2 +/* 83392C 8024212C 00711821 */ addu $v1, $v1, $s1 +/* 833930 80242130 A06200E4 */ sb $v0, 0xe4($v1) +/* 833934 80242134 8E02000C */ lw $v0, 0xc($s0) +/* 833938 80242138 44920000 */ mtc1 $s2, $f0 +/* 83393C 8024213C 00000000 */ nop +/* 833940 80242140 46800020 */ cvt.s.w $f0, $f0 +/* 833944 80242144 00441021 */ addu $v0, $v0, $a0 +/* 833948 80242148 E4400034 */ swc1 $f0, 0x34($v0) +/* 83394C 8024214C 8E02000C */ lw $v0, 0xc($s0) +/* 833950 80242150 00441021 */ addu $v0, $v0, $a0 +/* 833954 80242154 E4580060 */ swc1 $f24, 0x60($v0) +/* 833958 80242158 8E02000C */ lw $v0, 0xc($s0) +/* 83395C 8024215C 00441021 */ addu $v0, $v0, $a0 +/* 833960 80242160 E456008C */ swc1 $f22, 0x8c($v0) +/* 833964 80242164 8E02000C */ lw $v0, 0xc($s0) +/* 833968 80242168 00441021 */ addu $v0, $v0, $a0 +/* 83396C 8024216C E45400B8 */ swc1 $f20, 0xb8($v0) +/* 833970 80242170 8E03000C */ lw $v1, 0xc($s0) +/* 833974 80242174 00641821 */ addu $v1, $v1, $a0 +/* 833978 80242178 8C620008 */ lw $v0, 8($v1) +/* 83397C 8024217C 34420001 */ ori $v0, $v0, 1 +/* 833980 80242180 AC620008 */ sw $v0, 8($v1) +/* 833984 80242184 8E03000C */ lw $v1, 0xc($s0) +/* 833988 80242188 00641821 */ addu $v1, $v1, $a0 +/* 83398C 8024218C 8C620008 */ lw $v0, 8($v1) +/* 833990 80242190 34420002 */ ori $v0, $v0, 2 +/* 833994 80242194 AC620008 */ sw $v0, 8($v1) +/* 833998 80242198 8E02000C */ lw $v0, 0xc($s0) +/* 83399C 8024219C 00511021 */ addu $v0, $v0, $s1 +/* 8339A0 802421A0 26310001 */ addiu $s1, $s1, 1 +/* 8339A4 802421A4 A05500EF */ sb $s5, 0xef($v0) +/* 8339A8 802421A8 0233102A */ slt $v0, $s1, $s3 +/* 8339AC 802421AC 1440FFDA */ bnez $v0, .L80242118 +/* 8339B0 802421B0 2652001E */ addiu $s2, $s2, 0x1e +.L802421B4: +/* 8339B4 802421B4 8FBF0030 */ lw $ra, 0x30($sp) +/* 8339B8 802421B8 8FB5002C */ lw $s5, 0x2c($sp) +/* 8339BC 802421BC 8FB40028 */ lw $s4, 0x28($sp) +/* 8339C0 802421C0 8FB30024 */ lw $s3, 0x24($sp) +/* 8339C4 802421C4 8FB20020 */ lw $s2, 0x20($sp) +/* 8339C8 802421C8 8FB1001C */ lw $s1, 0x1c($sp) +/* 8339CC 802421CC 8FB00018 */ lw $s0, 0x18($sp) +/* 8339D0 802421D0 D7B80048 */ ldc1 $f24, 0x48($sp) +/* 8339D4 802421D4 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 8339D8 802421D8 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 8339DC 802421DC 24020002 */ addiu $v0, $zero, 2 +/* 8339E0 802421E0 03E00008 */ jr $ra +/* 8339E4 802421E4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8.s deleted file mode 100644 index 6f2f97ac21..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8.s +++ /dev/null @@ -1,108 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421E8 -/* 8339E8 802421E8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8339EC 802421EC AFB20018 */ sw $s2, 0x18($sp) -/* 8339F0 802421F0 0080902D */ daddu $s2, $a0, $zero -/* 8339F4 802421F4 3C05FD05 */ lui $a1, 0xfd05 -/* 8339F8 802421F8 AFBF0024 */ sw $ra, 0x24($sp) -/* 8339FC 802421FC AFB40020 */ sw $s4, 0x20($sp) -/* 833A00 80242200 AFB3001C */ sw $s3, 0x1c($sp) -/* 833A04 80242204 AFB10014 */ sw $s1, 0x14($sp) -/* 833A08 80242208 AFB00010 */ sw $s0, 0x10($sp) -/* 833A0C 8024220C F7B80038 */ sdc1 $f24, 0x38($sp) -/* 833A10 80242210 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 833A14 80242214 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 833A18 80242218 0C0B1EAF */ jal get_variable -/* 833A1C 8024221C 34A50F82 */ ori $a1, $a1, 0xf82 -/* 833A20 80242220 0240202D */ daddu $a0, $s2, $zero -/* 833A24 80242224 8E50000C */ lw $s0, 0xc($s2) -/* 833A28 80242228 0040882D */ daddu $s1, $v0, $zero -/* 833A2C 8024222C 8E050000 */ lw $a1, ($s0) -/* 833A30 80242230 0C0B1EAF */ jal get_variable -/* 833A34 80242234 26100004 */ addiu $s0, $s0, 4 -/* 833A38 80242238 8E050000 */ lw $a1, ($s0) -/* 833A3C 8024223C 26100004 */ addiu $s0, $s0, 4 -/* 833A40 80242240 0240202D */ daddu $a0, $s2, $zero -/* 833A44 80242244 0C0B1EAF */ jal get_variable -/* 833A48 80242248 0040982D */ daddu $s3, $v0, $zero -/* 833A4C 8024224C 8E050000 */ lw $a1, ($s0) -/* 833A50 80242250 26100004 */ addiu $s0, $s0, 4 -/* 833A54 80242254 0240202D */ daddu $a0, $s2, $zero -/* 833A58 80242258 0C0B1EAF */ jal get_variable -/* 833A5C 8024225C 0040A02D */ daddu $s4, $v0, $zero -/* 833A60 80242260 8E050000 */ lw $a1, ($s0) -/* 833A64 80242264 26100004 */ addiu $s0, $s0, 4 -/* 833A68 80242268 4482C000 */ mtc1 $v0, $f24 -/* 833A6C 8024226C 00000000 */ nop -/* 833A70 80242270 4680C620 */ cvt.s.w $f24, $f24 -/* 833A74 80242274 0C0B1EAF */ jal get_variable -/* 833A78 80242278 0240202D */ daddu $a0, $s2, $zero -/* 833A7C 8024227C 8E050000 */ lw $a1, ($s0) -/* 833A80 80242280 26100004 */ addiu $s0, $s0, 4 -/* 833A84 80242284 4482B000 */ mtc1 $v0, $f22 -/* 833A88 80242288 00000000 */ nop -/* 833A8C 8024228C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 833A90 80242290 0C0B1EAF */ jal get_variable -/* 833A94 80242294 0240202D */ daddu $a0, $s2, $zero -/* 833A98 80242298 8E050000 */ lw $a1, ($s0) -/* 833A9C 8024229C 4482A000 */ mtc1 $v0, $f20 -/* 833AA0 802422A0 00000000 */ nop -/* 833AA4 802422A4 4680A520 */ cvt.s.w $f20, $f20 -/* 833AA8 802422A8 0C0B1EAF */ jal get_variable -/* 833AAC 802422AC 0240202D */ daddu $a0, $s2, $zero -/* 833AB0 802422B0 8E23000C */ lw $v1, 0xc($s1) -/* 833AB4 802422B4 00731821 */ addu $v1, $v1, $s3 -/* 833AB8 802422B8 A07400E4 */ sb $s4, 0xe4($v1) -/* 833ABC 802422BC 8E23000C */ lw $v1, 0xc($s1) -/* 833AC0 802422C0 00132080 */ sll $a0, $s3, 2 -/* 833AC4 802422C4 00641821 */ addu $v1, $v1, $a0 -/* 833AC8 802422C8 E4780034 */ swc1 $f24, 0x34($v1) -/* 833ACC 802422CC 8E23000C */ lw $v1, 0xc($s1) -/* 833AD0 802422D0 00641821 */ addu $v1, $v1, $a0 -/* 833AD4 802422D4 E4760060 */ swc1 $f22, 0x60($v1) -/* 833AD8 802422D8 8E23000C */ lw $v1, 0xc($s1) -/* 833ADC 802422DC 00641821 */ addu $v1, $v1, $a0 -/* 833AE0 802422E0 E474008C */ swc1 $f20, 0x8c($v1) -/* 833AE4 802422E4 8E23000C */ lw $v1, 0xc($s1) -/* 833AE8 802422E8 44820000 */ mtc1 $v0, $f0 -/* 833AEC 802422EC 00000000 */ nop -/* 833AF0 802422F0 46800020 */ cvt.s.w $f0, $f0 -/* 833AF4 802422F4 00641821 */ addu $v1, $v1, $a0 -/* 833AF8 802422F8 E46000B8 */ swc1 $f0, 0xb8($v1) -/* 833AFC 802422FC 8E23000C */ lw $v1, 0xc($s1) -/* 833B00 80242300 00641821 */ addu $v1, $v1, $a0 -/* 833B04 80242304 8C620008 */ lw $v0, 8($v1) -/* 833B08 80242308 34420001 */ ori $v0, $v0, 1 -/* 833B0C 8024230C AC620008 */ sw $v0, 8($v1) -/* 833B10 80242310 2402000A */ addiu $v0, $zero, 0xa -/* 833B14 80242314 1262000F */ beq $s3, $v0, .L80242354 -/* 833B18 80242318 3C05F5DE */ lui $a1, 0xf5de -/* 833B1C 8024231C 34A5019E */ ori $a1, $a1, 0x19e -/* 833B20 80242320 02652821 */ addu $a1, $s3, $a1 -/* 833B24 80242324 8E23000C */ lw $v1, 0xc($s1) -/* 833B28 80242328 0280302D */ daddu $a2, $s4, $zero -/* 833B2C 8024232C 00641821 */ addu $v1, $v1, $a0 -/* 833B30 80242330 8C620008 */ lw $v0, 8($v1) -/* 833B34 80242334 0240202D */ daddu $a0, $s2, $zero -/* 833B38 80242338 34420002 */ ori $v0, $v0, 2 -/* 833B3C 8024233C AC620008 */ sw $v0, 8($v1) -/* 833B40 80242340 8E22000C */ lw $v0, 0xc($s1) -/* 833B44 80242344 24030002 */ addiu $v1, $zero, 2 -/* 833B48 80242348 00531021 */ addu $v0, $v0, $s3 -/* 833B4C 8024234C 0C0B2026 */ jal set_variable -/* 833B50 80242350 A04300EF */ sb $v1, 0xef($v0) -.L80242354: -/* 833B54 80242354 8FBF0024 */ lw $ra, 0x24($sp) -/* 833B58 80242358 8FB40020 */ lw $s4, 0x20($sp) -/* 833B5C 8024235C 8FB3001C */ lw $s3, 0x1c($sp) -/* 833B60 80242360 8FB20018 */ lw $s2, 0x18($sp) -/* 833B64 80242364 8FB10014 */ lw $s1, 0x14($sp) -/* 833B68 80242368 8FB00010 */ lw $s0, 0x10($sp) -/* 833B6C 8024236C D7B80038 */ ldc1 $f24, 0x38($sp) -/* 833B70 80242370 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 833B74 80242374 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 833B78 80242378 24020002 */ addiu $v0, $zero, 2 -/* 833B7C 8024237C 03E00008 */ jr $ra -/* 833B80 80242380 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s new file mode 100644 index 0000000000..ac749f43a3 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802421E8_8339E8.s @@ -0,0 +1,108 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421E8_8339E8 +/* 8339E8 802421E8 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 8339EC 802421EC AFB20018 */ sw $s2, 0x18($sp) +/* 8339F0 802421F0 0080902D */ daddu $s2, $a0, $zero +/* 8339F4 802421F4 3C05FD05 */ lui $a1, 0xfd05 +/* 8339F8 802421F8 AFBF0024 */ sw $ra, 0x24($sp) +/* 8339FC 802421FC AFB40020 */ sw $s4, 0x20($sp) +/* 833A00 80242200 AFB3001C */ sw $s3, 0x1c($sp) +/* 833A04 80242204 AFB10014 */ sw $s1, 0x14($sp) +/* 833A08 80242208 AFB00010 */ sw $s0, 0x10($sp) +/* 833A0C 8024220C F7B80038 */ sdc1 $f24, 0x38($sp) +/* 833A10 80242210 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 833A14 80242214 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 833A18 80242218 0C0B1EAF */ jal get_variable +/* 833A1C 8024221C 34A50F82 */ ori $a1, $a1, 0xf82 +/* 833A20 80242220 0240202D */ daddu $a0, $s2, $zero +/* 833A24 80242224 8E50000C */ lw $s0, 0xc($s2) +/* 833A28 80242228 0040882D */ daddu $s1, $v0, $zero +/* 833A2C 8024222C 8E050000 */ lw $a1, ($s0) +/* 833A30 80242230 0C0B1EAF */ jal get_variable +/* 833A34 80242234 26100004 */ addiu $s0, $s0, 4 +/* 833A38 80242238 8E050000 */ lw $a1, ($s0) +/* 833A3C 8024223C 26100004 */ addiu $s0, $s0, 4 +/* 833A40 80242240 0240202D */ daddu $a0, $s2, $zero +/* 833A44 80242244 0C0B1EAF */ jal get_variable +/* 833A48 80242248 0040982D */ daddu $s3, $v0, $zero +/* 833A4C 8024224C 8E050000 */ lw $a1, ($s0) +/* 833A50 80242250 26100004 */ addiu $s0, $s0, 4 +/* 833A54 80242254 0240202D */ daddu $a0, $s2, $zero +/* 833A58 80242258 0C0B1EAF */ jal get_variable +/* 833A5C 8024225C 0040A02D */ daddu $s4, $v0, $zero +/* 833A60 80242260 8E050000 */ lw $a1, ($s0) +/* 833A64 80242264 26100004 */ addiu $s0, $s0, 4 +/* 833A68 80242268 4482C000 */ mtc1 $v0, $f24 +/* 833A6C 8024226C 00000000 */ nop +/* 833A70 80242270 4680C620 */ cvt.s.w $f24, $f24 +/* 833A74 80242274 0C0B1EAF */ jal get_variable +/* 833A78 80242278 0240202D */ daddu $a0, $s2, $zero +/* 833A7C 8024227C 8E050000 */ lw $a1, ($s0) +/* 833A80 80242280 26100004 */ addiu $s0, $s0, 4 +/* 833A84 80242284 4482B000 */ mtc1 $v0, $f22 +/* 833A88 80242288 00000000 */ nop +/* 833A8C 8024228C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 833A90 80242290 0C0B1EAF */ jal get_variable +/* 833A94 80242294 0240202D */ daddu $a0, $s2, $zero +/* 833A98 80242298 8E050000 */ lw $a1, ($s0) +/* 833A9C 8024229C 4482A000 */ mtc1 $v0, $f20 +/* 833AA0 802422A0 00000000 */ nop +/* 833AA4 802422A4 4680A520 */ cvt.s.w $f20, $f20 +/* 833AA8 802422A8 0C0B1EAF */ jal get_variable +/* 833AAC 802422AC 0240202D */ daddu $a0, $s2, $zero +/* 833AB0 802422B0 8E23000C */ lw $v1, 0xc($s1) +/* 833AB4 802422B4 00731821 */ addu $v1, $v1, $s3 +/* 833AB8 802422B8 A07400E4 */ sb $s4, 0xe4($v1) +/* 833ABC 802422BC 8E23000C */ lw $v1, 0xc($s1) +/* 833AC0 802422C0 00132080 */ sll $a0, $s3, 2 +/* 833AC4 802422C4 00641821 */ addu $v1, $v1, $a0 +/* 833AC8 802422C8 E4780034 */ swc1 $f24, 0x34($v1) +/* 833ACC 802422CC 8E23000C */ lw $v1, 0xc($s1) +/* 833AD0 802422D0 00641821 */ addu $v1, $v1, $a0 +/* 833AD4 802422D4 E4760060 */ swc1 $f22, 0x60($v1) +/* 833AD8 802422D8 8E23000C */ lw $v1, 0xc($s1) +/* 833ADC 802422DC 00641821 */ addu $v1, $v1, $a0 +/* 833AE0 802422E0 E474008C */ swc1 $f20, 0x8c($v1) +/* 833AE4 802422E4 8E23000C */ lw $v1, 0xc($s1) +/* 833AE8 802422E8 44820000 */ mtc1 $v0, $f0 +/* 833AEC 802422EC 00000000 */ nop +/* 833AF0 802422F0 46800020 */ cvt.s.w $f0, $f0 +/* 833AF4 802422F4 00641821 */ addu $v1, $v1, $a0 +/* 833AF8 802422F8 E46000B8 */ swc1 $f0, 0xb8($v1) +/* 833AFC 802422FC 8E23000C */ lw $v1, 0xc($s1) +/* 833B00 80242300 00641821 */ addu $v1, $v1, $a0 +/* 833B04 80242304 8C620008 */ lw $v0, 8($v1) +/* 833B08 80242308 34420001 */ ori $v0, $v0, 1 +/* 833B0C 8024230C AC620008 */ sw $v0, 8($v1) +/* 833B10 80242310 2402000A */ addiu $v0, $zero, 0xa +/* 833B14 80242314 1262000F */ beq $s3, $v0, .L80242354 +/* 833B18 80242318 3C05F5DE */ lui $a1, 0xf5de +/* 833B1C 8024231C 34A5019E */ ori $a1, $a1, 0x19e +/* 833B20 80242320 02652821 */ addu $a1, $s3, $a1 +/* 833B24 80242324 8E23000C */ lw $v1, 0xc($s1) +/* 833B28 80242328 0280302D */ daddu $a2, $s4, $zero +/* 833B2C 8024232C 00641821 */ addu $v1, $v1, $a0 +/* 833B30 80242330 8C620008 */ lw $v0, 8($v1) +/* 833B34 80242334 0240202D */ daddu $a0, $s2, $zero +/* 833B38 80242338 34420002 */ ori $v0, $v0, 2 +/* 833B3C 8024233C AC620008 */ sw $v0, 8($v1) +/* 833B40 80242340 8E22000C */ lw $v0, 0xc($s1) +/* 833B44 80242344 24030002 */ addiu $v1, $zero, 2 +/* 833B48 80242348 00531021 */ addu $v0, $v0, $s3 +/* 833B4C 8024234C 0C0B2026 */ jal set_variable +/* 833B50 80242350 A04300EF */ sb $v1, 0xef($v0) +.L80242354: +/* 833B54 80242354 8FBF0024 */ lw $ra, 0x24($sp) +/* 833B58 80242358 8FB40020 */ lw $s4, 0x20($sp) +/* 833B5C 8024235C 8FB3001C */ lw $s3, 0x1c($sp) +/* 833B60 80242360 8FB20018 */ lw $s2, 0x18($sp) +/* 833B64 80242364 8FB10014 */ lw $s1, 0x14($sp) +/* 833B68 80242368 8FB00010 */ lw $s0, 0x10($sp) +/* 833B6C 8024236C D7B80038 */ ldc1 $f24, 0x38($sp) +/* 833B70 80242370 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 833B74 80242374 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 833B78 80242378 24020002 */ addiu $v0, $zero, 2 +/* 833B7C 8024237C 03E00008 */ jr $ra +/* 833B80 80242380 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384.s deleted file mode 100644 index 70ae0eab7b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384.s +++ /dev/null @@ -1,75 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242384 -/* 833B84 80242384 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 833B88 80242388 AFB10014 */ sw $s1, 0x14($sp) -/* 833B8C 8024238C 0080882D */ daddu $s1, $a0, $zero -/* 833B90 80242390 3C05FD05 */ lui $a1, 0xfd05 -/* 833B94 80242394 AFBF0020 */ sw $ra, 0x20($sp) -/* 833B98 80242398 AFB3001C */ sw $s3, 0x1c($sp) -/* 833B9C 8024239C AFB20018 */ sw $s2, 0x18($sp) -/* 833BA0 802423A0 AFB00010 */ sw $s0, 0x10($sp) -/* 833BA4 802423A4 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 833BA8 802423A8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 833BAC 802423AC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 833BB0 802423B0 0C0B1EAF */ jal get_variable -/* 833BB4 802423B4 34A50F82 */ ori $a1, $a1, 0xf82 -/* 833BB8 802423B8 0220202D */ daddu $a0, $s1, $zero -/* 833BBC 802423BC 8E30000C */ lw $s0, 0xc($s1) -/* 833BC0 802423C0 0040982D */ daddu $s3, $v0, $zero -/* 833BC4 802423C4 8E050000 */ lw $a1, ($s0) -/* 833BC8 802423C8 0C0B1EAF */ jal get_variable -/* 833BCC 802423CC 26100004 */ addiu $s0, $s0, 4 -/* 833BD0 802423D0 8E050000 */ lw $a1, ($s0) -/* 833BD4 802423D4 26100004 */ addiu $s0, $s0, 4 -/* 833BD8 802423D8 0220202D */ daddu $a0, $s1, $zero -/* 833BDC 802423DC 0C0B1EAF */ jal get_variable -/* 833BE0 802423E0 0040902D */ daddu $s2, $v0, $zero -/* 833BE4 802423E4 8E050000 */ lw $a1, ($s0) -/* 833BE8 802423E8 26100004 */ addiu $s0, $s0, 4 -/* 833BEC 802423EC 4482C000 */ mtc1 $v0, $f24 -/* 833BF0 802423F0 00000000 */ nop -/* 833BF4 802423F4 4680C620 */ cvt.s.w $f24, $f24 -/* 833BF8 802423F8 0C0B1EAF */ jal get_variable -/* 833BFC 802423FC 0220202D */ daddu $a0, $s1, $zero -/* 833C00 80242400 8E050000 */ lw $a1, ($s0) -/* 833C04 80242404 26100004 */ addiu $s0, $s0, 4 -/* 833C08 80242408 4482B000 */ mtc1 $v0, $f22 -/* 833C0C 8024240C 00000000 */ nop -/* 833C10 80242410 4680B5A0 */ cvt.s.w $f22, $f22 -/* 833C14 80242414 0C0B1EAF */ jal get_variable -/* 833C18 80242418 0220202D */ daddu $a0, $s1, $zero -/* 833C1C 8024241C 8E050000 */ lw $a1, ($s0) -/* 833C20 80242420 4482A000 */ mtc1 $v0, $f20 -/* 833C24 80242424 00000000 */ nop -/* 833C28 80242428 4680A520 */ cvt.s.w $f20, $f20 -/* 833C2C 8024242C 0C0B1EAF */ jal get_variable -/* 833C30 80242430 0220202D */ daddu $a0, $s1, $zero -/* 833C34 80242434 8E63000C */ lw $v1, 0xc($s3) -/* 833C38 80242438 00129080 */ sll $s2, $s2, 2 -/* 833C3C 8024243C 00721821 */ addu $v1, $v1, $s2 -/* 833C40 80242440 E4780034 */ swc1 $f24, 0x34($v1) -/* 833C44 80242444 8E63000C */ lw $v1, 0xc($s3) -/* 833C48 80242448 00721821 */ addu $v1, $v1, $s2 -/* 833C4C 8024244C E4760060 */ swc1 $f22, 0x60($v1) -/* 833C50 80242450 8E63000C */ lw $v1, 0xc($s3) -/* 833C54 80242454 00721821 */ addu $v1, $v1, $s2 -/* 833C58 80242458 E474008C */ swc1 $f20, 0x8c($v1) -/* 833C5C 8024245C 8E63000C */ lw $v1, 0xc($s3) -/* 833C60 80242460 44820000 */ mtc1 $v0, $f0 -/* 833C64 80242464 00000000 */ nop -/* 833C68 80242468 46800020 */ cvt.s.w $f0, $f0 -/* 833C6C 8024246C 00721821 */ addu $v1, $v1, $s2 -/* 833C70 80242470 E46000B8 */ swc1 $f0, 0xb8($v1) -/* 833C74 80242474 8FBF0020 */ lw $ra, 0x20($sp) -/* 833C78 80242478 8FB3001C */ lw $s3, 0x1c($sp) -/* 833C7C 8024247C 8FB20018 */ lw $s2, 0x18($sp) -/* 833C80 80242480 8FB10014 */ lw $s1, 0x14($sp) -/* 833C84 80242484 8FB00010 */ lw $s0, 0x10($sp) -/* 833C88 80242488 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 833C8C 8024248C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 833C90 80242490 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 833C94 80242494 24020002 */ addiu $v0, $zero, 2 -/* 833C98 80242498 03E00008 */ jr $ra -/* 833C9C 8024249C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384_833B84.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384_833B84.s new file mode 100644 index 0000000000..e081420189 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242384_833B84.s @@ -0,0 +1,75 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242384_833B84 +/* 833B84 80242384 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 833B88 80242388 AFB10014 */ sw $s1, 0x14($sp) +/* 833B8C 8024238C 0080882D */ daddu $s1, $a0, $zero +/* 833B90 80242390 3C05FD05 */ lui $a1, 0xfd05 +/* 833B94 80242394 AFBF0020 */ sw $ra, 0x20($sp) +/* 833B98 80242398 AFB3001C */ sw $s3, 0x1c($sp) +/* 833B9C 8024239C AFB20018 */ sw $s2, 0x18($sp) +/* 833BA0 802423A0 AFB00010 */ sw $s0, 0x10($sp) +/* 833BA4 802423A4 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 833BA8 802423A8 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 833BAC 802423AC F7B40028 */ sdc1 $f20, 0x28($sp) +/* 833BB0 802423B0 0C0B1EAF */ jal get_variable +/* 833BB4 802423B4 34A50F82 */ ori $a1, $a1, 0xf82 +/* 833BB8 802423B8 0220202D */ daddu $a0, $s1, $zero +/* 833BBC 802423BC 8E30000C */ lw $s0, 0xc($s1) +/* 833BC0 802423C0 0040982D */ daddu $s3, $v0, $zero +/* 833BC4 802423C4 8E050000 */ lw $a1, ($s0) +/* 833BC8 802423C8 0C0B1EAF */ jal get_variable +/* 833BCC 802423CC 26100004 */ addiu $s0, $s0, 4 +/* 833BD0 802423D0 8E050000 */ lw $a1, ($s0) +/* 833BD4 802423D4 26100004 */ addiu $s0, $s0, 4 +/* 833BD8 802423D8 0220202D */ daddu $a0, $s1, $zero +/* 833BDC 802423DC 0C0B1EAF */ jal get_variable +/* 833BE0 802423E0 0040902D */ daddu $s2, $v0, $zero +/* 833BE4 802423E4 8E050000 */ lw $a1, ($s0) +/* 833BE8 802423E8 26100004 */ addiu $s0, $s0, 4 +/* 833BEC 802423EC 4482C000 */ mtc1 $v0, $f24 +/* 833BF0 802423F0 00000000 */ nop +/* 833BF4 802423F4 4680C620 */ cvt.s.w $f24, $f24 +/* 833BF8 802423F8 0C0B1EAF */ jal get_variable +/* 833BFC 802423FC 0220202D */ daddu $a0, $s1, $zero +/* 833C00 80242400 8E050000 */ lw $a1, ($s0) +/* 833C04 80242404 26100004 */ addiu $s0, $s0, 4 +/* 833C08 80242408 4482B000 */ mtc1 $v0, $f22 +/* 833C0C 8024240C 00000000 */ nop +/* 833C10 80242410 4680B5A0 */ cvt.s.w $f22, $f22 +/* 833C14 80242414 0C0B1EAF */ jal get_variable +/* 833C18 80242418 0220202D */ daddu $a0, $s1, $zero +/* 833C1C 8024241C 8E050000 */ lw $a1, ($s0) +/* 833C20 80242420 4482A000 */ mtc1 $v0, $f20 +/* 833C24 80242424 00000000 */ nop +/* 833C28 80242428 4680A520 */ cvt.s.w $f20, $f20 +/* 833C2C 8024242C 0C0B1EAF */ jal get_variable +/* 833C30 80242430 0220202D */ daddu $a0, $s1, $zero +/* 833C34 80242434 8E63000C */ lw $v1, 0xc($s3) +/* 833C38 80242438 00129080 */ sll $s2, $s2, 2 +/* 833C3C 8024243C 00721821 */ addu $v1, $v1, $s2 +/* 833C40 80242440 E4780034 */ swc1 $f24, 0x34($v1) +/* 833C44 80242444 8E63000C */ lw $v1, 0xc($s3) +/* 833C48 80242448 00721821 */ addu $v1, $v1, $s2 +/* 833C4C 8024244C E4760060 */ swc1 $f22, 0x60($v1) +/* 833C50 80242450 8E63000C */ lw $v1, 0xc($s3) +/* 833C54 80242454 00721821 */ addu $v1, $v1, $s2 +/* 833C58 80242458 E474008C */ swc1 $f20, 0x8c($v1) +/* 833C5C 8024245C 8E63000C */ lw $v1, 0xc($s3) +/* 833C60 80242460 44820000 */ mtc1 $v0, $f0 +/* 833C64 80242464 00000000 */ nop +/* 833C68 80242468 46800020 */ cvt.s.w $f0, $f0 +/* 833C6C 8024246C 00721821 */ addu $v1, $v1, $s2 +/* 833C70 80242470 E46000B8 */ swc1 $f0, 0xb8($v1) +/* 833C74 80242474 8FBF0020 */ lw $ra, 0x20($sp) +/* 833C78 80242478 8FB3001C */ lw $s3, 0x1c($sp) +/* 833C7C 8024247C 8FB20018 */ lw $s2, 0x18($sp) +/* 833C80 80242480 8FB10014 */ lw $s1, 0x14($sp) +/* 833C84 80242484 8FB00010 */ lw $s0, 0x10($sp) +/* 833C88 80242488 D7B80038 */ ldc1 $f24, 0x38($sp) +/* 833C8C 8024248C D7B60030 */ ldc1 $f22, 0x30($sp) +/* 833C90 80242490 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 833C94 80242494 24020002 */ addiu $v0, $zero, 2 +/* 833C98 80242498 03E00008 */ jr $ra +/* 833C9C 8024249C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0.s deleted file mode 100644 index 7205c6ac5e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424A0 -/* 833CA0 802424A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 833CA4 802424A4 AFB10014 */ sw $s1, 0x14($sp) -/* 833CA8 802424A8 0080882D */ daddu $s1, $a0, $zero -/* 833CAC 802424AC 3C05FD05 */ lui $a1, 0xfd05 -/* 833CB0 802424B0 34A50F82 */ ori $a1, $a1, 0xf82 -/* 833CB4 802424B4 AFBF0028 */ sw $ra, 0x28($sp) -/* 833CB8 802424B8 AFB50024 */ sw $s5, 0x24($sp) -/* 833CBC 802424BC AFB40020 */ sw $s4, 0x20($sp) -/* 833CC0 802424C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 833CC4 802424C4 AFB20018 */ sw $s2, 0x18($sp) -/* 833CC8 802424C8 0C0B1EAF */ jal get_variable -/* 833CCC 802424CC AFB00010 */ sw $s0, 0x10($sp) -/* 833CD0 802424D0 0220202D */ daddu $a0, $s1, $zero -/* 833CD4 802424D4 8E30000C */ lw $s0, 0xc($s1) -/* 833CD8 802424D8 0040982D */ daddu $s3, $v0, $zero -/* 833CDC 802424DC 8E050000 */ lw $a1, ($s0) -/* 833CE0 802424E0 0C0B1EAF */ jal get_variable -/* 833CE4 802424E4 26100004 */ addiu $s0, $s0, 4 -/* 833CE8 802424E8 8E050000 */ lw $a1, ($s0) -/* 833CEC 802424EC 26100004 */ addiu $s0, $s0, 4 -/* 833CF0 802424F0 8E150000 */ lw $s5, ($s0) -/* 833CF4 802424F4 26100004 */ addiu $s0, $s0, 4 -/* 833CF8 802424F8 00029080 */ sll $s2, $v0, 2 -/* 833CFC 802424FC 8E63000C */ lw $v1, 0xc($s3) -/* 833D00 80242500 8E140000 */ lw $s4, ($s0) -/* 833D04 80242504 00721821 */ addu $v1, $v1, $s2 -/* 833D08 80242508 C4600034 */ lwc1 $f0, 0x34($v1) -/* 833D0C 8024250C 8E100004 */ lw $s0, 4($s0) -/* 833D10 80242510 4600008D */ trunc.w.s $f2, $f0 -/* 833D14 80242514 44061000 */ mfc1 $a2, $f2 -/* 833D18 80242518 0C0B2026 */ jal set_variable -/* 833D1C 8024251C 0220202D */ daddu $a0, $s1, $zero -/* 833D20 80242520 8E62000C */ lw $v0, 0xc($s3) -/* 833D24 80242524 0220202D */ daddu $a0, $s1, $zero -/* 833D28 80242528 00521021 */ addu $v0, $v0, $s2 -/* 833D2C 8024252C C4400060 */ lwc1 $f0, 0x60($v0) -/* 833D30 80242530 4600008D */ trunc.w.s $f2, $f0 -/* 833D34 80242534 44061000 */ mfc1 $a2, $f2 -/* 833D38 80242538 0C0B2026 */ jal set_variable -/* 833D3C 8024253C 02A0282D */ daddu $a1, $s5, $zero -/* 833D40 80242540 8E62000C */ lw $v0, 0xc($s3) -/* 833D44 80242544 0220202D */ daddu $a0, $s1, $zero -/* 833D48 80242548 00521021 */ addu $v0, $v0, $s2 -/* 833D4C 8024254C C440008C */ lwc1 $f0, 0x8c($v0) -/* 833D50 80242550 4600008D */ trunc.w.s $f2, $f0 -/* 833D54 80242554 44061000 */ mfc1 $a2, $f2 -/* 833D58 80242558 0C0B2026 */ jal set_variable -/* 833D5C 8024255C 0280282D */ daddu $a1, $s4, $zero -/* 833D60 80242560 8E62000C */ lw $v0, 0xc($s3) -/* 833D64 80242564 0220202D */ daddu $a0, $s1, $zero -/* 833D68 80242568 00521021 */ addu $v0, $v0, $s2 -/* 833D6C 8024256C C44000B8 */ lwc1 $f0, 0xb8($v0) -/* 833D70 80242570 4600008D */ trunc.w.s $f2, $f0 -/* 833D74 80242574 44061000 */ mfc1 $a2, $f2 -/* 833D78 80242578 0C0B2026 */ jal set_variable -/* 833D7C 8024257C 0200282D */ daddu $a1, $s0, $zero -/* 833D80 80242580 8FBF0028 */ lw $ra, 0x28($sp) -/* 833D84 80242584 8FB50024 */ lw $s5, 0x24($sp) -/* 833D88 80242588 8FB40020 */ lw $s4, 0x20($sp) -/* 833D8C 8024258C 8FB3001C */ lw $s3, 0x1c($sp) -/* 833D90 80242590 8FB20018 */ lw $s2, 0x18($sp) -/* 833D94 80242594 8FB10014 */ lw $s1, 0x14($sp) -/* 833D98 80242598 8FB00010 */ lw $s0, 0x10($sp) -/* 833D9C 8024259C 24020002 */ addiu $v0, $zero, 2 -/* 833DA0 802425A0 03E00008 */ jr $ra -/* 833DA4 802425A4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0_833CA0.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0_833CA0.s new file mode 100644 index 0000000000..a41d6254f2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802424A0_833CA0.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424A0_833CA0 +/* 833CA0 802424A0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 833CA4 802424A4 AFB10014 */ sw $s1, 0x14($sp) +/* 833CA8 802424A8 0080882D */ daddu $s1, $a0, $zero +/* 833CAC 802424AC 3C05FD05 */ lui $a1, 0xfd05 +/* 833CB0 802424B0 34A50F82 */ ori $a1, $a1, 0xf82 +/* 833CB4 802424B4 AFBF0028 */ sw $ra, 0x28($sp) +/* 833CB8 802424B8 AFB50024 */ sw $s5, 0x24($sp) +/* 833CBC 802424BC AFB40020 */ sw $s4, 0x20($sp) +/* 833CC0 802424C0 AFB3001C */ sw $s3, 0x1c($sp) +/* 833CC4 802424C4 AFB20018 */ sw $s2, 0x18($sp) +/* 833CC8 802424C8 0C0B1EAF */ jal get_variable +/* 833CCC 802424CC AFB00010 */ sw $s0, 0x10($sp) +/* 833CD0 802424D0 0220202D */ daddu $a0, $s1, $zero +/* 833CD4 802424D4 8E30000C */ lw $s0, 0xc($s1) +/* 833CD8 802424D8 0040982D */ daddu $s3, $v0, $zero +/* 833CDC 802424DC 8E050000 */ lw $a1, ($s0) +/* 833CE0 802424E0 0C0B1EAF */ jal get_variable +/* 833CE4 802424E4 26100004 */ addiu $s0, $s0, 4 +/* 833CE8 802424E8 8E050000 */ lw $a1, ($s0) +/* 833CEC 802424EC 26100004 */ addiu $s0, $s0, 4 +/* 833CF0 802424F0 8E150000 */ lw $s5, ($s0) +/* 833CF4 802424F4 26100004 */ addiu $s0, $s0, 4 +/* 833CF8 802424F8 00029080 */ sll $s2, $v0, 2 +/* 833CFC 802424FC 8E63000C */ lw $v1, 0xc($s3) +/* 833D00 80242500 8E140000 */ lw $s4, ($s0) +/* 833D04 80242504 00721821 */ addu $v1, $v1, $s2 +/* 833D08 80242508 C4600034 */ lwc1 $f0, 0x34($v1) +/* 833D0C 8024250C 8E100004 */ lw $s0, 4($s0) +/* 833D10 80242510 4600008D */ trunc.w.s $f2, $f0 +/* 833D14 80242514 44061000 */ mfc1 $a2, $f2 +/* 833D18 80242518 0C0B2026 */ jal set_variable +/* 833D1C 8024251C 0220202D */ daddu $a0, $s1, $zero +/* 833D20 80242520 8E62000C */ lw $v0, 0xc($s3) +/* 833D24 80242524 0220202D */ daddu $a0, $s1, $zero +/* 833D28 80242528 00521021 */ addu $v0, $v0, $s2 +/* 833D2C 8024252C C4400060 */ lwc1 $f0, 0x60($v0) +/* 833D30 80242530 4600008D */ trunc.w.s $f2, $f0 +/* 833D34 80242534 44061000 */ mfc1 $a2, $f2 +/* 833D38 80242538 0C0B2026 */ jal set_variable +/* 833D3C 8024253C 02A0282D */ daddu $a1, $s5, $zero +/* 833D40 80242540 8E62000C */ lw $v0, 0xc($s3) +/* 833D44 80242544 0220202D */ daddu $a0, $s1, $zero +/* 833D48 80242548 00521021 */ addu $v0, $v0, $s2 +/* 833D4C 8024254C C440008C */ lwc1 $f0, 0x8c($v0) +/* 833D50 80242550 4600008D */ trunc.w.s $f2, $f0 +/* 833D54 80242554 44061000 */ mfc1 $a2, $f2 +/* 833D58 80242558 0C0B2026 */ jal set_variable +/* 833D5C 8024255C 0280282D */ daddu $a1, $s4, $zero +/* 833D60 80242560 8E62000C */ lw $v0, 0xc($s3) +/* 833D64 80242564 0220202D */ daddu $a0, $s1, $zero +/* 833D68 80242568 00521021 */ addu $v0, $v0, $s2 +/* 833D6C 8024256C C44000B8 */ lwc1 $f0, 0xb8($v0) +/* 833D70 80242570 4600008D */ trunc.w.s $f2, $f0 +/* 833D74 80242574 44061000 */ mfc1 $a2, $f2 +/* 833D78 80242578 0C0B2026 */ jal set_variable +/* 833D7C 8024257C 0200282D */ daddu $a1, $s0, $zero +/* 833D80 80242580 8FBF0028 */ lw $ra, 0x28($sp) +/* 833D84 80242584 8FB50024 */ lw $s5, 0x24($sp) +/* 833D88 80242588 8FB40020 */ lw $s4, 0x20($sp) +/* 833D8C 8024258C 8FB3001C */ lw $s3, 0x1c($sp) +/* 833D90 80242590 8FB20018 */ lw $s2, 0x18($sp) +/* 833D94 80242594 8FB10014 */ lw $s1, 0x14($sp) +/* 833D98 80242598 8FB00010 */ lw $s0, 0x10($sp) +/* 833D9C 8024259C 24020002 */ addiu $v0, $zero, 2 +/* 833DA0 802425A0 03E00008 */ jr $ra +/* 833DA4 802425A4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802425A8.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802425A8.s deleted file mode 100644 index 5398803f31..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802425A8.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425A8 -/* 833DA8 802425A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 833DAC 802425AC AFB00010 */ sw $s0, 0x10($sp) -/* 833DB0 802425B0 0080802D */ daddu $s0, $a0, $zero -/* 833DB4 802425B4 3C05FD05 */ lui $a1, 0xfd05 -/* 833DB8 802425B8 AFBF0014 */ sw $ra, 0x14($sp) -/* 833DBC 802425BC 0C0B1EAF */ jal get_variable -/* 833DC0 802425C0 34A50F82 */ ori $a1, $a1, 0xf82 -/* 833DC4 802425C4 8E03000C */ lw $v1, 0xc($s0) -/* 833DC8 802425C8 0200202D */ daddu $a0, $s0, $zero -/* 833DCC 802425CC 8C650000 */ lw $a1, ($v1) -/* 833DD0 802425D0 0C0B1EAF */ jal get_variable -/* 833DD4 802425D4 0040802D */ daddu $s0, $v0, $zero -/* 833DD8 802425D8 8E05000C */ lw $a1, 0xc($s0) -/* 833DDC 802425DC 00021880 */ sll $v1, $v0, 2 -/* 833DE0 802425E0 00A32821 */ addu $a1, $a1, $v1 -/* 833DE4 802425E4 8CA30008 */ lw $v1, 8($a1) -/* 833DE8 802425E8 2404FFFE */ addiu $a0, $zero, -2 -/* 833DEC 802425EC 00641824 */ and $v1, $v1, $a0 -/* 833DF0 802425F0 ACA30008 */ sw $v1, 8($a1) -/* 833DF4 802425F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 833DF8 802425F8 8FB00010 */ lw $s0, 0x10($sp) -/* 833DFC 802425FC 24020002 */ addiu $v0, $zero, 2 -/* 833E00 80242600 03E00008 */ jr $ra -/* 833E04 80242604 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802425A8_833DA8.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802425A8_833DA8.s new file mode 100644 index 0000000000..4be095b028 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802425A8_833DA8.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425A8_833DA8 +/* 833DA8 802425A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 833DAC 802425AC AFB00010 */ sw $s0, 0x10($sp) +/* 833DB0 802425B0 0080802D */ daddu $s0, $a0, $zero +/* 833DB4 802425B4 3C05FD05 */ lui $a1, 0xfd05 +/* 833DB8 802425B8 AFBF0014 */ sw $ra, 0x14($sp) +/* 833DBC 802425BC 0C0B1EAF */ jal get_variable +/* 833DC0 802425C0 34A50F82 */ ori $a1, $a1, 0xf82 +/* 833DC4 802425C4 8E03000C */ lw $v1, 0xc($s0) +/* 833DC8 802425C8 0200202D */ daddu $a0, $s0, $zero +/* 833DCC 802425CC 8C650000 */ lw $a1, ($v1) +/* 833DD0 802425D0 0C0B1EAF */ jal get_variable +/* 833DD4 802425D4 0040802D */ daddu $s0, $v0, $zero +/* 833DD8 802425D8 8E05000C */ lw $a1, 0xc($s0) +/* 833DDC 802425DC 00021880 */ sll $v1, $v0, 2 +/* 833DE0 802425E0 00A32821 */ addu $a1, $a1, $v1 +/* 833DE4 802425E4 8CA30008 */ lw $v1, 8($a1) +/* 833DE8 802425E8 2404FFFE */ addiu $a0, $zero, -2 +/* 833DEC 802425EC 00641824 */ and $v1, $v1, $a0 +/* 833DF0 802425F0 ACA30008 */ sw $v1, 8($a1) +/* 833DF4 802425F4 8FBF0014 */ lw $ra, 0x14($sp) +/* 833DF8 802425F8 8FB00010 */ lw $s0, 0x10($sp) +/* 833DFC 802425FC 24020002 */ addiu $v0, $zero, 2 +/* 833E00 80242600 03E00008 */ jr $ra +/* 833E04 80242604 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242608.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242608.s deleted file mode 100644 index fa70b4c5ce..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242608.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242608 -/* 833E08 80242608 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 833E0C 8024260C AFB10014 */ sw $s1, 0x14($sp) -/* 833E10 80242610 0080882D */ daddu $s1, $a0, $zero -/* 833E14 80242614 3C05FD05 */ lui $a1, 0xfd05 -/* 833E18 80242618 34A50F82 */ ori $a1, $a1, 0xf82 -/* 833E1C 8024261C AFBF001C */ sw $ra, 0x1c($sp) -/* 833E20 80242620 AFB20018 */ sw $s2, 0x18($sp) -/* 833E24 80242624 0C0B1EAF */ jal get_variable -/* 833E28 80242628 AFB00010 */ sw $s0, 0x10($sp) -/* 833E2C 8024262C 0220202D */ daddu $a0, $s1, $zero -/* 833E30 80242630 8E30000C */ lw $s0, 0xc($s1) -/* 833E34 80242634 0040902D */ daddu $s2, $v0, $zero -/* 833E38 80242638 8E050000 */ lw $a1, ($s0) -/* 833E3C 8024263C 0C0B1EAF */ jal get_variable -/* 833E40 80242640 26100004 */ addiu $s0, $s0, 4 -/* 833E44 80242644 0220202D */ daddu $a0, $s1, $zero -/* 833E48 80242648 8E050000 */ lw $a1, ($s0) -/* 833E4C 8024264C 0C0B1EAF */ jal get_variable -/* 833E50 80242650 0040802D */ daddu $s0, $v0, $zero -/* 833E54 80242654 8E44000C */ lw $a0, 0xc($s2) -/* 833E58 80242658 00101880 */ sll $v1, $s0, 2 -/* 833E5C 8024265C 00832021 */ addu $a0, $a0, $v1 -/* 833E60 80242660 8C830008 */ lw $v1, 8($a0) -/* 833E64 80242664 34630002 */ ori $v1, $v1, 2 -/* 833E68 80242668 AC830008 */ sw $v1, 8($a0) -/* 833E6C 8024266C 8E43000C */ lw $v1, 0xc($s2) -/* 833E70 80242670 00701821 */ addu $v1, $v1, $s0 -/* 833E74 80242674 A06200EF */ sb $v0, 0xef($v1) -/* 833E78 80242678 8FBF001C */ lw $ra, 0x1c($sp) -/* 833E7C 8024267C 8FB20018 */ lw $s2, 0x18($sp) -/* 833E80 80242680 8FB10014 */ lw $s1, 0x14($sp) -/* 833E84 80242684 8FB00010 */ lw $s0, 0x10($sp) -/* 833E88 80242688 24020002 */ addiu $v0, $zero, 2 -/* 833E8C 8024268C 03E00008 */ jr $ra -/* 833E90 80242690 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242608_833E08.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242608_833E08.s new file mode 100644 index 0000000000..93a9ef7fe2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242608_833E08.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242608_833E08 +/* 833E08 80242608 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 833E0C 8024260C AFB10014 */ sw $s1, 0x14($sp) +/* 833E10 80242610 0080882D */ daddu $s1, $a0, $zero +/* 833E14 80242614 3C05FD05 */ lui $a1, 0xfd05 +/* 833E18 80242618 34A50F82 */ ori $a1, $a1, 0xf82 +/* 833E1C 8024261C AFBF001C */ sw $ra, 0x1c($sp) +/* 833E20 80242620 AFB20018 */ sw $s2, 0x18($sp) +/* 833E24 80242624 0C0B1EAF */ jal get_variable +/* 833E28 80242628 AFB00010 */ sw $s0, 0x10($sp) +/* 833E2C 8024262C 0220202D */ daddu $a0, $s1, $zero +/* 833E30 80242630 8E30000C */ lw $s0, 0xc($s1) +/* 833E34 80242634 0040902D */ daddu $s2, $v0, $zero +/* 833E38 80242638 8E050000 */ lw $a1, ($s0) +/* 833E3C 8024263C 0C0B1EAF */ jal get_variable +/* 833E40 80242640 26100004 */ addiu $s0, $s0, 4 +/* 833E44 80242644 0220202D */ daddu $a0, $s1, $zero +/* 833E48 80242648 8E050000 */ lw $a1, ($s0) +/* 833E4C 8024264C 0C0B1EAF */ jal get_variable +/* 833E50 80242650 0040802D */ daddu $s0, $v0, $zero +/* 833E54 80242654 8E44000C */ lw $a0, 0xc($s2) +/* 833E58 80242658 00101880 */ sll $v1, $s0, 2 +/* 833E5C 8024265C 00832021 */ addu $a0, $a0, $v1 +/* 833E60 80242660 8C830008 */ lw $v1, 8($a0) +/* 833E64 80242664 34630002 */ ori $v1, $v1, 2 +/* 833E68 80242668 AC830008 */ sw $v1, 8($a0) +/* 833E6C 8024266C 8E43000C */ lw $v1, 0xc($s2) +/* 833E70 80242670 00701821 */ addu $v1, $v1, $s0 +/* 833E74 80242674 A06200EF */ sb $v0, 0xef($v1) +/* 833E78 80242678 8FBF001C */ lw $ra, 0x1c($sp) +/* 833E7C 8024267C 8FB20018 */ lw $s2, 0x18($sp) +/* 833E80 80242680 8FB10014 */ lw $s1, 0x14($sp) +/* 833E84 80242684 8FB00010 */ lw $s0, 0x10($sp) +/* 833E88 80242688 24020002 */ addiu $v0, $zero, 2 +/* 833E8C 8024268C 03E00008 */ jr $ra +/* 833E90 80242690 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694.s deleted file mode 100644 index 6633497433..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694.s +++ /dev/null @@ -1,84 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242694 -/* 833E94 80242694 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 833E98 80242698 AFB40020 */ sw $s4, 0x20($sp) -/* 833E9C 8024269C 0080A02D */ daddu $s4, $a0, $zero -/* 833EA0 802426A0 3C05FD05 */ lui $a1, 0xfd05 -/* 833EA4 802426A4 34A50F82 */ ori $a1, $a1, 0xf82 -/* 833EA8 802426A8 AFBF002C */ sw $ra, 0x2c($sp) -/* 833EAC 802426AC AFB60028 */ sw $s6, 0x28($sp) -/* 833EB0 802426B0 AFB50024 */ sw $s5, 0x24($sp) -/* 833EB4 802426B4 AFB3001C */ sw $s3, 0x1c($sp) -/* 833EB8 802426B8 AFB20018 */ sw $s2, 0x18($sp) -/* 833EBC 802426BC AFB10014 */ sw $s1, 0x14($sp) -/* 833EC0 802426C0 0C0B1EAF */ jal get_variable -/* 833EC4 802426C4 AFB00010 */ sw $s0, 0x10($sp) -/* 833EC8 802426C8 0040982D */ daddu $s3, $v0, $zero -/* 833ECC 802426CC 24120001 */ addiu $s2, $zero, 1 -/* 833ED0 802426D0 3C16F5DE */ lui $s6, 0xf5de -/* 833ED4 802426D4 36D6019E */ ori $s6, $s6, 0x19e -/* 833ED8 802426D8 3C15F5DE */ lui $s5, 0xf5de -/* 833EDC 802426DC 36B5019D */ ori $s5, $s5, 0x19d -/* 833EE0 802426E0 0000882D */ daddu $s1, $zero, $zero -.L802426E4: -/* 833EE4 802426E4 0280202D */ daddu $a0, $s4, $zero -/* 833EE8 802426E8 0C0B1EAF */ jal get_variable -/* 833EEC 802426EC 02562821 */ addu $a1, $s2, $s6 -/* 833EF0 802426F0 0280202D */ daddu $a0, $s4, $zero -/* 833EF4 802426F4 02552821 */ addu $a1, $s2, $s5 -/* 833EF8 802426F8 0040802D */ daddu $s0, $v0, $zero -/* 833EFC 802426FC 0C0B2026 */ jal set_variable -/* 833F00 80242700 0200302D */ daddu $a2, $s0, $zero -/* 833F04 80242704 8E63000C */ lw $v1, 0xc($s3) -/* 833F08 80242708 00121080 */ sll $v0, $s2, 2 -/* 833F0C 8024270C 00621021 */ addu $v0, $v1, $v0 -/* 833F10 80242710 C4400034 */ lwc1 $f0, 0x34($v0) -/* 833F14 80242714 C4420060 */ lwc1 $f2, 0x60($v0) -/* 833F18 80242718 C444008C */ lwc1 $f4, 0x8c($v0) -/* 833F1C 8024271C C44600B8 */ lwc1 $f6, 0xb8($v0) -/* 833F20 80242720 02431821 */ addu $v1, $s2, $v1 -/* 833F24 80242724 A07000E3 */ sb $s0, 0xe3($v1) -/* 833F28 80242728 8E62000C */ lw $v0, 0xc($s3) -/* 833F2C 8024272C 00511021 */ addu $v0, $v0, $s1 -/* 833F30 80242730 E4400034 */ swc1 $f0, 0x34($v0) -/* 833F34 80242734 8E62000C */ lw $v0, 0xc($s3) -/* 833F38 80242738 00511021 */ addu $v0, $v0, $s1 -/* 833F3C 8024273C E4420060 */ swc1 $f2, 0x60($v0) -/* 833F40 80242740 8E62000C */ lw $v0, 0xc($s3) -/* 833F44 80242744 00511021 */ addu $v0, $v0, $s1 -/* 833F48 80242748 E444008C */ swc1 $f4, 0x8c($v0) -/* 833F4C 8024274C 8E62000C */ lw $v0, 0xc($s3) -/* 833F50 80242750 00511021 */ addu $v0, $v0, $s1 -/* 833F54 80242754 E44600B8 */ swc1 $f6, 0xb8($v0) -/* 833F58 80242758 8E63000C */ lw $v1, 0xc($s3) -/* 833F5C 8024275C 26520001 */ addiu $s2, $s2, 1 -/* 833F60 80242760 00711821 */ addu $v1, $v1, $s1 -/* 833F64 80242764 8C620008 */ lw $v0, 8($v1) -/* 833F68 80242768 34420001 */ ori $v0, $v0, 1 -/* 833F6C 8024276C AC620008 */ sw $v0, 8($v1) -/* 833F70 80242770 2A42000A */ slti $v0, $s2, 0xa -/* 833F74 80242774 1440FFDB */ bnez $v0, .L802426E4 -/* 833F78 80242778 26310004 */ addiu $s1, $s1, 4 -/* 833F7C 8024277C 0280202D */ daddu $a0, $s4, $zero -/* 833F80 80242780 3C05F5DE */ lui $a1, 0xf5de -/* 833F84 80242784 34A5019D */ ori $a1, $a1, 0x19d -/* 833F88 80242788 8E62000C */ lw $v0, 0xc($s3) -/* 833F8C 8024278C 24060009 */ addiu $a2, $zero, 9 -/* 833F90 80242790 8C43002C */ lw $v1, 0x2c($v0) -/* 833F94 80242794 2407FFFE */ addiu $a3, $zero, -2 -/* 833F98 80242798 00671824 */ and $v1, $v1, $a3 -/* 833F9C 8024279C 0C0B2026 */ jal set_variable -/* 833FA0 802427A0 AC43002C */ sw $v1, 0x2c($v0) -/* 833FA4 802427A4 8FBF002C */ lw $ra, 0x2c($sp) -/* 833FA8 802427A8 8FB60028 */ lw $s6, 0x28($sp) -/* 833FAC 802427AC 8FB50024 */ lw $s5, 0x24($sp) -/* 833FB0 802427B0 8FB40020 */ lw $s4, 0x20($sp) -/* 833FB4 802427B4 8FB3001C */ lw $s3, 0x1c($sp) -/* 833FB8 802427B8 8FB20018 */ lw $s2, 0x18($sp) -/* 833FBC 802427BC 8FB10014 */ lw $s1, 0x14($sp) -/* 833FC0 802427C0 8FB00010 */ lw $s0, 0x10($sp) -/* 833FC4 802427C4 24020002 */ addiu $v0, $zero, 2 -/* 833FC8 802427C8 03E00008 */ jr $ra -/* 833FCC 802427CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694_833E94.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694_833E94.s new file mode 100644 index 0000000000..64bec72362 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80242694_833E94.s @@ -0,0 +1,84 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242694_833E94 +/* 833E94 80242694 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 833E98 80242698 AFB40020 */ sw $s4, 0x20($sp) +/* 833E9C 8024269C 0080A02D */ daddu $s4, $a0, $zero +/* 833EA0 802426A0 3C05FD05 */ lui $a1, 0xfd05 +/* 833EA4 802426A4 34A50F82 */ ori $a1, $a1, 0xf82 +/* 833EA8 802426A8 AFBF002C */ sw $ra, 0x2c($sp) +/* 833EAC 802426AC AFB60028 */ sw $s6, 0x28($sp) +/* 833EB0 802426B0 AFB50024 */ sw $s5, 0x24($sp) +/* 833EB4 802426B4 AFB3001C */ sw $s3, 0x1c($sp) +/* 833EB8 802426B8 AFB20018 */ sw $s2, 0x18($sp) +/* 833EBC 802426BC AFB10014 */ sw $s1, 0x14($sp) +/* 833EC0 802426C0 0C0B1EAF */ jal get_variable +/* 833EC4 802426C4 AFB00010 */ sw $s0, 0x10($sp) +/* 833EC8 802426C8 0040982D */ daddu $s3, $v0, $zero +/* 833ECC 802426CC 24120001 */ addiu $s2, $zero, 1 +/* 833ED0 802426D0 3C16F5DE */ lui $s6, 0xf5de +/* 833ED4 802426D4 36D6019E */ ori $s6, $s6, 0x19e +/* 833ED8 802426D8 3C15F5DE */ lui $s5, 0xf5de +/* 833EDC 802426DC 36B5019D */ ori $s5, $s5, 0x19d +/* 833EE0 802426E0 0000882D */ daddu $s1, $zero, $zero +.L802426E4: +/* 833EE4 802426E4 0280202D */ daddu $a0, $s4, $zero +/* 833EE8 802426E8 0C0B1EAF */ jal get_variable +/* 833EEC 802426EC 02562821 */ addu $a1, $s2, $s6 +/* 833EF0 802426F0 0280202D */ daddu $a0, $s4, $zero +/* 833EF4 802426F4 02552821 */ addu $a1, $s2, $s5 +/* 833EF8 802426F8 0040802D */ daddu $s0, $v0, $zero +/* 833EFC 802426FC 0C0B2026 */ jal set_variable +/* 833F00 80242700 0200302D */ daddu $a2, $s0, $zero +/* 833F04 80242704 8E63000C */ lw $v1, 0xc($s3) +/* 833F08 80242708 00121080 */ sll $v0, $s2, 2 +/* 833F0C 8024270C 00621021 */ addu $v0, $v1, $v0 +/* 833F10 80242710 C4400034 */ lwc1 $f0, 0x34($v0) +/* 833F14 80242714 C4420060 */ lwc1 $f2, 0x60($v0) +/* 833F18 80242718 C444008C */ lwc1 $f4, 0x8c($v0) +/* 833F1C 8024271C C44600B8 */ lwc1 $f6, 0xb8($v0) +/* 833F20 80242720 02431821 */ addu $v1, $s2, $v1 +/* 833F24 80242724 A07000E3 */ sb $s0, 0xe3($v1) +/* 833F28 80242728 8E62000C */ lw $v0, 0xc($s3) +/* 833F2C 8024272C 00511021 */ addu $v0, $v0, $s1 +/* 833F30 80242730 E4400034 */ swc1 $f0, 0x34($v0) +/* 833F34 80242734 8E62000C */ lw $v0, 0xc($s3) +/* 833F38 80242738 00511021 */ addu $v0, $v0, $s1 +/* 833F3C 8024273C E4420060 */ swc1 $f2, 0x60($v0) +/* 833F40 80242740 8E62000C */ lw $v0, 0xc($s3) +/* 833F44 80242744 00511021 */ addu $v0, $v0, $s1 +/* 833F48 80242748 E444008C */ swc1 $f4, 0x8c($v0) +/* 833F4C 8024274C 8E62000C */ lw $v0, 0xc($s3) +/* 833F50 80242750 00511021 */ addu $v0, $v0, $s1 +/* 833F54 80242754 E44600B8 */ swc1 $f6, 0xb8($v0) +/* 833F58 80242758 8E63000C */ lw $v1, 0xc($s3) +/* 833F5C 8024275C 26520001 */ addiu $s2, $s2, 1 +/* 833F60 80242760 00711821 */ addu $v1, $v1, $s1 +/* 833F64 80242764 8C620008 */ lw $v0, 8($v1) +/* 833F68 80242768 34420001 */ ori $v0, $v0, 1 +/* 833F6C 8024276C AC620008 */ sw $v0, 8($v1) +/* 833F70 80242770 2A42000A */ slti $v0, $s2, 0xa +/* 833F74 80242774 1440FFDB */ bnez $v0, .L802426E4 +/* 833F78 80242778 26310004 */ addiu $s1, $s1, 4 +/* 833F7C 8024277C 0280202D */ daddu $a0, $s4, $zero +/* 833F80 80242780 3C05F5DE */ lui $a1, 0xf5de +/* 833F84 80242784 34A5019D */ ori $a1, $a1, 0x19d +/* 833F88 80242788 8E62000C */ lw $v0, 0xc($s3) +/* 833F8C 8024278C 24060009 */ addiu $a2, $zero, 9 +/* 833F90 80242790 8C43002C */ lw $v1, 0x2c($v0) +/* 833F94 80242794 2407FFFE */ addiu $a3, $zero, -2 +/* 833F98 80242798 00671824 */ and $v1, $v1, $a3 +/* 833F9C 8024279C 0C0B2026 */ jal set_variable +/* 833FA0 802427A0 AC43002C */ sw $v1, 0x2c($v0) +/* 833FA4 802427A4 8FBF002C */ lw $ra, 0x2c($sp) +/* 833FA8 802427A8 8FB60028 */ lw $s6, 0x28($sp) +/* 833FAC 802427AC 8FB50024 */ lw $s5, 0x24($sp) +/* 833FB0 802427B0 8FB40020 */ lw $s4, 0x20($sp) +/* 833FB4 802427B4 8FB3001C */ lw $s3, 0x1c($sp) +/* 833FB8 802427B8 8FB20018 */ lw $s2, 0x18($sp) +/* 833FBC 802427BC 8FB10014 */ lw $s1, 0x14($sp) +/* 833FC0 802427C0 8FB00010 */ lw $s0, 0x10($sp) +/* 833FC4 802427C4 24020002 */ addiu $v0, $zero, 2 +/* 833FC8 802427C8 03E00008 */ jr $ra +/* 833FCC 802427CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0.s deleted file mode 100644 index cab03dad36..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427D0 -/* 833FD0 802427D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 833FD4 802427D4 AFB20018 */ sw $s2, 0x18($sp) -/* 833FD8 802427D8 0080902D */ daddu $s2, $a0, $zero -/* 833FDC 802427DC 3C05F5DE */ lui $a1, 0xf5de -/* 833FE0 802427E0 AFBF0020 */ sw $ra, 0x20($sp) -/* 833FE4 802427E4 AFB3001C */ sw $s3, 0x1c($sp) -/* 833FE8 802427E8 AFB10014 */ sw $s1, 0x14($sp) -/* 833FEC 802427EC AFB00010 */ sw $s0, 0x10($sp) -/* 833FF0 802427F0 8E51000C */ lw $s1, 0xc($s2) -/* 833FF4 802427F4 0C0B1EAF */ jal get_variable -/* 833FF8 802427F8 34A5019E */ ori $a1, $a1, 0x19e -/* 833FFC 802427FC 3C038025 */ lui $v1, 0x8025 -/* 834000 80242800 2463F800 */ addiu $v1, $v1, -0x800 -/* 834004 80242804 00028040 */ sll $s0, $v0, 1 -/* 834008 80242808 02028021 */ addu $s0, $s0, $v0 -/* 83400C 8024280C 00108080 */ sll $s0, $s0, 2 -/* 834010 80242810 02038021 */ addu $s0, $s0, $v1 -/* 834014 80242814 8E060000 */ lw $a2, ($s0) -/* 834018 80242818 8E250000 */ lw $a1, ($s1) -/* 83401C 8024281C 26310004 */ addiu $s1, $s1, 4 -/* 834020 80242820 8E330000 */ lw $s3, ($s1) -/* 834024 80242824 8E310004 */ lw $s1, 4($s1) -/* 834028 80242828 0C0B2026 */ jal set_variable -/* 83402C 8024282C 0240202D */ daddu $a0, $s2, $zero -/* 834030 80242830 0240202D */ daddu $a0, $s2, $zero -/* 834034 80242834 8E060004 */ lw $a2, 4($s0) -/* 834038 80242838 0C0B2026 */ jal set_variable -/* 83403C 8024283C 0260282D */ daddu $a1, $s3, $zero -/* 834040 80242840 0240202D */ daddu $a0, $s2, $zero -/* 834044 80242844 8E060008 */ lw $a2, 8($s0) -/* 834048 80242848 0C0B2026 */ jal set_variable -/* 83404C 8024284C 0220282D */ daddu $a1, $s1, $zero -/* 834050 80242850 8FBF0020 */ lw $ra, 0x20($sp) -/* 834054 80242854 8FB3001C */ lw $s3, 0x1c($sp) -/* 834058 80242858 8FB20018 */ lw $s2, 0x18($sp) -/* 83405C 8024285C 8FB10014 */ lw $s1, 0x14($sp) -/* 834060 80242860 8FB00010 */ lw $s0, 0x10($sp) -/* 834064 80242864 24020002 */ addiu $v0, $zero, 2 -/* 834068 80242868 03E00008 */ jr $ra -/* 83406C 8024286C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s new file mode 100644 index 0000000000..46412b0a42 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_03/833740/func_802427D0_833FD0.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427D0_833FD0 +/* 833FD0 802427D0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 833FD4 802427D4 AFB20018 */ sw $s2, 0x18($sp) +/* 833FD8 802427D8 0080902D */ daddu $s2, $a0, $zero +/* 833FDC 802427DC 3C05F5DE */ lui $a1, 0xf5de +/* 833FE0 802427E0 AFBF0020 */ sw $ra, 0x20($sp) +/* 833FE4 802427E4 AFB3001C */ sw $s3, 0x1c($sp) +/* 833FE8 802427E8 AFB10014 */ sw $s1, 0x14($sp) +/* 833FEC 802427EC AFB00010 */ sw $s0, 0x10($sp) +/* 833FF0 802427F0 8E51000C */ lw $s1, 0xc($s2) +/* 833FF4 802427F4 0C0B1EAF */ jal get_variable +/* 833FF8 802427F8 34A5019E */ ori $a1, $a1, 0x19e +/* 833FFC 802427FC 3C038025 */ lui $v1, 0x8025 +/* 834000 80242800 2463F800 */ addiu $v1, $v1, -0x800 +/* 834004 80242804 00028040 */ sll $s0, $v0, 1 +/* 834008 80242808 02028021 */ addu $s0, $s0, $v0 +/* 83400C 8024280C 00108080 */ sll $s0, $s0, 2 +/* 834010 80242810 02038021 */ addu $s0, $s0, $v1 +/* 834014 80242814 8E060000 */ lw $a2, ($s0) +/* 834018 80242818 8E250000 */ lw $a1, ($s1) +/* 83401C 8024281C 26310004 */ addiu $s1, $s1, 4 +/* 834020 80242820 8E330000 */ lw $s3, ($s1) +/* 834024 80242824 8E310004 */ lw $s1, 4($s1) +/* 834028 80242828 0C0B2026 */ jal set_variable +/* 83402C 8024282C 0240202D */ daddu $a0, $s2, $zero +/* 834030 80242830 0240202D */ daddu $a0, $s2, $zero +/* 834034 80242834 8E060004 */ lw $a2, 4($s0) +/* 834038 80242838 0C0B2026 */ jal set_variable +/* 83403C 8024283C 0260282D */ daddu $a1, $s3, $zero +/* 834040 80242840 0240202D */ daddu $a0, $s2, $zero +/* 834044 80242844 8E060008 */ lw $a2, 8($s0) +/* 834048 80242848 0C0B2026 */ jal set_variable +/* 83404C 8024284C 0220282D */ daddu $a1, $s1, $zero +/* 834050 80242850 8FBF0020 */ lw $ra, 0x20($sp) +/* 834054 80242854 8FB3001C */ lw $s3, 0x1c($sp) +/* 834058 80242858 8FB20018 */ lw $s2, 0x18($sp) +/* 83405C 8024285C 8FB10014 */ lw $s1, 0x14($sp) +/* 834060 80242860 8FB00010 */ lw $s0, 0x10($sp) +/* 834064 80242864 24020002 */ addiu $v0, $zero, 2 +/* 834068 80242868 03E00008 */ jr $ra +/* 83406C 8024286C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240050.s b/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240050.s deleted file mode 100644 index 408f2e2e2f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240050.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050 -/* 842C20 80240050 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 842C24 80240054 AFB1002C */ sw $s1, 0x2c($sp) -/* 842C28 80240058 0080882D */ daddu $s1, $a0, $zero -/* 842C2C 8024005C AFBF004C */ sw $ra, 0x4c($sp) -/* 842C30 80240060 AFBE0048 */ sw $fp, 0x48($sp) -/* 842C34 80240064 AFB70044 */ sw $s7, 0x44($sp) -/* 842C38 80240068 AFB60040 */ sw $s6, 0x40($sp) -/* 842C3C 8024006C AFB5003C */ sw $s5, 0x3c($sp) -/* 842C40 80240070 AFB40038 */ sw $s4, 0x38($sp) -/* 842C44 80240074 AFB30034 */ sw $s3, 0x34($sp) -/* 842C48 80240078 AFB20030 */ sw $s2, 0x30($sp) -/* 842C4C 8024007C AFB00028 */ sw $s0, 0x28($sp) -/* 842C50 80240080 8E30000C */ lw $s0, 0xc($s1) -/* 842C54 80240084 8E050000 */ lw $a1, ($s0) -/* 842C58 80240088 0C0B1EAF */ jal get_variable -/* 842C5C 8024008C 26100004 */ addiu $s0, $s0, 4 -/* 842C60 80240090 8E050000 */ lw $a1, ($s0) -/* 842C64 80240094 26100004 */ addiu $s0, $s0, 4 -/* 842C68 80240098 0220202D */ daddu $a0, $s1, $zero -/* 842C6C 8024009C 0C0B1EAF */ jal get_variable -/* 842C70 802400A0 0040F02D */ daddu $fp, $v0, $zero -/* 842C74 802400A4 8E050000 */ lw $a1, ($s0) -/* 842C78 802400A8 26100004 */ addiu $s0, $s0, 4 -/* 842C7C 802400AC 0220202D */ daddu $a0, $s1, $zero -/* 842C80 802400B0 0C0B1EAF */ jal get_variable -/* 842C84 802400B4 0040B02D */ daddu $s6, $v0, $zero -/* 842C88 802400B8 8E050000 */ lw $a1, ($s0) -/* 842C8C 802400BC 26100004 */ addiu $s0, $s0, 4 -/* 842C90 802400C0 0220202D */ daddu $a0, $s1, $zero -/* 842C94 802400C4 0C0B1EAF */ jal get_variable -/* 842C98 802400C8 0040B82D */ daddu $s7, $v0, $zero -/* 842C9C 802400CC 8E050000 */ lw $a1, ($s0) -/* 842CA0 802400D0 26100004 */ addiu $s0, $s0, 4 -/* 842CA4 802400D4 0220202D */ daddu $a0, $s1, $zero -/* 842CA8 802400D8 0C0B1EAF */ jal get_variable -/* 842CAC 802400DC 0040A82D */ daddu $s5, $v0, $zero -/* 842CB0 802400E0 8E050000 */ lw $a1, ($s0) -/* 842CB4 802400E4 26100004 */ addiu $s0, $s0, 4 -/* 842CB8 802400E8 0220202D */ daddu $a0, $s1, $zero -/* 842CBC 802400EC 0C0B1EAF */ jal get_variable -/* 842CC0 802400F0 0040A02D */ daddu $s4, $v0, $zero -/* 842CC4 802400F4 8E050000 */ lw $a1, ($s0) -/* 842CC8 802400F8 26100004 */ addiu $s0, $s0, 4 -/* 842CCC 802400FC 0220202D */ daddu $a0, $s1, $zero -/* 842CD0 80240100 0C0B1EAF */ jal get_variable -/* 842CD4 80240104 0040982D */ daddu $s3, $v0, $zero -/* 842CD8 80240108 8E050000 */ lw $a1, ($s0) -/* 842CDC 8024010C 26100004 */ addiu $s0, $s0, 4 -/* 842CE0 80240110 0220202D */ daddu $a0, $s1, $zero -/* 842CE4 80240114 0C0B1EAF */ jal get_variable -/* 842CE8 80240118 0040902D */ daddu $s2, $v0, $zero -/* 842CEC 8024011C 0220202D */ daddu $a0, $s1, $zero -/* 842CF0 80240120 8E050000 */ lw $a1, ($s0) -/* 842CF4 80240124 0C0B1EAF */ jal get_variable -/* 842CF8 80240128 0040802D */ daddu $s0, $v0, $zero -/* 842CFC 8024012C 33C400FF */ andi $a0, $fp, 0xff -/* 842D00 80240130 32C500FF */ andi $a1, $s6, 0xff -/* 842D04 80240134 329400FF */ andi $s4, $s4, 0xff -/* 842D08 80240138 327300FF */ andi $s3, $s3, 0xff -/* 842D0C 8024013C 325200FF */ andi $s2, $s2, 0xff -/* 842D10 80240140 32E600FF */ andi $a2, $s7, 0xff -/* 842D14 80240144 32A700FF */ andi $a3, $s5, 0xff -/* 842D18 80240148 AFB40010 */ sw $s4, 0x10($sp) -/* 842D1C 8024014C AFB30014 */ sw $s3, 0x14($sp) -/* 842D20 80240150 AFB20018 */ sw $s2, 0x18($sp) -/* 842D24 80240154 AFB0001C */ sw $s0, 0x1c($sp) -/* 842D28 80240158 0C046FAD */ jal func_8011BEB4 -/* 842D2C 8024015C AFA20020 */ sw $v0, 0x20($sp) -/* 842D30 80240160 8FBF004C */ lw $ra, 0x4c($sp) -/* 842D34 80240164 8FBE0048 */ lw $fp, 0x48($sp) -/* 842D38 80240168 8FB70044 */ lw $s7, 0x44($sp) -/* 842D3C 8024016C 8FB60040 */ lw $s6, 0x40($sp) -/* 842D40 80240170 8FB5003C */ lw $s5, 0x3c($sp) -/* 842D44 80240174 8FB40038 */ lw $s4, 0x38($sp) -/* 842D48 80240178 8FB30034 */ lw $s3, 0x34($sp) -/* 842D4C 8024017C 8FB20030 */ lw $s2, 0x30($sp) -/* 842D50 80240180 8FB1002C */ lw $s1, 0x2c($sp) -/* 842D54 80240184 8FB00028 */ lw $s0, 0x28($sp) -/* 842D58 80240188 24020002 */ addiu $v0, $zero, 2 -/* 842D5C 8024018C 03E00008 */ jr $ra -/* 842D60 80240190 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240050_842C20.s b/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240050_842C20.s new file mode 100644 index 0000000000..d33921d9d3 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240050_842C20.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240050_842C20 +/* 842C20 80240050 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 842C24 80240054 AFB1002C */ sw $s1, 0x2c($sp) +/* 842C28 80240058 0080882D */ daddu $s1, $a0, $zero +/* 842C2C 8024005C AFBF004C */ sw $ra, 0x4c($sp) +/* 842C30 80240060 AFBE0048 */ sw $fp, 0x48($sp) +/* 842C34 80240064 AFB70044 */ sw $s7, 0x44($sp) +/* 842C38 80240068 AFB60040 */ sw $s6, 0x40($sp) +/* 842C3C 8024006C AFB5003C */ sw $s5, 0x3c($sp) +/* 842C40 80240070 AFB40038 */ sw $s4, 0x38($sp) +/* 842C44 80240074 AFB30034 */ sw $s3, 0x34($sp) +/* 842C48 80240078 AFB20030 */ sw $s2, 0x30($sp) +/* 842C4C 8024007C AFB00028 */ sw $s0, 0x28($sp) +/* 842C50 80240080 8E30000C */ lw $s0, 0xc($s1) +/* 842C54 80240084 8E050000 */ lw $a1, ($s0) +/* 842C58 80240088 0C0B1EAF */ jal get_variable +/* 842C5C 8024008C 26100004 */ addiu $s0, $s0, 4 +/* 842C60 80240090 8E050000 */ lw $a1, ($s0) +/* 842C64 80240094 26100004 */ addiu $s0, $s0, 4 +/* 842C68 80240098 0220202D */ daddu $a0, $s1, $zero +/* 842C6C 8024009C 0C0B1EAF */ jal get_variable +/* 842C70 802400A0 0040F02D */ daddu $fp, $v0, $zero +/* 842C74 802400A4 8E050000 */ lw $a1, ($s0) +/* 842C78 802400A8 26100004 */ addiu $s0, $s0, 4 +/* 842C7C 802400AC 0220202D */ daddu $a0, $s1, $zero +/* 842C80 802400B0 0C0B1EAF */ jal get_variable +/* 842C84 802400B4 0040B02D */ daddu $s6, $v0, $zero +/* 842C88 802400B8 8E050000 */ lw $a1, ($s0) +/* 842C8C 802400BC 26100004 */ addiu $s0, $s0, 4 +/* 842C90 802400C0 0220202D */ daddu $a0, $s1, $zero +/* 842C94 802400C4 0C0B1EAF */ jal get_variable +/* 842C98 802400C8 0040B82D */ daddu $s7, $v0, $zero +/* 842C9C 802400CC 8E050000 */ lw $a1, ($s0) +/* 842CA0 802400D0 26100004 */ addiu $s0, $s0, 4 +/* 842CA4 802400D4 0220202D */ daddu $a0, $s1, $zero +/* 842CA8 802400D8 0C0B1EAF */ jal get_variable +/* 842CAC 802400DC 0040A82D */ daddu $s5, $v0, $zero +/* 842CB0 802400E0 8E050000 */ lw $a1, ($s0) +/* 842CB4 802400E4 26100004 */ addiu $s0, $s0, 4 +/* 842CB8 802400E8 0220202D */ daddu $a0, $s1, $zero +/* 842CBC 802400EC 0C0B1EAF */ jal get_variable +/* 842CC0 802400F0 0040A02D */ daddu $s4, $v0, $zero +/* 842CC4 802400F4 8E050000 */ lw $a1, ($s0) +/* 842CC8 802400F8 26100004 */ addiu $s0, $s0, 4 +/* 842CCC 802400FC 0220202D */ daddu $a0, $s1, $zero +/* 842CD0 80240100 0C0B1EAF */ jal get_variable +/* 842CD4 80240104 0040982D */ daddu $s3, $v0, $zero +/* 842CD8 80240108 8E050000 */ lw $a1, ($s0) +/* 842CDC 8024010C 26100004 */ addiu $s0, $s0, 4 +/* 842CE0 80240110 0220202D */ daddu $a0, $s1, $zero +/* 842CE4 80240114 0C0B1EAF */ jal get_variable +/* 842CE8 80240118 0040902D */ daddu $s2, $v0, $zero +/* 842CEC 8024011C 0220202D */ daddu $a0, $s1, $zero +/* 842CF0 80240120 8E050000 */ lw $a1, ($s0) +/* 842CF4 80240124 0C0B1EAF */ jal get_variable +/* 842CF8 80240128 0040802D */ daddu $s0, $v0, $zero +/* 842CFC 8024012C 33C400FF */ andi $a0, $fp, 0xff +/* 842D00 80240130 32C500FF */ andi $a1, $s6, 0xff +/* 842D04 80240134 329400FF */ andi $s4, $s4, 0xff +/* 842D08 80240138 327300FF */ andi $s3, $s3, 0xff +/* 842D0C 8024013C 325200FF */ andi $s2, $s2, 0xff +/* 842D10 80240140 32E600FF */ andi $a2, $s7, 0xff +/* 842D14 80240144 32A700FF */ andi $a3, $s5, 0xff +/* 842D18 80240148 AFB40010 */ sw $s4, 0x10($sp) +/* 842D1C 8024014C AFB30014 */ sw $s3, 0x14($sp) +/* 842D20 80240150 AFB20018 */ sw $s2, 0x18($sp) +/* 842D24 80240154 AFB0001C */ sw $s0, 0x1c($sp) +/* 842D28 80240158 0C046FAD */ jal func_8011BEB4 +/* 842D2C 8024015C AFA20020 */ sw $v0, 0x20($sp) +/* 842D30 80240160 8FBF004C */ lw $ra, 0x4c($sp) +/* 842D34 80240164 8FBE0048 */ lw $fp, 0x48($sp) +/* 842D38 80240168 8FB70044 */ lw $s7, 0x44($sp) +/* 842D3C 8024016C 8FB60040 */ lw $s6, 0x40($sp) +/* 842D40 80240170 8FB5003C */ lw $s5, 0x3c($sp) +/* 842D44 80240174 8FB40038 */ lw $s4, 0x38($sp) +/* 842D48 80240178 8FB30034 */ lw $s3, 0x34($sp) +/* 842D4C 8024017C 8FB20030 */ lw $s2, 0x30($sp) +/* 842D50 80240180 8FB1002C */ lw $s1, 0x2c($sp) +/* 842D54 80240184 8FB00028 */ lw $s0, 0x28($sp) +/* 842D58 80240188 24020002 */ addiu $v0, $zero, 2 +/* 842D5C 8024018C 03E00008 */ jr $ra +/* 842D60 80240190 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194.s b/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194.s deleted file mode 100644 index d93c37eb60..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240194 -/* 842D64 80240194 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 842D68 80240198 AFBF0010 */ sw $ra, 0x10($sp) -/* 842D6C 8024019C 0C04760B */ jal func_8011D82C -/* 842D70 802401A0 24040003 */ addiu $a0, $zero, 3 -/* 842D74 802401A4 8FBF0010 */ lw $ra, 0x10($sp) -/* 842D78 802401A8 24020002 */ addiu $v0, $zero, 2 -/* 842D7C 802401AC 03E00008 */ jr $ra -/* 842D80 802401B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 842D84 802401B4 00000000 */ nop -/* 842D88 802401B8 00000000 */ nop -/* 842D8C 802401BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s b/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s new file mode 100644 index 0000000000..179ca2faf2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/842C20/func_80240194_842D64.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240194_842D64 +/* 842D64 80240194 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 842D68 80240198 AFBF0010 */ sw $ra, 0x10($sp) +/* 842D6C 8024019C 0C04760B */ jal func_8011D82C +/* 842D70 802401A0 24040003 */ addiu $a0, $zero, 3 +/* 842D74 802401A4 8FBF0010 */ lw $ra, 0x10($sp) +/* 842D78 802401A8 24020002 */ addiu $v0, $zero, 2 +/* 842D7C 802401AC 03E00008 */ jr $ra +/* 842D80 802401B0 27BD0018 */ addiu $sp, $sp, 0x18 +/* 842D84 802401B4 00000000 */ nop +/* 842D88 802401B8 00000000 */ nop +/* 842D8C 802401BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0.s b/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0.s deleted file mode 100644 index f5d750314a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401C0 -/* 842D90 802401C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 842D94 802401C4 2404009E */ addiu $a0, $zero, 0x9e -/* 842D98 802401C8 2405FFFF */ addiu $a1, $zero, -1 -/* 842D9C 802401CC 24060001 */ addiu $a2, $zero, 1 -/* 842DA0 802401D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 842DA4 802401D4 0C046E54 */ jal func_8011B950 -/* 842DA8 802401D8 00C0382D */ daddu $a3, $a2, $zero -/* 842DAC 802401DC 0000202D */ daddu $a0, $zero, $zero -/* 842DB0 802401E0 0080282D */ daddu $a1, $a0, $zero -/* 842DB4 802401E4 0080302D */ daddu $a2, $a0, $zero -/* 842DB8 802401E8 0C046F97 */ jal set_background_color_blend -/* 842DBC 802401EC 240700FF */ addiu $a3, $zero, 0xff -/* 842DC0 802401F0 3C03800B */ lui $v1, %hi(gCameras) -/* 842DC4 802401F4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 842DC8 802401F8 A460002C */ sh $zero, 0x2c($v1) -/* 842DCC 802401FC A460002E */ sh $zero, 0x2e($v1) -/* 842DD0 80240200 A4600030 */ sh $zero, 0x30($v1) -/* 842DD4 80240204 8FBF0010 */ lw $ra, 0x10($sp) -/* 842DD8 80240208 24020002 */ addiu $v0, $zero, 2 -/* 842DDC 8024020C 03E00008 */ jr $ra -/* 842DE0 80240210 27BD0018 */ addiu $sp, $sp, 0x18 -/* 842DE4 80240214 00000000 */ nop -/* 842DE8 80240218 00000000 */ nop -/* 842DEC 8024021C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s b/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s new file mode 100644 index 0000000000..c0e6e7d51d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/842D90/func_802401C0_842D90.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401C0_842D90 +/* 842D90 802401C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 842D94 802401C4 2404009E */ addiu $a0, $zero, 0x9e +/* 842D98 802401C8 2405FFFF */ addiu $a1, $zero, -1 +/* 842D9C 802401CC 24060001 */ addiu $a2, $zero, 1 +/* 842DA0 802401D0 AFBF0010 */ sw $ra, 0x10($sp) +/* 842DA4 802401D4 0C046E54 */ jal func_8011B950 +/* 842DA8 802401D8 00C0382D */ daddu $a3, $a2, $zero +/* 842DAC 802401DC 0000202D */ daddu $a0, $zero, $zero +/* 842DB0 802401E0 0080282D */ daddu $a1, $a0, $zero +/* 842DB4 802401E4 0080302D */ daddu $a2, $a0, $zero +/* 842DB8 802401E8 0C046F97 */ jal set_background_color_blend +/* 842DBC 802401EC 240700FF */ addiu $a3, $zero, 0xff +/* 842DC0 802401F0 3C03800B */ lui $v1, %hi(gCameras) +/* 842DC4 802401F4 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* 842DC8 802401F8 A460002C */ sh $zero, 0x2c($v1) +/* 842DCC 802401FC A460002E */ sh $zero, 0x2e($v1) +/* 842DD0 80240200 A4600030 */ sh $zero, 0x30($v1) +/* 842DD4 80240204 8FBF0010 */ lw $ra, 0x10($sp) +/* 842DD8 80240208 24020002 */ addiu $v0, $zero, 2 +/* 842DDC 8024020C 03E00008 */ jr $ra +/* 842DE0 80240210 27BD0018 */ addiu $sp, $sp, 0x18 +/* 842DE4 80240214 00000000 */ nop +/* 842DE8 80240218 00000000 */ nop +/* 842DEC 8024021C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240220.s b/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240220.s deleted file mode 100644 index 2d82909798..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240220.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240220 -/* 842DF0 80240220 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 842DF4 80240224 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 842DF8 80240228 4485A000 */ mtc1 $a1, $f20 -/* 842DFC 8024022C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 842E00 80240230 4486B000 */ mtc1 $a2, $f22 -/* 842E04 80240234 AFB00010 */ sw $s0, 0x10($sp) -/* 842E08 80240238 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 842E0C 8024023C 4487C000 */ mtc1 $a3, $f24 -/* 842E10 80240240 AFBF0014 */ sw $ra, 0x14($sp) -/* 842E14 80240244 0C019D28 */ jal guMtxIdentF -/* 842E18 80240248 0080802D */ daddu $s0, $a0, $zero -/* 842E1C 8024024C 4616A582 */ mul.s $f22, $f20, $f22 -/* 842E20 80240250 00000000 */ nop -/* 842E24 80240254 4618A502 */ mul.s $f20, $f20, $f24 -/* 842E28 80240258 00000000 */ nop -/* 842E2C 8024025C 3C013F80 */ lui $at, 0x3f80 -/* 842E30 80240260 44810000 */ mtc1 $at, $f0 -/* 842E34 80240264 00000000 */ nop -/* 842E38 80240268 E6000014 */ swc1 $f0, 0x14($s0) -/* 842E3C 8024026C E6160010 */ swc1 $f22, 0x10($s0) -/* 842E40 80240270 E6140018 */ swc1 $f20, 0x18($s0) -/* 842E44 80240274 8FBF0014 */ lw $ra, 0x14($sp) -/* 842E48 80240278 8FB00010 */ lw $s0, 0x10($sp) -/* 842E4C 8024027C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 842E50 80240280 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 842E54 80240284 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 842E58 80240288 03E00008 */ jr $ra -/* 842E5C 8024028C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240220_842DF0.s b/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240220_842DF0.s new file mode 100644 index 0000000000..0cbb35c6cf --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240220_842DF0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240220_842DF0 +/* 842DF0 80240220 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 842DF4 80240224 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 842DF8 80240228 4485A000 */ mtc1 $a1, $f20 +/* 842DFC 8024022C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 842E00 80240230 4486B000 */ mtc1 $a2, $f22 +/* 842E04 80240234 AFB00010 */ sw $s0, 0x10($sp) +/* 842E08 80240238 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 842E0C 8024023C 4487C000 */ mtc1 $a3, $f24 +/* 842E10 80240240 AFBF0014 */ sw $ra, 0x14($sp) +/* 842E14 80240244 0C019D28 */ jal guMtxIdentF +/* 842E18 80240248 0080802D */ daddu $s0, $a0, $zero +/* 842E1C 8024024C 4616A582 */ mul.s $f22, $f20, $f22 +/* 842E20 80240250 00000000 */ nop +/* 842E24 80240254 4618A502 */ mul.s $f20, $f20, $f24 +/* 842E28 80240258 00000000 */ nop +/* 842E2C 8024025C 3C013F80 */ lui $at, 0x3f80 +/* 842E30 80240260 44810000 */ mtc1 $at, $f0 +/* 842E34 80240264 00000000 */ nop +/* 842E38 80240268 E6000014 */ swc1 $f0, 0x14($s0) +/* 842E3C 8024026C E6160010 */ swc1 $f22, 0x10($s0) +/* 842E40 80240270 E6140018 */ swc1 $f20, 0x18($s0) +/* 842E44 80240274 8FBF0014 */ lw $ra, 0x14($sp) +/* 842E48 80240278 8FB00010 */ lw $s0, 0x10($sp) +/* 842E4C 8024027C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 842E50 80240280 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 842E54 80240284 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 842E58 80240288 03E00008 */ jr $ra +/* 842E5C 8024028C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240290.s b/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240290.s deleted file mode 100644 index 0940baaaef..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240290.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240290 -/* 842E60 80240290 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 842E64 80240294 AFB10054 */ sw $s1, 0x54($sp) -/* 842E68 80240298 0080882D */ daddu $s1, $a0, $zero -/* 842E6C 8024029C AFBF005C */ sw $ra, 0x5c($sp) -/* 842E70 802402A0 AFB20058 */ sw $s2, 0x58($sp) -/* 842E74 802402A4 AFB00050 */ sw $s0, 0x50($sp) -/* 842E78 802402A8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 842E7C 802402AC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 842E80 802402B0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 842E84 802402B4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 842E88 802402B8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 842E8C 802402BC 8E30000C */ lw $s0, 0xc($s1) -/* 842E90 802402C0 8E050000 */ lw $a1, ($s0) -/* 842E94 802402C4 0C0B1EAF */ jal get_variable -/* 842E98 802402C8 26100004 */ addiu $s0, $s0, 4 -/* 842E9C 802402CC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 842EA0 802402D0 0040202D */ daddu $a0, $v0, $zero -/* 842EA4 802402D4 8E050000 */ lw $a1, ($s0) -/* 842EA8 802402D8 26100004 */ addiu $s0, $s0, 4 -/* 842EAC 802402DC 0220202D */ daddu $a0, $s1, $zero -/* 842EB0 802402E0 0C0B210B */ jal get_float_variable -/* 842EB4 802402E4 0040902D */ daddu $s2, $v0, $zero -/* 842EB8 802402E8 8E050000 */ lw $a1, ($s0) -/* 842EBC 802402EC 26100004 */ addiu $s0, $s0, 4 -/* 842EC0 802402F0 0220202D */ daddu $a0, $s1, $zero -/* 842EC4 802402F4 0C0B210B */ jal get_float_variable -/* 842EC8 802402F8 46000706 */ mov.s $f28, $f0 -/* 842ECC 802402FC 8E050000 */ lw $a1, ($s0) -/* 842ED0 80240300 26100004 */ addiu $s0, $s0, 4 -/* 842ED4 80240304 0220202D */ daddu $a0, $s1, $zero -/* 842ED8 80240308 0C0B210B */ jal get_float_variable -/* 842EDC 8024030C 46000686 */ mov.s $f26, $f0 -/* 842EE0 80240310 0220202D */ daddu $a0, $s1, $zero -/* 842EE4 80240314 8E050000 */ lw $a1, ($s0) -/* 842EE8 80240318 0C0B210B */ jal get_float_variable -/* 842EEC 8024031C 46000586 */ mov.s $f22, $f0 -/* 842EF0 80240320 0240202D */ daddu $a0, $s2, $zero -/* 842EF4 80240324 0C046B4C */ jal get_model_from_list_index -/* 842EF8 80240328 46000606 */ mov.s $f24, $f0 -/* 842EFC 8024032C 0040882D */ daddu $s1, $v0, $zero -/* 842F00 80240330 96220000 */ lhu $v0, ($s1) -/* 842F04 80240334 30420400 */ andi $v0, $v0, 0x400 -/* 842F08 80240338 1440001E */ bnez $v0, .L802403B4 -/* 842F0C 8024033C 26300058 */ addiu $s0, $s1, 0x58 -/* 842F10 80240340 4480A000 */ mtc1 $zero, $f20 -/* 842F14 80240344 4406B000 */ mfc1 $a2, $f22 -/* 842F18 80240348 4405A000 */ mfc1 $a1, $f20 -/* 842F1C 8024034C 4407A000 */ mfc1 $a3, $f20 -/* 842F20 80240350 0C019E40 */ jal guTranslateF -/* 842F24 80240354 0200202D */ daddu $a0, $s0, $zero -/* 842F28 80240358 4405E000 */ mfc1 $a1, $f28 -/* 842F2C 8024035C 4406D000 */ mfc1 $a2, $f26 -/* 842F30 80240360 4407C000 */ mfc1 $a3, $f24 -/* 842F34 80240364 0C090088 */ jal func_80240220 -/* 842F38 80240368 27A40010 */ addiu $a0, $sp, 0x10 -/* 842F3C 8024036C 27A40010 */ addiu $a0, $sp, 0x10 -/* 842F40 80240370 0200282D */ daddu $a1, $s0, $zero -/* 842F44 80240374 0C019D80 */ jal guMtxCatF -/* 842F48 80240378 0200302D */ daddu $a2, $s0, $zero -/* 842F4C 8024037C 27A40010 */ addiu $a0, $sp, 0x10 -/* 842F50 80240380 4600B587 */ neg.s $f22, $f22 -/* 842F54 80240384 4405A000 */ mfc1 $a1, $f20 -/* 842F58 80240388 4406B000 */ mfc1 $a2, $f22 -/* 842F5C 8024038C 0C019E40 */ jal guTranslateF -/* 842F60 80240390 00A0382D */ daddu $a3, $a1, $zero -/* 842F64 80240394 27A40010 */ addiu $a0, $sp, 0x10 -/* 842F68 80240398 0200282D */ daddu $a1, $s0, $zero -/* 842F6C 8024039C 0C019D80 */ jal guMtxCatF -/* 842F70 802403A0 00A0302D */ daddu $a2, $a1, $zero -/* 842F74 802403A4 96220000 */ lhu $v0, ($s1) -/* 842F78 802403A8 34421400 */ ori $v0, $v0, 0x1400 -/* 842F7C 802403AC 0809010B */ j .L8024042C -/* 842F80 802403B0 A6220000 */ sh $v0, ($s1) -.L802403B4: -/* 842F84 802403B4 4480A000 */ mtc1 $zero, $f20 -/* 842F88 802403B8 4406B000 */ mfc1 $a2, $f22 -/* 842F8C 802403BC 4405A000 */ mfc1 $a1, $f20 -/* 842F90 802403C0 4407A000 */ mfc1 $a3, $f20 -/* 842F94 802403C4 0C019E40 */ jal guTranslateF -/* 842F98 802403C8 27A40010 */ addiu $a0, $sp, 0x10 -/* 842F9C 802403CC 27A40010 */ addiu $a0, $sp, 0x10 -/* 842FA0 802403D0 26300058 */ addiu $s0, $s1, 0x58 -/* 842FA4 802403D4 0200282D */ daddu $a1, $s0, $zero -/* 842FA8 802403D8 0C019D80 */ jal guMtxCatF -/* 842FAC 802403DC 0200302D */ daddu $a2, $s0, $zero -/* 842FB0 802403E0 4405E000 */ mfc1 $a1, $f28 -/* 842FB4 802403E4 4406D000 */ mfc1 $a2, $f26 -/* 842FB8 802403E8 4407C000 */ mfc1 $a3, $f24 -/* 842FBC 802403EC 0C090088 */ jal func_80240220 -/* 842FC0 802403F0 27A40010 */ addiu $a0, $sp, 0x10 -/* 842FC4 802403F4 27A40010 */ addiu $a0, $sp, 0x10 -/* 842FC8 802403F8 0200282D */ daddu $a1, $s0, $zero -/* 842FCC 802403FC 0C019D80 */ jal guMtxCatF -/* 842FD0 80240400 0200302D */ daddu $a2, $s0, $zero -/* 842FD4 80240404 27A40010 */ addiu $a0, $sp, 0x10 -/* 842FD8 80240408 4600B587 */ neg.s $f22, $f22 -/* 842FDC 8024040C 4405A000 */ mfc1 $a1, $f20 -/* 842FE0 80240410 4406B000 */ mfc1 $a2, $f22 -/* 842FE4 80240414 0C019E40 */ jal guTranslateF -/* 842FE8 80240418 00A0382D */ daddu $a3, $a1, $zero -/* 842FEC 8024041C 27A40010 */ addiu $a0, $sp, 0x10 -/* 842FF0 80240420 0200282D */ daddu $a1, $s0, $zero -/* 842FF4 80240424 0C019D80 */ jal guMtxCatF -/* 842FF8 80240428 00A0302D */ daddu $a2, $a1, $zero -.L8024042C: -/* 842FFC 8024042C 8FBF005C */ lw $ra, 0x5c($sp) -/* 843000 80240430 8FB20058 */ lw $s2, 0x58($sp) -/* 843004 80240434 8FB10054 */ lw $s1, 0x54($sp) -/* 843008 80240438 8FB00050 */ lw $s0, 0x50($sp) -/* 84300C 8024043C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 843010 80240440 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 843014 80240444 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 843018 80240448 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 84301C 8024044C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 843020 80240450 24020002 */ addiu $v0, $zero, 2 -/* 843024 80240454 03E00008 */ jr $ra -/* 843028 80240458 27BD0088 */ addiu $sp, $sp, 0x88 -/* 84302C 8024045C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240290_842E60.s b/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240290_842E60.s new file mode 100644 index 0000000000..6edac7c2f3 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/842DF0/func_80240290_842E60.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240290_842E60 +/* 842E60 80240290 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 842E64 80240294 AFB10054 */ sw $s1, 0x54($sp) +/* 842E68 80240298 0080882D */ daddu $s1, $a0, $zero +/* 842E6C 8024029C AFBF005C */ sw $ra, 0x5c($sp) +/* 842E70 802402A0 AFB20058 */ sw $s2, 0x58($sp) +/* 842E74 802402A4 AFB00050 */ sw $s0, 0x50($sp) +/* 842E78 802402A8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 842E7C 802402AC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 842E80 802402B0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 842E84 802402B4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 842E88 802402B8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 842E8C 802402BC 8E30000C */ lw $s0, 0xc($s1) +/* 842E90 802402C0 8E050000 */ lw $a1, ($s0) +/* 842E94 802402C4 0C0B1EAF */ jal get_variable +/* 842E98 802402C8 26100004 */ addiu $s0, $s0, 4 +/* 842E9C 802402CC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 842EA0 802402D0 0040202D */ daddu $a0, $v0, $zero +/* 842EA4 802402D4 8E050000 */ lw $a1, ($s0) +/* 842EA8 802402D8 26100004 */ addiu $s0, $s0, 4 +/* 842EAC 802402DC 0220202D */ daddu $a0, $s1, $zero +/* 842EB0 802402E0 0C0B210B */ jal get_float_variable +/* 842EB4 802402E4 0040902D */ daddu $s2, $v0, $zero +/* 842EB8 802402E8 8E050000 */ lw $a1, ($s0) +/* 842EBC 802402EC 26100004 */ addiu $s0, $s0, 4 +/* 842EC0 802402F0 0220202D */ daddu $a0, $s1, $zero +/* 842EC4 802402F4 0C0B210B */ jal get_float_variable +/* 842EC8 802402F8 46000706 */ mov.s $f28, $f0 +/* 842ECC 802402FC 8E050000 */ lw $a1, ($s0) +/* 842ED0 80240300 26100004 */ addiu $s0, $s0, 4 +/* 842ED4 80240304 0220202D */ daddu $a0, $s1, $zero +/* 842ED8 80240308 0C0B210B */ jal get_float_variable +/* 842EDC 8024030C 46000686 */ mov.s $f26, $f0 +/* 842EE0 80240310 0220202D */ daddu $a0, $s1, $zero +/* 842EE4 80240314 8E050000 */ lw $a1, ($s0) +/* 842EE8 80240318 0C0B210B */ jal get_float_variable +/* 842EEC 8024031C 46000586 */ mov.s $f22, $f0 +/* 842EF0 80240320 0240202D */ daddu $a0, $s2, $zero +/* 842EF4 80240324 0C046B4C */ jal get_model_from_list_index +/* 842EF8 80240328 46000606 */ mov.s $f24, $f0 +/* 842EFC 8024032C 0040882D */ daddu $s1, $v0, $zero +/* 842F00 80240330 96220000 */ lhu $v0, ($s1) +/* 842F04 80240334 30420400 */ andi $v0, $v0, 0x400 +/* 842F08 80240338 1440001E */ bnez $v0, .L802403B4 +/* 842F0C 8024033C 26300058 */ addiu $s0, $s1, 0x58 +/* 842F10 80240340 4480A000 */ mtc1 $zero, $f20 +/* 842F14 80240344 4406B000 */ mfc1 $a2, $f22 +/* 842F18 80240348 4405A000 */ mfc1 $a1, $f20 +/* 842F1C 8024034C 4407A000 */ mfc1 $a3, $f20 +/* 842F20 80240350 0C019E40 */ jal guTranslateF +/* 842F24 80240354 0200202D */ daddu $a0, $s0, $zero +/* 842F28 80240358 4405E000 */ mfc1 $a1, $f28 +/* 842F2C 8024035C 4406D000 */ mfc1 $a2, $f26 +/* 842F30 80240360 4407C000 */ mfc1 $a3, $f24 +/* 842F34 80240364 0C090088 */ jal func_80240220_842DF0 +/* 842F38 80240368 27A40010 */ addiu $a0, $sp, 0x10 +/* 842F3C 8024036C 27A40010 */ addiu $a0, $sp, 0x10 +/* 842F40 80240370 0200282D */ daddu $a1, $s0, $zero +/* 842F44 80240374 0C019D80 */ jal guMtxCatF +/* 842F48 80240378 0200302D */ daddu $a2, $s0, $zero +/* 842F4C 8024037C 27A40010 */ addiu $a0, $sp, 0x10 +/* 842F50 80240380 4600B587 */ neg.s $f22, $f22 +/* 842F54 80240384 4405A000 */ mfc1 $a1, $f20 +/* 842F58 80240388 4406B000 */ mfc1 $a2, $f22 +/* 842F5C 8024038C 0C019E40 */ jal guTranslateF +/* 842F60 80240390 00A0382D */ daddu $a3, $a1, $zero +/* 842F64 80240394 27A40010 */ addiu $a0, $sp, 0x10 +/* 842F68 80240398 0200282D */ daddu $a1, $s0, $zero +/* 842F6C 8024039C 0C019D80 */ jal guMtxCatF +/* 842F70 802403A0 00A0302D */ daddu $a2, $a1, $zero +/* 842F74 802403A4 96220000 */ lhu $v0, ($s1) +/* 842F78 802403A8 34421400 */ ori $v0, $v0, 0x1400 +/* 842F7C 802403AC 0809010B */ j .L8024042C +/* 842F80 802403B0 A6220000 */ sh $v0, ($s1) +.L802403B4: +/* 842F84 802403B4 4480A000 */ mtc1 $zero, $f20 +/* 842F88 802403B8 4406B000 */ mfc1 $a2, $f22 +/* 842F8C 802403BC 4405A000 */ mfc1 $a1, $f20 +/* 842F90 802403C0 4407A000 */ mfc1 $a3, $f20 +/* 842F94 802403C4 0C019E40 */ jal guTranslateF +/* 842F98 802403C8 27A40010 */ addiu $a0, $sp, 0x10 +/* 842F9C 802403CC 27A40010 */ addiu $a0, $sp, 0x10 +/* 842FA0 802403D0 26300058 */ addiu $s0, $s1, 0x58 +/* 842FA4 802403D4 0200282D */ daddu $a1, $s0, $zero +/* 842FA8 802403D8 0C019D80 */ jal guMtxCatF +/* 842FAC 802403DC 0200302D */ daddu $a2, $s0, $zero +/* 842FB0 802403E0 4405E000 */ mfc1 $a1, $f28 +/* 842FB4 802403E4 4406D000 */ mfc1 $a2, $f26 +/* 842FB8 802403E8 4407C000 */ mfc1 $a3, $f24 +/* 842FBC 802403EC 0C090088 */ jal func_80240220_842DF0 +/* 842FC0 802403F0 27A40010 */ addiu $a0, $sp, 0x10 +/* 842FC4 802403F4 27A40010 */ addiu $a0, $sp, 0x10 +/* 842FC8 802403F8 0200282D */ daddu $a1, $s0, $zero +/* 842FCC 802403FC 0C019D80 */ jal guMtxCatF +/* 842FD0 80240400 0200302D */ daddu $a2, $s0, $zero +/* 842FD4 80240404 27A40010 */ addiu $a0, $sp, 0x10 +/* 842FD8 80240408 4600B587 */ neg.s $f22, $f22 +/* 842FDC 8024040C 4405A000 */ mfc1 $a1, $f20 +/* 842FE0 80240410 4406B000 */ mfc1 $a2, $f22 +/* 842FE4 80240414 0C019E40 */ jal guTranslateF +/* 842FE8 80240418 00A0382D */ daddu $a3, $a1, $zero +/* 842FEC 8024041C 27A40010 */ addiu $a0, $sp, 0x10 +/* 842FF0 80240420 0200282D */ daddu $a1, $s0, $zero +/* 842FF4 80240424 0C019D80 */ jal guMtxCatF +/* 842FF8 80240428 00A0302D */ daddu $a2, $a1, $zero +.L8024042C: +/* 842FFC 8024042C 8FBF005C */ lw $ra, 0x5c($sp) +/* 843000 80240430 8FB20058 */ lw $s2, 0x58($sp) +/* 843004 80240434 8FB10054 */ lw $s1, 0x54($sp) +/* 843008 80240438 8FB00050 */ lw $s0, 0x50($sp) +/* 84300C 8024043C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 843010 80240440 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 843014 80240444 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 843018 80240448 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 84301C 8024044C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 843020 80240450 24020002 */ addiu $v0, $zero, 2 +/* 843024 80240454 03E00008 */ jr $ra +/* 843028 80240458 27BD0088 */ addiu $sp, $sp, 0x88 +/* 84302C 8024045C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460.s deleted file mode 100644 index 6fcd24f808..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240460 -/* 843030 80240460 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 843034 80240464 AFB00010 */ sw $s0, 0x10($sp) -/* 843038 80240468 3C108024 */ lui $s0, 0x8024 -/* 84303C 8024046C 26103FE8 */ addiu $s0, $s0, 0x3fe8 -/* 843040 80240470 AFBF0018 */ sw $ra, 0x18($sp) -/* 843044 80240474 AFB10014 */ sw $s1, 0x14($sp) -/* 843048 80240478 8E020000 */ lw $v0, ($s0) -/* 84304C 8024047C 14400010 */ bnez $v0, .L802404C0 -/* 843050 80240480 0080882D */ daddu $s1, $a0, $zero -/* 843054 80240484 0C00AB39 */ jal heap_malloc -/* 843058 80240488 24040040 */ addiu $a0, $zero, 0x40 -/* 84305C 8024048C AE020000 */ sw $v0, ($s0) -/* 843060 80240490 0000182D */ daddu $v1, $zero, $zero -/* 843064 80240494 0040282D */ daddu $a1, $v0, $zero -/* 843068 80240498 0220202D */ daddu $a0, $s1, $zero -.L8024049C: -/* 84306C 8024049C 8C820084 */ lw $v0, 0x84($a0) -/* 843070 802404A0 24840004 */ addiu $a0, $a0, 4 -/* 843074 802404A4 24630001 */ addiu $v1, $v1, 1 -/* 843078 802404A8 ACA20000 */ sw $v0, ($a1) -/* 84307C 802404AC 28620010 */ slti $v0, $v1, 0x10 -/* 843080 802404B0 1440FFFA */ bnez $v0, .L8024049C -/* 843084 802404B4 24A50004 */ addiu $a1, $a1, 4 -/* 843088 802404B8 0809013F */ j .L802404FC -/* 84308C 802404BC 00000000 */ nop -.L802404C0: -/* 843090 802404C0 0000182D */ daddu $v1, $zero, $zero -/* 843094 802404C4 0040282D */ daddu $a1, $v0, $zero -/* 843098 802404C8 0220202D */ daddu $a0, $s1, $zero -.L802404CC: -/* 84309C 802404CC 8CA20000 */ lw $v0, ($a1) -/* 8430A0 802404D0 24A50004 */ addiu $a1, $a1, 4 -/* 8430A4 802404D4 24630001 */ addiu $v1, $v1, 1 -/* 8430A8 802404D8 AC820084 */ sw $v0, 0x84($a0) -/* 8430AC 802404DC 28620010 */ slti $v0, $v1, 0x10 -/* 8430B0 802404E0 1440FFFA */ bnez $v0, .L802404CC -/* 8430B4 802404E4 24840004 */ addiu $a0, $a0, 4 -/* 8430B8 802404E8 3C108024 */ lui $s0, 0x8024 -/* 8430BC 802404EC 26103FE8 */ addiu $s0, $s0, 0x3fe8 -/* 8430C0 802404F0 0C00AB4B */ jal heap_free -/* 8430C4 802404F4 8E040000 */ lw $a0, ($s0) -/* 8430C8 802404F8 AE000000 */ sw $zero, ($s0) -.L802404FC: -/* 8430CC 802404FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 8430D0 80240500 8FB10014 */ lw $s1, 0x14($sp) -/* 8430D4 80240504 8FB00010 */ lw $s0, 0x10($sp) -/* 8430D8 80240508 24020002 */ addiu $v0, $zero, 2 -/* 8430DC 8024050C 03E00008 */ jr $ra -/* 8430E0 80240510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s new file mode 100644 index 0000000000..147d80cb0e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240460_843030.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240460_843030 +/* 843030 80240460 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 843034 80240464 AFB00010 */ sw $s0, 0x10($sp) +/* 843038 80240468 3C108024 */ lui $s0, 0x8024 +/* 84303C 8024046C 26103FE8 */ addiu $s0, $s0, 0x3fe8 +/* 843040 80240470 AFBF0018 */ sw $ra, 0x18($sp) +/* 843044 80240474 AFB10014 */ sw $s1, 0x14($sp) +/* 843048 80240478 8E020000 */ lw $v0, ($s0) +/* 84304C 8024047C 14400010 */ bnez $v0, .L802404C0 +/* 843050 80240480 0080882D */ daddu $s1, $a0, $zero +/* 843054 80240484 0C00AB39 */ jal heap_malloc +/* 843058 80240488 24040040 */ addiu $a0, $zero, 0x40 +/* 84305C 8024048C AE020000 */ sw $v0, ($s0) +/* 843060 80240490 0000182D */ daddu $v1, $zero, $zero +/* 843064 80240494 0040282D */ daddu $a1, $v0, $zero +/* 843068 80240498 0220202D */ daddu $a0, $s1, $zero +.L8024049C: +/* 84306C 8024049C 8C820084 */ lw $v0, 0x84($a0) +/* 843070 802404A0 24840004 */ addiu $a0, $a0, 4 +/* 843074 802404A4 24630001 */ addiu $v1, $v1, 1 +/* 843078 802404A8 ACA20000 */ sw $v0, ($a1) +/* 84307C 802404AC 28620010 */ slti $v0, $v1, 0x10 +/* 843080 802404B0 1440FFFA */ bnez $v0, .L8024049C +/* 843084 802404B4 24A50004 */ addiu $a1, $a1, 4 +/* 843088 802404B8 0809013F */ j .L802404FC +/* 84308C 802404BC 00000000 */ nop +.L802404C0: +/* 843090 802404C0 0000182D */ daddu $v1, $zero, $zero +/* 843094 802404C4 0040282D */ daddu $a1, $v0, $zero +/* 843098 802404C8 0220202D */ daddu $a0, $s1, $zero +.L802404CC: +/* 84309C 802404CC 8CA20000 */ lw $v0, ($a1) +/* 8430A0 802404D0 24A50004 */ addiu $a1, $a1, 4 +/* 8430A4 802404D4 24630001 */ addiu $v1, $v1, 1 +/* 8430A8 802404D8 AC820084 */ sw $v0, 0x84($a0) +/* 8430AC 802404DC 28620010 */ slti $v0, $v1, 0x10 +/* 8430B0 802404E0 1440FFFA */ bnez $v0, .L802404CC +/* 8430B4 802404E4 24840004 */ addiu $a0, $a0, 4 +/* 8430B8 802404E8 3C108024 */ lui $s0, 0x8024 +/* 8430BC 802404EC 26103FE8 */ addiu $s0, $s0, 0x3fe8 +/* 8430C0 802404F0 0C00AB4B */ jal heap_free +/* 8430C4 802404F4 8E040000 */ lw $a0, ($s0) +/* 8430C8 802404F8 AE000000 */ sw $zero, ($s0) +.L802404FC: +/* 8430CC 802404FC 8FBF0018 */ lw $ra, 0x18($sp) +/* 8430D0 80240500 8FB10014 */ lw $s1, 0x14($sp) +/* 8430D4 80240504 8FB00010 */ lw $s0, 0x10($sp) +/* 8430D8 80240508 24020002 */ addiu $v0, $zero, 2 +/* 8430DC 8024050C 03E00008 */ jr $ra +/* 8430E0 80240510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578.s deleted file mode 100644 index b46fcbdfe1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578 -/* 843148 80240578 24020001 */ addiu $v0, $zero, 1 -/* 84314C 8024057C 3C018015 */ lui $at, %hi(D_80151310) -/* 843150 80240580 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 843154 80240584 03E00008 */ jr $ra -/* 843158 80240588 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s new file mode 100644 index 0000000000..a1fe2bd8db --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240578_843148 +/* 843148 80240578 24020001 */ addiu $v0, $zero, 1 +/* 84314C 8024057C 3C018015 */ lui $at, %hi(D_80151310) +/* 843150 80240580 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* 843154 80240584 03E00008 */ jr $ra +/* 843158 80240588 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C.s deleted file mode 100644 index f8a2733eb3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024058C -/* 84315C 8024058C 3C018015 */ lui $at, %hi(D_80151310) -/* 843160 80240590 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 843164 80240594 03E00008 */ jr $ra -/* 843168 80240598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s new file mode 100644 index 0000000000..4a79b1c634 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024058C_84315C +/* 84315C 8024058C 3C018015 */ lui $at, %hi(D_80151310) +/* 843160 80240590 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* 843164 80240594 03E00008 */ jr $ra +/* 843168 80240598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C.s deleted file mode 100644 index 153cfb5a07..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024059C -/* 84316C 8024059C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 843170 802405A0 AFB10024 */ sw $s1, 0x24($sp) -/* 843174 802405A4 0080882D */ daddu $s1, $a0, $zero -/* 843178 802405A8 3C05F840 */ lui $a1, 0xf840 -/* 84317C 802405AC AFBF0044 */ sw $ra, 0x44($sp) -/* 843180 802405B0 AFBE0040 */ sw $fp, 0x40($sp) -/* 843184 802405B4 AFB7003C */ sw $s7, 0x3c($sp) -/* 843188 802405B8 AFB60038 */ sw $s6, 0x38($sp) -/* 84318C 802405BC AFB50034 */ sw $s5, 0x34($sp) -/* 843190 802405C0 AFB40030 */ sw $s4, 0x30($sp) -/* 843194 802405C4 AFB3002C */ sw $s3, 0x2c($sp) -/* 843198 802405C8 AFB20028 */ sw $s2, 0x28($sp) -/* 84319C 802405CC AFB00020 */ sw $s0, 0x20($sp) -/* 8431A0 802405D0 8E3E0148 */ lw $fp, 0x148($s1) -/* 8431A4 802405D4 0C0B1EAF */ jal get_variable -/* 8431A8 802405D8 34A56268 */ ori $a1, $a1, 0x6268 -/* 8431AC 802405DC 0040802D */ daddu $s0, $v0, $zero -/* 8431B0 802405E0 0220202D */ daddu $a0, $s1, $zero -/* 8431B4 802405E4 3C05F840 */ lui $a1, 0xf840 -/* 8431B8 802405E8 0C0B1EAF */ jal get_variable -/* 8431BC 802405EC 34A56269 */ ori $a1, $a1, 0x6269 -/* 8431C0 802405F0 0040B82D */ daddu $s7, $v0, $zero -/* 8431C4 802405F4 0220202D */ daddu $a0, $s1, $zero -/* 8431C8 802405F8 3C05F5DE */ lui $a1, 0xf5de -/* 8431CC 802405FC 0C0B1EAF */ jal get_variable -/* 8431D0 80240600 34A502DE */ ori $a1, $a1, 0x2de -/* 8431D4 80240604 0040B02D */ daddu $s6, $v0, $zero -/* 8431D8 80240608 0220202D */ daddu $a0, $s1, $zero -/* 8431DC 8024060C 3C05F5DE */ lui $a1, 0xf5de -/* 8431E0 80240610 0C0B1EAF */ jal get_variable -/* 8431E4 80240614 34A502DF */ ori $a1, $a1, 0x2df -/* 8431E8 80240618 0040A82D */ daddu $s5, $v0, $zero -/* 8431EC 8024061C 93D3006D */ lbu $s3, 0x6d($fp) -/* 8431F0 80240620 32C2FFFF */ andi $v0, $s6, 0xffff -/* 8431F4 80240624 A7B30010 */ sh $s3, 0x10($sp) -/* 8431F8 80240628 93D2006E */ lbu $s2, 0x6e($fp) -/* 8431FC 8024062C 93C7006F */ lbu $a3, 0x6f($fp) -/* 843200 80240630 3274FFFF */ andi $s4, $s3, 0xffff -/* 843204 80240634 12820003 */ beq $s4, $v0, .L80240644 -/* 843208 80240638 A7A7001E */ sh $a3, 0x1e($sp) -/* 84320C 8024063C 0000B82D */ daddu $s7, $zero, $zero -/* 843210 80240640 02E0802D */ daddu $s0, $s7, $zero -.L80240644: -/* 843214 80240644 3202FFFF */ andi $v0, $s0, 0xffff -/* 843218 80240648 14400016 */ bnez $v0, .L802406A4 -/* 84321C 8024064C 0220202D */ daddu $a0, $s1, $zero -/* 843220 80240650 0C00A67F */ jal rand_int -/* 843224 80240654 24040064 */ addiu $a0, $zero, 0x64 -/* 843228 80240658 2842001E */ slti $v0, $v0, 0x1e -/* 84322C 8024065C 10400011 */ beqz $v0, .L802406A4 -/* 843230 80240660 0220202D */ daddu $a0, $s1, $zero -/* 843234 80240664 0C00A67F */ jal rand_int -/* 843238 80240668 2644FFFF */ addiu $a0, $s2, -1 -/* 84323C 8024066C 0040A82D */ daddu $s5, $v0, $zero -/* 843240 80240670 0260B02D */ daddu $s6, $s3, $zero -/* 843244 80240674 0220202D */ daddu $a0, $s1, $zero -/* 843248 80240678 3C05F5DE */ lui $a1, 0xf5de -/* 84324C 8024067C 34A502DE */ ori $a1, $a1, 0x2de -/* 843250 80240680 0C0B2026 */ jal set_variable -/* 843254 80240684 0280302D */ daddu $a2, $s4, $zero -/* 843258 80240688 0220202D */ daddu $a0, $s1, $zero -/* 84325C 8024068C 3C05F5DE */ lui $a1, 0xf5de -/* 843260 80240690 34A502DF */ ori $a1, $a1, 0x2df -/* 843264 80240694 0C0B2026 */ jal set_variable -/* 843268 80240698 32A6FFFF */ andi $a2, $s5, 0xffff -/* 84326C 8024069C 24100001 */ addiu $s0, $zero, 1 -/* 843270 802406A0 0220202D */ daddu $a0, $s1, $zero -.L802406A4: -/* 843274 802406A4 3C05F840 */ lui $a1, 0xf840 -/* 843278 802406A8 34A56268 */ ori $a1, $a1, 0x6268 -/* 84327C 802406AC 0C0B2026 */ jal set_variable -/* 843280 802406B0 3206FFFF */ andi $a2, $s0, 0xffff -/* 843284 802406B4 0220202D */ daddu $a0, $s1, $zero -/* 843288 802406B8 3C05F840 */ lui $a1, 0xf840 -/* 84328C 802406BC 34A56269 */ ori $a1, $a1, 0x6269 -/* 843290 802406C0 0C0B2026 */ jal set_variable -/* 843294 802406C4 32E6FFFF */ andi $a2, $s7, 0xffff -/* 843298 802406C8 0000202D */ daddu $a0, $zero, $zero -/* 84329C 802406CC 3C05F5DE */ lui $a1, 0xf5de -/* 8432A0 802406D0 0C0B1EAF */ jal get_variable -/* 8432A4 802406D4 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 8432A8 802406D8 0000202D */ daddu $a0, $zero, $zero -/* 8432AC 802406DC 3C05F5DE */ lui $a1, 0xf5de -/* 8432B0 802406E0 34A50180 */ ori $a1, $a1, 0x180 -/* 8432B4 802406E4 0C0B1EAF */ jal get_variable -/* 8432B8 802406E8 0040802D */ daddu $s0, $v0, $zero -/* 8432BC 802406EC 0040282D */ daddu $a1, $v0, $zero -/* 8432C0 802406F0 0000182D */ daddu $v1, $zero, $zero -/* 8432C4 802406F4 3C068024 */ lui $a2, 0x8024 -/* 8432C8 802406F8 24C6408C */ addiu $a2, $a2, 0x408c -/* 8432CC 802406FC 00C0202D */ daddu $a0, $a2, $zero -.L80240700: -/* 8432D0 80240700 8C820000 */ lw $v0, ($a0) -/* 8432D4 80240704 00A2102A */ slt $v0, $a1, $v0 -/* 8432D8 80240708 14400006 */ bnez $v0, .L80240724 -/* 8432DC 8024070C 000310C0 */ sll $v0, $v1, 3 -/* 8432E0 80240710 24630001 */ addiu $v1, $v1, 1 -/* 8432E4 80240714 28620008 */ slti $v0, $v1, 8 -/* 8432E8 80240718 1440FFF9 */ bnez $v0, .L80240700 -/* 8432EC 8024071C 24840008 */ addiu $a0, $a0, 8 -/* 8432F0 80240720 000310C0 */ sll $v0, $v1, 3 -.L80240724: -/* 8432F4 80240724 00461021 */ addu $v0, $v0, $a2 -/* 8432F8 80240728 8C420004 */ lw $v0, 4($v0) -/* 8432FC 8024072C 97A30010 */ lhu $v1, 0x10($sp) -/* 843300 80240730 0202202A */ slt $a0, $s0, $v0 -/* 843304 80240734 32C2FFFF */ andi $v0, $s6, 0xffff -/* 843308 80240738 14620008 */ bne $v1, $v0, .L8024075C -/* 84330C 8024073C 32A2FFFF */ andi $v0, $s5, 0xffff -/* 843310 80240740 97A7001E */ lhu $a3, 0x1e($sp) -/* 843314 80240744 14E20005 */ bne $a3, $v0, .L8024075C -/* 843318 80240748 32E2FFFF */ andi $v0, $s7, 0xffff -/* 84331C 8024074C 14400003 */ bnez $v0, .L8024075C -/* 843320 80240750 00000000 */ nop -/* 843324 80240754 14800008 */ bnez $a0, .L80240778 -/* 843328 80240758 24020001 */ addiu $v0, $zero, 1 -.L8024075C: -/* 84332C 8024075C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 843330 80240760 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 843334 80240764 80420075 */ lb $v0, 0x75($v0) -/* 843338 80240768 10400005 */ beqz $v0, .L80240780 -/* 84333C 8024076C 00000000 */ nop -/* 843340 80240770 10800003 */ beqz $a0, .L80240780 -/* 843344 80240774 24020001 */ addiu $v0, $zero, 1 -.L80240778: -/* 843348 80240778 080901E3 */ j .L8024078C -/* 84334C 8024077C AE220084 */ sw $v0, 0x84($s1) -.L80240780: -/* 843350 80240780 0C00F9EB */ jal kill_enemy -/* 843354 80240784 03C0202D */ daddu $a0, $fp, $zero -/* 843358 80240788 AE200084 */ sw $zero, 0x84($s1) -.L8024078C: -/* 84335C 8024078C 8FBF0044 */ lw $ra, 0x44($sp) -/* 843360 80240790 8FBE0040 */ lw $fp, 0x40($sp) -/* 843364 80240794 8FB7003C */ lw $s7, 0x3c($sp) -/* 843368 80240798 8FB60038 */ lw $s6, 0x38($sp) -/* 84336C 8024079C 8FB50034 */ lw $s5, 0x34($sp) -/* 843370 802407A0 8FB40030 */ lw $s4, 0x30($sp) -/* 843374 802407A4 8FB3002C */ lw $s3, 0x2c($sp) -/* 843378 802407A8 8FB20028 */ lw $s2, 0x28($sp) -/* 84337C 802407AC 8FB10024 */ lw $s1, 0x24($sp) -/* 843380 802407B0 8FB00020 */ lw $s0, 0x20($sp) -/* 843384 802407B4 24020002 */ addiu $v0, $zero, 2 -/* 843388 802407B8 03E00008 */ jr $ra -/* 84338C 802407BC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s new file mode 100644 index 0000000000..1f941534e2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024059C_84316C.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024059C_84316C +/* 84316C 8024059C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 843170 802405A0 AFB10024 */ sw $s1, 0x24($sp) +/* 843174 802405A4 0080882D */ daddu $s1, $a0, $zero +/* 843178 802405A8 3C05F840 */ lui $a1, 0xf840 +/* 84317C 802405AC AFBF0044 */ sw $ra, 0x44($sp) +/* 843180 802405B0 AFBE0040 */ sw $fp, 0x40($sp) +/* 843184 802405B4 AFB7003C */ sw $s7, 0x3c($sp) +/* 843188 802405B8 AFB60038 */ sw $s6, 0x38($sp) +/* 84318C 802405BC AFB50034 */ sw $s5, 0x34($sp) +/* 843190 802405C0 AFB40030 */ sw $s4, 0x30($sp) +/* 843194 802405C4 AFB3002C */ sw $s3, 0x2c($sp) +/* 843198 802405C8 AFB20028 */ sw $s2, 0x28($sp) +/* 84319C 802405CC AFB00020 */ sw $s0, 0x20($sp) +/* 8431A0 802405D0 8E3E0148 */ lw $fp, 0x148($s1) +/* 8431A4 802405D4 0C0B1EAF */ jal get_variable +/* 8431A8 802405D8 34A56268 */ ori $a1, $a1, 0x6268 +/* 8431AC 802405DC 0040802D */ daddu $s0, $v0, $zero +/* 8431B0 802405E0 0220202D */ daddu $a0, $s1, $zero +/* 8431B4 802405E4 3C05F840 */ lui $a1, 0xf840 +/* 8431B8 802405E8 0C0B1EAF */ jal get_variable +/* 8431BC 802405EC 34A56269 */ ori $a1, $a1, 0x6269 +/* 8431C0 802405F0 0040B82D */ daddu $s7, $v0, $zero +/* 8431C4 802405F4 0220202D */ daddu $a0, $s1, $zero +/* 8431C8 802405F8 3C05F5DE */ lui $a1, 0xf5de +/* 8431CC 802405FC 0C0B1EAF */ jal get_variable +/* 8431D0 80240600 34A502DE */ ori $a1, $a1, 0x2de +/* 8431D4 80240604 0040B02D */ daddu $s6, $v0, $zero +/* 8431D8 80240608 0220202D */ daddu $a0, $s1, $zero +/* 8431DC 8024060C 3C05F5DE */ lui $a1, 0xf5de +/* 8431E0 80240610 0C0B1EAF */ jal get_variable +/* 8431E4 80240614 34A502DF */ ori $a1, $a1, 0x2df +/* 8431E8 80240618 0040A82D */ daddu $s5, $v0, $zero +/* 8431EC 8024061C 93D3006D */ lbu $s3, 0x6d($fp) +/* 8431F0 80240620 32C2FFFF */ andi $v0, $s6, 0xffff +/* 8431F4 80240624 A7B30010 */ sh $s3, 0x10($sp) +/* 8431F8 80240628 93D2006E */ lbu $s2, 0x6e($fp) +/* 8431FC 8024062C 93C7006F */ lbu $a3, 0x6f($fp) +/* 843200 80240630 3274FFFF */ andi $s4, $s3, 0xffff +/* 843204 80240634 12820003 */ beq $s4, $v0, .L80240644 +/* 843208 80240638 A7A7001E */ sh $a3, 0x1e($sp) +/* 84320C 8024063C 0000B82D */ daddu $s7, $zero, $zero +/* 843210 80240640 02E0802D */ daddu $s0, $s7, $zero +.L80240644: +/* 843214 80240644 3202FFFF */ andi $v0, $s0, 0xffff +/* 843218 80240648 14400016 */ bnez $v0, .L802406A4 +/* 84321C 8024064C 0220202D */ daddu $a0, $s1, $zero +/* 843220 80240650 0C00A67F */ jal rand_int +/* 843224 80240654 24040064 */ addiu $a0, $zero, 0x64 +/* 843228 80240658 2842001E */ slti $v0, $v0, 0x1e +/* 84322C 8024065C 10400011 */ beqz $v0, .L802406A4 +/* 843230 80240660 0220202D */ daddu $a0, $s1, $zero +/* 843234 80240664 0C00A67F */ jal rand_int +/* 843238 80240668 2644FFFF */ addiu $a0, $s2, -1 +/* 84323C 8024066C 0040A82D */ daddu $s5, $v0, $zero +/* 843240 80240670 0260B02D */ daddu $s6, $s3, $zero +/* 843244 80240674 0220202D */ daddu $a0, $s1, $zero +/* 843248 80240678 3C05F5DE */ lui $a1, 0xf5de +/* 84324C 8024067C 34A502DE */ ori $a1, $a1, 0x2de +/* 843250 80240680 0C0B2026 */ jal set_variable +/* 843254 80240684 0280302D */ daddu $a2, $s4, $zero +/* 843258 80240688 0220202D */ daddu $a0, $s1, $zero +/* 84325C 8024068C 3C05F5DE */ lui $a1, 0xf5de +/* 843260 80240690 34A502DF */ ori $a1, $a1, 0x2df +/* 843264 80240694 0C0B2026 */ jal set_variable +/* 843268 80240698 32A6FFFF */ andi $a2, $s5, 0xffff +/* 84326C 8024069C 24100001 */ addiu $s0, $zero, 1 +/* 843270 802406A0 0220202D */ daddu $a0, $s1, $zero +.L802406A4: +/* 843274 802406A4 3C05F840 */ lui $a1, 0xf840 +/* 843278 802406A8 34A56268 */ ori $a1, $a1, 0x6268 +/* 84327C 802406AC 0C0B2026 */ jal set_variable +/* 843280 802406B0 3206FFFF */ andi $a2, $s0, 0xffff +/* 843284 802406B4 0220202D */ daddu $a0, $s1, $zero +/* 843288 802406B8 3C05F840 */ lui $a1, 0xf840 +/* 84328C 802406BC 34A56269 */ ori $a1, $a1, 0x6269 +/* 843290 802406C0 0C0B2026 */ jal set_variable +/* 843294 802406C4 32E6FFFF */ andi $a2, $s7, 0xffff +/* 843298 802406C8 0000202D */ daddu $a0, $zero, $zero +/* 84329C 802406CC 3C05F5DE */ lui $a1, 0xf5de +/* 8432A0 802406D0 0C0B1EAF */ jal get_variable +/* 8432A4 802406D4 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 8432A8 802406D8 0000202D */ daddu $a0, $zero, $zero +/* 8432AC 802406DC 3C05F5DE */ lui $a1, 0xf5de +/* 8432B0 802406E0 34A50180 */ ori $a1, $a1, 0x180 +/* 8432B4 802406E4 0C0B1EAF */ jal get_variable +/* 8432B8 802406E8 0040802D */ daddu $s0, $v0, $zero +/* 8432BC 802406EC 0040282D */ daddu $a1, $v0, $zero +/* 8432C0 802406F0 0000182D */ daddu $v1, $zero, $zero +/* 8432C4 802406F4 3C068024 */ lui $a2, 0x8024 +/* 8432C8 802406F8 24C6408C */ addiu $a2, $a2, 0x408c +/* 8432CC 802406FC 00C0202D */ daddu $a0, $a2, $zero +.L80240700: +/* 8432D0 80240700 8C820000 */ lw $v0, ($a0) +/* 8432D4 80240704 00A2102A */ slt $v0, $a1, $v0 +/* 8432D8 80240708 14400006 */ bnez $v0, .L80240724 +/* 8432DC 8024070C 000310C0 */ sll $v0, $v1, 3 +/* 8432E0 80240710 24630001 */ addiu $v1, $v1, 1 +/* 8432E4 80240714 28620008 */ slti $v0, $v1, 8 +/* 8432E8 80240718 1440FFF9 */ bnez $v0, .L80240700 +/* 8432EC 8024071C 24840008 */ addiu $a0, $a0, 8 +/* 8432F0 80240720 000310C0 */ sll $v0, $v1, 3 +.L80240724: +/* 8432F4 80240724 00461021 */ addu $v0, $v0, $a2 +/* 8432F8 80240728 8C420004 */ lw $v0, 4($v0) +/* 8432FC 8024072C 97A30010 */ lhu $v1, 0x10($sp) +/* 843300 80240730 0202202A */ slt $a0, $s0, $v0 +/* 843304 80240734 32C2FFFF */ andi $v0, $s6, 0xffff +/* 843308 80240738 14620008 */ bne $v1, $v0, .L8024075C +/* 84330C 8024073C 32A2FFFF */ andi $v0, $s5, 0xffff +/* 843310 80240740 97A7001E */ lhu $a3, 0x1e($sp) +/* 843314 80240744 14E20005 */ bne $a3, $v0, .L8024075C +/* 843318 80240748 32E2FFFF */ andi $v0, $s7, 0xffff +/* 84331C 8024074C 14400003 */ bnez $v0, .L8024075C +/* 843320 80240750 00000000 */ nop +/* 843324 80240754 14800008 */ bnez $a0, .L80240778 +/* 843328 80240758 24020001 */ addiu $v0, $zero, 1 +.L8024075C: +/* 84332C 8024075C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 843330 80240760 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 843334 80240764 80420075 */ lb $v0, 0x75($v0) +/* 843338 80240768 10400005 */ beqz $v0, .L80240780 +/* 84333C 8024076C 00000000 */ nop +/* 843340 80240770 10800003 */ beqz $a0, .L80240780 +/* 843344 80240774 24020001 */ addiu $v0, $zero, 1 +.L80240778: +/* 843348 80240778 080901E3 */ j .L8024078C +/* 84334C 8024077C AE220084 */ sw $v0, 0x84($s1) +.L80240780: +/* 843350 80240780 0C00F9EB */ jal kill_enemy +/* 843354 80240784 03C0202D */ daddu $a0, $fp, $zero +/* 843358 80240788 AE200084 */ sw $zero, 0x84($s1) +.L8024078C: +/* 84335C 8024078C 8FBF0044 */ lw $ra, 0x44($sp) +/* 843360 80240790 8FBE0040 */ lw $fp, 0x40($sp) +/* 843364 80240794 8FB7003C */ lw $s7, 0x3c($sp) +/* 843368 80240798 8FB60038 */ lw $s6, 0x38($sp) +/* 84336C 8024079C 8FB50034 */ lw $s5, 0x34($sp) +/* 843370 802407A0 8FB40030 */ lw $s4, 0x30($sp) +/* 843374 802407A4 8FB3002C */ lw $s3, 0x2c($sp) +/* 843378 802407A8 8FB20028 */ lw $s2, 0x28($sp) +/* 84337C 802407AC 8FB10024 */ lw $s1, 0x24($sp) +/* 843380 802407B0 8FB00020 */ lw $s0, 0x20($sp) +/* 843384 802407B4 24020002 */ addiu $v0, $zero, 2 +/* 843388 802407B8 03E00008 */ jr $ra +/* 84338C 802407BC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0.s deleted file mode 100644 index 1c3dccb920..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407C0 -/* 843390 802407C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 843394 802407C4 AFBF0014 */ sw $ra, 0x14($sp) -/* 843398 802407C8 AFB00010 */ sw $s0, 0x10($sp) -/* 84339C 802407CC 0C00EABB */ jal get_npc_unsafe -/* 8433A0 802407D0 8C84014C */ lw $a0, 0x14c($a0) -/* 8433A4 802407D4 24040008 */ addiu $a0, $zero, 8 -/* 8433A8 802407D8 0040802D */ daddu $s0, $v0, $zero -/* 8433AC 802407DC 3C028024 */ lui $v0, 0x8024 -/* 8433B0 802407E0 2442082C */ addiu $v0, $v0, 0x82c -/* 8433B4 802407E4 0C00AB39 */ jal heap_malloc -/* 8433B8 802407E8 AE020008 */ sw $v0, 8($s0) -/* 8433BC 802407EC 0040182D */ daddu $v1, $v0, $zero -/* 8433C0 802407F0 AE030020 */ sw $v1, 0x20($s0) -/* 8433C4 802407F4 AC600000 */ sw $zero, ($v1) -/* 8433C8 802407F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8433CC 802407FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8433D0 80240800 24020001 */ addiu $v0, $zero, 1 -/* 8433D4 80240804 03E00008 */ jr $ra -/* 8433D8 80240808 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s new file mode 100644 index 0000000000..d61a1aa388 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802407C0_843390.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407C0_843390 +/* 843390 802407C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 843394 802407C4 AFBF0014 */ sw $ra, 0x14($sp) +/* 843398 802407C8 AFB00010 */ sw $s0, 0x10($sp) +/* 84339C 802407CC 0C00EABB */ jal get_npc_unsafe +/* 8433A0 802407D0 8C84014C */ lw $a0, 0x14c($a0) +/* 8433A4 802407D4 24040008 */ addiu $a0, $zero, 8 +/* 8433A8 802407D8 0040802D */ daddu $s0, $v0, $zero +/* 8433AC 802407DC 3C028024 */ lui $v0, 0x8024 +/* 8433B0 802407E0 2442082C */ addiu $v0, $v0, 0x82c +/* 8433B4 802407E4 0C00AB39 */ jal heap_malloc +/* 8433B8 802407E8 AE020008 */ sw $v0, 8($s0) +/* 8433BC 802407EC 0040182D */ daddu $v1, $v0, $zero +/* 8433C0 802407F0 AE030020 */ sw $v1, 0x20($s0) +/* 8433C4 802407F4 AC600000 */ sw $zero, ($v1) +/* 8433C8 802407F8 8FBF0014 */ lw $ra, 0x14($sp) +/* 8433CC 802407FC 8FB00010 */ lw $s0, 0x10($sp) +/* 8433D0 80240800 24020001 */ addiu $v0, $zero, 1 +/* 8433D4 80240804 03E00008 */ jr $ra +/* 8433D8 80240808 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C.s deleted file mode 100644 index f1b2faeba0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024080C -/* 8433DC 8024080C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8433E0 80240810 AFBF0010 */ sw $ra, 0x10($sp) -/* 8433E4 80240814 0C00EABB */ jal get_npc_unsafe -/* 8433E8 80240818 8C84014C */ lw $a0, 0x14c($a0) -/* 8433EC 8024081C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8433F0 80240820 0000102D */ daddu $v0, $zero, $zero -/* 8433F4 80240824 03E00008 */ jr $ra -/* 8433F8 80240828 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s new file mode 100644 index 0000000000..c28c31c70b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024080C_8433DC +/* 8433DC 8024080C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8433E0 80240810 AFBF0010 */ sw $ra, 0x10($sp) +/* 8433E4 80240814 0C00EABB */ jal get_npc_unsafe +/* 8433E8 80240818 8C84014C */ lw $a0, 0x14c($a0) +/* 8433EC 8024081C 8FBF0010 */ lw $ra, 0x10($sp) +/* 8433F0 80240820 0000102D */ daddu $v0, $zero, $zero +/* 8433F4 80240824 03E00008 */ jr $ra +/* 8433F8 80240828 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C.s deleted file mode 100644 index c72855c9fe..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024082C -/* 8433FC 8024082C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 843400 80240830 3C03800A */ lui $v1, 0x800a -/* 843404 80240834 8463A634 */ lh $v1, -0x59cc($v1) -/* 843408 80240838 3C05800B */ lui $a1, %hi(gCameras) -/* 84340C 8024083C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 843410 80240840 AFBF0010 */ sw $ra, 0x10($sp) -/* 843414 80240844 00031080 */ sll $v0, $v1, 2 -/* 843418 80240848 00431021 */ addu $v0, $v0, $v1 -/* 84341C 8024084C 00021080 */ sll $v0, $v0, 2 -/* 843420 80240850 00431023 */ subu $v0, $v0, $v1 -/* 843424 80240854 000218C0 */ sll $v1, $v0, 3 -/* 843428 80240858 00431021 */ addu $v0, $v0, $v1 -/* 84342C 8024085C 8C830020 */ lw $v1, 0x20($a0) -/* 843430 80240860 000210C0 */ sll $v0, $v0, 3 -/* 843434 80240864 8C630000 */ lw $v1, ($v1) -/* 843438 80240868 30630001 */ andi $v1, $v1, 1 -/* 84343C 8024086C 10600004 */ beqz $v1, .L80240880 -/* 843440 80240870 00451021 */ addu $v0, $v0, $a1 -/* 843444 80240874 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 843448 80240878 0C00A6C9 */ jal clamp_angle -/* 84344C 8024087C 46006307 */ neg.s $f12, $f12 -.L80240880: -/* 843450 80240880 8FBF0010 */ lw $ra, 0x10($sp) -/* 843454 80240884 03E00008 */ jr $ra -/* 843458 80240888 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s new file mode 100644 index 0000000000..b1d984ac9f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024082C_8433FC.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024082C_8433FC +/* 8433FC 8024082C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 843400 80240830 3C03800A */ lui $v1, 0x800a +/* 843404 80240834 8463A634 */ lh $v1, -0x59cc($v1) +/* 843408 80240838 3C05800B */ lui $a1, %hi(gCameras) +/* 84340C 8024083C 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 843410 80240840 AFBF0010 */ sw $ra, 0x10($sp) +/* 843414 80240844 00031080 */ sll $v0, $v1, 2 +/* 843418 80240848 00431021 */ addu $v0, $v0, $v1 +/* 84341C 8024084C 00021080 */ sll $v0, $v0, 2 +/* 843420 80240850 00431023 */ subu $v0, $v0, $v1 +/* 843424 80240854 000218C0 */ sll $v1, $v0, 3 +/* 843428 80240858 00431021 */ addu $v0, $v0, $v1 +/* 84342C 8024085C 8C830020 */ lw $v1, 0x20($a0) +/* 843430 80240860 000210C0 */ sll $v0, $v0, 3 +/* 843434 80240864 8C630000 */ lw $v1, ($v1) +/* 843438 80240868 30630001 */ andi $v1, $v1, 1 +/* 84343C 8024086C 10600004 */ beqz $v1, .L80240880 +/* 843440 80240870 00451021 */ addu $v0, $v0, $a1 +/* 843444 80240874 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 843448 80240878 0C00A6C9 */ jal clamp_angle +/* 84344C 8024087C 46006307 */ neg.s $f12, $f12 +.L80240880: +/* 843450 80240880 8FBF0010 */ lw $ra, 0x10($sp) +/* 843454 80240884 03E00008 */ jr $ra +/* 843458 80240888 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C.s deleted file mode 100644 index ef50e45286..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024088C -/* 84345C 8024088C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 843460 80240890 AFB10014 */ sw $s1, 0x14($sp) -/* 843464 80240894 0080882D */ daddu $s1, $a0, $zero -/* 843468 80240898 AFBF0024 */ sw $ra, 0x24($sp) -/* 84346C 8024089C AFB40020 */ sw $s4, 0x20($sp) -/* 843470 802408A0 AFB3001C */ sw $s3, 0x1c($sp) -/* 843474 802408A4 AFB20018 */ sw $s2, 0x18($sp) -/* 843478 802408A8 10A00033 */ beqz $a1, .L80240978 -/* 84347C 802408AC AFB00010 */ sw $s0, 0x10($sp) -/* 843480 802408B0 0C04760B */ jal func_8011D82C -/* 843484 802408B4 24040001 */ addiu $a0, $zero, 1 -/* 843488 802408B8 0000202D */ daddu $a0, $zero, $zero -/* 84348C 802408BC 0080282D */ daddu $a1, $a0, $zero -/* 843490 802408C0 0080302D */ daddu $a2, $a0, $zero -/* 843494 802408C4 0080382D */ daddu $a3, $a0, $zero -/* 843498 802408C8 0080802D */ daddu $s0, $a0, $zero -/* 84349C 802408CC 2414FFFC */ addiu $s4, $zero, -4 -/* 8434A0 802408D0 24130014 */ addiu $s3, $zero, 0x14 -/* 8434A4 802408D4 3C120080 */ lui $s2, 0x80 -/* 8434A8 802408D8 3C038015 */ lui $v1, 0x8015 -/* 8434AC 802408DC 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 8434B0 802408E0 24020001 */ addiu $v0, $zero, 1 -/* 8434B4 802408E4 0C046F97 */ jal set_background_color_blend -/* 8434B8 802408E8 A0620000 */ sb $v0, ($v1) -.L802408EC: -/* 8434BC 802408EC 0C00E2B7 */ jal get_npc_by_index -/* 8434C0 802408F0 0200202D */ daddu $a0, $s0, $zero -/* 8434C4 802408F4 0040202D */ daddu $a0, $v0, $zero -/* 8434C8 802408F8 5080000B */ beql $a0, $zero, .L80240928 -/* 8434CC 802408FC 26100001 */ addiu $s0, $s0, 1 -/* 8434D0 80240900 8C820000 */ lw $v0, ($a0) -/* 8434D4 80240904 50400008 */ beql $v0, $zero, .L80240928 -/* 8434D8 80240908 26100001 */ addiu $s0, $s0, 1 -/* 8434DC 8024090C 808300A4 */ lb $v1, 0xa4($a0) -/* 8434E0 80240910 10740005 */ beq $v1, $s4, .L80240928 -/* 8434E4 80240914 26100001 */ addiu $s0, $s0, 1 -/* 8434E8 80240918 10730003 */ beq $v1, $s3, .L80240928 -/* 8434EC 8024091C 00000000 */ nop -/* 8434F0 80240920 00521025 */ or $v0, $v0, $s2 -/* 8434F4 80240924 AC820000 */ sw $v0, ($a0) -.L80240928: -/* 8434F8 80240928 2A020040 */ slti $v0, $s0, 0x40 -/* 8434FC 8024092C 1440FFEF */ bnez $v0, .L802408EC -/* 843500 80240930 00000000 */ nop -/* 843504 80240934 0000802D */ daddu $s0, $zero, $zero -/* 843508 80240938 3C120800 */ lui $s2, 0x800 -.L8024093C: -/* 84350C 8024093C 0C04C3D6 */ jal get_item_entity -/* 843510 80240940 0200202D */ daddu $a0, $s0, $zero -/* 843514 80240944 0040182D */ daddu $v1, $v0, $zero -/* 843518 80240948 10600007 */ beqz $v1, .L80240968 -/* 84351C 8024094C 26100001 */ addiu $s0, $s0, 1 -/* 843520 80240950 8C640000 */ lw $a0, ($v1) -/* 843524 80240954 30820010 */ andi $v0, $a0, 0x10 -/* 843528 80240958 10400003 */ beqz $v0, .L80240968 -/* 84352C 8024095C 00000000 */ nop -/* 843530 80240960 00921025 */ or $v0, $a0, $s2 -/* 843534 80240964 AC620000 */ sw $v0, ($v1) -.L80240968: -/* 843538 80240968 2A020100 */ slti $v0, $s0, 0x100 -/* 84353C 8024096C 1440FFF3 */ bnez $v0, .L8024093C -/* 843540 80240970 00000000 */ nop -/* 843544 80240974 AE200070 */ sw $zero, 0x70($s1) -.L80240978: -/* 843548 80240978 8E220070 */ lw $v0, 0x70($s1) -/* 84354C 8024097C 24420008 */ addiu $v0, $v0, 8 -/* 843550 80240980 AE220070 */ sw $v0, 0x70($s1) -/* 843554 80240984 28420100 */ slti $v0, $v0, 0x100 -/* 843558 80240988 14400003 */ bnez $v0, .L80240998 -/* 84355C 8024098C 0000202D */ daddu $a0, $zero, $zero -/* 843560 80240990 240200FF */ addiu $v0, $zero, 0xff -/* 843564 80240994 AE220070 */ sw $v0, 0x70($s1) -.L80240998: -/* 843568 80240998 0080282D */ daddu $a1, $a0, $zero -/* 84356C 8024099C 92270073 */ lbu $a3, 0x73($s1) -/* 843570 802409A0 0C046F97 */ jal set_background_color_blend -/* 843574 802409A4 0080302D */ daddu $a2, $a0, $zero -/* 843578 802409A8 8E220070 */ lw $v0, 0x70($s1) -/* 84357C 802409AC 8FBF0024 */ lw $ra, 0x24($sp) -/* 843580 802409B0 8FB40020 */ lw $s4, 0x20($sp) -/* 843584 802409B4 8FB3001C */ lw $s3, 0x1c($sp) -/* 843588 802409B8 8FB20018 */ lw $s2, 0x18($sp) -/* 84358C 802409BC 8FB10014 */ lw $s1, 0x14($sp) -/* 843590 802409C0 8FB00010 */ lw $s0, 0x10($sp) -/* 843594 802409C4 384200FF */ xori $v0, $v0, 0xff -/* 843598 802409C8 2C420001 */ sltiu $v0, $v0, 1 -/* 84359C 802409CC 00021040 */ sll $v0, $v0, 1 -/* 8435A0 802409D0 03E00008 */ jr $ra -/* 8435A4 802409D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s new file mode 100644 index 0000000000..736d2d82ed --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024088C_84345C.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024088C_84345C +/* 84345C 8024088C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 843460 80240890 AFB10014 */ sw $s1, 0x14($sp) +/* 843464 80240894 0080882D */ daddu $s1, $a0, $zero +/* 843468 80240898 AFBF0024 */ sw $ra, 0x24($sp) +/* 84346C 8024089C AFB40020 */ sw $s4, 0x20($sp) +/* 843470 802408A0 AFB3001C */ sw $s3, 0x1c($sp) +/* 843474 802408A4 AFB20018 */ sw $s2, 0x18($sp) +/* 843478 802408A8 10A00033 */ beqz $a1, .L80240978 +/* 84347C 802408AC AFB00010 */ sw $s0, 0x10($sp) +/* 843480 802408B0 0C04760B */ jal func_8011D82C +/* 843484 802408B4 24040001 */ addiu $a0, $zero, 1 +/* 843488 802408B8 0000202D */ daddu $a0, $zero, $zero +/* 84348C 802408BC 0080282D */ daddu $a1, $a0, $zero +/* 843490 802408C0 0080302D */ daddu $a2, $a0, $zero +/* 843494 802408C4 0080382D */ daddu $a3, $a0, $zero +/* 843498 802408C8 0080802D */ daddu $s0, $a0, $zero +/* 84349C 802408CC 2414FFFC */ addiu $s4, $zero, -4 +/* 8434A0 802408D0 24130014 */ addiu $s3, $zero, 0x14 +/* 8434A4 802408D4 3C120080 */ lui $s2, 0x80 +/* 8434A8 802408D8 3C038015 */ lui $v1, 0x8015 +/* 8434AC 802408DC 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 8434B0 802408E0 24020001 */ addiu $v0, $zero, 1 +/* 8434B4 802408E4 0C046F97 */ jal set_background_color_blend +/* 8434B8 802408E8 A0620000 */ sb $v0, ($v1) +.L802408EC: +/* 8434BC 802408EC 0C00E2B7 */ jal get_npc_by_index +/* 8434C0 802408F0 0200202D */ daddu $a0, $s0, $zero +/* 8434C4 802408F4 0040202D */ daddu $a0, $v0, $zero +/* 8434C8 802408F8 5080000B */ beql $a0, $zero, .L80240928 +/* 8434CC 802408FC 26100001 */ addiu $s0, $s0, 1 +/* 8434D0 80240900 8C820000 */ lw $v0, ($a0) +/* 8434D4 80240904 50400008 */ beql $v0, $zero, .L80240928 +/* 8434D8 80240908 26100001 */ addiu $s0, $s0, 1 +/* 8434DC 8024090C 808300A4 */ lb $v1, 0xa4($a0) +/* 8434E0 80240910 10740005 */ beq $v1, $s4, .L80240928 +/* 8434E4 80240914 26100001 */ addiu $s0, $s0, 1 +/* 8434E8 80240918 10730003 */ beq $v1, $s3, .L80240928 +/* 8434EC 8024091C 00000000 */ nop +/* 8434F0 80240920 00521025 */ or $v0, $v0, $s2 +/* 8434F4 80240924 AC820000 */ sw $v0, ($a0) +.L80240928: +/* 8434F8 80240928 2A020040 */ slti $v0, $s0, 0x40 +/* 8434FC 8024092C 1440FFEF */ bnez $v0, .L802408EC +/* 843500 80240930 00000000 */ nop +/* 843504 80240934 0000802D */ daddu $s0, $zero, $zero +/* 843508 80240938 3C120800 */ lui $s2, 0x800 +.L8024093C: +/* 84350C 8024093C 0C04C3D6 */ jal get_item_entity +/* 843510 80240940 0200202D */ daddu $a0, $s0, $zero +/* 843514 80240944 0040182D */ daddu $v1, $v0, $zero +/* 843518 80240948 10600007 */ beqz $v1, .L80240968 +/* 84351C 8024094C 26100001 */ addiu $s0, $s0, 1 +/* 843520 80240950 8C640000 */ lw $a0, ($v1) +/* 843524 80240954 30820010 */ andi $v0, $a0, 0x10 +/* 843528 80240958 10400003 */ beqz $v0, .L80240968 +/* 84352C 8024095C 00000000 */ nop +/* 843530 80240960 00921025 */ or $v0, $a0, $s2 +/* 843534 80240964 AC620000 */ sw $v0, ($v1) +.L80240968: +/* 843538 80240968 2A020100 */ slti $v0, $s0, 0x100 +/* 84353C 8024096C 1440FFF3 */ bnez $v0, .L8024093C +/* 843540 80240970 00000000 */ nop +/* 843544 80240974 AE200070 */ sw $zero, 0x70($s1) +.L80240978: +/* 843548 80240978 8E220070 */ lw $v0, 0x70($s1) +/* 84354C 8024097C 24420008 */ addiu $v0, $v0, 8 +/* 843550 80240980 AE220070 */ sw $v0, 0x70($s1) +/* 843554 80240984 28420100 */ slti $v0, $v0, 0x100 +/* 843558 80240988 14400003 */ bnez $v0, .L80240998 +/* 84355C 8024098C 0000202D */ daddu $a0, $zero, $zero +/* 843560 80240990 240200FF */ addiu $v0, $zero, 0xff +/* 843564 80240994 AE220070 */ sw $v0, 0x70($s1) +.L80240998: +/* 843568 80240998 0080282D */ daddu $a1, $a0, $zero +/* 84356C 8024099C 92270073 */ lbu $a3, 0x73($s1) +/* 843570 802409A0 0C046F97 */ jal set_background_color_blend +/* 843574 802409A4 0080302D */ daddu $a2, $a0, $zero +/* 843578 802409A8 8E220070 */ lw $v0, 0x70($s1) +/* 84357C 802409AC 8FBF0024 */ lw $ra, 0x24($sp) +/* 843580 802409B0 8FB40020 */ lw $s4, 0x20($sp) +/* 843584 802409B4 8FB3001C */ lw $s3, 0x1c($sp) +/* 843588 802409B8 8FB20018 */ lw $s2, 0x18($sp) +/* 84358C 802409BC 8FB10014 */ lw $s1, 0x14($sp) +/* 843590 802409C0 8FB00010 */ lw $s0, 0x10($sp) +/* 843594 802409C4 384200FF */ xori $v0, $v0, 0xff +/* 843598 802409C8 2C420001 */ sltiu $v0, $v0, 1 +/* 84359C 802409CC 00021040 */ sll $v0, $v0, 1 +/* 8435A0 802409D0 03E00008 */ jr $ra +/* 8435A4 802409D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8.s deleted file mode 100644 index dd532b0591..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409D8 -/* 8435A8 802409D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8435AC 802409DC AFB00010 */ sw $s0, 0x10($sp) -/* 8435B0 802409E0 0080802D */ daddu $s0, $a0, $zero -/* 8435B4 802409E4 AFBF0020 */ sw $ra, 0x20($sp) -/* 8435B8 802409E8 AFB3001C */ sw $s3, 0x1c($sp) -/* 8435BC 802409EC AFB20018 */ sw $s2, 0x18($sp) -/* 8435C0 802409F0 10A00009 */ beqz $a1, .L80240A18 -/* 8435C4 802409F4 AFB10014 */ sw $s1, 0x14($sp) -/* 8435C8 802409F8 0000202D */ daddu $a0, $zero, $zero -/* 8435CC 802409FC 0080282D */ daddu $a1, $a0, $zero -/* 8435D0 80240A00 0080302D */ daddu $a2, $a0, $zero -/* 8435D4 80240A04 0C046F97 */ jal set_background_color_blend -/* 8435D8 80240A08 240700FF */ addiu $a3, $zero, 0xff -/* 8435DC 80240A0C 240200FF */ addiu $v0, $zero, 0xff -/* 8435E0 80240A10 AE020070 */ sw $v0, 0x70($s0) -/* 8435E4 80240A14 AE000074 */ sw $zero, 0x74($s0) -.L80240A18: -/* 8435E8 80240A18 8E020070 */ lw $v0, 0x70($s0) -/* 8435EC 80240A1C 2442FFF8 */ addiu $v0, $v0, -8 -/* 8435F0 80240A20 04410002 */ bgez $v0, .L80240A2C -/* 8435F4 80240A24 AE020070 */ sw $v0, 0x70($s0) -/* 8435F8 80240A28 AE000070 */ sw $zero, 0x70($s0) -.L80240A2C: -/* 8435FC 80240A2C 0000202D */ daddu $a0, $zero, $zero -/* 843600 80240A30 0080282D */ daddu $a1, $a0, $zero -/* 843604 80240A34 92070073 */ lbu $a3, 0x73($s0) -/* 843608 80240A38 0C046F97 */ jal set_background_color_blend -/* 84360C 80240A3C 0080302D */ daddu $a2, $a0, $zero -/* 843610 80240A40 8E020070 */ lw $v0, 0x70($s0) -/* 843614 80240A44 14400006 */ bnez $v0, .L80240A60 -/* 843618 80240A48 00000000 */ nop -/* 84361C 80240A4C 8E020074 */ lw $v0, 0x74($s0) -/* 843620 80240A50 14400003 */ bnez $v0, .L80240A60 -/* 843624 80240A54 24020001 */ addiu $v0, $zero, 1 -/* 843628 80240A58 080902CB */ j .L80240B2C -/* 84362C 80240A5C AE020074 */ sw $v0, 0x74($s0) -.L80240A60: -/* 843630 80240A60 8E030074 */ lw $v1, 0x74($s0) -/* 843634 80240A64 24020001 */ addiu $v0, $zero, 1 -/* 843638 80240A68 14620031 */ bne $v1, $v0, .L80240B30 -/* 84363C 80240A6C 0000102D */ daddu $v0, $zero, $zero -/* 843640 80240A70 0C04760B */ jal func_8011D82C -/* 843644 80240A74 0000202D */ daddu $a0, $zero, $zero -/* 843648 80240A78 0000802D */ daddu $s0, $zero, $zero -/* 84364C 80240A7C 2413FFFC */ addiu $s3, $zero, -4 -/* 843650 80240A80 24120014 */ addiu $s2, $zero, 0x14 -/* 843654 80240A84 3C11FF7F */ lui $s1, 0xff7f -/* 843658 80240A88 3C028015 */ lui $v0, 0x8015 -/* 84365C 80240A8C 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 843660 80240A90 3631FFFF */ ori $s1, $s1, 0xffff -/* 843664 80240A94 A0400000 */ sb $zero, ($v0) -.L80240A98: -/* 843668 80240A98 0C00E2B7 */ jal get_npc_by_index -/* 84366C 80240A9C 0200202D */ daddu $a0, $s0, $zero -/* 843670 80240AA0 0040202D */ daddu $a0, $v0, $zero -/* 843674 80240AA4 5080000B */ beql $a0, $zero, .L80240AD4 -/* 843678 80240AA8 26100001 */ addiu $s0, $s0, 1 -/* 84367C 80240AAC 8C820000 */ lw $v0, ($a0) -/* 843680 80240AB0 50400008 */ beql $v0, $zero, .L80240AD4 -/* 843684 80240AB4 26100001 */ addiu $s0, $s0, 1 -/* 843688 80240AB8 808300A4 */ lb $v1, 0xa4($a0) -/* 84368C 80240ABC 10730005 */ beq $v1, $s3, .L80240AD4 -/* 843690 80240AC0 26100001 */ addiu $s0, $s0, 1 -/* 843694 80240AC4 10720003 */ beq $v1, $s2, .L80240AD4 -/* 843698 80240AC8 00000000 */ nop -/* 84369C 80240ACC 00511024 */ and $v0, $v0, $s1 -/* 8436A0 80240AD0 AC820000 */ sw $v0, ($a0) -.L80240AD4: -/* 8436A4 80240AD4 2A020040 */ slti $v0, $s0, 0x40 -/* 8436A8 80240AD8 1440FFEF */ bnez $v0, .L80240A98 -/* 8436AC 80240ADC 00000000 */ nop -/* 8436B0 80240AE0 0000802D */ daddu $s0, $zero, $zero -/* 8436B4 80240AE4 3C11F7FF */ lui $s1, 0xf7ff -/* 8436B8 80240AE8 3631FFFF */ ori $s1, $s1, 0xffff -.L80240AEC: -/* 8436BC 80240AEC 0C04C3D6 */ jal get_item_entity -/* 8436C0 80240AF0 0200202D */ daddu $a0, $s0, $zero -/* 8436C4 80240AF4 0040182D */ daddu $v1, $v0, $zero -/* 8436C8 80240AF8 10600007 */ beqz $v1, .L80240B18 -/* 8436CC 80240AFC 26100001 */ addiu $s0, $s0, 1 -/* 8436D0 80240B00 8C640000 */ lw $a0, ($v1) -/* 8436D4 80240B04 30820010 */ andi $v0, $a0, 0x10 -/* 8436D8 80240B08 10400003 */ beqz $v0, .L80240B18 -/* 8436DC 80240B0C 00000000 */ nop -/* 8436E0 80240B10 00911024 */ and $v0, $a0, $s1 -/* 8436E4 80240B14 AC620000 */ sw $v0, ($v1) -.L80240B18: -/* 8436E8 80240B18 2A020100 */ slti $v0, $s0, 0x100 -/* 8436EC 80240B1C 1440FFF3 */ bnez $v0, .L80240AEC -/* 8436F0 80240B20 24020002 */ addiu $v0, $zero, 2 -/* 8436F4 80240B24 080902CC */ j .L80240B30 -/* 8436F8 80240B28 00000000 */ nop -.L80240B2C: -/* 8436FC 80240B2C 0000102D */ daddu $v0, $zero, $zero -.L80240B30: -/* 843700 80240B30 8FBF0020 */ lw $ra, 0x20($sp) -/* 843704 80240B34 8FB3001C */ lw $s3, 0x1c($sp) -/* 843708 80240B38 8FB20018 */ lw $s2, 0x18($sp) -/* 84370C 80240B3C 8FB10014 */ lw $s1, 0x14($sp) -/* 843710 80240B40 8FB00010 */ lw $s0, 0x10($sp) -/* 843714 80240B44 03E00008 */ jr $ra -/* 843718 80240B48 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s new file mode 100644 index 0000000000..998d25689f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802409D8_8435A8.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409D8_8435A8 +/* 8435A8 802409D8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8435AC 802409DC AFB00010 */ sw $s0, 0x10($sp) +/* 8435B0 802409E0 0080802D */ daddu $s0, $a0, $zero +/* 8435B4 802409E4 AFBF0020 */ sw $ra, 0x20($sp) +/* 8435B8 802409E8 AFB3001C */ sw $s3, 0x1c($sp) +/* 8435BC 802409EC AFB20018 */ sw $s2, 0x18($sp) +/* 8435C0 802409F0 10A00009 */ beqz $a1, .L80240A18 +/* 8435C4 802409F4 AFB10014 */ sw $s1, 0x14($sp) +/* 8435C8 802409F8 0000202D */ daddu $a0, $zero, $zero +/* 8435CC 802409FC 0080282D */ daddu $a1, $a0, $zero +/* 8435D0 80240A00 0080302D */ daddu $a2, $a0, $zero +/* 8435D4 80240A04 0C046F97 */ jal set_background_color_blend +/* 8435D8 80240A08 240700FF */ addiu $a3, $zero, 0xff +/* 8435DC 80240A0C 240200FF */ addiu $v0, $zero, 0xff +/* 8435E0 80240A10 AE020070 */ sw $v0, 0x70($s0) +/* 8435E4 80240A14 AE000074 */ sw $zero, 0x74($s0) +.L80240A18: +/* 8435E8 80240A18 8E020070 */ lw $v0, 0x70($s0) +/* 8435EC 80240A1C 2442FFF8 */ addiu $v0, $v0, -8 +/* 8435F0 80240A20 04410002 */ bgez $v0, .L80240A2C +/* 8435F4 80240A24 AE020070 */ sw $v0, 0x70($s0) +/* 8435F8 80240A28 AE000070 */ sw $zero, 0x70($s0) +.L80240A2C: +/* 8435FC 80240A2C 0000202D */ daddu $a0, $zero, $zero +/* 843600 80240A30 0080282D */ daddu $a1, $a0, $zero +/* 843604 80240A34 92070073 */ lbu $a3, 0x73($s0) +/* 843608 80240A38 0C046F97 */ jal set_background_color_blend +/* 84360C 80240A3C 0080302D */ daddu $a2, $a0, $zero +/* 843610 80240A40 8E020070 */ lw $v0, 0x70($s0) +/* 843614 80240A44 14400006 */ bnez $v0, .L80240A60 +/* 843618 80240A48 00000000 */ nop +/* 84361C 80240A4C 8E020074 */ lw $v0, 0x74($s0) +/* 843620 80240A50 14400003 */ bnez $v0, .L80240A60 +/* 843624 80240A54 24020001 */ addiu $v0, $zero, 1 +/* 843628 80240A58 080902CB */ j .L80240B2C +/* 84362C 80240A5C AE020074 */ sw $v0, 0x74($s0) +.L80240A60: +/* 843630 80240A60 8E030074 */ lw $v1, 0x74($s0) +/* 843634 80240A64 24020001 */ addiu $v0, $zero, 1 +/* 843638 80240A68 14620031 */ bne $v1, $v0, .L80240B30 +/* 84363C 80240A6C 0000102D */ daddu $v0, $zero, $zero +/* 843640 80240A70 0C04760B */ jal func_8011D82C +/* 843644 80240A74 0000202D */ daddu $a0, $zero, $zero +/* 843648 80240A78 0000802D */ daddu $s0, $zero, $zero +/* 84364C 80240A7C 2413FFFC */ addiu $s3, $zero, -4 +/* 843650 80240A80 24120014 */ addiu $s2, $zero, 0x14 +/* 843654 80240A84 3C11FF7F */ lui $s1, 0xff7f +/* 843658 80240A88 3C028015 */ lui $v0, 0x8015 +/* 84365C 80240A8C 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 843660 80240A90 3631FFFF */ ori $s1, $s1, 0xffff +/* 843664 80240A94 A0400000 */ sb $zero, ($v0) +.L80240A98: +/* 843668 80240A98 0C00E2B7 */ jal get_npc_by_index +/* 84366C 80240A9C 0200202D */ daddu $a0, $s0, $zero +/* 843670 80240AA0 0040202D */ daddu $a0, $v0, $zero +/* 843674 80240AA4 5080000B */ beql $a0, $zero, .L80240AD4 +/* 843678 80240AA8 26100001 */ addiu $s0, $s0, 1 +/* 84367C 80240AAC 8C820000 */ lw $v0, ($a0) +/* 843680 80240AB0 50400008 */ beql $v0, $zero, .L80240AD4 +/* 843684 80240AB4 26100001 */ addiu $s0, $s0, 1 +/* 843688 80240AB8 808300A4 */ lb $v1, 0xa4($a0) +/* 84368C 80240ABC 10730005 */ beq $v1, $s3, .L80240AD4 +/* 843690 80240AC0 26100001 */ addiu $s0, $s0, 1 +/* 843694 80240AC4 10720003 */ beq $v1, $s2, .L80240AD4 +/* 843698 80240AC8 00000000 */ nop +/* 84369C 80240ACC 00511024 */ and $v0, $v0, $s1 +/* 8436A0 80240AD0 AC820000 */ sw $v0, ($a0) +.L80240AD4: +/* 8436A4 80240AD4 2A020040 */ slti $v0, $s0, 0x40 +/* 8436A8 80240AD8 1440FFEF */ bnez $v0, .L80240A98 +/* 8436AC 80240ADC 00000000 */ nop +/* 8436B0 80240AE0 0000802D */ daddu $s0, $zero, $zero +/* 8436B4 80240AE4 3C11F7FF */ lui $s1, 0xf7ff +/* 8436B8 80240AE8 3631FFFF */ ori $s1, $s1, 0xffff +.L80240AEC: +/* 8436BC 80240AEC 0C04C3D6 */ jal get_item_entity +/* 8436C0 80240AF0 0200202D */ daddu $a0, $s0, $zero +/* 8436C4 80240AF4 0040182D */ daddu $v1, $v0, $zero +/* 8436C8 80240AF8 10600007 */ beqz $v1, .L80240B18 +/* 8436CC 80240AFC 26100001 */ addiu $s0, $s0, 1 +/* 8436D0 80240B00 8C640000 */ lw $a0, ($v1) +/* 8436D4 80240B04 30820010 */ andi $v0, $a0, 0x10 +/* 8436D8 80240B08 10400003 */ beqz $v0, .L80240B18 +/* 8436DC 80240B0C 00000000 */ nop +/* 8436E0 80240B10 00911024 */ and $v0, $a0, $s1 +/* 8436E4 80240B14 AC620000 */ sw $v0, ($v1) +.L80240B18: +/* 8436E8 80240B18 2A020100 */ slti $v0, $s0, 0x100 +/* 8436EC 80240B1C 1440FFF3 */ bnez $v0, .L80240AEC +/* 8436F0 80240B20 24020002 */ addiu $v0, $zero, 2 +/* 8436F4 80240B24 080902CC */ j .L80240B30 +/* 8436F8 80240B28 00000000 */ nop +.L80240B2C: +/* 8436FC 80240B2C 0000102D */ daddu $v0, $zero, $zero +.L80240B30: +/* 843700 80240B30 8FBF0020 */ lw $ra, 0x20($sp) +/* 843704 80240B34 8FB3001C */ lw $s3, 0x1c($sp) +/* 843708 80240B38 8FB20018 */ lw $s2, 0x18($sp) +/* 84370C 80240B3C 8FB10014 */ lw $s1, 0x14($sp) +/* 843710 80240B40 8FB00010 */ lw $s0, 0x10($sp) +/* 843714 80240B44 03E00008 */ jr $ra +/* 843718 80240B48 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C.s deleted file mode 100644 index da52257e94..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B4C -/* 84371C 80240B4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 843720 80240B50 AFB00010 */ sw $s0, 0x10($sp) -/* 843724 80240B54 3C108011 */ lui $s0, %hi(gPlayerData) -/* 843728 80240B58 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 84372C 80240B5C AFBF0018 */ sw $ra, 0x18($sp) -/* 843730 80240B60 AFB10014 */ sw $s1, 0x14($sp) -/* 843734 80240B64 960302C0 */ lhu $v1, 0x2c0($s0) -/* 843738 80240B68 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 84373C 80240B6C 10400003 */ beqz $v0, .L80240B7C -/* 843740 80240B70 0080882D */ daddu $s1, $a0, $zero -/* 843744 80240B74 24620001 */ addiu $v0, $v1, 1 -/* 843748 80240B78 A60202C0 */ sh $v0, 0x2c0($s0) -.L80240B7C: -/* 84374C 80240B7C 3C05F5DE */ lui $a1, 0xf5de -/* 843750 80240B80 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 843754 80240B84 0C0B1EAF */ jal get_variable -/* 843758 80240B88 0000202D */ daddu $a0, $zero, $zero -/* 84375C 80240B8C 3C038024 */ lui $v1, 0x8024 -/* 843760 80240B90 00621821 */ addu $v1, $v1, $v0 -/* 843764 80240B94 9063404C */ lbu $v1, 0x404c($v1) -/* 843768 80240B98 8E220084 */ lw $v0, 0x84($s1) -/* 84376C 80240B9C 54430006 */ bnel $v0, $v1, .L80240BB8 -/* 843770 80240BA0 AE200084 */ sw $zero, 0x84($s1) -/* 843774 80240BA4 24020001 */ addiu $v0, $zero, 1 -/* 843778 80240BA8 AE220084 */ sw $v0, 0x84($s1) -/* 84377C 80240BAC 960202C2 */ lhu $v0, 0x2c2($s0) -/* 843780 80240BB0 24420001 */ addiu $v0, $v0, 1 -/* 843784 80240BB4 A60202C2 */ sh $v0, 0x2c2($s0) -.L80240BB8: -/* 843788 80240BB8 8FBF0018 */ lw $ra, 0x18($sp) -/* 84378C 80240BBC 8FB10014 */ lw $s1, 0x14($sp) -/* 843790 80240BC0 8FB00010 */ lw $s0, 0x10($sp) -/* 843794 80240BC4 24020002 */ addiu $v0, $zero, 2 -/* 843798 80240BC8 03E00008 */ jr $ra -/* 84379C 80240BCC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C_84371C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C_84371C.s new file mode 100644 index 0000000000..5bd45a8ada --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240B4C_84371C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B4C_84371C +/* 84371C 80240B4C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 843720 80240B50 AFB00010 */ sw $s0, 0x10($sp) +/* 843724 80240B54 3C108011 */ lui $s0, %hi(gPlayerData) +/* 843728 80240B58 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 84372C 80240B5C AFBF0018 */ sw $ra, 0x18($sp) +/* 843730 80240B60 AFB10014 */ sw $s1, 0x14($sp) +/* 843734 80240B64 960302C0 */ lhu $v1, 0x2c0($s0) +/* 843738 80240B68 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 84373C 80240B6C 10400003 */ beqz $v0, .L80240B7C +/* 843740 80240B70 0080882D */ daddu $s1, $a0, $zero +/* 843744 80240B74 24620001 */ addiu $v0, $v1, 1 +/* 843748 80240B78 A60202C0 */ sh $v0, 0x2c0($s0) +.L80240B7C: +/* 84374C 80240B7C 3C05F5DE */ lui $a1, 0xf5de +/* 843750 80240B80 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 843754 80240B84 0C0B1EAF */ jal get_variable +/* 843758 80240B88 0000202D */ daddu $a0, $zero, $zero +/* 84375C 80240B8C 3C038024 */ lui $v1, 0x8024 +/* 843760 80240B90 00621821 */ addu $v1, $v1, $v0 +/* 843764 80240B94 9063404C */ lbu $v1, 0x404c($v1) +/* 843768 80240B98 8E220084 */ lw $v0, 0x84($s1) +/* 84376C 80240B9C 54430006 */ bnel $v0, $v1, .L80240BB8 +/* 843770 80240BA0 AE200084 */ sw $zero, 0x84($s1) +/* 843774 80240BA4 24020001 */ addiu $v0, $zero, 1 +/* 843778 80240BA8 AE220084 */ sw $v0, 0x84($s1) +/* 84377C 80240BAC 960202C2 */ lhu $v0, 0x2c2($s0) +/* 843780 80240BB0 24420001 */ addiu $v0, $v0, 1 +/* 843784 80240BB4 A60202C2 */ sh $v0, 0x2c2($s0) +.L80240BB8: +/* 843788 80240BB8 8FBF0018 */ lw $ra, 0x18($sp) +/* 84378C 80240BBC 8FB10014 */ lw $s1, 0x14($sp) +/* 843790 80240BC0 8FB00010 */ lw $s0, 0x10($sp) +/* 843794 80240BC4 24020002 */ addiu $v0, $zero, 2 +/* 843798 80240BC8 03E00008 */ jr $ra +/* 84379C 80240BCC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0.s deleted file mode 100644 index 8701f6b166..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BD0 -/* 8437A0 80240BD0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8437A4 80240BD4 AFB1001C */ sw $s1, 0x1c($sp) -/* 8437A8 80240BD8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8437AC 80240BDC AFB00018 */ sw $s0, 0x18($sp) -/* 8437B0 80240BE0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8437B4 80240BE4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8437B8 80240BE8 10A00060 */ beqz $a1, .L80240D6C -/* 8437BC 80240BEC 0080882D */ daddu $s1, $a0, $zero -/* 8437C0 80240BF0 3C05F4AC */ lui $a1, 0xf4ac -/* 8437C4 80240BF4 0C0B1EAF */ jal get_variable -/* 8437C8 80240BF8 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8437CC 80240BFC 0220202D */ daddu $a0, $s1, $zero -/* 8437D0 80240C00 3C05F4AC */ lui $a1, 0xf4ac -/* 8437D4 80240C04 4482B000 */ mtc1 $v0, $f22 -/* 8437D8 80240C08 00000000 */ nop -/* 8437DC 80240C0C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8437E0 80240C10 0C0B1EAF */ jal get_variable -/* 8437E4 80240C14 34A5D482 */ ori $a1, $a1, 0xd482 -/* 8437E8 80240C18 0220202D */ daddu $a0, $s1, $zero -/* 8437EC 80240C1C 3C05F4AC */ lui $a1, 0xf4ac -/* 8437F0 80240C20 4482A000 */ mtc1 $v0, $f20 -/* 8437F4 80240C24 00000000 */ nop -/* 8437F8 80240C28 4680A520 */ cvt.s.w $f20, $f20 -/* 8437FC 80240C2C 0C0B1EAF */ jal get_variable -/* 843800 80240C30 34A5D483 */ ori $a1, $a1, 0xd483 -/* 843804 80240C34 44821000 */ mtc1 $v0, $f2 -/* 843808 80240C38 00000000 */ nop -/* 84380C 80240C3C 468010A0 */ cvt.s.w $f2, $f2 -/* 843810 80240C40 4405B000 */ mfc1 $a1, $f22 -/* 843814 80240C44 4406A000 */ mfc1 $a2, $f20 -/* 843818 80240C48 44071000 */ mfc1 $a3, $f2 -/* 84381C 80240C4C 0C01C574 */ jal func_800715D0 -/* 843820 80240C50 0000202D */ daddu $a0, $zero, $zero -/* 843824 80240C54 0220202D */ daddu $a0, $s1, $zero -/* 843828 80240C58 3C05F4AC */ lui $a1, 0xf4ac -/* 84382C 80240C5C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 843830 80240C60 3C108025 */ lui $s0, 0x8025 -/* 843834 80240C64 2610F5C0 */ addiu $s0, $s0, -0xa40 -/* 843838 80240C68 0C0B1EAF */ jal get_variable -/* 84383C 80240C6C AE020000 */ sw $v0, ($s0) -/* 843840 80240C70 0220202D */ daddu $a0, $s1, $zero -/* 843844 80240C74 3C05F4AC */ lui $a1, 0xf4ac -/* 843848 80240C78 4482B000 */ mtc1 $v0, $f22 -/* 84384C 80240C7C 00000000 */ nop -/* 843850 80240C80 4680B5A0 */ cvt.s.w $f22, $f22 -/* 843854 80240C84 0C0B1EAF */ jal get_variable -/* 843858 80240C88 34A5D482 */ ori $a1, $a1, 0xd482 -/* 84385C 80240C8C 0220202D */ daddu $a0, $s1, $zero -/* 843860 80240C90 3C05F4AC */ lui $a1, 0xf4ac -/* 843864 80240C94 4482A000 */ mtc1 $v0, $f20 -/* 843868 80240C98 00000000 */ nop -/* 84386C 80240C9C 4680A520 */ cvt.s.w $f20, $f20 -/* 843870 80240CA0 0C0B1EAF */ jal get_variable -/* 843874 80240CA4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 843878 80240CA8 44821000 */ mtc1 $v0, $f2 -/* 84387C 80240CAC 00000000 */ nop -/* 843880 80240CB0 468010A0 */ cvt.s.w $f2, $f2 -/* 843884 80240CB4 4405B000 */ mfc1 $a1, $f22 -/* 843888 80240CB8 4406A000 */ mfc1 $a2, $f20 -/* 84388C 80240CBC 44071000 */ mfc1 $a3, $f2 -/* 843890 80240CC0 0C01C604 */ jal func_80071810 -/* 843894 80240CC4 0000202D */ daddu $a0, $zero, $zero -/* 843898 80240CC8 0220202D */ daddu $a0, $s1, $zero -/* 84389C 80240CCC 3C05F4AC */ lui $a1, 0xf4ac -/* 8438A0 80240CD0 3C018025 */ lui $at, 0x8025 -/* 8438A4 80240CD4 AC22F5C4 */ sw $v0, -0xa3c($at) -/* 8438A8 80240CD8 0C0B1EAF */ jal get_variable -/* 8438AC 80240CDC 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8438B0 80240CE0 0220202D */ daddu $a0, $s1, $zero -/* 8438B4 80240CE4 3C05F4AC */ lui $a1, 0xf4ac -/* 8438B8 80240CE8 4482B000 */ mtc1 $v0, $f22 -/* 8438BC 80240CEC 00000000 */ nop -/* 8438C0 80240CF0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8438C4 80240CF4 0C0B1EAF */ jal get_variable -/* 8438C8 80240CF8 34A5D482 */ ori $a1, $a1, 0xd482 -/* 8438CC 80240CFC 0220202D */ daddu $a0, $s1, $zero -/* 8438D0 80240D00 3C05F4AC */ lui $a1, 0xf4ac -/* 8438D4 80240D04 4482A000 */ mtc1 $v0, $f20 -/* 8438D8 80240D08 00000000 */ nop -/* 8438DC 80240D0C 4680A520 */ cvt.s.w $f20, $f20 -/* 8438E0 80240D10 0C0B1EAF */ jal get_variable -/* 8438E4 80240D14 34A5D483 */ ori $a1, $a1, 0xd483 -/* 8438E8 80240D18 44821000 */ mtc1 $v0, $f2 -/* 8438EC 80240D1C 00000000 */ nop -/* 8438F0 80240D20 468010A0 */ cvt.s.w $f2, $f2 -/* 8438F4 80240D24 4405B000 */ mfc1 $a1, $f22 -/* 8438F8 80240D28 4406A000 */ mfc1 $a2, $f20 -/* 8438FC 80240D2C 3C013F80 */ lui $at, 0x3f80 -/* 843900 80240D30 44810000 */ mtc1 $at, $f0 -/* 843904 80240D34 44071000 */ mfc1 $a3, $f2 -/* 843908 80240D38 0000202D */ daddu $a0, $zero, $zero -/* 84390C 80240D3C AFA00014 */ sw $zero, 0x14($sp) -/* 843910 80240D40 0C01CA24 */ jal func_80072890 -/* 843914 80240D44 E7A00010 */ swc1 $f0, 0x10($sp) -/* 843918 80240D48 8E030000 */ lw $v1, ($s0) -/* 84391C 80240D4C 8C64000C */ lw $a0, 0xc($v1) -/* 843920 80240D50 3C018025 */ lui $at, 0x8025 -/* 843924 80240D54 AC22F5C8 */ sw $v0, -0xa38($at) -/* 843928 80240D58 AC800018 */ sw $zero, 0x18($a0) -/* 84392C 80240D5C AC800020 */ sw $zero, 0x20($a0) -/* 843930 80240D60 AC800024 */ sw $zero, 0x24($a0) -/* 843934 80240D64 AC800028 */ sw $zero, 0x28($a0) -/* 843938 80240D68 AC80001C */ sw $zero, 0x1c($a0) -.L80240D6C: -/* 84393C 80240D6C 3C028025 */ lui $v0, 0x8025 -/* 843940 80240D70 8C42F5C0 */ lw $v0, -0xa40($v0) -/* 843944 80240D74 8C44000C */ lw $a0, 0xc($v0) -/* 843948 80240D78 8C820020 */ lw $v0, 0x20($a0) -/* 84394C 80240D7C 8C830028 */ lw $v1, 0x28($a0) -/* 843950 80240D80 2442000A */ addiu $v0, $v0, 0xa -/* 843954 80240D84 AC820020 */ sw $v0, 0x20($a0) -/* 843958 80240D88 8C820024 */ lw $v0, 0x24($a0) -/* 84395C 80240D8C 2463000A */ addiu $v1, $v1, 0xa -/* 843960 80240D90 AC830028 */ sw $v1, 0x28($a0) -/* 843964 80240D94 8C830018 */ lw $v1, 0x18($a0) -/* 843968 80240D98 2442000A */ addiu $v0, $v0, 0xa -/* 84396C 80240D9C AC820024 */ sw $v0, 0x24($a0) -/* 843970 80240DA0 8C82001C */ lw $v0, 0x1c($a0) -/* 843974 80240DA4 2463000A */ addiu $v1, $v1, 0xa -/* 843978 80240DA8 AC830018 */ sw $v1, 0x18($a0) -/* 84397C 80240DAC 286300FF */ slti $v1, $v1, 0xff -/* 843980 80240DB0 2442000A */ addiu $v0, $v0, 0xa -/* 843984 80240DB4 AC82001C */ sw $v0, 0x1c($a0) -/* 843988 80240DB8 14600004 */ bnez $v1, .L80240DCC -/* 84398C 80240DBC 0000102D */ daddu $v0, $zero, $zero -/* 843990 80240DC0 240200FF */ addiu $v0, $zero, 0xff -/* 843994 80240DC4 AC820018 */ sw $v0, 0x18($a0) -/* 843998 80240DC8 24020002 */ addiu $v0, $zero, 2 -.L80240DCC: -/* 84399C 80240DCC 8FBF0020 */ lw $ra, 0x20($sp) -/* 8439A0 80240DD0 8FB1001C */ lw $s1, 0x1c($sp) -/* 8439A4 80240DD4 8FB00018 */ lw $s0, 0x18($sp) -/* 8439A8 80240DD8 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8439AC 80240DDC D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8439B0 80240DE0 03E00008 */ jr $ra -/* 8439B4 80240DE4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s new file mode 100644 index 0000000000..1248d99ab7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240BD0_8437A0.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BD0_8437A0 +/* 8437A0 80240BD0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8437A4 80240BD4 AFB1001C */ sw $s1, 0x1c($sp) +/* 8437A8 80240BD8 AFBF0020 */ sw $ra, 0x20($sp) +/* 8437AC 80240BDC AFB00018 */ sw $s0, 0x18($sp) +/* 8437B0 80240BE0 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 8437B4 80240BE4 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8437B8 80240BE8 10A00060 */ beqz $a1, .L80240D6C +/* 8437BC 80240BEC 0080882D */ daddu $s1, $a0, $zero +/* 8437C0 80240BF0 3C05F4AC */ lui $a1, 0xf4ac +/* 8437C4 80240BF4 0C0B1EAF */ jal get_variable +/* 8437C8 80240BF8 34A5D481 */ ori $a1, $a1, 0xd481 +/* 8437CC 80240BFC 0220202D */ daddu $a0, $s1, $zero +/* 8437D0 80240C00 3C05F4AC */ lui $a1, 0xf4ac +/* 8437D4 80240C04 4482B000 */ mtc1 $v0, $f22 +/* 8437D8 80240C08 00000000 */ nop +/* 8437DC 80240C0C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8437E0 80240C10 0C0B1EAF */ jal get_variable +/* 8437E4 80240C14 34A5D482 */ ori $a1, $a1, 0xd482 +/* 8437E8 80240C18 0220202D */ daddu $a0, $s1, $zero +/* 8437EC 80240C1C 3C05F4AC */ lui $a1, 0xf4ac +/* 8437F0 80240C20 4482A000 */ mtc1 $v0, $f20 +/* 8437F4 80240C24 00000000 */ nop +/* 8437F8 80240C28 4680A520 */ cvt.s.w $f20, $f20 +/* 8437FC 80240C2C 0C0B1EAF */ jal get_variable +/* 843800 80240C30 34A5D483 */ ori $a1, $a1, 0xd483 +/* 843804 80240C34 44821000 */ mtc1 $v0, $f2 +/* 843808 80240C38 00000000 */ nop +/* 84380C 80240C3C 468010A0 */ cvt.s.w $f2, $f2 +/* 843810 80240C40 4405B000 */ mfc1 $a1, $f22 +/* 843814 80240C44 4406A000 */ mfc1 $a2, $f20 +/* 843818 80240C48 44071000 */ mfc1 $a3, $f2 +/* 84381C 80240C4C 0C01C574 */ jal func_800715D0 +/* 843820 80240C50 0000202D */ daddu $a0, $zero, $zero +/* 843824 80240C54 0220202D */ daddu $a0, $s1, $zero +/* 843828 80240C58 3C05F4AC */ lui $a1, 0xf4ac +/* 84382C 80240C5C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 843830 80240C60 3C108025 */ lui $s0, 0x8025 +/* 843834 80240C64 2610F5C0 */ addiu $s0, $s0, -0xa40 +/* 843838 80240C68 0C0B1EAF */ jal get_variable +/* 84383C 80240C6C AE020000 */ sw $v0, ($s0) +/* 843840 80240C70 0220202D */ daddu $a0, $s1, $zero +/* 843844 80240C74 3C05F4AC */ lui $a1, 0xf4ac +/* 843848 80240C78 4482B000 */ mtc1 $v0, $f22 +/* 84384C 80240C7C 00000000 */ nop +/* 843850 80240C80 4680B5A0 */ cvt.s.w $f22, $f22 +/* 843854 80240C84 0C0B1EAF */ jal get_variable +/* 843858 80240C88 34A5D482 */ ori $a1, $a1, 0xd482 +/* 84385C 80240C8C 0220202D */ daddu $a0, $s1, $zero +/* 843860 80240C90 3C05F4AC */ lui $a1, 0xf4ac +/* 843864 80240C94 4482A000 */ mtc1 $v0, $f20 +/* 843868 80240C98 00000000 */ nop +/* 84386C 80240C9C 4680A520 */ cvt.s.w $f20, $f20 +/* 843870 80240CA0 0C0B1EAF */ jal get_variable +/* 843874 80240CA4 34A5D483 */ ori $a1, $a1, 0xd483 +/* 843878 80240CA8 44821000 */ mtc1 $v0, $f2 +/* 84387C 80240CAC 00000000 */ nop +/* 843880 80240CB0 468010A0 */ cvt.s.w $f2, $f2 +/* 843884 80240CB4 4405B000 */ mfc1 $a1, $f22 +/* 843888 80240CB8 4406A000 */ mfc1 $a2, $f20 +/* 84388C 80240CBC 44071000 */ mfc1 $a3, $f2 +/* 843890 80240CC0 0C01C604 */ jal func_80071810 +/* 843894 80240CC4 0000202D */ daddu $a0, $zero, $zero +/* 843898 80240CC8 0220202D */ daddu $a0, $s1, $zero +/* 84389C 80240CCC 3C05F4AC */ lui $a1, 0xf4ac +/* 8438A0 80240CD0 3C018025 */ lui $at, 0x8025 +/* 8438A4 80240CD4 AC22F5C4 */ sw $v0, -0xa3c($at) +/* 8438A8 80240CD8 0C0B1EAF */ jal get_variable +/* 8438AC 80240CDC 34A5D481 */ ori $a1, $a1, 0xd481 +/* 8438B0 80240CE0 0220202D */ daddu $a0, $s1, $zero +/* 8438B4 80240CE4 3C05F4AC */ lui $a1, 0xf4ac +/* 8438B8 80240CE8 4482B000 */ mtc1 $v0, $f22 +/* 8438BC 80240CEC 00000000 */ nop +/* 8438C0 80240CF0 4680B5A0 */ cvt.s.w $f22, $f22 +/* 8438C4 80240CF4 0C0B1EAF */ jal get_variable +/* 8438C8 80240CF8 34A5D482 */ ori $a1, $a1, 0xd482 +/* 8438CC 80240CFC 0220202D */ daddu $a0, $s1, $zero +/* 8438D0 80240D00 3C05F4AC */ lui $a1, 0xf4ac +/* 8438D4 80240D04 4482A000 */ mtc1 $v0, $f20 +/* 8438D8 80240D08 00000000 */ nop +/* 8438DC 80240D0C 4680A520 */ cvt.s.w $f20, $f20 +/* 8438E0 80240D10 0C0B1EAF */ jal get_variable +/* 8438E4 80240D14 34A5D483 */ ori $a1, $a1, 0xd483 +/* 8438E8 80240D18 44821000 */ mtc1 $v0, $f2 +/* 8438EC 80240D1C 00000000 */ nop +/* 8438F0 80240D20 468010A0 */ cvt.s.w $f2, $f2 +/* 8438F4 80240D24 4405B000 */ mfc1 $a1, $f22 +/* 8438F8 80240D28 4406A000 */ mfc1 $a2, $f20 +/* 8438FC 80240D2C 3C013F80 */ lui $at, 0x3f80 +/* 843900 80240D30 44810000 */ mtc1 $at, $f0 +/* 843904 80240D34 44071000 */ mfc1 $a3, $f2 +/* 843908 80240D38 0000202D */ daddu $a0, $zero, $zero +/* 84390C 80240D3C AFA00014 */ sw $zero, 0x14($sp) +/* 843910 80240D40 0C01CA24 */ jal func_80072890 +/* 843914 80240D44 E7A00010 */ swc1 $f0, 0x10($sp) +/* 843918 80240D48 8E030000 */ lw $v1, ($s0) +/* 84391C 80240D4C 8C64000C */ lw $a0, 0xc($v1) +/* 843920 80240D50 3C018025 */ lui $at, 0x8025 +/* 843924 80240D54 AC22F5C8 */ sw $v0, -0xa38($at) +/* 843928 80240D58 AC800018 */ sw $zero, 0x18($a0) +/* 84392C 80240D5C AC800020 */ sw $zero, 0x20($a0) +/* 843930 80240D60 AC800024 */ sw $zero, 0x24($a0) +/* 843934 80240D64 AC800028 */ sw $zero, 0x28($a0) +/* 843938 80240D68 AC80001C */ sw $zero, 0x1c($a0) +.L80240D6C: +/* 84393C 80240D6C 3C028025 */ lui $v0, 0x8025 +/* 843940 80240D70 8C42F5C0 */ lw $v0, -0xa40($v0) +/* 843944 80240D74 8C44000C */ lw $a0, 0xc($v0) +/* 843948 80240D78 8C820020 */ lw $v0, 0x20($a0) +/* 84394C 80240D7C 8C830028 */ lw $v1, 0x28($a0) +/* 843950 80240D80 2442000A */ addiu $v0, $v0, 0xa +/* 843954 80240D84 AC820020 */ sw $v0, 0x20($a0) +/* 843958 80240D88 8C820024 */ lw $v0, 0x24($a0) +/* 84395C 80240D8C 2463000A */ addiu $v1, $v1, 0xa +/* 843960 80240D90 AC830028 */ sw $v1, 0x28($a0) +/* 843964 80240D94 8C830018 */ lw $v1, 0x18($a0) +/* 843968 80240D98 2442000A */ addiu $v0, $v0, 0xa +/* 84396C 80240D9C AC820024 */ sw $v0, 0x24($a0) +/* 843970 80240DA0 8C82001C */ lw $v0, 0x1c($a0) +/* 843974 80240DA4 2463000A */ addiu $v1, $v1, 0xa +/* 843978 80240DA8 AC830018 */ sw $v1, 0x18($a0) +/* 84397C 80240DAC 286300FF */ slti $v1, $v1, 0xff +/* 843980 80240DB0 2442000A */ addiu $v0, $v0, 0xa +/* 843984 80240DB4 AC82001C */ sw $v0, 0x1c($a0) +/* 843988 80240DB8 14600004 */ bnez $v1, .L80240DCC +/* 84398C 80240DBC 0000102D */ daddu $v0, $zero, $zero +/* 843990 80240DC0 240200FF */ addiu $v0, $zero, 0xff +/* 843994 80240DC4 AC820018 */ sw $v0, 0x18($a0) +/* 843998 80240DC8 24020002 */ addiu $v0, $zero, 2 +.L80240DCC: +/* 84399C 80240DCC 8FBF0020 */ lw $ra, 0x20($sp) +/* 8439A0 80240DD0 8FB1001C */ lw $s1, 0x1c($sp) +/* 8439A4 80240DD4 8FB00018 */ lw $s0, 0x18($sp) +/* 8439A8 80240DD8 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 8439AC 80240DDC D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8439B0 80240DE0 03E00008 */ jr $ra +/* 8439B4 80240DE4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8.s deleted file mode 100644 index 7150970f01..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DE8 -/* 8439B8 80240DE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8439BC 80240DEC 10A0000B */ beqz $a1, .L80240E1C -/* 8439C0 80240DF0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8439C4 80240DF4 3C038025 */ lui $v1, 0x8025 -/* 8439C8 80240DF8 8C63F5C4 */ lw $v1, -0xa3c($v1) -/* 8439CC 80240DFC 8C620000 */ lw $v0, ($v1) -/* 8439D0 80240E00 3C048025 */ lui $a0, 0x8025 -/* 8439D4 80240E04 8C84F5C8 */ lw $a0, -0xa38($a0) -/* 8439D8 80240E08 34420010 */ ori $v0, $v0, 0x10 -/* 8439DC 80240E0C AC620000 */ sw $v0, ($v1) -/* 8439E0 80240E10 8C820000 */ lw $v0, ($a0) -/* 8439E4 80240E14 34420010 */ ori $v0, $v0, 0x10 -/* 8439E8 80240E18 AC820000 */ sw $v0, ($a0) -.L80240E1C: -/* 8439EC 80240E1C 3C048025 */ lui $a0, 0x8025 -/* 8439F0 80240E20 8C84F5C0 */ lw $a0, -0xa40($a0) -/* 8439F4 80240E24 8C85000C */ lw $a1, 0xc($a0) -/* 8439F8 80240E28 8CA20018 */ lw $v0, 0x18($a1) -/* 8439FC 80240E2C 8CA30020 */ lw $v1, 0x20($a1) -/* 843A00 80240E30 2442FFF6 */ addiu $v0, $v0, -0xa -/* 843A04 80240E34 ACA20018 */ sw $v0, 0x18($a1) -/* 843A08 80240E38 8CA20024 */ lw $v0, 0x24($a1) -/* 843A0C 80240E3C 2463FFF6 */ addiu $v1, $v1, -0xa -/* 843A10 80240E40 ACA30020 */ sw $v1, 0x20($a1) -/* 843A14 80240E44 8CA30028 */ lw $v1, 0x28($a1) -/* 843A18 80240E48 2442FFF6 */ addiu $v0, $v0, -0xa -/* 843A1C 80240E4C ACA20024 */ sw $v0, 0x24($a1) -/* 843A20 80240E50 8CA2001C */ lw $v0, 0x1c($a1) -/* 843A24 80240E54 2463FFF6 */ addiu $v1, $v1, -0xa -/* 843A28 80240E58 ACA30028 */ sw $v1, 0x28($a1) -/* 843A2C 80240E5C 8CA30018 */ lw $v1, 0x18($a1) -/* 843A30 80240E60 2442FFF6 */ addiu $v0, $v0, -0xa -/* 843A34 80240E64 18600003 */ blez $v1, .L80240E74 -/* 843A38 80240E68 ACA2001C */ sw $v0, 0x1c($a1) -/* 843A3C 80240E6C 080903A4 */ j .L80240E90 -/* 843A40 80240E70 0000102D */ daddu $v0, $zero, $zero -.L80240E74: -/* 843A44 80240E74 0C016914 */ jal remove_effect -/* 843A48 80240E78 ACA00018 */ sw $zero, 0x18($a1) -/* 843A4C 80240E7C 3C048025 */ lui $a0, 0x8025 -/* 843A50 80240E80 8C84F5A0 */ lw $a0, -0xa60($a0) -/* 843A54 80240E84 0C048D70 */ jal func_801235C0 -/* 843A58 80240E88 00000000 */ nop -/* 843A5C 80240E8C 24020002 */ addiu $v0, $zero, 2 -.L80240E90: -/* 843A60 80240E90 8FBF0010 */ lw $ra, 0x10($sp) -/* 843A64 80240E94 03E00008 */ jr $ra -/* 843A68 80240E98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s new file mode 100644 index 0000000000..fd5db6a400 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240DE8_8439B8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DE8_8439B8 +/* 8439B8 80240DE8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8439BC 80240DEC 10A0000B */ beqz $a1, .L80240E1C +/* 8439C0 80240DF0 AFBF0010 */ sw $ra, 0x10($sp) +/* 8439C4 80240DF4 3C038025 */ lui $v1, 0x8025 +/* 8439C8 80240DF8 8C63F5C4 */ lw $v1, -0xa3c($v1) +/* 8439CC 80240DFC 8C620000 */ lw $v0, ($v1) +/* 8439D0 80240E00 3C048025 */ lui $a0, 0x8025 +/* 8439D4 80240E04 8C84F5C8 */ lw $a0, -0xa38($a0) +/* 8439D8 80240E08 34420010 */ ori $v0, $v0, 0x10 +/* 8439DC 80240E0C AC620000 */ sw $v0, ($v1) +/* 8439E0 80240E10 8C820000 */ lw $v0, ($a0) +/* 8439E4 80240E14 34420010 */ ori $v0, $v0, 0x10 +/* 8439E8 80240E18 AC820000 */ sw $v0, ($a0) +.L80240E1C: +/* 8439EC 80240E1C 3C048025 */ lui $a0, 0x8025 +/* 8439F0 80240E20 8C84F5C0 */ lw $a0, -0xa40($a0) +/* 8439F4 80240E24 8C85000C */ lw $a1, 0xc($a0) +/* 8439F8 80240E28 8CA20018 */ lw $v0, 0x18($a1) +/* 8439FC 80240E2C 8CA30020 */ lw $v1, 0x20($a1) +/* 843A00 80240E30 2442FFF6 */ addiu $v0, $v0, -0xa +/* 843A04 80240E34 ACA20018 */ sw $v0, 0x18($a1) +/* 843A08 80240E38 8CA20024 */ lw $v0, 0x24($a1) +/* 843A0C 80240E3C 2463FFF6 */ addiu $v1, $v1, -0xa +/* 843A10 80240E40 ACA30020 */ sw $v1, 0x20($a1) +/* 843A14 80240E44 8CA30028 */ lw $v1, 0x28($a1) +/* 843A18 80240E48 2442FFF6 */ addiu $v0, $v0, -0xa +/* 843A1C 80240E4C ACA20024 */ sw $v0, 0x24($a1) +/* 843A20 80240E50 8CA2001C */ lw $v0, 0x1c($a1) +/* 843A24 80240E54 2463FFF6 */ addiu $v1, $v1, -0xa +/* 843A28 80240E58 ACA30028 */ sw $v1, 0x28($a1) +/* 843A2C 80240E5C 8CA30018 */ lw $v1, 0x18($a1) +/* 843A30 80240E60 2442FFF6 */ addiu $v0, $v0, -0xa +/* 843A34 80240E64 18600003 */ blez $v1, .L80240E74 +/* 843A38 80240E68 ACA2001C */ sw $v0, 0x1c($a1) +/* 843A3C 80240E6C 080903A4 */ j .L80240E90 +/* 843A40 80240E70 0000102D */ daddu $v0, $zero, $zero +.L80240E74: +/* 843A44 80240E74 0C016914 */ jal remove_effect +/* 843A48 80240E78 ACA00018 */ sw $zero, 0x18($a1) +/* 843A4C 80240E7C 3C048025 */ lui $a0, 0x8025 +/* 843A50 80240E80 8C84F5A0 */ lw $a0, -0xa60($a0) +/* 843A54 80240E84 0C048D70 */ jal func_801235C0 +/* 843A58 80240E88 00000000 */ nop +/* 843A5C 80240E8C 24020002 */ addiu $v0, $zero, 2 +.L80240E90: +/* 843A60 80240E90 8FBF0010 */ lw $ra, 0x10($sp) +/* 843A64 80240E94 03E00008 */ jr $ra +/* 843A68 80240E98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C.s deleted file mode 100644 index 469974a0ec..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E9C -/* 843A6C 80240E9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 843A70 80240EA0 AFBF0010 */ sw $ra, 0x10($sp) -/* 843A74 80240EA4 8C82000C */ lw $v0, 0xc($a0) -/* 843A78 80240EA8 0C0B1EAF */ jal get_variable -/* 843A7C 80240EAC 8C450000 */ lw $a1, ($v0) -/* 843A80 80240EB0 3C038025 */ lui $v1, 0x8025 -/* 843A84 80240EB4 8C63F5C0 */ lw $v1, -0xa40($v1) -/* 843A88 80240EB8 8C63000C */ lw $v1, 0xc($v1) -/* 843A8C 80240EBC AC620034 */ sw $v0, 0x34($v1) -/* 843A90 80240EC0 8FBF0010 */ lw $ra, 0x10($sp) -/* 843A94 80240EC4 24020002 */ addiu $v0, $zero, 2 -/* 843A98 80240EC8 03E00008 */ jr $ra -/* 843A9C 80240ECC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C_843A6C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C_843A6C.s new file mode 100644 index 0000000000..3f9d29fca5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240E9C_843A6C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E9C_843A6C +/* 843A6C 80240E9C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 843A70 80240EA0 AFBF0010 */ sw $ra, 0x10($sp) +/* 843A74 80240EA4 8C82000C */ lw $v0, 0xc($a0) +/* 843A78 80240EA8 0C0B1EAF */ jal get_variable +/* 843A7C 80240EAC 8C450000 */ lw $a1, ($v0) +/* 843A80 80240EB0 3C038025 */ lui $v1, 0x8025 +/* 843A84 80240EB4 8C63F5C0 */ lw $v1, -0xa40($v1) +/* 843A88 80240EB8 8C63000C */ lw $v1, 0xc($v1) +/* 843A8C 80240EBC AC620034 */ sw $v0, 0x34($v1) +/* 843A90 80240EC0 8FBF0010 */ lw $ra, 0x10($sp) +/* 843A94 80240EC4 24020002 */ addiu $v0, $zero, 2 +/* 843A98 80240EC8 03E00008 */ jr $ra +/* 843A9C 80240ECC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0.s deleted file mode 100644 index d205dc2662..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ED0 -/* 843AA0 80240ED0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 843AA4 80240ED4 AFBF0010 */ sw $ra, 0x10($sp) -/* 843AA8 80240ED8 8C82000C */ lw $v0, 0xc($a0) -/* 843AAC 80240EDC 0C0B1EAF */ jal get_variable -/* 843AB0 80240EE0 8C450000 */ lw $a1, ($v0) -/* 843AB4 80240EE4 0040202D */ daddu $a0, $v0, $zero -/* 843AB8 80240EE8 3C028025 */ lui $v0, 0x8025 -/* 843ABC 80240EEC 8C42F5C0 */ lw $v0, -0xa40($v0) -/* 843AC0 80240EF0 24030001 */ addiu $v1, $zero, 1 -/* 843AC4 80240EF4 8C45000C */ lw $a1, 0xc($v0) -/* 843AC8 80240EF8 1083000D */ beq $a0, $v1, .L80240F30 -/* 843ACC 80240EFC 28820002 */ slti $v0, $a0, 2 -/* 843AD0 80240F00 10400005 */ beqz $v0, .L80240F18 -/* 843AD4 80240F04 24020002 */ addiu $v0, $zero, 2 -/* 843AD8 80240F08 10800007 */ beqz $a0, .L80240F28 -/* 843ADC 80240F0C 240200C0 */ addiu $v0, $zero, 0xc0 -/* 843AE0 80240F10 080903D0 */ j .L80240F40 -/* 843AE4 80240F14 ACA00038 */ sw $zero, 0x38($a1) -.L80240F18: -/* 843AE8 80240F18 10820008 */ beq $a0, $v0, .L80240F3C -/* 843AEC 80240F1C 24020040 */ addiu $v0, $zero, 0x40 -/* 843AF0 80240F20 080903D0 */ j .L80240F40 -/* 843AF4 80240F24 ACA00038 */ sw $zero, 0x38($a1) -.L80240F28: -/* 843AF8 80240F28 080903D0 */ j .L80240F40 -/* 843AFC 80240F2C ACA20038 */ sw $v0, 0x38($a1) -.L80240F30: -/* 843B00 80240F30 24020080 */ addiu $v0, $zero, 0x80 -/* 843B04 80240F34 080903D0 */ j .L80240F40 -/* 843B08 80240F38 ACA20038 */ sw $v0, 0x38($a1) -.L80240F3C: -/* 843B0C 80240F3C ACA20038 */ sw $v0, 0x38($a1) -.L80240F40: -/* 843B10 80240F40 8FBF0010 */ lw $ra, 0x10($sp) -/* 843B14 80240F44 24020002 */ addiu $v0, $zero, 2 -/* 843B18 80240F48 03E00008 */ jr $ra -/* 843B1C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0_843AA0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0_843AA0.s new file mode 100644 index 0000000000..4e0f74a57b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240ED0_843AA0.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240ED0_843AA0 +/* 843AA0 80240ED0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 843AA4 80240ED4 AFBF0010 */ sw $ra, 0x10($sp) +/* 843AA8 80240ED8 8C82000C */ lw $v0, 0xc($a0) +/* 843AAC 80240EDC 0C0B1EAF */ jal get_variable +/* 843AB0 80240EE0 8C450000 */ lw $a1, ($v0) +/* 843AB4 80240EE4 0040202D */ daddu $a0, $v0, $zero +/* 843AB8 80240EE8 3C028025 */ lui $v0, 0x8025 +/* 843ABC 80240EEC 8C42F5C0 */ lw $v0, -0xa40($v0) +/* 843AC0 80240EF0 24030001 */ addiu $v1, $zero, 1 +/* 843AC4 80240EF4 8C45000C */ lw $a1, 0xc($v0) +/* 843AC8 80240EF8 1083000D */ beq $a0, $v1, .L80240F30 +/* 843ACC 80240EFC 28820002 */ slti $v0, $a0, 2 +/* 843AD0 80240F00 10400005 */ beqz $v0, .L80240F18 +/* 843AD4 80240F04 24020002 */ addiu $v0, $zero, 2 +/* 843AD8 80240F08 10800007 */ beqz $a0, .L80240F28 +/* 843ADC 80240F0C 240200C0 */ addiu $v0, $zero, 0xc0 +/* 843AE0 80240F10 080903D0 */ j .L80240F40 +/* 843AE4 80240F14 ACA00038 */ sw $zero, 0x38($a1) +.L80240F18: +/* 843AE8 80240F18 10820008 */ beq $a0, $v0, .L80240F3C +/* 843AEC 80240F1C 24020040 */ addiu $v0, $zero, 0x40 +/* 843AF0 80240F20 080903D0 */ j .L80240F40 +/* 843AF4 80240F24 ACA00038 */ sw $zero, 0x38($a1) +.L80240F28: +/* 843AF8 80240F28 080903D0 */ j .L80240F40 +/* 843AFC 80240F2C ACA20038 */ sw $v0, 0x38($a1) +.L80240F30: +/* 843B00 80240F30 24020080 */ addiu $v0, $zero, 0x80 +/* 843B04 80240F34 080903D0 */ j .L80240F40 +/* 843B08 80240F38 ACA20038 */ sw $v0, 0x38($a1) +.L80240F3C: +/* 843B0C 80240F3C ACA20038 */ sw $v0, 0x38($a1) +.L80240F40: +/* 843B10 80240F40 8FBF0010 */ lw $ra, 0x10($sp) +/* 843B14 80240F44 24020002 */ addiu $v0, $zero, 2 +/* 843B18 80240F48 03E00008 */ jr $ra +/* 843B1C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68.s deleted file mode 100644 index 8af59e70fd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F68 -/* 843B38 80240F68 3C028025 */ lui $v0, 0x8025 -/* 843B3C 80240F6C 8C42F5C8 */ lw $v0, -0xa38($v0) -/* 843B40 80240F70 8C43000C */ lw $v1, 0xc($v0) -/* 843B44 80240F74 24020001 */ addiu $v0, $zero, 1 -/* 843B48 80240F78 AC62001C */ sw $v0, 0x1c($v1) -/* 843B4C 80240F7C 03E00008 */ jr $ra -/* 843B50 80240F80 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68_843B38.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68_843B38.s new file mode 100644 index 0000000000..9e46d5d32d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F68_843B38.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F68_843B38 +/* 843B38 80240F68 3C028025 */ lui $v0, 0x8025 +/* 843B3C 80240F6C 8C42F5C8 */ lw $v0, -0xa38($v0) +/* 843B40 80240F70 8C43000C */ lw $v1, 0xc($v0) +/* 843B44 80240F74 24020001 */ addiu $v0, $zero, 1 +/* 843B48 80240F78 AC62001C */ sw $v0, 0x1c($v1) +/* 843B4C 80240F7C 03E00008 */ jr $ra +/* 843B50 80240F80 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84.s deleted file mode 100644 index e067007281..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F84 -/* 843B54 80240F84 3C028025 */ lui $v0, 0x8025 -/* 843B58 80240F88 8C42F5C8 */ lw $v0, -0xa38($v0) -/* 843B5C 80240F8C 8C43000C */ lw $v1, 0xc($v0) -/* 843B60 80240F90 24020002 */ addiu $v0, $zero, 2 -/* 843B64 80240F94 03E00008 */ jr $ra -/* 843B68 80240F98 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84_843B54.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84_843B54.s new file mode 100644 index 0000000000..36d7b37219 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F84_843B54.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F84_843B54 +/* 843B54 80240F84 3C028025 */ lui $v0, 0x8025 +/* 843B58 80240F88 8C42F5C8 */ lw $v0, -0xa38($v0) +/* 843B5C 80240F8C 8C43000C */ lw $v1, 0xc($v0) +/* 843B60 80240F90 24020002 */ addiu $v0, $zero, 2 +/* 843B64 80240F94 03E00008 */ jr $ra +/* 843B68 80240F98 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C.s deleted file mode 100644 index df966a183c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F9C -/* 843B6C 80240F9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 843B70 80240FA0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 843B74 80240FA4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 843B78 80240FA8 3C05FE36 */ lui $a1, 0xfe36 -/* 843B7C 80240FAC AFBF0010 */ sw $ra, 0x10($sp) -/* 843B80 80240FB0 80460075 */ lb $a2, 0x75($v0) -/* 843B84 80240FB4 0C0B2026 */ jal set_variable -/* 843B88 80240FB8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 843B8C 80240FBC 8FBF0010 */ lw $ra, 0x10($sp) -/* 843B90 80240FC0 24020002 */ addiu $v0, $zero, 2 -/* 843B94 80240FC4 03E00008 */ jr $ra -/* 843B98 80240FC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s new file mode 100644 index 0000000000..c9949efe6f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F9C_843B6C +/* 843B6C 80240F9C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 843B70 80240FA0 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 843B74 80240FA4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 843B78 80240FA8 3C05FE36 */ lui $a1, 0xfe36 +/* 843B7C 80240FAC AFBF0010 */ sw $ra, 0x10($sp) +/* 843B80 80240FB0 80460075 */ lb $a2, 0x75($v0) +/* 843B84 80240FB4 0C0B2026 */ jal set_variable +/* 843B88 80240FB8 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 843B8C 80240FBC 8FBF0010 */ lw $ra, 0x10($sp) +/* 843B90 80240FC0 24020002 */ addiu $v0, $zero, 2 +/* 843B94 80240FC4 03E00008 */ jr $ra +/* 843B98 80240FC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC.s deleted file mode 100644 index 67e454c808..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FCC -/* 843B9C 80240FCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 843BA0 80240FD0 AFB10014 */ sw $s1, 0x14($sp) -/* 843BA4 80240FD4 0080882D */ daddu $s1, $a0, $zero -/* 843BA8 80240FD8 AFBF0018 */ sw $ra, 0x18($sp) -/* 843BAC 80240FDC AFB00010 */ sw $s0, 0x10($sp) -/* 843BB0 80240FE0 8E30000C */ lw $s0, 0xc($s1) -/* 843BB4 80240FE4 8E050000 */ lw $a1, ($s0) -/* 843BB8 80240FE8 0C0B1EAF */ jal get_variable -/* 843BBC 80240FEC 26100004 */ addiu $s0, $s0, 4 -/* 843BC0 80240FF0 0220202D */ daddu $a0, $s1, $zero -/* 843BC4 80240FF4 8E050000 */ lw $a1, ($s0) -/* 843BC8 80240FF8 0C0B210B */ jal get_float_variable -/* 843BCC 80240FFC 0040802D */ daddu $s0, $v0, $zero -/* 843BD0 80241000 24020002 */ addiu $v0, $zero, 2 -/* 843BD4 80241004 00501804 */ sllv $v1, $s0, $v0 -/* 843BD8 80241008 00701821 */ addu $v1, $v1, $s0 -/* 843BDC 8024100C 00431804 */ sllv $v1, $v1, $v0 -/* 843BE0 80241010 00701823 */ subu $v1, $v1, $s0 -/* 843BE4 80241014 000320C0 */ sll $a0, $v1, 3 -/* 843BE8 80241018 00641821 */ addu $v1, $v1, $a0 -/* 843BEC 8024101C 000318C0 */ sll $v1, $v1, 3 -/* 843BF0 80241020 3C01800B */ lui $at, 0x800b -/* 843BF4 80241024 00230821 */ addu $at, $at, $v1 -/* 843BF8 80241028 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 843BFC 8024102C 8FBF0018 */ lw $ra, 0x18($sp) -/* 843C00 80241030 8FB10014 */ lw $s1, 0x14($sp) -/* 843C04 80241034 8FB00010 */ lw $s0, 0x10($sp) -/* 843C08 80241038 03E00008 */ jr $ra -/* 843C0C 8024103C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s new file mode 100644 index 0000000000..c6b64fd369 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FCC_843B9C +/* 843B9C 80240FCC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 843BA0 80240FD0 AFB10014 */ sw $s1, 0x14($sp) +/* 843BA4 80240FD4 0080882D */ daddu $s1, $a0, $zero +/* 843BA8 80240FD8 AFBF0018 */ sw $ra, 0x18($sp) +/* 843BAC 80240FDC AFB00010 */ sw $s0, 0x10($sp) +/* 843BB0 80240FE0 8E30000C */ lw $s0, 0xc($s1) +/* 843BB4 80240FE4 8E050000 */ lw $a1, ($s0) +/* 843BB8 80240FE8 0C0B1EAF */ jal get_variable +/* 843BBC 80240FEC 26100004 */ addiu $s0, $s0, 4 +/* 843BC0 80240FF0 0220202D */ daddu $a0, $s1, $zero +/* 843BC4 80240FF4 8E050000 */ lw $a1, ($s0) +/* 843BC8 80240FF8 0C0B210B */ jal get_float_variable +/* 843BCC 80240FFC 0040802D */ daddu $s0, $v0, $zero +/* 843BD0 80241000 24020002 */ addiu $v0, $zero, 2 +/* 843BD4 80241004 00501804 */ sllv $v1, $s0, $v0 +/* 843BD8 80241008 00701821 */ addu $v1, $v1, $s0 +/* 843BDC 8024100C 00431804 */ sllv $v1, $v1, $v0 +/* 843BE0 80241010 00701823 */ subu $v1, $v1, $s0 +/* 843BE4 80241014 000320C0 */ sll $a0, $v1, 3 +/* 843BE8 80241018 00641821 */ addu $v1, $v1, $a0 +/* 843BEC 8024101C 000318C0 */ sll $v1, $v1, 3 +/* 843BF0 80241020 3C01800B */ lui $at, 0x800b +/* 843BF4 80241024 00230821 */ addu $at, $at, $v1 +/* 843BF8 80241028 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 843BFC 8024102C 8FBF0018 */ lw $ra, 0x18($sp) +/* 843C00 80241030 8FB10014 */ lw $s1, 0x14($sp) +/* 843C04 80241034 8FB00010 */ lw $s0, 0x10($sp) +/* 843C08 80241038 03E00008 */ jr $ra +/* 843C0C 8024103C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040.s deleted file mode 100644 index 3a5155e40d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241040 -/* 843C10 80241040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 843C14 80241044 AFB10014 */ sw $s1, 0x14($sp) -/* 843C18 80241048 0080882D */ daddu $s1, $a0, $zero -/* 843C1C 8024104C AFBF0018 */ sw $ra, 0x18($sp) -/* 843C20 80241050 AFB00010 */ sw $s0, 0x10($sp) -/* 843C24 80241054 8E30000C */ lw $s0, 0xc($s1) -/* 843C28 80241058 8E050000 */ lw $a1, ($s0) -/* 843C2C 8024105C 0C0B1EAF */ jal get_variable -/* 843C30 80241060 26100004 */ addiu $s0, $s0, 4 -/* 843C34 80241064 00021880 */ sll $v1, $v0, 2 -/* 843C38 80241068 00621821 */ addu $v1, $v1, $v0 -/* 843C3C 8024106C 00031880 */ sll $v1, $v1, 2 -/* 843C40 80241070 00621823 */ subu $v1, $v1, $v0 -/* 843C44 80241074 000310C0 */ sll $v0, $v1, 3 -/* 843C48 80241078 00621821 */ addu $v1, $v1, $v0 -/* 843C4C 8024107C 000318C0 */ sll $v1, $v1, 3 -/* 843C50 80241080 3C01800B */ lui $at, 0x800b -/* 843C54 80241084 00230821 */ addu $at, $at, $v1 -/* 843C58 80241088 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 843C5C 8024108C 3C014480 */ lui $at, 0x4480 -/* 843C60 80241090 44810000 */ mtc1 $at, $f0 -/* 843C64 80241094 00000000 */ nop -/* 843C68 80241098 46001082 */ mul.s $f2, $f2, $f0 -/* 843C6C 8024109C 00000000 */ nop -/* 843C70 802410A0 3C01CD5B */ lui $at, 0xcd5b -/* 843C74 802410A4 34215858 */ ori $at, $at, 0x5858 -/* 843C78 802410A8 44810000 */ mtc1 $at, $f0 -/* 843C7C 802410AC 00000000 */ nop -/* 843C80 802410B0 46001080 */ add.s $f2, $f2, $f0 -/* 843C84 802410B4 8E050000 */ lw $a1, ($s0) -/* 843C88 802410B8 4600110D */ trunc.w.s $f4, $f2 -/* 843C8C 802410BC 44062000 */ mfc1 $a2, $f4 -/* 843C90 802410C0 0C0B2026 */ jal set_variable -/* 843C94 802410C4 0220202D */ daddu $a0, $s1, $zero -/* 843C98 802410C8 8FBF0018 */ lw $ra, 0x18($sp) -/* 843C9C 802410CC 8FB10014 */ lw $s1, 0x14($sp) -/* 843CA0 802410D0 8FB00010 */ lw $s0, 0x10($sp) -/* 843CA4 802410D4 24020002 */ addiu $v0, $zero, 2 -/* 843CA8 802410D8 03E00008 */ jr $ra -/* 843CAC 802410DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s new file mode 100644 index 0000000000..be23cbb05e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241040_843C10 +/* 843C10 80241040 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 843C14 80241044 AFB10014 */ sw $s1, 0x14($sp) +/* 843C18 80241048 0080882D */ daddu $s1, $a0, $zero +/* 843C1C 8024104C AFBF0018 */ sw $ra, 0x18($sp) +/* 843C20 80241050 AFB00010 */ sw $s0, 0x10($sp) +/* 843C24 80241054 8E30000C */ lw $s0, 0xc($s1) +/* 843C28 80241058 8E050000 */ lw $a1, ($s0) +/* 843C2C 8024105C 0C0B1EAF */ jal get_variable +/* 843C30 80241060 26100004 */ addiu $s0, $s0, 4 +/* 843C34 80241064 00021880 */ sll $v1, $v0, 2 +/* 843C38 80241068 00621821 */ addu $v1, $v1, $v0 +/* 843C3C 8024106C 00031880 */ sll $v1, $v1, 2 +/* 843C40 80241070 00621823 */ subu $v1, $v1, $v0 +/* 843C44 80241074 000310C0 */ sll $v0, $v1, 3 +/* 843C48 80241078 00621821 */ addu $v1, $v1, $v0 +/* 843C4C 8024107C 000318C0 */ sll $v1, $v1, 3 +/* 843C50 80241080 3C01800B */ lui $at, 0x800b +/* 843C54 80241084 00230821 */ addu $at, $at, $v1 +/* 843C58 80241088 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 843C5C 8024108C 3C014480 */ lui $at, 0x4480 +/* 843C60 80241090 44810000 */ mtc1 $at, $f0 +/* 843C64 80241094 00000000 */ nop +/* 843C68 80241098 46001082 */ mul.s $f2, $f2, $f0 +/* 843C6C 8024109C 00000000 */ nop +/* 843C70 802410A0 3C01CD5B */ lui $at, 0xcd5b +/* 843C74 802410A4 34215858 */ ori $at, $at, 0x5858 +/* 843C78 802410A8 44810000 */ mtc1 $at, $f0 +/* 843C7C 802410AC 00000000 */ nop +/* 843C80 802410B0 46001080 */ add.s $f2, $f2, $f0 +/* 843C84 802410B4 8E050000 */ lw $a1, ($s0) +/* 843C88 802410B8 4600110D */ trunc.w.s $f4, $f2 +/* 843C8C 802410BC 44062000 */ mfc1 $a2, $f4 +/* 843C90 802410C0 0C0B2026 */ jal set_variable +/* 843C94 802410C4 0220202D */ daddu $a0, $s1, $zero +/* 843C98 802410C8 8FBF0018 */ lw $ra, 0x18($sp) +/* 843C9C 802410CC 8FB10014 */ lw $s1, 0x14($sp) +/* 843CA0 802410D0 8FB00010 */ lw $s0, 0x10($sp) +/* 843CA4 802410D4 24020002 */ addiu $v0, $zero, 2 +/* 843CA8 802410D8 03E00008 */ jr $ra +/* 843CAC 802410DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0.s deleted file mode 100644 index de7b46944a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410E0 -/* 843CB0 802410E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 843CB4 802410E4 AFB20018 */ sw $s2, 0x18($sp) -/* 843CB8 802410E8 0080902D */ daddu $s2, $a0, $zero -/* 843CBC 802410EC AFBF0030 */ sw $ra, 0x30($sp) -/* 843CC0 802410F0 AFB7002C */ sw $s7, 0x2c($sp) -/* 843CC4 802410F4 AFB60028 */ sw $s6, 0x28($sp) -/* 843CC8 802410F8 AFB50024 */ sw $s5, 0x24($sp) -/* 843CCC 802410FC AFB40020 */ sw $s4, 0x20($sp) -/* 843CD0 80241100 AFB3001C */ sw $s3, 0x1c($sp) -/* 843CD4 80241104 AFB10014 */ sw $s1, 0x14($sp) -/* 843CD8 80241108 AFB00010 */ sw $s0, 0x10($sp) -/* 843CDC 8024110C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 843CE0 80241110 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 843CE4 80241114 8E50000C */ lw $s0, 0xc($s2) -/* 843CE8 80241118 8E050000 */ lw $a1, ($s0) -/* 843CEC 8024111C 0C0B1EAF */ jal get_variable -/* 843CF0 80241120 26100004 */ addiu $s0, $s0, 4 -/* 843CF4 80241124 8E050000 */ lw $a1, ($s0) -/* 843CF8 80241128 26100004 */ addiu $s0, $s0, 4 -/* 843CFC 8024112C 0240202D */ daddu $a0, $s2, $zero -/* 843D00 80241130 0C0B1EAF */ jal get_variable -/* 843D04 80241134 0040B82D */ daddu $s7, $v0, $zero -/* 843D08 80241138 8E050000 */ lw $a1, ($s0) -/* 843D0C 8024113C 26100004 */ addiu $s0, $s0, 4 -/* 843D10 80241140 0240202D */ daddu $a0, $s2, $zero -/* 843D14 80241144 0C0B1EAF */ jal get_variable -/* 843D18 80241148 0040B02D */ daddu $s6, $v0, $zero -/* 843D1C 8024114C 0240202D */ daddu $a0, $s2, $zero -/* 843D20 80241150 3C05F4AC */ lui $a1, 0xf4ac -/* 843D24 80241154 34A5D481 */ ori $a1, $a1, 0xd481 -/* 843D28 80241158 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 843D2C 8024115C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 843D30 80241160 8E140000 */ lw $s4, ($s0) -/* 843D34 80241164 00061880 */ sll $v1, $a2, 2 -/* 843D38 80241168 00661821 */ addu $v1, $v1, $a2 -/* 843D3C 8024116C 00031880 */ sll $v1, $v1, 2 -/* 843D40 80241170 00661823 */ subu $v1, $v1, $a2 -/* 843D44 80241174 000330C0 */ sll $a2, $v1, 3 -/* 843D48 80241178 00661821 */ addu $v1, $v1, $a2 -/* 843D4C 8024117C 000318C0 */ sll $v1, $v1, 3 -/* 843D50 80241180 3C01800B */ lui $at, 0x800b -/* 843D54 80241184 00230821 */ addu $at, $at, $v1 -/* 843D58 80241188 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 843D5C 8024118C 8E150004 */ lw $s5, 4($s0) -/* 843D60 80241190 4600010D */ trunc.w.s $f4, $f0 -/* 843D64 80241194 44112000 */ mfc1 $s1, $f4 -/* 843D68 80241198 0C0B1EAF */ jal get_variable -/* 843D6C 8024119C 0040982D */ daddu $s3, $v0, $zero -/* 843D70 802411A0 4491B000 */ mtc1 $s1, $f22 -/* 843D74 802411A4 00000000 */ nop -/* 843D78 802411A8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 843D7C 802411AC 4600B306 */ mov.s $f12, $f22 -/* 843D80 802411B0 0C00A8D4 */ jal cos_deg -/* 843D84 802411B4 0040802D */ daddu $s0, $v0, $zero -/* 843D88 802411B8 4493A000 */ mtc1 $s3, $f20 -/* 843D8C 802411BC 00000000 */ nop -/* 843D90 802411C0 4680A520 */ cvt.s.w $f20, $f20 -/* 843D94 802411C4 4600A002 */ mul.s $f0, $f20, $f0 -/* 843D98 802411C8 00000000 */ nop -/* 843D9C 802411CC 0240202D */ daddu $a0, $s2, $zero -/* 843DA0 802411D0 44901000 */ mtc1 $s0, $f2 -/* 843DA4 802411D4 00000000 */ nop -/* 843DA8 802411D8 468010A0 */ cvt.s.w $f2, $f2 -/* 843DAC 802411DC 46001081 */ sub.s $f2, $f2, $f0 -/* 843DB0 802411E0 3C05F4AC */ lui $a1, 0xf4ac -/* 843DB4 802411E4 4600110D */ trunc.w.s $f4, $f2 -/* 843DB8 802411E8 44102000 */ mfc1 $s0, $f4 -/* 843DBC 802411EC 0C0B1EAF */ jal get_variable -/* 843DC0 802411F0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 843DC4 802411F4 4600B306 */ mov.s $f12, $f22 -/* 843DC8 802411F8 0C00A8BB */ jal sin_deg -/* 843DCC 802411FC 0040882D */ daddu $s1, $v0, $zero -/* 843DD0 80241200 4600A502 */ mul.s $f20, $f20, $f0 -/* 843DD4 80241204 00000000 */ nop -/* 843DD8 80241208 0240202D */ daddu $a0, $s2, $zero -/* 843DDC 8024120C 44910000 */ mtc1 $s1, $f0 -/* 843DE0 80241210 00000000 */ nop -/* 843DE4 80241214 46800020 */ cvt.s.w $f0, $f0 -/* 843DE8 80241218 46140001 */ sub.s $f0, $f0, $f20 -/* 843DEC 8024121C 0280282D */ daddu $a1, $s4, $zero -/* 843DF0 80241220 02173023 */ subu $a2, $s0, $s7 -/* 843DF4 80241224 4600010D */ trunc.w.s $f4, $f0 -/* 843DF8 80241228 44102000 */ mfc1 $s0, $f4 -/* 843DFC 8024122C 0C0B2026 */ jal set_variable -/* 843E00 80241230 02168023 */ subu $s0, $s0, $s6 -/* 843E04 80241234 0240202D */ daddu $a0, $s2, $zero -/* 843E08 80241238 02A0282D */ daddu $a1, $s5, $zero -/* 843E0C 8024123C 0C0B2026 */ jal set_variable -/* 843E10 80241240 0200302D */ daddu $a2, $s0, $zero -/* 843E14 80241244 8FBF0030 */ lw $ra, 0x30($sp) -/* 843E18 80241248 8FB7002C */ lw $s7, 0x2c($sp) -/* 843E1C 8024124C 8FB60028 */ lw $s6, 0x28($sp) -/* 843E20 80241250 8FB50024 */ lw $s5, 0x24($sp) -/* 843E24 80241254 8FB40020 */ lw $s4, 0x20($sp) -/* 843E28 80241258 8FB3001C */ lw $s3, 0x1c($sp) -/* 843E2C 8024125C 8FB20018 */ lw $s2, 0x18($sp) -/* 843E30 80241260 8FB10014 */ lw $s1, 0x14($sp) -/* 843E34 80241264 8FB00010 */ lw $s0, 0x10($sp) -/* 843E38 80241268 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 843E3C 8024126C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 843E40 80241270 24020002 */ addiu $v0, $zero, 2 -/* 843E44 80241274 03E00008 */ jr $ra -/* 843E48 80241278 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s new file mode 100644 index 0000000000..4e17291946 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410E0_843CB0 +/* 843CB0 802410E0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 843CB4 802410E4 AFB20018 */ sw $s2, 0x18($sp) +/* 843CB8 802410E8 0080902D */ daddu $s2, $a0, $zero +/* 843CBC 802410EC AFBF0030 */ sw $ra, 0x30($sp) +/* 843CC0 802410F0 AFB7002C */ sw $s7, 0x2c($sp) +/* 843CC4 802410F4 AFB60028 */ sw $s6, 0x28($sp) +/* 843CC8 802410F8 AFB50024 */ sw $s5, 0x24($sp) +/* 843CCC 802410FC AFB40020 */ sw $s4, 0x20($sp) +/* 843CD0 80241100 AFB3001C */ sw $s3, 0x1c($sp) +/* 843CD4 80241104 AFB10014 */ sw $s1, 0x14($sp) +/* 843CD8 80241108 AFB00010 */ sw $s0, 0x10($sp) +/* 843CDC 8024110C F7B60040 */ sdc1 $f22, 0x40($sp) +/* 843CE0 80241110 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 843CE4 80241114 8E50000C */ lw $s0, 0xc($s2) +/* 843CE8 80241118 8E050000 */ lw $a1, ($s0) +/* 843CEC 8024111C 0C0B1EAF */ jal get_variable +/* 843CF0 80241120 26100004 */ addiu $s0, $s0, 4 +/* 843CF4 80241124 8E050000 */ lw $a1, ($s0) +/* 843CF8 80241128 26100004 */ addiu $s0, $s0, 4 +/* 843CFC 8024112C 0240202D */ daddu $a0, $s2, $zero +/* 843D00 80241130 0C0B1EAF */ jal get_variable +/* 843D04 80241134 0040B82D */ daddu $s7, $v0, $zero +/* 843D08 80241138 8E050000 */ lw $a1, ($s0) +/* 843D0C 8024113C 26100004 */ addiu $s0, $s0, 4 +/* 843D10 80241140 0240202D */ daddu $a0, $s2, $zero +/* 843D14 80241144 0C0B1EAF */ jal get_variable +/* 843D18 80241148 0040B02D */ daddu $s6, $v0, $zero +/* 843D1C 8024114C 0240202D */ daddu $a0, $s2, $zero +/* 843D20 80241150 3C05F4AC */ lui $a1, 0xf4ac +/* 843D24 80241154 34A5D481 */ ori $a1, $a1, 0xd481 +/* 843D28 80241158 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* 843D2C 8024115C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* 843D30 80241160 8E140000 */ lw $s4, ($s0) +/* 843D34 80241164 00061880 */ sll $v1, $a2, 2 +/* 843D38 80241168 00661821 */ addu $v1, $v1, $a2 +/* 843D3C 8024116C 00031880 */ sll $v1, $v1, 2 +/* 843D40 80241170 00661823 */ subu $v1, $v1, $a2 +/* 843D44 80241174 000330C0 */ sll $a2, $v1, 3 +/* 843D48 80241178 00661821 */ addu $v1, $v1, $a2 +/* 843D4C 8024117C 000318C0 */ sll $v1, $v1, 3 +/* 843D50 80241180 3C01800B */ lui $at, 0x800b +/* 843D54 80241184 00230821 */ addu $at, $at, $v1 +/* 843D58 80241188 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 843D5C 8024118C 8E150004 */ lw $s5, 4($s0) +/* 843D60 80241190 4600010D */ trunc.w.s $f4, $f0 +/* 843D64 80241194 44112000 */ mfc1 $s1, $f4 +/* 843D68 80241198 0C0B1EAF */ jal get_variable +/* 843D6C 8024119C 0040982D */ daddu $s3, $v0, $zero +/* 843D70 802411A0 4491B000 */ mtc1 $s1, $f22 +/* 843D74 802411A4 00000000 */ nop +/* 843D78 802411A8 4680B5A0 */ cvt.s.w $f22, $f22 +/* 843D7C 802411AC 4600B306 */ mov.s $f12, $f22 +/* 843D80 802411B0 0C00A8D4 */ jal cos_deg +/* 843D84 802411B4 0040802D */ daddu $s0, $v0, $zero +/* 843D88 802411B8 4493A000 */ mtc1 $s3, $f20 +/* 843D8C 802411BC 00000000 */ nop +/* 843D90 802411C0 4680A520 */ cvt.s.w $f20, $f20 +/* 843D94 802411C4 4600A002 */ mul.s $f0, $f20, $f0 +/* 843D98 802411C8 00000000 */ nop +/* 843D9C 802411CC 0240202D */ daddu $a0, $s2, $zero +/* 843DA0 802411D0 44901000 */ mtc1 $s0, $f2 +/* 843DA4 802411D4 00000000 */ nop +/* 843DA8 802411D8 468010A0 */ cvt.s.w $f2, $f2 +/* 843DAC 802411DC 46001081 */ sub.s $f2, $f2, $f0 +/* 843DB0 802411E0 3C05F4AC */ lui $a1, 0xf4ac +/* 843DB4 802411E4 4600110D */ trunc.w.s $f4, $f2 +/* 843DB8 802411E8 44102000 */ mfc1 $s0, $f4 +/* 843DBC 802411EC 0C0B1EAF */ jal get_variable +/* 843DC0 802411F0 34A5D483 */ ori $a1, $a1, 0xd483 +/* 843DC4 802411F4 4600B306 */ mov.s $f12, $f22 +/* 843DC8 802411F8 0C00A8BB */ jal sin_deg +/* 843DCC 802411FC 0040882D */ daddu $s1, $v0, $zero +/* 843DD0 80241200 4600A502 */ mul.s $f20, $f20, $f0 +/* 843DD4 80241204 00000000 */ nop +/* 843DD8 80241208 0240202D */ daddu $a0, $s2, $zero +/* 843DDC 8024120C 44910000 */ mtc1 $s1, $f0 +/* 843DE0 80241210 00000000 */ nop +/* 843DE4 80241214 46800020 */ cvt.s.w $f0, $f0 +/* 843DE8 80241218 46140001 */ sub.s $f0, $f0, $f20 +/* 843DEC 8024121C 0280282D */ daddu $a1, $s4, $zero +/* 843DF0 80241220 02173023 */ subu $a2, $s0, $s7 +/* 843DF4 80241224 4600010D */ trunc.w.s $f4, $f0 +/* 843DF8 80241228 44102000 */ mfc1 $s0, $f4 +/* 843DFC 8024122C 0C0B2026 */ jal set_variable +/* 843E00 80241230 02168023 */ subu $s0, $s0, $s6 +/* 843E04 80241234 0240202D */ daddu $a0, $s2, $zero +/* 843E08 80241238 02A0282D */ daddu $a1, $s5, $zero +/* 843E0C 8024123C 0C0B2026 */ jal set_variable +/* 843E10 80241240 0200302D */ daddu $a2, $s0, $zero +/* 843E14 80241244 8FBF0030 */ lw $ra, 0x30($sp) +/* 843E18 80241248 8FB7002C */ lw $s7, 0x2c($sp) +/* 843E1C 8024124C 8FB60028 */ lw $s6, 0x28($sp) +/* 843E20 80241250 8FB50024 */ lw $s5, 0x24($sp) +/* 843E24 80241254 8FB40020 */ lw $s4, 0x20($sp) +/* 843E28 80241258 8FB3001C */ lw $s3, 0x1c($sp) +/* 843E2C 8024125C 8FB20018 */ lw $s2, 0x18($sp) +/* 843E30 80241260 8FB10014 */ lw $s1, 0x14($sp) +/* 843E34 80241264 8FB00010 */ lw $s0, 0x10($sp) +/* 843E38 80241268 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 843E3C 8024126C D7B40038 */ ldc1 $f20, 0x38($sp) +/* 843E40 80241270 24020002 */ addiu $v0, $zero, 2 +/* 843E44 80241274 03E00008 */ jr $ra +/* 843E48 80241278 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0.s deleted file mode 100644 index 94b31d4f26..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E0 -/* 843EB0 802412E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 843EB4 802412E4 AFB10014 */ sw $s1, 0x14($sp) -/* 843EB8 802412E8 0080882D */ daddu $s1, $a0, $zero -/* 843EBC 802412EC AFB00010 */ sw $s0, 0x10($sp) -/* 843EC0 802412F0 00A0802D */ daddu $s0, $a1, $zero -/* 843EC4 802412F4 AFBF0018 */ sw $ra, 0x18($sp) -/* 843EC8 802412F8 0C00EABB */ jal get_npc_unsafe -/* 843ECC 802412FC 2404FFFC */ addiu $a0, $zero, -4 -/* 843ED0 80241300 12000003 */ beqz $s0, .L80241310 -/* 843ED4 80241304 0040182D */ daddu $v1, $v0, $zero -/* 843ED8 80241308 2402003C */ addiu $v0, $zero, 0x3c -/* 843EDC 8024130C AE220070 */ sw $v0, 0x70($s1) -.L80241310: -/* 843EE0 80241310 C462000C */ lwc1 $f2, 0xc($v1) -/* 843EE4 80241314 3C0141F0 */ lui $at, 0x41f0 -/* 843EE8 80241318 44810000 */ mtc1 $at, $f0 -/* 843EEC 8024131C 00000000 */ nop -/* 843EF0 80241320 46001000 */ add.s $f0, $f2, $f0 -/* 843EF4 80241324 3C0143B4 */ lui $at, 0x43b4 -/* 843EF8 80241328 44811000 */ mtc1 $at, $f2 -/* 843EFC 8024132C 00000000 */ nop -/* 843F00 80241330 4600103E */ c.le.s $f2, $f0 -/* 843F04 80241334 00000000 */ nop -/* 843F08 80241338 45000003 */ bc1f .L80241348 -/* 843F0C 8024133C E460000C */ swc1 $f0, 0xc($v1) -/* 843F10 80241340 46020001 */ sub.s $f0, $f0, $f2 -/* 843F14 80241344 E460000C */ swc1 $f0, 0xc($v1) -.L80241348: -/* 843F18 80241348 8E230070 */ lw $v1, 0x70($s1) -/* 843F1C 8024134C 2463FFFF */ addiu $v1, $v1, -1 -/* 843F20 80241350 000317C3 */ sra $v0, $v1, 0x1f -/* 843F24 80241354 AE230070 */ sw $v1, 0x70($s1) -/* 843F28 80241358 8FBF0018 */ lw $ra, 0x18($sp) -/* 843F2C 8024135C 8FB10014 */ lw $s1, 0x14($sp) -/* 843F30 80241360 8FB00010 */ lw $s0, 0x10($sp) -/* 843F34 80241364 30420002 */ andi $v0, $v0, 2 -/* 843F38 80241368 03E00008 */ jr $ra -/* 843F3C 8024136C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s new file mode 100644 index 0000000000..162d8949bb --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412E0_843EB0 +/* 843EB0 802412E0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 843EB4 802412E4 AFB10014 */ sw $s1, 0x14($sp) +/* 843EB8 802412E8 0080882D */ daddu $s1, $a0, $zero +/* 843EBC 802412EC AFB00010 */ sw $s0, 0x10($sp) +/* 843EC0 802412F0 00A0802D */ daddu $s0, $a1, $zero +/* 843EC4 802412F4 AFBF0018 */ sw $ra, 0x18($sp) +/* 843EC8 802412F8 0C00EABB */ jal get_npc_unsafe +/* 843ECC 802412FC 2404FFFC */ addiu $a0, $zero, -4 +/* 843ED0 80241300 12000003 */ beqz $s0, .L80241310 +/* 843ED4 80241304 0040182D */ daddu $v1, $v0, $zero +/* 843ED8 80241308 2402003C */ addiu $v0, $zero, 0x3c +/* 843EDC 8024130C AE220070 */ sw $v0, 0x70($s1) +.L80241310: +/* 843EE0 80241310 C462000C */ lwc1 $f2, 0xc($v1) +/* 843EE4 80241314 3C0141F0 */ lui $at, 0x41f0 +/* 843EE8 80241318 44810000 */ mtc1 $at, $f0 +/* 843EEC 8024131C 00000000 */ nop +/* 843EF0 80241320 46001000 */ add.s $f0, $f2, $f0 +/* 843EF4 80241324 3C0143B4 */ lui $at, 0x43b4 +/* 843EF8 80241328 44811000 */ mtc1 $at, $f2 +/* 843EFC 8024132C 00000000 */ nop +/* 843F00 80241330 4600103E */ c.le.s $f2, $f0 +/* 843F04 80241334 00000000 */ nop +/* 843F08 80241338 45000003 */ bc1f .L80241348 +/* 843F0C 8024133C E460000C */ swc1 $f0, 0xc($v1) +/* 843F10 80241340 46020001 */ sub.s $f0, $f0, $f2 +/* 843F14 80241344 E460000C */ swc1 $f0, 0xc($v1) +.L80241348: +/* 843F18 80241348 8E230070 */ lw $v1, 0x70($s1) +/* 843F1C 8024134C 2463FFFF */ addiu $v1, $v1, -1 +/* 843F20 80241350 000317C3 */ sra $v0, $v1, 0x1f +/* 843F24 80241354 AE230070 */ sw $v1, 0x70($s1) +/* 843F28 80241358 8FBF0018 */ lw $ra, 0x18($sp) +/* 843F2C 8024135C 8FB10014 */ lw $s1, 0x14($sp) +/* 843F30 80241360 8FB00010 */ lw $s0, 0x10($sp) +/* 843F34 80241364 30420002 */ andi $v0, $v0, 2 +/* 843F38 80241368 03E00008 */ jr $ra +/* 843F3C 8024136C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370.s deleted file mode 100644 index ef455969f7..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241370 -/* 843F40 80241370 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 843F44 80241374 AFB10014 */ sw $s1, 0x14($sp) -/* 843F48 80241378 0080882D */ daddu $s1, $a0, $zero -/* 843F4C 8024137C AFB00010 */ sw $s0, 0x10($sp) -/* 843F50 80241380 00A0802D */ daddu $s0, $a1, $zero -/* 843F54 80241384 AFBF001C */ sw $ra, 0x1c($sp) -/* 843F58 80241388 AFB20018 */ sw $s2, 0x18($sp) -/* 843F5C 8024138C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 843F60 80241390 0C00EABB */ jal get_npc_unsafe -/* 843F64 80241394 2404FFFC */ addiu $a0, $zero, -4 -/* 843F68 80241398 12000017 */ beqz $s0, .L802413F8 -/* 843F6C 8024139C 0040902D */ daddu $s2, $v0, $zero -/* 843F70 802413A0 0220202D */ daddu $a0, $s1, $zero -/* 843F74 802413A4 3C05FE36 */ lui $a1, 0xfe36 -/* 843F78 802413A8 0C0B210B */ jal get_float_variable -/* 843F7C 802413AC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 843F80 802413B0 0220202D */ daddu $a0, $s1, $zero -/* 843F84 802413B4 3C05FE36 */ lui $a1, 0xfe36 -/* 843F88 802413B8 3C014270 */ lui $at, 0x4270 -/* 843F8C 802413BC 4481A000 */ mtc1 $at, $f20 -/* 843F90 802413C0 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 843F94 802413C4 46140003 */ div.s $f0, $f0, $f20 -/* 843F98 802413C8 0C0B210B */ jal get_float_variable -/* 843F9C 802413CC E6200074 */ swc1 $f0, 0x74($s1) -/* 843FA0 802413D0 0220202D */ daddu $a0, $s1, $zero -/* 843FA4 802413D4 3C05FE36 */ lui $a1, 0xfe36 -/* 843FA8 802413D8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 843FAC 802413DC 46140003 */ div.s $f0, $f0, $f20 -/* 843FB0 802413E0 0C0B210B */ jal get_float_variable -/* 843FB4 802413E4 E6200078 */ swc1 $f0, 0x78($s1) -/* 843FB8 802413E8 46140003 */ div.s $f0, $f0, $f20 -/* 843FBC 802413EC 2402003C */ addiu $v0, $zero, 0x3c -/* 843FC0 802413F0 E620007C */ swc1 $f0, 0x7c($s1) -/* 843FC4 802413F4 AE220070 */ sw $v0, 0x70($s1) -.L802413F8: -/* 843FC8 802413F8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 843FCC 802413FC C6220074 */ lwc1 $f2, 0x74($s1) -/* 843FD0 80241400 46020000 */ add.s $f0, $f0, $f2 -/* 843FD4 80241404 E6400038 */ swc1 $f0, 0x38($s2) -/* 843FD8 80241408 C640003C */ lwc1 $f0, 0x3c($s2) -/* 843FDC 8024140C C6220078 */ lwc1 $f2, 0x78($s1) -/* 843FE0 80241410 46020000 */ add.s $f0, $f0, $f2 -/* 843FE4 80241414 E640003C */ swc1 $f0, 0x3c($s2) -/* 843FE8 80241418 C6400040 */ lwc1 $f0, 0x40($s2) -/* 843FEC 8024141C C622007C */ lwc1 $f2, 0x7c($s1) -/* 843FF0 80241420 46020000 */ add.s $f0, $f0, $f2 -/* 843FF4 80241424 E6400040 */ swc1 $f0, 0x40($s2) -/* 843FF8 80241428 8E230070 */ lw $v1, 0x70($s1) -/* 843FFC 8024142C 2463FFFF */ addiu $v1, $v1, -1 -/* 844000 80241430 2C620001 */ sltiu $v0, $v1, 1 -/* 844004 80241434 AE230070 */ sw $v1, 0x70($s1) -/* 844008 80241438 8FBF001C */ lw $ra, 0x1c($sp) -/* 84400C 8024143C 8FB20018 */ lw $s2, 0x18($sp) -/* 844010 80241440 8FB10014 */ lw $s1, 0x14($sp) -/* 844014 80241444 8FB00010 */ lw $s0, 0x10($sp) -/* 844018 80241448 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 84401C 8024144C 00021040 */ sll $v0, $v0, 1 -/* 844020 80241450 03E00008 */ jr $ra -/* 844024 80241454 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s new file mode 100644 index 0000000000..43bf452bf7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241370_843F40 +/* 843F40 80241370 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 843F44 80241374 AFB10014 */ sw $s1, 0x14($sp) +/* 843F48 80241378 0080882D */ daddu $s1, $a0, $zero +/* 843F4C 8024137C AFB00010 */ sw $s0, 0x10($sp) +/* 843F50 80241380 00A0802D */ daddu $s0, $a1, $zero +/* 843F54 80241384 AFBF001C */ sw $ra, 0x1c($sp) +/* 843F58 80241388 AFB20018 */ sw $s2, 0x18($sp) +/* 843F5C 8024138C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 843F60 80241390 0C00EABB */ jal get_npc_unsafe +/* 843F64 80241394 2404FFFC */ addiu $a0, $zero, -4 +/* 843F68 80241398 12000017 */ beqz $s0, .L802413F8 +/* 843F6C 8024139C 0040902D */ daddu $s2, $v0, $zero +/* 843F70 802413A0 0220202D */ daddu $a0, $s1, $zero +/* 843F74 802413A4 3C05FE36 */ lui $a1, 0xfe36 +/* 843F78 802413A8 0C0B210B */ jal get_float_variable +/* 843F7C 802413AC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 843F80 802413B0 0220202D */ daddu $a0, $s1, $zero +/* 843F84 802413B4 3C05FE36 */ lui $a1, 0xfe36 +/* 843F88 802413B8 3C014270 */ lui $at, 0x4270 +/* 843F8C 802413BC 4481A000 */ mtc1 $at, $f20 +/* 843F90 802413C0 34A53C85 */ ori $a1, $a1, 0x3c85 +/* 843F94 802413C4 46140003 */ div.s $f0, $f0, $f20 +/* 843F98 802413C8 0C0B210B */ jal get_float_variable +/* 843F9C 802413CC E6200074 */ swc1 $f0, 0x74($s1) +/* 843FA0 802413D0 0220202D */ daddu $a0, $s1, $zero +/* 843FA4 802413D4 3C05FE36 */ lui $a1, 0xfe36 +/* 843FA8 802413D8 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 843FAC 802413DC 46140003 */ div.s $f0, $f0, $f20 +/* 843FB0 802413E0 0C0B210B */ jal get_float_variable +/* 843FB4 802413E4 E6200078 */ swc1 $f0, 0x78($s1) +/* 843FB8 802413E8 46140003 */ div.s $f0, $f0, $f20 +/* 843FBC 802413EC 2402003C */ addiu $v0, $zero, 0x3c +/* 843FC0 802413F0 E620007C */ swc1 $f0, 0x7c($s1) +/* 843FC4 802413F4 AE220070 */ sw $v0, 0x70($s1) +.L802413F8: +/* 843FC8 802413F8 C6400038 */ lwc1 $f0, 0x38($s2) +/* 843FCC 802413FC C6220074 */ lwc1 $f2, 0x74($s1) +/* 843FD0 80241400 46020000 */ add.s $f0, $f0, $f2 +/* 843FD4 80241404 E6400038 */ swc1 $f0, 0x38($s2) +/* 843FD8 80241408 C640003C */ lwc1 $f0, 0x3c($s2) +/* 843FDC 8024140C C6220078 */ lwc1 $f2, 0x78($s1) +/* 843FE0 80241410 46020000 */ add.s $f0, $f0, $f2 +/* 843FE4 80241414 E640003C */ swc1 $f0, 0x3c($s2) +/* 843FE8 80241418 C6400040 */ lwc1 $f0, 0x40($s2) +/* 843FEC 8024141C C622007C */ lwc1 $f2, 0x7c($s1) +/* 843FF0 80241420 46020000 */ add.s $f0, $f0, $f2 +/* 843FF4 80241424 E6400040 */ swc1 $f0, 0x40($s2) +/* 843FF8 80241428 8E230070 */ lw $v1, 0x70($s1) +/* 843FFC 8024142C 2463FFFF */ addiu $v1, $v1, -1 +/* 844000 80241430 2C620001 */ sltiu $v0, $v1, 1 +/* 844004 80241434 AE230070 */ sw $v1, 0x70($s1) +/* 844008 80241438 8FBF001C */ lw $ra, 0x1c($sp) +/* 84400C 8024143C 8FB20018 */ lw $s2, 0x18($sp) +/* 844010 80241440 8FB10014 */ lw $s1, 0x14($sp) +/* 844014 80241444 8FB00010 */ lw $s0, 0x10($sp) +/* 844018 80241448 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 84401C 8024144C 00021040 */ sll $v0, $v0, 1 +/* 844020 80241450 03E00008 */ jr $ra +/* 844024 80241454 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458.s deleted file mode 100644 index 0f474de1f0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241458 -/* 844028 80241458 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 84402C 8024145C 3C058025 */ lui $a1, 0x8025 -/* 844030 80241460 8CA5F5B8 */ lw $a1, -0xa48($a1) -/* 844034 80241464 AFBF0010 */ sw $ra, 0x10($sp) -/* 844038 80241468 0C0B1EAF */ jal get_variable -/* 84403C 8024146C 0000202D */ daddu $a0, $zero, $zero -/* 844040 80241470 0040182D */ daddu $v1, $v0, $zero -/* 844044 80241474 24020001 */ addiu $v0, $zero, 1 -/* 844048 80241478 14620006 */ bne $v1, $v0, .L80241494 -/* 84404C 8024147C 24020002 */ addiu $v0, $zero, 2 -/* 844050 80241480 44800000 */ mtc1 $zero, $f0 -/* 844054 80241484 00000000 */ nop -/* 844058 80241488 44050000 */ mfc1 $a1, $f0 -/* 84405C 8024148C 0809052B */ j .L802414AC -/* 844060 80241490 0000202D */ daddu $a0, $zero, $zero -.L80241494: -/* 844064 80241494 14620008 */ bne $v1, $v0, .L802414B8 -/* 844068 80241498 24040001 */ addiu $a0, $zero, 1 -/* 84406C 8024149C 44800000 */ mtc1 $zero, $f0 -/* 844070 802414A0 00000000 */ nop -/* 844074 802414A4 44050000 */ mfc1 $a1, $f0 -/* 844078 802414A8 00000000 */ nop -.L802414AC: -/* 84407C 802414AC 00A0302D */ daddu $a2, $a1, $zero -/* 844080 802414B0 0C01C5A4 */ jal func_80071690 -/* 844084 802414B4 00A0382D */ daddu $a3, $a1, $zero -.L802414B8: -/* 844088 802414B8 8FBF0010 */ lw $ra, 0x10($sp) -/* 84408C 802414BC 03E00008 */ jr $ra -/* 844090 802414C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s new file mode 100644 index 0000000000..3c5ffd571f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241458_844028.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241458_844028 +/* 844028 80241458 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 84402C 8024145C 3C058025 */ lui $a1, 0x8025 +/* 844030 80241460 8CA5F5B8 */ lw $a1, -0xa48($a1) +/* 844034 80241464 AFBF0010 */ sw $ra, 0x10($sp) +/* 844038 80241468 0C0B1EAF */ jal get_variable +/* 84403C 8024146C 0000202D */ daddu $a0, $zero, $zero +/* 844040 80241470 0040182D */ daddu $v1, $v0, $zero +/* 844044 80241474 24020001 */ addiu $v0, $zero, 1 +/* 844048 80241478 14620006 */ bne $v1, $v0, .L80241494 +/* 84404C 8024147C 24020002 */ addiu $v0, $zero, 2 +/* 844050 80241480 44800000 */ mtc1 $zero, $f0 +/* 844054 80241484 00000000 */ nop +/* 844058 80241488 44050000 */ mfc1 $a1, $f0 +/* 84405C 8024148C 0809052B */ j .L802414AC +/* 844060 80241490 0000202D */ daddu $a0, $zero, $zero +.L80241494: +/* 844064 80241494 14620008 */ bne $v1, $v0, .L802414B8 +/* 844068 80241498 24040001 */ addiu $a0, $zero, 1 +/* 84406C 8024149C 44800000 */ mtc1 $zero, $f0 +/* 844070 802414A0 00000000 */ nop +/* 844074 802414A4 44050000 */ mfc1 $a1, $f0 +/* 844078 802414A8 00000000 */ nop +.L802414AC: +/* 84407C 802414AC 00A0302D */ daddu $a2, $a1, $zero +/* 844080 802414B0 0C01C5A4 */ jal func_80071690 +/* 844084 802414B4 00A0382D */ daddu $a3, $a1, $zero +.L802414B8: +/* 844088 802414B8 8FBF0010 */ lw $ra, 0x10($sp) +/* 84408C 802414BC 03E00008 */ jr $ra +/* 844090 802414C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774.s deleted file mode 100644 index 7a4a96f742..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241774 -/* 844344 80241774 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844348 80241778 AFBF0010 */ sw $ra, 0x10($sp) -/* 84434C 8024177C 8C82000C */ lw $v0, 0xc($a0) -/* 844350 80241780 0C0B1EAF */ jal get_variable -/* 844354 80241784 8C450000 */ lw $a1, ($v0) -/* 844358 80241788 3C018024 */ lui $at, 0x8024 -/* 84435C 8024178C AC226614 */ sw $v0, 0x6614($at) -/* 844360 80241790 24020002 */ addiu $v0, $zero, 2 -/* 844364 80241794 8FBF0010 */ lw $ra, 0x10($sp) -/* 844368 80241798 24030001 */ addiu $v1, $zero, 1 -/* 84436C 8024179C 3C018024 */ lui $at, 0x8024 -/* 844370 802417A0 AC236610 */ sw $v1, 0x6610($at) -/* 844374 802417A4 03E00008 */ jr $ra -/* 844378 802417A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s new file mode 100644 index 0000000000..30e2e2159c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241774_844344.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241774_844344 +/* 844344 80241774 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 844348 80241778 AFBF0010 */ sw $ra, 0x10($sp) +/* 84434C 8024177C 8C82000C */ lw $v0, 0xc($a0) +/* 844350 80241780 0C0B1EAF */ jal get_variable +/* 844354 80241784 8C450000 */ lw $a1, ($v0) +/* 844358 80241788 3C018024 */ lui $at, 0x8024 +/* 84435C 8024178C AC226614 */ sw $v0, 0x6614($at) +/* 844360 80241790 24020002 */ addiu $v0, $zero, 2 +/* 844364 80241794 8FBF0010 */ lw $ra, 0x10($sp) +/* 844368 80241798 24030001 */ addiu $v1, $zero, 1 +/* 84436C 8024179C 3C018024 */ lui $at, 0x8024 +/* 844370 802417A0 AC236610 */ sw $v1, 0x6610($at) +/* 844374 802417A4 03E00008 */ jr $ra +/* 844378 802417A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC.s deleted file mode 100644 index aa9bdd48e0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417AC -/* 84437C 802417AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844380 802417B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 844384 802417B4 8C82000C */ lw $v0, 0xc($a0) -/* 844388 802417B8 0C0B1EAF */ jal get_variable -/* 84438C 802417BC 8C450000 */ lw $a1, ($v0) -/* 844390 802417C0 0040182D */ daddu $v1, $v0, $zero -/* 844394 802417C4 10600012 */ beqz $v1, .L80241810 -/* 844398 802417C8 0000202D */ daddu $a0, $zero, $zero -/* 84439C 802417CC 8C620000 */ lw $v0, ($v1) -/* 8443A0 802417D0 5040000A */ beql $v0, $zero, .L802417FC -/* 8443A4 802417D4 00041080 */ sll $v0, $a0, 2 -/* 8443A8 802417D8 3C058025 */ lui $a1, 0x8025 -/* 8443AC 802417DC 24A5F5D0 */ addiu $a1, $a1, -0xa30 -.L802417E0: -/* 8443B0 802417E0 24630004 */ addiu $v1, $v1, 4 -/* 8443B4 802417E4 24840001 */ addiu $a0, $a0, 1 -/* 8443B8 802417E8 ACA20000 */ sw $v0, ($a1) -/* 8443BC 802417EC 8C620000 */ lw $v0, ($v1) -/* 8443C0 802417F0 1440FFFB */ bnez $v0, .L802417E0 -/* 8443C4 802417F4 24A50004 */ addiu $a1, $a1, 4 -/* 8443C8 802417F8 00041080 */ sll $v0, $a0, 2 -.L802417FC: -/* 8443CC 802417FC 3C018025 */ lui $at, 0x8025 -/* 8443D0 80241800 00220821 */ addu $at, $at, $v0 -/* 8443D4 80241804 AC20F5D0 */ sw $zero, -0xa30($at) -/* 8443D8 80241808 0809060E */ j .L80241838 -/* 8443DC 8024180C 00000000 */ nop -.L80241810: -/* 8443E0 80241810 3C038025 */ lui $v1, 0x8025 -/* 8443E4 80241814 2463F5D0 */ addiu $v1, $v1, -0xa30 -/* 8443E8 80241818 0060282D */ daddu $a1, $v1, $zero -.L8024181C: -/* 8443EC 8024181C 24820010 */ addiu $v0, $a0, 0x10 -/* 8443F0 80241820 AC620000 */ sw $v0, ($v1) -/* 8443F4 80241824 24630004 */ addiu $v1, $v1, 4 -/* 8443F8 80241828 24840001 */ addiu $a0, $a0, 1 -/* 8443FC 8024182C 28820070 */ slti $v0, $a0, 0x70 -/* 844400 80241830 1440FFFA */ bnez $v0, .L8024181C -/* 844404 80241834 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80241838: -/* 844408 80241838 8FBF0010 */ lw $ra, 0x10($sp) -/* 84440C 8024183C 24020002 */ addiu $v0, $zero, 2 -/* 844410 80241840 03E00008 */ jr $ra -/* 844414 80241844 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s new file mode 100644 index 0000000000..fa3bedd331 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802417AC_84437C.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417AC_84437C +/* 84437C 802417AC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 844380 802417B0 AFBF0010 */ sw $ra, 0x10($sp) +/* 844384 802417B4 8C82000C */ lw $v0, 0xc($a0) +/* 844388 802417B8 0C0B1EAF */ jal get_variable +/* 84438C 802417BC 8C450000 */ lw $a1, ($v0) +/* 844390 802417C0 0040182D */ daddu $v1, $v0, $zero +/* 844394 802417C4 10600012 */ beqz $v1, .L80241810 +/* 844398 802417C8 0000202D */ daddu $a0, $zero, $zero +/* 84439C 802417CC 8C620000 */ lw $v0, ($v1) +/* 8443A0 802417D0 5040000A */ beql $v0, $zero, .L802417FC +/* 8443A4 802417D4 00041080 */ sll $v0, $a0, 2 +/* 8443A8 802417D8 3C058025 */ lui $a1, 0x8025 +/* 8443AC 802417DC 24A5F5D0 */ addiu $a1, $a1, -0xa30 +.L802417E0: +/* 8443B0 802417E0 24630004 */ addiu $v1, $v1, 4 +/* 8443B4 802417E4 24840001 */ addiu $a0, $a0, 1 +/* 8443B8 802417E8 ACA20000 */ sw $v0, ($a1) +/* 8443BC 802417EC 8C620000 */ lw $v0, ($v1) +/* 8443C0 802417F0 1440FFFB */ bnez $v0, .L802417E0 +/* 8443C4 802417F4 24A50004 */ addiu $a1, $a1, 4 +/* 8443C8 802417F8 00041080 */ sll $v0, $a0, 2 +.L802417FC: +/* 8443CC 802417FC 3C018025 */ lui $at, 0x8025 +/* 8443D0 80241800 00220821 */ addu $at, $at, $v0 +/* 8443D4 80241804 AC20F5D0 */ sw $zero, -0xa30($at) +/* 8443D8 80241808 0809060E */ j .L80241838 +/* 8443DC 8024180C 00000000 */ nop +.L80241810: +/* 8443E0 80241810 3C038025 */ lui $v1, 0x8025 +/* 8443E4 80241814 2463F5D0 */ addiu $v1, $v1, -0xa30 +/* 8443E8 80241818 0060282D */ daddu $a1, $v1, $zero +.L8024181C: +/* 8443EC 8024181C 24820010 */ addiu $v0, $a0, 0x10 +/* 8443F0 80241820 AC620000 */ sw $v0, ($v1) +/* 8443F4 80241824 24630004 */ addiu $v1, $v1, 4 +/* 8443F8 80241828 24840001 */ addiu $a0, $a0, 1 +/* 8443FC 8024182C 28820070 */ slti $v0, $a0, 0x70 +/* 844400 80241830 1440FFFA */ bnez $v0, .L8024181C +/* 844404 80241834 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80241838: +/* 844408 80241838 8FBF0010 */ lw $ra, 0x10($sp) +/* 84440C 8024183C 24020002 */ addiu $v0, $zero, 2 +/* 844410 80241840 03E00008 */ jr $ra +/* 844414 80241844 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848.s deleted file mode 100644 index f637286bd0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241848 -/* 844418 80241848 0000302D */ daddu $a2, $zero, $zero -/* 84441C 8024184C 00C0282D */ daddu $a1, $a2, $zero -/* 844420 80241850 3C088008 */ lui $t0, %hi(gItemTable) -/* 844424 80241854 250878E0 */ addiu $t0, $t0, %lo(gItemTable) -/* 844428 80241858 3C078009 */ lui $a3, 0x8009 -/* 84442C 8024185C 24E7F060 */ addiu $a3, $a3, -0xfa0 -/* 844430 80241860 3C048011 */ lui $a0, %hi(gPlayerData) -/* 844434 80241864 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) -.L80241868: -/* 844438 80241868 84820208 */ lh $v0, 0x208($a0) -/* 84443C 8024186C 1040000A */ beqz $v0, .L80241898 -/* 844440 80241870 24A50001 */ addiu $a1, $a1, 1 -/* 844444 80241874 00021140 */ sll $v0, $v0, 5 -/* 844448 80241878 00481021 */ addu $v0, $v0, $t0 -/* 84444C 8024187C 9043001A */ lbu $v1, 0x1a($v0) -/* 844450 80241880 00031080 */ sll $v0, $v1, 2 -/* 844454 80241884 00431021 */ addu $v0, $v0, $v1 -/* 844458 80241888 00021080 */ sll $v0, $v0, 2 -/* 84445C 8024188C 00471021 */ addu $v0, $v0, $a3 -/* 844460 80241890 80420012 */ lb $v0, 0x12($v0) -/* 844464 80241894 00C23021 */ addu $a2, $a2, $v0 -.L80241898: -/* 844468 80241898 28A20040 */ slti $v0, $a1, 0x40 -/* 84446C 8024189C 1440FFF2 */ bnez $v0, .L80241868 -/* 844470 802418A0 24840002 */ addiu $a0, $a0, 2 -/* 844474 802418A4 03E00008 */ jr $ra -/* 844478 802418A8 00C0102D */ daddu $v0, $a2, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s new file mode 100644 index 0000000000..6d8b1232c1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241848_844418.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241848_844418 +/* 844418 80241848 0000302D */ daddu $a2, $zero, $zero +/* 84441C 8024184C 00C0282D */ daddu $a1, $a2, $zero +/* 844420 80241850 3C088008 */ lui $t0, %hi(gItemTable) +/* 844424 80241854 250878E0 */ addiu $t0, $t0, %lo(gItemTable) +/* 844428 80241858 3C078009 */ lui $a3, 0x8009 +/* 84442C 8024185C 24E7F060 */ addiu $a3, $a3, -0xfa0 +/* 844430 80241860 3C048011 */ lui $a0, %hi(gPlayerData) +/* 844434 80241864 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) +.L80241868: +/* 844438 80241868 84820208 */ lh $v0, 0x208($a0) +/* 84443C 8024186C 1040000A */ beqz $v0, .L80241898 +/* 844440 80241870 24A50001 */ addiu $a1, $a1, 1 +/* 844444 80241874 00021140 */ sll $v0, $v0, 5 +/* 844448 80241878 00481021 */ addu $v0, $v0, $t0 +/* 84444C 8024187C 9043001A */ lbu $v1, 0x1a($v0) +/* 844450 80241880 00031080 */ sll $v0, $v1, 2 +/* 844454 80241884 00431021 */ addu $v0, $v0, $v1 +/* 844458 80241888 00021080 */ sll $v0, $v0, 2 +/* 84445C 8024188C 00471021 */ addu $v0, $v0, $a3 +/* 844460 80241890 80420012 */ lb $v0, 0x12($v0) +/* 844464 80241894 00C23021 */ addu $a2, $a2, $v0 +.L80241898: +/* 844468 80241898 28A20040 */ slti $v0, $a1, 0x40 +/* 84446C 8024189C 1440FFF2 */ bnez $v0, .L80241868 +/* 844470 802418A0 24840002 */ addiu $a0, $a0, 2 +/* 844474 802418A4 03E00008 */ jr $ra +/* 844478 802418A8 00C0102D */ daddu $v0, $a2, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC.s deleted file mode 100644 index 4ca1a04658..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418AC -/* 84447C 802418AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 844480 802418B0 AFB00010 */ sw $s0, 0x10($sp) -/* 844484 802418B4 0080802D */ daddu $s0, $a0, $zero -/* 844488 802418B8 AFBF001C */ sw $ra, 0x1c($sp) -/* 84448C 802418BC AFB20018 */ sw $s2, 0x18($sp) -/* 844490 802418C0 AFB10014 */ sw $s1, 0x14($sp) -/* 844494 802418C4 8E02000C */ lw $v0, 0xc($s0) -/* 844498 802418C8 0C090612 */ jal func_80241848 -/* 84449C 802418CC 8C520000 */ lw $s2, ($v0) -/* 8444A0 802418D0 3C118011 */ lui $s1, %hi(gPlayerData) -/* 8444A4 802418D4 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* 8444A8 802418D8 82230008 */ lb $v1, 8($s1) -/* 8444AC 802418DC 0062182A */ slt $v1, $v1, $v0 -/* 8444B0 802418E0 14600005 */ bnez $v1, .L802418F8 -/* 8444B4 802418E4 2403003F */ addiu $v1, $zero, 0x3f -/* 8444B8 802418E8 0200202D */ daddu $a0, $s0, $zero -/* 8444BC 802418EC 0240282D */ daddu $a1, $s2, $zero -/* 8444C0 802418F0 08090648 */ j .L80241920 -/* 8444C4 802418F4 0000302D */ daddu $a2, $zero, $zero -.L802418F8: -/* 8444C8 802418F8 26220286 */ addiu $v0, $s1, 0x286 -.L802418FC: -/* 8444CC 802418FC A4400000 */ sh $zero, ($v0) -/* 8444D0 80241900 2463FFFF */ addiu $v1, $v1, -1 -/* 8444D4 80241904 0461FFFD */ bgez $v1, .L802418FC -/* 8444D8 80241908 2442FFFE */ addiu $v0, $v0, -2 -/* 8444DC 8024190C 0C039E1B */ jal enforce_hpfp_limits -/* 8444E0 80241910 00000000 */ nop -/* 8444E4 80241914 0200202D */ daddu $a0, $s0, $zero -/* 8444E8 80241918 0240282D */ daddu $a1, $s2, $zero -/* 8444EC 8024191C 24060001 */ addiu $a2, $zero, 1 -.L80241920: -/* 8444F0 80241920 0C0B2026 */ jal set_variable -/* 8444F4 80241924 00000000 */ nop -/* 8444F8 80241928 24020002 */ addiu $v0, $zero, 2 -/* 8444FC 8024192C 8FBF001C */ lw $ra, 0x1c($sp) -/* 844500 80241930 8FB20018 */ lw $s2, 0x18($sp) -/* 844504 80241934 8FB10014 */ lw $s1, 0x14($sp) -/* 844508 80241938 8FB00010 */ lw $s0, 0x10($sp) -/* 84450C 8024193C 03E00008 */ jr $ra -/* 844510 80241940 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s new file mode 100644 index 0000000000..be25ef331d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802418AC_84447C.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418AC_84447C +/* 84447C 802418AC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 844480 802418B0 AFB00010 */ sw $s0, 0x10($sp) +/* 844484 802418B4 0080802D */ daddu $s0, $a0, $zero +/* 844488 802418B8 AFBF001C */ sw $ra, 0x1c($sp) +/* 84448C 802418BC AFB20018 */ sw $s2, 0x18($sp) +/* 844490 802418C0 AFB10014 */ sw $s1, 0x14($sp) +/* 844494 802418C4 8E02000C */ lw $v0, 0xc($s0) +/* 844498 802418C8 0C090612 */ jal func_80241848_844418 +/* 84449C 802418CC 8C520000 */ lw $s2, ($v0) +/* 8444A0 802418D0 3C118011 */ lui $s1, %hi(gPlayerData) +/* 8444A4 802418D4 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) +/* 8444A8 802418D8 82230008 */ lb $v1, 8($s1) +/* 8444AC 802418DC 0062182A */ slt $v1, $v1, $v0 +/* 8444B0 802418E0 14600005 */ bnez $v1, .L802418F8 +/* 8444B4 802418E4 2403003F */ addiu $v1, $zero, 0x3f +/* 8444B8 802418E8 0200202D */ daddu $a0, $s0, $zero +/* 8444BC 802418EC 0240282D */ daddu $a1, $s2, $zero +/* 8444C0 802418F0 08090648 */ j .L80241920 +/* 8444C4 802418F4 0000302D */ daddu $a2, $zero, $zero +.L802418F8: +/* 8444C8 802418F8 26220286 */ addiu $v0, $s1, 0x286 +.L802418FC: +/* 8444CC 802418FC A4400000 */ sh $zero, ($v0) +/* 8444D0 80241900 2463FFFF */ addiu $v1, $v1, -1 +/* 8444D4 80241904 0461FFFD */ bgez $v1, .L802418FC +/* 8444D8 80241908 2442FFFE */ addiu $v0, $v0, -2 +/* 8444DC 8024190C 0C039E1B */ jal enforce_hpfp_limits +/* 8444E0 80241910 00000000 */ nop +/* 8444E4 80241914 0200202D */ daddu $a0, $s0, $zero +/* 8444E8 80241918 0240282D */ daddu $a1, $s2, $zero +/* 8444EC 8024191C 24060001 */ addiu $a2, $zero, 1 +.L80241920: +/* 8444F0 80241920 0C0B2026 */ jal set_variable +/* 8444F4 80241924 00000000 */ nop +/* 8444F8 80241928 24020002 */ addiu $v0, $zero, 2 +/* 8444FC 8024192C 8FBF001C */ lw $ra, 0x1c($sp) +/* 844500 80241930 8FB20018 */ lw $s2, 0x18($sp) +/* 844504 80241934 8FB10014 */ lw $s1, 0x14($sp) +/* 844508 80241938 8FB00010 */ lw $s0, 0x10($sp) +/* 84450C 8024193C 03E00008 */ jr $ra +/* 844510 80241940 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241980.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241980.s deleted file mode 100644 index 1e9903858b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241980.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241980 -/* 844550 80241980 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844554 80241984 AFBF0010 */ sw $ra, 0x10($sp) -/* 844558 80241988 8C82000C */ lw $v0, 0xc($a0) -/* 84455C 8024198C 3C068016 */ lui $a2, 0x8016 -/* 844560 80241990 84C6A552 */ lh $a2, -0x5aae($a2) -/* 844564 80241994 0C0B2026 */ jal set_variable -/* 844568 80241998 8C450000 */ lw $a1, ($v0) -/* 84456C 8024199C 8FBF0010 */ lw $ra, 0x10($sp) -/* 844570 802419A0 24020002 */ addiu $v0, $zero, 2 -/* 844574 802419A4 03E00008 */ jr $ra -/* 844578 802419A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241980_844550.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241980_844550.s new file mode 100644 index 0000000000..a1ca68761d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241980_844550.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241980_844550 +/* 844550 80241980 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 844554 80241984 AFBF0010 */ sw $ra, 0x10($sp) +/* 844558 80241988 8C82000C */ lw $v0, 0xc($a0) +/* 84455C 8024198C 3C068016 */ lui $a2, 0x8016 +/* 844560 80241990 84C6A552 */ lh $a2, -0x5aae($a2) +/* 844564 80241994 0C0B2026 */ jal set_variable +/* 844568 80241998 8C450000 */ lw $a1, ($v0) +/* 84456C 8024199C 8FBF0010 */ lw $ra, 0x10($sp) +/* 844570 802419A0 24020002 */ addiu $v0, $zero, 2 +/* 844574 802419A4 03E00008 */ jr $ra +/* 844578 802419A8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC.s deleted file mode 100644 index 9b58ff8883..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419AC -/* 84457C 802419AC 3C038011 */ lui $v1, 0x8011 -/* 844580 802419B0 8063EBB3 */ lb $v1, -0x144d($v1) -/* 844584 802419B4 24020009 */ addiu $v0, $zero, 9 -/* 844588 802419B8 54620003 */ bnel $v1, $v0, .L802419C8 -/* 84458C 802419BC AC800084 */ sw $zero, 0x84($a0) -/* 844590 802419C0 24020001 */ addiu $v0, $zero, 1 -/* 844594 802419C4 AC820084 */ sw $v0, 0x84($a0) -.L802419C8: -/* 844598 802419C8 03E00008 */ jr $ra -/* 84459C 802419CC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s new file mode 100644 index 0000000000..9d7f2f61f2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419AC_84457C.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419AC_84457C +/* 84457C 802419AC 3C038011 */ lui $v1, 0x8011 +/* 844580 802419B0 8063EBB3 */ lb $v1, -0x144d($v1) +/* 844584 802419B4 24020009 */ addiu $v0, $zero, 9 +/* 844588 802419B8 54620003 */ bnel $v1, $v0, .L802419C8 +/* 84458C 802419BC AC800084 */ sw $zero, 0x84($a0) +/* 844590 802419C0 24020001 */ addiu $v0, $zero, 1 +/* 844594 802419C4 AC820084 */ sw $v0, 0x84($a0) +.L802419C8: +/* 844598 802419C8 03E00008 */ jr $ra +/* 84459C 802419CC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0.s deleted file mode 100644 index 4e59af6d02..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D0 -/* 8445A0 802419D0 3C028011 */ lui $v0, 0x8011 -/* 8445A4 802419D4 8442F29C */ lh $v0, -0xd64($v0) -/* 8445A8 802419D8 AC820084 */ sw $v0, 0x84($a0) -/* 8445AC 802419DC 03E00008 */ jr $ra -/* 8445B0 802419E0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s new file mode 100644 index 0000000000..d61c2be71c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419D0_8445A0 +/* 8445A0 802419D0 3C028011 */ lui $v0, 0x8011 +/* 8445A4 802419D4 8442F29C */ lh $v0, -0xd64($v0) +/* 8445A8 802419D8 AC820084 */ sw $v0, 0x84($a0) +/* 8445AC 802419DC 03E00008 */ jr $ra +/* 8445B0 802419E0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4.s deleted file mode 100644 index 37a111da8b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419E4 -/* 8445B4 802419E4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8445B8 802419E8 AFB00010 */ sw $s0, 0x10($sp) -/* 8445BC 802419EC 0080802D */ daddu $s0, $a0, $zero -/* 8445C0 802419F0 AFB10014 */ sw $s1, 0x14($sp) -/* 8445C4 802419F4 3C118011 */ lui $s1, %hi(gPlayerData) -/* 8445C8 802419F8 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) -/* 8445CC 802419FC AFBF0020 */ sw $ra, 0x20($sp) -/* 8445D0 80241A00 AFB3001C */ sw $s3, 0x1c($sp) -/* 8445D4 80241A04 AFB20018 */ sw $s2, 0x18($sp) -/* 8445D8 80241A08 8E02000C */ lw $v0, 0xc($s0) -/* 8445DC 80241A0C 82260004 */ lb $a2, 4($s1) -/* 8445E0 80241A10 8C450000 */ lw $a1, ($v0) -/* 8445E4 80241A14 24420004 */ addiu $v0, $v0, 4 -/* 8445E8 80241A18 8C520000 */ lw $s2, ($v0) -/* 8445EC 80241A1C 0C0B2026 */ jal set_variable -/* 8445F0 80241A20 8C530004 */ lw $s3, 4($v0) -/* 8445F4 80241A24 0200202D */ daddu $a0, $s0, $zero -/* 8445F8 80241A28 82260007 */ lb $a2, 7($s1) -/* 8445FC 80241A2C 0C0B2026 */ jal set_variable -/* 844600 80241A30 0240282D */ daddu $a1, $s2, $zero -/* 844604 80241A34 0200202D */ daddu $a0, $s0, $zero -/* 844608 80241A38 82260008 */ lb $a2, 8($s1) -/* 84460C 80241A3C 0C0B2026 */ jal set_variable -/* 844610 80241A40 0260282D */ daddu $a1, $s3, $zero -/* 844614 80241A44 8FBF0020 */ lw $ra, 0x20($sp) -/* 844618 80241A48 8FB3001C */ lw $s3, 0x1c($sp) -/* 84461C 80241A4C 8FB20018 */ lw $s2, 0x18($sp) -/* 844620 80241A50 8FB10014 */ lw $s1, 0x14($sp) -/* 844624 80241A54 8FB00010 */ lw $s0, 0x10($sp) -/* 844628 80241A58 24020002 */ addiu $v0, $zero, 2 -/* 84462C 80241A5C 03E00008 */ jr $ra -/* 844630 80241A60 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s new file mode 100644 index 0000000000..19c027e981 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419E4_8445B4.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419E4_8445B4 +/* 8445B4 802419E4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8445B8 802419E8 AFB00010 */ sw $s0, 0x10($sp) +/* 8445BC 802419EC 0080802D */ daddu $s0, $a0, $zero +/* 8445C0 802419F0 AFB10014 */ sw $s1, 0x14($sp) +/* 8445C4 802419F4 3C118011 */ lui $s1, %hi(gPlayerData) +/* 8445C8 802419F8 2631F290 */ addiu $s1, $s1, %lo(gPlayerData) +/* 8445CC 802419FC AFBF0020 */ sw $ra, 0x20($sp) +/* 8445D0 80241A00 AFB3001C */ sw $s3, 0x1c($sp) +/* 8445D4 80241A04 AFB20018 */ sw $s2, 0x18($sp) +/* 8445D8 80241A08 8E02000C */ lw $v0, 0xc($s0) +/* 8445DC 80241A0C 82260004 */ lb $a2, 4($s1) +/* 8445E0 80241A10 8C450000 */ lw $a1, ($v0) +/* 8445E4 80241A14 24420004 */ addiu $v0, $v0, 4 +/* 8445E8 80241A18 8C520000 */ lw $s2, ($v0) +/* 8445EC 80241A1C 0C0B2026 */ jal set_variable +/* 8445F0 80241A20 8C530004 */ lw $s3, 4($v0) +/* 8445F4 80241A24 0200202D */ daddu $a0, $s0, $zero +/* 8445F8 80241A28 82260007 */ lb $a2, 7($s1) +/* 8445FC 80241A2C 0C0B2026 */ jal set_variable +/* 844600 80241A30 0240282D */ daddu $a1, $s2, $zero +/* 844604 80241A34 0200202D */ daddu $a0, $s0, $zero +/* 844608 80241A38 82260008 */ lb $a2, 8($s1) +/* 84460C 80241A3C 0C0B2026 */ jal set_variable +/* 844610 80241A40 0260282D */ daddu $a1, $s3, $zero +/* 844614 80241A44 8FBF0020 */ lw $ra, 0x20($sp) +/* 844618 80241A48 8FB3001C */ lw $s3, 0x1c($sp) +/* 84461C 80241A4C 8FB20018 */ lw $s2, 0x18($sp) +/* 844620 80241A50 8FB10014 */ lw $s1, 0x14($sp) +/* 844624 80241A54 8FB00010 */ lw $s0, 0x10($sp) +/* 844628 80241A58 24020002 */ addiu $v0, $zero, 2 +/* 84462C 80241A5C 03E00008 */ jr $ra +/* 844630 80241A60 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64.s deleted file mode 100644 index a6849850ce..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A64 -/* 844634 80241A64 0000402D */ daddu $t0, $zero, $zero -/* 844638 80241A68 0100382D */ daddu $a3, $t0, $zero -/* 84463C 80241A6C 3C058011 */ lui $a1, %hi(gPlayerData) -/* 844640 80241A70 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 844644 80241A74 8C8300AC */ lw $v1, 0xac($a0) -/* 844648 80241A78 24020001 */ addiu $v0, $zero, 1 -/* 84464C 80241A7C 1062000F */ beq $v1, $v0, .L80241ABC -/* 844650 80241A80 0100302D */ daddu $a2, $t0, $zero -/* 844654 80241A84 28620002 */ slti $v0, $v1, 2 -/* 844658 80241A88 10400005 */ beqz $v0, .L80241AA0 -/* 84465C 80241A8C 24020002 */ addiu $v0, $zero, 2 -/* 844660 80241A90 50600007 */ beql $v1, $zero, .L80241AB0 -/* 844664 80241A94 2406000A */ addiu $a2, $zero, 0xa -/* 844668 80241A98 080906B5 */ j .L80241AD4 -/* 84466C 80241A9C 00000000 */ nop -.L80241AA0: -/* 844670 80241AA0 5062000A */ beql $v1, $v0, .L80241ACC -/* 844674 80241AA4 2406FFFB */ addiu $a2, $zero, -5 -/* 844678 80241AA8 080906B5 */ j .L80241AD4 -/* 84467C 80241AAC 00000000 */ nop -.L80241AB0: -/* 844680 80241AB0 2407FFFB */ addiu $a3, $zero, -5 -/* 844684 80241AB4 080906B5 */ j .L80241AD4 -/* 844688 80241AB8 2408FFFD */ addiu $t0, $zero, -3 -.L80241ABC: -/* 84468C 80241ABC 2406FFFB */ addiu $a2, $zero, -5 -/* 844690 80241AC0 2407000A */ addiu $a3, $zero, 0xa -/* 844694 80241AC4 080906B5 */ j .L80241AD4 -/* 844698 80241AC8 2408FFFD */ addiu $t0, $zero, -3 -.L80241ACC: -/* 84469C 80241ACC 00C0382D */ daddu $a3, $a2, $zero -/* 8446A0 80241AD0 24080006 */ addiu $t0, $zero, 6 -.L80241AD4: -/* 8446A4 80241AD4 90A30004 */ lbu $v1, 4($a1) -/* 8446A8 80241AD8 90A20003 */ lbu $v0, 3($a1) -/* 8446AC 80241ADC 00661821 */ addu $v1, $v1, $a2 -/* 8446B0 80241AE0 00461021 */ addu $v0, $v0, $a2 -/* 8446B4 80241AE4 A0A20003 */ sb $v0, 3($a1) -/* 8446B8 80241AE8 00021600 */ sll $v0, $v0, 0x18 -/* 8446BC 80241AEC 00021603 */ sra $v0, $v0, 0x18 -/* 8446C0 80241AF0 2842004C */ slti $v0, $v0, 0x4c -/* 8446C4 80241AF4 14400003 */ bnez $v0, .L80241B04 -/* 8446C8 80241AF8 A0A30004 */ sb $v1, 4($a1) -/* 8446CC 80241AFC 2402004B */ addiu $v0, $zero, 0x4b -/* 8446D0 80241B00 A0A20003 */ sb $v0, 3($a1) -.L80241B04: -/* 8446D4 80241B04 80A30002 */ lb $v1, 2($a1) -/* 8446D8 80241B08 80A20003 */ lb $v0, 3($a1) -/* 8446DC 80241B0C 0043102A */ slt $v0, $v0, $v1 -/* 8446E0 80241B10 90A30003 */ lbu $v1, 3($a1) -/* 8446E4 80241B14 54400001 */ bnel $v0, $zero, .L80241B1C -/* 8446E8 80241B18 A0A30002 */ sb $v1, 2($a1) -.L80241B1C: -/* 8446EC 80241B1C 90A30007 */ lbu $v1, 7($a1) -/* 8446F0 80241B20 90A20006 */ lbu $v0, 6($a1) -/* 8446F4 80241B24 00671821 */ addu $v1, $v1, $a3 -/* 8446F8 80241B28 00471021 */ addu $v0, $v0, $a3 -/* 8446FC 80241B2C A0A20006 */ sb $v0, 6($a1) -/* 844700 80241B30 00021600 */ sll $v0, $v0, 0x18 -/* 844704 80241B34 00021603 */ sra $v0, $v0, 0x18 -/* 844708 80241B38 2842004C */ slti $v0, $v0, 0x4c -/* 84470C 80241B3C 14400003 */ bnez $v0, .L80241B4C -/* 844710 80241B40 A0A30007 */ sb $v1, 7($a1) -/* 844714 80241B44 2402004B */ addiu $v0, $zero, 0x4b -/* 844718 80241B48 A0A20006 */ sb $v0, 6($a1) -.L80241B4C: -/* 84471C 80241B4C 80A30005 */ lb $v1, 5($a1) -/* 844720 80241B50 80A20006 */ lb $v0, 6($a1) -/* 844724 80241B54 0043102A */ slt $v0, $v0, $v1 -/* 844728 80241B58 90A30006 */ lbu $v1, 6($a1) -/* 84472C 80241B5C 54400001 */ bnel $v0, $zero, .L80241B64 -/* 844730 80241B60 A0A30005 */ sb $v1, 5($a1) -.L80241B64: -/* 844734 80241B64 90A20008 */ lbu $v0, 8($a1) -/* 844738 80241B68 00481021 */ addu $v0, $v0, $t0 -/* 84473C 80241B6C A0A20008 */ sb $v0, 8($a1) -/* 844740 80241B70 00021600 */ sll $v0, $v0, 0x18 -/* 844744 80241B74 00021603 */ sra $v0, $v0, 0x18 -/* 844748 80241B78 2842001F */ slti $v0, $v0, 0x1f -/* 84474C 80241B7C 14400002 */ bnez $v0, .L80241B88 -/* 844750 80241B80 2402001E */ addiu $v0, $zero, 0x1e -/* 844754 80241B84 A0A20008 */ sb $v0, 8($a1) -.L80241B88: -/* 844758 80241B88 03E00008 */ jr $ra -/* 84475C 80241B8C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s new file mode 100644 index 0000000000..407c6b7e61 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241A64_844634.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A64_844634 +/* 844634 80241A64 0000402D */ daddu $t0, $zero, $zero +/* 844638 80241A68 0100382D */ daddu $a3, $t0, $zero +/* 84463C 80241A6C 3C058011 */ lui $a1, %hi(gPlayerData) +/* 844640 80241A70 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* 844644 80241A74 8C8300AC */ lw $v1, 0xac($a0) +/* 844648 80241A78 24020001 */ addiu $v0, $zero, 1 +/* 84464C 80241A7C 1062000F */ beq $v1, $v0, .L80241ABC +/* 844650 80241A80 0100302D */ daddu $a2, $t0, $zero +/* 844654 80241A84 28620002 */ slti $v0, $v1, 2 +/* 844658 80241A88 10400005 */ beqz $v0, .L80241AA0 +/* 84465C 80241A8C 24020002 */ addiu $v0, $zero, 2 +/* 844660 80241A90 50600007 */ beql $v1, $zero, .L80241AB0 +/* 844664 80241A94 2406000A */ addiu $a2, $zero, 0xa +/* 844668 80241A98 080906B5 */ j .L80241AD4 +/* 84466C 80241A9C 00000000 */ nop +.L80241AA0: +/* 844670 80241AA0 5062000A */ beql $v1, $v0, .L80241ACC +/* 844674 80241AA4 2406FFFB */ addiu $a2, $zero, -5 +/* 844678 80241AA8 080906B5 */ j .L80241AD4 +/* 84467C 80241AAC 00000000 */ nop +.L80241AB0: +/* 844680 80241AB0 2407FFFB */ addiu $a3, $zero, -5 +/* 844684 80241AB4 080906B5 */ j .L80241AD4 +/* 844688 80241AB8 2408FFFD */ addiu $t0, $zero, -3 +.L80241ABC: +/* 84468C 80241ABC 2406FFFB */ addiu $a2, $zero, -5 +/* 844690 80241AC0 2407000A */ addiu $a3, $zero, 0xa +/* 844694 80241AC4 080906B5 */ j .L80241AD4 +/* 844698 80241AC8 2408FFFD */ addiu $t0, $zero, -3 +.L80241ACC: +/* 84469C 80241ACC 00C0382D */ daddu $a3, $a2, $zero +/* 8446A0 80241AD0 24080006 */ addiu $t0, $zero, 6 +.L80241AD4: +/* 8446A4 80241AD4 90A30004 */ lbu $v1, 4($a1) +/* 8446A8 80241AD8 90A20003 */ lbu $v0, 3($a1) +/* 8446AC 80241ADC 00661821 */ addu $v1, $v1, $a2 +/* 8446B0 80241AE0 00461021 */ addu $v0, $v0, $a2 +/* 8446B4 80241AE4 A0A20003 */ sb $v0, 3($a1) +/* 8446B8 80241AE8 00021600 */ sll $v0, $v0, 0x18 +/* 8446BC 80241AEC 00021603 */ sra $v0, $v0, 0x18 +/* 8446C0 80241AF0 2842004C */ slti $v0, $v0, 0x4c +/* 8446C4 80241AF4 14400003 */ bnez $v0, .L80241B04 +/* 8446C8 80241AF8 A0A30004 */ sb $v1, 4($a1) +/* 8446CC 80241AFC 2402004B */ addiu $v0, $zero, 0x4b +/* 8446D0 80241B00 A0A20003 */ sb $v0, 3($a1) +.L80241B04: +/* 8446D4 80241B04 80A30002 */ lb $v1, 2($a1) +/* 8446D8 80241B08 80A20003 */ lb $v0, 3($a1) +/* 8446DC 80241B0C 0043102A */ slt $v0, $v0, $v1 +/* 8446E0 80241B10 90A30003 */ lbu $v1, 3($a1) +/* 8446E4 80241B14 54400001 */ bnel $v0, $zero, .L80241B1C +/* 8446E8 80241B18 A0A30002 */ sb $v1, 2($a1) +.L80241B1C: +/* 8446EC 80241B1C 90A30007 */ lbu $v1, 7($a1) +/* 8446F0 80241B20 90A20006 */ lbu $v0, 6($a1) +/* 8446F4 80241B24 00671821 */ addu $v1, $v1, $a3 +/* 8446F8 80241B28 00471021 */ addu $v0, $v0, $a3 +/* 8446FC 80241B2C A0A20006 */ sb $v0, 6($a1) +/* 844700 80241B30 00021600 */ sll $v0, $v0, 0x18 +/* 844704 80241B34 00021603 */ sra $v0, $v0, 0x18 +/* 844708 80241B38 2842004C */ slti $v0, $v0, 0x4c +/* 84470C 80241B3C 14400003 */ bnez $v0, .L80241B4C +/* 844710 80241B40 A0A30007 */ sb $v1, 7($a1) +/* 844714 80241B44 2402004B */ addiu $v0, $zero, 0x4b +/* 844718 80241B48 A0A20006 */ sb $v0, 6($a1) +.L80241B4C: +/* 84471C 80241B4C 80A30005 */ lb $v1, 5($a1) +/* 844720 80241B50 80A20006 */ lb $v0, 6($a1) +/* 844724 80241B54 0043102A */ slt $v0, $v0, $v1 +/* 844728 80241B58 90A30006 */ lbu $v1, 6($a1) +/* 84472C 80241B5C 54400001 */ bnel $v0, $zero, .L80241B64 +/* 844730 80241B60 A0A30005 */ sb $v1, 5($a1) +.L80241B64: +/* 844734 80241B64 90A20008 */ lbu $v0, 8($a1) +/* 844738 80241B68 00481021 */ addu $v0, $v0, $t0 +/* 84473C 80241B6C A0A20008 */ sb $v0, 8($a1) +/* 844740 80241B70 00021600 */ sll $v0, $v0, 0x18 +/* 844744 80241B74 00021603 */ sra $v0, $v0, 0x18 +/* 844748 80241B78 2842001F */ slti $v0, $v0, 0x1f +/* 84474C 80241B7C 14400002 */ bnez $v0, .L80241B88 +/* 844750 80241B80 2402001E */ addiu $v0, $zero, 0x1e +/* 844754 80241B84 A0A20008 */ sb $v0, 8($a1) +.L80241B88: +/* 844758 80241B88 03E00008 */ jr $ra +/* 84475C 80241B8C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241B90.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241B90.s deleted file mode 100644 index d01f4aa2d3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241B90.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B90 -/* 844760 80241B90 3C038011 */ lui $v1, %hi(gPlayerData) -/* 844764 80241B94 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 844768 80241B98 80620003 */ lb $v0, 3($v1) -/* 84476C 80241B9C AC820084 */ sw $v0, 0x84($a0) -/* 844770 80241BA0 80620006 */ lb $v0, 6($v1) -/* 844774 80241BA4 AC820088 */ sw $v0, 0x88($a0) -/* 844778 80241BA8 80620008 */ lb $v0, 8($v1) -/* 84477C 80241BAC AC82008C */ sw $v0, 0x8c($a0) -/* 844780 80241BB0 03E00008 */ jr $ra -/* 844784 80241BB4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241B90_844760.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241B90_844760.s new file mode 100644 index 0000000000..9597a02910 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241B90_844760.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B90_844760 +/* 844760 80241B90 3C038011 */ lui $v1, %hi(gPlayerData) +/* 844764 80241B94 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 844768 80241B98 80620003 */ lb $v0, 3($v1) +/* 84476C 80241B9C AC820084 */ sw $v0, 0x84($a0) +/* 844770 80241BA0 80620006 */ lb $v0, 6($v1) +/* 844774 80241BA4 AC820088 */ sw $v0, 0x88($a0) +/* 844778 80241BA8 80620008 */ lb $v0, 8($v1) +/* 84477C 80241BAC AC82008C */ sw $v0, 0x8c($a0) +/* 844780 80241BB0 03E00008 */ jr $ra +/* 844784 80241BB4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8.s deleted file mode 100644 index d0e3917808..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BB8 -/* 844788 80241BB8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 84478C 80241BBC AFB10014 */ sw $s1, 0x14($sp) -/* 844790 80241BC0 0080882D */ daddu $s1, $a0, $zero -/* 844794 80241BC4 AFBF0018 */ sw $ra, 0x18($sp) -/* 844798 80241BC8 AFB00010 */ sw $s0, 0x10($sp) -/* 84479C 80241BCC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8447A0 80241BD0 8E30000C */ lw $s0, 0xc($s1) -/* 8447A4 80241BD4 8E050000 */ lw $a1, ($s0) -/* 8447A8 80241BD8 0C0B1EAF */ jal get_variable -/* 8447AC 80241BDC 26100004 */ addiu $s0, $s0, 4 -/* 8447B0 80241BE0 0220202D */ daddu $a0, $s1, $zero -/* 8447B4 80241BE4 8E050000 */ lw $a1, ($s0) -/* 8447B8 80241BE8 0C0B210B */ jal get_float_variable -/* 8447BC 80241BEC 0040802D */ daddu $s0, $v0, $zero -/* 8447C0 80241BF0 0220202D */ daddu $a0, $s1, $zero -/* 8447C4 80241BF4 0200282D */ daddu $a1, $s0, $zero -/* 8447C8 80241BF8 0C0B36B0 */ jal resolve_npc -/* 8447CC 80241BFC 46000506 */ mov.s $f20, $f0 -/* 8447D0 80241C00 E454007C */ swc1 $f20, 0x7c($v0) -/* 8447D4 80241C04 8FBF0018 */ lw $ra, 0x18($sp) -/* 8447D8 80241C08 8FB10014 */ lw $s1, 0x14($sp) -/* 8447DC 80241C0C 8FB00010 */ lw $s0, 0x10($sp) -/* 8447E0 80241C10 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8447E4 80241C14 24020002 */ addiu $v0, $zero, 2 -/* 8447E8 80241C18 03E00008 */ jr $ra -/* 8447EC 80241C1C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s new file mode 100644 index 0000000000..7009a923f1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241BB8_844788.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BB8_844788 +/* 844788 80241BB8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 84478C 80241BBC AFB10014 */ sw $s1, 0x14($sp) +/* 844790 80241BC0 0080882D */ daddu $s1, $a0, $zero +/* 844794 80241BC4 AFBF0018 */ sw $ra, 0x18($sp) +/* 844798 80241BC8 AFB00010 */ sw $s0, 0x10($sp) +/* 84479C 80241BCC F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8447A0 80241BD0 8E30000C */ lw $s0, 0xc($s1) +/* 8447A4 80241BD4 8E050000 */ lw $a1, ($s0) +/* 8447A8 80241BD8 0C0B1EAF */ jal get_variable +/* 8447AC 80241BDC 26100004 */ addiu $s0, $s0, 4 +/* 8447B0 80241BE0 0220202D */ daddu $a0, $s1, $zero +/* 8447B4 80241BE4 8E050000 */ lw $a1, ($s0) +/* 8447B8 80241BE8 0C0B210B */ jal get_float_variable +/* 8447BC 80241BEC 0040802D */ daddu $s0, $v0, $zero +/* 8447C0 80241BF0 0220202D */ daddu $a0, $s1, $zero +/* 8447C4 80241BF4 0200282D */ daddu $a1, $s0, $zero +/* 8447C8 80241BF8 0C0B36B0 */ jal resolve_npc +/* 8447CC 80241BFC 46000506 */ mov.s $f20, $f0 +/* 8447D0 80241C00 E454007C */ swc1 $f20, 0x7c($v0) +/* 8447D4 80241C04 8FBF0018 */ lw $ra, 0x18($sp) +/* 8447D8 80241C08 8FB10014 */ lw $s1, 0x14($sp) +/* 8447DC 80241C0C 8FB00010 */ lw $s0, 0x10($sp) +/* 8447E0 80241C10 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8447E4 80241C14 24020002 */ addiu $v0, $zero, 2 +/* 8447E8 80241C18 03E00008 */ jr $ra +/* 8447EC 80241C1C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20.s deleted file mode 100644 index 099b3546f4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C20 -/* 8447F0 80241C20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8447F4 80241C24 AFBF0010 */ sw $ra, 0x10($sp) -/* 8447F8 80241C28 0C03A625 */ jal func_800E9894 -/* 8447FC 80241C2C 00000000 */ nop -/* 844800 80241C30 8FBF0010 */ lw $ra, 0x10($sp) -/* 844804 80241C34 24020002 */ addiu $v0, $zero, 2 -/* 844808 80241C38 03E00008 */ jr $ra -/* 84480C 80241C3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s new file mode 100644 index 0000000000..d7340f5175 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C20_8447F0 +/* 8447F0 80241C20 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8447F4 80241C24 AFBF0010 */ sw $ra, 0x10($sp) +/* 8447F8 80241C28 0C03A625 */ jal func_800E9894 +/* 8447FC 80241C2C 00000000 */ nop +/* 844800 80241C30 8FBF0010 */ lw $ra, 0x10($sp) +/* 844804 80241C34 24020002 */ addiu $v0, $zero, 2 +/* 844808 80241C38 03E00008 */ jr $ra +/* 84480C 80241C3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40.s deleted file mode 100644 index e32acbdec6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C40 -/* 844810 80241C40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844814 80241C44 AFBF0010 */ sw $ra, 0x10($sp) -/* 844818 80241C48 0C03A631 */ jal func_800E98C4 -/* 84481C 80241C4C 00000000 */ nop -/* 844820 80241C50 8FBF0010 */ lw $ra, 0x10($sp) -/* 844824 80241C54 24020002 */ addiu $v0, $zero, 2 -/* 844828 80241C58 03E00008 */ jr $ra -/* 84482C 80241C5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s new file mode 100644 index 0000000000..3348064228 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C40_844810.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C40_844810 +/* 844810 80241C40 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 844814 80241C44 AFBF0010 */ sw $ra, 0x10($sp) +/* 844818 80241C48 0C03A631 */ jal func_800E98C4 +/* 84481C 80241C4C 00000000 */ nop +/* 844820 80241C50 8FBF0010 */ lw $ra, 0x10($sp) +/* 844824 80241C54 24020002 */ addiu $v0, $zero, 2 +/* 844828 80241C58 03E00008 */ jr $ra +/* 84482C 80241C5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60.s deleted file mode 100644 index 99a898385e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C60 -/* 844830 80241C60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844834 80241C64 AFBF0010 */ sw $ra, 0x10($sp) -/* 844838 80241C68 0C03A631 */ jal func_800E98C4 -/* 84483C 80241C6C 00000000 */ nop -/* 844840 80241C70 0C03A5D8 */ jal open_status_menu_long -/* 844844 80241C74 00000000 */ nop -/* 844848 80241C78 8FBF0010 */ lw $ra, 0x10($sp) -/* 84484C 80241C7C 24020002 */ addiu $v0, $zero, 2 -/* 844850 80241C80 03E00008 */ jr $ra -/* 844854 80241C84 27BD0018 */ addiu $sp, $sp, 0x18 -/* 844858 80241C88 00000000 */ nop -/* 84485C 80241C8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s new file mode 100644 index 0000000000..c6961a1283 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C60_844830.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C60_844830 +/* 844830 80241C60 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 844834 80241C64 AFBF0010 */ sw $ra, 0x10($sp) +/* 844838 80241C68 0C03A631 */ jal func_800E98C4 +/* 84483C 80241C6C 00000000 */ nop +/* 844840 80241C70 0C03A5D8 */ jal open_status_menu_long +/* 844844 80241C74 00000000 */ nop +/* 844848 80241C78 8FBF0010 */ lw $ra, 0x10($sp) +/* 84484C 80241C7C 24020002 */ addiu $v0, $zero, 2 +/* 844850 80241C80 03E00008 */ jr $ra +/* 844854 80241C84 27BD0018 */ addiu $sp, $sp, 0x18 +/* 844858 80241C88 00000000 */ nop +/* 84485C 80241C8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90.s deleted file mode 100644 index d3fb812737..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C90 -/* 844860 80241C90 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844864 80241C94 AFB00010 */ sw $s0, 0x10($sp) -/* 844868 80241C98 0080802D */ daddu $s0, $a0, $zero -/* 84486C 80241C9C 0000202D */ daddu $a0, $zero, $zero -/* 844870 80241CA0 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 844874 80241CA4 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 844878 80241CA8 AFBF0014 */ sw $ra, 0x14($sp) -/* 84487C 80241CAC 8C620004 */ lw $v0, 4($v1) -/* 844880 80241CB0 3C058024 */ lui $a1, 0x8024 -/* 844884 80241CB4 24A51D30 */ addiu $a1, $a1, 0x1d30 -/* 844888 80241CB8 34422000 */ ori $v0, $v0, 0x2000 -/* 84488C 80241CBC 0C048C56 */ jal bind_dynamic_entity_3 -/* 844890 80241CC0 AC620004 */ sw $v0, 4($v1) -/* 844894 80241CC4 0200202D */ daddu $a0, $s0, $zero -/* 844898 80241CC8 3C05FD05 */ lui $a1, 0xfd05 -/* 84489C 80241CCC 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8448A0 80241CD0 0C0B2026 */ jal set_variable -/* 8448A4 80241CD4 0040302D */ daddu $a2, $v0, $zero -/* 8448A8 80241CD8 8FBF0014 */ lw $ra, 0x14($sp) -/* 8448AC 80241CDC 8FB00010 */ lw $s0, 0x10($sp) -/* 8448B0 80241CE0 24020002 */ addiu $v0, $zero, 2 -/* 8448B4 80241CE4 03E00008 */ jr $ra -/* 8448B8 80241CE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s new file mode 100644 index 0000000000..e020a37c30 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241C90_844860.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C90_844860 +/* 844860 80241C90 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 844864 80241C94 AFB00010 */ sw $s0, 0x10($sp) +/* 844868 80241C98 0080802D */ daddu $s0, $a0, $zero +/* 84486C 80241C9C 0000202D */ daddu $a0, $zero, $zero +/* 844870 80241CA0 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 844874 80241CA4 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 844878 80241CA8 AFBF0014 */ sw $ra, 0x14($sp) +/* 84487C 80241CAC 8C620004 */ lw $v0, 4($v1) +/* 844880 80241CB0 3C058024 */ lui $a1, 0x8024 +/* 844884 80241CB4 24A51D30 */ addiu $a1, $a1, 0x1d30 +/* 844888 80241CB8 34422000 */ ori $v0, $v0, 0x2000 +/* 84488C 80241CBC 0C048C56 */ jal bind_dynamic_entity_3 +/* 844890 80241CC0 AC620004 */ sw $v0, 4($v1) +/* 844894 80241CC4 0200202D */ daddu $a0, $s0, $zero +/* 844898 80241CC8 3C05FD05 */ lui $a1, 0xfd05 +/* 84489C 80241CCC 34A50F8B */ ori $a1, $a1, 0xf8b +/* 8448A0 80241CD0 0C0B2026 */ jal set_variable +/* 8448A4 80241CD4 0040302D */ daddu $a2, $v0, $zero +/* 8448A8 80241CD8 8FBF0014 */ lw $ra, 0x14($sp) +/* 8448AC 80241CDC 8FB00010 */ lw $s0, 0x10($sp) +/* 8448B0 80241CE0 24020002 */ addiu $v0, $zero, 2 +/* 8448B4 80241CE4 03E00008 */ jr $ra +/* 8448B8 80241CE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241CEC.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241CEC.s deleted file mode 100644 index 94e75e67f3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241CEC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CEC -/* 8448BC 80241CEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8448C0 80241CF0 3C05FD05 */ lui $a1, 0xfd05 -/* 8448C4 80241CF4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8448C8 80241CF8 0C0B1EAF */ jal get_variable -/* 8448CC 80241CFC 34A50F8B */ ori $a1, $a1, 0xf8b -/* 8448D0 80241D00 0040202D */ daddu $a0, $v0, $zero -/* 8448D4 80241D04 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8448D8 80241D08 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8448DC 80241D0C 8C430004 */ lw $v1, 4($v0) -/* 8448E0 80241D10 2405DFFF */ addiu $a1, $zero, -0x2001 -/* 8448E4 80241D14 00651824 */ and $v1, $v1, $a1 -/* 8448E8 80241D18 0C048D70 */ jal func_801235C0 -/* 8448EC 80241D1C AC430004 */ sw $v1, 4($v0) -/* 8448F0 80241D20 8FBF0010 */ lw $ra, 0x10($sp) -/* 8448F4 80241D24 24020002 */ addiu $v0, $zero, 2 -/* 8448F8 80241D28 03E00008 */ jr $ra -/* 8448FC 80241D2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241CEC_8448BC.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241CEC_8448BC.s new file mode 100644 index 0000000000..2b7a8953f7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241CEC_8448BC.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CEC_8448BC +/* 8448BC 80241CEC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8448C0 80241CF0 3C05FD05 */ lui $a1, 0xfd05 +/* 8448C4 80241CF4 AFBF0010 */ sw $ra, 0x10($sp) +/* 8448C8 80241CF8 0C0B1EAF */ jal get_variable +/* 8448CC 80241CFC 34A50F8B */ ori $a1, $a1, 0xf8b +/* 8448D0 80241D00 0040202D */ daddu $a0, $v0, $zero +/* 8448D4 80241D04 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 8448D8 80241D08 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 8448DC 80241D0C 8C430004 */ lw $v1, 4($v0) +/* 8448E0 80241D10 2405DFFF */ addiu $a1, $zero, -0x2001 +/* 8448E4 80241D14 00651824 */ and $v1, $v1, $a1 +/* 8448E8 80241D18 0C048D70 */ jal func_801235C0 +/* 8448EC 80241D1C AC430004 */ sw $v1, 4($v0) +/* 8448F0 80241D20 8FBF0010 */ lw $ra, 0x10($sp) +/* 8448F4 80241D24 24020002 */ addiu $v0, $zero, 2 +/* 8448F8 80241D28 03E00008 */ jr $ra +/* 8448FC 80241D2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC.s deleted file mode 100644 index 0d86e9e35a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DAC -/* 84497C 80241DAC 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* 844980 80241DB0 AFB1009C */ sw $s1, 0x9c($sp) -/* 844984 80241DB4 0080882D */ daddu $s1, $a0, $zero -/* 844988 80241DB8 0000202D */ daddu $a0, $zero, $zero -/* 84498C 80241DBC 3C05FD05 */ lui $a1, 0xfd05 -/* 844990 80241DC0 AFBF00A0 */ sw $ra, 0xa0($sp) -/* 844994 80241DC4 AFB00098 */ sw $s0, 0x98($sp) -/* 844998 80241DC8 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* 84499C 80241DCC F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* 8449A0 80241DD0 0C0B210B */ jal get_float_variable -/* 8449A4 80241DD4 34A50F8A */ ori $a1, $a1, 0xf8a -/* 8449A8 80241DD8 44801000 */ mtc1 $zero, $f2 -/* 8449AC 80241DDC 3C013F80 */ lui $at, 0x3f80 -/* 8449B0 80241DE0 4481B000 */ mtc1 $at, $f22 -/* 8449B4 80241DE4 27A40018 */ addiu $a0, $sp, 0x18 -/* 8449B8 80241DE8 E7A20010 */ swc1 $f2, 0x10($sp) -/* 8449BC 80241DEC 8E2500A8 */ lw $a1, 0xa8($s1) -/* 8449C0 80241DF0 44061000 */ mfc1 $a2, $f2 -/* 8449C4 80241DF4 4407B000 */ mfc1 $a3, $f22 -/* 8449C8 80241DF8 0C019EC8 */ jal guRotateF -/* 8449CC 80241DFC 46000506 */ mov.s $f20, $f0 -/* 8449D0 80241E00 3C018025 */ lui $at, 0x8025 -/* 8449D4 80241E04 D420F580 */ ldc1 $f0, -0xa80($at) -/* 8449D8 80241E08 4600A521 */ cvt.d.s $f20, $f20 -/* 8449DC 80241E0C 4620A502 */ mul.d $f20, $f20, $f0 -/* 8449E0 80241E10 00000000 */ nop -/* 8449E4 80241E14 27B00058 */ addiu $s0, $sp, 0x58 -/* 8449E8 80241E18 4620A520 */ cvt.s.d $f20, $f20 -/* 8449EC 80241E1C 4405A000 */ mfc1 $a1, $f20 -/* 8449F0 80241E20 0200202D */ daddu $a0, $s0, $zero -/* 8449F4 80241E24 00A0302D */ daddu $a2, $a1, $zero -/* 8449F8 80241E28 0C019DF0 */ jal guScaleF -/* 8449FC 80241E2C 00A0382D */ daddu $a3, $a1, $zero -/* 844A00 80241E30 27A40018 */ addiu $a0, $sp, 0x18 -/* 844A04 80241E34 0200282D */ daddu $a1, $s0, $zero -/* 844A08 80241E38 0C019D80 */ jal guMtxCatF -/* 844A0C 80241E3C 0080302D */ daddu $a2, $a0, $zero -/* 844A10 80241E40 8E250028 */ lw $a1, 0x28($s1) -/* 844A14 80241E44 8E26002C */ lw $a2, 0x2c($s1) -/* 844A18 80241E48 8E270030 */ lw $a3, 0x30($s1) -/* 844A1C 80241E4C 0C019E40 */ jal guTranslateF -/* 844A20 80241E50 0200202D */ daddu $a0, $s0, $zero -/* 844A24 80241E54 27A40018 */ addiu $a0, $sp, 0x18 -/* 844A28 80241E58 0200282D */ daddu $a1, $s0, $zero -/* 844A2C 80241E5C 0C019D80 */ jal guMtxCatF -/* 844A30 80241E60 0080302D */ daddu $a2, $a0, $zero -/* 844A34 80241E64 8E2500A4 */ lw $a1, 0xa4($s1) -/* 844A38 80241E68 4406B000 */ mfc1 $a2, $f22 -/* 844A3C 80241E6C 0C0B76A3 */ jal func_802DDA8C -/* 844A40 80241E70 0000202D */ daddu $a0, $zero, $zero -/* 844A44 80241E74 0000202D */ daddu $a0, $zero, $zero -/* 844A48 80241E78 0080282D */ daddu $a1, $a0, $zero -/* 844A4C 80241E7C 0080302D */ daddu $a2, $a0, $zero -/* 844A50 80241E80 0080382D */ daddu $a3, $a0, $zero -/* 844A54 80241E84 A62200BC */ sh $v0, 0xbc($s1) -/* 844A58 80241E88 27A20018 */ addiu $v0, $sp, 0x18 -/* 844A5C 80241E8C 0C0B7710 */ jal render_sprite -/* 844A60 80241E90 AFA20010 */ sw $v0, 0x10($sp) -/* 844A64 80241E94 8FBF00A0 */ lw $ra, 0xa0($sp) -/* 844A68 80241E98 8FB1009C */ lw $s1, 0x9c($sp) -/* 844A6C 80241E9C 8FB00098 */ lw $s0, 0x98($sp) -/* 844A70 80241EA0 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* 844A74 80241EA4 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* 844A78 80241EA8 03E00008 */ jr $ra -/* 844A7C 80241EAC 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s new file mode 100644 index 0000000000..690b72393f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241DAC_84497C.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DAC_84497C +/* 84497C 80241DAC 27BDFF48 */ addiu $sp, $sp, -0xb8 +/* 844980 80241DB0 AFB1009C */ sw $s1, 0x9c($sp) +/* 844984 80241DB4 0080882D */ daddu $s1, $a0, $zero +/* 844988 80241DB8 0000202D */ daddu $a0, $zero, $zero +/* 84498C 80241DBC 3C05FD05 */ lui $a1, 0xfd05 +/* 844990 80241DC0 AFBF00A0 */ sw $ra, 0xa0($sp) +/* 844994 80241DC4 AFB00098 */ sw $s0, 0x98($sp) +/* 844998 80241DC8 F7B600B0 */ sdc1 $f22, 0xb0($sp) +/* 84499C 80241DCC F7B400A8 */ sdc1 $f20, 0xa8($sp) +/* 8449A0 80241DD0 0C0B210B */ jal get_float_variable +/* 8449A4 80241DD4 34A50F8A */ ori $a1, $a1, 0xf8a +/* 8449A8 80241DD8 44801000 */ mtc1 $zero, $f2 +/* 8449AC 80241DDC 3C013F80 */ lui $at, 0x3f80 +/* 8449B0 80241DE0 4481B000 */ mtc1 $at, $f22 +/* 8449B4 80241DE4 27A40018 */ addiu $a0, $sp, 0x18 +/* 8449B8 80241DE8 E7A20010 */ swc1 $f2, 0x10($sp) +/* 8449BC 80241DEC 8E2500A8 */ lw $a1, 0xa8($s1) +/* 8449C0 80241DF0 44061000 */ mfc1 $a2, $f2 +/* 8449C4 80241DF4 4407B000 */ mfc1 $a3, $f22 +/* 8449C8 80241DF8 0C019EC8 */ jal guRotateF +/* 8449CC 80241DFC 46000506 */ mov.s $f20, $f0 +/* 8449D0 80241E00 3C018025 */ lui $at, 0x8025 +/* 8449D4 80241E04 D420F580 */ ldc1 $f0, -0xa80($at) +/* 8449D8 80241E08 4600A521 */ cvt.d.s $f20, $f20 +/* 8449DC 80241E0C 4620A502 */ mul.d $f20, $f20, $f0 +/* 8449E0 80241E10 00000000 */ nop +/* 8449E4 80241E14 27B00058 */ addiu $s0, $sp, 0x58 +/* 8449E8 80241E18 4620A520 */ cvt.s.d $f20, $f20 +/* 8449EC 80241E1C 4405A000 */ mfc1 $a1, $f20 +/* 8449F0 80241E20 0200202D */ daddu $a0, $s0, $zero +/* 8449F4 80241E24 00A0302D */ daddu $a2, $a1, $zero +/* 8449F8 80241E28 0C019DF0 */ jal guScaleF +/* 8449FC 80241E2C 00A0382D */ daddu $a3, $a1, $zero +/* 844A00 80241E30 27A40018 */ addiu $a0, $sp, 0x18 +/* 844A04 80241E34 0200282D */ daddu $a1, $s0, $zero +/* 844A08 80241E38 0C019D80 */ jal guMtxCatF +/* 844A0C 80241E3C 0080302D */ daddu $a2, $a0, $zero +/* 844A10 80241E40 8E250028 */ lw $a1, 0x28($s1) +/* 844A14 80241E44 8E26002C */ lw $a2, 0x2c($s1) +/* 844A18 80241E48 8E270030 */ lw $a3, 0x30($s1) +/* 844A1C 80241E4C 0C019E40 */ jal guTranslateF +/* 844A20 80241E50 0200202D */ daddu $a0, $s0, $zero +/* 844A24 80241E54 27A40018 */ addiu $a0, $sp, 0x18 +/* 844A28 80241E58 0200282D */ daddu $a1, $s0, $zero +/* 844A2C 80241E5C 0C019D80 */ jal guMtxCatF +/* 844A30 80241E60 0080302D */ daddu $a2, $a0, $zero +/* 844A34 80241E64 8E2500A4 */ lw $a1, 0xa4($s1) +/* 844A38 80241E68 4406B000 */ mfc1 $a2, $f22 +/* 844A3C 80241E6C 0C0B76A3 */ jal func_802DDA8C +/* 844A40 80241E70 0000202D */ daddu $a0, $zero, $zero +/* 844A44 80241E74 0000202D */ daddu $a0, $zero, $zero +/* 844A48 80241E78 0080282D */ daddu $a1, $a0, $zero +/* 844A4C 80241E7C 0080302D */ daddu $a2, $a0, $zero +/* 844A50 80241E80 0080382D */ daddu $a3, $a0, $zero +/* 844A54 80241E84 A62200BC */ sh $v0, 0xbc($s1) +/* 844A58 80241E88 27A20018 */ addiu $v0, $sp, 0x18 +/* 844A5C 80241E8C 0C0B7710 */ jal render_sprite +/* 844A60 80241E90 AFA20010 */ sw $v0, 0x10($sp) +/* 844A64 80241E94 8FBF00A0 */ lw $ra, 0xa0($sp) +/* 844A68 80241E98 8FB1009C */ lw $s1, 0x9c($sp) +/* 844A6C 80241E9C 8FB00098 */ lw $s0, 0x98($sp) +/* 844A70 80241EA0 D7B600B0 */ ldc1 $f22, 0xb0($sp) +/* 844A74 80241EA4 D7B400A8 */ ldc1 $f20, 0xa8($sp) +/* 844A78 80241EA8 03E00008 */ jr $ra +/* 844A7C 80241EAC 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0.s deleted file mode 100644 index 1ebe3cffe9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EB0 -/* 844A80 80241EB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 844A84 80241EB4 AFBF0010 */ sw $ra, 0x10($sp) -/* 844A88 80241EB8 0C04417A */ jal get_entity_by_index -/* 844A8C 80241EBC 8C840084 */ lw $a0, 0x84($a0) -/* 844A90 80241EC0 0040182D */ daddu $v1, $v0, $zero -/* 844A94 80241EC4 8C640000 */ lw $a0, ($v1) -/* 844A98 80241EC8 3C050010 */ lui $a1, 0x10 -/* 844A9C 80241ECC 00852025 */ or $a0, $a0, $a1 -/* 844AA0 80241ED0 AC640000 */ sw $a0, ($v1) -/* 844AA4 80241ED4 8FBF0010 */ lw $ra, 0x10($sp) -/* 844AA8 80241ED8 24020002 */ addiu $v0, $zero, 2 -/* 844AAC 80241EDC 03E00008 */ jr $ra -/* 844AB0 80241EE0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 844AB4 80241EE4 00000000 */ nop -/* 844AB8 80241EE8 00000000 */ nop -/* 844ABC 80241EEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0_844A80.s b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0_844A80.s new file mode 100644 index 0000000000..e41d28b066 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/844860/func_80241EB0_844A80.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241EB0_844A80 +/* 844A80 80241EB0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 844A84 80241EB4 AFBF0010 */ sw $ra, 0x10($sp) +/* 844A88 80241EB8 0C04417A */ jal get_entity_by_index +/* 844A8C 80241EBC 8C840084 */ lw $a0, 0x84($a0) +/* 844A90 80241EC0 0040182D */ daddu $v1, $v0, $zero +/* 844A94 80241EC4 8C640000 */ lw $a0, ($v1) +/* 844A98 80241EC8 3C050010 */ lui $a1, 0x10 +/* 844A9C 80241ECC 00852025 */ or $a0, $a0, $a1 +/* 844AA0 80241ED0 AC640000 */ sw $a0, ($v1) +/* 844AA4 80241ED4 8FBF0010 */ lw $ra, 0x10($sp) +/* 844AA8 80241ED8 24020002 */ addiu $v0, $zero, 2 +/* 844AAC 80241EDC 03E00008 */ jr $ra +/* 844AB0 80241EE0 27BD0018 */ addiu $sp, $sp, 0x18 +/* 844AB4 80241EE4 00000000 */ nop +/* 844AB8 80241EE8 00000000 */ nop +/* 844ABC 80241EEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0.s b/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0.s deleted file mode 100644 index e5aa12cbee..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EF0 -/* 844AC0 80241EF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 844AC4 80241EF4 AFB00010 */ sw $s0, 0x10($sp) -/* 844AC8 80241EF8 0080802D */ daddu $s0, $a0, $zero -/* 844ACC 80241EFC AFB20018 */ sw $s2, 0x18($sp) -/* 844AD0 80241F00 AFBF001C */ sw $ra, 0x1c($sp) -/* 844AD4 80241F04 AFB10014 */ sw $s1, 0x14($sp) -/* 844AD8 80241F08 8E02000C */ lw $v0, 0xc($s0) -/* 844ADC 80241F0C 10A00008 */ beqz $a1, .L80241F30 -/* 844AE0 80241F10 0000902D */ daddu $s2, $zero, $zero -/* 844AE4 80241F14 8C450000 */ lw $a1, ($v0) -/* 844AE8 80241F18 0C0B1EAF */ jal get_variable -/* 844AEC 80241F1C 00000000 */ nop -/* 844AF0 80241F20 AE020070 */ sw $v0, 0x70($s0) -/* 844AF4 80241F24 AE000074 */ sw $zero, 0x74($s0) -/* 844AF8 80241F28 8C420014 */ lw $v0, 0x14($v0) -/* 844AFC 80241F2C AE020078 */ sw $v0, 0x78($s0) -.L80241F30: -/* 844B00 80241F30 8E050078 */ lw $a1, 0x78($s0) -/* 844B04 80241F34 8E110070 */ lw $s1, 0x70($s0) -/* 844B08 80241F38 0C0B1EAF */ jal get_variable -/* 844B0C 80241F3C 0200202D */ daddu $a0, $s0, $zero -/* 844B10 80241F40 10400006 */ beqz $v0, .L80241F5C -/* 844B14 80241F44 24030002 */ addiu $v1, $zero, 2 -/* 844B18 80241F48 8E020074 */ lw $v0, 0x74($s0) -/* 844B1C 80241F4C 10430027 */ beq $v0, $v1, .L80241FEC -/* 844B20 80241F50 00000000 */ nop -/* 844B24 80241F54 080907FA */ j .L80241FE8 -/* 844B28 80241F58 AE030074 */ sw $v1, 0x74($s0) -.L80241F5C: -/* 844B2C 80241F5C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 844B30 80241F60 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 844B34 80241F64 8E260000 */ lw $a2, ($s1) -/* 844B38 80241F68 8E270004 */ lw $a3, 4($s1) -/* 844B3C 80241F6C C44C0028 */ lwc1 $f12, 0x28($v0) -/* 844B40 80241F70 0C00A7B5 */ jal dist2D -/* 844B44 80241F74 C44E0030 */ lwc1 $f14, 0x30($v0) -/* 844B48 80241F78 8E030074 */ lw $v1, 0x74($s0) -/* 844B4C 80241F7C 24040001 */ addiu $a0, $zero, 1 -/* 844B50 80241F80 10640013 */ beq $v1, $a0, .L80241FD0 -/* 844B54 80241F84 46000086 */ mov.s $f2, $f0 -/* 844B58 80241F88 28620002 */ slti $v0, $v1, 2 -/* 844B5C 80241F8C 50400005 */ beql $v0, $zero, .L80241FA4 -/* 844B60 80241F90 24020002 */ addiu $v0, $zero, 2 -/* 844B64 80241F94 10600007 */ beqz $v1, .L80241FB4 -/* 844B68 80241F98 00000000 */ nop -/* 844B6C 80241F9C 080907FB */ j .L80241FEC -/* 844B70 80241FA0 00000000 */ nop -.L80241FA4: -/* 844B74 80241FA4 50620010 */ beql $v1, $v0, .L80241FE8 -/* 844B78 80241FA8 AE040074 */ sw $a0, 0x74($s0) -/* 844B7C 80241FAC 080907FB */ j .L80241FEC -/* 844B80 80241FB0 00000000 */ nop -.L80241FB4: -/* 844B84 80241FB4 C6200008 */ lwc1 $f0, 8($s1) -/* 844B88 80241FB8 4600103C */ c.lt.s $f2, $f0 -/* 844B8C 80241FBC 00000000 */ nop -/* 844B90 80241FC0 4500000A */ bc1f .L80241FEC -/* 844B94 80241FC4 00000000 */ nop -/* 844B98 80241FC8 080907FA */ j .L80241FE8 -/* 844B9C 80241FCC AE040074 */ sw $a0, 0x74($s0) -.L80241FD0: -/* 844BA0 80241FD0 C620000C */ lwc1 $f0, 0xc($s1) -/* 844BA4 80241FD4 4602003C */ c.lt.s $f0, $f2 -/* 844BA8 80241FD8 00000000 */ nop -/* 844BAC 80241FDC 45000003 */ bc1f .L80241FEC -/* 844BB0 80241FE0 00000000 */ nop -/* 844BB4 80241FE4 AE000074 */ sw $zero, 0x74($s0) -.L80241FE8: -/* 844BB8 80241FE8 24120001 */ addiu $s2, $zero, 1 -.L80241FEC: -/* 844BBC 80241FEC 12400005 */ beqz $s2, .L80242004 -/* 844BC0 80241FF0 00000000 */ nop -/* 844BC4 80241FF4 8E250010 */ lw $a1, 0x10($s1) -/* 844BC8 80241FF8 86060076 */ lh $a2, 0x76($s0) -/* 844BCC 80241FFC 0C052A95 */ jal func_8014AA54 -/* 844BD0 80242000 0000202D */ daddu $a0, $zero, $zero -.L80242004: -/* 844BD4 80242004 8FBF001C */ lw $ra, 0x1c($sp) -/* 844BD8 80242008 8FB20018 */ lw $s2, 0x18($sp) -/* 844BDC 8024200C 8FB10014 */ lw $s1, 0x14($sp) -/* 844BE0 80242010 8FB00010 */ lw $s0, 0x10($sp) -/* 844BE4 80242014 0000102D */ daddu $v0, $zero, $zero -/* 844BE8 80242018 03E00008 */ jr $ra -/* 844BEC 8024201C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s b/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s new file mode 100644 index 0000000000..4747ef3ec3 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_04/844AC0/func_80241EF0_844AC0.s @@ -0,0 +1,88 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241EF0_844AC0 +/* 844AC0 80241EF0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 844AC4 80241EF4 AFB00010 */ sw $s0, 0x10($sp) +/* 844AC8 80241EF8 0080802D */ daddu $s0, $a0, $zero +/* 844ACC 80241EFC AFB20018 */ sw $s2, 0x18($sp) +/* 844AD0 80241F00 AFBF001C */ sw $ra, 0x1c($sp) +/* 844AD4 80241F04 AFB10014 */ sw $s1, 0x14($sp) +/* 844AD8 80241F08 8E02000C */ lw $v0, 0xc($s0) +/* 844ADC 80241F0C 10A00008 */ beqz $a1, .L80241F30 +/* 844AE0 80241F10 0000902D */ daddu $s2, $zero, $zero +/* 844AE4 80241F14 8C450000 */ lw $a1, ($v0) +/* 844AE8 80241F18 0C0B1EAF */ jal get_variable +/* 844AEC 80241F1C 00000000 */ nop +/* 844AF0 80241F20 AE020070 */ sw $v0, 0x70($s0) +/* 844AF4 80241F24 AE000074 */ sw $zero, 0x74($s0) +/* 844AF8 80241F28 8C420014 */ lw $v0, 0x14($v0) +/* 844AFC 80241F2C AE020078 */ sw $v0, 0x78($s0) +.L80241F30: +/* 844B00 80241F30 8E050078 */ lw $a1, 0x78($s0) +/* 844B04 80241F34 8E110070 */ lw $s1, 0x70($s0) +/* 844B08 80241F38 0C0B1EAF */ jal get_variable +/* 844B0C 80241F3C 0200202D */ daddu $a0, $s0, $zero +/* 844B10 80241F40 10400006 */ beqz $v0, .L80241F5C +/* 844B14 80241F44 24030002 */ addiu $v1, $zero, 2 +/* 844B18 80241F48 8E020074 */ lw $v0, 0x74($s0) +/* 844B1C 80241F4C 10430027 */ beq $v0, $v1, .L80241FEC +/* 844B20 80241F50 00000000 */ nop +/* 844B24 80241F54 080907FA */ j .L80241FE8 +/* 844B28 80241F58 AE030074 */ sw $v1, 0x74($s0) +.L80241F5C: +/* 844B2C 80241F5C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 844B30 80241F60 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 844B34 80241F64 8E260000 */ lw $a2, ($s1) +/* 844B38 80241F68 8E270004 */ lw $a3, 4($s1) +/* 844B3C 80241F6C C44C0028 */ lwc1 $f12, 0x28($v0) +/* 844B40 80241F70 0C00A7B5 */ jal dist2D +/* 844B44 80241F74 C44E0030 */ lwc1 $f14, 0x30($v0) +/* 844B48 80241F78 8E030074 */ lw $v1, 0x74($s0) +/* 844B4C 80241F7C 24040001 */ addiu $a0, $zero, 1 +/* 844B50 80241F80 10640013 */ beq $v1, $a0, .L80241FD0 +/* 844B54 80241F84 46000086 */ mov.s $f2, $f0 +/* 844B58 80241F88 28620002 */ slti $v0, $v1, 2 +/* 844B5C 80241F8C 50400005 */ beql $v0, $zero, .L80241FA4 +/* 844B60 80241F90 24020002 */ addiu $v0, $zero, 2 +/* 844B64 80241F94 10600007 */ beqz $v1, .L80241FB4 +/* 844B68 80241F98 00000000 */ nop +/* 844B6C 80241F9C 080907FB */ j .L80241FEC +/* 844B70 80241FA0 00000000 */ nop +.L80241FA4: +/* 844B74 80241FA4 50620010 */ beql $v1, $v0, .L80241FE8 +/* 844B78 80241FA8 AE040074 */ sw $a0, 0x74($s0) +/* 844B7C 80241FAC 080907FB */ j .L80241FEC +/* 844B80 80241FB0 00000000 */ nop +.L80241FB4: +/* 844B84 80241FB4 C6200008 */ lwc1 $f0, 8($s1) +/* 844B88 80241FB8 4600103C */ c.lt.s $f2, $f0 +/* 844B8C 80241FBC 00000000 */ nop +/* 844B90 80241FC0 4500000A */ bc1f .L80241FEC +/* 844B94 80241FC4 00000000 */ nop +/* 844B98 80241FC8 080907FA */ j .L80241FE8 +/* 844B9C 80241FCC AE040074 */ sw $a0, 0x74($s0) +.L80241FD0: +/* 844BA0 80241FD0 C620000C */ lwc1 $f0, 0xc($s1) +/* 844BA4 80241FD4 4602003C */ c.lt.s $f0, $f2 +/* 844BA8 80241FD8 00000000 */ nop +/* 844BAC 80241FDC 45000003 */ bc1f .L80241FEC +/* 844BB0 80241FE0 00000000 */ nop +/* 844BB4 80241FE4 AE000074 */ sw $zero, 0x74($s0) +.L80241FE8: +/* 844BB8 80241FE8 24120001 */ addiu $s2, $zero, 1 +.L80241FEC: +/* 844BBC 80241FEC 12400005 */ beqz $s2, .L80242004 +/* 844BC0 80241FF0 00000000 */ nop +/* 844BC4 80241FF4 8E250010 */ lw $a1, 0x10($s1) +/* 844BC8 80241FF8 86060076 */ lh $a2, 0x76($s0) +/* 844BCC 80241FFC 0C052A95 */ jal func_8014AA54 +/* 844BD0 80242000 0000202D */ daddu $a0, $zero, $zero +.L80242004: +/* 844BD4 80242004 8FBF001C */ lw $ra, 0x1c($sp) +/* 844BD8 80242008 8FB20018 */ lw $s2, 0x18($sp) +/* 844BDC 8024200C 8FB10014 */ lw $s1, 0x14($sp) +/* 844BE0 80242010 8FB00010 */ lw $s0, 0x10($sp) +/* 844BE4 80242014 0000102D */ daddu $v0, $zero, $zero +/* 844BE8 80242018 03E00008 */ jr $ra +/* 844BEC 8024201C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124.s deleted file mode 100644 index 73f1bb4b52..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240124 -/* 852294 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 852298 80240128 AFB00010 */ sw $s0, 0x10($sp) -/* 85229C 8024012C 0080802D */ daddu $s0, $a0, $zero -/* 8522A0 80240130 10A00005 */ beqz $a1, .L80240148 -/* 8522A4 80240134 AFBF0014 */ sw $ra, 0x14($sp) -/* 8522A8 80240138 AE000070 */ sw $zero, 0x70($s0) -/* 8522AC 8024013C AE000074 */ sw $zero, 0x74($s0) -/* 8522B0 80240140 AE000078 */ sw $zero, 0x78($s0) -/* 8522B4 80240144 AE00007C */ sw $zero, 0x7c($s0) -.L80240148: -/* 8522B8 80240148 8E020070 */ lw $v0, 0x70($s0) -/* 8522BC 8024014C 1440000E */ bnez $v0, .L80240188 -/* 8522C0 80240150 00000000 */ nop -/* 8522C4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8522C8 80240158 8E020088 */ lw $v0, 0x88($s0) -/* 8522CC 8024015C 00621821 */ addu $v1, $v1, $v0 -/* 8522D0 80240160 04610004 */ bgez $v1, .L80240174 -/* 8522D4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8522D8 80240168 3C020002 */ lui $v0, 2 -/* 8522DC 8024016C 08090061 */ j .L80240184 -/* 8522E0 80240170 00621021 */ addu $v0, $v1, $v0 -.L80240174: -/* 8522E4 80240174 3C040002 */ lui $a0, 2 -/* 8522E8 80240178 0083102A */ slt $v0, $a0, $v1 -/* 8522EC 8024017C 10400002 */ beqz $v0, .L80240188 -/* 8522F0 80240180 00641023 */ subu $v0, $v1, $a0 -.L80240184: -/* 8522F4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) -.L80240188: -/* 8522F8 80240188 8E020074 */ lw $v0, 0x74($s0) -/* 8522FC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* 852300 80240190 00000000 */ nop -/* 852304 80240194 8E0300AC */ lw $v1, 0xac($s0) -/* 852308 80240198 8E02008C */ lw $v0, 0x8c($s0) -/* 85230C 8024019C 00621821 */ addu $v1, $v1, $v0 -/* 852310 802401A0 04610004 */ bgez $v1, .L802401B4 -/* 852314 802401A4 AE0300AC */ sw $v1, 0xac($s0) -/* 852318 802401A8 3C020002 */ lui $v0, 2 -/* 85231C 802401AC 08090071 */ j .L802401C4 -/* 852320 802401B0 00621021 */ addu $v0, $v1, $v0 -.L802401B4: -/* 852324 802401B4 3C040002 */ lui $a0, 2 -/* 852328 802401B8 0083102A */ slt $v0, $a0, $v1 -/* 85232C 802401BC 10400002 */ beqz $v0, .L802401C8 -/* 852330 802401C0 00641023 */ subu $v0, $v1, $a0 -.L802401C4: -/* 852334 802401C4 AE0200AC */ sw $v0, 0xac($s0) -.L802401C8: -/* 852338 802401C8 8E020078 */ lw $v0, 0x78($s0) -/* 85233C 802401CC 1440000E */ bnez $v0, .L80240208 -/* 852340 802401D0 00000000 */ nop -/* 852344 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) -/* 852348 802401D8 8E020090 */ lw $v0, 0x90($s0) -/* 85234C 802401DC 00621821 */ addu $v1, $v1, $v0 -/* 852350 802401E0 04610004 */ bgez $v1, .L802401F4 -/* 852354 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) -/* 852358 802401E8 3C020002 */ lui $v0, 2 -/* 85235C 802401EC 08090081 */ j .L80240204 -/* 852360 802401F0 00621021 */ addu $v0, $v1, $v0 -.L802401F4: -/* 852364 802401F4 3C040002 */ lui $a0, 2 -/* 852368 802401F8 0083102A */ slt $v0, $a0, $v1 -/* 85236C 802401FC 10400002 */ beqz $v0, .L80240208 -/* 852370 80240200 00641023 */ subu $v0, $v1, $a0 -.L80240204: -/* 852374 80240204 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240208: -/* 852378 80240208 8E02007C */ lw $v0, 0x7c($s0) -/* 85237C 8024020C 1440000E */ bnez $v0, .L80240248 -/* 852380 80240210 00000000 */ nop -/* 852384 80240214 8E0300B4 */ lw $v1, 0xb4($s0) -/* 852388 80240218 8E020094 */ lw $v0, 0x94($s0) -/* 85238C 8024021C 00621821 */ addu $v1, $v1, $v0 -/* 852390 80240220 04610004 */ bgez $v1, .L80240234 -/* 852394 80240224 AE0300B4 */ sw $v1, 0xb4($s0) -/* 852398 80240228 3C020002 */ lui $v0, 2 -/* 85239C 8024022C 08090091 */ j .L80240244 -/* 8523A0 80240230 00621021 */ addu $v0, $v1, $v0 -.L80240234: -/* 8523A4 80240234 3C040002 */ lui $a0, 2 -/* 8523A8 80240238 0083102A */ slt $v0, $a0, $v1 -/* 8523AC 8024023C 10400002 */ beqz $v0, .L80240248 -/* 8523B0 80240240 00641023 */ subu $v0, $v1, $a0 -.L80240244: -/* 8523B4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240248: -/* 8523B8 80240248 8E040084 */ lw $a0, 0x84($s0) -/* 8523BC 8024024C 0C046F07 */ jal set_main_pan_u -/* 8523C0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8523C4 80240254 8E040084 */ lw $a0, 0x84($s0) -/* 8523C8 80240258 0C046F0D */ jal set_main_pan_v -/* 8523CC 8024025C 8E0500AC */ lw $a1, 0xac($s0) -/* 8523D0 80240260 8E040084 */ lw $a0, 0x84($s0) -/* 8523D4 80240264 0C046F13 */ jal set_aux_pan_u -/* 8523D8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8523DC 8024026C 8E040084 */ lw $a0, 0x84($s0) -/* 8523E0 80240270 0C046F19 */ jal set_aux_pan_v -/* 8523E4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8523E8 80240278 8E020070 */ lw $v0, 0x70($s0) -/* 8523EC 8024027C 8E030078 */ lw $v1, 0x78($s0) -/* 8523F0 80240280 8E040098 */ lw $a0, 0x98($s0) -/* 8523F4 80240284 24420001 */ addiu $v0, $v0, 1 -/* 8523F8 80240288 AE020070 */ sw $v0, 0x70($s0) -/* 8523FC 8024028C 8E020074 */ lw $v0, 0x74($s0) -/* 852400 80240290 24630001 */ addiu $v1, $v1, 1 -/* 852404 80240294 AE030078 */ sw $v1, 0x78($s0) -/* 852408 80240298 8E030070 */ lw $v1, 0x70($s0) -/* 85240C 8024029C 24420001 */ addiu $v0, $v0, 1 -/* 852410 802402A0 AE020074 */ sw $v0, 0x74($s0) -/* 852414 802402A4 8E02007C */ lw $v0, 0x7c($s0) -/* 852418 802402A8 0064182A */ slt $v1, $v1, $a0 -/* 85241C 802402AC 24420001 */ addiu $v0, $v0, 1 -/* 852420 802402B0 14600002 */ bnez $v1, .L802402BC -/* 852424 802402B4 AE02007C */ sw $v0, 0x7c($s0) -/* 852428 802402B8 AE000070 */ sw $zero, 0x70($s0) -.L802402BC: -/* 85242C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 852430 802402C0 8E03009C */ lw $v1, 0x9c($s0) -/* 852434 802402C4 0043102A */ slt $v0, $v0, $v1 -/* 852438 802402C8 50400001 */ beql $v0, $zero, .L802402D0 -/* 85243C 802402CC AE000074 */ sw $zero, 0x74($s0) -.L802402D0: -/* 852440 802402D0 8E020078 */ lw $v0, 0x78($s0) -/* 852444 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) -/* 852448 802402D8 0043102A */ slt $v0, $v0, $v1 -/* 85244C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 -/* 852450 802402E0 AE000078 */ sw $zero, 0x78($s0) -.L802402E4: -/* 852454 802402E4 8E02007C */ lw $v0, 0x7c($s0) -/* 852458 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) -/* 85245C 802402EC 0043102A */ slt $v0, $v0, $v1 -/* 852460 802402F0 50400001 */ beql $v0, $zero, .L802402F8 -/* 852464 802402F4 AE00007C */ sw $zero, 0x7c($s0) -.L802402F8: -/* 852468 802402F8 8FBF0014 */ lw $ra, 0x14($sp) -/* 85246C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 852470 80240300 0000102D */ daddu $v0, $zero, $zero -/* 852474 80240304 03E00008 */ jr $ra -/* 852478 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124_852294.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124_852294.s new file mode 100644 index 0000000000..7637a67dd5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240124_852294.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240124_852294 +/* 852294 80240124 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 852298 80240128 AFB00010 */ sw $s0, 0x10($sp) +/* 85229C 8024012C 0080802D */ daddu $s0, $a0, $zero +/* 8522A0 80240130 10A00005 */ beqz $a1, .L80240148 +/* 8522A4 80240134 AFBF0014 */ sw $ra, 0x14($sp) +/* 8522A8 80240138 AE000070 */ sw $zero, 0x70($s0) +/* 8522AC 8024013C AE000074 */ sw $zero, 0x74($s0) +/* 8522B0 80240140 AE000078 */ sw $zero, 0x78($s0) +/* 8522B4 80240144 AE00007C */ sw $zero, 0x7c($s0) +.L80240148: +/* 8522B8 80240148 8E020070 */ lw $v0, 0x70($s0) +/* 8522BC 8024014C 1440000E */ bnez $v0, .L80240188 +/* 8522C0 80240150 00000000 */ nop +/* 8522C4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) +/* 8522C8 80240158 8E020088 */ lw $v0, 0x88($s0) +/* 8522CC 8024015C 00621821 */ addu $v1, $v1, $v0 +/* 8522D0 80240160 04610004 */ bgez $v1, .L80240174 +/* 8522D4 80240164 AE0300A8 */ sw $v1, 0xa8($s0) +/* 8522D8 80240168 3C020002 */ lui $v0, 2 +/* 8522DC 8024016C 08090061 */ j .L80240184 +/* 8522E0 80240170 00621021 */ addu $v0, $v1, $v0 +.L80240174: +/* 8522E4 80240174 3C040002 */ lui $a0, 2 +/* 8522E8 80240178 0083102A */ slt $v0, $a0, $v1 +/* 8522EC 8024017C 10400002 */ beqz $v0, .L80240188 +/* 8522F0 80240180 00641023 */ subu $v0, $v1, $a0 +.L80240184: +/* 8522F4 80240184 AE0200A8 */ sw $v0, 0xa8($s0) +.L80240188: +/* 8522F8 80240188 8E020074 */ lw $v0, 0x74($s0) +/* 8522FC 8024018C 1440000E */ bnez $v0, .L802401C8 +/* 852300 80240190 00000000 */ nop +/* 852304 80240194 8E0300AC */ lw $v1, 0xac($s0) +/* 852308 80240198 8E02008C */ lw $v0, 0x8c($s0) +/* 85230C 8024019C 00621821 */ addu $v1, $v1, $v0 +/* 852310 802401A0 04610004 */ bgez $v1, .L802401B4 +/* 852314 802401A4 AE0300AC */ sw $v1, 0xac($s0) +/* 852318 802401A8 3C020002 */ lui $v0, 2 +/* 85231C 802401AC 08090071 */ j .L802401C4 +/* 852320 802401B0 00621021 */ addu $v0, $v1, $v0 +.L802401B4: +/* 852324 802401B4 3C040002 */ lui $a0, 2 +/* 852328 802401B8 0083102A */ slt $v0, $a0, $v1 +/* 85232C 802401BC 10400002 */ beqz $v0, .L802401C8 +/* 852330 802401C0 00641023 */ subu $v0, $v1, $a0 +.L802401C4: +/* 852334 802401C4 AE0200AC */ sw $v0, 0xac($s0) +.L802401C8: +/* 852338 802401C8 8E020078 */ lw $v0, 0x78($s0) +/* 85233C 802401CC 1440000E */ bnez $v0, .L80240208 +/* 852340 802401D0 00000000 */ nop +/* 852344 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) +/* 852348 802401D8 8E020090 */ lw $v0, 0x90($s0) +/* 85234C 802401DC 00621821 */ addu $v1, $v1, $v0 +/* 852350 802401E0 04610004 */ bgez $v1, .L802401F4 +/* 852354 802401E4 AE0300B0 */ sw $v1, 0xb0($s0) +/* 852358 802401E8 3C020002 */ lui $v0, 2 +/* 85235C 802401EC 08090081 */ j .L80240204 +/* 852360 802401F0 00621021 */ addu $v0, $v1, $v0 +.L802401F4: +/* 852364 802401F4 3C040002 */ lui $a0, 2 +/* 852368 802401F8 0083102A */ slt $v0, $a0, $v1 +/* 85236C 802401FC 10400002 */ beqz $v0, .L80240208 +/* 852370 80240200 00641023 */ subu $v0, $v1, $a0 +.L80240204: +/* 852374 80240204 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240208: +/* 852378 80240208 8E02007C */ lw $v0, 0x7c($s0) +/* 85237C 8024020C 1440000E */ bnez $v0, .L80240248 +/* 852380 80240210 00000000 */ nop +/* 852384 80240214 8E0300B4 */ lw $v1, 0xb4($s0) +/* 852388 80240218 8E020094 */ lw $v0, 0x94($s0) +/* 85238C 8024021C 00621821 */ addu $v1, $v1, $v0 +/* 852390 80240220 04610004 */ bgez $v1, .L80240234 +/* 852394 80240224 AE0300B4 */ sw $v1, 0xb4($s0) +/* 852398 80240228 3C020002 */ lui $v0, 2 +/* 85239C 8024022C 08090091 */ j .L80240244 +/* 8523A0 80240230 00621021 */ addu $v0, $v1, $v0 +.L80240234: +/* 8523A4 80240234 3C040002 */ lui $a0, 2 +/* 8523A8 80240238 0083102A */ slt $v0, $a0, $v1 +/* 8523AC 8024023C 10400002 */ beqz $v0, .L80240248 +/* 8523B0 80240240 00641023 */ subu $v0, $v1, $a0 +.L80240244: +/* 8523B4 80240244 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240248: +/* 8523B8 80240248 8E040084 */ lw $a0, 0x84($s0) +/* 8523BC 8024024C 0C046F07 */ jal set_main_pan_u +/* 8523C0 80240250 8E0500A8 */ lw $a1, 0xa8($s0) +/* 8523C4 80240254 8E040084 */ lw $a0, 0x84($s0) +/* 8523C8 80240258 0C046F0D */ jal set_main_pan_v +/* 8523CC 8024025C 8E0500AC */ lw $a1, 0xac($s0) +/* 8523D0 80240260 8E040084 */ lw $a0, 0x84($s0) +/* 8523D4 80240264 0C046F13 */ jal set_aux_pan_u +/* 8523D8 80240268 8E0500B0 */ lw $a1, 0xb0($s0) +/* 8523DC 8024026C 8E040084 */ lw $a0, 0x84($s0) +/* 8523E0 80240270 0C046F19 */ jal set_aux_pan_v +/* 8523E4 80240274 8E0500B4 */ lw $a1, 0xb4($s0) +/* 8523E8 80240278 8E020070 */ lw $v0, 0x70($s0) +/* 8523EC 8024027C 8E030078 */ lw $v1, 0x78($s0) +/* 8523F0 80240280 8E040098 */ lw $a0, 0x98($s0) +/* 8523F4 80240284 24420001 */ addiu $v0, $v0, 1 +/* 8523F8 80240288 AE020070 */ sw $v0, 0x70($s0) +/* 8523FC 8024028C 8E020074 */ lw $v0, 0x74($s0) +/* 852400 80240290 24630001 */ addiu $v1, $v1, 1 +/* 852404 80240294 AE030078 */ sw $v1, 0x78($s0) +/* 852408 80240298 8E030070 */ lw $v1, 0x70($s0) +/* 85240C 8024029C 24420001 */ addiu $v0, $v0, 1 +/* 852410 802402A0 AE020074 */ sw $v0, 0x74($s0) +/* 852414 802402A4 8E02007C */ lw $v0, 0x7c($s0) +/* 852418 802402A8 0064182A */ slt $v1, $v1, $a0 +/* 85241C 802402AC 24420001 */ addiu $v0, $v0, 1 +/* 852420 802402B0 14600002 */ bnez $v1, .L802402BC +/* 852424 802402B4 AE02007C */ sw $v0, 0x7c($s0) +/* 852428 802402B8 AE000070 */ sw $zero, 0x70($s0) +.L802402BC: +/* 85242C 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* 852430 802402C0 8E03009C */ lw $v1, 0x9c($s0) +/* 852434 802402C4 0043102A */ slt $v0, $v0, $v1 +/* 852438 802402C8 50400001 */ beql $v0, $zero, .L802402D0 +/* 85243C 802402CC AE000074 */ sw $zero, 0x74($s0) +.L802402D0: +/* 852440 802402D0 8E020078 */ lw $v0, 0x78($s0) +/* 852444 802402D4 8E0300A0 */ lw $v1, 0xa0($s0) +/* 852448 802402D8 0043102A */ slt $v0, $v0, $v1 +/* 85244C 802402DC 50400001 */ beql $v0, $zero, .L802402E4 +/* 852450 802402E0 AE000078 */ sw $zero, 0x78($s0) +.L802402E4: +/* 852454 802402E4 8E02007C */ lw $v0, 0x7c($s0) +/* 852458 802402E8 8E0300A4 */ lw $v1, 0xa4($s0) +/* 85245C 802402EC 0043102A */ slt $v0, $v0, $v1 +/* 852460 802402F0 50400001 */ beql $v0, $zero, .L802402F8 +/* 852464 802402F4 AE00007C */ sw $zero, 0x7c($s0) +.L802402F8: +/* 852468 802402F8 8FBF0014 */ lw $ra, 0x14($sp) +/* 85246C 802402FC 8FB00010 */ lw $s0, 0x10($sp) +/* 852470 80240300 0000102D */ daddu $v0, $zero, $zero +/* 852474 80240304 03E00008 */ jr $ra +/* 852478 80240308 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C.s deleted file mode 100644 index 2e1fa48e85..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024030C -/* 85247C 8024030C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 852480 80240310 AFB20018 */ sw $s2, 0x18($sp) -/* 852484 80240314 0080902D */ daddu $s2, $a0, $zero -/* 852488 80240318 AFBF0028 */ sw $ra, 0x28($sp) -/* 85248C 8024031C AFB50024 */ sw $s5, 0x24($sp) -/* 852490 80240320 AFB40020 */ sw $s4, 0x20($sp) -/* 852494 80240324 AFB3001C */ sw $s3, 0x1c($sp) -/* 852498 80240328 AFB10014 */ sw $s1, 0x14($sp) -/* 85249C 8024032C AFB00010 */ sw $s0, 0x10($sp) -/* 8524A0 80240330 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 8524A4 80240334 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 8524A8 80240338 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 8524AC 8024033C 8E50000C */ lw $s0, 0xc($s2) -/* 8524B0 80240340 8E140000 */ lw $s4, ($s0) -/* 8524B4 80240344 26100004 */ addiu $s0, $s0, 4 -/* 8524B8 80240348 0C0B1EAF */ jal get_variable -/* 8524BC 8024034C 0280282D */ daddu $a1, $s4, $zero -/* 8524C0 80240350 0040982D */ daddu $s3, $v0, $zero -/* 8524C4 80240354 8E150000 */ lw $s5, ($s0) -/* 8524C8 80240358 26100004 */ addiu $s0, $s0, 4 -/* 8524CC 8024035C 8E050000 */ lw $a1, ($s0) -/* 8524D0 80240360 26100004 */ addiu $s0, $s0, 4 -/* 8524D4 80240364 0C0B210B */ jal get_float_variable -/* 8524D8 80240368 0240202D */ daddu $a0, $s2, $zero -/* 8524DC 8024036C 8E050000 */ lw $a1, ($s0) -/* 8524E0 80240370 26100004 */ addiu $s0, $s0, 4 -/* 8524E4 80240374 0240202D */ daddu $a0, $s2, $zero -/* 8524E8 80240378 0C0B210B */ jal get_float_variable -/* 8524EC 8024037C 46000606 */ mov.s $f24, $f0 -/* 8524F0 80240380 8E050000 */ lw $a1, ($s0) -/* 8524F4 80240384 26100004 */ addiu $s0, $s0, 4 -/* 8524F8 80240388 0240202D */ daddu $a0, $s2, $zero -/* 8524FC 8024038C 0C0B1EAF */ jal get_variable -/* 852500 80240390 46000506 */ mov.s $f20, $f0 -/* 852504 80240394 8E050000 */ lw $a1, ($s0) -/* 852508 80240398 26100004 */ addiu $s0, $s0, 4 -/* 85250C 8024039C 0240202D */ daddu $a0, $s2, $zero -/* 852510 802403A0 0C0B1EAF */ jal get_variable -/* 852514 802403A4 0040882D */ daddu $s1, $v0, $zero -/* 852518 802403A8 0240202D */ daddu $a0, $s2, $zero -/* 85251C 802403AC 8E050000 */ lw $a1, ($s0) -/* 852520 802403B0 0C0B210B */ jal get_float_variable -/* 852524 802403B4 0040802D */ daddu $s0, $v0, $zero -/* 852528 802403B8 4618A501 */ sub.s $f20, $f20, $f24 -/* 85252C 802403BC 3C013F00 */ lui $at, 0x3f00 -/* 852530 802403C0 44811000 */ mtc1 $at, $f2 -/* 852534 802403C4 00000000 */ nop -/* 852538 802403C8 4602A502 */ mul.s $f20, $f20, $f2 -/* 85253C 802403CC 00000000 */ nop -/* 852540 802403D0 12000008 */ beqz $s0, .L802403F4 -/* 852544 802403D4 46000586 */ mov.s $f22, $f0 -/* 852548 802403D8 0233102A */ slt $v0, $s1, $s3 -/* 85254C 802403DC 10400005 */ beqz $v0, .L802403F4 -/* 852550 802403E0 0240202D */ daddu $a0, $s2, $zero -/* 852554 802403E4 0220982D */ daddu $s3, $s1, $zero -/* 852558 802403E8 0280282D */ daddu $a1, $s4, $zero -/* 85255C 802403EC 0C0B2026 */ jal set_variable -/* 852560 802403F0 0220302D */ daddu $a2, $s1, $zero -.L802403F4: -/* 852564 802403F4 3C014334 */ lui $at, 0x4334 -/* 852568 802403F8 44810000 */ mtc1 $at, $f0 -/* 85256C 802403FC 44936000 */ mtc1 $s3, $f12 -/* 852570 80240400 00000000 */ nop -/* 852574 80240404 46806320 */ cvt.s.w $f12, $f12 -/* 852578 80240408 46006302 */ mul.s $f12, $f12, $f0 -/* 85257C 8024040C 00000000 */ nop -/* 852580 80240410 44910000 */ mtc1 $s1, $f0 -/* 852584 80240414 00000000 */ nop -/* 852588 80240418 46800020 */ cvt.s.w $f0, $f0 -/* 85258C 8024041C 46006303 */ div.s $f12, $f12, $f0 -/* 852590 80240420 0C00A8D4 */ jal cos_deg -/* 852594 80240424 46166300 */ add.s $f12, $f12, $f22 -/* 852598 80240428 4600A002 */ mul.s $f0, $f20, $f0 -/* 85259C 8024042C 00000000 */ nop -/* 8525A0 80240430 4614C080 */ add.s $f2, $f24, $f20 -/* 8525A4 80240434 46001081 */ sub.s $f2, $f2, $f0 -/* 8525A8 80240438 0240202D */ daddu $a0, $s2, $zero -/* 8525AC 8024043C 44061000 */ mfc1 $a2, $f2 -/* 8525B0 80240440 0C0B2190 */ jal set_float_variable -/* 8525B4 80240444 02A0282D */ daddu $a1, $s5, $zero -/* 8525B8 80240448 8FBF0028 */ lw $ra, 0x28($sp) -/* 8525BC 8024044C 8FB50024 */ lw $s5, 0x24($sp) -/* 8525C0 80240450 8FB40020 */ lw $s4, 0x20($sp) -/* 8525C4 80240454 8FB3001C */ lw $s3, 0x1c($sp) -/* 8525C8 80240458 8FB20018 */ lw $s2, 0x18($sp) -/* 8525CC 8024045C 8FB10014 */ lw $s1, 0x14($sp) -/* 8525D0 80240460 8FB00010 */ lw $s0, 0x10($sp) -/* 8525D4 80240464 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 8525D8 80240468 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 8525DC 8024046C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 8525E0 80240470 24020002 */ addiu $v0, $zero, 2 -/* 8525E4 80240474 03E00008 */ jr $ra -/* 8525E8 80240478 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s new file mode 100644 index 0000000000..ba9ddf9ec6 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024030C_85247C.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024030C_85247C +/* 85247C 8024030C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 852480 80240310 AFB20018 */ sw $s2, 0x18($sp) +/* 852484 80240314 0080902D */ daddu $s2, $a0, $zero +/* 852488 80240318 AFBF0028 */ sw $ra, 0x28($sp) +/* 85248C 8024031C AFB50024 */ sw $s5, 0x24($sp) +/* 852490 80240320 AFB40020 */ sw $s4, 0x20($sp) +/* 852494 80240324 AFB3001C */ sw $s3, 0x1c($sp) +/* 852498 80240328 AFB10014 */ sw $s1, 0x14($sp) +/* 85249C 8024032C AFB00010 */ sw $s0, 0x10($sp) +/* 8524A0 80240330 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 8524A4 80240334 F7B60038 */ sdc1 $f22, 0x38($sp) +/* 8524A8 80240338 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 8524AC 8024033C 8E50000C */ lw $s0, 0xc($s2) +/* 8524B0 80240340 8E140000 */ lw $s4, ($s0) +/* 8524B4 80240344 26100004 */ addiu $s0, $s0, 4 +/* 8524B8 80240348 0C0B1EAF */ jal get_variable +/* 8524BC 8024034C 0280282D */ daddu $a1, $s4, $zero +/* 8524C0 80240350 0040982D */ daddu $s3, $v0, $zero +/* 8524C4 80240354 8E150000 */ lw $s5, ($s0) +/* 8524C8 80240358 26100004 */ addiu $s0, $s0, 4 +/* 8524CC 8024035C 8E050000 */ lw $a1, ($s0) +/* 8524D0 80240360 26100004 */ addiu $s0, $s0, 4 +/* 8524D4 80240364 0C0B210B */ jal get_float_variable +/* 8524D8 80240368 0240202D */ daddu $a0, $s2, $zero +/* 8524DC 8024036C 8E050000 */ lw $a1, ($s0) +/* 8524E0 80240370 26100004 */ addiu $s0, $s0, 4 +/* 8524E4 80240374 0240202D */ daddu $a0, $s2, $zero +/* 8524E8 80240378 0C0B210B */ jal get_float_variable +/* 8524EC 8024037C 46000606 */ mov.s $f24, $f0 +/* 8524F0 80240380 8E050000 */ lw $a1, ($s0) +/* 8524F4 80240384 26100004 */ addiu $s0, $s0, 4 +/* 8524F8 80240388 0240202D */ daddu $a0, $s2, $zero +/* 8524FC 8024038C 0C0B1EAF */ jal get_variable +/* 852500 80240390 46000506 */ mov.s $f20, $f0 +/* 852504 80240394 8E050000 */ lw $a1, ($s0) +/* 852508 80240398 26100004 */ addiu $s0, $s0, 4 +/* 85250C 8024039C 0240202D */ daddu $a0, $s2, $zero +/* 852510 802403A0 0C0B1EAF */ jal get_variable +/* 852514 802403A4 0040882D */ daddu $s1, $v0, $zero +/* 852518 802403A8 0240202D */ daddu $a0, $s2, $zero +/* 85251C 802403AC 8E050000 */ lw $a1, ($s0) +/* 852520 802403B0 0C0B210B */ jal get_float_variable +/* 852524 802403B4 0040802D */ daddu $s0, $v0, $zero +/* 852528 802403B8 4618A501 */ sub.s $f20, $f20, $f24 +/* 85252C 802403BC 3C013F00 */ lui $at, 0x3f00 +/* 852530 802403C0 44811000 */ mtc1 $at, $f2 +/* 852534 802403C4 00000000 */ nop +/* 852538 802403C8 4602A502 */ mul.s $f20, $f20, $f2 +/* 85253C 802403CC 00000000 */ nop +/* 852540 802403D0 12000008 */ beqz $s0, .L802403F4 +/* 852544 802403D4 46000586 */ mov.s $f22, $f0 +/* 852548 802403D8 0233102A */ slt $v0, $s1, $s3 +/* 85254C 802403DC 10400005 */ beqz $v0, .L802403F4 +/* 852550 802403E0 0240202D */ daddu $a0, $s2, $zero +/* 852554 802403E4 0220982D */ daddu $s3, $s1, $zero +/* 852558 802403E8 0280282D */ daddu $a1, $s4, $zero +/* 85255C 802403EC 0C0B2026 */ jal set_variable +/* 852560 802403F0 0220302D */ daddu $a2, $s1, $zero +.L802403F4: +/* 852564 802403F4 3C014334 */ lui $at, 0x4334 +/* 852568 802403F8 44810000 */ mtc1 $at, $f0 +/* 85256C 802403FC 44936000 */ mtc1 $s3, $f12 +/* 852570 80240400 00000000 */ nop +/* 852574 80240404 46806320 */ cvt.s.w $f12, $f12 +/* 852578 80240408 46006302 */ mul.s $f12, $f12, $f0 +/* 85257C 8024040C 00000000 */ nop +/* 852580 80240410 44910000 */ mtc1 $s1, $f0 +/* 852584 80240414 00000000 */ nop +/* 852588 80240418 46800020 */ cvt.s.w $f0, $f0 +/* 85258C 8024041C 46006303 */ div.s $f12, $f12, $f0 +/* 852590 80240420 0C00A8D4 */ jal cos_deg +/* 852594 80240424 46166300 */ add.s $f12, $f12, $f22 +/* 852598 80240428 4600A002 */ mul.s $f0, $f20, $f0 +/* 85259C 8024042C 00000000 */ nop +/* 8525A0 80240430 4614C080 */ add.s $f2, $f24, $f20 +/* 8525A4 80240434 46001081 */ sub.s $f2, $f2, $f0 +/* 8525A8 80240438 0240202D */ daddu $a0, $s2, $zero +/* 8525AC 8024043C 44061000 */ mfc1 $a2, $f2 +/* 8525B0 80240440 0C0B2190 */ jal set_float_variable +/* 8525B4 80240444 02A0282D */ daddu $a1, $s5, $zero +/* 8525B8 80240448 8FBF0028 */ lw $ra, 0x28($sp) +/* 8525BC 8024044C 8FB50024 */ lw $s5, 0x24($sp) +/* 8525C0 80240450 8FB40020 */ lw $s4, 0x20($sp) +/* 8525C4 80240454 8FB3001C */ lw $s3, 0x1c($sp) +/* 8525C8 80240458 8FB20018 */ lw $s2, 0x18($sp) +/* 8525CC 8024045C 8FB10014 */ lw $s1, 0x14($sp) +/* 8525D0 80240460 8FB00010 */ lw $s0, 0x10($sp) +/* 8525D4 80240464 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 8525D8 80240468 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 8525DC 8024046C D7B40030 */ ldc1 $f20, 0x30($sp) +/* 8525E0 80240470 24020002 */ addiu $v0, $zero, 2 +/* 8525E4 80240474 03E00008 */ jr $ra +/* 8525E8 80240478 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024047C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024047C.s deleted file mode 100644 index 08c7ae24ee..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024047C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024047C -/* 8525EC 8024047C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8525F0 80240480 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8525F4 80240484 AC400094 */ sw $zero, 0x94($v0) -/* 8525F8 80240488 03E00008 */ jr $ra -/* 8525FC 8024048C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024047C_8525EC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024047C_8525EC.s new file mode 100644 index 0000000000..3c217916c1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024047C_8525EC.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024047C_8525EC +/* 8525EC 8024047C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 8525F0 80240480 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 8525F4 80240484 AC400094 */ sw $zero, 0x94($v0) +/* 8525F8 80240488 03E00008 */ jr $ra +/* 8525FC 8024048C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490.s deleted file mode 100644 index 4fbea5ba23..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240490 -/* 852600 80240490 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 852604 80240494 AFB50024 */ sw $s5, 0x24($sp) -/* 852608 80240498 0080A82D */ daddu $s5, $a0, $zero -/* 85260C 8024049C AFBF002C */ sw $ra, 0x2c($sp) -/* 852610 802404A0 AFB60028 */ sw $s6, 0x28($sp) -/* 852614 802404A4 AFB40020 */ sw $s4, 0x20($sp) -/* 852618 802404A8 AFB3001C */ sw $s3, 0x1c($sp) -/* 85261C 802404AC AFB20018 */ sw $s2, 0x18($sp) -/* 852620 802404B0 AFB10014 */ sw $s1, 0x14($sp) -/* 852624 802404B4 AFB00010 */ sw $s0, 0x10($sp) -/* 852628 802404B8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 85262C 802404BC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 852630 802404C0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 852634 802404C4 8EB30148 */ lw $s3, 0x148($s5) -/* 852638 802404C8 86640008 */ lh $a0, 8($s3) -/* 85263C 802404CC 0C00EABB */ jal get_npc_unsafe -/* 852640 802404D0 00A0B02D */ daddu $s6, $a1, $zero -/* 852644 802404D4 0040A02D */ daddu $s4, $v0, $zero -/* 852648 802404D8 AEA00074 */ sw $zero, 0x74($s5) -/* 85264C 802404DC C6980038 */ lwc1 $f24, 0x38($s4) -/* 852650 802404E0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 852654 802404E4 0000902D */ daddu $s2, $zero, $zero -/* 852658 802404E8 AEA00078 */ sw $zero, 0x78($s5) -/* 85265C 802404EC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 852660 802404F0 8C620000 */ lw $v0, ($v1) -/* 852664 802404F4 3C0146FF */ lui $at, 0x46ff -/* 852668 802404F8 3421FE00 */ ori $at, $at, 0xfe00 -/* 85266C 802404FC 4481A000 */ mtc1 $at, $f20 -/* 852670 80240500 18400018 */ blez $v0, .L80240564 -/* 852674 80240504 0240802D */ daddu $s0, $s2, $zero -/* 852678 80240508 0240882D */ daddu $s1, $s2, $zero -.L8024050C: -/* 85267C 8024050C 02231021 */ addu $v0, $s1, $v1 -/* 852680 80240510 4600C306 */ mov.s $f12, $f24 -/* 852684 80240514 C4440004 */ lwc1 $f4, 4($v0) -/* 852688 80240518 46802120 */ cvt.s.w $f4, $f4 -/* 85268C 8024051C 44062000 */ mfc1 $a2, $f4 -/* 852690 80240520 C444000C */ lwc1 $f4, 0xc($v0) -/* 852694 80240524 46802120 */ cvt.s.w $f4, $f4 -/* 852698 80240528 44072000 */ mfc1 $a3, $f4 -/* 85269C 8024052C 0C00A7B5 */ jal dist2D -/* 8526A0 80240530 4600B386 */ mov.s $f14, $f22 -/* 8526A4 80240534 4614003C */ c.lt.s $f0, $f20 -/* 8526A8 80240538 00000000 */ nop -/* 8526AC 8024053C 45000003 */ bc1f .L8024054C -/* 8526B0 80240540 2631000C */ addiu $s1, $s1, 0xc -/* 8526B4 80240544 46000506 */ mov.s $f20, $f0 -/* 8526B8 80240548 AEB20078 */ sw $s2, 0x78($s5) -.L8024054C: -/* 8526BC 8024054C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 8526C0 80240550 26100001 */ addiu $s0, $s0, 1 -/* 8526C4 80240554 8C620000 */ lw $v0, ($v1) -/* 8526C8 80240558 0202102A */ slt $v0, $s0, $v0 -/* 8526CC 8024055C 1440FFEB */ bnez $v0, .L8024050C -/* 8526D0 80240560 26520001 */ addiu $s2, $s2, 1 -.L80240564: -/* 8526D4 80240564 8E6200CC */ lw $v0, 0xcc($s3) -/* 8526D8 80240568 8C420004 */ lw $v0, 4($v0) -/* 8526DC 8024056C AE820028 */ sw $v0, 0x28($s4) -/* 8526E0 80240570 8E6200D0 */ lw $v0, 0xd0($s3) -/* 8526E4 80240574 8C42007C */ lw $v0, 0x7c($v0) -/* 8526E8 80240578 04410004 */ bgez $v0, .L8024058C -/* 8526EC 8024057C 00000000 */ nop -/* 8526F0 80240580 C6C00000 */ lwc1 $f0, ($s6) -/* 8526F4 80240584 0809016B */ j .L802405AC -/* 8526F8 80240588 E6800018 */ swc1 $f0, 0x18($s4) -.L8024058C: -/* 8526FC 8024058C 3C018025 */ lui $at, 0x8025 -/* 852700 80240590 D42227B0 */ ldc1 $f2, 0x27b0($at) -/* 852704 80240594 44820000 */ mtc1 $v0, $f0 -/* 852708 80240598 00000000 */ nop -/* 85270C 8024059C 46800021 */ cvt.d.w $f0, $f0 -/* 852710 802405A0 46220003 */ div.d $f0, $f0, $f2 -/* 852714 802405A4 46200020 */ cvt.s.d $f0, $f0 -/* 852718 802405A8 E6800018 */ swc1 $f0, 0x18($s4) -.L802405AC: -/* 85271C 802405AC 24020001 */ addiu $v0, $zero, 1 -/* 852720 802405B0 AEA20070 */ sw $v0, 0x70($s5) -/* 852724 802405B4 8FBF002C */ lw $ra, 0x2c($sp) -/* 852728 802405B8 8FB60028 */ lw $s6, 0x28($sp) -/* 85272C 802405BC 8FB50024 */ lw $s5, 0x24($sp) -/* 852730 802405C0 8FB40020 */ lw $s4, 0x20($sp) -/* 852734 802405C4 8FB3001C */ lw $s3, 0x1c($sp) -/* 852738 802405C8 8FB20018 */ lw $s2, 0x18($sp) -/* 85273C 802405CC 8FB10014 */ lw $s1, 0x14($sp) -/* 852740 802405D0 8FB00010 */ lw $s0, 0x10($sp) -/* 852744 802405D4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 852748 802405D8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 85274C 802405DC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 852750 802405E0 03E00008 */ jr $ra -/* 852754 802405E4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s new file mode 100644 index 0000000000..57d6c7536f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240490_852600.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240490_852600 +/* 852600 80240490 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 852604 80240494 AFB50024 */ sw $s5, 0x24($sp) +/* 852608 80240498 0080A82D */ daddu $s5, $a0, $zero +/* 85260C 8024049C AFBF002C */ sw $ra, 0x2c($sp) +/* 852610 802404A0 AFB60028 */ sw $s6, 0x28($sp) +/* 852614 802404A4 AFB40020 */ sw $s4, 0x20($sp) +/* 852618 802404A8 AFB3001C */ sw $s3, 0x1c($sp) +/* 85261C 802404AC AFB20018 */ sw $s2, 0x18($sp) +/* 852620 802404B0 AFB10014 */ sw $s1, 0x14($sp) +/* 852624 802404B4 AFB00010 */ sw $s0, 0x10($sp) +/* 852628 802404B8 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 85262C 802404BC F7B60038 */ sdc1 $f22, 0x38($sp) +/* 852630 802404C0 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 852634 802404C4 8EB30148 */ lw $s3, 0x148($s5) +/* 852638 802404C8 86640008 */ lh $a0, 8($s3) +/* 85263C 802404CC 0C00EABB */ jal get_npc_unsafe +/* 852640 802404D0 00A0B02D */ daddu $s6, $a1, $zero +/* 852644 802404D4 0040A02D */ daddu $s4, $v0, $zero +/* 852648 802404D8 AEA00074 */ sw $zero, 0x74($s5) +/* 85264C 802404DC C6980038 */ lwc1 $f24, 0x38($s4) +/* 852650 802404E0 C6960040 */ lwc1 $f22, 0x40($s4) +/* 852654 802404E4 0000902D */ daddu $s2, $zero, $zero +/* 852658 802404E8 AEA00078 */ sw $zero, 0x78($s5) +/* 85265C 802404EC 8E6300D0 */ lw $v1, 0xd0($s3) +/* 852660 802404F0 8C620000 */ lw $v0, ($v1) +/* 852664 802404F4 3C0146FF */ lui $at, 0x46ff +/* 852668 802404F8 3421FE00 */ ori $at, $at, 0xfe00 +/* 85266C 802404FC 4481A000 */ mtc1 $at, $f20 +/* 852670 80240500 18400018 */ blez $v0, .L80240564 +/* 852674 80240504 0240802D */ daddu $s0, $s2, $zero +/* 852678 80240508 0240882D */ daddu $s1, $s2, $zero +.L8024050C: +/* 85267C 8024050C 02231021 */ addu $v0, $s1, $v1 +/* 852680 80240510 4600C306 */ mov.s $f12, $f24 +/* 852684 80240514 C4440004 */ lwc1 $f4, 4($v0) +/* 852688 80240518 46802120 */ cvt.s.w $f4, $f4 +/* 85268C 8024051C 44062000 */ mfc1 $a2, $f4 +/* 852690 80240520 C444000C */ lwc1 $f4, 0xc($v0) +/* 852694 80240524 46802120 */ cvt.s.w $f4, $f4 +/* 852698 80240528 44072000 */ mfc1 $a3, $f4 +/* 85269C 8024052C 0C00A7B5 */ jal dist2D +/* 8526A0 80240530 4600B386 */ mov.s $f14, $f22 +/* 8526A4 80240534 4614003C */ c.lt.s $f0, $f20 +/* 8526A8 80240538 00000000 */ nop +/* 8526AC 8024053C 45000003 */ bc1f .L8024054C +/* 8526B0 80240540 2631000C */ addiu $s1, $s1, 0xc +/* 8526B4 80240544 46000506 */ mov.s $f20, $f0 +/* 8526B8 80240548 AEB20078 */ sw $s2, 0x78($s5) +.L8024054C: +/* 8526BC 8024054C 8E6300D0 */ lw $v1, 0xd0($s3) +/* 8526C0 80240550 26100001 */ addiu $s0, $s0, 1 +/* 8526C4 80240554 8C620000 */ lw $v0, ($v1) +/* 8526C8 80240558 0202102A */ slt $v0, $s0, $v0 +/* 8526CC 8024055C 1440FFEB */ bnez $v0, .L8024050C +/* 8526D0 80240560 26520001 */ addiu $s2, $s2, 1 +.L80240564: +/* 8526D4 80240564 8E6200CC */ lw $v0, 0xcc($s3) +/* 8526D8 80240568 8C420004 */ lw $v0, 4($v0) +/* 8526DC 8024056C AE820028 */ sw $v0, 0x28($s4) +/* 8526E0 80240570 8E6200D0 */ lw $v0, 0xd0($s3) +/* 8526E4 80240574 8C42007C */ lw $v0, 0x7c($v0) +/* 8526E8 80240578 04410004 */ bgez $v0, .L8024058C +/* 8526EC 8024057C 00000000 */ nop +/* 8526F0 80240580 C6C00000 */ lwc1 $f0, ($s6) +/* 8526F4 80240584 0809016B */ j .L802405AC +/* 8526F8 80240588 E6800018 */ swc1 $f0, 0x18($s4) +.L8024058C: +/* 8526FC 8024058C 3C018025 */ lui $at, 0x8025 +/* 852700 80240590 D42227B0 */ ldc1 $f2, 0x27b0($at) +/* 852704 80240594 44820000 */ mtc1 $v0, $f0 +/* 852708 80240598 00000000 */ nop +/* 85270C 8024059C 46800021 */ cvt.d.w $f0, $f0 +/* 852710 802405A0 46220003 */ div.d $f0, $f0, $f2 +/* 852714 802405A4 46200020 */ cvt.s.d $f0, $f0 +/* 852718 802405A8 E6800018 */ swc1 $f0, 0x18($s4) +.L802405AC: +/* 85271C 802405AC 24020001 */ addiu $v0, $zero, 1 +/* 852720 802405B0 AEA20070 */ sw $v0, 0x70($s5) +/* 852724 802405B4 8FBF002C */ lw $ra, 0x2c($sp) +/* 852728 802405B8 8FB60028 */ lw $s6, 0x28($sp) +/* 85272C 802405BC 8FB50024 */ lw $s5, 0x24($sp) +/* 852730 802405C0 8FB40020 */ lw $s4, 0x20($sp) +/* 852734 802405C4 8FB3001C */ lw $s3, 0x1c($sp) +/* 852738 802405C8 8FB20018 */ lw $s2, 0x18($sp) +/* 85273C 802405CC 8FB10014 */ lw $s1, 0x14($sp) +/* 852740 802405D0 8FB00010 */ lw $s0, 0x10($sp) +/* 852744 802405D4 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 852748 802405D8 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 85274C 802405DC D7B40030 */ ldc1 $f20, 0x30($sp) +/* 852750 802405E0 03E00008 */ jr $ra +/* 852754 802405E4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890.s deleted file mode 100644 index 4e8f92bacb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240890 -/* 852A00 80240890 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 852A04 80240894 AFB3001C */ sw $s3, 0x1c($sp) -/* 852A08 80240898 0080982D */ daddu $s3, $a0, $zero -/* 852A0C 8024089C AFBF0020 */ sw $ra, 0x20($sp) -/* 852A10 802408A0 AFB20018 */ sw $s2, 0x18($sp) -/* 852A14 802408A4 AFB10014 */ sw $s1, 0x14($sp) -/* 852A18 802408A8 AFB00010 */ sw $s0, 0x10($sp) -/* 852A1C 802408AC 8E720148 */ lw $s2, 0x148($s3) -/* 852A20 802408B0 86440008 */ lh $a0, 8($s2) -/* 852A24 802408B4 0C00EABB */ jal get_npc_unsafe -/* 852A28 802408B8 00A0882D */ daddu $s1, $a1, $zero -/* 852A2C 802408BC 8E240008 */ lw $a0, 8($s1) -/* 852A30 802408C0 0040802D */ daddu $s0, $v0, $zero -/* 852A34 802408C4 00041FC2 */ srl $v1, $a0, 0x1f -/* 852A38 802408C8 00832021 */ addu $a0, $a0, $v1 -/* 852A3C 802408CC 00042043 */ sra $a0, $a0, 1 -/* 852A40 802408D0 0C00A67F */ jal rand_int -/* 852A44 802408D4 24840001 */ addiu $a0, $a0, 1 -/* 852A48 802408D8 8E230008 */ lw $v1, 8($s1) -/* 852A4C 802408DC 240400B4 */ addiu $a0, $zero, 0xb4 -/* 852A50 802408E0 00032FC2 */ srl $a1, $v1, 0x1f -/* 852A54 802408E4 00651821 */ addu $v1, $v1, $a1 -/* 852A58 802408E8 00031843 */ sra $v1, $v1, 1 -/* 852A5C 802408EC 00621821 */ addu $v1, $v1, $v0 -/* 852A60 802408F0 0C00A67F */ jal rand_int -/* 852A64 802408F4 A603008E */ sh $v1, 0x8e($s0) -/* 852A68 802408F8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 852A6C 802408FC 44820000 */ mtc1 $v0, $f0 -/* 852A70 80240900 00000000 */ nop -/* 852A74 80240904 46800020 */ cvt.s.w $f0, $f0 -/* 852A78 80240908 46006300 */ add.s $f12, $f12, $f0 -/* 852A7C 8024090C 3C0142B4 */ lui $at, 0x42b4 -/* 852A80 80240910 44810000 */ mtc1 $at, $f0 -/* 852A84 80240914 0C00A6C9 */ jal clamp_angle -/* 852A88 80240918 46006301 */ sub.s $f12, $f12, $f0 -/* 852A8C 8024091C E600000C */ swc1 $f0, 0xc($s0) -/* 852A90 80240920 8E4200CC */ lw $v0, 0xcc($s2) -/* 852A94 80240924 8C420000 */ lw $v0, ($v0) -/* 852A98 80240928 AE020028 */ sw $v0, 0x28($s0) -/* 852A9C 8024092C 24020003 */ addiu $v0, $zero, 3 -/* 852AA0 80240930 AE620070 */ sw $v0, 0x70($s3) -/* 852AA4 80240934 8FBF0020 */ lw $ra, 0x20($sp) -/* 852AA8 80240938 8FB3001C */ lw $s3, 0x1c($sp) -/* 852AAC 8024093C 8FB20018 */ lw $s2, 0x18($sp) -/* 852AB0 80240940 8FB10014 */ lw $s1, 0x14($sp) -/* 852AB4 80240944 8FB00010 */ lw $s0, 0x10($sp) -/* 852AB8 80240948 03E00008 */ jr $ra -/* 852ABC 8024094C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s new file mode 100644 index 0000000000..4fb2757e15 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240890_852A00.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240890_852A00 +/* 852A00 80240890 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 852A04 80240894 AFB3001C */ sw $s3, 0x1c($sp) +/* 852A08 80240898 0080982D */ daddu $s3, $a0, $zero +/* 852A0C 8024089C AFBF0020 */ sw $ra, 0x20($sp) +/* 852A10 802408A0 AFB20018 */ sw $s2, 0x18($sp) +/* 852A14 802408A4 AFB10014 */ sw $s1, 0x14($sp) +/* 852A18 802408A8 AFB00010 */ sw $s0, 0x10($sp) +/* 852A1C 802408AC 8E720148 */ lw $s2, 0x148($s3) +/* 852A20 802408B0 86440008 */ lh $a0, 8($s2) +/* 852A24 802408B4 0C00EABB */ jal get_npc_unsafe +/* 852A28 802408B8 00A0882D */ daddu $s1, $a1, $zero +/* 852A2C 802408BC 8E240008 */ lw $a0, 8($s1) +/* 852A30 802408C0 0040802D */ daddu $s0, $v0, $zero +/* 852A34 802408C4 00041FC2 */ srl $v1, $a0, 0x1f +/* 852A38 802408C8 00832021 */ addu $a0, $a0, $v1 +/* 852A3C 802408CC 00042043 */ sra $a0, $a0, 1 +/* 852A40 802408D0 0C00A67F */ jal rand_int +/* 852A44 802408D4 24840001 */ addiu $a0, $a0, 1 +/* 852A48 802408D8 8E230008 */ lw $v1, 8($s1) +/* 852A4C 802408DC 240400B4 */ addiu $a0, $zero, 0xb4 +/* 852A50 802408E0 00032FC2 */ srl $a1, $v1, 0x1f +/* 852A54 802408E4 00651821 */ addu $v1, $v1, $a1 +/* 852A58 802408E8 00031843 */ sra $v1, $v1, 1 +/* 852A5C 802408EC 00621821 */ addu $v1, $v1, $v0 +/* 852A60 802408F0 0C00A67F */ jal rand_int +/* 852A64 802408F4 A603008E */ sh $v1, 0x8e($s0) +/* 852A68 802408F8 C60C000C */ lwc1 $f12, 0xc($s0) +/* 852A6C 802408FC 44820000 */ mtc1 $v0, $f0 +/* 852A70 80240900 00000000 */ nop +/* 852A74 80240904 46800020 */ cvt.s.w $f0, $f0 +/* 852A78 80240908 46006300 */ add.s $f12, $f12, $f0 +/* 852A7C 8024090C 3C0142B4 */ lui $at, 0x42b4 +/* 852A80 80240910 44810000 */ mtc1 $at, $f0 +/* 852A84 80240914 0C00A6C9 */ jal clamp_angle +/* 852A88 80240918 46006301 */ sub.s $f12, $f12, $f0 +/* 852A8C 8024091C E600000C */ swc1 $f0, 0xc($s0) +/* 852A90 80240920 8E4200CC */ lw $v0, 0xcc($s2) +/* 852A94 80240924 8C420000 */ lw $v0, ($v0) +/* 852A98 80240928 AE020028 */ sw $v0, 0x28($s0) +/* 852A9C 8024092C 24020003 */ addiu $v0, $zero, 3 +/* 852AA0 80240930 AE620070 */ sw $v0, 0x70($s3) +/* 852AA4 80240934 8FBF0020 */ lw $ra, 0x20($sp) +/* 852AA8 80240938 8FB3001C */ lw $s3, 0x1c($sp) +/* 852AAC 8024093C 8FB20018 */ lw $s2, 0x18($sp) +/* 852AB0 80240940 8FB10014 */ lw $s1, 0x14($sp) +/* 852AB4 80240944 8FB00010 */ lw $s0, 0x10($sp) +/* 852AB8 80240948 03E00008 */ jr $ra +/* 852ABC 8024094C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950.s deleted file mode 100644 index 429e72f524..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240950 -/* 852AC0 80240950 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 852AC4 80240954 AFB40040 */ sw $s4, 0x40($sp) -/* 852AC8 80240958 0080A02D */ daddu $s4, $a0, $zero -/* 852ACC 8024095C AFBF0044 */ sw $ra, 0x44($sp) -/* 852AD0 80240960 AFB3003C */ sw $s3, 0x3c($sp) -/* 852AD4 80240964 AFB20038 */ sw $s2, 0x38($sp) -/* 852AD8 80240968 AFB10034 */ sw $s1, 0x34($sp) -/* 852ADC 8024096C AFB00030 */ sw $s0, 0x30($sp) -/* 852AE0 80240970 8E910148 */ lw $s1, 0x148($s4) -/* 852AE4 80240974 00A0902D */ daddu $s2, $a1, $zero -/* 852AE8 80240978 86240008 */ lh $a0, 8($s1) -/* 852AEC 8024097C 0C00EABB */ jal get_npc_unsafe -/* 852AF0 80240980 00C0982D */ daddu $s3, $a2, $zero -/* 852AF4 80240984 8E430014 */ lw $v1, 0x14($s2) -/* 852AF8 80240988 04600031 */ bltz $v1, .L80240A50 -/* 852AFC 8024098C 0040802D */ daddu $s0, $v0, $zero -/* 852B00 80240990 0260202D */ daddu $a0, $s3, $zero -/* 852B04 80240994 AFA00010 */ sw $zero, 0x10($sp) -/* 852B08 80240998 8E460024 */ lw $a2, 0x24($s2) -/* 852B0C 8024099C 8E470028 */ lw $a3, 0x28($s2) -/* 852B10 802409A0 0C01242D */ jal func_800490B4 -/* 852B14 802409A4 0220282D */ daddu $a1, $s1, $zero -/* 852B18 802409A8 10400029 */ beqz $v0, .L80240A50 -/* 852B1C 802409AC 0000202D */ daddu $a0, $zero, $zero -/* 852B20 802409B0 0200282D */ daddu $a1, $s0, $zero -/* 852B24 802409B4 0000302D */ daddu $a2, $zero, $zero -/* 852B28 802409B8 860300A8 */ lh $v1, 0xa8($s0) -/* 852B2C 802409BC 3C013F80 */ lui $at, 0x3f80 -/* 852B30 802409C0 44810000 */ mtc1 $at, $f0 -/* 852B34 802409C4 3C014000 */ lui $at, 0x4000 -/* 852B38 802409C8 44811000 */ mtc1 $at, $f2 -/* 852B3C 802409CC 3C01C1A0 */ lui $at, 0xc1a0 -/* 852B40 802409D0 44812000 */ mtc1 $at, $f4 -/* 852B44 802409D4 2402000F */ addiu $v0, $zero, 0xf -/* 852B48 802409D8 AFA2001C */ sw $v0, 0x1c($sp) -/* 852B4C 802409DC 44833000 */ mtc1 $v1, $f6 -/* 852B50 802409E0 00000000 */ nop -/* 852B54 802409E4 468031A0 */ cvt.s.w $f6, $f6 -/* 852B58 802409E8 44073000 */ mfc1 $a3, $f6 -/* 852B5C 802409EC 27A20028 */ addiu $v0, $sp, 0x28 -/* 852B60 802409F0 AFA20020 */ sw $v0, 0x20($sp) -/* 852B64 802409F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 852B68 802409F8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 852B6C 802409FC 0C01BFA4 */ jal fx_emote -/* 852B70 80240A00 E7A40018 */ swc1 $f4, 0x18($sp) -/* 852B74 80240A04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 852B78 80240A08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 852B7C 80240A0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 852B80 80240A10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 852B84 80240A14 8C460028 */ lw $a2, 0x28($v0) -/* 852B88 80240A18 0C00A720 */ jal atan2 -/* 852B8C 80240A1C 8C470030 */ lw $a3, 0x30($v0) -/* 852B90 80240A20 0200202D */ daddu $a0, $s0, $zero -/* 852B94 80240A24 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 852B98 80240A28 3C060020 */ lui $a2, 0x20 -/* 852B9C 80240A2C 0C012530 */ jal func_800494C0 -/* 852BA0 80240A30 E480000C */ swc1 $f0, 0xc($a0) -/* 852BA4 80240A34 8E220018 */ lw $v0, 0x18($s1) -/* 852BA8 80240A38 9442002A */ lhu $v0, 0x2a($v0) -/* 852BAC 80240A3C 30420001 */ andi $v0, $v0, 1 -/* 852BB0 80240A40 14400029 */ bnez $v0, .L80240AE8 -/* 852BB4 80240A44 2402000A */ addiu $v0, $zero, 0xa -/* 852BB8 80240A48 080902BA */ j .L80240AE8 -/* 852BBC 80240A4C 2402000C */ addiu $v0, $zero, 0xc -.L80240A50: -/* 852BC0 80240A50 8602008C */ lh $v0, 0x8c($s0) -/* 852BC4 80240A54 14400025 */ bnez $v0, .L80240AEC -/* 852BC8 80240A58 00000000 */ nop -/* 852BCC 80240A5C 9602008E */ lhu $v0, 0x8e($s0) -/* 852BD0 80240A60 2442FFFF */ addiu $v0, $v0, -1 -/* 852BD4 80240A64 A602008E */ sh $v0, 0x8e($s0) -/* 852BD8 80240A68 00021400 */ sll $v0, $v0, 0x10 -/* 852BDC 80240A6C 1440001F */ bnez $v0, .L80240AEC -/* 852BE0 80240A70 00000000 */ nop -/* 852BE4 80240A74 8E820074 */ lw $v0, 0x74($s4) -/* 852BE8 80240A78 2442FFFF */ addiu $v0, $v0, -1 -/* 852BEC 80240A7C 10400019 */ beqz $v0, .L80240AE4 -/* 852BF0 80240A80 AE820074 */ sw $v0, 0x74($s4) -/* 852BF4 80240A84 8E220018 */ lw $v0, 0x18($s1) -/* 852BF8 80240A88 9442002A */ lhu $v0, 0x2a($v0) -/* 852BFC 80240A8C 30420010 */ andi $v0, $v0, 0x10 -/* 852C00 80240A90 14400007 */ bnez $v0, .L80240AB0 -/* 852C04 80240A94 00000000 */ nop -/* 852C08 80240A98 C600000C */ lwc1 $f0, 0xc($s0) -/* 852C0C 80240A9C 3C014334 */ lui $at, 0x4334 -/* 852C10 80240AA0 44816000 */ mtc1 $at, $f12 -/* 852C14 80240AA4 0C00A6C9 */ jal clamp_angle -/* 852C18 80240AA8 460C0300 */ add.s $f12, $f0, $f12 -/* 852C1C 80240AAC E600000C */ swc1 $f0, 0xc($s0) -.L80240AB0: -/* 852C20 80240AB0 8E440008 */ lw $a0, 8($s2) -/* 852C24 80240AB4 000417C2 */ srl $v0, $a0, 0x1f -/* 852C28 80240AB8 00822021 */ addu $a0, $a0, $v0 -/* 852C2C 80240ABC 00042043 */ sra $a0, $a0, 1 -/* 852C30 80240AC0 0C00A67F */ jal rand_int -/* 852C34 80240AC4 24840001 */ addiu $a0, $a0, 1 -/* 852C38 80240AC8 8E430008 */ lw $v1, 8($s2) -/* 852C3C 80240ACC 000327C2 */ srl $a0, $v1, 0x1f -/* 852C40 80240AD0 00641821 */ addu $v1, $v1, $a0 -/* 852C44 80240AD4 00031843 */ sra $v1, $v1, 1 -/* 852C48 80240AD8 00621821 */ addu $v1, $v1, $v0 -/* 852C4C 80240ADC 080902BB */ j .L80240AEC -/* 852C50 80240AE0 A603008E */ sh $v1, 0x8e($s0) -.L80240AE4: -/* 852C54 80240AE4 24020004 */ addiu $v0, $zero, 4 -.L80240AE8: -/* 852C58 80240AE8 AE820070 */ sw $v0, 0x70($s4) -.L80240AEC: -/* 852C5C 80240AEC 8FBF0044 */ lw $ra, 0x44($sp) -/* 852C60 80240AF0 8FB40040 */ lw $s4, 0x40($sp) -/* 852C64 80240AF4 8FB3003C */ lw $s3, 0x3c($sp) -/* 852C68 80240AF8 8FB20038 */ lw $s2, 0x38($sp) -/* 852C6C 80240AFC 8FB10034 */ lw $s1, 0x34($sp) -/* 852C70 80240B00 8FB00030 */ lw $s0, 0x30($sp) -/* 852C74 80240B04 03E00008 */ jr $ra -/* 852C78 80240B08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s new file mode 100644 index 0000000000..a40e254d68 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240950_852AC0.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240950_852AC0 +/* 852AC0 80240950 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 852AC4 80240954 AFB40040 */ sw $s4, 0x40($sp) +/* 852AC8 80240958 0080A02D */ daddu $s4, $a0, $zero +/* 852ACC 8024095C AFBF0044 */ sw $ra, 0x44($sp) +/* 852AD0 80240960 AFB3003C */ sw $s3, 0x3c($sp) +/* 852AD4 80240964 AFB20038 */ sw $s2, 0x38($sp) +/* 852AD8 80240968 AFB10034 */ sw $s1, 0x34($sp) +/* 852ADC 8024096C AFB00030 */ sw $s0, 0x30($sp) +/* 852AE0 80240970 8E910148 */ lw $s1, 0x148($s4) +/* 852AE4 80240974 00A0902D */ daddu $s2, $a1, $zero +/* 852AE8 80240978 86240008 */ lh $a0, 8($s1) +/* 852AEC 8024097C 0C00EABB */ jal get_npc_unsafe +/* 852AF0 80240980 00C0982D */ daddu $s3, $a2, $zero +/* 852AF4 80240984 8E430014 */ lw $v1, 0x14($s2) +/* 852AF8 80240988 04600031 */ bltz $v1, .L80240A50 +/* 852AFC 8024098C 0040802D */ daddu $s0, $v0, $zero +/* 852B00 80240990 0260202D */ daddu $a0, $s3, $zero +/* 852B04 80240994 AFA00010 */ sw $zero, 0x10($sp) +/* 852B08 80240998 8E460024 */ lw $a2, 0x24($s2) +/* 852B0C 8024099C 8E470028 */ lw $a3, 0x28($s2) +/* 852B10 802409A0 0C01242D */ jal func_800490B4 +/* 852B14 802409A4 0220282D */ daddu $a1, $s1, $zero +/* 852B18 802409A8 10400029 */ beqz $v0, .L80240A50 +/* 852B1C 802409AC 0000202D */ daddu $a0, $zero, $zero +/* 852B20 802409B0 0200282D */ daddu $a1, $s0, $zero +/* 852B24 802409B4 0000302D */ daddu $a2, $zero, $zero +/* 852B28 802409B8 860300A8 */ lh $v1, 0xa8($s0) +/* 852B2C 802409BC 3C013F80 */ lui $at, 0x3f80 +/* 852B30 802409C0 44810000 */ mtc1 $at, $f0 +/* 852B34 802409C4 3C014000 */ lui $at, 0x4000 +/* 852B38 802409C8 44811000 */ mtc1 $at, $f2 +/* 852B3C 802409CC 3C01C1A0 */ lui $at, 0xc1a0 +/* 852B40 802409D0 44812000 */ mtc1 $at, $f4 +/* 852B44 802409D4 2402000F */ addiu $v0, $zero, 0xf +/* 852B48 802409D8 AFA2001C */ sw $v0, 0x1c($sp) +/* 852B4C 802409DC 44833000 */ mtc1 $v1, $f6 +/* 852B50 802409E0 00000000 */ nop +/* 852B54 802409E4 468031A0 */ cvt.s.w $f6, $f6 +/* 852B58 802409E8 44073000 */ mfc1 $a3, $f6 +/* 852B5C 802409EC 27A20028 */ addiu $v0, $sp, 0x28 +/* 852B60 802409F0 AFA20020 */ sw $v0, 0x20($sp) +/* 852B64 802409F4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 852B68 802409F8 E7A20014 */ swc1 $f2, 0x14($sp) +/* 852B6C 802409FC 0C01BFA4 */ jal fx_emote +/* 852B70 80240A00 E7A40018 */ swc1 $f4, 0x18($sp) +/* 852B74 80240A04 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 852B78 80240A08 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 852B7C 80240A0C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 852B80 80240A10 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 852B84 80240A14 8C460028 */ lw $a2, 0x28($v0) +/* 852B88 80240A18 0C00A720 */ jal atan2 +/* 852B8C 80240A1C 8C470030 */ lw $a3, 0x30($v0) +/* 852B90 80240A20 0200202D */ daddu $a0, $s0, $zero +/* 852B94 80240A24 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 852B98 80240A28 3C060020 */ lui $a2, 0x20 +/* 852B9C 80240A2C 0C012530 */ jal func_800494C0 +/* 852BA0 80240A30 E480000C */ swc1 $f0, 0xc($a0) +/* 852BA4 80240A34 8E220018 */ lw $v0, 0x18($s1) +/* 852BA8 80240A38 9442002A */ lhu $v0, 0x2a($v0) +/* 852BAC 80240A3C 30420001 */ andi $v0, $v0, 1 +/* 852BB0 80240A40 14400029 */ bnez $v0, .L80240AE8 +/* 852BB4 80240A44 2402000A */ addiu $v0, $zero, 0xa +/* 852BB8 80240A48 080902BA */ j .L80240AE8 +/* 852BBC 80240A4C 2402000C */ addiu $v0, $zero, 0xc +.L80240A50: +/* 852BC0 80240A50 8602008C */ lh $v0, 0x8c($s0) +/* 852BC4 80240A54 14400025 */ bnez $v0, .L80240AEC +/* 852BC8 80240A58 00000000 */ nop +/* 852BCC 80240A5C 9602008E */ lhu $v0, 0x8e($s0) +/* 852BD0 80240A60 2442FFFF */ addiu $v0, $v0, -1 +/* 852BD4 80240A64 A602008E */ sh $v0, 0x8e($s0) +/* 852BD8 80240A68 00021400 */ sll $v0, $v0, 0x10 +/* 852BDC 80240A6C 1440001F */ bnez $v0, .L80240AEC +/* 852BE0 80240A70 00000000 */ nop +/* 852BE4 80240A74 8E820074 */ lw $v0, 0x74($s4) +/* 852BE8 80240A78 2442FFFF */ addiu $v0, $v0, -1 +/* 852BEC 80240A7C 10400019 */ beqz $v0, .L80240AE4 +/* 852BF0 80240A80 AE820074 */ sw $v0, 0x74($s4) +/* 852BF4 80240A84 8E220018 */ lw $v0, 0x18($s1) +/* 852BF8 80240A88 9442002A */ lhu $v0, 0x2a($v0) +/* 852BFC 80240A8C 30420010 */ andi $v0, $v0, 0x10 +/* 852C00 80240A90 14400007 */ bnez $v0, .L80240AB0 +/* 852C04 80240A94 00000000 */ nop +/* 852C08 80240A98 C600000C */ lwc1 $f0, 0xc($s0) +/* 852C0C 80240A9C 3C014334 */ lui $at, 0x4334 +/* 852C10 80240AA0 44816000 */ mtc1 $at, $f12 +/* 852C14 80240AA4 0C00A6C9 */ jal clamp_angle +/* 852C18 80240AA8 460C0300 */ add.s $f12, $f0, $f12 +/* 852C1C 80240AAC E600000C */ swc1 $f0, 0xc($s0) +.L80240AB0: +/* 852C20 80240AB0 8E440008 */ lw $a0, 8($s2) +/* 852C24 80240AB4 000417C2 */ srl $v0, $a0, 0x1f +/* 852C28 80240AB8 00822021 */ addu $a0, $a0, $v0 +/* 852C2C 80240ABC 00042043 */ sra $a0, $a0, 1 +/* 852C30 80240AC0 0C00A67F */ jal rand_int +/* 852C34 80240AC4 24840001 */ addiu $a0, $a0, 1 +/* 852C38 80240AC8 8E430008 */ lw $v1, 8($s2) +/* 852C3C 80240ACC 000327C2 */ srl $a0, $v1, 0x1f +/* 852C40 80240AD0 00641821 */ addu $v1, $v1, $a0 +/* 852C44 80240AD4 00031843 */ sra $v1, $v1, 1 +/* 852C48 80240AD8 00621821 */ addu $v1, $v1, $v0 +/* 852C4C 80240ADC 080902BB */ j .L80240AEC +/* 852C50 80240AE0 A603008E */ sh $v1, 0x8e($s0) +.L80240AE4: +/* 852C54 80240AE4 24020004 */ addiu $v0, $zero, 4 +.L80240AE8: +/* 852C58 80240AE8 AE820070 */ sw $v0, 0x70($s4) +.L80240AEC: +/* 852C5C 80240AEC 8FBF0044 */ lw $ra, 0x44($sp) +/* 852C60 80240AF0 8FB40040 */ lw $s4, 0x40($sp) +/* 852C64 80240AF4 8FB3003C */ lw $s3, 0x3c($sp) +/* 852C68 80240AF8 8FB20038 */ lw $s2, 0x38($sp) +/* 852C6C 80240AFC 8FB10034 */ lw $s1, 0x34($sp) +/* 852C70 80240B00 8FB00030 */ lw $s0, 0x30($sp) +/* 852C74 80240B04 03E00008 */ jr $ra +/* 852C78 80240B08 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C.s deleted file mode 100644 index f6f95edba8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B0C -/* 852C7C 80240B0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 852C80 80240B10 AFB10014 */ sw $s1, 0x14($sp) -/* 852C84 80240B14 0080882D */ daddu $s1, $a0, $zero -/* 852C88 80240B18 AFBF001C */ sw $ra, 0x1c($sp) -/* 852C8C 80240B1C AFB20018 */ sw $s2, 0x18($sp) -/* 852C90 80240B20 AFB00010 */ sw $s0, 0x10($sp) -/* 852C94 80240B24 8E300148 */ lw $s0, 0x148($s1) -/* 852C98 80240B28 86040008 */ lh $a0, 8($s0) -/* 852C9C 80240B2C 0C00EABB */ jal get_npc_unsafe -/* 852CA0 80240B30 00A0902D */ daddu $s2, $a1, $zero -/* 852CA4 80240B34 8E230078 */ lw $v1, 0x78($s1) -/* 852CA8 80240B38 24630001 */ addiu $v1, $v1, 1 -/* 852CAC 80240B3C AE230078 */ sw $v1, 0x78($s1) -/* 852CB0 80240B40 8E0400D0 */ lw $a0, 0xd0($s0) -/* 852CB4 80240B44 8C840000 */ lw $a0, ($a0) -/* 852CB8 80240B48 0064182A */ slt $v1, $v1, $a0 -/* 852CBC 80240B4C 14600002 */ bnez $v1, .L80240B58 -/* 852CC0 80240B50 0040282D */ daddu $a1, $v0, $zero -/* 852CC4 80240B54 AE200078 */ sw $zero, 0x78($s1) -.L80240B58: -/* 852CC8 80240B58 8E0200CC */ lw $v0, 0xcc($s0) -/* 852CCC 80240B5C 8C420004 */ lw $v0, 4($v0) -/* 852CD0 80240B60 ACA20028 */ sw $v0, 0x28($a1) -/* 852CD4 80240B64 8E0200D0 */ lw $v0, 0xd0($s0) -/* 852CD8 80240B68 8C42007C */ lw $v0, 0x7c($v0) -/* 852CDC 80240B6C 04410004 */ bgez $v0, .L80240B80 -/* 852CE0 80240B70 00000000 */ nop -/* 852CE4 80240B74 C6400000 */ lwc1 $f0, ($s2) -/* 852CE8 80240B78 080902E8 */ j .L80240BA0 -/* 852CEC 80240B7C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240B80: -/* 852CF0 80240B80 3C018025 */ lui $at, 0x8025 -/* 852CF4 80240B84 D42227B8 */ ldc1 $f2, 0x27b8($at) -/* 852CF8 80240B88 44820000 */ mtc1 $v0, $f0 -/* 852CFC 80240B8C 00000000 */ nop -/* 852D00 80240B90 46800021 */ cvt.d.w $f0, $f0 -/* 852D04 80240B94 46220003 */ div.d $f0, $f0, $f2 -/* 852D08 80240B98 46200020 */ cvt.s.d $f0, $f0 -/* 852D0C 80240B9C E4A00018 */ swc1 $f0, 0x18($a1) -.L80240BA0: -/* 852D10 80240BA0 24020001 */ addiu $v0, $zero, 1 -/* 852D14 80240BA4 AE220070 */ sw $v0, 0x70($s1) -/* 852D18 80240BA8 8FBF001C */ lw $ra, 0x1c($sp) -/* 852D1C 80240BAC 8FB20018 */ lw $s2, 0x18($sp) -/* 852D20 80240BB0 8FB10014 */ lw $s1, 0x14($sp) -/* 852D24 80240BB4 8FB00010 */ lw $s0, 0x10($sp) -/* 852D28 80240BB8 03E00008 */ jr $ra -/* 852D2C 80240BBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s new file mode 100644 index 0000000000..76c79004df --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240B0C_852C7C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B0C_852C7C +/* 852C7C 80240B0C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 852C80 80240B10 AFB10014 */ sw $s1, 0x14($sp) +/* 852C84 80240B14 0080882D */ daddu $s1, $a0, $zero +/* 852C88 80240B18 AFBF001C */ sw $ra, 0x1c($sp) +/* 852C8C 80240B1C AFB20018 */ sw $s2, 0x18($sp) +/* 852C90 80240B20 AFB00010 */ sw $s0, 0x10($sp) +/* 852C94 80240B24 8E300148 */ lw $s0, 0x148($s1) +/* 852C98 80240B28 86040008 */ lh $a0, 8($s0) +/* 852C9C 80240B2C 0C00EABB */ jal get_npc_unsafe +/* 852CA0 80240B30 00A0902D */ daddu $s2, $a1, $zero +/* 852CA4 80240B34 8E230078 */ lw $v1, 0x78($s1) +/* 852CA8 80240B38 24630001 */ addiu $v1, $v1, 1 +/* 852CAC 80240B3C AE230078 */ sw $v1, 0x78($s1) +/* 852CB0 80240B40 8E0400D0 */ lw $a0, 0xd0($s0) +/* 852CB4 80240B44 8C840000 */ lw $a0, ($a0) +/* 852CB8 80240B48 0064182A */ slt $v1, $v1, $a0 +/* 852CBC 80240B4C 14600002 */ bnez $v1, .L80240B58 +/* 852CC0 80240B50 0040282D */ daddu $a1, $v0, $zero +/* 852CC4 80240B54 AE200078 */ sw $zero, 0x78($s1) +.L80240B58: +/* 852CC8 80240B58 8E0200CC */ lw $v0, 0xcc($s0) +/* 852CCC 80240B5C 8C420004 */ lw $v0, 4($v0) +/* 852CD0 80240B60 ACA20028 */ sw $v0, 0x28($a1) +/* 852CD4 80240B64 8E0200D0 */ lw $v0, 0xd0($s0) +/* 852CD8 80240B68 8C42007C */ lw $v0, 0x7c($v0) +/* 852CDC 80240B6C 04410004 */ bgez $v0, .L80240B80 +/* 852CE0 80240B70 00000000 */ nop +/* 852CE4 80240B74 C6400000 */ lwc1 $f0, ($s2) +/* 852CE8 80240B78 080902E8 */ j .L80240BA0 +/* 852CEC 80240B7C E4A00018 */ swc1 $f0, 0x18($a1) +.L80240B80: +/* 852CF0 80240B80 3C018025 */ lui $at, 0x8025 +/* 852CF4 80240B84 D42227B8 */ ldc1 $f2, 0x27b8($at) +/* 852CF8 80240B88 44820000 */ mtc1 $v0, $f0 +/* 852CFC 80240B8C 00000000 */ nop +/* 852D00 80240B90 46800021 */ cvt.d.w $f0, $f0 +/* 852D04 80240B94 46220003 */ div.d $f0, $f0, $f2 +/* 852D08 80240B98 46200020 */ cvt.s.d $f0, $f0 +/* 852D0C 80240B9C E4A00018 */ swc1 $f0, 0x18($a1) +.L80240BA0: +/* 852D10 80240BA0 24020001 */ addiu $v0, $zero, 1 +/* 852D14 80240BA4 AE220070 */ sw $v0, 0x70($s1) +/* 852D18 80240BA8 8FBF001C */ lw $ra, 0x1c($sp) +/* 852D1C 80240BAC 8FB20018 */ lw $s2, 0x18($sp) +/* 852D20 80240BB0 8FB10014 */ lw $s1, 0x14($sp) +/* 852D24 80240BB4 8FB00010 */ lw $s0, 0x10($sp) +/* 852D28 80240BB8 03E00008 */ jr $ra +/* 852D2C 80240BBC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0.s deleted file mode 100644 index 94a48451cd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BC0 -/* 852D30 80240BC0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 852D34 80240BC4 AFB10014 */ sw $s1, 0x14($sp) -/* 852D38 80240BC8 0080882D */ daddu $s1, $a0, $zero -/* 852D3C 80240BCC AFBF0018 */ sw $ra, 0x18($sp) -/* 852D40 80240BD0 AFB00010 */ sw $s0, 0x10($sp) -/* 852D44 80240BD4 8E300148 */ lw $s0, 0x148($s1) -/* 852D48 80240BD8 0C00EABB */ jal get_npc_unsafe -/* 852D4C 80240BDC 86040008 */ lh $a0, 8($s0) -/* 852D50 80240BE0 8E0300CC */ lw $v1, 0xcc($s0) -/* 852D54 80240BE4 3C014120 */ lui $at, 0x4120 -/* 852D58 80240BE8 44812000 */ mtc1 $at, $f4 -/* 852D5C 80240BEC 3C014000 */ lui $at, 0x4000 -/* 852D60 80240BF0 44810000 */ mtc1 $at, $f0 -/* 852D64 80240BF4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 852D68 80240BF8 8C640010 */ lw $a0, 0x10($v1) -/* 852D6C 80240BFC 8C430000 */ lw $v1, ($v0) -/* 852D70 80240C00 E444001C */ swc1 $f4, 0x1c($v0) -/* 852D74 80240C04 E4400014 */ swc1 $f0, 0x14($v0) -/* 852D78 80240C08 E4420064 */ swc1 $f2, 0x64($v0) -/* 852D7C 80240C0C 34630800 */ ori $v1, $v1, 0x800 -/* 852D80 80240C10 AC430000 */ sw $v1, ($v0) -/* 852D84 80240C14 AC440028 */ sw $a0, 0x28($v0) -/* 852D88 80240C18 2402000B */ addiu $v0, $zero, 0xb -/* 852D8C 80240C1C AE220070 */ sw $v0, 0x70($s1) -/* 852D90 80240C20 8FBF0018 */ lw $ra, 0x18($sp) -/* 852D94 80240C24 8FB10014 */ lw $s1, 0x14($sp) -/* 852D98 80240C28 8FB00010 */ lw $s0, 0x10($sp) -/* 852D9C 80240C2C 03E00008 */ jr $ra -/* 852DA0 80240C30 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0_852D30.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0_852D30.s new file mode 100644 index 0000000000..97c6a5e257 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240BC0_852D30.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BC0_852D30 +/* 852D30 80240BC0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 852D34 80240BC4 AFB10014 */ sw $s1, 0x14($sp) +/* 852D38 80240BC8 0080882D */ daddu $s1, $a0, $zero +/* 852D3C 80240BCC AFBF0018 */ sw $ra, 0x18($sp) +/* 852D40 80240BD0 AFB00010 */ sw $s0, 0x10($sp) +/* 852D44 80240BD4 8E300148 */ lw $s0, 0x148($s1) +/* 852D48 80240BD8 0C00EABB */ jal get_npc_unsafe +/* 852D4C 80240BDC 86040008 */ lh $a0, 8($s0) +/* 852D50 80240BE0 8E0300CC */ lw $v1, 0xcc($s0) +/* 852D54 80240BE4 3C014120 */ lui $at, 0x4120 +/* 852D58 80240BE8 44812000 */ mtc1 $at, $f4 +/* 852D5C 80240BEC 3C014000 */ lui $at, 0x4000 +/* 852D60 80240BF0 44810000 */ mtc1 $at, $f0 +/* 852D64 80240BF4 C442003C */ lwc1 $f2, 0x3c($v0) +/* 852D68 80240BF8 8C640010 */ lw $a0, 0x10($v1) +/* 852D6C 80240BFC 8C430000 */ lw $v1, ($v0) +/* 852D70 80240C00 E444001C */ swc1 $f4, 0x1c($v0) +/* 852D74 80240C04 E4400014 */ swc1 $f0, 0x14($v0) +/* 852D78 80240C08 E4420064 */ swc1 $f2, 0x64($v0) +/* 852D7C 80240C0C 34630800 */ ori $v1, $v1, 0x800 +/* 852D80 80240C10 AC430000 */ sw $v1, ($v0) +/* 852D84 80240C14 AC440028 */ sw $a0, 0x28($v0) +/* 852D88 80240C18 2402000B */ addiu $v0, $zero, 0xb +/* 852D8C 80240C1C AE220070 */ sw $v0, 0x70($s1) +/* 852D90 80240C20 8FBF0018 */ lw $ra, 0x18($sp) +/* 852D94 80240C24 8FB10014 */ lw $s1, 0x14($sp) +/* 852D98 80240C28 8FB00010 */ lw $s0, 0x10($sp) +/* 852D9C 80240C2C 03E00008 */ jr $ra +/* 852DA0 80240C30 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34.s deleted file mode 100644 index 6105c76c3e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C34 -/* 852DA4 80240C34 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 852DA8 80240C38 AFB00010 */ sw $s0, 0x10($sp) -/* 852DAC 80240C3C 0080802D */ daddu $s0, $a0, $zero -/* 852DB0 80240C40 AFBF0014 */ sw $ra, 0x14($sp) -/* 852DB4 80240C44 8E020148 */ lw $v0, 0x148($s0) -/* 852DB8 80240C48 0C00EABB */ jal get_npc_unsafe -/* 852DBC 80240C4C 84440008 */ lh $a0, 8($v0) -/* 852DC0 80240C50 0040202D */ daddu $a0, $v0, $zero -/* 852DC4 80240C54 C482003C */ lwc1 $f2, 0x3c($a0) -/* 852DC8 80240C58 C480001C */ lwc1 $f0, 0x1c($a0) -/* 852DCC 80240C5C 46001080 */ add.s $f2, $f2, $f0 -/* 852DD0 80240C60 C4840014 */ lwc1 $f4, 0x14($a0) -/* 852DD4 80240C64 46040001 */ sub.s $f0, $f0, $f4 -/* 852DD8 80240C68 C4840064 */ lwc1 $f4, 0x64($a0) -/* 852DDC 80240C6C 4602203C */ c.lt.s $f4, $f2 -/* 852DE0 80240C70 E482003C */ swc1 $f2, 0x3c($a0) -/* 852DE4 80240C74 45010009 */ bc1t .L80240C9C -/* 852DE8 80240C78 E480001C */ swc1 $f0, 0x1c($a0) -/* 852DEC 80240C7C 8C820000 */ lw $v0, ($a0) -/* 852DF0 80240C80 2403F7FF */ addiu $v1, $zero, -0x801 -/* 852DF4 80240C84 E484003C */ swc1 $f4, 0x3c($a0) -/* 852DF8 80240C88 AC80001C */ sw $zero, 0x1c($a0) -/* 852DFC 80240C8C 00431024 */ and $v0, $v0, $v1 -/* 852E00 80240C90 AC820000 */ sw $v0, ($a0) -/* 852E04 80240C94 2402000C */ addiu $v0, $zero, 0xc -/* 852E08 80240C98 AE020070 */ sw $v0, 0x70($s0) -.L80240C9C: -/* 852E0C 80240C9C 8FBF0014 */ lw $ra, 0x14($sp) -/* 852E10 80240CA0 8FB00010 */ lw $s0, 0x10($sp) -/* 852E14 80240CA4 03E00008 */ jr $ra -/* 852E18 80240CA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34_852DA4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34_852DA4.s new file mode 100644 index 0000000000..f6b5122211 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240C34_852DA4.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C34_852DA4 +/* 852DA4 80240C34 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 852DA8 80240C38 AFB00010 */ sw $s0, 0x10($sp) +/* 852DAC 80240C3C 0080802D */ daddu $s0, $a0, $zero +/* 852DB0 80240C40 AFBF0014 */ sw $ra, 0x14($sp) +/* 852DB4 80240C44 8E020148 */ lw $v0, 0x148($s0) +/* 852DB8 80240C48 0C00EABB */ jal get_npc_unsafe +/* 852DBC 80240C4C 84440008 */ lh $a0, 8($v0) +/* 852DC0 80240C50 0040202D */ daddu $a0, $v0, $zero +/* 852DC4 80240C54 C482003C */ lwc1 $f2, 0x3c($a0) +/* 852DC8 80240C58 C480001C */ lwc1 $f0, 0x1c($a0) +/* 852DCC 80240C5C 46001080 */ add.s $f2, $f2, $f0 +/* 852DD0 80240C60 C4840014 */ lwc1 $f4, 0x14($a0) +/* 852DD4 80240C64 46040001 */ sub.s $f0, $f0, $f4 +/* 852DD8 80240C68 C4840064 */ lwc1 $f4, 0x64($a0) +/* 852DDC 80240C6C 4602203C */ c.lt.s $f4, $f2 +/* 852DE0 80240C70 E482003C */ swc1 $f2, 0x3c($a0) +/* 852DE4 80240C74 45010009 */ bc1t .L80240C9C +/* 852DE8 80240C78 E480001C */ swc1 $f0, 0x1c($a0) +/* 852DEC 80240C7C 8C820000 */ lw $v0, ($a0) +/* 852DF0 80240C80 2403F7FF */ addiu $v1, $zero, -0x801 +/* 852DF4 80240C84 E484003C */ swc1 $f4, 0x3c($a0) +/* 852DF8 80240C88 AC80001C */ sw $zero, 0x1c($a0) +/* 852DFC 80240C8C 00431024 */ and $v0, $v0, $v1 +/* 852E00 80240C90 AC820000 */ sw $v0, ($a0) +/* 852E04 80240C94 2402000C */ addiu $v0, $zero, 0xc +/* 852E08 80240C98 AE020070 */ sw $v0, 0x70($s0) +.L80240C9C: +/* 852E0C 80240C9C 8FBF0014 */ lw $ra, 0x14($sp) +/* 852E10 80240CA0 8FB00010 */ lw $s0, 0x10($sp) +/* 852E14 80240CA4 03E00008 */ jr $ra +/* 852E18 80240CA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC.s deleted file mode 100644 index ad9ea0f290..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CAC -/* 852E1C 80240CAC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 852E20 80240CB0 AFB3001C */ sw $s3, 0x1c($sp) -/* 852E24 80240CB4 0080982D */ daddu $s3, $a0, $zero -/* 852E28 80240CB8 AFBF0020 */ sw $ra, 0x20($sp) -/* 852E2C 80240CBC AFB20018 */ sw $s2, 0x18($sp) -/* 852E30 80240CC0 AFB10014 */ sw $s1, 0x14($sp) -/* 852E34 80240CC4 AFB00010 */ sw $s0, 0x10($sp) -/* 852E38 80240CC8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 852E3C 80240CCC 8E710148 */ lw $s1, 0x148($s3) -/* 852E40 80240CD0 86240008 */ lh $a0, 8($s1) -/* 852E44 80240CD4 0C00EABB */ jal get_npc_unsafe -/* 852E48 80240CD8 00A0802D */ daddu $s0, $a1, $zero -/* 852E4C 80240CDC 8E040020 */ lw $a0, 0x20($s0) -/* 852E50 80240CE0 0040902D */ daddu $s2, $v0, $zero -/* 852E54 80240CE4 00041FC2 */ srl $v1, $a0, 0x1f -/* 852E58 80240CE8 00832021 */ addu $a0, $a0, $v1 -/* 852E5C 80240CEC 00042043 */ sra $a0, $a0, 1 -/* 852E60 80240CF0 0C00A67F */ jal rand_int -/* 852E64 80240CF4 24840001 */ addiu $a0, $a0, 1 -/* 852E68 80240CF8 8E030020 */ lw $v1, 0x20($s0) -/* 852E6C 80240CFC C64C0038 */ lwc1 $f12, 0x38($s2) -/* 852E70 80240D00 000327C2 */ srl $a0, $v1, 0x1f -/* 852E74 80240D04 00641821 */ addu $v1, $v1, $a0 -/* 852E78 80240D08 00031843 */ sra $v1, $v1, 1 -/* 852E7C 80240D0C 00621821 */ addu $v1, $v1, $v0 -/* 852E80 80240D10 A643008E */ sh $v1, 0x8e($s2) -/* 852E84 80240D14 8E2200CC */ lw $v0, 0xcc($s1) -/* 852E88 80240D18 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 852E8C 80240D1C 8C42000C */ lw $v0, 0xc($v0) -/* 852E90 80240D20 AE420028 */ sw $v0, 0x28($s2) -/* 852E94 80240D24 C6000018 */ lwc1 $f0, 0x18($s0) -/* 852E98 80240D28 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 852E9C 80240D2C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 852EA0 80240D30 E6400018 */ swc1 $f0, 0x18($s2) -/* 852EA4 80240D34 8C460028 */ lw $a2, 0x28($v0) -/* 852EA8 80240D38 0C00A720 */ jal atan2 -/* 852EAC 80240D3C 8C470030 */ lw $a3, 0x30($v0) -/* 852EB0 80240D40 46000506 */ mov.s $f20, $f0 -/* 852EB4 80240D44 C64C000C */ lwc1 $f12, 0xc($s2) -/* 852EB8 80240D48 0C00A70A */ jal get_clamped_angle_diff -/* 852EBC 80240D4C 4600A386 */ mov.s $f14, $f20 -/* 852EC0 80240D50 46000086 */ mov.s $f2, $f0 -/* 852EC4 80240D54 8E02001C */ lw $v0, 0x1c($s0) -/* 852EC8 80240D58 46001005 */ abs.s $f0, $f2 -/* 852ECC 80240D5C 44822000 */ mtc1 $v0, $f4 -/* 852ED0 80240D60 00000000 */ nop -/* 852ED4 80240D64 46802120 */ cvt.s.w $f4, $f4 -/* 852ED8 80240D68 4600203C */ c.lt.s $f4, $f0 -/* 852EDC 80240D6C 00000000 */ nop -/* 852EE0 80240D70 4500000D */ bc1f .L80240DA8 -/* 852EE4 80240D74 00000000 */ nop -/* 852EE8 80240D78 44800000 */ mtc1 $zero, $f0 -/* 852EEC 80240D7C C654000C */ lwc1 $f20, 0xc($s2) -/* 852EF0 80240D80 4600103C */ c.lt.s $f2, $f0 -/* 852EF4 80240D84 00000000 */ nop -/* 852EF8 80240D88 45000006 */ bc1f .L80240DA4 -/* 852EFC 80240D8C 00021023 */ negu $v0, $v0 -/* 852F00 80240D90 44820000 */ mtc1 $v0, $f0 -/* 852F04 80240D94 00000000 */ nop -/* 852F08 80240D98 46800020 */ cvt.s.w $f0, $f0 -/* 852F0C 80240D9C 0809036A */ j .L80240DA8 -/* 852F10 80240DA0 4600A500 */ add.s $f20, $f20, $f0 -.L80240DA4: -/* 852F14 80240DA4 4604A500 */ add.s $f20, $f20, $f4 -.L80240DA8: -/* 852F18 80240DA8 0C00A6C9 */ jal clamp_angle -/* 852F1C 80240DAC 4600A306 */ mov.s $f12, $f20 -/* 852F20 80240DB0 2402000D */ addiu $v0, $zero, 0xd -/* 852F24 80240DB4 E640000C */ swc1 $f0, 0xc($s2) -/* 852F28 80240DB8 AE620070 */ sw $v0, 0x70($s3) -/* 852F2C 80240DBC 8FBF0020 */ lw $ra, 0x20($sp) -/* 852F30 80240DC0 8FB3001C */ lw $s3, 0x1c($sp) -/* 852F34 80240DC4 8FB20018 */ lw $s2, 0x18($sp) -/* 852F38 80240DC8 8FB10014 */ lw $s1, 0x14($sp) -/* 852F3C 80240DCC 8FB00010 */ lw $s0, 0x10($sp) -/* 852F40 80240DD0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 852F44 80240DD4 03E00008 */ jr $ra -/* 852F48 80240DD8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC_852E1C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC_852E1C.s new file mode 100644 index 0000000000..acdea58840 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240CAC_852E1C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CAC_852E1C +/* 852E1C 80240CAC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 852E20 80240CB0 AFB3001C */ sw $s3, 0x1c($sp) +/* 852E24 80240CB4 0080982D */ daddu $s3, $a0, $zero +/* 852E28 80240CB8 AFBF0020 */ sw $ra, 0x20($sp) +/* 852E2C 80240CBC AFB20018 */ sw $s2, 0x18($sp) +/* 852E30 80240CC0 AFB10014 */ sw $s1, 0x14($sp) +/* 852E34 80240CC4 AFB00010 */ sw $s0, 0x10($sp) +/* 852E38 80240CC8 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 852E3C 80240CCC 8E710148 */ lw $s1, 0x148($s3) +/* 852E40 80240CD0 86240008 */ lh $a0, 8($s1) +/* 852E44 80240CD4 0C00EABB */ jal get_npc_unsafe +/* 852E48 80240CD8 00A0802D */ daddu $s0, $a1, $zero +/* 852E4C 80240CDC 8E040020 */ lw $a0, 0x20($s0) +/* 852E50 80240CE0 0040902D */ daddu $s2, $v0, $zero +/* 852E54 80240CE4 00041FC2 */ srl $v1, $a0, 0x1f +/* 852E58 80240CE8 00832021 */ addu $a0, $a0, $v1 +/* 852E5C 80240CEC 00042043 */ sra $a0, $a0, 1 +/* 852E60 80240CF0 0C00A67F */ jal rand_int +/* 852E64 80240CF4 24840001 */ addiu $a0, $a0, 1 +/* 852E68 80240CF8 8E030020 */ lw $v1, 0x20($s0) +/* 852E6C 80240CFC C64C0038 */ lwc1 $f12, 0x38($s2) +/* 852E70 80240D00 000327C2 */ srl $a0, $v1, 0x1f +/* 852E74 80240D04 00641821 */ addu $v1, $v1, $a0 +/* 852E78 80240D08 00031843 */ sra $v1, $v1, 1 +/* 852E7C 80240D0C 00621821 */ addu $v1, $v1, $v0 +/* 852E80 80240D10 A643008E */ sh $v1, 0x8e($s2) +/* 852E84 80240D14 8E2200CC */ lw $v0, 0xcc($s1) +/* 852E88 80240D18 C64E0040 */ lwc1 $f14, 0x40($s2) +/* 852E8C 80240D1C 8C42000C */ lw $v0, 0xc($v0) +/* 852E90 80240D20 AE420028 */ sw $v0, 0x28($s2) +/* 852E94 80240D24 C6000018 */ lwc1 $f0, 0x18($s0) +/* 852E98 80240D28 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 852E9C 80240D2C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 852EA0 80240D30 E6400018 */ swc1 $f0, 0x18($s2) +/* 852EA4 80240D34 8C460028 */ lw $a2, 0x28($v0) +/* 852EA8 80240D38 0C00A720 */ jal atan2 +/* 852EAC 80240D3C 8C470030 */ lw $a3, 0x30($v0) +/* 852EB0 80240D40 46000506 */ mov.s $f20, $f0 +/* 852EB4 80240D44 C64C000C */ lwc1 $f12, 0xc($s2) +/* 852EB8 80240D48 0C00A70A */ jal get_clamped_angle_diff +/* 852EBC 80240D4C 4600A386 */ mov.s $f14, $f20 +/* 852EC0 80240D50 46000086 */ mov.s $f2, $f0 +/* 852EC4 80240D54 8E02001C */ lw $v0, 0x1c($s0) +/* 852EC8 80240D58 46001005 */ abs.s $f0, $f2 +/* 852ECC 80240D5C 44822000 */ mtc1 $v0, $f4 +/* 852ED0 80240D60 00000000 */ nop +/* 852ED4 80240D64 46802120 */ cvt.s.w $f4, $f4 +/* 852ED8 80240D68 4600203C */ c.lt.s $f4, $f0 +/* 852EDC 80240D6C 00000000 */ nop +/* 852EE0 80240D70 4500000D */ bc1f .L80240DA8 +/* 852EE4 80240D74 00000000 */ nop +/* 852EE8 80240D78 44800000 */ mtc1 $zero, $f0 +/* 852EEC 80240D7C C654000C */ lwc1 $f20, 0xc($s2) +/* 852EF0 80240D80 4600103C */ c.lt.s $f2, $f0 +/* 852EF4 80240D84 00000000 */ nop +/* 852EF8 80240D88 45000006 */ bc1f .L80240DA4 +/* 852EFC 80240D8C 00021023 */ negu $v0, $v0 +/* 852F00 80240D90 44820000 */ mtc1 $v0, $f0 +/* 852F04 80240D94 00000000 */ nop +/* 852F08 80240D98 46800020 */ cvt.s.w $f0, $f0 +/* 852F0C 80240D9C 0809036A */ j .L80240DA8 +/* 852F10 80240DA0 4600A500 */ add.s $f20, $f20, $f0 +.L80240DA4: +/* 852F14 80240DA4 4604A500 */ add.s $f20, $f20, $f4 +.L80240DA8: +/* 852F18 80240DA8 0C00A6C9 */ jal clamp_angle +/* 852F1C 80240DAC 4600A306 */ mov.s $f12, $f20 +/* 852F20 80240DB0 2402000D */ addiu $v0, $zero, 0xd +/* 852F24 80240DB4 E640000C */ swc1 $f0, 0xc($s2) +/* 852F28 80240DB8 AE620070 */ sw $v0, 0x70($s3) +/* 852F2C 80240DBC 8FBF0020 */ lw $ra, 0x20($sp) +/* 852F30 80240DC0 8FB3001C */ lw $s3, 0x1c($sp) +/* 852F34 80240DC4 8FB20018 */ lw $s2, 0x18($sp) +/* 852F38 80240DC8 8FB10014 */ lw $s1, 0x14($sp) +/* 852F3C 80240DCC 8FB00010 */ lw $s0, 0x10($sp) +/* 852F40 80240DD0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 852F44 80240DD4 03E00008 */ jr $ra +/* 852F48 80240DD8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC.s deleted file mode 100644 index 02023a95c8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DDC -/* 852F4C 80240DDC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 852F50 80240DE0 AFB3003C */ sw $s3, 0x3c($sp) -/* 852F54 80240DE4 0080982D */ daddu $s3, $a0, $zero -/* 852F58 80240DE8 AFBF0040 */ sw $ra, 0x40($sp) -/* 852F5C 80240DEC AFB20038 */ sw $s2, 0x38($sp) -/* 852F60 80240DF0 AFB10034 */ sw $s1, 0x34($sp) -/* 852F64 80240DF4 AFB00030 */ sw $s0, 0x30($sp) -/* 852F68 80240DF8 8E720148 */ lw $s2, 0x148($s3) -/* 852F6C 80240DFC 00A0882D */ daddu $s1, $a1, $zero -/* 852F70 80240E00 86440008 */ lh $a0, 8($s2) -/* 852F74 80240E04 0C00EABB */ jal get_npc_unsafe -/* 852F78 80240E08 00C0802D */ daddu $s0, $a2, $zero -/* 852F7C 80240E0C 0200202D */ daddu $a0, $s0, $zero -/* 852F80 80240E10 0240282D */ daddu $a1, $s2, $zero -/* 852F84 80240E14 24030001 */ addiu $v1, $zero, 1 -/* 852F88 80240E18 AFA30010 */ sw $v1, 0x10($sp) -/* 852F8C 80240E1C 8E260024 */ lw $a2, 0x24($s1) -/* 852F90 80240E20 8E270028 */ lw $a3, 0x28($s1) -/* 852F94 80240E24 0C01242D */ jal func_800490B4 -/* 852F98 80240E28 0040802D */ daddu $s0, $v0, $zero -/* 852F9C 80240E2C 1440001E */ bnez $v0, .L80240EA8 -/* 852FA0 80240E30 0200202D */ daddu $a0, $s0, $zero -/* 852FA4 80240E34 24040002 */ addiu $a0, $zero, 2 -/* 852FA8 80240E38 0200282D */ daddu $a1, $s0, $zero -/* 852FAC 80240E3C 0000302D */ daddu $a2, $zero, $zero -/* 852FB0 80240E40 860300A8 */ lh $v1, 0xa8($s0) -/* 852FB4 80240E44 3C013F80 */ lui $at, 0x3f80 -/* 852FB8 80240E48 44810000 */ mtc1 $at, $f0 -/* 852FBC 80240E4C 3C014000 */ lui $at, 0x4000 -/* 852FC0 80240E50 44811000 */ mtc1 $at, $f2 -/* 852FC4 80240E54 3C01C1A0 */ lui $at, 0xc1a0 -/* 852FC8 80240E58 44812000 */ mtc1 $at, $f4 -/* 852FCC 80240E5C 2402000F */ addiu $v0, $zero, 0xf -/* 852FD0 80240E60 AFA2001C */ sw $v0, 0x1c($sp) -/* 852FD4 80240E64 44833000 */ mtc1 $v1, $f6 -/* 852FD8 80240E68 00000000 */ nop -/* 852FDC 80240E6C 468031A0 */ cvt.s.w $f6, $f6 -/* 852FE0 80240E70 44073000 */ mfc1 $a3, $f6 -/* 852FE4 80240E74 27A20028 */ addiu $v0, $sp, 0x28 -/* 852FE8 80240E78 AFA20020 */ sw $v0, 0x20($sp) -/* 852FEC 80240E7C E7A00010 */ swc1 $f0, 0x10($sp) -/* 852FF0 80240E80 E7A20014 */ swc1 $f2, 0x14($sp) -/* 852FF4 80240E84 0C01BFA4 */ jal fx_emote -/* 852FF8 80240E88 E7A40018 */ swc1 $f4, 0x18($sp) -/* 852FFC 80240E8C 8E4200CC */ lw $v0, 0xcc($s2) -/* 853000 80240E90 8C430000 */ lw $v1, ($v0) -/* 853004 80240E94 24020019 */ addiu $v0, $zero, 0x19 -/* 853008 80240E98 A602008E */ sh $v0, 0x8e($s0) -/* 85300C 80240E9C 2402000E */ addiu $v0, $zero, 0xe -/* 853010 80240EA0 080903B7 */ j .L80240EDC -/* 853014 80240EA4 AE030028 */ sw $v1, 0x28($s0) -.L80240EA8: -/* 853018 80240EA8 0C00F598 */ jal func_8003D660 -/* 85301C 80240EAC 24050001 */ addiu $a1, $zero, 1 -/* 853020 80240EB0 8E050018 */ lw $a1, 0x18($s0) -/* 853024 80240EB4 8E06000C */ lw $a2, 0xc($s0) -/* 853028 80240EB8 0C00EA95 */ jal npc_move_heading -/* 85302C 80240EBC 0200202D */ daddu $a0, $s0, $zero -/* 853030 80240EC0 8602008E */ lh $v0, 0x8e($s0) -/* 853034 80240EC4 9603008E */ lhu $v1, 0x8e($s0) -/* 853038 80240EC8 18400003 */ blez $v0, .L80240ED8 -/* 85303C 80240ECC 2462FFFF */ addiu $v0, $v1, -1 -/* 853040 80240ED0 080903B8 */ j .L80240EE0 -/* 853044 80240ED4 A602008E */ sh $v0, 0x8e($s0) -.L80240ED8: -/* 853048 80240ED8 2402000C */ addiu $v0, $zero, 0xc -.L80240EDC: -/* 85304C 80240EDC AE620070 */ sw $v0, 0x70($s3) -.L80240EE0: -/* 853050 80240EE0 8FBF0040 */ lw $ra, 0x40($sp) -/* 853054 80240EE4 8FB3003C */ lw $s3, 0x3c($sp) -/* 853058 80240EE8 8FB20038 */ lw $s2, 0x38($sp) -/* 85305C 80240EEC 8FB10034 */ lw $s1, 0x34($sp) -/* 853060 80240EF0 8FB00030 */ lw $s0, 0x30($sp) -/* 853064 80240EF4 03E00008 */ jr $ra -/* 853068 80240EF8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s new file mode 100644 index 0000000000..d21852e473 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240DDC_852F4C.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DDC_852F4C +/* 852F4C 80240DDC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 852F50 80240DE0 AFB3003C */ sw $s3, 0x3c($sp) +/* 852F54 80240DE4 0080982D */ daddu $s3, $a0, $zero +/* 852F58 80240DE8 AFBF0040 */ sw $ra, 0x40($sp) +/* 852F5C 80240DEC AFB20038 */ sw $s2, 0x38($sp) +/* 852F60 80240DF0 AFB10034 */ sw $s1, 0x34($sp) +/* 852F64 80240DF4 AFB00030 */ sw $s0, 0x30($sp) +/* 852F68 80240DF8 8E720148 */ lw $s2, 0x148($s3) +/* 852F6C 80240DFC 00A0882D */ daddu $s1, $a1, $zero +/* 852F70 80240E00 86440008 */ lh $a0, 8($s2) +/* 852F74 80240E04 0C00EABB */ jal get_npc_unsafe +/* 852F78 80240E08 00C0802D */ daddu $s0, $a2, $zero +/* 852F7C 80240E0C 0200202D */ daddu $a0, $s0, $zero +/* 852F80 80240E10 0240282D */ daddu $a1, $s2, $zero +/* 852F84 80240E14 24030001 */ addiu $v1, $zero, 1 +/* 852F88 80240E18 AFA30010 */ sw $v1, 0x10($sp) +/* 852F8C 80240E1C 8E260024 */ lw $a2, 0x24($s1) +/* 852F90 80240E20 8E270028 */ lw $a3, 0x28($s1) +/* 852F94 80240E24 0C01242D */ jal func_800490B4 +/* 852F98 80240E28 0040802D */ daddu $s0, $v0, $zero +/* 852F9C 80240E2C 1440001E */ bnez $v0, .L80240EA8 +/* 852FA0 80240E30 0200202D */ daddu $a0, $s0, $zero +/* 852FA4 80240E34 24040002 */ addiu $a0, $zero, 2 +/* 852FA8 80240E38 0200282D */ daddu $a1, $s0, $zero +/* 852FAC 80240E3C 0000302D */ daddu $a2, $zero, $zero +/* 852FB0 80240E40 860300A8 */ lh $v1, 0xa8($s0) +/* 852FB4 80240E44 3C013F80 */ lui $at, 0x3f80 +/* 852FB8 80240E48 44810000 */ mtc1 $at, $f0 +/* 852FBC 80240E4C 3C014000 */ lui $at, 0x4000 +/* 852FC0 80240E50 44811000 */ mtc1 $at, $f2 +/* 852FC4 80240E54 3C01C1A0 */ lui $at, 0xc1a0 +/* 852FC8 80240E58 44812000 */ mtc1 $at, $f4 +/* 852FCC 80240E5C 2402000F */ addiu $v0, $zero, 0xf +/* 852FD0 80240E60 AFA2001C */ sw $v0, 0x1c($sp) +/* 852FD4 80240E64 44833000 */ mtc1 $v1, $f6 +/* 852FD8 80240E68 00000000 */ nop +/* 852FDC 80240E6C 468031A0 */ cvt.s.w $f6, $f6 +/* 852FE0 80240E70 44073000 */ mfc1 $a3, $f6 +/* 852FE4 80240E74 27A20028 */ addiu $v0, $sp, 0x28 +/* 852FE8 80240E78 AFA20020 */ sw $v0, 0x20($sp) +/* 852FEC 80240E7C E7A00010 */ swc1 $f0, 0x10($sp) +/* 852FF0 80240E80 E7A20014 */ swc1 $f2, 0x14($sp) +/* 852FF4 80240E84 0C01BFA4 */ jal fx_emote +/* 852FF8 80240E88 E7A40018 */ swc1 $f4, 0x18($sp) +/* 852FFC 80240E8C 8E4200CC */ lw $v0, 0xcc($s2) +/* 853000 80240E90 8C430000 */ lw $v1, ($v0) +/* 853004 80240E94 24020019 */ addiu $v0, $zero, 0x19 +/* 853008 80240E98 A602008E */ sh $v0, 0x8e($s0) +/* 85300C 80240E9C 2402000E */ addiu $v0, $zero, 0xe +/* 853010 80240EA0 080903B7 */ j .L80240EDC +/* 853014 80240EA4 AE030028 */ sw $v1, 0x28($s0) +.L80240EA8: +/* 853018 80240EA8 0C00F598 */ jal func_8003D660 +/* 85301C 80240EAC 24050001 */ addiu $a1, $zero, 1 +/* 853020 80240EB0 8E050018 */ lw $a1, 0x18($s0) +/* 853024 80240EB4 8E06000C */ lw $a2, 0xc($s0) +/* 853028 80240EB8 0C00EA95 */ jal npc_move_heading +/* 85302C 80240EBC 0200202D */ daddu $a0, $s0, $zero +/* 853030 80240EC0 8602008E */ lh $v0, 0x8e($s0) +/* 853034 80240EC4 9603008E */ lhu $v1, 0x8e($s0) +/* 853038 80240EC8 18400003 */ blez $v0, .L80240ED8 +/* 85303C 80240ECC 2462FFFF */ addiu $v0, $v1, -1 +/* 853040 80240ED0 080903B8 */ j .L80240EE0 +/* 853044 80240ED4 A602008E */ sh $v0, 0x8e($s0) +.L80240ED8: +/* 853048 80240ED8 2402000C */ addiu $v0, $zero, 0xc +.L80240EDC: +/* 85304C 80240EDC AE620070 */ sw $v0, 0x70($s3) +.L80240EE0: +/* 853050 80240EE0 8FBF0040 */ lw $ra, 0x40($sp) +/* 853054 80240EE4 8FB3003C */ lw $s3, 0x3c($sp) +/* 853058 80240EE8 8FB20038 */ lw $s2, 0x38($sp) +/* 85305C 80240EEC 8FB10034 */ lw $s1, 0x34($sp) +/* 853060 80240EF0 8FB00030 */ lw $s0, 0x30($sp) +/* 853064 80240EF4 03E00008 */ jr $ra +/* 853068 80240EF8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC.s deleted file mode 100644 index 203ca0f4fb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EFC -/* 85306C 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 853070 80240F00 AFB10014 */ sw $s1, 0x14($sp) -/* 853074 80240F04 0080882D */ daddu $s1, $a0, $zero -/* 853078 80240F08 AFBF0018 */ sw $ra, 0x18($sp) -/* 85307C 80240F0C AFB00010 */ sw $s0, 0x10($sp) -/* 853080 80240F10 8E300148 */ lw $s0, 0x148($s1) -/* 853084 80240F14 0C00EABB */ jal get_npc_unsafe -/* 853088 80240F18 86040008 */ lh $a0, 8($s0) -/* 85308C 80240F1C 9443008E */ lhu $v1, 0x8e($v0) -/* 853090 80240F20 2463FFFF */ addiu $v1, $v1, -1 -/* 853094 80240F24 A443008E */ sh $v1, 0x8e($v0) -/* 853098 80240F28 00031C00 */ sll $v1, $v1, 0x10 -/* 85309C 80240F2C 14600008 */ bnez $v1, .L80240F50 -/* 8530A0 80240F30 00000000 */ nop -/* 8530A4 80240F34 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8530A8 80240F38 30420080 */ andi $v0, $v0, 0x80 -/* 8530AC 80240F3C 10400003 */ beqz $v0, .L80240F4C -/* 8530B0 80240F40 2402000F */ addiu $v0, $zero, 0xf -/* 8530B4 80240F44 080903D4 */ j .L80240F50 -/* 8530B8 80240F48 AE220070 */ sw $v0, 0x70($s1) -.L80240F4C: -/* 8530BC 80240F4C AE200070 */ sw $zero, 0x70($s1) -.L80240F50: -/* 8530C0 80240F50 8FBF0018 */ lw $ra, 0x18($sp) -/* 8530C4 80240F54 8FB10014 */ lw $s1, 0x14($sp) -/* 8530C8 80240F58 8FB00010 */ lw $s0, 0x10($sp) -/* 8530CC 80240F5C 03E00008 */ jr $ra -/* 8530D0 80240F60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s new file mode 100644 index 0000000000..1452bffff1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240EFC_85306C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EFC_85306C +/* 85306C 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 853070 80240F00 AFB10014 */ sw $s1, 0x14($sp) +/* 853074 80240F04 0080882D */ daddu $s1, $a0, $zero +/* 853078 80240F08 AFBF0018 */ sw $ra, 0x18($sp) +/* 85307C 80240F0C AFB00010 */ sw $s0, 0x10($sp) +/* 853080 80240F10 8E300148 */ lw $s0, 0x148($s1) +/* 853084 80240F14 0C00EABB */ jal get_npc_unsafe +/* 853088 80240F18 86040008 */ lh $a0, 8($s0) +/* 85308C 80240F1C 9443008E */ lhu $v1, 0x8e($v0) +/* 853090 80240F20 2463FFFF */ addiu $v1, $v1, -1 +/* 853094 80240F24 A443008E */ sh $v1, 0x8e($v0) +/* 853098 80240F28 00031C00 */ sll $v1, $v1, 0x10 +/* 85309C 80240F2C 14600008 */ bnez $v1, .L80240F50 +/* 8530A0 80240F30 00000000 */ nop +/* 8530A4 80240F34 8E0200B0 */ lw $v0, 0xb0($s0) +/* 8530A8 80240F38 30420080 */ andi $v0, $v0, 0x80 +/* 8530AC 80240F3C 10400003 */ beqz $v0, .L80240F4C +/* 8530B0 80240F40 2402000F */ addiu $v0, $zero, 0xf +/* 8530B4 80240F44 080903D4 */ j .L80240F50 +/* 8530B8 80240F48 AE220070 */ sw $v0, 0x70($s1) +.L80240F4C: +/* 8530BC 80240F4C AE200070 */ sw $zero, 0x70($s1) +.L80240F50: +/* 8530C0 80240F50 8FBF0018 */ lw $ra, 0x18($sp) +/* 8530C4 80240F54 8FB10014 */ lw $s1, 0x14($sp) +/* 8530C8 80240F58 8FB00010 */ lw $s0, 0x10($sp) +/* 8530CC 80240F5C 03E00008 */ jr $ra +/* 8530D0 80240F60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64.s deleted file mode 100644 index 3cfc2eba6c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F64 -/* 8530D4 80240F64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8530D8 80240F68 AFB10014 */ sw $s1, 0x14($sp) -/* 8530DC 80240F6C 0080882D */ daddu $s1, $a0, $zero -/* 8530E0 80240F70 AFBF001C */ sw $ra, 0x1c($sp) -/* 8530E4 80240F74 AFB20018 */ sw $s2, 0x18($sp) -/* 8530E8 80240F78 AFB00010 */ sw $s0, 0x10($sp) -/* 8530EC 80240F7C 8E300148 */ lw $s0, 0x148($s1) -/* 8530F0 80240F80 86040008 */ lh $a0, 8($s0) -/* 8530F4 80240F84 0C00EABB */ jal get_npc_unsafe -/* 8530F8 80240F88 00A0902D */ daddu $s2, $a1, $zero -/* 8530FC 80240F8C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 853100 80240F90 8E240078 */ lw $a0, 0x78($s1) -/* 853104 80240F94 8C630000 */ lw $v1, ($v1) -/* 853108 80240F98 0083182A */ slt $v1, $a0, $v1 -/* 85310C 80240F9C 10600013 */ beqz $v1, .L80240FEC -/* 853110 80240FA0 0040302D */ daddu $a2, $v0, $zero -/* 853114 80240FA4 00041040 */ sll $v0, $a0, 1 -/* 853118 80240FA8 00441021 */ addu $v0, $v0, $a0 -/* 85311C 80240FAC 00022880 */ sll $a1, $v0, 2 -.L80240FB0: -/* 853120 80240FB0 8E0300D0 */ lw $v1, 0xd0($s0) -/* 853124 80240FB4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 853128 80240FB8 00A31021 */ addu $v0, $a1, $v1 -/* 85312C 80240FBC C4400008 */ lwc1 $f0, 8($v0) -/* 853130 80240FC0 46800020 */ cvt.s.w $f0, $f0 -/* 853134 80240FC4 4602003E */ c.le.s $f0, $f2 -/* 853138 80240FC8 00000000 */ nop -/* 85313C 80240FCC 45020003 */ bc1fl .L80240FDC -/* 853140 80240FD0 24840001 */ addiu $a0, $a0, 1 -/* 853144 80240FD4 080903FB */ j .L80240FEC -/* 853148 80240FD8 AE240078 */ sw $a0, 0x78($s1) -.L80240FDC: -/* 85314C 80240FDC 8C620000 */ lw $v0, ($v1) -/* 853150 80240FE0 0082102A */ slt $v0, $a0, $v0 -/* 853154 80240FE4 1440FFF2 */ bnez $v0, .L80240FB0 -/* 853158 80240FE8 24A5000C */ addiu $a1, $a1, 0xc -.L80240FEC: -/* 85315C 80240FEC C6400000 */ lwc1 $f0, ($s2) -/* 853160 80240FF0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 853164 80240FF4 8E0200CC */ lw $v0, 0xcc($s0) -/* 853168 80240FF8 8C420004 */ lw $v0, 4($v0) -/* 85316C 80240FFC ACC20028 */ sw $v0, 0x28($a2) -/* 853170 80241000 24020001 */ addiu $v0, $zero, 1 -/* 853174 80241004 AE200074 */ sw $zero, 0x74($s1) -/* 853178 80241008 AE220070 */ sw $v0, 0x70($s1) -/* 85317C 8024100C 8FBF001C */ lw $ra, 0x1c($sp) -/* 853180 80241010 8FB20018 */ lw $s2, 0x18($sp) -/* 853184 80241014 8FB10014 */ lw $s1, 0x14($sp) -/* 853188 80241018 8FB00010 */ lw $s0, 0x10($sp) -/* 85318C 8024101C 03E00008 */ jr $ra -/* 853190 80241020 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s new file mode 100644 index 0000000000..dec38886f3 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80240F64_8530D4.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F64_8530D4 +/* 8530D4 80240F64 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8530D8 80240F68 AFB10014 */ sw $s1, 0x14($sp) +/* 8530DC 80240F6C 0080882D */ daddu $s1, $a0, $zero +/* 8530E0 80240F70 AFBF001C */ sw $ra, 0x1c($sp) +/* 8530E4 80240F74 AFB20018 */ sw $s2, 0x18($sp) +/* 8530E8 80240F78 AFB00010 */ sw $s0, 0x10($sp) +/* 8530EC 80240F7C 8E300148 */ lw $s0, 0x148($s1) +/* 8530F0 80240F80 86040008 */ lh $a0, 8($s0) +/* 8530F4 80240F84 0C00EABB */ jal get_npc_unsafe +/* 8530F8 80240F88 00A0902D */ daddu $s2, $a1, $zero +/* 8530FC 80240F8C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 853100 80240F90 8E240078 */ lw $a0, 0x78($s1) +/* 853104 80240F94 8C630000 */ lw $v1, ($v1) +/* 853108 80240F98 0083182A */ slt $v1, $a0, $v1 +/* 85310C 80240F9C 10600013 */ beqz $v1, .L80240FEC +/* 853110 80240FA0 0040302D */ daddu $a2, $v0, $zero +/* 853114 80240FA4 00041040 */ sll $v0, $a0, 1 +/* 853118 80240FA8 00441021 */ addu $v0, $v0, $a0 +/* 85311C 80240FAC 00022880 */ sll $a1, $v0, 2 +.L80240FB0: +/* 853120 80240FB0 8E0300D0 */ lw $v1, 0xd0($s0) +/* 853124 80240FB4 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* 853128 80240FB8 00A31021 */ addu $v0, $a1, $v1 +/* 85312C 80240FBC C4400008 */ lwc1 $f0, 8($v0) +/* 853130 80240FC0 46800020 */ cvt.s.w $f0, $f0 +/* 853134 80240FC4 4602003E */ c.le.s $f0, $f2 +/* 853138 80240FC8 00000000 */ nop +/* 85313C 80240FCC 45020003 */ bc1fl .L80240FDC +/* 853140 80240FD0 24840001 */ addiu $a0, $a0, 1 +/* 853144 80240FD4 080903FB */ j .L80240FEC +/* 853148 80240FD8 AE240078 */ sw $a0, 0x78($s1) +.L80240FDC: +/* 85314C 80240FDC 8C620000 */ lw $v0, ($v1) +/* 853150 80240FE0 0082102A */ slt $v0, $a0, $v0 +/* 853154 80240FE4 1440FFF2 */ bnez $v0, .L80240FB0 +/* 853158 80240FE8 24A5000C */ addiu $a1, $a1, 0xc +.L80240FEC: +/* 85315C 80240FEC C6400000 */ lwc1 $f0, ($s2) +/* 853160 80240FF0 E4C00018 */ swc1 $f0, 0x18($a2) +/* 853164 80240FF4 8E0200CC */ lw $v0, 0xcc($s0) +/* 853168 80240FF8 8C420004 */ lw $v0, 4($v0) +/* 85316C 80240FFC ACC20028 */ sw $v0, 0x28($a2) +/* 853170 80241000 24020001 */ addiu $v0, $zero, 1 +/* 853174 80241004 AE200074 */ sw $zero, 0x74($s1) +/* 853178 80241008 AE220070 */ sw $v0, 0x70($s1) +/* 85317C 8024100C 8FBF001C */ lw $ra, 0x1c($sp) +/* 853180 80241010 8FB20018 */ lw $s2, 0x18($sp) +/* 853184 80241014 8FB10014 */ lw $s1, 0x14($sp) +/* 853188 80241018 8FB00010 */ lw $s0, 0x10($sp) +/* 85318C 8024101C 03E00008 */ jr $ra +/* 853190 80241020 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024.s deleted file mode 100644 index cb6ac4cd36..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241024 -/* 853194 80241024 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 853198 80241028 AFB40058 */ sw $s4, 0x58($sp) -/* 85319C 8024102C 0080A02D */ daddu $s4, $a0, $zero -/* 8531A0 80241030 AFBF0060 */ sw $ra, 0x60($sp) -/* 8531A4 80241034 AFB5005C */ sw $s5, 0x5c($sp) -/* 8531A8 80241038 AFB30054 */ sw $s3, 0x54($sp) -/* 8531AC 8024103C AFB20050 */ sw $s2, 0x50($sp) -/* 8531B0 80241040 AFB1004C */ sw $s1, 0x4c($sp) -/* 8531B4 80241044 AFB00048 */ sw $s0, 0x48($sp) -/* 8531B8 80241048 8E910148 */ lw $s1, 0x148($s4) -/* 8531BC 8024104C 86240008 */ lh $a0, 8($s1) -/* 8531C0 80241050 0C00EABB */ jal get_npc_unsafe -/* 8531C4 80241054 00A0802D */ daddu $s0, $a1, $zero -/* 8531C8 80241058 8E83000C */ lw $v1, 0xc($s4) -/* 8531CC 8024105C 0280202D */ daddu $a0, $s4, $zero -/* 8531D0 80241060 8C650000 */ lw $a1, ($v1) -/* 8531D4 80241064 0C0B1EAF */ jal get_variable -/* 8531D8 80241068 0040902D */ daddu $s2, $v0, $zero -/* 8531DC 8024106C AFA00018 */ sw $zero, 0x18($sp) -/* 8531E0 80241070 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8531E4 80241074 8C630094 */ lw $v1, 0x94($v1) -/* 8531E8 80241078 AFA3001C */ sw $v1, 0x1c($sp) -/* 8531EC 8024107C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8531F0 80241080 8C630080 */ lw $v1, 0x80($v1) -/* 8531F4 80241084 AFA30020 */ sw $v1, 0x20($sp) -/* 8531F8 80241088 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8531FC 8024108C 8C630088 */ lw $v1, 0x88($v1) -/* 853200 80241090 AFA30024 */ sw $v1, 0x24($sp) -/* 853204 80241094 8E2300D0 */ lw $v1, 0xd0($s1) -/* 853208 80241098 8C63008C */ lw $v1, 0x8c($v1) -/* 85320C 8024109C 27B50018 */ addiu $s5, $sp, 0x18 -/* 853210 802410A0 AFA30028 */ sw $v1, 0x28($sp) -/* 853214 802410A4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 853218 802410A8 3C014282 */ lui $at, 0x4282 -/* 85321C 802410AC 44810000 */ mtc1 $at, $f0 -/* 853220 802410B0 8C630090 */ lw $v1, 0x90($v1) -/* 853224 802410B4 0040982D */ daddu $s3, $v0, $zero -/* 853228 802410B8 E7A00030 */ swc1 $f0, 0x30($sp) -/* 85322C 802410BC A7A00034 */ sh $zero, 0x34($sp) -/* 853230 802410C0 16000005 */ bnez $s0, .L802410D8 -/* 853234 802410C4 AFA3002C */ sw $v1, 0x2c($sp) -/* 853238 802410C8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 85323C 802410CC 30420004 */ andi $v0, $v0, 4 -/* 853240 802410D0 10400044 */ beqz $v0, .L802411E4 -/* 853244 802410D4 00000000 */ nop -.L802410D8: -/* 853248 802410D8 2404F7FF */ addiu $a0, $zero, -0x801 -/* 85324C 802410DC AE800070 */ sw $zero, 0x70($s4) -/* 853250 802410E0 A640008E */ sh $zero, 0x8e($s2) -/* 853254 802410E4 8E2200CC */ lw $v0, 0xcc($s1) -/* 853258 802410E8 8E430000 */ lw $v1, ($s2) -/* 85325C 802410EC 8C420000 */ lw $v0, ($v0) -/* 853260 802410F0 00641824 */ and $v1, $v1, $a0 -/* 853264 802410F4 AE430000 */ sw $v1, ($s2) -/* 853268 802410F8 AE420028 */ sw $v0, 0x28($s2) -/* 85326C 802410FC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 853270 80241100 8C420098 */ lw $v0, 0x98($v0) -/* 853274 80241104 54400005 */ bnel $v0, $zero, .L8024111C -/* 853278 80241108 2402FDFF */ addiu $v0, $zero, -0x201 -/* 85327C 8024110C 34620200 */ ori $v0, $v1, 0x200 -/* 853280 80241110 2403FFF7 */ addiu $v1, $zero, -9 -/* 853284 80241114 08090449 */ j .L80241124 -/* 853288 80241118 00431024 */ and $v0, $v0, $v1 -.L8024111C: -/* 85328C 8024111C 00621024 */ and $v0, $v1, $v0 -/* 853290 80241120 34420008 */ ori $v0, $v0, 8 -.L80241124: -/* 853294 80241124 AE420000 */ sw $v0, ($s2) -/* 853298 80241128 8E2200B0 */ lw $v0, 0xb0($s1) -/* 85329C 8024112C 30420004 */ andi $v0, $v0, 4 -/* 8532A0 80241130 10400008 */ beqz $v0, .L80241154 -/* 8532A4 80241134 24020063 */ addiu $v0, $zero, 0x63 -/* 8532A8 80241138 AE820070 */ sw $v0, 0x70($s4) -/* 8532AC 8024113C AE800074 */ sw $zero, 0x74($s4) -/* 8532B0 80241140 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8532B4 80241144 2403FFFB */ addiu $v1, $zero, -5 -/* 8532B8 80241148 00431024 */ and $v0, $v0, $v1 -/* 8532BC 8024114C 08090460 */ j .L80241180 -/* 8532C0 80241150 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241154: -/* 8532C4 80241154 8E220000 */ lw $v0, ($s1) -/* 8532C8 80241158 3C034000 */ lui $v1, 0x4000 -/* 8532CC 8024115C 00431024 */ and $v0, $v0, $v1 -/* 8532D0 80241160 10400007 */ beqz $v0, .L80241180 -/* 8532D4 80241164 3C03BFFF */ lui $v1, 0xbfff -/* 8532D8 80241168 2402000C */ addiu $v0, $zero, 0xc -/* 8532DC 8024116C AE820070 */ sw $v0, 0x70($s4) -/* 8532E0 80241170 8E220000 */ lw $v0, ($s1) -/* 8532E4 80241174 3463FFFF */ ori $v1, $v1, 0xffff -/* 8532E8 80241178 00431024 */ and $v0, $v0, $v1 -/* 8532EC 8024117C AE220000 */ sw $v0, ($s1) -.L80241180: -/* 8532F0 80241180 27A50038 */ addiu $a1, $sp, 0x38 -/* 8532F4 80241184 27A6003C */ addiu $a2, $sp, 0x3c -/* 8532F8 80241188 C6400038 */ lwc1 $f0, 0x38($s2) -/* 8532FC 8024118C 864200A8 */ lh $v0, 0xa8($s2) -/* 853300 80241190 3C0142C8 */ lui $at, 0x42c8 -/* 853304 80241194 44812000 */ mtc1 $at, $f4 -/* 853308 80241198 44823000 */ mtc1 $v0, $f6 -/* 85330C 8024119C 00000000 */ nop -/* 853310 802411A0 468031A0 */ cvt.s.w $f6, $f6 -/* 853314 802411A4 27A20044 */ addiu $v0, $sp, 0x44 -/* 853318 802411A8 E7A00038 */ swc1 $f0, 0x38($sp) -/* 85331C 802411AC C640003C */ lwc1 $f0, 0x3c($s2) -/* 853320 802411B0 C6420040 */ lwc1 $f2, 0x40($s2) -/* 853324 802411B4 46060000 */ add.s $f0, $f0, $f6 -/* 853328 802411B8 E7A40044 */ swc1 $f4, 0x44($sp) -/* 85332C 802411BC E7A20040 */ swc1 $f2, 0x40($sp) -/* 853330 802411C0 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 853334 802411C4 AFA20010 */ sw $v0, 0x10($sp) -/* 853338 802411C8 8E440080 */ lw $a0, 0x80($s2) -/* 85333C 802411CC 0C0372DF */ jal func_800DCB7C -/* 853340 802411D0 27A70040 */ addiu $a3, $sp, 0x40 -/* 853344 802411D4 10400003 */ beqz $v0, .L802411E4 -/* 853348 802411D8 00000000 */ nop -/* 85334C 802411DC C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 853350 802411E0 E640003C */ swc1 $f0, 0x3c($s2) -.L802411E4: -/* 853354 802411E4 8E830070 */ lw $v1, 0x70($s4) -/* 853358 802411E8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 85335C 802411EC 10400042 */ beqz $v0, .L802412F8 -/* 853360 802411F0 00031080 */ sll $v0, $v1, 2 -/* 853364 802411F4 3C018025 */ lui $at, 0x8025 -/* 853368 802411F8 00220821 */ addu $at, $at, $v0 -/* 85336C 802411FC 8C2227C0 */ lw $v0, 0x27c0($at) -/* 853370 80241200 00400008 */ jr $v0 -/* 853374 80241204 00000000 */ nop -/* 853378 80241208 0280202D */ daddu $a0, $s4, $zero -/* 85337C 8024120C 0260282D */ daddu $a1, $s3, $zero -/* 853380 80241210 0C090124 */ jal func_80240490 -/* 853384 80241214 02A0302D */ daddu $a2, $s5, $zero -/* 853388 80241218 0280202D */ daddu $a0, $s4, $zero -/* 85338C 8024121C 0260282D */ daddu $a1, $s3, $zero -/* 853390 80241220 0C09017A */ jal func_802405E8 -/* 853394 80241224 02A0302D */ daddu $a2, $s5, $zero -/* 853398 80241228 080904BE */ j .L802412F8 -/* 85339C 8024122C 00000000 */ nop -/* 8533A0 80241230 0280202D */ daddu $a0, $s4, $zero -/* 8533A4 80241234 0260282D */ daddu $a1, $s3, $zero -/* 8533A8 80241238 0C090224 */ jal func_80240890 -/* 8533AC 8024123C 02A0302D */ daddu $a2, $s5, $zero -/* 8533B0 80241240 0280202D */ daddu $a0, $s4, $zero -/* 8533B4 80241244 0260282D */ daddu $a1, $s3, $zero -/* 8533B8 80241248 0C090254 */ jal func_80240950 -/* 8533BC 8024124C 02A0302D */ daddu $a2, $s5, $zero -/* 8533C0 80241250 080904BE */ j .L802412F8 -/* 8533C4 80241254 00000000 */ nop -/* 8533C8 80241258 0280202D */ daddu $a0, $s4, $zero -/* 8533CC 8024125C 0260282D */ daddu $a1, $s3, $zero -/* 8533D0 80241260 0C0902C3 */ jal func_80240B0C -/* 8533D4 80241264 02A0302D */ daddu $a2, $s5, $zero -/* 8533D8 80241268 080904BE */ j .L802412F8 -/* 8533DC 8024126C 00000000 */ nop -/* 8533E0 80241270 0280202D */ daddu $a0, $s4, $zero -/* 8533E4 80241274 0260282D */ daddu $a1, $s3, $zero -/* 8533E8 80241278 0C0902F0 */ jal func_80240BC0 -/* 8533EC 8024127C 02A0302D */ daddu $a2, $s5, $zero -/* 8533F0 80241280 0280202D */ daddu $a0, $s4, $zero -/* 8533F4 80241284 0260282D */ daddu $a1, $s3, $zero -/* 8533F8 80241288 0C09030D */ jal func_80240C34 -/* 8533FC 8024128C 02A0302D */ daddu $a2, $s5, $zero -/* 853400 80241290 080904BE */ j .L802412F8 -/* 853404 80241294 00000000 */ nop -/* 853408 80241298 0280202D */ daddu $a0, $s4, $zero -/* 85340C 8024129C 0260282D */ daddu $a1, $s3, $zero -/* 853410 802412A0 0C09032B */ jal func_80240CAC -/* 853414 802412A4 02A0302D */ daddu $a2, $s5, $zero -/* 853418 802412A8 0280202D */ daddu $a0, $s4, $zero -/* 85341C 802412AC 0260282D */ daddu $a1, $s3, $zero -/* 853420 802412B0 0C090377 */ jal func_80240DDC -/* 853424 802412B4 02A0302D */ daddu $a2, $s5, $zero -/* 853428 802412B8 080904BE */ j .L802412F8 -/* 85342C 802412BC 00000000 */ nop -/* 853430 802412C0 0280202D */ daddu $a0, $s4, $zero -/* 853434 802412C4 0260282D */ daddu $a1, $s3, $zero -/* 853438 802412C8 0C0903BF */ jal func_80240EFC -/* 85343C 802412CC 02A0302D */ daddu $a2, $s5, $zero -/* 853440 802412D0 080904BE */ j .L802412F8 -/* 853444 802412D4 00000000 */ nop -/* 853448 802412D8 0280202D */ daddu $a0, $s4, $zero -/* 85344C 802412DC 0260282D */ daddu $a1, $s3, $zero -/* 853450 802412E0 0C0903D9 */ jal func_80240F64 -/* 853454 802412E4 02A0302D */ daddu $a2, $s5, $zero -/* 853458 802412E8 080904BE */ j .L802412F8 -/* 85345C 802412EC 00000000 */ nop -/* 853460 802412F0 0C0129CF */ jal func_8004A73C -/* 853464 802412F4 0280202D */ daddu $a0, $s4, $zero -.L802412F8: -/* 853468 802412F8 8FBF0060 */ lw $ra, 0x60($sp) -/* 85346C 802412FC 8FB5005C */ lw $s5, 0x5c($sp) -/* 853470 80241300 8FB40058 */ lw $s4, 0x58($sp) -/* 853474 80241304 8FB30054 */ lw $s3, 0x54($sp) -/* 853478 80241308 8FB20050 */ lw $s2, 0x50($sp) -/* 85347C 8024130C 8FB1004C */ lw $s1, 0x4c($sp) -/* 853480 80241310 8FB00048 */ lw $s0, 0x48($sp) -/* 853484 80241314 0000102D */ daddu $v0, $zero, $zero -/* 853488 80241318 03E00008 */ jr $ra -/* 85348C 8024131C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s new file mode 100644 index 0000000000..19182f02e4 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241024_853194.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241024_853194 +/* 853194 80241024 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 853198 80241028 AFB40058 */ sw $s4, 0x58($sp) +/* 85319C 8024102C 0080A02D */ daddu $s4, $a0, $zero +/* 8531A0 80241030 AFBF0060 */ sw $ra, 0x60($sp) +/* 8531A4 80241034 AFB5005C */ sw $s5, 0x5c($sp) +/* 8531A8 80241038 AFB30054 */ sw $s3, 0x54($sp) +/* 8531AC 8024103C AFB20050 */ sw $s2, 0x50($sp) +/* 8531B0 80241040 AFB1004C */ sw $s1, 0x4c($sp) +/* 8531B4 80241044 AFB00048 */ sw $s0, 0x48($sp) +/* 8531B8 80241048 8E910148 */ lw $s1, 0x148($s4) +/* 8531BC 8024104C 86240008 */ lh $a0, 8($s1) +/* 8531C0 80241050 0C00EABB */ jal get_npc_unsafe +/* 8531C4 80241054 00A0802D */ daddu $s0, $a1, $zero +/* 8531C8 80241058 8E83000C */ lw $v1, 0xc($s4) +/* 8531CC 8024105C 0280202D */ daddu $a0, $s4, $zero +/* 8531D0 80241060 8C650000 */ lw $a1, ($v1) +/* 8531D4 80241064 0C0B1EAF */ jal get_variable +/* 8531D8 80241068 0040902D */ daddu $s2, $v0, $zero +/* 8531DC 8024106C AFA00018 */ sw $zero, 0x18($sp) +/* 8531E0 80241070 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8531E4 80241074 8C630094 */ lw $v1, 0x94($v1) +/* 8531E8 80241078 AFA3001C */ sw $v1, 0x1c($sp) +/* 8531EC 8024107C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8531F0 80241080 8C630080 */ lw $v1, 0x80($v1) +/* 8531F4 80241084 AFA30020 */ sw $v1, 0x20($sp) +/* 8531F8 80241088 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8531FC 8024108C 8C630088 */ lw $v1, 0x88($v1) +/* 853200 80241090 AFA30024 */ sw $v1, 0x24($sp) +/* 853204 80241094 8E2300D0 */ lw $v1, 0xd0($s1) +/* 853208 80241098 8C63008C */ lw $v1, 0x8c($v1) +/* 85320C 8024109C 27B50018 */ addiu $s5, $sp, 0x18 +/* 853210 802410A0 AFA30028 */ sw $v1, 0x28($sp) +/* 853214 802410A4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 853218 802410A8 3C014282 */ lui $at, 0x4282 +/* 85321C 802410AC 44810000 */ mtc1 $at, $f0 +/* 853220 802410B0 8C630090 */ lw $v1, 0x90($v1) +/* 853224 802410B4 0040982D */ daddu $s3, $v0, $zero +/* 853228 802410B8 E7A00030 */ swc1 $f0, 0x30($sp) +/* 85322C 802410BC A7A00034 */ sh $zero, 0x34($sp) +/* 853230 802410C0 16000005 */ bnez $s0, .L802410D8 +/* 853234 802410C4 AFA3002C */ sw $v1, 0x2c($sp) +/* 853238 802410C8 8E2200B0 */ lw $v0, 0xb0($s1) +/* 85323C 802410CC 30420004 */ andi $v0, $v0, 4 +/* 853240 802410D0 10400044 */ beqz $v0, .L802411E4 +/* 853244 802410D4 00000000 */ nop +.L802410D8: +/* 853248 802410D8 2404F7FF */ addiu $a0, $zero, -0x801 +/* 85324C 802410DC AE800070 */ sw $zero, 0x70($s4) +/* 853250 802410E0 A640008E */ sh $zero, 0x8e($s2) +/* 853254 802410E4 8E2200CC */ lw $v0, 0xcc($s1) +/* 853258 802410E8 8E430000 */ lw $v1, ($s2) +/* 85325C 802410EC 8C420000 */ lw $v0, ($v0) +/* 853260 802410F0 00641824 */ and $v1, $v1, $a0 +/* 853264 802410F4 AE430000 */ sw $v1, ($s2) +/* 853268 802410F8 AE420028 */ sw $v0, 0x28($s2) +/* 85326C 802410FC 8E2200D0 */ lw $v0, 0xd0($s1) +/* 853270 80241100 8C420098 */ lw $v0, 0x98($v0) +/* 853274 80241104 54400005 */ bnel $v0, $zero, .L8024111C +/* 853278 80241108 2402FDFF */ addiu $v0, $zero, -0x201 +/* 85327C 8024110C 34620200 */ ori $v0, $v1, 0x200 +/* 853280 80241110 2403FFF7 */ addiu $v1, $zero, -9 +/* 853284 80241114 08090449 */ j .L80241124 +/* 853288 80241118 00431024 */ and $v0, $v0, $v1 +.L8024111C: +/* 85328C 8024111C 00621024 */ and $v0, $v1, $v0 +/* 853290 80241120 34420008 */ ori $v0, $v0, 8 +.L80241124: +/* 853294 80241124 AE420000 */ sw $v0, ($s2) +/* 853298 80241128 8E2200B0 */ lw $v0, 0xb0($s1) +/* 85329C 8024112C 30420004 */ andi $v0, $v0, 4 +/* 8532A0 80241130 10400008 */ beqz $v0, .L80241154 +/* 8532A4 80241134 24020063 */ addiu $v0, $zero, 0x63 +/* 8532A8 80241138 AE820070 */ sw $v0, 0x70($s4) +/* 8532AC 8024113C AE800074 */ sw $zero, 0x74($s4) +/* 8532B0 80241140 8E2200B0 */ lw $v0, 0xb0($s1) +/* 8532B4 80241144 2403FFFB */ addiu $v1, $zero, -5 +/* 8532B8 80241148 00431024 */ and $v0, $v0, $v1 +/* 8532BC 8024114C 08090460 */ j .L80241180 +/* 8532C0 80241150 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241154: +/* 8532C4 80241154 8E220000 */ lw $v0, ($s1) +/* 8532C8 80241158 3C034000 */ lui $v1, 0x4000 +/* 8532CC 8024115C 00431024 */ and $v0, $v0, $v1 +/* 8532D0 80241160 10400007 */ beqz $v0, .L80241180 +/* 8532D4 80241164 3C03BFFF */ lui $v1, 0xbfff +/* 8532D8 80241168 2402000C */ addiu $v0, $zero, 0xc +/* 8532DC 8024116C AE820070 */ sw $v0, 0x70($s4) +/* 8532E0 80241170 8E220000 */ lw $v0, ($s1) +/* 8532E4 80241174 3463FFFF */ ori $v1, $v1, 0xffff +/* 8532E8 80241178 00431024 */ and $v0, $v0, $v1 +/* 8532EC 8024117C AE220000 */ sw $v0, ($s1) +.L80241180: +/* 8532F0 80241180 27A50038 */ addiu $a1, $sp, 0x38 +/* 8532F4 80241184 27A6003C */ addiu $a2, $sp, 0x3c +/* 8532F8 80241188 C6400038 */ lwc1 $f0, 0x38($s2) +/* 8532FC 8024118C 864200A8 */ lh $v0, 0xa8($s2) +/* 853300 80241190 3C0142C8 */ lui $at, 0x42c8 +/* 853304 80241194 44812000 */ mtc1 $at, $f4 +/* 853308 80241198 44823000 */ mtc1 $v0, $f6 +/* 85330C 8024119C 00000000 */ nop +/* 853310 802411A0 468031A0 */ cvt.s.w $f6, $f6 +/* 853314 802411A4 27A20044 */ addiu $v0, $sp, 0x44 +/* 853318 802411A8 E7A00038 */ swc1 $f0, 0x38($sp) +/* 85331C 802411AC C640003C */ lwc1 $f0, 0x3c($s2) +/* 853320 802411B0 C6420040 */ lwc1 $f2, 0x40($s2) +/* 853324 802411B4 46060000 */ add.s $f0, $f0, $f6 +/* 853328 802411B8 E7A40044 */ swc1 $f4, 0x44($sp) +/* 85332C 802411BC E7A20040 */ swc1 $f2, 0x40($sp) +/* 853330 802411C0 E7A0003C */ swc1 $f0, 0x3c($sp) +/* 853334 802411C4 AFA20010 */ sw $v0, 0x10($sp) +/* 853338 802411C8 8E440080 */ lw $a0, 0x80($s2) +/* 85333C 802411CC 0C0372DF */ jal func_800DCB7C +/* 853340 802411D0 27A70040 */ addiu $a3, $sp, 0x40 +/* 853344 802411D4 10400003 */ beqz $v0, .L802411E4 +/* 853348 802411D8 00000000 */ nop +/* 85334C 802411DC C7A0003C */ lwc1 $f0, 0x3c($sp) +/* 853350 802411E0 E640003C */ swc1 $f0, 0x3c($s2) +.L802411E4: +/* 853354 802411E4 8E830070 */ lw $v1, 0x70($s4) +/* 853358 802411E8 2C620064 */ sltiu $v0, $v1, 0x64 +/* 85335C 802411EC 10400042 */ beqz $v0, .L802412F8 +/* 853360 802411F0 00031080 */ sll $v0, $v1, 2 +/* 853364 802411F4 3C018025 */ lui $at, 0x8025 +/* 853368 802411F8 00220821 */ addu $at, $at, $v0 +/* 85336C 802411FC 8C2227C0 */ lw $v0, 0x27c0($at) +/* 853370 80241200 00400008 */ jr $v0 +/* 853374 80241204 00000000 */ nop +/* 853378 80241208 0280202D */ daddu $a0, $s4, $zero +/* 85337C 8024120C 0260282D */ daddu $a1, $s3, $zero +/* 853380 80241210 0C090124 */ jal func_80240490_852600 +/* 853384 80241214 02A0302D */ daddu $a2, $s5, $zero +/* 853388 80241218 0280202D */ daddu $a0, $s4, $zero +/* 85338C 8024121C 0260282D */ daddu $a1, $s3, $zero +/* 853390 80241220 0C09017A */ jal func_802405E8_852758 +/* 853394 80241224 02A0302D */ daddu $a2, $s5, $zero +/* 853398 80241228 080904BE */ j .L802412F8 +/* 85339C 8024122C 00000000 */ nop +/* 8533A0 80241230 0280202D */ daddu $a0, $s4, $zero +/* 8533A4 80241234 0260282D */ daddu $a1, $s3, $zero +/* 8533A8 80241238 0C090224 */ jal func_80240890_852A00 +/* 8533AC 8024123C 02A0302D */ daddu $a2, $s5, $zero +/* 8533B0 80241240 0280202D */ daddu $a0, $s4, $zero +/* 8533B4 80241244 0260282D */ daddu $a1, $s3, $zero +/* 8533B8 80241248 0C090254 */ jal func_80240950_852AC0 +/* 8533BC 8024124C 02A0302D */ daddu $a2, $s5, $zero +/* 8533C0 80241250 080904BE */ j .L802412F8 +/* 8533C4 80241254 00000000 */ nop +/* 8533C8 80241258 0280202D */ daddu $a0, $s4, $zero +/* 8533CC 8024125C 0260282D */ daddu $a1, $s3, $zero +/* 8533D0 80241260 0C0902C3 */ jal func_80240B0C_852C7C +/* 8533D4 80241264 02A0302D */ daddu $a2, $s5, $zero +/* 8533D8 80241268 080904BE */ j .L802412F8 +/* 8533DC 8024126C 00000000 */ nop +/* 8533E0 80241270 0280202D */ daddu $a0, $s4, $zero +/* 8533E4 80241274 0260282D */ daddu $a1, $s3, $zero +/* 8533E8 80241278 0C0902F0 */ jal func_80240BC0_852D30 +/* 8533EC 8024127C 02A0302D */ daddu $a2, $s5, $zero +/* 8533F0 80241280 0280202D */ daddu $a0, $s4, $zero +/* 8533F4 80241284 0260282D */ daddu $a1, $s3, $zero +/* 8533F8 80241288 0C09030D */ jal func_80240C34_852DA4 +/* 8533FC 8024128C 02A0302D */ daddu $a2, $s5, $zero +/* 853400 80241290 080904BE */ j .L802412F8 +/* 853404 80241294 00000000 */ nop +/* 853408 80241298 0280202D */ daddu $a0, $s4, $zero +/* 85340C 8024129C 0260282D */ daddu $a1, $s3, $zero +/* 853410 802412A0 0C09032B */ jal func_80240CAC_852E1C +/* 853414 802412A4 02A0302D */ daddu $a2, $s5, $zero +/* 853418 802412A8 0280202D */ daddu $a0, $s4, $zero +/* 85341C 802412AC 0260282D */ daddu $a1, $s3, $zero +/* 853420 802412B0 0C090377 */ jal func_80240DDC_852F4C +/* 853424 802412B4 02A0302D */ daddu $a2, $s5, $zero +/* 853428 802412B8 080904BE */ j .L802412F8 +/* 85342C 802412BC 00000000 */ nop +/* 853430 802412C0 0280202D */ daddu $a0, $s4, $zero +/* 853434 802412C4 0260282D */ daddu $a1, $s3, $zero +/* 853438 802412C8 0C0903BF */ jal func_80240EFC_85306C +/* 85343C 802412CC 02A0302D */ daddu $a2, $s5, $zero +/* 853440 802412D0 080904BE */ j .L802412F8 +/* 853444 802412D4 00000000 */ nop +/* 853448 802412D8 0280202D */ daddu $a0, $s4, $zero +/* 85344C 802412DC 0260282D */ daddu $a1, $s3, $zero +/* 853450 802412E0 0C0903D9 */ jal func_80240F64_8530D4 +/* 853454 802412E4 02A0302D */ daddu $a2, $s5, $zero +/* 853458 802412E8 080904BE */ j .L802412F8 +/* 85345C 802412EC 00000000 */ nop +/* 853460 802412F0 0C0129CF */ jal func_8004A73C +/* 853464 802412F4 0280202D */ daddu $a0, $s4, $zero +.L802412F8: +/* 853468 802412F8 8FBF0060 */ lw $ra, 0x60($sp) +/* 85346C 802412FC 8FB5005C */ lw $s5, 0x5c($sp) +/* 853470 80241300 8FB40058 */ lw $s4, 0x58($sp) +/* 853474 80241304 8FB30054 */ lw $s3, 0x54($sp) +/* 853478 80241308 8FB20050 */ lw $s2, 0x50($sp) +/* 85347C 8024130C 8FB1004C */ lw $s1, 0x4c($sp) +/* 853480 80241310 8FB00048 */ lw $s0, 0x48($sp) +/* 853484 80241314 0000102D */ daddu $v0, $zero, $zero +/* 853488 80241318 03E00008 */ jr $ra +/* 85348C 8024131C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320.s deleted file mode 100644 index 9645b38fa6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241320 -/* 853490 80241320 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 853494 80241324 AFB00010 */ sw $s0, 0x10($sp) -/* 853498 80241328 3C108024 */ lui $s0, 0x8024 -/* 85349C 8024132C 261050B0 */ addiu $s0, $s0, 0x50b0 -/* 8534A0 80241330 AFBF0018 */ sw $ra, 0x18($sp) -/* 8534A4 80241334 AFB10014 */ sw $s1, 0x14($sp) -/* 8534A8 80241338 8E020000 */ lw $v0, ($s0) -/* 8534AC 8024133C 14400010 */ bnez $v0, .L80241380 -/* 8534B0 80241340 0080882D */ daddu $s1, $a0, $zero -/* 8534B4 80241344 0C00AB39 */ jal heap_malloc -/* 8534B8 80241348 24040040 */ addiu $a0, $zero, 0x40 -/* 8534BC 8024134C AE020000 */ sw $v0, ($s0) -/* 8534C0 80241350 0000182D */ daddu $v1, $zero, $zero -/* 8534C4 80241354 0040282D */ daddu $a1, $v0, $zero -/* 8534C8 80241358 0220202D */ daddu $a0, $s1, $zero -.L8024135C: -/* 8534CC 8024135C 8C820084 */ lw $v0, 0x84($a0) -/* 8534D0 80241360 24840004 */ addiu $a0, $a0, 4 -/* 8534D4 80241364 24630001 */ addiu $v1, $v1, 1 -/* 8534D8 80241368 ACA20000 */ sw $v0, ($a1) -/* 8534DC 8024136C 28620010 */ slti $v0, $v1, 0x10 -/* 8534E0 80241370 1440FFFA */ bnez $v0, .L8024135C -/* 8534E4 80241374 24A50004 */ addiu $a1, $a1, 4 -/* 8534E8 80241378 080904EF */ j .L802413BC -/* 8534EC 8024137C 00000000 */ nop -.L80241380: -/* 8534F0 80241380 0000182D */ daddu $v1, $zero, $zero -/* 8534F4 80241384 0040282D */ daddu $a1, $v0, $zero -/* 8534F8 80241388 0220202D */ daddu $a0, $s1, $zero -.L8024138C: -/* 8534FC 8024138C 8CA20000 */ lw $v0, ($a1) -/* 853500 80241390 24A50004 */ addiu $a1, $a1, 4 -/* 853504 80241394 24630001 */ addiu $v1, $v1, 1 -/* 853508 80241398 AC820084 */ sw $v0, 0x84($a0) -/* 85350C 8024139C 28620010 */ slti $v0, $v1, 0x10 -/* 853510 802413A0 1440FFFA */ bnez $v0, .L8024138C -/* 853514 802413A4 24840004 */ addiu $a0, $a0, 4 -/* 853518 802413A8 3C108024 */ lui $s0, 0x8024 -/* 85351C 802413AC 261050B0 */ addiu $s0, $s0, 0x50b0 -/* 853520 802413B0 0C00AB4B */ jal heap_free -/* 853524 802413B4 8E040000 */ lw $a0, ($s0) -/* 853528 802413B8 AE000000 */ sw $zero, ($s0) -.L802413BC: -/* 85352C 802413BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 853530 802413C0 8FB10014 */ lw $s1, 0x14($sp) -/* 853534 802413C4 8FB00010 */ lw $s0, 0x10($sp) -/* 853538 802413C8 24020002 */ addiu $v0, $zero, 2 -/* 85353C 802413CC 03E00008 */ jr $ra -/* 853540 802413D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s new file mode 100644 index 0000000000..ce1b039188 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241320_853490.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241320_853490 +/* 853490 80241320 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 853494 80241324 AFB00010 */ sw $s0, 0x10($sp) +/* 853498 80241328 3C108024 */ lui $s0, 0x8024 +/* 85349C 8024132C 261050B0 */ addiu $s0, $s0, 0x50b0 +/* 8534A0 80241330 AFBF0018 */ sw $ra, 0x18($sp) +/* 8534A4 80241334 AFB10014 */ sw $s1, 0x14($sp) +/* 8534A8 80241338 8E020000 */ lw $v0, ($s0) +/* 8534AC 8024133C 14400010 */ bnez $v0, .L80241380 +/* 8534B0 80241340 0080882D */ daddu $s1, $a0, $zero +/* 8534B4 80241344 0C00AB39 */ jal heap_malloc +/* 8534B8 80241348 24040040 */ addiu $a0, $zero, 0x40 +/* 8534BC 8024134C AE020000 */ sw $v0, ($s0) +/* 8534C0 80241350 0000182D */ daddu $v1, $zero, $zero +/* 8534C4 80241354 0040282D */ daddu $a1, $v0, $zero +/* 8534C8 80241358 0220202D */ daddu $a0, $s1, $zero +.L8024135C: +/* 8534CC 8024135C 8C820084 */ lw $v0, 0x84($a0) +/* 8534D0 80241360 24840004 */ addiu $a0, $a0, 4 +/* 8534D4 80241364 24630001 */ addiu $v1, $v1, 1 +/* 8534D8 80241368 ACA20000 */ sw $v0, ($a1) +/* 8534DC 8024136C 28620010 */ slti $v0, $v1, 0x10 +/* 8534E0 80241370 1440FFFA */ bnez $v0, .L8024135C +/* 8534E4 80241374 24A50004 */ addiu $a1, $a1, 4 +/* 8534E8 80241378 080904EF */ j .L802413BC +/* 8534EC 8024137C 00000000 */ nop +.L80241380: +/* 8534F0 80241380 0000182D */ daddu $v1, $zero, $zero +/* 8534F4 80241384 0040282D */ daddu $a1, $v0, $zero +/* 8534F8 80241388 0220202D */ daddu $a0, $s1, $zero +.L8024138C: +/* 8534FC 8024138C 8CA20000 */ lw $v0, ($a1) +/* 853500 80241390 24A50004 */ addiu $a1, $a1, 4 +/* 853504 80241394 24630001 */ addiu $v1, $v1, 1 +/* 853508 80241398 AC820084 */ sw $v0, 0x84($a0) +/* 85350C 8024139C 28620010 */ slti $v0, $v1, 0x10 +/* 853510 802413A0 1440FFFA */ bnez $v0, .L8024138C +/* 853514 802413A4 24840004 */ addiu $a0, $a0, 4 +/* 853518 802413A8 3C108024 */ lui $s0, 0x8024 +/* 85351C 802413AC 261050B0 */ addiu $s0, $s0, 0x50b0 +/* 853520 802413B0 0C00AB4B */ jal heap_free +/* 853524 802413B4 8E040000 */ lw $a0, ($s0) +/* 853528 802413B8 AE000000 */ sw $zero, ($s0) +.L802413BC: +/* 85352C 802413BC 8FBF0018 */ lw $ra, 0x18($sp) +/* 853530 802413C0 8FB10014 */ lw $s1, 0x14($sp) +/* 853534 802413C4 8FB00010 */ lw $s0, 0x10($sp) +/* 853538 802413C8 24020002 */ addiu $v0, $zero, 2 +/* 85353C 802413CC 03E00008 */ jr $ra +/* 853540 802413D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438.s deleted file mode 100644 index fc55459d24..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241438 -/* 8535A8 80241438 24020001 */ addiu $v0, $zero, 1 -/* 8535AC 8024143C 3C018015 */ lui $at, %hi(D_80151310) -/* 8535B0 80241440 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 8535B4 80241444 03E00008 */ jr $ra -/* 8535B8 80241448 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s new file mode 100644 index 0000000000..7bfa348ac9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241438_8535A8 +/* 8535A8 80241438 24020001 */ addiu $v0, $zero, 1 +/* 8535AC 8024143C 3C018015 */ lui $at, %hi(D_80151310) +/* 8535B0 80241440 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* 8535B4 80241444 03E00008 */ jr $ra +/* 8535B8 80241448 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C.s deleted file mode 100644 index fb5ec08f86..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024145C -/* 8535CC 8024145C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8535D0 80241460 AFB10024 */ sw $s1, 0x24($sp) -/* 8535D4 80241464 0080882D */ daddu $s1, $a0, $zero -/* 8535D8 80241468 3C05F840 */ lui $a1, 0xf840 -/* 8535DC 8024146C AFBF0044 */ sw $ra, 0x44($sp) -/* 8535E0 80241470 AFBE0040 */ sw $fp, 0x40($sp) -/* 8535E4 80241474 AFB7003C */ sw $s7, 0x3c($sp) -/* 8535E8 80241478 AFB60038 */ sw $s6, 0x38($sp) -/* 8535EC 8024147C AFB50034 */ sw $s5, 0x34($sp) -/* 8535F0 80241480 AFB40030 */ sw $s4, 0x30($sp) -/* 8535F4 80241484 AFB3002C */ sw $s3, 0x2c($sp) -/* 8535F8 80241488 AFB20028 */ sw $s2, 0x28($sp) -/* 8535FC 8024148C AFB00020 */ sw $s0, 0x20($sp) -/* 853600 80241490 8E3E0148 */ lw $fp, 0x148($s1) -/* 853604 80241494 0C0B1EAF */ jal get_variable -/* 853608 80241498 34A56268 */ ori $a1, $a1, 0x6268 -/* 85360C 8024149C 0040802D */ daddu $s0, $v0, $zero -/* 853610 802414A0 0220202D */ daddu $a0, $s1, $zero -/* 853614 802414A4 3C05F840 */ lui $a1, 0xf840 -/* 853618 802414A8 0C0B1EAF */ jal get_variable -/* 85361C 802414AC 34A56269 */ ori $a1, $a1, 0x6269 -/* 853620 802414B0 0040B82D */ daddu $s7, $v0, $zero -/* 853624 802414B4 0220202D */ daddu $a0, $s1, $zero -/* 853628 802414B8 3C05F5DE */ lui $a1, 0xf5de -/* 85362C 802414BC 0C0B1EAF */ jal get_variable -/* 853630 802414C0 34A502DE */ ori $a1, $a1, 0x2de -/* 853634 802414C4 0040B02D */ daddu $s6, $v0, $zero -/* 853638 802414C8 0220202D */ daddu $a0, $s1, $zero -/* 85363C 802414CC 3C05F5DE */ lui $a1, 0xf5de -/* 853640 802414D0 0C0B1EAF */ jal get_variable -/* 853644 802414D4 34A502DF */ ori $a1, $a1, 0x2df -/* 853648 802414D8 0040A82D */ daddu $s5, $v0, $zero -/* 85364C 802414DC 93D3006D */ lbu $s3, 0x6d($fp) -/* 853650 802414E0 32C2FFFF */ andi $v0, $s6, 0xffff -/* 853654 802414E4 A7B30010 */ sh $s3, 0x10($sp) -/* 853658 802414E8 93D2006E */ lbu $s2, 0x6e($fp) -/* 85365C 802414EC 93C7006F */ lbu $a3, 0x6f($fp) -/* 853660 802414F0 3274FFFF */ andi $s4, $s3, 0xffff -/* 853664 802414F4 12820003 */ beq $s4, $v0, .L80241504 -/* 853668 802414F8 A7A7001E */ sh $a3, 0x1e($sp) -/* 85366C 802414FC 0000B82D */ daddu $s7, $zero, $zero -/* 853670 80241500 02E0802D */ daddu $s0, $s7, $zero -.L80241504: -/* 853674 80241504 3202FFFF */ andi $v0, $s0, 0xffff -/* 853678 80241508 14400016 */ bnez $v0, .L80241564 -/* 85367C 8024150C 0220202D */ daddu $a0, $s1, $zero -/* 853680 80241510 0C00A67F */ jal rand_int -/* 853684 80241514 24040064 */ addiu $a0, $zero, 0x64 -/* 853688 80241518 2842001E */ slti $v0, $v0, 0x1e -/* 85368C 8024151C 10400011 */ beqz $v0, .L80241564 -/* 853690 80241520 0220202D */ daddu $a0, $s1, $zero -/* 853694 80241524 0C00A67F */ jal rand_int -/* 853698 80241528 2644FFFF */ addiu $a0, $s2, -1 -/* 85369C 8024152C 0040A82D */ daddu $s5, $v0, $zero -/* 8536A0 80241530 0260B02D */ daddu $s6, $s3, $zero -/* 8536A4 80241534 0220202D */ daddu $a0, $s1, $zero -/* 8536A8 80241538 3C05F5DE */ lui $a1, 0xf5de -/* 8536AC 8024153C 34A502DE */ ori $a1, $a1, 0x2de -/* 8536B0 80241540 0C0B2026 */ jal set_variable -/* 8536B4 80241544 0280302D */ daddu $a2, $s4, $zero -/* 8536B8 80241548 0220202D */ daddu $a0, $s1, $zero -/* 8536BC 8024154C 3C05F5DE */ lui $a1, 0xf5de -/* 8536C0 80241550 34A502DF */ ori $a1, $a1, 0x2df -/* 8536C4 80241554 0C0B2026 */ jal set_variable -/* 8536C8 80241558 32A6FFFF */ andi $a2, $s5, 0xffff -/* 8536CC 8024155C 24100001 */ addiu $s0, $zero, 1 -/* 8536D0 80241560 0220202D */ daddu $a0, $s1, $zero -.L80241564: -/* 8536D4 80241564 3C05F840 */ lui $a1, 0xf840 -/* 8536D8 80241568 34A56268 */ ori $a1, $a1, 0x6268 -/* 8536DC 8024156C 0C0B2026 */ jal set_variable -/* 8536E0 80241570 3206FFFF */ andi $a2, $s0, 0xffff -/* 8536E4 80241574 0220202D */ daddu $a0, $s1, $zero -/* 8536E8 80241578 3C05F840 */ lui $a1, 0xf840 -/* 8536EC 8024157C 34A56269 */ ori $a1, $a1, 0x6269 -/* 8536F0 80241580 0C0B2026 */ jal set_variable -/* 8536F4 80241584 32E6FFFF */ andi $a2, $s7, 0xffff -/* 8536F8 80241588 0000202D */ daddu $a0, $zero, $zero -/* 8536FC 8024158C 3C05F5DE */ lui $a1, 0xf5de -/* 853700 80241590 0C0B1EAF */ jal get_variable -/* 853704 80241594 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 853708 80241598 0000202D */ daddu $a0, $zero, $zero -/* 85370C 8024159C 3C05F5DE */ lui $a1, 0xf5de -/* 853710 802415A0 34A50180 */ ori $a1, $a1, 0x180 -/* 853714 802415A4 0C0B1EAF */ jal get_variable -/* 853718 802415A8 0040802D */ daddu $s0, $v0, $zero -/* 85371C 802415AC 0040282D */ daddu $a1, $v0, $zero -/* 853720 802415B0 0000182D */ daddu $v1, $zero, $zero -/* 853724 802415B4 3C068024 */ lui $a2, 0x8024 -/* 853728 802415B8 24C65154 */ addiu $a2, $a2, 0x5154 -/* 85372C 802415BC 00C0202D */ daddu $a0, $a2, $zero -.L802415C0: -/* 853730 802415C0 8C820000 */ lw $v0, ($a0) -/* 853734 802415C4 00A2102A */ slt $v0, $a1, $v0 -/* 853738 802415C8 14400006 */ bnez $v0, .L802415E4 -/* 85373C 802415CC 000310C0 */ sll $v0, $v1, 3 -/* 853740 802415D0 24630001 */ addiu $v1, $v1, 1 -/* 853744 802415D4 28620008 */ slti $v0, $v1, 8 -/* 853748 802415D8 1440FFF9 */ bnez $v0, .L802415C0 -/* 85374C 802415DC 24840008 */ addiu $a0, $a0, 8 -/* 853750 802415E0 000310C0 */ sll $v0, $v1, 3 -.L802415E4: -/* 853754 802415E4 00461021 */ addu $v0, $v0, $a2 -/* 853758 802415E8 8C420004 */ lw $v0, 4($v0) -/* 85375C 802415EC 97A30010 */ lhu $v1, 0x10($sp) -/* 853760 802415F0 0202202A */ slt $a0, $s0, $v0 -/* 853764 802415F4 32C2FFFF */ andi $v0, $s6, 0xffff -/* 853768 802415F8 14620008 */ bne $v1, $v0, .L8024161C -/* 85376C 802415FC 32A2FFFF */ andi $v0, $s5, 0xffff -/* 853770 80241600 97A7001E */ lhu $a3, 0x1e($sp) -/* 853774 80241604 14E20005 */ bne $a3, $v0, .L8024161C -/* 853778 80241608 32E2FFFF */ andi $v0, $s7, 0xffff -/* 85377C 8024160C 14400003 */ bnez $v0, .L8024161C -/* 853780 80241610 00000000 */ nop -/* 853784 80241614 14800008 */ bnez $a0, .L80241638 -/* 853788 80241618 24020001 */ addiu $v0, $zero, 1 -.L8024161C: -/* 85378C 8024161C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 853790 80241620 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 853794 80241624 80420075 */ lb $v0, 0x75($v0) -/* 853798 80241628 10400005 */ beqz $v0, .L80241640 -/* 85379C 8024162C 00000000 */ nop -/* 8537A0 80241630 10800003 */ beqz $a0, .L80241640 -/* 8537A4 80241634 24020001 */ addiu $v0, $zero, 1 -.L80241638: -/* 8537A8 80241638 08090593 */ j .L8024164C -/* 8537AC 8024163C AE220084 */ sw $v0, 0x84($s1) -.L80241640: -/* 8537B0 80241640 0C00F9EB */ jal kill_enemy -/* 8537B4 80241644 03C0202D */ daddu $a0, $fp, $zero -/* 8537B8 80241648 AE200084 */ sw $zero, 0x84($s1) -.L8024164C: -/* 8537BC 8024164C 8FBF0044 */ lw $ra, 0x44($sp) -/* 8537C0 80241650 8FBE0040 */ lw $fp, 0x40($sp) -/* 8537C4 80241654 8FB7003C */ lw $s7, 0x3c($sp) -/* 8537C8 80241658 8FB60038 */ lw $s6, 0x38($sp) -/* 8537CC 8024165C 8FB50034 */ lw $s5, 0x34($sp) -/* 8537D0 80241660 8FB40030 */ lw $s4, 0x30($sp) -/* 8537D4 80241664 8FB3002C */ lw $s3, 0x2c($sp) -/* 8537D8 80241668 8FB20028 */ lw $s2, 0x28($sp) -/* 8537DC 8024166C 8FB10024 */ lw $s1, 0x24($sp) -/* 8537E0 80241670 8FB00020 */ lw $s0, 0x20($sp) -/* 8537E4 80241674 24020002 */ addiu $v0, $zero, 2 -/* 8537E8 80241678 03E00008 */ jr $ra -/* 8537EC 8024167C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s new file mode 100644 index 0000000000..bbdb778167 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024145C_8535CC.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024145C_8535CC +/* 8535CC 8024145C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8535D0 80241460 AFB10024 */ sw $s1, 0x24($sp) +/* 8535D4 80241464 0080882D */ daddu $s1, $a0, $zero +/* 8535D8 80241468 3C05F840 */ lui $a1, 0xf840 +/* 8535DC 8024146C AFBF0044 */ sw $ra, 0x44($sp) +/* 8535E0 80241470 AFBE0040 */ sw $fp, 0x40($sp) +/* 8535E4 80241474 AFB7003C */ sw $s7, 0x3c($sp) +/* 8535E8 80241478 AFB60038 */ sw $s6, 0x38($sp) +/* 8535EC 8024147C AFB50034 */ sw $s5, 0x34($sp) +/* 8535F0 80241480 AFB40030 */ sw $s4, 0x30($sp) +/* 8535F4 80241484 AFB3002C */ sw $s3, 0x2c($sp) +/* 8535F8 80241488 AFB20028 */ sw $s2, 0x28($sp) +/* 8535FC 8024148C AFB00020 */ sw $s0, 0x20($sp) +/* 853600 80241490 8E3E0148 */ lw $fp, 0x148($s1) +/* 853604 80241494 0C0B1EAF */ jal get_variable +/* 853608 80241498 34A56268 */ ori $a1, $a1, 0x6268 +/* 85360C 8024149C 0040802D */ daddu $s0, $v0, $zero +/* 853610 802414A0 0220202D */ daddu $a0, $s1, $zero +/* 853614 802414A4 3C05F840 */ lui $a1, 0xf840 +/* 853618 802414A8 0C0B1EAF */ jal get_variable +/* 85361C 802414AC 34A56269 */ ori $a1, $a1, 0x6269 +/* 853620 802414B0 0040B82D */ daddu $s7, $v0, $zero +/* 853624 802414B4 0220202D */ daddu $a0, $s1, $zero +/* 853628 802414B8 3C05F5DE */ lui $a1, 0xf5de +/* 85362C 802414BC 0C0B1EAF */ jal get_variable +/* 853630 802414C0 34A502DE */ ori $a1, $a1, 0x2de +/* 853634 802414C4 0040B02D */ daddu $s6, $v0, $zero +/* 853638 802414C8 0220202D */ daddu $a0, $s1, $zero +/* 85363C 802414CC 3C05F5DE */ lui $a1, 0xf5de +/* 853640 802414D0 0C0B1EAF */ jal get_variable +/* 853644 802414D4 34A502DF */ ori $a1, $a1, 0x2df +/* 853648 802414D8 0040A82D */ daddu $s5, $v0, $zero +/* 85364C 802414DC 93D3006D */ lbu $s3, 0x6d($fp) +/* 853650 802414E0 32C2FFFF */ andi $v0, $s6, 0xffff +/* 853654 802414E4 A7B30010 */ sh $s3, 0x10($sp) +/* 853658 802414E8 93D2006E */ lbu $s2, 0x6e($fp) +/* 85365C 802414EC 93C7006F */ lbu $a3, 0x6f($fp) +/* 853660 802414F0 3274FFFF */ andi $s4, $s3, 0xffff +/* 853664 802414F4 12820003 */ beq $s4, $v0, .L80241504 +/* 853668 802414F8 A7A7001E */ sh $a3, 0x1e($sp) +/* 85366C 802414FC 0000B82D */ daddu $s7, $zero, $zero +/* 853670 80241500 02E0802D */ daddu $s0, $s7, $zero +.L80241504: +/* 853674 80241504 3202FFFF */ andi $v0, $s0, 0xffff +/* 853678 80241508 14400016 */ bnez $v0, .L80241564 +/* 85367C 8024150C 0220202D */ daddu $a0, $s1, $zero +/* 853680 80241510 0C00A67F */ jal rand_int +/* 853684 80241514 24040064 */ addiu $a0, $zero, 0x64 +/* 853688 80241518 2842001E */ slti $v0, $v0, 0x1e +/* 85368C 8024151C 10400011 */ beqz $v0, .L80241564 +/* 853690 80241520 0220202D */ daddu $a0, $s1, $zero +/* 853694 80241524 0C00A67F */ jal rand_int +/* 853698 80241528 2644FFFF */ addiu $a0, $s2, -1 +/* 85369C 8024152C 0040A82D */ daddu $s5, $v0, $zero +/* 8536A0 80241530 0260B02D */ daddu $s6, $s3, $zero +/* 8536A4 80241534 0220202D */ daddu $a0, $s1, $zero +/* 8536A8 80241538 3C05F5DE */ lui $a1, 0xf5de +/* 8536AC 8024153C 34A502DE */ ori $a1, $a1, 0x2de +/* 8536B0 80241540 0C0B2026 */ jal set_variable +/* 8536B4 80241544 0280302D */ daddu $a2, $s4, $zero +/* 8536B8 80241548 0220202D */ daddu $a0, $s1, $zero +/* 8536BC 8024154C 3C05F5DE */ lui $a1, 0xf5de +/* 8536C0 80241550 34A502DF */ ori $a1, $a1, 0x2df +/* 8536C4 80241554 0C0B2026 */ jal set_variable +/* 8536C8 80241558 32A6FFFF */ andi $a2, $s5, 0xffff +/* 8536CC 8024155C 24100001 */ addiu $s0, $zero, 1 +/* 8536D0 80241560 0220202D */ daddu $a0, $s1, $zero +.L80241564: +/* 8536D4 80241564 3C05F840 */ lui $a1, 0xf840 +/* 8536D8 80241568 34A56268 */ ori $a1, $a1, 0x6268 +/* 8536DC 8024156C 0C0B2026 */ jal set_variable +/* 8536E0 80241570 3206FFFF */ andi $a2, $s0, 0xffff +/* 8536E4 80241574 0220202D */ daddu $a0, $s1, $zero +/* 8536E8 80241578 3C05F840 */ lui $a1, 0xf840 +/* 8536EC 8024157C 34A56269 */ ori $a1, $a1, 0x6269 +/* 8536F0 80241580 0C0B2026 */ jal set_variable +/* 8536F4 80241584 32E6FFFF */ andi $a2, $s7, 0xffff +/* 8536F8 80241588 0000202D */ daddu $a0, $zero, $zero +/* 8536FC 8024158C 3C05F5DE */ lui $a1, 0xf5de +/* 853700 80241590 0C0B1EAF */ jal get_variable +/* 853704 80241594 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 853708 80241598 0000202D */ daddu $a0, $zero, $zero +/* 85370C 8024159C 3C05F5DE */ lui $a1, 0xf5de +/* 853710 802415A0 34A50180 */ ori $a1, $a1, 0x180 +/* 853714 802415A4 0C0B1EAF */ jal get_variable +/* 853718 802415A8 0040802D */ daddu $s0, $v0, $zero +/* 85371C 802415AC 0040282D */ daddu $a1, $v0, $zero +/* 853720 802415B0 0000182D */ daddu $v1, $zero, $zero +/* 853724 802415B4 3C068024 */ lui $a2, 0x8024 +/* 853728 802415B8 24C65154 */ addiu $a2, $a2, 0x5154 +/* 85372C 802415BC 00C0202D */ daddu $a0, $a2, $zero +.L802415C0: +/* 853730 802415C0 8C820000 */ lw $v0, ($a0) +/* 853734 802415C4 00A2102A */ slt $v0, $a1, $v0 +/* 853738 802415C8 14400006 */ bnez $v0, .L802415E4 +/* 85373C 802415CC 000310C0 */ sll $v0, $v1, 3 +/* 853740 802415D0 24630001 */ addiu $v1, $v1, 1 +/* 853744 802415D4 28620008 */ slti $v0, $v1, 8 +/* 853748 802415D8 1440FFF9 */ bnez $v0, .L802415C0 +/* 85374C 802415DC 24840008 */ addiu $a0, $a0, 8 +/* 853750 802415E0 000310C0 */ sll $v0, $v1, 3 +.L802415E4: +/* 853754 802415E4 00461021 */ addu $v0, $v0, $a2 +/* 853758 802415E8 8C420004 */ lw $v0, 4($v0) +/* 85375C 802415EC 97A30010 */ lhu $v1, 0x10($sp) +/* 853760 802415F0 0202202A */ slt $a0, $s0, $v0 +/* 853764 802415F4 32C2FFFF */ andi $v0, $s6, 0xffff +/* 853768 802415F8 14620008 */ bne $v1, $v0, .L8024161C +/* 85376C 802415FC 32A2FFFF */ andi $v0, $s5, 0xffff +/* 853770 80241600 97A7001E */ lhu $a3, 0x1e($sp) +/* 853774 80241604 14E20005 */ bne $a3, $v0, .L8024161C +/* 853778 80241608 32E2FFFF */ andi $v0, $s7, 0xffff +/* 85377C 8024160C 14400003 */ bnez $v0, .L8024161C +/* 853780 80241610 00000000 */ nop +/* 853784 80241614 14800008 */ bnez $a0, .L80241638 +/* 853788 80241618 24020001 */ addiu $v0, $zero, 1 +.L8024161C: +/* 85378C 8024161C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 853790 80241620 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 853794 80241624 80420075 */ lb $v0, 0x75($v0) +/* 853798 80241628 10400005 */ beqz $v0, .L80241640 +/* 85379C 8024162C 00000000 */ nop +/* 8537A0 80241630 10800003 */ beqz $a0, .L80241640 +/* 8537A4 80241634 24020001 */ addiu $v0, $zero, 1 +.L80241638: +/* 8537A8 80241638 08090593 */ j .L8024164C +/* 8537AC 8024163C AE220084 */ sw $v0, 0x84($s1) +.L80241640: +/* 8537B0 80241640 0C00F9EB */ jal kill_enemy +/* 8537B4 80241644 03C0202D */ daddu $a0, $fp, $zero +/* 8537B8 80241648 AE200084 */ sw $zero, 0x84($s1) +.L8024164C: +/* 8537BC 8024164C 8FBF0044 */ lw $ra, 0x44($sp) +/* 8537C0 80241650 8FBE0040 */ lw $fp, 0x40($sp) +/* 8537C4 80241654 8FB7003C */ lw $s7, 0x3c($sp) +/* 8537C8 80241658 8FB60038 */ lw $s6, 0x38($sp) +/* 8537CC 8024165C 8FB50034 */ lw $s5, 0x34($sp) +/* 8537D0 80241660 8FB40030 */ lw $s4, 0x30($sp) +/* 8537D4 80241664 8FB3002C */ lw $s3, 0x2c($sp) +/* 8537D8 80241668 8FB20028 */ lw $s2, 0x28($sp) +/* 8537DC 8024166C 8FB10024 */ lw $s1, 0x24($sp) +/* 8537E0 80241670 8FB00020 */ lw $s0, 0x20($sp) +/* 8537E4 80241674 24020002 */ addiu $v0, $zero, 2 +/* 8537E8 80241678 03E00008 */ jr $ra +/* 8537EC 8024167C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680.s deleted file mode 100644 index 1866d79a16..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241680 -/* 8537F0 80241680 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8537F4 80241684 AFBF0014 */ sw $ra, 0x14($sp) -/* 8537F8 80241688 AFB00010 */ sw $s0, 0x10($sp) -/* 8537FC 8024168C 0C00EABB */ jal get_npc_unsafe -/* 853800 80241690 8C84014C */ lw $a0, 0x14c($a0) -/* 853804 80241694 24040008 */ addiu $a0, $zero, 8 -/* 853808 80241698 0040802D */ daddu $s0, $v0, $zero -/* 85380C 8024169C 3C028024 */ lui $v0, 0x8024 -/* 853810 802416A0 244216EC */ addiu $v0, $v0, 0x16ec -/* 853814 802416A4 0C00AB39 */ jal heap_malloc -/* 853818 802416A8 AE020008 */ sw $v0, 8($s0) -/* 85381C 802416AC 0040182D */ daddu $v1, $v0, $zero -/* 853820 802416B0 AE030020 */ sw $v1, 0x20($s0) -/* 853824 802416B4 AC600000 */ sw $zero, ($v1) -/* 853828 802416B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 85382C 802416BC 8FB00010 */ lw $s0, 0x10($sp) -/* 853830 802416C0 24020001 */ addiu $v0, $zero, 1 -/* 853834 802416C4 03E00008 */ jr $ra -/* 853838 802416C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s new file mode 100644 index 0000000000..16e8f86150 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241680_8537F0.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241680_8537F0 +/* 8537F0 80241680 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8537F4 80241684 AFBF0014 */ sw $ra, 0x14($sp) +/* 8537F8 80241688 AFB00010 */ sw $s0, 0x10($sp) +/* 8537FC 8024168C 0C00EABB */ jal get_npc_unsafe +/* 853800 80241690 8C84014C */ lw $a0, 0x14c($a0) +/* 853804 80241694 24040008 */ addiu $a0, $zero, 8 +/* 853808 80241698 0040802D */ daddu $s0, $v0, $zero +/* 85380C 8024169C 3C028024 */ lui $v0, 0x8024 +/* 853810 802416A0 244216EC */ addiu $v0, $v0, 0x16ec +/* 853814 802416A4 0C00AB39 */ jal heap_malloc +/* 853818 802416A8 AE020008 */ sw $v0, 8($s0) +/* 85381C 802416AC 0040182D */ daddu $v1, $v0, $zero +/* 853820 802416B0 AE030020 */ sw $v1, 0x20($s0) +/* 853824 802416B4 AC600000 */ sw $zero, ($v1) +/* 853828 802416B8 8FBF0014 */ lw $ra, 0x14($sp) +/* 85382C 802416BC 8FB00010 */ lw $s0, 0x10($sp) +/* 853830 802416C0 24020001 */ addiu $v0, $zero, 1 +/* 853834 802416C4 03E00008 */ jr $ra +/* 853838 802416C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC.s deleted file mode 100644 index 15c6517e8f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416CC -/* 85383C 802416CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 853840 802416D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 853844 802416D4 0C00EABB */ jal get_npc_unsafe -/* 853848 802416D8 8C84014C */ lw $a0, 0x14c($a0) -/* 85384C 802416DC 8FBF0010 */ lw $ra, 0x10($sp) -/* 853850 802416E0 0000102D */ daddu $v0, $zero, $zero -/* 853854 802416E4 03E00008 */ jr $ra -/* 853858 802416E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s new file mode 100644 index 0000000000..2b150ccfd3 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416CC_85383C +/* 85383C 802416CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 853840 802416D0 AFBF0010 */ sw $ra, 0x10($sp) +/* 853844 802416D4 0C00EABB */ jal get_npc_unsafe +/* 853848 802416D8 8C84014C */ lw $a0, 0x14c($a0) +/* 85384C 802416DC 8FBF0010 */ lw $ra, 0x10($sp) +/* 853850 802416E0 0000102D */ daddu $v0, $zero, $zero +/* 853854 802416E4 03E00008 */ jr $ra +/* 853858 802416E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC.s deleted file mode 100644 index 6e3f915cb3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416EC -/* 85385C 802416EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 853860 802416F0 3C03800A */ lui $v1, 0x800a -/* 853864 802416F4 8463A634 */ lh $v1, -0x59cc($v1) -/* 853868 802416F8 3C05800B */ lui $a1, %hi(gCameras) -/* 85386C 802416FC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 853870 80241700 AFBF0010 */ sw $ra, 0x10($sp) -/* 853874 80241704 00031080 */ sll $v0, $v1, 2 -/* 853878 80241708 00431021 */ addu $v0, $v0, $v1 -/* 85387C 8024170C 00021080 */ sll $v0, $v0, 2 -/* 853880 80241710 00431023 */ subu $v0, $v0, $v1 -/* 853884 80241714 000218C0 */ sll $v1, $v0, 3 -/* 853888 80241718 00431021 */ addu $v0, $v0, $v1 -/* 85388C 8024171C 8C830020 */ lw $v1, 0x20($a0) -/* 853890 80241720 000210C0 */ sll $v0, $v0, 3 -/* 853894 80241724 8C630000 */ lw $v1, ($v1) -/* 853898 80241728 30630001 */ andi $v1, $v1, 1 -/* 85389C 8024172C 10600004 */ beqz $v1, .L80241740 -/* 8538A0 80241730 00451021 */ addu $v0, $v0, $a1 -/* 8538A4 80241734 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 8538A8 80241738 0C00A6C9 */ jal clamp_angle -/* 8538AC 8024173C 46006307 */ neg.s $f12, $f12 -.L80241740: -/* 8538B0 80241740 8FBF0010 */ lw $ra, 0x10($sp) -/* 8538B4 80241744 03E00008 */ jr $ra -/* 8538B8 80241748 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s new file mode 100644 index 0000000000..30e22a0f62 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416EC_85385C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416EC_85385C +/* 85385C 802416EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 853860 802416F0 3C03800A */ lui $v1, 0x800a +/* 853864 802416F4 8463A634 */ lh $v1, -0x59cc($v1) +/* 853868 802416F8 3C05800B */ lui $a1, %hi(gCameras) +/* 85386C 802416FC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 853870 80241700 AFBF0010 */ sw $ra, 0x10($sp) +/* 853874 80241704 00031080 */ sll $v0, $v1, 2 +/* 853878 80241708 00431021 */ addu $v0, $v0, $v1 +/* 85387C 8024170C 00021080 */ sll $v0, $v0, 2 +/* 853880 80241710 00431023 */ subu $v0, $v0, $v1 +/* 853884 80241714 000218C0 */ sll $v1, $v0, 3 +/* 853888 80241718 00431021 */ addu $v0, $v0, $v1 +/* 85388C 8024171C 8C830020 */ lw $v1, 0x20($a0) +/* 853890 80241720 000210C0 */ sll $v0, $v0, 3 +/* 853894 80241724 8C630000 */ lw $v1, ($v1) +/* 853898 80241728 30630001 */ andi $v1, $v1, 1 +/* 85389C 8024172C 10600004 */ beqz $v1, .L80241740 +/* 8538A0 80241730 00451021 */ addu $v0, $v0, $a1 +/* 8538A4 80241734 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 8538A8 80241738 0C00A6C9 */ jal clamp_angle +/* 8538AC 8024173C 46006307 */ neg.s $f12, $f12 +.L80241740: +/* 8538B0 80241740 8FBF0010 */ lw $ra, 0x10($sp) +/* 8538B4 80241744 03E00008 */ jr $ra +/* 8538B8 80241748 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C.s deleted file mode 100644 index 62d38393d4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024174C -/* 8538BC 8024174C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8538C0 80241750 AFB10014 */ sw $s1, 0x14($sp) -/* 8538C4 80241754 0080882D */ daddu $s1, $a0, $zero -/* 8538C8 80241758 AFBF0024 */ sw $ra, 0x24($sp) -/* 8538CC 8024175C AFB40020 */ sw $s4, 0x20($sp) -/* 8538D0 80241760 AFB3001C */ sw $s3, 0x1c($sp) -/* 8538D4 80241764 AFB20018 */ sw $s2, 0x18($sp) -/* 8538D8 80241768 10A00033 */ beqz $a1, .L80241838 -/* 8538DC 8024176C AFB00010 */ sw $s0, 0x10($sp) -/* 8538E0 80241770 0C04760B */ jal func_8011D82C -/* 8538E4 80241774 24040001 */ addiu $a0, $zero, 1 -/* 8538E8 80241778 0000202D */ daddu $a0, $zero, $zero -/* 8538EC 8024177C 0080282D */ daddu $a1, $a0, $zero -/* 8538F0 80241780 0080302D */ daddu $a2, $a0, $zero -/* 8538F4 80241784 0080382D */ daddu $a3, $a0, $zero -/* 8538F8 80241788 0080802D */ daddu $s0, $a0, $zero -/* 8538FC 8024178C 2414FFFC */ addiu $s4, $zero, -4 -/* 853900 80241790 24130006 */ addiu $s3, $zero, 6 -/* 853904 80241794 3C120080 */ lui $s2, 0x80 -/* 853908 80241798 3C038015 */ lui $v1, 0x8015 -/* 85390C 8024179C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 853910 802417A0 24020001 */ addiu $v0, $zero, 1 -/* 853914 802417A4 0C046F97 */ jal set_background_color_blend -/* 853918 802417A8 A0620000 */ sb $v0, ($v1) -.L802417AC: -/* 85391C 802417AC 0C00E2B7 */ jal get_npc_by_index -/* 853920 802417B0 0200202D */ daddu $a0, $s0, $zero -/* 853924 802417B4 0040202D */ daddu $a0, $v0, $zero -/* 853928 802417B8 5080000B */ beql $a0, $zero, .L802417E8 -/* 85392C 802417BC 26100001 */ addiu $s0, $s0, 1 -/* 853930 802417C0 8C820000 */ lw $v0, ($a0) -/* 853934 802417C4 50400008 */ beql $v0, $zero, .L802417E8 -/* 853938 802417C8 26100001 */ addiu $s0, $s0, 1 -/* 85393C 802417CC 808300A4 */ lb $v1, 0xa4($a0) -/* 853940 802417D0 10740005 */ beq $v1, $s4, .L802417E8 -/* 853944 802417D4 26100001 */ addiu $s0, $s0, 1 -/* 853948 802417D8 10730003 */ beq $v1, $s3, .L802417E8 -/* 85394C 802417DC 00000000 */ nop -/* 853950 802417E0 00521025 */ or $v0, $v0, $s2 -/* 853954 802417E4 AC820000 */ sw $v0, ($a0) -.L802417E8: -/* 853958 802417E8 2A020040 */ slti $v0, $s0, 0x40 -/* 85395C 802417EC 1440FFEF */ bnez $v0, .L802417AC -/* 853960 802417F0 00000000 */ nop -/* 853964 802417F4 0000802D */ daddu $s0, $zero, $zero -/* 853968 802417F8 3C120800 */ lui $s2, 0x800 -.L802417FC: -/* 85396C 802417FC 0C04C3D6 */ jal get_item_entity -/* 853970 80241800 0200202D */ daddu $a0, $s0, $zero -/* 853974 80241804 0040182D */ daddu $v1, $v0, $zero -/* 853978 80241808 10600007 */ beqz $v1, .L80241828 -/* 85397C 8024180C 26100001 */ addiu $s0, $s0, 1 -/* 853980 80241810 8C640000 */ lw $a0, ($v1) -/* 853984 80241814 30820010 */ andi $v0, $a0, 0x10 -/* 853988 80241818 10400003 */ beqz $v0, .L80241828 -/* 85398C 8024181C 00000000 */ nop -/* 853990 80241820 00921025 */ or $v0, $a0, $s2 -/* 853994 80241824 AC620000 */ sw $v0, ($v1) -.L80241828: -/* 853998 80241828 2A020100 */ slti $v0, $s0, 0x100 -/* 85399C 8024182C 1440FFF3 */ bnez $v0, .L802417FC -/* 8539A0 80241830 00000000 */ nop -/* 8539A4 80241834 AE200070 */ sw $zero, 0x70($s1) -.L80241838: -/* 8539A8 80241838 8E220070 */ lw $v0, 0x70($s1) -/* 8539AC 8024183C 24420008 */ addiu $v0, $v0, 8 -/* 8539B0 80241840 AE220070 */ sw $v0, 0x70($s1) -/* 8539B4 80241844 28420100 */ slti $v0, $v0, 0x100 -/* 8539B8 80241848 14400003 */ bnez $v0, .L80241858 -/* 8539BC 8024184C 0000202D */ daddu $a0, $zero, $zero -/* 8539C0 80241850 240200FF */ addiu $v0, $zero, 0xff -/* 8539C4 80241854 AE220070 */ sw $v0, 0x70($s1) -.L80241858: -/* 8539C8 80241858 0080282D */ daddu $a1, $a0, $zero -/* 8539CC 8024185C 92270073 */ lbu $a3, 0x73($s1) -/* 8539D0 80241860 0C046F97 */ jal set_background_color_blend -/* 8539D4 80241864 0080302D */ daddu $a2, $a0, $zero -/* 8539D8 80241868 8E220070 */ lw $v0, 0x70($s1) -/* 8539DC 8024186C 8FBF0024 */ lw $ra, 0x24($sp) -/* 8539E0 80241870 8FB40020 */ lw $s4, 0x20($sp) -/* 8539E4 80241874 8FB3001C */ lw $s3, 0x1c($sp) -/* 8539E8 80241878 8FB20018 */ lw $s2, 0x18($sp) -/* 8539EC 8024187C 8FB10014 */ lw $s1, 0x14($sp) -/* 8539F0 80241880 8FB00010 */ lw $s0, 0x10($sp) -/* 8539F4 80241884 384200FF */ xori $v0, $v0, 0xff -/* 8539F8 80241888 2C420001 */ sltiu $v0, $v0, 1 -/* 8539FC 8024188C 00021040 */ sll $v0, $v0, 1 -/* 853A00 80241890 03E00008 */ jr $ra -/* 853A04 80241894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s new file mode 100644 index 0000000000..970b30afeb --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024174C_8538BC.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024174C_8538BC +/* 8538BC 8024174C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8538C0 80241750 AFB10014 */ sw $s1, 0x14($sp) +/* 8538C4 80241754 0080882D */ daddu $s1, $a0, $zero +/* 8538C8 80241758 AFBF0024 */ sw $ra, 0x24($sp) +/* 8538CC 8024175C AFB40020 */ sw $s4, 0x20($sp) +/* 8538D0 80241760 AFB3001C */ sw $s3, 0x1c($sp) +/* 8538D4 80241764 AFB20018 */ sw $s2, 0x18($sp) +/* 8538D8 80241768 10A00033 */ beqz $a1, .L80241838 +/* 8538DC 8024176C AFB00010 */ sw $s0, 0x10($sp) +/* 8538E0 80241770 0C04760B */ jal func_8011D82C +/* 8538E4 80241774 24040001 */ addiu $a0, $zero, 1 +/* 8538E8 80241778 0000202D */ daddu $a0, $zero, $zero +/* 8538EC 8024177C 0080282D */ daddu $a1, $a0, $zero +/* 8538F0 80241780 0080302D */ daddu $a2, $a0, $zero +/* 8538F4 80241784 0080382D */ daddu $a3, $a0, $zero +/* 8538F8 80241788 0080802D */ daddu $s0, $a0, $zero +/* 8538FC 8024178C 2414FFFC */ addiu $s4, $zero, -4 +/* 853900 80241790 24130006 */ addiu $s3, $zero, 6 +/* 853904 80241794 3C120080 */ lui $s2, 0x80 +/* 853908 80241798 3C038015 */ lui $v1, 0x8015 +/* 85390C 8024179C 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 853910 802417A0 24020001 */ addiu $v0, $zero, 1 +/* 853914 802417A4 0C046F97 */ jal set_background_color_blend +/* 853918 802417A8 A0620000 */ sb $v0, ($v1) +.L802417AC: +/* 85391C 802417AC 0C00E2B7 */ jal get_npc_by_index +/* 853920 802417B0 0200202D */ daddu $a0, $s0, $zero +/* 853924 802417B4 0040202D */ daddu $a0, $v0, $zero +/* 853928 802417B8 5080000B */ beql $a0, $zero, .L802417E8 +/* 85392C 802417BC 26100001 */ addiu $s0, $s0, 1 +/* 853930 802417C0 8C820000 */ lw $v0, ($a0) +/* 853934 802417C4 50400008 */ beql $v0, $zero, .L802417E8 +/* 853938 802417C8 26100001 */ addiu $s0, $s0, 1 +/* 85393C 802417CC 808300A4 */ lb $v1, 0xa4($a0) +/* 853940 802417D0 10740005 */ beq $v1, $s4, .L802417E8 +/* 853944 802417D4 26100001 */ addiu $s0, $s0, 1 +/* 853948 802417D8 10730003 */ beq $v1, $s3, .L802417E8 +/* 85394C 802417DC 00000000 */ nop +/* 853950 802417E0 00521025 */ or $v0, $v0, $s2 +/* 853954 802417E4 AC820000 */ sw $v0, ($a0) +.L802417E8: +/* 853958 802417E8 2A020040 */ slti $v0, $s0, 0x40 +/* 85395C 802417EC 1440FFEF */ bnez $v0, .L802417AC +/* 853960 802417F0 00000000 */ nop +/* 853964 802417F4 0000802D */ daddu $s0, $zero, $zero +/* 853968 802417F8 3C120800 */ lui $s2, 0x800 +.L802417FC: +/* 85396C 802417FC 0C04C3D6 */ jal get_item_entity +/* 853970 80241800 0200202D */ daddu $a0, $s0, $zero +/* 853974 80241804 0040182D */ daddu $v1, $v0, $zero +/* 853978 80241808 10600007 */ beqz $v1, .L80241828 +/* 85397C 8024180C 26100001 */ addiu $s0, $s0, 1 +/* 853980 80241810 8C640000 */ lw $a0, ($v1) +/* 853984 80241814 30820010 */ andi $v0, $a0, 0x10 +/* 853988 80241818 10400003 */ beqz $v0, .L80241828 +/* 85398C 8024181C 00000000 */ nop +/* 853990 80241820 00921025 */ or $v0, $a0, $s2 +/* 853994 80241824 AC620000 */ sw $v0, ($v1) +.L80241828: +/* 853998 80241828 2A020100 */ slti $v0, $s0, 0x100 +/* 85399C 8024182C 1440FFF3 */ bnez $v0, .L802417FC +/* 8539A0 80241830 00000000 */ nop +/* 8539A4 80241834 AE200070 */ sw $zero, 0x70($s1) +.L80241838: +/* 8539A8 80241838 8E220070 */ lw $v0, 0x70($s1) +/* 8539AC 8024183C 24420008 */ addiu $v0, $v0, 8 +/* 8539B0 80241840 AE220070 */ sw $v0, 0x70($s1) +/* 8539B4 80241844 28420100 */ slti $v0, $v0, 0x100 +/* 8539B8 80241848 14400003 */ bnez $v0, .L80241858 +/* 8539BC 8024184C 0000202D */ daddu $a0, $zero, $zero +/* 8539C0 80241850 240200FF */ addiu $v0, $zero, 0xff +/* 8539C4 80241854 AE220070 */ sw $v0, 0x70($s1) +.L80241858: +/* 8539C8 80241858 0080282D */ daddu $a1, $a0, $zero +/* 8539CC 8024185C 92270073 */ lbu $a3, 0x73($s1) +/* 8539D0 80241860 0C046F97 */ jal set_background_color_blend +/* 8539D4 80241864 0080302D */ daddu $a2, $a0, $zero +/* 8539D8 80241868 8E220070 */ lw $v0, 0x70($s1) +/* 8539DC 8024186C 8FBF0024 */ lw $ra, 0x24($sp) +/* 8539E0 80241870 8FB40020 */ lw $s4, 0x20($sp) +/* 8539E4 80241874 8FB3001C */ lw $s3, 0x1c($sp) +/* 8539E8 80241878 8FB20018 */ lw $s2, 0x18($sp) +/* 8539EC 8024187C 8FB10014 */ lw $s1, 0x14($sp) +/* 8539F0 80241880 8FB00010 */ lw $s0, 0x10($sp) +/* 8539F4 80241884 384200FF */ xori $v0, $v0, 0xff +/* 8539F8 80241888 2C420001 */ sltiu $v0, $v0, 1 +/* 8539FC 8024188C 00021040 */ sll $v0, $v0, 1 +/* 853A00 80241890 03E00008 */ jr $ra +/* 853A04 80241894 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C.s deleted file mode 100644 index debbbaf445..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A0C -/* 853B7C 80241A0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 853B80 80241A10 AFB00010 */ sw $s0, 0x10($sp) -/* 853B84 80241A14 3C108011 */ lui $s0, %hi(gPlayerData) -/* 853B88 80241A18 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 853B8C 80241A1C AFBF0018 */ sw $ra, 0x18($sp) -/* 853B90 80241A20 AFB10014 */ sw $s1, 0x14($sp) -/* 853B94 80241A24 960302C0 */ lhu $v1, 0x2c0($s0) -/* 853B98 80241A28 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 853B9C 80241A2C 10400003 */ beqz $v0, .L80241A3C -/* 853BA0 80241A30 0080882D */ daddu $s1, $a0, $zero -/* 853BA4 80241A34 24620001 */ addiu $v0, $v1, 1 -/* 853BA8 80241A38 A60202C0 */ sh $v0, 0x2c0($s0) -.L80241A3C: -/* 853BAC 80241A3C 3C05F5DE */ lui $a1, 0xf5de -/* 853BB0 80241A40 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 853BB4 80241A44 0C0B1EAF */ jal get_variable -/* 853BB8 80241A48 0000202D */ daddu $a0, $zero, $zero -/* 853BBC 80241A4C 3C038024 */ lui $v1, 0x8024 -/* 853BC0 80241A50 00621821 */ addu $v1, $v1, $v0 -/* 853BC4 80241A54 90635114 */ lbu $v1, 0x5114($v1) -/* 853BC8 80241A58 8E220084 */ lw $v0, 0x84($s1) -/* 853BCC 80241A5C 54430006 */ bnel $v0, $v1, .L80241A78 -/* 853BD0 80241A60 AE200084 */ sw $zero, 0x84($s1) -/* 853BD4 80241A64 24020001 */ addiu $v0, $zero, 1 -/* 853BD8 80241A68 AE220084 */ sw $v0, 0x84($s1) -/* 853BDC 80241A6C 960202C2 */ lhu $v0, 0x2c2($s0) -/* 853BE0 80241A70 24420001 */ addiu $v0, $v0, 1 -/* 853BE4 80241A74 A60202C2 */ sh $v0, 0x2c2($s0) -.L80241A78: -/* 853BE8 80241A78 8FBF0018 */ lw $ra, 0x18($sp) -/* 853BEC 80241A7C 8FB10014 */ lw $s1, 0x14($sp) -/* 853BF0 80241A80 8FB00010 */ lw $s0, 0x10($sp) -/* 853BF4 80241A84 24020002 */ addiu $v0, $zero, 2 -/* 853BF8 80241A88 03E00008 */ jr $ra -/* 853BFC 80241A8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C_853B7C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C_853B7C.s new file mode 100644 index 0000000000..78c9517d44 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A0C_853B7C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A0C_853B7C +/* 853B7C 80241A0C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 853B80 80241A10 AFB00010 */ sw $s0, 0x10($sp) +/* 853B84 80241A14 3C108011 */ lui $s0, %hi(gPlayerData) +/* 853B88 80241A18 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 853B8C 80241A1C AFBF0018 */ sw $ra, 0x18($sp) +/* 853B90 80241A20 AFB10014 */ sw $s1, 0x14($sp) +/* 853B94 80241A24 960302C0 */ lhu $v1, 0x2c0($s0) +/* 853B98 80241A28 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 853B9C 80241A2C 10400003 */ beqz $v0, .L80241A3C +/* 853BA0 80241A30 0080882D */ daddu $s1, $a0, $zero +/* 853BA4 80241A34 24620001 */ addiu $v0, $v1, 1 +/* 853BA8 80241A38 A60202C0 */ sh $v0, 0x2c0($s0) +.L80241A3C: +/* 853BAC 80241A3C 3C05F5DE */ lui $a1, 0xf5de +/* 853BB0 80241A40 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 853BB4 80241A44 0C0B1EAF */ jal get_variable +/* 853BB8 80241A48 0000202D */ daddu $a0, $zero, $zero +/* 853BBC 80241A4C 3C038024 */ lui $v1, 0x8024 +/* 853BC0 80241A50 00621821 */ addu $v1, $v1, $v0 +/* 853BC4 80241A54 90635114 */ lbu $v1, 0x5114($v1) +/* 853BC8 80241A58 8E220084 */ lw $v0, 0x84($s1) +/* 853BCC 80241A5C 54430006 */ bnel $v0, $v1, .L80241A78 +/* 853BD0 80241A60 AE200084 */ sw $zero, 0x84($s1) +/* 853BD4 80241A64 24020001 */ addiu $v0, $zero, 1 +/* 853BD8 80241A68 AE220084 */ sw $v0, 0x84($s1) +/* 853BDC 80241A6C 960202C2 */ lhu $v0, 0x2c2($s0) +/* 853BE0 80241A70 24420001 */ addiu $v0, $v0, 1 +/* 853BE4 80241A74 A60202C2 */ sh $v0, 0x2c2($s0) +.L80241A78: +/* 853BE8 80241A78 8FBF0018 */ lw $ra, 0x18($sp) +/* 853BEC 80241A7C 8FB10014 */ lw $s1, 0x14($sp) +/* 853BF0 80241A80 8FB00010 */ lw $s0, 0x10($sp) +/* 853BF4 80241A84 24020002 */ addiu $v0, $zero, 2 +/* 853BF8 80241A88 03E00008 */ jr $ra +/* 853BFC 80241A8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90.s deleted file mode 100644 index 84d429bb1b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A90 -/* 853C00 80241A90 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 853C04 80241A94 AFB1001C */ sw $s1, 0x1c($sp) -/* 853C08 80241A98 AFBF0020 */ sw $ra, 0x20($sp) -/* 853C0C 80241A9C AFB00018 */ sw $s0, 0x18($sp) -/* 853C10 80241AA0 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 853C14 80241AA4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 853C18 80241AA8 10A00060 */ beqz $a1, .L80241C2C -/* 853C1C 80241AAC 0080882D */ daddu $s1, $a0, $zero -/* 853C20 80241AB0 3C05F4AC */ lui $a1, 0xf4ac -/* 853C24 80241AB4 0C0B1EAF */ jal get_variable -/* 853C28 80241AB8 34A5D481 */ ori $a1, $a1, 0xd481 -/* 853C2C 80241ABC 0220202D */ daddu $a0, $s1, $zero -/* 853C30 80241AC0 3C05F4AC */ lui $a1, 0xf4ac -/* 853C34 80241AC4 4482B000 */ mtc1 $v0, $f22 -/* 853C38 80241AC8 00000000 */ nop -/* 853C3C 80241ACC 4680B5A0 */ cvt.s.w $f22, $f22 -/* 853C40 80241AD0 0C0B1EAF */ jal get_variable -/* 853C44 80241AD4 34A5D482 */ ori $a1, $a1, 0xd482 -/* 853C48 80241AD8 0220202D */ daddu $a0, $s1, $zero -/* 853C4C 80241ADC 3C05F4AC */ lui $a1, 0xf4ac -/* 853C50 80241AE0 4482A000 */ mtc1 $v0, $f20 -/* 853C54 80241AE4 00000000 */ nop -/* 853C58 80241AE8 4680A520 */ cvt.s.w $f20, $f20 -/* 853C5C 80241AEC 0C0B1EAF */ jal get_variable -/* 853C60 80241AF0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 853C64 80241AF4 44821000 */ mtc1 $v0, $f2 -/* 853C68 80241AF8 00000000 */ nop -/* 853C6C 80241AFC 468010A0 */ cvt.s.w $f2, $f2 -/* 853C70 80241B00 4405B000 */ mfc1 $a1, $f22 -/* 853C74 80241B04 4406A000 */ mfc1 $a2, $f20 -/* 853C78 80241B08 44071000 */ mfc1 $a3, $f2 -/* 853C7C 80241B0C 0C01C574 */ jal func_800715D0 -/* 853C80 80241B10 0000202D */ daddu $a0, $zero, $zero -/* 853C84 80241B14 0220202D */ daddu $a0, $s1, $zero -/* 853C88 80241B18 3C05F4AC */ lui $a1, 0xf4ac -/* 853C8C 80241B1C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 853C90 80241B20 3C108025 */ lui $s0, 0x8025 -/* 853C94 80241B24 261029F0 */ addiu $s0, $s0, 0x29f0 -/* 853C98 80241B28 0C0B1EAF */ jal get_variable -/* 853C9C 80241B2C AE020000 */ sw $v0, ($s0) -/* 853CA0 80241B30 0220202D */ daddu $a0, $s1, $zero -/* 853CA4 80241B34 3C05F4AC */ lui $a1, 0xf4ac -/* 853CA8 80241B38 4482B000 */ mtc1 $v0, $f22 -/* 853CAC 80241B3C 00000000 */ nop -/* 853CB0 80241B40 4680B5A0 */ cvt.s.w $f22, $f22 -/* 853CB4 80241B44 0C0B1EAF */ jal get_variable -/* 853CB8 80241B48 34A5D482 */ ori $a1, $a1, 0xd482 -/* 853CBC 80241B4C 0220202D */ daddu $a0, $s1, $zero -/* 853CC0 80241B50 3C05F4AC */ lui $a1, 0xf4ac -/* 853CC4 80241B54 4482A000 */ mtc1 $v0, $f20 -/* 853CC8 80241B58 00000000 */ nop -/* 853CCC 80241B5C 4680A520 */ cvt.s.w $f20, $f20 -/* 853CD0 80241B60 0C0B1EAF */ jal get_variable -/* 853CD4 80241B64 34A5D483 */ ori $a1, $a1, 0xd483 -/* 853CD8 80241B68 44821000 */ mtc1 $v0, $f2 -/* 853CDC 80241B6C 00000000 */ nop -/* 853CE0 80241B70 468010A0 */ cvt.s.w $f2, $f2 -/* 853CE4 80241B74 4405B000 */ mfc1 $a1, $f22 -/* 853CE8 80241B78 4406A000 */ mfc1 $a2, $f20 -/* 853CEC 80241B7C 44071000 */ mfc1 $a3, $f2 -/* 853CF0 80241B80 0C01C604 */ jal func_80071810 -/* 853CF4 80241B84 0000202D */ daddu $a0, $zero, $zero -/* 853CF8 80241B88 0220202D */ daddu $a0, $s1, $zero -/* 853CFC 80241B8C 3C05F4AC */ lui $a1, 0xf4ac -/* 853D00 80241B90 3C018025 */ lui $at, 0x8025 -/* 853D04 80241B94 AC2229F4 */ sw $v0, 0x29f4($at) -/* 853D08 80241B98 0C0B1EAF */ jal get_variable -/* 853D0C 80241B9C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 853D10 80241BA0 0220202D */ daddu $a0, $s1, $zero -/* 853D14 80241BA4 3C05F4AC */ lui $a1, 0xf4ac -/* 853D18 80241BA8 4482B000 */ mtc1 $v0, $f22 -/* 853D1C 80241BAC 00000000 */ nop -/* 853D20 80241BB0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 853D24 80241BB4 0C0B1EAF */ jal get_variable -/* 853D28 80241BB8 34A5D482 */ ori $a1, $a1, 0xd482 -/* 853D2C 80241BBC 0220202D */ daddu $a0, $s1, $zero -/* 853D30 80241BC0 3C05F4AC */ lui $a1, 0xf4ac -/* 853D34 80241BC4 4482A000 */ mtc1 $v0, $f20 -/* 853D38 80241BC8 00000000 */ nop -/* 853D3C 80241BCC 4680A520 */ cvt.s.w $f20, $f20 -/* 853D40 80241BD0 0C0B1EAF */ jal get_variable -/* 853D44 80241BD4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 853D48 80241BD8 44821000 */ mtc1 $v0, $f2 -/* 853D4C 80241BDC 00000000 */ nop -/* 853D50 80241BE0 468010A0 */ cvt.s.w $f2, $f2 -/* 853D54 80241BE4 4405B000 */ mfc1 $a1, $f22 -/* 853D58 80241BE8 4406A000 */ mfc1 $a2, $f20 -/* 853D5C 80241BEC 3C013F80 */ lui $at, 0x3f80 -/* 853D60 80241BF0 44810000 */ mtc1 $at, $f0 -/* 853D64 80241BF4 44071000 */ mfc1 $a3, $f2 -/* 853D68 80241BF8 0000202D */ daddu $a0, $zero, $zero -/* 853D6C 80241BFC AFA00014 */ sw $zero, 0x14($sp) -/* 853D70 80241C00 0C01CA24 */ jal func_80072890 -/* 853D74 80241C04 E7A00010 */ swc1 $f0, 0x10($sp) -/* 853D78 80241C08 8E030000 */ lw $v1, ($s0) -/* 853D7C 80241C0C 8C64000C */ lw $a0, 0xc($v1) -/* 853D80 80241C10 3C018025 */ lui $at, 0x8025 -/* 853D84 80241C14 AC2229F8 */ sw $v0, 0x29f8($at) -/* 853D88 80241C18 AC800018 */ sw $zero, 0x18($a0) -/* 853D8C 80241C1C AC800020 */ sw $zero, 0x20($a0) -/* 853D90 80241C20 AC800024 */ sw $zero, 0x24($a0) -/* 853D94 80241C24 AC800028 */ sw $zero, 0x28($a0) -/* 853D98 80241C28 AC80001C */ sw $zero, 0x1c($a0) -.L80241C2C: -/* 853D9C 80241C2C 3C028025 */ lui $v0, 0x8025 -/* 853DA0 80241C30 8C4229F0 */ lw $v0, 0x29f0($v0) -/* 853DA4 80241C34 8C44000C */ lw $a0, 0xc($v0) -/* 853DA8 80241C38 8C820020 */ lw $v0, 0x20($a0) -/* 853DAC 80241C3C 8C830028 */ lw $v1, 0x28($a0) -/* 853DB0 80241C40 2442000A */ addiu $v0, $v0, 0xa -/* 853DB4 80241C44 AC820020 */ sw $v0, 0x20($a0) -/* 853DB8 80241C48 8C820024 */ lw $v0, 0x24($a0) -/* 853DBC 80241C4C 2463000A */ addiu $v1, $v1, 0xa -/* 853DC0 80241C50 AC830028 */ sw $v1, 0x28($a0) -/* 853DC4 80241C54 8C830018 */ lw $v1, 0x18($a0) -/* 853DC8 80241C58 2442000A */ addiu $v0, $v0, 0xa -/* 853DCC 80241C5C AC820024 */ sw $v0, 0x24($a0) -/* 853DD0 80241C60 8C82001C */ lw $v0, 0x1c($a0) -/* 853DD4 80241C64 2463000A */ addiu $v1, $v1, 0xa -/* 853DD8 80241C68 AC830018 */ sw $v1, 0x18($a0) -/* 853DDC 80241C6C 286300FF */ slti $v1, $v1, 0xff -/* 853DE0 80241C70 2442000A */ addiu $v0, $v0, 0xa -/* 853DE4 80241C74 AC82001C */ sw $v0, 0x1c($a0) -/* 853DE8 80241C78 14600004 */ bnez $v1, .L80241C8C -/* 853DEC 80241C7C 0000102D */ daddu $v0, $zero, $zero -/* 853DF0 80241C80 240200FF */ addiu $v0, $zero, 0xff -/* 853DF4 80241C84 AC820018 */ sw $v0, 0x18($a0) -/* 853DF8 80241C88 24020002 */ addiu $v0, $zero, 2 -.L80241C8C: -/* 853DFC 80241C8C 8FBF0020 */ lw $ra, 0x20($sp) -/* 853E00 80241C90 8FB1001C */ lw $s1, 0x1c($sp) -/* 853E04 80241C94 8FB00018 */ lw $s0, 0x18($sp) -/* 853E08 80241C98 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 853E0C 80241C9C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 853E10 80241CA0 03E00008 */ jr $ra -/* 853E14 80241CA4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s new file mode 100644 index 0000000000..fe3041650a --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241A90_853C00.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A90_853C00 +/* 853C00 80241A90 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 853C04 80241A94 AFB1001C */ sw $s1, 0x1c($sp) +/* 853C08 80241A98 AFBF0020 */ sw $ra, 0x20($sp) +/* 853C0C 80241A9C AFB00018 */ sw $s0, 0x18($sp) +/* 853C10 80241AA0 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 853C14 80241AA4 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 853C18 80241AA8 10A00060 */ beqz $a1, .L80241C2C +/* 853C1C 80241AAC 0080882D */ daddu $s1, $a0, $zero +/* 853C20 80241AB0 3C05F4AC */ lui $a1, 0xf4ac +/* 853C24 80241AB4 0C0B1EAF */ jal get_variable +/* 853C28 80241AB8 34A5D481 */ ori $a1, $a1, 0xd481 +/* 853C2C 80241ABC 0220202D */ daddu $a0, $s1, $zero +/* 853C30 80241AC0 3C05F4AC */ lui $a1, 0xf4ac +/* 853C34 80241AC4 4482B000 */ mtc1 $v0, $f22 +/* 853C38 80241AC8 00000000 */ nop +/* 853C3C 80241ACC 4680B5A0 */ cvt.s.w $f22, $f22 +/* 853C40 80241AD0 0C0B1EAF */ jal get_variable +/* 853C44 80241AD4 34A5D482 */ ori $a1, $a1, 0xd482 +/* 853C48 80241AD8 0220202D */ daddu $a0, $s1, $zero +/* 853C4C 80241ADC 3C05F4AC */ lui $a1, 0xf4ac +/* 853C50 80241AE0 4482A000 */ mtc1 $v0, $f20 +/* 853C54 80241AE4 00000000 */ nop +/* 853C58 80241AE8 4680A520 */ cvt.s.w $f20, $f20 +/* 853C5C 80241AEC 0C0B1EAF */ jal get_variable +/* 853C60 80241AF0 34A5D483 */ ori $a1, $a1, 0xd483 +/* 853C64 80241AF4 44821000 */ mtc1 $v0, $f2 +/* 853C68 80241AF8 00000000 */ nop +/* 853C6C 80241AFC 468010A0 */ cvt.s.w $f2, $f2 +/* 853C70 80241B00 4405B000 */ mfc1 $a1, $f22 +/* 853C74 80241B04 4406A000 */ mfc1 $a2, $f20 +/* 853C78 80241B08 44071000 */ mfc1 $a3, $f2 +/* 853C7C 80241B0C 0C01C574 */ jal func_800715D0 +/* 853C80 80241B10 0000202D */ daddu $a0, $zero, $zero +/* 853C84 80241B14 0220202D */ daddu $a0, $s1, $zero +/* 853C88 80241B18 3C05F4AC */ lui $a1, 0xf4ac +/* 853C8C 80241B1C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 853C90 80241B20 3C108025 */ lui $s0, 0x8025 +/* 853C94 80241B24 261029F0 */ addiu $s0, $s0, 0x29f0 +/* 853C98 80241B28 0C0B1EAF */ jal get_variable +/* 853C9C 80241B2C AE020000 */ sw $v0, ($s0) +/* 853CA0 80241B30 0220202D */ daddu $a0, $s1, $zero +/* 853CA4 80241B34 3C05F4AC */ lui $a1, 0xf4ac +/* 853CA8 80241B38 4482B000 */ mtc1 $v0, $f22 +/* 853CAC 80241B3C 00000000 */ nop +/* 853CB0 80241B40 4680B5A0 */ cvt.s.w $f22, $f22 +/* 853CB4 80241B44 0C0B1EAF */ jal get_variable +/* 853CB8 80241B48 34A5D482 */ ori $a1, $a1, 0xd482 +/* 853CBC 80241B4C 0220202D */ daddu $a0, $s1, $zero +/* 853CC0 80241B50 3C05F4AC */ lui $a1, 0xf4ac +/* 853CC4 80241B54 4482A000 */ mtc1 $v0, $f20 +/* 853CC8 80241B58 00000000 */ nop +/* 853CCC 80241B5C 4680A520 */ cvt.s.w $f20, $f20 +/* 853CD0 80241B60 0C0B1EAF */ jal get_variable +/* 853CD4 80241B64 34A5D483 */ ori $a1, $a1, 0xd483 +/* 853CD8 80241B68 44821000 */ mtc1 $v0, $f2 +/* 853CDC 80241B6C 00000000 */ nop +/* 853CE0 80241B70 468010A0 */ cvt.s.w $f2, $f2 +/* 853CE4 80241B74 4405B000 */ mfc1 $a1, $f22 +/* 853CE8 80241B78 4406A000 */ mfc1 $a2, $f20 +/* 853CEC 80241B7C 44071000 */ mfc1 $a3, $f2 +/* 853CF0 80241B80 0C01C604 */ jal func_80071810 +/* 853CF4 80241B84 0000202D */ daddu $a0, $zero, $zero +/* 853CF8 80241B88 0220202D */ daddu $a0, $s1, $zero +/* 853CFC 80241B8C 3C05F4AC */ lui $a1, 0xf4ac +/* 853D00 80241B90 3C018025 */ lui $at, 0x8025 +/* 853D04 80241B94 AC2229F4 */ sw $v0, 0x29f4($at) +/* 853D08 80241B98 0C0B1EAF */ jal get_variable +/* 853D0C 80241B9C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 853D10 80241BA0 0220202D */ daddu $a0, $s1, $zero +/* 853D14 80241BA4 3C05F4AC */ lui $a1, 0xf4ac +/* 853D18 80241BA8 4482B000 */ mtc1 $v0, $f22 +/* 853D1C 80241BAC 00000000 */ nop +/* 853D20 80241BB0 4680B5A0 */ cvt.s.w $f22, $f22 +/* 853D24 80241BB4 0C0B1EAF */ jal get_variable +/* 853D28 80241BB8 34A5D482 */ ori $a1, $a1, 0xd482 +/* 853D2C 80241BBC 0220202D */ daddu $a0, $s1, $zero +/* 853D30 80241BC0 3C05F4AC */ lui $a1, 0xf4ac +/* 853D34 80241BC4 4482A000 */ mtc1 $v0, $f20 +/* 853D38 80241BC8 00000000 */ nop +/* 853D3C 80241BCC 4680A520 */ cvt.s.w $f20, $f20 +/* 853D40 80241BD0 0C0B1EAF */ jal get_variable +/* 853D44 80241BD4 34A5D483 */ ori $a1, $a1, 0xd483 +/* 853D48 80241BD8 44821000 */ mtc1 $v0, $f2 +/* 853D4C 80241BDC 00000000 */ nop +/* 853D50 80241BE0 468010A0 */ cvt.s.w $f2, $f2 +/* 853D54 80241BE4 4405B000 */ mfc1 $a1, $f22 +/* 853D58 80241BE8 4406A000 */ mfc1 $a2, $f20 +/* 853D5C 80241BEC 3C013F80 */ lui $at, 0x3f80 +/* 853D60 80241BF0 44810000 */ mtc1 $at, $f0 +/* 853D64 80241BF4 44071000 */ mfc1 $a3, $f2 +/* 853D68 80241BF8 0000202D */ daddu $a0, $zero, $zero +/* 853D6C 80241BFC AFA00014 */ sw $zero, 0x14($sp) +/* 853D70 80241C00 0C01CA24 */ jal func_80072890 +/* 853D74 80241C04 E7A00010 */ swc1 $f0, 0x10($sp) +/* 853D78 80241C08 8E030000 */ lw $v1, ($s0) +/* 853D7C 80241C0C 8C64000C */ lw $a0, 0xc($v1) +/* 853D80 80241C10 3C018025 */ lui $at, 0x8025 +/* 853D84 80241C14 AC2229F8 */ sw $v0, 0x29f8($at) +/* 853D88 80241C18 AC800018 */ sw $zero, 0x18($a0) +/* 853D8C 80241C1C AC800020 */ sw $zero, 0x20($a0) +/* 853D90 80241C20 AC800024 */ sw $zero, 0x24($a0) +/* 853D94 80241C24 AC800028 */ sw $zero, 0x28($a0) +/* 853D98 80241C28 AC80001C */ sw $zero, 0x1c($a0) +.L80241C2C: +/* 853D9C 80241C2C 3C028025 */ lui $v0, 0x8025 +/* 853DA0 80241C30 8C4229F0 */ lw $v0, 0x29f0($v0) +/* 853DA4 80241C34 8C44000C */ lw $a0, 0xc($v0) +/* 853DA8 80241C38 8C820020 */ lw $v0, 0x20($a0) +/* 853DAC 80241C3C 8C830028 */ lw $v1, 0x28($a0) +/* 853DB0 80241C40 2442000A */ addiu $v0, $v0, 0xa +/* 853DB4 80241C44 AC820020 */ sw $v0, 0x20($a0) +/* 853DB8 80241C48 8C820024 */ lw $v0, 0x24($a0) +/* 853DBC 80241C4C 2463000A */ addiu $v1, $v1, 0xa +/* 853DC0 80241C50 AC830028 */ sw $v1, 0x28($a0) +/* 853DC4 80241C54 8C830018 */ lw $v1, 0x18($a0) +/* 853DC8 80241C58 2442000A */ addiu $v0, $v0, 0xa +/* 853DCC 80241C5C AC820024 */ sw $v0, 0x24($a0) +/* 853DD0 80241C60 8C82001C */ lw $v0, 0x1c($a0) +/* 853DD4 80241C64 2463000A */ addiu $v1, $v1, 0xa +/* 853DD8 80241C68 AC830018 */ sw $v1, 0x18($a0) +/* 853DDC 80241C6C 286300FF */ slti $v1, $v1, 0xff +/* 853DE0 80241C70 2442000A */ addiu $v0, $v0, 0xa +/* 853DE4 80241C74 AC82001C */ sw $v0, 0x1c($a0) +/* 853DE8 80241C78 14600004 */ bnez $v1, .L80241C8C +/* 853DEC 80241C7C 0000102D */ daddu $v0, $zero, $zero +/* 853DF0 80241C80 240200FF */ addiu $v0, $zero, 0xff +/* 853DF4 80241C84 AC820018 */ sw $v0, 0x18($a0) +/* 853DF8 80241C88 24020002 */ addiu $v0, $zero, 2 +.L80241C8C: +/* 853DFC 80241C8C 8FBF0020 */ lw $ra, 0x20($sp) +/* 853E00 80241C90 8FB1001C */ lw $s1, 0x1c($sp) +/* 853E04 80241C94 8FB00018 */ lw $s0, 0x18($sp) +/* 853E08 80241C98 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 853E0C 80241C9C D7B40028 */ ldc1 $f20, 0x28($sp) +/* 853E10 80241CA0 03E00008 */ jr $ra +/* 853E14 80241CA4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8.s deleted file mode 100644 index 76f165a800..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CA8 -/* 853E18 80241CA8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 853E1C 80241CAC 10A0000B */ beqz $a1, .L80241CDC -/* 853E20 80241CB0 AFBF0010 */ sw $ra, 0x10($sp) -/* 853E24 80241CB4 3C038025 */ lui $v1, 0x8025 -/* 853E28 80241CB8 8C6329F4 */ lw $v1, 0x29f4($v1) -/* 853E2C 80241CBC 8C620000 */ lw $v0, ($v1) -/* 853E30 80241CC0 3C048025 */ lui $a0, 0x8025 -/* 853E34 80241CC4 8C8429F8 */ lw $a0, 0x29f8($a0) -/* 853E38 80241CC8 34420010 */ ori $v0, $v0, 0x10 -/* 853E3C 80241CCC AC620000 */ sw $v0, ($v1) -/* 853E40 80241CD0 8C820000 */ lw $v0, ($a0) -/* 853E44 80241CD4 34420010 */ ori $v0, $v0, 0x10 -/* 853E48 80241CD8 AC820000 */ sw $v0, ($a0) -.L80241CDC: -/* 853E4C 80241CDC 3C048025 */ lui $a0, 0x8025 -/* 853E50 80241CE0 8C8429F0 */ lw $a0, 0x29f0($a0) -/* 853E54 80241CE4 8C85000C */ lw $a1, 0xc($a0) -/* 853E58 80241CE8 8CA20018 */ lw $v0, 0x18($a1) -/* 853E5C 80241CEC 8CA30020 */ lw $v1, 0x20($a1) -/* 853E60 80241CF0 2442FFF6 */ addiu $v0, $v0, -0xa -/* 853E64 80241CF4 ACA20018 */ sw $v0, 0x18($a1) -/* 853E68 80241CF8 8CA20024 */ lw $v0, 0x24($a1) -/* 853E6C 80241CFC 2463FFF6 */ addiu $v1, $v1, -0xa -/* 853E70 80241D00 ACA30020 */ sw $v1, 0x20($a1) -/* 853E74 80241D04 8CA30028 */ lw $v1, 0x28($a1) -/* 853E78 80241D08 2442FFF6 */ addiu $v0, $v0, -0xa -/* 853E7C 80241D0C ACA20024 */ sw $v0, 0x24($a1) -/* 853E80 80241D10 8CA2001C */ lw $v0, 0x1c($a1) -/* 853E84 80241D14 2463FFF6 */ addiu $v1, $v1, -0xa -/* 853E88 80241D18 ACA30028 */ sw $v1, 0x28($a1) -/* 853E8C 80241D1C 8CA30018 */ lw $v1, 0x18($a1) -/* 853E90 80241D20 2442FFF6 */ addiu $v0, $v0, -0xa -/* 853E94 80241D24 18600003 */ blez $v1, .L80241D34 -/* 853E98 80241D28 ACA2001C */ sw $v0, 0x1c($a1) -/* 853E9C 80241D2C 08090754 */ j .L80241D50 -/* 853EA0 80241D30 0000102D */ daddu $v0, $zero, $zero -.L80241D34: -/* 853EA4 80241D34 0C016914 */ jal remove_effect -/* 853EA8 80241D38 ACA00018 */ sw $zero, 0x18($a1) -/* 853EAC 80241D3C 3C048025 */ lui $a0, 0x8025 -/* 853EB0 80241D40 8C8429D0 */ lw $a0, 0x29d0($a0) -/* 853EB4 80241D44 0C048D70 */ jal func_801235C0 -/* 853EB8 80241D48 00000000 */ nop -/* 853EBC 80241D4C 24020002 */ addiu $v0, $zero, 2 -.L80241D50: -/* 853EC0 80241D50 8FBF0010 */ lw $ra, 0x10($sp) -/* 853EC4 80241D54 03E00008 */ jr $ra -/* 853EC8 80241D58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s new file mode 100644 index 0000000000..456dde60ea --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241CA8_853E18.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CA8_853E18 +/* 853E18 80241CA8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 853E1C 80241CAC 10A0000B */ beqz $a1, .L80241CDC +/* 853E20 80241CB0 AFBF0010 */ sw $ra, 0x10($sp) +/* 853E24 80241CB4 3C038025 */ lui $v1, 0x8025 +/* 853E28 80241CB8 8C6329F4 */ lw $v1, 0x29f4($v1) +/* 853E2C 80241CBC 8C620000 */ lw $v0, ($v1) +/* 853E30 80241CC0 3C048025 */ lui $a0, 0x8025 +/* 853E34 80241CC4 8C8429F8 */ lw $a0, 0x29f8($a0) +/* 853E38 80241CC8 34420010 */ ori $v0, $v0, 0x10 +/* 853E3C 80241CCC AC620000 */ sw $v0, ($v1) +/* 853E40 80241CD0 8C820000 */ lw $v0, ($a0) +/* 853E44 80241CD4 34420010 */ ori $v0, $v0, 0x10 +/* 853E48 80241CD8 AC820000 */ sw $v0, ($a0) +.L80241CDC: +/* 853E4C 80241CDC 3C048025 */ lui $a0, 0x8025 +/* 853E50 80241CE0 8C8429F0 */ lw $a0, 0x29f0($a0) +/* 853E54 80241CE4 8C85000C */ lw $a1, 0xc($a0) +/* 853E58 80241CE8 8CA20018 */ lw $v0, 0x18($a1) +/* 853E5C 80241CEC 8CA30020 */ lw $v1, 0x20($a1) +/* 853E60 80241CF0 2442FFF6 */ addiu $v0, $v0, -0xa +/* 853E64 80241CF4 ACA20018 */ sw $v0, 0x18($a1) +/* 853E68 80241CF8 8CA20024 */ lw $v0, 0x24($a1) +/* 853E6C 80241CFC 2463FFF6 */ addiu $v1, $v1, -0xa +/* 853E70 80241D00 ACA30020 */ sw $v1, 0x20($a1) +/* 853E74 80241D04 8CA30028 */ lw $v1, 0x28($a1) +/* 853E78 80241D08 2442FFF6 */ addiu $v0, $v0, -0xa +/* 853E7C 80241D0C ACA20024 */ sw $v0, 0x24($a1) +/* 853E80 80241D10 8CA2001C */ lw $v0, 0x1c($a1) +/* 853E84 80241D14 2463FFF6 */ addiu $v1, $v1, -0xa +/* 853E88 80241D18 ACA30028 */ sw $v1, 0x28($a1) +/* 853E8C 80241D1C 8CA30018 */ lw $v1, 0x18($a1) +/* 853E90 80241D20 2442FFF6 */ addiu $v0, $v0, -0xa +/* 853E94 80241D24 18600003 */ blez $v1, .L80241D34 +/* 853E98 80241D28 ACA2001C */ sw $v0, 0x1c($a1) +/* 853E9C 80241D2C 08090754 */ j .L80241D50 +/* 853EA0 80241D30 0000102D */ daddu $v0, $zero, $zero +.L80241D34: +/* 853EA4 80241D34 0C016914 */ jal remove_effect +/* 853EA8 80241D38 ACA00018 */ sw $zero, 0x18($a1) +/* 853EAC 80241D3C 3C048025 */ lui $a0, 0x8025 +/* 853EB0 80241D40 8C8429D0 */ lw $a0, 0x29d0($a0) +/* 853EB4 80241D44 0C048D70 */ jal func_801235C0 +/* 853EB8 80241D48 00000000 */ nop +/* 853EBC 80241D4C 24020002 */ addiu $v0, $zero, 2 +.L80241D50: +/* 853EC0 80241D50 8FBF0010 */ lw $ra, 0x10($sp) +/* 853EC4 80241D54 03E00008 */ jr $ra +/* 853EC8 80241D58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C.s deleted file mode 100644 index ae499c148b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D5C -/* 853ECC 80241D5C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 853ED0 80241D60 AFBF0010 */ sw $ra, 0x10($sp) -/* 853ED4 80241D64 8C82000C */ lw $v0, 0xc($a0) -/* 853ED8 80241D68 0C0B1EAF */ jal get_variable -/* 853EDC 80241D6C 8C450000 */ lw $a1, ($v0) -/* 853EE0 80241D70 3C038025 */ lui $v1, 0x8025 -/* 853EE4 80241D74 8C6329F0 */ lw $v1, 0x29f0($v1) -/* 853EE8 80241D78 8C63000C */ lw $v1, 0xc($v1) -/* 853EEC 80241D7C AC620034 */ sw $v0, 0x34($v1) -/* 853EF0 80241D80 8FBF0010 */ lw $ra, 0x10($sp) -/* 853EF4 80241D84 24020002 */ addiu $v0, $zero, 2 -/* 853EF8 80241D88 03E00008 */ jr $ra -/* 853EFC 80241D8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C_853ECC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C_853ECC.s new file mode 100644 index 0000000000..939502f20f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D5C_853ECC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D5C_853ECC +/* 853ECC 80241D5C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 853ED0 80241D60 AFBF0010 */ sw $ra, 0x10($sp) +/* 853ED4 80241D64 8C82000C */ lw $v0, 0xc($a0) +/* 853ED8 80241D68 0C0B1EAF */ jal get_variable +/* 853EDC 80241D6C 8C450000 */ lw $a1, ($v0) +/* 853EE0 80241D70 3C038025 */ lui $v1, 0x8025 +/* 853EE4 80241D74 8C6329F0 */ lw $v1, 0x29f0($v1) +/* 853EE8 80241D78 8C63000C */ lw $v1, 0xc($v1) +/* 853EEC 80241D7C AC620034 */ sw $v0, 0x34($v1) +/* 853EF0 80241D80 8FBF0010 */ lw $ra, 0x10($sp) +/* 853EF4 80241D84 24020002 */ addiu $v0, $zero, 2 +/* 853EF8 80241D88 03E00008 */ jr $ra +/* 853EFC 80241D8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90.s deleted file mode 100644 index 1946b5111f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D90 -/* 853F00 80241D90 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 853F04 80241D94 AFBF0010 */ sw $ra, 0x10($sp) -/* 853F08 80241D98 8C82000C */ lw $v0, 0xc($a0) -/* 853F0C 80241D9C 0C0B1EAF */ jal get_variable -/* 853F10 80241DA0 8C450000 */ lw $a1, ($v0) -/* 853F14 80241DA4 0040202D */ daddu $a0, $v0, $zero -/* 853F18 80241DA8 3C028025 */ lui $v0, 0x8025 -/* 853F1C 80241DAC 8C4229F0 */ lw $v0, 0x29f0($v0) -/* 853F20 80241DB0 24030001 */ addiu $v1, $zero, 1 -/* 853F24 80241DB4 8C45000C */ lw $a1, 0xc($v0) -/* 853F28 80241DB8 1083000D */ beq $a0, $v1, .L80241DF0 -/* 853F2C 80241DBC 28820002 */ slti $v0, $a0, 2 -/* 853F30 80241DC0 10400005 */ beqz $v0, .L80241DD8 -/* 853F34 80241DC4 24020002 */ addiu $v0, $zero, 2 -/* 853F38 80241DC8 10800007 */ beqz $a0, .L80241DE8 -/* 853F3C 80241DCC 240200C0 */ addiu $v0, $zero, 0xc0 -/* 853F40 80241DD0 08090780 */ j .L80241E00 -/* 853F44 80241DD4 ACA00038 */ sw $zero, 0x38($a1) -.L80241DD8: -/* 853F48 80241DD8 10820008 */ beq $a0, $v0, .L80241DFC -/* 853F4C 80241DDC 24020040 */ addiu $v0, $zero, 0x40 -/* 853F50 80241DE0 08090780 */ j .L80241E00 -/* 853F54 80241DE4 ACA00038 */ sw $zero, 0x38($a1) -.L80241DE8: -/* 853F58 80241DE8 08090780 */ j .L80241E00 -/* 853F5C 80241DEC ACA20038 */ sw $v0, 0x38($a1) -.L80241DF0: -/* 853F60 80241DF0 24020080 */ addiu $v0, $zero, 0x80 -/* 853F64 80241DF4 08090780 */ j .L80241E00 -/* 853F68 80241DF8 ACA20038 */ sw $v0, 0x38($a1) -.L80241DFC: -/* 853F6C 80241DFC ACA20038 */ sw $v0, 0x38($a1) -.L80241E00: -/* 853F70 80241E00 8FBF0010 */ lw $ra, 0x10($sp) -/* 853F74 80241E04 24020002 */ addiu $v0, $zero, 2 -/* 853F78 80241E08 03E00008 */ jr $ra -/* 853F7C 80241E0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90_853F00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90_853F00.s new file mode 100644 index 0000000000..c68372ed4f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241D90_853F00.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D90_853F00 +/* 853F00 80241D90 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 853F04 80241D94 AFBF0010 */ sw $ra, 0x10($sp) +/* 853F08 80241D98 8C82000C */ lw $v0, 0xc($a0) +/* 853F0C 80241D9C 0C0B1EAF */ jal get_variable +/* 853F10 80241DA0 8C450000 */ lw $a1, ($v0) +/* 853F14 80241DA4 0040202D */ daddu $a0, $v0, $zero +/* 853F18 80241DA8 3C028025 */ lui $v0, 0x8025 +/* 853F1C 80241DAC 8C4229F0 */ lw $v0, 0x29f0($v0) +/* 853F20 80241DB0 24030001 */ addiu $v1, $zero, 1 +/* 853F24 80241DB4 8C45000C */ lw $a1, 0xc($v0) +/* 853F28 80241DB8 1083000D */ beq $a0, $v1, .L80241DF0 +/* 853F2C 80241DBC 28820002 */ slti $v0, $a0, 2 +/* 853F30 80241DC0 10400005 */ beqz $v0, .L80241DD8 +/* 853F34 80241DC4 24020002 */ addiu $v0, $zero, 2 +/* 853F38 80241DC8 10800007 */ beqz $a0, .L80241DE8 +/* 853F3C 80241DCC 240200C0 */ addiu $v0, $zero, 0xc0 +/* 853F40 80241DD0 08090780 */ j .L80241E00 +/* 853F44 80241DD4 ACA00038 */ sw $zero, 0x38($a1) +.L80241DD8: +/* 853F48 80241DD8 10820008 */ beq $a0, $v0, .L80241DFC +/* 853F4C 80241DDC 24020040 */ addiu $v0, $zero, 0x40 +/* 853F50 80241DE0 08090780 */ j .L80241E00 +/* 853F54 80241DE4 ACA00038 */ sw $zero, 0x38($a1) +.L80241DE8: +/* 853F58 80241DE8 08090780 */ j .L80241E00 +/* 853F5C 80241DEC ACA20038 */ sw $v0, 0x38($a1) +.L80241DF0: +/* 853F60 80241DF0 24020080 */ addiu $v0, $zero, 0x80 +/* 853F64 80241DF4 08090780 */ j .L80241E00 +/* 853F68 80241DF8 ACA20038 */ sw $v0, 0x38($a1) +.L80241DFC: +/* 853F6C 80241DFC ACA20038 */ sw $v0, 0x38($a1) +.L80241E00: +/* 853F70 80241E00 8FBF0010 */ lw $ra, 0x10($sp) +/* 853F74 80241E04 24020002 */ addiu $v0, $zero, 2 +/* 853F78 80241E08 03E00008 */ jr $ra +/* 853F7C 80241E0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10.s deleted file mode 100644 index af61329298..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E10 -/* 853F80 80241E10 3C028025 */ lui $v0, 0x8025 -/* 853F84 80241E14 8C4229F8 */ lw $v0, 0x29f8($v0) -/* 853F88 80241E18 8C42000C */ lw $v0, 0xc($v0) -/* 853F8C 80241E1C AC40001C */ sw $zero, 0x1c($v0) -/* 853F90 80241E20 03E00008 */ jr $ra -/* 853F94 80241E24 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10_853F80.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10_853F80.s new file mode 100644 index 0000000000..c56ec06f85 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E10_853F80.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E10_853F80 +/* 853F80 80241E10 3C028025 */ lui $v0, 0x8025 +/* 853F84 80241E14 8C4229F8 */ lw $v0, 0x29f8($v0) +/* 853F88 80241E18 8C42000C */ lw $v0, 0xc($v0) +/* 853F8C 80241E1C AC40001C */ sw $zero, 0x1c($v0) +/* 853F90 80241E20 03E00008 */ jr $ra +/* 853F94 80241E24 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28.s deleted file mode 100644 index 7771b00195..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E28 -/* 853F98 80241E28 3C028025 */ lui $v0, 0x8025 -/* 853F9C 80241E2C 8C4229F8 */ lw $v0, 0x29f8($v0) -/* 853FA0 80241E30 8C43000C */ lw $v1, 0xc($v0) -/* 853FA4 80241E34 24020001 */ addiu $v0, $zero, 1 -/* 853FA8 80241E38 AC62001C */ sw $v0, 0x1c($v1) -/* 853FAC 80241E3C 03E00008 */ jr $ra -/* 853FB0 80241E40 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28_853F98.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28_853F98.s new file mode 100644 index 0000000000..2b5510ffa6 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E28_853F98.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E28_853F98 +/* 853F98 80241E28 3C028025 */ lui $v0, 0x8025 +/* 853F9C 80241E2C 8C4229F8 */ lw $v0, 0x29f8($v0) +/* 853FA0 80241E30 8C43000C */ lw $v1, 0xc($v0) +/* 853FA4 80241E34 24020001 */ addiu $v0, $zero, 1 +/* 853FA8 80241E38 AC62001C */ sw $v0, 0x1c($v1) +/* 853FAC 80241E3C 03E00008 */ jr $ra +/* 853FB0 80241E40 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44.s deleted file mode 100644 index 1edda6cdc5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E44 -/* 853FB4 80241E44 3C028025 */ lui $v0, 0x8025 -/* 853FB8 80241E48 8C4229F8 */ lw $v0, 0x29f8($v0) -/* 853FBC 80241E4C 8C43000C */ lw $v1, 0xc($v0) -/* 853FC0 80241E50 24020002 */ addiu $v0, $zero, 2 -/* 853FC4 80241E54 03E00008 */ jr $ra -/* 853FC8 80241E58 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44_853FB4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44_853FB4.s new file mode 100644 index 0000000000..8d18eea522 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E44_853FB4.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E44_853FB4 +/* 853FB4 80241E44 3C028025 */ lui $v0, 0x8025 +/* 853FB8 80241E48 8C4229F8 */ lw $v0, 0x29f8($v0) +/* 853FBC 80241E4C 8C43000C */ lw $v1, 0xc($v0) +/* 853FC0 80241E50 24020002 */ addiu $v0, $zero, 2 +/* 853FC4 80241E54 03E00008 */ jr $ra +/* 853FC8 80241E58 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C.s deleted file mode 100644 index 2450fe63ea..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E5C -/* 853FCC 80241E5C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 853FD0 80241E60 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 853FD4 80241E64 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 853FD8 80241E68 3C05FE36 */ lui $a1, 0xfe36 -/* 853FDC 80241E6C AFBF0010 */ sw $ra, 0x10($sp) -/* 853FE0 80241E70 80460075 */ lb $a2, 0x75($v0) -/* 853FE4 80241E74 0C0B2026 */ jal set_variable -/* 853FE8 80241E78 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 853FEC 80241E7C 8FBF0010 */ lw $ra, 0x10($sp) -/* 853FF0 80241E80 24020002 */ addiu $v0, $zero, 2 -/* 853FF4 80241E84 03E00008 */ jr $ra -/* 853FF8 80241E88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s new file mode 100644 index 0000000000..2448ab78c2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E5C_853FCC +/* 853FCC 80241E5C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 853FD0 80241E60 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 853FD4 80241E64 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 853FD8 80241E68 3C05FE36 */ lui $a1, 0xfe36 +/* 853FDC 80241E6C AFBF0010 */ sw $ra, 0x10($sp) +/* 853FE0 80241E70 80460075 */ lb $a2, 0x75($v0) +/* 853FE4 80241E74 0C0B2026 */ jal set_variable +/* 853FE8 80241E78 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 853FEC 80241E7C 8FBF0010 */ lw $ra, 0x10($sp) +/* 853FF0 80241E80 24020002 */ addiu $v0, $zero, 2 +/* 853FF4 80241E84 03E00008 */ jr $ra +/* 853FF8 80241E88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C.s deleted file mode 100644 index 9840678013..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E8C -/* 853FFC 80241E8C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 854000 80241E90 AFB10014 */ sw $s1, 0x14($sp) -/* 854004 80241E94 0080882D */ daddu $s1, $a0, $zero -/* 854008 80241E98 AFBF0018 */ sw $ra, 0x18($sp) -/* 85400C 80241E9C AFB00010 */ sw $s0, 0x10($sp) -/* 854010 80241EA0 8E30000C */ lw $s0, 0xc($s1) -/* 854014 80241EA4 8E050000 */ lw $a1, ($s0) -/* 854018 80241EA8 0C0B1EAF */ jal get_variable -/* 85401C 80241EAC 26100004 */ addiu $s0, $s0, 4 -/* 854020 80241EB0 0220202D */ daddu $a0, $s1, $zero -/* 854024 80241EB4 8E050000 */ lw $a1, ($s0) -/* 854028 80241EB8 0C0B210B */ jal get_float_variable -/* 85402C 80241EBC 0040802D */ daddu $s0, $v0, $zero -/* 854030 80241EC0 24020002 */ addiu $v0, $zero, 2 -/* 854034 80241EC4 00501804 */ sllv $v1, $s0, $v0 -/* 854038 80241EC8 00701821 */ addu $v1, $v1, $s0 -/* 85403C 80241ECC 00431804 */ sllv $v1, $v1, $v0 -/* 854040 80241ED0 00701823 */ subu $v1, $v1, $s0 -/* 854044 80241ED4 000320C0 */ sll $a0, $v1, 3 -/* 854048 80241ED8 00641821 */ addu $v1, $v1, $a0 -/* 85404C 80241EDC 000318C0 */ sll $v1, $v1, 3 -/* 854050 80241EE0 3C01800B */ lui $at, 0x800b -/* 854054 80241EE4 00230821 */ addu $at, $at, $v1 -/* 854058 80241EE8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 85405C 80241EEC 8FBF0018 */ lw $ra, 0x18($sp) -/* 854060 80241EF0 8FB10014 */ lw $s1, 0x14($sp) -/* 854064 80241EF4 8FB00010 */ lw $s0, 0x10($sp) -/* 854068 80241EF8 03E00008 */ jr $ra -/* 85406C 80241EFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s new file mode 100644 index 0000000000..20106558e2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E8C_853FFC +/* 853FFC 80241E8C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 854000 80241E90 AFB10014 */ sw $s1, 0x14($sp) +/* 854004 80241E94 0080882D */ daddu $s1, $a0, $zero +/* 854008 80241E98 AFBF0018 */ sw $ra, 0x18($sp) +/* 85400C 80241E9C AFB00010 */ sw $s0, 0x10($sp) +/* 854010 80241EA0 8E30000C */ lw $s0, 0xc($s1) +/* 854014 80241EA4 8E050000 */ lw $a1, ($s0) +/* 854018 80241EA8 0C0B1EAF */ jal get_variable +/* 85401C 80241EAC 26100004 */ addiu $s0, $s0, 4 +/* 854020 80241EB0 0220202D */ daddu $a0, $s1, $zero +/* 854024 80241EB4 8E050000 */ lw $a1, ($s0) +/* 854028 80241EB8 0C0B210B */ jal get_float_variable +/* 85402C 80241EBC 0040802D */ daddu $s0, $v0, $zero +/* 854030 80241EC0 24020002 */ addiu $v0, $zero, 2 +/* 854034 80241EC4 00501804 */ sllv $v1, $s0, $v0 +/* 854038 80241EC8 00701821 */ addu $v1, $v1, $s0 +/* 85403C 80241ECC 00431804 */ sllv $v1, $v1, $v0 +/* 854040 80241ED0 00701823 */ subu $v1, $v1, $s0 +/* 854044 80241ED4 000320C0 */ sll $a0, $v1, 3 +/* 854048 80241ED8 00641821 */ addu $v1, $v1, $a0 +/* 85404C 80241EDC 000318C0 */ sll $v1, $v1, 3 +/* 854050 80241EE0 3C01800B */ lui $at, 0x800b +/* 854054 80241EE4 00230821 */ addu $at, $at, $v1 +/* 854058 80241EE8 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 85405C 80241EEC 8FBF0018 */ lw $ra, 0x18($sp) +/* 854060 80241EF0 8FB10014 */ lw $s1, 0x14($sp) +/* 854064 80241EF4 8FB00010 */ lw $s0, 0x10($sp) +/* 854068 80241EF8 03E00008 */ jr $ra +/* 85406C 80241EFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00.s deleted file mode 100644 index 74c1635f0b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F00 -/* 854070 80241F00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 854074 80241F04 AFB10014 */ sw $s1, 0x14($sp) -/* 854078 80241F08 0080882D */ daddu $s1, $a0, $zero -/* 85407C 80241F0C AFBF0018 */ sw $ra, 0x18($sp) -/* 854080 80241F10 AFB00010 */ sw $s0, 0x10($sp) -/* 854084 80241F14 8E30000C */ lw $s0, 0xc($s1) -/* 854088 80241F18 8E050000 */ lw $a1, ($s0) -/* 85408C 80241F1C 0C0B1EAF */ jal get_variable -/* 854090 80241F20 26100004 */ addiu $s0, $s0, 4 -/* 854094 80241F24 00021880 */ sll $v1, $v0, 2 -/* 854098 80241F28 00621821 */ addu $v1, $v1, $v0 -/* 85409C 80241F2C 00031880 */ sll $v1, $v1, 2 -/* 8540A0 80241F30 00621823 */ subu $v1, $v1, $v0 -/* 8540A4 80241F34 000310C0 */ sll $v0, $v1, 3 -/* 8540A8 80241F38 00621821 */ addu $v1, $v1, $v0 -/* 8540AC 80241F3C 000318C0 */ sll $v1, $v1, 3 -/* 8540B0 80241F40 3C01800B */ lui $at, 0x800b -/* 8540B4 80241F44 00230821 */ addu $at, $at, $v1 -/* 8540B8 80241F48 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8540BC 80241F4C 3C014480 */ lui $at, 0x4480 -/* 8540C0 80241F50 44810000 */ mtc1 $at, $f0 -/* 8540C4 80241F54 00000000 */ nop -/* 8540C8 80241F58 46001082 */ mul.s $f2, $f2, $f0 -/* 8540CC 80241F5C 00000000 */ nop -/* 8540D0 80241F60 3C01CD5B */ lui $at, 0xcd5b -/* 8540D4 80241F64 34215858 */ ori $at, $at, 0x5858 -/* 8540D8 80241F68 44810000 */ mtc1 $at, $f0 -/* 8540DC 80241F6C 00000000 */ nop -/* 8540E0 80241F70 46001080 */ add.s $f2, $f2, $f0 -/* 8540E4 80241F74 8E050000 */ lw $a1, ($s0) -/* 8540E8 80241F78 4600110D */ trunc.w.s $f4, $f2 -/* 8540EC 80241F7C 44062000 */ mfc1 $a2, $f4 -/* 8540F0 80241F80 0C0B2026 */ jal set_variable -/* 8540F4 80241F84 0220202D */ daddu $a0, $s1, $zero -/* 8540F8 80241F88 8FBF0018 */ lw $ra, 0x18($sp) -/* 8540FC 80241F8C 8FB10014 */ lw $s1, 0x14($sp) -/* 854100 80241F90 8FB00010 */ lw $s0, 0x10($sp) -/* 854104 80241F94 24020002 */ addiu $v0, $zero, 2 -/* 854108 80241F98 03E00008 */ jr $ra -/* 85410C 80241F9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s new file mode 100644 index 0000000000..d757ecc223 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F00_854070 +/* 854070 80241F00 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 854074 80241F04 AFB10014 */ sw $s1, 0x14($sp) +/* 854078 80241F08 0080882D */ daddu $s1, $a0, $zero +/* 85407C 80241F0C AFBF0018 */ sw $ra, 0x18($sp) +/* 854080 80241F10 AFB00010 */ sw $s0, 0x10($sp) +/* 854084 80241F14 8E30000C */ lw $s0, 0xc($s1) +/* 854088 80241F18 8E050000 */ lw $a1, ($s0) +/* 85408C 80241F1C 0C0B1EAF */ jal get_variable +/* 854090 80241F20 26100004 */ addiu $s0, $s0, 4 +/* 854094 80241F24 00021880 */ sll $v1, $v0, 2 +/* 854098 80241F28 00621821 */ addu $v1, $v1, $v0 +/* 85409C 80241F2C 00031880 */ sll $v1, $v1, 2 +/* 8540A0 80241F30 00621823 */ subu $v1, $v1, $v0 +/* 8540A4 80241F34 000310C0 */ sll $v0, $v1, 3 +/* 8540A8 80241F38 00621821 */ addu $v1, $v1, $v0 +/* 8540AC 80241F3C 000318C0 */ sll $v1, $v1, 3 +/* 8540B0 80241F40 3C01800B */ lui $at, 0x800b +/* 8540B4 80241F44 00230821 */ addu $at, $at, $v1 +/* 8540B8 80241F48 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 8540BC 80241F4C 3C014480 */ lui $at, 0x4480 +/* 8540C0 80241F50 44810000 */ mtc1 $at, $f0 +/* 8540C4 80241F54 00000000 */ nop +/* 8540C8 80241F58 46001082 */ mul.s $f2, $f2, $f0 +/* 8540CC 80241F5C 00000000 */ nop +/* 8540D0 80241F60 3C01CD5B */ lui $at, 0xcd5b +/* 8540D4 80241F64 34215858 */ ori $at, $at, 0x5858 +/* 8540D8 80241F68 44810000 */ mtc1 $at, $f0 +/* 8540DC 80241F6C 00000000 */ nop +/* 8540E0 80241F70 46001080 */ add.s $f2, $f2, $f0 +/* 8540E4 80241F74 8E050000 */ lw $a1, ($s0) +/* 8540E8 80241F78 4600110D */ trunc.w.s $f4, $f2 +/* 8540EC 80241F7C 44062000 */ mfc1 $a2, $f4 +/* 8540F0 80241F80 0C0B2026 */ jal set_variable +/* 8540F4 80241F84 0220202D */ daddu $a0, $s1, $zero +/* 8540F8 80241F88 8FBF0018 */ lw $ra, 0x18($sp) +/* 8540FC 80241F8C 8FB10014 */ lw $s1, 0x14($sp) +/* 854100 80241F90 8FB00010 */ lw $s0, 0x10($sp) +/* 854104 80241F94 24020002 */ addiu $v0, $zero, 2 +/* 854108 80241F98 03E00008 */ jr $ra +/* 85410C 80241F9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C.s deleted file mode 100644 index 78165b0a7a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024213C -/* 8542AC 8024213C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8542B0 80242140 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8542B4 80242144 10A00002 */ beqz $a1, .L80242150 -/* 8542B8 80242148 2402003C */ addiu $v0, $zero, 0x3c -/* 8542BC 8024214C AC820070 */ sw $v0, 0x70($a0) -.L80242150: -/* 8542C0 80242150 C4620080 */ lwc1 $f2, 0x80($v1) -/* 8542C4 80242154 3C0141F0 */ lui $at, 0x41f0 -/* 8542C8 80242158 44810000 */ mtc1 $at, $f0 -/* 8542CC 8024215C 00000000 */ nop -/* 8542D0 80242160 46001000 */ add.s $f0, $f2, $f0 -/* 8542D4 80242164 3C0143B4 */ lui $at, 0x43b4 -/* 8542D8 80242168 44811000 */ mtc1 $at, $f2 -/* 8542DC 8024216C 00000000 */ nop -/* 8542E0 80242170 4600103E */ c.le.s $f2, $f0 -/* 8542E4 80242174 00000000 */ nop -/* 8542E8 80242178 45000003 */ bc1f .L80242188 -/* 8542EC 8024217C E4600080 */ swc1 $f0, 0x80($v1) -/* 8542F0 80242180 46020001 */ sub.s $f0, $f0, $f2 -/* 8542F4 80242184 E4600080 */ swc1 $f0, 0x80($v1) -.L80242188: -/* 8542F8 80242188 8C820070 */ lw $v0, 0x70($a0) -/* 8542FC 8024218C 2442FFFF */ addiu $v0, $v0, -1 -/* 854300 80242190 AC820070 */ sw $v0, 0x70($a0) -/* 854304 80242194 000217C3 */ sra $v0, $v0, 0x1f -/* 854308 80242198 03E00008 */ jr $ra -/* 85430C 8024219C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s new file mode 100644 index 0000000000..bca1515ff1 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024213C_8542AC +/* 8542AC 8024213C 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 8542B0 80242140 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 8542B4 80242144 10A00002 */ beqz $a1, .L80242150 +/* 8542B8 80242148 2402003C */ addiu $v0, $zero, 0x3c +/* 8542BC 8024214C AC820070 */ sw $v0, 0x70($a0) +.L80242150: +/* 8542C0 80242150 C4620080 */ lwc1 $f2, 0x80($v1) +/* 8542C4 80242154 3C0141F0 */ lui $at, 0x41f0 +/* 8542C8 80242158 44810000 */ mtc1 $at, $f0 +/* 8542CC 8024215C 00000000 */ nop +/* 8542D0 80242160 46001000 */ add.s $f0, $f2, $f0 +/* 8542D4 80242164 3C0143B4 */ lui $at, 0x43b4 +/* 8542D8 80242168 44811000 */ mtc1 $at, $f2 +/* 8542DC 8024216C 00000000 */ nop +/* 8542E0 80242170 4600103E */ c.le.s $f2, $f0 +/* 8542E4 80242174 00000000 */ nop +/* 8542E8 80242178 45000003 */ bc1f .L80242188 +/* 8542EC 8024217C E4600080 */ swc1 $f0, 0x80($v1) +/* 8542F0 80242180 46020001 */ sub.s $f0, $f0, $f2 +/* 8542F4 80242184 E4600080 */ swc1 $f0, 0x80($v1) +.L80242188: +/* 8542F8 80242188 8C820070 */ lw $v0, 0x70($a0) +/* 8542FC 8024218C 2442FFFF */ addiu $v0, $v0, -1 +/* 854300 80242190 AC820070 */ sw $v0, 0x70($a0) +/* 854304 80242194 000217C3 */ sra $v0, $v0, 0x1f +/* 854308 80242198 03E00008 */ jr $ra +/* 85430C 8024219C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0.s deleted file mode 100644 index a861eb54c6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421A0 -/* 854310 802421A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 854314 802421A4 AFB10014 */ sw $s1, 0x14($sp) -/* 854318 802421A8 0080882D */ daddu $s1, $a0, $zero -/* 85431C 802421AC AFB00010 */ sw $s0, 0x10($sp) -/* 854320 802421B0 00A0802D */ daddu $s0, $a1, $zero -/* 854324 802421B4 AFBF0018 */ sw $ra, 0x18($sp) -/* 854328 802421B8 0C00EABB */ jal get_npc_unsafe -/* 85432C 802421BC 2404FFFC */ addiu $a0, $zero, -4 -/* 854330 802421C0 12000003 */ beqz $s0, .L802421D0 -/* 854334 802421C4 0040182D */ daddu $v1, $v0, $zero -/* 854338 802421C8 2402003C */ addiu $v0, $zero, 0x3c -/* 85433C 802421CC AE220070 */ sw $v0, 0x70($s1) -.L802421D0: -/* 854340 802421D0 C462000C */ lwc1 $f2, 0xc($v1) -/* 854344 802421D4 3C0141F0 */ lui $at, 0x41f0 -/* 854348 802421D8 44810000 */ mtc1 $at, $f0 -/* 85434C 802421DC 00000000 */ nop -/* 854350 802421E0 46001000 */ add.s $f0, $f2, $f0 -/* 854354 802421E4 3C0143B4 */ lui $at, 0x43b4 -/* 854358 802421E8 44811000 */ mtc1 $at, $f2 -/* 85435C 802421EC 00000000 */ nop -/* 854360 802421F0 4600103E */ c.le.s $f2, $f0 -/* 854364 802421F4 00000000 */ nop -/* 854368 802421F8 45000003 */ bc1f .L80242208 -/* 85436C 802421FC E460000C */ swc1 $f0, 0xc($v1) -/* 854370 80242200 46020001 */ sub.s $f0, $f0, $f2 -/* 854374 80242204 E460000C */ swc1 $f0, 0xc($v1) -.L80242208: -/* 854378 80242208 8E230070 */ lw $v1, 0x70($s1) -/* 85437C 8024220C 2463FFFF */ addiu $v1, $v1, -1 -/* 854380 80242210 000317C3 */ sra $v0, $v1, 0x1f -/* 854384 80242214 AE230070 */ sw $v1, 0x70($s1) -/* 854388 80242218 8FBF0018 */ lw $ra, 0x18($sp) -/* 85438C 8024221C 8FB10014 */ lw $s1, 0x14($sp) -/* 854390 80242220 8FB00010 */ lw $s0, 0x10($sp) -/* 854394 80242224 30420002 */ andi $v0, $v0, 2 -/* 854398 80242228 03E00008 */ jr $ra -/* 85439C 8024222C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s new file mode 100644 index 0000000000..5b145b0814 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421A0_854310 +/* 854310 802421A0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 854314 802421A4 AFB10014 */ sw $s1, 0x14($sp) +/* 854318 802421A8 0080882D */ daddu $s1, $a0, $zero +/* 85431C 802421AC AFB00010 */ sw $s0, 0x10($sp) +/* 854320 802421B0 00A0802D */ daddu $s0, $a1, $zero +/* 854324 802421B4 AFBF0018 */ sw $ra, 0x18($sp) +/* 854328 802421B8 0C00EABB */ jal get_npc_unsafe +/* 85432C 802421BC 2404FFFC */ addiu $a0, $zero, -4 +/* 854330 802421C0 12000003 */ beqz $s0, .L802421D0 +/* 854334 802421C4 0040182D */ daddu $v1, $v0, $zero +/* 854338 802421C8 2402003C */ addiu $v0, $zero, 0x3c +/* 85433C 802421CC AE220070 */ sw $v0, 0x70($s1) +.L802421D0: +/* 854340 802421D0 C462000C */ lwc1 $f2, 0xc($v1) +/* 854344 802421D4 3C0141F0 */ lui $at, 0x41f0 +/* 854348 802421D8 44810000 */ mtc1 $at, $f0 +/* 85434C 802421DC 00000000 */ nop +/* 854350 802421E0 46001000 */ add.s $f0, $f2, $f0 +/* 854354 802421E4 3C0143B4 */ lui $at, 0x43b4 +/* 854358 802421E8 44811000 */ mtc1 $at, $f2 +/* 85435C 802421EC 00000000 */ nop +/* 854360 802421F0 4600103E */ c.le.s $f2, $f0 +/* 854364 802421F4 00000000 */ nop +/* 854368 802421F8 45000003 */ bc1f .L80242208 +/* 85436C 802421FC E460000C */ swc1 $f0, 0xc($v1) +/* 854370 80242200 46020001 */ sub.s $f0, $f0, $f2 +/* 854374 80242204 E460000C */ swc1 $f0, 0xc($v1) +.L80242208: +/* 854378 80242208 8E230070 */ lw $v1, 0x70($s1) +/* 85437C 8024220C 2463FFFF */ addiu $v1, $v1, -1 +/* 854380 80242210 000317C3 */ sra $v0, $v1, 0x1f +/* 854384 80242214 AE230070 */ sw $v1, 0x70($s1) +/* 854388 80242218 8FBF0018 */ lw $ra, 0x18($sp) +/* 85438C 8024221C 8FB10014 */ lw $s1, 0x14($sp) +/* 854390 80242220 8FB00010 */ lw $s0, 0x10($sp) +/* 854394 80242224 30420002 */ andi $v0, $v0, 2 +/* 854398 80242228 03E00008 */ jr $ra +/* 85439C 8024222C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318.s deleted file mode 100644 index aade2b8494..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242318 -/* 854488 80242318 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 85448C 8024231C 3C058025 */ lui $a1, 0x8025 -/* 854490 80242320 8CA529E8 */ lw $a1, 0x29e8($a1) -/* 854494 80242324 AFBF0010 */ sw $ra, 0x10($sp) -/* 854498 80242328 0C0B1EAF */ jal get_variable -/* 85449C 8024232C 0000202D */ daddu $a0, $zero, $zero -/* 8544A0 80242330 0040182D */ daddu $v1, $v0, $zero -/* 8544A4 80242334 24020001 */ addiu $v0, $zero, 1 -/* 8544A8 80242338 14620006 */ bne $v1, $v0, .L80242354 -/* 8544AC 8024233C 24020002 */ addiu $v0, $zero, 2 -/* 8544B0 80242340 44800000 */ mtc1 $zero, $f0 -/* 8544B4 80242344 00000000 */ nop -/* 8544B8 80242348 44050000 */ mfc1 $a1, $f0 -/* 8544BC 8024234C 080908DB */ j .L8024236C -/* 8544C0 80242350 0000202D */ daddu $a0, $zero, $zero -.L80242354: -/* 8544C4 80242354 14620008 */ bne $v1, $v0, .L80242378 -/* 8544C8 80242358 24040001 */ addiu $a0, $zero, 1 -/* 8544CC 8024235C 44800000 */ mtc1 $zero, $f0 -/* 8544D0 80242360 00000000 */ nop -/* 8544D4 80242364 44050000 */ mfc1 $a1, $f0 -/* 8544D8 80242368 00000000 */ nop -.L8024236C: -/* 8544DC 8024236C 00A0302D */ daddu $a2, $a1, $zero -/* 8544E0 80242370 0C01C5A4 */ jal func_80071690 -/* 8544E4 80242374 00A0382D */ daddu $a3, $a1, $zero -.L80242378: -/* 8544E8 80242378 8FBF0010 */ lw $ra, 0x10($sp) -/* 8544EC 8024237C 03E00008 */ jr $ra -/* 8544F0 80242380 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s new file mode 100644 index 0000000000..7ce3925f37 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242318_854488.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242318_854488 +/* 854488 80242318 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 85448C 8024231C 3C058025 */ lui $a1, 0x8025 +/* 854490 80242320 8CA529E8 */ lw $a1, 0x29e8($a1) +/* 854494 80242324 AFBF0010 */ sw $ra, 0x10($sp) +/* 854498 80242328 0C0B1EAF */ jal get_variable +/* 85449C 8024232C 0000202D */ daddu $a0, $zero, $zero +/* 8544A0 80242330 0040182D */ daddu $v1, $v0, $zero +/* 8544A4 80242334 24020001 */ addiu $v0, $zero, 1 +/* 8544A8 80242338 14620006 */ bne $v1, $v0, .L80242354 +/* 8544AC 8024233C 24020002 */ addiu $v0, $zero, 2 +/* 8544B0 80242340 44800000 */ mtc1 $zero, $f0 +/* 8544B4 80242344 00000000 */ nop +/* 8544B8 80242348 44050000 */ mfc1 $a1, $f0 +/* 8544BC 8024234C 080908DB */ j .L8024236C +/* 8544C0 80242350 0000202D */ daddu $a0, $zero, $zero +.L80242354: +/* 8544C4 80242354 14620008 */ bne $v1, $v0, .L80242378 +/* 8544C8 80242358 24040001 */ addiu $a0, $zero, 1 +/* 8544CC 8024235C 44800000 */ mtc1 $zero, $f0 +/* 8544D0 80242360 00000000 */ nop +/* 8544D4 80242364 44050000 */ mfc1 $a1, $f0 +/* 8544D8 80242368 00000000 */ nop +.L8024236C: +/* 8544DC 8024236C 00A0302D */ daddu $a2, $a1, $zero +/* 8544E0 80242370 0C01C5A4 */ jal func_80071690 +/* 8544E4 80242374 00A0382D */ daddu $a3, $a1, $zero +.L80242378: +/* 8544E8 80242378 8FBF0010 */ lw $ra, 0x10($sp) +/* 8544EC 8024237C 03E00008 */ jr $ra +/* 8544F0 80242380 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0.s deleted file mode 100644 index 955c63fb65..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425E0 -/* 854750 802425E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 854754 802425E4 AFBF0010 */ sw $ra, 0x10($sp) -/* 854758 802425E8 10A00003 */ beqz $a1, .L802425F8 -/* 85475C 802425EC 8C86000C */ lw $a2, 0xc($a0) -/* 854760 802425F0 3C018024 */ lui $at, 0x8024 -/* 854764 802425F4 AC2076D8 */ sw $zero, 0x76d8($at) -.L802425F8: -/* 854768 802425F8 3C038024 */ lui $v1, 0x8024 -/* 85476C 802425FC 246376D8 */ addiu $v1, $v1, 0x76d8 -/* 854770 80242600 8C620000 */ lw $v0, ($v1) -/* 854774 80242604 54400003 */ bnel $v0, $zero, .L80242614 -/* 854778 80242608 AC600000 */ sw $zero, ($v1) -/* 85477C 8024260C 0809098A */ j .L80242628 -/* 854780 80242610 0000102D */ daddu $v0, $zero, $zero -.L80242614: -/* 854784 80242614 8CC50000 */ lw $a1, ($a2) -/* 854788 80242618 3C068024 */ lui $a2, 0x8024 -/* 85478C 8024261C 0C0B2026 */ jal set_variable -/* 854790 80242620 8CC676DC */ lw $a2, 0x76dc($a2) -/* 854794 80242624 24020002 */ addiu $v0, $zero, 2 -.L80242628: -/* 854798 80242628 8FBF0010 */ lw $ra, 0x10($sp) -/* 85479C 8024262C 03E00008 */ jr $ra -/* 8547A0 80242630 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s new file mode 100644 index 0000000000..e5caa98222 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802425E0_854750.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425E0_854750 +/* 854750 802425E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 854754 802425E4 AFBF0010 */ sw $ra, 0x10($sp) +/* 854758 802425E8 10A00003 */ beqz $a1, .L802425F8 +/* 85475C 802425EC 8C86000C */ lw $a2, 0xc($a0) +/* 854760 802425F0 3C018024 */ lui $at, 0x8024 +/* 854764 802425F4 AC2076D8 */ sw $zero, 0x76d8($at) +.L802425F8: +/* 854768 802425F8 3C038024 */ lui $v1, 0x8024 +/* 85476C 802425FC 246376D8 */ addiu $v1, $v1, 0x76d8 +/* 854770 80242600 8C620000 */ lw $v0, ($v1) +/* 854774 80242604 54400003 */ bnel $v0, $zero, .L80242614 +/* 854778 80242608 AC600000 */ sw $zero, ($v1) +/* 85477C 8024260C 0809098A */ j .L80242628 +/* 854780 80242610 0000102D */ daddu $v0, $zero, $zero +.L80242614: +/* 854784 80242614 8CC50000 */ lw $a1, ($a2) +/* 854788 80242618 3C068024 */ lui $a2, 0x8024 +/* 85478C 8024261C 0C0B2026 */ jal set_variable +/* 854790 80242620 8CC676DC */ lw $a2, 0x76dc($a2) +/* 854794 80242624 24020002 */ addiu $v0, $zero, 2 +.L80242628: +/* 854798 80242628 8FBF0010 */ lw $ra, 0x10($sp) +/* 85479C 8024262C 03E00008 */ jr $ra +/* 8547A0 80242630 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634.s deleted file mode 100644 index edf73949b0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242634 -/* 8547A4 80242634 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8547A8 80242638 AFBF0010 */ sw $ra, 0x10($sp) -/* 8547AC 8024263C 8C82000C */ lw $v0, 0xc($a0) -/* 8547B0 80242640 0C0B1EAF */ jal get_variable -/* 8547B4 80242644 8C450000 */ lw $a1, ($v0) -/* 8547B8 80242648 3C018024 */ lui $at, 0x8024 -/* 8547BC 8024264C AC2276DC */ sw $v0, 0x76dc($at) -/* 8547C0 80242650 24020002 */ addiu $v0, $zero, 2 -/* 8547C4 80242654 8FBF0010 */ lw $ra, 0x10($sp) -/* 8547C8 80242658 24030001 */ addiu $v1, $zero, 1 -/* 8547CC 8024265C 3C018024 */ lui $at, 0x8024 -/* 8547D0 80242660 AC2376D8 */ sw $v1, 0x76d8($at) -/* 8547D4 80242664 03E00008 */ jr $ra -/* 8547D8 80242668 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s new file mode 100644 index 0000000000..114ab93f34 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242634_8547A4.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242634_8547A4 +/* 8547A4 80242634 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8547A8 80242638 AFBF0010 */ sw $ra, 0x10($sp) +/* 8547AC 8024263C 8C82000C */ lw $v0, 0xc($a0) +/* 8547B0 80242640 0C0B1EAF */ jal get_variable +/* 8547B4 80242644 8C450000 */ lw $a1, ($v0) +/* 8547B8 80242648 3C018024 */ lui $at, 0x8024 +/* 8547BC 8024264C AC2276DC */ sw $v0, 0x76dc($at) +/* 8547C0 80242650 24020002 */ addiu $v0, $zero, 2 +/* 8547C4 80242654 8FBF0010 */ lw $ra, 0x10($sp) +/* 8547C8 80242658 24030001 */ addiu $v1, $zero, 1 +/* 8547CC 8024265C 3C018024 */ lui $at, 0x8024 +/* 8547D0 80242660 AC2376D8 */ sw $v1, 0x76d8($at) +/* 8547D4 80242664 03E00008 */ jr $ra +/* 8547D8 80242668 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C.s deleted file mode 100644 index 734d877795..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024266C -/* 8547DC 8024266C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8547E0 80242670 AFBF0010 */ sw $ra, 0x10($sp) -/* 8547E4 80242674 8C82000C */ lw $v0, 0xc($a0) -/* 8547E8 80242678 0C0B1EAF */ jal get_variable -/* 8547EC 8024267C 8C450000 */ lw $a1, ($v0) -/* 8547F0 80242680 0040182D */ daddu $v1, $v0, $zero -/* 8547F4 80242684 10600012 */ beqz $v1, .L802426D0 -/* 8547F8 80242688 0000202D */ daddu $a0, $zero, $zero -/* 8547FC 8024268C 8C620000 */ lw $v0, ($v1) -/* 854800 80242690 5040000A */ beql $v0, $zero, .L802426BC -/* 854804 80242694 00041080 */ sll $v0, $a0, 2 -/* 854808 80242698 3C058025 */ lui $a1, 0x8025 -/* 85480C 8024269C 24A52A00 */ addiu $a1, $a1, 0x2a00 -.L802426A0: -/* 854810 802426A0 24630004 */ addiu $v1, $v1, 4 -/* 854814 802426A4 24840001 */ addiu $a0, $a0, 1 -/* 854818 802426A8 ACA20000 */ sw $v0, ($a1) -/* 85481C 802426AC 8C620000 */ lw $v0, ($v1) -/* 854820 802426B0 1440FFFB */ bnez $v0, .L802426A0 -/* 854824 802426B4 24A50004 */ addiu $a1, $a1, 4 -/* 854828 802426B8 00041080 */ sll $v0, $a0, 2 -.L802426BC: -/* 85482C 802426BC 3C018025 */ lui $at, 0x8025 -/* 854830 802426C0 00220821 */ addu $at, $at, $v0 -/* 854834 802426C4 AC202A00 */ sw $zero, 0x2a00($at) -/* 854838 802426C8 080909BE */ j .L802426F8 -/* 85483C 802426CC 00000000 */ nop -.L802426D0: -/* 854840 802426D0 3C038025 */ lui $v1, 0x8025 -/* 854844 802426D4 24632A00 */ addiu $v1, $v1, 0x2a00 -/* 854848 802426D8 0060282D */ daddu $a1, $v1, $zero -.L802426DC: -/* 85484C 802426DC 24820010 */ addiu $v0, $a0, 0x10 -/* 854850 802426E0 AC620000 */ sw $v0, ($v1) -/* 854854 802426E4 24630004 */ addiu $v1, $v1, 4 -/* 854858 802426E8 24840001 */ addiu $a0, $a0, 1 -/* 85485C 802426EC 28820070 */ slti $v0, $a0, 0x70 -/* 854860 802426F0 1440FFFA */ bnez $v0, .L802426DC -/* 854864 802426F4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802426F8: -/* 854868 802426F8 8FBF0010 */ lw $ra, 0x10($sp) -/* 85486C 802426FC 24020002 */ addiu $v0, $zero, 2 -/* 854870 80242700 03E00008 */ jr $ra -/* 854874 80242704 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s new file mode 100644 index 0000000000..082099d8b7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024266C_8547DC.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024266C_8547DC +/* 8547DC 8024266C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8547E0 80242670 AFBF0010 */ sw $ra, 0x10($sp) +/* 8547E4 80242674 8C82000C */ lw $v0, 0xc($a0) +/* 8547E8 80242678 0C0B1EAF */ jal get_variable +/* 8547EC 8024267C 8C450000 */ lw $a1, ($v0) +/* 8547F0 80242680 0040182D */ daddu $v1, $v0, $zero +/* 8547F4 80242684 10600012 */ beqz $v1, .L802426D0 +/* 8547F8 80242688 0000202D */ daddu $a0, $zero, $zero +/* 8547FC 8024268C 8C620000 */ lw $v0, ($v1) +/* 854800 80242690 5040000A */ beql $v0, $zero, .L802426BC +/* 854804 80242694 00041080 */ sll $v0, $a0, 2 +/* 854808 80242698 3C058025 */ lui $a1, 0x8025 +/* 85480C 8024269C 24A52A00 */ addiu $a1, $a1, 0x2a00 +.L802426A0: +/* 854810 802426A0 24630004 */ addiu $v1, $v1, 4 +/* 854814 802426A4 24840001 */ addiu $a0, $a0, 1 +/* 854818 802426A8 ACA20000 */ sw $v0, ($a1) +/* 85481C 802426AC 8C620000 */ lw $v0, ($v1) +/* 854820 802426B0 1440FFFB */ bnez $v0, .L802426A0 +/* 854824 802426B4 24A50004 */ addiu $a1, $a1, 4 +/* 854828 802426B8 00041080 */ sll $v0, $a0, 2 +.L802426BC: +/* 85482C 802426BC 3C018025 */ lui $at, 0x8025 +/* 854830 802426C0 00220821 */ addu $at, $at, $v0 +/* 854834 802426C4 AC202A00 */ sw $zero, 0x2a00($at) +/* 854838 802426C8 080909BE */ j .L802426F8 +/* 85483C 802426CC 00000000 */ nop +.L802426D0: +/* 854840 802426D0 3C038025 */ lui $v1, 0x8025 +/* 854844 802426D4 24632A00 */ addiu $v1, $v1, 0x2a00 +/* 854848 802426D8 0060282D */ daddu $a1, $v1, $zero +.L802426DC: +/* 85484C 802426DC 24820010 */ addiu $v0, $a0, 0x10 +/* 854850 802426E0 AC620000 */ sw $v0, ($v1) +/* 854854 802426E4 24630004 */ addiu $v1, $v1, 4 +/* 854858 802426E8 24840001 */ addiu $a0, $a0, 1 +/* 85485C 802426EC 28820070 */ slti $v0, $a0, 0x70 +/* 854860 802426F0 1440FFFA */ bnez $v0, .L802426DC +/* 854864 802426F4 ACA001C0 */ sw $zero, 0x1c0($a1) +.L802426F8: +/* 854868 802426F8 8FBF0010 */ lw $ra, 0x10($sp) +/* 85486C 802426FC 24020002 */ addiu $v0, $zero, 2 +/* 854870 80242700 03E00008 */ jr $ra +/* 854874 80242704 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708.s deleted file mode 100644 index dc8b39c413..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242708 -/* 854878 80242708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 85487C 8024270C AFBF0010 */ sw $ra, 0x10($sp) -/* 854880 80242710 8C82000C */ lw $v0, 0xc($a0) -/* 854884 80242714 0C0B1EAF */ jal get_variable -/* 854888 80242718 8C450000 */ lw $a1, ($v0) -/* 85488C 8024271C 0040182D */ daddu $v1, $v0, $zero -/* 854890 80242720 10600012 */ beqz $v1, .L8024276C -/* 854894 80242724 0000202D */ daddu $a0, $zero, $zero -/* 854898 80242728 8C620000 */ lw $v0, ($v1) -/* 85489C 8024272C 5040000A */ beql $v0, $zero, .L80242758 -/* 8548A0 80242730 00041080 */ sll $v0, $a0, 2 -/* 8548A4 80242734 3C058025 */ lui $a1, 0x8025 -/* 8548A8 80242738 24A52BC8 */ addiu $a1, $a1, 0x2bc8 -.L8024273C: -/* 8548AC 8024273C 24630004 */ addiu $v1, $v1, 4 -/* 8548B0 80242740 24840001 */ addiu $a0, $a0, 1 -/* 8548B4 80242744 ACA20000 */ sw $v0, ($a1) -/* 8548B8 80242748 8C620000 */ lw $v0, ($v1) -/* 8548BC 8024274C 1440FFFB */ bnez $v0, .L8024273C -/* 8548C0 80242750 24A50004 */ addiu $a1, $a1, 4 -/* 8548C4 80242754 00041080 */ sll $v0, $a0, 2 -.L80242758: -/* 8548C8 80242758 3C018025 */ lui $at, 0x8025 -/* 8548CC 8024275C 00220821 */ addu $at, $at, $v0 -/* 8548D0 80242760 AC202BC8 */ sw $zero, 0x2bc8($at) -/* 8548D4 80242764 080909E5 */ j .L80242794 -/* 8548D8 80242768 00000000 */ nop -.L8024276C: -/* 8548DC 8024276C 3C038025 */ lui $v1, 0x8025 -/* 8548E0 80242770 24632BC8 */ addiu $v1, $v1, 0x2bc8 -/* 8548E4 80242774 0060282D */ daddu $a1, $v1, $zero -.L80242778: -/* 8548E8 80242778 24820080 */ addiu $v0, $a0, 0x80 -/* 8548EC 8024277C AC620000 */ sw $v0, ($v1) -/* 8548F0 80242780 24630004 */ addiu $v1, $v1, 4 -/* 8548F4 80242784 24840001 */ addiu $a0, $a0, 1 -/* 8548F8 80242788 2882005B */ slti $v0, $a0, 0x5b -/* 8548FC 8024278C 1440FFFA */ bnez $v0, .L80242778 -/* 854900 80242790 ACA0016C */ sw $zero, 0x16c($a1) -.L80242794: -/* 854904 80242794 8FBF0010 */ lw $ra, 0x10($sp) -/* 854908 80242798 24020002 */ addiu $v0, $zero, 2 -/* 85490C 8024279C 03E00008 */ jr $ra -/* 854910 802427A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s new file mode 100644 index 0000000000..2184854b07 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242708_854878.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242708_854878 +/* 854878 80242708 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 85487C 8024270C AFBF0010 */ sw $ra, 0x10($sp) +/* 854880 80242710 8C82000C */ lw $v0, 0xc($a0) +/* 854884 80242714 0C0B1EAF */ jal get_variable +/* 854888 80242718 8C450000 */ lw $a1, ($v0) +/* 85488C 8024271C 0040182D */ daddu $v1, $v0, $zero +/* 854890 80242720 10600012 */ beqz $v1, .L8024276C +/* 854894 80242724 0000202D */ daddu $a0, $zero, $zero +/* 854898 80242728 8C620000 */ lw $v0, ($v1) +/* 85489C 8024272C 5040000A */ beql $v0, $zero, .L80242758 +/* 8548A0 80242730 00041080 */ sll $v0, $a0, 2 +/* 8548A4 80242734 3C058025 */ lui $a1, 0x8025 +/* 8548A8 80242738 24A52BC8 */ addiu $a1, $a1, 0x2bc8 +.L8024273C: +/* 8548AC 8024273C 24630004 */ addiu $v1, $v1, 4 +/* 8548B0 80242740 24840001 */ addiu $a0, $a0, 1 +/* 8548B4 80242744 ACA20000 */ sw $v0, ($a1) +/* 8548B8 80242748 8C620000 */ lw $v0, ($v1) +/* 8548BC 8024274C 1440FFFB */ bnez $v0, .L8024273C +/* 8548C0 80242750 24A50004 */ addiu $a1, $a1, 4 +/* 8548C4 80242754 00041080 */ sll $v0, $a0, 2 +.L80242758: +/* 8548C8 80242758 3C018025 */ lui $at, 0x8025 +/* 8548CC 8024275C 00220821 */ addu $at, $at, $v0 +/* 8548D0 80242760 AC202BC8 */ sw $zero, 0x2bc8($at) +/* 8548D4 80242764 080909E5 */ j .L80242794 +/* 8548D8 80242768 00000000 */ nop +.L8024276C: +/* 8548DC 8024276C 3C038025 */ lui $v1, 0x8025 +/* 8548E0 80242770 24632BC8 */ addiu $v1, $v1, 0x2bc8 +/* 8548E4 80242774 0060282D */ daddu $a1, $v1, $zero +.L80242778: +/* 8548E8 80242778 24820080 */ addiu $v0, $a0, 0x80 +/* 8548EC 8024277C AC620000 */ sw $v0, ($v1) +/* 8548F0 80242780 24630004 */ addiu $v1, $v1, 4 +/* 8548F4 80242784 24840001 */ addiu $a0, $a0, 1 +/* 8548F8 80242788 2882005B */ slti $v0, $a0, 0x5b +/* 8548FC 8024278C 1440FFFA */ bnez $v0, .L80242778 +/* 854900 80242790 ACA0016C */ sw $zero, 0x16c($a1) +.L80242794: +/* 854904 80242794 8FBF0010 */ lw $ra, 0x10($sp) +/* 854908 80242798 24020002 */ addiu $v0, $zero, 2 +/* 85490C 8024279C 03E00008 */ jr $ra +/* 854910 802427A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802427A4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802427A4.s deleted file mode 100644 index 8a4436388f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802427A4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427A4 -/* 854914 802427A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 854918 802427A8 AFB10014 */ sw $s1, 0x14($sp) -/* 85491C 802427AC 0080882D */ daddu $s1, $a0, $zero -/* 854920 802427B0 AFBF0018 */ sw $ra, 0x18($sp) -/* 854924 802427B4 AFB00010 */ sw $s0, 0x10($sp) -/* 854928 802427B8 8E30000C */ lw $s0, 0xc($s1) -/* 85492C 802427BC 8E050000 */ lw $a1, ($s0) -/* 854930 802427C0 0C0B1EAF */ jal get_variable -/* 854934 802427C4 26100004 */ addiu $s0, $s0, 4 -/* 854938 802427C8 AE22008C */ sw $v0, 0x8c($s1) -/* 85493C 802427CC 8E050000 */ lw $a1, ($s0) -/* 854940 802427D0 26100004 */ addiu $s0, $s0, 4 -/* 854944 802427D4 0C0B1EAF */ jal get_variable -/* 854948 802427D8 0220202D */ daddu $a0, $s1, $zero -/* 85494C 802427DC AE220090 */ sw $v0, 0x90($s1) -/* 854950 802427E0 8E050000 */ lw $a1, ($s0) -/* 854954 802427E4 26100004 */ addiu $s0, $s0, 4 -/* 854958 802427E8 0C0B1EAF */ jal get_variable -/* 85495C 802427EC 0220202D */ daddu $a0, $s1, $zero -/* 854960 802427F0 AE220094 */ sw $v0, 0x94($s1) -/* 854964 802427F4 8E050000 */ lw $a1, ($s0) -/* 854968 802427F8 26100004 */ addiu $s0, $s0, 4 -/* 85496C 802427FC 0C0B1EAF */ jal get_variable -/* 854970 80242800 0220202D */ daddu $a0, $s1, $zero -/* 854974 80242804 AE220098 */ sw $v0, 0x98($s1) -/* 854978 80242808 8E050000 */ lw $a1, ($s0) -/* 85497C 8024280C 26100004 */ addiu $s0, $s0, 4 -/* 854980 80242810 0C0B1EAF */ jal get_variable -/* 854984 80242814 0220202D */ daddu $a0, $s1, $zero -/* 854988 80242818 AE22009C */ sw $v0, 0x9c($s1) -/* 85498C 8024281C 8E050000 */ lw $a1, ($s0) -/* 854990 80242820 26100004 */ addiu $s0, $s0, 4 -/* 854994 80242824 0C0B1EAF */ jal get_variable -/* 854998 80242828 0220202D */ daddu $a0, $s1, $zero -/* 85499C 8024282C AE2200A0 */ sw $v0, 0xa0($s1) -/* 8549A0 80242830 8E050000 */ lw $a1, ($s0) -/* 8549A4 80242834 26100004 */ addiu $s0, $s0, 4 -/* 8549A8 80242838 0C0B1EAF */ jal get_variable -/* 8549AC 8024283C 0220202D */ daddu $a0, $s1, $zero -/* 8549B0 80242840 AE2200A4 */ sw $v0, 0xa4($s1) -/* 8549B4 80242844 8E050000 */ lw $a1, ($s0) -/* 8549B8 80242848 26100004 */ addiu $s0, $s0, 4 -/* 8549BC 8024284C 0C0B1EAF */ jal get_variable -/* 8549C0 80242850 0220202D */ daddu $a0, $s1, $zero -/* 8549C4 80242854 AE2200A8 */ sw $v0, 0xa8($s1) -/* 8549C8 80242858 8E050000 */ lw $a1, ($s0) -/* 8549CC 8024285C 26100004 */ addiu $s0, $s0, 4 -/* 8549D0 80242860 0C0B1EAF */ jal get_variable -/* 8549D4 80242864 0220202D */ daddu $a0, $s1, $zero -/* 8549D8 80242868 AE2200AC */ sw $v0, 0xac($s1) -/* 8549DC 8024286C 8E050000 */ lw $a1, ($s0) -/* 8549E0 80242870 0C0B1EAF */ jal get_variable -/* 8549E4 80242874 0220202D */ daddu $a0, $s1, $zero -/* 8549E8 80242878 AE2200B0 */ sw $v0, 0xb0($s1) -/* 8549EC 8024287C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8549F0 80242880 8FB10014 */ lw $s1, 0x14($sp) -/* 8549F4 80242884 8FB00010 */ lw $s0, 0x10($sp) -/* 8549F8 80242888 24020002 */ addiu $v0, $zero, 2 -/* 8549FC 8024288C 03E00008 */ jr $ra -/* 854A00 80242890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802427A4_854914.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802427A4_854914.s new file mode 100644 index 0000000000..f3721fcf4d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802427A4_854914.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427A4_854914 +/* 854914 802427A4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 854918 802427A8 AFB10014 */ sw $s1, 0x14($sp) +/* 85491C 802427AC 0080882D */ daddu $s1, $a0, $zero +/* 854920 802427B0 AFBF0018 */ sw $ra, 0x18($sp) +/* 854924 802427B4 AFB00010 */ sw $s0, 0x10($sp) +/* 854928 802427B8 8E30000C */ lw $s0, 0xc($s1) +/* 85492C 802427BC 8E050000 */ lw $a1, ($s0) +/* 854930 802427C0 0C0B1EAF */ jal get_variable +/* 854934 802427C4 26100004 */ addiu $s0, $s0, 4 +/* 854938 802427C8 AE22008C */ sw $v0, 0x8c($s1) +/* 85493C 802427CC 8E050000 */ lw $a1, ($s0) +/* 854940 802427D0 26100004 */ addiu $s0, $s0, 4 +/* 854944 802427D4 0C0B1EAF */ jal get_variable +/* 854948 802427D8 0220202D */ daddu $a0, $s1, $zero +/* 85494C 802427DC AE220090 */ sw $v0, 0x90($s1) +/* 854950 802427E0 8E050000 */ lw $a1, ($s0) +/* 854954 802427E4 26100004 */ addiu $s0, $s0, 4 +/* 854958 802427E8 0C0B1EAF */ jal get_variable +/* 85495C 802427EC 0220202D */ daddu $a0, $s1, $zero +/* 854960 802427F0 AE220094 */ sw $v0, 0x94($s1) +/* 854964 802427F4 8E050000 */ lw $a1, ($s0) +/* 854968 802427F8 26100004 */ addiu $s0, $s0, 4 +/* 85496C 802427FC 0C0B1EAF */ jal get_variable +/* 854970 80242800 0220202D */ daddu $a0, $s1, $zero +/* 854974 80242804 AE220098 */ sw $v0, 0x98($s1) +/* 854978 80242808 8E050000 */ lw $a1, ($s0) +/* 85497C 8024280C 26100004 */ addiu $s0, $s0, 4 +/* 854980 80242810 0C0B1EAF */ jal get_variable +/* 854984 80242814 0220202D */ daddu $a0, $s1, $zero +/* 854988 80242818 AE22009C */ sw $v0, 0x9c($s1) +/* 85498C 8024281C 8E050000 */ lw $a1, ($s0) +/* 854990 80242820 26100004 */ addiu $s0, $s0, 4 +/* 854994 80242824 0C0B1EAF */ jal get_variable +/* 854998 80242828 0220202D */ daddu $a0, $s1, $zero +/* 85499C 8024282C AE2200A0 */ sw $v0, 0xa0($s1) +/* 8549A0 80242830 8E050000 */ lw $a1, ($s0) +/* 8549A4 80242834 26100004 */ addiu $s0, $s0, 4 +/* 8549A8 80242838 0C0B1EAF */ jal get_variable +/* 8549AC 8024283C 0220202D */ daddu $a0, $s1, $zero +/* 8549B0 80242840 AE2200A4 */ sw $v0, 0xa4($s1) +/* 8549B4 80242844 8E050000 */ lw $a1, ($s0) +/* 8549B8 80242848 26100004 */ addiu $s0, $s0, 4 +/* 8549BC 8024284C 0C0B1EAF */ jal get_variable +/* 8549C0 80242850 0220202D */ daddu $a0, $s1, $zero +/* 8549C4 80242854 AE2200A8 */ sw $v0, 0xa8($s1) +/* 8549C8 80242858 8E050000 */ lw $a1, ($s0) +/* 8549CC 8024285C 26100004 */ addiu $s0, $s0, 4 +/* 8549D0 80242860 0C0B1EAF */ jal get_variable +/* 8549D4 80242864 0220202D */ daddu $a0, $s1, $zero +/* 8549D8 80242868 AE2200AC */ sw $v0, 0xac($s1) +/* 8549DC 8024286C 8E050000 */ lw $a1, ($s0) +/* 8549E0 80242870 0C0B1EAF */ jal get_variable +/* 8549E4 80242874 0220202D */ daddu $a0, $s1, $zero +/* 8549E8 80242878 AE2200B0 */ sw $v0, 0xb0($s1) +/* 8549EC 8024287C 8FBF0018 */ lw $ra, 0x18($sp) +/* 8549F0 80242880 8FB10014 */ lw $s1, 0x14($sp) +/* 8549F4 80242884 8FB00010 */ lw $s0, 0x10($sp) +/* 8549F8 80242888 24020002 */ addiu $v0, $zero, 2 +/* 8549FC 8024288C 03E00008 */ jr $ra +/* 854A00 80242890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894.s deleted file mode 100644 index 18c00442a5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242894 -/* 854A04 80242894 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 854A08 80242898 AFB1001C */ sw $s1, 0x1c($sp) -/* 854A0C 8024289C 0080882D */ daddu $s1, $a0, $zero -/* 854A10 802428A0 AFBF0034 */ sw $ra, 0x34($sp) -/* 854A14 802428A4 AFB60030 */ sw $s6, 0x30($sp) -/* 854A18 802428A8 AFB5002C */ sw $s5, 0x2c($sp) -/* 854A1C 802428AC AFB40028 */ sw $s4, 0x28($sp) -/* 854A20 802428B0 AFB30024 */ sw $s3, 0x24($sp) -/* 854A24 802428B4 AFB20020 */ sw $s2, 0x20($sp) -/* 854A28 802428B8 AFB00018 */ sw $s0, 0x18($sp) -/* 854A2C 802428BC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 854A30 802428C0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 854A34 802428C4 8E30000C */ lw $s0, 0xc($s1) -/* 854A38 802428C8 8E160000 */ lw $s6, ($s0) -/* 854A3C 802428CC 26100004 */ addiu $s0, $s0, 4 -/* 854A40 802428D0 0C0B1EAF */ jal get_variable -/* 854A44 802428D4 02C0282D */ daddu $a1, $s6, $zero -/* 854A48 802428D8 44820000 */ mtc1 $v0, $f0 -/* 854A4C 802428DC 00000000 */ nop -/* 854A50 802428E0 46800020 */ cvt.s.w $f0, $f0 -/* 854A54 802428E4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 854A58 802428E8 8E140000 */ lw $s4, ($s0) -/* 854A5C 802428EC 26100004 */ addiu $s0, $s0, 4 -/* 854A60 802428F0 0220202D */ daddu $a0, $s1, $zero -/* 854A64 802428F4 0C0B1EAF */ jal get_variable -/* 854A68 802428F8 0280282D */ daddu $a1, $s4, $zero -/* 854A6C 802428FC 0220202D */ daddu $a0, $s1, $zero -/* 854A70 80242900 8E150000 */ lw $s5, ($s0) -/* 854A74 80242904 4482B000 */ mtc1 $v0, $f22 -/* 854A78 80242908 00000000 */ nop -/* 854A7C 8024290C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 854A80 80242910 0C0B1EAF */ jal get_variable -/* 854A84 80242914 02A0282D */ daddu $a1, $s5, $zero -/* 854A88 80242918 2404FFFC */ addiu $a0, $zero, -4 -/* 854A8C 8024291C 44820000 */ mtc1 $v0, $f0 -/* 854A90 80242920 00000000 */ nop -/* 854A94 80242924 46800020 */ cvt.s.w $f0, $f0 -/* 854A98 80242928 0C00EABB */ jal get_npc_unsafe -/* 854A9C 8024292C E7A00014 */ swc1 $f0, 0x14($sp) -/* 854AA0 80242930 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 854AA4 80242934 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 854AA8 80242938 3C014334 */ lui $at, 0x4334 -/* 854AAC 8024293C 44816000 */ mtc1 $at, $f12 -/* 854AB0 80242940 00041880 */ sll $v1, $a0, 2 -/* 854AB4 80242944 00641821 */ addu $v1, $v1, $a0 -/* 854AB8 80242948 00031880 */ sll $v1, $v1, 2 -/* 854ABC 8024294C 00641823 */ subu $v1, $v1, $a0 -/* 854AC0 80242950 000320C0 */ sll $a0, $v1, 3 -/* 854AC4 80242954 00641821 */ addu $v1, $v1, $a0 -/* 854AC8 80242958 000318C0 */ sll $v1, $v1, 3 -/* 854ACC 8024295C 3C01800B */ lui $at, 0x800b -/* 854AD0 80242960 00230821 */ addu $at, $at, $v1 -/* 854AD4 80242964 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 854AD8 80242968 460C0300 */ add.s $f12, $f0, $f12 -/* 854ADC 8024296C 0C00A6C9 */ jal clamp_angle -/* 854AE0 80242970 0040982D */ daddu $s3, $v0, $zero -/* 854AE4 80242974 27B00010 */ addiu $s0, $sp, 0x10 -/* 854AE8 80242978 0200202D */ daddu $a0, $s0, $zero -/* 854AEC 8024297C 27B20014 */ addiu $s2, $sp, 0x14 -/* 854AF0 80242980 0240282D */ daddu $a1, $s2, $zero -/* 854AF4 80242984 3C064170 */ lui $a2, 0x4170 -/* 854AF8 80242988 8E67000C */ lw $a3, 0xc($s3) -/* 854AFC 8024298C 0C00A7E7 */ jal add_vec2D_polar -/* 854B00 80242990 46000506 */ mov.s $f20, $f0 -/* 854B04 80242994 0200202D */ daddu $a0, $s0, $zero -/* 854B08 80242998 3C064120 */ lui $a2, 0x4120 -/* 854B0C 8024299C 4407A000 */ mfc1 $a3, $f20 -/* 854B10 802429A0 0C00A7E7 */ jal add_vec2D_polar -/* 854B14 802429A4 0240282D */ daddu $a1, $s2, $zero -/* 854B18 802429A8 0220202D */ daddu $a0, $s1, $zero -/* 854B1C 802429AC C7A00010 */ lwc1 $f0, 0x10($sp) -/* 854B20 802429B0 4600008D */ trunc.w.s $f2, $f0 -/* 854B24 802429B4 44061000 */ mfc1 $a2, $f2 -/* 854B28 802429B8 0C0B2026 */ jal set_variable -/* 854B2C 802429BC 02C0282D */ daddu $a1, $s6, $zero -/* 854B30 802429C0 0220202D */ daddu $a0, $s1, $zero -/* 854B34 802429C4 4600B08D */ trunc.w.s $f2, $f22 -/* 854B38 802429C8 44061000 */ mfc1 $a2, $f2 -/* 854B3C 802429CC 0C0B2026 */ jal set_variable -/* 854B40 802429D0 0280282D */ daddu $a1, $s4, $zero -/* 854B44 802429D4 0220202D */ daddu $a0, $s1, $zero -/* 854B48 802429D8 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 854B4C 802429DC 4600008D */ trunc.w.s $f2, $f0 -/* 854B50 802429E0 44061000 */ mfc1 $a2, $f2 -/* 854B54 802429E4 0C0B2026 */ jal set_variable -/* 854B58 802429E8 02A0282D */ daddu $a1, $s5, $zero -/* 854B5C 802429EC 8FBF0034 */ lw $ra, 0x34($sp) -/* 854B60 802429F0 8FB60030 */ lw $s6, 0x30($sp) -/* 854B64 802429F4 8FB5002C */ lw $s5, 0x2c($sp) -/* 854B68 802429F8 8FB40028 */ lw $s4, 0x28($sp) -/* 854B6C 802429FC 8FB30024 */ lw $s3, 0x24($sp) -/* 854B70 80242A00 8FB20020 */ lw $s2, 0x20($sp) -/* 854B74 80242A04 8FB1001C */ lw $s1, 0x1c($sp) -/* 854B78 80242A08 8FB00018 */ lw $s0, 0x18($sp) -/* 854B7C 80242A0C D7B60040 */ ldc1 $f22, 0x40($sp) -/* 854B80 80242A10 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 854B84 80242A14 24020002 */ addiu $v0, $zero, 2 -/* 854B88 80242A18 03E00008 */ jr $ra -/* 854B8C 80242A1C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894_854A04.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894_854A04.s new file mode 100644 index 0000000000..d1a4b3b511 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242894_854A04.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242894_854A04 +/* 854A04 80242894 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 854A08 80242898 AFB1001C */ sw $s1, 0x1c($sp) +/* 854A0C 8024289C 0080882D */ daddu $s1, $a0, $zero +/* 854A10 802428A0 AFBF0034 */ sw $ra, 0x34($sp) +/* 854A14 802428A4 AFB60030 */ sw $s6, 0x30($sp) +/* 854A18 802428A8 AFB5002C */ sw $s5, 0x2c($sp) +/* 854A1C 802428AC AFB40028 */ sw $s4, 0x28($sp) +/* 854A20 802428B0 AFB30024 */ sw $s3, 0x24($sp) +/* 854A24 802428B4 AFB20020 */ sw $s2, 0x20($sp) +/* 854A28 802428B8 AFB00018 */ sw $s0, 0x18($sp) +/* 854A2C 802428BC F7B60040 */ sdc1 $f22, 0x40($sp) +/* 854A30 802428C0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 854A34 802428C4 8E30000C */ lw $s0, 0xc($s1) +/* 854A38 802428C8 8E160000 */ lw $s6, ($s0) +/* 854A3C 802428CC 26100004 */ addiu $s0, $s0, 4 +/* 854A40 802428D0 0C0B1EAF */ jal get_variable +/* 854A44 802428D4 02C0282D */ daddu $a1, $s6, $zero +/* 854A48 802428D8 44820000 */ mtc1 $v0, $f0 +/* 854A4C 802428DC 00000000 */ nop +/* 854A50 802428E0 46800020 */ cvt.s.w $f0, $f0 +/* 854A54 802428E4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 854A58 802428E8 8E140000 */ lw $s4, ($s0) +/* 854A5C 802428EC 26100004 */ addiu $s0, $s0, 4 +/* 854A60 802428F0 0220202D */ daddu $a0, $s1, $zero +/* 854A64 802428F4 0C0B1EAF */ jal get_variable +/* 854A68 802428F8 0280282D */ daddu $a1, $s4, $zero +/* 854A6C 802428FC 0220202D */ daddu $a0, $s1, $zero +/* 854A70 80242900 8E150000 */ lw $s5, ($s0) +/* 854A74 80242904 4482B000 */ mtc1 $v0, $f22 +/* 854A78 80242908 00000000 */ nop +/* 854A7C 8024290C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 854A80 80242910 0C0B1EAF */ jal get_variable +/* 854A84 80242914 02A0282D */ daddu $a1, $s5, $zero +/* 854A88 80242918 2404FFFC */ addiu $a0, $zero, -4 +/* 854A8C 8024291C 44820000 */ mtc1 $v0, $f0 +/* 854A90 80242920 00000000 */ nop +/* 854A94 80242924 46800020 */ cvt.s.w $f0, $f0 +/* 854A98 80242928 0C00EABB */ jal get_npc_unsafe +/* 854A9C 8024292C E7A00014 */ swc1 $f0, 0x14($sp) +/* 854AA0 80242930 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 854AA4 80242934 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 854AA8 80242938 3C014334 */ lui $at, 0x4334 +/* 854AAC 8024293C 44816000 */ mtc1 $at, $f12 +/* 854AB0 80242940 00041880 */ sll $v1, $a0, 2 +/* 854AB4 80242944 00641821 */ addu $v1, $v1, $a0 +/* 854AB8 80242948 00031880 */ sll $v1, $v1, 2 +/* 854ABC 8024294C 00641823 */ subu $v1, $v1, $a0 +/* 854AC0 80242950 000320C0 */ sll $a0, $v1, 3 +/* 854AC4 80242954 00641821 */ addu $v1, $v1, $a0 +/* 854AC8 80242958 000318C0 */ sll $v1, $v1, 3 +/* 854ACC 8024295C 3C01800B */ lui $at, 0x800b +/* 854AD0 80242960 00230821 */ addu $at, $at, $v1 +/* 854AD4 80242964 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 854AD8 80242968 460C0300 */ add.s $f12, $f0, $f12 +/* 854ADC 8024296C 0C00A6C9 */ jal clamp_angle +/* 854AE0 80242970 0040982D */ daddu $s3, $v0, $zero +/* 854AE4 80242974 27B00010 */ addiu $s0, $sp, 0x10 +/* 854AE8 80242978 0200202D */ daddu $a0, $s0, $zero +/* 854AEC 8024297C 27B20014 */ addiu $s2, $sp, 0x14 +/* 854AF0 80242980 0240282D */ daddu $a1, $s2, $zero +/* 854AF4 80242984 3C064170 */ lui $a2, 0x4170 +/* 854AF8 80242988 8E67000C */ lw $a3, 0xc($s3) +/* 854AFC 8024298C 0C00A7E7 */ jal add_vec2D_polar +/* 854B00 80242990 46000506 */ mov.s $f20, $f0 +/* 854B04 80242994 0200202D */ daddu $a0, $s0, $zero +/* 854B08 80242998 3C064120 */ lui $a2, 0x4120 +/* 854B0C 8024299C 4407A000 */ mfc1 $a3, $f20 +/* 854B10 802429A0 0C00A7E7 */ jal add_vec2D_polar +/* 854B14 802429A4 0240282D */ daddu $a1, $s2, $zero +/* 854B18 802429A8 0220202D */ daddu $a0, $s1, $zero +/* 854B1C 802429AC C7A00010 */ lwc1 $f0, 0x10($sp) +/* 854B20 802429B0 4600008D */ trunc.w.s $f2, $f0 +/* 854B24 802429B4 44061000 */ mfc1 $a2, $f2 +/* 854B28 802429B8 0C0B2026 */ jal set_variable +/* 854B2C 802429BC 02C0282D */ daddu $a1, $s6, $zero +/* 854B30 802429C0 0220202D */ daddu $a0, $s1, $zero +/* 854B34 802429C4 4600B08D */ trunc.w.s $f2, $f22 +/* 854B38 802429C8 44061000 */ mfc1 $a2, $f2 +/* 854B3C 802429CC 0C0B2026 */ jal set_variable +/* 854B40 802429D0 0280282D */ daddu $a1, $s4, $zero +/* 854B44 802429D4 0220202D */ daddu $a0, $s1, $zero +/* 854B48 802429D8 C7A00014 */ lwc1 $f0, 0x14($sp) +/* 854B4C 802429DC 4600008D */ trunc.w.s $f2, $f0 +/* 854B50 802429E0 44061000 */ mfc1 $a2, $f2 +/* 854B54 802429E4 0C0B2026 */ jal set_variable +/* 854B58 802429E8 02A0282D */ daddu $a1, $s5, $zero +/* 854B5C 802429EC 8FBF0034 */ lw $ra, 0x34($sp) +/* 854B60 802429F0 8FB60030 */ lw $s6, 0x30($sp) +/* 854B64 802429F4 8FB5002C */ lw $s5, 0x2c($sp) +/* 854B68 802429F8 8FB40028 */ lw $s4, 0x28($sp) +/* 854B6C 802429FC 8FB30024 */ lw $s3, 0x24($sp) +/* 854B70 80242A00 8FB20020 */ lw $s2, 0x20($sp) +/* 854B74 80242A04 8FB1001C */ lw $s1, 0x1c($sp) +/* 854B78 80242A08 8FB00018 */ lw $s0, 0x18($sp) +/* 854B7C 80242A0C D7B60040 */ ldc1 $f22, 0x40($sp) +/* 854B80 80242A10 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 854B84 80242A14 24020002 */ addiu $v0, $zero, 2 +/* 854B88 80242A18 03E00008 */ jr $ra +/* 854B8C 80242A1C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20.s deleted file mode 100644 index 619cebad0b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A20 -/* 854B90 80242A20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 854B94 80242A24 AFB00010 */ sw $s0, 0x10($sp) -/* 854B98 80242A28 0080802D */ daddu $s0, $a0, $zero -/* 854B9C 80242A2C AFBF0014 */ sw $ra, 0x14($sp) -/* 854BA0 80242A30 0C00EABB */ jal get_npc_unsafe -/* 854BA4 80242A34 8E04008C */ lw $a0, 0x8c($s0) -/* 854BA8 80242A38 0040282D */ daddu $a1, $v0, $zero -/* 854BAC 80242A3C 8E040094 */ lw $a0, 0x94($s0) -/* 854BB0 80242A40 8CA30028 */ lw $v1, 0x28($a1) -/* 854BB4 80242A44 ACA40028 */ sw $a0, 0x28($a1) -/* 854BB8 80242A48 8FBF0014 */ lw $ra, 0x14($sp) -/* 854BBC 80242A4C 8FB00010 */ lw $s0, 0x10($sp) -/* 854BC0 80242A50 24020002 */ addiu $v0, $zero, 2 -/* 854BC4 80242A54 3C018025 */ lui $at, 0x8025 -/* 854BC8 80242A58 AC232D38 */ sw $v1, 0x2d38($at) -/* 854BCC 80242A5C 03E00008 */ jr $ra -/* 854BD0 80242A60 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s new file mode 100644 index 0000000000..c2bd2f3dd9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A20_854B90.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A20_854B90 +/* 854B90 80242A20 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 854B94 80242A24 AFB00010 */ sw $s0, 0x10($sp) +/* 854B98 80242A28 0080802D */ daddu $s0, $a0, $zero +/* 854B9C 80242A2C AFBF0014 */ sw $ra, 0x14($sp) +/* 854BA0 80242A30 0C00EABB */ jal get_npc_unsafe +/* 854BA4 80242A34 8E04008C */ lw $a0, 0x8c($s0) +/* 854BA8 80242A38 0040282D */ daddu $a1, $v0, $zero +/* 854BAC 80242A3C 8E040094 */ lw $a0, 0x94($s0) +/* 854BB0 80242A40 8CA30028 */ lw $v1, 0x28($a1) +/* 854BB4 80242A44 ACA40028 */ sw $a0, 0x28($a1) +/* 854BB8 80242A48 8FBF0014 */ lw $ra, 0x14($sp) +/* 854BBC 80242A4C 8FB00010 */ lw $s0, 0x10($sp) +/* 854BC0 80242A50 24020002 */ addiu $v0, $zero, 2 +/* 854BC4 80242A54 3C018025 */ lui $at, 0x8025 +/* 854BC8 80242A58 AC232D38 */ sw $v1, 0x2d38($at) +/* 854BCC 80242A5C 03E00008 */ jr $ra +/* 854BD0 80242A60 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64.s deleted file mode 100644 index 46c6134511..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A64 -/* 854BD4 80242A64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 854BD8 80242A68 AFBF0010 */ sw $ra, 0x10($sp) -/* 854BDC 80242A6C 0C00EABB */ jal get_npc_unsafe -/* 854BE0 80242A70 8C84008C */ lw $a0, 0x8c($a0) -/* 854BE4 80242A74 3C038025 */ lui $v1, 0x8025 -/* 854BE8 80242A78 8C632D38 */ lw $v1, 0x2d38($v1) -/* 854BEC 80242A7C AC430028 */ sw $v1, 0x28($v0) -/* 854BF0 80242A80 8FBF0010 */ lw $ra, 0x10($sp) -/* 854BF4 80242A84 24020002 */ addiu $v0, $zero, 2 -/* 854BF8 80242A88 03E00008 */ jr $ra -/* 854BFC 80242A8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s new file mode 100644 index 0000000000..b6ee9dcbbc --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A64_854BD4.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A64_854BD4 +/* 854BD4 80242A64 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 854BD8 80242A68 AFBF0010 */ sw $ra, 0x10($sp) +/* 854BDC 80242A6C 0C00EABB */ jal get_npc_unsafe +/* 854BE0 80242A70 8C84008C */ lw $a0, 0x8c($a0) +/* 854BE4 80242A74 3C038025 */ lui $v1, 0x8025 +/* 854BE8 80242A78 8C632D38 */ lw $v1, 0x2d38($v1) +/* 854BEC 80242A7C AC430028 */ sw $v1, 0x28($v0) +/* 854BF0 80242A80 8FBF0010 */ lw $ra, 0x10($sp) +/* 854BF4 80242A84 24020002 */ addiu $v0, $zero, 2 +/* 854BF8 80242A88 03E00008 */ jr $ra +/* 854BFC 80242A8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90.s deleted file mode 100644 index 566d8e8c1e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90.s +++ /dev/null @@ -1,129 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A90 -/* 854C00 80242A90 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 854C04 80242A94 AFB20018 */ sw $s2, 0x18($sp) -/* 854C08 80242A98 0080902D */ daddu $s2, $a0, $zero -/* 854C0C 80242A9C AFBF0028 */ sw $ra, 0x28($sp) -/* 854C10 80242AA0 AFB50024 */ sw $s5, 0x24($sp) -/* 854C14 80242AA4 AFB40020 */ sw $s4, 0x20($sp) -/* 854C18 80242AA8 AFB3001C */ sw $s3, 0x1c($sp) -/* 854C1C 80242AAC AFB10014 */ sw $s1, 0x14($sp) -/* 854C20 80242AB0 AFB00010 */ sw $s0, 0x10($sp) -/* 854C24 80242AB4 F7BA0048 */ sdc1 $f26, 0x48($sp) -/* 854C28 80242AB8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 854C2C 80242ABC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 854C30 80242AC0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 854C34 80242AC4 8E50000C */ lw $s0, 0xc($s2) -/* 854C38 80242AC8 8E050000 */ lw $a1, ($s0) -/* 854C3C 80242ACC 0C0B1EAF */ jal get_variable -/* 854C40 80242AD0 26100004 */ addiu $s0, $s0, 4 -/* 854C44 80242AD4 8E130000 */ lw $s3, ($s0) -/* 854C48 80242AD8 26100004 */ addiu $s0, $s0, 4 -/* 854C4C 80242ADC 0000202D */ daddu $a0, $zero, $zero -/* 854C50 80242AE0 8E140000 */ lw $s4, ($s0) -/* 854C54 80242AE4 8E150004 */ lw $s5, 4($s0) -/* 854C58 80242AE8 0C00EAD2 */ jal get_npc_safe -/* 854C5C 80242AEC 0040882D */ daddu $s1, $v0, $zero -/* 854C60 80242AF0 0040802D */ daddu $s0, $v0, $zero -/* 854C64 80242AF4 2E220005 */ sltiu $v0, $s1, 5 -/* 854C68 80242AF8 10400024 */ beqz $v0, .L80242B8C -/* 854C6C 80242AFC 00111080 */ sll $v0, $s1, 2 -/* 854C70 80242B00 3C018025 */ lui $at, 0x8025 -/* 854C74 80242B04 00220821 */ addu $at, $at, $v0 -/* 854C78 80242B08 8C222950 */ lw $v0, 0x2950($at) -/* 854C7C 80242B0C 00400008 */ jr $v0 -/* 854C80 80242B10 00000000 */ nop -/* 854C84 80242B14 3C01425C */ lui $at, 0x425c -/* 854C88 80242B18 4481D000 */ mtc1 $at, $f26 -/* 854C8C 80242B1C 08090AEB */ j .L80242BAC -/* 854C90 80242B20 2A220003 */ slti $v0, $s1, 3 -/* 854C94 80242B24 3C0142AA */ lui $at, 0x42aa -/* 854C98 80242B28 4481D000 */ mtc1 $at, $f26 -/* 854C9C 80242B2C 08090AEB */ j .L80242BAC -/* 854CA0 80242B30 2A220003 */ slti $v0, $s1, 3 -/* 854CA4 80242B34 3C0141C8 */ lui $at, 0x41c8 -/* 854CA8 80242B38 4481D000 */ mtc1 $at, $f26 -/* 854CAC 80242B3C 08090AEB */ j .L80242BAC -/* 854CB0 80242B40 2A220003 */ slti $v0, $s1, 3 -/* 854CB4 80242B44 3C01C393 */ lui $at, 0xc393 -/* 854CB8 80242B48 34218000 */ ori $at, $at, 0x8000 -/* 854CBC 80242B4C 4481C000 */ mtc1 $at, $f24 -/* 854CC0 80242B50 3C01C120 */ lui $at, 0xc120 -/* 854CC4 80242B54 4481B000 */ mtc1 $at, $f22 -/* 854CC8 80242B58 3C0143C8 */ lui $at, 0x43c8 -/* 854CCC 80242B5C 4481A000 */ mtc1 $at, $f20 -/* 854CD0 80242B60 08090AEB */ j .L80242BAC -/* 854CD4 80242B64 2A220003 */ slti $v0, $s1, 3 -/* 854CD8 80242B68 3C01C38E */ lui $at, 0xc38e -/* 854CDC 80242B6C 34218000 */ ori $at, $at, 0x8000 -/* 854CE0 80242B70 4481C000 */ mtc1 $at, $f24 -/* 854CE4 80242B74 3C01C120 */ lui $at, 0xc120 -/* 854CE8 80242B78 4481B000 */ mtc1 $at, $f22 -/* 854CEC 80242B7C 3C0143BE */ lui $at, 0x43be -/* 854CF0 80242B80 4481A000 */ mtc1 $at, $f20 -/* 854CF4 80242B84 08090AEB */ j .L80242BAC -/* 854CF8 80242B88 2A220003 */ slti $v0, $s1, 3 -.L80242B8C: -/* 854CFC 80242B8C 3C01C393 */ lui $at, 0xc393 -/* 854D00 80242B90 34218000 */ ori $at, $at, 0x8000 -/* 854D04 80242B94 4481C000 */ mtc1 $at, $f24 -/* 854D08 80242B98 3C01C120 */ lui $at, 0xc120 -/* 854D0C 80242B9C 4481B000 */ mtc1 $at, $f22 -/* 854D10 80242BA0 3C0143D2 */ lui $at, 0x43d2 -/* 854D14 80242BA4 4481A000 */ mtc1 $at, $f20 -/* 854D18 80242BA8 2A220003 */ slti $v0, $s1, 3 -.L80242BAC: -/* 854D1C 80242BAC 10400019 */ beqz $v0, .L80242C14 -/* 854D20 80242BB0 0240202D */ daddu $a0, $s2, $zero -/* 854D24 80242BB4 C614000C */ lwc1 $f20, 0xc($s0) -/* 854D28 80242BB8 4600A507 */ neg.s $f20, $f20 -/* 854D2C 80242BBC 0C00A8BB */ jal sin_deg -/* 854D30 80242BC0 4600A306 */ mov.s $f12, $f20 -/* 854D34 80242BC4 461A0002 */ mul.s $f0, $f0, $f26 -/* 854D38 80242BC8 00000000 */ nop -/* 854D3C 80242BCC C6020038 */ lwc1 $f2, 0x38($s0) -/* 854D40 80242BD0 3C0141F0 */ lui $at, 0x41f0 -/* 854D44 80242BD4 44812000 */ mtc1 $at, $f4 -/* 854D48 80242BD8 00000000 */ nop -/* 854D4C 80242BDC 46041080 */ add.s $f2, $f2, $f4 -/* 854D50 80242BE0 46001600 */ add.s $f24, $f2, $f0 -/* 854D54 80242BE4 0C00A8D4 */ jal cos_deg -/* 854D58 80242BE8 4600A306 */ mov.s $f12, $f20 -/* 854D5C 80242BEC 461A0002 */ mul.s $f0, $f0, $f26 -/* 854D60 80242BF0 00000000 */ nop -/* 854D64 80242BF4 C604003C */ lwc1 $f4, 0x3c($s0) -/* 854D68 80242BF8 3C014248 */ lui $at, 0x4248 -/* 854D6C 80242BFC 44811000 */ mtc1 $at, $f2 -/* 854D70 80242C00 00000000 */ nop -/* 854D74 80242C04 46022580 */ add.s $f22, $f4, $f2 -/* 854D78 80242C08 C6020040 */ lwc1 $f2, 0x40($s0) -/* 854D7C 80242C0C 46001500 */ add.s $f20, $f2, $f0 -/* 854D80 80242C10 0240202D */ daddu $a0, $s2, $zero -.L80242C14: -/* 854D84 80242C14 4406C000 */ mfc1 $a2, $f24 -/* 854D88 80242C18 0C0B2190 */ jal set_float_variable -/* 854D8C 80242C1C 0260282D */ daddu $a1, $s3, $zero -/* 854D90 80242C20 0240202D */ daddu $a0, $s2, $zero -/* 854D94 80242C24 4406B000 */ mfc1 $a2, $f22 -/* 854D98 80242C28 0C0B2190 */ jal set_float_variable -/* 854D9C 80242C2C 0280282D */ daddu $a1, $s4, $zero -/* 854DA0 80242C30 0240202D */ daddu $a0, $s2, $zero -/* 854DA4 80242C34 4406A000 */ mfc1 $a2, $f20 -/* 854DA8 80242C38 0C0B2190 */ jal set_float_variable -/* 854DAC 80242C3C 02A0282D */ daddu $a1, $s5, $zero -/* 854DB0 80242C40 8FBF0028 */ lw $ra, 0x28($sp) -/* 854DB4 80242C44 8FB50024 */ lw $s5, 0x24($sp) -/* 854DB8 80242C48 8FB40020 */ lw $s4, 0x20($sp) -/* 854DBC 80242C4C 8FB3001C */ lw $s3, 0x1c($sp) -/* 854DC0 80242C50 8FB20018 */ lw $s2, 0x18($sp) -/* 854DC4 80242C54 8FB10014 */ lw $s1, 0x14($sp) -/* 854DC8 80242C58 8FB00010 */ lw $s0, 0x10($sp) -/* 854DCC 80242C5C D7BA0048 */ ldc1 $f26, 0x48($sp) -/* 854DD0 80242C60 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 854DD4 80242C64 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 854DD8 80242C68 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 854DDC 80242C6C 24020002 */ addiu $v0, $zero, 2 -/* 854DE0 80242C70 03E00008 */ jr $ra -/* 854DE4 80242C74 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s new file mode 100644 index 0000000000..3c3a5e1861 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242A90_854C00.s @@ -0,0 +1,129 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A90_854C00 +/* 854C00 80242A90 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 854C04 80242A94 AFB20018 */ sw $s2, 0x18($sp) +/* 854C08 80242A98 0080902D */ daddu $s2, $a0, $zero +/* 854C0C 80242A9C AFBF0028 */ sw $ra, 0x28($sp) +/* 854C10 80242AA0 AFB50024 */ sw $s5, 0x24($sp) +/* 854C14 80242AA4 AFB40020 */ sw $s4, 0x20($sp) +/* 854C18 80242AA8 AFB3001C */ sw $s3, 0x1c($sp) +/* 854C1C 80242AAC AFB10014 */ sw $s1, 0x14($sp) +/* 854C20 80242AB0 AFB00010 */ sw $s0, 0x10($sp) +/* 854C24 80242AB4 F7BA0048 */ sdc1 $f26, 0x48($sp) +/* 854C28 80242AB8 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 854C2C 80242ABC F7B60038 */ sdc1 $f22, 0x38($sp) +/* 854C30 80242AC0 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 854C34 80242AC4 8E50000C */ lw $s0, 0xc($s2) +/* 854C38 80242AC8 8E050000 */ lw $a1, ($s0) +/* 854C3C 80242ACC 0C0B1EAF */ jal get_variable +/* 854C40 80242AD0 26100004 */ addiu $s0, $s0, 4 +/* 854C44 80242AD4 8E130000 */ lw $s3, ($s0) +/* 854C48 80242AD8 26100004 */ addiu $s0, $s0, 4 +/* 854C4C 80242ADC 0000202D */ daddu $a0, $zero, $zero +/* 854C50 80242AE0 8E140000 */ lw $s4, ($s0) +/* 854C54 80242AE4 8E150004 */ lw $s5, 4($s0) +/* 854C58 80242AE8 0C00EAD2 */ jal get_npc_safe +/* 854C5C 80242AEC 0040882D */ daddu $s1, $v0, $zero +/* 854C60 80242AF0 0040802D */ daddu $s0, $v0, $zero +/* 854C64 80242AF4 2E220005 */ sltiu $v0, $s1, 5 +/* 854C68 80242AF8 10400024 */ beqz $v0, .L80242B8C +/* 854C6C 80242AFC 00111080 */ sll $v0, $s1, 2 +/* 854C70 80242B00 3C018025 */ lui $at, 0x8025 +/* 854C74 80242B04 00220821 */ addu $at, $at, $v0 +/* 854C78 80242B08 8C222950 */ lw $v0, 0x2950($at) +/* 854C7C 80242B0C 00400008 */ jr $v0 +/* 854C80 80242B10 00000000 */ nop +/* 854C84 80242B14 3C01425C */ lui $at, 0x425c +/* 854C88 80242B18 4481D000 */ mtc1 $at, $f26 +/* 854C8C 80242B1C 08090AEB */ j .L80242BAC +/* 854C90 80242B20 2A220003 */ slti $v0, $s1, 3 +/* 854C94 80242B24 3C0142AA */ lui $at, 0x42aa +/* 854C98 80242B28 4481D000 */ mtc1 $at, $f26 +/* 854C9C 80242B2C 08090AEB */ j .L80242BAC +/* 854CA0 80242B30 2A220003 */ slti $v0, $s1, 3 +/* 854CA4 80242B34 3C0141C8 */ lui $at, 0x41c8 +/* 854CA8 80242B38 4481D000 */ mtc1 $at, $f26 +/* 854CAC 80242B3C 08090AEB */ j .L80242BAC +/* 854CB0 80242B40 2A220003 */ slti $v0, $s1, 3 +/* 854CB4 80242B44 3C01C393 */ lui $at, 0xc393 +/* 854CB8 80242B48 34218000 */ ori $at, $at, 0x8000 +/* 854CBC 80242B4C 4481C000 */ mtc1 $at, $f24 +/* 854CC0 80242B50 3C01C120 */ lui $at, 0xc120 +/* 854CC4 80242B54 4481B000 */ mtc1 $at, $f22 +/* 854CC8 80242B58 3C0143C8 */ lui $at, 0x43c8 +/* 854CCC 80242B5C 4481A000 */ mtc1 $at, $f20 +/* 854CD0 80242B60 08090AEB */ j .L80242BAC +/* 854CD4 80242B64 2A220003 */ slti $v0, $s1, 3 +/* 854CD8 80242B68 3C01C38E */ lui $at, 0xc38e +/* 854CDC 80242B6C 34218000 */ ori $at, $at, 0x8000 +/* 854CE0 80242B70 4481C000 */ mtc1 $at, $f24 +/* 854CE4 80242B74 3C01C120 */ lui $at, 0xc120 +/* 854CE8 80242B78 4481B000 */ mtc1 $at, $f22 +/* 854CEC 80242B7C 3C0143BE */ lui $at, 0x43be +/* 854CF0 80242B80 4481A000 */ mtc1 $at, $f20 +/* 854CF4 80242B84 08090AEB */ j .L80242BAC +/* 854CF8 80242B88 2A220003 */ slti $v0, $s1, 3 +.L80242B8C: +/* 854CFC 80242B8C 3C01C393 */ lui $at, 0xc393 +/* 854D00 80242B90 34218000 */ ori $at, $at, 0x8000 +/* 854D04 80242B94 4481C000 */ mtc1 $at, $f24 +/* 854D08 80242B98 3C01C120 */ lui $at, 0xc120 +/* 854D0C 80242B9C 4481B000 */ mtc1 $at, $f22 +/* 854D10 80242BA0 3C0143D2 */ lui $at, 0x43d2 +/* 854D14 80242BA4 4481A000 */ mtc1 $at, $f20 +/* 854D18 80242BA8 2A220003 */ slti $v0, $s1, 3 +.L80242BAC: +/* 854D1C 80242BAC 10400019 */ beqz $v0, .L80242C14 +/* 854D20 80242BB0 0240202D */ daddu $a0, $s2, $zero +/* 854D24 80242BB4 C614000C */ lwc1 $f20, 0xc($s0) +/* 854D28 80242BB8 4600A507 */ neg.s $f20, $f20 +/* 854D2C 80242BBC 0C00A8BB */ jal sin_deg +/* 854D30 80242BC0 4600A306 */ mov.s $f12, $f20 +/* 854D34 80242BC4 461A0002 */ mul.s $f0, $f0, $f26 +/* 854D38 80242BC8 00000000 */ nop +/* 854D3C 80242BCC C6020038 */ lwc1 $f2, 0x38($s0) +/* 854D40 80242BD0 3C0141F0 */ lui $at, 0x41f0 +/* 854D44 80242BD4 44812000 */ mtc1 $at, $f4 +/* 854D48 80242BD8 00000000 */ nop +/* 854D4C 80242BDC 46041080 */ add.s $f2, $f2, $f4 +/* 854D50 80242BE0 46001600 */ add.s $f24, $f2, $f0 +/* 854D54 80242BE4 0C00A8D4 */ jal cos_deg +/* 854D58 80242BE8 4600A306 */ mov.s $f12, $f20 +/* 854D5C 80242BEC 461A0002 */ mul.s $f0, $f0, $f26 +/* 854D60 80242BF0 00000000 */ nop +/* 854D64 80242BF4 C604003C */ lwc1 $f4, 0x3c($s0) +/* 854D68 80242BF8 3C014248 */ lui $at, 0x4248 +/* 854D6C 80242BFC 44811000 */ mtc1 $at, $f2 +/* 854D70 80242C00 00000000 */ nop +/* 854D74 80242C04 46022580 */ add.s $f22, $f4, $f2 +/* 854D78 80242C08 C6020040 */ lwc1 $f2, 0x40($s0) +/* 854D7C 80242C0C 46001500 */ add.s $f20, $f2, $f0 +/* 854D80 80242C10 0240202D */ daddu $a0, $s2, $zero +.L80242C14: +/* 854D84 80242C14 4406C000 */ mfc1 $a2, $f24 +/* 854D88 80242C18 0C0B2190 */ jal set_float_variable +/* 854D8C 80242C1C 0260282D */ daddu $a1, $s3, $zero +/* 854D90 80242C20 0240202D */ daddu $a0, $s2, $zero +/* 854D94 80242C24 4406B000 */ mfc1 $a2, $f22 +/* 854D98 80242C28 0C0B2190 */ jal set_float_variable +/* 854D9C 80242C2C 0280282D */ daddu $a1, $s4, $zero +/* 854DA0 80242C30 0240202D */ daddu $a0, $s2, $zero +/* 854DA4 80242C34 4406A000 */ mfc1 $a2, $f20 +/* 854DA8 80242C38 0C0B2190 */ jal set_float_variable +/* 854DAC 80242C3C 02A0282D */ daddu $a1, $s5, $zero +/* 854DB0 80242C40 8FBF0028 */ lw $ra, 0x28($sp) +/* 854DB4 80242C44 8FB50024 */ lw $s5, 0x24($sp) +/* 854DB8 80242C48 8FB40020 */ lw $s4, 0x20($sp) +/* 854DBC 80242C4C 8FB3001C */ lw $s3, 0x1c($sp) +/* 854DC0 80242C50 8FB20018 */ lw $s2, 0x18($sp) +/* 854DC4 80242C54 8FB10014 */ lw $s1, 0x14($sp) +/* 854DC8 80242C58 8FB00010 */ lw $s0, 0x10($sp) +/* 854DCC 80242C5C D7BA0048 */ ldc1 $f26, 0x48($sp) +/* 854DD0 80242C60 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 854DD4 80242C64 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 854DD8 80242C68 D7B40030 */ ldc1 $f20, 0x30($sp) +/* 854DDC 80242C6C 24020002 */ addiu $v0, $zero, 2 +/* 854DE0 80242C70 03E00008 */ jr $ra +/* 854DE4 80242C74 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78.s deleted file mode 100644 index 9304db0a05..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78.s +++ /dev/null @@ -1,146 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C78 -/* 854DE8 80242C78 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 854DEC 80242C7C AFB3001C */ sw $s3, 0x1c($sp) -/* 854DF0 80242C80 0080982D */ daddu $s3, $a0, $zero -/* 854DF4 80242C84 AFB00010 */ sw $s0, 0x10($sp) -/* 854DF8 80242C88 00A0802D */ daddu $s0, $a1, $zero -/* 854DFC 80242C8C AFBF0020 */ sw $ra, 0x20($sp) -/* 854E00 80242C90 AFB20018 */ sw $s2, 0x18($sp) -/* 854E04 80242C94 AFB10014 */ sw $s1, 0x14($sp) -/* 854E08 80242C98 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 854E0C 80242C9C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 854E10 80242CA0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 854E14 80242CA4 8E72000C */ lw $s2, 0xc($s3) -/* 854E18 80242CA8 0C00EAD2 */ jal get_npc_safe -/* 854E1C 80242CAC 0000202D */ daddu $a0, $zero, $zero -/* 854E20 80242CB0 12000010 */ beqz $s0, .L80242CF4 -/* 854E24 80242CB4 0040882D */ daddu $s1, $v0, $zero -/* 854E28 80242CB8 8E450000 */ lw $a1, ($s2) -/* 854E2C 80242CBC 0C0B1EAF */ jal get_variable -/* 854E30 80242CC0 0260202D */ daddu $a0, $s3, $zero -/* 854E34 80242CC4 0040182D */ daddu $v1, $v0, $zero -/* 854E38 80242CC8 10600006 */ beqz $v1, .L80242CE4 -/* 854E3C 80242CCC AE630070 */ sw $v1, 0x70($s3) -/* 854E40 80242CD0 24020001 */ addiu $v0, $zero, 1 -/* 854E44 80242CD4 10620005 */ beq $v1, $v0, .L80242CEC -/* 854E48 80242CD8 24020019 */ addiu $v0, $zero, 0x19 -/* 854E4C 80242CDC 08090B3D */ j .L80242CF4 -/* 854E50 80242CE0 AE620074 */ sw $v0, 0x74($s3) -.L80242CE4: -/* 854E54 80242CE4 08090B3C */ j .L80242CF0 -/* 854E58 80242CE8 24020037 */ addiu $v0, $zero, 0x37 -.L80242CEC: -/* 854E5C 80242CEC 24020055 */ addiu $v0, $zero, 0x55 -.L80242CF0: -/* 854E60 80242CF0 AE620074 */ sw $v0, 0x74($s3) -.L80242CF4: -/* 854E64 80242CF4 C634000C */ lwc1 $f20, 0xc($s1) -/* 854E68 80242CF8 C6760074 */ lwc1 $f22, 0x74($s3) -/* 854E6C 80242CFC 4680B5A0 */ cvt.s.w $f22, $f22 -/* 854E70 80242D00 4600A507 */ neg.s $f20, $f20 -/* 854E74 80242D04 0C00A8BB */ jal sin_deg -/* 854E78 80242D08 4600A306 */ mov.s $f12, $f20 -/* 854E7C 80242D0C 46160002 */ mul.s $f0, $f0, $f22 -/* 854E80 80242D10 00000000 */ nop -/* 854E84 80242D14 C6220038 */ lwc1 $f2, 0x38($s1) -/* 854E88 80242D18 3C0141F0 */ lui $at, 0x41f0 -/* 854E8C 80242D1C 44812000 */ mtc1 $at, $f4 -/* 854E90 80242D20 00000000 */ nop -/* 854E94 80242D24 46041080 */ add.s $f2, $f2, $f4 -/* 854E98 80242D28 46001600 */ add.s $f24, $f2, $f0 -/* 854E9C 80242D2C 0C00A8D4 */ jal cos_deg -/* 854EA0 80242D30 4600A306 */ mov.s $f12, $f20 -/* 854EA4 80242D34 46160002 */ mul.s $f0, $f0, $f22 -/* 854EA8 80242D38 00000000 */ nop -/* 854EAC 80242D3C 24020001 */ addiu $v0, $zero, 1 -/* 854EB0 80242D40 C6220040 */ lwc1 $f2, 0x40($s1) -/* 854EB4 80242D44 C624003C */ lwc1 $f4, 0x3c($s1) -/* 854EB8 80242D48 46001580 */ add.s $f22, $f2, $f0 -/* 854EBC 80242D4C 3C014248 */ lui $at, 0x4248 -/* 854EC0 80242D50 44810000 */ mtc1 $at, $f0 -/* 854EC4 80242D54 8E640070 */ lw $a0, 0x70($s3) -/* 854EC8 80242D58 1082001C */ beq $a0, $v0, .L80242DCC -/* 854ECC 80242D5C 46002500 */ add.s $f20, $f4, $f0 -/* 854ED0 80242D60 28820002 */ slti $v0, $a0, 2 -/* 854ED4 80242D64 10400005 */ beqz $v0, .L80242D7C -/* 854ED8 80242D68 24020002 */ addiu $v0, $zero, 2 -/* 854EDC 80242D6C 10800007 */ beqz $a0, .L80242D8C -/* 854EE0 80242D70 0000102D */ daddu $v0, $zero, $zero -/* 854EE4 80242D74 08090B97 */ j .L80242E5C -/* 854EE8 80242D78 00000000 */ nop -.L80242D7C: -/* 854EEC 80242D7C 10820027 */ beq $a0, $v0, .L80242E1C -/* 854EF0 80242D80 0000102D */ daddu $v0, $zero, $zero -/* 854EF4 80242D84 08090B97 */ j .L80242E5C -/* 854EF8 80242D88 00000000 */ nop -.L80242D8C: -/* 854EFC 80242D8C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 854F00 80242D90 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 854F04 80242D94 3C030001 */ lui $v1, 1 -/* 854F08 80242D98 E4580028 */ swc1 $f24, 0x28($v0) -/* 854F0C 80242D9C E454002C */ swc1 $f20, 0x2c($v0) -/* 854F10 80242DA0 E4560030 */ swc1 $f22, 0x30($v0) -/* 854F14 80242DA4 C6200038 */ lwc1 $f0, 0x38($s1) -/* 854F18 80242DA8 C622003C */ lwc1 $f2, 0x3c($s1) -/* 854F1C 80242DAC 8E220000 */ lw $v0, ($s1) -/* 854F20 80242DB0 C6240040 */ lwc1 $f4, 0x40($s1) -/* 854F24 80242DB4 00431025 */ or $v0, $v0, $v1 -/* 854F28 80242DB8 E620006C */ swc1 $f0, 0x6c($s1) -/* 854F2C 80242DBC E6220070 */ swc1 $f2, 0x70($s1) -/* 854F30 80242DC0 E6240074 */ swc1 $f4, 0x74($s1) -/* 854F34 80242DC4 08090B96 */ j .L80242E58 -/* 854F38 80242DC8 AE220000 */ sw $v0, ($s1) -.L80242DCC: -/* 854F3C 80242DCC 0C00EAD2 */ jal get_npc_safe -/* 854F40 80242DD0 2404FFFC */ addiu $a0, $zero, -4 -/* 854F44 80242DD4 0040202D */ daddu $a0, $v0, $zero -/* 854F48 80242DD8 54800003 */ bnel $a0, $zero, .L80242DE8 -/* 854F4C 80242DDC E4980038 */ swc1 $f24, 0x38($a0) -/* 854F50 80242DE0 08090B97 */ j .L80242E5C -/* 854F54 80242DE4 24020002 */ addiu $v0, $zero, 2 -.L80242DE8: -/* 854F58 80242DE8 4600C006 */ mov.s $f0, $f24 -/* 854F5C 80242DEC E494003C */ swc1 $f20, 0x3c($a0) -/* 854F60 80242DF0 4600A086 */ mov.s $f2, $f20 -/* 854F64 80242DF4 E4960040 */ swc1 $f22, 0x40($a0) -/* 854F68 80242DF8 4600B106 */ mov.s $f4, $f22 -/* 854F6C 80242DFC 8C820000 */ lw $v0, ($a0) -/* 854F70 80242E00 3C030001 */ lui $v1, 1 -/* 854F74 80242E04 E480006C */ swc1 $f0, 0x6c($a0) -/* 854F78 80242E08 E4820070 */ swc1 $f2, 0x70($a0) -/* 854F7C 80242E0C E4840074 */ swc1 $f4, 0x74($a0) -/* 854F80 80242E10 00431025 */ or $v0, $v0, $v1 -/* 854F84 80242E14 08090B96 */ j .L80242E58 -/* 854F88 80242E18 AC820000 */ sw $v0, ($a0) -.L80242E1C: -/* 854F8C 80242E1C 0C00EAD2 */ jal get_npc_safe -/* 854F90 80242E20 24040001 */ addiu $a0, $zero, 1 -/* 854F94 80242E24 E4580038 */ swc1 $f24, 0x38($v0) -/* 854F98 80242E28 4600C006 */ mov.s $f0, $f24 -/* 854F9C 80242E2C E454003C */ swc1 $f20, 0x3c($v0) -/* 854FA0 80242E30 4600A086 */ mov.s $f2, $f20 -/* 854FA4 80242E34 E4560040 */ swc1 $f22, 0x40($v0) -/* 854FA8 80242E38 4600B106 */ mov.s $f4, $f22 -/* 854FAC 80242E3C 8C430000 */ lw $v1, ($v0) -/* 854FB0 80242E40 3C040001 */ lui $a0, 1 -/* 854FB4 80242E44 E440006C */ swc1 $f0, 0x6c($v0) -/* 854FB8 80242E48 E4420070 */ swc1 $f2, 0x70($v0) -/* 854FBC 80242E4C E4440074 */ swc1 $f4, 0x74($v0) -/* 854FC0 80242E50 00641825 */ or $v1, $v1, $a0 -/* 854FC4 80242E54 AC430000 */ sw $v1, ($v0) -.L80242E58: -/* 854FC8 80242E58 0000102D */ daddu $v0, $zero, $zero -.L80242E5C: -/* 854FCC 80242E5C 8FBF0020 */ lw $ra, 0x20($sp) -/* 854FD0 80242E60 8FB3001C */ lw $s3, 0x1c($sp) -/* 854FD4 80242E64 8FB20018 */ lw $s2, 0x18($sp) -/* 854FD8 80242E68 8FB10014 */ lw $s1, 0x14($sp) -/* 854FDC 80242E6C 8FB00010 */ lw $s0, 0x10($sp) -/* 854FE0 80242E70 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 854FE4 80242E74 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 854FE8 80242E78 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 854FEC 80242E7C 03E00008 */ jr $ra -/* 854FF0 80242E80 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s new file mode 100644 index 0000000000..2009fbb72f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242C78_854DE8.s @@ -0,0 +1,146 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C78_854DE8 +/* 854DE8 80242C78 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 854DEC 80242C7C AFB3001C */ sw $s3, 0x1c($sp) +/* 854DF0 80242C80 0080982D */ daddu $s3, $a0, $zero +/* 854DF4 80242C84 AFB00010 */ sw $s0, 0x10($sp) +/* 854DF8 80242C88 00A0802D */ daddu $s0, $a1, $zero +/* 854DFC 80242C8C AFBF0020 */ sw $ra, 0x20($sp) +/* 854E00 80242C90 AFB20018 */ sw $s2, 0x18($sp) +/* 854E04 80242C94 AFB10014 */ sw $s1, 0x14($sp) +/* 854E08 80242C98 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 854E0C 80242C9C F7B60030 */ sdc1 $f22, 0x30($sp) +/* 854E10 80242CA0 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 854E14 80242CA4 8E72000C */ lw $s2, 0xc($s3) +/* 854E18 80242CA8 0C00EAD2 */ jal get_npc_safe +/* 854E1C 80242CAC 0000202D */ daddu $a0, $zero, $zero +/* 854E20 80242CB0 12000010 */ beqz $s0, .L80242CF4 +/* 854E24 80242CB4 0040882D */ daddu $s1, $v0, $zero +/* 854E28 80242CB8 8E450000 */ lw $a1, ($s2) +/* 854E2C 80242CBC 0C0B1EAF */ jal get_variable +/* 854E30 80242CC0 0260202D */ daddu $a0, $s3, $zero +/* 854E34 80242CC4 0040182D */ daddu $v1, $v0, $zero +/* 854E38 80242CC8 10600006 */ beqz $v1, .L80242CE4 +/* 854E3C 80242CCC AE630070 */ sw $v1, 0x70($s3) +/* 854E40 80242CD0 24020001 */ addiu $v0, $zero, 1 +/* 854E44 80242CD4 10620005 */ beq $v1, $v0, .L80242CEC +/* 854E48 80242CD8 24020019 */ addiu $v0, $zero, 0x19 +/* 854E4C 80242CDC 08090B3D */ j .L80242CF4 +/* 854E50 80242CE0 AE620074 */ sw $v0, 0x74($s3) +.L80242CE4: +/* 854E54 80242CE4 08090B3C */ j .L80242CF0 +/* 854E58 80242CE8 24020037 */ addiu $v0, $zero, 0x37 +.L80242CEC: +/* 854E5C 80242CEC 24020055 */ addiu $v0, $zero, 0x55 +.L80242CF0: +/* 854E60 80242CF0 AE620074 */ sw $v0, 0x74($s3) +.L80242CF4: +/* 854E64 80242CF4 C634000C */ lwc1 $f20, 0xc($s1) +/* 854E68 80242CF8 C6760074 */ lwc1 $f22, 0x74($s3) +/* 854E6C 80242CFC 4680B5A0 */ cvt.s.w $f22, $f22 +/* 854E70 80242D00 4600A507 */ neg.s $f20, $f20 +/* 854E74 80242D04 0C00A8BB */ jal sin_deg +/* 854E78 80242D08 4600A306 */ mov.s $f12, $f20 +/* 854E7C 80242D0C 46160002 */ mul.s $f0, $f0, $f22 +/* 854E80 80242D10 00000000 */ nop +/* 854E84 80242D14 C6220038 */ lwc1 $f2, 0x38($s1) +/* 854E88 80242D18 3C0141F0 */ lui $at, 0x41f0 +/* 854E8C 80242D1C 44812000 */ mtc1 $at, $f4 +/* 854E90 80242D20 00000000 */ nop +/* 854E94 80242D24 46041080 */ add.s $f2, $f2, $f4 +/* 854E98 80242D28 46001600 */ add.s $f24, $f2, $f0 +/* 854E9C 80242D2C 0C00A8D4 */ jal cos_deg +/* 854EA0 80242D30 4600A306 */ mov.s $f12, $f20 +/* 854EA4 80242D34 46160002 */ mul.s $f0, $f0, $f22 +/* 854EA8 80242D38 00000000 */ nop +/* 854EAC 80242D3C 24020001 */ addiu $v0, $zero, 1 +/* 854EB0 80242D40 C6220040 */ lwc1 $f2, 0x40($s1) +/* 854EB4 80242D44 C624003C */ lwc1 $f4, 0x3c($s1) +/* 854EB8 80242D48 46001580 */ add.s $f22, $f2, $f0 +/* 854EBC 80242D4C 3C014248 */ lui $at, 0x4248 +/* 854EC0 80242D50 44810000 */ mtc1 $at, $f0 +/* 854EC4 80242D54 8E640070 */ lw $a0, 0x70($s3) +/* 854EC8 80242D58 1082001C */ beq $a0, $v0, .L80242DCC +/* 854ECC 80242D5C 46002500 */ add.s $f20, $f4, $f0 +/* 854ED0 80242D60 28820002 */ slti $v0, $a0, 2 +/* 854ED4 80242D64 10400005 */ beqz $v0, .L80242D7C +/* 854ED8 80242D68 24020002 */ addiu $v0, $zero, 2 +/* 854EDC 80242D6C 10800007 */ beqz $a0, .L80242D8C +/* 854EE0 80242D70 0000102D */ daddu $v0, $zero, $zero +/* 854EE4 80242D74 08090B97 */ j .L80242E5C +/* 854EE8 80242D78 00000000 */ nop +.L80242D7C: +/* 854EEC 80242D7C 10820027 */ beq $a0, $v0, .L80242E1C +/* 854EF0 80242D80 0000102D */ daddu $v0, $zero, $zero +/* 854EF4 80242D84 08090B97 */ j .L80242E5C +/* 854EF8 80242D88 00000000 */ nop +.L80242D8C: +/* 854EFC 80242D8C 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 854F00 80242D90 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 854F04 80242D94 3C030001 */ lui $v1, 1 +/* 854F08 80242D98 E4580028 */ swc1 $f24, 0x28($v0) +/* 854F0C 80242D9C E454002C */ swc1 $f20, 0x2c($v0) +/* 854F10 80242DA0 E4560030 */ swc1 $f22, 0x30($v0) +/* 854F14 80242DA4 C6200038 */ lwc1 $f0, 0x38($s1) +/* 854F18 80242DA8 C622003C */ lwc1 $f2, 0x3c($s1) +/* 854F1C 80242DAC 8E220000 */ lw $v0, ($s1) +/* 854F20 80242DB0 C6240040 */ lwc1 $f4, 0x40($s1) +/* 854F24 80242DB4 00431025 */ or $v0, $v0, $v1 +/* 854F28 80242DB8 E620006C */ swc1 $f0, 0x6c($s1) +/* 854F2C 80242DBC E6220070 */ swc1 $f2, 0x70($s1) +/* 854F30 80242DC0 E6240074 */ swc1 $f4, 0x74($s1) +/* 854F34 80242DC4 08090B96 */ j .L80242E58 +/* 854F38 80242DC8 AE220000 */ sw $v0, ($s1) +.L80242DCC: +/* 854F3C 80242DCC 0C00EAD2 */ jal get_npc_safe +/* 854F40 80242DD0 2404FFFC */ addiu $a0, $zero, -4 +/* 854F44 80242DD4 0040202D */ daddu $a0, $v0, $zero +/* 854F48 80242DD8 54800003 */ bnel $a0, $zero, .L80242DE8 +/* 854F4C 80242DDC E4980038 */ swc1 $f24, 0x38($a0) +/* 854F50 80242DE0 08090B97 */ j .L80242E5C +/* 854F54 80242DE4 24020002 */ addiu $v0, $zero, 2 +.L80242DE8: +/* 854F58 80242DE8 4600C006 */ mov.s $f0, $f24 +/* 854F5C 80242DEC E494003C */ swc1 $f20, 0x3c($a0) +/* 854F60 80242DF0 4600A086 */ mov.s $f2, $f20 +/* 854F64 80242DF4 E4960040 */ swc1 $f22, 0x40($a0) +/* 854F68 80242DF8 4600B106 */ mov.s $f4, $f22 +/* 854F6C 80242DFC 8C820000 */ lw $v0, ($a0) +/* 854F70 80242E00 3C030001 */ lui $v1, 1 +/* 854F74 80242E04 E480006C */ swc1 $f0, 0x6c($a0) +/* 854F78 80242E08 E4820070 */ swc1 $f2, 0x70($a0) +/* 854F7C 80242E0C E4840074 */ swc1 $f4, 0x74($a0) +/* 854F80 80242E10 00431025 */ or $v0, $v0, $v1 +/* 854F84 80242E14 08090B96 */ j .L80242E58 +/* 854F88 80242E18 AC820000 */ sw $v0, ($a0) +.L80242E1C: +/* 854F8C 80242E1C 0C00EAD2 */ jal get_npc_safe +/* 854F90 80242E20 24040001 */ addiu $a0, $zero, 1 +/* 854F94 80242E24 E4580038 */ swc1 $f24, 0x38($v0) +/* 854F98 80242E28 4600C006 */ mov.s $f0, $f24 +/* 854F9C 80242E2C E454003C */ swc1 $f20, 0x3c($v0) +/* 854FA0 80242E30 4600A086 */ mov.s $f2, $f20 +/* 854FA4 80242E34 E4560040 */ swc1 $f22, 0x40($v0) +/* 854FA8 80242E38 4600B106 */ mov.s $f4, $f22 +/* 854FAC 80242E3C 8C430000 */ lw $v1, ($v0) +/* 854FB0 80242E40 3C040001 */ lui $a0, 1 +/* 854FB4 80242E44 E440006C */ swc1 $f0, 0x6c($v0) +/* 854FB8 80242E48 E4420070 */ swc1 $f2, 0x70($v0) +/* 854FBC 80242E4C E4440074 */ swc1 $f4, 0x74($v0) +/* 854FC0 80242E50 00641825 */ or $v1, $v1, $a0 +/* 854FC4 80242E54 AC430000 */ sw $v1, ($v0) +.L80242E58: +/* 854FC8 80242E58 0000102D */ daddu $v0, $zero, $zero +.L80242E5C: +/* 854FCC 80242E5C 8FBF0020 */ lw $ra, 0x20($sp) +/* 854FD0 80242E60 8FB3001C */ lw $s3, 0x1c($sp) +/* 854FD4 80242E64 8FB20018 */ lw $s2, 0x18($sp) +/* 854FD8 80242E68 8FB10014 */ lw $s1, 0x14($sp) +/* 854FDC 80242E6C 8FB00010 */ lw $s0, 0x10($sp) +/* 854FE0 80242E70 D7B80038 */ ldc1 $f24, 0x38($sp) +/* 854FE4 80242E74 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 854FE8 80242E78 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 854FEC 80242E7C 03E00008 */ jr $ra +/* 854FF0 80242E80 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84.s deleted file mode 100644 index d49a7fbf34..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E84 -/* 854FF4 80242E84 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 854FF8 80242E88 AFB20018 */ sw $s2, 0x18($sp) -/* 854FFC 80242E8C 0080902D */ daddu $s2, $a0, $zero -/* 855000 80242E90 AFB00010 */ sw $s0, 0x10($sp) -/* 855004 80242E94 00A0802D */ daddu $s0, $a1, $zero -/* 855008 80242E98 AFBF0020 */ sw $ra, 0x20($sp) -/* 85500C 80242E9C AFB3001C */ sw $s3, 0x1c($sp) -/* 855010 80242EA0 AFB10014 */ sw $s1, 0x14($sp) -/* 855014 80242EA4 8E53000C */ lw $s3, 0xc($s2) -/* 855018 80242EA8 0C00EAD2 */ jal get_npc_safe -/* 85501C 80242EAC 0000202D */ daddu $a0, $zero, $zero -/* 855020 80242EB0 12000018 */ beqz $s0, .L80242F14 -/* 855024 80242EB4 0040882D */ daddu $s1, $v0, $zero -/* 855028 80242EB8 8E650000 */ lw $a1, ($s3) -/* 85502C 80242EBC 0C0B1EAF */ jal get_variable -/* 855030 80242EC0 0240202D */ daddu $a0, $s2, $zero -/* 855034 80242EC4 14400005 */ bnez $v0, .L80242EDC -/* 855038 80242EC8 AE420070 */ sw $v0, 0x70($s2) -/* 85503C 80242ECC 2402005A */ addiu $v0, $zero, 0x5a -/* 855040 80242ED0 AE400078 */ sw $zero, 0x78($s2) -/* 855044 80242ED4 08090BC5 */ j .L80242F14 -/* 855048 80242ED8 AE420074 */ sw $v0, 0x74($s2) -.L80242EDC: -/* 85504C 80242EDC 3C014422 */ lui $at, 0x4422 -/* 855050 80242EE0 34218000 */ ori $at, $at, 0x8000 -/* 855054 80242EE4 44810000 */ mtc1 $at, $f0 -/* 855058 80242EE8 3C01C1F0 */ lui $at, 0xc1f0 -/* 85505C 80242EEC 44811000 */ mtc1 $at, $f2 -/* 855060 80242EF0 3C0143BA */ lui $at, 0x43ba -/* 855064 80242EF4 44812000 */ mtc1 $at, $f4 -/* 855068 80242EF8 2402000A */ addiu $v0, $zero, 0xa -/* 85506C 80242EFC AE420078 */ sw $v0, 0x78($s2) -/* 855070 80242F00 24020122 */ addiu $v0, $zero, 0x122 -/* 855074 80242F04 AE420074 */ sw $v0, 0x74($s2) -/* 855078 80242F08 E6200038 */ swc1 $f0, 0x38($s1) -/* 85507C 80242F0C E622003C */ swc1 $f2, 0x3c($s1) -/* 855080 80242F10 E6240040 */ swc1 $f4, 0x40($s1) -.L80242F14: -/* 855084 80242F14 8E430078 */ lw $v1, 0x78($s2) -/* 855088 80242F18 24040001 */ addiu $a0, $zero, 1 -/* 85508C 80242F1C 10640022 */ beq $v1, $a0, .L80242FA8 -/* 855090 80242F20 28620002 */ slti $v0, $v1, 2 -/* 855094 80242F24 10400005 */ beqz $v0, .L80242F3C -/* 855098 80242F28 2402000A */ addiu $v0, $zero, 0xa -/* 85509C 80242F2C 10600009 */ beqz $v1, .L80242F54 -/* 8550A0 80242F30 0000102D */ daddu $v0, $zero, $zero -/* 8550A4 80242F34 08090C1B */ j .L8024306C -/* 8550A8 80242F38 00000000 */ nop -.L80242F3C: -/* 8550AC 80242F3C 1062002C */ beq $v1, $v0, .L80242FF0 -/* 8550B0 80242F40 2402000B */ addiu $v0, $zero, 0xb -/* 8550B4 80242F44 1062003D */ beq $v1, $v0, .L8024303C -/* 8550B8 80242F48 0000102D */ daddu $v0, $zero, $zero -/* 8550BC 80242F4C 08090C1B */ j .L8024306C -/* 8550C0 80242F50 00000000 */ nop -.L80242F54: -/* 8550C4 80242F54 3C0200B6 */ lui $v0, 0xb6 -/* 8550C8 80242F58 C624000C */ lwc1 $f4, 0xc($s1) -/* 8550CC 80242F5C 3C013F80 */ lui $at, 0x3f80 -/* 8550D0 80242F60 44810000 */ mtc1 $at, $f0 -/* 8550D4 80242F64 3C014040 */ lui $at, 0x4040 -/* 8550D8 80242F68 44811000 */ mtc1 $at, $f2 -/* 8550DC 80242F6C 46002101 */ sub.s $f4, $f4, $f0 -/* 8550E0 80242F70 C6200038 */ lwc1 $f0, 0x38($s1) -/* 8550E4 80242F74 34420001 */ ori $v0, $v0, 1 -/* 8550E8 80242F78 46020000 */ add.s $f0, $f0, $f2 -/* 8550EC 80242F7C AE220028 */ sw $v0, 0x28($s1) -/* 8550F0 80242F80 E624000C */ swc1 $f4, 0xc($s1) -/* 8550F4 80242F84 E6200038 */ swc1 $f0, 0x38($s1) -/* 8550F8 80242F88 8E420074 */ lw $v0, 0x74($s2) -/* 8550FC 80242F8C 2442FFFF */ addiu $v0, $v0, -1 -/* 855100 80242F90 1C400035 */ bgtz $v0, .L80243068 -/* 855104 80242F94 AE420074 */ sw $v0, 0x74($s2) -/* 855108 80242F98 240200C8 */ addiu $v0, $zero, 0xc8 -/* 85510C 80242F9C AE440078 */ sw $a0, 0x78($s2) -/* 855110 80242FA0 08090C1A */ j .L80243068 -/* 855114 80242FA4 AE420074 */ sw $v0, 0x74($s2) -.L80242FA8: -/* 855118 80242FA8 0000202D */ daddu $a0, $zero, $zero -/* 85511C 80242FAC 3C05FAA2 */ lui $a1, 0xfaa2 -/* 855120 80242FB0 0C0B1EAF */ jal get_variable -/* 855124 80242FB4 34A5B581 */ ori $a1, $a1, 0xb581 -/* 855128 80242FB8 1040002C */ beqz $v0, .L8024306C -/* 85512C 80242FBC 0000102D */ daddu $v0, $zero, $zero -/* 855130 80242FC0 C6200038 */ lwc1 $f0, 0x38($s1) -/* 855134 80242FC4 3C014040 */ lui $at, 0x4040 -/* 855138 80242FC8 44811000 */ mtc1 $at, $f2 -/* 85513C 80242FCC 00000000 */ nop -/* 855140 80242FD0 46020000 */ add.s $f0, $f0, $f2 -/* 855144 80242FD4 E6200038 */ swc1 $f0, 0x38($s1) -/* 855148 80242FD8 8E420074 */ lw $v0, 0x74($s2) -/* 85514C 80242FDC 2442FFFF */ addiu $v0, $v0, -1 -/* 855150 80242FE0 1C400021 */ bgtz $v0, .L80243068 -/* 855154 80242FE4 AE420074 */ sw $v0, 0x74($s2) -/* 855158 80242FE8 08090C1B */ j .L8024306C -/* 85515C 80242FEC 24020001 */ addiu $v0, $zero, 1 -.L80242FF0: -/* 855160 80242FF0 C6220038 */ lwc1 $f2, 0x38($s1) -/* 855164 80242FF4 3C014040 */ lui $at, 0x4040 -/* 855168 80242FF8 44810000 */ mtc1 $at, $f0 -/* 85516C 80242FFC 00000000 */ nop -/* 855170 80243000 46001081 */ sub.s $f2, $f2, $f0 -/* 855174 80243004 3C014387 */ lui $at, 0x4387 -/* 855178 80243008 44810000 */ mtc1 $at, $f0 -/* 85517C 8024300C 00000000 */ nop -/* 855180 80243010 E620000C */ swc1 $f0, 0xc($s1) -/* 855184 80243014 E6220038 */ swc1 $f2, 0x38($s1) -/* 855188 80243018 8E420074 */ lw $v0, 0x74($s2) -/* 85518C 8024301C 2442FFFF */ addiu $v0, $v0, -1 -/* 855190 80243020 1C400011 */ bgtz $v0, .L80243068 -/* 855194 80243024 AE420074 */ sw $v0, 0x74($s2) -/* 855198 80243028 2402000B */ addiu $v0, $zero, 0xb -/* 85519C 8024302C AE420078 */ sw $v0, 0x78($s2) -/* 8551A0 80243030 2402005A */ addiu $v0, $zero, 0x5a -/* 8551A4 80243034 08090C1A */ j .L80243068 -/* 8551A8 80243038 AE420074 */ sw $v0, 0x74($s2) -.L8024303C: -/* 8551AC 8024303C C620000C */ lwc1 $f0, 0xc($s1) -/* 8551B0 80243040 3C013F80 */ lui $at, 0x3f80 -/* 8551B4 80243044 44811000 */ mtc1 $at, $f2 -/* 8551B8 80243048 00000000 */ nop -/* 8551BC 8024304C 46020001 */ sub.s $f0, $f0, $f2 -/* 8551C0 80243050 E620000C */ swc1 $f0, 0xc($s1) -/* 8551C4 80243054 8E430074 */ lw $v1, 0x74($s2) -/* 8551C8 80243058 24020001 */ addiu $v0, $zero, 1 -/* 8551CC 8024305C 2463FFFF */ addiu $v1, $v1, -1 -/* 8551D0 80243060 18600002 */ blez $v1, .L8024306C -/* 8551D4 80243064 AE430074 */ sw $v1, 0x74($s2) -.L80243068: -/* 8551D8 80243068 0000102D */ daddu $v0, $zero, $zero -.L8024306C: -/* 8551DC 8024306C 8FBF0020 */ lw $ra, 0x20($sp) -/* 8551E0 80243070 8FB3001C */ lw $s3, 0x1c($sp) -/* 8551E4 80243074 8FB20018 */ lw $s2, 0x18($sp) -/* 8551E8 80243078 8FB10014 */ lw $s1, 0x14($sp) -/* 8551EC 8024307C 8FB00010 */ lw $s0, 0x10($sp) -/* 8551F0 80243080 03E00008 */ jr $ra -/* 8551F4 80243084 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s new file mode 100644 index 0000000000..1a830f0efe --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242E84_854FF4.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E84_854FF4 +/* 854FF4 80242E84 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 854FF8 80242E88 AFB20018 */ sw $s2, 0x18($sp) +/* 854FFC 80242E8C 0080902D */ daddu $s2, $a0, $zero +/* 855000 80242E90 AFB00010 */ sw $s0, 0x10($sp) +/* 855004 80242E94 00A0802D */ daddu $s0, $a1, $zero +/* 855008 80242E98 AFBF0020 */ sw $ra, 0x20($sp) +/* 85500C 80242E9C AFB3001C */ sw $s3, 0x1c($sp) +/* 855010 80242EA0 AFB10014 */ sw $s1, 0x14($sp) +/* 855014 80242EA4 8E53000C */ lw $s3, 0xc($s2) +/* 855018 80242EA8 0C00EAD2 */ jal get_npc_safe +/* 85501C 80242EAC 0000202D */ daddu $a0, $zero, $zero +/* 855020 80242EB0 12000018 */ beqz $s0, .L80242F14 +/* 855024 80242EB4 0040882D */ daddu $s1, $v0, $zero +/* 855028 80242EB8 8E650000 */ lw $a1, ($s3) +/* 85502C 80242EBC 0C0B1EAF */ jal get_variable +/* 855030 80242EC0 0240202D */ daddu $a0, $s2, $zero +/* 855034 80242EC4 14400005 */ bnez $v0, .L80242EDC +/* 855038 80242EC8 AE420070 */ sw $v0, 0x70($s2) +/* 85503C 80242ECC 2402005A */ addiu $v0, $zero, 0x5a +/* 855040 80242ED0 AE400078 */ sw $zero, 0x78($s2) +/* 855044 80242ED4 08090BC5 */ j .L80242F14 +/* 855048 80242ED8 AE420074 */ sw $v0, 0x74($s2) +.L80242EDC: +/* 85504C 80242EDC 3C014422 */ lui $at, 0x4422 +/* 855050 80242EE0 34218000 */ ori $at, $at, 0x8000 +/* 855054 80242EE4 44810000 */ mtc1 $at, $f0 +/* 855058 80242EE8 3C01C1F0 */ lui $at, 0xc1f0 +/* 85505C 80242EEC 44811000 */ mtc1 $at, $f2 +/* 855060 80242EF0 3C0143BA */ lui $at, 0x43ba +/* 855064 80242EF4 44812000 */ mtc1 $at, $f4 +/* 855068 80242EF8 2402000A */ addiu $v0, $zero, 0xa +/* 85506C 80242EFC AE420078 */ sw $v0, 0x78($s2) +/* 855070 80242F00 24020122 */ addiu $v0, $zero, 0x122 +/* 855074 80242F04 AE420074 */ sw $v0, 0x74($s2) +/* 855078 80242F08 E6200038 */ swc1 $f0, 0x38($s1) +/* 85507C 80242F0C E622003C */ swc1 $f2, 0x3c($s1) +/* 855080 80242F10 E6240040 */ swc1 $f4, 0x40($s1) +.L80242F14: +/* 855084 80242F14 8E430078 */ lw $v1, 0x78($s2) +/* 855088 80242F18 24040001 */ addiu $a0, $zero, 1 +/* 85508C 80242F1C 10640022 */ beq $v1, $a0, .L80242FA8 +/* 855090 80242F20 28620002 */ slti $v0, $v1, 2 +/* 855094 80242F24 10400005 */ beqz $v0, .L80242F3C +/* 855098 80242F28 2402000A */ addiu $v0, $zero, 0xa +/* 85509C 80242F2C 10600009 */ beqz $v1, .L80242F54 +/* 8550A0 80242F30 0000102D */ daddu $v0, $zero, $zero +/* 8550A4 80242F34 08090C1B */ j .L8024306C +/* 8550A8 80242F38 00000000 */ nop +.L80242F3C: +/* 8550AC 80242F3C 1062002C */ beq $v1, $v0, .L80242FF0 +/* 8550B0 80242F40 2402000B */ addiu $v0, $zero, 0xb +/* 8550B4 80242F44 1062003D */ beq $v1, $v0, .L8024303C +/* 8550B8 80242F48 0000102D */ daddu $v0, $zero, $zero +/* 8550BC 80242F4C 08090C1B */ j .L8024306C +/* 8550C0 80242F50 00000000 */ nop +.L80242F54: +/* 8550C4 80242F54 3C0200B6 */ lui $v0, 0xb6 +/* 8550C8 80242F58 C624000C */ lwc1 $f4, 0xc($s1) +/* 8550CC 80242F5C 3C013F80 */ lui $at, 0x3f80 +/* 8550D0 80242F60 44810000 */ mtc1 $at, $f0 +/* 8550D4 80242F64 3C014040 */ lui $at, 0x4040 +/* 8550D8 80242F68 44811000 */ mtc1 $at, $f2 +/* 8550DC 80242F6C 46002101 */ sub.s $f4, $f4, $f0 +/* 8550E0 80242F70 C6200038 */ lwc1 $f0, 0x38($s1) +/* 8550E4 80242F74 34420001 */ ori $v0, $v0, 1 +/* 8550E8 80242F78 46020000 */ add.s $f0, $f0, $f2 +/* 8550EC 80242F7C AE220028 */ sw $v0, 0x28($s1) +/* 8550F0 80242F80 E624000C */ swc1 $f4, 0xc($s1) +/* 8550F4 80242F84 E6200038 */ swc1 $f0, 0x38($s1) +/* 8550F8 80242F88 8E420074 */ lw $v0, 0x74($s2) +/* 8550FC 80242F8C 2442FFFF */ addiu $v0, $v0, -1 +/* 855100 80242F90 1C400035 */ bgtz $v0, .L80243068 +/* 855104 80242F94 AE420074 */ sw $v0, 0x74($s2) +/* 855108 80242F98 240200C8 */ addiu $v0, $zero, 0xc8 +/* 85510C 80242F9C AE440078 */ sw $a0, 0x78($s2) +/* 855110 80242FA0 08090C1A */ j .L80243068 +/* 855114 80242FA4 AE420074 */ sw $v0, 0x74($s2) +.L80242FA8: +/* 855118 80242FA8 0000202D */ daddu $a0, $zero, $zero +/* 85511C 80242FAC 3C05FAA2 */ lui $a1, 0xfaa2 +/* 855120 80242FB0 0C0B1EAF */ jal get_variable +/* 855124 80242FB4 34A5B581 */ ori $a1, $a1, 0xb581 +/* 855128 80242FB8 1040002C */ beqz $v0, .L8024306C +/* 85512C 80242FBC 0000102D */ daddu $v0, $zero, $zero +/* 855130 80242FC0 C6200038 */ lwc1 $f0, 0x38($s1) +/* 855134 80242FC4 3C014040 */ lui $at, 0x4040 +/* 855138 80242FC8 44811000 */ mtc1 $at, $f2 +/* 85513C 80242FCC 00000000 */ nop +/* 855140 80242FD0 46020000 */ add.s $f0, $f0, $f2 +/* 855144 80242FD4 E6200038 */ swc1 $f0, 0x38($s1) +/* 855148 80242FD8 8E420074 */ lw $v0, 0x74($s2) +/* 85514C 80242FDC 2442FFFF */ addiu $v0, $v0, -1 +/* 855150 80242FE0 1C400021 */ bgtz $v0, .L80243068 +/* 855154 80242FE4 AE420074 */ sw $v0, 0x74($s2) +/* 855158 80242FE8 08090C1B */ j .L8024306C +/* 85515C 80242FEC 24020001 */ addiu $v0, $zero, 1 +.L80242FF0: +/* 855160 80242FF0 C6220038 */ lwc1 $f2, 0x38($s1) +/* 855164 80242FF4 3C014040 */ lui $at, 0x4040 +/* 855168 80242FF8 44810000 */ mtc1 $at, $f0 +/* 85516C 80242FFC 00000000 */ nop +/* 855170 80243000 46001081 */ sub.s $f2, $f2, $f0 +/* 855174 80243004 3C014387 */ lui $at, 0x4387 +/* 855178 80243008 44810000 */ mtc1 $at, $f0 +/* 85517C 8024300C 00000000 */ nop +/* 855180 80243010 E620000C */ swc1 $f0, 0xc($s1) +/* 855184 80243014 E6220038 */ swc1 $f2, 0x38($s1) +/* 855188 80243018 8E420074 */ lw $v0, 0x74($s2) +/* 85518C 8024301C 2442FFFF */ addiu $v0, $v0, -1 +/* 855190 80243020 1C400011 */ bgtz $v0, .L80243068 +/* 855194 80243024 AE420074 */ sw $v0, 0x74($s2) +/* 855198 80243028 2402000B */ addiu $v0, $zero, 0xb +/* 85519C 8024302C AE420078 */ sw $v0, 0x78($s2) +/* 8551A0 80243030 2402005A */ addiu $v0, $zero, 0x5a +/* 8551A4 80243034 08090C1A */ j .L80243068 +/* 8551A8 80243038 AE420074 */ sw $v0, 0x74($s2) +.L8024303C: +/* 8551AC 8024303C C620000C */ lwc1 $f0, 0xc($s1) +/* 8551B0 80243040 3C013F80 */ lui $at, 0x3f80 +/* 8551B4 80243044 44811000 */ mtc1 $at, $f2 +/* 8551B8 80243048 00000000 */ nop +/* 8551BC 8024304C 46020001 */ sub.s $f0, $f0, $f2 +/* 8551C0 80243050 E620000C */ swc1 $f0, 0xc($s1) +/* 8551C4 80243054 8E430074 */ lw $v1, 0x74($s2) +/* 8551C8 80243058 24020001 */ addiu $v0, $zero, 1 +/* 8551CC 8024305C 2463FFFF */ addiu $v1, $v1, -1 +/* 8551D0 80243060 18600002 */ blez $v1, .L8024306C +/* 8551D4 80243064 AE430074 */ sw $v1, 0x74($s2) +.L80243068: +/* 8551D8 80243068 0000102D */ daddu $v0, $zero, $zero +.L8024306C: +/* 8551DC 8024306C 8FBF0020 */ lw $ra, 0x20($sp) +/* 8551E0 80243070 8FB3001C */ lw $s3, 0x1c($sp) +/* 8551E4 80243074 8FB20018 */ lw $s2, 0x18($sp) +/* 8551E8 80243078 8FB10014 */ lw $s1, 0x14($sp) +/* 8551EC 8024307C 8FB00010 */ lw $s0, 0x10($sp) +/* 8551F0 80243080 03E00008 */ jr $ra +/* 8551F4 80243084 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4.s deleted file mode 100644 index 47f3bf8969..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430B4 -/* 855224 802430B4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 855228 802430B8 AFB20038 */ sw $s2, 0x38($sp) -/* 85522C 802430BC 0080902D */ daddu $s2, $a0, $zero -/* 855230 802430C0 AFBF003C */ sw $ra, 0x3c($sp) -/* 855234 802430C4 AFB10034 */ sw $s1, 0x34($sp) -/* 855238 802430C8 AFB00030 */ sw $s0, 0x30($sp) -/* 85523C 802430CC F7B40040 */ sdc1 $f20, 0x40($sp) -/* 855240 802430D0 8E51000C */ lw $s1, 0xc($s2) -/* 855244 802430D4 0C00EAD2 */ jal get_npc_safe -/* 855248 802430D8 2404FFFC */ addiu $a0, $zero, -4 -/* 85524C 802430DC 2410FFFF */ addiu $s0, $zero, -1 -/* 855250 802430E0 3C038016 */ lui $v1, 0x8016 -/* 855254 802430E4 8463A568 */ lh $v1, -0x5a98($v1) -/* 855258 802430E8 04600025 */ bltz $v1, .L80243180 -/* 85525C 802430EC 0040202D */ daddu $a0, $v0, $zero -/* 855260 802430F0 3C014130 */ lui $at, 0x4130 -/* 855264 802430F4 44812000 */ mtc1 $at, $f4 -/* 855268 802430F8 C4800038 */ lwc1 $f0, 0x38($a0) -/* 85526C 802430FC 3C014140 */ lui $at, 0x4140 -/* 855270 80243100 4481A000 */ mtc1 $at, $f20 -/* 855274 80243104 27A2002C */ addiu $v0, $sp, 0x2c -/* 855278 80243108 E7A4002C */ swc1 $f4, 0x2c($sp) -/* 85527C 8024310C E7A00020 */ swc1 $f0, 0x20($sp) -/* 855280 80243110 C480003C */ lwc1 $f0, 0x3c($a0) -/* 855284 80243114 C4820040 */ lwc1 $f2, 0x40($a0) -/* 855288 80243118 46040000 */ add.s $f0, $f0, $f4 -/* 85528C 8024311C E7B4002C */ swc1 $f20, 0x2c($sp) -/* 855290 80243120 E7A20028 */ swc1 $f2, 0x28($sp) -/* 855294 80243124 E7A00024 */ swc1 $f0, 0x24($sp) -/* 855298 80243128 AFA20010 */ sw $v0, 0x10($sp) -/* 85529C 8024312C C480000C */ lwc1 $f0, 0xc($a0) -/* 8552A0 80243130 27A50020 */ addiu $a1, $sp, 0x20 -/* 8552A4 80243134 E7A00014 */ swc1 $f0, 0x14($sp) -/* 8552A8 80243138 848200A6 */ lh $v0, 0xa6($a0) -/* 8552AC 8024313C 27A60024 */ addiu $a2, $sp, 0x24 -/* 8552B0 80243140 44820000 */ mtc1 $v0, $f0 -/* 8552B4 80243144 00000000 */ nop -/* 8552B8 80243148 46800020 */ cvt.s.w $f0, $f0 -/* 8552BC 8024314C E7A00018 */ swc1 $f0, 0x18($sp) -/* 8552C0 80243150 8C840080 */ lw $a0, 0x80($a0) -/* 8552C4 80243154 0C0371DE */ jal func_800DC778 -/* 8552C8 80243158 27A70028 */ addiu $a3, $sp, 0x28 -/* 8552CC 8024315C 10400009 */ beqz $v0, .L80243184 -/* 8552D0 80243160 0240202D */ daddu $a0, $s2, $zero -/* 8552D4 80243164 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 8552D8 80243168 4614003E */ c.le.s $f0, $f20 -/* 8552DC 8024316C 00000000 */ nop -/* 8552E0 80243170 45000004 */ bc1f .L80243184 -/* 8552E4 80243174 00000000 */ nop -/* 8552E8 80243178 3C108011 */ lui $s0, 0x8011 -/* 8552EC 8024317C 8E10C978 */ lw $s0, -0x3688($s0) -.L80243180: -/* 8552F0 80243180 0240202D */ daddu $a0, $s2, $zero -.L80243184: -/* 8552F4 80243184 8E250000 */ lw $a1, ($s1) -/* 8552F8 80243188 0C0B2026 */ jal set_variable -/* 8552FC 8024318C 0200302D */ daddu $a2, $s0, $zero -/* 855300 80243190 8FBF003C */ lw $ra, 0x3c($sp) -/* 855304 80243194 8FB20038 */ lw $s2, 0x38($sp) -/* 855308 80243198 8FB10034 */ lw $s1, 0x34($sp) -/* 85530C 8024319C 8FB00030 */ lw $s0, 0x30($sp) -/* 855310 802431A0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 855314 802431A4 24020002 */ addiu $v0, $zero, 2 -/* 855318 802431A8 03E00008 */ jr $ra -/* 85531C 802431AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s new file mode 100644 index 0000000000..a7b29513bb --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802430B4_855224.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802430B4_855224 +/* 855224 802430B4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 855228 802430B8 AFB20038 */ sw $s2, 0x38($sp) +/* 85522C 802430BC 0080902D */ daddu $s2, $a0, $zero +/* 855230 802430C0 AFBF003C */ sw $ra, 0x3c($sp) +/* 855234 802430C4 AFB10034 */ sw $s1, 0x34($sp) +/* 855238 802430C8 AFB00030 */ sw $s0, 0x30($sp) +/* 85523C 802430CC F7B40040 */ sdc1 $f20, 0x40($sp) +/* 855240 802430D0 8E51000C */ lw $s1, 0xc($s2) +/* 855244 802430D4 0C00EAD2 */ jal get_npc_safe +/* 855248 802430D8 2404FFFC */ addiu $a0, $zero, -4 +/* 85524C 802430DC 2410FFFF */ addiu $s0, $zero, -1 +/* 855250 802430E0 3C038016 */ lui $v1, 0x8016 +/* 855254 802430E4 8463A568 */ lh $v1, -0x5a98($v1) +/* 855258 802430E8 04600025 */ bltz $v1, .L80243180 +/* 85525C 802430EC 0040202D */ daddu $a0, $v0, $zero +/* 855260 802430F0 3C014130 */ lui $at, 0x4130 +/* 855264 802430F4 44812000 */ mtc1 $at, $f4 +/* 855268 802430F8 C4800038 */ lwc1 $f0, 0x38($a0) +/* 85526C 802430FC 3C014140 */ lui $at, 0x4140 +/* 855270 80243100 4481A000 */ mtc1 $at, $f20 +/* 855274 80243104 27A2002C */ addiu $v0, $sp, 0x2c +/* 855278 80243108 E7A4002C */ swc1 $f4, 0x2c($sp) +/* 85527C 8024310C E7A00020 */ swc1 $f0, 0x20($sp) +/* 855280 80243110 C480003C */ lwc1 $f0, 0x3c($a0) +/* 855284 80243114 C4820040 */ lwc1 $f2, 0x40($a0) +/* 855288 80243118 46040000 */ add.s $f0, $f0, $f4 +/* 85528C 8024311C E7B4002C */ swc1 $f20, 0x2c($sp) +/* 855290 80243120 E7A20028 */ swc1 $f2, 0x28($sp) +/* 855294 80243124 E7A00024 */ swc1 $f0, 0x24($sp) +/* 855298 80243128 AFA20010 */ sw $v0, 0x10($sp) +/* 85529C 8024312C C480000C */ lwc1 $f0, 0xc($a0) +/* 8552A0 80243130 27A50020 */ addiu $a1, $sp, 0x20 +/* 8552A4 80243134 E7A00014 */ swc1 $f0, 0x14($sp) +/* 8552A8 80243138 848200A6 */ lh $v0, 0xa6($a0) +/* 8552AC 8024313C 27A60024 */ addiu $a2, $sp, 0x24 +/* 8552B0 80243140 44820000 */ mtc1 $v0, $f0 +/* 8552B4 80243144 00000000 */ nop +/* 8552B8 80243148 46800020 */ cvt.s.w $f0, $f0 +/* 8552BC 8024314C E7A00018 */ swc1 $f0, 0x18($sp) +/* 8552C0 80243150 8C840080 */ lw $a0, 0x80($a0) +/* 8552C4 80243154 0C0371DE */ jal func_800DC778 +/* 8552C8 80243158 27A70028 */ addiu $a3, $sp, 0x28 +/* 8552CC 8024315C 10400009 */ beqz $v0, .L80243184 +/* 8552D0 80243160 0240202D */ daddu $a0, $s2, $zero +/* 8552D4 80243164 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* 8552D8 80243168 4614003E */ c.le.s $f0, $f20 +/* 8552DC 8024316C 00000000 */ nop +/* 8552E0 80243170 45000004 */ bc1f .L80243184 +/* 8552E4 80243174 00000000 */ nop +/* 8552E8 80243178 3C108011 */ lui $s0, 0x8011 +/* 8552EC 8024317C 8E10C978 */ lw $s0, -0x3688($s0) +.L80243180: +/* 8552F0 80243180 0240202D */ daddu $a0, $s2, $zero +.L80243184: +/* 8552F4 80243184 8E250000 */ lw $a1, ($s1) +/* 8552F8 80243188 0C0B2026 */ jal set_variable +/* 8552FC 8024318C 0200302D */ daddu $a2, $s0, $zero +/* 855300 80243190 8FBF003C */ lw $ra, 0x3c($sp) +/* 855304 80243194 8FB20038 */ lw $s2, 0x38($sp) +/* 855308 80243198 8FB10034 */ lw $s1, 0x34($sp) +/* 85530C 8024319C 8FB00030 */ lw $s0, 0x30($sp) +/* 855310 802431A0 D7B40040 */ ldc1 $f20, 0x40($sp) +/* 855314 802431A4 24020002 */ addiu $v0, $zero, 2 +/* 855318 802431A8 03E00008 */ jr $ra +/* 85531C 802431AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0.s deleted file mode 100644 index f6f447477b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431B0 -/* 855320 802431B0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 855324 802431B4 AFBF0018 */ sw $ra, 0x18($sp) -/* 855328 802431B8 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 85532C 802431BC F7B60028 */ sdc1 $f22, 0x28($sp) -/* 855330 802431C0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 855334 802431C4 0C00EAD2 */ jal get_npc_safe -/* 855338 802431C8 24040004 */ addiu $a0, $zero, 4 -/* 85533C 802431CC C4420038 */ lwc1 $f2, 0x38($v0) -/* 855340 802431D0 3C0141A0 */ lui $at, 0x41a0 -/* 855344 802431D4 44810000 */ mtc1 $at, $f0 -/* 855348 802431D8 00000000 */ nop -/* 85534C 802431DC 46001580 */ add.s $f22, $f2, $f0 -/* 855350 802431E0 C4420040 */ lwc1 $f2, 0x40($v0) -/* 855354 802431E4 3C014170 */ lui $at, 0x4170 -/* 855358 802431E8 44810000 */ mtc1 $at, $f0 -/* 85535C 802431EC C454003C */ lwc1 $f20, 0x3c($v0) -/* 855360 802431F0 46001601 */ sub.s $f24, $f2, $f0 -/* 855364 802431F4 44800000 */ mtc1 $zero, $f0 -/* 855368 802431F8 00000000 */ nop -/* 85536C 802431FC 4600A03C */ c.lt.s $f20, $f0 -/* 855370 80243200 00000000 */ nop -/* 855374 80243204 4500000C */ bc1f .L80243238 -/* 855378 80243208 0000202D */ daddu $a0, $zero, $zero -/* 85537C 8024320C 4405B000 */ mfc1 $a1, $f22 -/* 855380 80243210 4406A000 */ mfc1 $a2, $f20 -/* 855384 80243214 4407C000 */ mfc1 $a3, $f24 -/* 855388 80243218 0C01C16C */ jal func_800705B0 -/* 85538C 8024321C E7A00010 */ swc1 $f0, 0x10($sp) -/* 855390 80243220 24040046 */ addiu $a0, $zero, 0x46 -/* 855394 80243224 4406B000 */ mfc1 $a2, $f22 -/* 855398 80243228 4407A000 */ mfc1 $a3, $f20 -/* 85539C 8024322C 0000282D */ daddu $a1, $zero, $zero -/* 8553A0 80243230 0C05267B */ jal func_801499EC -/* 8553A4 80243234 E7B80010 */ swc1 $f24, 0x10($sp) -.L80243238: -/* 8553A8 80243238 8FBF0018 */ lw $ra, 0x18($sp) -/* 8553AC 8024323C D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8553B0 80243240 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8553B4 80243244 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8553B8 80243248 24020002 */ addiu $v0, $zero, 2 -/* 8553BC 8024324C 03E00008 */ jr $ra -/* 8553C0 80243250 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s new file mode 100644 index 0000000000..14a0ed44f7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802431B0_855320.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802431B0_855320 +/* 855320 802431B0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 855324 802431B4 AFBF0018 */ sw $ra, 0x18($sp) +/* 855328 802431B8 F7B80030 */ sdc1 $f24, 0x30($sp) +/* 85532C 802431BC F7B60028 */ sdc1 $f22, 0x28($sp) +/* 855330 802431C0 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 855334 802431C4 0C00EAD2 */ jal get_npc_safe +/* 855338 802431C8 24040004 */ addiu $a0, $zero, 4 +/* 85533C 802431CC C4420038 */ lwc1 $f2, 0x38($v0) +/* 855340 802431D0 3C0141A0 */ lui $at, 0x41a0 +/* 855344 802431D4 44810000 */ mtc1 $at, $f0 +/* 855348 802431D8 00000000 */ nop +/* 85534C 802431DC 46001580 */ add.s $f22, $f2, $f0 +/* 855350 802431E0 C4420040 */ lwc1 $f2, 0x40($v0) +/* 855354 802431E4 3C014170 */ lui $at, 0x4170 +/* 855358 802431E8 44810000 */ mtc1 $at, $f0 +/* 85535C 802431EC C454003C */ lwc1 $f20, 0x3c($v0) +/* 855360 802431F0 46001601 */ sub.s $f24, $f2, $f0 +/* 855364 802431F4 44800000 */ mtc1 $zero, $f0 +/* 855368 802431F8 00000000 */ nop +/* 85536C 802431FC 4600A03C */ c.lt.s $f20, $f0 +/* 855370 80243200 00000000 */ nop +/* 855374 80243204 4500000C */ bc1f .L80243238 +/* 855378 80243208 0000202D */ daddu $a0, $zero, $zero +/* 85537C 8024320C 4405B000 */ mfc1 $a1, $f22 +/* 855380 80243210 4406A000 */ mfc1 $a2, $f20 +/* 855384 80243214 4407C000 */ mfc1 $a3, $f24 +/* 855388 80243218 0C01C16C */ jal func_800705B0 +/* 85538C 8024321C E7A00010 */ swc1 $f0, 0x10($sp) +/* 855390 80243220 24040046 */ addiu $a0, $zero, 0x46 +/* 855394 80243224 4406B000 */ mfc1 $a2, $f22 +/* 855398 80243228 4407A000 */ mfc1 $a3, $f20 +/* 85539C 8024322C 0000282D */ daddu $a1, $zero, $zero +/* 8553A0 80243230 0C05267B */ jal func_801499EC +/* 8553A4 80243234 E7B80010 */ swc1 $f24, 0x10($sp) +.L80243238: +/* 8553A8 80243238 8FBF0018 */ lw $ra, 0x18($sp) +/* 8553AC 8024323C D7B80030 */ ldc1 $f24, 0x30($sp) +/* 8553B0 80243240 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8553B4 80243244 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8553B8 80243248 24020002 */ addiu $v0, $zero, 2 +/* 8553BC 8024324C 03E00008 */ jr $ra +/* 8553C0 80243250 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254.s deleted file mode 100644 index 9eadbcd3c6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243254 -/* 8553C4 80243254 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 8553C8 80243258 AFB10014 */ sw $s1, 0x14($sp) -/* 8553CC 8024325C 0080882D */ daddu $s1, $a0, $zero -/* 8553D0 80243260 AFBF0020 */ sw $ra, 0x20($sp) -/* 8553D4 80243264 AFB3001C */ sw $s3, 0x1c($sp) -/* 8553D8 80243268 AFB20018 */ sw $s2, 0x18($sp) -/* 8553DC 8024326C AFB00010 */ sw $s0, 0x10($sp) -/* 8553E0 80243270 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8553E4 80243274 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8553E8 80243278 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8553EC 8024327C 8E30000C */ lw $s0, 0xc($s1) -/* 8553F0 80243280 8E050000 */ lw $a1, ($s0) -/* 8553F4 80243284 0C0B1EAF */ jal get_variable -/* 8553F8 80243288 26100004 */ addiu $s0, $s0, 4 -/* 8553FC 8024328C 0220202D */ daddu $a0, $s1, $zero -/* 855400 80243290 8E120000 */ lw $s2, ($s0) -/* 855404 80243294 8E130004 */ lw $s3, 4($s0) -/* 855408 80243298 0C0B36B0 */ jal resolve_npc -/* 85540C 8024329C 0040282D */ daddu $a1, $v0, $zero -/* 855410 802432A0 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 855414 802432A4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 855418 802432A8 50400022 */ beql $v0, $zero, .L80243334 -/* 85541C 802432AC 24020002 */ addiu $v0, $zero, 2 -/* 855420 802432B0 C60C0028 */ lwc1 $f12, 0x28($s0) -/* 855424 802432B4 8C460038 */ lw $a2, 0x38($v0) -/* 855428 802432B8 C60E0030 */ lwc1 $f14, 0x30($s0) -/* 85542C 802432BC 0C00A720 */ jal atan2 -/* 855430 802432C0 8C470040 */ lw $a3, 0x40($v0) -/* 855434 802432C4 0C00A6C9 */ jal clamp_angle -/* 855438 802432C8 46000306 */ mov.s $f12, $f0 -/* 85543C 802432CC 46000506 */ mov.s $f20, $f0 -/* 855440 802432D0 3C014220 */ lui $at, 0x4220 -/* 855444 802432D4 4481C000 */ mtc1 $at, $f24 -/* 855448 802432D8 0C00A8BB */ jal sin_deg -/* 85544C 802432DC 4600A306 */ mov.s $f12, $f20 -/* 855450 802432E0 46180002 */ mul.s $f0, $f0, $f24 -/* 855454 802432E4 00000000 */ nop -/* 855458 802432E8 C6160028 */ lwc1 $f22, 0x28($s0) -/* 85545C 802432EC 4600B580 */ add.s $f22, $f22, $f0 -/* 855460 802432F0 0C00A8D4 */ jal cos_deg -/* 855464 802432F4 4600A306 */ mov.s $f12, $f20 -/* 855468 802432F8 46180002 */ mul.s $f0, $f0, $f24 -/* 85546C 802432FC 00000000 */ nop -/* 855470 80243300 0220202D */ daddu $a0, $s1, $zero -/* 855474 80243304 0240282D */ daddu $a1, $s2, $zero -/* 855478 80243308 C6140030 */ lwc1 $f20, 0x30($s0) -/* 85547C 8024330C 4600B08D */ trunc.w.s $f2, $f22 -/* 855480 80243310 44061000 */ mfc1 $a2, $f2 -/* 855484 80243314 0C0B2026 */ jal set_variable -/* 855488 80243318 4600A501 */ sub.s $f20, $f20, $f0 -/* 85548C 8024331C 0220202D */ daddu $a0, $s1, $zero -/* 855490 80243320 4600A08D */ trunc.w.s $f2, $f20 -/* 855494 80243324 44061000 */ mfc1 $a2, $f2 -/* 855498 80243328 0C0B2026 */ jal set_variable -/* 85549C 8024332C 0260282D */ daddu $a1, $s3, $zero -/* 8554A0 80243330 24020002 */ addiu $v0, $zero, 2 -.L80243334: -/* 8554A4 80243334 8FBF0020 */ lw $ra, 0x20($sp) -/* 8554A8 80243338 8FB3001C */ lw $s3, 0x1c($sp) -/* 8554AC 8024333C 8FB20018 */ lw $s2, 0x18($sp) -/* 8554B0 80243340 8FB10014 */ lw $s1, 0x14($sp) -/* 8554B4 80243344 8FB00010 */ lw $s0, 0x10($sp) -/* 8554B8 80243348 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8554BC 8024334C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8554C0 80243350 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8554C4 80243354 03E00008 */ jr $ra -/* 8554C8 80243358 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s new file mode 100644 index 0000000000..479a2c883d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80243254_8553C4.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243254_8553C4 +/* 8553C4 80243254 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 8553C8 80243258 AFB10014 */ sw $s1, 0x14($sp) +/* 8553CC 8024325C 0080882D */ daddu $s1, $a0, $zero +/* 8553D0 80243260 AFBF0020 */ sw $ra, 0x20($sp) +/* 8553D4 80243264 AFB3001C */ sw $s3, 0x1c($sp) +/* 8553D8 80243268 AFB20018 */ sw $s2, 0x18($sp) +/* 8553DC 8024326C AFB00010 */ sw $s0, 0x10($sp) +/* 8553E0 80243270 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 8553E4 80243274 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 8553E8 80243278 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8553EC 8024327C 8E30000C */ lw $s0, 0xc($s1) +/* 8553F0 80243280 8E050000 */ lw $a1, ($s0) +/* 8553F4 80243284 0C0B1EAF */ jal get_variable +/* 8553F8 80243288 26100004 */ addiu $s0, $s0, 4 +/* 8553FC 8024328C 0220202D */ daddu $a0, $s1, $zero +/* 855400 80243290 8E120000 */ lw $s2, ($s0) +/* 855404 80243294 8E130004 */ lw $s3, 4($s0) +/* 855408 80243298 0C0B36B0 */ jal resolve_npc +/* 85540C 8024329C 0040282D */ daddu $a1, $v0, $zero +/* 855410 802432A0 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* 855414 802432A4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* 855418 802432A8 50400022 */ beql $v0, $zero, .L80243334 +/* 85541C 802432AC 24020002 */ addiu $v0, $zero, 2 +/* 855420 802432B0 C60C0028 */ lwc1 $f12, 0x28($s0) +/* 855424 802432B4 8C460038 */ lw $a2, 0x38($v0) +/* 855428 802432B8 C60E0030 */ lwc1 $f14, 0x30($s0) +/* 85542C 802432BC 0C00A720 */ jal atan2 +/* 855430 802432C0 8C470040 */ lw $a3, 0x40($v0) +/* 855434 802432C4 0C00A6C9 */ jal clamp_angle +/* 855438 802432C8 46000306 */ mov.s $f12, $f0 +/* 85543C 802432CC 46000506 */ mov.s $f20, $f0 +/* 855440 802432D0 3C014220 */ lui $at, 0x4220 +/* 855444 802432D4 4481C000 */ mtc1 $at, $f24 +/* 855448 802432D8 0C00A8BB */ jal sin_deg +/* 85544C 802432DC 4600A306 */ mov.s $f12, $f20 +/* 855450 802432E0 46180002 */ mul.s $f0, $f0, $f24 +/* 855454 802432E4 00000000 */ nop +/* 855458 802432E8 C6160028 */ lwc1 $f22, 0x28($s0) +/* 85545C 802432EC 4600B580 */ add.s $f22, $f22, $f0 +/* 855460 802432F0 0C00A8D4 */ jal cos_deg +/* 855464 802432F4 4600A306 */ mov.s $f12, $f20 +/* 855468 802432F8 46180002 */ mul.s $f0, $f0, $f24 +/* 85546C 802432FC 00000000 */ nop +/* 855470 80243300 0220202D */ daddu $a0, $s1, $zero +/* 855474 80243304 0240282D */ daddu $a1, $s2, $zero +/* 855478 80243308 C6140030 */ lwc1 $f20, 0x30($s0) +/* 85547C 8024330C 4600B08D */ trunc.w.s $f2, $f22 +/* 855480 80243310 44061000 */ mfc1 $a2, $f2 +/* 855484 80243314 0C0B2026 */ jal set_variable +/* 855488 80243318 4600A501 */ sub.s $f20, $f20, $f0 +/* 85548C 8024331C 0220202D */ daddu $a0, $s1, $zero +/* 855490 80243320 4600A08D */ trunc.w.s $f2, $f20 +/* 855494 80243324 44061000 */ mfc1 $a2, $f2 +/* 855498 80243328 0C0B2026 */ jal set_variable +/* 85549C 8024332C 0260282D */ daddu $a1, $s3, $zero +/* 8554A0 80243330 24020002 */ addiu $v0, $zero, 2 +.L80243334: +/* 8554A4 80243334 8FBF0020 */ lw $ra, 0x20($sp) +/* 8554A8 80243338 8FB3001C */ lw $s3, 0x1c($sp) +/* 8554AC 8024333C 8FB20018 */ lw $s2, 0x18($sp) +/* 8554B0 80243340 8FB10014 */ lw $s1, 0x14($sp) +/* 8554B4 80243344 8FB00010 */ lw $s0, 0x10($sp) +/* 8554B8 80243348 D7B80038 */ ldc1 $f24, 0x38($sp) +/* 8554BC 8024334C D7B60030 */ ldc1 $f22, 0x30($sp) +/* 8554C0 80243350 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8554C4 80243354 03E00008 */ jr $ra +/* 8554C8 80243358 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C.s deleted file mode 100644 index ddaf2fc6bc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024335C -/* 8554CC 8024335C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8554D0 80243360 AFBF0010 */ sw $ra, 0x10($sp) -/* 8554D4 80243364 0C052B50 */ jal func_8014AD40 -/* 8554D8 80243368 00000000 */ nop -/* 8554DC 8024336C 2C420001 */ sltiu $v0, $v0, 1 -/* 8554E0 80243370 8FBF0010 */ lw $ra, 0x10($sp) -/* 8554E4 80243374 00021040 */ sll $v0, $v0, 1 -/* 8554E8 80243378 03E00008 */ jr $ra -/* 8554EC 8024337C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s new file mode 100644 index 0000000000..2199c4126c --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024335C_8554CC.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024335C_8554CC +/* 8554CC 8024335C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8554D0 80243360 AFBF0010 */ sw $ra, 0x10($sp) +/* 8554D4 80243364 0C052B50 */ jal func_8014AD40 +/* 8554D8 80243368 00000000 */ nop +/* 8554DC 8024336C 2C420001 */ sltiu $v0, $v0, 1 +/* 8554E0 80243370 8FBF0010 */ lw $ra, 0x10($sp) +/* 8554E4 80243374 00021040 */ sll $v0, $v0, 1 +/* 8554E8 80243378 03E00008 */ jr $ra +/* 8554EC 8024337C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC.s deleted file mode 100644 index 7e642425d0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433BC -/* 85552C 802433BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 855530 802433C0 AFB00010 */ sw $s0, 0x10($sp) -/* 855534 802433C4 AFBF0014 */ sw $ra, 0x14($sp) -/* 855538 802433C8 0C039D7B */ jal get_item_count -/* 85553C 802433CC 0080802D */ daddu $s0, $a0, $zero -/* 855540 802433D0 AE020084 */ sw $v0, 0x84($s0) -/* 855544 802433D4 8FBF0014 */ lw $ra, 0x14($sp) -/* 855548 802433D8 8FB00010 */ lw $s0, 0x10($sp) -/* 85554C 802433DC 24020002 */ addiu $v0, $zero, 2 -/* 855550 802433E0 03E00008 */ jr $ra -/* 855554 802433E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 855558 802433E8 00000000 */ nop -/* 85555C 802433EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s new file mode 100644 index 0000000000..3a1d274bd7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802433BC_85552C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802433BC_85552C +/* 85552C 802433BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 855530 802433C0 AFB00010 */ sw $s0, 0x10($sp) +/* 855534 802433C4 AFBF0014 */ sw $ra, 0x14($sp) +/* 855538 802433C8 0C039D7B */ jal get_item_count +/* 85553C 802433CC 0080802D */ daddu $s0, $a0, $zero +/* 855540 802433D0 AE020084 */ sw $v0, 0x84($s0) +/* 855544 802433D4 8FBF0014 */ lw $ra, 0x14($sp) +/* 855548 802433D8 8FB00010 */ lw $s0, 0x10($sp) +/* 85554C 802433DC 24020002 */ addiu $v0, $zero, 2 +/* 855550 802433E0 03E00008 */ jr $ra +/* 855554 802433E4 27BD0018 */ addiu $sp, $sp, 0x18 +/* 855558 802433E8 00000000 */ nop +/* 85555C 802433EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C.s deleted file mode 100644 index f9adbdfa51..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024343C -/* 8555AC 8024343C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8555B0 80243440 AFB10014 */ sw $s1, 0x14($sp) -/* 8555B4 80243444 0080882D */ daddu $s1, $a0, $zero -/* 8555B8 80243448 AFBF0024 */ sw $ra, 0x24($sp) -/* 8555BC 8024344C AFB40020 */ sw $s4, 0x20($sp) -/* 8555C0 80243450 AFB3001C */ sw $s3, 0x1c($sp) -/* 8555C4 80243454 AFB20018 */ sw $s2, 0x18($sp) -/* 8555C8 80243458 AFB00010 */ sw $s0, 0x10($sp) -/* 8555CC 8024345C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8555D0 80243460 8E30000C */ lw $s0, 0xc($s1) -/* 8555D4 80243464 8E050000 */ lw $a1, ($s0) -/* 8555D8 80243468 0C0B1EAF */ jal get_variable -/* 8555DC 8024346C 26100004 */ addiu $s0, $s0, 4 -/* 8555E0 80243470 8E120000 */ lw $s2, ($s0) -/* 8555E4 80243474 26100004 */ addiu $s0, $s0, 4 -/* 8555E8 80243478 0220202D */ daddu $a0, $s1, $zero -/* 8555EC 8024347C 8E130000 */ lw $s3, ($s0) -/* 8555F0 80243480 8E140004 */ lw $s4, 4($s0) -/* 8555F4 80243484 0C090CFC */ jal func_802433F0 -/* 8555F8 80243488 0040282D */ daddu $a1, $v0, $zero -/* 8555FC 8024348C 0040802D */ daddu $s0, $v0, $zero -/* 855600 80243490 12000034 */ beqz $s0, .L80243564 -/* 855604 80243494 24020002 */ addiu $v0, $zero, 2 -/* 855608 80243498 3C038025 */ lui $v1, 0x8025 -/* 85560C 8024349C 24630A50 */ addiu $v1, $v1, 0xa50 -/* 855610 802434A0 8C640000 */ lw $a0, ($v1) -/* 855614 802434A4 24820004 */ addiu $v0, $a0, 4 -/* 855618 802434A8 AC620000 */ sw $v0, ($v1) -/* 85561C 802434AC 2C420168 */ sltiu $v0, $v0, 0x168 -/* 855620 802434B0 14400004 */ bnez $v0, .L802434C4 -/* 855624 802434B4 3C0200B6 */ lui $v0, 0xb6 -/* 855628 802434B8 2482FE9C */ addiu $v0, $a0, -0x164 -/* 85562C 802434BC AC620000 */ sw $v0, ($v1) -/* 855630 802434C0 3C0200B6 */ lui $v0, 0xb6 -.L802434C4: -/* 855634 802434C4 8E030028 */ lw $v1, 0x28($s0) -/* 855638 802434C8 C614003C */ lwc1 $f20, 0x3c($s0) -/* 85563C 802434CC 10620009 */ beq $v1, $v0, .L802434F4 -/* 855640 802434D0 34420004 */ ori $v0, $v0, 4 -/* 855644 802434D4 10620007 */ beq $v1, $v0, .L802434F4 -/* 855648 802434D8 3C0200B6 */ lui $v0, 0xb6 -/* 85564C 802434DC 34420008 */ ori $v0, $v0, 8 -/* 855650 802434E0 10620004 */ beq $v1, $v0, .L802434F4 -/* 855654 802434E4 3C0200B6 */ lui $v0, 0xb6 -/* 855658 802434E8 3442000C */ ori $v0, $v0, 0xc -/* 85565C 802434EC 14620011 */ bne $v1, $v0, .L80243534 -/* 855660 802434F0 0220202D */ daddu $a0, $s1, $zero -.L802434F4: -/* 855664 802434F4 3C028025 */ lui $v0, 0x8025 -/* 855668 802434F8 8C420A50 */ lw $v0, 0xa50($v0) -/* 85566C 802434FC 44826000 */ mtc1 $v0, $f12 -/* 855670 80243500 00000000 */ nop -/* 855674 80243504 04410006 */ bgez $v0, .L80243520 -/* 855678 80243508 46806321 */ cvt.d.w $f12, $f12 -/* 85567C 8024350C 3C0141F0 */ lui $at, 0x41f0 -/* 855680 80243510 44810800 */ mtc1 $at, $f1 -/* 855684 80243514 44800000 */ mtc1 $zero, $f0 -/* 855688 80243518 00000000 */ nop -/* 85568C 8024351C 46206300 */ add.d $f12, $f12, $f0 -.L80243520: -/* 855690 80243520 0C00A8BB */ jal sin_deg -/* 855694 80243524 46206320 */ cvt.s.d $f12, $f12 -/* 855698 80243528 46000000 */ add.s $f0, $f0, $f0 -/* 85569C 8024352C 4600A500 */ add.s $f20, $f20, $f0 -/* 8556A0 80243530 0220202D */ daddu $a0, $s1, $zero -.L80243534: -/* 8556A4 80243534 8E060038 */ lw $a2, 0x38($s0) -/* 8556A8 80243538 0C0B2190 */ jal set_float_variable -/* 8556AC 8024353C 0240282D */ daddu $a1, $s2, $zero -/* 8556B0 80243540 0220202D */ daddu $a0, $s1, $zero -/* 8556B4 80243544 4406A000 */ mfc1 $a2, $f20 -/* 8556B8 80243548 0C0B2190 */ jal set_float_variable -/* 8556BC 8024354C 0260282D */ daddu $a1, $s3, $zero -/* 8556C0 80243550 0220202D */ daddu $a0, $s1, $zero -/* 8556C4 80243554 8E060040 */ lw $a2, 0x40($s0) -/* 8556C8 80243558 0C0B2190 */ jal set_float_variable -/* 8556CC 8024355C 0280282D */ daddu $a1, $s4, $zero -/* 8556D0 80243560 24020002 */ addiu $v0, $zero, 2 -.L80243564: -/* 8556D4 80243564 8FBF0024 */ lw $ra, 0x24($sp) -/* 8556D8 80243568 8FB40020 */ lw $s4, 0x20($sp) -/* 8556DC 8024356C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8556E0 80243570 8FB20018 */ lw $s2, 0x18($sp) -/* 8556E4 80243574 8FB10014 */ lw $s1, 0x14($sp) -/* 8556E8 80243578 8FB00010 */ lw $s0, 0x10($sp) -/* 8556EC 8024357C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8556F0 80243580 03E00008 */ jr $ra -/* 8556F4 80243584 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s new file mode 100644 index 0000000000..665639e1f0 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_8024343C_8555AC.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024343C_8555AC +/* 8555AC 8024343C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8555B0 80243440 AFB10014 */ sw $s1, 0x14($sp) +/* 8555B4 80243444 0080882D */ daddu $s1, $a0, $zero +/* 8555B8 80243448 AFBF0024 */ sw $ra, 0x24($sp) +/* 8555BC 8024344C AFB40020 */ sw $s4, 0x20($sp) +/* 8555C0 80243450 AFB3001C */ sw $s3, 0x1c($sp) +/* 8555C4 80243454 AFB20018 */ sw $s2, 0x18($sp) +/* 8555C8 80243458 AFB00010 */ sw $s0, 0x10($sp) +/* 8555CC 8024345C F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8555D0 80243460 8E30000C */ lw $s0, 0xc($s1) +/* 8555D4 80243464 8E050000 */ lw $a1, ($s0) +/* 8555D8 80243468 0C0B1EAF */ jal get_variable +/* 8555DC 8024346C 26100004 */ addiu $s0, $s0, 4 +/* 8555E0 80243470 8E120000 */ lw $s2, ($s0) +/* 8555E4 80243474 26100004 */ addiu $s0, $s0, 4 +/* 8555E8 80243478 0220202D */ daddu $a0, $s1, $zero +/* 8555EC 8024347C 8E130000 */ lw $s3, ($s0) +/* 8555F0 80243480 8E140004 */ lw $s4, 4($s0) +/* 8555F4 80243484 0C090CFC */ jal func_802433F0_855560 +/* 8555F8 80243488 0040282D */ daddu $a1, $v0, $zero +/* 8555FC 8024348C 0040802D */ daddu $s0, $v0, $zero +/* 855600 80243490 12000034 */ beqz $s0, .L80243564 +/* 855604 80243494 24020002 */ addiu $v0, $zero, 2 +/* 855608 80243498 3C038025 */ lui $v1, 0x8025 +/* 85560C 8024349C 24630A50 */ addiu $v1, $v1, 0xa50 +/* 855610 802434A0 8C640000 */ lw $a0, ($v1) +/* 855614 802434A4 24820004 */ addiu $v0, $a0, 4 +/* 855618 802434A8 AC620000 */ sw $v0, ($v1) +/* 85561C 802434AC 2C420168 */ sltiu $v0, $v0, 0x168 +/* 855620 802434B0 14400004 */ bnez $v0, .L802434C4 +/* 855624 802434B4 3C0200B6 */ lui $v0, 0xb6 +/* 855628 802434B8 2482FE9C */ addiu $v0, $a0, -0x164 +/* 85562C 802434BC AC620000 */ sw $v0, ($v1) +/* 855630 802434C0 3C0200B6 */ lui $v0, 0xb6 +.L802434C4: +/* 855634 802434C4 8E030028 */ lw $v1, 0x28($s0) +/* 855638 802434C8 C614003C */ lwc1 $f20, 0x3c($s0) +/* 85563C 802434CC 10620009 */ beq $v1, $v0, .L802434F4 +/* 855640 802434D0 34420004 */ ori $v0, $v0, 4 +/* 855644 802434D4 10620007 */ beq $v1, $v0, .L802434F4 +/* 855648 802434D8 3C0200B6 */ lui $v0, 0xb6 +/* 85564C 802434DC 34420008 */ ori $v0, $v0, 8 +/* 855650 802434E0 10620004 */ beq $v1, $v0, .L802434F4 +/* 855654 802434E4 3C0200B6 */ lui $v0, 0xb6 +/* 855658 802434E8 3442000C */ ori $v0, $v0, 0xc +/* 85565C 802434EC 14620011 */ bne $v1, $v0, .L80243534 +/* 855660 802434F0 0220202D */ daddu $a0, $s1, $zero +.L802434F4: +/* 855664 802434F4 3C028025 */ lui $v0, 0x8025 +/* 855668 802434F8 8C420A50 */ lw $v0, 0xa50($v0) +/* 85566C 802434FC 44826000 */ mtc1 $v0, $f12 +/* 855670 80243500 00000000 */ nop +/* 855674 80243504 04410006 */ bgez $v0, .L80243520 +/* 855678 80243508 46806321 */ cvt.d.w $f12, $f12 +/* 85567C 8024350C 3C0141F0 */ lui $at, 0x41f0 +/* 855680 80243510 44810800 */ mtc1 $at, $f1 +/* 855684 80243514 44800000 */ mtc1 $zero, $f0 +/* 855688 80243518 00000000 */ nop +/* 85568C 8024351C 46206300 */ add.d $f12, $f12, $f0 +.L80243520: +/* 855690 80243520 0C00A8BB */ jal sin_deg +/* 855694 80243524 46206320 */ cvt.s.d $f12, $f12 +/* 855698 80243528 46000000 */ add.s $f0, $f0, $f0 +/* 85569C 8024352C 4600A500 */ add.s $f20, $f20, $f0 +/* 8556A0 80243530 0220202D */ daddu $a0, $s1, $zero +.L80243534: +/* 8556A4 80243534 8E060038 */ lw $a2, 0x38($s0) +/* 8556A8 80243538 0C0B2190 */ jal set_float_variable +/* 8556AC 8024353C 0240282D */ daddu $a1, $s2, $zero +/* 8556B0 80243540 0220202D */ daddu $a0, $s1, $zero +/* 8556B4 80243544 4406A000 */ mfc1 $a2, $f20 +/* 8556B8 80243548 0C0B2190 */ jal set_float_variable +/* 8556BC 8024354C 0260282D */ daddu $a1, $s3, $zero +/* 8556C0 80243550 0220202D */ daddu $a0, $s1, $zero +/* 8556C4 80243554 8E060040 */ lw $a2, 0x40($s0) +/* 8556C8 80243558 0C0B2190 */ jal set_float_variable +/* 8556CC 8024355C 0280282D */ daddu $a1, $s4, $zero +/* 8556D0 80243560 24020002 */ addiu $v0, $zero, 2 +.L80243564: +/* 8556D4 80243564 8FBF0024 */ lw $ra, 0x24($sp) +/* 8556D8 80243568 8FB40020 */ lw $s4, 0x20($sp) +/* 8556DC 8024356C 8FB3001C */ lw $s3, 0x1c($sp) +/* 8556E0 80243570 8FB20018 */ lw $s2, 0x18($sp) +/* 8556E4 80243574 8FB10014 */ lw $s1, 0x14($sp) +/* 8556E8 80243578 8FB00010 */ lw $s0, 0x10($sp) +/* 8556EC 8024357C D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8556F0 80243580 03E00008 */ jr $ra +/* 8556F4 80243584 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588.s deleted file mode 100644 index f2b1620ad6..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243588 -/* 8556F8 80243588 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 8556FC 8024358C AFB20018 */ sw $s2, 0x18($sp) -/* 855700 80243590 0080902D */ daddu $s2, $a0, $zero -/* 855704 80243594 AFB10014 */ sw $s1, 0x14($sp) -/* 855708 80243598 00A0882D */ daddu $s1, $a1, $zero -/* 85570C 8024359C AFB7002C */ sw $s7, 0x2c($sp) -/* 855710 802435A0 00C0B82D */ daddu $s7, $a2, $zero -/* 855714 802435A4 AFB00010 */ sw $s0, 0x10($sp) -/* 855718 802435A8 00E0802D */ daddu $s0, $a3, $zero -/* 85571C 802435AC AFBF0030 */ sw $ra, 0x30($sp) -/* 855720 802435B0 AFB60028 */ sw $s6, 0x28($sp) -/* 855724 802435B4 AFB50024 */ sw $s5, 0x24($sp) -/* 855728 802435B8 AFB40020 */ sw $s4, 0x20($sp) -/* 85572C 802435BC AFB3001C */ sw $s3, 0x1c($sp) -/* 855730 802435C0 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* 855734 802435C4 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* 855738 802435C8 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* 85573C 802435CC F7B80048 */ sdc1 $f24, 0x48($sp) -/* 855740 802435D0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 855744 802435D4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 855748 802435D8 8E160000 */ lw $s6, ($s0) -/* 85574C 802435DC 0C00EAD2 */ jal get_npc_safe -/* 855750 802435E0 0000202D */ daddu $a0, $zero, $zero -/* 855754 802435E4 8C420028 */ lw $v0, 0x28($v0) -/* 855758 802435E8 3C03FF4A */ lui $v1, 0xff4a -/* 85575C 802435EC 00431821 */ addu $v1, $v0, $v1 -/* 855760 802435F0 2C62000D */ sltiu $v0, $v1, 0xd -/* 855764 802435F4 1040000B */ beqz $v0, .L80243624 -/* 855768 802435F8 00031080 */ sll $v0, $v1, 2 -/* 85576C 802435FC 3C018025 */ lui $at, 0x8025 -/* 855770 80243600 00220821 */ addu $at, $at, $v0 -/* 855774 80243604 8C222970 */ lw $v0, 0x2970($at) -/* 855778 80243608 00400008 */ jr $v0 -/* 85577C 8024360C 00000000 */ nop -/* 855780 80243610 8E020000 */ lw $v0, ($s0) -/* 855784 80243614 04410003 */ bgez $v0, .L80243624 -/* 855788 80243618 00000000 */ nop -/* 85578C 8024361C 0000B02D */ daddu $s6, $zero, $zero -/* 855790 80243620 AE000000 */ sw $zero, ($s0) -.L80243624: -/* 855794 80243624 1AE00065 */ blez $s7, .L802437BC -/* 855798 80243628 0000A02D */ daddu $s4, $zero, $zero -/* 85579C 8024362C 0220982D */ daddu $s3, $s1, $zero -/* 8557A0 80243630 3C014220 */ lui $at, 0x4220 -/* 8557A4 80243634 4481F000 */ mtc1 $at, $f30 -/* 8557A8 80243638 3C014120 */ lui $at, 0x4120 -/* 8557AC 8024363C 4481E000 */ mtc1 $at, $f28 -.L80243640: -/* 8557B0 80243640 86440000 */ lh $a0, ($s2) -/* 8557B4 80243644 2882001F */ slti $v0, $a0, 0x1f -/* 8557B8 80243648 54400058 */ bnel $v0, $zero, .L802437AC -/* 8557BC 8024364C 26730010 */ addiu $s3, $s3, 0x10 -/* 8557C0 80243650 3C026666 */ lui $v0, 0x6666 -/* 8557C4 80243654 34426667 */ ori $v0, $v0, 0x6667 -/* 8557C8 80243658 2483FFE2 */ addiu $v1, $a0, -0x1e -/* 8557CC 8024365C 00620018 */ mult $v1, $v0 -/* 8557D0 80243660 4480C000 */ mtc1 $zero, $f24 -/* 8557D4 80243664 0000802D */ daddu $s0, $zero, $zero -/* 8557D8 80243668 00031FC3 */ sra $v1, $v1, 0x1f -/* 8557DC 8024366C 4600C686 */ mov.s $f26, $f24 -/* 8557E0 80243670 00004010 */ mfhi $t0 -/* 8557E4 80243674 00081083 */ sra $v0, $t0, 2 -/* 8557E8 80243678 00438823 */ subu $s1, $v0, $v1 -/* 8557EC 8024367C 00111080 */ sll $v0, $s1, 2 -/* 8557F0 80243680 00511021 */ addu $v0, $v0, $s1 -/* 8557F4 80243684 00021040 */ sll $v0, $v0, 1 -/* 8557F8 80243688 2442001E */ addiu $v0, $v0, 0x1e -/* 8557FC 8024368C 1A20001D */ blez $s1, .L80243704 -/* 855800 80243690 0082A823 */ subu $s5, $a0, $v0 -.L80243694: -/* 855804 80243694 44966000 */ mtc1 $s6, $f12 -/* 855808 80243698 00000000 */ nop -/* 85580C 8024369C 0C00A8BB */ jal sin_deg -/* 855810 802436A0 46806320 */ cvt.s.w $f12, $f12 -/* 855814 802436A4 44902000 */ mtc1 $s0, $f4 -/* 855818 802436A8 00000000 */ nop -/* 85581C 802436AC 46802120 */ cvt.s.w $f4, $f4 -/* 855820 802436B0 461E2083 */ div.s $f2, $f4, $f30 -/* 855824 802436B4 46001082 */ mul.s $f2, $f2, $f0 -/* 855828 802436B8 00000000 */ nop -/* 85582C 802436BC 3C014170 */ lui $at, 0x4170 -/* 855830 802436C0 44813000 */ mtc1 $at, $f6 -/* 855834 802436C4 00000000 */ nop -/* 855838 802436C8 46062103 */ div.s $f4, $f4, $f6 -/* 85583C 802436CC 46022580 */ add.s $f22, $f4, $f2 -/* 855840 802436D0 0C00A874 */ jal cos_rad -/* 855844 802436D4 4600B306 */ mov.s $f12, $f22 -/* 855848 802436D8 461C0002 */ mul.s $f0, $f0, $f28 -/* 85584C 802436DC 00000000 */ nop -/* 855850 802436E0 4600D680 */ add.s $f26, $f26, $f0 -/* 855854 802436E4 0C00A85B */ jal sin_rad -/* 855858 802436E8 4600B306 */ mov.s $f12, $f22 -/* 85585C 802436EC 461C0002 */ mul.s $f0, $f0, $f28 -/* 855860 802436F0 00000000 */ nop -/* 855864 802436F4 26100001 */ addiu $s0, $s0, 1 -/* 855868 802436F8 0211102A */ slt $v0, $s0, $s1 -/* 85586C 802436FC 1440FFE5 */ bnez $v0, .L80243694 -/* 855870 80243700 4600C600 */ add.s $f24, $f24, $f0 -.L80243704: -/* 855874 80243704 44966000 */ mtc1 $s6, $f12 -/* 855878 80243708 00000000 */ nop -/* 85587C 8024370C 0C00A8BB */ jal sin_deg -/* 855880 80243710 46806320 */ cvt.s.w $f12, $f12 -/* 855884 80243714 44902000 */ mtc1 $s0, $f4 -/* 855888 80243718 00000000 */ nop -/* 85588C 8024371C 46802120 */ cvt.s.w $f4, $f4 -/* 855890 80243720 461E2083 */ div.s $f2, $f4, $f30 -/* 855894 80243724 46001082 */ mul.s $f2, $f2, $f0 -/* 855898 80243728 00000000 */ nop -/* 85589C 8024372C 3C014170 */ lui $at, 0x4170 -/* 8558A0 80243730 44813000 */ mtc1 $at, $f6 -/* 8558A4 80243734 00000000 */ nop -/* 8558A8 80243738 46062103 */ div.s $f4, $f4, $f6 -/* 8558AC 8024373C 46022580 */ add.s $f22, $f4, $f2 -/* 8558B0 80243740 0C00A874 */ jal cos_rad -/* 8558B4 80243744 4600B306 */ mov.s $f12, $f22 -/* 8558B8 80243748 4495A000 */ mtc1 $s5, $f20 -/* 8558BC 8024374C 00000000 */ nop -/* 8558C0 80243750 4680A520 */ cvt.s.w $f20, $f20 -/* 8558C4 80243754 4600A002 */ mul.s $f0, $f20, $f0 -/* 8558C8 80243758 00000000 */ nop -/* 8558CC 8024375C 4600D680 */ add.s $f26, $f26, $f0 -/* 8558D0 80243760 0C00A85B */ jal sin_rad -/* 8558D4 80243764 4600B306 */ mov.s $f12, $f22 -/* 8558D8 80243768 4600A502 */ mul.s $f20, $f20, $f0 -/* 8558DC 8024376C 00000000 */ nop -/* 8558E0 80243770 4600D18D */ trunc.w.s $f6, $f26 -/* 8558E4 80243774 44023000 */ mfc1 $v0, $f6 -/* 8558E8 80243778 00000000 */ nop -/* 8558EC 8024377C A6620000 */ sh $v0, ($s3) -/* 8558F0 80243780 86420002 */ lh $v0, 2($s2) -/* 8558F4 80243784 4614C600 */ add.s $f24, $f24, $f20 -/* 8558F8 80243788 44820000 */ mtc1 $v0, $f0 -/* 8558FC 8024378C 00000000 */ nop -/* 855900 80243790 46800020 */ cvt.s.w $f0, $f0 -/* 855904 80243794 46180000 */ add.s $f0, $f0, $f24 -/* 855908 80243798 4600018D */ trunc.w.s $f6, $f0 -/* 85590C 8024379C 44023000 */ mfc1 $v0, $f6 -/* 855910 802437A0 00000000 */ nop -/* 855914 802437A4 A6620002 */ sh $v0, 2($s3) -/* 855918 802437A8 26730010 */ addiu $s3, $s3, 0x10 -.L802437AC: -/* 85591C 802437AC 26940001 */ addiu $s4, $s4, 1 -/* 855920 802437B0 0297102A */ slt $v0, $s4, $s7 -/* 855924 802437B4 1440FFA2 */ bnez $v0, .L80243640 -/* 855928 802437B8 26520010 */ addiu $s2, $s2, 0x10 -.L802437BC: -/* 85592C 802437BC 8FBF0030 */ lw $ra, 0x30($sp) -/* 855930 802437C0 8FB7002C */ lw $s7, 0x2c($sp) -/* 855934 802437C4 8FB60028 */ lw $s6, 0x28($sp) -/* 855938 802437C8 8FB50024 */ lw $s5, 0x24($sp) -/* 85593C 802437CC 8FB40020 */ lw $s4, 0x20($sp) -/* 855940 802437D0 8FB3001C */ lw $s3, 0x1c($sp) -/* 855944 802437D4 8FB20018 */ lw $s2, 0x18($sp) -/* 855948 802437D8 8FB10014 */ lw $s1, 0x14($sp) -/* 85594C 802437DC 8FB00010 */ lw $s0, 0x10($sp) -/* 855950 802437E0 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* 855954 802437E4 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* 855958 802437E8 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* 85595C 802437EC D7B80048 */ ldc1 $f24, 0x48($sp) -/* 855960 802437F0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 855964 802437F4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 855968 802437F8 03E00008 */ jr $ra -/* 85596C 802437FC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s new file mode 100644 index 0000000000..4e6a0527ca --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243588_8556F8.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243588_8556F8 +/* 8556F8 80243588 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 8556FC 8024358C AFB20018 */ sw $s2, 0x18($sp) +/* 855700 80243590 0080902D */ daddu $s2, $a0, $zero +/* 855704 80243594 AFB10014 */ sw $s1, 0x14($sp) +/* 855708 80243598 00A0882D */ daddu $s1, $a1, $zero +/* 85570C 8024359C AFB7002C */ sw $s7, 0x2c($sp) +/* 855710 802435A0 00C0B82D */ daddu $s7, $a2, $zero +/* 855714 802435A4 AFB00010 */ sw $s0, 0x10($sp) +/* 855718 802435A8 00E0802D */ daddu $s0, $a3, $zero +/* 85571C 802435AC AFBF0030 */ sw $ra, 0x30($sp) +/* 855720 802435B0 AFB60028 */ sw $s6, 0x28($sp) +/* 855724 802435B4 AFB50024 */ sw $s5, 0x24($sp) +/* 855728 802435B8 AFB40020 */ sw $s4, 0x20($sp) +/* 85572C 802435BC AFB3001C */ sw $s3, 0x1c($sp) +/* 855730 802435C0 F7BE0060 */ sdc1 $f30, 0x60($sp) +/* 855734 802435C4 F7BC0058 */ sdc1 $f28, 0x58($sp) +/* 855738 802435C8 F7BA0050 */ sdc1 $f26, 0x50($sp) +/* 85573C 802435CC F7B80048 */ sdc1 $f24, 0x48($sp) +/* 855740 802435D0 F7B60040 */ sdc1 $f22, 0x40($sp) +/* 855744 802435D4 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 855748 802435D8 8E160000 */ lw $s6, ($s0) +/* 85574C 802435DC 0C00EAD2 */ jal get_npc_safe +/* 855750 802435E0 0000202D */ daddu $a0, $zero, $zero +/* 855754 802435E4 8C420028 */ lw $v0, 0x28($v0) +/* 855758 802435E8 3C03FF4A */ lui $v1, 0xff4a +/* 85575C 802435EC 00431821 */ addu $v1, $v0, $v1 +/* 855760 802435F0 2C62000D */ sltiu $v0, $v1, 0xd +/* 855764 802435F4 1040000B */ beqz $v0, .L80243624 +/* 855768 802435F8 00031080 */ sll $v0, $v1, 2 +/* 85576C 802435FC 3C018025 */ lui $at, 0x8025 +/* 855770 80243600 00220821 */ addu $at, $at, $v0 +/* 855774 80243604 8C222970 */ lw $v0, 0x2970($at) +/* 855778 80243608 00400008 */ jr $v0 +/* 85577C 8024360C 00000000 */ nop +/* 855780 80243610 8E020000 */ lw $v0, ($s0) +/* 855784 80243614 04410003 */ bgez $v0, .L80243624 +/* 855788 80243618 00000000 */ nop +/* 85578C 8024361C 0000B02D */ daddu $s6, $zero, $zero +/* 855790 80243620 AE000000 */ sw $zero, ($s0) +.L80243624: +/* 855794 80243624 1AE00065 */ blez $s7, .L802437BC +/* 855798 80243628 0000A02D */ daddu $s4, $zero, $zero +/* 85579C 8024362C 0220982D */ daddu $s3, $s1, $zero +/* 8557A0 80243630 3C014220 */ lui $at, 0x4220 +/* 8557A4 80243634 4481F000 */ mtc1 $at, $f30 +/* 8557A8 80243638 3C014120 */ lui $at, 0x4120 +/* 8557AC 8024363C 4481E000 */ mtc1 $at, $f28 +.L80243640: +/* 8557B0 80243640 86440000 */ lh $a0, ($s2) +/* 8557B4 80243644 2882001F */ slti $v0, $a0, 0x1f +/* 8557B8 80243648 54400058 */ bnel $v0, $zero, .L802437AC +/* 8557BC 8024364C 26730010 */ addiu $s3, $s3, 0x10 +/* 8557C0 80243650 3C026666 */ lui $v0, 0x6666 +/* 8557C4 80243654 34426667 */ ori $v0, $v0, 0x6667 +/* 8557C8 80243658 2483FFE2 */ addiu $v1, $a0, -0x1e +/* 8557CC 8024365C 00620018 */ mult $v1, $v0 +/* 8557D0 80243660 4480C000 */ mtc1 $zero, $f24 +/* 8557D4 80243664 0000802D */ daddu $s0, $zero, $zero +/* 8557D8 80243668 00031FC3 */ sra $v1, $v1, 0x1f +/* 8557DC 8024366C 4600C686 */ mov.s $f26, $f24 +/* 8557E0 80243670 00004010 */ mfhi $t0 +/* 8557E4 80243674 00081083 */ sra $v0, $t0, 2 +/* 8557E8 80243678 00438823 */ subu $s1, $v0, $v1 +/* 8557EC 8024367C 00111080 */ sll $v0, $s1, 2 +/* 8557F0 80243680 00511021 */ addu $v0, $v0, $s1 +/* 8557F4 80243684 00021040 */ sll $v0, $v0, 1 +/* 8557F8 80243688 2442001E */ addiu $v0, $v0, 0x1e +/* 8557FC 8024368C 1A20001D */ blez $s1, .L80243704 +/* 855800 80243690 0082A823 */ subu $s5, $a0, $v0 +.L80243694: +/* 855804 80243694 44966000 */ mtc1 $s6, $f12 +/* 855808 80243698 00000000 */ nop +/* 85580C 8024369C 0C00A8BB */ jal sin_deg +/* 855810 802436A0 46806320 */ cvt.s.w $f12, $f12 +/* 855814 802436A4 44902000 */ mtc1 $s0, $f4 +/* 855818 802436A8 00000000 */ nop +/* 85581C 802436AC 46802120 */ cvt.s.w $f4, $f4 +/* 855820 802436B0 461E2083 */ div.s $f2, $f4, $f30 +/* 855824 802436B4 46001082 */ mul.s $f2, $f2, $f0 +/* 855828 802436B8 00000000 */ nop +/* 85582C 802436BC 3C014170 */ lui $at, 0x4170 +/* 855830 802436C0 44813000 */ mtc1 $at, $f6 +/* 855834 802436C4 00000000 */ nop +/* 855838 802436C8 46062103 */ div.s $f4, $f4, $f6 +/* 85583C 802436CC 46022580 */ add.s $f22, $f4, $f2 +/* 855840 802436D0 0C00A874 */ jal cos_rad +/* 855844 802436D4 4600B306 */ mov.s $f12, $f22 +/* 855848 802436D8 461C0002 */ mul.s $f0, $f0, $f28 +/* 85584C 802436DC 00000000 */ nop +/* 855850 802436E0 4600D680 */ add.s $f26, $f26, $f0 +/* 855854 802436E4 0C00A85B */ jal sin_rad +/* 855858 802436E8 4600B306 */ mov.s $f12, $f22 +/* 85585C 802436EC 461C0002 */ mul.s $f0, $f0, $f28 +/* 855860 802436F0 00000000 */ nop +/* 855864 802436F4 26100001 */ addiu $s0, $s0, 1 +/* 855868 802436F8 0211102A */ slt $v0, $s0, $s1 +/* 85586C 802436FC 1440FFE5 */ bnez $v0, .L80243694 +/* 855870 80243700 4600C600 */ add.s $f24, $f24, $f0 +.L80243704: +/* 855874 80243704 44966000 */ mtc1 $s6, $f12 +/* 855878 80243708 00000000 */ nop +/* 85587C 8024370C 0C00A8BB */ jal sin_deg +/* 855880 80243710 46806320 */ cvt.s.w $f12, $f12 +/* 855884 80243714 44902000 */ mtc1 $s0, $f4 +/* 855888 80243718 00000000 */ nop +/* 85588C 8024371C 46802120 */ cvt.s.w $f4, $f4 +/* 855890 80243720 461E2083 */ div.s $f2, $f4, $f30 +/* 855894 80243724 46001082 */ mul.s $f2, $f2, $f0 +/* 855898 80243728 00000000 */ nop +/* 85589C 8024372C 3C014170 */ lui $at, 0x4170 +/* 8558A0 80243730 44813000 */ mtc1 $at, $f6 +/* 8558A4 80243734 00000000 */ nop +/* 8558A8 80243738 46062103 */ div.s $f4, $f4, $f6 +/* 8558AC 8024373C 46022580 */ add.s $f22, $f4, $f2 +/* 8558B0 80243740 0C00A874 */ jal cos_rad +/* 8558B4 80243744 4600B306 */ mov.s $f12, $f22 +/* 8558B8 80243748 4495A000 */ mtc1 $s5, $f20 +/* 8558BC 8024374C 00000000 */ nop +/* 8558C0 80243750 4680A520 */ cvt.s.w $f20, $f20 +/* 8558C4 80243754 4600A002 */ mul.s $f0, $f20, $f0 +/* 8558C8 80243758 00000000 */ nop +/* 8558CC 8024375C 4600D680 */ add.s $f26, $f26, $f0 +/* 8558D0 80243760 0C00A85B */ jal sin_rad +/* 8558D4 80243764 4600B306 */ mov.s $f12, $f22 +/* 8558D8 80243768 4600A502 */ mul.s $f20, $f20, $f0 +/* 8558DC 8024376C 00000000 */ nop +/* 8558E0 80243770 4600D18D */ trunc.w.s $f6, $f26 +/* 8558E4 80243774 44023000 */ mfc1 $v0, $f6 +/* 8558E8 80243778 00000000 */ nop +/* 8558EC 8024377C A6620000 */ sh $v0, ($s3) +/* 8558F0 80243780 86420002 */ lh $v0, 2($s2) +/* 8558F4 80243784 4614C600 */ add.s $f24, $f24, $f20 +/* 8558F8 80243788 44820000 */ mtc1 $v0, $f0 +/* 8558FC 8024378C 00000000 */ nop +/* 855900 80243790 46800020 */ cvt.s.w $f0, $f0 +/* 855904 80243794 46180000 */ add.s $f0, $f0, $f24 +/* 855908 80243798 4600018D */ trunc.w.s $f6, $f0 +/* 85590C 8024379C 44023000 */ mfc1 $v0, $f6 +/* 855910 802437A0 00000000 */ nop +/* 855914 802437A4 A6620002 */ sh $v0, 2($s3) +/* 855918 802437A8 26730010 */ addiu $s3, $s3, 0x10 +.L802437AC: +/* 85591C 802437AC 26940001 */ addiu $s4, $s4, 1 +/* 855920 802437B0 0297102A */ slt $v0, $s4, $s7 +/* 855924 802437B4 1440FFA2 */ bnez $v0, .L80243640 +/* 855928 802437B8 26520010 */ addiu $s2, $s2, 0x10 +.L802437BC: +/* 85592C 802437BC 8FBF0030 */ lw $ra, 0x30($sp) +/* 855930 802437C0 8FB7002C */ lw $s7, 0x2c($sp) +/* 855934 802437C4 8FB60028 */ lw $s6, 0x28($sp) +/* 855938 802437C8 8FB50024 */ lw $s5, 0x24($sp) +/* 85593C 802437CC 8FB40020 */ lw $s4, 0x20($sp) +/* 855940 802437D0 8FB3001C */ lw $s3, 0x1c($sp) +/* 855944 802437D4 8FB20018 */ lw $s2, 0x18($sp) +/* 855948 802437D8 8FB10014 */ lw $s1, 0x14($sp) +/* 85594C 802437DC 8FB00010 */ lw $s0, 0x10($sp) +/* 855950 802437E0 D7BE0060 */ ldc1 $f30, 0x60($sp) +/* 855954 802437E4 D7BC0058 */ ldc1 $f28, 0x58($sp) +/* 855958 802437E8 D7BA0050 */ ldc1 $f26, 0x50($sp) +/* 85595C 802437EC D7B80048 */ ldc1 $f24, 0x48($sp) +/* 855960 802437F0 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 855964 802437F4 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 855968 802437F8 03E00008 */ jr $ra +/* 85596C 802437FC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800.s deleted file mode 100644 index d6b1ecac43..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243800 -/* 855970 80243800 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 855974 80243804 24040001 */ addiu $a0, $zero, 1 -/* 855978 80243808 27A50010 */ addiu $a1, $sp, 0x10 -/* 85597C 8024380C 27A60014 */ addiu $a2, $sp, 0x14 -/* 855980 80243810 27A70018 */ addiu $a3, $sp, 0x18 -/* 855984 80243814 AFBF0028 */ sw $ra, 0x28($sp) -/* 855988 80243818 AFB10024 */ sw $s1, 0x24($sp) -/* 85598C 8024381C 0C0470AC */ jal func_8011C2B0 -/* 855990 80243820 AFB00020 */ sw $s0, 0x20($sp) -/* 855994 80243824 3C118025 */ lui $s1, 0x8025 -/* 855998 80243828 26310A54 */ addiu $s1, $s1, 0xa54 -/* 85599C 8024382C 8FA40010 */ lw $a0, 0x10($sp) -/* 8559A0 80243830 8FA50014 */ lw $a1, 0x14($sp) -/* 8559A4 80243834 8FA60018 */ lw $a2, 0x18($sp) -/* 8559A8 80243838 0C090D62 */ jal func_80243588 -/* 8559AC 8024383C 0220382D */ daddu $a3, $s1, $zero -/* 8559B0 80243840 3C03800A */ lui $v1, 0x800a -/* 8559B4 80243844 2463A66C */ addiu $v1, $v1, -0x5994 -/* 8559B8 80243848 8C620000 */ lw $v0, ($v1) -/* 8559BC 8024384C 24040001 */ addiu $a0, $zero, 1 -/* 8559C0 80243850 0040802D */ daddu $s0, $v0, $zero -/* 8559C4 80243854 24420008 */ addiu $v0, $v0, 8 -/* 8559C8 80243858 AC620000 */ sw $v0, ($v1) -/* 8559CC 8024385C 3C02DE00 */ lui $v0, 0xde00 -/* 8559D0 80243860 0C0470BB */ jal func_8011C2EC -/* 8559D4 80243864 AE020000 */ sw $v0, ($s0) -/* 8559D8 80243868 8E230000 */ lw $v1, ($s1) -/* 8559DC 8024386C 04600003 */ bltz $v1, .L8024387C -/* 8559E0 80243870 AE020004 */ sw $v0, 4($s0) -/* 8559E4 80243874 24620004 */ addiu $v0, $v1, 4 -/* 8559E8 80243878 AE220000 */ sw $v0, ($s1) -.L8024387C: -/* 8559EC 8024387C 8E220000 */ lw $v0, ($s1) -/* 8559F0 80243880 28420168 */ slti $v0, $v0, 0x168 -/* 8559F4 80243884 14400002 */ bnez $v0, .L80243890 -/* 8559F8 80243888 2402FFFF */ addiu $v0, $zero, -1 -/* 8559FC 8024388C AE220000 */ sw $v0, ($s1) -.L80243890: -/* 855A00 80243890 8FBF0028 */ lw $ra, 0x28($sp) -/* 855A04 80243894 8FB10024 */ lw $s1, 0x24($sp) -/* 855A08 80243898 8FB00020 */ lw $s0, 0x20($sp) -/* 855A0C 8024389C 03E00008 */ jr $ra -/* 855A10 802438A0 27BD0030 */ addiu $sp, $sp, 0x30 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 new file mode 100644 index 0000000000..8bf7242982 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243800_855970.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243800_855970 +/* 855970 80243800 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 855974 80243804 24040001 */ addiu $a0, $zero, 1 +/* 855978 80243808 27A50010 */ addiu $a1, $sp, 0x10 +/* 85597C 8024380C 27A60014 */ addiu $a2, $sp, 0x14 +/* 855980 80243810 27A70018 */ addiu $a3, $sp, 0x18 +/* 855984 80243814 AFBF0028 */ sw $ra, 0x28($sp) +/* 855988 80243818 AFB10024 */ sw $s1, 0x24($sp) +/* 85598C 8024381C 0C0470AC */ jal func_8011C2B0 +/* 855990 80243820 AFB00020 */ sw $s0, 0x20($sp) +/* 855994 80243824 3C118025 */ lui $s1, 0x8025 +/* 855998 80243828 26310A54 */ addiu $s1, $s1, 0xa54 +/* 85599C 8024382C 8FA40010 */ lw $a0, 0x10($sp) +/* 8559A0 80243830 8FA50014 */ lw $a1, 0x14($sp) +/* 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, 0x800a +/* 8559B4 80243844 2463A66C */ addiu $v1, $v1, -0x5994 +/* 8559B8 80243848 8C620000 */ lw $v0, ($v1) +/* 8559BC 8024384C 24040001 */ addiu $a0, $zero, 1 +/* 8559C0 80243850 0040802D */ daddu $s0, $v0, $zero +/* 8559C4 80243854 24420008 */ addiu $v0, $v0, 8 +/* 8559C8 80243858 AC620000 */ sw $v0, ($v1) +/* 8559CC 8024385C 3C02DE00 */ lui $v0, 0xde00 +/* 8559D0 80243860 0C0470BB */ jal func_8011C2EC +/* 8559D4 80243864 AE020000 */ sw $v0, ($s0) +/* 8559D8 80243868 8E230000 */ lw $v1, ($s1) +/* 8559DC 8024386C 04600003 */ bltz $v1, .L8024387C +/* 8559E0 80243870 AE020004 */ sw $v0, 4($s0) +/* 8559E4 80243874 24620004 */ addiu $v0, $v1, 4 +/* 8559E8 80243878 AE220000 */ sw $v0, ($s1) +.L8024387C: +/* 8559EC 8024387C 8E220000 */ lw $v0, ($s1) +/* 8559F0 80243880 28420168 */ slti $v0, $v0, 0x168 +/* 8559F4 80243884 14400002 */ bnez $v0, .L80243890 +/* 8559F8 80243888 2402FFFF */ addiu $v0, $zero, -1 +/* 8559FC 8024388C AE220000 */ sw $v0, ($s1) +.L80243890: +/* 855A00 80243890 8FBF0028 */ lw $ra, 0x28($sp) +/* 855A04 80243894 8FB10024 */ lw $s1, 0x24($sp) +/* 855A08 80243898 8FB00020 */ lw $s0, 0x20($sp) +/* 855A0C 8024389C 03E00008 */ jr $ra +/* 855A10 802438A0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4.s deleted file mode 100644 index c043f6b505..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802438A4 -/* 855A14 802438A4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 855A18 802438A8 24040002 */ addiu $a0, $zero, 2 -/* 855A1C 802438AC 27A50010 */ addiu $a1, $sp, 0x10 -/* 855A20 802438B0 27A60014 */ addiu $a2, $sp, 0x14 -/* 855A24 802438B4 27A70018 */ addiu $a3, $sp, 0x18 -/* 855A28 802438B8 AFBF0028 */ sw $ra, 0x28($sp) -/* 855A2C 802438BC AFB10024 */ sw $s1, 0x24($sp) -/* 855A30 802438C0 0C0470AC */ jal func_8011C2B0 -/* 855A34 802438C4 AFB00020 */ sw $s0, 0x20($sp) -/* 855A38 802438C8 3C118025 */ lui $s1, 0x8025 -/* 855A3C 802438CC 26310A58 */ addiu $s1, $s1, 0xa58 -/* 855A40 802438D0 8FA40010 */ lw $a0, 0x10($sp) -/* 855A44 802438D4 8FA50014 */ lw $a1, 0x14($sp) -/* 855A48 802438D8 8FA60018 */ lw $a2, 0x18($sp) -/* 855A4C 802438DC 0C090D62 */ jal func_80243588 -/* 855A50 802438E0 0220382D */ daddu $a3, $s1, $zero -/* 855A54 802438E4 3C03800A */ lui $v1, 0x800a -/* 855A58 802438E8 2463A66C */ addiu $v1, $v1, -0x5994 -/* 855A5C 802438EC 8C620000 */ lw $v0, ($v1) -/* 855A60 802438F0 24040002 */ addiu $a0, $zero, 2 -/* 855A64 802438F4 0040802D */ daddu $s0, $v0, $zero -/* 855A68 802438F8 24420008 */ addiu $v0, $v0, 8 -/* 855A6C 802438FC AC620000 */ sw $v0, ($v1) -/* 855A70 80243900 3C02DE00 */ lui $v0, 0xde00 -/* 855A74 80243904 0C0470BB */ jal func_8011C2EC -/* 855A78 80243908 AE020000 */ sw $v0, ($s0) -/* 855A7C 8024390C 8E230000 */ lw $v1, ($s1) -/* 855A80 80243910 04600003 */ bltz $v1, .L80243920 -/* 855A84 80243914 AE020004 */ sw $v0, 4($s0) -/* 855A88 80243918 24620004 */ addiu $v0, $v1, 4 -/* 855A8C 8024391C AE220000 */ sw $v0, ($s1) -.L80243920: -/* 855A90 80243920 8E220000 */ lw $v0, ($s1) -/* 855A94 80243924 28420168 */ slti $v0, $v0, 0x168 -/* 855A98 80243928 14400002 */ bnez $v0, .L80243934 -/* 855A9C 8024392C 2402FFFF */ addiu $v0, $zero, -1 -/* 855AA0 80243930 AE220000 */ sw $v0, ($s1) -.L80243934: -/* 855AA4 80243934 8FBF0028 */ lw $ra, 0x28($sp) -/* 855AA8 80243938 8FB10024 */ lw $s1, 0x24($sp) -/* 855AAC 8024393C 8FB00020 */ lw $s0, 0x20($sp) -/* 855AB0 80243940 03E00008 */ jr $ra -/* 855AB4 80243944 27BD0030 */ addiu $sp, $sp, 0x30 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 new file mode 100644 index 0000000000..b4ce4c2aa2 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_802438A4_855A14.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802438A4_855A14 +/* 855A14 802438A4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 855A18 802438A8 24040002 */ addiu $a0, $zero, 2 +/* 855A1C 802438AC 27A50010 */ addiu $a1, $sp, 0x10 +/* 855A20 802438B0 27A60014 */ addiu $a2, $sp, 0x14 +/* 855A24 802438B4 27A70018 */ addiu $a3, $sp, 0x18 +/* 855A28 802438B8 AFBF0028 */ sw $ra, 0x28($sp) +/* 855A2C 802438BC AFB10024 */ sw $s1, 0x24($sp) +/* 855A30 802438C0 0C0470AC */ jal func_8011C2B0 +/* 855A34 802438C4 AFB00020 */ sw $s0, 0x20($sp) +/* 855A38 802438C8 3C118025 */ lui $s1, 0x8025 +/* 855A3C 802438CC 26310A58 */ addiu $s1, $s1, 0xa58 +/* 855A40 802438D0 8FA40010 */ lw $a0, 0x10($sp) +/* 855A44 802438D4 8FA50014 */ lw $a1, 0x14($sp) +/* 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, 0x800a +/* 855A58 802438E8 2463A66C */ addiu $v1, $v1, -0x5994 +/* 855A5C 802438EC 8C620000 */ lw $v0, ($v1) +/* 855A60 802438F0 24040002 */ addiu $a0, $zero, 2 +/* 855A64 802438F4 0040802D */ daddu $s0, $v0, $zero +/* 855A68 802438F8 24420008 */ addiu $v0, $v0, 8 +/* 855A6C 802438FC AC620000 */ sw $v0, ($v1) +/* 855A70 80243900 3C02DE00 */ lui $v0, 0xde00 +/* 855A74 80243904 0C0470BB */ jal func_8011C2EC +/* 855A78 80243908 AE020000 */ sw $v0, ($s0) +/* 855A7C 8024390C 8E230000 */ lw $v1, ($s1) +/* 855A80 80243910 04600003 */ bltz $v1, .L80243920 +/* 855A84 80243914 AE020004 */ sw $v0, 4($s0) +/* 855A88 80243918 24620004 */ addiu $v0, $v1, 4 +/* 855A8C 8024391C AE220000 */ sw $v0, ($s1) +.L80243920: +/* 855A90 80243920 8E220000 */ lw $v0, ($s1) +/* 855A94 80243924 28420168 */ slti $v0, $v0, 0x168 +/* 855A98 80243928 14400002 */ bnez $v0, .L80243934 +/* 855A9C 8024392C 2402FFFF */ addiu $v0, $zero, -1 +/* 855AA0 80243930 AE220000 */ sw $v0, ($s1) +.L80243934: +/* 855AA4 80243934 8FBF0028 */ lw $ra, 0x28($sp) +/* 855AA8 80243938 8FB10024 */ lw $s1, 0x24($sp) +/* 855AAC 8024393C 8FB00020 */ lw $s0, 0x20($sp) +/* 855AB0 80243940 03E00008 */ jr $ra +/* 855AB4 80243944 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948.s deleted file mode 100644 index f3be8c7563..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243948 -/* 855AB8 80243948 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 855ABC 8024394C AFB20018 */ sw $s2, 0x18($sp) -/* 855AC0 80243950 0080902D */ daddu $s2, $a0, $zero -/* 855AC4 80243954 AFBF0028 */ sw $ra, 0x28($sp) -/* 855AC8 80243958 AFB50024 */ sw $s5, 0x24($sp) -/* 855ACC 8024395C AFB40020 */ sw $s4, 0x20($sp) -/* 855AD0 80243960 AFB3001C */ sw $s3, 0x1c($sp) -/* 855AD4 80243964 AFB10014 */ sw $s1, 0x14($sp) -/* 855AD8 80243968 AFB00010 */ sw $s0, 0x10($sp) -/* 855ADC 8024396C F7B80040 */ sdc1 $f24, 0x40($sp) -/* 855AE0 80243970 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 855AE4 80243974 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 855AE8 80243978 8E50000C */ lw $s0, 0xc($s2) -/* 855AEC 8024397C 8E140000 */ lw $s4, ($s0) -/* 855AF0 80243980 26100004 */ addiu $s0, $s0, 4 -/* 855AF4 80243984 0C0B1EAF */ jal get_variable -/* 855AF8 80243988 0280282D */ daddu $a1, $s4, $zero -/* 855AFC 8024398C 0040982D */ daddu $s3, $v0, $zero -/* 855B00 80243990 8E150000 */ lw $s5, ($s0) -/* 855B04 80243994 26100004 */ addiu $s0, $s0, 4 -/* 855B08 80243998 8E050000 */ lw $a1, ($s0) -/* 855B0C 8024399C 26100004 */ addiu $s0, $s0, 4 -/* 855B10 802439A0 0C0B210B */ jal get_float_variable -/* 855B14 802439A4 0240202D */ daddu $a0, $s2, $zero -/* 855B18 802439A8 8E050000 */ lw $a1, ($s0) -/* 855B1C 802439AC 26100004 */ addiu $s0, $s0, 4 -/* 855B20 802439B0 0240202D */ daddu $a0, $s2, $zero -/* 855B24 802439B4 0C0B210B */ jal get_float_variable -/* 855B28 802439B8 46000606 */ mov.s $f24, $f0 -/* 855B2C 802439BC 8E050000 */ lw $a1, ($s0) -/* 855B30 802439C0 26100004 */ addiu $s0, $s0, 4 -/* 855B34 802439C4 0240202D */ daddu $a0, $s2, $zero -/* 855B38 802439C8 0C0B1EAF */ jal get_variable -/* 855B3C 802439CC 46000506 */ mov.s $f20, $f0 -/* 855B40 802439D0 8E050000 */ lw $a1, ($s0) -/* 855B44 802439D4 26100004 */ addiu $s0, $s0, 4 -/* 855B48 802439D8 0240202D */ daddu $a0, $s2, $zero -/* 855B4C 802439DC 0C0B1EAF */ jal get_variable -/* 855B50 802439E0 0040882D */ daddu $s1, $v0, $zero -/* 855B54 802439E4 0240202D */ daddu $a0, $s2, $zero -/* 855B58 802439E8 8E050000 */ lw $a1, ($s0) -/* 855B5C 802439EC 0C0B210B */ jal get_float_variable -/* 855B60 802439F0 0040802D */ daddu $s0, $v0, $zero -/* 855B64 802439F4 4618A501 */ sub.s $f20, $f20, $f24 -/* 855B68 802439F8 3C013F00 */ lui $at, 0x3f00 -/* 855B6C 802439FC 44811000 */ mtc1 $at, $f2 -/* 855B70 80243A00 00000000 */ nop -/* 855B74 80243A04 4602A502 */ mul.s $f20, $f20, $f2 -/* 855B78 80243A08 00000000 */ nop -/* 855B7C 80243A0C 12000008 */ beqz $s0, .L80243A30 -/* 855B80 80243A10 46000586 */ mov.s $f22, $f0 -/* 855B84 80243A14 0233102A */ slt $v0, $s1, $s3 -/* 855B88 80243A18 10400005 */ beqz $v0, .L80243A30 -/* 855B8C 80243A1C 0240202D */ daddu $a0, $s2, $zero -/* 855B90 80243A20 0220982D */ daddu $s3, $s1, $zero -/* 855B94 80243A24 0280282D */ daddu $a1, $s4, $zero -/* 855B98 80243A28 0C0B2026 */ jal set_variable -/* 855B9C 80243A2C 0220302D */ daddu $a2, $s1, $zero -.L80243A30: -/* 855BA0 80243A30 3C014334 */ lui $at, 0x4334 -/* 855BA4 80243A34 44810000 */ mtc1 $at, $f0 -/* 855BA8 80243A38 44936000 */ mtc1 $s3, $f12 -/* 855BAC 80243A3C 00000000 */ nop -/* 855BB0 80243A40 46806320 */ cvt.s.w $f12, $f12 -/* 855BB4 80243A44 46006302 */ mul.s $f12, $f12, $f0 -/* 855BB8 80243A48 00000000 */ nop -/* 855BBC 80243A4C 44910000 */ mtc1 $s1, $f0 -/* 855BC0 80243A50 00000000 */ nop -/* 855BC4 80243A54 46800020 */ cvt.s.w $f0, $f0 -/* 855BC8 80243A58 46006303 */ div.s $f12, $f12, $f0 -/* 855BCC 80243A5C 0C00A8D4 */ jal cos_deg -/* 855BD0 80243A60 46166300 */ add.s $f12, $f12, $f22 -/* 855BD4 80243A64 4600A002 */ mul.s $f0, $f20, $f0 -/* 855BD8 80243A68 00000000 */ nop -/* 855BDC 80243A6C 4614C080 */ add.s $f2, $f24, $f20 -/* 855BE0 80243A70 46001081 */ sub.s $f2, $f2, $f0 -/* 855BE4 80243A74 0240202D */ daddu $a0, $s2, $zero -/* 855BE8 80243A78 44061000 */ mfc1 $a2, $f2 -/* 855BEC 80243A7C 0C0B2190 */ jal set_float_variable -/* 855BF0 80243A80 02A0282D */ daddu $a1, $s5, $zero -/* 855BF4 80243A84 8FBF0028 */ lw $ra, 0x28($sp) -/* 855BF8 80243A88 8FB50024 */ lw $s5, 0x24($sp) -/* 855BFC 80243A8C 8FB40020 */ lw $s4, 0x20($sp) -/* 855C00 80243A90 8FB3001C */ lw $s3, 0x1c($sp) -/* 855C04 80243A94 8FB20018 */ lw $s2, 0x18($sp) -/* 855C08 80243A98 8FB10014 */ lw $s1, 0x14($sp) -/* 855C0C 80243A9C 8FB00010 */ lw $s0, 0x10($sp) -/* 855C10 80243AA0 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 855C14 80243AA4 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 855C18 80243AA8 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 855C1C 80243AAC 24020002 */ addiu $v0, $zero, 2 -/* 855C20 80243AB0 03E00008 */ jr $ra -/* 855C24 80243AB4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s new file mode 100644 index 0000000000..2a01240840 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243948_855AB8.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243948_855AB8 +/* 855AB8 80243948 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 855ABC 8024394C AFB20018 */ sw $s2, 0x18($sp) +/* 855AC0 80243950 0080902D */ daddu $s2, $a0, $zero +/* 855AC4 80243954 AFBF0028 */ sw $ra, 0x28($sp) +/* 855AC8 80243958 AFB50024 */ sw $s5, 0x24($sp) +/* 855ACC 8024395C AFB40020 */ sw $s4, 0x20($sp) +/* 855AD0 80243960 AFB3001C */ sw $s3, 0x1c($sp) +/* 855AD4 80243964 AFB10014 */ sw $s1, 0x14($sp) +/* 855AD8 80243968 AFB00010 */ sw $s0, 0x10($sp) +/* 855ADC 8024396C F7B80040 */ sdc1 $f24, 0x40($sp) +/* 855AE0 80243970 F7B60038 */ sdc1 $f22, 0x38($sp) +/* 855AE4 80243974 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 855AE8 80243978 8E50000C */ lw $s0, 0xc($s2) +/* 855AEC 8024397C 8E140000 */ lw $s4, ($s0) +/* 855AF0 80243980 26100004 */ addiu $s0, $s0, 4 +/* 855AF4 80243984 0C0B1EAF */ jal get_variable +/* 855AF8 80243988 0280282D */ daddu $a1, $s4, $zero +/* 855AFC 8024398C 0040982D */ daddu $s3, $v0, $zero +/* 855B00 80243990 8E150000 */ lw $s5, ($s0) +/* 855B04 80243994 26100004 */ addiu $s0, $s0, 4 +/* 855B08 80243998 8E050000 */ lw $a1, ($s0) +/* 855B0C 8024399C 26100004 */ addiu $s0, $s0, 4 +/* 855B10 802439A0 0C0B210B */ jal get_float_variable +/* 855B14 802439A4 0240202D */ daddu $a0, $s2, $zero +/* 855B18 802439A8 8E050000 */ lw $a1, ($s0) +/* 855B1C 802439AC 26100004 */ addiu $s0, $s0, 4 +/* 855B20 802439B0 0240202D */ daddu $a0, $s2, $zero +/* 855B24 802439B4 0C0B210B */ jal get_float_variable +/* 855B28 802439B8 46000606 */ mov.s $f24, $f0 +/* 855B2C 802439BC 8E050000 */ lw $a1, ($s0) +/* 855B30 802439C0 26100004 */ addiu $s0, $s0, 4 +/* 855B34 802439C4 0240202D */ daddu $a0, $s2, $zero +/* 855B38 802439C8 0C0B1EAF */ jal get_variable +/* 855B3C 802439CC 46000506 */ mov.s $f20, $f0 +/* 855B40 802439D0 8E050000 */ lw $a1, ($s0) +/* 855B44 802439D4 26100004 */ addiu $s0, $s0, 4 +/* 855B48 802439D8 0240202D */ daddu $a0, $s2, $zero +/* 855B4C 802439DC 0C0B1EAF */ jal get_variable +/* 855B50 802439E0 0040882D */ daddu $s1, $v0, $zero +/* 855B54 802439E4 0240202D */ daddu $a0, $s2, $zero +/* 855B58 802439E8 8E050000 */ lw $a1, ($s0) +/* 855B5C 802439EC 0C0B210B */ jal get_float_variable +/* 855B60 802439F0 0040802D */ daddu $s0, $v0, $zero +/* 855B64 802439F4 4618A501 */ sub.s $f20, $f20, $f24 +/* 855B68 802439F8 3C013F00 */ lui $at, 0x3f00 +/* 855B6C 802439FC 44811000 */ mtc1 $at, $f2 +/* 855B70 80243A00 00000000 */ nop +/* 855B74 80243A04 4602A502 */ mul.s $f20, $f20, $f2 +/* 855B78 80243A08 00000000 */ nop +/* 855B7C 80243A0C 12000008 */ beqz $s0, .L80243A30 +/* 855B80 80243A10 46000586 */ mov.s $f22, $f0 +/* 855B84 80243A14 0233102A */ slt $v0, $s1, $s3 +/* 855B88 80243A18 10400005 */ beqz $v0, .L80243A30 +/* 855B8C 80243A1C 0240202D */ daddu $a0, $s2, $zero +/* 855B90 80243A20 0220982D */ daddu $s3, $s1, $zero +/* 855B94 80243A24 0280282D */ daddu $a1, $s4, $zero +/* 855B98 80243A28 0C0B2026 */ jal set_variable +/* 855B9C 80243A2C 0220302D */ daddu $a2, $s1, $zero +.L80243A30: +/* 855BA0 80243A30 3C014334 */ lui $at, 0x4334 +/* 855BA4 80243A34 44810000 */ mtc1 $at, $f0 +/* 855BA8 80243A38 44936000 */ mtc1 $s3, $f12 +/* 855BAC 80243A3C 00000000 */ nop +/* 855BB0 80243A40 46806320 */ cvt.s.w $f12, $f12 +/* 855BB4 80243A44 46006302 */ mul.s $f12, $f12, $f0 +/* 855BB8 80243A48 00000000 */ nop +/* 855BBC 80243A4C 44910000 */ mtc1 $s1, $f0 +/* 855BC0 80243A50 00000000 */ nop +/* 855BC4 80243A54 46800020 */ cvt.s.w $f0, $f0 +/* 855BC8 80243A58 46006303 */ div.s $f12, $f12, $f0 +/* 855BCC 80243A5C 0C00A8D4 */ jal cos_deg +/* 855BD0 80243A60 46166300 */ add.s $f12, $f12, $f22 +/* 855BD4 80243A64 4600A002 */ mul.s $f0, $f20, $f0 +/* 855BD8 80243A68 00000000 */ nop +/* 855BDC 80243A6C 4614C080 */ add.s $f2, $f24, $f20 +/* 855BE0 80243A70 46001081 */ sub.s $f2, $f2, $f0 +/* 855BE4 80243A74 0240202D */ daddu $a0, $s2, $zero +/* 855BE8 80243A78 44061000 */ mfc1 $a2, $f2 +/* 855BEC 80243A7C 0C0B2190 */ jal set_float_variable +/* 855BF0 80243A80 02A0282D */ daddu $a1, $s5, $zero +/* 855BF4 80243A84 8FBF0028 */ lw $ra, 0x28($sp) +/* 855BF8 80243A88 8FB50024 */ lw $s5, 0x24($sp) +/* 855BFC 80243A8C 8FB40020 */ lw $s4, 0x20($sp) +/* 855C00 80243A90 8FB3001C */ lw $s3, 0x1c($sp) +/* 855C04 80243A94 8FB20018 */ lw $s2, 0x18($sp) +/* 855C08 80243A98 8FB10014 */ lw $s1, 0x14($sp) +/* 855C0C 80243A9C 8FB00010 */ lw $s0, 0x10($sp) +/* 855C10 80243AA0 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 855C14 80243AA4 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 855C18 80243AA8 D7B40030 */ ldc1 $f20, 0x30($sp) +/* 855C1C 80243AAC 24020002 */ addiu $v0, $zero, 2 +/* 855C20 80243AB0 03E00008 */ jr $ra +/* 855C24 80243AB4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8.s deleted file mode 100644 index 8dbb956e25..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243AB8 -/* 855C28 80243AB8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 855C2C 80243ABC AFB10014 */ sw $s1, 0x14($sp) -/* 855C30 80243AC0 0080882D */ daddu $s1, $a0, $zero -/* 855C34 80243AC4 AFBF0018 */ sw $ra, 0x18($sp) -/* 855C38 80243AC8 AFB00010 */ sw $s0, 0x10($sp) -/* 855C3C 80243ACC F7B80030 */ sdc1 $f24, 0x30($sp) -/* 855C40 80243AD0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 855C44 80243AD4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 855C48 80243AD8 0C00EAD2 */ jal get_npc_safe -/* 855C4C 80243ADC 0000202D */ daddu $a0, $zero, $zero -/* 855C50 80243AE0 0040802D */ daddu $s0, $v0, $zero -/* 855C54 80243AE4 C614000C */ lwc1 $f20, 0xc($s0) -/* 855C58 80243AE8 3C01428C */ lui $at, 0x428c -/* 855C5C 80243AEC 4481C000 */ mtc1 $at, $f24 -/* 855C60 80243AF0 4600A507 */ neg.s $f20, $f20 -/* 855C64 80243AF4 0C00A8BB */ jal sin_deg -/* 855C68 80243AF8 4600A306 */ mov.s $f12, $f20 -/* 855C6C 80243AFC 46180002 */ mul.s $f0, $f0, $f24 -/* 855C70 80243B00 00000000 */ nop -/* 855C74 80243B04 C6160038 */ lwc1 $f22, 0x38($s0) -/* 855C78 80243B08 3C0141F0 */ lui $at, 0x41f0 -/* 855C7C 80243B0C 44811000 */ mtc1 $at, $f2 -/* 855C80 80243B10 00000000 */ nop -/* 855C84 80243B14 4602B580 */ add.s $f22, $f22, $f2 -/* 855C88 80243B18 4600A306 */ mov.s $f12, $f20 -/* 855C8C 80243B1C 0C00A8D4 */ jal cos_deg -/* 855C90 80243B20 4600B580 */ add.s $f22, $f22, $f0 -/* 855C94 80243B24 0220202D */ daddu $a0, $s1, $zero -/* 855C98 80243B28 46180002 */ mul.s $f0, $f0, $f24 -/* 855C9C 80243B2C 00000000 */ nop -/* 855CA0 80243B30 3C05FE36 */ lui $a1, 0xfe36 -/* 855CA4 80243B34 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 855CA8 80243B38 C6180040 */ lwc1 $f24, 0x40($s0) -/* 855CAC 80243B3C C614003C */ lwc1 $f20, 0x3c($s0) -/* 855CB0 80243B40 4600C600 */ add.s $f24, $f24, $f0 -/* 855CB4 80243B44 3C014248 */ lui $at, 0x4248 -/* 855CB8 80243B48 44810000 */ mtc1 $at, $f0 -/* 855CBC 80243B4C 4406B000 */ mfc1 $a2, $f22 -/* 855CC0 80243B50 0C0B2190 */ jal set_float_variable -/* 855CC4 80243B54 4600A500 */ add.s $f20, $f20, $f0 -/* 855CC8 80243B58 0220202D */ daddu $a0, $s1, $zero -/* 855CCC 80243B5C 3C05FE36 */ lui $a1, 0xfe36 -/* 855CD0 80243B60 4406A000 */ mfc1 $a2, $f20 -/* 855CD4 80243B64 0C0B2190 */ jal set_float_variable -/* 855CD8 80243B68 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 855CDC 80243B6C 0220202D */ daddu $a0, $s1, $zero -/* 855CE0 80243B70 3C05FE36 */ lui $a1, 0xfe36 -/* 855CE4 80243B74 4406C000 */ mfc1 $a2, $f24 -/* 855CE8 80243B78 0C0B2190 */ jal set_float_variable -/* 855CEC 80243B7C 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 855CF0 80243B80 8FBF0018 */ lw $ra, 0x18($sp) -/* 855CF4 80243B84 8FB10014 */ lw $s1, 0x14($sp) -/* 855CF8 80243B88 8FB00010 */ lw $s0, 0x10($sp) -/* 855CFC 80243B8C D7B80030 */ ldc1 $f24, 0x30($sp) -/* 855D00 80243B90 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 855D04 80243B94 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 855D08 80243B98 24020002 */ addiu $v0, $zero, 2 -/* 855D0C 80243B9C 03E00008 */ jr $ra -/* 855D10 80243BA0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s new file mode 100644 index 0000000000..161d11d3c8 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243AB8_855C28.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243AB8_855C28 +/* 855C28 80243AB8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 855C2C 80243ABC AFB10014 */ sw $s1, 0x14($sp) +/* 855C30 80243AC0 0080882D */ daddu $s1, $a0, $zero +/* 855C34 80243AC4 AFBF0018 */ sw $ra, 0x18($sp) +/* 855C38 80243AC8 AFB00010 */ sw $s0, 0x10($sp) +/* 855C3C 80243ACC F7B80030 */ sdc1 $f24, 0x30($sp) +/* 855C40 80243AD0 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 855C44 80243AD4 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 855C48 80243AD8 0C00EAD2 */ jal get_npc_safe +/* 855C4C 80243ADC 0000202D */ daddu $a0, $zero, $zero +/* 855C50 80243AE0 0040802D */ daddu $s0, $v0, $zero +/* 855C54 80243AE4 C614000C */ lwc1 $f20, 0xc($s0) +/* 855C58 80243AE8 3C01428C */ lui $at, 0x428c +/* 855C5C 80243AEC 4481C000 */ mtc1 $at, $f24 +/* 855C60 80243AF0 4600A507 */ neg.s $f20, $f20 +/* 855C64 80243AF4 0C00A8BB */ jal sin_deg +/* 855C68 80243AF8 4600A306 */ mov.s $f12, $f20 +/* 855C6C 80243AFC 46180002 */ mul.s $f0, $f0, $f24 +/* 855C70 80243B00 00000000 */ nop +/* 855C74 80243B04 C6160038 */ lwc1 $f22, 0x38($s0) +/* 855C78 80243B08 3C0141F0 */ lui $at, 0x41f0 +/* 855C7C 80243B0C 44811000 */ mtc1 $at, $f2 +/* 855C80 80243B10 00000000 */ nop +/* 855C84 80243B14 4602B580 */ add.s $f22, $f22, $f2 +/* 855C88 80243B18 4600A306 */ mov.s $f12, $f20 +/* 855C8C 80243B1C 0C00A8D4 */ jal cos_deg +/* 855C90 80243B20 4600B580 */ add.s $f22, $f22, $f0 +/* 855C94 80243B24 0220202D */ daddu $a0, $s1, $zero +/* 855C98 80243B28 46180002 */ mul.s $f0, $f0, $f24 +/* 855C9C 80243B2C 00000000 */ nop +/* 855CA0 80243B30 3C05FE36 */ lui $a1, 0xfe36 +/* 855CA4 80243B34 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 855CA8 80243B38 C6180040 */ lwc1 $f24, 0x40($s0) +/* 855CAC 80243B3C C614003C */ lwc1 $f20, 0x3c($s0) +/* 855CB0 80243B40 4600C600 */ add.s $f24, $f24, $f0 +/* 855CB4 80243B44 3C014248 */ lui $at, 0x4248 +/* 855CB8 80243B48 44810000 */ mtc1 $at, $f0 +/* 855CBC 80243B4C 4406B000 */ mfc1 $a2, $f22 +/* 855CC0 80243B50 0C0B2190 */ jal set_float_variable +/* 855CC4 80243B54 4600A500 */ add.s $f20, $f20, $f0 +/* 855CC8 80243B58 0220202D */ daddu $a0, $s1, $zero +/* 855CCC 80243B5C 3C05FE36 */ lui $a1, 0xfe36 +/* 855CD0 80243B60 4406A000 */ mfc1 $a2, $f20 +/* 855CD4 80243B64 0C0B2190 */ jal set_float_variable +/* 855CD8 80243B68 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 855CDC 80243B6C 0220202D */ daddu $a0, $s1, $zero +/* 855CE0 80243B70 3C05FE36 */ lui $a1, 0xfe36 +/* 855CE4 80243B74 4406C000 */ mfc1 $a2, $f24 +/* 855CE8 80243B78 0C0B2190 */ jal set_float_variable +/* 855CEC 80243B7C 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 855CF0 80243B80 8FBF0018 */ lw $ra, 0x18($sp) +/* 855CF4 80243B84 8FB10014 */ lw $s1, 0x14($sp) +/* 855CF8 80243B88 8FB00010 */ lw $s0, 0x10($sp) +/* 855CFC 80243B8C D7B80030 */ ldc1 $f24, 0x30($sp) +/* 855D00 80243B90 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 855D04 80243B94 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 855D08 80243B98 24020002 */ addiu $v0, $zero, 2 +/* 855D0C 80243B9C 03E00008 */ jr $ra +/* 855D10 80243BA0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243BA4.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243BA4.s deleted file mode 100644 index 68f488f98c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243BA4.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243BA4 -/* 855D14 80243BA4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 855D18 80243BA8 AFB10034 */ sw $s1, 0x34($sp) -/* 855D1C 80243BAC 0080882D */ daddu $s1, $a0, $zero -/* 855D20 80243BB0 AFBF003C */ sw $ra, 0x3c($sp) -/* 855D24 80243BB4 AFB20038 */ sw $s2, 0x38($sp) -/* 855D28 80243BB8 AFB00030 */ sw $s0, 0x30($sp) -/* 855D2C 80243BBC F7BE0068 */ sdc1 $f30, 0x68($sp) -/* 855D30 80243BC0 F7BC0060 */ sdc1 $f28, 0x60($sp) -/* 855D34 80243BC4 F7BA0058 */ sdc1 $f26, 0x58($sp) -/* 855D38 80243BC8 F7B80050 */ sdc1 $f24, 0x50($sp) -/* 855D3C 80243BCC F7B60048 */ sdc1 $f22, 0x48($sp) -/* 855D40 80243BD0 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 855D44 80243BD4 8E30000C */ lw $s0, 0xc($s1) -/* 855D48 80243BD8 8E050000 */ lw $a1, ($s0) -/* 855D4C 80243BDC 0C0B1EAF */ jal get_variable -/* 855D50 80243BE0 26100004 */ addiu $s0, $s0, 4 -/* 855D54 80243BE4 8E050000 */ lw $a1, ($s0) -/* 855D58 80243BE8 26100004 */ addiu $s0, $s0, 4 -/* 855D5C 80243BEC 0220202D */ daddu $a0, $s1, $zero -/* 855D60 80243BF0 0C0B210B */ jal get_float_variable -/* 855D64 80243BF4 0040902D */ daddu $s2, $v0, $zero -/* 855D68 80243BF8 8E050000 */ lw $a1, ($s0) -/* 855D6C 80243BFC 26100004 */ addiu $s0, $s0, 4 -/* 855D70 80243C00 0220202D */ daddu $a0, $s1, $zero -/* 855D74 80243C04 0C0B210B */ jal get_float_variable -/* 855D78 80243C08 46000706 */ mov.s $f28, $f0 -/* 855D7C 80243C0C 8E050000 */ lw $a1, ($s0) -/* 855D80 80243C10 26100004 */ addiu $s0, $s0, 4 -/* 855D84 80243C14 0220202D */ daddu $a0, $s1, $zero -/* 855D88 80243C18 0C0B210B */ jal get_float_variable -/* 855D8C 80243C1C 46000786 */ mov.s $f30, $f0 -/* 855D90 80243C20 8E050000 */ lw $a1, ($s0) -/* 855D94 80243C24 26100004 */ addiu $s0, $s0, 4 -/* 855D98 80243C28 0220202D */ daddu $a0, $s1, $zero -/* 855D9C 80243C2C 0C0B210B */ jal get_float_variable -/* 855DA0 80243C30 46000686 */ mov.s $f26, $f0 -/* 855DA4 80243C34 8E050000 */ lw $a1, ($s0) -/* 855DA8 80243C38 26100004 */ addiu $s0, $s0, 4 -/* 855DAC 80243C3C 0220202D */ daddu $a0, $s1, $zero -/* 855DB0 80243C40 0C0B210B */ jal get_float_variable -/* 855DB4 80243C44 46000606 */ mov.s $f24, $f0 -/* 855DB8 80243C48 8E050000 */ lw $a1, ($s0) -/* 855DBC 80243C4C 26100004 */ addiu $s0, $s0, 4 -/* 855DC0 80243C50 0220202D */ daddu $a0, $s1, $zero -/* 855DC4 80243C54 0C0B210B */ jal get_float_variable -/* 855DC8 80243C58 46000586 */ mov.s $f22, $f0 -/* 855DCC 80243C5C 0220202D */ daddu $a0, $s1, $zero -/* 855DD0 80243C60 8E050000 */ lw $a1, ($s0) -/* 855DD4 80243C64 0C0B1EAF */ jal get_variable -/* 855DD8 80243C68 46000506 */ mov.s $f20, $f0 -/* 855DDC 80243C6C 4405E000 */ mfc1 $a1, $f28 -/* 855DE0 80243C70 4406F000 */ mfc1 $a2, $f30 -/* 855DE4 80243C74 4407D000 */ mfc1 $a3, $f26 -/* 855DE8 80243C78 0240202D */ daddu $a0, $s2, $zero -/* 855DEC 80243C7C AFA2001C */ sw $v0, 0x1c($sp) -/* 855DF0 80243C80 27A20028 */ addiu $v0, $sp, 0x28 -/* 855DF4 80243C84 E7B80010 */ swc1 $f24, 0x10($sp) -/* 855DF8 80243C88 E7B60014 */ swc1 $f22, 0x14($sp) -/* 855DFC 80243C8C E7B40018 */ swc1 $f20, 0x18($sp) -/* 855E00 80243C90 0C01C3DC */ jal func_80070F70 -/* 855E04 80243C94 AFA20020 */ sw $v0, 0x20($sp) -/* 855E08 80243C98 8FA30028 */ lw $v1, 0x28($sp) -/* 855E0C 80243C9C AE230084 */ sw $v1, 0x84($s1) -/* 855E10 80243CA0 8FBF003C */ lw $ra, 0x3c($sp) -/* 855E14 80243CA4 8FB20038 */ lw $s2, 0x38($sp) -/* 855E18 80243CA8 8FB10034 */ lw $s1, 0x34($sp) -/* 855E1C 80243CAC 8FB00030 */ lw $s0, 0x30($sp) -/* 855E20 80243CB0 D7BE0068 */ ldc1 $f30, 0x68($sp) -/* 855E24 80243CB4 D7BC0060 */ ldc1 $f28, 0x60($sp) -/* 855E28 80243CB8 D7BA0058 */ ldc1 $f26, 0x58($sp) -/* 855E2C 80243CBC D7B80050 */ ldc1 $f24, 0x50($sp) -/* 855E30 80243CC0 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 855E34 80243CC4 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 855E38 80243CC8 24020002 */ addiu $v0, $zero, 2 -/* 855E3C 80243CCC 03E00008 */ jr $ra -/* 855E40 80243CD0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243BA4_855D14.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243BA4_855D14.s new file mode 100644 index 0000000000..aa0881d671 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243BA4_855D14.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243BA4_855D14 +/* 855D14 80243BA4 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 855D18 80243BA8 AFB10034 */ sw $s1, 0x34($sp) +/* 855D1C 80243BAC 0080882D */ daddu $s1, $a0, $zero +/* 855D20 80243BB0 AFBF003C */ sw $ra, 0x3c($sp) +/* 855D24 80243BB4 AFB20038 */ sw $s2, 0x38($sp) +/* 855D28 80243BB8 AFB00030 */ sw $s0, 0x30($sp) +/* 855D2C 80243BBC F7BE0068 */ sdc1 $f30, 0x68($sp) +/* 855D30 80243BC0 F7BC0060 */ sdc1 $f28, 0x60($sp) +/* 855D34 80243BC4 F7BA0058 */ sdc1 $f26, 0x58($sp) +/* 855D38 80243BC8 F7B80050 */ sdc1 $f24, 0x50($sp) +/* 855D3C 80243BCC F7B60048 */ sdc1 $f22, 0x48($sp) +/* 855D40 80243BD0 F7B40040 */ sdc1 $f20, 0x40($sp) +/* 855D44 80243BD4 8E30000C */ lw $s0, 0xc($s1) +/* 855D48 80243BD8 8E050000 */ lw $a1, ($s0) +/* 855D4C 80243BDC 0C0B1EAF */ jal get_variable +/* 855D50 80243BE0 26100004 */ addiu $s0, $s0, 4 +/* 855D54 80243BE4 8E050000 */ lw $a1, ($s0) +/* 855D58 80243BE8 26100004 */ addiu $s0, $s0, 4 +/* 855D5C 80243BEC 0220202D */ daddu $a0, $s1, $zero +/* 855D60 80243BF0 0C0B210B */ jal get_float_variable +/* 855D64 80243BF4 0040902D */ daddu $s2, $v0, $zero +/* 855D68 80243BF8 8E050000 */ lw $a1, ($s0) +/* 855D6C 80243BFC 26100004 */ addiu $s0, $s0, 4 +/* 855D70 80243C00 0220202D */ daddu $a0, $s1, $zero +/* 855D74 80243C04 0C0B210B */ jal get_float_variable +/* 855D78 80243C08 46000706 */ mov.s $f28, $f0 +/* 855D7C 80243C0C 8E050000 */ lw $a1, ($s0) +/* 855D80 80243C10 26100004 */ addiu $s0, $s0, 4 +/* 855D84 80243C14 0220202D */ daddu $a0, $s1, $zero +/* 855D88 80243C18 0C0B210B */ jal get_float_variable +/* 855D8C 80243C1C 46000786 */ mov.s $f30, $f0 +/* 855D90 80243C20 8E050000 */ lw $a1, ($s0) +/* 855D94 80243C24 26100004 */ addiu $s0, $s0, 4 +/* 855D98 80243C28 0220202D */ daddu $a0, $s1, $zero +/* 855D9C 80243C2C 0C0B210B */ jal get_float_variable +/* 855DA0 80243C30 46000686 */ mov.s $f26, $f0 +/* 855DA4 80243C34 8E050000 */ lw $a1, ($s0) +/* 855DA8 80243C38 26100004 */ addiu $s0, $s0, 4 +/* 855DAC 80243C3C 0220202D */ daddu $a0, $s1, $zero +/* 855DB0 80243C40 0C0B210B */ jal get_float_variable +/* 855DB4 80243C44 46000606 */ mov.s $f24, $f0 +/* 855DB8 80243C48 8E050000 */ lw $a1, ($s0) +/* 855DBC 80243C4C 26100004 */ addiu $s0, $s0, 4 +/* 855DC0 80243C50 0220202D */ daddu $a0, $s1, $zero +/* 855DC4 80243C54 0C0B210B */ jal get_float_variable +/* 855DC8 80243C58 46000586 */ mov.s $f22, $f0 +/* 855DCC 80243C5C 0220202D */ daddu $a0, $s1, $zero +/* 855DD0 80243C60 8E050000 */ lw $a1, ($s0) +/* 855DD4 80243C64 0C0B1EAF */ jal get_variable +/* 855DD8 80243C68 46000506 */ mov.s $f20, $f0 +/* 855DDC 80243C6C 4405E000 */ mfc1 $a1, $f28 +/* 855DE0 80243C70 4406F000 */ mfc1 $a2, $f30 +/* 855DE4 80243C74 4407D000 */ mfc1 $a3, $f26 +/* 855DE8 80243C78 0240202D */ daddu $a0, $s2, $zero +/* 855DEC 80243C7C AFA2001C */ sw $v0, 0x1c($sp) +/* 855DF0 80243C80 27A20028 */ addiu $v0, $sp, 0x28 +/* 855DF4 80243C84 E7B80010 */ swc1 $f24, 0x10($sp) +/* 855DF8 80243C88 E7B60014 */ swc1 $f22, 0x14($sp) +/* 855DFC 80243C8C E7B40018 */ swc1 $f20, 0x18($sp) +/* 855E00 80243C90 0C01C3DC */ jal func_80070F70 +/* 855E04 80243C94 AFA20020 */ sw $v0, 0x20($sp) +/* 855E08 80243C98 8FA30028 */ lw $v1, 0x28($sp) +/* 855E0C 80243C9C AE230084 */ sw $v1, 0x84($s1) +/* 855E10 80243CA0 8FBF003C */ lw $ra, 0x3c($sp) +/* 855E14 80243CA4 8FB20038 */ lw $s2, 0x38($sp) +/* 855E18 80243CA8 8FB10034 */ lw $s1, 0x34($sp) +/* 855E1C 80243CAC 8FB00030 */ lw $s0, 0x30($sp) +/* 855E20 80243CB0 D7BE0068 */ ldc1 $f30, 0x68($sp) +/* 855E24 80243CB4 D7BC0060 */ ldc1 $f28, 0x60($sp) +/* 855E28 80243CB8 D7BA0058 */ ldc1 $f26, 0x58($sp) +/* 855E2C 80243CBC D7B80050 */ ldc1 $f24, 0x50($sp) +/* 855E30 80243CC0 D7B60048 */ ldc1 $f22, 0x48($sp) +/* 855E34 80243CC4 D7B40040 */ ldc1 $f20, 0x40($sp) +/* 855E38 80243CC8 24020002 */ addiu $v0, $zero, 2 +/* 855E3C 80243CCC 03E00008 */ jr $ra +/* 855E40 80243CD0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78.s deleted file mode 100644 index f000f2b251..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243D78 -/* 855EE8 80243D78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 855EEC 80243D7C AFBF0010 */ sw $ra, 0x10($sp) -/* 855EF0 80243D80 8C82000C */ lw $v0, 0xc($a0) -/* 855EF4 80243D84 0C0B1EAF */ jal get_variable -/* 855EF8 80243D88 8C450000 */ lw $a1, ($v0) -/* 855EFC 80243D8C 8C44000C */ lw $a0, 0xc($v0) -/* 855F00 80243D90 24030001 */ addiu $v1, $zero, 1 -/* 855F04 80243D94 AC830004 */ sw $v1, 4($a0) -/* 855F08 80243D98 8FBF0010 */ lw $ra, 0x10($sp) -/* 855F0C 80243D9C 24020002 */ addiu $v0, $zero, 2 -/* 855F10 80243DA0 03E00008 */ jr $ra -/* 855F14 80243DA4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 855F18 80243DA8 00000000 */ nop -/* 855F1C 80243DAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78_855EE8.s b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78_855EE8.s new file mode 100644 index 0000000000..5b99964b54 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855560/func_80243D78_855EE8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243D78_855EE8 +/* 855EE8 80243D78 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 855EEC 80243D7C AFBF0010 */ sw $ra, 0x10($sp) +/* 855EF0 80243D80 8C82000C */ lw $v0, 0xc($a0) +/* 855EF4 80243D84 0C0B1EAF */ jal get_variable +/* 855EF8 80243D88 8C450000 */ lw $a1, ($v0) +/* 855EFC 80243D8C 8C44000C */ lw $a0, 0xc($v0) +/* 855F00 80243D90 24030001 */ addiu $v1, $zero, 1 +/* 855F04 80243D94 AC830004 */ sw $v1, 4($a0) +/* 855F08 80243D98 8FBF0010 */ lw $ra, 0x10($sp) +/* 855F0C 80243D9C 24020002 */ addiu $v0, $zero, 2 +/* 855F10 80243DA0 03E00008 */ jr $ra +/* 855F14 80243DA4 27BD0018 */ addiu $sp, $sp, 0x18 +/* 855F18 80243DA8 00000000 */ nop +/* 855F1C 80243DAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0.s b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0.s deleted file mode 100644 index e8dd89baa0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243DB0 -/* 855F20 80243DB0 44862000 */ mtc1 $a2, $f4 -/* 855F24 80243DB4 3C013F00 */ lui $at, 0x3f00 -/* 855F28 80243DB8 44810000 */ mtc1 $at, $f0 -/* 855F2C 80243DBC 8FA40010 */ lw $a0, 0x10($sp) -/* 855F30 80243DC0 8FA50014 */ lw $a1, 0x14($sp) -/* 855F34 80243DC4 4600203E */ c.le.s $f4, $f0 -/* 855F38 80243DC8 00000000 */ nop -/* 855F3C 80243DCC 45020008 */ bc1fl .L80243DF0 -/* 855F40 80243DD0 460E2000 */ add.s $f0, $f4, $f14 -/* 855F44 80243DD4 460020A1 */ cvt.d.s $f2, $f4 -/* 855F48 80243DD8 46007021 */ cvt.d.s $f0, $f14 -/* 855F4C 80243DDC 46220002 */ mul.d $f0, $f0, $f2 -/* 855F50 80243DE0 00000000 */ nop -/* 855F54 80243DE4 46220000 */ add.d $f0, $f0, $f2 -/* 855F58 80243DE8 08090F7F */ j .L80243DFC -/* 855F5C 80243DEC 462001A0 */ cvt.s.d $f6, $f0 -.L80243DF0: -/* 855F60 80243DF0 460E2082 */ mul.s $f2, $f4, $f14 -/* 855F64 80243DF4 00000000 */ nop -/* 855F68 80243DF8 46020181 */ sub.s $f6, $f0, $f2 -.L80243DFC: -/* 855F6C 80243DFC 44800000 */ mtc1 $zero, $f0 -/* 855F70 80243E00 00000000 */ nop -/* 855F74 80243E04 46003032 */ c.eq.s $f6, $f0 -/* 855F78 80243E08 00000000 */ nop -/* 855F7C 80243E0C 45000005 */ bc1f .L80243E24 -/* 855F80 80243E10 00000000 */ nop -/* 855F84 80243E14 E4A00000 */ swc1 $f0, ($a1) -/* 855F88 80243E18 E4800000 */ swc1 $f0, ($a0) -/* 855F8C 80243E1C 03E00008 */ jr $ra -/* 855F90 80243E20 E4E00000 */ swc1 $f0, ($a3) -.L80243E24: -/* 855F94 80243E24 3C0140C0 */ lui $at, 0x40c0 -/* 855F98 80243E28 44810000 */ mtc1 $at, $f0 -/* 855F9C 80243E2C 00000000 */ nop -/* 855FA0 80243E30 46006302 */ mul.s $f12, $f12, $f0 -/* 855FA4 80243E34 00000000 */ nop -/* 855FA8 80243E38 46042000 */ add.s $f0, $f4, $f4 -/* 855FAC 80243E3C 46060201 */ sub.s $f8, $f0, $f6 -/* 855FB0 80243E40 46083001 */ sub.s $f0, $f6, $f8 -/* 855FB4 80243E44 46060003 */ div.s $f0, $f0, $f6 -/* 855FB8 80243E48 46003002 */ mul.s $f0, $f6, $f0 -/* 855FBC 80243E4C 00000000 */ nop -/* 855FC0 80243E50 4600628D */ trunc.w.s $f10, $f12 -/* 855FC4 80243E54 44025000 */ mfc1 $v0, $f10 -/* 855FC8 80243E58 00000000 */ nop -/* 855FCC 80243E5C 44822000 */ mtc1 $v0, $f4 -/* 855FD0 80243E60 00000000 */ nop -/* 855FD4 80243E64 46802120 */ cvt.s.w $f4, $f4 -/* 855FD8 80243E68 46046081 */ sub.s $f2, $f12, $f4 -/* 855FDC 80243E6C 46020002 */ mul.s $f0, $f0, $f2 -/* 855FE0 80243E70 00000000 */ nop -/* 855FE4 80243E74 46004080 */ add.s $f2, $f8, $f0 -/* 855FE8 80243E78 4600228D */ trunc.w.s $f10, $f4 -/* 855FEC 80243E7C 44035000 */ mfc1 $v1, $f10 -/* 855FF0 80243E80 00000000 */ nop -/* 855FF4 80243E84 2C620006 */ sltiu $v0, $v1, 6 -/* 855FF8 80243E88 1040001E */ beqz $v0, .L80243F04 -/* 855FFC 80243E8C 46003001 */ sub.s $f0, $f6, $f0 -/* 856000 80243E90 00031080 */ sll $v0, $v1, 2 -/* 856004 80243E94 3C018025 */ lui $at, 0x8025 -/* 856008 80243E98 00220821 */ addu $at, $at, $v0 -/* 85600C 80243E9C 8C2229B0 */ lw $v0, 0x29b0($at) -/* 856010 80243EA0 00400008 */ jr $v0 -/* 856014 80243EA4 00000000 */ nop -/* 856018 80243EA8 E4E60000 */ swc1 $f6, ($a3) -/* 85601C 80243EAC E4820000 */ swc1 $f2, ($a0) -/* 856020 80243EB0 03E00008 */ jr $ra -/* 856024 80243EB4 E4A80000 */ swc1 $f8, ($a1) -/* 856028 80243EB8 E4E00000 */ swc1 $f0, ($a3) -/* 85602C 80243EBC E4860000 */ swc1 $f6, ($a0) -/* 856030 80243EC0 03E00008 */ jr $ra -/* 856034 80243EC4 E4A80000 */ swc1 $f8, ($a1) -/* 856038 80243EC8 E4E80000 */ swc1 $f8, ($a3) -/* 85603C 80243ECC E4860000 */ swc1 $f6, ($a0) -/* 856040 80243ED0 03E00008 */ jr $ra -/* 856044 80243ED4 E4A20000 */ swc1 $f2, ($a1) -/* 856048 80243ED8 E4E80000 */ swc1 $f8, ($a3) -/* 85604C 80243EDC E4800000 */ swc1 $f0, ($a0) -/* 856050 80243EE0 03E00008 */ jr $ra -/* 856054 80243EE4 E4A60000 */ swc1 $f6, ($a1) -/* 856058 80243EE8 E4E20000 */ swc1 $f2, ($a3) -/* 85605C 80243EEC E4880000 */ swc1 $f8, ($a0) -/* 856060 80243EF0 03E00008 */ jr $ra -/* 856064 80243EF4 E4A60000 */ swc1 $f6, ($a1) -/* 856068 80243EF8 E4E60000 */ swc1 $f6, ($a3) -/* 85606C 80243EFC E4880000 */ swc1 $f8, ($a0) -/* 856070 80243F00 E4A00000 */ swc1 $f0, ($a1) -.L80243F04: -/* 856074 80243F04 03E00008 */ jr $ra -/* 856078 80243F08 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s new file mode 100644 index 0000000000..ee2569fe9f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243DB0_855F20.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243DB0_855F20 +/* 855F20 80243DB0 44862000 */ mtc1 $a2, $f4 +/* 855F24 80243DB4 3C013F00 */ lui $at, 0x3f00 +/* 855F28 80243DB8 44810000 */ mtc1 $at, $f0 +/* 855F2C 80243DBC 8FA40010 */ lw $a0, 0x10($sp) +/* 855F30 80243DC0 8FA50014 */ lw $a1, 0x14($sp) +/* 855F34 80243DC4 4600203E */ c.le.s $f4, $f0 +/* 855F38 80243DC8 00000000 */ nop +/* 855F3C 80243DCC 45020008 */ bc1fl .L80243DF0 +/* 855F40 80243DD0 460E2000 */ add.s $f0, $f4, $f14 +/* 855F44 80243DD4 460020A1 */ cvt.d.s $f2, $f4 +/* 855F48 80243DD8 46007021 */ cvt.d.s $f0, $f14 +/* 855F4C 80243DDC 46220002 */ mul.d $f0, $f0, $f2 +/* 855F50 80243DE0 00000000 */ nop +/* 855F54 80243DE4 46220000 */ add.d $f0, $f0, $f2 +/* 855F58 80243DE8 08090F7F */ j .L80243DFC +/* 855F5C 80243DEC 462001A0 */ cvt.s.d $f6, $f0 +.L80243DF0: +/* 855F60 80243DF0 460E2082 */ mul.s $f2, $f4, $f14 +/* 855F64 80243DF4 00000000 */ nop +/* 855F68 80243DF8 46020181 */ sub.s $f6, $f0, $f2 +.L80243DFC: +/* 855F6C 80243DFC 44800000 */ mtc1 $zero, $f0 +/* 855F70 80243E00 00000000 */ nop +/* 855F74 80243E04 46003032 */ c.eq.s $f6, $f0 +/* 855F78 80243E08 00000000 */ nop +/* 855F7C 80243E0C 45000005 */ bc1f .L80243E24 +/* 855F80 80243E10 00000000 */ nop +/* 855F84 80243E14 E4A00000 */ swc1 $f0, ($a1) +/* 855F88 80243E18 E4800000 */ swc1 $f0, ($a0) +/* 855F8C 80243E1C 03E00008 */ jr $ra +/* 855F90 80243E20 E4E00000 */ swc1 $f0, ($a3) +.L80243E24: +/* 855F94 80243E24 3C0140C0 */ lui $at, 0x40c0 +/* 855F98 80243E28 44810000 */ mtc1 $at, $f0 +/* 855F9C 80243E2C 00000000 */ nop +/* 855FA0 80243E30 46006302 */ mul.s $f12, $f12, $f0 +/* 855FA4 80243E34 00000000 */ nop +/* 855FA8 80243E38 46042000 */ add.s $f0, $f4, $f4 +/* 855FAC 80243E3C 46060201 */ sub.s $f8, $f0, $f6 +/* 855FB0 80243E40 46083001 */ sub.s $f0, $f6, $f8 +/* 855FB4 80243E44 46060003 */ div.s $f0, $f0, $f6 +/* 855FB8 80243E48 46003002 */ mul.s $f0, $f6, $f0 +/* 855FBC 80243E4C 00000000 */ nop +/* 855FC0 80243E50 4600628D */ trunc.w.s $f10, $f12 +/* 855FC4 80243E54 44025000 */ mfc1 $v0, $f10 +/* 855FC8 80243E58 00000000 */ nop +/* 855FCC 80243E5C 44822000 */ mtc1 $v0, $f4 +/* 855FD0 80243E60 00000000 */ nop +/* 855FD4 80243E64 46802120 */ cvt.s.w $f4, $f4 +/* 855FD8 80243E68 46046081 */ sub.s $f2, $f12, $f4 +/* 855FDC 80243E6C 46020002 */ mul.s $f0, $f0, $f2 +/* 855FE0 80243E70 00000000 */ nop +/* 855FE4 80243E74 46004080 */ add.s $f2, $f8, $f0 +/* 855FE8 80243E78 4600228D */ trunc.w.s $f10, $f4 +/* 855FEC 80243E7C 44035000 */ mfc1 $v1, $f10 +/* 855FF0 80243E80 00000000 */ nop +/* 855FF4 80243E84 2C620006 */ sltiu $v0, $v1, 6 +/* 855FF8 80243E88 1040001E */ beqz $v0, .L80243F04 +/* 855FFC 80243E8C 46003001 */ sub.s $f0, $f6, $f0 +/* 856000 80243E90 00031080 */ sll $v0, $v1, 2 +/* 856004 80243E94 3C018025 */ lui $at, 0x8025 +/* 856008 80243E98 00220821 */ addu $at, $at, $v0 +/* 85600C 80243E9C 8C2229B0 */ lw $v0, 0x29b0($at) +/* 856010 80243EA0 00400008 */ jr $v0 +/* 856014 80243EA4 00000000 */ nop +/* 856018 80243EA8 E4E60000 */ swc1 $f6, ($a3) +/* 85601C 80243EAC E4820000 */ swc1 $f2, ($a0) +/* 856020 80243EB0 03E00008 */ jr $ra +/* 856024 80243EB4 E4A80000 */ swc1 $f8, ($a1) +/* 856028 80243EB8 E4E00000 */ swc1 $f0, ($a3) +/* 85602C 80243EBC E4860000 */ swc1 $f6, ($a0) +/* 856030 80243EC0 03E00008 */ jr $ra +/* 856034 80243EC4 E4A80000 */ swc1 $f8, ($a1) +/* 856038 80243EC8 E4E80000 */ swc1 $f8, ($a3) +/* 85603C 80243ECC E4860000 */ swc1 $f6, ($a0) +/* 856040 80243ED0 03E00008 */ jr $ra +/* 856044 80243ED4 E4A20000 */ swc1 $f2, ($a1) +/* 856048 80243ED8 E4E80000 */ swc1 $f8, ($a3) +/* 85604C 80243EDC E4800000 */ swc1 $f0, ($a0) +/* 856050 80243EE0 03E00008 */ jr $ra +/* 856054 80243EE4 E4A60000 */ swc1 $f6, ($a1) +/* 856058 80243EE8 E4E20000 */ swc1 $f2, ($a3) +/* 85605C 80243EEC E4880000 */ swc1 $f8, ($a0) +/* 856060 80243EF0 03E00008 */ jr $ra +/* 856064 80243EF4 E4A60000 */ swc1 $f6, ($a1) +/* 856068 80243EF8 E4E60000 */ swc1 $f6, ($a3) +/* 85606C 80243EFC E4880000 */ swc1 $f8, ($a0) +/* 856070 80243F00 E4A00000 */ swc1 $f0, ($a1) +.L80243F04: +/* 856074 80243F04 03E00008 */ jr $ra +/* 856078 80243F08 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C.s b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C.s deleted file mode 100644 index 5e207b4df4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243F0C -/* 85607C 80243F0C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 856080 80243F10 24040003 */ addiu $a0, $zero, 3 -/* 856084 80243F14 27A6001C */ addiu $a2, $sp, 0x1c -/* 856088 80243F18 27A70020 */ addiu $a3, $sp, 0x20 -/* 85608C 80243F1C AFBF003C */ sw $ra, 0x3c($sp) -/* 856090 80243F20 AFB20038 */ sw $s2, 0x38($sp) -/* 856094 80243F24 AFB10034 */ sw $s1, 0x34($sp) -/* 856098 80243F28 AFB00030 */ sw $s0, 0x30($sp) -/* 85609C 80243F2C F7B80050 */ sdc1 $f24, 0x50($sp) -/* 8560A0 80243F30 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 8560A4 80243F34 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 8560A8 80243F38 0C0470AC */ jal func_8011C2B0 -/* 8560AC 80243F3C 27A50018 */ addiu $a1, $sp, 0x18 -/* 8560B0 80243F40 8FA30020 */ lw $v1, 0x20($sp) -/* 8560B4 80243F44 1860005D */ blez $v1, .L802440BC -/* 8560B8 80243F48 0000882D */ daddu $s1, $zero, $zero -/* 8560BC 80243F4C 3C128000 */ lui $s2, 0x8000 -/* 8560C0 80243F50 3C013FF0 */ lui $at, 0x3ff0 -/* 8560C4 80243F54 4481B800 */ mtc1 $at, $f23 -/* 8560C8 80243F58 4480B000 */ mtc1 $zero, $f22 -/* 8560CC 80243F5C 3C01437F */ lui $at, 0x437f -/* 8560D0 80243F60 4481C000 */ mtc1 $at, $f24 -/* 8560D4 80243F64 3C014F00 */ lui $at, 0x4f00 -/* 8560D8 80243F68 4481A000 */ mtc1 $at, $f20 -.L80243F6C: -/* 8560DC 80243F6C 44910000 */ mtc1 $s1, $f0 -/* 8560E0 80243F70 00000000 */ nop -/* 8560E4 80243F74 46800020 */ cvt.s.w $f0, $f0 -/* 8560E8 80243F78 44831000 */ mtc1 $v1, $f2 -/* 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 -/* 8560FC 80243F8C 3C018025 */ lui $at, 0x8025 -/* 856100 80243F90 C4242744 */ lwc1 $f4, 0x2744($at) -/* 856104 80243F94 8FA2001C */ lw $v0, 0x1c($sp) -/* 856108 80243F98 46002300 */ add.s $f12, $f4, $f0 -/* 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 -/* 85611C 80243FAC 45000003 */ bc1f .L80243FBC -/* 856120 80243FB0 2450000C */ addiu $s0, $v0, 0xc -/* 856124 80243FB4 46360001 */ sub.d $f0, $f0, $f22 -/* 856128 80243FB8 46200320 */ cvt.s.d $f12, $f0 -.L80243FBC: -/* 85612C 80243FBC 27A70024 */ addiu $a3, $sp, 0x24 -/* 856130 80243FC0 3C063F00 */ lui $a2, 0x3f00 -/* 856134 80243FC4 3C013F80 */ lui $at, 0x3f80 -/* 856138 80243FC8 44817000 */ mtc1 $at, $f14 -/* 85613C 80243FCC 27A20028 */ addiu $v0, $sp, 0x28 -/* 856140 80243FD0 AFA20010 */ sw $v0, 0x10($sp) -/* 856144 80243FD4 27A2002C */ addiu $v0, $sp, 0x2c -/* 856148 80243FD8 0C090F6C */ jal func_80243DB0 -/* 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 -/* 85615C 80243FEC 4600A03E */ c.le.s $f20, $f0 -/* 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 -/* 856170 80244000 44023000 */ mfc1 $v0, $f6 -/* 856174 80244004 08091008 */ j .L80244020 -/* 856178 80244008 A2020000 */ sb $v0, ($s0) -.L8024400C: -/* 85617C 8024400C 4600018D */ trunc.w.s $f6, $f0 -/* 856180 80244010 44023000 */ mfc1 $v0, $f6 -/* 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 -/* 85619C 8024402C 4600A03E */ c.le.s $f20, $f0 -/* 8561A0 80244030 00000000 */ nop -/* 8561A4 80244034 45010005 */ bc1t .L8024404C -/* 8561A8 80244038 26030001 */ addiu $v1, $s0, 1 -/* 8561AC 8024403C 4600018D */ trunc.w.s $f6, $f0 -/* 8561B0 80244040 44023000 */ mfc1 $v0, $f6 -/* 8561B4 80244044 08091019 */ j .L80244064 -/* 8561B8 80244048 A0620000 */ sb $v0, ($v1) -.L8024404C: -/* 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 -/* 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 -/* 8561E0 80244070 4600A03E */ c.le.s $f20, $f0 -/* 8561E4 80244074 00000000 */ nop -/* 8561E8 80244078 45010005 */ bc1t .L80244090 -/* 8561EC 8024407C 26020002 */ addiu $v0, $s0, 2 -/* 8561F0 80244080 4600018D */ trunc.w.s $f6, $f0 -/* 8561F4 80244084 44033000 */ mfc1 $v1, $f6 -/* 8561F8 80244088 0809102A */ j .L802440A8 -/* 8561FC 8024408C A0430000 */ sb $v1, ($v0) -.L80244090: -/* 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 -/* 856210 802440A0 00721825 */ or $v1, $v1, $s2 -/* 856214 802440A4 A0430000 */ sb $v1, ($v0) -.L802440A8: -/* 856218 802440A8 8FA30020 */ lw $v1, 0x20($sp) -/* 85621C 802440AC 26310001 */ addiu $s1, $s1, 1 -/* 856220 802440B0 0223102A */ slt $v0, $s1, $v1 -/* 856224 802440B4 1440FFAD */ bnez $v0, .L80243F6C -/* 856228 802440B8 00000000 */ nop -.L802440BC: -/* 85622C 802440BC 3C03800A */ lui $v1, 0x800a -/* 856230 802440C0 2463A66C */ addiu $v1, $v1, -0x5994 -/* 856234 802440C4 8C620000 */ lw $v0, ($v1) -/* 856238 802440C8 24040003 */ addiu $a0, $zero, 3 -/* 85623C 802440CC 0040802D */ daddu $s0, $v0, $zero -/* 856240 802440D0 24420008 */ addiu $v0, $v0, 8 -/* 856244 802440D4 AC620000 */ sw $v0, ($v1) -/* 856248 802440D8 3C02DE00 */ lui $v0, 0xde00 -/* 85624C 802440DC 0C0470BB */ jal func_8011C2EC -/* 856250 802440E0 AE020000 */ sw $v0, ($s0) -/* 856254 802440E4 3C038025 */ lui $v1, 0x8025 -/* 856258 802440E8 24632744 */ addiu $v1, $v1, 0x2744 -/* 85625C 802440EC C4600000 */ lwc1 $f0, ($v1) -/* 856260 802440F0 3C018025 */ lui $at, 0x8025 -/* 856264 802440F4 D42229C8 */ ldc1 $f2, 0x29c8($at) -/* 856268 802440F8 46000021 */ cvt.d.s $f0, $f0 -/* 85626C 802440FC 46220000 */ add.d $f0, $f0, $f2 -/* 856270 80244100 AE020004 */ sw $v0, 4($s0) -/* 856274 80244104 3C013FF0 */ lui $at, 0x3ff0 -/* 856278 80244108 44811800 */ mtc1 $at, $f3 -/* 85627C 8024410C 44801000 */ mtc1 $zero, $f2 -/* 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 -/* 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 -/* 8562A4 80244134 46002001 */ sub.s $f0, $f4, $f0 -/* 8562A8 80244138 E4600000 */ swc1 $f0, ($v1) -.L8024413C: -/* 8562AC 8024413C 8FBF003C */ lw $ra, 0x3c($sp) -/* 8562B0 80244140 8FB20038 */ lw $s2, 0x38($sp) -/* 8562B4 80244144 8FB10034 */ lw $s1, 0x34($sp) -/* 8562B8 80244148 8FB00030 */ lw $s0, 0x30($sp) -/* 8562BC 8024414C D7B80050 */ ldc1 $f24, 0x50($sp) -/* 8562C0 80244150 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 8562C4 80244154 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 8562C8 80244158 03E00008 */ jr $ra -/* 8562CC 8024415C 27BD0058 */ addiu $sp, $sp, 0x58 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 new file mode 100644 index 0000000000..1f62cb87ef --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_05/855F20/func_80243F0C_85607C.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243F0C_85607C +/* 85607C 80243F0C 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* 856080 80243F10 24040003 */ addiu $a0, $zero, 3 +/* 856084 80243F14 27A6001C */ addiu $a2, $sp, 0x1c +/* 856088 80243F18 27A70020 */ addiu $a3, $sp, 0x20 +/* 85608C 80243F1C AFBF003C */ sw $ra, 0x3c($sp) +/* 856090 80243F20 AFB20038 */ sw $s2, 0x38($sp) +/* 856094 80243F24 AFB10034 */ sw $s1, 0x34($sp) +/* 856098 80243F28 AFB00030 */ sw $s0, 0x30($sp) +/* 85609C 80243F2C F7B80050 */ sdc1 $f24, 0x50($sp) +/* 8560A0 80243F30 F7B60048 */ sdc1 $f22, 0x48($sp) +/* 8560A4 80243F34 F7B40040 */ sdc1 $f20, 0x40($sp) +/* 8560A8 80243F38 0C0470AC */ jal func_8011C2B0 +/* 8560AC 80243F3C 27A50018 */ addiu $a1, $sp, 0x18 +/* 8560B0 80243F40 8FA30020 */ lw $v1, 0x20($sp) +/* 8560B4 80243F44 1860005D */ blez $v1, .L802440BC +/* 8560B8 80243F48 0000882D */ daddu $s1, $zero, $zero +/* 8560BC 80243F4C 3C128000 */ lui $s2, 0x8000 +/* 8560C0 80243F50 3C013FF0 */ lui $at, 0x3ff0 +/* 8560C4 80243F54 4481B800 */ mtc1 $at, $f23 +/* 8560C8 80243F58 4480B000 */ mtc1 $zero, $f22 +/* 8560CC 80243F5C 3C01437F */ lui $at, 0x437f +/* 8560D0 80243F60 4481C000 */ mtc1 $at, $f24 +/* 8560D4 80243F64 3C014F00 */ lui $at, 0x4f00 +/* 8560D8 80243F68 4481A000 */ mtc1 $at, $f20 +.L80243F6C: +/* 8560DC 80243F6C 44910000 */ mtc1 $s1, $f0 +/* 8560E0 80243F70 00000000 */ nop +/* 8560E4 80243F74 46800020 */ cvt.s.w $f0, $f0 +/* 8560E8 80243F78 44831000 */ mtc1 $v1, $f2 +/* 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 +/* 8560FC 80243F8C 3C018025 */ lui $at, 0x8025 +/* 856100 80243F90 C4242744 */ lwc1 $f4, 0x2744($at) +/* 856104 80243F94 8FA2001C */ lw $v0, 0x1c($sp) +/* 856108 80243F98 46002300 */ add.s $f12, $f4, $f0 +/* 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 +/* 85611C 80243FAC 45000003 */ bc1f .L80243FBC +/* 856120 80243FB0 2450000C */ addiu $s0, $v0, 0xc +/* 856124 80243FB4 46360001 */ sub.d $f0, $f0, $f22 +/* 856128 80243FB8 46200320 */ cvt.s.d $f12, $f0 +.L80243FBC: +/* 85612C 80243FBC 27A70024 */ addiu $a3, $sp, 0x24 +/* 856130 80243FC0 3C063F00 */ lui $a2, 0x3f00 +/* 856134 80243FC4 3C013F80 */ lui $at, 0x3f80 +/* 856138 80243FC8 44817000 */ mtc1 $at, $f14 +/* 85613C 80243FCC 27A20028 */ addiu $v0, $sp, 0x28 +/* 856140 80243FD0 AFA20010 */ sw $v0, 0x10($sp) +/* 856144 80243FD4 27A2002C */ addiu $v0, $sp, 0x2c +/* 856148 80243FD8 0C090F6C */ jal func_80243DB0_855F20 +/* 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 +/* 85615C 80243FEC 4600A03E */ c.le.s $f20, $f0 +/* 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 +/* 856170 80244000 44023000 */ mfc1 $v0, $f6 +/* 856174 80244004 08091008 */ j .L80244020 +/* 856178 80244008 A2020000 */ sb $v0, ($s0) +.L8024400C: +/* 85617C 8024400C 4600018D */ trunc.w.s $f6, $f0 +/* 856180 80244010 44023000 */ mfc1 $v0, $f6 +/* 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 +/* 85619C 8024402C 4600A03E */ c.le.s $f20, $f0 +/* 8561A0 80244030 00000000 */ nop +/* 8561A4 80244034 45010005 */ bc1t .L8024404C +/* 8561A8 80244038 26030001 */ addiu $v1, $s0, 1 +/* 8561AC 8024403C 4600018D */ trunc.w.s $f6, $f0 +/* 8561B0 80244040 44023000 */ mfc1 $v0, $f6 +/* 8561B4 80244044 08091019 */ j .L80244064 +/* 8561B8 80244048 A0620000 */ sb $v0, ($v1) +.L8024404C: +/* 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 +/* 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 +/* 8561E0 80244070 4600A03E */ c.le.s $f20, $f0 +/* 8561E4 80244074 00000000 */ nop +/* 8561E8 80244078 45010005 */ bc1t .L80244090 +/* 8561EC 8024407C 26020002 */ addiu $v0, $s0, 2 +/* 8561F0 80244080 4600018D */ trunc.w.s $f6, $f0 +/* 8561F4 80244084 44033000 */ mfc1 $v1, $f6 +/* 8561F8 80244088 0809102A */ j .L802440A8 +/* 8561FC 8024408C A0430000 */ sb $v1, ($v0) +.L80244090: +/* 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 +/* 856210 802440A0 00721825 */ or $v1, $v1, $s2 +/* 856214 802440A4 A0430000 */ sb $v1, ($v0) +.L802440A8: +/* 856218 802440A8 8FA30020 */ lw $v1, 0x20($sp) +/* 85621C 802440AC 26310001 */ addiu $s1, $s1, 1 +/* 856220 802440B0 0223102A */ slt $v0, $s1, $v1 +/* 856224 802440B4 1440FFAD */ bnez $v0, .L80243F6C +/* 856228 802440B8 00000000 */ nop +.L802440BC: +/* 85622C 802440BC 3C03800A */ lui $v1, 0x800a +/* 856230 802440C0 2463A66C */ addiu $v1, $v1, -0x5994 +/* 856234 802440C4 8C620000 */ lw $v0, ($v1) +/* 856238 802440C8 24040003 */ addiu $a0, $zero, 3 +/* 85623C 802440CC 0040802D */ daddu $s0, $v0, $zero +/* 856240 802440D0 24420008 */ addiu $v0, $v0, 8 +/* 856244 802440D4 AC620000 */ sw $v0, ($v1) +/* 856248 802440D8 3C02DE00 */ lui $v0, 0xde00 +/* 85624C 802440DC 0C0470BB */ jal func_8011C2EC +/* 856250 802440E0 AE020000 */ sw $v0, ($s0) +/* 856254 802440E4 3C038025 */ lui $v1, 0x8025 +/* 856258 802440E8 24632744 */ addiu $v1, $v1, 0x2744 +/* 85625C 802440EC C4600000 */ lwc1 $f0, ($v1) +/* 856260 802440F0 3C018025 */ lui $at, 0x8025 +/* 856264 802440F4 D42229C8 */ ldc1 $f2, 0x29c8($at) +/* 856268 802440F8 46000021 */ cvt.d.s $f0, $f0 +/* 85626C 802440FC 46220000 */ add.d $f0, $f0, $f2 +/* 856270 80244100 AE020004 */ sw $v0, 4($s0) +/* 856274 80244104 3C013FF0 */ lui $at, 0x3ff0 +/* 856278 80244108 44811800 */ mtc1 $at, $f3 +/* 85627C 8024410C 44801000 */ mtc1 $zero, $f2 +/* 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 +/* 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 +/* 8562A4 80244134 46002001 */ sub.s $f0, $f4, $f0 +/* 8562A8 80244138 E4600000 */ swc1 $f0, ($v1) +.L8024413C: +/* 8562AC 8024413C 8FBF003C */ lw $ra, 0x3c($sp) +/* 8562B0 80244140 8FB20038 */ lw $s2, 0x38($sp) +/* 8562B4 80244144 8FB10034 */ lw $s1, 0x34($sp) +/* 8562B8 80244148 8FB00030 */ lw $s0, 0x30($sp) +/* 8562BC 8024414C D7B80050 */ ldc1 $f24, 0x50($sp) +/* 8562C0 80244150 D7B60048 */ ldc1 $f22, 0x48($sp) +/* 8562C4 80244154 D7B40040 */ ldc1 $f20, 0x40($sp) +/* 8562C8 80244158 03E00008 */ jr $ra +/* 8562CC 8024415C 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0.s deleted file mode 100644 index 7608e2cb2e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C0 -/* 865000 802404C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 865004 802404C4 0080182D */ daddu $v1, $a0, $zero -/* 865008 802404C8 00A0202D */ daddu $a0, $a1, $zero -/* 86500C 802404CC 2402FFFF */ addiu $v0, $zero, -1 -/* 865010 802404D0 14820004 */ bne $a0, $v0, .L802404E4 -/* 865014 802404D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 865018 802404D8 8C64014C */ lw $a0, 0x14c($v1) -/* 86501C 802404DC 0809013E */ j .L802404F8 -/* 865020 802404E0 00000000 */ nop -.L802404E4: -/* 865024 802404E4 3C02EFE8 */ lui $v0, 0xefe8 -/* 865028 802404E8 34422080 */ ori $v0, $v0, 0x2080 -/* 86502C 802404EC 0082102A */ slt $v0, $a0, $v0 -/* 865030 802404F0 14400003 */ bnez $v0, .L80240500 -/* 865034 802404F4 0080102D */ daddu $v0, $a0, $zero -.L802404F8: -/* 865038 802404F8 0C00EAD2 */ jal get_npc_safe -/* 86503C 802404FC 00000000 */ nop -.L80240500: -/* 865040 80240500 8FBF0010 */ lw $ra, 0x10($sp) -/* 865044 80240504 03E00008 */ jr $ra -/* 865048 80240508 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s new file mode 100644 index 0000000000..871e7aa77f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802404C0_865000.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404C0_865000 +/* 865000 802404C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 865004 802404C4 0080182D */ daddu $v1, $a0, $zero +/* 865008 802404C8 00A0202D */ daddu $a0, $a1, $zero +/* 86500C 802404CC 2402FFFF */ addiu $v0, $zero, -1 +/* 865010 802404D0 14820004 */ bne $a0, $v0, .L802404E4 +/* 865014 802404D4 AFBF0010 */ sw $ra, 0x10($sp) +/* 865018 802404D8 8C64014C */ lw $a0, 0x14c($v1) +/* 86501C 802404DC 0809013E */ j .L802404F8 +/* 865020 802404E0 00000000 */ nop +.L802404E4: +/* 865024 802404E4 3C02EFE8 */ lui $v0, 0xefe8 +/* 865028 802404E8 34422080 */ ori $v0, $v0, 0x2080 +/* 86502C 802404EC 0082102A */ slt $v0, $a0, $v0 +/* 865030 802404F0 14400003 */ bnez $v0, .L80240500 +/* 865034 802404F4 0080102D */ daddu $v0, $a0, $zero +.L802404F8: +/* 865038 802404F8 0C00EAD2 */ jal get_npc_safe +/* 86503C 802404FC 00000000 */ nop +.L80240500: +/* 865040 80240500 8FBF0010 */ lw $ra, 0x10($sp) +/* 865044 80240504 03E00008 */ jr $ra +/* 865048 80240508 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C.s deleted file mode 100644 index 70f6e0607f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024050C -/* 86504C 8024050C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 865050 80240510 AFB10014 */ sw $s1, 0x14($sp) -/* 865054 80240514 0080882D */ daddu $s1, $a0, $zero -/* 865058 80240518 AFBF0024 */ sw $ra, 0x24($sp) -/* 86505C 8024051C AFB40020 */ sw $s4, 0x20($sp) -/* 865060 80240520 AFB3001C */ sw $s3, 0x1c($sp) -/* 865064 80240524 AFB20018 */ sw $s2, 0x18($sp) -/* 865068 80240528 AFB00010 */ sw $s0, 0x10($sp) -/* 86506C 8024052C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 865070 80240530 8E30000C */ lw $s0, 0xc($s1) -/* 865074 80240534 8E050000 */ lw $a1, ($s0) -/* 865078 80240538 0C0B1EAF */ jal get_variable -/* 86507C 8024053C 26100004 */ addiu $s0, $s0, 4 -/* 865080 80240540 8E120000 */ lw $s2, ($s0) -/* 865084 80240544 26100004 */ addiu $s0, $s0, 4 -/* 865088 80240548 0220202D */ daddu $a0, $s1, $zero -/* 86508C 8024054C 8E130000 */ lw $s3, ($s0) -/* 865090 80240550 8E140004 */ lw $s4, 4($s0) -/* 865094 80240554 0C090130 */ jal func_802404C0 -/* 865098 80240558 0040282D */ daddu $a1, $v0, $zero -/* 86509C 8024055C 0040802D */ daddu $s0, $v0, $zero -/* 8650A0 80240560 12000034 */ beqz $s0, .L80240634 -/* 8650A4 80240564 24020002 */ addiu $v0, $zero, 2 -/* 8650A8 80240568 3C038024 */ lui $v1, 0x8024 -/* 8650AC 8024056C 24631B60 */ addiu $v1, $v1, 0x1b60 -/* 8650B0 80240570 8C640000 */ lw $a0, ($v1) -/* 8650B4 80240574 24820004 */ addiu $v0, $a0, 4 -/* 8650B8 80240578 AC620000 */ sw $v0, ($v1) -/* 8650BC 8024057C 2C420168 */ sltiu $v0, $v0, 0x168 -/* 8650C0 80240580 14400004 */ bnez $v0, .L80240594 -/* 8650C4 80240584 3C0200B6 */ lui $v0, 0xb6 -/* 8650C8 80240588 2482FE9C */ addiu $v0, $a0, -0x164 -/* 8650CC 8024058C AC620000 */ sw $v0, ($v1) -/* 8650D0 80240590 3C0200B6 */ lui $v0, 0xb6 -.L80240594: -/* 8650D4 80240594 8E030028 */ lw $v1, 0x28($s0) -/* 8650D8 80240598 C614003C */ lwc1 $f20, 0x3c($s0) -/* 8650DC 8024059C 10620009 */ beq $v1, $v0, .L802405C4 -/* 8650E0 802405A0 34420004 */ ori $v0, $v0, 4 -/* 8650E4 802405A4 10620007 */ beq $v1, $v0, .L802405C4 -/* 8650E8 802405A8 3C0200B6 */ lui $v0, 0xb6 -/* 8650EC 802405AC 34420008 */ ori $v0, $v0, 8 -/* 8650F0 802405B0 10620004 */ beq $v1, $v0, .L802405C4 -/* 8650F4 802405B4 3C0200B6 */ lui $v0, 0xb6 -/* 8650F8 802405B8 3442000C */ ori $v0, $v0, 0xc -/* 8650FC 802405BC 14620011 */ bne $v1, $v0, .L80240604 -/* 865100 802405C0 0220202D */ daddu $a0, $s1, $zero -.L802405C4: -/* 865104 802405C4 3C028024 */ lui $v0, 0x8024 -/* 865108 802405C8 8C421B60 */ lw $v0, 0x1b60($v0) -/* 86510C 802405CC 44826000 */ mtc1 $v0, $f12 -/* 865110 802405D0 00000000 */ nop -/* 865114 802405D4 04410006 */ bgez $v0, .L802405F0 -/* 865118 802405D8 46806321 */ cvt.d.w $f12, $f12 -/* 86511C 802405DC 3C0141F0 */ lui $at, 0x41f0 -/* 865120 802405E0 44810800 */ mtc1 $at, $f1 -/* 865124 802405E4 44800000 */ mtc1 $zero, $f0 -/* 865128 802405E8 00000000 */ nop -/* 86512C 802405EC 46206300 */ add.d $f12, $f12, $f0 -.L802405F0: -/* 865130 802405F0 0C00A8BB */ jal sin_deg -/* 865134 802405F4 46206320 */ cvt.s.d $f12, $f12 -/* 865138 802405F8 46000000 */ add.s $f0, $f0, $f0 -/* 86513C 802405FC 4600A500 */ add.s $f20, $f20, $f0 -/* 865140 80240600 0220202D */ daddu $a0, $s1, $zero -.L80240604: -/* 865144 80240604 8E060038 */ lw $a2, 0x38($s0) -/* 865148 80240608 0C0B2190 */ jal set_float_variable -/* 86514C 8024060C 0240282D */ daddu $a1, $s2, $zero -/* 865150 80240610 0220202D */ daddu $a0, $s1, $zero -/* 865154 80240614 4406A000 */ mfc1 $a2, $f20 -/* 865158 80240618 0C0B2190 */ jal set_float_variable -/* 86515C 8024061C 0260282D */ daddu $a1, $s3, $zero -/* 865160 80240620 0220202D */ daddu $a0, $s1, $zero -/* 865164 80240624 8E060040 */ lw $a2, 0x40($s0) -/* 865168 80240628 0C0B2190 */ jal set_float_variable -/* 86516C 8024062C 0280282D */ daddu $a1, $s4, $zero -/* 865170 80240630 24020002 */ addiu $v0, $zero, 2 -.L80240634: -/* 865174 80240634 8FBF0024 */ lw $ra, 0x24($sp) -/* 865178 80240638 8FB40020 */ lw $s4, 0x20($sp) -/* 86517C 8024063C 8FB3001C */ lw $s3, 0x1c($sp) -/* 865180 80240640 8FB20018 */ lw $s2, 0x18($sp) -/* 865184 80240644 8FB10014 */ lw $s1, 0x14($sp) -/* 865188 80240648 8FB00010 */ lw $s0, 0x10($sp) -/* 86518C 8024064C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 865190 80240650 03E00008 */ jr $ra -/* 865194 80240654 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s new file mode 100644 index 0000000000..68d37c1aab --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_8024050C_86504C.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024050C_86504C +/* 86504C 8024050C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 865050 80240510 AFB10014 */ sw $s1, 0x14($sp) +/* 865054 80240514 0080882D */ daddu $s1, $a0, $zero +/* 865058 80240518 AFBF0024 */ sw $ra, 0x24($sp) +/* 86505C 8024051C AFB40020 */ sw $s4, 0x20($sp) +/* 865060 80240520 AFB3001C */ sw $s3, 0x1c($sp) +/* 865064 80240524 AFB20018 */ sw $s2, 0x18($sp) +/* 865068 80240528 AFB00010 */ sw $s0, 0x10($sp) +/* 86506C 8024052C F7B40028 */ sdc1 $f20, 0x28($sp) +/* 865070 80240530 8E30000C */ lw $s0, 0xc($s1) +/* 865074 80240534 8E050000 */ lw $a1, ($s0) +/* 865078 80240538 0C0B1EAF */ jal get_variable +/* 86507C 8024053C 26100004 */ addiu $s0, $s0, 4 +/* 865080 80240540 8E120000 */ lw $s2, ($s0) +/* 865084 80240544 26100004 */ addiu $s0, $s0, 4 +/* 865088 80240548 0220202D */ daddu $a0, $s1, $zero +/* 86508C 8024054C 8E130000 */ lw $s3, ($s0) +/* 865090 80240550 8E140004 */ lw $s4, 4($s0) +/* 865094 80240554 0C090130 */ jal func_802404C0_865000 +/* 865098 80240558 0040282D */ daddu $a1, $v0, $zero +/* 86509C 8024055C 0040802D */ daddu $s0, $v0, $zero +/* 8650A0 80240560 12000034 */ beqz $s0, .L80240634 +/* 8650A4 80240564 24020002 */ addiu $v0, $zero, 2 +/* 8650A8 80240568 3C038024 */ lui $v1, 0x8024 +/* 8650AC 8024056C 24631B60 */ addiu $v1, $v1, 0x1b60 +/* 8650B0 80240570 8C640000 */ lw $a0, ($v1) +/* 8650B4 80240574 24820004 */ addiu $v0, $a0, 4 +/* 8650B8 80240578 AC620000 */ sw $v0, ($v1) +/* 8650BC 8024057C 2C420168 */ sltiu $v0, $v0, 0x168 +/* 8650C0 80240580 14400004 */ bnez $v0, .L80240594 +/* 8650C4 80240584 3C0200B6 */ lui $v0, 0xb6 +/* 8650C8 80240588 2482FE9C */ addiu $v0, $a0, -0x164 +/* 8650CC 8024058C AC620000 */ sw $v0, ($v1) +/* 8650D0 80240590 3C0200B6 */ lui $v0, 0xb6 +.L80240594: +/* 8650D4 80240594 8E030028 */ lw $v1, 0x28($s0) +/* 8650D8 80240598 C614003C */ lwc1 $f20, 0x3c($s0) +/* 8650DC 8024059C 10620009 */ beq $v1, $v0, .L802405C4 +/* 8650E0 802405A0 34420004 */ ori $v0, $v0, 4 +/* 8650E4 802405A4 10620007 */ beq $v1, $v0, .L802405C4 +/* 8650E8 802405A8 3C0200B6 */ lui $v0, 0xb6 +/* 8650EC 802405AC 34420008 */ ori $v0, $v0, 8 +/* 8650F0 802405B0 10620004 */ beq $v1, $v0, .L802405C4 +/* 8650F4 802405B4 3C0200B6 */ lui $v0, 0xb6 +/* 8650F8 802405B8 3442000C */ ori $v0, $v0, 0xc +/* 8650FC 802405BC 14620011 */ bne $v1, $v0, .L80240604 +/* 865100 802405C0 0220202D */ daddu $a0, $s1, $zero +.L802405C4: +/* 865104 802405C4 3C028024 */ lui $v0, 0x8024 +/* 865108 802405C8 8C421B60 */ lw $v0, 0x1b60($v0) +/* 86510C 802405CC 44826000 */ mtc1 $v0, $f12 +/* 865110 802405D0 00000000 */ nop +/* 865114 802405D4 04410006 */ bgez $v0, .L802405F0 +/* 865118 802405D8 46806321 */ cvt.d.w $f12, $f12 +/* 86511C 802405DC 3C0141F0 */ lui $at, 0x41f0 +/* 865120 802405E0 44810800 */ mtc1 $at, $f1 +/* 865124 802405E4 44800000 */ mtc1 $zero, $f0 +/* 865128 802405E8 00000000 */ nop +/* 86512C 802405EC 46206300 */ add.d $f12, $f12, $f0 +.L802405F0: +/* 865130 802405F0 0C00A8BB */ jal sin_deg +/* 865134 802405F4 46206320 */ cvt.s.d $f12, $f12 +/* 865138 802405F8 46000000 */ add.s $f0, $f0, $f0 +/* 86513C 802405FC 4600A500 */ add.s $f20, $f20, $f0 +/* 865140 80240600 0220202D */ daddu $a0, $s1, $zero +.L80240604: +/* 865144 80240604 8E060038 */ lw $a2, 0x38($s0) +/* 865148 80240608 0C0B2190 */ jal set_float_variable +/* 86514C 8024060C 0240282D */ daddu $a1, $s2, $zero +/* 865150 80240610 0220202D */ daddu $a0, $s1, $zero +/* 865154 80240614 4406A000 */ mfc1 $a2, $f20 +/* 865158 80240618 0C0B2190 */ jal set_float_variable +/* 86515C 8024061C 0260282D */ daddu $a1, $s3, $zero +/* 865160 80240620 0220202D */ daddu $a0, $s1, $zero +/* 865164 80240624 8E060040 */ lw $a2, 0x40($s0) +/* 865168 80240628 0C0B2190 */ jal set_float_variable +/* 86516C 8024062C 0280282D */ daddu $a1, $s4, $zero +/* 865170 80240630 24020002 */ addiu $v0, $zero, 2 +.L80240634: +/* 865174 80240634 8FBF0024 */ lw $ra, 0x24($sp) +/* 865178 80240638 8FB40020 */ lw $s4, 0x20($sp) +/* 86517C 8024063C 8FB3001C */ lw $s3, 0x1c($sp) +/* 865180 80240640 8FB20018 */ lw $s2, 0x18($sp) +/* 865184 80240644 8FB10014 */ lw $s1, 0x14($sp) +/* 865188 80240648 8FB00010 */ lw $s0, 0x10($sp) +/* 86518C 8024064C D7B40028 */ ldc1 $f20, 0x28($sp) +/* 865190 80240650 03E00008 */ jr $ra +/* 865194 80240654 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658.s deleted file mode 100644 index 1ca9dbb0de..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240658 -/* 865198 80240658 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 86519C 8024065C AFB20018 */ sw $s2, 0x18($sp) -/* 8651A0 80240660 0080902D */ daddu $s2, $a0, $zero -/* 8651A4 80240664 AFB10014 */ sw $s1, 0x14($sp) -/* 8651A8 80240668 00A0882D */ daddu $s1, $a1, $zero -/* 8651AC 8024066C AFB7002C */ sw $s7, 0x2c($sp) -/* 8651B0 80240670 00C0B82D */ daddu $s7, $a2, $zero -/* 8651B4 80240674 AFB00010 */ sw $s0, 0x10($sp) -/* 8651B8 80240678 00E0802D */ daddu $s0, $a3, $zero -/* 8651BC 8024067C AFBF0030 */ sw $ra, 0x30($sp) -/* 8651C0 80240680 AFB60028 */ sw $s6, 0x28($sp) -/* 8651C4 80240684 AFB50024 */ sw $s5, 0x24($sp) -/* 8651C8 80240688 AFB40020 */ sw $s4, 0x20($sp) -/* 8651CC 8024068C AFB3001C */ sw $s3, 0x1c($sp) -/* 8651D0 80240690 F7BE0060 */ sdc1 $f30, 0x60($sp) -/* 8651D4 80240694 F7BC0058 */ sdc1 $f28, 0x58($sp) -/* 8651D8 80240698 F7BA0050 */ sdc1 $f26, 0x50($sp) -/* 8651DC 8024069C F7B80048 */ sdc1 $f24, 0x48($sp) -/* 8651E0 802406A0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8651E4 802406A4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8651E8 802406A8 8E160000 */ lw $s6, ($s0) -/* 8651EC 802406AC 0C00EAD2 */ jal get_npc_safe -/* 8651F0 802406B0 0000202D */ daddu $a0, $zero, $zero -/* 8651F4 802406B4 8C420028 */ lw $v0, 0x28($v0) -/* 8651F8 802406B8 3C03FF4A */ lui $v1, 0xff4a -/* 8651FC 802406BC 00431821 */ addu $v1, $v0, $v1 -/* 865200 802406C0 2C62000D */ sltiu $v0, $v1, 0xd -/* 865204 802406C4 1040000B */ beqz $v0, .L802406F4 -/* 865208 802406C8 00031080 */ sll $v0, $v1, 2 -/* 86520C 802406CC 3C018024 */ lui $at, 0x8024 -/* 865210 802406D0 00220821 */ addu $at, $at, $v0 -/* 865214 802406D4 8C224910 */ lw $v0, 0x4910($at) -/* 865218 802406D8 00400008 */ jr $v0 -/* 86521C 802406DC 00000000 */ nop -/* 865220 802406E0 8E020000 */ lw $v0, ($s0) -/* 865224 802406E4 04410003 */ bgez $v0, .L802406F4 -/* 865228 802406E8 00000000 */ nop -/* 86522C 802406EC 0000B02D */ daddu $s6, $zero, $zero -/* 865230 802406F0 AE000000 */ sw $zero, ($s0) -.L802406F4: -/* 865234 802406F4 1AE00065 */ blez $s7, .L8024088C -/* 865238 802406F8 0000A02D */ daddu $s4, $zero, $zero -/* 86523C 802406FC 0220982D */ daddu $s3, $s1, $zero -/* 865240 80240700 3C014220 */ lui $at, 0x4220 -/* 865244 80240704 4481F000 */ mtc1 $at, $f30 -/* 865248 80240708 3C014120 */ lui $at, 0x4120 -/* 86524C 8024070C 4481E000 */ mtc1 $at, $f28 -.L80240710: -/* 865250 80240710 86440000 */ lh $a0, ($s2) -/* 865254 80240714 2882001F */ slti $v0, $a0, 0x1f -/* 865258 80240718 54400058 */ bnel $v0, $zero, .L8024087C -/* 86525C 8024071C 26730010 */ addiu $s3, $s3, 0x10 -/* 865260 80240720 3C026666 */ lui $v0, 0x6666 -/* 865264 80240724 34426667 */ ori $v0, $v0, 0x6667 -/* 865268 80240728 2483FFE2 */ addiu $v1, $a0, -0x1e -/* 86526C 8024072C 00620018 */ mult $v1, $v0 -/* 865270 80240730 4480C000 */ mtc1 $zero, $f24 -/* 865274 80240734 0000802D */ daddu $s0, $zero, $zero -/* 865278 80240738 00031FC3 */ sra $v1, $v1, 0x1f -/* 86527C 8024073C 4600C686 */ mov.s $f26, $f24 -/* 865280 80240740 00004010 */ mfhi $t0 -/* 865284 80240744 00081083 */ sra $v0, $t0, 2 -/* 865288 80240748 00438823 */ subu $s1, $v0, $v1 -/* 86528C 8024074C 00111080 */ sll $v0, $s1, 2 -/* 865290 80240750 00511021 */ addu $v0, $v0, $s1 -/* 865294 80240754 00021040 */ sll $v0, $v0, 1 -/* 865298 80240758 2442001E */ addiu $v0, $v0, 0x1e -/* 86529C 8024075C 1A20001D */ blez $s1, .L802407D4 -/* 8652A0 80240760 0082A823 */ subu $s5, $a0, $v0 -.L80240764: -/* 8652A4 80240764 44966000 */ mtc1 $s6, $f12 -/* 8652A8 80240768 00000000 */ nop -/* 8652AC 8024076C 0C00A8BB */ jal sin_deg -/* 8652B0 80240770 46806320 */ cvt.s.w $f12, $f12 -/* 8652B4 80240774 44902000 */ mtc1 $s0, $f4 -/* 8652B8 80240778 00000000 */ nop -/* 8652BC 8024077C 46802120 */ cvt.s.w $f4, $f4 -/* 8652C0 80240780 461E2083 */ div.s $f2, $f4, $f30 -/* 8652C4 80240784 46001082 */ mul.s $f2, $f2, $f0 -/* 8652C8 80240788 00000000 */ nop -/* 8652CC 8024078C 3C014170 */ lui $at, 0x4170 -/* 8652D0 80240790 44813000 */ mtc1 $at, $f6 -/* 8652D4 80240794 00000000 */ nop -/* 8652D8 80240798 46062103 */ div.s $f4, $f4, $f6 -/* 8652DC 8024079C 46022580 */ add.s $f22, $f4, $f2 -/* 8652E0 802407A0 0C00A874 */ jal cos_rad -/* 8652E4 802407A4 4600B306 */ mov.s $f12, $f22 -/* 8652E8 802407A8 461C0002 */ mul.s $f0, $f0, $f28 -/* 8652EC 802407AC 00000000 */ nop -/* 8652F0 802407B0 4600D680 */ add.s $f26, $f26, $f0 -/* 8652F4 802407B4 0C00A85B */ jal sin_rad -/* 8652F8 802407B8 4600B306 */ mov.s $f12, $f22 -/* 8652FC 802407BC 461C0002 */ mul.s $f0, $f0, $f28 -/* 865300 802407C0 00000000 */ nop -/* 865304 802407C4 26100001 */ addiu $s0, $s0, 1 -/* 865308 802407C8 0211102A */ slt $v0, $s0, $s1 -/* 86530C 802407CC 1440FFE5 */ bnez $v0, .L80240764 -/* 865310 802407D0 4600C600 */ add.s $f24, $f24, $f0 -.L802407D4: -/* 865314 802407D4 44966000 */ mtc1 $s6, $f12 -/* 865318 802407D8 00000000 */ nop -/* 86531C 802407DC 0C00A8BB */ jal sin_deg -/* 865320 802407E0 46806320 */ cvt.s.w $f12, $f12 -/* 865324 802407E4 44902000 */ mtc1 $s0, $f4 -/* 865328 802407E8 00000000 */ nop -/* 86532C 802407EC 46802120 */ cvt.s.w $f4, $f4 -/* 865330 802407F0 461E2083 */ div.s $f2, $f4, $f30 -/* 865334 802407F4 46001082 */ mul.s $f2, $f2, $f0 -/* 865338 802407F8 00000000 */ nop -/* 86533C 802407FC 3C014170 */ lui $at, 0x4170 -/* 865340 80240800 44813000 */ mtc1 $at, $f6 -/* 865344 80240804 00000000 */ nop -/* 865348 80240808 46062103 */ div.s $f4, $f4, $f6 -/* 86534C 8024080C 46022580 */ add.s $f22, $f4, $f2 -/* 865350 80240810 0C00A874 */ jal cos_rad -/* 865354 80240814 4600B306 */ mov.s $f12, $f22 -/* 865358 80240818 4495A000 */ mtc1 $s5, $f20 -/* 86535C 8024081C 00000000 */ nop -/* 865360 80240820 4680A520 */ cvt.s.w $f20, $f20 -/* 865364 80240824 4600A002 */ mul.s $f0, $f20, $f0 -/* 865368 80240828 00000000 */ nop -/* 86536C 8024082C 4600D680 */ add.s $f26, $f26, $f0 -/* 865370 80240830 0C00A85B */ jal sin_rad -/* 865374 80240834 4600B306 */ mov.s $f12, $f22 -/* 865378 80240838 4600A502 */ mul.s $f20, $f20, $f0 -/* 86537C 8024083C 00000000 */ nop -/* 865380 80240840 4600D18D */ trunc.w.s $f6, $f26 -/* 865384 80240844 44023000 */ mfc1 $v0, $f6 -/* 865388 80240848 00000000 */ nop -/* 86538C 8024084C A6620000 */ sh $v0, ($s3) -/* 865390 80240850 86420002 */ lh $v0, 2($s2) -/* 865394 80240854 4614C600 */ add.s $f24, $f24, $f20 -/* 865398 80240858 44820000 */ mtc1 $v0, $f0 -/* 86539C 8024085C 00000000 */ nop -/* 8653A0 80240860 46800020 */ cvt.s.w $f0, $f0 -/* 8653A4 80240864 46180000 */ add.s $f0, $f0, $f24 -/* 8653A8 80240868 4600018D */ trunc.w.s $f6, $f0 -/* 8653AC 8024086C 44023000 */ mfc1 $v0, $f6 -/* 8653B0 80240870 00000000 */ nop -/* 8653B4 80240874 A6620002 */ sh $v0, 2($s3) -/* 8653B8 80240878 26730010 */ addiu $s3, $s3, 0x10 -.L8024087C: -/* 8653BC 8024087C 26940001 */ addiu $s4, $s4, 1 -/* 8653C0 80240880 0297102A */ slt $v0, $s4, $s7 -/* 8653C4 80240884 1440FFA2 */ bnez $v0, .L80240710 -/* 8653C8 80240888 26520010 */ addiu $s2, $s2, 0x10 -.L8024088C: -/* 8653CC 8024088C 8FBF0030 */ lw $ra, 0x30($sp) -/* 8653D0 80240890 8FB7002C */ lw $s7, 0x2c($sp) -/* 8653D4 80240894 8FB60028 */ lw $s6, 0x28($sp) -/* 8653D8 80240898 8FB50024 */ lw $s5, 0x24($sp) -/* 8653DC 8024089C 8FB40020 */ lw $s4, 0x20($sp) -/* 8653E0 802408A0 8FB3001C */ lw $s3, 0x1c($sp) -/* 8653E4 802408A4 8FB20018 */ lw $s2, 0x18($sp) -/* 8653E8 802408A8 8FB10014 */ lw $s1, 0x14($sp) -/* 8653EC 802408AC 8FB00010 */ lw $s0, 0x10($sp) -/* 8653F0 802408B0 D7BE0060 */ ldc1 $f30, 0x60($sp) -/* 8653F4 802408B4 D7BC0058 */ ldc1 $f28, 0x58($sp) -/* 8653F8 802408B8 D7BA0050 */ ldc1 $f26, 0x50($sp) -/* 8653FC 802408BC D7B80048 */ ldc1 $f24, 0x48($sp) -/* 865400 802408C0 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 865404 802408C4 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 865408 802408C8 03E00008 */ jr $ra -/* 86540C 802408CC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s new file mode 100644 index 0000000000..8ed973a8fe --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240658_865198.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240658_865198 +/* 865198 80240658 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 86519C 8024065C AFB20018 */ sw $s2, 0x18($sp) +/* 8651A0 80240660 0080902D */ daddu $s2, $a0, $zero +/* 8651A4 80240664 AFB10014 */ sw $s1, 0x14($sp) +/* 8651A8 80240668 00A0882D */ daddu $s1, $a1, $zero +/* 8651AC 8024066C AFB7002C */ sw $s7, 0x2c($sp) +/* 8651B0 80240670 00C0B82D */ daddu $s7, $a2, $zero +/* 8651B4 80240674 AFB00010 */ sw $s0, 0x10($sp) +/* 8651B8 80240678 00E0802D */ daddu $s0, $a3, $zero +/* 8651BC 8024067C AFBF0030 */ sw $ra, 0x30($sp) +/* 8651C0 80240680 AFB60028 */ sw $s6, 0x28($sp) +/* 8651C4 80240684 AFB50024 */ sw $s5, 0x24($sp) +/* 8651C8 80240688 AFB40020 */ sw $s4, 0x20($sp) +/* 8651CC 8024068C AFB3001C */ sw $s3, 0x1c($sp) +/* 8651D0 80240690 F7BE0060 */ sdc1 $f30, 0x60($sp) +/* 8651D4 80240694 F7BC0058 */ sdc1 $f28, 0x58($sp) +/* 8651D8 80240698 F7BA0050 */ sdc1 $f26, 0x50($sp) +/* 8651DC 8024069C F7B80048 */ sdc1 $f24, 0x48($sp) +/* 8651E0 802406A0 F7B60040 */ sdc1 $f22, 0x40($sp) +/* 8651E4 802406A4 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 8651E8 802406A8 8E160000 */ lw $s6, ($s0) +/* 8651EC 802406AC 0C00EAD2 */ jal get_npc_safe +/* 8651F0 802406B0 0000202D */ daddu $a0, $zero, $zero +/* 8651F4 802406B4 8C420028 */ lw $v0, 0x28($v0) +/* 8651F8 802406B8 3C03FF4A */ lui $v1, 0xff4a +/* 8651FC 802406BC 00431821 */ addu $v1, $v0, $v1 +/* 865200 802406C0 2C62000D */ sltiu $v0, $v1, 0xd +/* 865204 802406C4 1040000B */ beqz $v0, .L802406F4 +/* 865208 802406C8 00031080 */ sll $v0, $v1, 2 +/* 86520C 802406CC 3C018024 */ lui $at, 0x8024 +/* 865210 802406D0 00220821 */ addu $at, $at, $v0 +/* 865214 802406D4 8C224910 */ lw $v0, 0x4910($at) +/* 865218 802406D8 00400008 */ jr $v0 +/* 86521C 802406DC 00000000 */ nop +/* 865220 802406E0 8E020000 */ lw $v0, ($s0) +/* 865224 802406E4 04410003 */ bgez $v0, .L802406F4 +/* 865228 802406E8 00000000 */ nop +/* 86522C 802406EC 0000B02D */ daddu $s6, $zero, $zero +/* 865230 802406F0 AE000000 */ sw $zero, ($s0) +.L802406F4: +/* 865234 802406F4 1AE00065 */ blez $s7, .L8024088C +/* 865238 802406F8 0000A02D */ daddu $s4, $zero, $zero +/* 86523C 802406FC 0220982D */ daddu $s3, $s1, $zero +/* 865240 80240700 3C014220 */ lui $at, 0x4220 +/* 865244 80240704 4481F000 */ mtc1 $at, $f30 +/* 865248 80240708 3C014120 */ lui $at, 0x4120 +/* 86524C 8024070C 4481E000 */ mtc1 $at, $f28 +.L80240710: +/* 865250 80240710 86440000 */ lh $a0, ($s2) +/* 865254 80240714 2882001F */ slti $v0, $a0, 0x1f +/* 865258 80240718 54400058 */ bnel $v0, $zero, .L8024087C +/* 86525C 8024071C 26730010 */ addiu $s3, $s3, 0x10 +/* 865260 80240720 3C026666 */ lui $v0, 0x6666 +/* 865264 80240724 34426667 */ ori $v0, $v0, 0x6667 +/* 865268 80240728 2483FFE2 */ addiu $v1, $a0, -0x1e +/* 86526C 8024072C 00620018 */ mult $v1, $v0 +/* 865270 80240730 4480C000 */ mtc1 $zero, $f24 +/* 865274 80240734 0000802D */ daddu $s0, $zero, $zero +/* 865278 80240738 00031FC3 */ sra $v1, $v1, 0x1f +/* 86527C 8024073C 4600C686 */ mov.s $f26, $f24 +/* 865280 80240740 00004010 */ mfhi $t0 +/* 865284 80240744 00081083 */ sra $v0, $t0, 2 +/* 865288 80240748 00438823 */ subu $s1, $v0, $v1 +/* 86528C 8024074C 00111080 */ sll $v0, $s1, 2 +/* 865290 80240750 00511021 */ addu $v0, $v0, $s1 +/* 865294 80240754 00021040 */ sll $v0, $v0, 1 +/* 865298 80240758 2442001E */ addiu $v0, $v0, 0x1e +/* 86529C 8024075C 1A20001D */ blez $s1, .L802407D4 +/* 8652A0 80240760 0082A823 */ subu $s5, $a0, $v0 +.L80240764: +/* 8652A4 80240764 44966000 */ mtc1 $s6, $f12 +/* 8652A8 80240768 00000000 */ nop +/* 8652AC 8024076C 0C00A8BB */ jal sin_deg +/* 8652B0 80240770 46806320 */ cvt.s.w $f12, $f12 +/* 8652B4 80240774 44902000 */ mtc1 $s0, $f4 +/* 8652B8 80240778 00000000 */ nop +/* 8652BC 8024077C 46802120 */ cvt.s.w $f4, $f4 +/* 8652C0 80240780 461E2083 */ div.s $f2, $f4, $f30 +/* 8652C4 80240784 46001082 */ mul.s $f2, $f2, $f0 +/* 8652C8 80240788 00000000 */ nop +/* 8652CC 8024078C 3C014170 */ lui $at, 0x4170 +/* 8652D0 80240790 44813000 */ mtc1 $at, $f6 +/* 8652D4 80240794 00000000 */ nop +/* 8652D8 80240798 46062103 */ div.s $f4, $f4, $f6 +/* 8652DC 8024079C 46022580 */ add.s $f22, $f4, $f2 +/* 8652E0 802407A0 0C00A874 */ jal cos_rad +/* 8652E4 802407A4 4600B306 */ mov.s $f12, $f22 +/* 8652E8 802407A8 461C0002 */ mul.s $f0, $f0, $f28 +/* 8652EC 802407AC 00000000 */ nop +/* 8652F0 802407B0 4600D680 */ add.s $f26, $f26, $f0 +/* 8652F4 802407B4 0C00A85B */ jal sin_rad +/* 8652F8 802407B8 4600B306 */ mov.s $f12, $f22 +/* 8652FC 802407BC 461C0002 */ mul.s $f0, $f0, $f28 +/* 865300 802407C0 00000000 */ nop +/* 865304 802407C4 26100001 */ addiu $s0, $s0, 1 +/* 865308 802407C8 0211102A */ slt $v0, $s0, $s1 +/* 86530C 802407CC 1440FFE5 */ bnez $v0, .L80240764 +/* 865310 802407D0 4600C600 */ add.s $f24, $f24, $f0 +.L802407D4: +/* 865314 802407D4 44966000 */ mtc1 $s6, $f12 +/* 865318 802407D8 00000000 */ nop +/* 86531C 802407DC 0C00A8BB */ jal sin_deg +/* 865320 802407E0 46806320 */ cvt.s.w $f12, $f12 +/* 865324 802407E4 44902000 */ mtc1 $s0, $f4 +/* 865328 802407E8 00000000 */ nop +/* 86532C 802407EC 46802120 */ cvt.s.w $f4, $f4 +/* 865330 802407F0 461E2083 */ div.s $f2, $f4, $f30 +/* 865334 802407F4 46001082 */ mul.s $f2, $f2, $f0 +/* 865338 802407F8 00000000 */ nop +/* 86533C 802407FC 3C014170 */ lui $at, 0x4170 +/* 865340 80240800 44813000 */ mtc1 $at, $f6 +/* 865344 80240804 00000000 */ nop +/* 865348 80240808 46062103 */ div.s $f4, $f4, $f6 +/* 86534C 8024080C 46022580 */ add.s $f22, $f4, $f2 +/* 865350 80240810 0C00A874 */ jal cos_rad +/* 865354 80240814 4600B306 */ mov.s $f12, $f22 +/* 865358 80240818 4495A000 */ mtc1 $s5, $f20 +/* 86535C 8024081C 00000000 */ nop +/* 865360 80240820 4680A520 */ cvt.s.w $f20, $f20 +/* 865364 80240824 4600A002 */ mul.s $f0, $f20, $f0 +/* 865368 80240828 00000000 */ nop +/* 86536C 8024082C 4600D680 */ add.s $f26, $f26, $f0 +/* 865370 80240830 0C00A85B */ jal sin_rad +/* 865374 80240834 4600B306 */ mov.s $f12, $f22 +/* 865378 80240838 4600A502 */ mul.s $f20, $f20, $f0 +/* 86537C 8024083C 00000000 */ nop +/* 865380 80240840 4600D18D */ trunc.w.s $f6, $f26 +/* 865384 80240844 44023000 */ mfc1 $v0, $f6 +/* 865388 80240848 00000000 */ nop +/* 86538C 8024084C A6620000 */ sh $v0, ($s3) +/* 865390 80240850 86420002 */ lh $v0, 2($s2) +/* 865394 80240854 4614C600 */ add.s $f24, $f24, $f20 +/* 865398 80240858 44820000 */ mtc1 $v0, $f0 +/* 86539C 8024085C 00000000 */ nop +/* 8653A0 80240860 46800020 */ cvt.s.w $f0, $f0 +/* 8653A4 80240864 46180000 */ add.s $f0, $f0, $f24 +/* 8653A8 80240868 4600018D */ trunc.w.s $f6, $f0 +/* 8653AC 8024086C 44023000 */ mfc1 $v0, $f6 +/* 8653B0 80240870 00000000 */ nop +/* 8653B4 80240874 A6620002 */ sh $v0, 2($s3) +/* 8653B8 80240878 26730010 */ addiu $s3, $s3, 0x10 +.L8024087C: +/* 8653BC 8024087C 26940001 */ addiu $s4, $s4, 1 +/* 8653C0 80240880 0297102A */ slt $v0, $s4, $s7 +/* 8653C4 80240884 1440FFA2 */ bnez $v0, .L80240710 +/* 8653C8 80240888 26520010 */ addiu $s2, $s2, 0x10 +.L8024088C: +/* 8653CC 8024088C 8FBF0030 */ lw $ra, 0x30($sp) +/* 8653D0 80240890 8FB7002C */ lw $s7, 0x2c($sp) +/* 8653D4 80240894 8FB60028 */ lw $s6, 0x28($sp) +/* 8653D8 80240898 8FB50024 */ lw $s5, 0x24($sp) +/* 8653DC 8024089C 8FB40020 */ lw $s4, 0x20($sp) +/* 8653E0 802408A0 8FB3001C */ lw $s3, 0x1c($sp) +/* 8653E4 802408A4 8FB20018 */ lw $s2, 0x18($sp) +/* 8653E8 802408A8 8FB10014 */ lw $s1, 0x14($sp) +/* 8653EC 802408AC 8FB00010 */ lw $s0, 0x10($sp) +/* 8653F0 802408B0 D7BE0060 */ ldc1 $f30, 0x60($sp) +/* 8653F4 802408B4 D7BC0058 */ ldc1 $f28, 0x58($sp) +/* 8653F8 802408B8 D7BA0050 */ ldc1 $f26, 0x50($sp) +/* 8653FC 802408BC D7B80048 */ ldc1 $f24, 0x48($sp) +/* 865400 802408C0 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 865404 802408C4 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 865408 802408C8 03E00008 */ jr $ra +/* 86540C 802408CC 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0.s deleted file mode 100644 index bb85aabaa5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408D0 -/* 865410 802408D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 865414 802408D4 24040001 */ addiu $a0, $zero, 1 -/* 865418 802408D8 27A50010 */ addiu $a1, $sp, 0x10 -/* 86541C 802408DC 27A60014 */ addiu $a2, $sp, 0x14 -/* 865420 802408E0 27A70018 */ addiu $a3, $sp, 0x18 -/* 865424 802408E4 AFBF0028 */ sw $ra, 0x28($sp) -/* 865428 802408E8 AFB10024 */ sw $s1, 0x24($sp) -/* 86542C 802408EC 0C0470AC */ jal func_8011C2B0 -/* 865430 802408F0 AFB00020 */ sw $s0, 0x20($sp) -/* 865434 802408F4 3C118024 */ lui $s1, 0x8024 -/* 865438 802408F8 26311B64 */ addiu $s1, $s1, 0x1b64 -/* 86543C 802408FC 8FA40010 */ lw $a0, 0x10($sp) -/* 865440 80240900 8FA50014 */ lw $a1, 0x14($sp) -/* 865444 80240904 8FA60018 */ lw $a2, 0x18($sp) -/* 865448 80240908 0C090196 */ jal func_80240658 -/* 86544C 8024090C 0220382D */ daddu $a3, $s1, $zero -/* 865450 80240910 3C03800A */ lui $v1, 0x800a -/* 865454 80240914 2463A66C */ addiu $v1, $v1, -0x5994 -/* 865458 80240918 8C620000 */ lw $v0, ($v1) -/* 86545C 8024091C 24040001 */ addiu $a0, $zero, 1 -/* 865460 80240920 0040802D */ daddu $s0, $v0, $zero -/* 865464 80240924 24420008 */ addiu $v0, $v0, 8 -/* 865468 80240928 AC620000 */ sw $v0, ($v1) -/* 86546C 8024092C 3C02DE00 */ lui $v0, 0xde00 -/* 865470 80240930 0C0470BB */ jal func_8011C2EC -/* 865474 80240934 AE020000 */ sw $v0, ($s0) -/* 865478 80240938 8E230000 */ lw $v1, ($s1) -/* 86547C 8024093C 04600003 */ bltz $v1, .L8024094C -/* 865480 80240940 AE020004 */ sw $v0, 4($s0) -/* 865484 80240944 24620004 */ addiu $v0, $v1, 4 -/* 865488 80240948 AE220000 */ sw $v0, ($s1) -.L8024094C: -/* 86548C 8024094C 8E220000 */ lw $v0, ($s1) -/* 865490 80240950 28420168 */ slti $v0, $v0, 0x168 -/* 865494 80240954 14400002 */ bnez $v0, .L80240960 -/* 865498 80240958 2402FFFF */ addiu $v0, $zero, -1 -/* 86549C 8024095C AE220000 */ sw $v0, ($s1) -.L80240960: -/* 8654A0 80240960 8FBF0028 */ lw $ra, 0x28($sp) -/* 8654A4 80240964 8FB10024 */ lw $s1, 0x24($sp) -/* 8654A8 80240968 8FB00020 */ lw $s0, 0x20($sp) -/* 8654AC 8024096C 03E00008 */ jr $ra -/* 8654B0 80240970 27BD0030 */ addiu $sp, $sp, 0x30 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 new file mode 100644 index 0000000000..fc696806de --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_802408D0_865410.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408D0_865410 +/* 865410 802408D0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 865414 802408D4 24040001 */ addiu $a0, $zero, 1 +/* 865418 802408D8 27A50010 */ addiu $a1, $sp, 0x10 +/* 86541C 802408DC 27A60014 */ addiu $a2, $sp, 0x14 +/* 865420 802408E0 27A70018 */ addiu $a3, $sp, 0x18 +/* 865424 802408E4 AFBF0028 */ sw $ra, 0x28($sp) +/* 865428 802408E8 AFB10024 */ sw $s1, 0x24($sp) +/* 86542C 802408EC 0C0470AC */ jal func_8011C2B0 +/* 865430 802408F0 AFB00020 */ sw $s0, 0x20($sp) +/* 865434 802408F4 3C118024 */ lui $s1, 0x8024 +/* 865438 802408F8 26311B64 */ addiu $s1, $s1, 0x1b64 +/* 86543C 802408FC 8FA40010 */ lw $a0, 0x10($sp) +/* 865440 80240900 8FA50014 */ lw $a1, 0x14($sp) +/* 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, 0x800a +/* 865454 80240914 2463A66C */ addiu $v1, $v1, -0x5994 +/* 865458 80240918 8C620000 */ lw $v0, ($v1) +/* 86545C 8024091C 24040001 */ addiu $a0, $zero, 1 +/* 865460 80240920 0040802D */ daddu $s0, $v0, $zero +/* 865464 80240924 24420008 */ addiu $v0, $v0, 8 +/* 865468 80240928 AC620000 */ sw $v0, ($v1) +/* 86546C 8024092C 3C02DE00 */ lui $v0, 0xde00 +/* 865470 80240930 0C0470BB */ jal func_8011C2EC +/* 865474 80240934 AE020000 */ sw $v0, ($s0) +/* 865478 80240938 8E230000 */ lw $v1, ($s1) +/* 86547C 8024093C 04600003 */ bltz $v1, .L8024094C +/* 865480 80240940 AE020004 */ sw $v0, 4($s0) +/* 865484 80240944 24620004 */ addiu $v0, $v1, 4 +/* 865488 80240948 AE220000 */ sw $v0, ($s1) +.L8024094C: +/* 86548C 8024094C 8E220000 */ lw $v0, ($s1) +/* 865490 80240950 28420168 */ slti $v0, $v0, 0x168 +/* 865494 80240954 14400002 */ bnez $v0, .L80240960 +/* 865498 80240958 2402FFFF */ addiu $v0, $zero, -1 +/* 86549C 8024095C AE220000 */ sw $v0, ($s1) +.L80240960: +/* 8654A0 80240960 8FBF0028 */ lw $ra, 0x28($sp) +/* 8654A4 80240964 8FB10024 */ lw $s1, 0x24($sp) +/* 8654A8 80240968 8FB00020 */ lw $s0, 0x20($sp) +/* 8654AC 8024096C 03E00008 */ jr $ra +/* 8654B0 80240970 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974.s deleted file mode 100644 index 4ef03c69e9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240974 -/* 8654B4 80240974 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8654B8 80240978 24040002 */ addiu $a0, $zero, 2 -/* 8654BC 8024097C 27A50010 */ addiu $a1, $sp, 0x10 -/* 8654C0 80240980 27A60014 */ addiu $a2, $sp, 0x14 -/* 8654C4 80240984 27A70018 */ addiu $a3, $sp, 0x18 -/* 8654C8 80240988 AFBF0028 */ sw $ra, 0x28($sp) -/* 8654CC 8024098C AFB10024 */ sw $s1, 0x24($sp) -/* 8654D0 80240990 0C0470AC */ jal func_8011C2B0 -/* 8654D4 80240994 AFB00020 */ sw $s0, 0x20($sp) -/* 8654D8 80240998 3C118024 */ lui $s1, 0x8024 -/* 8654DC 8024099C 26311B68 */ addiu $s1, $s1, 0x1b68 -/* 8654E0 802409A0 8FA40010 */ lw $a0, 0x10($sp) -/* 8654E4 802409A4 8FA50014 */ lw $a1, 0x14($sp) -/* 8654E8 802409A8 8FA60018 */ lw $a2, 0x18($sp) -/* 8654EC 802409AC 0C090196 */ jal func_80240658 -/* 8654F0 802409B0 0220382D */ daddu $a3, $s1, $zero -/* 8654F4 802409B4 3C03800A */ lui $v1, 0x800a -/* 8654F8 802409B8 2463A66C */ addiu $v1, $v1, -0x5994 -/* 8654FC 802409BC 8C620000 */ lw $v0, ($v1) -/* 865500 802409C0 24040002 */ addiu $a0, $zero, 2 -/* 865504 802409C4 0040802D */ daddu $s0, $v0, $zero -/* 865508 802409C8 24420008 */ addiu $v0, $v0, 8 -/* 86550C 802409CC AC620000 */ sw $v0, ($v1) -/* 865510 802409D0 3C02DE00 */ lui $v0, 0xde00 -/* 865514 802409D4 0C0470BB */ jal func_8011C2EC -/* 865518 802409D8 AE020000 */ sw $v0, ($s0) -/* 86551C 802409DC 8E230000 */ lw $v1, ($s1) -/* 865520 802409E0 04600003 */ bltz $v1, .L802409F0 -/* 865524 802409E4 AE020004 */ sw $v0, 4($s0) -/* 865528 802409E8 24620004 */ addiu $v0, $v1, 4 -/* 86552C 802409EC AE220000 */ sw $v0, ($s1) -.L802409F0: -/* 865530 802409F0 8E220000 */ lw $v0, ($s1) -/* 865534 802409F4 28420168 */ slti $v0, $v0, 0x168 -/* 865538 802409F8 14400002 */ bnez $v0, .L80240A04 -/* 86553C 802409FC 2402FFFF */ addiu $v0, $zero, -1 -/* 865540 80240A00 AE220000 */ sw $v0, ($s1) -.L80240A04: -/* 865544 80240A04 8FBF0028 */ lw $ra, 0x28($sp) -/* 865548 80240A08 8FB10024 */ lw $s1, 0x24($sp) -/* 86554C 80240A0C 8FB00020 */ lw $s0, 0x20($sp) -/* 865550 80240A10 03E00008 */ jr $ra -/* 865554 80240A14 27BD0030 */ addiu $sp, $sp, 0x30 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 new file mode 100644 index 0000000000..da4edfbdb6 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240974_8654B4.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240974_8654B4 +/* 8654B4 80240974 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8654B8 80240978 24040002 */ addiu $a0, $zero, 2 +/* 8654BC 8024097C 27A50010 */ addiu $a1, $sp, 0x10 +/* 8654C0 80240980 27A60014 */ addiu $a2, $sp, 0x14 +/* 8654C4 80240984 27A70018 */ addiu $a3, $sp, 0x18 +/* 8654C8 80240988 AFBF0028 */ sw $ra, 0x28($sp) +/* 8654CC 8024098C AFB10024 */ sw $s1, 0x24($sp) +/* 8654D0 80240990 0C0470AC */ jal func_8011C2B0 +/* 8654D4 80240994 AFB00020 */ sw $s0, 0x20($sp) +/* 8654D8 80240998 3C118024 */ lui $s1, 0x8024 +/* 8654DC 8024099C 26311B68 */ addiu $s1, $s1, 0x1b68 +/* 8654E0 802409A0 8FA40010 */ lw $a0, 0x10($sp) +/* 8654E4 802409A4 8FA50014 */ lw $a1, 0x14($sp) +/* 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, 0x800a +/* 8654F8 802409B8 2463A66C */ addiu $v1, $v1, -0x5994 +/* 8654FC 802409BC 8C620000 */ lw $v0, ($v1) +/* 865500 802409C0 24040002 */ addiu $a0, $zero, 2 +/* 865504 802409C4 0040802D */ daddu $s0, $v0, $zero +/* 865508 802409C8 24420008 */ addiu $v0, $v0, 8 +/* 86550C 802409CC AC620000 */ sw $v0, ($v1) +/* 865510 802409D0 3C02DE00 */ lui $v0, 0xde00 +/* 865514 802409D4 0C0470BB */ jal func_8011C2EC +/* 865518 802409D8 AE020000 */ sw $v0, ($s0) +/* 86551C 802409DC 8E230000 */ lw $v1, ($s1) +/* 865520 802409E0 04600003 */ bltz $v1, .L802409F0 +/* 865524 802409E4 AE020004 */ sw $v0, 4($s0) +/* 865528 802409E8 24620004 */ addiu $v0, $v1, 4 +/* 86552C 802409EC AE220000 */ sw $v0, ($s1) +.L802409F0: +/* 865530 802409F0 8E220000 */ lw $v0, ($s1) +/* 865534 802409F4 28420168 */ slti $v0, $v0, 0x168 +/* 865538 802409F8 14400002 */ bnez $v0, .L80240A04 +/* 86553C 802409FC 2402FFFF */ addiu $v0, $zero, -1 +/* 865540 80240A00 AE220000 */ sw $v0, ($s1) +.L80240A04: +/* 865544 80240A04 8FBF0028 */ lw $ra, 0x28($sp) +/* 865548 80240A08 8FB10024 */ lw $s1, 0x24($sp) +/* 86554C 80240A0C 8FB00020 */ lw $s0, 0x20($sp) +/* 865550 80240A10 03E00008 */ jr $ra +/* 865554 80240A14 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18.s deleted file mode 100644 index 22906522c4..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A18 -/* 865558 80240A18 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 86555C 80240A1C AFB20018 */ sw $s2, 0x18($sp) -/* 865560 80240A20 0080902D */ daddu $s2, $a0, $zero -/* 865564 80240A24 AFBF0028 */ sw $ra, 0x28($sp) -/* 865568 80240A28 AFB50024 */ sw $s5, 0x24($sp) -/* 86556C 80240A2C AFB40020 */ sw $s4, 0x20($sp) -/* 865570 80240A30 AFB3001C */ sw $s3, 0x1c($sp) -/* 865574 80240A34 AFB10014 */ sw $s1, 0x14($sp) -/* 865578 80240A38 AFB00010 */ sw $s0, 0x10($sp) -/* 86557C 80240A3C F7B80040 */ sdc1 $f24, 0x40($sp) -/* 865580 80240A40 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 865584 80240A44 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 865588 80240A48 8E50000C */ lw $s0, 0xc($s2) -/* 86558C 80240A4C 8E140000 */ lw $s4, ($s0) -/* 865590 80240A50 26100004 */ addiu $s0, $s0, 4 -/* 865594 80240A54 0C0B1EAF */ jal get_variable -/* 865598 80240A58 0280282D */ daddu $a1, $s4, $zero -/* 86559C 80240A5C 0040982D */ daddu $s3, $v0, $zero -/* 8655A0 80240A60 8E150000 */ lw $s5, ($s0) -/* 8655A4 80240A64 26100004 */ addiu $s0, $s0, 4 -/* 8655A8 80240A68 8E050000 */ lw $a1, ($s0) -/* 8655AC 80240A6C 26100004 */ addiu $s0, $s0, 4 -/* 8655B0 80240A70 0C0B210B */ jal get_float_variable -/* 8655B4 80240A74 0240202D */ daddu $a0, $s2, $zero -/* 8655B8 80240A78 8E050000 */ lw $a1, ($s0) -/* 8655BC 80240A7C 26100004 */ addiu $s0, $s0, 4 -/* 8655C0 80240A80 0240202D */ daddu $a0, $s2, $zero -/* 8655C4 80240A84 0C0B210B */ jal get_float_variable -/* 8655C8 80240A88 46000606 */ mov.s $f24, $f0 -/* 8655CC 80240A8C 8E050000 */ lw $a1, ($s0) -/* 8655D0 80240A90 26100004 */ addiu $s0, $s0, 4 -/* 8655D4 80240A94 0240202D */ daddu $a0, $s2, $zero -/* 8655D8 80240A98 0C0B1EAF */ jal get_variable -/* 8655DC 80240A9C 46000506 */ mov.s $f20, $f0 -/* 8655E0 80240AA0 8E050000 */ lw $a1, ($s0) -/* 8655E4 80240AA4 26100004 */ addiu $s0, $s0, 4 -/* 8655E8 80240AA8 0240202D */ daddu $a0, $s2, $zero -/* 8655EC 80240AAC 0C0B1EAF */ jal get_variable -/* 8655F0 80240AB0 0040882D */ daddu $s1, $v0, $zero -/* 8655F4 80240AB4 0240202D */ daddu $a0, $s2, $zero -/* 8655F8 80240AB8 8E050000 */ lw $a1, ($s0) -/* 8655FC 80240ABC 0C0B210B */ jal get_float_variable -/* 865600 80240AC0 0040802D */ daddu $s0, $v0, $zero -/* 865604 80240AC4 4618A501 */ sub.s $f20, $f20, $f24 -/* 865608 80240AC8 3C013F00 */ lui $at, 0x3f00 -/* 86560C 80240ACC 44811000 */ mtc1 $at, $f2 -/* 865610 80240AD0 00000000 */ nop -/* 865614 80240AD4 4602A502 */ mul.s $f20, $f20, $f2 -/* 865618 80240AD8 00000000 */ nop -/* 86561C 80240ADC 12000008 */ beqz $s0, .L80240B00 -/* 865620 80240AE0 46000586 */ mov.s $f22, $f0 -/* 865624 80240AE4 0233102A */ slt $v0, $s1, $s3 -/* 865628 80240AE8 10400005 */ beqz $v0, .L80240B00 -/* 86562C 80240AEC 0240202D */ daddu $a0, $s2, $zero -/* 865630 80240AF0 0220982D */ daddu $s3, $s1, $zero -/* 865634 80240AF4 0280282D */ daddu $a1, $s4, $zero -/* 865638 80240AF8 0C0B2026 */ jal set_variable -/* 86563C 80240AFC 0220302D */ daddu $a2, $s1, $zero -.L80240B00: -/* 865640 80240B00 3C014334 */ lui $at, 0x4334 -/* 865644 80240B04 44810000 */ mtc1 $at, $f0 -/* 865648 80240B08 44936000 */ mtc1 $s3, $f12 -/* 86564C 80240B0C 00000000 */ nop -/* 865650 80240B10 46806320 */ cvt.s.w $f12, $f12 -/* 865654 80240B14 46006302 */ mul.s $f12, $f12, $f0 -/* 865658 80240B18 00000000 */ nop -/* 86565C 80240B1C 44910000 */ mtc1 $s1, $f0 -/* 865660 80240B20 00000000 */ nop -/* 865664 80240B24 46800020 */ cvt.s.w $f0, $f0 -/* 865668 80240B28 46006303 */ div.s $f12, $f12, $f0 -/* 86566C 80240B2C 0C00A8D4 */ jal cos_deg -/* 865670 80240B30 46166300 */ add.s $f12, $f12, $f22 -/* 865674 80240B34 4600A002 */ mul.s $f0, $f20, $f0 -/* 865678 80240B38 00000000 */ nop -/* 86567C 80240B3C 4614C080 */ add.s $f2, $f24, $f20 -/* 865680 80240B40 46001081 */ sub.s $f2, $f2, $f0 -/* 865684 80240B44 0240202D */ daddu $a0, $s2, $zero -/* 865688 80240B48 44061000 */ mfc1 $a2, $f2 -/* 86568C 80240B4C 0C0B2190 */ jal set_float_variable -/* 865690 80240B50 02A0282D */ daddu $a1, $s5, $zero -/* 865694 80240B54 8FBF0028 */ lw $ra, 0x28($sp) -/* 865698 80240B58 8FB50024 */ lw $s5, 0x24($sp) -/* 86569C 80240B5C 8FB40020 */ lw $s4, 0x20($sp) -/* 8656A0 80240B60 8FB3001C */ lw $s3, 0x1c($sp) -/* 8656A4 80240B64 8FB20018 */ lw $s2, 0x18($sp) -/* 8656A8 80240B68 8FB10014 */ lw $s1, 0x14($sp) -/* 8656AC 80240B6C 8FB00010 */ lw $s0, 0x10($sp) -/* 8656B0 80240B70 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 8656B4 80240B74 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 8656B8 80240B78 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 8656BC 80240B7C 24020002 */ addiu $v0, $zero, 2 -/* 8656C0 80240B80 03E00008 */ jr $ra -/* 8656C4 80240B84 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s new file mode 100644 index 0000000000..1f6f733be9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240A18_865558.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A18_865558 +/* 865558 80240A18 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 86555C 80240A1C AFB20018 */ sw $s2, 0x18($sp) +/* 865560 80240A20 0080902D */ daddu $s2, $a0, $zero +/* 865564 80240A24 AFBF0028 */ sw $ra, 0x28($sp) +/* 865568 80240A28 AFB50024 */ sw $s5, 0x24($sp) +/* 86556C 80240A2C AFB40020 */ sw $s4, 0x20($sp) +/* 865570 80240A30 AFB3001C */ sw $s3, 0x1c($sp) +/* 865574 80240A34 AFB10014 */ sw $s1, 0x14($sp) +/* 865578 80240A38 AFB00010 */ sw $s0, 0x10($sp) +/* 86557C 80240A3C F7B80040 */ sdc1 $f24, 0x40($sp) +/* 865580 80240A40 F7B60038 */ sdc1 $f22, 0x38($sp) +/* 865584 80240A44 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 865588 80240A48 8E50000C */ lw $s0, 0xc($s2) +/* 86558C 80240A4C 8E140000 */ lw $s4, ($s0) +/* 865590 80240A50 26100004 */ addiu $s0, $s0, 4 +/* 865594 80240A54 0C0B1EAF */ jal get_variable +/* 865598 80240A58 0280282D */ daddu $a1, $s4, $zero +/* 86559C 80240A5C 0040982D */ daddu $s3, $v0, $zero +/* 8655A0 80240A60 8E150000 */ lw $s5, ($s0) +/* 8655A4 80240A64 26100004 */ addiu $s0, $s0, 4 +/* 8655A8 80240A68 8E050000 */ lw $a1, ($s0) +/* 8655AC 80240A6C 26100004 */ addiu $s0, $s0, 4 +/* 8655B0 80240A70 0C0B210B */ jal get_float_variable +/* 8655B4 80240A74 0240202D */ daddu $a0, $s2, $zero +/* 8655B8 80240A78 8E050000 */ lw $a1, ($s0) +/* 8655BC 80240A7C 26100004 */ addiu $s0, $s0, 4 +/* 8655C0 80240A80 0240202D */ daddu $a0, $s2, $zero +/* 8655C4 80240A84 0C0B210B */ jal get_float_variable +/* 8655C8 80240A88 46000606 */ mov.s $f24, $f0 +/* 8655CC 80240A8C 8E050000 */ lw $a1, ($s0) +/* 8655D0 80240A90 26100004 */ addiu $s0, $s0, 4 +/* 8655D4 80240A94 0240202D */ daddu $a0, $s2, $zero +/* 8655D8 80240A98 0C0B1EAF */ jal get_variable +/* 8655DC 80240A9C 46000506 */ mov.s $f20, $f0 +/* 8655E0 80240AA0 8E050000 */ lw $a1, ($s0) +/* 8655E4 80240AA4 26100004 */ addiu $s0, $s0, 4 +/* 8655E8 80240AA8 0240202D */ daddu $a0, $s2, $zero +/* 8655EC 80240AAC 0C0B1EAF */ jal get_variable +/* 8655F0 80240AB0 0040882D */ daddu $s1, $v0, $zero +/* 8655F4 80240AB4 0240202D */ daddu $a0, $s2, $zero +/* 8655F8 80240AB8 8E050000 */ lw $a1, ($s0) +/* 8655FC 80240ABC 0C0B210B */ jal get_float_variable +/* 865600 80240AC0 0040802D */ daddu $s0, $v0, $zero +/* 865604 80240AC4 4618A501 */ sub.s $f20, $f20, $f24 +/* 865608 80240AC8 3C013F00 */ lui $at, 0x3f00 +/* 86560C 80240ACC 44811000 */ mtc1 $at, $f2 +/* 865610 80240AD0 00000000 */ nop +/* 865614 80240AD4 4602A502 */ mul.s $f20, $f20, $f2 +/* 865618 80240AD8 00000000 */ nop +/* 86561C 80240ADC 12000008 */ beqz $s0, .L80240B00 +/* 865620 80240AE0 46000586 */ mov.s $f22, $f0 +/* 865624 80240AE4 0233102A */ slt $v0, $s1, $s3 +/* 865628 80240AE8 10400005 */ beqz $v0, .L80240B00 +/* 86562C 80240AEC 0240202D */ daddu $a0, $s2, $zero +/* 865630 80240AF0 0220982D */ daddu $s3, $s1, $zero +/* 865634 80240AF4 0280282D */ daddu $a1, $s4, $zero +/* 865638 80240AF8 0C0B2026 */ jal set_variable +/* 86563C 80240AFC 0220302D */ daddu $a2, $s1, $zero +.L80240B00: +/* 865640 80240B00 3C014334 */ lui $at, 0x4334 +/* 865644 80240B04 44810000 */ mtc1 $at, $f0 +/* 865648 80240B08 44936000 */ mtc1 $s3, $f12 +/* 86564C 80240B0C 00000000 */ nop +/* 865650 80240B10 46806320 */ cvt.s.w $f12, $f12 +/* 865654 80240B14 46006302 */ mul.s $f12, $f12, $f0 +/* 865658 80240B18 00000000 */ nop +/* 86565C 80240B1C 44910000 */ mtc1 $s1, $f0 +/* 865660 80240B20 00000000 */ nop +/* 865664 80240B24 46800020 */ cvt.s.w $f0, $f0 +/* 865668 80240B28 46006303 */ div.s $f12, $f12, $f0 +/* 86566C 80240B2C 0C00A8D4 */ jal cos_deg +/* 865670 80240B30 46166300 */ add.s $f12, $f12, $f22 +/* 865674 80240B34 4600A002 */ mul.s $f0, $f20, $f0 +/* 865678 80240B38 00000000 */ nop +/* 86567C 80240B3C 4614C080 */ add.s $f2, $f24, $f20 +/* 865680 80240B40 46001081 */ sub.s $f2, $f2, $f0 +/* 865684 80240B44 0240202D */ daddu $a0, $s2, $zero +/* 865688 80240B48 44061000 */ mfc1 $a2, $f2 +/* 86568C 80240B4C 0C0B2190 */ jal set_float_variable +/* 865690 80240B50 02A0282D */ daddu $a1, $s5, $zero +/* 865694 80240B54 8FBF0028 */ lw $ra, 0x28($sp) +/* 865698 80240B58 8FB50024 */ lw $s5, 0x24($sp) +/* 86569C 80240B5C 8FB40020 */ lw $s4, 0x20($sp) +/* 8656A0 80240B60 8FB3001C */ lw $s3, 0x1c($sp) +/* 8656A4 80240B64 8FB20018 */ lw $s2, 0x18($sp) +/* 8656A8 80240B68 8FB10014 */ lw $s1, 0x14($sp) +/* 8656AC 80240B6C 8FB00010 */ lw $s0, 0x10($sp) +/* 8656B0 80240B70 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 8656B4 80240B74 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 8656B8 80240B78 D7B40030 */ ldc1 $f20, 0x30($sp) +/* 8656BC 80240B7C 24020002 */ addiu $v0, $zero, 2 +/* 8656C0 80240B80 03E00008 */ jr $ra +/* 8656C4 80240B84 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88.s deleted file mode 100644 index 0cff3b4976..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B88 -/* 8656C8 80240B88 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8656CC 80240B8C AFB10014 */ sw $s1, 0x14($sp) -/* 8656D0 80240B90 0080882D */ daddu $s1, $a0, $zero -/* 8656D4 80240B94 AFBF0018 */ sw $ra, 0x18($sp) -/* 8656D8 80240B98 AFB00010 */ sw $s0, 0x10($sp) -/* 8656DC 80240B9C F7B80030 */ sdc1 $f24, 0x30($sp) -/* 8656E0 80240BA0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8656E4 80240BA4 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8656E8 80240BA8 0C00EAD2 */ jal get_npc_safe -/* 8656EC 80240BAC 0000202D */ daddu $a0, $zero, $zero -/* 8656F0 80240BB0 0040802D */ daddu $s0, $v0, $zero -/* 8656F4 80240BB4 C614000C */ lwc1 $f20, 0xc($s0) -/* 8656F8 80240BB8 3C01428C */ lui $at, 0x428c -/* 8656FC 80240BBC 4481C000 */ mtc1 $at, $f24 -/* 865700 80240BC0 4600A507 */ neg.s $f20, $f20 -/* 865704 80240BC4 0C00A8BB */ jal sin_deg -/* 865708 80240BC8 4600A306 */ mov.s $f12, $f20 -/* 86570C 80240BCC 46180002 */ mul.s $f0, $f0, $f24 -/* 865710 80240BD0 00000000 */ nop -/* 865714 80240BD4 C6160038 */ lwc1 $f22, 0x38($s0) -/* 865718 80240BD8 3C0141F0 */ lui $at, 0x41f0 -/* 86571C 80240BDC 44811000 */ mtc1 $at, $f2 -/* 865720 80240BE0 00000000 */ nop -/* 865724 80240BE4 4602B580 */ add.s $f22, $f22, $f2 -/* 865728 80240BE8 4600A306 */ mov.s $f12, $f20 -/* 86572C 80240BEC 0C00A8D4 */ jal cos_deg -/* 865730 80240BF0 4600B580 */ add.s $f22, $f22, $f0 -/* 865734 80240BF4 0220202D */ daddu $a0, $s1, $zero -/* 865738 80240BF8 46180002 */ mul.s $f0, $f0, $f24 -/* 86573C 80240BFC 00000000 */ nop -/* 865740 80240C00 3C05FE36 */ lui $a1, 0xfe36 -/* 865744 80240C04 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 865748 80240C08 C6180040 */ lwc1 $f24, 0x40($s0) -/* 86574C 80240C0C C614003C */ lwc1 $f20, 0x3c($s0) -/* 865750 80240C10 4600C600 */ add.s $f24, $f24, $f0 -/* 865754 80240C14 3C014248 */ lui $at, 0x4248 -/* 865758 80240C18 44810000 */ mtc1 $at, $f0 -/* 86575C 80240C1C 4406B000 */ mfc1 $a2, $f22 -/* 865760 80240C20 0C0B2190 */ jal set_float_variable -/* 865764 80240C24 4600A500 */ add.s $f20, $f20, $f0 -/* 865768 80240C28 0220202D */ daddu $a0, $s1, $zero -/* 86576C 80240C2C 3C05FE36 */ lui $a1, 0xfe36 -/* 865770 80240C30 4406A000 */ mfc1 $a2, $f20 -/* 865774 80240C34 0C0B2190 */ jal set_float_variable -/* 865778 80240C38 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 86577C 80240C3C 0220202D */ daddu $a0, $s1, $zero -/* 865780 80240C40 3C05FE36 */ lui $a1, 0xfe36 -/* 865784 80240C44 4406C000 */ mfc1 $a2, $f24 -/* 865788 80240C48 0C0B2190 */ jal set_float_variable -/* 86578C 80240C4C 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 865790 80240C50 8FBF0018 */ lw $ra, 0x18($sp) -/* 865794 80240C54 8FB10014 */ lw $s1, 0x14($sp) -/* 865798 80240C58 8FB00010 */ lw $s0, 0x10($sp) -/* 86579C 80240C5C D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8657A0 80240C60 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8657A4 80240C64 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8657A8 80240C68 24020002 */ addiu $v0, $zero, 2 -/* 8657AC 80240C6C 03E00008 */ jr $ra -/* 8657B0 80240C70 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s new file mode 100644 index 0000000000..17e97789db --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240B88_8656C8.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B88_8656C8 +/* 8656C8 80240B88 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 8656CC 80240B8C AFB10014 */ sw $s1, 0x14($sp) +/* 8656D0 80240B90 0080882D */ daddu $s1, $a0, $zero +/* 8656D4 80240B94 AFBF0018 */ sw $ra, 0x18($sp) +/* 8656D8 80240B98 AFB00010 */ sw $s0, 0x10($sp) +/* 8656DC 80240B9C F7B80030 */ sdc1 $f24, 0x30($sp) +/* 8656E0 80240BA0 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 8656E4 80240BA4 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 8656E8 80240BA8 0C00EAD2 */ jal get_npc_safe +/* 8656EC 80240BAC 0000202D */ daddu $a0, $zero, $zero +/* 8656F0 80240BB0 0040802D */ daddu $s0, $v0, $zero +/* 8656F4 80240BB4 C614000C */ lwc1 $f20, 0xc($s0) +/* 8656F8 80240BB8 3C01428C */ lui $at, 0x428c +/* 8656FC 80240BBC 4481C000 */ mtc1 $at, $f24 +/* 865700 80240BC0 4600A507 */ neg.s $f20, $f20 +/* 865704 80240BC4 0C00A8BB */ jal sin_deg +/* 865708 80240BC8 4600A306 */ mov.s $f12, $f20 +/* 86570C 80240BCC 46180002 */ mul.s $f0, $f0, $f24 +/* 865710 80240BD0 00000000 */ nop +/* 865714 80240BD4 C6160038 */ lwc1 $f22, 0x38($s0) +/* 865718 80240BD8 3C0141F0 */ lui $at, 0x41f0 +/* 86571C 80240BDC 44811000 */ mtc1 $at, $f2 +/* 865720 80240BE0 00000000 */ nop +/* 865724 80240BE4 4602B580 */ add.s $f22, $f22, $f2 +/* 865728 80240BE8 4600A306 */ mov.s $f12, $f20 +/* 86572C 80240BEC 0C00A8D4 */ jal cos_deg +/* 865730 80240BF0 4600B580 */ add.s $f22, $f22, $f0 +/* 865734 80240BF4 0220202D */ daddu $a0, $s1, $zero +/* 865738 80240BF8 46180002 */ mul.s $f0, $f0, $f24 +/* 86573C 80240BFC 00000000 */ nop +/* 865740 80240C00 3C05FE36 */ lui $a1, 0xfe36 +/* 865744 80240C04 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 865748 80240C08 C6180040 */ lwc1 $f24, 0x40($s0) +/* 86574C 80240C0C C614003C */ lwc1 $f20, 0x3c($s0) +/* 865750 80240C10 4600C600 */ add.s $f24, $f24, $f0 +/* 865754 80240C14 3C014248 */ lui $at, 0x4248 +/* 865758 80240C18 44810000 */ mtc1 $at, $f0 +/* 86575C 80240C1C 4406B000 */ mfc1 $a2, $f22 +/* 865760 80240C20 0C0B2190 */ jal set_float_variable +/* 865764 80240C24 4600A500 */ add.s $f20, $f20, $f0 +/* 865768 80240C28 0220202D */ daddu $a0, $s1, $zero +/* 86576C 80240C2C 3C05FE36 */ lui $a1, 0xfe36 +/* 865770 80240C30 4406A000 */ mfc1 $a2, $f20 +/* 865774 80240C34 0C0B2190 */ jal set_float_variable +/* 865778 80240C38 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 86577C 80240C3C 0220202D */ daddu $a0, $s1, $zero +/* 865780 80240C40 3C05FE36 */ lui $a1, 0xfe36 +/* 865784 80240C44 4406C000 */ mfc1 $a2, $f24 +/* 865788 80240C48 0C0B2190 */ jal set_float_variable +/* 86578C 80240C4C 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 865790 80240C50 8FBF0018 */ lw $ra, 0x18($sp) +/* 865794 80240C54 8FB10014 */ lw $s1, 0x14($sp) +/* 865798 80240C58 8FB00010 */ lw $s0, 0x10($sp) +/* 86579C 80240C5C D7B80030 */ ldc1 $f24, 0x30($sp) +/* 8657A0 80240C60 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8657A4 80240C64 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8657A8 80240C68 24020002 */ addiu $v0, $zero, 2 +/* 8657AC 80240C6C 03E00008 */ jr $ra +/* 8657B0 80240C70 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240C74.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240C74.s deleted file mode 100644 index a92c8e8dde..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240C74.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C74 -/* 8657B4 80240C74 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 8657B8 80240C78 AFB10034 */ sw $s1, 0x34($sp) -/* 8657BC 80240C7C 0080882D */ daddu $s1, $a0, $zero -/* 8657C0 80240C80 AFBF003C */ sw $ra, 0x3c($sp) -/* 8657C4 80240C84 AFB20038 */ sw $s2, 0x38($sp) -/* 8657C8 80240C88 AFB00030 */ sw $s0, 0x30($sp) -/* 8657CC 80240C8C F7BE0068 */ sdc1 $f30, 0x68($sp) -/* 8657D0 80240C90 F7BC0060 */ sdc1 $f28, 0x60($sp) -/* 8657D4 80240C94 F7BA0058 */ sdc1 $f26, 0x58($sp) -/* 8657D8 80240C98 F7B80050 */ sdc1 $f24, 0x50($sp) -/* 8657DC 80240C9C F7B60048 */ sdc1 $f22, 0x48($sp) -/* 8657E0 80240CA0 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 8657E4 80240CA4 8E30000C */ lw $s0, 0xc($s1) -/* 8657E8 80240CA8 8E050000 */ lw $a1, ($s0) -/* 8657EC 80240CAC 0C0B1EAF */ jal get_variable -/* 8657F0 80240CB0 26100004 */ addiu $s0, $s0, 4 -/* 8657F4 80240CB4 8E050000 */ lw $a1, ($s0) -/* 8657F8 80240CB8 26100004 */ addiu $s0, $s0, 4 -/* 8657FC 80240CBC 0220202D */ daddu $a0, $s1, $zero -/* 865800 80240CC0 0C0B210B */ jal get_float_variable -/* 865804 80240CC4 0040902D */ daddu $s2, $v0, $zero -/* 865808 80240CC8 8E050000 */ lw $a1, ($s0) -/* 86580C 80240CCC 26100004 */ addiu $s0, $s0, 4 -/* 865810 80240CD0 0220202D */ daddu $a0, $s1, $zero -/* 865814 80240CD4 0C0B210B */ jal get_float_variable -/* 865818 80240CD8 46000706 */ mov.s $f28, $f0 -/* 86581C 80240CDC 8E050000 */ lw $a1, ($s0) -/* 865820 80240CE0 26100004 */ addiu $s0, $s0, 4 -/* 865824 80240CE4 0220202D */ daddu $a0, $s1, $zero -/* 865828 80240CE8 0C0B210B */ jal get_float_variable -/* 86582C 80240CEC 46000786 */ mov.s $f30, $f0 -/* 865830 80240CF0 8E050000 */ lw $a1, ($s0) -/* 865834 80240CF4 26100004 */ addiu $s0, $s0, 4 -/* 865838 80240CF8 0220202D */ daddu $a0, $s1, $zero -/* 86583C 80240CFC 0C0B210B */ jal get_float_variable -/* 865840 80240D00 46000686 */ mov.s $f26, $f0 -/* 865844 80240D04 8E050000 */ lw $a1, ($s0) -/* 865848 80240D08 26100004 */ addiu $s0, $s0, 4 -/* 86584C 80240D0C 0220202D */ daddu $a0, $s1, $zero -/* 865850 80240D10 0C0B210B */ jal get_float_variable -/* 865854 80240D14 46000606 */ mov.s $f24, $f0 -/* 865858 80240D18 8E050000 */ lw $a1, ($s0) -/* 86585C 80240D1C 26100004 */ addiu $s0, $s0, 4 -/* 865860 80240D20 0220202D */ daddu $a0, $s1, $zero -/* 865864 80240D24 0C0B210B */ jal get_float_variable -/* 865868 80240D28 46000586 */ mov.s $f22, $f0 -/* 86586C 80240D2C 0220202D */ daddu $a0, $s1, $zero -/* 865870 80240D30 8E050000 */ lw $a1, ($s0) -/* 865874 80240D34 0C0B1EAF */ jal get_variable -/* 865878 80240D38 46000506 */ mov.s $f20, $f0 -/* 86587C 80240D3C 4405E000 */ mfc1 $a1, $f28 -/* 865880 80240D40 4406F000 */ mfc1 $a2, $f30 -/* 865884 80240D44 4407D000 */ mfc1 $a3, $f26 -/* 865888 80240D48 0240202D */ daddu $a0, $s2, $zero -/* 86588C 80240D4C AFA2001C */ sw $v0, 0x1c($sp) -/* 865890 80240D50 27A20028 */ addiu $v0, $sp, 0x28 -/* 865894 80240D54 E7B80010 */ swc1 $f24, 0x10($sp) -/* 865898 80240D58 E7B60014 */ swc1 $f22, 0x14($sp) -/* 86589C 80240D5C E7B40018 */ swc1 $f20, 0x18($sp) -/* 8658A0 80240D60 0C01C3DC */ jal func_80070F70 -/* 8658A4 80240D64 AFA20020 */ sw $v0, 0x20($sp) -/* 8658A8 80240D68 8FA30028 */ lw $v1, 0x28($sp) -/* 8658AC 80240D6C AE230084 */ sw $v1, 0x84($s1) -/* 8658B0 80240D70 8FBF003C */ lw $ra, 0x3c($sp) -/* 8658B4 80240D74 8FB20038 */ lw $s2, 0x38($sp) -/* 8658B8 80240D78 8FB10034 */ lw $s1, 0x34($sp) -/* 8658BC 80240D7C 8FB00030 */ lw $s0, 0x30($sp) -/* 8658C0 80240D80 D7BE0068 */ ldc1 $f30, 0x68($sp) -/* 8658C4 80240D84 D7BC0060 */ ldc1 $f28, 0x60($sp) -/* 8658C8 80240D88 D7BA0058 */ ldc1 $f26, 0x58($sp) -/* 8658CC 80240D8C D7B80050 */ ldc1 $f24, 0x50($sp) -/* 8658D0 80240D90 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 8658D4 80240D94 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 8658D8 80240D98 24020002 */ addiu $v0, $zero, 2 -/* 8658DC 80240D9C 03E00008 */ jr $ra -/* 8658E0 80240DA0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240C74_8657B4.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240C74_8657B4.s new file mode 100644 index 0000000000..5f35d5ce8b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240C74_8657B4.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C74_8657B4 +/* 8657B4 80240C74 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 8657B8 80240C78 AFB10034 */ sw $s1, 0x34($sp) +/* 8657BC 80240C7C 0080882D */ daddu $s1, $a0, $zero +/* 8657C0 80240C80 AFBF003C */ sw $ra, 0x3c($sp) +/* 8657C4 80240C84 AFB20038 */ sw $s2, 0x38($sp) +/* 8657C8 80240C88 AFB00030 */ sw $s0, 0x30($sp) +/* 8657CC 80240C8C F7BE0068 */ sdc1 $f30, 0x68($sp) +/* 8657D0 80240C90 F7BC0060 */ sdc1 $f28, 0x60($sp) +/* 8657D4 80240C94 F7BA0058 */ sdc1 $f26, 0x58($sp) +/* 8657D8 80240C98 F7B80050 */ sdc1 $f24, 0x50($sp) +/* 8657DC 80240C9C F7B60048 */ sdc1 $f22, 0x48($sp) +/* 8657E0 80240CA0 F7B40040 */ sdc1 $f20, 0x40($sp) +/* 8657E4 80240CA4 8E30000C */ lw $s0, 0xc($s1) +/* 8657E8 80240CA8 8E050000 */ lw $a1, ($s0) +/* 8657EC 80240CAC 0C0B1EAF */ jal get_variable +/* 8657F0 80240CB0 26100004 */ addiu $s0, $s0, 4 +/* 8657F4 80240CB4 8E050000 */ lw $a1, ($s0) +/* 8657F8 80240CB8 26100004 */ addiu $s0, $s0, 4 +/* 8657FC 80240CBC 0220202D */ daddu $a0, $s1, $zero +/* 865800 80240CC0 0C0B210B */ jal get_float_variable +/* 865804 80240CC4 0040902D */ daddu $s2, $v0, $zero +/* 865808 80240CC8 8E050000 */ lw $a1, ($s0) +/* 86580C 80240CCC 26100004 */ addiu $s0, $s0, 4 +/* 865810 80240CD0 0220202D */ daddu $a0, $s1, $zero +/* 865814 80240CD4 0C0B210B */ jal get_float_variable +/* 865818 80240CD8 46000706 */ mov.s $f28, $f0 +/* 86581C 80240CDC 8E050000 */ lw $a1, ($s0) +/* 865820 80240CE0 26100004 */ addiu $s0, $s0, 4 +/* 865824 80240CE4 0220202D */ daddu $a0, $s1, $zero +/* 865828 80240CE8 0C0B210B */ jal get_float_variable +/* 86582C 80240CEC 46000786 */ mov.s $f30, $f0 +/* 865830 80240CF0 8E050000 */ lw $a1, ($s0) +/* 865834 80240CF4 26100004 */ addiu $s0, $s0, 4 +/* 865838 80240CF8 0220202D */ daddu $a0, $s1, $zero +/* 86583C 80240CFC 0C0B210B */ jal get_float_variable +/* 865840 80240D00 46000686 */ mov.s $f26, $f0 +/* 865844 80240D04 8E050000 */ lw $a1, ($s0) +/* 865848 80240D08 26100004 */ addiu $s0, $s0, 4 +/* 86584C 80240D0C 0220202D */ daddu $a0, $s1, $zero +/* 865850 80240D10 0C0B210B */ jal get_float_variable +/* 865854 80240D14 46000606 */ mov.s $f24, $f0 +/* 865858 80240D18 8E050000 */ lw $a1, ($s0) +/* 86585C 80240D1C 26100004 */ addiu $s0, $s0, 4 +/* 865860 80240D20 0220202D */ daddu $a0, $s1, $zero +/* 865864 80240D24 0C0B210B */ jal get_float_variable +/* 865868 80240D28 46000586 */ mov.s $f22, $f0 +/* 86586C 80240D2C 0220202D */ daddu $a0, $s1, $zero +/* 865870 80240D30 8E050000 */ lw $a1, ($s0) +/* 865874 80240D34 0C0B1EAF */ jal get_variable +/* 865878 80240D38 46000506 */ mov.s $f20, $f0 +/* 86587C 80240D3C 4405E000 */ mfc1 $a1, $f28 +/* 865880 80240D40 4406F000 */ mfc1 $a2, $f30 +/* 865884 80240D44 4407D000 */ mfc1 $a3, $f26 +/* 865888 80240D48 0240202D */ daddu $a0, $s2, $zero +/* 86588C 80240D4C AFA2001C */ sw $v0, 0x1c($sp) +/* 865890 80240D50 27A20028 */ addiu $v0, $sp, 0x28 +/* 865894 80240D54 E7B80010 */ swc1 $f24, 0x10($sp) +/* 865898 80240D58 E7B60014 */ swc1 $f22, 0x14($sp) +/* 86589C 80240D5C E7B40018 */ swc1 $f20, 0x18($sp) +/* 8658A0 80240D60 0C01C3DC */ jal func_80070F70 +/* 8658A4 80240D64 AFA20020 */ sw $v0, 0x20($sp) +/* 8658A8 80240D68 8FA30028 */ lw $v1, 0x28($sp) +/* 8658AC 80240D6C AE230084 */ sw $v1, 0x84($s1) +/* 8658B0 80240D70 8FBF003C */ lw $ra, 0x3c($sp) +/* 8658B4 80240D74 8FB20038 */ lw $s2, 0x38($sp) +/* 8658B8 80240D78 8FB10034 */ lw $s1, 0x34($sp) +/* 8658BC 80240D7C 8FB00030 */ lw $s0, 0x30($sp) +/* 8658C0 80240D80 D7BE0068 */ ldc1 $f30, 0x68($sp) +/* 8658C4 80240D84 D7BC0060 */ ldc1 $f28, 0x60($sp) +/* 8658C8 80240D88 D7BA0058 */ ldc1 $f26, 0x58($sp) +/* 8658CC 80240D8C D7B80050 */ ldc1 $f24, 0x50($sp) +/* 8658D0 80240D90 D7B60048 */ ldc1 $f22, 0x48($sp) +/* 8658D4 80240D94 D7B40040 */ ldc1 $f20, 0x40($sp) +/* 8658D8 80240D98 24020002 */ addiu $v0, $zero, 2 +/* 8658DC 80240D9C 03E00008 */ jr $ra +/* 8658E0 80240DA0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4.s deleted file mode 100644 index 85c375659c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DA4 -/* 8658E4 80240DA4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8658E8 80240DA8 AFB10014 */ sw $s1, 0x14($sp) -/* 8658EC 80240DAC 0080882D */ daddu $s1, $a0, $zero -/* 8658F0 80240DB0 AFBF001C */ sw $ra, 0x1c($sp) -/* 8658F4 80240DB4 AFB20018 */ sw $s2, 0x18($sp) -/* 8658F8 80240DB8 AFB00010 */ sw $s0, 0x10($sp) -/* 8658FC 80240DBC F7B60028 */ sdc1 $f22, 0x28($sp) -/* 865900 80240DC0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 865904 80240DC4 8E30000C */ lw $s0, 0xc($s1) -/* 865908 80240DC8 8E050000 */ lw $a1, ($s0) -/* 86590C 80240DCC 0C0B1EAF */ jal get_variable -/* 865910 80240DD0 26100004 */ addiu $s0, $s0, 4 -/* 865914 80240DD4 8E050000 */ lw $a1, ($s0) -/* 865918 80240DD8 26100004 */ addiu $s0, $s0, 4 -/* 86591C 80240DDC 0220202D */ daddu $a0, $s1, $zero -/* 865920 80240DE0 0C0B210B */ jal get_float_variable -/* 865924 80240DE4 0040902D */ daddu $s2, $v0, $zero -/* 865928 80240DE8 8E050000 */ lw $a1, ($s0) -/* 86592C 80240DEC 26100004 */ addiu $s0, $s0, 4 -/* 865930 80240DF0 0220202D */ daddu $a0, $s1, $zero -/* 865934 80240DF4 0C0B210B */ jal get_float_variable -/* 865938 80240DF8 46000586 */ mov.s $f22, $f0 -/* 86593C 80240DFC 0220202D */ daddu $a0, $s1, $zero -/* 865940 80240E00 8E050000 */ lw $a1, ($s0) -/* 865944 80240E04 0C0B210B */ jal get_float_variable -/* 865948 80240E08 46000506 */ mov.s $f20, $f0 -/* 86594C 80240E0C 8E42000C */ lw $v0, 0xc($s2) -/* 865950 80240E10 E4560008 */ swc1 $f22, 8($v0) -/* 865954 80240E14 8E42000C */ lw $v0, 0xc($s2) -/* 865958 80240E18 E454000C */ swc1 $f20, 0xc($v0) -/* 86595C 80240E1C 8E43000C */ lw $v1, 0xc($s2) -/* 865960 80240E20 E4600010 */ swc1 $f0, 0x10($v1) -/* 865964 80240E24 8FBF001C */ lw $ra, 0x1c($sp) -/* 865968 80240E28 8FB20018 */ lw $s2, 0x18($sp) -/* 86596C 80240E2C 8FB10014 */ lw $s1, 0x14($sp) -/* 865970 80240E30 8FB00010 */ lw $s0, 0x10($sp) -/* 865974 80240E34 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 865978 80240E38 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 86597C 80240E3C 24020002 */ addiu $v0, $zero, 2 -/* 865980 80240E40 03E00008 */ jr $ra -/* 865984 80240E44 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4_8658E4.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4_8658E4.s new file mode 100644 index 0000000000..491fcea65f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240DA4_8658E4.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DA4_8658E4 +/* 8658E4 80240DA4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 8658E8 80240DA8 AFB10014 */ sw $s1, 0x14($sp) +/* 8658EC 80240DAC 0080882D */ daddu $s1, $a0, $zero +/* 8658F0 80240DB0 AFBF001C */ sw $ra, 0x1c($sp) +/* 8658F4 80240DB4 AFB20018 */ sw $s2, 0x18($sp) +/* 8658F8 80240DB8 AFB00010 */ sw $s0, 0x10($sp) +/* 8658FC 80240DBC F7B60028 */ sdc1 $f22, 0x28($sp) +/* 865900 80240DC0 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 865904 80240DC4 8E30000C */ lw $s0, 0xc($s1) +/* 865908 80240DC8 8E050000 */ lw $a1, ($s0) +/* 86590C 80240DCC 0C0B1EAF */ jal get_variable +/* 865910 80240DD0 26100004 */ addiu $s0, $s0, 4 +/* 865914 80240DD4 8E050000 */ lw $a1, ($s0) +/* 865918 80240DD8 26100004 */ addiu $s0, $s0, 4 +/* 86591C 80240DDC 0220202D */ daddu $a0, $s1, $zero +/* 865920 80240DE0 0C0B210B */ jal get_float_variable +/* 865924 80240DE4 0040902D */ daddu $s2, $v0, $zero +/* 865928 80240DE8 8E050000 */ lw $a1, ($s0) +/* 86592C 80240DEC 26100004 */ addiu $s0, $s0, 4 +/* 865930 80240DF0 0220202D */ daddu $a0, $s1, $zero +/* 865934 80240DF4 0C0B210B */ jal get_float_variable +/* 865938 80240DF8 46000586 */ mov.s $f22, $f0 +/* 86593C 80240DFC 0220202D */ daddu $a0, $s1, $zero +/* 865940 80240E00 8E050000 */ lw $a1, ($s0) +/* 865944 80240E04 0C0B210B */ jal get_float_variable +/* 865948 80240E08 46000506 */ mov.s $f20, $f0 +/* 86594C 80240E0C 8E42000C */ lw $v0, 0xc($s2) +/* 865950 80240E10 E4560008 */ swc1 $f22, 8($v0) +/* 865954 80240E14 8E42000C */ lw $v0, 0xc($s2) +/* 865958 80240E18 E454000C */ swc1 $f20, 0xc($v0) +/* 86595C 80240E1C 8E43000C */ lw $v1, 0xc($s2) +/* 865960 80240E20 E4600010 */ swc1 $f0, 0x10($v1) +/* 865964 80240E24 8FBF001C */ lw $ra, 0x1c($sp) +/* 865968 80240E28 8FB20018 */ lw $s2, 0x18($sp) +/* 86596C 80240E2C 8FB10014 */ lw $s1, 0x14($sp) +/* 865970 80240E30 8FB00010 */ lw $s0, 0x10($sp) +/* 865974 80240E34 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 865978 80240E38 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 86597C 80240E3C 24020002 */ addiu $v0, $zero, 2 +/* 865980 80240E40 03E00008 */ jr $ra +/* 865984 80240E44 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48.s deleted file mode 100644 index cafac2654f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E48 -/* 865988 80240E48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86598C 80240E4C AFBF0010 */ sw $ra, 0x10($sp) -/* 865990 80240E50 8C82000C */ lw $v0, 0xc($a0) -/* 865994 80240E54 0C0B1EAF */ jal get_variable -/* 865998 80240E58 8C450000 */ lw $a1, ($v0) -/* 86599C 80240E5C 8C44000C */ lw $a0, 0xc($v0) -/* 8659A0 80240E60 24030001 */ addiu $v1, $zero, 1 -/* 8659A4 80240E64 AC830004 */ sw $v1, 4($a0) -/* 8659A8 80240E68 8FBF0010 */ lw $ra, 0x10($sp) -/* 8659AC 80240E6C 24020002 */ addiu $v0, $zero, 2 -/* 8659B0 80240E70 03E00008 */ jr $ra -/* 8659B4 80240E74 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8659B8 80240E78 00000000 */ nop -/* 8659BC 80240E7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48_865988.s b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48_865988.s new file mode 100644 index 0000000000..866c666f23 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/865000/func_80240E48_865988.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E48_865988 +/* 865988 80240E48 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 86598C 80240E4C AFBF0010 */ sw $ra, 0x10($sp) +/* 865990 80240E50 8C82000C */ lw $v0, 0xc($a0) +/* 865994 80240E54 0C0B1EAF */ jal get_variable +/* 865998 80240E58 8C450000 */ lw $a1, ($v0) +/* 86599C 80240E5C 8C44000C */ lw $a0, 0xc($v0) +/* 8659A0 80240E60 24030001 */ addiu $v1, $zero, 1 +/* 8659A4 80240E64 AC830004 */ sw $v1, 4($a0) +/* 8659A8 80240E68 8FBF0010 */ lw $ra, 0x10($sp) +/* 8659AC 80240E6C 24020002 */ addiu $v0, $zero, 2 +/* 8659B0 80240E70 03E00008 */ jr $ra +/* 8659B4 80240E74 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8659B8 80240E78 00000000 */ nop +/* 8659BC 80240E7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098.s deleted file mode 100644 index 439b9ec2df..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241098 -/* 865BD8 80241098 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 865BDC 8024109C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 865BE0 802410A0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 865BE4 802410A4 AFBF0014 */ sw $ra, 0x14($sp) -/* 865BE8 802410A8 AFB00010 */ sw $s0, 0x10($sp) -/* 865BEC 802410AC 8C500010 */ lw $s0, 0x10($v0) -/* 865BF0 802410B0 0C00EAD2 */ jal get_npc_safe -/* 865BF4 802410B4 0000202D */ daddu $a0, $zero, $zero -/* 865BF8 802410B8 3C048024 */ lui $a0, 0x8024 -/* 865BFC 802410BC 2484343C */ addiu $a0, $a0, 0x343c -/* 865C00 802410C0 8C830000 */ lw $v1, ($a0) -/* 865C04 802410C4 1060000E */ beqz $v1, .L80241100 -/* 865C08 802410C8 0040282D */ daddu $a1, $v0, $zero -/* 865C0C 802410CC 0460006B */ bltz $v1, .L8024127C -/* 865C10 802410D0 2402000A */ addiu $v0, $zero, 0xa -/* 865C14 802410D4 10620019 */ beq $v1, $v0, .L8024113C -/* 865C18 802410D8 0062102A */ slt $v0, $v1, $v0 -/* 865C1C 802410DC 14400068 */ bnez $v0, .L80241280 -/* 865C20 802410E0 0000102D */ daddu $v0, $zero, $zero -/* 865C24 802410E4 2402000B */ addiu $v0, $zero, 0xb -/* 865C28 802410E8 10620021 */ beq $v1, $v0, .L80241170 -/* 865C2C 802410EC 2402000C */ addiu $v0, $zero, 0xc -/* 865C30 802410F0 1062004D */ beq $v1, $v0, .L80241228 -/* 865C34 802410F4 0000102D */ daddu $v0, $zero, $zero -/* 865C38 802410F8 080904A0 */ j .L80241280 -/* 865C3C 802410FC 00000000 */ nop -.L80241100: -/* 865C40 80241100 32028000 */ andi $v0, $s0, 0x8000 -/* 865C44 80241104 10400003 */ beqz $v0, .L80241114 -/* 865C48 80241108 2402000A */ addiu $v0, $zero, 0xa -/* 865C4C 8024110C 0809049F */ j .L8024127C -/* 865C50 80241110 AC820000 */ sw $v0, ($a0) -.L80241114: -/* 865C54 80241114 3C048024 */ lui $a0, 0x8024 -/* 865C58 80241118 24843440 */ addiu $a0, $a0, 0x3440 -/* 865C5C 8024111C 8C830000 */ lw $v1, ($a0) -/* 865C60 80241120 28620096 */ slti $v0, $v1, 0x96 -/* 865C64 80241124 14400003 */ bnez $v0, .L80241134 -/* 865C68 80241128 24620001 */ addiu $v0, $v1, 1 -/* 865C6C 8024112C 080904A0 */ j .L80241280 -/* 865C70 80241130 24020002 */ addiu $v0, $zero, 2 -.L80241134: -/* 865C74 80241134 0809049F */ j .L8024127C -/* 865C78 80241138 AC820000 */ sw $v0, ($a0) -.L8024113C: -/* 865C7C 8024113C 3C0200B6 */ lui $v0, 0xb6 -/* 865C80 80241140 3C0140A0 */ lui $at, 0x40a0 -/* 865C84 80241144 44810000 */ mtc1 $at, $f0 -/* 865C88 80241148 34420009 */ ori $v0, $v0, 9 -/* 865C8C 8024114C ACA20028 */ sw $v0, 0x28($a1) -/* 865C90 80241150 2402000B */ addiu $v0, $zero, 0xb -/* 865C94 80241154 3C018024 */ lui $at, 0x8024 -/* 865C98 80241158 AC203434 */ sw $zero, 0x3434($at) -/* 865C9C 8024115C AC820000 */ sw $v0, ($a0) -/* 865CA0 80241160 3C018024 */ lui $at, 0x8024 -/* 865CA4 80241164 E4203438 */ swc1 $f0, 0x3438($at) -/* 865CA8 80241168 080904A0 */ j .L80241280 -/* 865CAC 8024116C 0000102D */ daddu $v0, $zero, $zero -.L80241170: -/* 865CB0 80241170 3C028024 */ lui $v0, 0x8024 -/* 865CB4 80241174 24423434 */ addiu $v0, $v0, 0x3434 -/* 865CB8 80241178 3C038024 */ lui $v1, 0x8024 -/* 865CBC 8024117C 24633438 */ addiu $v1, $v1, 0x3438 -/* 865CC0 80241180 C4400000 */ lwc1 $f0, ($v0) -/* 865CC4 80241184 C4640000 */ lwc1 $f4, ($v1) -/* 865CC8 80241188 46040000 */ add.s $f0, $f0, $f4 -/* 865CCC 8024118C 3C01428C */ lui $at, 0x428c -/* 865CD0 80241190 44811000 */ mtc1 $at, $f2 -/* 865CD4 80241194 00000000 */ nop -/* 865CD8 80241198 4602003C */ c.lt.s $f0, $f2 -/* 865CDC 8024119C 00000000 */ nop -/* 865CE0 802411A0 4500000D */ bc1f .L802411D8 -/* 865CE4 802411A4 E4400000 */ swc1 $f0, ($v0) -/* 865CE8 802411A8 3C014080 */ lui $at, 0x4080 -/* 865CEC 802411AC 44810000 */ mtc1 $at, $f0 -/* 865CF0 802411B0 00000000 */ nop -/* 865CF4 802411B4 4600203C */ c.lt.s $f4, $f0 -/* 865CF8 802411B8 00000000 */ nop -/* 865CFC 802411BC 45030001 */ bc1tl .L802411C4 -/* 865D00 802411C0 E4600000 */ swc1 $f0, ($v1) -.L802411C4: -/* 865D04 802411C4 C4600000 */ lwc1 $f0, ($v1) -/* 865D08 802411C8 3C013F80 */ lui $at, 0x3f80 -/* 865D0C 802411CC 44811000 */ mtc1 $at, $f2 -/* 865D10 802411D0 0809047A */ j .L802411E8 -/* 865D14 802411D4 46020000 */ add.s $f0, $f0, $f2 -.L802411D8: -/* 865D18 802411D8 3C014000 */ lui $at, 0x4000 -/* 865D1C 802411DC 44810000 */ mtc1 $at, $f0 -/* 865D20 802411E0 00000000 */ nop -/* 865D24 802411E4 46002001 */ sub.s $f0, $f4, $f0 -.L802411E8: -/* 865D28 802411E8 E4600000 */ swc1 $f0, ($v1) -/* 865D2C 802411EC 3C0300B6 */ lui $v1, 0xb6 -/* 865D30 802411F0 8CA20028 */ lw $v0, 0x28($a1) -/* 865D34 802411F4 34630001 */ ori $v1, $v1, 1 -/* 865D38 802411F8 14430021 */ bne $v0, $v1, .L80241280 -/* 865D3C 802411FC 0000102D */ daddu $v0, $zero, $zero -/* 865D40 80241200 3C038024 */ lui $v1, 0x8024 -/* 865D44 80241204 2463343C */ addiu $v1, $v1, 0x343c -/* 865D48 80241208 8C620000 */ lw $v0, ($v1) -/* 865D4C 8024120C 3C014080 */ lui $at, 0x4080 -/* 865D50 80241210 44810000 */ mtc1 $at, $f0 -/* 865D54 80241214 24420001 */ addiu $v0, $v0, 1 -/* 865D58 80241218 3C018024 */ lui $at, 0x8024 -/* 865D5C 8024121C E4203438 */ swc1 $f0, 0x3438($at) -/* 865D60 80241220 0809049F */ j .L8024127C -/* 865D64 80241224 AC620000 */ sw $v0, ($v1) -.L80241228: -/* 865D68 80241228 3C028024 */ lui $v0, 0x8024 -/* 865D6C 8024122C 24423434 */ addiu $v0, $v0, 0x3434 -/* 865D70 80241230 3C038024 */ lui $v1, 0x8024 -/* 865D74 80241234 24633438 */ addiu $v1, $v1, 0x3438 -/* 865D78 80241238 C4400000 */ lwc1 $f0, ($v0) -/* 865D7C 8024123C C4620000 */ lwc1 $f2, ($v1) -/* 865D80 80241240 46020001 */ sub.s $f0, $f0, $f2 -/* 865D84 80241244 44802000 */ mtc1 $zero, $f4 -/* 865D88 80241248 00000000 */ nop -/* 865D8C 8024124C 4604003C */ c.lt.s $f0, $f4 -/* 865D90 80241250 00000000 */ nop -/* 865D94 80241254 45000004 */ bc1f .L80241268 -/* 865D98 80241258 E4400000 */ swc1 $f0, ($v0) -/* 865D9C 8024125C E4440000 */ swc1 $f4, ($v0) -/* 865DA0 80241260 080904A0 */ j .L80241280 -/* 865DA4 80241264 24020002 */ addiu $v0, $zero, 2 -.L80241268: -/* 865DA8 80241268 3C013F80 */ lui $at, 0x3f80 -/* 865DAC 8024126C 44810000 */ mtc1 $at, $f0 -/* 865DB0 80241270 00000000 */ nop -/* 865DB4 80241274 46001000 */ add.s $f0, $f2, $f0 -/* 865DB8 80241278 E4600000 */ swc1 $f0, ($v1) -.L8024127C: -/* 865DBC 8024127C 0000102D */ daddu $v0, $zero, $zero -.L80241280: -/* 865DC0 80241280 8FBF0014 */ lw $ra, 0x14($sp) -/* 865DC4 80241284 8FB00010 */ lw $s0, 0x10($sp) -/* 865DC8 80241288 03E00008 */ jr $ra -/* 865DCC 8024128C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s new file mode 100644 index 0000000000..73d01b573f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241098_865BD8.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241098_865BD8 +/* 865BD8 80241098 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 865BDC 8024109C 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 865BE0 802410A0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 865BE4 802410A4 AFBF0014 */ sw $ra, 0x14($sp) +/* 865BE8 802410A8 AFB00010 */ sw $s0, 0x10($sp) +/* 865BEC 802410AC 8C500010 */ lw $s0, 0x10($v0) +/* 865BF0 802410B0 0C00EAD2 */ jal get_npc_safe +/* 865BF4 802410B4 0000202D */ daddu $a0, $zero, $zero +/* 865BF8 802410B8 3C048024 */ lui $a0, 0x8024 +/* 865BFC 802410BC 2484343C */ addiu $a0, $a0, 0x343c +/* 865C00 802410C0 8C830000 */ lw $v1, ($a0) +/* 865C04 802410C4 1060000E */ beqz $v1, .L80241100 +/* 865C08 802410C8 0040282D */ daddu $a1, $v0, $zero +/* 865C0C 802410CC 0460006B */ bltz $v1, .L8024127C +/* 865C10 802410D0 2402000A */ addiu $v0, $zero, 0xa +/* 865C14 802410D4 10620019 */ beq $v1, $v0, .L8024113C +/* 865C18 802410D8 0062102A */ slt $v0, $v1, $v0 +/* 865C1C 802410DC 14400068 */ bnez $v0, .L80241280 +/* 865C20 802410E0 0000102D */ daddu $v0, $zero, $zero +/* 865C24 802410E4 2402000B */ addiu $v0, $zero, 0xb +/* 865C28 802410E8 10620021 */ beq $v1, $v0, .L80241170 +/* 865C2C 802410EC 2402000C */ addiu $v0, $zero, 0xc +/* 865C30 802410F0 1062004D */ beq $v1, $v0, .L80241228 +/* 865C34 802410F4 0000102D */ daddu $v0, $zero, $zero +/* 865C38 802410F8 080904A0 */ j .L80241280 +/* 865C3C 802410FC 00000000 */ nop +.L80241100: +/* 865C40 80241100 32028000 */ andi $v0, $s0, 0x8000 +/* 865C44 80241104 10400003 */ beqz $v0, .L80241114 +/* 865C48 80241108 2402000A */ addiu $v0, $zero, 0xa +/* 865C4C 8024110C 0809049F */ j .L8024127C +/* 865C50 80241110 AC820000 */ sw $v0, ($a0) +.L80241114: +/* 865C54 80241114 3C048024 */ lui $a0, 0x8024 +/* 865C58 80241118 24843440 */ addiu $a0, $a0, 0x3440 +/* 865C5C 8024111C 8C830000 */ lw $v1, ($a0) +/* 865C60 80241120 28620096 */ slti $v0, $v1, 0x96 +/* 865C64 80241124 14400003 */ bnez $v0, .L80241134 +/* 865C68 80241128 24620001 */ addiu $v0, $v1, 1 +/* 865C6C 8024112C 080904A0 */ j .L80241280 +/* 865C70 80241130 24020002 */ addiu $v0, $zero, 2 +.L80241134: +/* 865C74 80241134 0809049F */ j .L8024127C +/* 865C78 80241138 AC820000 */ sw $v0, ($a0) +.L8024113C: +/* 865C7C 8024113C 3C0200B6 */ lui $v0, 0xb6 +/* 865C80 80241140 3C0140A0 */ lui $at, 0x40a0 +/* 865C84 80241144 44810000 */ mtc1 $at, $f0 +/* 865C88 80241148 34420009 */ ori $v0, $v0, 9 +/* 865C8C 8024114C ACA20028 */ sw $v0, 0x28($a1) +/* 865C90 80241150 2402000B */ addiu $v0, $zero, 0xb +/* 865C94 80241154 3C018024 */ lui $at, 0x8024 +/* 865C98 80241158 AC203434 */ sw $zero, 0x3434($at) +/* 865C9C 8024115C AC820000 */ sw $v0, ($a0) +/* 865CA0 80241160 3C018024 */ lui $at, 0x8024 +/* 865CA4 80241164 E4203438 */ swc1 $f0, 0x3438($at) +/* 865CA8 80241168 080904A0 */ j .L80241280 +/* 865CAC 8024116C 0000102D */ daddu $v0, $zero, $zero +.L80241170: +/* 865CB0 80241170 3C028024 */ lui $v0, 0x8024 +/* 865CB4 80241174 24423434 */ addiu $v0, $v0, 0x3434 +/* 865CB8 80241178 3C038024 */ lui $v1, 0x8024 +/* 865CBC 8024117C 24633438 */ addiu $v1, $v1, 0x3438 +/* 865CC0 80241180 C4400000 */ lwc1 $f0, ($v0) +/* 865CC4 80241184 C4640000 */ lwc1 $f4, ($v1) +/* 865CC8 80241188 46040000 */ add.s $f0, $f0, $f4 +/* 865CCC 8024118C 3C01428C */ lui $at, 0x428c +/* 865CD0 80241190 44811000 */ mtc1 $at, $f2 +/* 865CD4 80241194 00000000 */ nop +/* 865CD8 80241198 4602003C */ c.lt.s $f0, $f2 +/* 865CDC 8024119C 00000000 */ nop +/* 865CE0 802411A0 4500000D */ bc1f .L802411D8 +/* 865CE4 802411A4 E4400000 */ swc1 $f0, ($v0) +/* 865CE8 802411A8 3C014080 */ lui $at, 0x4080 +/* 865CEC 802411AC 44810000 */ mtc1 $at, $f0 +/* 865CF0 802411B0 00000000 */ nop +/* 865CF4 802411B4 4600203C */ c.lt.s $f4, $f0 +/* 865CF8 802411B8 00000000 */ nop +/* 865CFC 802411BC 45030001 */ bc1tl .L802411C4 +/* 865D00 802411C0 E4600000 */ swc1 $f0, ($v1) +.L802411C4: +/* 865D04 802411C4 C4600000 */ lwc1 $f0, ($v1) +/* 865D08 802411C8 3C013F80 */ lui $at, 0x3f80 +/* 865D0C 802411CC 44811000 */ mtc1 $at, $f2 +/* 865D10 802411D0 0809047A */ j .L802411E8 +/* 865D14 802411D4 46020000 */ add.s $f0, $f0, $f2 +.L802411D8: +/* 865D18 802411D8 3C014000 */ lui $at, 0x4000 +/* 865D1C 802411DC 44810000 */ mtc1 $at, $f0 +/* 865D20 802411E0 00000000 */ nop +/* 865D24 802411E4 46002001 */ sub.s $f0, $f4, $f0 +.L802411E8: +/* 865D28 802411E8 E4600000 */ swc1 $f0, ($v1) +/* 865D2C 802411EC 3C0300B6 */ lui $v1, 0xb6 +/* 865D30 802411F0 8CA20028 */ lw $v0, 0x28($a1) +/* 865D34 802411F4 34630001 */ ori $v1, $v1, 1 +/* 865D38 802411F8 14430021 */ bne $v0, $v1, .L80241280 +/* 865D3C 802411FC 0000102D */ daddu $v0, $zero, $zero +/* 865D40 80241200 3C038024 */ lui $v1, 0x8024 +/* 865D44 80241204 2463343C */ addiu $v1, $v1, 0x343c +/* 865D48 80241208 8C620000 */ lw $v0, ($v1) +/* 865D4C 8024120C 3C014080 */ lui $at, 0x4080 +/* 865D50 80241210 44810000 */ mtc1 $at, $f0 +/* 865D54 80241214 24420001 */ addiu $v0, $v0, 1 +/* 865D58 80241218 3C018024 */ lui $at, 0x8024 +/* 865D5C 8024121C E4203438 */ swc1 $f0, 0x3438($at) +/* 865D60 80241220 0809049F */ j .L8024127C +/* 865D64 80241224 AC620000 */ sw $v0, ($v1) +.L80241228: +/* 865D68 80241228 3C028024 */ lui $v0, 0x8024 +/* 865D6C 8024122C 24423434 */ addiu $v0, $v0, 0x3434 +/* 865D70 80241230 3C038024 */ lui $v1, 0x8024 +/* 865D74 80241234 24633438 */ addiu $v1, $v1, 0x3438 +/* 865D78 80241238 C4400000 */ lwc1 $f0, ($v0) +/* 865D7C 8024123C C4620000 */ lwc1 $f2, ($v1) +/* 865D80 80241240 46020001 */ sub.s $f0, $f0, $f2 +/* 865D84 80241244 44802000 */ mtc1 $zero, $f4 +/* 865D88 80241248 00000000 */ nop +/* 865D8C 8024124C 4604003C */ c.lt.s $f0, $f4 +/* 865D90 80241250 00000000 */ nop +/* 865D94 80241254 45000004 */ bc1f .L80241268 +/* 865D98 80241258 E4400000 */ swc1 $f0, ($v0) +/* 865D9C 8024125C E4440000 */ swc1 $f4, ($v0) +/* 865DA0 80241260 080904A0 */ j .L80241280 +/* 865DA4 80241264 24020002 */ addiu $v0, $zero, 2 +.L80241268: +/* 865DA8 80241268 3C013F80 */ lui $at, 0x3f80 +/* 865DAC 8024126C 44810000 */ mtc1 $at, $f0 +/* 865DB0 80241270 00000000 */ nop +/* 865DB4 80241274 46001000 */ add.s $f0, $f2, $f0 +/* 865DB8 80241278 E4600000 */ swc1 $f0, ($v1) +.L8024127C: +/* 865DBC 8024127C 0000102D */ daddu $v0, $zero, $zero +.L80241280: +/* 865DC0 80241280 8FBF0014 */ lw $ra, 0x14($sp) +/* 865DC4 80241284 8FB00010 */ lw $s0, 0x10($sp) +/* 865DC8 80241288 03E00008 */ jr $ra +/* 865DCC 8024128C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241290.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241290.s deleted file mode 100644 index 1a1aeaa2ba..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241290.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241290 -/* 865DD0 80241290 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 865DD4 80241294 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 865DD8 80241298 8C420010 */ lw $v0, 0x10($v0) -/* 865DDC 8024129C 30424000 */ andi $v0, $v0, 0x4000 -/* 865DE0 802412A0 0002102B */ sltu $v0, $zero, $v0 -/* 865DE4 802412A4 03E00008 */ jr $ra -/* 865DE8 802412A8 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241290_865DD0.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241290_865DD0.s new file mode 100644 index 0000000000..f68019ea2d --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241290_865DD0.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241290_865DD0 +/* 865DD0 80241290 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 865DD4 80241294 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 865DD8 80241298 8C420010 */ lw $v0, 0x10($v0) +/* 865DDC 8024129C 30424000 */ andi $v0, $v0, 0x4000 +/* 865DE0 802412A0 0002102B */ sltu $v0, $zero, $v0 +/* 865DE4 802412A4 03E00008 */ jr $ra +/* 865DE8 802412A8 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC.s deleted file mode 100644 index 49b3145916..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC.s +++ /dev/null @@ -1,61 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412AC -/* 865DEC 802412AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 865DF0 802412B0 AFB10014 */ sw $s1, 0x14($sp) -/* 865DF4 802412B4 0080882D */ daddu $s1, $a0, $zero -/* 865DF8 802412B8 AFBF0020 */ sw $ra, 0x20($sp) -/* 865DFC 802412BC AFB3001C */ sw $s3, 0x1c($sp) -/* 865E00 802412C0 AFB20018 */ sw $s2, 0x18($sp) -/* 865E04 802412C4 AFB00010 */ sw $s0, 0x10($sp) -/* 865E08 802412C8 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 865E0C 802412CC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 865E10 802412D0 8E30000C */ lw $s0, 0xc($s1) -/* 865E14 802412D4 8E050000 */ lw $a1, ($s0) -/* 865E18 802412D8 0C0B1EAF */ jal get_variable -/* 865E1C 802412DC 26100004 */ addiu $s0, $s0, 4 -/* 865E20 802412E0 8E120000 */ lw $s2, ($s0) -/* 865E24 802412E4 26100004 */ addiu $s0, $s0, 4 -/* 865E28 802412E8 8E130000 */ lw $s3, ($s0) -/* 865E2C 802412EC 8E100004 */ lw $s0, 4($s0) -/* 865E30 802412F0 0C046C04 */ jal get_model_list_index_from_tree_index -/* 865E34 802412F4 0040202D */ daddu $a0, $v0, $zero -/* 865E38 802412F8 0C046B4C */ jal get_model_from_list_index -/* 865E3C 802412FC 0040202D */ daddu $a0, $v0, $zero -/* 865E40 80241300 0040302D */ daddu $a2, $v0, $zero -/* 865E44 80241304 94C20000 */ lhu $v0, ($a2) -/* 865E48 80241308 30420400 */ andi $v0, $v0, 0x400 -/* 865E4C 8024130C 10400005 */ beqz $v0, .L80241324 -/* 865E50 80241310 0220202D */ daddu $a0, $s1, $zero -/* 865E54 80241314 C4C00088 */ lwc1 $f0, 0x88($a2) -/* 865E58 80241318 C4D6008C */ lwc1 $f22, 0x8c($a2) -/* 865E5C 8024131C 080904CD */ j .L80241334 -/* 865E60 80241320 C4D40090 */ lwc1 $f20, 0x90($a2) -.L80241324: -/* 865E64 80241324 4480A000 */ mtc1 $zero, $f20 -/* 865E68 80241328 00000000 */ nop -/* 865E6C 8024132C 4600A586 */ mov.s $f22, $f20 -/* 865E70 80241330 4600A006 */ mov.s $f0, $f20 -.L80241334: -/* 865E74 80241334 44060000 */ mfc1 $a2, $f0 -/* 865E78 80241338 0C0B2190 */ jal set_float_variable -/* 865E7C 8024133C 0240282D */ daddu $a1, $s2, $zero -/* 865E80 80241340 0220202D */ daddu $a0, $s1, $zero -/* 865E84 80241344 4406B000 */ mfc1 $a2, $f22 -/* 865E88 80241348 0C0B2190 */ jal set_float_variable -/* 865E8C 8024134C 0260282D */ daddu $a1, $s3, $zero -/* 865E90 80241350 0220202D */ daddu $a0, $s1, $zero -/* 865E94 80241354 4406A000 */ mfc1 $a2, $f20 -/* 865E98 80241358 0C0B2190 */ jal set_float_variable -/* 865E9C 8024135C 0200282D */ daddu $a1, $s0, $zero -/* 865EA0 80241360 8FBF0020 */ lw $ra, 0x20($sp) -/* 865EA4 80241364 8FB3001C */ lw $s3, 0x1c($sp) -/* 865EA8 80241368 8FB20018 */ lw $s2, 0x18($sp) -/* 865EAC 8024136C 8FB10014 */ lw $s1, 0x14($sp) -/* 865EB0 80241370 8FB00010 */ lw $s0, 0x10($sp) -/* 865EB4 80241374 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 865EB8 80241378 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 865EBC 8024137C 24020002 */ addiu $v0, $zero, 2 -/* 865EC0 80241380 03E00008 */ jr $ra -/* 865EC4 80241384 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s new file mode 100644 index 0000000000..270968fce9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802412AC_865DEC.s @@ -0,0 +1,61 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412AC_865DEC +/* 865DEC 802412AC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 865DF0 802412B0 AFB10014 */ sw $s1, 0x14($sp) +/* 865DF4 802412B4 0080882D */ daddu $s1, $a0, $zero +/* 865DF8 802412B8 AFBF0020 */ sw $ra, 0x20($sp) +/* 865DFC 802412BC AFB3001C */ sw $s3, 0x1c($sp) +/* 865E00 802412C0 AFB20018 */ sw $s2, 0x18($sp) +/* 865E04 802412C4 AFB00010 */ sw $s0, 0x10($sp) +/* 865E08 802412C8 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 865E0C 802412CC F7B40028 */ sdc1 $f20, 0x28($sp) +/* 865E10 802412D0 8E30000C */ lw $s0, 0xc($s1) +/* 865E14 802412D4 8E050000 */ lw $a1, ($s0) +/* 865E18 802412D8 0C0B1EAF */ jal get_variable +/* 865E1C 802412DC 26100004 */ addiu $s0, $s0, 4 +/* 865E20 802412E0 8E120000 */ lw $s2, ($s0) +/* 865E24 802412E4 26100004 */ addiu $s0, $s0, 4 +/* 865E28 802412E8 8E130000 */ lw $s3, ($s0) +/* 865E2C 802412EC 8E100004 */ lw $s0, 4($s0) +/* 865E30 802412F0 0C046C04 */ jal get_model_list_index_from_tree_index +/* 865E34 802412F4 0040202D */ daddu $a0, $v0, $zero +/* 865E38 802412F8 0C046B4C */ jal get_model_from_list_index +/* 865E3C 802412FC 0040202D */ daddu $a0, $v0, $zero +/* 865E40 80241300 0040302D */ daddu $a2, $v0, $zero +/* 865E44 80241304 94C20000 */ lhu $v0, ($a2) +/* 865E48 80241308 30420400 */ andi $v0, $v0, 0x400 +/* 865E4C 8024130C 10400005 */ beqz $v0, .L80241324 +/* 865E50 80241310 0220202D */ daddu $a0, $s1, $zero +/* 865E54 80241314 C4C00088 */ lwc1 $f0, 0x88($a2) +/* 865E58 80241318 C4D6008C */ lwc1 $f22, 0x8c($a2) +/* 865E5C 8024131C 080904CD */ j .L80241334 +/* 865E60 80241320 C4D40090 */ lwc1 $f20, 0x90($a2) +.L80241324: +/* 865E64 80241324 4480A000 */ mtc1 $zero, $f20 +/* 865E68 80241328 00000000 */ nop +/* 865E6C 8024132C 4600A586 */ mov.s $f22, $f20 +/* 865E70 80241330 4600A006 */ mov.s $f0, $f20 +.L80241334: +/* 865E74 80241334 44060000 */ mfc1 $a2, $f0 +/* 865E78 80241338 0C0B2190 */ jal set_float_variable +/* 865E7C 8024133C 0240282D */ daddu $a1, $s2, $zero +/* 865E80 80241340 0220202D */ daddu $a0, $s1, $zero +/* 865E84 80241344 4406B000 */ mfc1 $a2, $f22 +/* 865E88 80241348 0C0B2190 */ jal set_float_variable +/* 865E8C 8024134C 0260282D */ daddu $a1, $s3, $zero +/* 865E90 80241350 0220202D */ daddu $a0, $s1, $zero +/* 865E94 80241354 4406A000 */ mfc1 $a2, $f20 +/* 865E98 80241358 0C0B2190 */ jal set_float_variable +/* 865E9C 8024135C 0200282D */ daddu $a1, $s0, $zero +/* 865EA0 80241360 8FBF0020 */ lw $ra, 0x20($sp) +/* 865EA4 80241364 8FB3001C */ lw $s3, 0x1c($sp) +/* 865EA8 80241368 8FB20018 */ lw $s2, 0x18($sp) +/* 865EAC 8024136C 8FB10014 */ lw $s1, 0x14($sp) +/* 865EB0 80241370 8FB00010 */ lw $s0, 0x10($sp) +/* 865EB4 80241374 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 865EB8 80241378 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 865EBC 8024137C 24020002 */ addiu $v0, $zero, 2 +/* 865EC0 80241380 03E00008 */ jr $ra +/* 865EC4 80241384 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388.s deleted file mode 100644 index 809f71ed72..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241388 -/* 865EC8 80241388 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 865ECC 8024138C AFB00010 */ sw $s0, 0x10($sp) -/* 865ED0 80241390 0080802D */ daddu $s0, $a0, $zero -/* 865ED4 80241394 3C05FE36 */ lui $a1, 0xfe36 -/* 865ED8 80241398 AFBF0014 */ sw $ra, 0x14($sp) -/* 865EDC 8024139C F7BC0038 */ sdc1 $f28, 0x38($sp) -/* 865EE0 802413A0 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* 865EE4 802413A4 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 865EE8 802413A8 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 865EEC 802413AC F7B40018 */ sdc1 $f20, 0x18($sp) -/* 865EF0 802413B0 0C0B210B */ jal get_float_variable -/* 865EF4 802413B4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 865EF8 802413B8 0200202D */ daddu $a0, $s0, $zero -/* 865EFC 802413BC 3C05FE36 */ lui $a1, 0xfe36 -/* 865F00 802413C0 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 865F04 802413C4 0C0B210B */ jal get_float_variable -/* 865F08 802413C8 46000706 */ mov.s $f28, $f0 -/* 865F0C 802413CC 0200202D */ daddu $a0, $s0, $zero -/* 865F10 802413D0 3C05FE36 */ lui $a1, 0xfe36 -/* 865F14 802413D4 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 865F18 802413D8 0C0B210B */ jal get_float_variable -/* 865F1C 802413DC 46000606 */ mov.s $f24, $f0 -/* 865F20 802413E0 0200202D */ daddu $a0, $s0, $zero -/* 865F24 802413E4 3C05FE36 */ lui $a1, 0xfe36 -/* 865F28 802413E8 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 865F2C 802413EC 0C0B210B */ jal get_float_variable -/* 865F30 802413F0 46000686 */ mov.s $f26, $f0 -/* 865F34 802413F4 0200202D */ daddu $a0, $s0, $zero -/* 865F38 802413F8 3C05FE36 */ lui $a1, 0xfe36 -/* 865F3C 802413FC 34A53C87 */ ori $a1, $a1, 0x3c87 -/* 865F40 80241400 0C0B210B */ jal get_float_variable -/* 865F44 80241404 46000506 */ mov.s $f20, $f0 -/* 865F48 80241408 46000586 */ mov.s $f22, $f0 -/* 865F4C 8024140C 0200202D */ daddu $a0, $s0, $zero -/* 865F50 80241410 3C05FBD3 */ lui $a1, 0xfbd3 -/* 865F54 80241414 0C0B1EAF */ jal get_variable -/* 865F58 80241418 34A5E280 */ ori $a1, $a1, 0xe280 -/* 865F5C 8024141C 10400017 */ beqz $v0, .L8024147C -/* 865F60 80241420 0200202D */ daddu $a0, $s0, $zero -/* 865F64 80241424 4480A000 */ mtc1 $zero, $f20 -/* 865F68 80241428 3C05FE36 */ lui $a1, 0xfe36 -/* 865F6C 8024142C 4406A000 */ mfc1 $a2, $f20 -/* 865F70 80241430 0C0B2190 */ jal set_float_variable -/* 865F74 80241434 34A53C86 */ ori $a1, $a1, 0x3c86 -/* 865F78 80241438 0200202D */ daddu $a0, $s0, $zero -/* 865F7C 8024143C 3C05FE36 */ lui $a1, 0xfe36 -/* 865F80 80241440 4406A000 */ mfc1 $a2, $f20 -/* 865F84 80241444 0C0B2190 */ jal set_float_variable -/* 865F88 80241448 34A53C87 */ ori $a1, $a1, 0x3c87 -/* 865F8C 8024144C 0200202D */ daddu $a0, $s0, $zero -/* 865F90 80241450 3C05FBD3 */ lui $a1, 0xfbd3 -/* 865F94 80241454 34A5E280 */ ori $a1, $a1, 0xe280 -/* 865F98 80241458 0C0B2026 */ jal set_variable -/* 865F9C 8024145C 0000302D */ daddu $a2, $zero, $zero -/* 865FA0 80241460 0200202D */ daddu $a0, $s0, $zero -/* 865FA4 80241464 3C05FBD3 */ lui $a1, 0xfbd3 -/* 865FA8 80241468 34A5E281 */ ori $a1, $a1, 0xe281 -/* 865FAC 8024146C 0C0B2026 */ jal set_variable -/* 865FB0 80241470 24060001 */ addiu $a2, $zero, 1 -/* 865FB4 80241474 08090576 */ j .L802415D8 -/* 865FB8 80241478 24020002 */ addiu $v0, $zero, 2 -.L8024147C: -/* 865FBC 8024147C 461AE032 */ c.eq.s $f28, $f26 -/* 865FC0 80241480 00000000 */ nop -/* 865FC4 80241484 45000007 */ bc1f .L802414A4 -/* 865FC8 80241488 3C05FBD3 */ lui $a1, 0xfbd3 -/* 865FCC 8024148C 4614C032 */ c.eq.s $f24, $f20 -/* 865FD0 80241490 00000000 */ nop -/* 865FD4 80241494 45010050 */ bc1t .L802415D8 -/* 865FD8 80241498 24020002 */ addiu $v0, $zero, 2 -/* 865FDC 8024149C 0200202D */ daddu $a0, $s0, $zero -/* 865FE0 802414A0 3C05FBD3 */ lui $a1, 0xfbd3 -.L802414A4: -/* 865FE4 802414A4 0C0B1EAF */ jal get_variable -/* 865FE8 802414A8 34A5E281 */ ori $a1, $a1, 0xe281 -/* 865FEC 802414AC 10400018 */ beqz $v0, .L80241510 -/* 865FF0 802414B0 4600C386 */ mov.s $f14, $f24 -/* 865FF4 802414B4 4600D687 */ neg.s $f26, $f26 -/* 865FF8 802414B8 4407A000 */ mfc1 $a3, $f20 -/* 865FFC 802414BC 4406D000 */ mfc1 $a2, $f26 -/* 866000 802414C0 0C00A720 */ jal atan2 -/* 866004 802414C4 4600E307 */ neg.s $f12, $f28 -/* 866008 802414C8 46000506 */ mov.s $f20, $f0 -/* 86600C 802414CC 0200202D */ daddu $a0, $s0, $zero -/* 866010 802414D0 3C05FE36 */ lui $a1, 0xfe36 -/* 866014 802414D4 4406A000 */ mfc1 $a2, $f20 -/* 866018 802414D8 0C0B2190 */ jal set_float_variable -/* 86601C 802414DC 34A53C86 */ ori $a1, $a1, 0x3c86 -/* 866020 802414E0 0200202D */ daddu $a0, $s0, $zero -/* 866024 802414E4 3C05FE36 */ lui $a1, 0xfe36 -/* 866028 802414E8 4406A000 */ mfc1 $a2, $f20 -/* 86602C 802414EC 0C0B2190 */ jal set_float_variable -/* 866030 802414F0 34A53C87 */ ori $a1, $a1, 0x3c87 -/* 866034 802414F4 0200202D */ daddu $a0, $s0, $zero -/* 866038 802414F8 3C05FBD3 */ lui $a1, 0xfbd3 -/* 86603C 802414FC 34A5E281 */ ori $a1, $a1, 0xe281 -/* 866040 80241500 0C0B2026 */ jal set_variable -/* 866044 80241504 0000302D */ daddu $a2, $zero, $zero -/* 866048 80241508 08090576 */ j .L802415D8 -/* 86604C 8024150C 24020002 */ addiu $v0, $zero, 2 -.L80241510: -/* 866050 80241510 4407A000 */ mfc1 $a3, $f20 -/* 866054 80241514 4600D687 */ neg.s $f26, $f26 -/* 866058 80241518 4406D000 */ mfc1 $a2, $f26 -/* 86605C 8024151C 0C00A720 */ jal atan2 -/* 866060 80241520 4600E307 */ neg.s $f12, $f28 -/* 866064 80241524 0C00A6C9 */ jal clamp_angle -/* 866068 80241528 46000306 */ mov.s $f12, $f0 -/* 86606C 8024152C 46000506 */ mov.s $f20, $f0 -/* 866070 80241530 0200202D */ daddu $a0, $s0, $zero -/* 866074 80241534 3C05FE36 */ lui $a1, 0xfe36 -/* 866078 80241538 4406A000 */ mfc1 $a2, $f20 -/* 86607C 8024153C 0C0B2190 */ jal set_float_variable -/* 866080 80241540 34A53C86 */ ori $a1, $a1, 0x3c86 -/* 866084 80241544 4614B081 */ sub.s $f2, $f22, $f20 -/* 866088 80241548 3C014334 */ lui $at, 0x4334 -/* 86608C 8024154C 44810000 */ mtc1 $at, $f0 -/* 866090 80241550 00000000 */ nop -/* 866094 80241554 4602003E */ c.le.s $f0, $f2 -/* 866098 80241558 00000000 */ nop -/* 86609C 8024155C 45000005 */ bc1f .L80241574 -/* 8660A0 80241560 00000000 */ nop -/* 8660A4 80241564 3C0143B4 */ lui $at, 0x43b4 -/* 8660A8 80241568 44810000 */ mtc1 $at, $f0 -/* 8660AC 8024156C 08090568 */ j .L802415A0 -/* 8660B0 80241570 4600B581 */ sub.s $f22, $f22, $f0 -.L80241574: -/* 8660B4 80241574 3C01C334 */ lui $at, 0xc334 -/* 8660B8 80241578 44810000 */ mtc1 $at, $f0 -/* 8660BC 8024157C 00000000 */ nop -/* 8660C0 80241580 4600103E */ c.le.s $f2, $f0 -/* 8660C4 80241584 00000000 */ nop -/* 8660C8 80241588 45020006 */ bc1fl .L802415A4 -/* 8660CC 8024158C 4616A001 */ sub.s $f0, $f20, $f22 -/* 8660D0 80241590 3C0143B4 */ lui $at, 0x43b4 -/* 8660D4 80241594 44810000 */ mtc1 $at, $f0 -/* 8660D8 80241598 00000000 */ nop -/* 8660DC 8024159C 4600B580 */ add.s $f22, $f22, $f0 -.L802415A0: -/* 8660E0 802415A0 4616A001 */ sub.s $f0, $f20, $f22 -.L802415A4: -/* 8660E4 802415A4 3C018024 */ lui $at, 0x8024 -/* 8660E8 802415A8 D4224968 */ ldc1 $f2, 0x4968($at) -/* 8660EC 802415AC 46000021 */ cvt.d.s $f0, $f0 -/* 8660F0 802415B0 46220002 */ mul.d $f0, $f0, $f2 -/* 8660F4 802415B4 00000000 */ nop -/* 8660F8 802415B8 46200020 */ cvt.s.d $f0, $f0 -/* 8660FC 802415BC 4600B580 */ add.s $f22, $f22, $f0 -/* 866100 802415C0 0200202D */ daddu $a0, $s0, $zero -/* 866104 802415C4 3C05FE36 */ lui $a1, 0xfe36 -/* 866108 802415C8 4406B000 */ mfc1 $a2, $f22 -/* 86610C 802415CC 0C0B2190 */ jal set_float_variable -/* 866110 802415D0 34A53C87 */ ori $a1, $a1, 0x3c87 -/* 866114 802415D4 24020002 */ addiu $v0, $zero, 2 -.L802415D8: -/* 866118 802415D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 86611C 802415DC 8FB00010 */ lw $s0, 0x10($sp) -/* 866120 802415E0 D7BC0038 */ ldc1 $f28, 0x38($sp) -/* 866124 802415E4 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* 866128 802415E8 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 86612C 802415EC D7B60020 */ ldc1 $f22, 0x20($sp) -/* 866130 802415F0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 866134 802415F4 03E00008 */ jr $ra -/* 866138 802415F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s new file mode 100644 index 0000000000..d1ed2674c5 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_80241388_865EC8.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241388_865EC8 +/* 865EC8 80241388 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 865ECC 8024138C AFB00010 */ sw $s0, 0x10($sp) +/* 865ED0 80241390 0080802D */ daddu $s0, $a0, $zero +/* 865ED4 80241394 3C05FE36 */ lui $a1, 0xfe36 +/* 865ED8 80241398 AFBF0014 */ sw $ra, 0x14($sp) +/* 865EDC 8024139C F7BC0038 */ sdc1 $f28, 0x38($sp) +/* 865EE0 802413A0 F7BA0030 */ sdc1 $f26, 0x30($sp) +/* 865EE4 802413A4 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 865EE8 802413A8 F7B60020 */ sdc1 $f22, 0x20($sp) +/* 865EEC 802413AC F7B40018 */ sdc1 $f20, 0x18($sp) +/* 865EF0 802413B0 0C0B210B */ jal get_float_variable +/* 865EF4 802413B4 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 865EF8 802413B8 0200202D */ daddu $a0, $s0, $zero +/* 865EFC 802413BC 3C05FE36 */ lui $a1, 0xfe36 +/* 865F00 802413C0 34A53C83 */ ori $a1, $a1, 0x3c83 +/* 865F04 802413C4 0C0B210B */ jal get_float_variable +/* 865F08 802413C8 46000706 */ mov.s $f28, $f0 +/* 865F0C 802413CC 0200202D */ daddu $a0, $s0, $zero +/* 865F10 802413D0 3C05FE36 */ lui $a1, 0xfe36 +/* 865F14 802413D4 34A53C84 */ ori $a1, $a1, 0x3c84 +/* 865F18 802413D8 0C0B210B */ jal get_float_variable +/* 865F1C 802413DC 46000606 */ mov.s $f24, $f0 +/* 865F20 802413E0 0200202D */ daddu $a0, $s0, $zero +/* 865F24 802413E4 3C05FE36 */ lui $a1, 0xfe36 +/* 865F28 802413E8 34A53C85 */ ori $a1, $a1, 0x3c85 +/* 865F2C 802413EC 0C0B210B */ jal get_float_variable +/* 865F30 802413F0 46000686 */ mov.s $f26, $f0 +/* 865F34 802413F4 0200202D */ daddu $a0, $s0, $zero +/* 865F38 802413F8 3C05FE36 */ lui $a1, 0xfe36 +/* 865F3C 802413FC 34A53C87 */ ori $a1, $a1, 0x3c87 +/* 865F40 80241400 0C0B210B */ jal get_float_variable +/* 865F44 80241404 46000506 */ mov.s $f20, $f0 +/* 865F48 80241408 46000586 */ mov.s $f22, $f0 +/* 865F4C 8024140C 0200202D */ daddu $a0, $s0, $zero +/* 865F50 80241410 3C05FBD3 */ lui $a1, 0xfbd3 +/* 865F54 80241414 0C0B1EAF */ jal get_variable +/* 865F58 80241418 34A5E280 */ ori $a1, $a1, 0xe280 +/* 865F5C 8024141C 10400017 */ beqz $v0, .L8024147C +/* 865F60 80241420 0200202D */ daddu $a0, $s0, $zero +/* 865F64 80241424 4480A000 */ mtc1 $zero, $f20 +/* 865F68 80241428 3C05FE36 */ lui $a1, 0xfe36 +/* 865F6C 8024142C 4406A000 */ mfc1 $a2, $f20 +/* 865F70 80241430 0C0B2190 */ jal set_float_variable +/* 865F74 80241434 34A53C86 */ ori $a1, $a1, 0x3c86 +/* 865F78 80241438 0200202D */ daddu $a0, $s0, $zero +/* 865F7C 8024143C 3C05FE36 */ lui $a1, 0xfe36 +/* 865F80 80241440 4406A000 */ mfc1 $a2, $f20 +/* 865F84 80241444 0C0B2190 */ jal set_float_variable +/* 865F88 80241448 34A53C87 */ ori $a1, $a1, 0x3c87 +/* 865F8C 8024144C 0200202D */ daddu $a0, $s0, $zero +/* 865F90 80241450 3C05FBD3 */ lui $a1, 0xfbd3 +/* 865F94 80241454 34A5E280 */ ori $a1, $a1, 0xe280 +/* 865F98 80241458 0C0B2026 */ jal set_variable +/* 865F9C 8024145C 0000302D */ daddu $a2, $zero, $zero +/* 865FA0 80241460 0200202D */ daddu $a0, $s0, $zero +/* 865FA4 80241464 3C05FBD3 */ lui $a1, 0xfbd3 +/* 865FA8 80241468 34A5E281 */ ori $a1, $a1, 0xe281 +/* 865FAC 8024146C 0C0B2026 */ jal set_variable +/* 865FB0 80241470 24060001 */ addiu $a2, $zero, 1 +/* 865FB4 80241474 08090576 */ j .L802415D8 +/* 865FB8 80241478 24020002 */ addiu $v0, $zero, 2 +.L8024147C: +/* 865FBC 8024147C 461AE032 */ c.eq.s $f28, $f26 +/* 865FC0 80241480 00000000 */ nop +/* 865FC4 80241484 45000007 */ bc1f .L802414A4 +/* 865FC8 80241488 3C05FBD3 */ lui $a1, 0xfbd3 +/* 865FCC 8024148C 4614C032 */ c.eq.s $f24, $f20 +/* 865FD0 80241490 00000000 */ nop +/* 865FD4 80241494 45010050 */ bc1t .L802415D8 +/* 865FD8 80241498 24020002 */ addiu $v0, $zero, 2 +/* 865FDC 8024149C 0200202D */ daddu $a0, $s0, $zero +/* 865FE0 802414A0 3C05FBD3 */ lui $a1, 0xfbd3 +.L802414A4: +/* 865FE4 802414A4 0C0B1EAF */ jal get_variable +/* 865FE8 802414A8 34A5E281 */ ori $a1, $a1, 0xe281 +/* 865FEC 802414AC 10400018 */ beqz $v0, .L80241510 +/* 865FF0 802414B0 4600C386 */ mov.s $f14, $f24 +/* 865FF4 802414B4 4600D687 */ neg.s $f26, $f26 +/* 865FF8 802414B8 4407A000 */ mfc1 $a3, $f20 +/* 865FFC 802414BC 4406D000 */ mfc1 $a2, $f26 +/* 866000 802414C0 0C00A720 */ jal atan2 +/* 866004 802414C4 4600E307 */ neg.s $f12, $f28 +/* 866008 802414C8 46000506 */ mov.s $f20, $f0 +/* 86600C 802414CC 0200202D */ daddu $a0, $s0, $zero +/* 866010 802414D0 3C05FE36 */ lui $a1, 0xfe36 +/* 866014 802414D4 4406A000 */ mfc1 $a2, $f20 +/* 866018 802414D8 0C0B2190 */ jal set_float_variable +/* 86601C 802414DC 34A53C86 */ ori $a1, $a1, 0x3c86 +/* 866020 802414E0 0200202D */ daddu $a0, $s0, $zero +/* 866024 802414E4 3C05FE36 */ lui $a1, 0xfe36 +/* 866028 802414E8 4406A000 */ mfc1 $a2, $f20 +/* 86602C 802414EC 0C0B2190 */ jal set_float_variable +/* 866030 802414F0 34A53C87 */ ori $a1, $a1, 0x3c87 +/* 866034 802414F4 0200202D */ daddu $a0, $s0, $zero +/* 866038 802414F8 3C05FBD3 */ lui $a1, 0xfbd3 +/* 86603C 802414FC 34A5E281 */ ori $a1, $a1, 0xe281 +/* 866040 80241500 0C0B2026 */ jal set_variable +/* 866044 80241504 0000302D */ daddu $a2, $zero, $zero +/* 866048 80241508 08090576 */ j .L802415D8 +/* 86604C 8024150C 24020002 */ addiu $v0, $zero, 2 +.L80241510: +/* 866050 80241510 4407A000 */ mfc1 $a3, $f20 +/* 866054 80241514 4600D687 */ neg.s $f26, $f26 +/* 866058 80241518 4406D000 */ mfc1 $a2, $f26 +/* 86605C 8024151C 0C00A720 */ jal atan2 +/* 866060 80241520 4600E307 */ neg.s $f12, $f28 +/* 866064 80241524 0C00A6C9 */ jal clamp_angle +/* 866068 80241528 46000306 */ mov.s $f12, $f0 +/* 86606C 8024152C 46000506 */ mov.s $f20, $f0 +/* 866070 80241530 0200202D */ daddu $a0, $s0, $zero +/* 866074 80241534 3C05FE36 */ lui $a1, 0xfe36 +/* 866078 80241538 4406A000 */ mfc1 $a2, $f20 +/* 86607C 8024153C 0C0B2190 */ jal set_float_variable +/* 866080 80241540 34A53C86 */ ori $a1, $a1, 0x3c86 +/* 866084 80241544 4614B081 */ sub.s $f2, $f22, $f20 +/* 866088 80241548 3C014334 */ lui $at, 0x4334 +/* 86608C 8024154C 44810000 */ mtc1 $at, $f0 +/* 866090 80241550 00000000 */ nop +/* 866094 80241554 4602003E */ c.le.s $f0, $f2 +/* 866098 80241558 00000000 */ nop +/* 86609C 8024155C 45000005 */ bc1f .L80241574 +/* 8660A0 80241560 00000000 */ nop +/* 8660A4 80241564 3C0143B4 */ lui $at, 0x43b4 +/* 8660A8 80241568 44810000 */ mtc1 $at, $f0 +/* 8660AC 8024156C 08090568 */ j .L802415A0 +/* 8660B0 80241570 4600B581 */ sub.s $f22, $f22, $f0 +.L80241574: +/* 8660B4 80241574 3C01C334 */ lui $at, 0xc334 +/* 8660B8 80241578 44810000 */ mtc1 $at, $f0 +/* 8660BC 8024157C 00000000 */ nop +/* 8660C0 80241580 4600103E */ c.le.s $f2, $f0 +/* 8660C4 80241584 00000000 */ nop +/* 8660C8 80241588 45020006 */ bc1fl .L802415A4 +/* 8660CC 8024158C 4616A001 */ sub.s $f0, $f20, $f22 +/* 8660D0 80241590 3C0143B4 */ lui $at, 0x43b4 +/* 8660D4 80241594 44810000 */ mtc1 $at, $f0 +/* 8660D8 80241598 00000000 */ nop +/* 8660DC 8024159C 4600B580 */ add.s $f22, $f22, $f0 +.L802415A0: +/* 8660E0 802415A0 4616A001 */ sub.s $f0, $f20, $f22 +.L802415A4: +/* 8660E4 802415A4 3C018024 */ lui $at, 0x8024 +/* 8660E8 802415A8 D4224968 */ ldc1 $f2, 0x4968($at) +/* 8660EC 802415AC 46000021 */ cvt.d.s $f0, $f0 +/* 8660F0 802415B0 46220002 */ mul.d $f0, $f0, $f2 +/* 8660F4 802415B4 00000000 */ nop +/* 8660F8 802415B8 46200020 */ cvt.s.d $f0, $f0 +/* 8660FC 802415BC 4600B580 */ add.s $f22, $f22, $f0 +/* 866100 802415C0 0200202D */ daddu $a0, $s0, $zero +/* 866104 802415C4 3C05FE36 */ lui $a1, 0xfe36 +/* 866108 802415C8 4406B000 */ mfc1 $a2, $f22 +/* 86610C 802415CC 0C0B2190 */ jal set_float_variable +/* 866110 802415D0 34A53C87 */ ori $a1, $a1, 0x3c87 +/* 866114 802415D4 24020002 */ addiu $v0, $zero, 2 +.L802415D8: +/* 866118 802415D8 8FBF0014 */ lw $ra, 0x14($sp) +/* 86611C 802415DC 8FB00010 */ lw $s0, 0x10($sp) +/* 866120 802415E0 D7BC0038 */ ldc1 $f28, 0x38($sp) +/* 866124 802415E4 D7BA0030 */ ldc1 $f26, 0x30($sp) +/* 866128 802415E8 D7B80028 */ ldc1 $f24, 0x28($sp) +/* 86612C 802415EC D7B60020 */ ldc1 $f22, 0x20($sp) +/* 866130 802415F0 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 866134 802415F4 03E00008 */ jr $ra +/* 866138 802415F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC.s deleted file mode 100644 index c827535fd0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415FC -/* 86613C 802415FC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 866140 80241600 AFBF0018 */ sw $ra, 0x18($sp) -/* 866144 80241604 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 866148 80241608 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 86614C 8024160C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 866150 80241610 0C00EAD2 */ jal get_npc_safe -/* 866154 80241614 24040003 */ addiu $a0, $zero, 3 -/* 866158 80241618 C4420038 */ lwc1 $f2, 0x38($v0) -/* 86615C 8024161C 3C014120 */ lui $at, 0x4120 -/* 866160 80241620 44810000 */ mtc1 $at, $f0 -/* 866164 80241624 C454003C */ lwc1 $f20, 0x3c($v0) -/* 866168 80241628 46001600 */ add.s $f24, $f2, $f0 -/* 86616C 8024162C 44800000 */ mtc1 $zero, $f0 -/* 866170 80241630 C4560040 */ lwc1 $f22, 0x40($v0) -/* 866174 80241634 4600A03C */ c.lt.s $f20, $f0 -/* 866178 80241638 00000000 */ nop -/* 86617C 8024163C 4500000C */ bc1f .L80241670 -/* 866180 80241640 0000202D */ daddu $a0, $zero, $zero -/* 866184 80241644 4405C000 */ mfc1 $a1, $f24 -/* 866188 80241648 4406A000 */ mfc1 $a2, $f20 -/* 86618C 8024164C 4407B000 */ mfc1 $a3, $f22 -/* 866190 80241650 0C01C16C */ jal func_800705B0 -/* 866194 80241654 E7A00010 */ swc1 $f0, 0x10($sp) -/* 866198 80241658 24040046 */ addiu $a0, $zero, 0x46 -/* 86619C 8024165C 4406C000 */ mfc1 $a2, $f24 -/* 8661A0 80241660 4407A000 */ mfc1 $a3, $f20 -/* 8661A4 80241664 0000282D */ daddu $a1, $zero, $zero -/* 8661A8 80241668 0C05267B */ jal func_801499EC -/* 8661AC 8024166C E7B60010 */ swc1 $f22, 0x10($sp) -.L80241670: -/* 8661B0 80241670 8FBF0018 */ lw $ra, 0x18($sp) -/* 8661B4 80241674 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8661B8 80241678 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8661BC 8024167C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8661C0 80241680 24020002 */ addiu $v0, $zero, 2 -/* 8661C4 80241684 03E00008 */ jr $ra -/* 8661C8 80241688 27BD0038 */ addiu $sp, $sp, 0x38 -/* 8661CC 8024168C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s new file mode 100644 index 0000000000..a74a183cdd --- /dev/null +++ b/asm/nonmatchings/world/area_mac/mac_06/8659C0/func_802415FC_86613C.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415FC_86613C +/* 86613C 802415FC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 866140 80241600 AFBF0018 */ sw $ra, 0x18($sp) +/* 866144 80241604 F7B80030 */ sdc1 $f24, 0x30($sp) +/* 866148 80241608 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 86614C 8024160C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 866150 80241610 0C00EAD2 */ jal get_npc_safe +/* 866154 80241614 24040003 */ addiu $a0, $zero, 3 +/* 866158 80241618 C4420038 */ lwc1 $f2, 0x38($v0) +/* 86615C 8024161C 3C014120 */ lui $at, 0x4120 +/* 866160 80241620 44810000 */ mtc1 $at, $f0 +/* 866164 80241624 C454003C */ lwc1 $f20, 0x3c($v0) +/* 866168 80241628 46001600 */ add.s $f24, $f2, $f0 +/* 86616C 8024162C 44800000 */ mtc1 $zero, $f0 +/* 866170 80241630 C4560040 */ lwc1 $f22, 0x40($v0) +/* 866174 80241634 4600A03C */ c.lt.s $f20, $f0 +/* 866178 80241638 00000000 */ nop +/* 86617C 8024163C 4500000C */ bc1f .L80241670 +/* 866180 80241640 0000202D */ daddu $a0, $zero, $zero +/* 866184 80241644 4405C000 */ mfc1 $a1, $f24 +/* 866188 80241648 4406A000 */ mfc1 $a2, $f20 +/* 86618C 8024164C 4407B000 */ mfc1 $a3, $f22 +/* 866190 80241650 0C01C16C */ jal func_800705B0 +/* 866194 80241654 E7A00010 */ swc1 $f0, 0x10($sp) +/* 866198 80241658 24040046 */ addiu $a0, $zero, 0x46 +/* 86619C 8024165C 4406C000 */ mfc1 $a2, $f24 +/* 8661A0 80241660 4407A000 */ mfc1 $a3, $f20 +/* 8661A4 80241664 0000282D */ daddu $a1, $zero, $zero +/* 8661A8 80241668 0C05267B */ jal func_801499EC +/* 8661AC 8024166C E7B60010 */ swc1 $f22, 0x10($sp) +.L80241670: +/* 8661B0 80241670 8FBF0018 */ lw $ra, 0x18($sp) +/* 8661B4 80241674 D7B80030 */ ldc1 $f24, 0x30($sp) +/* 8661B8 80241678 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 8661BC 8024167C D7B40020 */ ldc1 $f20, 0x20($sp) +/* 8661C0 80241680 24020002 */ addiu $v0, $zero, 2 +/* 8661C4 80241684 03E00008 */ jr $ra +/* 8661C8 80241688 27BD0038 */ addiu $sp, $sp, 0x38 +/* 8661CC 8024168C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000.s deleted file mode 100644 index bd0fa4a84c..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000 -/* 7E73A0 80240000 3C038024 */ lui $v1, 0x8024 -/* 7E73A4 80240004 246307E0 */ addiu $v1, $v1, 0x7e0 -.L80240008: -/* 7E73A8 80240008 8C620000 */ lw $v0, ($v1) -/* 7E73AC 8024000C 1440FFFE */ bnez $v0, .L80240008 -/* 7E73B0 80240010 24630010 */ addiu $v1, $v1, 0x10 -/* 7E73B4 80240014 3C038024 */ lui $v1, 0x8024 -/* 7E73B8 80240018 246309F0 */ addiu $v1, $v1, 0x9f0 -.L8024001C: -/* 7E73BC 8024001C 8C620000 */ lw $v0, ($v1) -/* 7E73C0 80240020 1440FFFE */ bnez $v0, .L8024001C -/* 7E73C4 80240024 24630010 */ addiu $v1, $v1, 0x10 -/* 7E73C8 80240028 03E00008 */ jr $ra -/* 7E73CC 8024002C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s new file mode 100644 index 0000000000..e9feda4933 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240000_7E73A0.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240000_7E73A0 +/* 7E73A0 80240000 3C038024 */ lui $v1, 0x8024 +/* 7E73A4 80240004 246307E0 */ addiu $v1, $v1, 0x7e0 +.L80240008: +/* 7E73A8 80240008 8C620000 */ lw $v0, ($v1) +/* 7E73AC 8024000C 1440FFFE */ bnez $v0, .L80240008 +/* 7E73B0 80240010 24630010 */ addiu $v1, $v1, 0x10 +/* 7E73B4 80240014 3C038024 */ lui $v1, 0x8024 +/* 7E73B8 80240018 246309F0 */ addiu $v1, $v1, 0x9f0 +.L8024001C: +/* 7E73BC 8024001C 8C620000 */ lw $v0, ($v1) +/* 7E73C0 80240020 1440FFFE */ bnez $v0, .L8024001C +/* 7E73C4 80240024 24630010 */ addiu $v1, $v1, 0x10 +/* 7E73C8 80240028 03E00008 */ jr $ra +/* 7E73CC 8024002C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240030.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240030.s deleted file mode 100644 index 6186d70e24..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240030.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240030 -/* 7E73D0 80240030 03E00008 */ jr $ra -/* 7E73D4 80240034 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240030_7E73D0.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240030_7E73D0.s new file mode 100644 index 0000000000..e9cdfd959f --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240030_7E73D0.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240030_7E73D0 +/* 7E73D0 80240030 03E00008 */ jr $ra +/* 7E73D4 80240034 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240038.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240038.s deleted file mode 100644 index 05c23ad366..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240038.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240038 -/* 7E73D8 80240038 03E00008 */ jr $ra -/* 7E73DC 8024003C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240038_7E73D8.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240038_7E73D8.s new file mode 100644 index 0000000000..f69bbeaed4 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240038_7E73D8.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240038_7E73D8 +/* 7E73D8 80240038 03E00008 */ jr $ra +/* 7E73DC 8024003C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240040.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240040.s deleted file mode 100644 index ac98dc54b9..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240040.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240040 -/* 7E73E0 80240040 03E00008 */ jr $ra -/* 7E73E4 80240044 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240040_7E73E0.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240040_7E73E0.s new file mode 100644 index 0000000000..12f7f11982 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240040_7E73E0.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240040_7E73E0 +/* 7E73E0 80240040 03E00008 */ jr $ra +/* 7E73E4 80240044 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048.s deleted file mode 100644 index 956810bb12..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240048 -/* 7E73E8 80240048 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E73EC 8024004C AFB00010 */ sw $s0, 0x10($sp) -/* 7E73F0 80240050 0080802D */ daddu $s0, $a0, $zero -/* 7E73F4 80240054 10A00008 */ beqz $a1, .L80240078 -/* 7E73F8 80240058 AFBF0014 */ sw $ra, 0x14($sp) -/* 7E73FC 8024005C 3C03800A */ lui $v1, %hi(D_8009A650) -/* 7E7400 80240060 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 7E7404 80240064 8C620000 */ lw $v0, ($v1) -/* 7E7408 80240068 AE000070 */ sw $zero, 0x70($s0) -/* 7E740C 8024006C AE000074 */ sw $zero, 0x74($s0) -/* 7E7410 80240070 34420010 */ ori $v0, $v0, 0x10 -/* 7E7414 80240074 AC620000 */ sw $v0, ($v1) -.L80240078: -/* 7E7418 80240078 C6000074 */ lwc1 $f0, 0x74($s0) -/* 7E741C 8024007C 46800020 */ cvt.s.w $f0, $f0 -/* 7E7420 80240080 44050000 */ mfc1 $a1, $f0 -/* 7E7424 80240084 0C04DF62 */ jal func_80137D88 -/* 7E7428 80240088 0000202D */ daddu $a0, $zero, $zero -/* 7E742C 8024008C 8E020074 */ lw $v0, 0x74($s0) -/* 7E7430 80240090 240300FF */ addiu $v1, $zero, 0xff -/* 7E7434 80240094 14430003 */ bne $v0, $v1, .L802400A4 -/* 7E7438 80240098 2442000A */ addiu $v0, $v0, 0xa -/* 7E743C 8024009C 0809002E */ j .L802400B8 -/* 7E7440 802400A0 24020002 */ addiu $v0, $zero, 2 -.L802400A4: -/* 7E7444 802400A4 AE020074 */ sw $v0, 0x74($s0) -/* 7E7448 802400A8 28420100 */ slti $v0, $v0, 0x100 -/* 7E744C 802400AC 50400001 */ beql $v0, $zero, .L802400B4 -/* 7E7450 802400B0 AE030074 */ sw $v1, 0x74($s0) -.L802400B4: -/* 7E7454 802400B4 0000102D */ daddu $v0, $zero, $zero -.L802400B8: -/* 7E7458 802400B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 7E745C 802400BC 8FB00010 */ lw $s0, 0x10($sp) -/* 7E7460 802400C0 03E00008 */ jr $ra -/* 7E7464 802400C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048_7E73E8.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048_7E73E8.s new file mode 100644 index 0000000000..e09afc56ba --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240048_7E73E8.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240048_7E73E8 +/* 7E73E8 80240048 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E73EC 8024004C AFB00010 */ sw $s0, 0x10($sp) +/* 7E73F0 80240050 0080802D */ daddu $s0, $a0, $zero +/* 7E73F4 80240054 10A00008 */ beqz $a1, .L80240078 +/* 7E73F8 80240058 AFBF0014 */ sw $ra, 0x14($sp) +/* 7E73FC 8024005C 3C03800A */ lui $v1, %hi(D_8009A650) +/* 7E7400 80240060 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) +/* 7E7404 80240064 8C620000 */ lw $v0, ($v1) +/* 7E7408 80240068 AE000070 */ sw $zero, 0x70($s0) +/* 7E740C 8024006C AE000074 */ sw $zero, 0x74($s0) +/* 7E7410 80240070 34420010 */ ori $v0, $v0, 0x10 +/* 7E7414 80240074 AC620000 */ sw $v0, ($v1) +.L80240078: +/* 7E7418 80240078 C6000074 */ lwc1 $f0, 0x74($s0) +/* 7E741C 8024007C 46800020 */ cvt.s.w $f0, $f0 +/* 7E7420 80240080 44050000 */ mfc1 $a1, $f0 +/* 7E7424 80240084 0C04DF62 */ jal func_80137D88 +/* 7E7428 80240088 0000202D */ daddu $a0, $zero, $zero +/* 7E742C 8024008C 8E020074 */ lw $v0, 0x74($s0) +/* 7E7430 80240090 240300FF */ addiu $v1, $zero, 0xff +/* 7E7434 80240094 14430003 */ bne $v0, $v1, .L802400A4 +/* 7E7438 80240098 2442000A */ addiu $v0, $v0, 0xa +/* 7E743C 8024009C 0809002E */ j .L802400B8 +/* 7E7440 802400A0 24020002 */ addiu $v0, $zero, 2 +.L802400A4: +/* 7E7444 802400A4 AE020074 */ sw $v0, 0x74($s0) +/* 7E7448 802400A8 28420100 */ slti $v0, $v0, 0x100 +/* 7E744C 802400AC 50400001 */ beql $v0, $zero, .L802400B4 +/* 7E7450 802400B0 AE030074 */ sw $v1, 0x74($s0) +.L802400B4: +/* 7E7454 802400B4 0000102D */ daddu $v0, $zero, $zero +.L802400B8: +/* 7E7458 802400B8 8FBF0014 */ lw $ra, 0x14($sp) +/* 7E745C 802400BC 8FB00010 */ lw $s0, 0x10($sp) +/* 7E7460 802400C0 03E00008 */ jr $ra +/* 7E7464 802400C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_802400C8.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_802400C8.s deleted file mode 100644 index dd8a558dd6..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_802400C8.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C8 -/* 7E7468 802400C8 8C820084 */ lw $v0, 0x84($a0) -/* 7E746C 802400CC 3C058011 */ lui $a1, %hi(gPlayerData) -/* 7E7470 802400D0 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 7E7474 802400D4 24420001 */ addiu $v0, $v0, 1 -/* 7E7478 802400D8 000210C0 */ sll $v0, $v0, 3 -/* 7E747C 802400DC 00451021 */ addu $v0, $v0, $a1 -/* 7E7480 802400E0 90430015 */ lbu $v1, 0x15($v0) -/* 7E7484 802400E4 24630001 */ addiu $v1, $v1, 1 -/* 7E7488 802400E8 A0430015 */ sb $v1, 0x15($v0) -/* 7E748C 802400EC AC800084 */ sw $zero, 0x84($a0) -/* 7E7490 802400F0 80A2001D */ lb $v0, 0x1d($a1) -/* 7E7494 802400F4 28420003 */ slti $v0, $v0, 3 -/* 7E7498 802400F8 14400004 */ bnez $v0, .L8024010C -/* 7E749C 802400FC 24020002 */ addiu $v0, $zero, 2 -/* 7E74A0 80240100 A0A2001D */ sb $v0, 0x1d($a1) -/* 7E74A4 80240104 24020001 */ addiu $v0, $zero, 1 -/* 7E74A8 80240108 AC820084 */ sw $v0, 0x84($a0) -.L8024010C: -/* 7E74AC 8024010C 03E00008 */ jr $ra -/* 7E74B0 80240110 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_802400C8_7E7468.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_802400C8_7E7468.s new file mode 100644 index 0000000000..82166d2e58 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_802400C8_7E7468.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400C8_7E7468 +/* 7E7468 802400C8 8C820084 */ lw $v0, 0x84($a0) +/* 7E746C 802400CC 3C058011 */ lui $a1, %hi(gPlayerData) +/* 7E7470 802400D0 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* 7E7474 802400D4 24420001 */ addiu $v0, $v0, 1 +/* 7E7478 802400D8 000210C0 */ sll $v0, $v0, 3 +/* 7E747C 802400DC 00451021 */ addu $v0, $v0, $a1 +/* 7E7480 802400E0 90430015 */ lbu $v1, 0x15($v0) +/* 7E7484 802400E4 24630001 */ addiu $v1, $v1, 1 +/* 7E7488 802400E8 A0430015 */ sb $v1, 0x15($v0) +/* 7E748C 802400EC AC800084 */ sw $zero, 0x84($a0) +/* 7E7490 802400F0 80A2001D */ lb $v0, 0x1d($a1) +/* 7E7494 802400F4 28420003 */ slti $v0, $v0, 3 +/* 7E7498 802400F8 14400004 */ bnez $v0, .L8024010C +/* 7E749C 802400FC 24020002 */ addiu $v0, $zero, 2 +/* 7E74A0 80240100 A0A2001D */ sb $v0, 0x1d($a1) +/* 7E74A4 80240104 24020001 */ addiu $v0, $zero, 1 +/* 7E74A8 80240108 AC820084 */ sw $v0, 0x84($a0) +.L8024010C: +/* 7E74AC 8024010C 03E00008 */ jr $ra +/* 7E74B0 80240110 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114.s deleted file mode 100644 index 77273b33a2..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240114 -/* 7E74B4 80240114 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E74B8 80240118 AFB00010 */ sw $s0, 0x10($sp) -/* 7E74BC 8024011C 0080802D */ daddu $s0, $a0, $zero -/* 7E74C0 80240120 10A00009 */ beqz $a1, .L80240148 -/* 7E74C4 80240124 AFBF0014 */ sw $ra, 0x14($sp) -/* 7E74C8 80240128 3C02800A */ lui $v0, %hi(D_8009A650) -/* 7E74CC 8024012C 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 7E74D0 80240130 AE000070 */ sw $zero, 0x70($s0) -/* 7E74D4 80240134 8C430000 */ lw $v1, ($v0) -/* 7E74D8 80240138 240400FF */ addiu $a0, $zero, 0xff -/* 7E74DC 8024013C AE040074 */ sw $a0, 0x74($s0) -/* 7E74E0 80240140 34630010 */ ori $v1, $v1, 0x10 -/* 7E74E4 80240144 AC430000 */ sw $v1, ($v0) -.L80240148: -/* 7E74E8 80240148 C6000074 */ lwc1 $f0, 0x74($s0) -/* 7E74EC 8024014C 46800020 */ cvt.s.w $f0, $f0 -/* 7E74F0 80240150 44050000 */ mfc1 $a1, $f0 -/* 7E74F4 80240154 0C04DF62 */ jal func_80137D88 -/* 7E74F8 80240158 0000202D */ daddu $a0, $zero, $zero -/* 7E74FC 8024015C 8E020074 */ lw $v0, 0x74($s0) -/* 7E7500 80240160 14400009 */ bnez $v0, .L80240188 -/* 7E7504 80240164 2442FFF6 */ addiu $v0, $v0, -0xa -/* 7E7508 80240168 24020002 */ addiu $v0, $zero, 2 -/* 7E750C 8024016C 3C03800A */ lui $v1, %hi(D_8009A650) -/* 7E7510 80240170 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 7E7514 80240174 8C640000 */ lw $a0, ($v1) -/* 7E7518 80240178 2405FFEF */ addiu $a1, $zero, -0x11 -/* 7E751C 8024017C 00852024 */ and $a0, $a0, $a1 -/* 7E7520 80240180 08090066 */ j .L80240198 -/* 7E7524 80240184 AC640000 */ sw $a0, ($v1) -.L80240188: -/* 7E7528 80240188 04410002 */ bgez $v0, .L80240194 -/* 7E752C 8024018C AE020074 */ sw $v0, 0x74($s0) -/* 7E7530 80240190 AE000074 */ sw $zero, 0x74($s0) -.L80240194: -/* 7E7534 80240194 0000102D */ daddu $v0, $zero, $zero -.L80240198: -/* 7E7538 80240198 8FBF0014 */ lw $ra, 0x14($sp) -/* 7E753C 8024019C 8FB00010 */ lw $s0, 0x10($sp) -/* 7E7540 802401A0 03E00008 */ jr $ra -/* 7E7544 802401A4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7E7548 802401A8 00000000 */ nop -/* 7E754C 802401AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s new file mode 100644 index 0000000000..a951aedb48 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E73A0/func_80240114_7E74B4.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240114_7E74B4 +/* 7E74B4 80240114 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E74B8 80240118 AFB00010 */ sw $s0, 0x10($sp) +/* 7E74BC 8024011C 0080802D */ daddu $s0, $a0, $zero +/* 7E74C0 80240120 10A00009 */ beqz $a1, .L80240148 +/* 7E74C4 80240124 AFBF0014 */ sw $ra, 0x14($sp) +/* 7E74C8 80240128 3C02800A */ lui $v0, %hi(D_8009A650) +/* 7E74CC 8024012C 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* 7E74D0 80240130 AE000070 */ sw $zero, 0x70($s0) +/* 7E74D4 80240134 8C430000 */ lw $v1, ($v0) +/* 7E74D8 80240138 240400FF */ addiu $a0, $zero, 0xff +/* 7E74DC 8024013C AE040074 */ sw $a0, 0x74($s0) +/* 7E74E0 80240140 34630010 */ ori $v1, $v1, 0x10 +/* 7E74E4 80240144 AC430000 */ sw $v1, ($v0) +.L80240148: +/* 7E74E8 80240148 C6000074 */ lwc1 $f0, 0x74($s0) +/* 7E74EC 8024014C 46800020 */ cvt.s.w $f0, $f0 +/* 7E74F0 80240150 44050000 */ mfc1 $a1, $f0 +/* 7E74F4 80240154 0C04DF62 */ jal func_80137D88 +/* 7E74F8 80240158 0000202D */ daddu $a0, $zero, $zero +/* 7E74FC 8024015C 8E020074 */ lw $v0, 0x74($s0) +/* 7E7500 80240160 14400009 */ bnez $v0, .L80240188 +/* 7E7504 80240164 2442FFF6 */ addiu $v0, $v0, -0xa +/* 7E7508 80240168 24020002 */ addiu $v0, $zero, 2 +/* 7E750C 8024016C 3C03800A */ lui $v1, %hi(D_8009A650) +/* 7E7510 80240170 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) +/* 7E7514 80240174 8C640000 */ lw $a0, ($v1) +/* 7E7518 80240178 2405FFEF */ addiu $a1, $zero, -0x11 +/* 7E751C 8024017C 00852024 */ and $a0, $a0, $a1 +/* 7E7520 80240180 08090066 */ j .L80240198 +/* 7E7524 80240184 AC640000 */ sw $a0, ($v1) +.L80240188: +/* 7E7528 80240188 04410002 */ bgez $v0, .L80240194 +/* 7E752C 8024018C AE020074 */ sw $v0, 0x74($s0) +/* 7E7530 80240190 AE000074 */ sw $zero, 0x74($s0) +.L80240194: +/* 7E7534 80240194 0000102D */ daddu $v0, $zero, $zero +.L80240198: +/* 7E7538 80240198 8FBF0014 */ lw $ra, 0x14($sp) +/* 7E753C 8024019C 8FB00010 */ lw $s0, 0x10($sp) +/* 7E7540 802401A0 03E00008 */ jr $ra +/* 7E7544 802401A4 27BD0018 */ addiu $sp, $sp, 0x18 +/* 7E7548 802401A8 00000000 */ nop +/* 7E754C 802401AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0.s deleted file mode 100644 index 426a52bb68..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0 -/* 7E7550 802401B0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 7E7554 802401B4 AFBF002C */ sw $ra, 0x2c($sp) -/* 7E7558 802401B8 AFB20028 */ sw $s2, 0x28($sp) -/* 7E755C 802401BC AFB10024 */ sw $s1, 0x24($sp) -/* 7E7560 802401C0 AFB00020 */ sw $s0, 0x20($sp) -/* 7E7564 802401C4 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 7E7568 802401C8 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 7E756C 802401CC 8C820148 */ lw $v0, 0x148($a0) -/* 7E7570 802401D0 0C00EABB */ jal get_npc_unsafe -/* 7E7574 802401D4 84440008 */ lh $a0, 8($v0) -/* 7E7578 802401D8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 7E757C 802401DC 0C00A67F */ jal rand_int -/* 7E7580 802401E0 0040902D */ daddu $s2, $v0, $zero -/* 7E7584 802401E4 284201F4 */ slti $v0, $v0, 0x1f4 -/* 7E7588 802401E8 10400019 */ beqz $v0, .L80240250 -/* 7E758C 802401EC 00000000 */ nop -/* 7E7590 802401F0 0C00A67F */ jal rand_int -/* 7E7594 802401F4 24040004 */ addiu $a0, $zero, 4 -/* 7E7598 802401F8 24420001 */ addiu $v0, $v0, 1 -/* 7E759C 802401FC 4482B000 */ mtc1 $v0, $f22 -/* 7E75A0 80240200 00000000 */ nop -/* 7E75A4 80240204 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7E75A8 80240208 0C00A67F */ jal rand_int -/* 7E75AC 8024020C 24040003 */ addiu $a0, $zero, 3 -/* 7E75B0 80240210 24420005 */ addiu $v0, $v0, 5 -/* 7E75B4 80240214 4482A000 */ mtc1 $v0, $f20 -/* 7E75B8 80240218 00000000 */ nop -/* 7E75BC 8024021C 4680A520 */ cvt.s.w $f20, $f20 -/* 7E75C0 80240220 0C00A67F */ jal rand_int -/* 7E75C4 80240224 24040032 */ addiu $a0, $zero, 0x32 -/* 7E75C8 80240228 24040064 */ addiu $a0, $zero, 0x64 -/* 7E75CC 8024022C 0C00A67F */ jal rand_int -/* 7E75D0 80240230 24500032 */ addiu $s0, $v0, 0x32 -/* 7E75D4 80240234 0240202D */ daddu $a0, $s2, $zero -/* 7E75D8 80240238 2405FFFF */ addiu $a1, $zero, -1 -/* 7E75DC 8024023C 3C068024 */ lui $a2, 0x8024 -/* 7E75E0 80240240 24C61180 */ addiu $a2, $a2, 0x1180 -/* 7E75E4 80240244 4407B000 */ mfc1 $a3, $f22 -/* 7E75E8 80240248 080900AE */ j .L802402B8 -/* 7E75EC 8024024C 24420064 */ addiu $v0, $v0, 0x64 -.L80240250: -/* 7E75F0 80240250 0C00A67F */ jal rand_int -/* 7E75F4 80240254 24040003 */ addiu $a0, $zero, 3 -/* 7E75F8 80240258 24040004 */ addiu $a0, $zero, 4 -/* 7E75FC 8024025C 0C00A67F */ jal rand_int -/* 7E7600 80240260 2451000A */ addiu $s1, $v0, 0xa -/* 7E7604 80240264 24420001 */ addiu $v0, $v0, 1 -/* 7E7608 80240268 4482B000 */ mtc1 $v0, $f22 -/* 7E760C 8024026C 00000000 */ nop -/* 7E7610 80240270 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7E7614 80240274 0C00A67F */ jal rand_int -/* 7E7618 80240278 24040003 */ addiu $a0, $zero, 3 -/* 7E761C 8024027C 24420005 */ addiu $v0, $v0, 5 -/* 7E7620 80240280 4482A000 */ mtc1 $v0, $f20 -/* 7E7624 80240284 00000000 */ nop -/* 7E7628 80240288 4680A520 */ cvt.s.w $f20, $f20 -/* 7E762C 8024028C 0C00A67F */ jal rand_int -/* 7E7630 80240290 24040032 */ addiu $a0, $zero, 0x32 -/* 7E7634 80240294 24040064 */ addiu $a0, $zero, 0x64 -/* 7E7638 80240298 0C00A67F */ jal rand_int -/* 7E763C 8024029C 24500032 */ addiu $s0, $v0, 0x32 -/* 7E7640 802402A0 0240202D */ daddu $a0, $s2, $zero -/* 7E7644 802402A4 0220282D */ daddu $a1, $s1, $zero -/* 7E7648 802402A8 3C068024 */ lui $a2, 0x8024 -/* 7E764C 802402AC 24C61180 */ addiu $a2, $a2, 0x1180 -/* 7E7650 802402B0 4407B000 */ mfc1 $a3, $f22 -/* 7E7654 802402B4 2442000A */ addiu $v0, $v0, 0xa -.L802402B8: -/* 7E7658 802402B8 E7B40010 */ swc1 $f20, 0x10($sp) -/* 7E765C 802402BC AFB00014 */ sw $s0, 0x14($sp) -/* 7E7660 802402C0 0C0177B3 */ jal func_8005DECC -/* 7E7664 802402C4 AFA20018 */ sw $v0, 0x18($sp) -/* 7E7668 802402C8 8FBF002C */ lw $ra, 0x2c($sp) -/* 7E766C 802402CC 8FB20028 */ lw $s2, 0x28($sp) -/* 7E7670 802402D0 8FB10024 */ lw $s1, 0x24($sp) -/* 7E7674 802402D4 8FB00020 */ lw $s0, 0x20($sp) -/* 7E7678 802402D8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 7E767C 802402DC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 7E7680 802402E0 24020002 */ addiu $v0, $zero, 2 -/* 7E7684 802402E4 03E00008 */ jr $ra -/* 7E7688 802402E8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s new file mode 100644 index 0000000000..c310ffa3e8 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802401B0_7E7550.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401B0_7E7550 +/* 7E7550 802401B0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 7E7554 802401B4 AFBF002C */ sw $ra, 0x2c($sp) +/* 7E7558 802401B8 AFB20028 */ sw $s2, 0x28($sp) +/* 7E755C 802401BC AFB10024 */ sw $s1, 0x24($sp) +/* 7E7560 802401C0 AFB00020 */ sw $s0, 0x20($sp) +/* 7E7564 802401C4 F7B60038 */ sdc1 $f22, 0x38($sp) +/* 7E7568 802401C8 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 7E756C 802401CC 8C820148 */ lw $v0, 0x148($a0) +/* 7E7570 802401D0 0C00EABB */ jal get_npc_unsafe +/* 7E7574 802401D4 84440008 */ lh $a0, 8($v0) +/* 7E7578 802401D8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 7E757C 802401DC 0C00A67F */ jal rand_int +/* 7E7580 802401E0 0040902D */ daddu $s2, $v0, $zero +/* 7E7584 802401E4 284201F4 */ slti $v0, $v0, 0x1f4 +/* 7E7588 802401E8 10400019 */ beqz $v0, .L80240250 +/* 7E758C 802401EC 00000000 */ nop +/* 7E7590 802401F0 0C00A67F */ jal rand_int +/* 7E7594 802401F4 24040004 */ addiu $a0, $zero, 4 +/* 7E7598 802401F8 24420001 */ addiu $v0, $v0, 1 +/* 7E759C 802401FC 4482B000 */ mtc1 $v0, $f22 +/* 7E75A0 80240200 00000000 */ nop +/* 7E75A4 80240204 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7E75A8 80240208 0C00A67F */ jal rand_int +/* 7E75AC 8024020C 24040003 */ addiu $a0, $zero, 3 +/* 7E75B0 80240210 24420005 */ addiu $v0, $v0, 5 +/* 7E75B4 80240214 4482A000 */ mtc1 $v0, $f20 +/* 7E75B8 80240218 00000000 */ nop +/* 7E75BC 8024021C 4680A520 */ cvt.s.w $f20, $f20 +/* 7E75C0 80240220 0C00A67F */ jal rand_int +/* 7E75C4 80240224 24040032 */ addiu $a0, $zero, 0x32 +/* 7E75C8 80240228 24040064 */ addiu $a0, $zero, 0x64 +/* 7E75CC 8024022C 0C00A67F */ jal rand_int +/* 7E75D0 80240230 24500032 */ addiu $s0, $v0, 0x32 +/* 7E75D4 80240234 0240202D */ daddu $a0, $s2, $zero +/* 7E75D8 80240238 2405FFFF */ addiu $a1, $zero, -1 +/* 7E75DC 8024023C 3C068024 */ lui $a2, 0x8024 +/* 7E75E0 80240240 24C61180 */ addiu $a2, $a2, 0x1180 +/* 7E75E4 80240244 4407B000 */ mfc1 $a3, $f22 +/* 7E75E8 80240248 080900AE */ j .L802402B8 +/* 7E75EC 8024024C 24420064 */ addiu $v0, $v0, 0x64 +.L80240250: +/* 7E75F0 80240250 0C00A67F */ jal rand_int +/* 7E75F4 80240254 24040003 */ addiu $a0, $zero, 3 +/* 7E75F8 80240258 24040004 */ addiu $a0, $zero, 4 +/* 7E75FC 8024025C 0C00A67F */ jal rand_int +/* 7E7600 80240260 2451000A */ addiu $s1, $v0, 0xa +/* 7E7604 80240264 24420001 */ addiu $v0, $v0, 1 +/* 7E7608 80240268 4482B000 */ mtc1 $v0, $f22 +/* 7E760C 8024026C 00000000 */ nop +/* 7E7610 80240270 4680B5A0 */ cvt.s.w $f22, $f22 +/* 7E7614 80240274 0C00A67F */ jal rand_int +/* 7E7618 80240278 24040003 */ addiu $a0, $zero, 3 +/* 7E761C 8024027C 24420005 */ addiu $v0, $v0, 5 +/* 7E7620 80240280 4482A000 */ mtc1 $v0, $f20 +/* 7E7624 80240284 00000000 */ nop +/* 7E7628 80240288 4680A520 */ cvt.s.w $f20, $f20 +/* 7E762C 8024028C 0C00A67F */ jal rand_int +/* 7E7630 80240290 24040032 */ addiu $a0, $zero, 0x32 +/* 7E7634 80240294 24040064 */ addiu $a0, $zero, 0x64 +/* 7E7638 80240298 0C00A67F */ jal rand_int +/* 7E763C 8024029C 24500032 */ addiu $s0, $v0, 0x32 +/* 7E7640 802402A0 0240202D */ daddu $a0, $s2, $zero +/* 7E7644 802402A4 0220282D */ daddu $a1, $s1, $zero +/* 7E7648 802402A8 3C068024 */ lui $a2, 0x8024 +/* 7E764C 802402AC 24C61180 */ addiu $a2, $a2, 0x1180 +/* 7E7650 802402B0 4407B000 */ mfc1 $a3, $f22 +/* 7E7654 802402B4 2442000A */ addiu $v0, $v0, 0xa +.L802402B8: +/* 7E7658 802402B8 E7B40010 */ swc1 $f20, 0x10($sp) +/* 7E765C 802402BC AFB00014 */ sw $s0, 0x14($sp) +/* 7E7660 802402C0 0C0177B3 */ jal func_8005DECC +/* 7E7664 802402C4 AFA20018 */ sw $v0, 0x18($sp) +/* 7E7668 802402C8 8FBF002C */ lw $ra, 0x2c($sp) +/* 7E766C 802402CC 8FB20028 */ lw $s2, 0x28($sp) +/* 7E7670 802402D0 8FB10024 */ lw $s1, 0x24($sp) +/* 7E7674 802402D4 8FB00020 */ lw $s0, 0x20($sp) +/* 7E7678 802402D8 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 7E767C 802402DC D7B40030 */ ldc1 $f20, 0x30($sp) +/* 7E7680 802402E0 24020002 */ addiu $v0, $zero, 2 +/* 7E7684 802402E4 03E00008 */ jr $ra +/* 7E7688 802402E8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802402EC.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802402EC.s deleted file mode 100644 index ebb344bc4f..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802402EC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402EC -/* 7E768C 802402EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E7690 802402F0 AFBF0010 */ sw $ra, 0x10($sp) -/* 7E7694 802402F4 8C820148 */ lw $v0, 0x148($a0) -/* 7E7698 802402F8 0C00EABB */ jal get_npc_unsafe -/* 7E769C 802402FC 84440008 */ lh $a0, 8($v0) -/* 7E76A0 80240300 0C0177F5 */ jal func_8005DFD4 -/* 7E76A4 80240304 0040202D */ daddu $a0, $v0, $zero -/* 7E76A8 80240308 8FBF0010 */ lw $ra, 0x10($sp) -/* 7E76AC 8024030C 24020002 */ addiu $v0, $zero, 2 -/* 7E76B0 80240310 03E00008 */ jr $ra -/* 7E76B4 80240314 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802402EC_7E768C.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802402EC_7E768C.s new file mode 100644 index 0000000000..813382d28b --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802402EC_7E768C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402EC_7E768C +/* 7E768C 802402EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E7690 802402F0 AFBF0010 */ sw $ra, 0x10($sp) +/* 7E7694 802402F4 8C820148 */ lw $v0, 0x148($a0) +/* 7E7698 802402F8 0C00EABB */ jal get_npc_unsafe +/* 7E769C 802402FC 84440008 */ lh $a0, 8($v0) +/* 7E76A0 80240300 0C0177F5 */ jal func_8005DFD4 +/* 7E76A4 80240304 0040202D */ daddu $a0, $v0, $zero +/* 7E76A8 80240308 8FBF0010 */ lw $ra, 0x10($sp) +/* 7E76AC 8024030C 24020002 */ addiu $v0, $zero, 2 +/* 7E76B0 80240310 03E00008 */ jr $ra +/* 7E76B4 80240314 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240318.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240318.s deleted file mode 100644 index 2902a03fc8..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240318.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240318 -/* 7E76B8 80240318 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E76BC 8024031C AFBF0010 */ sw $ra, 0x10($sp) -/* 7E76C0 80240320 8C820148 */ lw $v0, 0x148($a0) -/* 7E76C4 80240324 0C00EABB */ jal get_npc_unsafe -/* 7E76C8 80240328 84440008 */ lh $a0, 8($v0) -/* 7E76CC 8024032C 0C01784B */ jal func_8005E12C -/* 7E76D0 80240330 0040202D */ daddu $a0, $v0, $zero -/* 7E76D4 80240334 8FBF0010 */ lw $ra, 0x10($sp) -/* 7E76D8 80240338 24020002 */ addiu $v0, $zero, 2 -/* 7E76DC 8024033C 03E00008 */ jr $ra -/* 7E76E0 80240340 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240318_7E76B8.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240318_7E76B8.s new file mode 100644 index 0000000000..bf63bc84f7 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240318_7E76B8.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240318_7E76B8 +/* 7E76B8 80240318 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E76BC 8024031C AFBF0010 */ sw $ra, 0x10($sp) +/* 7E76C0 80240320 8C820148 */ lw $v0, 0x148($a0) +/* 7E76C4 80240324 0C00EABB */ jal get_npc_unsafe +/* 7E76C8 80240328 84440008 */ lh $a0, 8($v0) +/* 7E76CC 8024032C 0C01784B */ jal func_8005E12C +/* 7E76D0 80240330 0040202D */ daddu $a0, $v0, $zero +/* 7E76D4 80240334 8FBF0010 */ lw $ra, 0x10($sp) +/* 7E76D8 80240338 24020002 */ addiu $v0, $zero, 2 +/* 7E76DC 8024033C 03E00008 */ jr $ra +/* 7E76E0 80240340 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240344.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240344.s deleted file mode 100644 index 12742262e8..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240344.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240344 -/* 7E76E4 80240344 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7E76E8 80240348 2405000B */ addiu $a1, $zero, 0xb -/* 7E76EC 8024034C 3C028011 */ lui $v0, %hi(gPlayerData) -/* 7E76F0 80240350 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 7E76F4 80240354 24440058 */ addiu $a0, $v0, 0x58 -/* 7E76F8 80240358 24030005 */ addiu $v1, $zero, 5 -/* 7E76FC 8024035C AFBF0010 */ sw $ra, 0x10($sp) -/* 7E7700 80240360 A0430002 */ sb $v1, 2($v0) -/* 7E7704 80240364 A0430003 */ sb $v1, 3($v0) -/* 7E7708 80240368 2403FFFF */ addiu $v1, $zero, -1 -/* 7E770C 8024036C A0400000 */ sb $zero, ($v0) -/* 7E7710 80240370 A0430001 */ sb $v1, 1($v0) -/* 7E7714 80240374 A040000E */ sb $zero, 0xe($v0) -.L80240378: -/* 7E7718 80240378 A0800014 */ sb $zero, 0x14($a0) -/* 7E771C 8024037C 24A5FFFF */ addiu $a1, $a1, -1 -/* 7E7720 80240380 04A1FFFD */ bgez $a1, .L80240378 -/* 7E7724 80240384 2484FFF8 */ addiu $a0, $a0, -8 -/* 7E7728 80240388 0C03AC5A */ jal func_800EB168 -/* 7E772C 8024038C 0000202D */ daddu $a0, $zero, $zero -/* 7E7730 80240390 8FBF0010 */ lw $ra, 0x10($sp) -/* 7E7734 80240394 24020002 */ addiu $v0, $zero, 2 -/* 7E7738 80240398 03E00008 */ jr $ra -/* 7E773C 8024039C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240344_7E76E4.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240344_7E76E4.s new file mode 100644 index 0000000000..eea407fde9 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240344_7E76E4.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240344_7E76E4 +/* 7E76E4 80240344 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 7E76E8 80240348 2405000B */ addiu $a1, $zero, 0xb +/* 7E76EC 8024034C 3C028011 */ lui $v0, %hi(gPlayerData) +/* 7E76F0 80240350 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 7E76F4 80240354 24440058 */ addiu $a0, $v0, 0x58 +/* 7E76F8 80240358 24030005 */ addiu $v1, $zero, 5 +/* 7E76FC 8024035C AFBF0010 */ sw $ra, 0x10($sp) +/* 7E7700 80240360 A0430002 */ sb $v1, 2($v0) +/* 7E7704 80240364 A0430003 */ sb $v1, 3($v0) +/* 7E7708 80240368 2403FFFF */ addiu $v1, $zero, -1 +/* 7E770C 8024036C A0400000 */ sb $zero, ($v0) +/* 7E7710 80240370 A0430001 */ sb $v1, 1($v0) +/* 7E7714 80240374 A040000E */ sb $zero, 0xe($v0) +.L80240378: +/* 7E7718 80240378 A0800014 */ sb $zero, 0x14($a0) +/* 7E771C 8024037C 24A5FFFF */ addiu $a1, $a1, -1 +/* 7E7720 80240380 04A1FFFD */ bgez $a1, .L80240378 +/* 7E7724 80240384 2484FFF8 */ addiu $a0, $a0, -8 +/* 7E7728 80240388 0C03AC5A */ jal func_800EB168 +/* 7E772C 8024038C 0000202D */ daddu $a0, $zero, $zero +/* 7E7730 80240390 8FBF0010 */ lw $ra, 0x10($sp) +/* 7E7734 80240394 24020002 */ addiu $v0, $zero, 2 +/* 7E7738 80240398 03E00008 */ jr $ra +/* 7E773C 8024039C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802403A0.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802403A0.s deleted file mode 100644 index f16fc0bb44..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802403A0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403A0 -/* 7E7740 802403A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E7744 802403A4 AFBF001C */ sw $ra, 0x1c($sp) -/* 7E7748 802403A8 AFB00018 */ sw $s0, 0x18($sp) -/* 7E774C 802403AC 8C820148 */ lw $v0, 0x148($a0) -/* 7E7750 802403B0 0C00EABB */ jal get_npc_unsafe -/* 7E7754 802403B4 84440008 */ lh $a0, 8($v0) -/* 7E7758 802403B8 0040802D */ daddu $s0, $v0, $zero -/* 7E775C 802403BC 0200202D */ daddu $a0, $s0, $zero -/* 7E7760 802403C0 0C00ECF4 */ jal func_8003B3D0 -/* 7E7764 802403C4 24050003 */ addiu $a1, $zero, 3 -/* 7E7768 802403C8 0200202D */ daddu $a0, $s0, $zero -/* 7E776C 802403CC 0000282D */ daddu $a1, $zero, $zero -/* 7E7770 802403D0 24060001 */ addiu $a2, $zero, 1 -/* 7E7774 802403D4 2407001E */ addiu $a3, $zero, 0x1e -/* 7E7778 802403D8 2402000A */ addiu $v0, $zero, 0xa -/* 7E777C 802403DC 0C00ED13 */ jal func_8003B44C -/* 7E7780 802403E0 AFA20010 */ sw $v0, 0x10($sp) -/* 7E7784 802403E4 0200202D */ daddu $a0, $s0, $zero -/* 7E7788 802403E8 2405003C */ addiu $a1, $zero, 0x3c -/* 7E778C 802403EC 24060014 */ addiu $a2, $zero, 0x14 -/* 7E7790 802403F0 0000382D */ daddu $a3, $zero, $zero -/* 7E7794 802403F4 0C00ED19 */ jal func_8003B464 -/* 7E7798 802403F8 AFA00010 */ sw $zero, 0x10($sp) -/* 7E779C 802403FC 8FBF001C */ lw $ra, 0x1c($sp) -/* 7E77A0 80240400 8FB00018 */ lw $s0, 0x18($sp) -/* 7E77A4 80240404 24020002 */ addiu $v0, $zero, 2 -/* 7E77A8 80240408 03E00008 */ jr $ra -/* 7E77AC 8024040C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_802403A0_7E7740.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802403A0_7E7740.s new file mode 100644 index 0000000000..d9c7186efd --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_802403A0_7E7740.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403A0_7E7740 +/* 7E7740 802403A0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E7744 802403A4 AFBF001C */ sw $ra, 0x1c($sp) +/* 7E7748 802403A8 AFB00018 */ sw $s0, 0x18($sp) +/* 7E774C 802403AC 8C820148 */ lw $v0, 0x148($a0) +/* 7E7750 802403B0 0C00EABB */ jal get_npc_unsafe +/* 7E7754 802403B4 84440008 */ lh $a0, 8($v0) +/* 7E7758 802403B8 0040802D */ daddu $s0, $v0, $zero +/* 7E775C 802403BC 0200202D */ daddu $a0, $s0, $zero +/* 7E7760 802403C0 0C00ECF4 */ jal func_8003B3D0 +/* 7E7764 802403C4 24050003 */ addiu $a1, $zero, 3 +/* 7E7768 802403C8 0200202D */ daddu $a0, $s0, $zero +/* 7E776C 802403CC 0000282D */ daddu $a1, $zero, $zero +/* 7E7770 802403D0 24060001 */ addiu $a2, $zero, 1 +/* 7E7774 802403D4 2407001E */ addiu $a3, $zero, 0x1e +/* 7E7778 802403D8 2402000A */ addiu $v0, $zero, 0xa +/* 7E777C 802403DC 0C00ED13 */ jal func_8003B44C +/* 7E7780 802403E0 AFA20010 */ sw $v0, 0x10($sp) +/* 7E7784 802403E4 0200202D */ daddu $a0, $s0, $zero +/* 7E7788 802403E8 2405003C */ addiu $a1, $zero, 0x3c +/* 7E778C 802403EC 24060014 */ addiu $a2, $zero, 0x14 +/* 7E7790 802403F0 0000382D */ daddu $a3, $zero, $zero +/* 7E7794 802403F4 0C00ED19 */ jal func_8003B464 +/* 7E7798 802403F8 AFA00010 */ sw $zero, 0x10($sp) +/* 7E779C 802403FC 8FBF001C */ lw $ra, 0x1c($sp) +/* 7E77A0 80240400 8FB00018 */ lw $s0, 0x18($sp) +/* 7E77A4 80240404 24020002 */ addiu $v0, $zero, 2 +/* 7E77A8 80240408 03E00008 */ jr $ra +/* 7E77AC 8024040C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240410.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240410.s deleted file mode 100644 index e633b4f405..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240410.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240410 -/* 7E77B0 80240410 24050001 */ addiu $a1, $zero, 1 -/* 7E77B4 80240414 3C028011 */ lui $v0, %hi(gPlayerData) -/* 7E77B8 80240418 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 7E77BC 8024041C 24440008 */ addiu $a0, $v0, 8 -/* 7E77C0 80240420 24030008 */ addiu $v1, $zero, 8 -/* 7E77C4 80240424 A0430002 */ sb $v1, 2($v0) -/* 7E77C8 80240428 A0430003 */ sb $v1, 3($v0) -/* 7E77CC 8024042C 00A0182D */ daddu $v1, $a1, $zero -/* 7E77D0 80240430 A0400000 */ sb $zero, ($v0) -/* 7E77D4 80240434 A0400001 */ sb $zero, 1($v0) -/* 7E77D8 80240438 A040000E */ sb $zero, 0xe($v0) -/* 7E77DC 8024043C A0430014 */ sb $v1, 0x14($v0) -.L80240440: -/* 7E77E0 80240440 A0800014 */ sb $zero, 0x14($a0) -/* 7E77E4 80240444 24A50001 */ addiu $a1, $a1, 1 -/* 7E77E8 80240448 28A2000C */ slti $v0, $a1, 0xc -/* 7E77EC 8024044C 1440FFFC */ bnez $v0, .L80240440 -/* 7E77F0 80240450 24840008 */ addiu $a0, $a0, 8 -/* 7E77F4 80240454 03E00008 */ jr $ra -/* 7E77F8 80240458 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240410_7E77B0.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240410_7E77B0.s new file mode 100644 index 0000000000..c5f9591a78 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_80240410_7E77B0.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240410_7E77B0 +/* 7E77B0 80240410 24050001 */ addiu $a1, $zero, 1 +/* 7E77B4 80240414 3C028011 */ lui $v0, %hi(gPlayerData) +/* 7E77B8 80240418 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 7E77BC 8024041C 24440008 */ addiu $a0, $v0, 8 +/* 7E77C0 80240420 24030008 */ addiu $v1, $zero, 8 +/* 7E77C4 80240424 A0430002 */ sb $v1, 2($v0) +/* 7E77C8 80240428 A0430003 */ sb $v1, 3($v0) +/* 7E77CC 8024042C 00A0182D */ daddu $v1, $a1, $zero +/* 7E77D0 80240430 A0400000 */ sb $zero, ($v0) +/* 7E77D4 80240434 A0400001 */ sb $zero, 1($v0) +/* 7E77D8 80240438 A040000E */ sb $zero, 0xe($v0) +/* 7E77DC 8024043C A0430014 */ sb $v1, 0x14($v0) +.L80240440: +/* 7E77E0 80240440 A0800014 */ sb $zero, 0x14($a0) +/* 7E77E4 80240444 24A50001 */ addiu $a1, $a1, 1 +/* 7E77E8 80240448 28A2000C */ slti $v0, $a1, 0xc +/* 7E77EC 8024044C 1440FFFC */ bnez $v0, .L80240440 +/* 7E77F0 80240450 24840008 */ addiu $a0, $a0, 8 +/* 7E77F4 80240454 03E00008 */ jr $ra +/* 7E77F8 80240458 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C.s deleted file mode 100644 index 8b0556b2d8..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024045C -/* 7E77FC 8024045C 2404000B */ addiu $a0, $zero, 0xb -/* 7E7800 80240460 3C058011 */ lui $a1, %hi(gPlayerData) -/* 7E7804 80240464 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 7E7808 80240468 24A30058 */ addiu $v1, $a1, 0x58 -/* 7E780C 8024046C 0080102D */ daddu $v0, $a0, $zero -/* 7E7810 80240470 A0A20002 */ sb $v0, 2($a1) -/* 7E7814 80240474 A0A20003 */ sb $v0, 3($a1) -/* 7E7818 80240478 A0A00000 */ sb $zero, ($a1) -/* 7E781C 8024047C A0A00001 */ sb $zero, 1($a1) -/* 7E7820 80240480 A0A0000E */ sb $zero, 0xe($a1) -.L80240484: -/* 7E7824 80240484 A0600014 */ sb $zero, 0x14($v1) -/* 7E7828 80240488 2484FFFF */ addiu $a0, $a0, -1 -/* 7E782C 8024048C 0481FFFD */ bgez $a0, .L80240484 -/* 7E7830 80240490 2463FFF8 */ addiu $v1, $v1, -8 -/* 7E7834 80240494 24020001 */ addiu $v0, $zero, 1 -/* 7E7838 80240498 A0A20014 */ sb $v0, 0x14($a1) -/* 7E783C 8024049C A0A2001C */ sb $v0, 0x1c($a1) -/* 7E7840 802404A0 A0A2002C */ sb $v0, 0x2c($a1) -/* 7E7844 802404A4 03E00008 */ jr $ra -/* 7E7848 802404A8 24020002 */ addiu $v0, $zero, 2 -/* 7E784C 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C_7E77FC.s b/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C_7E77FC.s new file mode 100644 index 0000000000..80cd0f2193 --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E7550/func_8024045C_7E77FC.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024045C_7E77FC +/* 7E77FC 8024045C 2404000B */ addiu $a0, $zero, 0xb +/* 7E7800 80240460 3C058011 */ lui $a1, %hi(gPlayerData) +/* 7E7804 80240464 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* 7E7808 80240468 24A30058 */ addiu $v1, $a1, 0x58 +/* 7E780C 8024046C 0080102D */ daddu $v0, $a0, $zero +/* 7E7810 80240470 A0A20002 */ sb $v0, 2($a1) +/* 7E7814 80240474 A0A20003 */ sb $v0, 3($a1) +/* 7E7818 80240478 A0A00000 */ sb $zero, ($a1) +/* 7E781C 8024047C A0A00001 */ sb $zero, 1($a1) +/* 7E7820 80240480 A0A0000E */ sb $zero, 0xe($a1) +.L80240484: +/* 7E7824 80240484 A0600014 */ sb $zero, 0x14($v1) +/* 7E7828 80240488 2484FFFF */ addiu $a0, $a0, -1 +/* 7E782C 8024048C 0481FFFD */ bgez $a0, .L80240484 +/* 7E7830 80240490 2463FFF8 */ addiu $v1, $v1, -8 +/* 7E7834 80240494 24020001 */ addiu $v0, $zero, 1 +/* 7E7838 80240498 A0A20014 */ sb $v0, 0x14($a1) +/* 7E783C 8024049C A0A2001C */ sb $v0, 0x1c($a1) +/* 7E7840 802404A0 A0A2002C */ sb $v0, 0x2c($a1) +/* 7E7844 802404A4 03E00008 */ jr $ra +/* 7E7848 802404A8 24020002 */ addiu $v0, $zero, 2 +/* 7E784C 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0.s b/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0.s deleted file mode 100644 index 27a5fe29e5..0000000000 --- a/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0.s +++ /dev/null @@ -1,129 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B0 -/* 7E7850 802404B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7E7854 802404B4 AFB10014 */ sw $s1, 0x14($sp) -/* 7E7858 802404B8 0080882D */ daddu $s1, $a0, $zero -/* 7E785C 802404BC AFB00010 */ sw $s0, 0x10($sp) -/* 7E7860 802404C0 00A0802D */ daddu $s0, $a1, $zero -/* 7E7864 802404C4 AFBF0018 */ sw $ra, 0x18($sp) -/* 7E7868 802404C8 0C00EABB */ jal get_npc_unsafe -/* 7E786C 802404CC 24040037 */ addiu $a0, $zero, 0x37 -/* 7E7870 802404D0 12000002 */ beqz $s0, .L802404DC -/* 7E7874 802404D4 0040202D */ daddu $a0, $v0, $zero -/* 7E7878 802404D8 AE200070 */ sw $zero, 0x70($s1) -.L802404DC: -/* 7E787C 802404DC 8E230070 */ lw $v1, 0x70($s1) -/* 7E7880 802404E0 10600005 */ beqz $v1, .L802404F8 -/* 7E7884 802404E4 24020001 */ addiu $v0, $zero, 1 -/* 7E7888 802404E8 1062003C */ beq $v1, $v0, .L802405DC -/* 7E788C 802404EC 0000102D */ daddu $v0, $zero, $zero -/* 7E7890 802404F0 0809019E */ j .L80240678 -/* 7E7894 802404F4 00000000 */ nop -.L802404F8: -/* 7E7898 802404F8 C4800038 */ lwc1 $f0, 0x38($a0) -/* 7E789C 802404FC 3C0143FA */ lui $at, 0x43fa -/* 7E78A0 80240500 44814000 */ mtc1 $at, $f8 -/* 7E78A4 80240504 00000000 */ nop -/* 7E78A8 80240508 46080000 */ add.s $f0, $f0, $f8 -/* 7E78AC 8024050C C482003C */ lwc1 $f2, 0x3c($a0) -/* 7E78B0 80240510 E4800060 */ swc1 $f0, 0x60($a0) -/* 7E78B4 80240514 3C0142F0 */ lui $at, 0x42f0 -/* 7E78B8 80240518 44810000 */ mtc1 $at, $f0 -/* 7E78BC 8024051C C4860038 */ lwc1 $f6, 0x38($a0) -/* 7E78C0 80240520 46001080 */ add.s $f2, $f2, $f0 -/* 7E78C4 80240524 C4800040 */ lwc1 $f0, 0x40($a0) -/* 7E78C8 80240528 24020014 */ addiu $v0, $zero, 0x14 -/* 7E78CC 8024052C A482008E */ sh $v0, 0x8e($a0) -/* 7E78D0 80240530 46080001 */ sub.s $f0, $f0, $f8 -/* 7E78D4 80240534 C4840060 */ lwc1 $f4, 0x60($a0) -/* 7E78D8 80240538 8483008E */ lh $v1, 0x8e($a0) -/* 7E78DC 8024053C 46062101 */ sub.s $f4, $f4, $f6 -/* 7E78E0 80240540 E4800068 */ swc1 $f0, 0x68($a0) -/* 7E78E4 80240544 C480003C */ lwc1 $f0, 0x3c($a0) -/* 7E78E8 80240548 24020064 */ addiu $v0, $zero, 0x64 -/* 7E78EC 8024054C E4820064 */ swc1 $f2, 0x64($a0) -/* 7E78F0 80240550 46001081 */ sub.s $f2, $f2, $f0 -/* 7E78F4 80240554 3C0141A0 */ lui $at, 0x41a0 -/* 7E78F8 80240558 44813000 */ mtc1 $at, $f6 -/* 7E78FC 8024055C 44830000 */ mtc1 $v1, $f0 -/* 7E7900 80240560 00000000 */ nop -/* 7E7904 80240564 46800020 */ cvt.s.w $f0, $f0 -/* 7E7908 80240568 46001083 */ div.s $f2, $f2, $f0 -/* 7E790C 8024056C C4800068 */ lwc1 $f0, 0x68($a0) -/* 7E7910 80240570 0060282D */ daddu $a1, $v1, $zero -/* 7E7914 80240574 A482008E */ sh $v0, 0x8e($a0) -/* 7E7918 80240578 E4820064 */ swc1 $f2, 0x64($a0) -/* 7E791C 8024057C C4820040 */ lwc1 $f2, 0x40($a0) -/* 7E7920 80240580 46062103 */ div.s $f4, $f4, $f6 -/* 7E7924 80240584 E4840060 */ swc1 $f4, 0x60($a0) -/* 7E7928 80240588 46020001 */ sub.s $f0, $f0, $f2 -/* 7E792C 8024058C 46002086 */ mov.s $f2, $f4 -/* 7E7930 80240590 3C014120 */ lui $at, 0x4120 -/* 7E7934 80240594 44812000 */ mtc1 $at, $f4 -/* 7E7938 80240598 44853000 */ mtc1 $a1, $f6 -/* 7E793C 8024059C 00000000 */ nop -/* 7E7940 802405A0 468031A0 */ cvt.s.w $f6, $f6 -/* 7E7944 802405A4 46041083 */ div.s $f2, $f2, $f4 -/* 7E7948 802405A8 E4820060 */ swc1 $f2, 0x60($a0) -/* 7E794C 802405AC 46060003 */ div.s $f0, $f0, $f6 -/* 7E7950 802405B0 E4800068 */ swc1 $f0, 0x68($a0) -/* 7E7954 802405B4 C4800064 */ lwc1 $f0, 0x64($a0) -/* 7E7958 802405B8 C4820068 */ lwc1 $f2, 0x68($a0) -/* 7E795C 802405BC 46040003 */ div.s $f0, $f0, $f4 -/* 7E7960 802405C0 46041083 */ div.s $f2, $f2, $f4 -/* 7E7964 802405C4 E4800064 */ swc1 $f0, 0x64($a0) -/* 7E7968 802405C8 0C00EB49 */ jal enable_npc_blur -/* 7E796C 802405CC E4820068 */ swc1 $f2, 0x68($a0) -/* 7E7970 802405D0 24020001 */ addiu $v0, $zero, 1 -/* 7E7974 802405D4 0809019D */ j .L80240674 -/* 7E7978 802405D8 AE220070 */ sw $v0, 0x70($s1) -.L802405DC: -/* 7E797C 802405DC C4840060 */ lwc1 $f4, 0x60($a0) -/* 7E7980 802405E0 3C018024 */ lui $at, 0x8024 -/* 7E7984 802405E4 D42A3960 */ ldc1 $f10, 0x3960($at) -/* 7E7988 802405E8 46002121 */ cvt.d.s $f4, $f4 -/* 7E798C 802405EC 462A2102 */ mul.d $f4, $f4, $f10 -/* 7E7990 802405F0 00000000 */ nop -/* 7E7994 802405F4 C4820064 */ lwc1 $f2, 0x64($a0) -/* 7E7998 802405F8 460010A1 */ cvt.d.s $f2, $f2 -/* 7E799C 802405FC 462A1082 */ mul.d $f2, $f2, $f10 -/* 7E79A0 80240600 00000000 */ nop -/* 7E79A4 80240604 24020001 */ addiu $v0, $zero, 1 -/* 7E79A8 80240608 C48E0038 */ lwc1 $f14, 0x38($a0) -/* 7E79AC 8024060C C4800060 */ lwc1 $f0, 0x60($a0) -/* 7E79B0 80240610 C48C003C */ lwc1 $f12, 0x3c($a0) -/* 7E79B4 80240614 9483008E */ lhu $v1, 0x8e($a0) -/* 7E79B8 80240618 C4880040 */ lwc1 $f8, 0x40($a0) -/* 7E79BC 8024061C C4860068 */ lwc1 $f6, 0x68($a0) -/* 7E79C0 80240620 46007380 */ add.s $f14, $f14, $f0 -/* 7E79C4 80240624 2463FFFF */ addiu $v1, $v1, -1 -/* 7E79C8 80240628 C4800064 */ lwc1 $f0, 0x64($a0) -/* 7E79CC 8024062C 46064200 */ add.s $f8, $f8, $f6 -/* 7E79D0 80240630 A483008E */ sh $v1, 0x8e($a0) -/* 7E79D4 80240634 00031C00 */ sll $v1, $v1, 0x10 -/* 7E79D8 80240638 46006300 */ add.s $f12, $f12, $f0 -/* 7E79DC 8024063C 46003006 */ mov.s $f0, $f6 -/* 7E79E0 80240640 46000021 */ cvt.d.s $f0, $f0 -/* 7E79E4 80240644 462A0002 */ mul.d $f0, $f0, $f10 -/* 7E79E8 80240648 00000000 */ nop -/* 7E79EC 8024064C E48E0038 */ swc1 $f14, 0x38($a0) -/* 7E79F0 80240650 E4880040 */ swc1 $f8, 0x40($a0) -/* 7E79F4 80240654 E48C003C */ swc1 $f12, 0x3c($a0) -/* 7E79F8 80240658 46202120 */ cvt.s.d $f4, $f4 -/* 7E79FC 8024065C 462010A0 */ cvt.s.d $f2, $f2 -/* 7E7A00 80240660 E4840060 */ swc1 $f4, 0x60($a0) -/* 7E7A04 80240664 E4820064 */ swc1 $f2, 0x64($a0) -/* 7E7A08 80240668 46200020 */ cvt.s.d $f0, $f0 -/* 7E7A0C 8024066C 10600002 */ beqz $v1, .L80240678 -/* 7E7A10 80240670 E4800068 */ swc1 $f0, 0x68($a0) -.L80240674: -/* 7E7A14 80240674 0000102D */ daddu $v0, $zero, $zero -.L80240678: -/* 7E7A18 80240678 8FBF0018 */ lw $ra, 0x18($sp) -/* 7E7A1C 8024067C 8FB10014 */ lw $s1, 0x14($sp) -/* 7E7A20 80240680 8FB00010 */ lw $s0, 0x10($sp) -/* 7E7A24 80240684 03E00008 */ jr $ra -/* 7E7A28 80240688 27BD0020 */ addiu $sp, $sp, 0x20 -/* 7E7A2C 8024068C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s b/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s new file mode 100644 index 0000000000..91448d9e0e --- /dev/null +++ b/asm/nonmatchings/world/area_mac/machi/7E7850/func_802404B0_7E7850.s @@ -0,0 +1,129 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404B0_7E7850 +/* 7E7850 802404B0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 7E7854 802404B4 AFB10014 */ sw $s1, 0x14($sp) +/* 7E7858 802404B8 0080882D */ daddu $s1, $a0, $zero +/* 7E785C 802404BC AFB00010 */ sw $s0, 0x10($sp) +/* 7E7860 802404C0 00A0802D */ daddu $s0, $a1, $zero +/* 7E7864 802404C4 AFBF0018 */ sw $ra, 0x18($sp) +/* 7E7868 802404C8 0C00EABB */ jal get_npc_unsafe +/* 7E786C 802404CC 24040037 */ addiu $a0, $zero, 0x37 +/* 7E7870 802404D0 12000002 */ beqz $s0, .L802404DC +/* 7E7874 802404D4 0040202D */ daddu $a0, $v0, $zero +/* 7E7878 802404D8 AE200070 */ sw $zero, 0x70($s1) +.L802404DC: +/* 7E787C 802404DC 8E230070 */ lw $v1, 0x70($s1) +/* 7E7880 802404E0 10600005 */ beqz $v1, .L802404F8 +/* 7E7884 802404E4 24020001 */ addiu $v0, $zero, 1 +/* 7E7888 802404E8 1062003C */ beq $v1, $v0, .L802405DC +/* 7E788C 802404EC 0000102D */ daddu $v0, $zero, $zero +/* 7E7890 802404F0 0809019E */ j .L80240678 +/* 7E7894 802404F4 00000000 */ nop +.L802404F8: +/* 7E7898 802404F8 C4800038 */ lwc1 $f0, 0x38($a0) +/* 7E789C 802404FC 3C0143FA */ lui $at, 0x43fa +/* 7E78A0 80240500 44814000 */ mtc1 $at, $f8 +/* 7E78A4 80240504 00000000 */ nop +/* 7E78A8 80240508 46080000 */ add.s $f0, $f0, $f8 +/* 7E78AC 8024050C C482003C */ lwc1 $f2, 0x3c($a0) +/* 7E78B0 80240510 E4800060 */ swc1 $f0, 0x60($a0) +/* 7E78B4 80240514 3C0142F0 */ lui $at, 0x42f0 +/* 7E78B8 80240518 44810000 */ mtc1 $at, $f0 +/* 7E78BC 8024051C C4860038 */ lwc1 $f6, 0x38($a0) +/* 7E78C0 80240520 46001080 */ add.s $f2, $f2, $f0 +/* 7E78C4 80240524 C4800040 */ lwc1 $f0, 0x40($a0) +/* 7E78C8 80240528 24020014 */ addiu $v0, $zero, 0x14 +/* 7E78CC 8024052C A482008E */ sh $v0, 0x8e($a0) +/* 7E78D0 80240530 46080001 */ sub.s $f0, $f0, $f8 +/* 7E78D4 80240534 C4840060 */ lwc1 $f4, 0x60($a0) +/* 7E78D8 80240538 8483008E */ lh $v1, 0x8e($a0) +/* 7E78DC 8024053C 46062101 */ sub.s $f4, $f4, $f6 +/* 7E78E0 80240540 E4800068 */ swc1 $f0, 0x68($a0) +/* 7E78E4 80240544 C480003C */ lwc1 $f0, 0x3c($a0) +/* 7E78E8 80240548 24020064 */ addiu $v0, $zero, 0x64 +/* 7E78EC 8024054C E4820064 */ swc1 $f2, 0x64($a0) +/* 7E78F0 80240550 46001081 */ sub.s $f2, $f2, $f0 +/* 7E78F4 80240554 3C0141A0 */ lui $at, 0x41a0 +/* 7E78F8 80240558 44813000 */ mtc1 $at, $f6 +/* 7E78FC 8024055C 44830000 */ mtc1 $v1, $f0 +/* 7E7900 80240560 00000000 */ nop +/* 7E7904 80240564 46800020 */ cvt.s.w $f0, $f0 +/* 7E7908 80240568 46001083 */ div.s $f2, $f2, $f0 +/* 7E790C 8024056C C4800068 */ lwc1 $f0, 0x68($a0) +/* 7E7910 80240570 0060282D */ daddu $a1, $v1, $zero +/* 7E7914 80240574 A482008E */ sh $v0, 0x8e($a0) +/* 7E7918 80240578 E4820064 */ swc1 $f2, 0x64($a0) +/* 7E791C 8024057C C4820040 */ lwc1 $f2, 0x40($a0) +/* 7E7920 80240580 46062103 */ div.s $f4, $f4, $f6 +/* 7E7924 80240584 E4840060 */ swc1 $f4, 0x60($a0) +/* 7E7928 80240588 46020001 */ sub.s $f0, $f0, $f2 +/* 7E792C 8024058C 46002086 */ mov.s $f2, $f4 +/* 7E7930 80240590 3C014120 */ lui $at, 0x4120 +/* 7E7934 80240594 44812000 */ mtc1 $at, $f4 +/* 7E7938 80240598 44853000 */ mtc1 $a1, $f6 +/* 7E793C 8024059C 00000000 */ nop +/* 7E7940 802405A0 468031A0 */ cvt.s.w $f6, $f6 +/* 7E7944 802405A4 46041083 */ div.s $f2, $f2, $f4 +/* 7E7948 802405A8 E4820060 */ swc1 $f2, 0x60($a0) +/* 7E794C 802405AC 46060003 */ div.s $f0, $f0, $f6 +/* 7E7950 802405B0 E4800068 */ swc1 $f0, 0x68($a0) +/* 7E7954 802405B4 C4800064 */ lwc1 $f0, 0x64($a0) +/* 7E7958 802405B8 C4820068 */ lwc1 $f2, 0x68($a0) +/* 7E795C 802405BC 46040003 */ div.s $f0, $f0, $f4 +/* 7E7960 802405C0 46041083 */ div.s $f2, $f2, $f4 +/* 7E7964 802405C4 E4800064 */ swc1 $f0, 0x64($a0) +/* 7E7968 802405C8 0C00EB49 */ jal enable_npc_blur +/* 7E796C 802405CC E4820068 */ swc1 $f2, 0x68($a0) +/* 7E7970 802405D0 24020001 */ addiu $v0, $zero, 1 +/* 7E7974 802405D4 0809019D */ j .L80240674 +/* 7E7978 802405D8 AE220070 */ sw $v0, 0x70($s1) +.L802405DC: +/* 7E797C 802405DC C4840060 */ lwc1 $f4, 0x60($a0) +/* 7E7980 802405E0 3C018024 */ lui $at, 0x8024 +/* 7E7984 802405E4 D42A3960 */ ldc1 $f10, 0x3960($at) +/* 7E7988 802405E8 46002121 */ cvt.d.s $f4, $f4 +/* 7E798C 802405EC 462A2102 */ mul.d $f4, $f4, $f10 +/* 7E7990 802405F0 00000000 */ nop +/* 7E7994 802405F4 C4820064 */ lwc1 $f2, 0x64($a0) +/* 7E7998 802405F8 460010A1 */ cvt.d.s $f2, $f2 +/* 7E799C 802405FC 462A1082 */ mul.d $f2, $f2, $f10 +/* 7E79A0 80240600 00000000 */ nop +/* 7E79A4 80240604 24020001 */ addiu $v0, $zero, 1 +/* 7E79A8 80240608 C48E0038 */ lwc1 $f14, 0x38($a0) +/* 7E79AC 8024060C C4800060 */ lwc1 $f0, 0x60($a0) +/* 7E79B0 80240610 C48C003C */ lwc1 $f12, 0x3c($a0) +/* 7E79B4 80240614 9483008E */ lhu $v1, 0x8e($a0) +/* 7E79B8 80240618 C4880040 */ lwc1 $f8, 0x40($a0) +/* 7E79BC 8024061C C4860068 */ lwc1 $f6, 0x68($a0) +/* 7E79C0 80240620 46007380 */ add.s $f14, $f14, $f0 +/* 7E79C4 80240624 2463FFFF */ addiu $v1, $v1, -1 +/* 7E79C8 80240628 C4800064 */ lwc1 $f0, 0x64($a0) +/* 7E79CC 8024062C 46064200 */ add.s $f8, $f8, $f6 +/* 7E79D0 80240630 A483008E */ sh $v1, 0x8e($a0) +/* 7E79D4 80240634 00031C00 */ sll $v1, $v1, 0x10 +/* 7E79D8 80240638 46006300 */ add.s $f12, $f12, $f0 +/* 7E79DC 8024063C 46003006 */ mov.s $f0, $f6 +/* 7E79E0 80240640 46000021 */ cvt.d.s $f0, $f0 +/* 7E79E4 80240644 462A0002 */ mul.d $f0, $f0, $f10 +/* 7E79E8 80240648 00000000 */ nop +/* 7E79EC 8024064C E48E0038 */ swc1 $f14, 0x38($a0) +/* 7E79F0 80240650 E4880040 */ swc1 $f8, 0x40($a0) +/* 7E79F4 80240654 E48C003C */ swc1 $f12, 0x3c($a0) +/* 7E79F8 80240658 46202120 */ cvt.s.d $f4, $f4 +/* 7E79FC 8024065C 462010A0 */ cvt.s.d $f2, $f2 +/* 7E7A00 80240660 E4840060 */ swc1 $f4, 0x60($a0) +/* 7E7A04 80240664 E4820064 */ swc1 $f2, 0x64($a0) +/* 7E7A08 80240668 46200020 */ cvt.s.d $f0, $f0 +/* 7E7A0C 8024066C 10600002 */ beqz $v1, .L80240678 +/* 7E7A10 80240670 E4800068 */ swc1 $f0, 0x68($a0) +.L80240674: +/* 7E7A14 80240674 0000102D */ daddu $v0, $zero, $zero +.L80240678: +/* 7E7A18 80240678 8FBF0018 */ lw $ra, 0x18($sp) +/* 7E7A1C 8024067C 8FB10014 */ lw $s1, 0x14($sp) +/* 7E7A20 80240680 8FB00010 */ lw $s0, 0x10($sp) +/* 7E7A24 80240684 03E00008 */ jr $ra +/* 7E7A28 80240688 27BD0020 */ addiu $sp, $sp, 0x20 +/* 7E7A2C 8024068C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC.s deleted file mode 100644 index 9d56371a05..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AFC -/* E0F29C 80240AFC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* E0F2A0 80240B00 AFB3001C */ sw $s3, 0x1c($sp) -/* E0F2A4 80240B04 0080982D */ daddu $s3, $a0, $zero -/* E0F2A8 80240B08 AFBF0020 */ sw $ra, 0x20($sp) -/* E0F2AC 80240B0C AFB20018 */ sw $s2, 0x18($sp) -/* E0F2B0 80240B10 AFB10014 */ sw $s1, 0x14($sp) -/* E0F2B4 80240B14 AFB00010 */ sw $s0, 0x10($sp) -/* E0F2B8 80240B18 F7B40028 */ sdc1 $f20, 0x28($sp) -/* E0F2BC 80240B1C 8E710148 */ lw $s1, 0x148($s3) -/* E0F2C0 80240B20 86240008 */ lh $a0, 8($s1) -/* E0F2C4 80240B24 0C00EABB */ jal get_npc_unsafe -/* E0F2C8 80240B28 00A0802D */ daddu $s0, $a1, $zero -/* E0F2CC 80240B2C 8E040020 */ lw $a0, 0x20($s0) -/* E0F2D0 80240B30 0040902D */ daddu $s2, $v0, $zero -/* E0F2D4 80240B34 00041FC2 */ srl $v1, $a0, 0x1f -/* E0F2D8 80240B38 00832021 */ addu $a0, $a0, $v1 -/* E0F2DC 80240B3C 00042043 */ sra $a0, $a0, 1 -/* E0F2E0 80240B40 0C00A67F */ jal rand_int -/* E0F2E4 80240B44 24840001 */ addiu $a0, $a0, 1 -/* E0F2E8 80240B48 8E030020 */ lw $v1, 0x20($s0) -/* E0F2EC 80240B4C C64C0038 */ lwc1 $f12, 0x38($s2) -/* E0F2F0 80240B50 000327C2 */ srl $a0, $v1, 0x1f -/* E0F2F4 80240B54 00641821 */ addu $v1, $v1, $a0 -/* E0F2F8 80240B58 00031843 */ sra $v1, $v1, 1 -/* E0F2FC 80240B5C 00621821 */ addu $v1, $v1, $v0 -/* E0F300 80240B60 A643008E */ sh $v1, 0x8e($s2) -/* E0F304 80240B64 8E2200CC */ lw $v0, 0xcc($s1) -/* E0F308 80240B68 C64E0040 */ lwc1 $f14, 0x40($s2) -/* E0F30C 80240B6C 8C42000C */ lw $v0, 0xc($v0) -/* E0F310 80240B70 AE420028 */ sw $v0, 0x28($s2) -/* E0F314 80240B74 C6000018 */ lwc1 $f0, 0x18($s0) -/* E0F318 80240B78 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* E0F31C 80240B7C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* E0F320 80240B80 E6400018 */ swc1 $f0, 0x18($s2) -/* E0F324 80240B84 8C460028 */ lw $a2, 0x28($v0) -/* E0F328 80240B88 0C00A720 */ jal atan2 -/* E0F32C 80240B8C 8C470030 */ lw $a3, 0x30($v0) -/* E0F330 80240B90 46000506 */ mov.s $f20, $f0 -/* E0F334 80240B94 C64C000C */ lwc1 $f12, 0xc($s2) -/* E0F338 80240B98 0C00A70A */ jal get_clamped_angle_diff -/* E0F33C 80240B9C 4600A386 */ mov.s $f14, $f20 -/* E0F340 80240BA0 46000086 */ mov.s $f2, $f0 -/* E0F344 80240BA4 8E02001C */ lw $v0, 0x1c($s0) -/* E0F348 80240BA8 46001005 */ abs.s $f0, $f2 -/* E0F34C 80240BAC 44822000 */ mtc1 $v0, $f4 -/* E0F350 80240BB0 00000000 */ nop -/* E0F354 80240BB4 46802120 */ cvt.s.w $f4, $f4 -/* E0F358 80240BB8 4600203C */ c.lt.s $f4, $f0 -/* E0F35C 80240BBC 00000000 */ nop -/* E0F360 80240BC0 4500000D */ bc1f .L80240BF8 -/* E0F364 80240BC4 00000000 */ nop -/* E0F368 80240BC8 44800000 */ mtc1 $zero, $f0 -/* E0F36C 80240BCC C654000C */ lwc1 $f20, 0xc($s2) -/* E0F370 80240BD0 4600103C */ c.lt.s $f2, $f0 -/* E0F374 80240BD4 00000000 */ nop -/* E0F378 80240BD8 45000006 */ bc1f .L80240BF4 -/* E0F37C 80240BDC 00021023 */ negu $v0, $v0 -/* E0F380 80240BE0 44820000 */ mtc1 $v0, $f0 -/* E0F384 80240BE4 00000000 */ nop -/* E0F388 80240BE8 46800020 */ cvt.s.w $f0, $f0 -/* E0F38C 80240BEC 080902FE */ j .L80240BF8 -/* E0F390 80240BF0 4600A500 */ add.s $f20, $f20, $f0 -.L80240BF4: -/* E0F394 80240BF4 4604A500 */ add.s $f20, $f20, $f4 -.L80240BF8: -/* E0F398 80240BF8 0C00A6C9 */ jal clamp_angle -/* E0F39C 80240BFC 4600A306 */ mov.s $f12, $f20 -/* E0F3A0 80240C00 2402000D */ addiu $v0, $zero, 0xd -/* E0F3A4 80240C04 E640000C */ swc1 $f0, 0xc($s2) -/* E0F3A8 80240C08 AE620070 */ sw $v0, 0x70($s3) -/* E0F3AC 80240C0C 8FBF0020 */ lw $ra, 0x20($sp) -/* E0F3B0 80240C10 8FB3001C */ lw $s3, 0x1c($sp) -/* E0F3B4 80240C14 8FB20018 */ lw $s2, 0x18($sp) -/* E0F3B8 80240C18 8FB10014 */ lw $s1, 0x14($sp) -/* E0F3BC 80240C1C 8FB00010 */ lw $s0, 0x10($sp) -/* E0F3C0 80240C20 D7B40028 */ ldc1 $f20, 0x28($sp) -/* E0F3C4 80240C24 03E00008 */ jr $ra -/* E0F3C8 80240C28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC_E0F29C.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC_E0F29C.s new file mode 100644 index 0000000000..4357967cbb --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240AFC_E0F29C.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AFC_E0F29C +/* E0F29C 80240AFC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E0F2A0 80240B00 AFB3001C */ sw $s3, 0x1c($sp) +/* E0F2A4 80240B04 0080982D */ daddu $s3, $a0, $zero +/* E0F2A8 80240B08 AFBF0020 */ sw $ra, 0x20($sp) +/* E0F2AC 80240B0C AFB20018 */ sw $s2, 0x18($sp) +/* E0F2B0 80240B10 AFB10014 */ sw $s1, 0x14($sp) +/* E0F2B4 80240B14 AFB00010 */ sw $s0, 0x10($sp) +/* E0F2B8 80240B18 F7B40028 */ sdc1 $f20, 0x28($sp) +/* E0F2BC 80240B1C 8E710148 */ lw $s1, 0x148($s3) +/* E0F2C0 80240B20 86240008 */ lh $a0, 8($s1) +/* E0F2C4 80240B24 0C00EABB */ jal get_npc_unsafe +/* E0F2C8 80240B28 00A0802D */ daddu $s0, $a1, $zero +/* E0F2CC 80240B2C 8E040020 */ lw $a0, 0x20($s0) +/* E0F2D0 80240B30 0040902D */ daddu $s2, $v0, $zero +/* E0F2D4 80240B34 00041FC2 */ srl $v1, $a0, 0x1f +/* E0F2D8 80240B38 00832021 */ addu $a0, $a0, $v1 +/* E0F2DC 80240B3C 00042043 */ sra $a0, $a0, 1 +/* E0F2E0 80240B40 0C00A67F */ jal rand_int +/* E0F2E4 80240B44 24840001 */ addiu $a0, $a0, 1 +/* E0F2E8 80240B48 8E030020 */ lw $v1, 0x20($s0) +/* E0F2EC 80240B4C C64C0038 */ lwc1 $f12, 0x38($s2) +/* E0F2F0 80240B50 000327C2 */ srl $a0, $v1, 0x1f +/* E0F2F4 80240B54 00641821 */ addu $v1, $v1, $a0 +/* E0F2F8 80240B58 00031843 */ sra $v1, $v1, 1 +/* E0F2FC 80240B5C 00621821 */ addu $v1, $v1, $v0 +/* E0F300 80240B60 A643008E */ sh $v1, 0x8e($s2) +/* E0F304 80240B64 8E2200CC */ lw $v0, 0xcc($s1) +/* E0F308 80240B68 C64E0040 */ lwc1 $f14, 0x40($s2) +/* E0F30C 80240B6C 8C42000C */ lw $v0, 0xc($v0) +/* E0F310 80240B70 AE420028 */ sw $v0, 0x28($s2) +/* E0F314 80240B74 C6000018 */ lwc1 $f0, 0x18($s0) +/* E0F318 80240B78 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* E0F31C 80240B7C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* E0F320 80240B80 E6400018 */ swc1 $f0, 0x18($s2) +/* E0F324 80240B84 8C460028 */ lw $a2, 0x28($v0) +/* E0F328 80240B88 0C00A720 */ jal atan2 +/* E0F32C 80240B8C 8C470030 */ lw $a3, 0x30($v0) +/* E0F330 80240B90 46000506 */ mov.s $f20, $f0 +/* E0F334 80240B94 C64C000C */ lwc1 $f12, 0xc($s2) +/* E0F338 80240B98 0C00A70A */ jal get_clamped_angle_diff +/* E0F33C 80240B9C 4600A386 */ mov.s $f14, $f20 +/* E0F340 80240BA0 46000086 */ mov.s $f2, $f0 +/* E0F344 80240BA4 8E02001C */ lw $v0, 0x1c($s0) +/* E0F348 80240BA8 46001005 */ abs.s $f0, $f2 +/* E0F34C 80240BAC 44822000 */ mtc1 $v0, $f4 +/* E0F350 80240BB0 00000000 */ nop +/* E0F354 80240BB4 46802120 */ cvt.s.w $f4, $f4 +/* E0F358 80240BB8 4600203C */ c.lt.s $f4, $f0 +/* E0F35C 80240BBC 00000000 */ nop +/* E0F360 80240BC0 4500000D */ bc1f .L80240BF8 +/* E0F364 80240BC4 00000000 */ nop +/* E0F368 80240BC8 44800000 */ mtc1 $zero, $f0 +/* E0F36C 80240BCC C654000C */ lwc1 $f20, 0xc($s2) +/* E0F370 80240BD0 4600103C */ c.lt.s $f2, $f0 +/* E0F374 80240BD4 00000000 */ nop +/* E0F378 80240BD8 45000006 */ bc1f .L80240BF4 +/* E0F37C 80240BDC 00021023 */ negu $v0, $v0 +/* E0F380 80240BE0 44820000 */ mtc1 $v0, $f0 +/* E0F384 80240BE4 00000000 */ nop +/* E0F388 80240BE8 46800020 */ cvt.s.w $f0, $f0 +/* E0F38C 80240BEC 080902FE */ j .L80240BF8 +/* E0F390 80240BF0 4600A500 */ add.s $f20, $f20, $f0 +.L80240BF4: +/* E0F394 80240BF4 4604A500 */ add.s $f20, $f20, $f4 +.L80240BF8: +/* E0F398 80240BF8 0C00A6C9 */ jal clamp_angle +/* E0F39C 80240BFC 4600A306 */ mov.s $f12, $f20 +/* E0F3A0 80240C00 2402000D */ addiu $v0, $zero, 0xd +/* E0F3A4 80240C04 E640000C */ swc1 $f0, 0xc($s2) +/* E0F3A8 80240C08 AE620070 */ sw $v0, 0x70($s3) +/* E0F3AC 80240C0C 8FBF0020 */ lw $ra, 0x20($sp) +/* E0F3B0 80240C10 8FB3001C */ lw $s3, 0x1c($sp) +/* E0F3B4 80240C14 8FB20018 */ lw $s2, 0x18($sp) +/* E0F3B8 80240C18 8FB10014 */ lw $s1, 0x14($sp) +/* E0F3BC 80240C1C 8FB00010 */ lw $s0, 0x10($sp) +/* E0F3C0 80240C20 D7B40028 */ ldc1 $f20, 0x28($sp) +/* E0F3C4 80240C24 03E00008 */ jr $ra +/* E0F3C8 80240C28 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C.s deleted file mode 100644 index e1219400fd..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D4C -/* E0F4EC 80240D4C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F4F0 80240D50 AFB10014 */ sw $s1, 0x14($sp) -/* E0F4F4 80240D54 0080882D */ daddu $s1, $a0, $zero -/* E0F4F8 80240D58 AFBF0018 */ sw $ra, 0x18($sp) -/* E0F4FC 80240D5C AFB00010 */ sw $s0, 0x10($sp) -/* E0F500 80240D60 8E300148 */ lw $s0, 0x148($s1) -/* E0F504 80240D64 0C00EABB */ jal get_npc_unsafe -/* E0F508 80240D68 86040008 */ lh $a0, 8($s0) -/* E0F50C 80240D6C 9443008E */ lhu $v1, 0x8e($v0) -/* E0F510 80240D70 2463FFFF */ addiu $v1, $v1, -1 -/* E0F514 80240D74 A443008E */ sh $v1, 0x8e($v0) -/* E0F518 80240D78 00031C00 */ sll $v1, $v1, 0x10 -/* E0F51C 80240D7C 14600008 */ bnez $v1, .L80240DA0 -/* E0F520 80240D80 00000000 */ nop -/* E0F524 80240D84 8E0200B0 */ lw $v0, 0xb0($s0) -/* E0F528 80240D88 30420080 */ andi $v0, $v0, 0x80 -/* E0F52C 80240D8C 10400003 */ beqz $v0, .L80240D9C -/* E0F530 80240D90 2402000F */ addiu $v0, $zero, 0xf -/* E0F534 80240D94 08090368 */ j .L80240DA0 -/* E0F538 80240D98 AE220070 */ sw $v0, 0x70($s1) -.L80240D9C: -/* E0F53C 80240D9C AE200070 */ sw $zero, 0x70($s1) -.L80240DA0: -/* E0F540 80240DA0 8FBF0018 */ lw $ra, 0x18($sp) -/* E0F544 80240DA4 8FB10014 */ lw $s1, 0x14($sp) -/* E0F548 80240DA8 8FB00010 */ lw $s0, 0x10($sp) -/* E0F54C 80240DAC 03E00008 */ jr $ra -/* E0F550 80240DB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s new file mode 100644 index 0000000000..ecc987254a --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240D4C_E0F4EC.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D4C_E0F4EC +/* E0F4EC 80240D4C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E0F4F0 80240D50 AFB10014 */ sw $s1, 0x14($sp) +/* E0F4F4 80240D54 0080882D */ daddu $s1, $a0, $zero +/* E0F4F8 80240D58 AFBF0018 */ sw $ra, 0x18($sp) +/* E0F4FC 80240D5C AFB00010 */ sw $s0, 0x10($sp) +/* E0F500 80240D60 8E300148 */ lw $s0, 0x148($s1) +/* E0F504 80240D64 0C00EABB */ jal get_npc_unsafe +/* E0F508 80240D68 86040008 */ lh $a0, 8($s0) +/* E0F50C 80240D6C 9443008E */ lhu $v1, 0x8e($v0) +/* E0F510 80240D70 2463FFFF */ addiu $v1, $v1, -1 +/* E0F514 80240D74 A443008E */ sh $v1, 0x8e($v0) +/* E0F518 80240D78 00031C00 */ sll $v1, $v1, 0x10 +/* E0F51C 80240D7C 14600008 */ bnez $v1, .L80240DA0 +/* E0F520 80240D80 00000000 */ nop +/* E0F524 80240D84 8E0200B0 */ lw $v0, 0xb0($s0) +/* E0F528 80240D88 30420080 */ andi $v0, $v0, 0x80 +/* E0F52C 80240D8C 10400003 */ beqz $v0, .L80240D9C +/* E0F530 80240D90 2402000F */ addiu $v0, $zero, 0xf +/* E0F534 80240D94 08090368 */ j .L80240DA0 +/* E0F538 80240D98 AE220070 */ sw $v0, 0x70($s1) +.L80240D9C: +/* E0F53C 80240D9C AE200070 */ sw $zero, 0x70($s1) +.L80240DA0: +/* E0F540 80240DA0 8FBF0018 */ lw $ra, 0x18($sp) +/* E0F544 80240DA4 8FB10014 */ lw $s1, 0x14($sp) +/* E0F548 80240DA8 8FB00010 */ lw $s0, 0x10($sp) +/* E0F54C 80240DAC 03E00008 */ jr $ra +/* E0F550 80240DB0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4.s deleted file mode 100644 index 5248a4aa62..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DB4 -/* E0F554 80240DB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E0F558 80240DB8 AFB10014 */ sw $s1, 0x14($sp) -/* E0F55C 80240DBC 0080882D */ daddu $s1, $a0, $zero -/* E0F560 80240DC0 AFBF001C */ sw $ra, 0x1c($sp) -/* E0F564 80240DC4 AFB20018 */ sw $s2, 0x18($sp) -/* E0F568 80240DC8 AFB00010 */ sw $s0, 0x10($sp) -/* E0F56C 80240DCC 8E300148 */ lw $s0, 0x148($s1) -/* E0F570 80240DD0 86040008 */ lh $a0, 8($s0) -/* E0F574 80240DD4 0C00EABB */ jal get_npc_unsafe -/* E0F578 80240DD8 00A0902D */ daddu $s2, $a1, $zero -/* E0F57C 80240DDC 8E0300D0 */ lw $v1, 0xd0($s0) -/* E0F580 80240DE0 8E240078 */ lw $a0, 0x78($s1) -/* E0F584 80240DE4 8C630000 */ lw $v1, ($v1) -/* E0F588 80240DE8 0083182A */ slt $v1, $a0, $v1 -/* E0F58C 80240DEC 10600013 */ beqz $v1, .L80240E3C -/* E0F590 80240DF0 0040302D */ daddu $a2, $v0, $zero -/* E0F594 80240DF4 00041040 */ sll $v0, $a0, 1 -/* E0F598 80240DF8 00441021 */ addu $v0, $v0, $a0 -/* E0F59C 80240DFC 00022880 */ sll $a1, $v0, 2 -.L80240E00: -/* E0F5A0 80240E00 8E0300D0 */ lw $v1, 0xd0($s0) -/* E0F5A4 80240E04 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* E0F5A8 80240E08 00A31021 */ addu $v0, $a1, $v1 -/* E0F5AC 80240E0C C4400008 */ lwc1 $f0, 8($v0) -/* E0F5B0 80240E10 46800020 */ cvt.s.w $f0, $f0 -/* E0F5B4 80240E14 4602003E */ c.le.s $f0, $f2 -/* E0F5B8 80240E18 00000000 */ nop -/* E0F5BC 80240E1C 45020003 */ bc1fl .L80240E2C -/* E0F5C0 80240E20 24840001 */ addiu $a0, $a0, 1 -/* E0F5C4 80240E24 0809038F */ j .L80240E3C -/* E0F5C8 80240E28 AE240078 */ sw $a0, 0x78($s1) -.L80240E2C: -/* E0F5CC 80240E2C 8C620000 */ lw $v0, ($v1) -/* E0F5D0 80240E30 0082102A */ slt $v0, $a0, $v0 -/* E0F5D4 80240E34 1440FFF2 */ bnez $v0, .L80240E00 -/* E0F5D8 80240E38 24A5000C */ addiu $a1, $a1, 0xc -.L80240E3C: -/* E0F5DC 80240E3C C6400000 */ lwc1 $f0, ($s2) -/* E0F5E0 80240E40 E4C00018 */ swc1 $f0, 0x18($a2) -/* E0F5E4 80240E44 8E0200CC */ lw $v0, 0xcc($s0) -/* E0F5E8 80240E48 8C420004 */ lw $v0, 4($v0) -/* E0F5EC 80240E4C ACC20028 */ sw $v0, 0x28($a2) -/* E0F5F0 80240E50 24020001 */ addiu $v0, $zero, 1 -/* E0F5F4 80240E54 AE200074 */ sw $zero, 0x74($s1) -/* E0F5F8 80240E58 AE220070 */ sw $v0, 0x70($s1) -/* E0F5FC 80240E5C 8FBF001C */ lw $ra, 0x1c($sp) -/* E0F600 80240E60 8FB20018 */ lw $s2, 0x18($sp) -/* E0F604 80240E64 8FB10014 */ lw $s1, 0x14($sp) -/* E0F608 80240E68 8FB00010 */ lw $s0, 0x10($sp) -/* E0F60C 80240E6C 03E00008 */ jr $ra -/* E0F610 80240E70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s new file mode 100644 index 0000000000..15343e346b --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240DB4_E0F554.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DB4_E0F554 +/* E0F554 80240DB4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E0F558 80240DB8 AFB10014 */ sw $s1, 0x14($sp) +/* E0F55C 80240DBC 0080882D */ daddu $s1, $a0, $zero +/* E0F560 80240DC0 AFBF001C */ sw $ra, 0x1c($sp) +/* E0F564 80240DC4 AFB20018 */ sw $s2, 0x18($sp) +/* E0F568 80240DC8 AFB00010 */ sw $s0, 0x10($sp) +/* E0F56C 80240DCC 8E300148 */ lw $s0, 0x148($s1) +/* E0F570 80240DD0 86040008 */ lh $a0, 8($s0) +/* E0F574 80240DD4 0C00EABB */ jal get_npc_unsafe +/* E0F578 80240DD8 00A0902D */ daddu $s2, $a1, $zero +/* E0F57C 80240DDC 8E0300D0 */ lw $v1, 0xd0($s0) +/* E0F580 80240DE0 8E240078 */ lw $a0, 0x78($s1) +/* E0F584 80240DE4 8C630000 */ lw $v1, ($v1) +/* E0F588 80240DE8 0083182A */ slt $v1, $a0, $v1 +/* E0F58C 80240DEC 10600013 */ beqz $v1, .L80240E3C +/* E0F590 80240DF0 0040302D */ daddu $a2, $v0, $zero +/* E0F594 80240DF4 00041040 */ sll $v0, $a0, 1 +/* E0F598 80240DF8 00441021 */ addu $v0, $v0, $a0 +/* E0F59C 80240DFC 00022880 */ sll $a1, $v0, 2 +.L80240E00: +/* E0F5A0 80240E00 8E0300D0 */ lw $v1, 0xd0($s0) +/* E0F5A4 80240E04 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* E0F5A8 80240E08 00A31021 */ addu $v0, $a1, $v1 +/* E0F5AC 80240E0C C4400008 */ lwc1 $f0, 8($v0) +/* E0F5B0 80240E10 46800020 */ cvt.s.w $f0, $f0 +/* E0F5B4 80240E14 4602003E */ c.le.s $f0, $f2 +/* E0F5B8 80240E18 00000000 */ nop +/* E0F5BC 80240E1C 45020003 */ bc1fl .L80240E2C +/* E0F5C0 80240E20 24840001 */ addiu $a0, $a0, 1 +/* E0F5C4 80240E24 0809038F */ j .L80240E3C +/* E0F5C8 80240E28 AE240078 */ sw $a0, 0x78($s1) +.L80240E2C: +/* E0F5CC 80240E2C 8C620000 */ lw $v0, ($v1) +/* E0F5D0 80240E30 0082102A */ slt $v0, $a0, $v0 +/* E0F5D4 80240E34 1440FFF2 */ bnez $v0, .L80240E00 +/* E0F5D8 80240E38 24A5000C */ addiu $a1, $a1, 0xc +.L80240E3C: +/* E0F5DC 80240E3C C6400000 */ lwc1 $f0, ($s2) +/* E0F5E0 80240E40 E4C00018 */ swc1 $f0, 0x18($a2) +/* E0F5E4 80240E44 8E0200CC */ lw $v0, 0xcc($s0) +/* E0F5E8 80240E48 8C420004 */ lw $v0, 4($v0) +/* E0F5EC 80240E4C ACC20028 */ sw $v0, 0x28($a2) +/* E0F5F0 80240E50 24020001 */ addiu $v0, $zero, 1 +/* E0F5F4 80240E54 AE200074 */ sw $zero, 0x74($s1) +/* E0F5F8 80240E58 AE220070 */ sw $v0, 0x70($s1) +/* E0F5FC 80240E5C 8FBF001C */ lw $ra, 0x1c($sp) +/* E0F600 80240E60 8FB20018 */ lw $s2, 0x18($sp) +/* E0F604 80240E64 8FB10014 */ lw $s1, 0x14($sp) +/* E0F608 80240E68 8FB00010 */ lw $s0, 0x10($sp) +/* E0F60C 80240E6C 03E00008 */ jr $ra +/* E0F610 80240E70 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74.s deleted file mode 100644 index 92bc6ee08e..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E74 -/* E0F614 80240E74 27BDFF98 */ addiu $sp, $sp, -0x68 -/* E0F618 80240E78 AFB40058 */ sw $s4, 0x58($sp) -/* E0F61C 80240E7C 0080A02D */ daddu $s4, $a0, $zero -/* E0F620 80240E80 AFBF0060 */ sw $ra, 0x60($sp) -/* E0F624 80240E84 AFB5005C */ sw $s5, 0x5c($sp) -/* E0F628 80240E88 AFB30054 */ sw $s3, 0x54($sp) -/* E0F62C 80240E8C AFB20050 */ sw $s2, 0x50($sp) -/* E0F630 80240E90 AFB1004C */ sw $s1, 0x4c($sp) -/* E0F634 80240E94 AFB00048 */ sw $s0, 0x48($sp) -/* E0F638 80240E98 8E910148 */ lw $s1, 0x148($s4) -/* E0F63C 80240E9C 86240008 */ lh $a0, 8($s1) -/* E0F640 80240EA0 0C00EABB */ jal get_npc_unsafe -/* E0F644 80240EA4 00A0802D */ daddu $s0, $a1, $zero -/* E0F648 80240EA8 8E83000C */ lw $v1, 0xc($s4) -/* E0F64C 80240EAC 0280202D */ daddu $a0, $s4, $zero -/* E0F650 80240EB0 8C650000 */ lw $a1, ($v1) -/* E0F654 80240EB4 0C0B1EAF */ jal get_variable -/* E0F658 80240EB8 0040902D */ daddu $s2, $v0, $zero -/* E0F65C 80240EBC AFA00018 */ sw $zero, 0x18($sp) -/* E0F660 80240EC0 8E2300D0 */ lw $v1, 0xd0($s1) -/* E0F664 80240EC4 8C630094 */ lw $v1, 0x94($v1) -/* E0F668 80240EC8 AFA3001C */ sw $v1, 0x1c($sp) -/* E0F66C 80240ECC 8E2300D0 */ lw $v1, 0xd0($s1) -/* E0F670 80240ED0 8C630080 */ lw $v1, 0x80($v1) -/* E0F674 80240ED4 AFA30020 */ sw $v1, 0x20($sp) -/* E0F678 80240ED8 8E2300D0 */ lw $v1, 0xd0($s1) -/* E0F67C 80240EDC 8C630088 */ lw $v1, 0x88($v1) -/* E0F680 80240EE0 AFA30024 */ sw $v1, 0x24($sp) -/* E0F684 80240EE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* E0F688 80240EE8 8C63008C */ lw $v1, 0x8c($v1) -/* E0F68C 80240EEC 27B50018 */ addiu $s5, $sp, 0x18 -/* E0F690 80240EF0 AFA30028 */ sw $v1, 0x28($sp) -/* E0F694 80240EF4 8E2300D0 */ lw $v1, 0xd0($s1) -/* E0F698 80240EF8 3C014282 */ lui $at, 0x4282 -/* E0F69C 80240EFC 44810000 */ mtc1 $at, $f0 -/* E0F6A0 80240F00 8C630090 */ lw $v1, 0x90($v1) -/* E0F6A4 80240F04 0040982D */ daddu $s3, $v0, $zero -/* E0F6A8 80240F08 E7A00030 */ swc1 $f0, 0x30($sp) -/* E0F6AC 80240F0C A7A00034 */ sh $zero, 0x34($sp) -/* E0F6B0 80240F10 16000005 */ bnez $s0, .L80240F28 -/* E0F6B4 80240F14 AFA3002C */ sw $v1, 0x2c($sp) -/* E0F6B8 80240F18 8E2200B0 */ lw $v0, 0xb0($s1) -/* E0F6BC 80240F1C 30420004 */ andi $v0, $v0, 4 -/* E0F6C0 80240F20 10400044 */ beqz $v0, .L80241034 -/* E0F6C4 80240F24 00000000 */ nop -.L80240F28: -/* E0F6C8 80240F28 2404F7FF */ addiu $a0, $zero, -0x801 -/* E0F6CC 80240F2C AE800070 */ sw $zero, 0x70($s4) -/* E0F6D0 80240F30 A640008E */ sh $zero, 0x8e($s2) -/* E0F6D4 80240F34 8E2200CC */ lw $v0, 0xcc($s1) -/* E0F6D8 80240F38 8E430000 */ lw $v1, ($s2) -/* E0F6DC 80240F3C 8C420000 */ lw $v0, ($v0) -/* E0F6E0 80240F40 00641824 */ and $v1, $v1, $a0 -/* E0F6E4 80240F44 AE430000 */ sw $v1, ($s2) -/* E0F6E8 80240F48 AE420028 */ sw $v0, 0x28($s2) -/* E0F6EC 80240F4C 8E2200D0 */ lw $v0, 0xd0($s1) -/* E0F6F0 80240F50 8C420098 */ lw $v0, 0x98($v0) -/* E0F6F4 80240F54 54400005 */ bnel $v0, $zero, .L80240F6C -/* E0F6F8 80240F58 2402FDFF */ addiu $v0, $zero, -0x201 -/* E0F6FC 80240F5C 34620200 */ ori $v0, $v1, 0x200 -/* E0F700 80240F60 2403FFF7 */ addiu $v1, $zero, -9 -/* E0F704 80240F64 080903DD */ j .L80240F74 -/* E0F708 80240F68 00431024 */ and $v0, $v0, $v1 -.L80240F6C: -/* E0F70C 80240F6C 00621024 */ and $v0, $v1, $v0 -/* E0F710 80240F70 34420008 */ ori $v0, $v0, 8 -.L80240F74: -/* E0F714 80240F74 AE420000 */ sw $v0, ($s2) -/* E0F718 80240F78 8E2200B0 */ lw $v0, 0xb0($s1) -/* E0F71C 80240F7C 30420004 */ andi $v0, $v0, 4 -/* E0F720 80240F80 10400008 */ beqz $v0, .L80240FA4 -/* E0F724 80240F84 24020063 */ addiu $v0, $zero, 0x63 -/* E0F728 80240F88 AE820070 */ sw $v0, 0x70($s4) -/* E0F72C 80240F8C AE800074 */ sw $zero, 0x74($s4) -/* E0F730 80240F90 8E2200B0 */ lw $v0, 0xb0($s1) -/* E0F734 80240F94 2403FFFB */ addiu $v1, $zero, -5 -/* E0F738 80240F98 00431024 */ and $v0, $v0, $v1 -/* E0F73C 80240F9C 080903F4 */ j .L80240FD0 -/* E0F740 80240FA0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240FA4: -/* E0F744 80240FA4 8E220000 */ lw $v0, ($s1) -/* E0F748 80240FA8 3C034000 */ lui $v1, 0x4000 -/* E0F74C 80240FAC 00431024 */ and $v0, $v0, $v1 -/* E0F750 80240FB0 10400007 */ beqz $v0, .L80240FD0 -/* E0F754 80240FB4 3C03BFFF */ lui $v1, 0xbfff -/* E0F758 80240FB8 2402000C */ addiu $v0, $zero, 0xc -/* E0F75C 80240FBC AE820070 */ sw $v0, 0x70($s4) -/* E0F760 80240FC0 8E220000 */ lw $v0, ($s1) -/* E0F764 80240FC4 3463FFFF */ ori $v1, $v1, 0xffff -/* E0F768 80240FC8 00431024 */ and $v0, $v0, $v1 -/* E0F76C 80240FCC AE220000 */ sw $v0, ($s1) -.L80240FD0: -/* E0F770 80240FD0 27A50038 */ addiu $a1, $sp, 0x38 -/* E0F774 80240FD4 27A6003C */ addiu $a2, $sp, 0x3c -/* E0F778 80240FD8 C6400038 */ lwc1 $f0, 0x38($s2) -/* E0F77C 80240FDC 864200A8 */ lh $v0, 0xa8($s2) -/* E0F780 80240FE0 3C0142C8 */ lui $at, 0x42c8 -/* E0F784 80240FE4 44812000 */ mtc1 $at, $f4 -/* E0F788 80240FE8 44823000 */ mtc1 $v0, $f6 -/* E0F78C 80240FEC 00000000 */ nop -/* E0F790 80240FF0 468031A0 */ cvt.s.w $f6, $f6 -/* E0F794 80240FF4 27A20044 */ addiu $v0, $sp, 0x44 -/* E0F798 80240FF8 E7A00038 */ swc1 $f0, 0x38($sp) -/* E0F79C 80240FFC C640003C */ lwc1 $f0, 0x3c($s2) -/* E0F7A0 80241000 C6420040 */ lwc1 $f2, 0x40($s2) -/* E0F7A4 80241004 46060000 */ add.s $f0, $f0, $f6 -/* E0F7A8 80241008 E7A40044 */ swc1 $f4, 0x44($sp) -/* E0F7AC 8024100C E7A20040 */ swc1 $f2, 0x40($sp) -/* E0F7B0 80241010 E7A0003C */ swc1 $f0, 0x3c($sp) -/* E0F7B4 80241014 AFA20010 */ sw $v0, 0x10($sp) -/* E0F7B8 80241018 8E440080 */ lw $a0, 0x80($s2) -/* E0F7BC 8024101C 0C0372DF */ jal func_800DCB7C -/* E0F7C0 80241020 27A70040 */ addiu $a3, $sp, 0x40 -/* E0F7C4 80241024 10400003 */ beqz $v0, .L80241034 -/* E0F7C8 80241028 00000000 */ nop -/* E0F7CC 8024102C C7A0003C */ lwc1 $f0, 0x3c($sp) -/* E0F7D0 80241030 E640003C */ swc1 $f0, 0x3c($s2) -.L80241034: -/* E0F7D4 80241034 8E830070 */ lw $v1, 0x70($s4) -/* E0F7D8 80241038 2C620064 */ sltiu $v0, $v1, 0x64 -/* E0F7DC 8024103C 10400042 */ beqz $v0, .L80241148 -/* E0F7E0 80241040 00031080 */ sll $v0, $v1, 2 -/* E0F7E4 80241044 3C018024 */ lui $at, 0x8024 -/* E0F7E8 80241048 00220821 */ addu $at, $at, $v0 -/* E0F7EC 8024104C 8C223E00 */ lw $v0, 0x3e00($at) -/* E0F7F0 80241050 00400008 */ jr $v0 -/* E0F7F4 80241054 00000000 */ nop -/* E0F7F8 80241058 0280202D */ daddu $a0, $s4, $zero -/* E0F7FC 8024105C 0260282D */ daddu $a1, $s3, $zero -/* E0F800 80241060 0C0900B8 */ jal func_802402E0 -/* E0F804 80241064 02A0302D */ daddu $a2, $s5, $zero -/* E0F808 80241068 0280202D */ daddu $a0, $s4, $zero -/* E0F80C 8024106C 0260282D */ daddu $a1, $s3, $zero -/* E0F810 80241070 0C09010E */ jal func_80240438 -/* E0F814 80241074 02A0302D */ daddu $a2, $s5, $zero -/* E0F818 80241078 08090452 */ j .L80241148 -/* E0F81C 8024107C 00000000 */ nop -/* E0F820 80241080 0280202D */ daddu $a0, $s4, $zero -/* E0F824 80241084 0260282D */ daddu $a1, $s3, $zero -/* E0F828 80241088 0C0901B8 */ jal func_802406E0 -/* E0F82C 8024108C 02A0302D */ daddu $a2, $s5, $zero -/* E0F830 80241090 0280202D */ daddu $a0, $s4, $zero -/* E0F834 80241094 0260282D */ daddu $a1, $s3, $zero -/* E0F838 80241098 0C0901E8 */ jal func_802407A0 -/* E0F83C 8024109C 02A0302D */ daddu $a2, $s5, $zero -/* E0F840 802410A0 08090452 */ j .L80241148 -/* E0F844 802410A4 00000000 */ nop -/* E0F848 802410A8 0280202D */ daddu $a0, $s4, $zero -/* E0F84C 802410AC 0260282D */ daddu $a1, $s3, $zero -/* E0F850 802410B0 0C090257 */ jal func_8024095C -/* E0F854 802410B4 02A0302D */ daddu $a2, $s5, $zero -/* E0F858 802410B8 08090452 */ j .L80241148 -/* E0F85C 802410BC 00000000 */ nop -/* E0F860 802410C0 0280202D */ daddu $a0, $s4, $zero -/* E0F864 802410C4 0260282D */ daddu $a1, $s3, $zero -/* E0F868 802410C8 0C090284 */ jal func_80240A10 -/* E0F86C 802410CC 02A0302D */ daddu $a2, $s5, $zero -/* E0F870 802410D0 0280202D */ daddu $a0, $s4, $zero -/* E0F874 802410D4 0260282D */ daddu $a1, $s3, $zero -/* E0F878 802410D8 0C0902A1 */ jal func_80240A84 -/* E0F87C 802410DC 02A0302D */ daddu $a2, $s5, $zero -/* E0F880 802410E0 08090452 */ j .L80241148 -/* E0F884 802410E4 00000000 */ nop -/* E0F888 802410E8 0280202D */ daddu $a0, $s4, $zero -/* E0F88C 802410EC 0260282D */ daddu $a1, $s3, $zero -/* E0F890 802410F0 0C0902BF */ jal func_80240AFC -/* E0F894 802410F4 02A0302D */ daddu $a2, $s5, $zero -/* E0F898 802410F8 0280202D */ daddu $a0, $s4, $zero -/* E0F89C 802410FC 0260282D */ daddu $a1, $s3, $zero -/* E0F8A0 80241100 0C09030B */ jal func_80240C2C -/* E0F8A4 80241104 02A0302D */ daddu $a2, $s5, $zero -/* E0F8A8 80241108 08090452 */ j .L80241148 -/* E0F8AC 8024110C 00000000 */ nop -/* E0F8B0 80241110 0280202D */ daddu $a0, $s4, $zero -/* E0F8B4 80241114 0260282D */ daddu $a1, $s3, $zero -/* E0F8B8 80241118 0C090353 */ jal func_80240D4C -/* E0F8BC 8024111C 02A0302D */ daddu $a2, $s5, $zero -/* E0F8C0 80241120 08090452 */ j .L80241148 -/* E0F8C4 80241124 00000000 */ nop -/* E0F8C8 80241128 0280202D */ daddu $a0, $s4, $zero -/* E0F8CC 8024112C 0260282D */ daddu $a1, $s3, $zero -/* E0F8D0 80241130 0C09036D */ jal func_80240DB4 -/* E0F8D4 80241134 02A0302D */ daddu $a2, $s5, $zero -/* E0F8D8 80241138 08090452 */ j .L80241148 -/* E0F8DC 8024113C 00000000 */ nop -/* E0F8E0 80241140 0C0129CF */ jal func_8004A73C -/* E0F8E4 80241144 0280202D */ daddu $a0, $s4, $zero -.L80241148: -/* E0F8E8 80241148 8FBF0060 */ lw $ra, 0x60($sp) -/* E0F8EC 8024114C 8FB5005C */ lw $s5, 0x5c($sp) -/* E0F8F0 80241150 8FB40058 */ lw $s4, 0x58($sp) -/* E0F8F4 80241154 8FB30054 */ lw $s3, 0x54($sp) -/* E0F8F8 80241158 8FB20050 */ lw $s2, 0x50($sp) -/* E0F8FC 8024115C 8FB1004C */ lw $s1, 0x4c($sp) -/* E0F900 80241160 8FB00048 */ lw $s0, 0x48($sp) -/* E0F904 80241164 0000102D */ daddu $v0, $zero, $zero -/* E0F908 80241168 03E00008 */ jr $ra -/* E0F90C 8024116C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s new file mode 100644 index 0000000000..2ea272337e --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0E7A0/func_80240E74_E0F614.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E74_E0F614 +/* E0F614 80240E74 27BDFF98 */ addiu $sp, $sp, -0x68 +/* E0F618 80240E78 AFB40058 */ sw $s4, 0x58($sp) +/* E0F61C 80240E7C 0080A02D */ daddu $s4, $a0, $zero +/* E0F620 80240E80 AFBF0060 */ sw $ra, 0x60($sp) +/* E0F624 80240E84 AFB5005C */ sw $s5, 0x5c($sp) +/* E0F628 80240E88 AFB30054 */ sw $s3, 0x54($sp) +/* E0F62C 80240E8C AFB20050 */ sw $s2, 0x50($sp) +/* E0F630 80240E90 AFB1004C */ sw $s1, 0x4c($sp) +/* E0F634 80240E94 AFB00048 */ sw $s0, 0x48($sp) +/* E0F638 80240E98 8E910148 */ lw $s1, 0x148($s4) +/* E0F63C 80240E9C 86240008 */ lh $a0, 8($s1) +/* E0F640 80240EA0 0C00EABB */ jal get_npc_unsafe +/* E0F644 80240EA4 00A0802D */ daddu $s0, $a1, $zero +/* E0F648 80240EA8 8E83000C */ lw $v1, 0xc($s4) +/* E0F64C 80240EAC 0280202D */ daddu $a0, $s4, $zero +/* E0F650 80240EB0 8C650000 */ lw $a1, ($v1) +/* E0F654 80240EB4 0C0B1EAF */ jal get_variable +/* E0F658 80240EB8 0040902D */ daddu $s2, $v0, $zero +/* E0F65C 80240EBC AFA00018 */ sw $zero, 0x18($sp) +/* E0F660 80240EC0 8E2300D0 */ lw $v1, 0xd0($s1) +/* E0F664 80240EC4 8C630094 */ lw $v1, 0x94($v1) +/* E0F668 80240EC8 AFA3001C */ sw $v1, 0x1c($sp) +/* E0F66C 80240ECC 8E2300D0 */ lw $v1, 0xd0($s1) +/* E0F670 80240ED0 8C630080 */ lw $v1, 0x80($v1) +/* E0F674 80240ED4 AFA30020 */ sw $v1, 0x20($sp) +/* E0F678 80240ED8 8E2300D0 */ lw $v1, 0xd0($s1) +/* E0F67C 80240EDC 8C630088 */ lw $v1, 0x88($v1) +/* E0F680 80240EE0 AFA30024 */ sw $v1, 0x24($sp) +/* E0F684 80240EE4 8E2300D0 */ lw $v1, 0xd0($s1) +/* E0F688 80240EE8 8C63008C */ lw $v1, 0x8c($v1) +/* E0F68C 80240EEC 27B50018 */ addiu $s5, $sp, 0x18 +/* E0F690 80240EF0 AFA30028 */ sw $v1, 0x28($sp) +/* E0F694 80240EF4 8E2300D0 */ lw $v1, 0xd0($s1) +/* E0F698 80240EF8 3C014282 */ lui $at, 0x4282 +/* E0F69C 80240EFC 44810000 */ mtc1 $at, $f0 +/* E0F6A0 80240F00 8C630090 */ lw $v1, 0x90($v1) +/* E0F6A4 80240F04 0040982D */ daddu $s3, $v0, $zero +/* E0F6A8 80240F08 E7A00030 */ swc1 $f0, 0x30($sp) +/* E0F6AC 80240F0C A7A00034 */ sh $zero, 0x34($sp) +/* E0F6B0 80240F10 16000005 */ bnez $s0, .L80240F28 +/* E0F6B4 80240F14 AFA3002C */ sw $v1, 0x2c($sp) +/* E0F6B8 80240F18 8E2200B0 */ lw $v0, 0xb0($s1) +/* E0F6BC 80240F1C 30420004 */ andi $v0, $v0, 4 +/* E0F6C0 80240F20 10400044 */ beqz $v0, .L80241034 +/* E0F6C4 80240F24 00000000 */ nop +.L80240F28: +/* E0F6C8 80240F28 2404F7FF */ addiu $a0, $zero, -0x801 +/* E0F6CC 80240F2C AE800070 */ sw $zero, 0x70($s4) +/* E0F6D0 80240F30 A640008E */ sh $zero, 0x8e($s2) +/* E0F6D4 80240F34 8E2200CC */ lw $v0, 0xcc($s1) +/* E0F6D8 80240F38 8E430000 */ lw $v1, ($s2) +/* E0F6DC 80240F3C 8C420000 */ lw $v0, ($v0) +/* E0F6E0 80240F40 00641824 */ and $v1, $v1, $a0 +/* E0F6E4 80240F44 AE430000 */ sw $v1, ($s2) +/* E0F6E8 80240F48 AE420028 */ sw $v0, 0x28($s2) +/* E0F6EC 80240F4C 8E2200D0 */ lw $v0, 0xd0($s1) +/* E0F6F0 80240F50 8C420098 */ lw $v0, 0x98($v0) +/* E0F6F4 80240F54 54400005 */ bnel $v0, $zero, .L80240F6C +/* E0F6F8 80240F58 2402FDFF */ addiu $v0, $zero, -0x201 +/* E0F6FC 80240F5C 34620200 */ ori $v0, $v1, 0x200 +/* E0F700 80240F60 2403FFF7 */ addiu $v1, $zero, -9 +/* E0F704 80240F64 080903DD */ j .L80240F74 +/* E0F708 80240F68 00431024 */ and $v0, $v0, $v1 +.L80240F6C: +/* E0F70C 80240F6C 00621024 */ and $v0, $v1, $v0 +/* E0F710 80240F70 34420008 */ ori $v0, $v0, 8 +.L80240F74: +/* E0F714 80240F74 AE420000 */ sw $v0, ($s2) +/* E0F718 80240F78 8E2200B0 */ lw $v0, 0xb0($s1) +/* E0F71C 80240F7C 30420004 */ andi $v0, $v0, 4 +/* E0F720 80240F80 10400008 */ beqz $v0, .L80240FA4 +/* E0F724 80240F84 24020063 */ addiu $v0, $zero, 0x63 +/* E0F728 80240F88 AE820070 */ sw $v0, 0x70($s4) +/* E0F72C 80240F8C AE800074 */ sw $zero, 0x74($s4) +/* E0F730 80240F90 8E2200B0 */ lw $v0, 0xb0($s1) +/* E0F734 80240F94 2403FFFB */ addiu $v1, $zero, -5 +/* E0F738 80240F98 00431024 */ and $v0, $v0, $v1 +/* E0F73C 80240F9C 080903F4 */ j .L80240FD0 +/* E0F740 80240FA0 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240FA4: +/* E0F744 80240FA4 8E220000 */ lw $v0, ($s1) +/* E0F748 80240FA8 3C034000 */ lui $v1, 0x4000 +/* E0F74C 80240FAC 00431024 */ and $v0, $v0, $v1 +/* E0F750 80240FB0 10400007 */ beqz $v0, .L80240FD0 +/* E0F754 80240FB4 3C03BFFF */ lui $v1, 0xbfff +/* E0F758 80240FB8 2402000C */ addiu $v0, $zero, 0xc +/* E0F75C 80240FBC AE820070 */ sw $v0, 0x70($s4) +/* E0F760 80240FC0 8E220000 */ lw $v0, ($s1) +/* E0F764 80240FC4 3463FFFF */ ori $v1, $v1, 0xffff +/* E0F768 80240FC8 00431024 */ and $v0, $v0, $v1 +/* E0F76C 80240FCC AE220000 */ sw $v0, ($s1) +.L80240FD0: +/* E0F770 80240FD0 27A50038 */ addiu $a1, $sp, 0x38 +/* E0F774 80240FD4 27A6003C */ addiu $a2, $sp, 0x3c +/* E0F778 80240FD8 C6400038 */ lwc1 $f0, 0x38($s2) +/* E0F77C 80240FDC 864200A8 */ lh $v0, 0xa8($s2) +/* E0F780 80240FE0 3C0142C8 */ lui $at, 0x42c8 +/* E0F784 80240FE4 44812000 */ mtc1 $at, $f4 +/* E0F788 80240FE8 44823000 */ mtc1 $v0, $f6 +/* E0F78C 80240FEC 00000000 */ nop +/* E0F790 80240FF0 468031A0 */ cvt.s.w $f6, $f6 +/* E0F794 80240FF4 27A20044 */ addiu $v0, $sp, 0x44 +/* E0F798 80240FF8 E7A00038 */ swc1 $f0, 0x38($sp) +/* E0F79C 80240FFC C640003C */ lwc1 $f0, 0x3c($s2) +/* E0F7A0 80241000 C6420040 */ lwc1 $f2, 0x40($s2) +/* E0F7A4 80241004 46060000 */ add.s $f0, $f0, $f6 +/* E0F7A8 80241008 E7A40044 */ swc1 $f4, 0x44($sp) +/* E0F7AC 8024100C E7A20040 */ swc1 $f2, 0x40($sp) +/* E0F7B0 80241010 E7A0003C */ swc1 $f0, 0x3c($sp) +/* E0F7B4 80241014 AFA20010 */ sw $v0, 0x10($sp) +/* E0F7B8 80241018 8E440080 */ lw $a0, 0x80($s2) +/* E0F7BC 8024101C 0C0372DF */ jal func_800DCB7C +/* E0F7C0 80241020 27A70040 */ addiu $a3, $sp, 0x40 +/* E0F7C4 80241024 10400003 */ beqz $v0, .L80241034 +/* E0F7C8 80241028 00000000 */ nop +/* E0F7CC 8024102C C7A0003C */ lwc1 $f0, 0x3c($sp) +/* E0F7D0 80241030 E640003C */ swc1 $f0, 0x3c($s2) +.L80241034: +/* E0F7D4 80241034 8E830070 */ lw $v1, 0x70($s4) +/* E0F7D8 80241038 2C620064 */ sltiu $v0, $v1, 0x64 +/* E0F7DC 8024103C 10400042 */ beqz $v0, .L80241148 +/* E0F7E0 80241040 00031080 */ sll $v0, $v1, 2 +/* E0F7E4 80241044 3C018024 */ lui $at, 0x8024 +/* E0F7E8 80241048 00220821 */ addu $at, $at, $v0 +/* E0F7EC 8024104C 8C223E00 */ lw $v0, 0x3e00($at) +/* E0F7F0 80241050 00400008 */ jr $v0 +/* E0F7F4 80241054 00000000 */ nop +/* E0F7F8 80241058 0280202D */ daddu $a0, $s4, $zero +/* E0F7FC 8024105C 0260282D */ daddu $a1, $s3, $zero +/* E0F800 80241060 0C0900B8 */ jal func_802402E0_E0EA80 +/* E0F804 80241064 02A0302D */ daddu $a2, $s5, $zero +/* E0F808 80241068 0280202D */ daddu $a0, $s4, $zero +/* E0F80C 8024106C 0260282D */ daddu $a1, $s3, $zero +/* E0F810 80241070 0C09010E */ jal func_80240438_E0EBD8 +/* E0F814 80241074 02A0302D */ daddu $a2, $s5, $zero +/* E0F818 80241078 08090452 */ j .L80241148 +/* E0F81C 8024107C 00000000 */ nop +/* E0F820 80241080 0280202D */ daddu $a0, $s4, $zero +/* E0F824 80241084 0260282D */ daddu $a1, $s3, $zero +/* E0F828 80241088 0C0901B8 */ jal func_802406E0_E0EE80 +/* E0F82C 8024108C 02A0302D */ daddu $a2, $s5, $zero +/* E0F830 80241090 0280202D */ daddu $a0, $s4, $zero +/* E0F834 80241094 0260282D */ daddu $a1, $s3, $zero +/* E0F838 80241098 0C0901E8 */ jal func_802407A0_E0EF40 +/* E0F83C 8024109C 02A0302D */ daddu $a2, $s5, $zero +/* E0F840 802410A0 08090452 */ j .L80241148 +/* E0F844 802410A4 00000000 */ nop +/* E0F848 802410A8 0280202D */ daddu $a0, $s4, $zero +/* E0F84C 802410AC 0260282D */ daddu $a1, $s3, $zero +/* E0F850 802410B0 0C090257 */ jal func_8024095C_E0F0FC +/* E0F854 802410B4 02A0302D */ daddu $a2, $s5, $zero +/* E0F858 802410B8 08090452 */ j .L80241148 +/* E0F85C 802410BC 00000000 */ nop +/* E0F860 802410C0 0280202D */ daddu $a0, $s4, $zero +/* E0F864 802410C4 0260282D */ daddu $a1, $s3, $zero +/* E0F868 802410C8 0C090284 */ jal func_80240A10_E0F1B0 +/* E0F86C 802410CC 02A0302D */ daddu $a2, $s5, $zero +/* E0F870 802410D0 0280202D */ daddu $a0, $s4, $zero +/* E0F874 802410D4 0260282D */ daddu $a1, $s3, $zero +/* E0F878 802410D8 0C0902A1 */ jal func_80240A84_E0F224 +/* E0F87C 802410DC 02A0302D */ daddu $a2, $s5, $zero +/* E0F880 802410E0 08090452 */ j .L80241148 +/* E0F884 802410E4 00000000 */ nop +/* E0F888 802410E8 0280202D */ daddu $a0, $s4, $zero +/* E0F88C 802410EC 0260282D */ daddu $a1, $s3, $zero +/* E0F890 802410F0 0C0902BF */ jal func_80240AFC_E0F29C +/* E0F894 802410F4 02A0302D */ daddu $a2, $s5, $zero +/* E0F898 802410F8 0280202D */ daddu $a0, $s4, $zero +/* E0F89C 802410FC 0260282D */ daddu $a1, $s3, $zero +/* E0F8A0 80241100 0C09030B */ jal func_80240C2C_E0F3CC +/* E0F8A4 80241104 02A0302D */ daddu $a2, $s5, $zero +/* E0F8A8 80241108 08090452 */ j .L80241148 +/* E0F8AC 8024110C 00000000 */ nop +/* E0F8B0 80241110 0280202D */ daddu $a0, $s4, $zero +/* E0F8B4 80241114 0260282D */ daddu $a1, $s3, $zero +/* E0F8B8 80241118 0C090353 */ jal func_80240D4C_E0F4EC +/* E0F8BC 8024111C 02A0302D */ daddu $a2, $s5, $zero +/* E0F8C0 80241120 08090452 */ j .L80241148 +/* E0F8C4 80241124 00000000 */ nop +/* E0F8C8 80241128 0280202D */ daddu $a0, $s4, $zero +/* E0F8CC 8024112C 0260282D */ daddu $a1, $s3, $zero +/* E0F8D0 80241130 0C09036D */ jal func_80240DB4_E0F554 +/* E0F8D4 80241134 02A0302D */ daddu $a2, $s5, $zero +/* E0F8D8 80241138 08090452 */ j .L80241148 +/* E0F8DC 8024113C 00000000 */ nop +/* E0F8E0 80241140 0C0129CF */ jal func_8004A73C +/* E0F8E4 80241144 0280202D */ daddu $a0, $s4, $zero +.L80241148: +/* E0F8E8 80241148 8FBF0060 */ lw $ra, 0x60($sp) +/* E0F8EC 8024114C 8FB5005C */ lw $s5, 0x5c($sp) +/* E0F8F0 80241150 8FB40058 */ lw $s4, 0x58($sp) +/* E0F8F4 80241154 8FB30054 */ lw $s3, 0x54($sp) +/* E0F8F8 80241158 8FB20050 */ lw $s2, 0x50($sp) +/* E0F8FC 8024115C 8FB1004C */ lw $s1, 0x4c($sp) +/* E0F900 80241160 8FB00048 */ lw $s0, 0x48($sp) +/* E0F904 80241164 0000102D */ daddu $v0, $zero, $zero +/* E0F908 80241168 03E00008 */ jr $ra +/* E0F90C 8024116C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0.s deleted file mode 100644 index dbb49abd16..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411E0 -/* E0F980 802411E0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* E0F984 802411E4 AFB1002C */ sw $s1, 0x2c($sp) -/* E0F988 802411E8 0080882D */ daddu $s1, $a0, $zero -/* E0F98C 802411EC AFB20030 */ sw $s2, 0x30($sp) -/* E0F990 802411F0 00A0902D */ daddu $s2, $a1, $zero -/* 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, 0x800a -/* E0F9A4 80241204 2484A66C */ addiu $a0, $a0, -0x5994 -/* E0F9A8 80241208 3C02DE00 */ lui $v0, 0xde00 -/* E0F9AC 8024120C 44920000 */ mtc1 $s2, $f0 -/* E0F9B0 80241210 00000000 */ nop -/* E0F9B4 80241214 46800021 */ cvt.d.w $f0, $f0 -/* E0F9B8 80241218 8C830000 */ lw $v1, ($a0) -/* E0F9BC 8024121C 3C018024 */ lui $at, 0x8024 -/* E0F9C0 80241220 D4223F90 */ ldc1 $f2, 0x3f90($at) -/* E0F9C4 80241224 0060282D */ daddu $a1, $v1, $zero -/* E0F9C8 80241228 24630008 */ addiu $v1, $v1, 8 -/* E0F9CC 8024122C AC830000 */ sw $v1, ($a0) -/* E0F9D0 80241230 ACA20000 */ sw $v0, ($a1) -/* E0F9D4 80241234 3C028024 */ lui $v0, 0x8024 -/* E0F9D8 80241238 24423C50 */ addiu $v0, $v0, 0x3c50 -/* E0F9DC 8024123C ACA20004 */ sw $v0, 4($a1) -/* E0F9E0 80241240 24620008 */ addiu $v0, $v1, 8 -/* E0F9E4 80241244 AC820000 */ sw $v0, ($a0) -/* E0F9E8 80241248 3C02E700 */ lui $v0, 0xe700 -/* E0F9EC 8024124C 46220002 */ mul.d $f0, $f0, $f2 -/* E0F9F0 80241250 00000000 */ nop -/* E0F9F4 80241254 AC620000 */ sw $v0, ($v1) -/* E0F9F8 80241258 24620010 */ addiu $v0, $v1, 0x10 -/* E0F9FC 8024125C AC600004 */ sw $zero, 4($v1) -/* E0FA00 80241260 AC820000 */ sw $v0, ($a0) -/* E0FA04 80241264 3C02FA00 */ lui $v0, 0xfa00 -/* E0FA08 80241268 3C0141E0 */ lui $at, 0x41e0 -/* E0FA0C 8024126C 44811800 */ mtc1 $at, $f3 -/* 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 -/* E0FA20 80241280 45010005 */ bc1t .L80241298 -/* E0FA24 80241284 AC620008 */ sw $v0, 8($v1) -/* E0FA28 80241288 4620010D */ trunc.w.d $f4, $f0 -/* E0FA2C 8024128C 440C2000 */ mfc1 $t4, $f4 -/* E0FA30 80241290 080904AD */ j .L802412B4 -/* E0FA34 80241294 3C091078 */ lui $t1, 0x1078 -.L80241298: -/* E0FA38 80241298 46220001 */ sub.d $f0, $f0, $f2 -/* E0FA3C 8024129C 3C028000 */ lui $v0, 0x8000 -/* E0FA40 802412A0 4620010D */ trunc.w.d $f4, $f0 -/* E0FA44 802412A4 440C2000 */ mfc1 $t4, $f4 -/* E0FA48 802412A8 00000000 */ nop -/* E0FA4C 802412AC 01826025 */ or $t4, $t4, $v0 -/* E0FA50 802412B0 3C091078 */ lui $t1, 0x1078 -.L802412B4: -/* E0FA54 802412B4 35291800 */ ori $t1, $t1, 0x1800 -/* E0FA58 802412B8 3C0BF644 */ lui $t3, 0xf644 -/* E0FA5C 802412BC 356B0204 */ ori $t3, $t3, 0x204 -/* E0FA60 802412C0 3C0A000C */ lui $t2, 0xc -/* E0FA64 802412C4 354A00D4 */ ori $t2, $t2, 0xd4 -/* 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, 0x800a -/* E0FA78 802412D8 2508A66C */ addiu $t0, $t0, -0x5994 -/* E0FA7C 802412DC 318200FF */ andi $v0, $t4, 0xff -/* E0FA80 802412E0 00491025 */ or $v0, $v0, $t1 -/* E0FA84 802412E4 44921000 */ mtc1 $s2, $f2 -/* E0FA88 802412E8 00000000 */ nop -/* E0FA8C 802412EC 468010A1 */ cvt.d.w $f2, $f2 -/* E0FA90 802412F0 8D030000 */ lw $v1, ($t0) -/* E0FA94 802412F4 3C018024 */ lui $at, 0x8024 -/* E0FA98 802412F8 D4203F98 */ ldc1 $f0, 0x3f98($at) -/* E0FA9C 802412FC 24100001 */ addiu $s0, $zero, 1 -/* E0FAA0 80241300 ADA20000 */ sw $v0, ($t5) -/* E0FAA4 80241304 0060102D */ daddu $v0, $v1, $zero -/* E0FAA8 80241308 24630008 */ addiu $v1, $v1, 8 -/* E0FAAC 8024130C AD030000 */ sw $v1, ($t0) -/* E0FAB0 80241310 AC4B0000 */ sw $t3, ($v0) -/* E0FAB4 80241314 AC4A0004 */ sw $t2, 4($v0) -/* E0FAB8 80241318 24620008 */ addiu $v0, $v1, 8 -/* E0FABC 8024131C AD020000 */ sw $v0, ($t0) -/* E0FAC0 80241320 3C02E700 */ lui $v0, 0xe700 -/* E0FAC4 80241324 46201082 */ mul.d $f2, $f2, $f0 -/* E0FAC8 80241328 00000000 */ nop -/* E0FACC 8024132C AC620000 */ sw $v0, ($v1) -/* E0FAD0 80241330 24020006 */ addiu $v0, $zero, 6 -/* E0FAD4 80241334 AC600004 */ sw $zero, 4($v1) -/* E0FAD8 80241338 AFA20010 */ sw $v0, 0x10($sp) -/* E0FADC 8024133C AFA00014 */ sw $zero, 0x14($sp) -/* E0FAE0 80241340 AFB00018 */ sw $s0, 0x18($sp) -/* E0FAE4 80241344 AFB20020 */ sw $s2, 0x20($sp) -/* E0FAE8 80241348 4620110D */ trunc.w.d $f4, $f2 -/* E0FAEC 8024134C E7A4001C */ swc1 $f4, 0x1c($sp) -/* E0FAF0 80241350 0C04B6D6 */ jal func_8012DB58 -/* E0FAF4 80241354 24070052 */ addiu $a3, $zero, 0x52 -/* E0FAF8 80241358 8E220008 */ lw $v0, 8($s1) -/* E0FAFC 8024135C 1450001F */ bne $v0, $s0, .L802413DC -/* E0FB00 80241360 3C040008 */ lui $a0, 8 -/* E0FB04 80241364 3484001C */ ori $a0, $a0, 0x1c -/* E0FB08 80241368 24050042 */ addiu $a1, $zero, 0x42 -/* E0FB0C 8024136C 24060039 */ addiu $a2, $zero, 0x39 -/* E0FB10 80241370 0240382D */ daddu $a3, $s2, $zero -/* E0FB14 80241374 AFB00010 */ sw $s0, 0x10($sp) -/* E0FB18 80241378 0C04993B */ jal draw_string -/* E0FB1C 8024137C AFA00014 */ sw $zero, 0x14($sp) -/* E0FB20 80241380 240500DB */ addiu $a1, $zero, 0xdb -/* E0FB24 80241384 2406004E */ addiu $a2, $zero, 0x4e -/* E0FB28 80241388 0200382D */ daddu $a3, $s0, $zero -/* E0FB2C 8024138C 3C108011 */ lui $s0, %hi(gPlayerData) -/* E0FB30 80241390 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* E0FB34 80241394 AFA00010 */ sw $zero, 0x10($sp) -/* E0FB38 80241398 AFB20014 */ sw $s2, 0x14($sp) -/* E0FB3C 8024139C 9604032E */ lhu $a0, 0x32e($s0) -/* E0FB40 802413A0 24110003 */ addiu $s1, $zero, 3 -/* E0FB44 802413A4 0C049DA7 */ jal draw_number -/* E0FB48 802413A8 AFB10018 */ sw $s1, 0x18($sp) -/* E0FB4C 802413AC 240500DB */ addiu $a1, $zero, 0xdb -/* E0FB50 802413B0 2406005D */ addiu $a2, $zero, 0x5d -/* E0FB54 802413B4 8E040330 */ lw $a0, 0x330($s0) -/* E0FB58 802413B8 24070001 */ addiu $a3, $zero, 1 -/* E0FB5C 802413BC AFA00010 */ sw $zero, 0x10($sp) -/* E0FB60 802413C0 AFB20014 */ sw $s2, 0x14($sp) -/* E0FB64 802413C4 0C049DA7 */ jal draw_number -/* E0FB68 802413C8 AFB10018 */ sw $s1, 0x18($sp) -/* E0FB6C 802413CC 240500DB */ addiu $a1, $zero, 0xdb -/* E0FB70 802413D0 96040334 */ lhu $a0, 0x334($s0) -/* E0FB74 802413D4 08090514 */ j .L80241450 -/* E0FB78 802413D8 2406006C */ addiu $a2, $zero, 0x6c -.L802413DC: -/* E0FB7C 802413DC 3484001D */ ori $a0, $a0, 0x1d -/* E0FB80 802413E0 24050040 */ addiu $a1, $zero, 0x40 -/* E0FB84 802413E4 24060039 */ addiu $a2, $zero, 0x39 -/* E0FB88 802413E8 0240382D */ daddu $a3, $s2, $zero -/* E0FB8C 802413EC AFB00010 */ sw $s0, 0x10($sp) -/* E0FB90 802413F0 0C04993B */ jal draw_string -/* E0FB94 802413F4 AFA00014 */ sw $zero, 0x14($sp) -/* E0FB98 802413F8 240500DB */ addiu $a1, $zero, 0xdb -/* E0FB9C 802413FC 2406004E */ addiu $a2, $zero, 0x4e -/* E0FBA0 80241400 24070001 */ addiu $a3, $zero, 1 -/* E0FBA4 80241404 3C108011 */ lui $s0, %hi(gPlayerData) -/* E0FBA8 80241408 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* E0FBAC 8024140C AFA00010 */ sw $zero, 0x10($sp) -/* E0FBB0 80241410 AFB20014 */ sw $s2, 0x14($sp) -/* E0FBB4 80241414 96040336 */ lhu $a0, 0x336($s0) -/* E0FBB8 80241418 24110003 */ addiu $s1, $zero, 3 -/* E0FBBC 8024141C 0C049DA7 */ jal draw_number -/* E0FBC0 80241420 AFB10018 */ sw $s1, 0x18($sp) -/* E0FBC4 80241424 240500DB */ addiu $a1, $zero, 0xdb -/* E0FBC8 80241428 2406005D */ addiu $a2, $zero, 0x5d -/* E0FBCC 8024142C 8E040338 */ lw $a0, 0x338($s0) -/* E0FBD0 80241430 24070001 */ addiu $a3, $zero, 1 -/* E0FBD4 80241434 AFA00010 */ sw $zero, 0x10($sp) -/* E0FBD8 80241438 AFB20014 */ sw $s2, 0x14($sp) -/* E0FBDC 8024143C 0C049DA7 */ jal draw_number -/* E0FBE0 80241440 AFB10018 */ sw $s1, 0x18($sp) -/* E0FBE4 80241444 240500DB */ addiu $a1, $zero, 0xdb -/* E0FBE8 80241448 2406006C */ addiu $a2, $zero, 0x6c -/* E0FBEC 8024144C 9604033C */ lhu $a0, 0x33c($s0) -.L80241450: -/* E0FBF0 80241450 24070001 */ addiu $a3, $zero, 1 -/* E0FBF4 80241454 AFA00010 */ sw $zero, 0x10($sp) -/* E0FBF8 80241458 AFB20014 */ sw $s2, 0x14($sp) -/* E0FBFC 8024145C 0C049DA7 */ jal draw_number -/* E0FC00 80241460 AFB10018 */ sw $s1, 0x18($sp) -/* E0FC04 80241464 3C040008 */ lui $a0, 8 -/* E0FC08 80241468 3484001E */ ori $a0, $a0, 0x1e -/* E0FC0C 8024146C 2405003A */ addiu $a1, $zero, 0x3a -/* E0FC10 80241470 2406004E */ addiu $a2, $zero, 0x4e -/* E0FC14 80241474 0240382D */ daddu $a3, $s2, $zero -/* E0FC18 80241478 24100001 */ addiu $s0, $zero, 1 -/* E0FC1C 8024147C AFA00010 */ sw $zero, 0x10($sp) -/* E0FC20 80241480 0C04993B */ jal draw_string -/* E0FC24 80241484 AFB00014 */ sw $s0, 0x14($sp) -/* E0FC28 80241488 3C040008 */ lui $a0, 8 -/* E0FC2C 8024148C 34840023 */ ori $a0, $a0, 0x23 -/* E0FC30 80241490 240500DF */ addiu $a1, $zero, 0xdf -/* E0FC34 80241494 2406004E */ addiu $a2, $zero, 0x4e -/* E0FC38 80241498 0240382D */ daddu $a3, $s2, $zero -/* E0FC3C 8024149C AFA00010 */ sw $zero, 0x10($sp) -/* E0FC40 802414A0 0C04993B */ jal draw_string -/* E0FC44 802414A4 AFB00014 */ sw $s0, 0x14($sp) -/* E0FC48 802414A8 3C040008 */ lui $a0, 8 -/* E0FC4C 802414AC 3484001F */ ori $a0, $a0, 0x1f -/* E0FC50 802414B0 2405003A */ addiu $a1, $zero, 0x3a -/* E0FC54 802414B4 2406005D */ addiu $a2, $zero, 0x5d -/* E0FC58 802414B8 0240382D */ daddu $a3, $s2, $zero -/* E0FC5C 802414BC AFA00010 */ sw $zero, 0x10($sp) -/* E0FC60 802414C0 0C04993B */ jal draw_string -/* E0FC64 802414C4 AFB00014 */ sw $s0, 0x14($sp) -/* E0FC68 802414C8 3C040008 */ lui $a0, 8 -/* E0FC6C 802414CC 34840021 */ ori $a0, $a0, 0x21 -/* E0FC70 802414D0 240500DF */ addiu $a1, $zero, 0xdf -/* E0FC74 802414D4 2406005D */ addiu $a2, $zero, 0x5d -/* E0FC78 802414D8 0240382D */ daddu $a3, $s2, $zero -/* E0FC7C 802414DC AFA00010 */ sw $zero, 0x10($sp) -/* E0FC80 802414E0 0C04993B */ jal draw_string -/* E0FC84 802414E4 AFB00014 */ sw $s0, 0x14($sp) -/* E0FC88 802414E8 3C040008 */ lui $a0, 8 -/* E0FC8C 802414EC 34840020 */ ori $a0, $a0, 0x20 -/* E0FC90 802414F0 2405003A */ addiu $a1, $zero, 0x3a -/* E0FC94 802414F4 2406006C */ addiu $a2, $zero, 0x6c -/* E0FC98 802414F8 0240382D */ daddu $a3, $s2, $zero -/* E0FC9C 802414FC AFA00010 */ sw $zero, 0x10($sp) -/* E0FCA0 80241500 0C04993B */ jal draw_string -/* E0FCA4 80241504 AFB00014 */ sw $s0, 0x14($sp) -/* E0FCA8 80241508 3C040008 */ lui $a0, 8 -/* E0FCAC 8024150C 34840021 */ ori $a0, $a0, 0x21 -/* E0FCB0 80241510 240500DF */ addiu $a1, $zero, 0xdf -/* E0FCB4 80241514 2406006C */ addiu $a2, $zero, 0x6c -/* E0FCB8 80241518 0240382D */ daddu $a3, $s2, $zero -/* E0FCBC 8024151C AFA00010 */ sw $zero, 0x10($sp) -/* E0FCC0 80241520 0C04993B */ jal draw_string -/* E0FCC4 80241524 AFB00014 */ sw $s0, 0x14($sp) -.L80241528: -/* E0FCC8 80241528 8FBF0034 */ lw $ra, 0x34($sp) -/* E0FCCC 8024152C 8FB20030 */ lw $s2, 0x30($sp) -/* E0FCD0 80241530 8FB1002C */ lw $s1, 0x2c($sp) -/* E0FCD4 80241534 8FB00028 */ lw $s0, 0x28($sp) -/* E0FCD8 80241538 03E00008 */ jr $ra -/* E0FCDC 8024153C 27BD0038 */ addiu $sp, $sp, 0x38 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 new file mode 100644 index 0000000000..ea7660589d --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_802411E0_E0F980.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411E0_E0F980 +/* E0F980 802411E0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* E0F984 802411E4 AFB1002C */ sw $s1, 0x2c($sp) +/* E0F988 802411E8 0080882D */ daddu $s1, $a0, $zero +/* E0F98C 802411EC AFB20030 */ sw $s2, 0x30($sp) +/* E0F990 802411F0 00A0902D */ daddu $s2, $a1, $zero +/* 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, 0x800a +/* E0F9A4 80241204 2484A66C */ addiu $a0, $a0, -0x5994 +/* E0F9A8 80241208 3C02DE00 */ lui $v0, 0xde00 +/* E0F9AC 8024120C 44920000 */ mtc1 $s2, $f0 +/* E0F9B0 80241210 00000000 */ nop +/* E0F9B4 80241214 46800021 */ cvt.d.w $f0, $f0 +/* E0F9B8 80241218 8C830000 */ lw $v1, ($a0) +/* E0F9BC 8024121C 3C018024 */ lui $at, 0x8024 +/* E0F9C0 80241220 D4223F90 */ ldc1 $f2, 0x3f90($at) +/* E0F9C4 80241224 0060282D */ daddu $a1, $v1, $zero +/* E0F9C8 80241228 24630008 */ addiu $v1, $v1, 8 +/* E0F9CC 8024122C AC830000 */ sw $v1, ($a0) +/* E0F9D0 80241230 ACA20000 */ sw $v0, ($a1) +/* E0F9D4 80241234 3C028024 */ lui $v0, 0x8024 +/* E0F9D8 80241238 24423C50 */ addiu $v0, $v0, 0x3c50 +/* E0F9DC 8024123C ACA20004 */ sw $v0, 4($a1) +/* E0F9E0 80241240 24620008 */ addiu $v0, $v1, 8 +/* E0F9E4 80241244 AC820000 */ sw $v0, ($a0) +/* E0F9E8 80241248 3C02E700 */ lui $v0, 0xe700 +/* E0F9EC 8024124C 46220002 */ mul.d $f0, $f0, $f2 +/* E0F9F0 80241250 00000000 */ nop +/* E0F9F4 80241254 AC620000 */ sw $v0, ($v1) +/* E0F9F8 80241258 24620010 */ addiu $v0, $v1, 0x10 +/* E0F9FC 8024125C AC600004 */ sw $zero, 4($v1) +/* E0FA00 80241260 AC820000 */ sw $v0, ($a0) +/* E0FA04 80241264 3C02FA00 */ lui $v0, 0xfa00 +/* E0FA08 80241268 3C0141E0 */ lui $at, 0x41e0 +/* E0FA0C 8024126C 44811800 */ mtc1 $at, $f3 +/* 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 +/* E0FA20 80241280 45010005 */ bc1t .L80241298 +/* E0FA24 80241284 AC620008 */ sw $v0, 8($v1) +/* E0FA28 80241288 4620010D */ trunc.w.d $f4, $f0 +/* E0FA2C 8024128C 440C2000 */ mfc1 $t4, $f4 +/* E0FA30 80241290 080904AD */ j .L802412B4 +/* E0FA34 80241294 3C091078 */ lui $t1, 0x1078 +.L80241298: +/* E0FA38 80241298 46220001 */ sub.d $f0, $f0, $f2 +/* E0FA3C 8024129C 3C028000 */ lui $v0, 0x8000 +/* E0FA40 802412A0 4620010D */ trunc.w.d $f4, $f0 +/* E0FA44 802412A4 440C2000 */ mfc1 $t4, $f4 +/* E0FA48 802412A8 00000000 */ nop +/* E0FA4C 802412AC 01826025 */ or $t4, $t4, $v0 +/* E0FA50 802412B0 3C091078 */ lui $t1, 0x1078 +.L802412B4: +/* E0FA54 802412B4 35291800 */ ori $t1, $t1, 0x1800 +/* E0FA58 802412B8 3C0BF644 */ lui $t3, 0xf644 +/* E0FA5C 802412BC 356B0204 */ ori $t3, $t3, 0x204 +/* E0FA60 802412C0 3C0A000C */ lui $t2, 0xc +/* E0FA64 802412C4 354A00D4 */ ori $t2, $t2, 0xd4 +/* 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, 0x800a +/* E0FA78 802412D8 2508A66C */ addiu $t0, $t0, -0x5994 +/* E0FA7C 802412DC 318200FF */ andi $v0, $t4, 0xff +/* E0FA80 802412E0 00491025 */ or $v0, $v0, $t1 +/* E0FA84 802412E4 44921000 */ mtc1 $s2, $f2 +/* E0FA88 802412E8 00000000 */ nop +/* E0FA8C 802412EC 468010A1 */ cvt.d.w $f2, $f2 +/* E0FA90 802412F0 8D030000 */ lw $v1, ($t0) +/* E0FA94 802412F4 3C018024 */ lui $at, 0x8024 +/* E0FA98 802412F8 D4203F98 */ ldc1 $f0, 0x3f98($at) +/* E0FA9C 802412FC 24100001 */ addiu $s0, $zero, 1 +/* E0FAA0 80241300 ADA20000 */ sw $v0, ($t5) +/* E0FAA4 80241304 0060102D */ daddu $v0, $v1, $zero +/* E0FAA8 80241308 24630008 */ addiu $v1, $v1, 8 +/* E0FAAC 8024130C AD030000 */ sw $v1, ($t0) +/* E0FAB0 80241310 AC4B0000 */ sw $t3, ($v0) +/* E0FAB4 80241314 AC4A0004 */ sw $t2, 4($v0) +/* E0FAB8 80241318 24620008 */ addiu $v0, $v1, 8 +/* E0FABC 8024131C AD020000 */ sw $v0, ($t0) +/* E0FAC0 80241320 3C02E700 */ lui $v0, 0xe700 +/* E0FAC4 80241324 46201082 */ mul.d $f2, $f2, $f0 +/* E0FAC8 80241328 00000000 */ nop +/* E0FACC 8024132C AC620000 */ sw $v0, ($v1) +/* E0FAD0 80241330 24020006 */ addiu $v0, $zero, 6 +/* E0FAD4 80241334 AC600004 */ sw $zero, 4($v1) +/* E0FAD8 80241338 AFA20010 */ sw $v0, 0x10($sp) +/* E0FADC 8024133C AFA00014 */ sw $zero, 0x14($sp) +/* E0FAE0 80241340 AFB00018 */ sw $s0, 0x18($sp) +/* E0FAE4 80241344 AFB20020 */ sw $s2, 0x20($sp) +/* E0FAE8 80241348 4620110D */ trunc.w.d $f4, $f2 +/* E0FAEC 8024134C E7A4001C */ swc1 $f4, 0x1c($sp) +/* E0FAF0 80241350 0C04B6D6 */ jal func_8012DB58 +/* E0FAF4 80241354 24070052 */ addiu $a3, $zero, 0x52 +/* E0FAF8 80241358 8E220008 */ lw $v0, 8($s1) +/* E0FAFC 8024135C 1450001F */ bne $v0, $s0, .L802413DC +/* E0FB00 80241360 3C040008 */ lui $a0, 8 +/* E0FB04 80241364 3484001C */ ori $a0, $a0, 0x1c +/* E0FB08 80241368 24050042 */ addiu $a1, $zero, 0x42 +/* E0FB0C 8024136C 24060039 */ addiu $a2, $zero, 0x39 +/* E0FB10 80241370 0240382D */ daddu $a3, $s2, $zero +/* E0FB14 80241374 AFB00010 */ sw $s0, 0x10($sp) +/* E0FB18 80241378 0C04993B */ jal draw_string +/* E0FB1C 8024137C AFA00014 */ sw $zero, 0x14($sp) +/* E0FB20 80241380 240500DB */ addiu $a1, $zero, 0xdb +/* E0FB24 80241384 2406004E */ addiu $a2, $zero, 0x4e +/* E0FB28 80241388 0200382D */ daddu $a3, $s0, $zero +/* E0FB2C 8024138C 3C108011 */ lui $s0, %hi(gPlayerData) +/* E0FB30 80241390 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* E0FB34 80241394 AFA00010 */ sw $zero, 0x10($sp) +/* E0FB38 80241398 AFB20014 */ sw $s2, 0x14($sp) +/* E0FB3C 8024139C 9604032E */ lhu $a0, 0x32e($s0) +/* E0FB40 802413A0 24110003 */ addiu $s1, $zero, 3 +/* E0FB44 802413A4 0C049DA7 */ jal draw_number +/* E0FB48 802413A8 AFB10018 */ sw $s1, 0x18($sp) +/* E0FB4C 802413AC 240500DB */ addiu $a1, $zero, 0xdb +/* E0FB50 802413B0 2406005D */ addiu $a2, $zero, 0x5d +/* E0FB54 802413B4 8E040330 */ lw $a0, 0x330($s0) +/* E0FB58 802413B8 24070001 */ addiu $a3, $zero, 1 +/* E0FB5C 802413BC AFA00010 */ sw $zero, 0x10($sp) +/* E0FB60 802413C0 AFB20014 */ sw $s2, 0x14($sp) +/* E0FB64 802413C4 0C049DA7 */ jal draw_number +/* E0FB68 802413C8 AFB10018 */ sw $s1, 0x18($sp) +/* E0FB6C 802413CC 240500DB */ addiu $a1, $zero, 0xdb +/* E0FB70 802413D0 96040334 */ lhu $a0, 0x334($s0) +/* E0FB74 802413D4 08090514 */ j .L80241450 +/* E0FB78 802413D8 2406006C */ addiu $a2, $zero, 0x6c +.L802413DC: +/* E0FB7C 802413DC 3484001D */ ori $a0, $a0, 0x1d +/* E0FB80 802413E0 24050040 */ addiu $a1, $zero, 0x40 +/* E0FB84 802413E4 24060039 */ addiu $a2, $zero, 0x39 +/* E0FB88 802413E8 0240382D */ daddu $a3, $s2, $zero +/* E0FB8C 802413EC AFB00010 */ sw $s0, 0x10($sp) +/* E0FB90 802413F0 0C04993B */ jal draw_string +/* E0FB94 802413F4 AFA00014 */ sw $zero, 0x14($sp) +/* E0FB98 802413F8 240500DB */ addiu $a1, $zero, 0xdb +/* E0FB9C 802413FC 2406004E */ addiu $a2, $zero, 0x4e +/* E0FBA0 80241400 24070001 */ addiu $a3, $zero, 1 +/* E0FBA4 80241404 3C108011 */ lui $s0, %hi(gPlayerData) +/* E0FBA8 80241408 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* E0FBAC 8024140C AFA00010 */ sw $zero, 0x10($sp) +/* E0FBB0 80241410 AFB20014 */ sw $s2, 0x14($sp) +/* E0FBB4 80241414 96040336 */ lhu $a0, 0x336($s0) +/* E0FBB8 80241418 24110003 */ addiu $s1, $zero, 3 +/* E0FBBC 8024141C 0C049DA7 */ jal draw_number +/* E0FBC0 80241420 AFB10018 */ sw $s1, 0x18($sp) +/* E0FBC4 80241424 240500DB */ addiu $a1, $zero, 0xdb +/* E0FBC8 80241428 2406005D */ addiu $a2, $zero, 0x5d +/* E0FBCC 8024142C 8E040338 */ lw $a0, 0x338($s0) +/* E0FBD0 80241430 24070001 */ addiu $a3, $zero, 1 +/* E0FBD4 80241434 AFA00010 */ sw $zero, 0x10($sp) +/* E0FBD8 80241438 AFB20014 */ sw $s2, 0x14($sp) +/* E0FBDC 8024143C 0C049DA7 */ jal draw_number +/* E0FBE0 80241440 AFB10018 */ sw $s1, 0x18($sp) +/* E0FBE4 80241444 240500DB */ addiu $a1, $zero, 0xdb +/* E0FBE8 80241448 2406006C */ addiu $a2, $zero, 0x6c +/* E0FBEC 8024144C 9604033C */ lhu $a0, 0x33c($s0) +.L80241450: +/* E0FBF0 80241450 24070001 */ addiu $a3, $zero, 1 +/* E0FBF4 80241454 AFA00010 */ sw $zero, 0x10($sp) +/* E0FBF8 80241458 AFB20014 */ sw $s2, 0x14($sp) +/* E0FBFC 8024145C 0C049DA7 */ jal draw_number +/* E0FC00 80241460 AFB10018 */ sw $s1, 0x18($sp) +/* E0FC04 80241464 3C040008 */ lui $a0, 8 +/* E0FC08 80241468 3484001E */ ori $a0, $a0, 0x1e +/* E0FC0C 8024146C 2405003A */ addiu $a1, $zero, 0x3a +/* E0FC10 80241470 2406004E */ addiu $a2, $zero, 0x4e +/* E0FC14 80241474 0240382D */ daddu $a3, $s2, $zero +/* E0FC18 80241478 24100001 */ addiu $s0, $zero, 1 +/* E0FC1C 8024147C AFA00010 */ sw $zero, 0x10($sp) +/* E0FC20 80241480 0C04993B */ jal draw_string +/* E0FC24 80241484 AFB00014 */ sw $s0, 0x14($sp) +/* E0FC28 80241488 3C040008 */ lui $a0, 8 +/* E0FC2C 8024148C 34840023 */ ori $a0, $a0, 0x23 +/* E0FC30 80241490 240500DF */ addiu $a1, $zero, 0xdf +/* E0FC34 80241494 2406004E */ addiu $a2, $zero, 0x4e +/* E0FC38 80241498 0240382D */ daddu $a3, $s2, $zero +/* E0FC3C 8024149C AFA00010 */ sw $zero, 0x10($sp) +/* E0FC40 802414A0 0C04993B */ jal draw_string +/* E0FC44 802414A4 AFB00014 */ sw $s0, 0x14($sp) +/* E0FC48 802414A8 3C040008 */ lui $a0, 8 +/* E0FC4C 802414AC 3484001F */ ori $a0, $a0, 0x1f +/* E0FC50 802414B0 2405003A */ addiu $a1, $zero, 0x3a +/* E0FC54 802414B4 2406005D */ addiu $a2, $zero, 0x5d +/* E0FC58 802414B8 0240382D */ daddu $a3, $s2, $zero +/* E0FC5C 802414BC AFA00010 */ sw $zero, 0x10($sp) +/* E0FC60 802414C0 0C04993B */ jal draw_string +/* E0FC64 802414C4 AFB00014 */ sw $s0, 0x14($sp) +/* E0FC68 802414C8 3C040008 */ lui $a0, 8 +/* E0FC6C 802414CC 34840021 */ ori $a0, $a0, 0x21 +/* E0FC70 802414D0 240500DF */ addiu $a1, $zero, 0xdf +/* E0FC74 802414D4 2406005D */ addiu $a2, $zero, 0x5d +/* E0FC78 802414D8 0240382D */ daddu $a3, $s2, $zero +/* E0FC7C 802414DC AFA00010 */ sw $zero, 0x10($sp) +/* E0FC80 802414E0 0C04993B */ jal draw_string +/* E0FC84 802414E4 AFB00014 */ sw $s0, 0x14($sp) +/* E0FC88 802414E8 3C040008 */ lui $a0, 8 +/* E0FC8C 802414EC 34840020 */ ori $a0, $a0, 0x20 +/* E0FC90 802414F0 2405003A */ addiu $a1, $zero, 0x3a +/* E0FC94 802414F4 2406006C */ addiu $a2, $zero, 0x6c +/* E0FC98 802414F8 0240382D */ daddu $a3, $s2, $zero +/* E0FC9C 802414FC AFA00010 */ sw $zero, 0x10($sp) +/* E0FCA0 80241500 0C04993B */ jal draw_string +/* E0FCA4 80241504 AFB00014 */ sw $s0, 0x14($sp) +/* E0FCA8 80241508 3C040008 */ lui $a0, 8 +/* E0FCAC 8024150C 34840021 */ ori $a0, $a0, 0x21 +/* E0FCB0 80241510 240500DF */ addiu $a1, $zero, 0xdf +/* E0FCB4 80241514 2406006C */ addiu $a2, $zero, 0x6c +/* E0FCB8 80241518 0240382D */ daddu $a3, $s2, $zero +/* E0FCBC 8024151C AFA00010 */ sw $zero, 0x10($sp) +/* E0FCC0 80241520 0C04993B */ jal draw_string +/* E0FCC4 80241524 AFB00014 */ sw $s0, 0x14($sp) +.L80241528: +/* E0FCC8 80241528 8FBF0034 */ lw $ra, 0x34($sp) +/* E0FCCC 8024152C 8FB20030 */ lw $s2, 0x30($sp) +/* E0FCD0 80241530 8FB1002C */ lw $s1, 0x2c($sp) +/* E0FCD4 80241534 8FB00028 */ lw $s0, 0x28($sp) +/* E0FCD8 80241538 03E00008 */ jr $ra +/* E0FCDC 8024153C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s index c60e4cd0f0..1233f6fda6 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s +++ b/asm/nonmatchings/world/area_mgm/mgm_00/E0F980/func_80241540_E0FCE0.s @@ -93,7 +93,7 @@ glabel func_80241540_E0FCE0 /* E0FE3C 8024169C AE110000 */ sw $s1, ($s0) .L802416A0: /* E0FE40 802416A0 8E05000C */ lw $a1, 0xc($s0) -/* E0FE44 802416A4 0C090478 */ jal func_802411E0 +/* E0FE44 802416A4 0C090478 */ jal func_802411E0_E0F980 /* E0FE48 802416A8 0200202D */ daddu $a0, $s0, $zero /* E0FE4C 802416AC 8FBF0020 */ lw $ra, 0x20($sp) /* E0FE50 802416B0 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC.s deleted file mode 100644 index 9caa93a3f0..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408EC -/* E1304C 802408EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E13050 802408F0 AFB00018 */ sw $s0, 0x18($sp) -/* E13054 802408F4 0080802D */ daddu $s0, $a0, $zero -/* E13058 802408F8 AFBF001C */ sw $ra, 0x1c($sp) -/* E1305C 802408FC 0C00FB3A */ jal get_enemy -/* E13060 80240900 0000202D */ daddu $a0, $zero, $zero -/* E13064 80240904 8E03000C */ lw $v1, 0xc($s0) -/* E13068 80240908 0200202D */ daddu $a0, $s0, $zero -/* E1306C 8024090C 8C650000 */ lw $a1, ($v1) -/* E13070 80240910 0C0B1EAF */ jal get_variable -/* E13074 80240914 8C500080 */ lw $s0, 0x80($v0) -/* E13078 80240918 0040282D */ daddu $a1, $v0, $zero -/* E1307C 8024091C 00051040 */ sll $v0, $a1, 1 -/* E13080 80240920 00451021 */ addu $v0, $v0, $a1 -/* E13084 80240924 000210C0 */ sll $v0, $v0, 3 -/* E13088 80240928 00451023 */ subu $v0, $v0, $a1 -/* E1308C 8024092C 00021080 */ sll $v0, $v0, 2 -/* E13090 80240930 02022021 */ addu $a0, $s0, $v0 -/* E13094 80240934 C4800094 */ lwc1 $f0, 0x94($a0) -/* E13098 80240938 C4820098 */ lwc1 $f2, 0x98($a0) -/* E1309C 8024093C C484009C */ lwc1 $f4, 0x9c($a0) -/* E130A0 80240940 C48600C4 */ lwc1 $f6, 0xc4($a0) -/* E130A4 80240944 8C83007C */ lw $v1, 0x7c($a0) -/* E130A8 80240948 24020003 */ addiu $v0, $zero, 3 -/* E130AC 8024094C AC80008C */ sw $zero, 0x8c($a0) -/* E130B0 80240950 AC8000B8 */ sw $zero, 0xb8($a0) -/* E130B4 80240954 AC8000BC */ sw $zero, 0xbc($a0) -/* E130B8 80240958 E48000A0 */ swc1 $f0, 0xa0($a0) -/* E130BC 8024095C E48200A4 */ swc1 $f2, 0xa4($a0) -/* E130C0 80240960 E48400A8 */ swc1 $f4, 0xa8($a0) -/* E130C4 80240964 10620017 */ beq $v1, $v0, .L802409C4 -/* E130C8 80240968 E48600C8 */ swc1 $f6, 0xc8($a0) -/* E130CC 8024096C 8C820084 */ lw $v0, 0x84($a0) -/* E130D0 80240970 3C0142DC */ lui $at, 0x42dc -/* E130D4 80240974 44812000 */ mtc1 $at, $f4 -/* E130D8 80240978 00021080 */ sll $v0, $v0, 2 -/* E130DC 8024097C 3C018024 */ lui $at, 0x8024 -/* E130E0 80240980 00220821 */ addu $at, $at, $v0 -/* E130E4 80240984 C4201AEC */ lwc1 $f0, 0x1aec($at) -/* E130E8 80240988 8C820084 */ lw $v0, 0x84($a0) -/* E130EC 8024098C 3C013F80 */ lui $at, 0x3f80 -/* E130F0 80240990 44811000 */ mtc1 $at, $f2 -/* E130F4 80240994 00021080 */ sll $v0, $v0, 2 -/* E130F8 80240998 E48000AC */ swc1 $f0, 0xac($a0) -/* E130FC 8024099C 3C018024 */ lui $at, 0x8024 -/* E13100 802409A0 00220821 */ addu $at, $at, $v0 -/* E13104 802409A4 C4261B18 */ lwc1 $f6, 0x1b18($at) -/* E13108 802409A8 3C0143B4 */ lui $at, 0x43b4 -/* E1310C 802409AC 44810000 */ mtc1 $at, $f0 -/* E13110 802409B0 E48400B4 */ swc1 $f4, 0xb4($a0) -/* E13114 802409B4 E48200CC */ swc1 $f2, 0xcc($a0) -/* E13118 802409B8 E48000C0 */ swc1 $f0, 0xc0($a0) -/* E1311C 802409BC 0809027E */ j .L802409F8 -/* E13120 802409C0 E48600B0 */ swc1 $f6, 0xb0($a0) -.L802409C4: -/* E13124 802409C4 3C0142C8 */ lui $at, 0x42c8 -/* E13128 802409C8 44810000 */ mtc1 $at, $f0 -/* E1312C 802409CC 3C0142F0 */ lui $at, 0x42f0 -/* E13130 802409D0 44811000 */ mtc1 $at, $f2 -/* E13134 802409D4 3C014434 */ lui $at, 0x4434 -/* E13138 802409D8 44812000 */ mtc1 $at, $f4 -/* E1313C 802409DC 3C014080 */ lui $at, 0x4080 -/* E13140 802409E0 44813000 */ mtc1 $at, $f6 -/* E13144 802409E4 AC8000AC */ sw $zero, 0xac($a0) -/* E13148 802409E8 E48000B0 */ swc1 $f0, 0xb0($a0) -/* E1314C 802409EC E48200B4 */ swc1 $f2, 0xb4($a0) -/* E13150 802409F0 E48400C0 */ swc1 $f4, 0xc0($a0) -/* E13154 802409F4 E48600CC */ swc1 $f6, 0xcc($a0) -.L802409F8: -/* E13158 802409F8 00051040 */ sll $v0, $a1, 1 -/* E1315C 802409FC 00451021 */ addu $v0, $v0, $a1 -/* E13160 80240A00 000210C0 */ sll $v0, $v0, 3 -/* E13164 80240A04 00451023 */ subu $v0, $v0, $a1 -/* E13168 80240A08 00021080 */ sll $v0, $v0, 2 -/* E1316C 80240A0C 02028021 */ addu $s0, $s0, $v0 -/* E13170 80240A10 C60000B0 */ lwc1 $f0, 0xb0($s0) -/* E13174 80240A14 E7A00010 */ swc1 $f0, 0x10($sp) -/* E13178 80240A18 C60000B4 */ lwc1 $f0, 0xb4($s0) -/* E1317C 80240A1C E7A00014 */ swc1 $f0, 0x14($sp) -/* E13180 80240A20 C60C00A0 */ lwc1 $f12, 0xa0($s0) -/* E13184 80240A24 C60E00A4 */ lwc1 $f14, 0xa4($s0) -/* E13188 80240A28 8E0600A8 */ lw $a2, 0xa8($s0) -/* E1318C 80240A2C 0C00A7CB */ jal dist3D -/* E13190 80240A30 8E0700AC */ lw $a3, 0xac($s0) -/* E13194 80240A34 8E03007C */ lw $v1, 0x7c($s0) -/* E13198 80240A38 24020003 */ addiu $v0, $zero, 3 -/* E1319C 80240A3C 1062000C */ beq $v1, $v0, .L80240A70 -/* E131A0 80240A40 46000021 */ cvt.d.s $f0, $f0 -/* E131A4 80240A44 3C013FC0 */ lui $at, 0x3fc0 -/* E131A8 80240A48 44811800 */ mtc1 $at, $f3 -/* E131AC 80240A4C 44801000 */ mtc1 $zero, $f2 -/* E131B0 80240A50 00000000 */ nop -/* E131B4 80240A54 46220002 */ mul.d $f0, $f0, $f2 -/* E131B8 80240A58 00000000 */ nop -/* E131BC 80240A5C 3C013FE0 */ lui $at, 0x3fe0 -/* E131C0 80240A60 44811800 */ mtc1 $at, $f3 -/* E131C4 80240A64 44801000 */ mtc1 $zero, $f2 -/* E131C8 80240A68 080902A4 */ j .L80240A90 -/* E131CC 80240A6C 46220000 */ add.d $f0, $f0, $f2 -.L80240A70: -/* E131D0 80240A70 3C014014 */ lui $at, 0x4014 -/* E131D4 80240A74 44811800 */ mtc1 $at, $f3 -/* E131D8 80240A78 44801000 */ mtc1 $zero, $f2 -/* E131DC 80240A7C 3C013FE0 */ lui $at, 0x3fe0 -/* E131E0 80240A80 44812800 */ mtc1 $at, $f5 -/* E131E4 80240A84 44802000 */ mtc1 $zero, $f4 -/* E131E8 80240A88 46220003 */ div.d $f0, $f0, $f2 -/* E131EC 80240A8C 46240000 */ add.d $f0, $f0, $f4 -.L80240A90: -/* E131F0 80240A90 4620020D */ trunc.w.d $f8, $f0 -/* E131F4 80240A94 E6080090 */ swc1 $f8, 0x90($s0) -/* E131F8 80240A98 8FBF001C */ lw $ra, 0x1c($sp) -/* E131FC 80240A9C 8FB00018 */ lw $s0, 0x18($sp) -/* E13200 80240AA0 24020002 */ addiu $v0, $zero, 2 -/* E13204 80240AA4 03E00008 */ jr $ra -/* E13208 80240AA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s new file mode 100644 index 0000000000..12ef6b5d42 --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802408EC_E1304C.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408EC_E1304C +/* E1304C 802408EC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E13050 802408F0 AFB00018 */ sw $s0, 0x18($sp) +/* E13054 802408F4 0080802D */ daddu $s0, $a0, $zero +/* E13058 802408F8 AFBF001C */ sw $ra, 0x1c($sp) +/* E1305C 802408FC 0C00FB3A */ jal get_enemy +/* E13060 80240900 0000202D */ daddu $a0, $zero, $zero +/* E13064 80240904 8E03000C */ lw $v1, 0xc($s0) +/* E13068 80240908 0200202D */ daddu $a0, $s0, $zero +/* E1306C 8024090C 8C650000 */ lw $a1, ($v1) +/* E13070 80240910 0C0B1EAF */ jal get_variable +/* E13074 80240914 8C500080 */ lw $s0, 0x80($v0) +/* E13078 80240918 0040282D */ daddu $a1, $v0, $zero +/* E1307C 8024091C 00051040 */ sll $v0, $a1, 1 +/* E13080 80240920 00451021 */ addu $v0, $v0, $a1 +/* E13084 80240924 000210C0 */ sll $v0, $v0, 3 +/* E13088 80240928 00451023 */ subu $v0, $v0, $a1 +/* E1308C 8024092C 00021080 */ sll $v0, $v0, 2 +/* E13090 80240930 02022021 */ addu $a0, $s0, $v0 +/* E13094 80240934 C4800094 */ lwc1 $f0, 0x94($a0) +/* E13098 80240938 C4820098 */ lwc1 $f2, 0x98($a0) +/* E1309C 8024093C C484009C */ lwc1 $f4, 0x9c($a0) +/* E130A0 80240940 C48600C4 */ lwc1 $f6, 0xc4($a0) +/* E130A4 80240944 8C83007C */ lw $v1, 0x7c($a0) +/* E130A8 80240948 24020003 */ addiu $v0, $zero, 3 +/* E130AC 8024094C AC80008C */ sw $zero, 0x8c($a0) +/* E130B0 80240950 AC8000B8 */ sw $zero, 0xb8($a0) +/* E130B4 80240954 AC8000BC */ sw $zero, 0xbc($a0) +/* E130B8 80240958 E48000A0 */ swc1 $f0, 0xa0($a0) +/* E130BC 8024095C E48200A4 */ swc1 $f2, 0xa4($a0) +/* E130C0 80240960 E48400A8 */ swc1 $f4, 0xa8($a0) +/* E130C4 80240964 10620017 */ beq $v1, $v0, .L802409C4 +/* E130C8 80240968 E48600C8 */ swc1 $f6, 0xc8($a0) +/* E130CC 8024096C 8C820084 */ lw $v0, 0x84($a0) +/* E130D0 80240970 3C0142DC */ lui $at, 0x42dc +/* E130D4 80240974 44812000 */ mtc1 $at, $f4 +/* E130D8 80240978 00021080 */ sll $v0, $v0, 2 +/* E130DC 8024097C 3C018024 */ lui $at, 0x8024 +/* E130E0 80240980 00220821 */ addu $at, $at, $v0 +/* E130E4 80240984 C4201AEC */ lwc1 $f0, 0x1aec($at) +/* E130E8 80240988 8C820084 */ lw $v0, 0x84($a0) +/* E130EC 8024098C 3C013F80 */ lui $at, 0x3f80 +/* E130F0 80240990 44811000 */ mtc1 $at, $f2 +/* E130F4 80240994 00021080 */ sll $v0, $v0, 2 +/* E130F8 80240998 E48000AC */ swc1 $f0, 0xac($a0) +/* E130FC 8024099C 3C018024 */ lui $at, 0x8024 +/* E13100 802409A0 00220821 */ addu $at, $at, $v0 +/* E13104 802409A4 C4261B18 */ lwc1 $f6, 0x1b18($at) +/* E13108 802409A8 3C0143B4 */ lui $at, 0x43b4 +/* E1310C 802409AC 44810000 */ mtc1 $at, $f0 +/* E13110 802409B0 E48400B4 */ swc1 $f4, 0xb4($a0) +/* E13114 802409B4 E48200CC */ swc1 $f2, 0xcc($a0) +/* E13118 802409B8 E48000C0 */ swc1 $f0, 0xc0($a0) +/* E1311C 802409BC 0809027E */ j .L802409F8 +/* E13120 802409C0 E48600B0 */ swc1 $f6, 0xb0($a0) +.L802409C4: +/* E13124 802409C4 3C0142C8 */ lui $at, 0x42c8 +/* E13128 802409C8 44810000 */ mtc1 $at, $f0 +/* E1312C 802409CC 3C0142F0 */ lui $at, 0x42f0 +/* E13130 802409D0 44811000 */ mtc1 $at, $f2 +/* E13134 802409D4 3C014434 */ lui $at, 0x4434 +/* E13138 802409D8 44812000 */ mtc1 $at, $f4 +/* E1313C 802409DC 3C014080 */ lui $at, 0x4080 +/* E13140 802409E0 44813000 */ mtc1 $at, $f6 +/* E13144 802409E4 AC8000AC */ sw $zero, 0xac($a0) +/* E13148 802409E8 E48000B0 */ swc1 $f0, 0xb0($a0) +/* E1314C 802409EC E48200B4 */ swc1 $f2, 0xb4($a0) +/* E13150 802409F0 E48400C0 */ swc1 $f4, 0xc0($a0) +/* E13154 802409F4 E48600CC */ swc1 $f6, 0xcc($a0) +.L802409F8: +/* E13158 802409F8 00051040 */ sll $v0, $a1, 1 +/* E1315C 802409FC 00451021 */ addu $v0, $v0, $a1 +/* E13160 80240A00 000210C0 */ sll $v0, $v0, 3 +/* E13164 80240A04 00451023 */ subu $v0, $v0, $a1 +/* E13168 80240A08 00021080 */ sll $v0, $v0, 2 +/* E1316C 80240A0C 02028021 */ addu $s0, $s0, $v0 +/* E13170 80240A10 C60000B0 */ lwc1 $f0, 0xb0($s0) +/* E13174 80240A14 E7A00010 */ swc1 $f0, 0x10($sp) +/* E13178 80240A18 C60000B4 */ lwc1 $f0, 0xb4($s0) +/* E1317C 80240A1C E7A00014 */ swc1 $f0, 0x14($sp) +/* E13180 80240A20 C60C00A0 */ lwc1 $f12, 0xa0($s0) +/* E13184 80240A24 C60E00A4 */ lwc1 $f14, 0xa4($s0) +/* E13188 80240A28 8E0600A8 */ lw $a2, 0xa8($s0) +/* E1318C 80240A2C 0C00A7CB */ jal dist3D +/* E13190 80240A30 8E0700AC */ lw $a3, 0xac($s0) +/* E13194 80240A34 8E03007C */ lw $v1, 0x7c($s0) +/* E13198 80240A38 24020003 */ addiu $v0, $zero, 3 +/* E1319C 80240A3C 1062000C */ beq $v1, $v0, .L80240A70 +/* E131A0 80240A40 46000021 */ cvt.d.s $f0, $f0 +/* E131A4 80240A44 3C013FC0 */ lui $at, 0x3fc0 +/* E131A8 80240A48 44811800 */ mtc1 $at, $f3 +/* E131AC 80240A4C 44801000 */ mtc1 $zero, $f2 +/* E131B0 80240A50 00000000 */ nop +/* E131B4 80240A54 46220002 */ mul.d $f0, $f0, $f2 +/* E131B8 80240A58 00000000 */ nop +/* E131BC 80240A5C 3C013FE0 */ lui $at, 0x3fe0 +/* E131C0 80240A60 44811800 */ mtc1 $at, $f3 +/* E131C4 80240A64 44801000 */ mtc1 $zero, $f2 +/* E131C8 80240A68 080902A4 */ j .L80240A90 +/* E131CC 80240A6C 46220000 */ add.d $f0, $f0, $f2 +.L80240A70: +/* E131D0 80240A70 3C014014 */ lui $at, 0x4014 +/* E131D4 80240A74 44811800 */ mtc1 $at, $f3 +/* E131D8 80240A78 44801000 */ mtc1 $zero, $f2 +/* E131DC 80240A7C 3C013FE0 */ lui $at, 0x3fe0 +/* E131E0 80240A80 44812800 */ mtc1 $at, $f5 +/* E131E4 80240A84 44802000 */ mtc1 $zero, $f4 +/* E131E8 80240A88 46220003 */ div.d $f0, $f0, $f2 +/* E131EC 80240A8C 46240000 */ add.d $f0, $f0, $f4 +.L80240A90: +/* E131F0 80240A90 4620020D */ trunc.w.d $f8, $f0 +/* E131F4 80240A94 E6080090 */ swc1 $f8, 0x90($s0) +/* E131F8 80240A98 8FBF001C */ lw $ra, 0x1c($sp) +/* E131FC 80240A9C 8FB00018 */ lw $s0, 0x18($sp) +/* E13200 80240AA0 24020002 */ addiu $v0, $zero, 2 +/* E13204 80240AA4 03E00008 */ jr $ra +/* E13208 80240AA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8.s deleted file mode 100644 index e9215129c8..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DB8 -/* E13518 80240DB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* E1351C 80240DBC AFB10014 */ sw $s1, 0x14($sp) -/* E13520 80240DC0 0080882D */ daddu $s1, $a0, $zero -/* E13524 80240DC4 0000202D */ daddu $a0, $zero, $zero -/* E13528 80240DC8 AFBF0018 */ sw $ra, 0x18($sp) -/* E1352C 80240DCC 0C00FB3A */ jal get_enemy -/* E13530 80240DD0 AFB00010 */ sw $s0, 0x10($sp) -/* E13534 80240DD4 0000282D */ daddu $a1, $zero, $zero -/* E13538 80240DD8 24070003 */ addiu $a3, $zero, 3 -/* E1353C 80240DDC 8C460080 */ lw $a2, 0x80($v0) -/* E13540 80240DE0 24040009 */ addiu $a0, $zero, 9 -/* E13544 80240DE4 00C0182D */ daddu $v1, $a2, $zero -.L80240DE8: -/* E13548 80240DE8 8C62007C */ lw $v0, 0x7c($v1) -/* E1354C 80240DEC 54470005 */ bnel $v0, $a3, .L80240E04 -/* E13550 80240DF0 24A50001 */ addiu $a1, $a1, 1 -/* E13554 80240DF4 8C620074 */ lw $v0, 0x74($v1) -/* E13558 80240DF8 50440006 */ beql $v0, $a0, .L80240E14 -/* E1355C 80240DFC 0220202D */ daddu $a0, $s1, $zero -/* E13560 80240E00 24A50001 */ addiu $a1, $a1, 1 -.L80240E04: -/* E13564 80240E04 28A2000B */ slti $v0, $a1, 0xb -/* E13568 80240E08 1440FFF7 */ bnez $v0, .L80240DE8 -/* E1356C 80240E0C 2463005C */ addiu $v1, $v1, 0x5c -/* E13570 80240E10 0220202D */ daddu $a0, $s1, $zero -.L80240E14: -/* E13574 80240E14 00058040 */ sll $s0, $a1, 1 -/* E13578 80240E18 02058021 */ addu $s0, $s0, $a1 -/* E1357C 80240E1C 001080C0 */ sll $s0, $s0, 3 -/* E13580 80240E20 02058023 */ subu $s0, $s0, $a1 -/* E13584 80240E24 00108080 */ sll $s0, $s0, 2 -/* E13588 80240E28 00D08021 */ addu $s0, $a2, $s0 -/* E1358C 80240E2C 8E020084 */ lw $v0, 0x84($s0) -/* E13590 80240E30 3C05FE36 */ lui $a1, 0xfe36 -/* E13594 80240E34 00021080 */ sll $v0, $v0, 2 -/* E13598 80240E38 3C018024 */ lui $at, 0x8024 -/* E1359C 80240E3C 00220821 */ addu $at, $at, $v0 -/* E135A0 80240E40 C4201AEC */ lwc1 $f0, 0x1aec($at) -/* E135A4 80240E44 8E020084 */ lw $v0, 0x84($s0) -/* E135A8 80240E48 8E060078 */ lw $a2, 0x78($s0) -/* E135AC 80240E4C 00021080 */ sll $v0, $v0, 2 -/* E135B0 80240E50 E6000094 */ swc1 $f0, 0x94($s0) -/* E135B4 80240E54 3C018024 */ lui $at, 0x8024 -/* E135B8 80240E58 00220821 */ addu $at, $at, $v0 -/* E135BC 80240E5C C4221B18 */ lwc1 $f2, 0x1b18($at) -/* E135C0 80240E60 3C0142DC */ lui $at, 0x42dc -/* E135C4 80240E64 44810000 */ mtc1 $at, $f0 -/* E135C8 80240E68 34A53C81 */ ori $a1, $a1, 0x3c81 -/* E135CC 80240E6C E600009C */ swc1 $f0, 0x9c($s0) -/* E135D0 80240E70 0C0B2026 */ jal set_variable -/* E135D4 80240E74 E6020098 */ swc1 $f2, 0x98($s0) -/* E135D8 80240E78 0220202D */ daddu $a0, $s1, $zero -/* E135DC 80240E7C 3C05FE36 */ lui $a1, 0xfe36 -/* E135E0 80240E80 8E060094 */ lw $a2, 0x94($s0) -/* E135E4 80240E84 0C0B2190 */ jal set_float_variable -/* E135E8 80240E88 34A53C85 */ ori $a1, $a1, 0x3c85 -/* E135EC 80240E8C 0220202D */ daddu $a0, $s1, $zero -/* E135F0 80240E90 3C05FE36 */ lui $a1, 0xfe36 -/* E135F4 80240E94 8E060098 */ lw $a2, 0x98($s0) -/* E135F8 80240E98 0C0B2190 */ jal set_float_variable -/* E135FC 80240E9C 34A53C86 */ ori $a1, $a1, 0x3c86 -/* E13600 80240EA0 0220202D */ daddu $a0, $s1, $zero -/* E13604 80240EA4 3C05FE36 */ lui $a1, 0xfe36 -/* E13608 80240EA8 8E06009C */ lw $a2, 0x9c($s0) -/* E1360C 80240EAC 0C0B2190 */ jal set_float_variable -/* E13610 80240EB0 34A53C87 */ ori $a1, $a1, 0x3c87 -/* E13614 80240EB4 8FBF0018 */ lw $ra, 0x18($sp) -/* E13618 80240EB8 8FB10014 */ lw $s1, 0x14($sp) -/* E1361C 80240EBC 8FB00010 */ lw $s0, 0x10($sp) -/* E13620 80240EC0 24020002 */ addiu $v0, $zero, 2 -/* E13624 80240EC4 03E00008 */ jr $ra -/* E13628 80240EC8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s new file mode 100644 index 0000000000..4d82befa90 --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80240DB8_E13518.s @@ -0,0 +1,76 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DB8_E13518 +/* E13518 80240DB8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E1351C 80240DBC AFB10014 */ sw $s1, 0x14($sp) +/* E13520 80240DC0 0080882D */ daddu $s1, $a0, $zero +/* E13524 80240DC4 0000202D */ daddu $a0, $zero, $zero +/* E13528 80240DC8 AFBF0018 */ sw $ra, 0x18($sp) +/* E1352C 80240DCC 0C00FB3A */ jal get_enemy +/* E13530 80240DD0 AFB00010 */ sw $s0, 0x10($sp) +/* E13534 80240DD4 0000282D */ daddu $a1, $zero, $zero +/* E13538 80240DD8 24070003 */ addiu $a3, $zero, 3 +/* E1353C 80240DDC 8C460080 */ lw $a2, 0x80($v0) +/* E13540 80240DE0 24040009 */ addiu $a0, $zero, 9 +/* E13544 80240DE4 00C0182D */ daddu $v1, $a2, $zero +.L80240DE8: +/* E13548 80240DE8 8C62007C */ lw $v0, 0x7c($v1) +/* E1354C 80240DEC 54470005 */ bnel $v0, $a3, .L80240E04 +/* E13550 80240DF0 24A50001 */ addiu $a1, $a1, 1 +/* E13554 80240DF4 8C620074 */ lw $v0, 0x74($v1) +/* E13558 80240DF8 50440006 */ beql $v0, $a0, .L80240E14 +/* E1355C 80240DFC 0220202D */ daddu $a0, $s1, $zero +/* E13560 80240E00 24A50001 */ addiu $a1, $a1, 1 +.L80240E04: +/* E13564 80240E04 28A2000B */ slti $v0, $a1, 0xb +/* E13568 80240E08 1440FFF7 */ bnez $v0, .L80240DE8 +/* E1356C 80240E0C 2463005C */ addiu $v1, $v1, 0x5c +/* E13570 80240E10 0220202D */ daddu $a0, $s1, $zero +.L80240E14: +/* E13574 80240E14 00058040 */ sll $s0, $a1, 1 +/* E13578 80240E18 02058021 */ addu $s0, $s0, $a1 +/* E1357C 80240E1C 001080C0 */ sll $s0, $s0, 3 +/* E13580 80240E20 02058023 */ subu $s0, $s0, $a1 +/* E13584 80240E24 00108080 */ sll $s0, $s0, 2 +/* E13588 80240E28 00D08021 */ addu $s0, $a2, $s0 +/* E1358C 80240E2C 8E020084 */ lw $v0, 0x84($s0) +/* E13590 80240E30 3C05FE36 */ lui $a1, 0xfe36 +/* E13594 80240E34 00021080 */ sll $v0, $v0, 2 +/* E13598 80240E38 3C018024 */ lui $at, 0x8024 +/* E1359C 80240E3C 00220821 */ addu $at, $at, $v0 +/* E135A0 80240E40 C4201AEC */ lwc1 $f0, 0x1aec($at) +/* E135A4 80240E44 8E020084 */ lw $v0, 0x84($s0) +/* E135A8 80240E48 8E060078 */ lw $a2, 0x78($s0) +/* E135AC 80240E4C 00021080 */ sll $v0, $v0, 2 +/* E135B0 80240E50 E6000094 */ swc1 $f0, 0x94($s0) +/* E135B4 80240E54 3C018024 */ lui $at, 0x8024 +/* E135B8 80240E58 00220821 */ addu $at, $at, $v0 +/* E135BC 80240E5C C4221B18 */ lwc1 $f2, 0x1b18($at) +/* E135C0 80240E60 3C0142DC */ lui $at, 0x42dc +/* E135C4 80240E64 44810000 */ mtc1 $at, $f0 +/* E135C8 80240E68 34A53C81 */ ori $a1, $a1, 0x3c81 +/* E135CC 80240E6C E600009C */ swc1 $f0, 0x9c($s0) +/* E135D0 80240E70 0C0B2026 */ jal set_variable +/* E135D4 80240E74 E6020098 */ swc1 $f2, 0x98($s0) +/* E135D8 80240E78 0220202D */ daddu $a0, $s1, $zero +/* E135DC 80240E7C 3C05FE36 */ lui $a1, 0xfe36 +/* E135E0 80240E80 8E060094 */ lw $a2, 0x94($s0) +/* E135E4 80240E84 0C0B2190 */ jal set_float_variable +/* E135E8 80240E88 34A53C85 */ ori $a1, $a1, 0x3c85 +/* E135EC 80240E8C 0220202D */ daddu $a0, $s1, $zero +/* E135F0 80240E90 3C05FE36 */ lui $a1, 0xfe36 +/* E135F4 80240E94 8E060098 */ lw $a2, 0x98($s0) +/* E135F8 80240E98 0C0B2190 */ jal set_float_variable +/* E135FC 80240E9C 34A53C86 */ ori $a1, $a1, 0x3c86 +/* E13600 80240EA0 0220202D */ daddu $a0, $s1, $zero +/* E13604 80240EA4 3C05FE36 */ lui $a1, 0xfe36 +/* E13608 80240EA8 8E06009C */ lw $a2, 0x9c($s0) +/* E1360C 80240EAC 0C0B2190 */ jal set_float_variable +/* E13610 80240EB0 34A53C87 */ ori $a1, $a1, 0x3c87 +/* E13614 80240EB4 8FBF0018 */ lw $ra, 0x18($sp) +/* E13618 80240EB8 8FB10014 */ lw $s1, 0x14($sp) +/* E1361C 80240EBC 8FB00010 */ lw $s0, 0x10($sp) +/* E13620 80240EC0 24020002 */ addiu $v0, $zero, 2 +/* E13624 80240EC4 03E00008 */ jr $ra +/* E13628 80240EC8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234.s deleted file mode 100644 index f0dea1db8b..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234.s +++ /dev/null @@ -1,194 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241234 -/* E13994 80241234 27BDFF88 */ addiu $sp, $sp, -0x78 -/* E13998 80241238 AFB5006C */ sw $s5, 0x6c($sp) -/* E1399C 8024123C 0080A82D */ daddu $s5, $a0, $zero -/* E139A0 80241240 AFB00058 */ sw $s0, 0x58($sp) -/* E139A4 80241244 00A0802D */ daddu $s0, $a1, $zero -/* E139A8 80241248 0000202D */ daddu $a0, $zero, $zero -/* E139AC 8024124C AFBF0070 */ sw $ra, 0x70($sp) -/* E139B0 80241250 AFB40068 */ sw $s4, 0x68($sp) -/* E139B4 80241254 AFB30064 */ sw $s3, 0x64($sp) -/* E139B8 80241258 AFB20060 */ sw $s2, 0x60($sp) -/* E139BC 8024125C 0C00FB3A */ jal get_enemy -/* E139C0 80241260 AFB1005C */ sw $s1, 0x5c($sp) -/* E139C4 80241264 27A30028 */ addiu $v1, $sp, 0x28 -/* E139C8 80241268 8C540080 */ lw $s4, 0x80($v0) -/* E139CC 8024126C 3C028024 */ lui $v0, 0x8024 -/* E139D0 80241270 244235E8 */ addiu $v0, $v0, 0x35e8 -/* E139D4 80241274 24440020 */ addiu $a0, $v0, 0x20 -.L80241278: -/* E139D8 80241278 8C480000 */ lw $t0, ($v0) -/* E139DC 8024127C 8C490004 */ lw $t1, 4($v0) -/* E139E0 80241280 8C4A0008 */ lw $t2, 8($v0) -/* E139E4 80241284 8C4B000C */ lw $t3, 0xc($v0) -/* E139E8 80241288 AC680000 */ sw $t0, ($v1) -/* E139EC 8024128C AC690004 */ sw $t1, 4($v1) -/* E139F0 80241290 AC6A0008 */ sw $t2, 8($v1) -/* E139F4 80241294 AC6B000C */ sw $t3, 0xc($v1) -/* E139F8 80241298 24420010 */ addiu $v0, $v0, 0x10 -/* E139FC 8024129C 1444FFF6 */ bne $v0, $a0, .L80241278 -/* E13A00 802412A0 24630010 */ addiu $v1, $v1, 0x10 -/* E13A04 802412A4 8C480000 */ lw $t0, ($v0) -/* E13A08 802412A8 8C490004 */ lw $t1, 4($v0) -/* E13A0C 802412AC 8C4A0008 */ lw $t2, 8($v0) -/* E13A10 802412B0 AC680000 */ sw $t0, ($v1) -/* E13A14 802412B4 AC690004 */ sw $t1, 4($v1) -/* E13A18 802412B8 12000044 */ beqz $s0, .L802413CC -/* E13A1C 802412BC AC6A0008 */ sw $t2, 8($v1) -/* E13A20 802412C0 0C00A67F */ jal rand_int -/* E13A24 802412C4 240403E8 */ addiu $a0, $zero, 0x3e8 -/* E13A28 802412C8 0040182D */ daddu $v1, $v0, $zero -/* E13A2C 802412CC 04620001 */ bltzl $v1, .L802412D4 -/* E13A30 802412D0 24620003 */ addiu $v0, $v1, 3 -.L802412D4: -/* E13A34 802412D4 00022083 */ sra $a0, $v0, 2 -/* E13A38 802412D8 00041080 */ sll $v0, $a0, 2 -/* E13A3C 802412DC 00622023 */ subu $a0, $v1, $v0 -/* E13A40 802412E0 0000882D */ daddu $s1, $zero, $zero -/* E13A44 802412E4 3C058024 */ lui $a1, 0x8024 -/* E13A48 802412E8 24A51B9C */ addiu $a1, $a1, 0x1b9c -/* E13A4C 802412EC 00041040 */ sll $v0, $a0, 1 -/* E13A50 802412F0 00441021 */ addu $v0, $v0, $a0 -/* E13A54 802412F4 00021080 */ sll $v0, $v0, 2 -/* E13A58 802412F8 00441023 */ subu $v0, $v0, $a0 -/* E13A5C 802412FC 00022080 */ sll $a0, $v0, 2 -/* E13A60 80241300 0280182D */ daddu $v1, $s4, $zero -.L80241304: -/* E13A64 80241304 00851021 */ addu $v0, $a0, $a1 -/* E13A68 80241308 24840004 */ addiu $a0, $a0, 4 -/* E13A6C 8024130C 8C420000 */ lw $v0, ($v0) -/* E13A70 80241310 26310001 */ addiu $s1, $s1, 1 -/* E13A74 80241314 AC62001C */ sw $v0, 0x1c($v1) -/* E13A78 80241318 2A22000B */ slti $v0, $s1, 0xb -/* E13A7C 8024131C 1440FFF9 */ bnez $v0, .L80241304 -/* E13A80 80241320 24630004 */ addiu $v1, $v1, 4 -/* E13A84 80241324 0000882D */ daddu $s1, $zero, $zero -/* E13A88 80241328 3C122E8B */ lui $s2, 0x2e8b -/* E13A8C 8024132C 3652A2E9 */ ori $s2, $s2, 0xa2e9 -.L80241330: -/* E13A90 80241330 0C00A67F */ jal rand_int -/* E13A94 80241334 24042710 */ addiu $a0, $zero, 0x2710 -/* E13A98 80241338 00520018 */ mult $v0, $s2 -/* E13A9C 8024133C 24042710 */ addiu $a0, $zero, 0x2710 -/* E13AA0 80241340 00021FC3 */ sra $v1, $v0, 0x1f -/* E13AA4 80241344 00004010 */ mfhi $t0 -/* E13AA8 80241348 00082843 */ sra $a1, $t0, 1 -/* E13AAC 8024134C 00A38023 */ subu $s0, $a1, $v1 -/* E13AB0 80241350 00101840 */ sll $v1, $s0, 1 -/* E13AB4 80241354 00701821 */ addu $v1, $v1, $s0 -/* E13AB8 80241358 00031880 */ sll $v1, $v1, 2 -/* E13ABC 8024135C 00701823 */ subu $v1, $v1, $s0 -/* E13AC0 80241360 0C00A67F */ jal rand_int -/* E13AC4 80241364 00438023 */ subu $s0, $v0, $v1 -/* E13AC8 80241368 00520018 */ mult $v0, $s2 -/* E13ACC 8024136C 00021FC3 */ sra $v1, $v0, 0x1f -/* E13AD0 80241370 00004010 */ mfhi $t0 -/* E13AD4 80241374 00082043 */ sra $a0, $t0, 1 -/* E13AD8 80241378 00832023 */ subu $a0, $a0, $v1 -/* E13ADC 8024137C 00041840 */ sll $v1, $a0, 1 -/* E13AE0 80241380 00641821 */ addu $v1, $v1, $a0 -/* E13AE4 80241384 00031880 */ sll $v1, $v1, 2 -/* E13AE8 80241388 00641823 */ subu $v1, $v1, $a0 -/* E13AEC 8024138C 00432023 */ subu $a0, $v0, $v1 -/* E13AF0 80241390 12040009 */ beq $s0, $a0, .L802413B8 -/* E13AF4 80241394 26310001 */ addiu $s1, $s1, 1 -/* E13AF8 80241398 00041880 */ sll $v1, $a0, 2 -/* E13AFC 8024139C 02831821 */ addu $v1, $s4, $v1 -/* E13B00 802413A0 00101080 */ sll $v0, $s0, 2 -/* E13B04 802413A4 02821021 */ addu $v0, $s4, $v0 -/* E13B08 802413A8 8C44001C */ lw $a0, 0x1c($v0) -/* E13B0C 802413AC 8C65001C */ lw $a1, 0x1c($v1) -/* E13B10 802413B0 AC64001C */ sw $a0, 0x1c($v1) -/* E13B14 802413B4 AC45001C */ sw $a1, 0x1c($v0) -.L802413B8: -/* E13B18 802413B8 2A2203E8 */ slti $v0, $s1, 0x3e8 -/* E13B1C 802413BC 1440FFDC */ bnez $v0, .L80241330 -/* E13B20 802413C0 00000000 */ nop -/* E13B24 802413C4 AEA00070 */ sw $zero, 0x70($s5) -/* E13B28 802413C8 AEA00074 */ sw $zero, 0x74($s5) -.L802413CC: -/* E13B2C 802413CC 8EA20070 */ lw $v0, 0x70($s5) -/* E13B30 802413D0 2442FFFF */ addiu $v0, $v0, -1 -/* E13B34 802413D4 1C400041 */ bgtz $v0, .L802414DC -/* E13B38 802413D8 AEA20070 */ sw $v0, 0x70($s5) -/* E13B3C 802413DC 3C138024 */ lui $s3, 0x8024 -/* E13B40 802413E0 26731AC8 */ addiu $s3, $s3, 0x1ac8 -/* E13B44 802413E4 3C128024 */ lui $s2, 0x8024 -/* E13B48 802413E8 26521AD4 */ addiu $s2, $s2, 0x1ad4 -/* E13B4C 802413EC 3C118024 */ lui $s1, 0x8024 -/* E13B50 802413F0 26311AE0 */ addiu $s1, $s1, 0x1ae0 -/* E13B54 802413F4 8EB00074 */ lw $s0, 0x74($s5) -/* E13B58 802413F8 3C04802F */ lui $a0, 0x802f -/* E13B5C 802413FC 2484A0C4 */ addiu $a0, $a0, -0x5f3c -/* E13B60 80241400 02139821 */ addu $s3, $s0, $s3 -/* E13B64 80241404 02129021 */ addu $s2, $s0, $s2 -/* E13B68 80241408 02118821 */ addu $s1, $s0, $s1 -/* E13B6C 8024140C 82650000 */ lb $a1, ($s3) -/* E13B70 80241410 82460000 */ lb $a2, ($s2) -/* E13B74 80241414 82270000 */ lb $a3, ($s1) -/* E13B78 80241418 3C028000 */ lui $v0, 0x8000 -/* E13B7C 8024141C AFA00010 */ sw $zero, 0x10($sp) -/* E13B80 80241420 AFA00014 */ sw $zero, 0x14($sp) -/* E13B84 80241424 AFA00018 */ sw $zero, 0x18($sp) -/* E13B88 80241428 AFA0001C */ sw $zero, 0x1c($sp) -/* E13B8C 8024142C 0C044631 */ jal create_entity -/* E13B90 80241430 AFA20020 */ sw $v0, 0x20($sp) -/* E13B94 80241434 0040202D */ daddu $a0, $v0, $zero -/* E13B98 80241438 00101040 */ sll $v0, $s0, 1 -/* E13B9C 8024143C 00501021 */ addu $v0, $v0, $s0 -/* E13BA0 80241440 000210C0 */ sll $v0, $v0, 3 -/* E13BA4 80241444 00501023 */ subu $v0, $v0, $s0 -/* E13BA8 80241448 00021080 */ sll $v0, $v0, 2 -/* E13BAC 8024144C 02821021 */ addu $v0, $s4, $v0 -/* E13BB0 80241450 0C04417A */ jal get_entity_by_index -/* E13BB4 80241454 AC440088 */ sw $a0, 0x88($v0) -/* E13BB8 80241458 00108080 */ sll $s0, $s0, 2 -/* E13BBC 8024145C 03B01821 */ addu $v1, $sp, $s0 -/* E13BC0 80241460 8C630028 */ lw $v1, 0x28($v1) -/* E13BC4 80241464 3C0141B8 */ lui $at, 0x41b8 -/* E13BC8 80241468 44810000 */ mtc1 $at, $f0 -/* E13BCC 8024146C AC430028 */ sw $v1, 0x28($v0) -/* E13BD0 80241470 82650000 */ lb $a1, ($s3) -/* E13BD4 80241474 82420000 */ lb $v0, ($s2) -/* E13BD8 80241478 82230000 */ lb $v1, ($s1) -/* E13BDC 8024147C 44851000 */ mtc1 $a1, $f2 -/* E13BE0 80241480 00000000 */ nop -/* E13BE4 80241484 468010A0 */ cvt.s.w $f2, $f2 -/* E13BE8 80241488 2442000D */ addiu $v0, $v0, 0xd -/* E13BEC 8024148C 44051000 */ mfc1 $a1, $f2 -/* E13BF0 80241490 44821000 */ mtc1 $v0, $f2 -/* E13BF4 80241494 00000000 */ nop -/* E13BF8 80241498 468010A0 */ cvt.s.w $f2, $f2 -/* E13BFC 8024149C 24630005 */ addiu $v1, $v1, 5 -/* E13C00 802414A0 44061000 */ mfc1 $a2, $f2 -/* E13C04 802414A4 44831000 */ mtc1 $v1, $f2 -/* E13C08 802414A8 00000000 */ nop -/* E13C0C 802414AC 468010A0 */ cvt.s.w $f2, $f2 -/* E13C10 802414B0 44071000 */ mfc1 $a3, $f2 -/* E13C14 802414B4 24040003 */ addiu $a0, $zero, 3 -/* E13C18 802414B8 0C01BFBC */ jal func_8006FEF0 -/* E13C1C 802414BC E7A00010 */ swc1 $f0, 0x10($sp) -/* E13C20 802414C0 0C05272D */ jal play_sound -/* E13C24 802414C4 24040213 */ addiu $a0, $zero, 0x213 -/* E13C28 802414C8 8EA20074 */ lw $v0, 0x74($s5) -/* E13C2C 802414CC 24030003 */ addiu $v1, $zero, 3 -/* E13C30 802414D0 AEA30070 */ sw $v1, 0x70($s5) -/* E13C34 802414D4 24420001 */ addiu $v0, $v0, 1 -/* E13C38 802414D8 AEA20074 */ sw $v0, 0x74($s5) -.L802414DC: -/* E13C3C 802414DC 8EA20074 */ lw $v0, 0x74($s5) -/* E13C40 802414E0 8FBF0070 */ lw $ra, 0x70($sp) -/* E13C44 802414E4 8FB5006C */ lw $s5, 0x6c($sp) -/* E13C48 802414E8 8FB40068 */ lw $s4, 0x68($sp) -/* E13C4C 802414EC 8FB30064 */ lw $s3, 0x64($sp) -/* E13C50 802414F0 8FB20060 */ lw $s2, 0x60($sp) -/* E13C54 802414F4 8FB1005C */ lw $s1, 0x5c($sp) -/* E13C58 802414F8 8FB00058 */ lw $s0, 0x58($sp) -/* E13C5C 802414FC 2842000B */ slti $v0, $v0, 0xb -/* E13C60 80241500 38420001 */ xori $v0, $v0, 1 -/* E13C64 80241504 00021040 */ sll $v0, $v0, 1 -/* E13C68 80241508 03E00008 */ jr $ra -/* E13C6C 8024150C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s new file mode 100644 index 0000000000..723f3dd666 --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_80241234_E13994.s @@ -0,0 +1,194 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241234_E13994 +/* E13994 80241234 27BDFF88 */ addiu $sp, $sp, -0x78 +/* E13998 80241238 AFB5006C */ sw $s5, 0x6c($sp) +/* E1399C 8024123C 0080A82D */ daddu $s5, $a0, $zero +/* E139A0 80241240 AFB00058 */ sw $s0, 0x58($sp) +/* E139A4 80241244 00A0802D */ daddu $s0, $a1, $zero +/* E139A8 80241248 0000202D */ daddu $a0, $zero, $zero +/* E139AC 8024124C AFBF0070 */ sw $ra, 0x70($sp) +/* E139B0 80241250 AFB40068 */ sw $s4, 0x68($sp) +/* E139B4 80241254 AFB30064 */ sw $s3, 0x64($sp) +/* E139B8 80241258 AFB20060 */ sw $s2, 0x60($sp) +/* E139BC 8024125C 0C00FB3A */ jal get_enemy +/* E139C0 80241260 AFB1005C */ sw $s1, 0x5c($sp) +/* E139C4 80241264 27A30028 */ addiu $v1, $sp, 0x28 +/* E139C8 80241268 8C540080 */ lw $s4, 0x80($v0) +/* E139CC 8024126C 3C028024 */ lui $v0, 0x8024 +/* E139D0 80241270 244235E8 */ addiu $v0, $v0, 0x35e8 +/* E139D4 80241274 24440020 */ addiu $a0, $v0, 0x20 +.L80241278: +/* E139D8 80241278 8C480000 */ lw $t0, ($v0) +/* E139DC 8024127C 8C490004 */ lw $t1, 4($v0) +/* E139E0 80241280 8C4A0008 */ lw $t2, 8($v0) +/* E139E4 80241284 8C4B000C */ lw $t3, 0xc($v0) +/* E139E8 80241288 AC680000 */ sw $t0, ($v1) +/* E139EC 8024128C AC690004 */ sw $t1, 4($v1) +/* E139F0 80241290 AC6A0008 */ sw $t2, 8($v1) +/* E139F4 80241294 AC6B000C */ sw $t3, 0xc($v1) +/* E139F8 80241298 24420010 */ addiu $v0, $v0, 0x10 +/* E139FC 8024129C 1444FFF6 */ bne $v0, $a0, .L80241278 +/* E13A00 802412A0 24630010 */ addiu $v1, $v1, 0x10 +/* E13A04 802412A4 8C480000 */ lw $t0, ($v0) +/* E13A08 802412A8 8C490004 */ lw $t1, 4($v0) +/* E13A0C 802412AC 8C4A0008 */ lw $t2, 8($v0) +/* E13A10 802412B0 AC680000 */ sw $t0, ($v1) +/* E13A14 802412B4 AC690004 */ sw $t1, 4($v1) +/* E13A18 802412B8 12000044 */ beqz $s0, .L802413CC +/* E13A1C 802412BC AC6A0008 */ sw $t2, 8($v1) +/* E13A20 802412C0 0C00A67F */ jal rand_int +/* E13A24 802412C4 240403E8 */ addiu $a0, $zero, 0x3e8 +/* E13A28 802412C8 0040182D */ daddu $v1, $v0, $zero +/* E13A2C 802412CC 04620001 */ bltzl $v1, .L802412D4 +/* E13A30 802412D0 24620003 */ addiu $v0, $v1, 3 +.L802412D4: +/* E13A34 802412D4 00022083 */ sra $a0, $v0, 2 +/* E13A38 802412D8 00041080 */ sll $v0, $a0, 2 +/* E13A3C 802412DC 00622023 */ subu $a0, $v1, $v0 +/* E13A40 802412E0 0000882D */ daddu $s1, $zero, $zero +/* E13A44 802412E4 3C058024 */ lui $a1, 0x8024 +/* E13A48 802412E8 24A51B9C */ addiu $a1, $a1, 0x1b9c +/* E13A4C 802412EC 00041040 */ sll $v0, $a0, 1 +/* E13A50 802412F0 00441021 */ addu $v0, $v0, $a0 +/* E13A54 802412F4 00021080 */ sll $v0, $v0, 2 +/* E13A58 802412F8 00441023 */ subu $v0, $v0, $a0 +/* E13A5C 802412FC 00022080 */ sll $a0, $v0, 2 +/* E13A60 80241300 0280182D */ daddu $v1, $s4, $zero +.L80241304: +/* E13A64 80241304 00851021 */ addu $v0, $a0, $a1 +/* E13A68 80241308 24840004 */ addiu $a0, $a0, 4 +/* E13A6C 8024130C 8C420000 */ lw $v0, ($v0) +/* E13A70 80241310 26310001 */ addiu $s1, $s1, 1 +/* E13A74 80241314 AC62001C */ sw $v0, 0x1c($v1) +/* E13A78 80241318 2A22000B */ slti $v0, $s1, 0xb +/* E13A7C 8024131C 1440FFF9 */ bnez $v0, .L80241304 +/* E13A80 80241320 24630004 */ addiu $v1, $v1, 4 +/* E13A84 80241324 0000882D */ daddu $s1, $zero, $zero +/* E13A88 80241328 3C122E8B */ lui $s2, 0x2e8b +/* E13A8C 8024132C 3652A2E9 */ ori $s2, $s2, 0xa2e9 +.L80241330: +/* E13A90 80241330 0C00A67F */ jal rand_int +/* E13A94 80241334 24042710 */ addiu $a0, $zero, 0x2710 +/* E13A98 80241338 00520018 */ mult $v0, $s2 +/* E13A9C 8024133C 24042710 */ addiu $a0, $zero, 0x2710 +/* E13AA0 80241340 00021FC3 */ sra $v1, $v0, 0x1f +/* E13AA4 80241344 00004010 */ mfhi $t0 +/* E13AA8 80241348 00082843 */ sra $a1, $t0, 1 +/* E13AAC 8024134C 00A38023 */ subu $s0, $a1, $v1 +/* E13AB0 80241350 00101840 */ sll $v1, $s0, 1 +/* E13AB4 80241354 00701821 */ addu $v1, $v1, $s0 +/* E13AB8 80241358 00031880 */ sll $v1, $v1, 2 +/* E13ABC 8024135C 00701823 */ subu $v1, $v1, $s0 +/* E13AC0 80241360 0C00A67F */ jal rand_int +/* E13AC4 80241364 00438023 */ subu $s0, $v0, $v1 +/* E13AC8 80241368 00520018 */ mult $v0, $s2 +/* E13ACC 8024136C 00021FC3 */ sra $v1, $v0, 0x1f +/* E13AD0 80241370 00004010 */ mfhi $t0 +/* E13AD4 80241374 00082043 */ sra $a0, $t0, 1 +/* E13AD8 80241378 00832023 */ subu $a0, $a0, $v1 +/* E13ADC 8024137C 00041840 */ sll $v1, $a0, 1 +/* E13AE0 80241380 00641821 */ addu $v1, $v1, $a0 +/* E13AE4 80241384 00031880 */ sll $v1, $v1, 2 +/* E13AE8 80241388 00641823 */ subu $v1, $v1, $a0 +/* E13AEC 8024138C 00432023 */ subu $a0, $v0, $v1 +/* E13AF0 80241390 12040009 */ beq $s0, $a0, .L802413B8 +/* E13AF4 80241394 26310001 */ addiu $s1, $s1, 1 +/* E13AF8 80241398 00041880 */ sll $v1, $a0, 2 +/* E13AFC 8024139C 02831821 */ addu $v1, $s4, $v1 +/* E13B00 802413A0 00101080 */ sll $v0, $s0, 2 +/* E13B04 802413A4 02821021 */ addu $v0, $s4, $v0 +/* E13B08 802413A8 8C44001C */ lw $a0, 0x1c($v0) +/* E13B0C 802413AC 8C65001C */ lw $a1, 0x1c($v1) +/* E13B10 802413B0 AC64001C */ sw $a0, 0x1c($v1) +/* E13B14 802413B4 AC45001C */ sw $a1, 0x1c($v0) +.L802413B8: +/* E13B18 802413B8 2A2203E8 */ slti $v0, $s1, 0x3e8 +/* E13B1C 802413BC 1440FFDC */ bnez $v0, .L80241330 +/* E13B20 802413C0 00000000 */ nop +/* E13B24 802413C4 AEA00070 */ sw $zero, 0x70($s5) +/* E13B28 802413C8 AEA00074 */ sw $zero, 0x74($s5) +.L802413CC: +/* E13B2C 802413CC 8EA20070 */ lw $v0, 0x70($s5) +/* E13B30 802413D0 2442FFFF */ addiu $v0, $v0, -1 +/* E13B34 802413D4 1C400041 */ bgtz $v0, .L802414DC +/* E13B38 802413D8 AEA20070 */ sw $v0, 0x70($s5) +/* E13B3C 802413DC 3C138024 */ lui $s3, 0x8024 +/* E13B40 802413E0 26731AC8 */ addiu $s3, $s3, 0x1ac8 +/* E13B44 802413E4 3C128024 */ lui $s2, 0x8024 +/* E13B48 802413E8 26521AD4 */ addiu $s2, $s2, 0x1ad4 +/* E13B4C 802413EC 3C118024 */ lui $s1, 0x8024 +/* E13B50 802413F0 26311AE0 */ addiu $s1, $s1, 0x1ae0 +/* E13B54 802413F4 8EB00074 */ lw $s0, 0x74($s5) +/* E13B58 802413F8 3C04802F */ lui $a0, 0x802f +/* E13B5C 802413FC 2484A0C4 */ addiu $a0, $a0, -0x5f3c +/* E13B60 80241400 02139821 */ addu $s3, $s0, $s3 +/* E13B64 80241404 02129021 */ addu $s2, $s0, $s2 +/* E13B68 80241408 02118821 */ addu $s1, $s0, $s1 +/* E13B6C 8024140C 82650000 */ lb $a1, ($s3) +/* E13B70 80241410 82460000 */ lb $a2, ($s2) +/* E13B74 80241414 82270000 */ lb $a3, ($s1) +/* E13B78 80241418 3C028000 */ lui $v0, 0x8000 +/* E13B7C 8024141C AFA00010 */ sw $zero, 0x10($sp) +/* E13B80 80241420 AFA00014 */ sw $zero, 0x14($sp) +/* E13B84 80241424 AFA00018 */ sw $zero, 0x18($sp) +/* E13B88 80241428 AFA0001C */ sw $zero, 0x1c($sp) +/* E13B8C 8024142C 0C044631 */ jal create_entity +/* E13B90 80241430 AFA20020 */ sw $v0, 0x20($sp) +/* E13B94 80241434 0040202D */ daddu $a0, $v0, $zero +/* E13B98 80241438 00101040 */ sll $v0, $s0, 1 +/* E13B9C 8024143C 00501021 */ addu $v0, $v0, $s0 +/* E13BA0 80241440 000210C0 */ sll $v0, $v0, 3 +/* E13BA4 80241444 00501023 */ subu $v0, $v0, $s0 +/* E13BA8 80241448 00021080 */ sll $v0, $v0, 2 +/* E13BAC 8024144C 02821021 */ addu $v0, $s4, $v0 +/* E13BB0 80241450 0C04417A */ jal get_entity_by_index +/* E13BB4 80241454 AC440088 */ sw $a0, 0x88($v0) +/* E13BB8 80241458 00108080 */ sll $s0, $s0, 2 +/* E13BBC 8024145C 03B01821 */ addu $v1, $sp, $s0 +/* E13BC0 80241460 8C630028 */ lw $v1, 0x28($v1) +/* E13BC4 80241464 3C0141B8 */ lui $at, 0x41b8 +/* E13BC8 80241468 44810000 */ mtc1 $at, $f0 +/* E13BCC 8024146C AC430028 */ sw $v1, 0x28($v0) +/* E13BD0 80241470 82650000 */ lb $a1, ($s3) +/* E13BD4 80241474 82420000 */ lb $v0, ($s2) +/* E13BD8 80241478 82230000 */ lb $v1, ($s1) +/* E13BDC 8024147C 44851000 */ mtc1 $a1, $f2 +/* E13BE0 80241480 00000000 */ nop +/* E13BE4 80241484 468010A0 */ cvt.s.w $f2, $f2 +/* E13BE8 80241488 2442000D */ addiu $v0, $v0, 0xd +/* E13BEC 8024148C 44051000 */ mfc1 $a1, $f2 +/* E13BF0 80241490 44821000 */ mtc1 $v0, $f2 +/* E13BF4 80241494 00000000 */ nop +/* E13BF8 80241498 468010A0 */ cvt.s.w $f2, $f2 +/* E13BFC 8024149C 24630005 */ addiu $v1, $v1, 5 +/* E13C00 802414A0 44061000 */ mfc1 $a2, $f2 +/* E13C04 802414A4 44831000 */ mtc1 $v1, $f2 +/* E13C08 802414A8 00000000 */ nop +/* E13C0C 802414AC 468010A0 */ cvt.s.w $f2, $f2 +/* E13C10 802414B0 44071000 */ mfc1 $a3, $f2 +/* E13C14 802414B4 24040003 */ addiu $a0, $zero, 3 +/* E13C18 802414B8 0C01BFBC */ jal func_8006FEF0 +/* E13C1C 802414BC E7A00010 */ swc1 $f0, 0x10($sp) +/* E13C20 802414C0 0C05272D */ jal play_sound +/* E13C24 802414C4 24040213 */ addiu $a0, $zero, 0x213 +/* E13C28 802414C8 8EA20074 */ lw $v0, 0x74($s5) +/* E13C2C 802414CC 24030003 */ addiu $v1, $zero, 3 +/* E13C30 802414D0 AEA30070 */ sw $v1, 0x70($s5) +/* E13C34 802414D4 24420001 */ addiu $v0, $v0, 1 +/* E13C38 802414D8 AEA20074 */ sw $v0, 0x74($s5) +.L802414DC: +/* E13C3C 802414DC 8EA20074 */ lw $v0, 0x74($s5) +/* E13C40 802414E0 8FBF0070 */ lw $ra, 0x70($sp) +/* E13C44 802414E4 8FB5006C */ lw $s5, 0x6c($sp) +/* E13C48 802414E8 8FB40068 */ lw $s4, 0x68($sp) +/* E13C4C 802414EC 8FB30064 */ lw $s3, 0x64($sp) +/* E13C50 802414F0 8FB20060 */ lw $s2, 0x60($sp) +/* E13C54 802414F4 8FB1005C */ lw $s1, 0x5c($sp) +/* E13C58 802414F8 8FB00058 */ lw $s0, 0x58($sp) +/* E13C5C 802414FC 2842000B */ slti $v0, $v0, 0xb +/* E13C60 80241500 38420001 */ xori $v0, $v0, 1 +/* E13C64 80241504 00021040 */ sll $v0, $v0, 1 +/* E13C68 80241508 03E00008 */ jr $ra +/* E13C6C 8024150C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4.s deleted file mode 100644 index 5708eacf20..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4.s +++ /dev/null @@ -1,179 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FE4 -/* E17D64 80241FE4 27BDFF88 */ addiu $sp, $sp, -0x78 -/* E17D68 80241FE8 AFBF0058 */ sw $ra, 0x58($sp) -/* E17D6C 80241FEC AFB70054 */ sw $s7, 0x54($sp) -/* E17D70 80241FF0 AFB60050 */ sw $s6, 0x50($sp) -/* E17D74 80241FF4 AFB5004C */ sw $s5, 0x4c($sp) -/* E17D78 80241FF8 AFB40048 */ sw $s4, 0x48($sp) -/* E17D7C 80241FFC AFB30044 */ sw $s3, 0x44($sp) -/* E17D80 80242000 AFB20040 */ sw $s2, 0x40($sp) -/* E17D84 80242004 AFB1003C */ sw $s1, 0x3c($sp) -/* E17D88 80242008 AFB00038 */ sw $s0, 0x38($sp) -/* E17D8C 8024200C F7B80070 */ sdc1 $f24, 0x70($sp) -/* E17D90 80242010 F7B60068 */ sdc1 $f22, 0x68($sp) -/* E17D94 80242014 F7B40060 */ sdc1 $f20, 0x60($sp) -/* E17D98 80242018 0C00FB3A */ jal get_enemy -/* E17D9C 8024201C 0000202D */ daddu $a0, $zero, $zero -/* E17DA0 80242020 0040882D */ daddu $s1, $v0, $zero -/* E17DA4 80242024 24030004 */ addiu $v1, $zero, 4 -/* E17DA8 80242028 8E220078 */ lw $v0, 0x78($s1) -/* E17DAC 8024202C 8E24006C */ lw $a0, 0x6c($s1) -/* E17DB0 80242030 14430035 */ bne $v0, $v1, .L80242108 -/* E17DB4 80242034 0000902D */ daddu $s2, $zero, $zero -/* E17DB8 80242038 2417FFFF */ addiu $s7, $zero, -1 -/* E17DBC 8024203C 27B60028 */ addiu $s6, $sp, 0x28 -/* E17DC0 80242040 27B5002C */ addiu $s5, $sp, 0x2c -/* E17DC4 80242044 27B40030 */ addiu $s4, $sp, 0x30 -/* E17DC8 80242048 0080982D */ daddu $s3, $a0, $zero -.L8024204C: -/* E17DCC 8024204C 8E640040 */ lw $a0, 0x40($s3) -/* E17DD0 80242050 50970028 */ beql $a0, $s7, .L802420F4 -/* E17DD4 80242054 26520001 */ addiu $s2, $s2, 1 -/* E17DD8 80242058 0C00FB3A */ jal get_enemy -/* E17DDC 8024205C 00000000 */ nop -/* E17DE0 80242060 84440008 */ lh $a0, 8($v0) -/* E17DE4 80242064 0C00EABB */ jal get_npc_unsafe -/* E17DE8 80242068 0040882D */ daddu $s1, $v0, $zero -/* E17DEC 8024206C 0040802D */ daddu $s0, $v0, $zero -/* E17DF0 80242070 8E020000 */ lw $v0, ($s0) -/* E17DF4 80242074 30420002 */ andi $v0, $v0, 2 -/* E17DF8 80242078 5440001E */ bnel $v0, $zero, .L802420F4 -/* E17DFC 8024207C 26520001 */ addiu $s2, $s2, 1 -/* E17E00 80242080 AFB60010 */ sw $s6, 0x10($sp) -/* E17E04 80242084 AFB50014 */ sw $s5, 0x14($sp) -/* E17E08 80242088 AFB40018 */ sw $s4, 0x18($sp) -/* E17E0C 8024208C 8E050038 */ lw $a1, 0x38($s0) -/* E17E10 80242090 8E06003C */ lw $a2, 0x3c($s0) -/* E17E14 80242094 8E070040 */ lw $a3, 0x40($s0) -/* E17E18 80242098 0C00B94E */ jal get_screen_coords -/* E17E1C 8024209C 0000202D */ daddu $a0, $zero, $zero -/* E17E20 802420A0 8FA20028 */ lw $v0, 0x28($sp) -/* E17E24 802420A4 2442FFFF */ addiu $v0, $v0, -1 -/* E17E28 802420A8 2C42013F */ sltiu $v0, $v0, 0x13f -/* E17E2C 802420AC 1040000A */ beqz $v0, .L802420D8 -/* E17E30 802420B0 00000000 */ nop -/* E17E34 802420B4 AFA00010 */ sw $zero, 0x10($sp) -/* E17E38 802420B8 AFA00014 */ sw $zero, 0x14($sp) -/* E17E3C 802420BC 8E050038 */ lw $a1, 0x38($s0) -/* E17E40 802420C0 8E06003C */ lw $a2, 0x3c($s0) -/* E17E44 802420C4 8E070040 */ lw $a3, 0x40($s0) -/* E17E48 802420C8 0C01BECC */ jal fx_walk_normal -/* E17E4C 802420CC 24040001 */ addiu $a0, $zero, 1 -/* E17E50 802420D0 0C05272D */ jal play_sound -/* E17E54 802420D4 24040283 */ addiu $a0, $zero, 0x283 -.L802420D8: -/* E17E58 802420D8 8E020000 */ lw $v0, ($s0) -/* E17E5C 802420DC 0200202D */ daddu $a0, $s0, $zero -/* E17E60 802420E0 34420002 */ ori $v0, $v0, 2 -/* E17E64 802420E4 0C00EAFF */ jal disable_npc_shadow -/* E17E68 802420E8 AC820000 */ sw $v0, ($a0) -/* E17E6C 802420EC AE20006C */ sw $zero, 0x6c($s1) -/* E17E70 802420F0 26520001 */ addiu $s2, $s2, 1 -.L802420F4: -/* E17E74 802420F4 2A420023 */ slti $v0, $s2, 0x23 -/* E17E78 802420F8 1440FFD4 */ bnez $v0, .L8024204C -/* E17E7C 802420FC 2673001C */ addiu $s3, $s3, 0x1c -/* E17E80 80242100 0809088F */ j .L8024223C -/* E17E84 80242104 24020002 */ addiu $v0, $zero, 2 -.L80242108: -/* E17E88 80242108 24160012 */ addiu $s6, $zero, 0x12 -/* E17E8C 8024210C 2415001E */ addiu $s5, $zero, 0x1e -/* E17E90 80242110 27B30034 */ addiu $s3, $sp, 0x34 -/* E17E94 80242114 24140025 */ addiu $s4, $zero, 0x25 -/* E17E98 80242118 0080882D */ daddu $s1, $a0, $zero -/* E17E9C 8024211C 4480A000 */ mtc1 $zero, $f20 -/* E17EA0 80242120 3C013F80 */ lui $at, 0x3f80 -/* E17EA4 80242124 4481C000 */ mtc1 $at, $f24 -/* E17EA8 80242128 3C014000 */ lui $at, 0x4000 -/* E17EAC 8024212C 4481B000 */ mtc1 $at, $f22 -.L80242130: -/* E17EB0 80242130 8E240040 */ lw $a0, 0x40($s1) -/* E17EB4 80242134 2402FFFF */ addiu $v0, $zero, -1 -/* E17EB8 80242138 5082003C */ beql $a0, $v0, .L8024222C -/* E17EBC 8024213C 2631001C */ addiu $s1, $s1, 0x1c -/* E17EC0 80242140 0C00FB3A */ jal get_enemy -/* E17EC4 80242144 00000000 */ nop -/* E17EC8 80242148 0C00EABB */ jal get_npc_unsafe -/* E17ECC 8024214C 84440008 */ lh $a0, 8($v0) -/* E17ED0 80242150 0040802D */ daddu $s0, $v0, $zero -/* E17ED4 80242154 8E020000 */ lw $v0, ($s0) -/* E17ED8 80242158 30420002 */ andi $v0, $v0, 2 -/* E17EDC 8024215C 54400033 */ bnel $v0, $zero, .L8024222C -/* E17EE0 80242160 2631001C */ addiu $s1, $s1, 0x1c -/* E17EE4 80242164 8E230034 */ lw $v1, 0x34($s1) -/* E17EE8 80242168 10600005 */ beqz $v1, .L80242180 -/* E17EEC 8024216C 24020001 */ addiu $v0, $zero, 1 -/* E17EF0 80242170 10620017 */ beq $v1, $v0, .L802421D0 -/* E17EF4 80242174 00000000 */ nop -/* E17EF8 80242178 0809088B */ j .L8024222C -/* E17EFC 8024217C 2631001C */ addiu $s1, $s1, 0x1c -.L80242180: -/* E17F00 80242180 8E22002C */ lw $v0, 0x2c($s1) -/* E17F04 80242184 10560028 */ beq $v0, $s6, .L80242228 -/* E17F08 80242188 24040002 */ addiu $a0, $zero, 2 -/* E17F0C 8024218C AE36002C */ sw $s6, 0x2c($s1) -/* E17F10 80242190 860200A8 */ lh $v0, 0xa8($s0) -/* E17F14 80242194 4406A000 */ mfc1 $a2, $f20 -/* E17F18 80242198 44820000 */ mtc1 $v0, $f0 -/* E17F1C 8024219C 00000000 */ nop -/* E17F20 802421A0 46800020 */ cvt.s.w $f0, $f0 -/* E17F24 802421A4 44070000 */ mfc1 $a3, $f0 -/* E17F28 802421A8 0200282D */ daddu $a1, $s0, $zero -/* E17F2C 802421AC E7B80010 */ swc1 $f24, 0x10($sp) -/* E17F30 802421B0 E7B60014 */ swc1 $f22, 0x14($sp) -/* E17F34 802421B4 E7B40018 */ swc1 $f20, 0x18($sp) -/* E17F38 802421B8 AFB5001C */ sw $s5, 0x1c($sp) -/* E17F3C 802421BC 0C01BFA4 */ jal fx_emote -/* E17F40 802421C0 AFB30020 */ sw $s3, 0x20($sp) -/* E17F44 802421C4 3C02002B */ lui $v0, 0x2b -/* E17F48 802421C8 08090887 */ j .L8024221C -/* E17F4C 802421CC 3442000E */ ori $v0, $v0, 0xe -.L802421D0: -/* E17F50 802421D0 8E22002C */ lw $v0, 0x2c($s1) -/* E17F54 802421D4 10540014 */ beq $v0, $s4, .L80242228 -/* E17F58 802421D8 24040002 */ addiu $a0, $zero, 2 -/* E17F5C 802421DC AE34002C */ sw $s4, 0x2c($s1) -/* E17F60 802421E0 860200A8 */ lh $v0, 0xa8($s0) -/* E17F64 802421E4 4406A000 */ mfc1 $a2, $f20 -/* E17F68 802421E8 44820000 */ mtc1 $v0, $f0 -/* E17F6C 802421EC 00000000 */ nop -/* E17F70 802421F0 46800020 */ cvt.s.w $f0, $f0 -/* E17F74 802421F4 44070000 */ mfc1 $a3, $f0 -/* E17F78 802421F8 0200282D */ daddu $a1, $s0, $zero -/* E17F7C 802421FC E7B80010 */ swc1 $f24, 0x10($sp) -/* E17F80 80242200 E7B60014 */ swc1 $f22, 0x14($sp) -/* E17F84 80242204 E7B40018 */ swc1 $f20, 0x18($sp) -/* E17F88 80242208 AFB5001C */ sw $s5, 0x1c($sp) -/* E17F8C 8024220C 0C01BFA4 */ jal fx_emote -/* E17F90 80242210 AFB30020 */ sw $s3, 0x20($sp) -/* E17F94 80242214 3C02002C */ lui $v0, 0x2c -/* E17F98 80242218 3442001C */ ori $v0, $v0, 0x1c -.L8024221C: -/* E17F9C 8024221C 0200202D */ daddu $a0, $s0, $zero -/* E17FA0 80242220 0C00EAE8 */ jal enable_npc_shadow -/* E17FA4 80242224 AC820028 */ sw $v0, 0x28($a0) -.L80242228: -/* E17FA8 80242228 2631001C */ addiu $s1, $s1, 0x1c -.L8024222C: -/* E17FAC 8024222C 26520001 */ addiu $s2, $s2, 1 -/* E17FB0 80242230 2A420023 */ slti $v0, $s2, 0x23 -/* E17FB4 80242234 1440FFBE */ bnez $v0, .L80242130 -/* E17FB8 80242238 0000102D */ daddu $v0, $zero, $zero -.L8024223C: -/* E17FBC 8024223C 8FBF0058 */ lw $ra, 0x58($sp) -/* E17FC0 80242240 8FB70054 */ lw $s7, 0x54($sp) -/* E17FC4 80242244 8FB60050 */ lw $s6, 0x50($sp) -/* E17FC8 80242248 8FB5004C */ lw $s5, 0x4c($sp) -/* E17FCC 8024224C 8FB40048 */ lw $s4, 0x48($sp) -/* E17FD0 80242250 8FB30044 */ lw $s3, 0x44($sp) -/* E17FD4 80242254 8FB20040 */ lw $s2, 0x40($sp) -/* E17FD8 80242258 8FB1003C */ lw $s1, 0x3c($sp) -/* E17FDC 8024225C 8FB00038 */ lw $s0, 0x38($sp) -/* E17FE0 80242260 D7B80070 */ ldc1 $f24, 0x70($sp) -/* E17FE4 80242264 D7B60068 */ ldc1 $f22, 0x68($sp) -/* E17FE8 80242268 D7B40060 */ ldc1 $f20, 0x60($sp) -/* E17FEC 8024226C 03E00008 */ jr $ra -/* E17FF0 80242270 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s new file mode 100644 index 0000000000..9bb3c5f2a8 --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80241FE4_E17D64.s @@ -0,0 +1,179 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FE4_E17D64 +/* E17D64 80241FE4 27BDFF88 */ addiu $sp, $sp, -0x78 +/* E17D68 80241FE8 AFBF0058 */ sw $ra, 0x58($sp) +/* E17D6C 80241FEC AFB70054 */ sw $s7, 0x54($sp) +/* E17D70 80241FF0 AFB60050 */ sw $s6, 0x50($sp) +/* E17D74 80241FF4 AFB5004C */ sw $s5, 0x4c($sp) +/* E17D78 80241FF8 AFB40048 */ sw $s4, 0x48($sp) +/* E17D7C 80241FFC AFB30044 */ sw $s3, 0x44($sp) +/* E17D80 80242000 AFB20040 */ sw $s2, 0x40($sp) +/* E17D84 80242004 AFB1003C */ sw $s1, 0x3c($sp) +/* E17D88 80242008 AFB00038 */ sw $s0, 0x38($sp) +/* E17D8C 8024200C F7B80070 */ sdc1 $f24, 0x70($sp) +/* E17D90 80242010 F7B60068 */ sdc1 $f22, 0x68($sp) +/* E17D94 80242014 F7B40060 */ sdc1 $f20, 0x60($sp) +/* E17D98 80242018 0C00FB3A */ jal get_enemy +/* E17D9C 8024201C 0000202D */ daddu $a0, $zero, $zero +/* E17DA0 80242020 0040882D */ daddu $s1, $v0, $zero +/* E17DA4 80242024 24030004 */ addiu $v1, $zero, 4 +/* E17DA8 80242028 8E220078 */ lw $v0, 0x78($s1) +/* E17DAC 8024202C 8E24006C */ lw $a0, 0x6c($s1) +/* E17DB0 80242030 14430035 */ bne $v0, $v1, .L80242108 +/* E17DB4 80242034 0000902D */ daddu $s2, $zero, $zero +/* E17DB8 80242038 2417FFFF */ addiu $s7, $zero, -1 +/* E17DBC 8024203C 27B60028 */ addiu $s6, $sp, 0x28 +/* E17DC0 80242040 27B5002C */ addiu $s5, $sp, 0x2c +/* E17DC4 80242044 27B40030 */ addiu $s4, $sp, 0x30 +/* E17DC8 80242048 0080982D */ daddu $s3, $a0, $zero +.L8024204C: +/* E17DCC 8024204C 8E640040 */ lw $a0, 0x40($s3) +/* E17DD0 80242050 50970028 */ beql $a0, $s7, .L802420F4 +/* E17DD4 80242054 26520001 */ addiu $s2, $s2, 1 +/* E17DD8 80242058 0C00FB3A */ jal get_enemy +/* E17DDC 8024205C 00000000 */ nop +/* E17DE0 80242060 84440008 */ lh $a0, 8($v0) +/* E17DE4 80242064 0C00EABB */ jal get_npc_unsafe +/* E17DE8 80242068 0040882D */ daddu $s1, $v0, $zero +/* E17DEC 8024206C 0040802D */ daddu $s0, $v0, $zero +/* E17DF0 80242070 8E020000 */ lw $v0, ($s0) +/* E17DF4 80242074 30420002 */ andi $v0, $v0, 2 +/* E17DF8 80242078 5440001E */ bnel $v0, $zero, .L802420F4 +/* E17DFC 8024207C 26520001 */ addiu $s2, $s2, 1 +/* E17E00 80242080 AFB60010 */ sw $s6, 0x10($sp) +/* E17E04 80242084 AFB50014 */ sw $s5, 0x14($sp) +/* E17E08 80242088 AFB40018 */ sw $s4, 0x18($sp) +/* E17E0C 8024208C 8E050038 */ lw $a1, 0x38($s0) +/* E17E10 80242090 8E06003C */ lw $a2, 0x3c($s0) +/* E17E14 80242094 8E070040 */ lw $a3, 0x40($s0) +/* E17E18 80242098 0C00B94E */ jal get_screen_coords +/* E17E1C 8024209C 0000202D */ daddu $a0, $zero, $zero +/* E17E20 802420A0 8FA20028 */ lw $v0, 0x28($sp) +/* E17E24 802420A4 2442FFFF */ addiu $v0, $v0, -1 +/* E17E28 802420A8 2C42013F */ sltiu $v0, $v0, 0x13f +/* E17E2C 802420AC 1040000A */ beqz $v0, .L802420D8 +/* E17E30 802420B0 00000000 */ nop +/* E17E34 802420B4 AFA00010 */ sw $zero, 0x10($sp) +/* E17E38 802420B8 AFA00014 */ sw $zero, 0x14($sp) +/* E17E3C 802420BC 8E050038 */ lw $a1, 0x38($s0) +/* E17E40 802420C0 8E06003C */ lw $a2, 0x3c($s0) +/* E17E44 802420C4 8E070040 */ lw $a3, 0x40($s0) +/* E17E48 802420C8 0C01BECC */ jal fx_walk_normal +/* E17E4C 802420CC 24040001 */ addiu $a0, $zero, 1 +/* E17E50 802420D0 0C05272D */ jal play_sound +/* E17E54 802420D4 24040283 */ addiu $a0, $zero, 0x283 +.L802420D8: +/* E17E58 802420D8 8E020000 */ lw $v0, ($s0) +/* E17E5C 802420DC 0200202D */ daddu $a0, $s0, $zero +/* E17E60 802420E0 34420002 */ ori $v0, $v0, 2 +/* E17E64 802420E4 0C00EAFF */ jal disable_npc_shadow +/* E17E68 802420E8 AC820000 */ sw $v0, ($a0) +/* E17E6C 802420EC AE20006C */ sw $zero, 0x6c($s1) +/* E17E70 802420F0 26520001 */ addiu $s2, $s2, 1 +.L802420F4: +/* E17E74 802420F4 2A420023 */ slti $v0, $s2, 0x23 +/* E17E78 802420F8 1440FFD4 */ bnez $v0, .L8024204C +/* E17E7C 802420FC 2673001C */ addiu $s3, $s3, 0x1c +/* E17E80 80242100 0809088F */ j .L8024223C +/* E17E84 80242104 24020002 */ addiu $v0, $zero, 2 +.L80242108: +/* E17E88 80242108 24160012 */ addiu $s6, $zero, 0x12 +/* E17E8C 8024210C 2415001E */ addiu $s5, $zero, 0x1e +/* E17E90 80242110 27B30034 */ addiu $s3, $sp, 0x34 +/* E17E94 80242114 24140025 */ addiu $s4, $zero, 0x25 +/* E17E98 80242118 0080882D */ daddu $s1, $a0, $zero +/* E17E9C 8024211C 4480A000 */ mtc1 $zero, $f20 +/* E17EA0 80242120 3C013F80 */ lui $at, 0x3f80 +/* E17EA4 80242124 4481C000 */ mtc1 $at, $f24 +/* E17EA8 80242128 3C014000 */ lui $at, 0x4000 +/* E17EAC 8024212C 4481B000 */ mtc1 $at, $f22 +.L80242130: +/* E17EB0 80242130 8E240040 */ lw $a0, 0x40($s1) +/* E17EB4 80242134 2402FFFF */ addiu $v0, $zero, -1 +/* E17EB8 80242138 5082003C */ beql $a0, $v0, .L8024222C +/* E17EBC 8024213C 2631001C */ addiu $s1, $s1, 0x1c +/* E17EC0 80242140 0C00FB3A */ jal get_enemy +/* E17EC4 80242144 00000000 */ nop +/* E17EC8 80242148 0C00EABB */ jal get_npc_unsafe +/* E17ECC 8024214C 84440008 */ lh $a0, 8($v0) +/* E17ED0 80242150 0040802D */ daddu $s0, $v0, $zero +/* E17ED4 80242154 8E020000 */ lw $v0, ($s0) +/* E17ED8 80242158 30420002 */ andi $v0, $v0, 2 +/* E17EDC 8024215C 54400033 */ bnel $v0, $zero, .L8024222C +/* E17EE0 80242160 2631001C */ addiu $s1, $s1, 0x1c +/* E17EE4 80242164 8E230034 */ lw $v1, 0x34($s1) +/* E17EE8 80242168 10600005 */ beqz $v1, .L80242180 +/* E17EEC 8024216C 24020001 */ addiu $v0, $zero, 1 +/* E17EF0 80242170 10620017 */ beq $v1, $v0, .L802421D0 +/* E17EF4 80242174 00000000 */ nop +/* E17EF8 80242178 0809088B */ j .L8024222C +/* E17EFC 8024217C 2631001C */ addiu $s1, $s1, 0x1c +.L80242180: +/* E17F00 80242180 8E22002C */ lw $v0, 0x2c($s1) +/* E17F04 80242184 10560028 */ beq $v0, $s6, .L80242228 +/* E17F08 80242188 24040002 */ addiu $a0, $zero, 2 +/* E17F0C 8024218C AE36002C */ sw $s6, 0x2c($s1) +/* E17F10 80242190 860200A8 */ lh $v0, 0xa8($s0) +/* E17F14 80242194 4406A000 */ mfc1 $a2, $f20 +/* E17F18 80242198 44820000 */ mtc1 $v0, $f0 +/* E17F1C 8024219C 00000000 */ nop +/* E17F20 802421A0 46800020 */ cvt.s.w $f0, $f0 +/* E17F24 802421A4 44070000 */ mfc1 $a3, $f0 +/* E17F28 802421A8 0200282D */ daddu $a1, $s0, $zero +/* E17F2C 802421AC E7B80010 */ swc1 $f24, 0x10($sp) +/* E17F30 802421B0 E7B60014 */ swc1 $f22, 0x14($sp) +/* E17F34 802421B4 E7B40018 */ swc1 $f20, 0x18($sp) +/* E17F38 802421B8 AFB5001C */ sw $s5, 0x1c($sp) +/* E17F3C 802421BC 0C01BFA4 */ jal fx_emote +/* E17F40 802421C0 AFB30020 */ sw $s3, 0x20($sp) +/* E17F44 802421C4 3C02002B */ lui $v0, 0x2b +/* E17F48 802421C8 08090887 */ j .L8024221C +/* E17F4C 802421CC 3442000E */ ori $v0, $v0, 0xe +.L802421D0: +/* E17F50 802421D0 8E22002C */ lw $v0, 0x2c($s1) +/* E17F54 802421D4 10540014 */ beq $v0, $s4, .L80242228 +/* E17F58 802421D8 24040002 */ addiu $a0, $zero, 2 +/* E17F5C 802421DC AE34002C */ sw $s4, 0x2c($s1) +/* E17F60 802421E0 860200A8 */ lh $v0, 0xa8($s0) +/* E17F64 802421E4 4406A000 */ mfc1 $a2, $f20 +/* E17F68 802421E8 44820000 */ mtc1 $v0, $f0 +/* E17F6C 802421EC 00000000 */ nop +/* E17F70 802421F0 46800020 */ cvt.s.w $f0, $f0 +/* E17F74 802421F4 44070000 */ mfc1 $a3, $f0 +/* E17F78 802421F8 0200282D */ daddu $a1, $s0, $zero +/* E17F7C 802421FC E7B80010 */ swc1 $f24, 0x10($sp) +/* E17F80 80242200 E7B60014 */ swc1 $f22, 0x14($sp) +/* E17F84 80242204 E7B40018 */ swc1 $f20, 0x18($sp) +/* E17F88 80242208 AFB5001C */ sw $s5, 0x1c($sp) +/* E17F8C 8024220C 0C01BFA4 */ jal fx_emote +/* E17F90 80242210 AFB30020 */ sw $s3, 0x20($sp) +/* E17F94 80242214 3C02002C */ lui $v0, 0x2c +/* E17F98 80242218 3442001C */ ori $v0, $v0, 0x1c +.L8024221C: +/* E17F9C 8024221C 0200202D */ daddu $a0, $s0, $zero +/* E17FA0 80242220 0C00EAE8 */ jal enable_npc_shadow +/* E17FA4 80242224 AC820028 */ sw $v0, 0x28($a0) +.L80242228: +/* E17FA8 80242228 2631001C */ addiu $s1, $s1, 0x1c +.L8024222C: +/* E17FAC 8024222C 26520001 */ addiu $s2, $s2, 1 +/* E17FB0 80242230 2A420023 */ slti $v0, $s2, 0x23 +/* E17FB4 80242234 1440FFBE */ bnez $v0, .L80242130 +/* E17FB8 80242238 0000102D */ daddu $v0, $zero, $zero +.L8024223C: +/* E17FBC 8024223C 8FBF0058 */ lw $ra, 0x58($sp) +/* E17FC0 80242240 8FB70054 */ lw $s7, 0x54($sp) +/* E17FC4 80242244 8FB60050 */ lw $s6, 0x50($sp) +/* E17FC8 80242248 8FB5004C */ lw $s5, 0x4c($sp) +/* E17FCC 8024224C 8FB40048 */ lw $s4, 0x48($sp) +/* E17FD0 80242250 8FB30044 */ lw $s3, 0x44($sp) +/* E17FD4 80242254 8FB20040 */ lw $s2, 0x40($sp) +/* E17FD8 80242258 8FB1003C */ lw $s1, 0x3c($sp) +/* E17FDC 8024225C 8FB00038 */ lw $s0, 0x38($sp) +/* E17FE0 80242260 D7B80070 */ ldc1 $f24, 0x70($sp) +/* E17FE4 80242264 D7B60068 */ ldc1 $f22, 0x68($sp) +/* E17FE8 80242268 D7B40060 */ ldc1 $f20, 0x60($sp) +/* E17FEC 8024226C 03E00008 */ jr $ra +/* E17FF0 80242270 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274.s deleted file mode 100644 index cea4412909..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242274 -/* E17FF4 80242274 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E17FF8 80242278 0000202D */ daddu $a0, $zero, $zero -/* E17FFC 8024227C AFBF0014 */ sw $ra, 0x14($sp) -/* E18000 80242280 0C00FB3A */ jal get_enemy -/* E18004 80242284 AFB00010 */ sw $s0, 0x10($sp) -/* E18008 80242288 24040400 */ addiu $a0, $zero, 0x400 -/* E1800C 8024228C 0C00AB39 */ jal heap_malloc -/* E18010 80242290 0040802D */ daddu $s0, $v0, $zero -/* E18014 80242294 2403FFB0 */ addiu $v1, $zero, -0x50 -/* E18018 80242298 AE02006C */ sw $v0, 0x6c($s0) -/* E1801C 8024229C AC430014 */ sw $v1, 0x14($v0) -/* E18020 802422A0 24030140 */ addiu $v1, $zero, 0x140 -/* E18024 802422A4 AC430018 */ sw $v1, 0x18($v0) -/* E18028 802422A8 24030384 */ addiu $v1, $zero, 0x384 -/* E1802C 802422AC 0C03A625 */ jal func_800E9894 -/* E18030 802422B0 AC430008 */ sw $v1, 8($v0) -/* E18034 802422B4 0C03A5EE */ jal func_800E97B8 -/* E18038 802422B8 00000000 */ nop -/* E1803C 802422BC 8FBF0014 */ lw $ra, 0x14($sp) -/* E18040 802422C0 8FB00010 */ lw $s0, 0x10($sp) -/* E18044 802422C4 24020002 */ addiu $v0, $zero, 2 -/* E18048 802422C8 03E00008 */ jr $ra -/* E1804C 802422CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s new file mode 100644 index 0000000000..49549a4e01 --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242274_E17FF4.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242274_E17FF4 +/* E17FF4 80242274 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E17FF8 80242278 0000202D */ daddu $a0, $zero, $zero +/* E17FFC 8024227C AFBF0014 */ sw $ra, 0x14($sp) +/* E18000 80242280 0C00FB3A */ jal get_enemy +/* E18004 80242284 AFB00010 */ sw $s0, 0x10($sp) +/* E18008 80242288 24040400 */ addiu $a0, $zero, 0x400 +/* E1800C 8024228C 0C00AB39 */ jal heap_malloc +/* E18010 80242290 0040802D */ daddu $s0, $v0, $zero +/* E18014 80242294 2403FFB0 */ addiu $v1, $zero, -0x50 +/* E18018 80242298 AE02006C */ sw $v0, 0x6c($s0) +/* E1801C 8024229C AC430014 */ sw $v1, 0x14($v0) +/* E18020 802422A0 24030140 */ addiu $v1, $zero, 0x140 +/* E18024 802422A4 AC430018 */ sw $v1, 0x18($v0) +/* E18028 802422A8 24030384 */ addiu $v1, $zero, 0x384 +/* E1802C 802422AC 0C03A625 */ jal func_800E9894 +/* E18030 802422B0 AC430008 */ sw $v1, 8($v0) +/* E18034 802422B4 0C03A5EE */ jal func_800E97B8 +/* E18038 802422B8 00000000 */ nop +/* E1803C 802422BC 8FBF0014 */ lw $ra, 0x14($sp) +/* E18040 802422C0 8FB00010 */ lw $s0, 0x10($sp) +/* E18044 802422C4 24020002 */ addiu $v0, $zero, 2 +/* E18048 802422C8 03E00008 */ jr $ra +/* E1804C 802422CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0.s deleted file mode 100644 index 2164843ce7..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422D0 -/* E18050 802422D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E18054 802422D4 0000202D */ daddu $a0, $zero, $zero -/* E18058 802422D8 AFBF0014 */ sw $ra, 0x14($sp) -/* E1805C 802422DC 0C00FB3A */ jal get_enemy -/* E18060 802422E0 AFB00010 */ sw $s0, 0x10($sp) -/* E18064 802422E4 8C50006C */ lw $s0, 0x6c($v0) -/* E18068 802422E8 0C048D70 */ jal func_801235C0 -/* E1806C 802422EC 8E040000 */ lw $a0, ($s0) -/* E18070 802422F0 0C05123D */ jal free_icon -/* E18074 802422F4 8E04000C */ lw $a0, 0xc($s0) -/* E18078 802422F8 0C05123D */ jal free_icon -/* E1807C 802422FC 8E040010 */ lw $a0, 0x10($s0) -/* E18080 80242300 8FBF0014 */ lw $ra, 0x14($sp) -/* E18084 80242304 8FB00010 */ lw $s0, 0x10($sp) -/* E18088 80242308 24020002 */ addiu $v0, $zero, 2 -/* E1808C 8024230C 03E00008 */ jr $ra -/* E18090 80242310 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0_E18050.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0_E18050.s new file mode 100644 index 0000000000..0e821ee56c --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802422D0_E18050.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422D0_E18050 +/* E18050 802422D0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E18054 802422D4 0000202D */ daddu $a0, $zero, $zero +/* E18058 802422D8 AFBF0014 */ sw $ra, 0x14($sp) +/* E1805C 802422DC 0C00FB3A */ jal get_enemy +/* E18060 802422E0 AFB00010 */ sw $s0, 0x10($sp) +/* E18064 802422E4 8C50006C */ lw $s0, 0x6c($v0) +/* E18068 802422E8 0C048D70 */ jal func_801235C0 +/* E1806C 802422EC 8E040000 */ lw $a0, ($s0) +/* E18070 802422F0 0C05123D */ jal free_icon +/* E18074 802422F4 8E04000C */ lw $a0, 0xc($s0) +/* E18078 802422F8 0C05123D */ jal free_icon +/* E1807C 802422FC 8E040010 */ lw $a0, 0x10($s0) +/* E18080 80242300 8FBF0014 */ lw $ra, 0x14($sp) +/* E18084 80242304 8FB00010 */ lw $s0, 0x10($sp) +/* E18088 80242308 24020002 */ addiu $v0, $zero, 2 +/* E1808C 8024230C 03E00008 */ jr $ra +/* E18090 80242310 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340.s deleted file mode 100644 index 2ed2f5596e..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242340 -/* E180C0 80242340 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E180C4 80242344 AFB00010 */ sw $s0, 0x10($sp) -/* E180C8 80242348 0080802D */ daddu $s0, $a0, $zero -/* E180CC 8024234C 3C038011 */ lui $v1, %hi(gPlayerData) -/* E180D0 80242350 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* E180D4 80242354 10A00005 */ beqz $a1, .L8024236C -/* E180D8 80242358 AFBF0014 */ sw $ra, 0x14($sp) -/* E180DC 8024235C 94620336 */ lhu $v0, 0x336($v1) -/* E180E0 80242360 24420001 */ addiu $v0, $v0, 1 -/* E180E4 80242364 A4620336 */ sh $v0, 0x336($v1) -/* E180E8 80242368 AE000070 */ sw $zero, 0x70($s0) -.L8024236C: -/* E180EC 8024236C 0C03A830 */ jal add_coins -/* E180F0 80242370 2404FFFF */ addiu $a0, $zero, -1 -/* E180F4 80242374 0C05272D */ jal play_sound -/* E180F8 80242378 24040211 */ addiu $a0, $zero, 0x211 -/* E180FC 8024237C 8E030070 */ lw $v1, 0x70($s0) -/* E18100 80242380 24630001 */ addiu $v1, $v1, 1 -/* E18104 80242384 3862000A */ xori $v0, $v1, 0xa -/* E18108 80242388 2C420001 */ sltiu $v0, $v0, 1 -/* E1810C 8024238C AE030070 */ sw $v1, 0x70($s0) -/* E18110 80242390 8FBF0014 */ lw $ra, 0x14($sp) -/* E18114 80242394 8FB00010 */ lw $s0, 0x10($sp) -/* E18118 80242398 00021040 */ sll $v0, $v0, 1 -/* E1811C 8024239C 03E00008 */ jr $ra -/* E18120 802423A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s new file mode 100644 index 0000000000..019a0c6377 --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242340_E180C0.s @@ -0,0 +1,30 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242340_E180C0 +/* E180C0 80242340 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E180C4 80242344 AFB00010 */ sw $s0, 0x10($sp) +/* E180C8 80242348 0080802D */ daddu $s0, $a0, $zero +/* E180CC 8024234C 3C038011 */ lui $v1, %hi(gPlayerData) +/* E180D0 80242350 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* E180D4 80242354 10A00005 */ beqz $a1, .L8024236C +/* E180D8 80242358 AFBF0014 */ sw $ra, 0x14($sp) +/* E180DC 8024235C 94620336 */ lhu $v0, 0x336($v1) +/* E180E0 80242360 24420001 */ addiu $v0, $v0, 1 +/* E180E4 80242364 A4620336 */ sh $v0, 0x336($v1) +/* E180E8 80242368 AE000070 */ sw $zero, 0x70($s0) +.L8024236C: +/* E180EC 8024236C 0C03A830 */ jal add_coins +/* E180F0 80242370 2404FFFF */ addiu $a0, $zero, -1 +/* E180F4 80242374 0C05272D */ jal play_sound +/* E180F8 80242378 24040211 */ addiu $a0, $zero, 0x211 +/* E180FC 8024237C 8E030070 */ lw $v1, 0x70($s0) +/* E18100 80242380 24630001 */ addiu $v1, $v1, 1 +/* E18104 80242384 3862000A */ xori $v0, $v1, 0xa +/* E18108 80242388 2C420001 */ sltiu $v0, $v0, 1 +/* E1810C 8024238C AE030070 */ sw $v1, 0x70($s0) +/* E18110 80242390 8FBF0014 */ lw $ra, 0x14($sp) +/* E18114 80242394 8FB00010 */ lw $s0, 0x10($sp) +/* E18118 80242398 00021040 */ sll $v0, $v0, 1 +/* E1811C 8024239C 03E00008 */ jr $ra +/* E18120 802423A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4.s deleted file mode 100644 index d28da5face..0000000000 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423A4 -/* E18124 802423A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* E18128 802423A8 AFBF0010 */ sw $ra, 0x10($sp) -/* E1812C 802423AC 0C03A5B2 */ jal func_800E96C8 -/* E18130 802423B0 00000000 */ nop -/* E18134 802423B4 8FBF0010 */ lw $ra, 0x10($sp) -/* E18138 802423B8 24020002 */ addiu $v0, $zero, 2 -/* E1813C 802423BC 03E00008 */ jr $ra -/* E18140 802423C0 27BD0018 */ addiu $sp, $sp, 0x18 -/* E18144 802423C4 00000000 */ nop -/* E18148 802423C8 00000000 */ nop -/* E1814C 802423CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s new file mode 100644 index 0000000000..1e7fbc4184 --- /dev/null +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_802423A4_E18124.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423A4_E18124 +/* E18124 802423A4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E18128 802423A8 AFBF0010 */ sw $ra, 0x10($sp) +/* E1812C 802423AC 0C03A5B2 */ jal func_800E96C8 +/* E18130 802423B0 00000000 */ nop +/* E18134 802423B4 8FBF0010 */ lw $ra, 0x10($sp) +/* E18138 802423B8 24020002 */ addiu $v0, $zero, 2 +/* E1813C 802423BC 03E00008 */ jr $ra +/* E18140 802423C0 27BD0018 */ addiu $sp, $sp, 0x18 +/* E18144 802423C4 00000000 */ nop +/* E18148 802423C8 00000000 */ nop +/* E1814C 802423CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s index 93462f0ad7..73befe5835 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_80240070_B934B0.s @@ -62,7 +62,7 @@ glabel func_80240070_B934B0 /* B93588 80240148 02A0382D */ daddu $a3, $s5, $zero /* B9358C 8024014C E7A00018 */ swc1 $f0, 0x18($sp) /* B93590 80240150 E7A2001C */ swc1 $f2, 0x1c($sp) -/* B93594 80240154 0C09001C */ jal func_80240070 +/* B93594 80240154 0C09001C */ jal func_80240070_B934B0 /* B93598 80240158 E7B00020 */ swc1 $f16, 0x20($sp) /* B9359C 8024015C C7A00018 */ lwc1 $f0, 0x18($sp) /* B935A0 80240160 C7A2001C */ lwc1 $f2, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s index 5931f204e0..6029e1022c 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B934B0/func_802403F0_B93830.s @@ -22,7 +22,7 @@ glabel func_802403F0_B93830 /* B93874 80240434 8C420004 */ lw $v0, 4($v0) /* B93878 80240438 27A60014 */ addiu $a2, $sp, 0x14 /* B9387C 8024043C 8C440000 */ lw $a0, ($v0) -/* B93880 80240440 0C09001C */ jal func_80240070 +/* B93880 80240440 0C09001C */ jal func_80240070_B934B0 /* B93884 80240444 27A70018 */ addiu $a3, $sp, 0x18 /* B93888 80240448 C7A00010 */ lwc1 $f0, 0x10($sp) /* B9388C 8024044C 3C014480 */ lui $at, 0x4480 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4.s deleted file mode 100644 index 2ae07b5b1f..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406B4 -/* B93AF4 802406B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B93AF8 802406B8 AFB10014 */ sw $s1, 0x14($sp) -/* B93AFC 802406BC 0080882D */ daddu $s1, $a0, $zero -/* B93B00 802406C0 AFBF0018 */ sw $ra, 0x18($sp) -/* B93B04 802406C4 AFB00010 */ sw $s0, 0x10($sp) -/* B93B08 802406C8 8E300148 */ lw $s0, 0x148($s1) -/* B93B0C 802406CC 0C00EABB */ jal get_npc_unsafe -/* B93B10 802406D0 86040008 */ lh $a0, 8($s0) -/* B93B14 802406D4 9443008E */ lhu $v1, 0x8e($v0) -/* B93B18 802406D8 2463FFFF */ addiu $v1, $v1, -1 -/* B93B1C 802406DC A443008E */ sh $v1, 0x8e($v0) -/* B93B20 802406E0 00031C00 */ sll $v1, $v1, 0x10 -/* B93B24 802406E4 1C600003 */ bgtz $v1, .L802406F4 -/* B93B28 802406E8 2402000C */ addiu $v0, $zero, 0xc -/* B93B2C 802406EC AE00006C */ sw $zero, 0x6c($s0) -/* B93B30 802406F0 AE220070 */ sw $v0, 0x70($s1) -.L802406F4: -/* B93B34 802406F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B93B38 802406F8 8FB10014 */ lw $s1, 0x14($sp) -/* B93B3C 802406FC 8FB00010 */ lw $s0, 0x10($sp) -/* B93B40 80240700 03E00008 */ jr $ra -/* B93B44 80240704 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s new file mode 100644 index 0000000000..6481a00699 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_802406B4_B93AF4.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406B4_B93AF4 +/* B93AF4 802406B4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B93AF8 802406B8 AFB10014 */ sw $s1, 0x14($sp) +/* B93AFC 802406BC 0080882D */ daddu $s1, $a0, $zero +/* B93B00 802406C0 AFBF0018 */ sw $ra, 0x18($sp) +/* B93B04 802406C4 AFB00010 */ sw $s0, 0x10($sp) +/* B93B08 802406C8 8E300148 */ lw $s0, 0x148($s1) +/* B93B0C 802406CC 0C00EABB */ jal get_npc_unsafe +/* B93B10 802406D0 86040008 */ lh $a0, 8($s0) +/* B93B14 802406D4 9443008E */ lhu $v1, 0x8e($v0) +/* B93B18 802406D8 2463FFFF */ addiu $v1, $v1, -1 +/* B93B1C 802406DC A443008E */ sh $v1, 0x8e($v0) +/* B93B20 802406E0 00031C00 */ sll $v1, $v1, 0x10 +/* B93B24 802406E4 1C600003 */ bgtz $v1, .L802406F4 +/* B93B28 802406E8 2402000C */ addiu $v0, $zero, 0xc +/* B93B2C 802406EC AE00006C */ sw $zero, 0x6c($s0) +/* B93B30 802406F0 AE220070 */ sw $v0, 0x70($s1) +.L802406F4: +/* B93B34 802406F4 8FBF0018 */ lw $ra, 0x18($sp) +/* B93B38 802406F8 8FB10014 */ lw $s1, 0x14($sp) +/* B93B3C 802406FC 8FB00010 */ lw $s0, 0x10($sp) +/* B93B40 80240700 03E00008 */ jr $ra +/* B93B44 80240704 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s index de193be10b..6d69c0ae69 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240B1C_B93F5C.s @@ -90,7 +90,7 @@ glabel func_80240B1C_B93F5C /* B9409C 80240C5C 8E22006C */ lw $v0, 0x6c($s1) /* B940A0 80240C60 14400006 */ bnez $v0, .L80240C7C /* B940A4 80240C64 00000000 */ nop -/* B940A8 80240C68 0C0901C2 */ jal func_80240708 +/* B940A8 80240C68 0C0901C2 */ jal func_80240708_B93B48 /* B940AC 80240C6C 0240202D */ daddu $a0, $s2, $zero /* B940B0 80240C70 10400002 */ beqz $v0, .L80240C7C /* B940B4 80240C74 2402001E */ addiu $v0, $zero, 0x1e @@ -151,21 +151,21 @@ glabel func_80240B1C_B93F5C /* B9418C 80240D4C 0280302D */ daddu $a2, $s4, $zero /* B94190 80240D50 0809036A */ j .L80240DA8 /* B94194 80240D54 00000000 */ nop -/* B94198 80240D58 0C090140 */ jal func_80240500 +/* B94198 80240D58 0C090140 */ jal func_80240500_B93940 /* B9419C 80240D5C 0240202D */ daddu $a0, $s2, $zero -/* B941A0 80240D60 0C09015B */ jal func_8024056C +/* B941A0 80240D60 0C09015B */ jal func_8024056C_B939AC /* B941A4 80240D64 0240202D */ daddu $a0, $s2, $zero /* B941A8 80240D68 8E430070 */ lw $v1, 0x70($s2) /* B941AC 80240D6C 24020020 */ addiu $v0, $zero, 0x20 /* B941B0 80240D70 1462000D */ bne $v1, $v0, .L80240DA8 /* B941B4 80240D74 00000000 */ nop -/* B941B8 80240D78 0C090177 */ jal func_802405DC +/* B941B8 80240D78 0C090177 */ jal func_802405DC_B93A1C /* B941BC 80240D7C 0240202D */ daddu $a0, $s2, $zero /* B941C0 80240D80 8E430070 */ lw $v1, 0x70($s2) /* B941C4 80240D84 24020021 */ addiu $v0, $zero, 0x21 /* B941C8 80240D88 14620007 */ bne $v1, $v0, .L80240DA8 /* B941CC 80240D8C 00000000 */ nop -/* B941D0 80240D90 0C0901AD */ jal func_802406B4 +/* B941D0 80240D90 0C0901AD */ jal func_802406B4_B93AF4 /* B941D4 80240D94 0240202D */ daddu $a0, $s2, $zero /* B941D8 80240D98 0809036A */ j .L80240DA8 /* B941DC 80240D9C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38.s deleted file mode 100644 index 304b0071f7..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38.s +++ /dev/null @@ -1,688 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F38 -/* B94378 80240F38 27BDFF80 */ addiu $sp, $sp, -0x80 -/* B9437C 80240F3C AFBF0064 */ sw $ra, 0x64($sp) -/* B94380 80240F40 AFBE0060 */ sw $fp, 0x60($sp) -/* B94384 80240F44 AFB7005C */ sw $s7, 0x5c($sp) -/* B94388 80240F48 AFB60058 */ sw $s6, 0x58($sp) -/* B9438C 80240F4C AFB50054 */ sw $s5, 0x54($sp) -/* B94390 80240F50 AFB40050 */ sw $s4, 0x50($sp) -/* B94394 80240F54 AFB3004C */ sw $s3, 0x4c($sp) -/* B94398 80240F58 AFB20048 */ sw $s2, 0x48($sp) -/* B9439C 80240F5C AFB10044 */ sw $s1, 0x44($sp) -/* B943A0 80240F60 AFB00040 */ sw $s0, 0x40($sp) -/* B943A4 80240F64 F7B80078 */ sdc1 $f24, 0x78($sp) -/* B943A8 80240F68 F7B60070 */ sdc1 $f22, 0x70($sp) -/* B943AC 80240F6C F7B40068 */ sdc1 $f20, 0x68($sp) -/* B943B0 80240F70 AFA40080 */ sw $a0, 0x80($sp) -/* B943B4 80240F74 8C960148 */ lw $s6, 0x148($a0) -/* B943B8 80240F78 00C0902D */ daddu $s2, $a2, $zero -/* B943BC 80240F7C 86C40008 */ lh $a0, 8($s6) -/* B943C0 80240F80 0C00EABB */ jal get_npc_unsafe -/* B943C4 80240F84 0000B82D */ daddu $s7, $zero, $zero -/* B943C8 80240F88 0040882D */ daddu $s1, $v0, $zero -/* B943CC 80240F8C 9622008E */ lhu $v0, 0x8e($s1) -/* B943D0 80240F90 2442FFFF */ addiu $v0, $v0, -1 -/* B943D4 80240F94 A622008E */ sh $v0, 0x8e($s1) -/* B943D8 80240F98 00021400 */ sll $v0, $v0, 0x10 -/* B943DC 80240F9C 8EC30090 */ lw $v1, 0x90($s6) -/* B943E0 80240FA0 00021403 */ sra $v0, $v0, 0x10 -/* B943E4 80240FA4 0062182A */ slt $v1, $v1, $v0 -/* B943E8 80240FA8 14600005 */ bnez $v1, .L80240FC0 -/* B943EC 80240FAC 02E0F02D */ daddu $fp, $s7, $zero -/* B943F0 80240FB0 8EC20000 */ lw $v0, ($s6) -/* B943F4 80240FB4 3C031F10 */ lui $v1, 0x1f10 -/* B943F8 80240FB8 00431025 */ or $v0, $v0, $v1 -/* B943FC 80240FBC AEC20000 */ sw $v0, ($s6) -.L80240FC0: -/* B94400 80240FC0 8622008E */ lh $v0, 0x8e($s1) -/* B94404 80240FC4 1440025D */ bnez $v0, .L8024193C -/* B94408 80240FC8 00000000 */ nop -/* B9440C 80240FCC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B94410 80240FD0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B94414 80240FD4 0C00A6C9 */ jal clamp_angle -/* B94418 80240FD8 C44C00A8 */ lwc1 $f12, 0xa8($v0) -/* B9441C 80240FDC 3C014334 */ lui $at, 0x4334 -/* B94420 80240FE0 44811000 */ mtc1 $at, $f2 -/* B94424 80240FE4 00000000 */ nop -/* B94428 80240FE8 4602003C */ c.lt.s $f0, $f2 -/* B9442C 80240FEC 00000000 */ nop -/* B94430 80240FF0 45000011 */ bc1f .L80241038 -/* B94434 80240FF4 00000000 */ nop -/* B94438 80240FF8 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B9443C 80240FFC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B94440 80241000 3C0142B4 */ lui $at, 0x42b4 -/* B94444 80241004 44816000 */ mtc1 $at, $f12 -/* B94448 80241008 00031080 */ sll $v0, $v1, 2 -/* B9444C 8024100C 00431021 */ addu $v0, $v0, $v1 -/* B94450 80241010 00021080 */ sll $v0, $v0, 2 -/* B94454 80241014 00431023 */ subu $v0, $v0, $v1 -/* B94458 80241018 000218C0 */ sll $v1, $v0, 3 -/* B9445C 8024101C 00431021 */ addu $v0, $v0, $v1 -/* B94460 80241020 000210C0 */ sll $v0, $v0, 3 -/* B94464 80241024 3C01800B */ lui $at, 0x800b -/* B94468 80241028 00220821 */ addu $at, $at, $v0 -/* B9446C 8024102C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B94470 80241030 0809041D */ j .L80241074 -/* B94474 80241034 460C0301 */ sub.s $f12, $f0, $f12 -.L80241038: -/* B94478 80241038 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* B9447C 8024103C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* B94480 80241040 3C0142B4 */ lui $at, 0x42b4 -/* B94484 80241044 44816000 */ mtc1 $at, $f12 -/* B94488 80241048 00031080 */ sll $v0, $v1, 2 -/* B9448C 8024104C 00431021 */ addu $v0, $v0, $v1 -/* B94490 80241050 00021080 */ sll $v0, $v0, 2 -/* B94494 80241054 00431023 */ subu $v0, $v0, $v1 -/* B94498 80241058 000218C0 */ sll $v1, $v0, 3 -/* B9449C 8024105C 00431021 */ addu $v0, $v0, $v1 -/* B944A0 80241060 000210C0 */ sll $v0, $v0, 3 -/* B944A4 80241064 3C01800B */ lui $at, 0x800b -/* B944A8 80241068 00220821 */ addu $at, $at, $v0 -/* B944AC 8024106C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B944B0 80241070 460C0300 */ add.s $f12, $f0, $f12 -.L80241074: -/* B944B4 80241074 0C00A6C9 */ jal clamp_angle -/* B944B8 80241078 00000000 */ nop -/* B944BC 8024107C 46000586 */ mov.s $f22, $f0 -/* B944C0 80241080 3C014334 */ lui $at, 0x4334 -/* B944C4 80241084 44816000 */ mtc1 $at, $f12 -/* B944C8 80241088 0C00A6C9 */ jal clamp_angle -/* B944CC 8024108C 460CB300 */ add.s $f12, $f22, $f12 -/* B944D0 80241090 8EC20088 */ lw $v0, 0x88($s6) -/* B944D4 80241094 14400010 */ bnez $v0, .L802410D8 -/* B944D8 80241098 46000606 */ mov.s $f24, $f0 -/* B944DC 8024109C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B944E0 802410A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B944E4 802410A4 804300B4 */ lb $v1, 0xb4($v0) -/* B944E8 802410A8 3C014200 */ lui $at, 0x4200 -/* B944EC 802410AC 4481A000 */ mtc1 $at, $f20 -/* B944F0 802410B0 10600016 */ beqz $v1, .L8024110C -/* B944F4 802410B4 24020001 */ addiu $v0, $zero, 1 -/* B944F8 802410B8 3C0142C8 */ lui $at, 0x42c8 -/* B944FC 802410BC 4481A000 */ mtc1 $at, $f20 -/* B94500 802410C0 14620013 */ bne $v1, $v0, .L80241110 -/* B94504 802410C4 26300038 */ addiu $s0, $s1, 0x38 -/* B94508 802410C8 3C0142B4 */ lui $at, 0x42b4 -/* B9450C 802410CC 4481A000 */ mtc1 $at, $f20 -/* B94510 802410D0 08090445 */ j .L80241114 -/* B94514 802410D4 0200202D */ daddu $a0, $s0, $zero -.L802410D8: -/* B94518 802410D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B9451C 802410DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B94520 802410E0 804300B4 */ lb $v1, 0xb4($v0) -/* B94524 802410E4 3C014218 */ lui $at, 0x4218 -/* B94528 802410E8 4481A000 */ mtc1 $at, $f20 -/* B9452C 802410EC 10600007 */ beqz $v1, .L8024110C -/* B94530 802410F0 24020001 */ addiu $v0, $zero, 1 -/* B94534 802410F4 3C0142B4 */ lui $at, 0x42b4 -/* B94538 802410F8 4481A000 */ mtc1 $at, $f20 -/* B9453C 802410FC 14620004 */ bne $v1, $v0, .L80241110 -/* B94540 80241100 26300038 */ addiu $s0, $s1, 0x38 -/* B94544 80241104 3C014296 */ lui $at, 0x4296 -/* B94548 80241108 4481A000 */ mtc1 $at, $f20 -.L8024110C: -/* B9454C 8024110C 26300038 */ addiu $s0, $s1, 0x38 -.L80241110: -/* B94550 80241110 0200202D */ daddu $a0, $s0, $zero -.L80241114: -/* B94554 80241114 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) -/* B94558 80241118 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) -/* B9455C 8024111C 4407C000 */ mfc1 $a3, $f24 -/* B94560 80241120 862200A6 */ lh $v0, 0xa6($s1) -/* B94564 80241124 8EA30000 */ lw $v1, ($s5) -/* B94568 80241128 44824000 */ mtc1 $v0, $f8 -/* B9456C 8024112C 00000000 */ nop -/* B94570 80241130 46804220 */ cvt.s.w $f8, $f8 -/* B94574 80241134 C4600028 */ lwc1 $f0, 0x28($v1) -/* B94578 80241138 44064000 */ mfc1 $a2, $f8 -/* B9457C 8024113C 26330040 */ addiu $s3, $s1, 0x40 -/* B94580 80241140 E6200038 */ swc1 $f0, 0x38($s1) -/* B94584 80241144 C4600030 */ lwc1 $f0, 0x30($v1) -/* B94588 80241148 0260282D */ daddu $a1, $s3, $zero -/* B9458C 8024114C 0C00A7E7 */ jal add_vec2D_polar -/* B94590 80241150 E6200040 */ swc1 $f0, 0x40($s1) -/* B94594 80241154 862200A6 */ lh $v0, 0xa6($s1) -/* B94598 80241158 44820000 */ mtc1 $v0, $f0 -/* B9459C 8024115C 00000000 */ nop -/* B945A0 80241160 46800020 */ cvt.s.w $f0, $f0 -/* B945A4 80241164 4600A000 */ add.s $f0, $f20, $f0 -/* B945A8 80241168 4406B000 */ mfc1 $a2, $f22 -/* B945AC 8024116C 44050000 */ mfc1 $a1, $f0 -/* B945B0 80241170 0C00EA95 */ jal npc_move_heading -/* B945B4 80241174 0220202D */ daddu $a0, $s1, $zero -/* B945B8 80241178 8EC20088 */ lw $v0, 0x88($s6) -/* B945BC 8024117C 1440005D */ bnez $v0, .L802412F4 -/* B945C0 80241180 00000000 */ nop -/* B945C4 80241184 C6200038 */ lwc1 $f0, 0x38($s1) -/* B945C8 80241188 3C018024 */ lui $at, 0x8024 -/* B945CC 8024118C D4244788 */ ldc1 $f4, 0x4788($at) -/* B945D0 80241190 46000021 */ cvt.d.s $f0, $f0 -/* B945D4 80241194 4620203C */ c.lt.d $f4, $f0 -/* B945D8 80241198 00000000 */ nop -/* B945DC 8024119C 45000005 */ bc1f .L802411B4 -/* B945E0 802411A0 00000000 */ nop -/* B945E4 802411A4 3C0143BE */ lui $at, 0x43be -/* B945E8 802411A8 44810000 */ mtc1 $at, $f0 -/* B945EC 802411AC 00000000 */ nop -/* B945F0 802411B0 E6200038 */ swc1 $f0, 0x38($s1) -.L802411B4: -/* B945F4 802411B4 C6200038 */ lwc1 $f0, 0x38($s1) -/* B945F8 802411B8 3C018024 */ lui $at, 0x8024 -/* B945FC 802411BC D4224790 */ ldc1 $f2, 0x4790($at) -/* B94600 802411C0 46000021 */ cvt.d.s $f0, $f0 -/* B94604 802411C4 4622003C */ c.lt.d $f0, $f2 -/* B94608 802411C8 00000000 */ nop -/* B9460C 802411CC 45000005 */ bc1f .L802411E4 -/* B94610 802411D0 00000000 */ nop -/* B94614 802411D4 3C01C3BE */ lui $at, 0xc3be -/* B94618 802411D8 44810000 */ mtc1 $at, $f0 -/* B9461C 802411DC 00000000 */ nop -/* B94620 802411E0 E6200038 */ swc1 $f0, 0x38($s1) -.L802411E4: -/* B94624 802411E4 C6200040 */ lwc1 $f0, 0x40($s1) -/* B94628 802411E8 46000021 */ cvt.d.s $f0, $f0 -/* B9462C 802411EC 4620203C */ c.lt.d $f4, $f0 -/* B94630 802411F0 00000000 */ nop -/* B94634 802411F4 45000005 */ bc1f .L8024120C -/* B94638 802411F8 00000000 */ nop -/* B9463C 802411FC 3C0143BE */ lui $at, 0x43be -/* B94640 80241200 44810000 */ mtc1 $at, $f0 -/* B94644 80241204 00000000 */ nop -/* B94648 80241208 E6200040 */ swc1 $f0, 0x40($s1) -.L8024120C: -/* B9464C 8024120C C6200040 */ lwc1 $f0, 0x40($s1) -/* B94650 80241210 46000021 */ cvt.d.s $f0, $f0 -/* B94654 80241214 4622003C */ c.lt.d $f0, $f2 -/* B94658 80241218 00000000 */ nop -/* B9465C 8024121C 45000005 */ bc1f .L80241234 -/* B94660 80241220 00000000 */ nop -/* B94664 80241224 3C01C3BE */ lui $at, 0xc3be -/* B94668 80241228 44810000 */ mtc1 $at, $f0 -/* B9466C 8024122C 00000000 */ nop -/* B94670 80241230 E6200040 */ swc1 $f0, 0x40($s1) -.L80241234: -/* B94674 80241234 C6220038 */ lwc1 $f2, 0x38($s1) -/* B94678 80241238 46021082 */ mul.s $f2, $f2, $f2 -/* B9467C 8024123C 00000000 */ nop -/* B94680 80241240 C6200040 */ lwc1 $f0, 0x40($s1) -/* B94684 80241244 46000002 */ mul.s $f0, $f0, $f0 -/* B94688 80241248 00000000 */ nop -/* B9468C 8024124C 46001300 */ add.s $f12, $f2, $f0 -/* B94690 80241250 46006004 */ sqrt.s $f0, $f12 -/* B94694 80241254 46000032 */ c.eq.s $f0, $f0 -/* B94698 80241258 00000000 */ nop -/* B9469C 8024125C 45010003 */ bc1t .L8024126C -/* B946A0 80241260 00000000 */ nop -/* B946A4 80241264 0C0187BC */ jal sqrtf -/* B946A8 80241268 00000000 */ nop -.L8024126C: -/* B946AC 8024126C 8E260038 */ lw $a2, 0x38($s1) -/* B946B0 80241270 8E270040 */ lw $a3, 0x40($s1) -/* B946B4 80241274 4480A000 */ mtc1 $zero, $f20 -/* B946B8 80241278 E7A00038 */ swc1 $f0, 0x38($sp) -/* B946BC 8024127C 4600A306 */ mov.s $f12, $f20 -/* B946C0 80241280 0C00A720 */ jal atan2 -/* B946C4 80241284 4600A386 */ mov.s $f14, $f20 -/* B946C8 80241288 46000586 */ mov.s $f22, $f0 -/* B946CC 8024128C C7A20038 */ lwc1 $f2, 0x38($sp) -/* B946D0 80241290 3C018024 */ lui $at, 0x8024 -/* B946D4 80241294 D4204798 */ ldc1 $f0, 0x4798($at) -/* B946D8 80241298 460010A1 */ cvt.d.s $f2, $f2 -/* B946DC 8024129C 4620103C */ c.lt.d $f2, $f0 -/* B946E0 802412A0 00000000 */ nop -/* B946E4 802412A4 45000004 */ bc1f .L802412B8 -/* B946E8 802412A8 0200202D */ daddu $a0, $s0, $zero -/* B946EC 802412AC 3C064398 */ lui $a2, 0x4398 -/* B946F0 802412B0 080904B6 */ j .L802412D8 -/* B946F4 802412B4 34C68000 */ ori $a2, $a2, 0x8000 -.L802412B8: -/* B946F8 802412B8 3C018024 */ lui $at, 0x8024 -/* B946FC 802412BC D42047A0 */ ldc1 $f0, 0x47a0($at) -/* B94700 802412C0 4622003C */ c.lt.d $f0, $f2 -/* B94704 802412C4 00000000 */ nop -/* B94708 802412C8 450000FA */ bc1f .L802416B4 -/* B9470C 802412CC 00000000 */ nop -/* B94710 802412D0 3C0643BB */ lui $a2, 0x43bb -/* B94714 802412D4 34C68000 */ ori $a2, $a2, 0x8000 -.L802412D8: -/* B94718 802412D8 4407B000 */ mfc1 $a3, $f22 -/* B9471C 802412DC 0260282D */ daddu $a1, $s3, $zero -/* B94720 802412E0 E6340038 */ swc1 $f20, 0x38($s1) -/* B94724 802412E4 0C00A7E7 */ jal add_vec2D_polar -/* B94728 802412E8 E6340040 */ swc1 $f20, 0x40($s1) -/* B9472C 802412EC 080905AD */ j .L802416B4 -/* B94730 802412F0 00000000 */ nop -.L802412F4: -/* B94734 802412F4 8E220000 */ lw $v0, ($s1) -/* B94738 802412F8 30420040 */ andi $v0, $v0, 0x40 -/* B9473C 802412FC 144000B0 */ bnez $v0, .L802415C0 -/* B94740 80241300 27A50020 */ addiu $a1, $sp, 0x20 -/* B94744 80241304 27B40020 */ addiu $s4, $sp, 0x20 -/* B94748 80241308 0280282D */ daddu $a1, $s4, $zero -/* B9474C 8024130C 27B30024 */ addiu $s3, $sp, 0x24 -/* B94750 80241310 8EA20000 */ lw $v0, ($s5) -/* B94754 80241314 3C014032 */ lui $at, 0x4032 -/* B94758 80241318 44811800 */ mtc1 $at, $f3 -/* B9475C 8024131C 44801000 */ mtc1 $zero, $f2 -/* B94760 80241320 C440002C */ lwc1 $f0, 0x2c($v0) -/* B94764 80241324 C4460028 */ lwc1 $f6, 0x28($v0) -/* B94768 80241328 C4440030 */ lwc1 $f4, 0x30($v0) -/* B9476C 8024132C 46000021 */ cvt.d.s $f0, $f0 -/* B94770 80241330 46220000 */ add.d $f0, $f0, $f2 -/* B94774 80241334 E7A60020 */ swc1 $f6, 0x20($sp) -/* B94778 80241338 E7A40028 */ swc1 $f4, 0x28($sp) -/* B9477C 8024133C 46200020 */ cvt.s.d $f0, $f0 -/* B94780 80241340 E7A00024 */ swc1 $f0, 0x24($sp) -/* B94784 80241344 E7B40010 */ swc1 $f20, 0x10($sp) -/* B94788 80241348 E7B60014 */ swc1 $f22, 0x14($sp) -/* B9478C 8024134C 862200A8 */ lh $v0, 0xa8($s1) -/* B94790 80241350 0260302D */ daddu $a2, $s3, $zero -/* B94794 80241354 44820000 */ mtc1 $v0, $f0 -/* B94798 80241358 00000000 */ nop -/* B9479C 8024135C 46800020 */ cvt.s.w $f0, $f0 -/* B947A0 80241360 E7A00018 */ swc1 $f0, 0x18($sp) -/* B947A4 80241364 862200A6 */ lh $v0, 0xa6($s1) -/* B947A8 80241368 27B00028 */ addiu $s0, $sp, 0x28 -/* B947AC 8024136C 44820000 */ mtc1 $v0, $f0 -/* B947B0 80241370 00000000 */ nop -/* B947B4 80241374 46800020 */ cvt.s.w $f0, $f0 -/* B947B8 80241378 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B947BC 8024137C 8E240080 */ lw $a0, 0x80($s1) -/* B947C0 80241380 0C037711 */ jal func_800DDC44 -/* B947C4 80241384 0200382D */ daddu $a3, $s0, $zero -/* B947C8 80241388 104000CA */ beqz $v0, .L802416B4 -/* B947CC 8024138C 0280282D */ daddu $a1, $s4, $zero -/* B947D0 80241390 8EA20000 */ lw $v0, ($s5) -/* B947D4 80241394 3C018024 */ lui $at, 0x8024 -/* B947D8 80241398 D42247A8 */ ldc1 $f2, 0x47a8($at) -/* B947DC 8024139C C440002C */ lwc1 $f0, 0x2c($v0) -/* B947E0 802413A0 C4460028 */ lwc1 $f6, 0x28($v0) -/* B947E4 802413A4 C4440030 */ lwc1 $f4, 0x30($v0) -/* B947E8 802413A8 46000021 */ cvt.d.s $f0, $f0 -/* B947EC 802413AC 46220000 */ add.d $f0, $f0, $f2 -/* B947F0 802413B0 E7A60020 */ swc1 $f6, 0x20($sp) -/* B947F4 802413B4 E7A40028 */ swc1 $f4, 0x28($sp) -/* B947F8 802413B8 46200020 */ cvt.s.d $f0, $f0 -/* B947FC 802413BC E7A00024 */ swc1 $f0, 0x24($sp) -/* B94800 802413C0 E7B40010 */ swc1 $f20, 0x10($sp) -/* B94804 802413C4 E7B60014 */ swc1 $f22, 0x14($sp) -/* B94808 802413C8 862200A8 */ lh $v0, 0xa8($s1) -/* B9480C 802413CC 44820000 */ mtc1 $v0, $f0 -/* B94810 802413D0 00000000 */ nop -/* B94814 802413D4 46800020 */ cvt.s.w $f0, $f0 -/* B94818 802413D8 E7A00018 */ swc1 $f0, 0x18($sp) -/* B9481C 802413DC 862200A6 */ lh $v0, 0xa6($s1) -/* B94820 802413E0 0260302D */ daddu $a2, $s3, $zero -/* B94824 802413E4 44820000 */ mtc1 $v0, $f0 -/* B94828 802413E8 00000000 */ nop -/* B9482C 802413EC 46800020 */ cvt.s.w $f0, $f0 -/* B94830 802413F0 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B94834 802413F4 8E240080 */ lw $a0, 0x80($s1) -/* B94838 802413F8 0C037711 */ jal func_800DDC44 -/* B9483C 802413FC 0200382D */ daddu $a3, $s0, $zero -/* B94840 80241400 27A5002C */ addiu $a1, $sp, 0x2c -/* B94844 80241404 27A60030 */ addiu $a2, $sp, 0x30 -/* B94848 80241408 27A70034 */ addiu $a3, $sp, 0x34 -/* B9484C 8024140C 27A30038 */ addiu $v1, $sp, 0x38 -/* B94850 80241410 C6220038 */ lwc1 $f2, 0x38($s1) -/* B94854 80241414 C620003C */ lwc1 $f0, 0x3c($s1) -/* B94858 80241418 3C014348 */ lui $at, 0x4348 -/* B9485C 8024141C 44813000 */ mtc1 $at, $f6 -/* B94860 80241420 46000021 */ cvt.d.s $f0, $f0 -/* B94864 80241424 E7A2002C */ swc1 $f2, 0x2c($sp) -/* B94868 80241428 3C014059 */ lui $at, 0x4059 -/* B9486C 8024142C 44811800 */ mtc1 $at, $f3 -/* B94870 80241430 44801000 */ mtc1 $zero, $f2 -/* B94874 80241434 C6240040 */ lwc1 $f4, 0x40($s1) -/* B94878 80241438 46220000 */ add.d $f0, $f0, $f2 -/* B9487C 8024143C E7A60038 */ swc1 $f6, 0x38($sp) -/* B94880 80241440 E7A40034 */ swc1 $f4, 0x34($sp) -/* B94884 80241444 46200020 */ cvt.s.d $f0, $f0 -/* B94888 80241448 E7A00030 */ swc1 $f0, 0x30($sp) -/* B9488C 8024144C AFA30010 */ sw $v1, 0x10($sp) -/* B94890 80241450 8E240080 */ lw $a0, 0x80($s1) -/* B94894 80241454 0C0372DF */ jal func_800DCB7C -/* B94898 80241458 0040802D */ daddu $s0, $v0, $zero -/* B9489C 8024145C 1600001C */ bnez $s0, .L802414D0 -/* B948A0 80241460 00000000 */ nop -/* B948A4 80241464 1040001A */ beqz $v0, .L802414D0 -/* B948A8 80241468 00000000 */ nop -/* B948AC 8024146C C7A20038 */ lwc1 $f2, 0x38($sp) -/* B948B0 80241470 3C014054 */ lui $at, 0x4054 -/* B948B4 80241474 44810800 */ mtc1 $at, $f1 -/* B948B8 80241478 44800000 */ mtc1 $zero, $f0 -/* B948BC 8024147C 460010A1 */ cvt.d.s $f2, $f2 -/* B948C0 80241480 4622003C */ c.lt.d $f0, $f2 -/* B948C4 80241484 00000000 */ nop -/* B948C8 80241488 45000011 */ bc1f .L802414D0 -/* B948CC 8024148C 00000000 */ nop -/* B948D0 80241490 3C01405E */ lui $at, 0x405e -/* B948D4 80241494 44810800 */ mtc1 $at, $f1 -/* B948D8 80241498 44800000 */ mtc1 $zero, $f0 -/* B948DC 8024149C 00000000 */ nop -/* B948E0 802414A0 4620103C */ c.lt.d $f2, $f0 -/* B948E4 802414A4 00000000 */ nop -/* B948E8 802414A8 45000009 */ bc1f .L802414D0 -/* B948EC 802414AC 00000000 */ nop -/* B948F0 802414B0 C622003C */ lwc1 $f2, 0x3c($s1) -/* B948F4 802414B4 C7A00030 */ lwc1 $f0, 0x30($sp) -/* B948F8 802414B8 46001032 */ c.eq.s $f2, $f0 -/* B948FC 802414BC 00000000 */ nop -/* B94900 802414C0 45010003 */ bc1t .L802414D0 -/* B94904 802414C4 00000000 */ nop -/* B94908 802414C8 080905AD */ j .L802416B4 -/* B9490C 802414CC 241E0001 */ addiu $fp, $zero, 1 -.L802414D0: -/* B94910 802414D0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) -/* B94914 802414D4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) -/* B94918 802414D8 8E020000 */ lw $v0, ($s0) -/* B9491C 802414DC 3C014024 */ lui $at, 0x4024 -/* B94920 802414E0 44811800 */ mtc1 $at, $f3 -/* B94924 802414E4 44801000 */ mtc1 $zero, $f2 -/* B94928 802414E8 C440002C */ lwc1 $f0, 0x2c($v0) -/* B9492C 802414EC C4460028 */ lwc1 $f6, 0x28($v0) -/* B94930 802414F0 C4440030 */ lwc1 $f4, 0x30($v0) -/* B94934 802414F4 46000021 */ cvt.d.s $f0, $f0 -/* B94938 802414F8 46220000 */ add.d $f0, $f0, $f2 -/* B9493C 802414FC E7A60020 */ swc1 $f6, 0x20($sp) -/* B94940 80241500 E7A40028 */ swc1 $f4, 0x28($sp) -/* B94944 80241504 46200020 */ cvt.s.d $f0, $f0 -/* B94948 80241508 E7A00024 */ swc1 $f0, 0x24($sp) -/* B9494C 8024150C E7B40010 */ swc1 $f20, 0x10($sp) -/* B94950 80241510 E7B60014 */ swc1 $f22, 0x14($sp) -/* B94954 80241514 862200A8 */ lh $v0, 0xa8($s1) -/* B94958 80241518 27A50020 */ addiu $a1, $sp, 0x20 -/* B9495C 8024151C 44820000 */ mtc1 $v0, $f0 -/* B94960 80241520 00000000 */ nop -/* B94964 80241524 46800020 */ cvt.s.w $f0, $f0 -/* B94968 80241528 E7A00018 */ swc1 $f0, 0x18($sp) -/* B9496C 8024152C 862200A6 */ lh $v0, 0xa6($s1) -/* B94970 80241530 27A60024 */ addiu $a2, $sp, 0x24 -/* B94974 80241534 44820000 */ mtc1 $v0, $f0 -/* B94978 80241538 00000000 */ nop -/* B9497C 8024153C 46800020 */ cvt.s.w $f0, $f0 -/* B94980 80241540 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B94984 80241544 8E240080 */ lw $a0, 0x80($s1) -/* B94988 80241548 0C037711 */ jal func_800DDC44 -/* B9498C 8024154C 27A70028 */ addiu $a3, $sp, 0x28 -/* B94990 80241550 8FA60020 */ lw $a2, 0x20($sp) -/* B94994 80241554 8E020000 */ lw $v0, ($s0) -/* B94998 80241558 8FA70028 */ lw $a3, 0x28($sp) -/* B9499C 8024155C C44C0028 */ lwc1 $f12, 0x28($v0) -/* B949A0 80241560 C44E0030 */ lwc1 $f14, 0x30($v0) -/* B949A4 80241564 0C00A7B5 */ jal dist2D -/* B949A8 80241568 24170001 */ addiu $s7, $zero, 1 -/* B949AC 8024156C 46000506 */ mov.s $f20, $f0 -/* B949B0 80241570 8E030000 */ lw $v1, ($s0) -/* B949B4 80241574 862200A6 */ lh $v0, 0xa6($s1) -/* B949B8 80241578 4407C000 */ mfc1 $a3, $f24 -/* B949BC 8024157C 44824000 */ mtc1 $v0, $f8 -/* B949C0 80241580 00000000 */ nop -/* B949C4 80241584 46804220 */ cvt.s.w $f8, $f8 -/* B949C8 80241588 C4600028 */ lwc1 $f0, 0x28($v1) -/* B949CC 8024158C 44064000 */ mfc1 $a2, $f8 -/* B949D0 80241590 26240038 */ addiu $a0, $s1, 0x38 -/* B949D4 80241594 E6200038 */ swc1 $f0, 0x38($s1) -/* B949D8 80241598 C4600030 */ lwc1 $f0, 0x30($v1) -/* B949DC 8024159C 26250040 */ addiu $a1, $s1, 0x40 -/* B949E0 802415A0 0C00A7E7 */ jal add_vec2D_polar -/* B949E4 802415A4 E6200040 */ swc1 $f0, 0x40($s1) -/* B949E8 802415A8 862200A6 */ lh $v0, 0xa6($s1) -/* B949EC 802415AC 44820000 */ mtc1 $v0, $f0 -/* B949F0 802415B0 00000000 */ nop -/* B949F4 802415B4 46800020 */ cvt.s.w $f0, $f0 -/* B949F8 802415B8 080905A9 */ j .L802416A4 -/* B949FC 802415BC 4600A500 */ add.s $f20, $f20, $f0 -.L802415C0: -/* B94A00 802415C0 8EA20000 */ lw $v0, ($s5) -/* B94A04 802415C4 3C014032 */ lui $at, 0x4032 -/* B94A08 802415C8 44811800 */ mtc1 $at, $f3 -/* B94A0C 802415CC 44801000 */ mtc1 $zero, $f2 -/* B94A10 802415D0 C440002C */ lwc1 $f0, 0x2c($v0) -/* B94A14 802415D4 C4460028 */ lwc1 $f6, 0x28($v0) -/* B94A18 802415D8 C4440030 */ lwc1 $f4, 0x30($v0) -/* B94A1C 802415DC 46000021 */ cvt.d.s $f0, $f0 -/* B94A20 802415E0 46220000 */ add.d $f0, $f0, $f2 -/* B94A24 802415E4 E7A60020 */ swc1 $f6, 0x20($sp) -/* B94A28 802415E8 E7A40028 */ swc1 $f4, 0x28($sp) -/* B94A2C 802415EC 46200020 */ cvt.s.d $f0, $f0 -/* B94A30 802415F0 E7A00024 */ swc1 $f0, 0x24($sp) -/* B94A34 802415F4 E7B40010 */ swc1 $f20, 0x10($sp) -/* B94A38 802415F8 E7B60014 */ swc1 $f22, 0x14($sp) -/* B94A3C 802415FC 862200A8 */ lh $v0, 0xa8($s1) -/* B94A40 80241600 44820000 */ mtc1 $v0, $f0 -/* B94A44 80241604 00000000 */ nop -/* B94A48 80241608 46800020 */ cvt.s.w $f0, $f0 -/* B94A4C 8024160C E7A00018 */ swc1 $f0, 0x18($sp) -/* B94A50 80241610 862200A6 */ lh $v0, 0xa6($s1) -/* B94A54 80241614 27A60024 */ addiu $a2, $sp, 0x24 -/* B94A58 80241618 44820000 */ mtc1 $v0, $f0 -/* B94A5C 8024161C 00000000 */ nop -/* B94A60 80241620 46800020 */ cvt.s.w $f0, $f0 -/* B94A64 80241624 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B94A68 80241628 8E240080 */ lw $a0, 0x80($s1) -/* B94A6C 8024162C 0C037711 */ jal func_800DDC44 -/* B94A70 80241630 27A70028 */ addiu $a3, $sp, 0x28 -/* B94A74 80241634 1040001F */ beqz $v0, .L802416B4 -/* B94A78 80241638 00000000 */ nop -/* B94A7C 8024163C 8FA60020 */ lw $a2, 0x20($sp) -/* B94A80 80241640 8EA20000 */ lw $v0, ($s5) -/* B94A84 80241644 8FA70028 */ lw $a3, 0x28($sp) -/* B94A88 80241648 C44C0028 */ lwc1 $f12, 0x28($v0) -/* B94A8C 8024164C 0C00A7B5 */ jal dist2D -/* B94A90 80241650 C44E0030 */ lwc1 $f14, 0x30($v0) -/* B94A94 80241654 46000506 */ mov.s $f20, $f0 -/* B94A98 80241658 8EA30000 */ lw $v1, ($s5) -/* B94A9C 8024165C 862200A6 */ lh $v0, 0xa6($s1) -/* B94AA0 80241660 4407C000 */ mfc1 $a3, $f24 -/* B94AA4 80241664 44824000 */ mtc1 $v0, $f8 -/* B94AA8 80241668 00000000 */ nop -/* B94AAC 8024166C 46804220 */ cvt.s.w $f8, $f8 -/* B94AB0 80241670 C4600028 */ lwc1 $f0, 0x28($v1) -/* B94AB4 80241674 44064000 */ mfc1 $a2, $f8 -/* B94AB8 80241678 0200202D */ daddu $a0, $s0, $zero -/* B94ABC 8024167C E6200038 */ swc1 $f0, 0x38($s1) -/* B94AC0 80241680 C4600030 */ lwc1 $f0, 0x30($v1) -/* B94AC4 80241684 0260282D */ daddu $a1, $s3, $zero -/* B94AC8 80241688 0C00A7E7 */ jal add_vec2D_polar -/* B94ACC 8024168C E6200040 */ swc1 $f0, 0x40($s1) -/* B94AD0 80241690 862200A6 */ lh $v0, 0xa6($s1) -/* B94AD4 80241694 44820000 */ mtc1 $v0, $f0 -/* B94AD8 80241698 00000000 */ nop -/* B94ADC 8024169C 46800020 */ cvt.s.w $f0, $f0 -/* B94AE0 802416A0 4600A500 */ add.s $f20, $f20, $f0 -.L802416A4: -/* B94AE4 802416A4 4406B000 */ mfc1 $a2, $f22 -/* B94AE8 802416A8 4405A000 */ mfc1 $a1, $f20 -/* B94AEC 802416AC 0C00EA95 */ jal npc_move_heading -/* B94AF0 802416B0 0220202D */ daddu $a0, $s1, $zero -.L802416B4: -/* B94AF4 802416B4 C6400008 */ lwc1 $f0, 8($s2) -/* B94AF8 802416B8 46800020 */ cvt.s.w $f0, $f0 -/* B94AFC 802416BC 44050000 */ mfc1 $a1, $f0 -/* B94B00 802416C0 C640000C */ lwc1 $f0, 0xc($s2) -/* B94B04 802416C4 46800020 */ cvt.s.w $f0, $f0 -/* B94B08 802416C8 44060000 */ mfc1 $a2, $f0 -/* B94B0C 802416CC C6200040 */ lwc1 $f0, 0x40($s1) -/* B94B10 802416D0 26300038 */ addiu $s0, $s1, 0x38 -/* B94B14 802416D4 E7A00010 */ swc1 $f0, 0x10($sp) -/* B94B18 802416D8 C6400010 */ lwc1 $f0, 0x10($s2) -/* B94B1C 802416DC 46800020 */ cvt.s.w $f0, $f0 -/* B94B20 802416E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* B94B24 802416E4 C6400014 */ lwc1 $f0, 0x14($s2) -/* B94B28 802416E8 46800020 */ cvt.s.w $f0, $f0 -/* B94B2C 802416EC E7A00018 */ swc1 $f0, 0x18($sp) -/* B94B30 802416F0 8E440004 */ lw $a0, 4($s2) -/* B94B34 802416F4 8E270038 */ lw $a3, 0x38($s1) -/* B94B38 802416F8 0C0123F5 */ jal is_point_within_region -/* B94B3C 802416FC 26330040 */ addiu $s3, $s1, 0x40 -/* B94B40 80241700 1040005A */ beqz $v0, .L8024186C -/* B94B44 80241704 00000000 */ nop -/* B94B48 80241708 8E430004 */ lw $v1, 4($s2) -/* B94B4C 8024170C 10600005 */ beqz $v1, .L80241724 -/* B94B50 80241710 24020001 */ addiu $v0, $zero, 1 -/* B94B54 80241714 10620029 */ beq $v1, $v0, .L802417BC -/* B94B58 80241718 00000000 */ nop -/* B94B5C 8024171C 0809061B */ j .L8024186C -/* B94B60 80241720 00000000 */ nop -.L80241724: -/* B94B64 80241724 C6480008 */ lwc1 $f8, 8($s2) -/* B94B68 80241728 46804220 */ cvt.s.w $f8, $f8 -/* B94B6C 8024172C 44064000 */ mfc1 $a2, $f8 -/* B94B70 80241730 C648000C */ lwc1 $f8, 0xc($s2) -/* B94B74 80241734 46804220 */ cvt.s.w $f8, $f8 -/* B94B78 80241738 C62C0038 */ lwc1 $f12, 0x38($s1) -/* B94B7C 8024173C C62E0040 */ lwc1 $f14, 0x40($s1) -/* B94B80 80241740 44074000 */ mfc1 $a3, $f8 -/* B94B84 80241744 0C00A7B5 */ jal dist2D -/* B94B88 80241748 00000000 */ nop -/* B94B8C 8024174C C6420010 */ lwc1 $f2, 0x10($s2) -/* B94B90 80241750 468010A0 */ cvt.s.w $f2, $f2 -/* B94B94 80241754 4600103C */ c.lt.s $f2, $f0 -/* B94B98 80241758 00000000 */ nop -/* B94B9C 8024175C 45000043 */ bc1f .L8024186C -/* B94BA0 80241760 E7A00038 */ swc1 $f0, 0x38($sp) -/* B94BA4 80241764 C64C0008 */ lwc1 $f12, 8($s2) -/* B94BA8 80241768 46806320 */ cvt.s.w $f12, $f12 -/* B94BAC 8024176C 8E260038 */ lw $a2, 0x38($s1) -/* B94BB0 80241770 8E270040 */ lw $a3, 0x40($s1) -/* B94BB4 80241774 C64E000C */ lwc1 $f14, 0xc($s2) -/* B94BB8 80241778 0C00A720 */ jal atan2 -/* B94BBC 8024177C 468073A0 */ cvt.s.w $f14, $f14 -/* B94BC0 80241780 0200202D */ daddu $a0, $s0, $zero -/* B94BC4 80241784 44070000 */ mfc1 $a3, $f0 -/* B94BC8 80241788 C6400008 */ lwc1 $f0, 8($s2) -/* B94BCC 8024178C 46800020 */ cvt.s.w $f0, $f0 -/* B94BD0 80241790 E6200038 */ swc1 $f0, 0x38($s1) -/* B94BD4 80241794 C640000C */ lwc1 $f0, 0xc($s2) -/* B94BD8 80241798 46800020 */ cvt.s.w $f0, $f0 -/* B94BDC 8024179C E6200040 */ swc1 $f0, 0x40($s1) -/* B94BE0 802417A0 C6480010 */ lwc1 $f8, 0x10($s2) -/* B94BE4 802417A4 46804220 */ cvt.s.w $f8, $f8 -/* B94BE8 802417A8 44064000 */ mfc1 $a2, $f8 -/* B94BEC 802417AC 0C00A7E7 */ jal add_vec2D_polar -/* B94BF0 802417B0 0260282D */ daddu $a1, $s3, $zero -/* B94BF4 802417B4 0809061B */ j .L8024186C -/* B94BF8 802417B8 00000000 */ nop -.L802417BC: -/* B94BFC 802417BC 8E420008 */ lw $v0, 8($s2) -/* B94C00 802417C0 8E430010 */ lw $v1, 0x10($s2) -/* B94C04 802417C4 C6200038 */ lwc1 $f0, 0x38($s1) -/* B94C08 802417C8 00431021 */ addu $v0, $v0, $v1 -/* B94C0C 802417CC 44821000 */ mtc1 $v0, $f2 -/* B94C10 802417D0 00000000 */ nop -/* B94C14 802417D4 468010A0 */ cvt.s.w $f2, $f2 -/* B94C18 802417D8 4600103C */ c.lt.s $f2, $f0 -/* B94C1C 802417DC 00000000 */ nop -/* B94C20 802417E0 45030001 */ bc1tl .L802417E8 -/* B94C24 802417E4 E6220038 */ swc1 $f2, 0x38($s1) -.L802417E8: -/* B94C28 802417E8 8E420008 */ lw $v0, 8($s2) -/* B94C2C 802417EC 8E430010 */ lw $v1, 0x10($s2) -/* B94C30 802417F0 C6200038 */ lwc1 $f0, 0x38($s1) -/* B94C34 802417F4 00431023 */ subu $v0, $v0, $v1 -/* B94C38 802417F8 44821000 */ mtc1 $v0, $f2 -/* B94C3C 802417FC 00000000 */ nop -/* B94C40 80241800 468010A0 */ cvt.s.w $f2, $f2 -/* B94C44 80241804 4602003C */ c.lt.s $f0, $f2 -/* B94C48 80241808 00000000 */ nop -/* B94C4C 8024180C 45030001 */ bc1tl .L80241814 -/* B94C50 80241810 E6220038 */ swc1 $f2, 0x38($s1) -.L80241814: -/* B94C54 80241814 8E42000C */ lw $v0, 0xc($s2) -/* B94C58 80241818 8E430014 */ lw $v1, 0x14($s2) -/* B94C5C 8024181C C6200040 */ lwc1 $f0, 0x40($s1) -/* B94C60 80241820 00431021 */ addu $v0, $v0, $v1 -/* B94C64 80241824 44821000 */ mtc1 $v0, $f2 -/* B94C68 80241828 00000000 */ nop -/* B94C6C 8024182C 468010A0 */ cvt.s.w $f2, $f2 -/* B94C70 80241830 4600103C */ c.lt.s $f2, $f0 -/* B94C74 80241834 00000000 */ nop -/* B94C78 80241838 45030001 */ bc1tl .L80241840 -/* B94C7C 8024183C E6220040 */ swc1 $f2, 0x40($s1) -.L80241840: -/* B94C80 80241840 8E42000C */ lw $v0, 0xc($s2) -/* B94C84 80241844 8E430014 */ lw $v1, 0x14($s2) -/* B94C88 80241848 C6200040 */ lwc1 $f0, 0x40($s1) -/* B94C8C 8024184C 00431023 */ subu $v0, $v0, $v1 -/* B94C90 80241850 44821000 */ mtc1 $v0, $f2 -/* B94C94 80241854 00000000 */ nop -/* B94C98 80241858 468010A0 */ cvt.s.w $f2, $f2 -/* B94C9C 8024185C 4602003C */ c.lt.s $f0, $f2 -/* B94CA0 80241860 00000000 */ nop -/* B94CA4 80241864 45030001 */ bc1tl .L8024186C -/* B94CA8 80241868 E6220040 */ swc1 $f2, 0x40($s1) -.L8024186C: -/* B94CAC 8024186C 16E0001F */ bnez $s7, .L802418EC -/* B94CB0 80241870 00000000 */ nop -/* B94CB4 80241874 8E220000 */ lw $v0, ($s1) -/* B94CB8 80241878 30420008 */ andi $v0, $v0, 8 -/* B94CBC 8024187C 10400003 */ beqz $v0, .L8024188C -/* B94CC0 80241880 27A50020 */ addiu $a1, $sp, 0x20 -/* B94CC4 80241884 13C00019 */ beqz $fp, .L802418EC -/* B94CC8 80241888 00000000 */ nop -.L8024188C: -/* B94CCC 8024188C 27A60024 */ addiu $a2, $sp, 0x24 -/* B94CD0 80241890 27A20038 */ addiu $v0, $sp, 0x38 -/* B94CD4 80241894 C6220038 */ lwc1 $f2, 0x38($s1) -/* B94CD8 80241898 C620003C */ lwc1 $f0, 0x3c($s1) -/* B94CDC 8024189C 3C0143C8 */ lui $at, 0x43c8 -/* B94CE0 802418A0 44813000 */ mtc1 $at, $f6 -/* B94CE4 802418A4 46000021 */ cvt.d.s $f0, $f0 -/* B94CE8 802418A8 E7A20020 */ swc1 $f2, 0x20($sp) -/* B94CEC 802418AC 3C018024 */ lui $at, 0x8024 -/* B94CF0 802418B0 D42247B0 */ ldc1 $f2, 0x47b0($at) -/* B94CF4 802418B4 C6240040 */ lwc1 $f4, 0x40($s1) -/* B94CF8 802418B8 46220000 */ add.d $f0, $f0, $f2 -/* B94CFC 802418BC E7A60038 */ swc1 $f6, 0x38($sp) -/* B94D00 802418C0 E7A40028 */ swc1 $f4, 0x28($sp) -/* B94D04 802418C4 46200020 */ cvt.s.d $f0, $f0 -/* B94D08 802418C8 E7A00024 */ swc1 $f0, 0x24($sp) -/* B94D0C 802418CC AFA20010 */ sw $v0, 0x10($sp) -/* B94D10 802418D0 8E240080 */ lw $a0, 0x80($s1) -/* B94D14 802418D4 0C0372DF */ jal func_800DCB7C -/* B94D18 802418D8 27A70028 */ addiu $a3, $sp, 0x28 -/* B94D1C 802418DC 10400003 */ beqz $v0, .L802418EC -/* B94D20 802418E0 00000000 */ nop -/* B94D24 802418E4 C7A00024 */ lwc1 $f0, 0x24($sp) -/* B94D28 802418E8 E620003C */ swc1 $f0, 0x3c($s1) -.L802418EC: -/* B94D2C 802418EC C62C0038 */ lwc1 $f12, 0x38($s1) -/* B94D30 802418F0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B94D34 802418F4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B94D38 802418F8 C62E0040 */ lwc1 $f14, 0x40($s1) -/* B94D3C 802418FC 8C460028 */ lw $a2, 0x28($v0) -/* B94D40 80241900 0C00A720 */ jal atan2 -/* B94D44 80241904 8C470030 */ lw $a3, 0x30($v0) -/* B94D48 80241908 0220202D */ daddu $a0, $s1, $zero -/* B94D4C 8024190C 24050321 */ addiu $a1, $zero, 0x321 -/* B94D50 80241910 0000302D */ daddu $a2, $zero, $zero -/* B94D54 80241914 0C012530 */ jal func_800494C0 -/* B94D58 80241918 E620000C */ swc1 $f0, 0xc($s1) -/* B94D5C 8024191C 8EC200CC */ lw $v0, 0xcc($s6) -/* B94D60 80241920 8C420024 */ lw $v0, 0x24($v0) -/* B94D64 80241924 AE220028 */ sw $v0, 0x28($s1) -/* B94D68 80241928 96C20096 */ lhu $v0, 0x96($s6) -/* B94D6C 8024192C A622008E */ sh $v0, 0x8e($s1) -/* B94D70 80241930 8FA80080 */ lw $t0, 0x80($sp) -/* B94D74 80241934 2402000B */ addiu $v0, $zero, 0xb -/* B94D78 80241938 AD020070 */ sw $v0, 0x70($t0) -.L8024193C: -/* B94D7C 8024193C 8FBF0064 */ lw $ra, 0x64($sp) -/* B94D80 80241940 8FBE0060 */ lw $fp, 0x60($sp) -/* B94D84 80241944 8FB7005C */ lw $s7, 0x5c($sp) -/* B94D88 80241948 8FB60058 */ lw $s6, 0x58($sp) -/* B94D8C 8024194C 8FB50054 */ lw $s5, 0x54($sp) -/* B94D90 80241950 8FB40050 */ lw $s4, 0x50($sp) -/* B94D94 80241954 8FB3004C */ lw $s3, 0x4c($sp) -/* B94D98 80241958 8FB20048 */ lw $s2, 0x48($sp) -/* B94D9C 8024195C 8FB10044 */ lw $s1, 0x44($sp) -/* B94DA0 80241960 8FB00040 */ lw $s0, 0x40($sp) -/* B94DA4 80241964 D7B80078 */ ldc1 $f24, 0x78($sp) -/* B94DA8 80241968 D7B60070 */ ldc1 $f22, 0x70($sp) -/* B94DAC 8024196C D7B40068 */ ldc1 $f20, 0x68($sp) -/* B94DB0 80241970 03E00008 */ jr $ra -/* B94DB4 80241974 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s new file mode 100644 index 0000000000..726a545931 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80240F38_B94378.s @@ -0,0 +1,688 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F38_B94378 +/* B94378 80240F38 27BDFF80 */ addiu $sp, $sp, -0x80 +/* B9437C 80240F3C AFBF0064 */ sw $ra, 0x64($sp) +/* B94380 80240F40 AFBE0060 */ sw $fp, 0x60($sp) +/* B94384 80240F44 AFB7005C */ sw $s7, 0x5c($sp) +/* B94388 80240F48 AFB60058 */ sw $s6, 0x58($sp) +/* B9438C 80240F4C AFB50054 */ sw $s5, 0x54($sp) +/* B94390 80240F50 AFB40050 */ sw $s4, 0x50($sp) +/* B94394 80240F54 AFB3004C */ sw $s3, 0x4c($sp) +/* B94398 80240F58 AFB20048 */ sw $s2, 0x48($sp) +/* B9439C 80240F5C AFB10044 */ sw $s1, 0x44($sp) +/* B943A0 80240F60 AFB00040 */ sw $s0, 0x40($sp) +/* B943A4 80240F64 F7B80078 */ sdc1 $f24, 0x78($sp) +/* B943A8 80240F68 F7B60070 */ sdc1 $f22, 0x70($sp) +/* B943AC 80240F6C F7B40068 */ sdc1 $f20, 0x68($sp) +/* B943B0 80240F70 AFA40080 */ sw $a0, 0x80($sp) +/* B943B4 80240F74 8C960148 */ lw $s6, 0x148($a0) +/* B943B8 80240F78 00C0902D */ daddu $s2, $a2, $zero +/* B943BC 80240F7C 86C40008 */ lh $a0, 8($s6) +/* B943C0 80240F80 0C00EABB */ jal get_npc_unsafe +/* B943C4 80240F84 0000B82D */ daddu $s7, $zero, $zero +/* B943C8 80240F88 0040882D */ daddu $s1, $v0, $zero +/* B943CC 80240F8C 9622008E */ lhu $v0, 0x8e($s1) +/* B943D0 80240F90 2442FFFF */ addiu $v0, $v0, -1 +/* B943D4 80240F94 A622008E */ sh $v0, 0x8e($s1) +/* B943D8 80240F98 00021400 */ sll $v0, $v0, 0x10 +/* B943DC 80240F9C 8EC30090 */ lw $v1, 0x90($s6) +/* B943E0 80240FA0 00021403 */ sra $v0, $v0, 0x10 +/* B943E4 80240FA4 0062182A */ slt $v1, $v1, $v0 +/* B943E8 80240FA8 14600005 */ bnez $v1, .L80240FC0 +/* B943EC 80240FAC 02E0F02D */ daddu $fp, $s7, $zero +/* B943F0 80240FB0 8EC20000 */ lw $v0, ($s6) +/* B943F4 80240FB4 3C031F10 */ lui $v1, 0x1f10 +/* B943F8 80240FB8 00431025 */ or $v0, $v0, $v1 +/* B943FC 80240FBC AEC20000 */ sw $v0, ($s6) +.L80240FC0: +/* B94400 80240FC0 8622008E */ lh $v0, 0x8e($s1) +/* B94404 80240FC4 1440025D */ bnez $v0, .L8024193C +/* B94408 80240FC8 00000000 */ nop +/* B9440C 80240FCC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B94410 80240FD0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B94414 80240FD4 0C00A6C9 */ jal clamp_angle +/* B94418 80240FD8 C44C00A8 */ lwc1 $f12, 0xa8($v0) +/* B9441C 80240FDC 3C014334 */ lui $at, 0x4334 +/* B94420 80240FE0 44811000 */ mtc1 $at, $f2 +/* B94424 80240FE4 00000000 */ nop +/* B94428 80240FE8 4602003C */ c.lt.s $f0, $f2 +/* B9442C 80240FEC 00000000 */ nop +/* B94430 80240FF0 45000011 */ bc1f .L80241038 +/* B94434 80240FF4 00000000 */ nop +/* B94438 80240FF8 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* B9443C 80240FFC 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* B94440 80241000 3C0142B4 */ lui $at, 0x42b4 +/* B94444 80241004 44816000 */ mtc1 $at, $f12 +/* B94448 80241008 00031080 */ sll $v0, $v1, 2 +/* B9444C 8024100C 00431021 */ addu $v0, $v0, $v1 +/* B94450 80241010 00021080 */ sll $v0, $v0, 2 +/* B94454 80241014 00431023 */ subu $v0, $v0, $v1 +/* B94458 80241018 000218C0 */ sll $v1, $v0, 3 +/* B9445C 8024101C 00431021 */ addu $v0, $v0, $v1 +/* B94460 80241020 000210C0 */ sll $v0, $v0, 3 +/* B94464 80241024 3C01800B */ lui $at, 0x800b +/* B94468 80241028 00220821 */ addu $at, $at, $v0 +/* B9446C 8024102C C4201DEC */ lwc1 $f0, 0x1dec($at) +/* B94470 80241030 0809041D */ j .L80241074 +/* B94474 80241034 460C0301 */ sub.s $f12, $f0, $f12 +.L80241038: +/* B94478 80241038 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* B9447C 8024103C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* B94480 80241040 3C0142B4 */ lui $at, 0x42b4 +/* B94484 80241044 44816000 */ mtc1 $at, $f12 +/* B94488 80241048 00031080 */ sll $v0, $v1, 2 +/* B9448C 8024104C 00431021 */ addu $v0, $v0, $v1 +/* B94490 80241050 00021080 */ sll $v0, $v0, 2 +/* B94494 80241054 00431023 */ subu $v0, $v0, $v1 +/* B94498 80241058 000218C0 */ sll $v1, $v0, 3 +/* B9449C 8024105C 00431021 */ addu $v0, $v0, $v1 +/* B944A0 80241060 000210C0 */ sll $v0, $v0, 3 +/* B944A4 80241064 3C01800B */ lui $at, 0x800b +/* B944A8 80241068 00220821 */ addu $at, $at, $v0 +/* B944AC 8024106C C4201DEC */ lwc1 $f0, 0x1dec($at) +/* B944B0 80241070 460C0300 */ add.s $f12, $f0, $f12 +.L80241074: +/* B944B4 80241074 0C00A6C9 */ jal clamp_angle +/* B944B8 80241078 00000000 */ nop +/* B944BC 8024107C 46000586 */ mov.s $f22, $f0 +/* B944C0 80241080 3C014334 */ lui $at, 0x4334 +/* B944C4 80241084 44816000 */ mtc1 $at, $f12 +/* B944C8 80241088 0C00A6C9 */ jal clamp_angle +/* B944CC 8024108C 460CB300 */ add.s $f12, $f22, $f12 +/* B944D0 80241090 8EC20088 */ lw $v0, 0x88($s6) +/* B944D4 80241094 14400010 */ bnez $v0, .L802410D8 +/* B944D8 80241098 46000606 */ mov.s $f24, $f0 +/* B944DC 8024109C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B944E0 802410A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B944E4 802410A4 804300B4 */ lb $v1, 0xb4($v0) +/* B944E8 802410A8 3C014200 */ lui $at, 0x4200 +/* B944EC 802410AC 4481A000 */ mtc1 $at, $f20 +/* B944F0 802410B0 10600016 */ beqz $v1, .L8024110C +/* B944F4 802410B4 24020001 */ addiu $v0, $zero, 1 +/* B944F8 802410B8 3C0142C8 */ lui $at, 0x42c8 +/* B944FC 802410BC 4481A000 */ mtc1 $at, $f20 +/* B94500 802410C0 14620013 */ bne $v1, $v0, .L80241110 +/* B94504 802410C4 26300038 */ addiu $s0, $s1, 0x38 +/* B94508 802410C8 3C0142B4 */ lui $at, 0x42b4 +/* B9450C 802410CC 4481A000 */ mtc1 $at, $f20 +/* B94510 802410D0 08090445 */ j .L80241114 +/* B94514 802410D4 0200202D */ daddu $a0, $s0, $zero +.L802410D8: +/* B94518 802410D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B9451C 802410DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B94520 802410E0 804300B4 */ lb $v1, 0xb4($v0) +/* B94524 802410E4 3C014218 */ lui $at, 0x4218 +/* B94528 802410E8 4481A000 */ mtc1 $at, $f20 +/* B9452C 802410EC 10600007 */ beqz $v1, .L8024110C +/* B94530 802410F0 24020001 */ addiu $v0, $zero, 1 +/* B94534 802410F4 3C0142B4 */ lui $at, 0x42b4 +/* B94538 802410F8 4481A000 */ mtc1 $at, $f20 +/* B9453C 802410FC 14620004 */ bne $v1, $v0, .L80241110 +/* B94540 80241100 26300038 */ addiu $s0, $s1, 0x38 +/* B94544 80241104 3C014296 */ lui $at, 0x4296 +/* B94548 80241108 4481A000 */ mtc1 $at, $f20 +.L8024110C: +/* B9454C 8024110C 26300038 */ addiu $s0, $s1, 0x38 +.L80241110: +/* B94550 80241110 0200202D */ daddu $a0, $s0, $zero +.L80241114: +/* B94554 80241114 3C15800F */ lui $s5, %hi(gPlayerStatusPtr) +/* B94558 80241118 26B57B30 */ addiu $s5, $s5, %lo(gPlayerStatusPtr) +/* B9455C 8024111C 4407C000 */ mfc1 $a3, $f24 +/* B94560 80241120 862200A6 */ lh $v0, 0xa6($s1) +/* B94564 80241124 8EA30000 */ lw $v1, ($s5) +/* B94568 80241128 44824000 */ mtc1 $v0, $f8 +/* B9456C 8024112C 00000000 */ nop +/* B94570 80241130 46804220 */ cvt.s.w $f8, $f8 +/* B94574 80241134 C4600028 */ lwc1 $f0, 0x28($v1) +/* B94578 80241138 44064000 */ mfc1 $a2, $f8 +/* B9457C 8024113C 26330040 */ addiu $s3, $s1, 0x40 +/* B94580 80241140 E6200038 */ swc1 $f0, 0x38($s1) +/* B94584 80241144 C4600030 */ lwc1 $f0, 0x30($v1) +/* B94588 80241148 0260282D */ daddu $a1, $s3, $zero +/* B9458C 8024114C 0C00A7E7 */ jal add_vec2D_polar +/* B94590 80241150 E6200040 */ swc1 $f0, 0x40($s1) +/* B94594 80241154 862200A6 */ lh $v0, 0xa6($s1) +/* B94598 80241158 44820000 */ mtc1 $v0, $f0 +/* B9459C 8024115C 00000000 */ nop +/* B945A0 80241160 46800020 */ cvt.s.w $f0, $f0 +/* B945A4 80241164 4600A000 */ add.s $f0, $f20, $f0 +/* B945A8 80241168 4406B000 */ mfc1 $a2, $f22 +/* B945AC 8024116C 44050000 */ mfc1 $a1, $f0 +/* B945B0 80241170 0C00EA95 */ jal npc_move_heading +/* B945B4 80241174 0220202D */ daddu $a0, $s1, $zero +/* B945B8 80241178 8EC20088 */ lw $v0, 0x88($s6) +/* B945BC 8024117C 1440005D */ bnez $v0, .L802412F4 +/* B945C0 80241180 00000000 */ nop +/* B945C4 80241184 C6200038 */ lwc1 $f0, 0x38($s1) +/* B945C8 80241188 3C018024 */ lui $at, 0x8024 +/* B945CC 8024118C D4244788 */ ldc1 $f4, 0x4788($at) +/* B945D0 80241190 46000021 */ cvt.d.s $f0, $f0 +/* B945D4 80241194 4620203C */ c.lt.d $f4, $f0 +/* B945D8 80241198 00000000 */ nop +/* B945DC 8024119C 45000005 */ bc1f .L802411B4 +/* B945E0 802411A0 00000000 */ nop +/* B945E4 802411A4 3C0143BE */ lui $at, 0x43be +/* B945E8 802411A8 44810000 */ mtc1 $at, $f0 +/* B945EC 802411AC 00000000 */ nop +/* B945F0 802411B0 E6200038 */ swc1 $f0, 0x38($s1) +.L802411B4: +/* B945F4 802411B4 C6200038 */ lwc1 $f0, 0x38($s1) +/* B945F8 802411B8 3C018024 */ lui $at, 0x8024 +/* B945FC 802411BC D4224790 */ ldc1 $f2, 0x4790($at) +/* B94600 802411C0 46000021 */ cvt.d.s $f0, $f0 +/* B94604 802411C4 4622003C */ c.lt.d $f0, $f2 +/* B94608 802411C8 00000000 */ nop +/* B9460C 802411CC 45000005 */ bc1f .L802411E4 +/* B94610 802411D0 00000000 */ nop +/* B94614 802411D4 3C01C3BE */ lui $at, 0xc3be +/* B94618 802411D8 44810000 */ mtc1 $at, $f0 +/* B9461C 802411DC 00000000 */ nop +/* B94620 802411E0 E6200038 */ swc1 $f0, 0x38($s1) +.L802411E4: +/* B94624 802411E4 C6200040 */ lwc1 $f0, 0x40($s1) +/* B94628 802411E8 46000021 */ cvt.d.s $f0, $f0 +/* B9462C 802411EC 4620203C */ c.lt.d $f4, $f0 +/* B94630 802411F0 00000000 */ nop +/* B94634 802411F4 45000005 */ bc1f .L8024120C +/* B94638 802411F8 00000000 */ nop +/* B9463C 802411FC 3C0143BE */ lui $at, 0x43be +/* B94640 80241200 44810000 */ mtc1 $at, $f0 +/* B94644 80241204 00000000 */ nop +/* B94648 80241208 E6200040 */ swc1 $f0, 0x40($s1) +.L8024120C: +/* B9464C 8024120C C6200040 */ lwc1 $f0, 0x40($s1) +/* B94650 80241210 46000021 */ cvt.d.s $f0, $f0 +/* B94654 80241214 4622003C */ c.lt.d $f0, $f2 +/* B94658 80241218 00000000 */ nop +/* B9465C 8024121C 45000005 */ bc1f .L80241234 +/* B94660 80241220 00000000 */ nop +/* B94664 80241224 3C01C3BE */ lui $at, 0xc3be +/* B94668 80241228 44810000 */ mtc1 $at, $f0 +/* B9466C 8024122C 00000000 */ nop +/* B94670 80241230 E6200040 */ swc1 $f0, 0x40($s1) +.L80241234: +/* B94674 80241234 C6220038 */ lwc1 $f2, 0x38($s1) +/* B94678 80241238 46021082 */ mul.s $f2, $f2, $f2 +/* B9467C 8024123C 00000000 */ nop +/* B94680 80241240 C6200040 */ lwc1 $f0, 0x40($s1) +/* B94684 80241244 46000002 */ mul.s $f0, $f0, $f0 +/* B94688 80241248 00000000 */ nop +/* B9468C 8024124C 46001300 */ add.s $f12, $f2, $f0 +/* B94690 80241250 46006004 */ sqrt.s $f0, $f12 +/* B94694 80241254 46000032 */ c.eq.s $f0, $f0 +/* B94698 80241258 00000000 */ nop +/* B9469C 8024125C 45010003 */ bc1t .L8024126C +/* B946A0 80241260 00000000 */ nop +/* B946A4 80241264 0C0187BC */ jal sqrtf +/* B946A8 80241268 00000000 */ nop +.L8024126C: +/* B946AC 8024126C 8E260038 */ lw $a2, 0x38($s1) +/* B946B0 80241270 8E270040 */ lw $a3, 0x40($s1) +/* B946B4 80241274 4480A000 */ mtc1 $zero, $f20 +/* B946B8 80241278 E7A00038 */ swc1 $f0, 0x38($sp) +/* B946BC 8024127C 4600A306 */ mov.s $f12, $f20 +/* B946C0 80241280 0C00A720 */ jal atan2 +/* B946C4 80241284 4600A386 */ mov.s $f14, $f20 +/* B946C8 80241288 46000586 */ mov.s $f22, $f0 +/* B946CC 8024128C C7A20038 */ lwc1 $f2, 0x38($sp) +/* B946D0 80241290 3C018024 */ lui $at, 0x8024 +/* B946D4 80241294 D4204798 */ ldc1 $f0, 0x4798($at) +/* B946D8 80241298 460010A1 */ cvt.d.s $f2, $f2 +/* B946DC 8024129C 4620103C */ c.lt.d $f2, $f0 +/* B946E0 802412A0 00000000 */ nop +/* B946E4 802412A4 45000004 */ bc1f .L802412B8 +/* B946E8 802412A8 0200202D */ daddu $a0, $s0, $zero +/* B946EC 802412AC 3C064398 */ lui $a2, 0x4398 +/* B946F0 802412B0 080904B6 */ j .L802412D8 +/* B946F4 802412B4 34C68000 */ ori $a2, $a2, 0x8000 +.L802412B8: +/* B946F8 802412B8 3C018024 */ lui $at, 0x8024 +/* B946FC 802412BC D42047A0 */ ldc1 $f0, 0x47a0($at) +/* B94700 802412C0 4622003C */ c.lt.d $f0, $f2 +/* B94704 802412C4 00000000 */ nop +/* B94708 802412C8 450000FA */ bc1f .L802416B4 +/* B9470C 802412CC 00000000 */ nop +/* B94710 802412D0 3C0643BB */ lui $a2, 0x43bb +/* B94714 802412D4 34C68000 */ ori $a2, $a2, 0x8000 +.L802412D8: +/* B94718 802412D8 4407B000 */ mfc1 $a3, $f22 +/* B9471C 802412DC 0260282D */ daddu $a1, $s3, $zero +/* B94720 802412E0 E6340038 */ swc1 $f20, 0x38($s1) +/* B94724 802412E4 0C00A7E7 */ jal add_vec2D_polar +/* B94728 802412E8 E6340040 */ swc1 $f20, 0x40($s1) +/* B9472C 802412EC 080905AD */ j .L802416B4 +/* B94730 802412F0 00000000 */ nop +.L802412F4: +/* B94734 802412F4 8E220000 */ lw $v0, ($s1) +/* B94738 802412F8 30420040 */ andi $v0, $v0, 0x40 +/* B9473C 802412FC 144000B0 */ bnez $v0, .L802415C0 +/* B94740 80241300 27A50020 */ addiu $a1, $sp, 0x20 +/* B94744 80241304 27B40020 */ addiu $s4, $sp, 0x20 +/* B94748 80241308 0280282D */ daddu $a1, $s4, $zero +/* B9474C 8024130C 27B30024 */ addiu $s3, $sp, 0x24 +/* B94750 80241310 8EA20000 */ lw $v0, ($s5) +/* B94754 80241314 3C014032 */ lui $at, 0x4032 +/* B94758 80241318 44811800 */ mtc1 $at, $f3 +/* B9475C 8024131C 44801000 */ mtc1 $zero, $f2 +/* B94760 80241320 C440002C */ lwc1 $f0, 0x2c($v0) +/* B94764 80241324 C4460028 */ lwc1 $f6, 0x28($v0) +/* B94768 80241328 C4440030 */ lwc1 $f4, 0x30($v0) +/* B9476C 8024132C 46000021 */ cvt.d.s $f0, $f0 +/* B94770 80241330 46220000 */ add.d $f0, $f0, $f2 +/* B94774 80241334 E7A60020 */ swc1 $f6, 0x20($sp) +/* B94778 80241338 E7A40028 */ swc1 $f4, 0x28($sp) +/* B9477C 8024133C 46200020 */ cvt.s.d $f0, $f0 +/* B94780 80241340 E7A00024 */ swc1 $f0, 0x24($sp) +/* B94784 80241344 E7B40010 */ swc1 $f20, 0x10($sp) +/* B94788 80241348 E7B60014 */ swc1 $f22, 0x14($sp) +/* B9478C 8024134C 862200A8 */ lh $v0, 0xa8($s1) +/* B94790 80241350 0260302D */ daddu $a2, $s3, $zero +/* B94794 80241354 44820000 */ mtc1 $v0, $f0 +/* B94798 80241358 00000000 */ nop +/* B9479C 8024135C 46800020 */ cvt.s.w $f0, $f0 +/* B947A0 80241360 E7A00018 */ swc1 $f0, 0x18($sp) +/* B947A4 80241364 862200A6 */ lh $v0, 0xa6($s1) +/* B947A8 80241368 27B00028 */ addiu $s0, $sp, 0x28 +/* B947AC 8024136C 44820000 */ mtc1 $v0, $f0 +/* B947B0 80241370 00000000 */ nop +/* B947B4 80241374 46800020 */ cvt.s.w $f0, $f0 +/* B947B8 80241378 E7A0001C */ swc1 $f0, 0x1c($sp) +/* B947BC 8024137C 8E240080 */ lw $a0, 0x80($s1) +/* B947C0 80241380 0C037711 */ jal func_800DDC44 +/* B947C4 80241384 0200382D */ daddu $a3, $s0, $zero +/* B947C8 80241388 104000CA */ beqz $v0, .L802416B4 +/* B947CC 8024138C 0280282D */ daddu $a1, $s4, $zero +/* B947D0 80241390 8EA20000 */ lw $v0, ($s5) +/* B947D4 80241394 3C018024 */ lui $at, 0x8024 +/* B947D8 80241398 D42247A8 */ ldc1 $f2, 0x47a8($at) +/* B947DC 8024139C C440002C */ lwc1 $f0, 0x2c($v0) +/* B947E0 802413A0 C4460028 */ lwc1 $f6, 0x28($v0) +/* B947E4 802413A4 C4440030 */ lwc1 $f4, 0x30($v0) +/* B947E8 802413A8 46000021 */ cvt.d.s $f0, $f0 +/* B947EC 802413AC 46220000 */ add.d $f0, $f0, $f2 +/* B947F0 802413B0 E7A60020 */ swc1 $f6, 0x20($sp) +/* B947F4 802413B4 E7A40028 */ swc1 $f4, 0x28($sp) +/* B947F8 802413B8 46200020 */ cvt.s.d $f0, $f0 +/* B947FC 802413BC E7A00024 */ swc1 $f0, 0x24($sp) +/* B94800 802413C0 E7B40010 */ swc1 $f20, 0x10($sp) +/* B94804 802413C4 E7B60014 */ swc1 $f22, 0x14($sp) +/* B94808 802413C8 862200A8 */ lh $v0, 0xa8($s1) +/* B9480C 802413CC 44820000 */ mtc1 $v0, $f0 +/* B94810 802413D0 00000000 */ nop +/* B94814 802413D4 46800020 */ cvt.s.w $f0, $f0 +/* B94818 802413D8 E7A00018 */ swc1 $f0, 0x18($sp) +/* B9481C 802413DC 862200A6 */ lh $v0, 0xa6($s1) +/* B94820 802413E0 0260302D */ daddu $a2, $s3, $zero +/* B94824 802413E4 44820000 */ mtc1 $v0, $f0 +/* B94828 802413E8 00000000 */ nop +/* B9482C 802413EC 46800020 */ cvt.s.w $f0, $f0 +/* B94830 802413F0 E7A0001C */ swc1 $f0, 0x1c($sp) +/* B94834 802413F4 8E240080 */ lw $a0, 0x80($s1) +/* B94838 802413F8 0C037711 */ jal func_800DDC44 +/* B9483C 802413FC 0200382D */ daddu $a3, $s0, $zero +/* B94840 80241400 27A5002C */ addiu $a1, $sp, 0x2c +/* B94844 80241404 27A60030 */ addiu $a2, $sp, 0x30 +/* B94848 80241408 27A70034 */ addiu $a3, $sp, 0x34 +/* B9484C 8024140C 27A30038 */ addiu $v1, $sp, 0x38 +/* B94850 80241410 C6220038 */ lwc1 $f2, 0x38($s1) +/* B94854 80241414 C620003C */ lwc1 $f0, 0x3c($s1) +/* B94858 80241418 3C014348 */ lui $at, 0x4348 +/* B9485C 8024141C 44813000 */ mtc1 $at, $f6 +/* B94860 80241420 46000021 */ cvt.d.s $f0, $f0 +/* B94864 80241424 E7A2002C */ swc1 $f2, 0x2c($sp) +/* B94868 80241428 3C014059 */ lui $at, 0x4059 +/* B9486C 8024142C 44811800 */ mtc1 $at, $f3 +/* B94870 80241430 44801000 */ mtc1 $zero, $f2 +/* B94874 80241434 C6240040 */ lwc1 $f4, 0x40($s1) +/* B94878 80241438 46220000 */ add.d $f0, $f0, $f2 +/* B9487C 8024143C E7A60038 */ swc1 $f6, 0x38($sp) +/* B94880 80241440 E7A40034 */ swc1 $f4, 0x34($sp) +/* B94884 80241444 46200020 */ cvt.s.d $f0, $f0 +/* B94888 80241448 E7A00030 */ swc1 $f0, 0x30($sp) +/* B9488C 8024144C AFA30010 */ sw $v1, 0x10($sp) +/* B94890 80241450 8E240080 */ lw $a0, 0x80($s1) +/* B94894 80241454 0C0372DF */ jal func_800DCB7C +/* B94898 80241458 0040802D */ daddu $s0, $v0, $zero +/* B9489C 8024145C 1600001C */ bnez $s0, .L802414D0 +/* B948A0 80241460 00000000 */ nop +/* B948A4 80241464 1040001A */ beqz $v0, .L802414D0 +/* B948A8 80241468 00000000 */ nop +/* B948AC 8024146C C7A20038 */ lwc1 $f2, 0x38($sp) +/* B948B0 80241470 3C014054 */ lui $at, 0x4054 +/* B948B4 80241474 44810800 */ mtc1 $at, $f1 +/* B948B8 80241478 44800000 */ mtc1 $zero, $f0 +/* B948BC 8024147C 460010A1 */ cvt.d.s $f2, $f2 +/* B948C0 80241480 4622003C */ c.lt.d $f0, $f2 +/* B948C4 80241484 00000000 */ nop +/* B948C8 80241488 45000011 */ bc1f .L802414D0 +/* B948CC 8024148C 00000000 */ nop +/* B948D0 80241490 3C01405E */ lui $at, 0x405e +/* B948D4 80241494 44810800 */ mtc1 $at, $f1 +/* B948D8 80241498 44800000 */ mtc1 $zero, $f0 +/* B948DC 8024149C 00000000 */ nop +/* B948E0 802414A0 4620103C */ c.lt.d $f2, $f0 +/* B948E4 802414A4 00000000 */ nop +/* B948E8 802414A8 45000009 */ bc1f .L802414D0 +/* B948EC 802414AC 00000000 */ nop +/* B948F0 802414B0 C622003C */ lwc1 $f2, 0x3c($s1) +/* B948F4 802414B4 C7A00030 */ lwc1 $f0, 0x30($sp) +/* B948F8 802414B8 46001032 */ c.eq.s $f2, $f0 +/* B948FC 802414BC 00000000 */ nop +/* B94900 802414C0 45010003 */ bc1t .L802414D0 +/* B94904 802414C4 00000000 */ nop +/* B94908 802414C8 080905AD */ j .L802416B4 +/* B9490C 802414CC 241E0001 */ addiu $fp, $zero, 1 +.L802414D0: +/* B94910 802414D0 3C10800F */ lui $s0, %hi(gPlayerStatusPtr) +/* B94914 802414D4 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) +/* B94918 802414D8 8E020000 */ lw $v0, ($s0) +/* B9491C 802414DC 3C014024 */ lui $at, 0x4024 +/* B94920 802414E0 44811800 */ mtc1 $at, $f3 +/* B94924 802414E4 44801000 */ mtc1 $zero, $f2 +/* B94928 802414E8 C440002C */ lwc1 $f0, 0x2c($v0) +/* B9492C 802414EC C4460028 */ lwc1 $f6, 0x28($v0) +/* B94930 802414F0 C4440030 */ lwc1 $f4, 0x30($v0) +/* B94934 802414F4 46000021 */ cvt.d.s $f0, $f0 +/* B94938 802414F8 46220000 */ add.d $f0, $f0, $f2 +/* B9493C 802414FC E7A60020 */ swc1 $f6, 0x20($sp) +/* B94940 80241500 E7A40028 */ swc1 $f4, 0x28($sp) +/* B94944 80241504 46200020 */ cvt.s.d $f0, $f0 +/* B94948 80241508 E7A00024 */ swc1 $f0, 0x24($sp) +/* B9494C 8024150C E7B40010 */ swc1 $f20, 0x10($sp) +/* B94950 80241510 E7B60014 */ swc1 $f22, 0x14($sp) +/* B94954 80241514 862200A8 */ lh $v0, 0xa8($s1) +/* B94958 80241518 27A50020 */ addiu $a1, $sp, 0x20 +/* B9495C 8024151C 44820000 */ mtc1 $v0, $f0 +/* B94960 80241520 00000000 */ nop +/* B94964 80241524 46800020 */ cvt.s.w $f0, $f0 +/* B94968 80241528 E7A00018 */ swc1 $f0, 0x18($sp) +/* B9496C 8024152C 862200A6 */ lh $v0, 0xa6($s1) +/* B94970 80241530 27A60024 */ addiu $a2, $sp, 0x24 +/* B94974 80241534 44820000 */ mtc1 $v0, $f0 +/* B94978 80241538 00000000 */ nop +/* B9497C 8024153C 46800020 */ cvt.s.w $f0, $f0 +/* B94980 80241540 E7A0001C */ swc1 $f0, 0x1c($sp) +/* B94984 80241544 8E240080 */ lw $a0, 0x80($s1) +/* B94988 80241548 0C037711 */ jal func_800DDC44 +/* B9498C 8024154C 27A70028 */ addiu $a3, $sp, 0x28 +/* B94990 80241550 8FA60020 */ lw $a2, 0x20($sp) +/* B94994 80241554 8E020000 */ lw $v0, ($s0) +/* B94998 80241558 8FA70028 */ lw $a3, 0x28($sp) +/* B9499C 8024155C C44C0028 */ lwc1 $f12, 0x28($v0) +/* B949A0 80241560 C44E0030 */ lwc1 $f14, 0x30($v0) +/* B949A4 80241564 0C00A7B5 */ jal dist2D +/* B949A8 80241568 24170001 */ addiu $s7, $zero, 1 +/* B949AC 8024156C 46000506 */ mov.s $f20, $f0 +/* B949B0 80241570 8E030000 */ lw $v1, ($s0) +/* B949B4 80241574 862200A6 */ lh $v0, 0xa6($s1) +/* B949B8 80241578 4407C000 */ mfc1 $a3, $f24 +/* B949BC 8024157C 44824000 */ mtc1 $v0, $f8 +/* B949C0 80241580 00000000 */ nop +/* B949C4 80241584 46804220 */ cvt.s.w $f8, $f8 +/* B949C8 80241588 C4600028 */ lwc1 $f0, 0x28($v1) +/* B949CC 8024158C 44064000 */ mfc1 $a2, $f8 +/* B949D0 80241590 26240038 */ addiu $a0, $s1, 0x38 +/* B949D4 80241594 E6200038 */ swc1 $f0, 0x38($s1) +/* B949D8 80241598 C4600030 */ lwc1 $f0, 0x30($v1) +/* B949DC 8024159C 26250040 */ addiu $a1, $s1, 0x40 +/* B949E0 802415A0 0C00A7E7 */ jal add_vec2D_polar +/* B949E4 802415A4 E6200040 */ swc1 $f0, 0x40($s1) +/* B949E8 802415A8 862200A6 */ lh $v0, 0xa6($s1) +/* B949EC 802415AC 44820000 */ mtc1 $v0, $f0 +/* B949F0 802415B0 00000000 */ nop +/* B949F4 802415B4 46800020 */ cvt.s.w $f0, $f0 +/* B949F8 802415B8 080905A9 */ j .L802416A4 +/* B949FC 802415BC 4600A500 */ add.s $f20, $f20, $f0 +.L802415C0: +/* B94A00 802415C0 8EA20000 */ lw $v0, ($s5) +/* B94A04 802415C4 3C014032 */ lui $at, 0x4032 +/* B94A08 802415C8 44811800 */ mtc1 $at, $f3 +/* B94A0C 802415CC 44801000 */ mtc1 $zero, $f2 +/* B94A10 802415D0 C440002C */ lwc1 $f0, 0x2c($v0) +/* B94A14 802415D4 C4460028 */ lwc1 $f6, 0x28($v0) +/* B94A18 802415D8 C4440030 */ lwc1 $f4, 0x30($v0) +/* B94A1C 802415DC 46000021 */ cvt.d.s $f0, $f0 +/* B94A20 802415E0 46220000 */ add.d $f0, $f0, $f2 +/* B94A24 802415E4 E7A60020 */ swc1 $f6, 0x20($sp) +/* B94A28 802415E8 E7A40028 */ swc1 $f4, 0x28($sp) +/* B94A2C 802415EC 46200020 */ cvt.s.d $f0, $f0 +/* B94A30 802415F0 E7A00024 */ swc1 $f0, 0x24($sp) +/* B94A34 802415F4 E7B40010 */ swc1 $f20, 0x10($sp) +/* B94A38 802415F8 E7B60014 */ swc1 $f22, 0x14($sp) +/* B94A3C 802415FC 862200A8 */ lh $v0, 0xa8($s1) +/* B94A40 80241600 44820000 */ mtc1 $v0, $f0 +/* B94A44 80241604 00000000 */ nop +/* B94A48 80241608 46800020 */ cvt.s.w $f0, $f0 +/* B94A4C 8024160C E7A00018 */ swc1 $f0, 0x18($sp) +/* B94A50 80241610 862200A6 */ lh $v0, 0xa6($s1) +/* B94A54 80241614 27A60024 */ addiu $a2, $sp, 0x24 +/* B94A58 80241618 44820000 */ mtc1 $v0, $f0 +/* B94A5C 8024161C 00000000 */ nop +/* B94A60 80241620 46800020 */ cvt.s.w $f0, $f0 +/* B94A64 80241624 E7A0001C */ swc1 $f0, 0x1c($sp) +/* B94A68 80241628 8E240080 */ lw $a0, 0x80($s1) +/* B94A6C 8024162C 0C037711 */ jal func_800DDC44 +/* B94A70 80241630 27A70028 */ addiu $a3, $sp, 0x28 +/* B94A74 80241634 1040001F */ beqz $v0, .L802416B4 +/* B94A78 80241638 00000000 */ nop +/* B94A7C 8024163C 8FA60020 */ lw $a2, 0x20($sp) +/* B94A80 80241640 8EA20000 */ lw $v0, ($s5) +/* B94A84 80241644 8FA70028 */ lw $a3, 0x28($sp) +/* B94A88 80241648 C44C0028 */ lwc1 $f12, 0x28($v0) +/* B94A8C 8024164C 0C00A7B5 */ jal dist2D +/* B94A90 80241650 C44E0030 */ lwc1 $f14, 0x30($v0) +/* B94A94 80241654 46000506 */ mov.s $f20, $f0 +/* B94A98 80241658 8EA30000 */ lw $v1, ($s5) +/* B94A9C 8024165C 862200A6 */ lh $v0, 0xa6($s1) +/* B94AA0 80241660 4407C000 */ mfc1 $a3, $f24 +/* B94AA4 80241664 44824000 */ mtc1 $v0, $f8 +/* B94AA8 80241668 00000000 */ nop +/* B94AAC 8024166C 46804220 */ cvt.s.w $f8, $f8 +/* B94AB0 80241670 C4600028 */ lwc1 $f0, 0x28($v1) +/* B94AB4 80241674 44064000 */ mfc1 $a2, $f8 +/* B94AB8 80241678 0200202D */ daddu $a0, $s0, $zero +/* B94ABC 8024167C E6200038 */ swc1 $f0, 0x38($s1) +/* B94AC0 80241680 C4600030 */ lwc1 $f0, 0x30($v1) +/* B94AC4 80241684 0260282D */ daddu $a1, $s3, $zero +/* B94AC8 80241688 0C00A7E7 */ jal add_vec2D_polar +/* B94ACC 8024168C E6200040 */ swc1 $f0, 0x40($s1) +/* B94AD0 80241690 862200A6 */ lh $v0, 0xa6($s1) +/* B94AD4 80241694 44820000 */ mtc1 $v0, $f0 +/* B94AD8 80241698 00000000 */ nop +/* B94ADC 8024169C 46800020 */ cvt.s.w $f0, $f0 +/* B94AE0 802416A0 4600A500 */ add.s $f20, $f20, $f0 +.L802416A4: +/* B94AE4 802416A4 4406B000 */ mfc1 $a2, $f22 +/* B94AE8 802416A8 4405A000 */ mfc1 $a1, $f20 +/* B94AEC 802416AC 0C00EA95 */ jal npc_move_heading +/* B94AF0 802416B0 0220202D */ daddu $a0, $s1, $zero +.L802416B4: +/* B94AF4 802416B4 C6400008 */ lwc1 $f0, 8($s2) +/* B94AF8 802416B8 46800020 */ cvt.s.w $f0, $f0 +/* B94AFC 802416BC 44050000 */ mfc1 $a1, $f0 +/* B94B00 802416C0 C640000C */ lwc1 $f0, 0xc($s2) +/* B94B04 802416C4 46800020 */ cvt.s.w $f0, $f0 +/* B94B08 802416C8 44060000 */ mfc1 $a2, $f0 +/* B94B0C 802416CC C6200040 */ lwc1 $f0, 0x40($s1) +/* B94B10 802416D0 26300038 */ addiu $s0, $s1, 0x38 +/* B94B14 802416D4 E7A00010 */ swc1 $f0, 0x10($sp) +/* B94B18 802416D8 C6400010 */ lwc1 $f0, 0x10($s2) +/* B94B1C 802416DC 46800020 */ cvt.s.w $f0, $f0 +/* B94B20 802416E0 E7A00014 */ swc1 $f0, 0x14($sp) +/* B94B24 802416E4 C6400014 */ lwc1 $f0, 0x14($s2) +/* B94B28 802416E8 46800020 */ cvt.s.w $f0, $f0 +/* B94B2C 802416EC E7A00018 */ swc1 $f0, 0x18($sp) +/* B94B30 802416F0 8E440004 */ lw $a0, 4($s2) +/* B94B34 802416F4 8E270038 */ lw $a3, 0x38($s1) +/* B94B38 802416F8 0C0123F5 */ jal is_point_within_region +/* B94B3C 802416FC 26330040 */ addiu $s3, $s1, 0x40 +/* B94B40 80241700 1040005A */ beqz $v0, .L8024186C +/* B94B44 80241704 00000000 */ nop +/* B94B48 80241708 8E430004 */ lw $v1, 4($s2) +/* B94B4C 8024170C 10600005 */ beqz $v1, .L80241724 +/* B94B50 80241710 24020001 */ addiu $v0, $zero, 1 +/* B94B54 80241714 10620029 */ beq $v1, $v0, .L802417BC +/* B94B58 80241718 00000000 */ nop +/* B94B5C 8024171C 0809061B */ j .L8024186C +/* B94B60 80241720 00000000 */ nop +.L80241724: +/* B94B64 80241724 C6480008 */ lwc1 $f8, 8($s2) +/* B94B68 80241728 46804220 */ cvt.s.w $f8, $f8 +/* B94B6C 8024172C 44064000 */ mfc1 $a2, $f8 +/* B94B70 80241730 C648000C */ lwc1 $f8, 0xc($s2) +/* B94B74 80241734 46804220 */ cvt.s.w $f8, $f8 +/* B94B78 80241738 C62C0038 */ lwc1 $f12, 0x38($s1) +/* B94B7C 8024173C C62E0040 */ lwc1 $f14, 0x40($s1) +/* B94B80 80241740 44074000 */ mfc1 $a3, $f8 +/* B94B84 80241744 0C00A7B5 */ jal dist2D +/* B94B88 80241748 00000000 */ nop +/* B94B8C 8024174C C6420010 */ lwc1 $f2, 0x10($s2) +/* B94B90 80241750 468010A0 */ cvt.s.w $f2, $f2 +/* B94B94 80241754 4600103C */ c.lt.s $f2, $f0 +/* B94B98 80241758 00000000 */ nop +/* B94B9C 8024175C 45000043 */ bc1f .L8024186C +/* B94BA0 80241760 E7A00038 */ swc1 $f0, 0x38($sp) +/* B94BA4 80241764 C64C0008 */ lwc1 $f12, 8($s2) +/* B94BA8 80241768 46806320 */ cvt.s.w $f12, $f12 +/* B94BAC 8024176C 8E260038 */ lw $a2, 0x38($s1) +/* B94BB0 80241770 8E270040 */ lw $a3, 0x40($s1) +/* B94BB4 80241774 C64E000C */ lwc1 $f14, 0xc($s2) +/* B94BB8 80241778 0C00A720 */ jal atan2 +/* B94BBC 8024177C 468073A0 */ cvt.s.w $f14, $f14 +/* B94BC0 80241780 0200202D */ daddu $a0, $s0, $zero +/* B94BC4 80241784 44070000 */ mfc1 $a3, $f0 +/* B94BC8 80241788 C6400008 */ lwc1 $f0, 8($s2) +/* B94BCC 8024178C 46800020 */ cvt.s.w $f0, $f0 +/* B94BD0 80241790 E6200038 */ swc1 $f0, 0x38($s1) +/* B94BD4 80241794 C640000C */ lwc1 $f0, 0xc($s2) +/* B94BD8 80241798 46800020 */ cvt.s.w $f0, $f0 +/* B94BDC 8024179C E6200040 */ swc1 $f0, 0x40($s1) +/* B94BE0 802417A0 C6480010 */ lwc1 $f8, 0x10($s2) +/* B94BE4 802417A4 46804220 */ cvt.s.w $f8, $f8 +/* B94BE8 802417A8 44064000 */ mfc1 $a2, $f8 +/* B94BEC 802417AC 0C00A7E7 */ jal add_vec2D_polar +/* B94BF0 802417B0 0260282D */ daddu $a1, $s3, $zero +/* B94BF4 802417B4 0809061B */ j .L8024186C +/* B94BF8 802417B8 00000000 */ nop +.L802417BC: +/* B94BFC 802417BC 8E420008 */ lw $v0, 8($s2) +/* B94C00 802417C0 8E430010 */ lw $v1, 0x10($s2) +/* B94C04 802417C4 C6200038 */ lwc1 $f0, 0x38($s1) +/* B94C08 802417C8 00431021 */ addu $v0, $v0, $v1 +/* B94C0C 802417CC 44821000 */ mtc1 $v0, $f2 +/* B94C10 802417D0 00000000 */ nop +/* B94C14 802417D4 468010A0 */ cvt.s.w $f2, $f2 +/* B94C18 802417D8 4600103C */ c.lt.s $f2, $f0 +/* B94C1C 802417DC 00000000 */ nop +/* B94C20 802417E0 45030001 */ bc1tl .L802417E8 +/* B94C24 802417E4 E6220038 */ swc1 $f2, 0x38($s1) +.L802417E8: +/* B94C28 802417E8 8E420008 */ lw $v0, 8($s2) +/* B94C2C 802417EC 8E430010 */ lw $v1, 0x10($s2) +/* B94C30 802417F0 C6200038 */ lwc1 $f0, 0x38($s1) +/* B94C34 802417F4 00431023 */ subu $v0, $v0, $v1 +/* B94C38 802417F8 44821000 */ mtc1 $v0, $f2 +/* B94C3C 802417FC 00000000 */ nop +/* B94C40 80241800 468010A0 */ cvt.s.w $f2, $f2 +/* B94C44 80241804 4602003C */ c.lt.s $f0, $f2 +/* B94C48 80241808 00000000 */ nop +/* B94C4C 8024180C 45030001 */ bc1tl .L80241814 +/* B94C50 80241810 E6220038 */ swc1 $f2, 0x38($s1) +.L80241814: +/* B94C54 80241814 8E42000C */ lw $v0, 0xc($s2) +/* B94C58 80241818 8E430014 */ lw $v1, 0x14($s2) +/* B94C5C 8024181C C6200040 */ lwc1 $f0, 0x40($s1) +/* B94C60 80241820 00431021 */ addu $v0, $v0, $v1 +/* B94C64 80241824 44821000 */ mtc1 $v0, $f2 +/* B94C68 80241828 00000000 */ nop +/* B94C6C 8024182C 468010A0 */ cvt.s.w $f2, $f2 +/* B94C70 80241830 4600103C */ c.lt.s $f2, $f0 +/* B94C74 80241834 00000000 */ nop +/* B94C78 80241838 45030001 */ bc1tl .L80241840 +/* B94C7C 8024183C E6220040 */ swc1 $f2, 0x40($s1) +.L80241840: +/* B94C80 80241840 8E42000C */ lw $v0, 0xc($s2) +/* B94C84 80241844 8E430014 */ lw $v1, 0x14($s2) +/* B94C88 80241848 C6200040 */ lwc1 $f0, 0x40($s1) +/* B94C8C 8024184C 00431023 */ subu $v0, $v0, $v1 +/* B94C90 80241850 44821000 */ mtc1 $v0, $f2 +/* B94C94 80241854 00000000 */ nop +/* B94C98 80241858 468010A0 */ cvt.s.w $f2, $f2 +/* B94C9C 8024185C 4602003C */ c.lt.s $f0, $f2 +/* B94CA0 80241860 00000000 */ nop +/* B94CA4 80241864 45030001 */ bc1tl .L8024186C +/* B94CA8 80241868 E6220040 */ swc1 $f2, 0x40($s1) +.L8024186C: +/* B94CAC 8024186C 16E0001F */ bnez $s7, .L802418EC +/* B94CB0 80241870 00000000 */ nop +/* B94CB4 80241874 8E220000 */ lw $v0, ($s1) +/* B94CB8 80241878 30420008 */ andi $v0, $v0, 8 +/* B94CBC 8024187C 10400003 */ beqz $v0, .L8024188C +/* B94CC0 80241880 27A50020 */ addiu $a1, $sp, 0x20 +/* B94CC4 80241884 13C00019 */ beqz $fp, .L802418EC +/* B94CC8 80241888 00000000 */ nop +.L8024188C: +/* B94CCC 8024188C 27A60024 */ addiu $a2, $sp, 0x24 +/* B94CD0 80241890 27A20038 */ addiu $v0, $sp, 0x38 +/* B94CD4 80241894 C6220038 */ lwc1 $f2, 0x38($s1) +/* B94CD8 80241898 C620003C */ lwc1 $f0, 0x3c($s1) +/* B94CDC 8024189C 3C0143C8 */ lui $at, 0x43c8 +/* B94CE0 802418A0 44813000 */ mtc1 $at, $f6 +/* B94CE4 802418A4 46000021 */ cvt.d.s $f0, $f0 +/* B94CE8 802418A8 E7A20020 */ swc1 $f2, 0x20($sp) +/* B94CEC 802418AC 3C018024 */ lui $at, 0x8024 +/* B94CF0 802418B0 D42247B0 */ ldc1 $f2, 0x47b0($at) +/* B94CF4 802418B4 C6240040 */ lwc1 $f4, 0x40($s1) +/* B94CF8 802418B8 46220000 */ add.d $f0, $f0, $f2 +/* B94CFC 802418BC E7A60038 */ swc1 $f6, 0x38($sp) +/* B94D00 802418C0 E7A40028 */ swc1 $f4, 0x28($sp) +/* B94D04 802418C4 46200020 */ cvt.s.d $f0, $f0 +/* B94D08 802418C8 E7A00024 */ swc1 $f0, 0x24($sp) +/* B94D0C 802418CC AFA20010 */ sw $v0, 0x10($sp) +/* B94D10 802418D0 8E240080 */ lw $a0, 0x80($s1) +/* B94D14 802418D4 0C0372DF */ jal func_800DCB7C +/* B94D18 802418D8 27A70028 */ addiu $a3, $sp, 0x28 +/* B94D1C 802418DC 10400003 */ beqz $v0, .L802418EC +/* B94D20 802418E0 00000000 */ nop +/* B94D24 802418E4 C7A00024 */ lwc1 $f0, 0x24($sp) +/* B94D28 802418E8 E620003C */ swc1 $f0, 0x3c($s1) +.L802418EC: +/* B94D2C 802418EC C62C0038 */ lwc1 $f12, 0x38($s1) +/* B94D30 802418F0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B94D34 802418F4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B94D38 802418F8 C62E0040 */ lwc1 $f14, 0x40($s1) +/* B94D3C 802418FC 8C460028 */ lw $a2, 0x28($v0) +/* B94D40 80241900 0C00A720 */ jal atan2 +/* B94D44 80241904 8C470030 */ lw $a3, 0x30($v0) +/* B94D48 80241908 0220202D */ daddu $a0, $s1, $zero +/* B94D4C 8024190C 24050321 */ addiu $a1, $zero, 0x321 +/* B94D50 80241910 0000302D */ daddu $a2, $zero, $zero +/* B94D54 80241914 0C012530 */ jal func_800494C0 +/* B94D58 80241918 E620000C */ swc1 $f0, 0xc($s1) +/* B94D5C 8024191C 8EC200CC */ lw $v0, 0xcc($s6) +/* B94D60 80241920 8C420024 */ lw $v0, 0x24($v0) +/* B94D64 80241924 AE220028 */ sw $v0, 0x28($s1) +/* B94D68 80241928 96C20096 */ lhu $v0, 0x96($s6) +/* B94D6C 8024192C A622008E */ sh $v0, 0x8e($s1) +/* B94D70 80241930 8FA80080 */ lw $t0, 0x80($sp) +/* B94D74 80241934 2402000B */ addiu $v0, $zero, 0xb +/* B94D78 80241938 AD020070 */ sw $v0, 0x70($t0) +.L8024193C: +/* B94D7C 8024193C 8FBF0064 */ lw $ra, 0x64($sp) +/* B94D80 80241940 8FBE0060 */ lw $fp, 0x60($sp) +/* B94D84 80241944 8FB7005C */ lw $s7, 0x5c($sp) +/* B94D88 80241948 8FB60058 */ lw $s6, 0x58($sp) +/* B94D8C 8024194C 8FB50054 */ lw $s5, 0x54($sp) +/* B94D90 80241950 8FB40050 */ lw $s4, 0x50($sp) +/* B94D94 80241954 8FB3004C */ lw $s3, 0x4c($sp) +/* B94D98 80241958 8FB20048 */ lw $s2, 0x48($sp) +/* B94D9C 8024195C 8FB10044 */ lw $s1, 0x44($sp) +/* B94DA0 80241960 8FB00040 */ lw $s0, 0x40($sp) +/* B94DA4 80241964 D7B80078 */ ldc1 $f24, 0x78($sp) +/* B94DA8 80241968 D7B60070 */ ldc1 $f22, 0x70($sp) +/* B94DAC 8024196C D7B40068 */ ldc1 $f20, 0x68($sp) +/* B94DB0 80241970 03E00008 */ jr $ra +/* B94DB4 80241974 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978.s deleted file mode 100644 index 1b14d21c28..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241978 -/* B94DB8 80241978 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B94DBC 8024197C AFB10014 */ sw $s1, 0x14($sp) -/* B94DC0 80241980 0080882D */ daddu $s1, $a0, $zero -/* B94DC4 80241984 AFBF0018 */ sw $ra, 0x18($sp) -/* B94DC8 80241988 AFB00010 */ sw $s0, 0x10($sp) -/* B94DCC 8024198C 8E300148 */ lw $s0, 0x148($s1) -/* B94DD0 80241990 0C00EABB */ jal get_npc_unsafe -/* B94DD4 80241994 86040008 */ lh $a0, 8($s0) -/* B94DD8 80241998 0040202D */ daddu $a0, $v0, $zero -/* B94DDC 8024199C 9482008E */ lhu $v0, 0x8e($a0) -/* B94DE0 802419A0 2442FFFF */ addiu $v0, $v0, -1 -/* B94DE4 802419A4 A482008E */ sh $v0, 0x8e($a0) -/* B94DE8 802419A8 00021400 */ sll $v0, $v0, 0x10 -/* B94DEC 802419AC 8E030098 */ lw $v1, 0x98($s0) -/* B94DF0 802419B0 00021403 */ sra $v0, $v0, 0x10 -/* B94DF4 802419B4 0062182A */ slt $v1, $v1, $v0 -/* B94DF8 802419B8 14600005 */ bnez $v1, .L802419D0 -/* B94DFC 802419BC 3C03E0EF */ lui $v1, 0xe0ef -/* B94E00 802419C0 8E020000 */ lw $v0, ($s0) -/* B94E04 802419C4 3463FFFF */ ori $v1, $v1, 0xffff -/* B94E08 802419C8 00431024 */ and $v0, $v0, $v1 -/* B94E0C 802419CC AE020000 */ sw $v0, ($s0) -.L802419D0: -/* B94E10 802419D0 8482008E */ lh $v0, 0x8e($a0) -/* B94E14 802419D4 14400007 */ bnez $v0, .L802419F4 -/* B94E18 802419D8 00000000 */ nop -/* B94E1C 802419DC 8E0200CC */ lw $v0, 0xcc($s0) -/* B94E20 802419E0 8C420028 */ lw $v0, 0x28($v0) -/* B94E24 802419E4 A480008E */ sh $zero, 0x8e($a0) -/* B94E28 802419E8 AC820028 */ sw $v0, 0x28($a0) -/* B94E2C 802419EC 2402000C */ addiu $v0, $zero, 0xc -/* B94E30 802419F0 AE220070 */ sw $v0, 0x70($s1) -.L802419F4: -/* B94E34 802419F4 8FBF0018 */ lw $ra, 0x18($sp) -/* B94E38 802419F8 8FB10014 */ lw $s1, 0x14($sp) -/* B94E3C 802419FC 8FB00010 */ lw $s0, 0x10($sp) -/* B94E40 80241A00 03E00008 */ jr $ra -/* B94E44 80241A04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s new file mode 100644 index 0000000000..f156699de3 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241978_B94DB8.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241978_B94DB8 +/* B94DB8 80241978 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B94DBC 8024197C AFB10014 */ sw $s1, 0x14($sp) +/* B94DC0 80241980 0080882D */ daddu $s1, $a0, $zero +/* B94DC4 80241984 AFBF0018 */ sw $ra, 0x18($sp) +/* B94DC8 80241988 AFB00010 */ sw $s0, 0x10($sp) +/* B94DCC 8024198C 8E300148 */ lw $s0, 0x148($s1) +/* B94DD0 80241990 0C00EABB */ jal get_npc_unsafe +/* B94DD4 80241994 86040008 */ lh $a0, 8($s0) +/* B94DD8 80241998 0040202D */ daddu $a0, $v0, $zero +/* B94DDC 8024199C 9482008E */ lhu $v0, 0x8e($a0) +/* B94DE0 802419A0 2442FFFF */ addiu $v0, $v0, -1 +/* B94DE4 802419A4 A482008E */ sh $v0, 0x8e($a0) +/* B94DE8 802419A8 00021400 */ sll $v0, $v0, 0x10 +/* B94DEC 802419AC 8E030098 */ lw $v1, 0x98($s0) +/* B94DF0 802419B0 00021403 */ sra $v0, $v0, 0x10 +/* B94DF4 802419B4 0062182A */ slt $v1, $v1, $v0 +/* B94DF8 802419B8 14600005 */ bnez $v1, .L802419D0 +/* B94DFC 802419BC 3C03E0EF */ lui $v1, 0xe0ef +/* B94E00 802419C0 8E020000 */ lw $v0, ($s0) +/* B94E04 802419C4 3463FFFF */ ori $v1, $v1, 0xffff +/* B94E08 802419C8 00431024 */ and $v0, $v0, $v1 +/* B94E0C 802419CC AE020000 */ sw $v0, ($s0) +.L802419D0: +/* B94E10 802419D0 8482008E */ lh $v0, 0x8e($a0) +/* B94E14 802419D4 14400007 */ bnez $v0, .L802419F4 +/* B94E18 802419D8 00000000 */ nop +/* B94E1C 802419DC 8E0200CC */ lw $v0, 0xcc($s0) +/* B94E20 802419E0 8C420028 */ lw $v0, 0x28($v0) +/* B94E24 802419E4 A480008E */ sh $zero, 0x8e($a0) +/* B94E28 802419E8 AC820028 */ sw $v0, 0x28($a0) +/* B94E2C 802419EC 2402000C */ addiu $v0, $zero, 0xc +/* B94E30 802419F0 AE220070 */ sw $v0, 0x70($s1) +.L802419F4: +/* B94E34 802419F4 8FBF0018 */ lw $ra, 0x18($sp) +/* B94E38 802419F8 8FB10014 */ lw $s1, 0x14($sp) +/* B94E3C 802419FC 8FB00010 */ lw $s0, 0x10($sp) +/* B94E40 80241A00 03E00008 */ jr $ra +/* B94E44 80241A04 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08.s deleted file mode 100644 index 2b09053cb5..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A08 -/* B94E48 80241A08 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B94E4C 80241A0C AFB10034 */ sw $s1, 0x34($sp) -/* B94E50 80241A10 0080882D */ daddu $s1, $a0, $zero -/* B94E54 80241A14 AFBF0038 */ sw $ra, 0x38($sp) -/* B94E58 80241A18 AFB00030 */ sw $s0, 0x30($sp) -/* B94E5C 80241A1C 8E300148 */ lw $s0, 0x148($s1) -/* B94E60 80241A20 0C00EABB */ jal get_npc_unsafe -/* B94E64 80241A24 86040008 */ lh $a0, 8($s0) -/* B94E68 80241A28 0040282D */ daddu $a1, $v0, $zero -/* B94E6C 80241A2C 94A2008E */ lhu $v0, 0x8e($a1) -/* B94E70 80241A30 24420001 */ addiu $v0, $v0, 1 -/* B94E74 80241A34 A4A2008E */ sh $v0, 0x8e($a1) -/* B94E78 80241A38 00021400 */ sll $v0, $v0, 0x10 -/* B94E7C 80241A3C 8E0300A0 */ lw $v1, 0xa0($s0) -/* B94E80 80241A40 00021403 */ sra $v0, $v0, 0x10 -/* B94E84 80241A44 14430004 */ bne $v0, $v1, .L80241A58 -/* B94E88 80241A48 00000000 */ nop -/* B94E8C 80241A4C 8E0200CC */ lw $v0, 0xcc($s0) -/* B94E90 80241A50 8C42002C */ lw $v0, 0x2c($v0) -/* B94E94 80241A54 ACA20028 */ sw $v0, 0x28($a1) -.L80241A58: -/* B94E98 80241A58 84A3008E */ lh $v1, 0x8e($a1) -/* B94E9C 80241A5C 8E0200A4 */ lw $v0, 0xa4($s0) -/* B94EA0 80241A60 14620002 */ bne $v1, $v0, .L80241A6C -/* B94EA4 80241A64 24020003 */ addiu $v0, $zero, 3 -/* B94EA8 80241A68 AE02006C */ sw $v0, 0x6c($s0) -.L80241A6C: -/* B94EAC 80241A6C 84A2008E */ lh $v0, 0x8e($a1) -/* B94EB0 80241A70 8E03009C */ lw $v1, 0x9c($s0) -/* B94EB4 80241A74 0043102A */ slt $v0, $v0, $v1 -/* B94EB8 80241A78 1440001E */ bnez $v0, .L80241AF4 -/* B94EBC 80241A7C 24020004 */ addiu $v0, $zero, 4 -/* B94EC0 80241A80 AE02006C */ sw $v0, 0x6c($s0) -/* B94EC4 80241A84 24020008 */ addiu $v0, $zero, 8 -/* B94EC8 80241A88 24040003 */ addiu $a0, $zero, 3 -/* B94ECC 80241A8C A4A2008E */ sh $v0, 0x8e($a1) -/* B94ED0 80241A90 8E0200CC */ lw $v0, 0xcc($s0) -/* B94ED4 80241A94 84A300A8 */ lh $v1, 0xa8($a1) -/* B94ED8 80241A98 3C013F80 */ lui $at, 0x3f80 -/* B94EDC 80241A9C 44810000 */ mtc1 $at, $f0 -/* B94EE0 80241AA0 3C014000 */ lui $at, 0x4000 -/* B94EE4 80241AA4 44811000 */ mtc1 $at, $f2 -/* B94EE8 80241AA8 3C01C1A0 */ lui $at, 0xc1a0 -/* B94EEC 80241AAC 44812000 */ mtc1 $at, $f4 -/* B94EF0 80241AB0 44833000 */ mtc1 $v1, $f6 -/* B94EF4 80241AB4 00000000 */ nop -/* B94EF8 80241AB8 468031A0 */ cvt.s.w $f6, $f6 -/* B94EFC 80241ABC 8C420000 */ lw $v0, ($v0) -/* B94F00 80241AC0 44073000 */ mfc1 $a3, $f6 -/* B94F04 80241AC4 0000302D */ daddu $a2, $zero, $zero -/* B94F08 80241AC8 ACA20028 */ sw $v0, 0x28($a1) -/* B94F0C 80241ACC 2402000A */ addiu $v0, $zero, 0xa -/* B94F10 80241AD0 AFA2001C */ sw $v0, 0x1c($sp) -/* B94F14 80241AD4 27A20028 */ addiu $v0, $sp, 0x28 -/* B94F18 80241AD8 E7A00010 */ swc1 $f0, 0x10($sp) -/* B94F1C 80241ADC E7A20014 */ swc1 $f2, 0x14($sp) -/* B94F20 80241AE0 E7A40018 */ swc1 $f4, 0x18($sp) -/* B94F24 80241AE4 0C01BFA4 */ jal fx_emote -/* B94F28 80241AE8 AFA20020 */ sw $v0, 0x20($sp) -/* B94F2C 80241AEC 2402000D */ addiu $v0, $zero, 0xd -/* B94F30 80241AF0 AE220070 */ sw $v0, 0x70($s1) -.L80241AF4: -/* B94F34 80241AF4 8FBF0038 */ lw $ra, 0x38($sp) -/* B94F38 80241AF8 8FB10034 */ lw $s1, 0x34($sp) -/* B94F3C 80241AFC 8FB00030 */ lw $s0, 0x30($sp) -/* B94F40 80241B00 03E00008 */ jr $ra -/* B94F44 80241B04 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s new file mode 100644 index 0000000000..0088b66417 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241A08_B94E48.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A08_B94E48 +/* B94E48 80241A08 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* B94E4C 80241A0C AFB10034 */ sw $s1, 0x34($sp) +/* B94E50 80241A10 0080882D */ daddu $s1, $a0, $zero +/* B94E54 80241A14 AFBF0038 */ sw $ra, 0x38($sp) +/* B94E58 80241A18 AFB00030 */ sw $s0, 0x30($sp) +/* B94E5C 80241A1C 8E300148 */ lw $s0, 0x148($s1) +/* B94E60 80241A20 0C00EABB */ jal get_npc_unsafe +/* B94E64 80241A24 86040008 */ lh $a0, 8($s0) +/* B94E68 80241A28 0040282D */ daddu $a1, $v0, $zero +/* B94E6C 80241A2C 94A2008E */ lhu $v0, 0x8e($a1) +/* B94E70 80241A30 24420001 */ addiu $v0, $v0, 1 +/* B94E74 80241A34 A4A2008E */ sh $v0, 0x8e($a1) +/* B94E78 80241A38 00021400 */ sll $v0, $v0, 0x10 +/* B94E7C 80241A3C 8E0300A0 */ lw $v1, 0xa0($s0) +/* B94E80 80241A40 00021403 */ sra $v0, $v0, 0x10 +/* B94E84 80241A44 14430004 */ bne $v0, $v1, .L80241A58 +/* B94E88 80241A48 00000000 */ nop +/* B94E8C 80241A4C 8E0200CC */ lw $v0, 0xcc($s0) +/* B94E90 80241A50 8C42002C */ lw $v0, 0x2c($v0) +/* B94E94 80241A54 ACA20028 */ sw $v0, 0x28($a1) +.L80241A58: +/* B94E98 80241A58 84A3008E */ lh $v1, 0x8e($a1) +/* B94E9C 80241A5C 8E0200A4 */ lw $v0, 0xa4($s0) +/* B94EA0 80241A60 14620002 */ bne $v1, $v0, .L80241A6C +/* B94EA4 80241A64 24020003 */ addiu $v0, $zero, 3 +/* B94EA8 80241A68 AE02006C */ sw $v0, 0x6c($s0) +.L80241A6C: +/* B94EAC 80241A6C 84A2008E */ lh $v0, 0x8e($a1) +/* B94EB0 80241A70 8E03009C */ lw $v1, 0x9c($s0) +/* B94EB4 80241A74 0043102A */ slt $v0, $v0, $v1 +/* B94EB8 80241A78 1440001E */ bnez $v0, .L80241AF4 +/* B94EBC 80241A7C 24020004 */ addiu $v0, $zero, 4 +/* B94EC0 80241A80 AE02006C */ sw $v0, 0x6c($s0) +/* B94EC4 80241A84 24020008 */ addiu $v0, $zero, 8 +/* B94EC8 80241A88 24040003 */ addiu $a0, $zero, 3 +/* B94ECC 80241A8C A4A2008E */ sh $v0, 0x8e($a1) +/* B94ED0 80241A90 8E0200CC */ lw $v0, 0xcc($s0) +/* B94ED4 80241A94 84A300A8 */ lh $v1, 0xa8($a1) +/* B94ED8 80241A98 3C013F80 */ lui $at, 0x3f80 +/* B94EDC 80241A9C 44810000 */ mtc1 $at, $f0 +/* B94EE0 80241AA0 3C014000 */ lui $at, 0x4000 +/* B94EE4 80241AA4 44811000 */ mtc1 $at, $f2 +/* B94EE8 80241AA8 3C01C1A0 */ lui $at, 0xc1a0 +/* B94EEC 80241AAC 44812000 */ mtc1 $at, $f4 +/* B94EF0 80241AB0 44833000 */ mtc1 $v1, $f6 +/* B94EF4 80241AB4 00000000 */ nop +/* B94EF8 80241AB8 468031A0 */ cvt.s.w $f6, $f6 +/* B94EFC 80241ABC 8C420000 */ lw $v0, ($v0) +/* B94F00 80241AC0 44073000 */ mfc1 $a3, $f6 +/* B94F04 80241AC4 0000302D */ daddu $a2, $zero, $zero +/* B94F08 80241AC8 ACA20028 */ sw $v0, 0x28($a1) +/* B94F0C 80241ACC 2402000A */ addiu $v0, $zero, 0xa +/* B94F10 80241AD0 AFA2001C */ sw $v0, 0x1c($sp) +/* B94F14 80241AD4 27A20028 */ addiu $v0, $sp, 0x28 +/* B94F18 80241AD8 E7A00010 */ swc1 $f0, 0x10($sp) +/* B94F1C 80241ADC E7A20014 */ swc1 $f2, 0x14($sp) +/* B94F20 80241AE0 E7A40018 */ swc1 $f4, 0x18($sp) +/* B94F24 80241AE4 0C01BFA4 */ jal fx_emote +/* B94F28 80241AE8 AFA20020 */ sw $v0, 0x20($sp) +/* B94F2C 80241AEC 2402000D */ addiu $v0, $zero, 0xd +/* B94F30 80241AF0 AE220070 */ sw $v0, 0x70($s1) +.L80241AF4: +/* B94F34 80241AF4 8FBF0038 */ lw $ra, 0x38($sp) +/* B94F38 80241AF8 8FB10034 */ lw $s1, 0x34($sp) +/* B94F3C 80241AFC 8FB00030 */ lw $s0, 0x30($sp) +/* B94F40 80241B00 03E00008 */ jr $ra +/* B94F44 80241B04 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68.s deleted file mode 100644 index db9da9c2c5..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B68 -/* B94FA8 80241B68 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B94FAC 80241B6C AFB40040 */ sw $s4, 0x40($sp) -/* B94FB0 80241B70 0080A02D */ daddu $s4, $a0, $zero -/* B94FB4 80241B74 AFBF0044 */ sw $ra, 0x44($sp) -/* B94FB8 80241B78 AFB3003C */ sw $s3, 0x3c($sp) -/* B94FBC 80241B7C AFB20038 */ sw $s2, 0x38($sp) -/* B94FC0 80241B80 AFB10034 */ sw $s1, 0x34($sp) -/* B94FC4 80241B84 AFB00030 */ sw $s0, 0x30($sp) -/* B94FC8 80241B88 8E910148 */ lw $s1, 0x148($s4) -/* B94FCC 80241B8C 00A0902D */ daddu $s2, $a1, $zero -/* B94FD0 80241B90 86240008 */ lh $a0, 8($s1) -/* B94FD4 80241B94 0C00EABB */ jal get_npc_unsafe -/* B94FD8 80241B98 00C0982D */ daddu $s3, $a2, $zero -/* B94FDC 80241B9C 0040802D */ daddu $s0, $v0, $zero -/* B94FE0 80241BA0 9602008E */ lhu $v0, 0x8e($s0) -/* B94FE4 80241BA4 2442FFFF */ addiu $v0, $v0, -1 -/* B94FE8 80241BA8 A602008E */ sh $v0, 0x8e($s0) -/* B94FEC 80241BAC 00021400 */ sll $v0, $v0, 0x10 -/* B94FF0 80241BB0 14400020 */ bnez $v0, .L80241C34 -/* B94FF4 80241BB4 0260202D */ daddu $a0, $s3, $zero -/* B94FF8 80241BB8 AFA00010 */ sw $zero, 0x10($sp) -/* B94FFC 80241BBC 8E46000C */ lw $a2, 0xc($s2) -/* B95000 80241BC0 8E470010 */ lw $a3, 0x10($s2) -/* B95004 80241BC4 0C01242D */ jal func_800490B4 -/* B95008 80241BC8 0220282D */ daddu $a1, $s1, $zero -/* B9500C 80241BCC 54400018 */ bnel $v0, $zero, .L80241C30 -/* B95010 80241BD0 A600008E */ sh $zero, 0x8e($s0) -/* B95014 80241BD4 24040002 */ addiu $a0, $zero, 2 -/* B95018 80241BD8 0200282D */ daddu $a1, $s0, $zero -/* B9501C 80241BDC 0000302D */ daddu $a2, $zero, $zero -/* B95020 80241BE0 860300A8 */ lh $v1, 0xa8($s0) -/* B95024 80241BE4 3C013F80 */ lui $at, 0x3f80 -/* B95028 80241BE8 44810000 */ mtc1 $at, $f0 -/* B9502C 80241BEC 3C014000 */ lui $at, 0x4000 -/* B95030 80241BF0 44811000 */ mtc1 $at, $f2 -/* B95034 80241BF4 3C01C1A0 */ lui $at, 0xc1a0 -/* B95038 80241BF8 44812000 */ mtc1 $at, $f4 -/* B9503C 80241BFC 2402000F */ addiu $v0, $zero, 0xf -/* B95040 80241C00 AFA2001C */ sw $v0, 0x1c($sp) -/* B95044 80241C04 44833000 */ mtc1 $v1, $f6 -/* B95048 80241C08 00000000 */ nop -/* B9504C 80241C0C 468031A0 */ cvt.s.w $f6, $f6 -/* B95050 80241C10 44073000 */ mfc1 $a3, $f6 -/* B95054 80241C14 27A20028 */ addiu $v0, $sp, 0x28 -/* B95058 80241C18 AFA20020 */ sw $v0, 0x20($sp) -/* B9505C 80241C1C E7A00010 */ swc1 $f0, 0x10($sp) -/* B95060 80241C20 E7A20014 */ swc1 $f2, 0x14($sp) -/* B95064 80241C24 0C01BFA4 */ jal fx_emote -/* B95068 80241C28 E7A40018 */ swc1 $f4, 0x18($sp) -/* B9506C 80241C2C A600008E */ sh $zero, 0x8e($s0) -.L80241C30: -/* B95070 80241C30 AE800070 */ sw $zero, 0x70($s4) -.L80241C34: -/* B95074 80241C34 8FBF0044 */ lw $ra, 0x44($sp) -/* B95078 80241C38 8FB40040 */ lw $s4, 0x40($sp) -/* B9507C 80241C3C 8FB3003C */ lw $s3, 0x3c($sp) -/* B95080 80241C40 8FB20038 */ lw $s2, 0x38($sp) -/* B95084 80241C44 8FB10034 */ lw $s1, 0x34($sp) -/* B95088 80241C48 8FB00030 */ lw $s0, 0x30($sp) -/* B9508C 80241C4C 03E00008 */ jr $ra -/* B95090 80241C50 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s new file mode 100644 index 0000000000..460b777e07 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241B68_B94FA8.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B68_B94FA8 +/* B94FA8 80241B68 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B94FAC 80241B6C AFB40040 */ sw $s4, 0x40($sp) +/* B94FB0 80241B70 0080A02D */ daddu $s4, $a0, $zero +/* B94FB4 80241B74 AFBF0044 */ sw $ra, 0x44($sp) +/* B94FB8 80241B78 AFB3003C */ sw $s3, 0x3c($sp) +/* B94FBC 80241B7C AFB20038 */ sw $s2, 0x38($sp) +/* B94FC0 80241B80 AFB10034 */ sw $s1, 0x34($sp) +/* B94FC4 80241B84 AFB00030 */ sw $s0, 0x30($sp) +/* B94FC8 80241B88 8E910148 */ lw $s1, 0x148($s4) +/* B94FCC 80241B8C 00A0902D */ daddu $s2, $a1, $zero +/* B94FD0 80241B90 86240008 */ lh $a0, 8($s1) +/* B94FD4 80241B94 0C00EABB */ jal get_npc_unsafe +/* B94FD8 80241B98 00C0982D */ daddu $s3, $a2, $zero +/* B94FDC 80241B9C 0040802D */ daddu $s0, $v0, $zero +/* B94FE0 80241BA0 9602008E */ lhu $v0, 0x8e($s0) +/* B94FE4 80241BA4 2442FFFF */ addiu $v0, $v0, -1 +/* B94FE8 80241BA8 A602008E */ sh $v0, 0x8e($s0) +/* B94FEC 80241BAC 00021400 */ sll $v0, $v0, 0x10 +/* B94FF0 80241BB0 14400020 */ bnez $v0, .L80241C34 +/* B94FF4 80241BB4 0260202D */ daddu $a0, $s3, $zero +/* B94FF8 80241BB8 AFA00010 */ sw $zero, 0x10($sp) +/* B94FFC 80241BBC 8E46000C */ lw $a2, 0xc($s2) +/* B95000 80241BC0 8E470010 */ lw $a3, 0x10($s2) +/* B95004 80241BC4 0C01242D */ jal func_800490B4 +/* B95008 80241BC8 0220282D */ daddu $a1, $s1, $zero +/* B9500C 80241BCC 54400018 */ bnel $v0, $zero, .L80241C30 +/* B95010 80241BD0 A600008E */ sh $zero, 0x8e($s0) +/* B95014 80241BD4 24040002 */ addiu $a0, $zero, 2 +/* B95018 80241BD8 0200282D */ daddu $a1, $s0, $zero +/* B9501C 80241BDC 0000302D */ daddu $a2, $zero, $zero +/* B95020 80241BE0 860300A8 */ lh $v1, 0xa8($s0) +/* B95024 80241BE4 3C013F80 */ lui $at, 0x3f80 +/* B95028 80241BE8 44810000 */ mtc1 $at, $f0 +/* B9502C 80241BEC 3C014000 */ lui $at, 0x4000 +/* B95030 80241BF0 44811000 */ mtc1 $at, $f2 +/* B95034 80241BF4 3C01C1A0 */ lui $at, 0xc1a0 +/* B95038 80241BF8 44812000 */ mtc1 $at, $f4 +/* B9503C 80241BFC 2402000F */ addiu $v0, $zero, 0xf +/* B95040 80241C00 AFA2001C */ sw $v0, 0x1c($sp) +/* B95044 80241C04 44833000 */ mtc1 $v1, $f6 +/* B95048 80241C08 00000000 */ nop +/* B9504C 80241C0C 468031A0 */ cvt.s.w $f6, $f6 +/* B95050 80241C10 44073000 */ mfc1 $a3, $f6 +/* B95054 80241C14 27A20028 */ addiu $v0, $sp, 0x28 +/* B95058 80241C18 AFA20020 */ sw $v0, 0x20($sp) +/* B9505C 80241C1C E7A00010 */ swc1 $f0, 0x10($sp) +/* B95060 80241C20 E7A20014 */ swc1 $f2, 0x14($sp) +/* B95064 80241C24 0C01BFA4 */ jal fx_emote +/* B95068 80241C28 E7A40018 */ swc1 $f4, 0x18($sp) +/* B9506C 80241C2C A600008E */ sh $zero, 0x8e($s0) +.L80241C30: +/* B95070 80241C30 AE800070 */ sw $zero, 0x70($s4) +.L80241C34: +/* B95074 80241C34 8FBF0044 */ lw $ra, 0x44($sp) +/* B95078 80241C38 8FB40040 */ lw $s4, 0x40($sp) +/* B9507C 80241C3C 8FB3003C */ lw $s3, 0x3c($sp) +/* B95080 80241C40 8FB20038 */ lw $s2, 0x38($sp) +/* B95084 80241C44 8FB10034 */ lw $s1, 0x34($sp) +/* B95088 80241C48 8FB00030 */ lw $s0, 0x30($sp) +/* B9508C 80241C4C 03E00008 */ jr $ra +/* B95090 80241C50 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s index 40da1c5f2f..e13e8d78d4 100644 --- a/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s +++ b/asm/nonmatchings/world/area_mim/mim_01/B93940/func_80241C54_B95094.s @@ -99,18 +99,18 @@ glabel func_80241C54_B95094 /* B951FC 80241DBC 00000000 */ nop .L80241DC0: /* B95200 80241DC0 0260282D */ daddu $a1, $s3, $zero -/* B95204 80241DC4 0C090374 */ jal func_80240DD0 +/* B95204 80241DC4 0C090374 */ jal func_80240DD0_B94210 /* B95208 80241DC8 0280302D */ daddu $a2, $s4, $zero .L80241DCC: /* B9520C 80241DCC 0240202D */ daddu $a0, $s2, $zero /* B95210 80241DD0 0260282D */ daddu $a1, $s3, $zero -/* B95214 80241DD4 0C09038F */ jal func_80240E3C +/* B95214 80241DD4 0C09038F */ jal func_80240E3C_B9427C /* B95218 80241DD8 0280302D */ daddu $a2, $s4, $zero /* B9521C 80241DDC 0809079F */ j .L80241E7C /* B95220 80241DE0 00000000 */ nop .L80241DE4: /* B95224 80241DE4 0260282D */ daddu $a1, $s3, $zero -/* B95228 80241DE8 0C0903CE */ jal func_80240F38 +/* B95228 80241DE8 0C0903CE */ jal func_80240F38_B94378 /* B9522C 80241DEC 0280302D */ daddu $a2, $s4, $zero /* B95230 80241DF0 8E420070 */ lw $v0, 0x70($s2) /* B95234 80241DF4 14500021 */ bne $v0, $s0, .L80241E7C @@ -118,7 +118,7 @@ glabel func_80241C54_B95094 .L80241DFC: /* B9523C 80241DFC 0240202D */ daddu $a0, $s2, $zero /* B95240 80241E00 0260282D */ daddu $a1, $s3, $zero -/* B95244 80241E04 0C09065E */ jal func_80241978 +/* B95244 80241E04 0C09065E */ jal func_80241978_B94DB8 /* B95248 80241E08 0280302D */ daddu $a2, $s4, $zero /* B9524C 80241E0C 8E430070 */ lw $v1, 0x70($s2) /* B95250 80241E10 2402000C */ addiu $v0, $zero, 0xc @@ -127,7 +127,7 @@ glabel func_80241C54_B95094 /* B9525C 80241E1C 0240202D */ daddu $a0, $s2, $zero .L80241E20: /* B95260 80241E20 0260282D */ daddu $a1, $s3, $zero -/* B95264 80241E24 0C090682 */ jal func_80241A08 +/* B95264 80241E24 0C090682 */ jal func_80241A08_B94E48 /* B95268 80241E28 0280302D */ daddu $a2, $s4, $zero /* B9526C 80241E2C 8E430070 */ lw $v1, 0x70($s2) /* B95270 80241E30 2402000D */ addiu $v0, $zero, 0xd @@ -136,7 +136,7 @@ glabel func_80241C54_B95094 .L80241E3C: /* B9527C 80241E3C 0240202D */ daddu $a0, $s2, $zero /* B95280 80241E40 0260282D */ daddu $a1, $s3, $zero -/* B95284 80241E44 0C0906C2 */ jal func_80241B08 +/* B95284 80241E44 0C0906C2 */ jal func_80241B08_B94F48 /* B95288 80241E48 0280302D */ daddu $a2, $s4, $zero /* B9528C 80241E4C 8E430070 */ lw $v1, 0x70($s2) /* B95290 80241E50 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80241C54_B95094 /* B9529C 80241E5C 0240202D */ daddu $a0, $s2, $zero .L80241E60: /* B952A0 80241E60 0260282D */ daddu $a1, $s3, $zero -/* B952A4 80241E64 0C0906DA */ jal func_80241B68 +/* B952A4 80241E64 0C0906DA */ jal func_80241B68_B94FA8 /* B952A8 80241E68 0280302D */ daddu $a2, $s4, $zero /* B952AC 80241E6C 0809079F */ j .L80241E7C /* B952B0 80241E70 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698.s deleted file mode 100644 index e93d624723..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240698 -/* B98298 80240698 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B9829C 8024069C AFB40040 */ sw $s4, 0x40($sp) -/* B982A0 802406A0 0080A02D */ daddu $s4, $a0, $zero -/* B982A4 802406A4 AFBF0044 */ sw $ra, 0x44($sp) -/* B982A8 802406A8 AFB3003C */ sw $s3, 0x3c($sp) -/* B982AC 802406AC AFB20038 */ sw $s2, 0x38($sp) -/* B982B0 802406B0 AFB10034 */ sw $s1, 0x34($sp) -/* B982B4 802406B4 AFB00030 */ sw $s0, 0x30($sp) -/* B982B8 802406B8 8E920148 */ lw $s2, 0x148($s4) -/* B982BC 802406BC 00A0882D */ daddu $s1, $a1, $zero -/* B982C0 802406C0 86440008 */ lh $a0, 8($s2) -/* B982C4 802406C4 0C00EABB */ jal get_npc_unsafe -/* B982C8 802406C8 00C0982D */ daddu $s3, $a2, $zero -/* B982CC 802406CC 8E230014 */ lw $v1, 0x14($s1) -/* B982D0 802406D0 0460002D */ bltz $v1, .L80240788 -/* B982D4 802406D4 0040802D */ daddu $s0, $v0, $zero -/* B982D8 802406D8 0260202D */ daddu $a0, $s3, $zero -/* B982DC 802406DC AFA00010 */ sw $zero, 0x10($sp) -/* B982E0 802406E0 8E260024 */ lw $a2, 0x24($s1) -/* B982E4 802406E4 8E270028 */ lw $a3, 0x28($s1) -/* B982E8 802406E8 0C01242D */ jal func_800490B4 -/* B982EC 802406EC 0240282D */ daddu $a1, $s2, $zero -/* B982F0 802406F0 10400025 */ beqz $v0, .L80240788 -/* B982F4 802406F4 0000202D */ daddu $a0, $zero, $zero -/* B982F8 802406F8 0200282D */ daddu $a1, $s0, $zero -/* B982FC 802406FC 0000302D */ daddu $a2, $zero, $zero -/* B98300 80240700 860300A8 */ lh $v1, 0xa8($s0) -/* B98304 80240704 3C013F80 */ lui $at, 0x3f80 -/* B98308 80240708 44810000 */ mtc1 $at, $f0 -/* B9830C 8024070C 3C014000 */ lui $at, 0x4000 -/* B98310 80240710 44811000 */ mtc1 $at, $f2 -/* B98314 80240714 3C01C1A0 */ lui $at, 0xc1a0 -/* B98318 80240718 44812000 */ mtc1 $at, $f4 -/* B9831C 8024071C 2402000F */ addiu $v0, $zero, 0xf -/* B98320 80240720 AFA2001C */ sw $v0, 0x1c($sp) -/* B98324 80240724 44833000 */ mtc1 $v1, $f6 -/* B98328 80240728 00000000 */ nop -/* B9832C 8024072C 468031A0 */ cvt.s.w $f6, $f6 -/* B98330 80240730 44073000 */ mfc1 $a3, $f6 -/* B98334 80240734 27A20028 */ addiu $v0, $sp, 0x28 -/* B98338 80240738 AFA20020 */ sw $v0, 0x20($sp) -/* B9833C 8024073C E7A00010 */ swc1 $f0, 0x10($sp) -/* B98340 80240740 E7A20014 */ swc1 $f2, 0x14($sp) -/* B98344 80240744 0C01BFA4 */ jal fx_emote -/* B98348 80240748 E7A40018 */ swc1 $f4, 0x18($sp) -/* B9834C 8024074C 0200202D */ daddu $a0, $s0, $zero -/* B98350 80240750 240502F4 */ addiu $a1, $zero, 0x2f4 -/* B98354 80240754 0C012530 */ jal func_800494C0 -/* B98358 80240758 3C060020 */ lui $a2, 0x20 -/* B9835C 8024075C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B98360 80240760 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B98364 80240764 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B98368 80240768 C60E0040 */ lwc1 $f14, 0x40($s0) -/* B9836C 8024076C 8C460028 */ lw $a2, 0x28($v0) -/* B98370 80240770 0C00A720 */ jal atan2 -/* B98374 80240774 8C470030 */ lw $a3, 0x30($v0) -/* B98378 80240778 2402000C */ addiu $v0, $zero, 0xc -/* B9837C 8024077C E600000C */ swc1 $f0, 0xc($s0) -/* B98380 80240780 08090207 */ j .L8024081C -/* B98384 80240784 AE820070 */ sw $v0, 0x70($s4) -.L80240788: -/* B98388 80240788 8602008C */ lh $v0, 0x8c($s0) -/* B9838C 8024078C 14400023 */ bnez $v0, .L8024081C -/* B98390 80240790 00000000 */ nop -/* B98394 80240794 9602008E */ lhu $v0, 0x8e($s0) -/* B98398 80240798 2442FFFF */ addiu $v0, $v0, -1 -/* B9839C 8024079C A602008E */ sh $v0, 0x8e($s0) -/* B983A0 802407A0 00021400 */ sll $v0, $v0, 0x10 -/* B983A4 802407A4 1C40001D */ bgtz $v0, .L8024081C -/* B983A8 802407A8 00000000 */ nop -/* B983AC 802407AC 8E820074 */ lw $v0, 0x74($s4) -/* B983B0 802407B0 2442FFFF */ addiu $v0, $v0, -1 -/* B983B4 802407B4 18400018 */ blez $v0, .L80240818 -/* B983B8 802407B8 AE820074 */ sw $v0, 0x74($s4) -/* B983BC 802407BC C600000C */ lwc1 $f0, 0xc($s0) -/* B983C0 802407C0 3C014334 */ lui $at, 0x4334 -/* B983C4 802407C4 44816000 */ mtc1 $at, $f12 -/* B983C8 802407C8 0C00A6C9 */ jal clamp_angle -/* B983CC 802407CC 460C0300 */ add.s $f12, $f0, $f12 -/* B983D0 802407D0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* B983D4 802407D4 0C00A67F */ jal rand_int -/* B983D8 802407D8 E600000C */ swc1 $f0, 0xc($s0) -/* B983DC 802407DC 3C032E8B */ lui $v1, 0x2e8b -/* B983E0 802407E0 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* B983E4 802407E4 00430018 */ mult $v0, $v1 -/* B983E8 802407E8 00021FC3 */ sra $v1, $v0, 0x1f -/* B983EC 802407EC 00004010 */ mfhi $t0 -/* B983F0 802407F0 00082043 */ sra $a0, $t0, 1 -/* B983F4 802407F4 00832023 */ subu $a0, $a0, $v1 -/* B983F8 802407F8 00041840 */ sll $v1, $a0, 1 -/* B983FC 802407FC 00641821 */ addu $v1, $v1, $a0 -/* B98400 80240800 00031880 */ sll $v1, $v1, 2 -/* B98404 80240804 00641823 */ subu $v1, $v1, $a0 -/* B98408 80240808 00431023 */ subu $v0, $v0, $v1 -/* B9840C 8024080C 24420005 */ addiu $v0, $v0, 5 -/* B98410 80240810 08090207 */ j .L8024081C -/* B98414 80240814 A602008E */ sh $v0, 0x8e($s0) -.L80240818: -/* B98418 80240818 AE800070 */ sw $zero, 0x70($s4) -.L8024081C: -/* B9841C 8024081C 8FBF0044 */ lw $ra, 0x44($sp) -/* B98420 80240820 8FB40040 */ lw $s4, 0x40($sp) -/* B98424 80240824 8FB3003C */ lw $s3, 0x3c($sp) -/* B98428 80240828 8FB20038 */ lw $s2, 0x38($sp) -/* B9842C 8024082C 8FB10034 */ lw $s1, 0x34($sp) -/* B98430 80240830 8FB00030 */ lw $s0, 0x30($sp) -/* B98434 80240834 03E00008 */ jr $ra -/* B98438 80240838 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698_B98298.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698_B98298.s new file mode 100644 index 0000000000..7904a84dc0 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240698_B98298.s @@ -0,0 +1,112 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240698_B98298 +/* B98298 80240698 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* B9829C 8024069C AFB40040 */ sw $s4, 0x40($sp) +/* B982A0 802406A0 0080A02D */ daddu $s4, $a0, $zero +/* B982A4 802406A4 AFBF0044 */ sw $ra, 0x44($sp) +/* B982A8 802406A8 AFB3003C */ sw $s3, 0x3c($sp) +/* B982AC 802406AC AFB20038 */ sw $s2, 0x38($sp) +/* B982B0 802406B0 AFB10034 */ sw $s1, 0x34($sp) +/* B982B4 802406B4 AFB00030 */ sw $s0, 0x30($sp) +/* B982B8 802406B8 8E920148 */ lw $s2, 0x148($s4) +/* B982BC 802406BC 00A0882D */ daddu $s1, $a1, $zero +/* B982C0 802406C0 86440008 */ lh $a0, 8($s2) +/* B982C4 802406C4 0C00EABB */ jal get_npc_unsafe +/* B982C8 802406C8 00C0982D */ daddu $s3, $a2, $zero +/* B982CC 802406CC 8E230014 */ lw $v1, 0x14($s1) +/* B982D0 802406D0 0460002D */ bltz $v1, .L80240788 +/* B982D4 802406D4 0040802D */ daddu $s0, $v0, $zero +/* B982D8 802406D8 0260202D */ daddu $a0, $s3, $zero +/* B982DC 802406DC AFA00010 */ sw $zero, 0x10($sp) +/* B982E0 802406E0 8E260024 */ lw $a2, 0x24($s1) +/* B982E4 802406E4 8E270028 */ lw $a3, 0x28($s1) +/* B982E8 802406E8 0C01242D */ jal func_800490B4 +/* B982EC 802406EC 0240282D */ daddu $a1, $s2, $zero +/* B982F0 802406F0 10400025 */ beqz $v0, .L80240788 +/* B982F4 802406F4 0000202D */ daddu $a0, $zero, $zero +/* B982F8 802406F8 0200282D */ daddu $a1, $s0, $zero +/* B982FC 802406FC 0000302D */ daddu $a2, $zero, $zero +/* B98300 80240700 860300A8 */ lh $v1, 0xa8($s0) +/* B98304 80240704 3C013F80 */ lui $at, 0x3f80 +/* B98308 80240708 44810000 */ mtc1 $at, $f0 +/* B9830C 8024070C 3C014000 */ lui $at, 0x4000 +/* B98310 80240710 44811000 */ mtc1 $at, $f2 +/* B98314 80240714 3C01C1A0 */ lui $at, 0xc1a0 +/* B98318 80240718 44812000 */ mtc1 $at, $f4 +/* B9831C 8024071C 2402000F */ addiu $v0, $zero, 0xf +/* B98320 80240720 AFA2001C */ sw $v0, 0x1c($sp) +/* B98324 80240724 44833000 */ mtc1 $v1, $f6 +/* B98328 80240728 00000000 */ nop +/* B9832C 8024072C 468031A0 */ cvt.s.w $f6, $f6 +/* B98330 80240730 44073000 */ mfc1 $a3, $f6 +/* B98334 80240734 27A20028 */ addiu $v0, $sp, 0x28 +/* B98338 80240738 AFA20020 */ sw $v0, 0x20($sp) +/* B9833C 8024073C E7A00010 */ swc1 $f0, 0x10($sp) +/* B98340 80240740 E7A20014 */ swc1 $f2, 0x14($sp) +/* B98344 80240744 0C01BFA4 */ jal fx_emote +/* B98348 80240748 E7A40018 */ swc1 $f4, 0x18($sp) +/* B9834C 8024074C 0200202D */ daddu $a0, $s0, $zero +/* B98350 80240750 240502F4 */ addiu $a1, $zero, 0x2f4 +/* B98354 80240754 0C012530 */ jal func_800494C0 +/* B98358 80240758 3C060020 */ lui $a2, 0x20 +/* B9835C 8024075C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B98360 80240760 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B98364 80240764 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B98368 80240768 C60E0040 */ lwc1 $f14, 0x40($s0) +/* B9836C 8024076C 8C460028 */ lw $a2, 0x28($v0) +/* B98370 80240770 0C00A720 */ jal atan2 +/* B98374 80240774 8C470030 */ lw $a3, 0x30($v0) +/* B98378 80240778 2402000C */ addiu $v0, $zero, 0xc +/* B9837C 8024077C E600000C */ swc1 $f0, 0xc($s0) +/* B98380 80240780 08090207 */ j .L8024081C +/* B98384 80240784 AE820070 */ sw $v0, 0x70($s4) +.L80240788: +/* B98388 80240788 8602008C */ lh $v0, 0x8c($s0) +/* B9838C 8024078C 14400023 */ bnez $v0, .L8024081C +/* B98390 80240790 00000000 */ nop +/* B98394 80240794 9602008E */ lhu $v0, 0x8e($s0) +/* B98398 80240798 2442FFFF */ addiu $v0, $v0, -1 +/* B9839C 8024079C A602008E */ sh $v0, 0x8e($s0) +/* B983A0 802407A0 00021400 */ sll $v0, $v0, 0x10 +/* B983A4 802407A4 1C40001D */ bgtz $v0, .L8024081C +/* B983A8 802407A8 00000000 */ nop +/* B983AC 802407AC 8E820074 */ lw $v0, 0x74($s4) +/* B983B0 802407B0 2442FFFF */ addiu $v0, $v0, -1 +/* B983B4 802407B4 18400018 */ blez $v0, .L80240818 +/* B983B8 802407B8 AE820074 */ sw $v0, 0x74($s4) +/* B983BC 802407BC C600000C */ lwc1 $f0, 0xc($s0) +/* B983C0 802407C0 3C014334 */ lui $at, 0x4334 +/* B983C4 802407C4 44816000 */ mtc1 $at, $f12 +/* B983C8 802407C8 0C00A6C9 */ jal clamp_angle +/* B983CC 802407CC 460C0300 */ add.s $f12, $f0, $f12 +/* B983D0 802407D0 240403E8 */ addiu $a0, $zero, 0x3e8 +/* B983D4 802407D4 0C00A67F */ jal rand_int +/* B983D8 802407D8 E600000C */ swc1 $f0, 0xc($s0) +/* B983DC 802407DC 3C032E8B */ lui $v1, 0x2e8b +/* B983E0 802407E0 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* B983E4 802407E4 00430018 */ mult $v0, $v1 +/* B983E8 802407E8 00021FC3 */ sra $v1, $v0, 0x1f +/* B983EC 802407EC 00004010 */ mfhi $t0 +/* B983F0 802407F0 00082043 */ sra $a0, $t0, 1 +/* B983F4 802407F4 00832023 */ subu $a0, $a0, $v1 +/* B983F8 802407F8 00041840 */ sll $v1, $a0, 1 +/* B983FC 802407FC 00641821 */ addu $v1, $v1, $a0 +/* B98400 80240800 00031880 */ sll $v1, $v1, 2 +/* B98404 80240804 00641823 */ subu $v1, $v1, $a0 +/* B98408 80240808 00431023 */ subu $v0, $v0, $v1 +/* B9840C 8024080C 24420005 */ addiu $v0, $v0, 5 +/* B98410 80240810 08090207 */ j .L8024081C +/* B98414 80240814 A602008E */ sh $v0, 0x8e($s0) +.L80240818: +/* B98418 80240818 AE800070 */ sw $zero, 0x70($s4) +.L8024081C: +/* B9841C 8024081C 8FBF0044 */ lw $ra, 0x44($sp) +/* B98420 80240820 8FB40040 */ lw $s4, 0x40($sp) +/* B98424 80240824 8FB3003C */ lw $s3, 0x3c($sp) +/* B98428 80240828 8FB20038 */ lw $s2, 0x38($sp) +/* B9842C 8024082C 8FB10034 */ lw $s1, 0x34($sp) +/* B98430 80240830 8FB00030 */ lw $s0, 0x30($sp) +/* B98434 80240834 03E00008 */ jr $ra +/* B98438 80240838 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C.s deleted file mode 100644 index 0ec0ba4c8c..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024083C -/* B9843C 8024083C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B98440 80240840 AFB10014 */ sw $s1, 0x14($sp) -/* B98444 80240844 0080882D */ daddu $s1, $a0, $zero -/* B98448 80240848 AFBF001C */ sw $ra, 0x1c($sp) -/* B9844C 8024084C AFB20018 */ sw $s2, 0x18($sp) -/* B98450 80240850 AFB00010 */ sw $s0, 0x10($sp) -/* B98454 80240854 8E220148 */ lw $v0, 0x148($s1) -/* B98458 80240858 00A0902D */ daddu $s2, $a1, $zero -/* B9845C 8024085C 84440008 */ lh $a0, 8($v0) -/* B98460 80240860 0C00EABB */ jal get_npc_unsafe -/* B98464 80240864 00C0802D */ daddu $s0, $a2, $zero -/* B98468 80240868 0220202D */ daddu $a0, $s1, $zero -/* B9846C 8024086C 0240282D */ daddu $a1, $s2, $zero -/* B98470 80240870 0200302D */ daddu $a2, $s0, $zero -/* B98474 80240874 0C0127DF */ jal func_80049F7C -/* B98478 80240878 0040802D */ daddu $s0, $v0, $zero -/* B9847C 8024087C 8E020000 */ lw $v0, ($s0) -/* B98480 80240880 24040005 */ addiu $a0, $zero, 5 -/* B98484 80240884 34420800 */ ori $v0, $v0, 0x800 -/* B98488 80240888 0C00A67F */ jal rand_int -/* B9848C 8024088C AE020000 */ sw $v0, ($s0) -/* B98490 80240890 44820000 */ mtc1 $v0, $f0 -/* B98494 80240894 00000000 */ nop -/* B98498 80240898 46800021 */ cvt.d.w $f0, $f0 -/* B9849C 8024089C 3C014024 */ lui $at, 0x4024 -/* B984A0 802408A0 44811800 */ mtc1 $at, $f3 -/* B984A4 802408A4 44801000 */ mtc1 $zero, $f2 -/* B984A8 802408A8 3C013FC0 */ lui $at, 0x3fc0 -/* B984AC 802408AC 44812000 */ mtc1 $at, $f4 -/* B984B0 802408B0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* B984B4 802408B4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* B984B8 802408B8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* B984BC 802408BC C60E0040 */ lwc1 $f14, 0x40($s0) -/* B984C0 802408C0 46220000 */ add.d $f0, $f0, $f2 -/* B984C4 802408C4 E6040014 */ swc1 $f4, 0x14($s0) -/* B984C8 802408C8 46200020 */ cvt.s.d $f0, $f0 -/* B984CC 802408CC E600001C */ swc1 $f0, 0x1c($s0) -/* B984D0 802408D0 8C460028 */ lw $a2, 0x28($v0) -/* B984D4 802408D4 0C00A720 */ jal atan2 -/* B984D8 802408D8 8C470030 */ lw $a3, 0x30($v0) -/* B984DC 802408DC 0200202D */ daddu $a0, $s0, $zero -/* B984E0 802408E0 3C05B000 */ lui $a1, 0xb000 -/* B984E4 802408E4 34A50017 */ ori $a1, $a1, 0x17 -/* B984E8 802408E8 0000302D */ daddu $a2, $zero, $zero -/* B984EC 802408EC E480000C */ swc1 $f0, 0xc($a0) -/* B984F0 802408F0 C6400018 */ lwc1 $f0, 0x18($s2) -/* B984F4 802408F4 2402000D */ addiu $v0, $zero, 0xd -/* B984F8 802408F8 E4800018 */ swc1 $f0, 0x18($a0) -/* B984FC 802408FC 0C012530 */ jal func_800494C0 -/* B98500 80240900 AE220070 */ sw $v0, 0x70($s1) -/* B98504 80240904 8FBF001C */ lw $ra, 0x1c($sp) -/* B98508 80240908 8FB20018 */ lw $s2, 0x18($sp) -/* B9850C 8024090C 8FB10014 */ lw $s1, 0x14($sp) -/* B98510 80240910 8FB00010 */ lw $s0, 0x10($sp) -/* B98514 80240914 03E00008 */ jr $ra -/* B98518 80240918 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s new file mode 100644 index 0000000000..08d648e0e7 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024083C_B9843C.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024083C_B9843C +/* B9843C 8024083C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B98440 80240840 AFB10014 */ sw $s1, 0x14($sp) +/* B98444 80240844 0080882D */ daddu $s1, $a0, $zero +/* B98448 80240848 AFBF001C */ sw $ra, 0x1c($sp) +/* B9844C 8024084C AFB20018 */ sw $s2, 0x18($sp) +/* B98450 80240850 AFB00010 */ sw $s0, 0x10($sp) +/* B98454 80240854 8E220148 */ lw $v0, 0x148($s1) +/* B98458 80240858 00A0902D */ daddu $s2, $a1, $zero +/* B9845C 8024085C 84440008 */ lh $a0, 8($v0) +/* B98460 80240860 0C00EABB */ jal get_npc_unsafe +/* B98464 80240864 00C0802D */ daddu $s0, $a2, $zero +/* B98468 80240868 0220202D */ daddu $a0, $s1, $zero +/* B9846C 8024086C 0240282D */ daddu $a1, $s2, $zero +/* B98470 80240870 0200302D */ daddu $a2, $s0, $zero +/* B98474 80240874 0C0127DF */ jal func_80049F7C +/* B98478 80240878 0040802D */ daddu $s0, $v0, $zero +/* B9847C 8024087C 8E020000 */ lw $v0, ($s0) +/* B98480 80240880 24040005 */ addiu $a0, $zero, 5 +/* B98484 80240884 34420800 */ ori $v0, $v0, 0x800 +/* B98488 80240888 0C00A67F */ jal rand_int +/* B9848C 8024088C AE020000 */ sw $v0, ($s0) +/* B98490 80240890 44820000 */ mtc1 $v0, $f0 +/* B98494 80240894 00000000 */ nop +/* B98498 80240898 46800021 */ cvt.d.w $f0, $f0 +/* B9849C 8024089C 3C014024 */ lui $at, 0x4024 +/* B984A0 802408A0 44811800 */ mtc1 $at, $f3 +/* B984A4 802408A4 44801000 */ mtc1 $zero, $f2 +/* B984A8 802408A8 3C013FC0 */ lui $at, 0x3fc0 +/* B984AC 802408AC 44812000 */ mtc1 $at, $f4 +/* B984B0 802408B0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* B984B4 802408B4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* B984B8 802408B8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* B984BC 802408BC C60E0040 */ lwc1 $f14, 0x40($s0) +/* B984C0 802408C0 46220000 */ add.d $f0, $f0, $f2 +/* B984C4 802408C4 E6040014 */ swc1 $f4, 0x14($s0) +/* B984C8 802408C8 46200020 */ cvt.s.d $f0, $f0 +/* B984CC 802408CC E600001C */ swc1 $f0, 0x1c($s0) +/* B984D0 802408D0 8C460028 */ lw $a2, 0x28($v0) +/* B984D4 802408D4 0C00A720 */ jal atan2 +/* B984D8 802408D8 8C470030 */ lw $a3, 0x30($v0) +/* B984DC 802408DC 0200202D */ daddu $a0, $s0, $zero +/* B984E0 802408E0 3C05B000 */ lui $a1, 0xb000 +/* B984E4 802408E4 34A50017 */ ori $a1, $a1, 0x17 +/* B984E8 802408E8 0000302D */ daddu $a2, $zero, $zero +/* B984EC 802408EC E480000C */ swc1 $f0, 0xc($a0) +/* B984F0 802408F0 C6400018 */ lwc1 $f0, 0x18($s2) +/* B984F4 802408F4 2402000D */ addiu $v0, $zero, 0xd +/* B984F8 802408F8 E4800018 */ swc1 $f0, 0x18($a0) +/* B984FC 802408FC 0C012530 */ jal func_800494C0 +/* B98500 80240900 AE220070 */ sw $v0, 0x70($s1) +/* B98504 80240904 8FBF001C */ lw $ra, 0x1c($sp) +/* B98508 80240908 8FB20018 */ lw $s2, 0x18($sp) +/* B9850C 8024090C 8FB10014 */ lw $s1, 0x14($sp) +/* B98510 80240910 8FB00010 */ lw $s0, 0x10($sp) +/* B98514 80240914 03E00008 */ jr $ra +/* B98518 80240918 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s index ff7595ab11..8eae94b6c4 100644 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_80240C60_B98860.s @@ -95,17 +95,17 @@ glabel func_80240C60_B98860 /* B989C0 80240DC0 00000000 */ nop /* B989C4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* B989C8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* B989CC 80240DCC 0C09001C */ jal func_80240070 +/* B989CC 80240DCC 0C09001C */ jal func_80240070_B97C70 /* B989D0 80240DD0 0200302D */ daddu $a2, $s0, $zero /* B989D4 80240DD4 0260202D */ daddu $a0, $s3, $zero /* B989D8 80240DD8 0280282D */ daddu $a1, $s4, $zero -/* B989DC 80240DDC 0C0900A8 */ jal func_802402A0 +/* B989DC 80240DDC 0C0900A8 */ jal func_802402A0_B97EA0 /* B989E0 80240DE0 0200302D */ daddu $a2, $s0, $zero /* B989E4 80240DE4 08090398 */ j .L80240E60 /* B989E8 80240DE8 0000102D */ daddu $v0, $zero, $zero /* B989EC 80240DEC 0260202D */ daddu $a0, $s3, $zero /* B989F0 80240DF0 0280282D */ daddu $a1, $s4, $zero -/* B989F4 80240DF4 0C090176 */ jal func_802405D8 +/* B989F4 80240DF4 0C090176 */ jal func_802405D8_B981D8 /* B989F8 80240DF8 0200302D */ daddu $a2, $s0, $zero /* B989FC 80240DFC 8E630070 */ lw $v1, 0x70($s3) /* B98A00 80240E00 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80240C60_B98860 /* B98A08 80240E08 0000102D */ daddu $v0, $zero, $zero /* B98A0C 80240E0C 0260202D */ daddu $a0, $s3, $zero /* B98A10 80240E10 0280282D */ daddu $a1, $s4, $zero -/* B98A14 80240E14 0C0901A6 */ jal func_80240698 +/* B98A14 80240E14 0C0901A6 */ jal func_80240698_B98298 /* B98A18 80240E18 0200302D */ daddu $a2, $s0, $zero /* B98A1C 80240E1C 08090398 */ j .L80240E60 /* B98A20 80240E20 0000102D */ daddu $v0, $zero, $zero /* B98A24 80240E24 0260202D */ daddu $a0, $s3, $zero /* B98A28 80240E28 0280282D */ daddu $a1, $s4, $zero -/* B98A2C 80240E2C 0C09020F */ jal func_8024083C +/* B98A2C 80240E2C 0C09020F */ jal func_8024083C_B9843C /* B98A30 80240E30 0200302D */ daddu $a2, $s0, $zero /* B98A34 80240E34 0260202D */ daddu $a0, $s3, $zero /* B98A38 80240E38 0280282D */ daddu $a1, $s4, $zero -/* B98A3C 80240E3C 0C090247 */ jal func_8024091C +/* B98A3C 80240E3C 0C090247 */ jal func_8024091C_B9851C /* B98A40 80240E40 0200302D */ daddu $a2, $s0, $zero /* B98A44 80240E44 08090398 */ j .L80240E60 /* B98A48 80240E48 0000102D */ daddu $v0, $zero, $zero /* B98A4C 80240E4C 0260202D */ daddu $a0, $s3, $zero /* B98A50 80240E50 0280282D */ daddu $a1, $s4, $zero -/* B98A54 80240E54 0C090307 */ jal func_80240C1C +/* B98A54 80240E54 0C090307 */ jal func_80240C1C_B9881C /* B98A58 80240E58 0200302D */ daddu $a2, $s0, $zero .L80240E5C: /* B98A5C 80240E5C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C.s deleted file mode 100644 index 7c9df4540d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024113C -/* B98D3C 8024113C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B98D40 80241140 AFBF0010 */ sw $ra, 0x10($sp) -/* B98D44 80241144 8C82000C */ lw $v0, 0xc($a0) -/* B98D48 80241148 0C0B1EAF */ jal get_variable -/* B98D4C 8024114C 8C450000 */ lw $a1, ($v0) -/* B98D50 80241150 0040182D */ daddu $v1, $v0, $zero -/* B98D54 80241154 10600012 */ beqz $v1, .L802411A0 -/* B98D58 80241158 0000202D */ daddu $a0, $zero, $zero -/* B98D5C 8024115C 8C620000 */ lw $v0, ($v1) -/* B98D60 80241160 5040000A */ beql $v0, $zero, .L8024118C -/* B98D64 80241164 00041080 */ sll $v0, $a0, 2 -/* B98D68 80241168 3C058024 */ lui $a1, 0x8024 -/* B98D6C 8024116C 24A53880 */ addiu $a1, $a1, 0x3880 -.L80241170: -/* B98D70 80241170 24630004 */ addiu $v1, $v1, 4 -/* B98D74 80241174 24840001 */ addiu $a0, $a0, 1 -/* B98D78 80241178 ACA20000 */ sw $v0, ($a1) -/* B98D7C 8024117C 8C620000 */ lw $v0, ($v1) -/* B98D80 80241180 1440FFFB */ bnez $v0, .L80241170 -/* B98D84 80241184 24A50004 */ addiu $a1, $a1, 4 -/* B98D88 80241188 00041080 */ sll $v0, $a0, 2 -.L8024118C: -/* B98D8C 8024118C 3C018024 */ lui $at, 0x8024 -/* B98D90 80241190 00220821 */ addu $at, $at, $v0 -/* B98D94 80241194 AC203880 */ sw $zero, 0x3880($at) -/* B98D98 80241198 08090472 */ j .L802411C8 -/* B98D9C 8024119C 00000000 */ nop -.L802411A0: -/* B98DA0 802411A0 3C038024 */ lui $v1, 0x8024 -/* B98DA4 802411A4 24633880 */ addiu $v1, $v1, 0x3880 -/* B98DA8 802411A8 0060282D */ daddu $a1, $v1, $zero -.L802411AC: -/* B98DAC 802411AC 24820010 */ addiu $v0, $a0, 0x10 -/* B98DB0 802411B0 AC620000 */ sw $v0, ($v1) -/* B98DB4 802411B4 24630004 */ addiu $v1, $v1, 4 -/* B98DB8 802411B8 24840001 */ addiu $a0, $a0, 1 -/* B98DBC 802411BC 28820070 */ slti $v0, $a0, 0x70 -/* B98DC0 802411C0 1440FFFA */ bnez $v0, .L802411AC -/* B98DC4 802411C4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802411C8: -/* B98DC8 802411C8 8FBF0010 */ lw $ra, 0x10($sp) -/* B98DCC 802411CC 24020002 */ addiu $v0, $zero, 2 -/* B98DD0 802411D0 03E00008 */ jr $ra -/* B98DD4 802411D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B98DD8 802411D8 00000000 */ nop -/* B98DDC 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s new file mode 100644 index 0000000000..5bca9268ba --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_02/B97C70/func_8024113C_B98D3C.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024113C_B98D3C +/* B98D3C 8024113C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B98D40 80241140 AFBF0010 */ sw $ra, 0x10($sp) +/* B98D44 80241144 8C82000C */ lw $v0, 0xc($a0) +/* B98D48 80241148 0C0B1EAF */ jal get_variable +/* B98D4C 8024114C 8C450000 */ lw $a1, ($v0) +/* B98D50 80241150 0040182D */ daddu $v1, $v0, $zero +/* B98D54 80241154 10600012 */ beqz $v1, .L802411A0 +/* B98D58 80241158 0000202D */ daddu $a0, $zero, $zero +/* B98D5C 8024115C 8C620000 */ lw $v0, ($v1) +/* B98D60 80241160 5040000A */ beql $v0, $zero, .L8024118C +/* B98D64 80241164 00041080 */ sll $v0, $a0, 2 +/* B98D68 80241168 3C058024 */ lui $a1, 0x8024 +/* B98D6C 8024116C 24A53880 */ addiu $a1, $a1, 0x3880 +.L80241170: +/* B98D70 80241170 24630004 */ addiu $v1, $v1, 4 +/* B98D74 80241174 24840001 */ addiu $a0, $a0, 1 +/* B98D78 80241178 ACA20000 */ sw $v0, ($a1) +/* B98D7C 8024117C 8C620000 */ lw $v0, ($v1) +/* B98D80 80241180 1440FFFB */ bnez $v0, .L80241170 +/* B98D84 80241184 24A50004 */ addiu $a1, $a1, 4 +/* B98D88 80241188 00041080 */ sll $v0, $a0, 2 +.L8024118C: +/* B98D8C 8024118C 3C018024 */ lui $at, 0x8024 +/* B98D90 80241190 00220821 */ addu $at, $at, $v0 +/* B98D94 80241194 AC203880 */ sw $zero, 0x3880($at) +/* B98D98 80241198 08090472 */ j .L802411C8 +/* B98D9C 8024119C 00000000 */ nop +.L802411A0: +/* B98DA0 802411A0 3C038024 */ lui $v1, 0x8024 +/* B98DA4 802411A4 24633880 */ addiu $v1, $v1, 0x3880 +/* B98DA8 802411A8 0060282D */ daddu $a1, $v1, $zero +.L802411AC: +/* B98DAC 802411AC 24820010 */ addiu $v0, $a0, 0x10 +/* B98DB0 802411B0 AC620000 */ sw $v0, ($v1) +/* B98DB4 802411B4 24630004 */ addiu $v1, $v1, 4 +/* B98DB8 802411B8 24840001 */ addiu $a0, $a0, 1 +/* B98DBC 802411BC 28820070 */ slti $v0, $a0, 0x70 +/* B98DC0 802411C0 1440FFFA */ bnez $v0, .L802411AC +/* B98DC4 802411C4 ACA001C0 */ sw $zero, 0x1c0($a1) +.L802411C8: +/* B98DC8 802411C8 8FBF0010 */ lw $ra, 0x10($sp) +/* B98DCC 802411CC 24020002 */ addiu $v0, $zero, 2 +/* B98DD0 802411D0 03E00008 */ jr $ra +/* B98DD4 802411D4 27BD0018 */ addiu $sp, $sp, 0x18 +/* B98DD8 802411D8 00000000 */ nop +/* B98DDC 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s index 19eab88408..4f573ecf11 100644 --- a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s +++ b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_802400A0_B9B520.s @@ -62,7 +62,7 @@ glabel func_802400A0_B9B520 /* B9B5F8 80240178 02A0382D */ daddu $a3, $s5, $zero /* B9B5FC 8024017C E7A00018 */ swc1 $f0, 0x18($sp) /* B9B600 80240180 E7A2001C */ swc1 $f2, 0x1c($sp) -/* B9B604 80240184 0C090028 */ jal func_802400A0 +/* B9B604 80240184 0C090028 */ jal func_802400A0_B9B520 /* B9B608 80240188 E7B00020 */ swc1 $f16, 0x20($sp) /* B9B60C 8024018C C7A00018 */ lwc1 $f0, 0x18($sp) /* B9B610 80240190 C7A2001C */ lwc1 $f2, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s index f1e8dc2166..c1b2e0967f 100644 --- a/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s +++ b/asm/nonmatchings/world/area_mim/mim_03/B9B480/func_80240420_B9B8A0.s @@ -22,7 +22,7 @@ glabel func_80240420_B9B8A0 /* B9B8E4 80240464 8C420004 */ lw $v0, 4($v0) /* B9B8E8 80240468 27A60014 */ addiu $a2, $sp, 0x14 /* B9B8EC 8024046C 8C440000 */ lw $a0, ($v0) -/* B9B8F0 80240470 0C090028 */ jal func_802400A0 +/* B9B8F0 80240470 0C090028 */ jal func_802400A0_B9B520 /* B9B8F4 80240474 27A70018 */ addiu $a3, $sp, 0x18 /* B9B8F8 80240478 C7A00010 */ lwc1 $f0, 0x10($sp) /* B9B8FC 8024047C 3C014480 */ lui $at, 0x4480 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s index e99e80b93c..aa534816a1 100644 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80240DF0_B9E750.s @@ -95,17 +95,17 @@ glabel func_80240DF0_B9E750 /* B9E8B0 80240F50 00000000 */ nop /* B9E8B4 80240F54 0260202D */ daddu $a0, $s3, $zero /* B9E8B8 80240F58 0280282D */ daddu $a1, $s4, $zero -/* B9E8BC 80240F5C 0C090080 */ jal func_80240200 +/* B9E8BC 80240F5C 0C090080 */ jal func_80240200_B9DB60 /* B9E8C0 80240F60 0200302D */ daddu $a2, $s0, $zero /* B9E8C4 80240F64 0260202D */ daddu $a0, $s3, $zero /* B9E8C8 80240F68 0280282D */ daddu $a1, $s4, $zero -/* B9E8CC 80240F6C 0C09010C */ jal func_80240430 +/* B9E8CC 80240F6C 0C09010C */ jal func_80240430_B9DD90 /* B9E8D0 80240F70 0200302D */ daddu $a2, $s0, $zero /* B9E8D4 80240F74 080903FC */ j .L80240FF0 /* B9E8D8 80240F78 0000102D */ daddu $v0, $zero, $zero /* B9E8DC 80240F7C 0260202D */ daddu $a0, $s3, $zero /* B9E8E0 80240F80 0280282D */ daddu $a1, $s4, $zero -/* B9E8E4 80240F84 0C0901DA */ jal func_80240768 +/* B9E8E4 80240F84 0C0901DA */ jal func_80240768_B9E0C8 /* B9E8E8 80240F88 0200302D */ daddu $a2, $s0, $zero /* B9E8EC 80240F8C 8E630070 */ lw $v1, 0x70($s3) /* B9E8F0 80240F90 24020003 */ addiu $v0, $zero, 3 @@ -113,7 +113,7 @@ glabel func_80240DF0_B9E750 /* B9E8F8 80240F98 0000102D */ daddu $v0, $zero, $zero /* B9E8FC 80240F9C 0260202D */ daddu $a0, $s3, $zero /* B9E900 80240FA0 0280282D */ daddu $a1, $s4, $zero -/* B9E904 80240FA4 0C09020A */ jal func_80240828 +/* B9E904 80240FA4 0C09020A */ jal func_80240828_B9E188 /* B9E908 80240FA8 0200302D */ daddu $a2, $s0, $zero /* B9E90C 80240FAC 080903FC */ j .L80240FF0 /* B9E910 80240FB0 0000102D */ daddu $v0, $zero, $zero @@ -123,7 +123,7 @@ glabel func_80240DF0_B9E750 /* B9E920 80240FC0 0200302D */ daddu $a2, $s0, $zero /* B9E924 80240FC4 0260202D */ daddu $a0, $s3, $zero /* B9E928 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* B9E92C 80240FCC 0C0902AB */ jal func_80240AAC +/* B9E92C 80240FCC 0C0902AB */ jal func_80240AAC_B9E40C /* B9E930 80240FD0 0200302D */ daddu $a2, $s0, $zero /* B9E934 80240FD4 080903FC */ j .L80240FF0 /* B9E938 80240FD8 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014.s deleted file mode 100644 index 0765d8c683..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241014 -/* B9E974 80241014 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B9E978 80241018 AFB00010 */ sw $s0, 0x10($sp) -/* B9E97C 8024101C 3C108024 */ lui $s0, 0x8024 -/* B9E980 80241020 26102614 */ addiu $s0, $s0, 0x2614 -/* B9E984 80241024 AFBF0018 */ sw $ra, 0x18($sp) -/* B9E988 80241028 AFB10014 */ sw $s1, 0x14($sp) -/* B9E98C 8024102C 8E020000 */ lw $v0, ($s0) -/* B9E990 80241030 14400010 */ bnez $v0, .L80241074 -/* B9E994 80241034 0080882D */ daddu $s1, $a0, $zero -/* B9E998 80241038 0C00AB39 */ jal heap_malloc -/* B9E99C 8024103C 24040040 */ addiu $a0, $zero, 0x40 -/* B9E9A0 80241040 AE020000 */ sw $v0, ($s0) -/* B9E9A4 80241044 0000182D */ daddu $v1, $zero, $zero -/* B9E9A8 80241048 0040282D */ daddu $a1, $v0, $zero -/* B9E9AC 8024104C 0220202D */ daddu $a0, $s1, $zero -.L80241050: -/* B9E9B0 80241050 8C820084 */ lw $v0, 0x84($a0) -/* B9E9B4 80241054 24840004 */ addiu $a0, $a0, 4 -/* B9E9B8 80241058 24630001 */ addiu $v1, $v1, 1 -/* B9E9BC 8024105C ACA20000 */ sw $v0, ($a1) -/* B9E9C0 80241060 28620010 */ slti $v0, $v1, 0x10 -/* B9E9C4 80241064 1440FFFA */ bnez $v0, .L80241050 -/* B9E9C8 80241068 24A50004 */ addiu $a1, $a1, 4 -/* B9E9CC 8024106C 0809042C */ j .L802410B0 -/* B9E9D0 80241070 00000000 */ nop -.L80241074: -/* B9E9D4 80241074 0000182D */ daddu $v1, $zero, $zero -/* B9E9D8 80241078 0040282D */ daddu $a1, $v0, $zero -/* B9E9DC 8024107C 0220202D */ daddu $a0, $s1, $zero -.L80241080: -/* B9E9E0 80241080 8CA20000 */ lw $v0, ($a1) -/* B9E9E4 80241084 24A50004 */ addiu $a1, $a1, 4 -/* B9E9E8 80241088 24630001 */ addiu $v1, $v1, 1 -/* B9E9EC 8024108C AC820084 */ sw $v0, 0x84($a0) -/* B9E9F0 80241090 28620010 */ slti $v0, $v1, 0x10 -/* B9E9F4 80241094 1440FFFA */ bnez $v0, .L80241080 -/* B9E9F8 80241098 24840004 */ addiu $a0, $a0, 4 -/* B9E9FC 8024109C 3C108024 */ lui $s0, 0x8024 -/* B9EA00 802410A0 26102614 */ addiu $s0, $s0, 0x2614 -/* B9EA04 802410A4 0C00AB4B */ jal heap_free -/* B9EA08 802410A8 8E040000 */ lw $a0, ($s0) -/* B9EA0C 802410AC AE000000 */ sw $zero, ($s0) -.L802410B0: -/* B9EA10 802410B0 8FBF0018 */ lw $ra, 0x18($sp) -/* B9EA14 802410B4 8FB10014 */ lw $s1, 0x14($sp) -/* B9EA18 802410B8 8FB00010 */ lw $s0, 0x10($sp) -/* B9EA1C 802410BC 24020002 */ addiu $v0, $zero, 2 -/* B9EA20 802410C0 03E00008 */ jr $ra -/* B9EA24 802410C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s new file mode 100644 index 0000000000..af0fbd273f --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_04/B9DB60/func_80241014_B9E974.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241014_B9E974 +/* B9E974 80241014 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B9E978 80241018 AFB00010 */ sw $s0, 0x10($sp) +/* B9E97C 8024101C 3C108024 */ lui $s0, 0x8024 +/* B9E980 80241020 26102614 */ addiu $s0, $s0, 0x2614 +/* B9E984 80241024 AFBF0018 */ sw $ra, 0x18($sp) +/* B9E988 80241028 AFB10014 */ sw $s1, 0x14($sp) +/* B9E98C 8024102C 8E020000 */ lw $v0, ($s0) +/* B9E990 80241030 14400010 */ bnez $v0, .L80241074 +/* B9E994 80241034 0080882D */ daddu $s1, $a0, $zero +/* B9E998 80241038 0C00AB39 */ jal heap_malloc +/* B9E99C 8024103C 24040040 */ addiu $a0, $zero, 0x40 +/* B9E9A0 80241040 AE020000 */ sw $v0, ($s0) +/* B9E9A4 80241044 0000182D */ daddu $v1, $zero, $zero +/* B9E9A8 80241048 0040282D */ daddu $a1, $v0, $zero +/* B9E9AC 8024104C 0220202D */ daddu $a0, $s1, $zero +.L80241050: +/* B9E9B0 80241050 8C820084 */ lw $v0, 0x84($a0) +/* B9E9B4 80241054 24840004 */ addiu $a0, $a0, 4 +/* B9E9B8 80241058 24630001 */ addiu $v1, $v1, 1 +/* B9E9BC 8024105C ACA20000 */ sw $v0, ($a1) +/* B9E9C0 80241060 28620010 */ slti $v0, $v1, 0x10 +/* B9E9C4 80241064 1440FFFA */ bnez $v0, .L80241050 +/* B9E9C8 80241068 24A50004 */ addiu $a1, $a1, 4 +/* B9E9CC 8024106C 0809042C */ j .L802410B0 +/* B9E9D0 80241070 00000000 */ nop +.L80241074: +/* B9E9D4 80241074 0000182D */ daddu $v1, $zero, $zero +/* B9E9D8 80241078 0040282D */ daddu $a1, $v0, $zero +/* B9E9DC 8024107C 0220202D */ daddu $a0, $s1, $zero +.L80241080: +/* B9E9E0 80241080 8CA20000 */ lw $v0, ($a1) +/* B9E9E4 80241084 24A50004 */ addiu $a1, $a1, 4 +/* B9E9E8 80241088 24630001 */ addiu $v1, $v1, 1 +/* B9E9EC 8024108C AC820084 */ sw $v0, 0x84($a0) +/* B9E9F0 80241090 28620010 */ slti $v0, $v1, 0x10 +/* B9E9F4 80241094 1440FFFA */ bnez $v0, .L80241080 +/* B9E9F8 80241098 24840004 */ addiu $a0, $a0, 4 +/* B9E9FC 8024109C 3C108024 */ lui $s0, 0x8024 +/* B9EA00 802410A0 26102614 */ addiu $s0, $s0, 0x2614 +/* B9EA04 802410A4 0C00AB4B */ jal heap_free +/* B9EA08 802410A8 8E040000 */ lw $a0, ($s0) +/* B9EA0C 802410AC AE000000 */ sw $zero, ($s0) +.L802410B0: +/* B9EA10 802410B0 8FBF0018 */ lw $ra, 0x18($sp) +/* B9EA14 802410B4 8FB10014 */ lw $s1, 0x14($sp) +/* B9EA18 802410B8 8FB00010 */ lw $s0, 0x10($sp) +/* B9EA1C 802410BC 24020002 */ addiu $v0, $zero, 2 +/* B9EA20 802410C0 03E00008 */ jr $ra +/* B9EA24 802410C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC.s deleted file mode 100644 index 8df08dc5e7..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400DC -/* BA080C 802400DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA0810 802400E0 AFB10014 */ sw $s1, 0x14($sp) -/* BA0814 802400E4 0080882D */ daddu $s1, $a0, $zero -/* BA0818 802400E8 AFBF0018 */ sw $ra, 0x18($sp) -/* BA081C 802400EC AFB00010 */ sw $s0, 0x10($sp) -/* BA0820 802400F0 8E300148 */ lw $s0, 0x148($s1) -/* BA0824 802400F4 0C00EABB */ jal get_npc_unsafe -/* BA0828 802400F8 86040008 */ lh $a0, 8($s0) -/* BA082C 802400FC 0040202D */ daddu $a0, $v0, $zero -/* BA0830 80240100 9482008E */ lhu $v0, 0x8e($a0) -/* BA0834 80240104 2442FFFF */ addiu $v0, $v0, -1 -/* BA0838 80240108 A482008E */ sh $v0, 0x8e($a0) -/* BA083C 8024010C 00021400 */ sll $v0, $v0, 0x10 -/* BA0840 80240110 1C400009 */ bgtz $v0, .L80240138 -/* BA0844 80240114 24020003 */ addiu $v0, $zero, 3 -/* BA0848 80240118 96030076 */ lhu $v1, 0x76($s0) -/* BA084C 8024011C AE02006C */ sw $v0, 0x6c($s0) -/* BA0850 80240120 A483008E */ sh $v1, 0x8e($a0) -/* BA0854 80240124 8E0200CC */ lw $v0, 0xcc($s0) -/* BA0858 80240128 8C420024 */ lw $v0, 0x24($v0) -/* BA085C 8024012C AC820028 */ sw $v0, 0x28($a0) -/* BA0860 80240130 24020020 */ addiu $v0, $zero, 0x20 -/* BA0864 80240134 AE220070 */ sw $v0, 0x70($s1) -.L80240138: -/* BA0868 80240138 8FBF0018 */ lw $ra, 0x18($sp) -/* BA086C 8024013C 8FB10014 */ lw $s1, 0x14($sp) -/* BA0870 80240140 8FB00010 */ lw $s0, 0x10($sp) -/* BA0874 80240144 03E00008 */ jr $ra -/* BA0878 80240148 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s new file mode 100644 index 0000000000..199e967854 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802400DC_BA080C.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400DC_BA080C +/* BA080C 802400DC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BA0810 802400E0 AFB10014 */ sw $s1, 0x14($sp) +/* BA0814 802400E4 0080882D */ daddu $s1, $a0, $zero +/* BA0818 802400E8 AFBF0018 */ sw $ra, 0x18($sp) +/* BA081C 802400EC AFB00010 */ sw $s0, 0x10($sp) +/* BA0820 802400F0 8E300148 */ lw $s0, 0x148($s1) +/* BA0824 802400F4 0C00EABB */ jal get_npc_unsafe +/* BA0828 802400F8 86040008 */ lh $a0, 8($s0) +/* BA082C 802400FC 0040202D */ daddu $a0, $v0, $zero +/* BA0830 80240100 9482008E */ lhu $v0, 0x8e($a0) +/* BA0834 80240104 2442FFFF */ addiu $v0, $v0, -1 +/* BA0838 80240108 A482008E */ sh $v0, 0x8e($a0) +/* BA083C 8024010C 00021400 */ sll $v0, $v0, 0x10 +/* BA0840 80240110 1C400009 */ bgtz $v0, .L80240138 +/* BA0844 80240114 24020003 */ addiu $v0, $zero, 3 +/* BA0848 80240118 96030076 */ lhu $v1, 0x76($s0) +/* BA084C 8024011C AE02006C */ sw $v0, 0x6c($s0) +/* BA0850 80240120 A483008E */ sh $v1, 0x8e($a0) +/* BA0854 80240124 8E0200CC */ lw $v0, 0xcc($s0) +/* BA0858 80240128 8C420024 */ lw $v0, 0x24($v0) +/* BA085C 8024012C AC820028 */ sw $v0, 0x28($a0) +/* BA0860 80240130 24020020 */ addiu $v0, $zero, 0x20 +/* BA0864 80240134 AE220070 */ sw $v0, 0x70($s1) +.L80240138: +/* BA0868 80240138 8FBF0018 */ lw $ra, 0x18($sp) +/* BA086C 8024013C 8FB10014 */ lw $s1, 0x14($sp) +/* BA0870 80240140 8FB00010 */ lw $s0, 0x10($sp) +/* BA0874 80240144 03E00008 */ jr $ra +/* BA0878 80240148 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C.s deleted file mode 100644 index dc44734369..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024014C -/* BA087C 8024014C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA0880 80240150 AFB10034 */ sw $s1, 0x34($sp) -/* BA0884 80240154 0080882D */ daddu $s1, $a0, $zero -/* BA0888 80240158 AFBF0038 */ sw $ra, 0x38($sp) -/* BA088C 8024015C AFB00030 */ sw $s0, 0x30($sp) -/* BA0890 80240160 8E300148 */ lw $s0, 0x148($s1) -/* BA0894 80240164 0C00EABB */ jal get_npc_unsafe -/* BA0898 80240168 86040008 */ lh $a0, 8($s0) -/* BA089C 8024016C 0040282D */ daddu $a1, $v0, $zero -/* BA08A0 80240170 94A2008E */ lhu $v0, 0x8e($a1) -/* BA08A4 80240174 2442FFFF */ addiu $v0, $v0, -1 -/* BA08A8 80240178 A4A2008E */ sh $v0, 0x8e($a1) -/* BA08AC 8024017C 00021400 */ sll $v0, $v0, 0x10 -/* BA08B0 80240180 1C400023 */ bgtz $v0, .L80240210 -/* BA08B4 80240184 24020004 */ addiu $v0, $zero, 4 -/* BA08B8 80240188 8E0300CC */ lw $v1, 0xcc($s0) -/* BA08BC 8024018C AE02006C */ sw $v0, 0x6c($s0) -/* BA08C0 80240190 8C620000 */ lw $v0, ($v1) -/* BA08C4 80240194 ACA20028 */ sw $v0, 0x28($a1) -/* BA08C8 80240198 9602007A */ lhu $v0, 0x7a($s0) -/* BA08CC 8024019C A4A2008E */ sh $v0, 0x8e($a1) -/* BA08D0 802401A0 8E020078 */ lw $v0, 0x78($s0) -/* BA08D4 802401A4 28420008 */ slti $v0, $v0, 8 -/* BA08D8 802401A8 14400018 */ bnez $v0, .L8024020C -/* BA08DC 802401AC 24020021 */ addiu $v0, $zero, 0x21 -/* BA08E0 802401B0 24040003 */ addiu $a0, $zero, 3 -/* BA08E4 802401B4 27A30028 */ addiu $v1, $sp, 0x28 -/* BA08E8 802401B8 84A700A8 */ lh $a3, 0xa8($a1) -/* BA08EC 802401BC 3C013F80 */ lui $at, 0x3f80 -/* BA08F0 802401C0 44810000 */ mtc1 $at, $f0 -/* BA08F4 802401C4 3C014000 */ lui $at, 0x4000 -/* BA08F8 802401C8 44811000 */ mtc1 $at, $f2 -/* BA08FC 802401CC 3C01C1A0 */ lui $at, 0xc1a0 -/* BA0900 802401D0 44812000 */ mtc1 $at, $f4 -/* BA0904 802401D4 44873000 */ mtc1 $a3, $f6 -/* BA0908 802401D8 00000000 */ nop -/* BA090C 802401DC 468031A0 */ cvt.s.w $f6, $f6 -/* BA0910 802401E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA0914 802401E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA0918 802401E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA091C 802401EC 8E020078 */ lw $v0, 0x78($s0) -/* BA0920 802401F0 44073000 */ mfc1 $a3, $f6 -/* BA0924 802401F4 0000302D */ daddu $a2, $zero, $zero -/* BA0928 802401F8 AFA30020 */ sw $v1, 0x20($sp) -/* BA092C 802401FC 2442FFFF */ addiu $v0, $v0, -1 -/* BA0930 80240200 0C01BFA4 */ jal fx_emote -/* BA0934 80240204 AFA2001C */ sw $v0, 0x1c($sp) -/* BA0938 80240208 24020021 */ addiu $v0, $zero, 0x21 -.L8024020C: -/* BA093C 8024020C AE220070 */ sw $v0, 0x70($s1) -.L80240210: -/* BA0940 80240210 8FBF0038 */ lw $ra, 0x38($sp) -/* BA0944 80240214 8FB10034 */ lw $s1, 0x34($sp) -/* BA0948 80240218 8FB00030 */ lw $s0, 0x30($sp) -/* BA094C 8024021C 03E00008 */ jr $ra -/* BA0950 80240220 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s new file mode 100644 index 0000000000..8eb72cd97d --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024014C_BA087C.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024014C_BA087C +/* BA087C 8024014C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* BA0880 80240150 AFB10034 */ sw $s1, 0x34($sp) +/* BA0884 80240154 0080882D */ daddu $s1, $a0, $zero +/* BA0888 80240158 AFBF0038 */ sw $ra, 0x38($sp) +/* BA088C 8024015C AFB00030 */ sw $s0, 0x30($sp) +/* BA0890 80240160 8E300148 */ lw $s0, 0x148($s1) +/* BA0894 80240164 0C00EABB */ jal get_npc_unsafe +/* BA0898 80240168 86040008 */ lh $a0, 8($s0) +/* BA089C 8024016C 0040282D */ daddu $a1, $v0, $zero +/* BA08A0 80240170 94A2008E */ lhu $v0, 0x8e($a1) +/* BA08A4 80240174 2442FFFF */ addiu $v0, $v0, -1 +/* BA08A8 80240178 A4A2008E */ sh $v0, 0x8e($a1) +/* BA08AC 8024017C 00021400 */ sll $v0, $v0, 0x10 +/* BA08B0 80240180 1C400023 */ bgtz $v0, .L80240210 +/* BA08B4 80240184 24020004 */ addiu $v0, $zero, 4 +/* BA08B8 80240188 8E0300CC */ lw $v1, 0xcc($s0) +/* BA08BC 8024018C AE02006C */ sw $v0, 0x6c($s0) +/* BA08C0 80240190 8C620000 */ lw $v0, ($v1) +/* BA08C4 80240194 ACA20028 */ sw $v0, 0x28($a1) +/* BA08C8 80240198 9602007A */ lhu $v0, 0x7a($s0) +/* BA08CC 8024019C A4A2008E */ sh $v0, 0x8e($a1) +/* BA08D0 802401A0 8E020078 */ lw $v0, 0x78($s0) +/* BA08D4 802401A4 28420008 */ slti $v0, $v0, 8 +/* BA08D8 802401A8 14400018 */ bnez $v0, .L8024020C +/* BA08DC 802401AC 24020021 */ addiu $v0, $zero, 0x21 +/* BA08E0 802401B0 24040003 */ addiu $a0, $zero, 3 +/* BA08E4 802401B4 27A30028 */ addiu $v1, $sp, 0x28 +/* BA08E8 802401B8 84A700A8 */ lh $a3, 0xa8($a1) +/* BA08EC 802401BC 3C013F80 */ lui $at, 0x3f80 +/* BA08F0 802401C0 44810000 */ mtc1 $at, $f0 +/* BA08F4 802401C4 3C014000 */ lui $at, 0x4000 +/* BA08F8 802401C8 44811000 */ mtc1 $at, $f2 +/* BA08FC 802401CC 3C01C1A0 */ lui $at, 0xc1a0 +/* BA0900 802401D0 44812000 */ mtc1 $at, $f4 +/* BA0904 802401D4 44873000 */ mtc1 $a3, $f6 +/* BA0908 802401D8 00000000 */ nop +/* BA090C 802401DC 468031A0 */ cvt.s.w $f6, $f6 +/* BA0910 802401E0 E7A00010 */ swc1 $f0, 0x10($sp) +/* BA0914 802401E4 E7A20014 */ swc1 $f2, 0x14($sp) +/* BA0918 802401E8 E7A40018 */ swc1 $f4, 0x18($sp) +/* BA091C 802401EC 8E020078 */ lw $v0, 0x78($s0) +/* BA0920 802401F0 44073000 */ mfc1 $a3, $f6 +/* BA0924 802401F4 0000302D */ daddu $a2, $zero, $zero +/* BA0928 802401F8 AFA30020 */ sw $v1, 0x20($sp) +/* BA092C 802401FC 2442FFFF */ addiu $v0, $v0, -1 +/* BA0930 80240200 0C01BFA4 */ jal fx_emote +/* BA0934 80240204 AFA2001C */ sw $v0, 0x1c($sp) +/* BA0938 80240208 24020021 */ addiu $v0, $zero, 0x21 +.L8024020C: +/* BA093C 8024020C AE220070 */ sw $v0, 0x70($s1) +.L80240210: +/* BA0940 80240210 8FBF0038 */ lw $ra, 0x38($sp) +/* BA0944 80240214 8FB10034 */ lw $s1, 0x34($sp) +/* BA0948 80240218 8FB00030 */ lw $s0, 0x30($sp) +/* BA094C 8024021C 03E00008 */ jr $ra +/* BA0950 80240220 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278.s deleted file mode 100644 index f0c304a329..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240278 -/* BA09A8 80240278 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BA09AC 8024027C AFBF0024 */ sw $ra, 0x24($sp) -/* BA09B0 80240280 AFB40020 */ sw $s4, 0x20($sp) -/* BA09B4 80240284 AFB3001C */ sw $s3, 0x1c($sp) -/* BA09B8 80240288 AFB20018 */ sw $s2, 0x18($sp) -/* BA09BC 8024028C AFB10014 */ sw $s1, 0x14($sp) -/* BA09C0 80240290 AFB00010 */ sw $s0, 0x10($sp) -/* BA09C4 80240294 F7B40028 */ sdc1 $f20, 0x28($sp) -/* BA09C8 80240298 8C900148 */ lw $s0, 0x148($a0) -/* BA09CC 8024029C 86040008 */ lh $a0, 8($s0) -/* BA09D0 802402A0 0C00EABB */ jal get_npc_unsafe -/* BA09D4 802402A4 24110001 */ addiu $s1, $zero, 1 -/* BA09D8 802402A8 86040008 */ lh $a0, 8($s0) -/* BA09DC 802402AC 0040802D */ daddu $s0, $v0, $zero -/* BA09E0 802402B0 3C05800B */ lui $a1, %hi(gCameras) -/* BA09E4 802402B4 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* BA09E8 802402B8 3C03800A */ lui $v1, 0x800a -/* BA09EC 802402BC 8463A634 */ lh $v1, -0x59cc($v1) -/* BA09F0 802402C0 00912021 */ addu $a0, $a0, $s1 -/* BA09F4 802402C4 00031080 */ sll $v0, $v1, 2 -/* BA09F8 802402C8 00431021 */ addu $v0, $v0, $v1 -/* BA09FC 802402CC 00021080 */ sll $v0, $v0, 2 -/* BA0A00 802402D0 00431023 */ subu $v0, $v0, $v1 -/* BA0A04 802402D4 000218C0 */ sll $v1, $v0, 3 -/* BA0A08 802402D8 00431021 */ addu $v0, $v0, $v1 -/* BA0A0C 802402DC 000210C0 */ sll $v0, $v0, 3 -/* BA0A10 802402E0 0C00FB3A */ jal get_enemy -/* BA0A14 802402E4 00459021 */ addu $s2, $v0, $a1 -/* BA0A18 802402E8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* BA0A1C 802402EC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* BA0A20 802402F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA0A24 802402F4 8E830000 */ lw $v1, ($s4) -/* BA0A28 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA0A2C 802402FC 8C660028 */ lw $a2, 0x28($v1) -/* BA0A30 80240300 8C670030 */ lw $a3, 0x30($v1) -/* BA0A34 80240304 0C00A7B5 */ jal dist2D -/* BA0A38 80240308 0040982D */ daddu $s3, $v0, $zero -/* BA0A3C 8024030C C6620074 */ lwc1 $f2, 0x74($s3) -/* BA0A40 80240310 468010A0 */ cvt.s.w $f2, $f2 -/* BA0A44 80240314 4600103C */ c.lt.s $f2, $f0 -/* BA0A48 80240318 00000000 */ nop -/* BA0A4C 8024031C 45030001 */ bc1tl .L80240324 -/* BA0A50 80240320 0000882D */ daddu $s1, $zero, $zero -.L80240324: -/* BA0A54 80240324 C64C006C */ lwc1 $f12, 0x6c($s2) -/* BA0A58 80240328 C60E000C */ lwc1 $f14, 0xc($s0) -/* BA0A5C 8024032C 3C014387 */ lui $at, 0x4387 -/* BA0A60 80240330 4481A000 */ mtc1 $at, $f20 -/* BA0A64 80240334 0C00A70A */ jal get_clamped_angle_diff -/* BA0A68 80240338 00000000 */ nop -/* BA0A6C 8024033C 0C00A6C9 */ jal clamp_angle -/* BA0A70 80240340 46000306 */ mov.s $f12, $f0 -/* BA0A74 80240344 3C018024 */ lui $at, 0x8024 -/* BA0A78 80240348 D4223E80 */ ldc1 $f2, 0x3e80($at) -/* BA0A7C 8024034C 46000021 */ cvt.d.s $f0, $f0 -/* BA0A80 80240350 4622003C */ c.lt.d $f0, $f2 -/* BA0A84 80240354 00000000 */ nop -/* BA0A88 80240358 45000003 */ bc1f .L80240368 -/* BA0A8C 8024035C 00000000 */ nop -/* BA0A90 80240360 3C0142B4 */ lui $at, 0x42b4 -/* BA0A94 80240364 4481A000 */ mtc1 $at, $f20 -.L80240368: -/* BA0A98 80240368 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA0A9C 8024036C 8E820000 */ lw $v0, ($s4) -/* BA0AA0 80240370 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA0AA4 80240374 8C460028 */ lw $a2, 0x28($v0) -/* BA0AA8 80240378 0C00A720 */ jal atan2 -/* BA0AAC 8024037C 8C470030 */ lw $a3, 0x30($v0) -/* BA0AB0 80240380 4600A306 */ mov.s $f12, $f20 -/* BA0AB4 80240384 0C00A70A */ jal get_clamped_angle_diff -/* BA0AB8 80240388 46000386 */ mov.s $f14, $f0 -/* BA0ABC 8024038C C6620078 */ lwc1 $f2, 0x78($s3) -/* BA0AC0 80240390 468010A0 */ cvt.s.w $f2, $f2 -/* BA0AC4 80240394 46000005 */ abs.s $f0, $f0 -/* BA0AC8 80240398 4600103C */ c.lt.s $f2, $f0 -/* BA0ACC 8024039C 00000000 */ nop -/* BA0AD0 802403A0 45030001 */ bc1tl .L802403A8 -/* BA0AD4 802403A4 0000882D */ daddu $s1, $zero, $zero -.L802403A8: -/* BA0AD8 802403A8 8E820000 */ lw $v0, ($s4) -/* BA0ADC 802403AC C600003C */ lwc1 $f0, 0x3c($s0) -/* BA0AE0 802403B0 C442002C */ lwc1 $f2, 0x2c($v0) -/* BA0AE4 802403B4 860200A8 */ lh $v0, 0xa8($s0) -/* BA0AE8 802403B8 46020001 */ sub.s $f0, $f0, $f2 -/* BA0AEC 802403BC 44821000 */ mtc1 $v0, $f2 -/* BA0AF0 802403C0 00000000 */ nop -/* BA0AF4 802403C4 468010A1 */ cvt.d.w $f2, $f2 -/* BA0AF8 802403C8 46221080 */ add.d $f2, $f2, $f2 -/* BA0AFC 802403CC 46000005 */ abs.s $f0, $f0 -/* BA0B00 802403D0 46000021 */ cvt.d.s $f0, $f0 -/* BA0B04 802403D4 4620103E */ c.le.d $f2, $f0 -/* BA0B08 802403D8 00000000 */ nop -/* BA0B0C 802403DC 45030001 */ bc1tl .L802403E4 -/* BA0B10 802403E0 0000882D */ daddu $s1, $zero, $zero -.L802403E4: -/* BA0B14 802403E4 3C038011 */ lui $v1, 0x8011 -/* BA0B18 802403E8 8063EBB3 */ lb $v1, -0x144d($v1) -/* BA0B1C 802403EC 24020009 */ addiu $v0, $zero, 9 -/* BA0B20 802403F0 50620001 */ beql $v1, $v0, .L802403F8 -/* BA0B24 802403F4 0000882D */ daddu $s1, $zero, $zero -.L802403F8: -/* BA0B28 802403F8 24020007 */ addiu $v0, $zero, 7 -/* BA0B2C 802403FC 50620001 */ beql $v1, $v0, .L80240404 -/* BA0B30 80240400 0000882D */ daddu $s1, $zero, $zero -.L80240404: -/* BA0B34 80240404 0220102D */ daddu $v0, $s1, $zero -/* BA0B38 80240408 8FBF0024 */ lw $ra, 0x24($sp) -/* BA0B3C 8024040C 8FB40020 */ lw $s4, 0x20($sp) -/* BA0B40 80240410 8FB3001C */ lw $s3, 0x1c($sp) -/* BA0B44 80240414 8FB20018 */ lw $s2, 0x18($sp) -/* BA0B48 80240418 8FB10014 */ lw $s1, 0x14($sp) -/* BA0B4C 8024041C 8FB00010 */ lw $s0, 0x10($sp) -/* BA0B50 80240420 D7B40028 */ ldc1 $f20, 0x28($sp) -/* BA0B54 80240424 03E00008 */ jr $ra -/* BA0B58 80240428 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s new file mode 100644 index 0000000000..6497508616 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80240278_BA09A8.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240278_BA09A8 +/* BA09A8 80240278 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* BA09AC 8024027C AFBF0024 */ sw $ra, 0x24($sp) +/* BA09B0 80240280 AFB40020 */ sw $s4, 0x20($sp) +/* BA09B4 80240284 AFB3001C */ sw $s3, 0x1c($sp) +/* BA09B8 80240288 AFB20018 */ sw $s2, 0x18($sp) +/* BA09BC 8024028C AFB10014 */ sw $s1, 0x14($sp) +/* BA09C0 80240290 AFB00010 */ sw $s0, 0x10($sp) +/* BA09C4 80240294 F7B40028 */ sdc1 $f20, 0x28($sp) +/* BA09C8 80240298 8C900148 */ lw $s0, 0x148($a0) +/* BA09CC 8024029C 86040008 */ lh $a0, 8($s0) +/* BA09D0 802402A0 0C00EABB */ jal get_npc_unsafe +/* BA09D4 802402A4 24110001 */ addiu $s1, $zero, 1 +/* BA09D8 802402A8 86040008 */ lh $a0, 8($s0) +/* BA09DC 802402AC 0040802D */ daddu $s0, $v0, $zero +/* BA09E0 802402B0 3C05800B */ lui $a1, %hi(gCameras) +/* BA09E4 802402B4 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* BA09E8 802402B8 3C03800A */ lui $v1, 0x800a +/* BA09EC 802402BC 8463A634 */ lh $v1, -0x59cc($v1) +/* BA09F0 802402C0 00912021 */ addu $a0, $a0, $s1 +/* BA09F4 802402C4 00031080 */ sll $v0, $v1, 2 +/* BA09F8 802402C8 00431021 */ addu $v0, $v0, $v1 +/* BA09FC 802402CC 00021080 */ sll $v0, $v0, 2 +/* BA0A00 802402D0 00431023 */ subu $v0, $v0, $v1 +/* BA0A04 802402D4 000218C0 */ sll $v1, $v0, 3 +/* BA0A08 802402D8 00431021 */ addu $v0, $v0, $v1 +/* BA0A0C 802402DC 000210C0 */ sll $v0, $v0, 3 +/* BA0A10 802402E0 0C00FB3A */ jal get_enemy +/* BA0A14 802402E4 00459021 */ addu $s2, $v0, $a1 +/* BA0A18 802402E8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) +/* BA0A1C 802402EC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) +/* BA0A20 802402F0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BA0A24 802402F4 8E830000 */ lw $v1, ($s4) +/* BA0A28 802402F8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BA0A2C 802402FC 8C660028 */ lw $a2, 0x28($v1) +/* BA0A30 80240300 8C670030 */ lw $a3, 0x30($v1) +/* BA0A34 80240304 0C00A7B5 */ jal dist2D +/* BA0A38 80240308 0040982D */ daddu $s3, $v0, $zero +/* BA0A3C 8024030C C6620074 */ lwc1 $f2, 0x74($s3) +/* BA0A40 80240310 468010A0 */ cvt.s.w $f2, $f2 +/* BA0A44 80240314 4600103C */ c.lt.s $f2, $f0 +/* BA0A48 80240318 00000000 */ nop +/* BA0A4C 8024031C 45030001 */ bc1tl .L80240324 +/* BA0A50 80240320 0000882D */ daddu $s1, $zero, $zero +.L80240324: +/* BA0A54 80240324 C64C006C */ lwc1 $f12, 0x6c($s2) +/* BA0A58 80240328 C60E000C */ lwc1 $f14, 0xc($s0) +/* BA0A5C 8024032C 3C014387 */ lui $at, 0x4387 +/* BA0A60 80240330 4481A000 */ mtc1 $at, $f20 +/* BA0A64 80240334 0C00A70A */ jal get_clamped_angle_diff +/* BA0A68 80240338 00000000 */ nop +/* BA0A6C 8024033C 0C00A6C9 */ jal clamp_angle +/* BA0A70 80240340 46000306 */ mov.s $f12, $f0 +/* BA0A74 80240344 3C018024 */ lui $at, 0x8024 +/* BA0A78 80240348 D4223E80 */ ldc1 $f2, 0x3e80($at) +/* BA0A7C 8024034C 46000021 */ cvt.d.s $f0, $f0 +/* BA0A80 80240350 4622003C */ c.lt.d $f0, $f2 +/* BA0A84 80240354 00000000 */ nop +/* BA0A88 80240358 45000003 */ bc1f .L80240368 +/* BA0A8C 8024035C 00000000 */ nop +/* BA0A90 80240360 3C0142B4 */ lui $at, 0x42b4 +/* BA0A94 80240364 4481A000 */ mtc1 $at, $f20 +.L80240368: +/* BA0A98 80240368 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BA0A9C 8024036C 8E820000 */ lw $v0, ($s4) +/* BA0AA0 80240370 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BA0AA4 80240374 8C460028 */ lw $a2, 0x28($v0) +/* BA0AA8 80240378 0C00A720 */ jal atan2 +/* BA0AAC 8024037C 8C470030 */ lw $a3, 0x30($v0) +/* BA0AB0 80240380 4600A306 */ mov.s $f12, $f20 +/* BA0AB4 80240384 0C00A70A */ jal get_clamped_angle_diff +/* BA0AB8 80240388 46000386 */ mov.s $f14, $f0 +/* BA0ABC 8024038C C6620078 */ lwc1 $f2, 0x78($s3) +/* BA0AC0 80240390 468010A0 */ cvt.s.w $f2, $f2 +/* BA0AC4 80240394 46000005 */ abs.s $f0, $f0 +/* BA0AC8 80240398 4600103C */ c.lt.s $f2, $f0 +/* BA0ACC 8024039C 00000000 */ nop +/* BA0AD0 802403A0 45030001 */ bc1tl .L802403A8 +/* BA0AD4 802403A4 0000882D */ daddu $s1, $zero, $zero +.L802403A8: +/* BA0AD8 802403A8 8E820000 */ lw $v0, ($s4) +/* BA0ADC 802403AC C600003C */ lwc1 $f0, 0x3c($s0) +/* BA0AE0 802403B0 C442002C */ lwc1 $f2, 0x2c($v0) +/* BA0AE4 802403B4 860200A8 */ lh $v0, 0xa8($s0) +/* BA0AE8 802403B8 46020001 */ sub.s $f0, $f0, $f2 +/* BA0AEC 802403BC 44821000 */ mtc1 $v0, $f2 +/* BA0AF0 802403C0 00000000 */ nop +/* BA0AF4 802403C4 468010A1 */ cvt.d.w $f2, $f2 +/* BA0AF8 802403C8 46221080 */ add.d $f2, $f2, $f2 +/* BA0AFC 802403CC 46000005 */ abs.s $f0, $f0 +/* BA0B00 802403D0 46000021 */ cvt.d.s $f0, $f0 +/* BA0B04 802403D4 4620103E */ c.le.d $f2, $f0 +/* BA0B08 802403D8 00000000 */ nop +/* BA0B0C 802403DC 45030001 */ bc1tl .L802403E4 +/* BA0B10 802403E0 0000882D */ daddu $s1, $zero, $zero +.L802403E4: +/* BA0B14 802403E4 3C038011 */ lui $v1, 0x8011 +/* BA0B18 802403E8 8063EBB3 */ lb $v1, -0x144d($v1) +/* BA0B1C 802403EC 24020009 */ addiu $v0, $zero, 9 +/* BA0B20 802403F0 50620001 */ beql $v1, $v0, .L802403F8 +/* BA0B24 802403F4 0000882D */ daddu $s1, $zero, $zero +.L802403F8: +/* BA0B28 802403F8 24020007 */ addiu $v0, $zero, 7 +/* BA0B2C 802403FC 50620001 */ beql $v1, $v0, .L80240404 +/* BA0B30 80240400 0000882D */ daddu $s1, $zero, $zero +.L80240404: +/* BA0B34 80240404 0220102D */ daddu $v0, $s1, $zero +/* BA0B38 80240408 8FBF0024 */ lw $ra, 0x24($sp) +/* BA0B3C 8024040C 8FB40020 */ lw $s4, 0x20($sp) +/* BA0B40 80240410 8FB3001C */ lw $s3, 0x1c($sp) +/* BA0B44 80240414 8FB20018 */ lw $s2, 0x18($sp) +/* BA0B48 80240418 8FB10014 */ lw $s1, 0x14($sp) +/* BA0B4C 8024041C 8FB00010 */ lw $s0, 0x10($sp) +/* BA0B50 80240420 D7B40028 */ ldc1 $f20, 0x28($sp) +/* BA0B54 80240424 03E00008 */ jr $ra +/* BA0B58 80240428 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s index 26d527a268..47a2a87ea0 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_8024068C_BA0DBC.s @@ -90,7 +90,7 @@ glabel func_8024068C_BA0DBC /* BA0EFC 802407CC 8E22006C */ lw $v0, 0x6c($s1) /* BA0F00 802407D0 14400006 */ bnez $v0, .L802407EC /* BA0F04 802407D4 00000000 */ nop -/* BA0F08 802407D8 0C09009E */ jal func_80240278 +/* BA0F08 802407D8 0C09009E */ jal func_80240278_BA09A8 /* BA0F0C 802407DC 0240202D */ daddu $a0, $s2, $zero /* BA0F10 802407E0 10400002 */ beqz $v0, .L802407EC /* BA0F14 802407E4 2402001E */ addiu $v0, $zero, 0x1e @@ -151,21 +151,21 @@ glabel func_8024068C_BA0DBC /* BA0FEC 802408BC 0280302D */ daddu $a2, $s4, $zero /* BA0FF0 802408C0 08090246 */ j .L80240918 /* BA0FF4 802408C4 00000000 */ nop -/* BA0FF8 802408C8 0C09001C */ jal func_80240070 +/* BA0FF8 802408C8 0C09001C */ jal func_80240070_BA07A0 /* BA0FFC 802408CC 0240202D */ daddu $a0, $s2, $zero -/* BA1000 802408D0 0C090037 */ jal func_802400DC +/* BA1000 802408D0 0C090037 */ jal func_802400DC_BA080C /* BA1004 802408D4 0240202D */ daddu $a0, $s2, $zero /* BA1008 802408D8 8E430070 */ lw $v1, 0x70($s2) /* BA100C 802408DC 24020020 */ addiu $v0, $zero, 0x20 /* BA1010 802408E0 1462000D */ bne $v1, $v0, .L80240918 /* BA1014 802408E4 00000000 */ nop -/* BA1018 802408E8 0C090053 */ jal func_8024014C +/* BA1018 802408E8 0C090053 */ jal func_8024014C_BA087C /* BA101C 802408EC 0240202D */ daddu $a0, $s2, $zero /* BA1020 802408F0 8E430070 */ lw $v1, 0x70($s2) /* BA1024 802408F4 24020021 */ addiu $v0, $zero, 0x21 /* BA1028 802408F8 14620007 */ bne $v1, $v0, .L80240918 /* BA102C 802408FC 00000000 */ nop -/* BA1030 80240900 0C090089 */ jal func_80240224 +/* BA1030 80240900 0C090089 */ jal func_80240224_BA0954 /* BA1034 80240904 0240202D */ daddu $a0, $s2, $zero /* BA1038 80240908 08090246 */ j .L80240918 /* BA103C 8024090C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678.s deleted file mode 100644 index 8f2d884148..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241678 -/* BA1DA8 80241678 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA1DAC 8024167C AFB10014 */ sw $s1, 0x14($sp) -/* BA1DB0 80241680 0080882D */ daddu $s1, $a0, $zero -/* BA1DB4 80241684 AFBF0018 */ sw $ra, 0x18($sp) -/* BA1DB8 80241688 AFB00010 */ sw $s0, 0x10($sp) -/* BA1DBC 8024168C 8E300148 */ lw $s0, 0x148($s1) -/* BA1DC0 80241690 0C00EABB */ jal get_npc_unsafe -/* BA1DC4 80241694 86040008 */ lh $a0, 8($s0) -/* BA1DC8 80241698 0040182D */ daddu $v1, $v0, $zero -/* BA1DCC 8024169C 9462008E */ lhu $v0, 0x8e($v1) -/* BA1DD0 802416A0 2442FFFF */ addiu $v0, $v0, -1 -/* BA1DD4 802416A4 A462008E */ sh $v0, 0x8e($v1) -/* BA1DD8 802416A8 00021400 */ sll $v0, $v0, 0x10 -/* BA1DDC 802416AC 14400005 */ bnez $v0, .L802416C4 -/* BA1DE0 802416B0 00000000 */ nop -/* BA1DE4 802416B4 960200AA */ lhu $v0, 0xaa($s0) -/* BA1DE8 802416B8 A462008E */ sh $v0, 0x8e($v1) -/* BA1DEC 802416BC 2402000E */ addiu $v0, $zero, 0xe -/* BA1DF0 802416C0 AE220070 */ sw $v0, 0x70($s1) -.L802416C4: -/* BA1DF4 802416C4 8FBF0018 */ lw $ra, 0x18($sp) -/* BA1DF8 802416C8 8FB10014 */ lw $s1, 0x14($sp) -/* BA1DFC 802416CC 8FB00010 */ lw $s0, 0x10($sp) -/* BA1E00 802416D0 03E00008 */ jr $ra -/* BA1E04 802416D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s new file mode 100644 index 0000000000..a73252a14e --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_80241678_BA1DA8.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241678_BA1DA8 +/* BA1DA8 80241678 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BA1DAC 8024167C AFB10014 */ sw $s1, 0x14($sp) +/* BA1DB0 80241680 0080882D */ daddu $s1, $a0, $zero +/* BA1DB4 80241684 AFBF0018 */ sw $ra, 0x18($sp) +/* BA1DB8 80241688 AFB00010 */ sw $s0, 0x10($sp) +/* BA1DBC 8024168C 8E300148 */ lw $s0, 0x148($s1) +/* BA1DC0 80241690 0C00EABB */ jal get_npc_unsafe +/* BA1DC4 80241694 86040008 */ lh $a0, 8($s0) +/* BA1DC8 80241698 0040182D */ daddu $v1, $v0, $zero +/* BA1DCC 8024169C 9462008E */ lhu $v0, 0x8e($v1) +/* BA1DD0 802416A0 2442FFFF */ addiu $v0, $v0, -1 +/* BA1DD4 802416A4 A462008E */ sh $v0, 0x8e($v1) +/* BA1DD8 802416A8 00021400 */ sll $v0, $v0, 0x10 +/* BA1DDC 802416AC 14400005 */ bnez $v0, .L802416C4 +/* BA1DE0 802416B0 00000000 */ nop +/* BA1DE4 802416B4 960200AA */ lhu $v0, 0xaa($s0) +/* BA1DE8 802416B8 A462008E */ sh $v0, 0x8e($v1) +/* BA1DEC 802416BC 2402000E */ addiu $v0, $zero, 0xe +/* BA1DF0 802416C0 AE220070 */ sw $v0, 0x70($s1) +.L802416C4: +/* BA1DF4 802416C4 8FBF0018 */ lw $ra, 0x18($sp) +/* BA1DF8 802416C8 8FB10014 */ lw $s1, 0x14($sp) +/* BA1DFC 802416CC 8FB00010 */ lw $s0, 0x10($sp) +/* BA1E00 802416D0 03E00008 */ jr $ra +/* BA1E04 802416D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8.s deleted file mode 100644 index 59907d6133..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416D8 -/* BA1E08 802416D8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BA1E0C 802416DC AFB40040 */ sw $s4, 0x40($sp) -/* BA1E10 802416E0 0080A02D */ daddu $s4, $a0, $zero -/* BA1E14 802416E4 AFBF0044 */ sw $ra, 0x44($sp) -/* BA1E18 802416E8 AFB3003C */ sw $s3, 0x3c($sp) -/* BA1E1C 802416EC AFB20038 */ sw $s2, 0x38($sp) -/* BA1E20 802416F0 AFB10034 */ sw $s1, 0x34($sp) -/* BA1E24 802416F4 AFB00030 */ sw $s0, 0x30($sp) -/* BA1E28 802416F8 8E910148 */ lw $s1, 0x148($s4) -/* BA1E2C 802416FC 00A0902D */ daddu $s2, $a1, $zero -/* BA1E30 80241700 86240008 */ lh $a0, 8($s1) -/* BA1E34 80241704 0C00EABB */ jal get_npc_unsafe -/* BA1E38 80241708 00C0982D */ daddu $s3, $a2, $zero -/* BA1E3C 8024170C 0040802D */ daddu $s0, $v0, $zero -/* BA1E40 80241710 9602008E */ lhu $v0, 0x8e($s0) -/* BA1E44 80241714 2442FFFF */ addiu $v0, $v0, -1 -/* BA1E48 80241718 A602008E */ sh $v0, 0x8e($s0) -/* BA1E4C 8024171C 00021400 */ sll $v0, $v0, 0x10 -/* BA1E50 80241720 14400020 */ bnez $v0, .L802417A4 -/* BA1E54 80241724 0260202D */ daddu $a0, $s3, $zero -/* BA1E58 80241728 AFA00010 */ sw $zero, 0x10($sp) -/* BA1E5C 8024172C 8E46000C */ lw $a2, 0xc($s2) -/* BA1E60 80241730 8E470010 */ lw $a3, 0x10($s2) -/* BA1E64 80241734 0C01242D */ jal func_800490B4 -/* BA1E68 80241738 0220282D */ daddu $a1, $s1, $zero -/* BA1E6C 8024173C 54400018 */ bnel $v0, $zero, .L802417A0 -/* BA1E70 80241740 A600008E */ sh $zero, 0x8e($s0) -/* BA1E74 80241744 24040002 */ addiu $a0, $zero, 2 -/* BA1E78 80241748 0200282D */ daddu $a1, $s0, $zero -/* BA1E7C 8024174C 0000302D */ daddu $a2, $zero, $zero -/* BA1E80 80241750 860300A8 */ lh $v1, 0xa8($s0) -/* BA1E84 80241754 3C013F80 */ lui $at, 0x3f80 -/* BA1E88 80241758 44810000 */ mtc1 $at, $f0 -/* BA1E8C 8024175C 3C014000 */ lui $at, 0x4000 -/* BA1E90 80241760 44811000 */ mtc1 $at, $f2 -/* BA1E94 80241764 3C01C1A0 */ lui $at, 0xc1a0 -/* BA1E98 80241768 44812000 */ mtc1 $at, $f4 -/* BA1E9C 8024176C 2402000F */ addiu $v0, $zero, 0xf -/* BA1EA0 80241770 AFA2001C */ sw $v0, 0x1c($sp) -/* BA1EA4 80241774 44833000 */ mtc1 $v1, $f6 -/* BA1EA8 80241778 00000000 */ nop -/* BA1EAC 8024177C 468031A0 */ cvt.s.w $f6, $f6 -/* BA1EB0 80241780 44073000 */ mfc1 $a3, $f6 -/* BA1EB4 80241784 27A20028 */ addiu $v0, $sp, 0x28 -/* BA1EB8 80241788 AFA20020 */ sw $v0, 0x20($sp) -/* BA1EBC 8024178C E7A00010 */ swc1 $f0, 0x10($sp) -/* BA1EC0 80241790 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA1EC4 80241794 0C01BFA4 */ jal fx_emote -/* BA1EC8 80241798 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA1ECC 8024179C A600008E */ sh $zero, 0x8e($s0) -.L802417A0: -/* BA1ED0 802417A0 AE800070 */ sw $zero, 0x70($s4) -.L802417A4: -/* BA1ED4 802417A4 8FBF0044 */ lw $ra, 0x44($sp) -/* BA1ED8 802417A8 8FB40040 */ lw $s4, 0x40($sp) -/* BA1EDC 802417AC 8FB3003C */ lw $s3, 0x3c($sp) -/* BA1EE0 802417B0 8FB20038 */ lw $s2, 0x38($sp) -/* BA1EE4 802417B4 8FB10034 */ lw $s1, 0x34($sp) -/* BA1EE8 802417B8 8FB00030 */ lw $s0, 0x30($sp) -/* BA1EEC 802417BC 03E00008 */ jr $ra -/* BA1EF0 802417C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s new file mode 100644 index 0000000000..76eb672b4c --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802416D8_BA1E08.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416D8_BA1E08 +/* BA1E08 802416D8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* BA1E0C 802416DC AFB40040 */ sw $s4, 0x40($sp) +/* BA1E10 802416E0 0080A02D */ daddu $s4, $a0, $zero +/* BA1E14 802416E4 AFBF0044 */ sw $ra, 0x44($sp) +/* BA1E18 802416E8 AFB3003C */ sw $s3, 0x3c($sp) +/* BA1E1C 802416EC AFB20038 */ sw $s2, 0x38($sp) +/* BA1E20 802416F0 AFB10034 */ sw $s1, 0x34($sp) +/* BA1E24 802416F4 AFB00030 */ sw $s0, 0x30($sp) +/* BA1E28 802416F8 8E910148 */ lw $s1, 0x148($s4) +/* BA1E2C 802416FC 00A0902D */ daddu $s2, $a1, $zero +/* BA1E30 80241700 86240008 */ lh $a0, 8($s1) +/* BA1E34 80241704 0C00EABB */ jal get_npc_unsafe +/* BA1E38 80241708 00C0982D */ daddu $s3, $a2, $zero +/* BA1E3C 8024170C 0040802D */ daddu $s0, $v0, $zero +/* BA1E40 80241710 9602008E */ lhu $v0, 0x8e($s0) +/* BA1E44 80241714 2442FFFF */ addiu $v0, $v0, -1 +/* BA1E48 80241718 A602008E */ sh $v0, 0x8e($s0) +/* BA1E4C 8024171C 00021400 */ sll $v0, $v0, 0x10 +/* BA1E50 80241720 14400020 */ bnez $v0, .L802417A4 +/* BA1E54 80241724 0260202D */ daddu $a0, $s3, $zero +/* BA1E58 80241728 AFA00010 */ sw $zero, 0x10($sp) +/* BA1E5C 8024172C 8E46000C */ lw $a2, 0xc($s2) +/* BA1E60 80241730 8E470010 */ lw $a3, 0x10($s2) +/* BA1E64 80241734 0C01242D */ jal func_800490B4 +/* BA1E68 80241738 0220282D */ daddu $a1, $s1, $zero +/* BA1E6C 8024173C 54400018 */ bnel $v0, $zero, .L802417A0 +/* BA1E70 80241740 A600008E */ sh $zero, 0x8e($s0) +/* BA1E74 80241744 24040002 */ addiu $a0, $zero, 2 +/* BA1E78 80241748 0200282D */ daddu $a1, $s0, $zero +/* BA1E7C 8024174C 0000302D */ daddu $a2, $zero, $zero +/* BA1E80 80241750 860300A8 */ lh $v1, 0xa8($s0) +/* BA1E84 80241754 3C013F80 */ lui $at, 0x3f80 +/* BA1E88 80241758 44810000 */ mtc1 $at, $f0 +/* BA1E8C 8024175C 3C014000 */ lui $at, 0x4000 +/* BA1E90 80241760 44811000 */ mtc1 $at, $f2 +/* BA1E94 80241764 3C01C1A0 */ lui $at, 0xc1a0 +/* BA1E98 80241768 44812000 */ mtc1 $at, $f4 +/* BA1E9C 8024176C 2402000F */ addiu $v0, $zero, 0xf +/* BA1EA0 80241770 AFA2001C */ sw $v0, 0x1c($sp) +/* BA1EA4 80241774 44833000 */ mtc1 $v1, $f6 +/* BA1EA8 80241778 00000000 */ nop +/* BA1EAC 8024177C 468031A0 */ cvt.s.w $f6, $f6 +/* BA1EB0 80241780 44073000 */ mfc1 $a3, $f6 +/* BA1EB4 80241784 27A20028 */ addiu $v0, $sp, 0x28 +/* BA1EB8 80241788 AFA20020 */ sw $v0, 0x20($sp) +/* BA1EBC 8024178C E7A00010 */ swc1 $f0, 0x10($sp) +/* BA1EC0 80241790 E7A20014 */ swc1 $f2, 0x14($sp) +/* BA1EC4 80241794 0C01BFA4 */ jal fx_emote +/* BA1EC8 80241798 E7A40018 */ swc1 $f4, 0x18($sp) +/* BA1ECC 8024179C A600008E */ sh $zero, 0x8e($s0) +.L802417A0: +/* BA1ED0 802417A0 AE800070 */ sw $zero, 0x70($s4) +.L802417A4: +/* BA1ED4 802417A4 8FBF0044 */ lw $ra, 0x44($sp) +/* BA1ED8 802417A8 8FB40040 */ lw $s4, 0x40($sp) +/* BA1EDC 802417AC 8FB3003C */ lw $s3, 0x3c($sp) +/* BA1EE0 802417B0 8FB20038 */ lw $s2, 0x38($sp) +/* BA1EE4 802417B4 8FB10034 */ lw $s1, 0x34($sp) +/* BA1EE8 802417B8 8FB00030 */ lw $s0, 0x30($sp) +/* BA1EEC 802417BC 03E00008 */ jr $ra +/* BA1EF0 802417C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s index b1ac546351..1dd6a1851b 100644 --- a/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s +++ b/asm/nonmatchings/world/area_mim/mim_05/BA07A0/func_802417C4_BA1EF4.s @@ -99,18 +99,18 @@ glabel func_802417C4_BA1EF4 /* BA205C 8024192C 00000000 */ nop .L80241930: /* BA2060 80241930 0260282D */ daddu $a1, $s3, $zero -/* BA2064 80241934 0C090250 */ jal func_80240940 +/* BA2064 80241934 0C090250 */ jal func_80240940_BA1070 /* BA2068 80241938 0280302D */ daddu $a2, $s4, $zero .L8024193C: /* BA206C 8024193C 0240202D */ daddu $a0, $s2, $zero /* BA2070 80241940 0260282D */ daddu $a1, $s3, $zero -/* BA2074 80241944 0C09026B */ jal func_802409AC +/* BA2074 80241944 0C09026B */ jal func_802409AC_BA10DC /* BA2078 80241948 0280302D */ daddu $a2, $s4, $zero /* BA207C 8024194C 0809067B */ j .L802419EC /* BA2080 80241950 00000000 */ nop .L80241954: /* BA2084 80241954 0260282D */ daddu $a1, $s3, $zero -/* BA2088 80241958 0C0902AA */ jal func_80240AA8 +/* BA2088 80241958 0C0902AA */ jal func_80240AA8_BA11D8 /* BA208C 8024195C 0280302D */ daddu $a2, $s4, $zero /* BA2090 80241960 8E420070 */ lw $v0, 0x70($s2) /* BA2094 80241964 14500021 */ bne $v0, $s0, .L802419EC @@ -118,7 +118,7 @@ glabel func_802417C4_BA1EF4 .L8024196C: /* BA209C 8024196C 0240202D */ daddu $a0, $s2, $zero /* BA20A0 80241970 0260282D */ daddu $a1, $s3, $zero -/* BA20A4 80241974 0C09053A */ jal func_802414E8 +/* BA20A4 80241974 0C09053A */ jal func_802414E8_BA1C18 /* BA20A8 80241978 0280302D */ daddu $a2, $s4, $zero /* BA20AC 8024197C 8E430070 */ lw $v1, 0x70($s2) /* BA20B0 80241980 2402000C */ addiu $v0, $zero, 0xc @@ -127,7 +127,7 @@ glabel func_802417C4_BA1EF4 /* BA20BC 8024198C 0240202D */ daddu $a0, $s2, $zero .L80241990: /* BA20C0 80241990 0260282D */ daddu $a1, $s3, $zero -/* BA20C4 80241994 0C09055E */ jal func_80241578 +/* BA20C4 80241994 0C09055E */ jal func_80241578_BA1CA8 /* BA20C8 80241998 0280302D */ daddu $a2, $s4, $zero /* BA20CC 8024199C 8E430070 */ lw $v1, 0x70($s2) /* BA20D0 802419A0 2402000D */ addiu $v0, $zero, 0xd @@ -136,7 +136,7 @@ glabel func_802417C4_BA1EF4 .L802419AC: /* BA20DC 802419AC 0240202D */ daddu $a0, $s2, $zero /* BA20E0 802419B0 0260282D */ daddu $a1, $s3, $zero -/* BA20E4 802419B4 0C09059E */ jal func_80241678 +/* BA20E4 802419B4 0C09059E */ jal func_80241678_BA1DA8 /* BA20E8 802419B8 0280302D */ daddu $a2, $s4, $zero /* BA20EC 802419BC 8E430070 */ lw $v1, 0x70($s2) /* BA20F0 802419C0 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_802417C4_BA1EF4 /* BA20FC 802419CC 0240202D */ daddu $a0, $s2, $zero .L802419D0: /* BA2100 802419D0 0260282D */ daddu $a1, $s3, $zero -/* BA2104 802419D4 0C0905B6 */ jal func_802416D8 +/* BA2104 802419D4 0C0905B6 */ jal func_802416D8_BA1E08 /* BA2108 802419D8 0280302D */ daddu $a2, $s4, $zero /* BA210C 802419DC 0809067B */ j .L802419EC /* BA2110 802419E0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s index 8eff6d5b5b..cb6bc352a4 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_80240070_BA47F0.s @@ -62,7 +62,7 @@ glabel func_80240070_BA47F0 /* BA48C8 80240148 02A0382D */ daddu $a3, $s5, $zero /* BA48CC 8024014C E7A00018 */ swc1 $f0, 0x18($sp) /* BA48D0 80240150 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BA48D4 80240154 0C09001C */ jal func_80240070 +/* BA48D4 80240154 0C09001C */ jal func_80240070_BA47F0 /* BA48D8 80240158 E7B00020 */ swc1 $f16, 0x20($sp) /* BA48DC 8024015C C7A00018 */ lwc1 $f0, 0x18($sp) /* BA48E0 80240160 C7A2001C */ lwc1 $f2, 0x1c($sp) diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s index 032b07a76f..c1892a6bbe 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA47F0/func_802403F0_BA4B70.s @@ -22,7 +22,7 @@ glabel func_802403F0_BA4B70 /* BA4BB4 80240434 8C420004 */ lw $v0, 4($v0) /* BA4BB8 80240438 27A60014 */ addiu $a2, $sp, 0x14 /* BA4BBC 8024043C 8C440000 */ lw $a0, ($v0) -/* BA4BC0 80240440 0C09001C */ jal func_80240070 +/* BA4BC0 80240440 0C09001C */ jal func_80240070_BA47F0 /* BA4BC4 80240444 27A70018 */ addiu $a3, $sp, 0x18 /* BA4BC8 80240448 C7A00010 */ lwc1 $f0, 0x10($sp) /* BA4BCC 8024044C 3C014480 */ lui $at, 0x4480 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C.s deleted file mode 100644 index f3de473a06..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024064C -/* BA4DCC 8024064C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA4DD0 80240650 AFB10034 */ sw $s1, 0x34($sp) -/* BA4DD4 80240654 0080882D */ daddu $s1, $a0, $zero -/* BA4DD8 80240658 AFBF0038 */ sw $ra, 0x38($sp) -/* BA4DDC 8024065C AFB00030 */ sw $s0, 0x30($sp) -/* BA4DE0 80240660 8E300148 */ lw $s0, 0x148($s1) -/* BA4DE4 80240664 0C00EABB */ jal get_npc_unsafe -/* BA4DE8 80240668 86040008 */ lh $a0, 8($s0) -/* BA4DEC 8024066C 0040282D */ daddu $a1, $v0, $zero -/* BA4DF0 80240670 94A2008E */ lhu $v0, 0x8e($a1) -/* BA4DF4 80240674 2442FFFF */ addiu $v0, $v0, -1 -/* BA4DF8 80240678 A4A2008E */ sh $v0, 0x8e($a1) -/* BA4DFC 8024067C 00021400 */ sll $v0, $v0, 0x10 -/* BA4E00 80240680 1C400023 */ bgtz $v0, .L80240710 -/* BA4E04 80240684 24020004 */ addiu $v0, $zero, 4 -/* BA4E08 80240688 8E0300CC */ lw $v1, 0xcc($s0) -/* BA4E0C 8024068C AE02006C */ sw $v0, 0x6c($s0) -/* BA4E10 80240690 8C620000 */ lw $v0, ($v1) -/* BA4E14 80240694 ACA20028 */ sw $v0, 0x28($a1) -/* BA4E18 80240698 9602007A */ lhu $v0, 0x7a($s0) -/* BA4E1C 8024069C A4A2008E */ sh $v0, 0x8e($a1) -/* BA4E20 802406A0 8E020078 */ lw $v0, 0x78($s0) -/* BA4E24 802406A4 28420008 */ slti $v0, $v0, 8 -/* BA4E28 802406A8 14400018 */ bnez $v0, .L8024070C -/* BA4E2C 802406AC 24020021 */ addiu $v0, $zero, 0x21 -/* BA4E30 802406B0 24040003 */ addiu $a0, $zero, 3 -/* BA4E34 802406B4 27A30028 */ addiu $v1, $sp, 0x28 -/* BA4E38 802406B8 84A700A8 */ lh $a3, 0xa8($a1) -/* BA4E3C 802406BC 3C013F80 */ lui $at, 0x3f80 -/* BA4E40 802406C0 44810000 */ mtc1 $at, $f0 -/* BA4E44 802406C4 3C014000 */ lui $at, 0x4000 -/* BA4E48 802406C8 44811000 */ mtc1 $at, $f2 -/* BA4E4C 802406CC 3C01C1A0 */ lui $at, 0xc1a0 -/* BA4E50 802406D0 44812000 */ mtc1 $at, $f4 -/* BA4E54 802406D4 44873000 */ mtc1 $a3, $f6 -/* BA4E58 802406D8 00000000 */ nop -/* BA4E5C 802406DC 468031A0 */ cvt.s.w $f6, $f6 -/* BA4E60 802406E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA4E64 802406E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA4E68 802406E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA4E6C 802406EC 8E020078 */ lw $v0, 0x78($s0) -/* BA4E70 802406F0 44073000 */ mfc1 $a3, $f6 -/* BA4E74 802406F4 0000302D */ daddu $a2, $zero, $zero -/* BA4E78 802406F8 AFA30020 */ sw $v1, 0x20($sp) -/* BA4E7C 802406FC 2442FFFF */ addiu $v0, $v0, -1 -/* BA4E80 80240700 0C01BFA4 */ jal fx_emote -/* BA4E84 80240704 AFA2001C */ sw $v0, 0x1c($sp) -/* BA4E88 80240708 24020021 */ addiu $v0, $zero, 0x21 -.L8024070C: -/* BA4E8C 8024070C AE220070 */ sw $v0, 0x70($s1) -.L80240710: -/* BA4E90 80240710 8FBF0038 */ lw $ra, 0x38($sp) -/* BA4E94 80240714 8FB10034 */ lw $s1, 0x34($sp) -/* BA4E98 80240718 8FB00030 */ lw $s0, 0x30($sp) -/* BA4E9C 8024071C 03E00008 */ jr $ra -/* BA4EA0 80240720 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s new file mode 100644 index 0000000000..5715c61ad6 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024064C_BA4DCC.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024064C_BA4DCC +/* BA4DCC 8024064C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* BA4DD0 80240650 AFB10034 */ sw $s1, 0x34($sp) +/* BA4DD4 80240654 0080882D */ daddu $s1, $a0, $zero +/* BA4DD8 80240658 AFBF0038 */ sw $ra, 0x38($sp) +/* BA4DDC 8024065C AFB00030 */ sw $s0, 0x30($sp) +/* BA4DE0 80240660 8E300148 */ lw $s0, 0x148($s1) +/* BA4DE4 80240664 0C00EABB */ jal get_npc_unsafe +/* BA4DE8 80240668 86040008 */ lh $a0, 8($s0) +/* BA4DEC 8024066C 0040282D */ daddu $a1, $v0, $zero +/* BA4DF0 80240670 94A2008E */ lhu $v0, 0x8e($a1) +/* BA4DF4 80240674 2442FFFF */ addiu $v0, $v0, -1 +/* BA4DF8 80240678 A4A2008E */ sh $v0, 0x8e($a1) +/* BA4DFC 8024067C 00021400 */ sll $v0, $v0, 0x10 +/* BA4E00 80240680 1C400023 */ bgtz $v0, .L80240710 +/* BA4E04 80240684 24020004 */ addiu $v0, $zero, 4 +/* BA4E08 80240688 8E0300CC */ lw $v1, 0xcc($s0) +/* BA4E0C 8024068C AE02006C */ sw $v0, 0x6c($s0) +/* BA4E10 80240690 8C620000 */ lw $v0, ($v1) +/* BA4E14 80240694 ACA20028 */ sw $v0, 0x28($a1) +/* BA4E18 80240698 9602007A */ lhu $v0, 0x7a($s0) +/* BA4E1C 8024069C A4A2008E */ sh $v0, 0x8e($a1) +/* BA4E20 802406A0 8E020078 */ lw $v0, 0x78($s0) +/* BA4E24 802406A4 28420008 */ slti $v0, $v0, 8 +/* BA4E28 802406A8 14400018 */ bnez $v0, .L8024070C +/* BA4E2C 802406AC 24020021 */ addiu $v0, $zero, 0x21 +/* BA4E30 802406B0 24040003 */ addiu $a0, $zero, 3 +/* BA4E34 802406B4 27A30028 */ addiu $v1, $sp, 0x28 +/* BA4E38 802406B8 84A700A8 */ lh $a3, 0xa8($a1) +/* BA4E3C 802406BC 3C013F80 */ lui $at, 0x3f80 +/* BA4E40 802406C0 44810000 */ mtc1 $at, $f0 +/* BA4E44 802406C4 3C014000 */ lui $at, 0x4000 +/* BA4E48 802406C8 44811000 */ mtc1 $at, $f2 +/* BA4E4C 802406CC 3C01C1A0 */ lui $at, 0xc1a0 +/* BA4E50 802406D0 44812000 */ mtc1 $at, $f4 +/* BA4E54 802406D4 44873000 */ mtc1 $a3, $f6 +/* BA4E58 802406D8 00000000 */ nop +/* BA4E5C 802406DC 468031A0 */ cvt.s.w $f6, $f6 +/* BA4E60 802406E0 E7A00010 */ swc1 $f0, 0x10($sp) +/* BA4E64 802406E4 E7A20014 */ swc1 $f2, 0x14($sp) +/* BA4E68 802406E8 E7A40018 */ swc1 $f4, 0x18($sp) +/* BA4E6C 802406EC 8E020078 */ lw $v0, 0x78($s0) +/* BA4E70 802406F0 44073000 */ mfc1 $a3, $f6 +/* BA4E74 802406F4 0000302D */ daddu $a2, $zero, $zero +/* BA4E78 802406F8 AFA30020 */ sw $v1, 0x20($sp) +/* BA4E7C 802406FC 2442FFFF */ addiu $v0, $v0, -1 +/* BA4E80 80240700 0C01BFA4 */ jal fx_emote +/* BA4E84 80240704 AFA2001C */ sw $v0, 0x1c($sp) +/* BA4E88 80240708 24020021 */ addiu $v0, $zero, 0x21 +.L8024070C: +/* BA4E8C 8024070C AE220070 */ sw $v0, 0x70($s1) +.L80240710: +/* BA4E90 80240710 8FBF0038 */ lw $ra, 0x38($sp) +/* BA4E94 80240714 8FB10034 */ lw $s1, 0x34($sp) +/* BA4E98 80240718 8FB00030 */ lw $s0, 0x30($sp) +/* BA4E9C 8024071C 03E00008 */ jr $ra +/* BA4EA0 80240720 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s index d68f617cc1..22d95163bb 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240B8C_BA530C.s @@ -90,7 +90,7 @@ glabel func_80240B8C_BA530C /* BA544C 80240CCC 8E22006C */ lw $v0, 0x6c($s1) /* BA5450 80240CD0 14400006 */ bnez $v0, .L80240CEC /* BA5454 80240CD4 00000000 */ nop -/* BA5458 80240CD8 0C0901DE */ jal func_80240778 +/* BA5458 80240CD8 0C0901DE */ jal func_80240778_BA4EF8 /* BA545C 80240CDC 0240202D */ daddu $a0, $s2, $zero /* BA5460 80240CE0 10400002 */ beqz $v0, .L80240CEC /* BA5464 80240CE4 2402001E */ addiu $v0, $zero, 0x1e @@ -151,21 +151,21 @@ glabel func_80240B8C_BA530C /* BA553C 80240DBC 0280302D */ daddu $a2, $s4, $zero /* BA5540 80240DC0 08090386 */ j .L80240E18 /* BA5544 80240DC4 00000000 */ nop -/* BA5548 80240DC8 0C09015C */ jal func_80240570 +/* BA5548 80240DC8 0C09015C */ jal func_80240570_BA4CF0 /* BA554C 80240DCC 0240202D */ daddu $a0, $s2, $zero -/* BA5550 80240DD0 0C090177 */ jal func_802405DC +/* BA5550 80240DD0 0C090177 */ jal func_802405DC_BA4D5C /* BA5554 80240DD4 0240202D */ daddu $a0, $s2, $zero /* BA5558 80240DD8 8E430070 */ lw $v1, 0x70($s2) /* BA555C 80240DDC 24020020 */ addiu $v0, $zero, 0x20 /* BA5560 80240DE0 1462000D */ bne $v1, $v0, .L80240E18 /* BA5564 80240DE4 00000000 */ nop -/* BA5568 80240DE8 0C090193 */ jal func_8024064C +/* BA5568 80240DE8 0C090193 */ jal func_8024064C_BA4DCC /* BA556C 80240DEC 0240202D */ daddu $a0, $s2, $zero /* BA5570 80240DF0 8E430070 */ lw $v1, 0x70($s2) /* BA5574 80240DF4 24020021 */ addiu $v0, $zero, 0x21 /* BA5578 80240DF8 14620007 */ bne $v1, $v0, .L80240E18 /* BA557C 80240DFC 00000000 */ nop -/* BA5580 80240E00 0C0901C9 */ jal func_80240724 +/* BA5580 80240E00 0C0901C9 */ jal func_80240724_BA4EA4 /* BA5584 80240E04 0240202D */ daddu $a0, $s2, $zero /* BA5588 80240E08 08090386 */ j .L80240E18 /* BA558C 80240E0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC.s deleted file mode 100644 index 02407e880d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EAC -/* BA562C 80240EAC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BA5630 80240EB0 AFB3003C */ sw $s3, 0x3c($sp) -/* BA5634 80240EB4 0080982D */ daddu $s3, $a0, $zero -/* BA5638 80240EB8 AFBF0040 */ sw $ra, 0x40($sp) -/* BA563C 80240EBC AFB20038 */ sw $s2, 0x38($sp) -/* BA5640 80240EC0 AFB10034 */ sw $s1, 0x34($sp) -/* BA5644 80240EC4 AFB00030 */ sw $s0, 0x30($sp) -/* BA5648 80240EC8 8E720148 */ lw $s2, 0x148($s3) -/* BA564C 80240ECC 00A0882D */ daddu $s1, $a1, $zero -/* BA5650 80240ED0 86440008 */ lh $a0, 8($s2) -/* BA5654 80240ED4 0C00EABB */ jal get_npc_unsafe -/* BA5658 80240ED8 00C0802D */ daddu $s0, $a2, $zero -/* BA565C 80240EDC 0200202D */ daddu $a0, $s0, $zero -/* BA5660 80240EE0 0240282D */ daddu $a1, $s2, $zero -/* BA5664 80240EE4 AFA00010 */ sw $zero, 0x10($sp) -/* BA5668 80240EE8 8E26000C */ lw $a2, 0xc($s1) -/* BA566C 80240EEC 8E270010 */ lw $a3, 0x10($s1) -/* BA5670 80240EF0 0C01242D */ jal func_800490B4 -/* BA5674 80240EF4 0040882D */ daddu $s1, $v0, $zero -/* BA5678 80240EF8 10400024 */ beqz $v0, .L80240F8C -/* BA567C 80240EFC 0220202D */ daddu $a0, $s1, $zero -/* BA5680 80240F00 24050322 */ addiu $a1, $zero, 0x322 -/* BA5684 80240F04 0C012530 */ jal func_800494C0 -/* BA5688 80240F08 0000302D */ daddu $a2, $zero, $zero -/* BA568C 80240F0C 0000202D */ daddu $a0, $zero, $zero -/* BA5690 80240F10 0220282D */ daddu $a1, $s1, $zero -/* BA5694 80240F14 0000302D */ daddu $a2, $zero, $zero -/* BA5698 80240F18 2410000A */ addiu $s0, $zero, 0xa -/* BA569C 80240F1C 862300A8 */ lh $v1, 0xa8($s1) -/* BA56A0 80240F20 3C013F80 */ lui $at, 0x3f80 -/* BA56A4 80240F24 44810000 */ mtc1 $at, $f0 -/* BA56A8 80240F28 3C014000 */ lui $at, 0x4000 -/* BA56AC 80240F2C 44811000 */ mtc1 $at, $f2 -/* BA56B0 80240F30 3C01C1A0 */ lui $at, 0xc1a0 -/* BA56B4 80240F34 44812000 */ mtc1 $at, $f4 -/* BA56B8 80240F38 44833000 */ mtc1 $v1, $f6 -/* BA56BC 80240F3C 00000000 */ nop -/* BA56C0 80240F40 468031A0 */ cvt.s.w $f6, $f6 -/* BA56C4 80240F44 44073000 */ mfc1 $a3, $f6 -/* BA56C8 80240F48 27A20028 */ addiu $v0, $sp, 0x28 -/* BA56CC 80240F4C AFB0001C */ sw $s0, 0x1c($sp) -/* BA56D0 80240F50 AFA20020 */ sw $v0, 0x20($sp) -/* BA56D4 80240F54 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA56D8 80240F58 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA56DC 80240F5C 0C01BFA4 */ jal fx_emote -/* BA56E0 80240F60 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA56E4 80240F64 0220202D */ daddu $a0, $s1, $zero -/* BA56E8 80240F68 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BA56EC 80240F6C 0C012530 */ jal func_800494C0 -/* BA56F0 80240F70 3C060020 */ lui $a2, 0x20 -/* BA56F4 80240F74 8E4200CC */ lw $v0, 0xcc($s2) -/* BA56F8 80240F78 8C420020 */ lw $v0, 0x20($v0) -/* BA56FC 80240F7C AE220028 */ sw $v0, 0x28($s1) -/* BA5700 80240F80 9642008E */ lhu $v0, 0x8e($s2) -/* BA5704 80240F84 A622008E */ sh $v0, 0x8e($s1) -/* BA5708 80240F88 AE700070 */ sw $s0, 0x70($s3) -.L80240F8C: -/* BA570C 80240F8C 8FBF0040 */ lw $ra, 0x40($sp) -/* BA5710 80240F90 8FB3003C */ lw $s3, 0x3c($sp) -/* BA5714 80240F94 8FB20038 */ lw $s2, 0x38($sp) -/* BA5718 80240F98 8FB10034 */ lw $s1, 0x34($sp) -/* BA571C 80240F9C 8FB00030 */ lw $s0, 0x30($sp) -/* BA5720 80240FA0 03E00008 */ jr $ra -/* BA5724 80240FA4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s new file mode 100644 index 0000000000..e628e71cf9 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80240EAC_BA562C.s @@ -0,0 +1,68 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EAC_BA562C +/* BA562C 80240EAC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* BA5630 80240EB0 AFB3003C */ sw $s3, 0x3c($sp) +/* BA5634 80240EB4 0080982D */ daddu $s3, $a0, $zero +/* BA5638 80240EB8 AFBF0040 */ sw $ra, 0x40($sp) +/* BA563C 80240EBC AFB20038 */ sw $s2, 0x38($sp) +/* BA5640 80240EC0 AFB10034 */ sw $s1, 0x34($sp) +/* BA5644 80240EC4 AFB00030 */ sw $s0, 0x30($sp) +/* BA5648 80240EC8 8E720148 */ lw $s2, 0x148($s3) +/* BA564C 80240ECC 00A0882D */ daddu $s1, $a1, $zero +/* BA5650 80240ED0 86440008 */ lh $a0, 8($s2) +/* BA5654 80240ED4 0C00EABB */ jal get_npc_unsafe +/* BA5658 80240ED8 00C0802D */ daddu $s0, $a2, $zero +/* BA565C 80240EDC 0200202D */ daddu $a0, $s0, $zero +/* BA5660 80240EE0 0240282D */ daddu $a1, $s2, $zero +/* BA5664 80240EE4 AFA00010 */ sw $zero, 0x10($sp) +/* BA5668 80240EE8 8E26000C */ lw $a2, 0xc($s1) +/* BA566C 80240EEC 8E270010 */ lw $a3, 0x10($s1) +/* BA5670 80240EF0 0C01242D */ jal func_800490B4 +/* BA5674 80240EF4 0040882D */ daddu $s1, $v0, $zero +/* BA5678 80240EF8 10400024 */ beqz $v0, .L80240F8C +/* BA567C 80240EFC 0220202D */ daddu $a0, $s1, $zero +/* BA5680 80240F00 24050322 */ addiu $a1, $zero, 0x322 +/* BA5684 80240F04 0C012530 */ jal func_800494C0 +/* BA5688 80240F08 0000302D */ daddu $a2, $zero, $zero +/* BA568C 80240F0C 0000202D */ daddu $a0, $zero, $zero +/* BA5690 80240F10 0220282D */ daddu $a1, $s1, $zero +/* BA5694 80240F14 0000302D */ daddu $a2, $zero, $zero +/* BA5698 80240F18 2410000A */ addiu $s0, $zero, 0xa +/* BA569C 80240F1C 862300A8 */ lh $v1, 0xa8($s1) +/* BA56A0 80240F20 3C013F80 */ lui $at, 0x3f80 +/* BA56A4 80240F24 44810000 */ mtc1 $at, $f0 +/* BA56A8 80240F28 3C014000 */ lui $at, 0x4000 +/* BA56AC 80240F2C 44811000 */ mtc1 $at, $f2 +/* BA56B0 80240F30 3C01C1A0 */ lui $at, 0xc1a0 +/* BA56B4 80240F34 44812000 */ mtc1 $at, $f4 +/* BA56B8 80240F38 44833000 */ mtc1 $v1, $f6 +/* BA56BC 80240F3C 00000000 */ nop +/* BA56C0 80240F40 468031A0 */ cvt.s.w $f6, $f6 +/* BA56C4 80240F44 44073000 */ mfc1 $a3, $f6 +/* BA56C8 80240F48 27A20028 */ addiu $v0, $sp, 0x28 +/* BA56CC 80240F4C AFB0001C */ sw $s0, 0x1c($sp) +/* BA56D0 80240F50 AFA20020 */ sw $v0, 0x20($sp) +/* BA56D4 80240F54 E7A00010 */ swc1 $f0, 0x10($sp) +/* BA56D8 80240F58 E7A20014 */ swc1 $f2, 0x14($sp) +/* BA56DC 80240F5C 0C01BFA4 */ jal fx_emote +/* BA56E0 80240F60 E7A40018 */ swc1 $f4, 0x18($sp) +/* BA56E4 80240F64 0220202D */ daddu $a0, $s1, $zero +/* BA56E8 80240F68 240502F4 */ addiu $a1, $zero, 0x2f4 +/* BA56EC 80240F6C 0C012530 */ jal func_800494C0 +/* BA56F0 80240F70 3C060020 */ lui $a2, 0x20 +/* BA56F4 80240F74 8E4200CC */ lw $v0, 0xcc($s2) +/* BA56F8 80240F78 8C420020 */ lw $v0, 0x20($v0) +/* BA56FC 80240F7C AE220028 */ sw $v0, 0x28($s1) +/* BA5700 80240F80 9642008E */ lhu $v0, 0x8e($s2) +/* BA5704 80240F84 A622008E */ sh $v0, 0x8e($s1) +/* BA5708 80240F88 AE700070 */ sw $s0, 0x70($s3) +.L80240F8C: +/* BA570C 80240F8C 8FBF0040 */ lw $ra, 0x40($sp) +/* BA5710 80240F90 8FB3003C */ lw $s3, 0x3c($sp) +/* BA5714 80240F94 8FB20038 */ lw $s2, 0x38($sp) +/* BA5718 80240F98 8FB10034 */ lw $s1, 0x34($sp) +/* BA571C 80240F9C 8FB00030 */ lw $s0, 0x30($sp) +/* BA5720 80240FA0 03E00008 */ jr $ra +/* BA5724 80240FA4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78.s deleted file mode 100644 index 1db9412b6d..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A78 -/* BA61F8 80241A78 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BA61FC 80241A7C AFB10034 */ sw $s1, 0x34($sp) -/* BA6200 80241A80 0080882D */ daddu $s1, $a0, $zero -/* BA6204 80241A84 AFBF0038 */ sw $ra, 0x38($sp) -/* BA6208 80241A88 AFB00030 */ sw $s0, 0x30($sp) -/* BA620C 80241A8C 8E300148 */ lw $s0, 0x148($s1) -/* BA6210 80241A90 0C00EABB */ jal get_npc_unsafe -/* BA6214 80241A94 86040008 */ lh $a0, 8($s0) -/* BA6218 80241A98 0040282D */ daddu $a1, $v0, $zero -/* BA621C 80241A9C 94A2008E */ lhu $v0, 0x8e($a1) -/* BA6220 80241AA0 24420001 */ addiu $v0, $v0, 1 -/* BA6224 80241AA4 A4A2008E */ sh $v0, 0x8e($a1) -/* BA6228 80241AA8 00021400 */ sll $v0, $v0, 0x10 -/* BA622C 80241AAC 8E0300A0 */ lw $v1, 0xa0($s0) -/* BA6230 80241AB0 00021403 */ sra $v0, $v0, 0x10 -/* BA6234 80241AB4 14430004 */ bne $v0, $v1, .L80241AC8 -/* BA6238 80241AB8 00000000 */ nop -/* BA623C 80241ABC 8E0200CC */ lw $v0, 0xcc($s0) -/* BA6240 80241AC0 8C42002C */ lw $v0, 0x2c($v0) -/* BA6244 80241AC4 ACA20028 */ sw $v0, 0x28($a1) -.L80241AC8: -/* BA6248 80241AC8 84A3008E */ lh $v1, 0x8e($a1) -/* BA624C 80241ACC 8E0200A4 */ lw $v0, 0xa4($s0) -/* BA6250 80241AD0 14620002 */ bne $v1, $v0, .L80241ADC -/* BA6254 80241AD4 24020003 */ addiu $v0, $zero, 3 -/* BA6258 80241AD8 AE02006C */ sw $v0, 0x6c($s0) -.L80241ADC: -/* BA625C 80241ADC 84A2008E */ lh $v0, 0x8e($a1) -/* BA6260 80241AE0 8E03009C */ lw $v1, 0x9c($s0) -/* BA6264 80241AE4 0043102A */ slt $v0, $v0, $v1 -/* BA6268 80241AE8 1440001E */ bnez $v0, .L80241B64 -/* BA626C 80241AEC 24020004 */ addiu $v0, $zero, 4 -/* BA6270 80241AF0 AE02006C */ sw $v0, 0x6c($s0) -/* BA6274 80241AF4 24020008 */ addiu $v0, $zero, 8 -/* BA6278 80241AF8 24040003 */ addiu $a0, $zero, 3 -/* BA627C 80241AFC A4A2008E */ sh $v0, 0x8e($a1) -/* BA6280 80241B00 8E0200CC */ lw $v0, 0xcc($s0) -/* BA6284 80241B04 84A300A8 */ lh $v1, 0xa8($a1) -/* BA6288 80241B08 3C013F80 */ lui $at, 0x3f80 -/* BA628C 80241B0C 44810000 */ mtc1 $at, $f0 -/* BA6290 80241B10 3C014000 */ lui $at, 0x4000 -/* BA6294 80241B14 44811000 */ mtc1 $at, $f2 -/* BA6298 80241B18 3C01C1A0 */ lui $at, 0xc1a0 -/* BA629C 80241B1C 44812000 */ mtc1 $at, $f4 -/* BA62A0 80241B20 44833000 */ mtc1 $v1, $f6 -/* BA62A4 80241B24 00000000 */ nop -/* BA62A8 80241B28 468031A0 */ cvt.s.w $f6, $f6 -/* BA62AC 80241B2C 8C420000 */ lw $v0, ($v0) -/* BA62B0 80241B30 44073000 */ mfc1 $a3, $f6 -/* BA62B4 80241B34 0000302D */ daddu $a2, $zero, $zero -/* BA62B8 80241B38 ACA20028 */ sw $v0, 0x28($a1) -/* BA62BC 80241B3C 2402000A */ addiu $v0, $zero, 0xa -/* BA62C0 80241B40 AFA2001C */ sw $v0, 0x1c($sp) -/* BA62C4 80241B44 27A20028 */ addiu $v0, $sp, 0x28 -/* BA62C8 80241B48 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA62CC 80241B4C E7A20014 */ swc1 $f2, 0x14($sp) -/* BA62D0 80241B50 E7A40018 */ swc1 $f4, 0x18($sp) -/* BA62D4 80241B54 0C01BFA4 */ jal fx_emote -/* BA62D8 80241B58 AFA20020 */ sw $v0, 0x20($sp) -/* BA62DC 80241B5C 2402000D */ addiu $v0, $zero, 0xd -/* BA62E0 80241B60 AE220070 */ sw $v0, 0x70($s1) -.L80241B64: -/* BA62E4 80241B64 8FBF0038 */ lw $ra, 0x38($sp) -/* BA62E8 80241B68 8FB10034 */ lw $s1, 0x34($sp) -/* BA62EC 80241B6C 8FB00030 */ lw $s0, 0x30($sp) -/* BA62F0 80241B70 03E00008 */ jr $ra -/* BA62F4 80241B74 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s new file mode 100644 index 0000000000..87e5040739 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241A78_BA61F8.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A78_BA61F8 +/* BA61F8 80241A78 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* BA61FC 80241A7C AFB10034 */ sw $s1, 0x34($sp) +/* BA6200 80241A80 0080882D */ daddu $s1, $a0, $zero +/* BA6204 80241A84 AFBF0038 */ sw $ra, 0x38($sp) +/* BA6208 80241A88 AFB00030 */ sw $s0, 0x30($sp) +/* BA620C 80241A8C 8E300148 */ lw $s0, 0x148($s1) +/* BA6210 80241A90 0C00EABB */ jal get_npc_unsafe +/* BA6214 80241A94 86040008 */ lh $a0, 8($s0) +/* BA6218 80241A98 0040282D */ daddu $a1, $v0, $zero +/* BA621C 80241A9C 94A2008E */ lhu $v0, 0x8e($a1) +/* BA6220 80241AA0 24420001 */ addiu $v0, $v0, 1 +/* BA6224 80241AA4 A4A2008E */ sh $v0, 0x8e($a1) +/* BA6228 80241AA8 00021400 */ sll $v0, $v0, 0x10 +/* BA622C 80241AAC 8E0300A0 */ lw $v1, 0xa0($s0) +/* BA6230 80241AB0 00021403 */ sra $v0, $v0, 0x10 +/* BA6234 80241AB4 14430004 */ bne $v0, $v1, .L80241AC8 +/* BA6238 80241AB8 00000000 */ nop +/* BA623C 80241ABC 8E0200CC */ lw $v0, 0xcc($s0) +/* BA6240 80241AC0 8C42002C */ lw $v0, 0x2c($v0) +/* BA6244 80241AC4 ACA20028 */ sw $v0, 0x28($a1) +.L80241AC8: +/* BA6248 80241AC8 84A3008E */ lh $v1, 0x8e($a1) +/* BA624C 80241ACC 8E0200A4 */ lw $v0, 0xa4($s0) +/* BA6250 80241AD0 14620002 */ bne $v1, $v0, .L80241ADC +/* BA6254 80241AD4 24020003 */ addiu $v0, $zero, 3 +/* BA6258 80241AD8 AE02006C */ sw $v0, 0x6c($s0) +.L80241ADC: +/* BA625C 80241ADC 84A2008E */ lh $v0, 0x8e($a1) +/* BA6260 80241AE0 8E03009C */ lw $v1, 0x9c($s0) +/* BA6264 80241AE4 0043102A */ slt $v0, $v0, $v1 +/* BA6268 80241AE8 1440001E */ bnez $v0, .L80241B64 +/* BA626C 80241AEC 24020004 */ addiu $v0, $zero, 4 +/* BA6270 80241AF0 AE02006C */ sw $v0, 0x6c($s0) +/* BA6274 80241AF4 24020008 */ addiu $v0, $zero, 8 +/* BA6278 80241AF8 24040003 */ addiu $a0, $zero, 3 +/* BA627C 80241AFC A4A2008E */ sh $v0, 0x8e($a1) +/* BA6280 80241B00 8E0200CC */ lw $v0, 0xcc($s0) +/* BA6284 80241B04 84A300A8 */ lh $v1, 0xa8($a1) +/* BA6288 80241B08 3C013F80 */ lui $at, 0x3f80 +/* BA628C 80241B0C 44810000 */ mtc1 $at, $f0 +/* BA6290 80241B10 3C014000 */ lui $at, 0x4000 +/* BA6294 80241B14 44811000 */ mtc1 $at, $f2 +/* BA6298 80241B18 3C01C1A0 */ lui $at, 0xc1a0 +/* BA629C 80241B1C 44812000 */ mtc1 $at, $f4 +/* BA62A0 80241B20 44833000 */ mtc1 $v1, $f6 +/* BA62A4 80241B24 00000000 */ nop +/* BA62A8 80241B28 468031A0 */ cvt.s.w $f6, $f6 +/* BA62AC 80241B2C 8C420000 */ lw $v0, ($v0) +/* BA62B0 80241B30 44073000 */ mfc1 $a3, $f6 +/* BA62B4 80241B34 0000302D */ daddu $a2, $zero, $zero +/* BA62B8 80241B38 ACA20028 */ sw $v0, 0x28($a1) +/* BA62BC 80241B3C 2402000A */ addiu $v0, $zero, 0xa +/* BA62C0 80241B40 AFA2001C */ sw $v0, 0x1c($sp) +/* BA62C4 80241B44 27A20028 */ addiu $v0, $sp, 0x28 +/* BA62C8 80241B48 E7A00010 */ swc1 $f0, 0x10($sp) +/* BA62CC 80241B4C E7A20014 */ swc1 $f2, 0x14($sp) +/* BA62D0 80241B50 E7A40018 */ swc1 $f4, 0x18($sp) +/* BA62D4 80241B54 0C01BFA4 */ jal fx_emote +/* BA62D8 80241B58 AFA20020 */ sw $v0, 0x20($sp) +/* BA62DC 80241B5C 2402000D */ addiu $v0, $zero, 0xd +/* BA62E0 80241B60 AE220070 */ sw $v0, 0x70($s1) +.L80241B64: +/* BA62E4 80241B64 8FBF0038 */ lw $ra, 0x38($sp) +/* BA62E8 80241B68 8FB10034 */ lw $s1, 0x34($sp) +/* BA62EC 80241B6C 8FB00030 */ lw $s0, 0x30($sp) +/* BA62F0 80241B70 03E00008 */ jr $ra +/* BA62F4 80241B74 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78.s deleted file mode 100644 index aa7bddfa47..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B78 -/* BA62F8 80241B78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BA62FC 80241B7C AFB10014 */ sw $s1, 0x14($sp) -/* BA6300 80241B80 0080882D */ daddu $s1, $a0, $zero -/* BA6304 80241B84 AFBF0018 */ sw $ra, 0x18($sp) -/* BA6308 80241B88 AFB00010 */ sw $s0, 0x10($sp) -/* BA630C 80241B8C 8E300148 */ lw $s0, 0x148($s1) -/* BA6310 80241B90 0C00EABB */ jal get_npc_unsafe -/* BA6314 80241B94 86040008 */ lh $a0, 8($s0) -/* BA6318 80241B98 0040182D */ daddu $v1, $v0, $zero -/* BA631C 80241B9C 9462008E */ lhu $v0, 0x8e($v1) -/* BA6320 80241BA0 2442FFFF */ addiu $v0, $v0, -1 -/* BA6324 80241BA4 A462008E */ sh $v0, 0x8e($v1) -/* BA6328 80241BA8 00021400 */ sll $v0, $v0, 0x10 -/* BA632C 80241BAC 14400005 */ bnez $v0, .L80241BC4 -/* BA6330 80241BB0 00000000 */ nop -/* BA6334 80241BB4 960200AA */ lhu $v0, 0xaa($s0) -/* BA6338 80241BB8 A462008E */ sh $v0, 0x8e($v1) -/* BA633C 80241BBC 2402000E */ addiu $v0, $zero, 0xe -/* BA6340 80241BC0 AE220070 */ sw $v0, 0x70($s1) -.L80241BC4: -/* BA6344 80241BC4 8FBF0018 */ lw $ra, 0x18($sp) -/* BA6348 80241BC8 8FB10014 */ lw $s1, 0x14($sp) -/* BA634C 80241BCC 8FB00010 */ lw $s0, 0x10($sp) -/* BA6350 80241BD0 03E00008 */ jr $ra -/* BA6354 80241BD4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s new file mode 100644 index 0000000000..00a2c19ec7 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241B78_BA62F8.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B78_BA62F8 +/* BA62F8 80241B78 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BA62FC 80241B7C AFB10014 */ sw $s1, 0x14($sp) +/* BA6300 80241B80 0080882D */ daddu $s1, $a0, $zero +/* BA6304 80241B84 AFBF0018 */ sw $ra, 0x18($sp) +/* BA6308 80241B88 AFB00010 */ sw $s0, 0x10($sp) +/* BA630C 80241B8C 8E300148 */ lw $s0, 0x148($s1) +/* BA6310 80241B90 0C00EABB */ jal get_npc_unsafe +/* BA6314 80241B94 86040008 */ lh $a0, 8($s0) +/* BA6318 80241B98 0040182D */ daddu $v1, $v0, $zero +/* BA631C 80241B9C 9462008E */ lhu $v0, 0x8e($v1) +/* BA6320 80241BA0 2442FFFF */ addiu $v0, $v0, -1 +/* BA6324 80241BA4 A462008E */ sh $v0, 0x8e($v1) +/* BA6328 80241BA8 00021400 */ sll $v0, $v0, 0x10 +/* BA632C 80241BAC 14400005 */ bnez $v0, .L80241BC4 +/* BA6330 80241BB0 00000000 */ nop +/* BA6334 80241BB4 960200AA */ lhu $v0, 0xaa($s0) +/* BA6338 80241BB8 A462008E */ sh $v0, 0x8e($v1) +/* BA633C 80241BBC 2402000E */ addiu $v0, $zero, 0xe +/* BA6340 80241BC0 AE220070 */ sw $v0, 0x70($s1) +.L80241BC4: +/* BA6344 80241BC4 8FBF0018 */ lw $ra, 0x18($sp) +/* BA6348 80241BC8 8FB10014 */ lw $s1, 0x14($sp) +/* BA634C 80241BCC 8FB00010 */ lw $s0, 0x10($sp) +/* BA6350 80241BD0 03E00008 */ jr $ra +/* BA6354 80241BD4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4.s deleted file mode 100644 index 7d0ae81410..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CC4 -/* BA6444 80241CC4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BA6448 80241CC8 AFB20038 */ sw $s2, 0x38($sp) -/* BA644C 80241CCC 0080902D */ daddu $s2, $a0, $zero -/* BA6450 80241CD0 AFBF0048 */ sw $ra, 0x48($sp) -/* BA6454 80241CD4 AFB50044 */ sw $s5, 0x44($sp) -/* BA6458 80241CD8 AFB40040 */ sw $s4, 0x40($sp) -/* BA645C 80241CDC AFB3003C */ sw $s3, 0x3c($sp) -/* BA6460 80241CE0 AFB10034 */ sw $s1, 0x34($sp) -/* BA6464 80241CE4 AFB00030 */ sw $s0, 0x30($sp) -/* BA6468 80241CE8 8E510148 */ lw $s1, 0x148($s2) -/* BA646C 80241CEC 86240008 */ lh $a0, 8($s1) -/* BA6470 80241CF0 0C00EABB */ jal get_npc_unsafe -/* BA6474 80241CF4 00A0802D */ daddu $s0, $a1, $zero -/* BA6478 80241CF8 8E43000C */ lw $v1, 0xc($s2) -/* BA647C 80241CFC 0240202D */ daddu $a0, $s2, $zero -/* BA6480 80241D00 8C650000 */ lw $a1, ($v1) -/* BA6484 80241D04 0C0B1EAF */ jal get_variable -/* BA6488 80241D08 0040A82D */ daddu $s5, $v0, $zero -/* BA648C 80241D0C AFA00010 */ sw $zero, 0x10($sp) -/* BA6490 80241D10 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA6494 80241D14 8C630030 */ lw $v1, 0x30($v1) -/* BA6498 80241D18 AFA30014 */ sw $v1, 0x14($sp) -/* BA649C 80241D1C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA64A0 80241D20 8C63001C */ lw $v1, 0x1c($v1) -/* BA64A4 80241D24 AFA30018 */ sw $v1, 0x18($sp) -/* BA64A8 80241D28 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA64AC 80241D2C 8C630024 */ lw $v1, 0x24($v1) -/* BA64B0 80241D30 AFA3001C */ sw $v1, 0x1c($sp) -/* BA64B4 80241D34 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA64B8 80241D38 8C630028 */ lw $v1, 0x28($v1) -/* BA64BC 80241D3C 27B40010 */ addiu $s4, $sp, 0x10 -/* BA64C0 80241D40 AFA30020 */ sw $v1, 0x20($sp) -/* BA64C4 80241D44 8E2300D0 */ lw $v1, 0xd0($s1) -/* BA64C8 80241D48 3C014348 */ lui $at, 0x4348 -/* BA64CC 80241D4C 44810000 */ mtc1 $at, $f0 -/* BA64D0 80241D50 8C63002C */ lw $v1, 0x2c($v1) -/* BA64D4 80241D54 0040982D */ daddu $s3, $v0, $zero -/* BA64D8 80241D58 E7A00028 */ swc1 $f0, 0x28($sp) -/* BA64DC 80241D5C A7A0002C */ sh $zero, 0x2c($sp) -/* BA64E0 80241D60 16000005 */ bnez $s0, .L80241D78 -/* BA64E4 80241D64 AFA30024 */ sw $v1, 0x24($sp) -/* BA64E8 80241D68 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA64EC 80241D6C 30420004 */ andi $v0, $v0, 4 -/* BA64F0 80241D70 10400011 */ beqz $v0, .L80241DB8 -/* BA64F4 80241D74 00000000 */ nop -.L80241D78: -/* BA64F8 80241D78 AE400070 */ sw $zero, 0x70($s2) -/* BA64FC 80241D7C A6A0008E */ sh $zero, 0x8e($s5) -/* BA6500 80241D80 8E2200CC */ lw $v0, 0xcc($s1) -/* BA6504 80241D84 8C420000 */ lw $v0, ($v0) -/* BA6508 80241D88 AEA20028 */ sw $v0, 0x28($s5) -/* BA650C 80241D8C 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA6510 80241D90 30420004 */ andi $v0, $v0, 4 -/* BA6514 80241D94 10400008 */ beqz $v0, .L80241DB8 -/* BA6518 80241D98 AE20006C */ sw $zero, 0x6c($s1) -/* BA651C 80241D9C 24020063 */ addiu $v0, $zero, 0x63 -/* BA6520 80241DA0 AE420070 */ sw $v0, 0x70($s2) -/* BA6524 80241DA4 AE400074 */ sw $zero, 0x74($s2) -/* BA6528 80241DA8 8E2200B0 */ lw $v0, 0xb0($s1) -/* BA652C 80241DAC 2403FFFB */ addiu $v1, $zero, -5 -/* BA6530 80241DB0 00431024 */ and $v0, $v0, $v1 -/* BA6534 80241DB4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241DB8: -/* BA6538 80241DB8 8E430070 */ lw $v1, 0x70($s2) -/* BA653C 80241DBC 2410000B */ addiu $s0, $zero, 0xb -/* BA6540 80241DC0 1070002A */ beq $v1, $s0, .L80241E6C -/* BA6544 80241DC4 2862000C */ slti $v0, $v1, 0xc -/* BA6548 80241DC8 1040000D */ beqz $v0, .L80241E00 -/* BA654C 80241DCC 24020001 */ addiu $v0, $zero, 1 -/* BA6550 80241DD0 1062001A */ beq $v1, $v0, .L80241E3C -/* BA6554 80241DD4 28620002 */ slti $v0, $v1, 2 -/* BA6558 80241DD8 10400005 */ beqz $v0, .L80241DF0 -/* BA655C 80241DDC 2402000A */ addiu $v0, $zero, 0xa -/* BA6560 80241DE0 10600013 */ beqz $v1, .L80241E30 -/* BA6564 80241DE4 0240202D */ daddu $a0, $s2, $zero -/* BA6568 80241DE8 080907BB */ j .L80241EEC -/* BA656C 80241DEC 00000000 */ nop -.L80241DF0: -/* BA6570 80241DF0 10620018 */ beq $v1, $v0, .L80241E54 -/* BA6574 80241DF4 0240202D */ daddu $a0, $s2, $zero -/* BA6578 80241DF8 080907BB */ j .L80241EEC -/* BA657C 80241DFC 00000000 */ nop -.L80241E00: -/* BA6580 80241E00 2402000D */ addiu $v0, $zero, 0xd -/* BA6584 80241E04 10620029 */ beq $v1, $v0, .L80241EAC -/* BA6588 80241E08 0062102A */ slt $v0, $v1, $v0 -/* BA658C 80241E0C 14400020 */ bnez $v0, .L80241E90 -/* BA6590 80241E10 0240202D */ daddu $a0, $s2, $zero -/* BA6594 80241E14 2402000E */ addiu $v0, $zero, 0xe -/* BA6598 80241E18 1062002D */ beq $v1, $v0, .L80241ED0 -/* BA659C 80241E1C 24020063 */ addiu $v0, $zero, 0x63 -/* BA65A0 80241E20 10620030 */ beq $v1, $v0, .L80241EE4 -/* BA65A4 80241E24 00000000 */ nop -/* BA65A8 80241E28 080907BB */ j .L80241EEC -/* BA65AC 80241E2C 00000000 */ nop -.L80241E30: -/* BA65B0 80241E30 0260282D */ daddu $a1, $s3, $zero -/* BA65B4 80241E34 0C090390 */ jal func_80240E40 -/* BA65B8 80241E38 0280302D */ daddu $a2, $s4, $zero -.L80241E3C: -/* BA65BC 80241E3C 0240202D */ daddu $a0, $s2, $zero -/* BA65C0 80241E40 0260282D */ daddu $a1, $s3, $zero -/* BA65C4 80241E44 0C0903AB */ jal func_80240EAC -/* BA65C8 80241E48 0280302D */ daddu $a2, $s4, $zero -/* BA65CC 80241E4C 080907BB */ j .L80241EEC -/* BA65D0 80241E50 00000000 */ nop -.L80241E54: -/* BA65D4 80241E54 0260282D */ daddu $a1, $s3, $zero -/* BA65D8 80241E58 0C0903EA */ jal func_80240FA8 -/* BA65DC 80241E5C 0280302D */ daddu $a2, $s4, $zero -/* BA65E0 80241E60 8E420070 */ lw $v0, 0x70($s2) -/* BA65E4 80241E64 14500021 */ bne $v0, $s0, .L80241EEC -/* BA65E8 80241E68 00000000 */ nop -.L80241E6C: -/* BA65EC 80241E6C 0240202D */ daddu $a0, $s2, $zero -/* BA65F0 80241E70 0260282D */ daddu $a1, $s3, $zero -/* BA65F4 80241E74 0C09067A */ jal func_802419E8 -/* BA65F8 80241E78 0280302D */ daddu $a2, $s4, $zero -/* BA65FC 80241E7C 8E430070 */ lw $v1, 0x70($s2) -/* BA6600 80241E80 2402000C */ addiu $v0, $zero, 0xc -/* BA6604 80241E84 14620019 */ bne $v1, $v0, .L80241EEC -/* BA6608 80241E88 00000000 */ nop -/* BA660C 80241E8C 0240202D */ daddu $a0, $s2, $zero -.L80241E90: -/* BA6610 80241E90 0260282D */ daddu $a1, $s3, $zero -/* BA6614 80241E94 0C09069E */ jal func_80241A78 -/* BA6618 80241E98 0280302D */ daddu $a2, $s4, $zero -/* BA661C 80241E9C 8E430070 */ lw $v1, 0x70($s2) -/* BA6620 80241EA0 2402000D */ addiu $v0, $zero, 0xd -/* BA6624 80241EA4 14620011 */ bne $v1, $v0, .L80241EEC -/* BA6628 80241EA8 00000000 */ nop -.L80241EAC: -/* BA662C 80241EAC 0240202D */ daddu $a0, $s2, $zero -/* BA6630 80241EB0 0260282D */ daddu $a1, $s3, $zero -/* BA6634 80241EB4 0C0906DE */ jal func_80241B78 -/* BA6638 80241EB8 0280302D */ daddu $a2, $s4, $zero -/* BA663C 80241EBC 8E430070 */ lw $v1, 0x70($s2) -/* BA6640 80241EC0 2402000E */ addiu $v0, $zero, 0xe -/* BA6644 80241EC4 14620009 */ bne $v1, $v0, .L80241EEC -/* BA6648 80241EC8 00000000 */ nop -/* BA664C 80241ECC 0240202D */ daddu $a0, $s2, $zero -.L80241ED0: -/* BA6650 80241ED0 0260282D */ daddu $a1, $s3, $zero -/* BA6654 80241ED4 0C0906F6 */ jal func_80241BD8 -/* BA6658 80241ED8 0280302D */ daddu $a2, $s4, $zero -/* BA665C 80241EDC 080907BB */ j .L80241EEC -/* BA6660 80241EE0 00000000 */ nop -.L80241EE4: -/* BA6664 80241EE4 0C0129CF */ jal func_8004A73C -/* BA6668 80241EE8 0240202D */ daddu $a0, $s2, $zero -.L80241EEC: -/* BA666C 80241EEC 8FBF0048 */ lw $ra, 0x48($sp) -/* BA6670 80241EF0 8FB50044 */ lw $s5, 0x44($sp) -/* BA6674 80241EF4 8FB40040 */ lw $s4, 0x40($sp) -/* BA6678 80241EF8 8FB3003C */ lw $s3, 0x3c($sp) -/* BA667C 80241EFC 8FB20038 */ lw $s2, 0x38($sp) -/* BA6680 80241F00 8FB10034 */ lw $s1, 0x34($sp) -/* BA6684 80241F04 8FB00030 */ lw $s0, 0x30($sp) -/* BA6688 80241F08 0000102D */ daddu $v0, $zero, $zero -/* BA668C 80241F0C 03E00008 */ jr $ra -/* BA6690 80241F10 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s new file mode 100644 index 0000000000..0b2c037674 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241CC4_BA6444.s @@ -0,0 +1,165 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CC4_BA6444 +/* BA6444 80241CC4 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BA6448 80241CC8 AFB20038 */ sw $s2, 0x38($sp) +/* BA644C 80241CCC 0080902D */ daddu $s2, $a0, $zero +/* BA6450 80241CD0 AFBF0048 */ sw $ra, 0x48($sp) +/* BA6454 80241CD4 AFB50044 */ sw $s5, 0x44($sp) +/* BA6458 80241CD8 AFB40040 */ sw $s4, 0x40($sp) +/* BA645C 80241CDC AFB3003C */ sw $s3, 0x3c($sp) +/* BA6460 80241CE0 AFB10034 */ sw $s1, 0x34($sp) +/* BA6464 80241CE4 AFB00030 */ sw $s0, 0x30($sp) +/* BA6468 80241CE8 8E510148 */ lw $s1, 0x148($s2) +/* BA646C 80241CEC 86240008 */ lh $a0, 8($s1) +/* BA6470 80241CF0 0C00EABB */ jal get_npc_unsafe +/* BA6474 80241CF4 00A0802D */ daddu $s0, $a1, $zero +/* BA6478 80241CF8 8E43000C */ lw $v1, 0xc($s2) +/* BA647C 80241CFC 0240202D */ daddu $a0, $s2, $zero +/* BA6480 80241D00 8C650000 */ lw $a1, ($v1) +/* BA6484 80241D04 0C0B1EAF */ jal get_variable +/* BA6488 80241D08 0040A82D */ daddu $s5, $v0, $zero +/* BA648C 80241D0C AFA00010 */ sw $zero, 0x10($sp) +/* BA6490 80241D10 8E2300D0 */ lw $v1, 0xd0($s1) +/* BA6494 80241D14 8C630030 */ lw $v1, 0x30($v1) +/* BA6498 80241D18 AFA30014 */ sw $v1, 0x14($sp) +/* BA649C 80241D1C 8E2300D0 */ lw $v1, 0xd0($s1) +/* BA64A0 80241D20 8C63001C */ lw $v1, 0x1c($v1) +/* BA64A4 80241D24 AFA30018 */ sw $v1, 0x18($sp) +/* BA64A8 80241D28 8E2300D0 */ lw $v1, 0xd0($s1) +/* BA64AC 80241D2C 8C630024 */ lw $v1, 0x24($v1) +/* BA64B0 80241D30 AFA3001C */ sw $v1, 0x1c($sp) +/* BA64B4 80241D34 8E2300D0 */ lw $v1, 0xd0($s1) +/* BA64B8 80241D38 8C630028 */ lw $v1, 0x28($v1) +/* BA64BC 80241D3C 27B40010 */ addiu $s4, $sp, 0x10 +/* BA64C0 80241D40 AFA30020 */ sw $v1, 0x20($sp) +/* BA64C4 80241D44 8E2300D0 */ lw $v1, 0xd0($s1) +/* BA64C8 80241D48 3C014348 */ lui $at, 0x4348 +/* BA64CC 80241D4C 44810000 */ mtc1 $at, $f0 +/* BA64D0 80241D50 8C63002C */ lw $v1, 0x2c($v1) +/* BA64D4 80241D54 0040982D */ daddu $s3, $v0, $zero +/* BA64D8 80241D58 E7A00028 */ swc1 $f0, 0x28($sp) +/* BA64DC 80241D5C A7A0002C */ sh $zero, 0x2c($sp) +/* BA64E0 80241D60 16000005 */ bnez $s0, .L80241D78 +/* BA64E4 80241D64 AFA30024 */ sw $v1, 0x24($sp) +/* BA64E8 80241D68 8E2200B0 */ lw $v0, 0xb0($s1) +/* BA64EC 80241D6C 30420004 */ andi $v0, $v0, 4 +/* BA64F0 80241D70 10400011 */ beqz $v0, .L80241DB8 +/* BA64F4 80241D74 00000000 */ nop +.L80241D78: +/* BA64F8 80241D78 AE400070 */ sw $zero, 0x70($s2) +/* BA64FC 80241D7C A6A0008E */ sh $zero, 0x8e($s5) +/* BA6500 80241D80 8E2200CC */ lw $v0, 0xcc($s1) +/* BA6504 80241D84 8C420000 */ lw $v0, ($v0) +/* BA6508 80241D88 AEA20028 */ sw $v0, 0x28($s5) +/* BA650C 80241D8C 8E2200B0 */ lw $v0, 0xb0($s1) +/* BA6510 80241D90 30420004 */ andi $v0, $v0, 4 +/* BA6514 80241D94 10400008 */ beqz $v0, .L80241DB8 +/* BA6518 80241D98 AE20006C */ sw $zero, 0x6c($s1) +/* BA651C 80241D9C 24020063 */ addiu $v0, $zero, 0x63 +/* BA6520 80241DA0 AE420070 */ sw $v0, 0x70($s2) +/* BA6524 80241DA4 AE400074 */ sw $zero, 0x74($s2) +/* BA6528 80241DA8 8E2200B0 */ lw $v0, 0xb0($s1) +/* BA652C 80241DAC 2403FFFB */ addiu $v1, $zero, -5 +/* BA6530 80241DB0 00431024 */ and $v0, $v0, $v1 +/* BA6534 80241DB4 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241DB8: +/* BA6538 80241DB8 8E430070 */ lw $v1, 0x70($s2) +/* BA653C 80241DBC 2410000B */ addiu $s0, $zero, 0xb +/* BA6540 80241DC0 1070002A */ beq $v1, $s0, .L80241E6C +/* BA6544 80241DC4 2862000C */ slti $v0, $v1, 0xc +/* BA6548 80241DC8 1040000D */ beqz $v0, .L80241E00 +/* BA654C 80241DCC 24020001 */ addiu $v0, $zero, 1 +/* BA6550 80241DD0 1062001A */ beq $v1, $v0, .L80241E3C +/* BA6554 80241DD4 28620002 */ slti $v0, $v1, 2 +/* BA6558 80241DD8 10400005 */ beqz $v0, .L80241DF0 +/* BA655C 80241DDC 2402000A */ addiu $v0, $zero, 0xa +/* BA6560 80241DE0 10600013 */ beqz $v1, .L80241E30 +/* BA6564 80241DE4 0240202D */ daddu $a0, $s2, $zero +/* BA6568 80241DE8 080907BB */ j .L80241EEC +/* BA656C 80241DEC 00000000 */ nop +.L80241DF0: +/* BA6570 80241DF0 10620018 */ beq $v1, $v0, .L80241E54 +/* BA6574 80241DF4 0240202D */ daddu $a0, $s2, $zero +/* BA6578 80241DF8 080907BB */ j .L80241EEC +/* BA657C 80241DFC 00000000 */ nop +.L80241E00: +/* BA6580 80241E00 2402000D */ addiu $v0, $zero, 0xd +/* BA6584 80241E04 10620029 */ beq $v1, $v0, .L80241EAC +/* BA6588 80241E08 0062102A */ slt $v0, $v1, $v0 +/* BA658C 80241E0C 14400020 */ bnez $v0, .L80241E90 +/* BA6590 80241E10 0240202D */ daddu $a0, $s2, $zero +/* BA6594 80241E14 2402000E */ addiu $v0, $zero, 0xe +/* BA6598 80241E18 1062002D */ beq $v1, $v0, .L80241ED0 +/* BA659C 80241E1C 24020063 */ addiu $v0, $zero, 0x63 +/* BA65A0 80241E20 10620030 */ beq $v1, $v0, .L80241EE4 +/* BA65A4 80241E24 00000000 */ nop +/* BA65A8 80241E28 080907BB */ j .L80241EEC +/* BA65AC 80241E2C 00000000 */ nop +.L80241E30: +/* BA65B0 80241E30 0260282D */ daddu $a1, $s3, $zero +/* BA65B4 80241E34 0C090390 */ jal func_80240E40_BA55C0 +/* BA65B8 80241E38 0280302D */ daddu $a2, $s4, $zero +.L80241E3C: +/* BA65BC 80241E3C 0240202D */ daddu $a0, $s2, $zero +/* BA65C0 80241E40 0260282D */ daddu $a1, $s3, $zero +/* BA65C4 80241E44 0C0903AB */ jal func_80240EAC_BA562C +/* BA65C8 80241E48 0280302D */ daddu $a2, $s4, $zero +/* BA65CC 80241E4C 080907BB */ j .L80241EEC +/* BA65D0 80241E50 00000000 */ nop +.L80241E54: +/* BA65D4 80241E54 0260282D */ daddu $a1, $s3, $zero +/* BA65D8 80241E58 0C0903EA */ jal func_80240FA8_BA5728 +/* BA65DC 80241E5C 0280302D */ daddu $a2, $s4, $zero +/* BA65E0 80241E60 8E420070 */ lw $v0, 0x70($s2) +/* BA65E4 80241E64 14500021 */ bne $v0, $s0, .L80241EEC +/* BA65E8 80241E68 00000000 */ nop +.L80241E6C: +/* BA65EC 80241E6C 0240202D */ daddu $a0, $s2, $zero +/* BA65F0 80241E70 0260282D */ daddu $a1, $s3, $zero +/* BA65F4 80241E74 0C09067A */ jal func_802419E8_BA6168 +/* BA65F8 80241E78 0280302D */ daddu $a2, $s4, $zero +/* BA65FC 80241E7C 8E430070 */ lw $v1, 0x70($s2) +/* BA6600 80241E80 2402000C */ addiu $v0, $zero, 0xc +/* BA6604 80241E84 14620019 */ bne $v1, $v0, .L80241EEC +/* BA6608 80241E88 00000000 */ nop +/* BA660C 80241E8C 0240202D */ daddu $a0, $s2, $zero +.L80241E90: +/* BA6610 80241E90 0260282D */ daddu $a1, $s3, $zero +/* BA6614 80241E94 0C09069E */ jal func_80241A78_BA61F8 +/* BA6618 80241E98 0280302D */ daddu $a2, $s4, $zero +/* BA661C 80241E9C 8E430070 */ lw $v1, 0x70($s2) +/* BA6620 80241EA0 2402000D */ addiu $v0, $zero, 0xd +/* BA6624 80241EA4 14620011 */ bne $v1, $v0, .L80241EEC +/* BA6628 80241EA8 00000000 */ nop +.L80241EAC: +/* BA662C 80241EAC 0240202D */ daddu $a0, $s2, $zero +/* BA6630 80241EB0 0260282D */ daddu $a1, $s3, $zero +/* BA6634 80241EB4 0C0906DE */ jal func_80241B78_BA62F8 +/* BA6638 80241EB8 0280302D */ daddu $a2, $s4, $zero +/* BA663C 80241EBC 8E430070 */ lw $v1, 0x70($s2) +/* BA6640 80241EC0 2402000E */ addiu $v0, $zero, 0xe +/* BA6644 80241EC4 14620009 */ bne $v1, $v0, .L80241EEC +/* BA6648 80241EC8 00000000 */ nop +/* BA664C 80241ECC 0240202D */ daddu $a0, $s2, $zero +.L80241ED0: +/* BA6650 80241ED0 0260282D */ daddu $a1, $s3, $zero +/* BA6654 80241ED4 0C0906F6 */ jal func_80241BD8_BA6358 +/* BA6658 80241ED8 0280302D */ daddu $a2, $s4, $zero +/* BA665C 80241EDC 080907BB */ j .L80241EEC +/* BA6660 80241EE0 00000000 */ nop +.L80241EE4: +/* BA6664 80241EE4 0C0129CF */ jal func_8004A73C +/* BA6668 80241EE8 0240202D */ daddu $a0, $s2, $zero +.L80241EEC: +/* BA666C 80241EEC 8FBF0048 */ lw $ra, 0x48($sp) +/* BA6670 80241EF0 8FB50044 */ lw $s5, 0x44($sp) +/* BA6674 80241EF4 8FB40040 */ lw $s4, 0x40($sp) +/* BA6678 80241EF8 8FB3003C */ lw $s3, 0x3c($sp) +/* BA667C 80241EFC 8FB20038 */ lw $s2, 0x38($sp) +/* BA6680 80241F00 8FB10034 */ lw $s1, 0x34($sp) +/* BA6684 80241F04 8FB00030 */ lw $s0, 0x30($sp) +/* BA6688 80241F08 0000102D */ daddu $v0, $zero, $zero +/* BA668C 80241F0C 03E00008 */ jr $ra +/* BA6690 80241F10 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14.s deleted file mode 100644 index fff7904afd..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14.s +++ /dev/null @@ -1,147 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F14 -/* BA6694 80241F14 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* BA6698 80241F18 AFB00030 */ sw $s0, 0x30($sp) -/* BA669C 80241F1C 0080802D */ daddu $s0, $a0, $zero -/* BA66A0 80241F20 AFBF0040 */ sw $ra, 0x40($sp) -/* BA66A4 80241F24 AFB3003C */ sw $s3, 0x3c($sp) -/* BA66A8 80241F28 AFB20038 */ sw $s2, 0x38($sp) -/* BA66AC 80241F2C AFB10034 */ sw $s1, 0x34($sp) -/* BA66B0 80241F30 F7B60050 */ sdc1 $f22, 0x50($sp) -/* BA66B4 80241F34 F7B40048 */ sdc1 $f20, 0x48($sp) -/* BA66B8 80241F38 8E130148 */ lw $s3, 0x148($s0) -/* BA66BC 80241F3C 00A0882D */ daddu $s1, $a1, $zero -/* BA66C0 80241F40 86640008 */ lh $a0, 8($s3) -/* BA66C4 80241F44 0C00EABB */ jal get_npc_unsafe -/* BA66C8 80241F48 00C0902D */ daddu $s2, $a2, $zero -/* BA66CC 80241F4C 0200202D */ daddu $a0, $s0, $zero -/* BA66D0 80241F50 0220282D */ daddu $a1, $s1, $zero -/* BA66D4 80241F54 0240302D */ daddu $a2, $s2, $zero -/* BA66D8 80241F58 0C012568 */ jal func_800495A0 -/* BA66DC 80241F5C 0040802D */ daddu $s0, $v0, $zero -/* BA66E0 80241F60 8E020000 */ lw $v0, ($s0) -/* BA66E4 80241F64 2404002D */ addiu $a0, $zero, 0x2d -/* BA66E8 80241F68 34420800 */ ori $v0, $v0, 0x800 -/* BA66EC 80241F6C 0C00A67F */ jal rand_int -/* BA66F0 80241F70 AE020000 */ sw $v0, ($s0) -/* BA66F4 80241F74 0200202D */ daddu $a0, $s0, $zero -/* BA66F8 80241F78 3C05B000 */ lui $a1, 0xb000 -/* BA66FC 80241F7C 34A50017 */ ori $a1, $a1, 0x17 -/* BA6700 80241F80 44820000 */ mtc1 $v0, $f0 -/* BA6704 80241F84 00000000 */ nop -/* BA6708 80241F88 46800021 */ cvt.d.w $f0, $f0 -/* BA670C 80241F8C 3C014024 */ lui $at, 0x4024 -/* BA6710 80241F90 44811800 */ mtc1 $at, $f3 -/* BA6714 80241F94 44801000 */ mtc1 $zero, $f2 -/* BA6718 80241F98 3C014020 */ lui $at, 0x4020 -/* BA671C 80241F9C 44812800 */ mtc1 $at, $f5 -/* BA6720 80241FA0 44802000 */ mtc1 $zero, $f4 -/* BA6724 80241FA4 46220003 */ div.d $f0, $f0, $f2 -/* BA6728 80241FA8 46240000 */ add.d $f0, $f0, $f4 -/* BA672C 80241FAC 3C013FC0 */ lui $at, 0x3fc0 -/* BA6730 80241FB0 44811000 */ mtc1 $at, $f2 -/* BA6734 80241FB4 0000302D */ daddu $a2, $zero, $zero -/* BA6738 80241FB8 E6020014 */ swc1 $f2, 0x14($s0) -/* BA673C 80241FBC 46200020 */ cvt.s.d $f0, $f0 -/* BA6740 80241FC0 0C012530 */ jal func_800494C0 -/* BA6744 80241FC4 E600001C */ swc1 $f0, 0x1c($s0) -/* BA6748 80241FC8 8E6300D0 */ lw $v1, 0xd0($s3) -/* BA674C 80241FCC C6000040 */ lwc1 $f0, 0x40($s0) -/* BA6750 80241FD0 C4620000 */ lwc1 $f2, ($v1) -/* BA6754 80241FD4 468010A0 */ cvt.s.w $f2, $f2 -/* BA6758 80241FD8 C4640008 */ lwc1 $f4, 8($v1) -/* BA675C 80241FDC 46802120 */ cvt.s.w $f4, $f4 -/* BA6760 80241FE0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA6764 80241FE4 8E6200D0 */ lw $v0, 0xd0($s3) -/* BA6768 80241FE8 44051000 */ mfc1 $a1, $f2 -/* BA676C 80241FEC C440000C */ lwc1 $f0, 0xc($v0) -/* BA6770 80241FF0 46800020 */ cvt.s.w $f0, $f0 -/* BA6774 80241FF4 E7A00014 */ swc1 $f0, 0x14($sp) -/* BA6778 80241FF8 8E6200D0 */ lw $v0, 0xd0($s3) -/* BA677C 80241FFC 44062000 */ mfc1 $a2, $f4 -/* BA6780 80242000 C4400010 */ lwc1 $f0, 0x10($v0) -/* BA6784 80242004 46800020 */ cvt.s.w $f0, $f0 -/* BA6788 80242008 E7A00018 */ swc1 $f0, 0x18($sp) -/* BA678C 8024200C 8C640018 */ lw $a0, 0x18($v1) -/* BA6790 80242010 0C0123F5 */ jal is_point_within_region -/* BA6794 80242014 8E070038 */ lw $a3, 0x38($s0) -/* BA6798 80242018 10400035 */ beqz $v0, .L802420F0 -/* BA679C 8024201C 00000000 */ nop -/* BA67A0 80242020 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA67A4 80242024 3C0141C8 */ lui $at, 0x41c8 -/* BA67A8 80242028 4481B000 */ mtc1 $at, $f22 -/* BA67AC 8024202C 8E6200D0 */ lw $v0, 0xd0($s3) -/* BA67B0 80242030 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA67B4 80242034 C4480000 */ lwc1 $f8, ($v0) -/* BA67B8 80242038 46804220 */ cvt.s.w $f8, $f8 -/* BA67BC 8024203C 44064000 */ mfc1 $a2, $f8 -/* BA67C0 80242040 C4480008 */ lwc1 $f8, 8($v0) -/* BA67C4 80242044 46804220 */ cvt.s.w $f8, $f8 -/* BA67C8 80242048 44074000 */ mfc1 $a3, $f8 -/* BA67CC 8024204C 3C01403E */ lui $at, 0x403e -/* BA67D0 80242050 4481A800 */ mtc1 $at, $f21 -/* BA67D4 80242054 4480A000 */ mtc1 $zero, $f20 -/* BA67D8 80242058 0C00A720 */ jal atan2 -/* BA67DC 8024205C 0000882D */ daddu $s1, $zero, $zero -/* BA67E0 80242060 C6020038 */ lwc1 $f2, 0x38($s0) -/* BA67E4 80242064 C604003C */ lwc1 $f4, 0x3c($s0) -/* BA67E8 80242068 C6060040 */ lwc1 $f6, 0x40($s0) -/* BA67EC 8024206C E600000C */ swc1 $f0, 0xc($s0) -/* BA67F0 80242070 E7A20020 */ swc1 $f2, 0x20($sp) -/* BA67F4 80242074 E7A40024 */ swc1 $f4, 0x24($sp) -/* BA67F8 80242078 E7A60028 */ swc1 $f6, 0x28($sp) -.L8024207C: -/* BA67FC 8024207C E7B60010 */ swc1 $f22, 0x10($sp) -/* BA6800 80242080 C600000C */ lwc1 $f0, 0xc($s0) -/* BA6804 80242084 E7A00014 */ swc1 $f0, 0x14($sp) -/* BA6808 80242088 860200A8 */ lh $v0, 0xa8($s0) -/* BA680C 8024208C 27A50020 */ addiu $a1, $sp, 0x20 -/* BA6810 80242090 44820000 */ mtc1 $v0, $f0 -/* BA6814 80242094 00000000 */ nop -/* BA6818 80242098 46800020 */ cvt.s.w $f0, $f0 -/* BA681C 8024209C E7A00018 */ swc1 $f0, 0x18($sp) -/* BA6820 802420A0 860200A6 */ lh $v0, 0xa6($s0) -/* BA6824 802420A4 27A60024 */ addiu $a2, $sp, 0x24 -/* BA6828 802420A8 44820000 */ mtc1 $v0, $f0 -/* BA682C 802420AC 00000000 */ nop -/* BA6830 802420B0 46800020 */ cvt.s.w $f0, $f0 -/* BA6834 802420B4 E7A0001C */ swc1 $f0, 0x1c($sp) -/* BA6838 802420B8 8E040080 */ lw $a0, 0x80($s0) -/* BA683C 802420BC 0C037711 */ jal func_800DDC44 -/* BA6840 802420C0 27A70028 */ addiu $a3, $sp, 0x28 -/* BA6844 802420C4 10400016 */ beqz $v0, .L80242120 -/* BA6848 802420C8 26310001 */ addiu $s1, $s1, 1 -/* BA684C 802420CC C600000C */ lwc1 $f0, 0xc($s0) -/* BA6850 802420D0 46000021 */ cvt.d.s $f0, $f0 -/* BA6854 802420D4 46340000 */ add.d $f0, $f0, $f20 -/* BA6858 802420D8 2A220006 */ slti $v0, $s1, 6 -/* BA685C 802420DC 46200020 */ cvt.s.d $f0, $f0 -/* BA6860 802420E0 1440FFE6 */ bnez $v0, .L8024207C -/* BA6864 802420E4 E600000C */ swc1 $f0, 0xc($s0) -/* BA6868 802420E8 08090848 */ j .L80242120 -/* BA686C 802420EC 00000000 */ nop -.L802420F0: -/* BA6870 802420F0 0C00A67F */ jal rand_int -/* BA6874 802420F4 2404003C */ addiu $a0, $zero, 0x3c -/* BA6878 802420F8 C60C000C */ lwc1 $f12, 0xc($s0) -/* BA687C 802420FC 44820000 */ mtc1 $v0, $f0 -/* BA6880 80242100 00000000 */ nop -/* BA6884 80242104 46800020 */ cvt.s.w $f0, $f0 -/* BA6888 80242108 46006300 */ add.s $f12, $f12, $f0 -/* BA688C 8024210C 3C0141F0 */ lui $at, 0x41f0 -/* BA6890 80242110 44810000 */ mtc1 $at, $f0 -/* BA6894 80242114 0C00A6C9 */ jal clamp_angle -/* BA6898 80242118 46006301 */ sub.s $f12, $f12, $f0 -/* BA689C 8024211C E600000C */ swc1 $f0, 0xc($s0) -.L80242120: -/* BA68A0 80242120 8FBF0040 */ lw $ra, 0x40($sp) -/* BA68A4 80242124 8FB3003C */ lw $s3, 0x3c($sp) -/* BA68A8 80242128 8FB20038 */ lw $s2, 0x38($sp) -/* BA68AC 8024212C 8FB10034 */ lw $s1, 0x34($sp) -/* BA68B0 80242130 8FB00030 */ lw $s0, 0x30($sp) -/* BA68B4 80242134 D7B60050 */ ldc1 $f22, 0x50($sp) -/* BA68B8 80242138 D7B40048 */ ldc1 $f20, 0x48($sp) -/* BA68BC 8024213C 03E00008 */ jr $ra -/* BA68C0 80242140 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s new file mode 100644 index 0000000000..fa59fa9bb9 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80241F14_BA6694.s @@ -0,0 +1,147 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F14_BA6694 +/* BA6694 80241F14 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* BA6698 80241F18 AFB00030 */ sw $s0, 0x30($sp) +/* BA669C 80241F1C 0080802D */ daddu $s0, $a0, $zero +/* BA66A0 80241F20 AFBF0040 */ sw $ra, 0x40($sp) +/* BA66A4 80241F24 AFB3003C */ sw $s3, 0x3c($sp) +/* BA66A8 80241F28 AFB20038 */ sw $s2, 0x38($sp) +/* BA66AC 80241F2C AFB10034 */ sw $s1, 0x34($sp) +/* BA66B0 80241F30 F7B60050 */ sdc1 $f22, 0x50($sp) +/* BA66B4 80241F34 F7B40048 */ sdc1 $f20, 0x48($sp) +/* BA66B8 80241F38 8E130148 */ lw $s3, 0x148($s0) +/* BA66BC 80241F3C 00A0882D */ daddu $s1, $a1, $zero +/* BA66C0 80241F40 86640008 */ lh $a0, 8($s3) +/* BA66C4 80241F44 0C00EABB */ jal get_npc_unsafe +/* BA66C8 80241F48 00C0902D */ daddu $s2, $a2, $zero +/* BA66CC 80241F4C 0200202D */ daddu $a0, $s0, $zero +/* BA66D0 80241F50 0220282D */ daddu $a1, $s1, $zero +/* BA66D4 80241F54 0240302D */ daddu $a2, $s2, $zero +/* BA66D8 80241F58 0C012568 */ jal func_800495A0 +/* BA66DC 80241F5C 0040802D */ daddu $s0, $v0, $zero +/* BA66E0 80241F60 8E020000 */ lw $v0, ($s0) +/* BA66E4 80241F64 2404002D */ addiu $a0, $zero, 0x2d +/* BA66E8 80241F68 34420800 */ ori $v0, $v0, 0x800 +/* BA66EC 80241F6C 0C00A67F */ jal rand_int +/* BA66F0 80241F70 AE020000 */ sw $v0, ($s0) +/* BA66F4 80241F74 0200202D */ daddu $a0, $s0, $zero +/* BA66F8 80241F78 3C05B000 */ lui $a1, 0xb000 +/* BA66FC 80241F7C 34A50017 */ ori $a1, $a1, 0x17 +/* BA6700 80241F80 44820000 */ mtc1 $v0, $f0 +/* BA6704 80241F84 00000000 */ nop +/* BA6708 80241F88 46800021 */ cvt.d.w $f0, $f0 +/* BA670C 80241F8C 3C014024 */ lui $at, 0x4024 +/* BA6710 80241F90 44811800 */ mtc1 $at, $f3 +/* BA6714 80241F94 44801000 */ mtc1 $zero, $f2 +/* BA6718 80241F98 3C014020 */ lui $at, 0x4020 +/* BA671C 80241F9C 44812800 */ mtc1 $at, $f5 +/* BA6720 80241FA0 44802000 */ mtc1 $zero, $f4 +/* BA6724 80241FA4 46220003 */ div.d $f0, $f0, $f2 +/* BA6728 80241FA8 46240000 */ add.d $f0, $f0, $f4 +/* BA672C 80241FAC 3C013FC0 */ lui $at, 0x3fc0 +/* BA6730 80241FB0 44811000 */ mtc1 $at, $f2 +/* BA6734 80241FB4 0000302D */ daddu $a2, $zero, $zero +/* BA6738 80241FB8 E6020014 */ swc1 $f2, 0x14($s0) +/* BA673C 80241FBC 46200020 */ cvt.s.d $f0, $f0 +/* BA6740 80241FC0 0C012530 */ jal func_800494C0 +/* BA6744 80241FC4 E600001C */ swc1 $f0, 0x1c($s0) +/* BA6748 80241FC8 8E6300D0 */ lw $v1, 0xd0($s3) +/* BA674C 80241FCC C6000040 */ lwc1 $f0, 0x40($s0) +/* BA6750 80241FD0 C4620000 */ lwc1 $f2, ($v1) +/* BA6754 80241FD4 468010A0 */ cvt.s.w $f2, $f2 +/* BA6758 80241FD8 C4640008 */ lwc1 $f4, 8($v1) +/* BA675C 80241FDC 46802120 */ cvt.s.w $f4, $f4 +/* BA6760 80241FE0 E7A00010 */ swc1 $f0, 0x10($sp) +/* BA6764 80241FE4 8E6200D0 */ lw $v0, 0xd0($s3) +/* BA6768 80241FE8 44051000 */ mfc1 $a1, $f2 +/* BA676C 80241FEC C440000C */ lwc1 $f0, 0xc($v0) +/* BA6770 80241FF0 46800020 */ cvt.s.w $f0, $f0 +/* BA6774 80241FF4 E7A00014 */ swc1 $f0, 0x14($sp) +/* BA6778 80241FF8 8E6200D0 */ lw $v0, 0xd0($s3) +/* BA677C 80241FFC 44062000 */ mfc1 $a2, $f4 +/* BA6780 80242000 C4400010 */ lwc1 $f0, 0x10($v0) +/* BA6784 80242004 46800020 */ cvt.s.w $f0, $f0 +/* BA6788 80242008 E7A00018 */ swc1 $f0, 0x18($sp) +/* BA678C 8024200C 8C640018 */ lw $a0, 0x18($v1) +/* BA6790 80242010 0C0123F5 */ jal is_point_within_region +/* BA6794 80242014 8E070038 */ lw $a3, 0x38($s0) +/* BA6798 80242018 10400035 */ beqz $v0, .L802420F0 +/* BA679C 8024201C 00000000 */ nop +/* BA67A0 80242020 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BA67A4 80242024 3C0141C8 */ lui $at, 0x41c8 +/* BA67A8 80242028 4481B000 */ mtc1 $at, $f22 +/* BA67AC 8024202C 8E6200D0 */ lw $v0, 0xd0($s3) +/* BA67B0 80242030 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BA67B4 80242034 C4480000 */ lwc1 $f8, ($v0) +/* BA67B8 80242038 46804220 */ cvt.s.w $f8, $f8 +/* BA67BC 8024203C 44064000 */ mfc1 $a2, $f8 +/* BA67C0 80242040 C4480008 */ lwc1 $f8, 8($v0) +/* BA67C4 80242044 46804220 */ cvt.s.w $f8, $f8 +/* BA67C8 80242048 44074000 */ mfc1 $a3, $f8 +/* BA67CC 8024204C 3C01403E */ lui $at, 0x403e +/* BA67D0 80242050 4481A800 */ mtc1 $at, $f21 +/* BA67D4 80242054 4480A000 */ mtc1 $zero, $f20 +/* BA67D8 80242058 0C00A720 */ jal atan2 +/* BA67DC 8024205C 0000882D */ daddu $s1, $zero, $zero +/* BA67E0 80242060 C6020038 */ lwc1 $f2, 0x38($s0) +/* BA67E4 80242064 C604003C */ lwc1 $f4, 0x3c($s0) +/* BA67E8 80242068 C6060040 */ lwc1 $f6, 0x40($s0) +/* BA67EC 8024206C E600000C */ swc1 $f0, 0xc($s0) +/* BA67F0 80242070 E7A20020 */ swc1 $f2, 0x20($sp) +/* BA67F4 80242074 E7A40024 */ swc1 $f4, 0x24($sp) +/* BA67F8 80242078 E7A60028 */ swc1 $f6, 0x28($sp) +.L8024207C: +/* BA67FC 8024207C E7B60010 */ swc1 $f22, 0x10($sp) +/* BA6800 80242080 C600000C */ lwc1 $f0, 0xc($s0) +/* BA6804 80242084 E7A00014 */ swc1 $f0, 0x14($sp) +/* BA6808 80242088 860200A8 */ lh $v0, 0xa8($s0) +/* BA680C 8024208C 27A50020 */ addiu $a1, $sp, 0x20 +/* BA6810 80242090 44820000 */ mtc1 $v0, $f0 +/* BA6814 80242094 00000000 */ nop +/* BA6818 80242098 46800020 */ cvt.s.w $f0, $f0 +/* BA681C 8024209C E7A00018 */ swc1 $f0, 0x18($sp) +/* BA6820 802420A0 860200A6 */ lh $v0, 0xa6($s0) +/* BA6824 802420A4 27A60024 */ addiu $a2, $sp, 0x24 +/* BA6828 802420A8 44820000 */ mtc1 $v0, $f0 +/* BA682C 802420AC 00000000 */ nop +/* BA6830 802420B0 46800020 */ cvt.s.w $f0, $f0 +/* BA6834 802420B4 E7A0001C */ swc1 $f0, 0x1c($sp) +/* BA6838 802420B8 8E040080 */ lw $a0, 0x80($s0) +/* BA683C 802420BC 0C037711 */ jal func_800DDC44 +/* BA6840 802420C0 27A70028 */ addiu $a3, $sp, 0x28 +/* BA6844 802420C4 10400016 */ beqz $v0, .L80242120 +/* BA6848 802420C8 26310001 */ addiu $s1, $s1, 1 +/* BA684C 802420CC C600000C */ lwc1 $f0, 0xc($s0) +/* BA6850 802420D0 46000021 */ cvt.d.s $f0, $f0 +/* BA6854 802420D4 46340000 */ add.d $f0, $f0, $f20 +/* BA6858 802420D8 2A220006 */ slti $v0, $s1, 6 +/* BA685C 802420DC 46200020 */ cvt.s.d $f0, $f0 +/* BA6860 802420E0 1440FFE6 */ bnez $v0, .L8024207C +/* BA6864 802420E4 E600000C */ swc1 $f0, 0xc($s0) +/* BA6868 802420E8 08090848 */ j .L80242120 +/* BA686C 802420EC 00000000 */ nop +.L802420F0: +/* BA6870 802420F0 0C00A67F */ jal rand_int +/* BA6874 802420F4 2404003C */ addiu $a0, $zero, 0x3c +/* BA6878 802420F8 C60C000C */ lwc1 $f12, 0xc($s0) +/* BA687C 802420FC 44820000 */ mtc1 $v0, $f0 +/* BA6880 80242100 00000000 */ nop +/* BA6884 80242104 46800020 */ cvt.s.w $f0, $f0 +/* BA6888 80242108 46006300 */ add.s $f12, $f12, $f0 +/* BA688C 8024210C 3C0141F0 */ lui $at, 0x41f0 +/* BA6890 80242110 44810000 */ mtc1 $at, $f0 +/* BA6894 80242114 0C00A6C9 */ jal clamp_angle +/* BA6898 80242118 46006301 */ sub.s $f12, $f12, $f0 +/* BA689C 8024211C E600000C */ swc1 $f0, 0xc($s0) +.L80242120: +/* BA68A0 80242120 8FBF0040 */ lw $ra, 0x40($sp) +/* BA68A4 80242124 8FB3003C */ lw $s3, 0x3c($sp) +/* BA68A8 80242128 8FB20038 */ lw $s2, 0x38($sp) +/* BA68AC 8024212C 8FB10034 */ lw $s1, 0x34($sp) +/* BA68B0 80242130 8FB00030 */ lw $s0, 0x30($sp) +/* BA68B4 80242134 D7B60050 */ ldc1 $f22, 0x50($sp) +/* BA68B8 80242138 D7B40048 */ ldc1 $f20, 0x48($sp) +/* BA68BC 8024213C 03E00008 */ jr $ra +/* BA68C0 80242140 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C.s deleted file mode 100644 index ff7a3df74a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024253C -/* BA6CBC 8024253C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BA6CC0 80242540 AFB40040 */ sw $s4, 0x40($sp) -/* BA6CC4 80242544 0080A02D */ daddu $s4, $a0, $zero -/* BA6CC8 80242548 AFBF0044 */ sw $ra, 0x44($sp) -/* BA6CCC 8024254C AFB3003C */ sw $s3, 0x3c($sp) -/* BA6CD0 80242550 AFB20038 */ sw $s2, 0x38($sp) -/* BA6CD4 80242554 AFB10034 */ sw $s1, 0x34($sp) -/* BA6CD8 80242558 AFB00030 */ sw $s0, 0x30($sp) -/* BA6CDC 8024255C 8E920148 */ lw $s2, 0x148($s4) -/* BA6CE0 80242560 00A0882D */ daddu $s1, $a1, $zero -/* BA6CE4 80242564 86440008 */ lh $a0, 8($s2) -/* BA6CE8 80242568 0C00EABB */ jal get_npc_unsafe -/* BA6CEC 8024256C 00C0982D */ daddu $s3, $a2, $zero -/* BA6CF0 80242570 8E230014 */ lw $v1, 0x14($s1) -/* BA6CF4 80242574 0460002D */ bltz $v1, .L8024262C -/* BA6CF8 80242578 0040802D */ daddu $s0, $v0, $zero -/* BA6CFC 8024257C 0260202D */ daddu $a0, $s3, $zero -/* BA6D00 80242580 AFA00010 */ sw $zero, 0x10($sp) -/* BA6D04 80242584 8E260024 */ lw $a2, 0x24($s1) -/* BA6D08 80242588 8E270028 */ lw $a3, 0x28($s1) -/* BA6D0C 8024258C 0C01242D */ jal func_800490B4 -/* BA6D10 80242590 0240282D */ daddu $a1, $s2, $zero -/* BA6D14 80242594 10400025 */ beqz $v0, .L8024262C -/* BA6D18 80242598 0000202D */ daddu $a0, $zero, $zero -/* BA6D1C 8024259C 0200282D */ daddu $a1, $s0, $zero -/* BA6D20 802425A0 0000302D */ daddu $a2, $zero, $zero -/* BA6D24 802425A4 860300A8 */ lh $v1, 0xa8($s0) -/* BA6D28 802425A8 3C013F80 */ lui $at, 0x3f80 -/* BA6D2C 802425AC 44810000 */ mtc1 $at, $f0 -/* BA6D30 802425B0 3C014000 */ lui $at, 0x4000 -/* BA6D34 802425B4 44811000 */ mtc1 $at, $f2 -/* BA6D38 802425B8 3C01C1A0 */ lui $at, 0xc1a0 -/* BA6D3C 802425BC 44812000 */ mtc1 $at, $f4 -/* BA6D40 802425C0 2402000F */ addiu $v0, $zero, 0xf -/* BA6D44 802425C4 AFA2001C */ sw $v0, 0x1c($sp) -/* BA6D48 802425C8 44833000 */ mtc1 $v1, $f6 -/* BA6D4C 802425CC 00000000 */ nop -/* BA6D50 802425D0 468031A0 */ cvt.s.w $f6, $f6 -/* BA6D54 802425D4 44073000 */ mfc1 $a3, $f6 -/* BA6D58 802425D8 27A20028 */ addiu $v0, $sp, 0x28 -/* BA6D5C 802425DC AFA20020 */ sw $v0, 0x20($sp) -/* BA6D60 802425E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* BA6D64 802425E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* BA6D68 802425E8 0C01BFA4 */ jal fx_emote -/* BA6D6C 802425EC E7A40018 */ swc1 $f4, 0x18($sp) -/* BA6D70 802425F0 0200202D */ daddu $a0, $s0, $zero -/* BA6D74 802425F4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BA6D78 802425F8 0C012530 */ jal func_800494C0 -/* BA6D7C 802425FC 3C060020 */ lui $a2, 0x20 -/* BA6D80 80242600 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BA6D84 80242604 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BA6D88 80242608 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BA6D8C 8024260C C60E0040 */ lwc1 $f14, 0x40($s0) -/* BA6D90 80242610 8C460028 */ lw $a2, 0x28($v0) -/* BA6D94 80242614 0C00A720 */ jal atan2 -/* BA6D98 80242618 8C470030 */ lw $a3, 0x30($v0) -/* BA6D9C 8024261C 2402000C */ addiu $v0, $zero, 0xc -/* BA6DA0 80242620 E600000C */ swc1 $f0, 0xc($s0) -/* BA6DA4 80242624 080909B0 */ j .L802426C0 -/* BA6DA8 80242628 AE820070 */ sw $v0, 0x70($s4) -.L8024262C: -/* BA6DAC 8024262C 8602008C */ lh $v0, 0x8c($s0) -/* BA6DB0 80242630 14400023 */ bnez $v0, .L802426C0 -/* BA6DB4 80242634 00000000 */ nop -/* BA6DB8 80242638 9602008E */ lhu $v0, 0x8e($s0) -/* BA6DBC 8024263C 2442FFFF */ addiu $v0, $v0, -1 -/* BA6DC0 80242640 A602008E */ sh $v0, 0x8e($s0) -/* BA6DC4 80242644 00021400 */ sll $v0, $v0, 0x10 -/* BA6DC8 80242648 1C40001D */ bgtz $v0, .L802426C0 -/* BA6DCC 8024264C 00000000 */ nop -/* BA6DD0 80242650 8E820074 */ lw $v0, 0x74($s4) -/* BA6DD4 80242654 2442FFFF */ addiu $v0, $v0, -1 -/* BA6DD8 80242658 18400018 */ blez $v0, .L802426BC -/* BA6DDC 8024265C AE820074 */ sw $v0, 0x74($s4) -/* BA6DE0 80242660 C600000C */ lwc1 $f0, 0xc($s0) -/* BA6DE4 80242664 3C014334 */ lui $at, 0x4334 -/* BA6DE8 80242668 44816000 */ mtc1 $at, $f12 -/* BA6DEC 8024266C 0C00A6C9 */ jal clamp_angle -/* BA6DF0 80242670 460C0300 */ add.s $f12, $f0, $f12 -/* BA6DF4 80242674 240403E8 */ addiu $a0, $zero, 0x3e8 -/* BA6DF8 80242678 0C00A67F */ jal rand_int -/* BA6DFC 8024267C E600000C */ swc1 $f0, 0xc($s0) -/* BA6E00 80242680 3C032E8B */ lui $v1, 0x2e8b -/* BA6E04 80242684 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* BA6E08 80242688 00430018 */ mult $v0, $v1 -/* BA6E0C 8024268C 00021FC3 */ sra $v1, $v0, 0x1f -/* BA6E10 80242690 00004010 */ mfhi $t0 -/* BA6E14 80242694 00082043 */ sra $a0, $t0, 1 -/* BA6E18 80242698 00832023 */ subu $a0, $a0, $v1 -/* BA6E1C 8024269C 00041840 */ sll $v1, $a0, 1 -/* BA6E20 802426A0 00641821 */ addu $v1, $v1, $a0 -/* BA6E24 802426A4 00031880 */ sll $v1, $v1, 2 -/* BA6E28 802426A8 00641823 */ subu $v1, $v1, $a0 -/* BA6E2C 802426AC 00431023 */ subu $v0, $v0, $v1 -/* BA6E30 802426B0 24420005 */ addiu $v0, $v0, 5 -/* BA6E34 802426B4 080909B0 */ j .L802426C0 -/* BA6E38 802426B8 A602008E */ sh $v0, 0x8e($s0) -.L802426BC: -/* BA6E3C 802426BC AE800070 */ sw $zero, 0x70($s4) -.L802426C0: -/* BA6E40 802426C0 8FBF0044 */ lw $ra, 0x44($sp) -/* BA6E44 802426C4 8FB40040 */ lw $s4, 0x40($sp) -/* BA6E48 802426C8 8FB3003C */ lw $s3, 0x3c($sp) -/* BA6E4C 802426CC 8FB20038 */ lw $s2, 0x38($sp) -/* BA6E50 802426D0 8FB10034 */ lw $s1, 0x34($sp) -/* BA6E54 802426D4 8FB00030 */ lw $s0, 0x30($sp) -/* BA6E58 802426D8 03E00008 */ jr $ra -/* BA6E5C 802426DC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C_BA6CBC.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C_BA6CBC.s new file mode 100644 index 0000000000..cc740fe6bc --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_8024253C_BA6CBC.s @@ -0,0 +1,112 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024253C_BA6CBC +/* BA6CBC 8024253C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* BA6CC0 80242540 AFB40040 */ sw $s4, 0x40($sp) +/* BA6CC4 80242544 0080A02D */ daddu $s4, $a0, $zero +/* BA6CC8 80242548 AFBF0044 */ sw $ra, 0x44($sp) +/* BA6CCC 8024254C AFB3003C */ sw $s3, 0x3c($sp) +/* BA6CD0 80242550 AFB20038 */ sw $s2, 0x38($sp) +/* BA6CD4 80242554 AFB10034 */ sw $s1, 0x34($sp) +/* BA6CD8 80242558 AFB00030 */ sw $s0, 0x30($sp) +/* BA6CDC 8024255C 8E920148 */ lw $s2, 0x148($s4) +/* BA6CE0 80242560 00A0882D */ daddu $s1, $a1, $zero +/* BA6CE4 80242564 86440008 */ lh $a0, 8($s2) +/* BA6CE8 80242568 0C00EABB */ jal get_npc_unsafe +/* BA6CEC 8024256C 00C0982D */ daddu $s3, $a2, $zero +/* BA6CF0 80242570 8E230014 */ lw $v1, 0x14($s1) +/* BA6CF4 80242574 0460002D */ bltz $v1, .L8024262C +/* BA6CF8 80242578 0040802D */ daddu $s0, $v0, $zero +/* BA6CFC 8024257C 0260202D */ daddu $a0, $s3, $zero +/* BA6D00 80242580 AFA00010 */ sw $zero, 0x10($sp) +/* BA6D04 80242584 8E260024 */ lw $a2, 0x24($s1) +/* BA6D08 80242588 8E270028 */ lw $a3, 0x28($s1) +/* BA6D0C 8024258C 0C01242D */ jal func_800490B4 +/* BA6D10 80242590 0240282D */ daddu $a1, $s2, $zero +/* BA6D14 80242594 10400025 */ beqz $v0, .L8024262C +/* BA6D18 80242598 0000202D */ daddu $a0, $zero, $zero +/* BA6D1C 8024259C 0200282D */ daddu $a1, $s0, $zero +/* BA6D20 802425A0 0000302D */ daddu $a2, $zero, $zero +/* BA6D24 802425A4 860300A8 */ lh $v1, 0xa8($s0) +/* BA6D28 802425A8 3C013F80 */ lui $at, 0x3f80 +/* BA6D2C 802425AC 44810000 */ mtc1 $at, $f0 +/* BA6D30 802425B0 3C014000 */ lui $at, 0x4000 +/* BA6D34 802425B4 44811000 */ mtc1 $at, $f2 +/* BA6D38 802425B8 3C01C1A0 */ lui $at, 0xc1a0 +/* BA6D3C 802425BC 44812000 */ mtc1 $at, $f4 +/* BA6D40 802425C0 2402000F */ addiu $v0, $zero, 0xf +/* BA6D44 802425C4 AFA2001C */ sw $v0, 0x1c($sp) +/* BA6D48 802425C8 44833000 */ mtc1 $v1, $f6 +/* BA6D4C 802425CC 00000000 */ nop +/* BA6D50 802425D0 468031A0 */ cvt.s.w $f6, $f6 +/* BA6D54 802425D4 44073000 */ mfc1 $a3, $f6 +/* BA6D58 802425D8 27A20028 */ addiu $v0, $sp, 0x28 +/* BA6D5C 802425DC AFA20020 */ sw $v0, 0x20($sp) +/* BA6D60 802425E0 E7A00010 */ swc1 $f0, 0x10($sp) +/* BA6D64 802425E4 E7A20014 */ swc1 $f2, 0x14($sp) +/* BA6D68 802425E8 0C01BFA4 */ jal fx_emote +/* BA6D6C 802425EC E7A40018 */ swc1 $f4, 0x18($sp) +/* BA6D70 802425F0 0200202D */ daddu $a0, $s0, $zero +/* BA6D74 802425F4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* BA6D78 802425F8 0C012530 */ jal func_800494C0 +/* BA6D7C 802425FC 3C060020 */ lui $a2, 0x20 +/* BA6D80 80242600 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BA6D84 80242604 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BA6D88 80242608 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BA6D8C 8024260C C60E0040 */ lwc1 $f14, 0x40($s0) +/* BA6D90 80242610 8C460028 */ lw $a2, 0x28($v0) +/* BA6D94 80242614 0C00A720 */ jal atan2 +/* BA6D98 80242618 8C470030 */ lw $a3, 0x30($v0) +/* BA6D9C 8024261C 2402000C */ addiu $v0, $zero, 0xc +/* BA6DA0 80242620 E600000C */ swc1 $f0, 0xc($s0) +/* BA6DA4 80242624 080909B0 */ j .L802426C0 +/* BA6DA8 80242628 AE820070 */ sw $v0, 0x70($s4) +.L8024262C: +/* BA6DAC 8024262C 8602008C */ lh $v0, 0x8c($s0) +/* BA6DB0 80242630 14400023 */ bnez $v0, .L802426C0 +/* BA6DB4 80242634 00000000 */ nop +/* BA6DB8 80242638 9602008E */ lhu $v0, 0x8e($s0) +/* BA6DBC 8024263C 2442FFFF */ addiu $v0, $v0, -1 +/* BA6DC0 80242640 A602008E */ sh $v0, 0x8e($s0) +/* BA6DC4 80242644 00021400 */ sll $v0, $v0, 0x10 +/* BA6DC8 80242648 1C40001D */ bgtz $v0, .L802426C0 +/* BA6DCC 8024264C 00000000 */ nop +/* BA6DD0 80242650 8E820074 */ lw $v0, 0x74($s4) +/* BA6DD4 80242654 2442FFFF */ addiu $v0, $v0, -1 +/* BA6DD8 80242658 18400018 */ blez $v0, .L802426BC +/* BA6DDC 8024265C AE820074 */ sw $v0, 0x74($s4) +/* BA6DE0 80242660 C600000C */ lwc1 $f0, 0xc($s0) +/* BA6DE4 80242664 3C014334 */ lui $at, 0x4334 +/* BA6DE8 80242668 44816000 */ mtc1 $at, $f12 +/* BA6DEC 8024266C 0C00A6C9 */ jal clamp_angle +/* BA6DF0 80242670 460C0300 */ add.s $f12, $f0, $f12 +/* BA6DF4 80242674 240403E8 */ addiu $a0, $zero, 0x3e8 +/* BA6DF8 80242678 0C00A67F */ jal rand_int +/* BA6DFC 8024267C E600000C */ swc1 $f0, 0xc($s0) +/* BA6E00 80242680 3C032E8B */ lui $v1, 0x2e8b +/* BA6E04 80242684 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* BA6E08 80242688 00430018 */ mult $v0, $v1 +/* BA6E0C 8024268C 00021FC3 */ sra $v1, $v0, 0x1f +/* BA6E10 80242690 00004010 */ mfhi $t0 +/* BA6E14 80242694 00082043 */ sra $a0, $t0, 1 +/* BA6E18 80242698 00832023 */ subu $a0, $a0, $v1 +/* BA6E1C 8024269C 00041840 */ sll $v1, $a0, 1 +/* BA6E20 802426A0 00641821 */ addu $v1, $v1, $a0 +/* BA6E24 802426A4 00031880 */ sll $v1, $v1, 2 +/* BA6E28 802426A8 00641823 */ subu $v1, $v1, $a0 +/* BA6E2C 802426AC 00431023 */ subu $v0, $v0, $v1 +/* BA6E30 802426B0 24420005 */ addiu $v0, $v0, 5 +/* BA6E34 802426B4 080909B0 */ j .L802426C0 +/* BA6E38 802426B8 A602008E */ sh $v0, 0x8e($s0) +.L802426BC: +/* BA6E3C 802426BC AE800070 */ sw $zero, 0x70($s4) +.L802426C0: +/* BA6E40 802426C0 8FBF0044 */ lw $ra, 0x44($sp) +/* BA6E44 802426C4 8FB40040 */ lw $s4, 0x40($sp) +/* BA6E48 802426C8 8FB3003C */ lw $s3, 0x3c($sp) +/* BA6E4C 802426CC 8FB20038 */ lw $s2, 0x38($sp) +/* BA6E50 802426D0 8FB10034 */ lw $s1, 0x34($sp) +/* BA6E54 802426D4 8FB00030 */ lw $s0, 0x30($sp) +/* BA6E58 802426D8 03E00008 */ jr $ra +/* BA6E5C 802426DC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s index 440c2f8bc8..7793819346 100644 --- a/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s +++ b/asm/nonmatchings/world/area_mim/mim_06/BA4CF0/func_80242B04_BA7284.s @@ -95,17 +95,17 @@ glabel func_80242B04_BA7284 /* BA73E4 80242C64 00000000 */ nop /* BA73E8 80242C68 0260202D */ daddu $a0, $s3, $zero /* BA73EC 80242C6C 0280282D */ daddu $a1, $s4, $zero -/* BA73F0 80242C70 0C0907C5 */ jal func_80241F14 +/* BA73F0 80242C70 0C0907C5 */ jal func_80241F14_BA6694 /* BA73F4 80242C74 0200302D */ daddu $a2, $s0, $zero /* BA73F8 80242C78 0260202D */ daddu $a0, $s3, $zero /* BA73FC 80242C7C 0280282D */ daddu $a1, $s4, $zero -/* BA7400 80242C80 0C090851 */ jal func_80242144 +/* BA7400 80242C80 0C090851 */ jal func_80242144_BA68C4 /* BA7404 80242C84 0200302D */ daddu $a2, $s0, $zero /* BA7408 80242C88 08090B41 */ j .L80242D04 /* BA740C 80242C8C 0000102D */ daddu $v0, $zero, $zero /* BA7410 80242C90 0260202D */ daddu $a0, $s3, $zero /* BA7414 80242C94 0280282D */ daddu $a1, $s4, $zero -/* BA7418 80242C98 0C09091F */ jal func_8024247C +/* BA7418 80242C98 0C09091F */ jal func_8024247C_BA6BFC /* BA741C 80242C9C 0200302D */ daddu $a2, $s0, $zero /* BA7420 80242CA0 8E630070 */ lw $v1, 0x70($s3) /* BA7424 80242CA4 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80242B04_BA7284 /* BA742C 80242CAC 0000102D */ daddu $v0, $zero, $zero /* BA7430 80242CB0 0260202D */ daddu $a0, $s3, $zero /* BA7434 80242CB4 0280282D */ daddu $a1, $s4, $zero -/* BA7438 80242CB8 0C09094F */ jal func_8024253C +/* BA7438 80242CB8 0C09094F */ jal func_8024253C_BA6CBC /* BA743C 80242CBC 0200302D */ daddu $a2, $s0, $zero /* BA7440 80242CC0 08090B41 */ j .L80242D04 /* BA7444 80242CC4 0000102D */ daddu $v0, $zero, $zero /* BA7448 80242CC8 0260202D */ daddu $a0, $s3, $zero /* BA744C 80242CCC 0280282D */ daddu $a1, $s4, $zero -/* BA7450 80242CD0 0C0909B8 */ jal func_802426E0 +/* BA7450 80242CD0 0C0909B8 */ jal func_802426E0_BA6E60 /* BA7454 80242CD4 0200302D */ daddu $a2, $s0, $zero /* BA7458 80242CD8 0260202D */ daddu $a0, $s3, $zero /* BA745C 80242CDC 0280282D */ daddu $a1, $s4, $zero -/* BA7460 80242CE0 0C0909F0 */ jal func_802427C0 +/* BA7460 80242CE0 0C0909F0 */ jal func_802427C0_BA6F40 /* BA7464 80242CE4 0200302D */ daddu $a2, $s0, $zero /* BA7468 80242CE8 08090B41 */ j .L80242D04 /* BA746C 80242CEC 0000102D */ daddu $v0, $zero, $zero /* BA7470 80242CF0 0260202D */ daddu $a0, $s3, $zero /* BA7474 80242CF4 0280282D */ daddu $a1, $s4, $zero -/* BA7478 80242CF8 0C090AB0 */ jal func_80242AC0 +/* BA7478 80242CF8 0C090AB0 */ jal func_80242AC0_BA7240 /* BA747C 80242CFC 0200302D */ daddu $a2, $s0, $zero .L80242D00: /* BA7480 80242D00 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8.s deleted file mode 100644 index 025610b03f..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400D8 -/* BAA218 802400D8 3C058024 */ lui $a1, 0x8024 -/* BAA21C 802400DC 24A51680 */ addiu $a1, $a1, 0x1680 -/* BAA220 802400E0 8CA30000 */ lw $v1, ($a1) -/* BAA224 802400E4 24040002 */ addiu $a0, $zero, 2 -/* BAA228 802400E8 10640012 */ beq $v1, $a0, .L80240134 -/* BAA22C 802400EC 28620003 */ slti $v0, $v1, 3 -/* BAA230 802400F0 10400005 */ beqz $v0, .L80240108 -/* BAA234 802400F4 24020001 */ addiu $v0, $zero, 1 -/* BAA238 802400F8 1062000A */ beq $v1, $v0, .L80240124 -/* BAA23C 802400FC 3C02E300 */ lui $v0, 0xe300 -/* BAA240 80240100 08090071 */ j .L802401C4 -/* BAA244 80240104 34420A01 */ ori $v0, $v0, 0xa01 -.L80240108: -/* BAA248 80240108 24020003 */ addiu $v0, $zero, 3 -/* BAA24C 8024010C 10620019 */ beq $v1, $v0, .L80240174 -/* BAA250 80240110 24020004 */ addiu $v0, $zero, 4 -/* BAA254 80240114 10620021 */ beq $v1, $v0, .L8024019C -/* BAA258 80240118 3C02E300 */ lui $v0, 0xe300 -/* BAA25C 8024011C 08090071 */ j .L802401C4 -/* BAA260 80240120 34420A01 */ ori $v0, $v0, 0xa01 -.L80240124: -/* BAA264 80240124 3C018024 */ lui $at, 0x8024 -/* BAA268 80240128 AC201688 */ sw $zero, 0x1688($at) -/* BAA26C 8024012C 0809006F */ j .L802401BC -/* BAA270 80240130 ACA40000 */ sw $a0, ($a1) -.L80240134: -/* BAA274 80240134 3C038024 */ lui $v1, 0x8024 -/* BAA278 80240138 24631688 */ addiu $v1, $v1, 0x1688 -/* BAA27C 8024013C 8C620000 */ lw $v0, ($v1) -/* BAA280 80240140 2442000A */ addiu $v0, $v0, 0xa -/* BAA284 80240144 AC620000 */ sw $v0, ($v1) -/* BAA288 80240148 28420100 */ slti $v0, $v0, 0x100 -/* BAA28C 8024014C 1440001C */ bnez $v0, .L802401C0 -/* BAA290 80240150 3C02E300 */ lui $v0, 0xe300 -/* BAA294 80240154 240200FF */ addiu $v0, $zero, 0xff -/* BAA298 80240158 AC620000 */ sw $v0, ($v1) -/* BAA29C 8024015C 24020032 */ addiu $v0, $zero, 0x32 -/* BAA2A0 80240160 3C018024 */ lui $at, 0x8024 -/* BAA2A4 80240164 AC221684 */ sw $v0, 0x1684($at) -/* BAA2A8 80240168 24020003 */ addiu $v0, $zero, 3 -/* BAA2AC 8024016C 0809006F */ j .L802401BC -/* BAA2B0 80240170 ACA20000 */ sw $v0, ($a1) -.L80240174: -/* BAA2B4 80240174 3C038024 */ lui $v1, 0x8024 -/* BAA2B8 80240178 24631684 */ addiu $v1, $v1, 0x1684 -/* BAA2BC 8024017C 8C620000 */ lw $v0, ($v1) -/* BAA2C0 80240180 2442FFFF */ addiu $v0, $v0, -1 -/* BAA2C4 80240184 0441000D */ bgez $v0, .L802401BC -/* BAA2C8 80240188 AC620000 */ sw $v0, ($v1) -/* BAA2CC 8024018C 24020004 */ addiu $v0, $zero, 4 -/* BAA2D0 80240190 AC600000 */ sw $zero, ($v1) -/* BAA2D4 80240194 0809006F */ j .L802401BC -/* BAA2D8 80240198 ACA20000 */ sw $v0, ($a1) -.L8024019C: -/* BAA2DC 8024019C 3C038024 */ lui $v1, 0x8024 -/* BAA2E0 802401A0 24631688 */ addiu $v1, $v1, 0x1688 -/* BAA2E4 802401A4 8C620000 */ lw $v0, ($v1) -/* BAA2E8 802401A8 2442FFF9 */ addiu $v0, $v0, -7 -/* BAA2EC 802401AC 04410003 */ bgez $v0, .L802401BC -/* BAA2F0 802401B0 AC620000 */ sw $v0, ($v1) -/* BAA2F4 802401B4 AC600000 */ sw $zero, ($v1) -/* BAA2F8 802401B8 ACA00000 */ sw $zero, ($a1) -.L802401BC: -/* BAA2FC 802401BC 3C02E300 */ lui $v0, 0xe300 -.L802401C0: -/* BAA300 802401C0 34420A01 */ ori $v0, $v0, 0xa01 -.L802401C4: -/* BAA304 802401C4 3C06FC12 */ lui $a2, 0xfc12 -/* BAA308 802401C8 34C6160A */ ori $a2, $a2, 0x160a -/* BAA30C 802401CC 3C08E200 */ lui $t0, 0xe200 -/* BAA310 802401D0 3508001C */ ori $t0, $t0, 0x1c -/* BAA314 802401D4 3C07C810 */ lui $a3, 0xc810 -/* BAA318 802401D8 3C05800A */ lui $a1, 0x800a -/* BAA31C 802401DC 24A5A66C */ addiu $a1, $a1, -0x5994 -/* BAA320 802401E0 8CA30000 */ lw $v1, ($a1) -/* BAA324 802401E4 34E74DD8 */ ori $a3, $a3, 0x4dd8 -/* BAA328 802401E8 0060202D */ daddu $a0, $v1, $zero -/* BAA32C 802401EC 24630008 */ addiu $v1, $v1, 8 -/* BAA330 802401F0 ACA30000 */ sw $v1, ($a1) -/* BAA334 802401F4 AC820000 */ sw $v0, ($a0) -/* BAA338 802401F8 3C020010 */ lui $v0, 0x10 -/* BAA33C 802401FC AC820004 */ sw $v0, 4($a0) -/* BAA340 80240200 24620008 */ addiu $v0, $v1, 8 -/* BAA344 80240204 ACA20000 */ sw $v0, ($a1) -/* BAA348 80240208 3C048024 */ lui $a0, 0x8024 -/* BAA34C 8024020C 9084168B */ lbu $a0, 0x168b($a0) -/* BAA350 80240210 3C02FA00 */ lui $v0, 0xfa00 -/* BAA354 80240214 AC620000 */ sw $v0, ($v1) -/* BAA358 80240218 24620010 */ addiu $v0, $v1, 0x10 -/* BAA35C 8024021C AC640004 */ sw $a0, 4($v1) -/* BAA360 80240220 ACA20000 */ sw $v0, ($a1) -/* BAA364 80240224 2402FFF8 */ addiu $v0, $zero, -8 -/* BAA368 80240228 AC62000C */ sw $v0, 0xc($v1) -/* BAA36C 8024022C 24620018 */ addiu $v0, $v1, 0x18 -/* BAA370 80240230 AC660008 */ sw $a2, 8($v1) -/* BAA374 80240234 ACA20000 */ sw $v0, ($a1) -/* BAA378 80240238 AC680010 */ sw $t0, 0x10($v1) -/* BAA37C 8024023C 03E00008 */ jr $ra -/* BAA380 80240240 AC670014 */ sw $a3, 0x14($v1) 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 new file mode 100644 index 0000000000..c91ff99e04 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_802400D8_BAA218.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400D8_BAA218 +/* BAA218 802400D8 3C058024 */ lui $a1, 0x8024 +/* BAA21C 802400DC 24A51680 */ addiu $a1, $a1, 0x1680 +/* BAA220 802400E0 8CA30000 */ lw $v1, ($a1) +/* BAA224 802400E4 24040002 */ addiu $a0, $zero, 2 +/* BAA228 802400E8 10640012 */ beq $v1, $a0, .L80240134 +/* BAA22C 802400EC 28620003 */ slti $v0, $v1, 3 +/* BAA230 802400F0 10400005 */ beqz $v0, .L80240108 +/* BAA234 802400F4 24020001 */ addiu $v0, $zero, 1 +/* BAA238 802400F8 1062000A */ beq $v1, $v0, .L80240124 +/* BAA23C 802400FC 3C02E300 */ lui $v0, 0xe300 +/* BAA240 80240100 08090071 */ j .L802401C4 +/* BAA244 80240104 34420A01 */ ori $v0, $v0, 0xa01 +.L80240108: +/* BAA248 80240108 24020003 */ addiu $v0, $zero, 3 +/* BAA24C 8024010C 10620019 */ beq $v1, $v0, .L80240174 +/* BAA250 80240110 24020004 */ addiu $v0, $zero, 4 +/* BAA254 80240114 10620021 */ beq $v1, $v0, .L8024019C +/* BAA258 80240118 3C02E300 */ lui $v0, 0xe300 +/* BAA25C 8024011C 08090071 */ j .L802401C4 +/* BAA260 80240120 34420A01 */ ori $v0, $v0, 0xa01 +.L80240124: +/* BAA264 80240124 3C018024 */ lui $at, 0x8024 +/* BAA268 80240128 AC201688 */ sw $zero, 0x1688($at) +/* BAA26C 8024012C 0809006F */ j .L802401BC +/* BAA270 80240130 ACA40000 */ sw $a0, ($a1) +.L80240134: +/* BAA274 80240134 3C038024 */ lui $v1, 0x8024 +/* BAA278 80240138 24631688 */ addiu $v1, $v1, 0x1688 +/* BAA27C 8024013C 8C620000 */ lw $v0, ($v1) +/* BAA280 80240140 2442000A */ addiu $v0, $v0, 0xa +/* BAA284 80240144 AC620000 */ sw $v0, ($v1) +/* BAA288 80240148 28420100 */ slti $v0, $v0, 0x100 +/* BAA28C 8024014C 1440001C */ bnez $v0, .L802401C0 +/* BAA290 80240150 3C02E300 */ lui $v0, 0xe300 +/* BAA294 80240154 240200FF */ addiu $v0, $zero, 0xff +/* BAA298 80240158 AC620000 */ sw $v0, ($v1) +/* BAA29C 8024015C 24020032 */ addiu $v0, $zero, 0x32 +/* BAA2A0 80240160 3C018024 */ lui $at, 0x8024 +/* BAA2A4 80240164 AC221684 */ sw $v0, 0x1684($at) +/* BAA2A8 80240168 24020003 */ addiu $v0, $zero, 3 +/* BAA2AC 8024016C 0809006F */ j .L802401BC +/* BAA2B0 80240170 ACA20000 */ sw $v0, ($a1) +.L80240174: +/* BAA2B4 80240174 3C038024 */ lui $v1, 0x8024 +/* BAA2B8 80240178 24631684 */ addiu $v1, $v1, 0x1684 +/* BAA2BC 8024017C 8C620000 */ lw $v0, ($v1) +/* BAA2C0 80240180 2442FFFF */ addiu $v0, $v0, -1 +/* BAA2C4 80240184 0441000D */ bgez $v0, .L802401BC +/* BAA2C8 80240188 AC620000 */ sw $v0, ($v1) +/* BAA2CC 8024018C 24020004 */ addiu $v0, $zero, 4 +/* BAA2D0 80240190 AC600000 */ sw $zero, ($v1) +/* BAA2D4 80240194 0809006F */ j .L802401BC +/* BAA2D8 80240198 ACA20000 */ sw $v0, ($a1) +.L8024019C: +/* BAA2DC 8024019C 3C038024 */ lui $v1, 0x8024 +/* BAA2E0 802401A0 24631688 */ addiu $v1, $v1, 0x1688 +/* BAA2E4 802401A4 8C620000 */ lw $v0, ($v1) +/* BAA2E8 802401A8 2442FFF9 */ addiu $v0, $v0, -7 +/* BAA2EC 802401AC 04410003 */ bgez $v0, .L802401BC +/* BAA2F0 802401B0 AC620000 */ sw $v0, ($v1) +/* BAA2F4 802401B4 AC600000 */ sw $zero, ($v1) +/* BAA2F8 802401B8 ACA00000 */ sw $zero, ($a1) +.L802401BC: +/* BAA2FC 802401BC 3C02E300 */ lui $v0, 0xe300 +.L802401C0: +/* BAA300 802401C0 34420A01 */ ori $v0, $v0, 0xa01 +.L802401C4: +/* BAA304 802401C4 3C06FC12 */ lui $a2, 0xfc12 +/* BAA308 802401C8 34C6160A */ ori $a2, $a2, 0x160a +/* BAA30C 802401CC 3C08E200 */ lui $t0, 0xe200 +/* BAA310 802401D0 3508001C */ ori $t0, $t0, 0x1c +/* BAA314 802401D4 3C07C810 */ lui $a3, 0xc810 +/* BAA318 802401D8 3C05800A */ lui $a1, 0x800a +/* BAA31C 802401DC 24A5A66C */ addiu $a1, $a1, -0x5994 +/* BAA320 802401E0 8CA30000 */ lw $v1, ($a1) +/* BAA324 802401E4 34E74DD8 */ ori $a3, $a3, 0x4dd8 +/* BAA328 802401E8 0060202D */ daddu $a0, $v1, $zero +/* BAA32C 802401EC 24630008 */ addiu $v1, $v1, 8 +/* BAA330 802401F0 ACA30000 */ sw $v1, ($a1) +/* BAA334 802401F4 AC820000 */ sw $v0, ($a0) +/* BAA338 802401F8 3C020010 */ lui $v0, 0x10 +/* BAA33C 802401FC AC820004 */ sw $v0, 4($a0) +/* BAA340 80240200 24620008 */ addiu $v0, $v1, 8 +/* BAA344 80240204 ACA20000 */ sw $v0, ($a1) +/* BAA348 80240208 3C048024 */ lui $a0, 0x8024 +/* BAA34C 8024020C 9084168B */ lbu $a0, 0x168b($a0) +/* BAA350 80240210 3C02FA00 */ lui $v0, 0xfa00 +/* BAA354 80240214 AC620000 */ sw $v0, ($v1) +/* BAA358 80240218 24620010 */ addiu $v0, $v1, 0x10 +/* BAA35C 8024021C AC640004 */ sw $a0, 4($v1) +/* BAA360 80240220 ACA20000 */ sw $v0, ($a1) +/* BAA364 80240224 2402FFF8 */ addiu $v0, $zero, -8 +/* BAA368 80240228 AC62000C */ sw $v0, 0xc($v1) +/* BAA36C 8024022C 24620018 */ addiu $v0, $v1, 0x18 +/* BAA370 80240230 AC660008 */ sw $a2, 8($v1) +/* BAA374 80240234 ACA20000 */ sw $v0, ($a1) +/* BAA378 80240238 AC680010 */ sw $t0, 0x10($v1) +/* BAA37C 8024023C 03E00008 */ jr $ra +/* BAA380 80240240 AC670014 */ sw $a3, 0x14($v1) diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244.s deleted file mode 100644 index 92b1c6f74a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240244 -/* BAA384 80240244 3C038024 */ lui $v1, 0x8024 -/* BAA388 80240248 24631680 */ addiu $v1, $v1, 0x1680 -/* BAA38C 8024024C 8C620000 */ lw $v0, ($v1) -/* BAA390 80240250 14400003 */ bnez $v0, .L80240260 -/* BAA394 80240254 24020001 */ addiu $v0, $zero, 1 -/* BAA398 80240258 AC620000 */ sw $v0, ($v1) -/* BAA39C 8024025C AC820084 */ sw $v0, 0x84($a0) -.L80240260: -/* BAA3A0 80240260 03E00008 */ jr $ra -/* BAA3A4 80240264 24020002 */ addiu $v0, $zero, 2 -/* BAA3A8 80240268 00000000 */ nop -/* BAA3AC 8024026C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s new file mode 100644 index 0000000000..a784ef51c9 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA1B0/func_80240244_BAA384.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240244_BAA384 +/* BAA384 80240244 3C038024 */ lui $v1, 0x8024 +/* BAA388 80240248 24631680 */ addiu $v1, $v1, 0x1680 +/* BAA38C 8024024C 8C620000 */ lw $v0, ($v1) +/* BAA390 80240250 14400003 */ bnez $v0, .L80240260 +/* BAA394 80240254 24020001 */ addiu $v0, $zero, 1 +/* BAA398 80240258 AC620000 */ sw $v0, ($v1) +/* BAA39C 8024025C AC820084 */ sw $v0, 0x84($a0) +.L80240260: +/* BAA3A0 80240260 03E00008 */ jr $ra +/* BAA3A4 80240264 24020002 */ addiu $v0, $zero, 2 +/* BAA3A8 80240268 00000000 */ nop +/* BAA3AC 8024026C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s index e6458117a0..3f653198a8 100644 --- a/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s +++ b/asm/nonmatchings/world/area_mim/mim_07/BAA3B0/func_80240E60_BAAFA0.s @@ -95,17 +95,17 @@ glabel func_80240E60_BAAFA0 /* BAB100 80240FC0 00000000 */ nop /* BAB104 80240FC4 0260202D */ daddu $a0, $s3, $zero /* BAB108 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* BAB10C 80240FCC 0C09009C */ jal func_80240270 +/* BAB10C 80240FCC 0C09009C */ jal func_80240270_BAA3B0 /* BAB110 80240FD0 0200302D */ daddu $a2, $s0, $zero /* BAB114 80240FD4 0260202D */ daddu $a0, $s3, $zero /* BAB118 80240FD8 0280282D */ daddu $a1, $s4, $zero -/* BAB11C 80240FDC 0C090128 */ jal func_802404A0 +/* BAB11C 80240FDC 0C090128 */ jal func_802404A0_BAA5E0 /* BAB120 80240FE0 0200302D */ daddu $a2, $s0, $zero /* BAB124 80240FE4 08090418 */ j .L80241060 /* BAB128 80240FE8 0000102D */ daddu $v0, $zero, $zero /* BAB12C 80240FEC 0260202D */ daddu $a0, $s3, $zero /* BAB130 80240FF0 0280282D */ daddu $a1, $s4, $zero -/* BAB134 80240FF4 0C0901F6 */ jal func_802407D8 +/* BAB134 80240FF4 0C0901F6 */ jal func_802407D8_BAA918 /* BAB138 80240FF8 0200302D */ daddu $a2, $s0, $zero /* BAB13C 80240FFC 8E630070 */ lw $v1, 0x70($s3) /* BAB140 80241000 24020003 */ addiu $v0, $zero, 3 @@ -113,17 +113,17 @@ glabel func_80240E60_BAAFA0 /* BAB148 80241008 0000102D */ daddu $v0, $zero, $zero /* BAB14C 8024100C 0260202D */ daddu $a0, $s3, $zero /* BAB150 80241010 0280282D */ daddu $a1, $s4, $zero -/* BAB154 80241014 0C090226 */ jal func_80240898 +/* BAB154 80241014 0C090226 */ jal func_80240898_BAA9D8 /* BAB158 80241018 0200302D */ daddu $a2, $s0, $zero /* BAB15C 8024101C 08090418 */ j .L80241060 /* BAB160 80241020 0000102D */ daddu $v0, $zero, $zero /* BAB164 80241024 0260202D */ daddu $a0, $s3, $zero /* BAB168 80241028 0280282D */ daddu $a1, $s4, $zero -/* BAB16C 8024102C 0C09028F */ jal func_80240A3C +/* BAB16C 8024102C 0C09028F */ jal func_80240A3C_BAAB7C /* BAB170 80241030 0200302D */ daddu $a2, $s0, $zero /* BAB174 80241034 0260202D */ daddu $a0, $s3, $zero /* BAB178 80241038 0280282D */ daddu $a1, $s4, $zero -/* BAB17C 8024103C 0C0902C7 */ jal func_80240B1C +/* BAB17C 8024103C 0C0902C7 */ jal func_80240B1C_BAAC5C /* BAB180 80241040 0200302D */ daddu $a2, $s0, $zero /* BAB184 80241044 08090418 */ j .L80241060 /* BAB188 80241048 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C.s deleted file mode 100644 index 46bf442749..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C7C -/* BAE5BC 80240C7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAE5C0 80240C80 AFB20018 */ sw $s2, 0x18($sp) -/* BAE5C4 80240C84 0080902D */ daddu $s2, $a0, $zero -/* BAE5C8 80240C88 AFBF001C */ sw $ra, 0x1c($sp) -/* BAE5CC 80240C8C AFB10014 */ sw $s1, 0x14($sp) -/* BAE5D0 80240C90 AFB00010 */ sw $s0, 0x10($sp) -/* BAE5D4 80240C94 8E510148 */ lw $s1, 0x148($s2) -/* BAE5D8 80240C98 0C00EABB */ jal get_npc_unsafe -/* BAE5DC 80240C9C 86240008 */ lh $a0, 8($s1) -/* BAE5E0 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* BAE5E4 80240CA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAE5E8 80240CA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAE5EC 80240CAC C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAE5F0 80240CB0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAE5F4 80240CB4 A600008E */ sh $zero, 0x8e($s0) -/* BAE5F8 80240CB8 8C460028 */ lw $a2, 0x28($v0) -/* BAE5FC 80240CBC 0C00A720 */ jal atan2 -/* BAE600 80240CC0 8C470030 */ lw $a3, 0x30($v0) -/* BAE604 80240CC4 E600000C */ swc1 $f0, 0xc($s0) -/* BAE608 80240CC8 8E2200CC */ lw $v0, 0xcc($s1) -/* BAE60C 80240CCC 8C420020 */ lw $v0, 0x20($v0) -/* BAE610 80240CD0 AE020028 */ sw $v0, 0x28($s0) -/* BAE614 80240CD4 2402000B */ addiu $v0, $zero, 0xb -/* BAE618 80240CD8 AE420070 */ sw $v0, 0x70($s2) -/* BAE61C 80240CDC 8FBF001C */ lw $ra, 0x1c($sp) -/* BAE620 80240CE0 8FB20018 */ lw $s2, 0x18($sp) -/* BAE624 80240CE4 8FB10014 */ lw $s1, 0x14($sp) -/* BAE628 80240CE8 8FB00010 */ lw $s0, 0x10($sp) -/* BAE62C 80240CEC 03E00008 */ jr $ra -/* BAE630 80240CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C_BAE5BC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C_BAE5BC.s new file mode 100644 index 0000000000..8ff53bec75 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240C7C_BAE5BC.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C7C_BAE5BC +/* BAE5BC 80240C7C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BAE5C0 80240C80 AFB20018 */ sw $s2, 0x18($sp) +/* BAE5C4 80240C84 0080902D */ daddu $s2, $a0, $zero +/* BAE5C8 80240C88 AFBF001C */ sw $ra, 0x1c($sp) +/* BAE5CC 80240C8C AFB10014 */ sw $s1, 0x14($sp) +/* BAE5D0 80240C90 AFB00010 */ sw $s0, 0x10($sp) +/* BAE5D4 80240C94 8E510148 */ lw $s1, 0x148($s2) +/* BAE5D8 80240C98 0C00EABB */ jal get_npc_unsafe +/* BAE5DC 80240C9C 86240008 */ lh $a0, 8($s1) +/* BAE5E0 80240CA0 0040802D */ daddu $s0, $v0, $zero +/* BAE5E4 80240CA4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BAE5E8 80240CA8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BAE5EC 80240CAC C60C0038 */ lwc1 $f12, 0x38($s0) +/* BAE5F0 80240CB0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BAE5F4 80240CB4 A600008E */ sh $zero, 0x8e($s0) +/* BAE5F8 80240CB8 8C460028 */ lw $a2, 0x28($v0) +/* BAE5FC 80240CBC 0C00A720 */ jal atan2 +/* BAE600 80240CC0 8C470030 */ lw $a3, 0x30($v0) +/* BAE604 80240CC4 E600000C */ swc1 $f0, 0xc($s0) +/* BAE608 80240CC8 8E2200CC */ lw $v0, 0xcc($s1) +/* BAE60C 80240CCC 8C420020 */ lw $v0, 0x20($v0) +/* BAE610 80240CD0 AE020028 */ sw $v0, 0x28($s0) +/* BAE614 80240CD4 2402000B */ addiu $v0, $zero, 0xb +/* BAE618 80240CD8 AE420070 */ sw $v0, 0x70($s2) +/* BAE61C 80240CDC 8FBF001C */ lw $ra, 0x1c($sp) +/* BAE620 80240CE0 8FB20018 */ lw $s2, 0x18($sp) +/* BAE624 80240CE4 8FB10014 */ lw $s1, 0x14($sp) +/* BAE628 80240CE8 8FB00010 */ lw $s0, 0x10($sp) +/* BAE62C 80240CEC 03E00008 */ jr $ra +/* BAE630 80240CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8.s deleted file mode 100644 index c92f13bfcd..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EF8 -/* BAE838 80240EF8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BAE83C 80240EFC AFB20030 */ sw $s2, 0x30($sp) -/* BAE840 80240F00 0080902D */ daddu $s2, $a0, $zero -/* BAE844 80240F04 AFBF0038 */ sw $ra, 0x38($sp) -/* BAE848 80240F08 AFB30034 */ sw $s3, 0x34($sp) -/* BAE84C 80240F0C AFB1002C */ sw $s1, 0x2c($sp) -/* BAE850 80240F10 AFB00028 */ sw $s0, 0x28($sp) -/* BAE854 80240F14 F7B60048 */ sdc1 $f22, 0x48($sp) -/* BAE858 80240F18 F7B40040 */ sdc1 $f20, 0x40($sp) -/* BAE85C 80240F1C 8E510148 */ lw $s1, 0x148($s2) -/* BAE860 80240F20 86240008 */ lh $a0, 8($s1) -/* BAE864 80240F24 0C00EABB */ jal get_npc_unsafe -/* BAE868 80240F28 00A0982D */ daddu $s3, $a1, $zero -/* BAE86C 80240F2C 0040802D */ daddu $s0, $v0, $zero -/* BAE870 80240F30 0200202D */ daddu $a0, $s0, $zero -/* BAE874 80240F34 C6220088 */ lwc1 $f2, 0x88($s1) -/* BAE878 80240F38 468010A0 */ cvt.s.w $f2, $f2 -/* BAE87C 80240F3C 460010A1 */ cvt.d.s $f2, $f2 -/* BAE880 80240F40 C604001C */ lwc1 $f4, 0x1c($s0) -/* BAE884 80240F44 C6000014 */ lwc1 $f0, 0x14($s0) -/* BAE888 80240F48 8E050018 */ lw $a1, 0x18($s0) -/* BAE88C 80240F4C 46002100 */ add.s $f4, $f4, $f0 -/* BAE890 80240F50 8E06000C */ lw $a2, 0xc($s0) -/* BAE894 80240F54 C6200078 */ lwc1 $f0, 0x78($s1) -/* BAE898 80240F58 46800020 */ cvt.s.w $f0, $f0 -/* BAE89C 80240F5C E604001C */ swc1 $f4, 0x1c($s0) -/* BAE8A0 80240F60 3C014059 */ lui $at, 0x4059 -/* BAE8A4 80240F64 44812800 */ mtc1 $at, $f5 -/* BAE8A8 80240F68 44802000 */ mtc1 $zero, $f4 -/* BAE8AC 80240F6C 46000021 */ cvt.d.s $f0, $f0 -/* BAE8B0 80240F70 46240003 */ div.d $f0, $f0, $f4 -/* BAE8B4 80240F74 46200520 */ cvt.s.d $f20, $f0 -/* BAE8B8 80240F78 46241083 */ div.d $f2, $f2, $f4 -/* BAE8BC 80240F7C 0C00EA95 */ jal npc_move_heading -/* BAE8C0 80240F80 462015A0 */ cvt.s.d $f22, $f2 -/* BAE8C4 80240F84 C604001C */ lwc1 $f4, 0x1c($s0) -/* BAE8C8 80240F88 44801000 */ mtc1 $zero, $f2 -/* BAE8CC 80240F8C 44801800 */ mtc1 $zero, $f3 -/* BAE8D0 80240F90 46002021 */ cvt.d.s $f0, $f4 -/* BAE8D4 80240F94 4620103E */ c.le.d $f2, $f0 -/* BAE8D8 80240F98 00000000 */ nop -/* BAE8DC 80240F9C 45000030 */ bc1f .L80241060 -/* BAE8E0 80240FA0 00000000 */ nop -/* BAE8E4 80240FA4 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAE8E8 80240FA8 46040000 */ add.s $f0, $f0, $f4 -/* BAE8EC 80240FAC E600003C */ swc1 $f0, 0x3c($s0) -/* BAE8F0 80240FB0 8E2200CC */ lw $v0, 0xcc($s1) -/* BAE8F4 80240FB4 8C420024 */ lw $v0, 0x24($v0) -/* BAE8F8 80240FB8 AE020028 */ sw $v0, 0x28($s0) -/* BAE8FC 80240FBC A2200007 */ sb $zero, 7($s1) -/* BAE900 80240FC0 8E020000 */ lw $v0, ($s0) -/* BAE904 80240FC4 30420008 */ andi $v0, $v0, 8 -/* BAE908 80240FC8 14400011 */ bnez $v0, .L80241010 -/* BAE90C 80240FCC 0000102D */ daddu $v0, $zero, $zero -/* BAE910 80240FD0 27A50018 */ addiu $a1, $sp, 0x18 -/* BAE914 80240FD4 27A6001C */ addiu $a2, $sp, 0x1c -/* BAE918 80240FD8 C6000038 */ lwc1 $f0, 0x38($s0) -/* BAE91C 80240FDC C602003C */ lwc1 $f2, 0x3c($s0) -/* BAE920 80240FE0 C6040040 */ lwc1 $f4, 0x40($s0) -/* BAE924 80240FE4 3C01447A */ lui $at, 0x447a -/* BAE928 80240FE8 44813000 */ mtc1 $at, $f6 -/* BAE92C 80240FEC 27A20024 */ addiu $v0, $sp, 0x24 -/* BAE930 80240FF0 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAE934 80240FF4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BAE938 80240FF8 E7A40020 */ swc1 $f4, 0x20($sp) -/* BAE93C 80240FFC E7A60024 */ swc1 $f6, 0x24($sp) -/* BAE940 80241000 AFA20010 */ sw $v0, 0x10($sp) -/* BAE944 80241004 8E040080 */ lw $a0, 0x80($s0) -/* BAE948 80241008 0C0372DF */ jal func_800DCB7C -/* BAE94C 8024100C 27A70020 */ addiu $a3, $sp, 0x20 -.L80241010: -/* BAE950 80241010 1040000B */ beqz $v0, .L80241040 -/* BAE954 80241014 00000000 */ nop -/* BAE958 80241018 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BAE95C 8024101C 46140080 */ add.s $f2, $f0, $f20 -/* BAE960 80241020 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAE964 80241024 4600103E */ c.le.s $f2, $f0 -/* BAE968 80241028 00000000 */ nop -/* BAE96C 8024102C 4500008D */ bc1f .L80241264 -/* BAE970 80241030 00000000 */ nop -/* BAE974 80241034 E602003C */ swc1 $f2, 0x3c($s0) -/* BAE978 80241038 08090499 */ j .L80241264 -/* BAE97C 8024103C AE400070 */ sw $zero, 0x70($s2) -.L80241040: -/* BAE980 80241040 C602003C */ lwc1 $f2, 0x3c($s0) -/* BAE984 80241044 C6000064 */ lwc1 $f0, 0x64($s0) -/* BAE988 80241048 4602003E */ c.le.s $f0, $f2 -/* BAE98C 8024104C 00000000 */ nop -/* BAE990 80241050 45030084 */ bc1tl .L80241264 -/* BAE994 80241054 AE400070 */ sw $zero, 0x70($s2) -/* BAE998 80241058 08090499 */ j .L80241264 -/* BAE99C 8024105C 00000000 */ nop -.L80241060: -/* BAE9A0 80241060 4622003C */ c.lt.d $f0, $f2 -/* BAE9A4 80241064 00000000 */ nop -/* BAE9A8 80241068 4500007E */ bc1f .L80241264 -/* BAE9AC 8024106C 00000000 */ nop -/* BAE9B0 80241070 9602008E */ lhu $v0, 0x8e($s0) -/* BAE9B4 80241074 24420001 */ addiu $v0, $v0, 1 -/* BAE9B8 80241078 A602008E */ sh $v0, 0x8e($s0) -/* BAE9BC 8024107C 00021400 */ sll $v0, $v0, 0x10 -/* BAE9C0 80241080 8E630020 */ lw $v1, 0x20($s3) -/* BAE9C4 80241084 00021403 */ sra $v0, $v0, 0x10 -/* BAE9C8 80241088 0043102A */ slt $v0, $v0, $v1 -/* BAE9CC 8024108C 14400026 */ bnez $v0, .L80241128 -/* BAE9D0 80241090 00000000 */ nop -/* BAE9D4 80241094 C60C0038 */ lwc1 $f12, 0x38($s0) -/* BAE9D8 80241098 C60E0040 */ lwc1 $f14, 0x40($s0) -/* BAE9DC 8024109C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* BAE9E0 802410A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* BAE9E4 802410A4 A600008E */ sh $zero, 0x8e($s0) -/* BAE9E8 802410A8 8C460028 */ lw $a2, 0x28($v0) -/* BAE9EC 802410AC 0C00A720 */ jal atan2 -/* BAE9F0 802410B0 8C470030 */ lw $a3, 0x30($v0) -/* BAE9F4 802410B4 46000506 */ mov.s $f20, $f0 -/* BAE9F8 802410B8 C60C000C */ lwc1 $f12, 0xc($s0) -/* BAE9FC 802410BC 0C00A70A */ jal get_clamped_angle_diff -/* BAEA00 802410C0 4600A386 */ mov.s $f14, $f20 -/* BAEA04 802410C4 46000086 */ mov.s $f2, $f0 -/* BAEA08 802410C8 8E62001C */ lw $v0, 0x1c($s3) -/* BAEA0C 802410CC 46001005 */ abs.s $f0, $f2 -/* BAEA10 802410D0 44822000 */ mtc1 $v0, $f4 -/* BAEA14 802410D4 00000000 */ nop -/* BAEA18 802410D8 46802120 */ cvt.s.w $f4, $f4 -/* BAEA1C 802410DC 4600203C */ c.lt.s $f4, $f0 -/* BAEA20 802410E0 00000000 */ nop -/* BAEA24 802410E4 4500000D */ bc1f .L8024111C -/* BAEA28 802410E8 00000000 */ nop -/* BAEA2C 802410EC 44800000 */ mtc1 $zero, $f0 -/* BAEA30 802410F0 C614000C */ lwc1 $f20, 0xc($s0) -/* BAEA34 802410F4 4600103C */ c.lt.s $f2, $f0 -/* BAEA38 802410F8 00000000 */ nop -/* BAEA3C 802410FC 45000006 */ bc1f .L80241118 -/* BAEA40 80241100 00021023 */ negu $v0, $v0 -/* BAEA44 80241104 44820000 */ mtc1 $v0, $f0 -/* BAEA48 80241108 00000000 */ nop -/* BAEA4C 8024110C 46800020 */ cvt.s.w $f0, $f0 -/* BAEA50 80241110 08090447 */ j .L8024111C -/* BAEA54 80241114 4600A500 */ add.s $f20, $f20, $f0 -.L80241118: -/* BAEA58 80241118 4604A500 */ add.s $f20, $f20, $f4 -.L8024111C: -/* BAEA5C 8024111C 0C00A6C9 */ jal clamp_angle -/* BAEA60 80241120 4600A306 */ mov.s $f12, $f20 -/* BAEA64 80241124 E600000C */ swc1 $f0, 0xc($s0) -.L80241128: -/* BAEA68 80241128 8E020000 */ lw $v0, ($s0) -/* BAEA6C 8024112C 30420008 */ andi $v0, $v0, 8 -/* BAEA70 80241130 1040000A */ beqz $v0, .L8024115C -/* BAEA74 80241134 27A50018 */ addiu $a1, $sp, 0x18 -/* BAEA78 80241138 C602003C */ lwc1 $f2, 0x3c($s0) -/* BAEA7C 8024113C C600001C */ lwc1 $f0, 0x1c($s0) -/* BAEA80 80241140 46001080 */ add.s $f2, $f2, $f0 -/* BAEA84 80241144 4616103C */ c.lt.s $f2, $f22 -/* BAEA88 80241148 00000000 */ nop -/* BAEA8C 8024114C 45020045 */ bc1fl .L80241264 -/* BAEA90 80241150 E602003C */ swc1 $f2, 0x3c($s0) -/* BAEA94 80241154 08090498 */ j .L80241260 -/* BAEA98 80241158 E616003C */ swc1 $f22, 0x3c($s0) -.L8024115C: -/* BAEA9C 8024115C C6000038 */ lwc1 $f0, 0x38($s0) -/* BAEAA0 80241160 27A6001C */ addiu $a2, $sp, 0x1c -/* BAEAA4 80241164 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAEAA8 80241168 860200A8 */ lh $v0, 0xa8($s0) -/* BAEAAC 8024116C C600001C */ lwc1 $f0, 0x1c($s0) -/* BAEAB0 80241170 C604003C */ lwc1 $f4, 0x3c($s0) -/* BAEAB4 80241174 44821000 */ mtc1 $v0, $f2 -/* BAEAB8 80241178 00000000 */ nop -/* BAEABC 8024117C 468010A0 */ cvt.s.w $f2, $f2 -/* BAEAC0 80241180 46000005 */ abs.s $f0, $f0 -/* BAEAC4 80241184 46020000 */ add.s $f0, $f0, $f2 -/* BAEAC8 80241188 C6060040 */ lwc1 $f6, 0x40($s0) -/* BAEACC 8024118C 27A20024 */ addiu $v0, $sp, 0x24 -/* BAEAD0 80241190 46022100 */ add.s $f4, $f4, $f2 -/* BAEAD4 80241194 3C014024 */ lui $at, 0x4024 -/* BAEAD8 80241198 44811800 */ mtc1 $at, $f3 -/* BAEADC 8024119C 44801000 */ mtc1 $zero, $f2 -/* BAEAE0 802411A0 46000021 */ cvt.d.s $f0, $f0 -/* BAEAE4 802411A4 46220000 */ add.d $f0, $f0, $f2 -/* BAEAE8 802411A8 E7A60020 */ swc1 $f6, 0x20($sp) -/* BAEAEC 802411AC E7A4001C */ swc1 $f4, 0x1c($sp) -/* BAEAF0 802411B0 46200020 */ cvt.s.d $f0, $f0 -/* BAEAF4 802411B4 E7A00024 */ swc1 $f0, 0x24($sp) -/* BAEAF8 802411B8 AFA20010 */ sw $v0, 0x10($sp) -/* BAEAFC 802411BC 8E040080 */ lw $a0, 0x80($s0) -/* BAEB00 802411C0 0C0372DF */ jal func_800DCB7C -/* BAEB04 802411C4 27A70020 */ addiu $a3, $sp, 0x20 -/* BAEB08 802411C8 10400015 */ beqz $v0, .L80241220 -/* BAEB0C 802411CC 00000000 */ nop -/* BAEB10 802411D0 860200A8 */ lh $v0, 0xa8($s0) -/* BAEB14 802411D4 C604001C */ lwc1 $f4, 0x1c($s0) -/* BAEB18 802411D8 44820000 */ mtc1 $v0, $f0 -/* BAEB1C 802411DC 00000000 */ nop -/* BAEB20 802411E0 46800020 */ cvt.s.w $f0, $f0 -/* BAEB24 802411E4 46002085 */ abs.s $f2, $f4 -/* BAEB28 802411E8 46020000 */ add.s $f0, $f0, $f2 -/* BAEB2C 802411EC C7A20024 */ lwc1 $f2, 0x24($sp) -/* BAEB30 802411F0 4600103E */ c.le.s $f2, $f0 -/* BAEB34 802411F4 00000000 */ nop -/* BAEB38 802411F8 45000005 */ bc1f .L80241210 -/* BAEB3C 802411FC 00000000 */ nop -/* BAEB40 80241200 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BAEB44 80241204 AE00001C */ sw $zero, 0x1c($s0) -/* BAEB48 80241208 08090499 */ j .L80241264 -/* BAEB4C 8024120C E600003C */ swc1 $f0, 0x3c($s0) -.L80241210: -/* BAEB50 80241210 C600003C */ lwc1 $f0, 0x3c($s0) -/* BAEB54 80241214 46040000 */ add.s $f0, $f0, $f4 -/* BAEB58 80241218 08090499 */ j .L80241264 -/* BAEB5C 8024121C E600003C */ swc1 $f0, 0x3c($s0) -.L80241220: -/* BAEB60 80241220 C606003C */ lwc1 $f6, 0x3c($s0) -/* BAEB64 80241224 860200A8 */ lh $v0, 0xa8($s0) -/* BAEB68 80241228 46163081 */ sub.s $f2, $f6, $f22 -/* BAEB6C 8024122C 44820000 */ mtc1 $v0, $f0 -/* BAEB70 80241230 00000000 */ nop -/* BAEB74 80241234 46800020 */ cvt.s.w $f0, $f0 -/* BAEB78 80241238 46001080 */ add.s $f2, $f2, $f0 -/* BAEB7C 8024123C C604001C */ lwc1 $f4, 0x1c($s0) -/* BAEB80 80241240 46002005 */ abs.s $f0, $f4 -/* BAEB84 80241244 4602003C */ c.lt.s $f0, $f2 -/* BAEB88 80241248 00000000 */ nop -/* BAEB8C 8024124C 45020005 */ bc1fl .L80241264 -/* BAEB90 80241250 AE00001C */ sw $zero, 0x1c($s0) -/* BAEB94 80241254 46043000 */ add.s $f0, $f6, $f4 -/* BAEB98 80241258 08090499 */ j .L80241264 -/* BAEB9C 8024125C E600003C */ swc1 $f0, 0x3c($s0) -.L80241260: -/* BAEBA0 80241260 AE00001C */ sw $zero, 0x1c($s0) -.L80241264: -/* BAEBA4 80241264 8FBF0038 */ lw $ra, 0x38($sp) -/* BAEBA8 80241268 8FB30034 */ lw $s3, 0x34($sp) -/* BAEBAC 8024126C 8FB20030 */ lw $s2, 0x30($sp) -/* BAEBB0 80241270 8FB1002C */ lw $s1, 0x2c($sp) -/* BAEBB4 80241274 8FB00028 */ lw $s0, 0x28($sp) -/* BAEBB8 80241278 D7B60048 */ ldc1 $f22, 0x48($sp) -/* BAEBBC 8024127C D7B40040 */ ldc1 $f20, 0x40($sp) -/* BAEBC0 80241280 03E00008 */ jr $ra -/* BAEBC4 80241284 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s new file mode 100644 index 0000000000..4fd0119992 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80240EF8_BAE838.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EF8_BAE838 +/* BAE838 80240EF8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BAE83C 80240EFC AFB20030 */ sw $s2, 0x30($sp) +/* BAE840 80240F00 0080902D */ daddu $s2, $a0, $zero +/* BAE844 80240F04 AFBF0038 */ sw $ra, 0x38($sp) +/* BAE848 80240F08 AFB30034 */ sw $s3, 0x34($sp) +/* BAE84C 80240F0C AFB1002C */ sw $s1, 0x2c($sp) +/* BAE850 80240F10 AFB00028 */ sw $s0, 0x28($sp) +/* BAE854 80240F14 F7B60048 */ sdc1 $f22, 0x48($sp) +/* BAE858 80240F18 F7B40040 */ sdc1 $f20, 0x40($sp) +/* BAE85C 80240F1C 8E510148 */ lw $s1, 0x148($s2) +/* BAE860 80240F20 86240008 */ lh $a0, 8($s1) +/* BAE864 80240F24 0C00EABB */ jal get_npc_unsafe +/* BAE868 80240F28 00A0982D */ daddu $s3, $a1, $zero +/* BAE86C 80240F2C 0040802D */ daddu $s0, $v0, $zero +/* BAE870 80240F30 0200202D */ daddu $a0, $s0, $zero +/* BAE874 80240F34 C6220088 */ lwc1 $f2, 0x88($s1) +/* BAE878 80240F38 468010A0 */ cvt.s.w $f2, $f2 +/* BAE87C 80240F3C 460010A1 */ cvt.d.s $f2, $f2 +/* BAE880 80240F40 C604001C */ lwc1 $f4, 0x1c($s0) +/* BAE884 80240F44 C6000014 */ lwc1 $f0, 0x14($s0) +/* BAE888 80240F48 8E050018 */ lw $a1, 0x18($s0) +/* BAE88C 80240F4C 46002100 */ add.s $f4, $f4, $f0 +/* BAE890 80240F50 8E06000C */ lw $a2, 0xc($s0) +/* BAE894 80240F54 C6200078 */ lwc1 $f0, 0x78($s1) +/* BAE898 80240F58 46800020 */ cvt.s.w $f0, $f0 +/* BAE89C 80240F5C E604001C */ swc1 $f4, 0x1c($s0) +/* BAE8A0 80240F60 3C014059 */ lui $at, 0x4059 +/* BAE8A4 80240F64 44812800 */ mtc1 $at, $f5 +/* BAE8A8 80240F68 44802000 */ mtc1 $zero, $f4 +/* BAE8AC 80240F6C 46000021 */ cvt.d.s $f0, $f0 +/* BAE8B0 80240F70 46240003 */ div.d $f0, $f0, $f4 +/* BAE8B4 80240F74 46200520 */ cvt.s.d $f20, $f0 +/* BAE8B8 80240F78 46241083 */ div.d $f2, $f2, $f4 +/* BAE8BC 80240F7C 0C00EA95 */ jal npc_move_heading +/* BAE8C0 80240F80 462015A0 */ cvt.s.d $f22, $f2 +/* BAE8C4 80240F84 C604001C */ lwc1 $f4, 0x1c($s0) +/* BAE8C8 80240F88 44801000 */ mtc1 $zero, $f2 +/* BAE8CC 80240F8C 44801800 */ mtc1 $zero, $f3 +/* BAE8D0 80240F90 46002021 */ cvt.d.s $f0, $f4 +/* BAE8D4 80240F94 4620103E */ c.le.d $f2, $f0 +/* BAE8D8 80240F98 00000000 */ nop +/* BAE8DC 80240F9C 45000030 */ bc1f .L80241060 +/* BAE8E0 80240FA0 00000000 */ nop +/* BAE8E4 80240FA4 C600003C */ lwc1 $f0, 0x3c($s0) +/* BAE8E8 80240FA8 46040000 */ add.s $f0, $f0, $f4 +/* BAE8EC 80240FAC E600003C */ swc1 $f0, 0x3c($s0) +/* BAE8F0 80240FB0 8E2200CC */ lw $v0, 0xcc($s1) +/* BAE8F4 80240FB4 8C420024 */ lw $v0, 0x24($v0) +/* BAE8F8 80240FB8 AE020028 */ sw $v0, 0x28($s0) +/* BAE8FC 80240FBC A2200007 */ sb $zero, 7($s1) +/* BAE900 80240FC0 8E020000 */ lw $v0, ($s0) +/* BAE904 80240FC4 30420008 */ andi $v0, $v0, 8 +/* BAE908 80240FC8 14400011 */ bnez $v0, .L80241010 +/* BAE90C 80240FCC 0000102D */ daddu $v0, $zero, $zero +/* BAE910 80240FD0 27A50018 */ addiu $a1, $sp, 0x18 +/* BAE914 80240FD4 27A6001C */ addiu $a2, $sp, 0x1c +/* BAE918 80240FD8 C6000038 */ lwc1 $f0, 0x38($s0) +/* BAE91C 80240FDC C602003C */ lwc1 $f2, 0x3c($s0) +/* BAE920 80240FE0 C6040040 */ lwc1 $f4, 0x40($s0) +/* BAE924 80240FE4 3C01447A */ lui $at, 0x447a +/* BAE928 80240FE8 44813000 */ mtc1 $at, $f6 +/* BAE92C 80240FEC 27A20024 */ addiu $v0, $sp, 0x24 +/* BAE930 80240FF0 E7A00018 */ swc1 $f0, 0x18($sp) +/* BAE934 80240FF4 E7A2001C */ swc1 $f2, 0x1c($sp) +/* BAE938 80240FF8 E7A40020 */ swc1 $f4, 0x20($sp) +/* BAE93C 80240FFC E7A60024 */ swc1 $f6, 0x24($sp) +/* BAE940 80241000 AFA20010 */ sw $v0, 0x10($sp) +/* BAE944 80241004 8E040080 */ lw $a0, 0x80($s0) +/* BAE948 80241008 0C0372DF */ jal func_800DCB7C +/* BAE94C 8024100C 27A70020 */ addiu $a3, $sp, 0x20 +.L80241010: +/* BAE950 80241010 1040000B */ beqz $v0, .L80241040 +/* BAE954 80241014 00000000 */ nop +/* BAE958 80241018 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* BAE95C 8024101C 46140080 */ add.s $f2, $f0, $f20 +/* BAE960 80241020 C600003C */ lwc1 $f0, 0x3c($s0) +/* BAE964 80241024 4600103E */ c.le.s $f2, $f0 +/* BAE968 80241028 00000000 */ nop +/* BAE96C 8024102C 4500008D */ bc1f .L80241264 +/* BAE970 80241030 00000000 */ nop +/* BAE974 80241034 E602003C */ swc1 $f2, 0x3c($s0) +/* BAE978 80241038 08090499 */ j .L80241264 +/* BAE97C 8024103C AE400070 */ sw $zero, 0x70($s2) +.L80241040: +/* BAE980 80241040 C602003C */ lwc1 $f2, 0x3c($s0) +/* BAE984 80241044 C6000064 */ lwc1 $f0, 0x64($s0) +/* BAE988 80241048 4602003E */ c.le.s $f0, $f2 +/* BAE98C 8024104C 00000000 */ nop +/* BAE990 80241050 45030084 */ bc1tl .L80241264 +/* BAE994 80241054 AE400070 */ sw $zero, 0x70($s2) +/* BAE998 80241058 08090499 */ j .L80241264 +/* BAE99C 8024105C 00000000 */ nop +.L80241060: +/* BAE9A0 80241060 4622003C */ c.lt.d $f0, $f2 +/* BAE9A4 80241064 00000000 */ nop +/* BAE9A8 80241068 4500007E */ bc1f .L80241264 +/* BAE9AC 8024106C 00000000 */ nop +/* BAE9B0 80241070 9602008E */ lhu $v0, 0x8e($s0) +/* BAE9B4 80241074 24420001 */ addiu $v0, $v0, 1 +/* BAE9B8 80241078 A602008E */ sh $v0, 0x8e($s0) +/* BAE9BC 8024107C 00021400 */ sll $v0, $v0, 0x10 +/* BAE9C0 80241080 8E630020 */ lw $v1, 0x20($s3) +/* BAE9C4 80241084 00021403 */ sra $v0, $v0, 0x10 +/* BAE9C8 80241088 0043102A */ slt $v0, $v0, $v1 +/* BAE9CC 8024108C 14400026 */ bnez $v0, .L80241128 +/* BAE9D0 80241090 00000000 */ nop +/* BAE9D4 80241094 C60C0038 */ lwc1 $f12, 0x38($s0) +/* BAE9D8 80241098 C60E0040 */ lwc1 $f14, 0x40($s0) +/* BAE9DC 8024109C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* BAE9E0 802410A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* BAE9E4 802410A4 A600008E */ sh $zero, 0x8e($s0) +/* BAE9E8 802410A8 8C460028 */ lw $a2, 0x28($v0) +/* BAE9EC 802410AC 0C00A720 */ jal atan2 +/* BAE9F0 802410B0 8C470030 */ lw $a3, 0x30($v0) +/* BAE9F4 802410B4 46000506 */ mov.s $f20, $f0 +/* BAE9F8 802410B8 C60C000C */ lwc1 $f12, 0xc($s0) +/* BAE9FC 802410BC 0C00A70A */ jal get_clamped_angle_diff +/* BAEA00 802410C0 4600A386 */ mov.s $f14, $f20 +/* BAEA04 802410C4 46000086 */ mov.s $f2, $f0 +/* BAEA08 802410C8 8E62001C */ lw $v0, 0x1c($s3) +/* BAEA0C 802410CC 46001005 */ abs.s $f0, $f2 +/* BAEA10 802410D0 44822000 */ mtc1 $v0, $f4 +/* BAEA14 802410D4 00000000 */ nop +/* BAEA18 802410D8 46802120 */ cvt.s.w $f4, $f4 +/* BAEA1C 802410DC 4600203C */ c.lt.s $f4, $f0 +/* BAEA20 802410E0 00000000 */ nop +/* BAEA24 802410E4 4500000D */ bc1f .L8024111C +/* BAEA28 802410E8 00000000 */ nop +/* BAEA2C 802410EC 44800000 */ mtc1 $zero, $f0 +/* BAEA30 802410F0 C614000C */ lwc1 $f20, 0xc($s0) +/* BAEA34 802410F4 4600103C */ c.lt.s $f2, $f0 +/* BAEA38 802410F8 00000000 */ nop +/* BAEA3C 802410FC 45000006 */ bc1f .L80241118 +/* BAEA40 80241100 00021023 */ negu $v0, $v0 +/* BAEA44 80241104 44820000 */ mtc1 $v0, $f0 +/* BAEA48 80241108 00000000 */ nop +/* BAEA4C 8024110C 46800020 */ cvt.s.w $f0, $f0 +/* BAEA50 80241110 08090447 */ j .L8024111C +/* BAEA54 80241114 4600A500 */ add.s $f20, $f20, $f0 +.L80241118: +/* BAEA58 80241118 4604A500 */ add.s $f20, $f20, $f4 +.L8024111C: +/* BAEA5C 8024111C 0C00A6C9 */ jal clamp_angle +/* BAEA60 80241120 4600A306 */ mov.s $f12, $f20 +/* BAEA64 80241124 E600000C */ swc1 $f0, 0xc($s0) +.L80241128: +/* BAEA68 80241128 8E020000 */ lw $v0, ($s0) +/* BAEA6C 8024112C 30420008 */ andi $v0, $v0, 8 +/* BAEA70 80241130 1040000A */ beqz $v0, .L8024115C +/* BAEA74 80241134 27A50018 */ addiu $a1, $sp, 0x18 +/* BAEA78 80241138 C602003C */ lwc1 $f2, 0x3c($s0) +/* BAEA7C 8024113C C600001C */ lwc1 $f0, 0x1c($s0) +/* BAEA80 80241140 46001080 */ add.s $f2, $f2, $f0 +/* BAEA84 80241144 4616103C */ c.lt.s $f2, $f22 +/* BAEA88 80241148 00000000 */ nop +/* BAEA8C 8024114C 45020045 */ bc1fl .L80241264 +/* BAEA90 80241150 E602003C */ swc1 $f2, 0x3c($s0) +/* BAEA94 80241154 08090498 */ j .L80241260 +/* BAEA98 80241158 E616003C */ swc1 $f22, 0x3c($s0) +.L8024115C: +/* BAEA9C 8024115C C6000038 */ lwc1 $f0, 0x38($s0) +/* BAEAA0 80241160 27A6001C */ addiu $a2, $sp, 0x1c +/* BAEAA4 80241164 E7A00018 */ swc1 $f0, 0x18($sp) +/* BAEAA8 80241168 860200A8 */ lh $v0, 0xa8($s0) +/* BAEAAC 8024116C C600001C */ lwc1 $f0, 0x1c($s0) +/* BAEAB0 80241170 C604003C */ lwc1 $f4, 0x3c($s0) +/* BAEAB4 80241174 44821000 */ mtc1 $v0, $f2 +/* BAEAB8 80241178 00000000 */ nop +/* BAEABC 8024117C 468010A0 */ cvt.s.w $f2, $f2 +/* BAEAC0 80241180 46000005 */ abs.s $f0, $f0 +/* BAEAC4 80241184 46020000 */ add.s $f0, $f0, $f2 +/* BAEAC8 80241188 C6060040 */ lwc1 $f6, 0x40($s0) +/* BAEACC 8024118C 27A20024 */ addiu $v0, $sp, 0x24 +/* BAEAD0 80241190 46022100 */ add.s $f4, $f4, $f2 +/* BAEAD4 80241194 3C014024 */ lui $at, 0x4024 +/* BAEAD8 80241198 44811800 */ mtc1 $at, $f3 +/* BAEADC 8024119C 44801000 */ mtc1 $zero, $f2 +/* BAEAE0 802411A0 46000021 */ cvt.d.s $f0, $f0 +/* BAEAE4 802411A4 46220000 */ add.d $f0, $f0, $f2 +/* BAEAE8 802411A8 E7A60020 */ swc1 $f6, 0x20($sp) +/* BAEAEC 802411AC E7A4001C */ swc1 $f4, 0x1c($sp) +/* BAEAF0 802411B0 46200020 */ cvt.s.d $f0, $f0 +/* BAEAF4 802411B4 E7A00024 */ swc1 $f0, 0x24($sp) +/* BAEAF8 802411B8 AFA20010 */ sw $v0, 0x10($sp) +/* BAEAFC 802411BC 8E040080 */ lw $a0, 0x80($s0) +/* BAEB00 802411C0 0C0372DF */ jal func_800DCB7C +/* BAEB04 802411C4 27A70020 */ addiu $a3, $sp, 0x20 +/* BAEB08 802411C8 10400015 */ beqz $v0, .L80241220 +/* BAEB0C 802411CC 00000000 */ nop +/* BAEB10 802411D0 860200A8 */ lh $v0, 0xa8($s0) +/* BAEB14 802411D4 C604001C */ lwc1 $f4, 0x1c($s0) +/* BAEB18 802411D8 44820000 */ mtc1 $v0, $f0 +/* BAEB1C 802411DC 00000000 */ nop +/* BAEB20 802411E0 46800020 */ cvt.s.w $f0, $f0 +/* BAEB24 802411E4 46002085 */ abs.s $f2, $f4 +/* BAEB28 802411E8 46020000 */ add.s $f0, $f0, $f2 +/* BAEB2C 802411EC C7A20024 */ lwc1 $f2, 0x24($sp) +/* BAEB30 802411F0 4600103E */ c.le.s $f2, $f0 +/* BAEB34 802411F4 00000000 */ nop +/* BAEB38 802411F8 45000005 */ bc1f .L80241210 +/* BAEB3C 802411FC 00000000 */ nop +/* BAEB40 80241200 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* BAEB44 80241204 AE00001C */ sw $zero, 0x1c($s0) +/* BAEB48 80241208 08090499 */ j .L80241264 +/* BAEB4C 8024120C E600003C */ swc1 $f0, 0x3c($s0) +.L80241210: +/* BAEB50 80241210 C600003C */ lwc1 $f0, 0x3c($s0) +/* BAEB54 80241214 46040000 */ add.s $f0, $f0, $f4 +/* BAEB58 80241218 08090499 */ j .L80241264 +/* BAEB5C 8024121C E600003C */ swc1 $f0, 0x3c($s0) +.L80241220: +/* BAEB60 80241220 C606003C */ lwc1 $f6, 0x3c($s0) +/* BAEB64 80241224 860200A8 */ lh $v0, 0xa8($s0) +/* BAEB68 80241228 46163081 */ sub.s $f2, $f6, $f22 +/* BAEB6C 8024122C 44820000 */ mtc1 $v0, $f0 +/* BAEB70 80241230 00000000 */ nop +/* BAEB74 80241234 46800020 */ cvt.s.w $f0, $f0 +/* BAEB78 80241238 46001080 */ add.s $f2, $f2, $f0 +/* BAEB7C 8024123C C604001C */ lwc1 $f4, 0x1c($s0) +/* BAEB80 80241240 46002005 */ abs.s $f0, $f4 +/* BAEB84 80241244 4602003C */ c.lt.s $f0, $f2 +/* BAEB88 80241248 00000000 */ nop +/* BAEB8C 8024124C 45020005 */ bc1fl .L80241264 +/* BAEB90 80241250 AE00001C */ sw $zero, 0x1c($s0) +/* BAEB94 80241254 46043000 */ add.s $f0, $f6, $f4 +/* BAEB98 80241258 08090499 */ j .L80241264 +/* BAEB9C 8024125C E600003C */ swc1 $f0, 0x3c($s0) +.L80241260: +/* BAEBA0 80241260 AE00001C */ sw $zero, 0x1c($s0) +.L80241264: +/* BAEBA4 80241264 8FBF0038 */ lw $ra, 0x38($sp) +/* BAEBA8 80241268 8FB30034 */ lw $s3, 0x34($sp) +/* BAEBAC 8024126C 8FB20030 */ lw $s2, 0x30($sp) +/* BAEBB0 80241270 8FB1002C */ lw $s1, 0x2c($sp) +/* BAEBB4 80241274 8FB00028 */ lw $s0, 0x28($sp) +/* BAEBB8 80241278 D7B60048 */ ldc1 $f22, 0x48($sp) +/* BAEBBC 8024127C D7B40040 */ ldc1 $f20, 0x40($sp) +/* BAEBC0 80241280 03E00008 */ jr $ra +/* BAEBC4 80241284 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288.s deleted file mode 100644 index d223a1b3ef..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241288 -/* BAEBC8 80241288 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BAEBCC 8024128C AFB00028 */ sw $s0, 0x28($sp) -/* BAEBD0 80241290 00A0802D */ daddu $s0, $a1, $zero -/* BAEBD4 80241294 AFB1002C */ sw $s1, 0x2c($sp) -/* BAEBD8 80241298 00C0882D */ daddu $s1, $a2, $zero -/* BAEBDC 8024129C AFBF0034 */ sw $ra, 0x34($sp) -/* BAEBE0 802412A0 AFB20030 */ sw $s2, 0x30($sp) -/* BAEBE4 802412A4 AE200070 */ sw $zero, 0x70($s1) -/* BAEBE8 802412A8 8C830000 */ lw $v1, ($a0) -/* BAEBEC 802412AC 2402FDFF */ addiu $v0, $zero, -0x201 -/* BAEBF0 802412B0 A480008E */ sh $zero, 0x8e($a0) -/* BAEBF4 802412B4 00621824 */ and $v1, $v1, $v0 -/* BAEBF8 802412B8 34650800 */ ori $a1, $v1, 0x800 -/* BAEBFC 802412BC AC850000 */ sw $a1, ($a0) -/* BAEC00 802412C0 8E0200D0 */ lw $v0, 0xd0($s0) -/* BAEC04 802412C4 8C420034 */ lw $v0, 0x34($v0) -/* BAEC08 802412C8 10400003 */ beqz $v0, .L802412D8 -/* BAEC0C 802412CC 00E0902D */ daddu $s2, $a3, $zero -/* BAEC10 802412D0 080904B8 */ j .L802412E0 -/* BAEC14 802412D4 34620808 */ ori $v0, $v1, 0x808 -.L802412D8: -/* BAEC18 802412D8 2402FFF7 */ addiu $v0, $zero, -9 -/* BAEC1C 802412DC 00A21024 */ and $v0, $a1, $v0 -.L802412E0: -/* BAEC20 802412E0 AC820000 */ sw $v0, ($a0) -/* BAEC24 802412E4 27A20024 */ addiu $v0, $sp, 0x24 -/* BAEC28 802412E8 27A50018 */ addiu $a1, $sp, 0x18 -/* BAEC2C 802412EC C4800038 */ lwc1 $f0, 0x38($a0) -/* BAEC30 802412F0 C482003C */ lwc1 $f2, 0x3c($a0) -/* BAEC34 802412F4 C4840040 */ lwc1 $f4, 0x40($a0) -/* BAEC38 802412F8 3C01447A */ lui $at, 0x447a -/* BAEC3C 802412FC 44813000 */ mtc1 $at, $f6 -/* BAEC40 80241300 27A6001C */ addiu $a2, $sp, 0x1c -/* BAEC44 80241304 E7A00018 */ swc1 $f0, 0x18($sp) -/* BAEC48 80241308 E7A2001C */ swc1 $f2, 0x1c($sp) -/* BAEC4C 8024130C E7A40020 */ swc1 $f4, 0x20($sp) -/* BAEC50 80241310 E7A60024 */ swc1 $f6, 0x24($sp) -/* BAEC54 80241314 AFA20010 */ sw $v0, 0x10($sp) -/* BAEC58 80241318 8C840080 */ lw $a0, 0x80($a0) -/* BAEC5C 8024131C 0C0372DF */ jal func_800DCB7C -/* BAEC60 80241320 27A70020 */ addiu $a3, $sp, 0x20 -/* BAEC64 80241324 C7A20024 */ lwc1 $f2, 0x24($sp) -/* BAEC68 80241328 3C014059 */ lui $at, 0x4059 -/* BAEC6C 8024132C 44812800 */ mtc1 $at, $f5 -/* BAEC70 80241330 44802000 */ mtc1 $zero, $f4 -/* BAEC74 80241334 460010A1 */ cvt.d.s $f2, $f2 -/* BAEC78 80241338 46241082 */ mul.d $f2, $f2, $f4 -/* BAEC7C 8024133C 00000000 */ nop -/* BAEC80 80241340 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* BAEC84 80241344 46000021 */ cvt.d.s $f0, $f0 -/* BAEC88 80241348 46240002 */ mul.d $f0, $f0, $f4 -/* BAEC8C 8024134C 00000000 */ nop -/* BAEC90 80241350 3C013FE0 */ lui $at, 0x3fe0 -/* BAEC94 80241354 44812800 */ mtc1 $at, $f5 -/* BAEC98 80241358 44802000 */ mtc1 $zero, $f4 -/* BAEC9C 8024135C 00000000 */ nop -/* BAECA0 80241360 46241080 */ add.d $f2, $f2, $f4 -/* BAECA4 80241364 AE000074 */ sw $zero, 0x74($s0) -/* BAECA8 80241368 46240000 */ add.d $f0, $f0, $f4 -/* BAECAC 8024136C AE000090 */ sw $zero, 0x90($s0) -/* BAECB0 80241370 4620120D */ trunc.w.d $f8, $f2 -/* BAECB4 80241374 E6080078 */ swc1 $f8, 0x78($s0) -/* BAECB8 80241378 4620020D */ trunc.w.d $f8, $f0 -/* BAECBC 8024137C E6080088 */ swc1 $f8, 0x88($s0) -/* BAECC0 80241380 8E420014 */ lw $v0, 0x14($s2) -/* BAECC4 80241384 AE220074 */ sw $v0, 0x74($s1) -/* BAECC8 80241388 8E0200B0 */ lw $v0, 0xb0($s0) -/* BAECCC 8024138C 34420010 */ ori $v0, $v0, 0x10 -/* BAECD0 80241390 AE0200B0 */ sw $v0, 0xb0($s0) -/* BAECD4 80241394 8FBF0034 */ lw $ra, 0x34($sp) -/* BAECD8 80241398 8FB20030 */ lw $s2, 0x30($sp) -/* BAECDC 8024139C 8FB1002C */ lw $s1, 0x2c($sp) -/* BAECE0 802413A0 8FB00028 */ lw $s0, 0x28($sp) -/* BAECE4 802413A4 03E00008 */ jr $ra -/* BAECE8 802413A8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s new file mode 100644 index 0000000000..c4a73dbfbf --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241288_BAEBC8.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241288_BAEBC8 +/* BAEBC8 80241288 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* BAEBCC 8024128C AFB00028 */ sw $s0, 0x28($sp) +/* BAEBD0 80241290 00A0802D */ daddu $s0, $a1, $zero +/* BAEBD4 80241294 AFB1002C */ sw $s1, 0x2c($sp) +/* BAEBD8 80241298 00C0882D */ daddu $s1, $a2, $zero +/* BAEBDC 8024129C AFBF0034 */ sw $ra, 0x34($sp) +/* BAEBE0 802412A0 AFB20030 */ sw $s2, 0x30($sp) +/* BAEBE4 802412A4 AE200070 */ sw $zero, 0x70($s1) +/* BAEBE8 802412A8 8C830000 */ lw $v1, ($a0) +/* BAEBEC 802412AC 2402FDFF */ addiu $v0, $zero, -0x201 +/* BAEBF0 802412B0 A480008E */ sh $zero, 0x8e($a0) +/* BAEBF4 802412B4 00621824 */ and $v1, $v1, $v0 +/* BAEBF8 802412B8 34650800 */ ori $a1, $v1, 0x800 +/* BAEBFC 802412BC AC850000 */ sw $a1, ($a0) +/* BAEC00 802412C0 8E0200D0 */ lw $v0, 0xd0($s0) +/* BAEC04 802412C4 8C420034 */ lw $v0, 0x34($v0) +/* BAEC08 802412C8 10400003 */ beqz $v0, .L802412D8 +/* BAEC0C 802412CC 00E0902D */ daddu $s2, $a3, $zero +/* BAEC10 802412D0 080904B8 */ j .L802412E0 +/* BAEC14 802412D4 34620808 */ ori $v0, $v1, 0x808 +.L802412D8: +/* BAEC18 802412D8 2402FFF7 */ addiu $v0, $zero, -9 +/* BAEC1C 802412DC 00A21024 */ and $v0, $a1, $v0 +.L802412E0: +/* BAEC20 802412E0 AC820000 */ sw $v0, ($a0) +/* BAEC24 802412E4 27A20024 */ addiu $v0, $sp, 0x24 +/* BAEC28 802412E8 27A50018 */ addiu $a1, $sp, 0x18 +/* BAEC2C 802412EC C4800038 */ lwc1 $f0, 0x38($a0) +/* BAEC30 802412F0 C482003C */ lwc1 $f2, 0x3c($a0) +/* BAEC34 802412F4 C4840040 */ lwc1 $f4, 0x40($a0) +/* BAEC38 802412F8 3C01447A */ lui $at, 0x447a +/* BAEC3C 802412FC 44813000 */ mtc1 $at, $f6 +/* BAEC40 80241300 27A6001C */ addiu $a2, $sp, 0x1c +/* BAEC44 80241304 E7A00018 */ swc1 $f0, 0x18($sp) +/* BAEC48 80241308 E7A2001C */ swc1 $f2, 0x1c($sp) +/* BAEC4C 8024130C E7A40020 */ swc1 $f4, 0x20($sp) +/* BAEC50 80241310 E7A60024 */ swc1 $f6, 0x24($sp) +/* BAEC54 80241314 AFA20010 */ sw $v0, 0x10($sp) +/* BAEC58 80241318 8C840080 */ lw $a0, 0x80($a0) +/* BAEC5C 8024131C 0C0372DF */ jal func_800DCB7C +/* BAEC60 80241320 27A70020 */ addiu $a3, $sp, 0x20 +/* BAEC64 80241324 C7A20024 */ lwc1 $f2, 0x24($sp) +/* BAEC68 80241328 3C014059 */ lui $at, 0x4059 +/* BAEC6C 8024132C 44812800 */ mtc1 $at, $f5 +/* BAEC70 80241330 44802000 */ mtc1 $zero, $f4 +/* BAEC74 80241334 460010A1 */ cvt.d.s $f2, $f2 +/* BAEC78 80241338 46241082 */ mul.d $f2, $f2, $f4 +/* BAEC7C 8024133C 00000000 */ nop +/* BAEC80 80241340 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* BAEC84 80241344 46000021 */ cvt.d.s $f0, $f0 +/* BAEC88 80241348 46240002 */ mul.d $f0, $f0, $f4 +/* BAEC8C 8024134C 00000000 */ nop +/* BAEC90 80241350 3C013FE0 */ lui $at, 0x3fe0 +/* BAEC94 80241354 44812800 */ mtc1 $at, $f5 +/* BAEC98 80241358 44802000 */ mtc1 $zero, $f4 +/* BAEC9C 8024135C 00000000 */ nop +/* BAECA0 80241360 46241080 */ add.d $f2, $f2, $f4 +/* BAECA4 80241364 AE000074 */ sw $zero, 0x74($s0) +/* BAECA8 80241368 46240000 */ add.d $f0, $f0, $f4 +/* BAECAC 8024136C AE000090 */ sw $zero, 0x90($s0) +/* BAECB0 80241370 4620120D */ trunc.w.d $f8, $f2 +/* BAECB4 80241374 E6080078 */ swc1 $f8, 0x78($s0) +/* BAECB8 80241378 4620020D */ trunc.w.d $f8, $f0 +/* BAECBC 8024137C E6080088 */ swc1 $f8, 0x88($s0) +/* BAECC0 80241380 8E420014 */ lw $v0, 0x14($s2) +/* BAECC4 80241384 AE220074 */ sw $v0, 0x74($s1) +/* BAECC8 80241388 8E0200B0 */ lw $v0, 0xb0($s0) +/* BAECCC 8024138C 34420010 */ ori $v0, $v0, 0x10 +/* BAECD0 80241390 AE0200B0 */ sw $v0, 0xb0($s0) +/* BAECD4 80241394 8FBF0034 */ lw $ra, 0x34($sp) +/* BAECD8 80241398 8FB20030 */ lw $s2, 0x30($sp) +/* BAECDC 8024139C 8FB1002C */ lw $s1, 0x2c($sp) +/* BAECE0 802413A0 8FB00028 */ lw $s0, 0x28($sp) +/* BAECE4 802413A4 03E00008 */ jr $ra +/* BAECE8 802413A8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC.s deleted file mode 100644 index 709f4a4451..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413AC -/* BAECEC 802413AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BAECF0 802413B0 AFB40040 */ sw $s4, 0x40($sp) -/* BAECF4 802413B4 0080A02D */ daddu $s4, $a0, $zero -/* BAECF8 802413B8 AFBF0048 */ sw $ra, 0x48($sp) -/* BAECFC 802413BC AFB50044 */ sw $s5, 0x44($sp) -/* BAED00 802413C0 AFB3003C */ sw $s3, 0x3c($sp) -/* BAED04 802413C4 AFB20038 */ sw $s2, 0x38($sp) -/* BAED08 802413C8 AFB10034 */ sw $s1, 0x34($sp) -/* BAED0C 802413CC AFB00030 */ sw $s0, 0x30($sp) -/* BAED10 802413D0 8E920148 */ lw $s2, 0x148($s4) -/* BAED14 802413D4 86440008 */ lh $a0, 8($s2) -/* BAED18 802413D8 8E90000C */ lw $s0, 0xc($s4) -/* BAED1C 802413DC 0C00EABB */ jal get_npc_unsafe -/* BAED20 802413E0 00A0882D */ daddu $s1, $a1, $zero -/* BAED24 802413E4 0280202D */ daddu $a0, $s4, $zero -/* BAED28 802413E8 8E050000 */ lw $a1, ($s0) -/* BAED2C 802413EC 0C0B1EAF */ jal get_variable -/* BAED30 802413F0 0040A82D */ daddu $s5, $v0, $zero -/* BAED34 802413F4 AFA00010 */ sw $zero, 0x10($sp) -/* BAED38 802413F8 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED3C 802413FC 8C630030 */ lw $v1, 0x30($v1) -/* BAED40 80241400 AFA30014 */ sw $v1, 0x14($sp) -/* BAED44 80241404 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED48 80241408 8C63001C */ lw $v1, 0x1c($v1) -/* BAED4C 8024140C AFA30018 */ sw $v1, 0x18($sp) -/* BAED50 80241410 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED54 80241414 8C630024 */ lw $v1, 0x24($v1) -/* BAED58 80241418 AFA3001C */ sw $v1, 0x1c($sp) -/* BAED5C 8024141C 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED60 80241420 8C630028 */ lw $v1, 0x28($v1) -/* BAED64 80241424 27B30010 */ addiu $s3, $sp, 0x10 -/* BAED68 80241428 AFA30020 */ sw $v1, 0x20($sp) -/* BAED6C 8024142C 8E4300D0 */ lw $v1, 0xd0($s2) -/* BAED70 80241430 3C0142F0 */ lui $at, 0x42f0 -/* BAED74 80241434 44810000 */ mtc1 $at, $f0 -/* BAED78 80241438 8C63002C */ lw $v1, 0x2c($v1) -/* BAED7C 8024143C 0040802D */ daddu $s0, $v0, $zero -/* BAED80 80241440 E7A00028 */ swc1 $f0, 0x28($sp) -/* BAED84 80241444 A7A0002C */ sh $zero, 0x2c($sp) -/* BAED88 80241448 12200006 */ beqz $s1, .L80241464 -/* BAED8C 8024144C AFA30024 */ sw $v1, 0x24($sp) -/* BAED90 80241450 02A0202D */ daddu $a0, $s5, $zero -/* BAED94 80241454 0240282D */ daddu $a1, $s2, $zero -/* BAED98 80241458 0280302D */ daddu $a2, $s4, $zero -/* BAED9C 8024145C 0C0904A2 */ jal func_80241288 -/* BAEDA0 80241460 0200382D */ daddu $a3, $s0, $zero -.L80241464: -/* BAEDA4 80241464 2402FFFE */ addiu $v0, $zero, -2 -/* BAEDA8 80241468 A2A200AB */ sb $v0, 0xab($s5) -/* BAEDAC 8024146C 8E4300B0 */ lw $v1, 0xb0($s2) -/* BAEDB0 80241470 30620004 */ andi $v0, $v1, 4 -/* BAEDB4 80241474 10400007 */ beqz $v0, .L80241494 -/* BAEDB8 80241478 00000000 */ nop -/* BAEDBC 8024147C 824200B4 */ lb $v0, 0xb4($s2) -/* BAEDC0 80241480 1440003C */ bnez $v0, .L80241574 -/* BAEDC4 80241484 0000102D */ daddu $v0, $zero, $zero -/* BAEDC8 80241488 2402FFFB */ addiu $v0, $zero, -5 -/* BAEDCC 8024148C 00621024 */ and $v0, $v1, $v0 -/* BAEDD0 80241490 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241494: -/* BAEDD4 80241494 8E830070 */ lw $v1, 0x70($s4) -/* BAEDD8 80241498 2C62000F */ sltiu $v0, $v1, 0xf -/* BAEDDC 8024149C 10400034 */ beqz $v0, .L80241570 -/* BAEDE0 802414A0 00031080 */ sll $v0, $v1, 2 -/* BAEDE4 802414A4 3C018024 */ lui $at, 0x8024 -/* BAEDE8 802414A8 00220821 */ addu $at, $at, $v0 -/* BAEDEC 802414AC 8C2252B8 */ lw $v0, 0x52b8($at) -/* BAEDF0 802414B0 00400008 */ jr $v0 -/* BAEDF4 802414B4 00000000 */ nop -/* BAEDF8 802414B8 0280202D */ daddu $a0, $s4, $zero -/* BAEDFC 802414BC 0200282D */ daddu $a1, $s0, $zero -/* BAEE00 802414C0 0C090028 */ jal func_802400A0 -/* BAEE04 802414C4 0260302D */ daddu $a2, $s3, $zero -/* BAEE08 802414C8 0280202D */ daddu $a0, $s4, $zero -/* BAEE0C 802414CC 0200282D */ daddu $a1, $s0, $zero -/* BAEE10 802414D0 0C090094 */ jal func_80240250 -/* BAEE14 802414D4 0260302D */ daddu $a2, $s3, $zero -/* BAEE18 802414D8 0809055D */ j .L80241574 -/* BAEE1C 802414DC 0000102D */ daddu $v0, $zero, $zero -/* BAEE20 802414E0 0280202D */ daddu $a0, $s4, $zero -/* BAEE24 802414E4 0200282D */ daddu $a1, $s0, $zero -/* BAEE28 802414E8 0C09021E */ jal func_80240878 -/* BAEE2C 802414EC 0260302D */ daddu $a2, $s3, $zero -/* BAEE30 802414F0 0280202D */ daddu $a0, $s4, $zero -/* BAEE34 802414F4 0200282D */ daddu $a1, $s0, $zero -/* BAEE38 802414F8 0C09024E */ jal func_80240938 -/* BAEE3C 802414FC 0260302D */ daddu $a2, $s3, $zero -/* BAEE40 80241500 0809055D */ j .L80241574 -/* BAEE44 80241504 0000102D */ daddu $v0, $zero, $zero -/* BAEE48 80241508 0280202D */ daddu $a0, $s4, $zero -/* BAEE4C 8024150C 0200282D */ daddu $a1, $s0, $zero -/* BAEE50 80241510 0C09031F */ jal func_80240C7C -/* BAEE54 80241514 0260302D */ daddu $a2, $s3, $zero -/* BAEE58 80241518 0280202D */ daddu $a0, $s4, $zero -/* BAEE5C 8024151C 0200282D */ daddu $a1, $s0, $zero -/* BAEE60 80241520 0C09033D */ jal func_80240CF4 -/* BAEE64 80241524 0260302D */ daddu $a2, $s3, $zero -/* BAEE68 80241528 0809055D */ j .L80241574 -/* BAEE6C 8024152C 0000102D */ daddu $v0, $zero, $zero -/* BAEE70 80241530 0280202D */ daddu $a0, $s4, $zero -/* BAEE74 80241534 0200282D */ daddu $a1, $s0, $zero -/* BAEE78 80241538 0C090358 */ jal func_80240D60 -/* BAEE7C 8024153C 0260302D */ daddu $a2, $s3, $zero -/* BAEE80 80241540 0809055D */ j .L80241574 -/* BAEE84 80241544 0000102D */ daddu $v0, $zero, $zero -/* BAEE88 80241548 0280202D */ daddu $a0, $s4, $zero -/* BAEE8C 8024154C 0200282D */ daddu $a1, $s0, $zero -/* BAEE90 80241550 0C0903A5 */ jal func_80240E94 -/* BAEE94 80241554 0260302D */ daddu $a2, $s3, $zero -/* BAEE98 80241558 0809055D */ j .L80241574 -/* BAEE9C 8024155C 0000102D */ daddu $v0, $zero, $zero -/* BAEEA0 80241560 0280202D */ daddu $a0, $s4, $zero -/* BAEEA4 80241564 0200282D */ daddu $a1, $s0, $zero -/* BAEEA8 80241568 0C0903BE */ jal func_80240EF8 -/* BAEEAC 8024156C 0260302D */ daddu $a2, $s3, $zero -.L80241570: -/* BAEEB0 80241570 0000102D */ daddu $v0, $zero, $zero -.L80241574: -/* BAEEB4 80241574 8FBF0048 */ lw $ra, 0x48($sp) -/* BAEEB8 80241578 8FB50044 */ lw $s5, 0x44($sp) -/* BAEEBC 8024157C 8FB40040 */ lw $s4, 0x40($sp) -/* BAEEC0 80241580 8FB3003C */ lw $s3, 0x3c($sp) -/* BAEEC4 80241584 8FB20038 */ lw $s2, 0x38($sp) -/* BAEEC8 80241588 8FB10034 */ lw $s1, 0x34($sp) -/* BAEECC 8024158C 8FB00030 */ lw $s0, 0x30($sp) -/* BAEED0 80241590 03E00008 */ jr $ra -/* BAEED4 80241594 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s new file mode 100644 index 0000000000..2e99fa01c7 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_802413AC_BAECEC.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413AC_BAECEC +/* BAECEC 802413AC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BAECF0 802413B0 AFB40040 */ sw $s4, 0x40($sp) +/* BAECF4 802413B4 0080A02D */ daddu $s4, $a0, $zero +/* BAECF8 802413B8 AFBF0048 */ sw $ra, 0x48($sp) +/* BAECFC 802413BC AFB50044 */ sw $s5, 0x44($sp) +/* BAED00 802413C0 AFB3003C */ sw $s3, 0x3c($sp) +/* BAED04 802413C4 AFB20038 */ sw $s2, 0x38($sp) +/* BAED08 802413C8 AFB10034 */ sw $s1, 0x34($sp) +/* BAED0C 802413CC AFB00030 */ sw $s0, 0x30($sp) +/* BAED10 802413D0 8E920148 */ lw $s2, 0x148($s4) +/* BAED14 802413D4 86440008 */ lh $a0, 8($s2) +/* BAED18 802413D8 8E90000C */ lw $s0, 0xc($s4) +/* BAED1C 802413DC 0C00EABB */ jal get_npc_unsafe +/* BAED20 802413E0 00A0882D */ daddu $s1, $a1, $zero +/* BAED24 802413E4 0280202D */ daddu $a0, $s4, $zero +/* BAED28 802413E8 8E050000 */ lw $a1, ($s0) +/* BAED2C 802413EC 0C0B1EAF */ jal get_variable +/* BAED30 802413F0 0040A82D */ daddu $s5, $v0, $zero +/* BAED34 802413F4 AFA00010 */ sw $zero, 0x10($sp) +/* BAED38 802413F8 8E4300D0 */ lw $v1, 0xd0($s2) +/* BAED3C 802413FC 8C630030 */ lw $v1, 0x30($v1) +/* BAED40 80241400 AFA30014 */ sw $v1, 0x14($sp) +/* BAED44 80241404 8E4300D0 */ lw $v1, 0xd0($s2) +/* BAED48 80241408 8C63001C */ lw $v1, 0x1c($v1) +/* BAED4C 8024140C AFA30018 */ sw $v1, 0x18($sp) +/* BAED50 80241410 8E4300D0 */ lw $v1, 0xd0($s2) +/* BAED54 80241414 8C630024 */ lw $v1, 0x24($v1) +/* BAED58 80241418 AFA3001C */ sw $v1, 0x1c($sp) +/* BAED5C 8024141C 8E4300D0 */ lw $v1, 0xd0($s2) +/* BAED60 80241420 8C630028 */ lw $v1, 0x28($v1) +/* BAED64 80241424 27B30010 */ addiu $s3, $sp, 0x10 +/* BAED68 80241428 AFA30020 */ sw $v1, 0x20($sp) +/* BAED6C 8024142C 8E4300D0 */ lw $v1, 0xd0($s2) +/* BAED70 80241430 3C0142F0 */ lui $at, 0x42f0 +/* BAED74 80241434 44810000 */ mtc1 $at, $f0 +/* BAED78 80241438 8C63002C */ lw $v1, 0x2c($v1) +/* BAED7C 8024143C 0040802D */ daddu $s0, $v0, $zero +/* BAED80 80241440 E7A00028 */ swc1 $f0, 0x28($sp) +/* BAED84 80241444 A7A0002C */ sh $zero, 0x2c($sp) +/* BAED88 80241448 12200006 */ beqz $s1, .L80241464 +/* BAED8C 8024144C AFA30024 */ sw $v1, 0x24($sp) +/* BAED90 80241450 02A0202D */ daddu $a0, $s5, $zero +/* BAED94 80241454 0240282D */ daddu $a1, $s2, $zero +/* BAED98 80241458 0280302D */ daddu $a2, $s4, $zero +/* BAED9C 8024145C 0C0904A2 */ jal func_80241288_BAEBC8 +/* BAEDA0 80241460 0200382D */ daddu $a3, $s0, $zero +.L80241464: +/* BAEDA4 80241464 2402FFFE */ addiu $v0, $zero, -2 +/* BAEDA8 80241468 A2A200AB */ sb $v0, 0xab($s5) +/* BAEDAC 8024146C 8E4300B0 */ lw $v1, 0xb0($s2) +/* BAEDB0 80241470 30620004 */ andi $v0, $v1, 4 +/* BAEDB4 80241474 10400007 */ beqz $v0, .L80241494 +/* BAEDB8 80241478 00000000 */ nop +/* BAEDBC 8024147C 824200B4 */ lb $v0, 0xb4($s2) +/* BAEDC0 80241480 1440003C */ bnez $v0, .L80241574 +/* BAEDC4 80241484 0000102D */ daddu $v0, $zero, $zero +/* BAEDC8 80241488 2402FFFB */ addiu $v0, $zero, -5 +/* BAEDCC 8024148C 00621024 */ and $v0, $v1, $v0 +/* BAEDD0 80241490 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241494: +/* BAEDD4 80241494 8E830070 */ lw $v1, 0x70($s4) +/* BAEDD8 80241498 2C62000F */ sltiu $v0, $v1, 0xf +/* BAEDDC 8024149C 10400034 */ beqz $v0, .L80241570 +/* BAEDE0 802414A0 00031080 */ sll $v0, $v1, 2 +/* BAEDE4 802414A4 3C018024 */ lui $at, 0x8024 +/* BAEDE8 802414A8 00220821 */ addu $at, $at, $v0 +/* BAEDEC 802414AC 8C2252B8 */ lw $v0, 0x52b8($at) +/* BAEDF0 802414B0 00400008 */ jr $v0 +/* BAEDF4 802414B4 00000000 */ nop +/* BAEDF8 802414B8 0280202D */ daddu $a0, $s4, $zero +/* BAEDFC 802414BC 0200282D */ daddu $a1, $s0, $zero +/* BAEE00 802414C0 0C090028 */ jal func_802400A0_BAD9E0 +/* BAEE04 802414C4 0260302D */ daddu $a2, $s3, $zero +/* BAEE08 802414C8 0280202D */ daddu $a0, $s4, $zero +/* BAEE0C 802414CC 0200282D */ daddu $a1, $s0, $zero +/* BAEE10 802414D0 0C090094 */ jal func_80240250_BADB90 +/* BAEE14 802414D4 0260302D */ daddu $a2, $s3, $zero +/* BAEE18 802414D8 0809055D */ j .L80241574 +/* BAEE1C 802414DC 0000102D */ daddu $v0, $zero, $zero +/* BAEE20 802414E0 0280202D */ daddu $a0, $s4, $zero +/* BAEE24 802414E4 0200282D */ daddu $a1, $s0, $zero +/* BAEE28 802414E8 0C09021E */ jal func_80240878_BAE1B8 +/* BAEE2C 802414EC 0260302D */ daddu $a2, $s3, $zero +/* BAEE30 802414F0 0280202D */ daddu $a0, $s4, $zero +/* BAEE34 802414F4 0200282D */ daddu $a1, $s0, $zero +/* BAEE38 802414F8 0C09024E */ jal func_80240938_BAE278 +/* BAEE3C 802414FC 0260302D */ daddu $a2, $s3, $zero +/* BAEE40 80241500 0809055D */ j .L80241574 +/* BAEE44 80241504 0000102D */ daddu $v0, $zero, $zero +/* BAEE48 80241508 0280202D */ daddu $a0, $s4, $zero +/* BAEE4C 8024150C 0200282D */ daddu $a1, $s0, $zero +/* BAEE50 80241510 0C09031F */ jal func_80240C7C_BAE5BC +/* BAEE54 80241514 0260302D */ daddu $a2, $s3, $zero +/* BAEE58 80241518 0280202D */ daddu $a0, $s4, $zero +/* BAEE5C 8024151C 0200282D */ daddu $a1, $s0, $zero +/* BAEE60 80241520 0C09033D */ jal func_80240CF4_BAE634 +/* BAEE64 80241524 0260302D */ daddu $a2, $s3, $zero +/* BAEE68 80241528 0809055D */ j .L80241574 +/* BAEE6C 8024152C 0000102D */ daddu $v0, $zero, $zero +/* BAEE70 80241530 0280202D */ daddu $a0, $s4, $zero +/* BAEE74 80241534 0200282D */ daddu $a1, $s0, $zero +/* BAEE78 80241538 0C090358 */ jal func_80240D60_BAE6A0 +/* BAEE7C 8024153C 0260302D */ daddu $a2, $s3, $zero +/* BAEE80 80241540 0809055D */ j .L80241574 +/* BAEE84 80241544 0000102D */ daddu $v0, $zero, $zero +/* BAEE88 80241548 0280202D */ daddu $a0, $s4, $zero +/* BAEE8C 8024154C 0200282D */ daddu $a1, $s0, $zero +/* BAEE90 80241550 0C0903A5 */ jal func_80240E94_BAE7D4 +/* BAEE94 80241554 0260302D */ daddu $a2, $s3, $zero +/* BAEE98 80241558 0809055D */ j .L80241574 +/* BAEE9C 8024155C 0000102D */ daddu $v0, $zero, $zero +/* BAEEA0 80241560 0280202D */ daddu $a0, $s4, $zero +/* BAEEA4 80241564 0200282D */ daddu $a1, $s0, $zero +/* BAEEA8 80241568 0C0903BE */ jal func_80240EF8_BAE838 +/* BAEEAC 8024156C 0260302D */ daddu $a2, $s3, $zero +.L80241570: +/* BAEEB0 80241570 0000102D */ daddu $v0, $zero, $zero +.L80241574: +/* BAEEB4 80241574 8FBF0048 */ lw $ra, 0x48($sp) +/* BAEEB8 80241578 8FB50044 */ lw $s5, 0x44($sp) +/* BAEEBC 8024157C 8FB40040 */ lw $s4, 0x40($sp) +/* BAEEC0 80241580 8FB3003C */ lw $s3, 0x3c($sp) +/* BAEEC4 80241584 8FB20038 */ lw $s2, 0x38($sp) +/* BAEEC8 80241588 8FB10034 */ lw $s1, 0x34($sp) +/* BAEECC 8024158C 8FB00030 */ lw $s0, 0x30($sp) +/* BAEED0 80241590 03E00008 */ jr $ra +/* BAEED4 80241594 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598.s deleted file mode 100644 index c2fdc3aeb6..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241598 -/* BAEED8 80241598 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAEEDC 8024159C AFB10014 */ sw $s1, 0x14($sp) -/* BAEEE0 802415A0 0080882D */ daddu $s1, $a0, $zero -/* BAEEE4 802415A4 AFBF0018 */ sw $ra, 0x18($sp) -/* BAEEE8 802415A8 AFB00010 */ sw $s0, 0x10($sp) -/* BAEEEC 802415AC 8E300148 */ lw $s0, 0x148($s1) -/* BAEEF0 802415B0 0C00EABB */ jal get_npc_unsafe -/* BAEEF4 802415B4 86040008 */ lh $a0, 8($s0) -/* BAEEF8 802415B8 24030001 */ addiu $v1, $zero, 1 -/* BAEEFC 802415BC 0040202D */ daddu $a0, $v0, $zero -/* BAEF00 802415C0 AE03006C */ sw $v1, 0x6c($s0) -/* BAEF04 802415C4 8482008C */ lh $v0, 0x8c($a0) -/* BAEF08 802415C8 14400009 */ bnez $v0, .L802415F0 -/* BAEF0C 802415CC 24020002 */ addiu $v0, $zero, 2 -/* BAEF10 802415D0 96030072 */ lhu $v1, 0x72($s0) -/* BAEF14 802415D4 AE02006C */ sw $v0, 0x6c($s0) -/* BAEF18 802415D8 A483008E */ sh $v1, 0x8e($a0) -/* BAEF1C 802415DC 8E0200CC */ lw $v0, 0xcc($s0) -/* BAEF20 802415E0 8C420020 */ lw $v0, 0x20($v0) -/* BAEF24 802415E4 AC820028 */ sw $v0, 0x28($a0) -/* BAEF28 802415E8 2402001F */ addiu $v0, $zero, 0x1f -/* BAEF2C 802415EC AE220070 */ sw $v0, 0x70($s1) -.L802415F0: -/* BAEF30 802415F0 8FBF0018 */ lw $ra, 0x18($sp) -/* BAEF34 802415F4 8FB10014 */ lw $s1, 0x14($sp) -/* BAEF38 802415F8 8FB00010 */ lw $s0, 0x10($sp) -/* BAEF3C 802415FC 03E00008 */ jr $ra -/* BAEF40 80241600 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598_BAEED8.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598_BAEED8.s new file mode 100644 index 0000000000..22460b9400 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241598_BAEED8.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241598_BAEED8 +/* BAEED8 80241598 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BAEEDC 8024159C AFB10014 */ sw $s1, 0x14($sp) +/* BAEEE0 802415A0 0080882D */ daddu $s1, $a0, $zero +/* BAEEE4 802415A4 AFBF0018 */ sw $ra, 0x18($sp) +/* BAEEE8 802415A8 AFB00010 */ sw $s0, 0x10($sp) +/* BAEEEC 802415AC 8E300148 */ lw $s0, 0x148($s1) +/* BAEEF0 802415B0 0C00EABB */ jal get_npc_unsafe +/* BAEEF4 802415B4 86040008 */ lh $a0, 8($s0) +/* BAEEF8 802415B8 24030001 */ addiu $v1, $zero, 1 +/* BAEEFC 802415BC 0040202D */ daddu $a0, $v0, $zero +/* BAEF00 802415C0 AE03006C */ sw $v1, 0x6c($s0) +/* BAEF04 802415C4 8482008C */ lh $v0, 0x8c($a0) +/* BAEF08 802415C8 14400009 */ bnez $v0, .L802415F0 +/* BAEF0C 802415CC 24020002 */ addiu $v0, $zero, 2 +/* BAEF10 802415D0 96030072 */ lhu $v1, 0x72($s0) +/* BAEF14 802415D4 AE02006C */ sw $v0, 0x6c($s0) +/* BAEF18 802415D8 A483008E */ sh $v1, 0x8e($a0) +/* BAEF1C 802415DC 8E0200CC */ lw $v0, 0xcc($s0) +/* BAEF20 802415E0 8C420020 */ lw $v0, 0x20($v0) +/* BAEF24 802415E4 AC820028 */ sw $v0, 0x28($a0) +/* BAEF28 802415E8 2402001F */ addiu $v0, $zero, 0x1f +/* BAEF2C 802415EC AE220070 */ sw $v0, 0x70($s1) +.L802415F0: +/* BAEF30 802415F0 8FBF0018 */ lw $ra, 0x18($sp) +/* BAEF34 802415F4 8FB10014 */ lw $s1, 0x14($sp) +/* BAEF38 802415F8 8FB00010 */ lw $s0, 0x10($sp) +/* BAEF3C 802415FC 03E00008 */ jr $ra +/* BAEF40 80241600 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604.s deleted file mode 100644 index 12c1f4b837..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241604 -/* BAEF44 80241604 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAEF48 80241608 AFB10014 */ sw $s1, 0x14($sp) -/* BAEF4C 8024160C 0080882D */ daddu $s1, $a0, $zero -/* BAEF50 80241610 AFBF0018 */ sw $ra, 0x18($sp) -/* BAEF54 80241614 AFB00010 */ sw $s0, 0x10($sp) -/* BAEF58 80241618 8E300148 */ lw $s0, 0x148($s1) -/* BAEF5C 8024161C 0C00EABB */ jal get_npc_unsafe -/* BAEF60 80241620 86040008 */ lh $a0, 8($s0) -/* BAEF64 80241624 0040202D */ daddu $a0, $v0, $zero -/* BAEF68 80241628 9482008E */ lhu $v0, 0x8e($a0) -/* BAEF6C 8024162C 2442FFFF */ addiu $v0, $v0, -1 -/* BAEF70 80241630 A482008E */ sh $v0, 0x8e($a0) -/* BAEF74 80241634 00021400 */ sll $v0, $v0, 0x10 -/* BAEF78 80241638 1C400009 */ bgtz $v0, .L80241660 -/* BAEF7C 8024163C 24020003 */ addiu $v0, $zero, 3 -/* BAEF80 80241640 96030076 */ lhu $v1, 0x76($s0) -/* BAEF84 80241644 AE02006C */ sw $v0, 0x6c($s0) -/* BAEF88 80241648 A483008E */ sh $v1, 0x8e($a0) -/* BAEF8C 8024164C 8E0200CC */ lw $v0, 0xcc($s0) -/* BAEF90 80241650 8C420024 */ lw $v0, 0x24($v0) -/* BAEF94 80241654 AC820028 */ sw $v0, 0x28($a0) -/* BAEF98 80241658 24020020 */ addiu $v0, $zero, 0x20 -/* BAEF9C 8024165C AE220070 */ sw $v0, 0x70($s1) -.L80241660: -/* BAEFA0 80241660 8FBF0018 */ lw $ra, 0x18($sp) -/* BAEFA4 80241664 8FB10014 */ lw $s1, 0x14($sp) -/* BAEFA8 80241668 8FB00010 */ lw $s0, 0x10($sp) -/* BAEFAC 8024166C 03E00008 */ jr $ra -/* BAEFB0 80241670 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s new file mode 100644 index 0000000000..41adc3eca9 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241604_BAEF44.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241604_BAEF44 +/* BAEF44 80241604 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BAEF48 80241608 AFB10014 */ sw $s1, 0x14($sp) +/* BAEF4C 8024160C 0080882D */ daddu $s1, $a0, $zero +/* BAEF50 80241610 AFBF0018 */ sw $ra, 0x18($sp) +/* BAEF54 80241614 AFB00010 */ sw $s0, 0x10($sp) +/* BAEF58 80241618 8E300148 */ lw $s0, 0x148($s1) +/* BAEF5C 8024161C 0C00EABB */ jal get_npc_unsafe +/* BAEF60 80241620 86040008 */ lh $a0, 8($s0) +/* BAEF64 80241624 0040202D */ daddu $a0, $v0, $zero +/* BAEF68 80241628 9482008E */ lhu $v0, 0x8e($a0) +/* BAEF6C 8024162C 2442FFFF */ addiu $v0, $v0, -1 +/* BAEF70 80241630 A482008E */ sh $v0, 0x8e($a0) +/* BAEF74 80241634 00021400 */ sll $v0, $v0, 0x10 +/* BAEF78 80241638 1C400009 */ bgtz $v0, .L80241660 +/* BAEF7C 8024163C 24020003 */ addiu $v0, $zero, 3 +/* BAEF80 80241640 96030076 */ lhu $v1, 0x76($s0) +/* BAEF84 80241644 AE02006C */ sw $v0, 0x6c($s0) +/* BAEF88 80241648 A483008E */ sh $v1, 0x8e($a0) +/* BAEF8C 8024164C 8E0200CC */ lw $v0, 0xcc($s0) +/* BAEF90 80241650 8C420024 */ lw $v0, 0x24($v0) +/* BAEF94 80241654 AC820028 */ sw $v0, 0x28($a0) +/* BAEF98 80241658 24020020 */ addiu $v0, $zero, 0x20 +/* BAEF9C 8024165C AE220070 */ sw $v0, 0x70($s1) +.L80241660: +/* BAEFA0 80241660 8FBF0018 */ lw $ra, 0x18($sp) +/* BAEFA4 80241664 8FB10014 */ lw $s1, 0x14($sp) +/* BAEFA8 80241668 8FB00010 */ lw $s0, 0x10($sp) +/* BAEFAC 8024166C 03E00008 */ jr $ra +/* BAEFB0 80241670 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674.s deleted file mode 100644 index 52dc075fa6..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241674 -/* BAEFB4 80241674 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BAEFB8 80241678 AFB10034 */ sw $s1, 0x34($sp) -/* BAEFBC 8024167C 0080882D */ daddu $s1, $a0, $zero -/* BAEFC0 80241680 AFBF0038 */ sw $ra, 0x38($sp) -/* BAEFC4 80241684 AFB00030 */ sw $s0, 0x30($sp) -/* BAEFC8 80241688 8E300148 */ lw $s0, 0x148($s1) -/* BAEFCC 8024168C 0C00EABB */ jal get_npc_unsafe -/* BAEFD0 80241690 86040008 */ lh $a0, 8($s0) -/* BAEFD4 80241694 0040282D */ daddu $a1, $v0, $zero -/* BAEFD8 80241698 94A2008E */ lhu $v0, 0x8e($a1) -/* BAEFDC 8024169C 2442FFFF */ addiu $v0, $v0, -1 -/* BAEFE0 802416A0 A4A2008E */ sh $v0, 0x8e($a1) -/* BAEFE4 802416A4 00021400 */ sll $v0, $v0, 0x10 -/* BAEFE8 802416A8 1C400023 */ bgtz $v0, .L80241738 -/* BAEFEC 802416AC 24020004 */ addiu $v0, $zero, 4 -/* BAEFF0 802416B0 8E0300CC */ lw $v1, 0xcc($s0) -/* BAEFF4 802416B4 AE02006C */ sw $v0, 0x6c($s0) -/* BAEFF8 802416B8 8C620000 */ lw $v0, ($v1) -/* BAEFFC 802416BC ACA20028 */ sw $v0, 0x28($a1) -/* BAF000 802416C0 9602007A */ lhu $v0, 0x7a($s0) -/* BAF004 802416C4 A4A2008E */ sh $v0, 0x8e($a1) -/* BAF008 802416C8 8E020078 */ lw $v0, 0x78($s0) -/* BAF00C 802416CC 28420008 */ slti $v0, $v0, 8 -/* BAF010 802416D0 14400018 */ bnez $v0, .L80241734 -/* BAF014 802416D4 24020021 */ addiu $v0, $zero, 0x21 -/* BAF018 802416D8 24040003 */ addiu $a0, $zero, 3 -/* BAF01C 802416DC 27A30028 */ addiu $v1, $sp, 0x28 -/* BAF020 802416E0 84A700A8 */ lh $a3, 0xa8($a1) -/* BAF024 802416E4 3C013F80 */ lui $at, 0x3f80 -/* BAF028 802416E8 44810000 */ mtc1 $at, $f0 -/* BAF02C 802416EC 3C014000 */ lui $at, 0x4000 -/* BAF030 802416F0 44811000 */ mtc1 $at, $f2 -/* BAF034 802416F4 3C01C1A0 */ lui $at, 0xc1a0 -/* BAF038 802416F8 44812000 */ mtc1 $at, $f4 -/* BAF03C 802416FC 44873000 */ mtc1 $a3, $f6 -/* BAF040 80241700 00000000 */ nop -/* BAF044 80241704 468031A0 */ cvt.s.w $f6, $f6 -/* BAF048 80241708 E7A00010 */ swc1 $f0, 0x10($sp) -/* BAF04C 8024170C E7A20014 */ swc1 $f2, 0x14($sp) -/* BAF050 80241710 E7A40018 */ swc1 $f4, 0x18($sp) -/* BAF054 80241714 8E020078 */ lw $v0, 0x78($s0) -/* BAF058 80241718 44073000 */ mfc1 $a3, $f6 -/* BAF05C 8024171C 0000302D */ daddu $a2, $zero, $zero -/* BAF060 80241720 AFA30020 */ sw $v1, 0x20($sp) -/* BAF064 80241724 2442FFFF */ addiu $v0, $v0, -1 -/* BAF068 80241728 0C01BFA4 */ jal fx_emote -/* BAF06C 8024172C AFA2001C */ sw $v0, 0x1c($sp) -/* BAF070 80241730 24020021 */ addiu $v0, $zero, 0x21 -.L80241734: -/* BAF074 80241734 AE220070 */ sw $v0, 0x70($s1) -.L80241738: -/* BAF078 80241738 8FBF0038 */ lw $ra, 0x38($sp) -/* BAF07C 8024173C 8FB10034 */ lw $s1, 0x34($sp) -/* BAF080 80241740 8FB00030 */ lw $s0, 0x30($sp) -/* BAF084 80241744 03E00008 */ jr $ra -/* BAF088 80241748 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s new file mode 100644 index 0000000000..fee0da3bf1 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241674_BAEFB4.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241674_BAEFB4 +/* BAEFB4 80241674 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* BAEFB8 80241678 AFB10034 */ sw $s1, 0x34($sp) +/* BAEFBC 8024167C 0080882D */ daddu $s1, $a0, $zero +/* BAEFC0 80241680 AFBF0038 */ sw $ra, 0x38($sp) +/* BAEFC4 80241684 AFB00030 */ sw $s0, 0x30($sp) +/* BAEFC8 80241688 8E300148 */ lw $s0, 0x148($s1) +/* BAEFCC 8024168C 0C00EABB */ jal get_npc_unsafe +/* BAEFD0 80241690 86040008 */ lh $a0, 8($s0) +/* BAEFD4 80241694 0040282D */ daddu $a1, $v0, $zero +/* BAEFD8 80241698 94A2008E */ lhu $v0, 0x8e($a1) +/* BAEFDC 8024169C 2442FFFF */ addiu $v0, $v0, -1 +/* BAEFE0 802416A0 A4A2008E */ sh $v0, 0x8e($a1) +/* BAEFE4 802416A4 00021400 */ sll $v0, $v0, 0x10 +/* BAEFE8 802416A8 1C400023 */ bgtz $v0, .L80241738 +/* BAEFEC 802416AC 24020004 */ addiu $v0, $zero, 4 +/* BAEFF0 802416B0 8E0300CC */ lw $v1, 0xcc($s0) +/* BAEFF4 802416B4 AE02006C */ sw $v0, 0x6c($s0) +/* BAEFF8 802416B8 8C620000 */ lw $v0, ($v1) +/* BAEFFC 802416BC ACA20028 */ sw $v0, 0x28($a1) +/* BAF000 802416C0 9602007A */ lhu $v0, 0x7a($s0) +/* BAF004 802416C4 A4A2008E */ sh $v0, 0x8e($a1) +/* BAF008 802416C8 8E020078 */ lw $v0, 0x78($s0) +/* BAF00C 802416CC 28420008 */ slti $v0, $v0, 8 +/* BAF010 802416D0 14400018 */ bnez $v0, .L80241734 +/* BAF014 802416D4 24020021 */ addiu $v0, $zero, 0x21 +/* BAF018 802416D8 24040003 */ addiu $a0, $zero, 3 +/* BAF01C 802416DC 27A30028 */ addiu $v1, $sp, 0x28 +/* BAF020 802416E0 84A700A8 */ lh $a3, 0xa8($a1) +/* BAF024 802416E4 3C013F80 */ lui $at, 0x3f80 +/* BAF028 802416E8 44810000 */ mtc1 $at, $f0 +/* BAF02C 802416EC 3C014000 */ lui $at, 0x4000 +/* BAF030 802416F0 44811000 */ mtc1 $at, $f2 +/* BAF034 802416F4 3C01C1A0 */ lui $at, 0xc1a0 +/* BAF038 802416F8 44812000 */ mtc1 $at, $f4 +/* BAF03C 802416FC 44873000 */ mtc1 $a3, $f6 +/* BAF040 80241700 00000000 */ nop +/* BAF044 80241704 468031A0 */ cvt.s.w $f6, $f6 +/* BAF048 80241708 E7A00010 */ swc1 $f0, 0x10($sp) +/* BAF04C 8024170C E7A20014 */ swc1 $f2, 0x14($sp) +/* BAF050 80241710 E7A40018 */ swc1 $f4, 0x18($sp) +/* BAF054 80241714 8E020078 */ lw $v0, 0x78($s0) +/* BAF058 80241718 44073000 */ mfc1 $a3, $f6 +/* BAF05C 8024171C 0000302D */ daddu $a2, $zero, $zero +/* BAF060 80241720 AFA30020 */ sw $v1, 0x20($sp) +/* BAF064 80241724 2442FFFF */ addiu $v0, $v0, -1 +/* BAF068 80241728 0C01BFA4 */ jal fx_emote +/* BAF06C 8024172C AFA2001C */ sw $v0, 0x1c($sp) +/* BAF070 80241730 24020021 */ addiu $v0, $zero, 0x21 +.L80241734: +/* BAF074 80241734 AE220070 */ sw $v0, 0x70($s1) +.L80241738: +/* BAF078 80241738 8FBF0038 */ lw $ra, 0x38($sp) +/* BAF07C 8024173C 8FB10034 */ lw $s1, 0x34($sp) +/* BAF080 80241740 8FB00030 */ lw $s0, 0x30($sp) +/* BAF084 80241744 03E00008 */ jr $ra +/* BAF088 80241748 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954.s deleted file mode 100644 index d44e1a50d4..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241954 -/* BAF294 80241954 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BAF298 80241958 AFB40028 */ sw $s4, 0x28($sp) -/* BAF29C 8024195C 0080A02D */ daddu $s4, $a0, $zero -/* BAF2A0 80241960 AFBF002C */ sw $ra, 0x2c($sp) -/* BAF2A4 80241964 AFB30024 */ sw $s3, 0x24($sp) -/* BAF2A8 80241968 AFB20020 */ sw $s2, 0x20($sp) -/* BAF2AC 8024196C AFB1001C */ sw $s1, 0x1c($sp) -/* BAF2B0 80241970 AFB00018 */ sw $s0, 0x18($sp) -/* BAF2B4 80241974 8E910148 */ lw $s1, 0x148($s4) -/* BAF2B8 80241978 86240008 */ lh $a0, 8($s1) -/* BAF2BC 8024197C 0C00EABB */ jal get_npc_unsafe -/* BAF2C0 80241980 00A0802D */ daddu $s0, $a1, $zero -/* BAF2C4 80241984 16000005 */ bnez $s0, .L8024199C -/* BAF2C8 80241988 0040902D */ daddu $s2, $v0, $zero -/* BAF2CC 8024198C 8E2200B0 */ lw $v0, 0xb0($s1) -/* BAF2D0 80241990 30420004 */ andi $v0, $v0, 4 -/* BAF2D4 80241994 10400015 */ beqz $v0, .L802419EC -/* BAF2D8 80241998 00000000 */ nop -.L8024199C: -/* BAF2DC 8024199C AE800070 */ sw $zero, 0x70($s4) -/* BAF2E0 802419A0 8E420000 */ lw $v0, ($s2) -/* BAF2E4 802419A4 3C031F30 */ lui $v1, 0x1f30 -/* BAF2E8 802419A8 A640008E */ sh $zero, 0x8e($s2) -/* BAF2EC 802419AC 34420102 */ ori $v0, $v0, 0x102 -/* BAF2F0 802419B0 AE420000 */ sw $v0, ($s2) -/* BAF2F4 802419B4 8E220000 */ lw $v0, ($s1) -/* BAF2F8 802419B8 3C01C47A */ lui $at, 0xc47a -/* BAF2FC 802419BC 44810000 */ mtc1 $at, $f0 -/* BAF300 802419C0 00431025 */ or $v0, $v0, $v1 -/* BAF304 802419C4 AE220000 */ sw $v0, ($s1) -/* BAF308 802419C8 AE400038 */ sw $zero, 0x38($s2) -/* BAF30C 802419CC E640003C */ swc1 $f0, 0x3c($s2) -/* BAF310 802419D0 AE400040 */ sw $zero, 0x40($s2) -/* BAF314 802419D4 8E2300B0 */ lw $v1, 0xb0($s1) -/* BAF318 802419D8 30620004 */ andi $v0, $v1, 4 -/* BAF31C 802419DC 10400003 */ beqz $v0, .L802419EC -/* BAF320 802419E0 2402FFFB */ addiu $v0, $zero, -5 -/* BAF324 802419E4 00621024 */ and $v0, $v1, $v0 -/* BAF328 802419E8 AE2200B0 */ sw $v0, 0xb0($s1) -.L802419EC: -/* BAF32C 802419EC 8E930070 */ lw $s3, 0x70($s4) -/* BAF330 802419F0 12600005 */ beqz $s3, .L80241A08 -/* BAF334 802419F4 24020001 */ addiu $v0, $zero, 1 -/* BAF338 802419F8 12620048 */ beq $s3, $v0, .L80241B1C -/* BAF33C 802419FC 00000000 */ nop -/* BAF340 80241A00 080906E4 */ j .L80241B90 -/* BAF344 80241A04 00000000 */ nop -.L80241A08: -/* BAF348 80241A08 86240008 */ lh $a0, 8($s1) -/* BAF34C 80241A0C 0C00FB3A */ jal get_enemy -/* BAF350 80241A10 2484FFFF */ addiu $a0, $a0, -1 -/* BAF354 80241A14 0040802D */ daddu $s0, $v0, $zero -/* BAF358 80241A18 0C00EABB */ jal get_npc_unsafe -/* BAF35C 80241A1C 86040008 */ lh $a0, 8($s0) -/* BAF360 80241A20 24030001 */ addiu $v1, $zero, 1 -/* BAF364 80241A24 0040982D */ daddu $s3, $v0, $zero -/* BAF368 80241A28 A2230007 */ sb $v1, 7($s1) -/* BAF36C 80241A2C 8E03006C */ lw $v1, 0x6c($s0) -/* BAF370 80241A30 24020003 */ addiu $v0, $zero, 3 -/* BAF374 80241A34 14620056 */ bne $v1, $v0, .L80241B90 -/* BAF378 80241A38 00000000 */ nop -/* BAF37C 80241A3C 8E2500A8 */ lw $a1, 0xa8($s1) -/* BAF380 80241A40 10A00003 */ beqz $a1, .L80241A50 -/* BAF384 80241A44 0260202D */ daddu $a0, $s3, $zero -/* BAF388 80241A48 0C012530 */ jal func_800494C0 -/* BAF38C 80241A4C 0000302D */ daddu $a2, $zero, $zero -.L80241A50: -/* BAF390 80241A50 27A40010 */ addiu $a0, $sp, 0x10 -/* BAF394 80241A54 C6280070 */ lwc1 $f8, 0x70($s1) -/* BAF398 80241A58 46804220 */ cvt.s.w $f8, $f8 -/* BAF39C 80241A5C C6620034 */ lwc1 $f2, 0x34($s3) -/* BAF3A0 80241A60 3C014387 */ lui $at, 0x4387 -/* BAF3A4 80241A64 44810000 */ mtc1 $at, $f0 -/* BAF3A8 80241A68 44064000 */ mfc1 $a2, $f8 -/* BAF3AC 80241A6C 46020001 */ sub.s $f0, $f0, $f2 -/* BAF3B0 80241A70 C6660038 */ lwc1 $f6, 0x38($s3) -/* BAF3B4 80241A74 C6640040 */ lwc1 $f4, 0x40($s3) -/* BAF3B8 80241A78 44070000 */ mfc1 $a3, $f0 -/* BAF3BC 80241A7C 27A50014 */ addiu $a1, $sp, 0x14 -/* BAF3C0 80241A80 E7A60010 */ swc1 $f6, 0x10($sp) -/* BAF3C4 80241A84 0C00A7E7 */ jal add_vec2D_polar -/* BAF3C8 80241A88 E7A40014 */ swc1 $f4, 0x14($sp) -/* BAF3CC 80241A8C C7A00010 */ lwc1 $f0, 0x10($sp) -/* BAF3D0 80241A90 4600020D */ trunc.w.s $f8, $f0 -/* BAF3D4 80241A94 44024000 */ mfc1 $v0, $f8 -/* BAF3D8 80241A98 E6400038 */ swc1 $f0, 0x38($s2) -/* BAF3DC 80241A9C A6220010 */ sh $v0, 0x10($s1) -/* BAF3E0 80241AA0 C660003C */ lwc1 $f0, 0x3c($s3) -/* BAF3E4 80241AA4 C622006C */ lwc1 $f2, 0x6c($s1) -/* BAF3E8 80241AA8 468010A0 */ cvt.s.w $f2, $f2 -/* BAF3EC 80241AAC 46020000 */ add.s $f0, $f0, $f2 -/* BAF3F0 80241AB0 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) -/* BAF3F4 80241AB4 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) -/* BAF3F8 80241AB8 E640003C */ swc1 $f0, 0x3c($s2) -/* BAF3FC 80241ABC C7A20014 */ lwc1 $f2, 0x14($sp) -/* BAF400 80241AC0 4600020D */ trunc.w.s $f8, $f0 -/* BAF404 80241AC4 44024000 */ mfc1 $v0, $f8 -/* BAF408 80241AC8 00000000 */ nop -/* BAF40C 80241ACC A6220012 */ sh $v0, 0x12($s1) -/* BAF410 80241AD0 4600120D */ trunc.w.s $f8, $f2 -/* BAF414 80241AD4 44024000 */ mfc1 $v0, $f8 -/* BAF418 80241AD8 E6420040 */ swc1 $f2, 0x40($s2) -/* BAF41C 80241ADC A6220014 */ sh $v0, 0x14($s1) -/* BAF420 80241AE0 8C660028 */ lw $a2, 0x28($v1) -/* BAF424 80241AE4 8C670030 */ lw $a3, 0x30($v1) -/* BAF428 80241AE8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* BAF42C 80241AEC 0C00A720 */ jal atan2 -/* BAF430 80241AF0 C64E0040 */ lwc1 $f14, 0x40($s2) -/* BAF434 80241AF4 3C03E0EF */ lui $v1, 0xe0ef -/* BAF438 80241AF8 E640000C */ swc1 $f0, 0xc($s2) -/* BAF43C 80241AFC 8E220000 */ lw $v0, ($s1) -/* BAF440 80241B00 3463FFFF */ ori $v1, $v1, 0xffff -/* BAF444 80241B04 00431024 */ and $v0, $v0, $v1 -/* BAF448 80241B08 AE220000 */ sw $v0, ($s1) -/* BAF44C 80241B0C 24020001 */ addiu $v0, $zero, 1 -/* BAF450 80241B10 A640008E */ sh $zero, 0x8e($s2) -/* BAF454 80241B14 080906E4 */ j .L80241B90 -/* BAF458 80241B18 AE820070 */ sw $v0, 0x70($s4) -.L80241B1C: -/* BAF45C 80241B1C 86240008 */ lh $a0, 8($s1) -/* BAF460 80241B20 0C00FB3A */ jal get_enemy -/* BAF464 80241B24 2484FFFF */ addiu $a0, $a0, -1 -/* BAF468 80241B28 0040802D */ daddu $s0, $v0, $zero -/* BAF46C 80241B2C 0C00EABB */ jal get_npc_unsafe -/* BAF470 80241B30 86040008 */ lh $a0, 8($s0) -/* BAF474 80241B34 9642008E */ lhu $v0, 0x8e($s2) -/* BAF478 80241B38 24420001 */ addiu $v0, $v0, 1 -/* BAF47C 80241B3C A642008E */ sh $v0, 0x8e($s2) -/* BAF480 80241B40 00021400 */ sll $v0, $v0, 0x10 -/* BAF484 80241B44 8E23007C */ lw $v1, 0x7c($s1) -/* BAF488 80241B48 00021403 */ sra $v0, $v0, 0x10 -/* BAF48C 80241B4C 0043102A */ slt $v0, $v0, $v1 -/* BAF490 80241B50 50400001 */ beql $v0, $zero, .L80241B58 -/* BAF494 80241B54 A2200007 */ sb $zero, 7($s1) -.L80241B58: -/* BAF498 80241B58 8E03006C */ lw $v1, 0x6c($s0) -/* BAF49C 80241B5C 24020004 */ addiu $v0, $zero, 4 -/* BAF4A0 80241B60 1462000B */ bne $v1, $v0, .L80241B90 -/* BAF4A4 80241B64 3C021F10 */ lui $v0, 0x1f10 -/* BAF4A8 80241B68 8E230000 */ lw $v1, ($s1) -/* BAF4AC 80241B6C 3C01C47A */ lui $at, 0xc47a -/* BAF4B0 80241B70 44810000 */ mtc1 $at, $f0 -/* BAF4B4 80241B74 00621825 */ or $v1, $v1, $v0 -/* BAF4B8 80241B78 AE230000 */ sw $v1, ($s1) -/* BAF4BC 80241B7C AE400038 */ sw $zero, 0x38($s2) -/* BAF4C0 80241B80 E640003C */ swc1 $f0, 0x3c($s2) -/* BAF4C4 80241B84 AE400040 */ sw $zero, 0x40($s2) -/* BAF4C8 80241B88 A2330007 */ sb $s3, 7($s1) -/* BAF4CC 80241B8C AE800070 */ sw $zero, 0x70($s4) -.L80241B90: -/* BAF4D0 80241B90 8FBF002C */ lw $ra, 0x2c($sp) -/* BAF4D4 80241B94 8FB40028 */ lw $s4, 0x28($sp) -/* BAF4D8 80241B98 8FB30024 */ lw $s3, 0x24($sp) -/* BAF4DC 80241B9C 8FB20020 */ lw $s2, 0x20($sp) -/* BAF4E0 80241BA0 8FB1001C */ lw $s1, 0x1c($sp) -/* BAF4E4 80241BA4 8FB00018 */ lw $s0, 0x18($sp) -/* BAF4E8 80241BA8 0000102D */ daddu $v0, $zero, $zero -/* BAF4EC 80241BAC 03E00008 */ jr $ra -/* BAF4F0 80241BB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s new file mode 100644 index 0000000000..7c84c8c3ad --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241954_BAF294.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241954_BAF294 +/* BAF294 80241954 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* BAF298 80241958 AFB40028 */ sw $s4, 0x28($sp) +/* BAF29C 8024195C 0080A02D */ daddu $s4, $a0, $zero +/* BAF2A0 80241960 AFBF002C */ sw $ra, 0x2c($sp) +/* BAF2A4 80241964 AFB30024 */ sw $s3, 0x24($sp) +/* BAF2A8 80241968 AFB20020 */ sw $s2, 0x20($sp) +/* BAF2AC 8024196C AFB1001C */ sw $s1, 0x1c($sp) +/* BAF2B0 80241970 AFB00018 */ sw $s0, 0x18($sp) +/* BAF2B4 80241974 8E910148 */ lw $s1, 0x148($s4) +/* BAF2B8 80241978 86240008 */ lh $a0, 8($s1) +/* BAF2BC 8024197C 0C00EABB */ jal get_npc_unsafe +/* BAF2C0 80241980 00A0802D */ daddu $s0, $a1, $zero +/* BAF2C4 80241984 16000005 */ bnez $s0, .L8024199C +/* BAF2C8 80241988 0040902D */ daddu $s2, $v0, $zero +/* BAF2CC 8024198C 8E2200B0 */ lw $v0, 0xb0($s1) +/* BAF2D0 80241990 30420004 */ andi $v0, $v0, 4 +/* BAF2D4 80241994 10400015 */ beqz $v0, .L802419EC +/* BAF2D8 80241998 00000000 */ nop +.L8024199C: +/* BAF2DC 8024199C AE800070 */ sw $zero, 0x70($s4) +/* BAF2E0 802419A0 8E420000 */ lw $v0, ($s2) +/* BAF2E4 802419A4 3C031F30 */ lui $v1, 0x1f30 +/* BAF2E8 802419A8 A640008E */ sh $zero, 0x8e($s2) +/* BAF2EC 802419AC 34420102 */ ori $v0, $v0, 0x102 +/* BAF2F0 802419B0 AE420000 */ sw $v0, ($s2) +/* BAF2F4 802419B4 8E220000 */ lw $v0, ($s1) +/* BAF2F8 802419B8 3C01C47A */ lui $at, 0xc47a +/* BAF2FC 802419BC 44810000 */ mtc1 $at, $f0 +/* BAF300 802419C0 00431025 */ or $v0, $v0, $v1 +/* BAF304 802419C4 AE220000 */ sw $v0, ($s1) +/* BAF308 802419C8 AE400038 */ sw $zero, 0x38($s2) +/* BAF30C 802419CC E640003C */ swc1 $f0, 0x3c($s2) +/* BAF310 802419D0 AE400040 */ sw $zero, 0x40($s2) +/* BAF314 802419D4 8E2300B0 */ lw $v1, 0xb0($s1) +/* BAF318 802419D8 30620004 */ andi $v0, $v1, 4 +/* BAF31C 802419DC 10400003 */ beqz $v0, .L802419EC +/* BAF320 802419E0 2402FFFB */ addiu $v0, $zero, -5 +/* BAF324 802419E4 00621024 */ and $v0, $v1, $v0 +/* BAF328 802419E8 AE2200B0 */ sw $v0, 0xb0($s1) +.L802419EC: +/* BAF32C 802419EC 8E930070 */ lw $s3, 0x70($s4) +/* BAF330 802419F0 12600005 */ beqz $s3, .L80241A08 +/* BAF334 802419F4 24020001 */ addiu $v0, $zero, 1 +/* BAF338 802419F8 12620048 */ beq $s3, $v0, .L80241B1C +/* BAF33C 802419FC 00000000 */ nop +/* BAF340 80241A00 080906E4 */ j .L80241B90 +/* BAF344 80241A04 00000000 */ nop +.L80241A08: +/* BAF348 80241A08 86240008 */ lh $a0, 8($s1) +/* BAF34C 80241A0C 0C00FB3A */ jal get_enemy +/* BAF350 80241A10 2484FFFF */ addiu $a0, $a0, -1 +/* BAF354 80241A14 0040802D */ daddu $s0, $v0, $zero +/* BAF358 80241A18 0C00EABB */ jal get_npc_unsafe +/* BAF35C 80241A1C 86040008 */ lh $a0, 8($s0) +/* BAF360 80241A20 24030001 */ addiu $v1, $zero, 1 +/* BAF364 80241A24 0040982D */ daddu $s3, $v0, $zero +/* BAF368 80241A28 A2230007 */ sb $v1, 7($s1) +/* BAF36C 80241A2C 8E03006C */ lw $v1, 0x6c($s0) +/* BAF370 80241A30 24020003 */ addiu $v0, $zero, 3 +/* BAF374 80241A34 14620056 */ bne $v1, $v0, .L80241B90 +/* BAF378 80241A38 00000000 */ nop +/* BAF37C 80241A3C 8E2500A8 */ lw $a1, 0xa8($s1) +/* BAF380 80241A40 10A00003 */ beqz $a1, .L80241A50 +/* BAF384 80241A44 0260202D */ daddu $a0, $s3, $zero +/* BAF388 80241A48 0C012530 */ jal func_800494C0 +/* BAF38C 80241A4C 0000302D */ daddu $a2, $zero, $zero +.L80241A50: +/* BAF390 80241A50 27A40010 */ addiu $a0, $sp, 0x10 +/* BAF394 80241A54 C6280070 */ lwc1 $f8, 0x70($s1) +/* BAF398 80241A58 46804220 */ cvt.s.w $f8, $f8 +/* BAF39C 80241A5C C6620034 */ lwc1 $f2, 0x34($s3) +/* BAF3A0 80241A60 3C014387 */ lui $at, 0x4387 +/* BAF3A4 80241A64 44810000 */ mtc1 $at, $f0 +/* BAF3A8 80241A68 44064000 */ mfc1 $a2, $f8 +/* BAF3AC 80241A6C 46020001 */ sub.s $f0, $f0, $f2 +/* BAF3B0 80241A70 C6660038 */ lwc1 $f6, 0x38($s3) +/* BAF3B4 80241A74 C6640040 */ lwc1 $f4, 0x40($s3) +/* BAF3B8 80241A78 44070000 */ mfc1 $a3, $f0 +/* BAF3BC 80241A7C 27A50014 */ addiu $a1, $sp, 0x14 +/* BAF3C0 80241A80 E7A60010 */ swc1 $f6, 0x10($sp) +/* BAF3C4 80241A84 0C00A7E7 */ jal add_vec2D_polar +/* BAF3C8 80241A88 E7A40014 */ swc1 $f4, 0x14($sp) +/* BAF3CC 80241A8C C7A00010 */ lwc1 $f0, 0x10($sp) +/* BAF3D0 80241A90 4600020D */ trunc.w.s $f8, $f0 +/* BAF3D4 80241A94 44024000 */ mfc1 $v0, $f8 +/* BAF3D8 80241A98 E6400038 */ swc1 $f0, 0x38($s2) +/* BAF3DC 80241A9C A6220010 */ sh $v0, 0x10($s1) +/* BAF3E0 80241AA0 C660003C */ lwc1 $f0, 0x3c($s3) +/* BAF3E4 80241AA4 C622006C */ lwc1 $f2, 0x6c($s1) +/* BAF3E8 80241AA8 468010A0 */ cvt.s.w $f2, $f2 +/* BAF3EC 80241AAC 46020000 */ add.s $f0, $f0, $f2 +/* BAF3F0 80241AB0 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) +/* BAF3F4 80241AB4 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) +/* BAF3F8 80241AB8 E640003C */ swc1 $f0, 0x3c($s2) +/* BAF3FC 80241ABC C7A20014 */ lwc1 $f2, 0x14($sp) +/* BAF400 80241AC0 4600020D */ trunc.w.s $f8, $f0 +/* BAF404 80241AC4 44024000 */ mfc1 $v0, $f8 +/* BAF408 80241AC8 00000000 */ nop +/* BAF40C 80241ACC A6220012 */ sh $v0, 0x12($s1) +/* BAF410 80241AD0 4600120D */ trunc.w.s $f8, $f2 +/* BAF414 80241AD4 44024000 */ mfc1 $v0, $f8 +/* BAF418 80241AD8 E6420040 */ swc1 $f2, 0x40($s2) +/* BAF41C 80241ADC A6220014 */ sh $v0, 0x14($s1) +/* BAF420 80241AE0 8C660028 */ lw $a2, 0x28($v1) +/* BAF424 80241AE4 8C670030 */ lw $a3, 0x30($v1) +/* BAF428 80241AE8 C64C0038 */ lwc1 $f12, 0x38($s2) +/* BAF42C 80241AEC 0C00A720 */ jal atan2 +/* BAF430 80241AF0 C64E0040 */ lwc1 $f14, 0x40($s2) +/* BAF434 80241AF4 3C03E0EF */ lui $v1, 0xe0ef +/* BAF438 80241AF8 E640000C */ swc1 $f0, 0xc($s2) +/* BAF43C 80241AFC 8E220000 */ lw $v0, ($s1) +/* BAF440 80241B00 3463FFFF */ ori $v1, $v1, 0xffff +/* BAF444 80241B04 00431024 */ and $v0, $v0, $v1 +/* BAF448 80241B08 AE220000 */ sw $v0, ($s1) +/* BAF44C 80241B0C 24020001 */ addiu $v0, $zero, 1 +/* BAF450 80241B10 A640008E */ sh $zero, 0x8e($s2) +/* BAF454 80241B14 080906E4 */ j .L80241B90 +/* BAF458 80241B18 AE820070 */ sw $v0, 0x70($s4) +.L80241B1C: +/* BAF45C 80241B1C 86240008 */ lh $a0, 8($s1) +/* BAF460 80241B20 0C00FB3A */ jal get_enemy +/* BAF464 80241B24 2484FFFF */ addiu $a0, $a0, -1 +/* BAF468 80241B28 0040802D */ daddu $s0, $v0, $zero +/* BAF46C 80241B2C 0C00EABB */ jal get_npc_unsafe +/* BAF470 80241B30 86040008 */ lh $a0, 8($s0) +/* BAF474 80241B34 9642008E */ lhu $v0, 0x8e($s2) +/* BAF478 80241B38 24420001 */ addiu $v0, $v0, 1 +/* BAF47C 80241B3C A642008E */ sh $v0, 0x8e($s2) +/* BAF480 80241B40 00021400 */ sll $v0, $v0, 0x10 +/* BAF484 80241B44 8E23007C */ lw $v1, 0x7c($s1) +/* BAF488 80241B48 00021403 */ sra $v0, $v0, 0x10 +/* BAF48C 80241B4C 0043102A */ slt $v0, $v0, $v1 +/* BAF490 80241B50 50400001 */ beql $v0, $zero, .L80241B58 +/* BAF494 80241B54 A2200007 */ sb $zero, 7($s1) +.L80241B58: +/* BAF498 80241B58 8E03006C */ lw $v1, 0x6c($s0) +/* BAF49C 80241B5C 24020004 */ addiu $v0, $zero, 4 +/* BAF4A0 80241B60 1462000B */ bne $v1, $v0, .L80241B90 +/* BAF4A4 80241B64 3C021F10 */ lui $v0, 0x1f10 +/* BAF4A8 80241B68 8E230000 */ lw $v1, ($s1) +/* BAF4AC 80241B6C 3C01C47A */ lui $at, 0xc47a +/* BAF4B0 80241B70 44810000 */ mtc1 $at, $f0 +/* BAF4B4 80241B74 00621825 */ or $v1, $v1, $v0 +/* BAF4B8 80241B78 AE230000 */ sw $v1, ($s1) +/* BAF4BC 80241B7C AE400038 */ sw $zero, 0x38($s2) +/* BAF4C0 80241B80 E640003C */ swc1 $f0, 0x3c($s2) +/* BAF4C4 80241B84 AE400040 */ sw $zero, 0x40($s2) +/* BAF4C8 80241B88 A2330007 */ sb $s3, 7($s1) +/* BAF4CC 80241B8C AE800070 */ sw $zero, 0x70($s4) +.L80241B90: +/* BAF4D0 80241B90 8FBF002C */ lw $ra, 0x2c($sp) +/* BAF4D4 80241B94 8FB40028 */ lw $s4, 0x28($sp) +/* BAF4D8 80241B98 8FB30024 */ lw $s3, 0x24($sp) +/* BAF4DC 80241B9C 8FB20020 */ lw $s2, 0x20($sp) +/* BAF4E0 80241BA0 8FB1001C */ lw $s1, 0x1c($sp) +/* BAF4E4 80241BA4 8FB00018 */ lw $s0, 0x18($sp) +/* BAF4E8 80241BA8 0000102D */ daddu $v0, $zero, $zero +/* BAF4EC 80241BAC 03E00008 */ jr $ra +/* BAF4F0 80241BB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4.s deleted file mode 100644 index 28c93fd997..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BB4 -/* BAF4F4 80241BB4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BAF4F8 80241BB8 AFB20038 */ sw $s2, 0x38($sp) -/* BAF4FC 80241BBC 0080902D */ daddu $s2, $a0, $zero -/* BAF500 80241BC0 AFBF0048 */ sw $ra, 0x48($sp) -/* BAF504 80241BC4 AFB50044 */ sw $s5, 0x44($sp) -/* BAF508 80241BC8 AFB40040 */ sw $s4, 0x40($sp) -/* BAF50C 80241BCC AFB3003C */ sw $s3, 0x3c($sp) -/* BAF510 80241BD0 AFB10034 */ sw $s1, 0x34($sp) -/* BAF514 80241BD4 AFB00030 */ sw $s0, 0x30($sp) -/* BAF518 80241BD8 8E510148 */ lw $s1, 0x148($s2) -/* BAF51C 80241BDC 86240008 */ lh $a0, 8($s1) -/* BAF520 80241BE0 0C00EABB */ jal get_npc_unsafe -/* BAF524 80241BE4 00A0802D */ daddu $s0, $a1, $zero -/* BAF528 80241BE8 8E43000C */ lw $v1, 0xc($s2) -/* BAF52C 80241BEC 0240202D */ daddu $a0, $s2, $zero -/* BAF530 80241BF0 8C650000 */ lw $a1, ($v1) -/* BAF534 80241BF4 0C0B1EAF */ jal get_variable -/* BAF538 80241BF8 0040A82D */ daddu $s5, $v0, $zero -/* BAF53C 80241BFC AFA00010 */ sw $zero, 0x10($sp) -/* BAF540 80241C00 8E2300D0 */ lw $v1, 0xd0($s1) -/* BAF544 80241C04 8C630030 */ lw $v1, 0x30($v1) -/* BAF548 80241C08 AFA30014 */ sw $v1, 0x14($sp) -/* BAF54C 80241C0C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BAF550 80241C10 8C63001C */ lw $v1, 0x1c($v1) -/* BAF554 80241C14 AFA30018 */ sw $v1, 0x18($sp) -/* BAF558 80241C18 8E2300D0 */ lw $v1, 0xd0($s1) -/* BAF55C 80241C1C 8C630024 */ lw $v1, 0x24($v1) -/* BAF560 80241C20 AFA3001C */ sw $v1, 0x1c($sp) -/* BAF564 80241C24 8E2300D0 */ lw $v1, 0xd0($s1) -/* BAF568 80241C28 8C630028 */ lw $v1, 0x28($v1) -/* BAF56C 80241C2C 27B40010 */ addiu $s4, $sp, 0x10 -/* BAF570 80241C30 AFA30020 */ sw $v1, 0x20($sp) -/* BAF574 80241C34 8E2300D0 */ lw $v1, 0xd0($s1) -/* BAF578 80241C38 3C014282 */ lui $at, 0x4282 -/* BAF57C 80241C3C 44810000 */ mtc1 $at, $f0 -/* BAF580 80241C40 8C63002C */ lw $v1, 0x2c($v1) -/* BAF584 80241C44 0040982D */ daddu $s3, $v0, $zero -/* BAF588 80241C48 E7A00028 */ swc1 $f0, 0x28($sp) -/* BAF58C 80241C4C A7A0002C */ sh $zero, 0x2c($sp) -/* BAF590 80241C50 16000005 */ bnez $s0, .L80241C68 -/* BAF594 80241C54 AFA30024 */ sw $v1, 0x24($sp) -/* BAF598 80241C58 8E2200B0 */ lw $v0, 0xb0($s1) -/* BAF59C 80241C5C 30420004 */ andi $v0, $v0, 4 -/* BAF5A0 80241C60 10400020 */ beqz $v0, .L80241CE4 -/* BAF5A4 80241C64 00000000 */ nop -.L80241C68: -/* BAF5A8 80241C68 2404F7FF */ addiu $a0, $zero, -0x801 -/* BAF5AC 80241C6C AE400070 */ sw $zero, 0x70($s2) -/* BAF5B0 80241C70 A6A0008E */ sh $zero, 0x8e($s5) -/* BAF5B4 80241C74 8E2200CC */ lw $v0, 0xcc($s1) -/* BAF5B8 80241C78 8EA30000 */ lw $v1, ($s5) -/* BAF5BC 80241C7C 8C420000 */ lw $v0, ($v0) -/* BAF5C0 80241C80 00641824 */ and $v1, $v1, $a0 -/* BAF5C4 80241C84 AEA30000 */ sw $v1, ($s5) -/* BAF5C8 80241C88 AEA20028 */ sw $v0, 0x28($s5) -/* BAF5CC 80241C8C 8E2200D0 */ lw $v0, 0xd0($s1) -/* BAF5D0 80241C90 8C420034 */ lw $v0, 0x34($v0) -/* BAF5D4 80241C94 54400005 */ bnel $v0, $zero, .L80241CAC -/* BAF5D8 80241C98 2402FDFF */ addiu $v0, $zero, -0x201 -/* BAF5DC 80241C9C 34620200 */ ori $v0, $v1, 0x200 -/* BAF5E0 80241CA0 2403FFF7 */ addiu $v1, $zero, -9 -/* BAF5E4 80241CA4 0809072D */ j .L80241CB4 -/* BAF5E8 80241CA8 00431024 */ and $v0, $v0, $v1 -.L80241CAC: -/* BAF5EC 80241CAC 00621024 */ and $v0, $v1, $v0 -/* BAF5F0 80241CB0 34420008 */ ori $v0, $v0, 8 -.L80241CB4: -/* BAF5F4 80241CB4 AEA20000 */ sw $v0, ($s5) -/* BAF5F8 80241CB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* BAF5FC 80241CBC 30420004 */ andi $v0, $v0, 4 -/* BAF600 80241CC0 10400007 */ beqz $v0, .L80241CE0 -/* BAF604 80241CC4 24020063 */ addiu $v0, $zero, 0x63 -/* BAF608 80241CC8 AE420070 */ sw $v0, 0x70($s2) -/* BAF60C 80241CCC AE400074 */ sw $zero, 0x74($s2) -/* BAF610 80241CD0 8E2200B0 */ lw $v0, 0xb0($s1) -/* BAF614 80241CD4 2403FFFB */ addiu $v1, $zero, -5 -/* BAF618 80241CD8 00431024 */ and $v0, $v0, $v1 -/* BAF61C 80241CDC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241CE0: -/* BAF620 80241CE0 AE20006C */ sw $zero, 0x6c($s1) -.L80241CE4: -/* BAF624 80241CE4 8E420070 */ lw $v0, 0x70($s2) -/* BAF628 80241CE8 2842001E */ slti $v0, $v0, 0x1e -/* BAF62C 80241CEC 10400009 */ beqz $v0, .L80241D14 -/* BAF630 80241CF0 00000000 */ nop -/* BAF634 80241CF4 8E22006C */ lw $v0, 0x6c($s1) -/* BAF638 80241CF8 14400006 */ bnez $v0, .L80241D14 -/* BAF63C 80241CFC 00000000 */ nop -/* BAF640 80241D00 0C0905E8 */ jal func_802417A0 -/* BAF644 80241D04 0240202D */ daddu $a0, $s2, $zero -/* BAF648 80241D08 10400002 */ beqz $v0, .L80241D14 -/* BAF64C 80241D0C 2402001E */ addiu $v0, $zero, 0x1e -/* BAF650 80241D10 AE420070 */ sw $v0, 0x70($s2) -.L80241D14: -/* BAF654 80241D14 8E430070 */ lw $v1, 0x70($s2) -/* BAF658 80241D18 2C620064 */ sltiu $v0, $v1, 0x64 -/* BAF65C 80241D1C 10400048 */ beqz $v0, .L80241E40 -/* BAF660 80241D20 00031080 */ sll $v0, $v1, 2 -/* BAF664 80241D24 3C018024 */ lui $at, 0x8024 -/* BAF668 80241D28 00220821 */ addu $at, $at, $v0 -/* BAF66C 80241D2C 8C225300 */ lw $v0, 0x5300($at) -/* BAF670 80241D30 00400008 */ jr $v0 -/* BAF674 80241D34 00000000 */ nop -/* BAF678 80241D38 0240202D */ daddu $a0, $s2, $zero -/* BAF67C 80241D3C 0260282D */ daddu $a1, $s3, $zero -/* BAF680 80241D40 0C012568 */ jal func_800495A0 -/* BAF684 80241D44 0280302D */ daddu $a2, $s4, $zero -/* BAF688 80241D48 0240202D */ daddu $a0, $s2, $zero -/* BAF68C 80241D4C 0260282D */ daddu $a1, $s3, $zero -/* BAF690 80241D50 0C0125AE */ jal func_800496B8 -/* BAF694 80241D54 0280302D */ daddu $a2, $s4, $zero -/* BAF698 80241D58 08090790 */ j .L80241E40 -/* BAF69C 80241D5C 00000000 */ nop -/* BAF6A0 80241D60 0240202D */ daddu $a0, $s2, $zero -/* BAF6A4 80241D64 0260282D */ daddu $a1, $s3, $zero -/* BAF6A8 80241D68 0C0126D1 */ jal func_80049B44 -/* BAF6AC 80241D6C 0280302D */ daddu $a2, $s4, $zero -/* BAF6B0 80241D70 0240202D */ daddu $a0, $s2, $zero -/* BAF6B4 80241D74 0260282D */ daddu $a1, $s3, $zero -/* BAF6B8 80241D78 0C012701 */ jal func_80049C04 -/* BAF6BC 80241D7C 0280302D */ daddu $a2, $s4, $zero -/* BAF6C0 80241D80 08090790 */ j .L80241E40 -/* BAF6C4 80241D84 00000000 */ nop -/* BAF6C8 80241D88 0240202D */ daddu $a0, $s2, $zero -/* BAF6CC 80241D8C 0260282D */ daddu $a1, $s3, $zero -/* BAF6D0 80241D90 0C01278F */ jal func_80049E3C -/* BAF6D4 80241D94 0280302D */ daddu $a2, $s4, $zero -/* BAF6D8 80241D98 0240202D */ daddu $a0, $s2, $zero -/* BAF6DC 80241D9C 0260282D */ daddu $a1, $s3, $zero -/* BAF6E0 80241DA0 0C0127B3 */ jal func_80049ECC -/* BAF6E4 80241DA4 0280302D */ daddu $a2, $s4, $zero -/* BAF6E8 80241DA8 08090790 */ j .L80241E40 -/* BAF6EC 80241DAC 00000000 */ nop -/* BAF6F0 80241DB0 0240202D */ daddu $a0, $s2, $zero -/* BAF6F4 80241DB4 0260282D */ daddu $a1, $s3, $zero -/* BAF6F8 80241DB8 0C0127DF */ jal func_80049F7C -/* BAF6FC 80241DBC 0280302D */ daddu $a2, $s4, $zero -/* BAF700 80241DC0 0240202D */ daddu $a0, $s2, $zero -/* BAF704 80241DC4 0260282D */ daddu $a1, $s3, $zero -/* BAF708 80241DC8 0C012849 */ jal func_8004A124 -/* BAF70C 80241DCC 0280302D */ daddu $a2, $s4, $zero -/* BAF710 80241DD0 08090790 */ j .L80241E40 -/* BAF714 80241DD4 00000000 */ nop -/* BAF718 80241DD8 0240202D */ daddu $a0, $s2, $zero -/* BAF71C 80241DDC 0260282D */ daddu $a1, $s3, $zero -/* BAF720 80241DE0 0C0128FA */ jal func_8004A3E8 -/* BAF724 80241DE4 0280302D */ daddu $a2, $s4, $zero -/* BAF728 80241DE8 08090790 */ j .L80241E40 -/* BAF72C 80241DEC 00000000 */ nop -/* BAF730 80241DF0 0C090566 */ jal func_80241598 -/* BAF734 80241DF4 0240202D */ daddu $a0, $s2, $zero -/* BAF738 80241DF8 0C090581 */ jal func_80241604 -/* BAF73C 80241DFC 0240202D */ daddu $a0, $s2, $zero -/* BAF740 80241E00 8E430070 */ lw $v1, 0x70($s2) -/* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 -/* BAF748 80241E08 1462000D */ bne $v1, $v0, .L80241E40 -/* BAF74C 80241E0C 00000000 */ nop -/* BAF750 80241E10 0C09059D */ jal func_80241674 -/* BAF754 80241E14 0240202D */ daddu $a0, $s2, $zero -/* BAF758 80241E18 8E430070 */ lw $v1, 0x70($s2) -/* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 -/* BAF760 80241E20 14620007 */ bne $v1, $v0, .L80241E40 -/* BAF764 80241E24 00000000 */ nop -/* BAF768 80241E28 0C0905D3 */ jal func_8024174C -/* BAF76C 80241E2C 0240202D */ daddu $a0, $s2, $zero -/* BAF770 80241E30 08090790 */ j .L80241E40 -/* BAF774 80241E34 00000000 */ nop -/* BAF778 80241E38 0C0129CF */ jal func_8004A73C -/* BAF77C 80241E3C 0240202D */ daddu $a0, $s2, $zero -.L80241E40: -/* BAF780 80241E40 8FBF0048 */ lw $ra, 0x48($sp) -/* BAF784 80241E44 8FB50044 */ lw $s5, 0x44($sp) -/* BAF788 80241E48 8FB40040 */ lw $s4, 0x40($sp) -/* BAF78C 80241E4C 8FB3003C */ lw $s3, 0x3c($sp) -/* BAF790 80241E50 8FB20038 */ lw $s2, 0x38($sp) -/* BAF794 80241E54 8FB10034 */ lw $s1, 0x34($sp) -/* BAF798 80241E58 8FB00030 */ lw $s0, 0x30($sp) -/* BAF79C 80241E5C 0000102D */ daddu $v0, $zero, $zero -/* BAF7A0 80241E60 03E00008 */ jr $ra -/* BAF7A4 80241E64 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s new file mode 100644 index 0000000000..dc42dc41ab --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241BB4_BAF4F4.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BB4_BAF4F4 +/* BAF4F4 80241BB4 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BAF4F8 80241BB8 AFB20038 */ sw $s2, 0x38($sp) +/* BAF4FC 80241BBC 0080902D */ daddu $s2, $a0, $zero +/* BAF500 80241BC0 AFBF0048 */ sw $ra, 0x48($sp) +/* BAF504 80241BC4 AFB50044 */ sw $s5, 0x44($sp) +/* BAF508 80241BC8 AFB40040 */ sw $s4, 0x40($sp) +/* BAF50C 80241BCC AFB3003C */ sw $s3, 0x3c($sp) +/* BAF510 80241BD0 AFB10034 */ sw $s1, 0x34($sp) +/* BAF514 80241BD4 AFB00030 */ sw $s0, 0x30($sp) +/* BAF518 80241BD8 8E510148 */ lw $s1, 0x148($s2) +/* BAF51C 80241BDC 86240008 */ lh $a0, 8($s1) +/* BAF520 80241BE0 0C00EABB */ jal get_npc_unsafe +/* BAF524 80241BE4 00A0802D */ daddu $s0, $a1, $zero +/* BAF528 80241BE8 8E43000C */ lw $v1, 0xc($s2) +/* BAF52C 80241BEC 0240202D */ daddu $a0, $s2, $zero +/* BAF530 80241BF0 8C650000 */ lw $a1, ($v1) +/* BAF534 80241BF4 0C0B1EAF */ jal get_variable +/* BAF538 80241BF8 0040A82D */ daddu $s5, $v0, $zero +/* BAF53C 80241BFC AFA00010 */ sw $zero, 0x10($sp) +/* BAF540 80241C00 8E2300D0 */ lw $v1, 0xd0($s1) +/* BAF544 80241C04 8C630030 */ lw $v1, 0x30($v1) +/* BAF548 80241C08 AFA30014 */ sw $v1, 0x14($sp) +/* BAF54C 80241C0C 8E2300D0 */ lw $v1, 0xd0($s1) +/* BAF550 80241C10 8C63001C */ lw $v1, 0x1c($v1) +/* BAF554 80241C14 AFA30018 */ sw $v1, 0x18($sp) +/* BAF558 80241C18 8E2300D0 */ lw $v1, 0xd0($s1) +/* BAF55C 80241C1C 8C630024 */ lw $v1, 0x24($v1) +/* BAF560 80241C20 AFA3001C */ sw $v1, 0x1c($sp) +/* BAF564 80241C24 8E2300D0 */ lw $v1, 0xd0($s1) +/* BAF568 80241C28 8C630028 */ lw $v1, 0x28($v1) +/* BAF56C 80241C2C 27B40010 */ addiu $s4, $sp, 0x10 +/* BAF570 80241C30 AFA30020 */ sw $v1, 0x20($sp) +/* BAF574 80241C34 8E2300D0 */ lw $v1, 0xd0($s1) +/* BAF578 80241C38 3C014282 */ lui $at, 0x4282 +/* BAF57C 80241C3C 44810000 */ mtc1 $at, $f0 +/* BAF580 80241C40 8C63002C */ lw $v1, 0x2c($v1) +/* BAF584 80241C44 0040982D */ daddu $s3, $v0, $zero +/* BAF588 80241C48 E7A00028 */ swc1 $f0, 0x28($sp) +/* BAF58C 80241C4C A7A0002C */ sh $zero, 0x2c($sp) +/* BAF590 80241C50 16000005 */ bnez $s0, .L80241C68 +/* BAF594 80241C54 AFA30024 */ sw $v1, 0x24($sp) +/* BAF598 80241C58 8E2200B0 */ lw $v0, 0xb0($s1) +/* BAF59C 80241C5C 30420004 */ andi $v0, $v0, 4 +/* BAF5A0 80241C60 10400020 */ beqz $v0, .L80241CE4 +/* BAF5A4 80241C64 00000000 */ nop +.L80241C68: +/* BAF5A8 80241C68 2404F7FF */ addiu $a0, $zero, -0x801 +/* BAF5AC 80241C6C AE400070 */ sw $zero, 0x70($s2) +/* BAF5B0 80241C70 A6A0008E */ sh $zero, 0x8e($s5) +/* BAF5B4 80241C74 8E2200CC */ lw $v0, 0xcc($s1) +/* BAF5B8 80241C78 8EA30000 */ lw $v1, ($s5) +/* BAF5BC 80241C7C 8C420000 */ lw $v0, ($v0) +/* BAF5C0 80241C80 00641824 */ and $v1, $v1, $a0 +/* BAF5C4 80241C84 AEA30000 */ sw $v1, ($s5) +/* BAF5C8 80241C88 AEA20028 */ sw $v0, 0x28($s5) +/* BAF5CC 80241C8C 8E2200D0 */ lw $v0, 0xd0($s1) +/* BAF5D0 80241C90 8C420034 */ lw $v0, 0x34($v0) +/* BAF5D4 80241C94 54400005 */ bnel $v0, $zero, .L80241CAC +/* BAF5D8 80241C98 2402FDFF */ addiu $v0, $zero, -0x201 +/* BAF5DC 80241C9C 34620200 */ ori $v0, $v1, 0x200 +/* BAF5E0 80241CA0 2403FFF7 */ addiu $v1, $zero, -9 +/* BAF5E4 80241CA4 0809072D */ j .L80241CB4 +/* BAF5E8 80241CA8 00431024 */ and $v0, $v0, $v1 +.L80241CAC: +/* BAF5EC 80241CAC 00621024 */ and $v0, $v1, $v0 +/* BAF5F0 80241CB0 34420008 */ ori $v0, $v0, 8 +.L80241CB4: +/* BAF5F4 80241CB4 AEA20000 */ sw $v0, ($s5) +/* BAF5F8 80241CB8 8E2200B0 */ lw $v0, 0xb0($s1) +/* BAF5FC 80241CBC 30420004 */ andi $v0, $v0, 4 +/* BAF600 80241CC0 10400007 */ beqz $v0, .L80241CE0 +/* BAF604 80241CC4 24020063 */ addiu $v0, $zero, 0x63 +/* BAF608 80241CC8 AE420070 */ sw $v0, 0x70($s2) +/* BAF60C 80241CCC AE400074 */ sw $zero, 0x74($s2) +/* BAF610 80241CD0 8E2200B0 */ lw $v0, 0xb0($s1) +/* BAF614 80241CD4 2403FFFB */ addiu $v1, $zero, -5 +/* BAF618 80241CD8 00431024 */ and $v0, $v0, $v1 +/* BAF61C 80241CDC AE2200B0 */ sw $v0, 0xb0($s1) +.L80241CE0: +/* BAF620 80241CE0 AE20006C */ sw $zero, 0x6c($s1) +.L80241CE4: +/* BAF624 80241CE4 8E420070 */ lw $v0, 0x70($s2) +/* BAF628 80241CE8 2842001E */ slti $v0, $v0, 0x1e +/* BAF62C 80241CEC 10400009 */ beqz $v0, .L80241D14 +/* BAF630 80241CF0 00000000 */ nop +/* BAF634 80241CF4 8E22006C */ lw $v0, 0x6c($s1) +/* BAF638 80241CF8 14400006 */ bnez $v0, .L80241D14 +/* BAF63C 80241CFC 00000000 */ nop +/* BAF640 80241D00 0C0905E8 */ jal func_802417A0_BAF0E0 +/* BAF644 80241D04 0240202D */ daddu $a0, $s2, $zero +/* BAF648 80241D08 10400002 */ beqz $v0, .L80241D14 +/* BAF64C 80241D0C 2402001E */ addiu $v0, $zero, 0x1e +/* BAF650 80241D10 AE420070 */ sw $v0, 0x70($s2) +.L80241D14: +/* BAF654 80241D14 8E430070 */ lw $v1, 0x70($s2) +/* BAF658 80241D18 2C620064 */ sltiu $v0, $v1, 0x64 +/* BAF65C 80241D1C 10400048 */ beqz $v0, .L80241E40 +/* BAF660 80241D20 00031080 */ sll $v0, $v1, 2 +/* BAF664 80241D24 3C018024 */ lui $at, 0x8024 +/* BAF668 80241D28 00220821 */ addu $at, $at, $v0 +/* BAF66C 80241D2C 8C225300 */ lw $v0, 0x5300($at) +/* BAF670 80241D30 00400008 */ jr $v0 +/* BAF674 80241D34 00000000 */ nop +/* BAF678 80241D38 0240202D */ daddu $a0, $s2, $zero +/* BAF67C 80241D3C 0260282D */ daddu $a1, $s3, $zero +/* BAF680 80241D40 0C012568 */ jal func_800495A0 +/* BAF684 80241D44 0280302D */ daddu $a2, $s4, $zero +/* BAF688 80241D48 0240202D */ daddu $a0, $s2, $zero +/* BAF68C 80241D4C 0260282D */ daddu $a1, $s3, $zero +/* BAF690 80241D50 0C0125AE */ jal func_800496B8 +/* BAF694 80241D54 0280302D */ daddu $a2, $s4, $zero +/* BAF698 80241D58 08090790 */ j .L80241E40 +/* BAF69C 80241D5C 00000000 */ nop +/* BAF6A0 80241D60 0240202D */ daddu $a0, $s2, $zero +/* BAF6A4 80241D64 0260282D */ daddu $a1, $s3, $zero +/* BAF6A8 80241D68 0C0126D1 */ jal func_80049B44 +/* BAF6AC 80241D6C 0280302D */ daddu $a2, $s4, $zero +/* BAF6B0 80241D70 0240202D */ daddu $a0, $s2, $zero +/* BAF6B4 80241D74 0260282D */ daddu $a1, $s3, $zero +/* BAF6B8 80241D78 0C012701 */ jal func_80049C04 +/* BAF6BC 80241D7C 0280302D */ daddu $a2, $s4, $zero +/* BAF6C0 80241D80 08090790 */ j .L80241E40 +/* BAF6C4 80241D84 00000000 */ nop +/* BAF6C8 80241D88 0240202D */ daddu $a0, $s2, $zero +/* BAF6CC 80241D8C 0260282D */ daddu $a1, $s3, $zero +/* BAF6D0 80241D90 0C01278F */ jal func_80049E3C +/* BAF6D4 80241D94 0280302D */ daddu $a2, $s4, $zero +/* BAF6D8 80241D98 0240202D */ daddu $a0, $s2, $zero +/* BAF6DC 80241D9C 0260282D */ daddu $a1, $s3, $zero +/* BAF6E0 80241DA0 0C0127B3 */ jal func_80049ECC +/* BAF6E4 80241DA4 0280302D */ daddu $a2, $s4, $zero +/* BAF6E8 80241DA8 08090790 */ j .L80241E40 +/* BAF6EC 80241DAC 00000000 */ nop +/* BAF6F0 80241DB0 0240202D */ daddu $a0, $s2, $zero +/* BAF6F4 80241DB4 0260282D */ daddu $a1, $s3, $zero +/* BAF6F8 80241DB8 0C0127DF */ jal func_80049F7C +/* BAF6FC 80241DBC 0280302D */ daddu $a2, $s4, $zero +/* BAF700 80241DC0 0240202D */ daddu $a0, $s2, $zero +/* BAF704 80241DC4 0260282D */ daddu $a1, $s3, $zero +/* BAF708 80241DC8 0C012849 */ jal func_8004A124 +/* BAF70C 80241DCC 0280302D */ daddu $a2, $s4, $zero +/* BAF710 80241DD0 08090790 */ j .L80241E40 +/* BAF714 80241DD4 00000000 */ nop +/* BAF718 80241DD8 0240202D */ daddu $a0, $s2, $zero +/* BAF71C 80241DDC 0260282D */ daddu $a1, $s3, $zero +/* BAF720 80241DE0 0C0128FA */ jal func_8004A3E8 +/* BAF724 80241DE4 0280302D */ daddu $a2, $s4, $zero +/* BAF728 80241DE8 08090790 */ j .L80241E40 +/* BAF72C 80241DEC 00000000 */ nop +/* BAF730 80241DF0 0C090566 */ jal func_80241598_BAEED8 +/* BAF734 80241DF4 0240202D */ daddu $a0, $s2, $zero +/* BAF738 80241DF8 0C090581 */ jal func_80241604_BAEF44 +/* BAF73C 80241DFC 0240202D */ daddu $a0, $s2, $zero +/* BAF740 80241E00 8E430070 */ lw $v1, 0x70($s2) +/* BAF744 80241E04 24020020 */ addiu $v0, $zero, 0x20 +/* BAF748 80241E08 1462000D */ bne $v1, $v0, .L80241E40 +/* BAF74C 80241E0C 00000000 */ nop +/* BAF750 80241E10 0C09059D */ jal func_80241674_BAEFB4 +/* BAF754 80241E14 0240202D */ daddu $a0, $s2, $zero +/* BAF758 80241E18 8E430070 */ lw $v1, 0x70($s2) +/* BAF75C 80241E1C 24020021 */ addiu $v0, $zero, 0x21 +/* BAF760 80241E20 14620007 */ bne $v1, $v0, .L80241E40 +/* BAF764 80241E24 00000000 */ nop +/* BAF768 80241E28 0C0905D3 */ jal func_8024174C_BAF08C +/* BAF76C 80241E2C 0240202D */ daddu $a0, $s2, $zero +/* BAF770 80241E30 08090790 */ j .L80241E40 +/* BAF774 80241E34 00000000 */ nop +/* BAF778 80241E38 0C0129CF */ jal func_8004A73C +/* BAF77C 80241E3C 0240202D */ daddu $a0, $s2, $zero +.L80241E40: +/* BAF780 80241E40 8FBF0048 */ lw $ra, 0x48($sp) +/* BAF784 80241E44 8FB50044 */ lw $s5, 0x44($sp) +/* BAF788 80241E48 8FB40040 */ lw $s4, 0x40($sp) +/* BAF78C 80241E4C 8FB3003C */ lw $s3, 0x3c($sp) +/* BAF790 80241E50 8FB20038 */ lw $s2, 0x38($sp) +/* BAF794 80241E54 8FB10034 */ lw $s1, 0x34($sp) +/* BAF798 80241E58 8FB00030 */ lw $s0, 0x30($sp) +/* BAF79C 80241E5C 0000102D */ daddu $v0, $zero, $zero +/* BAF7A0 80241E60 03E00008 */ jr $ra +/* BAF7A4 80241E64 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241E68.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241E68.s deleted file mode 100644 index 5640202abe..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241E68.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E68 -/* BAF7A8 80241E68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BAF7AC 80241E6C AFB10014 */ sw $s1, 0x14($sp) -/* BAF7B0 80241E70 0080882D */ daddu $s1, $a0, $zero -/* BAF7B4 80241E74 AFBF0018 */ sw $ra, 0x18($sp) -/* BAF7B8 80241E78 AFB00010 */ sw $s0, 0x10($sp) -/* BAF7BC 80241E7C 8E300148 */ lw $s0, 0x148($s1) -/* BAF7C0 80241E80 0C00EABB */ jal get_npc_unsafe -/* BAF7C4 80241E84 86040008 */ lh $a0, 8($s0) -/* BAF7C8 80241E88 0040202D */ daddu $a0, $v0, $zero -/* BAF7CC 80241E8C 8482008E */ lh $v0, 0x8e($a0) -/* BAF7D0 80241E90 9483008E */ lhu $v1, 0x8e($a0) -/* BAF7D4 80241E94 18400003 */ blez $v0, .L80241EA4 -/* BAF7D8 80241E98 2462FFFF */ addiu $v0, $v1, -1 -/* BAF7DC 80241E9C 080907B0 */ j .L80241EC0 -/* BAF7E0 80241EA0 A482008E */ sh $v0, 0x8e($a0) -.L80241EA4: -/* BAF7E4 80241EA4 8E0200CC */ lw $v0, 0xcc($s0) -/* BAF7E8 80241EA8 AE00006C */ sw $zero, 0x6c($s0) -/* BAF7EC 80241EAC 8C420000 */ lw $v0, ($v0) -/* BAF7F0 80241EB0 AC820028 */ sw $v0, 0x28($a0) -/* BAF7F4 80241EB4 24020001 */ addiu $v0, $zero, 1 -/* BAF7F8 80241EB8 AE200074 */ sw $zero, 0x74($s1) -/* BAF7FC 80241EBC AE220070 */ sw $v0, 0x70($s1) -.L80241EC0: -/* BAF800 80241EC0 8FBF0018 */ lw $ra, 0x18($sp) -/* BAF804 80241EC4 8FB10014 */ lw $s1, 0x14($sp) -/* BAF808 80241EC8 8FB00010 */ lw $s0, 0x10($sp) -/* BAF80C 80241ECC 03E00008 */ jr $ra -/* BAF810 80241ED0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241E68_BAF7A8.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241E68_BAF7A8.s new file mode 100644 index 0000000000..09b0adefa9 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241E68_BAF7A8.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E68_BAF7A8 +/* BAF7A8 80241E68 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BAF7AC 80241E6C AFB10014 */ sw $s1, 0x14($sp) +/* BAF7B0 80241E70 0080882D */ daddu $s1, $a0, $zero +/* BAF7B4 80241E74 AFBF0018 */ sw $ra, 0x18($sp) +/* BAF7B8 80241E78 AFB00010 */ sw $s0, 0x10($sp) +/* BAF7BC 80241E7C 8E300148 */ lw $s0, 0x148($s1) +/* BAF7C0 80241E80 0C00EABB */ jal get_npc_unsafe +/* BAF7C4 80241E84 86040008 */ lh $a0, 8($s0) +/* BAF7C8 80241E88 0040202D */ daddu $a0, $v0, $zero +/* BAF7CC 80241E8C 8482008E */ lh $v0, 0x8e($a0) +/* BAF7D0 80241E90 9483008E */ lhu $v1, 0x8e($a0) +/* BAF7D4 80241E94 18400003 */ blez $v0, .L80241EA4 +/* BAF7D8 80241E98 2462FFFF */ addiu $v0, $v1, -1 +/* BAF7DC 80241E9C 080907B0 */ j .L80241EC0 +/* BAF7E0 80241EA0 A482008E */ sh $v0, 0x8e($a0) +.L80241EA4: +/* BAF7E4 80241EA4 8E0200CC */ lw $v0, 0xcc($s0) +/* BAF7E8 80241EA8 AE00006C */ sw $zero, 0x6c($s0) +/* BAF7EC 80241EAC 8C420000 */ lw $v0, ($v0) +/* BAF7F0 80241EB0 AC820028 */ sw $v0, 0x28($a0) +/* BAF7F4 80241EB4 24020001 */ addiu $v0, $zero, 1 +/* BAF7F8 80241EB8 AE200074 */ sw $zero, 0x74($s1) +/* BAF7FC 80241EBC AE220070 */ sw $v0, 0x70($s1) +.L80241EC0: +/* BAF800 80241EC0 8FBF0018 */ lw $ra, 0x18($sp) +/* BAF804 80241EC4 8FB10014 */ lw $s1, 0x14($sp) +/* BAF808 80241EC8 8FB00010 */ lw $s0, 0x10($sp) +/* BAF80C 80241ECC 03E00008 */ jr $ra +/* BAF810 80241ED0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4.s deleted file mode 100644 index 50f84e401a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4.s +++ /dev/null @@ -1,68 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241ED4 -/* BAF814 80241ED4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* BAF818 80241ED8 AFB3003C */ sw $s3, 0x3c($sp) -/* BAF81C 80241EDC 0080982D */ daddu $s3, $a0, $zero -/* BAF820 80241EE0 AFBF0040 */ sw $ra, 0x40($sp) -/* BAF824 80241EE4 AFB20038 */ sw $s2, 0x38($sp) -/* BAF828 80241EE8 AFB10034 */ sw $s1, 0x34($sp) -/* BAF82C 80241EEC AFB00030 */ sw $s0, 0x30($sp) -/* BAF830 80241EF0 8E720148 */ lw $s2, 0x148($s3) -/* BAF834 80241EF4 00A0882D */ daddu $s1, $a1, $zero -/* BAF838 80241EF8 86440008 */ lh $a0, 8($s2) -/* BAF83C 80241EFC 0C00EABB */ jal get_npc_unsafe -/* BAF840 80241F00 00C0802D */ daddu $s0, $a2, $zero -/* BAF844 80241F04 0200202D */ daddu $a0, $s0, $zero -/* BAF848 80241F08 0240282D */ daddu $a1, $s2, $zero -/* BAF84C 80241F0C AFA00010 */ sw $zero, 0x10($sp) -/* BAF850 80241F10 8E26000C */ lw $a2, 0xc($s1) -/* BAF854 80241F14 8E270010 */ lw $a3, 0x10($s1) -/* BAF858 80241F18 0C01242D */ jal func_800490B4 -/* BAF85C 80241F1C 0040882D */ daddu $s1, $v0, $zero -/* BAF860 80241F20 10400024 */ beqz $v0, .L80241FB4 -/* BAF864 80241F24 0220202D */ daddu $a0, $s1, $zero -/* BAF868 80241F28 24050322 */ addiu $a1, $zero, 0x322 -/* BAF86C 80241F2C 0C012530 */ jal func_800494C0 -/* BAF870 80241F30 0000302D */ daddu $a2, $zero, $zero -/* BAF874 80241F34 0000202D */ daddu $a0, $zero, $zero -/* BAF878 80241F38 0220282D */ daddu $a1, $s1, $zero -/* BAF87C 80241F3C 0000302D */ daddu $a2, $zero, $zero -/* BAF880 80241F40 2410000A */ addiu $s0, $zero, 0xa -/* BAF884 80241F44 862300A8 */ lh $v1, 0xa8($s1) -/* BAF888 80241F48 3C013F80 */ lui $at, 0x3f80 -/* BAF88C 80241F4C 44810000 */ mtc1 $at, $f0 -/* BAF890 80241F50 3C014000 */ lui $at, 0x4000 -/* BAF894 80241F54 44811000 */ mtc1 $at, $f2 -/* BAF898 80241F58 3C01C1A0 */ lui $at, 0xc1a0 -/* BAF89C 80241F5C 44812000 */ mtc1 $at, $f4 -/* BAF8A0 80241F60 44833000 */ mtc1 $v1, $f6 -/* BAF8A4 80241F64 00000000 */ nop -/* BAF8A8 80241F68 468031A0 */ cvt.s.w $f6, $f6 -/* BAF8AC 80241F6C 44073000 */ mfc1 $a3, $f6 -/* BAF8B0 80241F70 27A20028 */ addiu $v0, $sp, 0x28 -/* BAF8B4 80241F74 AFB0001C */ sw $s0, 0x1c($sp) -/* BAF8B8 80241F78 AFA20020 */ sw $v0, 0x20($sp) -/* BAF8BC 80241F7C E7A00010 */ swc1 $f0, 0x10($sp) -/* BAF8C0 80241F80 E7A20014 */ swc1 $f2, 0x14($sp) -/* BAF8C4 80241F84 0C01BFA4 */ jal fx_emote -/* BAF8C8 80241F88 E7A40018 */ swc1 $f4, 0x18($sp) -/* BAF8CC 80241F8C 0220202D */ daddu $a0, $s1, $zero -/* BAF8D0 80241F90 240502F4 */ addiu $a1, $zero, 0x2f4 -/* BAF8D4 80241F94 0C012530 */ jal func_800494C0 -/* BAF8D8 80241F98 3C060020 */ lui $a2, 0x20 -/* BAF8DC 80241F9C 8E4200CC */ lw $v0, 0xcc($s2) -/* BAF8E0 80241FA0 8C420020 */ lw $v0, 0x20($v0) -/* BAF8E4 80241FA4 AE220028 */ sw $v0, 0x28($s1) -/* BAF8E8 80241FA8 9642008E */ lhu $v0, 0x8e($s2) -/* BAF8EC 80241FAC A622008E */ sh $v0, 0x8e($s1) -/* BAF8F0 80241FB0 AE700070 */ sw $s0, 0x70($s3) -.L80241FB4: -/* BAF8F4 80241FB4 8FBF0040 */ lw $ra, 0x40($sp) -/* BAF8F8 80241FB8 8FB3003C */ lw $s3, 0x3c($sp) -/* BAF8FC 80241FBC 8FB20038 */ lw $s2, 0x38($sp) -/* BAF900 80241FC0 8FB10034 */ lw $s1, 0x34($sp) -/* BAF904 80241FC4 8FB00030 */ lw $s0, 0x30($sp) -/* BAF908 80241FC8 03E00008 */ jr $ra -/* BAF90C 80241FCC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s new file mode 100644 index 0000000000..daec32e7c4 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80241ED4_BAF814.s @@ -0,0 +1,68 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241ED4_BAF814 +/* BAF814 80241ED4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* BAF818 80241ED8 AFB3003C */ sw $s3, 0x3c($sp) +/* BAF81C 80241EDC 0080982D */ daddu $s3, $a0, $zero +/* BAF820 80241EE0 AFBF0040 */ sw $ra, 0x40($sp) +/* BAF824 80241EE4 AFB20038 */ sw $s2, 0x38($sp) +/* BAF828 80241EE8 AFB10034 */ sw $s1, 0x34($sp) +/* BAF82C 80241EEC AFB00030 */ sw $s0, 0x30($sp) +/* BAF830 80241EF0 8E720148 */ lw $s2, 0x148($s3) +/* BAF834 80241EF4 00A0882D */ daddu $s1, $a1, $zero +/* BAF838 80241EF8 86440008 */ lh $a0, 8($s2) +/* BAF83C 80241EFC 0C00EABB */ jal get_npc_unsafe +/* BAF840 80241F00 00C0802D */ daddu $s0, $a2, $zero +/* BAF844 80241F04 0200202D */ daddu $a0, $s0, $zero +/* BAF848 80241F08 0240282D */ daddu $a1, $s2, $zero +/* BAF84C 80241F0C AFA00010 */ sw $zero, 0x10($sp) +/* BAF850 80241F10 8E26000C */ lw $a2, 0xc($s1) +/* BAF854 80241F14 8E270010 */ lw $a3, 0x10($s1) +/* BAF858 80241F18 0C01242D */ jal func_800490B4 +/* BAF85C 80241F1C 0040882D */ daddu $s1, $v0, $zero +/* BAF860 80241F20 10400024 */ beqz $v0, .L80241FB4 +/* BAF864 80241F24 0220202D */ daddu $a0, $s1, $zero +/* BAF868 80241F28 24050322 */ addiu $a1, $zero, 0x322 +/* BAF86C 80241F2C 0C012530 */ jal func_800494C0 +/* BAF870 80241F30 0000302D */ daddu $a2, $zero, $zero +/* BAF874 80241F34 0000202D */ daddu $a0, $zero, $zero +/* BAF878 80241F38 0220282D */ daddu $a1, $s1, $zero +/* BAF87C 80241F3C 0000302D */ daddu $a2, $zero, $zero +/* BAF880 80241F40 2410000A */ addiu $s0, $zero, 0xa +/* BAF884 80241F44 862300A8 */ lh $v1, 0xa8($s1) +/* BAF888 80241F48 3C013F80 */ lui $at, 0x3f80 +/* BAF88C 80241F4C 44810000 */ mtc1 $at, $f0 +/* BAF890 80241F50 3C014000 */ lui $at, 0x4000 +/* BAF894 80241F54 44811000 */ mtc1 $at, $f2 +/* BAF898 80241F58 3C01C1A0 */ lui $at, 0xc1a0 +/* BAF89C 80241F5C 44812000 */ mtc1 $at, $f4 +/* BAF8A0 80241F60 44833000 */ mtc1 $v1, $f6 +/* BAF8A4 80241F64 00000000 */ nop +/* BAF8A8 80241F68 468031A0 */ cvt.s.w $f6, $f6 +/* BAF8AC 80241F6C 44073000 */ mfc1 $a3, $f6 +/* BAF8B0 80241F70 27A20028 */ addiu $v0, $sp, 0x28 +/* BAF8B4 80241F74 AFB0001C */ sw $s0, 0x1c($sp) +/* BAF8B8 80241F78 AFA20020 */ sw $v0, 0x20($sp) +/* BAF8BC 80241F7C E7A00010 */ swc1 $f0, 0x10($sp) +/* BAF8C0 80241F80 E7A20014 */ swc1 $f2, 0x14($sp) +/* BAF8C4 80241F84 0C01BFA4 */ jal fx_emote +/* BAF8C8 80241F88 E7A40018 */ swc1 $f4, 0x18($sp) +/* BAF8CC 80241F8C 0220202D */ daddu $a0, $s1, $zero +/* BAF8D0 80241F90 240502F4 */ addiu $a1, $zero, 0x2f4 +/* BAF8D4 80241F94 0C012530 */ jal func_800494C0 +/* BAF8D8 80241F98 3C060020 */ lui $a2, 0x20 +/* BAF8DC 80241F9C 8E4200CC */ lw $v0, 0xcc($s2) +/* BAF8E0 80241FA0 8C420020 */ lw $v0, 0x20($v0) +/* BAF8E4 80241FA4 AE220028 */ sw $v0, 0x28($s1) +/* BAF8E8 80241FA8 9642008E */ lhu $v0, 0x8e($s2) +/* BAF8EC 80241FAC A622008E */ sh $v0, 0x8e($s1) +/* BAF8F0 80241FB0 AE700070 */ sw $s0, 0x70($s3) +.L80241FB4: +/* BAF8F4 80241FB4 8FBF0040 */ lw $ra, 0x40($sp) +/* BAF8F8 80241FB8 8FB3003C */ lw $s3, 0x3c($sp) +/* BAF8FC 80241FBC 8FB20038 */ lw $s2, 0x38($sp) +/* BAF900 80241FC0 8FB10034 */ lw $s1, 0x34($sp) +/* BAF904 80241FC4 8FB00030 */ lw $s0, 0x30($sp) +/* BAF908 80241FC8 03E00008 */ jr $ra +/* BAF90C 80241FCC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10.s deleted file mode 100644 index be7dfe13f6..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A10 -/* BB0350 80242A10 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BB0354 80242A14 AFB10014 */ sw $s1, 0x14($sp) -/* BB0358 80242A18 0080882D */ daddu $s1, $a0, $zero -/* BB035C 80242A1C AFBF0018 */ sw $ra, 0x18($sp) -/* BB0360 80242A20 AFB00010 */ sw $s0, 0x10($sp) -/* BB0364 80242A24 8E300148 */ lw $s0, 0x148($s1) -/* BB0368 80242A28 0C00EABB */ jal get_npc_unsafe -/* BB036C 80242A2C 86040008 */ lh $a0, 8($s0) -/* BB0370 80242A30 0040202D */ daddu $a0, $v0, $zero -/* BB0374 80242A34 9482008E */ lhu $v0, 0x8e($a0) -/* BB0378 80242A38 2442FFFF */ addiu $v0, $v0, -1 -/* BB037C 80242A3C A482008E */ sh $v0, 0x8e($a0) -/* BB0380 80242A40 00021400 */ sll $v0, $v0, 0x10 -/* BB0384 80242A44 8E030098 */ lw $v1, 0x98($s0) -/* BB0388 80242A48 00021403 */ sra $v0, $v0, 0x10 -/* BB038C 80242A4C 0062182A */ slt $v1, $v1, $v0 -/* BB0390 80242A50 14600005 */ bnez $v1, .L80242A68 -/* BB0394 80242A54 3C03E0EF */ lui $v1, 0xe0ef -/* BB0398 80242A58 8E020000 */ lw $v0, ($s0) -/* BB039C 80242A5C 3463FFFF */ ori $v1, $v1, 0xffff -/* BB03A0 80242A60 00431024 */ and $v0, $v0, $v1 -/* BB03A4 80242A64 AE020000 */ sw $v0, ($s0) -.L80242A68: -/* BB03A8 80242A68 8482008E */ lh $v0, 0x8e($a0) -/* BB03AC 80242A6C 14400007 */ bnez $v0, .L80242A8C -/* BB03B0 80242A70 00000000 */ nop -/* BB03B4 80242A74 8E0200CC */ lw $v0, 0xcc($s0) -/* BB03B8 80242A78 8C420028 */ lw $v0, 0x28($v0) -/* BB03BC 80242A7C A480008E */ sh $zero, 0x8e($a0) -/* BB03C0 80242A80 AC820028 */ sw $v0, 0x28($a0) -/* BB03C4 80242A84 2402000C */ addiu $v0, $zero, 0xc -/* BB03C8 80242A88 AE220070 */ sw $v0, 0x70($s1) -.L80242A8C: -/* BB03CC 80242A8C 8FBF0018 */ lw $ra, 0x18($sp) -/* BB03D0 80242A90 8FB10014 */ lw $s1, 0x14($sp) -/* BB03D4 80242A94 8FB00010 */ lw $s0, 0x10($sp) -/* BB03D8 80242A98 03E00008 */ jr $ra -/* BB03DC 80242A9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s new file mode 100644 index 0000000000..197b7789db --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242A10_BB0350.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A10_BB0350 +/* BB0350 80242A10 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BB0354 80242A14 AFB10014 */ sw $s1, 0x14($sp) +/* BB0358 80242A18 0080882D */ daddu $s1, $a0, $zero +/* BB035C 80242A1C AFBF0018 */ sw $ra, 0x18($sp) +/* BB0360 80242A20 AFB00010 */ sw $s0, 0x10($sp) +/* BB0364 80242A24 8E300148 */ lw $s0, 0x148($s1) +/* BB0368 80242A28 0C00EABB */ jal get_npc_unsafe +/* BB036C 80242A2C 86040008 */ lh $a0, 8($s0) +/* BB0370 80242A30 0040202D */ daddu $a0, $v0, $zero +/* BB0374 80242A34 9482008E */ lhu $v0, 0x8e($a0) +/* BB0378 80242A38 2442FFFF */ addiu $v0, $v0, -1 +/* BB037C 80242A3C A482008E */ sh $v0, 0x8e($a0) +/* BB0380 80242A40 00021400 */ sll $v0, $v0, 0x10 +/* BB0384 80242A44 8E030098 */ lw $v1, 0x98($s0) +/* BB0388 80242A48 00021403 */ sra $v0, $v0, 0x10 +/* BB038C 80242A4C 0062182A */ slt $v1, $v1, $v0 +/* BB0390 80242A50 14600005 */ bnez $v1, .L80242A68 +/* BB0394 80242A54 3C03E0EF */ lui $v1, 0xe0ef +/* BB0398 80242A58 8E020000 */ lw $v0, ($s0) +/* BB039C 80242A5C 3463FFFF */ ori $v1, $v1, 0xffff +/* BB03A0 80242A60 00431024 */ and $v0, $v0, $v1 +/* BB03A4 80242A64 AE020000 */ sw $v0, ($s0) +.L80242A68: +/* BB03A8 80242A68 8482008E */ lh $v0, 0x8e($a0) +/* BB03AC 80242A6C 14400007 */ bnez $v0, .L80242A8C +/* BB03B0 80242A70 00000000 */ nop +/* BB03B4 80242A74 8E0200CC */ lw $v0, 0xcc($s0) +/* BB03B8 80242A78 8C420028 */ lw $v0, 0x28($v0) +/* BB03BC 80242A7C A480008E */ sh $zero, 0x8e($a0) +/* BB03C0 80242A80 AC820028 */ sw $v0, 0x28($a0) +/* BB03C4 80242A84 2402000C */ addiu $v0, $zero, 0xc +/* BB03C8 80242A88 AE220070 */ sw $v0, 0x70($s1) +.L80242A8C: +/* BB03CC 80242A8C 8FBF0018 */ lw $ra, 0x18($sp) +/* BB03D0 80242A90 8FB10014 */ lw $s1, 0x14($sp) +/* BB03D4 80242A94 8FB00010 */ lw $s0, 0x10($sp) +/* BB03D8 80242A98 03E00008 */ jr $ra +/* BB03DC 80242A9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0.s deleted file mode 100644 index caf582fa10..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AA0 -/* BB03E0 80242AA0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* BB03E4 80242AA4 AFB10034 */ sw $s1, 0x34($sp) -/* BB03E8 80242AA8 0080882D */ daddu $s1, $a0, $zero -/* BB03EC 80242AAC AFBF0038 */ sw $ra, 0x38($sp) -/* BB03F0 80242AB0 AFB00030 */ sw $s0, 0x30($sp) -/* BB03F4 80242AB4 8E300148 */ lw $s0, 0x148($s1) -/* BB03F8 80242AB8 0C00EABB */ jal get_npc_unsafe -/* BB03FC 80242ABC 86040008 */ lh $a0, 8($s0) -/* BB0400 80242AC0 0040282D */ daddu $a1, $v0, $zero -/* BB0404 80242AC4 94A2008E */ lhu $v0, 0x8e($a1) -/* BB0408 80242AC8 24420001 */ addiu $v0, $v0, 1 -/* BB040C 80242ACC A4A2008E */ sh $v0, 0x8e($a1) -/* BB0410 80242AD0 00021400 */ sll $v0, $v0, 0x10 -/* BB0414 80242AD4 8E0300A0 */ lw $v1, 0xa0($s0) -/* BB0418 80242AD8 00021403 */ sra $v0, $v0, 0x10 -/* BB041C 80242ADC 14430004 */ bne $v0, $v1, .L80242AF0 -/* BB0420 80242AE0 00000000 */ nop -/* BB0424 80242AE4 8E0200CC */ lw $v0, 0xcc($s0) -/* BB0428 80242AE8 8C42002C */ lw $v0, 0x2c($v0) -/* BB042C 80242AEC ACA20028 */ sw $v0, 0x28($a1) -.L80242AF0: -/* BB0430 80242AF0 84A3008E */ lh $v1, 0x8e($a1) -/* BB0434 80242AF4 8E0200A4 */ lw $v0, 0xa4($s0) -/* BB0438 80242AF8 14620002 */ bne $v1, $v0, .L80242B04 -/* BB043C 80242AFC 24020003 */ addiu $v0, $zero, 3 -/* BB0440 80242B00 AE02006C */ sw $v0, 0x6c($s0) -.L80242B04: -/* BB0444 80242B04 84A2008E */ lh $v0, 0x8e($a1) -/* BB0448 80242B08 8E03009C */ lw $v1, 0x9c($s0) -/* BB044C 80242B0C 0043102A */ slt $v0, $v0, $v1 -/* BB0450 80242B10 1440001E */ bnez $v0, .L80242B8C -/* BB0454 80242B14 24020004 */ addiu $v0, $zero, 4 -/* BB0458 80242B18 AE02006C */ sw $v0, 0x6c($s0) -/* BB045C 80242B1C 24020008 */ addiu $v0, $zero, 8 -/* BB0460 80242B20 24040003 */ addiu $a0, $zero, 3 -/* BB0464 80242B24 A4A2008E */ sh $v0, 0x8e($a1) -/* BB0468 80242B28 8E0200CC */ lw $v0, 0xcc($s0) -/* BB046C 80242B2C 84A300A8 */ lh $v1, 0xa8($a1) -/* BB0470 80242B30 3C013F80 */ lui $at, 0x3f80 -/* BB0474 80242B34 44810000 */ mtc1 $at, $f0 -/* BB0478 80242B38 3C014000 */ lui $at, 0x4000 -/* BB047C 80242B3C 44811000 */ mtc1 $at, $f2 -/* BB0480 80242B40 3C01C1A0 */ lui $at, 0xc1a0 -/* BB0484 80242B44 44812000 */ mtc1 $at, $f4 -/* BB0488 80242B48 44833000 */ mtc1 $v1, $f6 -/* BB048C 80242B4C 00000000 */ nop -/* BB0490 80242B50 468031A0 */ cvt.s.w $f6, $f6 -/* BB0494 80242B54 8C420000 */ lw $v0, ($v0) -/* BB0498 80242B58 44073000 */ mfc1 $a3, $f6 -/* BB049C 80242B5C 0000302D */ daddu $a2, $zero, $zero -/* BB04A0 80242B60 ACA20028 */ sw $v0, 0x28($a1) -/* BB04A4 80242B64 2402000A */ addiu $v0, $zero, 0xa -/* BB04A8 80242B68 AFA2001C */ sw $v0, 0x1c($sp) -/* BB04AC 80242B6C 27A20028 */ addiu $v0, $sp, 0x28 -/* BB04B0 80242B70 E7A00010 */ swc1 $f0, 0x10($sp) -/* BB04B4 80242B74 E7A20014 */ swc1 $f2, 0x14($sp) -/* BB04B8 80242B78 E7A40018 */ swc1 $f4, 0x18($sp) -/* BB04BC 80242B7C 0C01BFA4 */ jal fx_emote -/* BB04C0 80242B80 AFA20020 */ sw $v0, 0x20($sp) -/* BB04C4 80242B84 2402000D */ addiu $v0, $zero, 0xd -/* BB04C8 80242B88 AE220070 */ sw $v0, 0x70($s1) -.L80242B8C: -/* BB04CC 80242B8C 8FBF0038 */ lw $ra, 0x38($sp) -/* BB04D0 80242B90 8FB10034 */ lw $s1, 0x34($sp) -/* BB04D4 80242B94 8FB00030 */ lw $s0, 0x30($sp) -/* BB04D8 80242B98 03E00008 */ jr $ra -/* BB04DC 80242B9C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s new file mode 100644 index 0000000000..966a837106 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242AA0_BB03E0.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242AA0_BB03E0 +/* BB03E0 80242AA0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* BB03E4 80242AA4 AFB10034 */ sw $s1, 0x34($sp) +/* BB03E8 80242AA8 0080882D */ daddu $s1, $a0, $zero +/* BB03EC 80242AAC AFBF0038 */ sw $ra, 0x38($sp) +/* BB03F0 80242AB0 AFB00030 */ sw $s0, 0x30($sp) +/* BB03F4 80242AB4 8E300148 */ lw $s0, 0x148($s1) +/* BB03F8 80242AB8 0C00EABB */ jal get_npc_unsafe +/* BB03FC 80242ABC 86040008 */ lh $a0, 8($s0) +/* BB0400 80242AC0 0040282D */ daddu $a1, $v0, $zero +/* BB0404 80242AC4 94A2008E */ lhu $v0, 0x8e($a1) +/* BB0408 80242AC8 24420001 */ addiu $v0, $v0, 1 +/* BB040C 80242ACC A4A2008E */ sh $v0, 0x8e($a1) +/* BB0410 80242AD0 00021400 */ sll $v0, $v0, 0x10 +/* BB0414 80242AD4 8E0300A0 */ lw $v1, 0xa0($s0) +/* BB0418 80242AD8 00021403 */ sra $v0, $v0, 0x10 +/* BB041C 80242ADC 14430004 */ bne $v0, $v1, .L80242AF0 +/* BB0420 80242AE0 00000000 */ nop +/* BB0424 80242AE4 8E0200CC */ lw $v0, 0xcc($s0) +/* BB0428 80242AE8 8C42002C */ lw $v0, 0x2c($v0) +/* BB042C 80242AEC ACA20028 */ sw $v0, 0x28($a1) +.L80242AF0: +/* BB0430 80242AF0 84A3008E */ lh $v1, 0x8e($a1) +/* BB0434 80242AF4 8E0200A4 */ lw $v0, 0xa4($s0) +/* BB0438 80242AF8 14620002 */ bne $v1, $v0, .L80242B04 +/* BB043C 80242AFC 24020003 */ addiu $v0, $zero, 3 +/* BB0440 80242B00 AE02006C */ sw $v0, 0x6c($s0) +.L80242B04: +/* BB0444 80242B04 84A2008E */ lh $v0, 0x8e($a1) +/* BB0448 80242B08 8E03009C */ lw $v1, 0x9c($s0) +/* BB044C 80242B0C 0043102A */ slt $v0, $v0, $v1 +/* BB0450 80242B10 1440001E */ bnez $v0, .L80242B8C +/* BB0454 80242B14 24020004 */ addiu $v0, $zero, 4 +/* BB0458 80242B18 AE02006C */ sw $v0, 0x6c($s0) +/* BB045C 80242B1C 24020008 */ addiu $v0, $zero, 8 +/* BB0460 80242B20 24040003 */ addiu $a0, $zero, 3 +/* BB0464 80242B24 A4A2008E */ sh $v0, 0x8e($a1) +/* BB0468 80242B28 8E0200CC */ lw $v0, 0xcc($s0) +/* BB046C 80242B2C 84A300A8 */ lh $v1, 0xa8($a1) +/* BB0470 80242B30 3C013F80 */ lui $at, 0x3f80 +/* BB0474 80242B34 44810000 */ mtc1 $at, $f0 +/* BB0478 80242B38 3C014000 */ lui $at, 0x4000 +/* BB047C 80242B3C 44811000 */ mtc1 $at, $f2 +/* BB0480 80242B40 3C01C1A0 */ lui $at, 0xc1a0 +/* BB0484 80242B44 44812000 */ mtc1 $at, $f4 +/* BB0488 80242B48 44833000 */ mtc1 $v1, $f6 +/* BB048C 80242B4C 00000000 */ nop +/* BB0490 80242B50 468031A0 */ cvt.s.w $f6, $f6 +/* BB0494 80242B54 8C420000 */ lw $v0, ($v0) +/* BB0498 80242B58 44073000 */ mfc1 $a3, $f6 +/* BB049C 80242B5C 0000302D */ daddu $a2, $zero, $zero +/* BB04A0 80242B60 ACA20028 */ sw $v0, 0x28($a1) +/* BB04A4 80242B64 2402000A */ addiu $v0, $zero, 0xa +/* BB04A8 80242B68 AFA2001C */ sw $v0, 0x1c($sp) +/* BB04AC 80242B6C 27A20028 */ addiu $v0, $sp, 0x28 +/* BB04B0 80242B70 E7A00010 */ swc1 $f0, 0x10($sp) +/* BB04B4 80242B74 E7A20014 */ swc1 $f2, 0x14($sp) +/* BB04B8 80242B78 E7A40018 */ swc1 $f4, 0x18($sp) +/* BB04BC 80242B7C 0C01BFA4 */ jal fx_emote +/* BB04C0 80242B80 AFA20020 */ sw $v0, 0x20($sp) +/* BB04C4 80242B84 2402000D */ addiu $v0, $zero, 0xd +/* BB04C8 80242B88 AE220070 */ sw $v0, 0x70($s1) +.L80242B8C: +/* BB04CC 80242B8C 8FBF0038 */ lw $ra, 0x38($sp) +/* BB04D0 80242B90 8FB10034 */ lw $s1, 0x34($sp) +/* BB04D4 80242B94 8FB00030 */ lw $s0, 0x30($sp) +/* BB04D8 80242B98 03E00008 */ jr $ra +/* BB04DC 80242B9C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC.s deleted file mode 100644 index d1a540a60a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC.s +++ /dev/null @@ -1,166 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CEC -/* BB062C 80242CEC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BB0630 80242CF0 AFB20038 */ sw $s2, 0x38($sp) -/* BB0634 80242CF4 0080902D */ daddu $s2, $a0, $zero -/* BB0638 80242CF8 AFBF0048 */ sw $ra, 0x48($sp) -/* BB063C 80242CFC AFB50044 */ sw $s5, 0x44($sp) -/* BB0640 80242D00 AFB40040 */ sw $s4, 0x40($sp) -/* BB0644 80242D04 AFB3003C */ sw $s3, 0x3c($sp) -/* BB0648 80242D08 AFB10034 */ sw $s1, 0x34($sp) -/* BB064C 80242D0C AFB00030 */ sw $s0, 0x30($sp) -/* BB0650 80242D10 8E510148 */ lw $s1, 0x148($s2) -/* BB0654 80242D14 86240008 */ lh $a0, 8($s1) -/* BB0658 80242D18 0C00EABB */ jal get_npc_unsafe -/* BB065C 80242D1C 00A0802D */ daddu $s0, $a1, $zero -/* BB0660 80242D20 8E43000C */ lw $v1, 0xc($s2) -/* BB0664 80242D24 0240202D */ daddu $a0, $s2, $zero -/* BB0668 80242D28 8C650000 */ lw $a1, ($v1) -/* BB066C 80242D2C 0C0B1EAF */ jal get_variable -/* BB0670 80242D30 0040A82D */ daddu $s5, $v0, $zero -/* BB0674 80242D34 AFA00010 */ sw $zero, 0x10($sp) -/* BB0678 80242D38 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB067C 80242D3C 8C630030 */ lw $v1, 0x30($v1) -/* BB0680 80242D40 AFA30014 */ sw $v1, 0x14($sp) -/* BB0684 80242D44 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB0688 80242D48 8C63001C */ lw $v1, 0x1c($v1) -/* BB068C 80242D4C AFA30018 */ sw $v1, 0x18($sp) -/* BB0690 80242D50 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB0694 80242D54 8C630024 */ lw $v1, 0x24($v1) -/* BB0698 80242D58 AFA3001C */ sw $v1, 0x1c($sp) -/* BB069C 80242D5C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB06A0 80242D60 8C630028 */ lw $v1, 0x28($v1) -/* BB06A4 80242D64 27B40010 */ addiu $s4, $sp, 0x10 -/* BB06A8 80242D68 AFA30020 */ sw $v1, 0x20($sp) -/* BB06AC 80242D6C 8E2300D0 */ lw $v1, 0xd0($s1) -/* BB06B0 80242D70 3C014348 */ lui $at, 0x4348 -/* BB06B4 80242D74 44810000 */ mtc1 $at, $f0 -/* BB06B8 80242D78 8C63002C */ lw $v1, 0x2c($v1) -/* BB06BC 80242D7C 0040982D */ daddu $s3, $v0, $zero -/* BB06C0 80242D80 E7A00028 */ swc1 $f0, 0x28($sp) -/* BB06C4 80242D84 A7A0002C */ sh $zero, 0x2c($sp) -/* BB06C8 80242D88 16000005 */ bnez $s0, .L80242DA0 -/* BB06CC 80242D8C AFA30024 */ sw $v1, 0x24($sp) -/* BB06D0 80242D90 8E2200B0 */ lw $v0, 0xb0($s1) -/* BB06D4 80242D94 30420004 */ andi $v0, $v0, 4 -/* BB06D8 80242D98 10400011 */ beqz $v0, .L80242DE0 -/* BB06DC 80242D9C 00000000 */ nop -.L80242DA0: -/* BB06E0 80242DA0 AE400070 */ sw $zero, 0x70($s2) -/* BB06E4 80242DA4 A6A0008E */ sh $zero, 0x8e($s5) -/* BB06E8 80242DA8 8E2200CC */ lw $v0, 0xcc($s1) -/* BB06EC 80242DAC 8C420000 */ lw $v0, ($v0) -/* BB06F0 80242DB0 AEA20028 */ sw $v0, 0x28($s5) -/* BB06F4 80242DB4 8E2200B0 */ lw $v0, 0xb0($s1) -/* BB06F8 80242DB8 30420004 */ andi $v0, $v0, 4 -/* BB06FC 80242DBC 10400008 */ beqz $v0, .L80242DE0 -/* BB0700 80242DC0 AE20006C */ sw $zero, 0x6c($s1) -/* BB0704 80242DC4 24020063 */ addiu $v0, $zero, 0x63 -/* BB0708 80242DC8 AE420070 */ sw $v0, 0x70($s2) -/* BB070C 80242DCC AE400074 */ sw $zero, 0x74($s2) -/* BB0710 80242DD0 8E2200B0 */ lw $v0, 0xb0($s1) -/* BB0714 80242DD4 2403FFFB */ addiu $v1, $zero, -5 -/* BB0718 80242DD8 00431024 */ and $v0, $v0, $v1 -/* BB071C 80242DDC AE2200B0 */ sw $v0, 0xb0($s1) -.L80242DE0: -/* BB0720 80242DE0 8E430070 */ lw $v1, 0x70($s2) -/* BB0724 80242DE4 2410000B */ addiu $s0, $zero, 0xb -/* BB0728 80242DE8 1070002A */ beq $v1, $s0, .L80242E94 -/* BB072C 80242DEC 2862000C */ slti $v0, $v1, 0xc -/* BB0730 80242DF0 1040000D */ beqz $v0, .L80242E28 -/* BB0734 80242DF4 24020001 */ addiu $v0, $zero, 1 -/* BB0738 80242DF8 1062001A */ beq $v1, $v0, .L80242E64 -/* BB073C 80242DFC 28620002 */ slti $v0, $v1, 2 -/* BB0740 80242E00 10400005 */ beqz $v0, .L80242E18 -/* BB0744 80242E04 2402000A */ addiu $v0, $zero, 0xa -/* BB0748 80242E08 10600013 */ beqz $v1, .L80242E58 -/* BB074C 80242E0C 0240202D */ daddu $a0, $s2, $zero -/* BB0750 80242E10 08090BC5 */ j .L80242F14 -/* BB0754 80242E14 00000000 */ nop -.L80242E18: -/* BB0758 80242E18 10620018 */ beq $v1, $v0, .L80242E7C -/* BB075C 80242E1C 0240202D */ daddu $a0, $s2, $zero -/* BB0760 80242E20 08090BC5 */ j .L80242F14 -/* BB0764 80242E24 00000000 */ nop -.L80242E28: -/* BB0768 80242E28 2402000D */ addiu $v0, $zero, 0xd -/* BB076C 80242E2C 10620029 */ beq $v1, $v0, .L80242ED4 -/* BB0770 80242E30 0062102A */ slt $v0, $v1, $v0 -/* BB0774 80242E34 14400020 */ bnez $v0, .L80242EB8 -/* BB0778 80242E38 0240202D */ daddu $a0, $s2, $zero -/* BB077C 80242E3C 2402000E */ addiu $v0, $zero, 0xe -/* BB0780 80242E40 1062002D */ beq $v1, $v0, .L80242EF8 -/* BB0784 80242E44 24020063 */ addiu $v0, $zero, 0x63 -/* BB0788 80242E48 10620030 */ beq $v1, $v0, .L80242F0C -/* BB078C 80242E4C 00000000 */ nop -/* BB0790 80242E50 08090BC5 */ j .L80242F14 -/* BB0794 80242E54 00000000 */ nop -.L80242E58: -/* BB0798 80242E58 0260282D */ daddu $a1, $s3, $zero -/* BB079C 80242E5C 0C09079A */ jal func_80241E68 -/* BB07A0 80242E60 0280302D */ daddu $a2, $s4, $zero -.L80242E64: -/* BB07A4 80242E64 0240202D */ daddu $a0, $s2, $zero -/* BB07A8 80242E68 0260282D */ daddu $a1, $s3, $zero -/* BB07AC 80242E6C 0C0907B5 */ jal func_80241ED4 -/* BB07B0 80242E70 0280302D */ daddu $a2, $s4, $zero -/* BB07B4 80242E74 08090BC5 */ j .L80242F14 -/* BB07B8 80242E78 00000000 */ nop -.L80242E7C: -/* BB07BC 80242E7C 0260282D */ daddu $a1, $s3, $zero -/* BB07C0 80242E80 0C0907F4 */ jal func_80241FD0 -/* BB07C4 80242E84 0280302D */ daddu $a2, $s4, $zero -/* BB07C8 80242E88 8E420070 */ lw $v0, 0x70($s2) -/* BB07CC 80242E8C 14500021 */ bne $v0, $s0, .L80242F14 -/* BB07D0 80242E90 00000000 */ nop -.L80242E94: -/* BB07D4 80242E94 0240202D */ daddu $a0, $s2, $zero -/* BB07D8 80242E98 0260282D */ daddu $a1, $s3, $zero -/* BB07DC 80242E9C 0C090A84 */ jal func_80242A10 -/* BB07E0 80242EA0 0280302D */ daddu $a2, $s4, $zero -/* BB07E4 80242EA4 8E430070 */ lw $v1, 0x70($s2) -/* BB07E8 80242EA8 2402000C */ addiu $v0, $zero, 0xc -/* BB07EC 80242EAC 14620019 */ bne $v1, $v0, .L80242F14 -/* BB07F0 80242EB0 00000000 */ nop -/* BB07F4 80242EB4 0240202D */ daddu $a0, $s2, $zero -.L80242EB8: -/* BB07F8 80242EB8 0260282D */ daddu $a1, $s3, $zero -/* BB07FC 80242EBC 0C090AA8 */ jal func_80242AA0 -/* BB0800 80242EC0 0280302D */ daddu $a2, $s4, $zero -/* BB0804 80242EC4 8E430070 */ lw $v1, 0x70($s2) -/* BB0808 80242EC8 2402000D */ addiu $v0, $zero, 0xd -/* BB080C 80242ECC 14620011 */ bne $v1, $v0, .L80242F14 -/* BB0810 80242ED0 00000000 */ nop -.L80242ED4: -/* BB0814 80242ED4 0240202D */ daddu $a0, $s2, $zero -/* BB0818 80242ED8 0260282D */ daddu $a1, $s3, $zero -/* BB081C 80242EDC 0C090AE8 */ jal pause_set_cursor_opacity -/* BB0820 80242EE0 0280302D */ daddu $a2, $s4, $zero -/* BB0824 80242EE4 8E430070 */ lw $v1, 0x70($s2) -/* BB0828 80242EE8 2402000E */ addiu $v0, $zero, 0xe -/* BB082C 80242EEC 14620009 */ bne $v1, $v0, .L80242F14 -/* BB0830 80242EF0 00000000 */ nop -/* BB0834 80242EF4 0240202D */ daddu $a0, $s2, $zero -.L80242EF8: -/* BB0838 80242EF8 0260282D */ daddu $a1, $s3, $zero -/* BB083C 80242EFC 0C090B00 */ jal func_80242C00 -/* BB0840 80242F00 0280302D */ daddu $a2, $s4, $zero -/* BB0844 80242F04 08090BC5 */ j .L80242F14 -/* BB0848 80242F08 00000000 */ nop -.L80242F0C: -/* BB084C 80242F0C 0C0129CF */ jal func_8004A73C -/* BB0850 80242F10 0240202D */ daddu $a0, $s2, $zero -.L80242F14: -/* BB0854 80242F14 8FBF0048 */ lw $ra, 0x48($sp) -/* BB0858 80242F18 8FB50044 */ lw $s5, 0x44($sp) -/* BB085C 80242F1C 8FB40040 */ lw $s4, 0x40($sp) -/* BB0860 80242F20 8FB3003C */ lw $s3, 0x3c($sp) -/* BB0864 80242F24 8FB20038 */ lw $s2, 0x38($sp) -/* BB0868 80242F28 8FB10034 */ lw $s1, 0x34($sp) -/* BB086C 80242F2C 8FB00030 */ lw $s0, 0x30($sp) -/* BB0870 80242F30 0000102D */ daddu $v0, $zero, $zero -/* BB0874 80242F34 03E00008 */ jr $ra -/* BB0878 80242F38 27BD0050 */ addiu $sp, $sp, 0x50 -/* BB087C 80242F3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s new file mode 100644 index 0000000000..fde3889e83 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_08/BAD940/func_80242CEC_BB062C.s @@ -0,0 +1,166 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242CEC_BB062C +/* BB062C 80242CEC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BB0630 80242CF0 AFB20038 */ sw $s2, 0x38($sp) +/* BB0634 80242CF4 0080902D */ daddu $s2, $a0, $zero +/* BB0638 80242CF8 AFBF0048 */ sw $ra, 0x48($sp) +/* BB063C 80242CFC AFB50044 */ sw $s5, 0x44($sp) +/* BB0640 80242D00 AFB40040 */ sw $s4, 0x40($sp) +/* BB0644 80242D04 AFB3003C */ sw $s3, 0x3c($sp) +/* BB0648 80242D08 AFB10034 */ sw $s1, 0x34($sp) +/* BB064C 80242D0C AFB00030 */ sw $s0, 0x30($sp) +/* BB0650 80242D10 8E510148 */ lw $s1, 0x148($s2) +/* BB0654 80242D14 86240008 */ lh $a0, 8($s1) +/* BB0658 80242D18 0C00EABB */ jal get_npc_unsafe +/* BB065C 80242D1C 00A0802D */ daddu $s0, $a1, $zero +/* BB0660 80242D20 8E43000C */ lw $v1, 0xc($s2) +/* BB0664 80242D24 0240202D */ daddu $a0, $s2, $zero +/* BB0668 80242D28 8C650000 */ lw $a1, ($v1) +/* BB066C 80242D2C 0C0B1EAF */ jal get_variable +/* BB0670 80242D30 0040A82D */ daddu $s5, $v0, $zero +/* BB0674 80242D34 AFA00010 */ sw $zero, 0x10($sp) +/* BB0678 80242D38 8E2300D0 */ lw $v1, 0xd0($s1) +/* BB067C 80242D3C 8C630030 */ lw $v1, 0x30($v1) +/* BB0680 80242D40 AFA30014 */ sw $v1, 0x14($sp) +/* BB0684 80242D44 8E2300D0 */ lw $v1, 0xd0($s1) +/* BB0688 80242D48 8C63001C */ lw $v1, 0x1c($v1) +/* BB068C 80242D4C AFA30018 */ sw $v1, 0x18($sp) +/* BB0690 80242D50 8E2300D0 */ lw $v1, 0xd0($s1) +/* BB0694 80242D54 8C630024 */ lw $v1, 0x24($v1) +/* BB0698 80242D58 AFA3001C */ sw $v1, 0x1c($sp) +/* BB069C 80242D5C 8E2300D0 */ lw $v1, 0xd0($s1) +/* BB06A0 80242D60 8C630028 */ lw $v1, 0x28($v1) +/* BB06A4 80242D64 27B40010 */ addiu $s4, $sp, 0x10 +/* BB06A8 80242D68 AFA30020 */ sw $v1, 0x20($sp) +/* BB06AC 80242D6C 8E2300D0 */ lw $v1, 0xd0($s1) +/* BB06B0 80242D70 3C014348 */ lui $at, 0x4348 +/* BB06B4 80242D74 44810000 */ mtc1 $at, $f0 +/* BB06B8 80242D78 8C63002C */ lw $v1, 0x2c($v1) +/* BB06BC 80242D7C 0040982D */ daddu $s3, $v0, $zero +/* BB06C0 80242D80 E7A00028 */ swc1 $f0, 0x28($sp) +/* BB06C4 80242D84 A7A0002C */ sh $zero, 0x2c($sp) +/* BB06C8 80242D88 16000005 */ bnez $s0, .L80242DA0 +/* BB06CC 80242D8C AFA30024 */ sw $v1, 0x24($sp) +/* BB06D0 80242D90 8E2200B0 */ lw $v0, 0xb0($s1) +/* BB06D4 80242D94 30420004 */ andi $v0, $v0, 4 +/* BB06D8 80242D98 10400011 */ beqz $v0, .L80242DE0 +/* BB06DC 80242D9C 00000000 */ nop +.L80242DA0: +/* BB06E0 80242DA0 AE400070 */ sw $zero, 0x70($s2) +/* BB06E4 80242DA4 A6A0008E */ sh $zero, 0x8e($s5) +/* BB06E8 80242DA8 8E2200CC */ lw $v0, 0xcc($s1) +/* BB06EC 80242DAC 8C420000 */ lw $v0, ($v0) +/* BB06F0 80242DB0 AEA20028 */ sw $v0, 0x28($s5) +/* BB06F4 80242DB4 8E2200B0 */ lw $v0, 0xb0($s1) +/* BB06F8 80242DB8 30420004 */ andi $v0, $v0, 4 +/* BB06FC 80242DBC 10400008 */ beqz $v0, .L80242DE0 +/* BB0700 80242DC0 AE20006C */ sw $zero, 0x6c($s1) +/* BB0704 80242DC4 24020063 */ addiu $v0, $zero, 0x63 +/* BB0708 80242DC8 AE420070 */ sw $v0, 0x70($s2) +/* BB070C 80242DCC AE400074 */ sw $zero, 0x74($s2) +/* BB0710 80242DD0 8E2200B0 */ lw $v0, 0xb0($s1) +/* BB0714 80242DD4 2403FFFB */ addiu $v1, $zero, -5 +/* BB0718 80242DD8 00431024 */ and $v0, $v0, $v1 +/* BB071C 80242DDC AE2200B0 */ sw $v0, 0xb0($s1) +.L80242DE0: +/* BB0720 80242DE0 8E430070 */ lw $v1, 0x70($s2) +/* BB0724 80242DE4 2410000B */ addiu $s0, $zero, 0xb +/* BB0728 80242DE8 1070002A */ beq $v1, $s0, .L80242E94 +/* BB072C 80242DEC 2862000C */ slti $v0, $v1, 0xc +/* BB0730 80242DF0 1040000D */ beqz $v0, .L80242E28 +/* BB0734 80242DF4 24020001 */ addiu $v0, $zero, 1 +/* BB0738 80242DF8 1062001A */ beq $v1, $v0, .L80242E64 +/* BB073C 80242DFC 28620002 */ slti $v0, $v1, 2 +/* BB0740 80242E00 10400005 */ beqz $v0, .L80242E18 +/* BB0744 80242E04 2402000A */ addiu $v0, $zero, 0xa +/* BB0748 80242E08 10600013 */ beqz $v1, .L80242E58 +/* BB074C 80242E0C 0240202D */ daddu $a0, $s2, $zero +/* BB0750 80242E10 08090BC5 */ j .L80242F14 +/* BB0754 80242E14 00000000 */ nop +.L80242E18: +/* BB0758 80242E18 10620018 */ beq $v1, $v0, .L80242E7C +/* BB075C 80242E1C 0240202D */ daddu $a0, $s2, $zero +/* BB0760 80242E20 08090BC5 */ j .L80242F14 +/* BB0764 80242E24 00000000 */ nop +.L80242E28: +/* BB0768 80242E28 2402000D */ addiu $v0, $zero, 0xd +/* BB076C 80242E2C 10620029 */ beq $v1, $v0, .L80242ED4 +/* BB0770 80242E30 0062102A */ slt $v0, $v1, $v0 +/* BB0774 80242E34 14400020 */ bnez $v0, .L80242EB8 +/* BB0778 80242E38 0240202D */ daddu $a0, $s2, $zero +/* BB077C 80242E3C 2402000E */ addiu $v0, $zero, 0xe +/* BB0780 80242E40 1062002D */ beq $v1, $v0, .L80242EF8 +/* BB0784 80242E44 24020063 */ addiu $v0, $zero, 0x63 +/* BB0788 80242E48 10620030 */ beq $v1, $v0, .L80242F0C +/* BB078C 80242E4C 00000000 */ nop +/* BB0790 80242E50 08090BC5 */ j .L80242F14 +/* BB0794 80242E54 00000000 */ nop +.L80242E58: +/* BB0798 80242E58 0260282D */ daddu $a1, $s3, $zero +/* BB079C 80242E5C 0C09079A */ jal func_80241E68_BAF7A8 +/* BB07A0 80242E60 0280302D */ daddu $a2, $s4, $zero +.L80242E64: +/* BB07A4 80242E64 0240202D */ daddu $a0, $s2, $zero +/* BB07A8 80242E68 0260282D */ daddu $a1, $s3, $zero +/* BB07AC 80242E6C 0C0907B5 */ jal func_80241ED4_BAF814 +/* BB07B0 80242E70 0280302D */ daddu $a2, $s4, $zero +/* BB07B4 80242E74 08090BC5 */ j .L80242F14 +/* BB07B8 80242E78 00000000 */ nop +.L80242E7C: +/* BB07BC 80242E7C 0260282D */ daddu $a1, $s3, $zero +/* BB07C0 80242E80 0C0907F4 */ jal func_80241FD0_BAF910 +/* BB07C4 80242E84 0280302D */ daddu $a2, $s4, $zero +/* BB07C8 80242E88 8E420070 */ lw $v0, 0x70($s2) +/* BB07CC 80242E8C 14500021 */ bne $v0, $s0, .L80242F14 +/* BB07D0 80242E90 00000000 */ nop +.L80242E94: +/* BB07D4 80242E94 0240202D */ daddu $a0, $s2, $zero +/* BB07D8 80242E98 0260282D */ daddu $a1, $s3, $zero +/* BB07DC 80242E9C 0C090A84 */ jal func_80242A10_BB0350 +/* BB07E0 80242EA0 0280302D */ daddu $a2, $s4, $zero +/* BB07E4 80242EA4 8E430070 */ lw $v1, 0x70($s2) +/* BB07E8 80242EA8 2402000C */ addiu $v0, $zero, 0xc +/* BB07EC 80242EAC 14620019 */ bne $v1, $v0, .L80242F14 +/* BB07F0 80242EB0 00000000 */ nop +/* BB07F4 80242EB4 0240202D */ daddu $a0, $s2, $zero +.L80242EB8: +/* BB07F8 80242EB8 0260282D */ daddu $a1, $s3, $zero +/* BB07FC 80242EBC 0C090AA8 */ jal func_80242AA0_BB03E0 +/* BB0800 80242EC0 0280302D */ daddu $a2, $s4, $zero +/* BB0804 80242EC4 8E430070 */ lw $v1, 0x70($s2) +/* BB0808 80242EC8 2402000D */ addiu $v0, $zero, 0xd +/* BB080C 80242ECC 14620011 */ bne $v1, $v0, .L80242F14 +/* BB0810 80242ED0 00000000 */ nop +.L80242ED4: +/* BB0814 80242ED4 0240202D */ daddu $a0, $s2, $zero +/* BB0818 80242ED8 0260282D */ daddu $a1, $s3, $zero +/* BB081C 80242EDC 0C090AE8 */ jal pause_set_cursor_opacity +/* BB0820 80242EE0 0280302D */ daddu $a2, $s4, $zero +/* BB0824 80242EE4 8E430070 */ lw $v1, 0x70($s2) +/* BB0828 80242EE8 2402000E */ addiu $v0, $zero, 0xe +/* BB082C 80242EEC 14620009 */ bne $v1, $v0, .L80242F14 +/* BB0830 80242EF0 00000000 */ nop +/* BB0834 80242EF4 0240202D */ daddu $a0, $s2, $zero +.L80242EF8: +/* BB0838 80242EF8 0260282D */ daddu $a1, $s3, $zero +/* BB083C 80242EFC 0C090B00 */ jal func_80242C00_BB0540 +/* BB0840 80242F00 0280302D */ daddu $a2, $s4, $zero +/* BB0844 80242F04 08090BC5 */ j .L80242F14 +/* BB0848 80242F08 00000000 */ nop +.L80242F0C: +/* BB084C 80242F0C 0C0129CF */ jal func_8004A73C +/* BB0850 80242F10 0240202D */ daddu $a0, $s2, $zero +.L80242F14: +/* BB0854 80242F14 8FBF0048 */ lw $ra, 0x48($sp) +/* BB0858 80242F18 8FB50044 */ lw $s5, 0x44($sp) +/* BB085C 80242F1C 8FB40040 */ lw $s4, 0x40($sp) +/* BB0860 80242F20 8FB3003C */ lw $s3, 0x3c($sp) +/* BB0864 80242F24 8FB20038 */ lw $s2, 0x38($sp) +/* BB0868 80242F28 8FB10034 */ lw $s1, 0x34($sp) +/* BB086C 80242F2C 8FB00030 */ lw $s0, 0x30($sp) +/* BB0870 80242F30 0000102D */ daddu $v0, $zero, $zero +/* BB0874 80242F34 03E00008 */ jr $ra +/* BB0878 80242F38 27BD0050 */ addiu $sp, $sp, 0x50 +/* BB087C 80242F3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608.s deleted file mode 100644 index b895ca6114..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240608 -/* BB3408 80240608 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BB340C 8024060C AFB3001C */ sw $s3, 0x1c($sp) -/* BB3410 80240610 0080982D */ daddu $s3, $a0, $zero -/* BB3414 80240614 AFBF0020 */ sw $ra, 0x20($sp) -/* BB3418 80240618 AFB20018 */ sw $s2, 0x18($sp) -/* BB341C 8024061C AFB10014 */ sw $s1, 0x14($sp) -/* BB3420 80240620 AFB00010 */ sw $s0, 0x10($sp) -/* BB3424 80240624 8E720148 */ lw $s2, 0x148($s3) -/* BB3428 80240628 86440008 */ lh $a0, 8($s2) -/* BB342C 8024062C 0C00EABB */ jal get_npc_unsafe -/* BB3430 80240630 00A0882D */ daddu $s1, $a1, $zero -/* BB3434 80240634 8E240008 */ lw $a0, 8($s1) -/* BB3438 80240638 0040802D */ daddu $s0, $v0, $zero -/* BB343C 8024063C 00041FC2 */ srl $v1, $a0, 0x1f -/* BB3440 80240640 00832021 */ addu $a0, $a0, $v1 -/* BB3444 80240644 00042043 */ sra $a0, $a0, 1 -/* BB3448 80240648 0C00A67F */ jal rand_int -/* BB344C 8024064C 24840001 */ addiu $a0, $a0, 1 -/* BB3450 80240650 8E230008 */ lw $v1, 8($s1) -/* BB3454 80240654 240400B4 */ addiu $a0, $zero, 0xb4 -/* BB3458 80240658 00032FC2 */ srl $a1, $v1, 0x1f -/* BB345C 8024065C 00651821 */ addu $v1, $v1, $a1 -/* BB3460 80240660 00031843 */ sra $v1, $v1, 1 -/* BB3464 80240664 00621821 */ addu $v1, $v1, $v0 -/* BB3468 80240668 0C00A67F */ jal rand_int -/* BB346C 8024066C A603008E */ sh $v1, 0x8e($s0) -/* BB3470 80240670 C60C000C */ lwc1 $f12, 0xc($s0) -/* BB3474 80240674 44820000 */ mtc1 $v0, $f0 -/* BB3478 80240678 00000000 */ nop -/* BB347C 8024067C 46800020 */ cvt.s.w $f0, $f0 -/* BB3480 80240680 46006300 */ add.s $f12, $f12, $f0 -/* BB3484 80240684 3C0142B4 */ lui $at, 0x42b4 -/* BB3488 80240688 44810000 */ mtc1 $at, $f0 -/* BB348C 8024068C 0C00A6C9 */ jal clamp_angle -/* BB3490 80240690 46006301 */ sub.s $f12, $f12, $f0 -/* BB3494 80240694 E600000C */ swc1 $f0, 0xc($s0) -/* BB3498 80240698 8E4200CC */ lw $v0, 0xcc($s2) -/* BB349C 8024069C 8C420000 */ lw $v0, ($v0) -/* BB34A0 802406A0 AE020028 */ sw $v0, 0x28($s0) -/* BB34A4 802406A4 24020003 */ addiu $v0, $zero, 3 -/* BB34A8 802406A8 AE620070 */ sw $v0, 0x70($s3) -/* BB34AC 802406AC 8FBF0020 */ lw $ra, 0x20($sp) -/* BB34B0 802406B0 8FB3001C */ lw $s3, 0x1c($sp) -/* BB34B4 802406B4 8FB20018 */ lw $s2, 0x18($sp) -/* BB34B8 802406B8 8FB10014 */ lw $s1, 0x14($sp) -/* BB34BC 802406BC 8FB00010 */ lw $s0, 0x10($sp) -/* BB34C0 802406C0 03E00008 */ jr $ra -/* BB34C4 802406C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s new file mode 100644 index 0000000000..e3efb6389e --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240608_BB3408.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240608_BB3408 +/* BB3408 80240608 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* BB340C 8024060C AFB3001C */ sw $s3, 0x1c($sp) +/* BB3410 80240610 0080982D */ daddu $s3, $a0, $zero +/* BB3414 80240614 AFBF0020 */ sw $ra, 0x20($sp) +/* BB3418 80240618 AFB20018 */ sw $s2, 0x18($sp) +/* BB341C 8024061C AFB10014 */ sw $s1, 0x14($sp) +/* BB3420 80240620 AFB00010 */ sw $s0, 0x10($sp) +/* BB3424 80240624 8E720148 */ lw $s2, 0x148($s3) +/* BB3428 80240628 86440008 */ lh $a0, 8($s2) +/* BB342C 8024062C 0C00EABB */ jal get_npc_unsafe +/* BB3430 80240630 00A0882D */ daddu $s1, $a1, $zero +/* BB3434 80240634 8E240008 */ lw $a0, 8($s1) +/* BB3438 80240638 0040802D */ daddu $s0, $v0, $zero +/* BB343C 8024063C 00041FC2 */ srl $v1, $a0, 0x1f +/* BB3440 80240640 00832021 */ addu $a0, $a0, $v1 +/* BB3444 80240644 00042043 */ sra $a0, $a0, 1 +/* BB3448 80240648 0C00A67F */ jal rand_int +/* BB344C 8024064C 24840001 */ addiu $a0, $a0, 1 +/* BB3450 80240650 8E230008 */ lw $v1, 8($s1) +/* BB3454 80240654 240400B4 */ addiu $a0, $zero, 0xb4 +/* BB3458 80240658 00032FC2 */ srl $a1, $v1, 0x1f +/* BB345C 8024065C 00651821 */ addu $v1, $v1, $a1 +/* BB3460 80240660 00031843 */ sra $v1, $v1, 1 +/* BB3464 80240664 00621821 */ addu $v1, $v1, $v0 +/* BB3468 80240668 0C00A67F */ jal rand_int +/* BB346C 8024066C A603008E */ sh $v1, 0x8e($s0) +/* BB3470 80240670 C60C000C */ lwc1 $f12, 0xc($s0) +/* BB3474 80240674 44820000 */ mtc1 $v0, $f0 +/* BB3478 80240678 00000000 */ nop +/* BB347C 8024067C 46800020 */ cvt.s.w $f0, $f0 +/* BB3480 80240680 46006300 */ add.s $f12, $f12, $f0 +/* BB3484 80240684 3C0142B4 */ lui $at, 0x42b4 +/* BB3488 80240688 44810000 */ mtc1 $at, $f0 +/* BB348C 8024068C 0C00A6C9 */ jal clamp_angle +/* BB3490 80240690 46006301 */ sub.s $f12, $f12, $f0 +/* BB3494 80240694 E600000C */ swc1 $f0, 0xc($s0) +/* BB3498 80240698 8E4200CC */ lw $v0, 0xcc($s2) +/* BB349C 8024069C 8C420000 */ lw $v0, ($v0) +/* BB34A0 802406A0 AE020028 */ sw $v0, 0x28($s0) +/* BB34A4 802406A4 24020003 */ addiu $v0, $zero, 3 +/* BB34A8 802406A8 AE620070 */ sw $v0, 0x70($s3) +/* BB34AC 802406AC 8FBF0020 */ lw $ra, 0x20($sp) +/* BB34B0 802406B0 8FB3001C */ lw $s3, 0x1c($sp) +/* BB34B4 802406B4 8FB20018 */ lw $s2, 0x18($sp) +/* BB34B8 802406B8 8FB10014 */ lw $s1, 0x14($sp) +/* BB34BC 802406BC 8FB00010 */ lw $s0, 0x10($sp) +/* BB34C0 802406C0 03E00008 */ jr $ra +/* BB34C4 802406C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s index 6c02221e52..1a598f27f6 100644 --- a/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s +++ b/asm/nonmatchings/world/area_mim/mim_09/BB2E00/func_80240C90_BB3A90.s @@ -95,17 +95,17 @@ glabel func_80240C90_BB3A90 /* BB3BF0 80240DF0 00000000 */ nop /* BB3BF4 80240DF4 0260202D */ daddu $a0, $s3, $zero /* BB3BF8 80240DF8 0280282D */ daddu $a1, $s4, $zero -/* BB3BFC 80240DFC 0C090028 */ jal func_802400A0 +/* BB3BFC 80240DFC 0C090028 */ jal func_802400A0_BB2EA0 /* BB3C00 80240E00 0200302D */ daddu $a2, $s0, $zero /* BB3C04 80240E04 0260202D */ daddu $a0, $s3, $zero /* BB3C08 80240E08 0280282D */ daddu $a1, $s4, $zero -/* BB3C0C 80240E0C 0C0900B4 */ jal func_802402D0 +/* BB3C0C 80240E0C 0C0900B4 */ jal func_802402D0_BB30D0 /* BB3C10 80240E10 0200302D */ daddu $a2, $s0, $zero /* BB3C14 80240E14 080903A4 */ j .L80240E90 /* BB3C18 80240E18 0000102D */ daddu $v0, $zero, $zero /* BB3C1C 80240E1C 0260202D */ daddu $a0, $s3, $zero /* BB3C20 80240E20 0280282D */ daddu $a1, $s4, $zero -/* BB3C24 80240E24 0C090182 */ jal func_80240608 +/* BB3C24 80240E24 0C090182 */ jal func_80240608_BB3408 /* BB3C28 80240E28 0200302D */ daddu $a2, $s0, $zero /* BB3C2C 80240E2C 8E630070 */ lw $v1, 0x70($s3) /* BB3C30 80240E30 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80240C90_BB3A90 /* BB3C38 80240E38 0000102D */ daddu $v0, $zero, $zero /* BB3C3C 80240E3C 0260202D */ daddu $a0, $s3, $zero /* BB3C40 80240E40 0280282D */ daddu $a1, $s4, $zero -/* BB3C44 80240E44 0C0901B2 */ jal func_802406C8 +/* BB3C44 80240E44 0C0901B2 */ jal func_802406C8_BB34C8 /* BB3C48 80240E48 0200302D */ daddu $a2, $s0, $zero /* BB3C4C 80240E4C 080903A4 */ j .L80240E90 /* BB3C50 80240E50 0000102D */ daddu $v0, $zero, $zero /* BB3C54 80240E54 0260202D */ daddu $a0, $s3, $zero /* BB3C58 80240E58 0280282D */ daddu $a1, $s4, $zero -/* BB3C5C 80240E5C 0C09021B */ jal func_8024086C +/* BB3C5C 80240E5C 0C09021B */ jal func_8024086C_BB366C /* BB3C60 80240E60 0200302D */ daddu $a2, $s0, $zero /* BB3C64 80240E64 0260202D */ daddu $a0, $s3, $zero /* BB3C68 80240E68 0280282D */ daddu $a1, $s4, $zero -/* BB3C6C 80240E6C 0C090253 */ jal func_8024094C +/* BB3C6C 80240E6C 0C090253 */ jal func_8024094C_BB374C /* BB3C70 80240E70 0200302D */ daddu $a2, $s0, $zero /* BB3C74 80240E74 080903A4 */ j .L80240E90 /* BB3C78 80240E78 0000102D */ daddu $v0, $zero, $zero /* BB3C7C 80240E7C 0260202D */ daddu $a0, $s3, $zero /* BB3C80 80240E80 0280282D */ daddu $a1, $s4, $zero -/* BB3C84 80240E84 0C090313 */ jal func_80240C4C +/* BB3C84 80240E84 0C090313 */ jal func_80240C4C_BB3A4C /* BB3C88 80240E88 0200302D */ daddu $a2, $s0, $zero .L80240E8C: /* BB3C8C 80240E8C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC.s b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC.s deleted file mode 100644 index 5af2263d5a..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400EC -/* BB5ACC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BB5AD0 802400F0 AFB00010 */ sw $s0, 0x10($sp) -/* BB5AD4 802400F4 0000802D */ daddu $s0, $zero, $zero -/* BB5AD8 802400F8 10A00003 */ beqz $a1, .L80240108 -/* BB5ADC 802400FC AFBF0014 */ sw $ra, 0x14($sp) -/* BB5AE0 80240100 24020424 */ addiu $v0, $zero, 0x424 -/* BB5AE4 80240104 AC820074 */ sw $v0, 0x74($a0) -.L80240108: -/* BB5AE8 80240108 8C820074 */ lw $v0, 0x74($a0) -/* BB5AEC 8024010C 2442FFFF */ addiu $v0, $v0, -1 -/* BB5AF0 80240110 AC820074 */ sw $v0, 0x74($a0) -/* BB5AF4 80240114 284203E9 */ slti $v0, $v0, 0x3e9 -/* BB5AF8 80240118 10400003 */ beqz $v0, .L80240128 -/* BB5AFC 8024011C 240203E8 */ addiu $v0, $zero, 0x3e8 -/* BB5B00 80240120 AC820074 */ sw $v0, 0x74($a0) -/* BB5B04 80240124 24100002 */ addiu $s0, $zero, 2 -.L80240128: -/* BB5B08 80240128 8C850074 */ lw $a1, 0x74($a0) -/* BB5B0C 8024012C 0C046EDD */ jal set_world_fog_dist -/* BB5B10 80240130 240403DE */ addiu $a0, $zero, 0x3de -/* BB5B14 80240134 0200102D */ daddu $v0, $s0, $zero -/* BB5B18 80240138 8FBF0014 */ lw $ra, 0x14($sp) -/* BB5B1C 8024013C 8FB00010 */ lw $s0, 0x10($sp) -/* BB5B20 80240140 03E00008 */ jr $ra -/* BB5B24 80240144 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC_BB5ACC.s b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC_BB5ACC.s new file mode 100644 index 0000000000..54fc4383dd --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_802400EC_BB5ACC.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400EC_BB5ACC +/* BB5ACC 802400EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BB5AD0 802400F0 AFB00010 */ sw $s0, 0x10($sp) +/* BB5AD4 802400F4 0000802D */ daddu $s0, $zero, $zero +/* BB5AD8 802400F8 10A00003 */ beqz $a1, .L80240108 +/* BB5ADC 802400FC AFBF0014 */ sw $ra, 0x14($sp) +/* BB5AE0 80240100 24020424 */ addiu $v0, $zero, 0x424 +/* BB5AE4 80240104 AC820074 */ sw $v0, 0x74($a0) +.L80240108: +/* BB5AE8 80240108 8C820074 */ lw $v0, 0x74($a0) +/* BB5AEC 8024010C 2442FFFF */ addiu $v0, $v0, -1 +/* BB5AF0 80240110 AC820074 */ sw $v0, 0x74($a0) +/* BB5AF4 80240114 284203E9 */ slti $v0, $v0, 0x3e9 +/* BB5AF8 80240118 10400003 */ beqz $v0, .L80240128 +/* BB5AFC 8024011C 240203E8 */ addiu $v0, $zero, 0x3e8 +/* BB5B00 80240120 AC820074 */ sw $v0, 0x74($a0) +/* BB5B04 80240124 24100002 */ addiu $s0, $zero, 2 +.L80240128: +/* BB5B08 80240128 8C850074 */ lw $a1, 0x74($a0) +/* BB5B0C 8024012C 0C046EDD */ jal set_world_fog_dist +/* BB5B10 80240130 240403DE */ addiu $a0, $zero, 0x3de +/* BB5B14 80240134 0200102D */ daddu $v0, $s0, $zero +/* BB5B18 80240138 8FBF0014 */ lw $ra, 0x14($sp) +/* BB5B1C 8024013C 8FB00010 */ lw $s0, 0x10($sp) +/* BB5B20 80240140 03E00008 */ jr $ra +/* BB5B24 80240144 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148.s b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148.s deleted file mode 100644 index 9a591c01b8..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240148 -/* BB5B28 80240148 10A00002 */ beqz $a1, .L80240154 -/* BB5B2C 8024014C 0000302D */ daddu $a2, $zero, $zero -/* BB5B30 80240150 AC800074 */ sw $zero, 0x74($a0) -.L80240154: -/* BB5B34 80240154 8C820074 */ lw $v0, 0x74($a0) -/* BB5B38 80240158 24420004 */ addiu $v0, $v0, 4 -/* BB5B3C 8024015C AC820074 */ sw $v0, 0x74($a0) -/* BB5B40 80240160 284200F0 */ slti $v0, $v0, 0xf0 -/* BB5B44 80240164 14400004 */ bnez $v0, .L80240178 -/* BB5B48 80240168 00000000 */ nop -/* BB5B4C 8024016C 240200F0 */ addiu $v0, $zero, 0xf0 -/* BB5B50 80240170 AC820074 */ sw $v0, 0x74($a0) -/* BB5B54 80240174 24060002 */ addiu $a2, $zero, 2 -.L80240178: -/* BB5B58 80240178 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* BB5B5C 8024017C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* BB5B60 80240180 94820076 */ lhu $v0, 0x76($a0) -/* BB5B64 80240184 A462015C */ sh $v0, 0x15c($v1) -/* BB5B68 80240188 03E00008 */ jr $ra -/* BB5B6C 8024018C 00C0102D */ daddu $v0, $a2, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s new file mode 100644 index 0000000000..f0c5f47e25 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_10/BB59E0/func_80240148_BB5B28.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240148_BB5B28 +/* BB5B28 80240148 10A00002 */ beqz $a1, .L80240154 +/* BB5B2C 8024014C 0000302D */ daddu $a2, $zero, $zero +/* BB5B30 80240150 AC800074 */ sw $zero, 0x74($a0) +.L80240154: +/* BB5B34 80240154 8C820074 */ lw $v0, 0x74($a0) +/* BB5B38 80240158 24420004 */ addiu $v0, $v0, 4 +/* BB5B3C 8024015C AC820074 */ sw $v0, 0x74($a0) +/* BB5B40 80240160 284200F0 */ slti $v0, $v0, 0xf0 +/* BB5B44 80240164 14400004 */ bnez $v0, .L80240178 +/* BB5B48 80240168 00000000 */ nop +/* BB5B4C 8024016C 240200F0 */ addiu $v0, $zero, 0xf0 +/* BB5B50 80240170 AC820074 */ sw $v0, 0x74($a0) +/* BB5B54 80240174 24060002 */ addiu $a2, $zero, 2 +.L80240178: +/* BB5B58 80240178 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* BB5B5C 8024017C 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* BB5B60 80240180 94820076 */ lhu $v0, 0x76($a0) +/* BB5B64 80240184 A462015C */ sh $v0, 0x15c($v1) +/* BB5B68 80240188 03E00008 */ jr $ra +/* BB5B6C 8024018C 00C0102D */ daddu $v0, $a2, $zero diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C.s deleted file mode 100644 index 2a665b70a0..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024066C -/* BB76DC 8024066C 0080302D */ daddu $a2, $a0, $zero -/* BB76E0 80240670 0000382D */ daddu $a3, $zero, $zero -/* BB76E4 80240674 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* BB76E8 80240678 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* BB76EC 8024067C 3C04800B */ lui $a0, %hi(gCameras) -/* BB76F0 80240680 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* BB76F4 80240684 00031080 */ sll $v0, $v1, 2 -/* BB76F8 80240688 00431021 */ addu $v0, $v0, $v1 -/* BB76FC 8024068C 00021080 */ sll $v0, $v0, 2 -/* BB7700 80240690 00431023 */ subu $v0, $v0, $v1 -/* BB7704 80240694 000218C0 */ sll $v1, $v0, 3 -/* BB7708 80240698 00431021 */ addu $v0, $v0, $v1 -/* BB770C 8024069C 000210C0 */ sll $v0, $v0, 3 -/* BB7710 802406A0 10A00005 */ beqz $a1, .L802406B8 -/* BB7714 802406A4 00442021 */ addu $a0, $v0, $a0 -/* BB7718 802406A8 24020064 */ addiu $v0, $zero, 0x64 -/* BB771C 802406AC ACC00074 */ sw $zero, 0x74($a2) -/* BB7720 802406B0 ACC00078 */ sw $zero, 0x78($a2) -/* BB7724 802406B4 ACC2007C */ sw $v0, 0x7c($a2) -.L802406B8: -/* BB7728 802406B8 8CC30074 */ lw $v1, 0x74($a2) -/* BB772C 802406BC 10600005 */ beqz $v1, .L802406D4 -/* BB7730 802406C0 24020001 */ addiu $v0, $zero, 1 -/* BB7734 802406C4 1062000C */ beq $v1, $v0, .L802406F8 -/* BB7738 802406C8 00000000 */ nop -/* BB773C 802406CC 080901C9 */ j .L80240724 -/* BB7740 802406D0 00000000 */ nop -.L802406D4: -/* BB7744 802406D4 8CC20078 */ lw $v0, 0x78($a2) -/* BB7748 802406D8 8CC3007C */ lw $v1, 0x7c($a2) -/* BB774C 802406DC 00431021 */ addu $v0, $v0, $v1 -/* BB7750 802406E0 ACC20078 */ sw $v0, 0x78($a2) -/* BB7754 802406E4 28423E80 */ slti $v0, $v0, 0x3e80 -/* BB7758 802406E8 1440000E */ bnez $v0, .L80240724 -/* BB775C 802406EC 24020001 */ addiu $v0, $zero, 1 -/* BB7760 802406F0 080901C9 */ j .L80240724 -/* BB7764 802406F4 ACC20074 */ sw $v0, 0x74($a2) -.L802406F8: -/* BB7768 802406F8 8CC20078 */ lw $v0, 0x78($a2) -/* BB776C 802406FC 8CC3007C */ lw $v1, 0x7c($a2) -/* BB7770 80240700 00431021 */ addu $v0, $v0, $v1 -/* BB7774 80240704 ACC20078 */ sw $v0, 0x78($a2) -/* BB7778 80240708 0060102D */ daddu $v0, $v1, $zero -/* BB777C 8024070C 8CC30078 */ lw $v1, 0x78($a2) -/* BB7780 80240710 2442FFFE */ addiu $v0, $v0, -2 -/* BB7784 80240714 28634650 */ slti $v1, $v1, 0x4650 -/* BB7788 80240718 14600002 */ bnez $v1, .L80240724 -/* BB778C 8024071C ACC2007C */ sw $v0, 0x7c($a2) -/* BB7790 80240720 24070002 */ addiu $a3, $zero, 2 -.L80240724: -/* BB7794 80240724 3C013A89 */ lui $at, 0x3a89 -/* BB7798 80240728 3421A028 */ ori $at, $at, 0xa028 -/* BB779C 8024072C 44811000 */ mtc1 $at, $f2 -/* BB77A0 80240730 C4C00078 */ lwc1 $f0, 0x78($a2) -/* BB77A4 80240734 46800020 */ cvt.s.w $f0, $f0 -/* BB77A8 80240738 46020002 */ mul.s $f0, $f0, $f2 -/* BB77AC 8024073C 00000000 */ nop -/* BB77B0 80240740 3C014220 */ lui $at, 0x4220 -/* BB77B4 80240744 44811000 */ mtc1 $at, $f2 -/* BB77B8 80240748 00000000 */ nop -/* BB77BC 8024074C 46020000 */ add.s $f0, $f0, $f2 -/* BB77C0 80240750 3C013B29 */ lui $at, 0x3b29 -/* BB77C4 80240754 34214D24 */ ori $at, $at, 0x4d24 -/* BB77C8 80240758 44811000 */ mtc1 $at, $f2 -/* BB77CC 8024075C E48004E0 */ swc1 $f0, 0x4e0($a0) -/* BB77D0 80240760 C4C00078 */ lwc1 $f0, 0x78($a2) -/* BB77D4 80240764 46800020 */ cvt.s.w $f0, $f0 -/* BB77D8 80240768 46020002 */ mul.s $f0, $f0, $f2 -/* BB77DC 8024076C 00000000 */ nop -/* BB77E0 80240770 3C01C27E */ lui $at, 0xc27e -/* BB77E4 80240774 34216666 */ ori $at, $at, 0x6666 -/* BB77E8 80240778 44811000 */ mtc1 $at, $f2 -/* BB77EC 8024077C 00000000 */ nop -/* BB77F0 80240780 46020000 */ add.s $f0, $f0, $f2 -/* BB77F4 80240784 00E0102D */ daddu $v0, $a3, $zero -/* BB77F8 80240788 03E00008 */ jr $ra -/* BB77FC 8024078C E48004FC */ swc1 $f0, 0x4fc($a0) diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s new file mode 100644 index 0000000000..99639e6290 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_8024066C_BB76DC.s @@ -0,0 +1,81 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024066C_BB76DC +/* BB76DC 8024066C 0080302D */ daddu $a2, $a0, $zero +/* BB76E0 80240670 0000382D */ daddu $a3, $zero, $zero +/* BB76E4 80240674 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* BB76E8 80240678 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* BB76EC 8024067C 3C04800B */ lui $a0, %hi(gCameras) +/* BB76F0 80240680 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* BB76F4 80240684 00031080 */ sll $v0, $v1, 2 +/* BB76F8 80240688 00431021 */ addu $v0, $v0, $v1 +/* BB76FC 8024068C 00021080 */ sll $v0, $v0, 2 +/* BB7700 80240690 00431023 */ subu $v0, $v0, $v1 +/* BB7704 80240694 000218C0 */ sll $v1, $v0, 3 +/* BB7708 80240698 00431021 */ addu $v0, $v0, $v1 +/* BB770C 8024069C 000210C0 */ sll $v0, $v0, 3 +/* BB7710 802406A0 10A00005 */ beqz $a1, .L802406B8 +/* BB7714 802406A4 00442021 */ addu $a0, $v0, $a0 +/* BB7718 802406A8 24020064 */ addiu $v0, $zero, 0x64 +/* BB771C 802406AC ACC00074 */ sw $zero, 0x74($a2) +/* BB7720 802406B0 ACC00078 */ sw $zero, 0x78($a2) +/* BB7724 802406B4 ACC2007C */ sw $v0, 0x7c($a2) +.L802406B8: +/* BB7728 802406B8 8CC30074 */ lw $v1, 0x74($a2) +/* BB772C 802406BC 10600005 */ beqz $v1, .L802406D4 +/* BB7730 802406C0 24020001 */ addiu $v0, $zero, 1 +/* BB7734 802406C4 1062000C */ beq $v1, $v0, .L802406F8 +/* BB7738 802406C8 00000000 */ nop +/* BB773C 802406CC 080901C9 */ j .L80240724 +/* BB7740 802406D0 00000000 */ nop +.L802406D4: +/* BB7744 802406D4 8CC20078 */ lw $v0, 0x78($a2) +/* BB7748 802406D8 8CC3007C */ lw $v1, 0x7c($a2) +/* BB774C 802406DC 00431021 */ addu $v0, $v0, $v1 +/* BB7750 802406E0 ACC20078 */ sw $v0, 0x78($a2) +/* BB7754 802406E4 28423E80 */ slti $v0, $v0, 0x3e80 +/* BB7758 802406E8 1440000E */ bnez $v0, .L80240724 +/* BB775C 802406EC 24020001 */ addiu $v0, $zero, 1 +/* BB7760 802406F0 080901C9 */ j .L80240724 +/* BB7764 802406F4 ACC20074 */ sw $v0, 0x74($a2) +.L802406F8: +/* BB7768 802406F8 8CC20078 */ lw $v0, 0x78($a2) +/* BB776C 802406FC 8CC3007C */ lw $v1, 0x7c($a2) +/* BB7770 80240700 00431021 */ addu $v0, $v0, $v1 +/* BB7774 80240704 ACC20078 */ sw $v0, 0x78($a2) +/* BB7778 80240708 0060102D */ daddu $v0, $v1, $zero +/* BB777C 8024070C 8CC30078 */ lw $v1, 0x78($a2) +/* BB7780 80240710 2442FFFE */ addiu $v0, $v0, -2 +/* BB7784 80240714 28634650 */ slti $v1, $v1, 0x4650 +/* BB7788 80240718 14600002 */ bnez $v1, .L80240724 +/* BB778C 8024071C ACC2007C */ sw $v0, 0x7c($a2) +/* BB7790 80240720 24070002 */ addiu $a3, $zero, 2 +.L80240724: +/* BB7794 80240724 3C013A89 */ lui $at, 0x3a89 +/* BB7798 80240728 3421A028 */ ori $at, $at, 0xa028 +/* BB779C 8024072C 44811000 */ mtc1 $at, $f2 +/* BB77A0 80240730 C4C00078 */ lwc1 $f0, 0x78($a2) +/* BB77A4 80240734 46800020 */ cvt.s.w $f0, $f0 +/* BB77A8 80240738 46020002 */ mul.s $f0, $f0, $f2 +/* BB77AC 8024073C 00000000 */ nop +/* BB77B0 80240740 3C014220 */ lui $at, 0x4220 +/* BB77B4 80240744 44811000 */ mtc1 $at, $f2 +/* BB77B8 80240748 00000000 */ nop +/* BB77BC 8024074C 46020000 */ add.s $f0, $f0, $f2 +/* BB77C0 80240750 3C013B29 */ lui $at, 0x3b29 +/* BB77C4 80240754 34214D24 */ ori $at, $at, 0x4d24 +/* BB77C8 80240758 44811000 */ mtc1 $at, $f2 +/* BB77CC 8024075C E48004E0 */ swc1 $f0, 0x4e0($a0) +/* BB77D0 80240760 C4C00078 */ lwc1 $f0, 0x78($a2) +/* BB77D4 80240764 46800020 */ cvt.s.w $f0, $f0 +/* BB77D8 80240768 46020002 */ mul.s $f0, $f0, $f2 +/* BB77DC 8024076C 00000000 */ nop +/* BB77E0 80240770 3C01C27E */ lui $at, 0xc27e +/* BB77E4 80240774 34216666 */ ori $at, $at, 0x6666 +/* BB77E8 80240778 44811000 */ mtc1 $at, $f2 +/* BB77EC 8024077C 00000000 */ nop +/* BB77F0 80240780 46020000 */ add.s $f0, $f0, $f2 +/* BB77F4 80240784 00E0102D */ daddu $v0, $a3, $zero +/* BB77F8 80240788 03E00008 */ jr $ra +/* BB77FC 8024078C E48004FC */ swc1 $f0, 0x4fc($a0) diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790.s deleted file mode 100644 index 4aafb7caa4..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790.s +++ /dev/null @@ -1,85 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240790 -/* BB7800 80240790 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BB7804 80240794 AFB00010 */ sw $s0, 0x10($sp) -/* BB7808 80240798 AFB10014 */ sw $s1, 0x14($sp) -/* BB780C 8024079C 3C11800B */ lui $s1, %hi(gCameras) -/* BB7810 802407A0 26311D80 */ addiu $s1, $s1, %lo(gCameras) -/* BB7814 802407A4 AFBF0018 */ sw $ra, 0x18($sp) -/* BB7818 802407A8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* BB781C 802407AC F7B40020 */ sdc1 $f20, 0x20($sp) -/* BB7820 802407B0 10A00002 */ beqz $a1, .L802407BC -/* BB7824 802407B4 0080802D */ daddu $s0, $a0, $zero -/* BB7828 802407B8 AE000074 */ sw $zero, 0x74($s0) -.L802407BC: -/* BB782C 802407BC 3C064296 */ lui $a2, 0x4296 -/* BB7830 802407C0 3C07439A */ lui $a3, 0x439a -/* BB7834 802407C4 34E78000 */ ori $a3, $a3, 0x8000 -/* BB7838 802407C8 3C0142B2 */ lui $at, 0x42b2 -/* BB783C 802407CC 4481A000 */ mtc1 $at, $f20 -/* BB7840 802407D0 3C0142A8 */ lui $at, 0x42a8 -/* BB7844 802407D4 4481B000 */ mtc1 $at, $f22 -/* BB7848 802407D8 4600A306 */ mov.s $f12, $f20 -/* BB784C 802407DC 0C00A720 */ jal atan2 -/* BB7850 802407E0 4600B386 */ mov.s $f14, $f22 -/* BB7854 802407E4 4600A306 */ mov.s $f12, $f20 -/* BB7858 802407E8 4600B386 */ mov.s $f14, $f22 -/* BB785C 802407EC 3C064375 */ lui $a2, 0x4375 -/* BB7860 802407F0 3C0742AA */ lui $a3, 0x42aa -/* BB7864 802407F4 0C00A720 */ jal atan2 -/* BB7868 802407F8 46000586 */ mov.s $f22, $f0 -/* BB786C 802407FC 46160501 */ sub.s $f20, $f0, $f22 -/* BB7870 80240800 3C014220 */ lui $at, 0x4220 -/* BB7874 80240804 44810000 */ mtc1 $at, $f0 -/* BB7878 80240808 00000000 */ nop -/* BB787C 8024080C 4600A503 */ div.s $f20, $f20, $f0 -/* BB7880 80240810 C6000074 */ lwc1 $f0, 0x74($s0) -/* BB7884 80240814 46800020 */ cvt.s.w $f0, $f0 -/* BB7888 80240818 4600A502 */ mul.s $f20, $f20, $f0 -/* BB788C 8024081C 00000000 */ nop -/* BB7890 80240820 4616A500 */ add.s $f20, $f20, $f22 -/* BB7894 80240824 3C0142C8 */ lui $at, 0x42c8 -/* BB7898 80240828 4481B000 */ mtc1 $at, $f22 -/* BB789C 8024082C 0C00A8BB */ jal sin_deg -/* BB78A0 80240830 4600A306 */ mov.s $f12, $f20 -/* BB78A4 80240834 46160002 */ mul.s $f0, $f0, $f22 -/* BB78A8 80240838 00000000 */ nop -/* BB78AC 8024083C 4600A306 */ mov.s $f12, $f20 -/* BB78B0 80240840 4600008D */ trunc.w.s $f2, $f0 -/* BB78B4 80240844 44021000 */ mfc1 $v0, $f2 -/* BB78B8 80240848 00000000 */ nop -/* BB78BC 8024084C 24420059 */ addiu $v0, $v0, 0x59 -/* BB78C0 80240850 44820000 */ mtc1 $v0, $f0 -/* BB78C4 80240854 00000000 */ nop -/* BB78C8 80240858 46800020 */ cvt.s.w $f0, $f0 -/* BB78CC 8024085C 0C00A8D4 */ jal cos_deg -/* BB78D0 80240860 E62004B0 */ swc1 $f0, 0x4b0($s1) -/* BB78D4 80240864 46000007 */ neg.s $f0, $f0 -/* BB78D8 80240868 46160002 */ mul.s $f0, $f0, $f22 -/* BB78DC 8024086C 00000000 */ nop -/* BB78E0 80240870 24020001 */ addiu $v0, $zero, 1 -/* BB78E4 80240874 A6220506 */ sh $v0, 0x506($s1) -/* BB78E8 80240878 4600008D */ trunc.w.s $f2, $f0 -/* BB78EC 8024087C 44021000 */ mfc1 $v0, $f2 -/* BB78F0 80240880 00000000 */ nop -/* BB78F4 80240884 24420054 */ addiu $v0, $v0, 0x54 -/* BB78F8 80240888 44820000 */ mtc1 $v0, $f0 -/* BB78FC 8024088C 00000000 */ nop -/* BB7900 80240890 46800020 */ cvt.s.w $f0, $f0 -/* BB7904 80240894 E62004B8 */ swc1 $f0, 0x4b8($s1) -/* BB7908 80240898 8E020074 */ lw $v0, 0x74($s0) -/* BB790C 8024089C 24420001 */ addiu $v0, $v0, 1 -/* BB7910 802408A0 AE020074 */ sw $v0, 0x74($s0) -/* BB7914 802408A4 28420029 */ slti $v0, $v0, 0x29 -/* BB7918 802408A8 38420001 */ xori $v0, $v0, 1 -/* BB791C 802408AC 8FBF0018 */ lw $ra, 0x18($sp) -/* BB7920 802408B0 8FB10014 */ lw $s1, 0x14($sp) -/* BB7924 802408B4 8FB00010 */ lw $s0, 0x10($sp) -/* BB7928 802408B8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* BB792C 802408BC D7B40020 */ ldc1 $f20, 0x20($sp) -/* BB7930 802408C0 00021040 */ sll $v0, $v0, 1 -/* BB7934 802408C4 03E00008 */ jr $ra -/* BB7938 802408C8 27BD0030 */ addiu $sp, $sp, 0x30 -/* BB793C 802408CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s new file mode 100644 index 0000000000..f2df7a421a --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_11/BB7070/func_80240790_BB7800.s @@ -0,0 +1,85 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240790_BB7800 +/* BB7800 80240790 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* BB7804 80240794 AFB00010 */ sw $s0, 0x10($sp) +/* BB7808 80240798 AFB10014 */ sw $s1, 0x14($sp) +/* BB780C 8024079C 3C11800B */ lui $s1, %hi(gCameras) +/* BB7810 802407A0 26311D80 */ addiu $s1, $s1, %lo(gCameras) +/* BB7814 802407A4 AFBF0018 */ sw $ra, 0x18($sp) +/* BB7818 802407A8 F7B60028 */ sdc1 $f22, 0x28($sp) +/* BB781C 802407AC F7B40020 */ sdc1 $f20, 0x20($sp) +/* BB7820 802407B0 10A00002 */ beqz $a1, .L802407BC +/* BB7824 802407B4 0080802D */ daddu $s0, $a0, $zero +/* BB7828 802407B8 AE000074 */ sw $zero, 0x74($s0) +.L802407BC: +/* BB782C 802407BC 3C064296 */ lui $a2, 0x4296 +/* BB7830 802407C0 3C07439A */ lui $a3, 0x439a +/* BB7834 802407C4 34E78000 */ ori $a3, $a3, 0x8000 +/* BB7838 802407C8 3C0142B2 */ lui $at, 0x42b2 +/* BB783C 802407CC 4481A000 */ mtc1 $at, $f20 +/* BB7840 802407D0 3C0142A8 */ lui $at, 0x42a8 +/* BB7844 802407D4 4481B000 */ mtc1 $at, $f22 +/* BB7848 802407D8 4600A306 */ mov.s $f12, $f20 +/* BB784C 802407DC 0C00A720 */ jal atan2 +/* BB7850 802407E0 4600B386 */ mov.s $f14, $f22 +/* BB7854 802407E4 4600A306 */ mov.s $f12, $f20 +/* BB7858 802407E8 4600B386 */ mov.s $f14, $f22 +/* BB785C 802407EC 3C064375 */ lui $a2, 0x4375 +/* BB7860 802407F0 3C0742AA */ lui $a3, 0x42aa +/* BB7864 802407F4 0C00A720 */ jal atan2 +/* BB7868 802407F8 46000586 */ mov.s $f22, $f0 +/* BB786C 802407FC 46160501 */ sub.s $f20, $f0, $f22 +/* BB7870 80240800 3C014220 */ lui $at, 0x4220 +/* BB7874 80240804 44810000 */ mtc1 $at, $f0 +/* BB7878 80240808 00000000 */ nop +/* BB787C 8024080C 4600A503 */ div.s $f20, $f20, $f0 +/* BB7880 80240810 C6000074 */ lwc1 $f0, 0x74($s0) +/* BB7884 80240814 46800020 */ cvt.s.w $f0, $f0 +/* BB7888 80240818 4600A502 */ mul.s $f20, $f20, $f0 +/* BB788C 8024081C 00000000 */ nop +/* BB7890 80240820 4616A500 */ add.s $f20, $f20, $f22 +/* BB7894 80240824 3C0142C8 */ lui $at, 0x42c8 +/* BB7898 80240828 4481B000 */ mtc1 $at, $f22 +/* BB789C 8024082C 0C00A8BB */ jal sin_deg +/* BB78A0 80240830 4600A306 */ mov.s $f12, $f20 +/* BB78A4 80240834 46160002 */ mul.s $f0, $f0, $f22 +/* BB78A8 80240838 00000000 */ nop +/* BB78AC 8024083C 4600A306 */ mov.s $f12, $f20 +/* BB78B0 80240840 4600008D */ trunc.w.s $f2, $f0 +/* BB78B4 80240844 44021000 */ mfc1 $v0, $f2 +/* BB78B8 80240848 00000000 */ nop +/* BB78BC 8024084C 24420059 */ addiu $v0, $v0, 0x59 +/* BB78C0 80240850 44820000 */ mtc1 $v0, $f0 +/* BB78C4 80240854 00000000 */ nop +/* BB78C8 80240858 46800020 */ cvt.s.w $f0, $f0 +/* BB78CC 8024085C 0C00A8D4 */ jal cos_deg +/* BB78D0 80240860 E62004B0 */ swc1 $f0, 0x4b0($s1) +/* BB78D4 80240864 46000007 */ neg.s $f0, $f0 +/* BB78D8 80240868 46160002 */ mul.s $f0, $f0, $f22 +/* BB78DC 8024086C 00000000 */ nop +/* BB78E0 80240870 24020001 */ addiu $v0, $zero, 1 +/* BB78E4 80240874 A6220506 */ sh $v0, 0x506($s1) +/* BB78E8 80240878 4600008D */ trunc.w.s $f2, $f0 +/* BB78EC 8024087C 44021000 */ mfc1 $v0, $f2 +/* BB78F0 80240880 00000000 */ nop +/* BB78F4 80240884 24420054 */ addiu $v0, $v0, 0x54 +/* BB78F8 80240888 44820000 */ mtc1 $v0, $f0 +/* BB78FC 8024088C 00000000 */ nop +/* BB7900 80240890 46800020 */ cvt.s.w $f0, $f0 +/* BB7904 80240894 E62004B8 */ swc1 $f0, 0x4b8($s1) +/* BB7908 80240898 8E020074 */ lw $v0, 0x74($s0) +/* BB790C 8024089C 24420001 */ addiu $v0, $v0, 1 +/* BB7910 802408A0 AE020074 */ sw $v0, 0x74($s0) +/* BB7914 802408A4 28420029 */ slti $v0, $v0, 0x29 +/* BB7918 802408A8 38420001 */ xori $v0, $v0, 1 +/* BB791C 802408AC 8FBF0018 */ lw $ra, 0x18($sp) +/* BB7920 802408B0 8FB10014 */ lw $s1, 0x14($sp) +/* BB7924 802408B4 8FB00010 */ lw $s0, 0x10($sp) +/* BB7928 802408B8 D7B60028 */ ldc1 $f22, 0x28($sp) +/* BB792C 802408BC D7B40020 */ ldc1 $f20, 0x20($sp) +/* BB7930 802408C0 00021040 */ sll $v0, $v0, 1 +/* BB7934 802408C4 03E00008 */ jr $ra +/* BB7938 802408C8 27BD0030 */ addiu $sp, $sp, 0x30 +/* BB793C 802408CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_80240980.s b/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_80240980.s deleted file mode 100644 index d233ddb90b..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_80240980.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240980 -/* BB79F0 80240980 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BB79F4 80240984 F7B40018 */ sdc1 $f20, 0x18($sp) -/* BB79F8 80240988 4485A000 */ mtc1 $a1, $f20 -/* BB79FC 8024098C F7B60020 */ sdc1 $f22, 0x20($sp) -/* BB7A00 80240990 4486B000 */ mtc1 $a2, $f22 -/* BB7A04 80240994 AFB00010 */ sw $s0, 0x10($sp) -/* BB7A08 80240998 F7B80028 */ sdc1 $f24, 0x28($sp) -/* BB7A0C 8024099C 4487C000 */ mtc1 $a3, $f24 -/* BB7A10 802409A0 AFBF0014 */ sw $ra, 0x14($sp) -/* BB7A14 802409A4 0C019D28 */ jal guMtxIdentF -/* BB7A18 802409A8 0080802D */ daddu $s0, $a0, $zero -/* BB7A1C 802409AC 4616A582 */ mul.s $f22, $f20, $f22 -/* BB7A20 802409B0 00000000 */ nop -/* BB7A24 802409B4 4618A502 */ mul.s $f20, $f20, $f24 -/* BB7A28 802409B8 00000000 */ nop -/* BB7A2C 802409BC 3C013F80 */ lui $at, 0x3f80 -/* BB7A30 802409C0 44810000 */ mtc1 $at, $f0 -/* BB7A34 802409C4 00000000 */ nop -/* BB7A38 802409C8 E6000014 */ swc1 $f0, 0x14($s0) -/* BB7A3C 802409CC E6160010 */ swc1 $f22, 0x10($s0) -/* BB7A40 802409D0 E6140018 */ swc1 $f20, 0x18($s0) -/* BB7A44 802409D4 8FBF0014 */ lw $ra, 0x14($sp) -/* BB7A48 802409D8 8FB00010 */ lw $s0, 0x10($sp) -/* BB7A4C 802409DC D7B80028 */ ldc1 $f24, 0x28($sp) -/* BB7A50 802409E0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* BB7A54 802409E4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* BB7A58 802409E8 03E00008 */ jr $ra -/* BB7A5C 802409EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_80240980_BB79F0.s b/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_80240980_BB79F0.s new file mode 100644 index 0000000000..a50a962552 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_80240980_BB79F0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240980_BB79F0 +/* BB79F0 80240980 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* BB79F4 80240984 F7B40018 */ sdc1 $f20, 0x18($sp) +/* BB79F8 80240988 4485A000 */ mtc1 $a1, $f20 +/* BB79FC 8024098C F7B60020 */ sdc1 $f22, 0x20($sp) +/* BB7A00 80240990 4486B000 */ mtc1 $a2, $f22 +/* BB7A04 80240994 AFB00010 */ sw $s0, 0x10($sp) +/* BB7A08 80240998 F7B80028 */ sdc1 $f24, 0x28($sp) +/* BB7A0C 8024099C 4487C000 */ mtc1 $a3, $f24 +/* BB7A10 802409A0 AFBF0014 */ sw $ra, 0x14($sp) +/* BB7A14 802409A4 0C019D28 */ jal guMtxIdentF +/* BB7A18 802409A8 0080802D */ daddu $s0, $a0, $zero +/* BB7A1C 802409AC 4616A582 */ mul.s $f22, $f20, $f22 +/* BB7A20 802409B0 00000000 */ nop +/* BB7A24 802409B4 4618A502 */ mul.s $f20, $f20, $f24 +/* BB7A28 802409B8 00000000 */ nop +/* BB7A2C 802409BC 3C013F80 */ lui $at, 0x3f80 +/* BB7A30 802409C0 44810000 */ mtc1 $at, $f0 +/* BB7A34 802409C4 00000000 */ nop +/* BB7A38 802409C8 E6000014 */ swc1 $f0, 0x14($s0) +/* BB7A3C 802409CC E6160010 */ swc1 $f22, 0x10($s0) +/* BB7A40 802409D0 E6140018 */ swc1 $f20, 0x18($s0) +/* BB7A44 802409D4 8FBF0014 */ lw $ra, 0x14($sp) +/* BB7A48 802409D8 8FB00010 */ lw $s0, 0x10($sp) +/* BB7A4C 802409DC D7B80028 */ ldc1 $f24, 0x28($sp) +/* BB7A50 802409E0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* BB7A54 802409E4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* BB7A58 802409E8 03E00008 */ jr $ra +/* BB7A5C 802409EC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_802409F0.s b/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_802409F0.s deleted file mode 100644 index 92a6974ab5..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_802409F0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409F0 -/* BB7A60 802409F0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* BB7A64 802409F4 AFB10054 */ sw $s1, 0x54($sp) -/* BB7A68 802409F8 0080882D */ daddu $s1, $a0, $zero -/* BB7A6C 802409FC AFBF005C */ sw $ra, 0x5c($sp) -/* BB7A70 80240A00 AFB20058 */ sw $s2, 0x58($sp) -/* BB7A74 80240A04 AFB00050 */ sw $s0, 0x50($sp) -/* BB7A78 80240A08 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* BB7A7C 80240A0C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* BB7A80 80240A10 F7B80070 */ sdc1 $f24, 0x70($sp) -/* BB7A84 80240A14 F7B60068 */ sdc1 $f22, 0x68($sp) -/* BB7A88 80240A18 F7B40060 */ sdc1 $f20, 0x60($sp) -/* BB7A8C 80240A1C 8E30000C */ lw $s0, 0xc($s1) -/* BB7A90 80240A20 8E050000 */ lw $a1, ($s0) -/* BB7A94 80240A24 0C0B1EAF */ jal get_variable -/* BB7A98 80240A28 26100004 */ addiu $s0, $s0, 4 -/* BB7A9C 80240A2C 0C046C04 */ jal get_model_list_index_from_tree_index -/* BB7AA0 80240A30 0040202D */ daddu $a0, $v0, $zero -/* BB7AA4 80240A34 8E050000 */ lw $a1, ($s0) -/* BB7AA8 80240A38 26100004 */ addiu $s0, $s0, 4 -/* BB7AAC 80240A3C 0220202D */ daddu $a0, $s1, $zero -/* BB7AB0 80240A40 0C0B210B */ jal get_float_variable -/* BB7AB4 80240A44 0040902D */ daddu $s2, $v0, $zero -/* BB7AB8 80240A48 8E050000 */ lw $a1, ($s0) -/* BB7ABC 80240A4C 26100004 */ addiu $s0, $s0, 4 -/* BB7AC0 80240A50 0220202D */ daddu $a0, $s1, $zero -/* BB7AC4 80240A54 0C0B210B */ jal get_float_variable -/* BB7AC8 80240A58 46000706 */ mov.s $f28, $f0 -/* BB7ACC 80240A5C 8E050000 */ lw $a1, ($s0) -/* BB7AD0 80240A60 26100004 */ addiu $s0, $s0, 4 -/* BB7AD4 80240A64 0220202D */ daddu $a0, $s1, $zero -/* BB7AD8 80240A68 0C0B210B */ jal get_float_variable -/* BB7ADC 80240A6C 46000686 */ mov.s $f26, $f0 -/* BB7AE0 80240A70 0220202D */ daddu $a0, $s1, $zero -/* BB7AE4 80240A74 8E050000 */ lw $a1, ($s0) -/* BB7AE8 80240A78 0C0B210B */ jal get_float_variable -/* BB7AEC 80240A7C 46000586 */ mov.s $f22, $f0 -/* BB7AF0 80240A80 0240202D */ daddu $a0, $s2, $zero -/* BB7AF4 80240A84 0C046B4C */ jal get_model_from_list_index -/* BB7AF8 80240A88 46000606 */ mov.s $f24, $f0 -/* BB7AFC 80240A8C 0040882D */ daddu $s1, $v0, $zero -/* BB7B00 80240A90 96220000 */ lhu $v0, ($s1) -/* BB7B04 80240A94 30420400 */ andi $v0, $v0, 0x400 -/* BB7B08 80240A98 1440001E */ bnez $v0, .L80240B14 -/* BB7B0C 80240A9C 26300058 */ addiu $s0, $s1, 0x58 -/* BB7B10 80240AA0 4480A000 */ mtc1 $zero, $f20 -/* BB7B14 80240AA4 4406B000 */ mfc1 $a2, $f22 -/* BB7B18 80240AA8 4405A000 */ mfc1 $a1, $f20 -/* BB7B1C 80240AAC 4407A000 */ mfc1 $a3, $f20 -/* BB7B20 80240AB0 0C019E40 */ jal guTranslateF -/* BB7B24 80240AB4 0200202D */ daddu $a0, $s0, $zero -/* BB7B28 80240AB8 4405E000 */ mfc1 $a1, $f28 -/* BB7B2C 80240ABC 4406D000 */ mfc1 $a2, $f26 -/* BB7B30 80240AC0 4407C000 */ mfc1 $a3, $f24 -/* BB7B34 80240AC4 0C090260 */ jal func_80240980 -/* BB7B38 80240AC8 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7B3C 80240ACC 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7B40 80240AD0 0200282D */ daddu $a1, $s0, $zero -/* BB7B44 80240AD4 0C019D80 */ jal guMtxCatF -/* BB7B48 80240AD8 0200302D */ daddu $a2, $s0, $zero -/* BB7B4C 80240ADC 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7B50 80240AE0 4600B587 */ neg.s $f22, $f22 -/* BB7B54 80240AE4 4405A000 */ mfc1 $a1, $f20 -/* BB7B58 80240AE8 4406B000 */ mfc1 $a2, $f22 -/* BB7B5C 80240AEC 0C019E40 */ jal guTranslateF -/* BB7B60 80240AF0 00A0382D */ daddu $a3, $a1, $zero -/* BB7B64 80240AF4 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7B68 80240AF8 0200282D */ daddu $a1, $s0, $zero -/* BB7B6C 80240AFC 0C019D80 */ jal guMtxCatF -/* BB7B70 80240B00 00A0302D */ daddu $a2, $a1, $zero -/* BB7B74 80240B04 96220000 */ lhu $v0, ($s1) -/* BB7B78 80240B08 34421400 */ ori $v0, $v0, 0x1400 -/* BB7B7C 80240B0C 080902E3 */ j .L80240B8C -/* BB7B80 80240B10 A6220000 */ sh $v0, ($s1) -.L80240B14: -/* BB7B84 80240B14 4480A000 */ mtc1 $zero, $f20 -/* BB7B88 80240B18 4406B000 */ mfc1 $a2, $f22 -/* BB7B8C 80240B1C 4405A000 */ mfc1 $a1, $f20 -/* BB7B90 80240B20 4407A000 */ mfc1 $a3, $f20 -/* BB7B94 80240B24 0C019E40 */ jal guTranslateF -/* BB7B98 80240B28 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7B9C 80240B2C 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7BA0 80240B30 26300058 */ addiu $s0, $s1, 0x58 -/* BB7BA4 80240B34 0200282D */ daddu $a1, $s0, $zero -/* BB7BA8 80240B38 0C019D80 */ jal guMtxCatF -/* BB7BAC 80240B3C 0200302D */ daddu $a2, $s0, $zero -/* BB7BB0 80240B40 4405E000 */ mfc1 $a1, $f28 -/* BB7BB4 80240B44 4406D000 */ mfc1 $a2, $f26 -/* BB7BB8 80240B48 4407C000 */ mfc1 $a3, $f24 -/* BB7BBC 80240B4C 0C090260 */ jal func_80240980 -/* BB7BC0 80240B50 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7BC4 80240B54 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7BC8 80240B58 0200282D */ daddu $a1, $s0, $zero -/* BB7BCC 80240B5C 0C019D80 */ jal guMtxCatF -/* BB7BD0 80240B60 0200302D */ daddu $a2, $s0, $zero -/* BB7BD4 80240B64 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7BD8 80240B68 4600B587 */ neg.s $f22, $f22 -/* BB7BDC 80240B6C 4405A000 */ mfc1 $a1, $f20 -/* BB7BE0 80240B70 4406B000 */ mfc1 $a2, $f22 -/* BB7BE4 80240B74 0C019E40 */ jal guTranslateF -/* BB7BE8 80240B78 00A0382D */ daddu $a3, $a1, $zero -/* BB7BEC 80240B7C 27A40010 */ addiu $a0, $sp, 0x10 -/* BB7BF0 80240B80 0200282D */ daddu $a1, $s0, $zero -/* BB7BF4 80240B84 0C019D80 */ jal guMtxCatF -/* BB7BF8 80240B88 00A0302D */ daddu $a2, $a1, $zero -.L80240B8C: -/* BB7BFC 80240B8C 8FBF005C */ lw $ra, 0x5c($sp) -/* BB7C00 80240B90 8FB20058 */ lw $s2, 0x58($sp) -/* BB7C04 80240B94 8FB10054 */ lw $s1, 0x54($sp) -/* BB7C08 80240B98 8FB00050 */ lw $s0, 0x50($sp) -/* BB7C0C 80240B9C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* BB7C10 80240BA0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* BB7C14 80240BA4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* BB7C18 80240BA8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* BB7C1C 80240BAC D7B40060 */ ldc1 $f20, 0x60($sp) -/* BB7C20 80240BB0 24020002 */ addiu $v0, $zero, 2 -/* BB7C24 80240BB4 03E00008 */ jr $ra -/* BB7C28 80240BB8 27BD0088 */ addiu $sp, $sp, 0x88 -/* BB7C2C 80240BBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_802409F0_BB7A60.s b/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_802409F0_BB7A60.s new file mode 100644 index 0000000000..8df46a91a8 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_11/BB79F0/func_802409F0_BB7A60.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409F0_BB7A60 +/* BB7A60 802409F0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* BB7A64 802409F4 AFB10054 */ sw $s1, 0x54($sp) +/* BB7A68 802409F8 0080882D */ daddu $s1, $a0, $zero +/* BB7A6C 802409FC AFBF005C */ sw $ra, 0x5c($sp) +/* BB7A70 80240A00 AFB20058 */ sw $s2, 0x58($sp) +/* BB7A74 80240A04 AFB00050 */ sw $s0, 0x50($sp) +/* BB7A78 80240A08 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* BB7A7C 80240A0C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* BB7A80 80240A10 F7B80070 */ sdc1 $f24, 0x70($sp) +/* BB7A84 80240A14 F7B60068 */ sdc1 $f22, 0x68($sp) +/* BB7A88 80240A18 F7B40060 */ sdc1 $f20, 0x60($sp) +/* BB7A8C 80240A1C 8E30000C */ lw $s0, 0xc($s1) +/* BB7A90 80240A20 8E050000 */ lw $a1, ($s0) +/* BB7A94 80240A24 0C0B1EAF */ jal get_variable +/* BB7A98 80240A28 26100004 */ addiu $s0, $s0, 4 +/* BB7A9C 80240A2C 0C046C04 */ jal get_model_list_index_from_tree_index +/* BB7AA0 80240A30 0040202D */ daddu $a0, $v0, $zero +/* BB7AA4 80240A34 8E050000 */ lw $a1, ($s0) +/* BB7AA8 80240A38 26100004 */ addiu $s0, $s0, 4 +/* BB7AAC 80240A3C 0220202D */ daddu $a0, $s1, $zero +/* BB7AB0 80240A40 0C0B210B */ jal get_float_variable +/* BB7AB4 80240A44 0040902D */ daddu $s2, $v0, $zero +/* BB7AB8 80240A48 8E050000 */ lw $a1, ($s0) +/* BB7ABC 80240A4C 26100004 */ addiu $s0, $s0, 4 +/* BB7AC0 80240A50 0220202D */ daddu $a0, $s1, $zero +/* BB7AC4 80240A54 0C0B210B */ jal get_float_variable +/* BB7AC8 80240A58 46000706 */ mov.s $f28, $f0 +/* BB7ACC 80240A5C 8E050000 */ lw $a1, ($s0) +/* BB7AD0 80240A60 26100004 */ addiu $s0, $s0, 4 +/* BB7AD4 80240A64 0220202D */ daddu $a0, $s1, $zero +/* BB7AD8 80240A68 0C0B210B */ jal get_float_variable +/* BB7ADC 80240A6C 46000686 */ mov.s $f26, $f0 +/* BB7AE0 80240A70 0220202D */ daddu $a0, $s1, $zero +/* BB7AE4 80240A74 8E050000 */ lw $a1, ($s0) +/* BB7AE8 80240A78 0C0B210B */ jal get_float_variable +/* BB7AEC 80240A7C 46000586 */ mov.s $f22, $f0 +/* BB7AF0 80240A80 0240202D */ daddu $a0, $s2, $zero +/* BB7AF4 80240A84 0C046B4C */ jal get_model_from_list_index +/* BB7AF8 80240A88 46000606 */ mov.s $f24, $f0 +/* BB7AFC 80240A8C 0040882D */ daddu $s1, $v0, $zero +/* BB7B00 80240A90 96220000 */ lhu $v0, ($s1) +/* BB7B04 80240A94 30420400 */ andi $v0, $v0, 0x400 +/* BB7B08 80240A98 1440001E */ bnez $v0, .L80240B14 +/* BB7B0C 80240A9C 26300058 */ addiu $s0, $s1, 0x58 +/* BB7B10 80240AA0 4480A000 */ mtc1 $zero, $f20 +/* BB7B14 80240AA4 4406B000 */ mfc1 $a2, $f22 +/* BB7B18 80240AA8 4405A000 */ mfc1 $a1, $f20 +/* BB7B1C 80240AAC 4407A000 */ mfc1 $a3, $f20 +/* BB7B20 80240AB0 0C019E40 */ jal guTranslateF +/* BB7B24 80240AB4 0200202D */ daddu $a0, $s0, $zero +/* BB7B28 80240AB8 4405E000 */ mfc1 $a1, $f28 +/* BB7B2C 80240ABC 4406D000 */ mfc1 $a2, $f26 +/* BB7B30 80240AC0 4407C000 */ mfc1 $a3, $f24 +/* BB7B34 80240AC4 0C090260 */ jal func_80240980_BB79F0 +/* BB7B38 80240AC8 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7B3C 80240ACC 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7B40 80240AD0 0200282D */ daddu $a1, $s0, $zero +/* BB7B44 80240AD4 0C019D80 */ jal guMtxCatF +/* BB7B48 80240AD8 0200302D */ daddu $a2, $s0, $zero +/* BB7B4C 80240ADC 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7B50 80240AE0 4600B587 */ neg.s $f22, $f22 +/* BB7B54 80240AE4 4405A000 */ mfc1 $a1, $f20 +/* BB7B58 80240AE8 4406B000 */ mfc1 $a2, $f22 +/* BB7B5C 80240AEC 0C019E40 */ jal guTranslateF +/* BB7B60 80240AF0 00A0382D */ daddu $a3, $a1, $zero +/* BB7B64 80240AF4 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7B68 80240AF8 0200282D */ daddu $a1, $s0, $zero +/* BB7B6C 80240AFC 0C019D80 */ jal guMtxCatF +/* BB7B70 80240B00 00A0302D */ daddu $a2, $a1, $zero +/* BB7B74 80240B04 96220000 */ lhu $v0, ($s1) +/* BB7B78 80240B08 34421400 */ ori $v0, $v0, 0x1400 +/* BB7B7C 80240B0C 080902E3 */ j .L80240B8C +/* BB7B80 80240B10 A6220000 */ sh $v0, ($s1) +.L80240B14: +/* BB7B84 80240B14 4480A000 */ mtc1 $zero, $f20 +/* BB7B88 80240B18 4406B000 */ mfc1 $a2, $f22 +/* BB7B8C 80240B1C 4405A000 */ mfc1 $a1, $f20 +/* BB7B90 80240B20 4407A000 */ mfc1 $a3, $f20 +/* BB7B94 80240B24 0C019E40 */ jal guTranslateF +/* BB7B98 80240B28 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7B9C 80240B2C 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7BA0 80240B30 26300058 */ addiu $s0, $s1, 0x58 +/* BB7BA4 80240B34 0200282D */ daddu $a1, $s0, $zero +/* BB7BA8 80240B38 0C019D80 */ jal guMtxCatF +/* BB7BAC 80240B3C 0200302D */ daddu $a2, $s0, $zero +/* BB7BB0 80240B40 4405E000 */ mfc1 $a1, $f28 +/* BB7BB4 80240B44 4406D000 */ mfc1 $a2, $f26 +/* BB7BB8 80240B48 4407C000 */ mfc1 $a3, $f24 +/* BB7BBC 80240B4C 0C090260 */ jal func_80240980_BB79F0 +/* BB7BC0 80240B50 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7BC4 80240B54 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7BC8 80240B58 0200282D */ daddu $a1, $s0, $zero +/* BB7BCC 80240B5C 0C019D80 */ jal guMtxCatF +/* BB7BD0 80240B60 0200302D */ daddu $a2, $s0, $zero +/* BB7BD4 80240B64 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7BD8 80240B68 4600B587 */ neg.s $f22, $f22 +/* BB7BDC 80240B6C 4405A000 */ mfc1 $a1, $f20 +/* BB7BE0 80240B70 4406B000 */ mfc1 $a2, $f22 +/* BB7BE4 80240B74 0C019E40 */ jal guTranslateF +/* BB7BE8 80240B78 00A0382D */ daddu $a3, $a1, $zero +/* BB7BEC 80240B7C 27A40010 */ addiu $a0, $sp, 0x10 +/* BB7BF0 80240B80 0200282D */ daddu $a1, $s0, $zero +/* BB7BF4 80240B84 0C019D80 */ jal guMtxCatF +/* BB7BF8 80240B88 00A0302D */ daddu $a2, $a1, $zero +.L80240B8C: +/* BB7BFC 80240B8C 8FBF005C */ lw $ra, 0x5c($sp) +/* BB7C00 80240B90 8FB20058 */ lw $s2, 0x58($sp) +/* BB7C04 80240B94 8FB10054 */ lw $s1, 0x54($sp) +/* BB7C08 80240B98 8FB00050 */ lw $s0, 0x50($sp) +/* BB7C0C 80240B9C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* BB7C10 80240BA0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* BB7C14 80240BA4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* BB7C18 80240BA8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* BB7C1C 80240BAC D7B40060 */ ldc1 $f20, 0x60($sp) +/* BB7C20 80240BB0 24020002 */ addiu $v0, $zero, 2 +/* BB7C24 80240BB4 03E00008 */ jr $ra +/* BB7C28 80240BB8 27BD0088 */ addiu $sp, $sp, 0x88 +/* BB7C2C 80240BBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC.s deleted file mode 100644 index 7d75b80a30..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400CC -/* BBB44C 802400CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BBB450 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* BBB454 802400D4 0080882D */ daddu $s1, $a0, $zero -/* BBB458 802400D8 AFB20018 */ sw $s2, 0x18($sp) -/* BBB45C 802400DC AFBF001C */ sw $ra, 0x1c($sp) -/* BBB460 802400E0 AFB00010 */ sw $s0, 0x10($sp) -/* BBB464 802400E4 8E30000C */ lw $s0, 0xc($s1) -/* BBB468 802400E8 10A00013 */ beqz $a1, .L80240138 -/* BBB46C 802400EC 0000902D */ daddu $s2, $zero, $zero -/* BBB470 802400F0 8E050000 */ lw $a1, ($s0) -/* BBB474 802400F4 0C0B1EAF */ jal get_variable -/* BBB478 802400F8 26100004 */ addiu $s0, $s0, 4 -/* BBB47C 802400FC AE220074 */ sw $v0, 0x74($s1) -/* BBB480 80240100 8E050000 */ lw $a1, ($s0) -/* BBB484 80240104 26100004 */ addiu $s0, $s0, 4 -/* BBB488 80240108 0C0B1EAF */ jal get_variable -/* BBB48C 8024010C 0220202D */ daddu $a0, $s1, $zero -/* BBB490 80240110 AE220078 */ sw $v0, 0x78($s1) -/* BBB494 80240114 8E050000 */ lw $a1, ($s0) -/* BBB498 80240118 26100004 */ addiu $s0, $s0, 4 -/* BBB49C 8024011C 0C0B1EAF */ jal get_variable -/* BBB4A0 80240120 0220202D */ daddu $a0, $s1, $zero -/* BBB4A4 80240124 AE220070 */ sw $v0, 0x70($s1) -/* BBB4A8 80240128 8E050000 */ lw $a1, ($s0) -/* BBB4AC 8024012C 0C0B1EAF */ jal get_variable -/* BBB4B0 80240130 0220202D */ daddu $a0, $s1, $zero -/* BBB4B4 80240134 AE22007C */ sw $v0, 0x7c($s1) -.L80240138: -/* BBB4B8 80240138 8E23007C */ lw $v1, 0x7c($s1) -/* BBB4BC 8024013C 8E220074 */ lw $v0, 0x74($s1) -/* BBB4C0 80240140 0060202D */ daddu $a0, $v1, $zero -/* BBB4C4 80240144 00431021 */ addu $v0, $v0, $v1 -/* BBB4C8 80240148 04800004 */ bltz $a0, .L8024015C -/* BBB4CC 8024014C AE220074 */ sw $v0, 0x74($s1) -/* BBB4D0 80240150 8E230078 */ lw $v1, 0x78($s1) -/* BBB4D4 80240154 08090059 */ j .L80240164 -/* BBB4D8 80240158 0043102A */ slt $v0, $v0, $v1 -.L8024015C: -/* BBB4DC 8024015C 8E230078 */ lw $v1, 0x78($s1) -/* BBB4E0 80240160 0062102A */ slt $v0, $v1, $v0 -.L80240164: -/* BBB4E4 80240164 14400003 */ bnez $v0, .L80240174 -/* BBB4E8 80240168 00000000 */ nop -/* BBB4EC 8024016C AE230074 */ sw $v1, 0x74($s1) -/* BBB4F0 80240170 24120002 */ addiu $s2, $zero, 2 -.L80240174: -/* BBB4F4 80240174 8E240074 */ lw $a0, 0x74($s1) -/* BBB4F8 80240178 0C046EDD */ jal set_world_fog_dist -/* BBB4FC 8024017C 8E250070 */ lw $a1, 0x70($s1) -/* BBB500 80240180 0240102D */ daddu $v0, $s2, $zero -/* BBB504 80240184 8FBF001C */ lw $ra, 0x1c($sp) -/* BBB508 80240188 8FB20018 */ lw $s2, 0x18($sp) -/* BBB50C 8024018C 8FB10014 */ lw $s1, 0x14($sp) -/* BBB510 80240190 8FB00010 */ lw $s0, 0x10($sp) -/* BBB514 80240194 03E00008 */ jr $ra -/* BBB518 80240198 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s new file mode 100644 index 0000000000..d6b5d3aa5a --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_802400CC_BBB44C.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400CC_BBB44C +/* BBB44C 802400CC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BBB450 802400D0 AFB10014 */ sw $s1, 0x14($sp) +/* BBB454 802400D4 0080882D */ daddu $s1, $a0, $zero +/* BBB458 802400D8 AFB20018 */ sw $s2, 0x18($sp) +/* BBB45C 802400DC AFBF001C */ sw $ra, 0x1c($sp) +/* BBB460 802400E0 AFB00010 */ sw $s0, 0x10($sp) +/* BBB464 802400E4 8E30000C */ lw $s0, 0xc($s1) +/* BBB468 802400E8 10A00013 */ beqz $a1, .L80240138 +/* BBB46C 802400EC 0000902D */ daddu $s2, $zero, $zero +/* BBB470 802400F0 8E050000 */ lw $a1, ($s0) +/* BBB474 802400F4 0C0B1EAF */ jal get_variable +/* BBB478 802400F8 26100004 */ addiu $s0, $s0, 4 +/* BBB47C 802400FC AE220074 */ sw $v0, 0x74($s1) +/* BBB480 80240100 8E050000 */ lw $a1, ($s0) +/* BBB484 80240104 26100004 */ addiu $s0, $s0, 4 +/* BBB488 80240108 0C0B1EAF */ jal get_variable +/* BBB48C 8024010C 0220202D */ daddu $a0, $s1, $zero +/* BBB490 80240110 AE220078 */ sw $v0, 0x78($s1) +/* BBB494 80240114 8E050000 */ lw $a1, ($s0) +/* BBB498 80240118 26100004 */ addiu $s0, $s0, 4 +/* BBB49C 8024011C 0C0B1EAF */ jal get_variable +/* BBB4A0 80240120 0220202D */ daddu $a0, $s1, $zero +/* BBB4A4 80240124 AE220070 */ sw $v0, 0x70($s1) +/* BBB4A8 80240128 8E050000 */ lw $a1, ($s0) +/* BBB4AC 8024012C 0C0B1EAF */ jal get_variable +/* BBB4B0 80240130 0220202D */ daddu $a0, $s1, $zero +/* BBB4B4 80240134 AE22007C */ sw $v0, 0x7c($s1) +.L80240138: +/* BBB4B8 80240138 8E23007C */ lw $v1, 0x7c($s1) +/* BBB4BC 8024013C 8E220074 */ lw $v0, 0x74($s1) +/* BBB4C0 80240140 0060202D */ daddu $a0, $v1, $zero +/* BBB4C4 80240144 00431021 */ addu $v0, $v0, $v1 +/* BBB4C8 80240148 04800004 */ bltz $a0, .L8024015C +/* BBB4CC 8024014C AE220074 */ sw $v0, 0x74($s1) +/* BBB4D0 80240150 8E230078 */ lw $v1, 0x78($s1) +/* BBB4D4 80240154 08090059 */ j .L80240164 +/* BBB4D8 80240158 0043102A */ slt $v0, $v0, $v1 +.L8024015C: +/* BBB4DC 8024015C 8E230078 */ lw $v1, 0x78($s1) +/* BBB4E0 80240160 0062102A */ slt $v0, $v1, $v0 +.L80240164: +/* BBB4E4 80240164 14400003 */ bnez $v0, .L80240174 +/* BBB4E8 80240168 00000000 */ nop +/* BBB4EC 8024016C AE230074 */ sw $v1, 0x74($s1) +/* BBB4F0 80240170 24120002 */ addiu $s2, $zero, 2 +.L80240174: +/* BBB4F4 80240174 8E240074 */ lw $a0, 0x74($s1) +/* BBB4F8 80240178 0C046EDD */ jal set_world_fog_dist +/* BBB4FC 8024017C 8E250070 */ lw $a1, 0x70($s1) +/* BBB500 80240180 0240102D */ daddu $v0, $s2, $zero +/* BBB504 80240184 8FBF001C */ lw $ra, 0x1c($sp) +/* BBB508 80240188 8FB20018 */ lw $s2, 0x18($sp) +/* BBB50C 8024018C 8FB10014 */ lw $s1, 0x14($sp) +/* BBB510 80240190 8FB00010 */ lw $s0, 0x10($sp) +/* BBB514 80240194 03E00008 */ jr $ra +/* BBB518 80240198 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C.s deleted file mode 100644 index 7787f15ac0..0000000000 --- a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C.s +++ /dev/null @@ -1,159 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024025C -/* BBB5DC 8024025C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* BBB5E0 80240260 AFB1001C */ sw $s1, 0x1c($sp) -/* BBB5E4 80240264 0080882D */ daddu $s1, $a0, $zero -/* BBB5E8 80240268 AFB30024 */ sw $s3, 0x24($sp) -/* BBB5EC 8024026C 3C138015 */ lui $s3, %hi(D_80151328) -/* BBB5F0 80240270 26731328 */ addiu $s3, $s3, %lo(D_80151328) -/* BBB5F4 80240274 AFBF0028 */ sw $ra, 0x28($sp) -/* BBB5F8 80240278 AFB20020 */ sw $s2, 0x20($sp) -/* BBB5FC 8024027C AFB00018 */ sw $s0, 0x18($sp) -/* BBB600 80240280 8E30000C */ lw $s0, 0xc($s1) -/* BBB604 80240284 10A00019 */ beqz $a1, .L802402EC -/* BBB608 80240288 8E720000 */ lw $s2, ($s3) -/* BBB60C 8024028C 8E050000 */ lw $a1, ($s0) -/* BBB610 80240290 0C0B1EAF */ jal get_variable -/* BBB614 80240294 26100004 */ addiu $s0, $s0, 4 -/* BBB618 80240298 AE220084 */ sw $v0, 0x84($s1) -/* BBB61C 8024029C 8E050000 */ lw $a1, ($s0) -/* BBB620 802402A0 26100004 */ addiu $s0, $s0, 4 -/* BBB624 802402A4 0C0B1EAF */ jal get_variable -/* BBB628 802402A8 0220202D */ daddu $a0, $s1, $zero -/* BBB62C 802402AC AE220088 */ sw $v0, 0x88($s1) -/* BBB630 802402B0 8E050000 */ lw $a1, ($s0) -/* BBB634 802402B4 0C0B1EAF */ jal get_variable -/* BBB638 802402B8 0220202D */ daddu $a0, $s1, $zero -/* BBB63C 802402BC AE22008C */ sw $v0, 0x8c($s1) -/* BBB640 802402C0 924200AC */ lbu $v0, 0xac($s2) -/* BBB644 802402C4 AE220090 */ sw $v0, 0x90($s1) -/* BBB648 802402C8 924200AD */ lbu $v0, 0xad($s2) -/* BBB64C 802402CC AE220094 */ sw $v0, 0x94($s1) -/* BBB650 802402D0 924200AE */ lbu $v0, 0xae($s2) -/* BBB654 802402D4 8E630000 */ lw $v1, ($s3) -/* BBB658 802402D8 AE20009C */ sw $zero, 0x9c($s1) -/* BBB65C 802402DC AE220098 */ sw $v0, 0x98($s1) -/* BBB660 802402E0 94620000 */ lhu $v0, ($v1) -/* BBB664 802402E4 34420001 */ ori $v0, $v0, 1 -/* BBB668 802402E8 A4620000 */ sh $v0, ($v1) -.L802402EC: -/* BBB66C 802402EC C6200090 */ lwc1 $f0, 0x90($s1) -/* BBB670 802402F0 46800020 */ cvt.s.w $f0, $f0 -/* BBB674 802402F4 44050000 */ mfc1 $a1, $f0 -/* BBB678 802402F8 C6200084 */ lwc1 $f0, 0x84($s1) -/* BBB67C 802402FC 46800020 */ cvt.s.w $f0, $f0 -/* BBB680 80240300 8E22009C */ lw $v0, 0x9c($s1) -/* BBB684 80240304 44060000 */ mfc1 $a2, $f0 -/* BBB688 80240308 24420001 */ addiu $v0, $v0, 1 -/* BBB68C 8024030C AE22009C */ sw $v0, 0x9c($s1) -/* BBB690 80240310 24020014 */ addiu $v0, $zero, 0x14 -/* BBB694 80240314 AFA20010 */ sw $v0, 0x10($sp) -/* BBB698 80240318 8E27009C */ lw $a3, 0x9c($s1) -/* BBB69C 8024031C 0C00A8ED */ jal update_lerp -/* BBB6A0 80240320 0000202D */ daddu $a0, $zero, $zero -/* BBB6A4 80240324 3C014F00 */ lui $at, 0x4f00 -/* BBB6A8 80240328 44811000 */ mtc1 $at, $f2 -/* BBB6AC 8024032C 00000000 */ nop -/* BBB6B0 80240330 4600103E */ c.le.s $f2, $f0 -/* BBB6B4 80240334 00000000 */ nop -/* BBB6B8 80240338 45010005 */ bc1t .L80240350 -/* BBB6BC 8024033C 264400AC */ addiu $a0, $s2, 0xac -/* BBB6C0 80240340 4600010D */ trunc.w.s $f4, $f0 -/* BBB6C4 80240344 44032000 */ mfc1 $v1, $f4 -/* BBB6C8 80240348 080900DB */ j .L8024036C -/* BBB6CC 8024034C A0830000 */ sb $v1, ($a0) -.L80240350: -/* BBB6D0 80240350 46020001 */ sub.s $f0, $f0, $f2 -/* BBB6D4 80240354 3C028000 */ lui $v0, 0x8000 -/* BBB6D8 80240358 4600010D */ trunc.w.s $f4, $f0 -/* BBB6DC 8024035C 44032000 */ mfc1 $v1, $f4 -/* BBB6E0 80240360 00000000 */ nop -/* BBB6E4 80240364 00621825 */ or $v1, $v1, $v0 -/* BBB6E8 80240368 A0830000 */ sb $v1, ($a0) -.L8024036C: -/* BBB6EC 8024036C C6200094 */ lwc1 $f0, 0x94($s1) -/* BBB6F0 80240370 46800020 */ cvt.s.w $f0, $f0 -/* BBB6F4 80240374 44050000 */ mfc1 $a1, $f0 -/* BBB6F8 80240378 C6200088 */ lwc1 $f0, 0x88($s1) -/* BBB6FC 8024037C 46800020 */ cvt.s.w $f0, $f0 -/* BBB700 80240380 44060000 */ mfc1 $a2, $f0 -/* BBB704 80240384 24020014 */ addiu $v0, $zero, 0x14 -/* BBB708 80240388 AFA20010 */ sw $v0, 0x10($sp) -/* BBB70C 8024038C 8E27009C */ lw $a3, 0x9c($s1) -/* BBB710 80240390 0C00A8ED */ jal update_lerp -/* BBB714 80240394 0000202D */ daddu $a0, $zero, $zero -/* BBB718 80240398 3C014F00 */ lui $at, 0x4f00 -/* BBB71C 8024039C 44811000 */ mtc1 $at, $f2 -/* BBB720 802403A0 00000000 */ nop -/* BBB724 802403A4 4600103E */ c.le.s $f2, $f0 -/* BBB728 802403A8 00000000 */ nop -/* BBB72C 802403AC 45010005 */ bc1t .L802403C4 -/* BBB730 802403B0 264400AD */ addiu $a0, $s2, 0xad -/* BBB734 802403B4 4600010D */ trunc.w.s $f4, $f0 -/* BBB738 802403B8 44032000 */ mfc1 $v1, $f4 -/* BBB73C 802403BC 080900F8 */ j .L802403E0 -/* BBB740 802403C0 A0830000 */ sb $v1, ($a0) -.L802403C4: -/* BBB744 802403C4 46020001 */ sub.s $f0, $f0, $f2 -/* BBB748 802403C8 3C028000 */ lui $v0, 0x8000 -/* BBB74C 802403CC 4600010D */ trunc.w.s $f4, $f0 -/* BBB750 802403D0 44032000 */ mfc1 $v1, $f4 -/* BBB754 802403D4 00000000 */ nop -/* BBB758 802403D8 00621825 */ or $v1, $v1, $v0 -/* BBB75C 802403DC A0830000 */ sb $v1, ($a0) -.L802403E0: -/* BBB760 802403E0 C6200098 */ lwc1 $f0, 0x98($s1) -/* BBB764 802403E4 46800020 */ cvt.s.w $f0, $f0 -/* BBB768 802403E8 44050000 */ mfc1 $a1, $f0 -/* BBB76C 802403EC C620008C */ lwc1 $f0, 0x8c($s1) -/* BBB770 802403F0 46800020 */ cvt.s.w $f0, $f0 -/* BBB774 802403F4 44060000 */ mfc1 $a2, $f0 -/* BBB778 802403F8 24020014 */ addiu $v0, $zero, 0x14 -/* BBB77C 802403FC AFA20010 */ sw $v0, 0x10($sp) -/* BBB780 80240400 8E27009C */ lw $a3, 0x9c($s1) -/* BBB784 80240404 0C00A8ED */ jal update_lerp -/* BBB788 80240408 0000202D */ daddu $a0, $zero, $zero -/* BBB78C 8024040C 3C014F00 */ lui $at, 0x4f00 -/* BBB790 80240410 44811000 */ mtc1 $at, $f2 -/* BBB794 80240414 00000000 */ nop -/* BBB798 80240418 4600103E */ c.le.s $f2, $f0 -/* BBB79C 8024041C 00000000 */ nop -/* BBB7A0 80240420 45010005 */ bc1t .L80240438 -/* BBB7A4 80240424 264400AE */ addiu $a0, $s2, 0xae -/* BBB7A8 80240428 4600010D */ trunc.w.s $f4, $f0 -/* BBB7AC 8024042C 44032000 */ mfc1 $v1, $f4 -/* BBB7B0 80240430 08090115 */ j .L80240454 -/* BBB7B4 80240434 A0830000 */ sb $v1, ($a0) -.L80240438: -/* BBB7B8 80240438 46020001 */ sub.s $f0, $f0, $f2 -/* BBB7BC 8024043C 3C028000 */ lui $v0, 0x8000 -/* BBB7C0 80240440 4600010D */ trunc.w.s $f4, $f0 -/* BBB7C4 80240444 44032000 */ mfc1 $v1, $f4 -/* BBB7C8 80240448 00000000 */ nop -/* BBB7CC 8024044C 00621825 */ or $v1, $v1, $v0 -/* BBB7D0 80240450 A0830000 */ sb $v1, ($a0) -.L80240454: -/* BBB7D4 80240454 8E23009C */ lw $v1, 0x9c($s1) -/* BBB7D8 80240458 24020014 */ addiu $v0, $zero, 0x14 -/* BBB7DC 8024045C 1462000B */ bne $v1, $v0, .L8024048C -/* BBB7E0 80240460 0000102D */ daddu $v0, $zero, $zero -/* BBB7E4 80240464 8E230084 */ lw $v1, 0x84($s1) -/* BBB7E8 80240468 240200FF */ addiu $v0, $zero, 0xff -/* BBB7EC 8024046C 54620007 */ bnel $v1, $v0, .L8024048C -/* BBB7F0 80240470 24020002 */ addiu $v0, $zero, 2 -/* BBB7F4 80240474 3C038015 */ lui $v1, %hi(D_80151328) -/* BBB7F8 80240478 8C631328 */ lw $v1, %lo(D_80151328)($v1) -/* BBB7FC 8024047C 94620000 */ lhu $v0, ($v1) -/* BBB800 80240480 3042FFFE */ andi $v0, $v0, 0xfffe -/* BBB804 80240484 A4620000 */ sh $v0, ($v1) -/* BBB808 80240488 24020002 */ addiu $v0, $zero, 2 -.L8024048C: -/* BBB80C 8024048C 8FBF0028 */ lw $ra, 0x28($sp) -/* BBB810 80240490 8FB30024 */ lw $s3, 0x24($sp) -/* BBB814 80240494 8FB20020 */ lw $s2, 0x20($sp) -/* BBB818 80240498 8FB1001C */ lw $s1, 0x1c($sp) -/* BBB81C 8024049C 8FB00018 */ lw $s0, 0x18($sp) -/* BBB820 802404A0 03E00008 */ jr $ra -/* BBB824 802404A4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s new file mode 100644 index 0000000000..9cc3417110 --- /dev/null +++ b/asm/nonmatchings/world/area_mim/mim_12/BBB380/func_8024025C_BBB5DC.s @@ -0,0 +1,159 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024025C_BBB5DC +/* BBB5DC 8024025C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* BBB5E0 80240260 AFB1001C */ sw $s1, 0x1c($sp) +/* BBB5E4 80240264 0080882D */ daddu $s1, $a0, $zero +/* BBB5E8 80240268 AFB30024 */ sw $s3, 0x24($sp) +/* BBB5EC 8024026C 3C138015 */ lui $s3, %hi(D_80151328) +/* BBB5F0 80240270 26731328 */ addiu $s3, $s3, %lo(D_80151328) +/* BBB5F4 80240274 AFBF0028 */ sw $ra, 0x28($sp) +/* BBB5F8 80240278 AFB20020 */ sw $s2, 0x20($sp) +/* BBB5FC 8024027C AFB00018 */ sw $s0, 0x18($sp) +/* BBB600 80240280 8E30000C */ lw $s0, 0xc($s1) +/* BBB604 80240284 10A00019 */ beqz $a1, .L802402EC +/* BBB608 80240288 8E720000 */ lw $s2, ($s3) +/* BBB60C 8024028C 8E050000 */ lw $a1, ($s0) +/* BBB610 80240290 0C0B1EAF */ jal get_variable +/* BBB614 80240294 26100004 */ addiu $s0, $s0, 4 +/* BBB618 80240298 AE220084 */ sw $v0, 0x84($s1) +/* BBB61C 8024029C 8E050000 */ lw $a1, ($s0) +/* BBB620 802402A0 26100004 */ addiu $s0, $s0, 4 +/* BBB624 802402A4 0C0B1EAF */ jal get_variable +/* BBB628 802402A8 0220202D */ daddu $a0, $s1, $zero +/* BBB62C 802402AC AE220088 */ sw $v0, 0x88($s1) +/* BBB630 802402B0 8E050000 */ lw $a1, ($s0) +/* BBB634 802402B4 0C0B1EAF */ jal get_variable +/* BBB638 802402B8 0220202D */ daddu $a0, $s1, $zero +/* BBB63C 802402BC AE22008C */ sw $v0, 0x8c($s1) +/* BBB640 802402C0 924200AC */ lbu $v0, 0xac($s2) +/* BBB644 802402C4 AE220090 */ sw $v0, 0x90($s1) +/* BBB648 802402C8 924200AD */ lbu $v0, 0xad($s2) +/* BBB64C 802402CC AE220094 */ sw $v0, 0x94($s1) +/* BBB650 802402D0 924200AE */ lbu $v0, 0xae($s2) +/* BBB654 802402D4 8E630000 */ lw $v1, ($s3) +/* BBB658 802402D8 AE20009C */ sw $zero, 0x9c($s1) +/* BBB65C 802402DC AE220098 */ sw $v0, 0x98($s1) +/* BBB660 802402E0 94620000 */ lhu $v0, ($v1) +/* BBB664 802402E4 34420001 */ ori $v0, $v0, 1 +/* BBB668 802402E8 A4620000 */ sh $v0, ($v1) +.L802402EC: +/* BBB66C 802402EC C6200090 */ lwc1 $f0, 0x90($s1) +/* BBB670 802402F0 46800020 */ cvt.s.w $f0, $f0 +/* BBB674 802402F4 44050000 */ mfc1 $a1, $f0 +/* BBB678 802402F8 C6200084 */ lwc1 $f0, 0x84($s1) +/* BBB67C 802402FC 46800020 */ cvt.s.w $f0, $f0 +/* BBB680 80240300 8E22009C */ lw $v0, 0x9c($s1) +/* BBB684 80240304 44060000 */ mfc1 $a2, $f0 +/* BBB688 80240308 24420001 */ addiu $v0, $v0, 1 +/* BBB68C 8024030C AE22009C */ sw $v0, 0x9c($s1) +/* BBB690 80240310 24020014 */ addiu $v0, $zero, 0x14 +/* BBB694 80240314 AFA20010 */ sw $v0, 0x10($sp) +/* BBB698 80240318 8E27009C */ lw $a3, 0x9c($s1) +/* BBB69C 8024031C 0C00A8ED */ jal update_lerp +/* BBB6A0 80240320 0000202D */ daddu $a0, $zero, $zero +/* BBB6A4 80240324 3C014F00 */ lui $at, 0x4f00 +/* BBB6A8 80240328 44811000 */ mtc1 $at, $f2 +/* BBB6AC 8024032C 00000000 */ nop +/* BBB6B0 80240330 4600103E */ c.le.s $f2, $f0 +/* BBB6B4 80240334 00000000 */ nop +/* BBB6B8 80240338 45010005 */ bc1t .L80240350 +/* BBB6BC 8024033C 264400AC */ addiu $a0, $s2, 0xac +/* BBB6C0 80240340 4600010D */ trunc.w.s $f4, $f0 +/* BBB6C4 80240344 44032000 */ mfc1 $v1, $f4 +/* BBB6C8 80240348 080900DB */ j .L8024036C +/* BBB6CC 8024034C A0830000 */ sb $v1, ($a0) +.L80240350: +/* BBB6D0 80240350 46020001 */ sub.s $f0, $f0, $f2 +/* BBB6D4 80240354 3C028000 */ lui $v0, 0x8000 +/* BBB6D8 80240358 4600010D */ trunc.w.s $f4, $f0 +/* BBB6DC 8024035C 44032000 */ mfc1 $v1, $f4 +/* BBB6E0 80240360 00000000 */ nop +/* BBB6E4 80240364 00621825 */ or $v1, $v1, $v0 +/* BBB6E8 80240368 A0830000 */ sb $v1, ($a0) +.L8024036C: +/* BBB6EC 8024036C C6200094 */ lwc1 $f0, 0x94($s1) +/* BBB6F0 80240370 46800020 */ cvt.s.w $f0, $f0 +/* BBB6F4 80240374 44050000 */ mfc1 $a1, $f0 +/* BBB6F8 80240378 C6200088 */ lwc1 $f0, 0x88($s1) +/* BBB6FC 8024037C 46800020 */ cvt.s.w $f0, $f0 +/* BBB700 80240380 44060000 */ mfc1 $a2, $f0 +/* BBB704 80240384 24020014 */ addiu $v0, $zero, 0x14 +/* BBB708 80240388 AFA20010 */ sw $v0, 0x10($sp) +/* BBB70C 8024038C 8E27009C */ lw $a3, 0x9c($s1) +/* BBB710 80240390 0C00A8ED */ jal update_lerp +/* BBB714 80240394 0000202D */ daddu $a0, $zero, $zero +/* BBB718 80240398 3C014F00 */ lui $at, 0x4f00 +/* BBB71C 8024039C 44811000 */ mtc1 $at, $f2 +/* BBB720 802403A0 00000000 */ nop +/* BBB724 802403A4 4600103E */ c.le.s $f2, $f0 +/* BBB728 802403A8 00000000 */ nop +/* BBB72C 802403AC 45010005 */ bc1t .L802403C4 +/* BBB730 802403B0 264400AD */ addiu $a0, $s2, 0xad +/* BBB734 802403B4 4600010D */ trunc.w.s $f4, $f0 +/* BBB738 802403B8 44032000 */ mfc1 $v1, $f4 +/* BBB73C 802403BC 080900F8 */ j .L802403E0 +/* BBB740 802403C0 A0830000 */ sb $v1, ($a0) +.L802403C4: +/* BBB744 802403C4 46020001 */ sub.s $f0, $f0, $f2 +/* BBB748 802403C8 3C028000 */ lui $v0, 0x8000 +/* BBB74C 802403CC 4600010D */ trunc.w.s $f4, $f0 +/* BBB750 802403D0 44032000 */ mfc1 $v1, $f4 +/* BBB754 802403D4 00000000 */ nop +/* BBB758 802403D8 00621825 */ or $v1, $v1, $v0 +/* BBB75C 802403DC A0830000 */ sb $v1, ($a0) +.L802403E0: +/* BBB760 802403E0 C6200098 */ lwc1 $f0, 0x98($s1) +/* BBB764 802403E4 46800020 */ cvt.s.w $f0, $f0 +/* BBB768 802403E8 44050000 */ mfc1 $a1, $f0 +/* BBB76C 802403EC C620008C */ lwc1 $f0, 0x8c($s1) +/* BBB770 802403F0 46800020 */ cvt.s.w $f0, $f0 +/* BBB774 802403F4 44060000 */ mfc1 $a2, $f0 +/* BBB778 802403F8 24020014 */ addiu $v0, $zero, 0x14 +/* BBB77C 802403FC AFA20010 */ sw $v0, 0x10($sp) +/* BBB780 80240400 8E27009C */ lw $a3, 0x9c($s1) +/* BBB784 80240404 0C00A8ED */ jal update_lerp +/* BBB788 80240408 0000202D */ daddu $a0, $zero, $zero +/* BBB78C 8024040C 3C014F00 */ lui $at, 0x4f00 +/* BBB790 80240410 44811000 */ mtc1 $at, $f2 +/* BBB794 80240414 00000000 */ nop +/* BBB798 80240418 4600103E */ c.le.s $f2, $f0 +/* BBB79C 8024041C 00000000 */ nop +/* BBB7A0 80240420 45010005 */ bc1t .L80240438 +/* BBB7A4 80240424 264400AE */ addiu $a0, $s2, 0xae +/* BBB7A8 80240428 4600010D */ trunc.w.s $f4, $f0 +/* BBB7AC 8024042C 44032000 */ mfc1 $v1, $f4 +/* BBB7B0 80240430 08090115 */ j .L80240454 +/* BBB7B4 80240434 A0830000 */ sb $v1, ($a0) +.L80240438: +/* BBB7B8 80240438 46020001 */ sub.s $f0, $f0, $f2 +/* BBB7BC 8024043C 3C028000 */ lui $v0, 0x8000 +/* BBB7C0 80240440 4600010D */ trunc.w.s $f4, $f0 +/* BBB7C4 80240444 44032000 */ mfc1 $v1, $f4 +/* BBB7C8 80240448 00000000 */ nop +/* BBB7CC 8024044C 00621825 */ or $v1, $v1, $v0 +/* BBB7D0 80240450 A0830000 */ sb $v1, ($a0) +.L80240454: +/* BBB7D4 80240454 8E23009C */ lw $v1, 0x9c($s1) +/* BBB7D8 80240458 24020014 */ addiu $v0, $zero, 0x14 +/* BBB7DC 8024045C 1462000B */ bne $v1, $v0, .L8024048C +/* BBB7E0 80240460 0000102D */ daddu $v0, $zero, $zero +/* BBB7E4 80240464 8E230084 */ lw $v1, 0x84($s1) +/* BBB7E8 80240468 240200FF */ addiu $v0, $zero, 0xff +/* BBB7EC 8024046C 54620007 */ bnel $v1, $v0, .L8024048C +/* BBB7F0 80240470 24020002 */ addiu $v0, $zero, 2 +/* BBB7F4 80240474 3C038015 */ lui $v1, %hi(D_80151328) +/* BBB7F8 80240478 8C631328 */ lw $v1, %lo(D_80151328)($v1) +/* BBB7FC 8024047C 94620000 */ lhu $v0, ($v1) +/* BBB800 80240480 3042FFFE */ andi $v0, $v0, 0xfffe +/* BBB804 80240484 A4620000 */ sh $v0, ($v1) +/* BBB808 80240488 24020002 */ addiu $v0, $zero, 2 +.L8024048C: +/* BBB80C 8024048C 8FBF0028 */ lw $ra, 0x28($sp) +/* BBB810 80240490 8FB30024 */ lw $s3, 0x24($sp) +/* BBB814 80240494 8FB20020 */ lw $s2, 0x20($sp) +/* BBB818 80240498 8FB1001C */ lw $s1, 0x1c($sp) +/* BBB81C 8024049C 8FB00018 */ lw $s0, 0x18($sp) +/* BBB820 802404A0 03E00008 */ jr $ra +/* BBB824 802404A4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s index 26b05c07ca..6ff4823bcc 100644 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802407F4_9C5BD4.s @@ -109,47 +109,47 @@ glabel func_802407F4_9C5BD4 /* 9C5D60 80240980 00000000 */ nop /* 9C5D64 80240984 0280202D */ daddu $a0, $s4, $zero /* 9C5D68 80240988 0260282D */ daddu $a1, $s3, $zero -/* 9C5D6C 8024098C 0C090000 */ jal func_80240000 +/* 9C5D6C 8024098C 0C090000 */ jal func_80240000_9C53E0 /* 9C5D70 80240990 02A0302D */ daddu $a2, $s5, $zero /* 9C5D74 80240994 0280202D */ daddu $a0, $s4, $zero /* 9C5D78 80240998 0260282D */ daddu $a1, $s3, $zero -/* 9C5D7C 8024099C 0C09002D */ jal func_802400B4 +/* 9C5D7C 8024099C 0C09002D */ jal func_802400B4_9C5494 /* 9C5D80 802409A0 02A0302D */ daddu $a2, $s5, $zero /* 9C5D84 802409A4 08090291 */ j .L80240A44 /* 9C5D88 802409A8 00000000 */ nop /* 9C5D8C 802409AC 0280202D */ daddu $a0, $s4, $zero /* 9C5D90 802409B0 0260282D */ daddu $a1, $s3, $zero -/* 9C5D94 802409B4 0C090075 */ jal func_802401D4 +/* 9C5D94 802409B4 0C090075 */ jal func_802401D4_9C55B4 /* 9C5D98 802409B8 02A0302D */ daddu $a2, $s5, $zero /* 9C5D9C 802409BC 0280202D */ daddu $a0, $s4, $zero /* 9C5DA0 802409C0 0260282D */ daddu $a1, $s3, $zero -/* 9C5DA4 802409C4 0C09008D */ jal func_80240234 +/* 9C5DA4 802409C4 0C09008D */ jal func_80240234_9C5614 /* 9C5DA8 802409C8 02A0302D */ daddu $a2, $s5, $zero /* 9C5DAC 802409CC 08090291 */ j .L80240A44 /* 9C5DB0 802409D0 00000000 */ nop /* 9C5DB4 802409D4 0280202D */ daddu $a0, $s4, $zero /* 9C5DB8 802409D8 0260282D */ daddu $a1, $s3, $zero -/* 9C5DBC 802409DC 0C0900AB */ jal func_802402AC +/* 9C5DBC 802409DC 0C0900AB */ jal func_802402AC_9C568C /* 9C5DC0 802409E0 02A0302D */ daddu $a2, $s5, $zero /* 9C5DC4 802409E4 0280202D */ daddu $a0, $s4, $zero /* 9C5DC8 802409E8 0260282D */ daddu $a1, $s3, $zero -/* 9C5DCC 802409EC 0C0900F7 */ jal func_802403DC +/* 9C5DCC 802409EC 0C0900F7 */ jal func_802403DC_9C57BC /* 9C5DD0 802409F0 02A0302D */ daddu $a2, $s5, $zero /* 9C5DD4 802409F4 08090291 */ j .L80240A44 /* 9C5DD8 802409F8 00000000 */ nop /* 9C5DDC 802409FC 0280202D */ daddu $a0, $s4, $zero /* 9C5DE0 80240A00 0260282D */ daddu $a1, $s3, $zero -/* 9C5DE4 80240A04 0C09013E */ jal func_802404F8 +/* 9C5DE4 80240A04 0C09013E */ jal func_802404F8_9C58D8 /* 9C5DE8 80240A08 02A0302D */ daddu $a2, $s5, $zero /* 9C5DEC 80240A0C 08090291 */ j .L80240A44 /* 9C5DF0 80240A10 00000000 */ nop /* 9C5DF4 80240A14 0280202D */ daddu $a0, $s4, $zero /* 9C5DF8 80240A18 0260282D */ daddu $a1, $s3, $zero -/* 9C5DFC 80240A1C 0C090150 */ jal func_80240540 +/* 9C5DFC 80240A1C 0C090150 */ jal func_80240540_9C5920 /* 9C5E00 80240A20 02A0302D */ daddu $a2, $s5, $zero /* 9C5E04 80240A24 0280202D */ daddu $a0, $s4, $zero /* 9C5E08 80240A28 0260282D */ daddu $a1, $s3, $zero -/* 9C5E0C 80240A2C 0C09017B */ jal func_802405EC +/* 9C5E0C 80240A2C 0C09017B */ jal func_802405EC_9C59CC /* 9C5E10 80240A30 02A0302D */ daddu $a2, $s5, $zero /* 9C5E14 80240A34 08090291 */ j .L80240A44 /* 9C5E18 80240A38 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C.s deleted file mode 100644 index 45ed486c9d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A8C -/* 9C5E6C 80240A8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5E70 80240A90 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5E74 80240A94 0C03A631 */ jal func_800E98C4 -/* 9C5E78 80240A98 00000000 */ nop -/* 9C5E7C 80240A9C 0C03A6DB */ jal sync_status_menu -/* 9C5E80 80240AA0 00000000 */ nop -/* 9C5E84 80240AA4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C5E88 80240AA8 24020002 */ addiu $v0, $zero, 2 -/* 9C5E8C 80240AAC 03E00008 */ jr $ra -/* 9C5E90 80240AB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s new file mode 100644 index 0000000000..98cc382f6f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A8C_9C5E6C +/* 9C5E6C 80240A8C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C5E70 80240A90 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C5E74 80240A94 0C03A631 */ jal func_800E98C4 +/* 9C5E78 80240A98 00000000 */ nop +/* 9C5E7C 80240A9C 0C03A6DB */ jal sync_status_menu +/* 9C5E80 80240AA0 00000000 */ nop +/* 9C5E84 80240AA4 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C5E88 80240AA8 24020002 */ addiu $v0, $zero, 2 +/* 9C5E8C 80240AAC 03E00008 */ jr $ra +/* 9C5E90 80240AB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4.s deleted file mode 100644 index 4643039621..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AB4 -/* 9C5E94 80240AB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C5E98 80240AB8 AFB10014 */ sw $s1, 0x14($sp) -/* 9C5E9C 80240ABC 0080882D */ daddu $s1, $a0, $zero -/* 9C5EA0 80240AC0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C5EA4 80240AC4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C5EA8 80240AC8 8E30000C */ lw $s0, 0xc($s1) -/* 9C5EAC 80240ACC 8E050000 */ lw $a1, ($s0) -/* 9C5EB0 80240AD0 0C0B1EAF */ jal get_variable -/* 9C5EB4 80240AD4 26100004 */ addiu $s0, $s0, 4 -/* 9C5EB8 80240AD8 0220202D */ daddu $a0, $s1, $zero -/* 9C5EBC 80240ADC 8E050000 */ lw $a1, ($s0) -/* 9C5EC0 80240AE0 0C0B1EAF */ jal get_variable -/* 9C5EC4 80240AE4 0040882D */ daddu $s1, $v0, $zero -/* 9C5EC8 80240AE8 0000202D */ daddu $a0, $zero, $zero -/* 9C5ECC 80240AEC 0080282D */ daddu $a1, $a0, $zero -/* 9C5ED0 80240AF0 0040802D */ daddu $s0, $v0, $zero -/* 9C5ED4 80240AF4 240600BE */ addiu $a2, $zero, 0xbe -/* 9C5ED8 80240AF8 0C04DF93 */ jal func_80137E4C -/* 9C5EDC 80240AFC 24070091 */ addiu $a3, $zero, 0x91 -/* 9C5EE0 80240B00 44900000 */ mtc1 $s0, $f0 -/* 9C5EE4 80240B04 00000000 */ nop -/* 9C5EE8 80240B08 46800020 */ cvt.s.w $f0, $f0 -/* 9C5EEC 80240B0C 44050000 */ mfc1 $a1, $f0 -/* 9C5EF0 80240B10 0C04DF62 */ jal func_80137D88 -/* 9C5EF4 80240B14 322400FF */ andi $a0, $s1, 0xff -/* 9C5EF8 80240B18 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C5EFC 80240B1C 8FB10014 */ lw $s1, 0x14($sp) -/* 9C5F00 80240B20 8FB00010 */ lw $s0, 0x10($sp) -/* 9C5F04 80240B24 24020002 */ addiu $v0, $zero, 2 -/* 9C5F08 80240B28 03E00008 */ jr $ra -/* 9C5F0C 80240B2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s new file mode 100644 index 0000000000..6eeab34db0 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240AB4_9C5E94.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AB4_9C5E94 +/* 9C5E94 80240AB4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9C5E98 80240AB8 AFB10014 */ sw $s1, 0x14($sp) +/* 9C5E9C 80240ABC 0080882D */ daddu $s1, $a0, $zero +/* 9C5EA0 80240AC0 AFBF0018 */ sw $ra, 0x18($sp) +/* 9C5EA4 80240AC4 AFB00010 */ sw $s0, 0x10($sp) +/* 9C5EA8 80240AC8 8E30000C */ lw $s0, 0xc($s1) +/* 9C5EAC 80240ACC 8E050000 */ lw $a1, ($s0) +/* 9C5EB0 80240AD0 0C0B1EAF */ jal get_variable +/* 9C5EB4 80240AD4 26100004 */ addiu $s0, $s0, 4 +/* 9C5EB8 80240AD8 0220202D */ daddu $a0, $s1, $zero +/* 9C5EBC 80240ADC 8E050000 */ lw $a1, ($s0) +/* 9C5EC0 80240AE0 0C0B1EAF */ jal get_variable +/* 9C5EC4 80240AE4 0040882D */ daddu $s1, $v0, $zero +/* 9C5EC8 80240AE8 0000202D */ daddu $a0, $zero, $zero +/* 9C5ECC 80240AEC 0080282D */ daddu $a1, $a0, $zero +/* 9C5ED0 80240AF0 0040802D */ daddu $s0, $v0, $zero +/* 9C5ED4 80240AF4 240600BE */ addiu $a2, $zero, 0xbe +/* 9C5ED8 80240AF8 0C04DF93 */ jal func_80137E4C +/* 9C5EDC 80240AFC 24070091 */ addiu $a3, $zero, 0x91 +/* 9C5EE0 80240B00 44900000 */ mtc1 $s0, $f0 +/* 9C5EE4 80240B04 00000000 */ nop +/* 9C5EE8 80240B08 46800020 */ cvt.s.w $f0, $f0 +/* 9C5EEC 80240B0C 44050000 */ mfc1 $a1, $f0 +/* 9C5EF0 80240B10 0C04DF62 */ jal func_80137D88 +/* 9C5EF4 80240B14 322400FF */ andi $a0, $s1, 0xff +/* 9C5EF8 80240B18 8FBF0018 */ lw $ra, 0x18($sp) +/* 9C5EFC 80240B1C 8FB10014 */ lw $s1, 0x14($sp) +/* 9C5F00 80240B20 8FB00010 */ lw $s0, 0x10($sp) +/* 9C5F04 80240B24 24020002 */ addiu $v0, $zero, 2 +/* 9C5F08 80240B28 03E00008 */ jr $ra +/* 9C5F0C 80240B2C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30.s deleted file mode 100644 index 867d12c71e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B30 -/* 9C5F10 80240B30 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C5F14 80240B34 AFB10014 */ sw $s1, 0x14($sp) -/* 9C5F18 80240B38 0080882D */ daddu $s1, $a0, $zero -/* 9C5F1C 80240B3C AFBF0018 */ sw $ra, 0x18($sp) -/* 9C5F20 80240B40 AFB00010 */ sw $s0, 0x10($sp) -/* 9C5F24 80240B44 8E30000C */ lw $s0, 0xc($s1) -/* 9C5F28 80240B48 8E050000 */ lw $a1, ($s0) -/* 9C5F2C 80240B4C 0C0B1EAF */ jal get_variable -/* 9C5F30 80240B50 26100004 */ addiu $s0, $s0, 4 -/* 9C5F34 80240B54 0220202D */ daddu $a0, $s1, $zero -/* 9C5F38 80240B58 8E050000 */ lw $a1, ($s0) -/* 9C5F3C 80240B5C 0C0B1EAF */ jal get_variable -/* 9C5F40 80240B60 0040802D */ daddu $s0, $v0, $zero -/* 9C5F44 80240B64 44820000 */ mtc1 $v0, $f0 -/* 9C5F48 80240B68 00000000 */ nop -/* 9C5F4C 80240B6C 46800020 */ cvt.s.w $f0, $f0 -/* 9C5F50 80240B70 24020002 */ addiu $v0, $zero, 2 -/* 9C5F54 80240B74 00501804 */ sllv $v1, $s0, $v0 -/* 9C5F58 80240B78 00701821 */ addu $v1, $v1, $s0 -/* 9C5F5C 80240B7C 00431804 */ sllv $v1, $v1, $v0 -/* 9C5F60 80240B80 00701823 */ subu $v1, $v1, $s0 -/* 9C5F64 80240B84 000320C0 */ sll $a0, $v1, 3 -/* 9C5F68 80240B88 00641821 */ addu $v1, $v1, $a0 -/* 9C5F6C 80240B8C 000318C0 */ sll $v1, $v1, 3 -/* 9C5F70 80240B90 3C01800B */ lui $at, 0x800b -/* 9C5F74 80240B94 00230821 */ addu $at, $at, $v1 -/* 9C5F78 80240B98 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 9C5F7C 80240B9C 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C5F80 80240BA0 8FB10014 */ lw $s1, 0x14($sp) -/* 9C5F84 80240BA4 8FB00010 */ lw $s0, 0x10($sp) -/* 9C5F88 80240BA8 03E00008 */ jr $ra -/* 9C5F8C 80240BAC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s new file mode 100644 index 0000000000..a203cf7371 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240B30_9C5F10.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B30_9C5F10 +/* 9C5F10 80240B30 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9C5F14 80240B34 AFB10014 */ sw $s1, 0x14($sp) +/* 9C5F18 80240B38 0080882D */ daddu $s1, $a0, $zero +/* 9C5F1C 80240B3C AFBF0018 */ sw $ra, 0x18($sp) +/* 9C5F20 80240B40 AFB00010 */ sw $s0, 0x10($sp) +/* 9C5F24 80240B44 8E30000C */ lw $s0, 0xc($s1) +/* 9C5F28 80240B48 8E050000 */ lw $a1, ($s0) +/* 9C5F2C 80240B4C 0C0B1EAF */ jal get_variable +/* 9C5F30 80240B50 26100004 */ addiu $s0, $s0, 4 +/* 9C5F34 80240B54 0220202D */ daddu $a0, $s1, $zero +/* 9C5F38 80240B58 8E050000 */ lw $a1, ($s0) +/* 9C5F3C 80240B5C 0C0B1EAF */ jal get_variable +/* 9C5F40 80240B60 0040802D */ daddu $s0, $v0, $zero +/* 9C5F44 80240B64 44820000 */ mtc1 $v0, $f0 +/* 9C5F48 80240B68 00000000 */ nop +/* 9C5F4C 80240B6C 46800020 */ cvt.s.w $f0, $f0 +/* 9C5F50 80240B70 24020002 */ addiu $v0, $zero, 2 +/* 9C5F54 80240B74 00501804 */ sllv $v1, $s0, $v0 +/* 9C5F58 80240B78 00701821 */ addu $v1, $v1, $s0 +/* 9C5F5C 80240B7C 00431804 */ sllv $v1, $v1, $v0 +/* 9C5F60 80240B80 00701823 */ subu $v1, $v1, $s0 +/* 9C5F64 80240B84 000320C0 */ sll $a0, $v1, 3 +/* 9C5F68 80240B88 00641821 */ addu $v1, $v1, $a0 +/* 9C5F6C 80240B8C 000318C0 */ sll $v1, $v1, 3 +/* 9C5F70 80240B90 3C01800B */ lui $at, 0x800b +/* 9C5F74 80240B94 00230821 */ addu $at, $at, $v1 +/* 9C5F78 80240B98 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 9C5F7C 80240B9C 8FBF0018 */ lw $ra, 0x18($sp) +/* 9C5F80 80240BA0 8FB10014 */ lw $s1, 0x14($sp) +/* 9C5F84 80240BA4 8FB00010 */ lw $s0, 0x10($sp) +/* 9C5F88 80240BA8 03E00008 */ jr $ra +/* 9C5F8C 80240BAC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0.s deleted file mode 100644 index 51eb6f7410..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB0 -/* 9C5F90 80240BB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5F94 80240BB4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5F98 80240BB8 8C82000C */ lw $v0, 0xc($a0) -/* 9C5F9C 80240BBC 0C0B1EAF */ jal get_variable -/* 9C5FA0 80240BC0 8C450000 */ lw $a1, ($v0) -/* 9C5FA4 80240BC4 0C0B1059 */ jal does_script_exist -/* 9C5FA8 80240BC8 0040202D */ daddu $a0, $v0, $zero -/* 9C5FAC 80240BCC 2C420001 */ sltiu $v0, $v0, 1 -/* 9C5FB0 80240BD0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C5FB4 80240BD4 00021040 */ sll $v0, $v0, 1 -/* 9C5FB8 80240BD8 03E00008 */ jr $ra -/* 9C5FBC 80240BDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s new file mode 100644 index 0000000000..6350b38660 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BB0_9C5F90 +/* 9C5F90 80240BB0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C5F94 80240BB4 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C5F98 80240BB8 8C82000C */ lw $v0, 0xc($a0) +/* 9C5F9C 80240BBC 0C0B1EAF */ jal get_variable +/* 9C5FA0 80240BC0 8C450000 */ lw $a1, ($v0) +/* 9C5FA4 80240BC4 0C0B1059 */ jal does_script_exist +/* 9C5FA8 80240BC8 0040202D */ daddu $a0, $v0, $zero +/* 9C5FAC 80240BCC 2C420001 */ sltiu $v0, $v0, 1 +/* 9C5FB0 80240BD0 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C5FB4 80240BD4 00021040 */ sll $v0, $v0, 1 +/* 9C5FB8 80240BD8 03E00008 */ jr $ra +/* 9C5FBC 80240BDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C.s deleted file mode 100644 index 916aa68a69..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C0C -/* 9C5FEC 80240C0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5FF0 80240C10 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5FF4 80240C14 0C03AE18 */ jal partner_resume_ability_script -/* 9C5FF8 80240C18 00000000 */ nop -/* 9C5FFC 80240C1C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6000 80240C20 24020002 */ addiu $v0, $zero, 2 -/* 9C6004 80240C24 03E00008 */ jr $ra -/* 9C6008 80240C28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s new file mode 100644 index 0000000000..40d7fa4df1 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C0C_9C5FEC +/* 9C5FEC 80240C0C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C5FF0 80240C10 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C5FF4 80240C14 0C03AE18 */ jal partner_resume_ability_script +/* 9C5FF8 80240C18 00000000 */ nop +/* 9C5FFC 80240C1C 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C6000 80240C20 24020002 */ addiu $v0, $zero, 2 +/* 9C6004 80240C24 03E00008 */ jr $ra +/* 9C6008 80240C28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C.s deleted file mode 100644 index 4227be774a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C2C -/* 9C600C 80240C2C 3C058011 */ lui $a1, %hi(gPlayerData) -/* 9C6010 80240C30 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* 9C6014 80240C34 AC800088 */ sw $zero, 0x88($a0) -/* 9C6018 80240C38 80A30003 */ lb $v1, 3($a1) -/* 9C601C 80240C3C 80A20002 */ lb $v0, 2($a1) -/* 9C6020 80240C40 1462000B */ bne $v1, $v0, .L80240C70 -/* 9C6024 80240C44 00A0302D */ daddu $a2, $a1, $zero -/* 9C6028 80240C48 80A30006 */ lb $v1, 6($a1) -/* 9C602C 80240C4C 80A20005 */ lb $v0, 5($a1) -/* 9C6030 80240C50 14620007 */ bne $v1, $v0, .L80240C70 -/* 9C6034 80240C54 00000000 */ nop -/* 9C6038 80240C58 80C2028E */ lb $v0, 0x28e($a2) -/* 9C603C 80240C5C 84C30290 */ lh $v1, 0x290($a2) -/* 9C6040 80240C60 00021200 */ sll $v0, $v0, 8 -/* 9C6044 80240C64 14620004 */ bne $v1, $v0, .L80240C78 -/* 9C6048 80240C68 24020001 */ addiu $v0, $zero, 1 -/* 9C604C 80240C6C AC820088 */ sw $v0, 0x88($a0) -.L80240C70: -/* 9C6050 80240C70 03E00008 */ jr $ra -/* 9C6054 80240C74 24020002 */ addiu $v0, $zero, 2 -.L80240C78: -/* 9C6058 80240C78 03E00008 */ jr $ra -/* 9C605C 80240C7C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s new file mode 100644 index 0000000000..fb42181779 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C2C_9C600C.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C2C_9C600C +/* 9C600C 80240C2C 3C058011 */ lui $a1, %hi(gPlayerData) +/* 9C6010 80240C30 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* 9C6014 80240C34 AC800088 */ sw $zero, 0x88($a0) +/* 9C6018 80240C38 80A30003 */ lb $v1, 3($a1) +/* 9C601C 80240C3C 80A20002 */ lb $v0, 2($a1) +/* 9C6020 80240C40 1462000B */ bne $v1, $v0, .L80240C70 +/* 9C6024 80240C44 00A0302D */ daddu $a2, $a1, $zero +/* 9C6028 80240C48 80A30006 */ lb $v1, 6($a1) +/* 9C602C 80240C4C 80A20005 */ lb $v0, 5($a1) +/* 9C6030 80240C50 14620007 */ bne $v1, $v0, .L80240C70 +/* 9C6034 80240C54 00000000 */ nop +/* 9C6038 80240C58 80C2028E */ lb $v0, 0x28e($a2) +/* 9C603C 80240C5C 84C30290 */ lh $v1, 0x290($a2) +/* 9C6040 80240C60 00021200 */ sll $v0, $v0, 8 +/* 9C6044 80240C64 14620004 */ bne $v1, $v0, .L80240C78 +/* 9C6048 80240C68 24020001 */ addiu $v0, $zero, 1 +/* 9C604C 80240C6C AC820088 */ sw $v0, 0x88($a0) +.L80240C70: +/* 9C6050 80240C70 03E00008 */ jr $ra +/* 9C6054 80240C74 24020002 */ addiu $v0, $zero, 2 +.L80240C78: +/* 9C6058 80240C78 03E00008 */ jr $ra +/* 9C605C 80240C7C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC.s deleted file mode 100644 index a04134d132..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CFC -/* 9C60DC 80240CFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C60E0 80240D00 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C60E4 80240D04 8C82000C */ lw $v0, 0xc($a0) -/* 9C60E8 80240D08 3C068011 */ lui $a2, 0x8011 -/* 9C60EC 80240D0C 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 9C60F0 80240D10 0C0B2026 */ jal set_variable -/* 9C60F4 80240D14 8C450000 */ lw $a1, ($v0) -/* 9C60F8 80240D18 0C03AC5A */ jal func_800EB168 -/* 9C60FC 80240D1C 0000202D */ daddu $a0, $zero, $zero -/* 9C6100 80240D20 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6104 80240D24 24020002 */ addiu $v0, $zero, 2 -/* 9C6108 80240D28 03E00008 */ jr $ra -/* 9C610C 80240D2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s new file mode 100644 index 0000000000..fff7263a9d --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CFC_9C60DC +/* 9C60DC 80240CFC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C60E0 80240D00 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C60E4 80240D04 8C82000C */ lw $v0, 0xc($a0) +/* 9C60E8 80240D08 3C068011 */ lui $a2, 0x8011 +/* 9C60EC 80240D0C 80C6F2A2 */ lb $a2, -0xd5e($a2) +/* 9C60F0 80240D10 0C0B2026 */ jal set_variable +/* 9C60F4 80240D14 8C450000 */ lw $a1, ($v0) +/* 9C60F8 80240D18 0C03AC5A */ jal func_800EB168 +/* 9C60FC 80240D1C 0000202D */ daddu $a0, $zero, $zero +/* 9C6100 80240D20 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C6104 80240D24 24020002 */ addiu $v0, $zero, 2 +/* 9C6108 80240D28 03E00008 */ jr $ra +/* 9C610C 80240D2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D60.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D60.s deleted file mode 100644 index aa913f1929..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D60.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D60 -/* 9C6140 80240D60 03E00008 */ jr $ra -/* 9C6144 80240D64 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D60_9C6140.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D60_9C6140.s new file mode 100644 index 0000000000..08b5f3f65a --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D60_9C6140.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D60_9C6140 +/* 9C6140 80240D60 03E00008 */ jr $ra +/* 9C6144 80240D64 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94.s deleted file mode 100644 index 7af0860e91..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E94 -/* 9C6274 80240E94 3C018015 */ lui $at, %hi(D_80151310) -/* 9C6278 80240E98 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 9C627C 80240E9C 03E00008 */ jr $ra -/* 9C6280 80240EA0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s new file mode 100644 index 0000000000..1c38b3a255 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E94_9C6274 +/* 9C6274 80240E94 3C018015 */ lui $at, %hi(D_80151310) +/* 9C6278 80240E98 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* 9C627C 80240E9C 03E00008 */ jr $ra +/* 9C6280 80240EA0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4.s deleted file mode 100644 index 597d084153..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EA4 -/* 9C6284 80240EA4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C6288 80240EA8 AFB10024 */ sw $s1, 0x24($sp) -/* 9C628C 80240EAC 0080882D */ daddu $s1, $a0, $zero -/* 9C6290 80240EB0 3C05F840 */ lui $a1, 0xf840 -/* 9C6294 80240EB4 AFBF0044 */ sw $ra, 0x44($sp) -/* 9C6298 80240EB8 AFBE0040 */ sw $fp, 0x40($sp) -/* 9C629C 80240EBC AFB7003C */ sw $s7, 0x3c($sp) -/* 9C62A0 80240EC0 AFB60038 */ sw $s6, 0x38($sp) -/* 9C62A4 80240EC4 AFB50034 */ sw $s5, 0x34($sp) -/* 9C62A8 80240EC8 AFB40030 */ sw $s4, 0x30($sp) -/* 9C62AC 80240ECC AFB3002C */ sw $s3, 0x2c($sp) -/* 9C62B0 80240ED0 AFB20028 */ sw $s2, 0x28($sp) -/* 9C62B4 80240ED4 AFB00020 */ sw $s0, 0x20($sp) -/* 9C62B8 80240ED8 8E3E0148 */ lw $fp, 0x148($s1) -/* 9C62BC 80240EDC 0C0B1EAF */ jal get_variable -/* 9C62C0 80240EE0 34A56268 */ ori $a1, $a1, 0x6268 -/* 9C62C4 80240EE4 0040802D */ daddu $s0, $v0, $zero -/* 9C62C8 80240EE8 0220202D */ daddu $a0, $s1, $zero -/* 9C62CC 80240EEC 3C05F840 */ lui $a1, 0xf840 -/* 9C62D0 80240EF0 0C0B1EAF */ jal get_variable -/* 9C62D4 80240EF4 34A56269 */ ori $a1, $a1, 0x6269 -/* 9C62D8 80240EF8 0040B82D */ daddu $s7, $v0, $zero -/* 9C62DC 80240EFC 0220202D */ daddu $a0, $s1, $zero -/* 9C62E0 80240F00 3C05F5DE */ lui $a1, 0xf5de -/* 9C62E4 80240F04 0C0B1EAF */ jal get_variable -/* 9C62E8 80240F08 34A502DE */ ori $a1, $a1, 0x2de -/* 9C62EC 80240F0C 0040B02D */ daddu $s6, $v0, $zero -/* 9C62F0 80240F10 0220202D */ daddu $a0, $s1, $zero -/* 9C62F4 80240F14 3C05F5DE */ lui $a1, 0xf5de -/* 9C62F8 80240F18 0C0B1EAF */ jal get_variable -/* 9C62FC 80240F1C 34A502DF */ ori $a1, $a1, 0x2df -/* 9C6300 80240F20 0040A82D */ daddu $s5, $v0, $zero -/* 9C6304 80240F24 93D3006D */ lbu $s3, 0x6d($fp) -/* 9C6308 80240F28 32C2FFFF */ andi $v0, $s6, 0xffff -/* 9C630C 80240F2C A7B30010 */ sh $s3, 0x10($sp) -/* 9C6310 80240F30 93D2006E */ lbu $s2, 0x6e($fp) -/* 9C6314 80240F34 93C7006F */ lbu $a3, 0x6f($fp) -/* 9C6318 80240F38 3274FFFF */ andi $s4, $s3, 0xffff -/* 9C631C 80240F3C 12820003 */ beq $s4, $v0, .L80240F4C -/* 9C6320 80240F40 A7A7001E */ sh $a3, 0x1e($sp) -/* 9C6324 80240F44 0000B82D */ daddu $s7, $zero, $zero -/* 9C6328 80240F48 02E0802D */ daddu $s0, $s7, $zero -.L80240F4C: -/* 9C632C 80240F4C 3202FFFF */ andi $v0, $s0, 0xffff -/* 9C6330 80240F50 14400016 */ bnez $v0, .L80240FAC -/* 9C6334 80240F54 0220202D */ daddu $a0, $s1, $zero -/* 9C6338 80240F58 0C00A67F */ jal rand_int -/* 9C633C 80240F5C 24040064 */ addiu $a0, $zero, 0x64 -/* 9C6340 80240F60 2842001E */ slti $v0, $v0, 0x1e -/* 9C6344 80240F64 10400011 */ beqz $v0, .L80240FAC -/* 9C6348 80240F68 0220202D */ daddu $a0, $s1, $zero -/* 9C634C 80240F6C 0C00A67F */ jal rand_int -/* 9C6350 80240F70 2644FFFF */ addiu $a0, $s2, -1 -/* 9C6354 80240F74 0040A82D */ daddu $s5, $v0, $zero -/* 9C6358 80240F78 0260B02D */ daddu $s6, $s3, $zero -/* 9C635C 80240F7C 0220202D */ daddu $a0, $s1, $zero -/* 9C6360 80240F80 3C05F5DE */ lui $a1, 0xf5de -/* 9C6364 80240F84 34A502DE */ ori $a1, $a1, 0x2de -/* 9C6368 80240F88 0C0B2026 */ jal set_variable -/* 9C636C 80240F8C 0280302D */ daddu $a2, $s4, $zero -/* 9C6370 80240F90 0220202D */ daddu $a0, $s1, $zero -/* 9C6374 80240F94 3C05F5DE */ lui $a1, 0xf5de -/* 9C6378 80240F98 34A502DF */ ori $a1, $a1, 0x2df -/* 9C637C 80240F9C 0C0B2026 */ jal set_variable -/* 9C6380 80240FA0 32A6FFFF */ andi $a2, $s5, 0xffff -/* 9C6384 80240FA4 24100001 */ addiu $s0, $zero, 1 -/* 9C6388 80240FA8 0220202D */ daddu $a0, $s1, $zero -.L80240FAC: -/* 9C638C 80240FAC 3C05F840 */ lui $a1, 0xf840 -/* 9C6390 80240FB0 34A56268 */ ori $a1, $a1, 0x6268 -/* 9C6394 80240FB4 0C0B2026 */ jal set_variable -/* 9C6398 80240FB8 3206FFFF */ andi $a2, $s0, 0xffff -/* 9C639C 80240FBC 0220202D */ daddu $a0, $s1, $zero -/* 9C63A0 80240FC0 3C05F840 */ lui $a1, 0xf840 -/* 9C63A4 80240FC4 34A56269 */ ori $a1, $a1, 0x6269 -/* 9C63A8 80240FC8 0C0B2026 */ jal set_variable -/* 9C63AC 80240FCC 32E6FFFF */ andi $a2, $s7, 0xffff -/* 9C63B0 80240FD0 0000202D */ daddu $a0, $zero, $zero -/* 9C63B4 80240FD4 3C05F5DE */ lui $a1, 0xf5de -/* 9C63B8 80240FD8 0C0B1EAF */ jal get_variable -/* 9C63BC 80240FDC 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 9C63C0 80240FE0 0000202D */ daddu $a0, $zero, $zero -/* 9C63C4 80240FE4 3C05F5DE */ lui $a1, 0xf5de -/* 9C63C8 80240FE8 34A50180 */ ori $a1, $a1, 0x180 -/* 9C63CC 80240FEC 0C0B1EAF */ jal get_variable -/* 9C63D0 80240FF0 0040802D */ daddu $s0, $v0, $zero -/* 9C63D4 80240FF4 0040282D */ daddu $a1, $v0, $zero -/* 9C63D8 80240FF8 0000182D */ daddu $v1, $zero, $zero -/* 9C63DC 80240FFC 3C068024 */ lui $a2, 0x8024 -/* 9C63E0 80241000 24C65FE8 */ addiu $a2, $a2, 0x5fe8 -/* 9C63E4 80241004 00C0202D */ daddu $a0, $a2, $zero -.L80241008: -/* 9C63E8 80241008 8C820000 */ lw $v0, ($a0) -/* 9C63EC 8024100C 00A2102A */ slt $v0, $a1, $v0 -/* 9C63F0 80241010 14400006 */ bnez $v0, .L8024102C -/* 9C63F4 80241014 000310C0 */ sll $v0, $v1, 3 -/* 9C63F8 80241018 24630001 */ addiu $v1, $v1, 1 -/* 9C63FC 8024101C 28620008 */ slti $v0, $v1, 8 -/* 9C6400 80241020 1440FFF9 */ bnez $v0, .L80241008 -/* 9C6404 80241024 24840008 */ addiu $a0, $a0, 8 -/* 9C6408 80241028 000310C0 */ sll $v0, $v1, 3 -.L8024102C: -/* 9C640C 8024102C 00461021 */ addu $v0, $v0, $a2 -/* 9C6410 80241030 8C420004 */ lw $v0, 4($v0) -/* 9C6414 80241034 97A30010 */ lhu $v1, 0x10($sp) -/* 9C6418 80241038 0202202A */ slt $a0, $s0, $v0 -/* 9C641C 8024103C 32C2FFFF */ andi $v0, $s6, 0xffff -/* 9C6420 80241040 14620008 */ bne $v1, $v0, .L80241064 -/* 9C6424 80241044 32A2FFFF */ andi $v0, $s5, 0xffff -/* 9C6428 80241048 97A7001E */ lhu $a3, 0x1e($sp) -/* 9C642C 8024104C 14E20005 */ bne $a3, $v0, .L80241064 -/* 9C6430 80241050 32E2FFFF */ andi $v0, $s7, 0xffff -/* 9C6434 80241054 14400003 */ bnez $v0, .L80241064 -/* 9C6438 80241058 00000000 */ nop -/* 9C643C 8024105C 14800008 */ bnez $a0, .L80241080 -/* 9C6440 80241060 24020001 */ addiu $v0, $zero, 1 -.L80241064: -/* 9C6444 80241064 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9C6448 80241068 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9C644C 8024106C 80420075 */ lb $v0, 0x75($v0) -/* 9C6450 80241070 10400005 */ beqz $v0, .L80241088 -/* 9C6454 80241074 00000000 */ nop -/* 9C6458 80241078 10800003 */ beqz $a0, .L80241088 -/* 9C645C 8024107C 24020001 */ addiu $v0, $zero, 1 -.L80241080: -/* 9C6460 80241080 08090425 */ j .L80241094 -/* 9C6464 80241084 AE220084 */ sw $v0, 0x84($s1) -.L80241088: -/* 9C6468 80241088 0C00F9EB */ jal kill_enemy -/* 9C646C 8024108C 03C0202D */ daddu $a0, $fp, $zero -/* 9C6470 80241090 AE200084 */ sw $zero, 0x84($s1) -.L80241094: -/* 9C6474 80241094 8FBF0044 */ lw $ra, 0x44($sp) -/* 9C6478 80241098 8FBE0040 */ lw $fp, 0x40($sp) -/* 9C647C 8024109C 8FB7003C */ lw $s7, 0x3c($sp) -/* 9C6480 802410A0 8FB60038 */ lw $s6, 0x38($sp) -/* 9C6484 802410A4 8FB50034 */ lw $s5, 0x34($sp) -/* 9C6488 802410A8 8FB40030 */ lw $s4, 0x30($sp) -/* 9C648C 802410AC 8FB3002C */ lw $s3, 0x2c($sp) -/* 9C6490 802410B0 8FB20028 */ lw $s2, 0x28($sp) -/* 9C6494 802410B4 8FB10024 */ lw $s1, 0x24($sp) -/* 9C6498 802410B8 8FB00020 */ lw $s0, 0x20($sp) -/* 9C649C 802410BC 24020002 */ addiu $v0, $zero, 2 -/* 9C64A0 802410C0 03E00008 */ jr $ra -/* 9C64A4 802410C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s new file mode 100644 index 0000000000..6d79d7d1d1 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240EA4_9C6284.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EA4_9C6284 +/* 9C6284 80240EA4 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9C6288 80240EA8 AFB10024 */ sw $s1, 0x24($sp) +/* 9C628C 80240EAC 0080882D */ daddu $s1, $a0, $zero +/* 9C6290 80240EB0 3C05F840 */ lui $a1, 0xf840 +/* 9C6294 80240EB4 AFBF0044 */ sw $ra, 0x44($sp) +/* 9C6298 80240EB8 AFBE0040 */ sw $fp, 0x40($sp) +/* 9C629C 80240EBC AFB7003C */ sw $s7, 0x3c($sp) +/* 9C62A0 80240EC0 AFB60038 */ sw $s6, 0x38($sp) +/* 9C62A4 80240EC4 AFB50034 */ sw $s5, 0x34($sp) +/* 9C62A8 80240EC8 AFB40030 */ sw $s4, 0x30($sp) +/* 9C62AC 80240ECC AFB3002C */ sw $s3, 0x2c($sp) +/* 9C62B0 80240ED0 AFB20028 */ sw $s2, 0x28($sp) +/* 9C62B4 80240ED4 AFB00020 */ sw $s0, 0x20($sp) +/* 9C62B8 80240ED8 8E3E0148 */ lw $fp, 0x148($s1) +/* 9C62BC 80240EDC 0C0B1EAF */ jal get_variable +/* 9C62C0 80240EE0 34A56268 */ ori $a1, $a1, 0x6268 +/* 9C62C4 80240EE4 0040802D */ daddu $s0, $v0, $zero +/* 9C62C8 80240EE8 0220202D */ daddu $a0, $s1, $zero +/* 9C62CC 80240EEC 3C05F840 */ lui $a1, 0xf840 +/* 9C62D0 80240EF0 0C0B1EAF */ jal get_variable +/* 9C62D4 80240EF4 34A56269 */ ori $a1, $a1, 0x6269 +/* 9C62D8 80240EF8 0040B82D */ daddu $s7, $v0, $zero +/* 9C62DC 80240EFC 0220202D */ daddu $a0, $s1, $zero +/* 9C62E0 80240F00 3C05F5DE */ lui $a1, 0xf5de +/* 9C62E4 80240F04 0C0B1EAF */ jal get_variable +/* 9C62E8 80240F08 34A502DE */ ori $a1, $a1, 0x2de +/* 9C62EC 80240F0C 0040B02D */ daddu $s6, $v0, $zero +/* 9C62F0 80240F10 0220202D */ daddu $a0, $s1, $zero +/* 9C62F4 80240F14 3C05F5DE */ lui $a1, 0xf5de +/* 9C62F8 80240F18 0C0B1EAF */ jal get_variable +/* 9C62FC 80240F1C 34A502DF */ ori $a1, $a1, 0x2df +/* 9C6300 80240F20 0040A82D */ daddu $s5, $v0, $zero +/* 9C6304 80240F24 93D3006D */ lbu $s3, 0x6d($fp) +/* 9C6308 80240F28 32C2FFFF */ andi $v0, $s6, 0xffff +/* 9C630C 80240F2C A7B30010 */ sh $s3, 0x10($sp) +/* 9C6310 80240F30 93D2006E */ lbu $s2, 0x6e($fp) +/* 9C6314 80240F34 93C7006F */ lbu $a3, 0x6f($fp) +/* 9C6318 80240F38 3274FFFF */ andi $s4, $s3, 0xffff +/* 9C631C 80240F3C 12820003 */ beq $s4, $v0, .L80240F4C +/* 9C6320 80240F40 A7A7001E */ sh $a3, 0x1e($sp) +/* 9C6324 80240F44 0000B82D */ daddu $s7, $zero, $zero +/* 9C6328 80240F48 02E0802D */ daddu $s0, $s7, $zero +.L80240F4C: +/* 9C632C 80240F4C 3202FFFF */ andi $v0, $s0, 0xffff +/* 9C6330 80240F50 14400016 */ bnez $v0, .L80240FAC +/* 9C6334 80240F54 0220202D */ daddu $a0, $s1, $zero +/* 9C6338 80240F58 0C00A67F */ jal rand_int +/* 9C633C 80240F5C 24040064 */ addiu $a0, $zero, 0x64 +/* 9C6340 80240F60 2842001E */ slti $v0, $v0, 0x1e +/* 9C6344 80240F64 10400011 */ beqz $v0, .L80240FAC +/* 9C6348 80240F68 0220202D */ daddu $a0, $s1, $zero +/* 9C634C 80240F6C 0C00A67F */ jal rand_int +/* 9C6350 80240F70 2644FFFF */ addiu $a0, $s2, -1 +/* 9C6354 80240F74 0040A82D */ daddu $s5, $v0, $zero +/* 9C6358 80240F78 0260B02D */ daddu $s6, $s3, $zero +/* 9C635C 80240F7C 0220202D */ daddu $a0, $s1, $zero +/* 9C6360 80240F80 3C05F5DE */ lui $a1, 0xf5de +/* 9C6364 80240F84 34A502DE */ ori $a1, $a1, 0x2de +/* 9C6368 80240F88 0C0B2026 */ jal set_variable +/* 9C636C 80240F8C 0280302D */ daddu $a2, $s4, $zero +/* 9C6370 80240F90 0220202D */ daddu $a0, $s1, $zero +/* 9C6374 80240F94 3C05F5DE */ lui $a1, 0xf5de +/* 9C6378 80240F98 34A502DF */ ori $a1, $a1, 0x2df +/* 9C637C 80240F9C 0C0B2026 */ jal set_variable +/* 9C6380 80240FA0 32A6FFFF */ andi $a2, $s5, 0xffff +/* 9C6384 80240FA4 24100001 */ addiu $s0, $zero, 1 +/* 9C6388 80240FA8 0220202D */ daddu $a0, $s1, $zero +.L80240FAC: +/* 9C638C 80240FAC 3C05F840 */ lui $a1, 0xf840 +/* 9C6390 80240FB0 34A56268 */ ori $a1, $a1, 0x6268 +/* 9C6394 80240FB4 0C0B2026 */ jal set_variable +/* 9C6398 80240FB8 3206FFFF */ andi $a2, $s0, 0xffff +/* 9C639C 80240FBC 0220202D */ daddu $a0, $s1, $zero +/* 9C63A0 80240FC0 3C05F840 */ lui $a1, 0xf840 +/* 9C63A4 80240FC4 34A56269 */ ori $a1, $a1, 0x6269 +/* 9C63A8 80240FC8 0C0B2026 */ jal set_variable +/* 9C63AC 80240FCC 32E6FFFF */ andi $a2, $s7, 0xffff +/* 9C63B0 80240FD0 0000202D */ daddu $a0, $zero, $zero +/* 9C63B4 80240FD4 3C05F5DE */ lui $a1, 0xf5de +/* 9C63B8 80240FD8 0C0B1EAF */ jal get_variable +/* 9C63BC 80240FDC 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 9C63C0 80240FE0 0000202D */ daddu $a0, $zero, $zero +/* 9C63C4 80240FE4 3C05F5DE */ lui $a1, 0xf5de +/* 9C63C8 80240FE8 34A50180 */ ori $a1, $a1, 0x180 +/* 9C63CC 80240FEC 0C0B1EAF */ jal get_variable +/* 9C63D0 80240FF0 0040802D */ daddu $s0, $v0, $zero +/* 9C63D4 80240FF4 0040282D */ daddu $a1, $v0, $zero +/* 9C63D8 80240FF8 0000182D */ daddu $v1, $zero, $zero +/* 9C63DC 80240FFC 3C068024 */ lui $a2, 0x8024 +/* 9C63E0 80241000 24C65FE8 */ addiu $a2, $a2, 0x5fe8 +/* 9C63E4 80241004 00C0202D */ daddu $a0, $a2, $zero +.L80241008: +/* 9C63E8 80241008 8C820000 */ lw $v0, ($a0) +/* 9C63EC 8024100C 00A2102A */ slt $v0, $a1, $v0 +/* 9C63F0 80241010 14400006 */ bnez $v0, .L8024102C +/* 9C63F4 80241014 000310C0 */ sll $v0, $v1, 3 +/* 9C63F8 80241018 24630001 */ addiu $v1, $v1, 1 +/* 9C63FC 8024101C 28620008 */ slti $v0, $v1, 8 +/* 9C6400 80241020 1440FFF9 */ bnez $v0, .L80241008 +/* 9C6404 80241024 24840008 */ addiu $a0, $a0, 8 +/* 9C6408 80241028 000310C0 */ sll $v0, $v1, 3 +.L8024102C: +/* 9C640C 8024102C 00461021 */ addu $v0, $v0, $a2 +/* 9C6410 80241030 8C420004 */ lw $v0, 4($v0) +/* 9C6414 80241034 97A30010 */ lhu $v1, 0x10($sp) +/* 9C6418 80241038 0202202A */ slt $a0, $s0, $v0 +/* 9C641C 8024103C 32C2FFFF */ andi $v0, $s6, 0xffff +/* 9C6420 80241040 14620008 */ bne $v1, $v0, .L80241064 +/* 9C6424 80241044 32A2FFFF */ andi $v0, $s5, 0xffff +/* 9C6428 80241048 97A7001E */ lhu $a3, 0x1e($sp) +/* 9C642C 8024104C 14E20005 */ bne $a3, $v0, .L80241064 +/* 9C6430 80241050 32E2FFFF */ andi $v0, $s7, 0xffff +/* 9C6434 80241054 14400003 */ bnez $v0, .L80241064 +/* 9C6438 80241058 00000000 */ nop +/* 9C643C 8024105C 14800008 */ bnez $a0, .L80241080 +/* 9C6440 80241060 24020001 */ addiu $v0, $zero, 1 +.L80241064: +/* 9C6444 80241064 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 9C6448 80241068 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 9C644C 8024106C 80420075 */ lb $v0, 0x75($v0) +/* 9C6450 80241070 10400005 */ beqz $v0, .L80241088 +/* 9C6454 80241074 00000000 */ nop +/* 9C6458 80241078 10800003 */ beqz $a0, .L80241088 +/* 9C645C 8024107C 24020001 */ addiu $v0, $zero, 1 +.L80241080: +/* 9C6460 80241080 08090425 */ j .L80241094 +/* 9C6464 80241084 AE220084 */ sw $v0, 0x84($s1) +.L80241088: +/* 9C6468 80241088 0C00F9EB */ jal kill_enemy +/* 9C646C 8024108C 03C0202D */ daddu $a0, $fp, $zero +/* 9C6470 80241090 AE200084 */ sw $zero, 0x84($s1) +.L80241094: +/* 9C6474 80241094 8FBF0044 */ lw $ra, 0x44($sp) +/* 9C6478 80241098 8FBE0040 */ lw $fp, 0x40($sp) +/* 9C647C 8024109C 8FB7003C */ lw $s7, 0x3c($sp) +/* 9C6480 802410A0 8FB60038 */ lw $s6, 0x38($sp) +/* 9C6484 802410A4 8FB50034 */ lw $s5, 0x34($sp) +/* 9C6488 802410A8 8FB40030 */ lw $s4, 0x30($sp) +/* 9C648C 802410AC 8FB3002C */ lw $s3, 0x2c($sp) +/* 9C6490 802410B0 8FB20028 */ lw $s2, 0x28($sp) +/* 9C6494 802410B4 8FB10024 */ lw $s1, 0x24($sp) +/* 9C6498 802410B8 8FB00020 */ lw $s0, 0x20($sp) +/* 9C649C 802410BC 24020002 */ addiu $v0, $zero, 2 +/* 9C64A0 802410C0 03E00008 */ jr $ra +/* 9C64A4 802410C4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8.s deleted file mode 100644 index ceffac4227..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410C8 -/* 9C64A8 802410C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C64AC 802410CC AFBF0014 */ sw $ra, 0x14($sp) -/* 9C64B0 802410D0 AFB00010 */ sw $s0, 0x10($sp) -/* 9C64B4 802410D4 0C00EABB */ jal get_npc_unsafe -/* 9C64B8 802410D8 8C84014C */ lw $a0, 0x14c($a0) -/* 9C64BC 802410DC 24040008 */ addiu $a0, $zero, 8 -/* 9C64C0 802410E0 0040802D */ daddu $s0, $v0, $zero -/* 9C64C4 802410E4 3C028024 */ lui $v0, 0x8024 -/* 9C64C8 802410E8 24421134 */ addiu $v0, $v0, 0x1134 -/* 9C64CC 802410EC 0C00AB39 */ jal heap_malloc -/* 9C64D0 802410F0 AE020008 */ sw $v0, 8($s0) -/* 9C64D4 802410F4 0040182D */ daddu $v1, $v0, $zero -/* 9C64D8 802410F8 AE030020 */ sw $v1, 0x20($s0) -/* 9C64DC 802410FC AC600000 */ sw $zero, ($v1) -/* 9C64E0 80241100 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C64E4 80241104 8FB00010 */ lw $s0, 0x10($sp) -/* 9C64E8 80241108 24020001 */ addiu $v0, $zero, 1 -/* 9C64EC 8024110C 03E00008 */ jr $ra -/* 9C64F0 80241110 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s new file mode 100644 index 0000000000..c41c9b3552 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802410C8_9C64A8.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410C8_9C64A8 +/* 9C64A8 802410C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C64AC 802410CC AFBF0014 */ sw $ra, 0x14($sp) +/* 9C64B0 802410D0 AFB00010 */ sw $s0, 0x10($sp) +/* 9C64B4 802410D4 0C00EABB */ jal get_npc_unsafe +/* 9C64B8 802410D8 8C84014C */ lw $a0, 0x14c($a0) +/* 9C64BC 802410DC 24040008 */ addiu $a0, $zero, 8 +/* 9C64C0 802410E0 0040802D */ daddu $s0, $v0, $zero +/* 9C64C4 802410E4 3C028024 */ lui $v0, 0x8024 +/* 9C64C8 802410E8 24421134 */ addiu $v0, $v0, 0x1134 +/* 9C64CC 802410EC 0C00AB39 */ jal heap_malloc +/* 9C64D0 802410F0 AE020008 */ sw $v0, 8($s0) +/* 9C64D4 802410F4 0040182D */ daddu $v1, $v0, $zero +/* 9C64D8 802410F8 AE030020 */ sw $v1, 0x20($s0) +/* 9C64DC 802410FC AC600000 */ sw $zero, ($v1) +/* 9C64E0 80241100 8FBF0014 */ lw $ra, 0x14($sp) +/* 9C64E4 80241104 8FB00010 */ lw $s0, 0x10($sp) +/* 9C64E8 80241108 24020001 */ addiu $v0, $zero, 1 +/* 9C64EC 8024110C 03E00008 */ jr $ra +/* 9C64F0 80241110 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114.s deleted file mode 100644 index 885b91fd87..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241114 -/* 9C64F4 80241114 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C64F8 80241118 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C64FC 8024111C 0C00EABB */ jal get_npc_unsafe -/* 9C6500 80241120 8C84014C */ lw $a0, 0x14c($a0) -/* 9C6504 80241124 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6508 80241128 0000102D */ daddu $v0, $zero, $zero -/* 9C650C 8024112C 03E00008 */ jr $ra -/* 9C6510 80241130 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s new file mode 100644 index 0000000000..c442e04124 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241114_9C64F4 +/* 9C64F4 80241114 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C64F8 80241118 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C64FC 8024111C 0C00EABB */ jal get_npc_unsafe +/* 9C6500 80241120 8C84014C */ lw $a0, 0x14c($a0) +/* 9C6504 80241124 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C6508 80241128 0000102D */ daddu $v0, $zero, $zero +/* 9C650C 8024112C 03E00008 */ jr $ra +/* 9C6510 80241130 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134.s deleted file mode 100644 index ca217d6816..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241134 -/* 9C6514 80241134 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C6518 80241138 3C03800A */ lui $v1, 0x800a -/* 9C651C 8024113C 8463A634 */ lh $v1, -0x59cc($v1) -/* 9C6520 80241140 3C05800B */ lui $a1, %hi(gCameras) -/* 9C6524 80241144 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 9C6528 80241148 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C652C 8024114C 00031080 */ sll $v0, $v1, 2 -/* 9C6530 80241150 00431021 */ addu $v0, $v0, $v1 -/* 9C6534 80241154 00021080 */ sll $v0, $v0, 2 -/* 9C6538 80241158 00431023 */ subu $v0, $v0, $v1 -/* 9C653C 8024115C 000218C0 */ sll $v1, $v0, 3 -/* 9C6540 80241160 00431021 */ addu $v0, $v0, $v1 -/* 9C6544 80241164 8C830020 */ lw $v1, 0x20($a0) -/* 9C6548 80241168 000210C0 */ sll $v0, $v0, 3 -/* 9C654C 8024116C 8C630000 */ lw $v1, ($v1) -/* 9C6550 80241170 30630001 */ andi $v1, $v1, 1 -/* 9C6554 80241174 10600004 */ beqz $v1, .L80241188 -/* 9C6558 80241178 00451021 */ addu $v0, $v0, $a1 -/* 9C655C 8024117C C44C006C */ lwc1 $f12, 0x6c($v0) -/* 9C6560 80241180 0C00A6C9 */ jal clamp_angle -/* 9C6564 80241184 46006307 */ neg.s $f12, $f12 -.L80241188: -/* 9C6568 80241188 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C656C 8024118C 03E00008 */ jr $ra -/* 9C6570 80241190 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s new file mode 100644 index 0000000000..30cdf9c232 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241134_9C6514.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241134_9C6514 +/* 9C6514 80241134 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C6518 80241138 3C03800A */ lui $v1, 0x800a +/* 9C651C 8024113C 8463A634 */ lh $v1, -0x59cc($v1) +/* 9C6520 80241140 3C05800B */ lui $a1, %hi(gCameras) +/* 9C6524 80241144 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 9C6528 80241148 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C652C 8024114C 00031080 */ sll $v0, $v1, 2 +/* 9C6530 80241150 00431021 */ addu $v0, $v0, $v1 +/* 9C6534 80241154 00021080 */ sll $v0, $v0, 2 +/* 9C6538 80241158 00431023 */ subu $v0, $v0, $v1 +/* 9C653C 8024115C 000218C0 */ sll $v1, $v0, 3 +/* 9C6540 80241160 00431021 */ addu $v0, $v0, $v1 +/* 9C6544 80241164 8C830020 */ lw $v1, 0x20($a0) +/* 9C6548 80241168 000210C0 */ sll $v0, $v0, 3 +/* 9C654C 8024116C 8C630000 */ lw $v1, ($v1) +/* 9C6550 80241170 30630001 */ andi $v1, $v1, 1 +/* 9C6554 80241174 10600004 */ beqz $v1, .L80241188 +/* 9C6558 80241178 00451021 */ addu $v0, $v0, $a1 +/* 9C655C 8024117C C44C006C */ lwc1 $f12, 0x6c($v0) +/* 9C6560 80241180 0C00A6C9 */ jal clamp_angle +/* 9C6564 80241184 46006307 */ neg.s $f12, $f12 +.L80241188: +/* 9C6568 80241188 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C656C 8024118C 03E00008 */ jr $ra +/* 9C6570 80241190 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194.s deleted file mode 100644 index 8eb8e3dafc..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241194 -/* 9C6574 80241194 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C6578 80241198 AFB10014 */ sw $s1, 0x14($sp) -/* 9C657C 8024119C 0080882D */ daddu $s1, $a0, $zero -/* 9C6580 802411A0 AFBF0024 */ sw $ra, 0x24($sp) -/* 9C6584 802411A4 AFB40020 */ sw $s4, 0x20($sp) -/* 9C6588 802411A8 AFB3001C */ sw $s3, 0x1c($sp) -/* 9C658C 802411AC AFB20018 */ sw $s2, 0x18($sp) -/* 9C6590 802411B0 10A00033 */ beqz $a1, .L80241280 -/* 9C6594 802411B4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6598 802411B8 0C04760B */ jal func_8011D82C -/* 9C659C 802411BC 24040001 */ addiu $a0, $zero, 1 -/* 9C65A0 802411C0 0000202D */ daddu $a0, $zero, $zero -/* 9C65A4 802411C4 0080282D */ daddu $a1, $a0, $zero -/* 9C65A8 802411C8 0080302D */ daddu $a2, $a0, $zero -/* 9C65AC 802411CC 0080382D */ daddu $a3, $a0, $zero -/* 9C65B0 802411D0 0080802D */ daddu $s0, $a0, $zero -/* 9C65B4 802411D4 2414FFFC */ addiu $s4, $zero, -4 -/* 9C65B8 802411D8 2413000F */ addiu $s3, $zero, 0xf -/* 9C65BC 802411DC 3C120080 */ lui $s2, 0x80 -/* 9C65C0 802411E0 3C038015 */ lui $v1, 0x8015 -/* 9C65C4 802411E4 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 9C65C8 802411E8 24020001 */ addiu $v0, $zero, 1 -/* 9C65CC 802411EC 0C046F97 */ jal set_background_color_blend -/* 9C65D0 802411F0 A0620000 */ sb $v0, ($v1) -.L802411F4: -/* 9C65D4 802411F4 0C00E2B7 */ jal get_npc_by_index -/* 9C65D8 802411F8 0200202D */ daddu $a0, $s0, $zero -/* 9C65DC 802411FC 0040202D */ daddu $a0, $v0, $zero -/* 9C65E0 80241200 5080000B */ beql $a0, $zero, .L80241230 -/* 9C65E4 80241204 26100001 */ addiu $s0, $s0, 1 -/* 9C65E8 80241208 8C820000 */ lw $v0, ($a0) -/* 9C65EC 8024120C 50400008 */ beql $v0, $zero, .L80241230 -/* 9C65F0 80241210 26100001 */ addiu $s0, $s0, 1 -/* 9C65F4 80241214 808300A4 */ lb $v1, 0xa4($a0) -/* 9C65F8 80241218 10740005 */ beq $v1, $s4, .L80241230 -/* 9C65FC 8024121C 26100001 */ addiu $s0, $s0, 1 -/* 9C6600 80241220 10730003 */ beq $v1, $s3, .L80241230 -/* 9C6604 80241224 00000000 */ nop -/* 9C6608 80241228 00521025 */ or $v0, $v0, $s2 -/* 9C660C 8024122C AC820000 */ sw $v0, ($a0) -.L80241230: -/* 9C6610 80241230 2A020040 */ slti $v0, $s0, 0x40 -/* 9C6614 80241234 1440FFEF */ bnez $v0, .L802411F4 -/* 9C6618 80241238 00000000 */ nop -/* 9C661C 8024123C 0000802D */ daddu $s0, $zero, $zero -/* 9C6620 80241240 3C120800 */ lui $s2, 0x800 -.L80241244: -/* 9C6624 80241244 0C04C3D6 */ jal get_item_entity -/* 9C6628 80241248 0200202D */ daddu $a0, $s0, $zero -/* 9C662C 8024124C 0040182D */ daddu $v1, $v0, $zero -/* 9C6630 80241250 10600007 */ beqz $v1, .L80241270 -/* 9C6634 80241254 26100001 */ addiu $s0, $s0, 1 -/* 9C6638 80241258 8C640000 */ lw $a0, ($v1) -/* 9C663C 8024125C 30820010 */ andi $v0, $a0, 0x10 -/* 9C6640 80241260 10400003 */ beqz $v0, .L80241270 -/* 9C6644 80241264 00000000 */ nop -/* 9C6648 80241268 00921025 */ or $v0, $a0, $s2 -/* 9C664C 8024126C AC620000 */ sw $v0, ($v1) -.L80241270: -/* 9C6650 80241270 2A020100 */ slti $v0, $s0, 0x100 -/* 9C6654 80241274 1440FFF3 */ bnez $v0, .L80241244 -/* 9C6658 80241278 00000000 */ nop -/* 9C665C 8024127C AE200070 */ sw $zero, 0x70($s1) -.L80241280: -/* 9C6660 80241280 8E220070 */ lw $v0, 0x70($s1) -/* 9C6664 80241284 24420008 */ addiu $v0, $v0, 8 -/* 9C6668 80241288 AE220070 */ sw $v0, 0x70($s1) -/* 9C666C 8024128C 28420100 */ slti $v0, $v0, 0x100 -/* 9C6670 80241290 14400003 */ bnez $v0, .L802412A0 -/* 9C6674 80241294 0000202D */ daddu $a0, $zero, $zero -/* 9C6678 80241298 240200FF */ addiu $v0, $zero, 0xff -/* 9C667C 8024129C AE220070 */ sw $v0, 0x70($s1) -.L802412A0: -/* 9C6680 802412A0 0080282D */ daddu $a1, $a0, $zero -/* 9C6684 802412A4 92270073 */ lbu $a3, 0x73($s1) -/* 9C6688 802412A8 0C046F97 */ jal set_background_color_blend -/* 9C668C 802412AC 0080302D */ daddu $a2, $a0, $zero -/* 9C6690 802412B0 8E220070 */ lw $v0, 0x70($s1) -/* 9C6694 802412B4 8FBF0024 */ lw $ra, 0x24($sp) -/* 9C6698 802412B8 8FB40020 */ lw $s4, 0x20($sp) -/* 9C669C 802412BC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9C66A0 802412C0 8FB20018 */ lw $s2, 0x18($sp) -/* 9C66A4 802412C4 8FB10014 */ lw $s1, 0x14($sp) -/* 9C66A8 802412C8 8FB00010 */ lw $s0, 0x10($sp) -/* 9C66AC 802412CC 384200FF */ xori $v0, $v0, 0xff -/* 9C66B0 802412D0 2C420001 */ sltiu $v0, $v0, 1 -/* 9C66B4 802412D4 00021040 */ sll $v0, $v0, 1 -/* 9C66B8 802412D8 03E00008 */ jr $ra -/* 9C66BC 802412DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s new file mode 100644 index 0000000000..6d5b73bc67 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241194_9C6574.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241194_9C6574 +/* 9C6574 80241194 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9C6578 80241198 AFB10014 */ sw $s1, 0x14($sp) +/* 9C657C 8024119C 0080882D */ daddu $s1, $a0, $zero +/* 9C6580 802411A0 AFBF0024 */ sw $ra, 0x24($sp) +/* 9C6584 802411A4 AFB40020 */ sw $s4, 0x20($sp) +/* 9C6588 802411A8 AFB3001C */ sw $s3, 0x1c($sp) +/* 9C658C 802411AC AFB20018 */ sw $s2, 0x18($sp) +/* 9C6590 802411B0 10A00033 */ beqz $a1, .L80241280 +/* 9C6594 802411B4 AFB00010 */ sw $s0, 0x10($sp) +/* 9C6598 802411B8 0C04760B */ jal func_8011D82C +/* 9C659C 802411BC 24040001 */ addiu $a0, $zero, 1 +/* 9C65A0 802411C0 0000202D */ daddu $a0, $zero, $zero +/* 9C65A4 802411C4 0080282D */ daddu $a1, $a0, $zero +/* 9C65A8 802411C8 0080302D */ daddu $a2, $a0, $zero +/* 9C65AC 802411CC 0080382D */ daddu $a3, $a0, $zero +/* 9C65B0 802411D0 0080802D */ daddu $s0, $a0, $zero +/* 9C65B4 802411D4 2414FFFC */ addiu $s4, $zero, -4 +/* 9C65B8 802411D8 2413000F */ addiu $s3, $zero, 0xf +/* 9C65BC 802411DC 3C120080 */ lui $s2, 0x80 +/* 9C65C0 802411E0 3C038015 */ lui $v1, 0x8015 +/* 9C65C4 802411E4 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 9C65C8 802411E8 24020001 */ addiu $v0, $zero, 1 +/* 9C65CC 802411EC 0C046F97 */ jal set_background_color_blend +/* 9C65D0 802411F0 A0620000 */ sb $v0, ($v1) +.L802411F4: +/* 9C65D4 802411F4 0C00E2B7 */ jal get_npc_by_index +/* 9C65D8 802411F8 0200202D */ daddu $a0, $s0, $zero +/* 9C65DC 802411FC 0040202D */ daddu $a0, $v0, $zero +/* 9C65E0 80241200 5080000B */ beql $a0, $zero, .L80241230 +/* 9C65E4 80241204 26100001 */ addiu $s0, $s0, 1 +/* 9C65E8 80241208 8C820000 */ lw $v0, ($a0) +/* 9C65EC 8024120C 50400008 */ beql $v0, $zero, .L80241230 +/* 9C65F0 80241210 26100001 */ addiu $s0, $s0, 1 +/* 9C65F4 80241214 808300A4 */ lb $v1, 0xa4($a0) +/* 9C65F8 80241218 10740005 */ beq $v1, $s4, .L80241230 +/* 9C65FC 8024121C 26100001 */ addiu $s0, $s0, 1 +/* 9C6600 80241220 10730003 */ beq $v1, $s3, .L80241230 +/* 9C6604 80241224 00000000 */ nop +/* 9C6608 80241228 00521025 */ or $v0, $v0, $s2 +/* 9C660C 8024122C AC820000 */ sw $v0, ($a0) +.L80241230: +/* 9C6610 80241230 2A020040 */ slti $v0, $s0, 0x40 +/* 9C6614 80241234 1440FFEF */ bnez $v0, .L802411F4 +/* 9C6618 80241238 00000000 */ nop +/* 9C661C 8024123C 0000802D */ daddu $s0, $zero, $zero +/* 9C6620 80241240 3C120800 */ lui $s2, 0x800 +.L80241244: +/* 9C6624 80241244 0C04C3D6 */ jal get_item_entity +/* 9C6628 80241248 0200202D */ daddu $a0, $s0, $zero +/* 9C662C 8024124C 0040182D */ daddu $v1, $v0, $zero +/* 9C6630 80241250 10600007 */ beqz $v1, .L80241270 +/* 9C6634 80241254 26100001 */ addiu $s0, $s0, 1 +/* 9C6638 80241258 8C640000 */ lw $a0, ($v1) +/* 9C663C 8024125C 30820010 */ andi $v0, $a0, 0x10 +/* 9C6640 80241260 10400003 */ beqz $v0, .L80241270 +/* 9C6644 80241264 00000000 */ nop +/* 9C6648 80241268 00921025 */ or $v0, $a0, $s2 +/* 9C664C 8024126C AC620000 */ sw $v0, ($v1) +.L80241270: +/* 9C6650 80241270 2A020100 */ slti $v0, $s0, 0x100 +/* 9C6654 80241274 1440FFF3 */ bnez $v0, .L80241244 +/* 9C6658 80241278 00000000 */ nop +/* 9C665C 8024127C AE200070 */ sw $zero, 0x70($s1) +.L80241280: +/* 9C6660 80241280 8E220070 */ lw $v0, 0x70($s1) +/* 9C6664 80241284 24420008 */ addiu $v0, $v0, 8 +/* 9C6668 80241288 AE220070 */ sw $v0, 0x70($s1) +/* 9C666C 8024128C 28420100 */ slti $v0, $v0, 0x100 +/* 9C6670 80241290 14400003 */ bnez $v0, .L802412A0 +/* 9C6674 80241294 0000202D */ daddu $a0, $zero, $zero +/* 9C6678 80241298 240200FF */ addiu $v0, $zero, 0xff +/* 9C667C 8024129C AE220070 */ sw $v0, 0x70($s1) +.L802412A0: +/* 9C6680 802412A0 0080282D */ daddu $a1, $a0, $zero +/* 9C6684 802412A4 92270073 */ lbu $a3, 0x73($s1) +/* 9C6688 802412A8 0C046F97 */ jal set_background_color_blend +/* 9C668C 802412AC 0080302D */ daddu $a2, $a0, $zero +/* 9C6690 802412B0 8E220070 */ lw $v0, 0x70($s1) +/* 9C6694 802412B4 8FBF0024 */ lw $ra, 0x24($sp) +/* 9C6698 802412B8 8FB40020 */ lw $s4, 0x20($sp) +/* 9C669C 802412BC 8FB3001C */ lw $s3, 0x1c($sp) +/* 9C66A0 802412C0 8FB20018 */ lw $s2, 0x18($sp) +/* 9C66A4 802412C4 8FB10014 */ lw $s1, 0x14($sp) +/* 9C66A8 802412C8 8FB00010 */ lw $s0, 0x10($sp) +/* 9C66AC 802412CC 384200FF */ xori $v0, $v0, 0xff +/* 9C66B0 802412D0 2C420001 */ sltiu $v0, $v0, 1 +/* 9C66B4 802412D4 00021040 */ sll $v0, $v0, 1 +/* 9C66B8 802412D8 03E00008 */ jr $ra +/* 9C66BC 802412DC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454.s deleted file mode 100644 index 47d28d23ad..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241454 -/* 9C6834 80241454 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C6838 80241458 AFB00010 */ sw $s0, 0x10($sp) -/* 9C683C 8024145C 3C108011 */ lui $s0, %hi(gPlayerData) -/* 9C6840 80241460 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 9C6844 80241464 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C6848 80241468 AFB10014 */ sw $s1, 0x14($sp) -/* 9C684C 8024146C 960302C0 */ lhu $v1, 0x2c0($s0) -/* 9C6850 80241470 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 9C6854 80241474 10400003 */ beqz $v0, .L80241484 -/* 9C6858 80241478 0080882D */ daddu $s1, $a0, $zero -/* 9C685C 8024147C 24620001 */ addiu $v0, $v1, 1 -/* 9C6860 80241480 A60202C0 */ sh $v0, 0x2c0($s0) -.L80241484: -/* 9C6864 80241484 3C05F5DE */ lui $a1, 0xf5de -/* 9C6868 80241488 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 9C686C 8024148C 0C0B1EAF */ jal get_variable -/* 9C6870 80241490 0000202D */ daddu $a0, $zero, $zero -/* 9C6874 80241494 3C038024 */ lui $v1, 0x8024 -/* 9C6878 80241498 00621821 */ addu $v1, $v1, $v0 -/* 9C687C 8024149C 90635FA8 */ lbu $v1, 0x5fa8($v1) -/* 9C6880 802414A0 8E220084 */ lw $v0, 0x84($s1) -/* 9C6884 802414A4 54430006 */ bnel $v0, $v1, .L802414C0 -/* 9C6888 802414A8 AE200084 */ sw $zero, 0x84($s1) -/* 9C688C 802414AC 24020001 */ addiu $v0, $zero, 1 -/* 9C6890 802414B0 AE220084 */ sw $v0, 0x84($s1) -/* 9C6894 802414B4 960202C2 */ lhu $v0, 0x2c2($s0) -/* 9C6898 802414B8 24420001 */ addiu $v0, $v0, 1 -/* 9C689C 802414BC A60202C2 */ sh $v0, 0x2c2($s0) -.L802414C0: -/* 9C68A0 802414C0 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C68A4 802414C4 8FB10014 */ lw $s1, 0x14($sp) -/* 9C68A8 802414C8 8FB00010 */ lw $s0, 0x10($sp) -/* 9C68AC 802414CC 24020002 */ addiu $v0, $zero, 2 -/* 9C68B0 802414D0 03E00008 */ jr $ra -/* 9C68B4 802414D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454_9C6834.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454_9C6834.s new file mode 100644 index 0000000000..54d4e1d461 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241454_9C6834.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241454_9C6834 +/* 9C6834 80241454 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9C6838 80241458 AFB00010 */ sw $s0, 0x10($sp) +/* 9C683C 8024145C 3C108011 */ lui $s0, %hi(gPlayerData) +/* 9C6840 80241460 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 9C6844 80241464 AFBF0018 */ sw $ra, 0x18($sp) +/* 9C6848 80241468 AFB10014 */ sw $s1, 0x14($sp) +/* 9C684C 8024146C 960302C0 */ lhu $v1, 0x2c0($s0) +/* 9C6850 80241470 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 9C6854 80241474 10400003 */ beqz $v0, .L80241484 +/* 9C6858 80241478 0080882D */ daddu $s1, $a0, $zero +/* 9C685C 8024147C 24620001 */ addiu $v0, $v1, 1 +/* 9C6860 80241480 A60202C0 */ sh $v0, 0x2c0($s0) +.L80241484: +/* 9C6864 80241484 3C05F5DE */ lui $a1, 0xf5de +/* 9C6868 80241488 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 9C686C 8024148C 0C0B1EAF */ jal get_variable +/* 9C6870 80241490 0000202D */ daddu $a0, $zero, $zero +/* 9C6874 80241494 3C038024 */ lui $v1, 0x8024 +/* 9C6878 80241498 00621821 */ addu $v1, $v1, $v0 +/* 9C687C 8024149C 90635FA8 */ lbu $v1, 0x5fa8($v1) +/* 9C6880 802414A0 8E220084 */ lw $v0, 0x84($s1) +/* 9C6884 802414A4 54430006 */ bnel $v0, $v1, .L802414C0 +/* 9C6888 802414A8 AE200084 */ sw $zero, 0x84($s1) +/* 9C688C 802414AC 24020001 */ addiu $v0, $zero, 1 +/* 9C6890 802414B0 AE220084 */ sw $v0, 0x84($s1) +/* 9C6894 802414B4 960202C2 */ lhu $v0, 0x2c2($s0) +/* 9C6898 802414B8 24420001 */ addiu $v0, $v0, 1 +/* 9C689C 802414BC A60202C2 */ sh $v0, 0x2c2($s0) +.L802414C0: +/* 9C68A0 802414C0 8FBF0018 */ lw $ra, 0x18($sp) +/* 9C68A4 802414C4 8FB10014 */ lw $s1, 0x14($sp) +/* 9C68A8 802414C8 8FB00010 */ lw $s0, 0x10($sp) +/* 9C68AC 802414CC 24020002 */ addiu $v0, $zero, 2 +/* 9C68B0 802414D0 03E00008 */ jr $ra +/* 9C68B4 802414D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8.s deleted file mode 100644 index b4153cd70b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417D8 -/* 9C6BB8 802417D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C6BBC 802417DC AFBF0010 */ sw $ra, 0x10($sp) -/* 9C6BC0 802417E0 8C82000C */ lw $v0, 0xc($a0) -/* 9C6BC4 802417E4 0C0B1EAF */ jal get_variable -/* 9C6BC8 802417E8 8C450000 */ lw $a1, ($v0) -/* 9C6BCC 802417EC 0040202D */ daddu $a0, $v0, $zero -/* 9C6BD0 802417F0 3C028025 */ lui $v0, 0x8025 -/* 9C6BD4 802417F4 8C421C60 */ lw $v0, 0x1c60($v0) -/* 9C6BD8 802417F8 24030001 */ addiu $v1, $zero, 1 -/* 9C6BDC 802417FC 8C45000C */ lw $a1, 0xc($v0) -/* 9C6BE0 80241800 1083000D */ beq $a0, $v1, .L80241838 -/* 9C6BE4 80241804 28820002 */ slti $v0, $a0, 2 -/* 9C6BE8 80241808 10400005 */ beqz $v0, .L80241820 -/* 9C6BEC 8024180C 24020002 */ addiu $v0, $zero, 2 -/* 9C6BF0 80241810 10800007 */ beqz $a0, .L80241830 -/* 9C6BF4 80241814 240200C0 */ addiu $v0, $zero, 0xc0 -/* 9C6BF8 80241818 08090612 */ j .L80241848 -/* 9C6BFC 8024181C ACA00038 */ sw $zero, 0x38($a1) -.L80241820: -/* 9C6C00 80241820 10820008 */ beq $a0, $v0, .L80241844 -/* 9C6C04 80241824 24020040 */ addiu $v0, $zero, 0x40 -/* 9C6C08 80241828 08090612 */ j .L80241848 -/* 9C6C0C 8024182C ACA00038 */ sw $zero, 0x38($a1) -.L80241830: -/* 9C6C10 80241830 08090612 */ j .L80241848 -/* 9C6C14 80241834 ACA20038 */ sw $v0, 0x38($a1) -.L80241838: -/* 9C6C18 80241838 24020080 */ addiu $v0, $zero, 0x80 -/* 9C6C1C 8024183C 08090612 */ j .L80241848 -/* 9C6C20 80241840 ACA20038 */ sw $v0, 0x38($a1) -.L80241844: -/* 9C6C24 80241844 ACA20038 */ sw $v0, 0x38($a1) -.L80241848: -/* 9C6C28 80241848 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6C2C 8024184C 24020002 */ addiu $v0, $zero, 2 -/* 9C6C30 80241850 03E00008 */ jr $ra -/* 9C6C34 80241854 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8_9C6BB8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8_9C6BB8.s new file mode 100644 index 0000000000..f950dcf60b --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802417D8_9C6BB8.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417D8_9C6BB8 +/* 9C6BB8 802417D8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C6BBC 802417DC AFBF0010 */ sw $ra, 0x10($sp) +/* 9C6BC0 802417E0 8C82000C */ lw $v0, 0xc($a0) +/* 9C6BC4 802417E4 0C0B1EAF */ jal get_variable +/* 9C6BC8 802417E8 8C450000 */ lw $a1, ($v0) +/* 9C6BCC 802417EC 0040202D */ daddu $a0, $v0, $zero +/* 9C6BD0 802417F0 3C028025 */ lui $v0, 0x8025 +/* 9C6BD4 802417F4 8C421C60 */ lw $v0, 0x1c60($v0) +/* 9C6BD8 802417F8 24030001 */ addiu $v1, $zero, 1 +/* 9C6BDC 802417FC 8C45000C */ lw $a1, 0xc($v0) +/* 9C6BE0 80241800 1083000D */ beq $a0, $v1, .L80241838 +/* 9C6BE4 80241804 28820002 */ slti $v0, $a0, 2 +/* 9C6BE8 80241808 10400005 */ beqz $v0, .L80241820 +/* 9C6BEC 8024180C 24020002 */ addiu $v0, $zero, 2 +/* 9C6BF0 80241810 10800007 */ beqz $a0, .L80241830 +/* 9C6BF4 80241814 240200C0 */ addiu $v0, $zero, 0xc0 +/* 9C6BF8 80241818 08090612 */ j .L80241848 +/* 9C6BFC 8024181C ACA00038 */ sw $zero, 0x38($a1) +.L80241820: +/* 9C6C00 80241820 10820008 */ beq $a0, $v0, .L80241844 +/* 9C6C04 80241824 24020040 */ addiu $v0, $zero, 0x40 +/* 9C6C08 80241828 08090612 */ j .L80241848 +/* 9C6C0C 8024182C ACA00038 */ sw $zero, 0x38($a1) +.L80241830: +/* 9C6C10 80241830 08090612 */ j .L80241848 +/* 9C6C14 80241834 ACA20038 */ sw $v0, 0x38($a1) +.L80241838: +/* 9C6C18 80241838 24020080 */ addiu $v0, $zero, 0x80 +/* 9C6C1C 8024183C 08090612 */ j .L80241848 +/* 9C6C20 80241840 ACA20038 */ sw $v0, 0x38($a1) +.L80241844: +/* 9C6C24 80241844 ACA20038 */ sw $v0, 0x38($a1) +.L80241848: +/* 9C6C28 80241848 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C6C2C 8024184C 24020002 */ addiu $v0, $zero, 2 +/* 9C6C30 80241850 03E00008 */ jr $ra +/* 9C6C34 80241854 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858.s deleted file mode 100644 index 2ec819bd88..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241858 -/* 9C6C38 80241858 3C028025 */ lui $v0, 0x8025 -/* 9C6C3C 8024185C 8C421C68 */ lw $v0, 0x1c68($v0) -/* 9C6C40 80241860 8C42000C */ lw $v0, 0xc($v0) -/* 9C6C44 80241864 AC40001C */ sw $zero, 0x1c($v0) -/* 9C6C48 80241868 03E00008 */ jr $ra -/* 9C6C4C 8024186C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858_9C6C38.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858_9C6C38.s new file mode 100644 index 0000000000..d11a8d3c0a --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241858_9C6C38.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241858_9C6C38 +/* 9C6C38 80241858 3C028025 */ lui $v0, 0x8025 +/* 9C6C3C 8024185C 8C421C68 */ lw $v0, 0x1c68($v0) +/* 9C6C40 80241860 8C42000C */ lw $v0, 0xc($v0) +/* 9C6C44 80241864 AC40001C */ sw $zero, 0x1c($v0) +/* 9C6C48 80241868 03E00008 */ jr $ra +/* 9C6C4C 8024186C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C.s deleted file mode 100644 index 87a4dc5d55..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024188C -/* 9C6C6C 8024188C 3C028025 */ lui $v0, 0x8025 -/* 9C6C70 80241890 8C421C68 */ lw $v0, 0x1c68($v0) -/* 9C6C74 80241894 8C43000C */ lw $v1, 0xc($v0) -/* 9C6C78 80241898 24020002 */ addiu $v0, $zero, 2 -/* 9C6C7C 8024189C 03E00008 */ jr $ra -/* 9C6C80 802418A0 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C_9C6C6C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C_9C6C6C.s new file mode 100644 index 0000000000..b3f362f38b --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024188C_9C6C6C.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024188C_9C6C6C +/* 9C6C6C 8024188C 3C028025 */ lui $v0, 0x8025 +/* 9C6C70 80241890 8C421C68 */ lw $v0, 0x1c68($v0) +/* 9C6C74 80241894 8C43000C */ lw $v1, 0xc($v0) +/* 9C6C78 80241898 24020002 */ addiu $v0, $zero, 2 +/* 9C6C7C 8024189C 03E00008 */ jr $ra +/* 9C6C80 802418A0 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4.s deleted file mode 100644 index 4cfb0ced77..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418A4 -/* 9C6C84 802418A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C6C88 802418A8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9C6C8C 802418AC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9C6C90 802418B0 3C05FE36 */ lui $a1, 0xfe36 -/* 9C6C94 802418B4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C6C98 802418B8 80460075 */ lb $a2, 0x75($v0) -/* 9C6C9C 802418BC 0C0B2026 */ jal set_variable -/* 9C6CA0 802418C0 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9C6CA4 802418C4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6CA8 802418C8 24020002 */ addiu $v0, $zero, 2 -/* 9C6CAC 802418CC 03E00008 */ jr $ra -/* 9C6CB0 802418D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s new file mode 100644 index 0000000000..77956f0cbe --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418A4_9C6C84 +/* 9C6C84 802418A4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C6C88 802418A8 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 9C6C8C 802418AC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 9C6C90 802418B0 3C05FE36 */ lui $a1, 0xfe36 +/* 9C6C94 802418B4 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C6C98 802418B8 80460075 */ lb $a2, 0x75($v0) +/* 9C6C9C 802418BC 0C0B2026 */ jal set_variable +/* 9C6CA0 802418C0 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 9C6CA4 802418C4 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C6CA8 802418C8 24020002 */ addiu $v0, $zero, 2 +/* 9C6CAC 802418CC 03E00008 */ jr $ra +/* 9C6CB0 802418D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4.s deleted file mode 100644 index b1c0b259f7..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D4 -/* 9C6CB4 802418D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C6CB8 802418D8 AFB10014 */ sw $s1, 0x14($sp) -/* 9C6CBC 802418DC 0080882D */ daddu $s1, $a0, $zero -/* 9C6CC0 802418E0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C6CC4 802418E4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6CC8 802418E8 8E30000C */ lw $s0, 0xc($s1) -/* 9C6CCC 802418EC 8E050000 */ lw $a1, ($s0) -/* 9C6CD0 802418F0 0C0B1EAF */ jal get_variable -/* 9C6CD4 802418F4 26100004 */ addiu $s0, $s0, 4 -/* 9C6CD8 802418F8 0220202D */ daddu $a0, $s1, $zero -/* 9C6CDC 802418FC 8E050000 */ lw $a1, ($s0) -/* 9C6CE0 80241900 0C0B210B */ jal get_float_variable -/* 9C6CE4 80241904 0040802D */ daddu $s0, $v0, $zero -/* 9C6CE8 80241908 24020002 */ addiu $v0, $zero, 2 -/* 9C6CEC 8024190C 00501804 */ sllv $v1, $s0, $v0 -/* 9C6CF0 80241910 00701821 */ addu $v1, $v1, $s0 -/* 9C6CF4 80241914 00431804 */ sllv $v1, $v1, $v0 -/* 9C6CF8 80241918 00701823 */ subu $v1, $v1, $s0 -/* 9C6CFC 8024191C 000320C0 */ sll $a0, $v1, 3 -/* 9C6D00 80241920 00641821 */ addu $v1, $v1, $a0 -/* 9C6D04 80241924 000318C0 */ sll $v1, $v1, 3 -/* 9C6D08 80241928 3C01800B */ lui $at, 0x800b -/* 9C6D0C 8024192C 00230821 */ addu $at, $at, $v1 -/* 9C6D10 80241930 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 9C6D14 80241934 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C6D18 80241938 8FB10014 */ lw $s1, 0x14($sp) -/* 9C6D1C 8024193C 8FB00010 */ lw $s0, 0x10($sp) -/* 9C6D20 80241940 03E00008 */ jr $ra -/* 9C6D24 80241944 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s new file mode 100644 index 0000000000..295e73c133 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418D4_9C6CB4 +/* 9C6CB4 802418D4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9C6CB8 802418D8 AFB10014 */ sw $s1, 0x14($sp) +/* 9C6CBC 802418DC 0080882D */ daddu $s1, $a0, $zero +/* 9C6CC0 802418E0 AFBF0018 */ sw $ra, 0x18($sp) +/* 9C6CC4 802418E4 AFB00010 */ sw $s0, 0x10($sp) +/* 9C6CC8 802418E8 8E30000C */ lw $s0, 0xc($s1) +/* 9C6CCC 802418EC 8E050000 */ lw $a1, ($s0) +/* 9C6CD0 802418F0 0C0B1EAF */ jal get_variable +/* 9C6CD4 802418F4 26100004 */ addiu $s0, $s0, 4 +/* 9C6CD8 802418F8 0220202D */ daddu $a0, $s1, $zero +/* 9C6CDC 802418FC 8E050000 */ lw $a1, ($s0) +/* 9C6CE0 80241900 0C0B210B */ jal get_float_variable +/* 9C6CE4 80241904 0040802D */ daddu $s0, $v0, $zero +/* 9C6CE8 80241908 24020002 */ addiu $v0, $zero, 2 +/* 9C6CEC 8024190C 00501804 */ sllv $v1, $s0, $v0 +/* 9C6CF0 80241910 00701821 */ addu $v1, $v1, $s0 +/* 9C6CF4 80241914 00431804 */ sllv $v1, $v1, $v0 +/* 9C6CF8 80241918 00701823 */ subu $v1, $v1, $s0 +/* 9C6CFC 8024191C 000320C0 */ sll $a0, $v1, 3 +/* 9C6D00 80241920 00641821 */ addu $v1, $v1, $a0 +/* 9C6D04 80241924 000318C0 */ sll $v1, $v1, 3 +/* 9C6D08 80241928 3C01800B */ lui $at, 0x800b +/* 9C6D0C 8024192C 00230821 */ addu $at, $at, $v1 +/* 9C6D10 80241930 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 9C6D14 80241934 8FBF0018 */ lw $ra, 0x18($sp) +/* 9C6D18 80241938 8FB10014 */ lw $s1, 0x14($sp) +/* 9C6D1C 8024193C 8FB00010 */ lw $s0, 0x10($sp) +/* 9C6D20 80241940 03E00008 */ jr $ra +/* 9C6D24 80241944 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948.s deleted file mode 100644 index 1e1af9b04f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241948 -/* 9C6D28 80241948 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C6D2C 8024194C AFB10014 */ sw $s1, 0x14($sp) -/* 9C6D30 80241950 0080882D */ daddu $s1, $a0, $zero -/* 9C6D34 80241954 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C6D38 80241958 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6D3C 8024195C 8E30000C */ lw $s0, 0xc($s1) -/* 9C6D40 80241960 8E050000 */ lw $a1, ($s0) -/* 9C6D44 80241964 0C0B1EAF */ jal get_variable -/* 9C6D48 80241968 26100004 */ addiu $s0, $s0, 4 -/* 9C6D4C 8024196C 00021880 */ sll $v1, $v0, 2 -/* 9C6D50 80241970 00621821 */ addu $v1, $v1, $v0 -/* 9C6D54 80241974 00031880 */ sll $v1, $v1, 2 -/* 9C6D58 80241978 00621823 */ subu $v1, $v1, $v0 -/* 9C6D5C 8024197C 000310C0 */ sll $v0, $v1, 3 -/* 9C6D60 80241980 00621821 */ addu $v1, $v1, $v0 -/* 9C6D64 80241984 000318C0 */ sll $v1, $v1, 3 -/* 9C6D68 80241988 3C01800B */ lui $at, 0x800b -/* 9C6D6C 8024198C 00230821 */ addu $at, $at, $v1 -/* 9C6D70 80241990 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 9C6D74 80241994 3C014480 */ lui $at, 0x4480 -/* 9C6D78 80241998 44810000 */ mtc1 $at, $f0 -/* 9C6D7C 8024199C 00000000 */ nop -/* 9C6D80 802419A0 46001082 */ mul.s $f2, $f2, $f0 -/* 9C6D84 802419A4 00000000 */ nop -/* 9C6D88 802419A8 3C01CD5B */ lui $at, 0xcd5b -/* 9C6D8C 802419AC 34215858 */ ori $at, $at, 0x5858 -/* 9C6D90 802419B0 44810000 */ mtc1 $at, $f0 -/* 9C6D94 802419B4 00000000 */ nop -/* 9C6D98 802419B8 46001080 */ add.s $f2, $f2, $f0 -/* 9C6D9C 802419BC 8E050000 */ lw $a1, ($s0) -/* 9C6DA0 802419C0 4600110D */ trunc.w.s $f4, $f2 -/* 9C6DA4 802419C4 44062000 */ mfc1 $a2, $f4 -/* 9C6DA8 802419C8 0C0B2026 */ jal set_variable -/* 9C6DAC 802419CC 0220202D */ daddu $a0, $s1, $zero -/* 9C6DB0 802419D0 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C6DB4 802419D4 8FB10014 */ lw $s1, 0x14($sp) -/* 9C6DB8 802419D8 8FB00010 */ lw $s0, 0x10($sp) -/* 9C6DBC 802419DC 24020002 */ addiu $v0, $zero, 2 -/* 9C6DC0 802419E0 03E00008 */ jr $ra -/* 9C6DC4 802419E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s new file mode 100644 index 0000000000..e693a7580c --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241948_9C6D28 +/* 9C6D28 80241948 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9C6D2C 8024194C AFB10014 */ sw $s1, 0x14($sp) +/* 9C6D30 80241950 0080882D */ daddu $s1, $a0, $zero +/* 9C6D34 80241954 AFBF0018 */ sw $ra, 0x18($sp) +/* 9C6D38 80241958 AFB00010 */ sw $s0, 0x10($sp) +/* 9C6D3C 8024195C 8E30000C */ lw $s0, 0xc($s1) +/* 9C6D40 80241960 8E050000 */ lw $a1, ($s0) +/* 9C6D44 80241964 0C0B1EAF */ jal get_variable +/* 9C6D48 80241968 26100004 */ addiu $s0, $s0, 4 +/* 9C6D4C 8024196C 00021880 */ sll $v1, $v0, 2 +/* 9C6D50 80241970 00621821 */ addu $v1, $v1, $v0 +/* 9C6D54 80241974 00031880 */ sll $v1, $v1, 2 +/* 9C6D58 80241978 00621823 */ subu $v1, $v1, $v0 +/* 9C6D5C 8024197C 000310C0 */ sll $v0, $v1, 3 +/* 9C6D60 80241980 00621821 */ addu $v1, $v1, $v0 +/* 9C6D64 80241984 000318C0 */ sll $v1, $v1, 3 +/* 9C6D68 80241988 3C01800B */ lui $at, 0x800b +/* 9C6D6C 8024198C 00230821 */ addu $at, $at, $v1 +/* 9C6D70 80241990 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 9C6D74 80241994 3C014480 */ lui $at, 0x4480 +/* 9C6D78 80241998 44810000 */ mtc1 $at, $f0 +/* 9C6D7C 8024199C 00000000 */ nop +/* 9C6D80 802419A0 46001082 */ mul.s $f2, $f2, $f0 +/* 9C6D84 802419A4 00000000 */ nop +/* 9C6D88 802419A8 3C01CD5B */ lui $at, 0xcd5b +/* 9C6D8C 802419AC 34215858 */ ori $at, $at, 0x5858 +/* 9C6D90 802419B0 44810000 */ mtc1 $at, $f0 +/* 9C6D94 802419B4 00000000 */ nop +/* 9C6D98 802419B8 46001080 */ add.s $f2, $f2, $f0 +/* 9C6D9C 802419BC 8E050000 */ lw $a1, ($s0) +/* 9C6DA0 802419C0 4600110D */ trunc.w.s $f4, $f2 +/* 9C6DA4 802419C4 44062000 */ mfc1 $a2, $f4 +/* 9C6DA8 802419C8 0C0B2026 */ jal set_variable +/* 9C6DAC 802419CC 0220202D */ daddu $a0, $s1, $zero +/* 9C6DB0 802419D0 8FBF0018 */ lw $ra, 0x18($sp) +/* 9C6DB4 802419D4 8FB10014 */ lw $s1, 0x14($sp) +/* 9C6DB8 802419D8 8FB00010 */ lw $s0, 0x10($sp) +/* 9C6DBC 802419DC 24020002 */ addiu $v0, $zero, 2 +/* 9C6DC0 802419E0 03E00008 */ jr $ra +/* 9C6DC4 802419E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8.s deleted file mode 100644 index 79ed17b9a1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BE8 -/* 9C6FC8 80241BE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C6FCC 80241BEC AFB10014 */ sw $s1, 0x14($sp) -/* 9C6FD0 80241BF0 0080882D */ daddu $s1, $a0, $zero -/* 9C6FD4 80241BF4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6FD8 80241BF8 00A0802D */ daddu $s0, $a1, $zero -/* 9C6FDC 80241BFC AFBF0018 */ sw $ra, 0x18($sp) -/* 9C6FE0 80241C00 0C00EABB */ jal get_npc_unsafe -/* 9C6FE4 80241C04 2404FFFC */ addiu $a0, $zero, -4 -/* 9C6FE8 80241C08 12000003 */ beqz $s0, .L80241C18 -/* 9C6FEC 80241C0C 0040182D */ daddu $v1, $v0, $zero -/* 9C6FF0 80241C10 2402003C */ addiu $v0, $zero, 0x3c -/* 9C6FF4 80241C14 AE220070 */ sw $v0, 0x70($s1) -.L80241C18: -/* 9C6FF8 80241C18 C462000C */ lwc1 $f2, 0xc($v1) -/* 9C6FFC 80241C1C 3C0141F0 */ lui $at, 0x41f0 -/* 9C7000 80241C20 44810000 */ mtc1 $at, $f0 -/* 9C7004 80241C24 00000000 */ nop -/* 9C7008 80241C28 46001000 */ add.s $f0, $f2, $f0 -/* 9C700C 80241C2C 3C0143B4 */ lui $at, 0x43b4 -/* 9C7010 80241C30 44811000 */ mtc1 $at, $f2 -/* 9C7014 80241C34 00000000 */ nop -/* 9C7018 80241C38 4600103E */ c.le.s $f2, $f0 -/* 9C701C 80241C3C 00000000 */ nop -/* 9C7020 80241C40 45000003 */ bc1f .L80241C50 -/* 9C7024 80241C44 E460000C */ swc1 $f0, 0xc($v1) -/* 9C7028 80241C48 46020001 */ sub.s $f0, $f0, $f2 -/* 9C702C 80241C4C E460000C */ swc1 $f0, 0xc($v1) -.L80241C50: -/* 9C7030 80241C50 8E230070 */ lw $v1, 0x70($s1) -/* 9C7034 80241C54 2463FFFF */ addiu $v1, $v1, -1 -/* 9C7038 80241C58 000317C3 */ sra $v0, $v1, 0x1f -/* 9C703C 80241C5C AE230070 */ sw $v1, 0x70($s1) -/* 9C7040 80241C60 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C7044 80241C64 8FB10014 */ lw $s1, 0x14($sp) -/* 9C7048 80241C68 8FB00010 */ lw $s0, 0x10($sp) -/* 9C704C 80241C6C 30420002 */ andi $v0, $v0, 2 -/* 9C7050 80241C70 03E00008 */ jr $ra -/* 9C7054 80241C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s new file mode 100644 index 0000000000..26e45f88ed --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BE8_9C6FC8 +/* 9C6FC8 80241BE8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9C6FCC 80241BEC AFB10014 */ sw $s1, 0x14($sp) +/* 9C6FD0 80241BF0 0080882D */ daddu $s1, $a0, $zero +/* 9C6FD4 80241BF4 AFB00010 */ sw $s0, 0x10($sp) +/* 9C6FD8 80241BF8 00A0802D */ daddu $s0, $a1, $zero +/* 9C6FDC 80241BFC AFBF0018 */ sw $ra, 0x18($sp) +/* 9C6FE0 80241C00 0C00EABB */ jal get_npc_unsafe +/* 9C6FE4 80241C04 2404FFFC */ addiu $a0, $zero, -4 +/* 9C6FE8 80241C08 12000003 */ beqz $s0, .L80241C18 +/* 9C6FEC 80241C0C 0040182D */ daddu $v1, $v0, $zero +/* 9C6FF0 80241C10 2402003C */ addiu $v0, $zero, 0x3c +/* 9C6FF4 80241C14 AE220070 */ sw $v0, 0x70($s1) +.L80241C18: +/* 9C6FF8 80241C18 C462000C */ lwc1 $f2, 0xc($v1) +/* 9C6FFC 80241C1C 3C0141F0 */ lui $at, 0x41f0 +/* 9C7000 80241C20 44810000 */ mtc1 $at, $f0 +/* 9C7004 80241C24 00000000 */ nop +/* 9C7008 80241C28 46001000 */ add.s $f0, $f2, $f0 +/* 9C700C 80241C2C 3C0143B4 */ lui $at, 0x43b4 +/* 9C7010 80241C30 44811000 */ mtc1 $at, $f2 +/* 9C7014 80241C34 00000000 */ nop +/* 9C7018 80241C38 4600103E */ c.le.s $f2, $f0 +/* 9C701C 80241C3C 00000000 */ nop +/* 9C7020 80241C40 45000003 */ bc1f .L80241C50 +/* 9C7024 80241C44 E460000C */ swc1 $f0, 0xc($v1) +/* 9C7028 80241C48 46020001 */ sub.s $f0, $f0, $f2 +/* 9C702C 80241C4C E460000C */ swc1 $f0, 0xc($v1) +.L80241C50: +/* 9C7030 80241C50 8E230070 */ lw $v1, 0x70($s1) +/* 9C7034 80241C54 2463FFFF */ addiu $v1, $v1, -1 +/* 9C7038 80241C58 000317C3 */ sra $v0, $v1, 0x1f +/* 9C703C 80241C5C AE230070 */ sw $v1, 0x70($s1) +/* 9C7040 80241C60 8FBF0018 */ lw $ra, 0x18($sp) +/* 9C7044 80241C64 8FB10014 */ lw $s1, 0x14($sp) +/* 9C7048 80241C68 8FB00010 */ lw $s0, 0x10($sp) +/* 9C704C 80241C6C 30420002 */ andi $v0, $v0, 2 +/* 9C7050 80241C70 03E00008 */ jr $ra +/* 9C7054 80241C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60.s deleted file mode 100644 index 248a09b84a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D60 -/* 9C7140 80241D60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7144 80241D64 3C058025 */ lui $a1, 0x8025 -/* 9C7148 80241D68 8CA51C58 */ lw $a1, 0x1c58($a1) -/* 9C714C 80241D6C AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7150 80241D70 0C0B1EAF */ jal get_variable -/* 9C7154 80241D74 0000202D */ daddu $a0, $zero, $zero -/* 9C7158 80241D78 0040182D */ daddu $v1, $v0, $zero -/* 9C715C 80241D7C 24020001 */ addiu $v0, $zero, 1 -/* 9C7160 80241D80 14620006 */ bne $v1, $v0, .L80241D9C -/* 9C7164 80241D84 24020002 */ addiu $v0, $zero, 2 -/* 9C7168 80241D88 44800000 */ mtc1 $zero, $f0 -/* 9C716C 80241D8C 00000000 */ nop -/* 9C7170 80241D90 44050000 */ mfc1 $a1, $f0 -/* 9C7174 80241D94 0809076D */ j .L80241DB4 -/* 9C7178 80241D98 0000202D */ daddu $a0, $zero, $zero -.L80241D9C: -/* 9C717C 80241D9C 14620008 */ bne $v1, $v0, .L80241DC0 -/* 9C7180 80241DA0 24040001 */ addiu $a0, $zero, 1 -/* 9C7184 80241DA4 44800000 */ mtc1 $zero, $f0 -/* 9C7188 80241DA8 00000000 */ nop -/* 9C718C 80241DAC 44050000 */ mfc1 $a1, $f0 -/* 9C7190 80241DB0 00000000 */ nop -.L80241DB4: -/* 9C7194 80241DB4 00A0302D */ daddu $a2, $a1, $zero -/* 9C7198 80241DB8 0C01C5A4 */ jal func_80071690 -/* 9C719C 80241DBC 00A0382D */ daddu $a3, $a1, $zero -.L80241DC0: -/* 9C71A0 80241DC0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C71A4 80241DC4 03E00008 */ jr $ra -/* 9C71A8 80241DC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s new file mode 100644 index 0000000000..6c621cb6fb --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241D60_9C7140.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D60_9C7140 +/* 9C7140 80241D60 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C7144 80241D64 3C058025 */ lui $a1, 0x8025 +/* 9C7148 80241D68 8CA51C58 */ lw $a1, 0x1c58($a1) +/* 9C714C 80241D6C AFBF0010 */ sw $ra, 0x10($sp) +/* 9C7150 80241D70 0C0B1EAF */ jal get_variable +/* 9C7154 80241D74 0000202D */ daddu $a0, $zero, $zero +/* 9C7158 80241D78 0040182D */ daddu $v1, $v0, $zero +/* 9C715C 80241D7C 24020001 */ addiu $v0, $zero, 1 +/* 9C7160 80241D80 14620006 */ bne $v1, $v0, .L80241D9C +/* 9C7164 80241D84 24020002 */ addiu $v0, $zero, 2 +/* 9C7168 80241D88 44800000 */ mtc1 $zero, $f0 +/* 9C716C 80241D8C 00000000 */ nop +/* 9C7170 80241D90 44050000 */ mfc1 $a1, $f0 +/* 9C7174 80241D94 0809076D */ j .L80241DB4 +/* 9C7178 80241D98 0000202D */ daddu $a0, $zero, $zero +.L80241D9C: +/* 9C717C 80241D9C 14620008 */ bne $v1, $v0, .L80241DC0 +/* 9C7180 80241DA0 24040001 */ addiu $a0, $zero, 1 +/* 9C7184 80241DA4 44800000 */ mtc1 $zero, $f0 +/* 9C7188 80241DA8 00000000 */ nop +/* 9C718C 80241DAC 44050000 */ mfc1 $a1, $f0 +/* 9C7190 80241DB0 00000000 */ nop +.L80241DB4: +/* 9C7194 80241DB4 00A0302D */ daddu $a2, $a1, $zero +/* 9C7198 80241DB8 0C01C5A4 */ jal func_80071690 +/* 9C719C 80241DBC 00A0382D */ daddu $a3, $a1, $zero +.L80241DC0: +/* 9C71A0 80241DC0 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C71A4 80241DC4 03E00008 */ jr $ra +/* 9C71A8 80241DC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC.s deleted file mode 100644 index ee463f255d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DCC -/* 9C71AC 80241DCC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C71B0 80241DD0 3C058024 */ lui $a1, 0x8024 -/* 9C71B4 80241DD4 24A51D60 */ addiu $a1, $a1, 0x1d60 -/* 9C71B8 80241DD8 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C71BC 80241DDC 0C048C8F */ jal bind_dynamic_entity_7 -/* 9C71C0 80241DE0 0000202D */ daddu $a0, $zero, $zero -/* 9C71C4 80241DE4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C71C8 80241DE8 3C018025 */ lui $at, 0x8025 -/* 9C71CC 80241DEC AC221C40 */ sw $v0, 0x1c40($at) -/* 9C71D0 80241DF0 24020002 */ addiu $v0, $zero, 2 -/* 9C71D4 80241DF4 03E00008 */ jr $ra -/* 9C71D8 80241DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s new file mode 100644 index 0000000000..3644496aec --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241DCC_9C71AC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DCC_9C71AC +/* 9C71AC 80241DCC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C71B0 80241DD0 3C058024 */ lui $a1, 0x8024 +/* 9C71B4 80241DD4 24A51D60 */ addiu $a1, $a1, 0x1d60 +/* 9C71B8 80241DD8 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C71BC 80241DDC 0C048C8F */ jal bind_dynamic_entity_7 +/* 9C71C0 80241DE0 0000202D */ daddu $a0, $zero, $zero +/* 9C71C4 80241DE4 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C71C8 80241DE8 3C018025 */ lui $at, 0x8025 +/* 9C71CC 80241DEC AC221C40 */ sw $v0, 0x1c40($at) +/* 9C71D0 80241DF0 24020002 */ addiu $v0, $zero, 2 +/* 9C71D4 80241DF4 03E00008 */ jr $ra +/* 9C71D8 80241DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C.s deleted file mode 100644 index 99a02fb93c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024207C -/* 9C745C 8024207C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7460 80242080 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7464 80242084 8C82000C */ lw $v0, 0xc($a0) -/* 9C7468 80242088 0C0B1EAF */ jal get_variable -/* 9C746C 8024208C 8C450000 */ lw $a1, ($v0) -/* 9C7470 80242090 3C018025 */ lui $at, 0x8025 -/* 9C7474 80242094 AC228570 */ sw $v0, -0x7a90($at) -/* 9C7478 80242098 24020002 */ addiu $v0, $zero, 2 -/* 9C747C 8024209C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7480 802420A0 24030001 */ addiu $v1, $zero, 1 -/* 9C7484 802420A4 3C018025 */ lui $at, 0x8025 -/* 9C7488 802420A8 AC23856C */ sw $v1, -0x7a94($at) -/* 9C748C 802420AC 03E00008 */ jr $ra -/* 9C7490 802420B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s new file mode 100644 index 0000000000..cacdd1d059 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024207C_9C745C.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024207C_9C745C +/* 9C745C 8024207C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C7460 80242080 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C7464 80242084 8C82000C */ lw $v0, 0xc($a0) +/* 9C7468 80242088 0C0B1EAF */ jal get_variable +/* 9C746C 8024208C 8C450000 */ lw $a1, ($v0) +/* 9C7470 80242090 3C018025 */ lui $at, 0x8025 +/* 9C7474 80242094 AC228570 */ sw $v0, -0x7a90($at) +/* 9C7478 80242098 24020002 */ addiu $v0, $zero, 2 +/* 9C747C 8024209C 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C7480 802420A0 24030001 */ addiu $v1, $zero, 1 +/* 9C7484 802420A4 3C018025 */ lui $at, 0x8025 +/* 9C7488 802420A8 AC23856C */ sw $v1, -0x7a94($at) +/* 9C748C 802420AC 03E00008 */ jr $ra +/* 9C7490 802420B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4.s deleted file mode 100644 index 14390279be..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420B4 -/* 9C7494 802420B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7498 802420B8 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C749C 802420BC 8C82000C */ lw $v0, 0xc($a0) -/* 9C74A0 802420C0 0C0B1EAF */ jal get_variable -/* 9C74A4 802420C4 8C450000 */ lw $a1, ($v0) -/* 9C74A8 802420C8 0040182D */ daddu $v1, $v0, $zero -/* 9C74AC 802420CC 10600012 */ beqz $v1, .L80242118 -/* 9C74B0 802420D0 0000202D */ daddu $a0, $zero, $zero -/* 9C74B4 802420D4 8C620000 */ lw $v0, ($v1) -/* 9C74B8 802420D8 5040000A */ beql $v0, $zero, .L80242104 -/* 9C74BC 802420DC 00041080 */ sll $v0, $a0, 2 -/* 9C74C0 802420E0 3C058025 */ lui $a1, 0x8025 -/* 9C74C4 802420E4 24A51C70 */ addiu $a1, $a1, 0x1c70 -.L802420E8: -/* 9C74C8 802420E8 24630004 */ addiu $v1, $v1, 4 -/* 9C74CC 802420EC 24840001 */ addiu $a0, $a0, 1 -/* 9C74D0 802420F0 ACA20000 */ sw $v0, ($a1) -/* 9C74D4 802420F4 8C620000 */ lw $v0, ($v1) -/* 9C74D8 802420F8 1440FFFB */ bnez $v0, .L802420E8 -/* 9C74DC 802420FC 24A50004 */ addiu $a1, $a1, 4 -/* 9C74E0 80242100 00041080 */ sll $v0, $a0, 2 -.L80242104: -/* 9C74E4 80242104 3C018025 */ lui $at, 0x8025 -/* 9C74E8 80242108 00220821 */ addu $at, $at, $v0 -/* 9C74EC 8024210C AC201C70 */ sw $zero, 0x1c70($at) -/* 9C74F0 80242110 08090850 */ j .L80242140 -/* 9C74F4 80242114 00000000 */ nop -.L80242118: -/* 9C74F8 80242118 3C038025 */ lui $v1, 0x8025 -/* 9C74FC 8024211C 24631C70 */ addiu $v1, $v1, 0x1c70 -/* 9C7500 80242120 0060282D */ daddu $a1, $v1, $zero -.L80242124: -/* 9C7504 80242124 24820010 */ addiu $v0, $a0, 0x10 -/* 9C7508 80242128 AC620000 */ sw $v0, ($v1) -/* 9C750C 8024212C 24630004 */ addiu $v1, $v1, 4 -/* 9C7510 80242130 24840001 */ addiu $a0, $a0, 1 -/* 9C7514 80242134 28820070 */ slti $v0, $a0, 0x70 -/* 9C7518 80242138 1440FFFA */ bnez $v0, .L80242124 -/* 9C751C 8024213C ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242140: -/* 9C7520 80242140 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7524 80242144 24020002 */ addiu $v0, $zero, 2 -/* 9C7528 80242148 03E00008 */ jr $ra -/* 9C752C 8024214C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s new file mode 100644 index 0000000000..b9d85fa277 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802420B4_9C7494.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420B4_9C7494 +/* 9C7494 802420B4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C7498 802420B8 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C749C 802420BC 8C82000C */ lw $v0, 0xc($a0) +/* 9C74A0 802420C0 0C0B1EAF */ jal get_variable +/* 9C74A4 802420C4 8C450000 */ lw $a1, ($v0) +/* 9C74A8 802420C8 0040182D */ daddu $v1, $v0, $zero +/* 9C74AC 802420CC 10600012 */ beqz $v1, .L80242118 +/* 9C74B0 802420D0 0000202D */ daddu $a0, $zero, $zero +/* 9C74B4 802420D4 8C620000 */ lw $v0, ($v1) +/* 9C74B8 802420D8 5040000A */ beql $v0, $zero, .L80242104 +/* 9C74BC 802420DC 00041080 */ sll $v0, $a0, 2 +/* 9C74C0 802420E0 3C058025 */ lui $a1, 0x8025 +/* 9C74C4 802420E4 24A51C70 */ addiu $a1, $a1, 0x1c70 +.L802420E8: +/* 9C74C8 802420E8 24630004 */ addiu $v1, $v1, 4 +/* 9C74CC 802420EC 24840001 */ addiu $a0, $a0, 1 +/* 9C74D0 802420F0 ACA20000 */ sw $v0, ($a1) +/* 9C74D4 802420F4 8C620000 */ lw $v0, ($v1) +/* 9C74D8 802420F8 1440FFFB */ bnez $v0, .L802420E8 +/* 9C74DC 802420FC 24A50004 */ addiu $a1, $a1, 4 +/* 9C74E0 80242100 00041080 */ sll $v0, $a0, 2 +.L80242104: +/* 9C74E4 80242104 3C018025 */ lui $at, 0x8025 +/* 9C74E8 80242108 00220821 */ addu $at, $at, $v0 +/* 9C74EC 8024210C AC201C70 */ sw $zero, 0x1c70($at) +/* 9C74F0 80242110 08090850 */ j .L80242140 +/* 9C74F4 80242114 00000000 */ nop +.L80242118: +/* 9C74F8 80242118 3C038025 */ lui $v1, 0x8025 +/* 9C74FC 8024211C 24631C70 */ addiu $v1, $v1, 0x1c70 +/* 9C7500 80242120 0060282D */ daddu $a1, $v1, $zero +.L80242124: +/* 9C7504 80242124 24820010 */ addiu $v0, $a0, 0x10 +/* 9C7508 80242128 AC620000 */ sw $v0, ($v1) +/* 9C750C 8024212C 24630004 */ addiu $v1, $v1, 4 +/* 9C7510 80242130 24840001 */ addiu $a0, $a0, 1 +/* 9C7514 80242134 28820070 */ slti $v0, $a0, 0x70 +/* 9C7518 80242138 1440FFFA */ bnez $v0, .L80242124 +/* 9C751C 8024213C ACA001C0 */ sw $zero, 0x1c0($a1) +.L80242140: +/* 9C7520 80242140 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C7524 80242144 24020002 */ addiu $v0, $zero, 2 +/* 9C7528 80242148 03E00008 */ jr $ra +/* 9C752C 8024214C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242150.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242150.s deleted file mode 100644 index ea61ede542..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242150.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242150 -/* 9C7530 80242150 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C7534 80242154 AFB10014 */ sw $s1, 0x14($sp) -/* 9C7538 80242158 0080882D */ daddu $s1, $a0, $zero -/* 9C753C 8024215C AFBF0018 */ sw $ra, 0x18($sp) -/* 9C7540 80242160 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7544 80242164 8E30000C */ lw $s0, 0xc($s1) -/* 9C7548 80242168 8E050000 */ lw $a1, ($s0) -/* 9C754C 8024216C 0C0B1EAF */ jal get_variable -/* 9C7550 80242170 26100004 */ addiu $s0, $s0, 4 -/* 9C7554 80242174 AE22008C */ sw $v0, 0x8c($s1) -/* 9C7558 80242178 8E050000 */ lw $a1, ($s0) -/* 9C755C 8024217C 26100004 */ addiu $s0, $s0, 4 -/* 9C7560 80242180 0C0B1EAF */ jal get_variable -/* 9C7564 80242184 0220202D */ daddu $a0, $s1, $zero -/* 9C7568 80242188 AE220090 */ sw $v0, 0x90($s1) -/* 9C756C 8024218C 8E050000 */ lw $a1, ($s0) -/* 9C7570 80242190 26100004 */ addiu $s0, $s0, 4 -/* 9C7574 80242194 0C0B1EAF */ jal get_variable -/* 9C7578 80242198 0220202D */ daddu $a0, $s1, $zero -/* 9C757C 8024219C AE220094 */ sw $v0, 0x94($s1) -/* 9C7580 802421A0 8E050000 */ lw $a1, ($s0) -/* 9C7584 802421A4 26100004 */ addiu $s0, $s0, 4 -/* 9C7588 802421A8 0C0B1EAF */ jal get_variable -/* 9C758C 802421AC 0220202D */ daddu $a0, $s1, $zero -/* 9C7590 802421B0 AE220098 */ sw $v0, 0x98($s1) -/* 9C7594 802421B4 8E050000 */ lw $a1, ($s0) -/* 9C7598 802421B8 26100004 */ addiu $s0, $s0, 4 -/* 9C759C 802421BC 0C0B1EAF */ jal get_variable -/* 9C75A0 802421C0 0220202D */ daddu $a0, $s1, $zero -/* 9C75A4 802421C4 AE22009C */ sw $v0, 0x9c($s1) -/* 9C75A8 802421C8 8E050000 */ lw $a1, ($s0) -/* 9C75AC 802421CC 26100004 */ addiu $s0, $s0, 4 -/* 9C75B0 802421D0 0C0B1EAF */ jal get_variable -/* 9C75B4 802421D4 0220202D */ daddu $a0, $s1, $zero -/* 9C75B8 802421D8 AE2200A0 */ sw $v0, 0xa0($s1) -/* 9C75BC 802421DC 8E050000 */ lw $a1, ($s0) -/* 9C75C0 802421E0 26100004 */ addiu $s0, $s0, 4 -/* 9C75C4 802421E4 0C0B1EAF */ jal get_variable -/* 9C75C8 802421E8 0220202D */ daddu $a0, $s1, $zero -/* 9C75CC 802421EC AE2200A4 */ sw $v0, 0xa4($s1) -/* 9C75D0 802421F0 8E050000 */ lw $a1, ($s0) -/* 9C75D4 802421F4 26100004 */ addiu $s0, $s0, 4 -/* 9C75D8 802421F8 0C0B1EAF */ jal get_variable -/* 9C75DC 802421FC 0220202D */ daddu $a0, $s1, $zero -/* 9C75E0 80242200 AE2200A8 */ sw $v0, 0xa8($s1) -/* 9C75E4 80242204 8E050000 */ lw $a1, ($s0) -/* 9C75E8 80242208 26100004 */ addiu $s0, $s0, 4 -/* 9C75EC 8024220C 0C0B1EAF */ jal get_variable -/* 9C75F0 80242210 0220202D */ daddu $a0, $s1, $zero -/* 9C75F4 80242214 AE2200AC */ sw $v0, 0xac($s1) -/* 9C75F8 80242218 8E050000 */ lw $a1, ($s0) -/* 9C75FC 8024221C 0C0B1EAF */ jal get_variable -/* 9C7600 80242220 0220202D */ daddu $a0, $s1, $zero -/* 9C7604 80242224 AE2200B0 */ sw $v0, 0xb0($s1) -/* 9C7608 80242228 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C760C 8024222C 8FB10014 */ lw $s1, 0x14($sp) -/* 9C7610 80242230 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7614 80242234 24020002 */ addiu $v0, $zero, 2 -/* 9C7618 80242238 03E00008 */ jr $ra -/* 9C761C 8024223C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242150_9C7530.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242150_9C7530.s new file mode 100644 index 0000000000..f07f774a3a --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242150_9C7530.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242150_9C7530 +/* 9C7530 80242150 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9C7534 80242154 AFB10014 */ sw $s1, 0x14($sp) +/* 9C7538 80242158 0080882D */ daddu $s1, $a0, $zero +/* 9C753C 8024215C AFBF0018 */ sw $ra, 0x18($sp) +/* 9C7540 80242160 AFB00010 */ sw $s0, 0x10($sp) +/* 9C7544 80242164 8E30000C */ lw $s0, 0xc($s1) +/* 9C7548 80242168 8E050000 */ lw $a1, ($s0) +/* 9C754C 8024216C 0C0B1EAF */ jal get_variable +/* 9C7550 80242170 26100004 */ addiu $s0, $s0, 4 +/* 9C7554 80242174 AE22008C */ sw $v0, 0x8c($s1) +/* 9C7558 80242178 8E050000 */ lw $a1, ($s0) +/* 9C755C 8024217C 26100004 */ addiu $s0, $s0, 4 +/* 9C7560 80242180 0C0B1EAF */ jal get_variable +/* 9C7564 80242184 0220202D */ daddu $a0, $s1, $zero +/* 9C7568 80242188 AE220090 */ sw $v0, 0x90($s1) +/* 9C756C 8024218C 8E050000 */ lw $a1, ($s0) +/* 9C7570 80242190 26100004 */ addiu $s0, $s0, 4 +/* 9C7574 80242194 0C0B1EAF */ jal get_variable +/* 9C7578 80242198 0220202D */ daddu $a0, $s1, $zero +/* 9C757C 8024219C AE220094 */ sw $v0, 0x94($s1) +/* 9C7580 802421A0 8E050000 */ lw $a1, ($s0) +/* 9C7584 802421A4 26100004 */ addiu $s0, $s0, 4 +/* 9C7588 802421A8 0C0B1EAF */ jal get_variable +/* 9C758C 802421AC 0220202D */ daddu $a0, $s1, $zero +/* 9C7590 802421B0 AE220098 */ sw $v0, 0x98($s1) +/* 9C7594 802421B4 8E050000 */ lw $a1, ($s0) +/* 9C7598 802421B8 26100004 */ addiu $s0, $s0, 4 +/* 9C759C 802421BC 0C0B1EAF */ jal get_variable +/* 9C75A0 802421C0 0220202D */ daddu $a0, $s1, $zero +/* 9C75A4 802421C4 AE22009C */ sw $v0, 0x9c($s1) +/* 9C75A8 802421C8 8E050000 */ lw $a1, ($s0) +/* 9C75AC 802421CC 26100004 */ addiu $s0, $s0, 4 +/* 9C75B0 802421D0 0C0B1EAF */ jal get_variable +/* 9C75B4 802421D4 0220202D */ daddu $a0, $s1, $zero +/* 9C75B8 802421D8 AE2200A0 */ sw $v0, 0xa0($s1) +/* 9C75BC 802421DC 8E050000 */ lw $a1, ($s0) +/* 9C75C0 802421E0 26100004 */ addiu $s0, $s0, 4 +/* 9C75C4 802421E4 0C0B1EAF */ jal get_variable +/* 9C75C8 802421E8 0220202D */ daddu $a0, $s1, $zero +/* 9C75CC 802421EC AE2200A4 */ sw $v0, 0xa4($s1) +/* 9C75D0 802421F0 8E050000 */ lw $a1, ($s0) +/* 9C75D4 802421F4 26100004 */ addiu $s0, $s0, 4 +/* 9C75D8 802421F8 0C0B1EAF */ jal get_variable +/* 9C75DC 802421FC 0220202D */ daddu $a0, $s1, $zero +/* 9C75E0 80242200 AE2200A8 */ sw $v0, 0xa8($s1) +/* 9C75E4 80242204 8E050000 */ lw $a1, ($s0) +/* 9C75E8 80242208 26100004 */ addiu $s0, $s0, 4 +/* 9C75EC 8024220C 0C0B1EAF */ jal get_variable +/* 9C75F0 80242210 0220202D */ daddu $a0, $s1, $zero +/* 9C75F4 80242214 AE2200AC */ sw $v0, 0xac($s1) +/* 9C75F8 80242218 8E050000 */ lw $a1, ($s0) +/* 9C75FC 8024221C 0C0B1EAF */ jal get_variable +/* 9C7600 80242220 0220202D */ daddu $a0, $s1, $zero +/* 9C7604 80242224 AE2200B0 */ sw $v0, 0xb0($s1) +/* 9C7608 80242228 8FBF0018 */ lw $ra, 0x18($sp) +/* 9C760C 8024222C 8FB10014 */ lw $s1, 0x14($sp) +/* 9C7610 80242230 8FB00010 */ lw $s0, 0x10($sp) +/* 9C7614 80242234 24020002 */ addiu $v0, $zero, 2 +/* 9C7618 80242238 03E00008 */ jr $ra +/* 9C761C 8024223C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240.s deleted file mode 100644 index ea9602ce94..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242240 -/* 9C7620 80242240 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C7624 80242244 AFB1001C */ sw $s1, 0x1c($sp) -/* 9C7628 80242248 0080882D */ daddu $s1, $a0, $zero -/* 9C762C 8024224C AFBF0034 */ sw $ra, 0x34($sp) -/* 9C7630 80242250 AFB60030 */ sw $s6, 0x30($sp) -/* 9C7634 80242254 AFB5002C */ sw $s5, 0x2c($sp) -/* 9C7638 80242258 AFB40028 */ sw $s4, 0x28($sp) -/* 9C763C 8024225C AFB30024 */ sw $s3, 0x24($sp) -/* 9C7640 80242260 AFB20020 */ sw $s2, 0x20($sp) -/* 9C7644 80242264 AFB00018 */ sw $s0, 0x18($sp) -/* 9C7648 80242268 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9C764C 8024226C F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9C7650 80242270 8E30000C */ lw $s0, 0xc($s1) -/* 9C7654 80242274 8E160000 */ lw $s6, ($s0) -/* 9C7658 80242278 26100004 */ addiu $s0, $s0, 4 -/* 9C765C 8024227C 0C0B1EAF */ jal get_variable -/* 9C7660 80242280 02C0282D */ daddu $a1, $s6, $zero -/* 9C7664 80242284 44820000 */ mtc1 $v0, $f0 -/* 9C7668 80242288 00000000 */ nop -/* 9C766C 8024228C 46800020 */ cvt.s.w $f0, $f0 -/* 9C7670 80242290 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9C7674 80242294 8E140000 */ lw $s4, ($s0) -/* 9C7678 80242298 26100004 */ addiu $s0, $s0, 4 -/* 9C767C 8024229C 0220202D */ daddu $a0, $s1, $zero -/* 9C7680 802422A0 0C0B1EAF */ jal get_variable -/* 9C7684 802422A4 0280282D */ daddu $a1, $s4, $zero -/* 9C7688 802422A8 0220202D */ daddu $a0, $s1, $zero -/* 9C768C 802422AC 8E150000 */ lw $s5, ($s0) -/* 9C7690 802422B0 4482B000 */ mtc1 $v0, $f22 -/* 9C7694 802422B4 00000000 */ nop -/* 9C7698 802422B8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9C769C 802422BC 0C0B1EAF */ jal get_variable -/* 9C76A0 802422C0 02A0282D */ daddu $a1, $s5, $zero -/* 9C76A4 802422C4 2404FFFC */ addiu $a0, $zero, -4 -/* 9C76A8 802422C8 44820000 */ mtc1 $v0, $f0 -/* 9C76AC 802422CC 00000000 */ nop -/* 9C76B0 802422D0 46800020 */ cvt.s.w $f0, $f0 -/* 9C76B4 802422D4 0C00EABB */ jal get_npc_unsafe -/* 9C76B8 802422D8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9C76BC 802422DC 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 9C76C0 802422E0 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 9C76C4 802422E4 3C014334 */ lui $at, 0x4334 -/* 9C76C8 802422E8 44816000 */ mtc1 $at, $f12 -/* 9C76CC 802422EC 00041880 */ sll $v1, $a0, 2 -/* 9C76D0 802422F0 00641821 */ addu $v1, $v1, $a0 -/* 9C76D4 802422F4 00031880 */ sll $v1, $v1, 2 -/* 9C76D8 802422F8 00641823 */ subu $v1, $v1, $a0 -/* 9C76DC 802422FC 000320C0 */ sll $a0, $v1, 3 -/* 9C76E0 80242300 00641821 */ addu $v1, $v1, $a0 -/* 9C76E4 80242304 000318C0 */ sll $v1, $v1, 3 -/* 9C76E8 80242308 3C01800B */ lui $at, 0x800b -/* 9C76EC 8024230C 00230821 */ addu $at, $at, $v1 -/* 9C76F0 80242310 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9C76F4 80242314 460C0300 */ add.s $f12, $f0, $f12 -/* 9C76F8 80242318 0C00A6C9 */ jal clamp_angle -/* 9C76FC 8024231C 0040982D */ daddu $s3, $v0, $zero -/* 9C7700 80242320 27B00010 */ addiu $s0, $sp, 0x10 -/* 9C7704 80242324 0200202D */ daddu $a0, $s0, $zero -/* 9C7708 80242328 27B20014 */ addiu $s2, $sp, 0x14 -/* 9C770C 8024232C 0240282D */ daddu $a1, $s2, $zero -/* 9C7710 80242330 3C064170 */ lui $a2, 0x4170 -/* 9C7714 80242334 8E67000C */ lw $a3, 0xc($s3) -/* 9C7718 80242338 0C00A7E7 */ jal add_vec2D_polar -/* 9C771C 8024233C 46000506 */ mov.s $f20, $f0 -/* 9C7720 80242340 0200202D */ daddu $a0, $s0, $zero -/* 9C7724 80242344 3C064120 */ lui $a2, 0x4120 -/* 9C7728 80242348 4407A000 */ mfc1 $a3, $f20 -/* 9C772C 8024234C 0C00A7E7 */ jal add_vec2D_polar -/* 9C7730 80242350 0240282D */ daddu $a1, $s2, $zero -/* 9C7734 80242354 0220202D */ daddu $a0, $s1, $zero -/* 9C7738 80242358 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 9C773C 8024235C 4600008D */ trunc.w.s $f2, $f0 -/* 9C7740 80242360 44061000 */ mfc1 $a2, $f2 -/* 9C7744 80242364 0C0B2026 */ jal set_variable -/* 9C7748 80242368 02C0282D */ daddu $a1, $s6, $zero -/* 9C774C 8024236C 0220202D */ daddu $a0, $s1, $zero -/* 9C7750 80242370 4600B08D */ trunc.w.s $f2, $f22 -/* 9C7754 80242374 44061000 */ mfc1 $a2, $f2 -/* 9C7758 80242378 0C0B2026 */ jal set_variable -/* 9C775C 8024237C 0280282D */ daddu $a1, $s4, $zero -/* 9C7760 80242380 0220202D */ daddu $a0, $s1, $zero -/* 9C7764 80242384 C7A00014 */ lwc1 $f0, 0x14($sp) -/* 9C7768 80242388 4600008D */ trunc.w.s $f2, $f0 -/* 9C776C 8024238C 44061000 */ mfc1 $a2, $f2 -/* 9C7770 80242390 0C0B2026 */ jal set_variable -/* 9C7774 80242394 02A0282D */ daddu $a1, $s5, $zero -/* 9C7778 80242398 8FBF0034 */ lw $ra, 0x34($sp) -/* 9C777C 8024239C 8FB60030 */ lw $s6, 0x30($sp) -/* 9C7780 802423A0 8FB5002C */ lw $s5, 0x2c($sp) -/* 9C7784 802423A4 8FB40028 */ lw $s4, 0x28($sp) -/* 9C7788 802423A8 8FB30024 */ lw $s3, 0x24($sp) -/* 9C778C 802423AC 8FB20020 */ lw $s2, 0x20($sp) -/* 9C7790 802423B0 8FB1001C */ lw $s1, 0x1c($sp) -/* 9C7794 802423B4 8FB00018 */ lw $s0, 0x18($sp) -/* 9C7798 802423B8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9C779C 802423BC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9C77A0 802423C0 24020002 */ addiu $v0, $zero, 2 -/* 9C77A4 802423C4 03E00008 */ jr $ra -/* 9C77A8 802423C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240_9C7620.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240_9C7620.s new file mode 100644 index 0000000000..be67427f77 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242240_9C7620.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242240_9C7620 +/* 9C7620 80242240 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9C7624 80242244 AFB1001C */ sw $s1, 0x1c($sp) +/* 9C7628 80242248 0080882D */ daddu $s1, $a0, $zero +/* 9C762C 8024224C AFBF0034 */ sw $ra, 0x34($sp) +/* 9C7630 80242250 AFB60030 */ sw $s6, 0x30($sp) +/* 9C7634 80242254 AFB5002C */ sw $s5, 0x2c($sp) +/* 9C7638 80242258 AFB40028 */ sw $s4, 0x28($sp) +/* 9C763C 8024225C AFB30024 */ sw $s3, 0x24($sp) +/* 9C7640 80242260 AFB20020 */ sw $s2, 0x20($sp) +/* 9C7644 80242264 AFB00018 */ sw $s0, 0x18($sp) +/* 9C7648 80242268 F7B60040 */ sdc1 $f22, 0x40($sp) +/* 9C764C 8024226C F7B40038 */ sdc1 $f20, 0x38($sp) +/* 9C7650 80242270 8E30000C */ lw $s0, 0xc($s1) +/* 9C7654 80242274 8E160000 */ lw $s6, ($s0) +/* 9C7658 80242278 26100004 */ addiu $s0, $s0, 4 +/* 9C765C 8024227C 0C0B1EAF */ jal get_variable +/* 9C7660 80242280 02C0282D */ daddu $a1, $s6, $zero +/* 9C7664 80242284 44820000 */ mtc1 $v0, $f0 +/* 9C7668 80242288 00000000 */ nop +/* 9C766C 8024228C 46800020 */ cvt.s.w $f0, $f0 +/* 9C7670 80242290 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9C7674 80242294 8E140000 */ lw $s4, ($s0) +/* 9C7678 80242298 26100004 */ addiu $s0, $s0, 4 +/* 9C767C 8024229C 0220202D */ daddu $a0, $s1, $zero +/* 9C7680 802422A0 0C0B1EAF */ jal get_variable +/* 9C7684 802422A4 0280282D */ daddu $a1, $s4, $zero +/* 9C7688 802422A8 0220202D */ daddu $a0, $s1, $zero +/* 9C768C 802422AC 8E150000 */ lw $s5, ($s0) +/* 9C7690 802422B0 4482B000 */ mtc1 $v0, $f22 +/* 9C7694 802422B4 00000000 */ nop +/* 9C7698 802422B8 4680B5A0 */ cvt.s.w $f22, $f22 +/* 9C769C 802422BC 0C0B1EAF */ jal get_variable +/* 9C76A0 802422C0 02A0282D */ daddu $a1, $s5, $zero +/* 9C76A4 802422C4 2404FFFC */ addiu $a0, $zero, -4 +/* 9C76A8 802422C8 44820000 */ mtc1 $v0, $f0 +/* 9C76AC 802422CC 00000000 */ nop +/* 9C76B0 802422D0 46800020 */ cvt.s.w $f0, $f0 +/* 9C76B4 802422D4 0C00EABB */ jal get_npc_unsafe +/* 9C76B8 802422D8 E7A00014 */ swc1 $f0, 0x14($sp) +/* 9C76BC 802422DC 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 9C76C0 802422E0 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 9C76C4 802422E4 3C014334 */ lui $at, 0x4334 +/* 9C76C8 802422E8 44816000 */ mtc1 $at, $f12 +/* 9C76CC 802422EC 00041880 */ sll $v1, $a0, 2 +/* 9C76D0 802422F0 00641821 */ addu $v1, $v1, $a0 +/* 9C76D4 802422F4 00031880 */ sll $v1, $v1, 2 +/* 9C76D8 802422F8 00641823 */ subu $v1, $v1, $a0 +/* 9C76DC 802422FC 000320C0 */ sll $a0, $v1, 3 +/* 9C76E0 80242300 00641821 */ addu $v1, $v1, $a0 +/* 9C76E4 80242304 000318C0 */ sll $v1, $v1, 3 +/* 9C76E8 80242308 3C01800B */ lui $at, 0x800b +/* 9C76EC 8024230C 00230821 */ addu $at, $at, $v1 +/* 9C76F0 80242310 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 9C76F4 80242314 460C0300 */ add.s $f12, $f0, $f12 +/* 9C76F8 80242318 0C00A6C9 */ jal clamp_angle +/* 9C76FC 8024231C 0040982D */ daddu $s3, $v0, $zero +/* 9C7700 80242320 27B00010 */ addiu $s0, $sp, 0x10 +/* 9C7704 80242324 0200202D */ daddu $a0, $s0, $zero +/* 9C7708 80242328 27B20014 */ addiu $s2, $sp, 0x14 +/* 9C770C 8024232C 0240282D */ daddu $a1, $s2, $zero +/* 9C7710 80242330 3C064170 */ lui $a2, 0x4170 +/* 9C7714 80242334 8E67000C */ lw $a3, 0xc($s3) +/* 9C7718 80242338 0C00A7E7 */ jal add_vec2D_polar +/* 9C771C 8024233C 46000506 */ mov.s $f20, $f0 +/* 9C7720 80242340 0200202D */ daddu $a0, $s0, $zero +/* 9C7724 80242344 3C064120 */ lui $a2, 0x4120 +/* 9C7728 80242348 4407A000 */ mfc1 $a3, $f20 +/* 9C772C 8024234C 0C00A7E7 */ jal add_vec2D_polar +/* 9C7730 80242350 0240282D */ daddu $a1, $s2, $zero +/* 9C7734 80242354 0220202D */ daddu $a0, $s1, $zero +/* 9C7738 80242358 C7A00010 */ lwc1 $f0, 0x10($sp) +/* 9C773C 8024235C 4600008D */ trunc.w.s $f2, $f0 +/* 9C7740 80242360 44061000 */ mfc1 $a2, $f2 +/* 9C7744 80242364 0C0B2026 */ jal set_variable +/* 9C7748 80242368 02C0282D */ daddu $a1, $s6, $zero +/* 9C774C 8024236C 0220202D */ daddu $a0, $s1, $zero +/* 9C7750 80242370 4600B08D */ trunc.w.s $f2, $f22 +/* 9C7754 80242374 44061000 */ mfc1 $a2, $f2 +/* 9C7758 80242378 0C0B2026 */ jal set_variable +/* 9C775C 8024237C 0280282D */ daddu $a1, $s4, $zero +/* 9C7760 80242380 0220202D */ daddu $a0, $s1, $zero +/* 9C7764 80242384 C7A00014 */ lwc1 $f0, 0x14($sp) +/* 9C7768 80242388 4600008D */ trunc.w.s $f2, $f0 +/* 9C776C 8024238C 44061000 */ mfc1 $a2, $f2 +/* 9C7770 80242390 0C0B2026 */ jal set_variable +/* 9C7774 80242394 02A0282D */ daddu $a1, $s5, $zero +/* 9C7778 80242398 8FBF0034 */ lw $ra, 0x34($sp) +/* 9C777C 8024239C 8FB60030 */ lw $s6, 0x30($sp) +/* 9C7780 802423A0 8FB5002C */ lw $s5, 0x2c($sp) +/* 9C7784 802423A4 8FB40028 */ lw $s4, 0x28($sp) +/* 9C7788 802423A8 8FB30024 */ lw $s3, 0x24($sp) +/* 9C778C 802423AC 8FB20020 */ lw $s2, 0x20($sp) +/* 9C7790 802423B0 8FB1001C */ lw $s1, 0x1c($sp) +/* 9C7794 802423B4 8FB00018 */ lw $s0, 0x18($sp) +/* 9C7798 802423B8 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 9C779C 802423BC D7B40038 */ ldc1 $f20, 0x38($sp) +/* 9C77A0 802423C0 24020002 */ addiu $v0, $zero, 2 +/* 9C77A4 802423C4 03E00008 */ jr $ra +/* 9C77A8 802423C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC.s deleted file mode 100644 index 614176aff5..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423CC -/* 9C77AC 802423CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C77B0 802423D0 AFB00010 */ sw $s0, 0x10($sp) -/* 9C77B4 802423D4 0080802D */ daddu $s0, $a0, $zero -/* 9C77B8 802423D8 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C77BC 802423DC 0C00EABB */ jal get_npc_unsafe -/* 9C77C0 802423E0 8E04008C */ lw $a0, 0x8c($s0) -/* 9C77C4 802423E4 0040282D */ daddu $a1, $v0, $zero -/* 9C77C8 802423E8 8E040094 */ lw $a0, 0x94($s0) -/* 9C77CC 802423EC 8CA30028 */ lw $v1, 0x28($a1) -/* 9C77D0 802423F0 ACA40028 */ sw $a0, 0x28($a1) -/* 9C77D4 802423F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C77D8 802423F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9C77DC 802423FC 24020002 */ addiu $v0, $zero, 2 -/* 9C77E0 80242400 3C018025 */ lui $at, 0x8025 -/* 9C77E4 80242404 AC231E34 */ sw $v1, 0x1e34($at) -/* 9C77E8 80242408 03E00008 */ jr $ra -/* 9C77EC 8024240C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s new file mode 100644 index 0000000000..c920a609cc --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802423CC_9C77AC.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423CC_9C77AC +/* 9C77AC 802423CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C77B0 802423D0 AFB00010 */ sw $s0, 0x10($sp) +/* 9C77B4 802423D4 0080802D */ daddu $s0, $a0, $zero +/* 9C77B8 802423D8 AFBF0014 */ sw $ra, 0x14($sp) +/* 9C77BC 802423DC 0C00EABB */ jal get_npc_unsafe +/* 9C77C0 802423E0 8E04008C */ lw $a0, 0x8c($s0) +/* 9C77C4 802423E4 0040282D */ daddu $a1, $v0, $zero +/* 9C77C8 802423E8 8E040094 */ lw $a0, 0x94($s0) +/* 9C77CC 802423EC 8CA30028 */ lw $v1, 0x28($a1) +/* 9C77D0 802423F0 ACA40028 */ sw $a0, 0x28($a1) +/* 9C77D4 802423F4 8FBF0014 */ lw $ra, 0x14($sp) +/* 9C77D8 802423F8 8FB00010 */ lw $s0, 0x10($sp) +/* 9C77DC 802423FC 24020002 */ addiu $v0, $zero, 2 +/* 9C77E0 80242400 3C018025 */ lui $at, 0x8025 +/* 9C77E4 80242404 AC231E34 */ sw $v1, 0x1e34($at) +/* 9C77E8 80242408 03E00008 */ jr $ra +/* 9C77EC 8024240C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C.s deleted file mode 100644 index c21d6a4116..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024243C -/* 9C781C 8024243C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C7820 80242440 AFB10014 */ sw $s1, 0x14($sp) -/* 9C7824 80242444 0080882D */ daddu $s1, $a0, $zero -/* 9C7828 80242448 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C782C 8024244C AFB00010 */ sw $s0, 0x10($sp) -/* 9C7830 80242450 8E30000C */ lw $s0, 0xc($s1) -/* 9C7834 80242454 8E050000 */ lw $a1, ($s0) -/* 9C7838 80242458 0C0B1EAF */ jal get_variable -/* 9C783C 8024245C 26100004 */ addiu $s0, $s0, 4 -/* 9C7840 80242460 8E100000 */ lw $s0, ($s0) -/* 9C7844 80242464 0C00EAD2 */ jal get_npc_safe -/* 9C7848 80242468 0040202D */ daddu $a0, $v0, $zero -/* 9C784C 8024246C 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 9C7850 80242470 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 9C7854 80242474 C440000C */ lwc1 $f0, 0xc($v0) -/* 9C7858 80242478 3C014334 */ lui $at, 0x4334 -/* 9C785C 8024247C 44811000 */ mtc1 $at, $f2 -/* 9C7860 80242480 00041880 */ sll $v1, $a0, 2 -/* 9C7864 80242484 00641821 */ addu $v1, $v1, $a0 -/* 9C7868 80242488 00031880 */ sll $v1, $v1, 2 -/* 9C786C 8024248C 00641823 */ subu $v1, $v1, $a0 -/* 9C7870 80242490 000320C0 */ sll $a0, $v1, 3 -/* 9C7874 80242494 00641821 */ addu $v1, $v1, $a0 -/* 9C7878 80242498 000318C0 */ sll $v1, $v1, 3 -/* 9C787C 8024249C 46020000 */ add.s $f0, $f0, $f2 -/* 9C7880 802424A0 3C01800B */ lui $at, 0x800b -/* 9C7884 802424A4 00230821 */ addu $at, $at, $v1 -/* 9C7888 802424A8 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* 9C788C 802424AC 0C00A6C9 */ jal clamp_angle -/* 9C7890 802424B0 460C0301 */ sub.s $f12, $f0, $f12 -/* 9C7894 802424B4 3C014387 */ lui $at, 0x4387 -/* 9C7898 802424B8 44811000 */ mtc1 $at, $f2 -/* 9C789C 802424BC 46000106 */ mov.s $f4, $f0 -/* 9C78A0 802424C0 4604103C */ c.lt.s $f2, $f4 -/* 9C78A4 802424C4 00000000 */ nop -/* 9C78A8 802424C8 45010008 */ bc1t .L802424EC -/* 9C78AC 802424CC 0000302D */ daddu $a2, $zero, $zero -/* 9C78B0 802424D0 3C0142B4 */ lui $at, 0x42b4 -/* 9C78B4 802424D4 44810000 */ mtc1 $at, $f0 -/* 9C78B8 802424D8 00000000 */ nop -/* 9C78BC 802424DC 4600203C */ c.lt.s $f4, $f0 -/* 9C78C0 802424E0 00000000 */ nop -/* 9C78C4 802424E4 45000003 */ bc1f .L802424F4 -/* 9C78C8 802424E8 0220202D */ daddu $a0, $s1, $zero -.L802424EC: -/* 9C78CC 802424EC 24060001 */ addiu $a2, $zero, 1 -/* 9C78D0 802424F0 0220202D */ daddu $a0, $s1, $zero -.L802424F4: -/* 9C78D4 802424F4 0C0B2026 */ jal set_variable -/* 9C78D8 802424F8 0200282D */ daddu $a1, $s0, $zero -/* 9C78DC 802424FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C78E0 80242500 8FB10014 */ lw $s1, 0x14($sp) -/* 9C78E4 80242504 8FB00010 */ lw $s0, 0x10($sp) -/* 9C78E8 80242508 24020002 */ addiu $v0, $zero, 2 -/* 9C78EC 8024250C 03E00008 */ jr $ra -/* 9C78F0 80242510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s new file mode 100644 index 0000000000..0b3a11c95d --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_8024243C_9C781C.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024243C_9C781C +/* 9C781C 8024243C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9C7820 80242440 AFB10014 */ sw $s1, 0x14($sp) +/* 9C7824 80242444 0080882D */ daddu $s1, $a0, $zero +/* 9C7828 80242448 AFBF0018 */ sw $ra, 0x18($sp) +/* 9C782C 8024244C AFB00010 */ sw $s0, 0x10($sp) +/* 9C7830 80242450 8E30000C */ lw $s0, 0xc($s1) +/* 9C7834 80242454 8E050000 */ lw $a1, ($s0) +/* 9C7838 80242458 0C0B1EAF */ jal get_variable +/* 9C783C 8024245C 26100004 */ addiu $s0, $s0, 4 +/* 9C7840 80242460 8E100000 */ lw $s0, ($s0) +/* 9C7844 80242464 0C00EAD2 */ jal get_npc_safe +/* 9C7848 80242468 0040202D */ daddu $a0, $v0, $zero +/* 9C784C 8024246C 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 9C7850 80242470 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 9C7854 80242474 C440000C */ lwc1 $f0, 0xc($v0) +/* 9C7858 80242478 3C014334 */ lui $at, 0x4334 +/* 9C785C 8024247C 44811000 */ mtc1 $at, $f2 +/* 9C7860 80242480 00041880 */ sll $v1, $a0, 2 +/* 9C7864 80242484 00641821 */ addu $v1, $v1, $a0 +/* 9C7868 80242488 00031880 */ sll $v1, $v1, 2 +/* 9C786C 8024248C 00641823 */ subu $v1, $v1, $a0 +/* 9C7870 80242490 000320C0 */ sll $a0, $v1, 3 +/* 9C7874 80242494 00641821 */ addu $v1, $v1, $a0 +/* 9C7878 80242498 000318C0 */ sll $v1, $v1, 3 +/* 9C787C 8024249C 46020000 */ add.s $f0, $f0, $f2 +/* 9C7880 802424A0 3C01800B */ lui $at, 0x800b +/* 9C7884 802424A4 00230821 */ addu $at, $at, $v1 +/* 9C7888 802424A8 C42C1DEC */ lwc1 $f12, 0x1dec($at) +/* 9C788C 802424AC 0C00A6C9 */ jal clamp_angle +/* 9C7890 802424B0 460C0301 */ sub.s $f12, $f0, $f12 +/* 9C7894 802424B4 3C014387 */ lui $at, 0x4387 +/* 9C7898 802424B8 44811000 */ mtc1 $at, $f2 +/* 9C789C 802424BC 46000106 */ mov.s $f4, $f0 +/* 9C78A0 802424C0 4604103C */ c.lt.s $f2, $f4 +/* 9C78A4 802424C4 00000000 */ nop +/* 9C78A8 802424C8 45010008 */ bc1t .L802424EC +/* 9C78AC 802424CC 0000302D */ daddu $a2, $zero, $zero +/* 9C78B0 802424D0 3C0142B4 */ lui $at, 0x42b4 +/* 9C78B4 802424D4 44810000 */ mtc1 $at, $f0 +/* 9C78B8 802424D8 00000000 */ nop +/* 9C78BC 802424DC 4600203C */ c.lt.s $f4, $f0 +/* 9C78C0 802424E0 00000000 */ nop +/* 9C78C4 802424E4 45000003 */ bc1f .L802424F4 +/* 9C78C8 802424E8 0220202D */ daddu $a0, $s1, $zero +.L802424EC: +/* 9C78CC 802424EC 24060001 */ addiu $a2, $zero, 1 +/* 9C78D0 802424F0 0220202D */ daddu $a0, $s1, $zero +.L802424F4: +/* 9C78D4 802424F4 0C0B2026 */ jal set_variable +/* 9C78D8 802424F8 0200282D */ daddu $a1, $s0, $zero +/* 9C78DC 802424FC 8FBF0018 */ lw $ra, 0x18($sp) +/* 9C78E0 80242500 8FB10014 */ lw $s1, 0x14($sp) +/* 9C78E4 80242504 8FB00010 */ lw $s0, 0x10($sp) +/* 9C78E8 80242508 24020002 */ addiu $v0, $zero, 2 +/* 9C78EC 8024250C 03E00008 */ jr $ra +/* 9C78F0 80242510 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4.s deleted file mode 100644 index ad01ff8aa3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426A4 -/* 9C7A84 802426A4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9C7A88 802426A8 AFB10014 */ sw $s1, 0x14($sp) -/* 9C7A8C 802426AC 0080882D */ daddu $s1, $a0, $zero -/* 9C7A90 802426B0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C7A94 802426B4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7A98 802426B8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 9C7A9C 802426BC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9C7AA0 802426C0 8E30000C */ lw $s0, 0xc($s1) -/* 9C7AA4 802426C4 8E050000 */ lw $a1, ($s0) -/* 9C7AA8 802426C8 0C0B1EAF */ jal get_variable -/* 9C7AAC 802426CC 26100004 */ addiu $s0, $s0, 4 -/* 9C7AB0 802426D0 8E050000 */ lw $a1, ($s0) -/* 9C7AB4 802426D4 26100004 */ addiu $s0, $s0, 4 -/* 9C7AB8 802426D8 4482B000 */ mtc1 $v0, $f22 -/* 9C7ABC 802426DC 00000000 */ nop -/* 9C7AC0 802426E0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9C7AC4 802426E4 0C0B1EAF */ jal get_variable -/* 9C7AC8 802426E8 0220202D */ daddu $a0, $s1, $zero -/* 9C7ACC 802426EC 8E050000 */ lw $a1, ($s0) -/* 9C7AD0 802426F0 4482A000 */ mtc1 $v0, $f20 -/* 9C7AD4 802426F4 00000000 */ nop -/* 9C7AD8 802426F8 4680A520 */ cvt.s.w $f20, $f20 -/* 9C7ADC 802426FC 0C0B1EAF */ jal get_variable -/* 9C7AE0 80242700 0220202D */ daddu $a0, $s1, $zero -/* 9C7AE4 80242704 3C014170 */ lui $at, 0x4170 -/* 9C7AE8 80242708 44810000 */ mtc1 $at, $f0 -/* 9C7AEC 8024270C 44821000 */ mtc1 $v0, $f2 -/* 9C7AF0 80242710 00000000 */ nop -/* 9C7AF4 80242714 468010A0 */ cvt.s.w $f2, $f2 -/* 9C7AF8 80242718 4600A500 */ add.s $f20, $f20, $f0 -/* 9C7AFC 8024271C 4405B000 */ mfc1 $a1, $f22 -/* 9C7B00 80242720 44071000 */ mfc1 $a3, $f2 -/* 9C7B04 80242724 4406A000 */ mfc1 $a2, $f20 -/* 9C7B08 80242728 0C01C07C */ jal func_800701F0 -/* 9C7B0C 8024272C 0000202D */ daddu $a0, $zero, $zero -/* 9C7B10 80242730 0000202D */ daddu $a0, $zero, $zero -/* 9C7B14 80242734 0080282D */ daddu $a1, $a0, $zero -/* 9C7B18 80242738 0C0B2D5B */ jal exec_ShakeCam1 -/* 9C7B1C 8024273C 24060014 */ addiu $a2, $zero, 0x14 -/* 9C7B20 80242740 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C7B24 80242744 8FB10014 */ lw $s1, 0x14($sp) -/* 9C7B28 80242748 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7B2C 8024274C D7B60028 */ ldc1 $f22, 0x28($sp) -/* 9C7B30 80242750 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9C7B34 80242754 24020002 */ addiu $v0, $zero, 2 -/* 9C7B38 80242758 03E00008 */ jr $ra -/* 9C7B3C 8024275C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s new file mode 100644 index 0000000000..880660521c --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802426A4_9C7A84.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426A4_9C7A84 +/* 9C7A84 802426A4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9C7A88 802426A8 AFB10014 */ sw $s1, 0x14($sp) +/* 9C7A8C 802426AC 0080882D */ daddu $s1, $a0, $zero +/* 9C7A90 802426B0 AFBF0018 */ sw $ra, 0x18($sp) +/* 9C7A94 802426B4 AFB00010 */ sw $s0, 0x10($sp) +/* 9C7A98 802426B8 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 9C7A9C 802426BC F7B40020 */ sdc1 $f20, 0x20($sp) +/* 9C7AA0 802426C0 8E30000C */ lw $s0, 0xc($s1) +/* 9C7AA4 802426C4 8E050000 */ lw $a1, ($s0) +/* 9C7AA8 802426C8 0C0B1EAF */ jal get_variable +/* 9C7AAC 802426CC 26100004 */ addiu $s0, $s0, 4 +/* 9C7AB0 802426D0 8E050000 */ lw $a1, ($s0) +/* 9C7AB4 802426D4 26100004 */ addiu $s0, $s0, 4 +/* 9C7AB8 802426D8 4482B000 */ mtc1 $v0, $f22 +/* 9C7ABC 802426DC 00000000 */ nop +/* 9C7AC0 802426E0 4680B5A0 */ cvt.s.w $f22, $f22 +/* 9C7AC4 802426E4 0C0B1EAF */ jal get_variable +/* 9C7AC8 802426E8 0220202D */ daddu $a0, $s1, $zero +/* 9C7ACC 802426EC 8E050000 */ lw $a1, ($s0) +/* 9C7AD0 802426F0 4482A000 */ mtc1 $v0, $f20 +/* 9C7AD4 802426F4 00000000 */ nop +/* 9C7AD8 802426F8 4680A520 */ cvt.s.w $f20, $f20 +/* 9C7ADC 802426FC 0C0B1EAF */ jal get_variable +/* 9C7AE0 80242700 0220202D */ daddu $a0, $s1, $zero +/* 9C7AE4 80242704 3C014170 */ lui $at, 0x4170 +/* 9C7AE8 80242708 44810000 */ mtc1 $at, $f0 +/* 9C7AEC 8024270C 44821000 */ mtc1 $v0, $f2 +/* 9C7AF0 80242710 00000000 */ nop +/* 9C7AF4 80242714 468010A0 */ cvt.s.w $f2, $f2 +/* 9C7AF8 80242718 4600A500 */ add.s $f20, $f20, $f0 +/* 9C7AFC 8024271C 4405B000 */ mfc1 $a1, $f22 +/* 9C7B00 80242720 44071000 */ mfc1 $a3, $f2 +/* 9C7B04 80242724 4406A000 */ mfc1 $a2, $f20 +/* 9C7B08 80242728 0C01C07C */ jal func_800701F0 +/* 9C7B0C 8024272C 0000202D */ daddu $a0, $zero, $zero +/* 9C7B10 80242730 0000202D */ daddu $a0, $zero, $zero +/* 9C7B14 80242734 0080282D */ daddu $a1, $a0, $zero +/* 9C7B18 80242738 0C0B2D5B */ jal exec_ShakeCam1 +/* 9C7B1C 8024273C 24060014 */ addiu $a2, $zero, 0x14 +/* 9C7B20 80242740 8FBF0018 */ lw $ra, 0x18($sp) +/* 9C7B24 80242744 8FB10014 */ lw $s1, 0x14($sp) +/* 9C7B28 80242748 8FB00010 */ lw $s0, 0x10($sp) +/* 9C7B2C 8024274C D7B60028 */ ldc1 $f22, 0x28($sp) +/* 9C7B30 80242750 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 9C7B34 80242754 24020002 */ addiu $v0, $zero, 2 +/* 9C7B38 80242758 03E00008 */ jr $ra +/* 9C7B3C 8024275C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760.s deleted file mode 100644 index 8650fe814e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242760 -/* 9C7B40 80242760 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7B44 80242764 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7B48 80242768 0C03A63B */ jal func_800E98EC -/* 9C7B4C 8024276C 00000000 */ nop -/* 9C7B50 80242770 0C03A625 */ jal func_800E9894 -/* 9C7B54 80242774 00000000 */ nop -/* 9C7B58 80242778 0C03A5D8 */ jal open_status_menu_long -/* 9C7B5C 8024277C 00000000 */ nop -/* 9C7B60 80242780 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7B64 80242784 24020002 */ addiu $v0, $zero, 2 -/* 9C7B68 80242788 03E00008 */ jr $ra -/* 9C7B6C 8024278C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s new file mode 100644 index 0000000000..f18d75e334 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242760_9C7B40.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242760_9C7B40 +/* 9C7B40 80242760 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C7B44 80242764 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C7B48 80242768 0C03A63B */ jal func_800E98EC +/* 9C7B4C 8024276C 00000000 */ nop +/* 9C7B50 80242770 0C03A625 */ jal func_800E9894 +/* 9C7B54 80242774 00000000 */ nop +/* 9C7B58 80242778 0C03A5D8 */ jal open_status_menu_long +/* 9C7B5C 8024277C 00000000 */ nop +/* 9C7B60 80242780 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C7B64 80242784 24020002 */ addiu $v0, $zero, 2 +/* 9C7B68 80242788 03E00008 */ jr $ra +/* 9C7B6C 8024278C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790.s deleted file mode 100644 index 3facda1a15..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242790 -/* 9C7B70 80242790 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7B74 80242794 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7B78 80242798 0C03A640 */ jal func_800E9900 -/* 9C7B7C 8024279C 00000000 */ nop -/* 9C7B80 802427A0 0C03A631 */ jal func_800E98C4 -/* 9C7B84 802427A4 00000000 */ nop -/* 9C7B88 802427A8 0C03A5EE */ jal func_800E97B8 -/* 9C7B8C 802427AC 00000000 */ nop -/* 9C7B90 802427B0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7B94 802427B4 24020002 */ addiu $v0, $zero, 2 -/* 9C7B98 802427B8 03E00008 */ jr $ra -/* 9C7B9C 802427BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s new file mode 100644 index 0000000000..0f2de5425f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242790_9C7B70.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242790_9C7B70 +/* 9C7B70 80242790 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C7B74 80242794 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C7B78 80242798 0C03A640 */ jal func_800E9900 +/* 9C7B7C 8024279C 00000000 */ nop +/* 9C7B80 802427A0 0C03A631 */ jal func_800E98C4 +/* 9C7B84 802427A4 00000000 */ nop +/* 9C7B88 802427A8 0C03A5EE */ jal func_800E97B8 +/* 9C7B8C 802427AC 00000000 */ nop +/* 9C7B90 802427B0 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C7B94 802427B4 24020002 */ addiu $v0, $zero, 2 +/* 9C7B98 802427B8 03E00008 */ jr $ra +/* 9C7B9C 802427BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0.s deleted file mode 100644 index a876db257b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427C0 -/* 9C7BA0 802427C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7BA4 802427C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7BA8 802427C8 8C82000C */ lw $v0, 0xc($a0) -/* 9C7BAC 802427CC 0C0B1EAF */ jal get_variable -/* 9C7BB0 802427D0 8C450000 */ lw $a1, ($v0) -/* 9C7BB4 802427D4 0C015512 */ jal func_80055448 -/* 9C7BB8 802427D8 24040010 */ addiu $a0, $zero, 0x10 -/* 9C7BBC 802427DC 0C0155D8 */ jal func_80055760 -/* 9C7BC0 802427E0 24040004 */ addiu $a0, $zero, 4 -/* 9C7BC4 802427E4 0000202D */ daddu $a0, $zero, $zero -/* 9C7BC8 802427E8 240500FA */ addiu $a1, $zero, 0xfa -/* 9C7BCC 802427EC 0C01559B */ jal func_8005566C -/* 9C7BD0 802427F0 24060001 */ addiu $a2, $zero, 1 -/* 9C7BD4 802427F4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7BD8 802427F8 24020002 */ addiu $v0, $zero, 2 -/* 9C7BDC 802427FC 03E00008 */ jr $ra -/* 9C7BE0 80242800 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0_9C7BA0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0_9C7BA0.s new file mode 100644 index 0000000000..1098762c8e --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802427C0_9C7BA0.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427C0_9C7BA0 +/* 9C7BA0 802427C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C7BA4 802427C4 AFBF0010 */ sw $ra, 0x10($sp) +/* 9C7BA8 802427C8 8C82000C */ lw $v0, 0xc($a0) +/* 9C7BAC 802427CC 0C0B1EAF */ jal get_variable +/* 9C7BB0 802427D0 8C450000 */ lw $a1, ($v0) +/* 9C7BB4 802427D4 0C015512 */ jal func_80055448 +/* 9C7BB8 802427D8 24040010 */ addiu $a0, $zero, 0x10 +/* 9C7BBC 802427DC 0C0155D8 */ jal func_80055760 +/* 9C7BC0 802427E0 24040004 */ addiu $a0, $zero, 4 +/* 9C7BC4 802427E4 0000202D */ daddu $a0, $zero, $zero +/* 9C7BC8 802427E8 240500FA */ addiu $a1, $zero, 0xfa +/* 9C7BCC 802427EC 0C01559B */ jal func_8005566C +/* 9C7BD0 802427F0 24060001 */ addiu $a2, $zero, 1 +/* 9C7BD4 802427F4 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C7BD8 802427F8 24020002 */ addiu $v0, $zero, 2 +/* 9C7BDC 802427FC 03E00008 */ jr $ra +/* 9C7BE0 80242800 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804.s deleted file mode 100644 index ca8975899a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242804 -/* 9C7BE4 80242804 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7BE8 80242808 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C7BEC 8024280C AFB00010 */ sw $s0, 0x10($sp) -/* 9C7BF0 80242810 8C82000C */ lw $v0, 0xc($a0) -/* 9C7BF4 80242814 0C0B1EAF */ jal get_variable -/* 9C7BF8 80242818 8C450000 */ lw $a1, ($v0) -/* 9C7BFC 8024281C 3C038025 */ lui $v1, 0x8025 -/* 9C7C00 80242820 24630810 */ addiu $v1, $v1, 0x810 -/* 9C7C04 80242824 00028040 */ sll $s0, $v0, 1 -/* 9C7C08 80242828 02038021 */ addu $s0, $s0, $v1 -/* 9C7C0C 8024282C 0C015612 */ jal func_80055848 -/* 9C7C10 80242830 86040000 */ lh $a0, ($s0) -/* 9C7C14 80242834 240505DC */ addiu $a1, $zero, 0x5dc -/* 9C7C18 80242838 86040000 */ lh $a0, ($s0) -/* 9C7C1C 8024283C 0C01559B */ jal func_8005566C -/* 9C7C20 80242840 2406007F */ addiu $a2, $zero, 0x7f -/* 9C7C24 80242844 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C7C28 80242848 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7C2C 8024284C 24020002 */ addiu $v0, $zero, 2 -/* 9C7C30 80242850 03E00008 */ jr $ra -/* 9C7C34 80242854 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s new file mode 100644 index 0000000000..cd27df90e0 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242804_9C7BE4.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242804_9C7BE4 +/* 9C7BE4 80242804 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C7BE8 80242808 AFBF0014 */ sw $ra, 0x14($sp) +/* 9C7BEC 8024280C AFB00010 */ sw $s0, 0x10($sp) +/* 9C7BF0 80242810 8C82000C */ lw $v0, 0xc($a0) +/* 9C7BF4 80242814 0C0B1EAF */ jal get_variable +/* 9C7BF8 80242818 8C450000 */ lw $a1, ($v0) +/* 9C7BFC 8024281C 3C038025 */ lui $v1, 0x8025 +/* 9C7C00 80242820 24630810 */ addiu $v1, $v1, 0x810 +/* 9C7C04 80242824 00028040 */ sll $s0, $v0, 1 +/* 9C7C08 80242828 02038021 */ addu $s0, $s0, $v1 +/* 9C7C0C 8024282C 0C015612 */ jal func_80055848 +/* 9C7C10 80242830 86040000 */ lh $a0, ($s0) +/* 9C7C14 80242834 240505DC */ addiu $a1, $zero, 0x5dc +/* 9C7C18 80242838 86040000 */ lh $a0, ($s0) +/* 9C7C1C 8024283C 0C01559B */ jal func_8005566C +/* 9C7C20 80242840 2406007F */ addiu $a2, $zero, 0x7f +/* 9C7C24 80242844 8FBF0014 */ lw $ra, 0x14($sp) +/* 9C7C28 80242848 8FB00010 */ lw $s0, 0x10($sp) +/* 9C7C2C 8024284C 24020002 */ addiu $v0, $zero, 2 +/* 9C7C30 80242850 03E00008 */ jr $ra +/* 9C7C34 80242854 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8.s deleted file mode 100644 index ec931658e5..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428B8 -/* 9C7C98 802428B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7C9C 802428BC AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7CA0 802428C0 0C0155F3 */ jal func_800557CC -/* 9C7CA4 802428C4 24040064 */ addiu $a0, $zero, 0x64 -/* 9C7CA8 802428C8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7CAC 802428CC 24020002 */ addiu $v0, $zero, 2 -/* 9C7CB0 802428D0 03E00008 */ jr $ra -/* 9C7CB4 802428D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8_9C7C98.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8_9C7C98.s new file mode 100644 index 0000000000..e9dc2a2306 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428B8_9C7C98.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428B8_9C7C98 +/* 9C7C98 802428B8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C7C9C 802428BC AFBF0010 */ sw $ra, 0x10($sp) +/* 9C7CA0 802428C0 0C0155F3 */ jal func_800557CC +/* 9C7CA4 802428C4 24040064 */ addiu $a0, $zero, 0x64 +/* 9C7CA8 802428C8 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C7CAC 802428CC 24020002 */ addiu $v0, $zero, 2 +/* 9C7CB0 802428D0 03E00008 */ jr $ra +/* 9C7CB4 802428D4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8.s deleted file mode 100644 index 3f11504f85..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428D8 -/* 9C7CB8 802428D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C7CBC 802428DC AFBF0010 */ sw $ra, 0x10($sp) -/* 9C7CC0 802428E0 8C82000C */ lw $v0, 0xc($a0) -/* 9C7CC4 802428E4 0C0B1EAF */ jal get_variable -/* 9C7CC8 802428E8 8C450000 */ lw $a1, ($v0) -/* 9C7CCC 802428EC 00021040 */ sll $v0, $v0, 1 -/* 9C7CD0 802428F0 3C048025 */ lui $a0, 0x8025 -/* 9C7CD4 802428F4 00822021 */ addu $a0, $a0, $v0 -/* 9C7CD8 802428F8 0C015612 */ jal func_80055848 -/* 9C7CDC 802428FC 84840810 */ lh $a0, 0x810($a0) -/* 9C7CE0 80242900 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C7CE4 80242904 24020002 */ addiu $v0, $zero, 2 -/* 9C7CE8 80242908 03E00008 */ jr $ra -/* 9C7CEC 8024290C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8_9C7CB8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8_9C7CB8.s new file mode 100644 index 0000000000..81ede726e1 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802428D8_9C7CB8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428D8_9C7CB8 +/* 9C7CB8 802428D8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9C7CBC 802428DC AFBF0010 */ sw $ra, 0x10($sp) +/* 9C7CC0 802428E0 8C82000C */ lw $v0, 0xc($a0) +/* 9C7CC4 802428E4 0C0B1EAF */ jal get_variable +/* 9C7CC8 802428E8 8C450000 */ lw $a1, ($v0) +/* 9C7CCC 802428EC 00021040 */ sll $v0, $v0, 1 +/* 9C7CD0 802428F0 3C048025 */ lui $a0, 0x8025 +/* 9C7CD4 802428F4 00822021 */ addu $a0, $a0, $v0 +/* 9C7CD8 802428F8 0C015612 */ jal func_80055848 +/* 9C7CDC 802428FC 84840810 */ lh $a0, 0x810($a0) +/* 9C7CE0 80242900 8FBF0010 */ lw $ra, 0x10($sp) +/* 9C7CE4 80242904 24020002 */ addiu $v0, $zero, 2 +/* 9C7CE8 80242908 03E00008 */ jr $ra +/* 9C7CEC 8024290C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910.s deleted file mode 100644 index e8acd6b9c0..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242910 -/* 9C7CF0 80242910 3C038011 */ lui $v1, %hi(gPlayerData) -/* 9C7CF4 80242914 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 9C7CF8 80242918 8C6202BC */ lw $v0, 0x2bc($v1) -/* 9C7CFC 8024291C AC620324 */ sw $v0, 0x324($v1) -/* 9C7D00 80242920 03E00008 */ jr $ra -/* 9C7D04 80242924 24020002 */ addiu $v0, $zero, 2 -/* 9C7D08 80242928 00000000 */ nop -/* 9C7D0C 8024292C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s new file mode 100644 index 0000000000..359392fc29 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80242910_9C7CF0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242910_9C7CF0 +/* 9C7CF0 80242910 3C038011 */ lui $v1, %hi(gPlayerData) +/* 9C7CF4 80242914 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 9C7CF8 80242918 8C6202BC */ lw $v0, 0x2bc($v1) +/* 9C7CFC 8024291C AC620324 */ sw $v0, 0x324($v1) +/* 9C7D00 80242920 03E00008 */ jr $ra +/* 9C7D04 80242924 24020002 */ addiu $v0, $zero, 2 +/* 9C7D08 80242928 00000000 */ nop +/* 9C7D0C 8024292C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_80242930.s b/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_80242930.s deleted file mode 100644 index 187706de35..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_80242930.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242930 -/* 9C7D10 80242930 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9C7D14 80242934 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 9C7D18 80242938 4485A000 */ mtc1 $a1, $f20 -/* 9C7D1C 8024293C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 9C7D20 80242940 4486B000 */ mtc1 $a2, $f22 -/* 9C7D24 80242944 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7D28 80242948 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 9C7D2C 8024294C 4487C000 */ mtc1 $a3, $f24 -/* 9C7D30 80242950 AFBF0014 */ sw $ra, 0x14($sp) -/* 9C7D34 80242954 0C019D28 */ jal guMtxIdentF -/* 9C7D38 80242958 0080802D */ daddu $s0, $a0, $zero -/* 9C7D3C 8024295C 4616A582 */ mul.s $f22, $f20, $f22 -/* 9C7D40 80242960 00000000 */ nop -/* 9C7D44 80242964 4618A502 */ mul.s $f20, $f20, $f24 -/* 9C7D48 80242968 00000000 */ nop -/* 9C7D4C 8024296C 3C013F80 */ lui $at, 0x3f80 -/* 9C7D50 80242970 44810000 */ mtc1 $at, $f0 -/* 9C7D54 80242974 00000000 */ nop -/* 9C7D58 80242978 E6000014 */ swc1 $f0, 0x14($s0) -/* 9C7D5C 8024297C E6160010 */ swc1 $f22, 0x10($s0) -/* 9C7D60 80242980 E6140018 */ swc1 $f20, 0x18($s0) -/* 9C7D64 80242984 8FBF0014 */ lw $ra, 0x14($sp) -/* 9C7D68 80242988 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7D6C 8024298C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 9C7D70 80242990 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 9C7D74 80242994 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 9C7D78 80242998 03E00008 */ jr $ra -/* 9C7D7C 8024299C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_80242930_9C7D10.s b/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_80242930_9C7D10.s new file mode 100644 index 0000000000..81a4046a61 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_80242930_9C7D10.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242930_9C7D10 +/* 9C7D10 80242930 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9C7D14 80242934 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 9C7D18 80242938 4485A000 */ mtc1 $a1, $f20 +/* 9C7D1C 8024293C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 9C7D20 80242940 4486B000 */ mtc1 $a2, $f22 +/* 9C7D24 80242944 AFB00010 */ sw $s0, 0x10($sp) +/* 9C7D28 80242948 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 9C7D2C 8024294C 4487C000 */ mtc1 $a3, $f24 +/* 9C7D30 80242950 AFBF0014 */ sw $ra, 0x14($sp) +/* 9C7D34 80242954 0C019D28 */ jal guMtxIdentF +/* 9C7D38 80242958 0080802D */ daddu $s0, $a0, $zero +/* 9C7D3C 8024295C 4616A582 */ mul.s $f22, $f20, $f22 +/* 9C7D40 80242960 00000000 */ nop +/* 9C7D44 80242964 4618A502 */ mul.s $f20, $f20, $f24 +/* 9C7D48 80242968 00000000 */ nop +/* 9C7D4C 8024296C 3C013F80 */ lui $at, 0x3f80 +/* 9C7D50 80242970 44810000 */ mtc1 $at, $f0 +/* 9C7D54 80242974 00000000 */ nop +/* 9C7D58 80242978 E6000014 */ swc1 $f0, 0x14($s0) +/* 9C7D5C 8024297C E6160010 */ swc1 $f22, 0x10($s0) +/* 9C7D60 80242980 E6140018 */ swc1 $f20, 0x18($s0) +/* 9C7D64 80242984 8FBF0014 */ lw $ra, 0x14($sp) +/* 9C7D68 80242988 8FB00010 */ lw $s0, 0x10($sp) +/* 9C7D6C 8024298C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 9C7D70 80242990 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 9C7D74 80242994 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 9C7D78 80242998 03E00008 */ jr $ra +/* 9C7D7C 8024299C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_802429A0.s b/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_802429A0.s deleted file mode 100644 index 979adf0f39..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_802429A0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429A0 -/* 9C7D80 802429A0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 9C7D84 802429A4 AFB10054 */ sw $s1, 0x54($sp) -/* 9C7D88 802429A8 0080882D */ daddu $s1, $a0, $zero -/* 9C7D8C 802429AC AFBF005C */ sw $ra, 0x5c($sp) -/* 9C7D90 802429B0 AFB20058 */ sw $s2, 0x58($sp) -/* 9C7D94 802429B4 AFB00050 */ sw $s0, 0x50($sp) -/* 9C7D98 802429B8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 9C7D9C 802429BC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9C7DA0 802429C0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9C7DA4 802429C4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9C7DA8 802429C8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9C7DAC 802429CC 8E30000C */ lw $s0, 0xc($s1) -/* 9C7DB0 802429D0 8E050000 */ lw $a1, ($s0) -/* 9C7DB4 802429D4 0C0B1EAF */ jal get_variable -/* 9C7DB8 802429D8 26100004 */ addiu $s0, $s0, 4 -/* 9C7DBC 802429DC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 9C7DC0 802429E0 0040202D */ daddu $a0, $v0, $zero -/* 9C7DC4 802429E4 8E050000 */ lw $a1, ($s0) -/* 9C7DC8 802429E8 26100004 */ addiu $s0, $s0, 4 -/* 9C7DCC 802429EC 0220202D */ daddu $a0, $s1, $zero -/* 9C7DD0 802429F0 0C0B210B */ jal get_float_variable -/* 9C7DD4 802429F4 0040902D */ daddu $s2, $v0, $zero -/* 9C7DD8 802429F8 8E050000 */ lw $a1, ($s0) -/* 9C7DDC 802429FC 26100004 */ addiu $s0, $s0, 4 -/* 9C7DE0 80242A00 0220202D */ daddu $a0, $s1, $zero -/* 9C7DE4 80242A04 0C0B210B */ jal get_float_variable -/* 9C7DE8 80242A08 46000706 */ mov.s $f28, $f0 -/* 9C7DEC 80242A0C 8E050000 */ lw $a1, ($s0) -/* 9C7DF0 80242A10 26100004 */ addiu $s0, $s0, 4 -/* 9C7DF4 80242A14 0220202D */ daddu $a0, $s1, $zero -/* 9C7DF8 80242A18 0C0B210B */ jal get_float_variable -/* 9C7DFC 80242A1C 46000686 */ mov.s $f26, $f0 -/* 9C7E00 80242A20 0220202D */ daddu $a0, $s1, $zero -/* 9C7E04 80242A24 8E050000 */ lw $a1, ($s0) -/* 9C7E08 80242A28 0C0B210B */ jal get_float_variable -/* 9C7E0C 80242A2C 46000586 */ mov.s $f22, $f0 -/* 9C7E10 80242A30 0240202D */ daddu $a0, $s2, $zero -/* 9C7E14 80242A34 0C046B4C */ jal get_model_from_list_index -/* 9C7E18 80242A38 46000606 */ mov.s $f24, $f0 -/* 9C7E1C 80242A3C 0040882D */ daddu $s1, $v0, $zero -/* 9C7E20 80242A40 96220000 */ lhu $v0, ($s1) -/* 9C7E24 80242A44 30420400 */ andi $v0, $v0, 0x400 -/* 9C7E28 80242A48 1440001E */ bnez $v0, .L80242AC4 -/* 9C7E2C 80242A4C 26300058 */ addiu $s0, $s1, 0x58 -/* 9C7E30 80242A50 4480A000 */ mtc1 $zero, $f20 -/* 9C7E34 80242A54 4406B000 */ mfc1 $a2, $f22 -/* 9C7E38 80242A58 4405A000 */ mfc1 $a1, $f20 -/* 9C7E3C 80242A5C 4407A000 */ mfc1 $a3, $f20 -/* 9C7E40 80242A60 0C019E40 */ jal guTranslateF -/* 9C7E44 80242A64 0200202D */ daddu $a0, $s0, $zero -/* 9C7E48 80242A68 4405E000 */ mfc1 $a1, $f28 -/* 9C7E4C 80242A6C 4406D000 */ mfc1 $a2, $f26 -/* 9C7E50 80242A70 4407C000 */ mfc1 $a3, $f24 -/* 9C7E54 80242A74 0C090A4C */ jal func_80242930 -/* 9C7E58 80242A78 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7E5C 80242A7C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7E60 80242A80 0200282D */ daddu $a1, $s0, $zero -/* 9C7E64 80242A84 0C019D80 */ jal guMtxCatF -/* 9C7E68 80242A88 0200302D */ daddu $a2, $s0, $zero -/* 9C7E6C 80242A8C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7E70 80242A90 4600B587 */ neg.s $f22, $f22 -/* 9C7E74 80242A94 4405A000 */ mfc1 $a1, $f20 -/* 9C7E78 80242A98 4406B000 */ mfc1 $a2, $f22 -/* 9C7E7C 80242A9C 0C019E40 */ jal guTranslateF -/* 9C7E80 80242AA0 00A0382D */ daddu $a3, $a1, $zero -/* 9C7E84 80242AA4 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7E88 80242AA8 0200282D */ daddu $a1, $s0, $zero -/* 9C7E8C 80242AAC 0C019D80 */ jal guMtxCatF -/* 9C7E90 80242AB0 00A0302D */ daddu $a2, $a1, $zero -/* 9C7E94 80242AB4 96220000 */ lhu $v0, ($s1) -/* 9C7E98 80242AB8 34421400 */ ori $v0, $v0, 0x1400 -/* 9C7E9C 80242ABC 08090ACF */ j .L80242B3C -/* 9C7EA0 80242AC0 A6220000 */ sh $v0, ($s1) -.L80242AC4: -/* 9C7EA4 80242AC4 4480A000 */ mtc1 $zero, $f20 -/* 9C7EA8 80242AC8 4406B000 */ mfc1 $a2, $f22 -/* 9C7EAC 80242ACC 4405A000 */ mfc1 $a1, $f20 -/* 9C7EB0 80242AD0 4407A000 */ mfc1 $a3, $f20 -/* 9C7EB4 80242AD4 0C019E40 */ jal guTranslateF -/* 9C7EB8 80242AD8 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7EBC 80242ADC 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7EC0 80242AE0 26300058 */ addiu $s0, $s1, 0x58 -/* 9C7EC4 80242AE4 0200282D */ daddu $a1, $s0, $zero -/* 9C7EC8 80242AE8 0C019D80 */ jal guMtxCatF -/* 9C7ECC 80242AEC 0200302D */ daddu $a2, $s0, $zero -/* 9C7ED0 80242AF0 4405E000 */ mfc1 $a1, $f28 -/* 9C7ED4 80242AF4 4406D000 */ mfc1 $a2, $f26 -/* 9C7ED8 80242AF8 4407C000 */ mfc1 $a3, $f24 -/* 9C7EDC 80242AFC 0C090A4C */ jal func_80242930 -/* 9C7EE0 80242B00 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7EE4 80242B04 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7EE8 80242B08 0200282D */ daddu $a1, $s0, $zero -/* 9C7EEC 80242B0C 0C019D80 */ jal guMtxCatF -/* 9C7EF0 80242B10 0200302D */ daddu $a2, $s0, $zero -/* 9C7EF4 80242B14 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7EF8 80242B18 4600B587 */ neg.s $f22, $f22 -/* 9C7EFC 80242B1C 4405A000 */ mfc1 $a1, $f20 -/* 9C7F00 80242B20 4406B000 */ mfc1 $a2, $f22 -/* 9C7F04 80242B24 0C019E40 */ jal guTranslateF -/* 9C7F08 80242B28 00A0382D */ daddu $a3, $a1, $zero -/* 9C7F0C 80242B2C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9C7F10 80242B30 0200282D */ daddu $a1, $s0, $zero -/* 9C7F14 80242B34 0C019D80 */ jal guMtxCatF -/* 9C7F18 80242B38 00A0302D */ daddu $a2, $a1, $zero -.L80242B3C: -/* 9C7F1C 80242B3C 8FBF005C */ lw $ra, 0x5c($sp) -/* 9C7F20 80242B40 8FB20058 */ lw $s2, 0x58($sp) -/* 9C7F24 80242B44 8FB10054 */ lw $s1, 0x54($sp) -/* 9C7F28 80242B48 8FB00050 */ lw $s0, 0x50($sp) -/* 9C7F2C 80242B4C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 9C7F30 80242B50 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9C7F34 80242B54 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9C7F38 80242B58 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9C7F3C 80242B5C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9C7F40 80242B60 24020002 */ addiu $v0, $zero, 2 -/* 9C7F44 80242B64 03E00008 */ jr $ra -/* 9C7F48 80242B68 27BD0088 */ addiu $sp, $sp, 0x88 -/* 9C7F4C 80242B6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_802429A0_9C7D80.s b/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_802429A0_9C7D80.s new file mode 100644 index 0000000000..f6f4824171 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_01/9C7D10/func_802429A0_9C7D80.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429A0_9C7D80 +/* 9C7D80 802429A0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 9C7D84 802429A4 AFB10054 */ sw $s1, 0x54($sp) +/* 9C7D88 802429A8 0080882D */ daddu $s1, $a0, $zero +/* 9C7D8C 802429AC AFBF005C */ sw $ra, 0x5c($sp) +/* 9C7D90 802429B0 AFB20058 */ sw $s2, 0x58($sp) +/* 9C7D94 802429B4 AFB00050 */ sw $s0, 0x50($sp) +/* 9C7D98 802429B8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 9C7D9C 802429BC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 9C7DA0 802429C0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 9C7DA4 802429C4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 9C7DA8 802429C8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 9C7DAC 802429CC 8E30000C */ lw $s0, 0xc($s1) +/* 9C7DB0 802429D0 8E050000 */ lw $a1, ($s0) +/* 9C7DB4 802429D4 0C0B1EAF */ jal get_variable +/* 9C7DB8 802429D8 26100004 */ addiu $s0, $s0, 4 +/* 9C7DBC 802429DC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 9C7DC0 802429E0 0040202D */ daddu $a0, $v0, $zero +/* 9C7DC4 802429E4 8E050000 */ lw $a1, ($s0) +/* 9C7DC8 802429E8 26100004 */ addiu $s0, $s0, 4 +/* 9C7DCC 802429EC 0220202D */ daddu $a0, $s1, $zero +/* 9C7DD0 802429F0 0C0B210B */ jal get_float_variable +/* 9C7DD4 802429F4 0040902D */ daddu $s2, $v0, $zero +/* 9C7DD8 802429F8 8E050000 */ lw $a1, ($s0) +/* 9C7DDC 802429FC 26100004 */ addiu $s0, $s0, 4 +/* 9C7DE0 80242A00 0220202D */ daddu $a0, $s1, $zero +/* 9C7DE4 80242A04 0C0B210B */ jal get_float_variable +/* 9C7DE8 80242A08 46000706 */ mov.s $f28, $f0 +/* 9C7DEC 80242A0C 8E050000 */ lw $a1, ($s0) +/* 9C7DF0 80242A10 26100004 */ addiu $s0, $s0, 4 +/* 9C7DF4 80242A14 0220202D */ daddu $a0, $s1, $zero +/* 9C7DF8 80242A18 0C0B210B */ jal get_float_variable +/* 9C7DFC 80242A1C 46000686 */ mov.s $f26, $f0 +/* 9C7E00 80242A20 0220202D */ daddu $a0, $s1, $zero +/* 9C7E04 80242A24 8E050000 */ lw $a1, ($s0) +/* 9C7E08 80242A28 0C0B210B */ jal get_float_variable +/* 9C7E0C 80242A2C 46000586 */ mov.s $f22, $f0 +/* 9C7E10 80242A30 0240202D */ daddu $a0, $s2, $zero +/* 9C7E14 80242A34 0C046B4C */ jal get_model_from_list_index +/* 9C7E18 80242A38 46000606 */ mov.s $f24, $f0 +/* 9C7E1C 80242A3C 0040882D */ daddu $s1, $v0, $zero +/* 9C7E20 80242A40 96220000 */ lhu $v0, ($s1) +/* 9C7E24 80242A44 30420400 */ andi $v0, $v0, 0x400 +/* 9C7E28 80242A48 1440001E */ bnez $v0, .L80242AC4 +/* 9C7E2C 80242A4C 26300058 */ addiu $s0, $s1, 0x58 +/* 9C7E30 80242A50 4480A000 */ mtc1 $zero, $f20 +/* 9C7E34 80242A54 4406B000 */ mfc1 $a2, $f22 +/* 9C7E38 80242A58 4405A000 */ mfc1 $a1, $f20 +/* 9C7E3C 80242A5C 4407A000 */ mfc1 $a3, $f20 +/* 9C7E40 80242A60 0C019E40 */ jal guTranslateF +/* 9C7E44 80242A64 0200202D */ daddu $a0, $s0, $zero +/* 9C7E48 80242A68 4405E000 */ mfc1 $a1, $f28 +/* 9C7E4C 80242A6C 4406D000 */ mfc1 $a2, $f26 +/* 9C7E50 80242A70 4407C000 */ mfc1 $a3, $f24 +/* 9C7E54 80242A74 0C090A4C */ jal func_80242930_9C7D10 +/* 9C7E58 80242A78 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7E5C 80242A7C 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7E60 80242A80 0200282D */ daddu $a1, $s0, $zero +/* 9C7E64 80242A84 0C019D80 */ jal guMtxCatF +/* 9C7E68 80242A88 0200302D */ daddu $a2, $s0, $zero +/* 9C7E6C 80242A8C 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7E70 80242A90 4600B587 */ neg.s $f22, $f22 +/* 9C7E74 80242A94 4405A000 */ mfc1 $a1, $f20 +/* 9C7E78 80242A98 4406B000 */ mfc1 $a2, $f22 +/* 9C7E7C 80242A9C 0C019E40 */ jal guTranslateF +/* 9C7E80 80242AA0 00A0382D */ daddu $a3, $a1, $zero +/* 9C7E84 80242AA4 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7E88 80242AA8 0200282D */ daddu $a1, $s0, $zero +/* 9C7E8C 80242AAC 0C019D80 */ jal guMtxCatF +/* 9C7E90 80242AB0 00A0302D */ daddu $a2, $a1, $zero +/* 9C7E94 80242AB4 96220000 */ lhu $v0, ($s1) +/* 9C7E98 80242AB8 34421400 */ ori $v0, $v0, 0x1400 +/* 9C7E9C 80242ABC 08090ACF */ j .L80242B3C +/* 9C7EA0 80242AC0 A6220000 */ sh $v0, ($s1) +.L80242AC4: +/* 9C7EA4 80242AC4 4480A000 */ mtc1 $zero, $f20 +/* 9C7EA8 80242AC8 4406B000 */ mfc1 $a2, $f22 +/* 9C7EAC 80242ACC 4405A000 */ mfc1 $a1, $f20 +/* 9C7EB0 80242AD0 4407A000 */ mfc1 $a3, $f20 +/* 9C7EB4 80242AD4 0C019E40 */ jal guTranslateF +/* 9C7EB8 80242AD8 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7EBC 80242ADC 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7EC0 80242AE0 26300058 */ addiu $s0, $s1, 0x58 +/* 9C7EC4 80242AE4 0200282D */ daddu $a1, $s0, $zero +/* 9C7EC8 80242AE8 0C019D80 */ jal guMtxCatF +/* 9C7ECC 80242AEC 0200302D */ daddu $a2, $s0, $zero +/* 9C7ED0 80242AF0 4405E000 */ mfc1 $a1, $f28 +/* 9C7ED4 80242AF4 4406D000 */ mfc1 $a2, $f26 +/* 9C7ED8 80242AF8 4407C000 */ mfc1 $a3, $f24 +/* 9C7EDC 80242AFC 0C090A4C */ jal func_80242930_9C7D10 +/* 9C7EE0 80242B00 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7EE4 80242B04 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7EE8 80242B08 0200282D */ daddu $a1, $s0, $zero +/* 9C7EEC 80242B0C 0C019D80 */ jal guMtxCatF +/* 9C7EF0 80242B10 0200302D */ daddu $a2, $s0, $zero +/* 9C7EF4 80242B14 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7EF8 80242B18 4600B587 */ neg.s $f22, $f22 +/* 9C7EFC 80242B1C 4405A000 */ mfc1 $a1, $f20 +/* 9C7F00 80242B20 4406B000 */ mfc1 $a2, $f22 +/* 9C7F04 80242B24 0C019E40 */ jal guTranslateF +/* 9C7F08 80242B28 00A0382D */ daddu $a3, $a1, $zero +/* 9C7F0C 80242B2C 27A40010 */ addiu $a0, $sp, 0x10 +/* 9C7F10 80242B30 0200282D */ daddu $a1, $s0, $zero +/* 9C7F14 80242B34 0C019D80 */ jal guMtxCatF +/* 9C7F18 80242B38 00A0302D */ daddu $a2, $a1, $zero +.L80242B3C: +/* 9C7F1C 80242B3C 8FBF005C */ lw $ra, 0x5c($sp) +/* 9C7F20 80242B40 8FB20058 */ lw $s2, 0x58($sp) +/* 9C7F24 80242B44 8FB10054 */ lw $s1, 0x54($sp) +/* 9C7F28 80242B48 8FB00050 */ lw $s0, 0x50($sp) +/* 9C7F2C 80242B4C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 9C7F30 80242B50 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 9C7F34 80242B54 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 9C7F38 80242B58 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 9C7F3C 80242B5C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 9C7F40 80242B60 24020002 */ addiu $v0, $zero, 2 +/* 9C7F44 80242B64 03E00008 */ jr $ra +/* 9C7F48 80242B68 27BD0088 */ addiu $sp, $sp, 0x88 +/* 9C7F4C 80242B6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678.s deleted file mode 100644 index bf1e6251bf..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240678 -/* 9D7698 80240678 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D769C 8024067C AFBF0010 */ sw $ra, 0x10($sp) -/* 9D76A0 80240680 8C82000C */ lw $v0, 0xc($a0) -/* 9D76A4 80240684 0C0B1EAF */ jal get_variable -/* 9D76A8 80240688 8C450000 */ lw $a1, ($v0) -/* 9D76AC 8024068C 3C018024 */ lui $at, 0x8024 -/* 9D76B0 80240690 AC225438 */ sw $v0, 0x5438($at) -/* 9D76B4 80240694 24020002 */ addiu $v0, $zero, 2 -/* 9D76B8 80240698 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D76BC 8024069C 24030001 */ addiu $v1, $zero, 1 -/* 9D76C0 802406A0 3C018024 */ lui $at, 0x8024 -/* 9D76C4 802406A4 AC235434 */ sw $v1, 0x5434($at) -/* 9D76C8 802406A8 03E00008 */ jr $ra -/* 9D76CC 802406AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s new file mode 100644 index 0000000000..b1ea2d2a01 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7020/func_80240678_9D7698.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240678_9D7698 +/* 9D7698 80240678 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D769C 8024067C AFBF0010 */ sw $ra, 0x10($sp) +/* 9D76A0 80240680 8C82000C */ lw $v0, 0xc($a0) +/* 9D76A4 80240684 0C0B1EAF */ jal get_variable +/* 9D76A8 80240688 8C450000 */ lw $a1, ($v0) +/* 9D76AC 8024068C 3C018024 */ lui $at, 0x8024 +/* 9D76B0 80240690 AC225438 */ sw $v0, 0x5438($at) +/* 9D76B4 80240694 24020002 */ addiu $v0, $zero, 2 +/* 9D76B8 80240698 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D76BC 8024069C 24030001 */ addiu $v1, $zero, 1 +/* 9D76C0 802406A0 3C018024 */ lui $at, 0x8024 +/* 9D76C4 802406A4 AC235434 */ sw $v1, 0x5434($at) +/* 9D76C8 802406A8 03E00008 */ jr $ra +/* 9D76CC 802406AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750.s b/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750.s deleted file mode 100644 index 90fc4919f2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240750 -/* 9D7770 80240750 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D7774 80240754 AFB20018 */ sw $s2, 0x18($sp) -/* 9D7778 80240758 0080902D */ daddu $s2, $a0, $zero -/* 9D777C 8024075C AFBF001C */ sw $ra, 0x1c($sp) -/* 9D7780 80240760 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7784 80240764 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7788 80240768 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9D778C 8024076C 10A00044 */ beqz $a1, .L80240880 -/* 9D7790 80240770 8E50000C */ lw $s0, 0xc($s2) -/* 9D7794 80240774 0C00AB39 */ jal heap_malloc -/* 9D7798 80240778 24040024 */ addiu $a0, $zero, 0x24 -/* 9D779C 8024077C 0040882D */ daddu $s1, $v0, $zero -/* 9D77A0 80240780 AE510070 */ sw $s1, 0x70($s2) -/* 9D77A4 80240784 8E050000 */ lw $a1, ($s0) -/* 9D77A8 80240788 26100004 */ addiu $s0, $s0, 4 -/* 9D77AC 8024078C 0C0B1EAF */ jal get_variable -/* 9D77B0 80240790 0240202D */ daddu $a0, $s2, $zero -/* 9D77B4 80240794 AE220020 */ sw $v0, 0x20($s1) -/* 9D77B8 80240798 8E050000 */ lw $a1, ($s0) -/* 9D77BC 8024079C 26100004 */ addiu $s0, $s0, 4 -/* 9D77C0 802407A0 0C0B210B */ jal get_float_variable -/* 9D77C4 802407A4 0240202D */ daddu $a0, $s2, $zero -/* 9D77C8 802407A8 E6200000 */ swc1 $f0, ($s1) -/* 9D77CC 802407AC 8E050000 */ lw $a1, ($s0) -/* 9D77D0 802407B0 26100004 */ addiu $s0, $s0, 4 -/* 9D77D4 802407B4 0C0B210B */ jal get_float_variable -/* 9D77D8 802407B8 0240202D */ daddu $a0, $s2, $zero -/* 9D77DC 802407BC E6200004 */ swc1 $f0, 4($s1) -/* 9D77E0 802407C0 8E050000 */ lw $a1, ($s0) -/* 9D77E4 802407C4 26100004 */ addiu $s0, $s0, 4 -/* 9D77E8 802407C8 0C0B210B */ jal get_float_variable -/* 9D77EC 802407CC 0240202D */ daddu $a0, $s2, $zero -/* 9D77F0 802407D0 E6200008 */ swc1 $f0, 8($s1) -/* 9D77F4 802407D4 8E050000 */ lw $a1, ($s0) -/* 9D77F8 802407D8 26100004 */ addiu $s0, $s0, 4 -/* 9D77FC 802407DC 0C0B1EAF */ jal get_variable -/* 9D7800 802407E0 0240202D */ daddu $a0, $s2, $zero -/* 9D7804 802407E4 AE22001C */ sw $v0, 0x1c($s1) -/* 9D7808 802407E8 8E050000 */ lw $a1, ($s0) -/* 9D780C 802407EC 0C0B210B */ jal get_float_variable -/* 9D7810 802407F0 0240202D */ daddu $a0, $s2, $zero -/* 9D7814 802407F4 8E240020 */ lw $a0, 0x20($s1) -/* 9D7818 802407F8 0C04C3D6 */ jal get_item_entity -/* 9D781C 802407FC E6200010 */ swc1 $f0, 0x10($s1) -/* 9D7820 80240800 0040802D */ daddu $s0, $v0, $zero -/* 9D7824 80240804 C60C0008 */ lwc1 $f12, 8($s0) -/* 9D7828 80240808 C60E0010 */ lwc1 $f14, 0x10($s0) -/* 9D782C 8024080C 8E260000 */ lw $a2, ($s1) -/* 9D7830 80240810 0C00A7B5 */ jal dist2D -/* 9D7834 80240814 8E270008 */ lw $a3, 8($s1) -/* 9D7838 80240818 C60C0008 */ lwc1 $f12, 8($s0) -/* 9D783C 8024081C C60E0010 */ lwc1 $f14, 0x10($s0) -/* 9D7840 80240820 8E260000 */ lw $a2, ($s1) -/* 9D7844 80240824 8E270008 */ lw $a3, 8($s1) -/* 9D7848 80240828 0C00A720 */ jal atan2 -/* 9D784C 8024082C 46000506 */ mov.s $f20, $f0 -/* 9D7850 80240830 C6240010 */ lwc1 $f4, 0x10($s1) -/* 9D7854 80240834 C626001C */ lwc1 $f6, 0x1c($s1) -/* 9D7858 80240838 468031A0 */ cvt.s.w $f6, $f6 -/* 9D785C 8024083C 46062102 */ mul.s $f4, $f4, $f6 -/* 9D7860 80240840 00000000 */ nop -/* 9D7864 80240844 3C013F00 */ lui $at, 0x3f00 -/* 9D7868 80240848 44811000 */ mtc1 $at, $f2 -/* 9D786C 8024084C 00000000 */ nop -/* 9D7870 80240850 46022102 */ mul.s $f4, $f4, $f2 -/* 9D7874 80240854 00000000 */ nop -/* 9D7878 80240858 E620000C */ swc1 $f0, 0xc($s1) -/* 9D787C 8024085C C6200004 */ lwc1 $f0, 4($s1) -/* 9D7880 80240860 C602000C */ lwc1 $f2, 0xc($s0) -/* 9D7884 80240864 46020001 */ sub.s $f0, $f0, $f2 -/* 9D7888 80240868 46003086 */ mov.s $f2, $f6 -/* 9D788C 8024086C 46060003 */ div.s $f0, $f0, $f6 -/* 9D7890 80240870 46002100 */ add.s $f4, $f4, $f0 -/* 9D7894 80240874 4602A503 */ div.s $f20, $f20, $f2 -/* 9D7898 80240878 E6340014 */ swc1 $f20, 0x14($s1) -/* 9D789C 8024087C E6240018 */ swc1 $f4, 0x18($s1) -.L80240880: -/* 9D78A0 80240880 8E510070 */ lw $s1, 0x70($s2) -/* 9D78A4 80240884 0C04C3D6 */ jal get_item_entity -/* 9D78A8 80240888 8E240020 */ lw $a0, 0x20($s1) -/* 9D78AC 8024088C 0040802D */ daddu $s0, $v0, $zero -/* 9D78B0 80240890 16000005 */ bnez $s0, .L802408A8 -/* 9D78B4 80240894 00000000 */ nop -/* 9D78B8 80240898 0C00AB4B */ jal heap_free -/* 9D78BC 8024089C 8E440070 */ lw $a0, 0x70($s2) -/* 9D78C0 802408A0 08090253 */ j .L8024094C -/* 9D78C4 802408A4 24020002 */ addiu $v0, $zero, 2 -.L802408A8: -/* 9D78C8 802408A8 C62C000C */ lwc1 $f12, 0xc($s1) -/* 9D78CC 802408AC 0C00A8BB */ jal sin_deg -/* 9D78D0 802408B0 00000000 */ nop -/* 9D78D4 802408B4 C6220014 */ lwc1 $f2, 0x14($s1) -/* 9D78D8 802408B8 46001082 */ mul.s $f2, $f2, $f0 -/* 9D78DC 802408BC 00000000 */ nop -/* 9D78E0 802408C0 C6000008 */ lwc1 $f0, 8($s0) -/* 9D78E4 802408C4 46020000 */ add.s $f0, $f0, $f2 -/* 9D78E8 802408C8 E6000008 */ swc1 $f0, 8($s0) -/* 9D78EC 802408CC 0C00A8D4 */ jal cos_deg -/* 9D78F0 802408D0 C62C000C */ lwc1 $f12, 0xc($s1) -/* 9D78F4 802408D4 C6220014 */ lwc1 $f2, 0x14($s1) -/* 9D78F8 802408D8 46001082 */ mul.s $f2, $f2, $f0 -/* 9D78FC 802408DC 00000000 */ nop -/* 9D7900 802408E0 C6000010 */ lwc1 $f0, 0x10($s0) -/* 9D7904 802408E4 46020001 */ sub.s $f0, $f0, $f2 -/* 9D7908 802408E8 E6000010 */ swc1 $f0, 0x10($s0) -/* 9D790C 802408EC C600000C */ lwc1 $f0, 0xc($s0) -/* 9D7910 802408F0 C6220018 */ lwc1 $f2, 0x18($s1) -/* 9D7914 802408F4 46020000 */ add.s $f0, $f0, $f2 -/* 9D7918 802408F8 E600000C */ swc1 $f0, 0xc($s0) -/* 9D791C 802408FC C6200018 */ lwc1 $f0, 0x18($s1) -/* 9D7920 80240900 C6220010 */ lwc1 $f2, 0x10($s1) -/* 9D7924 80240904 8E22001C */ lw $v0, 0x1c($s1) -/* 9D7928 80240908 46020001 */ sub.s $f0, $f0, $f2 -/* 9D792C 8024090C 2442FFFF */ addiu $v0, $v0, -1 -/* 9D7930 80240910 AE22001C */ sw $v0, 0x1c($s1) -/* 9D7934 80240914 04400003 */ bltz $v0, .L80240924 -/* 9D7938 80240918 E6200018 */ swc1 $f0, 0x18($s1) -/* 9D793C 8024091C 08090253 */ j .L8024094C -/* 9D7940 80240920 0000102D */ daddu $v0, $zero, $zero -.L80240924: -/* 9D7944 80240924 C6200000 */ lwc1 $f0, ($s1) -/* 9D7948 80240928 E6000008 */ swc1 $f0, 8($s0) -/* 9D794C 8024092C C6200004 */ lwc1 $f0, 4($s1) -/* 9D7950 80240930 E600000C */ swc1 $f0, 0xc($s0) -/* 9D7954 80240934 C6200008 */ lwc1 $f0, 8($s1) -/* 9D7958 80240938 E6000010 */ swc1 $f0, 0x10($s0) -/* 9D795C 8024093C AE200018 */ sw $zero, 0x18($s1) -/* 9D7960 80240940 0C00AB4B */ jal heap_free -/* 9D7964 80240944 8E440070 */ lw $a0, 0x70($s2) -/* 9D7968 80240948 24020001 */ addiu $v0, $zero, 1 -.L8024094C: -/* 9D796C 8024094C 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D7970 80240950 8FB20018 */ lw $s2, 0x18($sp) -/* 9D7974 80240954 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7978 80240958 8FB00010 */ lw $s0, 0x10($sp) -/* 9D797C 8024095C D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9D7980 80240960 03E00008 */ jr $ra -/* 9D7984 80240964 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9D7988 80240968 00000000 */ nop -/* 9D798C 8024096C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s b/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s new file mode 100644 index 0000000000..14c2a817b9 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7770/func_80240750_9D7770.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240750_9D7770 +/* 9D7770 80240750 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9D7774 80240754 AFB20018 */ sw $s2, 0x18($sp) +/* 9D7778 80240758 0080902D */ daddu $s2, $a0, $zero +/* 9D777C 8024075C AFBF001C */ sw $ra, 0x1c($sp) +/* 9D7780 80240760 AFB10014 */ sw $s1, 0x14($sp) +/* 9D7784 80240764 AFB00010 */ sw $s0, 0x10($sp) +/* 9D7788 80240768 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 9D778C 8024076C 10A00044 */ beqz $a1, .L80240880 +/* 9D7790 80240770 8E50000C */ lw $s0, 0xc($s2) +/* 9D7794 80240774 0C00AB39 */ jal heap_malloc +/* 9D7798 80240778 24040024 */ addiu $a0, $zero, 0x24 +/* 9D779C 8024077C 0040882D */ daddu $s1, $v0, $zero +/* 9D77A0 80240780 AE510070 */ sw $s1, 0x70($s2) +/* 9D77A4 80240784 8E050000 */ lw $a1, ($s0) +/* 9D77A8 80240788 26100004 */ addiu $s0, $s0, 4 +/* 9D77AC 8024078C 0C0B1EAF */ jal get_variable +/* 9D77B0 80240790 0240202D */ daddu $a0, $s2, $zero +/* 9D77B4 80240794 AE220020 */ sw $v0, 0x20($s1) +/* 9D77B8 80240798 8E050000 */ lw $a1, ($s0) +/* 9D77BC 8024079C 26100004 */ addiu $s0, $s0, 4 +/* 9D77C0 802407A0 0C0B210B */ jal get_float_variable +/* 9D77C4 802407A4 0240202D */ daddu $a0, $s2, $zero +/* 9D77C8 802407A8 E6200000 */ swc1 $f0, ($s1) +/* 9D77CC 802407AC 8E050000 */ lw $a1, ($s0) +/* 9D77D0 802407B0 26100004 */ addiu $s0, $s0, 4 +/* 9D77D4 802407B4 0C0B210B */ jal get_float_variable +/* 9D77D8 802407B8 0240202D */ daddu $a0, $s2, $zero +/* 9D77DC 802407BC E6200004 */ swc1 $f0, 4($s1) +/* 9D77E0 802407C0 8E050000 */ lw $a1, ($s0) +/* 9D77E4 802407C4 26100004 */ addiu $s0, $s0, 4 +/* 9D77E8 802407C8 0C0B210B */ jal get_float_variable +/* 9D77EC 802407CC 0240202D */ daddu $a0, $s2, $zero +/* 9D77F0 802407D0 E6200008 */ swc1 $f0, 8($s1) +/* 9D77F4 802407D4 8E050000 */ lw $a1, ($s0) +/* 9D77F8 802407D8 26100004 */ addiu $s0, $s0, 4 +/* 9D77FC 802407DC 0C0B1EAF */ jal get_variable +/* 9D7800 802407E0 0240202D */ daddu $a0, $s2, $zero +/* 9D7804 802407E4 AE22001C */ sw $v0, 0x1c($s1) +/* 9D7808 802407E8 8E050000 */ lw $a1, ($s0) +/* 9D780C 802407EC 0C0B210B */ jal get_float_variable +/* 9D7810 802407F0 0240202D */ daddu $a0, $s2, $zero +/* 9D7814 802407F4 8E240020 */ lw $a0, 0x20($s1) +/* 9D7818 802407F8 0C04C3D6 */ jal get_item_entity +/* 9D781C 802407FC E6200010 */ swc1 $f0, 0x10($s1) +/* 9D7820 80240800 0040802D */ daddu $s0, $v0, $zero +/* 9D7824 80240804 C60C0008 */ lwc1 $f12, 8($s0) +/* 9D7828 80240808 C60E0010 */ lwc1 $f14, 0x10($s0) +/* 9D782C 8024080C 8E260000 */ lw $a2, ($s1) +/* 9D7830 80240810 0C00A7B5 */ jal dist2D +/* 9D7834 80240814 8E270008 */ lw $a3, 8($s1) +/* 9D7838 80240818 C60C0008 */ lwc1 $f12, 8($s0) +/* 9D783C 8024081C C60E0010 */ lwc1 $f14, 0x10($s0) +/* 9D7840 80240820 8E260000 */ lw $a2, ($s1) +/* 9D7844 80240824 8E270008 */ lw $a3, 8($s1) +/* 9D7848 80240828 0C00A720 */ jal atan2 +/* 9D784C 8024082C 46000506 */ mov.s $f20, $f0 +/* 9D7850 80240830 C6240010 */ lwc1 $f4, 0x10($s1) +/* 9D7854 80240834 C626001C */ lwc1 $f6, 0x1c($s1) +/* 9D7858 80240838 468031A0 */ cvt.s.w $f6, $f6 +/* 9D785C 8024083C 46062102 */ mul.s $f4, $f4, $f6 +/* 9D7860 80240840 00000000 */ nop +/* 9D7864 80240844 3C013F00 */ lui $at, 0x3f00 +/* 9D7868 80240848 44811000 */ mtc1 $at, $f2 +/* 9D786C 8024084C 00000000 */ nop +/* 9D7870 80240850 46022102 */ mul.s $f4, $f4, $f2 +/* 9D7874 80240854 00000000 */ nop +/* 9D7878 80240858 E620000C */ swc1 $f0, 0xc($s1) +/* 9D787C 8024085C C6200004 */ lwc1 $f0, 4($s1) +/* 9D7880 80240860 C602000C */ lwc1 $f2, 0xc($s0) +/* 9D7884 80240864 46020001 */ sub.s $f0, $f0, $f2 +/* 9D7888 80240868 46003086 */ mov.s $f2, $f6 +/* 9D788C 8024086C 46060003 */ div.s $f0, $f0, $f6 +/* 9D7890 80240870 46002100 */ add.s $f4, $f4, $f0 +/* 9D7894 80240874 4602A503 */ div.s $f20, $f20, $f2 +/* 9D7898 80240878 E6340014 */ swc1 $f20, 0x14($s1) +/* 9D789C 8024087C E6240018 */ swc1 $f4, 0x18($s1) +.L80240880: +/* 9D78A0 80240880 8E510070 */ lw $s1, 0x70($s2) +/* 9D78A4 80240884 0C04C3D6 */ jal get_item_entity +/* 9D78A8 80240888 8E240020 */ lw $a0, 0x20($s1) +/* 9D78AC 8024088C 0040802D */ daddu $s0, $v0, $zero +/* 9D78B0 80240890 16000005 */ bnez $s0, .L802408A8 +/* 9D78B4 80240894 00000000 */ nop +/* 9D78B8 80240898 0C00AB4B */ jal heap_free +/* 9D78BC 8024089C 8E440070 */ lw $a0, 0x70($s2) +/* 9D78C0 802408A0 08090253 */ j .L8024094C +/* 9D78C4 802408A4 24020002 */ addiu $v0, $zero, 2 +.L802408A8: +/* 9D78C8 802408A8 C62C000C */ lwc1 $f12, 0xc($s1) +/* 9D78CC 802408AC 0C00A8BB */ jal sin_deg +/* 9D78D0 802408B0 00000000 */ nop +/* 9D78D4 802408B4 C6220014 */ lwc1 $f2, 0x14($s1) +/* 9D78D8 802408B8 46001082 */ mul.s $f2, $f2, $f0 +/* 9D78DC 802408BC 00000000 */ nop +/* 9D78E0 802408C0 C6000008 */ lwc1 $f0, 8($s0) +/* 9D78E4 802408C4 46020000 */ add.s $f0, $f0, $f2 +/* 9D78E8 802408C8 E6000008 */ swc1 $f0, 8($s0) +/* 9D78EC 802408CC 0C00A8D4 */ jal cos_deg +/* 9D78F0 802408D0 C62C000C */ lwc1 $f12, 0xc($s1) +/* 9D78F4 802408D4 C6220014 */ lwc1 $f2, 0x14($s1) +/* 9D78F8 802408D8 46001082 */ mul.s $f2, $f2, $f0 +/* 9D78FC 802408DC 00000000 */ nop +/* 9D7900 802408E0 C6000010 */ lwc1 $f0, 0x10($s0) +/* 9D7904 802408E4 46020001 */ sub.s $f0, $f0, $f2 +/* 9D7908 802408E8 E6000010 */ swc1 $f0, 0x10($s0) +/* 9D790C 802408EC C600000C */ lwc1 $f0, 0xc($s0) +/* 9D7910 802408F0 C6220018 */ lwc1 $f2, 0x18($s1) +/* 9D7914 802408F4 46020000 */ add.s $f0, $f0, $f2 +/* 9D7918 802408F8 E600000C */ swc1 $f0, 0xc($s0) +/* 9D791C 802408FC C6200018 */ lwc1 $f0, 0x18($s1) +/* 9D7920 80240900 C6220010 */ lwc1 $f2, 0x10($s1) +/* 9D7924 80240904 8E22001C */ lw $v0, 0x1c($s1) +/* 9D7928 80240908 46020001 */ sub.s $f0, $f0, $f2 +/* 9D792C 8024090C 2442FFFF */ addiu $v0, $v0, -1 +/* 9D7930 80240910 AE22001C */ sw $v0, 0x1c($s1) +/* 9D7934 80240914 04400003 */ bltz $v0, .L80240924 +/* 9D7938 80240918 E6200018 */ swc1 $f0, 0x18($s1) +/* 9D793C 8024091C 08090253 */ j .L8024094C +/* 9D7940 80240920 0000102D */ daddu $v0, $zero, $zero +.L80240924: +/* 9D7944 80240924 C6200000 */ lwc1 $f0, ($s1) +/* 9D7948 80240928 E6000008 */ swc1 $f0, 8($s0) +/* 9D794C 8024092C C6200004 */ lwc1 $f0, 4($s1) +/* 9D7950 80240930 E600000C */ swc1 $f0, 0xc($s0) +/* 9D7954 80240934 C6200008 */ lwc1 $f0, 8($s1) +/* 9D7958 80240938 E6000010 */ swc1 $f0, 0x10($s0) +/* 9D795C 8024093C AE200018 */ sw $zero, 0x18($s1) +/* 9D7960 80240940 0C00AB4B */ jal heap_free +/* 9D7964 80240944 8E440070 */ lw $a0, 0x70($s2) +/* 9D7968 80240948 24020001 */ addiu $v0, $zero, 1 +.L8024094C: +/* 9D796C 8024094C 8FBF001C */ lw $ra, 0x1c($sp) +/* 9D7970 80240950 8FB20018 */ lw $s2, 0x18($sp) +/* 9D7974 80240954 8FB10014 */ lw $s1, 0x14($sp) +/* 9D7978 80240958 8FB00010 */ lw $s0, 0x10($sp) +/* 9D797C 8024095C D7B40020 */ ldc1 $f20, 0x20($sp) +/* 9D7980 80240960 03E00008 */ jr $ra +/* 9D7984 80240964 27BD0028 */ addiu $sp, $sp, 0x28 +/* 9D7988 80240968 00000000 */ nop +/* 9D798C 8024096C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80.s deleted file mode 100644 index c3f8fa8627..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A80 -/* 9D7AA0 80240A80 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D7AA4 80240A84 AFB50024 */ sw $s5, 0x24($sp) -/* 9D7AA8 80240A88 0080A82D */ daddu $s5, $a0, $zero -/* 9D7AAC 80240A8C AFBF002C */ sw $ra, 0x2c($sp) -/* 9D7AB0 80240A90 AFB60028 */ sw $s6, 0x28($sp) -/* 9D7AB4 80240A94 AFB40020 */ sw $s4, 0x20($sp) -/* 9D7AB8 80240A98 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D7ABC 80240A9C AFB20018 */ sw $s2, 0x18($sp) -/* 9D7AC0 80240AA0 AFB10014 */ sw $s1, 0x14($sp) -/* 9D7AC4 80240AA4 AFB00010 */ sw $s0, 0x10($sp) -/* 9D7AC8 80240AA8 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9D7ACC 80240AAC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9D7AD0 80240AB0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9D7AD4 80240AB4 8EB30148 */ lw $s3, 0x148($s5) -/* 9D7AD8 80240AB8 86640008 */ lh $a0, 8($s3) -/* 9D7ADC 80240ABC 0C00EABB */ jal get_npc_unsafe -/* 9D7AE0 80240AC0 00A0B02D */ daddu $s6, $a1, $zero -/* 9D7AE4 80240AC4 0040A02D */ daddu $s4, $v0, $zero -/* 9D7AE8 80240AC8 AEA00074 */ sw $zero, 0x74($s5) -/* 9D7AEC 80240ACC C6980038 */ lwc1 $f24, 0x38($s4) -/* 9D7AF0 80240AD0 C6960040 */ lwc1 $f22, 0x40($s4) -/* 9D7AF4 80240AD4 0000902D */ daddu $s2, $zero, $zero -/* 9D7AF8 80240AD8 AEA00078 */ sw $zero, 0x78($s5) -/* 9D7AFC 80240ADC 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9D7B00 80240AE0 8C620000 */ lw $v0, ($v1) -/* 9D7B04 80240AE4 3C0146FF */ lui $at, 0x46ff -/* 9D7B08 80240AE8 3421FE00 */ ori $at, $at, 0xfe00 -/* 9D7B0C 80240AEC 4481A000 */ mtc1 $at, $f20 -/* 9D7B10 80240AF0 18400018 */ blez $v0, .L80240B54 -/* 9D7B14 80240AF4 0240802D */ daddu $s0, $s2, $zero -/* 9D7B18 80240AF8 0240882D */ daddu $s1, $s2, $zero -.L80240AFC: -/* 9D7B1C 80240AFC 02231021 */ addu $v0, $s1, $v1 -/* 9D7B20 80240B00 4600C306 */ mov.s $f12, $f24 -/* 9D7B24 80240B04 C4440004 */ lwc1 $f4, 4($v0) -/* 9D7B28 80240B08 46802120 */ cvt.s.w $f4, $f4 -/* 9D7B2C 80240B0C 44062000 */ mfc1 $a2, $f4 -/* 9D7B30 80240B10 C444000C */ lwc1 $f4, 0xc($v0) -/* 9D7B34 80240B14 46802120 */ cvt.s.w $f4, $f4 -/* 9D7B38 80240B18 44072000 */ mfc1 $a3, $f4 -/* 9D7B3C 80240B1C 0C00A7B5 */ jal dist2D -/* 9D7B40 80240B20 4600B386 */ mov.s $f14, $f22 -/* 9D7B44 80240B24 4614003C */ c.lt.s $f0, $f20 -/* 9D7B48 80240B28 00000000 */ nop -/* 9D7B4C 80240B2C 45000003 */ bc1f .L80240B3C -/* 9D7B50 80240B30 2631000C */ addiu $s1, $s1, 0xc -/* 9D7B54 80240B34 46000506 */ mov.s $f20, $f0 -/* 9D7B58 80240B38 AEB20078 */ sw $s2, 0x78($s5) -.L80240B3C: -/* 9D7B5C 80240B3C 8E6300D0 */ lw $v1, 0xd0($s3) -/* 9D7B60 80240B40 26100001 */ addiu $s0, $s0, 1 -/* 9D7B64 80240B44 8C620000 */ lw $v0, ($v1) -/* 9D7B68 80240B48 0202102A */ slt $v0, $s0, $v0 -/* 9D7B6C 80240B4C 1440FFEB */ bnez $v0, .L80240AFC -/* 9D7B70 80240B50 26520001 */ addiu $s2, $s2, 1 -.L80240B54: -/* 9D7B74 80240B54 8E6200CC */ lw $v0, 0xcc($s3) -/* 9D7B78 80240B58 8C420004 */ lw $v0, 4($v0) -/* 9D7B7C 80240B5C AE820028 */ sw $v0, 0x28($s4) -/* 9D7B80 80240B60 8E6200D0 */ lw $v0, 0xd0($s3) -/* 9D7B84 80240B64 8C42007C */ lw $v0, 0x7c($v0) -/* 9D7B88 80240B68 04410004 */ bgez $v0, .L80240B7C -/* 9D7B8C 80240B6C 00000000 */ nop -/* 9D7B90 80240B70 C6C00000 */ lwc1 $f0, ($s6) -/* 9D7B94 80240B74 080902E7 */ j .L80240B9C -/* 9D7B98 80240B78 E6800018 */ swc1 $f0, 0x18($s4) -.L80240B7C: -/* 9D7B9C 80240B7C 3C018025 */ lui $at, 0x8025 -/* 9D7BA0 80240B80 D4224620 */ ldc1 $f2, 0x4620($at) -/* 9D7BA4 80240B84 44820000 */ mtc1 $v0, $f0 -/* 9D7BA8 80240B88 00000000 */ nop -/* 9D7BAC 80240B8C 46800021 */ cvt.d.w $f0, $f0 -/* 9D7BB0 80240B90 46220003 */ div.d $f0, $f0, $f2 -/* 9D7BB4 80240B94 46200020 */ cvt.s.d $f0, $f0 -/* 9D7BB8 80240B98 E6800018 */ swc1 $f0, 0x18($s4) -.L80240B9C: -/* 9D7BBC 80240B9C 24020001 */ addiu $v0, $zero, 1 -/* 9D7BC0 80240BA0 AEA20070 */ sw $v0, 0x70($s5) -/* 9D7BC4 80240BA4 8FBF002C */ lw $ra, 0x2c($sp) -/* 9D7BC8 80240BA8 8FB60028 */ lw $s6, 0x28($sp) -/* 9D7BCC 80240BAC 8FB50024 */ lw $s5, 0x24($sp) -/* 9D7BD0 80240BB0 8FB40020 */ lw $s4, 0x20($sp) -/* 9D7BD4 80240BB4 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D7BD8 80240BB8 8FB20018 */ lw $s2, 0x18($sp) -/* 9D7BDC 80240BBC 8FB10014 */ lw $s1, 0x14($sp) -/* 9D7BE0 80240BC0 8FB00010 */ lw $s0, 0x10($sp) -/* 9D7BE4 80240BC4 D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9D7BE8 80240BC8 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9D7BEC 80240BCC D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9D7BF0 80240BD0 03E00008 */ jr $ra -/* 9D7BF4 80240BD4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s new file mode 100644 index 0000000000..9611d44282 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80240A80_9D7AA0.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A80_9D7AA0 +/* 9D7AA0 80240A80 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9D7AA4 80240A84 AFB50024 */ sw $s5, 0x24($sp) +/* 9D7AA8 80240A88 0080A82D */ daddu $s5, $a0, $zero +/* 9D7AAC 80240A8C AFBF002C */ sw $ra, 0x2c($sp) +/* 9D7AB0 80240A90 AFB60028 */ sw $s6, 0x28($sp) +/* 9D7AB4 80240A94 AFB40020 */ sw $s4, 0x20($sp) +/* 9D7AB8 80240A98 AFB3001C */ sw $s3, 0x1c($sp) +/* 9D7ABC 80240A9C AFB20018 */ sw $s2, 0x18($sp) +/* 9D7AC0 80240AA0 AFB10014 */ sw $s1, 0x14($sp) +/* 9D7AC4 80240AA4 AFB00010 */ sw $s0, 0x10($sp) +/* 9D7AC8 80240AA8 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 9D7ACC 80240AAC F7B60038 */ sdc1 $f22, 0x38($sp) +/* 9D7AD0 80240AB0 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 9D7AD4 80240AB4 8EB30148 */ lw $s3, 0x148($s5) +/* 9D7AD8 80240AB8 86640008 */ lh $a0, 8($s3) +/* 9D7ADC 80240ABC 0C00EABB */ jal get_npc_unsafe +/* 9D7AE0 80240AC0 00A0B02D */ daddu $s6, $a1, $zero +/* 9D7AE4 80240AC4 0040A02D */ daddu $s4, $v0, $zero +/* 9D7AE8 80240AC8 AEA00074 */ sw $zero, 0x74($s5) +/* 9D7AEC 80240ACC C6980038 */ lwc1 $f24, 0x38($s4) +/* 9D7AF0 80240AD0 C6960040 */ lwc1 $f22, 0x40($s4) +/* 9D7AF4 80240AD4 0000902D */ daddu $s2, $zero, $zero +/* 9D7AF8 80240AD8 AEA00078 */ sw $zero, 0x78($s5) +/* 9D7AFC 80240ADC 8E6300D0 */ lw $v1, 0xd0($s3) +/* 9D7B00 80240AE0 8C620000 */ lw $v0, ($v1) +/* 9D7B04 80240AE4 3C0146FF */ lui $at, 0x46ff +/* 9D7B08 80240AE8 3421FE00 */ ori $at, $at, 0xfe00 +/* 9D7B0C 80240AEC 4481A000 */ mtc1 $at, $f20 +/* 9D7B10 80240AF0 18400018 */ blez $v0, .L80240B54 +/* 9D7B14 80240AF4 0240802D */ daddu $s0, $s2, $zero +/* 9D7B18 80240AF8 0240882D */ daddu $s1, $s2, $zero +.L80240AFC: +/* 9D7B1C 80240AFC 02231021 */ addu $v0, $s1, $v1 +/* 9D7B20 80240B00 4600C306 */ mov.s $f12, $f24 +/* 9D7B24 80240B04 C4440004 */ lwc1 $f4, 4($v0) +/* 9D7B28 80240B08 46802120 */ cvt.s.w $f4, $f4 +/* 9D7B2C 80240B0C 44062000 */ mfc1 $a2, $f4 +/* 9D7B30 80240B10 C444000C */ lwc1 $f4, 0xc($v0) +/* 9D7B34 80240B14 46802120 */ cvt.s.w $f4, $f4 +/* 9D7B38 80240B18 44072000 */ mfc1 $a3, $f4 +/* 9D7B3C 80240B1C 0C00A7B5 */ jal dist2D +/* 9D7B40 80240B20 4600B386 */ mov.s $f14, $f22 +/* 9D7B44 80240B24 4614003C */ c.lt.s $f0, $f20 +/* 9D7B48 80240B28 00000000 */ nop +/* 9D7B4C 80240B2C 45000003 */ bc1f .L80240B3C +/* 9D7B50 80240B30 2631000C */ addiu $s1, $s1, 0xc +/* 9D7B54 80240B34 46000506 */ mov.s $f20, $f0 +/* 9D7B58 80240B38 AEB20078 */ sw $s2, 0x78($s5) +.L80240B3C: +/* 9D7B5C 80240B3C 8E6300D0 */ lw $v1, 0xd0($s3) +/* 9D7B60 80240B40 26100001 */ addiu $s0, $s0, 1 +/* 9D7B64 80240B44 8C620000 */ lw $v0, ($v1) +/* 9D7B68 80240B48 0202102A */ slt $v0, $s0, $v0 +/* 9D7B6C 80240B4C 1440FFEB */ bnez $v0, .L80240AFC +/* 9D7B70 80240B50 26520001 */ addiu $s2, $s2, 1 +.L80240B54: +/* 9D7B74 80240B54 8E6200CC */ lw $v0, 0xcc($s3) +/* 9D7B78 80240B58 8C420004 */ lw $v0, 4($v0) +/* 9D7B7C 80240B5C AE820028 */ sw $v0, 0x28($s4) +/* 9D7B80 80240B60 8E6200D0 */ lw $v0, 0xd0($s3) +/* 9D7B84 80240B64 8C42007C */ lw $v0, 0x7c($v0) +/* 9D7B88 80240B68 04410004 */ bgez $v0, .L80240B7C +/* 9D7B8C 80240B6C 00000000 */ nop +/* 9D7B90 80240B70 C6C00000 */ lwc1 $f0, ($s6) +/* 9D7B94 80240B74 080902E7 */ j .L80240B9C +/* 9D7B98 80240B78 E6800018 */ swc1 $f0, 0x18($s4) +.L80240B7C: +/* 9D7B9C 80240B7C 3C018025 */ lui $at, 0x8025 +/* 9D7BA0 80240B80 D4224620 */ ldc1 $f2, 0x4620($at) +/* 9D7BA4 80240B84 44820000 */ mtc1 $v0, $f0 +/* 9D7BA8 80240B88 00000000 */ nop +/* 9D7BAC 80240B8C 46800021 */ cvt.d.w $f0, $f0 +/* 9D7BB0 80240B90 46220003 */ div.d $f0, $f0, $f2 +/* 9D7BB4 80240B94 46200020 */ cvt.s.d $f0, $f0 +/* 9D7BB8 80240B98 E6800018 */ swc1 $f0, 0x18($s4) +.L80240B9C: +/* 9D7BBC 80240B9C 24020001 */ addiu $v0, $zero, 1 +/* 9D7BC0 80240BA0 AEA20070 */ sw $v0, 0x70($s5) +/* 9D7BC4 80240BA4 8FBF002C */ lw $ra, 0x2c($sp) +/* 9D7BC8 80240BA8 8FB60028 */ lw $s6, 0x28($sp) +/* 9D7BCC 80240BAC 8FB50024 */ lw $s5, 0x24($sp) +/* 9D7BD0 80240BB0 8FB40020 */ lw $s4, 0x20($sp) +/* 9D7BD4 80240BB4 8FB3001C */ lw $s3, 0x1c($sp) +/* 9D7BD8 80240BB8 8FB20018 */ lw $s2, 0x18($sp) +/* 9D7BDC 80240BBC 8FB10014 */ lw $s1, 0x14($sp) +/* 9D7BE0 80240BC0 8FB00010 */ lw $s0, 0x10($sp) +/* 9D7BE4 80240BC4 D7B80040 */ ldc1 $f24, 0x40($sp) +/* 9D7BE8 80240BC8 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 9D7BEC 80240BCC D7B40030 */ ldc1 $f20, 0x30($sp) +/* 9D7BF0 80240BD0 03E00008 */ jr $ra +/* 9D7BF4 80240BD4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC.s deleted file mode 100644 index 9c3356b083..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410FC -/* 9D811C 802410FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D8120 80241100 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8124 80241104 0080882D */ daddu $s1, $a0, $zero -/* 9D8128 80241108 AFBF001C */ sw $ra, 0x1c($sp) -/* 9D812C 8024110C AFB20018 */ sw $s2, 0x18($sp) -/* 9D8130 80241110 AFB00010 */ sw $s0, 0x10($sp) -/* 9D8134 80241114 8E300148 */ lw $s0, 0x148($s1) -/* 9D8138 80241118 86040008 */ lh $a0, 8($s0) -/* 9D813C 8024111C 0C00EABB */ jal get_npc_unsafe -/* 9D8140 80241120 00A0902D */ daddu $s2, $a1, $zero -/* 9D8144 80241124 8E230078 */ lw $v1, 0x78($s1) -/* 9D8148 80241128 24630001 */ addiu $v1, $v1, 1 -/* 9D814C 8024112C AE230078 */ sw $v1, 0x78($s1) -/* 9D8150 80241130 8E0400D0 */ lw $a0, 0xd0($s0) -/* 9D8154 80241134 8C840000 */ lw $a0, ($a0) -/* 9D8158 80241138 0064182A */ slt $v1, $v1, $a0 -/* 9D815C 8024113C 14600002 */ bnez $v1, .L80241148 -/* 9D8160 80241140 0040282D */ daddu $a1, $v0, $zero -/* 9D8164 80241144 AE200078 */ sw $zero, 0x78($s1) -.L80241148: -/* 9D8168 80241148 8E0200CC */ lw $v0, 0xcc($s0) -/* 9D816C 8024114C 8C420004 */ lw $v0, 4($v0) -/* 9D8170 80241150 ACA20028 */ sw $v0, 0x28($a1) -/* 9D8174 80241154 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9D8178 80241158 8C42007C */ lw $v0, 0x7c($v0) -/* 9D817C 8024115C 04410004 */ bgez $v0, .L80241170 -/* 9D8180 80241160 00000000 */ nop -/* 9D8184 80241164 C6400000 */ lwc1 $f0, ($s2) -/* 9D8188 80241168 08090464 */ j .L80241190 -/* 9D818C 8024116C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241170: -/* 9D8190 80241170 3C018025 */ lui $at, 0x8025 -/* 9D8194 80241174 D4224628 */ ldc1 $f2, 0x4628($at) -/* 9D8198 80241178 44820000 */ mtc1 $v0, $f0 -/* 9D819C 8024117C 00000000 */ nop -/* 9D81A0 80241180 46800021 */ cvt.d.w $f0, $f0 -/* 9D81A4 80241184 46220003 */ div.d $f0, $f0, $f2 -/* 9D81A8 80241188 46200020 */ cvt.s.d $f0, $f0 -/* 9D81AC 8024118C E4A00018 */ swc1 $f0, 0x18($a1) -.L80241190: -/* 9D81B0 80241190 24020001 */ addiu $v0, $zero, 1 -/* 9D81B4 80241194 AE220070 */ sw $v0, 0x70($s1) -/* 9D81B8 80241198 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D81BC 8024119C 8FB20018 */ lw $s2, 0x18($sp) -/* 9D81C0 802411A0 8FB10014 */ lw $s1, 0x14($sp) -/* 9D81C4 802411A4 8FB00010 */ lw $s0, 0x10($sp) -/* 9D81C8 802411A8 03E00008 */ jr $ra -/* 9D81CC 802411AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s new file mode 100644 index 0000000000..0ae94b81d5 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802410FC_9D811C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410FC_9D811C +/* 9D811C 802410FC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9D8120 80241100 AFB10014 */ sw $s1, 0x14($sp) +/* 9D8124 80241104 0080882D */ daddu $s1, $a0, $zero +/* 9D8128 80241108 AFBF001C */ sw $ra, 0x1c($sp) +/* 9D812C 8024110C AFB20018 */ sw $s2, 0x18($sp) +/* 9D8130 80241110 AFB00010 */ sw $s0, 0x10($sp) +/* 9D8134 80241114 8E300148 */ lw $s0, 0x148($s1) +/* 9D8138 80241118 86040008 */ lh $a0, 8($s0) +/* 9D813C 8024111C 0C00EABB */ jal get_npc_unsafe +/* 9D8140 80241120 00A0902D */ daddu $s2, $a1, $zero +/* 9D8144 80241124 8E230078 */ lw $v1, 0x78($s1) +/* 9D8148 80241128 24630001 */ addiu $v1, $v1, 1 +/* 9D814C 8024112C AE230078 */ sw $v1, 0x78($s1) +/* 9D8150 80241130 8E0400D0 */ lw $a0, 0xd0($s0) +/* 9D8154 80241134 8C840000 */ lw $a0, ($a0) +/* 9D8158 80241138 0064182A */ slt $v1, $v1, $a0 +/* 9D815C 8024113C 14600002 */ bnez $v1, .L80241148 +/* 9D8160 80241140 0040282D */ daddu $a1, $v0, $zero +/* 9D8164 80241144 AE200078 */ sw $zero, 0x78($s1) +.L80241148: +/* 9D8168 80241148 8E0200CC */ lw $v0, 0xcc($s0) +/* 9D816C 8024114C 8C420004 */ lw $v0, 4($v0) +/* 9D8170 80241150 ACA20028 */ sw $v0, 0x28($a1) +/* 9D8174 80241154 8E0200D0 */ lw $v0, 0xd0($s0) +/* 9D8178 80241158 8C42007C */ lw $v0, 0x7c($v0) +/* 9D817C 8024115C 04410004 */ bgez $v0, .L80241170 +/* 9D8180 80241160 00000000 */ nop +/* 9D8184 80241164 C6400000 */ lwc1 $f0, ($s2) +/* 9D8188 80241168 08090464 */ j .L80241190 +/* 9D818C 8024116C E4A00018 */ swc1 $f0, 0x18($a1) +.L80241170: +/* 9D8190 80241170 3C018025 */ lui $at, 0x8025 +/* 9D8194 80241174 D4224628 */ ldc1 $f2, 0x4628($at) +/* 9D8198 80241178 44820000 */ mtc1 $v0, $f0 +/* 9D819C 8024117C 00000000 */ nop +/* 9D81A0 80241180 46800021 */ cvt.d.w $f0, $f0 +/* 9D81A4 80241184 46220003 */ div.d $f0, $f0, $f2 +/* 9D81A8 80241188 46200020 */ cvt.s.d $f0, $f0 +/* 9D81AC 8024118C E4A00018 */ swc1 $f0, 0x18($a1) +.L80241190: +/* 9D81B0 80241190 24020001 */ addiu $v0, $zero, 1 +/* 9D81B4 80241194 AE220070 */ sw $v0, 0x70($s1) +/* 9D81B8 80241198 8FBF001C */ lw $ra, 0x1c($sp) +/* 9D81BC 8024119C 8FB20018 */ lw $s2, 0x18($sp) +/* 9D81C0 802411A0 8FB10014 */ lw $s1, 0x14($sp) +/* 9D81C4 802411A4 8FB00010 */ lw $s0, 0x10($sp) +/* 9D81C8 802411A8 03E00008 */ jr $ra +/* 9D81CC 802411AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224.s deleted file mode 100644 index e9512e8de4..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241224 -/* 9D8244 80241224 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D8248 80241228 AFB00010 */ sw $s0, 0x10($sp) -/* 9D824C 8024122C 0080802D */ daddu $s0, $a0, $zero -/* 9D8250 80241230 AFBF0014 */ sw $ra, 0x14($sp) -/* 9D8254 80241234 8E020148 */ lw $v0, 0x148($s0) -/* 9D8258 80241238 0C00EABB */ jal get_npc_unsafe -/* 9D825C 8024123C 84440008 */ lh $a0, 8($v0) -/* 9D8260 80241240 0040202D */ daddu $a0, $v0, $zero -/* 9D8264 80241244 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9D8268 80241248 C480001C */ lwc1 $f0, 0x1c($a0) -/* 9D826C 8024124C 46001080 */ add.s $f2, $f2, $f0 -/* 9D8270 80241250 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9D8274 80241254 46040001 */ sub.s $f0, $f0, $f4 -/* 9D8278 80241258 C4840064 */ lwc1 $f4, 0x64($a0) -/* 9D827C 8024125C 4602203C */ c.lt.s $f4, $f2 -/* 9D8280 80241260 E482003C */ swc1 $f2, 0x3c($a0) -/* 9D8284 80241264 45010009 */ bc1t .L8024128C -/* 9D8288 80241268 E480001C */ swc1 $f0, 0x1c($a0) -/* 9D828C 8024126C 8C820000 */ lw $v0, ($a0) -/* 9D8290 80241270 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9D8294 80241274 E484003C */ swc1 $f4, 0x3c($a0) -/* 9D8298 80241278 AC80001C */ sw $zero, 0x1c($a0) -/* 9D829C 8024127C 00431024 */ and $v0, $v0, $v1 -/* 9D82A0 80241280 AC820000 */ sw $v0, ($a0) -/* 9D82A4 80241284 2402000C */ addiu $v0, $zero, 0xc -/* 9D82A8 80241288 AE020070 */ sw $v0, 0x70($s0) -.L8024128C: -/* 9D82AC 8024128C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9D82B0 80241290 8FB00010 */ lw $s0, 0x10($sp) -/* 9D82B4 80241294 03E00008 */ jr $ra -/* 9D82B8 80241298 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224_9D8244.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224_9D8244.s new file mode 100644 index 0000000000..2aa1ad5f1a --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241224_9D8244.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241224_9D8244 +/* 9D8244 80241224 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D8248 80241228 AFB00010 */ sw $s0, 0x10($sp) +/* 9D824C 8024122C 0080802D */ daddu $s0, $a0, $zero +/* 9D8250 80241230 AFBF0014 */ sw $ra, 0x14($sp) +/* 9D8254 80241234 8E020148 */ lw $v0, 0x148($s0) +/* 9D8258 80241238 0C00EABB */ jal get_npc_unsafe +/* 9D825C 8024123C 84440008 */ lh $a0, 8($v0) +/* 9D8260 80241240 0040202D */ daddu $a0, $v0, $zero +/* 9D8264 80241244 C482003C */ lwc1 $f2, 0x3c($a0) +/* 9D8268 80241248 C480001C */ lwc1 $f0, 0x1c($a0) +/* 9D826C 8024124C 46001080 */ add.s $f2, $f2, $f0 +/* 9D8270 80241250 C4840014 */ lwc1 $f4, 0x14($a0) +/* 9D8274 80241254 46040001 */ sub.s $f0, $f0, $f4 +/* 9D8278 80241258 C4840064 */ lwc1 $f4, 0x64($a0) +/* 9D827C 8024125C 4602203C */ c.lt.s $f4, $f2 +/* 9D8280 80241260 E482003C */ swc1 $f2, 0x3c($a0) +/* 9D8284 80241264 45010009 */ bc1t .L8024128C +/* 9D8288 80241268 E480001C */ swc1 $f0, 0x1c($a0) +/* 9D828C 8024126C 8C820000 */ lw $v0, ($a0) +/* 9D8290 80241270 2403F7FF */ addiu $v1, $zero, -0x801 +/* 9D8294 80241274 E484003C */ swc1 $f4, 0x3c($a0) +/* 9D8298 80241278 AC80001C */ sw $zero, 0x1c($a0) +/* 9D829C 8024127C 00431024 */ and $v0, $v0, $v1 +/* 9D82A0 80241280 AC820000 */ sw $v0, ($a0) +/* 9D82A4 80241284 2402000C */ addiu $v0, $zero, 0xc +/* 9D82A8 80241288 AE020070 */ sw $v0, 0x70($s0) +.L8024128C: +/* 9D82AC 8024128C 8FBF0014 */ lw $ra, 0x14($sp) +/* 9D82B0 80241290 8FB00010 */ lw $s0, 0x10($sp) +/* 9D82B4 80241294 03E00008 */ jr $ra +/* 9D82B8 80241298 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C.s deleted file mode 100644 index 378af5b509..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024129C -/* 9D82BC 8024129C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9D82C0 802412A0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D82C4 802412A4 0080982D */ daddu $s3, $a0, $zero -/* 9D82C8 802412A8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9D82CC 802412AC AFB20018 */ sw $s2, 0x18($sp) -/* 9D82D0 802412B0 AFB10014 */ sw $s1, 0x14($sp) -/* 9D82D4 802412B4 AFB00010 */ sw $s0, 0x10($sp) -/* 9D82D8 802412B8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9D82DC 802412BC 8E710148 */ lw $s1, 0x148($s3) -/* 9D82E0 802412C0 86240008 */ lh $a0, 8($s1) -/* 9D82E4 802412C4 0C00EABB */ jal get_npc_unsafe -/* 9D82E8 802412C8 00A0802D */ daddu $s0, $a1, $zero -/* 9D82EC 802412CC 8E040020 */ lw $a0, 0x20($s0) -/* 9D82F0 802412D0 0040902D */ daddu $s2, $v0, $zero -/* 9D82F4 802412D4 00041FC2 */ srl $v1, $a0, 0x1f -/* 9D82F8 802412D8 00832021 */ addu $a0, $a0, $v1 -/* 9D82FC 802412DC 00042043 */ sra $a0, $a0, 1 -/* 9D8300 802412E0 0C00A67F */ jal rand_int -/* 9D8304 802412E4 24840001 */ addiu $a0, $a0, 1 -/* 9D8308 802412E8 8E030020 */ lw $v1, 0x20($s0) -/* 9D830C 802412EC C64C0038 */ lwc1 $f12, 0x38($s2) -/* 9D8310 802412F0 000327C2 */ srl $a0, $v1, 0x1f -/* 9D8314 802412F4 00641821 */ addu $v1, $v1, $a0 -/* 9D8318 802412F8 00031843 */ sra $v1, $v1, 1 -/* 9D831C 802412FC 00621821 */ addu $v1, $v1, $v0 -/* 9D8320 80241300 A643008E */ sh $v1, 0x8e($s2) -/* 9D8324 80241304 8E2200CC */ lw $v0, 0xcc($s1) -/* 9D8328 80241308 C64E0040 */ lwc1 $f14, 0x40($s2) -/* 9D832C 8024130C 8C42000C */ lw $v0, 0xc($v0) -/* 9D8330 80241310 AE420028 */ sw $v0, 0x28($s2) -/* 9D8334 80241314 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9D8338 80241318 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9D833C 8024131C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9D8340 80241320 E6400018 */ swc1 $f0, 0x18($s2) -/* 9D8344 80241324 8C460028 */ lw $a2, 0x28($v0) -/* 9D8348 80241328 0C00A720 */ jal atan2 -/* 9D834C 8024132C 8C470030 */ lw $a3, 0x30($v0) -/* 9D8350 80241330 46000506 */ mov.s $f20, $f0 -/* 9D8354 80241334 C64C000C */ lwc1 $f12, 0xc($s2) -/* 9D8358 80241338 0C00A70A */ jal get_clamped_angle_diff -/* 9D835C 8024133C 4600A386 */ mov.s $f14, $f20 -/* 9D8360 80241340 46000086 */ mov.s $f2, $f0 -/* 9D8364 80241344 8E02001C */ lw $v0, 0x1c($s0) -/* 9D8368 80241348 46001005 */ abs.s $f0, $f2 -/* 9D836C 8024134C 44822000 */ mtc1 $v0, $f4 -/* 9D8370 80241350 00000000 */ nop -/* 9D8374 80241354 46802120 */ cvt.s.w $f4, $f4 -/* 9D8378 80241358 4600203C */ c.lt.s $f4, $f0 -/* 9D837C 8024135C 00000000 */ nop -/* 9D8380 80241360 4500000D */ bc1f .L80241398 -/* 9D8384 80241364 00000000 */ nop -/* 9D8388 80241368 44800000 */ mtc1 $zero, $f0 -/* 9D838C 8024136C C654000C */ lwc1 $f20, 0xc($s2) -/* 9D8390 80241370 4600103C */ c.lt.s $f2, $f0 -/* 9D8394 80241374 00000000 */ nop -/* 9D8398 80241378 45000006 */ bc1f .L80241394 -/* 9D839C 8024137C 00021023 */ negu $v0, $v0 -/* 9D83A0 80241380 44820000 */ mtc1 $v0, $f0 -/* 9D83A4 80241384 00000000 */ nop -/* 9D83A8 80241388 46800020 */ cvt.s.w $f0, $f0 -/* 9D83AC 8024138C 080904E6 */ j .L80241398 -/* 9D83B0 80241390 4600A500 */ add.s $f20, $f20, $f0 -.L80241394: -/* 9D83B4 80241394 4604A500 */ add.s $f20, $f20, $f4 -.L80241398: -/* 9D83B8 80241398 0C00A6C9 */ jal clamp_angle -/* 9D83BC 8024139C 4600A306 */ mov.s $f12, $f20 -/* 9D83C0 802413A0 2402000D */ addiu $v0, $zero, 0xd -/* 9D83C4 802413A4 E640000C */ swc1 $f0, 0xc($s2) -/* 9D83C8 802413A8 AE620070 */ sw $v0, 0x70($s3) -/* 9D83CC 802413AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9D83D0 802413B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D83D4 802413B4 8FB20018 */ lw $s2, 0x18($sp) -/* 9D83D8 802413B8 8FB10014 */ lw $s1, 0x14($sp) -/* 9D83DC 802413BC 8FB00010 */ lw $s0, 0x10($sp) -/* 9D83E0 802413C0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9D83E4 802413C4 03E00008 */ jr $ra -/* 9D83E8 802413C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C_9D82BC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C_9D82BC.s new file mode 100644 index 0000000000..ddc3e8bad5 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024129C_9D82BC.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024129C_9D82BC +/* 9D82BC 8024129C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9D82C0 802412A0 AFB3001C */ sw $s3, 0x1c($sp) +/* 9D82C4 802412A4 0080982D */ daddu $s3, $a0, $zero +/* 9D82C8 802412A8 AFBF0020 */ sw $ra, 0x20($sp) +/* 9D82CC 802412AC AFB20018 */ sw $s2, 0x18($sp) +/* 9D82D0 802412B0 AFB10014 */ sw $s1, 0x14($sp) +/* 9D82D4 802412B4 AFB00010 */ sw $s0, 0x10($sp) +/* 9D82D8 802412B8 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 9D82DC 802412BC 8E710148 */ lw $s1, 0x148($s3) +/* 9D82E0 802412C0 86240008 */ lh $a0, 8($s1) +/* 9D82E4 802412C4 0C00EABB */ jal get_npc_unsafe +/* 9D82E8 802412C8 00A0802D */ daddu $s0, $a1, $zero +/* 9D82EC 802412CC 8E040020 */ lw $a0, 0x20($s0) +/* 9D82F0 802412D0 0040902D */ daddu $s2, $v0, $zero +/* 9D82F4 802412D4 00041FC2 */ srl $v1, $a0, 0x1f +/* 9D82F8 802412D8 00832021 */ addu $a0, $a0, $v1 +/* 9D82FC 802412DC 00042043 */ sra $a0, $a0, 1 +/* 9D8300 802412E0 0C00A67F */ jal rand_int +/* 9D8304 802412E4 24840001 */ addiu $a0, $a0, 1 +/* 9D8308 802412E8 8E030020 */ lw $v1, 0x20($s0) +/* 9D830C 802412EC C64C0038 */ lwc1 $f12, 0x38($s2) +/* 9D8310 802412F0 000327C2 */ srl $a0, $v1, 0x1f +/* 9D8314 802412F4 00641821 */ addu $v1, $v1, $a0 +/* 9D8318 802412F8 00031843 */ sra $v1, $v1, 1 +/* 9D831C 802412FC 00621821 */ addu $v1, $v1, $v0 +/* 9D8320 80241300 A643008E */ sh $v1, 0x8e($s2) +/* 9D8324 80241304 8E2200CC */ lw $v0, 0xcc($s1) +/* 9D8328 80241308 C64E0040 */ lwc1 $f14, 0x40($s2) +/* 9D832C 8024130C 8C42000C */ lw $v0, 0xc($v0) +/* 9D8330 80241310 AE420028 */ sw $v0, 0x28($s2) +/* 9D8334 80241314 C6000018 */ lwc1 $f0, 0x18($s0) +/* 9D8338 80241318 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9D833C 8024131C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9D8340 80241320 E6400018 */ swc1 $f0, 0x18($s2) +/* 9D8344 80241324 8C460028 */ lw $a2, 0x28($v0) +/* 9D8348 80241328 0C00A720 */ jal atan2 +/* 9D834C 8024132C 8C470030 */ lw $a3, 0x30($v0) +/* 9D8350 80241330 46000506 */ mov.s $f20, $f0 +/* 9D8354 80241334 C64C000C */ lwc1 $f12, 0xc($s2) +/* 9D8358 80241338 0C00A70A */ jal get_clamped_angle_diff +/* 9D835C 8024133C 4600A386 */ mov.s $f14, $f20 +/* 9D8360 80241340 46000086 */ mov.s $f2, $f0 +/* 9D8364 80241344 8E02001C */ lw $v0, 0x1c($s0) +/* 9D8368 80241348 46001005 */ abs.s $f0, $f2 +/* 9D836C 8024134C 44822000 */ mtc1 $v0, $f4 +/* 9D8370 80241350 00000000 */ nop +/* 9D8374 80241354 46802120 */ cvt.s.w $f4, $f4 +/* 9D8378 80241358 4600203C */ c.lt.s $f4, $f0 +/* 9D837C 8024135C 00000000 */ nop +/* 9D8380 80241360 4500000D */ bc1f .L80241398 +/* 9D8384 80241364 00000000 */ nop +/* 9D8388 80241368 44800000 */ mtc1 $zero, $f0 +/* 9D838C 8024136C C654000C */ lwc1 $f20, 0xc($s2) +/* 9D8390 80241370 4600103C */ c.lt.s $f2, $f0 +/* 9D8394 80241374 00000000 */ nop +/* 9D8398 80241378 45000006 */ bc1f .L80241394 +/* 9D839C 8024137C 00021023 */ negu $v0, $v0 +/* 9D83A0 80241380 44820000 */ mtc1 $v0, $f0 +/* 9D83A4 80241384 00000000 */ nop +/* 9D83A8 80241388 46800020 */ cvt.s.w $f0, $f0 +/* 9D83AC 8024138C 080904E6 */ j .L80241398 +/* 9D83B0 80241390 4600A500 */ add.s $f20, $f20, $f0 +.L80241394: +/* 9D83B4 80241394 4604A500 */ add.s $f20, $f20, $f4 +.L80241398: +/* 9D83B8 80241398 0C00A6C9 */ jal clamp_angle +/* 9D83BC 8024139C 4600A306 */ mov.s $f12, $f20 +/* 9D83C0 802413A0 2402000D */ addiu $v0, $zero, 0xd +/* 9D83C4 802413A4 E640000C */ swc1 $f0, 0xc($s2) +/* 9D83C8 802413A8 AE620070 */ sw $v0, 0x70($s3) +/* 9D83CC 802413AC 8FBF0020 */ lw $ra, 0x20($sp) +/* 9D83D0 802413B0 8FB3001C */ lw $s3, 0x1c($sp) +/* 9D83D4 802413B4 8FB20018 */ lw $s2, 0x18($sp) +/* 9D83D8 802413B8 8FB10014 */ lw $s1, 0x14($sp) +/* 9D83DC 802413BC 8FB00010 */ lw $s0, 0x10($sp) +/* 9D83E0 802413C0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 9D83E4 802413C4 03E00008 */ jr $ra +/* 9D83E8 802413C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC.s deleted file mode 100644 index 0391d976ed..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413CC -/* 9D83EC 802413CC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D83F0 802413D0 AFB3003C */ sw $s3, 0x3c($sp) -/* 9D83F4 802413D4 0080982D */ daddu $s3, $a0, $zero -/* 9D83F8 802413D8 AFBF0040 */ sw $ra, 0x40($sp) -/* 9D83FC 802413DC AFB20038 */ sw $s2, 0x38($sp) -/* 9D8400 802413E0 AFB10034 */ sw $s1, 0x34($sp) -/* 9D8404 802413E4 AFB00030 */ sw $s0, 0x30($sp) -/* 9D8408 802413E8 8E720148 */ lw $s2, 0x148($s3) -/* 9D840C 802413EC 00A0882D */ daddu $s1, $a1, $zero -/* 9D8410 802413F0 86440008 */ lh $a0, 8($s2) -/* 9D8414 802413F4 0C00EABB */ jal get_npc_unsafe -/* 9D8418 802413F8 00C0802D */ daddu $s0, $a2, $zero -/* 9D841C 802413FC 0200202D */ daddu $a0, $s0, $zero -/* 9D8420 80241400 0240282D */ daddu $a1, $s2, $zero -/* 9D8424 80241404 24030001 */ addiu $v1, $zero, 1 -/* 9D8428 80241408 AFA30010 */ sw $v1, 0x10($sp) -/* 9D842C 8024140C 8E260024 */ lw $a2, 0x24($s1) -/* 9D8430 80241410 8E270028 */ lw $a3, 0x28($s1) -/* 9D8434 80241414 0C01242D */ jal func_800490B4 -/* 9D8438 80241418 0040802D */ daddu $s0, $v0, $zero -/* 9D843C 8024141C 1440001E */ bnez $v0, .L80241498 -/* 9D8440 80241420 0200202D */ daddu $a0, $s0, $zero -/* 9D8444 80241424 24040002 */ addiu $a0, $zero, 2 -/* 9D8448 80241428 0200282D */ daddu $a1, $s0, $zero -/* 9D844C 8024142C 0000302D */ daddu $a2, $zero, $zero -/* 9D8450 80241430 860300A8 */ lh $v1, 0xa8($s0) -/* 9D8454 80241434 3C013F80 */ lui $at, 0x3f80 -/* 9D8458 80241438 44810000 */ mtc1 $at, $f0 -/* 9D845C 8024143C 3C014000 */ lui $at, 0x4000 -/* 9D8460 80241440 44811000 */ mtc1 $at, $f2 -/* 9D8464 80241444 3C01C1A0 */ lui $at, 0xc1a0 -/* 9D8468 80241448 44812000 */ mtc1 $at, $f4 -/* 9D846C 8024144C 2402000F */ addiu $v0, $zero, 0xf -/* 9D8470 80241450 AFA2001C */ sw $v0, 0x1c($sp) -/* 9D8474 80241454 44833000 */ mtc1 $v1, $f6 -/* 9D8478 80241458 00000000 */ nop -/* 9D847C 8024145C 468031A0 */ cvt.s.w $f6, $f6 -/* 9D8480 80241460 44073000 */ mfc1 $a3, $f6 -/* 9D8484 80241464 27A20028 */ addiu $v0, $sp, 0x28 -/* 9D8488 80241468 AFA20020 */ sw $v0, 0x20($sp) -/* 9D848C 8024146C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D8490 80241470 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9D8494 80241474 0C01BFA4 */ jal fx_emote -/* 9D8498 80241478 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9D849C 8024147C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9D84A0 80241480 8C430000 */ lw $v1, ($v0) -/* 9D84A4 80241484 24020019 */ addiu $v0, $zero, 0x19 -/* 9D84A8 80241488 A602008E */ sh $v0, 0x8e($s0) -/* 9D84AC 8024148C 2402000E */ addiu $v0, $zero, 0xe -/* 9D84B0 80241490 08090533 */ j .L802414CC -/* 9D84B4 80241494 AE030028 */ sw $v1, 0x28($s0) -.L80241498: -/* 9D84B8 80241498 0C00F598 */ jal func_8003D660 -/* 9D84BC 8024149C 24050001 */ addiu $a1, $zero, 1 -/* 9D84C0 802414A0 8E050018 */ lw $a1, 0x18($s0) -/* 9D84C4 802414A4 8E06000C */ lw $a2, 0xc($s0) -/* 9D84C8 802414A8 0C00EA95 */ jal npc_move_heading -/* 9D84CC 802414AC 0200202D */ daddu $a0, $s0, $zero -/* 9D84D0 802414B0 8602008E */ lh $v0, 0x8e($s0) -/* 9D84D4 802414B4 9603008E */ lhu $v1, 0x8e($s0) -/* 9D84D8 802414B8 18400003 */ blez $v0, .L802414C8 -/* 9D84DC 802414BC 2462FFFF */ addiu $v0, $v1, -1 -/* 9D84E0 802414C0 08090534 */ j .L802414D0 -/* 9D84E4 802414C4 A602008E */ sh $v0, 0x8e($s0) -.L802414C8: -/* 9D84E8 802414C8 2402000C */ addiu $v0, $zero, 0xc -.L802414CC: -/* 9D84EC 802414CC AE620070 */ sw $v0, 0x70($s3) -.L802414D0: -/* 9D84F0 802414D0 8FBF0040 */ lw $ra, 0x40($sp) -/* 9D84F4 802414D4 8FB3003C */ lw $s3, 0x3c($sp) -/* 9D84F8 802414D8 8FB20038 */ lw $s2, 0x38($sp) -/* 9D84FC 802414DC 8FB10034 */ lw $s1, 0x34($sp) -/* 9D8500 802414E0 8FB00030 */ lw $s0, 0x30($sp) -/* 9D8504 802414E4 03E00008 */ jr $ra -/* 9D8508 802414E8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s new file mode 100644 index 0000000000..81240c5690 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802413CC_9D83EC.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413CC_9D83EC +/* 9D83EC 802413CC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9D83F0 802413D0 AFB3003C */ sw $s3, 0x3c($sp) +/* 9D83F4 802413D4 0080982D */ daddu $s3, $a0, $zero +/* 9D83F8 802413D8 AFBF0040 */ sw $ra, 0x40($sp) +/* 9D83FC 802413DC AFB20038 */ sw $s2, 0x38($sp) +/* 9D8400 802413E0 AFB10034 */ sw $s1, 0x34($sp) +/* 9D8404 802413E4 AFB00030 */ sw $s0, 0x30($sp) +/* 9D8408 802413E8 8E720148 */ lw $s2, 0x148($s3) +/* 9D840C 802413EC 00A0882D */ daddu $s1, $a1, $zero +/* 9D8410 802413F0 86440008 */ lh $a0, 8($s2) +/* 9D8414 802413F4 0C00EABB */ jal get_npc_unsafe +/* 9D8418 802413F8 00C0802D */ daddu $s0, $a2, $zero +/* 9D841C 802413FC 0200202D */ daddu $a0, $s0, $zero +/* 9D8420 80241400 0240282D */ daddu $a1, $s2, $zero +/* 9D8424 80241404 24030001 */ addiu $v1, $zero, 1 +/* 9D8428 80241408 AFA30010 */ sw $v1, 0x10($sp) +/* 9D842C 8024140C 8E260024 */ lw $a2, 0x24($s1) +/* 9D8430 80241410 8E270028 */ lw $a3, 0x28($s1) +/* 9D8434 80241414 0C01242D */ jal func_800490B4 +/* 9D8438 80241418 0040802D */ daddu $s0, $v0, $zero +/* 9D843C 8024141C 1440001E */ bnez $v0, .L80241498 +/* 9D8440 80241420 0200202D */ daddu $a0, $s0, $zero +/* 9D8444 80241424 24040002 */ addiu $a0, $zero, 2 +/* 9D8448 80241428 0200282D */ daddu $a1, $s0, $zero +/* 9D844C 8024142C 0000302D */ daddu $a2, $zero, $zero +/* 9D8450 80241430 860300A8 */ lh $v1, 0xa8($s0) +/* 9D8454 80241434 3C013F80 */ lui $at, 0x3f80 +/* 9D8458 80241438 44810000 */ mtc1 $at, $f0 +/* 9D845C 8024143C 3C014000 */ lui $at, 0x4000 +/* 9D8460 80241440 44811000 */ mtc1 $at, $f2 +/* 9D8464 80241444 3C01C1A0 */ lui $at, 0xc1a0 +/* 9D8468 80241448 44812000 */ mtc1 $at, $f4 +/* 9D846C 8024144C 2402000F */ addiu $v0, $zero, 0xf +/* 9D8470 80241450 AFA2001C */ sw $v0, 0x1c($sp) +/* 9D8474 80241454 44833000 */ mtc1 $v1, $f6 +/* 9D8478 80241458 00000000 */ nop +/* 9D847C 8024145C 468031A0 */ cvt.s.w $f6, $f6 +/* 9D8480 80241460 44073000 */ mfc1 $a3, $f6 +/* 9D8484 80241464 27A20028 */ addiu $v0, $sp, 0x28 +/* 9D8488 80241468 AFA20020 */ sw $v0, 0x20($sp) +/* 9D848C 8024146C E7A00010 */ swc1 $f0, 0x10($sp) +/* 9D8490 80241470 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9D8494 80241474 0C01BFA4 */ jal fx_emote +/* 9D8498 80241478 E7A40018 */ swc1 $f4, 0x18($sp) +/* 9D849C 8024147C 8E4200CC */ lw $v0, 0xcc($s2) +/* 9D84A0 80241480 8C430000 */ lw $v1, ($v0) +/* 9D84A4 80241484 24020019 */ addiu $v0, $zero, 0x19 +/* 9D84A8 80241488 A602008E */ sh $v0, 0x8e($s0) +/* 9D84AC 8024148C 2402000E */ addiu $v0, $zero, 0xe +/* 9D84B0 80241490 08090533 */ j .L802414CC +/* 9D84B4 80241494 AE030028 */ sw $v1, 0x28($s0) +.L80241498: +/* 9D84B8 80241498 0C00F598 */ jal func_8003D660 +/* 9D84BC 8024149C 24050001 */ addiu $a1, $zero, 1 +/* 9D84C0 802414A0 8E050018 */ lw $a1, 0x18($s0) +/* 9D84C4 802414A4 8E06000C */ lw $a2, 0xc($s0) +/* 9D84C8 802414A8 0C00EA95 */ jal npc_move_heading +/* 9D84CC 802414AC 0200202D */ daddu $a0, $s0, $zero +/* 9D84D0 802414B0 8602008E */ lh $v0, 0x8e($s0) +/* 9D84D4 802414B4 9603008E */ lhu $v1, 0x8e($s0) +/* 9D84D8 802414B8 18400003 */ blez $v0, .L802414C8 +/* 9D84DC 802414BC 2462FFFF */ addiu $v0, $v1, -1 +/* 9D84E0 802414C0 08090534 */ j .L802414D0 +/* 9D84E4 802414C4 A602008E */ sh $v0, 0x8e($s0) +.L802414C8: +/* 9D84E8 802414C8 2402000C */ addiu $v0, $zero, 0xc +.L802414CC: +/* 9D84EC 802414CC AE620070 */ sw $v0, 0x70($s3) +.L802414D0: +/* 9D84F0 802414D0 8FBF0040 */ lw $ra, 0x40($sp) +/* 9D84F4 802414D4 8FB3003C */ lw $s3, 0x3c($sp) +/* 9D84F8 802414D8 8FB20038 */ lw $s2, 0x38($sp) +/* 9D84FC 802414DC 8FB10034 */ lw $s1, 0x34($sp) +/* 9D8500 802414E0 8FB00030 */ lw $s0, 0x30($sp) +/* 9D8504 802414E4 03E00008 */ jr $ra +/* 9D8508 802414E8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC.s deleted file mode 100644 index 2dd25432e3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414EC -/* 9D850C 802414EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D8510 802414F0 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8514 802414F4 0080882D */ daddu $s1, $a0, $zero -/* 9D8518 802414F8 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D851C 802414FC AFB00010 */ sw $s0, 0x10($sp) -/* 9D8520 80241500 8E300148 */ lw $s0, 0x148($s1) -/* 9D8524 80241504 0C00EABB */ jal get_npc_unsafe -/* 9D8528 80241508 86040008 */ lh $a0, 8($s0) -/* 9D852C 8024150C 9443008E */ lhu $v1, 0x8e($v0) -/* 9D8530 80241510 2463FFFF */ addiu $v1, $v1, -1 -/* 9D8534 80241514 A443008E */ sh $v1, 0x8e($v0) -/* 9D8538 80241518 00031C00 */ sll $v1, $v1, 0x10 -/* 9D853C 8024151C 14600008 */ bnez $v1, .L80241540 -/* 9D8540 80241520 00000000 */ nop -/* 9D8544 80241524 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9D8548 80241528 30420080 */ andi $v0, $v0, 0x80 -/* 9D854C 8024152C 10400003 */ beqz $v0, .L8024153C -/* 9D8550 80241530 2402000F */ addiu $v0, $zero, 0xf -/* 9D8554 80241534 08090550 */ j .L80241540 -/* 9D8558 80241538 AE220070 */ sw $v0, 0x70($s1) -.L8024153C: -/* 9D855C 8024153C AE200070 */ sw $zero, 0x70($s1) -.L80241540: -/* 9D8560 80241540 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D8564 80241544 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8568 80241548 8FB00010 */ lw $s0, 0x10($sp) -/* 9D856C 8024154C 03E00008 */ jr $ra -/* 9D8570 80241550 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s new file mode 100644 index 0000000000..61d5664fa3 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802414EC_9D850C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414EC_9D850C +/* 9D850C 802414EC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9D8510 802414F0 AFB10014 */ sw $s1, 0x14($sp) +/* 9D8514 802414F4 0080882D */ daddu $s1, $a0, $zero +/* 9D8518 802414F8 AFBF0018 */ sw $ra, 0x18($sp) +/* 9D851C 802414FC AFB00010 */ sw $s0, 0x10($sp) +/* 9D8520 80241500 8E300148 */ lw $s0, 0x148($s1) +/* 9D8524 80241504 0C00EABB */ jal get_npc_unsafe +/* 9D8528 80241508 86040008 */ lh $a0, 8($s0) +/* 9D852C 8024150C 9443008E */ lhu $v1, 0x8e($v0) +/* 9D8530 80241510 2463FFFF */ addiu $v1, $v1, -1 +/* 9D8534 80241514 A443008E */ sh $v1, 0x8e($v0) +/* 9D8538 80241518 00031C00 */ sll $v1, $v1, 0x10 +/* 9D853C 8024151C 14600008 */ bnez $v1, .L80241540 +/* 9D8540 80241520 00000000 */ nop +/* 9D8544 80241524 8E0200B0 */ lw $v0, 0xb0($s0) +/* 9D8548 80241528 30420080 */ andi $v0, $v0, 0x80 +/* 9D854C 8024152C 10400003 */ beqz $v0, .L8024153C +/* 9D8550 80241530 2402000F */ addiu $v0, $zero, 0xf +/* 9D8554 80241534 08090550 */ j .L80241540 +/* 9D8558 80241538 AE220070 */ sw $v0, 0x70($s1) +.L8024153C: +/* 9D855C 8024153C AE200070 */ sw $zero, 0x70($s1) +.L80241540: +/* 9D8560 80241540 8FBF0018 */ lw $ra, 0x18($sp) +/* 9D8564 80241544 8FB10014 */ lw $s1, 0x14($sp) +/* 9D8568 80241548 8FB00010 */ lw $s0, 0x10($sp) +/* 9D856C 8024154C 03E00008 */ jr $ra +/* 9D8570 80241550 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554.s deleted file mode 100644 index 29c3d27ebc..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241554 -/* 9D8574 80241554 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D8578 80241558 AFB10014 */ sw $s1, 0x14($sp) -/* 9D857C 8024155C 0080882D */ daddu $s1, $a0, $zero -/* 9D8580 80241560 AFBF001C */ sw $ra, 0x1c($sp) -/* 9D8584 80241564 AFB20018 */ sw $s2, 0x18($sp) -/* 9D8588 80241568 AFB00010 */ sw $s0, 0x10($sp) -/* 9D858C 8024156C 8E300148 */ lw $s0, 0x148($s1) -/* 9D8590 80241570 86040008 */ lh $a0, 8($s0) -/* 9D8594 80241574 0C00EABB */ jal get_npc_unsafe -/* 9D8598 80241578 00A0902D */ daddu $s2, $a1, $zero -/* 9D859C 8024157C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9D85A0 80241580 8E240078 */ lw $a0, 0x78($s1) -/* 9D85A4 80241584 8C630000 */ lw $v1, ($v1) -/* 9D85A8 80241588 0083182A */ slt $v1, $a0, $v1 -/* 9D85AC 8024158C 10600013 */ beqz $v1, .L802415DC -/* 9D85B0 80241590 0040302D */ daddu $a2, $v0, $zero -/* 9D85B4 80241594 00041040 */ sll $v0, $a0, 1 -/* 9D85B8 80241598 00441021 */ addu $v0, $v0, $a0 -/* 9D85BC 8024159C 00022880 */ sll $a1, $v0, 2 -.L802415A0: -/* 9D85C0 802415A0 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9D85C4 802415A4 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 9D85C8 802415A8 00A31021 */ addu $v0, $a1, $v1 -/* 9D85CC 802415AC C4400008 */ lwc1 $f0, 8($v0) -/* 9D85D0 802415B0 46800020 */ cvt.s.w $f0, $f0 -/* 9D85D4 802415B4 4602003E */ c.le.s $f0, $f2 -/* 9D85D8 802415B8 00000000 */ nop -/* 9D85DC 802415BC 45020003 */ bc1fl .L802415CC -/* 9D85E0 802415C0 24840001 */ addiu $a0, $a0, 1 -/* 9D85E4 802415C4 08090577 */ j .L802415DC -/* 9D85E8 802415C8 AE240078 */ sw $a0, 0x78($s1) -.L802415CC: -/* 9D85EC 802415CC 8C620000 */ lw $v0, ($v1) -/* 9D85F0 802415D0 0082102A */ slt $v0, $a0, $v0 -/* 9D85F4 802415D4 1440FFF2 */ bnez $v0, .L802415A0 -/* 9D85F8 802415D8 24A5000C */ addiu $a1, $a1, 0xc -.L802415DC: -/* 9D85FC 802415DC C6400000 */ lwc1 $f0, ($s2) -/* 9D8600 802415E0 E4C00018 */ swc1 $f0, 0x18($a2) -/* 9D8604 802415E4 8E0200CC */ lw $v0, 0xcc($s0) -/* 9D8608 802415E8 8C420004 */ lw $v0, 4($v0) -/* 9D860C 802415EC ACC20028 */ sw $v0, 0x28($a2) -/* 9D8610 802415F0 24020001 */ addiu $v0, $zero, 1 -/* 9D8614 802415F4 AE200074 */ sw $zero, 0x74($s1) -/* 9D8618 802415F8 AE220070 */ sw $v0, 0x70($s1) -/* 9D861C 802415FC 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D8620 80241600 8FB20018 */ lw $s2, 0x18($sp) -/* 9D8624 80241604 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8628 80241608 8FB00010 */ lw $s0, 0x10($sp) -/* 9D862C 8024160C 03E00008 */ jr $ra -/* 9D8630 80241610 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s new file mode 100644 index 0000000000..9d544cc6c0 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241554_9D8574.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241554_9D8574 +/* 9D8574 80241554 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9D8578 80241558 AFB10014 */ sw $s1, 0x14($sp) +/* 9D857C 8024155C 0080882D */ daddu $s1, $a0, $zero +/* 9D8580 80241560 AFBF001C */ sw $ra, 0x1c($sp) +/* 9D8584 80241564 AFB20018 */ sw $s2, 0x18($sp) +/* 9D8588 80241568 AFB00010 */ sw $s0, 0x10($sp) +/* 9D858C 8024156C 8E300148 */ lw $s0, 0x148($s1) +/* 9D8590 80241570 86040008 */ lh $a0, 8($s0) +/* 9D8594 80241574 0C00EABB */ jal get_npc_unsafe +/* 9D8598 80241578 00A0902D */ daddu $s2, $a1, $zero +/* 9D859C 8024157C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 9D85A0 80241580 8E240078 */ lw $a0, 0x78($s1) +/* 9D85A4 80241584 8C630000 */ lw $v1, ($v1) +/* 9D85A8 80241588 0083182A */ slt $v1, $a0, $v1 +/* 9D85AC 8024158C 10600013 */ beqz $v1, .L802415DC +/* 9D85B0 80241590 0040302D */ daddu $a2, $v0, $zero +/* 9D85B4 80241594 00041040 */ sll $v0, $a0, 1 +/* 9D85B8 80241598 00441021 */ addu $v0, $v0, $a0 +/* 9D85BC 8024159C 00022880 */ sll $a1, $v0, 2 +.L802415A0: +/* 9D85C0 802415A0 8E0300D0 */ lw $v1, 0xd0($s0) +/* 9D85C4 802415A4 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* 9D85C8 802415A8 00A31021 */ addu $v0, $a1, $v1 +/* 9D85CC 802415AC C4400008 */ lwc1 $f0, 8($v0) +/* 9D85D0 802415B0 46800020 */ cvt.s.w $f0, $f0 +/* 9D85D4 802415B4 4602003E */ c.le.s $f0, $f2 +/* 9D85D8 802415B8 00000000 */ nop +/* 9D85DC 802415BC 45020003 */ bc1fl .L802415CC +/* 9D85E0 802415C0 24840001 */ addiu $a0, $a0, 1 +/* 9D85E4 802415C4 08090577 */ j .L802415DC +/* 9D85E8 802415C8 AE240078 */ sw $a0, 0x78($s1) +.L802415CC: +/* 9D85EC 802415CC 8C620000 */ lw $v0, ($v1) +/* 9D85F0 802415D0 0082102A */ slt $v0, $a0, $v0 +/* 9D85F4 802415D4 1440FFF2 */ bnez $v0, .L802415A0 +/* 9D85F8 802415D8 24A5000C */ addiu $a1, $a1, 0xc +.L802415DC: +/* 9D85FC 802415DC C6400000 */ lwc1 $f0, ($s2) +/* 9D8600 802415E0 E4C00018 */ swc1 $f0, 0x18($a2) +/* 9D8604 802415E4 8E0200CC */ lw $v0, 0xcc($s0) +/* 9D8608 802415E8 8C420004 */ lw $v0, 4($v0) +/* 9D860C 802415EC ACC20028 */ sw $v0, 0x28($a2) +/* 9D8610 802415F0 24020001 */ addiu $v0, $zero, 1 +/* 9D8614 802415F4 AE200074 */ sw $zero, 0x74($s1) +/* 9D8618 802415F8 AE220070 */ sw $v0, 0x70($s1) +/* 9D861C 802415FC 8FBF001C */ lw $ra, 0x1c($sp) +/* 9D8620 80241600 8FB20018 */ lw $s2, 0x18($sp) +/* 9D8624 80241604 8FB10014 */ lw $s1, 0x14($sp) +/* 9D8628 80241608 8FB00010 */ lw $s0, 0x10($sp) +/* 9D862C 8024160C 03E00008 */ jr $ra +/* 9D8630 80241610 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614.s deleted file mode 100644 index 19e137e9fa..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241614 -/* 9D8634 80241614 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 9D8638 80241618 AFB40058 */ sw $s4, 0x58($sp) -/* 9D863C 8024161C 0080A02D */ daddu $s4, $a0, $zero -/* 9D8640 80241620 AFBF0060 */ sw $ra, 0x60($sp) -/* 9D8644 80241624 AFB5005C */ sw $s5, 0x5c($sp) -/* 9D8648 80241628 AFB30054 */ sw $s3, 0x54($sp) -/* 9D864C 8024162C AFB20050 */ sw $s2, 0x50($sp) -/* 9D8650 80241630 AFB1004C */ sw $s1, 0x4c($sp) -/* 9D8654 80241634 AFB00048 */ sw $s0, 0x48($sp) -/* 9D8658 80241638 8E910148 */ lw $s1, 0x148($s4) -/* 9D865C 8024163C 86240008 */ lh $a0, 8($s1) -/* 9D8660 80241640 0C00EABB */ jal get_npc_unsafe -/* 9D8664 80241644 00A0802D */ daddu $s0, $a1, $zero -/* 9D8668 80241648 8E83000C */ lw $v1, 0xc($s4) -/* 9D866C 8024164C 0280202D */ daddu $a0, $s4, $zero -/* 9D8670 80241650 8C650000 */ lw $a1, ($v1) -/* 9D8674 80241654 0C0B1EAF */ jal get_variable -/* 9D8678 80241658 0040902D */ daddu $s2, $v0, $zero -/* 9D867C 8024165C AFA00018 */ sw $zero, 0x18($sp) -/* 9D8680 80241660 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9D8684 80241664 8C630094 */ lw $v1, 0x94($v1) -/* 9D8688 80241668 AFA3001C */ sw $v1, 0x1c($sp) -/* 9D868C 8024166C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9D8690 80241670 8C630080 */ lw $v1, 0x80($v1) -/* 9D8694 80241674 AFA30020 */ sw $v1, 0x20($sp) -/* 9D8698 80241678 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9D869C 8024167C 8C630088 */ lw $v1, 0x88($v1) -/* 9D86A0 80241680 AFA30024 */ sw $v1, 0x24($sp) -/* 9D86A4 80241684 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9D86A8 80241688 8C63008C */ lw $v1, 0x8c($v1) -/* 9D86AC 8024168C 27B50018 */ addiu $s5, $sp, 0x18 -/* 9D86B0 80241690 AFA30028 */ sw $v1, 0x28($sp) -/* 9D86B4 80241694 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9D86B8 80241698 3C014282 */ lui $at, 0x4282 -/* 9D86BC 8024169C 44810000 */ mtc1 $at, $f0 -/* 9D86C0 802416A0 8C630090 */ lw $v1, 0x90($v1) -/* 9D86C4 802416A4 0040982D */ daddu $s3, $v0, $zero -/* 9D86C8 802416A8 E7A00030 */ swc1 $f0, 0x30($sp) -/* 9D86CC 802416AC A7A00034 */ sh $zero, 0x34($sp) -/* 9D86D0 802416B0 16000005 */ bnez $s0, .L802416C8 -/* 9D86D4 802416B4 AFA3002C */ sw $v1, 0x2c($sp) -/* 9D86D8 802416B8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9D86DC 802416BC 30420004 */ andi $v0, $v0, 4 -/* 9D86E0 802416C0 10400044 */ beqz $v0, .L802417D4 -/* 9D86E4 802416C4 00000000 */ nop -.L802416C8: -/* 9D86E8 802416C8 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9D86EC 802416CC AE800070 */ sw $zero, 0x70($s4) -/* 9D86F0 802416D0 A640008E */ sh $zero, 0x8e($s2) -/* 9D86F4 802416D4 8E2200CC */ lw $v0, 0xcc($s1) -/* 9D86F8 802416D8 8E430000 */ lw $v1, ($s2) -/* 9D86FC 802416DC 8C420000 */ lw $v0, ($v0) -/* 9D8700 802416E0 00641824 */ and $v1, $v1, $a0 -/* 9D8704 802416E4 AE430000 */ sw $v1, ($s2) -/* 9D8708 802416E8 AE420028 */ sw $v0, 0x28($s2) -/* 9D870C 802416EC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9D8710 802416F0 8C420098 */ lw $v0, 0x98($v0) -/* 9D8714 802416F4 54400005 */ bnel $v0, $zero, .L8024170C -/* 9D8718 802416F8 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9D871C 802416FC 34620200 */ ori $v0, $v1, 0x200 -/* 9D8720 80241700 2403FFF7 */ addiu $v1, $zero, -9 -/* 9D8724 80241704 080905C5 */ j .L80241714 -/* 9D8728 80241708 00431024 */ and $v0, $v0, $v1 -.L8024170C: -/* 9D872C 8024170C 00621024 */ and $v0, $v1, $v0 -/* 9D8730 80241710 34420008 */ ori $v0, $v0, 8 -.L80241714: -/* 9D8734 80241714 AE420000 */ sw $v0, ($s2) -/* 9D8738 80241718 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9D873C 8024171C 30420004 */ andi $v0, $v0, 4 -/* 9D8740 80241720 10400008 */ beqz $v0, .L80241744 -/* 9D8744 80241724 24020063 */ addiu $v0, $zero, 0x63 -/* 9D8748 80241728 AE820070 */ sw $v0, 0x70($s4) -/* 9D874C 8024172C AE800074 */ sw $zero, 0x74($s4) -/* 9D8750 80241730 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9D8754 80241734 2403FFFB */ addiu $v1, $zero, -5 -/* 9D8758 80241738 00431024 */ and $v0, $v0, $v1 -/* 9D875C 8024173C 080905DC */ j .L80241770 -/* 9D8760 80241740 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241744: -/* 9D8764 80241744 8E220000 */ lw $v0, ($s1) -/* 9D8768 80241748 3C034000 */ lui $v1, 0x4000 -/* 9D876C 8024174C 00431024 */ and $v0, $v0, $v1 -/* 9D8770 80241750 10400007 */ beqz $v0, .L80241770 -/* 9D8774 80241754 3C03BFFF */ lui $v1, 0xbfff -/* 9D8778 80241758 2402000C */ addiu $v0, $zero, 0xc -/* 9D877C 8024175C AE820070 */ sw $v0, 0x70($s4) -/* 9D8780 80241760 8E220000 */ lw $v0, ($s1) -/* 9D8784 80241764 3463FFFF */ ori $v1, $v1, 0xffff -/* 9D8788 80241768 00431024 */ and $v0, $v0, $v1 -/* 9D878C 8024176C AE220000 */ sw $v0, ($s1) -.L80241770: -/* 9D8790 80241770 27A50038 */ addiu $a1, $sp, 0x38 -/* 9D8794 80241774 27A6003C */ addiu $a2, $sp, 0x3c -/* 9D8798 80241778 C6400038 */ lwc1 $f0, 0x38($s2) -/* 9D879C 8024177C 864200A8 */ lh $v0, 0xa8($s2) -/* 9D87A0 80241780 3C0142C8 */ lui $at, 0x42c8 -/* 9D87A4 80241784 44812000 */ mtc1 $at, $f4 -/* 9D87A8 80241788 44823000 */ mtc1 $v0, $f6 -/* 9D87AC 8024178C 00000000 */ nop -/* 9D87B0 80241790 468031A0 */ cvt.s.w $f6, $f6 -/* 9D87B4 80241794 27A20044 */ addiu $v0, $sp, 0x44 -/* 9D87B8 80241798 E7A00038 */ swc1 $f0, 0x38($sp) -/* 9D87BC 8024179C C640003C */ lwc1 $f0, 0x3c($s2) -/* 9D87C0 802417A0 C6420040 */ lwc1 $f2, 0x40($s2) -/* 9D87C4 802417A4 46060000 */ add.s $f0, $f0, $f6 -/* 9D87C8 802417A8 E7A40044 */ swc1 $f4, 0x44($sp) -/* 9D87CC 802417AC E7A20040 */ swc1 $f2, 0x40($sp) -/* 9D87D0 802417B0 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 9D87D4 802417B4 AFA20010 */ sw $v0, 0x10($sp) -/* 9D87D8 802417B8 8E440080 */ lw $a0, 0x80($s2) -/* 9D87DC 802417BC 0C0372DF */ jal func_800DCB7C -/* 9D87E0 802417C0 27A70040 */ addiu $a3, $sp, 0x40 -/* 9D87E4 802417C4 10400003 */ beqz $v0, .L802417D4 -/* 9D87E8 802417C8 00000000 */ nop -/* 9D87EC 802417CC C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 9D87F0 802417D0 E640003C */ swc1 $f0, 0x3c($s2) -.L802417D4: -/* 9D87F4 802417D4 8E830070 */ lw $v1, 0x70($s4) -/* 9D87F8 802417D8 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9D87FC 802417DC 10400042 */ beqz $v0, .L802418E8 -/* 9D8800 802417E0 00031080 */ sll $v0, $v1, 2 -/* 9D8804 802417E4 3C018025 */ lui $at, 0x8025 -/* 9D8808 802417E8 00220821 */ addu $at, $at, $v0 -/* 9D880C 802417EC 8C224630 */ lw $v0, 0x4630($at) -/* 9D8810 802417F0 00400008 */ jr $v0 -/* 9D8814 802417F4 00000000 */ nop -/* 9D8818 802417F8 0280202D */ daddu $a0, $s4, $zero -/* 9D881C 802417FC 0260282D */ daddu $a1, $s3, $zero -/* 9D8820 80241800 0C0902A0 */ jal func_80240A80 -/* 9D8824 80241804 02A0302D */ daddu $a2, $s5, $zero -/* 9D8828 80241808 0280202D */ daddu $a0, $s4, $zero -/* 9D882C 8024180C 0260282D */ daddu $a1, $s3, $zero -/* 9D8830 80241810 0C0902F6 */ jal func_80240BD8 -/* 9D8834 80241814 02A0302D */ daddu $a2, $s5, $zero -/* 9D8838 80241818 0809063A */ j .L802418E8 -/* 9D883C 8024181C 00000000 */ nop -/* 9D8840 80241820 0280202D */ daddu $a0, $s4, $zero -/* 9D8844 80241824 0260282D */ daddu $a1, $s3, $zero -/* 9D8848 80241828 0C0903A0 */ jal func_80240E80 -/* 9D884C 8024182C 02A0302D */ daddu $a2, $s5, $zero -/* 9D8850 80241830 0280202D */ daddu $a0, $s4, $zero -/* 9D8854 80241834 0260282D */ daddu $a1, $s3, $zero -/* 9D8858 80241838 0C0903D0 */ jal func_80240F40 -/* 9D885C 8024183C 02A0302D */ daddu $a2, $s5, $zero -/* 9D8860 80241840 0809063A */ j .L802418E8 -/* 9D8864 80241844 00000000 */ nop -/* 9D8868 80241848 0280202D */ daddu $a0, $s4, $zero -/* 9D886C 8024184C 0260282D */ daddu $a1, $s3, $zero -/* 9D8870 80241850 0C09043F */ jal func_802410FC -/* 9D8874 80241854 02A0302D */ daddu $a2, $s5, $zero -/* 9D8878 80241858 0809063A */ j .L802418E8 -/* 9D887C 8024185C 00000000 */ nop -/* 9D8880 80241860 0280202D */ daddu $a0, $s4, $zero -/* 9D8884 80241864 0260282D */ daddu $a1, $s3, $zero -/* 9D8888 80241868 0C09046C */ jal func_802411B0 -/* 9D888C 8024186C 02A0302D */ daddu $a2, $s5, $zero -/* 9D8890 80241870 0280202D */ daddu $a0, $s4, $zero -/* 9D8894 80241874 0260282D */ daddu $a1, $s3, $zero -/* 9D8898 80241878 0C090489 */ jal func_80241224 -/* 9D889C 8024187C 02A0302D */ daddu $a2, $s5, $zero -/* 9D88A0 80241880 0809063A */ j .L802418E8 -/* 9D88A4 80241884 00000000 */ nop -/* 9D88A8 80241888 0280202D */ daddu $a0, $s4, $zero -/* 9D88AC 8024188C 0260282D */ daddu $a1, $s3, $zero -/* 9D88B0 80241890 0C0904A7 */ jal func_8024129C -/* 9D88B4 80241894 02A0302D */ daddu $a2, $s5, $zero -/* 9D88B8 80241898 0280202D */ daddu $a0, $s4, $zero -/* 9D88BC 8024189C 0260282D */ daddu $a1, $s3, $zero -/* 9D88C0 802418A0 0C0904F3 */ jal func_802413CC -/* 9D88C4 802418A4 02A0302D */ daddu $a2, $s5, $zero -/* 9D88C8 802418A8 0809063A */ j .L802418E8 -/* 9D88CC 802418AC 00000000 */ nop -/* 9D88D0 802418B0 0280202D */ daddu $a0, $s4, $zero -/* 9D88D4 802418B4 0260282D */ daddu $a1, $s3, $zero -/* 9D88D8 802418B8 0C09053B */ jal func_802414EC -/* 9D88DC 802418BC 02A0302D */ daddu $a2, $s5, $zero -/* 9D88E0 802418C0 0809063A */ j .L802418E8 -/* 9D88E4 802418C4 00000000 */ nop -/* 9D88E8 802418C8 0280202D */ daddu $a0, $s4, $zero -/* 9D88EC 802418CC 0260282D */ daddu $a1, $s3, $zero -/* 9D88F0 802418D0 0C090555 */ jal func_80241554 -/* 9D88F4 802418D4 02A0302D */ daddu $a2, $s5, $zero -/* 9D88F8 802418D8 0809063A */ j .L802418E8 -/* 9D88FC 802418DC 00000000 */ nop -/* 9D8900 802418E0 0C0129CF */ jal func_8004A73C -/* 9D8904 802418E4 0280202D */ daddu $a0, $s4, $zero -.L802418E8: -/* 9D8908 802418E8 8FBF0060 */ lw $ra, 0x60($sp) -/* 9D890C 802418EC 8FB5005C */ lw $s5, 0x5c($sp) -/* 9D8910 802418F0 8FB40058 */ lw $s4, 0x58($sp) -/* 9D8914 802418F4 8FB30054 */ lw $s3, 0x54($sp) -/* 9D8918 802418F8 8FB20050 */ lw $s2, 0x50($sp) -/* 9D891C 802418FC 8FB1004C */ lw $s1, 0x4c($sp) -/* 9D8920 80241900 8FB00048 */ lw $s0, 0x48($sp) -/* 9D8924 80241904 0000102D */ daddu $v0, $zero, $zero -/* 9D8928 80241908 03E00008 */ jr $ra -/* 9D892C 8024190C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s new file mode 100644 index 0000000000..742a272a8a --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241614_9D8634.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241614_9D8634 +/* 9D8634 80241614 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 9D8638 80241618 AFB40058 */ sw $s4, 0x58($sp) +/* 9D863C 8024161C 0080A02D */ daddu $s4, $a0, $zero +/* 9D8640 80241620 AFBF0060 */ sw $ra, 0x60($sp) +/* 9D8644 80241624 AFB5005C */ sw $s5, 0x5c($sp) +/* 9D8648 80241628 AFB30054 */ sw $s3, 0x54($sp) +/* 9D864C 8024162C AFB20050 */ sw $s2, 0x50($sp) +/* 9D8650 80241630 AFB1004C */ sw $s1, 0x4c($sp) +/* 9D8654 80241634 AFB00048 */ sw $s0, 0x48($sp) +/* 9D8658 80241638 8E910148 */ lw $s1, 0x148($s4) +/* 9D865C 8024163C 86240008 */ lh $a0, 8($s1) +/* 9D8660 80241640 0C00EABB */ jal get_npc_unsafe +/* 9D8664 80241644 00A0802D */ daddu $s0, $a1, $zero +/* 9D8668 80241648 8E83000C */ lw $v1, 0xc($s4) +/* 9D866C 8024164C 0280202D */ daddu $a0, $s4, $zero +/* 9D8670 80241650 8C650000 */ lw $a1, ($v1) +/* 9D8674 80241654 0C0B1EAF */ jal get_variable +/* 9D8678 80241658 0040902D */ daddu $s2, $v0, $zero +/* 9D867C 8024165C AFA00018 */ sw $zero, 0x18($sp) +/* 9D8680 80241660 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9D8684 80241664 8C630094 */ lw $v1, 0x94($v1) +/* 9D8688 80241668 AFA3001C */ sw $v1, 0x1c($sp) +/* 9D868C 8024166C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9D8690 80241670 8C630080 */ lw $v1, 0x80($v1) +/* 9D8694 80241674 AFA30020 */ sw $v1, 0x20($sp) +/* 9D8698 80241678 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9D869C 8024167C 8C630088 */ lw $v1, 0x88($v1) +/* 9D86A0 80241680 AFA30024 */ sw $v1, 0x24($sp) +/* 9D86A4 80241684 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9D86A8 80241688 8C63008C */ lw $v1, 0x8c($v1) +/* 9D86AC 8024168C 27B50018 */ addiu $s5, $sp, 0x18 +/* 9D86B0 80241690 AFA30028 */ sw $v1, 0x28($sp) +/* 9D86B4 80241694 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9D86B8 80241698 3C014282 */ lui $at, 0x4282 +/* 9D86BC 8024169C 44810000 */ mtc1 $at, $f0 +/* 9D86C0 802416A0 8C630090 */ lw $v1, 0x90($v1) +/* 9D86C4 802416A4 0040982D */ daddu $s3, $v0, $zero +/* 9D86C8 802416A8 E7A00030 */ swc1 $f0, 0x30($sp) +/* 9D86CC 802416AC A7A00034 */ sh $zero, 0x34($sp) +/* 9D86D0 802416B0 16000005 */ bnez $s0, .L802416C8 +/* 9D86D4 802416B4 AFA3002C */ sw $v1, 0x2c($sp) +/* 9D86D8 802416B8 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9D86DC 802416BC 30420004 */ andi $v0, $v0, 4 +/* 9D86E0 802416C0 10400044 */ beqz $v0, .L802417D4 +/* 9D86E4 802416C4 00000000 */ nop +.L802416C8: +/* 9D86E8 802416C8 2404F7FF */ addiu $a0, $zero, -0x801 +/* 9D86EC 802416CC AE800070 */ sw $zero, 0x70($s4) +/* 9D86F0 802416D0 A640008E */ sh $zero, 0x8e($s2) +/* 9D86F4 802416D4 8E2200CC */ lw $v0, 0xcc($s1) +/* 9D86F8 802416D8 8E430000 */ lw $v1, ($s2) +/* 9D86FC 802416DC 8C420000 */ lw $v0, ($v0) +/* 9D8700 802416E0 00641824 */ and $v1, $v1, $a0 +/* 9D8704 802416E4 AE430000 */ sw $v1, ($s2) +/* 9D8708 802416E8 AE420028 */ sw $v0, 0x28($s2) +/* 9D870C 802416EC 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9D8710 802416F0 8C420098 */ lw $v0, 0x98($v0) +/* 9D8714 802416F4 54400005 */ bnel $v0, $zero, .L8024170C +/* 9D8718 802416F8 2402FDFF */ addiu $v0, $zero, -0x201 +/* 9D871C 802416FC 34620200 */ ori $v0, $v1, 0x200 +/* 9D8720 80241700 2403FFF7 */ addiu $v1, $zero, -9 +/* 9D8724 80241704 080905C5 */ j .L80241714 +/* 9D8728 80241708 00431024 */ and $v0, $v0, $v1 +.L8024170C: +/* 9D872C 8024170C 00621024 */ and $v0, $v1, $v0 +/* 9D8730 80241710 34420008 */ ori $v0, $v0, 8 +.L80241714: +/* 9D8734 80241714 AE420000 */ sw $v0, ($s2) +/* 9D8738 80241718 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9D873C 8024171C 30420004 */ andi $v0, $v0, 4 +/* 9D8740 80241720 10400008 */ beqz $v0, .L80241744 +/* 9D8744 80241724 24020063 */ addiu $v0, $zero, 0x63 +/* 9D8748 80241728 AE820070 */ sw $v0, 0x70($s4) +/* 9D874C 8024172C AE800074 */ sw $zero, 0x74($s4) +/* 9D8750 80241730 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9D8754 80241734 2403FFFB */ addiu $v1, $zero, -5 +/* 9D8758 80241738 00431024 */ and $v0, $v0, $v1 +/* 9D875C 8024173C 080905DC */ j .L80241770 +/* 9D8760 80241740 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241744: +/* 9D8764 80241744 8E220000 */ lw $v0, ($s1) +/* 9D8768 80241748 3C034000 */ lui $v1, 0x4000 +/* 9D876C 8024174C 00431024 */ and $v0, $v0, $v1 +/* 9D8770 80241750 10400007 */ beqz $v0, .L80241770 +/* 9D8774 80241754 3C03BFFF */ lui $v1, 0xbfff +/* 9D8778 80241758 2402000C */ addiu $v0, $zero, 0xc +/* 9D877C 8024175C AE820070 */ sw $v0, 0x70($s4) +/* 9D8780 80241760 8E220000 */ lw $v0, ($s1) +/* 9D8784 80241764 3463FFFF */ ori $v1, $v1, 0xffff +/* 9D8788 80241768 00431024 */ and $v0, $v0, $v1 +/* 9D878C 8024176C AE220000 */ sw $v0, ($s1) +.L80241770: +/* 9D8790 80241770 27A50038 */ addiu $a1, $sp, 0x38 +/* 9D8794 80241774 27A6003C */ addiu $a2, $sp, 0x3c +/* 9D8798 80241778 C6400038 */ lwc1 $f0, 0x38($s2) +/* 9D879C 8024177C 864200A8 */ lh $v0, 0xa8($s2) +/* 9D87A0 80241780 3C0142C8 */ lui $at, 0x42c8 +/* 9D87A4 80241784 44812000 */ mtc1 $at, $f4 +/* 9D87A8 80241788 44823000 */ mtc1 $v0, $f6 +/* 9D87AC 8024178C 00000000 */ nop +/* 9D87B0 80241790 468031A0 */ cvt.s.w $f6, $f6 +/* 9D87B4 80241794 27A20044 */ addiu $v0, $sp, 0x44 +/* 9D87B8 80241798 E7A00038 */ swc1 $f0, 0x38($sp) +/* 9D87BC 8024179C C640003C */ lwc1 $f0, 0x3c($s2) +/* 9D87C0 802417A0 C6420040 */ lwc1 $f2, 0x40($s2) +/* 9D87C4 802417A4 46060000 */ add.s $f0, $f0, $f6 +/* 9D87C8 802417A8 E7A40044 */ swc1 $f4, 0x44($sp) +/* 9D87CC 802417AC E7A20040 */ swc1 $f2, 0x40($sp) +/* 9D87D0 802417B0 E7A0003C */ swc1 $f0, 0x3c($sp) +/* 9D87D4 802417B4 AFA20010 */ sw $v0, 0x10($sp) +/* 9D87D8 802417B8 8E440080 */ lw $a0, 0x80($s2) +/* 9D87DC 802417BC 0C0372DF */ jal func_800DCB7C +/* 9D87E0 802417C0 27A70040 */ addiu $a3, $sp, 0x40 +/* 9D87E4 802417C4 10400003 */ beqz $v0, .L802417D4 +/* 9D87E8 802417C8 00000000 */ nop +/* 9D87EC 802417CC C7A0003C */ lwc1 $f0, 0x3c($sp) +/* 9D87F0 802417D0 E640003C */ swc1 $f0, 0x3c($s2) +.L802417D4: +/* 9D87F4 802417D4 8E830070 */ lw $v1, 0x70($s4) +/* 9D87F8 802417D8 2C620064 */ sltiu $v0, $v1, 0x64 +/* 9D87FC 802417DC 10400042 */ beqz $v0, .L802418E8 +/* 9D8800 802417E0 00031080 */ sll $v0, $v1, 2 +/* 9D8804 802417E4 3C018025 */ lui $at, 0x8025 +/* 9D8808 802417E8 00220821 */ addu $at, $at, $v0 +/* 9D880C 802417EC 8C224630 */ lw $v0, 0x4630($at) +/* 9D8810 802417F0 00400008 */ jr $v0 +/* 9D8814 802417F4 00000000 */ nop +/* 9D8818 802417F8 0280202D */ daddu $a0, $s4, $zero +/* 9D881C 802417FC 0260282D */ daddu $a1, $s3, $zero +/* 9D8820 80241800 0C0902A0 */ jal func_80240A80_9D7AA0 +/* 9D8824 80241804 02A0302D */ daddu $a2, $s5, $zero +/* 9D8828 80241808 0280202D */ daddu $a0, $s4, $zero +/* 9D882C 8024180C 0260282D */ daddu $a1, $s3, $zero +/* 9D8830 80241810 0C0902F6 */ jal func_80240BD8_9D7BF8 +/* 9D8834 80241814 02A0302D */ daddu $a2, $s5, $zero +/* 9D8838 80241818 0809063A */ j .L802418E8 +/* 9D883C 8024181C 00000000 */ nop +/* 9D8840 80241820 0280202D */ daddu $a0, $s4, $zero +/* 9D8844 80241824 0260282D */ daddu $a1, $s3, $zero +/* 9D8848 80241828 0C0903A0 */ jal func_80240E80_9D7EA0 +/* 9D884C 8024182C 02A0302D */ daddu $a2, $s5, $zero +/* 9D8850 80241830 0280202D */ daddu $a0, $s4, $zero +/* 9D8854 80241834 0260282D */ daddu $a1, $s3, $zero +/* 9D8858 80241838 0C0903D0 */ jal func_80240F40_9D7F60 +/* 9D885C 8024183C 02A0302D */ daddu $a2, $s5, $zero +/* 9D8860 80241840 0809063A */ j .L802418E8 +/* 9D8864 80241844 00000000 */ nop +/* 9D8868 80241848 0280202D */ daddu $a0, $s4, $zero +/* 9D886C 8024184C 0260282D */ daddu $a1, $s3, $zero +/* 9D8870 80241850 0C09043F */ jal func_802410FC_9D811C +/* 9D8874 80241854 02A0302D */ daddu $a2, $s5, $zero +/* 9D8878 80241858 0809063A */ j .L802418E8 +/* 9D887C 8024185C 00000000 */ nop +/* 9D8880 80241860 0280202D */ daddu $a0, $s4, $zero +/* 9D8884 80241864 0260282D */ daddu $a1, $s3, $zero +/* 9D8888 80241868 0C09046C */ jal func_802411B0_9D81D0 +/* 9D888C 8024186C 02A0302D */ daddu $a2, $s5, $zero +/* 9D8890 80241870 0280202D */ daddu $a0, $s4, $zero +/* 9D8894 80241874 0260282D */ daddu $a1, $s3, $zero +/* 9D8898 80241878 0C090489 */ jal func_80241224_9D8244 +/* 9D889C 8024187C 02A0302D */ daddu $a2, $s5, $zero +/* 9D88A0 80241880 0809063A */ j .L802418E8 +/* 9D88A4 80241884 00000000 */ nop +/* 9D88A8 80241888 0280202D */ daddu $a0, $s4, $zero +/* 9D88AC 8024188C 0260282D */ daddu $a1, $s3, $zero +/* 9D88B0 80241890 0C0904A7 */ jal func_8024129C_9D82BC +/* 9D88B4 80241894 02A0302D */ daddu $a2, $s5, $zero +/* 9D88B8 80241898 0280202D */ daddu $a0, $s4, $zero +/* 9D88BC 8024189C 0260282D */ daddu $a1, $s3, $zero +/* 9D88C0 802418A0 0C0904F3 */ jal func_802413CC_9D83EC +/* 9D88C4 802418A4 02A0302D */ daddu $a2, $s5, $zero +/* 9D88C8 802418A8 0809063A */ j .L802418E8 +/* 9D88CC 802418AC 00000000 */ nop +/* 9D88D0 802418B0 0280202D */ daddu $a0, $s4, $zero +/* 9D88D4 802418B4 0260282D */ daddu $a1, $s3, $zero +/* 9D88D8 802418B8 0C09053B */ jal func_802414EC_9D850C +/* 9D88DC 802418BC 02A0302D */ daddu $a2, $s5, $zero +/* 9D88E0 802418C0 0809063A */ j .L802418E8 +/* 9D88E4 802418C4 00000000 */ nop +/* 9D88E8 802418C8 0280202D */ daddu $a0, $s4, $zero +/* 9D88EC 802418CC 0260282D */ daddu $a1, $s3, $zero +/* 9D88F0 802418D0 0C090555 */ jal func_80241554_9D8574 +/* 9D88F4 802418D4 02A0302D */ daddu $a2, $s5, $zero +/* 9D88F8 802418D8 0809063A */ j .L802418E8 +/* 9D88FC 802418DC 00000000 */ nop +/* 9D8900 802418E0 0C0129CF */ jal func_8004A73C +/* 9D8904 802418E4 0280202D */ daddu $a0, $s4, $zero +.L802418E8: +/* 9D8908 802418E8 8FBF0060 */ lw $ra, 0x60($sp) +/* 9D890C 802418EC 8FB5005C */ lw $s5, 0x5c($sp) +/* 9D8910 802418F0 8FB40058 */ lw $s4, 0x58($sp) +/* 9D8914 802418F4 8FB30054 */ lw $s3, 0x54($sp) +/* 9D8918 802418F8 8FB20050 */ lw $s2, 0x50($sp) +/* 9D891C 802418FC 8FB1004C */ lw $s1, 0x4c($sp) +/* 9D8920 80241900 8FB00048 */ lw $s0, 0x48($sp) +/* 9D8924 80241904 0000102D */ daddu $v0, $zero, $zero +/* 9D8928 80241908 03E00008 */ jr $ra +/* 9D892C 8024190C 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910.s deleted file mode 100644 index 3155626a1d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241910 -/* 9D8930 80241910 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D8934 80241914 AFB00010 */ sw $s0, 0x10($sp) -/* 9D8938 80241918 3C108024 */ lui $s0, 0x8024 -/* 9D893C 8024191C 261070C8 */ addiu $s0, $s0, 0x70c8 -/* 9D8940 80241920 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D8944 80241924 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8948 80241928 8E020000 */ lw $v0, ($s0) -/* 9D894C 8024192C 14400010 */ bnez $v0, .L80241970 -/* 9D8950 80241930 0080882D */ daddu $s1, $a0, $zero -/* 9D8954 80241934 0C00AB39 */ jal heap_malloc -/* 9D8958 80241938 24040040 */ addiu $a0, $zero, 0x40 -/* 9D895C 8024193C AE020000 */ sw $v0, ($s0) -/* 9D8960 80241940 0000182D */ daddu $v1, $zero, $zero -/* 9D8964 80241944 0040282D */ daddu $a1, $v0, $zero -/* 9D8968 80241948 0220202D */ daddu $a0, $s1, $zero -.L8024194C: -/* 9D896C 8024194C 8C820084 */ lw $v0, 0x84($a0) -/* 9D8970 80241950 24840004 */ addiu $a0, $a0, 4 -/* 9D8974 80241954 24630001 */ addiu $v1, $v1, 1 -/* 9D8978 80241958 ACA20000 */ sw $v0, ($a1) -/* 9D897C 8024195C 28620010 */ slti $v0, $v1, 0x10 -/* 9D8980 80241960 1440FFFA */ bnez $v0, .L8024194C -/* 9D8984 80241964 24A50004 */ addiu $a1, $a1, 4 -/* 9D8988 80241968 0809066B */ j .L802419AC -/* 9D898C 8024196C 00000000 */ nop -.L80241970: -/* 9D8990 80241970 0000182D */ daddu $v1, $zero, $zero -/* 9D8994 80241974 0040282D */ daddu $a1, $v0, $zero -/* 9D8998 80241978 0220202D */ daddu $a0, $s1, $zero -.L8024197C: -/* 9D899C 8024197C 8CA20000 */ lw $v0, ($a1) -/* 9D89A0 80241980 24A50004 */ addiu $a1, $a1, 4 -/* 9D89A4 80241984 24630001 */ addiu $v1, $v1, 1 -/* 9D89A8 80241988 AC820084 */ sw $v0, 0x84($a0) -/* 9D89AC 8024198C 28620010 */ slti $v0, $v1, 0x10 -/* 9D89B0 80241990 1440FFFA */ bnez $v0, .L8024197C -/* 9D89B4 80241994 24840004 */ addiu $a0, $a0, 4 -/* 9D89B8 80241998 3C108024 */ lui $s0, 0x8024 -/* 9D89BC 8024199C 261070C8 */ addiu $s0, $s0, 0x70c8 -/* 9D89C0 802419A0 0C00AB4B */ jal heap_free -/* 9D89C4 802419A4 8E040000 */ lw $a0, ($s0) -/* 9D89C8 802419A8 AE000000 */ sw $zero, ($s0) -.L802419AC: -/* 9D89CC 802419AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D89D0 802419B0 8FB10014 */ lw $s1, 0x14($sp) -/* 9D89D4 802419B4 8FB00010 */ lw $s0, 0x10($sp) -/* 9D89D8 802419B8 24020002 */ addiu $v0, $zero, 2 -/* 9D89DC 802419BC 03E00008 */ jr $ra -/* 9D89E0 802419C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s new file mode 100644 index 0000000000..b79b85d6fa --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241910_9D8930.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241910_9D8930 +/* 9D8930 80241910 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9D8934 80241914 AFB00010 */ sw $s0, 0x10($sp) +/* 9D8938 80241918 3C108024 */ lui $s0, 0x8024 +/* 9D893C 8024191C 261070C8 */ addiu $s0, $s0, 0x70c8 +/* 9D8940 80241920 AFBF0018 */ sw $ra, 0x18($sp) +/* 9D8944 80241924 AFB10014 */ sw $s1, 0x14($sp) +/* 9D8948 80241928 8E020000 */ lw $v0, ($s0) +/* 9D894C 8024192C 14400010 */ bnez $v0, .L80241970 +/* 9D8950 80241930 0080882D */ daddu $s1, $a0, $zero +/* 9D8954 80241934 0C00AB39 */ jal heap_malloc +/* 9D8958 80241938 24040040 */ addiu $a0, $zero, 0x40 +/* 9D895C 8024193C AE020000 */ sw $v0, ($s0) +/* 9D8960 80241940 0000182D */ daddu $v1, $zero, $zero +/* 9D8964 80241944 0040282D */ daddu $a1, $v0, $zero +/* 9D8968 80241948 0220202D */ daddu $a0, $s1, $zero +.L8024194C: +/* 9D896C 8024194C 8C820084 */ lw $v0, 0x84($a0) +/* 9D8970 80241950 24840004 */ addiu $a0, $a0, 4 +/* 9D8974 80241954 24630001 */ addiu $v1, $v1, 1 +/* 9D8978 80241958 ACA20000 */ sw $v0, ($a1) +/* 9D897C 8024195C 28620010 */ slti $v0, $v1, 0x10 +/* 9D8980 80241960 1440FFFA */ bnez $v0, .L8024194C +/* 9D8984 80241964 24A50004 */ addiu $a1, $a1, 4 +/* 9D8988 80241968 0809066B */ j .L802419AC +/* 9D898C 8024196C 00000000 */ nop +.L80241970: +/* 9D8990 80241970 0000182D */ daddu $v1, $zero, $zero +/* 9D8994 80241974 0040282D */ daddu $a1, $v0, $zero +/* 9D8998 80241978 0220202D */ daddu $a0, $s1, $zero +.L8024197C: +/* 9D899C 8024197C 8CA20000 */ lw $v0, ($a1) +/* 9D89A0 80241980 24A50004 */ addiu $a1, $a1, 4 +/* 9D89A4 80241984 24630001 */ addiu $v1, $v1, 1 +/* 9D89A8 80241988 AC820084 */ sw $v0, 0x84($a0) +/* 9D89AC 8024198C 28620010 */ slti $v0, $v1, 0x10 +/* 9D89B0 80241990 1440FFFA */ bnez $v0, .L8024197C +/* 9D89B4 80241994 24840004 */ addiu $a0, $a0, 4 +/* 9D89B8 80241998 3C108024 */ lui $s0, 0x8024 +/* 9D89BC 8024199C 261070C8 */ addiu $s0, $s0, 0x70c8 +/* 9D89C0 802419A0 0C00AB4B */ jal heap_free +/* 9D89C4 802419A4 8E040000 */ lw $a0, ($s0) +/* 9D89C8 802419A8 AE000000 */ sw $zero, ($s0) +.L802419AC: +/* 9D89CC 802419AC 8FBF0018 */ lw $ra, 0x18($sp) +/* 9D89D0 802419B0 8FB10014 */ lw $s1, 0x14($sp) +/* 9D89D4 802419B4 8FB00010 */ lw $s0, 0x10($sp) +/* 9D89D8 802419B8 24020002 */ addiu $v0, $zero, 2 +/* 9D89DC 802419BC 03E00008 */ jr $ra +/* 9D89E0 802419C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28.s deleted file mode 100644 index def048dbce..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A28 -/* 9D8A48 80241A28 24020001 */ addiu $v0, $zero, 1 -/* 9D8A4C 80241A2C 3C018015 */ lui $at, %hi(D_80151310) -/* 9D8A50 80241A30 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 9D8A54 80241A34 03E00008 */ jr $ra -/* 9D8A58 80241A38 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s new file mode 100644 index 0000000000..561e80d2a0 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A28_9D8A48 +/* 9D8A48 80241A28 24020001 */ addiu $v0, $zero, 1 +/* 9D8A4C 80241A2C 3C018015 */ lui $at, %hi(D_80151310) +/* 9D8A50 80241A30 AC221310 */ sw $v0, %lo(D_80151310)($at) +/* 9D8A54 80241A34 03E00008 */ jr $ra +/* 9D8A58 80241A38 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C.s deleted file mode 100644 index 1938b3b51b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A3C -/* 9D8A5C 80241A3C 3C018015 */ lui $at, %hi(D_80151310) -/* 9D8A60 80241A40 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 9D8A64 80241A44 03E00008 */ jr $ra -/* 9D8A68 80241A48 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s new file mode 100644 index 0000000000..37af635b84 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s @@ -0,0 +1,8 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A3C_9D8A5C +/* 9D8A5C 80241A3C 3C018015 */ lui $at, %hi(D_80151310) +/* 9D8A60 80241A40 AC201310 */ sw $zero, %lo(D_80151310)($at) +/* 9D8A64 80241A44 03E00008 */ jr $ra +/* 9D8A68 80241A48 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70.s deleted file mode 100644 index 5af50fd7d5..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C70 -/* 9D8C90 80241C70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D8C94 80241C74 AFBF0014 */ sw $ra, 0x14($sp) -/* 9D8C98 80241C78 AFB00010 */ sw $s0, 0x10($sp) -/* 9D8C9C 80241C7C 0C00EABB */ jal get_npc_unsafe -/* 9D8CA0 80241C80 8C84014C */ lw $a0, 0x14c($a0) -/* 9D8CA4 80241C84 24040008 */ addiu $a0, $zero, 8 -/* 9D8CA8 80241C88 0040802D */ daddu $s0, $v0, $zero -/* 9D8CAC 80241C8C 3C028024 */ lui $v0, 0x8024 -/* 9D8CB0 80241C90 24421CDC */ addiu $v0, $v0, 0x1cdc -/* 9D8CB4 80241C94 0C00AB39 */ jal heap_malloc -/* 9D8CB8 80241C98 AE020008 */ sw $v0, 8($s0) -/* 9D8CBC 80241C9C 0040182D */ daddu $v1, $v0, $zero -/* 9D8CC0 80241CA0 AE030020 */ sw $v1, 0x20($s0) -/* 9D8CC4 80241CA4 AC600000 */ sw $zero, ($v1) -/* 9D8CC8 80241CA8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9D8CCC 80241CAC 8FB00010 */ lw $s0, 0x10($sp) -/* 9D8CD0 80241CB0 24020001 */ addiu $v0, $zero, 1 -/* 9D8CD4 80241CB4 03E00008 */ jr $ra -/* 9D8CD8 80241CB8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s new file mode 100644 index 0000000000..d1d4e43f2f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241C70_9D8C90.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C70_9D8C90 +/* 9D8C90 80241C70 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D8C94 80241C74 AFBF0014 */ sw $ra, 0x14($sp) +/* 9D8C98 80241C78 AFB00010 */ sw $s0, 0x10($sp) +/* 9D8C9C 80241C7C 0C00EABB */ jal get_npc_unsafe +/* 9D8CA0 80241C80 8C84014C */ lw $a0, 0x14c($a0) +/* 9D8CA4 80241C84 24040008 */ addiu $a0, $zero, 8 +/* 9D8CA8 80241C88 0040802D */ daddu $s0, $v0, $zero +/* 9D8CAC 80241C8C 3C028024 */ lui $v0, 0x8024 +/* 9D8CB0 80241C90 24421CDC */ addiu $v0, $v0, 0x1cdc +/* 9D8CB4 80241C94 0C00AB39 */ jal heap_malloc +/* 9D8CB8 80241C98 AE020008 */ sw $v0, 8($s0) +/* 9D8CBC 80241C9C 0040182D */ daddu $v1, $v0, $zero +/* 9D8CC0 80241CA0 AE030020 */ sw $v1, 0x20($s0) +/* 9D8CC4 80241CA4 AC600000 */ sw $zero, ($v1) +/* 9D8CC8 80241CA8 8FBF0014 */ lw $ra, 0x14($sp) +/* 9D8CCC 80241CAC 8FB00010 */ lw $s0, 0x10($sp) +/* 9D8CD0 80241CB0 24020001 */ addiu $v0, $zero, 1 +/* 9D8CD4 80241CB4 03E00008 */ jr $ra +/* 9D8CD8 80241CB8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC.s deleted file mode 100644 index d0f36cd929..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CBC -/* 9D8CDC 80241CBC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D8CE0 80241CC0 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D8CE4 80241CC4 0C00EABB */ jal get_npc_unsafe -/* 9D8CE8 80241CC8 8C84014C */ lw $a0, 0x14c($a0) -/* 9D8CEC 80241CCC 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D8CF0 80241CD0 0000102D */ daddu $v0, $zero, $zero -/* 9D8CF4 80241CD4 03E00008 */ jr $ra -/* 9D8CF8 80241CD8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s new file mode 100644 index 0000000000..7a943321ac --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CBC_9D8CDC +/* 9D8CDC 80241CBC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D8CE0 80241CC0 AFBF0010 */ sw $ra, 0x10($sp) +/* 9D8CE4 80241CC4 0C00EABB */ jal get_npc_unsafe +/* 9D8CE8 80241CC8 8C84014C */ lw $a0, 0x14c($a0) +/* 9D8CEC 80241CCC 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D8CF0 80241CD0 0000102D */ daddu $v0, $zero, $zero +/* 9D8CF4 80241CD4 03E00008 */ jr $ra +/* 9D8CF8 80241CD8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC.s deleted file mode 100644 index 228a34ad5a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CDC -/* 9D8CFC 80241CDC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D8D00 80241CE0 3C03800A */ lui $v1, 0x800a -/* 9D8D04 80241CE4 8463A634 */ lh $v1, -0x59cc($v1) -/* 9D8D08 80241CE8 3C05800B */ lui $a1, %hi(gCameras) -/* 9D8D0C 80241CEC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* 9D8D10 80241CF0 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D8D14 80241CF4 00031080 */ sll $v0, $v1, 2 -/* 9D8D18 80241CF8 00431021 */ addu $v0, $v0, $v1 -/* 9D8D1C 80241CFC 00021080 */ sll $v0, $v0, 2 -/* 9D8D20 80241D00 00431023 */ subu $v0, $v0, $v1 -/* 9D8D24 80241D04 000218C0 */ sll $v1, $v0, 3 -/* 9D8D28 80241D08 00431021 */ addu $v0, $v0, $v1 -/* 9D8D2C 80241D0C 8C830020 */ lw $v1, 0x20($a0) -/* 9D8D30 80241D10 000210C0 */ sll $v0, $v0, 3 -/* 9D8D34 80241D14 8C630000 */ lw $v1, ($v1) -/* 9D8D38 80241D18 30630001 */ andi $v1, $v1, 1 -/* 9D8D3C 80241D1C 10600004 */ beqz $v1, .L80241D30 -/* 9D8D40 80241D20 00451021 */ addu $v0, $v0, $a1 -/* 9D8D44 80241D24 C44C006C */ lwc1 $f12, 0x6c($v0) -/* 9D8D48 80241D28 0C00A6C9 */ jal clamp_angle -/* 9D8D4C 80241D2C 46006307 */ neg.s $f12, $f12 -.L80241D30: -/* 9D8D50 80241D30 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D8D54 80241D34 03E00008 */ jr $ra -/* 9D8D58 80241D38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s new file mode 100644 index 0000000000..54db506389 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CDC_9D8CFC.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CDC_9D8CFC +/* 9D8CFC 80241CDC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D8D00 80241CE0 3C03800A */ lui $v1, 0x800a +/* 9D8D04 80241CE4 8463A634 */ lh $v1, -0x59cc($v1) +/* 9D8D08 80241CE8 3C05800B */ lui $a1, %hi(gCameras) +/* 9D8D0C 80241CEC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* 9D8D10 80241CF0 AFBF0010 */ sw $ra, 0x10($sp) +/* 9D8D14 80241CF4 00031080 */ sll $v0, $v1, 2 +/* 9D8D18 80241CF8 00431021 */ addu $v0, $v0, $v1 +/* 9D8D1C 80241CFC 00021080 */ sll $v0, $v0, 2 +/* 9D8D20 80241D00 00431023 */ subu $v0, $v0, $v1 +/* 9D8D24 80241D04 000218C0 */ sll $v1, $v0, 3 +/* 9D8D28 80241D08 00431021 */ addu $v0, $v0, $v1 +/* 9D8D2C 80241D0C 8C830020 */ lw $v1, 0x20($a0) +/* 9D8D30 80241D10 000210C0 */ sll $v0, $v0, 3 +/* 9D8D34 80241D14 8C630000 */ lw $v1, ($v1) +/* 9D8D38 80241D18 30630001 */ andi $v1, $v1, 1 +/* 9D8D3C 80241D1C 10600004 */ beqz $v1, .L80241D30 +/* 9D8D40 80241D20 00451021 */ addu $v0, $v0, $a1 +/* 9D8D44 80241D24 C44C006C */ lwc1 $f12, 0x6c($v0) +/* 9D8D48 80241D28 0C00A6C9 */ jal clamp_angle +/* 9D8D4C 80241D2C 46006307 */ neg.s $f12, $f12 +.L80241D30: +/* 9D8D50 80241D30 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D8D54 80241D34 03E00008 */ jr $ra +/* 9D8D58 80241D38 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C.s deleted file mode 100644 index c45e3092e3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D3C -/* 9D8D5C 80241D3C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D8D60 80241D40 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8D64 80241D44 0080882D */ daddu $s1, $a0, $zero -/* 9D8D68 80241D48 AFBF0024 */ sw $ra, 0x24($sp) -/* 9D8D6C 80241D4C AFB40020 */ sw $s4, 0x20($sp) -/* 9D8D70 80241D50 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D8D74 80241D54 AFB20018 */ sw $s2, 0x18($sp) -/* 9D8D78 80241D58 10A00033 */ beqz $a1, .L80241E28 -/* 9D8D7C 80241D5C AFB00010 */ sw $s0, 0x10($sp) -/* 9D8D80 80241D60 0C04760B */ jal func_8011D82C -/* 9D8D84 80241D64 24040001 */ addiu $a0, $zero, 1 -/* 9D8D88 80241D68 0000202D */ daddu $a0, $zero, $zero -/* 9D8D8C 80241D6C 0080282D */ daddu $a1, $a0, $zero -/* 9D8D90 80241D70 0080302D */ daddu $a2, $a0, $zero -/* 9D8D94 80241D74 0080382D */ daddu $a3, $a0, $zero -/* 9D8D98 80241D78 0080802D */ daddu $s0, $a0, $zero -/* 9D8D9C 80241D7C 2414FFFC */ addiu $s4, $zero, -4 -/* 9D8DA0 80241D80 24130013 */ addiu $s3, $zero, 0x13 -/* 9D8DA4 80241D84 3C120080 */ lui $s2, 0x80 -/* 9D8DA8 80241D88 3C038015 */ lui $v1, 0x8015 -/* 9D8DAC 80241D8C 8C6312F0 */ lw $v1, 0x12f0($v1) -/* 9D8DB0 80241D90 24020001 */ addiu $v0, $zero, 1 -/* 9D8DB4 80241D94 0C046F97 */ jal set_background_color_blend -/* 9D8DB8 80241D98 A0620000 */ sb $v0, ($v1) -.L80241D9C: -/* 9D8DBC 80241D9C 0C00E2B7 */ jal get_npc_by_index -/* 9D8DC0 80241DA0 0200202D */ daddu $a0, $s0, $zero -/* 9D8DC4 80241DA4 0040202D */ daddu $a0, $v0, $zero -/* 9D8DC8 80241DA8 5080000B */ beql $a0, $zero, .L80241DD8 -/* 9D8DCC 80241DAC 26100001 */ addiu $s0, $s0, 1 -/* 9D8DD0 80241DB0 8C820000 */ lw $v0, ($a0) -/* 9D8DD4 80241DB4 50400008 */ beql $v0, $zero, .L80241DD8 -/* 9D8DD8 80241DB8 26100001 */ addiu $s0, $s0, 1 -/* 9D8DDC 80241DBC 808300A4 */ lb $v1, 0xa4($a0) -/* 9D8DE0 80241DC0 10740005 */ beq $v1, $s4, .L80241DD8 -/* 9D8DE4 80241DC4 26100001 */ addiu $s0, $s0, 1 -/* 9D8DE8 80241DC8 10730003 */ beq $v1, $s3, .L80241DD8 -/* 9D8DEC 80241DCC 00000000 */ nop -/* 9D8DF0 80241DD0 00521025 */ or $v0, $v0, $s2 -/* 9D8DF4 80241DD4 AC820000 */ sw $v0, ($a0) -.L80241DD8: -/* 9D8DF8 80241DD8 2A020040 */ slti $v0, $s0, 0x40 -/* 9D8DFC 80241DDC 1440FFEF */ bnez $v0, .L80241D9C -/* 9D8E00 80241DE0 00000000 */ nop -/* 9D8E04 80241DE4 0000802D */ daddu $s0, $zero, $zero -/* 9D8E08 80241DE8 3C120800 */ lui $s2, 0x800 -.L80241DEC: -/* 9D8E0C 80241DEC 0C04C3D6 */ jal get_item_entity -/* 9D8E10 80241DF0 0200202D */ daddu $a0, $s0, $zero -/* 9D8E14 80241DF4 0040182D */ daddu $v1, $v0, $zero -/* 9D8E18 80241DF8 10600007 */ beqz $v1, .L80241E18 -/* 9D8E1C 80241DFC 26100001 */ addiu $s0, $s0, 1 -/* 9D8E20 80241E00 8C640000 */ lw $a0, ($v1) -/* 9D8E24 80241E04 30820010 */ andi $v0, $a0, 0x10 -/* 9D8E28 80241E08 10400003 */ beqz $v0, .L80241E18 -/* 9D8E2C 80241E0C 00000000 */ nop -/* 9D8E30 80241E10 00921025 */ or $v0, $a0, $s2 -/* 9D8E34 80241E14 AC620000 */ sw $v0, ($v1) -.L80241E18: -/* 9D8E38 80241E18 2A020100 */ slti $v0, $s0, 0x100 -/* 9D8E3C 80241E1C 1440FFF3 */ bnez $v0, .L80241DEC -/* 9D8E40 80241E20 00000000 */ nop -/* 9D8E44 80241E24 AE200070 */ sw $zero, 0x70($s1) -.L80241E28: -/* 9D8E48 80241E28 8E220070 */ lw $v0, 0x70($s1) -/* 9D8E4C 80241E2C 24420008 */ addiu $v0, $v0, 8 -/* 9D8E50 80241E30 AE220070 */ sw $v0, 0x70($s1) -/* 9D8E54 80241E34 28420100 */ slti $v0, $v0, 0x100 -/* 9D8E58 80241E38 14400003 */ bnez $v0, .L80241E48 -/* 9D8E5C 80241E3C 0000202D */ daddu $a0, $zero, $zero -/* 9D8E60 80241E40 240200FF */ addiu $v0, $zero, 0xff -/* 9D8E64 80241E44 AE220070 */ sw $v0, 0x70($s1) -.L80241E48: -/* 9D8E68 80241E48 0080282D */ daddu $a1, $a0, $zero -/* 9D8E6C 80241E4C 92270073 */ lbu $a3, 0x73($s1) -/* 9D8E70 80241E50 0C046F97 */ jal set_background_color_blend -/* 9D8E74 80241E54 0080302D */ daddu $a2, $a0, $zero -/* 9D8E78 80241E58 8E220070 */ lw $v0, 0x70($s1) -/* 9D8E7C 80241E5C 8FBF0024 */ lw $ra, 0x24($sp) -/* 9D8E80 80241E60 8FB40020 */ lw $s4, 0x20($sp) -/* 9D8E84 80241E64 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D8E88 80241E68 8FB20018 */ lw $s2, 0x18($sp) -/* 9D8E8C 80241E6C 8FB10014 */ lw $s1, 0x14($sp) -/* 9D8E90 80241E70 8FB00010 */ lw $s0, 0x10($sp) -/* 9D8E94 80241E74 384200FF */ xori $v0, $v0, 0xff -/* 9D8E98 80241E78 2C420001 */ sltiu $v0, $v0, 1 -/* 9D8E9C 80241E7C 00021040 */ sll $v0, $v0, 1 -/* 9D8EA0 80241E80 03E00008 */ jr $ra -/* 9D8EA4 80241E84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s new file mode 100644 index 0000000000..306739c9c3 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241D3C_9D8D5C.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D3C_9D8D5C +/* 9D8D5C 80241D3C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9D8D60 80241D40 AFB10014 */ sw $s1, 0x14($sp) +/* 9D8D64 80241D44 0080882D */ daddu $s1, $a0, $zero +/* 9D8D68 80241D48 AFBF0024 */ sw $ra, 0x24($sp) +/* 9D8D6C 80241D4C AFB40020 */ sw $s4, 0x20($sp) +/* 9D8D70 80241D50 AFB3001C */ sw $s3, 0x1c($sp) +/* 9D8D74 80241D54 AFB20018 */ sw $s2, 0x18($sp) +/* 9D8D78 80241D58 10A00033 */ beqz $a1, .L80241E28 +/* 9D8D7C 80241D5C AFB00010 */ sw $s0, 0x10($sp) +/* 9D8D80 80241D60 0C04760B */ jal func_8011D82C +/* 9D8D84 80241D64 24040001 */ addiu $a0, $zero, 1 +/* 9D8D88 80241D68 0000202D */ daddu $a0, $zero, $zero +/* 9D8D8C 80241D6C 0080282D */ daddu $a1, $a0, $zero +/* 9D8D90 80241D70 0080302D */ daddu $a2, $a0, $zero +/* 9D8D94 80241D74 0080382D */ daddu $a3, $a0, $zero +/* 9D8D98 80241D78 0080802D */ daddu $s0, $a0, $zero +/* 9D8D9C 80241D7C 2414FFFC */ addiu $s4, $zero, -4 +/* 9D8DA0 80241D80 24130013 */ addiu $s3, $zero, 0x13 +/* 9D8DA4 80241D84 3C120080 */ lui $s2, 0x80 +/* 9D8DA8 80241D88 3C038015 */ lui $v1, 0x8015 +/* 9D8DAC 80241D8C 8C6312F0 */ lw $v1, 0x12f0($v1) +/* 9D8DB0 80241D90 24020001 */ addiu $v0, $zero, 1 +/* 9D8DB4 80241D94 0C046F97 */ jal set_background_color_blend +/* 9D8DB8 80241D98 A0620000 */ sb $v0, ($v1) +.L80241D9C: +/* 9D8DBC 80241D9C 0C00E2B7 */ jal get_npc_by_index +/* 9D8DC0 80241DA0 0200202D */ daddu $a0, $s0, $zero +/* 9D8DC4 80241DA4 0040202D */ daddu $a0, $v0, $zero +/* 9D8DC8 80241DA8 5080000B */ beql $a0, $zero, .L80241DD8 +/* 9D8DCC 80241DAC 26100001 */ addiu $s0, $s0, 1 +/* 9D8DD0 80241DB0 8C820000 */ lw $v0, ($a0) +/* 9D8DD4 80241DB4 50400008 */ beql $v0, $zero, .L80241DD8 +/* 9D8DD8 80241DB8 26100001 */ addiu $s0, $s0, 1 +/* 9D8DDC 80241DBC 808300A4 */ lb $v1, 0xa4($a0) +/* 9D8DE0 80241DC0 10740005 */ beq $v1, $s4, .L80241DD8 +/* 9D8DE4 80241DC4 26100001 */ addiu $s0, $s0, 1 +/* 9D8DE8 80241DC8 10730003 */ beq $v1, $s3, .L80241DD8 +/* 9D8DEC 80241DCC 00000000 */ nop +/* 9D8DF0 80241DD0 00521025 */ or $v0, $v0, $s2 +/* 9D8DF4 80241DD4 AC820000 */ sw $v0, ($a0) +.L80241DD8: +/* 9D8DF8 80241DD8 2A020040 */ slti $v0, $s0, 0x40 +/* 9D8DFC 80241DDC 1440FFEF */ bnez $v0, .L80241D9C +/* 9D8E00 80241DE0 00000000 */ nop +/* 9D8E04 80241DE4 0000802D */ daddu $s0, $zero, $zero +/* 9D8E08 80241DE8 3C120800 */ lui $s2, 0x800 +.L80241DEC: +/* 9D8E0C 80241DEC 0C04C3D6 */ jal get_item_entity +/* 9D8E10 80241DF0 0200202D */ daddu $a0, $s0, $zero +/* 9D8E14 80241DF4 0040182D */ daddu $v1, $v0, $zero +/* 9D8E18 80241DF8 10600007 */ beqz $v1, .L80241E18 +/* 9D8E1C 80241DFC 26100001 */ addiu $s0, $s0, 1 +/* 9D8E20 80241E00 8C640000 */ lw $a0, ($v1) +/* 9D8E24 80241E04 30820010 */ andi $v0, $a0, 0x10 +/* 9D8E28 80241E08 10400003 */ beqz $v0, .L80241E18 +/* 9D8E2C 80241E0C 00000000 */ nop +/* 9D8E30 80241E10 00921025 */ or $v0, $a0, $s2 +/* 9D8E34 80241E14 AC620000 */ sw $v0, ($v1) +.L80241E18: +/* 9D8E38 80241E18 2A020100 */ slti $v0, $s0, 0x100 +/* 9D8E3C 80241E1C 1440FFF3 */ bnez $v0, .L80241DEC +/* 9D8E40 80241E20 00000000 */ nop +/* 9D8E44 80241E24 AE200070 */ sw $zero, 0x70($s1) +.L80241E28: +/* 9D8E48 80241E28 8E220070 */ lw $v0, 0x70($s1) +/* 9D8E4C 80241E2C 24420008 */ addiu $v0, $v0, 8 +/* 9D8E50 80241E30 AE220070 */ sw $v0, 0x70($s1) +/* 9D8E54 80241E34 28420100 */ slti $v0, $v0, 0x100 +/* 9D8E58 80241E38 14400003 */ bnez $v0, .L80241E48 +/* 9D8E5C 80241E3C 0000202D */ daddu $a0, $zero, $zero +/* 9D8E60 80241E40 240200FF */ addiu $v0, $zero, 0xff +/* 9D8E64 80241E44 AE220070 */ sw $v0, 0x70($s1) +.L80241E48: +/* 9D8E68 80241E48 0080282D */ daddu $a1, $a0, $zero +/* 9D8E6C 80241E4C 92270073 */ lbu $a3, 0x73($s1) +/* 9D8E70 80241E50 0C046F97 */ jal set_background_color_blend +/* 9D8E74 80241E54 0080302D */ daddu $a2, $a0, $zero +/* 9D8E78 80241E58 8E220070 */ lw $v0, 0x70($s1) +/* 9D8E7C 80241E5C 8FBF0024 */ lw $ra, 0x24($sp) +/* 9D8E80 80241E60 8FB40020 */ lw $s4, 0x20($sp) +/* 9D8E84 80241E64 8FB3001C */ lw $s3, 0x1c($sp) +/* 9D8E88 80241E68 8FB20018 */ lw $s2, 0x18($sp) +/* 9D8E8C 80241E6C 8FB10014 */ lw $s1, 0x14($sp) +/* 9D8E90 80241E70 8FB00010 */ lw $s0, 0x10($sp) +/* 9D8E94 80241E74 384200FF */ xori $v0, $v0, 0xff +/* 9D8E98 80241E78 2C420001 */ sltiu $v0, $v0, 1 +/* 9D8E9C 80241E7C 00021040 */ sll $v0, $v0, 1 +/* 9D8EA0 80241E80 03E00008 */ jr $ra +/* 9D8EA4 80241E84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88.s deleted file mode 100644 index 78640bb234..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88.s +++ /dev/null @@ -1,106 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E88 -/* 9D8EA8 80241E88 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D8EAC 80241E8C AFB00010 */ sw $s0, 0x10($sp) -/* 9D8EB0 80241E90 0080802D */ daddu $s0, $a0, $zero -/* 9D8EB4 80241E94 AFBF0020 */ sw $ra, 0x20($sp) -/* 9D8EB8 80241E98 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D8EBC 80241E9C AFB20018 */ sw $s2, 0x18($sp) -/* 9D8EC0 80241EA0 10A00009 */ beqz $a1, .L80241EC8 -/* 9D8EC4 80241EA4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D8EC8 80241EA8 0000202D */ daddu $a0, $zero, $zero -/* 9D8ECC 80241EAC 0080282D */ daddu $a1, $a0, $zero -/* 9D8ED0 80241EB0 0080302D */ daddu $a2, $a0, $zero -/* 9D8ED4 80241EB4 0C046F97 */ jal set_background_color_blend -/* 9D8ED8 80241EB8 240700FF */ addiu $a3, $zero, 0xff -/* 9D8EDC 80241EBC 240200FF */ addiu $v0, $zero, 0xff -/* 9D8EE0 80241EC0 AE020070 */ sw $v0, 0x70($s0) -/* 9D8EE4 80241EC4 AE000074 */ sw $zero, 0x74($s0) -.L80241EC8: -/* 9D8EE8 80241EC8 8E020070 */ lw $v0, 0x70($s0) -/* 9D8EEC 80241ECC 2442FFF8 */ addiu $v0, $v0, -8 -/* 9D8EF0 80241ED0 04410002 */ bgez $v0, .L80241EDC -/* 9D8EF4 80241ED4 AE020070 */ sw $v0, 0x70($s0) -/* 9D8EF8 80241ED8 AE000070 */ sw $zero, 0x70($s0) -.L80241EDC: -/* 9D8EFC 80241EDC 0000202D */ daddu $a0, $zero, $zero -/* 9D8F00 80241EE0 0080282D */ daddu $a1, $a0, $zero -/* 9D8F04 80241EE4 92070073 */ lbu $a3, 0x73($s0) -/* 9D8F08 80241EE8 0C046F97 */ jal set_background_color_blend -/* 9D8F0C 80241EEC 0080302D */ daddu $a2, $a0, $zero -/* 9D8F10 80241EF0 8E020070 */ lw $v0, 0x70($s0) -/* 9D8F14 80241EF4 14400006 */ bnez $v0, .L80241F10 -/* 9D8F18 80241EF8 00000000 */ nop -/* 9D8F1C 80241EFC 8E020074 */ lw $v0, 0x74($s0) -/* 9D8F20 80241F00 14400003 */ bnez $v0, .L80241F10 -/* 9D8F24 80241F04 24020001 */ addiu $v0, $zero, 1 -/* 9D8F28 80241F08 080907F7 */ j .L80241FDC -/* 9D8F2C 80241F0C AE020074 */ sw $v0, 0x74($s0) -.L80241F10: -/* 9D8F30 80241F10 8E030074 */ lw $v1, 0x74($s0) -/* 9D8F34 80241F14 24020001 */ addiu $v0, $zero, 1 -/* 9D8F38 80241F18 14620031 */ bne $v1, $v0, .L80241FE0 -/* 9D8F3C 80241F1C 0000102D */ daddu $v0, $zero, $zero -/* 9D8F40 80241F20 0C04760B */ jal func_8011D82C -/* 9D8F44 80241F24 0000202D */ daddu $a0, $zero, $zero -/* 9D8F48 80241F28 0000802D */ daddu $s0, $zero, $zero -/* 9D8F4C 80241F2C 2413FFFC */ addiu $s3, $zero, -4 -/* 9D8F50 80241F30 24120013 */ addiu $s2, $zero, 0x13 -/* 9D8F54 80241F34 3C11FF7F */ lui $s1, 0xff7f -/* 9D8F58 80241F38 3C028015 */ lui $v0, 0x8015 -/* 9D8F5C 80241F3C 8C4212F0 */ lw $v0, 0x12f0($v0) -/* 9D8F60 80241F40 3631FFFF */ ori $s1, $s1, 0xffff -/* 9D8F64 80241F44 A0400000 */ sb $zero, ($v0) -.L80241F48: -/* 9D8F68 80241F48 0C00E2B7 */ jal get_npc_by_index -/* 9D8F6C 80241F4C 0200202D */ daddu $a0, $s0, $zero -/* 9D8F70 80241F50 0040202D */ daddu $a0, $v0, $zero -/* 9D8F74 80241F54 5080000B */ beql $a0, $zero, .L80241F84 -/* 9D8F78 80241F58 26100001 */ addiu $s0, $s0, 1 -/* 9D8F7C 80241F5C 8C820000 */ lw $v0, ($a0) -/* 9D8F80 80241F60 50400008 */ beql $v0, $zero, .L80241F84 -/* 9D8F84 80241F64 26100001 */ addiu $s0, $s0, 1 -/* 9D8F88 80241F68 808300A4 */ lb $v1, 0xa4($a0) -/* 9D8F8C 80241F6C 10730005 */ beq $v1, $s3, .L80241F84 -/* 9D8F90 80241F70 26100001 */ addiu $s0, $s0, 1 -/* 9D8F94 80241F74 10720003 */ beq $v1, $s2, .L80241F84 -/* 9D8F98 80241F78 00000000 */ nop -/* 9D8F9C 80241F7C 00511024 */ and $v0, $v0, $s1 -/* 9D8FA0 80241F80 AC820000 */ sw $v0, ($a0) -.L80241F84: -/* 9D8FA4 80241F84 2A020040 */ slti $v0, $s0, 0x40 -/* 9D8FA8 80241F88 1440FFEF */ bnez $v0, .L80241F48 -/* 9D8FAC 80241F8C 00000000 */ nop -/* 9D8FB0 80241F90 0000802D */ daddu $s0, $zero, $zero -/* 9D8FB4 80241F94 3C11F7FF */ lui $s1, 0xf7ff -/* 9D8FB8 80241F98 3631FFFF */ ori $s1, $s1, 0xffff -.L80241F9C: -/* 9D8FBC 80241F9C 0C04C3D6 */ jal get_item_entity -/* 9D8FC0 80241FA0 0200202D */ daddu $a0, $s0, $zero -/* 9D8FC4 80241FA4 0040182D */ daddu $v1, $v0, $zero -/* 9D8FC8 80241FA8 10600007 */ beqz $v1, .L80241FC8 -/* 9D8FCC 80241FAC 26100001 */ addiu $s0, $s0, 1 -/* 9D8FD0 80241FB0 8C640000 */ lw $a0, ($v1) -/* 9D8FD4 80241FB4 30820010 */ andi $v0, $a0, 0x10 -/* 9D8FD8 80241FB8 10400003 */ beqz $v0, .L80241FC8 -/* 9D8FDC 80241FBC 00000000 */ nop -/* 9D8FE0 80241FC0 00911024 */ and $v0, $a0, $s1 -/* 9D8FE4 80241FC4 AC620000 */ sw $v0, ($v1) -.L80241FC8: -/* 9D8FE8 80241FC8 2A020100 */ slti $v0, $s0, 0x100 -/* 9D8FEC 80241FCC 1440FFF3 */ bnez $v0, .L80241F9C -/* 9D8FF0 80241FD0 24020002 */ addiu $v0, $zero, 2 -/* 9D8FF4 80241FD4 080907F8 */ j .L80241FE0 -/* 9D8FF8 80241FD8 00000000 */ nop -.L80241FDC: -/* 9D8FFC 80241FDC 0000102D */ daddu $v0, $zero, $zero -.L80241FE0: -/* 9D9000 80241FE0 8FBF0020 */ lw $ra, 0x20($sp) -/* 9D9004 80241FE4 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D9008 80241FE8 8FB20018 */ lw $s2, 0x18($sp) -/* 9D900C 80241FEC 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9010 80241FF0 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9014 80241FF4 03E00008 */ jr $ra -/* 9D9018 80241FF8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s new file mode 100644 index 0000000000..8d094fca89 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241E88_9D8EA8.s @@ -0,0 +1,106 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E88_9D8EA8 +/* 9D8EA8 80241E88 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9D8EAC 80241E8C AFB00010 */ sw $s0, 0x10($sp) +/* 9D8EB0 80241E90 0080802D */ daddu $s0, $a0, $zero +/* 9D8EB4 80241E94 AFBF0020 */ sw $ra, 0x20($sp) +/* 9D8EB8 80241E98 AFB3001C */ sw $s3, 0x1c($sp) +/* 9D8EBC 80241E9C AFB20018 */ sw $s2, 0x18($sp) +/* 9D8EC0 80241EA0 10A00009 */ beqz $a1, .L80241EC8 +/* 9D8EC4 80241EA4 AFB10014 */ sw $s1, 0x14($sp) +/* 9D8EC8 80241EA8 0000202D */ daddu $a0, $zero, $zero +/* 9D8ECC 80241EAC 0080282D */ daddu $a1, $a0, $zero +/* 9D8ED0 80241EB0 0080302D */ daddu $a2, $a0, $zero +/* 9D8ED4 80241EB4 0C046F97 */ jal set_background_color_blend +/* 9D8ED8 80241EB8 240700FF */ addiu $a3, $zero, 0xff +/* 9D8EDC 80241EBC 240200FF */ addiu $v0, $zero, 0xff +/* 9D8EE0 80241EC0 AE020070 */ sw $v0, 0x70($s0) +/* 9D8EE4 80241EC4 AE000074 */ sw $zero, 0x74($s0) +.L80241EC8: +/* 9D8EE8 80241EC8 8E020070 */ lw $v0, 0x70($s0) +/* 9D8EEC 80241ECC 2442FFF8 */ addiu $v0, $v0, -8 +/* 9D8EF0 80241ED0 04410002 */ bgez $v0, .L80241EDC +/* 9D8EF4 80241ED4 AE020070 */ sw $v0, 0x70($s0) +/* 9D8EF8 80241ED8 AE000070 */ sw $zero, 0x70($s0) +.L80241EDC: +/* 9D8EFC 80241EDC 0000202D */ daddu $a0, $zero, $zero +/* 9D8F00 80241EE0 0080282D */ daddu $a1, $a0, $zero +/* 9D8F04 80241EE4 92070073 */ lbu $a3, 0x73($s0) +/* 9D8F08 80241EE8 0C046F97 */ jal set_background_color_blend +/* 9D8F0C 80241EEC 0080302D */ daddu $a2, $a0, $zero +/* 9D8F10 80241EF0 8E020070 */ lw $v0, 0x70($s0) +/* 9D8F14 80241EF4 14400006 */ bnez $v0, .L80241F10 +/* 9D8F18 80241EF8 00000000 */ nop +/* 9D8F1C 80241EFC 8E020074 */ lw $v0, 0x74($s0) +/* 9D8F20 80241F00 14400003 */ bnez $v0, .L80241F10 +/* 9D8F24 80241F04 24020001 */ addiu $v0, $zero, 1 +/* 9D8F28 80241F08 080907F7 */ j .L80241FDC +/* 9D8F2C 80241F0C AE020074 */ sw $v0, 0x74($s0) +.L80241F10: +/* 9D8F30 80241F10 8E030074 */ lw $v1, 0x74($s0) +/* 9D8F34 80241F14 24020001 */ addiu $v0, $zero, 1 +/* 9D8F38 80241F18 14620031 */ bne $v1, $v0, .L80241FE0 +/* 9D8F3C 80241F1C 0000102D */ daddu $v0, $zero, $zero +/* 9D8F40 80241F20 0C04760B */ jal func_8011D82C +/* 9D8F44 80241F24 0000202D */ daddu $a0, $zero, $zero +/* 9D8F48 80241F28 0000802D */ daddu $s0, $zero, $zero +/* 9D8F4C 80241F2C 2413FFFC */ addiu $s3, $zero, -4 +/* 9D8F50 80241F30 24120013 */ addiu $s2, $zero, 0x13 +/* 9D8F54 80241F34 3C11FF7F */ lui $s1, 0xff7f +/* 9D8F58 80241F38 3C028015 */ lui $v0, 0x8015 +/* 9D8F5C 80241F3C 8C4212F0 */ lw $v0, 0x12f0($v0) +/* 9D8F60 80241F40 3631FFFF */ ori $s1, $s1, 0xffff +/* 9D8F64 80241F44 A0400000 */ sb $zero, ($v0) +.L80241F48: +/* 9D8F68 80241F48 0C00E2B7 */ jal get_npc_by_index +/* 9D8F6C 80241F4C 0200202D */ daddu $a0, $s0, $zero +/* 9D8F70 80241F50 0040202D */ daddu $a0, $v0, $zero +/* 9D8F74 80241F54 5080000B */ beql $a0, $zero, .L80241F84 +/* 9D8F78 80241F58 26100001 */ addiu $s0, $s0, 1 +/* 9D8F7C 80241F5C 8C820000 */ lw $v0, ($a0) +/* 9D8F80 80241F60 50400008 */ beql $v0, $zero, .L80241F84 +/* 9D8F84 80241F64 26100001 */ addiu $s0, $s0, 1 +/* 9D8F88 80241F68 808300A4 */ lb $v1, 0xa4($a0) +/* 9D8F8C 80241F6C 10730005 */ beq $v1, $s3, .L80241F84 +/* 9D8F90 80241F70 26100001 */ addiu $s0, $s0, 1 +/* 9D8F94 80241F74 10720003 */ beq $v1, $s2, .L80241F84 +/* 9D8F98 80241F78 00000000 */ nop +/* 9D8F9C 80241F7C 00511024 */ and $v0, $v0, $s1 +/* 9D8FA0 80241F80 AC820000 */ sw $v0, ($a0) +.L80241F84: +/* 9D8FA4 80241F84 2A020040 */ slti $v0, $s0, 0x40 +/* 9D8FA8 80241F88 1440FFEF */ bnez $v0, .L80241F48 +/* 9D8FAC 80241F8C 00000000 */ nop +/* 9D8FB0 80241F90 0000802D */ daddu $s0, $zero, $zero +/* 9D8FB4 80241F94 3C11F7FF */ lui $s1, 0xf7ff +/* 9D8FB8 80241F98 3631FFFF */ ori $s1, $s1, 0xffff +.L80241F9C: +/* 9D8FBC 80241F9C 0C04C3D6 */ jal get_item_entity +/* 9D8FC0 80241FA0 0200202D */ daddu $a0, $s0, $zero +/* 9D8FC4 80241FA4 0040182D */ daddu $v1, $v0, $zero +/* 9D8FC8 80241FA8 10600007 */ beqz $v1, .L80241FC8 +/* 9D8FCC 80241FAC 26100001 */ addiu $s0, $s0, 1 +/* 9D8FD0 80241FB0 8C640000 */ lw $a0, ($v1) +/* 9D8FD4 80241FB4 30820010 */ andi $v0, $a0, 0x10 +/* 9D8FD8 80241FB8 10400003 */ beqz $v0, .L80241FC8 +/* 9D8FDC 80241FBC 00000000 */ nop +/* 9D8FE0 80241FC0 00911024 */ and $v0, $a0, $s1 +/* 9D8FE4 80241FC4 AC620000 */ sw $v0, ($v1) +.L80241FC8: +/* 9D8FE8 80241FC8 2A020100 */ slti $v0, $s0, 0x100 +/* 9D8FEC 80241FCC 1440FFF3 */ bnez $v0, .L80241F9C +/* 9D8FF0 80241FD0 24020002 */ addiu $v0, $zero, 2 +/* 9D8FF4 80241FD4 080907F8 */ j .L80241FE0 +/* 9D8FF8 80241FD8 00000000 */ nop +.L80241FDC: +/* 9D8FFC 80241FDC 0000102D */ daddu $v0, $zero, $zero +.L80241FE0: +/* 9D9000 80241FE0 8FBF0020 */ lw $ra, 0x20($sp) +/* 9D9004 80241FE4 8FB3001C */ lw $s3, 0x1c($sp) +/* 9D9008 80241FE8 8FB20018 */ lw $s2, 0x18($sp) +/* 9D900C 80241FEC 8FB10014 */ lw $s1, 0x14($sp) +/* 9D9010 80241FF0 8FB00010 */ lw $s0, 0x10($sp) +/* 9D9014 80241FF4 03E00008 */ jr $ra +/* 9D9018 80241FF8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC.s deleted file mode 100644 index fed20b4957..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FFC -/* 9D901C 80241FFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D9020 80242000 AFB00010 */ sw $s0, 0x10($sp) -/* 9D9024 80242004 3C108011 */ lui $s0, %hi(gPlayerData) -/* 9D9028 80242008 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) -/* 9D902C 8024200C AFBF0018 */ sw $ra, 0x18($sp) -/* 9D9030 80242010 AFB10014 */ sw $s1, 0x14($sp) -/* 9D9034 80242014 960302C0 */ lhu $v1, 0x2c0($s0) -/* 9D9038 80242018 2C6203E7 */ sltiu $v0, $v1, 0x3e7 -/* 9D903C 8024201C 10400003 */ beqz $v0, .L8024202C -/* 9D9040 80242020 0080882D */ daddu $s1, $a0, $zero -/* 9D9044 80242024 24620001 */ addiu $v0, $v1, 1 -/* 9D9048 80242028 A60202C0 */ sh $v0, 0x2c0($s0) -.L8024202C: -/* 9D904C 8024202C 3C05F5DE */ lui $a1, 0xf5de -/* 9D9050 80242030 34A502E0 */ ori $a1, $a1, 0x2e0 -/* 9D9054 80242034 0C0B1EAF */ jal get_variable -/* 9D9058 80242038 0000202D */ daddu $a0, $zero, $zero -/* 9D905C 8024203C 3C038024 */ lui $v1, 0x8024 -/* 9D9060 80242040 00621821 */ addu $v1, $v1, $v0 -/* 9D9064 80242044 9063712C */ lbu $v1, 0x712c($v1) -/* 9D9068 80242048 8E220084 */ lw $v0, 0x84($s1) -/* 9D906C 8024204C 54430006 */ bnel $v0, $v1, .L80242068 -/* 9D9070 80242050 AE200084 */ sw $zero, 0x84($s1) -/* 9D9074 80242054 24020001 */ addiu $v0, $zero, 1 -/* 9D9078 80242058 AE220084 */ sw $v0, 0x84($s1) -/* 9D907C 8024205C 960202C2 */ lhu $v0, 0x2c2($s0) -/* 9D9080 80242060 24420001 */ addiu $v0, $v0, 1 -/* 9D9084 80242064 A60202C2 */ sh $v0, 0x2c2($s0) -.L80242068: -/* 9D9088 80242068 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D908C 8024206C 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9090 80242070 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9094 80242074 24020002 */ addiu $v0, $zero, 2 -/* 9D9098 80242078 03E00008 */ jr $ra -/* 9D909C 8024207C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC_9D901C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC_9D901C.s new file mode 100644 index 0000000000..6e37bd7830 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241FFC_9D901C.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FFC_9D901C +/* 9D901C 80241FFC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9D9020 80242000 AFB00010 */ sw $s0, 0x10($sp) +/* 9D9024 80242004 3C108011 */ lui $s0, %hi(gPlayerData) +/* 9D9028 80242008 2610F290 */ addiu $s0, $s0, %lo(gPlayerData) +/* 9D902C 8024200C AFBF0018 */ sw $ra, 0x18($sp) +/* 9D9030 80242010 AFB10014 */ sw $s1, 0x14($sp) +/* 9D9034 80242014 960302C0 */ lhu $v1, 0x2c0($s0) +/* 9D9038 80242018 2C6203E7 */ sltiu $v0, $v1, 0x3e7 +/* 9D903C 8024201C 10400003 */ beqz $v0, .L8024202C +/* 9D9040 80242020 0080882D */ daddu $s1, $a0, $zero +/* 9D9044 80242024 24620001 */ addiu $v0, $v1, 1 +/* 9D9048 80242028 A60202C0 */ sh $v0, 0x2c0($s0) +.L8024202C: +/* 9D904C 8024202C 3C05F5DE */ lui $a1, 0xf5de +/* 9D9050 80242030 34A502E0 */ ori $a1, $a1, 0x2e0 +/* 9D9054 80242034 0C0B1EAF */ jal get_variable +/* 9D9058 80242038 0000202D */ daddu $a0, $zero, $zero +/* 9D905C 8024203C 3C038024 */ lui $v1, 0x8024 +/* 9D9060 80242040 00621821 */ addu $v1, $v1, $v0 +/* 9D9064 80242044 9063712C */ lbu $v1, 0x712c($v1) +/* 9D9068 80242048 8E220084 */ lw $v0, 0x84($s1) +/* 9D906C 8024204C 54430006 */ bnel $v0, $v1, .L80242068 +/* 9D9070 80242050 AE200084 */ sw $zero, 0x84($s1) +/* 9D9074 80242054 24020001 */ addiu $v0, $zero, 1 +/* 9D9078 80242058 AE220084 */ sw $v0, 0x84($s1) +/* 9D907C 8024205C 960202C2 */ lhu $v0, 0x2c2($s0) +/* 9D9080 80242060 24420001 */ addiu $v0, $v0, 1 +/* 9D9084 80242064 A60202C2 */ sh $v0, 0x2c2($s0) +.L80242068: +/* 9D9088 80242068 8FBF0018 */ lw $ra, 0x18($sp) +/* 9D908C 8024206C 8FB10014 */ lw $s1, 0x14($sp) +/* 9D9090 80242070 8FB00010 */ lw $s0, 0x10($sp) +/* 9D9094 80242074 24020002 */ addiu $v0, $zero, 2 +/* 9D9098 80242078 03E00008 */ jr $ra +/* 9D909C 8024207C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080.s deleted file mode 100644 index c2e94a8ac6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242080 -/* 9D90A0 80242080 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9D90A4 80242084 AFB1001C */ sw $s1, 0x1c($sp) -/* 9D90A8 80242088 AFBF0020 */ sw $ra, 0x20($sp) -/* 9D90AC 8024208C AFB00018 */ sw $s0, 0x18($sp) -/* 9D90B0 80242090 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 9D90B4 80242094 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9D90B8 80242098 10A00060 */ beqz $a1, .L8024221C -/* 9D90BC 8024209C 0080882D */ daddu $s1, $a0, $zero -/* 9D90C0 802420A0 3C05F4AC */ lui $a1, 0xf4ac -/* 9D90C4 802420A4 0C0B1EAF */ jal get_variable -/* 9D90C8 802420A8 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9D90CC 802420AC 0220202D */ daddu $a0, $s1, $zero -/* 9D90D0 802420B0 3C05F4AC */ lui $a1, 0xf4ac -/* 9D90D4 802420B4 4482B000 */ mtc1 $v0, $f22 -/* 9D90D8 802420B8 00000000 */ nop -/* 9D90DC 802420BC 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9D90E0 802420C0 0C0B1EAF */ jal get_variable -/* 9D90E4 802420C4 34A5D482 */ ori $a1, $a1, 0xd482 -/* 9D90E8 802420C8 0220202D */ daddu $a0, $s1, $zero -/* 9D90EC 802420CC 3C05F4AC */ lui $a1, 0xf4ac -/* 9D90F0 802420D0 4482A000 */ mtc1 $v0, $f20 -/* 9D90F4 802420D4 00000000 */ nop -/* 9D90F8 802420D8 4680A520 */ cvt.s.w $f20, $f20 -/* 9D90FC 802420DC 0C0B1EAF */ jal get_variable -/* 9D9100 802420E0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9D9104 802420E4 44821000 */ mtc1 $v0, $f2 -/* 9D9108 802420E8 00000000 */ nop -/* 9D910C 802420EC 468010A0 */ cvt.s.w $f2, $f2 -/* 9D9110 802420F0 4405B000 */ mfc1 $a1, $f22 -/* 9D9114 802420F4 4406A000 */ mfc1 $a2, $f20 -/* 9D9118 802420F8 44071000 */ mfc1 $a3, $f2 -/* 9D911C 802420FC 0C01C574 */ jal func_800715D0 -/* 9D9120 80242100 0000202D */ daddu $a0, $zero, $zero -/* 9D9124 80242104 0220202D */ daddu $a0, $s1, $zero -/* 9D9128 80242108 3C05F4AC */ lui $a1, 0xf4ac -/* 9D912C 8024210C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9D9130 80242110 3C108025 */ lui $s0, 0x8025 -/* 9D9134 80242114 261049C0 */ addiu $s0, $s0, 0x49c0 -/* 9D9138 80242118 0C0B1EAF */ jal get_variable -/* 9D913C 8024211C AE020000 */ sw $v0, ($s0) -/* 9D9140 80242120 0220202D */ daddu $a0, $s1, $zero -/* 9D9144 80242124 3C05F4AC */ lui $a1, 0xf4ac -/* 9D9148 80242128 4482B000 */ mtc1 $v0, $f22 -/* 9D914C 8024212C 00000000 */ nop -/* 9D9150 80242130 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9D9154 80242134 0C0B1EAF */ jal get_variable -/* 9D9158 80242138 34A5D482 */ ori $a1, $a1, 0xd482 -/* 9D915C 8024213C 0220202D */ daddu $a0, $s1, $zero -/* 9D9160 80242140 3C05F4AC */ lui $a1, 0xf4ac -/* 9D9164 80242144 4482A000 */ mtc1 $v0, $f20 -/* 9D9168 80242148 00000000 */ nop -/* 9D916C 8024214C 4680A520 */ cvt.s.w $f20, $f20 -/* 9D9170 80242150 0C0B1EAF */ jal get_variable -/* 9D9174 80242154 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9D9178 80242158 44821000 */ mtc1 $v0, $f2 -/* 9D917C 8024215C 00000000 */ nop -/* 9D9180 80242160 468010A0 */ cvt.s.w $f2, $f2 -/* 9D9184 80242164 4405B000 */ mfc1 $a1, $f22 -/* 9D9188 80242168 4406A000 */ mfc1 $a2, $f20 -/* 9D918C 8024216C 44071000 */ mfc1 $a3, $f2 -/* 9D9190 80242170 0C01C604 */ jal func_80071810 -/* 9D9194 80242174 0000202D */ daddu $a0, $zero, $zero -/* 9D9198 80242178 0220202D */ daddu $a0, $s1, $zero -/* 9D919C 8024217C 3C05F4AC */ lui $a1, 0xf4ac -/* 9D91A0 80242180 3C018025 */ lui $at, 0x8025 -/* 9D91A4 80242184 AC2249C4 */ sw $v0, 0x49c4($at) -/* 9D91A8 80242188 0C0B1EAF */ jal get_variable -/* 9D91AC 8024218C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9D91B0 80242190 0220202D */ daddu $a0, $s1, $zero -/* 9D91B4 80242194 3C05F4AC */ lui $a1, 0xf4ac -/* 9D91B8 80242198 4482B000 */ mtc1 $v0, $f22 -/* 9D91BC 8024219C 00000000 */ nop -/* 9D91C0 802421A0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9D91C4 802421A4 0C0B1EAF */ jal get_variable -/* 9D91C8 802421A8 34A5D482 */ ori $a1, $a1, 0xd482 -/* 9D91CC 802421AC 0220202D */ daddu $a0, $s1, $zero -/* 9D91D0 802421B0 3C05F4AC */ lui $a1, 0xf4ac -/* 9D91D4 802421B4 4482A000 */ mtc1 $v0, $f20 -/* 9D91D8 802421B8 00000000 */ nop -/* 9D91DC 802421BC 4680A520 */ cvt.s.w $f20, $f20 -/* 9D91E0 802421C0 0C0B1EAF */ jal get_variable -/* 9D91E4 802421C4 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9D91E8 802421C8 44821000 */ mtc1 $v0, $f2 -/* 9D91EC 802421CC 00000000 */ nop -/* 9D91F0 802421D0 468010A0 */ cvt.s.w $f2, $f2 -/* 9D91F4 802421D4 4405B000 */ mfc1 $a1, $f22 -/* 9D91F8 802421D8 4406A000 */ mfc1 $a2, $f20 -/* 9D91FC 802421DC 3C013F80 */ lui $at, 0x3f80 -/* 9D9200 802421E0 44810000 */ mtc1 $at, $f0 -/* 9D9204 802421E4 44071000 */ mfc1 $a3, $f2 -/* 9D9208 802421E8 0000202D */ daddu $a0, $zero, $zero -/* 9D920C 802421EC AFA00014 */ sw $zero, 0x14($sp) -/* 9D9210 802421F0 0C01CA24 */ jal func_80072890 -/* 9D9214 802421F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D9218 802421F8 8E030000 */ lw $v1, ($s0) -/* 9D921C 802421FC 8C64000C */ lw $a0, 0xc($v1) -/* 9D9220 80242200 3C018025 */ lui $at, 0x8025 -/* 9D9224 80242204 AC2249C8 */ sw $v0, 0x49c8($at) -/* 9D9228 80242208 AC800018 */ sw $zero, 0x18($a0) -/* 9D922C 8024220C AC800020 */ sw $zero, 0x20($a0) -/* 9D9230 80242210 AC800024 */ sw $zero, 0x24($a0) -/* 9D9234 80242214 AC800028 */ sw $zero, 0x28($a0) -/* 9D9238 80242218 AC80001C */ sw $zero, 0x1c($a0) -.L8024221C: -/* 9D923C 8024221C 3C028025 */ lui $v0, 0x8025 -/* 9D9240 80242220 8C4249C0 */ lw $v0, 0x49c0($v0) -/* 9D9244 80242224 8C44000C */ lw $a0, 0xc($v0) -/* 9D9248 80242228 8C820020 */ lw $v0, 0x20($a0) -/* 9D924C 8024222C 8C830028 */ lw $v1, 0x28($a0) -/* 9D9250 80242230 2442000A */ addiu $v0, $v0, 0xa -/* 9D9254 80242234 AC820020 */ sw $v0, 0x20($a0) -/* 9D9258 80242238 8C820024 */ lw $v0, 0x24($a0) -/* 9D925C 8024223C 2463000A */ addiu $v1, $v1, 0xa -/* 9D9260 80242240 AC830028 */ sw $v1, 0x28($a0) -/* 9D9264 80242244 8C830018 */ lw $v1, 0x18($a0) -/* 9D9268 80242248 2442000A */ addiu $v0, $v0, 0xa -/* 9D926C 8024224C AC820024 */ sw $v0, 0x24($a0) -/* 9D9270 80242250 8C82001C */ lw $v0, 0x1c($a0) -/* 9D9274 80242254 2463000A */ addiu $v1, $v1, 0xa -/* 9D9278 80242258 AC830018 */ sw $v1, 0x18($a0) -/* 9D927C 8024225C 286300FF */ slti $v1, $v1, 0xff -/* 9D9280 80242260 2442000A */ addiu $v0, $v0, 0xa -/* 9D9284 80242264 AC82001C */ sw $v0, 0x1c($a0) -/* 9D9288 80242268 14600004 */ bnez $v1, .L8024227C -/* 9D928C 8024226C 0000102D */ daddu $v0, $zero, $zero -/* 9D9290 80242270 240200FF */ addiu $v0, $zero, 0xff -/* 9D9294 80242274 AC820018 */ sw $v0, 0x18($a0) -/* 9D9298 80242278 24020002 */ addiu $v0, $zero, 2 -.L8024227C: -/* 9D929C 8024227C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9D92A0 80242280 8FB1001C */ lw $s1, 0x1c($sp) -/* 9D92A4 80242284 8FB00018 */ lw $s0, 0x18($sp) -/* 9D92A8 80242288 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 9D92AC 8024228C D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9D92B0 80242290 03E00008 */ jr $ra -/* 9D92B4 80242294 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s new file mode 100644 index 0000000000..cd756d7afd --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242080_9D90A0.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242080_9D90A0 +/* 9D90A0 80242080 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 9D90A4 80242084 AFB1001C */ sw $s1, 0x1c($sp) +/* 9D90A8 80242088 AFBF0020 */ sw $ra, 0x20($sp) +/* 9D90AC 8024208C AFB00018 */ sw $s0, 0x18($sp) +/* 9D90B0 80242090 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 9D90B4 80242094 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 9D90B8 80242098 10A00060 */ beqz $a1, .L8024221C +/* 9D90BC 8024209C 0080882D */ daddu $s1, $a0, $zero +/* 9D90C0 802420A0 3C05F4AC */ lui $a1, 0xf4ac +/* 9D90C4 802420A4 0C0B1EAF */ jal get_variable +/* 9D90C8 802420A8 34A5D481 */ ori $a1, $a1, 0xd481 +/* 9D90CC 802420AC 0220202D */ daddu $a0, $s1, $zero +/* 9D90D0 802420B0 3C05F4AC */ lui $a1, 0xf4ac +/* 9D90D4 802420B4 4482B000 */ mtc1 $v0, $f22 +/* 9D90D8 802420B8 00000000 */ nop +/* 9D90DC 802420BC 4680B5A0 */ cvt.s.w $f22, $f22 +/* 9D90E0 802420C0 0C0B1EAF */ jal get_variable +/* 9D90E4 802420C4 34A5D482 */ ori $a1, $a1, 0xd482 +/* 9D90E8 802420C8 0220202D */ daddu $a0, $s1, $zero +/* 9D90EC 802420CC 3C05F4AC */ lui $a1, 0xf4ac +/* 9D90F0 802420D0 4482A000 */ mtc1 $v0, $f20 +/* 9D90F4 802420D4 00000000 */ nop +/* 9D90F8 802420D8 4680A520 */ cvt.s.w $f20, $f20 +/* 9D90FC 802420DC 0C0B1EAF */ jal get_variable +/* 9D9100 802420E0 34A5D483 */ ori $a1, $a1, 0xd483 +/* 9D9104 802420E4 44821000 */ mtc1 $v0, $f2 +/* 9D9108 802420E8 00000000 */ nop +/* 9D910C 802420EC 468010A0 */ cvt.s.w $f2, $f2 +/* 9D9110 802420F0 4405B000 */ mfc1 $a1, $f22 +/* 9D9114 802420F4 4406A000 */ mfc1 $a2, $f20 +/* 9D9118 802420F8 44071000 */ mfc1 $a3, $f2 +/* 9D911C 802420FC 0C01C574 */ jal func_800715D0 +/* 9D9120 80242100 0000202D */ daddu $a0, $zero, $zero +/* 9D9124 80242104 0220202D */ daddu $a0, $s1, $zero +/* 9D9128 80242108 3C05F4AC */ lui $a1, 0xf4ac +/* 9D912C 8024210C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 9D9130 80242110 3C108025 */ lui $s0, 0x8025 +/* 9D9134 80242114 261049C0 */ addiu $s0, $s0, 0x49c0 +/* 9D9138 80242118 0C0B1EAF */ jal get_variable +/* 9D913C 8024211C AE020000 */ sw $v0, ($s0) +/* 9D9140 80242120 0220202D */ daddu $a0, $s1, $zero +/* 9D9144 80242124 3C05F4AC */ lui $a1, 0xf4ac +/* 9D9148 80242128 4482B000 */ mtc1 $v0, $f22 +/* 9D914C 8024212C 00000000 */ nop +/* 9D9150 80242130 4680B5A0 */ cvt.s.w $f22, $f22 +/* 9D9154 80242134 0C0B1EAF */ jal get_variable +/* 9D9158 80242138 34A5D482 */ ori $a1, $a1, 0xd482 +/* 9D915C 8024213C 0220202D */ daddu $a0, $s1, $zero +/* 9D9160 80242140 3C05F4AC */ lui $a1, 0xf4ac +/* 9D9164 80242144 4482A000 */ mtc1 $v0, $f20 +/* 9D9168 80242148 00000000 */ nop +/* 9D916C 8024214C 4680A520 */ cvt.s.w $f20, $f20 +/* 9D9170 80242150 0C0B1EAF */ jal get_variable +/* 9D9174 80242154 34A5D483 */ ori $a1, $a1, 0xd483 +/* 9D9178 80242158 44821000 */ mtc1 $v0, $f2 +/* 9D917C 8024215C 00000000 */ nop +/* 9D9180 80242160 468010A0 */ cvt.s.w $f2, $f2 +/* 9D9184 80242164 4405B000 */ mfc1 $a1, $f22 +/* 9D9188 80242168 4406A000 */ mfc1 $a2, $f20 +/* 9D918C 8024216C 44071000 */ mfc1 $a3, $f2 +/* 9D9190 80242170 0C01C604 */ jal func_80071810 +/* 9D9194 80242174 0000202D */ daddu $a0, $zero, $zero +/* 9D9198 80242178 0220202D */ daddu $a0, $s1, $zero +/* 9D919C 8024217C 3C05F4AC */ lui $a1, 0xf4ac +/* 9D91A0 80242180 3C018025 */ lui $at, 0x8025 +/* 9D91A4 80242184 AC2249C4 */ sw $v0, 0x49c4($at) +/* 9D91A8 80242188 0C0B1EAF */ jal get_variable +/* 9D91AC 8024218C 34A5D481 */ ori $a1, $a1, 0xd481 +/* 9D91B0 80242190 0220202D */ daddu $a0, $s1, $zero +/* 9D91B4 80242194 3C05F4AC */ lui $a1, 0xf4ac +/* 9D91B8 80242198 4482B000 */ mtc1 $v0, $f22 +/* 9D91BC 8024219C 00000000 */ nop +/* 9D91C0 802421A0 4680B5A0 */ cvt.s.w $f22, $f22 +/* 9D91C4 802421A4 0C0B1EAF */ jal get_variable +/* 9D91C8 802421A8 34A5D482 */ ori $a1, $a1, 0xd482 +/* 9D91CC 802421AC 0220202D */ daddu $a0, $s1, $zero +/* 9D91D0 802421B0 3C05F4AC */ lui $a1, 0xf4ac +/* 9D91D4 802421B4 4482A000 */ mtc1 $v0, $f20 +/* 9D91D8 802421B8 00000000 */ nop +/* 9D91DC 802421BC 4680A520 */ cvt.s.w $f20, $f20 +/* 9D91E0 802421C0 0C0B1EAF */ jal get_variable +/* 9D91E4 802421C4 34A5D483 */ ori $a1, $a1, 0xd483 +/* 9D91E8 802421C8 44821000 */ mtc1 $v0, $f2 +/* 9D91EC 802421CC 00000000 */ nop +/* 9D91F0 802421D0 468010A0 */ cvt.s.w $f2, $f2 +/* 9D91F4 802421D4 4405B000 */ mfc1 $a1, $f22 +/* 9D91F8 802421D8 4406A000 */ mfc1 $a2, $f20 +/* 9D91FC 802421DC 3C013F80 */ lui $at, 0x3f80 +/* 9D9200 802421E0 44810000 */ mtc1 $at, $f0 +/* 9D9204 802421E4 44071000 */ mfc1 $a3, $f2 +/* 9D9208 802421E8 0000202D */ daddu $a0, $zero, $zero +/* 9D920C 802421EC AFA00014 */ sw $zero, 0x14($sp) +/* 9D9210 802421F0 0C01CA24 */ jal func_80072890 +/* 9D9214 802421F4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9D9218 802421F8 8E030000 */ lw $v1, ($s0) +/* 9D921C 802421FC 8C64000C */ lw $a0, 0xc($v1) +/* 9D9220 80242200 3C018025 */ lui $at, 0x8025 +/* 9D9224 80242204 AC2249C8 */ sw $v0, 0x49c8($at) +/* 9D9228 80242208 AC800018 */ sw $zero, 0x18($a0) +/* 9D922C 8024220C AC800020 */ sw $zero, 0x20($a0) +/* 9D9230 80242210 AC800024 */ sw $zero, 0x24($a0) +/* 9D9234 80242214 AC800028 */ sw $zero, 0x28($a0) +/* 9D9238 80242218 AC80001C */ sw $zero, 0x1c($a0) +.L8024221C: +/* 9D923C 8024221C 3C028025 */ lui $v0, 0x8025 +/* 9D9240 80242220 8C4249C0 */ lw $v0, 0x49c0($v0) +/* 9D9244 80242224 8C44000C */ lw $a0, 0xc($v0) +/* 9D9248 80242228 8C820020 */ lw $v0, 0x20($a0) +/* 9D924C 8024222C 8C830028 */ lw $v1, 0x28($a0) +/* 9D9250 80242230 2442000A */ addiu $v0, $v0, 0xa +/* 9D9254 80242234 AC820020 */ sw $v0, 0x20($a0) +/* 9D9258 80242238 8C820024 */ lw $v0, 0x24($a0) +/* 9D925C 8024223C 2463000A */ addiu $v1, $v1, 0xa +/* 9D9260 80242240 AC830028 */ sw $v1, 0x28($a0) +/* 9D9264 80242244 8C830018 */ lw $v1, 0x18($a0) +/* 9D9268 80242248 2442000A */ addiu $v0, $v0, 0xa +/* 9D926C 8024224C AC820024 */ sw $v0, 0x24($a0) +/* 9D9270 80242250 8C82001C */ lw $v0, 0x1c($a0) +/* 9D9274 80242254 2463000A */ addiu $v1, $v1, 0xa +/* 9D9278 80242258 AC830018 */ sw $v1, 0x18($a0) +/* 9D927C 8024225C 286300FF */ slti $v1, $v1, 0xff +/* 9D9280 80242260 2442000A */ addiu $v0, $v0, 0xa +/* 9D9284 80242264 AC82001C */ sw $v0, 0x1c($a0) +/* 9D9288 80242268 14600004 */ bnez $v1, .L8024227C +/* 9D928C 8024226C 0000102D */ daddu $v0, $zero, $zero +/* 9D9290 80242270 240200FF */ addiu $v0, $zero, 0xff +/* 9D9294 80242274 AC820018 */ sw $v0, 0x18($a0) +/* 9D9298 80242278 24020002 */ addiu $v0, $zero, 2 +.L8024227C: +/* 9D929C 8024227C 8FBF0020 */ lw $ra, 0x20($sp) +/* 9D92A0 80242280 8FB1001C */ lw $s1, 0x1c($sp) +/* 9D92A4 80242284 8FB00018 */ lw $s0, 0x18($sp) +/* 9D92A8 80242288 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 9D92AC 8024228C D7B40028 */ ldc1 $f20, 0x28($sp) +/* 9D92B0 80242290 03E00008 */ jr $ra +/* 9D92B4 80242294 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298.s deleted file mode 100644 index 16ca238ecd..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242298 -/* 9D92B8 80242298 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D92BC 8024229C 10A0000B */ beqz $a1, .L802422CC -/* 9D92C0 802422A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D92C4 802422A4 3C038025 */ lui $v1, 0x8025 -/* 9D92C8 802422A8 8C6349C4 */ lw $v1, 0x49c4($v1) -/* 9D92CC 802422AC 8C620000 */ lw $v0, ($v1) -/* 9D92D0 802422B0 3C048025 */ lui $a0, 0x8025 -/* 9D92D4 802422B4 8C8449C8 */ lw $a0, 0x49c8($a0) -/* 9D92D8 802422B8 34420010 */ ori $v0, $v0, 0x10 -/* 9D92DC 802422BC AC620000 */ sw $v0, ($v1) -/* 9D92E0 802422C0 8C820000 */ lw $v0, ($a0) -/* 9D92E4 802422C4 34420010 */ ori $v0, $v0, 0x10 -/* 9D92E8 802422C8 AC820000 */ sw $v0, ($a0) -.L802422CC: -/* 9D92EC 802422CC 3C048025 */ lui $a0, 0x8025 -/* 9D92F0 802422D0 8C8449C0 */ lw $a0, 0x49c0($a0) -/* 9D92F4 802422D4 8C85000C */ lw $a1, 0xc($a0) -/* 9D92F8 802422D8 8CA20018 */ lw $v0, 0x18($a1) -/* 9D92FC 802422DC 8CA30020 */ lw $v1, 0x20($a1) -/* 9D9300 802422E0 2442FFF6 */ addiu $v0, $v0, -0xa -/* 9D9304 802422E4 ACA20018 */ sw $v0, 0x18($a1) -/* 9D9308 802422E8 8CA20024 */ lw $v0, 0x24($a1) -/* 9D930C 802422EC 2463FFF6 */ addiu $v1, $v1, -0xa -/* 9D9310 802422F0 ACA30020 */ sw $v1, 0x20($a1) -/* 9D9314 802422F4 8CA30028 */ lw $v1, 0x28($a1) -/* 9D9318 802422F8 2442FFF6 */ addiu $v0, $v0, -0xa -/* 9D931C 802422FC ACA20024 */ sw $v0, 0x24($a1) -/* 9D9320 80242300 8CA2001C */ lw $v0, 0x1c($a1) -/* 9D9324 80242304 2463FFF6 */ addiu $v1, $v1, -0xa -/* 9D9328 80242308 ACA30028 */ sw $v1, 0x28($a1) -/* 9D932C 8024230C 8CA30018 */ lw $v1, 0x18($a1) -/* 9D9330 80242310 2442FFF6 */ addiu $v0, $v0, -0xa -/* 9D9334 80242314 18600003 */ blez $v1, .L80242324 -/* 9D9338 80242318 ACA2001C */ sw $v0, 0x1c($a1) -/* 9D933C 8024231C 080908D0 */ j .L80242340 -/* 9D9340 80242320 0000102D */ daddu $v0, $zero, $zero -.L80242324: -/* 9D9344 80242324 0C016914 */ jal remove_effect -/* 9D9348 80242328 ACA00018 */ sw $zero, 0x18($a1) -/* 9D934C 8024232C 3C048025 */ lui $a0, 0x8025 -/* 9D9350 80242330 8C8449A0 */ lw $a0, 0x49a0($a0) -/* 9D9354 80242334 0C048D70 */ jal func_801235C0 -/* 9D9358 80242338 00000000 */ nop -/* 9D935C 8024233C 24020002 */ addiu $v0, $zero, 2 -.L80242340: -/* 9D9360 80242340 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9364 80242344 03E00008 */ jr $ra -/* 9D9368 80242348 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s new file mode 100644 index 0000000000..86e2504a67 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242298_9D92B8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242298_9D92B8 +/* 9D92B8 80242298 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D92BC 8024229C 10A0000B */ beqz $a1, .L802422CC +/* 9D92C0 802422A0 AFBF0010 */ sw $ra, 0x10($sp) +/* 9D92C4 802422A4 3C038025 */ lui $v1, 0x8025 +/* 9D92C8 802422A8 8C6349C4 */ lw $v1, 0x49c4($v1) +/* 9D92CC 802422AC 8C620000 */ lw $v0, ($v1) +/* 9D92D0 802422B0 3C048025 */ lui $a0, 0x8025 +/* 9D92D4 802422B4 8C8449C8 */ lw $a0, 0x49c8($a0) +/* 9D92D8 802422B8 34420010 */ ori $v0, $v0, 0x10 +/* 9D92DC 802422BC AC620000 */ sw $v0, ($v1) +/* 9D92E0 802422C0 8C820000 */ lw $v0, ($a0) +/* 9D92E4 802422C4 34420010 */ ori $v0, $v0, 0x10 +/* 9D92E8 802422C8 AC820000 */ sw $v0, ($a0) +.L802422CC: +/* 9D92EC 802422CC 3C048025 */ lui $a0, 0x8025 +/* 9D92F0 802422D0 8C8449C0 */ lw $a0, 0x49c0($a0) +/* 9D92F4 802422D4 8C85000C */ lw $a1, 0xc($a0) +/* 9D92F8 802422D8 8CA20018 */ lw $v0, 0x18($a1) +/* 9D92FC 802422DC 8CA30020 */ lw $v1, 0x20($a1) +/* 9D9300 802422E0 2442FFF6 */ addiu $v0, $v0, -0xa +/* 9D9304 802422E4 ACA20018 */ sw $v0, 0x18($a1) +/* 9D9308 802422E8 8CA20024 */ lw $v0, 0x24($a1) +/* 9D930C 802422EC 2463FFF6 */ addiu $v1, $v1, -0xa +/* 9D9310 802422F0 ACA30020 */ sw $v1, 0x20($a1) +/* 9D9314 802422F4 8CA30028 */ lw $v1, 0x28($a1) +/* 9D9318 802422F8 2442FFF6 */ addiu $v0, $v0, -0xa +/* 9D931C 802422FC ACA20024 */ sw $v0, 0x24($a1) +/* 9D9320 80242300 8CA2001C */ lw $v0, 0x1c($a1) +/* 9D9324 80242304 2463FFF6 */ addiu $v1, $v1, -0xa +/* 9D9328 80242308 ACA30028 */ sw $v1, 0x28($a1) +/* 9D932C 8024230C 8CA30018 */ lw $v1, 0x18($a1) +/* 9D9330 80242310 2442FFF6 */ addiu $v0, $v0, -0xa +/* 9D9334 80242314 18600003 */ blez $v1, .L80242324 +/* 9D9338 80242318 ACA2001C */ sw $v0, 0x1c($a1) +/* 9D933C 8024231C 080908D0 */ j .L80242340 +/* 9D9340 80242320 0000102D */ daddu $v0, $zero, $zero +.L80242324: +/* 9D9344 80242324 0C016914 */ jal remove_effect +/* 9D9348 80242328 ACA00018 */ sw $zero, 0x18($a1) +/* 9D934C 8024232C 3C048025 */ lui $a0, 0x8025 +/* 9D9350 80242330 8C8449A0 */ lw $a0, 0x49a0($a0) +/* 9D9354 80242334 0C048D70 */ jal func_801235C0 +/* 9D9358 80242338 00000000 */ nop +/* 9D935C 8024233C 24020002 */ addiu $v0, $zero, 2 +.L80242340: +/* 9D9360 80242340 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D9364 80242344 03E00008 */ jr $ra +/* 9D9368 80242348 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C.s deleted file mode 100644 index c8b05c5896..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024234C -/* 9D936C 8024234C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9370 80242350 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9374 80242354 8C82000C */ lw $v0, 0xc($a0) -/* 9D9378 80242358 0C0B1EAF */ jal get_variable -/* 9D937C 8024235C 8C450000 */ lw $a1, ($v0) -/* 9D9380 80242360 3C038025 */ lui $v1, 0x8025 -/* 9D9384 80242364 8C6349C0 */ lw $v1, 0x49c0($v1) -/* 9D9388 80242368 8C63000C */ lw $v1, 0xc($v1) -/* 9D938C 8024236C AC620034 */ sw $v0, 0x34($v1) -/* 9D9390 80242370 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9394 80242374 24020002 */ addiu $v0, $zero, 2 -/* 9D9398 80242378 03E00008 */ jr $ra -/* 9D939C 8024237C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s new file mode 100644 index 0000000000..3b47f6de51 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024234C_9D936C.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024234C_9D936C +/* 9D936C 8024234C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D9370 80242350 AFBF0010 */ sw $ra, 0x10($sp) +/* 9D9374 80242354 8C82000C */ lw $v0, 0xc($a0) +/* 9D9378 80242358 0C0B1EAF */ jal get_variable +/* 9D937C 8024235C 8C450000 */ lw $a1, ($v0) +/* 9D9380 80242360 3C038025 */ lui $v1, 0x8025 +/* 9D9384 80242364 8C6349C0 */ lw $v1, 0x49c0($v1) +/* 9D9388 80242368 8C63000C */ lw $v1, 0xc($v1) +/* 9D938C 8024236C AC620034 */ sw $v0, 0x34($v1) +/* 9D9390 80242370 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D9394 80242374 24020002 */ addiu $v0, $zero, 2 +/* 9D9398 80242378 03E00008 */ jr $ra +/* 9D939C 8024237C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400.s deleted file mode 100644 index 11c3c70cc6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242400 -/* 9D9420 80242400 3C028025 */ lui $v0, 0x8025 -/* 9D9424 80242404 8C4249C8 */ lw $v0, 0x49c8($v0) -/* 9D9428 80242408 8C42000C */ lw $v0, 0xc($v0) -/* 9D942C 8024240C AC40001C */ sw $zero, 0x1c($v0) -/* 9D9430 80242410 03E00008 */ jr $ra -/* 9D9434 80242414 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400_9D9420.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400_9D9420.s new file mode 100644 index 0000000000..357151f730 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242400_9D9420.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242400_9D9420 +/* 9D9420 80242400 3C028025 */ lui $v0, 0x8025 +/* 9D9424 80242404 8C4249C8 */ lw $v0, 0x49c8($v0) +/* 9D9428 80242408 8C42000C */ lw $v0, 0xc($v0) +/* 9D942C 8024240C AC40001C */ sw $zero, 0x1c($v0) +/* 9D9430 80242410 03E00008 */ jr $ra +/* 9D9434 80242414 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418.s deleted file mode 100644 index 7aa3a91b3a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242418 -/* 9D9438 80242418 3C028025 */ lui $v0, 0x8025 -/* 9D943C 8024241C 8C4249C8 */ lw $v0, 0x49c8($v0) -/* 9D9440 80242420 8C43000C */ lw $v1, 0xc($v0) -/* 9D9444 80242424 24020001 */ addiu $v0, $zero, 1 -/* 9D9448 80242428 AC62001C */ sw $v0, 0x1c($v1) -/* 9D944C 8024242C 03E00008 */ jr $ra -/* 9D9450 80242430 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418_9D9438.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418_9D9438.s new file mode 100644 index 0000000000..85342688a7 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242418_9D9438.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242418_9D9438 +/* 9D9438 80242418 3C028025 */ lui $v0, 0x8025 +/* 9D943C 8024241C 8C4249C8 */ lw $v0, 0x49c8($v0) +/* 9D9440 80242420 8C43000C */ lw $v1, 0xc($v0) +/* 9D9444 80242424 24020001 */ addiu $v0, $zero, 1 +/* 9D9448 80242428 AC62001C */ sw $v0, 0x1c($v1) +/* 9D944C 8024242C 03E00008 */ jr $ra +/* 9D9450 80242430 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434.s deleted file mode 100644 index 11cf985436..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242434 -/* 9D9454 80242434 3C028025 */ lui $v0, 0x8025 -/* 9D9458 80242438 8C4249C8 */ lw $v0, 0x49c8($v0) -/* 9D945C 8024243C 8C43000C */ lw $v1, 0xc($v0) -/* 9D9460 80242440 24020002 */ addiu $v0, $zero, 2 -/* 9D9464 80242444 03E00008 */ jr $ra -/* 9D9468 80242448 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434_9D9454.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434_9D9454.s new file mode 100644 index 0000000000..b3fcfa7658 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242434_9D9454.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242434_9D9454 +/* 9D9454 80242434 3C028025 */ lui $v0, 0x8025 +/* 9D9458 80242438 8C4249C8 */ lw $v0, 0x49c8($v0) +/* 9D945C 8024243C 8C43000C */ lw $v1, 0xc($v0) +/* 9D9460 80242440 24020002 */ addiu $v0, $zero, 2 +/* 9D9464 80242444 03E00008 */ jr $ra +/* 9D9468 80242448 AC62001C */ sw $v0, 0x1c($v1) diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C.s deleted file mode 100644 index ebc729ba17..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024244C -/* 9D946C 8024244C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9470 80242450 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9D9474 80242454 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9D9478 80242458 3C05FE36 */ lui $a1, 0xfe36 -/* 9D947C 8024245C AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9480 80242460 80460075 */ lb $a2, 0x75($v0) -/* 9D9484 80242464 0C0B2026 */ jal set_variable -/* 9D9488 80242468 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9D948C 8024246C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9490 80242470 24020002 */ addiu $v0, $zero, 2 -/* 9D9494 80242474 03E00008 */ jr $ra -/* 9D9498 80242478 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s new file mode 100644 index 0000000000..0cbfc43145 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024244C_9D946C +/* 9D946C 8024244C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D9470 80242450 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* 9D9474 80242454 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* 9D9478 80242458 3C05FE36 */ lui $a1, 0xfe36 +/* 9D947C 8024245C AFBF0010 */ sw $ra, 0x10($sp) +/* 9D9480 80242460 80460075 */ lb $a2, 0x75($v0) +/* 9D9484 80242464 0C0B2026 */ jal set_variable +/* 9D9488 80242468 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 9D948C 8024246C 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D9490 80242470 24020002 */ addiu $v0, $zero, 2 +/* 9D9494 80242474 03E00008 */ jr $ra +/* 9D9498 80242478 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C.s deleted file mode 100644 index d56e52d5fb..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024247C -/* 9D949C 8024247C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D94A0 80242480 AFB10014 */ sw $s1, 0x14($sp) -/* 9D94A4 80242484 0080882D */ daddu $s1, $a0, $zero -/* 9D94A8 80242488 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D94AC 8024248C AFB00010 */ sw $s0, 0x10($sp) -/* 9D94B0 80242490 8E30000C */ lw $s0, 0xc($s1) -/* 9D94B4 80242494 8E050000 */ lw $a1, ($s0) -/* 9D94B8 80242498 0C0B1EAF */ jal get_variable -/* 9D94BC 8024249C 26100004 */ addiu $s0, $s0, 4 -/* 9D94C0 802424A0 0220202D */ daddu $a0, $s1, $zero -/* 9D94C4 802424A4 8E050000 */ lw $a1, ($s0) -/* 9D94C8 802424A8 0C0B210B */ jal get_float_variable -/* 9D94CC 802424AC 0040802D */ daddu $s0, $v0, $zero -/* 9D94D0 802424B0 24020002 */ addiu $v0, $zero, 2 -/* 9D94D4 802424B4 00501804 */ sllv $v1, $s0, $v0 -/* 9D94D8 802424B8 00701821 */ addu $v1, $v1, $s0 -/* 9D94DC 802424BC 00431804 */ sllv $v1, $v1, $v0 -/* 9D94E0 802424C0 00701823 */ subu $v1, $v1, $s0 -/* 9D94E4 802424C4 000320C0 */ sll $a0, $v1, 3 -/* 9D94E8 802424C8 00641821 */ addu $v1, $v1, $a0 -/* 9D94EC 802424CC 000318C0 */ sll $v1, $v1, 3 -/* 9D94F0 802424D0 3C01800B */ lui $at, 0x800b -/* 9D94F4 802424D4 00230821 */ addu $at, $at, $v1 -/* 9D94F8 802424D8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 9D94FC 802424DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D9500 802424E0 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9504 802424E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9508 802424E8 03E00008 */ jr $ra -/* 9D950C 802424EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s new file mode 100644 index 0000000000..ca72344204 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024247C_9D949C +/* 9D949C 8024247C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9D94A0 80242480 AFB10014 */ sw $s1, 0x14($sp) +/* 9D94A4 80242484 0080882D */ daddu $s1, $a0, $zero +/* 9D94A8 80242488 AFBF0018 */ sw $ra, 0x18($sp) +/* 9D94AC 8024248C AFB00010 */ sw $s0, 0x10($sp) +/* 9D94B0 80242490 8E30000C */ lw $s0, 0xc($s1) +/* 9D94B4 80242494 8E050000 */ lw $a1, ($s0) +/* 9D94B8 80242498 0C0B1EAF */ jal get_variable +/* 9D94BC 8024249C 26100004 */ addiu $s0, $s0, 4 +/* 9D94C0 802424A0 0220202D */ daddu $a0, $s1, $zero +/* 9D94C4 802424A4 8E050000 */ lw $a1, ($s0) +/* 9D94C8 802424A8 0C0B210B */ jal get_float_variable +/* 9D94CC 802424AC 0040802D */ daddu $s0, $v0, $zero +/* 9D94D0 802424B0 24020002 */ addiu $v0, $zero, 2 +/* 9D94D4 802424B4 00501804 */ sllv $v1, $s0, $v0 +/* 9D94D8 802424B8 00701821 */ addu $v1, $v1, $s0 +/* 9D94DC 802424BC 00431804 */ sllv $v1, $v1, $v0 +/* 9D94E0 802424C0 00701823 */ subu $v1, $v1, $s0 +/* 9D94E4 802424C4 000320C0 */ sll $a0, $v1, 3 +/* 9D94E8 802424C8 00641821 */ addu $v1, $v1, $a0 +/* 9D94EC 802424CC 000318C0 */ sll $v1, $v1, 3 +/* 9D94F0 802424D0 3C01800B */ lui $at, 0x800b +/* 9D94F4 802424D4 00230821 */ addu $at, $at, $v1 +/* 9D94F8 802424D8 E4201D98 */ swc1 $f0, 0x1d98($at) +/* 9D94FC 802424DC 8FBF0018 */ lw $ra, 0x18($sp) +/* 9D9500 802424E0 8FB10014 */ lw $s1, 0x14($sp) +/* 9D9504 802424E4 8FB00010 */ lw $s0, 0x10($sp) +/* 9D9508 802424E8 03E00008 */ jr $ra +/* 9D950C 802424EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0.s deleted file mode 100644 index e1876965ce..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424F0 -/* 9D9510 802424F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D9514 802424F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D9518 802424F8 0080882D */ daddu $s1, $a0, $zero -/* 9D951C 802424FC AFBF0018 */ sw $ra, 0x18($sp) -/* 9D9520 80242500 AFB00010 */ sw $s0, 0x10($sp) -/* 9D9524 80242504 8E30000C */ lw $s0, 0xc($s1) -/* 9D9528 80242508 8E050000 */ lw $a1, ($s0) -/* 9D952C 8024250C 0C0B1EAF */ jal get_variable -/* 9D9530 80242510 26100004 */ addiu $s0, $s0, 4 -/* 9D9534 80242514 00021880 */ sll $v1, $v0, 2 -/* 9D9538 80242518 00621821 */ addu $v1, $v1, $v0 -/* 9D953C 8024251C 00031880 */ sll $v1, $v1, 2 -/* 9D9540 80242520 00621823 */ subu $v1, $v1, $v0 -/* 9D9544 80242524 000310C0 */ sll $v0, $v1, 3 -/* 9D9548 80242528 00621821 */ addu $v1, $v1, $v0 -/* 9D954C 8024252C 000318C0 */ sll $v1, $v1, 3 -/* 9D9550 80242530 3C01800B */ lui $at, 0x800b -/* 9D9554 80242534 00230821 */ addu $at, $at, $v1 -/* 9D9558 80242538 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 9D955C 8024253C 3C014480 */ lui $at, 0x4480 -/* 9D9560 80242540 44810000 */ mtc1 $at, $f0 -/* 9D9564 80242544 00000000 */ nop -/* 9D9568 80242548 46001082 */ mul.s $f2, $f2, $f0 -/* 9D956C 8024254C 00000000 */ nop -/* 9D9570 80242550 3C01CD5B */ lui $at, 0xcd5b -/* 9D9574 80242554 34215858 */ ori $at, $at, 0x5858 -/* 9D9578 80242558 44810000 */ mtc1 $at, $f0 -/* 9D957C 8024255C 00000000 */ nop -/* 9D9580 80242560 46001080 */ add.s $f2, $f2, $f0 -/* 9D9584 80242564 8E050000 */ lw $a1, ($s0) -/* 9D9588 80242568 4600110D */ trunc.w.s $f4, $f2 -/* 9D958C 8024256C 44062000 */ mfc1 $a2, $f4 -/* 9D9590 80242570 0C0B2026 */ jal set_variable -/* 9D9594 80242574 0220202D */ daddu $a0, $s1, $zero -/* 9D9598 80242578 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D959C 8024257C 8FB10014 */ lw $s1, 0x14($sp) -/* 9D95A0 80242580 8FB00010 */ lw $s0, 0x10($sp) -/* 9D95A4 80242584 24020002 */ addiu $v0, $zero, 2 -/* 9D95A8 80242588 03E00008 */ jr $ra -/* 9D95AC 8024258C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s new file mode 100644 index 0000000000..8de678506b --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424F0_9D9510 +/* 9D9510 802424F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9D9514 802424F4 AFB10014 */ sw $s1, 0x14($sp) +/* 9D9518 802424F8 0080882D */ daddu $s1, $a0, $zero +/* 9D951C 802424FC AFBF0018 */ sw $ra, 0x18($sp) +/* 9D9520 80242500 AFB00010 */ sw $s0, 0x10($sp) +/* 9D9524 80242504 8E30000C */ lw $s0, 0xc($s1) +/* 9D9528 80242508 8E050000 */ lw $a1, ($s0) +/* 9D952C 8024250C 0C0B1EAF */ jal get_variable +/* 9D9530 80242510 26100004 */ addiu $s0, $s0, 4 +/* 9D9534 80242514 00021880 */ sll $v1, $v0, 2 +/* 9D9538 80242518 00621821 */ addu $v1, $v1, $v0 +/* 9D953C 8024251C 00031880 */ sll $v1, $v1, 2 +/* 9D9540 80242520 00621823 */ subu $v1, $v1, $v0 +/* 9D9544 80242524 000310C0 */ sll $v0, $v1, 3 +/* 9D9548 80242528 00621821 */ addu $v1, $v1, $v0 +/* 9D954C 8024252C 000318C0 */ sll $v1, $v1, 3 +/* 9D9550 80242530 3C01800B */ lui $at, 0x800b +/* 9D9554 80242534 00230821 */ addu $at, $at, $v1 +/* 9D9558 80242538 C4221D98 */ lwc1 $f2, 0x1d98($at) +/* 9D955C 8024253C 3C014480 */ lui $at, 0x4480 +/* 9D9560 80242540 44810000 */ mtc1 $at, $f0 +/* 9D9564 80242544 00000000 */ nop +/* 9D9568 80242548 46001082 */ mul.s $f2, $f2, $f0 +/* 9D956C 8024254C 00000000 */ nop +/* 9D9570 80242550 3C01CD5B */ lui $at, 0xcd5b +/* 9D9574 80242554 34215858 */ ori $at, $at, 0x5858 +/* 9D9578 80242558 44810000 */ mtc1 $at, $f0 +/* 9D957C 8024255C 00000000 */ nop +/* 9D9580 80242560 46001080 */ add.s $f2, $f2, $f0 +/* 9D9584 80242564 8E050000 */ lw $a1, ($s0) +/* 9D9588 80242568 4600110D */ trunc.w.s $f4, $f2 +/* 9D958C 8024256C 44062000 */ mfc1 $a2, $f4 +/* 9D9590 80242570 0C0B2026 */ jal set_variable +/* 9D9594 80242574 0220202D */ daddu $a0, $s1, $zero +/* 9D9598 80242578 8FBF0018 */ lw $ra, 0x18($sp) +/* 9D959C 8024257C 8FB10014 */ lw $s1, 0x14($sp) +/* 9D95A0 80242580 8FB00010 */ lw $s0, 0x10($sp) +/* 9D95A4 80242584 24020002 */ addiu $v0, $zero, 2 +/* 9D95A8 80242588 03E00008 */ jr $ra +/* 9D95AC 8024258C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590.s deleted file mode 100644 index 774e487efd..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242590 -/* 9D95B0 80242590 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D95B4 80242594 AFB20018 */ sw $s2, 0x18($sp) -/* 9D95B8 80242598 0080902D */ daddu $s2, $a0, $zero -/* 9D95BC 8024259C AFBF0030 */ sw $ra, 0x30($sp) -/* 9D95C0 802425A0 AFB7002C */ sw $s7, 0x2c($sp) -/* 9D95C4 802425A4 AFB60028 */ sw $s6, 0x28($sp) -/* 9D95C8 802425A8 AFB50024 */ sw $s5, 0x24($sp) -/* 9D95CC 802425AC AFB40020 */ sw $s4, 0x20($sp) -/* 9D95D0 802425B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D95D4 802425B4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D95D8 802425B8 AFB00010 */ sw $s0, 0x10($sp) -/* 9D95DC 802425BC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9D95E0 802425C0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9D95E4 802425C4 8E50000C */ lw $s0, 0xc($s2) -/* 9D95E8 802425C8 8E050000 */ lw $a1, ($s0) -/* 9D95EC 802425CC 0C0B1EAF */ jal get_variable -/* 9D95F0 802425D0 26100004 */ addiu $s0, $s0, 4 -/* 9D95F4 802425D4 8E050000 */ lw $a1, ($s0) -/* 9D95F8 802425D8 26100004 */ addiu $s0, $s0, 4 -/* 9D95FC 802425DC 0240202D */ daddu $a0, $s2, $zero -/* 9D9600 802425E0 0C0B1EAF */ jal get_variable -/* 9D9604 802425E4 0040B82D */ daddu $s7, $v0, $zero -/* 9D9608 802425E8 8E050000 */ lw $a1, ($s0) -/* 9D960C 802425EC 26100004 */ addiu $s0, $s0, 4 -/* 9D9610 802425F0 0240202D */ daddu $a0, $s2, $zero -/* 9D9614 802425F4 0C0B1EAF */ jal get_variable -/* 9D9618 802425F8 0040B02D */ daddu $s6, $v0, $zero -/* 9D961C 802425FC 0240202D */ daddu $a0, $s2, $zero -/* 9D9620 80242600 3C05F4AC */ lui $a1, 0xf4ac -/* 9D9624 80242604 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9D9628 80242608 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 9D962C 8024260C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 9D9630 80242610 8E140000 */ lw $s4, ($s0) -/* 9D9634 80242614 00061880 */ sll $v1, $a2, 2 -/* 9D9638 80242618 00661821 */ addu $v1, $v1, $a2 -/* 9D963C 8024261C 00031880 */ sll $v1, $v1, 2 -/* 9D9640 80242620 00661823 */ subu $v1, $v1, $a2 -/* 9D9644 80242624 000330C0 */ sll $a2, $v1, 3 -/* 9D9648 80242628 00661821 */ addu $v1, $v1, $a2 -/* 9D964C 8024262C 000318C0 */ sll $v1, $v1, 3 -/* 9D9650 80242630 3C01800B */ lui $at, 0x800b -/* 9D9654 80242634 00230821 */ addu $at, $at, $v1 -/* 9D9658 80242638 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9D965C 8024263C 8E150004 */ lw $s5, 4($s0) -/* 9D9660 80242640 4600010D */ trunc.w.s $f4, $f0 -/* 9D9664 80242644 44112000 */ mfc1 $s1, $f4 -/* 9D9668 80242648 0C0B1EAF */ jal get_variable -/* 9D966C 8024264C 0040982D */ daddu $s3, $v0, $zero -/* 9D9670 80242650 4491B000 */ mtc1 $s1, $f22 -/* 9D9674 80242654 00000000 */ nop -/* 9D9678 80242658 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9D967C 8024265C 4600B306 */ mov.s $f12, $f22 -/* 9D9680 80242660 0C00A8D4 */ jal cos_deg -/* 9D9684 80242664 0040802D */ daddu $s0, $v0, $zero -/* 9D9688 80242668 4493A000 */ mtc1 $s3, $f20 -/* 9D968C 8024266C 00000000 */ nop -/* 9D9690 80242670 4680A520 */ cvt.s.w $f20, $f20 -/* 9D9694 80242674 4600A002 */ mul.s $f0, $f20, $f0 -/* 9D9698 80242678 00000000 */ nop -/* 9D969C 8024267C 0240202D */ daddu $a0, $s2, $zero -/* 9D96A0 80242680 44901000 */ mtc1 $s0, $f2 -/* 9D96A4 80242684 00000000 */ nop -/* 9D96A8 80242688 468010A0 */ cvt.s.w $f2, $f2 -/* 9D96AC 8024268C 46001081 */ sub.s $f2, $f2, $f0 -/* 9D96B0 80242690 3C05F4AC */ lui $a1, 0xf4ac -/* 9D96B4 80242694 4600110D */ trunc.w.s $f4, $f2 -/* 9D96B8 80242698 44102000 */ mfc1 $s0, $f4 -/* 9D96BC 8024269C 0C0B1EAF */ jal get_variable -/* 9D96C0 802426A0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9D96C4 802426A4 4600B306 */ mov.s $f12, $f22 -/* 9D96C8 802426A8 0C00A8BB */ jal sin_deg -/* 9D96CC 802426AC 0040882D */ daddu $s1, $v0, $zero -/* 9D96D0 802426B0 4600A502 */ mul.s $f20, $f20, $f0 -/* 9D96D4 802426B4 00000000 */ nop -/* 9D96D8 802426B8 0240202D */ daddu $a0, $s2, $zero -/* 9D96DC 802426BC 44910000 */ mtc1 $s1, $f0 -/* 9D96E0 802426C0 00000000 */ nop -/* 9D96E4 802426C4 46800020 */ cvt.s.w $f0, $f0 -/* 9D96E8 802426C8 46140001 */ sub.s $f0, $f0, $f20 -/* 9D96EC 802426CC 0280282D */ daddu $a1, $s4, $zero -/* 9D96F0 802426D0 02173023 */ subu $a2, $s0, $s7 -/* 9D96F4 802426D4 4600010D */ trunc.w.s $f4, $f0 -/* 9D96F8 802426D8 44102000 */ mfc1 $s0, $f4 -/* 9D96FC 802426DC 0C0B2026 */ jal set_variable -/* 9D9700 802426E0 02168023 */ subu $s0, $s0, $s6 -/* 9D9704 802426E4 0240202D */ daddu $a0, $s2, $zero -/* 9D9708 802426E8 02A0282D */ daddu $a1, $s5, $zero -/* 9D970C 802426EC 0C0B2026 */ jal set_variable -/* 9D9710 802426F0 0200302D */ daddu $a2, $s0, $zero -/* 9D9714 802426F4 8FBF0030 */ lw $ra, 0x30($sp) -/* 9D9718 802426F8 8FB7002C */ lw $s7, 0x2c($sp) -/* 9D971C 802426FC 8FB60028 */ lw $s6, 0x28($sp) -/* 9D9720 80242700 8FB50024 */ lw $s5, 0x24($sp) -/* 9D9724 80242704 8FB40020 */ lw $s4, 0x20($sp) -/* 9D9728 80242708 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D972C 8024270C 8FB20018 */ lw $s2, 0x18($sp) -/* 9D9730 80242710 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9734 80242714 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9738 80242718 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9D973C 8024271C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9D9740 80242720 24020002 */ addiu $v0, $zero, 2 -/* 9D9744 80242724 03E00008 */ jr $ra -/* 9D9748 80242728 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s new file mode 100644 index 0000000000..9de74ff0f4 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242590_9D95B0 +/* 9D95B0 80242590 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9D95B4 80242594 AFB20018 */ sw $s2, 0x18($sp) +/* 9D95B8 80242598 0080902D */ daddu $s2, $a0, $zero +/* 9D95BC 8024259C AFBF0030 */ sw $ra, 0x30($sp) +/* 9D95C0 802425A0 AFB7002C */ sw $s7, 0x2c($sp) +/* 9D95C4 802425A4 AFB60028 */ sw $s6, 0x28($sp) +/* 9D95C8 802425A8 AFB50024 */ sw $s5, 0x24($sp) +/* 9D95CC 802425AC AFB40020 */ sw $s4, 0x20($sp) +/* 9D95D0 802425B0 AFB3001C */ sw $s3, 0x1c($sp) +/* 9D95D4 802425B4 AFB10014 */ sw $s1, 0x14($sp) +/* 9D95D8 802425B8 AFB00010 */ sw $s0, 0x10($sp) +/* 9D95DC 802425BC F7B60040 */ sdc1 $f22, 0x40($sp) +/* 9D95E0 802425C0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 9D95E4 802425C4 8E50000C */ lw $s0, 0xc($s2) +/* 9D95E8 802425C8 8E050000 */ lw $a1, ($s0) +/* 9D95EC 802425CC 0C0B1EAF */ jal get_variable +/* 9D95F0 802425D0 26100004 */ addiu $s0, $s0, 4 +/* 9D95F4 802425D4 8E050000 */ lw $a1, ($s0) +/* 9D95F8 802425D8 26100004 */ addiu $s0, $s0, 4 +/* 9D95FC 802425DC 0240202D */ daddu $a0, $s2, $zero +/* 9D9600 802425E0 0C0B1EAF */ jal get_variable +/* 9D9604 802425E4 0040B82D */ daddu $s7, $v0, $zero +/* 9D9608 802425E8 8E050000 */ lw $a1, ($s0) +/* 9D960C 802425EC 26100004 */ addiu $s0, $s0, 4 +/* 9D9610 802425F0 0240202D */ daddu $a0, $s2, $zero +/* 9D9614 802425F4 0C0B1EAF */ jal get_variable +/* 9D9618 802425F8 0040B02D */ daddu $s6, $v0, $zero +/* 9D961C 802425FC 0240202D */ daddu $a0, $s2, $zero +/* 9D9620 80242600 3C05F4AC */ lui $a1, 0xf4ac +/* 9D9624 80242604 34A5D481 */ ori $a1, $a1, 0xd481 +/* 9D9628 80242608 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* 9D962C 8024260C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* 9D9630 80242610 8E140000 */ lw $s4, ($s0) +/* 9D9634 80242614 00061880 */ sll $v1, $a2, 2 +/* 9D9638 80242618 00661821 */ addu $v1, $v1, $a2 +/* 9D963C 8024261C 00031880 */ sll $v1, $v1, 2 +/* 9D9640 80242620 00661823 */ subu $v1, $v1, $a2 +/* 9D9644 80242624 000330C0 */ sll $a2, $v1, 3 +/* 9D9648 80242628 00661821 */ addu $v1, $v1, $a2 +/* 9D964C 8024262C 000318C0 */ sll $v1, $v1, 3 +/* 9D9650 80242630 3C01800B */ lui $at, 0x800b +/* 9D9654 80242634 00230821 */ addu $at, $at, $v1 +/* 9D9658 80242638 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 9D965C 8024263C 8E150004 */ lw $s5, 4($s0) +/* 9D9660 80242640 4600010D */ trunc.w.s $f4, $f0 +/* 9D9664 80242644 44112000 */ mfc1 $s1, $f4 +/* 9D9668 80242648 0C0B1EAF */ jal get_variable +/* 9D966C 8024264C 0040982D */ daddu $s3, $v0, $zero +/* 9D9670 80242650 4491B000 */ mtc1 $s1, $f22 +/* 9D9674 80242654 00000000 */ nop +/* 9D9678 80242658 4680B5A0 */ cvt.s.w $f22, $f22 +/* 9D967C 8024265C 4600B306 */ mov.s $f12, $f22 +/* 9D9680 80242660 0C00A8D4 */ jal cos_deg +/* 9D9684 80242664 0040802D */ daddu $s0, $v0, $zero +/* 9D9688 80242668 4493A000 */ mtc1 $s3, $f20 +/* 9D968C 8024266C 00000000 */ nop +/* 9D9690 80242670 4680A520 */ cvt.s.w $f20, $f20 +/* 9D9694 80242674 4600A002 */ mul.s $f0, $f20, $f0 +/* 9D9698 80242678 00000000 */ nop +/* 9D969C 8024267C 0240202D */ daddu $a0, $s2, $zero +/* 9D96A0 80242680 44901000 */ mtc1 $s0, $f2 +/* 9D96A4 80242684 00000000 */ nop +/* 9D96A8 80242688 468010A0 */ cvt.s.w $f2, $f2 +/* 9D96AC 8024268C 46001081 */ sub.s $f2, $f2, $f0 +/* 9D96B0 80242690 3C05F4AC */ lui $a1, 0xf4ac +/* 9D96B4 80242694 4600110D */ trunc.w.s $f4, $f2 +/* 9D96B8 80242698 44102000 */ mfc1 $s0, $f4 +/* 9D96BC 8024269C 0C0B1EAF */ jal get_variable +/* 9D96C0 802426A0 34A5D483 */ ori $a1, $a1, 0xd483 +/* 9D96C4 802426A4 4600B306 */ mov.s $f12, $f22 +/* 9D96C8 802426A8 0C00A8BB */ jal sin_deg +/* 9D96CC 802426AC 0040882D */ daddu $s1, $v0, $zero +/* 9D96D0 802426B0 4600A502 */ mul.s $f20, $f20, $f0 +/* 9D96D4 802426B4 00000000 */ nop +/* 9D96D8 802426B8 0240202D */ daddu $a0, $s2, $zero +/* 9D96DC 802426BC 44910000 */ mtc1 $s1, $f0 +/* 9D96E0 802426C0 00000000 */ nop +/* 9D96E4 802426C4 46800020 */ cvt.s.w $f0, $f0 +/* 9D96E8 802426C8 46140001 */ sub.s $f0, $f0, $f20 +/* 9D96EC 802426CC 0280282D */ daddu $a1, $s4, $zero +/* 9D96F0 802426D0 02173023 */ subu $a2, $s0, $s7 +/* 9D96F4 802426D4 4600010D */ trunc.w.s $f4, $f0 +/* 9D96F8 802426D8 44102000 */ mfc1 $s0, $f4 +/* 9D96FC 802426DC 0C0B2026 */ jal set_variable +/* 9D9700 802426E0 02168023 */ subu $s0, $s0, $s6 +/* 9D9704 802426E4 0240202D */ daddu $a0, $s2, $zero +/* 9D9708 802426E8 02A0282D */ daddu $a1, $s5, $zero +/* 9D970C 802426EC 0C0B2026 */ jal set_variable +/* 9D9710 802426F0 0200302D */ daddu $a2, $s0, $zero +/* 9D9714 802426F4 8FBF0030 */ lw $ra, 0x30($sp) +/* 9D9718 802426F8 8FB7002C */ lw $s7, 0x2c($sp) +/* 9D971C 802426FC 8FB60028 */ lw $s6, 0x28($sp) +/* 9D9720 80242700 8FB50024 */ lw $s5, 0x24($sp) +/* 9D9724 80242704 8FB40020 */ lw $s4, 0x20($sp) +/* 9D9728 80242708 8FB3001C */ lw $s3, 0x1c($sp) +/* 9D972C 8024270C 8FB20018 */ lw $s2, 0x18($sp) +/* 9D9730 80242710 8FB10014 */ lw $s1, 0x14($sp) +/* 9D9734 80242714 8FB00010 */ lw $s0, 0x10($sp) +/* 9D9738 80242718 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 9D973C 8024271C D7B40038 */ ldc1 $f20, 0x38($sp) +/* 9D9740 80242720 24020002 */ addiu $v0, $zero, 2 +/* 9D9744 80242724 03E00008 */ jr $ra +/* 9D9748 80242728 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C.s deleted file mode 100644 index 575179fc3e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024272C -/* 9D974C 8024272C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 9D9750 80242730 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 9D9754 80242734 10A00002 */ beqz $a1, .L80242740 -/* 9D9758 80242738 2402003C */ addiu $v0, $zero, 0x3c -/* 9D975C 8024273C AC820070 */ sw $v0, 0x70($a0) -.L80242740: -/* 9D9760 80242740 C4620080 */ lwc1 $f2, 0x80($v1) -/* 9D9764 80242744 3C0141F0 */ lui $at, 0x41f0 -/* 9D9768 80242748 44810000 */ mtc1 $at, $f0 -/* 9D976C 8024274C 00000000 */ nop -/* 9D9770 80242750 46001000 */ add.s $f0, $f2, $f0 -/* 9D9774 80242754 3C0143B4 */ lui $at, 0x43b4 -/* 9D9778 80242758 44811000 */ mtc1 $at, $f2 -/* 9D977C 8024275C 00000000 */ nop -/* 9D9780 80242760 4600103E */ c.le.s $f2, $f0 -/* 9D9784 80242764 00000000 */ nop -/* 9D9788 80242768 45000003 */ bc1f .L80242778 -/* 9D978C 8024276C E4600080 */ swc1 $f0, 0x80($v1) -/* 9D9790 80242770 46020001 */ sub.s $f0, $f0, $f2 -/* 9D9794 80242774 E4600080 */ swc1 $f0, 0x80($v1) -.L80242778: -/* 9D9798 80242778 8C820070 */ lw $v0, 0x70($a0) -/* 9D979C 8024277C 2442FFFF */ addiu $v0, $v0, -1 -/* 9D97A0 80242780 AC820070 */ sw $v0, 0x70($a0) -/* 9D97A4 80242784 000217C3 */ sra $v0, $v0, 0x1f -/* 9D97A8 80242788 03E00008 */ jr $ra -/* 9D97AC 8024278C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s new file mode 100644 index 0000000000..d25b5fb38c --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024272C_9D974C +/* 9D974C 8024272C 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 9D9750 80242730 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 9D9754 80242734 10A00002 */ beqz $a1, .L80242740 +/* 9D9758 80242738 2402003C */ addiu $v0, $zero, 0x3c +/* 9D975C 8024273C AC820070 */ sw $v0, 0x70($a0) +.L80242740: +/* 9D9760 80242740 C4620080 */ lwc1 $f2, 0x80($v1) +/* 9D9764 80242744 3C0141F0 */ lui $at, 0x41f0 +/* 9D9768 80242748 44810000 */ mtc1 $at, $f0 +/* 9D976C 8024274C 00000000 */ nop +/* 9D9770 80242750 46001000 */ add.s $f0, $f2, $f0 +/* 9D9774 80242754 3C0143B4 */ lui $at, 0x43b4 +/* 9D9778 80242758 44811000 */ mtc1 $at, $f2 +/* 9D977C 8024275C 00000000 */ nop +/* 9D9780 80242760 4600103E */ c.le.s $f2, $f0 +/* 9D9784 80242764 00000000 */ nop +/* 9D9788 80242768 45000003 */ bc1f .L80242778 +/* 9D978C 8024276C E4600080 */ swc1 $f0, 0x80($v1) +/* 9D9790 80242770 46020001 */ sub.s $f0, $f0, $f2 +/* 9D9794 80242774 E4600080 */ swc1 $f0, 0x80($v1) +.L80242778: +/* 9D9798 80242778 8C820070 */ lw $v0, 0x70($a0) +/* 9D979C 8024277C 2442FFFF */ addiu $v0, $v0, -1 +/* 9D97A0 80242780 AC820070 */ sw $v0, 0x70($a0) +/* 9D97A4 80242784 000217C3 */ sra $v0, $v0, 0x1f +/* 9D97A8 80242788 03E00008 */ jr $ra +/* 9D97AC 8024278C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820.s deleted file mode 100644 index 0d77a74fd9..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242820 -/* 9D9840 80242820 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D9844 80242824 AFB10014 */ sw $s1, 0x14($sp) -/* 9D9848 80242828 0080882D */ daddu $s1, $a0, $zero -/* 9D984C 8024282C AFB00010 */ sw $s0, 0x10($sp) -/* 9D9850 80242830 00A0802D */ daddu $s0, $a1, $zero -/* 9D9854 80242834 AFBF001C */ sw $ra, 0x1c($sp) -/* 9D9858 80242838 AFB20018 */ sw $s2, 0x18($sp) -/* 9D985C 8024283C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9D9860 80242840 0C00EABB */ jal get_npc_unsafe -/* 9D9864 80242844 2404FFFC */ addiu $a0, $zero, -4 -/* 9D9868 80242848 12000017 */ beqz $s0, .L802428A8 -/* 9D986C 8024284C 0040902D */ daddu $s2, $v0, $zero -/* 9D9870 80242850 0220202D */ daddu $a0, $s1, $zero -/* 9D9874 80242854 3C05FE36 */ lui $a1, 0xfe36 -/* 9D9878 80242858 0C0B210B */ jal get_float_variable -/* 9D987C 8024285C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9D9880 80242860 0220202D */ daddu $a0, $s1, $zero -/* 9D9884 80242864 3C05FE36 */ lui $a1, 0xfe36 -/* 9D9888 80242868 3C014270 */ lui $at, 0x4270 -/* 9D988C 8024286C 4481A000 */ mtc1 $at, $f20 -/* 9D9890 80242870 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 9D9894 80242874 46140003 */ div.s $f0, $f0, $f20 -/* 9D9898 80242878 0C0B210B */ jal get_float_variable -/* 9D989C 8024287C E6200074 */ swc1 $f0, 0x74($s1) -/* 9D98A0 80242880 0220202D */ daddu $a0, $s1, $zero -/* 9D98A4 80242884 3C05FE36 */ lui $a1, 0xfe36 -/* 9D98A8 80242888 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 9D98AC 8024288C 46140003 */ div.s $f0, $f0, $f20 -/* 9D98B0 80242890 0C0B210B */ jal get_float_variable -/* 9D98B4 80242894 E6200078 */ swc1 $f0, 0x78($s1) -/* 9D98B8 80242898 46140003 */ div.s $f0, $f0, $f20 -/* 9D98BC 8024289C 2402003C */ addiu $v0, $zero, 0x3c -/* 9D98C0 802428A0 E620007C */ swc1 $f0, 0x7c($s1) -/* 9D98C4 802428A4 AE220070 */ sw $v0, 0x70($s1) -.L802428A8: -/* 9D98C8 802428A8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 9D98CC 802428AC C6220074 */ lwc1 $f2, 0x74($s1) -/* 9D98D0 802428B0 46020000 */ add.s $f0, $f0, $f2 -/* 9D98D4 802428B4 E6400038 */ swc1 $f0, 0x38($s2) -/* 9D98D8 802428B8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 9D98DC 802428BC C6220078 */ lwc1 $f2, 0x78($s1) -/* 9D98E0 802428C0 46020000 */ add.s $f0, $f0, $f2 -/* 9D98E4 802428C4 E640003C */ swc1 $f0, 0x3c($s2) -/* 9D98E8 802428C8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 9D98EC 802428CC C622007C */ lwc1 $f2, 0x7c($s1) -/* 9D98F0 802428D0 46020000 */ add.s $f0, $f0, $f2 -/* 9D98F4 802428D4 E6400040 */ swc1 $f0, 0x40($s2) -/* 9D98F8 802428D8 8E230070 */ lw $v1, 0x70($s1) -/* 9D98FC 802428DC 2463FFFF */ addiu $v1, $v1, -1 -/* 9D9900 802428E0 2C620001 */ sltiu $v0, $v1, 1 -/* 9D9904 802428E4 AE230070 */ sw $v1, 0x70($s1) -/* 9D9908 802428E8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D990C 802428EC 8FB20018 */ lw $s2, 0x18($sp) -/* 9D9910 802428F0 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9914 802428F4 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9918 802428F8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9D991C 802428FC 00021040 */ sll $v0, $v0, 1 -/* 9D9920 80242900 03E00008 */ jr $ra -/* 9D9924 80242904 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s new file mode 100644 index 0000000000..f1ec2096ef --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s @@ -0,0 +1,63 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242820_9D9840 +/* 9D9840 80242820 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9D9844 80242824 AFB10014 */ sw $s1, 0x14($sp) +/* 9D9848 80242828 0080882D */ daddu $s1, $a0, $zero +/* 9D984C 8024282C AFB00010 */ sw $s0, 0x10($sp) +/* 9D9850 80242830 00A0802D */ daddu $s0, $a1, $zero +/* 9D9854 80242834 AFBF001C */ sw $ra, 0x1c($sp) +/* 9D9858 80242838 AFB20018 */ sw $s2, 0x18($sp) +/* 9D985C 8024283C F7B40020 */ sdc1 $f20, 0x20($sp) +/* 9D9860 80242840 0C00EABB */ jal get_npc_unsafe +/* 9D9864 80242844 2404FFFC */ addiu $a0, $zero, -4 +/* 9D9868 80242848 12000017 */ beqz $s0, .L802428A8 +/* 9D986C 8024284C 0040902D */ daddu $s2, $v0, $zero +/* 9D9870 80242850 0220202D */ daddu $a0, $s1, $zero +/* 9D9874 80242854 3C05FE36 */ lui $a1, 0xfe36 +/* 9D9878 80242858 0C0B210B */ jal get_float_variable +/* 9D987C 8024285C 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 9D9880 80242860 0220202D */ daddu $a0, $s1, $zero +/* 9D9884 80242864 3C05FE36 */ lui $a1, 0xfe36 +/* 9D9888 80242868 3C014270 */ lui $at, 0x4270 +/* 9D988C 8024286C 4481A000 */ mtc1 $at, $f20 +/* 9D9890 80242870 34A53C85 */ ori $a1, $a1, 0x3c85 +/* 9D9894 80242874 46140003 */ div.s $f0, $f0, $f20 +/* 9D9898 80242878 0C0B210B */ jal get_float_variable +/* 9D989C 8024287C E6200074 */ swc1 $f0, 0x74($s1) +/* 9D98A0 80242880 0220202D */ daddu $a0, $s1, $zero +/* 9D98A4 80242884 3C05FE36 */ lui $a1, 0xfe36 +/* 9D98A8 80242888 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 9D98AC 8024288C 46140003 */ div.s $f0, $f0, $f20 +/* 9D98B0 80242890 0C0B210B */ jal get_float_variable +/* 9D98B4 80242894 E6200078 */ swc1 $f0, 0x78($s1) +/* 9D98B8 80242898 46140003 */ div.s $f0, $f0, $f20 +/* 9D98BC 8024289C 2402003C */ addiu $v0, $zero, 0x3c +/* 9D98C0 802428A0 E620007C */ swc1 $f0, 0x7c($s1) +/* 9D98C4 802428A4 AE220070 */ sw $v0, 0x70($s1) +.L802428A8: +/* 9D98C8 802428A8 C6400038 */ lwc1 $f0, 0x38($s2) +/* 9D98CC 802428AC C6220074 */ lwc1 $f2, 0x74($s1) +/* 9D98D0 802428B0 46020000 */ add.s $f0, $f0, $f2 +/* 9D98D4 802428B4 E6400038 */ swc1 $f0, 0x38($s2) +/* 9D98D8 802428B8 C640003C */ lwc1 $f0, 0x3c($s2) +/* 9D98DC 802428BC C6220078 */ lwc1 $f2, 0x78($s1) +/* 9D98E0 802428C0 46020000 */ add.s $f0, $f0, $f2 +/* 9D98E4 802428C4 E640003C */ swc1 $f0, 0x3c($s2) +/* 9D98E8 802428C8 C6400040 */ lwc1 $f0, 0x40($s2) +/* 9D98EC 802428CC C622007C */ lwc1 $f2, 0x7c($s1) +/* 9D98F0 802428D0 46020000 */ add.s $f0, $f0, $f2 +/* 9D98F4 802428D4 E6400040 */ swc1 $f0, 0x40($s2) +/* 9D98F8 802428D8 8E230070 */ lw $v1, 0x70($s1) +/* 9D98FC 802428DC 2463FFFF */ addiu $v1, $v1, -1 +/* 9D9900 802428E0 2C620001 */ sltiu $v0, $v1, 1 +/* 9D9904 802428E4 AE230070 */ sw $v1, 0x70($s1) +/* 9D9908 802428E8 8FBF001C */ lw $ra, 0x1c($sp) +/* 9D990C 802428EC 8FB20018 */ lw $s2, 0x18($sp) +/* 9D9910 802428F0 8FB10014 */ lw $s1, 0x14($sp) +/* 9D9914 802428F4 8FB00010 */ lw $s0, 0x10($sp) +/* 9D9918 802428F8 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 9D991C 802428FC 00021040 */ sll $v0, $v0, 1 +/* 9D9920 80242900 03E00008 */ jr $ra +/* 9D9924 80242904 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974.s deleted file mode 100644 index 0cffd92db1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242974 -/* 9D9994 80242974 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9998 80242978 3C058024 */ lui $a1, 0x8024 -/* 9D999C 8024297C 24A52908 */ addiu $a1, $a1, 0x2908 -/* 9D99A0 80242980 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D99A4 80242984 0C048C8F */ jal bind_dynamic_entity_7 -/* 9D99A8 80242988 0000202D */ daddu $a0, $zero, $zero -/* 9D99AC 8024298C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D99B0 80242990 3C018025 */ lui $at, 0x8025 -/* 9D99B4 80242994 AC2249A0 */ sw $v0, 0x49a0($at) -/* 9D99B8 80242998 24020002 */ addiu $v0, $zero, 2 -/* 9D99BC 8024299C 03E00008 */ jr $ra -/* 9D99C0 802429A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s new file mode 100644 index 0000000000..89976cbb6d --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242974_9D9994.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242974_9D9994 +/* 9D9994 80242974 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D9998 80242978 3C058024 */ lui $a1, 0x8024 +/* 9D999C 8024297C 24A52908 */ addiu $a1, $a1, 0x2908 +/* 9D99A0 80242980 AFBF0010 */ sw $ra, 0x10($sp) +/* 9D99A4 80242984 0C048C8F */ jal bind_dynamic_entity_7 +/* 9D99A8 80242988 0000202D */ daddu $a0, $zero, $zero +/* 9D99AC 8024298C 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D99B0 80242990 3C018025 */ lui $at, 0x8025 +/* 9D99B4 80242994 AC2249A0 */ sw $v0, 0x49a0($at) +/* 9D99B8 80242998 24020002 */ addiu $v0, $zero, 2 +/* 9D99BC 8024299C 03E00008 */ jr $ra +/* 9D99C0 802429A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0.s deleted file mode 100644 index 08ea9e8ad9..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BD0 -/* 9D9BF0 80242BD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9BF4 80242BD4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9BF8 80242BD8 10A00003 */ beqz $a1, .L80242BE8 -/* 9D9BFC 80242BDC 8C86000C */ lw $a2, 0xc($a0) -/* 9D9C00 80242BE0 3C018025 */ lui $at, 0x8025 -/* 9D9C04 80242BE4 AC2096F0 */ sw $zero, -0x6910($at) -.L80242BE8: -/* 9D9C08 80242BE8 3C038025 */ lui $v1, 0x8025 -/* 9D9C0C 80242BEC 246396F0 */ addiu $v1, $v1, -0x6910 -/* 9D9C10 80242BF0 8C620000 */ lw $v0, ($v1) -/* 9D9C14 80242BF4 54400003 */ bnel $v0, $zero, .L80242C04 -/* 9D9C18 80242BF8 AC600000 */ sw $zero, ($v1) -/* 9D9C1C 80242BFC 08090B06 */ j .L80242C18 -/* 9D9C20 80242C00 0000102D */ daddu $v0, $zero, $zero -.L80242C04: -/* 9D9C24 80242C04 8CC50000 */ lw $a1, ($a2) -/* 9D9C28 80242C08 3C068025 */ lui $a2, 0x8025 -/* 9D9C2C 80242C0C 0C0B2026 */ jal set_variable -/* 9D9C30 80242C10 8CC696F4 */ lw $a2, -0x690c($a2) -/* 9D9C34 80242C14 24020002 */ addiu $v0, $zero, 2 -.L80242C18: -/* 9D9C38 80242C18 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9C3C 80242C1C 03E00008 */ jr $ra -/* 9D9C40 80242C20 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s new file mode 100644 index 0000000000..ee4edd8749 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242BD0_9D9BF0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242BD0_9D9BF0 +/* 9D9BF0 80242BD0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D9BF4 80242BD4 AFBF0010 */ sw $ra, 0x10($sp) +/* 9D9BF8 80242BD8 10A00003 */ beqz $a1, .L80242BE8 +/* 9D9BFC 80242BDC 8C86000C */ lw $a2, 0xc($a0) +/* 9D9C00 80242BE0 3C018025 */ lui $at, 0x8025 +/* 9D9C04 80242BE4 AC2096F0 */ sw $zero, -0x6910($at) +.L80242BE8: +/* 9D9C08 80242BE8 3C038025 */ lui $v1, 0x8025 +/* 9D9C0C 80242BEC 246396F0 */ addiu $v1, $v1, -0x6910 +/* 9D9C10 80242BF0 8C620000 */ lw $v0, ($v1) +/* 9D9C14 80242BF4 54400003 */ bnel $v0, $zero, .L80242C04 +/* 9D9C18 80242BF8 AC600000 */ sw $zero, ($v1) +/* 9D9C1C 80242BFC 08090B06 */ j .L80242C18 +/* 9D9C20 80242C00 0000102D */ daddu $v0, $zero, $zero +.L80242C04: +/* 9D9C24 80242C04 8CC50000 */ lw $a1, ($a2) +/* 9D9C28 80242C08 3C068025 */ lui $a2, 0x8025 +/* 9D9C2C 80242C0C 0C0B2026 */ jal set_variable +/* 9D9C30 80242C10 8CC696F4 */ lw $a2, -0x690c($a2) +/* 9D9C34 80242C14 24020002 */ addiu $v0, $zero, 2 +.L80242C18: +/* 9D9C38 80242C18 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D9C3C 80242C1C 03E00008 */ jr $ra +/* 9D9C40 80242C20 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24.s deleted file mode 100644 index 1d8339686e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C24 -/* 9D9C44 80242C24 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9C48 80242C28 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9C4C 80242C2C 8C82000C */ lw $v0, 0xc($a0) -/* 9D9C50 80242C30 0C0B1EAF */ jal get_variable -/* 9D9C54 80242C34 8C450000 */ lw $a1, ($v0) -/* 9D9C58 80242C38 3C018025 */ lui $at, 0x8025 -/* 9D9C5C 80242C3C AC2296F4 */ sw $v0, -0x690c($at) -/* 9D9C60 80242C40 24020002 */ addiu $v0, $zero, 2 -/* 9D9C64 80242C44 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9C68 80242C48 24030001 */ addiu $v1, $zero, 1 -/* 9D9C6C 80242C4C 3C018025 */ lui $at, 0x8025 -/* 9D9C70 80242C50 AC2396F0 */ sw $v1, -0x6910($at) -/* 9D9C74 80242C54 03E00008 */ jr $ra -/* 9D9C78 80242C58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s new file mode 100644 index 0000000000..04a8d93e4a --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C24_9D9C44.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C24_9D9C44 +/* 9D9C44 80242C24 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D9C48 80242C28 AFBF0010 */ sw $ra, 0x10($sp) +/* 9D9C4C 80242C2C 8C82000C */ lw $v0, 0xc($a0) +/* 9D9C50 80242C30 0C0B1EAF */ jal get_variable +/* 9D9C54 80242C34 8C450000 */ lw $a1, ($v0) +/* 9D9C58 80242C38 3C018025 */ lui $at, 0x8025 +/* 9D9C5C 80242C3C AC2296F4 */ sw $v0, -0x690c($at) +/* 9D9C60 80242C40 24020002 */ addiu $v0, $zero, 2 +/* 9D9C64 80242C44 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D9C68 80242C48 24030001 */ addiu $v1, $zero, 1 +/* 9D9C6C 80242C4C 3C018025 */ lui $at, 0x8025 +/* 9D9C70 80242C50 AC2396F0 */ sw $v1, -0x6910($at) +/* 9D9C74 80242C54 03E00008 */ jr $ra +/* 9D9C78 80242C58 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C.s deleted file mode 100644 index 84c0fbab18..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C5C -/* 9D9C7C 80242C5C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9C80 80242C60 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9C84 80242C64 8C82000C */ lw $v0, 0xc($a0) -/* 9D9C88 80242C68 0C0B1EAF */ jal get_variable -/* 9D9C8C 80242C6C 8C450000 */ lw $a1, ($v0) -/* 9D9C90 80242C70 0040182D */ daddu $v1, $v0, $zero -/* 9D9C94 80242C74 10600012 */ beqz $v1, .L80242CC0 -/* 9D9C98 80242C78 0000202D */ daddu $a0, $zero, $zero -/* 9D9C9C 80242C7C 8C620000 */ lw $v0, ($v1) -/* 9D9CA0 80242C80 5040000A */ beql $v0, $zero, .L80242CAC -/* 9D9CA4 80242C84 00041080 */ sll $v0, $a0, 2 -/* 9D9CA8 80242C88 3C058025 */ lui $a1, 0x8025 -/* 9D9CAC 80242C8C 24A549D0 */ addiu $a1, $a1, 0x49d0 -.L80242C90: -/* 9D9CB0 80242C90 24630004 */ addiu $v1, $v1, 4 -/* 9D9CB4 80242C94 24840001 */ addiu $a0, $a0, 1 -/* 9D9CB8 80242C98 ACA20000 */ sw $v0, ($a1) -/* 9D9CBC 80242C9C 8C620000 */ lw $v0, ($v1) -/* 9D9CC0 80242CA0 1440FFFB */ bnez $v0, .L80242C90 -/* 9D9CC4 80242CA4 24A50004 */ addiu $a1, $a1, 4 -/* 9D9CC8 80242CA8 00041080 */ sll $v0, $a0, 2 -.L80242CAC: -/* 9D9CCC 80242CAC 3C018025 */ lui $at, 0x8025 -/* 9D9CD0 80242CB0 00220821 */ addu $at, $at, $v0 -/* 9D9CD4 80242CB4 AC2049D0 */ sw $zero, 0x49d0($at) -/* 9D9CD8 80242CB8 08090B3A */ j .L80242CE8 -/* 9D9CDC 80242CBC 00000000 */ nop -.L80242CC0: -/* 9D9CE0 80242CC0 3C038025 */ lui $v1, 0x8025 -/* 9D9CE4 80242CC4 246349D0 */ addiu $v1, $v1, 0x49d0 -/* 9D9CE8 80242CC8 0060282D */ daddu $a1, $v1, $zero -.L80242CCC: -/* 9D9CEC 80242CCC 24820010 */ addiu $v0, $a0, 0x10 -/* 9D9CF0 80242CD0 AC620000 */ sw $v0, ($v1) -/* 9D9CF4 80242CD4 24630004 */ addiu $v1, $v1, 4 -/* 9D9CF8 80242CD8 24840001 */ addiu $a0, $a0, 1 -/* 9D9CFC 80242CDC 28820070 */ slti $v0, $a0, 0x70 -/* 9D9D00 80242CE0 1440FFFA */ bnez $v0, .L80242CCC -/* 9D9D04 80242CE4 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80242CE8: -/* 9D9D08 80242CE8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9D0C 80242CEC 24020002 */ addiu $v0, $zero, 2 -/* 9D9D10 80242CF0 03E00008 */ jr $ra -/* 9D9D14 80242CF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s new file mode 100644 index 0000000000..b164df16b0 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242C5C_9D9C7C.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C5C_9D9C7C +/* 9D9C7C 80242C5C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D9C80 80242C60 AFBF0010 */ sw $ra, 0x10($sp) +/* 9D9C84 80242C64 8C82000C */ lw $v0, 0xc($a0) +/* 9D9C88 80242C68 0C0B1EAF */ jal get_variable +/* 9D9C8C 80242C6C 8C450000 */ lw $a1, ($v0) +/* 9D9C90 80242C70 0040182D */ daddu $v1, $v0, $zero +/* 9D9C94 80242C74 10600012 */ beqz $v1, .L80242CC0 +/* 9D9C98 80242C78 0000202D */ daddu $a0, $zero, $zero +/* 9D9C9C 80242C7C 8C620000 */ lw $v0, ($v1) +/* 9D9CA0 80242C80 5040000A */ beql $v0, $zero, .L80242CAC +/* 9D9CA4 80242C84 00041080 */ sll $v0, $a0, 2 +/* 9D9CA8 80242C88 3C058025 */ lui $a1, 0x8025 +/* 9D9CAC 80242C8C 24A549D0 */ addiu $a1, $a1, 0x49d0 +.L80242C90: +/* 9D9CB0 80242C90 24630004 */ addiu $v1, $v1, 4 +/* 9D9CB4 80242C94 24840001 */ addiu $a0, $a0, 1 +/* 9D9CB8 80242C98 ACA20000 */ sw $v0, ($a1) +/* 9D9CBC 80242C9C 8C620000 */ lw $v0, ($v1) +/* 9D9CC0 80242CA0 1440FFFB */ bnez $v0, .L80242C90 +/* 9D9CC4 80242CA4 24A50004 */ addiu $a1, $a1, 4 +/* 9D9CC8 80242CA8 00041080 */ sll $v0, $a0, 2 +.L80242CAC: +/* 9D9CCC 80242CAC 3C018025 */ lui $at, 0x8025 +/* 9D9CD0 80242CB0 00220821 */ addu $at, $at, $v0 +/* 9D9CD4 80242CB4 AC2049D0 */ sw $zero, 0x49d0($at) +/* 9D9CD8 80242CB8 08090B3A */ j .L80242CE8 +/* 9D9CDC 80242CBC 00000000 */ nop +.L80242CC0: +/* 9D9CE0 80242CC0 3C038025 */ lui $v1, 0x8025 +/* 9D9CE4 80242CC4 246349D0 */ addiu $v1, $v1, 0x49d0 +/* 9D9CE8 80242CC8 0060282D */ daddu $a1, $v1, $zero +.L80242CCC: +/* 9D9CEC 80242CCC 24820010 */ addiu $v0, $a0, 0x10 +/* 9D9CF0 80242CD0 AC620000 */ sw $v0, ($v1) +/* 9D9CF4 80242CD4 24630004 */ addiu $v1, $v1, 4 +/* 9D9CF8 80242CD8 24840001 */ addiu $a0, $a0, 1 +/* 9D9CFC 80242CDC 28820070 */ slti $v0, $a0, 0x70 +/* 9D9D00 80242CE0 1440FFFA */ bnez $v0, .L80242CCC +/* 9D9D04 80242CE4 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80242CE8: +/* 9D9D08 80242CE8 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D9D0C 80242CEC 24020002 */ addiu $v0, $zero, 2 +/* 9D9D10 80242CF0 03E00008 */ jr $ra +/* 9D9D14 80242CF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242CF8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242CF8.s deleted file mode 100644 index 7ccc14ddef..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242CF8.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242CF8 -/* 9D9D18 80242CF8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D9D1C 80242CFC AFB10014 */ sw $s1, 0x14($sp) -/* 9D9D20 80242D00 0080882D */ daddu $s1, $a0, $zero -/* 9D9D24 80242D04 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D9D28 80242D08 AFB00010 */ sw $s0, 0x10($sp) -/* 9D9D2C 80242D0C 8E30000C */ lw $s0, 0xc($s1) -/* 9D9D30 80242D10 8E050000 */ lw $a1, ($s0) -/* 9D9D34 80242D14 0C0B1EAF */ jal get_variable -/* 9D9D38 80242D18 26100004 */ addiu $s0, $s0, 4 -/* 9D9D3C 80242D1C AE22008C */ sw $v0, 0x8c($s1) -/* 9D9D40 80242D20 8E050000 */ lw $a1, ($s0) -/* 9D9D44 80242D24 26100004 */ addiu $s0, $s0, 4 -/* 9D9D48 80242D28 0C0B1EAF */ jal get_variable -/* 9D9D4C 80242D2C 0220202D */ daddu $a0, $s1, $zero -/* 9D9D50 80242D30 AE220090 */ sw $v0, 0x90($s1) -/* 9D9D54 80242D34 8E050000 */ lw $a1, ($s0) -/* 9D9D58 80242D38 26100004 */ addiu $s0, $s0, 4 -/* 9D9D5C 80242D3C 0C0B1EAF */ jal get_variable -/* 9D9D60 80242D40 0220202D */ daddu $a0, $s1, $zero -/* 9D9D64 80242D44 AE220094 */ sw $v0, 0x94($s1) -/* 9D9D68 80242D48 8E050000 */ lw $a1, ($s0) -/* 9D9D6C 80242D4C 26100004 */ addiu $s0, $s0, 4 -/* 9D9D70 80242D50 0C0B1EAF */ jal get_variable -/* 9D9D74 80242D54 0220202D */ daddu $a0, $s1, $zero -/* 9D9D78 80242D58 AE220098 */ sw $v0, 0x98($s1) -/* 9D9D7C 80242D5C 8E050000 */ lw $a1, ($s0) -/* 9D9D80 80242D60 26100004 */ addiu $s0, $s0, 4 -/* 9D9D84 80242D64 0C0B1EAF */ jal get_variable -/* 9D9D88 80242D68 0220202D */ daddu $a0, $s1, $zero -/* 9D9D8C 80242D6C AE22009C */ sw $v0, 0x9c($s1) -/* 9D9D90 80242D70 8E050000 */ lw $a1, ($s0) -/* 9D9D94 80242D74 26100004 */ addiu $s0, $s0, 4 -/* 9D9D98 80242D78 0C0B1EAF */ jal get_variable -/* 9D9D9C 80242D7C 0220202D */ daddu $a0, $s1, $zero -/* 9D9DA0 80242D80 AE2200A0 */ sw $v0, 0xa0($s1) -/* 9D9DA4 80242D84 8E050000 */ lw $a1, ($s0) -/* 9D9DA8 80242D88 26100004 */ addiu $s0, $s0, 4 -/* 9D9DAC 80242D8C 0C0B1EAF */ jal get_variable -/* 9D9DB0 80242D90 0220202D */ daddu $a0, $s1, $zero -/* 9D9DB4 80242D94 AE2200A4 */ sw $v0, 0xa4($s1) -/* 9D9DB8 80242D98 8E050000 */ lw $a1, ($s0) -/* 9D9DBC 80242D9C 26100004 */ addiu $s0, $s0, 4 -/* 9D9DC0 80242DA0 0C0B1EAF */ jal get_variable -/* 9D9DC4 80242DA4 0220202D */ daddu $a0, $s1, $zero -/* 9D9DC8 80242DA8 AE2200A8 */ sw $v0, 0xa8($s1) -/* 9D9DCC 80242DAC 8E050000 */ lw $a1, ($s0) -/* 9D9DD0 80242DB0 26100004 */ addiu $s0, $s0, 4 -/* 9D9DD4 80242DB4 0C0B1EAF */ jal get_variable -/* 9D9DD8 80242DB8 0220202D */ daddu $a0, $s1, $zero -/* 9D9DDC 80242DBC AE2200AC */ sw $v0, 0xac($s1) -/* 9D9DE0 80242DC0 8E050000 */ lw $a1, ($s0) -/* 9D9DE4 80242DC4 0C0B1EAF */ jal get_variable -/* 9D9DE8 80242DC8 0220202D */ daddu $a0, $s1, $zero -/* 9D9DEC 80242DCC AE2200B0 */ sw $v0, 0xb0($s1) -/* 9D9DF0 80242DD0 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D9DF4 80242DD4 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9DF8 80242DD8 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9DFC 80242DDC 24020002 */ addiu $v0, $zero, 2 -/* 9D9E00 80242DE0 03E00008 */ jr $ra -/* 9D9E04 80242DE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242CF8_9D9D18.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242CF8_9D9D18.s new file mode 100644 index 0000000000..1202ac03f7 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242CF8_9D9D18.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242CF8_9D9D18 +/* 9D9D18 80242CF8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9D9D1C 80242CFC AFB10014 */ sw $s1, 0x14($sp) +/* 9D9D20 80242D00 0080882D */ daddu $s1, $a0, $zero +/* 9D9D24 80242D04 AFBF0018 */ sw $ra, 0x18($sp) +/* 9D9D28 80242D08 AFB00010 */ sw $s0, 0x10($sp) +/* 9D9D2C 80242D0C 8E30000C */ lw $s0, 0xc($s1) +/* 9D9D30 80242D10 8E050000 */ lw $a1, ($s0) +/* 9D9D34 80242D14 0C0B1EAF */ jal get_variable +/* 9D9D38 80242D18 26100004 */ addiu $s0, $s0, 4 +/* 9D9D3C 80242D1C AE22008C */ sw $v0, 0x8c($s1) +/* 9D9D40 80242D20 8E050000 */ lw $a1, ($s0) +/* 9D9D44 80242D24 26100004 */ addiu $s0, $s0, 4 +/* 9D9D48 80242D28 0C0B1EAF */ jal get_variable +/* 9D9D4C 80242D2C 0220202D */ daddu $a0, $s1, $zero +/* 9D9D50 80242D30 AE220090 */ sw $v0, 0x90($s1) +/* 9D9D54 80242D34 8E050000 */ lw $a1, ($s0) +/* 9D9D58 80242D38 26100004 */ addiu $s0, $s0, 4 +/* 9D9D5C 80242D3C 0C0B1EAF */ jal get_variable +/* 9D9D60 80242D40 0220202D */ daddu $a0, $s1, $zero +/* 9D9D64 80242D44 AE220094 */ sw $v0, 0x94($s1) +/* 9D9D68 80242D48 8E050000 */ lw $a1, ($s0) +/* 9D9D6C 80242D4C 26100004 */ addiu $s0, $s0, 4 +/* 9D9D70 80242D50 0C0B1EAF */ jal get_variable +/* 9D9D74 80242D54 0220202D */ daddu $a0, $s1, $zero +/* 9D9D78 80242D58 AE220098 */ sw $v0, 0x98($s1) +/* 9D9D7C 80242D5C 8E050000 */ lw $a1, ($s0) +/* 9D9D80 80242D60 26100004 */ addiu $s0, $s0, 4 +/* 9D9D84 80242D64 0C0B1EAF */ jal get_variable +/* 9D9D88 80242D68 0220202D */ daddu $a0, $s1, $zero +/* 9D9D8C 80242D6C AE22009C */ sw $v0, 0x9c($s1) +/* 9D9D90 80242D70 8E050000 */ lw $a1, ($s0) +/* 9D9D94 80242D74 26100004 */ addiu $s0, $s0, 4 +/* 9D9D98 80242D78 0C0B1EAF */ jal get_variable +/* 9D9D9C 80242D7C 0220202D */ daddu $a0, $s1, $zero +/* 9D9DA0 80242D80 AE2200A0 */ sw $v0, 0xa0($s1) +/* 9D9DA4 80242D84 8E050000 */ lw $a1, ($s0) +/* 9D9DA8 80242D88 26100004 */ addiu $s0, $s0, 4 +/* 9D9DAC 80242D8C 0C0B1EAF */ jal get_variable +/* 9D9DB0 80242D90 0220202D */ daddu $a0, $s1, $zero +/* 9D9DB4 80242D94 AE2200A4 */ sw $v0, 0xa4($s1) +/* 9D9DB8 80242D98 8E050000 */ lw $a1, ($s0) +/* 9D9DBC 80242D9C 26100004 */ addiu $s0, $s0, 4 +/* 9D9DC0 80242DA0 0C0B1EAF */ jal get_variable +/* 9D9DC4 80242DA4 0220202D */ daddu $a0, $s1, $zero +/* 9D9DC8 80242DA8 AE2200A8 */ sw $v0, 0xa8($s1) +/* 9D9DCC 80242DAC 8E050000 */ lw $a1, ($s0) +/* 9D9DD0 80242DB0 26100004 */ addiu $s0, $s0, 4 +/* 9D9DD4 80242DB4 0C0B1EAF */ jal get_variable +/* 9D9DD8 80242DB8 0220202D */ daddu $a0, $s1, $zero +/* 9D9DDC 80242DBC AE2200AC */ sw $v0, 0xac($s1) +/* 9D9DE0 80242DC0 8E050000 */ lw $a1, ($s0) +/* 9D9DE4 80242DC4 0C0B1EAF */ jal get_variable +/* 9D9DE8 80242DC8 0220202D */ daddu $a0, $s1, $zero +/* 9D9DEC 80242DCC AE2200B0 */ sw $v0, 0xb0($s1) +/* 9D9DF0 80242DD0 8FBF0018 */ lw $ra, 0x18($sp) +/* 9D9DF4 80242DD4 8FB10014 */ lw $s1, 0x14($sp) +/* 9D9DF8 80242DD8 8FB00010 */ lw $s0, 0x10($sp) +/* 9D9DFC 80242DDC 24020002 */ addiu $v0, $zero, 2 +/* 9D9E00 80242DE0 03E00008 */ jr $ra +/* 9D9E04 80242DE4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8.s deleted file mode 100644 index f2f3e5ee1d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DE8 -/* 9D9E08 80242DE8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D9E0C 80242DEC AFB1001C */ sw $s1, 0x1c($sp) -/* 9D9E10 80242DF0 0080882D */ daddu $s1, $a0, $zero -/* 9D9E14 80242DF4 AFBF0034 */ sw $ra, 0x34($sp) -/* 9D9E18 80242DF8 AFB60030 */ sw $s6, 0x30($sp) -/* 9D9E1C 80242DFC AFB5002C */ sw $s5, 0x2c($sp) -/* 9D9E20 80242E00 AFB40028 */ sw $s4, 0x28($sp) -/* 9D9E24 80242E04 AFB30024 */ sw $s3, 0x24($sp) -/* 9D9E28 80242E08 AFB20020 */ sw $s2, 0x20($sp) -/* 9D9E2C 80242E0C AFB00018 */ sw $s0, 0x18($sp) -/* 9D9E30 80242E10 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9D9E34 80242E14 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9D9E38 80242E18 8E30000C */ lw $s0, 0xc($s1) -/* 9D9E3C 80242E1C 8E160000 */ lw $s6, ($s0) -/* 9D9E40 80242E20 26100004 */ addiu $s0, $s0, 4 -/* 9D9E44 80242E24 0C0B1EAF */ jal get_variable -/* 9D9E48 80242E28 02C0282D */ daddu $a1, $s6, $zero -/* 9D9E4C 80242E2C 44820000 */ mtc1 $v0, $f0 -/* 9D9E50 80242E30 00000000 */ nop -/* 9D9E54 80242E34 46800020 */ cvt.s.w $f0, $f0 -/* 9D9E58 80242E38 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9D9E5C 80242E3C 8E140000 */ lw $s4, ($s0) -/* 9D9E60 80242E40 26100004 */ addiu $s0, $s0, 4 -/* 9D9E64 80242E44 0220202D */ daddu $a0, $s1, $zero -/* 9D9E68 80242E48 0C0B1EAF */ jal get_variable -/* 9D9E6C 80242E4C 0280282D */ daddu $a1, $s4, $zero -/* 9D9E70 80242E50 0220202D */ daddu $a0, $s1, $zero -/* 9D9E74 80242E54 8E150000 */ lw $s5, ($s0) -/* 9D9E78 80242E58 4482B000 */ mtc1 $v0, $f22 -/* 9D9E7C 80242E5C 00000000 */ nop -/* 9D9E80 80242E60 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9D9E84 80242E64 0C0B1EAF */ jal get_variable -/* 9D9E88 80242E68 02A0282D */ daddu $a1, $s5, $zero -/* 9D9E8C 80242E6C 2404FFFC */ addiu $a0, $zero, -4 -/* 9D9E90 80242E70 44820000 */ mtc1 $v0, $f0 -/* 9D9E94 80242E74 00000000 */ nop -/* 9D9E98 80242E78 46800020 */ cvt.s.w $f0, $f0 -/* 9D9E9C 80242E7C 0C00EABB */ jal get_npc_unsafe -/* 9D9EA0 80242E80 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9D9EA4 80242E84 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 9D9EA8 80242E88 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 9D9EAC 80242E8C 3C014334 */ lui $at, 0x4334 -/* 9D9EB0 80242E90 44816000 */ mtc1 $at, $f12 -/* 9D9EB4 80242E94 00041880 */ sll $v1, $a0, 2 -/* 9D9EB8 80242E98 00641821 */ addu $v1, $v1, $a0 -/* 9D9EBC 80242E9C 00031880 */ sll $v1, $v1, 2 -/* 9D9EC0 80242EA0 00641823 */ subu $v1, $v1, $a0 -/* 9D9EC4 80242EA4 000320C0 */ sll $a0, $v1, 3 -/* 9D9EC8 80242EA8 00641821 */ addu $v1, $v1, $a0 -/* 9D9ECC 80242EAC 000318C0 */ sll $v1, $v1, 3 -/* 9D9ED0 80242EB0 3C01800B */ lui $at, 0x800b -/* 9D9ED4 80242EB4 00230821 */ addu $at, $at, $v1 -/* 9D9ED8 80242EB8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9D9EDC 80242EBC 460C0300 */ add.s $f12, $f0, $f12 -/* 9D9EE0 80242EC0 0C00A6C9 */ jal clamp_angle -/* 9D9EE4 80242EC4 0040982D */ daddu $s3, $v0, $zero -/* 9D9EE8 80242EC8 27B00010 */ addiu $s0, $sp, 0x10 -/* 9D9EEC 80242ECC 0200202D */ daddu $a0, $s0, $zero -/* 9D9EF0 80242ED0 27B20014 */ addiu $s2, $sp, 0x14 -/* 9D9EF4 80242ED4 0240282D */ daddu $a1, $s2, $zero -/* 9D9EF8 80242ED8 3C064170 */ lui $a2, 0x4170 -/* 9D9EFC 80242EDC 8E67000C */ lw $a3, 0xc($s3) -/* 9D9F00 80242EE0 0C00A7E7 */ jal add_vec2D_polar -/* 9D9F04 80242EE4 46000506 */ mov.s $f20, $f0 -/* 9D9F08 80242EE8 0200202D */ daddu $a0, $s0, $zero -/* 9D9F0C 80242EEC 3C064120 */ lui $a2, 0x4120 -/* 9D9F10 80242EF0 4407A000 */ mfc1 $a3, $f20 -/* 9D9F14 80242EF4 0C00A7E7 */ jal add_vec2D_polar -/* 9D9F18 80242EF8 0240282D */ daddu $a1, $s2, $zero -/* 9D9F1C 80242EFC 0220202D */ daddu $a0, $s1, $zero -/* 9D9F20 80242F00 C7A00010 */ lwc1 $f0, 0x10($sp) -/* 9D9F24 80242F04 4600008D */ trunc.w.s $f2, $f0 -/* 9D9F28 80242F08 44061000 */ mfc1 $a2, $f2 -/* 9D9F2C 80242F0C 0C0B2026 */ jal set_variable -/* 9D9F30 80242F10 02C0282D */ daddu $a1, $s6, $zero -/* 9D9F34 80242F14 0220202D */ daddu $a0, $s1, $zero -/* 9D9F38 80242F18 4600B08D */ trunc.w.s $f2, $f22 -/* 9D9F3C 80242F1C 44061000 */ mfc1 $a2, $f2 -/* 9D9F40 80242F20 0C0B2026 */ jal set_variable -/* 9D9F44 80242F24 0280282D */ daddu $a1, $s4, $zero -/* 9D9F48 80242F28 0220202D */ daddu $a0, $s1, $zero -/* 9D9F4C 80242F2C C7A00014 */ lwc1 $f0, 0x14($sp) -/* 9D9F50 80242F30 4600008D */ trunc.w.s $f2, $f0 -/* 9D9F54 80242F34 44061000 */ mfc1 $a2, $f2 -/* 9D9F58 80242F38 0C0B2026 */ jal set_variable -/* 9D9F5C 80242F3C 02A0282D */ daddu $a1, $s5, $zero -/* 9D9F60 80242F40 8FBF0034 */ lw $ra, 0x34($sp) -/* 9D9F64 80242F44 8FB60030 */ lw $s6, 0x30($sp) -/* 9D9F68 80242F48 8FB5002C */ lw $s5, 0x2c($sp) -/* 9D9F6C 80242F4C 8FB40028 */ lw $s4, 0x28($sp) -/* 9D9F70 80242F50 8FB30024 */ lw $s3, 0x24($sp) -/* 9D9F74 80242F54 8FB20020 */ lw $s2, 0x20($sp) -/* 9D9F78 80242F58 8FB1001C */ lw $s1, 0x1c($sp) -/* 9D9F7C 80242F5C 8FB00018 */ lw $s0, 0x18($sp) -/* 9D9F80 80242F60 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9D9F84 80242F64 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9D9F88 80242F68 24020002 */ addiu $v0, $zero, 2 -/* 9D9F8C 80242F6C 03E00008 */ jr $ra -/* 9D9F90 80242F70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8_9D9E08.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8_9D9E08.s new file mode 100644 index 0000000000..4782554d2d --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242DE8_9D9E08.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242DE8_9D9E08 +/* 9D9E08 80242DE8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9D9E0C 80242DEC AFB1001C */ sw $s1, 0x1c($sp) +/* 9D9E10 80242DF0 0080882D */ daddu $s1, $a0, $zero +/* 9D9E14 80242DF4 AFBF0034 */ sw $ra, 0x34($sp) +/* 9D9E18 80242DF8 AFB60030 */ sw $s6, 0x30($sp) +/* 9D9E1C 80242DFC AFB5002C */ sw $s5, 0x2c($sp) +/* 9D9E20 80242E00 AFB40028 */ sw $s4, 0x28($sp) +/* 9D9E24 80242E04 AFB30024 */ sw $s3, 0x24($sp) +/* 9D9E28 80242E08 AFB20020 */ sw $s2, 0x20($sp) +/* 9D9E2C 80242E0C AFB00018 */ sw $s0, 0x18($sp) +/* 9D9E30 80242E10 F7B60040 */ sdc1 $f22, 0x40($sp) +/* 9D9E34 80242E14 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 9D9E38 80242E18 8E30000C */ lw $s0, 0xc($s1) +/* 9D9E3C 80242E1C 8E160000 */ lw $s6, ($s0) +/* 9D9E40 80242E20 26100004 */ addiu $s0, $s0, 4 +/* 9D9E44 80242E24 0C0B1EAF */ jal get_variable +/* 9D9E48 80242E28 02C0282D */ daddu $a1, $s6, $zero +/* 9D9E4C 80242E2C 44820000 */ mtc1 $v0, $f0 +/* 9D9E50 80242E30 00000000 */ nop +/* 9D9E54 80242E34 46800020 */ cvt.s.w $f0, $f0 +/* 9D9E58 80242E38 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9D9E5C 80242E3C 8E140000 */ lw $s4, ($s0) +/* 9D9E60 80242E40 26100004 */ addiu $s0, $s0, 4 +/* 9D9E64 80242E44 0220202D */ daddu $a0, $s1, $zero +/* 9D9E68 80242E48 0C0B1EAF */ jal get_variable +/* 9D9E6C 80242E4C 0280282D */ daddu $a1, $s4, $zero +/* 9D9E70 80242E50 0220202D */ daddu $a0, $s1, $zero +/* 9D9E74 80242E54 8E150000 */ lw $s5, ($s0) +/* 9D9E78 80242E58 4482B000 */ mtc1 $v0, $f22 +/* 9D9E7C 80242E5C 00000000 */ nop +/* 9D9E80 80242E60 4680B5A0 */ cvt.s.w $f22, $f22 +/* 9D9E84 80242E64 0C0B1EAF */ jal get_variable +/* 9D9E88 80242E68 02A0282D */ daddu $a1, $s5, $zero +/* 9D9E8C 80242E6C 2404FFFC */ addiu $a0, $zero, -4 +/* 9D9E90 80242E70 44820000 */ mtc1 $v0, $f0 +/* 9D9E94 80242E74 00000000 */ nop +/* 9D9E98 80242E78 46800020 */ cvt.s.w $f0, $f0 +/* 9D9E9C 80242E7C 0C00EABB */ jal get_npc_unsafe +/* 9D9EA0 80242E80 E7A00014 */ swc1 $f0, 0x14($sp) +/* 9D9EA4 80242E84 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 9D9EA8 80242E88 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 9D9EAC 80242E8C 3C014334 */ lui $at, 0x4334 +/* 9D9EB0 80242E90 44816000 */ mtc1 $at, $f12 +/* 9D9EB4 80242E94 00041880 */ sll $v1, $a0, 2 +/* 9D9EB8 80242E98 00641821 */ addu $v1, $v1, $a0 +/* 9D9EBC 80242E9C 00031880 */ sll $v1, $v1, 2 +/* 9D9EC0 80242EA0 00641823 */ subu $v1, $v1, $a0 +/* 9D9EC4 80242EA4 000320C0 */ sll $a0, $v1, 3 +/* 9D9EC8 80242EA8 00641821 */ addu $v1, $v1, $a0 +/* 9D9ECC 80242EAC 000318C0 */ sll $v1, $v1, 3 +/* 9D9ED0 80242EB0 3C01800B */ lui $at, 0x800b +/* 9D9ED4 80242EB4 00230821 */ addu $at, $at, $v1 +/* 9D9ED8 80242EB8 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 9D9EDC 80242EBC 460C0300 */ add.s $f12, $f0, $f12 +/* 9D9EE0 80242EC0 0C00A6C9 */ jal clamp_angle +/* 9D9EE4 80242EC4 0040982D */ daddu $s3, $v0, $zero +/* 9D9EE8 80242EC8 27B00010 */ addiu $s0, $sp, 0x10 +/* 9D9EEC 80242ECC 0200202D */ daddu $a0, $s0, $zero +/* 9D9EF0 80242ED0 27B20014 */ addiu $s2, $sp, 0x14 +/* 9D9EF4 80242ED4 0240282D */ daddu $a1, $s2, $zero +/* 9D9EF8 80242ED8 3C064170 */ lui $a2, 0x4170 +/* 9D9EFC 80242EDC 8E67000C */ lw $a3, 0xc($s3) +/* 9D9F00 80242EE0 0C00A7E7 */ jal add_vec2D_polar +/* 9D9F04 80242EE4 46000506 */ mov.s $f20, $f0 +/* 9D9F08 80242EE8 0200202D */ daddu $a0, $s0, $zero +/* 9D9F0C 80242EEC 3C064120 */ lui $a2, 0x4120 +/* 9D9F10 80242EF0 4407A000 */ mfc1 $a3, $f20 +/* 9D9F14 80242EF4 0C00A7E7 */ jal add_vec2D_polar +/* 9D9F18 80242EF8 0240282D */ daddu $a1, $s2, $zero +/* 9D9F1C 80242EFC 0220202D */ daddu $a0, $s1, $zero +/* 9D9F20 80242F00 C7A00010 */ lwc1 $f0, 0x10($sp) +/* 9D9F24 80242F04 4600008D */ trunc.w.s $f2, $f0 +/* 9D9F28 80242F08 44061000 */ mfc1 $a2, $f2 +/* 9D9F2C 80242F0C 0C0B2026 */ jal set_variable +/* 9D9F30 80242F10 02C0282D */ daddu $a1, $s6, $zero +/* 9D9F34 80242F14 0220202D */ daddu $a0, $s1, $zero +/* 9D9F38 80242F18 4600B08D */ trunc.w.s $f2, $f22 +/* 9D9F3C 80242F1C 44061000 */ mfc1 $a2, $f2 +/* 9D9F40 80242F20 0C0B2026 */ jal set_variable +/* 9D9F44 80242F24 0280282D */ daddu $a1, $s4, $zero +/* 9D9F48 80242F28 0220202D */ daddu $a0, $s1, $zero +/* 9D9F4C 80242F2C C7A00014 */ lwc1 $f0, 0x14($sp) +/* 9D9F50 80242F30 4600008D */ trunc.w.s $f2, $f0 +/* 9D9F54 80242F34 44061000 */ mfc1 $a2, $f2 +/* 9D9F58 80242F38 0C0B2026 */ jal set_variable +/* 9D9F5C 80242F3C 02A0282D */ daddu $a1, $s5, $zero +/* 9D9F60 80242F40 8FBF0034 */ lw $ra, 0x34($sp) +/* 9D9F64 80242F44 8FB60030 */ lw $s6, 0x30($sp) +/* 9D9F68 80242F48 8FB5002C */ lw $s5, 0x2c($sp) +/* 9D9F6C 80242F4C 8FB40028 */ lw $s4, 0x28($sp) +/* 9D9F70 80242F50 8FB30024 */ lw $s3, 0x24($sp) +/* 9D9F74 80242F54 8FB20020 */ lw $s2, 0x20($sp) +/* 9D9F78 80242F58 8FB1001C */ lw $s1, 0x1c($sp) +/* 9D9F7C 80242F5C 8FB00018 */ lw $s0, 0x18($sp) +/* 9D9F80 80242F60 D7B60040 */ ldc1 $f22, 0x40($sp) +/* 9D9F84 80242F64 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 9D9F88 80242F68 24020002 */ addiu $v0, $zero, 2 +/* 9D9F8C 80242F6C 03E00008 */ jr $ra +/* 9D9F90 80242F70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8.s deleted file mode 100644 index d65232a475..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FB8 -/* 9D9FD8 80242FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9FDC 80242FBC AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9FE0 80242FC0 0C00EABB */ jal get_npc_unsafe -/* 9D9FE4 80242FC4 8C84008C */ lw $a0, 0x8c($a0) -/* 9D9FE8 80242FC8 3C038025 */ lui $v1, 0x8025 -/* 9D9FEC 80242FCC 8C634B94 */ lw $v1, 0x4b94($v1) -/* 9D9FF0 80242FD0 AC430028 */ sw $v1, 0x28($v0) -/* 9D9FF4 80242FD4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9FF8 80242FD8 24020002 */ addiu $v0, $zero, 2 -/* 9D9FFC 80242FDC 03E00008 */ jr $ra -/* 9DA000 80242FE0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s new file mode 100644 index 0000000000..ddabbf9054 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FB8_9D9FD8.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242FB8_9D9FD8 +/* 9D9FD8 80242FB8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9D9FDC 80242FBC AFBF0010 */ sw $ra, 0x10($sp) +/* 9D9FE0 80242FC0 0C00EABB */ jal get_npc_unsafe +/* 9D9FE4 80242FC4 8C84008C */ lw $a0, 0x8c($a0) +/* 9D9FE8 80242FC8 3C038025 */ lui $v1, 0x8025 +/* 9D9FEC 80242FCC 8C634B94 */ lw $v1, 0x4b94($v1) +/* 9D9FF0 80242FD0 AC430028 */ sw $v1, 0x28($v0) +/* 9D9FF4 80242FD4 8FBF0010 */ lw $ra, 0x10($sp) +/* 9D9FF8 80242FD8 24020002 */ addiu $v0, $zero, 2 +/* 9D9FFC 80242FDC 03E00008 */ jr $ra +/* 9DA000 80242FE0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4.s deleted file mode 100644 index f34480d906..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FE4 -/* 9DA004 80242FE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DA008 80242FE8 AFBF0010 */ sw $ra, 0x10($sp) -/* 9DA00C 80242FEC 8C82000C */ lw $v0, 0xc($a0) -/* 9DA010 80242FF0 0C0B1EAF */ jal get_variable -/* 9DA014 80242FF4 8C450000 */ lw $a1, ($v0) -/* 9DA018 80242FF8 0C03AC5A */ jal func_800EB168 -/* 9DA01C 80242FFC 0040202D */ daddu $a0, $v0, $zero -/* 9DA020 80243000 8FBF0010 */ lw $ra, 0x10($sp) -/* 9DA024 80243004 24020002 */ addiu $v0, $zero, 2 -/* 9DA028 80243008 03E00008 */ jr $ra -/* 9DA02C 8024300C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4_9DA004.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4_9DA004.s new file mode 100644 index 0000000000..2943dcae70 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242FE4_9DA004.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242FE4_9DA004 +/* 9DA004 80242FE4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9DA008 80242FE8 AFBF0010 */ sw $ra, 0x10($sp) +/* 9DA00C 80242FEC 8C82000C */ lw $v0, 0xc($a0) +/* 9DA010 80242FF0 0C0B1EAF */ jal get_variable +/* 9DA014 80242FF4 8C450000 */ lw $a1, ($v0) +/* 9DA018 80242FF8 0C03AC5A */ jal func_800EB168 +/* 9DA01C 80242FFC 0040202D */ daddu $a0, $v0, $zero +/* 9DA020 80243000 8FBF0010 */ lw $ra, 0x10($sp) +/* 9DA024 80243004 24020002 */ addiu $v0, $zero, 2 +/* 9DA028 80243008 03E00008 */ jr $ra +/* 9DA02C 8024300C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010.s deleted file mode 100644 index f4eef7960b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243010 -/* 9DA030 80243010 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9DA034 80243014 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA038 80243018 0080882D */ daddu $s1, $a0, $zero -/* 9DA03C 8024301C AFBF0018 */ sw $ra, 0x18($sp) -/* 9DA040 80243020 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA044 80243024 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 9DA048 80243028 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9DA04C 8024302C 8E30000C */ lw $s0, 0xc($s1) -/* 9DA050 80243030 8E050000 */ lw $a1, ($s0) -/* 9DA054 80243034 0C0B1EAF */ jal get_variable -/* 9DA058 80243038 26100004 */ addiu $s0, $s0, 4 -/* 9DA05C 8024303C 8E050000 */ lw $a1, ($s0) -/* 9DA060 80243040 26100004 */ addiu $s0, $s0, 4 -/* 9DA064 80243044 4482B000 */ mtc1 $v0, $f22 -/* 9DA068 80243048 00000000 */ nop -/* 9DA06C 8024304C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9DA070 80243050 0C0B1EAF */ jal get_variable -/* 9DA074 80243054 0220202D */ daddu $a0, $s1, $zero -/* 9DA078 80243058 8E050000 */ lw $a1, ($s0) -/* 9DA07C 8024305C 4482A000 */ mtc1 $v0, $f20 -/* 9DA080 80243060 00000000 */ nop -/* 9DA084 80243064 4680A520 */ cvt.s.w $f20, $f20 -/* 9DA088 80243068 0C0B1EAF */ jal get_variable -/* 9DA08C 8024306C 0220202D */ daddu $a0, $s1, $zero -/* 9DA090 80243070 3C014170 */ lui $at, 0x4170 -/* 9DA094 80243074 44810000 */ mtc1 $at, $f0 -/* 9DA098 80243078 44821000 */ mtc1 $v0, $f2 -/* 9DA09C 8024307C 00000000 */ nop -/* 9DA0A0 80243080 468010A0 */ cvt.s.w $f2, $f2 -/* 9DA0A4 80243084 4600A500 */ add.s $f20, $f20, $f0 -/* 9DA0A8 80243088 4405B000 */ mfc1 $a1, $f22 -/* 9DA0AC 8024308C 44071000 */ mfc1 $a3, $f2 -/* 9DA0B0 80243090 4406A000 */ mfc1 $a2, $f20 -/* 9DA0B4 80243094 0C01C07C */ jal func_800701F0 -/* 9DA0B8 80243098 0000202D */ daddu $a0, $zero, $zero -/* 9DA0BC 8024309C 0000202D */ daddu $a0, $zero, $zero -/* 9DA0C0 802430A0 0080282D */ daddu $a1, $a0, $zero -/* 9DA0C4 802430A4 0C0B2D5B */ jal exec_ShakeCam1 -/* 9DA0C8 802430A8 24060014 */ addiu $a2, $zero, 0x14 -/* 9DA0CC 802430AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9DA0D0 802430B0 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA0D4 802430B4 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA0D8 802430B8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 9DA0DC 802430BC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9DA0E0 802430C0 24020002 */ addiu $v0, $zero, 2 -/* 9DA0E4 802430C4 03E00008 */ jr $ra -/* 9DA0E8 802430C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s new file mode 100644 index 0000000000..c2d64c0783 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243010_9DA030.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243010_9DA030 +/* 9DA030 80243010 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9DA034 80243014 AFB10014 */ sw $s1, 0x14($sp) +/* 9DA038 80243018 0080882D */ daddu $s1, $a0, $zero +/* 9DA03C 8024301C AFBF0018 */ sw $ra, 0x18($sp) +/* 9DA040 80243020 AFB00010 */ sw $s0, 0x10($sp) +/* 9DA044 80243024 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 9DA048 80243028 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 9DA04C 8024302C 8E30000C */ lw $s0, 0xc($s1) +/* 9DA050 80243030 8E050000 */ lw $a1, ($s0) +/* 9DA054 80243034 0C0B1EAF */ jal get_variable +/* 9DA058 80243038 26100004 */ addiu $s0, $s0, 4 +/* 9DA05C 8024303C 8E050000 */ lw $a1, ($s0) +/* 9DA060 80243040 26100004 */ addiu $s0, $s0, 4 +/* 9DA064 80243044 4482B000 */ mtc1 $v0, $f22 +/* 9DA068 80243048 00000000 */ nop +/* 9DA06C 8024304C 4680B5A0 */ cvt.s.w $f22, $f22 +/* 9DA070 80243050 0C0B1EAF */ jal get_variable +/* 9DA074 80243054 0220202D */ daddu $a0, $s1, $zero +/* 9DA078 80243058 8E050000 */ lw $a1, ($s0) +/* 9DA07C 8024305C 4482A000 */ mtc1 $v0, $f20 +/* 9DA080 80243060 00000000 */ nop +/* 9DA084 80243064 4680A520 */ cvt.s.w $f20, $f20 +/* 9DA088 80243068 0C0B1EAF */ jal get_variable +/* 9DA08C 8024306C 0220202D */ daddu $a0, $s1, $zero +/* 9DA090 80243070 3C014170 */ lui $at, 0x4170 +/* 9DA094 80243074 44810000 */ mtc1 $at, $f0 +/* 9DA098 80243078 44821000 */ mtc1 $v0, $f2 +/* 9DA09C 8024307C 00000000 */ nop +/* 9DA0A0 80243080 468010A0 */ cvt.s.w $f2, $f2 +/* 9DA0A4 80243084 4600A500 */ add.s $f20, $f20, $f0 +/* 9DA0A8 80243088 4405B000 */ mfc1 $a1, $f22 +/* 9DA0AC 8024308C 44071000 */ mfc1 $a3, $f2 +/* 9DA0B0 80243090 4406A000 */ mfc1 $a2, $f20 +/* 9DA0B4 80243094 0C01C07C */ jal func_800701F0 +/* 9DA0B8 80243098 0000202D */ daddu $a0, $zero, $zero +/* 9DA0BC 8024309C 0000202D */ daddu $a0, $zero, $zero +/* 9DA0C0 802430A0 0080282D */ daddu $a1, $a0, $zero +/* 9DA0C4 802430A4 0C0B2D5B */ jal exec_ShakeCam1 +/* 9DA0C8 802430A8 24060014 */ addiu $a2, $zero, 0x14 +/* 9DA0CC 802430AC 8FBF0018 */ lw $ra, 0x18($sp) +/* 9DA0D0 802430B0 8FB10014 */ lw $s1, 0x14($sp) +/* 9DA0D4 802430B4 8FB00010 */ lw $s0, 0x10($sp) +/* 9DA0D8 802430B8 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 9DA0DC 802430BC D7B40020 */ ldc1 $f20, 0x20($sp) +/* 9DA0E0 802430C0 24020002 */ addiu $v0, $zero, 2 +/* 9DA0E4 802430C4 03E00008 */ jr $ra +/* 9DA0E8 802430C8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC.s deleted file mode 100644 index af5726cf45..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC.s +++ /dev/null @@ -1,90 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802430CC -/* 9DA0EC 802430CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9DA0F0 802430D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA0F4 802430D4 0080882D */ daddu $s1, $a0, $zero -/* 9DA0F8 802430D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 9DA0FC 802430DC AFB20018 */ sw $s2, 0x18($sp) -/* 9DA100 802430E0 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA104 802430E4 8E30000C */ lw $s0, 0xc($s1) -/* 9DA108 802430E8 8E050000 */ lw $a1, ($s0) -/* 9DA10C 802430EC 0C0B1EAF */ jal get_variable -/* 9DA110 802430F0 26100004 */ addiu $s0, $s0, 4 -/* 9DA114 802430F4 0220202D */ daddu $a0, $s1, $zero -/* 9DA118 802430F8 8E050000 */ lw $a1, ($s0) -/* 9DA11C 802430FC 0C0B1EAF */ jal get_variable -/* 9DA120 80243100 0040802D */ daddu $s0, $v0, $zero -/* 9DA124 80243104 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* 9DA128 80243108 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* 9DA12C 8024310C 0000182D */ daddu $v1, $zero, $zero -/* 9DA130 80243110 C6420054 */ lwc1 $f2, 0x54($s2) -/* 9DA134 80243114 3C014080 */ lui $at, 0x4080 -/* 9DA138 80243118 44810000 */ mtc1 $at, $f0 -/* 9DA13C 8024311C 00000000 */ nop -/* 9DA140 80243120 4602003E */ c.le.s $f0, $f2 -/* 9DA144 80243124 00000000 */ nop -/* 9DA148 80243128 45000009 */ bc1f .L80243150 -/* 9DA14C 8024312C 0040202D */ daddu $a0, $v0, $zero -/* 9DA150 80243130 8E22008C */ lw $v0, 0x8c($s1) -/* 9DA154 80243134 24420001 */ addiu $v0, $v0, 1 -/* 9DA158 80243138 AE22008C */ sw $v0, 0x8c($s1) -/* 9DA15C 8024313C 28420003 */ slti $v0, $v0, 3 -/* 9DA160 80243140 14400004 */ bnez $v0, .L80243154 -/* 9DA164 80243144 24020002 */ addiu $v0, $zero, 2 -/* 9DA168 80243148 08090C55 */ j .L80243154 -/* 9DA16C 8024314C AE22008C */ sw $v0, 0x8c($s1) -.L80243150: -/* 9DA170 80243150 AE20008C */ sw $zero, 0x8c($s1) -.L80243154: -/* 9DA174 80243154 C6020038 */ lwc1 $f2, 0x38($s0) -/* 9DA178 80243158 C6400028 */ lwc1 $f0, 0x28($s2) -/* 9DA17C 8024315C 46001081 */ sub.s $f2, $f2, $f0 -/* 9DA180 80243160 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA184 80243164 00000000 */ nop -/* 9DA188 80243168 C6400030 */ lwc1 $f0, 0x30($s2) -/* 9DA18C 8024316C C6020040 */ lwc1 $f2, 0x40($s0) -/* 9DA190 80243170 46001001 */ sub.s $f0, $f2, $f0 -/* 9DA194 80243174 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA198 80243178 00000000 */ nop -/* 9DA19C 8024317C 46002100 */ add.s $f4, $f4, $f0 -/* 9DA1A0 80243180 3C0145C8 */ lui $at, 0x45c8 -/* 9DA1A4 80243184 44810000 */ mtc1 $at, $f0 -/* 9DA1A8 80243188 00000000 */ nop -/* 9DA1AC 8024318C 4600203C */ c.lt.s $f4, $f0 -/* 9DA1B0 80243190 00000000 */ nop -/* 9DA1B4 80243194 45000005 */ bc1f .L802431AC -/* 9DA1B8 80243198 00000000 */ nop -/* 9DA1BC 8024319C 8E22008C */ lw $v0, 0x8c($s1) -/* 9DA1C0 802431A0 28420002 */ slti $v0, $v0, 2 -/* 9DA1C4 802431A4 50400001 */ beql $v0, $zero, .L802431AC -/* 9DA1C8 802431A8 24030001 */ addiu $v1, $zero, 1 -.L802431AC: -/* 9DA1CC 802431AC C6020038 */ lwc1 $f2, 0x38($s0) -/* 9DA1D0 802431B0 C4800038 */ lwc1 $f0, 0x38($a0) -/* 9DA1D4 802431B4 46001081 */ sub.s $f2, $f2, $f0 -/* 9DA1D8 802431B8 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA1DC 802431BC 00000000 */ nop -/* 9DA1E0 802431C0 C4800040 */ lwc1 $f0, 0x40($a0) -/* 9DA1E4 802431C4 C6020040 */ lwc1 $f2, 0x40($s0) -/* 9DA1E8 802431C8 46001001 */ sub.s $f0, $f2, $f0 -/* 9DA1EC 802431CC 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA1F0 802431D0 00000000 */ nop -/* 9DA1F4 802431D4 46002100 */ add.s $f4, $f4, $f0 -/* 9DA1F8 802431D8 3C0144C8 */ lui $at, 0x44c8 -/* 9DA1FC 802431DC 44810000 */ mtc1 $at, $f0 -/* 9DA200 802431E0 00000000 */ nop -/* 9DA204 802431E4 4600203C */ c.lt.s $f4, $f0 -/* 9DA208 802431E8 00000000 */ nop -/* 9DA20C 802431EC 45030001 */ bc1tl .L802431F4 -/* 9DA210 802431F0 24030001 */ addiu $v1, $zero, 1 -.L802431F4: -/* 9DA214 802431F4 AE230084 */ sw $v1, 0x84($s1) -/* 9DA218 802431F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9DA21C 802431FC 8FB20018 */ lw $s2, 0x18($sp) -/* 9DA220 80243200 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA224 80243204 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA228 80243208 24020002 */ addiu $v0, $zero, 2 -/* 9DA22C 8024320C 03E00008 */ jr $ra -/* 9DA230 80243210 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC_9DA0EC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC_9DA0EC.s new file mode 100644 index 0000000000..8256d4e4d0 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802430CC_9DA0EC.s @@ -0,0 +1,90 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802430CC_9DA0EC +/* 9DA0EC 802430CC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9DA0F0 802430D0 AFB10014 */ sw $s1, 0x14($sp) +/* 9DA0F4 802430D4 0080882D */ daddu $s1, $a0, $zero +/* 9DA0F8 802430D8 AFBF001C */ sw $ra, 0x1c($sp) +/* 9DA0FC 802430DC AFB20018 */ sw $s2, 0x18($sp) +/* 9DA100 802430E0 AFB00010 */ sw $s0, 0x10($sp) +/* 9DA104 802430E4 8E30000C */ lw $s0, 0xc($s1) +/* 9DA108 802430E8 8E050000 */ lw $a1, ($s0) +/* 9DA10C 802430EC 0C0B1EAF */ jal get_variable +/* 9DA110 802430F0 26100004 */ addiu $s0, $s0, 4 +/* 9DA114 802430F4 0220202D */ daddu $a0, $s1, $zero +/* 9DA118 802430F8 8E050000 */ lw $a1, ($s0) +/* 9DA11C 802430FC 0C0B1EAF */ jal get_variable +/* 9DA120 80243100 0040802D */ daddu $s0, $v0, $zero +/* 9DA124 80243104 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* 9DA128 80243108 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* 9DA12C 8024310C 0000182D */ daddu $v1, $zero, $zero +/* 9DA130 80243110 C6420054 */ lwc1 $f2, 0x54($s2) +/* 9DA134 80243114 3C014080 */ lui $at, 0x4080 +/* 9DA138 80243118 44810000 */ mtc1 $at, $f0 +/* 9DA13C 8024311C 00000000 */ nop +/* 9DA140 80243120 4602003E */ c.le.s $f0, $f2 +/* 9DA144 80243124 00000000 */ nop +/* 9DA148 80243128 45000009 */ bc1f .L80243150 +/* 9DA14C 8024312C 0040202D */ daddu $a0, $v0, $zero +/* 9DA150 80243130 8E22008C */ lw $v0, 0x8c($s1) +/* 9DA154 80243134 24420001 */ addiu $v0, $v0, 1 +/* 9DA158 80243138 AE22008C */ sw $v0, 0x8c($s1) +/* 9DA15C 8024313C 28420003 */ slti $v0, $v0, 3 +/* 9DA160 80243140 14400004 */ bnez $v0, .L80243154 +/* 9DA164 80243144 24020002 */ addiu $v0, $zero, 2 +/* 9DA168 80243148 08090C55 */ j .L80243154 +/* 9DA16C 8024314C AE22008C */ sw $v0, 0x8c($s1) +.L80243150: +/* 9DA170 80243150 AE20008C */ sw $zero, 0x8c($s1) +.L80243154: +/* 9DA174 80243154 C6020038 */ lwc1 $f2, 0x38($s0) +/* 9DA178 80243158 C6400028 */ lwc1 $f0, 0x28($s2) +/* 9DA17C 8024315C 46001081 */ sub.s $f2, $f2, $f0 +/* 9DA180 80243160 46021102 */ mul.s $f4, $f2, $f2 +/* 9DA184 80243164 00000000 */ nop +/* 9DA188 80243168 C6400030 */ lwc1 $f0, 0x30($s2) +/* 9DA18C 8024316C C6020040 */ lwc1 $f2, 0x40($s0) +/* 9DA190 80243170 46001001 */ sub.s $f0, $f2, $f0 +/* 9DA194 80243174 46000002 */ mul.s $f0, $f0, $f0 +/* 9DA198 80243178 00000000 */ nop +/* 9DA19C 8024317C 46002100 */ add.s $f4, $f4, $f0 +/* 9DA1A0 80243180 3C0145C8 */ lui $at, 0x45c8 +/* 9DA1A4 80243184 44810000 */ mtc1 $at, $f0 +/* 9DA1A8 80243188 00000000 */ nop +/* 9DA1AC 8024318C 4600203C */ c.lt.s $f4, $f0 +/* 9DA1B0 80243190 00000000 */ nop +/* 9DA1B4 80243194 45000005 */ bc1f .L802431AC +/* 9DA1B8 80243198 00000000 */ nop +/* 9DA1BC 8024319C 8E22008C */ lw $v0, 0x8c($s1) +/* 9DA1C0 802431A0 28420002 */ slti $v0, $v0, 2 +/* 9DA1C4 802431A4 50400001 */ beql $v0, $zero, .L802431AC +/* 9DA1C8 802431A8 24030001 */ addiu $v1, $zero, 1 +.L802431AC: +/* 9DA1CC 802431AC C6020038 */ lwc1 $f2, 0x38($s0) +/* 9DA1D0 802431B0 C4800038 */ lwc1 $f0, 0x38($a0) +/* 9DA1D4 802431B4 46001081 */ sub.s $f2, $f2, $f0 +/* 9DA1D8 802431B8 46021102 */ mul.s $f4, $f2, $f2 +/* 9DA1DC 802431BC 00000000 */ nop +/* 9DA1E0 802431C0 C4800040 */ lwc1 $f0, 0x40($a0) +/* 9DA1E4 802431C4 C6020040 */ lwc1 $f2, 0x40($s0) +/* 9DA1E8 802431C8 46001001 */ sub.s $f0, $f2, $f0 +/* 9DA1EC 802431CC 46000002 */ mul.s $f0, $f0, $f0 +/* 9DA1F0 802431D0 00000000 */ nop +/* 9DA1F4 802431D4 46002100 */ add.s $f4, $f4, $f0 +/* 9DA1F8 802431D8 3C0144C8 */ lui $at, 0x44c8 +/* 9DA1FC 802431DC 44810000 */ mtc1 $at, $f0 +/* 9DA200 802431E0 00000000 */ nop +/* 9DA204 802431E4 4600203C */ c.lt.s $f4, $f0 +/* 9DA208 802431E8 00000000 */ nop +/* 9DA20C 802431EC 45030001 */ bc1tl .L802431F4 +/* 9DA210 802431F0 24030001 */ addiu $v1, $zero, 1 +.L802431F4: +/* 9DA214 802431F4 AE230084 */ sw $v1, 0x84($s1) +/* 9DA218 802431F8 8FBF001C */ lw $ra, 0x1c($sp) +/* 9DA21C 802431FC 8FB20018 */ lw $s2, 0x18($sp) +/* 9DA220 80243200 8FB10014 */ lw $s1, 0x14($sp) +/* 9DA224 80243204 8FB00010 */ lw $s0, 0x10($sp) +/* 9DA228 80243208 24020002 */ addiu $v0, $zero, 2 +/* 9DA22C 8024320C 03E00008 */ jr $ra +/* 9DA230 80243210 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214.s deleted file mode 100644 index 826d0ac6a1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243214 -/* 9DA234 80243214 3C058011 */ lui $a1, %hi(gPlayerStatus) -/* 9DA238 80243218 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) -/* 9DA23C 8024321C C4A20054 */ lwc1 $f2, 0x54($a1) -/* 9DA240 80243220 3C014080 */ lui $at, 0x4080 -/* 9DA244 80243224 44810000 */ mtc1 $at, $f0 -/* 9DA248 80243228 00000000 */ nop -/* 9DA24C 8024322C 4602003E */ c.le.s $f0, $f2 -/* 9DA250 80243230 00000000 */ nop -/* 9DA254 80243234 45020008 */ bc1fl .L80243258 -/* 9DA258 80243238 AC80008C */ sw $zero, 0x8c($a0) -/* 9DA25C 8024323C 8C82008C */ lw $v0, 0x8c($a0) -/* 9DA260 80243240 24420001 */ addiu $v0, $v0, 1 -/* 9DA264 80243244 AC82008C */ sw $v0, 0x8c($a0) -/* 9DA268 80243248 28420003 */ slti $v0, $v0, 3 -/* 9DA26C 8024324C 14400002 */ bnez $v0, .L80243258 -/* 9DA270 80243250 24020002 */ addiu $v0, $zero, 2 -/* 9DA274 80243254 AC82008C */ sw $v0, 0x8c($a0) -.L80243258: -/* 9DA278 80243258 8C82008C */ lw $v0, 0x8c($a0) -/* 9DA27C 8024325C 24030001 */ addiu $v1, $zero, 1 -/* 9DA280 80243260 28420002 */ slti $v0, $v0, 2 -/* 9DA284 80243264 14400002 */ bnez $v0, .L80243270 -/* 9DA288 80243268 AC830084 */ sw $v1, 0x84($a0) -/* 9DA28C 8024326C AC800084 */ sw $zero, 0x84($a0) -.L80243270: -/* 9DA290 80243270 C4A20054 */ lwc1 $f2, 0x54($a1) -/* 9DA294 80243274 44800000 */ mtc1 $zero, $f0 -/* 9DA298 80243278 00000000 */ nop -/* 9DA29C 8024327C 46001032 */ c.eq.s $f2, $f0 -/* 9DA2A0 80243280 00000000 */ nop -/* 9DA2A4 80243284 45030001 */ bc1tl .L8024328C -/* 9DA2A8 80243288 AC800084 */ sw $zero, 0x84($a0) -.L8024328C: -/* 9DA2AC 8024328C 03E00008 */ jr $ra -/* 9DA2B0 80243290 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s new file mode 100644 index 0000000000..c20f2fe5d2 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243214_9DA234.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243214_9DA234 +/* 9DA234 80243214 3C058011 */ lui $a1, %hi(gPlayerStatus) +/* 9DA238 80243218 24A5EFC8 */ addiu $a1, $a1, %lo(gPlayerStatus) +/* 9DA23C 8024321C C4A20054 */ lwc1 $f2, 0x54($a1) +/* 9DA240 80243220 3C014080 */ lui $at, 0x4080 +/* 9DA244 80243224 44810000 */ mtc1 $at, $f0 +/* 9DA248 80243228 00000000 */ nop +/* 9DA24C 8024322C 4602003E */ c.le.s $f0, $f2 +/* 9DA250 80243230 00000000 */ nop +/* 9DA254 80243234 45020008 */ bc1fl .L80243258 +/* 9DA258 80243238 AC80008C */ sw $zero, 0x8c($a0) +/* 9DA25C 8024323C 8C82008C */ lw $v0, 0x8c($a0) +/* 9DA260 80243240 24420001 */ addiu $v0, $v0, 1 +/* 9DA264 80243244 AC82008C */ sw $v0, 0x8c($a0) +/* 9DA268 80243248 28420003 */ slti $v0, $v0, 3 +/* 9DA26C 8024324C 14400002 */ bnez $v0, .L80243258 +/* 9DA270 80243250 24020002 */ addiu $v0, $zero, 2 +/* 9DA274 80243254 AC82008C */ sw $v0, 0x8c($a0) +.L80243258: +/* 9DA278 80243258 8C82008C */ lw $v0, 0x8c($a0) +/* 9DA27C 8024325C 24030001 */ addiu $v1, $zero, 1 +/* 9DA280 80243260 28420002 */ slti $v0, $v0, 2 +/* 9DA284 80243264 14400002 */ bnez $v0, .L80243270 +/* 9DA288 80243268 AC830084 */ sw $v1, 0x84($a0) +/* 9DA28C 8024326C AC800084 */ sw $zero, 0x84($a0) +.L80243270: +/* 9DA290 80243270 C4A20054 */ lwc1 $f2, 0x54($a1) +/* 9DA294 80243274 44800000 */ mtc1 $zero, $f0 +/* 9DA298 80243278 00000000 */ nop +/* 9DA29C 8024327C 46001032 */ c.eq.s $f2, $f0 +/* 9DA2A0 80243280 00000000 */ nop +/* 9DA2A4 80243284 45030001 */ bc1tl .L8024328C +/* 9DA2A8 80243288 AC800084 */ sw $zero, 0x84($a0) +.L8024328C: +/* 9DA2AC 8024328C 03E00008 */ jr $ra +/* 9DA2B0 80243290 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294.s deleted file mode 100644 index 22bcfce933..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294.s +++ /dev/null @@ -1,171 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243294 -/* 9DA2B4 80243294 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 9DA2B8 80243298 AFB50024 */ sw $s5, 0x24($sp) -/* 9DA2BC 8024329C 0080A82D */ daddu $s5, $a0, $zero -/* 9DA2C0 802432A0 AFB60028 */ sw $s6, 0x28($sp) -/* 9DA2C4 802432A4 3C168011 */ lui $s6, %hi(gPlayerStatus) -/* 9DA2C8 802432A8 26D6EFC8 */ addiu $s6, $s6, %lo(gPlayerStatus) -/* 9DA2CC 802432AC AFB10014 */ sw $s1, 0x14($sp) -/* 9DA2D0 802432B0 24112710 */ addiu $s1, $zero, 0x2710 -/* 9DA2D4 802432B4 AFB40020 */ sw $s4, 0x20($sp) -/* 9DA2D8 802432B8 3C1451EB */ lui $s4, 0x51eb -/* 9DA2DC 802432BC AFBF002C */ sw $ra, 0x2c($sp) -/* 9DA2E0 802432C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9DA2E4 802432C4 AFB20018 */ sw $s2, 0x18($sp) -/* 9DA2E8 802432C8 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA2EC 802432CC F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9DA2F0 802432D0 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9DA2F4 802432D4 8EB0000C */ lw $s0, 0xc($s5) -/* 9DA2F8 802432D8 3694851F */ ori $s4, $s4, 0x851f -/* 9DA2FC 802432DC 8E050000 */ lw $a1, ($s0) -/* 9DA300 802432E0 0C0B1EAF */ jal get_variable -/* 9DA304 802432E4 26100004 */ addiu $s0, $s0, 4 -/* 9DA308 802432E8 02A0202D */ daddu $a0, $s5, $zero -/* 9DA30C 802432EC 8E050000 */ lw $a1, ($s0) -/* 9DA310 802432F0 0C0B1EAF */ jal get_variable -/* 9DA314 802432F4 0040902D */ daddu $s2, $v0, $zero -/* 9DA318 802432F8 0040982D */ daddu $s3, $v0, $zero -.L802432FC: -/* 9DA31C 802432FC 0C00A67F */ jal rand_int -/* 9DA320 80243300 0220202D */ daddu $a0, $s1, $zero -/* 9DA324 80243304 001187C2 */ srl $s0, $s1, 0x1f -/* 9DA328 80243308 02308021 */ addu $s0, $s1, $s0 -/* 9DA32C 8024330C 00108043 */ sra $s0, $s0, 1 -/* 9DA330 80243310 00501023 */ subu $v0, $v0, $s0 -/* 9DA334 80243314 00540018 */ mult $v0, $s4 -/* 9DA338 80243318 0220202D */ daddu $a0, $s1, $zero -/* 9DA33C 8024331C 000217C3 */ sra $v0, $v0, 0x1f -/* 9DA340 80243320 C6420038 */ lwc1 $f2, 0x38($s2) -/* 9DA344 80243324 00003010 */ mfhi $a2 -/* 9DA348 80243328 00061943 */ sra $v1, $a2, 5 -/* 9DA34C 8024332C 00621823 */ subu $v1, $v1, $v0 -/* 9DA350 80243330 44830000 */ mtc1 $v1, $f0 -/* 9DA354 80243334 00000000 */ nop -/* 9DA358 80243338 46800020 */ cvt.s.w $f0, $f0 -/* 9DA35C 8024333C 0C00A67F */ jal rand_int -/* 9DA360 80243340 46020580 */ add.s $f22, $f0, $f2 -/* 9DA364 80243344 00501023 */ subu $v0, $v0, $s0 -/* 9DA368 80243348 00540018 */ mult $v0, $s4 -/* 9DA36C 8024334C 3C01C316 */ lui $at, 0xc316 -/* 9DA370 80243350 44810000 */ mtc1 $at, $f0 -/* 9DA374 80243354 00000000 */ nop -/* 9DA378 80243358 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA37C 8024335C 00003010 */ mfhi $a2 -/* 9DA380 80243360 000217C3 */ sra $v0, $v0, 0x1f -/* 9DA384 80243364 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA388 80243368 00000000 */ nop -/* 9DA38C 8024336C 00061943 */ sra $v1, $a2, 5 -/* 9DA390 80243370 00621823 */ subu $v1, $v1, $v0 -/* 9DA394 80243374 C6420040 */ lwc1 $f2, 0x40($s2) -/* 9DA398 80243378 44830000 */ mtc1 $v1, $f0 -/* 9DA39C 8024337C 00000000 */ nop -/* 9DA3A0 80243380 46800020 */ cvt.s.w $f0, $f0 -/* 9DA3A4 80243384 46020500 */ add.s $f20, $f0, $f2 -/* 9DA3A8 80243388 3C01437A */ lui $at, 0x437a -/* 9DA3AC 8024338C 44810000 */ mtc1 $at, $f0 -/* 9DA3B0 80243390 00000000 */ nop -/* 9DA3B4 80243394 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA3B8 80243398 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA3BC 8024339C 00000000 */ nop -/* 9DA3C0 802433A0 46002100 */ add.s $f4, $f4, $f0 -/* 9DA3C4 802433A4 3C0146AF */ lui $at, 0x46af -/* 9DA3C8 802433A8 3421C800 */ ori $at, $at, 0xc800 -/* 9DA3CC 802433AC 44810000 */ mtc1 $at, $f0 -/* 9DA3D0 802433B0 00000000 */ nop -/* 9DA3D4 802433B4 4600203C */ c.lt.s $f4, $f0 -/* 9DA3D8 802433B8 00000000 */ nop -/* 9DA3DC 802433BC 45000021 */ bc1f .L80243444 -/* 9DA3E0 802433C0 26311388 */ addiu $s1, $s1, 0x1388 -/* 9DA3E4 802433C4 C6C00028 */ lwc1 $f0, 0x28($s6) -/* 9DA3E8 802433C8 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA3EC 802433CC 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA3F0 802433D0 00000000 */ nop -/* 9DA3F4 802433D4 C6C00030 */ lwc1 $f0, 0x30($s6) -/* 9DA3F8 802433D8 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA3FC 802433DC 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA400 802433E0 00000000 */ nop -/* 9DA404 802433E4 46001080 */ add.s $f2, $f2, $f0 -/* 9DA408 802433E8 3C0145C8 */ lui $at, 0x45c8 -/* 9DA40C 802433EC 44810000 */ mtc1 $at, $f0 -/* 9DA410 802433F0 00000000 */ nop -/* 9DA414 802433F4 4602003C */ c.lt.s $f0, $f2 -/* 9DA418 802433F8 00000000 */ nop -/* 9DA41C 802433FC 45000011 */ bc1f .L80243444 -/* 9DA420 80243400 00000000 */ nop -/* 9DA424 80243404 C6600038 */ lwc1 $f0, 0x38($s3) -/* 9DA428 80243408 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA42C 8024340C 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA430 80243410 00000000 */ nop -/* 9DA434 80243414 C6600040 */ lwc1 $f0, 0x40($s3) -/* 9DA438 80243418 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA43C 8024341C 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA440 80243420 00000000 */ nop -/* 9DA444 80243424 46001080 */ add.s $f2, $f2, $f0 -/* 9DA448 80243428 3C0144C8 */ lui $at, 0x44c8 -/* 9DA44C 8024342C 44810000 */ mtc1 $at, $f0 -/* 9DA450 80243430 00000000 */ nop -/* 9DA454 80243434 4602003C */ c.lt.s $f0, $f2 -/* 9DA458 80243438 00000000 */ nop -/* 9DA45C 8024343C 45010006 */ bc1t .L80243458 -/* 9DA460 80243440 00000000 */ nop -.L80243444: -/* 9DA464 80243444 2A227531 */ slti $v0, $s1, 0x7531 -/* 9DA468 80243448 5040FFAC */ beql $v0, $zero, .L802432FC -/* 9DA46C 8024344C 24117530 */ addiu $s1, $zero, 0x7530 -/* 9DA470 80243450 08090CBF */ j .L802432FC -/* 9DA474 80243454 00000000 */ nop -.L80243458: -/* 9DA478 80243458 C6400038 */ lwc1 $f0, 0x38($s2) -/* 9DA47C 8024345C 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA480 80243460 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA484 80243464 00000000 */ nop -/* 9DA488 80243468 C6400040 */ lwc1 $f0, 0x40($s2) -/* 9DA48C 8024346C 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA490 80243470 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA494 80243474 00000000 */ nop -/* 9DA498 80243478 46001300 */ add.s $f12, $f2, $f0 -/* 9DA49C 8024347C 44800000 */ mtc1 $zero, $f0 -/* 9DA4A0 80243480 00000000 */ nop -/* 9DA4A4 80243484 46006032 */ c.eq.s $f12, $f0 -/* 9DA4A8 80243488 00000000 */ nop -/* 9DA4AC 8024348C 4501000D */ bc1t .L802434C4 -/* 9DA4B0 80243490 00000000 */ nop -/* 9DA4B4 80243494 46006104 */ sqrt.s $f4, $f12 -/* 9DA4B8 80243498 46042032 */ c.eq.s $f4, $f4 -/* 9DA4BC 8024349C 00000000 */ nop -/* 9DA4C0 802434A0 45010004 */ bc1t .L802434B4 -/* 9DA4C4 802434A4 00000000 */ nop -/* 9DA4C8 802434A8 0C0187BC */ jal sqrtf -/* 9DA4CC 802434AC 00000000 */ nop -/* 9DA4D0 802434B0 46000106 */ mov.s $f4, $f0 -.L802434B4: -/* 9DA4D4 802434B4 3C014120 */ lui $at, 0x4120 -/* 9DA4D8 802434B8 44810000 */ mtc1 $at, $f0 -/* 9DA4DC 802434BC 00000000 */ nop -/* 9DA4E0 802434C0 46002303 */ div.s $f12, $f4, $f0 -.L802434C4: -/* 9DA4E4 802434C4 4600B18D */ trunc.w.s $f6, $f22 -/* 9DA4E8 802434C8 E6A600AC */ swc1 $f6, 0xac($s5) -/* 9DA4EC 802434CC 4600A18D */ trunc.w.s $f6, $f20 -/* 9DA4F0 802434D0 E6A600B0 */ swc1 $f6, 0xb0($s5) -/* 9DA4F4 802434D4 4600618D */ trunc.w.s $f6, $f12 -/* 9DA4F8 802434D8 44023000 */ mfc1 $v0, $f6 -/* 9DA4FC 802434DC 00000000 */ nop -/* 9DA500 802434E0 24420001 */ addiu $v0, $v0, 1 -/* 9DA504 802434E4 AEA200B4 */ sw $v0, 0xb4($s5) -/* 9DA508 802434E8 8FBF002C */ lw $ra, 0x2c($sp) -/* 9DA50C 802434EC 8FB60028 */ lw $s6, 0x28($sp) -/* 9DA510 802434F0 8FB50024 */ lw $s5, 0x24($sp) -/* 9DA514 802434F4 8FB40020 */ lw $s4, 0x20($sp) -/* 9DA518 802434F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9DA51C 802434FC 8FB20018 */ lw $s2, 0x18($sp) -/* 9DA520 80243500 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA524 80243504 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA528 80243508 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9DA52C 8024350C D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9DA530 80243510 24020002 */ addiu $v0, $zero, 2 -/* 9DA534 80243514 03E00008 */ jr $ra -/* 9DA538 80243518 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s new file mode 100644 index 0000000000..25b2abd51e --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80243294_9DA2B4.s @@ -0,0 +1,171 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243294_9DA2B4 +/* 9DA2B4 80243294 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 9DA2B8 80243298 AFB50024 */ sw $s5, 0x24($sp) +/* 9DA2BC 8024329C 0080A82D */ daddu $s5, $a0, $zero +/* 9DA2C0 802432A0 AFB60028 */ sw $s6, 0x28($sp) +/* 9DA2C4 802432A4 3C168011 */ lui $s6, %hi(gPlayerStatus) +/* 9DA2C8 802432A8 26D6EFC8 */ addiu $s6, $s6, %lo(gPlayerStatus) +/* 9DA2CC 802432AC AFB10014 */ sw $s1, 0x14($sp) +/* 9DA2D0 802432B0 24112710 */ addiu $s1, $zero, 0x2710 +/* 9DA2D4 802432B4 AFB40020 */ sw $s4, 0x20($sp) +/* 9DA2D8 802432B8 3C1451EB */ lui $s4, 0x51eb +/* 9DA2DC 802432BC AFBF002C */ sw $ra, 0x2c($sp) +/* 9DA2E0 802432C0 AFB3001C */ sw $s3, 0x1c($sp) +/* 9DA2E4 802432C4 AFB20018 */ sw $s2, 0x18($sp) +/* 9DA2E8 802432C8 AFB00010 */ sw $s0, 0x10($sp) +/* 9DA2EC 802432CC F7B60038 */ sdc1 $f22, 0x38($sp) +/* 9DA2F0 802432D0 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 9DA2F4 802432D4 8EB0000C */ lw $s0, 0xc($s5) +/* 9DA2F8 802432D8 3694851F */ ori $s4, $s4, 0x851f +/* 9DA2FC 802432DC 8E050000 */ lw $a1, ($s0) +/* 9DA300 802432E0 0C0B1EAF */ jal get_variable +/* 9DA304 802432E4 26100004 */ addiu $s0, $s0, 4 +/* 9DA308 802432E8 02A0202D */ daddu $a0, $s5, $zero +/* 9DA30C 802432EC 8E050000 */ lw $a1, ($s0) +/* 9DA310 802432F0 0C0B1EAF */ jal get_variable +/* 9DA314 802432F4 0040902D */ daddu $s2, $v0, $zero +/* 9DA318 802432F8 0040982D */ daddu $s3, $v0, $zero +.L802432FC: +/* 9DA31C 802432FC 0C00A67F */ jal rand_int +/* 9DA320 80243300 0220202D */ daddu $a0, $s1, $zero +/* 9DA324 80243304 001187C2 */ srl $s0, $s1, 0x1f +/* 9DA328 80243308 02308021 */ addu $s0, $s1, $s0 +/* 9DA32C 8024330C 00108043 */ sra $s0, $s0, 1 +/* 9DA330 80243310 00501023 */ subu $v0, $v0, $s0 +/* 9DA334 80243314 00540018 */ mult $v0, $s4 +/* 9DA338 80243318 0220202D */ daddu $a0, $s1, $zero +/* 9DA33C 8024331C 000217C3 */ sra $v0, $v0, 0x1f +/* 9DA340 80243320 C6420038 */ lwc1 $f2, 0x38($s2) +/* 9DA344 80243324 00003010 */ mfhi $a2 +/* 9DA348 80243328 00061943 */ sra $v1, $a2, 5 +/* 9DA34C 8024332C 00621823 */ subu $v1, $v1, $v0 +/* 9DA350 80243330 44830000 */ mtc1 $v1, $f0 +/* 9DA354 80243334 00000000 */ nop +/* 9DA358 80243338 46800020 */ cvt.s.w $f0, $f0 +/* 9DA35C 8024333C 0C00A67F */ jal rand_int +/* 9DA360 80243340 46020580 */ add.s $f22, $f0, $f2 +/* 9DA364 80243344 00501023 */ subu $v0, $v0, $s0 +/* 9DA368 80243348 00540018 */ mult $v0, $s4 +/* 9DA36C 8024334C 3C01C316 */ lui $at, 0xc316 +/* 9DA370 80243350 44810000 */ mtc1 $at, $f0 +/* 9DA374 80243354 00000000 */ nop +/* 9DA378 80243358 4600B081 */ sub.s $f2, $f22, $f0 +/* 9DA37C 8024335C 00003010 */ mfhi $a2 +/* 9DA380 80243360 000217C3 */ sra $v0, $v0, 0x1f +/* 9DA384 80243364 46021102 */ mul.s $f4, $f2, $f2 +/* 9DA388 80243368 00000000 */ nop +/* 9DA38C 8024336C 00061943 */ sra $v1, $a2, 5 +/* 9DA390 80243370 00621823 */ subu $v1, $v1, $v0 +/* 9DA394 80243374 C6420040 */ lwc1 $f2, 0x40($s2) +/* 9DA398 80243378 44830000 */ mtc1 $v1, $f0 +/* 9DA39C 8024337C 00000000 */ nop +/* 9DA3A0 80243380 46800020 */ cvt.s.w $f0, $f0 +/* 9DA3A4 80243384 46020500 */ add.s $f20, $f0, $f2 +/* 9DA3A8 80243388 3C01437A */ lui $at, 0x437a +/* 9DA3AC 8024338C 44810000 */ mtc1 $at, $f0 +/* 9DA3B0 80243390 00000000 */ nop +/* 9DA3B4 80243394 4600A001 */ sub.s $f0, $f20, $f0 +/* 9DA3B8 80243398 46000002 */ mul.s $f0, $f0, $f0 +/* 9DA3BC 8024339C 00000000 */ nop +/* 9DA3C0 802433A0 46002100 */ add.s $f4, $f4, $f0 +/* 9DA3C4 802433A4 3C0146AF */ lui $at, 0x46af +/* 9DA3C8 802433A8 3421C800 */ ori $at, $at, 0xc800 +/* 9DA3CC 802433AC 44810000 */ mtc1 $at, $f0 +/* 9DA3D0 802433B0 00000000 */ nop +/* 9DA3D4 802433B4 4600203C */ c.lt.s $f4, $f0 +/* 9DA3D8 802433B8 00000000 */ nop +/* 9DA3DC 802433BC 45000021 */ bc1f .L80243444 +/* 9DA3E0 802433C0 26311388 */ addiu $s1, $s1, 0x1388 +/* 9DA3E4 802433C4 C6C00028 */ lwc1 $f0, 0x28($s6) +/* 9DA3E8 802433C8 4600B081 */ sub.s $f2, $f22, $f0 +/* 9DA3EC 802433CC 46021082 */ mul.s $f2, $f2, $f2 +/* 9DA3F0 802433D0 00000000 */ nop +/* 9DA3F4 802433D4 C6C00030 */ lwc1 $f0, 0x30($s6) +/* 9DA3F8 802433D8 4600A001 */ sub.s $f0, $f20, $f0 +/* 9DA3FC 802433DC 46000002 */ mul.s $f0, $f0, $f0 +/* 9DA400 802433E0 00000000 */ nop +/* 9DA404 802433E4 46001080 */ add.s $f2, $f2, $f0 +/* 9DA408 802433E8 3C0145C8 */ lui $at, 0x45c8 +/* 9DA40C 802433EC 44810000 */ mtc1 $at, $f0 +/* 9DA410 802433F0 00000000 */ nop +/* 9DA414 802433F4 4602003C */ c.lt.s $f0, $f2 +/* 9DA418 802433F8 00000000 */ nop +/* 9DA41C 802433FC 45000011 */ bc1f .L80243444 +/* 9DA420 80243400 00000000 */ nop +/* 9DA424 80243404 C6600038 */ lwc1 $f0, 0x38($s3) +/* 9DA428 80243408 4600B081 */ sub.s $f2, $f22, $f0 +/* 9DA42C 8024340C 46021082 */ mul.s $f2, $f2, $f2 +/* 9DA430 80243410 00000000 */ nop +/* 9DA434 80243414 C6600040 */ lwc1 $f0, 0x40($s3) +/* 9DA438 80243418 4600A001 */ sub.s $f0, $f20, $f0 +/* 9DA43C 8024341C 46000002 */ mul.s $f0, $f0, $f0 +/* 9DA440 80243420 00000000 */ nop +/* 9DA444 80243424 46001080 */ add.s $f2, $f2, $f0 +/* 9DA448 80243428 3C0144C8 */ lui $at, 0x44c8 +/* 9DA44C 8024342C 44810000 */ mtc1 $at, $f0 +/* 9DA450 80243430 00000000 */ nop +/* 9DA454 80243434 4602003C */ c.lt.s $f0, $f2 +/* 9DA458 80243438 00000000 */ nop +/* 9DA45C 8024343C 45010006 */ bc1t .L80243458 +/* 9DA460 80243440 00000000 */ nop +.L80243444: +/* 9DA464 80243444 2A227531 */ slti $v0, $s1, 0x7531 +/* 9DA468 80243448 5040FFAC */ beql $v0, $zero, .L802432FC +/* 9DA46C 8024344C 24117530 */ addiu $s1, $zero, 0x7530 +/* 9DA470 80243450 08090CBF */ j .L802432FC +/* 9DA474 80243454 00000000 */ nop +.L80243458: +/* 9DA478 80243458 C6400038 */ lwc1 $f0, 0x38($s2) +/* 9DA47C 8024345C 4600B081 */ sub.s $f2, $f22, $f0 +/* 9DA480 80243460 46021082 */ mul.s $f2, $f2, $f2 +/* 9DA484 80243464 00000000 */ nop +/* 9DA488 80243468 C6400040 */ lwc1 $f0, 0x40($s2) +/* 9DA48C 8024346C 4600A001 */ sub.s $f0, $f20, $f0 +/* 9DA490 80243470 46000002 */ mul.s $f0, $f0, $f0 +/* 9DA494 80243474 00000000 */ nop +/* 9DA498 80243478 46001300 */ add.s $f12, $f2, $f0 +/* 9DA49C 8024347C 44800000 */ mtc1 $zero, $f0 +/* 9DA4A0 80243480 00000000 */ nop +/* 9DA4A4 80243484 46006032 */ c.eq.s $f12, $f0 +/* 9DA4A8 80243488 00000000 */ nop +/* 9DA4AC 8024348C 4501000D */ bc1t .L802434C4 +/* 9DA4B0 80243490 00000000 */ nop +/* 9DA4B4 80243494 46006104 */ sqrt.s $f4, $f12 +/* 9DA4B8 80243498 46042032 */ c.eq.s $f4, $f4 +/* 9DA4BC 8024349C 00000000 */ nop +/* 9DA4C0 802434A0 45010004 */ bc1t .L802434B4 +/* 9DA4C4 802434A4 00000000 */ nop +/* 9DA4C8 802434A8 0C0187BC */ jal sqrtf +/* 9DA4CC 802434AC 00000000 */ nop +/* 9DA4D0 802434B0 46000106 */ mov.s $f4, $f0 +.L802434B4: +/* 9DA4D4 802434B4 3C014120 */ lui $at, 0x4120 +/* 9DA4D8 802434B8 44810000 */ mtc1 $at, $f0 +/* 9DA4DC 802434BC 00000000 */ nop +/* 9DA4E0 802434C0 46002303 */ div.s $f12, $f4, $f0 +.L802434C4: +/* 9DA4E4 802434C4 4600B18D */ trunc.w.s $f6, $f22 +/* 9DA4E8 802434C8 E6A600AC */ swc1 $f6, 0xac($s5) +/* 9DA4EC 802434CC 4600A18D */ trunc.w.s $f6, $f20 +/* 9DA4F0 802434D0 E6A600B0 */ swc1 $f6, 0xb0($s5) +/* 9DA4F4 802434D4 4600618D */ trunc.w.s $f6, $f12 +/* 9DA4F8 802434D8 44023000 */ mfc1 $v0, $f6 +/* 9DA4FC 802434DC 00000000 */ nop +/* 9DA500 802434E0 24420001 */ addiu $v0, $v0, 1 +/* 9DA504 802434E4 AEA200B4 */ sw $v0, 0xb4($s5) +/* 9DA508 802434E8 8FBF002C */ lw $ra, 0x2c($sp) +/* 9DA50C 802434EC 8FB60028 */ lw $s6, 0x28($sp) +/* 9DA510 802434F0 8FB50024 */ lw $s5, 0x24($sp) +/* 9DA514 802434F4 8FB40020 */ lw $s4, 0x20($sp) +/* 9DA518 802434F8 8FB3001C */ lw $s3, 0x1c($sp) +/* 9DA51C 802434FC 8FB20018 */ lw $s2, 0x18($sp) +/* 9DA520 80243500 8FB10014 */ lw $s1, 0x14($sp) +/* 9DA524 80243504 8FB00010 */ lw $s0, 0x10($sp) +/* 9DA528 80243508 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 9DA52C 8024350C D7B40030 */ ldc1 $f20, 0x30($sp) +/* 9DA530 80243510 24020002 */ addiu $v0, $zero, 2 +/* 9DA534 80243514 03E00008 */ jr $ra +/* 9DA538 80243518 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C.s deleted file mode 100644 index 0ecc5a912d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C.s +++ /dev/null @@ -1,151 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024351C -/* 9DA53C 8024351C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 9DA540 80243520 AFB50024 */ sw $s5, 0x24($sp) -/* 9DA544 80243524 0080A82D */ daddu $s5, $a0, $zero -/* 9DA548 80243528 AFB40020 */ sw $s4, 0x20($sp) -/* 9DA54C 8024352C 3C148011 */ lui $s4, %hi(gPlayerStatus) -/* 9DA550 80243530 2694EFC8 */ addiu $s4, $s4, %lo(gPlayerStatus) -/* 9DA554 80243534 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA558 80243538 24112710 */ addiu $s1, $zero, 0x2710 -/* 9DA55C 8024353C AFB3001C */ sw $s3, 0x1c($sp) -/* 9DA560 80243540 3C1351EB */ lui $s3, 0x51eb -/* 9DA564 80243544 F7BC0050 */ sdc1 $f28, 0x50($sp) -/* 9DA568 80243548 3C01C316 */ lui $at, 0xc316 -/* 9DA56C 8024354C 4481E000 */ mtc1 $at, $f28 -/* 9DA570 80243550 AFBF0028 */ sw $ra, 0x28($sp) -/* 9DA574 80243554 AFB20018 */ sw $s2, 0x18($sp) -/* 9DA578 80243558 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA57C 8024355C F7BA0048 */ sdc1 $f26, 0x48($sp) -/* 9DA580 80243560 F7B80040 */ sdc1 $f24, 0x40($sp) -/* 9DA584 80243564 F7B60038 */ sdc1 $f22, 0x38($sp) -/* 9DA588 80243568 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9DA58C 8024356C 8EA2000C */ lw $v0, 0xc($s5) -/* 9DA590 80243570 3C01437A */ lui $at, 0x437a -/* 9DA594 80243574 4481D000 */ mtc1 $at, $f26 -/* 9DA598 80243578 8C450000 */ lw $a1, ($v0) -/* 9DA59C 8024357C 3C0146AF */ lui $at, 0x46af -/* 9DA5A0 80243580 3421C800 */ ori $at, $at, 0xc800 -/* 9DA5A4 80243584 4481C000 */ mtc1 $at, $f24 -/* 9DA5A8 80243588 0C0B1EAF */ jal get_variable -/* 9DA5AC 8024358C 3673851F */ ori $s3, $s3, 0x851f -/* 9DA5B0 80243590 0040902D */ daddu $s2, $v0, $zero -.L80243594: -/* 9DA5B4 80243594 0C00A67F */ jal rand_int -/* 9DA5B8 80243598 0220202D */ daddu $a0, $s1, $zero -/* 9DA5BC 8024359C 001187C2 */ srl $s0, $s1, 0x1f -/* 9DA5C0 802435A0 02308021 */ addu $s0, $s1, $s0 -/* 9DA5C4 802435A4 00108043 */ sra $s0, $s0, 1 -/* 9DA5C8 802435A8 00501023 */ subu $v0, $v0, $s0 -/* 9DA5CC 802435AC 00530018 */ mult $v0, $s3 -/* 9DA5D0 802435B0 0220202D */ daddu $a0, $s1, $zero -/* 9DA5D4 802435B4 000217C3 */ sra $v0, $v0, 0x1f -/* 9DA5D8 802435B8 C6420038 */ lwc1 $f2, 0x38($s2) -/* 9DA5DC 802435BC 00003010 */ mfhi $a2 -/* 9DA5E0 802435C0 00061943 */ sra $v1, $a2, 5 -/* 9DA5E4 802435C4 00621823 */ subu $v1, $v1, $v0 -/* 9DA5E8 802435C8 44830000 */ mtc1 $v1, $f0 -/* 9DA5EC 802435CC 00000000 */ nop -/* 9DA5F0 802435D0 46800020 */ cvt.s.w $f0, $f0 -/* 9DA5F4 802435D4 0C00A67F */ jal rand_int -/* 9DA5F8 802435D8 46020580 */ add.s $f22, $f0, $f2 -/* 9DA5FC 802435DC 00501023 */ subu $v0, $v0, $s0 -/* 9DA600 802435E0 00530018 */ mult $v0, $s3 -/* 9DA604 802435E4 461CB081 */ sub.s $f2, $f22, $f28 -/* 9DA608 802435E8 00003010 */ mfhi $a2 -/* 9DA60C 802435EC 000217C3 */ sra $v0, $v0, 0x1f -/* 9DA610 802435F0 46021102 */ mul.s $f4, $f2, $f2 -/* 9DA614 802435F4 00000000 */ nop -/* 9DA618 802435F8 00061943 */ sra $v1, $a2, 5 -/* 9DA61C 802435FC 00621823 */ subu $v1, $v1, $v0 -/* 9DA620 80243600 C6420040 */ lwc1 $f2, 0x40($s2) -/* 9DA624 80243604 44830000 */ mtc1 $v1, $f0 -/* 9DA628 80243608 00000000 */ nop -/* 9DA62C 8024360C 46800020 */ cvt.s.w $f0, $f0 -/* 9DA630 80243610 46020500 */ add.s $f20, $f0, $f2 -/* 9DA634 80243614 461AA001 */ sub.s $f0, $f20, $f26 -/* 9DA638 80243618 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA63C 8024361C 00000000 */ nop -/* 9DA640 80243620 46002100 */ add.s $f4, $f4, $f0 -/* 9DA644 80243624 4618203C */ c.lt.s $f4, $f24 -/* 9DA648 80243628 00000000 */ nop -/* 9DA64C 8024362C 45000011 */ bc1f .L80243674 -/* 9DA650 80243630 26311388 */ addiu $s1, $s1, 0x1388 -/* 9DA654 80243634 C6800028 */ lwc1 $f0, 0x28($s4) -/* 9DA658 80243638 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA65C 8024363C 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA660 80243640 00000000 */ nop -/* 9DA664 80243644 C6800030 */ lwc1 $f0, 0x30($s4) -/* 9DA668 80243648 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA66C 8024364C 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA670 80243650 00000000 */ nop -/* 9DA674 80243654 46001080 */ add.s $f2, $f2, $f0 -/* 9DA678 80243658 3C0145C8 */ lui $at, 0x45c8 -/* 9DA67C 8024365C 44810000 */ mtc1 $at, $f0 -/* 9DA680 80243660 00000000 */ nop -/* 9DA684 80243664 4602003C */ c.lt.s $f0, $f2 -/* 9DA688 80243668 00000000 */ nop -/* 9DA68C 8024366C 45010006 */ bc1t .L80243688 -/* 9DA690 80243670 00000000 */ nop -.L80243674: -/* 9DA694 80243674 2A227531 */ slti $v0, $s1, 0x7531 -/* 9DA698 80243678 5040FFC6 */ beql $v0, $zero, .L80243594 -/* 9DA69C 8024367C 24117530 */ addiu $s1, $zero, 0x7530 -/* 9DA6A0 80243680 08090D65 */ j .L80243594 -/* 9DA6A4 80243684 00000000 */ nop -.L80243688: -/* 9DA6A8 80243688 C6400038 */ lwc1 $f0, 0x38($s2) -/* 9DA6AC 8024368C 4600B081 */ sub.s $f2, $f22, $f0 -/* 9DA6B0 80243690 46021082 */ mul.s $f2, $f2, $f2 -/* 9DA6B4 80243694 00000000 */ nop -/* 9DA6B8 80243698 C6400040 */ lwc1 $f0, 0x40($s2) -/* 9DA6BC 8024369C 4600A001 */ sub.s $f0, $f20, $f0 -/* 9DA6C0 802436A0 46000002 */ mul.s $f0, $f0, $f0 -/* 9DA6C4 802436A4 00000000 */ nop -/* 9DA6C8 802436A8 46001300 */ add.s $f12, $f2, $f0 -/* 9DA6CC 802436AC 44800000 */ mtc1 $zero, $f0 -/* 9DA6D0 802436B0 00000000 */ nop -/* 9DA6D4 802436B4 46006032 */ c.eq.s $f12, $f0 -/* 9DA6D8 802436B8 00000000 */ nop -/* 9DA6DC 802436BC 4501000D */ bc1t .L802436F4 -/* 9DA6E0 802436C0 00000000 */ nop -/* 9DA6E4 802436C4 46006104 */ sqrt.s $f4, $f12 -/* 9DA6E8 802436C8 46042032 */ c.eq.s $f4, $f4 -/* 9DA6EC 802436CC 00000000 */ nop -/* 9DA6F0 802436D0 45010004 */ bc1t .L802436E4 -/* 9DA6F4 802436D4 00000000 */ nop -/* 9DA6F8 802436D8 0C0187BC */ jal sqrtf -/* 9DA6FC 802436DC 00000000 */ nop -/* 9DA700 802436E0 46000106 */ mov.s $f4, $f0 -.L802436E4: -/* 9DA704 802436E4 3C014120 */ lui $at, 0x4120 -/* 9DA708 802436E8 44810000 */ mtc1 $at, $f0 -/* 9DA70C 802436EC 00000000 */ nop -/* 9DA710 802436F0 46002303 */ div.s $f12, $f4, $f0 -.L802436F4: -/* 9DA714 802436F4 4600B18D */ trunc.w.s $f6, $f22 -/* 9DA718 802436F8 E6A600AC */ swc1 $f6, 0xac($s5) -/* 9DA71C 802436FC 4600A18D */ trunc.w.s $f6, $f20 -/* 9DA720 80243700 E6A600B0 */ swc1 $f6, 0xb0($s5) -/* 9DA724 80243704 4600618D */ trunc.w.s $f6, $f12 -/* 9DA728 80243708 44023000 */ mfc1 $v0, $f6 -/* 9DA72C 8024370C 00000000 */ nop -/* 9DA730 80243710 24420001 */ addiu $v0, $v0, 1 -/* 9DA734 80243714 AEA200B4 */ sw $v0, 0xb4($s5) -/* 9DA738 80243718 8FBF0028 */ lw $ra, 0x28($sp) -/* 9DA73C 8024371C 8FB50024 */ lw $s5, 0x24($sp) -/* 9DA740 80243720 8FB40020 */ lw $s4, 0x20($sp) -/* 9DA744 80243724 8FB3001C */ lw $s3, 0x1c($sp) -/* 9DA748 80243728 8FB20018 */ lw $s2, 0x18($sp) -/* 9DA74C 8024372C 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA750 80243730 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA754 80243734 D7BC0050 */ ldc1 $f28, 0x50($sp) -/* 9DA758 80243738 D7BA0048 */ ldc1 $f26, 0x48($sp) -/* 9DA75C 8024373C D7B80040 */ ldc1 $f24, 0x40($sp) -/* 9DA760 80243740 D7B60038 */ ldc1 $f22, 0x38($sp) -/* 9DA764 80243744 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9DA768 80243748 24020002 */ addiu $v0, $zero, 2 -/* 9DA76C 8024374C 03E00008 */ jr $ra -/* 9DA770 80243750 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s new file mode 100644 index 0000000000..63a442a8b0 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024351C_9DA53C.s @@ -0,0 +1,151 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024351C_9DA53C +/* 9DA53C 8024351C 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* 9DA540 80243520 AFB50024 */ sw $s5, 0x24($sp) +/* 9DA544 80243524 0080A82D */ daddu $s5, $a0, $zero +/* 9DA548 80243528 AFB40020 */ sw $s4, 0x20($sp) +/* 9DA54C 8024352C 3C148011 */ lui $s4, %hi(gPlayerStatus) +/* 9DA550 80243530 2694EFC8 */ addiu $s4, $s4, %lo(gPlayerStatus) +/* 9DA554 80243534 AFB10014 */ sw $s1, 0x14($sp) +/* 9DA558 80243538 24112710 */ addiu $s1, $zero, 0x2710 +/* 9DA55C 8024353C AFB3001C */ sw $s3, 0x1c($sp) +/* 9DA560 80243540 3C1351EB */ lui $s3, 0x51eb +/* 9DA564 80243544 F7BC0050 */ sdc1 $f28, 0x50($sp) +/* 9DA568 80243548 3C01C316 */ lui $at, 0xc316 +/* 9DA56C 8024354C 4481E000 */ mtc1 $at, $f28 +/* 9DA570 80243550 AFBF0028 */ sw $ra, 0x28($sp) +/* 9DA574 80243554 AFB20018 */ sw $s2, 0x18($sp) +/* 9DA578 80243558 AFB00010 */ sw $s0, 0x10($sp) +/* 9DA57C 8024355C F7BA0048 */ sdc1 $f26, 0x48($sp) +/* 9DA580 80243560 F7B80040 */ sdc1 $f24, 0x40($sp) +/* 9DA584 80243564 F7B60038 */ sdc1 $f22, 0x38($sp) +/* 9DA588 80243568 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 9DA58C 8024356C 8EA2000C */ lw $v0, 0xc($s5) +/* 9DA590 80243570 3C01437A */ lui $at, 0x437a +/* 9DA594 80243574 4481D000 */ mtc1 $at, $f26 +/* 9DA598 80243578 8C450000 */ lw $a1, ($v0) +/* 9DA59C 8024357C 3C0146AF */ lui $at, 0x46af +/* 9DA5A0 80243580 3421C800 */ ori $at, $at, 0xc800 +/* 9DA5A4 80243584 4481C000 */ mtc1 $at, $f24 +/* 9DA5A8 80243588 0C0B1EAF */ jal get_variable +/* 9DA5AC 8024358C 3673851F */ ori $s3, $s3, 0x851f +/* 9DA5B0 80243590 0040902D */ daddu $s2, $v0, $zero +.L80243594: +/* 9DA5B4 80243594 0C00A67F */ jal rand_int +/* 9DA5B8 80243598 0220202D */ daddu $a0, $s1, $zero +/* 9DA5BC 8024359C 001187C2 */ srl $s0, $s1, 0x1f +/* 9DA5C0 802435A0 02308021 */ addu $s0, $s1, $s0 +/* 9DA5C4 802435A4 00108043 */ sra $s0, $s0, 1 +/* 9DA5C8 802435A8 00501023 */ subu $v0, $v0, $s0 +/* 9DA5CC 802435AC 00530018 */ mult $v0, $s3 +/* 9DA5D0 802435B0 0220202D */ daddu $a0, $s1, $zero +/* 9DA5D4 802435B4 000217C3 */ sra $v0, $v0, 0x1f +/* 9DA5D8 802435B8 C6420038 */ lwc1 $f2, 0x38($s2) +/* 9DA5DC 802435BC 00003010 */ mfhi $a2 +/* 9DA5E0 802435C0 00061943 */ sra $v1, $a2, 5 +/* 9DA5E4 802435C4 00621823 */ subu $v1, $v1, $v0 +/* 9DA5E8 802435C8 44830000 */ mtc1 $v1, $f0 +/* 9DA5EC 802435CC 00000000 */ nop +/* 9DA5F0 802435D0 46800020 */ cvt.s.w $f0, $f0 +/* 9DA5F4 802435D4 0C00A67F */ jal rand_int +/* 9DA5F8 802435D8 46020580 */ add.s $f22, $f0, $f2 +/* 9DA5FC 802435DC 00501023 */ subu $v0, $v0, $s0 +/* 9DA600 802435E0 00530018 */ mult $v0, $s3 +/* 9DA604 802435E4 461CB081 */ sub.s $f2, $f22, $f28 +/* 9DA608 802435E8 00003010 */ mfhi $a2 +/* 9DA60C 802435EC 000217C3 */ sra $v0, $v0, 0x1f +/* 9DA610 802435F0 46021102 */ mul.s $f4, $f2, $f2 +/* 9DA614 802435F4 00000000 */ nop +/* 9DA618 802435F8 00061943 */ sra $v1, $a2, 5 +/* 9DA61C 802435FC 00621823 */ subu $v1, $v1, $v0 +/* 9DA620 80243600 C6420040 */ lwc1 $f2, 0x40($s2) +/* 9DA624 80243604 44830000 */ mtc1 $v1, $f0 +/* 9DA628 80243608 00000000 */ nop +/* 9DA62C 8024360C 46800020 */ cvt.s.w $f0, $f0 +/* 9DA630 80243610 46020500 */ add.s $f20, $f0, $f2 +/* 9DA634 80243614 461AA001 */ sub.s $f0, $f20, $f26 +/* 9DA638 80243618 46000002 */ mul.s $f0, $f0, $f0 +/* 9DA63C 8024361C 00000000 */ nop +/* 9DA640 80243620 46002100 */ add.s $f4, $f4, $f0 +/* 9DA644 80243624 4618203C */ c.lt.s $f4, $f24 +/* 9DA648 80243628 00000000 */ nop +/* 9DA64C 8024362C 45000011 */ bc1f .L80243674 +/* 9DA650 80243630 26311388 */ addiu $s1, $s1, 0x1388 +/* 9DA654 80243634 C6800028 */ lwc1 $f0, 0x28($s4) +/* 9DA658 80243638 4600B081 */ sub.s $f2, $f22, $f0 +/* 9DA65C 8024363C 46021082 */ mul.s $f2, $f2, $f2 +/* 9DA660 80243640 00000000 */ nop +/* 9DA664 80243644 C6800030 */ lwc1 $f0, 0x30($s4) +/* 9DA668 80243648 4600A001 */ sub.s $f0, $f20, $f0 +/* 9DA66C 8024364C 46000002 */ mul.s $f0, $f0, $f0 +/* 9DA670 80243650 00000000 */ nop +/* 9DA674 80243654 46001080 */ add.s $f2, $f2, $f0 +/* 9DA678 80243658 3C0145C8 */ lui $at, 0x45c8 +/* 9DA67C 8024365C 44810000 */ mtc1 $at, $f0 +/* 9DA680 80243660 00000000 */ nop +/* 9DA684 80243664 4602003C */ c.lt.s $f0, $f2 +/* 9DA688 80243668 00000000 */ nop +/* 9DA68C 8024366C 45010006 */ bc1t .L80243688 +/* 9DA690 80243670 00000000 */ nop +.L80243674: +/* 9DA694 80243674 2A227531 */ slti $v0, $s1, 0x7531 +/* 9DA698 80243678 5040FFC6 */ beql $v0, $zero, .L80243594 +/* 9DA69C 8024367C 24117530 */ addiu $s1, $zero, 0x7530 +/* 9DA6A0 80243680 08090D65 */ j .L80243594 +/* 9DA6A4 80243684 00000000 */ nop +.L80243688: +/* 9DA6A8 80243688 C6400038 */ lwc1 $f0, 0x38($s2) +/* 9DA6AC 8024368C 4600B081 */ sub.s $f2, $f22, $f0 +/* 9DA6B0 80243690 46021082 */ mul.s $f2, $f2, $f2 +/* 9DA6B4 80243694 00000000 */ nop +/* 9DA6B8 80243698 C6400040 */ lwc1 $f0, 0x40($s2) +/* 9DA6BC 8024369C 4600A001 */ sub.s $f0, $f20, $f0 +/* 9DA6C0 802436A0 46000002 */ mul.s $f0, $f0, $f0 +/* 9DA6C4 802436A4 00000000 */ nop +/* 9DA6C8 802436A8 46001300 */ add.s $f12, $f2, $f0 +/* 9DA6CC 802436AC 44800000 */ mtc1 $zero, $f0 +/* 9DA6D0 802436B0 00000000 */ nop +/* 9DA6D4 802436B4 46006032 */ c.eq.s $f12, $f0 +/* 9DA6D8 802436B8 00000000 */ nop +/* 9DA6DC 802436BC 4501000D */ bc1t .L802436F4 +/* 9DA6E0 802436C0 00000000 */ nop +/* 9DA6E4 802436C4 46006104 */ sqrt.s $f4, $f12 +/* 9DA6E8 802436C8 46042032 */ c.eq.s $f4, $f4 +/* 9DA6EC 802436CC 00000000 */ nop +/* 9DA6F0 802436D0 45010004 */ bc1t .L802436E4 +/* 9DA6F4 802436D4 00000000 */ nop +/* 9DA6F8 802436D8 0C0187BC */ jal sqrtf +/* 9DA6FC 802436DC 00000000 */ nop +/* 9DA700 802436E0 46000106 */ mov.s $f4, $f0 +.L802436E4: +/* 9DA704 802436E4 3C014120 */ lui $at, 0x4120 +/* 9DA708 802436E8 44810000 */ mtc1 $at, $f0 +/* 9DA70C 802436EC 00000000 */ nop +/* 9DA710 802436F0 46002303 */ div.s $f12, $f4, $f0 +.L802436F4: +/* 9DA714 802436F4 4600B18D */ trunc.w.s $f6, $f22 +/* 9DA718 802436F8 E6A600AC */ swc1 $f6, 0xac($s5) +/* 9DA71C 802436FC 4600A18D */ trunc.w.s $f6, $f20 +/* 9DA720 80243700 E6A600B0 */ swc1 $f6, 0xb0($s5) +/* 9DA724 80243704 4600618D */ trunc.w.s $f6, $f12 +/* 9DA728 80243708 44023000 */ mfc1 $v0, $f6 +/* 9DA72C 8024370C 00000000 */ nop +/* 9DA730 80243710 24420001 */ addiu $v0, $v0, 1 +/* 9DA734 80243714 AEA200B4 */ sw $v0, 0xb4($s5) +/* 9DA738 80243718 8FBF0028 */ lw $ra, 0x28($sp) +/* 9DA73C 8024371C 8FB50024 */ lw $s5, 0x24($sp) +/* 9DA740 80243720 8FB40020 */ lw $s4, 0x20($sp) +/* 9DA744 80243724 8FB3001C */ lw $s3, 0x1c($sp) +/* 9DA748 80243728 8FB20018 */ lw $s2, 0x18($sp) +/* 9DA74C 8024372C 8FB10014 */ lw $s1, 0x14($sp) +/* 9DA750 80243730 8FB00010 */ lw $s0, 0x10($sp) +/* 9DA754 80243734 D7BC0050 */ ldc1 $f28, 0x50($sp) +/* 9DA758 80243738 D7BA0048 */ ldc1 $f26, 0x48($sp) +/* 9DA75C 8024373C D7B80040 */ ldc1 $f24, 0x40($sp) +/* 9DA760 80243740 D7B60038 */ ldc1 $f22, 0x38($sp) +/* 9DA764 80243744 D7B40030 */ ldc1 $f20, 0x30($sp) +/* 9DA768 80243748 24020002 */ addiu $v0, $zero, 2 +/* 9DA76C 8024374C 03E00008 */ jr $ra +/* 9DA770 80243750 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0.s deleted file mode 100644 index 7618a5f8df..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802438D0 -/* 9DA8F0 802438D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9DA8F4 802438D4 3C048025 */ lui $a0, 0x8025 -/* 9DA8F8 802438D8 248423B4 */ addiu $a0, $a0, 0x23b4 -/* 9DA8FC 802438DC AFBF0018 */ sw $ra, 0x18($sp) -/* 9DA900 802438E0 AFB10014 */ sw $s1, 0x14($sp) -/* 9DA904 802438E4 AFB00010 */ sw $s0, 0x10($sp) -/* 9DA908 802438E8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9DA90C 802438EC 8C830000 */ lw $v1, ($a0) -/* 9DA910 802438F0 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 9DA914 802438F4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 9DA918 802438F8 28620003 */ slti $v0, $v1, 3 -/* 9DA91C 802438FC 50400007 */ beql $v0, $zero, .L8024391C -/* 9DA920 80243900 24020003 */ addiu $v0, $zero, 3 -/* 9DA924 80243904 1C60000C */ bgtz $v1, .L80243938 -/* 9DA928 80243908 24620001 */ addiu $v0, $v1, 1 -/* 9DA92C 8024390C 10600007 */ beqz $v1, .L8024392C -/* 9DA930 80243910 0000102D */ daddu $v0, $zero, $zero -/* 9DA934 80243914 08090E6A */ j .L802439A8 -/* 9DA938 80243918 00000000 */ nop -.L8024391C: -/* 9DA93C 8024391C 10620008 */ beq $v1, $v0, .L80243940 -/* 9DA940 80243920 0000102D */ daddu $v0, $zero, $zero -/* 9DA944 80243924 08090E6A */ j .L802439A8 -/* 9DA948 80243928 00000000 */ nop -.L8024392C: -/* 9DA94C 8024392C 24020001 */ addiu $v0, $zero, 1 -/* 9DA950 80243930 08090E69 */ j .L802439A4 -/* 9DA954 80243934 AC820000 */ sw $v0, ($a0) -.L80243938: -/* 9DA958 80243938 08090E69 */ j .L802439A4 -/* 9DA95C 8024393C AC820000 */ sw $v0, ($a0) -.L80243940: -/* 9DA960 80243940 3C108011 */ lui $s0, 0x8011 -/* 9DA964 80243944 2610C930 */ addiu $s0, $s0, -0x36d0 -/* 9DA968 80243948 0C03BD17 */ jal clear_partner_move_history -/* 9DA96C 8024394C 8E040000 */ lw $a0, ($s0) -/* 9DA970 80243950 C6200028 */ lwc1 $f0, 0x28($s1) -/* 9DA974 80243954 C6220030 */ lwc1 $f2, 0x30($s1) -/* 9DA978 80243958 4600010D */ trunc.w.s $f4, $f0 -/* 9DA97C 8024395C 44042000 */ mfc1 $a0, $f4 -/* 9DA980 80243960 4600110D */ trunc.w.s $f4, $f2 -/* 9DA984 80243964 44052000 */ mfc1 $a1, $f4 -/* 9DA988 80243968 0C03BCF0 */ jal func_800EF3C0 -/* 9DA98C 8024396C 00000000 */ nop -/* 9DA990 80243970 0C03BCF5 */ jal func_800EF3D4 -/* 9DA994 80243974 0000202D */ daddu $a0, $zero, $zero -/* 9DA998 80243978 3C0142B4 */ lui $at, 0x42b4 -/* 9DA99C 8024397C 4481A000 */ mtc1 $at, $f20 -/* 9DA9A0 80243980 8E040000 */ lw $a0, ($s0) -/* 9DA9A4 80243984 4405A000 */ mfc1 $a1, $f20 -/* 9DA9A8 80243988 0C00ECD0 */ jal set_npc_yaw -/* 9DA9AC 8024398C 00000000 */ nop -/* 9DA9B0 80243990 24020002 */ addiu $v0, $zero, 2 -/* 9DA9B4 80243994 E6340080 */ swc1 $f20, 0x80($s1) -/* 9DA9B8 80243998 E6340084 */ swc1 $f20, 0x84($s1) -/* 9DA9BC 8024399C 08090E6A */ j .L802439A8 -/* 9DA9C0 802439A0 AE2000A8 */ sw $zero, 0xa8($s1) -.L802439A4: -/* 9DA9C4 802439A4 0000102D */ daddu $v0, $zero, $zero -.L802439A8: -/* 9DA9C8 802439A8 8FBF0018 */ lw $ra, 0x18($sp) -/* 9DA9CC 802439AC 8FB10014 */ lw $s1, 0x14($sp) -/* 9DA9D0 802439B0 8FB00010 */ lw $s0, 0x10($sp) -/* 9DA9D4 802439B4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9DA9D8 802439B8 03E00008 */ jr $ra -/* 9DA9DC 802439BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s new file mode 100644 index 0000000000..eeddc41f91 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802438D0_9DA8F0.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802438D0_9DA8F0 +/* 9DA8F0 802438D0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9DA8F4 802438D4 3C048025 */ lui $a0, 0x8025 +/* 9DA8F8 802438D8 248423B4 */ addiu $a0, $a0, 0x23b4 +/* 9DA8FC 802438DC AFBF0018 */ sw $ra, 0x18($sp) +/* 9DA900 802438E0 AFB10014 */ sw $s1, 0x14($sp) +/* 9DA904 802438E4 AFB00010 */ sw $s0, 0x10($sp) +/* 9DA908 802438E8 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 9DA90C 802438EC 8C830000 */ lw $v1, ($a0) +/* 9DA910 802438F0 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* 9DA914 802438F4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* 9DA918 802438F8 28620003 */ slti $v0, $v1, 3 +/* 9DA91C 802438FC 50400007 */ beql $v0, $zero, .L8024391C +/* 9DA920 80243900 24020003 */ addiu $v0, $zero, 3 +/* 9DA924 80243904 1C60000C */ bgtz $v1, .L80243938 +/* 9DA928 80243908 24620001 */ addiu $v0, $v1, 1 +/* 9DA92C 8024390C 10600007 */ beqz $v1, .L8024392C +/* 9DA930 80243910 0000102D */ daddu $v0, $zero, $zero +/* 9DA934 80243914 08090E6A */ j .L802439A8 +/* 9DA938 80243918 00000000 */ nop +.L8024391C: +/* 9DA93C 8024391C 10620008 */ beq $v1, $v0, .L80243940 +/* 9DA940 80243920 0000102D */ daddu $v0, $zero, $zero +/* 9DA944 80243924 08090E6A */ j .L802439A8 +/* 9DA948 80243928 00000000 */ nop +.L8024392C: +/* 9DA94C 8024392C 24020001 */ addiu $v0, $zero, 1 +/* 9DA950 80243930 08090E69 */ j .L802439A4 +/* 9DA954 80243934 AC820000 */ sw $v0, ($a0) +.L80243938: +/* 9DA958 80243938 08090E69 */ j .L802439A4 +/* 9DA95C 8024393C AC820000 */ sw $v0, ($a0) +.L80243940: +/* 9DA960 80243940 3C108011 */ lui $s0, 0x8011 +/* 9DA964 80243944 2610C930 */ addiu $s0, $s0, -0x36d0 +/* 9DA968 80243948 0C03BD17 */ jal clear_partner_move_history +/* 9DA96C 8024394C 8E040000 */ lw $a0, ($s0) +/* 9DA970 80243950 C6200028 */ lwc1 $f0, 0x28($s1) +/* 9DA974 80243954 C6220030 */ lwc1 $f2, 0x30($s1) +/* 9DA978 80243958 4600010D */ trunc.w.s $f4, $f0 +/* 9DA97C 8024395C 44042000 */ mfc1 $a0, $f4 +/* 9DA980 80243960 4600110D */ trunc.w.s $f4, $f2 +/* 9DA984 80243964 44052000 */ mfc1 $a1, $f4 +/* 9DA988 80243968 0C03BCF0 */ jal func_800EF3C0 +/* 9DA98C 8024396C 00000000 */ nop +/* 9DA990 80243970 0C03BCF5 */ jal func_800EF3D4 +/* 9DA994 80243974 0000202D */ daddu $a0, $zero, $zero +/* 9DA998 80243978 3C0142B4 */ lui $at, 0x42b4 +/* 9DA99C 8024397C 4481A000 */ mtc1 $at, $f20 +/* 9DA9A0 80243980 8E040000 */ lw $a0, ($s0) +/* 9DA9A4 80243984 4405A000 */ mfc1 $a1, $f20 +/* 9DA9A8 80243988 0C00ECD0 */ jal set_npc_yaw +/* 9DA9AC 8024398C 00000000 */ nop +/* 9DA9B0 80243990 24020002 */ addiu $v0, $zero, 2 +/* 9DA9B4 80243994 E6340080 */ swc1 $f20, 0x80($s1) +/* 9DA9B8 80243998 E6340084 */ swc1 $f20, 0x84($s1) +/* 9DA9BC 8024399C 08090E6A */ j .L802439A8 +/* 9DA9C0 802439A0 AE2000A8 */ sw $zero, 0xa8($s1) +.L802439A4: +/* 9DA9C4 802439A4 0000102D */ daddu $v0, $zero, $zero +.L802439A8: +/* 9DA9C8 802439A8 8FBF0018 */ lw $ra, 0x18($sp) +/* 9DA9CC 802439AC 8FB10014 */ lw $s1, 0x14($sp) +/* 9DA9D0 802439B0 8FB00010 */ lw $s0, 0x10($sp) +/* 9DA9D4 802439B4 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 9DA9D8 802439B8 03E00008 */ jr $ra +/* 9DA9DC 802439BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC.s deleted file mode 100644 index 8b2467782e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243BEC -/* 9DAC0C 80243BEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DAC10 80243BF0 AFBF0010 */ sw $ra, 0x10($sp) -/* 9DAC14 80243BF4 10A00003 */ beqz $a1, .L80243C04 -/* 9DAC18 80243BF8 8C86000C */ lw $a2, 0xc($a0) -/* 9DAC1C 80243BFC 3C018025 */ lui $at, 0x8025 -/* 9DAC20 80243C00 AC202400 */ sw $zero, 0x2400($at) -.L80243C04: -/* 9DAC24 80243C04 3C038025 */ lui $v1, 0x8025 -/* 9DAC28 80243C08 24632400 */ addiu $v1, $v1, 0x2400 -/* 9DAC2C 80243C0C 8C620000 */ lw $v0, ($v1) -/* 9DAC30 80243C10 54400003 */ bnel $v0, $zero, .L80243C20 -/* 9DAC34 80243C14 AC600000 */ sw $zero, ($v1) -/* 9DAC38 80243C18 08090F0D */ j .L80243C34 -/* 9DAC3C 80243C1C 0000102D */ daddu $v0, $zero, $zero -.L80243C20: -/* 9DAC40 80243C20 8CC50000 */ lw $a1, ($a2) -/* 9DAC44 80243C24 3C068025 */ lui $a2, 0x8025 -/* 9DAC48 80243C28 0C0B2026 */ jal set_variable -/* 9DAC4C 80243C2C 8CC62404 */ lw $a2, 0x2404($a2) -/* 9DAC50 80243C30 24020002 */ addiu $v0, $zero, 2 -.L80243C34: -/* 9DAC54 80243C34 8FBF0010 */ lw $ra, 0x10($sp) -/* 9DAC58 80243C38 03E00008 */ jr $ra -/* 9DAC5C 80243C3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s new file mode 100644 index 0000000000..012e104a4f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243BEC_9DAC0C.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243BEC_9DAC0C +/* 9DAC0C 80243BEC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9DAC10 80243BF0 AFBF0010 */ sw $ra, 0x10($sp) +/* 9DAC14 80243BF4 10A00003 */ beqz $a1, .L80243C04 +/* 9DAC18 80243BF8 8C86000C */ lw $a2, 0xc($a0) +/* 9DAC1C 80243BFC 3C018025 */ lui $at, 0x8025 +/* 9DAC20 80243C00 AC202400 */ sw $zero, 0x2400($at) +.L80243C04: +/* 9DAC24 80243C04 3C038025 */ lui $v1, 0x8025 +/* 9DAC28 80243C08 24632400 */ addiu $v1, $v1, 0x2400 +/* 9DAC2C 80243C0C 8C620000 */ lw $v0, ($v1) +/* 9DAC30 80243C10 54400003 */ bnel $v0, $zero, .L80243C20 +/* 9DAC34 80243C14 AC600000 */ sw $zero, ($v1) +/* 9DAC38 80243C18 08090F0D */ j .L80243C34 +/* 9DAC3C 80243C1C 0000102D */ daddu $v0, $zero, $zero +.L80243C20: +/* 9DAC40 80243C20 8CC50000 */ lw $a1, ($a2) +/* 9DAC44 80243C24 3C068025 */ lui $a2, 0x8025 +/* 9DAC48 80243C28 0C0B2026 */ jal set_variable +/* 9DAC4C 80243C2C 8CC62404 */ lw $a2, 0x2404($a2) +/* 9DAC50 80243C30 24020002 */ addiu $v0, $zero, 2 +.L80243C34: +/* 9DAC54 80243C34 8FBF0010 */ lw $ra, 0x10($sp) +/* 9DAC58 80243C38 03E00008 */ jr $ra +/* 9DAC5C 80243C3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40.s deleted file mode 100644 index 4919e4f9ae..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243C40 -/* 9DAC60 80243C40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DAC64 80243C44 AFBF0010 */ sw $ra, 0x10($sp) -/* 9DAC68 80243C48 8C82000C */ lw $v0, 0xc($a0) -/* 9DAC6C 80243C4C 0C0B1EAF */ jal get_variable -/* 9DAC70 80243C50 8C450000 */ lw $a1, ($v0) -/* 9DAC74 80243C54 3C018025 */ lui $at, 0x8025 -/* 9DAC78 80243C58 AC222404 */ sw $v0, 0x2404($at) -/* 9DAC7C 80243C5C 24020002 */ addiu $v0, $zero, 2 -/* 9DAC80 80243C60 8FBF0010 */ lw $ra, 0x10($sp) -/* 9DAC84 80243C64 24030001 */ addiu $v1, $zero, 1 -/* 9DAC88 80243C68 3C018025 */ lui $at, 0x8025 -/* 9DAC8C 80243C6C AC232400 */ sw $v1, 0x2400($at) -/* 9DAC90 80243C70 03E00008 */ jr $ra -/* 9DAC94 80243C74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s new file mode 100644 index 0000000000..1bda53e17f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C40_9DAC60.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243C40_9DAC60 +/* 9DAC60 80243C40 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9DAC64 80243C44 AFBF0010 */ sw $ra, 0x10($sp) +/* 9DAC68 80243C48 8C82000C */ lw $v0, 0xc($a0) +/* 9DAC6C 80243C4C 0C0B1EAF */ jal get_variable +/* 9DAC70 80243C50 8C450000 */ lw $a1, ($v0) +/* 9DAC74 80243C54 3C018025 */ lui $at, 0x8025 +/* 9DAC78 80243C58 AC222404 */ sw $v0, 0x2404($at) +/* 9DAC7C 80243C5C 24020002 */ addiu $v0, $zero, 2 +/* 9DAC80 80243C60 8FBF0010 */ lw $ra, 0x10($sp) +/* 9DAC84 80243C64 24030001 */ addiu $v1, $zero, 1 +/* 9DAC88 80243C68 3C018025 */ lui $at, 0x8025 +/* 9DAC8C 80243C6C AC232400 */ sw $v1, 0x2400($at) +/* 9DAC90 80243C70 03E00008 */ jr $ra +/* 9DAC94 80243C74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78.s deleted file mode 100644 index 077eaeca80..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243C78 -/* 9DAC98 80243C78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DAC9C 80243C7C AFBF0010 */ sw $ra, 0x10($sp) -/* 9DACA0 80243C80 8C82000C */ lw $v0, 0xc($a0) -/* 9DACA4 80243C84 0C0B1EAF */ jal get_variable -/* 9DACA8 80243C88 8C450000 */ lw $a1, ($v0) -/* 9DACAC 80243C8C 0040182D */ daddu $v1, $v0, $zero -/* 9DACB0 80243C90 10600012 */ beqz $v1, .L80243CDC -/* 9DACB4 80243C94 0000202D */ daddu $a0, $zero, $zero -/* 9DACB8 80243C98 8C620000 */ lw $v0, ($v1) -/* 9DACBC 80243C9C 5040000A */ beql $v0, $zero, .L80243CC8 -/* 9DACC0 80243CA0 00041080 */ sll $v0, $a0, 2 -/* 9DACC4 80243CA4 3C058025 */ lui $a1, 0x8025 -/* 9DACC8 80243CA8 24A54BA0 */ addiu $a1, $a1, 0x4ba0 -.L80243CAC: -/* 9DACCC 80243CAC 24630004 */ addiu $v1, $v1, 4 -/* 9DACD0 80243CB0 24840001 */ addiu $a0, $a0, 1 -/* 9DACD4 80243CB4 ACA20000 */ sw $v0, ($a1) -/* 9DACD8 80243CB8 8C620000 */ lw $v0, ($v1) -/* 9DACDC 80243CBC 1440FFFB */ bnez $v0, .L80243CAC -/* 9DACE0 80243CC0 24A50004 */ addiu $a1, $a1, 4 -/* 9DACE4 80243CC4 00041080 */ sll $v0, $a0, 2 -.L80243CC8: -/* 9DACE8 80243CC8 3C018025 */ lui $at, 0x8025 -/* 9DACEC 80243CCC 00220821 */ addu $at, $at, $v0 -/* 9DACF0 80243CD0 AC204BA0 */ sw $zero, 0x4ba0($at) -/* 9DACF4 80243CD4 08090F41 */ j .L80243D04 -/* 9DACF8 80243CD8 00000000 */ nop -.L80243CDC: -/* 9DACFC 80243CDC 3C038025 */ lui $v1, 0x8025 -/* 9DAD00 80243CE0 24634BA0 */ addiu $v1, $v1, 0x4ba0 -/* 9DAD04 80243CE4 0060282D */ daddu $a1, $v1, $zero -.L80243CE8: -/* 9DAD08 80243CE8 24820010 */ addiu $v0, $a0, 0x10 -/* 9DAD0C 80243CEC AC620000 */ sw $v0, ($v1) -/* 9DAD10 80243CF0 24630004 */ addiu $v1, $v1, 4 -/* 9DAD14 80243CF4 24840001 */ addiu $a0, $a0, 1 -/* 9DAD18 80243CF8 28820070 */ slti $v0, $a0, 0x70 -/* 9DAD1C 80243CFC 1440FFFA */ bnez $v0, .L80243CE8 -/* 9DAD20 80243D00 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80243D04: -/* 9DAD24 80243D04 8FBF0010 */ lw $ra, 0x10($sp) -/* 9DAD28 80243D08 24020002 */ addiu $v0, $zero, 2 -/* 9DAD2C 80243D0C 03E00008 */ jr $ra -/* 9DAD30 80243D10 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s new file mode 100644 index 0000000000..12be85eecf --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243C78_9DAC98.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243C78_9DAC98 +/* 9DAC98 80243C78 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9DAC9C 80243C7C AFBF0010 */ sw $ra, 0x10($sp) +/* 9DACA0 80243C80 8C82000C */ lw $v0, 0xc($a0) +/* 9DACA4 80243C84 0C0B1EAF */ jal get_variable +/* 9DACA8 80243C88 8C450000 */ lw $a1, ($v0) +/* 9DACAC 80243C8C 0040182D */ daddu $v1, $v0, $zero +/* 9DACB0 80243C90 10600012 */ beqz $v1, .L80243CDC +/* 9DACB4 80243C94 0000202D */ daddu $a0, $zero, $zero +/* 9DACB8 80243C98 8C620000 */ lw $v0, ($v1) +/* 9DACBC 80243C9C 5040000A */ beql $v0, $zero, .L80243CC8 +/* 9DACC0 80243CA0 00041080 */ sll $v0, $a0, 2 +/* 9DACC4 80243CA4 3C058025 */ lui $a1, 0x8025 +/* 9DACC8 80243CA8 24A54BA0 */ addiu $a1, $a1, 0x4ba0 +.L80243CAC: +/* 9DACCC 80243CAC 24630004 */ addiu $v1, $v1, 4 +/* 9DACD0 80243CB0 24840001 */ addiu $a0, $a0, 1 +/* 9DACD4 80243CB4 ACA20000 */ sw $v0, ($a1) +/* 9DACD8 80243CB8 8C620000 */ lw $v0, ($v1) +/* 9DACDC 80243CBC 1440FFFB */ bnez $v0, .L80243CAC +/* 9DACE0 80243CC0 24A50004 */ addiu $a1, $a1, 4 +/* 9DACE4 80243CC4 00041080 */ sll $v0, $a0, 2 +.L80243CC8: +/* 9DACE8 80243CC8 3C018025 */ lui $at, 0x8025 +/* 9DACEC 80243CCC 00220821 */ addu $at, $at, $v0 +/* 9DACF0 80243CD0 AC204BA0 */ sw $zero, 0x4ba0($at) +/* 9DACF4 80243CD4 08090F41 */ j .L80243D04 +/* 9DACF8 80243CD8 00000000 */ nop +.L80243CDC: +/* 9DACFC 80243CDC 3C038025 */ lui $v1, 0x8025 +/* 9DAD00 80243CE0 24634BA0 */ addiu $v1, $v1, 0x4ba0 +/* 9DAD04 80243CE4 0060282D */ daddu $a1, $v1, $zero +.L80243CE8: +/* 9DAD08 80243CE8 24820010 */ addiu $v0, $a0, 0x10 +/* 9DAD0C 80243CEC AC620000 */ sw $v0, ($v1) +/* 9DAD10 80243CF0 24630004 */ addiu $v1, $v1, 4 +/* 9DAD14 80243CF4 24840001 */ addiu $a0, $a0, 1 +/* 9DAD18 80243CF8 28820070 */ slti $v0, $a0, 0x70 +/* 9DAD1C 80243CFC 1440FFFA */ bnez $v0, .L80243CE8 +/* 9DAD20 80243D00 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80243D04: +/* 9DAD24 80243D04 8FBF0010 */ lw $ra, 0x10($sp) +/* 9DAD28 80243D08 24020002 */ addiu $v0, $zero, 2 +/* 9DAD2C 80243D0C 03E00008 */ jr $ra +/* 9DAD30 80243D10 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14.s deleted file mode 100644 index be682048a7..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243D14 -/* 9DAD34 80243D14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DAD38 80243D18 AFBF0010 */ sw $ra, 0x10($sp) -/* 9DAD3C 80243D1C 8C82000C */ lw $v0, 0xc($a0) -/* 9DAD40 80243D20 0C0B1EAF */ jal get_variable -/* 9DAD44 80243D24 8C450000 */ lw $a1, ($v0) -/* 9DAD48 80243D28 0040182D */ daddu $v1, $v0, $zero -/* 9DAD4C 80243D2C 10600012 */ beqz $v1, .L80243D78 -/* 9DAD50 80243D30 0000202D */ daddu $a0, $zero, $zero -/* 9DAD54 80243D34 8C620000 */ lw $v0, ($v1) -/* 9DAD58 80243D38 5040000A */ beql $v0, $zero, .L80243D64 -/* 9DAD5C 80243D3C 00041080 */ sll $v0, $a0, 2 -/* 9DAD60 80243D40 3C058025 */ lui $a1, 0x8025 -/* 9DAD64 80243D44 24A54D68 */ addiu $a1, $a1, 0x4d68 -.L80243D48: -/* 9DAD68 80243D48 24630004 */ addiu $v1, $v1, 4 -/* 9DAD6C 80243D4C 24840001 */ addiu $a0, $a0, 1 -/* 9DAD70 80243D50 ACA20000 */ sw $v0, ($a1) -/* 9DAD74 80243D54 8C620000 */ lw $v0, ($v1) -/* 9DAD78 80243D58 1440FFFB */ bnez $v0, .L80243D48 -/* 9DAD7C 80243D5C 24A50004 */ addiu $a1, $a1, 4 -/* 9DAD80 80243D60 00041080 */ sll $v0, $a0, 2 -.L80243D64: -/* 9DAD84 80243D64 3C018025 */ lui $at, 0x8025 -/* 9DAD88 80243D68 00220821 */ addu $at, $at, $v0 -/* 9DAD8C 80243D6C AC204D68 */ sw $zero, 0x4d68($at) -/* 9DAD90 80243D70 08090F68 */ j .L80243DA0 -/* 9DAD94 80243D74 00000000 */ nop -.L80243D78: -/* 9DAD98 80243D78 3C038025 */ lui $v1, 0x8025 -/* 9DAD9C 80243D7C 24634D68 */ addiu $v1, $v1, 0x4d68 -/* 9DADA0 80243D80 0060282D */ daddu $a1, $v1, $zero -.L80243D84: -/* 9DADA4 80243D84 24820080 */ addiu $v0, $a0, 0x80 -/* 9DADA8 80243D88 AC620000 */ sw $v0, ($v1) -/* 9DADAC 80243D8C 24630004 */ addiu $v1, $v1, 4 -/* 9DADB0 80243D90 24840001 */ addiu $a0, $a0, 1 -/* 9DADB4 80243D94 2882005B */ slti $v0, $a0, 0x5b -/* 9DADB8 80243D98 1440FFFA */ bnez $v0, .L80243D84 -/* 9DADBC 80243D9C ACA0016C */ sw $zero, 0x16c($a1) -.L80243DA0: -/* 9DADC0 80243DA0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9DADC4 80243DA4 24020002 */ addiu $v0, $zero, 2 -/* 9DADC8 80243DA8 03E00008 */ jr $ra -/* 9DADCC 80243DAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s new file mode 100644 index 0000000000..df471d5a9f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243D14_9DAD34.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243D14_9DAD34 +/* 9DAD34 80243D14 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9DAD38 80243D18 AFBF0010 */ sw $ra, 0x10($sp) +/* 9DAD3C 80243D1C 8C82000C */ lw $v0, 0xc($a0) +/* 9DAD40 80243D20 0C0B1EAF */ jal get_variable +/* 9DAD44 80243D24 8C450000 */ lw $a1, ($v0) +/* 9DAD48 80243D28 0040182D */ daddu $v1, $v0, $zero +/* 9DAD4C 80243D2C 10600012 */ beqz $v1, .L80243D78 +/* 9DAD50 80243D30 0000202D */ daddu $a0, $zero, $zero +/* 9DAD54 80243D34 8C620000 */ lw $v0, ($v1) +/* 9DAD58 80243D38 5040000A */ beql $v0, $zero, .L80243D64 +/* 9DAD5C 80243D3C 00041080 */ sll $v0, $a0, 2 +/* 9DAD60 80243D40 3C058025 */ lui $a1, 0x8025 +/* 9DAD64 80243D44 24A54D68 */ addiu $a1, $a1, 0x4d68 +.L80243D48: +/* 9DAD68 80243D48 24630004 */ addiu $v1, $v1, 4 +/* 9DAD6C 80243D4C 24840001 */ addiu $a0, $a0, 1 +/* 9DAD70 80243D50 ACA20000 */ sw $v0, ($a1) +/* 9DAD74 80243D54 8C620000 */ lw $v0, ($v1) +/* 9DAD78 80243D58 1440FFFB */ bnez $v0, .L80243D48 +/* 9DAD7C 80243D5C 24A50004 */ addiu $a1, $a1, 4 +/* 9DAD80 80243D60 00041080 */ sll $v0, $a0, 2 +.L80243D64: +/* 9DAD84 80243D64 3C018025 */ lui $at, 0x8025 +/* 9DAD88 80243D68 00220821 */ addu $at, $at, $v0 +/* 9DAD8C 80243D6C AC204D68 */ sw $zero, 0x4d68($at) +/* 9DAD90 80243D70 08090F68 */ j .L80243DA0 +/* 9DAD94 80243D74 00000000 */ nop +.L80243D78: +/* 9DAD98 80243D78 3C038025 */ lui $v1, 0x8025 +/* 9DAD9C 80243D7C 24634D68 */ addiu $v1, $v1, 0x4d68 +/* 9DADA0 80243D80 0060282D */ daddu $a1, $v1, $zero +.L80243D84: +/* 9DADA4 80243D84 24820080 */ addiu $v0, $a0, 0x80 +/* 9DADA8 80243D88 AC620000 */ sw $v0, ($v1) +/* 9DADAC 80243D8C 24630004 */ addiu $v1, $v1, 4 +/* 9DADB0 80243D90 24840001 */ addiu $a0, $a0, 1 +/* 9DADB4 80243D94 2882005B */ slti $v0, $a0, 0x5b +/* 9DADB8 80243D98 1440FFFA */ bnez $v0, .L80243D84 +/* 9DADBC 80243D9C ACA0016C */ sw $zero, 0x16c($a1) +.L80243DA0: +/* 9DADC0 80243DA0 8FBF0010 */ lw $ra, 0x10($sp) +/* 9DADC4 80243DA4 24020002 */ addiu $v0, $zero, 2 +/* 9DADC8 80243DA8 03E00008 */ jr $ra +/* 9DADCC 80243DAC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243EC8.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243EC8.s deleted file mode 100644 index 3503f9a3e5..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243EC8.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243EC8 -/* 9DAEE8 80243EC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DAEEC 80243ECC AFB00010 */ sw $s0, 0x10($sp) -/* 9DAEF0 80243ED0 0080802D */ daddu $s0, $a0, $zero -/* 9DAEF4 80243ED4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9DAEF8 80243ED8 8E02000C */ lw $v0, 0xc($s0) -/* 9DAEFC 80243EDC 0C0B1EAF */ jal get_variable -/* 9DAF00 80243EE0 8C450000 */ lw $a1, ($v0) -/* 9DAF04 80243EE4 30420003 */ andi $v0, $v0, 3 -/* 9DAF08 80243EE8 10400003 */ beqz $v0, .L80243EF8 -/* 9DAF0C 80243EEC 24020001 */ addiu $v0, $zero, 1 -/* 9DAF10 80243EF0 08090FBF */ j .L80243EFC -/* 9DAF14 80243EF4 AE000084 */ sw $zero, 0x84($s0) -.L80243EF8: -/* 9DAF18 80243EF8 AE020084 */ sw $v0, 0x84($s0) -.L80243EFC: -/* 9DAF1C 80243EFC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9DAF20 80243F00 8FB00010 */ lw $s0, 0x10($sp) -/* 9DAF24 80243F04 24020002 */ addiu $v0, $zero, 2 -/* 9DAF28 80243F08 03E00008 */ jr $ra -/* 9DAF2C 80243F0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243EC8_9DAEE8.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243EC8_9DAEE8.s new file mode 100644 index 0000000000..876537ccb0 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243EC8_9DAEE8.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243EC8_9DAEE8 +/* 9DAEE8 80243EC8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9DAEEC 80243ECC AFB00010 */ sw $s0, 0x10($sp) +/* 9DAEF0 80243ED0 0080802D */ daddu $s0, $a0, $zero +/* 9DAEF4 80243ED4 AFBF0014 */ sw $ra, 0x14($sp) +/* 9DAEF8 80243ED8 8E02000C */ lw $v0, 0xc($s0) +/* 9DAEFC 80243EDC 0C0B1EAF */ jal get_variable +/* 9DAF00 80243EE0 8C450000 */ lw $a1, ($v0) +/* 9DAF04 80243EE4 30420003 */ andi $v0, $v0, 3 +/* 9DAF08 80243EE8 10400003 */ beqz $v0, .L80243EF8 +/* 9DAF0C 80243EEC 24020001 */ addiu $v0, $zero, 1 +/* 9DAF10 80243EF0 08090FBF */ j .L80243EFC +/* 9DAF14 80243EF4 AE000084 */ sw $zero, 0x84($s0) +.L80243EF8: +/* 9DAF18 80243EF8 AE020084 */ sw $v0, 0x84($s0) +.L80243EFC: +/* 9DAF1C 80243EFC 8FBF0014 */ lw $ra, 0x14($sp) +/* 9DAF20 80243F00 8FB00010 */ lw $s0, 0x10($sp) +/* 9DAF24 80243F04 24020002 */ addiu $v0, $zero, 2 +/* 9DAF28 80243F08 03E00008 */ jr $ra +/* 9DAF2C 80243F0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10.s deleted file mode 100644 index 84830799c9..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243F10 -/* 9DAF30 80243F10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9DAF34 80243F14 AFB40020 */ sw $s4, 0x20($sp) -/* 9DAF38 80243F18 0080A02D */ daddu $s4, $a0, $zero -/* 9DAF3C 80243F1C AFB20018 */ sw $s2, 0x18($sp) -/* 9DAF40 80243F20 0000902D */ daddu $s2, $zero, $zero -/* 9DAF44 80243F24 AFB3001C */ sw $s3, 0x1c($sp) -/* 9DAF48 80243F28 3C138025 */ lui $s3, 0x8025 -/* 9DAF4C 80243F2C 26732784 */ addiu $s3, $s3, 0x2784 -/* 9DAF50 80243F30 AFB10014 */ sw $s1, 0x14($sp) -/* 9DAF54 80243F34 0240882D */ daddu $s1, $s2, $zero -/* 9DAF58 80243F38 AFBF002C */ sw $ra, 0x2c($sp) -/* 9DAF5C 80243F3C AFB60028 */ sw $s6, 0x28($sp) -/* 9DAF60 80243F40 AFB50024 */ sw $s5, 0x24($sp) -/* 9DAF64 80243F44 AFB00010 */ sw $s0, 0x10($sp) -/* 9DAF68 80243F48 8E82000C */ lw $v0, 0xc($s4) -/* 9DAF6C 80243F4C 26700010 */ addiu $s0, $s3, 0x10 -/* 9DAF70 80243F50 8C550000 */ lw $s5, ($v0) -.L80243F54: -/* 9DAF74 80243F54 8E05FFFC */ lw $a1, -4($s0) -/* 9DAF78 80243F58 0C0B1EAF */ jal get_variable -/* 9DAF7C 80243F5C 0280202D */ daddu $a0, $s4, $zero -/* 9DAF80 80243F60 5040000D */ beql $v0, $zero, .L80243F98 -/* 9DAF84 80243F64 26310001 */ addiu $s1, $s1, 1 -/* 9DAF88 80243F68 8E050004 */ lw $a1, 4($s0) -/* 9DAF8C 80243F6C 0C0B1EAF */ jal get_variable -/* 9DAF90 80243F70 0280202D */ daddu $a0, $s4, $zero -/* 9DAF94 80243F74 54400008 */ bnel $v0, $zero, .L80243F98 -/* 9DAF98 80243F78 26310001 */ addiu $s1, $s1, 1 -/* 9DAF9C 80243F7C 26520001 */ addiu $s2, $s2, 1 -/* 9DAFA0 80243F80 8E050000 */ lw $a1, ($s0) -/* 9DAFA4 80243F84 0C0B1EAF */ jal get_variable -/* 9DAFA8 80243F88 0280202D */ daddu $a0, $s4, $zero -/* 9DAFAC 80243F8C 10400007 */ beqz $v0, .L80243FAC -/* 9DAFB0 80243F90 24020014 */ addiu $v0, $zero, 0x14 -/* 9DAFB4 80243F94 26310001 */ addiu $s1, $s1, 1 -.L80243F98: -/* 9DAFB8 80243F98 2610001C */ addiu $s0, $s0, 0x1c -/* 9DAFBC 80243F9C 2E220014 */ sltiu $v0, $s1, 0x14 -/* 9DAFC0 80243FA0 1440FFEC */ bnez $v0, .L80243F54 -/* 9DAFC4 80243FA4 2673001C */ addiu $s3, $s3, 0x1c -/* 9DAFC8 80243FA8 24020014 */ addiu $v0, $zero, 0x14 -.L80243FAC: -/* 9DAFCC 80243FAC 16220021 */ bne $s1, $v0, .L80244034 -/* 9DAFD0 80243FB0 0280202D */ daddu $a0, $s4, $zero -/* 9DAFD4 80243FB4 16400004 */ bnez $s2, .L80243FC8 -/* 9DAFD8 80243FB8 02A0282D */ daddu $a1, $s5, $zero -/* 9DAFDC 80243FBC AE800084 */ sw $zero, 0x84($s4) -/* 9DAFE0 80243FC0 08091011 */ j .L80244044 -/* 9DAFE4 80243FC4 240600FF */ addiu $a2, $zero, 0xff -.L80243FC8: -/* 9DAFE8 80243FC8 0C00A67F */ jal rand_int -/* 9DAFEC 80243FCC 2644FFFF */ addiu $a0, $s2, -1 -/* 9DAFF0 80243FD0 0040B02D */ daddu $s6, $v0, $zero -/* 9DAFF4 80243FD4 0000902D */ daddu $s2, $zero, $zero -/* 9DAFF8 80243FD8 3C138025 */ lui $s3, 0x8025 -/* 9DAFFC 80243FDC 26732784 */ addiu $s3, $s3, 0x2784 -/* 9DB000 80243FE0 0240882D */ daddu $s1, $s2, $zero -/* 9DB004 80243FE4 26700014 */ addiu $s0, $s3, 0x14 -.L80243FE8: -/* 9DB008 80243FE8 8E05FFF8 */ lw $a1, -8($s0) -/* 9DB00C 80243FEC 0C0B1EAF */ jal get_variable -/* 9DB010 80243FF0 0280202D */ daddu $a0, $s4, $zero -/* 9DB014 80243FF4 5040000A */ beql $v0, $zero, .L80244020 -/* 9DB018 80243FF8 26310001 */ addiu $s1, $s1, 1 -/* 9DB01C 80243FFC 8E050000 */ lw $a1, ($s0) -/* 9DB020 80244000 0C0B1EAF */ jal get_variable -/* 9DB024 80244004 0280202D */ daddu $a0, $s4, $zero -/* 9DB028 80244008 54400005 */ bnel $v0, $zero, .L80244020 -/* 9DB02C 8024400C 26310001 */ addiu $s1, $s1, 1 -/* 9DB030 80244010 0240102D */ daddu $v0, $s2, $zero -/* 9DB034 80244014 10560006 */ beq $v0, $s6, .L80244030 -/* 9DB038 80244018 26520001 */ addiu $s2, $s2, 1 -/* 9DB03C 8024401C 26310001 */ addiu $s1, $s1, 1 -.L80244020: -/* 9DB040 80244020 2610001C */ addiu $s0, $s0, 0x1c -/* 9DB044 80244024 2E220014 */ sltiu $v0, $s1, 0x14 -/* 9DB048 80244028 1440FFEF */ bnez $v0, .L80243FE8 -/* 9DB04C 8024402C 2673001C */ addiu $s3, $s3, 0x1c -.L80244030: -/* 9DB050 80244030 0280202D */ daddu $a0, $s4, $zero -.L80244034: -/* 9DB054 80244034 02A0282D */ daddu $a1, $s5, $zero -/* 9DB058 80244038 8E620000 */ lw $v0, ($s3) -/* 9DB05C 8024403C 26260001 */ addiu $a2, $s1, 1 -/* 9DB060 80244040 AC820084 */ sw $v0, 0x84($a0) -.L80244044: -/* 9DB064 80244044 0C0B2026 */ jal set_variable -/* 9DB068 80244048 00000000 */ nop -/* 9DB06C 8024404C 24020002 */ addiu $v0, $zero, 2 -/* 9DB070 80244050 8FBF002C */ lw $ra, 0x2c($sp) -/* 9DB074 80244054 8FB60028 */ lw $s6, 0x28($sp) -/* 9DB078 80244058 8FB50024 */ lw $s5, 0x24($sp) -/* 9DB07C 8024405C 8FB40020 */ lw $s4, 0x20($sp) -/* 9DB080 80244060 8FB3001C */ lw $s3, 0x1c($sp) -/* 9DB084 80244064 8FB20018 */ lw $s2, 0x18($sp) -/* 9DB088 80244068 8FB10014 */ lw $s1, 0x14($sp) -/* 9DB08C 8024406C 8FB00010 */ lw $s0, 0x10($sp) -/* 9DB090 80244070 03E00008 */ jr $ra -/* 9DB094 80244074 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s new file mode 100644 index 0000000000..93fef7ee5b --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80243F10_9DAF30.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243F10_9DAF30 +/* 9DAF30 80243F10 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9DAF34 80243F14 AFB40020 */ sw $s4, 0x20($sp) +/* 9DAF38 80243F18 0080A02D */ daddu $s4, $a0, $zero +/* 9DAF3C 80243F1C AFB20018 */ sw $s2, 0x18($sp) +/* 9DAF40 80243F20 0000902D */ daddu $s2, $zero, $zero +/* 9DAF44 80243F24 AFB3001C */ sw $s3, 0x1c($sp) +/* 9DAF48 80243F28 3C138025 */ lui $s3, 0x8025 +/* 9DAF4C 80243F2C 26732784 */ addiu $s3, $s3, 0x2784 +/* 9DAF50 80243F30 AFB10014 */ sw $s1, 0x14($sp) +/* 9DAF54 80243F34 0240882D */ daddu $s1, $s2, $zero +/* 9DAF58 80243F38 AFBF002C */ sw $ra, 0x2c($sp) +/* 9DAF5C 80243F3C AFB60028 */ sw $s6, 0x28($sp) +/* 9DAF60 80243F40 AFB50024 */ sw $s5, 0x24($sp) +/* 9DAF64 80243F44 AFB00010 */ sw $s0, 0x10($sp) +/* 9DAF68 80243F48 8E82000C */ lw $v0, 0xc($s4) +/* 9DAF6C 80243F4C 26700010 */ addiu $s0, $s3, 0x10 +/* 9DAF70 80243F50 8C550000 */ lw $s5, ($v0) +.L80243F54: +/* 9DAF74 80243F54 8E05FFFC */ lw $a1, -4($s0) +/* 9DAF78 80243F58 0C0B1EAF */ jal get_variable +/* 9DAF7C 80243F5C 0280202D */ daddu $a0, $s4, $zero +/* 9DAF80 80243F60 5040000D */ beql $v0, $zero, .L80243F98 +/* 9DAF84 80243F64 26310001 */ addiu $s1, $s1, 1 +/* 9DAF88 80243F68 8E050004 */ lw $a1, 4($s0) +/* 9DAF8C 80243F6C 0C0B1EAF */ jal get_variable +/* 9DAF90 80243F70 0280202D */ daddu $a0, $s4, $zero +/* 9DAF94 80243F74 54400008 */ bnel $v0, $zero, .L80243F98 +/* 9DAF98 80243F78 26310001 */ addiu $s1, $s1, 1 +/* 9DAF9C 80243F7C 26520001 */ addiu $s2, $s2, 1 +/* 9DAFA0 80243F80 8E050000 */ lw $a1, ($s0) +/* 9DAFA4 80243F84 0C0B1EAF */ jal get_variable +/* 9DAFA8 80243F88 0280202D */ daddu $a0, $s4, $zero +/* 9DAFAC 80243F8C 10400007 */ beqz $v0, .L80243FAC +/* 9DAFB0 80243F90 24020014 */ addiu $v0, $zero, 0x14 +/* 9DAFB4 80243F94 26310001 */ addiu $s1, $s1, 1 +.L80243F98: +/* 9DAFB8 80243F98 2610001C */ addiu $s0, $s0, 0x1c +/* 9DAFBC 80243F9C 2E220014 */ sltiu $v0, $s1, 0x14 +/* 9DAFC0 80243FA0 1440FFEC */ bnez $v0, .L80243F54 +/* 9DAFC4 80243FA4 2673001C */ addiu $s3, $s3, 0x1c +/* 9DAFC8 80243FA8 24020014 */ addiu $v0, $zero, 0x14 +.L80243FAC: +/* 9DAFCC 80243FAC 16220021 */ bne $s1, $v0, .L80244034 +/* 9DAFD0 80243FB0 0280202D */ daddu $a0, $s4, $zero +/* 9DAFD4 80243FB4 16400004 */ bnez $s2, .L80243FC8 +/* 9DAFD8 80243FB8 02A0282D */ daddu $a1, $s5, $zero +/* 9DAFDC 80243FBC AE800084 */ sw $zero, 0x84($s4) +/* 9DAFE0 80243FC0 08091011 */ j .L80244044 +/* 9DAFE4 80243FC4 240600FF */ addiu $a2, $zero, 0xff +.L80243FC8: +/* 9DAFE8 80243FC8 0C00A67F */ jal rand_int +/* 9DAFEC 80243FCC 2644FFFF */ addiu $a0, $s2, -1 +/* 9DAFF0 80243FD0 0040B02D */ daddu $s6, $v0, $zero +/* 9DAFF4 80243FD4 0000902D */ daddu $s2, $zero, $zero +/* 9DAFF8 80243FD8 3C138025 */ lui $s3, 0x8025 +/* 9DAFFC 80243FDC 26732784 */ addiu $s3, $s3, 0x2784 +/* 9DB000 80243FE0 0240882D */ daddu $s1, $s2, $zero +/* 9DB004 80243FE4 26700014 */ addiu $s0, $s3, 0x14 +.L80243FE8: +/* 9DB008 80243FE8 8E05FFF8 */ lw $a1, -8($s0) +/* 9DB00C 80243FEC 0C0B1EAF */ jal get_variable +/* 9DB010 80243FF0 0280202D */ daddu $a0, $s4, $zero +/* 9DB014 80243FF4 5040000A */ beql $v0, $zero, .L80244020 +/* 9DB018 80243FF8 26310001 */ addiu $s1, $s1, 1 +/* 9DB01C 80243FFC 8E050000 */ lw $a1, ($s0) +/* 9DB020 80244000 0C0B1EAF */ jal get_variable +/* 9DB024 80244004 0280202D */ daddu $a0, $s4, $zero +/* 9DB028 80244008 54400005 */ bnel $v0, $zero, .L80244020 +/* 9DB02C 8024400C 26310001 */ addiu $s1, $s1, 1 +/* 9DB030 80244010 0240102D */ daddu $v0, $s2, $zero +/* 9DB034 80244014 10560006 */ beq $v0, $s6, .L80244030 +/* 9DB038 80244018 26520001 */ addiu $s2, $s2, 1 +/* 9DB03C 8024401C 26310001 */ addiu $s1, $s1, 1 +.L80244020: +/* 9DB040 80244020 2610001C */ addiu $s0, $s0, 0x1c +/* 9DB044 80244024 2E220014 */ sltiu $v0, $s1, 0x14 +/* 9DB048 80244028 1440FFEF */ bnez $v0, .L80243FE8 +/* 9DB04C 8024402C 2673001C */ addiu $s3, $s3, 0x1c +.L80244030: +/* 9DB050 80244030 0280202D */ daddu $a0, $s4, $zero +.L80244034: +/* 9DB054 80244034 02A0282D */ daddu $a1, $s5, $zero +/* 9DB058 80244038 8E620000 */ lw $v0, ($s3) +/* 9DB05C 8024403C 26260001 */ addiu $a2, $s1, 1 +/* 9DB060 80244040 AC820084 */ sw $v0, 0x84($a0) +.L80244044: +/* 9DB064 80244044 0C0B2026 */ jal set_variable +/* 9DB068 80244048 00000000 */ nop +/* 9DB06C 8024404C 24020002 */ addiu $v0, $zero, 2 +/* 9DB070 80244050 8FBF002C */ lw $ra, 0x2c($sp) +/* 9DB074 80244054 8FB60028 */ lw $s6, 0x28($sp) +/* 9DB078 80244058 8FB50024 */ lw $s5, 0x24($sp) +/* 9DB07C 8024405C 8FB40020 */ lw $s4, 0x20($sp) +/* 9DB080 80244060 8FB3001C */ lw $s3, 0x1c($sp) +/* 9DB084 80244064 8FB20018 */ lw $s2, 0x18($sp) +/* 9DB088 80244068 8FB10014 */ lw $s1, 0x14($sp) +/* 9DB08C 8024406C 8FB00010 */ lw $s0, 0x10($sp) +/* 9DB090 80244070 03E00008 */ jr $ra +/* 9DB094 80244074 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224.s deleted file mode 100644 index 5f79bcdc80..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244224 -/* 9DB244 80244224 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DB248 80244228 AFB00010 */ sw $s0, 0x10($sp) -/* 9DB24C 8024422C 0080802D */ daddu $s0, $a0, $zero -/* 9DB250 80244230 AFBF0014 */ sw $ra, 0x14($sp) -/* 9DB254 80244234 8E02000C */ lw $v0, 0xc($s0) -/* 9DB258 80244238 0C0B1EAF */ jal get_variable -/* 9DB25C 8024423C 8C450000 */ lw $a1, ($v0) -/* 9DB260 80244240 2442FFFF */ addiu $v0, $v0, -1 -/* 9DB264 80244244 3C048025 */ lui $a0, 0x8025 -/* 9DB268 80244248 24842784 */ addiu $a0, $a0, 0x2784 -/* 9DB26C 8024424C 000218C0 */ sll $v1, $v0, 3 -/* 9DB270 80244250 00621823 */ subu $v1, $v1, $v0 -/* 9DB274 80244254 00031880 */ sll $v1, $v1, 2 -/* 9DB278 80244258 00641821 */ addu $v1, $v1, $a0 -/* 9DB27C 8024425C 8C620000 */ lw $v0, ($v1) -/* 9DB280 80244260 AE020084 */ sw $v0, 0x84($s0) -/* 9DB284 80244264 8C620004 */ lw $v0, 4($v1) -/* 9DB288 80244268 AE020088 */ sw $v0, 0x88($s0) -/* 9DB28C 8024426C 8C630008 */ lw $v1, 8($v1) -/* 9DB290 80244270 AE03008C */ sw $v1, 0x8c($s0) -/* 9DB294 80244274 8FBF0014 */ lw $ra, 0x14($sp) -/* 9DB298 80244278 8FB00010 */ lw $s0, 0x10($sp) -/* 9DB29C 8024427C 24020002 */ addiu $v0, $zero, 2 -/* 9DB2A0 80244280 03E00008 */ jr $ra -/* 9DB2A4 80244284 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224_9DB244.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224_9DB244.s new file mode 100644 index 0000000000..5918c163eb --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244224_9DB244.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244224_9DB244 +/* 9DB244 80244224 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9DB248 80244228 AFB00010 */ sw $s0, 0x10($sp) +/* 9DB24C 8024422C 0080802D */ daddu $s0, $a0, $zero +/* 9DB250 80244230 AFBF0014 */ sw $ra, 0x14($sp) +/* 9DB254 80244234 8E02000C */ lw $v0, 0xc($s0) +/* 9DB258 80244238 0C0B1EAF */ jal get_variable +/* 9DB25C 8024423C 8C450000 */ lw $a1, ($v0) +/* 9DB260 80244240 2442FFFF */ addiu $v0, $v0, -1 +/* 9DB264 80244244 3C048025 */ lui $a0, 0x8025 +/* 9DB268 80244248 24842784 */ addiu $a0, $a0, 0x2784 +/* 9DB26C 8024424C 000218C0 */ sll $v1, $v0, 3 +/* 9DB270 80244250 00621823 */ subu $v1, $v1, $v0 +/* 9DB274 80244254 00031880 */ sll $v1, $v1, 2 +/* 9DB278 80244258 00641821 */ addu $v1, $v1, $a0 +/* 9DB27C 8024425C 8C620000 */ lw $v0, ($v1) +/* 9DB280 80244260 AE020084 */ sw $v0, 0x84($s0) +/* 9DB284 80244264 8C620004 */ lw $v0, 4($v1) +/* 9DB288 80244268 AE020088 */ sw $v0, 0x88($s0) +/* 9DB28C 8024426C 8C630008 */ lw $v1, 8($v1) +/* 9DB290 80244270 AE03008C */ sw $v1, 0x8c($s0) +/* 9DB294 80244274 8FBF0014 */ lw $ra, 0x14($sp) +/* 9DB298 80244278 8FB00010 */ lw $s0, 0x10($sp) +/* 9DB29C 8024427C 24020002 */ addiu $v0, $zero, 2 +/* 9DB2A0 80244280 03E00008 */ jr $ra +/* 9DB2A4 80244284 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288.s deleted file mode 100644 index 9c5d8cb38b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244288 -/* 9DB2A8 80244288 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DB2AC 8024428C AFB00010 */ sw $s0, 0x10($sp) -/* 9DB2B0 80244290 0080802D */ daddu $s0, $a0, $zero -/* 9DB2B4 80244294 AFBF0014 */ sw $ra, 0x14($sp) -/* 9DB2B8 80244298 8E02000C */ lw $v0, 0xc($s0) -/* 9DB2BC 8024429C 0C0B1EAF */ jal get_variable -/* 9DB2C0 802442A0 8C450000 */ lw $a1, ($v0) -/* 9DB2C4 802442A4 0200202D */ daddu $a0, $s0, $zero -/* 9DB2C8 802442A8 2442FFFF */ addiu $v0, $v0, -1 -/* 9DB2CC 802442AC 000218C0 */ sll $v1, $v0, 3 -/* 9DB2D0 802442B0 00621823 */ subu $v1, $v1, $v0 -/* 9DB2D4 802442B4 00031880 */ sll $v1, $v1, 2 -/* 9DB2D8 802442B8 3C058025 */ lui $a1, 0x8025 -/* 9DB2DC 802442BC 00A32821 */ addu $a1, $a1, $v1 -/* 9DB2E0 802442C0 8CA52798 */ lw $a1, 0x2798($a1) -/* 9DB2E4 802442C4 0C0B2026 */ jal set_variable -/* 9DB2E8 802442C8 24060001 */ addiu $a2, $zero, 1 -/* 9DB2EC 802442CC 8FBF0014 */ lw $ra, 0x14($sp) -/* 9DB2F0 802442D0 8FB00010 */ lw $s0, 0x10($sp) -/* 9DB2F4 802442D4 24020002 */ addiu $v0, $zero, 2 -/* 9DB2F8 802442D8 03E00008 */ jr $ra -/* 9DB2FC 802442DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s new file mode 100644 index 0000000000..e21caa1352 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_80244288_9DB2A8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244288_9DB2A8 +/* 9DB2A8 80244288 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9DB2AC 8024428C AFB00010 */ sw $s0, 0x10($sp) +/* 9DB2B0 80244290 0080802D */ daddu $s0, $a0, $zero +/* 9DB2B4 80244294 AFBF0014 */ sw $ra, 0x14($sp) +/* 9DB2B8 80244298 8E02000C */ lw $v0, 0xc($s0) +/* 9DB2BC 8024429C 0C0B1EAF */ jal get_variable +/* 9DB2C0 802442A0 8C450000 */ lw $a1, ($v0) +/* 9DB2C4 802442A4 0200202D */ daddu $a0, $s0, $zero +/* 9DB2C8 802442A8 2442FFFF */ addiu $v0, $v0, -1 +/* 9DB2CC 802442AC 000218C0 */ sll $v1, $v0, 3 +/* 9DB2D0 802442B0 00621823 */ subu $v1, $v1, $v0 +/* 9DB2D4 802442B4 00031880 */ sll $v1, $v1, 2 +/* 9DB2D8 802442B8 3C058025 */ lui $a1, 0x8025 +/* 9DB2DC 802442BC 00A32821 */ addu $a1, $a1, $v1 +/* 9DB2E0 802442C0 8CA52798 */ lw $a1, 0x2798($a1) +/* 9DB2E4 802442C4 0C0B2026 */ jal set_variable +/* 9DB2E8 802442C8 24060001 */ addiu $a2, $zero, 1 +/* 9DB2EC 802442CC 8FBF0014 */ lw $ra, 0x14($sp) +/* 9DB2F0 802442D0 8FB00010 */ lw $s0, 0x10($sp) +/* 9DB2F4 802442D4 24020002 */ addiu $v0, $zero, 2 +/* 9DB2F8 802442D8 03E00008 */ jr $ra +/* 9DB2FC 802442DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0.s deleted file mode 100644 index 602fae69f9..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802442E0 -/* 9DB300 802442E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9DB304 802442E4 AFB00010 */ sw $s0, 0x10($sp) -/* 9DB308 802442E8 0080802D */ daddu $s0, $a0, $zero -/* 9DB30C 802442EC AFBF0014 */ sw $ra, 0x14($sp) -/* 9DB310 802442F0 8E02000C */ lw $v0, 0xc($s0) -/* 9DB314 802442F4 0C0B1EAF */ jal get_variable -/* 9DB318 802442F8 8C450000 */ lw $a1, ($v0) -/* 9DB31C 802442FC 2442FFFF */ addiu $v0, $v0, -1 -/* 9DB320 80244300 000218C0 */ sll $v1, $v0, 3 -/* 9DB324 80244304 00621823 */ subu $v1, $v1, $v0 -/* 9DB328 80244308 00031880 */ sll $v1, $v1, 2 -/* 9DB32C 8024430C 3C048025 */ lui $a0, 0x8025 -/* 9DB330 80244310 00832021 */ addu $a0, $a0, $v1 -/* 9DB334 80244314 8C84279C */ lw $a0, 0x279c($a0) -/* 9DB338 80244318 00041140 */ sll $v0, $a0, 5 -/* 9DB33C 8024431C 3C018025 */ lui $at, 0x8025 -/* 9DB340 80244320 AC2429B4 */ sw $a0, 0x29b4($at) -/* 9DB344 80244324 3C038008 */ lui $v1, 0x8008 -/* 9DB348 80244328 00621821 */ addu $v1, $v1, $v0 -/* 9DB34C 8024432C 946378F8 */ lhu $v1, 0x78f8($v1) -/* 9DB350 80244330 AE040088 */ sw $a0, 0x88($s0) -/* 9DB354 80244334 30630004 */ andi $v1, $v1, 4 -/* 9DB358 80244338 0003182B */ sltu $v1, $zero, $v1 -/* 9DB35C 8024433C AE030084 */ sw $v1, 0x84($s0) -/* 9DB360 80244340 8FBF0014 */ lw $ra, 0x14($sp) -/* 9DB364 80244344 8FB00010 */ lw $s0, 0x10($sp) -/* 9DB368 80244348 24020002 */ addiu $v0, $zero, 2 -/* 9DB36C 8024434C 03E00008 */ jr $ra -/* 9DB370 80244350 27BD0018 */ addiu $sp, $sp, 0x18 -/* 9DB374 80244354 00000000 */ nop -/* 9DB378 80244358 00000000 */ nop -/* 9DB37C 8024435C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s new file mode 100644 index 0000000000..1d1ca2e1e7 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DA8F0/func_802442E0_9DB300.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802442E0_9DB300 +/* 9DB300 802442E0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9DB304 802442E4 AFB00010 */ sw $s0, 0x10($sp) +/* 9DB308 802442E8 0080802D */ daddu $s0, $a0, $zero +/* 9DB30C 802442EC AFBF0014 */ sw $ra, 0x14($sp) +/* 9DB310 802442F0 8E02000C */ lw $v0, 0xc($s0) +/* 9DB314 802442F4 0C0B1EAF */ jal get_variable +/* 9DB318 802442F8 8C450000 */ lw $a1, ($v0) +/* 9DB31C 802442FC 2442FFFF */ addiu $v0, $v0, -1 +/* 9DB320 80244300 000218C0 */ sll $v1, $v0, 3 +/* 9DB324 80244304 00621823 */ subu $v1, $v1, $v0 +/* 9DB328 80244308 00031880 */ sll $v1, $v1, 2 +/* 9DB32C 8024430C 3C048025 */ lui $a0, 0x8025 +/* 9DB330 80244310 00832021 */ addu $a0, $a0, $v1 +/* 9DB334 80244314 8C84279C */ lw $a0, 0x279c($a0) +/* 9DB338 80244318 00041140 */ sll $v0, $a0, 5 +/* 9DB33C 8024431C 3C018025 */ lui $at, 0x8025 +/* 9DB340 80244320 AC2429B4 */ sw $a0, 0x29b4($at) +/* 9DB344 80244324 3C038008 */ lui $v1, 0x8008 +/* 9DB348 80244328 00621821 */ addu $v1, $v1, $v0 +/* 9DB34C 8024432C 946378F8 */ lhu $v1, 0x78f8($v1) +/* 9DB350 80244330 AE040088 */ sw $a0, 0x88($s0) +/* 9DB354 80244334 30630004 */ andi $v1, $v1, 4 +/* 9DB358 80244338 0003182B */ sltu $v1, $zero, $v1 +/* 9DB35C 8024433C AE030084 */ sw $v1, 0x84($s0) +/* 9DB360 80244340 8FBF0014 */ lw $ra, 0x14($sp) +/* 9DB364 80244344 8FB00010 */ lw $s0, 0x10($sp) +/* 9DB368 80244348 24020002 */ addiu $v0, $zero, 2 +/* 9DB36C 8024434C 03E00008 */ jr $ra +/* 9DB370 80244350 27BD0018 */ addiu $sp, $sp, 0x18 +/* 9DB374 80244354 00000000 */ nop +/* 9DB378 80244358 00000000 */ nop +/* 9DB37C 8024435C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_80244360.s b/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_80244360.s deleted file mode 100644 index 67aa164fb7..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_80244360.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80244360 -/* 9DB380 80244360 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9DB384 80244364 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 9DB388 80244368 4485A000 */ mtc1 $a1, $f20 -/* 9DB38C 8024436C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 9DB390 80244370 4486B000 */ mtc1 $a2, $f22 -/* 9DB394 80244374 AFB00010 */ sw $s0, 0x10($sp) -/* 9DB398 80244378 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 9DB39C 8024437C 4487C000 */ mtc1 $a3, $f24 -/* 9DB3A0 80244380 AFBF0014 */ sw $ra, 0x14($sp) -/* 9DB3A4 80244384 0C019D28 */ jal guMtxIdentF -/* 9DB3A8 80244388 0080802D */ daddu $s0, $a0, $zero -/* 9DB3AC 8024438C 4616A582 */ mul.s $f22, $f20, $f22 -/* 9DB3B0 80244390 00000000 */ nop -/* 9DB3B4 80244394 4618A502 */ mul.s $f20, $f20, $f24 -/* 9DB3B8 80244398 00000000 */ nop -/* 9DB3BC 8024439C 3C013F80 */ lui $at, 0x3f80 -/* 9DB3C0 802443A0 44810000 */ mtc1 $at, $f0 -/* 9DB3C4 802443A4 00000000 */ nop -/* 9DB3C8 802443A8 E6000014 */ swc1 $f0, 0x14($s0) -/* 9DB3CC 802443AC E6160010 */ swc1 $f22, 0x10($s0) -/* 9DB3D0 802443B0 E6140018 */ swc1 $f20, 0x18($s0) -/* 9DB3D4 802443B4 8FBF0014 */ lw $ra, 0x14($sp) -/* 9DB3D8 802443B8 8FB00010 */ lw $s0, 0x10($sp) -/* 9DB3DC 802443BC D7B80028 */ ldc1 $f24, 0x28($sp) -/* 9DB3E0 802443C0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 9DB3E4 802443C4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 9DB3E8 802443C8 03E00008 */ jr $ra -/* 9DB3EC 802443CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_80244360_9DB380.s b/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_80244360_9DB380.s new file mode 100644 index 0000000000..a7da810bfb --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_80244360_9DB380.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80244360_9DB380 +/* 9DB380 80244360 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9DB384 80244364 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 9DB388 80244368 4485A000 */ mtc1 $a1, $f20 +/* 9DB38C 8024436C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 9DB390 80244370 4486B000 */ mtc1 $a2, $f22 +/* 9DB394 80244374 AFB00010 */ sw $s0, 0x10($sp) +/* 9DB398 80244378 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 9DB39C 8024437C 4487C000 */ mtc1 $a3, $f24 +/* 9DB3A0 80244380 AFBF0014 */ sw $ra, 0x14($sp) +/* 9DB3A4 80244384 0C019D28 */ jal guMtxIdentF +/* 9DB3A8 80244388 0080802D */ daddu $s0, $a0, $zero +/* 9DB3AC 8024438C 4616A582 */ mul.s $f22, $f20, $f22 +/* 9DB3B0 80244390 00000000 */ nop +/* 9DB3B4 80244394 4618A502 */ mul.s $f20, $f20, $f24 +/* 9DB3B8 80244398 00000000 */ nop +/* 9DB3BC 8024439C 3C013F80 */ lui $at, 0x3f80 +/* 9DB3C0 802443A0 44810000 */ mtc1 $at, $f0 +/* 9DB3C4 802443A4 00000000 */ nop +/* 9DB3C8 802443A8 E6000014 */ swc1 $f0, 0x14($s0) +/* 9DB3CC 802443AC E6160010 */ swc1 $f22, 0x10($s0) +/* 9DB3D0 802443B0 E6140018 */ swc1 $f20, 0x18($s0) +/* 9DB3D4 802443B4 8FBF0014 */ lw $ra, 0x14($sp) +/* 9DB3D8 802443B8 8FB00010 */ lw $s0, 0x10($sp) +/* 9DB3DC 802443BC D7B80028 */ ldc1 $f24, 0x28($sp) +/* 9DB3E0 802443C0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 9DB3E4 802443C4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 9DB3E8 802443C8 03E00008 */ jr $ra +/* 9DB3EC 802443CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_802443D0.s b/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_802443D0.s deleted file mode 100644 index 44bb1a090d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_802443D0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802443D0 -/* 9DB3F0 802443D0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 9DB3F4 802443D4 AFB10054 */ sw $s1, 0x54($sp) -/* 9DB3F8 802443D8 0080882D */ daddu $s1, $a0, $zero -/* 9DB3FC 802443DC AFBF005C */ sw $ra, 0x5c($sp) -/* 9DB400 802443E0 AFB20058 */ sw $s2, 0x58($sp) -/* 9DB404 802443E4 AFB00050 */ sw $s0, 0x50($sp) -/* 9DB408 802443E8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 9DB40C 802443EC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9DB410 802443F0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9DB414 802443F4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9DB418 802443F8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9DB41C 802443FC 8E30000C */ lw $s0, 0xc($s1) -/* 9DB420 80244400 8E050000 */ lw $a1, ($s0) -/* 9DB424 80244404 0C0B1EAF */ jal get_variable -/* 9DB428 80244408 26100004 */ addiu $s0, $s0, 4 -/* 9DB42C 8024440C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 9DB430 80244410 0040202D */ daddu $a0, $v0, $zero -/* 9DB434 80244414 8E050000 */ lw $a1, ($s0) -/* 9DB438 80244418 26100004 */ addiu $s0, $s0, 4 -/* 9DB43C 8024441C 0220202D */ daddu $a0, $s1, $zero -/* 9DB440 80244420 0C0B210B */ jal get_float_variable -/* 9DB444 80244424 0040902D */ daddu $s2, $v0, $zero -/* 9DB448 80244428 8E050000 */ lw $a1, ($s0) -/* 9DB44C 8024442C 26100004 */ addiu $s0, $s0, 4 -/* 9DB450 80244430 0220202D */ daddu $a0, $s1, $zero -/* 9DB454 80244434 0C0B210B */ jal get_float_variable -/* 9DB458 80244438 46000706 */ mov.s $f28, $f0 -/* 9DB45C 8024443C 8E050000 */ lw $a1, ($s0) -/* 9DB460 80244440 26100004 */ addiu $s0, $s0, 4 -/* 9DB464 80244444 0220202D */ daddu $a0, $s1, $zero -/* 9DB468 80244448 0C0B210B */ jal get_float_variable -/* 9DB46C 8024444C 46000686 */ mov.s $f26, $f0 -/* 9DB470 80244450 0220202D */ daddu $a0, $s1, $zero -/* 9DB474 80244454 8E050000 */ lw $a1, ($s0) -/* 9DB478 80244458 0C0B210B */ jal get_float_variable -/* 9DB47C 8024445C 46000586 */ mov.s $f22, $f0 -/* 9DB480 80244460 0240202D */ daddu $a0, $s2, $zero -/* 9DB484 80244464 0C046B4C */ jal get_model_from_list_index -/* 9DB488 80244468 46000606 */ mov.s $f24, $f0 -/* 9DB48C 8024446C 0040882D */ daddu $s1, $v0, $zero -/* 9DB490 80244470 96220000 */ lhu $v0, ($s1) -/* 9DB494 80244474 30420400 */ andi $v0, $v0, 0x400 -/* 9DB498 80244478 1440001E */ bnez $v0, .L802444F4 -/* 9DB49C 8024447C 26300058 */ addiu $s0, $s1, 0x58 -/* 9DB4A0 80244480 4480A000 */ mtc1 $zero, $f20 -/* 9DB4A4 80244484 4406B000 */ mfc1 $a2, $f22 -/* 9DB4A8 80244488 4405A000 */ mfc1 $a1, $f20 -/* 9DB4AC 8024448C 4407A000 */ mfc1 $a3, $f20 -/* 9DB4B0 80244490 0C019E40 */ jal guTranslateF -/* 9DB4B4 80244494 0200202D */ daddu $a0, $s0, $zero -/* 9DB4B8 80244498 4405E000 */ mfc1 $a1, $f28 -/* 9DB4BC 8024449C 4406D000 */ mfc1 $a2, $f26 -/* 9DB4C0 802444A0 4407C000 */ mfc1 $a3, $f24 -/* 9DB4C4 802444A4 0C0910D8 */ jal func_80244360 -/* 9DB4C8 802444A8 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB4CC 802444AC 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB4D0 802444B0 0200282D */ daddu $a1, $s0, $zero -/* 9DB4D4 802444B4 0C019D80 */ jal guMtxCatF -/* 9DB4D8 802444B8 0200302D */ daddu $a2, $s0, $zero -/* 9DB4DC 802444BC 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB4E0 802444C0 4600B587 */ neg.s $f22, $f22 -/* 9DB4E4 802444C4 4405A000 */ mfc1 $a1, $f20 -/* 9DB4E8 802444C8 4406B000 */ mfc1 $a2, $f22 -/* 9DB4EC 802444CC 0C019E40 */ jal guTranslateF -/* 9DB4F0 802444D0 00A0382D */ daddu $a3, $a1, $zero -/* 9DB4F4 802444D4 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB4F8 802444D8 0200282D */ daddu $a1, $s0, $zero -/* 9DB4FC 802444DC 0C019D80 */ jal guMtxCatF -/* 9DB500 802444E0 00A0302D */ daddu $a2, $a1, $zero -/* 9DB504 802444E4 96220000 */ lhu $v0, ($s1) -/* 9DB508 802444E8 34421400 */ ori $v0, $v0, 0x1400 -/* 9DB50C 802444EC 0809115B */ j .L8024456C -/* 9DB510 802444F0 A6220000 */ sh $v0, ($s1) -.L802444F4: -/* 9DB514 802444F4 4480A000 */ mtc1 $zero, $f20 -/* 9DB518 802444F8 4406B000 */ mfc1 $a2, $f22 -/* 9DB51C 802444FC 4405A000 */ mfc1 $a1, $f20 -/* 9DB520 80244500 4407A000 */ mfc1 $a3, $f20 -/* 9DB524 80244504 0C019E40 */ jal guTranslateF -/* 9DB528 80244508 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB52C 8024450C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB530 80244510 26300058 */ addiu $s0, $s1, 0x58 -/* 9DB534 80244514 0200282D */ daddu $a1, $s0, $zero -/* 9DB538 80244518 0C019D80 */ jal guMtxCatF -/* 9DB53C 8024451C 0200302D */ daddu $a2, $s0, $zero -/* 9DB540 80244520 4405E000 */ mfc1 $a1, $f28 -/* 9DB544 80244524 4406D000 */ mfc1 $a2, $f26 -/* 9DB548 80244528 4407C000 */ mfc1 $a3, $f24 -/* 9DB54C 8024452C 0C0910D8 */ jal func_80244360 -/* 9DB550 80244530 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB554 80244534 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB558 80244538 0200282D */ daddu $a1, $s0, $zero -/* 9DB55C 8024453C 0C019D80 */ jal guMtxCatF -/* 9DB560 80244540 0200302D */ daddu $a2, $s0, $zero -/* 9DB564 80244544 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB568 80244548 4600B587 */ neg.s $f22, $f22 -/* 9DB56C 8024454C 4405A000 */ mfc1 $a1, $f20 -/* 9DB570 80244550 4406B000 */ mfc1 $a2, $f22 -/* 9DB574 80244554 0C019E40 */ jal guTranslateF -/* 9DB578 80244558 00A0382D */ daddu $a3, $a1, $zero -/* 9DB57C 8024455C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9DB580 80244560 0200282D */ daddu $a1, $s0, $zero -/* 9DB584 80244564 0C019D80 */ jal guMtxCatF -/* 9DB588 80244568 00A0302D */ daddu $a2, $a1, $zero -.L8024456C: -/* 9DB58C 8024456C 8FBF005C */ lw $ra, 0x5c($sp) -/* 9DB590 80244570 8FB20058 */ lw $s2, 0x58($sp) -/* 9DB594 80244574 8FB10054 */ lw $s1, 0x54($sp) -/* 9DB598 80244578 8FB00050 */ lw $s0, 0x50($sp) -/* 9DB59C 8024457C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 9DB5A0 80244580 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9DB5A4 80244584 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9DB5A8 80244588 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9DB5AC 8024458C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9DB5B0 80244590 24020002 */ addiu $v0, $zero, 2 -/* 9DB5B4 80244594 03E00008 */ jr $ra -/* 9DB5B8 80244598 27BD0088 */ addiu $sp, $sp, 0x88 -/* 9DB5BC 8024459C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_802443D0_9DB3F0.s b/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_802443D0_9DB3F0.s new file mode 100644 index 0000000000..059f82f636 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_02/9DB380/func_802443D0_9DB3F0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802443D0_9DB3F0 +/* 9DB3F0 802443D0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 9DB3F4 802443D4 AFB10054 */ sw $s1, 0x54($sp) +/* 9DB3F8 802443D8 0080882D */ daddu $s1, $a0, $zero +/* 9DB3FC 802443DC AFBF005C */ sw $ra, 0x5c($sp) +/* 9DB400 802443E0 AFB20058 */ sw $s2, 0x58($sp) +/* 9DB404 802443E4 AFB00050 */ sw $s0, 0x50($sp) +/* 9DB408 802443E8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 9DB40C 802443EC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 9DB410 802443F0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 9DB414 802443F4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 9DB418 802443F8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 9DB41C 802443FC 8E30000C */ lw $s0, 0xc($s1) +/* 9DB420 80244400 8E050000 */ lw $a1, ($s0) +/* 9DB424 80244404 0C0B1EAF */ jal get_variable +/* 9DB428 80244408 26100004 */ addiu $s0, $s0, 4 +/* 9DB42C 8024440C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 9DB430 80244410 0040202D */ daddu $a0, $v0, $zero +/* 9DB434 80244414 8E050000 */ lw $a1, ($s0) +/* 9DB438 80244418 26100004 */ addiu $s0, $s0, 4 +/* 9DB43C 8024441C 0220202D */ daddu $a0, $s1, $zero +/* 9DB440 80244420 0C0B210B */ jal get_float_variable +/* 9DB444 80244424 0040902D */ daddu $s2, $v0, $zero +/* 9DB448 80244428 8E050000 */ lw $a1, ($s0) +/* 9DB44C 8024442C 26100004 */ addiu $s0, $s0, 4 +/* 9DB450 80244430 0220202D */ daddu $a0, $s1, $zero +/* 9DB454 80244434 0C0B210B */ jal get_float_variable +/* 9DB458 80244438 46000706 */ mov.s $f28, $f0 +/* 9DB45C 8024443C 8E050000 */ lw $a1, ($s0) +/* 9DB460 80244440 26100004 */ addiu $s0, $s0, 4 +/* 9DB464 80244444 0220202D */ daddu $a0, $s1, $zero +/* 9DB468 80244448 0C0B210B */ jal get_float_variable +/* 9DB46C 8024444C 46000686 */ mov.s $f26, $f0 +/* 9DB470 80244450 0220202D */ daddu $a0, $s1, $zero +/* 9DB474 80244454 8E050000 */ lw $a1, ($s0) +/* 9DB478 80244458 0C0B210B */ jal get_float_variable +/* 9DB47C 8024445C 46000586 */ mov.s $f22, $f0 +/* 9DB480 80244460 0240202D */ daddu $a0, $s2, $zero +/* 9DB484 80244464 0C046B4C */ jal get_model_from_list_index +/* 9DB488 80244468 46000606 */ mov.s $f24, $f0 +/* 9DB48C 8024446C 0040882D */ daddu $s1, $v0, $zero +/* 9DB490 80244470 96220000 */ lhu $v0, ($s1) +/* 9DB494 80244474 30420400 */ andi $v0, $v0, 0x400 +/* 9DB498 80244478 1440001E */ bnez $v0, .L802444F4 +/* 9DB49C 8024447C 26300058 */ addiu $s0, $s1, 0x58 +/* 9DB4A0 80244480 4480A000 */ mtc1 $zero, $f20 +/* 9DB4A4 80244484 4406B000 */ mfc1 $a2, $f22 +/* 9DB4A8 80244488 4405A000 */ mfc1 $a1, $f20 +/* 9DB4AC 8024448C 4407A000 */ mfc1 $a3, $f20 +/* 9DB4B0 80244490 0C019E40 */ jal guTranslateF +/* 9DB4B4 80244494 0200202D */ daddu $a0, $s0, $zero +/* 9DB4B8 80244498 4405E000 */ mfc1 $a1, $f28 +/* 9DB4BC 8024449C 4406D000 */ mfc1 $a2, $f26 +/* 9DB4C0 802444A0 4407C000 */ mfc1 $a3, $f24 +/* 9DB4C4 802444A4 0C0910D8 */ jal func_80244360_9DB380 +/* 9DB4C8 802444A8 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB4CC 802444AC 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB4D0 802444B0 0200282D */ daddu $a1, $s0, $zero +/* 9DB4D4 802444B4 0C019D80 */ jal guMtxCatF +/* 9DB4D8 802444B8 0200302D */ daddu $a2, $s0, $zero +/* 9DB4DC 802444BC 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB4E0 802444C0 4600B587 */ neg.s $f22, $f22 +/* 9DB4E4 802444C4 4405A000 */ mfc1 $a1, $f20 +/* 9DB4E8 802444C8 4406B000 */ mfc1 $a2, $f22 +/* 9DB4EC 802444CC 0C019E40 */ jal guTranslateF +/* 9DB4F0 802444D0 00A0382D */ daddu $a3, $a1, $zero +/* 9DB4F4 802444D4 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB4F8 802444D8 0200282D */ daddu $a1, $s0, $zero +/* 9DB4FC 802444DC 0C019D80 */ jal guMtxCatF +/* 9DB500 802444E0 00A0302D */ daddu $a2, $a1, $zero +/* 9DB504 802444E4 96220000 */ lhu $v0, ($s1) +/* 9DB508 802444E8 34421400 */ ori $v0, $v0, 0x1400 +/* 9DB50C 802444EC 0809115B */ j .L8024456C +/* 9DB510 802444F0 A6220000 */ sh $v0, ($s1) +.L802444F4: +/* 9DB514 802444F4 4480A000 */ mtc1 $zero, $f20 +/* 9DB518 802444F8 4406B000 */ mfc1 $a2, $f22 +/* 9DB51C 802444FC 4405A000 */ mfc1 $a1, $f20 +/* 9DB520 80244500 4407A000 */ mfc1 $a3, $f20 +/* 9DB524 80244504 0C019E40 */ jal guTranslateF +/* 9DB528 80244508 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB52C 8024450C 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB530 80244510 26300058 */ addiu $s0, $s1, 0x58 +/* 9DB534 80244514 0200282D */ daddu $a1, $s0, $zero +/* 9DB538 80244518 0C019D80 */ jal guMtxCatF +/* 9DB53C 8024451C 0200302D */ daddu $a2, $s0, $zero +/* 9DB540 80244520 4405E000 */ mfc1 $a1, $f28 +/* 9DB544 80244524 4406D000 */ mfc1 $a2, $f26 +/* 9DB548 80244528 4407C000 */ mfc1 $a3, $f24 +/* 9DB54C 8024452C 0C0910D8 */ jal func_80244360_9DB380 +/* 9DB550 80244530 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB554 80244534 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB558 80244538 0200282D */ daddu $a1, $s0, $zero +/* 9DB55C 8024453C 0C019D80 */ jal guMtxCatF +/* 9DB560 80244540 0200302D */ daddu $a2, $s0, $zero +/* 9DB564 80244544 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB568 80244548 4600B587 */ neg.s $f22, $f22 +/* 9DB56C 8024454C 4405A000 */ mfc1 $a1, $f20 +/* 9DB570 80244550 4406B000 */ mfc1 $a2, $f22 +/* 9DB574 80244554 0C019E40 */ jal guTranslateF +/* 9DB578 80244558 00A0382D */ daddu $a3, $a1, $zero +/* 9DB57C 8024455C 27A40010 */ addiu $a0, $sp, 0x10 +/* 9DB580 80244560 0200282D */ daddu $a1, $s0, $zero +/* 9DB584 80244564 0C019D80 */ jal guMtxCatF +/* 9DB588 80244568 00A0302D */ daddu $a2, $a1, $zero +.L8024456C: +/* 9DB58C 8024456C 8FBF005C */ lw $ra, 0x5c($sp) +/* 9DB590 80244570 8FB20058 */ lw $s2, 0x58($sp) +/* 9DB594 80244574 8FB10054 */ lw $s1, 0x54($sp) +/* 9DB598 80244578 8FB00050 */ lw $s0, 0x50($sp) +/* 9DB59C 8024457C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 9DB5A0 80244580 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 9DB5A4 80244584 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 9DB5A8 80244588 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 9DB5AC 8024458C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 9DB5B0 80244590 24020002 */ addiu $v0, $zero, 2 +/* 9DB5B4 80244594 03E00008 */ jr $ra +/* 9DB5B8 80244598 27BD0088 */ addiu $sp, $sp, 0x88 +/* 9DB5BC 8024459C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s index 0eac6f1d19..55a22f6e99 100644 --- a/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s +++ b/asm/nonmatchings/world/area_nok/nok_03/9EB7F0/func_80240BF0_9EC3E0.s @@ -95,17 +95,17 @@ glabel func_80240BF0_9EC3E0 /* 9EC540 80240D50 00000000 */ nop /* 9EC544 80240D54 0260202D */ daddu $a0, $s3, $zero /* 9EC548 80240D58 0280282D */ daddu $a1, $s4, $zero -/* 9EC54C 80240D5C 0C090000 */ jal func_80240000 +/* 9EC54C 80240D5C 0C090000 */ jal func_80240000_9EB7F0 /* 9EC550 80240D60 0200302D */ daddu $a2, $s0, $zero /* 9EC554 80240D64 0260202D */ daddu $a0, $s3, $zero /* 9EC558 80240D68 0280282D */ daddu $a1, $s4, $zero -/* 9EC55C 80240D6C 0C09008C */ jal func_80240230 +/* 9EC55C 80240D6C 0C09008C */ jal func_80240230_9EBA20 /* 9EC560 80240D70 0200302D */ daddu $a2, $s0, $zero /* 9EC564 80240D74 0809037C */ j .L80240DF0 /* 9EC568 80240D78 0000102D */ daddu $v0, $zero, $zero /* 9EC56C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* 9EC570 80240D80 0280282D */ daddu $a1, $s4, $zero -/* 9EC574 80240D84 0C09015A */ jal func_80240568 +/* 9EC574 80240D84 0C09015A */ jal func_80240568_9EBD58 /* 9EC578 80240D88 0200302D */ daddu $a2, $s0, $zero /* 9EC57C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* 9EC580 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80240BF0_9EC3E0 /* 9EC588 80240D98 0000102D */ daddu $v0, $zero, $zero /* 9EC58C 80240D9C 0260202D */ daddu $a0, $s3, $zero /* 9EC590 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 9EC594 80240DA4 0C09018A */ jal func_80240628 +/* 9EC594 80240DA4 0C09018A */ jal func_80240628_9EBE18 /* 9EC598 80240DA8 0200302D */ daddu $a2, $s0, $zero /* 9EC59C 80240DAC 0809037C */ j .L80240DF0 /* 9EC5A0 80240DB0 0000102D */ daddu $v0, $zero, $zero /* 9EC5A4 80240DB4 0260202D */ daddu $a0, $s3, $zero /* 9EC5A8 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 9EC5AC 80240DBC 0C0901F3 */ jal func_802407CC +/* 9EC5AC 80240DBC 0C0901F3 */ jal func_802407CC_9EBFBC /* 9EC5B0 80240DC0 0200302D */ daddu $a2, $s0, $zero /* 9EC5B4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* 9EC5B8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 9EC5BC 80240DCC 0C09022B */ jal func_802408AC +/* 9EC5BC 80240DCC 0C09022B */ jal func_802408AC_9EC09C /* 9EC5C0 80240DD0 0200302D */ daddu $a2, $s0, $zero /* 9EC5C4 80240DD4 0809037C */ j .L80240DF0 /* 9EC5C8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* 9EC5CC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* 9EC5D0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 9EC5D4 80240DE4 0C0902EB */ jal func_80240BAC +/* 9EC5D4 80240DE4 0C0902EB */ jal func_80240BAC_9EC39C /* 9EC5D8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* 9EC5DC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C.s deleted file mode 100644 index 98e6ffea68..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024051C -/* 9EE10C 8024051C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9EE110 80240520 AFBF0010 */ sw $ra, 0x10($sp) -/* 9EE114 80240524 8C82000C */ lw $v0, 0xc($a0) -/* 9EE118 80240528 0C0B1EAF */ jal get_variable -/* 9EE11C 8024052C 8C450000 */ lw $a1, ($v0) -/* 9EE120 80240530 8FBF0010 */ lw $ra, 0x10($sp) -/* 9EE124 80240534 3C018024 */ lui $at, 0x8024 -/* 9EE128 80240538 AC221438 */ sw $v0, 0x1438($at) -/* 9EE12C 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 9EE130 80240540 03E00008 */ jr $ra -/* 9EE134 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s new file mode 100644 index 0000000000..a59a241438 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_8024051C_9EE10C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024051C_9EE10C +/* 9EE10C 8024051C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9EE110 80240520 AFBF0010 */ sw $ra, 0x10($sp) +/* 9EE114 80240524 8C82000C */ lw $v0, 0xc($a0) +/* 9EE118 80240528 0C0B1EAF */ jal get_variable +/* 9EE11C 8024052C 8C450000 */ lw $a1, ($v0) +/* 9EE120 80240530 8FBF0010 */ lw $ra, 0x10($sp) +/* 9EE124 80240534 3C018024 */ lui $at, 0x8024 +/* 9EE128 80240538 AC221438 */ sw $v0, 0x1438($at) +/* 9EE12C 8024053C 24020002 */ addiu $v0, $zero, 2 +/* 9EE130 80240540 03E00008 */ jr $ra +/* 9EE134 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C.s deleted file mode 100644 index a58c46c12c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E4C -/* 9EEA3C 80240E4C 10A00003 */ beqz $a1, .L80240E5C -/* 9EEA40 80240E50 00000000 */ nop -/* 9EEA44 80240E54 3C018024 */ lui $at, 0x8024 -/* 9EEA48 80240E58 AC203254 */ sw $zero, 0x3254($at) -.L80240E5C: -/* 9EEA4C 80240E5C 3C028024 */ lui $v0, 0x8024 -/* 9EEA50 80240E60 8C423254 */ lw $v0, 0x3254($v0) -/* 9EEA54 80240E64 0002102B */ sltu $v0, $zero, $v0 -/* 9EEA58 80240E68 03E00008 */ jr $ra -/* 9EEA5C 80240E6C 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s new file mode 100644 index 0000000000..4c6dbea629 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_04/9EDBF0/func_80240E4C_9EEA3C.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E4C_9EEA3C +/* 9EEA3C 80240E4C 10A00003 */ beqz $a1, .L80240E5C +/* 9EEA40 80240E50 00000000 */ nop +/* 9EEA44 80240E54 3C018024 */ lui $at, 0x8024 +/* 9EEA48 80240E58 AC203254 */ sw $zero, 0x3254($at) +.L80240E5C: +/* 9EEA4C 80240E5C 3C028024 */ lui $v0, 0x8024 +/* 9EEA50 80240E60 8C423254 */ lw $v0, 0x3254($v0) +/* 9EEA54 80240E64 0002102B */ sltu $v0, $zero, $v0 +/* 9EEA58 80240E68 03E00008 */ jr $ra +/* 9EEA5C 80240E6C 00021040 */ sll $v0, $v0, 1 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s index e25f6b6a17..ded9d8b413 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80240394_9F4DD4.s @@ -232,25 +232,25 @@ glabel func_80240394_9F4DD4 .L802406E4: /* 9F5124 802406E4 0260202D */ daddu $a0, $s3, $zero /* 9F5128 802406E8 0280282D */ daddu $a1, $s4, $zero -/* 9F512C 802406EC 0C090000 */ jal func_80240000 +/* 9F512C 802406EC 0C090000 */ jal func_80240000_9F4A40 /* 9F5130 802406F0 02A0302D */ daddu $a2, $s5, $zero /* 9F5134 802406F4 0260202D */ daddu $a0, $s3, $zero .L802406F8: /* 9F5138 802406F8 0280282D */ daddu $a1, $s4, $zero -/* 9F513C 802406FC 0C09001F */ jal func_8024007C +/* 9F513C 802406FC 0C09001F */ jal func_8024007C_9F4ABC /* 9F5140 80240700 02A0302D */ daddu $a2, $s5, $zero /* 9F5144 80240704 080901D0 */ j .L80240740 /* 9F5148 80240708 00000000 */ nop .L8024070C: /* 9F514C 8024070C 0260202D */ daddu $a0, $s3, $zero /* 9F5150 80240710 0280282D */ daddu $a1, $s4, $zero -/* 9F5154 80240714 0C09006C */ jal func_802401B0 +/* 9F5154 80240714 0C09006C */ jal func_802401B0_9F4BF0 /* 9F5158 80240718 02A0302D */ daddu $a2, $s5, $zero /* 9F515C 8024071C 080901D0 */ j .L80240740 /* 9F5160 80240720 00000000 */ nop .L80240724: /* 9F5164 80240724 0280282D */ daddu $a1, $s4, $zero -/* 9F5168 80240728 0C0900C5 */ jal func_80240314 +/* 9F5168 80240728 0C0900C5 */ jal func_80240314_9F4D54 /* 9F516C 8024072C 02A0302D */ daddu $a2, $s5, $zero /* 9F5170 80240730 080901D0 */ j .L80240740 /* 9F5174 80240734 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0.s deleted file mode 100644 index 616977d38e..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413B0 -/* 9F5DF0 802413B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9F5DF4 802413B4 AFB20018 */ sw $s2, 0x18($sp) -/* 9F5DF8 802413B8 0080902D */ daddu $s2, $a0, $zero -/* 9F5DFC 802413BC AFBF001C */ sw $ra, 0x1c($sp) -/* 9F5E00 802413C0 AFB10014 */ sw $s1, 0x14($sp) -/* 9F5E04 802413C4 AFB00010 */ sw $s0, 0x10($sp) -/* 9F5E08 802413C8 8E510148 */ lw $s1, 0x148($s2) -/* 9F5E0C 802413CC 0C00EABB */ jal get_npc_unsafe -/* 9F5E10 802413D0 86240008 */ lh $a0, 8($s1) -/* 9F5E14 802413D4 0040802D */ daddu $s0, $v0, $zero -/* 9F5E18 802413D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F5E1C 802413DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F5E20 802413E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F5E24 802413E4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F5E28 802413E8 A600008E */ sh $zero, 0x8e($s0) -/* 9F5E2C 802413EC 8C460028 */ lw $a2, 0x28($v0) -/* 9F5E30 802413F0 0C00A720 */ jal atan2 -/* 9F5E34 802413F4 8C470030 */ lw $a3, 0x30($v0) -/* 9F5E38 802413F8 E600000C */ swc1 $f0, 0xc($s0) -/* 9F5E3C 802413FC 8E2200CC */ lw $v0, 0xcc($s1) -/* 9F5E40 80241400 8C420020 */ lw $v0, 0x20($v0) -/* 9F5E44 80241404 AE020028 */ sw $v0, 0x28($s0) -/* 9F5E48 80241408 2402000B */ addiu $v0, $zero, 0xb -/* 9F5E4C 8024140C AE420070 */ sw $v0, 0x70($s2) -/* 9F5E50 80241410 8FBF001C */ lw $ra, 0x1c($sp) -/* 9F5E54 80241414 8FB20018 */ lw $s2, 0x18($sp) -/* 9F5E58 80241418 8FB10014 */ lw $s1, 0x14($sp) -/* 9F5E5C 8024141C 8FB00010 */ lw $s0, 0x10($sp) -/* 9F5E60 80241420 03E00008 */ jr $ra -/* 9F5E64 80241424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0_9F5DF0.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0_9F5DF0.s new file mode 100644 index 0000000000..d1834f31c6 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802413B0_9F5DF0.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413B0_9F5DF0 +/* 9F5DF0 802413B0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9F5DF4 802413B4 AFB20018 */ sw $s2, 0x18($sp) +/* 9F5DF8 802413B8 0080902D */ daddu $s2, $a0, $zero +/* 9F5DFC 802413BC AFBF001C */ sw $ra, 0x1c($sp) +/* 9F5E00 802413C0 AFB10014 */ sw $s1, 0x14($sp) +/* 9F5E04 802413C4 AFB00010 */ sw $s0, 0x10($sp) +/* 9F5E08 802413C8 8E510148 */ lw $s1, 0x148($s2) +/* 9F5E0C 802413CC 0C00EABB */ jal get_npc_unsafe +/* 9F5E10 802413D0 86240008 */ lh $a0, 8($s1) +/* 9F5E14 802413D4 0040802D */ daddu $s0, $v0, $zero +/* 9F5E18 802413D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9F5E1C 802413DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9F5E20 802413E0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9F5E24 802413E4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9F5E28 802413E8 A600008E */ sh $zero, 0x8e($s0) +/* 9F5E2C 802413EC 8C460028 */ lw $a2, 0x28($v0) +/* 9F5E30 802413F0 0C00A720 */ jal atan2 +/* 9F5E34 802413F4 8C470030 */ lw $a3, 0x30($v0) +/* 9F5E38 802413F8 E600000C */ swc1 $f0, 0xc($s0) +/* 9F5E3C 802413FC 8E2200CC */ lw $v0, 0xcc($s1) +/* 9F5E40 80241400 8C420020 */ lw $v0, 0x20($v0) +/* 9F5E44 80241404 AE020028 */ sw $v0, 0x28($s0) +/* 9F5E48 80241408 2402000B */ addiu $v0, $zero, 0xb +/* 9F5E4C 8024140C AE420070 */ sw $v0, 0x70($s2) +/* 9F5E50 80241410 8FBF001C */ lw $ra, 0x1c($sp) +/* 9F5E54 80241414 8FB20018 */ lw $s2, 0x18($sp) +/* 9F5E58 80241418 8FB10014 */ lw $s1, 0x14($sp) +/* 9F5E5C 8024141C 8FB00010 */ lw $s0, 0x10($sp) +/* 9F5E60 80241420 03E00008 */ jr $ra +/* 9F5E64 80241424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494.s deleted file mode 100644 index e10d251872..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241494 -/* 9F5ED4 80241494 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9F5ED8 80241498 AFB3001C */ sw $s3, 0x1c($sp) -/* 9F5EDC 8024149C 0080982D */ daddu $s3, $a0, $zero -/* 9F5EE0 802414A0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9F5EE4 802414A4 AFB20018 */ sw $s2, 0x18($sp) -/* 9F5EE8 802414A8 AFB10014 */ sw $s1, 0x14($sp) -/* 9F5EEC 802414AC AFB00010 */ sw $s0, 0x10($sp) -/* 9F5EF0 802414B0 8E720148 */ lw $s2, 0x148($s3) -/* 9F5EF4 802414B4 86440008 */ lh $a0, 8($s2) -/* 9F5EF8 802414B8 0C00EABB */ jal get_npc_unsafe -/* 9F5EFC 802414BC 00A0802D */ daddu $s0, $a1, $zero -/* 9F5F00 802414C0 0040882D */ daddu $s1, $v0, $zero -/* 9F5F04 802414C4 C6420080 */ lwc1 $f2, 0x80($s2) -/* 9F5F08 802414C8 468010A0 */ cvt.s.w $f2, $f2 -/* 9F5F0C 802414CC 460010A1 */ cvt.d.s $f2, $f2 -/* 9F5F10 802414D0 C6400084 */ lwc1 $f0, 0x84($s2) -/* 9F5F14 802414D4 46800020 */ cvt.s.w $f0, $f0 -/* 9F5F18 802414D8 46000021 */ cvt.d.s $f0, $f0 -/* 9F5F1C 802414DC 3C014059 */ lui $at, 0x4059 -/* 9F5F20 802414E0 44812800 */ mtc1 $at, $f5 -/* 9F5F24 802414E4 44802000 */ mtc1 $zero, $f4 -/* 9F5F28 802414E8 8E4200CC */ lw $v0, 0xcc($s2) -/* 9F5F2C 802414EC C62C0038 */ lwc1 $f12, 0x38($s1) -/* 9F5F30 802414F0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 9F5F34 802414F4 46241083 */ div.d $f2, $f2, $f4 -/* 9F5F38 802414F8 462010A0 */ cvt.s.d $f2, $f2 -/* 9F5F3C 802414FC 46240003 */ div.d $f0, $f0, $f4 -/* 9F5F40 80241500 8C420020 */ lw $v0, 0x20($v0) -/* 9F5F44 80241504 46200020 */ cvt.s.d $f0, $f0 -/* 9F5F48 80241508 E622001C */ swc1 $f2, 0x1c($s1) -/* 9F5F4C 8024150C E6200014 */ swc1 $f0, 0x14($s1) -/* 9F5F50 80241510 AE220028 */ sw $v0, 0x28($s1) -/* 9F5F54 80241514 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9F5F58 80241518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F5F5C 8024151C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F5F60 80241520 E6200018 */ swc1 $f0, 0x18($s1) -/* 9F5F64 80241524 8C460028 */ lw $a2, 0x28($v0) -/* 9F5F68 80241528 0C00A720 */ jal atan2 -/* 9F5F6C 8024152C 8C470030 */ lw $a3, 0x30($v0) -/* 9F5F70 80241530 E620000C */ swc1 $f0, 0xc($s1) -/* 9F5F74 80241534 8E420018 */ lw $v0, 0x18($s2) -/* 9F5F78 80241538 AE400074 */ sw $zero, 0x74($s2) -/* 9F5F7C 8024153C 9442002A */ lhu $v0, 0x2a($v0) -/* 9F5F80 80241540 30420002 */ andi $v0, $v0, 2 -/* 9F5F84 80241544 10400005 */ beqz $v0, .L8024155C -/* 9F5F88 80241548 24020003 */ addiu $v0, $zero, 3 -/* 9F5F8C 8024154C A622008E */ sh $v0, 0x8e($s1) -/* 9F5F90 80241550 2402000D */ addiu $v0, $zero, 0xd -/* 9F5F94 80241554 0809056B */ j .L802415AC -/* 9F5F98 80241558 AE620070 */ sw $v0, 0x70($s3) -.L8024155C: -/* 9F5F9C 8024155C 24030001 */ addiu $v1, $zero, 1 -/* 9F5FA0 80241560 2402000E */ addiu $v0, $zero, 0xe -/* 9F5FA4 80241564 A623008E */ sh $v1, 0x8e($s1) -/* 9F5FA8 80241568 AE620070 */ sw $v0, 0x70($s3) -/* 9F5FAC 8024156C C6200038 */ lwc1 $f0, 0x38($s1) -/* 9F5FB0 80241570 4600018D */ trunc.w.s $f6, $f0 -/* 9F5FB4 80241574 44023000 */ mfc1 $v0, $f6 -/* 9F5FB8 80241578 00000000 */ nop -/* 9F5FBC 8024157C A6420010 */ sh $v0, 0x10($s2) -/* 9F5FC0 80241580 C620003C */ lwc1 $f0, 0x3c($s1) -/* 9F5FC4 80241584 4600018D */ trunc.w.s $f6, $f0 -/* 9F5FC8 80241588 44023000 */ mfc1 $v0, $f6 -/* 9F5FCC 8024158C 00000000 */ nop -/* 9F5FD0 80241590 A6420012 */ sh $v0, 0x12($s2) -/* 9F5FD4 80241594 C6200040 */ lwc1 $f0, 0x40($s1) -/* 9F5FD8 80241598 A2430007 */ sb $v1, 7($s2) -/* 9F5FDC 8024159C 4600018D */ trunc.w.s $f6, $f0 -/* 9F5FE0 802415A0 44023000 */ mfc1 $v0, $f6 -/* 9F5FE4 802415A4 00000000 */ nop -/* 9F5FE8 802415A8 A6420014 */ sh $v0, 0x14($s2) -.L802415AC: -/* 9F5FEC 802415AC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9F5FF0 802415B0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9F5FF4 802415B4 8FB20018 */ lw $s2, 0x18($sp) -/* 9F5FF8 802415B8 8FB10014 */ lw $s1, 0x14($sp) -/* 9F5FFC 802415BC 8FB00010 */ lw $s0, 0x10($sp) -/* 9F6000 802415C0 03E00008 */ jr $ra -/* 9F6004 802415C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s new file mode 100644 index 0000000000..6e408524ad --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241494_9F5ED4.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241494_9F5ED4 +/* 9F5ED4 80241494 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9F5ED8 80241498 AFB3001C */ sw $s3, 0x1c($sp) +/* 9F5EDC 8024149C 0080982D */ daddu $s3, $a0, $zero +/* 9F5EE0 802414A0 AFBF0020 */ sw $ra, 0x20($sp) +/* 9F5EE4 802414A4 AFB20018 */ sw $s2, 0x18($sp) +/* 9F5EE8 802414A8 AFB10014 */ sw $s1, 0x14($sp) +/* 9F5EEC 802414AC AFB00010 */ sw $s0, 0x10($sp) +/* 9F5EF0 802414B0 8E720148 */ lw $s2, 0x148($s3) +/* 9F5EF4 802414B4 86440008 */ lh $a0, 8($s2) +/* 9F5EF8 802414B8 0C00EABB */ jal get_npc_unsafe +/* 9F5EFC 802414BC 00A0802D */ daddu $s0, $a1, $zero +/* 9F5F00 802414C0 0040882D */ daddu $s1, $v0, $zero +/* 9F5F04 802414C4 C6420080 */ lwc1 $f2, 0x80($s2) +/* 9F5F08 802414C8 468010A0 */ cvt.s.w $f2, $f2 +/* 9F5F0C 802414CC 460010A1 */ cvt.d.s $f2, $f2 +/* 9F5F10 802414D0 C6400084 */ lwc1 $f0, 0x84($s2) +/* 9F5F14 802414D4 46800020 */ cvt.s.w $f0, $f0 +/* 9F5F18 802414D8 46000021 */ cvt.d.s $f0, $f0 +/* 9F5F1C 802414DC 3C014059 */ lui $at, 0x4059 +/* 9F5F20 802414E0 44812800 */ mtc1 $at, $f5 +/* 9F5F24 802414E4 44802000 */ mtc1 $zero, $f4 +/* 9F5F28 802414E8 8E4200CC */ lw $v0, 0xcc($s2) +/* 9F5F2C 802414EC C62C0038 */ lwc1 $f12, 0x38($s1) +/* 9F5F30 802414F0 C62E0040 */ lwc1 $f14, 0x40($s1) +/* 9F5F34 802414F4 46241083 */ div.d $f2, $f2, $f4 +/* 9F5F38 802414F8 462010A0 */ cvt.s.d $f2, $f2 +/* 9F5F3C 802414FC 46240003 */ div.d $f0, $f0, $f4 +/* 9F5F40 80241500 8C420020 */ lw $v0, 0x20($v0) +/* 9F5F44 80241504 46200020 */ cvt.s.d $f0, $f0 +/* 9F5F48 80241508 E622001C */ swc1 $f2, 0x1c($s1) +/* 9F5F4C 8024150C E6200014 */ swc1 $f0, 0x14($s1) +/* 9F5F50 80241510 AE220028 */ sw $v0, 0x28($s1) +/* 9F5F54 80241514 C6000018 */ lwc1 $f0, 0x18($s0) +/* 9F5F58 80241518 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9F5F5C 8024151C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9F5F60 80241520 E6200018 */ swc1 $f0, 0x18($s1) +/* 9F5F64 80241524 8C460028 */ lw $a2, 0x28($v0) +/* 9F5F68 80241528 0C00A720 */ jal atan2 +/* 9F5F6C 8024152C 8C470030 */ lw $a3, 0x30($v0) +/* 9F5F70 80241530 E620000C */ swc1 $f0, 0xc($s1) +/* 9F5F74 80241534 8E420018 */ lw $v0, 0x18($s2) +/* 9F5F78 80241538 AE400074 */ sw $zero, 0x74($s2) +/* 9F5F7C 8024153C 9442002A */ lhu $v0, 0x2a($v0) +/* 9F5F80 80241540 30420002 */ andi $v0, $v0, 2 +/* 9F5F84 80241544 10400005 */ beqz $v0, .L8024155C +/* 9F5F88 80241548 24020003 */ addiu $v0, $zero, 3 +/* 9F5F8C 8024154C A622008E */ sh $v0, 0x8e($s1) +/* 9F5F90 80241550 2402000D */ addiu $v0, $zero, 0xd +/* 9F5F94 80241554 0809056B */ j .L802415AC +/* 9F5F98 80241558 AE620070 */ sw $v0, 0x70($s3) +.L8024155C: +/* 9F5F9C 8024155C 24030001 */ addiu $v1, $zero, 1 +/* 9F5FA0 80241560 2402000E */ addiu $v0, $zero, 0xe +/* 9F5FA4 80241564 A623008E */ sh $v1, 0x8e($s1) +/* 9F5FA8 80241568 AE620070 */ sw $v0, 0x70($s3) +/* 9F5FAC 8024156C C6200038 */ lwc1 $f0, 0x38($s1) +/* 9F5FB0 80241570 4600018D */ trunc.w.s $f6, $f0 +/* 9F5FB4 80241574 44023000 */ mfc1 $v0, $f6 +/* 9F5FB8 80241578 00000000 */ nop +/* 9F5FBC 8024157C A6420010 */ sh $v0, 0x10($s2) +/* 9F5FC0 80241580 C620003C */ lwc1 $f0, 0x3c($s1) +/* 9F5FC4 80241584 4600018D */ trunc.w.s $f6, $f0 +/* 9F5FC8 80241588 44023000 */ mfc1 $v0, $f6 +/* 9F5FCC 8024158C 00000000 */ nop +/* 9F5FD0 80241590 A6420012 */ sh $v0, 0x12($s2) +/* 9F5FD4 80241594 C6200040 */ lwc1 $f0, 0x40($s1) +/* 9F5FD8 80241598 A2430007 */ sb $v1, 7($s2) +/* 9F5FDC 8024159C 4600018D */ trunc.w.s $f6, $f0 +/* 9F5FE0 802415A0 44023000 */ mfc1 $v0, $f6 +/* 9F5FE4 802415A4 00000000 */ nop +/* 9F5FE8 802415A8 A6420014 */ sh $v0, 0x14($s2) +.L802415AC: +/* 9F5FEC 802415AC 8FBF0020 */ lw $ra, 0x20($sp) +/* 9F5FF0 802415B0 8FB3001C */ lw $s3, 0x1c($sp) +/* 9F5FF4 802415B4 8FB20018 */ lw $s2, 0x18($sp) +/* 9F5FF8 802415B8 8FB10014 */ lw $s1, 0x14($sp) +/* 9F5FFC 802415BC 8FB00010 */ lw $s0, 0x10($sp) +/* 9F6000 802415C0 03E00008 */ jr $ra +/* 9F6004 802415C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8.s deleted file mode 100644 index a3670f5aee..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415C8 -/* 9F6008 802415C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9F600C 802415CC AFB00010 */ sw $s0, 0x10($sp) -/* 9F6010 802415D0 0080802D */ daddu $s0, $a0, $zero -/* 9F6014 802415D4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9F6018 802415D8 8E020148 */ lw $v0, 0x148($s0) -/* 9F601C 802415DC 0C00EABB */ jal get_npc_unsafe -/* 9F6020 802415E0 84440008 */ lh $a0, 8($v0) -/* 9F6024 802415E4 0040202D */ daddu $a0, $v0, $zero -/* 9F6028 802415E8 8482008E */ lh $v0, 0x8e($a0) -/* 9F602C 802415EC 9483008E */ lhu $v1, 0x8e($a0) -/* 9F6030 802415F0 18400005 */ blez $v0, .L80241608 -/* 9F6034 802415F4 2462FFFF */ addiu $v0, $v1, -1 -/* 9F6038 802415F8 A482008E */ sh $v0, 0x8e($a0) -/* 9F603C 802415FC 00021400 */ sll $v0, $v0, 0x10 -/* 9F6040 80241600 1C400006 */ bgtz $v0, .L8024161C -/* 9F6044 80241604 00000000 */ nop -.L80241608: -/* 9F6048 80241608 8482008C */ lh $v0, 0x8c($a0) -/* 9F604C 8024160C 14400003 */ bnez $v0, .L8024161C -/* 9F6050 80241610 2402000E */ addiu $v0, $zero, 0xe -/* 9F6054 80241614 A480008E */ sh $zero, 0x8e($a0) -/* 9F6058 80241618 AE020070 */ sw $v0, 0x70($s0) -.L8024161C: -/* 9F605C 8024161C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9F6060 80241620 8FB00010 */ lw $s0, 0x10($sp) -/* 9F6064 80241624 03E00008 */ jr $ra -/* 9F6068 80241628 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s new file mode 100644 index 0000000000..c6e5de5891 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_802415C8_9F6008.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415C8_9F6008 +/* 9F6008 802415C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9F600C 802415CC AFB00010 */ sw $s0, 0x10($sp) +/* 9F6010 802415D0 0080802D */ daddu $s0, $a0, $zero +/* 9F6014 802415D4 AFBF0014 */ sw $ra, 0x14($sp) +/* 9F6018 802415D8 8E020148 */ lw $v0, 0x148($s0) +/* 9F601C 802415DC 0C00EABB */ jal get_npc_unsafe +/* 9F6020 802415E0 84440008 */ lh $a0, 8($v0) +/* 9F6024 802415E4 0040202D */ daddu $a0, $v0, $zero +/* 9F6028 802415E8 8482008E */ lh $v0, 0x8e($a0) +/* 9F602C 802415EC 9483008E */ lhu $v1, 0x8e($a0) +/* 9F6030 802415F0 18400005 */ blez $v0, .L80241608 +/* 9F6034 802415F4 2462FFFF */ addiu $v0, $v1, -1 +/* 9F6038 802415F8 A482008E */ sh $v0, 0x8e($a0) +/* 9F603C 802415FC 00021400 */ sll $v0, $v0, 0x10 +/* 9F6040 80241600 1C400006 */ bgtz $v0, .L8024161C +/* 9F6044 80241604 00000000 */ nop +.L80241608: +/* 9F6048 80241608 8482008C */ lh $v0, 0x8c($a0) +/* 9F604C 8024160C 14400003 */ bnez $v0, .L8024161C +/* 9F6050 80241610 2402000E */ addiu $v0, $zero, 0xe +/* 9F6054 80241614 A480008E */ sh $zero, 0x8e($a0) +/* 9F6058 80241618 AE020070 */ sw $v0, 0x70($s0) +.L8024161C: +/* 9F605C 8024161C 8FBF0014 */ lw $ra, 0x14($sp) +/* 9F6060 80241620 8FB00010 */ lw $s0, 0x10($sp) +/* 9F6064 80241624 03E00008 */ jr $ra +/* 9F6068 80241628 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C.s deleted file mode 100644 index 9ebc7af075..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024162C -/* 9F606C 8024162C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9F6070 80241630 AFB20030 */ sw $s2, 0x30($sp) -/* 9F6074 80241634 0080902D */ daddu $s2, $a0, $zero -/* 9F6078 80241638 AFBF0038 */ sw $ra, 0x38($sp) -/* 9F607C 8024163C AFB30034 */ sw $s3, 0x34($sp) -/* 9F6080 80241640 AFB1002C */ sw $s1, 0x2c($sp) -/* 9F6084 80241644 AFB00028 */ sw $s0, 0x28($sp) -/* 9F6088 80241648 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 9F608C 8024164C F7B40040 */ sdc1 $f20, 0x40($sp) -/* 9F6090 80241650 8E510148 */ lw $s1, 0x148($s2) -/* 9F6094 80241654 86240008 */ lh $a0, 8($s1) -/* 9F6098 80241658 0C00EABB */ jal get_npc_unsafe -/* 9F609C 8024165C 00A0982D */ daddu $s3, $a1, $zero -/* 9F60A0 80241660 0040802D */ daddu $s0, $v0, $zero -/* 9F60A4 80241664 0200202D */ daddu $a0, $s0, $zero -/* 9F60A8 80241668 C6220088 */ lwc1 $f2, 0x88($s1) -/* 9F60AC 8024166C 468010A0 */ cvt.s.w $f2, $f2 -/* 9F60B0 80241670 460010A1 */ cvt.d.s $f2, $f2 -/* 9F60B4 80241674 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9F60B8 80241678 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9F60BC 8024167C 8E050018 */ lw $a1, 0x18($s0) -/* 9F60C0 80241680 46002100 */ add.s $f4, $f4, $f0 -/* 9F60C4 80241684 8E06000C */ lw $a2, 0xc($s0) -/* 9F60C8 80241688 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9F60CC 8024168C 46800020 */ cvt.s.w $f0, $f0 -/* 9F60D0 80241690 E604001C */ swc1 $f4, 0x1c($s0) -/* 9F60D4 80241694 3C014059 */ lui $at, 0x4059 -/* 9F60D8 80241698 44812800 */ mtc1 $at, $f5 -/* 9F60DC 8024169C 44802000 */ mtc1 $zero, $f4 -/* 9F60E0 802416A0 46000021 */ cvt.d.s $f0, $f0 -/* 9F60E4 802416A4 46240003 */ div.d $f0, $f0, $f4 -/* 9F60E8 802416A8 46200520 */ cvt.s.d $f20, $f0 -/* 9F60EC 802416AC 46241083 */ div.d $f2, $f2, $f4 -/* 9F60F0 802416B0 0C00EA95 */ jal npc_move_heading -/* 9F60F4 802416B4 462015A0 */ cvt.s.d $f22, $f2 -/* 9F60F8 802416B8 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9F60FC 802416BC 44801000 */ mtc1 $zero, $f2 -/* 9F6100 802416C0 44801800 */ mtc1 $zero, $f3 -/* 9F6104 802416C4 46002021 */ cvt.d.s $f0, $f4 -/* 9F6108 802416C8 4620103E */ c.le.d $f2, $f0 -/* 9F610C 802416CC 00000000 */ nop -/* 9F6110 802416D0 45000030 */ bc1f .L80241794 -/* 9F6114 802416D4 00000000 */ nop -/* 9F6118 802416D8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F611C 802416DC 46040000 */ add.s $f0, $f0, $f4 -/* 9F6120 802416E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 9F6124 802416E4 8E2200CC */ lw $v0, 0xcc($s1) -/* 9F6128 802416E8 8C420024 */ lw $v0, 0x24($v0) -/* 9F612C 802416EC AE020028 */ sw $v0, 0x28($s0) -/* 9F6130 802416F0 A2200007 */ sb $zero, 7($s1) -/* 9F6134 802416F4 8E020000 */ lw $v0, ($s0) -/* 9F6138 802416F8 30420008 */ andi $v0, $v0, 8 -/* 9F613C 802416FC 14400011 */ bnez $v0, .L80241744 -/* 9F6140 80241700 0000102D */ daddu $v0, $zero, $zero -/* 9F6144 80241704 27A50018 */ addiu $a1, $sp, 0x18 -/* 9F6148 80241708 27A6001C */ addiu $a2, $sp, 0x1c -/* 9F614C 8024170C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F6150 80241710 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F6154 80241714 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9F6158 80241718 3C01447A */ lui $at, 0x447a -/* 9F615C 8024171C 44813000 */ mtc1 $at, $f6 -/* 9F6160 80241720 27A20024 */ addiu $v0, $sp, 0x24 -/* 9F6164 80241724 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F6168 80241728 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9F616C 8024172C E7A40020 */ swc1 $f4, 0x20($sp) -/* 9F6170 80241730 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9F6174 80241734 AFA20010 */ sw $v0, 0x10($sp) -/* 9F6178 80241738 8E040080 */ lw $a0, 0x80($s0) -/* 9F617C 8024173C 0C0372DF */ jal func_800DCB7C -/* 9F6180 80241740 27A70020 */ addiu $a3, $sp, 0x20 -.L80241744: -/* 9F6184 80241744 1040000B */ beqz $v0, .L80241774 -/* 9F6188 80241748 00000000 */ nop -/* 9F618C 8024174C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9F6190 80241750 46140080 */ add.s $f2, $f0, $f20 -/* 9F6194 80241754 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F6198 80241758 4600103E */ c.le.s $f2, $f0 -/* 9F619C 8024175C 00000000 */ nop -/* 9F61A0 80241760 4500008D */ bc1f .L80241998 -/* 9F61A4 80241764 00000000 */ nop -/* 9F61A8 80241768 E602003C */ swc1 $f2, 0x3c($s0) -/* 9F61AC 8024176C 08090666 */ j .L80241998 -/* 9F61B0 80241770 AE400070 */ sw $zero, 0x70($s2) -.L80241774: -/* 9F61B4 80241774 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F61B8 80241778 C6000064 */ lwc1 $f0, 0x64($s0) -/* 9F61BC 8024177C 4602003E */ c.le.s $f0, $f2 -/* 9F61C0 80241780 00000000 */ nop -/* 9F61C4 80241784 45030084 */ bc1tl .L80241998 -/* 9F61C8 80241788 AE400070 */ sw $zero, 0x70($s2) -/* 9F61CC 8024178C 08090666 */ j .L80241998 -/* 9F61D0 80241790 00000000 */ nop -.L80241794: -/* 9F61D4 80241794 4622003C */ c.lt.d $f0, $f2 -/* 9F61D8 80241798 00000000 */ nop -/* 9F61DC 8024179C 4500007E */ bc1f .L80241998 -/* 9F61E0 802417A0 00000000 */ nop -/* 9F61E4 802417A4 9602008E */ lhu $v0, 0x8e($s0) -/* 9F61E8 802417A8 24420001 */ addiu $v0, $v0, 1 -/* 9F61EC 802417AC A602008E */ sh $v0, 0x8e($s0) -/* 9F61F0 802417B0 00021400 */ sll $v0, $v0, 0x10 -/* 9F61F4 802417B4 8E630020 */ lw $v1, 0x20($s3) -/* 9F61F8 802417B8 00021403 */ sra $v0, $v0, 0x10 -/* 9F61FC 802417BC 0043102A */ slt $v0, $v0, $v1 -/* 9F6200 802417C0 14400026 */ bnez $v0, .L8024185C -/* 9F6204 802417C4 00000000 */ nop -/* 9F6208 802417C8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9F620C 802417CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9F6210 802417D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9F6214 802417D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9F6218 802417D8 A600008E */ sh $zero, 0x8e($s0) -/* 9F621C 802417DC 8C460028 */ lw $a2, 0x28($v0) -/* 9F6220 802417E0 0C00A720 */ jal atan2 -/* 9F6224 802417E4 8C470030 */ lw $a3, 0x30($v0) -/* 9F6228 802417E8 46000506 */ mov.s $f20, $f0 -/* 9F622C 802417EC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9F6230 802417F0 0C00A70A */ jal get_clamped_angle_diff -/* 9F6234 802417F4 4600A386 */ mov.s $f14, $f20 -/* 9F6238 802417F8 46000086 */ mov.s $f2, $f0 -/* 9F623C 802417FC 8E62001C */ lw $v0, 0x1c($s3) -/* 9F6240 80241800 46001005 */ abs.s $f0, $f2 -/* 9F6244 80241804 44822000 */ mtc1 $v0, $f4 -/* 9F6248 80241808 00000000 */ nop -/* 9F624C 8024180C 46802120 */ cvt.s.w $f4, $f4 -/* 9F6250 80241810 4600203C */ c.lt.s $f4, $f0 -/* 9F6254 80241814 00000000 */ nop -/* 9F6258 80241818 4500000D */ bc1f .L80241850 -/* 9F625C 8024181C 00000000 */ nop -/* 9F6260 80241820 44800000 */ mtc1 $zero, $f0 -/* 9F6264 80241824 C614000C */ lwc1 $f20, 0xc($s0) -/* 9F6268 80241828 4600103C */ c.lt.s $f2, $f0 -/* 9F626C 8024182C 00000000 */ nop -/* 9F6270 80241830 45000006 */ bc1f .L8024184C -/* 9F6274 80241834 00021023 */ negu $v0, $v0 -/* 9F6278 80241838 44820000 */ mtc1 $v0, $f0 -/* 9F627C 8024183C 00000000 */ nop -/* 9F6280 80241840 46800020 */ cvt.s.w $f0, $f0 -/* 9F6284 80241844 08090614 */ j .L80241850 -/* 9F6288 80241848 4600A500 */ add.s $f20, $f20, $f0 -.L8024184C: -/* 9F628C 8024184C 4604A500 */ add.s $f20, $f20, $f4 -.L80241850: -/* 9F6290 80241850 0C00A6C9 */ jal clamp_angle -/* 9F6294 80241854 4600A306 */ mov.s $f12, $f20 -/* 9F6298 80241858 E600000C */ swc1 $f0, 0xc($s0) -.L8024185C: -/* 9F629C 8024185C 8E020000 */ lw $v0, ($s0) -/* 9F62A0 80241860 30420008 */ andi $v0, $v0, 8 -/* 9F62A4 80241864 1040000A */ beqz $v0, .L80241890 -/* 9F62A8 80241868 27A50018 */ addiu $a1, $sp, 0x18 -/* 9F62AC 8024186C C602003C */ lwc1 $f2, 0x3c($s0) -/* 9F62B0 80241870 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9F62B4 80241874 46001080 */ add.s $f2, $f2, $f0 -/* 9F62B8 80241878 4616103C */ c.lt.s $f2, $f22 -/* 9F62BC 8024187C 00000000 */ nop -/* 9F62C0 80241880 45020045 */ bc1fl .L80241998 -/* 9F62C4 80241884 E602003C */ swc1 $f2, 0x3c($s0) -/* 9F62C8 80241888 08090665 */ j .L80241994 -/* 9F62CC 8024188C E616003C */ swc1 $f22, 0x3c($s0) -.L80241890: -/* 9F62D0 80241890 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9F62D4 80241894 27A6001C */ addiu $a2, $sp, 0x1c -/* 9F62D8 80241898 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9F62DC 8024189C 860200A8 */ lh $v0, 0xa8($s0) -/* 9F62E0 802418A0 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9F62E4 802418A4 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9F62E8 802418A8 44821000 */ mtc1 $v0, $f2 -/* 9F62EC 802418AC 00000000 */ nop -/* 9F62F0 802418B0 468010A0 */ cvt.s.w $f2, $f2 -/* 9F62F4 802418B4 46000005 */ abs.s $f0, $f0 -/* 9F62F8 802418B8 46020000 */ add.s $f0, $f0, $f2 -/* 9F62FC 802418BC C6060040 */ lwc1 $f6, 0x40($s0) -/* 9F6300 802418C0 27A20024 */ addiu $v0, $sp, 0x24 -/* 9F6304 802418C4 46022100 */ add.s $f4, $f4, $f2 -/* 9F6308 802418C8 3C014024 */ lui $at, 0x4024 -/* 9F630C 802418CC 44811800 */ mtc1 $at, $f3 -/* 9F6310 802418D0 44801000 */ mtc1 $zero, $f2 -/* 9F6314 802418D4 46000021 */ cvt.d.s $f0, $f0 -/* 9F6318 802418D8 46220000 */ add.d $f0, $f0, $f2 -/* 9F631C 802418DC E7A60020 */ swc1 $f6, 0x20($sp) -/* 9F6320 802418E0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 9F6324 802418E4 46200020 */ cvt.s.d $f0, $f0 -/* 9F6328 802418E8 E7A00024 */ swc1 $f0, 0x24($sp) -/* 9F632C 802418EC AFA20010 */ sw $v0, 0x10($sp) -/* 9F6330 802418F0 8E040080 */ lw $a0, 0x80($s0) -/* 9F6334 802418F4 0C0372DF */ jal func_800DCB7C -/* 9F6338 802418F8 27A70020 */ addiu $a3, $sp, 0x20 -/* 9F633C 802418FC 10400015 */ beqz $v0, .L80241954 -/* 9F6340 80241900 00000000 */ nop -/* 9F6344 80241904 860200A8 */ lh $v0, 0xa8($s0) -/* 9F6348 80241908 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9F634C 8024190C 44820000 */ mtc1 $v0, $f0 -/* 9F6350 80241910 00000000 */ nop -/* 9F6354 80241914 46800020 */ cvt.s.w $f0, $f0 -/* 9F6358 80241918 46002085 */ abs.s $f2, $f4 -/* 9F635C 8024191C 46020000 */ add.s $f0, $f0, $f2 -/* 9F6360 80241920 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9F6364 80241924 4600103E */ c.le.s $f2, $f0 -/* 9F6368 80241928 00000000 */ nop -/* 9F636C 8024192C 45000005 */ bc1f .L80241944 -/* 9F6370 80241930 00000000 */ nop -/* 9F6374 80241934 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9F6378 80241938 AE00001C */ sw $zero, 0x1c($s0) -/* 9F637C 8024193C 08090666 */ j .L80241998 -/* 9F6380 80241940 E600003C */ swc1 $f0, 0x3c($s0) -.L80241944: -/* 9F6384 80241944 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9F6388 80241948 46040000 */ add.s $f0, $f0, $f4 -/* 9F638C 8024194C 08090666 */ j .L80241998 -/* 9F6390 80241950 E600003C */ swc1 $f0, 0x3c($s0) -.L80241954: -/* 9F6394 80241954 C606003C */ lwc1 $f6, 0x3c($s0) -/* 9F6398 80241958 860200A8 */ lh $v0, 0xa8($s0) -/* 9F639C 8024195C 46163081 */ sub.s $f2, $f6, $f22 -/* 9F63A0 80241960 44820000 */ mtc1 $v0, $f0 -/* 9F63A4 80241964 00000000 */ nop -/* 9F63A8 80241968 46800020 */ cvt.s.w $f0, $f0 -/* 9F63AC 8024196C 46001080 */ add.s $f2, $f2, $f0 -/* 9F63B0 80241970 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9F63B4 80241974 46002005 */ abs.s $f0, $f4 -/* 9F63B8 80241978 4602003C */ c.lt.s $f0, $f2 -/* 9F63BC 8024197C 00000000 */ nop -/* 9F63C0 80241980 45020005 */ bc1fl .L80241998 -/* 9F63C4 80241984 AE00001C */ sw $zero, 0x1c($s0) -/* 9F63C8 80241988 46043000 */ add.s $f0, $f6, $f4 -/* 9F63CC 8024198C 08090666 */ j .L80241998 -/* 9F63D0 80241990 E600003C */ swc1 $f0, 0x3c($s0) -.L80241994: -/* 9F63D4 80241994 AE00001C */ sw $zero, 0x1c($s0) -.L80241998: -/* 9F63D8 80241998 8FBF0038 */ lw $ra, 0x38($sp) -/* 9F63DC 8024199C 8FB30034 */ lw $s3, 0x34($sp) -/* 9F63E0 802419A0 8FB20030 */ lw $s2, 0x30($sp) -/* 9F63E4 802419A4 8FB1002C */ lw $s1, 0x2c($sp) -/* 9F63E8 802419A8 8FB00028 */ lw $s0, 0x28($sp) -/* 9F63EC 802419AC D7B60048 */ ldc1 $f22, 0x48($sp) -/* 9F63F0 802419B0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 9F63F4 802419B4 03E00008 */ jr $ra -/* 9F63F8 802419B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s new file mode 100644 index 0000000000..c26b008332 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_8024162C_9F606C.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024162C_9F606C +/* 9F606C 8024162C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 9F6070 80241630 AFB20030 */ sw $s2, 0x30($sp) +/* 9F6074 80241634 0080902D */ daddu $s2, $a0, $zero +/* 9F6078 80241638 AFBF0038 */ sw $ra, 0x38($sp) +/* 9F607C 8024163C AFB30034 */ sw $s3, 0x34($sp) +/* 9F6080 80241640 AFB1002C */ sw $s1, 0x2c($sp) +/* 9F6084 80241644 AFB00028 */ sw $s0, 0x28($sp) +/* 9F6088 80241648 F7B60048 */ sdc1 $f22, 0x48($sp) +/* 9F608C 8024164C F7B40040 */ sdc1 $f20, 0x40($sp) +/* 9F6090 80241650 8E510148 */ lw $s1, 0x148($s2) +/* 9F6094 80241654 86240008 */ lh $a0, 8($s1) +/* 9F6098 80241658 0C00EABB */ jal get_npc_unsafe +/* 9F609C 8024165C 00A0982D */ daddu $s3, $a1, $zero +/* 9F60A0 80241660 0040802D */ daddu $s0, $v0, $zero +/* 9F60A4 80241664 0200202D */ daddu $a0, $s0, $zero +/* 9F60A8 80241668 C6220088 */ lwc1 $f2, 0x88($s1) +/* 9F60AC 8024166C 468010A0 */ cvt.s.w $f2, $f2 +/* 9F60B0 80241670 460010A1 */ cvt.d.s $f2, $f2 +/* 9F60B4 80241674 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9F60B8 80241678 C6000014 */ lwc1 $f0, 0x14($s0) +/* 9F60BC 8024167C 8E050018 */ lw $a1, 0x18($s0) +/* 9F60C0 80241680 46002100 */ add.s $f4, $f4, $f0 +/* 9F60C4 80241684 8E06000C */ lw $a2, 0xc($s0) +/* 9F60C8 80241688 C6200078 */ lwc1 $f0, 0x78($s1) +/* 9F60CC 8024168C 46800020 */ cvt.s.w $f0, $f0 +/* 9F60D0 80241690 E604001C */ swc1 $f4, 0x1c($s0) +/* 9F60D4 80241694 3C014059 */ lui $at, 0x4059 +/* 9F60D8 80241698 44812800 */ mtc1 $at, $f5 +/* 9F60DC 8024169C 44802000 */ mtc1 $zero, $f4 +/* 9F60E0 802416A0 46000021 */ cvt.d.s $f0, $f0 +/* 9F60E4 802416A4 46240003 */ div.d $f0, $f0, $f4 +/* 9F60E8 802416A8 46200520 */ cvt.s.d $f20, $f0 +/* 9F60EC 802416AC 46241083 */ div.d $f2, $f2, $f4 +/* 9F60F0 802416B0 0C00EA95 */ jal npc_move_heading +/* 9F60F4 802416B4 462015A0 */ cvt.s.d $f22, $f2 +/* 9F60F8 802416B8 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9F60FC 802416BC 44801000 */ mtc1 $zero, $f2 +/* 9F6100 802416C0 44801800 */ mtc1 $zero, $f3 +/* 9F6104 802416C4 46002021 */ cvt.d.s $f0, $f4 +/* 9F6108 802416C8 4620103E */ c.le.d $f2, $f0 +/* 9F610C 802416CC 00000000 */ nop +/* 9F6110 802416D0 45000030 */ bc1f .L80241794 +/* 9F6114 802416D4 00000000 */ nop +/* 9F6118 802416D8 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9F611C 802416DC 46040000 */ add.s $f0, $f0, $f4 +/* 9F6120 802416E0 E600003C */ swc1 $f0, 0x3c($s0) +/* 9F6124 802416E4 8E2200CC */ lw $v0, 0xcc($s1) +/* 9F6128 802416E8 8C420024 */ lw $v0, 0x24($v0) +/* 9F612C 802416EC AE020028 */ sw $v0, 0x28($s0) +/* 9F6130 802416F0 A2200007 */ sb $zero, 7($s1) +/* 9F6134 802416F4 8E020000 */ lw $v0, ($s0) +/* 9F6138 802416F8 30420008 */ andi $v0, $v0, 8 +/* 9F613C 802416FC 14400011 */ bnez $v0, .L80241744 +/* 9F6140 80241700 0000102D */ daddu $v0, $zero, $zero +/* 9F6144 80241704 27A50018 */ addiu $a1, $sp, 0x18 +/* 9F6148 80241708 27A6001C */ addiu $a2, $sp, 0x1c +/* 9F614C 8024170C C6000038 */ lwc1 $f0, 0x38($s0) +/* 9F6150 80241710 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9F6154 80241714 C6040040 */ lwc1 $f4, 0x40($s0) +/* 9F6158 80241718 3C01447A */ lui $at, 0x447a +/* 9F615C 8024171C 44813000 */ mtc1 $at, $f6 +/* 9F6160 80241720 27A20024 */ addiu $v0, $sp, 0x24 +/* 9F6164 80241724 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9F6168 80241728 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 9F616C 8024172C E7A40020 */ swc1 $f4, 0x20($sp) +/* 9F6170 80241730 E7A60024 */ swc1 $f6, 0x24($sp) +/* 9F6174 80241734 AFA20010 */ sw $v0, 0x10($sp) +/* 9F6178 80241738 8E040080 */ lw $a0, 0x80($s0) +/* 9F617C 8024173C 0C0372DF */ jal func_800DCB7C +/* 9F6180 80241740 27A70020 */ addiu $a3, $sp, 0x20 +.L80241744: +/* 9F6184 80241744 1040000B */ beqz $v0, .L80241774 +/* 9F6188 80241748 00000000 */ nop +/* 9F618C 8024174C C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9F6190 80241750 46140080 */ add.s $f2, $f0, $f20 +/* 9F6194 80241754 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9F6198 80241758 4600103E */ c.le.s $f2, $f0 +/* 9F619C 8024175C 00000000 */ nop +/* 9F61A0 80241760 4500008D */ bc1f .L80241998 +/* 9F61A4 80241764 00000000 */ nop +/* 9F61A8 80241768 E602003C */ swc1 $f2, 0x3c($s0) +/* 9F61AC 8024176C 08090666 */ j .L80241998 +/* 9F61B0 80241770 AE400070 */ sw $zero, 0x70($s2) +.L80241774: +/* 9F61B4 80241774 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9F61B8 80241778 C6000064 */ lwc1 $f0, 0x64($s0) +/* 9F61BC 8024177C 4602003E */ c.le.s $f0, $f2 +/* 9F61C0 80241780 00000000 */ nop +/* 9F61C4 80241784 45030084 */ bc1tl .L80241998 +/* 9F61C8 80241788 AE400070 */ sw $zero, 0x70($s2) +/* 9F61CC 8024178C 08090666 */ j .L80241998 +/* 9F61D0 80241790 00000000 */ nop +.L80241794: +/* 9F61D4 80241794 4622003C */ c.lt.d $f0, $f2 +/* 9F61D8 80241798 00000000 */ nop +/* 9F61DC 8024179C 4500007E */ bc1f .L80241998 +/* 9F61E0 802417A0 00000000 */ nop +/* 9F61E4 802417A4 9602008E */ lhu $v0, 0x8e($s0) +/* 9F61E8 802417A8 24420001 */ addiu $v0, $v0, 1 +/* 9F61EC 802417AC A602008E */ sh $v0, 0x8e($s0) +/* 9F61F0 802417B0 00021400 */ sll $v0, $v0, 0x10 +/* 9F61F4 802417B4 8E630020 */ lw $v1, 0x20($s3) +/* 9F61F8 802417B8 00021403 */ sra $v0, $v0, 0x10 +/* 9F61FC 802417BC 0043102A */ slt $v0, $v0, $v1 +/* 9F6200 802417C0 14400026 */ bnez $v0, .L8024185C +/* 9F6204 802417C4 00000000 */ nop +/* 9F6208 802417C8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9F620C 802417CC C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9F6210 802417D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9F6214 802417D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9F6218 802417D8 A600008E */ sh $zero, 0x8e($s0) +/* 9F621C 802417DC 8C460028 */ lw $a2, 0x28($v0) +/* 9F6220 802417E0 0C00A720 */ jal atan2 +/* 9F6224 802417E4 8C470030 */ lw $a3, 0x30($v0) +/* 9F6228 802417E8 46000506 */ mov.s $f20, $f0 +/* 9F622C 802417EC C60C000C */ lwc1 $f12, 0xc($s0) +/* 9F6230 802417F0 0C00A70A */ jal get_clamped_angle_diff +/* 9F6234 802417F4 4600A386 */ mov.s $f14, $f20 +/* 9F6238 802417F8 46000086 */ mov.s $f2, $f0 +/* 9F623C 802417FC 8E62001C */ lw $v0, 0x1c($s3) +/* 9F6240 80241800 46001005 */ abs.s $f0, $f2 +/* 9F6244 80241804 44822000 */ mtc1 $v0, $f4 +/* 9F6248 80241808 00000000 */ nop +/* 9F624C 8024180C 46802120 */ cvt.s.w $f4, $f4 +/* 9F6250 80241810 4600203C */ c.lt.s $f4, $f0 +/* 9F6254 80241814 00000000 */ nop +/* 9F6258 80241818 4500000D */ bc1f .L80241850 +/* 9F625C 8024181C 00000000 */ nop +/* 9F6260 80241820 44800000 */ mtc1 $zero, $f0 +/* 9F6264 80241824 C614000C */ lwc1 $f20, 0xc($s0) +/* 9F6268 80241828 4600103C */ c.lt.s $f2, $f0 +/* 9F626C 8024182C 00000000 */ nop +/* 9F6270 80241830 45000006 */ bc1f .L8024184C +/* 9F6274 80241834 00021023 */ negu $v0, $v0 +/* 9F6278 80241838 44820000 */ mtc1 $v0, $f0 +/* 9F627C 8024183C 00000000 */ nop +/* 9F6280 80241840 46800020 */ cvt.s.w $f0, $f0 +/* 9F6284 80241844 08090614 */ j .L80241850 +/* 9F6288 80241848 4600A500 */ add.s $f20, $f20, $f0 +.L8024184C: +/* 9F628C 8024184C 4604A500 */ add.s $f20, $f20, $f4 +.L80241850: +/* 9F6290 80241850 0C00A6C9 */ jal clamp_angle +/* 9F6294 80241854 4600A306 */ mov.s $f12, $f20 +/* 9F6298 80241858 E600000C */ swc1 $f0, 0xc($s0) +.L8024185C: +/* 9F629C 8024185C 8E020000 */ lw $v0, ($s0) +/* 9F62A0 80241860 30420008 */ andi $v0, $v0, 8 +/* 9F62A4 80241864 1040000A */ beqz $v0, .L80241890 +/* 9F62A8 80241868 27A50018 */ addiu $a1, $sp, 0x18 +/* 9F62AC 8024186C C602003C */ lwc1 $f2, 0x3c($s0) +/* 9F62B0 80241870 C600001C */ lwc1 $f0, 0x1c($s0) +/* 9F62B4 80241874 46001080 */ add.s $f2, $f2, $f0 +/* 9F62B8 80241878 4616103C */ c.lt.s $f2, $f22 +/* 9F62BC 8024187C 00000000 */ nop +/* 9F62C0 80241880 45020045 */ bc1fl .L80241998 +/* 9F62C4 80241884 E602003C */ swc1 $f2, 0x3c($s0) +/* 9F62C8 80241888 08090665 */ j .L80241994 +/* 9F62CC 8024188C E616003C */ swc1 $f22, 0x3c($s0) +.L80241890: +/* 9F62D0 80241890 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9F62D4 80241894 27A6001C */ addiu $a2, $sp, 0x1c +/* 9F62D8 80241898 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9F62DC 8024189C 860200A8 */ lh $v0, 0xa8($s0) +/* 9F62E0 802418A0 C600001C */ lwc1 $f0, 0x1c($s0) +/* 9F62E4 802418A4 C604003C */ lwc1 $f4, 0x3c($s0) +/* 9F62E8 802418A8 44821000 */ mtc1 $v0, $f2 +/* 9F62EC 802418AC 00000000 */ nop +/* 9F62F0 802418B0 468010A0 */ cvt.s.w $f2, $f2 +/* 9F62F4 802418B4 46000005 */ abs.s $f0, $f0 +/* 9F62F8 802418B8 46020000 */ add.s $f0, $f0, $f2 +/* 9F62FC 802418BC C6060040 */ lwc1 $f6, 0x40($s0) +/* 9F6300 802418C0 27A20024 */ addiu $v0, $sp, 0x24 +/* 9F6304 802418C4 46022100 */ add.s $f4, $f4, $f2 +/* 9F6308 802418C8 3C014024 */ lui $at, 0x4024 +/* 9F630C 802418CC 44811800 */ mtc1 $at, $f3 +/* 9F6310 802418D0 44801000 */ mtc1 $zero, $f2 +/* 9F6314 802418D4 46000021 */ cvt.d.s $f0, $f0 +/* 9F6318 802418D8 46220000 */ add.d $f0, $f0, $f2 +/* 9F631C 802418DC E7A60020 */ swc1 $f6, 0x20($sp) +/* 9F6320 802418E0 E7A4001C */ swc1 $f4, 0x1c($sp) +/* 9F6324 802418E4 46200020 */ cvt.s.d $f0, $f0 +/* 9F6328 802418E8 E7A00024 */ swc1 $f0, 0x24($sp) +/* 9F632C 802418EC AFA20010 */ sw $v0, 0x10($sp) +/* 9F6330 802418F0 8E040080 */ lw $a0, 0x80($s0) +/* 9F6334 802418F4 0C0372DF */ jal func_800DCB7C +/* 9F6338 802418F8 27A70020 */ addiu $a3, $sp, 0x20 +/* 9F633C 802418FC 10400015 */ beqz $v0, .L80241954 +/* 9F6340 80241900 00000000 */ nop +/* 9F6344 80241904 860200A8 */ lh $v0, 0xa8($s0) +/* 9F6348 80241908 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9F634C 8024190C 44820000 */ mtc1 $v0, $f0 +/* 9F6350 80241910 00000000 */ nop +/* 9F6354 80241914 46800020 */ cvt.s.w $f0, $f0 +/* 9F6358 80241918 46002085 */ abs.s $f2, $f4 +/* 9F635C 8024191C 46020000 */ add.s $f0, $f0, $f2 +/* 9F6360 80241920 C7A20024 */ lwc1 $f2, 0x24($sp) +/* 9F6364 80241924 4600103E */ c.le.s $f2, $f0 +/* 9F6368 80241928 00000000 */ nop +/* 9F636C 8024192C 45000005 */ bc1f .L80241944 +/* 9F6370 80241930 00000000 */ nop +/* 9F6374 80241934 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9F6378 80241938 AE00001C */ sw $zero, 0x1c($s0) +/* 9F637C 8024193C 08090666 */ j .L80241998 +/* 9F6380 80241940 E600003C */ swc1 $f0, 0x3c($s0) +.L80241944: +/* 9F6384 80241944 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9F6388 80241948 46040000 */ add.s $f0, $f0, $f4 +/* 9F638C 8024194C 08090666 */ j .L80241998 +/* 9F6390 80241950 E600003C */ swc1 $f0, 0x3c($s0) +.L80241954: +/* 9F6394 80241954 C606003C */ lwc1 $f6, 0x3c($s0) +/* 9F6398 80241958 860200A8 */ lh $v0, 0xa8($s0) +/* 9F639C 8024195C 46163081 */ sub.s $f2, $f6, $f22 +/* 9F63A0 80241960 44820000 */ mtc1 $v0, $f0 +/* 9F63A4 80241964 00000000 */ nop +/* 9F63A8 80241968 46800020 */ cvt.s.w $f0, $f0 +/* 9F63AC 8024196C 46001080 */ add.s $f2, $f2, $f0 +/* 9F63B0 80241970 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9F63B4 80241974 46002005 */ abs.s $f0, $f4 +/* 9F63B8 80241978 4602003C */ c.lt.s $f0, $f2 +/* 9F63BC 8024197C 00000000 */ nop +/* 9F63C0 80241980 45020005 */ bc1fl .L80241998 +/* 9F63C4 80241984 AE00001C */ sw $zero, 0x1c($s0) +/* 9F63C8 80241988 46043000 */ add.s $f0, $f6, $f4 +/* 9F63CC 8024198C 08090666 */ j .L80241998 +/* 9F63D0 80241990 E600003C */ swc1 $f0, 0x3c($s0) +.L80241994: +/* 9F63D4 80241994 AE00001C */ sw $zero, 0x1c($s0) +.L80241998: +/* 9F63D8 80241998 8FBF0038 */ lw $ra, 0x38($sp) +/* 9F63DC 8024199C 8FB30034 */ lw $s3, 0x34($sp) +/* 9F63E0 802419A0 8FB20030 */ lw $s2, 0x30($sp) +/* 9F63E4 802419A4 8FB1002C */ lw $s1, 0x2c($sp) +/* 9F63E8 802419A8 8FB00028 */ lw $s0, 0x28($sp) +/* 9F63EC 802419AC D7B60048 */ ldc1 $f22, 0x48($sp) +/* 9F63F0 802419B0 D7B40040 */ ldc1 $f20, 0x40($sp) +/* 9F63F4 802419B4 03E00008 */ jr $ra +/* 9F63F8 802419B8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0.s deleted file mode 100644 index 0d98d4398f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AE0 -/* 9F6520 80241AE0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9F6524 80241AE4 AFB40040 */ sw $s4, 0x40($sp) -/* 9F6528 80241AE8 0080A02D */ daddu $s4, $a0, $zero -/* 9F652C 80241AEC AFBF0048 */ sw $ra, 0x48($sp) -/* 9F6530 80241AF0 AFB50044 */ sw $s5, 0x44($sp) -/* 9F6534 80241AF4 AFB3003C */ sw $s3, 0x3c($sp) -/* 9F6538 80241AF8 AFB20038 */ sw $s2, 0x38($sp) -/* 9F653C 80241AFC AFB10034 */ sw $s1, 0x34($sp) -/* 9F6540 80241B00 AFB00030 */ sw $s0, 0x30($sp) -/* 9F6544 80241B04 8E920148 */ lw $s2, 0x148($s4) -/* 9F6548 80241B08 86440008 */ lh $a0, 8($s2) -/* 9F654C 80241B0C 8E90000C */ lw $s0, 0xc($s4) -/* 9F6550 80241B10 0C00EABB */ jal get_npc_unsafe -/* 9F6554 80241B14 00A0882D */ daddu $s1, $a1, $zero -/* 9F6558 80241B18 0280202D */ daddu $a0, $s4, $zero -/* 9F655C 80241B1C 8E050000 */ lw $a1, ($s0) -/* 9F6560 80241B20 0C0B1EAF */ jal get_variable -/* 9F6564 80241B24 0040A82D */ daddu $s5, $v0, $zero -/* 9F6568 80241B28 AFA00010 */ sw $zero, 0x10($sp) -/* 9F656C 80241B2C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F6570 80241B30 8C630030 */ lw $v1, 0x30($v1) -/* 9F6574 80241B34 AFA30014 */ sw $v1, 0x14($sp) -/* 9F6578 80241B38 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F657C 80241B3C 8C63001C */ lw $v1, 0x1c($v1) -/* 9F6580 80241B40 AFA30018 */ sw $v1, 0x18($sp) -/* 9F6584 80241B44 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F6588 80241B48 8C630024 */ lw $v1, 0x24($v1) -/* 9F658C 80241B4C AFA3001C */ sw $v1, 0x1c($sp) -/* 9F6590 80241B50 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F6594 80241B54 8C630028 */ lw $v1, 0x28($v1) -/* 9F6598 80241B58 27B30010 */ addiu $s3, $sp, 0x10 -/* 9F659C 80241B5C AFA30020 */ sw $v1, 0x20($sp) -/* 9F65A0 80241B60 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9F65A4 80241B64 3C0142F0 */ lui $at, 0x42f0 -/* 9F65A8 80241B68 44810000 */ mtc1 $at, $f0 -/* 9F65AC 80241B6C 8C63002C */ lw $v1, 0x2c($v1) -/* 9F65B0 80241B70 0040802D */ daddu $s0, $v0, $zero -/* 9F65B4 80241B74 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9F65B8 80241B78 A7A0002C */ sh $zero, 0x2c($sp) -/* 9F65BC 80241B7C 12200006 */ beqz $s1, .L80241B98 -/* 9F65C0 80241B80 AFA30024 */ sw $v1, 0x24($sp) -/* 9F65C4 80241B84 02A0202D */ daddu $a0, $s5, $zero -/* 9F65C8 80241B88 0240282D */ daddu $a1, $s2, $zero -/* 9F65CC 80241B8C 0280302D */ daddu $a2, $s4, $zero -/* 9F65D0 80241B90 0C09066F */ jal func_802419BC -/* 9F65D4 80241B94 0200382D */ daddu $a3, $s0, $zero -.L80241B98: -/* 9F65D8 80241B98 2402FFFE */ addiu $v0, $zero, -2 -/* 9F65DC 80241B9C A2A200AB */ sb $v0, 0xab($s5) -/* 9F65E0 80241BA0 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9F65E4 80241BA4 30620004 */ andi $v0, $v1, 4 -/* 9F65E8 80241BA8 10400007 */ beqz $v0, .L80241BC8 -/* 9F65EC 80241BAC 00000000 */ nop -/* 9F65F0 80241BB0 824200B4 */ lb $v0, 0xb4($s2) -/* 9F65F4 80241BB4 1440003C */ bnez $v0, .L80241CA8 -/* 9F65F8 80241BB8 0000102D */ daddu $v0, $zero, $zero -/* 9F65FC 80241BBC 2402FFFB */ addiu $v0, $zero, -5 -/* 9F6600 80241BC0 00621024 */ and $v0, $v1, $v0 -/* 9F6604 80241BC4 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241BC8: -/* 9F6608 80241BC8 8E830070 */ lw $v1, 0x70($s4) -/* 9F660C 80241BCC 2C62000F */ sltiu $v0, $v1, 0xf -/* 9F6610 80241BD0 10400034 */ beqz $v0, .L80241CA4 -/* 9F6614 80241BD4 00031080 */ sll $v0, $v1, 2 -/* 9F6618 80241BD8 3C018024 */ lui $at, 0x8024 -/* 9F661C 80241BDC 00220821 */ addu $at, $at, $v0 -/* 9F6620 80241BE0 8C225D68 */ lw $v0, 0x5d68($at) -/* 9F6624 80241BE4 00400008 */ jr $v0 -/* 9F6628 80241BE8 00000000 */ nop -/* 9F662C 80241BEC 0280202D */ daddu $a0, $s4, $zero -/* 9F6630 80241BF0 0200282D */ daddu $a1, $s0, $zero -/* 9F6634 80241BF4 0C0901F5 */ jal func_802407D4 -/* 9F6638 80241BF8 0260302D */ daddu $a2, $s3, $zero -/* 9F663C 80241BFC 0280202D */ daddu $a0, $s4, $zero -/* 9F6640 80241C00 0200282D */ daddu $a1, $s0, $zero -/* 9F6644 80241C04 0C090261 */ jal func_80240984 -/* 9F6648 80241C08 0260302D */ daddu $a2, $s3, $zero -/* 9F664C 80241C0C 0809072A */ j .L80241CA8 -/* 9F6650 80241C10 0000102D */ daddu $v0, $zero, $zero -/* 9F6654 80241C14 0280202D */ daddu $a0, $s4, $zero -/* 9F6658 80241C18 0200282D */ daddu $a1, $s0, $zero -/* 9F665C 80241C1C 0C0903EB */ jal func_80240FAC -/* 9F6660 80241C20 0260302D */ daddu $a2, $s3, $zero -/* 9F6664 80241C24 0280202D */ daddu $a0, $s4, $zero -/* 9F6668 80241C28 0200282D */ daddu $a1, $s0, $zero -/* 9F666C 80241C2C 0C09041B */ jal func_8024106C -/* 9F6670 80241C30 0260302D */ daddu $a2, $s3, $zero -/* 9F6674 80241C34 0809072A */ j .L80241CA8 -/* 9F6678 80241C38 0000102D */ daddu $v0, $zero, $zero -/* 9F667C 80241C3C 0280202D */ daddu $a0, $s4, $zero -/* 9F6680 80241C40 0200282D */ daddu $a1, $s0, $zero -/* 9F6684 80241C44 0C0904EC */ jal func_802413B0 -/* 9F6688 80241C48 0260302D */ daddu $a2, $s3, $zero -/* 9F668C 80241C4C 0280202D */ daddu $a0, $s4, $zero -/* 9F6690 80241C50 0200282D */ daddu $a1, $s0, $zero -/* 9F6694 80241C54 0C09050A */ jal func_80241428 -/* 9F6698 80241C58 0260302D */ daddu $a2, $s3, $zero -/* 9F669C 80241C5C 0809072A */ j .L80241CA8 -/* 9F66A0 80241C60 0000102D */ daddu $v0, $zero, $zero -/* 9F66A4 80241C64 0280202D */ daddu $a0, $s4, $zero -/* 9F66A8 80241C68 0200282D */ daddu $a1, $s0, $zero -/* 9F66AC 80241C6C 0C090525 */ jal func_80241494 -/* 9F66B0 80241C70 0260302D */ daddu $a2, $s3, $zero -/* 9F66B4 80241C74 0809072A */ j .L80241CA8 -/* 9F66B8 80241C78 0000102D */ daddu $v0, $zero, $zero -/* 9F66BC 80241C7C 0280202D */ daddu $a0, $s4, $zero -/* 9F66C0 80241C80 0200282D */ daddu $a1, $s0, $zero -/* 9F66C4 80241C84 0C090572 */ jal func_802415C8 -/* 9F66C8 80241C88 0260302D */ daddu $a2, $s3, $zero -/* 9F66CC 80241C8C 0809072A */ j .L80241CA8 -/* 9F66D0 80241C90 0000102D */ daddu $v0, $zero, $zero -/* 9F66D4 80241C94 0280202D */ daddu $a0, $s4, $zero -/* 9F66D8 80241C98 0200282D */ daddu $a1, $s0, $zero -/* 9F66DC 80241C9C 0C09058B */ jal func_8024162C -/* 9F66E0 80241CA0 0260302D */ daddu $a2, $s3, $zero -.L80241CA4: -/* 9F66E4 80241CA4 0000102D */ daddu $v0, $zero, $zero -.L80241CA8: -/* 9F66E8 80241CA8 8FBF0048 */ lw $ra, 0x48($sp) -/* 9F66EC 80241CAC 8FB50044 */ lw $s5, 0x44($sp) -/* 9F66F0 80241CB0 8FB40040 */ lw $s4, 0x40($sp) -/* 9F66F4 80241CB4 8FB3003C */ lw $s3, 0x3c($sp) -/* 9F66F8 80241CB8 8FB20038 */ lw $s2, 0x38($sp) -/* 9F66FC 80241CBC 8FB10034 */ lw $s1, 0x34($sp) -/* 9F6700 80241CC0 8FB00030 */ lw $s0, 0x30($sp) -/* 9F6704 80241CC4 03E00008 */ jr $ra -/* 9F6708 80241CC8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s new file mode 100644 index 0000000000..6e7f600888 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241AE0_9F6520.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AE0_9F6520 +/* 9F6520 80241AE0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 9F6524 80241AE4 AFB40040 */ sw $s4, 0x40($sp) +/* 9F6528 80241AE8 0080A02D */ daddu $s4, $a0, $zero +/* 9F652C 80241AEC AFBF0048 */ sw $ra, 0x48($sp) +/* 9F6530 80241AF0 AFB50044 */ sw $s5, 0x44($sp) +/* 9F6534 80241AF4 AFB3003C */ sw $s3, 0x3c($sp) +/* 9F6538 80241AF8 AFB20038 */ sw $s2, 0x38($sp) +/* 9F653C 80241AFC AFB10034 */ sw $s1, 0x34($sp) +/* 9F6540 80241B00 AFB00030 */ sw $s0, 0x30($sp) +/* 9F6544 80241B04 8E920148 */ lw $s2, 0x148($s4) +/* 9F6548 80241B08 86440008 */ lh $a0, 8($s2) +/* 9F654C 80241B0C 8E90000C */ lw $s0, 0xc($s4) +/* 9F6550 80241B10 0C00EABB */ jal get_npc_unsafe +/* 9F6554 80241B14 00A0882D */ daddu $s1, $a1, $zero +/* 9F6558 80241B18 0280202D */ daddu $a0, $s4, $zero +/* 9F655C 80241B1C 8E050000 */ lw $a1, ($s0) +/* 9F6560 80241B20 0C0B1EAF */ jal get_variable +/* 9F6564 80241B24 0040A82D */ daddu $s5, $v0, $zero +/* 9F6568 80241B28 AFA00010 */ sw $zero, 0x10($sp) +/* 9F656C 80241B2C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9F6570 80241B30 8C630030 */ lw $v1, 0x30($v1) +/* 9F6574 80241B34 AFA30014 */ sw $v1, 0x14($sp) +/* 9F6578 80241B38 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9F657C 80241B3C 8C63001C */ lw $v1, 0x1c($v1) +/* 9F6580 80241B40 AFA30018 */ sw $v1, 0x18($sp) +/* 9F6584 80241B44 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9F6588 80241B48 8C630024 */ lw $v1, 0x24($v1) +/* 9F658C 80241B4C AFA3001C */ sw $v1, 0x1c($sp) +/* 9F6590 80241B50 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9F6594 80241B54 8C630028 */ lw $v1, 0x28($v1) +/* 9F6598 80241B58 27B30010 */ addiu $s3, $sp, 0x10 +/* 9F659C 80241B5C AFA30020 */ sw $v1, 0x20($sp) +/* 9F65A0 80241B60 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9F65A4 80241B64 3C0142F0 */ lui $at, 0x42f0 +/* 9F65A8 80241B68 44810000 */ mtc1 $at, $f0 +/* 9F65AC 80241B6C 8C63002C */ lw $v1, 0x2c($v1) +/* 9F65B0 80241B70 0040802D */ daddu $s0, $v0, $zero +/* 9F65B4 80241B74 E7A00028 */ swc1 $f0, 0x28($sp) +/* 9F65B8 80241B78 A7A0002C */ sh $zero, 0x2c($sp) +/* 9F65BC 80241B7C 12200006 */ beqz $s1, .L80241B98 +/* 9F65C0 80241B80 AFA30024 */ sw $v1, 0x24($sp) +/* 9F65C4 80241B84 02A0202D */ daddu $a0, $s5, $zero +/* 9F65C8 80241B88 0240282D */ daddu $a1, $s2, $zero +/* 9F65CC 80241B8C 0280302D */ daddu $a2, $s4, $zero +/* 9F65D0 80241B90 0C09066F */ jal func_802419BC_9F63FC +/* 9F65D4 80241B94 0200382D */ daddu $a3, $s0, $zero +.L80241B98: +/* 9F65D8 80241B98 2402FFFE */ addiu $v0, $zero, -2 +/* 9F65DC 80241B9C A2A200AB */ sb $v0, 0xab($s5) +/* 9F65E0 80241BA0 8E4300B0 */ lw $v1, 0xb0($s2) +/* 9F65E4 80241BA4 30620004 */ andi $v0, $v1, 4 +/* 9F65E8 80241BA8 10400007 */ beqz $v0, .L80241BC8 +/* 9F65EC 80241BAC 00000000 */ nop +/* 9F65F0 80241BB0 824200B4 */ lb $v0, 0xb4($s2) +/* 9F65F4 80241BB4 1440003C */ bnez $v0, .L80241CA8 +/* 9F65F8 80241BB8 0000102D */ daddu $v0, $zero, $zero +/* 9F65FC 80241BBC 2402FFFB */ addiu $v0, $zero, -5 +/* 9F6600 80241BC0 00621024 */ and $v0, $v1, $v0 +/* 9F6604 80241BC4 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241BC8: +/* 9F6608 80241BC8 8E830070 */ lw $v1, 0x70($s4) +/* 9F660C 80241BCC 2C62000F */ sltiu $v0, $v1, 0xf +/* 9F6610 80241BD0 10400034 */ beqz $v0, .L80241CA4 +/* 9F6614 80241BD4 00031080 */ sll $v0, $v1, 2 +/* 9F6618 80241BD8 3C018024 */ lui $at, 0x8024 +/* 9F661C 80241BDC 00220821 */ addu $at, $at, $v0 +/* 9F6620 80241BE0 8C225D68 */ lw $v0, 0x5d68($at) +/* 9F6624 80241BE4 00400008 */ jr $v0 +/* 9F6628 80241BE8 00000000 */ nop +/* 9F662C 80241BEC 0280202D */ daddu $a0, $s4, $zero +/* 9F6630 80241BF0 0200282D */ daddu $a1, $s0, $zero +/* 9F6634 80241BF4 0C0901F5 */ jal func_802407D4_9F5214 +/* 9F6638 80241BF8 0260302D */ daddu $a2, $s3, $zero +/* 9F663C 80241BFC 0280202D */ daddu $a0, $s4, $zero +/* 9F6640 80241C00 0200282D */ daddu $a1, $s0, $zero +/* 9F6644 80241C04 0C090261 */ jal func_80240984_9F53C4 +/* 9F6648 80241C08 0260302D */ daddu $a2, $s3, $zero +/* 9F664C 80241C0C 0809072A */ j .L80241CA8 +/* 9F6650 80241C10 0000102D */ daddu $v0, $zero, $zero +/* 9F6654 80241C14 0280202D */ daddu $a0, $s4, $zero +/* 9F6658 80241C18 0200282D */ daddu $a1, $s0, $zero +/* 9F665C 80241C1C 0C0903EB */ jal func_80240FAC_9F59EC +/* 9F6660 80241C20 0260302D */ daddu $a2, $s3, $zero +/* 9F6664 80241C24 0280202D */ daddu $a0, $s4, $zero +/* 9F6668 80241C28 0200282D */ daddu $a1, $s0, $zero +/* 9F666C 80241C2C 0C09041B */ jal func_8024106C_9F5AAC +/* 9F6670 80241C30 0260302D */ daddu $a2, $s3, $zero +/* 9F6674 80241C34 0809072A */ j .L80241CA8 +/* 9F6678 80241C38 0000102D */ daddu $v0, $zero, $zero +/* 9F667C 80241C3C 0280202D */ daddu $a0, $s4, $zero +/* 9F6680 80241C40 0200282D */ daddu $a1, $s0, $zero +/* 9F6684 80241C44 0C0904EC */ jal func_802413B0_9F5DF0 +/* 9F6688 80241C48 0260302D */ daddu $a2, $s3, $zero +/* 9F668C 80241C4C 0280202D */ daddu $a0, $s4, $zero +/* 9F6690 80241C50 0200282D */ daddu $a1, $s0, $zero +/* 9F6694 80241C54 0C09050A */ jal func_80241428_9F5E68 +/* 9F6698 80241C58 0260302D */ daddu $a2, $s3, $zero +/* 9F669C 80241C5C 0809072A */ j .L80241CA8 +/* 9F66A0 80241C60 0000102D */ daddu $v0, $zero, $zero +/* 9F66A4 80241C64 0280202D */ daddu $a0, $s4, $zero +/* 9F66A8 80241C68 0200282D */ daddu $a1, $s0, $zero +/* 9F66AC 80241C6C 0C090525 */ jal func_80241494_9F5ED4 +/* 9F66B0 80241C70 0260302D */ daddu $a2, $s3, $zero +/* 9F66B4 80241C74 0809072A */ j .L80241CA8 +/* 9F66B8 80241C78 0000102D */ daddu $v0, $zero, $zero +/* 9F66BC 80241C7C 0280202D */ daddu $a0, $s4, $zero +/* 9F66C0 80241C80 0200282D */ daddu $a1, $s0, $zero +/* 9F66C4 80241C84 0C090572 */ jal func_802415C8_9F6008 +/* 9F66C8 80241C88 0260302D */ daddu $a2, $s3, $zero +/* 9F66CC 80241C8C 0809072A */ j .L80241CA8 +/* 9F66D0 80241C90 0000102D */ daddu $v0, $zero, $zero +/* 9F66D4 80241C94 0280202D */ daddu $a0, $s4, $zero +/* 9F66D8 80241C98 0200282D */ daddu $a1, $s0, $zero +/* 9F66DC 80241C9C 0C09058B */ jal func_8024162C_9F606C +/* 9F66E0 80241CA0 0260302D */ daddu $a2, $s3, $zero +.L80241CA4: +/* 9F66E4 80241CA4 0000102D */ daddu $v0, $zero, $zero +.L80241CA8: +/* 9F66E8 80241CA8 8FBF0048 */ lw $ra, 0x48($sp) +/* 9F66EC 80241CAC 8FB50044 */ lw $s5, 0x44($sp) +/* 9F66F0 80241CB0 8FB40040 */ lw $s4, 0x40($sp) +/* 9F66F4 80241CB4 8FB3003C */ lw $s3, 0x3c($sp) +/* 9F66F8 80241CB8 8FB20038 */ lw $s2, 0x38($sp) +/* 9F66FC 80241CBC 8FB10034 */ lw $s1, 0x34($sp) +/* 9F6700 80241CC0 8FB00030 */ lw $s0, 0x30($sp) +/* 9F6704 80241CC4 03E00008 */ jr $ra +/* 9F6708 80241CC8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241D3C_9F677C.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241D3C_9F677C.s index 165bb768d2..23a98bc939 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241D3C_9F677C.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241D3C_9F677C.s @@ -55,7 +55,7 @@ glabel func_80241D3C_9F677C /* 9F6844 80241E04 4405E000 */ mfc1 $a1, $f28 /* 9F6848 80241E08 4406D000 */ mfc1 $a2, $f26 /* 9F684C 80241E0C 4407C000 */ mfc1 $a3, $f24 -/* 9F6850 80241E10 0C090733 */ jal func_80241CCC +/* 9F6850 80241E10 0C090733 */ jal func_80241CCC_9F670C /* 9F6854 80241E14 27A40010 */ addiu $a0, $sp, 0x10 /* 9F6858 80241E18 27A40010 */ addiu $a0, $sp, 0x10 /* 9F685C 80241E1C 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80241D3C_9F677C /* 9F68CC 80241E8C 4405E000 */ mfc1 $a1, $f28 /* 9F68D0 80241E90 4406D000 */ mfc1 $a2, $f26 /* 9F68D4 80241E94 4407C000 */ mfc1 $a3, $f24 -/* 9F68D8 80241E98 0C090733 */ jal func_80241CCC +/* 9F68D8 80241E98 0C090733 */ jal func_80241CCC_9F670C /* 9F68DC 80241E9C 27A40010 */ addiu $a0, $sp, 0x10 /* 9F68E0 80241EA0 27A40010 */ addiu $a0, $sp, 0x10 /* 9F68E4 80241EA4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08.s deleted file mode 100644 index 2bf96cafa2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F08 -/* 9F6948 80241F08 3C028011 */ lui $v0, 0x8011 -/* 9F694C 80241F0C 8442F29C */ lh $v0, -0xd64($v0) -/* 9F6950 80241F10 28420064 */ slti $v0, $v0, 0x64 -/* 9F6954 80241F14 14400003 */ bnez $v0, .L80241F24 -/* 9F6958 80241F18 24020001 */ addiu $v0, $zero, 1 -/* 9F695C 80241F1C 080907CA */ j .L80241F28 -/* 9F6960 80241F20 AC800084 */ sw $zero, 0x84($a0) -.L80241F24: -/* 9F6964 80241F24 AC820084 */ sw $v0, 0x84($a0) -.L80241F28: -/* 9F6968 80241F28 03E00008 */ jr $ra -/* 9F696C 80241F2C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s new file mode 100644 index 0000000000..f53c31221c --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F08_9F6948 +/* 9F6948 80241F08 3C028011 */ lui $v0, 0x8011 +/* 9F694C 80241F0C 8442F29C */ lh $v0, -0xd64($v0) +/* 9F6950 80241F10 28420064 */ slti $v0, $v0, 0x64 +/* 9F6954 80241F14 14400003 */ bnez $v0, .L80241F24 +/* 9F6958 80241F18 24020001 */ addiu $v0, $zero, 1 +/* 9F695C 80241F1C 080907CA */ j .L80241F28 +/* 9F6960 80241F20 AC800084 */ sw $zero, 0x84($a0) +.L80241F24: +/* 9F6964 80241F24 AC820084 */ sw $v0, 0x84($a0) +.L80241F28: +/* 9F6968 80241F28 03E00008 */ jr $ra +/* 9F696C 80241F2C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180.s b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180.s deleted file mode 100644 index a06d4b1246..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240180 -/* 9FA970 80240180 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FA974 80240184 AFB10014 */ sw $s1, 0x14($sp) -/* 9FA978 80240188 0080882D */ daddu $s1, $a0, $zero -/* 9FA97C 8024018C AFBF0020 */ sw $ra, 0x20($sp) -/* 9FA980 80240190 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FA984 80240194 AFB20018 */ sw $s2, 0x18($sp) -/* 9FA988 80240198 AFB00010 */ sw $s0, 0x10($sp) -/* 9FA98C 8024019C 8E30000C */ lw $s0, 0xc($s1) -/* 9FA990 802401A0 8E330148 */ lw $s3, 0x148($s1) -/* 9FA994 802401A4 8E050000 */ lw $a1, ($s0) -/* 9FA998 802401A8 0C0B1EAF */ jal get_variable -/* 9FA99C 802401AC 26100004 */ addiu $s0, $s0, 4 -/* 9FA9A0 802401B0 0040902D */ daddu $s2, $v0, $zero -/* 9FA9A4 802401B4 8E050000 */ lw $a1, ($s0) -/* 9FA9A8 802401B8 26100004 */ addiu $s0, $s0, 4 -/* 9FA9AC 802401BC 0C0B1EAF */ jal get_variable -/* 9FA9B0 802401C0 0220202D */ daddu $a0, $s1, $zero -/* 9FA9B4 802401C4 0220202D */ daddu $a0, $s1, $zero -/* 9FA9B8 802401C8 8E050000 */ lw $a1, ($s0) -/* 9FA9BC 802401CC 0C0B1EAF */ jal get_variable -/* 9FA9C0 802401D0 0040802D */ daddu $s0, $v0, $zero -/* 9FA9C4 802401D4 0040882D */ daddu $s1, $v0, $zero -/* 9FA9C8 802401D8 2402FFFF */ addiu $v0, $zero, -1 -/* 9FA9CC 802401DC 16420002 */ bne $s2, $v0, .L802401E8 -/* 9FA9D0 802401E0 00000000 */ nop -/* 9FA9D4 802401E4 86720008 */ lh $s2, 8($s3) -.L802401E8: -/* 9FA9D8 802401E8 0C00FB5A */ jal get_enemy_safe -/* 9FA9DC 802401EC 0240202D */ daddu $a0, $s2, $zero -/* 9FA9E0 802401F0 0040982D */ daddu $s3, $v0, $zero -/* 9FA9E4 802401F4 12600003 */ beqz $s3, .L80240204 -/* 9FA9E8 802401F8 00101080 */ sll $v0, $s0, 2 -/* 9FA9EC 802401FC 02621021 */ addu $v0, $s3, $v0 -/* 9FA9F0 80240200 AC51006C */ sw $s1, 0x6c($v0) -.L80240204: -/* 9FA9F4 80240204 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FA9F8 80240208 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FA9FC 8024020C 8FB20018 */ lw $s2, 0x18($sp) -/* 9FAA00 80240210 8FB10014 */ lw $s1, 0x14($sp) -/* 9FAA04 80240214 8FB00010 */ lw $s0, 0x10($sp) -/* 9FAA08 80240218 24020002 */ addiu $v0, $zero, 2 -/* 9FAA0C 8024021C 03E00008 */ jr $ra -/* 9FAA10 80240220 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s new file mode 100644 index 0000000000..1d46664948 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240180_9FA970.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240180_9FA970 +/* 9FA970 80240180 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9FA974 80240184 AFB10014 */ sw $s1, 0x14($sp) +/* 9FA978 80240188 0080882D */ daddu $s1, $a0, $zero +/* 9FA97C 8024018C AFBF0020 */ sw $ra, 0x20($sp) +/* 9FA980 80240190 AFB3001C */ sw $s3, 0x1c($sp) +/* 9FA984 80240194 AFB20018 */ sw $s2, 0x18($sp) +/* 9FA988 80240198 AFB00010 */ sw $s0, 0x10($sp) +/* 9FA98C 8024019C 8E30000C */ lw $s0, 0xc($s1) +/* 9FA990 802401A0 8E330148 */ lw $s3, 0x148($s1) +/* 9FA994 802401A4 8E050000 */ lw $a1, ($s0) +/* 9FA998 802401A8 0C0B1EAF */ jal get_variable +/* 9FA99C 802401AC 26100004 */ addiu $s0, $s0, 4 +/* 9FA9A0 802401B0 0040902D */ daddu $s2, $v0, $zero +/* 9FA9A4 802401B4 8E050000 */ lw $a1, ($s0) +/* 9FA9A8 802401B8 26100004 */ addiu $s0, $s0, 4 +/* 9FA9AC 802401BC 0C0B1EAF */ jal get_variable +/* 9FA9B0 802401C0 0220202D */ daddu $a0, $s1, $zero +/* 9FA9B4 802401C4 0220202D */ daddu $a0, $s1, $zero +/* 9FA9B8 802401C8 8E050000 */ lw $a1, ($s0) +/* 9FA9BC 802401CC 0C0B1EAF */ jal get_variable +/* 9FA9C0 802401D0 0040802D */ daddu $s0, $v0, $zero +/* 9FA9C4 802401D4 0040882D */ daddu $s1, $v0, $zero +/* 9FA9C8 802401D8 2402FFFF */ addiu $v0, $zero, -1 +/* 9FA9CC 802401DC 16420002 */ bne $s2, $v0, .L802401E8 +/* 9FA9D0 802401E0 00000000 */ nop +/* 9FA9D4 802401E4 86720008 */ lh $s2, 8($s3) +.L802401E8: +/* 9FA9D8 802401E8 0C00FB5A */ jal get_enemy_safe +/* 9FA9DC 802401EC 0240202D */ daddu $a0, $s2, $zero +/* 9FA9E0 802401F0 0040982D */ daddu $s3, $v0, $zero +/* 9FA9E4 802401F4 12600003 */ beqz $s3, .L80240204 +/* 9FA9E8 802401F8 00101080 */ sll $v0, $s0, 2 +/* 9FA9EC 802401FC 02621021 */ addu $v0, $s3, $v0 +/* 9FA9F0 80240200 AC51006C */ sw $s1, 0x6c($v0) +.L80240204: +/* 9FA9F4 80240204 8FBF0020 */ lw $ra, 0x20($sp) +/* 9FA9F8 80240208 8FB3001C */ lw $s3, 0x1c($sp) +/* 9FA9FC 8024020C 8FB20018 */ lw $s2, 0x18($sp) +/* 9FAA00 80240210 8FB10014 */ lw $s1, 0x14($sp) +/* 9FAA04 80240214 8FB00010 */ lw $s0, 0x10($sp) +/* 9FAA08 80240218 24020002 */ addiu $v0, $zero, 2 +/* 9FAA0C 8024021C 03E00008 */ jr $ra +/* 9FAA10 80240220 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224.s b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224.s deleted file mode 100644 index 1168e49893..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240224 -/* 9FAA14 80240224 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FAA18 80240228 AFB10014 */ sw $s1, 0x14($sp) -/* 9FAA1C 8024022C 0080882D */ daddu $s1, $a0, $zero -/* 9FAA20 80240230 AFBF0020 */ sw $ra, 0x20($sp) -/* 9FAA24 80240234 AFB3001C */ sw $s3, 0x1c($sp) -/* 9FAA28 80240238 AFB20018 */ sw $s2, 0x18($sp) -/* 9FAA2C 8024023C AFB00010 */ sw $s0, 0x10($sp) -/* 9FAA30 80240240 8E30000C */ lw $s0, 0xc($s1) -/* 9FAA34 80240244 8E050000 */ lw $a1, ($s0) -/* 9FAA38 80240248 0C0B1EAF */ jal get_variable -/* 9FAA3C 8024024C 26100004 */ addiu $s0, $s0, 4 -/* 9FAA40 80240250 8E050000 */ lw $a1, ($s0) -/* 9FAA44 80240254 26100004 */ addiu $s0, $s0, 4 -/* 9FAA48 80240258 0220202D */ daddu $a0, $s1, $zero -/* 9FAA4C 8024025C 0C0B1EAF */ jal get_variable -/* 9FAA50 80240260 0040982D */ daddu $s3, $v0, $zero -/* 9FAA54 80240264 8E050000 */ lw $a1, ($s0) -/* 9FAA58 80240268 26100004 */ addiu $s0, $s0, 4 -/* 9FAA5C 8024026C 0220202D */ daddu $a0, $s1, $zero -/* 9FAA60 80240270 0C0B1EAF */ jal get_variable -/* 9FAA64 80240274 0040902D */ daddu $s2, $v0, $zero -/* 9FAA68 80240278 0220202D */ daddu $a0, $s1, $zero -/* 9FAA6C 8024027C 8E050000 */ lw $a1, ($s0) -/* 9FAA70 80240280 0C0B1EAF */ jal get_variable -/* 9FAA74 80240284 0040882D */ daddu $s1, $v0, $zero -/* 9FAA78 80240288 0260202D */ daddu $a0, $s3, $zero -/* 9FAA7C 8024028C 0C04417A */ jal get_entity_by_index -/* 9FAA80 80240290 0040802D */ daddu $s0, $v0, $zero -/* 9FAA84 80240294 0040182D */ daddu $v1, $v0, $zero -/* 9FAA88 80240298 44920000 */ mtc1 $s2, $f0 -/* 9FAA8C 8024029C 00000000 */ nop -/* 9FAA90 802402A0 46800020 */ cvt.s.w $f0, $f0 -/* 9FAA94 802402A4 E4600048 */ swc1 $f0, 0x48($v1) -/* 9FAA98 802402A8 44910000 */ mtc1 $s1, $f0 -/* 9FAA9C 802402AC 00000000 */ nop -/* 9FAAA0 802402B0 46800020 */ cvt.s.w $f0, $f0 -/* 9FAAA4 802402B4 E460004C */ swc1 $f0, 0x4c($v1) -/* 9FAAA8 802402B8 44900000 */ mtc1 $s0, $f0 -/* 9FAAAC 802402BC 00000000 */ nop -/* 9FAAB0 802402C0 46800020 */ cvt.s.w $f0, $f0 -/* 9FAAB4 802402C4 E4600050 */ swc1 $f0, 0x50($v1) -/* 9FAAB8 802402C8 8FBF0020 */ lw $ra, 0x20($sp) -/* 9FAABC 802402CC 8FB3001C */ lw $s3, 0x1c($sp) -/* 9FAAC0 802402D0 8FB20018 */ lw $s2, 0x18($sp) -/* 9FAAC4 802402D4 8FB10014 */ lw $s1, 0x14($sp) -/* 9FAAC8 802402D8 8FB00010 */ lw $s0, 0x10($sp) -/* 9FAACC 802402DC 24020002 */ addiu $v0, $zero, 2 -/* 9FAAD0 802402E0 03E00008 */ jr $ra -/* 9FAAD4 802402E4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9FAAD8 802402E8 00000000 */ nop -/* 9FAADC 802402EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s new file mode 100644 index 0000000000..c025a0ebb0 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_12/9FA970/func_80240224_9FAA14.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240224_9FAA14 +/* 9FAA14 80240224 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9FAA18 80240228 AFB10014 */ sw $s1, 0x14($sp) +/* 9FAA1C 8024022C 0080882D */ daddu $s1, $a0, $zero +/* 9FAA20 80240230 AFBF0020 */ sw $ra, 0x20($sp) +/* 9FAA24 80240234 AFB3001C */ sw $s3, 0x1c($sp) +/* 9FAA28 80240238 AFB20018 */ sw $s2, 0x18($sp) +/* 9FAA2C 8024023C AFB00010 */ sw $s0, 0x10($sp) +/* 9FAA30 80240240 8E30000C */ lw $s0, 0xc($s1) +/* 9FAA34 80240244 8E050000 */ lw $a1, ($s0) +/* 9FAA38 80240248 0C0B1EAF */ jal get_variable +/* 9FAA3C 8024024C 26100004 */ addiu $s0, $s0, 4 +/* 9FAA40 80240250 8E050000 */ lw $a1, ($s0) +/* 9FAA44 80240254 26100004 */ addiu $s0, $s0, 4 +/* 9FAA48 80240258 0220202D */ daddu $a0, $s1, $zero +/* 9FAA4C 8024025C 0C0B1EAF */ jal get_variable +/* 9FAA50 80240260 0040982D */ daddu $s3, $v0, $zero +/* 9FAA54 80240264 8E050000 */ lw $a1, ($s0) +/* 9FAA58 80240268 26100004 */ addiu $s0, $s0, 4 +/* 9FAA5C 8024026C 0220202D */ daddu $a0, $s1, $zero +/* 9FAA60 80240270 0C0B1EAF */ jal get_variable +/* 9FAA64 80240274 0040902D */ daddu $s2, $v0, $zero +/* 9FAA68 80240278 0220202D */ daddu $a0, $s1, $zero +/* 9FAA6C 8024027C 8E050000 */ lw $a1, ($s0) +/* 9FAA70 80240280 0C0B1EAF */ jal get_variable +/* 9FAA74 80240284 0040882D */ daddu $s1, $v0, $zero +/* 9FAA78 80240288 0260202D */ daddu $a0, $s3, $zero +/* 9FAA7C 8024028C 0C04417A */ jal get_entity_by_index +/* 9FAA80 80240290 0040802D */ daddu $s0, $v0, $zero +/* 9FAA84 80240294 0040182D */ daddu $v1, $v0, $zero +/* 9FAA88 80240298 44920000 */ mtc1 $s2, $f0 +/* 9FAA8C 8024029C 00000000 */ nop +/* 9FAA90 802402A0 46800020 */ cvt.s.w $f0, $f0 +/* 9FAA94 802402A4 E4600048 */ swc1 $f0, 0x48($v1) +/* 9FAA98 802402A8 44910000 */ mtc1 $s1, $f0 +/* 9FAA9C 802402AC 00000000 */ nop +/* 9FAAA0 802402B0 46800020 */ cvt.s.w $f0, $f0 +/* 9FAAA4 802402B4 E460004C */ swc1 $f0, 0x4c($v1) +/* 9FAAA8 802402B8 44900000 */ mtc1 $s0, $f0 +/* 9FAAAC 802402BC 00000000 */ nop +/* 9FAAB0 802402C0 46800020 */ cvt.s.w $f0, $f0 +/* 9FAAB4 802402C4 E4600050 */ swc1 $f0, 0x50($v1) +/* 9FAAB8 802402C8 8FBF0020 */ lw $ra, 0x20($sp) +/* 9FAABC 802402CC 8FB3001C */ lw $s3, 0x1c($sp) +/* 9FAAC0 802402D0 8FB20018 */ lw $s2, 0x18($sp) +/* 9FAAC4 802402D4 8FB10014 */ lw $s1, 0x14($sp) +/* 9FAAC8 802402D8 8FB00010 */ lw $s0, 0x10($sp) +/* 9FAACC 802402DC 24020002 */ addiu $v0, $zero, 2 +/* 9FAAD0 802402E0 03E00008 */ jr $ra +/* 9FAAD4 802402E4 27BD0028 */ addiu $sp, $sp, 0x28 +/* 9FAAD8 802402E8 00000000 */ nop +/* 9FAADC 802402EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAB20/func_802403A0_9FAB90.s b/asm/nonmatchings/world/area_nok/nok_12/9FAB20/func_802403A0_9FAB90.s index a63ce279a1..d581055575 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAB20/func_802403A0_9FAB90.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAB20/func_802403A0_9FAB90.s @@ -55,7 +55,7 @@ glabel func_802403A0_9FAB90 /* 9FAC58 80240468 4405E000 */ mfc1 $a1, $f28 /* 9FAC5C 8024046C 4406D000 */ mfc1 $a2, $f26 /* 9FAC60 80240470 4407C000 */ mfc1 $a3, $f24 -/* 9FAC64 80240474 0C0900CC */ jal func_80240330 +/* 9FAC64 80240474 0C0900CC */ jal func_80240330_9FAB20 /* 9FAC68 80240478 27A40010 */ addiu $a0, $sp, 0x10 /* 9FAC6C 8024047C 27A40010 */ addiu $a0, $sp, 0x10 /* 9FAC70 80240480 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802403A0_9FAB90 /* 9FACE0 802404F0 4405E000 */ mfc1 $a1, $f28 /* 9FACE4 802404F4 4406D000 */ mfc1 $a2, $f26 /* 9FACE8 802404F8 4407C000 */ mfc1 $a3, $f24 -/* 9FACEC 802404FC 0C0900CC */ jal func_80240330 +/* 9FACEC 802404FC 0C0900CC */ jal func_80240330_9FAB20 /* 9FACF0 80240500 27A40010 */ addiu $a0, $sp, 0x10 /* 9FACF4 80240504 27A40010 */ addiu $a0, $sp, 0x10 /* 9FACF8 80240508 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240570.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240570.s deleted file mode 100644 index d24b69c9fd..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240570.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240570 -/* 9FAD60 80240570 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FAD64 80240574 AFB20018 */ sw $s2, 0x18($sp) -/* 9FAD68 80240578 0080902D */ daddu $s2, $a0, $zero -/* 9FAD6C 8024057C AFBF001C */ sw $ra, 0x1c($sp) -/* 9FAD70 80240580 AFB10014 */ sw $s1, 0x14($sp) -/* 9FAD74 80240584 AFB00010 */ sw $s0, 0x10($sp) -/* 9FAD78 80240588 8E510148 */ lw $s1, 0x148($s2) -/* 9FAD7C 8024058C 0C00EABB */ jal get_npc_unsafe -/* 9FAD80 80240590 86240008 */ lh $a0, 8($s1) -/* 9FAD84 80240594 0040802D */ daddu $s0, $v0, $zero -/* 9FAD88 80240598 8E2300CC */ lw $v1, 0xcc($s1) -/* 9FAD8C 8024059C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9FAD90 802405A0 8C630020 */ lw $v1, 0x20($v1) -/* 9FAD94 802405A4 AE030028 */ sw $v1, 0x28($s0) -/* 9FAD98 802405A8 96220076 */ lhu $v0, 0x76($s1) -/* 9FAD9C 802405AC A602008E */ sh $v0, 0x8e($s0) -/* 9FADA0 802405B0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9FADA4 802405B4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9FADA8 802405B8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9FADAC 802405BC 8C460028 */ lw $a2, 0x28($v0) -/* 9FADB0 802405C0 0C00A720 */ jal atan2 -/* 9FADB4 802405C4 8C470030 */ lw $a3, 0x30($v0) -/* 9FADB8 802405C8 2402000D */ addiu $v0, $zero, 0xd -/* 9FADBC 802405CC E600000C */ swc1 $f0, 0xc($s0) -/* 9FADC0 802405D0 AE420070 */ sw $v0, 0x70($s2) -/* 9FADC4 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 9FADC8 802405D8 8FB20018 */ lw $s2, 0x18($sp) -/* 9FADCC 802405DC 8FB10014 */ lw $s1, 0x14($sp) -/* 9FADD0 802405E0 8FB00010 */ lw $s0, 0x10($sp) -/* 9FADD4 802405E4 03E00008 */ jr $ra -/* 9FADD8 802405E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240570_9FAD60.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240570_9FAD60.s new file mode 100644 index 0000000000..8c6481246f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240570_9FAD60.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240570_9FAD60 +/* 9FAD60 80240570 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9FAD64 80240574 AFB20018 */ sw $s2, 0x18($sp) +/* 9FAD68 80240578 0080902D */ daddu $s2, $a0, $zero +/* 9FAD6C 8024057C AFBF001C */ sw $ra, 0x1c($sp) +/* 9FAD70 80240580 AFB10014 */ sw $s1, 0x14($sp) +/* 9FAD74 80240584 AFB00010 */ sw $s0, 0x10($sp) +/* 9FAD78 80240588 8E510148 */ lw $s1, 0x148($s2) +/* 9FAD7C 8024058C 0C00EABB */ jal get_npc_unsafe +/* 9FAD80 80240590 86240008 */ lh $a0, 8($s1) +/* 9FAD84 80240594 0040802D */ daddu $s0, $v0, $zero +/* 9FAD88 80240598 8E2300CC */ lw $v1, 0xcc($s1) +/* 9FAD8C 8024059C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9FAD90 802405A0 8C630020 */ lw $v1, 0x20($v1) +/* 9FAD94 802405A4 AE030028 */ sw $v1, 0x28($s0) +/* 9FAD98 802405A8 96220076 */ lhu $v0, 0x76($s1) +/* 9FAD9C 802405AC A602008E */ sh $v0, 0x8e($s0) +/* 9FADA0 802405B0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9FADA4 802405B4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9FADA8 802405B8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9FADAC 802405BC 8C460028 */ lw $a2, 0x28($v0) +/* 9FADB0 802405C0 0C00A720 */ jal atan2 +/* 9FADB4 802405C4 8C470030 */ lw $a3, 0x30($v0) +/* 9FADB8 802405C8 2402000D */ addiu $v0, $zero, 0xd +/* 9FADBC 802405CC E600000C */ swc1 $f0, 0xc($s0) +/* 9FADC0 802405D0 AE420070 */ sw $v0, 0x70($s2) +/* 9FADC4 802405D4 8FBF001C */ lw $ra, 0x1c($sp) +/* 9FADC8 802405D8 8FB20018 */ lw $s2, 0x18($sp) +/* 9FADCC 802405DC 8FB10014 */ lw $s1, 0x14($sp) +/* 9FADD0 802405E0 8FB00010 */ lw $s0, 0x10($sp) +/* 9FADD4 802405E4 03E00008 */ jr $ra +/* 9FADD8 802405E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240884.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240884.s deleted file mode 100644 index 149c406837..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240884.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240884 -/* 9FB074 80240884 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FB078 80240888 AFB10014 */ sw $s1, 0x14($sp) -/* 9FB07C 8024088C 0080882D */ daddu $s1, $a0, $zero -/* 9FB080 80240890 AFBF0018 */ sw $ra, 0x18($sp) -/* 9FB084 80240894 AFB00010 */ sw $s0, 0x10($sp) -/* 9FB088 80240898 8E300148 */ lw $s0, 0x148($s1) -/* 9FB08C 8024089C 0C00EABB */ jal get_npc_unsafe -/* 9FB090 802408A0 86040008 */ lh $a0, 8($s0) -/* 9FB094 802408A4 0040202D */ daddu $a0, $v0, $zero -/* 9FB098 802408A8 9482008E */ lhu $v0, 0x8e($a0) -/* 9FB09C 802408AC 24030003 */ addiu $v1, $zero, 3 -/* 9FB0A0 802408B0 24420001 */ addiu $v0, $v0, 1 -/* 9FB0A4 802408B4 A482008E */ sh $v0, 0x8e($a0) -/* 9FB0A8 802408B8 00021400 */ sll $v0, $v0, 0x10 -/* 9FB0AC 802408BC 00021403 */ sra $v0, $v0, 0x10 -/* 9FB0B0 802408C0 14430003 */ bne $v0, $v1, .L802408D0 -/* 9FB0B4 802408C4 00000000 */ nop -/* 9FB0B8 802408C8 96020086 */ lhu $v0, 0x86($s0) -/* 9FB0BC 802408CC A48200A8 */ sh $v0, 0xa8($a0) -.L802408D0: -/* 9FB0C0 802408D0 8482008E */ lh $v0, 0x8e($a0) -/* 9FB0C4 802408D4 8E030080 */ lw $v1, 0x80($s0) -/* 9FB0C8 802408D8 0043102A */ slt $v0, $v0, $v1 -/* 9FB0CC 802408DC 14400004 */ bnez $v0, .L802408F0 -/* 9FB0D0 802408E0 00000000 */ nop -/* 9FB0D4 802408E4 96020086 */ lhu $v0, 0x86($s0) -/* 9FB0D8 802408E8 A48200A8 */ sh $v0, 0xa8($a0) -/* 9FB0DC 802408EC AE200070 */ sw $zero, 0x70($s1) -.L802408F0: -/* 9FB0E0 802408F0 8FBF0018 */ lw $ra, 0x18($sp) -/* 9FB0E4 802408F4 8FB10014 */ lw $s1, 0x14($sp) -/* 9FB0E8 802408F8 8FB00010 */ lw $s0, 0x10($sp) -/* 9FB0EC 802408FC 03E00008 */ jr $ra -/* 9FB0F0 80240900 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240884_9FB074.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240884_9FB074.s new file mode 100644 index 0000000000..66071e9fb4 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240884_9FB074.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240884_9FB074 +/* 9FB074 80240884 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9FB078 80240888 AFB10014 */ sw $s1, 0x14($sp) +/* 9FB07C 8024088C 0080882D */ daddu $s1, $a0, $zero +/* 9FB080 80240890 AFBF0018 */ sw $ra, 0x18($sp) +/* 9FB084 80240894 AFB00010 */ sw $s0, 0x10($sp) +/* 9FB088 80240898 8E300148 */ lw $s0, 0x148($s1) +/* 9FB08C 8024089C 0C00EABB */ jal get_npc_unsafe +/* 9FB090 802408A0 86040008 */ lh $a0, 8($s0) +/* 9FB094 802408A4 0040202D */ daddu $a0, $v0, $zero +/* 9FB098 802408A8 9482008E */ lhu $v0, 0x8e($a0) +/* 9FB09C 802408AC 24030003 */ addiu $v1, $zero, 3 +/* 9FB0A0 802408B0 24420001 */ addiu $v0, $v0, 1 +/* 9FB0A4 802408B4 A482008E */ sh $v0, 0x8e($a0) +/* 9FB0A8 802408B8 00021400 */ sll $v0, $v0, 0x10 +/* 9FB0AC 802408BC 00021403 */ sra $v0, $v0, 0x10 +/* 9FB0B0 802408C0 14430003 */ bne $v0, $v1, .L802408D0 +/* 9FB0B4 802408C4 00000000 */ nop +/* 9FB0B8 802408C8 96020086 */ lhu $v0, 0x86($s0) +/* 9FB0BC 802408CC A48200A8 */ sh $v0, 0xa8($a0) +.L802408D0: +/* 9FB0C0 802408D0 8482008E */ lh $v0, 0x8e($a0) +/* 9FB0C4 802408D4 8E030080 */ lw $v1, 0x80($s0) +/* 9FB0C8 802408D8 0043102A */ slt $v0, $v0, $v1 +/* 9FB0CC 802408DC 14400004 */ bnez $v0, .L802408F0 +/* 9FB0D0 802408E0 00000000 */ nop +/* 9FB0D4 802408E4 96020086 */ lhu $v0, 0x86($s0) +/* 9FB0D8 802408E8 A48200A8 */ sh $v0, 0xa8($a0) +/* 9FB0DC 802408EC AE200070 */ sw $zero, 0x70($s1) +.L802408F0: +/* 9FB0E0 802408F0 8FBF0018 */ lw $ra, 0x18($sp) +/* 9FB0E4 802408F4 8FB10014 */ lw $s1, 0x14($sp) +/* 9FB0E8 802408F8 8FB00010 */ lw $s0, 0x10($sp) +/* 9FB0EC 802408FC 03E00008 */ jr $ra +/* 9FB0F0 80240900 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s index 22780146ff..63977fa540 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80240904_9FB0F4.s @@ -232,25 +232,25 @@ glabel func_80240904_9FB0F4 .L80240C54: /* 9FB444 80240C54 0260202D */ daddu $a0, $s3, $zero /* 9FB448 80240C58 0280282D */ daddu $a1, $s4, $zero -/* 9FB44C 80240C5C 0C09015C */ jal func_80240570 +/* 9FB44C 80240C5C 0C09015C */ jal func_80240570_9FAD60 /* 9FB450 80240C60 02A0302D */ daddu $a2, $s5, $zero /* 9FB454 80240C64 0260202D */ daddu $a0, $s3, $zero .L80240C68: /* 9FB458 80240C68 0280282D */ daddu $a1, $s4, $zero -/* 9FB45C 80240C6C 0C09017B */ jal func_802405EC +/* 9FB45C 80240C6C 0C09017B */ jal func_802405EC_9FADDC /* 9FB460 80240C70 02A0302D */ daddu $a2, $s5, $zero /* 9FB464 80240C74 0809032C */ j .L80240CB0 /* 9FB468 80240C78 00000000 */ nop .L80240C7C: /* 9FB46C 80240C7C 0260202D */ daddu $a0, $s3, $zero /* 9FB470 80240C80 0280282D */ daddu $a1, $s4, $zero -/* 9FB474 80240C84 0C0901C8 */ jal func_80240720 +/* 9FB474 80240C84 0C0901C8 */ jal func_80240720_9FAF10 /* 9FB478 80240C88 02A0302D */ daddu $a2, $s5, $zero /* 9FB47C 80240C8C 0809032C */ j .L80240CB0 /* 9FB480 80240C90 00000000 */ nop .L80240C94: /* 9FB484 80240C94 0280282D */ daddu $a1, $s4, $zero -/* 9FB488 80240C98 0C090221 */ jal func_80240884 +/* 9FB488 80240C98 0C090221 */ jal func_80240884_9FB074 /* 9FB48C 80240C9C 02A0302D */ daddu $a2, $s5, $zero /* 9FB490 80240CA0 0809032C */ j .L80240CB0 /* 9FB494 80240CA4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474.s deleted file mode 100644 index 53c1f66439..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241474 -/* 9FBC64 80241474 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9FBC68 80241478 AFB10014 */ sw $s1, 0x14($sp) -/* 9FBC6C 8024147C 0080882D */ daddu $s1, $a0, $zero -/* 9FBC70 80241480 AFBF0018 */ sw $ra, 0x18($sp) -/* 9FBC74 80241484 AFB00010 */ sw $s0, 0x10($sp) -/* 9FBC78 80241488 8E300148 */ lw $s0, 0x148($s1) -/* 9FBC7C 8024148C 0C00EABB */ jal get_npc_unsafe -/* 9FBC80 80241490 86040008 */ lh $a0, 8($s0) -/* 9FBC84 80241494 8E0300CC */ lw $v1, 0xcc($s0) -/* 9FBC88 80241498 3C014120 */ lui $at, 0x4120 -/* 9FBC8C 8024149C 44812000 */ mtc1 $at, $f4 -/* 9FBC90 802414A0 3C014000 */ lui $at, 0x4000 -/* 9FBC94 802414A4 44810000 */ mtc1 $at, $f0 -/* 9FBC98 802414A8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9FBC9C 802414AC 8C640010 */ lw $a0, 0x10($v1) -/* 9FBCA0 802414B0 8C430000 */ lw $v1, ($v0) -/* 9FBCA4 802414B4 E444001C */ swc1 $f4, 0x1c($v0) -/* 9FBCA8 802414B8 E4400014 */ swc1 $f0, 0x14($v0) -/* 9FBCAC 802414BC E4420064 */ swc1 $f2, 0x64($v0) -/* 9FBCB0 802414C0 34630800 */ ori $v1, $v1, 0x800 -/* 9FBCB4 802414C4 AC430000 */ sw $v1, ($v0) -/* 9FBCB8 802414C8 AC440028 */ sw $a0, 0x28($v0) -/* 9FBCBC 802414CC 2402000B */ addiu $v0, $zero, 0xb -/* 9FBCC0 802414D0 AE220070 */ sw $v0, 0x70($s1) -/* 9FBCC4 802414D4 8FBF0018 */ lw $ra, 0x18($sp) -/* 9FBCC8 802414D8 8FB10014 */ lw $s1, 0x14($sp) -/* 9FBCCC 802414DC 8FB00010 */ lw $s0, 0x10($sp) -/* 9FBCD0 802414E0 03E00008 */ jr $ra -/* 9FBCD4 802414E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474_9FBC64.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474_9FBC64.s new file mode 100644 index 0000000000..b746d2b8cc --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241474_9FBC64.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241474_9FBC64 +/* 9FBC64 80241474 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9FBC68 80241478 AFB10014 */ sw $s1, 0x14($sp) +/* 9FBC6C 8024147C 0080882D */ daddu $s1, $a0, $zero +/* 9FBC70 80241480 AFBF0018 */ sw $ra, 0x18($sp) +/* 9FBC74 80241484 AFB00010 */ sw $s0, 0x10($sp) +/* 9FBC78 80241488 8E300148 */ lw $s0, 0x148($s1) +/* 9FBC7C 8024148C 0C00EABB */ jal get_npc_unsafe +/* 9FBC80 80241490 86040008 */ lh $a0, 8($s0) +/* 9FBC84 80241494 8E0300CC */ lw $v1, 0xcc($s0) +/* 9FBC88 80241498 3C014120 */ lui $at, 0x4120 +/* 9FBC8C 8024149C 44812000 */ mtc1 $at, $f4 +/* 9FBC90 802414A0 3C014000 */ lui $at, 0x4000 +/* 9FBC94 802414A4 44810000 */ mtc1 $at, $f0 +/* 9FBC98 802414A8 C442003C */ lwc1 $f2, 0x3c($v0) +/* 9FBC9C 802414AC 8C640010 */ lw $a0, 0x10($v1) +/* 9FBCA0 802414B0 8C430000 */ lw $v1, ($v0) +/* 9FBCA4 802414B4 E444001C */ swc1 $f4, 0x1c($v0) +/* 9FBCA8 802414B8 E4400014 */ swc1 $f0, 0x14($v0) +/* 9FBCAC 802414BC E4420064 */ swc1 $f2, 0x64($v0) +/* 9FBCB0 802414C0 34630800 */ ori $v1, $v1, 0x800 +/* 9FBCB4 802414C4 AC430000 */ sw $v1, ($v0) +/* 9FBCB8 802414C8 AC440028 */ sw $a0, 0x28($v0) +/* 9FBCBC 802414CC 2402000B */ addiu $v0, $zero, 0xb +/* 9FBCC0 802414D0 AE220070 */ sw $v0, 0x70($s1) +/* 9FBCC4 802414D4 8FBF0018 */ lw $ra, 0x18($sp) +/* 9FBCC8 802414D8 8FB10014 */ lw $s1, 0x14($sp) +/* 9FBCCC 802414DC 8FB00010 */ lw $s0, 0x10($sp) +/* 9FBCD0 802414E0 03E00008 */ jr $ra +/* 9FBCD4 802414E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8.s deleted file mode 100644 index f1abc6d352..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414E8 -/* 9FBCD8 802414E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9FBCDC 802414EC AFB00010 */ sw $s0, 0x10($sp) -/* 9FBCE0 802414F0 0080802D */ daddu $s0, $a0, $zero -/* 9FBCE4 802414F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9FBCE8 802414F8 8E020148 */ lw $v0, 0x148($s0) -/* 9FBCEC 802414FC 0C00EABB */ jal get_npc_unsafe -/* 9FBCF0 80241500 84440008 */ lh $a0, 8($v0) -/* 9FBCF4 80241504 0040202D */ daddu $a0, $v0, $zero -/* 9FBCF8 80241508 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9FBCFC 8024150C C480001C */ lwc1 $f0, 0x1c($a0) -/* 9FBD00 80241510 46001080 */ add.s $f2, $f2, $f0 -/* 9FBD04 80241514 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9FBD08 80241518 46040001 */ sub.s $f0, $f0, $f4 -/* 9FBD0C 8024151C C4840064 */ lwc1 $f4, 0x64($a0) -/* 9FBD10 80241520 4602203C */ c.lt.s $f4, $f2 -/* 9FBD14 80241524 E482003C */ swc1 $f2, 0x3c($a0) -/* 9FBD18 80241528 45010009 */ bc1t .L80241550 -/* 9FBD1C 8024152C E480001C */ swc1 $f0, 0x1c($a0) -/* 9FBD20 80241530 8C820000 */ lw $v0, ($a0) -/* 9FBD24 80241534 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9FBD28 80241538 E484003C */ swc1 $f4, 0x3c($a0) -/* 9FBD2C 8024153C AC80001C */ sw $zero, 0x1c($a0) -/* 9FBD30 80241540 00431024 */ and $v0, $v0, $v1 -/* 9FBD34 80241544 AC820000 */ sw $v0, ($a0) -/* 9FBD38 80241548 2402000C */ addiu $v0, $zero, 0xc -/* 9FBD3C 8024154C AE020070 */ sw $v0, 0x70($s0) -.L80241550: -/* 9FBD40 80241550 8FBF0014 */ lw $ra, 0x14($sp) -/* 9FBD44 80241554 8FB00010 */ lw $s0, 0x10($sp) -/* 9FBD48 80241558 03E00008 */ jr $ra -/* 9FBD4C 8024155C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8_9FBCD8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8_9FBCD8.s new file mode 100644 index 0000000000..19104b548f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802414E8_9FBCD8.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414E8_9FBCD8 +/* 9FBCD8 802414E8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9FBCDC 802414EC AFB00010 */ sw $s0, 0x10($sp) +/* 9FBCE0 802414F0 0080802D */ daddu $s0, $a0, $zero +/* 9FBCE4 802414F4 AFBF0014 */ sw $ra, 0x14($sp) +/* 9FBCE8 802414F8 8E020148 */ lw $v0, 0x148($s0) +/* 9FBCEC 802414FC 0C00EABB */ jal get_npc_unsafe +/* 9FBCF0 80241500 84440008 */ lh $a0, 8($v0) +/* 9FBCF4 80241504 0040202D */ daddu $a0, $v0, $zero +/* 9FBCF8 80241508 C482003C */ lwc1 $f2, 0x3c($a0) +/* 9FBCFC 8024150C C480001C */ lwc1 $f0, 0x1c($a0) +/* 9FBD00 80241510 46001080 */ add.s $f2, $f2, $f0 +/* 9FBD04 80241514 C4840014 */ lwc1 $f4, 0x14($a0) +/* 9FBD08 80241518 46040001 */ sub.s $f0, $f0, $f4 +/* 9FBD0C 8024151C C4840064 */ lwc1 $f4, 0x64($a0) +/* 9FBD10 80241520 4602203C */ c.lt.s $f4, $f2 +/* 9FBD14 80241524 E482003C */ swc1 $f2, 0x3c($a0) +/* 9FBD18 80241528 45010009 */ bc1t .L80241550 +/* 9FBD1C 8024152C E480001C */ swc1 $f0, 0x1c($a0) +/* 9FBD20 80241530 8C820000 */ lw $v0, ($a0) +/* 9FBD24 80241534 2403F7FF */ addiu $v1, $zero, -0x801 +/* 9FBD28 80241538 E484003C */ swc1 $f4, 0x3c($a0) +/* 9FBD2C 8024153C AC80001C */ sw $zero, 0x1c($a0) +/* 9FBD30 80241540 00431024 */ and $v0, $v0, $v1 +/* 9FBD34 80241544 AC820000 */ sw $v0, ($a0) +/* 9FBD38 80241548 2402000C */ addiu $v0, $zero, 0xc +/* 9FBD3C 8024154C AE020070 */ sw $v0, 0x70($s0) +.L80241550: +/* 9FBD40 80241550 8FBF0014 */ lw $ra, 0x14($sp) +/* 9FBD44 80241554 8FB00010 */ lw $s0, 0x10($sp) +/* 9FBD48 80241558 03E00008 */ jr $ra +/* 9FBD4C 8024155C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690.s deleted file mode 100644 index 86f4e6d07c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241690 -/* 9FBE80 80241690 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9FBE84 80241694 AFB3003C */ sw $s3, 0x3c($sp) -/* 9FBE88 80241698 0080982D */ daddu $s3, $a0, $zero -/* 9FBE8C 8024169C AFBF0040 */ sw $ra, 0x40($sp) -/* 9FBE90 802416A0 AFB20038 */ sw $s2, 0x38($sp) -/* 9FBE94 802416A4 AFB10034 */ sw $s1, 0x34($sp) -/* 9FBE98 802416A8 AFB00030 */ sw $s0, 0x30($sp) -/* 9FBE9C 802416AC 8E720148 */ lw $s2, 0x148($s3) -/* 9FBEA0 802416B0 00A0882D */ daddu $s1, $a1, $zero -/* 9FBEA4 802416B4 86440008 */ lh $a0, 8($s2) -/* 9FBEA8 802416B8 0C00EABB */ jal get_npc_unsafe -/* 9FBEAC 802416BC 00C0802D */ daddu $s0, $a2, $zero -/* 9FBEB0 802416C0 0200202D */ daddu $a0, $s0, $zero -/* 9FBEB4 802416C4 0240282D */ daddu $a1, $s2, $zero -/* 9FBEB8 802416C8 24030001 */ addiu $v1, $zero, 1 -/* 9FBEBC 802416CC AFA30010 */ sw $v1, 0x10($sp) -/* 9FBEC0 802416D0 8E260024 */ lw $a2, 0x24($s1) -/* 9FBEC4 802416D4 8E270028 */ lw $a3, 0x28($s1) -/* 9FBEC8 802416D8 0C01242D */ jal func_800490B4 -/* 9FBECC 802416DC 0040802D */ daddu $s0, $v0, $zero -/* 9FBED0 802416E0 1440001E */ bnez $v0, .L8024175C -/* 9FBED4 802416E4 0200202D */ daddu $a0, $s0, $zero -/* 9FBED8 802416E8 24040002 */ addiu $a0, $zero, 2 -/* 9FBEDC 802416EC 0200282D */ daddu $a1, $s0, $zero -/* 9FBEE0 802416F0 0000302D */ daddu $a2, $zero, $zero -/* 9FBEE4 802416F4 860300A8 */ lh $v1, 0xa8($s0) -/* 9FBEE8 802416F8 3C013F80 */ lui $at, 0x3f80 -/* 9FBEEC 802416FC 44810000 */ mtc1 $at, $f0 -/* 9FBEF0 80241700 3C014000 */ lui $at, 0x4000 -/* 9FBEF4 80241704 44811000 */ mtc1 $at, $f2 -/* 9FBEF8 80241708 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FBEFC 8024170C 44812000 */ mtc1 $at, $f4 -/* 9FBF00 80241710 2402000F */ addiu $v0, $zero, 0xf -/* 9FBF04 80241714 AFA2001C */ sw $v0, 0x1c($sp) -/* 9FBF08 80241718 44833000 */ mtc1 $v1, $f6 -/* 9FBF0C 8024171C 00000000 */ nop -/* 9FBF10 80241720 468031A0 */ cvt.s.w $f6, $f6 -/* 9FBF14 80241724 44073000 */ mfc1 $a3, $f6 -/* 9FBF18 80241728 27A20028 */ addiu $v0, $sp, 0x28 -/* 9FBF1C 8024172C AFA20020 */ sw $v0, 0x20($sp) -/* 9FBF20 80241730 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FBF24 80241734 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FBF28 80241738 0C01BFA4 */ jal fx_emote -/* 9FBF2C 8024173C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FBF30 80241740 8E4200CC */ lw $v0, 0xcc($s2) -/* 9FBF34 80241744 8C430000 */ lw $v1, ($v0) -/* 9FBF38 80241748 24020019 */ addiu $v0, $zero, 0x19 -/* 9FBF3C 8024174C A602008E */ sh $v0, 0x8e($s0) -/* 9FBF40 80241750 2402000E */ addiu $v0, $zero, 0xe -/* 9FBF44 80241754 080905E4 */ j .L80241790 -/* 9FBF48 80241758 AE030028 */ sw $v1, 0x28($s0) -.L8024175C: -/* 9FBF4C 8024175C 0C00F598 */ jal func_8003D660 -/* 9FBF50 80241760 24050001 */ addiu $a1, $zero, 1 -/* 9FBF54 80241764 8E050018 */ lw $a1, 0x18($s0) -/* 9FBF58 80241768 8E06000C */ lw $a2, 0xc($s0) -/* 9FBF5C 8024176C 0C00EA95 */ jal npc_move_heading -/* 9FBF60 80241770 0200202D */ daddu $a0, $s0, $zero -/* 9FBF64 80241774 8602008E */ lh $v0, 0x8e($s0) -/* 9FBF68 80241778 9603008E */ lhu $v1, 0x8e($s0) -/* 9FBF6C 8024177C 18400003 */ blez $v0, .L8024178C -/* 9FBF70 80241780 2462FFFF */ addiu $v0, $v1, -1 -/* 9FBF74 80241784 080905E5 */ j .L80241794 -/* 9FBF78 80241788 A602008E */ sh $v0, 0x8e($s0) -.L8024178C: -/* 9FBF7C 8024178C 2402000C */ addiu $v0, $zero, 0xc -.L80241790: -/* 9FBF80 80241790 AE620070 */ sw $v0, 0x70($s3) -.L80241794: -/* 9FBF84 80241794 8FBF0040 */ lw $ra, 0x40($sp) -/* 9FBF88 80241798 8FB3003C */ lw $s3, 0x3c($sp) -/* 9FBF8C 8024179C 8FB20038 */ lw $s2, 0x38($sp) -/* 9FBF90 802417A0 8FB10034 */ lw $s1, 0x34($sp) -/* 9FBF94 802417A4 8FB00030 */ lw $s0, 0x30($sp) -/* 9FBF98 802417A8 03E00008 */ jr $ra -/* 9FBF9C 802417AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s new file mode 100644 index 0000000000..d9f897cf1a --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241690_9FBE80.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241690_9FBE80 +/* 9FBE80 80241690 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9FBE84 80241694 AFB3003C */ sw $s3, 0x3c($sp) +/* 9FBE88 80241698 0080982D */ daddu $s3, $a0, $zero +/* 9FBE8C 8024169C AFBF0040 */ sw $ra, 0x40($sp) +/* 9FBE90 802416A0 AFB20038 */ sw $s2, 0x38($sp) +/* 9FBE94 802416A4 AFB10034 */ sw $s1, 0x34($sp) +/* 9FBE98 802416A8 AFB00030 */ sw $s0, 0x30($sp) +/* 9FBE9C 802416AC 8E720148 */ lw $s2, 0x148($s3) +/* 9FBEA0 802416B0 00A0882D */ daddu $s1, $a1, $zero +/* 9FBEA4 802416B4 86440008 */ lh $a0, 8($s2) +/* 9FBEA8 802416B8 0C00EABB */ jal get_npc_unsafe +/* 9FBEAC 802416BC 00C0802D */ daddu $s0, $a2, $zero +/* 9FBEB0 802416C0 0200202D */ daddu $a0, $s0, $zero +/* 9FBEB4 802416C4 0240282D */ daddu $a1, $s2, $zero +/* 9FBEB8 802416C8 24030001 */ addiu $v1, $zero, 1 +/* 9FBEBC 802416CC AFA30010 */ sw $v1, 0x10($sp) +/* 9FBEC0 802416D0 8E260024 */ lw $a2, 0x24($s1) +/* 9FBEC4 802416D4 8E270028 */ lw $a3, 0x28($s1) +/* 9FBEC8 802416D8 0C01242D */ jal func_800490B4 +/* 9FBECC 802416DC 0040802D */ daddu $s0, $v0, $zero +/* 9FBED0 802416E0 1440001E */ bnez $v0, .L8024175C +/* 9FBED4 802416E4 0200202D */ daddu $a0, $s0, $zero +/* 9FBED8 802416E8 24040002 */ addiu $a0, $zero, 2 +/* 9FBEDC 802416EC 0200282D */ daddu $a1, $s0, $zero +/* 9FBEE0 802416F0 0000302D */ daddu $a2, $zero, $zero +/* 9FBEE4 802416F4 860300A8 */ lh $v1, 0xa8($s0) +/* 9FBEE8 802416F8 3C013F80 */ lui $at, 0x3f80 +/* 9FBEEC 802416FC 44810000 */ mtc1 $at, $f0 +/* 9FBEF0 80241700 3C014000 */ lui $at, 0x4000 +/* 9FBEF4 80241704 44811000 */ mtc1 $at, $f2 +/* 9FBEF8 80241708 3C01C1A0 */ lui $at, 0xc1a0 +/* 9FBEFC 8024170C 44812000 */ mtc1 $at, $f4 +/* 9FBF00 80241710 2402000F */ addiu $v0, $zero, 0xf +/* 9FBF04 80241714 AFA2001C */ sw $v0, 0x1c($sp) +/* 9FBF08 80241718 44833000 */ mtc1 $v1, $f6 +/* 9FBF0C 8024171C 00000000 */ nop +/* 9FBF10 80241720 468031A0 */ cvt.s.w $f6, $f6 +/* 9FBF14 80241724 44073000 */ mfc1 $a3, $f6 +/* 9FBF18 80241728 27A20028 */ addiu $v0, $sp, 0x28 +/* 9FBF1C 8024172C AFA20020 */ sw $v0, 0x20($sp) +/* 9FBF20 80241730 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9FBF24 80241734 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9FBF28 80241738 0C01BFA4 */ jal fx_emote +/* 9FBF2C 8024173C E7A40018 */ swc1 $f4, 0x18($sp) +/* 9FBF30 80241740 8E4200CC */ lw $v0, 0xcc($s2) +/* 9FBF34 80241744 8C430000 */ lw $v1, ($v0) +/* 9FBF38 80241748 24020019 */ addiu $v0, $zero, 0x19 +/* 9FBF3C 8024174C A602008E */ sh $v0, 0x8e($s0) +/* 9FBF40 80241750 2402000E */ addiu $v0, $zero, 0xe +/* 9FBF44 80241754 080905E4 */ j .L80241790 +/* 9FBF48 80241758 AE030028 */ sw $v1, 0x28($s0) +.L8024175C: +/* 9FBF4C 8024175C 0C00F598 */ jal func_8003D660 +/* 9FBF50 80241760 24050001 */ addiu $a1, $zero, 1 +/* 9FBF54 80241764 8E050018 */ lw $a1, 0x18($s0) +/* 9FBF58 80241768 8E06000C */ lw $a2, 0xc($s0) +/* 9FBF5C 8024176C 0C00EA95 */ jal npc_move_heading +/* 9FBF60 80241770 0200202D */ daddu $a0, $s0, $zero +/* 9FBF64 80241774 8602008E */ lh $v0, 0x8e($s0) +/* 9FBF68 80241778 9603008E */ lhu $v1, 0x8e($s0) +/* 9FBF6C 8024177C 18400003 */ blez $v0, .L8024178C +/* 9FBF70 80241780 2462FFFF */ addiu $v0, $v1, -1 +/* 9FBF74 80241784 080905E5 */ j .L80241794 +/* 9FBF78 80241788 A602008E */ sh $v0, 0x8e($s0) +.L8024178C: +/* 9FBF7C 8024178C 2402000C */ addiu $v0, $zero, 0xc +.L80241790: +/* 9FBF80 80241790 AE620070 */ sw $v0, 0x70($s3) +.L80241794: +/* 9FBF84 80241794 8FBF0040 */ lw $ra, 0x40($sp) +/* 9FBF88 80241798 8FB3003C */ lw $s3, 0x3c($sp) +/* 9FBF8C 8024179C 8FB20038 */ lw $s2, 0x38($sp) +/* 9FBF90 802417A0 8FB10034 */ lw $s1, 0x34($sp) +/* 9FBF94 802417A4 8FB00030 */ lw $s0, 0x30($sp) +/* 9FBF98 802417A8 03E00008 */ jr $ra +/* 9FBF9C 802417AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s index a3cd4233b5..0d0590e275 100644 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_802418D8_9FC0C8.s @@ -131,59 +131,59 @@ glabel func_802418D8_9FC0C8 /* 9FC2A8 80241AB8 00000000 */ nop /* 9FC2AC 80241ABC 0280202D */ daddu $a0, $s4, $zero /* 9FC2B0 80241AC0 0260282D */ daddu $a1, $s3, $zero -/* 9FC2B4 80241AC4 0C090351 */ jal func_80240D44 +/* 9FC2B4 80241AC4 0C090351 */ jal func_80240D44_9FB534 /* 9FC2B8 80241AC8 02A0302D */ daddu $a2, $s5, $zero /* 9FC2BC 80241ACC 0280202D */ daddu $a0, $s4, $zero /* 9FC2C0 80241AD0 0260282D */ daddu $a1, $s3, $zero -/* 9FC2C4 80241AD4 0C0903A7 */ jal func_80240E9C +/* 9FC2C4 80241AD4 0C0903A7 */ jal func_80240E9C_9FB68C /* 9FC2C8 80241AD8 02A0302D */ daddu $a2, $s5, $zero /* 9FC2CC 80241ADC 080906EB */ j .L80241BAC /* 9FC2D0 80241AE0 00000000 */ nop /* 9FC2D4 80241AE4 0280202D */ daddu $a0, $s4, $zero /* 9FC2D8 80241AE8 0260282D */ daddu $a1, $s3, $zero -/* 9FC2DC 80241AEC 0C090451 */ jal func_80241144 +/* 9FC2DC 80241AEC 0C090451 */ jal func_80241144_9FB934 /* 9FC2E0 80241AF0 02A0302D */ daddu $a2, $s5, $zero /* 9FC2E4 80241AF4 0280202D */ daddu $a0, $s4, $zero /* 9FC2E8 80241AF8 0260282D */ daddu $a1, $s3, $zero -/* 9FC2EC 80241AFC 0C090481 */ jal func_80241204 +/* 9FC2EC 80241AFC 0C090481 */ jal func_80241204_9FB9F4 /* 9FC2F0 80241B00 02A0302D */ daddu $a2, $s5, $zero /* 9FC2F4 80241B04 080906EB */ j .L80241BAC /* 9FC2F8 80241B08 00000000 */ nop /* 9FC2FC 80241B0C 0280202D */ daddu $a0, $s4, $zero /* 9FC300 80241B10 0260282D */ daddu $a1, $s3, $zero -/* 9FC304 80241B14 0C0904F0 */ jal func_802413C0 +/* 9FC304 80241B14 0C0904F0 */ jal func_802413C0_9FBBB0 /* 9FC308 80241B18 02A0302D */ daddu $a2, $s5, $zero /* 9FC30C 80241B1C 080906EB */ j .L80241BAC /* 9FC310 80241B20 00000000 */ nop /* 9FC314 80241B24 0280202D */ daddu $a0, $s4, $zero /* 9FC318 80241B28 0260282D */ daddu $a1, $s3, $zero -/* 9FC31C 80241B2C 0C09051D */ jal func_80241474 +/* 9FC31C 80241B2C 0C09051D */ jal func_80241474_9FBC64 /* 9FC320 80241B30 02A0302D */ daddu $a2, $s5, $zero /* 9FC324 80241B34 0280202D */ daddu $a0, $s4, $zero /* 9FC328 80241B38 0260282D */ daddu $a1, $s3, $zero -/* 9FC32C 80241B3C 0C09053A */ jal func_802414E8 +/* 9FC32C 80241B3C 0C09053A */ jal func_802414E8_9FBCD8 /* 9FC330 80241B40 02A0302D */ daddu $a2, $s5, $zero /* 9FC334 80241B44 080906EB */ j .L80241BAC /* 9FC338 80241B48 00000000 */ nop /* 9FC33C 80241B4C 0280202D */ daddu $a0, $s4, $zero /* 9FC340 80241B50 0260282D */ daddu $a1, $s3, $zero -/* 9FC344 80241B54 0C090558 */ jal func_80241560 +/* 9FC344 80241B54 0C090558 */ jal func_80241560_9FBD50 /* 9FC348 80241B58 02A0302D */ daddu $a2, $s5, $zero /* 9FC34C 80241B5C 0280202D */ daddu $a0, $s4, $zero /* 9FC350 80241B60 0260282D */ daddu $a1, $s3, $zero -/* 9FC354 80241B64 0C0905A4 */ jal func_80241690 +/* 9FC354 80241B64 0C0905A4 */ jal func_80241690_9FBE80 /* 9FC358 80241B68 02A0302D */ daddu $a2, $s5, $zero /* 9FC35C 80241B6C 080906EB */ j .L80241BAC /* 9FC360 80241B70 00000000 */ nop /* 9FC364 80241B74 0280202D */ daddu $a0, $s4, $zero /* 9FC368 80241B78 0260282D */ daddu $a1, $s3, $zero -/* 9FC36C 80241B7C 0C0905EC */ jal func_802417B0 +/* 9FC36C 80241B7C 0C0905EC */ jal func_802417B0_9FBFA0 /* 9FC370 80241B80 02A0302D */ daddu $a2, $s5, $zero /* 9FC374 80241B84 080906EB */ j .L80241BAC /* 9FC378 80241B88 00000000 */ nop /* 9FC37C 80241B8C 0280202D */ daddu $a0, $s4, $zero /* 9FC380 80241B90 0260282D */ daddu $a1, $s3, $zero -/* 9FC384 80241B94 0C090606 */ jal func_80241818 +/* 9FC384 80241B94 0C090606 */ jal func_80241818_9FC008 /* 9FC388 80241B98 02A0302D */ daddu $a2, $s5, $zero /* 9FC38C 80241B9C 080906EB */ j .L80241BAC /* 9FC390 80241BA0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4.s deleted file mode 100644 index c3d76b4948..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4.s +++ /dev/null @@ -1,206 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BD4 -/* 9FC3C4 80241BD4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9FC3C8 80241BD8 AFB3005C */ sw $s3, 0x5c($sp) -/* 9FC3CC 80241BDC 0080982D */ daddu $s3, $a0, $zero -/* 9FC3D0 80241BE0 AFBF0068 */ sw $ra, 0x68($sp) -/* 9FC3D4 80241BE4 AFB50064 */ sw $s5, 0x64($sp) -/* 9FC3D8 80241BE8 AFB40060 */ sw $s4, 0x60($sp) -/* 9FC3DC 80241BEC AFB20058 */ sw $s2, 0x58($sp) -/* 9FC3E0 80241BF0 AFB10054 */ sw $s1, 0x54($sp) -/* 9FC3E4 80241BF4 AFB00050 */ sw $s0, 0x50($sp) -/* 9FC3E8 80241BF8 8E710148 */ lw $s1, 0x148($s3) -/* 9FC3EC 80241BFC 86240008 */ lh $a0, 8($s1) -/* 9FC3F0 80241C00 0C00EABB */ jal get_npc_unsafe -/* 9FC3F4 80241C04 00A0802D */ daddu $s0, $a1, $zero -/* 9FC3F8 80241C08 8E63000C */ lw $v1, 0xc($s3) -/* 9FC3FC 80241C0C 0260202D */ daddu $a0, $s3, $zero -/* 9FC400 80241C10 8C650000 */ lw $a1, ($v1) -/* 9FC404 80241C14 0C0B1EAF */ jal get_variable -/* 9FC408 80241C18 0040902D */ daddu $s2, $v0, $zero -/* 9FC40C 80241C1C AFA00028 */ sw $zero, 0x28($sp) -/* 9FC410 80241C20 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC414 80241C24 8C630094 */ lw $v1, 0x94($v1) -/* 9FC418 80241C28 AFA3002C */ sw $v1, 0x2c($sp) -/* 9FC41C 80241C2C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC420 80241C30 8C630080 */ lw $v1, 0x80($v1) -/* 9FC424 80241C34 AFA30030 */ sw $v1, 0x30($sp) -/* 9FC428 80241C38 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC42C 80241C3C 8C630088 */ lw $v1, 0x88($v1) -/* 9FC430 80241C40 AFA30034 */ sw $v1, 0x34($sp) -/* 9FC434 80241C44 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC438 80241C48 8C63008C */ lw $v1, 0x8c($v1) -/* 9FC43C 80241C4C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9FC440 80241C50 AFA30038 */ sw $v1, 0x38($sp) -/* 9FC444 80241C54 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9FC448 80241C58 3C0142C8 */ lui $at, 0x42c8 -/* 9FC44C 80241C5C 44810000 */ mtc1 $at, $f0 -/* 9FC450 80241C60 8C630090 */ lw $v1, 0x90($v1) -/* 9FC454 80241C64 0040A02D */ daddu $s4, $v0, $zero -/* 9FC458 80241C68 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9FC45C 80241C6C A7A00044 */ sh $zero, 0x44($sp) -/* 9FC460 80241C70 12000007 */ beqz $s0, .L80241C90 -/* 9FC464 80241C74 AFA3003C */ sw $v1, 0x3c($sp) -/* 9FC468 80241C78 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC46C 80241C7C 864300A8 */ lh $v1, 0xa8($s2) -/* 9FC470 80241C80 34420008 */ ori $v0, $v0, 8 -/* 9FC474 80241C84 AE230084 */ sw $v1, 0x84($s1) -/* 9FC478 80241C88 08090728 */ j .L80241CA0 -/* 9FC47C 80241C8C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241C90: -/* 9FC480 80241C90 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC484 80241C94 30420004 */ andi $v0, $v0, 4 -/* 9FC488 80241C98 10400048 */ beqz $v0, .L80241DBC -/* 9FC48C 80241C9C 00000000 */ nop -.L80241CA0: -/* 9FC490 80241CA0 A640008E */ sh $zero, 0x8e($s2) -/* 9FC494 80241CA4 AE600070 */ sw $zero, 0x70($s3) -/* 9FC498 80241CA8 8E2300CC */ lw $v1, 0xcc($s1) -/* 9FC49C 80241CAC 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9FC4A0 80241CB0 A2200007 */ sb $zero, 7($s1) -/* 9FC4A4 80241CB4 8E420000 */ lw $v0, ($s2) -/* 9FC4A8 80241CB8 8C630000 */ lw $v1, ($v1) -/* 9FC4AC 80241CBC 00441024 */ and $v0, $v0, $a0 -/* 9FC4B0 80241CC0 AE420000 */ sw $v0, ($s2) -/* 9FC4B4 80241CC4 AE430028 */ sw $v1, 0x28($s2) -/* 9FC4B8 80241CC8 96220086 */ lhu $v0, 0x86($s1) -/* 9FC4BC 80241CCC A64200A8 */ sh $v0, 0xa8($s2) -/* 9FC4C0 80241CD0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9FC4C4 80241CD4 A22000B5 */ sb $zero, 0xb5($s1) -/* 9FC4C8 80241CD8 AE20008C */ sw $zero, 0x8c($s1) -/* 9FC4CC 80241CDC 8C420098 */ lw $v0, 0x98($v0) -/* 9FC4D0 80241CE0 14400006 */ bnez $v0, .L80241CFC -/* 9FC4D4 80241CE4 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9FC4D8 80241CE8 8E420000 */ lw $v0, ($s2) -/* 9FC4DC 80241CEC 2403FFF7 */ addiu $v1, $zero, -9 -/* 9FC4E0 80241CF0 34420200 */ ori $v0, $v0, 0x200 -/* 9FC4E4 80241CF4 08090742 */ j .L80241D08 -/* 9FC4E8 80241CF8 00431024 */ and $v0, $v0, $v1 -.L80241CFC: -/* 9FC4EC 80241CFC 8E420000 */ lw $v0, ($s2) -/* 9FC4F0 80241D00 00431024 */ and $v0, $v0, $v1 -/* 9FC4F4 80241D04 34420008 */ ori $v0, $v0, 8 -.L80241D08: -/* 9FC4F8 80241D08 AE420000 */ sw $v0, ($s2) -/* 9FC4FC 80241D0C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC500 80241D10 30420004 */ andi $v0, $v0, 4 -/* 9FC504 80241D14 1040001E */ beqz $v0, .L80241D90 -/* 9FC508 80241D18 24040002 */ addiu $a0, $zero, 2 -/* 9FC50C 80241D1C 0240282D */ daddu $a1, $s2, $zero -/* 9FC510 80241D20 0000302D */ daddu $a2, $zero, $zero -/* 9FC514 80241D24 24020063 */ addiu $v0, $zero, 0x63 -/* 9FC518 80241D28 AE620070 */ sw $v0, 0x70($s3) -/* 9FC51C 80241D2C AE600074 */ sw $zero, 0x74($s3) -/* 9FC520 80241D30 864300A8 */ lh $v1, 0xa8($s2) -/* 9FC524 80241D34 3C013F80 */ lui $at, 0x3f80 -/* 9FC528 80241D38 44810000 */ mtc1 $at, $f0 -/* 9FC52C 80241D3C 3C014000 */ lui $at, 0x4000 -/* 9FC530 80241D40 44811000 */ mtc1 $at, $f2 -/* 9FC534 80241D44 3C01C1A0 */ lui $at, 0xc1a0 -/* 9FC538 80241D48 44812000 */ mtc1 $at, $f4 -/* 9FC53C 80241D4C 24020028 */ addiu $v0, $zero, 0x28 -/* 9FC540 80241D50 AFA2001C */ sw $v0, 0x1c($sp) -/* 9FC544 80241D54 44833000 */ mtc1 $v1, $f6 -/* 9FC548 80241D58 00000000 */ nop -/* 9FC54C 80241D5C 468031A0 */ cvt.s.w $f6, $f6 -/* 9FC550 80241D60 44073000 */ mfc1 $a3, $f6 -/* 9FC554 80241D64 27A20048 */ addiu $v0, $sp, 0x48 -/* 9FC558 80241D68 AFA20020 */ sw $v0, 0x20($sp) -/* 9FC55C 80241D6C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9FC560 80241D70 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9FC564 80241D74 0C01BFA4 */ jal fx_emote -/* 9FC568 80241D78 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9FC56C 80241D7C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9FC570 80241D80 2403FFFB */ addiu $v1, $zero, -5 -/* 9FC574 80241D84 00431024 */ and $v0, $v0, $v1 -/* 9FC578 80241D88 0809076F */ j .L80241DBC -/* 9FC57C 80241D8C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241D90: -/* 9FC580 80241D90 8E220000 */ lw $v0, ($s1) -/* 9FC584 80241D94 3C034000 */ lui $v1, 0x4000 -/* 9FC588 80241D98 00431024 */ and $v0, $v0, $v1 -/* 9FC58C 80241D9C 10400007 */ beqz $v0, .L80241DBC -/* 9FC590 80241DA0 3C03BFFF */ lui $v1, 0xbfff -/* 9FC594 80241DA4 2402000C */ addiu $v0, $zero, 0xc -/* 9FC598 80241DA8 AE620070 */ sw $v0, 0x70($s3) -/* 9FC59C 80241DAC 8E220000 */ lw $v0, ($s1) -/* 9FC5A0 80241DB0 3463FFFF */ ori $v1, $v1, 0xffff -/* 9FC5A4 80241DB4 00431024 */ and $v0, $v0, $v1 -/* 9FC5A8 80241DB8 AE220000 */ sw $v0, ($s1) -.L80241DBC: -/* 9FC5AC 80241DBC 8E630070 */ lw $v1, 0x70($s3) -/* 9FC5B0 80241DC0 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9FC5B4 80241DC4 1040003A */ beqz $v0, .L80241EB0 -/* 9FC5B8 80241DC8 00031080 */ sll $v0, $v1, 2 -/* 9FC5BC 80241DCC 3C018024 */ lui $at, 0x8024 -/* 9FC5C0 80241DD0 00220821 */ addu $at, $at, $v0 -/* 9FC5C4 80241DD4 8C225C70 */ lw $v0, 0x5c70($at) -/* 9FC5C8 80241DD8 00400008 */ jr $v0 -/* 9FC5CC 80241DDC 00000000 */ nop -/* 9FC5D0 80241DE0 0260202D */ daddu $a0, $s3, $zero -/* 9FC5D4 80241DE4 0280282D */ daddu $a1, $s4, $zero -/* 9FC5D8 80241DE8 0C090351 */ jal func_80240D44 -/* 9FC5DC 80241DEC 02A0302D */ daddu $a2, $s5, $zero -/* 9FC5E0 80241DF0 96220086 */ lhu $v0, 0x86($s1) -/* 9FC5E4 80241DF4 A64200A8 */ sh $v0, 0xa8($s2) -/* 9FC5E8 80241DF8 0260202D */ daddu $a0, $s3, $zero -/* 9FC5EC 80241DFC 0280282D */ daddu $a1, $s4, $zero -/* 9FC5F0 80241E00 0C0903A7 */ jal func_80240E9C -/* 9FC5F4 80241E04 02A0302D */ daddu $a2, $s5, $zero -/* 9FC5F8 80241E08 080907AC */ j .L80241EB0 -/* 9FC5FC 80241E0C 00000000 */ nop -/* 9FC600 80241E10 0260202D */ daddu $a0, $s3, $zero -/* 9FC604 80241E14 0280282D */ daddu $a1, $s4, $zero -/* 9FC608 80241E18 0C090451 */ jal func_80241144 -/* 9FC60C 80241E1C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC610 80241E20 0260202D */ daddu $a0, $s3, $zero -/* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero -/* 9FC618 80241E28 0C090481 */ jal func_80241204 -/* 9FC61C 80241E2C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC620 80241E30 080907AC */ j .L80241EB0 -/* 9FC624 80241E34 00000000 */ nop -/* 9FC628 80241E38 0260202D */ daddu $a0, $s3, $zero -/* 9FC62C 80241E3C 0280282D */ daddu $a1, $s4, $zero -/* 9FC630 80241E40 0C0904F0 */ jal func_802413C0 -/* 9FC634 80241E44 02A0302D */ daddu $a2, $s5, $zero -/* 9FC638 80241E48 080907AC */ j .L80241EB0 -/* 9FC63C 80241E4C 00000000 */ nop -/* 9FC640 80241E50 0260202D */ daddu $a0, $s3, $zero -/* 9FC644 80241E54 0280282D */ daddu $a1, $s4, $zero -/* 9FC648 80241E58 0C09015C */ jal func_80240570 -/* 9FC64C 80241E5C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC650 80241E60 0260202D */ daddu $a0, $s3, $zero -/* 9FC654 80241E64 0280282D */ daddu $a1, $s4, $zero -/* 9FC658 80241E68 0C09017B */ jal func_802405EC -/* 9FC65C 80241E6C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC660 80241E70 080907AC */ j .L80241EB0 -/* 9FC664 80241E74 00000000 */ nop -/* 9FC668 80241E78 0260202D */ daddu $a0, $s3, $zero -/* 9FC66C 80241E7C 0280282D */ daddu $a1, $s4, $zero -/* 9FC670 80241E80 0C0901C8 */ jal func_80240720 -/* 9FC674 80241E84 02A0302D */ daddu $a2, $s5, $zero -/* 9FC678 80241E88 080907AC */ j .L80241EB0 -/* 9FC67C 80241E8C 00000000 */ nop -/* 9FC680 80241E90 0260202D */ daddu $a0, $s3, $zero -/* 9FC684 80241E94 0280282D */ daddu $a1, $s4, $zero -/* 9FC688 80241E98 0C090221 */ jal func_80240884 -/* 9FC68C 80241E9C 02A0302D */ daddu $a2, $s5, $zero -/* 9FC690 80241EA0 080907AC */ j .L80241EB0 -/* 9FC694 80241EA4 00000000 */ nop -/* 9FC698 80241EA8 0C0129CF */ jal func_8004A73C -/* 9FC69C 80241EAC 0260202D */ daddu $a0, $s3, $zero -.L80241EB0: -/* 9FC6A0 80241EB0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9FC6A4 80241EB4 8FB50064 */ lw $s5, 0x64($sp) -/* 9FC6A8 80241EB8 8FB40060 */ lw $s4, 0x60($sp) -/* 9FC6AC 80241EBC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9FC6B0 80241EC0 8FB20058 */ lw $s2, 0x58($sp) -/* 9FC6B4 80241EC4 8FB10054 */ lw $s1, 0x54($sp) -/* 9FC6B8 80241EC8 8FB00050 */ lw $s0, 0x50($sp) -/* 9FC6BC 80241ECC 0000102D */ daddu $v0, $zero, $zero -/* 9FC6C0 80241ED0 03E00008 */ jr $ra -/* 9FC6C4 80241ED4 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9FC6C8 80241ED8 00000000 */ nop -/* 9FC6CC 80241EDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s new file mode 100644 index 0000000000..5242862212 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_12/9FAD60/func_80241BD4_9FC3C4.s @@ -0,0 +1,206 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BD4_9FC3C4 +/* 9FC3C4 80241BD4 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 9FC3C8 80241BD8 AFB3005C */ sw $s3, 0x5c($sp) +/* 9FC3CC 80241BDC 0080982D */ daddu $s3, $a0, $zero +/* 9FC3D0 80241BE0 AFBF0068 */ sw $ra, 0x68($sp) +/* 9FC3D4 80241BE4 AFB50064 */ sw $s5, 0x64($sp) +/* 9FC3D8 80241BE8 AFB40060 */ sw $s4, 0x60($sp) +/* 9FC3DC 80241BEC AFB20058 */ sw $s2, 0x58($sp) +/* 9FC3E0 80241BF0 AFB10054 */ sw $s1, 0x54($sp) +/* 9FC3E4 80241BF4 AFB00050 */ sw $s0, 0x50($sp) +/* 9FC3E8 80241BF8 8E710148 */ lw $s1, 0x148($s3) +/* 9FC3EC 80241BFC 86240008 */ lh $a0, 8($s1) +/* 9FC3F0 80241C00 0C00EABB */ jal get_npc_unsafe +/* 9FC3F4 80241C04 00A0802D */ daddu $s0, $a1, $zero +/* 9FC3F8 80241C08 8E63000C */ lw $v1, 0xc($s3) +/* 9FC3FC 80241C0C 0260202D */ daddu $a0, $s3, $zero +/* 9FC400 80241C10 8C650000 */ lw $a1, ($v1) +/* 9FC404 80241C14 0C0B1EAF */ jal get_variable +/* 9FC408 80241C18 0040902D */ daddu $s2, $v0, $zero +/* 9FC40C 80241C1C AFA00028 */ sw $zero, 0x28($sp) +/* 9FC410 80241C20 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9FC414 80241C24 8C630094 */ lw $v1, 0x94($v1) +/* 9FC418 80241C28 AFA3002C */ sw $v1, 0x2c($sp) +/* 9FC41C 80241C2C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9FC420 80241C30 8C630080 */ lw $v1, 0x80($v1) +/* 9FC424 80241C34 AFA30030 */ sw $v1, 0x30($sp) +/* 9FC428 80241C38 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9FC42C 80241C3C 8C630088 */ lw $v1, 0x88($v1) +/* 9FC430 80241C40 AFA30034 */ sw $v1, 0x34($sp) +/* 9FC434 80241C44 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9FC438 80241C48 8C63008C */ lw $v1, 0x8c($v1) +/* 9FC43C 80241C4C 27B50028 */ addiu $s5, $sp, 0x28 +/* 9FC440 80241C50 AFA30038 */ sw $v1, 0x38($sp) +/* 9FC444 80241C54 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9FC448 80241C58 3C0142C8 */ lui $at, 0x42c8 +/* 9FC44C 80241C5C 44810000 */ mtc1 $at, $f0 +/* 9FC450 80241C60 8C630090 */ lw $v1, 0x90($v1) +/* 9FC454 80241C64 0040A02D */ daddu $s4, $v0, $zero +/* 9FC458 80241C68 E7A00040 */ swc1 $f0, 0x40($sp) +/* 9FC45C 80241C6C A7A00044 */ sh $zero, 0x44($sp) +/* 9FC460 80241C70 12000007 */ beqz $s0, .L80241C90 +/* 9FC464 80241C74 AFA3003C */ sw $v1, 0x3c($sp) +/* 9FC468 80241C78 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9FC46C 80241C7C 864300A8 */ lh $v1, 0xa8($s2) +/* 9FC470 80241C80 34420008 */ ori $v0, $v0, 8 +/* 9FC474 80241C84 AE230084 */ sw $v1, 0x84($s1) +/* 9FC478 80241C88 08090728 */ j .L80241CA0 +/* 9FC47C 80241C8C AE2200B0 */ sw $v0, 0xb0($s1) +.L80241C90: +/* 9FC480 80241C90 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9FC484 80241C94 30420004 */ andi $v0, $v0, 4 +/* 9FC488 80241C98 10400048 */ beqz $v0, .L80241DBC +/* 9FC48C 80241C9C 00000000 */ nop +.L80241CA0: +/* 9FC490 80241CA0 A640008E */ sh $zero, 0x8e($s2) +/* 9FC494 80241CA4 AE600070 */ sw $zero, 0x70($s3) +/* 9FC498 80241CA8 8E2300CC */ lw $v1, 0xcc($s1) +/* 9FC49C 80241CAC 2404F7FF */ addiu $a0, $zero, -0x801 +/* 9FC4A0 80241CB0 A2200007 */ sb $zero, 7($s1) +/* 9FC4A4 80241CB4 8E420000 */ lw $v0, ($s2) +/* 9FC4A8 80241CB8 8C630000 */ lw $v1, ($v1) +/* 9FC4AC 80241CBC 00441024 */ and $v0, $v0, $a0 +/* 9FC4B0 80241CC0 AE420000 */ sw $v0, ($s2) +/* 9FC4B4 80241CC4 AE430028 */ sw $v1, 0x28($s2) +/* 9FC4B8 80241CC8 96220086 */ lhu $v0, 0x86($s1) +/* 9FC4BC 80241CCC A64200A8 */ sh $v0, 0xa8($s2) +/* 9FC4C0 80241CD0 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9FC4C4 80241CD4 A22000B5 */ sb $zero, 0xb5($s1) +/* 9FC4C8 80241CD8 AE20008C */ sw $zero, 0x8c($s1) +/* 9FC4CC 80241CDC 8C420098 */ lw $v0, 0x98($v0) +/* 9FC4D0 80241CE0 14400006 */ bnez $v0, .L80241CFC +/* 9FC4D4 80241CE4 2403FDFF */ addiu $v1, $zero, -0x201 +/* 9FC4D8 80241CE8 8E420000 */ lw $v0, ($s2) +/* 9FC4DC 80241CEC 2403FFF7 */ addiu $v1, $zero, -9 +/* 9FC4E0 80241CF0 34420200 */ ori $v0, $v0, 0x200 +/* 9FC4E4 80241CF4 08090742 */ j .L80241D08 +/* 9FC4E8 80241CF8 00431024 */ and $v0, $v0, $v1 +.L80241CFC: +/* 9FC4EC 80241CFC 8E420000 */ lw $v0, ($s2) +/* 9FC4F0 80241D00 00431024 */ and $v0, $v0, $v1 +/* 9FC4F4 80241D04 34420008 */ ori $v0, $v0, 8 +.L80241D08: +/* 9FC4F8 80241D08 AE420000 */ sw $v0, ($s2) +/* 9FC4FC 80241D0C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9FC500 80241D10 30420004 */ andi $v0, $v0, 4 +/* 9FC504 80241D14 1040001E */ beqz $v0, .L80241D90 +/* 9FC508 80241D18 24040002 */ addiu $a0, $zero, 2 +/* 9FC50C 80241D1C 0240282D */ daddu $a1, $s2, $zero +/* 9FC510 80241D20 0000302D */ daddu $a2, $zero, $zero +/* 9FC514 80241D24 24020063 */ addiu $v0, $zero, 0x63 +/* 9FC518 80241D28 AE620070 */ sw $v0, 0x70($s3) +/* 9FC51C 80241D2C AE600074 */ sw $zero, 0x74($s3) +/* 9FC520 80241D30 864300A8 */ lh $v1, 0xa8($s2) +/* 9FC524 80241D34 3C013F80 */ lui $at, 0x3f80 +/* 9FC528 80241D38 44810000 */ mtc1 $at, $f0 +/* 9FC52C 80241D3C 3C014000 */ lui $at, 0x4000 +/* 9FC530 80241D40 44811000 */ mtc1 $at, $f2 +/* 9FC534 80241D44 3C01C1A0 */ lui $at, 0xc1a0 +/* 9FC538 80241D48 44812000 */ mtc1 $at, $f4 +/* 9FC53C 80241D4C 24020028 */ addiu $v0, $zero, 0x28 +/* 9FC540 80241D50 AFA2001C */ sw $v0, 0x1c($sp) +/* 9FC544 80241D54 44833000 */ mtc1 $v1, $f6 +/* 9FC548 80241D58 00000000 */ nop +/* 9FC54C 80241D5C 468031A0 */ cvt.s.w $f6, $f6 +/* 9FC550 80241D60 44073000 */ mfc1 $a3, $f6 +/* 9FC554 80241D64 27A20048 */ addiu $v0, $sp, 0x48 +/* 9FC558 80241D68 AFA20020 */ sw $v0, 0x20($sp) +/* 9FC55C 80241D6C E7A00010 */ swc1 $f0, 0x10($sp) +/* 9FC560 80241D70 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9FC564 80241D74 0C01BFA4 */ jal fx_emote +/* 9FC568 80241D78 E7A40018 */ swc1 $f4, 0x18($sp) +/* 9FC56C 80241D7C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9FC570 80241D80 2403FFFB */ addiu $v1, $zero, -5 +/* 9FC574 80241D84 00431024 */ and $v0, $v0, $v1 +/* 9FC578 80241D88 0809076F */ j .L80241DBC +/* 9FC57C 80241D8C AE2200B0 */ sw $v0, 0xb0($s1) +.L80241D90: +/* 9FC580 80241D90 8E220000 */ lw $v0, ($s1) +/* 9FC584 80241D94 3C034000 */ lui $v1, 0x4000 +/* 9FC588 80241D98 00431024 */ and $v0, $v0, $v1 +/* 9FC58C 80241D9C 10400007 */ beqz $v0, .L80241DBC +/* 9FC590 80241DA0 3C03BFFF */ lui $v1, 0xbfff +/* 9FC594 80241DA4 2402000C */ addiu $v0, $zero, 0xc +/* 9FC598 80241DA8 AE620070 */ sw $v0, 0x70($s3) +/* 9FC59C 80241DAC 8E220000 */ lw $v0, ($s1) +/* 9FC5A0 80241DB0 3463FFFF */ ori $v1, $v1, 0xffff +/* 9FC5A4 80241DB4 00431024 */ and $v0, $v0, $v1 +/* 9FC5A8 80241DB8 AE220000 */ sw $v0, ($s1) +.L80241DBC: +/* 9FC5AC 80241DBC 8E630070 */ lw $v1, 0x70($s3) +/* 9FC5B0 80241DC0 2C620064 */ sltiu $v0, $v1, 0x64 +/* 9FC5B4 80241DC4 1040003A */ beqz $v0, .L80241EB0 +/* 9FC5B8 80241DC8 00031080 */ sll $v0, $v1, 2 +/* 9FC5BC 80241DCC 3C018024 */ lui $at, 0x8024 +/* 9FC5C0 80241DD0 00220821 */ addu $at, $at, $v0 +/* 9FC5C4 80241DD4 8C225C70 */ lw $v0, 0x5c70($at) +/* 9FC5C8 80241DD8 00400008 */ jr $v0 +/* 9FC5CC 80241DDC 00000000 */ nop +/* 9FC5D0 80241DE0 0260202D */ daddu $a0, $s3, $zero +/* 9FC5D4 80241DE4 0280282D */ daddu $a1, $s4, $zero +/* 9FC5D8 80241DE8 0C090351 */ jal func_80240D44_9FB534 +/* 9FC5DC 80241DEC 02A0302D */ daddu $a2, $s5, $zero +/* 9FC5E0 80241DF0 96220086 */ lhu $v0, 0x86($s1) +/* 9FC5E4 80241DF4 A64200A8 */ sh $v0, 0xa8($s2) +/* 9FC5E8 80241DF8 0260202D */ daddu $a0, $s3, $zero +/* 9FC5EC 80241DFC 0280282D */ daddu $a1, $s4, $zero +/* 9FC5F0 80241E00 0C0903A7 */ jal func_80240E9C_9FB68C +/* 9FC5F4 80241E04 02A0302D */ daddu $a2, $s5, $zero +/* 9FC5F8 80241E08 080907AC */ j .L80241EB0 +/* 9FC5FC 80241E0C 00000000 */ nop +/* 9FC600 80241E10 0260202D */ daddu $a0, $s3, $zero +/* 9FC604 80241E14 0280282D */ daddu $a1, $s4, $zero +/* 9FC608 80241E18 0C090451 */ jal func_80241144_9FB934 +/* 9FC60C 80241E1C 02A0302D */ daddu $a2, $s5, $zero +/* 9FC610 80241E20 0260202D */ daddu $a0, $s3, $zero +/* 9FC614 80241E24 0280282D */ daddu $a1, $s4, $zero +/* 9FC618 80241E28 0C090481 */ jal func_80241204_9FB9F4 +/* 9FC61C 80241E2C 02A0302D */ daddu $a2, $s5, $zero +/* 9FC620 80241E30 080907AC */ j .L80241EB0 +/* 9FC624 80241E34 00000000 */ nop +/* 9FC628 80241E38 0260202D */ daddu $a0, $s3, $zero +/* 9FC62C 80241E3C 0280282D */ daddu $a1, $s4, $zero +/* 9FC630 80241E40 0C0904F0 */ jal func_802413C0_9FBBB0 +/* 9FC634 80241E44 02A0302D */ daddu $a2, $s5, $zero +/* 9FC638 80241E48 080907AC */ j .L80241EB0 +/* 9FC63C 80241E4C 00000000 */ nop +/* 9FC640 80241E50 0260202D */ daddu $a0, $s3, $zero +/* 9FC644 80241E54 0280282D */ daddu $a1, $s4, $zero +/* 9FC648 80241E58 0C09015C */ jal func_80240570_9FAD60 +/* 9FC64C 80241E5C 02A0302D */ daddu $a2, $s5, $zero +/* 9FC650 80241E60 0260202D */ daddu $a0, $s3, $zero +/* 9FC654 80241E64 0280282D */ daddu $a1, $s4, $zero +/* 9FC658 80241E68 0C09017B */ jal func_802405EC_9FADDC +/* 9FC65C 80241E6C 02A0302D */ daddu $a2, $s5, $zero +/* 9FC660 80241E70 080907AC */ j .L80241EB0 +/* 9FC664 80241E74 00000000 */ nop +/* 9FC668 80241E78 0260202D */ daddu $a0, $s3, $zero +/* 9FC66C 80241E7C 0280282D */ daddu $a1, $s4, $zero +/* 9FC670 80241E80 0C0901C8 */ jal func_80240720_9FAF10 +/* 9FC674 80241E84 02A0302D */ daddu $a2, $s5, $zero +/* 9FC678 80241E88 080907AC */ j .L80241EB0 +/* 9FC67C 80241E8C 00000000 */ nop +/* 9FC680 80241E90 0260202D */ daddu $a0, $s3, $zero +/* 9FC684 80241E94 0280282D */ daddu $a1, $s4, $zero +/* 9FC688 80241E98 0C090221 */ jal func_80240884_9FB074 +/* 9FC68C 80241E9C 02A0302D */ daddu $a2, $s5, $zero +/* 9FC690 80241EA0 080907AC */ j .L80241EB0 +/* 9FC694 80241EA4 00000000 */ nop +/* 9FC698 80241EA8 0C0129CF */ jal func_8004A73C +/* 9FC69C 80241EAC 0260202D */ daddu $a0, $s3, $zero +.L80241EB0: +/* 9FC6A0 80241EB0 8FBF0068 */ lw $ra, 0x68($sp) +/* 9FC6A4 80241EB4 8FB50064 */ lw $s5, 0x64($sp) +/* 9FC6A8 80241EB8 8FB40060 */ lw $s4, 0x60($sp) +/* 9FC6AC 80241EBC 8FB3005C */ lw $s3, 0x5c($sp) +/* 9FC6B0 80241EC0 8FB20058 */ lw $s2, 0x58($sp) +/* 9FC6B4 80241EC4 8FB10054 */ lw $s1, 0x54($sp) +/* 9FC6B8 80241EC8 8FB00050 */ lw $s0, 0x50($sp) +/* 9FC6BC 80241ECC 0000102D */ daddu $v0, $zero, $zero +/* 9FC6C0 80241ED0 03E00008 */ jr $ra +/* 9FC6C4 80241ED4 27BD0070 */ addiu $sp, $sp, 0x70 +/* 9FC6C8 80241ED8 00000000 */ nop +/* 9FC6CC 80241EDC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0.s b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0.s deleted file mode 100644 index d5ef8feb53..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FD0 -/* 9FC7C0 80241FD0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9FC7C4 80241FD4 3C048024 */ lui $a0, 0x8024 -/* 9FC7C8 80241FD8 24845A14 */ addiu $a0, $a0, 0x5a14 -/* 9FC7CC 80241FDC AFBF0018 */ sw $ra, 0x18($sp) -/* 9FC7D0 80241FE0 AFB10014 */ sw $s1, 0x14($sp) -/* 9FC7D4 80241FE4 AFB00010 */ sw $s0, 0x10($sp) -/* 9FC7D8 80241FE8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9FC7DC 80241FEC 8C830000 */ lw $v1, ($a0) -/* 9FC7E0 80241FF0 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 9FC7E4 80241FF4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 9FC7E8 80241FF8 28620003 */ slti $v0, $v1, 3 -/* 9FC7EC 80241FFC 50400007 */ beql $v0, $zero, .L8024201C -/* 9FC7F0 80242000 24020003 */ addiu $v0, $zero, 3 -/* 9FC7F4 80242004 1C60000C */ bgtz $v1, .L80242038 -/* 9FC7F8 80242008 24620001 */ addiu $v0, $v1, 1 -/* 9FC7FC 8024200C 10600007 */ beqz $v1, .L8024202C -/* 9FC800 80242010 0000102D */ daddu $v0, $zero, $zero -/* 9FC804 80242014 0809082A */ j .L802420A8 -/* 9FC808 80242018 00000000 */ nop -.L8024201C: -/* 9FC80C 8024201C 10620008 */ beq $v1, $v0, .L80242040 -/* 9FC810 80242020 0000102D */ daddu $v0, $zero, $zero -/* 9FC814 80242024 0809082A */ j .L802420A8 -/* 9FC818 80242028 00000000 */ nop -.L8024202C: -/* 9FC81C 8024202C 24020001 */ addiu $v0, $zero, 1 -/* 9FC820 80242030 08090829 */ j .L802420A4 -/* 9FC824 80242034 AC820000 */ sw $v0, ($a0) -.L80242038: -/* 9FC828 80242038 08090829 */ j .L802420A4 -/* 9FC82C 8024203C AC820000 */ sw $v0, ($a0) -.L80242040: -/* 9FC830 80242040 3C108011 */ lui $s0, 0x8011 -/* 9FC834 80242044 2610C930 */ addiu $s0, $s0, -0x36d0 -/* 9FC838 80242048 0C03BD17 */ jal clear_partner_move_history -/* 9FC83C 8024204C 8E040000 */ lw $a0, ($s0) -/* 9FC840 80242050 C6200028 */ lwc1 $f0, 0x28($s1) -/* 9FC844 80242054 C6220030 */ lwc1 $f2, 0x30($s1) -/* 9FC848 80242058 4600010D */ trunc.w.s $f4, $f0 -/* 9FC84C 8024205C 44042000 */ mfc1 $a0, $f4 -/* 9FC850 80242060 4600110D */ trunc.w.s $f4, $f2 -/* 9FC854 80242064 44052000 */ mfc1 $a1, $f4 -/* 9FC858 80242068 0C03BCF0 */ jal func_800EF3C0 -/* 9FC85C 8024206C 00000000 */ nop -/* 9FC860 80242070 0C03BCF5 */ jal func_800EF3D4 -/* 9FC864 80242074 0000202D */ daddu $a0, $zero, $zero -/* 9FC868 80242078 3C0142B4 */ lui $at, 0x42b4 -/* 9FC86C 8024207C 4481A000 */ mtc1 $at, $f20 -/* 9FC870 80242080 8E040000 */ lw $a0, ($s0) -/* 9FC874 80242084 4405A000 */ mfc1 $a1, $f20 -/* 9FC878 80242088 0C00ECD0 */ jal set_npc_yaw -/* 9FC87C 8024208C 00000000 */ nop -/* 9FC880 80242090 24020002 */ addiu $v0, $zero, 2 -/* 9FC884 80242094 E6340080 */ swc1 $f20, 0x80($s1) -/* 9FC888 80242098 E6340084 */ swc1 $f20, 0x84($s1) -/* 9FC88C 8024209C 0809082A */ j .L802420A8 -/* 9FC890 802420A0 AE2000A8 */ sw $zero, 0xa8($s1) -.L802420A4: -/* 9FC894 802420A4 0000102D */ daddu $v0, $zero, $zero -.L802420A8: -/* 9FC898 802420A8 8FBF0018 */ lw $ra, 0x18($sp) -/* 9FC89C 802420AC 8FB10014 */ lw $s1, 0x14($sp) -/* 9FC8A0 802420B0 8FB00010 */ lw $s0, 0x10($sp) -/* 9FC8A4 802420B4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9FC8A8 802420B8 03E00008 */ jr $ra -/* 9FC8AC 802420BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s new file mode 100644 index 0000000000..0537409180 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_12/9FC6D0/func_80241FD0_9FC7C0.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FD0_9FC7C0 +/* 9FC7C0 80241FD0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9FC7C4 80241FD4 3C048024 */ lui $a0, 0x8024 +/* 9FC7C8 80241FD8 24845A14 */ addiu $a0, $a0, 0x5a14 +/* 9FC7CC 80241FDC AFBF0018 */ sw $ra, 0x18($sp) +/* 9FC7D0 80241FE0 AFB10014 */ sw $s1, 0x14($sp) +/* 9FC7D4 80241FE4 AFB00010 */ sw $s0, 0x10($sp) +/* 9FC7D8 80241FE8 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 9FC7DC 80241FEC 8C830000 */ lw $v1, ($a0) +/* 9FC7E0 80241FF0 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* 9FC7E4 80241FF4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* 9FC7E8 80241FF8 28620003 */ slti $v0, $v1, 3 +/* 9FC7EC 80241FFC 50400007 */ beql $v0, $zero, .L8024201C +/* 9FC7F0 80242000 24020003 */ addiu $v0, $zero, 3 +/* 9FC7F4 80242004 1C60000C */ bgtz $v1, .L80242038 +/* 9FC7F8 80242008 24620001 */ addiu $v0, $v1, 1 +/* 9FC7FC 8024200C 10600007 */ beqz $v1, .L8024202C +/* 9FC800 80242010 0000102D */ daddu $v0, $zero, $zero +/* 9FC804 80242014 0809082A */ j .L802420A8 +/* 9FC808 80242018 00000000 */ nop +.L8024201C: +/* 9FC80C 8024201C 10620008 */ beq $v1, $v0, .L80242040 +/* 9FC810 80242020 0000102D */ daddu $v0, $zero, $zero +/* 9FC814 80242024 0809082A */ j .L802420A8 +/* 9FC818 80242028 00000000 */ nop +.L8024202C: +/* 9FC81C 8024202C 24020001 */ addiu $v0, $zero, 1 +/* 9FC820 80242030 08090829 */ j .L802420A4 +/* 9FC824 80242034 AC820000 */ sw $v0, ($a0) +.L80242038: +/* 9FC828 80242038 08090829 */ j .L802420A4 +/* 9FC82C 8024203C AC820000 */ sw $v0, ($a0) +.L80242040: +/* 9FC830 80242040 3C108011 */ lui $s0, 0x8011 +/* 9FC834 80242044 2610C930 */ addiu $s0, $s0, -0x36d0 +/* 9FC838 80242048 0C03BD17 */ jal clear_partner_move_history +/* 9FC83C 8024204C 8E040000 */ lw $a0, ($s0) +/* 9FC840 80242050 C6200028 */ lwc1 $f0, 0x28($s1) +/* 9FC844 80242054 C6220030 */ lwc1 $f2, 0x30($s1) +/* 9FC848 80242058 4600010D */ trunc.w.s $f4, $f0 +/* 9FC84C 8024205C 44042000 */ mfc1 $a0, $f4 +/* 9FC850 80242060 4600110D */ trunc.w.s $f4, $f2 +/* 9FC854 80242064 44052000 */ mfc1 $a1, $f4 +/* 9FC858 80242068 0C03BCF0 */ jal func_800EF3C0 +/* 9FC85C 8024206C 00000000 */ nop +/* 9FC860 80242070 0C03BCF5 */ jal func_800EF3D4 +/* 9FC864 80242074 0000202D */ daddu $a0, $zero, $zero +/* 9FC868 80242078 3C0142B4 */ lui $at, 0x42b4 +/* 9FC86C 8024207C 4481A000 */ mtc1 $at, $f20 +/* 9FC870 80242080 8E040000 */ lw $a0, ($s0) +/* 9FC874 80242084 4405A000 */ mfc1 $a1, $f20 +/* 9FC878 80242088 0C00ECD0 */ jal set_npc_yaw +/* 9FC87C 8024208C 00000000 */ nop +/* 9FC880 80242090 24020002 */ addiu $v0, $zero, 2 +/* 9FC884 80242094 E6340080 */ swc1 $f20, 0x80($s1) +/* 9FC888 80242098 E6340084 */ swc1 $f20, 0x84($s1) +/* 9FC88C 8024209C 0809082A */ j .L802420A8 +/* 9FC890 802420A0 AE2000A8 */ sw $zero, 0xa8($s1) +.L802420A4: +/* 9FC894 802420A4 0000102D */ daddu $v0, $zero, $zero +.L802420A8: +/* 9FC898 802420A8 8FBF0018 */ lw $ra, 0x18($sp) +/* 9FC89C 802420AC 8FB10014 */ lw $s1, 0x14($sp) +/* 9FC8A0 802420B0 8FB00010 */ lw $s0, 0x10($sp) +/* 9FC8A4 802420B4 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 9FC8A8 802420B8 03E00008 */ jr $ra +/* 9FC8AC 802420BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s index f12a72bf3f..75b03c6cf9 100644 --- a/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s +++ b/asm/nonmatchings/world/area_nok/nok_13/A00600/func_80240BF0_A011F0.s @@ -95,17 +95,17 @@ glabel func_80240BF0_A011F0 /* A01350 80240D50 00000000 */ nop /* A01354 80240D54 0260202D */ daddu $a0, $s3, $zero /* A01358 80240D58 0280282D */ daddu $a1, $s4, $zero -/* A0135C 80240D5C 0C090000 */ jal func_80240000 +/* A0135C 80240D5C 0C090000 */ jal func_80240000_A00600 /* A01360 80240D60 0200302D */ daddu $a2, $s0, $zero /* A01364 80240D64 0260202D */ daddu $a0, $s3, $zero /* A01368 80240D68 0280282D */ daddu $a1, $s4, $zero -/* A0136C 80240D6C 0C09008C */ jal func_80240230 +/* A0136C 80240D6C 0C09008C */ jal func_80240230_A00830 /* A01370 80240D70 0200302D */ daddu $a2, $s0, $zero /* A01374 80240D74 0809037C */ j .L80240DF0 /* A01378 80240D78 0000102D */ daddu $v0, $zero, $zero /* A0137C 80240D7C 0260202D */ daddu $a0, $s3, $zero /* A01380 80240D80 0280282D */ daddu $a1, $s4, $zero -/* A01384 80240D84 0C09015A */ jal func_80240568 +/* A01384 80240D84 0C09015A */ jal func_80240568_A00B68 /* A01388 80240D88 0200302D */ daddu $a2, $s0, $zero /* A0138C 80240D8C 8E630070 */ lw $v1, 0x70($s3) /* A01390 80240D90 24020003 */ addiu $v0, $zero, 3 @@ -113,23 +113,23 @@ glabel func_80240BF0_A011F0 /* A01398 80240D98 0000102D */ daddu $v0, $zero, $zero /* A0139C 80240D9C 0260202D */ daddu $a0, $s3, $zero /* A013A0 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* A013A4 80240DA4 0C09018A */ jal func_80240628 +/* A013A4 80240DA4 0C09018A */ jal func_80240628_A00C28 /* A013A8 80240DA8 0200302D */ daddu $a2, $s0, $zero /* A013AC 80240DAC 0809037C */ j .L80240DF0 /* A013B0 80240DB0 0000102D */ daddu $v0, $zero, $zero /* A013B4 80240DB4 0260202D */ daddu $a0, $s3, $zero /* A013B8 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* A013BC 80240DBC 0C0901F3 */ jal func_802407CC +/* A013BC 80240DBC 0C0901F3 */ jal func_802407CC_A00DCC /* A013C0 80240DC0 0200302D */ daddu $a2, $s0, $zero /* A013C4 80240DC4 0260202D */ daddu $a0, $s3, $zero /* A013C8 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* A013CC 80240DCC 0C09022B */ jal func_802408AC +/* A013CC 80240DCC 0C09022B */ jal func_802408AC_A00EAC /* A013D0 80240DD0 0200302D */ daddu $a2, $s0, $zero /* A013D4 80240DD4 0809037C */ j .L80240DF0 /* A013D8 80240DD8 0000102D */ daddu $v0, $zero, $zero /* A013DC 80240DDC 0260202D */ daddu $a0, $s3, $zero /* A013E0 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* A013E4 80240DE4 0C0902EB */ jal func_80240BAC +/* A013E4 80240DE4 0C0902EB */ jal func_80240BAC_A011AC /* A013E8 80240DE8 0200302D */ daddu $a2, $s0, $zero .L80240DEC: /* A013EC 80240DEC 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360.s b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360.s deleted file mode 100644 index b66a56d899..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241360 -/* A01960 80241360 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A01964 80241364 AFB10014 */ sw $s1, 0x14($sp) -/* A01968 80241368 0080882D */ daddu $s1, $a0, $zero -/* A0196C 8024136C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* A01970 80241370 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* A01974 80241374 AFBF0018 */ sw $ra, 0x18($sp) -/* A01978 80241378 AFB00010 */ sw $s0, 0x10($sp) -/* A0197C 8024137C 8C460028 */ lw $a2, 0x28($v0) -/* A01980 80241380 8E23000C */ lw $v1, 0xc($s1) -/* A01984 80241384 3C01C3B6 */ lui $at, 0xc3b6 -/* A01988 80241388 44816000 */ mtc1 $at, $f12 -/* A0198C 8024138C 3C01C307 */ lui $at, 0xc307 -/* A01990 80241390 44817000 */ mtc1 $at, $f14 -/* A01994 80241394 8C470030 */ lw $a3, 0x30($v0) -/* A01998 80241398 0C00A720 */ jal atan2 -/* A0199C 8024139C 8C700000 */ lw $s0, ($v1) -/* A019A0 802413A0 4600008D */ trunc.w.s $f2, $f0 -/* A019A4 802413A4 44061000 */ mfc1 $a2, $f2 -/* A019A8 802413A8 0220202D */ daddu $a0, $s1, $zero -/* A019AC 802413AC 0C0B2026 */ jal set_variable -/* A019B0 802413B0 0200282D */ daddu $a1, $s0, $zero -/* A019B4 802413B4 8FBF0018 */ lw $ra, 0x18($sp) -/* A019B8 802413B8 8FB10014 */ lw $s1, 0x14($sp) -/* A019BC 802413BC 8FB00010 */ lw $s0, 0x10($sp) -/* A019C0 802413C0 24020002 */ addiu $v0, $zero, 2 -/* A019C4 802413C4 03E00008 */ jr $ra -/* A019C8 802413C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s new file mode 100644 index 0000000000..a00a526322 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_13/A01420/func_80241360_A01960.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241360_A01960 +/* A01960 80241360 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A01964 80241364 AFB10014 */ sw $s1, 0x14($sp) +/* A01968 80241368 0080882D */ daddu $s1, $a0, $zero +/* A0196C 8024136C 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* A01970 80241370 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* A01974 80241374 AFBF0018 */ sw $ra, 0x18($sp) +/* A01978 80241378 AFB00010 */ sw $s0, 0x10($sp) +/* A0197C 8024137C 8C460028 */ lw $a2, 0x28($v0) +/* A01980 80241380 8E23000C */ lw $v1, 0xc($s1) +/* A01984 80241384 3C01C3B6 */ lui $at, 0xc3b6 +/* A01988 80241388 44816000 */ mtc1 $at, $f12 +/* A0198C 8024138C 3C01C307 */ lui $at, 0xc307 +/* A01990 80241390 44817000 */ mtc1 $at, $f14 +/* A01994 80241394 8C470030 */ lw $a3, 0x30($v0) +/* A01998 80241398 0C00A720 */ jal atan2 +/* A0199C 8024139C 8C700000 */ lw $s0, ($v1) +/* A019A0 802413A0 4600008D */ trunc.w.s $f2, $f0 +/* A019A4 802413A4 44061000 */ mfc1 $a2, $f2 +/* A019A8 802413A8 0220202D */ daddu $a0, $s1, $zero +/* A019AC 802413AC 0C0B2026 */ jal set_variable +/* A019B0 802413B0 0200282D */ daddu $a1, $s0, $zero +/* A019B4 802413B4 8FBF0018 */ lw $ra, 0x18($sp) +/* A019B8 802413B8 8FB10014 */ lw $s1, 0x14($sp) +/* A019BC 802413BC 8FB00010 */ lw $s0, 0x10($sp) +/* A019C0 802413C0 24020002 */ addiu $v0, $zero, 2 +/* A019C4 802413C4 03E00008 */ jr $ra +/* A019C8 802413C8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C.s b/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C.s deleted file mode 100644 index ec099a3f06..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024019C -/* A029DC 8024019C 3C03800B */ lui $v1, %hi(gCameras) -/* A029E0 802401A0 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A029E4 802401A4 94620000 */ lhu $v0, ($v1) -/* A029E8 802401A8 3042EFFF */ andi $v0, $v0, 0xefff -/* A029EC 802401AC A4620000 */ sh $v0, ($v1) -/* A029F0 802401B0 03E00008 */ jr $ra -/* A029F4 802401B4 24020002 */ addiu $v0, $zero, 2 -/* A029F8 802401B8 00000000 */ nop -/* A029FC 802401BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s b/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s new file mode 100644 index 0000000000..5baa47e5ef --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A029C0/func_8024019C_A029DC.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024019C_A029DC +/* A029DC 8024019C 3C03800B */ lui $v1, %hi(gCameras) +/* A029E0 802401A0 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* A029E4 802401A4 94620000 */ lhu $v0, ($v1) +/* A029E8 802401A8 3042EFFF */ andi $v0, $v0, 0xefff +/* A029EC 802401AC A4620000 */ sh $v0, ($v1) +/* A029F0 802401B0 03E00008 */ jr $ra +/* A029F4 802401B4 24020002 */ addiu $v0, $zero, 2 +/* A029F8 802401B8 00000000 */ nop +/* A029FC 802401BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802404D4.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802404D4.s deleted file mode 100644 index 14be2c6220..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802404D4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404D4 -/* A02D14 802404D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A02D18 802404D8 AFB10014 */ sw $s1, 0x14($sp) -/* A02D1C 802404DC 0080882D */ daddu $s1, $a0, $zero -/* A02D20 802404E0 AFBF0018 */ sw $ra, 0x18($sp) -/* A02D24 802404E4 AFB00010 */ sw $s0, 0x10($sp) -/* A02D28 802404E8 8E300148 */ lw $s0, 0x148($s1) -/* A02D2C 802404EC 0C00EABB */ jal get_npc_unsafe -/* A02D30 802404F0 86040008 */ lh $a0, 8($s0) -/* A02D34 802404F4 0040202D */ daddu $a0, $v0, $zero -/* A02D38 802404F8 9482008E */ lhu $v0, 0x8e($a0) -/* A02D3C 802404FC 24030003 */ addiu $v1, $zero, 3 -/* A02D40 80240500 24420001 */ addiu $v0, $v0, 1 -/* A02D44 80240504 A482008E */ sh $v0, 0x8e($a0) -/* A02D48 80240508 00021400 */ sll $v0, $v0, 0x10 -/* A02D4C 8024050C 00021403 */ sra $v0, $v0, 0x10 -/* A02D50 80240510 14430003 */ bne $v0, $v1, .L80240520 -/* A02D54 80240514 00000000 */ nop -/* A02D58 80240518 96020086 */ lhu $v0, 0x86($s0) -/* A02D5C 8024051C A48200A8 */ sh $v0, 0xa8($a0) -.L80240520: -/* A02D60 80240520 8482008E */ lh $v0, 0x8e($a0) -/* A02D64 80240524 8E030080 */ lw $v1, 0x80($s0) -/* A02D68 80240528 0043102A */ slt $v0, $v0, $v1 -/* A02D6C 8024052C 14400004 */ bnez $v0, .L80240540 -/* A02D70 80240530 00000000 */ nop -/* A02D74 80240534 96020086 */ lhu $v0, 0x86($s0) -/* A02D78 80240538 A48200A8 */ sh $v0, 0xa8($a0) -/* A02D7C 8024053C AE200070 */ sw $zero, 0x70($s1) -.L80240540: -/* A02D80 80240540 8FBF0018 */ lw $ra, 0x18($sp) -/* A02D84 80240544 8FB10014 */ lw $s1, 0x14($sp) -/* A02D88 80240548 8FB00010 */ lw $s0, 0x10($sp) -/* A02D8C 8024054C 03E00008 */ jr $ra -/* A02D90 80240550 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802404D4_A02D14.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802404D4_A02D14.s new file mode 100644 index 0000000000..1bcb80018c --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802404D4_A02D14.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404D4_A02D14 +/* A02D14 802404D4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A02D18 802404D8 AFB10014 */ sw $s1, 0x14($sp) +/* A02D1C 802404DC 0080882D */ daddu $s1, $a0, $zero +/* A02D20 802404E0 AFBF0018 */ sw $ra, 0x18($sp) +/* A02D24 802404E4 AFB00010 */ sw $s0, 0x10($sp) +/* A02D28 802404E8 8E300148 */ lw $s0, 0x148($s1) +/* A02D2C 802404EC 0C00EABB */ jal get_npc_unsafe +/* A02D30 802404F0 86040008 */ lh $a0, 8($s0) +/* A02D34 802404F4 0040202D */ daddu $a0, $v0, $zero +/* A02D38 802404F8 9482008E */ lhu $v0, 0x8e($a0) +/* A02D3C 802404FC 24030003 */ addiu $v1, $zero, 3 +/* A02D40 80240500 24420001 */ addiu $v0, $v0, 1 +/* A02D44 80240504 A482008E */ sh $v0, 0x8e($a0) +/* A02D48 80240508 00021400 */ sll $v0, $v0, 0x10 +/* A02D4C 8024050C 00021403 */ sra $v0, $v0, 0x10 +/* A02D50 80240510 14430003 */ bne $v0, $v1, .L80240520 +/* A02D54 80240514 00000000 */ nop +/* A02D58 80240518 96020086 */ lhu $v0, 0x86($s0) +/* A02D5C 8024051C A48200A8 */ sh $v0, 0xa8($a0) +.L80240520: +/* A02D60 80240520 8482008E */ lh $v0, 0x8e($a0) +/* A02D64 80240524 8E030080 */ lw $v1, 0x80($s0) +/* A02D68 80240528 0043102A */ slt $v0, $v0, $v1 +/* A02D6C 8024052C 14400004 */ bnez $v0, .L80240540 +/* A02D70 80240530 00000000 */ nop +/* A02D74 80240534 96020086 */ lhu $v0, 0x86($s0) +/* A02D78 80240538 A48200A8 */ sh $v0, 0xa8($a0) +/* A02D7C 8024053C AE200070 */ sw $zero, 0x70($s1) +.L80240540: +/* A02D80 80240540 8FBF0018 */ lw $ra, 0x18($sp) +/* A02D84 80240544 8FB10014 */ lw $s1, 0x14($sp) +/* A02D88 80240548 8FB00010 */ lw $s0, 0x10($sp) +/* A02D8C 8024054C 03E00008 */ jr $ra +/* A02D90 80240550 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554.s deleted file mode 100644 index 8f3ec67552..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240554 -/* A02D94 80240554 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A02D98 80240558 AFB3005C */ sw $s3, 0x5c($sp) -/* A02D9C 8024055C 0080982D */ daddu $s3, $a0, $zero -/* A02DA0 80240560 AFBF0068 */ sw $ra, 0x68($sp) -/* A02DA4 80240564 AFB50064 */ sw $s5, 0x64($sp) -/* A02DA8 80240568 AFB40060 */ sw $s4, 0x60($sp) -/* A02DAC 8024056C AFB20058 */ sw $s2, 0x58($sp) -/* A02DB0 80240570 AFB10054 */ sw $s1, 0x54($sp) -/* A02DB4 80240574 AFB00050 */ sw $s0, 0x50($sp) -/* A02DB8 80240578 8E710148 */ lw $s1, 0x148($s3) -/* A02DBC 8024057C 86240008 */ lh $a0, 8($s1) -/* A02DC0 80240580 0C00EABB */ jal get_npc_unsafe -/* A02DC4 80240584 00A0802D */ daddu $s0, $a1, $zero -/* A02DC8 80240588 8E63000C */ lw $v1, 0xc($s3) -/* A02DCC 8024058C 0260202D */ daddu $a0, $s3, $zero -/* A02DD0 80240590 8C650000 */ lw $a1, ($v1) -/* A02DD4 80240594 0C0B1EAF */ jal get_variable -/* A02DD8 80240598 0040902D */ daddu $s2, $v0, $zero -/* A02DDC 8024059C AFA00028 */ sw $zero, 0x28($sp) -/* A02DE0 802405A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02DE4 802405A4 8C630030 */ lw $v1, 0x30($v1) -/* A02DE8 802405A8 AFA3002C */ sw $v1, 0x2c($sp) -/* A02DEC 802405AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02DF0 802405B0 8C63001C */ lw $v1, 0x1c($v1) -/* A02DF4 802405B4 AFA30030 */ sw $v1, 0x30($sp) -/* A02DF8 802405B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02DFC 802405BC 8C630024 */ lw $v1, 0x24($v1) -/* A02E00 802405C0 AFA30034 */ sw $v1, 0x34($sp) -/* A02E04 802405C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02E08 802405C8 8C630028 */ lw $v1, 0x28($v1) -/* A02E0C 802405CC 27B50028 */ addiu $s5, $sp, 0x28 -/* A02E10 802405D0 AFA30038 */ sw $v1, 0x38($sp) -/* A02E14 802405D4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A02E18 802405D8 3C0142C8 */ lui $at, 0x42c8 -/* A02E1C 802405DC 44810000 */ mtc1 $at, $f0 -/* A02E20 802405E0 8C63002C */ lw $v1, 0x2c($v1) -/* A02E24 802405E4 0040A02D */ daddu $s4, $v0, $zero -/* A02E28 802405E8 E7A00040 */ swc1 $f0, 0x40($sp) -/* A02E2C 802405EC A7A00044 */ sh $zero, 0x44($sp) -/* A02E30 802405F0 12000009 */ beqz $s0, .L80240618 -/* A02E34 802405F4 AFA3003C */ sw $v1, 0x3c($sp) -/* A02E38 802405F8 864300A8 */ lh $v1, 0xa8($s2) -/* A02E3C 802405FC 8E2200B0 */ lw $v0, 0xb0($s1) -/* A02E40 80240600 AE20008C */ sw $zero, 0x8c($s1) -/* A02E44 80240604 A22000B5 */ sb $zero, 0xb5($s1) -/* A02E48 80240608 34420008 */ ori $v0, $v0, 8 -/* A02E4C 8024060C AE230084 */ sw $v1, 0x84($s1) -/* A02E50 80240610 0809018A */ j .L80240628 -/* A02E54 80240614 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240618: -/* A02E58 80240618 8E2200B0 */ lw $v0, 0xb0($s1) -/* A02E5C 8024061C 30420004 */ andi $v0, $v0, 4 -/* A02E60 80240620 10400047 */ beqz $v0, .L80240740 -/* A02E64 80240624 00000000 */ nop -.L80240628: -/* A02E68 80240628 AE600070 */ sw $zero, 0x70($s3) -/* A02E6C 8024062C A640008E */ sh $zero, 0x8e($s2) -/* A02E70 80240630 8E2300CC */ lw $v1, 0xcc($s1) -/* A02E74 80240634 2404F7FF */ addiu $a0, $zero, -0x801 -/* A02E78 80240638 A2200007 */ sb $zero, 7($s1) -/* A02E7C 8024063C 8E420000 */ lw $v0, ($s2) -/* A02E80 80240640 8C630000 */ lw $v1, ($v1) -/* A02E84 80240644 00441024 */ and $v0, $v0, $a0 -/* A02E88 80240648 AE420000 */ sw $v0, ($s2) -/* A02E8C 8024064C AE430028 */ sw $v1, 0x28($s2) -/* A02E90 80240650 96220086 */ lhu $v0, 0x86($s1) -/* A02E94 80240654 A64200A8 */ sh $v0, 0xa8($s2) -/* A02E98 80240658 8E2200D0 */ lw $v0, 0xd0($s1) -/* A02E9C 8024065C AE200090 */ sw $zero, 0x90($s1) -/* A02EA0 80240660 8C420034 */ lw $v0, 0x34($v0) -/* A02EA4 80240664 14400006 */ bnez $v0, .L80240680 -/* A02EA8 80240668 2403FDFF */ addiu $v1, $zero, -0x201 -/* A02EAC 8024066C 8E420000 */ lw $v0, ($s2) -/* A02EB0 80240670 2403FFF7 */ addiu $v1, $zero, -9 -/* A02EB4 80240674 34420200 */ ori $v0, $v0, 0x200 -/* A02EB8 80240678 080901A3 */ j .L8024068C -/* A02EBC 8024067C 00431024 */ and $v0, $v0, $v1 -.L80240680: -/* A02EC0 80240680 8E420000 */ lw $v0, ($s2) -/* A02EC4 80240684 00431024 */ and $v0, $v0, $v1 -/* A02EC8 80240688 34420008 */ ori $v0, $v0, 8 -.L8024068C: -/* A02ECC 8024068C AE420000 */ sw $v0, ($s2) -/* A02ED0 80240690 8E2200B0 */ lw $v0, 0xb0($s1) -/* A02ED4 80240694 30420004 */ andi $v0, $v0, 4 -/* A02ED8 80240698 1040001E */ beqz $v0, .L80240714 -/* A02EDC 8024069C 24040002 */ addiu $a0, $zero, 2 -/* A02EE0 802406A0 0240282D */ daddu $a1, $s2, $zero -/* A02EE4 802406A4 0000302D */ daddu $a2, $zero, $zero -/* A02EE8 802406A8 24020063 */ addiu $v0, $zero, 0x63 -/* A02EEC 802406AC AE620070 */ sw $v0, 0x70($s3) -/* A02EF0 802406B0 AE600074 */ sw $zero, 0x74($s3) -/* A02EF4 802406B4 864300A8 */ lh $v1, 0xa8($s2) -/* A02EF8 802406B8 3C013F80 */ lui $at, 0x3f80 -/* A02EFC 802406BC 44810000 */ mtc1 $at, $f0 -/* A02F00 802406C0 3C014000 */ lui $at, 0x4000 -/* A02F04 802406C4 44811000 */ mtc1 $at, $f2 -/* A02F08 802406C8 3C01C1A0 */ lui $at, 0xc1a0 -/* A02F0C 802406CC 44812000 */ mtc1 $at, $f4 -/* A02F10 802406D0 24020028 */ addiu $v0, $zero, 0x28 -/* A02F14 802406D4 AFA2001C */ sw $v0, 0x1c($sp) -/* A02F18 802406D8 44833000 */ mtc1 $v1, $f6 -/* A02F1C 802406DC 00000000 */ nop -/* A02F20 802406E0 468031A0 */ cvt.s.w $f6, $f6 -/* A02F24 802406E4 44073000 */ mfc1 $a3, $f6 -/* A02F28 802406E8 27A20048 */ addiu $v0, $sp, 0x48 -/* A02F2C 802406EC AFA20020 */ sw $v0, 0x20($sp) -/* A02F30 802406F0 E7A00010 */ swc1 $f0, 0x10($sp) -/* A02F34 802406F4 E7A20014 */ swc1 $f2, 0x14($sp) -/* A02F38 802406F8 0C01BFA4 */ jal fx_emote -/* A02F3C 802406FC E7A40018 */ swc1 $f4, 0x18($sp) -/* A02F40 80240700 8E2200B0 */ lw $v0, 0xb0($s1) -/* A02F44 80240704 2403FFFB */ addiu $v1, $zero, -5 -/* A02F48 80240708 00431024 */ and $v0, $v0, $v1 -/* A02F4C 8024070C 080901D0 */ j .L80240740 -/* A02F50 80240710 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240714: -/* A02F54 80240714 8E220000 */ lw $v0, ($s1) -/* A02F58 80240718 3C034000 */ lui $v1, 0x4000 -/* A02F5C 8024071C 00431024 */ and $v0, $v0, $v1 -/* A02F60 80240720 10400007 */ beqz $v0, .L80240740 -/* A02F64 80240724 3C03BFFF */ lui $v1, 0xbfff -/* A02F68 80240728 2402000C */ addiu $v0, $zero, 0xc -/* A02F6C 8024072C AE620070 */ sw $v0, 0x70($s3) -/* A02F70 80240730 8E220000 */ lw $v0, ($s1) -/* A02F74 80240734 3463FFFF */ ori $v1, $v1, 0xffff -/* A02F78 80240738 00431024 */ and $v0, $v0, $v1 -/* A02F7C 8024073C AE220000 */ sw $v0, ($s1) -.L80240740: -/* A02F80 80240740 8E220090 */ lw $v0, 0x90($s1) -/* A02F84 80240744 1840000C */ blez $v0, .L80240778 -/* A02F88 80240748 2442FFFF */ addiu $v0, $v0, -1 -/* A02F8C 8024074C 14400087 */ bnez $v0, .L8024096C -/* A02F90 80240750 AE220090 */ sw $v0, 0x90($s1) -/* A02F94 80240754 3C03FFAA */ lui $v1, 0xffaa -/* A02F98 80240758 8E420028 */ lw $v0, 0x28($s2) -/* A02F9C 8024075C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A02FA0 80240760 00431021 */ addu $v0, $v0, $v1 -/* A02FA4 80240764 2C420002 */ sltiu $v0, $v0, 2 -/* A02FA8 80240768 10400003 */ beqz $v0, .L80240778 -/* A02FAC 8024076C 3C020055 */ lui $v0, 0x55 -/* A02FB0 80240770 3442000C */ ori $v0, $v0, 0xc -/* A02FB4 80240774 AE420028 */ sw $v0, 0x28($s2) -.L80240778: -/* A02FB8 80240778 8E630070 */ lw $v1, 0x70($s3) -/* A02FBC 8024077C 2402000C */ addiu $v0, $zero, 0xc -/* A02FC0 80240780 10620048 */ beq $v1, $v0, .L802408A4 -/* A02FC4 80240784 2862000D */ slti $v0, $v1, 0xd -/* A02FC8 80240788 1040000F */ beqz $v0, .L802407C8 -/* A02FCC 8024078C 24100001 */ addiu $s0, $zero, 1 -/* A02FD0 80240790 1070001E */ beq $v1, $s0, .L8024080C -/* A02FD4 80240794 28620002 */ slti $v0, $v1, 2 -/* A02FD8 80240798 10400005 */ beqz $v0, .L802407B0 -/* A02FDC 8024079C 24020002 */ addiu $v0, $zero, 2 -/* A02FE0 802407A0 10600015 */ beqz $v1, .L802407F8 -/* A02FE4 802407A4 0260202D */ daddu $a0, $s3, $zero -/* A02FE8 802407A8 08090240 */ j .L80240900 -/* A02FEC 802407AC 00000000 */ nop -.L802407B0: -/* A02FF0 802407B0 1062001C */ beq $v1, $v0, .L80240824 -/* A02FF4 802407B4 24020003 */ addiu $v0, $zero, 3 -/* A02FF8 802407B8 10620035 */ beq $v1, $v0, .L80240890 -/* A02FFC 802407BC 0260202D */ daddu $a0, $s3, $zero -/* A03000 802407C0 08090240 */ j .L80240900 -/* A03004 802407C4 00000000 */ nop -.L802407C8: -/* A03008 802407C8 2402000E */ addiu $v0, $zero, 0xe -/* A0300C 802407CC 1062003F */ beq $v1, $v0, .L802408CC -/* A03010 802407D0 0062102A */ slt $v0, $v1, $v0 -/* A03014 802407D4 14400038 */ bnez $v0, .L802408B8 -/* A03018 802407D8 0260202D */ daddu $a0, $s3, $zero -/* A0301C 802407DC 2402000F */ addiu $v0, $zero, 0xf -/* A03020 802407E0 10620040 */ beq $v1, $v0, .L802408E4 -/* A03024 802407E4 24020063 */ addiu $v0, $zero, 0x63 -/* A03028 802407E8 10620043 */ beq $v1, $v0, .L802408F8 -/* A0302C 802407EC 00000000 */ nop -/* A03030 802407F0 08090240 */ j .L80240900 -/* A03034 802407F4 00000000 */ nop -.L802407F8: -/* A03038 802407F8 0280282D */ daddu $a1, $s4, $zero -/* A0303C 802407FC 0C012568 */ jal func_800495A0 -/* A03040 80240800 02A0302D */ daddu $a2, $s5, $zero -/* A03044 80240804 96220086 */ lhu $v0, 0x86($s1) -/* A03048 80240808 A64200A8 */ sh $v0, 0xa8($s2) -.L8024080C: -/* A0304C 8024080C 0260202D */ daddu $a0, $s3, $zero -/* A03050 80240810 0280282D */ daddu $a1, $s4, $zero -/* A03054 80240814 0C0125AE */ jal func_800496B8 -/* A03058 80240818 02A0302D */ daddu $a2, $s5, $zero -/* A0305C 8024081C 08090240 */ j .L80240900 -/* A03060 80240820 00000000 */ nop -.L80240824: -/* A03064 80240824 0260202D */ daddu $a0, $s3, $zero -/* A03068 80240828 0280282D */ daddu $a1, $s4, $zero -/* A0306C 8024082C 0C0126D1 */ jal func_80049B44 -/* A03070 80240830 02A0302D */ daddu $a2, $s5, $zero -/* A03074 80240834 8E230088 */ lw $v1, 0x88($s1) -/* A03078 80240838 24020006 */ addiu $v0, $zero, 6 -/* A0307C 8024083C 14620014 */ bne $v1, $v0, .L80240890 -/* A03080 80240840 0260202D */ daddu $a0, $s3, $zero -/* A03084 80240844 0C00A67F */ jal rand_int -/* A03088 80240848 24040064 */ addiu $a0, $zero, 0x64 -/* A0308C 8024084C 28420021 */ slti $v0, $v0, 0x21 -/* A03090 80240850 5040000F */ beql $v0, $zero, .L80240890 -/* A03094 80240854 0260202D */ daddu $a0, $s3, $zero -/* A03098 80240858 8E22008C */ lw $v0, 0x8c($s1) -/* A0309C 8024085C 10400005 */ beqz $v0, .L80240874 -/* A030A0 80240860 3C020055 */ lui $v0, 0x55 -/* A030A4 80240864 3442002F */ ori $v0, $v0, 0x2f -/* A030A8 80240868 AE20008C */ sw $zero, 0x8c($s1) -/* A030AC 8024086C 08090220 */ j .L80240880 -/* A030B0 80240870 A22000B5 */ sb $zero, 0xb5($s1) -.L80240874: -/* A030B4 80240874 3442002E */ ori $v0, $v0, 0x2e -/* A030B8 80240878 AE30008C */ sw $s0, 0x8c($s1) -/* A030BC 8024087C A23000B5 */ sb $s0, 0xb5($s1) -.L80240880: -/* A030C0 80240880 AE420028 */ sw $v0, 0x28($s2) -/* A030C4 80240884 24020007 */ addiu $v0, $zero, 7 -/* A030C8 80240888 0809025B */ j .L8024096C -/* A030CC 8024088C AE220090 */ sw $v0, 0x90($s1) -.L80240890: -/* A030D0 80240890 0280282D */ daddu $a1, $s4, $zero -/* A030D4 80240894 0C012701 */ jal func_80049C04 -/* A030D8 80240898 02A0302D */ daddu $a2, $s5, $zero -/* A030DC 8024089C 08090240 */ j .L80240900 -/* A030E0 802408A0 00000000 */ nop -.L802408A4: -/* A030E4 802408A4 0260202D */ daddu $a0, $s3, $zero -/* A030E8 802408A8 0280282D */ daddu $a1, $s4, $zero -/* A030EC 802408AC 0C090070 */ jal func_802401C0 -/* A030F0 802408B0 02A0302D */ daddu $a2, $s5, $zero -/* A030F4 802408B4 0260202D */ daddu $a0, $s3, $zero -.L802408B8: -/* A030F8 802408B8 0280282D */ daddu $a1, $s4, $zero -/* A030FC 802408BC 0C09008F */ jal func_8024023C -/* A03100 802408C0 02A0302D */ daddu $a2, $s5, $zero -/* A03104 802408C4 08090240 */ j .L80240900 -/* A03108 802408C8 00000000 */ nop -.L802408CC: -/* A0310C 802408CC 0260202D */ daddu $a0, $s3, $zero -/* A03110 802408D0 0280282D */ daddu $a1, $s4, $zero -/* A03114 802408D4 0C0900DC */ jal func_80240370 -/* A03118 802408D8 02A0302D */ daddu $a2, $s5, $zero -/* A0311C 802408DC 08090240 */ j .L80240900 -/* A03120 802408E0 00000000 */ nop -.L802408E4: -/* A03124 802408E4 0280282D */ daddu $a1, $s4, $zero -/* A03128 802408E8 0C090135 */ jal func_802404D4 -/* A0312C 802408EC 02A0302D */ daddu $a2, $s5, $zero -/* A03130 802408F0 08090240 */ j .L80240900 -/* A03134 802408F4 00000000 */ nop -.L802408F8: -/* A03138 802408F8 0C0129CF */ jal func_8004A73C -/* A0313C 802408FC 0260202D */ daddu $a0, $s3, $zero -.L80240900: -/* A03140 80240900 8E230088 */ lw $v1, 0x88($s1) -/* A03144 80240904 24020006 */ addiu $v0, $zero, 6 -/* A03148 80240908 14620019 */ bne $v1, $v0, .L80240970 -/* A0314C 8024090C 0000102D */ daddu $v0, $zero, $zero -/* A03150 80240910 8E22008C */ lw $v0, 0x8c($s1) -/* A03154 80240914 10400003 */ beqz $v0, .L80240924 -/* A03158 80240918 24020001 */ addiu $v0, $zero, 1 -/* A0315C 8024091C 0809024A */ j .L80240928 -/* A03160 80240920 A22200B5 */ sb $v0, 0xb5($s1) -.L80240924: -/* A03164 80240924 A22000B5 */ sb $zero, 0xb5($s1) -.L80240928: -/* A03168 80240928 8E22008C */ lw $v0, 0x8c($s1) -/* A0316C 8024092C 1040000F */ beqz $v0, .L8024096C -/* A03170 80240930 3C03FFAA */ lui $v1, 0xffaa -/* A03174 80240934 8E420028 */ lw $v0, 0x28($s2) -/* A03178 80240938 3463FFFC */ ori $v1, $v1, 0xfffc -/* A0317C 8024093C 00431821 */ addu $v1, $v0, $v1 -/* A03180 80240940 2C620015 */ sltiu $v0, $v1, 0x15 -/* A03184 80240944 10400009 */ beqz $v0, .L8024096C -/* A03188 80240948 00031080 */ sll $v0, $v1, 2 -/* A0318C 8024094C 3C018024 */ lui $at, 0x8024 -/* A03190 80240950 00220821 */ addu $at, $at, $v0 -/* A03194 80240954 8C2245C8 */ lw $v0, 0x45c8($at) -/* A03198 80240958 00400008 */ jr $v0 -/* A0319C 8024095C 00000000 */ nop -/* A031A0 80240960 8E420028 */ lw $v0, 0x28($s2) -/* A031A4 80240964 24420001 */ addiu $v0, $v0, 1 -/* A031A8 80240968 AE420028 */ sw $v0, 0x28($s2) -.L8024096C: -/* A031AC 8024096C 0000102D */ daddu $v0, $zero, $zero -.L80240970: -/* A031B0 80240970 8FBF0068 */ lw $ra, 0x68($sp) -/* A031B4 80240974 8FB50064 */ lw $s5, 0x64($sp) -/* A031B8 80240978 8FB40060 */ lw $s4, 0x60($sp) -/* A031BC 8024097C 8FB3005C */ lw $s3, 0x5c($sp) -/* A031C0 80240980 8FB20058 */ lw $s2, 0x58($sp) -/* A031C4 80240984 8FB10054 */ lw $s1, 0x54($sp) -/* A031C8 80240988 8FB00050 */ lw $s0, 0x50($sp) -/* A031CC 8024098C 03E00008 */ jr $ra -/* A031D0 80240990 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s new file mode 100644 index 0000000000..c0be6b89b3 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240554_A02D94.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240554_A02D94 +/* A02D94 80240554 27BDFF90 */ addiu $sp, $sp, -0x70 +/* A02D98 80240558 AFB3005C */ sw $s3, 0x5c($sp) +/* A02D9C 8024055C 0080982D */ daddu $s3, $a0, $zero +/* A02DA0 80240560 AFBF0068 */ sw $ra, 0x68($sp) +/* A02DA4 80240564 AFB50064 */ sw $s5, 0x64($sp) +/* A02DA8 80240568 AFB40060 */ sw $s4, 0x60($sp) +/* A02DAC 8024056C AFB20058 */ sw $s2, 0x58($sp) +/* A02DB0 80240570 AFB10054 */ sw $s1, 0x54($sp) +/* A02DB4 80240574 AFB00050 */ sw $s0, 0x50($sp) +/* A02DB8 80240578 8E710148 */ lw $s1, 0x148($s3) +/* A02DBC 8024057C 86240008 */ lh $a0, 8($s1) +/* A02DC0 80240580 0C00EABB */ jal get_npc_unsafe +/* A02DC4 80240584 00A0802D */ daddu $s0, $a1, $zero +/* A02DC8 80240588 8E63000C */ lw $v1, 0xc($s3) +/* A02DCC 8024058C 0260202D */ daddu $a0, $s3, $zero +/* A02DD0 80240590 8C650000 */ lw $a1, ($v1) +/* A02DD4 80240594 0C0B1EAF */ jal get_variable +/* A02DD8 80240598 0040902D */ daddu $s2, $v0, $zero +/* A02DDC 8024059C AFA00028 */ sw $zero, 0x28($sp) +/* A02DE0 802405A0 8E2300D0 */ lw $v1, 0xd0($s1) +/* A02DE4 802405A4 8C630030 */ lw $v1, 0x30($v1) +/* A02DE8 802405A8 AFA3002C */ sw $v1, 0x2c($sp) +/* A02DEC 802405AC 8E2300D0 */ lw $v1, 0xd0($s1) +/* A02DF0 802405B0 8C63001C */ lw $v1, 0x1c($v1) +/* A02DF4 802405B4 AFA30030 */ sw $v1, 0x30($sp) +/* A02DF8 802405B8 8E2300D0 */ lw $v1, 0xd0($s1) +/* A02DFC 802405BC 8C630024 */ lw $v1, 0x24($v1) +/* A02E00 802405C0 AFA30034 */ sw $v1, 0x34($sp) +/* A02E04 802405C4 8E2300D0 */ lw $v1, 0xd0($s1) +/* A02E08 802405C8 8C630028 */ lw $v1, 0x28($v1) +/* A02E0C 802405CC 27B50028 */ addiu $s5, $sp, 0x28 +/* A02E10 802405D0 AFA30038 */ sw $v1, 0x38($sp) +/* A02E14 802405D4 8E2300D0 */ lw $v1, 0xd0($s1) +/* A02E18 802405D8 3C0142C8 */ lui $at, 0x42c8 +/* A02E1C 802405DC 44810000 */ mtc1 $at, $f0 +/* A02E20 802405E0 8C63002C */ lw $v1, 0x2c($v1) +/* A02E24 802405E4 0040A02D */ daddu $s4, $v0, $zero +/* A02E28 802405E8 E7A00040 */ swc1 $f0, 0x40($sp) +/* A02E2C 802405EC A7A00044 */ sh $zero, 0x44($sp) +/* A02E30 802405F0 12000009 */ beqz $s0, .L80240618 +/* A02E34 802405F4 AFA3003C */ sw $v1, 0x3c($sp) +/* A02E38 802405F8 864300A8 */ lh $v1, 0xa8($s2) +/* A02E3C 802405FC 8E2200B0 */ lw $v0, 0xb0($s1) +/* A02E40 80240600 AE20008C */ sw $zero, 0x8c($s1) +/* A02E44 80240604 A22000B5 */ sb $zero, 0xb5($s1) +/* A02E48 80240608 34420008 */ ori $v0, $v0, 8 +/* A02E4C 8024060C AE230084 */ sw $v1, 0x84($s1) +/* A02E50 80240610 0809018A */ j .L80240628 +/* A02E54 80240614 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240618: +/* A02E58 80240618 8E2200B0 */ lw $v0, 0xb0($s1) +/* A02E5C 8024061C 30420004 */ andi $v0, $v0, 4 +/* A02E60 80240620 10400047 */ beqz $v0, .L80240740 +/* A02E64 80240624 00000000 */ nop +.L80240628: +/* A02E68 80240628 AE600070 */ sw $zero, 0x70($s3) +/* A02E6C 8024062C A640008E */ sh $zero, 0x8e($s2) +/* A02E70 80240630 8E2300CC */ lw $v1, 0xcc($s1) +/* A02E74 80240634 2404F7FF */ addiu $a0, $zero, -0x801 +/* A02E78 80240638 A2200007 */ sb $zero, 7($s1) +/* A02E7C 8024063C 8E420000 */ lw $v0, ($s2) +/* A02E80 80240640 8C630000 */ lw $v1, ($v1) +/* A02E84 80240644 00441024 */ and $v0, $v0, $a0 +/* A02E88 80240648 AE420000 */ sw $v0, ($s2) +/* A02E8C 8024064C AE430028 */ sw $v1, 0x28($s2) +/* A02E90 80240650 96220086 */ lhu $v0, 0x86($s1) +/* A02E94 80240654 A64200A8 */ sh $v0, 0xa8($s2) +/* A02E98 80240658 8E2200D0 */ lw $v0, 0xd0($s1) +/* A02E9C 8024065C AE200090 */ sw $zero, 0x90($s1) +/* A02EA0 80240660 8C420034 */ lw $v0, 0x34($v0) +/* A02EA4 80240664 14400006 */ bnez $v0, .L80240680 +/* A02EA8 80240668 2403FDFF */ addiu $v1, $zero, -0x201 +/* A02EAC 8024066C 8E420000 */ lw $v0, ($s2) +/* A02EB0 80240670 2403FFF7 */ addiu $v1, $zero, -9 +/* A02EB4 80240674 34420200 */ ori $v0, $v0, 0x200 +/* A02EB8 80240678 080901A3 */ j .L8024068C +/* A02EBC 8024067C 00431024 */ and $v0, $v0, $v1 +.L80240680: +/* A02EC0 80240680 8E420000 */ lw $v0, ($s2) +/* A02EC4 80240684 00431024 */ and $v0, $v0, $v1 +/* A02EC8 80240688 34420008 */ ori $v0, $v0, 8 +.L8024068C: +/* A02ECC 8024068C AE420000 */ sw $v0, ($s2) +/* A02ED0 80240690 8E2200B0 */ lw $v0, 0xb0($s1) +/* A02ED4 80240694 30420004 */ andi $v0, $v0, 4 +/* A02ED8 80240698 1040001E */ beqz $v0, .L80240714 +/* A02EDC 8024069C 24040002 */ addiu $a0, $zero, 2 +/* A02EE0 802406A0 0240282D */ daddu $a1, $s2, $zero +/* A02EE4 802406A4 0000302D */ daddu $a2, $zero, $zero +/* A02EE8 802406A8 24020063 */ addiu $v0, $zero, 0x63 +/* A02EEC 802406AC AE620070 */ sw $v0, 0x70($s3) +/* A02EF0 802406B0 AE600074 */ sw $zero, 0x74($s3) +/* A02EF4 802406B4 864300A8 */ lh $v1, 0xa8($s2) +/* A02EF8 802406B8 3C013F80 */ lui $at, 0x3f80 +/* A02EFC 802406BC 44810000 */ mtc1 $at, $f0 +/* A02F00 802406C0 3C014000 */ lui $at, 0x4000 +/* A02F04 802406C4 44811000 */ mtc1 $at, $f2 +/* A02F08 802406C8 3C01C1A0 */ lui $at, 0xc1a0 +/* A02F0C 802406CC 44812000 */ mtc1 $at, $f4 +/* A02F10 802406D0 24020028 */ addiu $v0, $zero, 0x28 +/* A02F14 802406D4 AFA2001C */ sw $v0, 0x1c($sp) +/* A02F18 802406D8 44833000 */ mtc1 $v1, $f6 +/* A02F1C 802406DC 00000000 */ nop +/* A02F20 802406E0 468031A0 */ cvt.s.w $f6, $f6 +/* A02F24 802406E4 44073000 */ mfc1 $a3, $f6 +/* A02F28 802406E8 27A20048 */ addiu $v0, $sp, 0x48 +/* A02F2C 802406EC AFA20020 */ sw $v0, 0x20($sp) +/* A02F30 802406F0 E7A00010 */ swc1 $f0, 0x10($sp) +/* A02F34 802406F4 E7A20014 */ swc1 $f2, 0x14($sp) +/* A02F38 802406F8 0C01BFA4 */ jal fx_emote +/* A02F3C 802406FC E7A40018 */ swc1 $f4, 0x18($sp) +/* A02F40 80240700 8E2200B0 */ lw $v0, 0xb0($s1) +/* A02F44 80240704 2403FFFB */ addiu $v1, $zero, -5 +/* A02F48 80240708 00431024 */ and $v0, $v0, $v1 +/* A02F4C 8024070C 080901D0 */ j .L80240740 +/* A02F50 80240710 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240714: +/* A02F54 80240714 8E220000 */ lw $v0, ($s1) +/* A02F58 80240718 3C034000 */ lui $v1, 0x4000 +/* A02F5C 8024071C 00431024 */ and $v0, $v0, $v1 +/* A02F60 80240720 10400007 */ beqz $v0, .L80240740 +/* A02F64 80240724 3C03BFFF */ lui $v1, 0xbfff +/* A02F68 80240728 2402000C */ addiu $v0, $zero, 0xc +/* A02F6C 8024072C AE620070 */ sw $v0, 0x70($s3) +/* A02F70 80240730 8E220000 */ lw $v0, ($s1) +/* A02F74 80240734 3463FFFF */ ori $v1, $v1, 0xffff +/* A02F78 80240738 00431024 */ and $v0, $v0, $v1 +/* A02F7C 8024073C AE220000 */ sw $v0, ($s1) +.L80240740: +/* A02F80 80240740 8E220090 */ lw $v0, 0x90($s1) +/* A02F84 80240744 1840000C */ blez $v0, .L80240778 +/* A02F88 80240748 2442FFFF */ addiu $v0, $v0, -1 +/* A02F8C 8024074C 14400087 */ bnez $v0, .L8024096C +/* A02F90 80240750 AE220090 */ sw $v0, 0x90($s1) +/* A02F94 80240754 3C03FFAA */ lui $v1, 0xffaa +/* A02F98 80240758 8E420028 */ lw $v0, 0x28($s2) +/* A02F9C 8024075C 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* A02FA0 80240760 00431021 */ addu $v0, $v0, $v1 +/* A02FA4 80240764 2C420002 */ sltiu $v0, $v0, 2 +/* A02FA8 80240768 10400003 */ beqz $v0, .L80240778 +/* A02FAC 8024076C 3C020055 */ lui $v0, 0x55 +/* A02FB0 80240770 3442000C */ ori $v0, $v0, 0xc +/* A02FB4 80240774 AE420028 */ sw $v0, 0x28($s2) +.L80240778: +/* A02FB8 80240778 8E630070 */ lw $v1, 0x70($s3) +/* A02FBC 8024077C 2402000C */ addiu $v0, $zero, 0xc +/* A02FC0 80240780 10620048 */ beq $v1, $v0, .L802408A4 +/* A02FC4 80240784 2862000D */ slti $v0, $v1, 0xd +/* A02FC8 80240788 1040000F */ beqz $v0, .L802407C8 +/* A02FCC 8024078C 24100001 */ addiu $s0, $zero, 1 +/* A02FD0 80240790 1070001E */ beq $v1, $s0, .L8024080C +/* A02FD4 80240794 28620002 */ slti $v0, $v1, 2 +/* A02FD8 80240798 10400005 */ beqz $v0, .L802407B0 +/* A02FDC 8024079C 24020002 */ addiu $v0, $zero, 2 +/* A02FE0 802407A0 10600015 */ beqz $v1, .L802407F8 +/* A02FE4 802407A4 0260202D */ daddu $a0, $s3, $zero +/* A02FE8 802407A8 08090240 */ j .L80240900 +/* A02FEC 802407AC 00000000 */ nop +.L802407B0: +/* A02FF0 802407B0 1062001C */ beq $v1, $v0, .L80240824 +/* A02FF4 802407B4 24020003 */ addiu $v0, $zero, 3 +/* A02FF8 802407B8 10620035 */ beq $v1, $v0, .L80240890 +/* A02FFC 802407BC 0260202D */ daddu $a0, $s3, $zero +/* A03000 802407C0 08090240 */ j .L80240900 +/* A03004 802407C4 00000000 */ nop +.L802407C8: +/* A03008 802407C8 2402000E */ addiu $v0, $zero, 0xe +/* A0300C 802407CC 1062003F */ beq $v1, $v0, .L802408CC +/* A03010 802407D0 0062102A */ slt $v0, $v1, $v0 +/* A03014 802407D4 14400038 */ bnez $v0, .L802408B8 +/* A03018 802407D8 0260202D */ daddu $a0, $s3, $zero +/* A0301C 802407DC 2402000F */ addiu $v0, $zero, 0xf +/* A03020 802407E0 10620040 */ beq $v1, $v0, .L802408E4 +/* A03024 802407E4 24020063 */ addiu $v0, $zero, 0x63 +/* A03028 802407E8 10620043 */ beq $v1, $v0, .L802408F8 +/* A0302C 802407EC 00000000 */ nop +/* A03030 802407F0 08090240 */ j .L80240900 +/* A03034 802407F4 00000000 */ nop +.L802407F8: +/* A03038 802407F8 0280282D */ daddu $a1, $s4, $zero +/* A0303C 802407FC 0C012568 */ jal func_800495A0 +/* A03040 80240800 02A0302D */ daddu $a2, $s5, $zero +/* A03044 80240804 96220086 */ lhu $v0, 0x86($s1) +/* A03048 80240808 A64200A8 */ sh $v0, 0xa8($s2) +.L8024080C: +/* A0304C 8024080C 0260202D */ daddu $a0, $s3, $zero +/* A03050 80240810 0280282D */ daddu $a1, $s4, $zero +/* A03054 80240814 0C0125AE */ jal func_800496B8 +/* A03058 80240818 02A0302D */ daddu $a2, $s5, $zero +/* A0305C 8024081C 08090240 */ j .L80240900 +/* A03060 80240820 00000000 */ nop +.L80240824: +/* A03064 80240824 0260202D */ daddu $a0, $s3, $zero +/* A03068 80240828 0280282D */ daddu $a1, $s4, $zero +/* A0306C 8024082C 0C0126D1 */ jal func_80049B44 +/* A03070 80240830 02A0302D */ daddu $a2, $s5, $zero +/* A03074 80240834 8E230088 */ lw $v1, 0x88($s1) +/* A03078 80240838 24020006 */ addiu $v0, $zero, 6 +/* A0307C 8024083C 14620014 */ bne $v1, $v0, .L80240890 +/* A03080 80240840 0260202D */ daddu $a0, $s3, $zero +/* A03084 80240844 0C00A67F */ jal rand_int +/* A03088 80240848 24040064 */ addiu $a0, $zero, 0x64 +/* A0308C 8024084C 28420021 */ slti $v0, $v0, 0x21 +/* A03090 80240850 5040000F */ beql $v0, $zero, .L80240890 +/* A03094 80240854 0260202D */ daddu $a0, $s3, $zero +/* A03098 80240858 8E22008C */ lw $v0, 0x8c($s1) +/* A0309C 8024085C 10400005 */ beqz $v0, .L80240874 +/* A030A0 80240860 3C020055 */ lui $v0, 0x55 +/* A030A4 80240864 3442002F */ ori $v0, $v0, 0x2f +/* A030A8 80240868 AE20008C */ sw $zero, 0x8c($s1) +/* A030AC 8024086C 08090220 */ j .L80240880 +/* A030B0 80240870 A22000B5 */ sb $zero, 0xb5($s1) +.L80240874: +/* A030B4 80240874 3442002E */ ori $v0, $v0, 0x2e +/* A030B8 80240878 AE30008C */ sw $s0, 0x8c($s1) +/* A030BC 8024087C A23000B5 */ sb $s0, 0xb5($s1) +.L80240880: +/* A030C0 80240880 AE420028 */ sw $v0, 0x28($s2) +/* A030C4 80240884 24020007 */ addiu $v0, $zero, 7 +/* A030C8 80240888 0809025B */ j .L8024096C +/* A030CC 8024088C AE220090 */ sw $v0, 0x90($s1) +.L80240890: +/* A030D0 80240890 0280282D */ daddu $a1, $s4, $zero +/* A030D4 80240894 0C012701 */ jal func_80049C04 +/* A030D8 80240898 02A0302D */ daddu $a2, $s5, $zero +/* A030DC 8024089C 08090240 */ j .L80240900 +/* A030E0 802408A0 00000000 */ nop +.L802408A4: +/* A030E4 802408A4 0260202D */ daddu $a0, $s3, $zero +/* A030E8 802408A8 0280282D */ daddu $a1, $s4, $zero +/* A030EC 802408AC 0C090070 */ jal func_802401C0_A02A00 +/* A030F0 802408B0 02A0302D */ daddu $a2, $s5, $zero +/* A030F4 802408B4 0260202D */ daddu $a0, $s3, $zero +.L802408B8: +/* A030F8 802408B8 0280282D */ daddu $a1, $s4, $zero +/* A030FC 802408BC 0C09008F */ jal func_8024023C_A02A7C +/* A03100 802408C0 02A0302D */ daddu $a2, $s5, $zero +/* A03104 802408C4 08090240 */ j .L80240900 +/* A03108 802408C8 00000000 */ nop +.L802408CC: +/* A0310C 802408CC 0260202D */ daddu $a0, $s3, $zero +/* A03110 802408D0 0280282D */ daddu $a1, $s4, $zero +/* A03114 802408D4 0C0900DC */ jal func_80240370_A02BB0 +/* A03118 802408D8 02A0302D */ daddu $a2, $s5, $zero +/* A0311C 802408DC 08090240 */ j .L80240900 +/* A03120 802408E0 00000000 */ nop +.L802408E4: +/* A03124 802408E4 0280282D */ daddu $a1, $s4, $zero +/* A03128 802408E8 0C090135 */ jal func_802404D4_A02D14 +/* A0312C 802408EC 02A0302D */ daddu $a2, $s5, $zero +/* A03130 802408F0 08090240 */ j .L80240900 +/* A03134 802408F4 00000000 */ nop +.L802408F8: +/* A03138 802408F8 0C0129CF */ jal func_8004A73C +/* A0313C 802408FC 0260202D */ daddu $a0, $s3, $zero +.L80240900: +/* A03140 80240900 8E230088 */ lw $v1, 0x88($s1) +/* A03144 80240904 24020006 */ addiu $v0, $zero, 6 +/* A03148 80240908 14620019 */ bne $v1, $v0, .L80240970 +/* A0314C 8024090C 0000102D */ daddu $v0, $zero, $zero +/* A03150 80240910 8E22008C */ lw $v0, 0x8c($s1) +/* A03154 80240914 10400003 */ beqz $v0, .L80240924 +/* A03158 80240918 24020001 */ addiu $v0, $zero, 1 +/* A0315C 8024091C 0809024A */ j .L80240928 +/* A03160 80240920 A22200B5 */ sb $v0, 0xb5($s1) +.L80240924: +/* A03164 80240924 A22000B5 */ sb $zero, 0xb5($s1) +.L80240928: +/* A03168 80240928 8E22008C */ lw $v0, 0x8c($s1) +/* A0316C 8024092C 1040000F */ beqz $v0, .L8024096C +/* A03170 80240930 3C03FFAA */ lui $v1, 0xffaa +/* A03174 80240934 8E420028 */ lw $v0, 0x28($s2) +/* A03178 80240938 3463FFFC */ ori $v1, $v1, 0xfffc +/* A0317C 8024093C 00431821 */ addu $v1, $v0, $v1 +/* A03180 80240940 2C620015 */ sltiu $v0, $v1, 0x15 +/* A03184 80240944 10400009 */ beqz $v0, .L8024096C +/* A03188 80240948 00031080 */ sll $v0, $v1, 2 +/* A0318C 8024094C 3C018024 */ lui $at, 0x8024 +/* A03190 80240950 00220821 */ addu $at, $at, $v0 +/* A03194 80240954 8C2245C8 */ lw $v0, 0x45c8($at) +/* A03198 80240958 00400008 */ jr $v0 +/* A0319C 8024095C 00000000 */ nop +/* A031A0 80240960 8E420028 */ lw $v0, 0x28($s2) +/* A031A4 80240964 24420001 */ addiu $v0, $v0, 1 +/* A031A8 80240968 AE420028 */ sw $v0, 0x28($s2) +.L8024096C: +/* A031AC 8024096C 0000102D */ daddu $v0, $zero, $zero +.L80240970: +/* A031B0 80240970 8FBF0068 */ lw $ra, 0x68($sp) +/* A031B4 80240974 8FB50064 */ lw $s5, 0x64($sp) +/* A031B8 80240978 8FB40060 */ lw $s4, 0x60($sp) +/* A031BC 8024097C 8FB3005C */ lw $s3, 0x5c($sp) +/* A031C0 80240980 8FB20058 */ lw $s2, 0x58($sp) +/* A031C4 80240984 8FB10054 */ lw $s1, 0x54($sp) +/* A031C8 80240988 8FB00050 */ lw $s0, 0x50($sp) +/* A031CC 8024098C 03E00008 */ jr $ra +/* A031D0 80240990 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994.s deleted file mode 100644 index f80ac4dd91..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240994 -/* A031D4 80240994 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A031D8 80240998 AFB3002C */ sw $s3, 0x2c($sp) -/* A031DC 8024099C 0080982D */ daddu $s3, $a0, $zero -/* A031E0 802409A0 AFBF0030 */ sw $ra, 0x30($sp) -/* A031E4 802409A4 AFB20028 */ sw $s2, 0x28($sp) -/* A031E8 802409A8 AFB10024 */ sw $s1, 0x24($sp) -/* A031EC 802409AC AFB00020 */ sw $s0, 0x20($sp) -/* A031F0 802409B0 8E710148 */ lw $s1, 0x148($s3) -/* A031F4 802409B4 86240008 */ lh $a0, 8($s1) -/* A031F8 802409B8 0C00EABB */ jal get_npc_unsafe -/* A031FC 802409BC 00A0902D */ daddu $s2, $a1, $zero -/* A03200 802409C0 8E440004 */ lw $a0, 4($s2) -/* A03204 802409C4 0040802D */ daddu $s0, $v0, $zero -/* A03208 802409C8 00041FC2 */ srl $v1, $a0, 0x1f -/* A0320C 802409CC 00832021 */ addu $a0, $a0, $v1 -/* A03210 802409D0 00042043 */ sra $a0, $a0, 1 -/* A03214 802409D4 0C00A67F */ jal rand_int -/* A03218 802409D8 24840001 */ addiu $a0, $a0, 1 -/* A0321C 802409DC 8E430004 */ lw $v1, 4($s2) -/* A03220 802409E0 000327C2 */ srl $a0, $v1, 0x1f -/* A03224 802409E4 00641821 */ addu $v1, $v1, $a0 -/* A03228 802409E8 00031843 */ sra $v1, $v1, 1 -/* A0322C 802409EC 00621821 */ addu $v1, $v1, $v0 -/* A03230 802409F0 A603008E */ sh $v1, 0x8e($s0) -/* A03234 802409F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A03238 802409F8 C6000040 */ lwc1 $f0, 0x40($s0) -/* A0323C 802409FC C4640000 */ lwc1 $f4, ($v1) -/* A03240 80240A00 46802120 */ cvt.s.w $f4, $f4 -/* A03244 80240A04 C4620008 */ lwc1 $f2, 8($v1) -/* A03248 80240A08 468010A0 */ cvt.s.w $f2, $f2 -/* A0324C 80240A0C E7A00010 */ swc1 $f0, 0x10($sp) -/* A03250 80240A10 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03254 80240A14 44061000 */ mfc1 $a2, $f2 -/* A03258 80240A18 C440000C */ lwc1 $f0, 0xc($v0) -/* A0325C 80240A1C 46800020 */ cvt.s.w $f0, $f0 -/* A03260 80240A20 E7A00014 */ swc1 $f0, 0x14($sp) -/* A03264 80240A24 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03268 80240A28 44052000 */ mfc1 $a1, $f4 -/* A0326C 80240A2C C4400010 */ lwc1 $f0, 0x10($v0) -/* A03270 80240A30 46800020 */ cvt.s.w $f0, $f0 -/* A03274 80240A34 E7A00018 */ swc1 $f0, 0x18($sp) -/* A03278 80240A38 8C640018 */ lw $a0, 0x18($v1) -/* A0327C 80240A3C 0C0123F5 */ jal is_point_within_region -/* A03280 80240A40 8E070038 */ lw $a3, 0x38($s0) -/* A03284 80240A44 1040000E */ beqz $v0, .L80240A80 -/* A03288 80240A48 00000000 */ nop -/* A0328C 80240A4C 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03290 80240A50 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A03294 80240A54 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A03298 80240A58 C4460000 */ lwc1 $f6, ($v0) -/* A0329C 80240A5C 468031A0 */ cvt.s.w $f6, $f6 -/* A032A0 80240A60 44063000 */ mfc1 $a2, $f6 -/* A032A4 80240A64 C4460008 */ lwc1 $f6, 8($v0) -/* A032A8 80240A68 468031A0 */ cvt.s.w $f6, $f6 -/* A032AC 80240A6C 44073000 */ mfc1 $a3, $f6 -/* A032B0 80240A70 0C00A720 */ jal atan2 -/* A032B4 80240A74 00000000 */ nop -/* A032B8 80240A78 080902AC */ j .L80240AB0 -/* A032BC 80240A7C E600000C */ swc1 $f0, 0xc($s0) -.L80240A80: -/* A032C0 80240A80 0C00A67F */ jal rand_int -/* A032C4 80240A84 2404003C */ addiu $a0, $zero, 0x3c -/* A032C8 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) -/* A032CC 80240A8C 44820000 */ mtc1 $v0, $f0 -/* A032D0 80240A90 00000000 */ nop -/* A032D4 80240A94 46800020 */ cvt.s.w $f0, $f0 -/* A032D8 80240A98 46006300 */ add.s $f12, $f12, $f0 -/* A032DC 80240A9C 3C0141F0 */ lui $at, 0x41f0 -/* A032E0 80240AA0 44810000 */ mtc1 $at, $f0 -/* A032E4 80240AA4 0C00A6C9 */ jal clamp_angle -/* A032E8 80240AA8 46006301 */ sub.s $f12, $f12, $f0 -/* A032EC 80240AAC E600000C */ swc1 $f0, 0xc($s0) -.L80240AB0: -/* A032F0 80240AB0 8E2200CC */ lw $v0, 0xcc($s1) -/* A032F4 80240AB4 8C420004 */ lw $v0, 4($v0) -/* A032F8 80240AB8 AE020028 */ sw $v0, 0x28($s0) -/* A032FC 80240ABC AE600074 */ sw $zero, 0x74($s3) -/* A03300 80240AC0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03304 80240AC4 8C420014 */ lw $v0, 0x14($v0) -/* A03308 80240AC8 04410004 */ bgez $v0, .L80240ADC -/* A0330C 80240ACC 00000000 */ nop -/* A03310 80240AD0 C6400000 */ lwc1 $f0, ($s2) -/* A03314 80240AD4 080902BF */ j .L80240AFC -/* A03318 80240AD8 E6000018 */ swc1 $f0, 0x18($s0) -.L80240ADC: -/* A0331C 80240ADC 3C018024 */ lui $at, 0x8024 -/* A03320 80240AE0 D4224620 */ ldc1 $f2, 0x4620($at) -/* A03324 80240AE4 44820000 */ mtc1 $v0, $f0 -/* A03328 80240AE8 00000000 */ nop -/* A0332C 80240AEC 46800021 */ cvt.d.w $f0, $f0 -/* A03330 80240AF0 46220003 */ div.d $f0, $f0, $f2 -/* A03334 80240AF4 46200020 */ cvt.s.d $f0, $f0 -/* A03338 80240AF8 E6000018 */ swc1 $f0, 0x18($s0) -.L80240AFC: -/* A0333C 80240AFC C600003C */ lwc1 $f0, 0x3c($s0) -/* A03340 80240B00 3C014059 */ lui $at, 0x4059 -/* A03344 80240B04 44811800 */ mtc1 $at, $f3 -/* A03348 80240B08 44801000 */ mtc1 $zero, $f2 -/* A0334C 80240B0C 46000021 */ cvt.d.s $f0, $f0 -/* A03350 80240B10 46220002 */ mul.d $f0, $f0, $f2 -/* A03354 80240B14 00000000 */ nop -/* A03358 80240B18 24020001 */ addiu $v0, $zero, 1 -/* A0335C 80240B1C 4620018D */ trunc.w.d $f6, $f0 -/* A03360 80240B20 E626007C */ swc1 $f6, 0x7c($s1) -/* A03364 80240B24 AE620070 */ sw $v0, 0x70($s3) -/* A03368 80240B28 8FBF0030 */ lw $ra, 0x30($sp) -/* A0336C 80240B2C 8FB3002C */ lw $s3, 0x2c($sp) -/* A03370 80240B30 8FB20028 */ lw $s2, 0x28($sp) -/* A03374 80240B34 8FB10024 */ lw $s1, 0x24($sp) -/* A03378 80240B38 8FB00020 */ lw $s0, 0x20($sp) -/* A0337C 80240B3C 03E00008 */ jr $ra -/* A03380 80240B40 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s new file mode 100644 index 0000000000..75a0a26d1e --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240994_A031D4.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240994_A031D4 +/* A031D4 80240994 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A031D8 80240998 AFB3002C */ sw $s3, 0x2c($sp) +/* A031DC 8024099C 0080982D */ daddu $s3, $a0, $zero +/* A031E0 802409A0 AFBF0030 */ sw $ra, 0x30($sp) +/* A031E4 802409A4 AFB20028 */ sw $s2, 0x28($sp) +/* A031E8 802409A8 AFB10024 */ sw $s1, 0x24($sp) +/* A031EC 802409AC AFB00020 */ sw $s0, 0x20($sp) +/* A031F0 802409B0 8E710148 */ lw $s1, 0x148($s3) +/* A031F4 802409B4 86240008 */ lh $a0, 8($s1) +/* A031F8 802409B8 0C00EABB */ jal get_npc_unsafe +/* A031FC 802409BC 00A0902D */ daddu $s2, $a1, $zero +/* A03200 802409C0 8E440004 */ lw $a0, 4($s2) +/* A03204 802409C4 0040802D */ daddu $s0, $v0, $zero +/* A03208 802409C8 00041FC2 */ srl $v1, $a0, 0x1f +/* A0320C 802409CC 00832021 */ addu $a0, $a0, $v1 +/* A03210 802409D0 00042043 */ sra $a0, $a0, 1 +/* A03214 802409D4 0C00A67F */ jal rand_int +/* A03218 802409D8 24840001 */ addiu $a0, $a0, 1 +/* A0321C 802409DC 8E430004 */ lw $v1, 4($s2) +/* A03220 802409E0 000327C2 */ srl $a0, $v1, 0x1f +/* A03224 802409E4 00641821 */ addu $v1, $v1, $a0 +/* A03228 802409E8 00031843 */ sra $v1, $v1, 1 +/* A0322C 802409EC 00621821 */ addu $v1, $v1, $v0 +/* A03230 802409F0 A603008E */ sh $v1, 0x8e($s0) +/* A03234 802409F4 8E2300D0 */ lw $v1, 0xd0($s1) +/* A03238 802409F8 C6000040 */ lwc1 $f0, 0x40($s0) +/* A0323C 802409FC C4640000 */ lwc1 $f4, ($v1) +/* A03240 80240A00 46802120 */ cvt.s.w $f4, $f4 +/* A03244 80240A04 C4620008 */ lwc1 $f2, 8($v1) +/* A03248 80240A08 468010A0 */ cvt.s.w $f2, $f2 +/* A0324C 80240A0C E7A00010 */ swc1 $f0, 0x10($sp) +/* A03250 80240A10 8E2200D0 */ lw $v0, 0xd0($s1) +/* A03254 80240A14 44061000 */ mfc1 $a2, $f2 +/* A03258 80240A18 C440000C */ lwc1 $f0, 0xc($v0) +/* A0325C 80240A1C 46800020 */ cvt.s.w $f0, $f0 +/* A03260 80240A20 E7A00014 */ swc1 $f0, 0x14($sp) +/* A03264 80240A24 8E2200D0 */ lw $v0, 0xd0($s1) +/* A03268 80240A28 44052000 */ mfc1 $a1, $f4 +/* A0326C 80240A2C C4400010 */ lwc1 $f0, 0x10($v0) +/* A03270 80240A30 46800020 */ cvt.s.w $f0, $f0 +/* A03274 80240A34 E7A00018 */ swc1 $f0, 0x18($sp) +/* A03278 80240A38 8C640018 */ lw $a0, 0x18($v1) +/* A0327C 80240A3C 0C0123F5 */ jal is_point_within_region +/* A03280 80240A40 8E070038 */ lw $a3, 0x38($s0) +/* A03284 80240A44 1040000E */ beqz $v0, .L80240A80 +/* A03288 80240A48 00000000 */ nop +/* A0328C 80240A4C 8E2200D0 */ lw $v0, 0xd0($s1) +/* A03290 80240A50 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A03294 80240A54 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A03298 80240A58 C4460000 */ lwc1 $f6, ($v0) +/* A0329C 80240A5C 468031A0 */ cvt.s.w $f6, $f6 +/* A032A0 80240A60 44063000 */ mfc1 $a2, $f6 +/* A032A4 80240A64 C4460008 */ lwc1 $f6, 8($v0) +/* A032A8 80240A68 468031A0 */ cvt.s.w $f6, $f6 +/* A032AC 80240A6C 44073000 */ mfc1 $a3, $f6 +/* A032B0 80240A70 0C00A720 */ jal atan2 +/* A032B4 80240A74 00000000 */ nop +/* A032B8 80240A78 080902AC */ j .L80240AB0 +/* A032BC 80240A7C E600000C */ swc1 $f0, 0xc($s0) +.L80240A80: +/* A032C0 80240A80 0C00A67F */ jal rand_int +/* A032C4 80240A84 2404003C */ addiu $a0, $zero, 0x3c +/* A032C8 80240A88 C60C000C */ lwc1 $f12, 0xc($s0) +/* A032CC 80240A8C 44820000 */ mtc1 $v0, $f0 +/* A032D0 80240A90 00000000 */ nop +/* A032D4 80240A94 46800020 */ cvt.s.w $f0, $f0 +/* A032D8 80240A98 46006300 */ add.s $f12, $f12, $f0 +/* A032DC 80240A9C 3C0141F0 */ lui $at, 0x41f0 +/* A032E0 80240AA0 44810000 */ mtc1 $at, $f0 +/* A032E4 80240AA4 0C00A6C9 */ jal clamp_angle +/* A032E8 80240AA8 46006301 */ sub.s $f12, $f12, $f0 +/* A032EC 80240AAC E600000C */ swc1 $f0, 0xc($s0) +.L80240AB0: +/* A032F0 80240AB0 8E2200CC */ lw $v0, 0xcc($s1) +/* A032F4 80240AB4 8C420004 */ lw $v0, 4($v0) +/* A032F8 80240AB8 AE020028 */ sw $v0, 0x28($s0) +/* A032FC 80240ABC AE600074 */ sw $zero, 0x74($s3) +/* A03300 80240AC0 8E2200D0 */ lw $v0, 0xd0($s1) +/* A03304 80240AC4 8C420014 */ lw $v0, 0x14($v0) +/* A03308 80240AC8 04410004 */ bgez $v0, .L80240ADC +/* A0330C 80240ACC 00000000 */ nop +/* A03310 80240AD0 C6400000 */ lwc1 $f0, ($s2) +/* A03314 80240AD4 080902BF */ j .L80240AFC +/* A03318 80240AD8 E6000018 */ swc1 $f0, 0x18($s0) +.L80240ADC: +/* A0331C 80240ADC 3C018024 */ lui $at, 0x8024 +/* A03320 80240AE0 D4224620 */ ldc1 $f2, 0x4620($at) +/* A03324 80240AE4 44820000 */ mtc1 $v0, $f0 +/* A03328 80240AE8 00000000 */ nop +/* A0332C 80240AEC 46800021 */ cvt.d.w $f0, $f0 +/* A03330 80240AF0 46220003 */ div.d $f0, $f0, $f2 +/* A03334 80240AF4 46200020 */ cvt.s.d $f0, $f0 +/* A03338 80240AF8 E6000018 */ swc1 $f0, 0x18($s0) +.L80240AFC: +/* A0333C 80240AFC C600003C */ lwc1 $f0, 0x3c($s0) +/* A03340 80240B00 3C014059 */ lui $at, 0x4059 +/* A03344 80240B04 44811800 */ mtc1 $at, $f3 +/* A03348 80240B08 44801000 */ mtc1 $zero, $f2 +/* A0334C 80240B0C 46000021 */ cvt.d.s $f0, $f0 +/* A03350 80240B10 46220002 */ mul.d $f0, $f0, $f2 +/* A03354 80240B14 00000000 */ nop +/* A03358 80240B18 24020001 */ addiu $v0, $zero, 1 +/* A0335C 80240B1C 4620018D */ trunc.w.d $f6, $f0 +/* A03360 80240B20 E626007C */ swc1 $f6, 0x7c($s1) +/* A03364 80240B24 AE620070 */ sw $v0, 0x70($s3) +/* A03368 80240B28 8FBF0030 */ lw $ra, 0x30($sp) +/* A0336C 80240B2C 8FB3002C */ lw $s3, 0x2c($sp) +/* A03370 80240B30 8FB20028 */ lw $s2, 0x28($sp) +/* A03374 80240B34 8FB10024 */ lw $s1, 0x24($sp) +/* A03378 80240B38 8FB00020 */ lw $s0, 0x20($sp) +/* A0337C 80240B3C 03E00008 */ jr $ra +/* A03380 80240B40 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44.s deleted file mode 100644 index 5d72bc949f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B44 -/* A03384 80240B44 27BDFF80 */ addiu $sp, $sp, -0x80 -/* A03388 80240B48 AFB3004C */ sw $s3, 0x4c($sp) -/* A0338C 80240B4C 0080982D */ daddu $s3, $a0, $zero -/* A03390 80240B50 AFBF0058 */ sw $ra, 0x58($sp) -/* A03394 80240B54 AFB50054 */ sw $s5, 0x54($sp) -/* A03398 80240B58 AFB40050 */ sw $s4, 0x50($sp) -/* A0339C 80240B5C AFB20048 */ sw $s2, 0x48($sp) -/* A033A0 80240B60 AFB10044 */ sw $s1, 0x44($sp) -/* A033A4 80240B64 AFB00040 */ sw $s0, 0x40($sp) -/* A033A8 80240B68 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A033AC 80240B6C F7B80070 */ sdc1 $f24, 0x70($sp) -/* A033B0 80240B70 F7B60068 */ sdc1 $f22, 0x68($sp) -/* A033B4 80240B74 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A033B8 80240B78 8E710148 */ lw $s1, 0x148($s3) -/* A033BC 80240B7C 00A0902D */ daddu $s2, $a1, $zero -/* A033C0 80240B80 86240008 */ lh $a0, 8($s1) -/* A033C4 80240B84 0C00EABB */ jal get_npc_unsafe -/* A033C8 80240B88 00C0A82D */ daddu $s5, $a2, $zero -/* A033CC 80240B8C 0040802D */ daddu $s0, $v0, $zero -/* A033D0 80240B90 0000A02D */ daddu $s4, $zero, $zero -/* A033D4 80240B94 C624007C */ lwc1 $f4, 0x7c($s1) -/* A033D8 80240B98 46802120 */ cvt.s.w $f4, $f4 -/* A033DC 80240B9C C6220088 */ lwc1 $f2, 0x88($s1) -/* A033E0 80240BA0 468010A0 */ cvt.s.w $f2, $f2 -/* A033E4 80240BA4 460010A1 */ cvt.d.s $f2, $f2 -/* A033E8 80240BA8 46002121 */ cvt.d.s $f4, $f4 -/* A033EC 80240BAC C600003C */ lwc1 $f0, 0x3c($s0) -/* A033F0 80240BB0 3C014059 */ lui $at, 0x4059 -/* A033F4 80240BB4 44813800 */ mtc1 $at, $f7 -/* A033F8 80240BB8 44803000 */ mtc1 $zero, $f6 -/* A033FC 80240BBC 46000021 */ cvt.d.s $f0, $f0 -/* A03400 80240BC0 46260002 */ mul.d $f0, $f0, $f6 -/* A03404 80240BC4 00000000 */ nop -/* A03408 80240BC8 24020001 */ addiu $v0, $zero, 1 -/* A0340C 80240BCC 8E24006C */ lw $a0, 0x6c($s1) -/* A03410 80240BD0 46261083 */ div.d $f2, $f2, $f6 -/* A03414 80240BD4 462010A0 */ cvt.s.d $f2, $f2 -/* A03418 80240BD8 46262103 */ div.d $f4, $f4, $f6 -/* A0341C 80240BDC 46202520 */ cvt.s.d $f20, $f4 -/* A03420 80240BE0 30830011 */ andi $v1, $a0, 0x11 -/* A03424 80240BE4 4620020D */ trunc.w.d $f8, $f0 -/* A03428 80240BE8 E628007C */ swc1 $f8, 0x7c($s1) -/* A0342C 80240BEC C6200078 */ lwc1 $f0, 0x78($s1) -/* A03430 80240BF0 46800020 */ cvt.s.w $f0, $f0 -/* A03434 80240BF4 46000021 */ cvt.d.s $f0, $f0 -/* A03438 80240BF8 46260003 */ div.d $f0, $f0, $f6 -/* A0343C 80240BFC 462006A0 */ cvt.s.d $f26, $f0 -/* A03440 80240C00 C6200070 */ lwc1 $f0, 0x70($s1) -/* A03444 80240C04 46800020 */ cvt.s.w $f0, $f0 -/* A03448 80240C08 46000021 */ cvt.d.s $f0, $f0 -/* A0344C 80240C0C 46260003 */ div.d $f0, $f0, $f6 -/* A03450 80240C10 462005A0 */ cvt.s.d $f22, $f0 -/* A03454 80240C14 14620025 */ bne $v1, $v0, .L80240CAC -/* A03458 80240C18 4602D600 */ add.s $f24, $f26, $f2 -/* A0345C 80240C1C 8E020000 */ lw $v0, ($s0) -/* A03460 80240C20 30420008 */ andi $v0, $v0, 8 -/* A03464 80240C24 10400009 */ beqz $v0, .L80240C4C -/* A03468 80240C28 27A50028 */ addiu $a1, $sp, 0x28 -/* A0346C 80240C2C C600003C */ lwc1 $f0, 0x3c($s0) -/* A03470 80240C30 4600C001 */ sub.s $f0, $f24, $f0 -/* A03474 80240C34 4600B03C */ c.lt.s $f22, $f0 -/* A03478 80240C38 00000000 */ nop -/* A0347C 80240C3C 4500001B */ bc1f .L80240CAC -/* A03480 80240C40 34820010 */ ori $v0, $a0, 0x10 -/* A03484 80240C44 0809032B */ j .L80240CAC -/* A03488 80240C48 AE22006C */ sw $v0, 0x6c($s1) -.L80240C4C: -/* A0348C 80240C4C 27A6002C */ addiu $a2, $sp, 0x2c -/* A03490 80240C50 C6000038 */ lwc1 $f0, 0x38($s0) -/* A03494 80240C54 C602003C */ lwc1 $f2, 0x3c($s0) -/* A03498 80240C58 C6040040 */ lwc1 $f4, 0x40($s0) -/* A0349C 80240C5C 3C01447A */ lui $at, 0x447a -/* A034A0 80240C60 44813000 */ mtc1 $at, $f6 -/* A034A4 80240C64 27A20034 */ addiu $v0, $sp, 0x34 -/* A034A8 80240C68 E7A00028 */ swc1 $f0, 0x28($sp) -/* A034AC 80240C6C E7A2002C */ swc1 $f2, 0x2c($sp) -/* A034B0 80240C70 E7A40030 */ swc1 $f4, 0x30($sp) -/* A034B4 80240C74 E7A60034 */ swc1 $f6, 0x34($sp) -/* A034B8 80240C78 AFA20010 */ sw $v0, 0x10($sp) -/* A034BC 80240C7C 8E040080 */ lw $a0, 0x80($s0) -/* A034C0 80240C80 0C0372DF */ jal func_800DCB7C -/* A034C4 80240C84 27A70030 */ addiu $a3, $sp, 0x30 -/* A034C8 80240C88 C7A00034 */ lwc1 $f0, 0x34($sp) -/* A034CC 80240C8C 4600D001 */ sub.s $f0, $f26, $f0 -/* A034D0 80240C90 4600B03C */ c.lt.s $f22, $f0 -/* A034D4 80240C94 00000000 */ nop -/* A034D8 80240C98 45000004 */ bc1f .L80240CAC -/* A034DC 80240C9C 00000000 */ nop -/* A034E0 80240CA0 8E22006C */ lw $v0, 0x6c($s1) -/* A034E4 80240CA4 34420010 */ ori $v0, $v0, 0x10 -/* A034E8 80240CA8 AE22006C */ sw $v0, 0x6c($s1) -.L80240CAC: -/* A034EC 80240CAC 8E22006C */ lw $v0, 0x6c($s1) -/* A034F0 80240CB0 24030011 */ addiu $v1, $zero, 0x11 -/* A034F4 80240CB4 30420011 */ andi $v0, $v0, 0x11 -/* A034F8 80240CB8 14430039 */ bne $v0, $v1, .L80240DA0 -/* A034FC 80240CBC 00000000 */ nop -/* A03500 80240CC0 8E020000 */ lw $v0, ($s0) -/* A03504 80240CC4 30420008 */ andi $v0, $v0, 8 -/* A03508 80240CC8 1040000A */ beqz $v0, .L80240CF4 -/* A0350C 80240CCC 4600C106 */ mov.s $f4, $f24 -/* A03510 80240CD0 4614C081 */ sub.s $f2, $f24, $f20 -/* A03514 80240CD4 3C018024 */ lui $at, 0x8024 -/* A03518 80240CD8 D4204628 */ ldc1 $f0, 0x4628($at) -/* A0351C 80240CDC 460010A1 */ cvt.d.s $f2, $f2 -/* A03520 80240CE0 46201082 */ mul.d $f2, $f2, $f0 -/* A03524 80240CE4 00000000 */ nop -/* A03528 80240CE8 4600A021 */ cvt.d.s $f0, $f20 -/* A0352C 80240CEC 08090356 */ j .L80240D58 -/* A03530 80240CF0 46220000 */ add.d $f0, $f0, $f2 -.L80240CF4: -/* A03534 80240CF4 27A50028 */ addiu $a1, $sp, 0x28 -/* A03538 80240CF8 27A6002C */ addiu $a2, $sp, 0x2c -/* A0353C 80240CFC C6000038 */ lwc1 $f0, 0x38($s0) -/* A03540 80240D00 C6020040 */ lwc1 $f2, 0x40($s0) -/* A03544 80240D04 3C01447A */ lui $at, 0x447a -/* A03548 80240D08 44812000 */ mtc1 $at, $f4 -/* A0354C 80240D0C 27A20034 */ addiu $v0, $sp, 0x34 -/* A03550 80240D10 E7B4002C */ swc1 $f20, 0x2c($sp) -/* A03554 80240D14 E7A00028 */ swc1 $f0, 0x28($sp) -/* A03558 80240D18 E7A20030 */ swc1 $f2, 0x30($sp) -/* A0355C 80240D1C E7A40034 */ swc1 $f4, 0x34($sp) -/* A03560 80240D20 AFA20010 */ sw $v0, 0x10($sp) -/* A03564 80240D24 8E040080 */ lw $a0, 0x80($s0) -/* A03568 80240D28 0C0372DF */ jal func_800DCB7C -/* A0356C 80240D2C 27A70030 */ addiu $a3, $sp, 0x30 -/* A03570 80240D30 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* A03574 80240D34 461A2100 */ add.s $f4, $f4, $f26 -/* A03578 80240D38 46142081 */ sub.s $f2, $f4, $f20 -/* A0357C 80240D3C 3C018024 */ lui $at, 0x8024 -/* A03580 80240D40 D4204630 */ ldc1 $f0, 0x4630($at) -/* A03584 80240D44 460010A1 */ cvt.d.s $f2, $f2 -/* A03588 80240D48 46201082 */ mul.d $f2, $f2, $f0 -/* A0358C 80240D4C 00000000 */ nop -/* A03590 80240D50 4600A021 */ cvt.d.s $f0, $f20 -/* A03594 80240D54 46220000 */ add.d $f0, $f0, $f2 -.L80240D58: -/* A03598 80240D58 46200020 */ cvt.s.d $f0, $f0 -/* A0359C 80240D5C E600003C */ swc1 $f0, 0x3c($s0) -/* A035A0 80240D60 C600003C */ lwc1 $f0, 0x3c($s0) -/* A035A4 80240D64 46002001 */ sub.s $f0, $f4, $f0 -/* A035A8 80240D68 3C013FF0 */ lui $at, 0x3ff0 -/* A035AC 80240D6C 44811800 */ mtc1 $at, $f3 -/* A035B0 80240D70 44801000 */ mtc1 $zero, $f2 -/* A035B4 80240D74 46000005 */ abs.s $f0, $f0 -/* A035B8 80240D78 46000021 */ cvt.d.s $f0, $f0 -/* A035BC 80240D7C 4622003C */ c.lt.d $f0, $f2 -/* A035C0 80240D80 00000000 */ nop -/* A035C4 80240D84 45000036 */ bc1f .L80240E60 -/* A035C8 80240D88 2403FFEF */ addiu $v1, $zero, -0x11 -/* A035CC 80240D8C E604003C */ swc1 $f4, 0x3c($s0) -/* A035D0 80240D90 8E22006C */ lw $v0, 0x6c($s1) -/* A035D4 80240D94 00431024 */ and $v0, $v0, $v1 -/* A035D8 80240D98 08090398 */ j .L80240E60 -/* A035DC 80240D9C AE22006C */ sw $v0, 0x6c($s1) -.L80240DA0: -/* A035E0 80240DA0 8E220070 */ lw $v0, 0x70($s1) -/* A035E4 80240DA4 1840002E */ blez $v0, .L80240E60 -/* A035E8 80240DA8 00000000 */ nop -/* A035EC 80240DAC C62C0074 */ lwc1 $f12, 0x74($s1) -/* A035F0 80240DB0 0C00A8BB */ jal sin_deg -/* A035F4 80240DB4 46806320 */ cvt.s.w $f12, $f12 -/* A035F8 80240DB8 8E020000 */ lw $v0, ($s0) -/* A035FC 80240DBC 30420008 */ andi $v0, $v0, 8 -/* A03600 80240DC0 10400003 */ beqz $v0, .L80240DD0 -/* A03604 80240DC4 46000506 */ mov.s $f20, $f0 -/* A03608 80240DC8 08090384 */ j .L80240E10 -/* A0360C 80240DCC 0000102D */ daddu $v0, $zero, $zero -.L80240DD0: -/* A03610 80240DD0 27A50028 */ addiu $a1, $sp, 0x28 -/* A03614 80240DD4 27A6002C */ addiu $a2, $sp, 0x2c -/* A03618 80240DD8 C6000038 */ lwc1 $f0, 0x38($s0) -/* A0361C 80240DDC C602003C */ lwc1 $f2, 0x3c($s0) -/* A03620 80240DE0 C6040040 */ lwc1 $f4, 0x40($s0) -/* A03624 80240DE4 3C01447A */ lui $at, 0x447a -/* A03628 80240DE8 44813000 */ mtc1 $at, $f6 -/* A0362C 80240DEC 27A20034 */ addiu $v0, $sp, 0x34 -/* A03630 80240DF0 E7A00028 */ swc1 $f0, 0x28($sp) -/* A03634 80240DF4 E7A2002C */ swc1 $f2, 0x2c($sp) -/* A03638 80240DF8 E7A40030 */ swc1 $f4, 0x30($sp) -/* A0363C 80240DFC E7A60034 */ swc1 $f6, 0x34($sp) -/* A03640 80240E00 AFA20010 */ sw $v0, 0x10($sp) -/* A03644 80240E04 8E040080 */ lw $a0, 0x80($s0) -/* A03648 80240E08 0C0372DF */ jal func_800DCB7C -/* A0364C 80240E0C 27A70030 */ addiu $a3, $sp, 0x30 -.L80240E10: -/* A03650 80240E10 10400007 */ beqz $v0, .L80240E30 -/* A03654 80240E14 00000000 */ nop -/* A03658 80240E18 4616A082 */ mul.s $f2, $f20, $f22 -/* A0365C 80240E1C 00000000 */ nop -/* A03660 80240E20 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A03664 80240E24 461A0000 */ add.s $f0, $f0, $f26 -/* A03668 80240E28 0809038F */ j .L80240E3C -/* A0366C 80240E2C 46020000 */ add.s $f0, $f0, $f2 -.L80240E30: -/* A03670 80240E30 4616A002 */ mul.s $f0, $f20, $f22 -/* A03674 80240E34 00000000 */ nop -/* A03678 80240E38 4600C000 */ add.s $f0, $f24, $f0 -.L80240E3C: -/* A0367C 80240E3C E600003C */ swc1 $f0, 0x3c($s0) -/* A03680 80240E40 8E220074 */ lw $v0, 0x74($s1) -/* A03684 80240E44 2442000A */ addiu $v0, $v0, 0xa -/* A03688 80240E48 44826000 */ mtc1 $v0, $f12 -/* A0368C 80240E4C 00000000 */ nop -/* A03690 80240E50 0C00A6C9 */ jal clamp_angle -/* A03694 80240E54 46806320 */ cvt.s.w $f12, $f12 -/* A03698 80240E58 4600020D */ trunc.w.s $f8, $f0 -/* A0369C 80240E5C E6280074 */ swc1 $f8, 0x74($s1) -.L80240E60: -/* A036A0 80240E60 8E220090 */ lw $v0, 0x90($s1) -/* A036A4 80240E64 1C40004A */ bgtz $v0, .L80240F90 -/* A036A8 80240E68 2442FFFF */ addiu $v0, $v0, -1 -/* A036AC 80240E6C 8E430014 */ lw $v1, 0x14($s2) -/* A036B0 80240E70 04600048 */ bltz $v1, .L80240F94 -/* A036B4 80240E74 00000000 */ nop -/* A036B8 80240E78 8E620074 */ lw $v0, 0x74($s3) -/* A036BC 80240E7C 1C400042 */ bgtz $v0, .L80240F88 -/* A036C0 80240E80 2442FFFF */ addiu $v0, $v0, -1 -/* A036C4 80240E84 AE630074 */ sw $v1, 0x74($s3) -/* A036C8 80240E88 860200A8 */ lh $v0, 0xa8($s0) -/* A036CC 80240E8C C602003C */ lwc1 $f2, 0x3c($s0) -/* A036D0 80240E90 44820000 */ mtc1 $v0, $f0 -/* A036D4 80240E94 00000000 */ nop -/* A036D8 80240E98 46800020 */ cvt.s.w $f0, $f0 -/* A036DC 80240E9C 46001080 */ add.s $f2, $f2, $f0 -/* A036E0 80240EA0 3C014024 */ lui $at, 0x4024 -/* A036E4 80240EA4 44810800 */ mtc1 $at, $f1 -/* A036E8 80240EA8 44800000 */ mtc1 $zero, $f0 -/* A036EC 80240EAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A036F0 80240EB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A036F4 80240EB4 460010A1 */ cvt.d.s $f2, $f2 -/* A036F8 80240EB8 46201080 */ add.d $f2, $f2, $f0 -/* A036FC 80240EBC C440002C */ lwc1 $f0, 0x2c($v0) -/* A03700 80240EC0 46000021 */ cvt.d.s $f0, $f0 -/* A03704 80240EC4 4622003C */ c.lt.d $f0, $f2 -/* A03708 80240EC8 00000000 */ nop -/* A0370C 80240ECC 4500002C */ bc1f .L80240F80 -/* A03710 80240ED0 02A0202D */ daddu $a0, $s5, $zero -/* A03714 80240ED4 AFA00010 */ sw $zero, 0x10($sp) -/* A03718 80240ED8 8E46000C */ lw $a2, 0xc($s2) -/* A0371C 80240EDC 8E470010 */ lw $a3, 0x10($s2) -/* A03720 80240EE0 0C01242D */ jal func_800490B4 -/* A03724 80240EE4 0220282D */ daddu $a1, $s1, $zero -/* A03728 80240EE8 10400025 */ beqz $v0, .L80240F80 -/* A0372C 80240EEC 0000202D */ daddu $a0, $zero, $zero -/* A03730 80240EF0 0200282D */ daddu $a1, $s0, $zero -/* A03734 80240EF4 0000302D */ daddu $a2, $zero, $zero -/* A03738 80240EF8 2412000C */ addiu $s2, $zero, 0xc -/* A0373C 80240EFC 860300A8 */ lh $v1, 0xa8($s0) -/* A03740 80240F00 3C013F80 */ lui $at, 0x3f80 -/* A03744 80240F04 44810000 */ mtc1 $at, $f0 -/* A03748 80240F08 3C014000 */ lui $at, 0x4000 -/* A0374C 80240F0C 44811000 */ mtc1 $at, $f2 -/* A03750 80240F10 3C01C1A0 */ lui $at, 0xc1a0 -/* A03754 80240F14 44812000 */ mtc1 $at, $f4 -/* A03758 80240F18 44834000 */ mtc1 $v1, $f8 -/* A0375C 80240F1C 00000000 */ nop -/* A03760 80240F20 46804220 */ cvt.s.w $f8, $f8 -/* A03764 80240F24 44074000 */ mfc1 $a3, $f8 -/* A03768 80240F28 27A20038 */ addiu $v0, $sp, 0x38 -/* A0376C 80240F2C AFB2001C */ sw $s2, 0x1c($sp) -/* A03770 80240F30 AFA20020 */ sw $v0, 0x20($sp) -/* A03774 80240F34 E7A00010 */ swc1 $f0, 0x10($sp) -/* A03778 80240F38 E7A20014 */ swc1 $f2, 0x14($sp) -/* A0377C 80240F3C 0C01BFA4 */ jal fx_emote -/* A03780 80240F40 E7A40018 */ swc1 $f4, 0x18($sp) -/* A03784 80240F44 0200202D */ daddu $a0, $s0, $zero -/* A03788 80240F48 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A0378C 80240F4C C480003C */ lwc1 $f0, 0x3c($a0) -/* A03790 80240F50 3C060020 */ lui $a2, 0x20 -/* A03794 80240F54 0C012530 */ jal func_800494C0 -/* A03798 80240F58 E4800064 */ swc1 $f0, 0x64($a0) -/* A0379C 80240F5C 8E220018 */ lw $v0, 0x18($s1) -/* A037A0 80240F60 9442002A */ lhu $v0, 0x2a($v0) -/* A037A4 80240F64 30420001 */ andi $v0, $v0, 1 -/* A037A8 80240F68 10400003 */ beqz $v0, .L80240F78 -/* A037AC 80240F6C 2402000A */ addiu $v0, $zero, 0xa -/* A037B0 80240F70 0809044E */ j .L80241138 -/* A037B4 80240F74 AE620070 */ sw $v0, 0x70($s3) -.L80240F78: -/* A037B8 80240F78 0809044E */ j .L80241138 -/* A037BC 80240F7C AE720070 */ sw $s2, 0x70($s3) -.L80240F80: -/* A037C0 80240F80 8E620074 */ lw $v0, 0x74($s3) -/* A037C4 80240F84 2442FFFF */ addiu $v0, $v0, -1 -.L80240F88: -/* A037C8 80240F88 080903E5 */ j .L80240F94 -/* A037CC 80240F8C AE620074 */ sw $v0, 0x74($s3) -.L80240F90: -/* A037D0 80240F90 AE220090 */ sw $v0, 0x90($s1) -.L80240F94: -/* A037D4 80240F94 8E2300D0 */ lw $v1, 0xd0($s1) -/* A037D8 80240F98 C6000040 */ lwc1 $f0, 0x40($s0) -/* A037DC 80240F9C C4620000 */ lwc1 $f2, ($v1) -/* A037E0 80240FA0 468010A0 */ cvt.s.w $f2, $f2 -/* A037E4 80240FA4 C4640008 */ lwc1 $f4, 8($v1) -/* A037E8 80240FA8 46802120 */ cvt.s.w $f4, $f4 -/* A037EC 80240FAC E7A00010 */ swc1 $f0, 0x10($sp) -/* A037F0 80240FB0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A037F4 80240FB4 44051000 */ mfc1 $a1, $f2 -/* A037F8 80240FB8 C440000C */ lwc1 $f0, 0xc($v0) -/* A037FC 80240FBC 46800020 */ cvt.s.w $f0, $f0 -/* A03800 80240FC0 E7A00014 */ swc1 $f0, 0x14($sp) -/* A03804 80240FC4 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03808 80240FC8 44062000 */ mfc1 $a2, $f4 -/* A0380C 80240FCC C4400010 */ lwc1 $f0, 0x10($v0) -/* A03810 80240FD0 46800020 */ cvt.s.w $f0, $f0 -/* A03814 80240FD4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A03818 80240FD8 8C640018 */ lw $a0, 0x18($v1) -/* A0381C 80240FDC 0C0123F5 */ jal is_point_within_region -/* A03820 80240FE0 8E070038 */ lw $a3, 0x38($s0) -/* A03824 80240FE4 1040001A */ beqz $v0, .L80241050 -/* A03828 80240FE8 00000000 */ nop -/* A0382C 80240FEC 8E060038 */ lw $a2, 0x38($s0) -/* A03830 80240FF0 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03834 80240FF4 8E070040 */ lw $a3, 0x40($s0) -/* A03838 80240FF8 C44C0000 */ lwc1 $f12, ($v0) -/* A0383C 80240FFC 46806320 */ cvt.s.w $f12, $f12 -/* A03840 80241000 C44E0008 */ lwc1 $f14, 8($v0) -/* A03844 80241004 0C00A7B5 */ jal dist2D -/* A03848 80241008 468073A0 */ cvt.s.w $f14, $f14 -/* A0384C 8024100C C6020018 */ lwc1 $f2, 0x18($s0) -/* A03850 80241010 4600103C */ c.lt.s $f2, $f0 -/* A03854 80241014 00000000 */ nop -/* A03858 80241018 4500000D */ bc1f .L80241050 -/* A0385C 8024101C E7A00034 */ swc1 $f0, 0x34($sp) -/* A03860 80241020 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A03864 80241024 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03868 80241028 C60E0040 */ lwc1 $f14, 0x40($s0) -/* A0386C 8024102C C4480000 */ lwc1 $f8, ($v0) -/* A03870 80241030 46804220 */ cvt.s.w $f8, $f8 -/* A03874 80241034 44064000 */ mfc1 $a2, $f8 -/* A03878 80241038 C4480008 */ lwc1 $f8, 8($v0) -/* A0387C 8024103C 46804220 */ cvt.s.w $f8, $f8 -/* A03880 80241040 44074000 */ mfc1 $a3, $f8 -/* A03884 80241044 0C00A720 */ jal atan2 -/* A03888 80241048 24140001 */ addiu $s4, $zero, 1 -/* A0388C 8024104C E600000C */ swc1 $f0, 0xc($s0) -.L80241050: -/* A03890 80241050 8E2200D0 */ lw $v0, 0xd0($s1) -/* A03894 80241054 8C43000C */ lw $v1, 0xc($v0) -/* A03898 80241058 8C420010 */ lw $v0, 0x10($v0) -/* A0389C 8024105C 00621825 */ or $v1, $v1, $v0 -/* A038A0 80241060 00741825 */ or $v1, $v1, $s4 -/* A038A4 80241064 10600008 */ beqz $v1, .L80241088 -/* A038A8 80241068 00000000 */ nop -/* A038AC 8024106C 8602008C */ lh $v0, 0x8c($s0) -/* A038B0 80241070 14400031 */ bnez $v0, .L80241138 -/* A038B4 80241074 00000000 */ nop -/* A038B8 80241078 8E050018 */ lw $a1, 0x18($s0) -/* A038BC 8024107C 8E06000C */ lw $a2, 0xc($s0) -/* A038C0 80241080 0C00EA95 */ jal npc_move_heading -/* A038C4 80241084 0200202D */ daddu $a0, $s0, $zero -.L80241088: -/* A038C8 80241088 C600003C */ lwc1 $f0, 0x3c($s0) -/* A038CC 8024108C 3C014059 */ lui $at, 0x4059 -/* A038D0 80241090 44811800 */ mtc1 $at, $f3 -/* A038D4 80241094 44801000 */ mtc1 $zero, $f2 -/* A038D8 80241098 46000021 */ cvt.d.s $f0, $f0 -/* A038DC 8024109C 46220002 */ mul.d $f0, $f0, $f2 -/* A038E0 802410A0 00000000 */ nop -/* A038E4 802410A4 4620020D */ trunc.w.d $f8, $f0 -/* A038E8 802410A8 E628007C */ swc1 $f8, 0x7c($s1) -/* A038EC 802410AC 8E420004 */ lw $v0, 4($s2) -/* A038F0 802410B0 18400021 */ blez $v0, .L80241138 -/* A038F4 802410B4 00000000 */ nop -/* A038F8 802410B8 8602008E */ lh $v0, 0x8e($s0) -/* A038FC 802410BC 9603008E */ lhu $v1, 0x8e($s0) -/* A03900 802410C0 18400005 */ blez $v0, .L802410D8 -/* A03904 802410C4 2462FFFF */ addiu $v0, $v1, -1 -/* A03908 802410C8 A602008E */ sh $v0, 0x8e($s0) -/* A0390C 802410CC 00021400 */ sll $v0, $v0, 0x10 -/* A03910 802410D0 1C400019 */ bgtz $v0, .L80241138 -/* A03914 802410D4 00000000 */ nop -.L802410D8: -/* A03918 802410D8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A0391C 802410DC 24020002 */ addiu $v0, $zero, 2 -/* A03920 802410E0 0C00A67F */ jal rand_int -/* A03924 802410E4 AE620070 */ sw $v0, 0x70($s3) -/* A03928 802410E8 3C035555 */ lui $v1, 0x5555 -/* A0392C 802410EC 34635556 */ ori $v1, $v1, 0x5556 -/* A03930 802410F0 00430018 */ mult $v0, $v1 -/* A03934 802410F4 000227C3 */ sra $a0, $v0, 0x1f -/* A03938 802410F8 00004010 */ mfhi $t0 -/* A0393C 802410FC 01042023 */ subu $a0, $t0, $a0 -/* A03940 80241100 00041840 */ sll $v1, $a0, 1 -/* A03944 80241104 00641821 */ addu $v1, $v1, $a0 -/* A03948 80241108 00431023 */ subu $v0, $v0, $v1 -/* A0394C 8024110C 24430002 */ addiu $v1, $v0, 2 -/* A03950 80241110 AE630074 */ sw $v1, 0x74($s3) -/* A03954 80241114 8E42002C */ lw $v0, 0x2c($s2) -/* A03958 80241118 58400007 */ blezl $v0, .L80241138 -/* A0395C 8024111C AE600070 */ sw $zero, 0x70($s3) -/* A03960 80241120 8E420008 */ lw $v0, 8($s2) -/* A03964 80241124 18400003 */ blez $v0, .L80241134 -/* A03968 80241128 28620003 */ slti $v0, $v1, 3 -/* A0396C 8024112C 10400002 */ beqz $v0, .L80241138 -/* A03970 80241130 00000000 */ nop -.L80241134: -/* A03974 80241134 AE600070 */ sw $zero, 0x70($s3) -.L80241138: -/* A03978 80241138 8FBF0058 */ lw $ra, 0x58($sp) -/* A0397C 8024113C 8FB50054 */ lw $s5, 0x54($sp) -/* A03980 80241140 8FB40050 */ lw $s4, 0x50($sp) -/* A03984 80241144 8FB3004C */ lw $s3, 0x4c($sp) -/* A03988 80241148 8FB20048 */ lw $s2, 0x48($sp) -/* A0398C 8024114C 8FB10044 */ lw $s1, 0x44($sp) -/* A03990 80241150 8FB00040 */ lw $s0, 0x40($sp) -/* A03994 80241154 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A03998 80241158 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A0399C 8024115C D7B60068 */ ldc1 $f22, 0x68($sp) -/* A039A0 80241160 D7B40060 */ ldc1 $f20, 0x60($sp) -/* A039A4 80241164 03E00008 */ jr $ra -/* A039A8 80241168 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s new file mode 100644 index 0000000000..3134bb23b5 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80240B44_A03384.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B44_A03384 +/* A03384 80240B44 27BDFF80 */ addiu $sp, $sp, -0x80 +/* A03388 80240B48 AFB3004C */ sw $s3, 0x4c($sp) +/* A0338C 80240B4C 0080982D */ daddu $s3, $a0, $zero +/* A03390 80240B50 AFBF0058 */ sw $ra, 0x58($sp) +/* A03394 80240B54 AFB50054 */ sw $s5, 0x54($sp) +/* A03398 80240B58 AFB40050 */ sw $s4, 0x50($sp) +/* A0339C 80240B5C AFB20048 */ sw $s2, 0x48($sp) +/* A033A0 80240B60 AFB10044 */ sw $s1, 0x44($sp) +/* A033A4 80240B64 AFB00040 */ sw $s0, 0x40($sp) +/* A033A8 80240B68 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* A033AC 80240B6C F7B80070 */ sdc1 $f24, 0x70($sp) +/* A033B0 80240B70 F7B60068 */ sdc1 $f22, 0x68($sp) +/* A033B4 80240B74 F7B40060 */ sdc1 $f20, 0x60($sp) +/* A033B8 80240B78 8E710148 */ lw $s1, 0x148($s3) +/* A033BC 80240B7C 00A0902D */ daddu $s2, $a1, $zero +/* A033C0 80240B80 86240008 */ lh $a0, 8($s1) +/* A033C4 80240B84 0C00EABB */ jal get_npc_unsafe +/* A033C8 80240B88 00C0A82D */ daddu $s5, $a2, $zero +/* A033CC 80240B8C 0040802D */ daddu $s0, $v0, $zero +/* A033D0 80240B90 0000A02D */ daddu $s4, $zero, $zero +/* A033D4 80240B94 C624007C */ lwc1 $f4, 0x7c($s1) +/* A033D8 80240B98 46802120 */ cvt.s.w $f4, $f4 +/* A033DC 80240B9C C6220088 */ lwc1 $f2, 0x88($s1) +/* A033E0 80240BA0 468010A0 */ cvt.s.w $f2, $f2 +/* A033E4 80240BA4 460010A1 */ cvt.d.s $f2, $f2 +/* A033E8 80240BA8 46002121 */ cvt.d.s $f4, $f4 +/* A033EC 80240BAC C600003C */ lwc1 $f0, 0x3c($s0) +/* A033F0 80240BB0 3C014059 */ lui $at, 0x4059 +/* A033F4 80240BB4 44813800 */ mtc1 $at, $f7 +/* A033F8 80240BB8 44803000 */ mtc1 $zero, $f6 +/* A033FC 80240BBC 46000021 */ cvt.d.s $f0, $f0 +/* A03400 80240BC0 46260002 */ mul.d $f0, $f0, $f6 +/* A03404 80240BC4 00000000 */ nop +/* A03408 80240BC8 24020001 */ addiu $v0, $zero, 1 +/* A0340C 80240BCC 8E24006C */ lw $a0, 0x6c($s1) +/* A03410 80240BD0 46261083 */ div.d $f2, $f2, $f6 +/* A03414 80240BD4 462010A0 */ cvt.s.d $f2, $f2 +/* A03418 80240BD8 46262103 */ div.d $f4, $f4, $f6 +/* A0341C 80240BDC 46202520 */ cvt.s.d $f20, $f4 +/* A03420 80240BE0 30830011 */ andi $v1, $a0, 0x11 +/* A03424 80240BE4 4620020D */ trunc.w.d $f8, $f0 +/* A03428 80240BE8 E628007C */ swc1 $f8, 0x7c($s1) +/* A0342C 80240BEC C6200078 */ lwc1 $f0, 0x78($s1) +/* A03430 80240BF0 46800020 */ cvt.s.w $f0, $f0 +/* A03434 80240BF4 46000021 */ cvt.d.s $f0, $f0 +/* A03438 80240BF8 46260003 */ div.d $f0, $f0, $f6 +/* A0343C 80240BFC 462006A0 */ cvt.s.d $f26, $f0 +/* A03440 80240C00 C6200070 */ lwc1 $f0, 0x70($s1) +/* A03444 80240C04 46800020 */ cvt.s.w $f0, $f0 +/* A03448 80240C08 46000021 */ cvt.d.s $f0, $f0 +/* A0344C 80240C0C 46260003 */ div.d $f0, $f0, $f6 +/* A03450 80240C10 462005A0 */ cvt.s.d $f22, $f0 +/* A03454 80240C14 14620025 */ bne $v1, $v0, .L80240CAC +/* A03458 80240C18 4602D600 */ add.s $f24, $f26, $f2 +/* A0345C 80240C1C 8E020000 */ lw $v0, ($s0) +/* A03460 80240C20 30420008 */ andi $v0, $v0, 8 +/* A03464 80240C24 10400009 */ beqz $v0, .L80240C4C +/* A03468 80240C28 27A50028 */ addiu $a1, $sp, 0x28 +/* A0346C 80240C2C C600003C */ lwc1 $f0, 0x3c($s0) +/* A03470 80240C30 4600C001 */ sub.s $f0, $f24, $f0 +/* A03474 80240C34 4600B03C */ c.lt.s $f22, $f0 +/* A03478 80240C38 00000000 */ nop +/* A0347C 80240C3C 4500001B */ bc1f .L80240CAC +/* A03480 80240C40 34820010 */ ori $v0, $a0, 0x10 +/* A03484 80240C44 0809032B */ j .L80240CAC +/* A03488 80240C48 AE22006C */ sw $v0, 0x6c($s1) +.L80240C4C: +/* A0348C 80240C4C 27A6002C */ addiu $a2, $sp, 0x2c +/* A03490 80240C50 C6000038 */ lwc1 $f0, 0x38($s0) +/* A03494 80240C54 C602003C */ lwc1 $f2, 0x3c($s0) +/* A03498 80240C58 C6040040 */ lwc1 $f4, 0x40($s0) +/* A0349C 80240C5C 3C01447A */ lui $at, 0x447a +/* A034A0 80240C60 44813000 */ mtc1 $at, $f6 +/* A034A4 80240C64 27A20034 */ addiu $v0, $sp, 0x34 +/* A034A8 80240C68 E7A00028 */ swc1 $f0, 0x28($sp) +/* A034AC 80240C6C E7A2002C */ swc1 $f2, 0x2c($sp) +/* A034B0 80240C70 E7A40030 */ swc1 $f4, 0x30($sp) +/* A034B4 80240C74 E7A60034 */ swc1 $f6, 0x34($sp) +/* A034B8 80240C78 AFA20010 */ sw $v0, 0x10($sp) +/* A034BC 80240C7C 8E040080 */ lw $a0, 0x80($s0) +/* A034C0 80240C80 0C0372DF */ jal func_800DCB7C +/* A034C4 80240C84 27A70030 */ addiu $a3, $sp, 0x30 +/* A034C8 80240C88 C7A00034 */ lwc1 $f0, 0x34($sp) +/* A034CC 80240C8C 4600D001 */ sub.s $f0, $f26, $f0 +/* A034D0 80240C90 4600B03C */ c.lt.s $f22, $f0 +/* A034D4 80240C94 00000000 */ nop +/* A034D8 80240C98 45000004 */ bc1f .L80240CAC +/* A034DC 80240C9C 00000000 */ nop +/* A034E0 80240CA0 8E22006C */ lw $v0, 0x6c($s1) +/* A034E4 80240CA4 34420010 */ ori $v0, $v0, 0x10 +/* A034E8 80240CA8 AE22006C */ sw $v0, 0x6c($s1) +.L80240CAC: +/* A034EC 80240CAC 8E22006C */ lw $v0, 0x6c($s1) +/* A034F0 80240CB0 24030011 */ addiu $v1, $zero, 0x11 +/* A034F4 80240CB4 30420011 */ andi $v0, $v0, 0x11 +/* A034F8 80240CB8 14430039 */ bne $v0, $v1, .L80240DA0 +/* A034FC 80240CBC 00000000 */ nop +/* A03500 80240CC0 8E020000 */ lw $v0, ($s0) +/* A03504 80240CC4 30420008 */ andi $v0, $v0, 8 +/* A03508 80240CC8 1040000A */ beqz $v0, .L80240CF4 +/* A0350C 80240CCC 4600C106 */ mov.s $f4, $f24 +/* A03510 80240CD0 4614C081 */ sub.s $f2, $f24, $f20 +/* A03514 80240CD4 3C018024 */ lui $at, 0x8024 +/* A03518 80240CD8 D4204628 */ ldc1 $f0, 0x4628($at) +/* A0351C 80240CDC 460010A1 */ cvt.d.s $f2, $f2 +/* A03520 80240CE0 46201082 */ mul.d $f2, $f2, $f0 +/* A03524 80240CE4 00000000 */ nop +/* A03528 80240CE8 4600A021 */ cvt.d.s $f0, $f20 +/* A0352C 80240CEC 08090356 */ j .L80240D58 +/* A03530 80240CF0 46220000 */ add.d $f0, $f0, $f2 +.L80240CF4: +/* A03534 80240CF4 27A50028 */ addiu $a1, $sp, 0x28 +/* A03538 80240CF8 27A6002C */ addiu $a2, $sp, 0x2c +/* A0353C 80240CFC C6000038 */ lwc1 $f0, 0x38($s0) +/* A03540 80240D00 C6020040 */ lwc1 $f2, 0x40($s0) +/* A03544 80240D04 3C01447A */ lui $at, 0x447a +/* A03548 80240D08 44812000 */ mtc1 $at, $f4 +/* A0354C 80240D0C 27A20034 */ addiu $v0, $sp, 0x34 +/* A03550 80240D10 E7B4002C */ swc1 $f20, 0x2c($sp) +/* A03554 80240D14 E7A00028 */ swc1 $f0, 0x28($sp) +/* A03558 80240D18 E7A20030 */ swc1 $f2, 0x30($sp) +/* A0355C 80240D1C E7A40034 */ swc1 $f4, 0x34($sp) +/* A03560 80240D20 AFA20010 */ sw $v0, 0x10($sp) +/* A03564 80240D24 8E040080 */ lw $a0, 0x80($s0) +/* A03568 80240D28 0C0372DF */ jal func_800DCB7C +/* A0356C 80240D2C 27A70030 */ addiu $a3, $sp, 0x30 +/* A03570 80240D30 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* A03574 80240D34 461A2100 */ add.s $f4, $f4, $f26 +/* A03578 80240D38 46142081 */ sub.s $f2, $f4, $f20 +/* A0357C 80240D3C 3C018024 */ lui $at, 0x8024 +/* A03580 80240D40 D4204630 */ ldc1 $f0, 0x4630($at) +/* A03584 80240D44 460010A1 */ cvt.d.s $f2, $f2 +/* A03588 80240D48 46201082 */ mul.d $f2, $f2, $f0 +/* A0358C 80240D4C 00000000 */ nop +/* A03590 80240D50 4600A021 */ cvt.d.s $f0, $f20 +/* A03594 80240D54 46220000 */ add.d $f0, $f0, $f2 +.L80240D58: +/* A03598 80240D58 46200020 */ cvt.s.d $f0, $f0 +/* A0359C 80240D5C E600003C */ swc1 $f0, 0x3c($s0) +/* A035A0 80240D60 C600003C */ lwc1 $f0, 0x3c($s0) +/* A035A4 80240D64 46002001 */ sub.s $f0, $f4, $f0 +/* A035A8 80240D68 3C013FF0 */ lui $at, 0x3ff0 +/* A035AC 80240D6C 44811800 */ mtc1 $at, $f3 +/* A035B0 80240D70 44801000 */ mtc1 $zero, $f2 +/* A035B4 80240D74 46000005 */ abs.s $f0, $f0 +/* A035B8 80240D78 46000021 */ cvt.d.s $f0, $f0 +/* A035BC 80240D7C 4622003C */ c.lt.d $f0, $f2 +/* A035C0 80240D80 00000000 */ nop +/* A035C4 80240D84 45000036 */ bc1f .L80240E60 +/* A035C8 80240D88 2403FFEF */ addiu $v1, $zero, -0x11 +/* A035CC 80240D8C E604003C */ swc1 $f4, 0x3c($s0) +/* A035D0 80240D90 8E22006C */ lw $v0, 0x6c($s1) +/* A035D4 80240D94 00431024 */ and $v0, $v0, $v1 +/* A035D8 80240D98 08090398 */ j .L80240E60 +/* A035DC 80240D9C AE22006C */ sw $v0, 0x6c($s1) +.L80240DA0: +/* A035E0 80240DA0 8E220070 */ lw $v0, 0x70($s1) +/* A035E4 80240DA4 1840002E */ blez $v0, .L80240E60 +/* A035E8 80240DA8 00000000 */ nop +/* A035EC 80240DAC C62C0074 */ lwc1 $f12, 0x74($s1) +/* A035F0 80240DB0 0C00A8BB */ jal sin_deg +/* A035F4 80240DB4 46806320 */ cvt.s.w $f12, $f12 +/* A035F8 80240DB8 8E020000 */ lw $v0, ($s0) +/* A035FC 80240DBC 30420008 */ andi $v0, $v0, 8 +/* A03600 80240DC0 10400003 */ beqz $v0, .L80240DD0 +/* A03604 80240DC4 46000506 */ mov.s $f20, $f0 +/* A03608 80240DC8 08090384 */ j .L80240E10 +/* A0360C 80240DCC 0000102D */ daddu $v0, $zero, $zero +.L80240DD0: +/* A03610 80240DD0 27A50028 */ addiu $a1, $sp, 0x28 +/* A03614 80240DD4 27A6002C */ addiu $a2, $sp, 0x2c +/* A03618 80240DD8 C6000038 */ lwc1 $f0, 0x38($s0) +/* A0361C 80240DDC C602003C */ lwc1 $f2, 0x3c($s0) +/* A03620 80240DE0 C6040040 */ lwc1 $f4, 0x40($s0) +/* A03624 80240DE4 3C01447A */ lui $at, 0x447a +/* A03628 80240DE8 44813000 */ mtc1 $at, $f6 +/* A0362C 80240DEC 27A20034 */ addiu $v0, $sp, 0x34 +/* A03630 80240DF0 E7A00028 */ swc1 $f0, 0x28($sp) +/* A03634 80240DF4 E7A2002C */ swc1 $f2, 0x2c($sp) +/* A03638 80240DF8 E7A40030 */ swc1 $f4, 0x30($sp) +/* A0363C 80240DFC E7A60034 */ swc1 $f6, 0x34($sp) +/* A03640 80240E00 AFA20010 */ sw $v0, 0x10($sp) +/* A03644 80240E04 8E040080 */ lw $a0, 0x80($s0) +/* A03648 80240E08 0C0372DF */ jal func_800DCB7C +/* A0364C 80240E0C 27A70030 */ addiu $a3, $sp, 0x30 +.L80240E10: +/* A03650 80240E10 10400007 */ beqz $v0, .L80240E30 +/* A03654 80240E14 00000000 */ nop +/* A03658 80240E18 4616A082 */ mul.s $f2, $f20, $f22 +/* A0365C 80240E1C 00000000 */ nop +/* A03660 80240E20 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A03664 80240E24 461A0000 */ add.s $f0, $f0, $f26 +/* A03668 80240E28 0809038F */ j .L80240E3C +/* A0366C 80240E2C 46020000 */ add.s $f0, $f0, $f2 +.L80240E30: +/* A03670 80240E30 4616A002 */ mul.s $f0, $f20, $f22 +/* A03674 80240E34 00000000 */ nop +/* A03678 80240E38 4600C000 */ add.s $f0, $f24, $f0 +.L80240E3C: +/* A0367C 80240E3C E600003C */ swc1 $f0, 0x3c($s0) +/* A03680 80240E40 8E220074 */ lw $v0, 0x74($s1) +/* A03684 80240E44 2442000A */ addiu $v0, $v0, 0xa +/* A03688 80240E48 44826000 */ mtc1 $v0, $f12 +/* A0368C 80240E4C 00000000 */ nop +/* A03690 80240E50 0C00A6C9 */ jal clamp_angle +/* A03694 80240E54 46806320 */ cvt.s.w $f12, $f12 +/* A03698 80240E58 4600020D */ trunc.w.s $f8, $f0 +/* A0369C 80240E5C E6280074 */ swc1 $f8, 0x74($s1) +.L80240E60: +/* A036A0 80240E60 8E220090 */ lw $v0, 0x90($s1) +/* A036A4 80240E64 1C40004A */ bgtz $v0, .L80240F90 +/* A036A8 80240E68 2442FFFF */ addiu $v0, $v0, -1 +/* A036AC 80240E6C 8E430014 */ lw $v1, 0x14($s2) +/* A036B0 80240E70 04600048 */ bltz $v1, .L80240F94 +/* A036B4 80240E74 00000000 */ nop +/* A036B8 80240E78 8E620074 */ lw $v0, 0x74($s3) +/* A036BC 80240E7C 1C400042 */ bgtz $v0, .L80240F88 +/* A036C0 80240E80 2442FFFF */ addiu $v0, $v0, -1 +/* A036C4 80240E84 AE630074 */ sw $v1, 0x74($s3) +/* A036C8 80240E88 860200A8 */ lh $v0, 0xa8($s0) +/* A036CC 80240E8C C602003C */ lwc1 $f2, 0x3c($s0) +/* A036D0 80240E90 44820000 */ mtc1 $v0, $f0 +/* A036D4 80240E94 00000000 */ nop +/* A036D8 80240E98 46800020 */ cvt.s.w $f0, $f0 +/* A036DC 80240E9C 46001080 */ add.s $f2, $f2, $f0 +/* A036E0 80240EA0 3C014024 */ lui $at, 0x4024 +/* A036E4 80240EA4 44810800 */ mtc1 $at, $f1 +/* A036E8 80240EA8 44800000 */ mtc1 $zero, $f0 +/* A036EC 80240EAC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A036F0 80240EB0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A036F4 80240EB4 460010A1 */ cvt.d.s $f2, $f2 +/* A036F8 80240EB8 46201080 */ add.d $f2, $f2, $f0 +/* A036FC 80240EBC C440002C */ lwc1 $f0, 0x2c($v0) +/* A03700 80240EC0 46000021 */ cvt.d.s $f0, $f0 +/* A03704 80240EC4 4622003C */ c.lt.d $f0, $f2 +/* A03708 80240EC8 00000000 */ nop +/* A0370C 80240ECC 4500002C */ bc1f .L80240F80 +/* A03710 80240ED0 02A0202D */ daddu $a0, $s5, $zero +/* A03714 80240ED4 AFA00010 */ sw $zero, 0x10($sp) +/* A03718 80240ED8 8E46000C */ lw $a2, 0xc($s2) +/* A0371C 80240EDC 8E470010 */ lw $a3, 0x10($s2) +/* A03720 80240EE0 0C01242D */ jal func_800490B4 +/* A03724 80240EE4 0220282D */ daddu $a1, $s1, $zero +/* A03728 80240EE8 10400025 */ beqz $v0, .L80240F80 +/* A0372C 80240EEC 0000202D */ daddu $a0, $zero, $zero +/* A03730 80240EF0 0200282D */ daddu $a1, $s0, $zero +/* A03734 80240EF4 0000302D */ daddu $a2, $zero, $zero +/* A03738 80240EF8 2412000C */ addiu $s2, $zero, 0xc +/* A0373C 80240EFC 860300A8 */ lh $v1, 0xa8($s0) +/* A03740 80240F00 3C013F80 */ lui $at, 0x3f80 +/* A03744 80240F04 44810000 */ mtc1 $at, $f0 +/* A03748 80240F08 3C014000 */ lui $at, 0x4000 +/* A0374C 80240F0C 44811000 */ mtc1 $at, $f2 +/* A03750 80240F10 3C01C1A0 */ lui $at, 0xc1a0 +/* A03754 80240F14 44812000 */ mtc1 $at, $f4 +/* A03758 80240F18 44834000 */ mtc1 $v1, $f8 +/* A0375C 80240F1C 00000000 */ nop +/* A03760 80240F20 46804220 */ cvt.s.w $f8, $f8 +/* A03764 80240F24 44074000 */ mfc1 $a3, $f8 +/* A03768 80240F28 27A20038 */ addiu $v0, $sp, 0x38 +/* A0376C 80240F2C AFB2001C */ sw $s2, 0x1c($sp) +/* A03770 80240F30 AFA20020 */ sw $v0, 0x20($sp) +/* A03774 80240F34 E7A00010 */ swc1 $f0, 0x10($sp) +/* A03778 80240F38 E7A20014 */ swc1 $f2, 0x14($sp) +/* A0377C 80240F3C 0C01BFA4 */ jal fx_emote +/* A03780 80240F40 E7A40018 */ swc1 $f4, 0x18($sp) +/* A03784 80240F44 0200202D */ daddu $a0, $s0, $zero +/* A03788 80240F48 240502F4 */ addiu $a1, $zero, 0x2f4 +/* A0378C 80240F4C C480003C */ lwc1 $f0, 0x3c($a0) +/* A03790 80240F50 3C060020 */ lui $a2, 0x20 +/* A03794 80240F54 0C012530 */ jal func_800494C0 +/* A03798 80240F58 E4800064 */ swc1 $f0, 0x64($a0) +/* A0379C 80240F5C 8E220018 */ lw $v0, 0x18($s1) +/* A037A0 80240F60 9442002A */ lhu $v0, 0x2a($v0) +/* A037A4 80240F64 30420001 */ andi $v0, $v0, 1 +/* A037A8 80240F68 10400003 */ beqz $v0, .L80240F78 +/* A037AC 80240F6C 2402000A */ addiu $v0, $zero, 0xa +/* A037B0 80240F70 0809044E */ j .L80241138 +/* A037B4 80240F74 AE620070 */ sw $v0, 0x70($s3) +.L80240F78: +/* A037B8 80240F78 0809044E */ j .L80241138 +/* A037BC 80240F7C AE720070 */ sw $s2, 0x70($s3) +.L80240F80: +/* A037C0 80240F80 8E620074 */ lw $v0, 0x74($s3) +/* A037C4 80240F84 2442FFFF */ addiu $v0, $v0, -1 +.L80240F88: +/* A037C8 80240F88 080903E5 */ j .L80240F94 +/* A037CC 80240F8C AE620074 */ sw $v0, 0x74($s3) +.L80240F90: +/* A037D0 80240F90 AE220090 */ sw $v0, 0x90($s1) +.L80240F94: +/* A037D4 80240F94 8E2300D0 */ lw $v1, 0xd0($s1) +/* A037D8 80240F98 C6000040 */ lwc1 $f0, 0x40($s0) +/* A037DC 80240F9C C4620000 */ lwc1 $f2, ($v1) +/* A037E0 80240FA0 468010A0 */ cvt.s.w $f2, $f2 +/* A037E4 80240FA4 C4640008 */ lwc1 $f4, 8($v1) +/* A037E8 80240FA8 46802120 */ cvt.s.w $f4, $f4 +/* A037EC 80240FAC E7A00010 */ swc1 $f0, 0x10($sp) +/* A037F0 80240FB0 8E2200D0 */ lw $v0, 0xd0($s1) +/* A037F4 80240FB4 44051000 */ mfc1 $a1, $f2 +/* A037F8 80240FB8 C440000C */ lwc1 $f0, 0xc($v0) +/* A037FC 80240FBC 46800020 */ cvt.s.w $f0, $f0 +/* A03800 80240FC0 E7A00014 */ swc1 $f0, 0x14($sp) +/* A03804 80240FC4 8E2200D0 */ lw $v0, 0xd0($s1) +/* A03808 80240FC8 44062000 */ mfc1 $a2, $f4 +/* A0380C 80240FCC C4400010 */ lwc1 $f0, 0x10($v0) +/* A03810 80240FD0 46800020 */ cvt.s.w $f0, $f0 +/* A03814 80240FD4 E7A00018 */ swc1 $f0, 0x18($sp) +/* A03818 80240FD8 8C640018 */ lw $a0, 0x18($v1) +/* A0381C 80240FDC 0C0123F5 */ jal is_point_within_region +/* A03820 80240FE0 8E070038 */ lw $a3, 0x38($s0) +/* A03824 80240FE4 1040001A */ beqz $v0, .L80241050 +/* A03828 80240FE8 00000000 */ nop +/* A0382C 80240FEC 8E060038 */ lw $a2, 0x38($s0) +/* A03830 80240FF0 8E2200D0 */ lw $v0, 0xd0($s1) +/* A03834 80240FF4 8E070040 */ lw $a3, 0x40($s0) +/* A03838 80240FF8 C44C0000 */ lwc1 $f12, ($v0) +/* A0383C 80240FFC 46806320 */ cvt.s.w $f12, $f12 +/* A03840 80241000 C44E0008 */ lwc1 $f14, 8($v0) +/* A03844 80241004 0C00A7B5 */ jal dist2D +/* A03848 80241008 468073A0 */ cvt.s.w $f14, $f14 +/* A0384C 8024100C C6020018 */ lwc1 $f2, 0x18($s0) +/* A03850 80241010 4600103C */ c.lt.s $f2, $f0 +/* A03854 80241014 00000000 */ nop +/* A03858 80241018 4500000D */ bc1f .L80241050 +/* A0385C 8024101C E7A00034 */ swc1 $f0, 0x34($sp) +/* A03860 80241020 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A03864 80241024 8E2200D0 */ lw $v0, 0xd0($s1) +/* A03868 80241028 C60E0040 */ lwc1 $f14, 0x40($s0) +/* A0386C 8024102C C4480000 */ lwc1 $f8, ($v0) +/* A03870 80241030 46804220 */ cvt.s.w $f8, $f8 +/* A03874 80241034 44064000 */ mfc1 $a2, $f8 +/* A03878 80241038 C4480008 */ lwc1 $f8, 8($v0) +/* A0387C 8024103C 46804220 */ cvt.s.w $f8, $f8 +/* A03880 80241040 44074000 */ mfc1 $a3, $f8 +/* A03884 80241044 0C00A720 */ jal atan2 +/* A03888 80241048 24140001 */ addiu $s4, $zero, 1 +/* A0388C 8024104C E600000C */ swc1 $f0, 0xc($s0) +.L80241050: +/* A03890 80241050 8E2200D0 */ lw $v0, 0xd0($s1) +/* A03894 80241054 8C43000C */ lw $v1, 0xc($v0) +/* A03898 80241058 8C420010 */ lw $v0, 0x10($v0) +/* A0389C 8024105C 00621825 */ or $v1, $v1, $v0 +/* A038A0 80241060 00741825 */ or $v1, $v1, $s4 +/* A038A4 80241064 10600008 */ beqz $v1, .L80241088 +/* A038A8 80241068 00000000 */ nop +/* A038AC 8024106C 8602008C */ lh $v0, 0x8c($s0) +/* A038B0 80241070 14400031 */ bnez $v0, .L80241138 +/* A038B4 80241074 00000000 */ nop +/* A038B8 80241078 8E050018 */ lw $a1, 0x18($s0) +/* A038BC 8024107C 8E06000C */ lw $a2, 0xc($s0) +/* A038C0 80241080 0C00EA95 */ jal npc_move_heading +/* A038C4 80241084 0200202D */ daddu $a0, $s0, $zero +.L80241088: +/* A038C8 80241088 C600003C */ lwc1 $f0, 0x3c($s0) +/* A038CC 8024108C 3C014059 */ lui $at, 0x4059 +/* A038D0 80241090 44811800 */ mtc1 $at, $f3 +/* A038D4 80241094 44801000 */ mtc1 $zero, $f2 +/* A038D8 80241098 46000021 */ cvt.d.s $f0, $f0 +/* A038DC 8024109C 46220002 */ mul.d $f0, $f0, $f2 +/* A038E0 802410A0 00000000 */ nop +/* A038E4 802410A4 4620020D */ trunc.w.d $f8, $f0 +/* A038E8 802410A8 E628007C */ swc1 $f8, 0x7c($s1) +/* A038EC 802410AC 8E420004 */ lw $v0, 4($s2) +/* A038F0 802410B0 18400021 */ blez $v0, .L80241138 +/* A038F4 802410B4 00000000 */ nop +/* A038F8 802410B8 8602008E */ lh $v0, 0x8e($s0) +/* A038FC 802410BC 9603008E */ lhu $v1, 0x8e($s0) +/* A03900 802410C0 18400005 */ blez $v0, .L802410D8 +/* A03904 802410C4 2462FFFF */ addiu $v0, $v1, -1 +/* A03908 802410C8 A602008E */ sh $v0, 0x8e($s0) +/* A0390C 802410CC 00021400 */ sll $v0, $v0, 0x10 +/* A03910 802410D0 1C400019 */ bgtz $v0, .L80241138 +/* A03914 802410D4 00000000 */ nop +.L802410D8: +/* A03918 802410D8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* A0391C 802410DC 24020002 */ addiu $v0, $zero, 2 +/* A03920 802410E0 0C00A67F */ jal rand_int +/* A03924 802410E4 AE620070 */ sw $v0, 0x70($s3) +/* A03928 802410E8 3C035555 */ lui $v1, 0x5555 +/* A0392C 802410EC 34635556 */ ori $v1, $v1, 0x5556 +/* A03930 802410F0 00430018 */ mult $v0, $v1 +/* A03934 802410F4 000227C3 */ sra $a0, $v0, 0x1f +/* A03938 802410F8 00004010 */ mfhi $t0 +/* A0393C 802410FC 01042023 */ subu $a0, $t0, $a0 +/* A03940 80241100 00041840 */ sll $v1, $a0, 1 +/* A03944 80241104 00641821 */ addu $v1, $v1, $a0 +/* A03948 80241108 00431023 */ subu $v0, $v0, $v1 +/* A0394C 8024110C 24430002 */ addiu $v1, $v0, 2 +/* A03950 80241110 AE630074 */ sw $v1, 0x74($s3) +/* A03954 80241114 8E42002C */ lw $v0, 0x2c($s2) +/* A03958 80241118 58400007 */ blezl $v0, .L80241138 +/* A0395C 8024111C AE600070 */ sw $zero, 0x70($s3) +/* A03960 80241120 8E420008 */ lw $v0, 8($s2) +/* A03964 80241124 18400003 */ blez $v0, .L80241134 +/* A03968 80241128 28620003 */ slti $v0, $v1, 3 +/* A0396C 8024112C 10400002 */ beqz $v0, .L80241138 +/* A03970 80241130 00000000 */ nop +.L80241134: +/* A03974 80241134 AE600070 */ sw $zero, 0x70($s3) +.L80241138: +/* A03978 80241138 8FBF0058 */ lw $ra, 0x58($sp) +/* A0397C 8024113C 8FB50054 */ lw $s5, 0x54($sp) +/* A03980 80241140 8FB40050 */ lw $s4, 0x50($sp) +/* A03984 80241144 8FB3004C */ lw $s3, 0x4c($sp) +/* A03988 80241148 8FB20048 */ lw $s2, 0x48($sp) +/* A0398C 8024114C 8FB10044 */ lw $s1, 0x44($sp) +/* A03990 80241150 8FB00040 */ lw $s0, 0x40($sp) +/* A03994 80241154 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* A03998 80241158 D7B80070 */ ldc1 $f24, 0x70($sp) +/* A0399C 8024115C D7B60068 */ ldc1 $f22, 0x68($sp) +/* A039A0 80241160 D7B40060 */ ldc1 $f20, 0x60($sp) +/* A039A4 80241164 03E00008 */ jr $ra +/* A039A8 80241168 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C.s deleted file mode 100644 index 3a4fa7e6ca..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024122C -/* A03A6C 8024122C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A03A70 80241230 AFB3004C */ sw $s3, 0x4c($sp) -/* A03A74 80241234 0080982D */ daddu $s3, $a0, $zero -/* A03A78 80241238 AFBF0054 */ sw $ra, 0x54($sp) -/* A03A7C 8024123C AFB40050 */ sw $s4, 0x50($sp) -/* A03A80 80241240 AFB20048 */ sw $s2, 0x48($sp) -/* A03A84 80241244 AFB10044 */ sw $s1, 0x44($sp) -/* A03A88 80241248 AFB00040 */ sw $s0, 0x40($sp) -/* A03A8C 8024124C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* A03A90 80241250 F7B80068 */ sdc1 $f24, 0x68($sp) -/* A03A94 80241254 F7B60060 */ sdc1 $f22, 0x60($sp) -/* A03A98 80241258 F7B40058 */ sdc1 $f20, 0x58($sp) -/* A03A9C 8024125C 8E710148 */ lw $s1, 0x148($s3) -/* A03AA0 80241260 00A0902D */ daddu $s2, $a1, $zero -/* A03AA4 80241264 86240008 */ lh $a0, 8($s1) -/* A03AA8 80241268 0C00EABB */ jal get_npc_unsafe -/* A03AAC 8024126C 00C0A02D */ daddu $s4, $a2, $zero -/* A03AB0 80241270 0040802D */ daddu $s0, $v0, $zero -/* A03AB4 80241274 C6200078 */ lwc1 $f0, 0x78($s1) -/* A03AB8 80241278 46800020 */ cvt.s.w $f0, $f0 -/* A03ABC 8024127C 46000021 */ cvt.d.s $f0, $f0 -/* A03AC0 80241280 3C014059 */ lui $at, 0x4059 -/* A03AC4 80241284 44811800 */ mtc1 $at, $f3 -/* A03AC8 80241288 44801000 */ mtc1 $zero, $f2 -/* A03ACC 8024128C 8602008E */ lh $v0, 0x8e($s0) -/* A03AD0 80241290 9603008E */ lhu $v1, 0x8e($s0) -/* A03AD4 80241294 46220003 */ div.d $f0, $f0, $f2 -/* A03AD8 80241298 46200620 */ cvt.s.d $f24, $f0 -/* A03ADC 8024129C C6200088 */ lwc1 $f0, 0x88($s1) -/* A03AE0 802412A0 46800020 */ cvt.s.w $f0, $f0 -/* A03AE4 802412A4 46000021 */ cvt.d.s $f0, $f0 -/* A03AE8 802412A8 46220003 */ div.d $f0, $f0, $f2 -/* A03AEC 802412AC 46200020 */ cvt.s.d $f0, $f0 -/* A03AF0 802412B0 18400003 */ blez $v0, .L802412C0 -/* A03AF4 802412B4 4600C680 */ add.s $f26, $f24, $f0 -/* A03AF8 802412B8 2462FFFF */ addiu $v0, $v1, -1 -/* A03AFC 802412BC A602008E */ sh $v0, 0x8e($s0) -.L802412C0: -/* A03B00 802412C0 8E220070 */ lw $v0, 0x70($s1) -/* A03B04 802412C4 18400034 */ blez $v0, .L80241398 -/* A03B08 802412C8 00000000 */ nop -/* A03B0C 802412CC C62C0074 */ lwc1 $f12, 0x74($s1) -/* A03B10 802412D0 46806320 */ cvt.s.w $f12, $f12 -/* A03B14 802412D4 44820000 */ mtc1 $v0, $f0 -/* A03B18 802412D8 00000000 */ nop -/* A03B1C 802412DC 46800020 */ cvt.s.w $f0, $f0 -/* A03B20 802412E0 46000021 */ cvt.d.s $f0, $f0 -/* A03B24 802412E4 46220003 */ div.d $f0, $f0, $f2 -/* A03B28 802412E8 0C00A8BB */ jal sin_deg -/* A03B2C 802412EC 462005A0 */ cvt.s.d $f22, $f0 -/* A03B30 802412F0 8E020000 */ lw $v0, ($s0) -/* A03B34 802412F4 30420008 */ andi $v0, $v0, 8 -/* A03B38 802412F8 10400003 */ beqz $v0, .L80241308 -/* A03B3C 802412FC 46000506 */ mov.s $f20, $f0 -/* A03B40 80241300 080904D2 */ j .L80241348 -/* A03B44 80241304 0000102D */ daddu $v0, $zero, $zero -.L80241308: -/* A03B48 80241308 27A50028 */ addiu $a1, $sp, 0x28 -/* A03B4C 8024130C 27A6002C */ addiu $a2, $sp, 0x2c -/* A03B50 80241310 C6000038 */ lwc1 $f0, 0x38($s0) -/* A03B54 80241314 C602003C */ lwc1 $f2, 0x3c($s0) -/* A03B58 80241318 C6040040 */ lwc1 $f4, 0x40($s0) -/* A03B5C 8024131C 3C01447A */ lui $at, 0x447a -/* A03B60 80241320 44813000 */ mtc1 $at, $f6 -/* A03B64 80241324 27A20034 */ addiu $v0, $sp, 0x34 -/* A03B68 80241328 E7A00028 */ swc1 $f0, 0x28($sp) -/* A03B6C 8024132C E7A2002C */ swc1 $f2, 0x2c($sp) -/* A03B70 80241330 E7A40030 */ swc1 $f4, 0x30($sp) -/* A03B74 80241334 E7A60034 */ swc1 $f6, 0x34($sp) -/* A03B78 80241338 AFA20010 */ sw $v0, 0x10($sp) -/* A03B7C 8024133C 8E040080 */ lw $a0, 0x80($s0) -/* A03B80 80241340 0C0372DF */ jal func_800DCB7C -/* A03B84 80241344 27A70030 */ addiu $a3, $sp, 0x30 -.L80241348: -/* A03B88 80241348 10400007 */ beqz $v0, .L80241368 -/* A03B8C 8024134C 00000000 */ nop -/* A03B90 80241350 4616A082 */ mul.s $f2, $f20, $f22 -/* A03B94 80241354 00000000 */ nop -/* A03B98 80241358 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A03B9C 8024135C 46180000 */ add.s $f0, $f0, $f24 -/* A03BA0 80241360 080904DD */ j .L80241374 -/* A03BA4 80241364 46020000 */ add.s $f0, $f0, $f2 -.L80241368: -/* A03BA8 80241368 4616A002 */ mul.s $f0, $f20, $f22 -/* A03BAC 8024136C 00000000 */ nop -/* A03BB0 80241370 4600D000 */ add.s $f0, $f26, $f0 -.L80241374: -/* A03BB4 80241374 E600003C */ swc1 $f0, 0x3c($s0) -/* A03BB8 80241378 8E220074 */ lw $v0, 0x74($s1) -/* A03BBC 8024137C 2442000A */ addiu $v0, $v0, 0xa -/* A03BC0 80241380 44826000 */ mtc1 $v0, $f12 -/* A03BC4 80241384 00000000 */ nop -/* A03BC8 80241388 0C00A6C9 */ jal clamp_angle -/* A03BCC 8024138C 46806320 */ cvt.s.w $f12, $f12 -/* A03BD0 80241390 4600020D */ trunc.w.s $f8, $f0 -/* A03BD4 80241394 E6280074 */ swc1 $f8, 0x74($s1) -.L80241398: -/* A03BD8 80241398 8E220090 */ lw $v0, 0x90($s1) -/* A03BDC 8024139C 1C400040 */ bgtz $v0, .L802414A0 -/* A03BE0 802413A0 2442FFFF */ addiu $v0, $v0, -1 -/* A03BE4 802413A4 860200A8 */ lh $v0, 0xa8($s0) -/* A03BE8 802413A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A03BEC 802413AC 44821000 */ mtc1 $v0, $f2 -/* A03BF0 802413B0 00000000 */ nop -/* A03BF4 802413B4 468010A0 */ cvt.s.w $f2, $f2 -/* A03BF8 802413B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A03BFC 802413BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A03C00 802413C0 46020000 */ add.s $f0, $f0, $f2 -/* A03C04 802413C4 3C014024 */ lui $at, 0x4024 -/* A03C08 802413C8 44812800 */ mtc1 $at, $f5 -/* A03C0C 802413CC 44802000 */ mtc1 $zero, $f4 -/* A03C10 802413D0 C442002C */ lwc1 $f2, 0x2c($v0) -/* A03C14 802413D4 46000021 */ cvt.d.s $f0, $f0 -/* A03C18 802413D8 46240000 */ add.d $f0, $f0, $f4 -/* A03C1C 802413DC 460010A1 */ cvt.d.s $f2, $f2 -/* A03C20 802413E0 4620103C */ c.lt.d $f2, $f0 -/* A03C24 802413E4 00000000 */ nop -/* A03C28 802413E8 4500002E */ bc1f .L802414A4 -/* A03C2C 802413EC 0280202D */ daddu $a0, $s4, $zero -/* A03C30 802413F0 24020001 */ addiu $v0, $zero, 1 -/* A03C34 802413F4 AFA20010 */ sw $v0, 0x10($sp) -/* A03C38 802413F8 8E460024 */ lw $a2, 0x24($s2) -/* A03C3C 802413FC 8E470028 */ lw $a3, 0x28($s2) -/* A03C40 80241400 0C01242D */ jal func_800490B4 -/* A03C44 80241404 0220282D */ daddu $a1, $s1, $zero -/* A03C48 80241408 10400026 */ beqz $v0, .L802414A4 -/* A03C4C 8024140C 0000202D */ daddu $a0, $zero, $zero -/* A03C50 80241410 0200282D */ daddu $a1, $s0, $zero -/* A03C54 80241414 0000302D */ daddu $a2, $zero, $zero -/* A03C58 80241418 2412000C */ addiu $s2, $zero, 0xc -/* A03C5C 8024141C 860300A8 */ lh $v1, 0xa8($s0) -/* A03C60 80241420 3C013F80 */ lui $at, 0x3f80 -/* A03C64 80241424 44810000 */ mtc1 $at, $f0 -/* A03C68 80241428 3C014000 */ lui $at, 0x4000 -/* A03C6C 8024142C 44811000 */ mtc1 $at, $f2 -/* A03C70 80241430 3C01C1A0 */ lui $at, 0xc1a0 -/* A03C74 80241434 44812000 */ mtc1 $at, $f4 -/* A03C78 80241438 44834000 */ mtc1 $v1, $f8 -/* A03C7C 8024143C 00000000 */ nop -/* A03C80 80241440 46804220 */ cvt.s.w $f8, $f8 -/* A03C84 80241444 44074000 */ mfc1 $a3, $f8 -/* A03C88 80241448 27A20038 */ addiu $v0, $sp, 0x38 -/* A03C8C 8024144C AFB2001C */ sw $s2, 0x1c($sp) -/* A03C90 80241450 AFA20020 */ sw $v0, 0x20($sp) -/* A03C94 80241454 E7A00010 */ swc1 $f0, 0x10($sp) -/* A03C98 80241458 E7A20014 */ swc1 $f2, 0x14($sp) -/* A03C9C 8024145C 0C01BFA4 */ jal fx_emote -/* A03CA0 80241460 E7A40018 */ swc1 $f4, 0x18($sp) -/* A03CA4 80241464 0200202D */ daddu $a0, $s0, $zero -/* A03CA8 80241468 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A03CAC 8024146C C480003C */ lwc1 $f0, 0x3c($a0) -/* A03CB0 80241470 3C060020 */ lui $a2, 0x20 -/* A03CB4 80241474 0C012530 */ jal func_800494C0 -/* A03CB8 80241478 E4800064 */ swc1 $f0, 0x64($a0) -/* A03CBC 8024147C 8E220018 */ lw $v0, 0x18($s1) -/* A03CC0 80241480 9442002A */ lhu $v0, 0x2a($v0) -/* A03CC4 80241484 30420001 */ andi $v0, $v0, 1 -/* A03CC8 80241488 10400003 */ beqz $v0, .L80241498 -/* A03CCC 8024148C 2402000A */ addiu $v0, $zero, 0xa -/* A03CD0 80241490 08090550 */ j .L80241540 -/* A03CD4 80241494 AE620070 */ sw $v0, 0x70($s3) -.L80241498: -/* A03CD8 80241498 08090550 */ j .L80241540 -/* A03CDC 8024149C AE720070 */ sw $s2, 0x70($s3) -.L802414A0: -/* A03CE0 802414A0 AE220090 */ sw $v0, 0x90($s1) -.L802414A4: -/* A03CE4 802414A4 8602008C */ lh $v0, 0x8c($s0) -/* A03CE8 802414A8 14400025 */ bnez $v0, .L80241540 -/* A03CEC 802414AC 00000000 */ nop -/* A03CF0 802414B0 8602008E */ lh $v0, 0x8e($s0) -/* A03CF4 802414B4 1C400022 */ bgtz $v0, .L80241540 -/* A03CF8 802414B8 00000000 */ nop -/* A03CFC 802414BC 8E620074 */ lw $v0, 0x74($s3) -/* A03D00 802414C0 2442FFFF */ addiu $v0, $v0, -1 -/* A03D04 802414C4 1840001D */ blez $v0, .L8024153C -/* A03D08 802414C8 AE620074 */ sw $v0, 0x74($s3) -/* A03D0C 802414CC 8E220018 */ lw $v0, 0x18($s1) -/* A03D10 802414D0 9442002A */ lhu $v0, 0x2a($v0) -/* A03D14 802414D4 30420010 */ andi $v0, $v0, 0x10 -/* A03D18 802414D8 14400007 */ bnez $v0, .L802414F8 -/* A03D1C 802414DC 00000000 */ nop -/* A03D20 802414E0 C600000C */ lwc1 $f0, 0xc($s0) -/* A03D24 802414E4 3C014334 */ lui $at, 0x4334 -/* A03D28 802414E8 44816000 */ mtc1 $at, $f12 -/* A03D2C 802414EC 0C00A6C9 */ jal clamp_angle -/* A03D30 802414F0 460C0300 */ add.s $f12, $f0, $f12 -/* A03D34 802414F4 E600000C */ swc1 $f0, 0xc($s0) -.L802414F8: -/* A03D38 802414F8 0C00A67F */ jal rand_int -/* A03D3C 802414FC 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A03D40 80241500 3C032E8B */ lui $v1, 0x2e8b -/* A03D44 80241504 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* A03D48 80241508 00430018 */ mult $v0, $v1 -/* A03D4C 8024150C 00021FC3 */ sra $v1, $v0, 0x1f -/* A03D50 80241510 00004010 */ mfhi $t0 -/* A03D54 80241514 00082043 */ sra $a0, $t0, 1 -/* A03D58 80241518 00832023 */ subu $a0, $a0, $v1 -/* A03D5C 8024151C 00041840 */ sll $v1, $a0, 1 -/* A03D60 80241520 00641821 */ addu $v1, $v1, $a0 -/* A03D64 80241524 00031880 */ sll $v1, $v1, 2 -/* A03D68 80241528 00641823 */ subu $v1, $v1, $a0 -/* A03D6C 8024152C 00431023 */ subu $v0, $v0, $v1 -/* A03D70 80241530 24420005 */ addiu $v0, $v0, 5 -/* A03D74 80241534 08090550 */ j .L80241540 -/* A03D78 80241538 A602008E */ sh $v0, 0x8e($s0) -.L8024153C: -/* A03D7C 8024153C AE600070 */ sw $zero, 0x70($s3) -.L80241540: -/* A03D80 80241540 8FBF0054 */ lw $ra, 0x54($sp) -/* A03D84 80241544 8FB40050 */ lw $s4, 0x50($sp) -/* A03D88 80241548 8FB3004C */ lw $s3, 0x4c($sp) -/* A03D8C 8024154C 8FB20048 */ lw $s2, 0x48($sp) -/* A03D90 80241550 8FB10044 */ lw $s1, 0x44($sp) -/* A03D94 80241554 8FB00040 */ lw $s0, 0x40($sp) -/* A03D98 80241558 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* A03D9C 8024155C D7B80068 */ ldc1 $f24, 0x68($sp) -/* A03DA0 80241560 D7B60060 */ ldc1 $f22, 0x60($sp) -/* A03DA4 80241564 D7B40058 */ ldc1 $f20, 0x58($sp) -/* A03DA8 80241568 03E00008 */ jr $ra -/* A03DAC 8024156C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s new file mode 100644 index 0000000000..c4985697c8 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_8024122C_A03A6C.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024122C_A03A6C +/* A03A6C 8024122C 27BDFF88 */ addiu $sp, $sp, -0x78 +/* A03A70 80241230 AFB3004C */ sw $s3, 0x4c($sp) +/* A03A74 80241234 0080982D */ daddu $s3, $a0, $zero +/* A03A78 80241238 AFBF0054 */ sw $ra, 0x54($sp) +/* A03A7C 8024123C AFB40050 */ sw $s4, 0x50($sp) +/* A03A80 80241240 AFB20048 */ sw $s2, 0x48($sp) +/* A03A84 80241244 AFB10044 */ sw $s1, 0x44($sp) +/* A03A88 80241248 AFB00040 */ sw $s0, 0x40($sp) +/* A03A8C 8024124C F7BA0070 */ sdc1 $f26, 0x70($sp) +/* A03A90 80241250 F7B80068 */ sdc1 $f24, 0x68($sp) +/* A03A94 80241254 F7B60060 */ sdc1 $f22, 0x60($sp) +/* A03A98 80241258 F7B40058 */ sdc1 $f20, 0x58($sp) +/* A03A9C 8024125C 8E710148 */ lw $s1, 0x148($s3) +/* A03AA0 80241260 00A0902D */ daddu $s2, $a1, $zero +/* A03AA4 80241264 86240008 */ lh $a0, 8($s1) +/* A03AA8 80241268 0C00EABB */ jal get_npc_unsafe +/* A03AAC 8024126C 00C0A02D */ daddu $s4, $a2, $zero +/* A03AB0 80241270 0040802D */ daddu $s0, $v0, $zero +/* A03AB4 80241274 C6200078 */ lwc1 $f0, 0x78($s1) +/* A03AB8 80241278 46800020 */ cvt.s.w $f0, $f0 +/* A03ABC 8024127C 46000021 */ cvt.d.s $f0, $f0 +/* A03AC0 80241280 3C014059 */ lui $at, 0x4059 +/* A03AC4 80241284 44811800 */ mtc1 $at, $f3 +/* A03AC8 80241288 44801000 */ mtc1 $zero, $f2 +/* A03ACC 8024128C 8602008E */ lh $v0, 0x8e($s0) +/* A03AD0 80241290 9603008E */ lhu $v1, 0x8e($s0) +/* A03AD4 80241294 46220003 */ div.d $f0, $f0, $f2 +/* A03AD8 80241298 46200620 */ cvt.s.d $f24, $f0 +/* A03ADC 8024129C C6200088 */ lwc1 $f0, 0x88($s1) +/* A03AE0 802412A0 46800020 */ cvt.s.w $f0, $f0 +/* A03AE4 802412A4 46000021 */ cvt.d.s $f0, $f0 +/* A03AE8 802412A8 46220003 */ div.d $f0, $f0, $f2 +/* A03AEC 802412AC 46200020 */ cvt.s.d $f0, $f0 +/* A03AF0 802412B0 18400003 */ blez $v0, .L802412C0 +/* A03AF4 802412B4 4600C680 */ add.s $f26, $f24, $f0 +/* A03AF8 802412B8 2462FFFF */ addiu $v0, $v1, -1 +/* A03AFC 802412BC A602008E */ sh $v0, 0x8e($s0) +.L802412C0: +/* A03B00 802412C0 8E220070 */ lw $v0, 0x70($s1) +/* A03B04 802412C4 18400034 */ blez $v0, .L80241398 +/* A03B08 802412C8 00000000 */ nop +/* A03B0C 802412CC C62C0074 */ lwc1 $f12, 0x74($s1) +/* A03B10 802412D0 46806320 */ cvt.s.w $f12, $f12 +/* A03B14 802412D4 44820000 */ mtc1 $v0, $f0 +/* A03B18 802412D8 00000000 */ nop +/* A03B1C 802412DC 46800020 */ cvt.s.w $f0, $f0 +/* A03B20 802412E0 46000021 */ cvt.d.s $f0, $f0 +/* A03B24 802412E4 46220003 */ div.d $f0, $f0, $f2 +/* A03B28 802412E8 0C00A8BB */ jal sin_deg +/* A03B2C 802412EC 462005A0 */ cvt.s.d $f22, $f0 +/* A03B30 802412F0 8E020000 */ lw $v0, ($s0) +/* A03B34 802412F4 30420008 */ andi $v0, $v0, 8 +/* A03B38 802412F8 10400003 */ beqz $v0, .L80241308 +/* A03B3C 802412FC 46000506 */ mov.s $f20, $f0 +/* A03B40 80241300 080904D2 */ j .L80241348 +/* A03B44 80241304 0000102D */ daddu $v0, $zero, $zero +.L80241308: +/* A03B48 80241308 27A50028 */ addiu $a1, $sp, 0x28 +/* A03B4C 8024130C 27A6002C */ addiu $a2, $sp, 0x2c +/* A03B50 80241310 C6000038 */ lwc1 $f0, 0x38($s0) +/* A03B54 80241314 C602003C */ lwc1 $f2, 0x3c($s0) +/* A03B58 80241318 C6040040 */ lwc1 $f4, 0x40($s0) +/* A03B5C 8024131C 3C01447A */ lui $at, 0x447a +/* A03B60 80241320 44813000 */ mtc1 $at, $f6 +/* A03B64 80241324 27A20034 */ addiu $v0, $sp, 0x34 +/* A03B68 80241328 E7A00028 */ swc1 $f0, 0x28($sp) +/* A03B6C 8024132C E7A2002C */ swc1 $f2, 0x2c($sp) +/* A03B70 80241330 E7A40030 */ swc1 $f4, 0x30($sp) +/* A03B74 80241334 E7A60034 */ swc1 $f6, 0x34($sp) +/* A03B78 80241338 AFA20010 */ sw $v0, 0x10($sp) +/* A03B7C 8024133C 8E040080 */ lw $a0, 0x80($s0) +/* A03B80 80241340 0C0372DF */ jal func_800DCB7C +/* A03B84 80241344 27A70030 */ addiu $a3, $sp, 0x30 +.L80241348: +/* A03B88 80241348 10400007 */ beqz $v0, .L80241368 +/* A03B8C 8024134C 00000000 */ nop +/* A03B90 80241350 4616A082 */ mul.s $f2, $f20, $f22 +/* A03B94 80241354 00000000 */ nop +/* A03B98 80241358 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A03B9C 8024135C 46180000 */ add.s $f0, $f0, $f24 +/* A03BA0 80241360 080904DD */ j .L80241374 +/* A03BA4 80241364 46020000 */ add.s $f0, $f0, $f2 +.L80241368: +/* A03BA8 80241368 4616A002 */ mul.s $f0, $f20, $f22 +/* A03BAC 8024136C 00000000 */ nop +/* A03BB0 80241370 4600D000 */ add.s $f0, $f26, $f0 +.L80241374: +/* A03BB4 80241374 E600003C */ swc1 $f0, 0x3c($s0) +/* A03BB8 80241378 8E220074 */ lw $v0, 0x74($s1) +/* A03BBC 8024137C 2442000A */ addiu $v0, $v0, 0xa +/* A03BC0 80241380 44826000 */ mtc1 $v0, $f12 +/* A03BC4 80241384 00000000 */ nop +/* A03BC8 80241388 0C00A6C9 */ jal clamp_angle +/* A03BCC 8024138C 46806320 */ cvt.s.w $f12, $f12 +/* A03BD0 80241390 4600020D */ trunc.w.s $f8, $f0 +/* A03BD4 80241394 E6280074 */ swc1 $f8, 0x74($s1) +.L80241398: +/* A03BD8 80241398 8E220090 */ lw $v0, 0x90($s1) +/* A03BDC 8024139C 1C400040 */ bgtz $v0, .L802414A0 +/* A03BE0 802413A0 2442FFFF */ addiu $v0, $v0, -1 +/* A03BE4 802413A4 860200A8 */ lh $v0, 0xa8($s0) +/* A03BE8 802413A8 C600003C */ lwc1 $f0, 0x3c($s0) +/* A03BEC 802413AC 44821000 */ mtc1 $v0, $f2 +/* A03BF0 802413B0 00000000 */ nop +/* A03BF4 802413B4 468010A0 */ cvt.s.w $f2, $f2 +/* A03BF8 802413B8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A03BFC 802413BC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A03C00 802413C0 46020000 */ add.s $f0, $f0, $f2 +/* A03C04 802413C4 3C014024 */ lui $at, 0x4024 +/* A03C08 802413C8 44812800 */ mtc1 $at, $f5 +/* A03C0C 802413CC 44802000 */ mtc1 $zero, $f4 +/* A03C10 802413D0 C442002C */ lwc1 $f2, 0x2c($v0) +/* A03C14 802413D4 46000021 */ cvt.d.s $f0, $f0 +/* A03C18 802413D8 46240000 */ add.d $f0, $f0, $f4 +/* A03C1C 802413DC 460010A1 */ cvt.d.s $f2, $f2 +/* A03C20 802413E0 4620103C */ c.lt.d $f2, $f0 +/* A03C24 802413E4 00000000 */ nop +/* A03C28 802413E8 4500002E */ bc1f .L802414A4 +/* A03C2C 802413EC 0280202D */ daddu $a0, $s4, $zero +/* A03C30 802413F0 24020001 */ addiu $v0, $zero, 1 +/* A03C34 802413F4 AFA20010 */ sw $v0, 0x10($sp) +/* A03C38 802413F8 8E460024 */ lw $a2, 0x24($s2) +/* A03C3C 802413FC 8E470028 */ lw $a3, 0x28($s2) +/* A03C40 80241400 0C01242D */ jal func_800490B4 +/* A03C44 80241404 0220282D */ daddu $a1, $s1, $zero +/* A03C48 80241408 10400026 */ beqz $v0, .L802414A4 +/* A03C4C 8024140C 0000202D */ daddu $a0, $zero, $zero +/* A03C50 80241410 0200282D */ daddu $a1, $s0, $zero +/* A03C54 80241414 0000302D */ daddu $a2, $zero, $zero +/* A03C58 80241418 2412000C */ addiu $s2, $zero, 0xc +/* A03C5C 8024141C 860300A8 */ lh $v1, 0xa8($s0) +/* A03C60 80241420 3C013F80 */ lui $at, 0x3f80 +/* A03C64 80241424 44810000 */ mtc1 $at, $f0 +/* A03C68 80241428 3C014000 */ lui $at, 0x4000 +/* A03C6C 8024142C 44811000 */ mtc1 $at, $f2 +/* A03C70 80241430 3C01C1A0 */ lui $at, 0xc1a0 +/* A03C74 80241434 44812000 */ mtc1 $at, $f4 +/* A03C78 80241438 44834000 */ mtc1 $v1, $f8 +/* A03C7C 8024143C 00000000 */ nop +/* A03C80 80241440 46804220 */ cvt.s.w $f8, $f8 +/* A03C84 80241444 44074000 */ mfc1 $a3, $f8 +/* A03C88 80241448 27A20038 */ addiu $v0, $sp, 0x38 +/* A03C8C 8024144C AFB2001C */ sw $s2, 0x1c($sp) +/* A03C90 80241450 AFA20020 */ sw $v0, 0x20($sp) +/* A03C94 80241454 E7A00010 */ swc1 $f0, 0x10($sp) +/* A03C98 80241458 E7A20014 */ swc1 $f2, 0x14($sp) +/* A03C9C 8024145C 0C01BFA4 */ jal fx_emote +/* A03CA0 80241460 E7A40018 */ swc1 $f4, 0x18($sp) +/* A03CA4 80241464 0200202D */ daddu $a0, $s0, $zero +/* A03CA8 80241468 240502F4 */ addiu $a1, $zero, 0x2f4 +/* A03CAC 8024146C C480003C */ lwc1 $f0, 0x3c($a0) +/* A03CB0 80241470 3C060020 */ lui $a2, 0x20 +/* A03CB4 80241474 0C012530 */ jal func_800494C0 +/* A03CB8 80241478 E4800064 */ swc1 $f0, 0x64($a0) +/* A03CBC 8024147C 8E220018 */ lw $v0, 0x18($s1) +/* A03CC0 80241480 9442002A */ lhu $v0, 0x2a($v0) +/* A03CC4 80241484 30420001 */ andi $v0, $v0, 1 +/* A03CC8 80241488 10400003 */ beqz $v0, .L80241498 +/* A03CCC 8024148C 2402000A */ addiu $v0, $zero, 0xa +/* A03CD0 80241490 08090550 */ j .L80241540 +/* A03CD4 80241494 AE620070 */ sw $v0, 0x70($s3) +.L80241498: +/* A03CD8 80241498 08090550 */ j .L80241540 +/* A03CDC 8024149C AE720070 */ sw $s2, 0x70($s3) +.L802414A0: +/* A03CE0 802414A0 AE220090 */ sw $v0, 0x90($s1) +.L802414A4: +/* A03CE4 802414A4 8602008C */ lh $v0, 0x8c($s0) +/* A03CE8 802414A8 14400025 */ bnez $v0, .L80241540 +/* A03CEC 802414AC 00000000 */ nop +/* A03CF0 802414B0 8602008E */ lh $v0, 0x8e($s0) +/* A03CF4 802414B4 1C400022 */ bgtz $v0, .L80241540 +/* A03CF8 802414B8 00000000 */ nop +/* A03CFC 802414BC 8E620074 */ lw $v0, 0x74($s3) +/* A03D00 802414C0 2442FFFF */ addiu $v0, $v0, -1 +/* A03D04 802414C4 1840001D */ blez $v0, .L8024153C +/* A03D08 802414C8 AE620074 */ sw $v0, 0x74($s3) +/* A03D0C 802414CC 8E220018 */ lw $v0, 0x18($s1) +/* A03D10 802414D0 9442002A */ lhu $v0, 0x2a($v0) +/* A03D14 802414D4 30420010 */ andi $v0, $v0, 0x10 +/* A03D18 802414D8 14400007 */ bnez $v0, .L802414F8 +/* A03D1C 802414DC 00000000 */ nop +/* A03D20 802414E0 C600000C */ lwc1 $f0, 0xc($s0) +/* A03D24 802414E4 3C014334 */ lui $at, 0x4334 +/* A03D28 802414E8 44816000 */ mtc1 $at, $f12 +/* A03D2C 802414EC 0C00A6C9 */ jal clamp_angle +/* A03D30 802414F0 460C0300 */ add.s $f12, $f0, $f12 +/* A03D34 802414F4 E600000C */ swc1 $f0, 0xc($s0) +.L802414F8: +/* A03D38 802414F8 0C00A67F */ jal rand_int +/* A03D3C 802414FC 240403E8 */ addiu $a0, $zero, 0x3e8 +/* A03D40 80241500 3C032E8B */ lui $v1, 0x2e8b +/* A03D44 80241504 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* A03D48 80241508 00430018 */ mult $v0, $v1 +/* A03D4C 8024150C 00021FC3 */ sra $v1, $v0, 0x1f +/* A03D50 80241510 00004010 */ mfhi $t0 +/* A03D54 80241514 00082043 */ sra $a0, $t0, 1 +/* A03D58 80241518 00832023 */ subu $a0, $a0, $v1 +/* A03D5C 8024151C 00041840 */ sll $v1, $a0, 1 +/* A03D60 80241520 00641821 */ addu $v1, $v1, $a0 +/* A03D64 80241524 00031880 */ sll $v1, $v1, 2 +/* A03D68 80241528 00641823 */ subu $v1, $v1, $a0 +/* A03D6C 8024152C 00431023 */ subu $v0, $v0, $v1 +/* A03D70 80241530 24420005 */ addiu $v0, $v0, 5 +/* A03D74 80241534 08090550 */ j .L80241540 +/* A03D78 80241538 A602008E */ sh $v0, 0x8e($s0) +.L8024153C: +/* A03D7C 8024153C AE600070 */ sw $zero, 0x70($s3) +.L80241540: +/* A03D80 80241540 8FBF0054 */ lw $ra, 0x54($sp) +/* A03D84 80241544 8FB40050 */ lw $s4, 0x50($sp) +/* A03D88 80241548 8FB3004C */ lw $s3, 0x4c($sp) +/* A03D8C 8024154C 8FB20048 */ lw $s2, 0x48($sp) +/* A03D90 80241550 8FB10044 */ lw $s1, 0x44($sp) +/* A03D94 80241554 8FB00040 */ lw $s0, 0x40($sp) +/* A03D98 80241558 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* A03D9C 8024155C D7B80068 */ ldc1 $f24, 0x68($sp) +/* A03DA0 80241560 D7B60060 */ ldc1 $f22, 0x60($sp) +/* A03DA4 80241564 D7B40058 */ ldc1 $f20, 0x58($sp) +/* A03DA8 80241568 03E00008 */ jr $ra +/* A03DAC 8024156C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8.s deleted file mode 100644 index 2c0e5ce4ca..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415E8 -/* A03E28 802415E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A03E2C 802415EC AFB00010 */ sw $s0, 0x10($sp) -/* A03E30 802415F0 0080802D */ daddu $s0, $a0, $zero -/* A03E34 802415F4 AFBF0014 */ sw $ra, 0x14($sp) -/* A03E38 802415F8 8E020148 */ lw $v0, 0x148($s0) -/* A03E3C 802415FC 0C00EABB */ jal get_npc_unsafe -/* A03E40 80241600 84440008 */ lh $a0, 8($v0) -/* A03E44 80241604 9443008E */ lhu $v1, 0x8e($v0) -/* A03E48 80241608 C440003C */ lwc1 $f0, 0x3c($v0) -/* A03E4C 8024160C 24640001 */ addiu $a0, $v1, 1 -/* A03E50 80241610 00031C00 */ sll $v1, $v1, 0x10 -/* A03E54 80241614 00031B83 */ sra $v1, $v1, 0xe -/* A03E58 80241618 A444008E */ sh $a0, 0x8e($v0) -/* A03E5C 8024161C 3C018024 */ lui $at, 0x8024 -/* A03E60 80241620 00230821 */ addu $at, $at, $v1 -/* A03E64 80241624 C4223A18 */ lwc1 $f2, 0x3a18($at) -/* A03E68 80241628 8443008E */ lh $v1, 0x8e($v0) -/* A03E6C 8024162C 46020000 */ add.s $f0, $f0, $f2 -/* A03E70 80241630 28630005 */ slti $v1, $v1, 5 -/* A03E74 80241634 14600003 */ bnez $v1, .L80241644 -/* A03E78 80241638 E440003C */ swc1 $f0, 0x3c($v0) -/* A03E7C 8024163C 2402000C */ addiu $v0, $zero, 0xc -/* A03E80 80241640 AE020070 */ sw $v0, 0x70($s0) -.L80241644: -/* A03E84 80241644 8FBF0014 */ lw $ra, 0x14($sp) -/* A03E88 80241648 8FB00010 */ lw $s0, 0x10($sp) -/* A03E8C 8024164C 03E00008 */ jr $ra -/* A03E90 80241650 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s new file mode 100644 index 0000000000..4552a284da --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802415E8_A03E28.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415E8_A03E28 +/* A03E28 802415E8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A03E2C 802415EC AFB00010 */ sw $s0, 0x10($sp) +/* A03E30 802415F0 0080802D */ daddu $s0, $a0, $zero +/* A03E34 802415F4 AFBF0014 */ sw $ra, 0x14($sp) +/* A03E38 802415F8 8E020148 */ lw $v0, 0x148($s0) +/* A03E3C 802415FC 0C00EABB */ jal get_npc_unsafe +/* A03E40 80241600 84440008 */ lh $a0, 8($v0) +/* A03E44 80241604 9443008E */ lhu $v1, 0x8e($v0) +/* A03E48 80241608 C440003C */ lwc1 $f0, 0x3c($v0) +/* A03E4C 8024160C 24640001 */ addiu $a0, $v1, 1 +/* A03E50 80241610 00031C00 */ sll $v1, $v1, 0x10 +/* A03E54 80241614 00031B83 */ sra $v1, $v1, 0xe +/* A03E58 80241618 A444008E */ sh $a0, 0x8e($v0) +/* A03E5C 8024161C 3C018024 */ lui $at, 0x8024 +/* A03E60 80241620 00230821 */ addu $at, $at, $v1 +/* A03E64 80241624 C4223A18 */ lwc1 $f2, 0x3a18($at) +/* A03E68 80241628 8443008E */ lh $v1, 0x8e($v0) +/* A03E6C 8024162C 46020000 */ add.s $f0, $f0, $f2 +/* A03E70 80241630 28630005 */ slti $v1, $v1, 5 +/* A03E74 80241634 14600003 */ bnez $v1, .L80241644 +/* A03E78 80241638 E440003C */ swc1 $f0, 0x3c($v0) +/* A03E7C 8024163C 2402000C */ addiu $v0, $zero, 0xc +/* A03E80 80241640 AE020070 */ sw $v0, 0x70($s0) +.L80241644: +/* A03E84 80241644 8FBF0014 */ lw $ra, 0x14($sp) +/* A03E88 80241648 8FB00010 */ lw $s0, 0x10($sp) +/* A03E8C 8024164C 03E00008 */ jr $ra +/* A03E90 80241650 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654.s deleted file mode 100644 index da25750ce2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241654 -/* A03E94 80241654 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A03E98 80241658 AFB3001C */ sw $s3, 0x1c($sp) -/* A03E9C 8024165C 0080982D */ daddu $s3, $a0, $zero -/* A03EA0 80241660 AFBF0020 */ sw $ra, 0x20($sp) -/* A03EA4 80241664 AFB20018 */ sw $s2, 0x18($sp) -/* A03EA8 80241668 AFB10014 */ sw $s1, 0x14($sp) -/* A03EAC 8024166C AFB00010 */ sw $s0, 0x10($sp) -/* A03EB0 80241670 8E720148 */ lw $s2, 0x148($s3) -/* A03EB4 80241674 86440008 */ lh $a0, 8($s2) -/* A03EB8 80241678 0C00EABB */ jal get_npc_unsafe -/* A03EBC 8024167C 00A0802D */ daddu $s0, $a1, $zero -/* A03EC0 80241680 0040882D */ daddu $s1, $v0, $zero -/* A03EC4 80241684 C6420080 */ lwc1 $f2, 0x80($s2) -/* A03EC8 80241688 468010A0 */ cvt.s.w $f2, $f2 -/* A03ECC 8024168C 460010A1 */ cvt.d.s $f2, $f2 -/* A03ED0 80241690 C6400084 */ lwc1 $f0, 0x84($s2) -/* A03ED4 80241694 46800020 */ cvt.s.w $f0, $f0 -/* A03ED8 80241698 46000021 */ cvt.d.s $f0, $f0 -/* A03EDC 8024169C 3C014059 */ lui $at, 0x4059 -/* A03EE0 802416A0 44812800 */ mtc1 $at, $f5 -/* A03EE4 802416A4 44802000 */ mtc1 $zero, $f4 -/* A03EE8 802416A8 8E4200CC */ lw $v0, 0xcc($s2) -/* A03EEC 802416AC C62C0038 */ lwc1 $f12, 0x38($s1) -/* A03EF0 802416B0 C62E0040 */ lwc1 $f14, 0x40($s1) -/* A03EF4 802416B4 46241083 */ div.d $f2, $f2, $f4 -/* A03EF8 802416B8 462010A0 */ cvt.s.d $f2, $f2 -/* A03EFC 802416BC 46240003 */ div.d $f0, $f0, $f4 -/* A03F00 802416C0 8C420020 */ lw $v0, 0x20($v0) -/* A03F04 802416C4 46200020 */ cvt.s.d $f0, $f0 -/* A03F08 802416C8 E622001C */ swc1 $f2, 0x1c($s1) -/* A03F0C 802416CC E6200014 */ swc1 $f0, 0x14($s1) -/* A03F10 802416D0 AE220028 */ sw $v0, 0x28($s1) -/* A03F14 802416D4 C6000018 */ lwc1 $f0, 0x18($s0) -/* A03F18 802416D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A03F1C 802416DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A03F20 802416E0 E6200018 */ swc1 $f0, 0x18($s1) -/* A03F24 802416E4 8C460028 */ lw $a2, 0x28($v0) -/* A03F28 802416E8 0C00A720 */ jal atan2 -/* A03F2C 802416EC 8C470030 */ lw $a3, 0x30($v0) -/* A03F30 802416F0 E620000C */ swc1 $f0, 0xc($s1) -/* A03F34 802416F4 8E420018 */ lw $v0, 0x18($s2) -/* A03F38 802416F8 AE400074 */ sw $zero, 0x74($s2) -/* A03F3C 802416FC 9442002A */ lhu $v0, 0x2a($v0) -/* A03F40 80241700 30420002 */ andi $v0, $v0, 2 -/* A03F44 80241704 10400005 */ beqz $v0, .L8024171C -/* A03F48 80241708 24020003 */ addiu $v0, $zero, 3 -/* A03F4C 8024170C A622008E */ sh $v0, 0x8e($s1) -/* A03F50 80241710 2402000D */ addiu $v0, $zero, 0xd -/* A03F54 80241714 080905DB */ j .L8024176C -/* A03F58 80241718 AE620070 */ sw $v0, 0x70($s3) -.L8024171C: -/* A03F5C 8024171C 24030001 */ addiu $v1, $zero, 1 -/* A03F60 80241720 2402000E */ addiu $v0, $zero, 0xe -/* A03F64 80241724 A623008E */ sh $v1, 0x8e($s1) -/* A03F68 80241728 AE620070 */ sw $v0, 0x70($s3) -/* A03F6C 8024172C C6200038 */ lwc1 $f0, 0x38($s1) -/* A03F70 80241730 4600018D */ trunc.w.s $f6, $f0 -/* A03F74 80241734 44023000 */ mfc1 $v0, $f6 -/* A03F78 80241738 00000000 */ nop -/* A03F7C 8024173C A6420010 */ sh $v0, 0x10($s2) -/* A03F80 80241740 C620003C */ lwc1 $f0, 0x3c($s1) -/* A03F84 80241744 4600018D */ trunc.w.s $f6, $f0 -/* A03F88 80241748 44023000 */ mfc1 $v0, $f6 -/* A03F8C 8024174C 00000000 */ nop -/* A03F90 80241750 A6420012 */ sh $v0, 0x12($s2) -/* A03F94 80241754 C6200040 */ lwc1 $f0, 0x40($s1) -/* A03F98 80241758 A2430007 */ sb $v1, 7($s2) -/* A03F9C 8024175C 4600018D */ trunc.w.s $f6, $f0 -/* A03FA0 80241760 44023000 */ mfc1 $v0, $f6 -/* A03FA4 80241764 00000000 */ nop -/* A03FA8 80241768 A6420014 */ sh $v0, 0x14($s2) -.L8024176C: -/* A03FAC 8024176C 8FBF0020 */ lw $ra, 0x20($sp) -/* A03FB0 80241770 8FB3001C */ lw $s3, 0x1c($sp) -/* A03FB4 80241774 8FB20018 */ lw $s2, 0x18($sp) -/* A03FB8 80241778 8FB10014 */ lw $s1, 0x14($sp) -/* A03FBC 8024177C 8FB00010 */ lw $s0, 0x10($sp) -/* A03FC0 80241780 03E00008 */ jr $ra -/* A03FC4 80241784 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s new file mode 100644 index 0000000000..194fb3d21e --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241654_A03E94.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241654_A03E94 +/* A03E94 80241654 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A03E98 80241658 AFB3001C */ sw $s3, 0x1c($sp) +/* A03E9C 8024165C 0080982D */ daddu $s3, $a0, $zero +/* A03EA0 80241660 AFBF0020 */ sw $ra, 0x20($sp) +/* A03EA4 80241664 AFB20018 */ sw $s2, 0x18($sp) +/* A03EA8 80241668 AFB10014 */ sw $s1, 0x14($sp) +/* A03EAC 8024166C AFB00010 */ sw $s0, 0x10($sp) +/* A03EB0 80241670 8E720148 */ lw $s2, 0x148($s3) +/* A03EB4 80241674 86440008 */ lh $a0, 8($s2) +/* A03EB8 80241678 0C00EABB */ jal get_npc_unsafe +/* A03EBC 8024167C 00A0802D */ daddu $s0, $a1, $zero +/* A03EC0 80241680 0040882D */ daddu $s1, $v0, $zero +/* A03EC4 80241684 C6420080 */ lwc1 $f2, 0x80($s2) +/* A03EC8 80241688 468010A0 */ cvt.s.w $f2, $f2 +/* A03ECC 8024168C 460010A1 */ cvt.d.s $f2, $f2 +/* A03ED0 80241690 C6400084 */ lwc1 $f0, 0x84($s2) +/* A03ED4 80241694 46800020 */ cvt.s.w $f0, $f0 +/* A03ED8 80241698 46000021 */ cvt.d.s $f0, $f0 +/* A03EDC 8024169C 3C014059 */ lui $at, 0x4059 +/* A03EE0 802416A0 44812800 */ mtc1 $at, $f5 +/* A03EE4 802416A4 44802000 */ mtc1 $zero, $f4 +/* A03EE8 802416A8 8E4200CC */ lw $v0, 0xcc($s2) +/* A03EEC 802416AC C62C0038 */ lwc1 $f12, 0x38($s1) +/* A03EF0 802416B0 C62E0040 */ lwc1 $f14, 0x40($s1) +/* A03EF4 802416B4 46241083 */ div.d $f2, $f2, $f4 +/* A03EF8 802416B8 462010A0 */ cvt.s.d $f2, $f2 +/* A03EFC 802416BC 46240003 */ div.d $f0, $f0, $f4 +/* A03F00 802416C0 8C420020 */ lw $v0, 0x20($v0) +/* A03F04 802416C4 46200020 */ cvt.s.d $f0, $f0 +/* A03F08 802416C8 E622001C */ swc1 $f2, 0x1c($s1) +/* A03F0C 802416CC E6200014 */ swc1 $f0, 0x14($s1) +/* A03F10 802416D0 AE220028 */ sw $v0, 0x28($s1) +/* A03F14 802416D4 C6000018 */ lwc1 $f0, 0x18($s0) +/* A03F18 802416D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A03F1C 802416DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A03F20 802416E0 E6200018 */ swc1 $f0, 0x18($s1) +/* A03F24 802416E4 8C460028 */ lw $a2, 0x28($v0) +/* A03F28 802416E8 0C00A720 */ jal atan2 +/* A03F2C 802416EC 8C470030 */ lw $a3, 0x30($v0) +/* A03F30 802416F0 E620000C */ swc1 $f0, 0xc($s1) +/* A03F34 802416F4 8E420018 */ lw $v0, 0x18($s2) +/* A03F38 802416F8 AE400074 */ sw $zero, 0x74($s2) +/* A03F3C 802416FC 9442002A */ lhu $v0, 0x2a($v0) +/* A03F40 80241700 30420002 */ andi $v0, $v0, 2 +/* A03F44 80241704 10400005 */ beqz $v0, .L8024171C +/* A03F48 80241708 24020003 */ addiu $v0, $zero, 3 +/* A03F4C 8024170C A622008E */ sh $v0, 0x8e($s1) +/* A03F50 80241710 2402000D */ addiu $v0, $zero, 0xd +/* A03F54 80241714 080905DB */ j .L8024176C +/* A03F58 80241718 AE620070 */ sw $v0, 0x70($s3) +.L8024171C: +/* A03F5C 8024171C 24030001 */ addiu $v1, $zero, 1 +/* A03F60 80241720 2402000E */ addiu $v0, $zero, 0xe +/* A03F64 80241724 A623008E */ sh $v1, 0x8e($s1) +/* A03F68 80241728 AE620070 */ sw $v0, 0x70($s3) +/* A03F6C 8024172C C6200038 */ lwc1 $f0, 0x38($s1) +/* A03F70 80241730 4600018D */ trunc.w.s $f6, $f0 +/* A03F74 80241734 44023000 */ mfc1 $v0, $f6 +/* A03F78 80241738 00000000 */ nop +/* A03F7C 8024173C A6420010 */ sh $v0, 0x10($s2) +/* A03F80 80241740 C620003C */ lwc1 $f0, 0x3c($s1) +/* A03F84 80241744 4600018D */ trunc.w.s $f6, $f0 +/* A03F88 80241748 44023000 */ mfc1 $v0, $f6 +/* A03F8C 8024174C 00000000 */ nop +/* A03F90 80241750 A6420012 */ sh $v0, 0x12($s2) +/* A03F94 80241754 C6200040 */ lwc1 $f0, 0x40($s1) +/* A03F98 80241758 A2430007 */ sb $v1, 7($s2) +/* A03F9C 8024175C 4600018D */ trunc.w.s $f6, $f0 +/* A03FA0 80241760 44023000 */ mfc1 $v0, $f6 +/* A03FA4 80241764 00000000 */ nop +/* A03FA8 80241768 A6420014 */ sh $v0, 0x14($s2) +.L8024176C: +/* A03FAC 8024176C 8FBF0020 */ lw $ra, 0x20($sp) +/* A03FB0 80241770 8FB3001C */ lw $s3, 0x1c($sp) +/* A03FB4 80241774 8FB20018 */ lw $s2, 0x18($sp) +/* A03FB8 80241778 8FB10014 */ lw $s1, 0x14($sp) +/* A03FBC 8024177C 8FB00010 */ lw $s0, 0x10($sp) +/* A03FC0 80241780 03E00008 */ jr $ra +/* A03FC4 80241784 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788.s deleted file mode 100644 index 2f83e9d109..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241788 -/* A03FC8 80241788 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A03FCC 8024178C AFB00010 */ sw $s0, 0x10($sp) -/* A03FD0 80241790 0080802D */ daddu $s0, $a0, $zero -/* A03FD4 80241794 AFBF0014 */ sw $ra, 0x14($sp) -/* A03FD8 80241798 8E020148 */ lw $v0, 0x148($s0) -/* A03FDC 8024179C 0C00EABB */ jal get_npc_unsafe -/* A03FE0 802417A0 84440008 */ lh $a0, 8($v0) -/* A03FE4 802417A4 0040202D */ daddu $a0, $v0, $zero -/* A03FE8 802417A8 8482008E */ lh $v0, 0x8e($a0) -/* A03FEC 802417AC 9483008E */ lhu $v1, 0x8e($a0) -/* A03FF0 802417B0 18400005 */ blez $v0, .L802417C8 -/* A03FF4 802417B4 2462FFFF */ addiu $v0, $v1, -1 -/* A03FF8 802417B8 A482008E */ sh $v0, 0x8e($a0) -/* A03FFC 802417BC 00021400 */ sll $v0, $v0, 0x10 -/* A04000 802417C0 1C400006 */ bgtz $v0, .L802417DC -/* A04004 802417C4 00000000 */ nop -.L802417C8: -/* A04008 802417C8 8482008C */ lh $v0, 0x8c($a0) -/* A0400C 802417CC 14400003 */ bnez $v0, .L802417DC -/* A04010 802417D0 2402000E */ addiu $v0, $zero, 0xe -/* A04014 802417D4 A480008E */ sh $zero, 0x8e($a0) -/* A04018 802417D8 AE020070 */ sw $v0, 0x70($s0) -.L802417DC: -/* A0401C 802417DC 8FBF0014 */ lw $ra, 0x14($sp) -/* A04020 802417E0 8FB00010 */ lw $s0, 0x10($sp) -/* A04024 802417E4 03E00008 */ jr $ra -/* A04028 802417E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s new file mode 100644 index 0000000000..451585c88f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241788_A03FC8.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241788_A03FC8 +/* A03FC8 80241788 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A03FCC 8024178C AFB00010 */ sw $s0, 0x10($sp) +/* A03FD0 80241790 0080802D */ daddu $s0, $a0, $zero +/* A03FD4 80241794 AFBF0014 */ sw $ra, 0x14($sp) +/* A03FD8 80241798 8E020148 */ lw $v0, 0x148($s0) +/* A03FDC 8024179C 0C00EABB */ jal get_npc_unsafe +/* A03FE0 802417A0 84440008 */ lh $a0, 8($v0) +/* A03FE4 802417A4 0040202D */ daddu $a0, $v0, $zero +/* A03FE8 802417A8 8482008E */ lh $v0, 0x8e($a0) +/* A03FEC 802417AC 9483008E */ lhu $v1, 0x8e($a0) +/* A03FF0 802417B0 18400005 */ blez $v0, .L802417C8 +/* A03FF4 802417B4 2462FFFF */ addiu $v0, $v1, -1 +/* A03FF8 802417B8 A482008E */ sh $v0, 0x8e($a0) +/* A03FFC 802417BC 00021400 */ sll $v0, $v0, 0x10 +/* A04000 802417C0 1C400006 */ bgtz $v0, .L802417DC +/* A04004 802417C4 00000000 */ nop +.L802417C8: +/* A04008 802417C8 8482008C */ lh $v0, 0x8c($a0) +/* A0400C 802417CC 14400003 */ bnez $v0, .L802417DC +/* A04010 802417D0 2402000E */ addiu $v0, $zero, 0xe +/* A04014 802417D4 A480008E */ sh $zero, 0x8e($a0) +/* A04018 802417D8 AE020070 */ sw $v0, 0x70($s0) +.L802417DC: +/* A0401C 802417DC 8FBF0014 */ lw $ra, 0x14($sp) +/* A04020 802417E0 8FB00010 */ lw $s0, 0x10($sp) +/* A04024 802417E4 03E00008 */ jr $ra +/* A04028 802417E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC.s deleted file mode 100644 index 7f0bdb7383..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417EC -/* A0402C 802417EC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A04030 802417F0 AFB20030 */ sw $s2, 0x30($sp) -/* A04034 802417F4 0080902D */ daddu $s2, $a0, $zero -/* A04038 802417F8 AFBF0038 */ sw $ra, 0x38($sp) -/* A0403C 802417FC AFB30034 */ sw $s3, 0x34($sp) -/* A04040 80241800 AFB1002C */ sw $s1, 0x2c($sp) -/* A04044 80241804 AFB00028 */ sw $s0, 0x28($sp) -/* A04048 80241808 F7B60048 */ sdc1 $f22, 0x48($sp) -/* A0404C 8024180C F7B40040 */ sdc1 $f20, 0x40($sp) -/* A04050 80241810 8E510148 */ lw $s1, 0x148($s2) -/* A04054 80241814 86240008 */ lh $a0, 8($s1) -/* A04058 80241818 0C00EABB */ jal get_npc_unsafe -/* A0405C 8024181C 00A0982D */ daddu $s3, $a1, $zero -/* A04060 80241820 0040802D */ daddu $s0, $v0, $zero -/* A04064 80241824 0200202D */ daddu $a0, $s0, $zero -/* A04068 80241828 C6220088 */ lwc1 $f2, 0x88($s1) -/* A0406C 8024182C 468010A0 */ cvt.s.w $f2, $f2 -/* A04070 80241830 460010A1 */ cvt.d.s $f2, $f2 -/* A04074 80241834 C604001C */ lwc1 $f4, 0x1c($s0) -/* A04078 80241838 C6000014 */ lwc1 $f0, 0x14($s0) -/* A0407C 8024183C 8E050018 */ lw $a1, 0x18($s0) -/* A04080 80241840 46002100 */ add.s $f4, $f4, $f0 -/* A04084 80241844 8E06000C */ lw $a2, 0xc($s0) -/* A04088 80241848 C6200078 */ lwc1 $f0, 0x78($s1) -/* A0408C 8024184C 46800020 */ cvt.s.w $f0, $f0 -/* A04090 80241850 E604001C */ swc1 $f4, 0x1c($s0) -/* A04094 80241854 3C014059 */ lui $at, 0x4059 -/* A04098 80241858 44812800 */ mtc1 $at, $f5 -/* A0409C 8024185C 44802000 */ mtc1 $zero, $f4 -/* A040A0 80241860 46000021 */ cvt.d.s $f0, $f0 -/* A040A4 80241864 46240003 */ div.d $f0, $f0, $f4 -/* A040A8 80241868 46200520 */ cvt.s.d $f20, $f0 -/* A040AC 8024186C 46241083 */ div.d $f2, $f2, $f4 -/* A040B0 80241870 0C00EA95 */ jal npc_move_heading -/* A040B4 80241874 462015A0 */ cvt.s.d $f22, $f2 -/* A040B8 80241878 C604001C */ lwc1 $f4, 0x1c($s0) -/* A040BC 8024187C 44801000 */ mtc1 $zero, $f2 -/* A040C0 80241880 44801800 */ mtc1 $zero, $f3 -/* A040C4 80241884 46002021 */ cvt.d.s $f0, $f4 -/* A040C8 80241888 4620103E */ c.le.d $f2, $f0 -/* A040CC 8024188C 00000000 */ nop -/* A040D0 80241890 45000030 */ bc1f .L80241954 -/* A040D4 80241894 00000000 */ nop -/* A040D8 80241898 C600003C */ lwc1 $f0, 0x3c($s0) -/* A040DC 8024189C 46040000 */ add.s $f0, $f0, $f4 -/* A040E0 802418A0 E600003C */ swc1 $f0, 0x3c($s0) -/* A040E4 802418A4 8E2200CC */ lw $v0, 0xcc($s1) -/* A040E8 802418A8 8C420024 */ lw $v0, 0x24($v0) -/* A040EC 802418AC AE020028 */ sw $v0, 0x28($s0) -/* A040F0 802418B0 A2200007 */ sb $zero, 7($s1) -/* A040F4 802418B4 8E020000 */ lw $v0, ($s0) -/* A040F8 802418B8 30420008 */ andi $v0, $v0, 8 -/* A040FC 802418BC 14400011 */ bnez $v0, .L80241904 -/* A04100 802418C0 0000102D */ daddu $v0, $zero, $zero -/* A04104 802418C4 27A50018 */ addiu $a1, $sp, 0x18 -/* A04108 802418C8 27A6001C */ addiu $a2, $sp, 0x1c -/* A0410C 802418CC C6000038 */ lwc1 $f0, 0x38($s0) -/* A04110 802418D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* A04114 802418D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* A04118 802418D8 3C01447A */ lui $at, 0x447a -/* A0411C 802418DC 44813000 */ mtc1 $at, $f6 -/* A04120 802418E0 27A20024 */ addiu $v0, $sp, 0x24 -/* A04124 802418E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* A04128 802418E8 E7A2001C */ swc1 $f2, 0x1c($sp) -/* A0412C 802418EC E7A40020 */ swc1 $f4, 0x20($sp) -/* A04130 802418F0 E7A60024 */ swc1 $f6, 0x24($sp) -/* A04134 802418F4 AFA20010 */ sw $v0, 0x10($sp) -/* A04138 802418F8 8E040080 */ lw $a0, 0x80($s0) -/* A0413C 802418FC 0C0372DF */ jal func_800DCB7C -/* A04140 80241900 27A70020 */ addiu $a3, $sp, 0x20 -.L80241904: -/* A04144 80241904 1040000B */ beqz $v0, .L80241934 -/* A04148 80241908 00000000 */ nop -/* A0414C 8024190C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A04150 80241910 46140080 */ add.s $f2, $f0, $f20 -/* A04154 80241914 C600003C */ lwc1 $f0, 0x3c($s0) -/* A04158 80241918 4600103E */ c.le.s $f2, $f0 -/* A0415C 8024191C 00000000 */ nop -/* A04160 80241920 4500008D */ bc1f .L80241B58 -/* A04164 80241924 00000000 */ nop -/* A04168 80241928 E602003C */ swc1 $f2, 0x3c($s0) -/* A0416C 8024192C 080906D6 */ j .L80241B58 -/* A04170 80241930 AE400070 */ sw $zero, 0x70($s2) -.L80241934: -/* A04174 80241934 C602003C */ lwc1 $f2, 0x3c($s0) -/* A04178 80241938 C6000064 */ lwc1 $f0, 0x64($s0) -/* A0417C 8024193C 4602003E */ c.le.s $f0, $f2 -/* A04180 80241940 00000000 */ nop -/* A04184 80241944 45030084 */ bc1tl .L80241B58 -/* A04188 80241948 AE400070 */ sw $zero, 0x70($s2) -/* A0418C 8024194C 080906D6 */ j .L80241B58 -/* A04190 80241950 00000000 */ nop -.L80241954: -/* A04194 80241954 4622003C */ c.lt.d $f0, $f2 -/* A04198 80241958 00000000 */ nop -/* A0419C 8024195C 4500007E */ bc1f .L80241B58 -/* A041A0 80241960 00000000 */ nop -/* A041A4 80241964 9602008E */ lhu $v0, 0x8e($s0) -/* A041A8 80241968 24420001 */ addiu $v0, $v0, 1 -/* A041AC 8024196C A602008E */ sh $v0, 0x8e($s0) -/* A041B0 80241970 00021400 */ sll $v0, $v0, 0x10 -/* A041B4 80241974 8E630020 */ lw $v1, 0x20($s3) -/* A041B8 80241978 00021403 */ sra $v0, $v0, 0x10 -/* A041BC 8024197C 0043102A */ slt $v0, $v0, $v1 -/* A041C0 80241980 14400026 */ bnez $v0, .L80241A1C -/* A041C4 80241984 00000000 */ nop -/* A041C8 80241988 C60C0038 */ lwc1 $f12, 0x38($s0) -/* A041CC 8024198C C60E0040 */ lwc1 $f14, 0x40($s0) -/* A041D0 80241990 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A041D4 80241994 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A041D8 80241998 A600008E */ sh $zero, 0x8e($s0) -/* A041DC 8024199C 8C460028 */ lw $a2, 0x28($v0) -/* A041E0 802419A0 0C00A720 */ jal atan2 -/* A041E4 802419A4 8C470030 */ lw $a3, 0x30($v0) -/* A041E8 802419A8 46000506 */ mov.s $f20, $f0 -/* A041EC 802419AC C60C000C */ lwc1 $f12, 0xc($s0) -/* A041F0 802419B0 0C00A70A */ jal get_clamped_angle_diff -/* A041F4 802419B4 4600A386 */ mov.s $f14, $f20 -/* A041F8 802419B8 46000086 */ mov.s $f2, $f0 -/* A041FC 802419BC 8E62001C */ lw $v0, 0x1c($s3) -/* A04200 802419C0 46001005 */ abs.s $f0, $f2 -/* A04204 802419C4 44822000 */ mtc1 $v0, $f4 -/* A04208 802419C8 00000000 */ nop -/* A0420C 802419CC 46802120 */ cvt.s.w $f4, $f4 -/* A04210 802419D0 4600203C */ c.lt.s $f4, $f0 -/* A04214 802419D4 00000000 */ nop -/* A04218 802419D8 4500000D */ bc1f .L80241A10 -/* A0421C 802419DC 00000000 */ nop -/* A04220 802419E0 44800000 */ mtc1 $zero, $f0 -/* A04224 802419E4 C614000C */ lwc1 $f20, 0xc($s0) -/* A04228 802419E8 4600103C */ c.lt.s $f2, $f0 -/* A0422C 802419EC 00000000 */ nop -/* A04230 802419F0 45000006 */ bc1f .L80241A0C -/* A04234 802419F4 00021023 */ negu $v0, $v0 -/* A04238 802419F8 44820000 */ mtc1 $v0, $f0 -/* A0423C 802419FC 00000000 */ nop -/* A04240 80241A00 46800020 */ cvt.s.w $f0, $f0 -/* A04244 80241A04 08090684 */ j .L80241A10 -/* A04248 80241A08 4600A500 */ add.s $f20, $f20, $f0 -.L80241A0C: -/* A0424C 80241A0C 4604A500 */ add.s $f20, $f20, $f4 -.L80241A10: -/* A04250 80241A10 0C00A6C9 */ jal clamp_angle -/* A04254 80241A14 4600A306 */ mov.s $f12, $f20 -/* A04258 80241A18 E600000C */ swc1 $f0, 0xc($s0) -.L80241A1C: -/* A0425C 80241A1C 8E020000 */ lw $v0, ($s0) -/* A04260 80241A20 30420008 */ andi $v0, $v0, 8 -/* A04264 80241A24 1040000A */ beqz $v0, .L80241A50 -/* A04268 80241A28 27A50018 */ addiu $a1, $sp, 0x18 -/* A0426C 80241A2C C602003C */ lwc1 $f2, 0x3c($s0) -/* A04270 80241A30 C600001C */ lwc1 $f0, 0x1c($s0) -/* A04274 80241A34 46001080 */ add.s $f2, $f2, $f0 -/* A04278 80241A38 4616103C */ c.lt.s $f2, $f22 -/* A0427C 80241A3C 00000000 */ nop -/* A04280 80241A40 45020045 */ bc1fl .L80241B58 -/* A04284 80241A44 E602003C */ swc1 $f2, 0x3c($s0) -/* A04288 80241A48 080906D5 */ j .L80241B54 -/* A0428C 80241A4C E616003C */ swc1 $f22, 0x3c($s0) -.L80241A50: -/* A04290 80241A50 C6000038 */ lwc1 $f0, 0x38($s0) -/* A04294 80241A54 27A6001C */ addiu $a2, $sp, 0x1c -/* A04298 80241A58 E7A00018 */ swc1 $f0, 0x18($sp) -/* A0429C 80241A5C 860200A8 */ lh $v0, 0xa8($s0) -/* A042A0 80241A60 C600001C */ lwc1 $f0, 0x1c($s0) -/* A042A4 80241A64 C604003C */ lwc1 $f4, 0x3c($s0) -/* A042A8 80241A68 44821000 */ mtc1 $v0, $f2 -/* A042AC 80241A6C 00000000 */ nop -/* A042B0 80241A70 468010A0 */ cvt.s.w $f2, $f2 -/* A042B4 80241A74 46000005 */ abs.s $f0, $f0 -/* A042B8 80241A78 46020000 */ add.s $f0, $f0, $f2 -/* A042BC 80241A7C C6060040 */ lwc1 $f6, 0x40($s0) -/* A042C0 80241A80 27A20024 */ addiu $v0, $sp, 0x24 -/* A042C4 80241A84 46022100 */ add.s $f4, $f4, $f2 -/* A042C8 80241A88 3C014024 */ lui $at, 0x4024 -/* A042CC 80241A8C 44811800 */ mtc1 $at, $f3 -/* A042D0 80241A90 44801000 */ mtc1 $zero, $f2 -/* A042D4 80241A94 46000021 */ cvt.d.s $f0, $f0 -/* A042D8 80241A98 46220000 */ add.d $f0, $f0, $f2 -/* A042DC 80241A9C E7A60020 */ swc1 $f6, 0x20($sp) -/* A042E0 80241AA0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* A042E4 80241AA4 46200020 */ cvt.s.d $f0, $f0 -/* A042E8 80241AA8 E7A00024 */ swc1 $f0, 0x24($sp) -/* A042EC 80241AAC AFA20010 */ sw $v0, 0x10($sp) -/* A042F0 80241AB0 8E040080 */ lw $a0, 0x80($s0) -/* A042F4 80241AB4 0C0372DF */ jal func_800DCB7C -/* A042F8 80241AB8 27A70020 */ addiu $a3, $sp, 0x20 -/* A042FC 80241ABC 10400015 */ beqz $v0, .L80241B14 -/* A04300 80241AC0 00000000 */ nop -/* A04304 80241AC4 860200A8 */ lh $v0, 0xa8($s0) -/* A04308 80241AC8 C604001C */ lwc1 $f4, 0x1c($s0) -/* A0430C 80241ACC 44820000 */ mtc1 $v0, $f0 -/* A04310 80241AD0 00000000 */ nop -/* A04314 80241AD4 46800020 */ cvt.s.w $f0, $f0 -/* A04318 80241AD8 46002085 */ abs.s $f2, $f4 -/* A0431C 80241ADC 46020000 */ add.s $f0, $f0, $f2 -/* A04320 80241AE0 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A04324 80241AE4 4600103E */ c.le.s $f2, $f0 -/* A04328 80241AE8 00000000 */ nop -/* A0432C 80241AEC 45000005 */ bc1f .L80241B04 -/* A04330 80241AF0 00000000 */ nop -/* A04334 80241AF4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A04338 80241AF8 AE00001C */ sw $zero, 0x1c($s0) -/* A0433C 80241AFC 080906D6 */ j .L80241B58 -/* A04340 80241B00 E600003C */ swc1 $f0, 0x3c($s0) -.L80241B04: -/* A04344 80241B04 C600003C */ lwc1 $f0, 0x3c($s0) -/* A04348 80241B08 46040000 */ add.s $f0, $f0, $f4 -/* A0434C 80241B0C 080906D6 */ j .L80241B58 -/* A04350 80241B10 E600003C */ swc1 $f0, 0x3c($s0) -.L80241B14: -/* A04354 80241B14 C606003C */ lwc1 $f6, 0x3c($s0) -/* A04358 80241B18 860200A8 */ lh $v0, 0xa8($s0) -/* A0435C 80241B1C 46163081 */ sub.s $f2, $f6, $f22 -/* A04360 80241B20 44820000 */ mtc1 $v0, $f0 -/* A04364 80241B24 00000000 */ nop -/* A04368 80241B28 46800020 */ cvt.s.w $f0, $f0 -/* A0436C 80241B2C 46001080 */ add.s $f2, $f2, $f0 -/* A04370 80241B30 C604001C */ lwc1 $f4, 0x1c($s0) -/* A04374 80241B34 46002005 */ abs.s $f0, $f4 -/* A04378 80241B38 4602003C */ c.lt.s $f0, $f2 -/* A0437C 80241B3C 00000000 */ nop -/* A04380 80241B40 45020005 */ bc1fl .L80241B58 -/* A04384 80241B44 AE00001C */ sw $zero, 0x1c($s0) -/* A04388 80241B48 46043000 */ add.s $f0, $f6, $f4 -/* A0438C 80241B4C 080906D6 */ j .L80241B58 -/* A04390 80241B50 E600003C */ swc1 $f0, 0x3c($s0) -.L80241B54: -/* A04394 80241B54 AE00001C */ sw $zero, 0x1c($s0) -.L80241B58: -/* A04398 80241B58 8FBF0038 */ lw $ra, 0x38($sp) -/* A0439C 80241B5C 8FB30034 */ lw $s3, 0x34($sp) -/* A043A0 80241B60 8FB20030 */ lw $s2, 0x30($sp) -/* A043A4 80241B64 8FB1002C */ lw $s1, 0x2c($sp) -/* A043A8 80241B68 8FB00028 */ lw $s0, 0x28($sp) -/* A043AC 80241B6C D7B60048 */ ldc1 $f22, 0x48($sp) -/* A043B0 80241B70 D7B40040 */ ldc1 $f20, 0x40($sp) -/* A043B4 80241B74 03E00008 */ jr $ra -/* A043B8 80241B78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s new file mode 100644 index 0000000000..5f1e30524c --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802417EC_A0402C.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417EC_A0402C +/* A0402C 802417EC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A04030 802417F0 AFB20030 */ sw $s2, 0x30($sp) +/* A04034 802417F4 0080902D */ daddu $s2, $a0, $zero +/* A04038 802417F8 AFBF0038 */ sw $ra, 0x38($sp) +/* A0403C 802417FC AFB30034 */ sw $s3, 0x34($sp) +/* A04040 80241800 AFB1002C */ sw $s1, 0x2c($sp) +/* A04044 80241804 AFB00028 */ sw $s0, 0x28($sp) +/* A04048 80241808 F7B60048 */ sdc1 $f22, 0x48($sp) +/* A0404C 8024180C F7B40040 */ sdc1 $f20, 0x40($sp) +/* A04050 80241810 8E510148 */ lw $s1, 0x148($s2) +/* A04054 80241814 86240008 */ lh $a0, 8($s1) +/* A04058 80241818 0C00EABB */ jal get_npc_unsafe +/* A0405C 8024181C 00A0982D */ daddu $s3, $a1, $zero +/* A04060 80241820 0040802D */ daddu $s0, $v0, $zero +/* A04064 80241824 0200202D */ daddu $a0, $s0, $zero +/* A04068 80241828 C6220088 */ lwc1 $f2, 0x88($s1) +/* A0406C 8024182C 468010A0 */ cvt.s.w $f2, $f2 +/* A04070 80241830 460010A1 */ cvt.d.s $f2, $f2 +/* A04074 80241834 C604001C */ lwc1 $f4, 0x1c($s0) +/* A04078 80241838 C6000014 */ lwc1 $f0, 0x14($s0) +/* A0407C 8024183C 8E050018 */ lw $a1, 0x18($s0) +/* A04080 80241840 46002100 */ add.s $f4, $f4, $f0 +/* A04084 80241844 8E06000C */ lw $a2, 0xc($s0) +/* A04088 80241848 C6200078 */ lwc1 $f0, 0x78($s1) +/* A0408C 8024184C 46800020 */ cvt.s.w $f0, $f0 +/* A04090 80241850 E604001C */ swc1 $f4, 0x1c($s0) +/* A04094 80241854 3C014059 */ lui $at, 0x4059 +/* A04098 80241858 44812800 */ mtc1 $at, $f5 +/* A0409C 8024185C 44802000 */ mtc1 $zero, $f4 +/* A040A0 80241860 46000021 */ cvt.d.s $f0, $f0 +/* A040A4 80241864 46240003 */ div.d $f0, $f0, $f4 +/* A040A8 80241868 46200520 */ cvt.s.d $f20, $f0 +/* A040AC 8024186C 46241083 */ div.d $f2, $f2, $f4 +/* A040B0 80241870 0C00EA95 */ jal npc_move_heading +/* A040B4 80241874 462015A0 */ cvt.s.d $f22, $f2 +/* A040B8 80241878 C604001C */ lwc1 $f4, 0x1c($s0) +/* A040BC 8024187C 44801000 */ mtc1 $zero, $f2 +/* A040C0 80241880 44801800 */ mtc1 $zero, $f3 +/* A040C4 80241884 46002021 */ cvt.d.s $f0, $f4 +/* A040C8 80241888 4620103E */ c.le.d $f2, $f0 +/* A040CC 8024188C 00000000 */ nop +/* A040D0 80241890 45000030 */ bc1f .L80241954 +/* A040D4 80241894 00000000 */ nop +/* A040D8 80241898 C600003C */ lwc1 $f0, 0x3c($s0) +/* A040DC 8024189C 46040000 */ add.s $f0, $f0, $f4 +/* A040E0 802418A0 E600003C */ swc1 $f0, 0x3c($s0) +/* A040E4 802418A4 8E2200CC */ lw $v0, 0xcc($s1) +/* A040E8 802418A8 8C420024 */ lw $v0, 0x24($v0) +/* A040EC 802418AC AE020028 */ sw $v0, 0x28($s0) +/* A040F0 802418B0 A2200007 */ sb $zero, 7($s1) +/* A040F4 802418B4 8E020000 */ lw $v0, ($s0) +/* A040F8 802418B8 30420008 */ andi $v0, $v0, 8 +/* A040FC 802418BC 14400011 */ bnez $v0, .L80241904 +/* A04100 802418C0 0000102D */ daddu $v0, $zero, $zero +/* A04104 802418C4 27A50018 */ addiu $a1, $sp, 0x18 +/* A04108 802418C8 27A6001C */ addiu $a2, $sp, 0x1c +/* A0410C 802418CC C6000038 */ lwc1 $f0, 0x38($s0) +/* A04110 802418D0 C602003C */ lwc1 $f2, 0x3c($s0) +/* A04114 802418D4 C6040040 */ lwc1 $f4, 0x40($s0) +/* A04118 802418D8 3C01447A */ lui $at, 0x447a +/* A0411C 802418DC 44813000 */ mtc1 $at, $f6 +/* A04120 802418E0 27A20024 */ addiu $v0, $sp, 0x24 +/* A04124 802418E4 E7A00018 */ swc1 $f0, 0x18($sp) +/* A04128 802418E8 E7A2001C */ swc1 $f2, 0x1c($sp) +/* A0412C 802418EC E7A40020 */ swc1 $f4, 0x20($sp) +/* A04130 802418F0 E7A60024 */ swc1 $f6, 0x24($sp) +/* A04134 802418F4 AFA20010 */ sw $v0, 0x10($sp) +/* A04138 802418F8 8E040080 */ lw $a0, 0x80($s0) +/* A0413C 802418FC 0C0372DF */ jal func_800DCB7C +/* A04140 80241900 27A70020 */ addiu $a3, $sp, 0x20 +.L80241904: +/* A04144 80241904 1040000B */ beqz $v0, .L80241934 +/* A04148 80241908 00000000 */ nop +/* A0414C 8024190C C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A04150 80241910 46140080 */ add.s $f2, $f0, $f20 +/* A04154 80241914 C600003C */ lwc1 $f0, 0x3c($s0) +/* A04158 80241918 4600103E */ c.le.s $f2, $f0 +/* A0415C 8024191C 00000000 */ nop +/* A04160 80241920 4500008D */ bc1f .L80241B58 +/* A04164 80241924 00000000 */ nop +/* A04168 80241928 E602003C */ swc1 $f2, 0x3c($s0) +/* A0416C 8024192C 080906D6 */ j .L80241B58 +/* A04170 80241930 AE400070 */ sw $zero, 0x70($s2) +.L80241934: +/* A04174 80241934 C602003C */ lwc1 $f2, 0x3c($s0) +/* A04178 80241938 C6000064 */ lwc1 $f0, 0x64($s0) +/* A0417C 8024193C 4602003E */ c.le.s $f0, $f2 +/* A04180 80241940 00000000 */ nop +/* A04184 80241944 45030084 */ bc1tl .L80241B58 +/* A04188 80241948 AE400070 */ sw $zero, 0x70($s2) +/* A0418C 8024194C 080906D6 */ j .L80241B58 +/* A04190 80241950 00000000 */ nop +.L80241954: +/* A04194 80241954 4622003C */ c.lt.d $f0, $f2 +/* A04198 80241958 00000000 */ nop +/* A0419C 8024195C 4500007E */ bc1f .L80241B58 +/* A041A0 80241960 00000000 */ nop +/* A041A4 80241964 9602008E */ lhu $v0, 0x8e($s0) +/* A041A8 80241968 24420001 */ addiu $v0, $v0, 1 +/* A041AC 8024196C A602008E */ sh $v0, 0x8e($s0) +/* A041B0 80241970 00021400 */ sll $v0, $v0, 0x10 +/* A041B4 80241974 8E630020 */ lw $v1, 0x20($s3) +/* A041B8 80241978 00021403 */ sra $v0, $v0, 0x10 +/* A041BC 8024197C 0043102A */ slt $v0, $v0, $v1 +/* A041C0 80241980 14400026 */ bnez $v0, .L80241A1C +/* A041C4 80241984 00000000 */ nop +/* A041C8 80241988 C60C0038 */ lwc1 $f12, 0x38($s0) +/* A041CC 8024198C C60E0040 */ lwc1 $f14, 0x40($s0) +/* A041D0 80241990 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A041D4 80241994 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A041D8 80241998 A600008E */ sh $zero, 0x8e($s0) +/* A041DC 8024199C 8C460028 */ lw $a2, 0x28($v0) +/* A041E0 802419A0 0C00A720 */ jal atan2 +/* A041E4 802419A4 8C470030 */ lw $a3, 0x30($v0) +/* A041E8 802419A8 46000506 */ mov.s $f20, $f0 +/* A041EC 802419AC C60C000C */ lwc1 $f12, 0xc($s0) +/* A041F0 802419B0 0C00A70A */ jal get_clamped_angle_diff +/* A041F4 802419B4 4600A386 */ mov.s $f14, $f20 +/* A041F8 802419B8 46000086 */ mov.s $f2, $f0 +/* A041FC 802419BC 8E62001C */ lw $v0, 0x1c($s3) +/* A04200 802419C0 46001005 */ abs.s $f0, $f2 +/* A04204 802419C4 44822000 */ mtc1 $v0, $f4 +/* A04208 802419C8 00000000 */ nop +/* A0420C 802419CC 46802120 */ cvt.s.w $f4, $f4 +/* A04210 802419D0 4600203C */ c.lt.s $f4, $f0 +/* A04214 802419D4 00000000 */ nop +/* A04218 802419D8 4500000D */ bc1f .L80241A10 +/* A0421C 802419DC 00000000 */ nop +/* A04220 802419E0 44800000 */ mtc1 $zero, $f0 +/* A04224 802419E4 C614000C */ lwc1 $f20, 0xc($s0) +/* A04228 802419E8 4600103C */ c.lt.s $f2, $f0 +/* A0422C 802419EC 00000000 */ nop +/* A04230 802419F0 45000006 */ bc1f .L80241A0C +/* A04234 802419F4 00021023 */ negu $v0, $v0 +/* A04238 802419F8 44820000 */ mtc1 $v0, $f0 +/* A0423C 802419FC 00000000 */ nop +/* A04240 80241A00 46800020 */ cvt.s.w $f0, $f0 +/* A04244 80241A04 08090684 */ j .L80241A10 +/* A04248 80241A08 4600A500 */ add.s $f20, $f20, $f0 +.L80241A0C: +/* A0424C 80241A0C 4604A500 */ add.s $f20, $f20, $f4 +.L80241A10: +/* A04250 80241A10 0C00A6C9 */ jal clamp_angle +/* A04254 80241A14 4600A306 */ mov.s $f12, $f20 +/* A04258 80241A18 E600000C */ swc1 $f0, 0xc($s0) +.L80241A1C: +/* A0425C 80241A1C 8E020000 */ lw $v0, ($s0) +/* A04260 80241A20 30420008 */ andi $v0, $v0, 8 +/* A04264 80241A24 1040000A */ beqz $v0, .L80241A50 +/* A04268 80241A28 27A50018 */ addiu $a1, $sp, 0x18 +/* A0426C 80241A2C C602003C */ lwc1 $f2, 0x3c($s0) +/* A04270 80241A30 C600001C */ lwc1 $f0, 0x1c($s0) +/* A04274 80241A34 46001080 */ add.s $f2, $f2, $f0 +/* A04278 80241A38 4616103C */ c.lt.s $f2, $f22 +/* A0427C 80241A3C 00000000 */ nop +/* A04280 80241A40 45020045 */ bc1fl .L80241B58 +/* A04284 80241A44 E602003C */ swc1 $f2, 0x3c($s0) +/* A04288 80241A48 080906D5 */ j .L80241B54 +/* A0428C 80241A4C E616003C */ swc1 $f22, 0x3c($s0) +.L80241A50: +/* A04290 80241A50 C6000038 */ lwc1 $f0, 0x38($s0) +/* A04294 80241A54 27A6001C */ addiu $a2, $sp, 0x1c +/* A04298 80241A58 E7A00018 */ swc1 $f0, 0x18($sp) +/* A0429C 80241A5C 860200A8 */ lh $v0, 0xa8($s0) +/* A042A0 80241A60 C600001C */ lwc1 $f0, 0x1c($s0) +/* A042A4 80241A64 C604003C */ lwc1 $f4, 0x3c($s0) +/* A042A8 80241A68 44821000 */ mtc1 $v0, $f2 +/* A042AC 80241A6C 00000000 */ nop +/* A042B0 80241A70 468010A0 */ cvt.s.w $f2, $f2 +/* A042B4 80241A74 46000005 */ abs.s $f0, $f0 +/* A042B8 80241A78 46020000 */ add.s $f0, $f0, $f2 +/* A042BC 80241A7C C6060040 */ lwc1 $f6, 0x40($s0) +/* A042C0 80241A80 27A20024 */ addiu $v0, $sp, 0x24 +/* A042C4 80241A84 46022100 */ add.s $f4, $f4, $f2 +/* A042C8 80241A88 3C014024 */ lui $at, 0x4024 +/* A042CC 80241A8C 44811800 */ mtc1 $at, $f3 +/* A042D0 80241A90 44801000 */ mtc1 $zero, $f2 +/* A042D4 80241A94 46000021 */ cvt.d.s $f0, $f0 +/* A042D8 80241A98 46220000 */ add.d $f0, $f0, $f2 +/* A042DC 80241A9C E7A60020 */ swc1 $f6, 0x20($sp) +/* A042E0 80241AA0 E7A4001C */ swc1 $f4, 0x1c($sp) +/* A042E4 80241AA4 46200020 */ cvt.s.d $f0, $f0 +/* A042E8 80241AA8 E7A00024 */ swc1 $f0, 0x24($sp) +/* A042EC 80241AAC AFA20010 */ sw $v0, 0x10($sp) +/* A042F0 80241AB0 8E040080 */ lw $a0, 0x80($s0) +/* A042F4 80241AB4 0C0372DF */ jal func_800DCB7C +/* A042F8 80241AB8 27A70020 */ addiu $a3, $sp, 0x20 +/* A042FC 80241ABC 10400015 */ beqz $v0, .L80241B14 +/* A04300 80241AC0 00000000 */ nop +/* A04304 80241AC4 860200A8 */ lh $v0, 0xa8($s0) +/* A04308 80241AC8 C604001C */ lwc1 $f4, 0x1c($s0) +/* A0430C 80241ACC 44820000 */ mtc1 $v0, $f0 +/* A04310 80241AD0 00000000 */ nop +/* A04314 80241AD4 46800020 */ cvt.s.w $f0, $f0 +/* A04318 80241AD8 46002085 */ abs.s $f2, $f4 +/* A0431C 80241ADC 46020000 */ add.s $f0, $f0, $f2 +/* A04320 80241AE0 C7A20024 */ lwc1 $f2, 0x24($sp) +/* A04324 80241AE4 4600103E */ c.le.s $f2, $f0 +/* A04328 80241AE8 00000000 */ nop +/* A0432C 80241AEC 45000005 */ bc1f .L80241B04 +/* A04330 80241AF0 00000000 */ nop +/* A04334 80241AF4 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A04338 80241AF8 AE00001C */ sw $zero, 0x1c($s0) +/* A0433C 80241AFC 080906D6 */ j .L80241B58 +/* A04340 80241B00 E600003C */ swc1 $f0, 0x3c($s0) +.L80241B04: +/* A04344 80241B04 C600003C */ lwc1 $f0, 0x3c($s0) +/* A04348 80241B08 46040000 */ add.s $f0, $f0, $f4 +/* A0434C 80241B0C 080906D6 */ j .L80241B58 +/* A04350 80241B10 E600003C */ swc1 $f0, 0x3c($s0) +.L80241B14: +/* A04354 80241B14 C606003C */ lwc1 $f6, 0x3c($s0) +/* A04358 80241B18 860200A8 */ lh $v0, 0xa8($s0) +/* A0435C 80241B1C 46163081 */ sub.s $f2, $f6, $f22 +/* A04360 80241B20 44820000 */ mtc1 $v0, $f0 +/* A04364 80241B24 00000000 */ nop +/* A04368 80241B28 46800020 */ cvt.s.w $f0, $f0 +/* A0436C 80241B2C 46001080 */ add.s $f2, $f2, $f0 +/* A04370 80241B30 C604001C */ lwc1 $f4, 0x1c($s0) +/* A04374 80241B34 46002005 */ abs.s $f0, $f4 +/* A04378 80241B38 4602003C */ c.lt.s $f0, $f2 +/* A0437C 80241B3C 00000000 */ nop +/* A04380 80241B40 45020005 */ bc1fl .L80241B58 +/* A04384 80241B44 AE00001C */ sw $zero, 0x1c($s0) +/* A04388 80241B48 46043000 */ add.s $f0, $f6, $f4 +/* A0438C 80241B4C 080906D6 */ j .L80241B58 +/* A04390 80241B50 E600003C */ swc1 $f0, 0x3c($s0) +.L80241B54: +/* A04394 80241B54 AE00001C */ sw $zero, 0x1c($s0) +.L80241B58: +/* A04398 80241B58 8FBF0038 */ lw $ra, 0x38($sp) +/* A0439C 80241B5C 8FB30034 */ lw $s3, 0x34($sp) +/* A043A0 80241B60 8FB20030 */ lw $s2, 0x30($sp) +/* A043A4 80241B64 8FB1002C */ lw $s1, 0x2c($sp) +/* A043A8 80241B68 8FB00028 */ lw $s0, 0x28($sp) +/* A043AC 80241B6C D7B60048 */ ldc1 $f22, 0x48($sp) +/* A043B0 80241B70 D7B40040 */ ldc1 $f20, 0x40($sp) +/* A043B4 80241B74 03E00008 */ jr $ra +/* A043B8 80241B78 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C.s deleted file mode 100644 index eb4c718c52..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B7C -/* A043BC 80241B7C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* A043C0 80241B80 AFB00028 */ sw $s0, 0x28($sp) -/* A043C4 80241B84 00A0802D */ daddu $s0, $a1, $zero -/* A043C8 80241B88 AFB1002C */ sw $s1, 0x2c($sp) -/* A043CC 80241B8C 00C0882D */ daddu $s1, $a2, $zero -/* A043D0 80241B90 AFBF0034 */ sw $ra, 0x34($sp) -/* A043D4 80241B94 AFB20030 */ sw $s2, 0x30($sp) -/* A043D8 80241B98 AE200070 */ sw $zero, 0x70($s1) -/* A043DC 80241B9C 8C830000 */ lw $v1, ($a0) -/* A043E0 80241BA0 2402FDFF */ addiu $v0, $zero, -0x201 -/* A043E4 80241BA4 A480008E */ sh $zero, 0x8e($a0) -/* A043E8 80241BA8 00621824 */ and $v1, $v1, $v0 -/* A043EC 80241BAC 34650800 */ ori $a1, $v1, 0x800 -/* A043F0 80241BB0 AC850000 */ sw $a1, ($a0) -/* A043F4 80241BB4 8E0200D0 */ lw $v0, 0xd0($s0) -/* A043F8 80241BB8 8C420034 */ lw $v0, 0x34($v0) -/* A043FC 80241BBC 10400003 */ beqz $v0, .L80241BCC -/* A04400 80241BC0 00E0902D */ daddu $s2, $a3, $zero -/* A04404 80241BC4 080906F5 */ j .L80241BD4 -/* A04408 80241BC8 34620808 */ ori $v0, $v1, 0x808 -.L80241BCC: -/* A0440C 80241BCC 2402FFF7 */ addiu $v0, $zero, -9 -/* A04410 80241BD0 00A21024 */ and $v0, $a1, $v0 -.L80241BD4: -/* A04414 80241BD4 AC820000 */ sw $v0, ($a0) -/* A04418 80241BD8 27A20024 */ addiu $v0, $sp, 0x24 -/* A0441C 80241BDC 27A50018 */ addiu $a1, $sp, 0x18 -/* A04420 80241BE0 C4800038 */ lwc1 $f0, 0x38($a0) -/* A04424 80241BE4 C482003C */ lwc1 $f2, 0x3c($a0) -/* A04428 80241BE8 C4840040 */ lwc1 $f4, 0x40($a0) -/* A0442C 80241BEC 3C01447A */ lui $at, 0x447a -/* A04430 80241BF0 44813000 */ mtc1 $at, $f6 -/* A04434 80241BF4 27A6001C */ addiu $a2, $sp, 0x1c -/* A04438 80241BF8 E7A00018 */ swc1 $f0, 0x18($sp) -/* A0443C 80241BFC E7A2001C */ swc1 $f2, 0x1c($sp) -/* A04440 80241C00 E7A40020 */ swc1 $f4, 0x20($sp) -/* A04444 80241C04 E7A60024 */ swc1 $f6, 0x24($sp) -/* A04448 80241C08 AFA20010 */ sw $v0, 0x10($sp) -/* A0444C 80241C0C 8C840080 */ lw $a0, 0x80($a0) -/* A04450 80241C10 0C0372DF */ jal func_800DCB7C -/* A04454 80241C14 27A70020 */ addiu $a3, $sp, 0x20 -/* A04458 80241C18 C7A20024 */ lwc1 $f2, 0x24($sp) -/* A0445C 80241C1C 3C014059 */ lui $at, 0x4059 -/* A04460 80241C20 44812800 */ mtc1 $at, $f5 -/* A04464 80241C24 44802000 */ mtc1 $zero, $f4 -/* A04468 80241C28 460010A1 */ cvt.d.s $f2, $f2 -/* A0446C 80241C2C 46241082 */ mul.d $f2, $f2, $f4 -/* A04470 80241C30 00000000 */ nop -/* A04474 80241C34 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A04478 80241C38 46000021 */ cvt.d.s $f0, $f0 -/* A0447C 80241C3C 46240002 */ mul.d $f0, $f0, $f4 -/* A04480 80241C40 00000000 */ nop -/* A04484 80241C44 3C013FE0 */ lui $at, 0x3fe0 -/* A04488 80241C48 44812800 */ mtc1 $at, $f5 -/* A0448C 80241C4C 44802000 */ mtc1 $zero, $f4 -/* A04490 80241C50 00000000 */ nop -/* A04494 80241C54 46241080 */ add.d $f2, $f2, $f4 -/* A04498 80241C58 AE000074 */ sw $zero, 0x74($s0) -/* A0449C 80241C5C 46240000 */ add.d $f0, $f0, $f4 -/* A044A0 80241C60 AE000090 */ sw $zero, 0x90($s0) -/* A044A4 80241C64 4620120D */ trunc.w.d $f8, $f2 -/* A044A8 80241C68 E6080078 */ swc1 $f8, 0x78($s0) -/* A044AC 80241C6C 4620020D */ trunc.w.d $f8, $f0 -/* A044B0 80241C70 E6080088 */ swc1 $f8, 0x88($s0) -/* A044B4 80241C74 8E420014 */ lw $v0, 0x14($s2) -/* A044B8 80241C78 AE220074 */ sw $v0, 0x74($s1) -/* A044BC 80241C7C 8E0200B0 */ lw $v0, 0xb0($s0) -/* A044C0 80241C80 34420010 */ ori $v0, $v0, 0x10 -/* A044C4 80241C84 AE0200B0 */ sw $v0, 0xb0($s0) -/* A044C8 80241C88 8FBF0034 */ lw $ra, 0x34($sp) -/* A044CC 80241C8C 8FB20030 */ lw $s2, 0x30($sp) -/* A044D0 80241C90 8FB1002C */ lw $s1, 0x2c($sp) -/* A044D4 80241C94 8FB00028 */ lw $s0, 0x28($sp) -/* A044D8 80241C98 03E00008 */ jr $ra -/* A044DC 80241C9C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s new file mode 100644 index 0000000000..4c7f2b1012 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241B7C_A043BC.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B7C_A043BC +/* A043BC 80241B7C 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* A043C0 80241B80 AFB00028 */ sw $s0, 0x28($sp) +/* A043C4 80241B84 00A0802D */ daddu $s0, $a1, $zero +/* A043C8 80241B88 AFB1002C */ sw $s1, 0x2c($sp) +/* A043CC 80241B8C 00C0882D */ daddu $s1, $a2, $zero +/* A043D0 80241B90 AFBF0034 */ sw $ra, 0x34($sp) +/* A043D4 80241B94 AFB20030 */ sw $s2, 0x30($sp) +/* A043D8 80241B98 AE200070 */ sw $zero, 0x70($s1) +/* A043DC 80241B9C 8C830000 */ lw $v1, ($a0) +/* A043E0 80241BA0 2402FDFF */ addiu $v0, $zero, -0x201 +/* A043E4 80241BA4 A480008E */ sh $zero, 0x8e($a0) +/* A043E8 80241BA8 00621824 */ and $v1, $v1, $v0 +/* A043EC 80241BAC 34650800 */ ori $a1, $v1, 0x800 +/* A043F0 80241BB0 AC850000 */ sw $a1, ($a0) +/* A043F4 80241BB4 8E0200D0 */ lw $v0, 0xd0($s0) +/* A043F8 80241BB8 8C420034 */ lw $v0, 0x34($v0) +/* A043FC 80241BBC 10400003 */ beqz $v0, .L80241BCC +/* A04400 80241BC0 00E0902D */ daddu $s2, $a3, $zero +/* A04404 80241BC4 080906F5 */ j .L80241BD4 +/* A04408 80241BC8 34620808 */ ori $v0, $v1, 0x808 +.L80241BCC: +/* A0440C 80241BCC 2402FFF7 */ addiu $v0, $zero, -9 +/* A04410 80241BD0 00A21024 */ and $v0, $a1, $v0 +.L80241BD4: +/* A04414 80241BD4 AC820000 */ sw $v0, ($a0) +/* A04418 80241BD8 27A20024 */ addiu $v0, $sp, 0x24 +/* A0441C 80241BDC 27A50018 */ addiu $a1, $sp, 0x18 +/* A04420 80241BE0 C4800038 */ lwc1 $f0, 0x38($a0) +/* A04424 80241BE4 C482003C */ lwc1 $f2, 0x3c($a0) +/* A04428 80241BE8 C4840040 */ lwc1 $f4, 0x40($a0) +/* A0442C 80241BEC 3C01447A */ lui $at, 0x447a +/* A04430 80241BF0 44813000 */ mtc1 $at, $f6 +/* A04434 80241BF4 27A6001C */ addiu $a2, $sp, 0x1c +/* A04438 80241BF8 E7A00018 */ swc1 $f0, 0x18($sp) +/* A0443C 80241BFC E7A2001C */ swc1 $f2, 0x1c($sp) +/* A04440 80241C00 E7A40020 */ swc1 $f4, 0x20($sp) +/* A04444 80241C04 E7A60024 */ swc1 $f6, 0x24($sp) +/* A04448 80241C08 AFA20010 */ sw $v0, 0x10($sp) +/* A0444C 80241C0C 8C840080 */ lw $a0, 0x80($a0) +/* A04450 80241C10 0C0372DF */ jal func_800DCB7C +/* A04454 80241C14 27A70020 */ addiu $a3, $sp, 0x20 +/* A04458 80241C18 C7A20024 */ lwc1 $f2, 0x24($sp) +/* A0445C 80241C1C 3C014059 */ lui $at, 0x4059 +/* A04460 80241C20 44812800 */ mtc1 $at, $f5 +/* A04464 80241C24 44802000 */ mtc1 $zero, $f4 +/* A04468 80241C28 460010A1 */ cvt.d.s $f2, $f2 +/* A0446C 80241C2C 46241082 */ mul.d $f2, $f2, $f4 +/* A04470 80241C30 00000000 */ nop +/* A04474 80241C34 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A04478 80241C38 46000021 */ cvt.d.s $f0, $f0 +/* A0447C 80241C3C 46240002 */ mul.d $f0, $f0, $f4 +/* A04480 80241C40 00000000 */ nop +/* A04484 80241C44 3C013FE0 */ lui $at, 0x3fe0 +/* A04488 80241C48 44812800 */ mtc1 $at, $f5 +/* A0448C 80241C4C 44802000 */ mtc1 $zero, $f4 +/* A04490 80241C50 00000000 */ nop +/* A04494 80241C54 46241080 */ add.d $f2, $f2, $f4 +/* A04498 80241C58 AE000074 */ sw $zero, 0x74($s0) +/* A0449C 80241C5C 46240000 */ add.d $f0, $f0, $f4 +/* A044A0 80241C60 AE000090 */ sw $zero, 0x90($s0) +/* A044A4 80241C64 4620120D */ trunc.w.d $f8, $f2 +/* A044A8 80241C68 E6080078 */ swc1 $f8, 0x78($s0) +/* A044AC 80241C6C 4620020D */ trunc.w.d $f8, $f0 +/* A044B0 80241C70 E6080088 */ swc1 $f8, 0x88($s0) +/* A044B4 80241C74 8E420014 */ lw $v0, 0x14($s2) +/* A044B8 80241C78 AE220074 */ sw $v0, 0x74($s1) +/* A044BC 80241C7C 8E0200B0 */ lw $v0, 0xb0($s0) +/* A044C0 80241C80 34420010 */ ori $v0, $v0, 0x10 +/* A044C4 80241C84 AE0200B0 */ sw $v0, 0xb0($s0) +/* A044C8 80241C88 8FBF0034 */ lw $ra, 0x34($sp) +/* A044CC 80241C8C 8FB20030 */ lw $s2, 0x30($sp) +/* A044D0 80241C90 8FB1002C */ lw $s1, 0x2c($sp) +/* A044D4 80241C94 8FB00028 */ lw $s0, 0x28($sp) +/* A044D8 80241C98 03E00008 */ jr $ra +/* A044DC 80241C9C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s index 7a9fd056f2..1369a223d6 100644 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241CA0_A044E0.s @@ -46,7 +46,7 @@ glabel func_80241CA0_A044E0 /* A04584 80241D44 02A0202D */ daddu $a0, $s5, $zero /* A04588 80241D48 0240282D */ daddu $a1, $s2, $zero /* A0458C 80241D4C 0280302D */ daddu $a2, $s4, $zero -/* A04590 80241D50 0C0906DF */ jal func_80241B7C +/* A04590 80241D50 0C0906DF */ jal func_80241B7C_A043BC /* A04594 80241D54 0200382D */ daddu $a3, $s0, $zero .L80241D58: /* A04598 80241D58 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_80241CA0_A044E0 /* A045E8 80241DA8 00000000 */ nop /* A045EC 80241DAC 0280202D */ daddu $a0, $s4, $zero /* A045F0 80241DB0 0200282D */ daddu $a1, $s0, $zero -/* A045F4 80241DB4 0C090265 */ jal func_80240994 +/* A045F4 80241DB4 0C090265 */ jal func_80240994_A031D4 /* A045F8 80241DB8 0260302D */ daddu $a2, $s3, $zero /* A045FC 80241DBC 0280202D */ daddu $a0, $s4, $zero /* A04600 80241DC0 0200282D */ daddu $a1, $s0, $zero -/* A04604 80241DC4 0C0902D1 */ jal func_80240B44 +/* A04604 80241DC4 0C0902D1 */ jal func_80240B44_A03384 /* A04608 80241DC8 0260302D */ daddu $a2, $s3, $zero /* A0460C 80241DCC 0809079A */ j .L80241E68 /* A04610 80241DD0 0000102D */ daddu $v0, $zero, $zero /* A04614 80241DD4 0280202D */ daddu $a0, $s4, $zero /* A04618 80241DD8 0200282D */ daddu $a1, $s0, $zero -/* A0461C 80241DDC 0C09045B */ jal func_8024116C +/* A0461C 80241DDC 0C09045B */ jal func_8024116C_A039AC /* A04620 80241DE0 0260302D */ daddu $a2, $s3, $zero /* A04624 80241DE4 0280202D */ daddu $a0, $s4, $zero /* A04628 80241DE8 0200282D */ daddu $a1, $s0, $zero -/* A0462C 80241DEC 0C09048B */ jal func_8024122C +/* A0462C 80241DEC 0C09048B */ jal func_8024122C_A03A6C /* A04630 80241DF0 0260302D */ daddu $a2, $s3, $zero /* A04634 80241DF4 0809079A */ j .L80241E68 /* A04638 80241DF8 0000102D */ daddu $v0, $zero, $zero /* A0463C 80241DFC 0280202D */ daddu $a0, $s4, $zero /* A04640 80241E00 0200282D */ daddu $a1, $s0, $zero -/* A04644 80241E04 0C09055C */ jal func_80241570 +/* A04644 80241E04 0C09055C */ jal func_80241570_A03DB0 /* A04648 80241E08 0260302D */ daddu $a2, $s3, $zero /* A0464C 80241E0C 0280202D */ daddu $a0, $s4, $zero /* A04650 80241E10 0200282D */ daddu $a1, $s0, $zero -/* A04654 80241E14 0C09057A */ jal func_802415E8 +/* A04654 80241E14 0C09057A */ jal func_802415E8_A03E28 /* A04658 80241E18 0260302D */ daddu $a2, $s3, $zero /* A0465C 80241E1C 0809079A */ j .L80241E68 /* A04660 80241E20 0000102D */ daddu $v0, $zero, $zero /* A04664 80241E24 0280202D */ daddu $a0, $s4, $zero /* A04668 80241E28 0200282D */ daddu $a1, $s0, $zero -/* A0466C 80241E2C 0C090595 */ jal func_80241654 +/* A0466C 80241E2C 0C090595 */ jal func_80241654_A03E94 /* A04670 80241E30 0260302D */ daddu $a2, $s3, $zero /* A04674 80241E34 0809079A */ j .L80241E68 /* A04678 80241E38 0000102D */ daddu $v0, $zero, $zero /* A0467C 80241E3C 0280202D */ daddu $a0, $s4, $zero /* A04680 80241E40 0200282D */ daddu $a1, $s0, $zero -/* A04684 80241E44 0C0905E2 */ jal func_80241788 +/* A04684 80241E44 0C0905E2 */ jal func_80241788_A03FC8 /* A04688 80241E48 0260302D */ daddu $a2, $s3, $zero /* A0468C 80241E4C 0809079A */ j .L80241E68 /* A04690 80241E50 0000102D */ daddu $v0, $zero, $zero /* A04694 80241E54 0280202D */ daddu $a0, $s4, $zero /* A04698 80241E58 0200282D */ daddu $a1, $s0, $zero -/* A0469C 80241E5C 0C0905FB */ jal func_802417EC +/* A0469C 80241E5C 0C0905FB */ jal func_802417EC_A0402C /* A046A0 80241E60 0260302D */ daddu $a2, $s3, $zero .L80241E64: /* A046A4 80241E64 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4.s deleted file mode 100644 index f43b2c5e16..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FB4 -/* A047F4 80241FB4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A047F8 80241FB8 AFB20018 */ sw $s2, 0x18($sp) -/* A047FC 80241FBC 0080902D */ daddu $s2, $a0, $zero -/* A04800 80241FC0 AFBF001C */ sw $ra, 0x1c($sp) -/* A04804 80241FC4 AFB10014 */ sw $s1, 0x14($sp) -/* A04808 80241FC8 AFB00010 */ sw $s0, 0x10($sp) -/* A0480C 80241FCC 8E510148 */ lw $s1, 0x148($s2) -/* A04810 80241FD0 0C00EABB */ jal get_npc_unsafe -/* A04814 80241FD4 86240008 */ lh $a0, 8($s1) -/* A04818 80241FD8 0040802D */ daddu $s0, $v0, $zero -/* A0481C 80241FDC C602001C */ lwc1 $f2, 0x1c($s0) -/* A04820 80241FE0 C6000014 */ lwc1 $f0, 0x14($s0) -/* A04824 80241FE4 8E050018 */ lw $a1, 0x18($s0) -/* A04828 80241FE8 46001080 */ add.s $f2, $f2, $f0 -/* A0482C 80241FEC C600003C */ lwc1 $f0, 0x3c($s0) -/* A04830 80241FF0 8E06000C */ lw $a2, 0xc($s0) -/* A04834 80241FF4 46020000 */ add.s $f0, $f0, $f2 -/* A04838 80241FF8 0200202D */ daddu $a0, $s0, $zero -/* A0483C 80241FFC E602001C */ swc1 $f2, 0x1c($s0) -/* A04840 80242000 0C00EA95 */ jal npc_move_heading -/* A04844 80242004 E600003C */ swc1 $f0, 0x3c($s0) -/* A04848 80242008 9602008E */ lhu $v0, 0x8e($s0) -/* A0484C 8024200C 2442FFFF */ addiu $v0, $v0, -1 -/* A04850 80242010 A602008E */ sh $v0, 0x8e($s0) -/* A04854 80242014 00021400 */ sll $v0, $v0, 0x10 -/* A04858 80242018 1C40000F */ bgtz $v0, .L80242058 -/* A0485C 8024201C 00000000 */ nop -/* A04860 80242020 3C013E99 */ lui $at, 0x3e99 -/* A04864 80242024 3421999A */ ori $at, $at, 0x999a -/* A04868 80242028 44810000 */ mtc1 $at, $f0 -/* A0486C 8024202C 3C014040 */ lui $at, 0x4040 -/* A04870 80242030 44811000 */ mtc1 $at, $f2 -/* A04874 80242034 A2200007 */ sb $zero, 7($s1) -/* A04878 80242038 AE00001C */ sw $zero, 0x1c($s0) -/* A0487C 8024203C E6000014 */ swc1 $f0, 0x14($s0) -/* A04880 80242040 E6020018 */ swc1 $f2, 0x18($s0) -/* A04884 80242044 8E2200CC */ lw $v0, 0xcc($s1) -/* A04888 80242048 8C420028 */ lw $v0, 0x28($v0) -/* A0488C 8024204C AE020028 */ sw $v0, 0x28($s0) -/* A04890 80242050 2402000E */ addiu $v0, $zero, 0xe -/* A04894 80242054 AE420070 */ sw $v0, 0x70($s2) -.L80242058: -/* A04898 80242058 8FBF001C */ lw $ra, 0x1c($sp) -/* A0489C 8024205C 8FB20018 */ lw $s2, 0x18($sp) -/* A048A0 80242060 8FB10014 */ lw $s1, 0x14($sp) -/* A048A4 80242064 8FB00010 */ lw $s0, 0x10($sp) -/* A048A8 80242068 03E00008 */ jr $ra -/* A048AC 8024206C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s new file mode 100644 index 0000000000..820c7dc70f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80241FB4_A047F4.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FB4_A047F4 +/* A047F4 80241FB4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A047F8 80241FB8 AFB20018 */ sw $s2, 0x18($sp) +/* A047FC 80241FBC 0080902D */ daddu $s2, $a0, $zero +/* A04800 80241FC0 AFBF001C */ sw $ra, 0x1c($sp) +/* A04804 80241FC4 AFB10014 */ sw $s1, 0x14($sp) +/* A04808 80241FC8 AFB00010 */ sw $s0, 0x10($sp) +/* A0480C 80241FCC 8E510148 */ lw $s1, 0x148($s2) +/* A04810 80241FD0 0C00EABB */ jal get_npc_unsafe +/* A04814 80241FD4 86240008 */ lh $a0, 8($s1) +/* A04818 80241FD8 0040802D */ daddu $s0, $v0, $zero +/* A0481C 80241FDC C602001C */ lwc1 $f2, 0x1c($s0) +/* A04820 80241FE0 C6000014 */ lwc1 $f0, 0x14($s0) +/* A04824 80241FE4 8E050018 */ lw $a1, 0x18($s0) +/* A04828 80241FE8 46001080 */ add.s $f2, $f2, $f0 +/* A0482C 80241FEC C600003C */ lwc1 $f0, 0x3c($s0) +/* A04830 80241FF0 8E06000C */ lw $a2, 0xc($s0) +/* A04834 80241FF4 46020000 */ add.s $f0, $f0, $f2 +/* A04838 80241FF8 0200202D */ daddu $a0, $s0, $zero +/* A0483C 80241FFC E602001C */ swc1 $f2, 0x1c($s0) +/* A04840 80242000 0C00EA95 */ jal npc_move_heading +/* A04844 80242004 E600003C */ swc1 $f0, 0x3c($s0) +/* A04848 80242008 9602008E */ lhu $v0, 0x8e($s0) +/* A0484C 8024200C 2442FFFF */ addiu $v0, $v0, -1 +/* A04850 80242010 A602008E */ sh $v0, 0x8e($s0) +/* A04854 80242014 00021400 */ sll $v0, $v0, 0x10 +/* A04858 80242018 1C40000F */ bgtz $v0, .L80242058 +/* A0485C 8024201C 00000000 */ nop +/* A04860 80242020 3C013E99 */ lui $at, 0x3e99 +/* A04864 80242024 3421999A */ ori $at, $at, 0x999a +/* A04868 80242028 44810000 */ mtc1 $at, $f0 +/* A0486C 8024202C 3C014040 */ lui $at, 0x4040 +/* A04870 80242030 44811000 */ mtc1 $at, $f2 +/* A04874 80242034 A2200007 */ sb $zero, 7($s1) +/* A04878 80242038 AE00001C */ sw $zero, 0x1c($s0) +/* A0487C 8024203C E6000014 */ swc1 $f0, 0x14($s0) +/* A04880 80242040 E6020018 */ swc1 $f2, 0x18($s0) +/* A04884 80242044 8E2200CC */ lw $v0, 0xcc($s1) +/* A04888 80242048 8C420028 */ lw $v0, 0x28($v0) +/* A0488C 8024204C AE020028 */ sw $v0, 0x28($s0) +/* A04890 80242050 2402000E */ addiu $v0, $zero, 0xe +/* A04894 80242054 AE420070 */ sw $v0, 0x70($s2) +.L80242058: +/* A04898 80242058 8FBF001C */ lw $ra, 0x1c($sp) +/* A0489C 8024205C 8FB20018 */ lw $s2, 0x18($sp) +/* A048A0 80242060 8FB10014 */ lw $s1, 0x14($sp) +/* A048A4 80242064 8FB00010 */ lw $s0, 0x10($sp) +/* A048A8 80242068 03E00008 */ jr $ra +/* A048AC 8024206C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070.s deleted file mode 100644 index 48ec51568a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242070 -/* A048B0 80242070 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A048B4 80242074 AFB20030 */ sw $s2, 0x30($sp) -/* A048B8 80242078 0080902D */ daddu $s2, $a0, $zero -/* A048BC 8024207C AFBF0034 */ sw $ra, 0x34($sp) -/* A048C0 80242080 AFB1002C */ sw $s1, 0x2c($sp) -/* A048C4 80242084 AFB00028 */ sw $s0, 0x28($sp) -/* A048C8 80242088 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A048CC 8024208C 8E510148 */ lw $s1, 0x148($s2) -/* A048D0 80242090 0C00EABB */ jal get_npc_unsafe -/* A048D4 80242094 86240008 */ lh $a0, 8($s1) -/* A048D8 80242098 0040802D */ daddu $s0, $v0, $zero -/* A048DC 8024209C C604001C */ lwc1 $f4, 0x1c($s0) -/* A048E0 802420A0 C6000014 */ lwc1 $f0, 0x14($s0) -/* A048E4 802420A4 0200202D */ daddu $a0, $s0, $zero -/* A048E8 802420A8 46002100 */ add.s $f4, $f4, $f0 -/* A048EC 802420AC C602003C */ lwc1 $f2, 0x3c($s0) -/* A048F0 802420B0 8E050018 */ lw $a1, 0x18($s0) -/* A048F4 802420B4 46041080 */ add.s $f2, $f2, $f4 -/* A048F8 802420B8 8E06000C */ lw $a2, 0xc($s0) -/* A048FC 802420BC C6200078 */ lwc1 $f0, 0x78($s1) -/* A04900 802420C0 46800020 */ cvt.s.w $f0, $f0 -/* A04904 802420C4 E602003C */ swc1 $f2, 0x3c($s0) -/* A04908 802420C8 3C014059 */ lui $at, 0x4059 -/* A0490C 802420CC 44811800 */ mtc1 $at, $f3 -/* A04910 802420D0 44801000 */ mtc1 $zero, $f2 -/* A04914 802420D4 46000021 */ cvt.d.s $f0, $f0 -/* A04918 802420D8 E604001C */ swc1 $f4, 0x1c($s0) -/* A0491C 802420DC 46220003 */ div.d $f0, $f0, $f2 -/* A04920 802420E0 0C00EA95 */ jal npc_move_heading -/* A04924 802420E4 46200520 */ cvt.s.d $f20, $f0 -/* A04928 802420E8 27A50018 */ addiu $a1, $sp, 0x18 -/* A0492C 802420EC 27A6001C */ addiu $a2, $sp, 0x1c -/* A04930 802420F0 C6000038 */ lwc1 $f0, 0x38($s0) -/* A04934 802420F4 C602003C */ lwc1 $f2, 0x3c($s0) -/* A04938 802420F8 C6040040 */ lwc1 $f4, 0x40($s0) -/* A0493C 802420FC 3C01447A */ lui $at, 0x447a -/* A04940 80242100 44813000 */ mtc1 $at, $f6 -/* A04944 80242104 27A20024 */ addiu $v0, $sp, 0x24 -/* A04948 80242108 E7A00018 */ swc1 $f0, 0x18($sp) -/* A0494C 8024210C E7A2001C */ swc1 $f2, 0x1c($sp) -/* A04950 80242110 E7A40020 */ swc1 $f4, 0x20($sp) -/* A04954 80242114 E7A60024 */ swc1 $f6, 0x24($sp) -/* A04958 80242118 AFA20010 */ sw $v0, 0x10($sp) -/* A0495C 8024211C 8E040080 */ lw $a0, 0x80($s0) -/* A04960 80242120 0C0372DF */ jal func_800DCB7C -/* A04964 80242124 27A70020 */ addiu $a3, $sp, 0x20 -/* A04968 80242128 10400003 */ beqz $v0, .L80242138 -/* A0496C 8024212C 4600A086 */ mov.s $f2, $f20 -/* A04970 80242130 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A04974 80242134 46140080 */ add.s $f2, $f0, $f20 -.L80242138: -/* A04978 80242138 C600003C */ lwc1 $f0, 0x3c($s0) -/* A0497C 8024213C 4602003C */ c.lt.s $f0, $f2 -/* A04980 80242140 00000000 */ nop -/* A04984 80242144 45010009 */ bc1t .L8024216C -/* A04988 80242148 2402000A */ addiu $v0, $zero, 0xa -/* A0498C 8024214C A602008E */ sh $v0, 0x8e($s0) -/* A04990 80242150 8E2200CC */ lw $v0, 0xcc($s1) -/* A04994 80242154 8C42002C */ lw $v0, 0x2c($v0) -/* A04998 80242158 AE020028 */ sw $v0, 0x28($s0) -/* A0499C 8024215C 9622008E */ lhu $v0, 0x8e($s1) -/* A049A0 80242160 A60200A8 */ sh $v0, 0xa8($s0) -/* A049A4 80242164 2402000F */ addiu $v0, $zero, 0xf -/* A049A8 80242168 AE420070 */ sw $v0, 0x70($s2) -.L8024216C: -/* A049AC 8024216C 8FBF0034 */ lw $ra, 0x34($sp) -/* A049B0 80242170 8FB20030 */ lw $s2, 0x30($sp) -/* A049B4 80242174 8FB1002C */ lw $s1, 0x2c($sp) -/* A049B8 80242178 8FB00028 */ lw $s0, 0x28($sp) -/* A049BC 8024217C D7B40038 */ ldc1 $f20, 0x38($sp) -/* A049C0 80242180 03E00008 */ jr $ra -/* A049C4 80242184 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s new file mode 100644 index 0000000000..f762d6e66a --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242070_A048B0.s @@ -0,0 +1,76 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242070_A048B0 +/* A048B0 80242070 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A048B4 80242074 AFB20030 */ sw $s2, 0x30($sp) +/* A048B8 80242078 0080902D */ daddu $s2, $a0, $zero +/* A048BC 8024207C AFBF0034 */ sw $ra, 0x34($sp) +/* A048C0 80242080 AFB1002C */ sw $s1, 0x2c($sp) +/* A048C4 80242084 AFB00028 */ sw $s0, 0x28($sp) +/* A048C8 80242088 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A048CC 8024208C 8E510148 */ lw $s1, 0x148($s2) +/* A048D0 80242090 0C00EABB */ jal get_npc_unsafe +/* A048D4 80242094 86240008 */ lh $a0, 8($s1) +/* A048D8 80242098 0040802D */ daddu $s0, $v0, $zero +/* A048DC 8024209C C604001C */ lwc1 $f4, 0x1c($s0) +/* A048E0 802420A0 C6000014 */ lwc1 $f0, 0x14($s0) +/* A048E4 802420A4 0200202D */ daddu $a0, $s0, $zero +/* A048E8 802420A8 46002100 */ add.s $f4, $f4, $f0 +/* A048EC 802420AC C602003C */ lwc1 $f2, 0x3c($s0) +/* A048F0 802420B0 8E050018 */ lw $a1, 0x18($s0) +/* A048F4 802420B4 46041080 */ add.s $f2, $f2, $f4 +/* A048F8 802420B8 8E06000C */ lw $a2, 0xc($s0) +/* A048FC 802420BC C6200078 */ lwc1 $f0, 0x78($s1) +/* A04900 802420C0 46800020 */ cvt.s.w $f0, $f0 +/* A04904 802420C4 E602003C */ swc1 $f2, 0x3c($s0) +/* A04908 802420C8 3C014059 */ lui $at, 0x4059 +/* A0490C 802420CC 44811800 */ mtc1 $at, $f3 +/* A04910 802420D0 44801000 */ mtc1 $zero, $f2 +/* A04914 802420D4 46000021 */ cvt.d.s $f0, $f0 +/* A04918 802420D8 E604001C */ swc1 $f4, 0x1c($s0) +/* A0491C 802420DC 46220003 */ div.d $f0, $f0, $f2 +/* A04920 802420E0 0C00EA95 */ jal npc_move_heading +/* A04924 802420E4 46200520 */ cvt.s.d $f20, $f0 +/* A04928 802420E8 27A50018 */ addiu $a1, $sp, 0x18 +/* A0492C 802420EC 27A6001C */ addiu $a2, $sp, 0x1c +/* A04930 802420F0 C6000038 */ lwc1 $f0, 0x38($s0) +/* A04934 802420F4 C602003C */ lwc1 $f2, 0x3c($s0) +/* A04938 802420F8 C6040040 */ lwc1 $f4, 0x40($s0) +/* A0493C 802420FC 3C01447A */ lui $at, 0x447a +/* A04940 80242100 44813000 */ mtc1 $at, $f6 +/* A04944 80242104 27A20024 */ addiu $v0, $sp, 0x24 +/* A04948 80242108 E7A00018 */ swc1 $f0, 0x18($sp) +/* A0494C 8024210C E7A2001C */ swc1 $f2, 0x1c($sp) +/* A04950 80242110 E7A40020 */ swc1 $f4, 0x20($sp) +/* A04954 80242114 E7A60024 */ swc1 $f6, 0x24($sp) +/* A04958 80242118 AFA20010 */ sw $v0, 0x10($sp) +/* A0495C 8024211C 8E040080 */ lw $a0, 0x80($s0) +/* A04960 80242120 0C0372DF */ jal func_800DCB7C +/* A04964 80242124 27A70020 */ addiu $a3, $sp, 0x20 +/* A04968 80242128 10400003 */ beqz $v0, .L80242138 +/* A0496C 8024212C 4600A086 */ mov.s $f2, $f20 +/* A04970 80242130 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A04974 80242134 46140080 */ add.s $f2, $f0, $f20 +.L80242138: +/* A04978 80242138 C600003C */ lwc1 $f0, 0x3c($s0) +/* A0497C 8024213C 4602003C */ c.lt.s $f0, $f2 +/* A04980 80242140 00000000 */ nop +/* A04984 80242144 45010009 */ bc1t .L8024216C +/* A04988 80242148 2402000A */ addiu $v0, $zero, 0xa +/* A0498C 8024214C A602008E */ sh $v0, 0x8e($s0) +/* A04990 80242150 8E2200CC */ lw $v0, 0xcc($s1) +/* A04994 80242154 8C42002C */ lw $v0, 0x2c($v0) +/* A04998 80242158 AE020028 */ sw $v0, 0x28($s0) +/* A0499C 8024215C 9622008E */ lhu $v0, 0x8e($s1) +/* A049A0 80242160 A60200A8 */ sh $v0, 0xa8($s0) +/* A049A4 80242164 2402000F */ addiu $v0, $zero, 0xf +/* A049A8 80242168 AE420070 */ sw $v0, 0x70($s2) +.L8024216C: +/* A049AC 8024216C 8FBF0034 */ lw $ra, 0x34($sp) +/* A049B0 80242170 8FB20030 */ lw $s2, 0x30($sp) +/* A049B4 80242174 8FB1002C */ lw $s1, 0x2c($sp) +/* A049B8 80242178 8FB00028 */ lw $s0, 0x28($sp) +/* A049BC 8024217C D7B40038 */ ldc1 $f20, 0x38($sp) +/* A049C0 80242180 03E00008 */ jr $ra +/* A049C4 80242184 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188.s deleted file mode 100644 index 1eb990e7b3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242188 -/* A049C8 80242188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A049CC 8024218C AFB00010 */ sw $s0, 0x10($sp) -/* A049D0 80242190 0080802D */ daddu $s0, $a0, $zero -/* A049D4 80242194 AFBF0014 */ sw $ra, 0x14($sp) -/* A049D8 80242198 8E020148 */ lw $v0, 0x148($s0) -/* A049DC 8024219C 0C00EABB */ jal get_npc_unsafe -/* A049E0 802421A0 84440008 */ lh $a0, 8($v0) -/* A049E4 802421A4 9443008E */ lhu $v1, 0x8e($v0) -/* A049E8 802421A8 2463FFFF */ addiu $v1, $v1, -1 -/* A049EC 802421AC A443008E */ sh $v1, 0x8e($v0) -/* A049F0 802421B0 00031C00 */ sll $v1, $v1, 0x10 -/* A049F4 802421B4 58600001 */ blezl $v1, .L802421BC -/* A049F8 802421B8 AE000070 */ sw $zero, 0x70($s0) -.L802421BC: -/* A049FC 802421BC 8FBF0014 */ lw $ra, 0x14($sp) -/* A04A00 802421C0 8FB00010 */ lw $s0, 0x10($sp) -/* A04A04 802421C4 03E00008 */ jr $ra -/* A04A08 802421C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s new file mode 100644 index 0000000000..ea0ed7d733 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_80242188_A049C8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242188_A049C8 +/* A049C8 80242188 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A049CC 8024218C AFB00010 */ sw $s0, 0x10($sp) +/* A049D0 80242190 0080802D */ daddu $s0, $a0, $zero +/* A049D4 80242194 AFBF0014 */ sw $ra, 0x14($sp) +/* A049D8 80242198 8E020148 */ lw $v0, 0x148($s0) +/* A049DC 8024219C 0C00EABB */ jal get_npc_unsafe +/* A049E0 802421A0 84440008 */ lh $a0, 8($v0) +/* A049E4 802421A4 9443008E */ lhu $v1, 0x8e($v0) +/* A049E8 802421A8 2463FFFF */ addiu $v1, $v1, -1 +/* A049EC 802421AC A443008E */ sh $v1, 0x8e($v0) +/* A049F0 802421B0 00031C00 */ sll $v1, $v1, 0x10 +/* A049F4 802421B4 58600001 */ blezl $v1, .L802421BC +/* A049F8 802421B8 AE000070 */ sw $zero, 0x70($s0) +.L802421BC: +/* A049FC 802421BC 8FBF0014 */ lw $ra, 0x14($sp) +/* A04A00 802421C0 8FB00010 */ lw $s0, 0x10($sp) +/* A04A04 802421C4 03E00008 */ jr $ra +/* A04A08 802421C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC.s deleted file mode 100644 index 9f32522c09..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC.s +++ /dev/null @@ -1,157 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421CC -/* A04A0C 802421CC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A04A10 802421D0 AFB3003C */ sw $s3, 0x3c($sp) -/* A04A14 802421D4 0080982D */ daddu $s3, $a0, $zero -/* A04A18 802421D8 AFBF0048 */ sw $ra, 0x48($sp) -/* A04A1C 802421DC AFB50044 */ sw $s5, 0x44($sp) -/* A04A20 802421E0 AFB40040 */ sw $s4, 0x40($sp) -/* A04A24 802421E4 AFB20038 */ sw $s2, 0x38($sp) -/* A04A28 802421E8 AFB10034 */ sw $s1, 0x34($sp) -/* A04A2C 802421EC AFB00030 */ sw $s0, 0x30($sp) -/* A04A30 802421F0 8E720148 */ lw $s2, 0x148($s3) -/* A04A34 802421F4 86440008 */ lh $a0, 8($s2) -/* A04A38 802421F8 8E70000C */ lw $s0, 0xc($s3) -/* A04A3C 802421FC 0C00EABB */ jal get_npc_unsafe -/* A04A40 80242200 00A0882D */ daddu $s1, $a1, $zero -/* A04A44 80242204 0260202D */ daddu $a0, $s3, $zero -/* A04A48 80242208 8E050000 */ lw $a1, ($s0) -/* A04A4C 8024220C 0C0B1EAF */ jal get_variable -/* A04A50 80242210 0040A82D */ daddu $s5, $v0, $zero -/* A04A54 80242214 AFA00010 */ sw $zero, 0x10($sp) -/* A04A58 80242218 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A5C 8024221C 8C630030 */ lw $v1, 0x30($v1) -/* A04A60 80242220 AFA30014 */ sw $v1, 0x14($sp) -/* A04A64 80242224 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A68 80242228 8C63001C */ lw $v1, 0x1c($v1) -/* A04A6C 8024222C AFA30018 */ sw $v1, 0x18($sp) -/* A04A70 80242230 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A74 80242234 8C630024 */ lw $v1, 0x24($v1) -/* A04A78 80242238 AFA3001C */ sw $v1, 0x1c($sp) -/* A04A7C 8024223C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A80 80242240 8C630028 */ lw $v1, 0x28($v1) -/* A04A84 80242244 27B40010 */ addiu $s4, $sp, 0x10 -/* A04A88 80242248 AFA30020 */ sw $v1, 0x20($sp) -/* A04A8C 8024224C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A04A90 80242250 3C0142F0 */ lui $at, 0x42f0 -/* A04A94 80242254 44810000 */ mtc1 $at, $f0 -/* A04A98 80242258 8C63002C */ lw $v1, 0x2c($v1) -/* A04A9C 8024225C 0040802D */ daddu $s0, $v0, $zero -/* A04AA0 80242260 E7A00028 */ swc1 $f0, 0x28($sp) -/* A04AA4 80242264 A7A0002C */ sh $zero, 0x2c($sp) -/* A04AA8 80242268 12200009 */ beqz $s1, .L80242290 -/* A04AAC 8024226C AFA30024 */ sw $v1, 0x24($sp) -/* A04AB0 80242270 02A0202D */ daddu $a0, $s5, $zero -/* A04AB4 80242274 0240282D */ daddu $a1, $s2, $zero -/* A04AB8 80242278 0260302D */ daddu $a2, $s3, $zero -/* A04ABC 8024227C 0C0906DF */ jal func_80241B7C -/* A04AC0 80242280 0200382D */ daddu $a3, $s0, $zero -/* A04AC4 80242284 86A200A8 */ lh $v0, 0xa8($s5) -/* A04AC8 80242288 AE42008C */ sw $v0, 0x8c($s2) -/* A04ACC 8024228C AE600070 */ sw $zero, 0x70($s3) -.L80242290: -/* A04AD0 80242290 2402FFFD */ addiu $v0, $zero, -3 -/* A04AD4 80242294 A2A200AB */ sb $v0, 0xab($s5) -/* A04AD8 80242298 8E4300B0 */ lw $v1, 0xb0($s2) -/* A04ADC 8024229C 30620004 */ andi $v0, $v1, 4 -/* A04AE0 802422A0 10400007 */ beqz $v0, .L802422C0 -/* A04AE4 802422A4 00000000 */ nop -/* A04AE8 802422A8 824200B4 */ lb $v0, 0xb4($s2) -/* A04AEC 802422AC 14400052 */ bnez $v0, .L802423F8 -/* A04AF0 802422B0 0000102D */ daddu $v0, $zero, $zero -/* A04AF4 802422B4 2402FFFB */ addiu $v0, $zero, -5 -/* A04AF8 802422B8 00621024 */ and $v0, $v1, $v0 -/* A04AFC 802422BC AE4200B0 */ sw $v0, 0xb0($s2) -.L802422C0: -/* A04B00 802422C0 8E630070 */ lw $v1, 0x70($s3) -/* A04B04 802422C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* A04B08 802422C8 1040004A */ beqz $v0, .L802423F4 -/* A04B0C 802422CC 00031080 */ sll $v0, $v1, 2 -/* A04B10 802422D0 3C018024 */ lui $at, 0x8024 -/* A04B14 802422D4 00220821 */ addu $at, $at, $v0 -/* A04B18 802422D8 8C224678 */ lw $v0, 0x4678($at) -/* A04B1C 802422DC 00400008 */ jr $v0 -/* A04B20 802422E0 00000000 */ nop -/* A04B24 802422E4 0260202D */ daddu $a0, $s3, $zero -/* A04B28 802422E8 0200282D */ daddu $a1, $s0, $zero -/* A04B2C 802422EC 0C090265 */ jal func_80240994 -/* A04B30 802422F0 0280302D */ daddu $a2, $s4, $zero -/* A04B34 802422F4 0260202D */ daddu $a0, $s3, $zero -/* A04B38 802422F8 0200282D */ daddu $a1, $s0, $zero -/* A04B3C 802422FC 0C0902D1 */ jal func_80240B44 -/* A04B40 80242300 0280302D */ daddu $a2, $s4, $zero -/* A04B44 80242304 8E630070 */ lw $v1, 0x70($s3) -/* A04B48 80242308 24020002 */ addiu $v0, $zero, 2 -/* A04B4C 8024230C 1462003A */ bne $v1, $v0, .L802423F8 -/* A04B50 80242310 0000102D */ daddu $v0, $zero, $zero -/* A04B54 80242314 0260202D */ daddu $a0, $s3, $zero -/* A04B58 80242318 0200282D */ daddu $a1, $s0, $zero -/* A04B5C 8024231C 0C09045B */ jal func_8024116C -/* A04B60 80242320 0280302D */ daddu $a2, $s4, $zero -/* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero -/* A04B68 80242328 0200282D */ daddu $a1, $s0, $zero -/* A04B6C 8024232C 0C09048B */ jal func_8024122C -/* A04B70 80242330 0280302D */ daddu $a2, $s4, $zero -/* A04B74 80242334 8E630070 */ lw $v1, 0x70($s3) -/* A04B78 80242338 2402000A */ addiu $v0, $zero, 0xa -/* A04B7C 8024233C 1462002E */ bne $v1, $v0, .L802423F8 -/* A04B80 80242340 0000102D */ daddu $v0, $zero, $zero -/* A04B84 80242344 0260202D */ daddu $a0, $s3, $zero -/* A04B88 80242348 0200282D */ daddu $a1, $s0, $zero -/* A04B8C 8024234C 0C09055C */ jal func_80241570 -/* A04B90 80242350 0280302D */ daddu $a2, $s4, $zero -/* A04B94 80242354 8E630070 */ lw $v1, 0x70($s3) -/* A04B98 80242358 2402000B */ addiu $v0, $zero, 0xb -/* A04B9C 8024235C 14620026 */ bne $v1, $v0, .L802423F8 -/* A04BA0 80242360 0000102D */ daddu $v0, $zero, $zero -/* A04BA4 80242364 0260202D */ daddu $a0, $s3, $zero -/* A04BA8 80242368 0200282D */ daddu $a1, $s0, $zero -/* A04BAC 8024236C 0C09057A */ jal func_802415E8 -/* A04BB0 80242370 0280302D */ daddu $a2, $s4, $zero -/* A04BB4 80242374 8E630070 */ lw $v1, 0x70($s3) -/* A04BB8 80242378 2402000C */ addiu $v0, $zero, 0xc -/* A04BBC 8024237C 1462001E */ bne $v1, $v0, .L802423F8 -/* A04BC0 80242380 0000102D */ daddu $v0, $zero, $zero -/* A04BC4 80242384 0260202D */ daddu $a0, $s3, $zero -/* A04BC8 80242388 0200282D */ daddu $a1, $s0, $zero -/* A04BCC 8024238C 0C0907A3 */ jal func_80241E8C -/* A04BD0 80242390 0280302D */ daddu $a2, $s4, $zero -/* A04BD4 80242394 8E630070 */ lw $v1, 0x70($s3) -/* A04BD8 80242398 2402000D */ addiu $v0, $zero, 0xd -/* A04BDC 8024239C 14620016 */ bne $v1, $v0, .L802423F8 -/* A04BE0 802423A0 0000102D */ daddu $v0, $zero, $zero -/* A04BE4 802423A4 0260202D */ daddu $a0, $s3, $zero -/* A04BE8 802423A8 0200282D */ daddu $a1, $s0, $zero -/* A04BEC 802423AC 0C0907ED */ jal func_80241FB4 -/* A04BF0 802423B0 0280302D */ daddu $a2, $s4, $zero -/* A04BF4 802423B4 8E630070 */ lw $v1, 0x70($s3) -/* A04BF8 802423B8 2402000E */ addiu $v0, $zero, 0xe -/* A04BFC 802423BC 1462000E */ bne $v1, $v0, .L802423F8 -/* A04C00 802423C0 0000102D */ daddu $v0, $zero, $zero -/* A04C04 802423C4 0260202D */ daddu $a0, $s3, $zero -/* A04C08 802423C8 0200282D */ daddu $a1, $s0, $zero -/* A04C0C 802423CC 0C09081C */ jal func_80242070 -/* A04C10 802423D0 0280302D */ daddu $a2, $s4, $zero -/* A04C14 802423D4 8E630070 */ lw $v1, 0x70($s3) -/* A04C18 802423D8 2402000F */ addiu $v0, $zero, 0xf -/* A04C1C 802423DC 14620006 */ bne $v1, $v0, .L802423F8 -/* A04C20 802423E0 0000102D */ daddu $v0, $zero, $zero -/* A04C24 802423E4 0260202D */ daddu $a0, $s3, $zero -/* A04C28 802423E8 0200282D */ daddu $a1, $s0, $zero -/* A04C2C 802423EC 0C090862 */ jal func_80242188 -/* A04C30 802423F0 0280302D */ daddu $a2, $s4, $zero -.L802423F4: -/* A04C34 802423F4 0000102D */ daddu $v0, $zero, $zero -.L802423F8: -/* A04C38 802423F8 8FBF0048 */ lw $ra, 0x48($sp) -/* A04C3C 802423FC 8FB50044 */ lw $s5, 0x44($sp) -/* A04C40 80242400 8FB40040 */ lw $s4, 0x40($sp) -/* A04C44 80242404 8FB3003C */ lw $s3, 0x3c($sp) -/* A04C48 80242408 8FB20038 */ lw $s2, 0x38($sp) -/* A04C4C 8024240C 8FB10034 */ lw $s1, 0x34($sp) -/* A04C50 80242410 8FB00030 */ lw $s0, 0x30($sp) -/* A04C54 80242414 03E00008 */ jr $ra -/* A04C58 80242418 27BD0050 */ addiu $sp, $sp, 0x50 -/* A04C5C 8024241C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s new file mode 100644 index 0000000000..19bc860e78 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_14/A02A00/func_802421CC_A04A0C.s @@ -0,0 +1,157 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421CC_A04A0C +/* A04A0C 802421CC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A04A10 802421D0 AFB3003C */ sw $s3, 0x3c($sp) +/* A04A14 802421D4 0080982D */ daddu $s3, $a0, $zero +/* A04A18 802421D8 AFBF0048 */ sw $ra, 0x48($sp) +/* A04A1C 802421DC AFB50044 */ sw $s5, 0x44($sp) +/* A04A20 802421E0 AFB40040 */ sw $s4, 0x40($sp) +/* A04A24 802421E4 AFB20038 */ sw $s2, 0x38($sp) +/* A04A28 802421E8 AFB10034 */ sw $s1, 0x34($sp) +/* A04A2C 802421EC AFB00030 */ sw $s0, 0x30($sp) +/* A04A30 802421F0 8E720148 */ lw $s2, 0x148($s3) +/* A04A34 802421F4 86440008 */ lh $a0, 8($s2) +/* A04A38 802421F8 8E70000C */ lw $s0, 0xc($s3) +/* A04A3C 802421FC 0C00EABB */ jal get_npc_unsafe +/* A04A40 80242200 00A0882D */ daddu $s1, $a1, $zero +/* A04A44 80242204 0260202D */ daddu $a0, $s3, $zero +/* A04A48 80242208 8E050000 */ lw $a1, ($s0) +/* A04A4C 8024220C 0C0B1EAF */ jal get_variable +/* A04A50 80242210 0040A82D */ daddu $s5, $v0, $zero +/* A04A54 80242214 AFA00010 */ sw $zero, 0x10($sp) +/* A04A58 80242218 8E4300D0 */ lw $v1, 0xd0($s2) +/* A04A5C 8024221C 8C630030 */ lw $v1, 0x30($v1) +/* A04A60 80242220 AFA30014 */ sw $v1, 0x14($sp) +/* A04A64 80242224 8E4300D0 */ lw $v1, 0xd0($s2) +/* A04A68 80242228 8C63001C */ lw $v1, 0x1c($v1) +/* A04A6C 8024222C AFA30018 */ sw $v1, 0x18($sp) +/* A04A70 80242230 8E4300D0 */ lw $v1, 0xd0($s2) +/* A04A74 80242234 8C630024 */ lw $v1, 0x24($v1) +/* A04A78 80242238 AFA3001C */ sw $v1, 0x1c($sp) +/* A04A7C 8024223C 8E4300D0 */ lw $v1, 0xd0($s2) +/* A04A80 80242240 8C630028 */ lw $v1, 0x28($v1) +/* A04A84 80242244 27B40010 */ addiu $s4, $sp, 0x10 +/* A04A88 80242248 AFA30020 */ sw $v1, 0x20($sp) +/* A04A8C 8024224C 8E4300D0 */ lw $v1, 0xd0($s2) +/* A04A90 80242250 3C0142F0 */ lui $at, 0x42f0 +/* A04A94 80242254 44810000 */ mtc1 $at, $f0 +/* A04A98 80242258 8C63002C */ lw $v1, 0x2c($v1) +/* A04A9C 8024225C 0040802D */ daddu $s0, $v0, $zero +/* A04AA0 80242260 E7A00028 */ swc1 $f0, 0x28($sp) +/* A04AA4 80242264 A7A0002C */ sh $zero, 0x2c($sp) +/* A04AA8 80242268 12200009 */ beqz $s1, .L80242290 +/* A04AAC 8024226C AFA30024 */ sw $v1, 0x24($sp) +/* A04AB0 80242270 02A0202D */ daddu $a0, $s5, $zero +/* A04AB4 80242274 0240282D */ daddu $a1, $s2, $zero +/* A04AB8 80242278 0260302D */ daddu $a2, $s3, $zero +/* A04ABC 8024227C 0C0906DF */ jal func_80241B7C_A043BC +/* A04AC0 80242280 0200382D */ daddu $a3, $s0, $zero +/* A04AC4 80242284 86A200A8 */ lh $v0, 0xa8($s5) +/* A04AC8 80242288 AE42008C */ sw $v0, 0x8c($s2) +/* A04ACC 8024228C AE600070 */ sw $zero, 0x70($s3) +.L80242290: +/* A04AD0 80242290 2402FFFD */ addiu $v0, $zero, -3 +/* A04AD4 80242294 A2A200AB */ sb $v0, 0xab($s5) +/* A04AD8 80242298 8E4300B0 */ lw $v1, 0xb0($s2) +/* A04ADC 8024229C 30620004 */ andi $v0, $v1, 4 +/* A04AE0 802422A0 10400007 */ beqz $v0, .L802422C0 +/* A04AE4 802422A4 00000000 */ nop +/* A04AE8 802422A8 824200B4 */ lb $v0, 0xb4($s2) +/* A04AEC 802422AC 14400052 */ bnez $v0, .L802423F8 +/* A04AF0 802422B0 0000102D */ daddu $v0, $zero, $zero +/* A04AF4 802422B4 2402FFFB */ addiu $v0, $zero, -5 +/* A04AF8 802422B8 00621024 */ and $v0, $v1, $v0 +/* A04AFC 802422BC AE4200B0 */ sw $v0, 0xb0($s2) +.L802422C0: +/* A04B00 802422C0 8E630070 */ lw $v1, 0x70($s3) +/* A04B04 802422C4 2C620010 */ sltiu $v0, $v1, 0x10 +/* A04B08 802422C8 1040004A */ beqz $v0, .L802423F4 +/* A04B0C 802422CC 00031080 */ sll $v0, $v1, 2 +/* A04B10 802422D0 3C018024 */ lui $at, 0x8024 +/* A04B14 802422D4 00220821 */ addu $at, $at, $v0 +/* A04B18 802422D8 8C224678 */ lw $v0, 0x4678($at) +/* A04B1C 802422DC 00400008 */ jr $v0 +/* A04B20 802422E0 00000000 */ nop +/* A04B24 802422E4 0260202D */ daddu $a0, $s3, $zero +/* A04B28 802422E8 0200282D */ daddu $a1, $s0, $zero +/* A04B2C 802422EC 0C090265 */ jal func_80240994_A031D4 +/* A04B30 802422F0 0280302D */ daddu $a2, $s4, $zero +/* A04B34 802422F4 0260202D */ daddu $a0, $s3, $zero +/* A04B38 802422F8 0200282D */ daddu $a1, $s0, $zero +/* A04B3C 802422FC 0C0902D1 */ jal func_80240B44_A03384 +/* A04B40 80242300 0280302D */ daddu $a2, $s4, $zero +/* A04B44 80242304 8E630070 */ lw $v1, 0x70($s3) +/* A04B48 80242308 24020002 */ addiu $v0, $zero, 2 +/* A04B4C 8024230C 1462003A */ bne $v1, $v0, .L802423F8 +/* A04B50 80242310 0000102D */ daddu $v0, $zero, $zero +/* A04B54 80242314 0260202D */ daddu $a0, $s3, $zero +/* A04B58 80242318 0200282D */ daddu $a1, $s0, $zero +/* A04B5C 8024231C 0C09045B */ jal func_8024116C_A039AC +/* A04B60 80242320 0280302D */ daddu $a2, $s4, $zero +/* A04B64 80242324 0260202D */ daddu $a0, $s3, $zero +/* A04B68 80242328 0200282D */ daddu $a1, $s0, $zero +/* A04B6C 8024232C 0C09048B */ jal func_8024122C_A03A6C +/* A04B70 80242330 0280302D */ daddu $a2, $s4, $zero +/* A04B74 80242334 8E630070 */ lw $v1, 0x70($s3) +/* A04B78 80242338 2402000A */ addiu $v0, $zero, 0xa +/* A04B7C 8024233C 1462002E */ bne $v1, $v0, .L802423F8 +/* A04B80 80242340 0000102D */ daddu $v0, $zero, $zero +/* A04B84 80242344 0260202D */ daddu $a0, $s3, $zero +/* A04B88 80242348 0200282D */ daddu $a1, $s0, $zero +/* A04B8C 8024234C 0C09055C */ jal func_80241570_A03DB0 +/* A04B90 80242350 0280302D */ daddu $a2, $s4, $zero +/* A04B94 80242354 8E630070 */ lw $v1, 0x70($s3) +/* A04B98 80242358 2402000B */ addiu $v0, $zero, 0xb +/* A04B9C 8024235C 14620026 */ bne $v1, $v0, .L802423F8 +/* A04BA0 80242360 0000102D */ daddu $v0, $zero, $zero +/* A04BA4 80242364 0260202D */ daddu $a0, $s3, $zero +/* A04BA8 80242368 0200282D */ daddu $a1, $s0, $zero +/* A04BAC 8024236C 0C09057A */ jal func_802415E8_A03E28 +/* A04BB0 80242370 0280302D */ daddu $a2, $s4, $zero +/* A04BB4 80242374 8E630070 */ lw $v1, 0x70($s3) +/* A04BB8 80242378 2402000C */ addiu $v0, $zero, 0xc +/* A04BBC 8024237C 1462001E */ bne $v1, $v0, .L802423F8 +/* A04BC0 80242380 0000102D */ daddu $v0, $zero, $zero +/* A04BC4 80242384 0260202D */ daddu $a0, $s3, $zero +/* A04BC8 80242388 0200282D */ daddu $a1, $s0, $zero +/* A04BCC 8024238C 0C0907A3 */ jal func_80241E8C_A046CC +/* A04BD0 80242390 0280302D */ daddu $a2, $s4, $zero +/* A04BD4 80242394 8E630070 */ lw $v1, 0x70($s3) +/* A04BD8 80242398 2402000D */ addiu $v0, $zero, 0xd +/* A04BDC 8024239C 14620016 */ bne $v1, $v0, .L802423F8 +/* A04BE0 802423A0 0000102D */ daddu $v0, $zero, $zero +/* A04BE4 802423A4 0260202D */ daddu $a0, $s3, $zero +/* A04BE8 802423A8 0200282D */ daddu $a1, $s0, $zero +/* A04BEC 802423AC 0C0907ED */ jal func_80241FB4_A047F4 +/* A04BF0 802423B0 0280302D */ daddu $a2, $s4, $zero +/* A04BF4 802423B4 8E630070 */ lw $v1, 0x70($s3) +/* A04BF8 802423B8 2402000E */ addiu $v0, $zero, 0xe +/* A04BFC 802423BC 1462000E */ bne $v1, $v0, .L802423F8 +/* A04C00 802423C0 0000102D */ daddu $v0, $zero, $zero +/* A04C04 802423C4 0260202D */ daddu $a0, $s3, $zero +/* A04C08 802423C8 0200282D */ daddu $a1, $s0, $zero +/* A04C0C 802423CC 0C09081C */ jal func_80242070_A048B0 +/* A04C10 802423D0 0280302D */ daddu $a2, $s4, $zero +/* A04C14 802423D4 8E630070 */ lw $v1, 0x70($s3) +/* A04C18 802423D8 2402000F */ addiu $v0, $zero, 0xf +/* A04C1C 802423DC 14620006 */ bne $v1, $v0, .L802423F8 +/* A04C20 802423E0 0000102D */ daddu $v0, $zero, $zero +/* A04C24 802423E4 0260202D */ daddu $a0, $s3, $zero +/* A04C28 802423E8 0200282D */ daddu $a1, $s0, $zero +/* A04C2C 802423EC 0C090862 */ jal func_80242188_A049C8 +/* A04C30 802423F0 0280302D */ daddu $a2, $s4, $zero +.L802423F4: +/* A04C34 802423F4 0000102D */ daddu $v0, $zero, $zero +.L802423F8: +/* A04C38 802423F8 8FBF0048 */ lw $ra, 0x48($sp) +/* A04C3C 802423FC 8FB50044 */ lw $s5, 0x44($sp) +/* A04C40 80242400 8FB40040 */ lw $s4, 0x40($sp) +/* A04C44 80242404 8FB3003C */ lw $s3, 0x3c($sp) +/* A04C48 80242408 8FB20038 */ lw $s2, 0x38($sp) +/* A04C4C 8024240C 8FB10034 */ lw $s1, 0x34($sp) +/* A04C50 80242410 8FB00030 */ lw $s0, 0x30($sp) +/* A04C54 80242414 03E00008 */ jr $ra +/* A04C58 80242418 27BD0050 */ addiu $sp, $sp, 0x50 +/* A04C5C 8024241C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802405F4.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802405F4.s deleted file mode 100644 index e27736440b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802405F4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405F4 -/* A074F4 802405F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A074F8 802405F8 AFB10014 */ sw $s1, 0x14($sp) -/* A074FC 802405FC 0080882D */ daddu $s1, $a0, $zero -/* A07500 80240600 AFBF0018 */ sw $ra, 0x18($sp) -/* A07504 80240604 AFB00010 */ sw $s0, 0x10($sp) -/* A07508 80240608 8E300148 */ lw $s0, 0x148($s1) -/* A0750C 8024060C 0C00EABB */ jal get_npc_unsafe -/* A07510 80240610 86040008 */ lh $a0, 8($s0) -/* A07514 80240614 0040202D */ daddu $a0, $v0, $zero -/* A07518 80240618 9482008E */ lhu $v0, 0x8e($a0) -/* A0751C 8024061C 24030003 */ addiu $v1, $zero, 3 -/* A07520 80240620 24420001 */ addiu $v0, $v0, 1 -/* A07524 80240624 A482008E */ sh $v0, 0x8e($a0) -/* A07528 80240628 00021400 */ sll $v0, $v0, 0x10 -/* A0752C 8024062C 00021403 */ sra $v0, $v0, 0x10 -/* A07530 80240630 14430003 */ bne $v0, $v1, .L80240640 -/* A07534 80240634 00000000 */ nop -/* A07538 80240638 96020086 */ lhu $v0, 0x86($s0) -/* A0753C 8024063C A48200A8 */ sh $v0, 0xa8($a0) -.L80240640: -/* A07540 80240640 8482008E */ lh $v0, 0x8e($a0) -/* A07544 80240644 8E030080 */ lw $v1, 0x80($s0) -/* A07548 80240648 0043102A */ slt $v0, $v0, $v1 -/* A0754C 8024064C 14400004 */ bnez $v0, .L80240660 -/* A07550 80240650 00000000 */ nop -/* A07554 80240654 96020086 */ lhu $v0, 0x86($s0) -/* A07558 80240658 A48200A8 */ sh $v0, 0xa8($a0) -/* A0755C 8024065C AE200070 */ sw $zero, 0x70($s1) -.L80240660: -/* A07560 80240660 8FBF0018 */ lw $ra, 0x18($sp) -/* A07564 80240664 8FB10014 */ lw $s1, 0x14($sp) -/* A07568 80240668 8FB00010 */ lw $s0, 0x10($sp) -/* A0756C 8024066C 03E00008 */ jr $ra -/* A07570 80240670 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802405F4_A074F4.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802405F4_A074F4.s new file mode 100644 index 0000000000..e3f9d88570 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802405F4_A074F4.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405F4_A074F4 +/* A074F4 802405F4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A074F8 802405F8 AFB10014 */ sw $s1, 0x14($sp) +/* A074FC 802405FC 0080882D */ daddu $s1, $a0, $zero +/* A07500 80240600 AFBF0018 */ sw $ra, 0x18($sp) +/* A07504 80240604 AFB00010 */ sw $s0, 0x10($sp) +/* A07508 80240608 8E300148 */ lw $s0, 0x148($s1) +/* A0750C 8024060C 0C00EABB */ jal get_npc_unsafe +/* A07510 80240610 86040008 */ lh $a0, 8($s0) +/* A07514 80240614 0040202D */ daddu $a0, $v0, $zero +/* A07518 80240618 9482008E */ lhu $v0, 0x8e($a0) +/* A0751C 8024061C 24030003 */ addiu $v1, $zero, 3 +/* A07520 80240620 24420001 */ addiu $v0, $v0, 1 +/* A07524 80240624 A482008E */ sh $v0, 0x8e($a0) +/* A07528 80240628 00021400 */ sll $v0, $v0, 0x10 +/* A0752C 8024062C 00021403 */ sra $v0, $v0, 0x10 +/* A07530 80240630 14430003 */ bne $v0, $v1, .L80240640 +/* A07534 80240634 00000000 */ nop +/* A07538 80240638 96020086 */ lhu $v0, 0x86($s0) +/* A0753C 8024063C A48200A8 */ sh $v0, 0xa8($a0) +.L80240640: +/* A07540 80240640 8482008E */ lh $v0, 0x8e($a0) +/* A07544 80240644 8E030080 */ lw $v1, 0x80($s0) +/* A07548 80240648 0043102A */ slt $v0, $v0, $v1 +/* A0754C 8024064C 14400004 */ bnez $v0, .L80240660 +/* A07550 80240650 00000000 */ nop +/* A07554 80240654 96020086 */ lhu $v0, 0x86($s0) +/* A07558 80240658 A48200A8 */ sh $v0, 0xa8($a0) +/* A0755C 8024065C AE200070 */ sw $zero, 0x70($s1) +.L80240660: +/* A07560 80240660 8FBF0018 */ lw $ra, 0x18($sp) +/* A07564 80240664 8FB10014 */ lw $s1, 0x14($sp) +/* A07568 80240668 8FB00010 */ lw $s0, 0x10($sp) +/* A0756C 8024066C 03E00008 */ jr $ra +/* A07570 80240670 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674.s deleted file mode 100644 index 71fbc0c3a8..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240674 -/* A07574 80240674 27BDFF90 */ addiu $sp, $sp, -0x70 -/* A07578 80240678 AFB3005C */ sw $s3, 0x5c($sp) -/* A0757C 8024067C 0080982D */ daddu $s3, $a0, $zero -/* A07580 80240680 AFBF0068 */ sw $ra, 0x68($sp) -/* A07584 80240684 AFB50064 */ sw $s5, 0x64($sp) -/* A07588 80240688 AFB40060 */ sw $s4, 0x60($sp) -/* A0758C 8024068C AFB20058 */ sw $s2, 0x58($sp) -/* A07590 80240690 AFB10054 */ sw $s1, 0x54($sp) -/* A07594 80240694 AFB00050 */ sw $s0, 0x50($sp) -/* A07598 80240698 8E710148 */ lw $s1, 0x148($s3) -/* A0759C 8024069C 86240008 */ lh $a0, 8($s1) -/* A075A0 802406A0 0C00EABB */ jal get_npc_unsafe -/* A075A4 802406A4 00A0802D */ daddu $s0, $a1, $zero -/* A075A8 802406A8 8E63000C */ lw $v1, 0xc($s3) -/* A075AC 802406AC 0260202D */ daddu $a0, $s3, $zero -/* A075B0 802406B0 8C650000 */ lw $a1, ($v1) -/* A075B4 802406B4 0C0B1EAF */ jal get_variable -/* A075B8 802406B8 0040902D */ daddu $s2, $v0, $zero -/* A075BC 802406BC AFA00028 */ sw $zero, 0x28($sp) -/* A075C0 802406C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075C4 802406C4 8C630030 */ lw $v1, 0x30($v1) -/* A075C8 802406C8 AFA3002C */ sw $v1, 0x2c($sp) -/* A075CC 802406CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075D0 802406D0 8C63001C */ lw $v1, 0x1c($v1) -/* A075D4 802406D4 AFA30030 */ sw $v1, 0x30($sp) -/* A075D8 802406D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075DC 802406DC 8C630024 */ lw $v1, 0x24($v1) -/* A075E0 802406E0 AFA30034 */ sw $v1, 0x34($sp) -/* A075E4 802406E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075E8 802406E8 8C630028 */ lw $v1, 0x28($v1) -/* A075EC 802406EC 27B50028 */ addiu $s5, $sp, 0x28 -/* A075F0 802406F0 AFA30038 */ sw $v1, 0x38($sp) -/* A075F4 802406F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* A075F8 802406F8 3C0142C8 */ lui $at, 0x42c8 -/* A075FC 802406FC 44810000 */ mtc1 $at, $f0 -/* A07600 80240700 8C63002C */ lw $v1, 0x2c($v1) -/* A07604 80240704 0040A02D */ daddu $s4, $v0, $zero -/* A07608 80240708 E7A00040 */ swc1 $f0, 0x40($sp) -/* A0760C 8024070C A7A00044 */ sh $zero, 0x44($sp) -/* A07610 80240710 12000009 */ beqz $s0, .L80240738 -/* A07614 80240714 AFA3003C */ sw $v1, 0x3c($sp) -/* A07618 80240718 864300A8 */ lh $v1, 0xa8($s2) -/* A0761C 8024071C 8E2200B0 */ lw $v0, 0xb0($s1) -/* A07620 80240720 AE20008C */ sw $zero, 0x8c($s1) -/* A07624 80240724 A22000B5 */ sb $zero, 0xb5($s1) -/* A07628 80240728 34420008 */ ori $v0, $v0, 8 -/* A0762C 8024072C AE230084 */ sw $v1, 0x84($s1) -/* A07630 80240730 080901D2 */ j .L80240748 -/* A07634 80240734 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240738: -/* A07638 80240738 8E2200B0 */ lw $v0, 0xb0($s1) -/* A0763C 8024073C 30420004 */ andi $v0, $v0, 4 -/* A07640 80240740 10400047 */ beqz $v0, .L80240860 -/* A07644 80240744 00000000 */ nop -.L80240748: -/* A07648 80240748 AE600070 */ sw $zero, 0x70($s3) -/* A0764C 8024074C A640008E */ sh $zero, 0x8e($s2) -/* A07650 80240750 8E2300CC */ lw $v1, 0xcc($s1) -/* A07654 80240754 2404F7FF */ addiu $a0, $zero, -0x801 -/* A07658 80240758 A2200007 */ sb $zero, 7($s1) -/* A0765C 8024075C 8E420000 */ lw $v0, ($s2) -/* A07660 80240760 8C630000 */ lw $v1, ($v1) -/* A07664 80240764 00441024 */ and $v0, $v0, $a0 -/* A07668 80240768 AE420000 */ sw $v0, ($s2) -/* A0766C 8024076C AE430028 */ sw $v1, 0x28($s2) -/* A07670 80240770 96220086 */ lhu $v0, 0x86($s1) -/* A07674 80240774 A64200A8 */ sh $v0, 0xa8($s2) -/* A07678 80240778 8E2200D0 */ lw $v0, 0xd0($s1) -/* A0767C 8024077C AE200090 */ sw $zero, 0x90($s1) -/* A07680 80240780 8C420034 */ lw $v0, 0x34($v0) -/* A07684 80240784 14400006 */ bnez $v0, .L802407A0 -/* A07688 80240788 2403FDFF */ addiu $v1, $zero, -0x201 -/* A0768C 8024078C 8E420000 */ lw $v0, ($s2) -/* A07690 80240790 2403FFF7 */ addiu $v1, $zero, -9 -/* A07694 80240794 34420200 */ ori $v0, $v0, 0x200 -/* A07698 80240798 080901EB */ j .L802407AC -/* A0769C 8024079C 00431024 */ and $v0, $v0, $v1 -.L802407A0: -/* A076A0 802407A0 8E420000 */ lw $v0, ($s2) -/* A076A4 802407A4 00431024 */ and $v0, $v0, $v1 -/* A076A8 802407A8 34420008 */ ori $v0, $v0, 8 -.L802407AC: -/* A076AC 802407AC AE420000 */ sw $v0, ($s2) -/* A076B0 802407B0 8E2200B0 */ lw $v0, 0xb0($s1) -/* A076B4 802407B4 30420004 */ andi $v0, $v0, 4 -/* A076B8 802407B8 1040001E */ beqz $v0, .L80240834 -/* A076BC 802407BC 24040002 */ addiu $a0, $zero, 2 -/* A076C0 802407C0 0240282D */ daddu $a1, $s2, $zero -/* A076C4 802407C4 0000302D */ daddu $a2, $zero, $zero -/* A076C8 802407C8 24020063 */ addiu $v0, $zero, 0x63 -/* A076CC 802407CC AE620070 */ sw $v0, 0x70($s3) -/* A076D0 802407D0 AE600074 */ sw $zero, 0x74($s3) -/* A076D4 802407D4 864300A8 */ lh $v1, 0xa8($s2) -/* A076D8 802407D8 3C013F80 */ lui $at, 0x3f80 -/* A076DC 802407DC 44810000 */ mtc1 $at, $f0 -/* A076E0 802407E0 3C014000 */ lui $at, 0x4000 -/* A076E4 802407E4 44811000 */ mtc1 $at, $f2 -/* A076E8 802407E8 3C01C1A0 */ lui $at, 0xc1a0 -/* A076EC 802407EC 44812000 */ mtc1 $at, $f4 -/* A076F0 802407F0 24020028 */ addiu $v0, $zero, 0x28 -/* A076F4 802407F4 AFA2001C */ sw $v0, 0x1c($sp) -/* A076F8 802407F8 44833000 */ mtc1 $v1, $f6 -/* A076FC 802407FC 00000000 */ nop -/* A07700 80240800 468031A0 */ cvt.s.w $f6, $f6 -/* A07704 80240804 44073000 */ mfc1 $a3, $f6 -/* A07708 80240808 27A20048 */ addiu $v0, $sp, 0x48 -/* A0770C 8024080C AFA20020 */ sw $v0, 0x20($sp) -/* A07710 80240810 E7A00010 */ swc1 $f0, 0x10($sp) -/* A07714 80240814 E7A20014 */ swc1 $f2, 0x14($sp) -/* A07718 80240818 0C01BFA4 */ jal fx_emote -/* A0771C 8024081C E7A40018 */ swc1 $f4, 0x18($sp) -/* A07720 80240820 8E2200B0 */ lw $v0, 0xb0($s1) -/* A07724 80240824 2403FFFB */ addiu $v1, $zero, -5 -/* A07728 80240828 00431024 */ and $v0, $v0, $v1 -/* A0772C 8024082C 08090218 */ j .L80240860 -/* A07730 80240830 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240834: -/* A07734 80240834 8E220000 */ lw $v0, ($s1) -/* A07738 80240838 3C034000 */ lui $v1, 0x4000 -/* A0773C 8024083C 00431024 */ and $v0, $v0, $v1 -/* A07740 80240840 10400007 */ beqz $v0, .L80240860 -/* A07744 80240844 3C03BFFF */ lui $v1, 0xbfff -/* A07748 80240848 2402000C */ addiu $v0, $zero, 0xc -/* A0774C 8024084C AE620070 */ sw $v0, 0x70($s3) -/* A07750 80240850 8E220000 */ lw $v0, ($s1) -/* A07754 80240854 3463FFFF */ ori $v1, $v1, 0xffff -/* A07758 80240858 00431024 */ and $v0, $v0, $v1 -/* A0775C 8024085C AE220000 */ sw $v0, ($s1) -.L80240860: -/* A07760 80240860 8E220090 */ lw $v0, 0x90($s1) -/* A07764 80240864 1840000C */ blez $v0, .L80240898 -/* A07768 80240868 2442FFFF */ addiu $v0, $v0, -1 -/* A0776C 8024086C 14400087 */ bnez $v0, .L80240A8C -/* A07770 80240870 AE220090 */ sw $v0, 0x90($s1) -/* A07774 80240874 3C03FFAA */ lui $v1, 0xffaa -/* A07778 80240878 8E420028 */ lw $v0, 0x28($s2) -/* A0777C 8024087C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* A07780 80240880 00431021 */ addu $v0, $v0, $v1 -/* A07784 80240884 2C420002 */ sltiu $v0, $v0, 2 -/* A07788 80240888 10400003 */ beqz $v0, .L80240898 -/* A0778C 8024088C 3C020055 */ lui $v0, 0x55 -/* A07790 80240890 3442000C */ ori $v0, $v0, 0xc -/* A07794 80240894 AE420028 */ sw $v0, 0x28($s2) -.L80240898: -/* A07798 80240898 8E630070 */ lw $v1, 0x70($s3) -/* A0779C 8024089C 2402000C */ addiu $v0, $zero, 0xc -/* A077A0 802408A0 10620048 */ beq $v1, $v0, .L802409C4 -/* A077A4 802408A4 2862000D */ slti $v0, $v1, 0xd -/* A077A8 802408A8 1040000F */ beqz $v0, .L802408E8 -/* A077AC 802408AC 24100001 */ addiu $s0, $zero, 1 -/* A077B0 802408B0 1070001E */ beq $v1, $s0, .L8024092C -/* A077B4 802408B4 28620002 */ slti $v0, $v1, 2 -/* A077B8 802408B8 10400005 */ beqz $v0, .L802408D0 -/* A077BC 802408BC 24020002 */ addiu $v0, $zero, 2 -/* A077C0 802408C0 10600015 */ beqz $v1, .L80240918 -/* A077C4 802408C4 0260202D */ daddu $a0, $s3, $zero -/* A077C8 802408C8 08090288 */ j .L80240A20 -/* A077CC 802408CC 00000000 */ nop -.L802408D0: -/* A077D0 802408D0 1062001C */ beq $v1, $v0, .L80240944 -/* A077D4 802408D4 24020003 */ addiu $v0, $zero, 3 -/* A077D8 802408D8 10620035 */ beq $v1, $v0, .L802409B0 -/* A077DC 802408DC 0260202D */ daddu $a0, $s3, $zero -/* A077E0 802408E0 08090288 */ j .L80240A20 -/* A077E4 802408E4 00000000 */ nop -.L802408E8: -/* A077E8 802408E8 2402000E */ addiu $v0, $zero, 0xe -/* A077EC 802408EC 1062003F */ beq $v1, $v0, .L802409EC -/* A077F0 802408F0 0062102A */ slt $v0, $v1, $v0 -/* A077F4 802408F4 14400038 */ bnez $v0, .L802409D8 -/* A077F8 802408F8 0260202D */ daddu $a0, $s3, $zero -/* A077FC 802408FC 2402000F */ addiu $v0, $zero, 0xf -/* A07800 80240900 10620040 */ beq $v1, $v0, .L80240A04 -/* A07804 80240904 24020063 */ addiu $v0, $zero, 0x63 -/* A07808 80240908 10620043 */ beq $v1, $v0, .L80240A18 -/* A0780C 8024090C 00000000 */ nop -/* A07810 80240910 08090288 */ j .L80240A20 -/* A07814 80240914 00000000 */ nop -.L80240918: -/* A07818 80240918 0280282D */ daddu $a1, $s4, $zero -/* A0781C 8024091C 0C012568 */ jal func_800495A0 -/* A07820 80240920 02A0302D */ daddu $a2, $s5, $zero -/* A07824 80240924 96220086 */ lhu $v0, 0x86($s1) -/* A07828 80240928 A64200A8 */ sh $v0, 0xa8($s2) -.L8024092C: -/* A0782C 8024092C 0260202D */ daddu $a0, $s3, $zero -/* A07830 80240930 0280282D */ daddu $a1, $s4, $zero -/* A07834 80240934 0C0125AE */ jal func_800496B8 -/* A07838 80240938 02A0302D */ daddu $a2, $s5, $zero -/* A0783C 8024093C 08090288 */ j .L80240A20 -/* A07840 80240940 00000000 */ nop -.L80240944: -/* A07844 80240944 0260202D */ daddu $a0, $s3, $zero -/* A07848 80240948 0280282D */ daddu $a1, $s4, $zero -/* A0784C 8024094C 0C0126D1 */ jal func_80049B44 -/* A07850 80240950 02A0302D */ daddu $a2, $s5, $zero -/* A07854 80240954 8E230088 */ lw $v1, 0x88($s1) -/* A07858 80240958 24020006 */ addiu $v0, $zero, 6 -/* A0785C 8024095C 14620014 */ bne $v1, $v0, .L802409B0 -/* A07860 80240960 0260202D */ daddu $a0, $s3, $zero -/* A07864 80240964 0C00A67F */ jal rand_int -/* A07868 80240968 24040064 */ addiu $a0, $zero, 0x64 -/* A0786C 8024096C 28420021 */ slti $v0, $v0, 0x21 -/* A07870 80240970 5040000F */ beql $v0, $zero, .L802409B0 -/* A07874 80240974 0260202D */ daddu $a0, $s3, $zero -/* A07878 80240978 8E22008C */ lw $v0, 0x8c($s1) -/* A0787C 8024097C 10400005 */ beqz $v0, .L80240994 -/* A07880 80240980 3C020055 */ lui $v0, 0x55 -/* A07884 80240984 3442002F */ ori $v0, $v0, 0x2f -/* A07888 80240988 AE20008C */ sw $zero, 0x8c($s1) -/* A0788C 8024098C 08090268 */ j .L802409A0 -/* A07890 80240990 A22000B5 */ sb $zero, 0xb5($s1) -.L80240994: -/* A07894 80240994 3442002E */ ori $v0, $v0, 0x2e -/* A07898 80240998 AE30008C */ sw $s0, 0x8c($s1) -/* A0789C 8024099C A23000B5 */ sb $s0, 0xb5($s1) -.L802409A0: -/* A078A0 802409A0 AE420028 */ sw $v0, 0x28($s2) -/* A078A4 802409A4 24020007 */ addiu $v0, $zero, 7 -/* A078A8 802409A8 080902A3 */ j .L80240A8C -/* A078AC 802409AC AE220090 */ sw $v0, 0x90($s1) -.L802409B0: -/* A078B0 802409B0 0280282D */ daddu $a1, $s4, $zero -/* A078B4 802409B4 0C012701 */ jal func_80049C04 -/* A078B8 802409B8 02A0302D */ daddu $a2, $s5, $zero -/* A078BC 802409BC 08090288 */ j .L80240A20 -/* A078C0 802409C0 00000000 */ nop -.L802409C4: -/* A078C4 802409C4 0260202D */ daddu $a0, $s3, $zero -/* A078C8 802409C8 0280282D */ daddu $a1, $s4, $zero -/* A078CC 802409CC 0C0900B8 */ jal func_802402E0 -/* A078D0 802409D0 02A0302D */ daddu $a2, $s5, $zero -/* A078D4 802409D4 0260202D */ daddu $a0, $s3, $zero -.L802409D8: -/* A078D8 802409D8 0280282D */ daddu $a1, $s4, $zero -/* A078DC 802409DC 0C0900D7 */ jal func_8024035C -/* A078E0 802409E0 02A0302D */ daddu $a2, $s5, $zero -/* A078E4 802409E4 08090288 */ j .L80240A20 -/* A078E8 802409E8 00000000 */ nop -.L802409EC: -/* A078EC 802409EC 0260202D */ daddu $a0, $s3, $zero -/* A078F0 802409F0 0280282D */ daddu $a1, $s4, $zero -/* A078F4 802409F4 0C090124 */ jal func_80240490 -/* A078F8 802409F8 02A0302D */ daddu $a2, $s5, $zero -/* A078FC 802409FC 08090288 */ j .L80240A20 -/* A07900 80240A00 00000000 */ nop -.L80240A04: -/* A07904 80240A04 0280282D */ daddu $a1, $s4, $zero -/* A07908 80240A08 0C09017D */ jal func_802405F4 -/* A0790C 80240A0C 02A0302D */ daddu $a2, $s5, $zero -/* A07910 80240A10 08090288 */ j .L80240A20 -/* A07914 80240A14 00000000 */ nop -.L80240A18: -/* A07918 80240A18 0C0129CF */ jal func_8004A73C -/* A0791C 80240A1C 0260202D */ daddu $a0, $s3, $zero -.L80240A20: -/* A07920 80240A20 8E230088 */ lw $v1, 0x88($s1) -/* A07924 80240A24 24020006 */ addiu $v0, $zero, 6 -/* A07928 80240A28 14620019 */ bne $v1, $v0, .L80240A90 -/* A0792C 80240A2C 0000102D */ daddu $v0, $zero, $zero -/* A07930 80240A30 8E22008C */ lw $v0, 0x8c($s1) -/* A07934 80240A34 10400003 */ beqz $v0, .L80240A44 -/* A07938 80240A38 24020001 */ addiu $v0, $zero, 1 -/* A0793C 80240A3C 08090292 */ j .L80240A48 -/* A07940 80240A40 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A44: -/* A07944 80240A44 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A48: -/* A07948 80240A48 8E22008C */ lw $v0, 0x8c($s1) -/* A0794C 80240A4C 1040000F */ beqz $v0, .L80240A8C -/* A07950 80240A50 3C03FFAA */ lui $v1, 0xffaa -/* A07954 80240A54 8E420028 */ lw $v0, 0x28($s2) -/* A07958 80240A58 3463FFFC */ ori $v1, $v1, 0xfffc -/* A0795C 80240A5C 00431821 */ addu $v1, $v0, $v1 -/* A07960 80240A60 2C620015 */ sltiu $v0, $v1, 0x15 -/* A07964 80240A64 10400009 */ beqz $v0, .L80240A8C -/* A07968 80240A68 00031080 */ sll $v0, $v1, 2 -/* A0796C 80240A6C 3C018024 */ lui $at, 0x8024 -/* A07970 80240A70 00220821 */ addu $at, $at, $v0 -/* A07974 80240A74 8C224CF8 */ lw $v0, 0x4cf8($at) -/* A07978 80240A78 00400008 */ jr $v0 -/* A0797C 80240A7C 00000000 */ nop -/* A07980 80240A80 8E420028 */ lw $v0, 0x28($s2) -/* A07984 80240A84 24420001 */ addiu $v0, $v0, 1 -/* A07988 80240A88 AE420028 */ sw $v0, 0x28($s2) -.L80240A8C: -/* A0798C 80240A8C 0000102D */ daddu $v0, $zero, $zero -.L80240A90: -/* A07990 80240A90 8FBF0068 */ lw $ra, 0x68($sp) -/* A07994 80240A94 8FB50064 */ lw $s5, 0x64($sp) -/* A07998 80240A98 8FB40060 */ lw $s4, 0x60($sp) -/* A0799C 80240A9C 8FB3005C */ lw $s3, 0x5c($sp) -/* A079A0 80240AA0 8FB20058 */ lw $s2, 0x58($sp) -/* A079A4 80240AA4 8FB10054 */ lw $s1, 0x54($sp) -/* A079A8 80240AA8 8FB00050 */ lw $s0, 0x50($sp) -/* A079AC 80240AAC 03E00008 */ jr $ra -/* A079B0 80240AB0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s new file mode 100644 index 0000000000..a7286e47c6 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80240674_A07574.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240674_A07574 +/* A07574 80240674 27BDFF90 */ addiu $sp, $sp, -0x70 +/* A07578 80240678 AFB3005C */ sw $s3, 0x5c($sp) +/* A0757C 8024067C 0080982D */ daddu $s3, $a0, $zero +/* A07580 80240680 AFBF0068 */ sw $ra, 0x68($sp) +/* A07584 80240684 AFB50064 */ sw $s5, 0x64($sp) +/* A07588 80240688 AFB40060 */ sw $s4, 0x60($sp) +/* A0758C 8024068C AFB20058 */ sw $s2, 0x58($sp) +/* A07590 80240690 AFB10054 */ sw $s1, 0x54($sp) +/* A07594 80240694 AFB00050 */ sw $s0, 0x50($sp) +/* A07598 80240698 8E710148 */ lw $s1, 0x148($s3) +/* A0759C 8024069C 86240008 */ lh $a0, 8($s1) +/* A075A0 802406A0 0C00EABB */ jal get_npc_unsafe +/* A075A4 802406A4 00A0802D */ daddu $s0, $a1, $zero +/* A075A8 802406A8 8E63000C */ lw $v1, 0xc($s3) +/* A075AC 802406AC 0260202D */ daddu $a0, $s3, $zero +/* A075B0 802406B0 8C650000 */ lw $a1, ($v1) +/* A075B4 802406B4 0C0B1EAF */ jal get_variable +/* A075B8 802406B8 0040902D */ daddu $s2, $v0, $zero +/* A075BC 802406BC AFA00028 */ sw $zero, 0x28($sp) +/* A075C0 802406C0 8E2300D0 */ lw $v1, 0xd0($s1) +/* A075C4 802406C4 8C630030 */ lw $v1, 0x30($v1) +/* A075C8 802406C8 AFA3002C */ sw $v1, 0x2c($sp) +/* A075CC 802406CC 8E2300D0 */ lw $v1, 0xd0($s1) +/* A075D0 802406D0 8C63001C */ lw $v1, 0x1c($v1) +/* A075D4 802406D4 AFA30030 */ sw $v1, 0x30($sp) +/* A075D8 802406D8 8E2300D0 */ lw $v1, 0xd0($s1) +/* A075DC 802406DC 8C630024 */ lw $v1, 0x24($v1) +/* A075E0 802406E0 AFA30034 */ sw $v1, 0x34($sp) +/* A075E4 802406E4 8E2300D0 */ lw $v1, 0xd0($s1) +/* A075E8 802406E8 8C630028 */ lw $v1, 0x28($v1) +/* A075EC 802406EC 27B50028 */ addiu $s5, $sp, 0x28 +/* A075F0 802406F0 AFA30038 */ sw $v1, 0x38($sp) +/* A075F4 802406F4 8E2300D0 */ lw $v1, 0xd0($s1) +/* A075F8 802406F8 3C0142C8 */ lui $at, 0x42c8 +/* A075FC 802406FC 44810000 */ mtc1 $at, $f0 +/* A07600 80240700 8C63002C */ lw $v1, 0x2c($v1) +/* A07604 80240704 0040A02D */ daddu $s4, $v0, $zero +/* A07608 80240708 E7A00040 */ swc1 $f0, 0x40($sp) +/* A0760C 8024070C A7A00044 */ sh $zero, 0x44($sp) +/* A07610 80240710 12000009 */ beqz $s0, .L80240738 +/* A07614 80240714 AFA3003C */ sw $v1, 0x3c($sp) +/* A07618 80240718 864300A8 */ lh $v1, 0xa8($s2) +/* A0761C 8024071C 8E2200B0 */ lw $v0, 0xb0($s1) +/* A07620 80240720 AE20008C */ sw $zero, 0x8c($s1) +/* A07624 80240724 A22000B5 */ sb $zero, 0xb5($s1) +/* A07628 80240728 34420008 */ ori $v0, $v0, 8 +/* A0762C 8024072C AE230084 */ sw $v1, 0x84($s1) +/* A07630 80240730 080901D2 */ j .L80240748 +/* A07634 80240734 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240738: +/* A07638 80240738 8E2200B0 */ lw $v0, 0xb0($s1) +/* A0763C 8024073C 30420004 */ andi $v0, $v0, 4 +/* A07640 80240740 10400047 */ beqz $v0, .L80240860 +/* A07644 80240744 00000000 */ nop +.L80240748: +/* A07648 80240748 AE600070 */ sw $zero, 0x70($s3) +/* A0764C 8024074C A640008E */ sh $zero, 0x8e($s2) +/* A07650 80240750 8E2300CC */ lw $v1, 0xcc($s1) +/* A07654 80240754 2404F7FF */ addiu $a0, $zero, -0x801 +/* A07658 80240758 A2200007 */ sb $zero, 7($s1) +/* A0765C 8024075C 8E420000 */ lw $v0, ($s2) +/* A07660 80240760 8C630000 */ lw $v1, ($v1) +/* A07664 80240764 00441024 */ and $v0, $v0, $a0 +/* A07668 80240768 AE420000 */ sw $v0, ($s2) +/* A0766C 8024076C AE430028 */ sw $v1, 0x28($s2) +/* A07670 80240770 96220086 */ lhu $v0, 0x86($s1) +/* A07674 80240774 A64200A8 */ sh $v0, 0xa8($s2) +/* A07678 80240778 8E2200D0 */ lw $v0, 0xd0($s1) +/* A0767C 8024077C AE200090 */ sw $zero, 0x90($s1) +/* A07680 80240780 8C420034 */ lw $v0, 0x34($v0) +/* A07684 80240784 14400006 */ bnez $v0, .L802407A0 +/* A07688 80240788 2403FDFF */ addiu $v1, $zero, -0x201 +/* A0768C 8024078C 8E420000 */ lw $v0, ($s2) +/* A07690 80240790 2403FFF7 */ addiu $v1, $zero, -9 +/* A07694 80240794 34420200 */ ori $v0, $v0, 0x200 +/* A07698 80240798 080901EB */ j .L802407AC +/* A0769C 8024079C 00431024 */ and $v0, $v0, $v1 +.L802407A0: +/* A076A0 802407A0 8E420000 */ lw $v0, ($s2) +/* A076A4 802407A4 00431024 */ and $v0, $v0, $v1 +/* A076A8 802407A8 34420008 */ ori $v0, $v0, 8 +.L802407AC: +/* A076AC 802407AC AE420000 */ sw $v0, ($s2) +/* A076B0 802407B0 8E2200B0 */ lw $v0, 0xb0($s1) +/* A076B4 802407B4 30420004 */ andi $v0, $v0, 4 +/* A076B8 802407B8 1040001E */ beqz $v0, .L80240834 +/* A076BC 802407BC 24040002 */ addiu $a0, $zero, 2 +/* A076C0 802407C0 0240282D */ daddu $a1, $s2, $zero +/* A076C4 802407C4 0000302D */ daddu $a2, $zero, $zero +/* A076C8 802407C8 24020063 */ addiu $v0, $zero, 0x63 +/* A076CC 802407CC AE620070 */ sw $v0, 0x70($s3) +/* A076D0 802407D0 AE600074 */ sw $zero, 0x74($s3) +/* A076D4 802407D4 864300A8 */ lh $v1, 0xa8($s2) +/* A076D8 802407D8 3C013F80 */ lui $at, 0x3f80 +/* A076DC 802407DC 44810000 */ mtc1 $at, $f0 +/* A076E0 802407E0 3C014000 */ lui $at, 0x4000 +/* A076E4 802407E4 44811000 */ mtc1 $at, $f2 +/* A076E8 802407E8 3C01C1A0 */ lui $at, 0xc1a0 +/* A076EC 802407EC 44812000 */ mtc1 $at, $f4 +/* A076F0 802407F0 24020028 */ addiu $v0, $zero, 0x28 +/* A076F4 802407F4 AFA2001C */ sw $v0, 0x1c($sp) +/* A076F8 802407F8 44833000 */ mtc1 $v1, $f6 +/* A076FC 802407FC 00000000 */ nop +/* A07700 80240800 468031A0 */ cvt.s.w $f6, $f6 +/* A07704 80240804 44073000 */ mfc1 $a3, $f6 +/* A07708 80240808 27A20048 */ addiu $v0, $sp, 0x48 +/* A0770C 8024080C AFA20020 */ sw $v0, 0x20($sp) +/* A07710 80240810 E7A00010 */ swc1 $f0, 0x10($sp) +/* A07714 80240814 E7A20014 */ swc1 $f2, 0x14($sp) +/* A07718 80240818 0C01BFA4 */ jal fx_emote +/* A0771C 8024081C E7A40018 */ swc1 $f4, 0x18($sp) +/* A07720 80240820 8E2200B0 */ lw $v0, 0xb0($s1) +/* A07724 80240824 2403FFFB */ addiu $v1, $zero, -5 +/* A07728 80240828 00431024 */ and $v0, $v0, $v1 +/* A0772C 8024082C 08090218 */ j .L80240860 +/* A07730 80240830 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240834: +/* A07734 80240834 8E220000 */ lw $v0, ($s1) +/* A07738 80240838 3C034000 */ lui $v1, 0x4000 +/* A0773C 8024083C 00431024 */ and $v0, $v0, $v1 +/* A07740 80240840 10400007 */ beqz $v0, .L80240860 +/* A07744 80240844 3C03BFFF */ lui $v1, 0xbfff +/* A07748 80240848 2402000C */ addiu $v0, $zero, 0xc +/* A0774C 8024084C AE620070 */ sw $v0, 0x70($s3) +/* A07750 80240850 8E220000 */ lw $v0, ($s1) +/* A07754 80240854 3463FFFF */ ori $v1, $v1, 0xffff +/* A07758 80240858 00431024 */ and $v0, $v0, $v1 +/* A0775C 8024085C AE220000 */ sw $v0, ($s1) +.L80240860: +/* A07760 80240860 8E220090 */ lw $v0, 0x90($s1) +/* A07764 80240864 1840000C */ blez $v0, .L80240898 +/* A07768 80240868 2442FFFF */ addiu $v0, $v0, -1 +/* A0776C 8024086C 14400087 */ bnez $v0, .L80240A8C +/* A07770 80240870 AE220090 */ sw $v0, 0x90($s1) +/* A07774 80240874 3C03FFAA */ lui $v1, 0xffaa +/* A07778 80240878 8E420028 */ lw $v0, 0x28($s2) +/* A0777C 8024087C 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* A07780 80240880 00431021 */ addu $v0, $v0, $v1 +/* A07784 80240884 2C420002 */ sltiu $v0, $v0, 2 +/* A07788 80240888 10400003 */ beqz $v0, .L80240898 +/* A0778C 8024088C 3C020055 */ lui $v0, 0x55 +/* A07790 80240890 3442000C */ ori $v0, $v0, 0xc +/* A07794 80240894 AE420028 */ sw $v0, 0x28($s2) +.L80240898: +/* A07798 80240898 8E630070 */ lw $v1, 0x70($s3) +/* A0779C 8024089C 2402000C */ addiu $v0, $zero, 0xc +/* A077A0 802408A0 10620048 */ beq $v1, $v0, .L802409C4 +/* A077A4 802408A4 2862000D */ slti $v0, $v1, 0xd +/* A077A8 802408A8 1040000F */ beqz $v0, .L802408E8 +/* A077AC 802408AC 24100001 */ addiu $s0, $zero, 1 +/* A077B0 802408B0 1070001E */ beq $v1, $s0, .L8024092C +/* A077B4 802408B4 28620002 */ slti $v0, $v1, 2 +/* A077B8 802408B8 10400005 */ beqz $v0, .L802408D0 +/* A077BC 802408BC 24020002 */ addiu $v0, $zero, 2 +/* A077C0 802408C0 10600015 */ beqz $v1, .L80240918 +/* A077C4 802408C4 0260202D */ daddu $a0, $s3, $zero +/* A077C8 802408C8 08090288 */ j .L80240A20 +/* A077CC 802408CC 00000000 */ nop +.L802408D0: +/* A077D0 802408D0 1062001C */ beq $v1, $v0, .L80240944 +/* A077D4 802408D4 24020003 */ addiu $v0, $zero, 3 +/* A077D8 802408D8 10620035 */ beq $v1, $v0, .L802409B0 +/* A077DC 802408DC 0260202D */ daddu $a0, $s3, $zero +/* A077E0 802408E0 08090288 */ j .L80240A20 +/* A077E4 802408E4 00000000 */ nop +.L802408E8: +/* A077E8 802408E8 2402000E */ addiu $v0, $zero, 0xe +/* A077EC 802408EC 1062003F */ beq $v1, $v0, .L802409EC +/* A077F0 802408F0 0062102A */ slt $v0, $v1, $v0 +/* A077F4 802408F4 14400038 */ bnez $v0, .L802409D8 +/* A077F8 802408F8 0260202D */ daddu $a0, $s3, $zero +/* A077FC 802408FC 2402000F */ addiu $v0, $zero, 0xf +/* A07800 80240900 10620040 */ beq $v1, $v0, .L80240A04 +/* A07804 80240904 24020063 */ addiu $v0, $zero, 0x63 +/* A07808 80240908 10620043 */ beq $v1, $v0, .L80240A18 +/* A0780C 8024090C 00000000 */ nop +/* A07810 80240910 08090288 */ j .L80240A20 +/* A07814 80240914 00000000 */ nop +.L80240918: +/* A07818 80240918 0280282D */ daddu $a1, $s4, $zero +/* A0781C 8024091C 0C012568 */ jal func_800495A0 +/* A07820 80240920 02A0302D */ daddu $a2, $s5, $zero +/* A07824 80240924 96220086 */ lhu $v0, 0x86($s1) +/* A07828 80240928 A64200A8 */ sh $v0, 0xa8($s2) +.L8024092C: +/* A0782C 8024092C 0260202D */ daddu $a0, $s3, $zero +/* A07830 80240930 0280282D */ daddu $a1, $s4, $zero +/* A07834 80240934 0C0125AE */ jal func_800496B8 +/* A07838 80240938 02A0302D */ daddu $a2, $s5, $zero +/* A0783C 8024093C 08090288 */ j .L80240A20 +/* A07840 80240940 00000000 */ nop +.L80240944: +/* A07844 80240944 0260202D */ daddu $a0, $s3, $zero +/* A07848 80240948 0280282D */ daddu $a1, $s4, $zero +/* A0784C 8024094C 0C0126D1 */ jal func_80049B44 +/* A07850 80240950 02A0302D */ daddu $a2, $s5, $zero +/* A07854 80240954 8E230088 */ lw $v1, 0x88($s1) +/* A07858 80240958 24020006 */ addiu $v0, $zero, 6 +/* A0785C 8024095C 14620014 */ bne $v1, $v0, .L802409B0 +/* A07860 80240960 0260202D */ daddu $a0, $s3, $zero +/* A07864 80240964 0C00A67F */ jal rand_int +/* A07868 80240968 24040064 */ addiu $a0, $zero, 0x64 +/* A0786C 8024096C 28420021 */ slti $v0, $v0, 0x21 +/* A07870 80240970 5040000F */ beql $v0, $zero, .L802409B0 +/* A07874 80240974 0260202D */ daddu $a0, $s3, $zero +/* A07878 80240978 8E22008C */ lw $v0, 0x8c($s1) +/* A0787C 8024097C 10400005 */ beqz $v0, .L80240994 +/* A07880 80240980 3C020055 */ lui $v0, 0x55 +/* A07884 80240984 3442002F */ ori $v0, $v0, 0x2f +/* A07888 80240988 AE20008C */ sw $zero, 0x8c($s1) +/* A0788C 8024098C 08090268 */ j .L802409A0 +/* A07890 80240990 A22000B5 */ sb $zero, 0xb5($s1) +.L80240994: +/* A07894 80240994 3442002E */ ori $v0, $v0, 0x2e +/* A07898 80240998 AE30008C */ sw $s0, 0x8c($s1) +/* A0789C 8024099C A23000B5 */ sb $s0, 0xb5($s1) +.L802409A0: +/* A078A0 802409A0 AE420028 */ sw $v0, 0x28($s2) +/* A078A4 802409A4 24020007 */ addiu $v0, $zero, 7 +/* A078A8 802409A8 080902A3 */ j .L80240A8C +/* A078AC 802409AC AE220090 */ sw $v0, 0x90($s1) +.L802409B0: +/* A078B0 802409B0 0280282D */ daddu $a1, $s4, $zero +/* A078B4 802409B4 0C012701 */ jal func_80049C04 +/* A078B8 802409B8 02A0302D */ daddu $a2, $s5, $zero +/* A078BC 802409BC 08090288 */ j .L80240A20 +/* A078C0 802409C0 00000000 */ nop +.L802409C4: +/* A078C4 802409C4 0260202D */ daddu $a0, $s3, $zero +/* A078C8 802409C8 0280282D */ daddu $a1, $s4, $zero +/* A078CC 802409CC 0C0900B8 */ jal func_802402E0_A071E0 +/* A078D0 802409D0 02A0302D */ daddu $a2, $s5, $zero +/* A078D4 802409D4 0260202D */ daddu $a0, $s3, $zero +.L802409D8: +/* A078D8 802409D8 0280282D */ daddu $a1, $s4, $zero +/* A078DC 802409DC 0C0900D7 */ jal func_8024035C_A0725C +/* A078E0 802409E0 02A0302D */ daddu $a2, $s5, $zero +/* A078E4 802409E4 08090288 */ j .L80240A20 +/* A078E8 802409E8 00000000 */ nop +.L802409EC: +/* A078EC 802409EC 0260202D */ daddu $a0, $s3, $zero +/* A078F0 802409F0 0280282D */ daddu $a1, $s4, $zero +/* A078F4 802409F4 0C090124 */ jal func_80240490_A07390 +/* A078F8 802409F8 02A0302D */ daddu $a2, $s5, $zero +/* A078FC 802409FC 08090288 */ j .L80240A20 +/* A07900 80240A00 00000000 */ nop +.L80240A04: +/* A07904 80240A04 0280282D */ daddu $a1, $s4, $zero +/* A07908 80240A08 0C09017D */ jal func_802405F4_A074F4 +/* A0790C 80240A0C 02A0302D */ daddu $a2, $s5, $zero +/* A07910 80240A10 08090288 */ j .L80240A20 +/* A07914 80240A14 00000000 */ nop +.L80240A18: +/* A07918 80240A18 0C0129CF */ jal func_8004A73C +/* A0791C 80240A1C 0260202D */ daddu $a0, $s3, $zero +.L80240A20: +/* A07920 80240A20 8E230088 */ lw $v1, 0x88($s1) +/* A07924 80240A24 24020006 */ addiu $v0, $zero, 6 +/* A07928 80240A28 14620019 */ bne $v1, $v0, .L80240A90 +/* A0792C 80240A2C 0000102D */ daddu $v0, $zero, $zero +/* A07930 80240A30 8E22008C */ lw $v0, 0x8c($s1) +/* A07934 80240A34 10400003 */ beqz $v0, .L80240A44 +/* A07938 80240A38 24020001 */ addiu $v0, $zero, 1 +/* A0793C 80240A3C 08090292 */ j .L80240A48 +/* A07940 80240A40 A22200B5 */ sb $v0, 0xb5($s1) +.L80240A44: +/* A07944 80240A44 A22000B5 */ sb $zero, 0xb5($s1) +.L80240A48: +/* A07948 80240A48 8E22008C */ lw $v0, 0x8c($s1) +/* A0794C 80240A4C 1040000F */ beqz $v0, .L80240A8C +/* A07950 80240A50 3C03FFAA */ lui $v1, 0xffaa +/* A07954 80240A54 8E420028 */ lw $v0, 0x28($s2) +/* A07958 80240A58 3463FFFC */ ori $v1, $v1, 0xfffc +/* A0795C 80240A5C 00431821 */ addu $v1, $v0, $v1 +/* A07960 80240A60 2C620015 */ sltiu $v0, $v1, 0x15 +/* A07964 80240A64 10400009 */ beqz $v0, .L80240A8C +/* A07968 80240A68 00031080 */ sll $v0, $v1, 2 +/* A0796C 80240A6C 3C018024 */ lui $at, 0x8024 +/* A07970 80240A70 00220821 */ addu $at, $at, $v0 +/* A07974 80240A74 8C224CF8 */ lw $v0, 0x4cf8($at) +/* A07978 80240A78 00400008 */ jr $v0 +/* A0797C 80240A7C 00000000 */ nop +/* A07980 80240A80 8E420028 */ lw $v0, 0x28($s2) +/* A07984 80240A84 24420001 */ addiu $v0, $v0, 1 +/* A07988 80240A88 AE420028 */ sw $v0, 0x28($s2) +.L80240A8C: +/* A0798C 80240A8C 0000102D */ daddu $v0, $zero, $zero +.L80240A90: +/* A07990 80240A90 8FBF0068 */ lw $ra, 0x68($sp) +/* A07994 80240A94 8FB50064 */ lw $s5, 0x64($sp) +/* A07998 80240A98 8FB40060 */ lw $s4, 0x60($sp) +/* A0799C 80240A9C 8FB3005C */ lw $s3, 0x5c($sp) +/* A079A0 80240AA0 8FB20058 */ lw $s2, 0x58($sp) +/* A079A4 80240AA4 8FB10054 */ lw $s1, 0x54($sp) +/* A079A8 80240AA8 8FB00050 */ lw $s0, 0x50($sp) +/* A079AC 80240AAC 03E00008 */ jr $ra +/* A079B0 80240AB0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C.s deleted file mode 100644 index 552e25faa7..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024128C -/* A0818C 8024128C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A08190 80241290 AFB3001C */ sw $s3, 0x1c($sp) -/* A08194 80241294 0080982D */ daddu $s3, $a0, $zero -/* A08198 80241298 AFBF0020 */ sw $ra, 0x20($sp) -/* A0819C 8024129C AFB20018 */ sw $s2, 0x18($sp) -/* A081A0 802412A0 AFB10014 */ sw $s1, 0x14($sp) -/* A081A4 802412A4 AFB00010 */ sw $s0, 0x10($sp) -/* A081A8 802412A8 8E720148 */ lw $s2, 0x148($s3) -/* A081AC 802412AC 86440008 */ lh $a0, 8($s2) -/* A081B0 802412B0 0C00EABB */ jal get_npc_unsafe -/* A081B4 802412B4 00A0882D */ daddu $s1, $a1, $zero -/* A081B8 802412B8 8E240008 */ lw $a0, 8($s1) -/* A081BC 802412BC 0040802D */ daddu $s0, $v0, $zero -/* A081C0 802412C0 00041FC2 */ srl $v1, $a0, 0x1f -/* A081C4 802412C4 00832021 */ addu $a0, $a0, $v1 -/* A081C8 802412C8 00042043 */ sra $a0, $a0, 1 -/* A081CC 802412CC 0C00A67F */ jal rand_int -/* A081D0 802412D0 24840001 */ addiu $a0, $a0, 1 -/* A081D4 802412D4 8E230008 */ lw $v1, 8($s1) -/* A081D8 802412D8 240400B4 */ addiu $a0, $zero, 0xb4 -/* A081DC 802412DC 00032FC2 */ srl $a1, $v1, 0x1f -/* A081E0 802412E0 00651821 */ addu $v1, $v1, $a1 -/* A081E4 802412E4 00031843 */ sra $v1, $v1, 1 -/* A081E8 802412E8 00621821 */ addu $v1, $v1, $v0 -/* A081EC 802412EC 0C00A67F */ jal rand_int -/* A081F0 802412F0 A603008E */ sh $v1, 0x8e($s0) -/* A081F4 802412F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* A081F8 802412F8 44820000 */ mtc1 $v0, $f0 -/* A081FC 802412FC 00000000 */ nop -/* A08200 80241300 46800020 */ cvt.s.w $f0, $f0 -/* A08204 80241304 46006300 */ add.s $f12, $f12, $f0 -/* A08208 80241308 3C0142B4 */ lui $at, 0x42b4 -/* A0820C 8024130C 44810000 */ mtc1 $at, $f0 -/* A08210 80241310 0C00A6C9 */ jal clamp_angle -/* A08214 80241314 46006301 */ sub.s $f12, $f12, $f0 -/* A08218 80241318 E600000C */ swc1 $f0, 0xc($s0) -/* A0821C 8024131C 8E4200CC */ lw $v0, 0xcc($s2) -/* A08220 80241320 8C420000 */ lw $v0, ($v0) -/* A08224 80241324 AE020028 */ sw $v0, 0x28($s0) -/* A08228 80241328 24020003 */ addiu $v0, $zero, 3 -/* A0822C 8024132C AE620070 */ sw $v0, 0x70($s3) -/* A08230 80241330 8FBF0020 */ lw $ra, 0x20($sp) -/* A08234 80241334 8FB3001C */ lw $s3, 0x1c($sp) -/* A08238 80241338 8FB20018 */ lw $s2, 0x18($sp) -/* A0823C 8024133C 8FB10014 */ lw $s1, 0x14($sp) -/* A08240 80241340 8FB00010 */ lw $s0, 0x10($sp) -/* A08244 80241344 03E00008 */ jr $ra -/* A08248 80241348 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s new file mode 100644 index 0000000000..808927853c --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024128C_A0818C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024128C_A0818C +/* A0818C 8024128C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* A08190 80241290 AFB3001C */ sw $s3, 0x1c($sp) +/* A08194 80241294 0080982D */ daddu $s3, $a0, $zero +/* A08198 80241298 AFBF0020 */ sw $ra, 0x20($sp) +/* A0819C 8024129C AFB20018 */ sw $s2, 0x18($sp) +/* A081A0 802412A0 AFB10014 */ sw $s1, 0x14($sp) +/* A081A4 802412A4 AFB00010 */ sw $s0, 0x10($sp) +/* A081A8 802412A8 8E720148 */ lw $s2, 0x148($s3) +/* A081AC 802412AC 86440008 */ lh $a0, 8($s2) +/* A081B0 802412B0 0C00EABB */ jal get_npc_unsafe +/* A081B4 802412B4 00A0882D */ daddu $s1, $a1, $zero +/* A081B8 802412B8 8E240008 */ lw $a0, 8($s1) +/* A081BC 802412BC 0040802D */ daddu $s0, $v0, $zero +/* A081C0 802412C0 00041FC2 */ srl $v1, $a0, 0x1f +/* A081C4 802412C4 00832021 */ addu $a0, $a0, $v1 +/* A081C8 802412C8 00042043 */ sra $a0, $a0, 1 +/* A081CC 802412CC 0C00A67F */ jal rand_int +/* A081D0 802412D0 24840001 */ addiu $a0, $a0, 1 +/* A081D4 802412D4 8E230008 */ lw $v1, 8($s1) +/* A081D8 802412D8 240400B4 */ addiu $a0, $zero, 0xb4 +/* A081DC 802412DC 00032FC2 */ srl $a1, $v1, 0x1f +/* A081E0 802412E0 00651821 */ addu $v1, $v1, $a1 +/* A081E4 802412E4 00031843 */ sra $v1, $v1, 1 +/* A081E8 802412E8 00621821 */ addu $v1, $v1, $v0 +/* A081EC 802412EC 0C00A67F */ jal rand_int +/* A081F0 802412F0 A603008E */ sh $v1, 0x8e($s0) +/* A081F4 802412F4 C60C000C */ lwc1 $f12, 0xc($s0) +/* A081F8 802412F8 44820000 */ mtc1 $v0, $f0 +/* A081FC 802412FC 00000000 */ nop +/* A08200 80241300 46800020 */ cvt.s.w $f0, $f0 +/* A08204 80241304 46006300 */ add.s $f12, $f12, $f0 +/* A08208 80241308 3C0142B4 */ lui $at, 0x42b4 +/* A0820C 8024130C 44810000 */ mtc1 $at, $f0 +/* A08210 80241310 0C00A6C9 */ jal clamp_angle +/* A08214 80241314 46006301 */ sub.s $f12, $f12, $f0 +/* A08218 80241318 E600000C */ swc1 $f0, 0xc($s0) +/* A0821C 8024131C 8E4200CC */ lw $v0, 0xcc($s2) +/* A08220 80241320 8C420000 */ lw $v0, ($v0) +/* A08224 80241324 AE020028 */ sw $v0, 0x28($s0) +/* A08228 80241328 24020003 */ addiu $v0, $zero, 3 +/* A0822C 8024132C AE620070 */ sw $v0, 0x70($s3) +/* A08230 80241330 8FBF0020 */ lw $ra, 0x20($sp) +/* A08234 80241334 8FB3001C */ lw $s3, 0x1c($sp) +/* A08238 80241338 8FB20018 */ lw $s2, 0x18($sp) +/* A0823C 8024133C 8FB10014 */ lw $s1, 0x14($sp) +/* A08240 80241340 8FB00010 */ lw $s0, 0x10($sp) +/* A08244 80241344 03E00008 */ jr $ra +/* A08248 80241348 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C.s deleted file mode 100644 index a04de0578a..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024134C -/* A0824C 8024134C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* A08250 80241350 AFB3004C */ sw $s3, 0x4c($sp) -/* A08254 80241354 0080982D */ daddu $s3, $a0, $zero -/* A08258 80241358 AFBF0054 */ sw $ra, 0x54($sp) -/* A0825C 8024135C AFB40050 */ sw $s4, 0x50($sp) -/* A08260 80241360 AFB20048 */ sw $s2, 0x48($sp) -/* A08264 80241364 AFB10044 */ sw $s1, 0x44($sp) -/* A08268 80241368 AFB00040 */ sw $s0, 0x40($sp) -/* A0826C 8024136C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* A08270 80241370 F7B80068 */ sdc1 $f24, 0x68($sp) -/* A08274 80241374 F7B60060 */ sdc1 $f22, 0x60($sp) -/* A08278 80241378 F7B40058 */ sdc1 $f20, 0x58($sp) -/* A0827C 8024137C 8E710148 */ lw $s1, 0x148($s3) -/* A08280 80241380 00A0902D */ daddu $s2, $a1, $zero -/* A08284 80241384 86240008 */ lh $a0, 8($s1) -/* A08288 80241388 0C00EABB */ jal get_npc_unsafe -/* A0828C 8024138C 00C0A02D */ daddu $s4, $a2, $zero -/* A08290 80241390 0040802D */ daddu $s0, $v0, $zero -/* A08294 80241394 C6200078 */ lwc1 $f0, 0x78($s1) -/* A08298 80241398 46800020 */ cvt.s.w $f0, $f0 -/* A0829C 8024139C 46000021 */ cvt.d.s $f0, $f0 -/* A082A0 802413A0 3C014059 */ lui $at, 0x4059 -/* A082A4 802413A4 44811800 */ mtc1 $at, $f3 -/* A082A8 802413A8 44801000 */ mtc1 $zero, $f2 -/* A082AC 802413AC 8602008E */ lh $v0, 0x8e($s0) -/* A082B0 802413B0 9603008E */ lhu $v1, 0x8e($s0) -/* A082B4 802413B4 46220003 */ div.d $f0, $f0, $f2 -/* A082B8 802413B8 46200620 */ cvt.s.d $f24, $f0 -/* A082BC 802413BC C6200088 */ lwc1 $f0, 0x88($s1) -/* A082C0 802413C0 46800020 */ cvt.s.w $f0, $f0 -/* A082C4 802413C4 46000021 */ cvt.d.s $f0, $f0 -/* A082C8 802413C8 46220003 */ div.d $f0, $f0, $f2 -/* A082CC 802413CC 46200020 */ cvt.s.d $f0, $f0 -/* A082D0 802413D0 18400003 */ blez $v0, .L802413E0 -/* A082D4 802413D4 4600C680 */ add.s $f26, $f24, $f0 -/* A082D8 802413D8 2462FFFF */ addiu $v0, $v1, -1 -/* A082DC 802413DC A602008E */ sh $v0, 0x8e($s0) -.L802413E0: -/* A082E0 802413E0 8E220070 */ lw $v0, 0x70($s1) -/* A082E4 802413E4 18400034 */ blez $v0, .L802414B8 -/* A082E8 802413E8 00000000 */ nop -/* A082EC 802413EC C62C0074 */ lwc1 $f12, 0x74($s1) -/* A082F0 802413F0 46806320 */ cvt.s.w $f12, $f12 -/* A082F4 802413F4 44820000 */ mtc1 $v0, $f0 -/* A082F8 802413F8 00000000 */ nop -/* A082FC 802413FC 46800020 */ cvt.s.w $f0, $f0 -/* A08300 80241400 46000021 */ cvt.d.s $f0, $f0 -/* A08304 80241404 46220003 */ div.d $f0, $f0, $f2 -/* A08308 80241408 0C00A8BB */ jal sin_deg -/* A0830C 8024140C 462005A0 */ cvt.s.d $f22, $f0 -/* A08310 80241410 8E020000 */ lw $v0, ($s0) -/* A08314 80241414 30420008 */ andi $v0, $v0, 8 -/* A08318 80241418 10400003 */ beqz $v0, .L80241428 -/* A0831C 8024141C 46000506 */ mov.s $f20, $f0 -/* A08320 80241420 0809051A */ j .L80241468 -/* A08324 80241424 0000102D */ daddu $v0, $zero, $zero -.L80241428: -/* A08328 80241428 27A50028 */ addiu $a1, $sp, 0x28 -/* A0832C 8024142C 27A6002C */ addiu $a2, $sp, 0x2c -/* A08330 80241430 C6000038 */ lwc1 $f0, 0x38($s0) -/* A08334 80241434 C602003C */ lwc1 $f2, 0x3c($s0) -/* A08338 80241438 C6040040 */ lwc1 $f4, 0x40($s0) -/* A0833C 8024143C 3C01447A */ lui $at, 0x447a -/* A08340 80241440 44813000 */ mtc1 $at, $f6 -/* A08344 80241444 27A20034 */ addiu $v0, $sp, 0x34 -/* A08348 80241448 E7A00028 */ swc1 $f0, 0x28($sp) -/* A0834C 8024144C E7A2002C */ swc1 $f2, 0x2c($sp) -/* A08350 80241450 E7A40030 */ swc1 $f4, 0x30($sp) -/* A08354 80241454 E7A60034 */ swc1 $f6, 0x34($sp) -/* A08358 80241458 AFA20010 */ sw $v0, 0x10($sp) -/* A0835C 8024145C 8E040080 */ lw $a0, 0x80($s0) -/* A08360 80241460 0C0372DF */ jal func_800DCB7C -/* A08364 80241464 27A70030 */ addiu $a3, $sp, 0x30 -.L80241468: -/* A08368 80241468 10400007 */ beqz $v0, .L80241488 -/* A0836C 8024146C 00000000 */ nop -/* A08370 80241470 4616A082 */ mul.s $f2, $f20, $f22 -/* A08374 80241474 00000000 */ nop -/* A08378 80241478 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* A0837C 8024147C 46180000 */ add.s $f0, $f0, $f24 -/* A08380 80241480 08090525 */ j .L80241494 -/* A08384 80241484 46020000 */ add.s $f0, $f0, $f2 -.L80241488: -/* A08388 80241488 4616A002 */ mul.s $f0, $f20, $f22 -/* A0838C 8024148C 00000000 */ nop -/* A08390 80241490 4600D000 */ add.s $f0, $f26, $f0 -.L80241494: -/* A08394 80241494 E600003C */ swc1 $f0, 0x3c($s0) -/* A08398 80241498 8E220074 */ lw $v0, 0x74($s1) -/* A0839C 8024149C 2442000A */ addiu $v0, $v0, 0xa -/* A083A0 802414A0 44826000 */ mtc1 $v0, $f12 -/* A083A4 802414A4 00000000 */ nop -/* A083A8 802414A8 0C00A6C9 */ jal clamp_angle -/* A083AC 802414AC 46806320 */ cvt.s.w $f12, $f12 -/* A083B0 802414B0 4600020D */ trunc.w.s $f8, $f0 -/* A083B4 802414B4 E6280074 */ swc1 $f8, 0x74($s1) -.L802414B8: -/* A083B8 802414B8 8E220090 */ lw $v0, 0x90($s1) -/* A083BC 802414BC 1C400040 */ bgtz $v0, .L802415C0 -/* A083C0 802414C0 2442FFFF */ addiu $v0, $v0, -1 -/* A083C4 802414C4 860200A8 */ lh $v0, 0xa8($s0) -/* A083C8 802414C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* A083CC 802414CC 44821000 */ mtc1 $v0, $f2 -/* A083D0 802414D0 00000000 */ nop -/* A083D4 802414D4 468010A0 */ cvt.s.w $f2, $f2 -/* A083D8 802414D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* A083DC 802414DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* A083E0 802414E0 46020000 */ add.s $f0, $f0, $f2 -/* A083E4 802414E4 3C014024 */ lui $at, 0x4024 -/* A083E8 802414E8 44812800 */ mtc1 $at, $f5 -/* A083EC 802414EC 44802000 */ mtc1 $zero, $f4 -/* A083F0 802414F0 C442002C */ lwc1 $f2, 0x2c($v0) -/* A083F4 802414F4 46000021 */ cvt.d.s $f0, $f0 -/* A083F8 802414F8 46240000 */ add.d $f0, $f0, $f4 -/* A083FC 802414FC 460010A1 */ cvt.d.s $f2, $f2 -/* A08400 80241500 4620103C */ c.lt.d $f2, $f0 -/* A08404 80241504 00000000 */ nop -/* A08408 80241508 4500002E */ bc1f .L802415C4 -/* A0840C 8024150C 0280202D */ daddu $a0, $s4, $zero -/* A08410 80241510 24020001 */ addiu $v0, $zero, 1 -/* A08414 80241514 AFA20010 */ sw $v0, 0x10($sp) -/* A08418 80241518 8E460024 */ lw $a2, 0x24($s2) -/* A0841C 8024151C 8E470028 */ lw $a3, 0x28($s2) -/* A08420 80241520 0C01242D */ jal func_800490B4 -/* A08424 80241524 0220282D */ daddu $a1, $s1, $zero -/* A08428 80241528 10400026 */ beqz $v0, .L802415C4 -/* A0842C 8024152C 0000202D */ daddu $a0, $zero, $zero -/* A08430 80241530 0200282D */ daddu $a1, $s0, $zero -/* A08434 80241534 0000302D */ daddu $a2, $zero, $zero -/* A08438 80241538 2412000C */ addiu $s2, $zero, 0xc -/* A0843C 8024153C 860300A8 */ lh $v1, 0xa8($s0) -/* A08440 80241540 3C013F80 */ lui $at, 0x3f80 -/* A08444 80241544 44810000 */ mtc1 $at, $f0 -/* A08448 80241548 3C014000 */ lui $at, 0x4000 -/* A0844C 8024154C 44811000 */ mtc1 $at, $f2 -/* A08450 80241550 3C01C1A0 */ lui $at, 0xc1a0 -/* A08454 80241554 44812000 */ mtc1 $at, $f4 -/* A08458 80241558 44834000 */ mtc1 $v1, $f8 -/* A0845C 8024155C 00000000 */ nop -/* A08460 80241560 46804220 */ cvt.s.w $f8, $f8 -/* A08464 80241564 44074000 */ mfc1 $a3, $f8 -/* A08468 80241568 27A20038 */ addiu $v0, $sp, 0x38 -/* A0846C 8024156C AFB2001C */ sw $s2, 0x1c($sp) -/* A08470 80241570 AFA20020 */ sw $v0, 0x20($sp) -/* A08474 80241574 E7A00010 */ swc1 $f0, 0x10($sp) -/* A08478 80241578 E7A20014 */ swc1 $f2, 0x14($sp) -/* A0847C 8024157C 0C01BFA4 */ jal fx_emote -/* A08480 80241580 E7A40018 */ swc1 $f4, 0x18($sp) -/* A08484 80241584 0200202D */ daddu $a0, $s0, $zero -/* A08488 80241588 240502F4 */ addiu $a1, $zero, 0x2f4 -/* A0848C 8024158C C480003C */ lwc1 $f0, 0x3c($a0) -/* A08490 80241590 3C060020 */ lui $a2, 0x20 -/* A08494 80241594 0C012530 */ jal func_800494C0 -/* A08498 80241598 E4800064 */ swc1 $f0, 0x64($a0) -/* A0849C 8024159C 8E220018 */ lw $v0, 0x18($s1) -/* A084A0 802415A0 9442002A */ lhu $v0, 0x2a($v0) -/* A084A4 802415A4 30420001 */ andi $v0, $v0, 1 -/* A084A8 802415A8 10400003 */ beqz $v0, .L802415B8 -/* A084AC 802415AC 2402000A */ addiu $v0, $zero, 0xa -/* A084B0 802415B0 08090598 */ j .L80241660 -/* A084B4 802415B4 AE620070 */ sw $v0, 0x70($s3) -.L802415B8: -/* A084B8 802415B8 08090598 */ j .L80241660 -/* A084BC 802415BC AE720070 */ sw $s2, 0x70($s3) -.L802415C0: -/* A084C0 802415C0 AE220090 */ sw $v0, 0x90($s1) -.L802415C4: -/* A084C4 802415C4 8602008C */ lh $v0, 0x8c($s0) -/* A084C8 802415C8 14400025 */ bnez $v0, .L80241660 -/* A084CC 802415CC 00000000 */ nop -/* A084D0 802415D0 8602008E */ lh $v0, 0x8e($s0) -/* A084D4 802415D4 1C400022 */ bgtz $v0, .L80241660 -/* A084D8 802415D8 00000000 */ nop -/* A084DC 802415DC 8E620074 */ lw $v0, 0x74($s3) -/* A084E0 802415E0 2442FFFF */ addiu $v0, $v0, -1 -/* A084E4 802415E4 1840001D */ blez $v0, .L8024165C -/* A084E8 802415E8 AE620074 */ sw $v0, 0x74($s3) -/* A084EC 802415EC 8E220018 */ lw $v0, 0x18($s1) -/* A084F0 802415F0 9442002A */ lhu $v0, 0x2a($v0) -/* A084F4 802415F4 30420010 */ andi $v0, $v0, 0x10 -/* A084F8 802415F8 14400007 */ bnez $v0, .L80241618 -/* A084FC 802415FC 00000000 */ nop -/* A08500 80241600 C600000C */ lwc1 $f0, 0xc($s0) -/* A08504 80241604 3C014334 */ lui $at, 0x4334 -/* A08508 80241608 44816000 */ mtc1 $at, $f12 -/* A0850C 8024160C 0C00A6C9 */ jal clamp_angle -/* A08510 80241610 460C0300 */ add.s $f12, $f0, $f12 -/* A08514 80241614 E600000C */ swc1 $f0, 0xc($s0) -.L80241618: -/* A08518 80241618 0C00A67F */ jal rand_int -/* A0851C 8024161C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* A08520 80241620 3C032E8B */ lui $v1, 0x2e8b -/* A08524 80241624 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* A08528 80241628 00430018 */ mult $v0, $v1 -/* A0852C 8024162C 00021FC3 */ sra $v1, $v0, 0x1f -/* A08530 80241630 00004010 */ mfhi $t0 -/* A08534 80241634 00082043 */ sra $a0, $t0, 1 -/* A08538 80241638 00832023 */ subu $a0, $a0, $v1 -/* A0853C 8024163C 00041840 */ sll $v1, $a0, 1 -/* A08540 80241640 00641821 */ addu $v1, $v1, $a0 -/* A08544 80241644 00031880 */ sll $v1, $v1, 2 -/* A08548 80241648 00641823 */ subu $v1, $v1, $a0 -/* A0854C 8024164C 00431023 */ subu $v0, $v0, $v1 -/* A08550 80241650 24420005 */ addiu $v0, $v0, 5 -/* A08554 80241654 08090598 */ j .L80241660 -/* A08558 80241658 A602008E */ sh $v0, 0x8e($s0) -.L8024165C: -/* A0855C 8024165C AE600070 */ sw $zero, 0x70($s3) -.L80241660: -/* A08560 80241660 8FBF0054 */ lw $ra, 0x54($sp) -/* A08564 80241664 8FB40050 */ lw $s4, 0x50($sp) -/* A08568 80241668 8FB3004C */ lw $s3, 0x4c($sp) -/* A0856C 8024166C 8FB20048 */ lw $s2, 0x48($sp) -/* A08570 80241670 8FB10044 */ lw $s1, 0x44($sp) -/* A08574 80241674 8FB00040 */ lw $s0, 0x40($sp) -/* A08578 80241678 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* A0857C 8024167C D7B80068 */ ldc1 $f24, 0x68($sp) -/* A08580 80241680 D7B60060 */ ldc1 $f22, 0x60($sp) -/* A08584 80241684 D7B40058 */ ldc1 $f20, 0x58($sp) -/* A08588 80241688 03E00008 */ jr $ra -/* A0858C 8024168C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s new file mode 100644 index 0000000000..6a2dd5dc72 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_8024134C_A0824C.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024134C_A0824C +/* A0824C 8024134C 27BDFF88 */ addiu $sp, $sp, -0x78 +/* A08250 80241350 AFB3004C */ sw $s3, 0x4c($sp) +/* A08254 80241354 0080982D */ daddu $s3, $a0, $zero +/* A08258 80241358 AFBF0054 */ sw $ra, 0x54($sp) +/* A0825C 8024135C AFB40050 */ sw $s4, 0x50($sp) +/* A08260 80241360 AFB20048 */ sw $s2, 0x48($sp) +/* A08264 80241364 AFB10044 */ sw $s1, 0x44($sp) +/* A08268 80241368 AFB00040 */ sw $s0, 0x40($sp) +/* A0826C 8024136C F7BA0070 */ sdc1 $f26, 0x70($sp) +/* A08270 80241370 F7B80068 */ sdc1 $f24, 0x68($sp) +/* A08274 80241374 F7B60060 */ sdc1 $f22, 0x60($sp) +/* A08278 80241378 F7B40058 */ sdc1 $f20, 0x58($sp) +/* A0827C 8024137C 8E710148 */ lw $s1, 0x148($s3) +/* A08280 80241380 00A0902D */ daddu $s2, $a1, $zero +/* A08284 80241384 86240008 */ lh $a0, 8($s1) +/* A08288 80241388 0C00EABB */ jal get_npc_unsafe +/* A0828C 8024138C 00C0A02D */ daddu $s4, $a2, $zero +/* A08290 80241390 0040802D */ daddu $s0, $v0, $zero +/* A08294 80241394 C6200078 */ lwc1 $f0, 0x78($s1) +/* A08298 80241398 46800020 */ cvt.s.w $f0, $f0 +/* A0829C 8024139C 46000021 */ cvt.d.s $f0, $f0 +/* A082A0 802413A0 3C014059 */ lui $at, 0x4059 +/* A082A4 802413A4 44811800 */ mtc1 $at, $f3 +/* A082A8 802413A8 44801000 */ mtc1 $zero, $f2 +/* A082AC 802413AC 8602008E */ lh $v0, 0x8e($s0) +/* A082B0 802413B0 9603008E */ lhu $v1, 0x8e($s0) +/* A082B4 802413B4 46220003 */ div.d $f0, $f0, $f2 +/* A082B8 802413B8 46200620 */ cvt.s.d $f24, $f0 +/* A082BC 802413BC C6200088 */ lwc1 $f0, 0x88($s1) +/* A082C0 802413C0 46800020 */ cvt.s.w $f0, $f0 +/* A082C4 802413C4 46000021 */ cvt.d.s $f0, $f0 +/* A082C8 802413C8 46220003 */ div.d $f0, $f0, $f2 +/* A082CC 802413CC 46200020 */ cvt.s.d $f0, $f0 +/* A082D0 802413D0 18400003 */ blez $v0, .L802413E0 +/* A082D4 802413D4 4600C680 */ add.s $f26, $f24, $f0 +/* A082D8 802413D8 2462FFFF */ addiu $v0, $v1, -1 +/* A082DC 802413DC A602008E */ sh $v0, 0x8e($s0) +.L802413E0: +/* A082E0 802413E0 8E220070 */ lw $v0, 0x70($s1) +/* A082E4 802413E4 18400034 */ blez $v0, .L802414B8 +/* A082E8 802413E8 00000000 */ nop +/* A082EC 802413EC C62C0074 */ lwc1 $f12, 0x74($s1) +/* A082F0 802413F0 46806320 */ cvt.s.w $f12, $f12 +/* A082F4 802413F4 44820000 */ mtc1 $v0, $f0 +/* A082F8 802413F8 00000000 */ nop +/* A082FC 802413FC 46800020 */ cvt.s.w $f0, $f0 +/* A08300 80241400 46000021 */ cvt.d.s $f0, $f0 +/* A08304 80241404 46220003 */ div.d $f0, $f0, $f2 +/* A08308 80241408 0C00A8BB */ jal sin_deg +/* A0830C 8024140C 462005A0 */ cvt.s.d $f22, $f0 +/* A08310 80241410 8E020000 */ lw $v0, ($s0) +/* A08314 80241414 30420008 */ andi $v0, $v0, 8 +/* A08318 80241418 10400003 */ beqz $v0, .L80241428 +/* A0831C 8024141C 46000506 */ mov.s $f20, $f0 +/* A08320 80241420 0809051A */ j .L80241468 +/* A08324 80241424 0000102D */ daddu $v0, $zero, $zero +.L80241428: +/* A08328 80241428 27A50028 */ addiu $a1, $sp, 0x28 +/* A0832C 8024142C 27A6002C */ addiu $a2, $sp, 0x2c +/* A08330 80241430 C6000038 */ lwc1 $f0, 0x38($s0) +/* A08334 80241434 C602003C */ lwc1 $f2, 0x3c($s0) +/* A08338 80241438 C6040040 */ lwc1 $f4, 0x40($s0) +/* A0833C 8024143C 3C01447A */ lui $at, 0x447a +/* A08340 80241440 44813000 */ mtc1 $at, $f6 +/* A08344 80241444 27A20034 */ addiu $v0, $sp, 0x34 +/* A08348 80241448 E7A00028 */ swc1 $f0, 0x28($sp) +/* A0834C 8024144C E7A2002C */ swc1 $f2, 0x2c($sp) +/* A08350 80241450 E7A40030 */ swc1 $f4, 0x30($sp) +/* A08354 80241454 E7A60034 */ swc1 $f6, 0x34($sp) +/* A08358 80241458 AFA20010 */ sw $v0, 0x10($sp) +/* A0835C 8024145C 8E040080 */ lw $a0, 0x80($s0) +/* A08360 80241460 0C0372DF */ jal func_800DCB7C +/* A08364 80241464 27A70030 */ addiu $a3, $sp, 0x30 +.L80241468: +/* A08368 80241468 10400007 */ beqz $v0, .L80241488 +/* A0836C 8024146C 00000000 */ nop +/* A08370 80241470 4616A082 */ mul.s $f2, $f20, $f22 +/* A08374 80241474 00000000 */ nop +/* A08378 80241478 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* A0837C 8024147C 46180000 */ add.s $f0, $f0, $f24 +/* A08380 80241480 08090525 */ j .L80241494 +/* A08384 80241484 46020000 */ add.s $f0, $f0, $f2 +.L80241488: +/* A08388 80241488 4616A002 */ mul.s $f0, $f20, $f22 +/* A0838C 8024148C 00000000 */ nop +/* A08390 80241490 4600D000 */ add.s $f0, $f26, $f0 +.L80241494: +/* A08394 80241494 E600003C */ swc1 $f0, 0x3c($s0) +/* A08398 80241498 8E220074 */ lw $v0, 0x74($s1) +/* A0839C 8024149C 2442000A */ addiu $v0, $v0, 0xa +/* A083A0 802414A0 44826000 */ mtc1 $v0, $f12 +/* A083A4 802414A4 00000000 */ nop +/* A083A8 802414A8 0C00A6C9 */ jal clamp_angle +/* A083AC 802414AC 46806320 */ cvt.s.w $f12, $f12 +/* A083B0 802414B0 4600020D */ trunc.w.s $f8, $f0 +/* A083B4 802414B4 E6280074 */ swc1 $f8, 0x74($s1) +.L802414B8: +/* A083B8 802414B8 8E220090 */ lw $v0, 0x90($s1) +/* A083BC 802414BC 1C400040 */ bgtz $v0, .L802415C0 +/* A083C0 802414C0 2442FFFF */ addiu $v0, $v0, -1 +/* A083C4 802414C4 860200A8 */ lh $v0, 0xa8($s0) +/* A083C8 802414C8 C600003C */ lwc1 $f0, 0x3c($s0) +/* A083CC 802414CC 44821000 */ mtc1 $v0, $f2 +/* A083D0 802414D0 00000000 */ nop +/* A083D4 802414D4 468010A0 */ cvt.s.w $f2, $f2 +/* A083D8 802414D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* A083DC 802414DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* A083E0 802414E0 46020000 */ add.s $f0, $f0, $f2 +/* A083E4 802414E4 3C014024 */ lui $at, 0x4024 +/* A083E8 802414E8 44812800 */ mtc1 $at, $f5 +/* A083EC 802414EC 44802000 */ mtc1 $zero, $f4 +/* A083F0 802414F0 C442002C */ lwc1 $f2, 0x2c($v0) +/* A083F4 802414F4 46000021 */ cvt.d.s $f0, $f0 +/* A083F8 802414F8 46240000 */ add.d $f0, $f0, $f4 +/* A083FC 802414FC 460010A1 */ cvt.d.s $f2, $f2 +/* A08400 80241500 4620103C */ c.lt.d $f2, $f0 +/* A08404 80241504 00000000 */ nop +/* A08408 80241508 4500002E */ bc1f .L802415C4 +/* A0840C 8024150C 0280202D */ daddu $a0, $s4, $zero +/* A08410 80241510 24020001 */ addiu $v0, $zero, 1 +/* A08414 80241514 AFA20010 */ sw $v0, 0x10($sp) +/* A08418 80241518 8E460024 */ lw $a2, 0x24($s2) +/* A0841C 8024151C 8E470028 */ lw $a3, 0x28($s2) +/* A08420 80241520 0C01242D */ jal func_800490B4 +/* A08424 80241524 0220282D */ daddu $a1, $s1, $zero +/* A08428 80241528 10400026 */ beqz $v0, .L802415C4 +/* A0842C 8024152C 0000202D */ daddu $a0, $zero, $zero +/* A08430 80241530 0200282D */ daddu $a1, $s0, $zero +/* A08434 80241534 0000302D */ daddu $a2, $zero, $zero +/* A08438 80241538 2412000C */ addiu $s2, $zero, 0xc +/* A0843C 8024153C 860300A8 */ lh $v1, 0xa8($s0) +/* A08440 80241540 3C013F80 */ lui $at, 0x3f80 +/* A08444 80241544 44810000 */ mtc1 $at, $f0 +/* A08448 80241548 3C014000 */ lui $at, 0x4000 +/* A0844C 8024154C 44811000 */ mtc1 $at, $f2 +/* A08450 80241550 3C01C1A0 */ lui $at, 0xc1a0 +/* A08454 80241554 44812000 */ mtc1 $at, $f4 +/* A08458 80241558 44834000 */ mtc1 $v1, $f8 +/* A0845C 8024155C 00000000 */ nop +/* A08460 80241560 46804220 */ cvt.s.w $f8, $f8 +/* A08464 80241564 44074000 */ mfc1 $a3, $f8 +/* A08468 80241568 27A20038 */ addiu $v0, $sp, 0x38 +/* A0846C 8024156C AFB2001C */ sw $s2, 0x1c($sp) +/* A08470 80241570 AFA20020 */ sw $v0, 0x20($sp) +/* A08474 80241574 E7A00010 */ swc1 $f0, 0x10($sp) +/* A08478 80241578 E7A20014 */ swc1 $f2, 0x14($sp) +/* A0847C 8024157C 0C01BFA4 */ jal fx_emote +/* A08480 80241580 E7A40018 */ swc1 $f4, 0x18($sp) +/* A08484 80241584 0200202D */ daddu $a0, $s0, $zero +/* A08488 80241588 240502F4 */ addiu $a1, $zero, 0x2f4 +/* A0848C 8024158C C480003C */ lwc1 $f0, 0x3c($a0) +/* A08490 80241590 3C060020 */ lui $a2, 0x20 +/* A08494 80241594 0C012530 */ jal func_800494C0 +/* A08498 80241598 E4800064 */ swc1 $f0, 0x64($a0) +/* A0849C 8024159C 8E220018 */ lw $v0, 0x18($s1) +/* A084A0 802415A0 9442002A */ lhu $v0, 0x2a($v0) +/* A084A4 802415A4 30420001 */ andi $v0, $v0, 1 +/* A084A8 802415A8 10400003 */ beqz $v0, .L802415B8 +/* A084AC 802415AC 2402000A */ addiu $v0, $zero, 0xa +/* A084B0 802415B0 08090598 */ j .L80241660 +/* A084B4 802415B4 AE620070 */ sw $v0, 0x70($s3) +.L802415B8: +/* A084B8 802415B8 08090598 */ j .L80241660 +/* A084BC 802415BC AE720070 */ sw $s2, 0x70($s3) +.L802415C0: +/* A084C0 802415C0 AE220090 */ sw $v0, 0x90($s1) +.L802415C4: +/* A084C4 802415C4 8602008C */ lh $v0, 0x8c($s0) +/* A084C8 802415C8 14400025 */ bnez $v0, .L80241660 +/* A084CC 802415CC 00000000 */ nop +/* A084D0 802415D0 8602008E */ lh $v0, 0x8e($s0) +/* A084D4 802415D4 1C400022 */ bgtz $v0, .L80241660 +/* A084D8 802415D8 00000000 */ nop +/* A084DC 802415DC 8E620074 */ lw $v0, 0x74($s3) +/* A084E0 802415E0 2442FFFF */ addiu $v0, $v0, -1 +/* A084E4 802415E4 1840001D */ blez $v0, .L8024165C +/* A084E8 802415E8 AE620074 */ sw $v0, 0x74($s3) +/* A084EC 802415EC 8E220018 */ lw $v0, 0x18($s1) +/* A084F0 802415F0 9442002A */ lhu $v0, 0x2a($v0) +/* A084F4 802415F4 30420010 */ andi $v0, $v0, 0x10 +/* A084F8 802415F8 14400007 */ bnez $v0, .L80241618 +/* A084FC 802415FC 00000000 */ nop +/* A08500 80241600 C600000C */ lwc1 $f0, 0xc($s0) +/* A08504 80241604 3C014334 */ lui $at, 0x4334 +/* A08508 80241608 44816000 */ mtc1 $at, $f12 +/* A0850C 8024160C 0C00A6C9 */ jal clamp_angle +/* A08510 80241610 460C0300 */ add.s $f12, $f0, $f12 +/* A08514 80241614 E600000C */ swc1 $f0, 0xc($s0) +.L80241618: +/* A08518 80241618 0C00A67F */ jal rand_int +/* A0851C 8024161C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* A08520 80241620 3C032E8B */ lui $v1, 0x2e8b +/* A08524 80241624 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* A08528 80241628 00430018 */ mult $v0, $v1 +/* A0852C 8024162C 00021FC3 */ sra $v1, $v0, 0x1f +/* A08530 80241630 00004010 */ mfhi $t0 +/* A08534 80241634 00082043 */ sra $a0, $t0, 1 +/* A08538 80241638 00832023 */ subu $a0, $a0, $v1 +/* A0853C 8024163C 00041840 */ sll $v1, $a0, 1 +/* A08540 80241640 00641821 */ addu $v1, $v1, $a0 +/* A08544 80241644 00031880 */ sll $v1, $v1, 2 +/* A08548 80241648 00641823 */ subu $v1, $v1, $a0 +/* A0854C 8024164C 00431023 */ subu $v0, $v0, $v1 +/* A08550 80241650 24420005 */ addiu $v0, $v0, 5 +/* A08554 80241654 08090598 */ j .L80241660 +/* A08558 80241658 A602008E */ sh $v0, 0x8e($s0) +.L8024165C: +/* A0855C 8024165C AE600070 */ sw $zero, 0x70($s3) +.L80241660: +/* A08560 80241660 8FBF0054 */ lw $ra, 0x54($sp) +/* A08564 80241664 8FB40050 */ lw $s4, 0x50($sp) +/* A08568 80241668 8FB3004C */ lw $s3, 0x4c($sp) +/* A0856C 8024166C 8FB20048 */ lw $s2, 0x48($sp) +/* A08570 80241670 8FB10044 */ lw $s1, 0x44($sp) +/* A08574 80241674 8FB00040 */ lw $s0, 0x40($sp) +/* A08578 80241678 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* A0857C 8024167C D7B80068 */ ldc1 $f24, 0x68($sp) +/* A08580 80241680 D7B60060 */ ldc1 $f22, 0x60($sp) +/* A08584 80241684 D7B40058 */ ldc1 $f20, 0x58($sp) +/* A08588 80241688 03E00008 */ jr $ra +/* A0858C 8024168C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708.s deleted file mode 100644 index 38acc04ed6..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241708 -/* A08608 80241708 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A0860C 8024170C AFB00010 */ sw $s0, 0x10($sp) -/* A08610 80241710 0080802D */ daddu $s0, $a0, $zero -/* A08614 80241714 AFBF0014 */ sw $ra, 0x14($sp) -/* A08618 80241718 8E020148 */ lw $v0, 0x148($s0) -/* A0861C 8024171C 0C00EABB */ jal get_npc_unsafe -/* A08620 80241720 84440008 */ lh $a0, 8($v0) -/* A08624 80241724 9443008E */ lhu $v1, 0x8e($v0) -/* A08628 80241728 C440003C */ lwc1 $f0, 0x3c($v0) -/* A0862C 8024172C 24640001 */ addiu $a0, $v1, 1 -/* A08630 80241730 00031C00 */ sll $v1, $v1, 0x10 -/* A08634 80241734 00031B83 */ sra $v1, $v1, 0xe -/* A08638 80241738 A444008E */ sh $a0, 0x8e($v0) -/* A0863C 8024173C 3C018024 */ lui $at, 0x8024 -/* A08640 80241740 00230821 */ addu $at, $at, $v1 -/* A08644 80241744 C4223D5C */ lwc1 $f2, 0x3d5c($at) -/* A08648 80241748 8443008E */ lh $v1, 0x8e($v0) -/* A0864C 8024174C 46020000 */ add.s $f0, $f0, $f2 -/* A08650 80241750 28630005 */ slti $v1, $v1, 5 -/* A08654 80241754 14600003 */ bnez $v1, .L80241764 -/* A08658 80241758 E440003C */ swc1 $f0, 0x3c($v0) -/* A0865C 8024175C 2402000C */ addiu $v0, $zero, 0xc -/* A08660 80241760 AE020070 */ sw $v0, 0x70($s0) -.L80241764: -/* A08664 80241764 8FBF0014 */ lw $ra, 0x14($sp) -/* A08668 80241768 8FB00010 */ lw $s0, 0x10($sp) -/* A0866C 8024176C 03E00008 */ jr $ra -/* A08670 80241770 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s new file mode 100644 index 0000000000..d6f125cea8 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241708_A08608.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241708_A08608 +/* A08608 80241708 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A0860C 8024170C AFB00010 */ sw $s0, 0x10($sp) +/* A08610 80241710 0080802D */ daddu $s0, $a0, $zero +/* A08614 80241714 AFBF0014 */ sw $ra, 0x14($sp) +/* A08618 80241718 8E020148 */ lw $v0, 0x148($s0) +/* A0861C 8024171C 0C00EABB */ jal get_npc_unsafe +/* A08620 80241720 84440008 */ lh $a0, 8($v0) +/* A08624 80241724 9443008E */ lhu $v1, 0x8e($v0) +/* A08628 80241728 C440003C */ lwc1 $f0, 0x3c($v0) +/* A0862C 8024172C 24640001 */ addiu $a0, $v1, 1 +/* A08630 80241730 00031C00 */ sll $v1, $v1, 0x10 +/* A08634 80241734 00031B83 */ sra $v1, $v1, 0xe +/* A08638 80241738 A444008E */ sh $a0, 0x8e($v0) +/* A0863C 8024173C 3C018024 */ lui $at, 0x8024 +/* A08640 80241740 00230821 */ addu $at, $at, $v1 +/* A08644 80241744 C4223D5C */ lwc1 $f2, 0x3d5c($at) +/* A08648 80241748 8443008E */ lh $v1, 0x8e($v0) +/* A0864C 8024174C 46020000 */ add.s $f0, $f0, $f2 +/* A08650 80241750 28630005 */ slti $v1, $v1, 5 +/* A08654 80241754 14600003 */ bnez $v1, .L80241764 +/* A08658 80241758 E440003C */ swc1 $f0, 0x3c($v0) +/* A0865C 8024175C 2402000C */ addiu $v0, $zero, 0xc +/* A08660 80241760 AE020070 */ sw $v0, 0x70($s0) +.L80241764: +/* A08664 80241764 8FBF0014 */ lw $ra, 0x14($sp) +/* A08668 80241768 8FB00010 */ lw $s0, 0x10($sp) +/* A0866C 8024176C 03E00008 */ jr $ra +/* A08670 80241770 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8.s deleted file mode 100644 index e188f52f6c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418A8 -/* A087A8 802418A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A087AC 802418AC AFB00010 */ sw $s0, 0x10($sp) -/* A087B0 802418B0 0080802D */ daddu $s0, $a0, $zero -/* A087B4 802418B4 AFBF0014 */ sw $ra, 0x14($sp) -/* A087B8 802418B8 8E020148 */ lw $v0, 0x148($s0) -/* A087BC 802418BC 0C00EABB */ jal get_npc_unsafe -/* A087C0 802418C0 84440008 */ lh $a0, 8($v0) -/* A087C4 802418C4 0040202D */ daddu $a0, $v0, $zero -/* A087C8 802418C8 8482008E */ lh $v0, 0x8e($a0) -/* A087CC 802418CC 9483008E */ lhu $v1, 0x8e($a0) -/* A087D0 802418D0 18400005 */ blez $v0, .L802418E8 -/* A087D4 802418D4 2462FFFF */ addiu $v0, $v1, -1 -/* A087D8 802418D8 A482008E */ sh $v0, 0x8e($a0) -/* A087DC 802418DC 00021400 */ sll $v0, $v0, 0x10 -/* A087E0 802418E0 1C400006 */ bgtz $v0, .L802418FC -/* A087E4 802418E4 00000000 */ nop -.L802418E8: -/* A087E8 802418E8 8482008C */ lh $v0, 0x8c($a0) -/* A087EC 802418EC 14400003 */ bnez $v0, .L802418FC -/* A087F0 802418F0 2402000E */ addiu $v0, $zero, 0xe -/* A087F4 802418F4 A480008E */ sh $zero, 0x8e($a0) -/* A087F8 802418F8 AE020070 */ sw $v0, 0x70($s0) -.L802418FC: -/* A087FC 802418FC 8FBF0014 */ lw $ra, 0x14($sp) -/* A08800 80241900 8FB00010 */ lw $s0, 0x10($sp) -/* A08804 80241904 03E00008 */ jr $ra -/* A08808 80241908 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s new file mode 100644 index 0000000000..c34e8d666c --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802418A8_A087A8.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418A8_A087A8 +/* A087A8 802418A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A087AC 802418AC AFB00010 */ sw $s0, 0x10($sp) +/* A087B0 802418B0 0080802D */ daddu $s0, $a0, $zero +/* A087B4 802418B4 AFBF0014 */ sw $ra, 0x14($sp) +/* A087B8 802418B8 8E020148 */ lw $v0, 0x148($s0) +/* A087BC 802418BC 0C00EABB */ jal get_npc_unsafe +/* A087C0 802418C0 84440008 */ lh $a0, 8($v0) +/* A087C4 802418C4 0040202D */ daddu $a0, $v0, $zero +/* A087C8 802418C8 8482008E */ lh $v0, 0x8e($a0) +/* A087CC 802418CC 9483008E */ lhu $v1, 0x8e($a0) +/* A087D0 802418D0 18400005 */ blez $v0, .L802418E8 +/* A087D4 802418D4 2462FFFF */ addiu $v0, $v1, -1 +/* A087D8 802418D8 A482008E */ sh $v0, 0x8e($a0) +/* A087DC 802418DC 00021400 */ sll $v0, $v0, 0x10 +/* A087E0 802418E0 1C400006 */ bgtz $v0, .L802418FC +/* A087E4 802418E4 00000000 */ nop +.L802418E8: +/* A087E8 802418E8 8482008C */ lh $v0, 0x8c($a0) +/* A087EC 802418EC 14400003 */ bnez $v0, .L802418FC +/* A087F0 802418F0 2402000E */ addiu $v0, $zero, 0xe +/* A087F4 802418F4 A480008E */ sh $zero, 0x8e($a0) +/* A087F8 802418F8 AE020070 */ sw $v0, 0x70($s0) +.L802418FC: +/* A087FC 802418FC 8FBF0014 */ lw $ra, 0x14($sp) +/* A08800 80241900 8FB00010 */ lw $s0, 0x10($sp) +/* A08804 80241904 03E00008 */ jr $ra +/* A08808 80241908 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0.s deleted file mode 100644 index 7ecd46bb02..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DC0 -/* A08CC0 80241DC0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A08CC4 80241DC4 AFB40040 */ sw $s4, 0x40($sp) -/* A08CC8 80241DC8 0080A02D */ daddu $s4, $a0, $zero -/* A08CCC 80241DCC AFBF0048 */ sw $ra, 0x48($sp) -/* A08CD0 80241DD0 AFB50044 */ sw $s5, 0x44($sp) -/* A08CD4 80241DD4 AFB3003C */ sw $s3, 0x3c($sp) -/* A08CD8 80241DD8 AFB20038 */ sw $s2, 0x38($sp) -/* A08CDC 80241DDC AFB10034 */ sw $s1, 0x34($sp) -/* A08CE0 80241DE0 AFB00030 */ sw $s0, 0x30($sp) -/* A08CE4 80241DE4 8E920148 */ lw $s2, 0x148($s4) -/* A08CE8 80241DE8 86440008 */ lh $a0, 8($s2) -/* A08CEC 80241DEC 8E90000C */ lw $s0, 0xc($s4) -/* A08CF0 80241DF0 0C00EABB */ jal get_npc_unsafe -/* A08CF4 80241DF4 00A0882D */ daddu $s1, $a1, $zero -/* A08CF8 80241DF8 0280202D */ daddu $a0, $s4, $zero -/* A08CFC 80241DFC 8E050000 */ lw $a1, ($s0) -/* A08D00 80241E00 0C0B1EAF */ jal get_variable -/* A08D04 80241E04 0040A82D */ daddu $s5, $v0, $zero -/* A08D08 80241E08 AFA00010 */ sw $zero, 0x10($sp) -/* A08D0C 80241E0C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D10 80241E10 8C630030 */ lw $v1, 0x30($v1) -/* A08D14 80241E14 AFA30014 */ sw $v1, 0x14($sp) -/* A08D18 80241E18 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D1C 80241E1C 8C63001C */ lw $v1, 0x1c($v1) -/* A08D20 80241E20 AFA30018 */ sw $v1, 0x18($sp) -/* A08D24 80241E24 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D28 80241E28 8C630024 */ lw $v1, 0x24($v1) -/* A08D2C 80241E2C AFA3001C */ sw $v1, 0x1c($sp) -/* A08D30 80241E30 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D34 80241E34 8C630028 */ lw $v1, 0x28($v1) -/* A08D38 80241E38 27B30010 */ addiu $s3, $sp, 0x10 -/* A08D3C 80241E3C AFA30020 */ sw $v1, 0x20($sp) -/* A08D40 80241E40 8E4300D0 */ lw $v1, 0xd0($s2) -/* A08D44 80241E44 3C0142F0 */ lui $at, 0x42f0 -/* A08D48 80241E48 44810000 */ mtc1 $at, $f0 -/* A08D4C 80241E4C 8C63002C */ lw $v1, 0x2c($v1) -/* A08D50 80241E50 0040802D */ daddu $s0, $v0, $zero -/* A08D54 80241E54 E7A00028 */ swc1 $f0, 0x28($sp) -/* A08D58 80241E58 A7A0002C */ sh $zero, 0x2c($sp) -/* A08D5C 80241E5C 12200006 */ beqz $s1, .L80241E78 -/* A08D60 80241E60 AFA30024 */ sw $v1, 0x24($sp) -/* A08D64 80241E64 02A0202D */ daddu $a0, $s5, $zero -/* A08D68 80241E68 0240282D */ daddu $a1, $s2, $zero -/* A08D6C 80241E6C 0280302D */ daddu $a2, $s4, $zero -/* A08D70 80241E70 0C090727 */ jal func_80241C9C -/* A08D74 80241E74 0200382D */ daddu $a3, $s0, $zero -.L80241E78: -/* A08D78 80241E78 2402FFFE */ addiu $v0, $zero, -2 -/* A08D7C 80241E7C A2A200AB */ sb $v0, 0xab($s5) -/* A08D80 80241E80 8E4300B0 */ lw $v1, 0xb0($s2) -/* A08D84 80241E84 30620004 */ andi $v0, $v1, 4 -/* A08D88 80241E88 10400007 */ beqz $v0, .L80241EA8 -/* A08D8C 80241E8C 00000000 */ nop -/* A08D90 80241E90 824200B4 */ lb $v0, 0xb4($s2) -/* A08D94 80241E94 1440003C */ bnez $v0, .L80241F88 -/* A08D98 80241E98 0000102D */ daddu $v0, $zero, $zero -/* A08D9C 80241E9C 2402FFFB */ addiu $v0, $zero, -5 -/* A08DA0 80241EA0 00621024 */ and $v0, $v1, $v0 -/* A08DA4 80241EA4 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241EA8: -/* A08DA8 80241EA8 8E830070 */ lw $v1, 0x70($s4) -/* A08DAC 80241EAC 2C62000F */ sltiu $v0, $v1, 0xf -/* A08DB0 80241EB0 10400034 */ beqz $v0, .L80241F84 -/* A08DB4 80241EB4 00031080 */ sll $v0, $v1, 2 -/* A08DB8 80241EB8 3C018024 */ lui $at, 0x8024 -/* A08DBC 80241EBC 00220821 */ addu $at, $at, $v0 -/* A08DC0 80241EC0 8C224D68 */ lw $v0, 0x4d68($at) -/* A08DC4 80241EC4 00400008 */ jr $v0 -/* A08DC8 80241EC8 00000000 */ nop -/* A08DCC 80241ECC 0280202D */ daddu $a0, $s4, $zero -/* A08DD0 80241ED0 0200282D */ daddu $a1, $s0, $zero -/* A08DD4 80241ED4 0C0902AD */ jal func_80240AB4 -/* A08DD8 80241ED8 0260302D */ daddu $a2, $s3, $zero -/* A08DDC 80241EDC 0280202D */ daddu $a0, $s4, $zero -/* A08DE0 80241EE0 0200282D */ daddu $a1, $s0, $zero -/* A08DE4 80241EE4 0C090319 */ jal func_80240C64 -/* A08DE8 80241EE8 0260302D */ daddu $a2, $s3, $zero -/* A08DEC 80241EEC 080907E2 */ j .L80241F88 -/* A08DF0 80241EF0 0000102D */ daddu $v0, $zero, $zero -/* A08DF4 80241EF4 0280202D */ daddu $a0, $s4, $zero -/* A08DF8 80241EF8 0200282D */ daddu $a1, $s0, $zero -/* A08DFC 80241EFC 0C0904A3 */ jal func_8024128C -/* A08E00 80241F00 0260302D */ daddu $a2, $s3, $zero -/* A08E04 80241F04 0280202D */ daddu $a0, $s4, $zero -/* A08E08 80241F08 0200282D */ daddu $a1, $s0, $zero -/* A08E0C 80241F0C 0C0904D3 */ jal func_8024134C -/* A08E10 80241F10 0260302D */ daddu $a2, $s3, $zero -/* A08E14 80241F14 080907E2 */ j .L80241F88 -/* A08E18 80241F18 0000102D */ daddu $v0, $zero, $zero -/* A08E1C 80241F1C 0280202D */ daddu $a0, $s4, $zero -/* A08E20 80241F20 0200282D */ daddu $a1, $s0, $zero -/* A08E24 80241F24 0C0905A4 */ jal func_80241690 -/* A08E28 80241F28 0260302D */ daddu $a2, $s3, $zero -/* A08E2C 80241F2C 0280202D */ daddu $a0, $s4, $zero -/* A08E30 80241F30 0200282D */ daddu $a1, $s0, $zero -/* A08E34 80241F34 0C0905C2 */ jal func_80241708 -/* A08E38 80241F38 0260302D */ daddu $a2, $s3, $zero -/* A08E3C 80241F3C 080907E2 */ j .L80241F88 -/* A08E40 80241F40 0000102D */ daddu $v0, $zero, $zero -/* A08E44 80241F44 0280202D */ daddu $a0, $s4, $zero -/* A08E48 80241F48 0200282D */ daddu $a1, $s0, $zero -/* A08E4C 80241F4C 0C0905DD */ jal func_80241774 -/* A08E50 80241F50 0260302D */ daddu $a2, $s3, $zero -/* A08E54 80241F54 080907E2 */ j .L80241F88 -/* A08E58 80241F58 0000102D */ daddu $v0, $zero, $zero -/* A08E5C 80241F5C 0280202D */ daddu $a0, $s4, $zero -/* A08E60 80241F60 0200282D */ daddu $a1, $s0, $zero -/* A08E64 80241F64 0C09062A */ jal func_802418A8 -/* A08E68 80241F68 0260302D */ daddu $a2, $s3, $zero -/* A08E6C 80241F6C 080907E2 */ j .L80241F88 -/* A08E70 80241F70 0000102D */ daddu $v0, $zero, $zero -/* A08E74 80241F74 0280202D */ daddu $a0, $s4, $zero -/* A08E78 80241F78 0200282D */ daddu $a1, $s0, $zero -/* A08E7C 80241F7C 0C090643 */ jal func_8024190C -/* A08E80 80241F80 0260302D */ daddu $a2, $s3, $zero -.L80241F84: -/* A08E84 80241F84 0000102D */ daddu $v0, $zero, $zero -.L80241F88: -/* A08E88 80241F88 8FBF0048 */ lw $ra, 0x48($sp) -/* A08E8C 80241F8C 8FB50044 */ lw $s5, 0x44($sp) -/* A08E90 80241F90 8FB40040 */ lw $s4, 0x40($sp) -/* A08E94 80241F94 8FB3003C */ lw $s3, 0x3c($sp) -/* A08E98 80241F98 8FB20038 */ lw $s2, 0x38($sp) -/* A08E9C 80241F9C 8FB10034 */ lw $s1, 0x34($sp) -/* A08EA0 80241FA0 8FB00030 */ lw $s0, 0x30($sp) -/* A08EA4 80241FA4 03E00008 */ jr $ra -/* A08EA8 80241FA8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s new file mode 100644 index 0000000000..3e90afdc4b --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80241DC0_A08CC0.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DC0_A08CC0 +/* A08CC0 80241DC0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A08CC4 80241DC4 AFB40040 */ sw $s4, 0x40($sp) +/* A08CC8 80241DC8 0080A02D */ daddu $s4, $a0, $zero +/* A08CCC 80241DCC AFBF0048 */ sw $ra, 0x48($sp) +/* A08CD0 80241DD0 AFB50044 */ sw $s5, 0x44($sp) +/* A08CD4 80241DD4 AFB3003C */ sw $s3, 0x3c($sp) +/* A08CD8 80241DD8 AFB20038 */ sw $s2, 0x38($sp) +/* A08CDC 80241DDC AFB10034 */ sw $s1, 0x34($sp) +/* A08CE0 80241DE0 AFB00030 */ sw $s0, 0x30($sp) +/* A08CE4 80241DE4 8E920148 */ lw $s2, 0x148($s4) +/* A08CE8 80241DE8 86440008 */ lh $a0, 8($s2) +/* A08CEC 80241DEC 8E90000C */ lw $s0, 0xc($s4) +/* A08CF0 80241DF0 0C00EABB */ jal get_npc_unsafe +/* A08CF4 80241DF4 00A0882D */ daddu $s1, $a1, $zero +/* A08CF8 80241DF8 0280202D */ daddu $a0, $s4, $zero +/* A08CFC 80241DFC 8E050000 */ lw $a1, ($s0) +/* A08D00 80241E00 0C0B1EAF */ jal get_variable +/* A08D04 80241E04 0040A82D */ daddu $s5, $v0, $zero +/* A08D08 80241E08 AFA00010 */ sw $zero, 0x10($sp) +/* A08D0C 80241E0C 8E4300D0 */ lw $v1, 0xd0($s2) +/* A08D10 80241E10 8C630030 */ lw $v1, 0x30($v1) +/* A08D14 80241E14 AFA30014 */ sw $v1, 0x14($sp) +/* A08D18 80241E18 8E4300D0 */ lw $v1, 0xd0($s2) +/* A08D1C 80241E1C 8C63001C */ lw $v1, 0x1c($v1) +/* A08D20 80241E20 AFA30018 */ sw $v1, 0x18($sp) +/* A08D24 80241E24 8E4300D0 */ lw $v1, 0xd0($s2) +/* A08D28 80241E28 8C630024 */ lw $v1, 0x24($v1) +/* A08D2C 80241E2C AFA3001C */ sw $v1, 0x1c($sp) +/* A08D30 80241E30 8E4300D0 */ lw $v1, 0xd0($s2) +/* A08D34 80241E34 8C630028 */ lw $v1, 0x28($v1) +/* A08D38 80241E38 27B30010 */ addiu $s3, $sp, 0x10 +/* A08D3C 80241E3C AFA30020 */ sw $v1, 0x20($sp) +/* A08D40 80241E40 8E4300D0 */ lw $v1, 0xd0($s2) +/* A08D44 80241E44 3C0142F0 */ lui $at, 0x42f0 +/* A08D48 80241E48 44810000 */ mtc1 $at, $f0 +/* A08D4C 80241E4C 8C63002C */ lw $v1, 0x2c($v1) +/* A08D50 80241E50 0040802D */ daddu $s0, $v0, $zero +/* A08D54 80241E54 E7A00028 */ swc1 $f0, 0x28($sp) +/* A08D58 80241E58 A7A0002C */ sh $zero, 0x2c($sp) +/* A08D5C 80241E5C 12200006 */ beqz $s1, .L80241E78 +/* A08D60 80241E60 AFA30024 */ sw $v1, 0x24($sp) +/* A08D64 80241E64 02A0202D */ daddu $a0, $s5, $zero +/* A08D68 80241E68 0240282D */ daddu $a1, $s2, $zero +/* A08D6C 80241E6C 0280302D */ daddu $a2, $s4, $zero +/* A08D70 80241E70 0C090727 */ jal func_80241C9C_A08B9C +/* A08D74 80241E74 0200382D */ daddu $a3, $s0, $zero +.L80241E78: +/* A08D78 80241E78 2402FFFE */ addiu $v0, $zero, -2 +/* A08D7C 80241E7C A2A200AB */ sb $v0, 0xab($s5) +/* A08D80 80241E80 8E4300B0 */ lw $v1, 0xb0($s2) +/* A08D84 80241E84 30620004 */ andi $v0, $v1, 4 +/* A08D88 80241E88 10400007 */ beqz $v0, .L80241EA8 +/* A08D8C 80241E8C 00000000 */ nop +/* A08D90 80241E90 824200B4 */ lb $v0, 0xb4($s2) +/* A08D94 80241E94 1440003C */ bnez $v0, .L80241F88 +/* A08D98 80241E98 0000102D */ daddu $v0, $zero, $zero +/* A08D9C 80241E9C 2402FFFB */ addiu $v0, $zero, -5 +/* A08DA0 80241EA0 00621024 */ and $v0, $v1, $v0 +/* A08DA4 80241EA4 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241EA8: +/* A08DA8 80241EA8 8E830070 */ lw $v1, 0x70($s4) +/* A08DAC 80241EAC 2C62000F */ sltiu $v0, $v1, 0xf +/* A08DB0 80241EB0 10400034 */ beqz $v0, .L80241F84 +/* A08DB4 80241EB4 00031080 */ sll $v0, $v1, 2 +/* A08DB8 80241EB8 3C018024 */ lui $at, 0x8024 +/* A08DBC 80241EBC 00220821 */ addu $at, $at, $v0 +/* A08DC0 80241EC0 8C224D68 */ lw $v0, 0x4d68($at) +/* A08DC4 80241EC4 00400008 */ jr $v0 +/* A08DC8 80241EC8 00000000 */ nop +/* A08DCC 80241ECC 0280202D */ daddu $a0, $s4, $zero +/* A08DD0 80241ED0 0200282D */ daddu $a1, $s0, $zero +/* A08DD4 80241ED4 0C0902AD */ jal func_80240AB4_A079B4 +/* A08DD8 80241ED8 0260302D */ daddu $a2, $s3, $zero +/* A08DDC 80241EDC 0280202D */ daddu $a0, $s4, $zero +/* A08DE0 80241EE0 0200282D */ daddu $a1, $s0, $zero +/* A08DE4 80241EE4 0C090319 */ jal func_80240C64_A07B64 +/* A08DE8 80241EE8 0260302D */ daddu $a2, $s3, $zero +/* A08DEC 80241EEC 080907E2 */ j .L80241F88 +/* A08DF0 80241EF0 0000102D */ daddu $v0, $zero, $zero +/* A08DF4 80241EF4 0280202D */ daddu $a0, $s4, $zero +/* A08DF8 80241EF8 0200282D */ daddu $a1, $s0, $zero +/* A08DFC 80241EFC 0C0904A3 */ jal func_8024128C_A0818C +/* A08E00 80241F00 0260302D */ daddu $a2, $s3, $zero +/* A08E04 80241F04 0280202D */ daddu $a0, $s4, $zero +/* A08E08 80241F08 0200282D */ daddu $a1, $s0, $zero +/* A08E0C 80241F0C 0C0904D3 */ jal func_8024134C_A0824C +/* A08E10 80241F10 0260302D */ daddu $a2, $s3, $zero +/* A08E14 80241F14 080907E2 */ j .L80241F88 +/* A08E18 80241F18 0000102D */ daddu $v0, $zero, $zero +/* A08E1C 80241F1C 0280202D */ daddu $a0, $s4, $zero +/* A08E20 80241F20 0200282D */ daddu $a1, $s0, $zero +/* A08E24 80241F24 0C0905A4 */ jal func_80241690_A08590 +/* A08E28 80241F28 0260302D */ daddu $a2, $s3, $zero +/* A08E2C 80241F2C 0280202D */ daddu $a0, $s4, $zero +/* A08E30 80241F30 0200282D */ daddu $a1, $s0, $zero +/* A08E34 80241F34 0C0905C2 */ jal func_80241708_A08608 +/* A08E38 80241F38 0260302D */ daddu $a2, $s3, $zero +/* A08E3C 80241F3C 080907E2 */ j .L80241F88 +/* A08E40 80241F40 0000102D */ daddu $v0, $zero, $zero +/* A08E44 80241F44 0280202D */ daddu $a0, $s4, $zero +/* A08E48 80241F48 0200282D */ daddu $a1, $s0, $zero +/* A08E4C 80241F4C 0C0905DD */ jal func_80241774_A08674 +/* A08E50 80241F50 0260302D */ daddu $a2, $s3, $zero +/* A08E54 80241F54 080907E2 */ j .L80241F88 +/* A08E58 80241F58 0000102D */ daddu $v0, $zero, $zero +/* A08E5C 80241F5C 0280202D */ daddu $a0, $s4, $zero +/* A08E60 80241F60 0200282D */ daddu $a1, $s0, $zero +/* A08E64 80241F64 0C09062A */ jal func_802418A8_A087A8 +/* A08E68 80241F68 0260302D */ daddu $a2, $s3, $zero +/* A08E6C 80241F6C 080907E2 */ j .L80241F88 +/* A08E70 80241F70 0000102D */ daddu $v0, $zero, $zero +/* A08E74 80241F74 0280202D */ daddu $a0, $s4, $zero +/* A08E78 80241F78 0200282D */ daddu $a1, $s0, $zero +/* A08E7C 80241F7C 0C090643 */ jal func_8024190C_A0880C +/* A08E80 80241F80 0260302D */ daddu $a2, $s3, $zero +.L80241F84: +/* A08E84 80241F84 0000102D */ daddu $v0, $zero, $zero +.L80241F88: +/* A08E88 80241F88 8FBF0048 */ lw $ra, 0x48($sp) +/* A08E8C 80241F8C 8FB50044 */ lw $s5, 0x44($sp) +/* A08E90 80241F90 8FB40040 */ lw $s4, 0x40($sp) +/* A08E94 80241F94 8FB3003C */ lw $s3, 0x3c($sp) +/* A08E98 80241F98 8FB20038 */ lw $s2, 0x38($sp) +/* A08E9C 80241F9C 8FB10034 */ lw $s1, 0x34($sp) +/* A08EA0 80241FA0 8FB00030 */ lw $s0, 0x30($sp) +/* A08EA4 80241FA4 03E00008 */ jr $ra +/* A08EA8 80241FA8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4.s deleted file mode 100644 index 7197293abe..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420D4 -/* A08FD4 802420D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A08FD8 802420D8 AFB20018 */ sw $s2, 0x18($sp) -/* A08FDC 802420DC 0080902D */ daddu $s2, $a0, $zero -/* A08FE0 802420E0 AFBF001C */ sw $ra, 0x1c($sp) -/* A08FE4 802420E4 AFB10014 */ sw $s1, 0x14($sp) -/* A08FE8 802420E8 AFB00010 */ sw $s0, 0x10($sp) -/* A08FEC 802420EC 8E510148 */ lw $s1, 0x148($s2) -/* A08FF0 802420F0 0C00EABB */ jal get_npc_unsafe -/* A08FF4 802420F4 86240008 */ lh $a0, 8($s1) -/* A08FF8 802420F8 0040802D */ daddu $s0, $v0, $zero -/* A08FFC 802420FC C602001C */ lwc1 $f2, 0x1c($s0) -/* A09000 80242100 C6000014 */ lwc1 $f0, 0x14($s0) -/* A09004 80242104 8E050018 */ lw $a1, 0x18($s0) -/* A09008 80242108 46001080 */ add.s $f2, $f2, $f0 -/* A0900C 8024210C C600003C */ lwc1 $f0, 0x3c($s0) -/* A09010 80242110 8E06000C */ lw $a2, 0xc($s0) -/* A09014 80242114 46020000 */ add.s $f0, $f0, $f2 -/* A09018 80242118 0200202D */ daddu $a0, $s0, $zero -/* A0901C 8024211C E602001C */ swc1 $f2, 0x1c($s0) -/* A09020 80242120 0C00EA95 */ jal npc_move_heading -/* A09024 80242124 E600003C */ swc1 $f0, 0x3c($s0) -/* A09028 80242128 9602008E */ lhu $v0, 0x8e($s0) -/* A0902C 8024212C 2442FFFF */ addiu $v0, $v0, -1 -/* A09030 80242130 A602008E */ sh $v0, 0x8e($s0) -/* A09034 80242134 00021400 */ sll $v0, $v0, 0x10 -/* A09038 80242138 1C40000F */ bgtz $v0, .L80242178 -/* A0903C 8024213C 00000000 */ nop -/* A09040 80242140 3C013E99 */ lui $at, 0x3e99 -/* A09044 80242144 3421999A */ ori $at, $at, 0x999a -/* A09048 80242148 44810000 */ mtc1 $at, $f0 -/* A0904C 8024214C 3C014040 */ lui $at, 0x4040 -/* A09050 80242150 44811000 */ mtc1 $at, $f2 -/* A09054 80242154 A2200007 */ sb $zero, 7($s1) -/* A09058 80242158 AE00001C */ sw $zero, 0x1c($s0) -/* A0905C 8024215C E6000014 */ swc1 $f0, 0x14($s0) -/* A09060 80242160 E6020018 */ swc1 $f2, 0x18($s0) -/* A09064 80242164 8E2200CC */ lw $v0, 0xcc($s1) -/* A09068 80242168 8C420028 */ lw $v0, 0x28($v0) -/* A0906C 8024216C AE020028 */ sw $v0, 0x28($s0) -/* A09070 80242170 2402000E */ addiu $v0, $zero, 0xe -/* A09074 80242174 AE420070 */ sw $v0, 0x70($s2) -.L80242178: -/* A09078 80242178 8FBF001C */ lw $ra, 0x1c($sp) -/* A0907C 8024217C 8FB20018 */ lw $s2, 0x18($sp) -/* A09080 80242180 8FB10014 */ lw $s1, 0x14($sp) -/* A09084 80242184 8FB00010 */ lw $s0, 0x10($sp) -/* A09088 80242188 03E00008 */ jr $ra -/* A0908C 8024218C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s new file mode 100644 index 0000000000..a4bcdbc04f --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802420D4_A08FD4.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420D4_A08FD4 +/* A08FD4 802420D4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* A08FD8 802420D8 AFB20018 */ sw $s2, 0x18($sp) +/* A08FDC 802420DC 0080902D */ daddu $s2, $a0, $zero +/* A08FE0 802420E0 AFBF001C */ sw $ra, 0x1c($sp) +/* A08FE4 802420E4 AFB10014 */ sw $s1, 0x14($sp) +/* A08FE8 802420E8 AFB00010 */ sw $s0, 0x10($sp) +/* A08FEC 802420EC 8E510148 */ lw $s1, 0x148($s2) +/* A08FF0 802420F0 0C00EABB */ jal get_npc_unsafe +/* A08FF4 802420F4 86240008 */ lh $a0, 8($s1) +/* A08FF8 802420F8 0040802D */ daddu $s0, $v0, $zero +/* A08FFC 802420FC C602001C */ lwc1 $f2, 0x1c($s0) +/* A09000 80242100 C6000014 */ lwc1 $f0, 0x14($s0) +/* A09004 80242104 8E050018 */ lw $a1, 0x18($s0) +/* A09008 80242108 46001080 */ add.s $f2, $f2, $f0 +/* A0900C 8024210C C600003C */ lwc1 $f0, 0x3c($s0) +/* A09010 80242110 8E06000C */ lw $a2, 0xc($s0) +/* A09014 80242114 46020000 */ add.s $f0, $f0, $f2 +/* A09018 80242118 0200202D */ daddu $a0, $s0, $zero +/* A0901C 8024211C E602001C */ swc1 $f2, 0x1c($s0) +/* A09020 80242120 0C00EA95 */ jal npc_move_heading +/* A09024 80242124 E600003C */ swc1 $f0, 0x3c($s0) +/* A09028 80242128 9602008E */ lhu $v0, 0x8e($s0) +/* A0902C 8024212C 2442FFFF */ addiu $v0, $v0, -1 +/* A09030 80242130 A602008E */ sh $v0, 0x8e($s0) +/* A09034 80242134 00021400 */ sll $v0, $v0, 0x10 +/* A09038 80242138 1C40000F */ bgtz $v0, .L80242178 +/* A0903C 8024213C 00000000 */ nop +/* A09040 80242140 3C013E99 */ lui $at, 0x3e99 +/* A09044 80242144 3421999A */ ori $at, $at, 0x999a +/* A09048 80242148 44810000 */ mtc1 $at, $f0 +/* A0904C 8024214C 3C014040 */ lui $at, 0x4040 +/* A09050 80242150 44811000 */ mtc1 $at, $f2 +/* A09054 80242154 A2200007 */ sb $zero, 7($s1) +/* A09058 80242158 AE00001C */ sw $zero, 0x1c($s0) +/* A0905C 8024215C E6000014 */ swc1 $f0, 0x14($s0) +/* A09060 80242160 E6020018 */ swc1 $f2, 0x18($s0) +/* A09064 80242164 8E2200CC */ lw $v0, 0xcc($s1) +/* A09068 80242168 8C420028 */ lw $v0, 0x28($v0) +/* A0906C 8024216C AE020028 */ sw $v0, 0x28($s0) +/* A09070 80242170 2402000E */ addiu $v0, $zero, 0xe +/* A09074 80242174 AE420070 */ sw $v0, 0x70($s2) +.L80242178: +/* A09078 80242178 8FBF001C */ lw $ra, 0x1c($sp) +/* A0907C 8024217C 8FB20018 */ lw $s2, 0x18($sp) +/* A09080 80242180 8FB10014 */ lw $s1, 0x14($sp) +/* A09084 80242184 8FB00010 */ lw $s0, 0x10($sp) +/* A09088 80242188 03E00008 */ jr $ra +/* A0908C 8024218C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190.s deleted file mode 100644 index f6a0471cc2..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242190 -/* A09090 80242190 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* A09094 80242194 AFB20030 */ sw $s2, 0x30($sp) -/* A09098 80242198 0080902D */ daddu $s2, $a0, $zero -/* A0909C 8024219C AFBF0034 */ sw $ra, 0x34($sp) -/* A090A0 802421A0 AFB1002C */ sw $s1, 0x2c($sp) -/* A090A4 802421A4 AFB00028 */ sw $s0, 0x28($sp) -/* A090A8 802421A8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A090AC 802421AC 8E510148 */ lw $s1, 0x148($s2) -/* A090B0 802421B0 0C00EABB */ jal get_npc_unsafe -/* A090B4 802421B4 86240008 */ lh $a0, 8($s1) -/* A090B8 802421B8 0040802D */ daddu $s0, $v0, $zero -/* A090BC 802421BC C604001C */ lwc1 $f4, 0x1c($s0) -/* A090C0 802421C0 C6000014 */ lwc1 $f0, 0x14($s0) -/* A090C4 802421C4 0200202D */ daddu $a0, $s0, $zero -/* A090C8 802421C8 46002100 */ add.s $f4, $f4, $f0 -/* A090CC 802421CC C602003C */ lwc1 $f2, 0x3c($s0) -/* A090D0 802421D0 8E050018 */ lw $a1, 0x18($s0) -/* A090D4 802421D4 46041080 */ add.s $f2, $f2, $f4 -/* A090D8 802421D8 8E06000C */ lw $a2, 0xc($s0) -/* A090DC 802421DC C6200078 */ lwc1 $f0, 0x78($s1) -/* A090E0 802421E0 46800020 */ cvt.s.w $f0, $f0 -/* A090E4 802421E4 E602003C */ swc1 $f2, 0x3c($s0) -/* A090E8 802421E8 3C014059 */ lui $at, 0x4059 -/* A090EC 802421EC 44811800 */ mtc1 $at, $f3 -/* A090F0 802421F0 44801000 */ mtc1 $zero, $f2 -/* A090F4 802421F4 46000021 */ cvt.d.s $f0, $f0 -/* A090F8 802421F8 E604001C */ swc1 $f4, 0x1c($s0) -/* A090FC 802421FC 46220003 */ div.d $f0, $f0, $f2 -/* A09100 80242200 0C00EA95 */ jal npc_move_heading -/* A09104 80242204 46200520 */ cvt.s.d $f20, $f0 -/* A09108 80242208 27A50018 */ addiu $a1, $sp, 0x18 -/* A0910C 8024220C 27A6001C */ addiu $a2, $sp, 0x1c -/* A09110 80242210 C6000038 */ lwc1 $f0, 0x38($s0) -/* A09114 80242214 C602003C */ lwc1 $f2, 0x3c($s0) -/* A09118 80242218 C6040040 */ lwc1 $f4, 0x40($s0) -/* A0911C 8024221C 3C01447A */ lui $at, 0x447a -/* A09120 80242220 44813000 */ mtc1 $at, $f6 -/* A09124 80242224 27A20024 */ addiu $v0, $sp, 0x24 -/* A09128 80242228 E7A00018 */ swc1 $f0, 0x18($sp) -/* A0912C 8024222C E7A2001C */ swc1 $f2, 0x1c($sp) -/* A09130 80242230 E7A40020 */ swc1 $f4, 0x20($sp) -/* A09134 80242234 E7A60024 */ swc1 $f6, 0x24($sp) -/* A09138 80242238 AFA20010 */ sw $v0, 0x10($sp) -/* A0913C 8024223C 8E040080 */ lw $a0, 0x80($s0) -/* A09140 80242240 0C0372DF */ jal func_800DCB7C -/* A09144 80242244 27A70020 */ addiu $a3, $sp, 0x20 -/* A09148 80242248 10400003 */ beqz $v0, .L80242258 -/* A0914C 8024224C 4600A086 */ mov.s $f2, $f20 -/* A09150 80242250 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* A09154 80242254 46140080 */ add.s $f2, $f0, $f20 -.L80242258: -/* A09158 80242258 C600003C */ lwc1 $f0, 0x3c($s0) -/* A0915C 8024225C 4602003C */ c.lt.s $f0, $f2 -/* A09160 80242260 00000000 */ nop -/* A09164 80242264 45010009 */ bc1t .L8024228C -/* A09168 80242268 2402000A */ addiu $v0, $zero, 0xa -/* A0916C 8024226C A602008E */ sh $v0, 0x8e($s0) -/* A09170 80242270 8E2200CC */ lw $v0, 0xcc($s1) -/* A09174 80242274 8C42002C */ lw $v0, 0x2c($v0) -/* A09178 80242278 AE020028 */ sw $v0, 0x28($s0) -/* A0917C 8024227C 9622008E */ lhu $v0, 0x8e($s1) -/* A09180 80242280 A60200A8 */ sh $v0, 0xa8($s0) -/* A09184 80242284 2402000F */ addiu $v0, $zero, 0xf -/* A09188 80242288 AE420070 */ sw $v0, 0x70($s2) -.L8024228C: -/* A0918C 8024228C 8FBF0034 */ lw $ra, 0x34($sp) -/* A09190 80242290 8FB20030 */ lw $s2, 0x30($sp) -/* A09194 80242294 8FB1002C */ lw $s1, 0x2c($sp) -/* A09198 80242298 8FB00028 */ lw $s0, 0x28($sp) -/* A0919C 8024229C D7B40038 */ ldc1 $f20, 0x38($sp) -/* A091A0 802422A0 03E00008 */ jr $ra -/* A091A4 802422A4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s new file mode 100644 index 0000000000..51e6257b0d --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_80242190_A09090.s @@ -0,0 +1,76 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242190_A09090 +/* A09090 80242190 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* A09094 80242194 AFB20030 */ sw $s2, 0x30($sp) +/* A09098 80242198 0080902D */ daddu $s2, $a0, $zero +/* A0909C 8024219C AFBF0034 */ sw $ra, 0x34($sp) +/* A090A0 802421A0 AFB1002C */ sw $s1, 0x2c($sp) +/* A090A4 802421A4 AFB00028 */ sw $s0, 0x28($sp) +/* A090A8 802421A8 F7B40038 */ sdc1 $f20, 0x38($sp) +/* A090AC 802421AC 8E510148 */ lw $s1, 0x148($s2) +/* A090B0 802421B0 0C00EABB */ jal get_npc_unsafe +/* A090B4 802421B4 86240008 */ lh $a0, 8($s1) +/* A090B8 802421B8 0040802D */ daddu $s0, $v0, $zero +/* A090BC 802421BC C604001C */ lwc1 $f4, 0x1c($s0) +/* A090C0 802421C0 C6000014 */ lwc1 $f0, 0x14($s0) +/* A090C4 802421C4 0200202D */ daddu $a0, $s0, $zero +/* A090C8 802421C8 46002100 */ add.s $f4, $f4, $f0 +/* A090CC 802421CC C602003C */ lwc1 $f2, 0x3c($s0) +/* A090D0 802421D0 8E050018 */ lw $a1, 0x18($s0) +/* A090D4 802421D4 46041080 */ add.s $f2, $f2, $f4 +/* A090D8 802421D8 8E06000C */ lw $a2, 0xc($s0) +/* A090DC 802421DC C6200078 */ lwc1 $f0, 0x78($s1) +/* A090E0 802421E0 46800020 */ cvt.s.w $f0, $f0 +/* A090E4 802421E4 E602003C */ swc1 $f2, 0x3c($s0) +/* A090E8 802421E8 3C014059 */ lui $at, 0x4059 +/* A090EC 802421EC 44811800 */ mtc1 $at, $f3 +/* A090F0 802421F0 44801000 */ mtc1 $zero, $f2 +/* A090F4 802421F4 46000021 */ cvt.d.s $f0, $f0 +/* A090F8 802421F8 E604001C */ swc1 $f4, 0x1c($s0) +/* A090FC 802421FC 46220003 */ div.d $f0, $f0, $f2 +/* A09100 80242200 0C00EA95 */ jal npc_move_heading +/* A09104 80242204 46200520 */ cvt.s.d $f20, $f0 +/* A09108 80242208 27A50018 */ addiu $a1, $sp, 0x18 +/* A0910C 8024220C 27A6001C */ addiu $a2, $sp, 0x1c +/* A09110 80242210 C6000038 */ lwc1 $f0, 0x38($s0) +/* A09114 80242214 C602003C */ lwc1 $f2, 0x3c($s0) +/* A09118 80242218 C6040040 */ lwc1 $f4, 0x40($s0) +/* A0911C 8024221C 3C01447A */ lui $at, 0x447a +/* A09120 80242220 44813000 */ mtc1 $at, $f6 +/* A09124 80242224 27A20024 */ addiu $v0, $sp, 0x24 +/* A09128 80242228 E7A00018 */ swc1 $f0, 0x18($sp) +/* A0912C 8024222C E7A2001C */ swc1 $f2, 0x1c($sp) +/* A09130 80242230 E7A40020 */ swc1 $f4, 0x20($sp) +/* A09134 80242234 E7A60024 */ swc1 $f6, 0x24($sp) +/* A09138 80242238 AFA20010 */ sw $v0, 0x10($sp) +/* A0913C 8024223C 8E040080 */ lw $a0, 0x80($s0) +/* A09140 80242240 0C0372DF */ jal func_800DCB7C +/* A09144 80242244 27A70020 */ addiu $a3, $sp, 0x20 +/* A09148 80242248 10400003 */ beqz $v0, .L80242258 +/* A0914C 8024224C 4600A086 */ mov.s $f2, $f20 +/* A09150 80242250 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* A09154 80242254 46140080 */ add.s $f2, $f0, $f20 +.L80242258: +/* A09158 80242258 C600003C */ lwc1 $f0, 0x3c($s0) +/* A0915C 8024225C 4602003C */ c.lt.s $f0, $f2 +/* A09160 80242260 00000000 */ nop +/* A09164 80242264 45010009 */ bc1t .L8024228C +/* A09168 80242268 2402000A */ addiu $v0, $zero, 0xa +/* A0916C 8024226C A602008E */ sh $v0, 0x8e($s0) +/* A09170 80242270 8E2200CC */ lw $v0, 0xcc($s1) +/* A09174 80242274 8C42002C */ lw $v0, 0x2c($v0) +/* A09178 80242278 AE020028 */ sw $v0, 0x28($s0) +/* A0917C 8024227C 9622008E */ lhu $v0, 0x8e($s1) +/* A09180 80242280 A60200A8 */ sh $v0, 0xa8($s0) +/* A09184 80242284 2402000F */ addiu $v0, $zero, 0xf +/* A09188 80242288 AE420070 */ sw $v0, 0x70($s2) +.L8024228C: +/* A0918C 8024228C 8FBF0034 */ lw $ra, 0x34($sp) +/* A09190 80242290 8FB20030 */ lw $s2, 0x30($sp) +/* A09194 80242294 8FB1002C */ lw $s1, 0x2c($sp) +/* A09198 80242298 8FB00028 */ lw $s0, 0x28($sp) +/* A0919C 8024229C D7B40038 */ ldc1 $f20, 0x38($sp) +/* A091A0 802422A0 03E00008 */ jr $ra +/* A091A4 802422A4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8.s deleted file mode 100644 index 1fb1778175..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422A8 -/* A091A8 802422A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A091AC 802422AC AFB00010 */ sw $s0, 0x10($sp) -/* A091B0 802422B0 0080802D */ daddu $s0, $a0, $zero -/* A091B4 802422B4 AFBF0014 */ sw $ra, 0x14($sp) -/* A091B8 802422B8 8E020148 */ lw $v0, 0x148($s0) -/* A091BC 802422BC 0C00EABB */ jal get_npc_unsafe -/* A091C0 802422C0 84440008 */ lh $a0, 8($v0) -/* A091C4 802422C4 9443008E */ lhu $v1, 0x8e($v0) -/* A091C8 802422C8 2463FFFF */ addiu $v1, $v1, -1 -/* A091CC 802422CC A443008E */ sh $v1, 0x8e($v0) -/* A091D0 802422D0 00031C00 */ sll $v1, $v1, 0x10 -/* A091D4 802422D4 58600001 */ blezl $v1, .L802422DC -/* A091D8 802422D8 AE000070 */ sw $zero, 0x70($s0) -.L802422DC: -/* A091DC 802422DC 8FBF0014 */ lw $ra, 0x14($sp) -/* A091E0 802422E0 8FB00010 */ lw $s0, 0x10($sp) -/* A091E4 802422E4 03E00008 */ jr $ra -/* A091E8 802422E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s new file mode 100644 index 0000000000..3167c48405 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422A8_A091A8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422A8_A091A8 +/* A091A8 802422A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* A091AC 802422AC AFB00010 */ sw $s0, 0x10($sp) +/* A091B0 802422B0 0080802D */ daddu $s0, $a0, $zero +/* A091B4 802422B4 AFBF0014 */ sw $ra, 0x14($sp) +/* A091B8 802422B8 8E020148 */ lw $v0, 0x148($s0) +/* A091BC 802422BC 0C00EABB */ jal get_npc_unsafe +/* A091C0 802422C0 84440008 */ lh $a0, 8($v0) +/* A091C4 802422C4 9443008E */ lhu $v1, 0x8e($v0) +/* A091C8 802422C8 2463FFFF */ addiu $v1, $v1, -1 +/* A091CC 802422CC A443008E */ sh $v1, 0x8e($v0) +/* A091D0 802422D0 00031C00 */ sll $v1, $v1, 0x10 +/* A091D4 802422D4 58600001 */ blezl $v1, .L802422DC +/* A091D8 802422D8 AE000070 */ sw $zero, 0x70($s0) +.L802422DC: +/* A091DC 802422DC 8FBF0014 */ lw $ra, 0x14($sp) +/* A091E0 802422E0 8FB00010 */ lw $s0, 0x10($sp) +/* A091E4 802422E4 03E00008 */ jr $ra +/* A091E8 802422E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC.s deleted file mode 100644 index 6bf0130229..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC.s +++ /dev/null @@ -1,157 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422EC -/* A091EC 802422EC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* A091F0 802422F0 AFB3003C */ sw $s3, 0x3c($sp) -/* A091F4 802422F4 0080982D */ daddu $s3, $a0, $zero -/* A091F8 802422F8 AFBF0048 */ sw $ra, 0x48($sp) -/* A091FC 802422FC AFB50044 */ sw $s5, 0x44($sp) -/* A09200 80242300 AFB40040 */ sw $s4, 0x40($sp) -/* A09204 80242304 AFB20038 */ sw $s2, 0x38($sp) -/* A09208 80242308 AFB10034 */ sw $s1, 0x34($sp) -/* A0920C 8024230C AFB00030 */ sw $s0, 0x30($sp) -/* A09210 80242310 8E720148 */ lw $s2, 0x148($s3) -/* A09214 80242314 86440008 */ lh $a0, 8($s2) -/* A09218 80242318 8E70000C */ lw $s0, 0xc($s3) -/* A0921C 8024231C 0C00EABB */ jal get_npc_unsafe -/* A09220 80242320 00A0882D */ daddu $s1, $a1, $zero -/* A09224 80242324 0260202D */ daddu $a0, $s3, $zero -/* A09228 80242328 8E050000 */ lw $a1, ($s0) -/* A0922C 8024232C 0C0B1EAF */ jal get_variable -/* A09230 80242330 0040A82D */ daddu $s5, $v0, $zero -/* A09234 80242334 AFA00010 */ sw $zero, 0x10($sp) -/* A09238 80242338 8E4300D0 */ lw $v1, 0xd0($s2) -/* A0923C 8024233C 8C630030 */ lw $v1, 0x30($v1) -/* A09240 80242340 AFA30014 */ sw $v1, 0x14($sp) -/* A09244 80242344 8E4300D0 */ lw $v1, 0xd0($s2) -/* A09248 80242348 8C63001C */ lw $v1, 0x1c($v1) -/* A0924C 8024234C AFA30018 */ sw $v1, 0x18($sp) -/* A09250 80242350 8E4300D0 */ lw $v1, 0xd0($s2) -/* A09254 80242354 8C630024 */ lw $v1, 0x24($v1) -/* A09258 80242358 AFA3001C */ sw $v1, 0x1c($sp) -/* A0925C 8024235C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A09260 80242360 8C630028 */ lw $v1, 0x28($v1) -/* A09264 80242364 27B40010 */ addiu $s4, $sp, 0x10 -/* A09268 80242368 AFA30020 */ sw $v1, 0x20($sp) -/* A0926C 8024236C 8E4300D0 */ lw $v1, 0xd0($s2) -/* A09270 80242370 3C0142F0 */ lui $at, 0x42f0 -/* A09274 80242374 44810000 */ mtc1 $at, $f0 -/* A09278 80242378 8C63002C */ lw $v1, 0x2c($v1) -/* A0927C 8024237C 0040802D */ daddu $s0, $v0, $zero -/* A09280 80242380 E7A00028 */ swc1 $f0, 0x28($sp) -/* A09284 80242384 A7A0002C */ sh $zero, 0x2c($sp) -/* A09288 80242388 12200009 */ beqz $s1, .L802423B0 -/* A0928C 8024238C AFA30024 */ sw $v1, 0x24($sp) -/* A09290 80242390 02A0202D */ daddu $a0, $s5, $zero -/* A09294 80242394 0240282D */ daddu $a1, $s2, $zero -/* A09298 80242398 0260302D */ daddu $a2, $s3, $zero -/* A0929C 8024239C 0C090727 */ jal func_80241C9C -/* A092A0 802423A0 0200382D */ daddu $a3, $s0, $zero -/* A092A4 802423A4 86A200A8 */ lh $v0, 0xa8($s5) -/* A092A8 802423A8 AE42008C */ sw $v0, 0x8c($s2) -/* A092AC 802423AC AE600070 */ sw $zero, 0x70($s3) -.L802423B0: -/* A092B0 802423B0 2402FFFD */ addiu $v0, $zero, -3 -/* A092B4 802423B4 A2A200AB */ sb $v0, 0xab($s5) -/* A092B8 802423B8 8E4300B0 */ lw $v1, 0xb0($s2) -/* A092BC 802423BC 30620004 */ andi $v0, $v1, 4 -/* A092C0 802423C0 10400007 */ beqz $v0, .L802423E0 -/* A092C4 802423C4 00000000 */ nop -/* A092C8 802423C8 824200B4 */ lb $v0, 0xb4($s2) -/* A092CC 802423CC 14400052 */ bnez $v0, .L80242518 -/* A092D0 802423D0 0000102D */ daddu $v0, $zero, $zero -/* A092D4 802423D4 2402FFFB */ addiu $v0, $zero, -5 -/* A092D8 802423D8 00621024 */ and $v0, $v1, $v0 -/* A092DC 802423DC AE4200B0 */ sw $v0, 0xb0($s2) -.L802423E0: -/* A092E0 802423E0 8E630070 */ lw $v1, 0x70($s3) -/* A092E4 802423E4 2C620010 */ sltiu $v0, $v1, 0x10 -/* A092E8 802423E8 1040004A */ beqz $v0, .L80242514 -/* A092EC 802423EC 00031080 */ sll $v0, $v1, 2 -/* A092F0 802423F0 3C018024 */ lui $at, 0x8024 -/* A092F4 802423F4 00220821 */ addu $at, $at, $v0 -/* A092F8 802423F8 8C224DA8 */ lw $v0, 0x4da8($at) -/* A092FC 802423FC 00400008 */ jr $v0 -/* A09300 80242400 00000000 */ nop -/* A09304 80242404 0260202D */ daddu $a0, $s3, $zero -/* A09308 80242408 0200282D */ daddu $a1, $s0, $zero -/* A0930C 8024240C 0C0902AD */ jal func_80240AB4 -/* A09310 80242410 0280302D */ daddu $a2, $s4, $zero -/* A09314 80242414 0260202D */ daddu $a0, $s3, $zero -/* A09318 80242418 0200282D */ daddu $a1, $s0, $zero -/* A0931C 8024241C 0C090319 */ jal func_80240C64 -/* A09320 80242420 0280302D */ daddu $a2, $s4, $zero -/* A09324 80242424 8E630070 */ lw $v1, 0x70($s3) -/* A09328 80242428 24020002 */ addiu $v0, $zero, 2 -/* A0932C 8024242C 1462003A */ bne $v1, $v0, .L80242518 -/* A09330 80242430 0000102D */ daddu $v0, $zero, $zero -/* A09334 80242434 0260202D */ daddu $a0, $s3, $zero -/* A09338 80242438 0200282D */ daddu $a1, $s0, $zero -/* A0933C 8024243C 0C0904A3 */ jal func_8024128C -/* A09340 80242440 0280302D */ daddu $a2, $s4, $zero -/* A09344 80242444 0260202D */ daddu $a0, $s3, $zero -/* A09348 80242448 0200282D */ daddu $a1, $s0, $zero -/* A0934C 8024244C 0C0904D3 */ jal func_8024134C -/* A09350 80242450 0280302D */ daddu $a2, $s4, $zero -/* A09354 80242454 8E630070 */ lw $v1, 0x70($s3) -/* A09358 80242458 2402000A */ addiu $v0, $zero, 0xa -/* A0935C 8024245C 1462002E */ bne $v1, $v0, .L80242518 -/* A09360 80242460 0000102D */ daddu $v0, $zero, $zero -/* A09364 80242464 0260202D */ daddu $a0, $s3, $zero -/* A09368 80242468 0200282D */ daddu $a1, $s0, $zero -/* A0936C 8024246C 0C0905A4 */ jal func_80241690 -/* A09370 80242470 0280302D */ daddu $a2, $s4, $zero -/* A09374 80242474 8E630070 */ lw $v1, 0x70($s3) -/* A09378 80242478 2402000B */ addiu $v0, $zero, 0xb -/* A0937C 8024247C 14620026 */ bne $v1, $v0, .L80242518 -/* A09380 80242480 0000102D */ daddu $v0, $zero, $zero -/* A09384 80242484 0260202D */ daddu $a0, $s3, $zero -/* A09388 80242488 0200282D */ daddu $a1, $s0, $zero -/* A0938C 8024248C 0C0905C2 */ jal func_80241708 -/* A09390 80242490 0280302D */ daddu $a2, $s4, $zero -/* A09394 80242494 8E630070 */ lw $v1, 0x70($s3) -/* A09398 80242498 2402000C */ addiu $v0, $zero, 0xc -/* A0939C 8024249C 1462001E */ bne $v1, $v0, .L80242518 -/* A093A0 802424A0 0000102D */ daddu $v0, $zero, $zero -/* A093A4 802424A4 0260202D */ daddu $a0, $s3, $zero -/* A093A8 802424A8 0200282D */ daddu $a1, $s0, $zero -/* A093AC 802424AC 0C0907EB */ jal func_80241FAC -/* A093B0 802424B0 0280302D */ daddu $a2, $s4, $zero -/* A093B4 802424B4 8E630070 */ lw $v1, 0x70($s3) -/* A093B8 802424B8 2402000D */ addiu $v0, $zero, 0xd -/* A093BC 802424BC 14620016 */ bne $v1, $v0, .L80242518 -/* A093C0 802424C0 0000102D */ daddu $v0, $zero, $zero -/* A093C4 802424C4 0260202D */ daddu $a0, $s3, $zero -/* A093C8 802424C8 0200282D */ daddu $a1, $s0, $zero -/* A093CC 802424CC 0C090835 */ jal func_802420D4 -/* A093D0 802424D0 0280302D */ daddu $a2, $s4, $zero -/* A093D4 802424D4 8E630070 */ lw $v1, 0x70($s3) -/* A093D8 802424D8 2402000E */ addiu $v0, $zero, 0xe -/* A093DC 802424DC 1462000E */ bne $v1, $v0, .L80242518 -/* A093E0 802424E0 0000102D */ daddu $v0, $zero, $zero -/* A093E4 802424E4 0260202D */ daddu $a0, $s3, $zero -/* A093E8 802424E8 0200282D */ daddu $a1, $s0, $zero -/* A093EC 802424EC 0C090864 */ jal func_80242190 -/* A093F0 802424F0 0280302D */ daddu $a2, $s4, $zero -/* A093F4 802424F4 8E630070 */ lw $v1, 0x70($s3) -/* A093F8 802424F8 2402000F */ addiu $v0, $zero, 0xf -/* A093FC 802424FC 14620006 */ bne $v1, $v0, .L80242518 -/* A09400 80242500 0000102D */ daddu $v0, $zero, $zero -/* A09404 80242504 0260202D */ daddu $a0, $s3, $zero -/* A09408 80242508 0200282D */ daddu $a1, $s0, $zero -/* A0940C 8024250C 0C0908AA */ jal func_802422A8 -/* A09410 80242510 0280302D */ daddu $a2, $s4, $zero -.L80242514: -/* A09414 80242514 0000102D */ daddu $v0, $zero, $zero -.L80242518: -/* A09418 80242518 8FBF0048 */ lw $ra, 0x48($sp) -/* A0941C 8024251C 8FB50044 */ lw $s5, 0x44($sp) -/* A09420 80242520 8FB40040 */ lw $s4, 0x40($sp) -/* A09424 80242524 8FB3003C */ lw $s3, 0x3c($sp) -/* A09428 80242528 8FB20038 */ lw $s2, 0x38($sp) -/* A0942C 8024252C 8FB10034 */ lw $s1, 0x34($sp) -/* A09430 80242530 8FB00030 */ lw $s0, 0x30($sp) -/* A09434 80242534 03E00008 */ jr $ra -/* A09438 80242538 27BD0050 */ addiu $sp, $sp, 0x50 -/* A0943C 8024253C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s new file mode 100644 index 0000000000..9c6f0d252b --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A06F00/func_802422EC_A091EC.s @@ -0,0 +1,157 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422EC_A091EC +/* A091EC 802422EC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* A091F0 802422F0 AFB3003C */ sw $s3, 0x3c($sp) +/* A091F4 802422F4 0080982D */ daddu $s3, $a0, $zero +/* A091F8 802422F8 AFBF0048 */ sw $ra, 0x48($sp) +/* A091FC 802422FC AFB50044 */ sw $s5, 0x44($sp) +/* A09200 80242300 AFB40040 */ sw $s4, 0x40($sp) +/* A09204 80242304 AFB20038 */ sw $s2, 0x38($sp) +/* A09208 80242308 AFB10034 */ sw $s1, 0x34($sp) +/* A0920C 8024230C AFB00030 */ sw $s0, 0x30($sp) +/* A09210 80242310 8E720148 */ lw $s2, 0x148($s3) +/* A09214 80242314 86440008 */ lh $a0, 8($s2) +/* A09218 80242318 8E70000C */ lw $s0, 0xc($s3) +/* A0921C 8024231C 0C00EABB */ jal get_npc_unsafe +/* A09220 80242320 00A0882D */ daddu $s1, $a1, $zero +/* A09224 80242324 0260202D */ daddu $a0, $s3, $zero +/* A09228 80242328 8E050000 */ lw $a1, ($s0) +/* A0922C 8024232C 0C0B1EAF */ jal get_variable +/* A09230 80242330 0040A82D */ daddu $s5, $v0, $zero +/* A09234 80242334 AFA00010 */ sw $zero, 0x10($sp) +/* A09238 80242338 8E4300D0 */ lw $v1, 0xd0($s2) +/* A0923C 8024233C 8C630030 */ lw $v1, 0x30($v1) +/* A09240 80242340 AFA30014 */ sw $v1, 0x14($sp) +/* A09244 80242344 8E4300D0 */ lw $v1, 0xd0($s2) +/* A09248 80242348 8C63001C */ lw $v1, 0x1c($v1) +/* A0924C 8024234C AFA30018 */ sw $v1, 0x18($sp) +/* A09250 80242350 8E4300D0 */ lw $v1, 0xd0($s2) +/* A09254 80242354 8C630024 */ lw $v1, 0x24($v1) +/* A09258 80242358 AFA3001C */ sw $v1, 0x1c($sp) +/* A0925C 8024235C 8E4300D0 */ lw $v1, 0xd0($s2) +/* A09260 80242360 8C630028 */ lw $v1, 0x28($v1) +/* A09264 80242364 27B40010 */ addiu $s4, $sp, 0x10 +/* A09268 80242368 AFA30020 */ sw $v1, 0x20($sp) +/* A0926C 8024236C 8E4300D0 */ lw $v1, 0xd0($s2) +/* A09270 80242370 3C0142F0 */ lui $at, 0x42f0 +/* A09274 80242374 44810000 */ mtc1 $at, $f0 +/* A09278 80242378 8C63002C */ lw $v1, 0x2c($v1) +/* A0927C 8024237C 0040802D */ daddu $s0, $v0, $zero +/* A09280 80242380 E7A00028 */ swc1 $f0, 0x28($sp) +/* A09284 80242384 A7A0002C */ sh $zero, 0x2c($sp) +/* A09288 80242388 12200009 */ beqz $s1, .L802423B0 +/* A0928C 8024238C AFA30024 */ sw $v1, 0x24($sp) +/* A09290 80242390 02A0202D */ daddu $a0, $s5, $zero +/* A09294 80242394 0240282D */ daddu $a1, $s2, $zero +/* A09298 80242398 0260302D */ daddu $a2, $s3, $zero +/* A0929C 8024239C 0C090727 */ jal func_80241C9C_A08B9C +/* A092A0 802423A0 0200382D */ daddu $a3, $s0, $zero +/* A092A4 802423A4 86A200A8 */ lh $v0, 0xa8($s5) +/* A092A8 802423A8 AE42008C */ sw $v0, 0x8c($s2) +/* A092AC 802423AC AE600070 */ sw $zero, 0x70($s3) +.L802423B0: +/* A092B0 802423B0 2402FFFD */ addiu $v0, $zero, -3 +/* A092B4 802423B4 A2A200AB */ sb $v0, 0xab($s5) +/* A092B8 802423B8 8E4300B0 */ lw $v1, 0xb0($s2) +/* A092BC 802423BC 30620004 */ andi $v0, $v1, 4 +/* A092C0 802423C0 10400007 */ beqz $v0, .L802423E0 +/* A092C4 802423C4 00000000 */ nop +/* A092C8 802423C8 824200B4 */ lb $v0, 0xb4($s2) +/* A092CC 802423CC 14400052 */ bnez $v0, .L80242518 +/* A092D0 802423D0 0000102D */ daddu $v0, $zero, $zero +/* A092D4 802423D4 2402FFFB */ addiu $v0, $zero, -5 +/* A092D8 802423D8 00621024 */ and $v0, $v1, $v0 +/* A092DC 802423DC AE4200B0 */ sw $v0, 0xb0($s2) +.L802423E0: +/* A092E0 802423E0 8E630070 */ lw $v1, 0x70($s3) +/* A092E4 802423E4 2C620010 */ sltiu $v0, $v1, 0x10 +/* A092E8 802423E8 1040004A */ beqz $v0, .L80242514 +/* A092EC 802423EC 00031080 */ sll $v0, $v1, 2 +/* A092F0 802423F0 3C018024 */ lui $at, 0x8024 +/* A092F4 802423F4 00220821 */ addu $at, $at, $v0 +/* A092F8 802423F8 8C224DA8 */ lw $v0, 0x4da8($at) +/* A092FC 802423FC 00400008 */ jr $v0 +/* A09300 80242400 00000000 */ nop +/* A09304 80242404 0260202D */ daddu $a0, $s3, $zero +/* A09308 80242408 0200282D */ daddu $a1, $s0, $zero +/* A0930C 8024240C 0C0902AD */ jal func_80240AB4_A079B4 +/* A09310 80242410 0280302D */ daddu $a2, $s4, $zero +/* A09314 80242414 0260202D */ daddu $a0, $s3, $zero +/* A09318 80242418 0200282D */ daddu $a1, $s0, $zero +/* A0931C 8024241C 0C090319 */ jal func_80240C64_A07B64 +/* A09320 80242420 0280302D */ daddu $a2, $s4, $zero +/* A09324 80242424 8E630070 */ lw $v1, 0x70($s3) +/* A09328 80242428 24020002 */ addiu $v0, $zero, 2 +/* A0932C 8024242C 1462003A */ bne $v1, $v0, .L80242518 +/* A09330 80242430 0000102D */ daddu $v0, $zero, $zero +/* A09334 80242434 0260202D */ daddu $a0, $s3, $zero +/* A09338 80242438 0200282D */ daddu $a1, $s0, $zero +/* A0933C 8024243C 0C0904A3 */ jal func_8024128C_A0818C +/* A09340 80242440 0280302D */ daddu $a2, $s4, $zero +/* A09344 80242444 0260202D */ daddu $a0, $s3, $zero +/* A09348 80242448 0200282D */ daddu $a1, $s0, $zero +/* A0934C 8024244C 0C0904D3 */ jal func_8024134C_A0824C +/* A09350 80242450 0280302D */ daddu $a2, $s4, $zero +/* A09354 80242454 8E630070 */ lw $v1, 0x70($s3) +/* A09358 80242458 2402000A */ addiu $v0, $zero, 0xa +/* A0935C 8024245C 1462002E */ bne $v1, $v0, .L80242518 +/* A09360 80242460 0000102D */ daddu $v0, $zero, $zero +/* A09364 80242464 0260202D */ daddu $a0, $s3, $zero +/* A09368 80242468 0200282D */ daddu $a1, $s0, $zero +/* A0936C 8024246C 0C0905A4 */ jal func_80241690_A08590 +/* A09370 80242470 0280302D */ daddu $a2, $s4, $zero +/* A09374 80242474 8E630070 */ lw $v1, 0x70($s3) +/* A09378 80242478 2402000B */ addiu $v0, $zero, 0xb +/* A0937C 8024247C 14620026 */ bne $v1, $v0, .L80242518 +/* A09380 80242480 0000102D */ daddu $v0, $zero, $zero +/* A09384 80242484 0260202D */ daddu $a0, $s3, $zero +/* A09388 80242488 0200282D */ daddu $a1, $s0, $zero +/* A0938C 8024248C 0C0905C2 */ jal func_80241708_A08608 +/* A09390 80242490 0280302D */ daddu $a2, $s4, $zero +/* A09394 80242494 8E630070 */ lw $v1, 0x70($s3) +/* A09398 80242498 2402000C */ addiu $v0, $zero, 0xc +/* A0939C 8024249C 1462001E */ bne $v1, $v0, .L80242518 +/* A093A0 802424A0 0000102D */ daddu $v0, $zero, $zero +/* A093A4 802424A4 0260202D */ daddu $a0, $s3, $zero +/* A093A8 802424A8 0200282D */ daddu $a1, $s0, $zero +/* A093AC 802424AC 0C0907EB */ jal func_80241FAC_A08EAC +/* A093B0 802424B0 0280302D */ daddu $a2, $s4, $zero +/* A093B4 802424B4 8E630070 */ lw $v1, 0x70($s3) +/* A093B8 802424B8 2402000D */ addiu $v0, $zero, 0xd +/* A093BC 802424BC 14620016 */ bne $v1, $v0, .L80242518 +/* A093C0 802424C0 0000102D */ daddu $v0, $zero, $zero +/* A093C4 802424C4 0260202D */ daddu $a0, $s3, $zero +/* A093C8 802424C8 0200282D */ daddu $a1, $s0, $zero +/* A093CC 802424CC 0C090835 */ jal func_802420D4_A08FD4 +/* A093D0 802424D0 0280302D */ daddu $a2, $s4, $zero +/* A093D4 802424D4 8E630070 */ lw $v1, 0x70($s3) +/* A093D8 802424D8 2402000E */ addiu $v0, $zero, 0xe +/* A093DC 802424DC 1462000E */ bne $v1, $v0, .L80242518 +/* A093E0 802424E0 0000102D */ daddu $v0, $zero, $zero +/* A093E4 802424E4 0260202D */ daddu $a0, $s3, $zero +/* A093E8 802424E8 0200282D */ daddu $a1, $s0, $zero +/* A093EC 802424EC 0C090864 */ jal func_80242190_A09090 +/* A093F0 802424F0 0280302D */ daddu $a2, $s4, $zero +/* A093F4 802424F4 8E630070 */ lw $v1, 0x70($s3) +/* A093F8 802424F8 2402000F */ addiu $v0, $zero, 0xf +/* A093FC 802424FC 14620006 */ bne $v1, $v0, .L80242518 +/* A09400 80242500 0000102D */ daddu $v0, $zero, $zero +/* A09404 80242504 0260202D */ daddu $a0, $s3, $zero +/* A09408 80242508 0200282D */ daddu $a1, $s0, $zero +/* A0940C 8024250C 0C0908AA */ jal func_802422A8_A091A8 +/* A09410 80242510 0280302D */ daddu $a2, $s4, $zero +.L80242514: +/* A09414 80242514 0000102D */ daddu $v0, $zero, $zero +.L80242518: +/* A09418 80242518 8FBF0048 */ lw $ra, 0x48($sp) +/* A0941C 8024251C 8FB50044 */ lw $s5, 0x44($sp) +/* A09420 80242520 8FB40040 */ lw $s4, 0x40($sp) +/* A09424 80242524 8FB3003C */ lw $s3, 0x3c($sp) +/* A09428 80242528 8FB20038 */ lw $s2, 0x38($sp) +/* A0942C 8024252C 8FB10034 */ lw $s1, 0x34($sp) +/* A09430 80242530 8FB00030 */ lw $s0, 0x30($sp) +/* A09434 80242534 03E00008 */ jr $ra +/* A09438 80242538 27BD0050 */ addiu $sp, $sp, 0x50 +/* A0943C 8024253C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_15/A09440/func_80242540.s b/asm/nonmatchings/world/area_nok/nok_15/A09440/func_80242540.s deleted file mode 100644 index c03586e61c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A09440/func_80242540.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242540 -/* A09440 80242540 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* A09444 80242544 F7B40018 */ sdc1 $f20, 0x18($sp) -/* A09448 80242548 4485A000 */ mtc1 $a1, $f20 -/* A0944C 8024254C F7B60020 */ sdc1 $f22, 0x20($sp) -/* A09450 80242550 4486B000 */ mtc1 $a2, $f22 -/* A09454 80242554 AFB00010 */ sw $s0, 0x10($sp) -/* A09458 80242558 F7B80028 */ sdc1 $f24, 0x28($sp) -/* A0945C 8024255C 4487C000 */ mtc1 $a3, $f24 -/* A09460 80242560 AFBF0014 */ sw $ra, 0x14($sp) -/* A09464 80242564 0C019D28 */ jal guMtxIdentF -/* A09468 80242568 0080802D */ daddu $s0, $a0, $zero -/* A0946C 8024256C 4616A582 */ mul.s $f22, $f20, $f22 -/* A09470 80242570 00000000 */ nop -/* A09474 80242574 4618A502 */ mul.s $f20, $f20, $f24 -/* A09478 80242578 00000000 */ nop -/* A0947C 8024257C 3C013F80 */ lui $at, 0x3f80 -/* A09480 80242580 44810000 */ mtc1 $at, $f0 -/* A09484 80242584 00000000 */ nop -/* A09488 80242588 E6000014 */ swc1 $f0, 0x14($s0) -/* A0948C 8024258C E6160010 */ swc1 $f22, 0x10($s0) -/* A09490 80242590 E6140018 */ swc1 $f20, 0x18($s0) -/* A09494 80242594 8FBF0014 */ lw $ra, 0x14($sp) -/* A09498 80242598 8FB00010 */ lw $s0, 0x10($sp) -/* A0949C 8024259C D7B80028 */ ldc1 $f24, 0x28($sp) -/* A094A0 802425A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* A094A4 802425A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* A094A8 802425A8 03E00008 */ jr $ra -/* A094AC 802425AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A09440/func_80242540_A09440.s b/asm/nonmatchings/world/area_nok/nok_15/A09440/func_80242540_A09440.s new file mode 100644 index 0000000000..dd3bb61423 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A09440/func_80242540_A09440.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242540_A09440 +/* A09440 80242540 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* A09444 80242544 F7B40018 */ sdc1 $f20, 0x18($sp) +/* A09448 80242548 4485A000 */ mtc1 $a1, $f20 +/* A0944C 8024254C F7B60020 */ sdc1 $f22, 0x20($sp) +/* A09450 80242550 4486B000 */ mtc1 $a2, $f22 +/* A09454 80242554 AFB00010 */ sw $s0, 0x10($sp) +/* A09458 80242558 F7B80028 */ sdc1 $f24, 0x28($sp) +/* A0945C 8024255C 4487C000 */ mtc1 $a3, $f24 +/* A09460 80242560 AFBF0014 */ sw $ra, 0x14($sp) +/* A09464 80242564 0C019D28 */ jal guMtxIdentF +/* A09468 80242568 0080802D */ daddu $s0, $a0, $zero +/* A0946C 8024256C 4616A582 */ mul.s $f22, $f20, $f22 +/* A09470 80242570 00000000 */ nop +/* A09474 80242574 4618A502 */ mul.s $f20, $f20, $f24 +/* A09478 80242578 00000000 */ nop +/* A0947C 8024257C 3C013F80 */ lui $at, 0x3f80 +/* A09480 80242580 44810000 */ mtc1 $at, $f0 +/* A09484 80242584 00000000 */ nop +/* A09488 80242588 E6000014 */ swc1 $f0, 0x14($s0) +/* A0948C 8024258C E6160010 */ swc1 $f22, 0x10($s0) +/* A09490 80242590 E6140018 */ swc1 $f20, 0x18($s0) +/* A09494 80242594 8FBF0014 */ lw $ra, 0x14($sp) +/* A09498 80242598 8FB00010 */ lw $s0, 0x10($sp) +/* A0949C 8024259C D7B80028 */ ldc1 $f24, 0x28($sp) +/* A094A0 802425A0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* A094A4 802425A4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* A094A8 802425A8 03E00008 */ jr $ra +/* A094AC 802425AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_nok/nok_15/A09440/func_802425B0.s b/asm/nonmatchings/world/area_nok/nok_15/A09440/func_802425B0.s deleted file mode 100644 index 0425fbddc5..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_15/A09440/func_802425B0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425B0 -/* A094B0 802425B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* A094B4 802425B4 AFB10054 */ sw $s1, 0x54($sp) -/* A094B8 802425B8 0080882D */ daddu $s1, $a0, $zero -/* A094BC 802425BC AFBF005C */ sw $ra, 0x5c($sp) -/* A094C0 802425C0 AFB20058 */ sw $s2, 0x58($sp) -/* A094C4 802425C4 AFB00050 */ sw $s0, 0x50($sp) -/* A094C8 802425C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* A094CC 802425CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* A094D0 802425D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* A094D4 802425D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* A094D8 802425D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* A094DC 802425DC 8E30000C */ lw $s0, 0xc($s1) -/* A094E0 802425E0 8E050000 */ lw $a1, ($s0) -/* A094E4 802425E4 0C0B1EAF */ jal get_variable -/* A094E8 802425E8 26100004 */ addiu $s0, $s0, 4 -/* A094EC 802425EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* A094F0 802425F0 0040202D */ daddu $a0, $v0, $zero -/* A094F4 802425F4 8E050000 */ lw $a1, ($s0) -/* A094F8 802425F8 26100004 */ addiu $s0, $s0, 4 -/* A094FC 802425FC 0220202D */ daddu $a0, $s1, $zero -/* A09500 80242600 0C0B210B */ jal get_float_variable -/* A09504 80242604 0040902D */ daddu $s2, $v0, $zero -/* A09508 80242608 8E050000 */ lw $a1, ($s0) -/* A0950C 8024260C 26100004 */ addiu $s0, $s0, 4 -/* A09510 80242610 0220202D */ daddu $a0, $s1, $zero -/* A09514 80242614 0C0B210B */ jal get_float_variable -/* A09518 80242618 46000706 */ mov.s $f28, $f0 -/* A0951C 8024261C 8E050000 */ lw $a1, ($s0) -/* A09520 80242620 26100004 */ addiu $s0, $s0, 4 -/* A09524 80242624 0220202D */ daddu $a0, $s1, $zero -/* A09528 80242628 0C0B210B */ jal get_float_variable -/* A0952C 8024262C 46000686 */ mov.s $f26, $f0 -/* A09530 80242630 0220202D */ daddu $a0, $s1, $zero -/* A09534 80242634 8E050000 */ lw $a1, ($s0) -/* A09538 80242638 0C0B210B */ jal get_float_variable -/* A0953C 8024263C 46000586 */ mov.s $f22, $f0 -/* A09540 80242640 0240202D */ daddu $a0, $s2, $zero -/* A09544 80242644 0C046B4C */ jal get_model_from_list_index -/* A09548 80242648 46000606 */ mov.s $f24, $f0 -/* A0954C 8024264C 0040882D */ daddu $s1, $v0, $zero -/* A09550 80242650 96220000 */ lhu $v0, ($s1) -/* A09554 80242654 30420400 */ andi $v0, $v0, 0x400 -/* A09558 80242658 1440001E */ bnez $v0, .L802426D4 -/* A0955C 8024265C 26300058 */ addiu $s0, $s1, 0x58 -/* A09560 80242660 4480A000 */ mtc1 $zero, $f20 -/* A09564 80242664 4406B000 */ mfc1 $a2, $f22 -/* A09568 80242668 4405A000 */ mfc1 $a1, $f20 -/* A0956C 8024266C 4407A000 */ mfc1 $a3, $f20 -/* A09570 80242670 0C019E40 */ jal guTranslateF -/* A09574 80242674 0200202D */ daddu $a0, $s0, $zero -/* A09578 80242678 4405E000 */ mfc1 $a1, $f28 -/* A0957C 8024267C 4406D000 */ mfc1 $a2, $f26 -/* A09580 80242680 4407C000 */ mfc1 $a3, $f24 -/* A09584 80242684 0C090950 */ jal func_80242540 -/* A09588 80242688 27A40010 */ addiu $a0, $sp, 0x10 -/* A0958C 8024268C 27A40010 */ addiu $a0, $sp, 0x10 -/* A09590 80242690 0200282D */ daddu $a1, $s0, $zero -/* A09594 80242694 0C019D80 */ jal guMtxCatF -/* A09598 80242698 0200302D */ daddu $a2, $s0, $zero -/* A0959C 8024269C 27A40010 */ addiu $a0, $sp, 0x10 -/* A095A0 802426A0 4600B587 */ neg.s $f22, $f22 -/* A095A4 802426A4 4405A000 */ mfc1 $a1, $f20 -/* A095A8 802426A8 4406B000 */ mfc1 $a2, $f22 -/* A095AC 802426AC 0C019E40 */ jal guTranslateF -/* A095B0 802426B0 00A0382D */ daddu $a3, $a1, $zero -/* A095B4 802426B4 27A40010 */ addiu $a0, $sp, 0x10 -/* A095B8 802426B8 0200282D */ daddu $a1, $s0, $zero -/* A095BC 802426BC 0C019D80 */ jal guMtxCatF -/* A095C0 802426C0 00A0302D */ daddu $a2, $a1, $zero -/* A095C4 802426C4 96220000 */ lhu $v0, ($s1) -/* A095C8 802426C8 34421400 */ ori $v0, $v0, 0x1400 -/* A095CC 802426CC 080909D3 */ j .L8024274C -/* A095D0 802426D0 A6220000 */ sh $v0, ($s1) -.L802426D4: -/* A095D4 802426D4 4480A000 */ mtc1 $zero, $f20 -/* A095D8 802426D8 4406B000 */ mfc1 $a2, $f22 -/* A095DC 802426DC 4405A000 */ mfc1 $a1, $f20 -/* A095E0 802426E0 4407A000 */ mfc1 $a3, $f20 -/* A095E4 802426E4 0C019E40 */ jal guTranslateF -/* A095E8 802426E8 27A40010 */ addiu $a0, $sp, 0x10 -/* A095EC 802426EC 27A40010 */ addiu $a0, $sp, 0x10 -/* A095F0 802426F0 26300058 */ addiu $s0, $s1, 0x58 -/* A095F4 802426F4 0200282D */ daddu $a1, $s0, $zero -/* A095F8 802426F8 0C019D80 */ jal guMtxCatF -/* A095FC 802426FC 0200302D */ daddu $a2, $s0, $zero -/* A09600 80242700 4405E000 */ mfc1 $a1, $f28 -/* A09604 80242704 4406D000 */ mfc1 $a2, $f26 -/* A09608 80242708 4407C000 */ mfc1 $a3, $f24 -/* A0960C 8024270C 0C090950 */ jal func_80242540 -/* A09610 80242710 27A40010 */ addiu $a0, $sp, 0x10 -/* A09614 80242714 27A40010 */ addiu $a0, $sp, 0x10 -/* A09618 80242718 0200282D */ daddu $a1, $s0, $zero -/* A0961C 8024271C 0C019D80 */ jal guMtxCatF -/* A09620 80242720 0200302D */ daddu $a2, $s0, $zero -/* A09624 80242724 27A40010 */ addiu $a0, $sp, 0x10 -/* A09628 80242728 4600B587 */ neg.s $f22, $f22 -/* A0962C 8024272C 4405A000 */ mfc1 $a1, $f20 -/* A09630 80242730 4406B000 */ mfc1 $a2, $f22 -/* A09634 80242734 0C019E40 */ jal guTranslateF -/* A09638 80242738 00A0382D */ daddu $a3, $a1, $zero -/* A0963C 8024273C 27A40010 */ addiu $a0, $sp, 0x10 -/* A09640 80242740 0200282D */ daddu $a1, $s0, $zero -/* A09644 80242744 0C019D80 */ jal guMtxCatF -/* A09648 80242748 00A0302D */ daddu $a2, $a1, $zero -.L8024274C: -/* A0964C 8024274C 8FBF005C */ lw $ra, 0x5c($sp) -/* A09650 80242750 8FB20058 */ lw $s2, 0x58($sp) -/* A09654 80242754 8FB10054 */ lw $s1, 0x54($sp) -/* A09658 80242758 8FB00050 */ lw $s0, 0x50($sp) -/* A0965C 8024275C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* A09660 80242760 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* A09664 80242764 D7B80070 */ ldc1 $f24, 0x70($sp) -/* A09668 80242768 D7B60068 */ ldc1 $f22, 0x68($sp) -/* A0966C 8024276C D7B40060 */ ldc1 $f20, 0x60($sp) -/* A09670 80242770 24020002 */ addiu $v0, $zero, 2 -/* A09674 80242774 03E00008 */ jr $ra -/* A09678 80242778 27BD0088 */ addiu $sp, $sp, 0x88 -/* A0967C 8024277C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_15/A09440/func_802425B0_A094B0.s b/asm/nonmatchings/world/area_nok/nok_15/A09440/func_802425B0_A094B0.s new file mode 100644 index 0000000000..92bc3d9649 --- /dev/null +++ b/asm/nonmatchings/world/area_nok/nok_15/A09440/func_802425B0_A094B0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425B0_A094B0 +/* A094B0 802425B0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* A094B4 802425B4 AFB10054 */ sw $s1, 0x54($sp) +/* A094B8 802425B8 0080882D */ daddu $s1, $a0, $zero +/* A094BC 802425BC AFBF005C */ sw $ra, 0x5c($sp) +/* A094C0 802425C0 AFB20058 */ sw $s2, 0x58($sp) +/* A094C4 802425C4 AFB00050 */ sw $s0, 0x50($sp) +/* A094C8 802425C8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* A094CC 802425CC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* A094D0 802425D0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* A094D4 802425D4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* A094D8 802425D8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* A094DC 802425DC 8E30000C */ lw $s0, 0xc($s1) +/* A094E0 802425E0 8E050000 */ lw $a1, ($s0) +/* A094E4 802425E4 0C0B1EAF */ jal get_variable +/* A094E8 802425E8 26100004 */ addiu $s0, $s0, 4 +/* A094EC 802425EC 0C046C04 */ jal get_model_list_index_from_tree_index +/* A094F0 802425F0 0040202D */ daddu $a0, $v0, $zero +/* A094F4 802425F4 8E050000 */ lw $a1, ($s0) +/* A094F8 802425F8 26100004 */ addiu $s0, $s0, 4 +/* A094FC 802425FC 0220202D */ daddu $a0, $s1, $zero +/* A09500 80242600 0C0B210B */ jal get_float_variable +/* A09504 80242604 0040902D */ daddu $s2, $v0, $zero +/* A09508 80242608 8E050000 */ lw $a1, ($s0) +/* A0950C 8024260C 26100004 */ addiu $s0, $s0, 4 +/* A09510 80242610 0220202D */ daddu $a0, $s1, $zero +/* A09514 80242614 0C0B210B */ jal get_float_variable +/* A09518 80242618 46000706 */ mov.s $f28, $f0 +/* A0951C 8024261C 8E050000 */ lw $a1, ($s0) +/* A09520 80242620 26100004 */ addiu $s0, $s0, 4 +/* A09524 80242624 0220202D */ daddu $a0, $s1, $zero +/* A09528 80242628 0C0B210B */ jal get_float_variable +/* A0952C 8024262C 46000686 */ mov.s $f26, $f0 +/* A09530 80242630 0220202D */ daddu $a0, $s1, $zero +/* A09534 80242634 8E050000 */ lw $a1, ($s0) +/* A09538 80242638 0C0B210B */ jal get_float_variable +/* A0953C 8024263C 46000586 */ mov.s $f22, $f0 +/* A09540 80242640 0240202D */ daddu $a0, $s2, $zero +/* A09544 80242644 0C046B4C */ jal get_model_from_list_index +/* A09548 80242648 46000606 */ mov.s $f24, $f0 +/* A0954C 8024264C 0040882D */ daddu $s1, $v0, $zero +/* A09550 80242650 96220000 */ lhu $v0, ($s1) +/* A09554 80242654 30420400 */ andi $v0, $v0, 0x400 +/* A09558 80242658 1440001E */ bnez $v0, .L802426D4 +/* A0955C 8024265C 26300058 */ addiu $s0, $s1, 0x58 +/* A09560 80242660 4480A000 */ mtc1 $zero, $f20 +/* A09564 80242664 4406B000 */ mfc1 $a2, $f22 +/* A09568 80242668 4405A000 */ mfc1 $a1, $f20 +/* A0956C 8024266C 4407A000 */ mfc1 $a3, $f20 +/* A09570 80242670 0C019E40 */ jal guTranslateF +/* A09574 80242674 0200202D */ daddu $a0, $s0, $zero +/* A09578 80242678 4405E000 */ mfc1 $a1, $f28 +/* A0957C 8024267C 4406D000 */ mfc1 $a2, $f26 +/* A09580 80242680 4407C000 */ mfc1 $a3, $f24 +/* A09584 80242684 0C090950 */ jal func_80242540_A09440 +/* A09588 80242688 27A40010 */ addiu $a0, $sp, 0x10 +/* A0958C 8024268C 27A40010 */ addiu $a0, $sp, 0x10 +/* A09590 80242690 0200282D */ daddu $a1, $s0, $zero +/* A09594 80242694 0C019D80 */ jal guMtxCatF +/* A09598 80242698 0200302D */ daddu $a2, $s0, $zero +/* A0959C 8024269C 27A40010 */ addiu $a0, $sp, 0x10 +/* A095A0 802426A0 4600B587 */ neg.s $f22, $f22 +/* A095A4 802426A4 4405A000 */ mfc1 $a1, $f20 +/* A095A8 802426A8 4406B000 */ mfc1 $a2, $f22 +/* A095AC 802426AC 0C019E40 */ jal guTranslateF +/* A095B0 802426B0 00A0382D */ daddu $a3, $a1, $zero +/* A095B4 802426B4 27A40010 */ addiu $a0, $sp, 0x10 +/* A095B8 802426B8 0200282D */ daddu $a1, $s0, $zero +/* A095BC 802426BC 0C019D80 */ jal guMtxCatF +/* A095C0 802426C0 00A0302D */ daddu $a2, $a1, $zero +/* A095C4 802426C4 96220000 */ lhu $v0, ($s1) +/* A095C8 802426C8 34421400 */ ori $v0, $v0, 0x1400 +/* A095CC 802426CC 080909D3 */ j .L8024274C +/* A095D0 802426D0 A6220000 */ sh $v0, ($s1) +.L802426D4: +/* A095D4 802426D4 4480A000 */ mtc1 $zero, $f20 +/* A095D8 802426D8 4406B000 */ mfc1 $a2, $f22 +/* A095DC 802426DC 4405A000 */ mfc1 $a1, $f20 +/* A095E0 802426E0 4407A000 */ mfc1 $a3, $f20 +/* A095E4 802426E4 0C019E40 */ jal guTranslateF +/* A095E8 802426E8 27A40010 */ addiu $a0, $sp, 0x10 +/* A095EC 802426EC 27A40010 */ addiu $a0, $sp, 0x10 +/* A095F0 802426F0 26300058 */ addiu $s0, $s1, 0x58 +/* A095F4 802426F4 0200282D */ daddu $a1, $s0, $zero +/* A095F8 802426F8 0C019D80 */ jal guMtxCatF +/* A095FC 802426FC 0200302D */ daddu $a2, $s0, $zero +/* A09600 80242700 4405E000 */ mfc1 $a1, $f28 +/* A09604 80242704 4406D000 */ mfc1 $a2, $f26 +/* A09608 80242708 4407C000 */ mfc1 $a3, $f24 +/* A0960C 8024270C 0C090950 */ jal func_80242540_A09440 +/* A09610 80242710 27A40010 */ addiu $a0, $sp, 0x10 +/* A09614 80242714 27A40010 */ addiu $a0, $sp, 0x10 +/* A09618 80242718 0200282D */ daddu $a1, $s0, $zero +/* A0961C 8024271C 0C019D80 */ jal guMtxCatF +/* A09620 80242720 0200302D */ daddu $a2, $s0, $zero +/* A09624 80242724 27A40010 */ addiu $a0, $sp, 0x10 +/* A09628 80242728 4600B587 */ neg.s $f22, $f22 +/* A0962C 8024272C 4405A000 */ mfc1 $a1, $f20 +/* A09630 80242730 4406B000 */ mfc1 $a2, $f22 +/* A09634 80242734 0C019E40 */ jal guTranslateF +/* A09638 80242738 00A0382D */ daddu $a3, $a1, $zero +/* A0963C 8024273C 27A40010 */ addiu $a0, $sp, 0x10 +/* A09640 80242740 0200282D */ daddu $a1, $s0, $zero +/* A09644 80242744 0C019D80 */ jal guMtxCatF +/* A09648 80242748 00A0302D */ daddu $a2, $a1, $zero +.L8024274C: +/* A0964C 8024274C 8FBF005C */ lw $ra, 0x5c($sp) +/* A09650 80242750 8FB20058 */ lw $s2, 0x58($sp) +/* A09654 80242754 8FB10054 */ lw $s1, 0x54($sp) +/* A09658 80242758 8FB00050 */ lw $s0, 0x50($sp) +/* A0965C 8024275C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* A09660 80242760 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* A09664 80242764 D7B80070 */ ldc1 $f24, 0x70($sp) +/* A09668 80242768 D7B60068 */ ldc1 $f22, 0x68($sp) +/* A0966C 8024276C D7B40060 */ ldc1 $f20, 0x60($sp) +/* A09670 80242770 24020002 */ addiu $v0, $zero, 2 +/* A09674 80242774 03E00008 */ jr $ra +/* A09678 80242778 27BD0088 */ addiu $sp, $sp, 0x88 +/* A0967C 8024277C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24.s deleted file mode 100644 index 4ff6deb10c..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B24 -/* BBDCC4 80240B24 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BBDCC8 80240B28 AFBF0010 */ sw $ra, 0x10($sp) -/* BBDCCC 80240B2C 10A00003 */ beqz $a1, .L80240B3C -/* BBDCD0 80240B30 8C86000C */ lw $a2, 0xc($a0) -/* BBDCD4 80240B34 3C018024 */ lui $at, 0x8024 -/* BBDCD8 80240B38 AC204154 */ sw $zero, 0x4154($at) -.L80240B3C: -/* BBDCDC 80240B3C 3C038024 */ lui $v1, 0x8024 -/* BBDCE0 80240B40 24634154 */ addiu $v1, $v1, 0x4154 -/* BBDCE4 80240B44 8C620000 */ lw $v0, ($v1) -/* BBDCE8 80240B48 54400003 */ bnel $v0, $zero, .L80240B58 -/* BBDCEC 80240B4C AC600000 */ sw $zero, ($v1) -/* BBDCF0 80240B50 080902DB */ j .L80240B6C -/* BBDCF4 80240B54 0000102D */ daddu $v0, $zero, $zero -.L80240B58: -/* BBDCF8 80240B58 8CC50000 */ lw $a1, ($a2) -/* BBDCFC 80240B5C 3C068024 */ lui $a2, 0x8024 -/* BBDD00 80240B60 0C0B2026 */ jal set_variable -/* BBDD04 80240B64 8CC64158 */ lw $a2, 0x4158($a2) -/* BBDD08 80240B68 24020002 */ addiu $v0, $zero, 2 -.L80240B6C: -/* BBDD0C 80240B6C 8FBF0010 */ lw $ra, 0x10($sp) -/* BBDD10 80240B70 03E00008 */ jr $ra -/* BBDD14 80240B74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s new file mode 100644 index 0000000000..bc1cbb53a1 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_01/BBD980/func_80240B24_BBDCC4.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B24_BBDCC4 +/* BBDCC4 80240B24 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BBDCC8 80240B28 AFBF0010 */ sw $ra, 0x10($sp) +/* BBDCCC 80240B2C 10A00003 */ beqz $a1, .L80240B3C +/* BBDCD0 80240B30 8C86000C */ lw $a2, 0xc($a0) +/* BBDCD4 80240B34 3C018024 */ lui $at, 0x8024 +/* BBDCD8 80240B38 AC204154 */ sw $zero, 0x4154($at) +.L80240B3C: +/* BBDCDC 80240B3C 3C038024 */ lui $v1, 0x8024 +/* BBDCE0 80240B40 24634154 */ addiu $v1, $v1, 0x4154 +/* BBDCE4 80240B44 8C620000 */ lw $v0, ($v1) +/* BBDCE8 80240B48 54400003 */ bnel $v0, $zero, .L80240B58 +/* BBDCEC 80240B4C AC600000 */ sw $zero, ($v1) +/* BBDCF0 80240B50 080902DB */ j .L80240B6C +/* BBDCF4 80240B54 0000102D */ daddu $v0, $zero, $zero +.L80240B58: +/* BBDCF8 80240B58 8CC50000 */ lw $a1, ($a2) +/* BBDCFC 80240B5C 3C068024 */ lui $a2, 0x8024 +/* BBDD00 80240B60 0C0B2026 */ jal set_variable +/* BBDD04 80240B64 8CC64158 */ lw $a2, 0x4158($a2) +/* BBDD08 80240B68 24020002 */ addiu $v0, $zero, 2 +.L80240B6C: +/* BBDD0C 80240B6C 8FBF0010 */ lw $ra, 0x10($sp) +/* BBDD10 80240B70 03E00008 */ jr $ra +/* BBDD14 80240B74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C.s b/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C.s deleted file mode 100644 index 5205df24a0..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024000C -/* BC2A9C 8024000C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BC2AA0 80240010 AFB10014 */ sw $s1, 0x14($sp) -/* BC2AA4 80240014 0080882D */ daddu $s1, $a0, $zero -/* BC2AA8 80240018 AFBF0018 */ sw $ra, 0x18($sp) -/* BC2AAC 8024001C AFB00010 */ sw $s0, 0x10($sp) -/* BC2AB0 80240020 0C00EAD2 */ jal get_npc_safe -/* BC2AB4 80240024 8E24014C */ lw $a0, 0x14c($s1) -/* BC2AB8 80240028 0040802D */ daddu $s0, $v0, $zero -/* BC2ABC 8024002C 8E230074 */ lw $v1, 0x74($s1) -/* BC2AC0 80240030 24020001 */ addiu $v0, $zero, 1 -/* BC2AC4 80240034 10620036 */ beq $v1, $v0, .L80240110 -/* BC2AC8 80240038 28620002 */ slti $v0, $v1, 2 -/* BC2ACC 8024003C 10400005 */ beqz $v0, .L80240054 -/* BC2AD0 80240040 24020002 */ addiu $v0, $zero, 2 -/* BC2AD4 80240044 10600007 */ beqz $v1, .L80240064 -/* BC2AD8 80240048 00000000 */ nop -/* BC2ADC 8024004C 0809005F */ j .L8024017C -/* BC2AE0 80240050 00000000 */ nop -.L80240054: -/* BC2AE4 80240054 10620036 */ beq $v1, $v0, .L80240130 -/* BC2AE8 80240058 00000000 */ nop -/* BC2AEC 8024005C 0809005F */ j .L8024017C -/* BC2AF0 80240060 00000000 */ nop -.L80240064: -/* BC2AF4 80240064 0C00A67F */ jal rand_int -/* BC2AF8 80240068 240400B4 */ addiu $a0, $zero, 0xb4 -/* BC2AFC 8024006C 24040032 */ addiu $a0, $zero, 0x32 -/* BC2B00 80240070 3C01C396 */ lui $at, 0xc396 -/* BC2B04 80240074 44810000 */ mtc1 $at, $f0 -/* BC2B08 80240078 2442001E */ addiu $v0, $v0, 0x1e -/* BC2B0C 8024007C A602008E */ sh $v0, 0x8e($s0) -/* BC2B10 80240080 0C00A67F */ jal rand_int -/* BC2B14 80240084 E6000040 */ swc1 $f0, 0x40($s0) -/* BC2B18 80240088 3C0142A0 */ lui $at, 0x42a0 -/* BC2B1C 8024008C 44811000 */ mtc1 $at, $f2 -/* BC2B20 80240090 44820000 */ mtc1 $v0, $f0 -/* BC2B24 80240094 00000000 */ nop -/* BC2B28 80240098 46800020 */ cvt.s.w $f0, $f0 -/* BC2B2C 8024009C 46020000 */ add.s $f0, $f0, $f2 -/* BC2B30 802400A0 0C00A64D */ jal func_80029934 -/* BC2B34 802400A4 E600003C */ swc1 $f0, 0x3c($s0) -/* BC2B38 802400A8 46000000 */ add.s $f0, $f0, $f0 -/* BC2B3C 802400AC 3C014000 */ lui $at, 0x4000 -/* BC2B40 802400B0 44811000 */ mtc1 $at, $f2 -/* BC2B44 802400B4 00000000 */ nop -/* BC2B48 802400B8 46020000 */ add.s $f0, $f0, $f2 -/* BC2B4C 802400BC 24040064 */ addiu $a0, $zero, 0x64 -/* BC2B50 802400C0 0C00A67F */ jal rand_int -/* BC2B54 802400C4 E6000018 */ swc1 $f0, 0x18($s0) -/* BC2B58 802400C8 28420032 */ slti $v0, $v0, 0x32 -/* BC2B5C 802400CC 10400007 */ beqz $v0, .L802400EC -/* BC2B60 802400D0 00000000 */ nop -/* BC2B64 802400D4 3C014387 */ lui $at, 0x4387 -/* BC2B68 802400D8 44810000 */ mtc1 $at, $f0 -/* BC2B6C 802400DC 00000000 */ nop -/* BC2B70 802400E0 E6000038 */ swc1 $f0, 0x38($s0) -/* BC2B74 802400E4 08090041 */ j .L80240104 -/* BC2B78 802400E8 E600000C */ swc1 $f0, 0xc($s0) -.L802400EC: -/* BC2B7C 802400EC 3C01C387 */ lui $at, 0xc387 -/* BC2B80 802400F0 44810000 */ mtc1 $at, $f0 -/* BC2B84 802400F4 3C0142B4 */ lui $at, 0x42b4 -/* BC2B88 802400F8 44811000 */ mtc1 $at, $f2 -/* BC2B8C 802400FC E6000038 */ swc1 $f0, 0x38($s0) -/* BC2B90 80240100 E602000C */ swc1 $f2, 0xc($s0) -.L80240104: -/* BC2B94 80240104 24020001 */ addiu $v0, $zero, 1 -/* BC2B98 80240108 0809005F */ j .L8024017C -/* BC2B9C 8024010C AE220074 */ sw $v0, 0x74($s1) -.L80240110: -/* BC2BA0 80240110 9602008E */ lhu $v0, 0x8e($s0) -/* BC2BA4 80240114 2442FFFF */ addiu $v0, $v0, -1 -/* BC2BA8 80240118 A602008E */ sh $v0, 0x8e($s0) -/* BC2BAC 8024011C 00021400 */ sll $v0, $v0, 0x10 -/* BC2BB0 80240120 14400016 */ bnez $v0, .L8024017C -/* BC2BB4 80240124 24020002 */ addiu $v0, $zero, 2 -/* BC2BB8 80240128 0809005F */ j .L8024017C -/* BC2BBC 8024012C AE220074 */ sw $v0, 0x74($s1) -.L80240130: -/* BC2BC0 80240130 8E050018 */ lw $a1, 0x18($s0) -/* BC2BC4 80240134 8E06000C */ lw $a2, 0xc($s0) -/* BC2BC8 80240138 0C00EA95 */ jal npc_move_heading -/* BC2BCC 8024013C 0200202D */ daddu $a0, $s0, $zero -/* BC2BD0 80240140 C6020038 */ lwc1 $f2, 0x38($s0) -/* BC2BD4 80240144 3C01C38C */ lui $at, 0xc38c -/* BC2BD8 80240148 44810000 */ mtc1 $at, $f0 -/* BC2BDC 8024014C 00000000 */ nop -/* BC2BE0 80240150 4600103C */ c.lt.s $f2, $f0 -/* BC2BE4 80240154 00000000 */ nop -/* BC2BE8 80240158 45030008 */ bc1tl .L8024017C -/* BC2BEC 8024015C AE200074 */ sw $zero, 0x74($s1) -/* BC2BF0 80240160 3C01438C */ lui $at, 0x438c -/* BC2BF4 80240164 44810000 */ mtc1 $at, $f0 -/* BC2BF8 80240168 00000000 */ nop -/* BC2BFC 8024016C 4602003C */ c.lt.s $f0, $f2 -/* BC2C00 80240170 00000000 */ nop -/* BC2C04 80240174 45030001 */ bc1tl .L8024017C -/* BC2C08 80240178 AE200074 */ sw $zero, 0x74($s1) -.L8024017C: -/* BC2C0C 8024017C 8FBF0018 */ lw $ra, 0x18($sp) -/* BC2C10 80240180 8FB10014 */ lw $s1, 0x14($sp) -/* BC2C14 80240184 8FB00010 */ lw $s0, 0x10($sp) -/* BC2C18 80240188 24020002 */ addiu $v0, $zero, 2 -/* BC2C1C 8024018C 03E00008 */ jr $ra -/* BC2C20 80240190 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s b/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s new file mode 100644 index 0000000000..93d72098b3 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_02/BC2A90/func_8024000C_BC2A9C.s @@ -0,0 +1,109 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024000C_BC2A9C +/* BC2A9C 8024000C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BC2AA0 80240010 AFB10014 */ sw $s1, 0x14($sp) +/* BC2AA4 80240014 0080882D */ daddu $s1, $a0, $zero +/* BC2AA8 80240018 AFBF0018 */ sw $ra, 0x18($sp) +/* BC2AAC 8024001C AFB00010 */ sw $s0, 0x10($sp) +/* BC2AB0 80240020 0C00EAD2 */ jal get_npc_safe +/* BC2AB4 80240024 8E24014C */ lw $a0, 0x14c($s1) +/* BC2AB8 80240028 0040802D */ daddu $s0, $v0, $zero +/* BC2ABC 8024002C 8E230074 */ lw $v1, 0x74($s1) +/* BC2AC0 80240030 24020001 */ addiu $v0, $zero, 1 +/* BC2AC4 80240034 10620036 */ beq $v1, $v0, .L80240110 +/* BC2AC8 80240038 28620002 */ slti $v0, $v1, 2 +/* BC2ACC 8024003C 10400005 */ beqz $v0, .L80240054 +/* BC2AD0 80240040 24020002 */ addiu $v0, $zero, 2 +/* BC2AD4 80240044 10600007 */ beqz $v1, .L80240064 +/* BC2AD8 80240048 00000000 */ nop +/* BC2ADC 8024004C 0809005F */ j .L8024017C +/* BC2AE0 80240050 00000000 */ nop +.L80240054: +/* BC2AE4 80240054 10620036 */ beq $v1, $v0, .L80240130 +/* BC2AE8 80240058 00000000 */ nop +/* BC2AEC 8024005C 0809005F */ j .L8024017C +/* BC2AF0 80240060 00000000 */ nop +.L80240064: +/* BC2AF4 80240064 0C00A67F */ jal rand_int +/* BC2AF8 80240068 240400B4 */ addiu $a0, $zero, 0xb4 +/* BC2AFC 8024006C 24040032 */ addiu $a0, $zero, 0x32 +/* BC2B00 80240070 3C01C396 */ lui $at, 0xc396 +/* BC2B04 80240074 44810000 */ mtc1 $at, $f0 +/* BC2B08 80240078 2442001E */ addiu $v0, $v0, 0x1e +/* BC2B0C 8024007C A602008E */ sh $v0, 0x8e($s0) +/* BC2B10 80240080 0C00A67F */ jal rand_int +/* BC2B14 80240084 E6000040 */ swc1 $f0, 0x40($s0) +/* BC2B18 80240088 3C0142A0 */ lui $at, 0x42a0 +/* BC2B1C 8024008C 44811000 */ mtc1 $at, $f2 +/* BC2B20 80240090 44820000 */ mtc1 $v0, $f0 +/* BC2B24 80240094 00000000 */ nop +/* BC2B28 80240098 46800020 */ cvt.s.w $f0, $f0 +/* BC2B2C 8024009C 46020000 */ add.s $f0, $f0, $f2 +/* BC2B30 802400A0 0C00A64D */ jal func_80029934 +/* BC2B34 802400A4 E600003C */ swc1 $f0, 0x3c($s0) +/* BC2B38 802400A8 46000000 */ add.s $f0, $f0, $f0 +/* BC2B3C 802400AC 3C014000 */ lui $at, 0x4000 +/* BC2B40 802400B0 44811000 */ mtc1 $at, $f2 +/* BC2B44 802400B4 00000000 */ nop +/* BC2B48 802400B8 46020000 */ add.s $f0, $f0, $f2 +/* BC2B4C 802400BC 24040064 */ addiu $a0, $zero, 0x64 +/* BC2B50 802400C0 0C00A67F */ jal rand_int +/* BC2B54 802400C4 E6000018 */ swc1 $f0, 0x18($s0) +/* BC2B58 802400C8 28420032 */ slti $v0, $v0, 0x32 +/* BC2B5C 802400CC 10400007 */ beqz $v0, .L802400EC +/* BC2B60 802400D0 00000000 */ nop +/* BC2B64 802400D4 3C014387 */ lui $at, 0x4387 +/* BC2B68 802400D8 44810000 */ mtc1 $at, $f0 +/* BC2B6C 802400DC 00000000 */ nop +/* BC2B70 802400E0 E6000038 */ swc1 $f0, 0x38($s0) +/* BC2B74 802400E4 08090041 */ j .L80240104 +/* BC2B78 802400E8 E600000C */ swc1 $f0, 0xc($s0) +.L802400EC: +/* BC2B7C 802400EC 3C01C387 */ lui $at, 0xc387 +/* BC2B80 802400F0 44810000 */ mtc1 $at, $f0 +/* BC2B84 802400F4 3C0142B4 */ lui $at, 0x42b4 +/* BC2B88 802400F8 44811000 */ mtc1 $at, $f2 +/* BC2B8C 802400FC E6000038 */ swc1 $f0, 0x38($s0) +/* BC2B90 80240100 E602000C */ swc1 $f2, 0xc($s0) +.L80240104: +/* BC2B94 80240104 24020001 */ addiu $v0, $zero, 1 +/* BC2B98 80240108 0809005F */ j .L8024017C +/* BC2B9C 8024010C AE220074 */ sw $v0, 0x74($s1) +.L80240110: +/* BC2BA0 80240110 9602008E */ lhu $v0, 0x8e($s0) +/* BC2BA4 80240114 2442FFFF */ addiu $v0, $v0, -1 +/* BC2BA8 80240118 A602008E */ sh $v0, 0x8e($s0) +/* BC2BAC 8024011C 00021400 */ sll $v0, $v0, 0x10 +/* BC2BB0 80240120 14400016 */ bnez $v0, .L8024017C +/* BC2BB4 80240124 24020002 */ addiu $v0, $zero, 2 +/* BC2BB8 80240128 0809005F */ j .L8024017C +/* BC2BBC 8024012C AE220074 */ sw $v0, 0x74($s1) +.L80240130: +/* BC2BC0 80240130 8E050018 */ lw $a1, 0x18($s0) +/* BC2BC4 80240134 8E06000C */ lw $a2, 0xc($s0) +/* BC2BC8 80240138 0C00EA95 */ jal npc_move_heading +/* BC2BCC 8024013C 0200202D */ daddu $a0, $s0, $zero +/* BC2BD0 80240140 C6020038 */ lwc1 $f2, 0x38($s0) +/* BC2BD4 80240144 3C01C38C */ lui $at, 0xc38c +/* BC2BD8 80240148 44810000 */ mtc1 $at, $f0 +/* BC2BDC 8024014C 00000000 */ nop +/* BC2BE0 80240150 4600103C */ c.lt.s $f2, $f0 +/* BC2BE4 80240154 00000000 */ nop +/* BC2BE8 80240158 45030008 */ bc1tl .L8024017C +/* BC2BEC 8024015C AE200074 */ sw $zero, 0x74($s1) +/* BC2BF0 80240160 3C01438C */ lui $at, 0x438c +/* BC2BF4 80240164 44810000 */ mtc1 $at, $f0 +/* BC2BF8 80240168 00000000 */ nop +/* BC2BFC 8024016C 4602003C */ c.lt.s $f0, $f2 +/* BC2C00 80240170 00000000 */ nop +/* BC2C04 80240174 45030001 */ bc1tl .L8024017C +/* BC2C08 80240178 AE200074 */ sw $zero, 0x74($s1) +.L8024017C: +/* BC2C0C 8024017C 8FBF0018 */ lw $ra, 0x18($sp) +/* BC2C10 80240180 8FB10014 */ lw $s1, 0x14($sp) +/* BC2C14 80240184 8FB00010 */ lw $s0, 0x10($sp) +/* BC2C18 80240188 24020002 */ addiu $v0, $zero, 2 +/* BC2C1C 8024018C 03E00008 */ jr $ra +/* BC2C20 80240190 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4.s deleted file mode 100644 index 615d915b8e..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404B4 -/* BC4734 802404B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC4738 802404B8 AFBF0010 */ sw $ra, 0x10($sp) -/* BC473C 802404BC 10A00003 */ beqz $a1, .L802404CC -/* BC4740 802404C0 8C86000C */ lw $a2, 0xc($a0) -/* BC4744 802404C4 3C018024 */ lui $at, 0x8024 -/* BC4748 802404C8 AC202F30 */ sw $zero, 0x2f30($at) -.L802404CC: -/* BC474C 802404CC 3C038024 */ lui $v1, 0x8024 -/* BC4750 802404D0 24632F30 */ addiu $v1, $v1, 0x2f30 -/* BC4754 802404D4 8C620000 */ lw $v0, ($v1) -/* BC4758 802404D8 54400003 */ bnel $v0, $zero, .L802404E8 -/* BC475C 802404DC AC600000 */ sw $zero, ($v1) -/* BC4760 802404E0 0809013F */ j .L802404FC -/* BC4764 802404E4 0000102D */ daddu $v0, $zero, $zero -.L802404E8: -/* BC4768 802404E8 8CC50000 */ lw $a1, ($a2) -/* BC476C 802404EC 3C068024 */ lui $a2, 0x8024 -/* BC4770 802404F0 0C0B2026 */ jal set_variable -/* BC4774 802404F4 8CC62F34 */ lw $a2, 0x2f34($a2) -/* BC4778 802404F8 24020002 */ addiu $v0, $zero, 2 -.L802404FC: -/* BC477C 802404FC 8FBF0010 */ lw $ra, 0x10($sp) -/* BC4780 80240500 03E00008 */ jr $ra -/* BC4784 80240504 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s new file mode 100644 index 0000000000..d1329574e9 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_802404B4_BC4734.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404B4_BC4734 +/* BC4734 802404B4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BC4738 802404B8 AFBF0010 */ sw $ra, 0x10($sp) +/* BC473C 802404BC 10A00003 */ beqz $a1, .L802404CC +/* BC4740 802404C0 8C86000C */ lw $a2, 0xc($a0) +/* BC4744 802404C4 3C018024 */ lui $at, 0x8024 +/* BC4748 802404C8 AC202F30 */ sw $zero, 0x2f30($at) +.L802404CC: +/* BC474C 802404CC 3C038024 */ lui $v1, 0x8024 +/* BC4750 802404D0 24632F30 */ addiu $v1, $v1, 0x2f30 +/* BC4754 802404D4 8C620000 */ lw $v0, ($v1) +/* BC4758 802404D8 54400003 */ bnel $v0, $zero, .L802404E8 +/* BC475C 802404DC AC600000 */ sw $zero, ($v1) +/* BC4760 802404E0 0809013F */ j .L802404FC +/* BC4764 802404E4 0000102D */ daddu $v0, $zero, $zero +.L802404E8: +/* BC4768 802404E8 8CC50000 */ lw $a1, ($a2) +/* BC476C 802404EC 3C068024 */ lui $a2, 0x8024 +/* BC4770 802404F0 0C0B2026 */ jal set_variable +/* BC4774 802404F4 8CC62F34 */ lw $a2, 0x2f34($a2) +/* BC4778 802404F8 24020002 */ addiu $v0, $zero, 2 +.L802404FC: +/* BC477C 802404FC 8FBF0010 */ lw $ra, 0x10($sp) +/* BC4780 80240500 03E00008 */ jr $ra +/* BC4784 80240504 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858.s deleted file mode 100644 index 9d13f68c38..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240858 -/* BC4AD8 80240858 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC4ADC 8024085C AFB00010 */ sw $s0, 0x10($sp) -/* BC4AE0 80240860 0080802D */ daddu $s0, $a0, $zero -/* BC4AE4 80240864 AFBF0014 */ sw $ra, 0x14($sp) -/* BC4AE8 80240868 0C00EABB */ jal get_npc_unsafe -/* BC4AEC 8024086C 8E04008C */ lw $a0, 0x8c($s0) -/* BC4AF0 80240870 0040282D */ daddu $a1, $v0, $zero -/* BC4AF4 80240874 8E040094 */ lw $a0, 0x94($s0) -/* BC4AF8 80240878 8CA30028 */ lw $v1, 0x28($a1) -/* BC4AFC 8024087C ACA40028 */ sw $a0, 0x28($a1) -/* BC4B00 80240880 8FBF0014 */ lw $ra, 0x14($sp) -/* BC4B04 80240884 8FB00010 */ lw $s0, 0x10($sp) -/* BC4B08 80240888 24020002 */ addiu $v0, $zero, 2 -/* BC4B0C 8024088C 3C018024 */ lui $at, 0x8024 -/* BC4B10 80240890 AC233DA4 */ sw $v1, 0x3da4($at) -/* BC4B14 80240894 03E00008 */ jr $ra -/* BC4B18 80240898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s new file mode 100644 index 0000000000..5d7237fd30 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_03/BC43F0/func_80240858_BC4AD8.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240858_BC4AD8 +/* BC4AD8 80240858 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BC4ADC 8024085C AFB00010 */ sw $s0, 0x10($sp) +/* BC4AE0 80240860 0080802D */ daddu $s0, $a0, $zero +/* BC4AE4 80240864 AFBF0014 */ sw $ra, 0x14($sp) +/* BC4AE8 80240868 0C00EABB */ jal get_npc_unsafe +/* BC4AEC 8024086C 8E04008C */ lw $a0, 0x8c($s0) +/* BC4AF0 80240870 0040282D */ daddu $a1, $v0, $zero +/* BC4AF4 80240874 8E040094 */ lw $a0, 0x94($s0) +/* BC4AF8 80240878 8CA30028 */ lw $v1, 0x28($a1) +/* BC4AFC 8024087C ACA40028 */ sw $a0, 0x28($a1) +/* BC4B00 80240880 8FBF0014 */ lw $ra, 0x14($sp) +/* BC4B04 80240884 8FB00010 */ lw $s0, 0x10($sp) +/* BC4B08 80240888 24020002 */ addiu $v0, $zero, 2 +/* BC4B0C 8024088C 3C018024 */ lui $at, 0x8024 +/* BC4B10 80240890 AC233DA4 */ sw $v1, 0x3da4($at) +/* BC4B14 80240894 03E00008 */ jr $ra +/* BC4B18 80240898 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240198.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240198.s deleted file mode 100644 index 82002bf4e0..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240198.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240198 -/* BC7FF8 80240198 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC7FFC 8024019C AFBF0010 */ sw $ra, 0x10($sp) -/* BC8000 802401A0 0C00EABB */ jal get_npc_unsafe -/* BC8004 802401A4 24040001 */ addiu $a0, $zero, 1 -/* BC8008 802401A8 0C090034 */ jal func_802400D0 -/* BC800C 802401AC 0040202D */ daddu $a0, $v0, $zero -/* BC8010 802401B0 0C00EABB */ jal get_npc_unsafe -/* BC8014 802401B4 24040002 */ addiu $a0, $zero, 2 -/* BC8018 802401B8 0C090034 */ jal func_802400D0 -/* BC801C 802401BC 0040202D */ daddu $a0, $v0, $zero -/* BC8020 802401C0 0C00EABB */ jal get_npc_unsafe -/* BC8024 802401C4 24040003 */ addiu $a0, $zero, 3 -/* BC8028 802401C8 0C090034 */ jal func_802400D0 -/* BC802C 802401CC 0040202D */ daddu $a0, $v0, $zero -/* BC8030 802401D0 0C00EABB */ jal get_npc_unsafe -/* BC8034 802401D4 24040004 */ addiu $a0, $zero, 4 -/* BC8038 802401D8 0C090034 */ jal func_802400D0 -/* BC803C 802401DC 0040202D */ daddu $a0, $v0, $zero -/* BC8040 802401E0 0C00EABB */ jal get_npc_unsafe -/* BC8044 802401E4 24040005 */ addiu $a0, $zero, 5 -/* BC8048 802401E8 0C090034 */ jal func_802400D0 -/* BC804C 802401EC 0040202D */ daddu $a0, $v0, $zero -/* BC8050 802401F0 0C00EABB */ jal get_npc_unsafe -/* BC8054 802401F4 24040006 */ addiu $a0, $zero, 6 -/* BC8058 802401F8 0C090034 */ jal func_802400D0 -/* BC805C 802401FC 0040202D */ daddu $a0, $v0, $zero -/* BC8060 80240200 0C00EABB */ jal get_npc_unsafe -/* BC8064 80240204 24040007 */ addiu $a0, $zero, 7 -/* BC8068 80240208 0C090034 */ jal func_802400D0 -/* BC806C 8024020C 0040202D */ daddu $a0, $v0, $zero -/* BC8070 80240210 0C00EABB */ jal get_npc_unsafe -/* BC8074 80240214 24040008 */ addiu $a0, $zero, 8 -/* BC8078 80240218 0C090034 */ jal func_802400D0 -/* BC807C 8024021C 0040202D */ daddu $a0, $v0, $zero -/* BC8080 80240220 8FBF0010 */ lw $ra, 0x10($sp) -/* BC8084 80240224 03E00008 */ jr $ra -/* BC8088 80240228 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240198_BC7FF8.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240198_BC7FF8.s new file mode 100644 index 0000000000..c710b30ca2 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240198_BC7FF8.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240198_BC7FF8 +/* BC7FF8 80240198 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BC7FFC 8024019C AFBF0010 */ sw $ra, 0x10($sp) +/* BC8000 802401A0 0C00EABB */ jal get_npc_unsafe +/* BC8004 802401A4 24040001 */ addiu $a0, $zero, 1 +/* BC8008 802401A8 0C090034 */ jal func_802400D0_BC7F30 +/* BC800C 802401AC 0040202D */ daddu $a0, $v0, $zero +/* BC8010 802401B0 0C00EABB */ jal get_npc_unsafe +/* BC8014 802401B4 24040002 */ addiu $a0, $zero, 2 +/* BC8018 802401B8 0C090034 */ jal func_802400D0_BC7F30 +/* BC801C 802401BC 0040202D */ daddu $a0, $v0, $zero +/* BC8020 802401C0 0C00EABB */ jal get_npc_unsafe +/* BC8024 802401C4 24040003 */ addiu $a0, $zero, 3 +/* BC8028 802401C8 0C090034 */ jal func_802400D0_BC7F30 +/* BC802C 802401CC 0040202D */ daddu $a0, $v0, $zero +/* BC8030 802401D0 0C00EABB */ jal get_npc_unsafe +/* BC8034 802401D4 24040004 */ addiu $a0, $zero, 4 +/* BC8038 802401D8 0C090034 */ jal func_802400D0_BC7F30 +/* BC803C 802401DC 0040202D */ daddu $a0, $v0, $zero +/* BC8040 802401E0 0C00EABB */ jal get_npc_unsafe +/* BC8044 802401E4 24040005 */ addiu $a0, $zero, 5 +/* BC8048 802401E8 0C090034 */ jal func_802400D0_BC7F30 +/* BC804C 802401EC 0040202D */ daddu $a0, $v0, $zero +/* BC8050 802401F0 0C00EABB */ jal get_npc_unsafe +/* BC8054 802401F4 24040006 */ addiu $a0, $zero, 6 +/* BC8058 802401F8 0C090034 */ jal func_802400D0_BC7F30 +/* BC805C 802401FC 0040202D */ daddu $a0, $v0, $zero +/* BC8060 80240200 0C00EABB */ jal get_npc_unsafe +/* BC8064 80240204 24040007 */ addiu $a0, $zero, 7 +/* BC8068 80240208 0C090034 */ jal func_802400D0_BC7F30 +/* BC806C 8024020C 0040202D */ daddu $a0, $v0, $zero +/* BC8070 80240210 0C00EABB */ jal get_npc_unsafe +/* BC8074 80240214 24040008 */ addiu $a0, $zero, 8 +/* BC8078 80240218 0C090034 */ jal func_802400D0_BC7F30 +/* BC807C 8024021C 0040202D */ daddu $a0, $v0, $zero +/* BC8080 80240220 8FBF0010 */ lw $ra, 0x10($sp) +/* BC8084 80240224 03E00008 */ jr $ra +/* BC8088 80240228 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s index 961bb65976..53e0c0eefb 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_802402F4_BC8154.s @@ -81,7 +81,7 @@ glabel func_802402F4_BC8154 /* BC8270 80240410 00000000 */ nop /* BC8274 80240414 45000003 */ bc1f .L80240424 /* BC8278 80240418 00000000 */ nop -/* BC827C 8024041C 0C090066 */ jal func_80240198 +/* BC827C 8024041C 0C090066 */ jal func_80240198_BC7FF8 /* BC8280 80240420 00000000 */ nop .L80240424: /* BC8284 80240424 C600000C */ lwc1 $f0, 0xc($s0) @@ -106,7 +106,7 @@ glabel func_802402F4_BC8154 /* BC82D0 80240470 34A50F82 */ ori $a1, $a1, 0xf82 /* BC82D4 80240474 0C0B2026 */ jal set_variable /* BC82D8 80240478 24060001 */ addiu $a2, $zero, 1 -/* BC82DC 8024047C 0C09008B */ jal func_8024022C +/* BC82DC 8024047C 0C09008B */ jal func_8024022C_BC808C /* BC82E0 80240480 00000000 */ nop /* BC82E4 80240484 08090164 */ j .L80240590 /* BC82E8 80240488 AE340074 */ sw $s4, 0x74($s1) @@ -115,7 +115,7 @@ glabel func_802402F4_BC8154 /* BC82F0 80240490 3C05FD05 */ lui $a1, 0xfd05 /* BC82F4 80240494 0C0B1EAF */ jal get_variable /* BC82F8 80240498 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC82FC 8024049C 0C0900A8 */ jal func_802402A0 +/* BC82FC 8024049C 0C0900A8 */ jal func_802402A0_BC8100 /* BC8300 802404A0 0040202D */ daddu $a0, $v0, $zero /* BC8304 802404A4 AE220074 */ sw $v0, 0x74($s1) /* BC8308 802404A8 C600000C */ lwc1 $f0, 0xc($s0) @@ -127,7 +127,7 @@ glabel func_802402F4_BC8154 /* BC831C 802404BC 3C05FD05 */ lui $a1, 0xfd05 /* BC8320 802404C0 0C0B1EAF */ jal get_variable /* BC8324 802404C4 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC8328 802404C8 0C0900A8 */ jal func_802402A0 +/* BC8328 802404C8 0C0900A8 */ jal func_802402A0_BC8100 /* BC832C 802404CC 0040202D */ daddu $a0, $v0, $zero /* BC8330 802404D0 AE220074 */ sw $v0, 0x74($s1) /* BC8334 802404D4 C600000C */ lwc1 $f0, 0xc($s0) @@ -181,7 +181,7 @@ glabel func_802402F4_BC8154 .L8024057C: /* BC83DC 8024057C 0C0B1EAF */ jal get_variable /* BC83E0 80240580 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC83E4 80240584 0C0900A8 */ jal func_802402A0 +/* BC83E4 80240584 0C0900A8 */ jal func_802402A0_BC8100 /* BC83E8 80240588 0040202D */ daddu $a0, $v0, $zero .L8024058C: /* BC83EC 8024058C AE220074 */ sw $v0, 0x74($s1) diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s index 79b72478b8..9b767bb601 100644 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240624_BC8484.s @@ -160,7 +160,7 @@ glabel func_80240624_BC8484 /* BC86DC 8024087C 34A50F83 */ ori $a1, $a1, 0xf83 /* BC86E0 80240880 0C0B1EAF */ jal get_variable /* BC86E4 80240884 E614000C */ swc1 $f20, 0xc($s0) -/* BC86E8 80240888 0C0900A8 */ jal func_802402A0 +/* BC86E8 80240888 0C0900A8 */ jal func_802402A0_BC8100 /* BC86EC 8024088C 0040202D */ daddu $a0, $v0, $zero /* BC86F0 80240890 AE620074 */ sw $v0, 0x74($s3) /* BC86F4 80240894 C6200038 */ lwc1 $f0, 0x38($s1) @@ -182,7 +182,7 @@ glabel func_80240624_BC8484 /* BC8730 802408D0 3C05FD05 */ lui $a1, 0xfd05 /* BC8734 802408D4 0C0B1EAF */ jal get_variable /* BC8738 802408D8 34A50F83 */ ori $a1, $a1, 0xf83 -/* BC873C 802408DC 0C0900A8 */ jal func_802402A0 +/* BC873C 802408DC 0C0900A8 */ jal func_802402A0_BC8100 /* BC8740 802408E0 0040202D */ daddu $a0, $v0, $zero .L802408E4: /* BC8744 802408E4 AE620074 */ sw $v0, 0x74($s3) diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58.s deleted file mode 100644 index 8fecdabc47..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A58 -/* BC88B8 80240A58 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* BC88BC 80240A5C AFB00010 */ sw $s0, 0x10($sp) -/* BC88C0 80240A60 0080802D */ daddu $s0, $a0, $zero -/* BC88C4 80240A64 24040001 */ addiu $a0, $zero, 1 -/* BC88C8 80240A68 AFBF0030 */ sw $ra, 0x30($sp) -/* BC88CC 80240A6C AFB7002C */ sw $s7, 0x2c($sp) -/* BC88D0 80240A70 AFB60028 */ sw $s6, 0x28($sp) -/* BC88D4 80240A74 AFB50024 */ sw $s5, 0x24($sp) -/* BC88D8 80240A78 AFB40020 */ sw $s4, 0x20($sp) -/* BC88DC 80240A7C AFB3001C */ sw $s3, 0x1c($sp) -/* BC88E0 80240A80 AFB20018 */ sw $s2, 0x18($sp) -/* BC88E4 80240A84 0C00EABB */ jal get_npc_unsafe -/* BC88E8 80240A88 AFB10014 */ sw $s1, 0x14($sp) -/* BC88EC 80240A8C 24040002 */ addiu $a0, $zero, 2 -/* BC88F0 80240A90 0C00EABB */ jal get_npc_unsafe -/* BC88F4 80240A94 0040B82D */ daddu $s7, $v0, $zero -/* BC88F8 80240A98 24040003 */ addiu $a0, $zero, 3 -/* BC88FC 80240A9C 0C00EABB */ jal get_npc_unsafe -/* BC8900 80240AA0 0040B02D */ daddu $s6, $v0, $zero -/* BC8904 80240AA4 24040004 */ addiu $a0, $zero, 4 -/* BC8908 80240AA8 0C00EABB */ jal get_npc_unsafe -/* BC890C 80240AAC 0040A82D */ daddu $s5, $v0, $zero -/* BC8910 80240AB0 24040005 */ addiu $a0, $zero, 5 -/* BC8914 80240AB4 0C00EABB */ jal get_npc_unsafe -/* BC8918 80240AB8 0040A02D */ daddu $s4, $v0, $zero -/* BC891C 80240ABC 24040006 */ addiu $a0, $zero, 6 -/* BC8920 80240AC0 0C00EABB */ jal get_npc_unsafe -/* BC8924 80240AC4 0040982D */ daddu $s3, $v0, $zero -/* BC8928 80240AC8 24040007 */ addiu $a0, $zero, 7 -/* BC892C 80240ACC 0C00EABB */ jal get_npc_unsafe -/* BC8930 80240AD0 0040902D */ daddu $s2, $v0, $zero -/* BC8934 80240AD4 24040008 */ addiu $a0, $zero, 8 -/* BC8938 80240AD8 0C00EABB */ jal get_npc_unsafe -/* BC893C 80240ADC 0040882D */ daddu $s1, $v0, $zero -/* BC8940 80240AE0 8E030084 */ lw $v1, 0x84($s0) -/* BC8944 80240AE4 0040302D */ daddu $a2, $v0, $zero -/* BC8948 80240AE8 2C620008 */ sltiu $v0, $v1, 8 -/* BC894C 80240AEC 10400039 */ beqz $v0, .L80240BD4 -/* BC8950 80240AF0 00031080 */ sll $v0, $v1, 2 -/* BC8954 80240AF4 3C018024 */ lui $at, 0x8024 -/* BC8958 80240AF8 00220821 */ addu $at, $at, $v0 -/* BC895C 80240AFC 8C2251D8 */ lw $v0, 0x51d8($at) -/* BC8960 80240B00 00400008 */ jr $v0 -/* BC8964 80240B04 00000000 */ nop -/* BC8968 80240B08 0000202D */ daddu $a0, $zero, $zero -/* BC896C 80240B0C 3C05FD05 */ lui $a1, 0xfd05 -/* BC8970 80240B10 34A50F85 */ ori $a1, $a1, 0xf85 -/* BC8974 80240B14 C6E0000C */ lwc1 $f0, 0xc($s7) -/* BC8978 80240B18 080902F1 */ j .L80240BC4 -/* BC897C 80240B1C 24060001 */ addiu $a2, $zero, 1 -/* BC8980 80240B20 0000202D */ daddu $a0, $zero, $zero -/* BC8984 80240B24 3C05FD05 */ lui $a1, 0xfd05 -/* BC8988 80240B28 34A50F85 */ ori $a1, $a1, 0xf85 -/* BC898C 80240B2C C6C0000C */ lwc1 $f0, 0xc($s6) -/* BC8990 80240B30 080902F1 */ j .L80240BC4 -/* BC8994 80240B34 24060002 */ addiu $a2, $zero, 2 -/* BC8998 80240B38 0000202D */ daddu $a0, $zero, $zero -/* BC899C 80240B3C 3C05FD05 */ lui $a1, 0xfd05 -/* BC89A0 80240B40 34A50F85 */ ori $a1, $a1, 0xf85 -/* BC89A4 80240B44 C6A0000C */ lwc1 $f0, 0xc($s5) -/* BC89A8 80240B48 080902F1 */ j .L80240BC4 -/* BC89AC 80240B4C 24060003 */ addiu $a2, $zero, 3 -/* BC89B0 80240B50 0000202D */ daddu $a0, $zero, $zero -/* BC89B4 80240B54 3C05FD05 */ lui $a1, 0xfd05 -/* BC89B8 80240B58 34A50F85 */ ori $a1, $a1, 0xf85 -/* BC89BC 80240B5C C680000C */ lwc1 $f0, 0xc($s4) -/* BC89C0 80240B60 080902F1 */ j .L80240BC4 -/* BC89C4 80240B64 24060004 */ addiu $a2, $zero, 4 -/* BC89C8 80240B68 0000202D */ daddu $a0, $zero, $zero -/* BC89CC 80240B6C 3C05FD05 */ lui $a1, 0xfd05 -/* BC89D0 80240B70 34A50F85 */ ori $a1, $a1, 0xf85 -/* BC89D4 80240B74 C660000C */ lwc1 $f0, 0xc($s3) -/* BC89D8 80240B78 080902F1 */ j .L80240BC4 -/* BC89DC 80240B7C 24060005 */ addiu $a2, $zero, 5 -/* BC89E0 80240B80 0000202D */ daddu $a0, $zero, $zero -/* BC89E4 80240B84 3C05FD05 */ lui $a1, 0xfd05 -/* BC89E8 80240B88 34A50F85 */ ori $a1, $a1, 0xf85 -/* BC89EC 80240B8C C640000C */ lwc1 $f0, 0xc($s2) -/* BC89F0 80240B90 080902F1 */ j .L80240BC4 -/* BC89F4 80240B94 24060006 */ addiu $a2, $zero, 6 -/* BC89F8 80240B98 0000202D */ daddu $a0, $zero, $zero -/* BC89FC 80240B9C 3C05FD05 */ lui $a1, 0xfd05 -/* BC8A00 80240BA0 34A50F85 */ ori $a1, $a1, 0xf85 -/* BC8A04 80240BA4 C620000C */ lwc1 $f0, 0xc($s1) -/* BC8A08 80240BA8 080902F1 */ j .L80240BC4 -/* BC8A0C 80240BAC 24060007 */ addiu $a2, $zero, 7 -/* BC8A10 80240BB0 0000202D */ daddu $a0, $zero, $zero -/* BC8A14 80240BB4 3C05FD05 */ lui $a1, 0xfd05 -/* BC8A18 80240BB8 34A50F85 */ ori $a1, $a1, 0xf85 -/* BC8A1C 80240BBC C4C0000C */ lwc1 $f0, 0xc($a2) -/* BC8A20 80240BC0 24060008 */ addiu $a2, $zero, 8 -.L80240BC4: -/* BC8A24 80240BC4 4600008D */ trunc.w.s $f2, $f0 -/* BC8A28 80240BC8 0C0B2026 */ jal set_variable -/* BC8A2C 80240BCC E6020084 */ swc1 $f2, 0x84($s0) -/* BC8A30 80240BD0 8E030084 */ lw $v1, 0x84($s0) -.L80240BD4: -/* BC8A34 80240BD4 8E040088 */ lw $a0, 0x88($s0) -/* BC8A38 80240BD8 00641821 */ addu $v1, $v1, $a0 -/* BC8A3C 80240BDC AE030084 */ sw $v1, 0x84($s0) -/* BC8A40 80240BE0 8FBF0030 */ lw $ra, 0x30($sp) -/* BC8A44 80240BE4 8FB7002C */ lw $s7, 0x2c($sp) -/* BC8A48 80240BE8 8FB60028 */ lw $s6, 0x28($sp) -/* BC8A4C 80240BEC 8FB50024 */ lw $s5, 0x24($sp) -/* BC8A50 80240BF0 8FB40020 */ lw $s4, 0x20($sp) -/* BC8A54 80240BF4 8FB3001C */ lw $s3, 0x1c($sp) -/* BC8A58 80240BF8 8FB20018 */ lw $s2, 0x18($sp) -/* BC8A5C 80240BFC 8FB10014 */ lw $s1, 0x14($sp) -/* BC8A60 80240C00 8FB00010 */ lw $s0, 0x10($sp) -/* BC8A64 80240C04 24020002 */ addiu $v0, $zero, 2 -/* BC8A68 80240C08 03E00008 */ jr $ra -/* BC8A6C 80240C0C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s new file mode 100644 index 0000000000..04476bf33e --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240A58_BC88B8.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A58_BC88B8 +/* BC88B8 80240A58 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* BC88BC 80240A5C AFB00010 */ sw $s0, 0x10($sp) +/* BC88C0 80240A60 0080802D */ daddu $s0, $a0, $zero +/* BC88C4 80240A64 24040001 */ addiu $a0, $zero, 1 +/* BC88C8 80240A68 AFBF0030 */ sw $ra, 0x30($sp) +/* BC88CC 80240A6C AFB7002C */ sw $s7, 0x2c($sp) +/* BC88D0 80240A70 AFB60028 */ sw $s6, 0x28($sp) +/* BC88D4 80240A74 AFB50024 */ sw $s5, 0x24($sp) +/* BC88D8 80240A78 AFB40020 */ sw $s4, 0x20($sp) +/* BC88DC 80240A7C AFB3001C */ sw $s3, 0x1c($sp) +/* BC88E0 80240A80 AFB20018 */ sw $s2, 0x18($sp) +/* BC88E4 80240A84 0C00EABB */ jal get_npc_unsafe +/* BC88E8 80240A88 AFB10014 */ sw $s1, 0x14($sp) +/* BC88EC 80240A8C 24040002 */ addiu $a0, $zero, 2 +/* BC88F0 80240A90 0C00EABB */ jal get_npc_unsafe +/* BC88F4 80240A94 0040B82D */ daddu $s7, $v0, $zero +/* BC88F8 80240A98 24040003 */ addiu $a0, $zero, 3 +/* BC88FC 80240A9C 0C00EABB */ jal get_npc_unsafe +/* BC8900 80240AA0 0040B02D */ daddu $s6, $v0, $zero +/* BC8904 80240AA4 24040004 */ addiu $a0, $zero, 4 +/* BC8908 80240AA8 0C00EABB */ jal get_npc_unsafe +/* BC890C 80240AAC 0040A82D */ daddu $s5, $v0, $zero +/* BC8910 80240AB0 24040005 */ addiu $a0, $zero, 5 +/* BC8914 80240AB4 0C00EABB */ jal get_npc_unsafe +/* BC8918 80240AB8 0040A02D */ daddu $s4, $v0, $zero +/* BC891C 80240ABC 24040006 */ addiu $a0, $zero, 6 +/* BC8920 80240AC0 0C00EABB */ jal get_npc_unsafe +/* BC8924 80240AC4 0040982D */ daddu $s3, $v0, $zero +/* BC8928 80240AC8 24040007 */ addiu $a0, $zero, 7 +/* BC892C 80240ACC 0C00EABB */ jal get_npc_unsafe +/* BC8930 80240AD0 0040902D */ daddu $s2, $v0, $zero +/* BC8934 80240AD4 24040008 */ addiu $a0, $zero, 8 +/* BC8938 80240AD8 0C00EABB */ jal get_npc_unsafe +/* BC893C 80240ADC 0040882D */ daddu $s1, $v0, $zero +/* BC8940 80240AE0 8E030084 */ lw $v1, 0x84($s0) +/* BC8944 80240AE4 0040302D */ daddu $a2, $v0, $zero +/* BC8948 80240AE8 2C620008 */ sltiu $v0, $v1, 8 +/* BC894C 80240AEC 10400039 */ beqz $v0, .L80240BD4 +/* BC8950 80240AF0 00031080 */ sll $v0, $v1, 2 +/* BC8954 80240AF4 3C018024 */ lui $at, 0x8024 +/* BC8958 80240AF8 00220821 */ addu $at, $at, $v0 +/* BC895C 80240AFC 8C2251D8 */ lw $v0, 0x51d8($at) +/* BC8960 80240B00 00400008 */ jr $v0 +/* BC8964 80240B04 00000000 */ nop +/* BC8968 80240B08 0000202D */ daddu $a0, $zero, $zero +/* BC896C 80240B0C 3C05FD05 */ lui $a1, 0xfd05 +/* BC8970 80240B10 34A50F85 */ ori $a1, $a1, 0xf85 +/* BC8974 80240B14 C6E0000C */ lwc1 $f0, 0xc($s7) +/* BC8978 80240B18 080902F1 */ j .L80240BC4 +/* BC897C 80240B1C 24060001 */ addiu $a2, $zero, 1 +/* BC8980 80240B20 0000202D */ daddu $a0, $zero, $zero +/* BC8984 80240B24 3C05FD05 */ lui $a1, 0xfd05 +/* BC8988 80240B28 34A50F85 */ ori $a1, $a1, 0xf85 +/* BC898C 80240B2C C6C0000C */ lwc1 $f0, 0xc($s6) +/* BC8990 80240B30 080902F1 */ j .L80240BC4 +/* BC8994 80240B34 24060002 */ addiu $a2, $zero, 2 +/* BC8998 80240B38 0000202D */ daddu $a0, $zero, $zero +/* BC899C 80240B3C 3C05FD05 */ lui $a1, 0xfd05 +/* BC89A0 80240B40 34A50F85 */ ori $a1, $a1, 0xf85 +/* BC89A4 80240B44 C6A0000C */ lwc1 $f0, 0xc($s5) +/* BC89A8 80240B48 080902F1 */ j .L80240BC4 +/* BC89AC 80240B4C 24060003 */ addiu $a2, $zero, 3 +/* BC89B0 80240B50 0000202D */ daddu $a0, $zero, $zero +/* BC89B4 80240B54 3C05FD05 */ lui $a1, 0xfd05 +/* BC89B8 80240B58 34A50F85 */ ori $a1, $a1, 0xf85 +/* BC89BC 80240B5C C680000C */ lwc1 $f0, 0xc($s4) +/* BC89C0 80240B60 080902F1 */ j .L80240BC4 +/* BC89C4 80240B64 24060004 */ addiu $a2, $zero, 4 +/* BC89C8 80240B68 0000202D */ daddu $a0, $zero, $zero +/* BC89CC 80240B6C 3C05FD05 */ lui $a1, 0xfd05 +/* BC89D0 80240B70 34A50F85 */ ori $a1, $a1, 0xf85 +/* BC89D4 80240B74 C660000C */ lwc1 $f0, 0xc($s3) +/* BC89D8 80240B78 080902F1 */ j .L80240BC4 +/* BC89DC 80240B7C 24060005 */ addiu $a2, $zero, 5 +/* BC89E0 80240B80 0000202D */ daddu $a0, $zero, $zero +/* BC89E4 80240B84 3C05FD05 */ lui $a1, 0xfd05 +/* BC89E8 80240B88 34A50F85 */ ori $a1, $a1, 0xf85 +/* BC89EC 80240B8C C640000C */ lwc1 $f0, 0xc($s2) +/* BC89F0 80240B90 080902F1 */ j .L80240BC4 +/* BC89F4 80240B94 24060006 */ addiu $a2, $zero, 6 +/* BC89F8 80240B98 0000202D */ daddu $a0, $zero, $zero +/* BC89FC 80240B9C 3C05FD05 */ lui $a1, 0xfd05 +/* BC8A00 80240BA0 34A50F85 */ ori $a1, $a1, 0xf85 +/* BC8A04 80240BA4 C620000C */ lwc1 $f0, 0xc($s1) +/* BC8A08 80240BA8 080902F1 */ j .L80240BC4 +/* BC8A0C 80240BAC 24060007 */ addiu $a2, $zero, 7 +/* BC8A10 80240BB0 0000202D */ daddu $a0, $zero, $zero +/* BC8A14 80240BB4 3C05FD05 */ lui $a1, 0xfd05 +/* BC8A18 80240BB8 34A50F85 */ ori $a1, $a1, 0xf85 +/* BC8A1C 80240BBC C4C0000C */ lwc1 $f0, 0xc($a2) +/* BC8A20 80240BC0 24060008 */ addiu $a2, $zero, 8 +.L80240BC4: +/* BC8A24 80240BC4 4600008D */ trunc.w.s $f2, $f0 +/* BC8A28 80240BC8 0C0B2026 */ jal set_variable +/* BC8A2C 80240BCC E6020084 */ swc1 $f2, 0x84($s0) +/* BC8A30 80240BD0 8E030084 */ lw $v1, 0x84($s0) +.L80240BD4: +/* BC8A34 80240BD4 8E040088 */ lw $a0, 0x88($s0) +/* BC8A38 80240BD8 00641821 */ addu $v1, $v1, $a0 +/* BC8A3C 80240BDC AE030084 */ sw $v1, 0x84($s0) +/* BC8A40 80240BE0 8FBF0030 */ lw $ra, 0x30($sp) +/* BC8A44 80240BE4 8FB7002C */ lw $s7, 0x2c($sp) +/* BC8A48 80240BE8 8FB60028 */ lw $s6, 0x28($sp) +/* BC8A4C 80240BEC 8FB50024 */ lw $s5, 0x24($sp) +/* BC8A50 80240BF0 8FB40020 */ lw $s4, 0x20($sp) +/* BC8A54 80240BF4 8FB3001C */ lw $s3, 0x1c($sp) +/* BC8A58 80240BF8 8FB20018 */ lw $s2, 0x18($sp) +/* BC8A5C 80240BFC 8FB10014 */ lw $s1, 0x14($sp) +/* BC8A60 80240C00 8FB00010 */ lw $s0, 0x10($sp) +/* BC8A64 80240C04 24020002 */ addiu $v0, $zero, 2 +/* BC8A68 80240C08 03E00008 */ jr $ra +/* BC8A6C 80240C0C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240CA0.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240CA0.s deleted file mode 100644 index 9c20f48317..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240CA0.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CA0 -/* BC8B00 80240CA0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BC8B04 80240CA4 AFB00010 */ sw $s0, 0x10($sp) -/* BC8B08 80240CA8 0080802D */ daddu $s0, $a0, $zero -/* BC8B0C 80240CAC 0000202D */ daddu $a0, $zero, $zero -/* BC8B10 80240CB0 3C05FD05 */ lui $a1, 0xfd05 -/* BC8B14 80240CB4 AFBF0014 */ sw $ra, 0x14($sp) -/* BC8B18 80240CB8 0C0B1EAF */ jal get_variable -/* BC8B1C 80240CBC 34A50F85 */ ori $a1, $a1, 0xf85 -/* BC8B20 80240CC0 0C00EABB */ jal get_npc_unsafe -/* BC8B24 80240CC4 0040202D */ daddu $a0, $v0, $zero -/* BC8B28 80240CC8 C4400038 */ lwc1 $f0, 0x38($v0) -/* BC8B2C 80240CCC 4600008D */ trunc.w.s $f2, $f0 -/* BC8B30 80240CD0 E6020084 */ swc1 $f2, 0x84($s0) -/* BC8B34 80240CD4 C440003C */ lwc1 $f0, 0x3c($v0) -/* BC8B38 80240CD8 4600008D */ trunc.w.s $f2, $f0 -/* BC8B3C 80240CDC E6020088 */ swc1 $f2, 0x88($s0) -/* BC8B40 80240CE0 C4400040 */ lwc1 $f0, 0x40($v0) -/* BC8B44 80240CE4 4600008D */ trunc.w.s $f2, $f0 -/* BC8B48 80240CE8 E602008C */ swc1 $f2, 0x8c($s0) -/* BC8B4C 80240CEC 8FBF0014 */ lw $ra, 0x14($sp) -/* BC8B50 80240CF0 8FB00010 */ lw $s0, 0x10($sp) -/* BC8B54 80240CF4 24020002 */ addiu $v0, $zero, 2 -/* BC8B58 80240CF8 03E00008 */ jr $ra -/* BC8B5C 80240CFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240CA0_BC8B00.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240CA0_BC8B00.s new file mode 100644 index 0000000000..989fb9a219 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240CA0_BC8B00.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CA0_BC8B00 +/* BC8B00 80240CA0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BC8B04 80240CA4 AFB00010 */ sw $s0, 0x10($sp) +/* BC8B08 80240CA8 0080802D */ daddu $s0, $a0, $zero +/* BC8B0C 80240CAC 0000202D */ daddu $a0, $zero, $zero +/* BC8B10 80240CB0 3C05FD05 */ lui $a1, 0xfd05 +/* BC8B14 80240CB4 AFBF0014 */ sw $ra, 0x14($sp) +/* BC8B18 80240CB8 0C0B1EAF */ jal get_variable +/* BC8B1C 80240CBC 34A50F85 */ ori $a1, $a1, 0xf85 +/* BC8B20 80240CC0 0C00EABB */ jal get_npc_unsafe +/* BC8B24 80240CC4 0040202D */ daddu $a0, $v0, $zero +/* BC8B28 80240CC8 C4400038 */ lwc1 $f0, 0x38($v0) +/* BC8B2C 80240CCC 4600008D */ trunc.w.s $f2, $f0 +/* BC8B30 80240CD0 E6020084 */ swc1 $f2, 0x84($s0) +/* BC8B34 80240CD4 C440003C */ lwc1 $f0, 0x3c($v0) +/* BC8B38 80240CD8 4600008D */ trunc.w.s $f2, $f0 +/* BC8B3C 80240CDC E6020088 */ swc1 $f2, 0x88($s0) +/* BC8B40 80240CE0 C4400040 */ lwc1 $f0, 0x40($v0) +/* BC8B44 80240CE4 4600008D */ trunc.w.s $f2, $f0 +/* BC8B48 80240CE8 E602008C */ swc1 $f2, 0x8c($s0) +/* BC8B4C 80240CEC 8FBF0014 */ lw $ra, 0x14($sp) +/* BC8B50 80240CF0 8FB00010 */ lw $s0, 0x10($sp) +/* BC8B54 80240CF4 24020002 */ addiu $v0, $zero, 2 +/* BC8B58 80240CF8 03E00008 */ jr $ra +/* BC8B5C 80240CFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D00.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D00.s deleted file mode 100644 index f196060d7f..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D00.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D00 -/* BC8B60 80240D00 24020001 */ addiu $v0, $zero, 1 -/* BC8B64 80240D04 3C018011 */ lui $at, %hi(gPlayerData) -/* BC8B68 80240D08 A022F290 */ sb $v0, %lo(gPlayerData)($at) -/* BC8B6C 80240D0C 03E00008 */ jr $ra -/* BC8B70 80240D10 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D00_BC8B60.s b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D00_BC8B60.s new file mode 100644 index 0000000000..d04573e587 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_04/BC7EB0/func_80240D00_BC8B60.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D00_BC8B60 +/* BC8B60 80240D00 24020001 */ addiu $v0, $zero, 1 +/* BC8B64 80240D04 3C018011 */ lui $at, %hi(gPlayerData) +/* BC8B68 80240D08 A022F290 */ sb $v0, %lo(gPlayerData)($at) +/* BC8B6C 80240D0C 03E00008 */ jr $ra +/* BC8B70 80240D10 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC.s b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC.s deleted file mode 100644 index 3f67e2af21..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407AC -/* BCD80C 802407AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCD810 802407B0 AFB10014 */ sw $s1, 0x14($sp) -/* BCD814 802407B4 0080882D */ daddu $s1, $a0, $zero -/* BCD818 802407B8 AFBF0018 */ sw $ra, 0x18($sp) -/* BCD81C 802407BC AFB00010 */ sw $s0, 0x10($sp) -/* BCD820 802407C0 0C00EAD2 */ jal get_npc_safe -/* BCD824 802407C4 8E24014C */ lw $a0, 0x14c($s1) -/* BCD828 802407C8 0040802D */ daddu $s0, $v0, $zero -/* BCD82C 802407CC 8E230074 */ lw $v1, 0x74($s1) -/* BCD830 802407D0 24020001 */ addiu $v0, $zero, 1 -/* BCD834 802407D4 10620036 */ beq $v1, $v0, .L802408B0 -/* BCD838 802407D8 28620002 */ slti $v0, $v1, 2 -/* BCD83C 802407DC 10400005 */ beqz $v0, .L802407F4 -/* BCD840 802407E0 24020002 */ addiu $v0, $zero, 2 -/* BCD844 802407E4 10600007 */ beqz $v1, .L80240804 -/* BCD848 802407E8 00000000 */ nop -/* BCD84C 802407EC 08090247 */ j .L8024091C -/* BCD850 802407F0 00000000 */ nop -.L802407F4: -/* BCD854 802407F4 10620036 */ beq $v1, $v0, .L802408D0 -/* BCD858 802407F8 00000000 */ nop -/* BCD85C 802407FC 08090247 */ j .L8024091C -/* BCD860 80240800 00000000 */ nop -.L80240804: -/* BCD864 80240804 0C00A67F */ jal rand_int -/* BCD868 80240808 240400B4 */ addiu $a0, $zero, 0xb4 -/* BCD86C 8024080C 24040032 */ addiu $a0, $zero, 0x32 -/* BCD870 80240810 3C01C3D7 */ lui $at, 0xc3d7 -/* BCD874 80240814 44810000 */ mtc1 $at, $f0 -/* BCD878 80240818 2442001E */ addiu $v0, $v0, 0x1e -/* BCD87C 8024081C A602008E */ sh $v0, 0x8e($s0) -/* BCD880 80240820 0C00A67F */ jal rand_int -/* BCD884 80240824 E6000040 */ swc1 $f0, 0x40($s0) -/* BCD888 80240828 3C014220 */ lui $at, 0x4220 -/* BCD88C 8024082C 44811000 */ mtc1 $at, $f2 -/* BCD890 80240830 44820000 */ mtc1 $v0, $f0 -/* BCD894 80240834 00000000 */ nop -/* BCD898 80240838 46800020 */ cvt.s.w $f0, $f0 -/* BCD89C 8024083C 46020000 */ add.s $f0, $f0, $f2 -/* BCD8A0 80240840 0C00A64D */ jal func_80029934 -/* BCD8A4 80240844 E600003C */ swc1 $f0, 0x3c($s0) -/* BCD8A8 80240848 46000000 */ add.s $f0, $f0, $f0 -/* BCD8AC 8024084C 3C014000 */ lui $at, 0x4000 -/* BCD8B0 80240850 44811000 */ mtc1 $at, $f2 -/* BCD8B4 80240854 00000000 */ nop -/* BCD8B8 80240858 46020000 */ add.s $f0, $f0, $f2 -/* BCD8BC 8024085C 24040064 */ addiu $a0, $zero, 0x64 -/* BCD8C0 80240860 0C00A67F */ jal rand_int -/* BCD8C4 80240864 E6000018 */ swc1 $f0, 0x18($s0) -/* BCD8C8 80240868 28420032 */ slti $v0, $v0, 0x32 -/* BCD8CC 8024086C 10400007 */ beqz $v0, .L8024088C -/* BCD8D0 80240870 00000000 */ nop -/* BCD8D4 80240874 3C014387 */ lui $at, 0x4387 -/* BCD8D8 80240878 44810000 */ mtc1 $at, $f0 -/* BCD8DC 8024087C 00000000 */ nop -/* BCD8E0 80240880 E6000038 */ swc1 $f0, 0x38($s0) -/* BCD8E4 80240884 08090229 */ j .L802408A4 -/* BCD8E8 80240888 E600000C */ swc1 $f0, 0xc($s0) -.L8024088C: -/* BCD8EC 8024088C 3C01C387 */ lui $at, 0xc387 -/* BCD8F0 80240890 44810000 */ mtc1 $at, $f0 -/* BCD8F4 80240894 3C0142B4 */ lui $at, 0x42b4 -/* BCD8F8 80240898 44811000 */ mtc1 $at, $f2 -/* BCD8FC 8024089C E6000038 */ swc1 $f0, 0x38($s0) -/* BCD900 802408A0 E602000C */ swc1 $f2, 0xc($s0) -.L802408A4: -/* BCD904 802408A4 24020001 */ addiu $v0, $zero, 1 -/* BCD908 802408A8 08090247 */ j .L8024091C -/* BCD90C 802408AC AE220074 */ sw $v0, 0x74($s1) -.L802408B0: -/* BCD910 802408B0 9602008E */ lhu $v0, 0x8e($s0) -/* BCD914 802408B4 2442FFFF */ addiu $v0, $v0, -1 -/* BCD918 802408B8 A602008E */ sh $v0, 0x8e($s0) -/* BCD91C 802408BC 00021400 */ sll $v0, $v0, 0x10 -/* BCD920 802408C0 14400016 */ bnez $v0, .L8024091C -/* BCD924 802408C4 24020002 */ addiu $v0, $zero, 2 -/* BCD928 802408C8 08090247 */ j .L8024091C -/* BCD92C 802408CC AE220074 */ sw $v0, 0x74($s1) -.L802408D0: -/* BCD930 802408D0 8E050018 */ lw $a1, 0x18($s0) -/* BCD934 802408D4 8E06000C */ lw $a2, 0xc($s0) -/* BCD938 802408D8 0C00EA95 */ jal npc_move_heading -/* BCD93C 802408DC 0200202D */ daddu $a0, $s0, $zero -/* BCD940 802408E0 C6020038 */ lwc1 $f2, 0x38($s0) -/* BCD944 802408E4 3C01C38C */ lui $at, 0xc38c -/* BCD948 802408E8 44810000 */ mtc1 $at, $f0 -/* BCD94C 802408EC 00000000 */ nop -/* BCD950 802408F0 4600103C */ c.lt.s $f2, $f0 -/* BCD954 802408F4 00000000 */ nop -/* BCD958 802408F8 45030008 */ bc1tl .L8024091C -/* BCD95C 802408FC AE200074 */ sw $zero, 0x74($s1) -/* BCD960 80240900 3C01438C */ lui $at, 0x438c -/* BCD964 80240904 44810000 */ mtc1 $at, $f0 -/* BCD968 80240908 00000000 */ nop -/* BCD96C 8024090C 4602003C */ c.lt.s $f0, $f2 -/* BCD970 80240910 00000000 */ nop -/* BCD974 80240914 45030001 */ bc1tl .L8024091C -/* BCD978 80240918 AE200074 */ sw $zero, 0x74($s1) -.L8024091C: -/* BCD97C 8024091C 8FBF0018 */ lw $ra, 0x18($sp) -/* BCD980 80240920 8FB10014 */ lw $s1, 0x14($sp) -/* BCD984 80240924 8FB00010 */ lw $s0, 0x10($sp) -/* BCD988 80240928 24020002 */ addiu $v0, $zero, 2 -/* BCD98C 8024092C 03E00008 */ jr $ra -/* BCD990 80240930 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s new file mode 100644 index 0000000000..4a4ca3f193 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_05/BCD7D0/func_802407AC_BCD80C.s @@ -0,0 +1,109 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407AC_BCD80C +/* BCD80C 802407AC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BCD810 802407B0 AFB10014 */ sw $s1, 0x14($sp) +/* BCD814 802407B4 0080882D */ daddu $s1, $a0, $zero +/* BCD818 802407B8 AFBF0018 */ sw $ra, 0x18($sp) +/* BCD81C 802407BC AFB00010 */ sw $s0, 0x10($sp) +/* BCD820 802407C0 0C00EAD2 */ jal get_npc_safe +/* BCD824 802407C4 8E24014C */ lw $a0, 0x14c($s1) +/* BCD828 802407C8 0040802D */ daddu $s0, $v0, $zero +/* BCD82C 802407CC 8E230074 */ lw $v1, 0x74($s1) +/* BCD830 802407D0 24020001 */ addiu $v0, $zero, 1 +/* BCD834 802407D4 10620036 */ beq $v1, $v0, .L802408B0 +/* BCD838 802407D8 28620002 */ slti $v0, $v1, 2 +/* BCD83C 802407DC 10400005 */ beqz $v0, .L802407F4 +/* BCD840 802407E0 24020002 */ addiu $v0, $zero, 2 +/* BCD844 802407E4 10600007 */ beqz $v1, .L80240804 +/* BCD848 802407E8 00000000 */ nop +/* BCD84C 802407EC 08090247 */ j .L8024091C +/* BCD850 802407F0 00000000 */ nop +.L802407F4: +/* BCD854 802407F4 10620036 */ beq $v1, $v0, .L802408D0 +/* BCD858 802407F8 00000000 */ nop +/* BCD85C 802407FC 08090247 */ j .L8024091C +/* BCD860 80240800 00000000 */ nop +.L80240804: +/* BCD864 80240804 0C00A67F */ jal rand_int +/* BCD868 80240808 240400B4 */ addiu $a0, $zero, 0xb4 +/* BCD86C 8024080C 24040032 */ addiu $a0, $zero, 0x32 +/* BCD870 80240810 3C01C3D7 */ lui $at, 0xc3d7 +/* BCD874 80240814 44810000 */ mtc1 $at, $f0 +/* BCD878 80240818 2442001E */ addiu $v0, $v0, 0x1e +/* BCD87C 8024081C A602008E */ sh $v0, 0x8e($s0) +/* BCD880 80240820 0C00A67F */ jal rand_int +/* BCD884 80240824 E6000040 */ swc1 $f0, 0x40($s0) +/* BCD888 80240828 3C014220 */ lui $at, 0x4220 +/* BCD88C 8024082C 44811000 */ mtc1 $at, $f2 +/* BCD890 80240830 44820000 */ mtc1 $v0, $f0 +/* BCD894 80240834 00000000 */ nop +/* BCD898 80240838 46800020 */ cvt.s.w $f0, $f0 +/* BCD89C 8024083C 46020000 */ add.s $f0, $f0, $f2 +/* BCD8A0 80240840 0C00A64D */ jal func_80029934 +/* BCD8A4 80240844 E600003C */ swc1 $f0, 0x3c($s0) +/* BCD8A8 80240848 46000000 */ add.s $f0, $f0, $f0 +/* BCD8AC 8024084C 3C014000 */ lui $at, 0x4000 +/* BCD8B0 80240850 44811000 */ mtc1 $at, $f2 +/* BCD8B4 80240854 00000000 */ nop +/* BCD8B8 80240858 46020000 */ add.s $f0, $f0, $f2 +/* BCD8BC 8024085C 24040064 */ addiu $a0, $zero, 0x64 +/* BCD8C0 80240860 0C00A67F */ jal rand_int +/* BCD8C4 80240864 E6000018 */ swc1 $f0, 0x18($s0) +/* BCD8C8 80240868 28420032 */ slti $v0, $v0, 0x32 +/* BCD8CC 8024086C 10400007 */ beqz $v0, .L8024088C +/* BCD8D0 80240870 00000000 */ nop +/* BCD8D4 80240874 3C014387 */ lui $at, 0x4387 +/* BCD8D8 80240878 44810000 */ mtc1 $at, $f0 +/* BCD8DC 8024087C 00000000 */ nop +/* BCD8E0 80240880 E6000038 */ swc1 $f0, 0x38($s0) +/* BCD8E4 80240884 08090229 */ j .L802408A4 +/* BCD8E8 80240888 E600000C */ swc1 $f0, 0xc($s0) +.L8024088C: +/* BCD8EC 8024088C 3C01C387 */ lui $at, 0xc387 +/* BCD8F0 80240890 44810000 */ mtc1 $at, $f0 +/* BCD8F4 80240894 3C0142B4 */ lui $at, 0x42b4 +/* BCD8F8 80240898 44811000 */ mtc1 $at, $f2 +/* BCD8FC 8024089C E6000038 */ swc1 $f0, 0x38($s0) +/* BCD900 802408A0 E602000C */ swc1 $f2, 0xc($s0) +.L802408A4: +/* BCD904 802408A4 24020001 */ addiu $v0, $zero, 1 +/* BCD908 802408A8 08090247 */ j .L8024091C +/* BCD90C 802408AC AE220074 */ sw $v0, 0x74($s1) +.L802408B0: +/* BCD910 802408B0 9602008E */ lhu $v0, 0x8e($s0) +/* BCD914 802408B4 2442FFFF */ addiu $v0, $v0, -1 +/* BCD918 802408B8 A602008E */ sh $v0, 0x8e($s0) +/* BCD91C 802408BC 00021400 */ sll $v0, $v0, 0x10 +/* BCD920 802408C0 14400016 */ bnez $v0, .L8024091C +/* BCD924 802408C4 24020002 */ addiu $v0, $zero, 2 +/* BCD928 802408C8 08090247 */ j .L8024091C +/* BCD92C 802408CC AE220074 */ sw $v0, 0x74($s1) +.L802408D0: +/* BCD930 802408D0 8E050018 */ lw $a1, 0x18($s0) +/* BCD934 802408D4 8E06000C */ lw $a2, 0xc($s0) +/* BCD938 802408D8 0C00EA95 */ jal npc_move_heading +/* BCD93C 802408DC 0200202D */ daddu $a0, $s0, $zero +/* BCD940 802408E0 C6020038 */ lwc1 $f2, 0x38($s0) +/* BCD944 802408E4 3C01C38C */ lui $at, 0xc38c +/* BCD948 802408E8 44810000 */ mtc1 $at, $f0 +/* BCD94C 802408EC 00000000 */ nop +/* BCD950 802408F0 4600103C */ c.lt.s $f2, $f0 +/* BCD954 802408F4 00000000 */ nop +/* BCD958 802408F8 45030008 */ bc1tl .L8024091C +/* BCD95C 802408FC AE200074 */ sw $zero, 0x74($s1) +/* BCD960 80240900 3C01438C */ lui $at, 0x438c +/* BCD964 80240904 44810000 */ mtc1 $at, $f0 +/* BCD968 80240908 00000000 */ nop +/* BCD96C 8024090C 4602003C */ c.lt.s $f0, $f2 +/* BCD970 80240910 00000000 */ nop +/* BCD974 80240914 45030001 */ bc1tl .L8024091C +/* BCD978 80240918 AE200074 */ sw $zero, 0x74($s1) +.L8024091C: +/* BCD97C 8024091C 8FBF0018 */ lw $ra, 0x18($sp) +/* BCD980 80240920 8FB10014 */ lw $s1, 0x14($sp) +/* BCD984 80240924 8FB00010 */ lw $s0, 0x10($sp) +/* BCD988 80240928 24020002 */ addiu $v0, $zero, 2 +/* BCD98C 8024092C 03E00008 */ jr $ra +/* BCD990 80240930 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC.s b/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC.s deleted file mode 100644 index 3ebec29d98..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402CC -/* BCEEBC 802402CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BCEEC0 802402D0 AFB10014 */ sw $s1, 0x14($sp) -/* BCEEC4 802402D4 0080882D */ daddu $s1, $a0, $zero -/* BCEEC8 802402D8 AFBF0018 */ sw $ra, 0x18($sp) -/* BCEECC 802402DC AFB00010 */ sw $s0, 0x10($sp) -/* BCEED0 802402E0 0C00EAD2 */ jal get_npc_safe -/* BCEED4 802402E4 8E24014C */ lw $a0, 0x14c($s1) -/* BCEED8 802402E8 0040802D */ daddu $s0, $v0, $zero -/* BCEEDC 802402EC 8E230074 */ lw $v1, 0x74($s1) -/* BCEEE0 802402F0 24020001 */ addiu $v0, $zero, 1 -/* BCEEE4 802402F4 10620036 */ beq $v1, $v0, .L802403D0 -/* BCEEE8 802402F8 28620002 */ slti $v0, $v1, 2 -/* BCEEEC 802402FC 10400005 */ beqz $v0, .L80240314 -/* BCEEF0 80240300 24020002 */ addiu $v0, $zero, 2 -/* BCEEF4 80240304 10600007 */ beqz $v1, .L80240324 -/* BCEEF8 80240308 00000000 */ nop -/* BCEEFC 8024030C 0809010F */ j .L8024043C -/* BCEF00 80240310 00000000 */ nop -.L80240314: -/* BCEF04 80240314 10620036 */ beq $v1, $v0, .L802403F0 -/* BCEF08 80240318 00000000 */ nop -/* BCEF0C 8024031C 0809010F */ j .L8024043C -/* BCEF10 80240320 00000000 */ nop -.L80240324: -/* BCEF14 80240324 0C00A67F */ jal rand_int -/* BCEF18 80240328 240400B4 */ addiu $a0, $zero, 0xb4 -/* BCEF1C 8024032C 24040032 */ addiu $a0, $zero, 0x32 -/* BCEF20 80240330 3C01C396 */ lui $at, 0xc396 -/* BCEF24 80240334 44810000 */ mtc1 $at, $f0 -/* BCEF28 80240338 2442001E */ addiu $v0, $v0, 0x1e -/* BCEF2C 8024033C A602008E */ sh $v0, 0x8e($s0) -/* BCEF30 80240340 0C00A67F */ jal rand_int -/* BCEF34 80240344 E6000040 */ swc1 $f0, 0x40($s0) -/* BCEF38 80240348 3C0142A0 */ lui $at, 0x42a0 -/* BCEF3C 8024034C 44811000 */ mtc1 $at, $f2 -/* BCEF40 80240350 44820000 */ mtc1 $v0, $f0 -/* BCEF44 80240354 00000000 */ nop -/* BCEF48 80240358 46800020 */ cvt.s.w $f0, $f0 -/* BCEF4C 8024035C 46020000 */ add.s $f0, $f0, $f2 -/* BCEF50 80240360 0C00A64D */ jal func_80029934 -/* BCEF54 80240364 E600003C */ swc1 $f0, 0x3c($s0) -/* BCEF58 80240368 46000000 */ add.s $f0, $f0, $f0 -/* BCEF5C 8024036C 3C014000 */ lui $at, 0x4000 -/* BCEF60 80240370 44811000 */ mtc1 $at, $f2 -/* BCEF64 80240374 00000000 */ nop -/* BCEF68 80240378 46020000 */ add.s $f0, $f0, $f2 -/* BCEF6C 8024037C 24040064 */ addiu $a0, $zero, 0x64 -/* BCEF70 80240380 0C00A67F */ jal rand_int -/* BCEF74 80240384 E6000018 */ swc1 $f0, 0x18($s0) -/* BCEF78 80240388 28420032 */ slti $v0, $v0, 0x32 -/* BCEF7C 8024038C 10400007 */ beqz $v0, .L802403AC -/* BCEF80 80240390 00000000 */ nop -/* BCEF84 80240394 3C014387 */ lui $at, 0x4387 -/* BCEF88 80240398 44810000 */ mtc1 $at, $f0 -/* BCEF8C 8024039C 00000000 */ nop -/* BCEF90 802403A0 E6000038 */ swc1 $f0, 0x38($s0) -/* BCEF94 802403A4 080900F1 */ j .L802403C4 -/* BCEF98 802403A8 E600000C */ swc1 $f0, 0xc($s0) -.L802403AC: -/* BCEF9C 802403AC 3C01C387 */ lui $at, 0xc387 -/* BCEFA0 802403B0 44810000 */ mtc1 $at, $f0 -/* BCEFA4 802403B4 3C0142B4 */ lui $at, 0x42b4 -/* BCEFA8 802403B8 44811000 */ mtc1 $at, $f2 -/* BCEFAC 802403BC E6000038 */ swc1 $f0, 0x38($s0) -/* BCEFB0 802403C0 E602000C */ swc1 $f2, 0xc($s0) -.L802403C4: -/* BCEFB4 802403C4 24020001 */ addiu $v0, $zero, 1 -/* BCEFB8 802403C8 0809010F */ j .L8024043C -/* BCEFBC 802403CC AE220074 */ sw $v0, 0x74($s1) -.L802403D0: -/* BCEFC0 802403D0 9602008E */ lhu $v0, 0x8e($s0) -/* BCEFC4 802403D4 2442FFFF */ addiu $v0, $v0, -1 -/* BCEFC8 802403D8 A602008E */ sh $v0, 0x8e($s0) -/* BCEFCC 802403DC 00021400 */ sll $v0, $v0, 0x10 -/* BCEFD0 802403E0 14400016 */ bnez $v0, .L8024043C -/* BCEFD4 802403E4 24020002 */ addiu $v0, $zero, 2 -/* BCEFD8 802403E8 0809010F */ j .L8024043C -/* BCEFDC 802403EC AE220074 */ sw $v0, 0x74($s1) -.L802403F0: -/* BCEFE0 802403F0 8E050018 */ lw $a1, 0x18($s0) -/* BCEFE4 802403F4 8E06000C */ lw $a2, 0xc($s0) -/* BCEFE8 802403F8 0C00EA95 */ jal npc_move_heading -/* BCEFEC 802403FC 0200202D */ daddu $a0, $s0, $zero -/* BCEFF0 80240400 C6020038 */ lwc1 $f2, 0x38($s0) -/* BCEFF4 80240404 3C01C38C */ lui $at, 0xc38c -/* BCEFF8 80240408 44810000 */ mtc1 $at, $f0 -/* BCEFFC 8024040C 00000000 */ nop -/* BCF000 80240410 4600103C */ c.lt.s $f2, $f0 -/* BCF004 80240414 00000000 */ nop -/* BCF008 80240418 45030008 */ bc1tl .L8024043C -/* BCF00C 8024041C AE200074 */ sw $zero, 0x74($s1) -/* BCF010 80240420 3C01438C */ lui $at, 0x438c -/* BCF014 80240424 44810000 */ mtc1 $at, $f0 -/* BCF018 80240428 00000000 */ nop -/* BCF01C 8024042C 4602003C */ c.lt.s $f0, $f2 -/* BCF020 80240430 00000000 */ nop -/* BCF024 80240434 45030001 */ bc1tl .L8024043C -/* BCF028 80240438 AE200074 */ sw $zero, 0x74($s1) -.L8024043C: -/* BCF02C 8024043C 8FBF0018 */ lw $ra, 0x18($sp) -/* BCF030 80240440 8FB10014 */ lw $s1, 0x14($sp) -/* BCF034 80240444 8FB00010 */ lw $s0, 0x10($sp) -/* BCF038 80240448 24020002 */ addiu $v0, $zero, 2 -/* BCF03C 8024044C 03E00008 */ jr $ra -/* BCF040 80240450 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s b/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s new file mode 100644 index 0000000000..fabf9c35f9 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCEEB0/func_802402CC_BCEEBC.s @@ -0,0 +1,109 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402CC_BCEEBC +/* BCEEBC 802402CC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BCEEC0 802402D0 AFB10014 */ sw $s1, 0x14($sp) +/* BCEEC4 802402D4 0080882D */ daddu $s1, $a0, $zero +/* BCEEC8 802402D8 AFBF0018 */ sw $ra, 0x18($sp) +/* BCEECC 802402DC AFB00010 */ sw $s0, 0x10($sp) +/* BCEED0 802402E0 0C00EAD2 */ jal get_npc_safe +/* BCEED4 802402E4 8E24014C */ lw $a0, 0x14c($s1) +/* BCEED8 802402E8 0040802D */ daddu $s0, $v0, $zero +/* BCEEDC 802402EC 8E230074 */ lw $v1, 0x74($s1) +/* BCEEE0 802402F0 24020001 */ addiu $v0, $zero, 1 +/* BCEEE4 802402F4 10620036 */ beq $v1, $v0, .L802403D0 +/* BCEEE8 802402F8 28620002 */ slti $v0, $v1, 2 +/* BCEEEC 802402FC 10400005 */ beqz $v0, .L80240314 +/* BCEEF0 80240300 24020002 */ addiu $v0, $zero, 2 +/* BCEEF4 80240304 10600007 */ beqz $v1, .L80240324 +/* BCEEF8 80240308 00000000 */ nop +/* BCEEFC 8024030C 0809010F */ j .L8024043C +/* BCEF00 80240310 00000000 */ nop +.L80240314: +/* BCEF04 80240314 10620036 */ beq $v1, $v0, .L802403F0 +/* BCEF08 80240318 00000000 */ nop +/* BCEF0C 8024031C 0809010F */ j .L8024043C +/* BCEF10 80240320 00000000 */ nop +.L80240324: +/* BCEF14 80240324 0C00A67F */ jal rand_int +/* BCEF18 80240328 240400B4 */ addiu $a0, $zero, 0xb4 +/* BCEF1C 8024032C 24040032 */ addiu $a0, $zero, 0x32 +/* BCEF20 80240330 3C01C396 */ lui $at, 0xc396 +/* BCEF24 80240334 44810000 */ mtc1 $at, $f0 +/* BCEF28 80240338 2442001E */ addiu $v0, $v0, 0x1e +/* BCEF2C 8024033C A602008E */ sh $v0, 0x8e($s0) +/* BCEF30 80240340 0C00A67F */ jal rand_int +/* BCEF34 80240344 E6000040 */ swc1 $f0, 0x40($s0) +/* BCEF38 80240348 3C0142A0 */ lui $at, 0x42a0 +/* BCEF3C 8024034C 44811000 */ mtc1 $at, $f2 +/* BCEF40 80240350 44820000 */ mtc1 $v0, $f0 +/* BCEF44 80240354 00000000 */ nop +/* BCEF48 80240358 46800020 */ cvt.s.w $f0, $f0 +/* BCEF4C 8024035C 46020000 */ add.s $f0, $f0, $f2 +/* BCEF50 80240360 0C00A64D */ jal func_80029934 +/* BCEF54 80240364 E600003C */ swc1 $f0, 0x3c($s0) +/* BCEF58 80240368 46000000 */ add.s $f0, $f0, $f0 +/* BCEF5C 8024036C 3C014000 */ lui $at, 0x4000 +/* BCEF60 80240370 44811000 */ mtc1 $at, $f2 +/* BCEF64 80240374 00000000 */ nop +/* BCEF68 80240378 46020000 */ add.s $f0, $f0, $f2 +/* BCEF6C 8024037C 24040064 */ addiu $a0, $zero, 0x64 +/* BCEF70 80240380 0C00A67F */ jal rand_int +/* BCEF74 80240384 E6000018 */ swc1 $f0, 0x18($s0) +/* BCEF78 80240388 28420032 */ slti $v0, $v0, 0x32 +/* BCEF7C 8024038C 10400007 */ beqz $v0, .L802403AC +/* BCEF80 80240390 00000000 */ nop +/* BCEF84 80240394 3C014387 */ lui $at, 0x4387 +/* BCEF88 80240398 44810000 */ mtc1 $at, $f0 +/* BCEF8C 8024039C 00000000 */ nop +/* BCEF90 802403A0 E6000038 */ swc1 $f0, 0x38($s0) +/* BCEF94 802403A4 080900F1 */ j .L802403C4 +/* BCEF98 802403A8 E600000C */ swc1 $f0, 0xc($s0) +.L802403AC: +/* BCEF9C 802403AC 3C01C387 */ lui $at, 0xc387 +/* BCEFA0 802403B0 44810000 */ mtc1 $at, $f0 +/* BCEFA4 802403B4 3C0142B4 */ lui $at, 0x42b4 +/* BCEFA8 802403B8 44811000 */ mtc1 $at, $f2 +/* BCEFAC 802403BC E6000038 */ swc1 $f0, 0x38($s0) +/* BCEFB0 802403C0 E602000C */ swc1 $f2, 0xc($s0) +.L802403C4: +/* BCEFB4 802403C4 24020001 */ addiu $v0, $zero, 1 +/* BCEFB8 802403C8 0809010F */ j .L8024043C +/* BCEFBC 802403CC AE220074 */ sw $v0, 0x74($s1) +.L802403D0: +/* BCEFC0 802403D0 9602008E */ lhu $v0, 0x8e($s0) +/* BCEFC4 802403D4 2442FFFF */ addiu $v0, $v0, -1 +/* BCEFC8 802403D8 A602008E */ sh $v0, 0x8e($s0) +/* BCEFCC 802403DC 00021400 */ sll $v0, $v0, 0x10 +/* BCEFD0 802403E0 14400016 */ bnez $v0, .L8024043C +/* BCEFD4 802403E4 24020002 */ addiu $v0, $zero, 2 +/* BCEFD8 802403E8 0809010F */ j .L8024043C +/* BCEFDC 802403EC AE220074 */ sw $v0, 0x74($s1) +.L802403F0: +/* BCEFE0 802403F0 8E050018 */ lw $a1, 0x18($s0) +/* BCEFE4 802403F4 8E06000C */ lw $a2, 0xc($s0) +/* BCEFE8 802403F8 0C00EA95 */ jal npc_move_heading +/* BCEFEC 802403FC 0200202D */ daddu $a0, $s0, $zero +/* BCEFF0 80240400 C6020038 */ lwc1 $f2, 0x38($s0) +/* BCEFF4 80240404 3C01C38C */ lui $at, 0xc38c +/* BCEFF8 80240408 44810000 */ mtc1 $at, $f0 +/* BCEFFC 8024040C 00000000 */ nop +/* BCF000 80240410 4600103C */ c.lt.s $f2, $f0 +/* BCF004 80240414 00000000 */ nop +/* BCF008 80240418 45030008 */ bc1tl .L8024043C +/* BCF00C 8024041C AE200074 */ sw $zero, 0x74($s1) +/* BCF010 80240420 3C01438C */ lui $at, 0x438c +/* BCF014 80240424 44810000 */ mtc1 $at, $f0 +/* BCF018 80240428 00000000 */ nop +/* BCF01C 8024042C 4602003C */ c.lt.s $f0, $f2 +/* BCF020 80240430 00000000 */ nop +/* BCF024 80240434 45030001 */ bc1tl .L8024043C +/* BCF028 80240438 AE200074 */ sw $zero, 0x74($s1) +.L8024043C: +/* BCF02C 8024043C 8FBF0018 */ lw $ra, 0x18($sp) +/* BCF030 80240440 8FB10014 */ lw $s1, 0x14($sp) +/* BCF034 80240444 8FB00010 */ lw $s0, 0x10($sp) +/* BCF038 80240448 24020002 */ addiu $v0, $zero, 2 +/* BCF03C 8024044C 03E00008 */ jr $ra +/* BCF040 80240450 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s index 400f0ecc97..45506e9282 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240564_BCF154.s @@ -15,7 +15,7 @@ glabel func_80240564_BCF154 /* BCF17C 8024058C AFB10044 */ sw $s1, 0x44($sp) /* BCF180 80240590 AFB00040 */ sw $s0, 0x40($sp) /* BCF184 80240594 AFA40068 */ sw $a0, 0x68($sp) -/* BCF188 80240598 0C090150 */ jal func_80240540 +/* BCF188 80240598 0C090150 */ jal func_80240540_BCF130 /* BCF18C 8024059C AFA5006C */ sw $a1, 0x6c($sp) /* BCF190 802405A0 8FAB0068 */ lw $t3, 0x68($sp) /* BCF194 802405A4 0040A82D */ daddu $s5, $v0, $zero diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10.s deleted file mode 100644 index b4d18554d1..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A10 -/* BCF600 80240A10 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BCF604 80240A14 AFB10014 */ sw $s1, 0x14($sp) -/* BCF608 80240A18 0080882D */ daddu $s1, $a0, $zero -/* BCF60C 80240A1C AFB20018 */ sw $s2, 0x18($sp) -/* BCF610 80240A20 00A0902D */ daddu $s2, $a1, $zero -/* BCF614 80240A24 AFB3001C */ sw $s3, 0x1c($sp) -/* BCF618 80240A28 00C0982D */ daddu $s3, $a2, $zero -/* BCF61C 80240A2C AFB00010 */ sw $s0, 0x10($sp) -/* BCF620 80240A30 AFBF0020 */ sw $ra, 0x20($sp) -/* BCF624 80240A34 0C090150 */ jal func_80240540 -/* BCF628 80240A38 00E0802D */ daddu $s0, $a3, $zero -/* BCF62C 80240A3C 0220202D */ daddu $a0, $s1, $zero -/* BCF630 80240A40 0240282D */ daddu $a1, $s2, $zero -/* BCF634 80240A44 0260302D */ daddu $a2, $s3, $zero -/* BCF638 80240A48 0C090159 */ jal func_80240564_BCF154 -/* BCF63C 80240A4C AC500000 */ sw $s0, ($v0) -/* BCF640 80240A50 8FBF0020 */ lw $ra, 0x20($sp) -/* BCF644 80240A54 8FB3001C */ lw $s3, 0x1c($sp) -/* BCF648 80240A58 8FB20018 */ lw $s2, 0x18($sp) -/* BCF64C 80240A5C 8FB10014 */ lw $s1, 0x14($sp) -/* BCF650 80240A60 8FB00010 */ lw $s0, 0x10($sp) -/* BCF654 80240A64 03E00008 */ jr $ra -/* BCF658 80240A68 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10_BCF600.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10_BCF600.s new file mode 100644 index 0000000000..8e87a3a82b --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A10_BCF600.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A10_BCF600 +/* BCF600 80240A10 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* BCF604 80240A14 AFB10014 */ sw $s1, 0x14($sp) +/* BCF608 80240A18 0080882D */ daddu $s1, $a0, $zero +/* BCF60C 80240A1C AFB20018 */ sw $s2, 0x18($sp) +/* BCF610 80240A20 00A0902D */ daddu $s2, $a1, $zero +/* BCF614 80240A24 AFB3001C */ sw $s3, 0x1c($sp) +/* BCF618 80240A28 00C0982D */ daddu $s3, $a2, $zero +/* BCF61C 80240A2C AFB00010 */ sw $s0, 0x10($sp) +/* BCF620 80240A30 AFBF0020 */ sw $ra, 0x20($sp) +/* BCF624 80240A34 0C090150 */ jal func_80240540_BCF130 +/* BCF628 80240A38 00E0802D */ daddu $s0, $a3, $zero +/* BCF62C 80240A3C 0220202D */ daddu $a0, $s1, $zero +/* BCF630 80240A40 0240282D */ daddu $a1, $s2, $zero +/* BCF634 80240A44 0260302D */ daddu $a2, $s3, $zero +/* BCF638 80240A48 0C090159 */ jal func_80240564_BCF154 +/* BCF63C 80240A4C AC500000 */ sw $s0, ($v0) +/* BCF640 80240A50 8FBF0020 */ lw $ra, 0x20($sp) +/* BCF644 80240A54 8FB3001C */ lw $s3, 0x1c($sp) +/* BCF648 80240A58 8FB20018 */ lw $s2, 0x18($sp) +/* BCF64C 80240A5C 8FB10014 */ lw $s1, 0x14($sp) +/* BCF650 80240A60 8FB00010 */ lw $s0, 0x10($sp) +/* BCF654 80240A64 03E00008 */ jr $ra +/* BCF658 80240A68 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s index 7b570bc322..d5b4632042 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240A6C_BCF65C.s @@ -7,7 +7,7 @@ glabel func_80240A6C_BCF65C /* BCF664 80240A74 AFB20018 */ sw $s2, 0x18($sp) /* BCF668 80240A78 AFB10014 */ sw $s1, 0x14($sp) /* BCF66C 80240A7C AFB00010 */ sw $s0, 0x10($sp) -/* BCF670 80240A80 0C090150 */ jal func_80240540 +/* BCF670 80240A80 0C090150 */ jal func_80240540_BCF130 /* BCF674 80240A84 F7B40020 */ sdc1 $f20, 0x20($sp) /* BCF678 80240A88 0040882D */ daddu $s1, $v0, $zero /* BCF67C 80240A8C 8E2301C0 */ lw $v1, 0x1c0($s1) diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240EF8_BCFAE8.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240EF8_BCFAE8.s index 6d39c4feca..9b8fd1865d 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240EF8_BCFAE8.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80240EF8_BCFAE8.s @@ -7,7 +7,7 @@ glabel func_80240EF8_BCFAE8 /* BCFAF0 80240F00 AFBF0018 */ sw $ra, 0x18($sp) /* BCFAF4 80240F04 AFB00010 */ sw $s0, 0x10($sp) /* BCFAF8 80240F08 F7B40020 */ sdc1 $f20, 0x20($sp) -/* BCFAFC 80240F0C 0C090150 */ jal func_80240540 +/* BCFAFC 80240F0C 0C090150 */ jal func_80240540_BCF130 /* BCFB00 80240F10 0080882D */ daddu $s1, $a0, $zero /* BCFB04 80240F14 3C041062 */ lui $a0, 0x1062 /* BCFB08 80240F18 8E230084 */ lw $v1, 0x84($s1) diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0.s deleted file mode 100644 index abd1b54caf..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410C0 -/* BCFCB0 802410C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BCFCB4 802410C4 AFBF0020 */ sw $ra, 0x20($sp) -/* BCFCB8 802410C8 AFB1001C */ sw $s1, 0x1c($sp) -/* BCFCBC 802410CC 0C090150 */ jal func_80240540 -/* BCFCC0 802410D0 AFB00018 */ sw $s0, 0x18($sp) -/* BCFCC4 802410D4 0040882D */ daddu $s1, $v0, $zero -/* BCFCC8 802410D8 0C0511EA */ jal draw_icon_0 -/* BCFCCC 802410DC 8E24003C */ lw $a0, 0x3c($s1) -/* BCFCD0 802410E0 8E300040 */ lw $s0, 0x40($s1) -/* BCFCD4 802410E4 0C0511EA */ jal draw_icon_0 -/* BCFCD8 802410E8 0200202D */ daddu $a0, $s0, $zero -/* BCFCDC 802410EC 0200202D */ daddu $a0, $s0, $zero -/* BCFCE0 802410F0 27A50010 */ addiu $a1, $sp, 0x10 -/* BCFCE4 802410F4 0C05126B */ jal get_icon_render_pos -/* BCFCE8 802410F8 27A60014 */ addiu $a2, $sp, 0x14 -/* BCFCEC 802410FC 8FA40010 */ lw $a0, 0x10($sp) -/* BCFCF0 80241100 8FA50014 */ lw $a1, 0x14($sp) -/* BCFCF4 80241104 8E260004 */ lw $a2, 4($s1) -/* BCFCF8 80241108 0C090284 */ jal func_80240A10 -/* BCFCFC 8024110C 24070002 */ addiu $a3, $zero, 2 -/* BCFD00 80241110 8E240044 */ lw $a0, 0x44($s1) -/* BCFD04 80241114 0C0511EA */ jal draw_icon_0 -/* BCFD08 80241118 00000000 */ nop -/* BCFD0C 8024111C 8FBF0020 */ lw $ra, 0x20($sp) -/* BCFD10 80241120 8FB1001C */ lw $s1, 0x1c($sp) -/* BCFD14 80241124 8FB00018 */ lw $s0, 0x18($sp) -/* BCFD18 80241128 03E00008 */ jr $ra -/* BCFD1C 8024112C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s new file mode 100644 index 0000000000..a882a46234 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802410C0_BCFCB0.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410C0_BCFCB0 +/* BCFCB0 802410C0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* BCFCB4 802410C4 AFBF0020 */ sw $ra, 0x20($sp) +/* BCFCB8 802410C8 AFB1001C */ sw $s1, 0x1c($sp) +/* BCFCBC 802410CC 0C090150 */ jal func_80240540_BCF130 +/* BCFCC0 802410D0 AFB00018 */ sw $s0, 0x18($sp) +/* BCFCC4 802410D4 0040882D */ daddu $s1, $v0, $zero +/* BCFCC8 802410D8 0C0511EA */ jal draw_icon_0 +/* BCFCCC 802410DC 8E24003C */ lw $a0, 0x3c($s1) +/* BCFCD0 802410E0 8E300040 */ lw $s0, 0x40($s1) +/* BCFCD4 802410E4 0C0511EA */ jal draw_icon_0 +/* BCFCD8 802410E8 0200202D */ daddu $a0, $s0, $zero +/* BCFCDC 802410EC 0200202D */ daddu $a0, $s0, $zero +/* BCFCE0 802410F0 27A50010 */ addiu $a1, $sp, 0x10 +/* BCFCE4 802410F4 0C05126B */ jal get_icon_render_pos +/* BCFCE8 802410F8 27A60014 */ addiu $a2, $sp, 0x14 +/* BCFCEC 802410FC 8FA40010 */ lw $a0, 0x10($sp) +/* BCFCF0 80241100 8FA50014 */ lw $a1, 0x14($sp) +/* BCFCF4 80241104 8E260004 */ lw $a2, 4($s1) +/* BCFCF8 80241108 0C090284 */ jal func_80240A10_BCF600 +/* BCFCFC 8024110C 24070002 */ addiu $a3, $zero, 2 +/* BCFD00 80241110 8E240044 */ lw $a0, 0x44($s1) +/* BCFD04 80241114 0C0511EA */ jal draw_icon_0 +/* BCFD08 80241118 00000000 */ nop +/* BCFD0C 8024111C 8FBF0020 */ lw $ra, 0x20($sp) +/* BCFD10 80241120 8FB1001C */ lw $s1, 0x1c($sp) +/* BCFD14 80241124 8FB00018 */ lw $s0, 0x18($sp) +/* BCFD18 80241128 03E00008 */ jr $ra +/* BCFD1C 8024112C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s index 45e6a0755c..83d8198aba 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241168_BCFD58.s @@ -5,7 +5,7 @@ glabel func_80241168_BCFD58 /* BCFD58 80241168 27BDFFE0 */ addiu $sp, $sp, -0x20 /* BCFD5C 8024116C AFBF0018 */ sw $ra, 0x18($sp) /* BCFD60 80241170 AFB10014 */ sw $s1, 0x14($sp) -/* BCFD64 80241174 0C090150 */ jal func_80240540 +/* BCFD64 80241174 0C090150 */ jal func_80240540_BCF130 /* BCFD68 80241178 AFB00010 */ sw $s0, 0x10($sp) /* BCFD6C 8024117C 3C048024 */ lui $a0, 0x8024 /* BCFD70 80241180 24840A6C */ addiu $a0, $a0, 0xa6c diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358.s deleted file mode 100644 index 2a2c95fd6d..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241358 -/* BCFF48 80241358 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BCFF4C 8024135C AFBF0014 */ sw $ra, 0x14($sp) -/* BCFF50 80241360 0C090150 */ jal func_80240540 -/* BCFF54 80241364 AFB00010 */ sw $s0, 0x10($sp) -/* BCFF58 80241368 0000202D */ daddu $a0, $zero, $zero -/* BCFF5C 8024136C 3C05FD05 */ lui $a1, 0xfd05 -/* BCFF60 80241370 34A50F88 */ ori $a1, $a1, 0xf88 -/* BCFF64 80241374 0040802D */ daddu $s0, $v0, $zero -/* BCFF68 80241378 2402000A */ addiu $v0, $zero, 0xa -/* BCFF6C 8024137C 0C0B1EAF */ jal get_variable -/* BCFF70 80241380 AE020030 */ sw $v0, 0x30($s0) -/* BCFF74 80241384 0000202D */ daddu $a0, $zero, $zero -/* BCFF78 80241388 3C05FD05 */ lui $a1, 0xfd05 -/* BCFF7C 8024138C 34A50F89 */ ori $a1, $a1, 0xf89 -/* BCFF80 80241390 0C0B1EAF */ jal get_variable -/* BCFF84 80241394 AE02004C */ sw $v0, 0x4c($s0) -/* BCFF88 80241398 0000202D */ daddu $a0, $zero, $zero -/* BCFF8C 8024139C 3C05FD05 */ lui $a1, 0xfd05 -/* BCFF90 802413A0 34A50F8A */ ori $a1, $a1, 0xf8a -/* BCFF94 802413A4 0C0B1EAF */ jal get_variable -/* BCFF98 802413A8 AE020050 */ sw $v0, 0x50($s0) -/* BCFF9C 802413AC AE020054 */ sw $v0, 0x54($s0) -/* BCFFA0 802413B0 3C038016 */ lui $v1, 0x8016 -/* BCFFA4 802413B4 8C639B08 */ lw $v1, -0x64f8($v1) -/* BCFFA8 802413B8 AE03000C */ sw $v1, 0xc($s0) -/* BCFFAC 802413BC 8FBF0014 */ lw $ra, 0x14($sp) -/* BCFFB0 802413C0 8FB00010 */ lw $s0, 0x10($sp) -/* BCFFB4 802413C4 24020002 */ addiu $v0, $zero, 2 -/* BCFFB8 802413C8 03E00008 */ jr $ra -/* BCFFBC 802413CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358_BCFF48.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358_BCFF48.s new file mode 100644 index 0000000000..9837e1ef51 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241358_BCFF48.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241358_BCFF48 +/* BCFF48 80241358 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BCFF4C 8024135C AFBF0014 */ sw $ra, 0x14($sp) +/* BCFF50 80241360 0C090150 */ jal func_80240540_BCF130 +/* BCFF54 80241364 AFB00010 */ sw $s0, 0x10($sp) +/* BCFF58 80241368 0000202D */ daddu $a0, $zero, $zero +/* BCFF5C 8024136C 3C05FD05 */ lui $a1, 0xfd05 +/* BCFF60 80241370 34A50F88 */ ori $a1, $a1, 0xf88 +/* BCFF64 80241374 0040802D */ daddu $s0, $v0, $zero +/* BCFF68 80241378 2402000A */ addiu $v0, $zero, 0xa +/* BCFF6C 8024137C 0C0B1EAF */ jal get_variable +/* BCFF70 80241380 AE020030 */ sw $v0, 0x30($s0) +/* BCFF74 80241384 0000202D */ daddu $a0, $zero, $zero +/* BCFF78 80241388 3C05FD05 */ lui $a1, 0xfd05 +/* BCFF7C 8024138C 34A50F89 */ ori $a1, $a1, 0xf89 +/* BCFF80 80241390 0C0B1EAF */ jal get_variable +/* BCFF84 80241394 AE02004C */ sw $v0, 0x4c($s0) +/* BCFF88 80241398 0000202D */ daddu $a0, $zero, $zero +/* BCFF8C 8024139C 3C05FD05 */ lui $a1, 0xfd05 +/* BCFF90 802413A0 34A50F8A */ ori $a1, $a1, 0xf8a +/* BCFF94 802413A4 0C0B1EAF */ jal get_variable +/* BCFF98 802413A8 AE020050 */ sw $v0, 0x50($s0) +/* BCFF9C 802413AC AE020054 */ sw $v0, 0x54($s0) +/* BCFFA0 802413B0 3C038016 */ lui $v1, 0x8016 +/* BCFFA4 802413B4 8C639B08 */ lw $v1, -0x64f8($v1) +/* BCFFA8 802413B8 AE03000C */ sw $v1, 0xc($s0) +/* BCFFAC 802413BC 8FBF0014 */ lw $ra, 0x14($sp) +/* BCFFB0 802413C0 8FB00010 */ lw $s0, 0x10($sp) +/* BCFFB4 802413C4 24020002 */ addiu $v0, $zero, 2 +/* BCFFB8 802413C8 03E00008 */ jr $ra +/* BCFFBC 802413CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s index 9bbced4fe3..f7bffc0f22 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802413D0_BCFFC0.s @@ -4,7 +4,7 @@ glabel func_802413D0_BCFFC0 /* BCFFC0 802413D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BCFFC4 802413D4 AFBF0014 */ sw $ra, 0x14($sp) -/* BCFFC8 802413D8 0C090150 */ jal func_80240540 +/* BCFFC8 802413D8 0C090150 */ jal func_80240540_BCF130 /* BCFFCC 802413DC AFB00010 */ sw $s0, 0x10($sp) /* BCFFD0 802413E0 0040802D */ daddu $s0, $v0, $zero /* BCFFD4 802413E4 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024143C.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024143C.s deleted file mode 100644 index f974c8c587..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024143C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024143C -/* BD002C 8024143C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD0030 80241440 AFB00010 */ sw $s0, 0x10($sp) -/* BD0034 80241444 AFBF0014 */ sw $ra, 0x14($sp) -/* BD0038 80241448 0C090150 */ jal func_80240540 -/* BD003C 8024144C 0080802D */ daddu $s0, $a0, $zero -/* BD0040 80241450 24020096 */ addiu $v0, $zero, 0x96 -/* BD0044 80241454 AE020090 */ sw $v0, 0x90($s0) -/* BD0048 80241458 8FBF0014 */ lw $ra, 0x14($sp) -/* BD004C 8024145C 8FB00010 */ lw $s0, 0x10($sp) -/* BD0050 80241460 24020002 */ addiu $v0, $zero, 2 -/* BD0054 80241464 03E00008 */ jr $ra -/* BD0058 80241468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024143C_BD002C.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024143C_BD002C.s new file mode 100644 index 0000000000..be130d36d1 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024143C_BD002C.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024143C_BD002C +/* BD002C 8024143C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BD0030 80241440 AFB00010 */ sw $s0, 0x10($sp) +/* BD0034 80241444 AFBF0014 */ sw $ra, 0x14($sp) +/* BD0038 80241448 0C090150 */ jal func_80240540_BCF130 +/* BD003C 8024144C 0080802D */ daddu $s0, $a0, $zero +/* BD0040 80241450 24020096 */ addiu $v0, $zero, 0x96 +/* BD0044 80241454 AE020090 */ sw $v0, 0x90($s0) +/* BD0048 80241458 8FBF0014 */ lw $ra, 0x14($sp) +/* BD004C 8024145C 8FB00010 */ lw $s0, 0x10($sp) +/* BD0050 80241460 24020002 */ addiu $v0, $zero, 2 +/* BD0054 80241464 03E00008 */ jr $ra +/* BD0058 80241468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024146C_BD005C.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024146C_BD005C.s index d6e5151f1b..fe4a2e6605 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024146C_BD005C.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024146C_BD005C.s @@ -6,7 +6,7 @@ glabel func_8024146C_BD005C /* BD0060 80241470 AFB10014 */ sw $s1, 0x14($sp) /* BD0064 80241474 0080882D */ daddu $s1, $a0, $zero /* BD0068 80241478 AFBF0018 */ sw $ra, 0x18($sp) -/* BD006C 8024147C 0C090150 */ jal func_80240540 +/* BD006C 8024147C 0C090150 */ jal func_80240540_BCF130 /* BD0070 80241480 AFB00010 */ sw $s0, 0x10($sp) /* BD0074 80241484 3C05FE36 */ lui $a1, 0xfe36 /* BD0078 80241488 34A53C82 */ ori $a1, $a1, 0x3c82 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802414B4_BD00A4.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802414B4_BD00A4.s index e3bbaab933..dc151a0301 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802414B4_BD00A4.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802414B4_BD00A4.s @@ -6,7 +6,7 @@ glabel func_802414B4_BD00A4 /* BD00A8 802414B8 AFB00010 */ sw $s0, 0x10($sp) /* BD00AC 802414BC 0080802D */ daddu $s0, $a0, $zero /* BD00B0 802414C0 AFBF0018 */ sw $ra, 0x18($sp) -/* BD00B4 802414C4 0C090150 */ jal func_80240540 +/* BD00B4 802414C4 0C090150 */ jal func_80240540_BCF130 /* BD00B8 802414C8 AFB10014 */ sw $s1, 0x14($sp) /* BD00BC 802414CC 0200202D */ daddu $a0, $s0, $zero /* BD00C0 802414D0 3C05FE36 */ lui $a1, 0xfe36 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518.s deleted file mode 100644 index a3be69f6c7..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241518 -/* BD0108 80241518 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD010C 8024151C AFB00010 */ sw $s0, 0x10($sp) -/* BD0110 80241520 0080802D */ daddu $s0, $a0, $zero -/* BD0114 80241524 AFBF0018 */ sw $ra, 0x18($sp) -/* BD0118 80241528 0C090150 */ jal func_80240540 -/* BD011C 8024152C AFB10014 */ sw $s1, 0x14($sp) -/* BD0120 80241530 0200202D */ daddu $a0, $s0, $zero -/* BD0124 80241534 3C05FE36 */ lui $a1, 0xfe36 -/* BD0128 80241538 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD012C 8024153C 0C0B210B */ jal get_float_variable -/* BD0130 80241540 0040882D */ daddu $s1, $v0, $zero -/* BD0134 80241544 0C00A6C9 */ jal clamp_angle -/* BD0138 80241548 46000306 */ mov.s $f12, $f0 -/* BD013C 8024154C 0200202D */ daddu $a0, $s0, $zero -/* BD0140 80241550 3C05FE36 */ lui $a1, 0xfe36 -/* BD0144 80241554 44060000 */ mfc1 $a2, $f0 -/* BD0148 80241558 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD014C 8024155C 0C0B2190 */ jal set_float_variable -/* BD0150 80241560 AE2601CC */ sw $a2, 0x1cc($s1) -/* BD0154 80241564 8FBF0018 */ lw $ra, 0x18($sp) -/* BD0158 80241568 8FB10014 */ lw $s1, 0x14($sp) -/* BD015C 8024156C 8FB00010 */ lw $s0, 0x10($sp) -/* BD0160 80241570 24020002 */ addiu $v0, $zero, 2 -/* BD0164 80241574 03E00008 */ jr $ra -/* BD0168 80241578 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518_BD0108.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518_BD0108.s new file mode 100644 index 0000000000..cbd3e9ebe7 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241518_BD0108.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241518_BD0108 +/* BD0108 80241518 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BD010C 8024151C AFB00010 */ sw $s0, 0x10($sp) +/* BD0110 80241520 0080802D */ daddu $s0, $a0, $zero +/* BD0114 80241524 AFBF0018 */ sw $ra, 0x18($sp) +/* BD0118 80241528 0C090150 */ jal func_80240540_BCF130 +/* BD011C 8024152C AFB10014 */ sw $s1, 0x14($sp) +/* BD0120 80241530 0200202D */ daddu $a0, $s0, $zero +/* BD0124 80241534 3C05FE36 */ lui $a1, 0xfe36 +/* BD0128 80241538 34A53C80 */ ori $a1, $a1, 0x3c80 +/* BD012C 8024153C 0C0B210B */ jal get_float_variable +/* BD0130 80241540 0040882D */ daddu $s1, $v0, $zero +/* BD0134 80241544 0C00A6C9 */ jal clamp_angle +/* BD0138 80241548 46000306 */ mov.s $f12, $f0 +/* BD013C 8024154C 0200202D */ daddu $a0, $s0, $zero +/* BD0140 80241550 3C05FE36 */ lui $a1, 0xfe36 +/* BD0144 80241554 44060000 */ mfc1 $a2, $f0 +/* BD0148 80241558 34A53C80 */ ori $a1, $a1, 0x3c80 +/* BD014C 8024155C 0C0B2190 */ jal set_float_variable +/* BD0150 80241560 AE2601CC */ sw $a2, 0x1cc($s1) +/* BD0154 80241564 8FBF0018 */ lw $ra, 0x18($sp) +/* BD0158 80241568 8FB10014 */ lw $s1, 0x14($sp) +/* BD015C 8024156C 8FB00010 */ lw $s0, 0x10($sp) +/* BD0160 80241570 24020002 */ addiu $v0, $zero, 2 +/* BD0164 80241574 03E00008 */ jr $ra +/* BD0168 80241578 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C.s deleted file mode 100644 index eddf0a3ca7..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024157C -/* BD016C 8024157C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD0170 80241580 AFB00010 */ sw $s0, 0x10($sp) -/* BD0174 80241584 AFBF0014 */ sw $ra, 0x14($sp) -/* BD0178 80241588 0C090150 */ jal func_80240540 -/* BD017C 8024158C 0080802D */ daddu $s0, $a0, $zero -/* BD0180 80241590 3C05FE36 */ lui $a1, 0xfe36 -/* BD0184 80241594 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD0188 80241598 8C4601D0 */ lw $a2, 0x1d0($v0) -/* BD018C 8024159C 0C0B2190 */ jal set_float_variable -/* BD0190 802415A0 0200202D */ daddu $a0, $s0, $zero -/* BD0194 802415A4 8FBF0014 */ lw $ra, 0x14($sp) -/* BD0198 802415A8 8FB00010 */ lw $s0, 0x10($sp) -/* BD019C 802415AC 24020002 */ addiu $v0, $zero, 2 -/* BD01A0 802415B0 03E00008 */ jr $ra -/* BD01A4 802415B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C_BD016C.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C_BD016C.s new file mode 100644 index 0000000000..9f70f77eed --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_8024157C_BD016C.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024157C_BD016C +/* BD016C 8024157C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BD0170 80241580 AFB00010 */ sw $s0, 0x10($sp) +/* BD0174 80241584 AFBF0014 */ sw $ra, 0x14($sp) +/* BD0178 80241588 0C090150 */ jal func_80240540_BCF130 +/* BD017C 8024158C 0080802D */ daddu $s0, $a0, $zero +/* BD0180 80241590 3C05FE36 */ lui $a1, 0xfe36 +/* BD0184 80241594 34A53C80 */ ori $a1, $a1, 0x3c80 +/* BD0188 80241598 8C4601D0 */ lw $a2, 0x1d0($v0) +/* BD018C 8024159C 0C0B2190 */ jal set_float_variable +/* BD0190 802415A0 0200202D */ daddu $a0, $s0, $zero +/* BD0194 802415A4 8FBF0014 */ lw $ra, 0x14($sp) +/* BD0198 802415A8 8FB00010 */ lw $s0, 0x10($sp) +/* BD019C 802415AC 24020002 */ addiu $v0, $zero, 2 +/* BD01A0 802415B0 03E00008 */ jr $ra +/* BD01A4 802415B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8.s deleted file mode 100644 index 6002db4179..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415B8 -/* BD01A8 802415B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD01AC 802415BC AFB00010 */ sw $s0, 0x10($sp) -/* BD01B0 802415C0 AFBF0014 */ sw $ra, 0x14($sp) -/* BD01B4 802415C4 0C090150 */ jal func_80240540 -/* BD01B8 802415C8 0080802D */ daddu $s0, $a0, $zero -/* BD01BC 802415CC 3C05FE36 */ lui $a1, 0xfe36 -/* BD01C0 802415D0 34A53C80 */ ori $a1, $a1, 0x3c80 -/* BD01C4 802415D4 8C4601C8 */ lw $a2, 0x1c8($v0) -/* BD01C8 802415D8 0C0B2190 */ jal set_float_variable -/* BD01CC 802415DC 0200202D */ daddu $a0, $s0, $zero -/* BD01D0 802415E0 8FBF0014 */ lw $ra, 0x14($sp) -/* BD01D4 802415E4 8FB00010 */ lw $s0, 0x10($sp) -/* BD01D8 802415E8 24020002 */ addiu $v0, $zero, 2 -/* BD01DC 802415EC 03E00008 */ jr $ra -/* BD01E0 802415F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8_BD01A8.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8_BD01A8.s new file mode 100644 index 0000000000..da27c8227a --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415B8_BD01A8.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415B8_BD01A8 +/* BD01A8 802415B8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BD01AC 802415BC AFB00010 */ sw $s0, 0x10($sp) +/* BD01B0 802415C0 AFBF0014 */ sw $ra, 0x14($sp) +/* BD01B4 802415C4 0C090150 */ jal func_80240540_BCF130 +/* BD01B8 802415C8 0080802D */ daddu $s0, $a0, $zero +/* BD01BC 802415CC 3C05FE36 */ lui $a1, 0xfe36 +/* BD01C0 802415D0 34A53C80 */ ori $a1, $a1, 0x3c80 +/* BD01C4 802415D4 8C4601C8 */ lw $a2, 0x1c8($v0) +/* BD01C8 802415D8 0C0B2190 */ jal set_float_variable +/* BD01CC 802415DC 0200202D */ daddu $a0, $s0, $zero +/* BD01D0 802415E0 8FBF0014 */ lw $ra, 0x14($sp) +/* BD01D4 802415E4 8FB00010 */ lw $s0, 0x10($sp) +/* BD01D8 802415E8 24020002 */ addiu $v0, $zero, 2 +/* BD01DC 802415EC 03E00008 */ jr $ra +/* BD01E0 802415F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415F4_BD01E4.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415F4_BD01E4.s index bd1ab9d23b..ca95a69c63 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415F4_BD01E4.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802415F4_BD01E4.s @@ -5,7 +5,7 @@ glabel func_802415F4_BD01E4 /* BD01E4 802415F4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BD01E8 802415F8 AFB00010 */ sw $s0, 0x10($sp) /* BD01EC 802415FC AFBF0014 */ sw $ra, 0x14($sp) -/* BD01F0 80241600 0C090150 */ jal func_80240540 +/* BD01F0 80241600 0C090150 */ jal func_80240540_BCF130 /* BD01F4 80241604 0080802D */ daddu $s0, $a0, $zero /* BD01F8 80241608 3C05FE36 */ lui $a1, 0xfe36 /* BD01FC 8024160C 34A53C80 */ ori $a1, $a1, 0x3c80 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241790_BD0380.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241790_BD0380.s index 2ad4199aed..6579b6a444 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241790_BD0380.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241790_BD0380.s @@ -5,7 +5,7 @@ glabel func_80241790_BD0380 /* BD0380 80241790 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BD0384 80241794 AFB00010 */ sw $s0, 0x10($sp) /* BD0388 80241798 AFBF0014 */ sw $ra, 0x14($sp) -/* BD038C 8024179C 0C090150 */ jal func_80240540 +/* BD038C 8024179C 0C090150 */ jal func_80240540_BCF130 /* BD0390 802417A0 0080802D */ daddu $s0, $a0, $zero /* BD0394 802417A4 0040282D */ daddu $a1, $v0, $zero /* BD0398 802417A8 8CA20004 */ lw $v0, 4($a1) diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241898_BD0488.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241898_BD0488.s index 036c8c7209..73a45d4cac 100644 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241898_BD0488.s +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241898_BD0488.s @@ -5,7 +5,7 @@ glabel func_80241898_BD0488 /* BD0488 80241898 27BDFFE8 */ addiu $sp, $sp, -0x18 /* BD048C 8024189C AFB00010 */ sw $s0, 0x10($sp) /* BD0490 802418A0 AFBF0014 */ sw $ra, 0x14($sp) -/* BD0494 802418A4 0C090150 */ jal func_80240540 +/* BD0494 802418A4 0C090150 */ jal func_80240540_BCF130 /* BD0498 802418A8 0080802D */ daddu $s0, $a0, $zero /* BD049C 802418AC 0040182D */ daddu $v1, $v0, $zero /* BD04A0 802418B0 AC6001D4 */ sw $zero, 0x1d4($v1) diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0.s deleted file mode 100644 index d7ecc100a9..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0.s +++ /dev/null @@ -1,171 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418E0 -/* BD04D0 802418E0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* BD04D4 802418E4 AFB20018 */ sw $s2, 0x18($sp) -/* BD04D8 802418E8 0080902D */ daddu $s2, $a0, $zero -/* BD04DC 802418EC AFBF001C */ sw $ra, 0x1c($sp) -/* BD04E0 802418F0 AFB10014 */ sw $s1, 0x14($sp) -/* BD04E4 802418F4 AFB00010 */ sw $s0, 0x10($sp) -/* BD04E8 802418F8 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* BD04EC 802418FC F7BC0040 */ sdc1 $f28, 0x40($sp) -/* BD04F0 80241900 F7BA0038 */ sdc1 $f26, 0x38($sp) -/* BD04F4 80241904 F7B80030 */ sdc1 $f24, 0x30($sp) -/* BD04F8 80241908 F7B60028 */ sdc1 $f22, 0x28($sp) -/* BD04FC 8024190C F7B40020 */ sdc1 $f20, 0x20($sp) -/* BD0500 80241910 0C00EABB */ jal get_npc_unsafe -/* BD0504 80241914 24040002 */ addiu $a0, $zero, 2 -/* BD0508 80241918 0C090150 */ jal func_80240540 -/* BD050C 8024191C 0040802D */ daddu $s0, $v0, $zero -/* BD0510 80241920 0040882D */ daddu $s1, $v0, $zero -/* BD0514 80241924 2403FFFF */ addiu $v1, $zero, -1 -/* BD0518 80241928 3C01C308 */ lui $at, 0xc308 -/* BD051C 8024192C 4481D000 */ mtc1 $at, $f26 -/* BD0520 80241930 C6160038 */ lwc1 $f22, 0x38($s0) -/* BD0524 80241934 C6180040 */ lwc1 $f24, 0x40($s0) -/* BD0528 80241938 3C01C2B8 */ lui $at, 0xc2b8 -/* BD052C 8024193C 4481F000 */ mtc1 $at, $f30 -/* BD0530 80241940 8E220030 */ lw $v0, 0x30($s1) -/* BD0534 80241944 3C014328 */ lui $at, 0x4328 -/* BD0538 80241948 4481E000 */ mtc1 $at, $f28 -/* BD053C 8024194C 14430025 */ bne $v0, $v1, .L802419E4 -/* BD0540 80241950 3C020095 */ lui $v0, 0x95 -/* BD0544 80241954 34420003 */ ori $v0, $v0, 3 -/* BD0548 80241958 4600B306 */ mov.s $f12, $f22 -/* BD054C 8024195C 3C014000 */ lui $at, 0x4000 -/* BD0550 80241960 4481A000 */ mtc1 $at, $f20 -/* BD0554 80241964 4406E000 */ mfc1 $a2, $f28 -/* BD0558 80241968 4407D000 */ mfc1 $a3, $f26 -/* BD055C 8024196C 4600C386 */ mov.s $f14, $f24 -/* BD0560 80241970 0C00A7B5 */ jal dist2D -/* BD0564 80241974 AE020028 */ sw $v0, 0x28($s0) -/* BD0568 80241978 4614003C */ c.lt.s $f0, $f20 -/* BD056C 8024197C 00000000 */ nop -/* BD0570 80241980 4500000D */ bc1f .L802419B8 -/* BD0574 80241984 4600B306 */ mov.s $f12, $f22 -/* BD0578 80241988 4406F000 */ mfc1 $a2, $f30 -/* BD057C 8024198C 4407D000 */ mfc1 $a3, $f26 -/* BD0580 80241990 4600C386 */ mov.s $f14, $f24 -/* BD0584 80241994 E61C0038 */ swc1 $f28, 0x38($s0) -/* BD0588 80241998 0C00A720 */ jal atan2 -/* BD058C 8024199C AE070040 */ sw $a3, 0x40($s0) -/* BD0590 802419A0 24020002 */ addiu $v0, $zero, 2 -/* BD0594 802419A4 24030001 */ addiu $v1, $zero, 1 -/* BD0598 802419A8 E600000C */ swc1 $f0, 0xc($s0) -/* BD059C 802419AC AE4000AC */ sw $zero, 0xac($s2) -/* BD05A0 802419B0 080906C8 */ j .L80241B20 -/* BD05A4 802419B4 AE4300B0 */ sw $v1, 0xb0($s2) -.L802419B8: -/* BD05A8 802419B8 4406E000 */ mfc1 $a2, $f28 -/* BD05AC 802419BC 4407D000 */ mfc1 $a3, $f26 -/* BD05B0 802419C0 0C00A720 */ jal atan2 -/* BD05B4 802419C4 4600C386 */ mov.s $f14, $f24 -/* BD05B8 802419C8 4405A000 */ mfc1 $a1, $f20 -/* BD05BC 802419CC 44060000 */ mfc1 $a2, $f0 -/* BD05C0 802419D0 0200202D */ daddu $a0, $s0, $zero -/* BD05C4 802419D4 0C00EA95 */ jal npc_move_heading -/* BD05C8 802419D8 AC86000C */ sw $a2, 0xc($a0) -/* BD05CC 802419DC 080906C8 */ j .L80241B20 -/* BD05D0 802419E0 24020002 */ addiu $v0, $zero, 2 -.L802419E4: -/* BD05D4 802419E4 8E2201D4 */ lw $v0, 0x1d4($s1) -/* BD05D8 802419E8 28421B59 */ slti $v0, $v0, 0x1b59 -/* BD05DC 802419EC 14400019 */ bnez $v0, .L80241A54 -/* BD05E0 802419F0 4600B306 */ mov.s $f12, $f22 -/* BD05E4 802419F4 4600C386 */ mov.s $f14, $f24 -/* BD05E8 802419F8 3C014000 */ lui $at, 0x4000 -/* BD05EC 802419FC 4481A000 */ mtc1 $at, $f20 -/* BD05F0 80241A00 4406F000 */ mfc1 $a2, $f30 -/* BD05F4 80241A04 4407D000 */ mfc1 $a3, $f26 -/* BD05F8 80241A08 24020001 */ addiu $v0, $zero, 1 -/* BD05FC 80241A0C 0C00A7B5 */ jal dist2D -/* BD0600 80241A10 AE4200AC */ sw $v0, 0xac($s2) -/* BD0604 80241A14 4614003C */ c.lt.s $f0, $f20 -/* BD0608 80241A18 00000000 */ nop -/* BD060C 80241A1C 45000004 */ bc1f .L80241A30 -/* BD0610 80241A20 4600B306 */ mov.s $f12, $f22 -/* BD0614 80241A24 E61E0038 */ swc1 $f30, 0x38($s0) -/* BD0618 80241A28 08090695 */ j .L80241A54 -/* BD061C 80241A2C E61A0040 */ swc1 $f26, 0x40($s0) -.L80241A30: -/* BD0620 80241A30 4406F000 */ mfc1 $a2, $f30 -/* BD0624 80241A34 4407D000 */ mfc1 $a3, $f26 -/* BD0628 80241A38 0C00A720 */ jal atan2 -/* BD062C 80241A3C 4600C386 */ mov.s $f14, $f24 -/* BD0630 80241A40 4405A000 */ mfc1 $a1, $f20 -/* BD0634 80241A44 44060000 */ mfc1 $a2, $f0 -/* BD0638 80241A48 0200202D */ daddu $a0, $s0, $zero -/* BD063C 80241A4C 0C00EA95 */ jal npc_move_heading -/* BD0640 80241A50 AE06000C */ sw $a2, 0xc($s0) -.L80241A54: -/* BD0644 80241A54 8E2201D4 */ lw $v0, 0x1d4($s1) -/* BD0648 80241A58 28420BB8 */ slti $v0, $v0, 0xbb8 -/* BD064C 80241A5C 1040001D */ beqz $v0, .L80241AD4 -/* BD0650 80241A60 4600B306 */ mov.s $f12, $f22 -/* BD0654 80241A64 3C014000 */ lui $at, 0x4000 -/* BD0658 80241A68 4481A000 */ mtc1 $at, $f20 -/* BD065C 80241A6C 4406E000 */ mfc1 $a2, $f28 -/* BD0660 80241A70 4407D000 */ mfc1 $a3, $f26 -/* BD0664 80241A74 4600C386 */ mov.s $f14, $f24 -/* BD0668 80241A78 0C00A7B5 */ jal dist2D -/* BD066C 80241A7C AE4000AC */ sw $zero, 0xac($s2) -/* BD0670 80241A80 4614003C */ c.lt.s $f0, $f20 -/* BD0674 80241A84 00000000 */ nop -/* BD0678 80241A88 45000009 */ bc1f .L80241AB0 -/* BD067C 80241A8C 4600B306 */ mov.s $f12, $f22 -/* BD0680 80241A90 4406F000 */ mfc1 $a2, $f30 -/* BD0684 80241A94 3C07C308 */ lui $a3, 0xc308 -/* BD0688 80241A98 4600C386 */ mov.s $f14, $f24 -/* BD068C 80241A9C E61C0038 */ swc1 $f28, 0x38($s0) -/* BD0690 80241AA0 0C00A720 */ jal atan2 -/* BD0694 80241AA4 E61A0040 */ swc1 $f26, 0x40($s0) -/* BD0698 80241AA8 080906B5 */ j .L80241AD4 -/* BD069C 80241AAC E600000C */ swc1 $f0, 0xc($s0) -.L80241AB0: -/* BD06A0 80241AB0 4406E000 */ mfc1 $a2, $f28 -/* BD06A4 80241AB4 4407D000 */ mfc1 $a3, $f26 -/* BD06A8 80241AB8 0C00A720 */ jal atan2 -/* BD06AC 80241ABC 4600C386 */ mov.s $f14, $f24 -/* BD06B0 80241AC0 4405A000 */ mfc1 $a1, $f20 -/* BD06B4 80241AC4 44060000 */ mfc1 $a2, $f0 -/* BD06B8 80241AC8 0200202D */ daddu $a0, $s0, $zero -/* BD06BC 80241ACC 0C00EA95 */ jal npc_move_heading -/* BD06C0 80241AD0 AE06000C */ sw $a2, 0xc($s0) -.L80241AD4: -/* BD06C4 80241AD4 8E2301D4 */ lw $v1, 0x1d4($s1) -/* BD06C8 80241AD8 28621B59 */ slti $v0, $v1, 0x1b59 -/* BD06CC 80241ADC 54400004 */ bnel $v0, $zero, .L80241AF0 -/* BD06D0 80241AE0 28621389 */ slti $v0, $v1, 0x1389 -/* BD06D4 80241AE4 3C020095 */ lui $v0, 0x95 -/* BD06D8 80241AE8 080906C6 */ j .L80241B18 -/* BD06DC 80241AEC 34420005 */ ori $v0, $v0, 5 -.L80241AF0: -/* BD06E0 80241AF0 54400004 */ bnel $v0, $zero, .L80241B04 -/* BD06E4 80241AF4 28620BB9 */ slti $v0, $v1, 0xbb9 -/* BD06E8 80241AF8 3C020095 */ lui $v0, 0x95 -/* BD06EC 80241AFC 080906C6 */ j .L80241B18 -/* BD06F0 80241B00 34420003 */ ori $v0, $v0, 3 -.L80241B04: -/* BD06F4 80241B04 14400003 */ bnez $v0, .L80241B14 -/* BD06F8 80241B08 3C020095 */ lui $v0, 0x95 -/* BD06FC 80241B0C 080906C6 */ j .L80241B18 -/* BD0700 80241B10 34420002 */ ori $v0, $v0, 2 -.L80241B14: -/* BD0704 80241B14 34420001 */ ori $v0, $v0, 1 -.L80241B18: -/* BD0708 80241B18 AE020028 */ sw $v0, 0x28($s0) -/* BD070C 80241B1C 24020002 */ addiu $v0, $zero, 2 -.L80241B20: -/* BD0710 80241B20 8FBF001C */ lw $ra, 0x1c($sp) -/* BD0714 80241B24 8FB20018 */ lw $s2, 0x18($sp) -/* BD0718 80241B28 8FB10014 */ lw $s1, 0x14($sp) -/* BD071C 80241B2C 8FB00010 */ lw $s0, 0x10($sp) -/* BD0720 80241B30 D7BE0048 */ ldc1 $f30, 0x48($sp) -/* BD0724 80241B34 D7BC0040 */ ldc1 $f28, 0x40($sp) -/* BD0728 80241B38 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* BD072C 80241B3C D7B80030 */ ldc1 $f24, 0x30($sp) -/* BD0730 80241B40 D7B60028 */ ldc1 $f22, 0x28($sp) -/* BD0734 80241B44 D7B40020 */ ldc1 $f20, 0x20($sp) -/* BD0738 80241B48 03E00008 */ jr $ra -/* BD073C 80241B4C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0_BD04D0.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0_BD04D0.s new file mode 100644 index 0000000000..850a300638 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_802418E0_BD04D0.s @@ -0,0 +1,171 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418E0_BD04D0 +/* BD04D0 802418E0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* BD04D4 802418E4 AFB20018 */ sw $s2, 0x18($sp) +/* BD04D8 802418E8 0080902D */ daddu $s2, $a0, $zero +/* BD04DC 802418EC AFBF001C */ sw $ra, 0x1c($sp) +/* BD04E0 802418F0 AFB10014 */ sw $s1, 0x14($sp) +/* BD04E4 802418F4 AFB00010 */ sw $s0, 0x10($sp) +/* BD04E8 802418F8 F7BE0048 */ sdc1 $f30, 0x48($sp) +/* BD04EC 802418FC F7BC0040 */ sdc1 $f28, 0x40($sp) +/* BD04F0 80241900 F7BA0038 */ sdc1 $f26, 0x38($sp) +/* BD04F4 80241904 F7B80030 */ sdc1 $f24, 0x30($sp) +/* BD04F8 80241908 F7B60028 */ sdc1 $f22, 0x28($sp) +/* BD04FC 8024190C F7B40020 */ sdc1 $f20, 0x20($sp) +/* BD0500 80241910 0C00EABB */ jal get_npc_unsafe +/* BD0504 80241914 24040002 */ addiu $a0, $zero, 2 +/* BD0508 80241918 0C090150 */ jal func_80240540_BCF130 +/* BD050C 8024191C 0040802D */ daddu $s0, $v0, $zero +/* BD0510 80241920 0040882D */ daddu $s1, $v0, $zero +/* BD0514 80241924 2403FFFF */ addiu $v1, $zero, -1 +/* BD0518 80241928 3C01C308 */ lui $at, 0xc308 +/* BD051C 8024192C 4481D000 */ mtc1 $at, $f26 +/* BD0520 80241930 C6160038 */ lwc1 $f22, 0x38($s0) +/* BD0524 80241934 C6180040 */ lwc1 $f24, 0x40($s0) +/* BD0528 80241938 3C01C2B8 */ lui $at, 0xc2b8 +/* BD052C 8024193C 4481F000 */ mtc1 $at, $f30 +/* BD0530 80241940 8E220030 */ lw $v0, 0x30($s1) +/* BD0534 80241944 3C014328 */ lui $at, 0x4328 +/* BD0538 80241948 4481E000 */ mtc1 $at, $f28 +/* BD053C 8024194C 14430025 */ bne $v0, $v1, .L802419E4 +/* BD0540 80241950 3C020095 */ lui $v0, 0x95 +/* BD0544 80241954 34420003 */ ori $v0, $v0, 3 +/* BD0548 80241958 4600B306 */ mov.s $f12, $f22 +/* BD054C 8024195C 3C014000 */ lui $at, 0x4000 +/* BD0550 80241960 4481A000 */ mtc1 $at, $f20 +/* BD0554 80241964 4406E000 */ mfc1 $a2, $f28 +/* BD0558 80241968 4407D000 */ mfc1 $a3, $f26 +/* BD055C 8024196C 4600C386 */ mov.s $f14, $f24 +/* BD0560 80241970 0C00A7B5 */ jal dist2D +/* BD0564 80241974 AE020028 */ sw $v0, 0x28($s0) +/* BD0568 80241978 4614003C */ c.lt.s $f0, $f20 +/* BD056C 8024197C 00000000 */ nop +/* BD0570 80241980 4500000D */ bc1f .L802419B8 +/* BD0574 80241984 4600B306 */ mov.s $f12, $f22 +/* BD0578 80241988 4406F000 */ mfc1 $a2, $f30 +/* BD057C 8024198C 4407D000 */ mfc1 $a3, $f26 +/* BD0580 80241990 4600C386 */ mov.s $f14, $f24 +/* BD0584 80241994 E61C0038 */ swc1 $f28, 0x38($s0) +/* BD0588 80241998 0C00A720 */ jal atan2 +/* BD058C 8024199C AE070040 */ sw $a3, 0x40($s0) +/* BD0590 802419A0 24020002 */ addiu $v0, $zero, 2 +/* BD0594 802419A4 24030001 */ addiu $v1, $zero, 1 +/* BD0598 802419A8 E600000C */ swc1 $f0, 0xc($s0) +/* BD059C 802419AC AE4000AC */ sw $zero, 0xac($s2) +/* BD05A0 802419B0 080906C8 */ j .L80241B20 +/* BD05A4 802419B4 AE4300B0 */ sw $v1, 0xb0($s2) +.L802419B8: +/* BD05A8 802419B8 4406E000 */ mfc1 $a2, $f28 +/* BD05AC 802419BC 4407D000 */ mfc1 $a3, $f26 +/* BD05B0 802419C0 0C00A720 */ jal atan2 +/* BD05B4 802419C4 4600C386 */ mov.s $f14, $f24 +/* BD05B8 802419C8 4405A000 */ mfc1 $a1, $f20 +/* BD05BC 802419CC 44060000 */ mfc1 $a2, $f0 +/* BD05C0 802419D0 0200202D */ daddu $a0, $s0, $zero +/* BD05C4 802419D4 0C00EA95 */ jal npc_move_heading +/* BD05C8 802419D8 AC86000C */ sw $a2, 0xc($a0) +/* BD05CC 802419DC 080906C8 */ j .L80241B20 +/* BD05D0 802419E0 24020002 */ addiu $v0, $zero, 2 +.L802419E4: +/* BD05D4 802419E4 8E2201D4 */ lw $v0, 0x1d4($s1) +/* BD05D8 802419E8 28421B59 */ slti $v0, $v0, 0x1b59 +/* BD05DC 802419EC 14400019 */ bnez $v0, .L80241A54 +/* BD05E0 802419F0 4600B306 */ mov.s $f12, $f22 +/* BD05E4 802419F4 4600C386 */ mov.s $f14, $f24 +/* BD05E8 802419F8 3C014000 */ lui $at, 0x4000 +/* BD05EC 802419FC 4481A000 */ mtc1 $at, $f20 +/* BD05F0 80241A00 4406F000 */ mfc1 $a2, $f30 +/* BD05F4 80241A04 4407D000 */ mfc1 $a3, $f26 +/* BD05F8 80241A08 24020001 */ addiu $v0, $zero, 1 +/* BD05FC 80241A0C 0C00A7B5 */ jal dist2D +/* BD0600 80241A10 AE4200AC */ sw $v0, 0xac($s2) +/* BD0604 80241A14 4614003C */ c.lt.s $f0, $f20 +/* BD0608 80241A18 00000000 */ nop +/* BD060C 80241A1C 45000004 */ bc1f .L80241A30 +/* BD0610 80241A20 4600B306 */ mov.s $f12, $f22 +/* BD0614 80241A24 E61E0038 */ swc1 $f30, 0x38($s0) +/* BD0618 80241A28 08090695 */ j .L80241A54 +/* BD061C 80241A2C E61A0040 */ swc1 $f26, 0x40($s0) +.L80241A30: +/* BD0620 80241A30 4406F000 */ mfc1 $a2, $f30 +/* BD0624 80241A34 4407D000 */ mfc1 $a3, $f26 +/* BD0628 80241A38 0C00A720 */ jal atan2 +/* BD062C 80241A3C 4600C386 */ mov.s $f14, $f24 +/* BD0630 80241A40 4405A000 */ mfc1 $a1, $f20 +/* BD0634 80241A44 44060000 */ mfc1 $a2, $f0 +/* BD0638 80241A48 0200202D */ daddu $a0, $s0, $zero +/* BD063C 80241A4C 0C00EA95 */ jal npc_move_heading +/* BD0640 80241A50 AE06000C */ sw $a2, 0xc($s0) +.L80241A54: +/* BD0644 80241A54 8E2201D4 */ lw $v0, 0x1d4($s1) +/* BD0648 80241A58 28420BB8 */ slti $v0, $v0, 0xbb8 +/* BD064C 80241A5C 1040001D */ beqz $v0, .L80241AD4 +/* BD0650 80241A60 4600B306 */ mov.s $f12, $f22 +/* BD0654 80241A64 3C014000 */ lui $at, 0x4000 +/* BD0658 80241A68 4481A000 */ mtc1 $at, $f20 +/* BD065C 80241A6C 4406E000 */ mfc1 $a2, $f28 +/* BD0660 80241A70 4407D000 */ mfc1 $a3, $f26 +/* BD0664 80241A74 4600C386 */ mov.s $f14, $f24 +/* BD0668 80241A78 0C00A7B5 */ jal dist2D +/* BD066C 80241A7C AE4000AC */ sw $zero, 0xac($s2) +/* BD0670 80241A80 4614003C */ c.lt.s $f0, $f20 +/* BD0674 80241A84 00000000 */ nop +/* BD0678 80241A88 45000009 */ bc1f .L80241AB0 +/* BD067C 80241A8C 4600B306 */ mov.s $f12, $f22 +/* BD0680 80241A90 4406F000 */ mfc1 $a2, $f30 +/* BD0684 80241A94 3C07C308 */ lui $a3, 0xc308 +/* BD0688 80241A98 4600C386 */ mov.s $f14, $f24 +/* BD068C 80241A9C E61C0038 */ swc1 $f28, 0x38($s0) +/* BD0690 80241AA0 0C00A720 */ jal atan2 +/* BD0694 80241AA4 E61A0040 */ swc1 $f26, 0x40($s0) +/* BD0698 80241AA8 080906B5 */ j .L80241AD4 +/* BD069C 80241AAC E600000C */ swc1 $f0, 0xc($s0) +.L80241AB0: +/* BD06A0 80241AB0 4406E000 */ mfc1 $a2, $f28 +/* BD06A4 80241AB4 4407D000 */ mfc1 $a3, $f26 +/* BD06A8 80241AB8 0C00A720 */ jal atan2 +/* BD06AC 80241ABC 4600C386 */ mov.s $f14, $f24 +/* BD06B0 80241AC0 4405A000 */ mfc1 $a1, $f20 +/* BD06B4 80241AC4 44060000 */ mfc1 $a2, $f0 +/* BD06B8 80241AC8 0200202D */ daddu $a0, $s0, $zero +/* BD06BC 80241ACC 0C00EA95 */ jal npc_move_heading +/* BD06C0 80241AD0 AE06000C */ sw $a2, 0xc($s0) +.L80241AD4: +/* BD06C4 80241AD4 8E2301D4 */ lw $v1, 0x1d4($s1) +/* BD06C8 80241AD8 28621B59 */ slti $v0, $v1, 0x1b59 +/* BD06CC 80241ADC 54400004 */ bnel $v0, $zero, .L80241AF0 +/* BD06D0 80241AE0 28621389 */ slti $v0, $v1, 0x1389 +/* BD06D4 80241AE4 3C020095 */ lui $v0, 0x95 +/* BD06D8 80241AE8 080906C6 */ j .L80241B18 +/* BD06DC 80241AEC 34420005 */ ori $v0, $v0, 5 +.L80241AF0: +/* BD06E0 80241AF0 54400004 */ bnel $v0, $zero, .L80241B04 +/* BD06E4 80241AF4 28620BB9 */ slti $v0, $v1, 0xbb9 +/* BD06E8 80241AF8 3C020095 */ lui $v0, 0x95 +/* BD06EC 80241AFC 080906C6 */ j .L80241B18 +/* BD06F0 80241B00 34420003 */ ori $v0, $v0, 3 +.L80241B04: +/* BD06F4 80241B04 14400003 */ bnez $v0, .L80241B14 +/* BD06F8 80241B08 3C020095 */ lui $v0, 0x95 +/* BD06FC 80241B0C 080906C6 */ j .L80241B18 +/* BD0700 80241B10 34420002 */ ori $v0, $v0, 2 +.L80241B14: +/* BD0704 80241B14 34420001 */ ori $v0, $v0, 1 +.L80241B18: +/* BD0708 80241B18 AE020028 */ sw $v0, 0x28($s0) +/* BD070C 80241B1C 24020002 */ addiu $v0, $zero, 2 +.L80241B20: +/* BD0710 80241B20 8FBF001C */ lw $ra, 0x1c($sp) +/* BD0714 80241B24 8FB20018 */ lw $s2, 0x18($sp) +/* BD0718 80241B28 8FB10014 */ lw $s1, 0x14($sp) +/* BD071C 80241B2C 8FB00010 */ lw $s0, 0x10($sp) +/* BD0720 80241B30 D7BE0048 */ ldc1 $f30, 0x48($sp) +/* BD0724 80241B34 D7BC0040 */ ldc1 $f28, 0x40($sp) +/* BD0728 80241B38 D7BA0038 */ ldc1 $f26, 0x38($sp) +/* BD072C 80241B3C D7B80030 */ ldc1 $f24, 0x30($sp) +/* BD0730 80241B40 D7B60028 */ ldc1 $f22, 0x28($sp) +/* BD0734 80241B44 D7B40020 */ ldc1 $f20, 0x20($sp) +/* BD0738 80241B48 03E00008 */ jr $ra +/* BD073C 80241B4C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50.s deleted file mode 100644 index 4127f96772..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B50 -/* BD0740 80241B50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD0744 80241B54 AFBF0010 */ sw $ra, 0x10($sp) -/* BD0748 80241B58 0C00EABB */ jal get_npc_unsafe -/* BD074C 80241B5C 8C84014C */ lw $a0, 0x14c($a0) -/* BD0750 80241B60 0040182D */ daddu $v1, $v0, $zero -/* BD0754 80241B64 240400B4 */ addiu $a0, $zero, 0xb4 -/* BD0758 80241B68 A06400AC */ sb $a0, 0xac($v1) -/* BD075C 80241B6C 24040016 */ addiu $a0, $zero, 0x16 -/* BD0760 80241B70 A06400AA */ sb $a0, 0xaa($v1) -/* BD0764 80241B74 8FBF0010 */ lw $ra, 0x10($sp) -/* BD0768 80241B78 24020002 */ addiu $v0, $zero, 2 -/* BD076C 80241B7C 03E00008 */ jr $ra -/* BD0770 80241B80 27BD0018 */ addiu $sp, $sp, 0x18 -/* BD0774 80241B84 00000000 */ nop -/* BD0778 80241B88 00000000 */ nop -/* BD077C 80241B8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50_BD0740.s b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50_BD0740.s new file mode 100644 index 0000000000..ddddad6de4 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_07/BCF0F0/func_80241B50_BD0740.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B50_BD0740 +/* BD0740 80241B50 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BD0744 80241B54 AFBF0010 */ sw $ra, 0x10($sp) +/* BD0748 80241B58 0C00EABB */ jal get_npc_unsafe +/* BD074C 80241B5C 8C84014C */ lw $a0, 0x14c($a0) +/* BD0750 80241B60 0040182D */ daddu $v1, $v0, $zero +/* BD0754 80241B64 240400B4 */ addiu $a0, $zero, 0xb4 +/* BD0758 80241B68 A06400AC */ sb $a0, 0xac($v1) +/* BD075C 80241B6C 24040016 */ addiu $a0, $zero, 0x16 +/* BD0760 80241B70 A06400AA */ sb $a0, 0xaa($v1) +/* BD0764 80241B74 8FBF0010 */ lw $ra, 0x10($sp) +/* BD0768 80241B78 24020002 */ addiu $v0, $zero, 2 +/* BD076C 80241B7C 03E00008 */ jr $ra +/* BD0770 80241B80 27BD0018 */ addiu $sp, $sp, 0x18 +/* BD0774 80241B84 00000000 */ nop +/* BD0778 80241B88 00000000 */ nop +/* BD077C 80241B8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0.s deleted file mode 100644 index 8390ebad3f..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404F0 -/* BD3D60 802404F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD3D64 802404F4 AFB10014 */ sw $s1, 0x14($sp) -/* BD3D68 802404F8 0080882D */ daddu $s1, $a0, $zero -/* BD3D6C 802404FC 0000202D */ daddu $a0, $zero, $zero -/* BD3D70 80240500 3C05FD05 */ lui $a1, 0xfd05 -/* BD3D74 80240504 34A50F8A */ ori $a1, $a1, 0xf8a -/* BD3D78 80240508 AFBF0018 */ sw $ra, 0x18($sp) -/* BD3D7C 8024050C 0C0B1EAF */ jal get_variable -/* BD3D80 80240510 AFB00010 */ sw $s0, 0x10($sp) -/* BD3D84 80240514 0040802D */ daddu $s0, $v0, $zero -/* BD3D88 80240518 0C04EA15 */ jal func_8013A854 -/* BD3D8C 8024051C 8E040000 */ lw $a0, ($s0) -/* BD3D90 80240520 0C048D70 */ jal func_801235C0 -/* BD3D94 80240524 8E040004 */ lw $a0, 4($s0) -/* BD3D98 80240528 0C00AB4B */ jal heap_free -/* BD3D9C 8024052C 0200202D */ daddu $a0, $s0, $zero -/* BD3DA0 80240530 0220202D */ daddu $a0, $s1, $zero -/* BD3DA4 80240534 3C05FD05 */ lui $a1, 0xfd05 -/* BD3DA8 80240538 34A50F8A */ ori $a1, $a1, 0xf8a -/* BD3DAC 8024053C 0C0B2026 */ jal set_variable -/* BD3DB0 80240540 0000302D */ daddu $a2, $zero, $zero -/* BD3DB4 80240544 8FBF0018 */ lw $ra, 0x18($sp) -/* BD3DB8 80240548 8FB10014 */ lw $s1, 0x14($sp) -/* BD3DBC 8024054C 8FB00010 */ lw $s0, 0x10($sp) -/* BD3DC0 80240550 24020002 */ addiu $v0, $zero, 2 -/* BD3DC4 80240554 03E00008 */ jr $ra -/* BD3DC8 80240558 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0_BD3D60.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0_BD3D60.s new file mode 100644 index 0000000000..dafafc16f4 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_802404F0_BD3D60.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404F0_BD3D60 +/* BD3D60 802404F0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BD3D64 802404F4 AFB10014 */ sw $s1, 0x14($sp) +/* BD3D68 802404F8 0080882D */ daddu $s1, $a0, $zero +/* BD3D6C 802404FC 0000202D */ daddu $a0, $zero, $zero +/* BD3D70 80240500 3C05FD05 */ lui $a1, 0xfd05 +/* BD3D74 80240504 34A50F8A */ ori $a1, $a1, 0xf8a +/* BD3D78 80240508 AFBF0018 */ sw $ra, 0x18($sp) +/* BD3D7C 8024050C 0C0B1EAF */ jal get_variable +/* BD3D80 80240510 AFB00010 */ sw $s0, 0x10($sp) +/* BD3D84 80240514 0040802D */ daddu $s0, $v0, $zero +/* BD3D88 80240518 0C04EA15 */ jal func_8013A854 +/* BD3D8C 8024051C 8E040000 */ lw $a0, ($s0) +/* BD3D90 80240520 0C048D70 */ jal func_801235C0 +/* BD3D94 80240524 8E040004 */ lw $a0, 4($s0) +/* BD3D98 80240528 0C00AB4B */ jal heap_free +/* BD3D9C 8024052C 0200202D */ daddu $a0, $s0, $zero +/* BD3DA0 80240530 0220202D */ daddu $a0, $s1, $zero +/* BD3DA4 80240534 3C05FD05 */ lui $a1, 0xfd05 +/* BD3DA8 80240538 34A50F8A */ ori $a1, $a1, 0xf8a +/* BD3DAC 8024053C 0C0B2026 */ jal set_variable +/* BD3DB0 80240540 0000302D */ daddu $a2, $zero, $zero +/* BD3DB4 80240544 8FBF0018 */ lw $ra, 0x18($sp) +/* BD3DB8 80240548 8FB10014 */ lw $s1, 0x14($sp) +/* BD3DBC 8024054C 8FB00010 */ lw $s0, 0x10($sp) +/* BD3DC0 80240550 24020002 */ addiu $v0, $zero, 2 +/* BD3DC4 80240554 03E00008 */ jr $ra +/* BD3DC8 80240558 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024079C.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024079C.s deleted file mode 100644 index 1f41f1d8ef..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024079C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024079C -/* BD400C 8024079C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD4010 802407A0 AFB10014 */ sw $s1, 0x14($sp) -/* BD4014 802407A4 0080882D */ daddu $s1, $a0, $zero -/* BD4018 802407A8 AFBF0018 */ sw $ra, 0x18($sp) -/* BD401C 802407AC AFB00010 */ sw $s0, 0x10($sp) -/* BD4020 802407B0 8E30000C */ lw $s0, 0xc($s1) -/* BD4024 802407B4 8E050000 */ lw $a1, ($s0) -/* BD4028 802407B8 0C0B1EAF */ jal get_variable -/* BD402C 802407BC 26100004 */ addiu $s0, $s0, 4 -/* BD4030 802407C0 0220202D */ daddu $a0, $s1, $zero -/* BD4034 802407C4 8E050000 */ lw $a1, ($s0) -/* BD4038 802407C8 0C0B1EAF */ jal get_variable -/* BD403C 802407CC 0040882D */ daddu $s1, $v0, $zero -/* BD4040 802407D0 0000202D */ daddu $a0, $zero, $zero -/* BD4044 802407D4 3C05FD05 */ lui $a1, 0xfd05 -/* BD4048 802407D8 34A50F8A */ ori $a1, $a1, 0xf8a -/* BD404C 802407DC 0C0B1EAF */ jal get_variable -/* BD4050 802407E0 0040802D */ daddu $s0, $v0, $zero -/* BD4054 802407E4 0040182D */ daddu $v1, $v0, $zero -/* BD4058 802407E8 AC710008 */ sw $s1, 8($v1) -/* BD405C 802407EC AC70000C */ sw $s0, 0xc($v1) -/* BD4060 802407F0 8FBF0018 */ lw $ra, 0x18($sp) -/* BD4064 802407F4 8FB10014 */ lw $s1, 0x14($sp) -/* BD4068 802407F8 8FB00010 */ lw $s0, 0x10($sp) -/* BD406C 802407FC 24020002 */ addiu $v0, $zero, 2 -/* BD4070 80240800 03E00008 */ jr $ra -/* BD4074 80240804 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024079C_BD400C.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024079C_BD400C.s new file mode 100644 index 0000000000..2d43c064a6 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_8024079C_BD400C.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024079C_BD400C +/* BD400C 8024079C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BD4010 802407A0 AFB10014 */ sw $s1, 0x14($sp) +/* BD4014 802407A4 0080882D */ daddu $s1, $a0, $zero +/* BD4018 802407A8 AFBF0018 */ sw $ra, 0x18($sp) +/* BD401C 802407AC AFB00010 */ sw $s0, 0x10($sp) +/* BD4020 802407B0 8E30000C */ lw $s0, 0xc($s1) +/* BD4024 802407B4 8E050000 */ lw $a1, ($s0) +/* BD4028 802407B8 0C0B1EAF */ jal get_variable +/* BD402C 802407BC 26100004 */ addiu $s0, $s0, 4 +/* BD4030 802407C0 0220202D */ daddu $a0, $s1, $zero +/* BD4034 802407C4 8E050000 */ lw $a1, ($s0) +/* BD4038 802407C8 0C0B1EAF */ jal get_variable +/* BD403C 802407CC 0040882D */ daddu $s1, $v0, $zero +/* BD4040 802407D0 0000202D */ daddu $a0, $zero, $zero +/* BD4044 802407D4 3C05FD05 */ lui $a1, 0xfd05 +/* BD4048 802407D8 34A50F8A */ ori $a1, $a1, 0xf8a +/* BD404C 802407DC 0C0B1EAF */ jal get_variable +/* BD4050 802407E0 0040802D */ daddu $s0, $v0, $zero +/* BD4054 802407E4 0040182D */ daddu $v1, $v0, $zero +/* BD4058 802407E8 AC710008 */ sw $s1, 8($v1) +/* BD405C 802407EC AC70000C */ sw $s0, 0xc($v1) +/* BD4060 802407F0 8FBF0018 */ lw $ra, 0x18($sp) +/* BD4064 802407F4 8FB10014 */ lw $s1, 0x14($sp) +/* BD4068 802407F8 8FB00010 */ lw $s0, 0x10($sp) +/* BD406C 802407FC 24020002 */ addiu $v0, $zero, 2 +/* BD4070 80240800 03E00008 */ jr $ra +/* BD4074 80240804 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808.s deleted file mode 100644 index 36a0d29d26..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240808 -/* BD4078 80240808 3C048011 */ lui $a0, %hi(gPlayerData) -/* BD407C 8024080C 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) -/* BD4080 80240810 80820002 */ lb $v0, 2($a0) -/* BD4084 80240814 90830002 */ lbu $v1, 2($a0) -/* BD4088 80240818 28420002 */ slti $v0, $v0, 2 -/* BD408C 8024081C 14400004 */ bnez $v0, .L80240830 -/* BD4090 80240820 2462FFFF */ addiu $v0, $v1, -1 -/* BD4094 80240824 A0820002 */ sb $v0, 2($a0) -/* BD4098 80240828 03E00008 */ jr $ra -/* BD409C 8024082C 24020002 */ addiu $v0, $zero, 2 -.L80240830: -/* BD40A0 80240830 03E00008 */ jr $ra -/* BD40A4 80240834 24020002 */ addiu $v0, $zero, 2 -/* BD40A8 80240838 00000000 */ nop -/* BD40AC 8024083C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s new file mode 100644 index 0000000000..52190cad00 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_08/BD3870/func_80240808_BD4078.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240808_BD4078 +/* BD4078 80240808 3C048011 */ lui $a0, %hi(gPlayerData) +/* BD407C 8024080C 2484F290 */ addiu $a0, $a0, %lo(gPlayerData) +/* BD4080 80240810 80820002 */ lb $v0, 2($a0) +/* BD4084 80240814 90830002 */ lbu $v1, 2($a0) +/* BD4088 80240818 28420002 */ slti $v0, $v0, 2 +/* BD408C 8024081C 14400004 */ bnez $v0, .L80240830 +/* BD4090 80240820 2462FFFF */ addiu $v0, $v1, -1 +/* BD4094 80240824 A0820002 */ sb $v0, 2($a0) +/* BD4098 80240828 03E00008 */ jr $ra +/* BD409C 8024082C 24020002 */ addiu $v0, $zero, 2 +.L80240830: +/* BD40A0 80240830 03E00008 */ jr $ra +/* BD40A4 80240834 24020002 */ addiu $v0, $zero, 2 +/* BD40A8 80240838 00000000 */ nop +/* BD40AC 8024083C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870.s b/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870.s deleted file mode 100644 index 5f48b7ab1d..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240870 -/* BD40E0 80240870 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD40E4 80240874 AFBF0010 */ sw $ra, 0x10($sp) -/* BD40E8 80240878 8C840084 */ lw $a0, 0x84($a0) -/* BD40EC 8024087C 0C04D052 */ jal set_item_entity_flags -/* BD40F0 80240880 3C050008 */ lui $a1, 8 -/* BD40F4 80240884 8FBF0010 */ lw $ra, 0x10($sp) -/* BD40F8 80240888 24020002 */ addiu $v0, $zero, 2 -/* BD40FC 8024088C 03E00008 */ jr $ra -/* BD4100 80240890 27BD0018 */ addiu $sp, $sp, 0x18 -/* BD4104 80240894 00000000 */ nop -/* BD4108 80240898 00000000 */ nop -/* BD410C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s b/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s new file mode 100644 index 0000000000..bc40d2372a --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_08/BD40B0/func_80240870_BD40E0.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240870_BD40E0 +/* BD40E0 80240870 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BD40E4 80240874 AFBF0010 */ sw $ra, 0x10($sp) +/* BD40E8 80240878 8C840084 */ lw $a0, 0x84($a0) +/* BD40EC 8024087C 0C04D052 */ jal set_item_entity_flags +/* BD40F0 80240880 3C050008 */ lui $a1, 8 +/* BD40F4 80240884 8FBF0010 */ lw $ra, 0x10($sp) +/* BD40F8 80240888 24020002 */ addiu $v0, $zero, 2 +/* BD40FC 8024088C 03E00008 */ jr $ra +/* BD4100 80240890 27BD0018 */ addiu $sp, $sp, 0x18 +/* BD4104 80240894 00000000 */ nop +/* BD4108 80240898 00000000 */ nop +/* BD410C 8024089C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802409E8.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802409E8.s deleted file mode 100644 index cbe1b1a477..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802409E8.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409E8 -/* BD4258 802409E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* BD425C 802409EC AFBF0010 */ sw $ra, 0x10($sp) -/* BD4260 802409F0 0C00EABB */ jal get_npc_unsafe -/* BD4264 802409F4 24040001 */ addiu $a0, $zero, 1 -/* BD4268 802409F8 0C090248 */ jal func_80240920 -/* BD426C 802409FC 0040202D */ daddu $a0, $v0, $zero -/* BD4270 80240A00 0C00EABB */ jal get_npc_unsafe -/* BD4274 80240A04 24040002 */ addiu $a0, $zero, 2 -/* BD4278 80240A08 0C090248 */ jal func_80240920 -/* BD427C 80240A0C 0040202D */ daddu $a0, $v0, $zero -/* BD4280 80240A10 0C00EABB */ jal get_npc_unsafe -/* BD4284 80240A14 24040003 */ addiu $a0, $zero, 3 -/* BD4288 80240A18 0C090248 */ jal func_80240920 -/* BD428C 80240A1C 0040202D */ daddu $a0, $v0, $zero -/* BD4290 80240A20 0C00EABB */ jal get_npc_unsafe -/* BD4294 80240A24 24040004 */ addiu $a0, $zero, 4 -/* BD4298 80240A28 0C090248 */ jal func_80240920 -/* BD429C 80240A2C 0040202D */ daddu $a0, $v0, $zero -/* BD42A0 80240A30 0C00EABB */ jal get_npc_unsafe -/* BD42A4 80240A34 24040005 */ addiu $a0, $zero, 5 -/* BD42A8 80240A38 0C090248 */ jal func_80240920 -/* BD42AC 80240A3C 0040202D */ daddu $a0, $v0, $zero -/* BD42B0 80240A40 0C00EABB */ jal get_npc_unsafe -/* BD42B4 80240A44 24040006 */ addiu $a0, $zero, 6 -/* BD42B8 80240A48 0C090248 */ jal func_80240920 -/* BD42BC 80240A4C 0040202D */ daddu $a0, $v0, $zero -/* BD42C0 80240A50 0C00EABB */ jal get_npc_unsafe -/* BD42C4 80240A54 24040007 */ addiu $a0, $zero, 7 -/* BD42C8 80240A58 0C090248 */ jal func_80240920 -/* BD42CC 80240A5C 0040202D */ daddu $a0, $v0, $zero -/* BD42D0 80240A60 0C00EABB */ jal get_npc_unsafe -/* BD42D4 80240A64 24040008 */ addiu $a0, $zero, 8 -/* BD42D8 80240A68 0C090248 */ jal func_80240920 -/* BD42DC 80240A6C 0040202D */ daddu $a0, $v0, $zero -/* BD42E0 80240A70 8FBF0010 */ lw $ra, 0x10($sp) -/* BD42E4 80240A74 03E00008 */ jr $ra -/* BD42E8 80240A78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802409E8_BD4258.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802409E8_BD4258.s new file mode 100644 index 0000000000..1206524f3a --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_802409E8_BD4258.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409E8_BD4258 +/* BD4258 802409E8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* BD425C 802409EC AFBF0010 */ sw $ra, 0x10($sp) +/* BD4260 802409F0 0C00EABB */ jal get_npc_unsafe +/* BD4264 802409F4 24040001 */ addiu $a0, $zero, 1 +/* BD4268 802409F8 0C090248 */ jal func_80240920_BD4190 +/* BD426C 802409FC 0040202D */ daddu $a0, $v0, $zero +/* BD4270 80240A00 0C00EABB */ jal get_npc_unsafe +/* BD4274 80240A04 24040002 */ addiu $a0, $zero, 2 +/* BD4278 80240A08 0C090248 */ jal func_80240920_BD4190 +/* BD427C 80240A0C 0040202D */ daddu $a0, $v0, $zero +/* BD4280 80240A10 0C00EABB */ jal get_npc_unsafe +/* BD4284 80240A14 24040003 */ addiu $a0, $zero, 3 +/* BD4288 80240A18 0C090248 */ jal func_80240920_BD4190 +/* BD428C 80240A1C 0040202D */ daddu $a0, $v0, $zero +/* BD4290 80240A20 0C00EABB */ jal get_npc_unsafe +/* BD4294 80240A24 24040004 */ addiu $a0, $zero, 4 +/* BD4298 80240A28 0C090248 */ jal func_80240920_BD4190 +/* BD429C 80240A2C 0040202D */ daddu $a0, $v0, $zero +/* BD42A0 80240A30 0C00EABB */ jal get_npc_unsafe +/* BD42A4 80240A34 24040005 */ addiu $a0, $zero, 5 +/* BD42A8 80240A38 0C090248 */ jal func_80240920_BD4190 +/* BD42AC 80240A3C 0040202D */ daddu $a0, $v0, $zero +/* BD42B0 80240A40 0C00EABB */ jal get_npc_unsafe +/* BD42B4 80240A44 24040006 */ addiu $a0, $zero, 6 +/* BD42B8 80240A48 0C090248 */ jal func_80240920_BD4190 +/* BD42BC 80240A4C 0040202D */ daddu $a0, $v0, $zero +/* BD42C0 80240A50 0C00EABB */ jal get_npc_unsafe +/* BD42C4 80240A54 24040007 */ addiu $a0, $zero, 7 +/* BD42C8 80240A58 0C090248 */ jal func_80240920_BD4190 +/* BD42CC 80240A5C 0040202D */ daddu $a0, $v0, $zero +/* BD42D0 80240A60 0C00EABB */ jal get_npc_unsafe +/* BD42D4 80240A64 24040008 */ addiu $a0, $zero, 8 +/* BD42D8 80240A68 0C090248 */ jal func_80240920_BD4190 +/* BD42DC 80240A6C 0040202D */ daddu $a0, $v0, $zero +/* BD42E0 80240A70 8FBF0010 */ lw $ra, 0x10($sp) +/* BD42E4 80240A74 03E00008 */ jr $ra +/* BD42E8 80240A78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s index fbeab54130..5080e3e267 100644 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240AF0_BD4360.s @@ -53,7 +53,7 @@ glabel func_80240AF0_BD4360 /* BD4420 80240BB0 00000000 */ nop /* BD4424 80240BB4 45000003 */ bc1f .L80240BC4 /* BD4428 80240BB8 00000000 */ nop -/* BD442C 80240BBC 0C09027A */ jal func_802409E8 +/* BD442C 80240BBC 0C09027A */ jal func_802409E8_BD4258 /* BD4430 80240BC0 00000000 */ nop .L80240BC4: /* BD4434 80240BC4 C600000C */ lwc1 $f0, 0xc($s0) @@ -78,7 +78,7 @@ glabel func_80240AF0_BD4360 /* BD4480 80240C10 34A50F81 */ ori $a1, $a1, 0xf81 /* BD4484 80240C14 0C0B2026 */ jal set_variable /* BD4488 80240C18 24060001 */ addiu $a2, $zero, 1 -/* BD448C 80240C1C 0C09029F */ jal func_80240A7C +/* BD448C 80240C1C 0C09029F */ jal func_80240A7C_BD42EC /* BD4490 80240C20 00000000 */ nop /* BD4494 80240C24 08090320 */ j .L80240C80 /* BD4498 80240C28 2402000C */ addiu $v0, $zero, 0xc diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FD8.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FD8.s deleted file mode 100644 index e5027de9eb..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FD8.s +++ /dev/null @@ -1,7 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FD8 -/* BD4848 80240FD8 AC800074 */ sw $zero, 0x74($a0) -/* BD484C 80240FDC 03E00008 */ jr $ra -/* BD4850 80240FE0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FD8_BD4848.s b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FD8_BD4848.s new file mode 100644 index 0000000000..fc2463b7df --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4110/func_80240FD8_BD4848.s @@ -0,0 +1,7 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FD8_BD4848 +/* BD4848 80240FD8 AC800074 */ sw $zero, 0x74($a0) +/* BD484C 80240FDC 03E00008 */ jr $ra +/* BD4850 80240FE0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220.s b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220.s deleted file mode 100644 index e391e3633c..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220.s +++ /dev/null @@ -1,43 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241220 -/* BD4A90 80241220 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* BD4A94 80241224 AFB20018 */ sw $s2, 0x18($sp) -/* BD4A98 80241228 0080902D */ daddu $s2, $a0, $zero -/* BD4A9C 8024122C 2404000B */ addiu $a0, $zero, 0xb -/* BD4AA0 80241230 AFBF001C */ sw $ra, 0x1c($sp) -/* BD4AA4 80241234 AFB10014 */ sw $s1, 0x14($sp) -/* BD4AA8 80241238 0C00EABB */ jal get_npc_unsafe -/* BD4AAC 8024123C AFB00010 */ sw $s0, 0x10($sp) -/* BD4AB0 80241240 0000202D */ daddu $a0, $zero, $zero -/* BD4AB4 80241244 0C00EABB */ jal get_npc_unsafe -/* BD4AB8 80241248 0040882D */ daddu $s1, $v0, $zero -/* BD4ABC 8024124C 0040802D */ daddu $s0, $v0, $zero -/* BD4AC0 80241250 C6000038 */ lwc1 $f0, 0x38($s0) -/* BD4AC4 80241254 E6200038 */ swc1 $f0, 0x38($s1) -/* BD4AC8 80241258 C6000040 */ lwc1 $f0, 0x40($s0) -/* BD4ACC 8024125C E6200040 */ swc1 $f0, 0x40($s1) -/* BD4AD0 80241260 C6440084 */ lwc1 $f4, 0x84($s2) -/* BD4AD4 80241264 46802120 */ cvt.s.w $f4, $f4 -/* BD4AD8 80241268 8E050010 */ lw $a1, 0x10($s0) -/* BD4ADC 8024126C 44062000 */ mfc1 $a2, $f4 -/* BD4AE0 80241270 0C00EA95 */ jal npc_move_heading -/* BD4AE4 80241274 0220202D */ daddu $a0, $s1, $zero -/* BD4AE8 80241278 C600003C */ lwc1 $f0, 0x3c($s0) -/* BD4AEC 8024127C 3C01447A */ lui $at, 0x447a -/* BD4AF0 80241280 44811000 */ mtc1 $at, $f2 -/* BD4AF4 80241284 00000000 */ nop -/* BD4AF8 80241288 46020000 */ add.s $f0, $f0, $f2 -/* BD4AFC 8024128C 3C0141C8 */ lui $at, 0x41c8 -/* BD4B00 80241290 44811000 */ mtc1 $at, $f2 -/* BD4B04 80241294 00000000 */ nop -/* BD4B08 80241298 46020000 */ add.s $f0, $f0, $f2 -/* BD4B0C 8024129C E620003C */ swc1 $f0, 0x3c($s1) -/* BD4B10 802412A0 8FBF001C */ lw $ra, 0x1c($sp) -/* BD4B14 802412A4 8FB20018 */ lw $s2, 0x18($sp) -/* BD4B18 802412A8 8FB10014 */ lw $s1, 0x14($sp) -/* BD4B1C 802412AC 8FB00010 */ lw $s0, 0x10($sp) -/* BD4B20 802412B0 24020002 */ addiu $v0, $zero, 2 -/* BD4B24 802412B4 03E00008 */ jr $ra -/* BD4B28 802412B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s new file mode 100644 index 0000000000..447a301925 --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_08/BD4A90/func_80241220_BD4A90.s @@ -0,0 +1,43 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241220_BD4A90 +/* BD4A90 80241220 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* BD4A94 80241224 AFB20018 */ sw $s2, 0x18($sp) +/* BD4A98 80241228 0080902D */ daddu $s2, $a0, $zero +/* BD4A9C 8024122C 2404000B */ addiu $a0, $zero, 0xb +/* BD4AA0 80241230 AFBF001C */ sw $ra, 0x1c($sp) +/* BD4AA4 80241234 AFB10014 */ sw $s1, 0x14($sp) +/* BD4AA8 80241238 0C00EABB */ jal get_npc_unsafe +/* BD4AAC 8024123C AFB00010 */ sw $s0, 0x10($sp) +/* BD4AB0 80241240 0000202D */ daddu $a0, $zero, $zero +/* BD4AB4 80241244 0C00EABB */ jal get_npc_unsafe +/* BD4AB8 80241248 0040882D */ daddu $s1, $v0, $zero +/* BD4ABC 8024124C 0040802D */ daddu $s0, $v0, $zero +/* BD4AC0 80241250 C6000038 */ lwc1 $f0, 0x38($s0) +/* BD4AC4 80241254 E6200038 */ swc1 $f0, 0x38($s1) +/* BD4AC8 80241258 C6000040 */ lwc1 $f0, 0x40($s0) +/* BD4ACC 8024125C E6200040 */ swc1 $f0, 0x40($s1) +/* BD4AD0 80241260 C6440084 */ lwc1 $f4, 0x84($s2) +/* BD4AD4 80241264 46802120 */ cvt.s.w $f4, $f4 +/* BD4AD8 80241268 8E050010 */ lw $a1, 0x10($s0) +/* BD4ADC 8024126C 44062000 */ mfc1 $a2, $f4 +/* BD4AE0 80241270 0C00EA95 */ jal npc_move_heading +/* BD4AE4 80241274 0220202D */ daddu $a0, $s1, $zero +/* BD4AE8 80241278 C600003C */ lwc1 $f0, 0x3c($s0) +/* BD4AEC 8024127C 3C01447A */ lui $at, 0x447a +/* BD4AF0 80241280 44811000 */ mtc1 $at, $f2 +/* BD4AF4 80241284 00000000 */ nop +/* BD4AF8 80241288 46020000 */ add.s $f0, $f0, $f2 +/* BD4AFC 8024128C 3C0141C8 */ lui $at, 0x41c8 +/* BD4B00 80241290 44811000 */ mtc1 $at, $f2 +/* BD4B04 80241294 00000000 */ nop +/* BD4B08 80241298 46020000 */ add.s $f0, $f0, $f2 +/* BD4B0C 8024129C E620003C */ swc1 $f0, 0x3c($s1) +/* BD4B10 802412A0 8FBF001C */ lw $ra, 0x1c($sp) +/* BD4B14 802412A4 8FB20018 */ lw $s2, 0x18($sp) +/* BD4B18 802412A8 8FB10014 */ lw $s1, 0x14($sp) +/* BD4B1C 802412AC 8FB00010 */ lw $s0, 0x10($sp) +/* BD4B20 802412B0 24020002 */ addiu $v0, $zero, 2 +/* BD4B24 802412B4 03E00008 */ jr $ra +/* BD4B28 802412B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190.s b/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190.s deleted file mode 100644 index e907707f70..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240190 -/* BDA940 80240190 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* BDA944 80240194 AFB20020 */ sw $s2, 0x20($sp) -/* BDA948 80240198 0080902D */ daddu $s2, $a0, $zero -/* BDA94C 8024019C AFBF0024 */ sw $ra, 0x24($sp) -/* BDA950 802401A0 AFB1001C */ sw $s1, 0x1c($sp) -/* BDA954 802401A4 AFB00018 */ sw $s0, 0x18($sp) -/* BDA958 802401A8 0C00EAD2 */ jal get_npc_safe -/* BDA95C 802401AC 8E44014C */ lw $a0, 0x14c($s2) -/* BDA960 802401B0 24040020 */ addiu $a0, $zero, 0x20 -/* BDA964 802401B4 0C00AB39 */ jal heap_malloc -/* BDA968 802401B8 0040882D */ daddu $s1, $v0, $zero -/* BDA96C 802401BC 0040802D */ daddu $s0, $v0, $zero -/* BDA970 802401C0 AE500060 */ sw $s0, 0x60($s2) -/* BDA974 802401C4 C6200038 */ lwc1 $f0, 0x38($s1) -/* BDA978 802401C8 3C013F80 */ lui $at, 0x3f80 -/* BDA97C 802401CC 44811000 */ mtc1 $at, $f2 -/* BDA980 802401D0 E6000000 */ swc1 $f0, ($s0) -/* BDA984 802401D4 C620003C */ lwc1 $f0, 0x3c($s1) -/* BDA988 802401D8 E6000004 */ swc1 $f0, 4($s0) -/* BDA98C 802401DC C6200040 */ lwc1 $f0, 0x40($s1) -/* BDA990 802401E0 AE000010 */ sw $zero, 0x10($s0) -/* BDA994 802401E4 E6000008 */ swc1 $f0, 8($s0) -/* BDA998 802401E8 E7A20010 */ swc1 $f2, 0x10($sp) -/* BDA99C 802401EC AFA00014 */ sw $zero, 0x14($sp) -/* BDA9A0 802401F0 8E050000 */ lw $a1, ($s0) -/* BDA9A4 802401F4 8E060004 */ lw $a2, 4($s0) -/* BDA9A8 802401F8 8E070008 */ lw $a3, 8($s0) -/* BDA9AC 802401FC 0C01C9AC */ jal func_800726B0 -/* BDA9B0 80240200 24040001 */ addiu $a0, $zero, 1 -/* BDA9B4 80240204 AE02001C */ sw $v0, 0x1c($s0) -/* BDA9B8 80240208 8C43000C */ lw $v1, 0xc($v0) -/* BDA9BC 8024020C 24020002 */ addiu $v0, $zero, 2 -/* BDA9C0 80240210 A0620034 */ sb $v0, 0x34($v1) -/* BDA9C4 80240214 8E050000 */ lw $a1, ($s0) -/* BDA9C8 80240218 8E060004 */ lw $a2, 4($s0) -/* BDA9CC 8024021C 8E070008 */ lw $a3, 8($s0) -/* BDA9D0 80240220 0C044898 */ jal create_shadow_type -/* BDA9D4 80240224 0000202D */ daddu $a0, $zero, $zero -/* BDA9D8 80240228 AE020018 */ sw $v0, 0x18($s0) -/* BDA9DC 8024022C 8FBF0024 */ lw $ra, 0x24($sp) -/* BDA9E0 80240230 8FB20020 */ lw $s2, 0x20($sp) -/* BDA9E4 80240234 8FB1001C */ lw $s1, 0x1c($sp) -/* BDA9E8 80240238 8FB00018 */ lw $s0, 0x18($sp) -/* BDA9EC 8024023C 24020002 */ addiu $v0, $zero, 2 -/* BDA9F0 80240240 03E00008 */ jr $ra -/* BDA9F4 80240244 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190_BDA940.s b/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190_BDA940.s new file mode 100644 index 0000000000..a57053670b --- /dev/null +++ b/asm/nonmatchings/world/area_obk/obk_09/BDA940/func_80240190_BDA940.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240190_BDA940 +/* BDA940 80240190 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* BDA944 80240194 AFB20020 */ sw $s2, 0x20($sp) +/* BDA948 80240198 0080902D */ daddu $s2, $a0, $zero +/* BDA94C 8024019C AFBF0024 */ sw $ra, 0x24($sp) +/* BDA950 802401A0 AFB1001C */ sw $s1, 0x1c($sp) +/* BDA954 802401A4 AFB00018 */ sw $s0, 0x18($sp) +/* BDA958 802401A8 0C00EAD2 */ jal get_npc_safe +/* BDA95C 802401AC 8E44014C */ lw $a0, 0x14c($s2) +/* BDA960 802401B0 24040020 */ addiu $a0, $zero, 0x20 +/* BDA964 802401B4 0C00AB39 */ jal heap_malloc +/* BDA968 802401B8 0040882D */ daddu $s1, $v0, $zero +/* BDA96C 802401BC 0040802D */ daddu $s0, $v0, $zero +/* BDA970 802401C0 AE500060 */ sw $s0, 0x60($s2) +/* BDA974 802401C4 C6200038 */ lwc1 $f0, 0x38($s1) +/* BDA978 802401C8 3C013F80 */ lui $at, 0x3f80 +/* BDA97C 802401CC 44811000 */ mtc1 $at, $f2 +/* BDA980 802401D0 E6000000 */ swc1 $f0, ($s0) +/* BDA984 802401D4 C620003C */ lwc1 $f0, 0x3c($s1) +/* BDA988 802401D8 E6000004 */ swc1 $f0, 4($s0) +/* BDA98C 802401DC C6200040 */ lwc1 $f0, 0x40($s1) +/* BDA990 802401E0 AE000010 */ sw $zero, 0x10($s0) +/* BDA994 802401E4 E6000008 */ swc1 $f0, 8($s0) +/* BDA998 802401E8 E7A20010 */ swc1 $f2, 0x10($sp) +/* BDA99C 802401EC AFA00014 */ sw $zero, 0x14($sp) +/* BDA9A0 802401F0 8E050000 */ lw $a1, ($s0) +/* BDA9A4 802401F4 8E060004 */ lw $a2, 4($s0) +/* BDA9A8 802401F8 8E070008 */ lw $a3, 8($s0) +/* BDA9AC 802401FC 0C01C9AC */ jal func_800726B0 +/* BDA9B0 80240200 24040001 */ addiu $a0, $zero, 1 +/* BDA9B4 80240204 AE02001C */ sw $v0, 0x1c($s0) +/* BDA9B8 80240208 8C43000C */ lw $v1, 0xc($v0) +/* BDA9BC 8024020C 24020002 */ addiu $v0, $zero, 2 +/* BDA9C0 80240210 A0620034 */ sb $v0, 0x34($v1) +/* BDA9C4 80240214 8E050000 */ lw $a1, ($s0) +/* BDA9C8 80240218 8E060004 */ lw $a2, 4($s0) +/* BDA9CC 8024021C 8E070008 */ lw $a3, 8($s0) +/* BDA9D0 80240220 0C044898 */ jal create_shadow_type +/* BDA9D4 80240224 0000202D */ daddu $a0, $zero, $zero +/* BDA9D8 80240228 AE020018 */ sw $v0, 0x18($s0) +/* BDA9DC 8024022C 8FBF0024 */ lw $ra, 0x24($sp) +/* BDA9E0 80240230 8FB20020 */ lw $s2, 0x20($sp) +/* BDA9E4 80240234 8FB1001C */ lw $s1, 0x1c($sp) +/* BDA9E8 80240238 8FB00018 */ lw $s0, 0x18($sp) +/* BDA9EC 8024023C 24020002 */ addiu $v0, $zero, 2 +/* BDA9F0 80240240 03E00008 */ jr $ra +/* BDA9F4 80240244 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s index d9dbb0db5d..c444f945db 100644 --- a/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s +++ b/asm/nonmatchings/world/area_omo/omo_01/D9B150/func_802409EC_D9B8DC.s @@ -122,17 +122,17 @@ glabel func_802409EC_D9B8DC /* D9BAA0 80240BB0 00000000 */ nop /* D9BAA4 80240BB4 0280202D */ daddu $a0, $s4, $zero /* D9BAA8 80240BB8 0240282D */ daddu $a1, $s2, $zero -/* D9BAAC 80240BBC 0C090098 */ jal func_80240260 +/* D9BAAC 80240BBC 0C090098 */ jal func_80240260_D9B150 /* D9BAB0 80240BC0 0260302D */ daddu $a2, $s3, $zero /* D9BAB4 80240BC4 0280202D */ daddu $a0, $s4, $zero /* D9BAB8 80240BC8 0240282D */ daddu $a1, $s2, $zero -/* D9BABC 80240BCC 0C090211 */ jal func_80240844 +/* D9BABC 80240BCC 0C090211 */ jal func_80240844_D9B734 /* D9BAC0 80240BD0 0260302D */ daddu $a2, $s3, $zero /* D9BAC4 80240BD4 080902FF */ j .L80240BFC /* D9BAC8 80240BD8 00000000 */ nop /* D9BACC 80240BDC 0280202D */ daddu $a0, $s4, $zero /* D9BAD0 80240BE0 0240282D */ daddu $a1, $s2, $zero -/* D9BAD4 80240BE4 0C09026A */ jal func_802409A8 +/* D9BAD4 80240BE4 0C09026A */ jal func_802409A8_D9B898 /* D9BAD8 80240BE8 0260302D */ daddu $a2, $s3, $zero /* D9BADC 80240BEC 080902FF */ j .L80240BFC /* D9BAE0 80240BF0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s index e24a724b87..a08c2a347c 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802402C0_D9D790.s @@ -25,7 +25,7 @@ glabel func_802402C0_D9D790 /* D9D7DC 8024030C 16020005 */ bne $s0, $v0, .L80240324 /* D9D7E0 80240310 24020001 */ addiu $v0, $zero, 1 /* D9D7E4 80240314 0260202D */ daddu $a0, $s3, $zero -/* D9D7E8 80240318 0C0900B0 */ jal func_802402C0 +/* D9D7E8 80240318 0C0900B0 */ jal func_802402C0_D9D790 /* D9D7EC 8024031C 02A0282D */ daddu $a1, $s5, $zero /* D9D7F0 80240320 24020001 */ addiu $v0, $zero, 1 .L80240324: diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s index 52ad8db29b..76cfad929e 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024043C_D9D90C.s @@ -120,7 +120,7 @@ glabel func_8024043C_D9D90C /* D9DAD4 80240604 8E420008 */ lw $v0, 8($s2) /* D9DAD8 80240608 8C420004 */ lw $v0, 4($v0) /* D9DADC 8024060C 8C440000 */ lw $a0, ($v0) -/* D9DAE0 80240610 0C0900B0 */ jal func_802402C0 +/* D9DAE0 80240610 0C0900B0 */ jal func_802402C0_D9D790 /* D9DAE4 80240614 0200282D */ daddu $a1, $s0, $zero /* D9DAE8 80240618 0000302D */ daddu $a2, $zero, $zero /* D9DAEC 8024061C 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s index 17d694e9d4..e743d02dc2 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240BA8_D9E078.s @@ -173,7 +173,7 @@ glabel func_80240BA8_D9E078 /* D9E300 80240E30 00000000 */ nop /* D9E304 80240E34 0260202D */ daddu $a0, $s3, $zero /* D9E308 80240E38 0280282D */ daddu $a1, $s4, $zero -/* D9E30C 80240E3C 0C09025C */ jal func_80240970 +/* D9E30C 80240E3C 0C09025C */ jal func_80240970_D9DE40 /* D9E310 80240E40 02A0302D */ daddu $a2, $s5, $zero /* D9E314 80240E44 8E630070 */ lw $v1, 0x70($s3) /* D9E318 80240E48 2402000F */ addiu $v0, $zero, 0xf @@ -181,7 +181,7 @@ glabel func_80240BA8_D9E078 /* D9E320 80240E50 00000000 */ nop /* D9E324 80240E54 0260202D */ daddu $a0, $s3, $zero /* D9E328 80240E58 0280282D */ daddu $a1, $s4, $zero -/* D9E32C 80240E5C 0C090278 */ jal func_802409E0 +/* D9E32C 80240E5C 0C090278 */ jal func_802409E0_D9DEB0 /* D9E330 80240E60 02A0302D */ daddu $a2, $s5, $zero /* D9E334 80240E64 8E630070 */ lw $v1, 0x70($s3) /* D9E338 80240E68 24020010 */ addiu $v0, $zero, 0x10 @@ -189,7 +189,7 @@ glabel func_80240BA8_D9E078 /* D9E340 80240E70 00000000 */ nop /* D9E344 80240E74 0260202D */ daddu $a0, $s3, $zero /* D9E348 80240E78 0280282D */ daddu $a1, $s4, $zero -/* D9E34C 80240E7C 0C0902AC */ jal func_80240AB0 +/* D9E34C 80240E7C 0C0902AC */ jal func_80240AB0_D9DF80 /* D9E350 80240E80 02A0302D */ daddu $a2, $s5, $zero /* D9E354 80240E84 8E630070 */ lw $v1, 0x70($s3) /* D9E358 80240E88 24020011 */ addiu $v0, $zero, 0x11 @@ -197,7 +197,7 @@ glabel func_80240BA8_D9E078 /* D9E360 80240E90 00000000 */ nop /* D9E364 80240E94 0260202D */ daddu $a0, $s3, $zero /* D9E368 80240E98 0280282D */ daddu $a1, $s4, $zero -/* D9E36C 80240E9C 0C0902D2 */ jal func_80240B48 +/* D9E36C 80240E9C 0C0902D2 */ jal func_80240B48_D9E018 /* D9E370 80240EA0 02A0302D */ daddu $a2, $s5, $zero /* D9E374 80240EA4 080903AD */ j .L80240EB4 /* D9E378 80240EA8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC.s deleted file mode 100644 index 6ba53491dc..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EDC -/* D9E3AC 80240EDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D9E3B0 80240EE0 AFB00010 */ sw $s0, 0x10($sp) -/* D9E3B4 80240EE4 0080802D */ daddu $s0, $a0, $zero -/* D9E3B8 80240EE8 AFBF001C */ sw $ra, 0x1c($sp) -/* D9E3BC 80240EEC AFB20018 */ sw $s2, 0x18($sp) -/* D9E3C0 80240EF0 AFB10014 */ sw $s1, 0x14($sp) -/* D9E3C4 80240EF4 8E110148 */ lw $s1, 0x148($s0) -/* D9E3C8 80240EF8 86240008 */ lh $a0, 8($s1) -/* D9E3CC 80240EFC 0C00EABB */ jal get_npc_unsafe -/* D9E3D0 80240F00 00A0902D */ daddu $s2, $a1, $zero -/* D9E3D4 80240F04 8E2300CC */ lw $v1, 0xcc($s1) -/* D9E3D8 80240F08 0040202D */ daddu $a0, $v0, $zero -/* D9E3DC 80240F0C 8C630000 */ lw $v1, ($v1) -/* D9E3E0 80240F10 24020001 */ addiu $v0, $zero, 1 -/* D9E3E4 80240F14 AC830028 */ sw $v1, 0x28($a0) -/* D9E3E8 80240F18 AE020070 */ sw $v0, 0x70($s0) -/* D9E3EC 80240F1C 8E220000 */ lw $v0, ($s1) -/* D9E3F0 80240F20 3C030010 */ lui $v1, 0x10 -/* D9E3F4 80240F24 00431024 */ and $v0, $v0, $v1 -/* D9E3F8 80240F28 10400004 */ beqz $v0, .L80240F3C -/* D9E3FC 80240F2C 00000000 */ nop -/* D9E400 80240F30 C620006C */ lwc1 $f0, 0x6c($s1) -/* D9E404 80240F34 46800020 */ cvt.s.w $f0, $f0 -/* D9E408 80240F38 E480000C */ swc1 $f0, 0xc($a0) -.L80240F3C: -/* D9E40C 80240F3C 8E2200D0 */ lw $v0, 0xd0($s1) -/* D9E410 80240F40 8C420014 */ lw $v0, 0x14($v0) -/* D9E414 80240F44 1C400004 */ bgtz $v0, .L80240F58 -/* D9E418 80240F48 00000000 */ nop -/* D9E41C 80240F4C C640000C */ lwc1 $f0, 0xc($s2) -/* D9E420 80240F50 080903DE */ j .L80240F78 -/* D9E424 80240F54 E4800018 */ swc1 $f0, 0x18($a0) -.L80240F58: -/* D9E428 80240F58 3C018024 */ lui $at, 0x8024 -/* D9E42C 80240F5C D4227A10 */ ldc1 $f2, 0x7a10($at) -/* D9E430 80240F60 44820000 */ mtc1 $v0, $f0 -/* D9E434 80240F64 00000000 */ nop -/* D9E438 80240F68 46800021 */ cvt.d.w $f0, $f0 -/* D9E43C 80240F6C 46220003 */ div.d $f0, $f0, $f2 -/* D9E440 80240F70 46200020 */ cvt.s.d $f0, $f0 -/* D9E444 80240F74 E4800018 */ swc1 $f0, 0x18($a0) -.L80240F78: -/* D9E448 80240F78 8FBF001C */ lw $ra, 0x1c($sp) -/* D9E44C 80240F7C 8FB20018 */ lw $s2, 0x18($sp) -/* D9E450 80240F80 8FB10014 */ lw $s1, 0x14($sp) -/* D9E454 80240F84 8FB00010 */ lw $s0, 0x10($sp) -/* D9E458 80240F88 03E00008 */ jr $ra -/* D9E45C 80240F8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s new file mode 100644 index 0000000000..ae10398d49 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80240EDC_D9E3AC.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EDC_D9E3AC +/* D9E3AC 80240EDC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D9E3B0 80240EE0 AFB00010 */ sw $s0, 0x10($sp) +/* D9E3B4 80240EE4 0080802D */ daddu $s0, $a0, $zero +/* D9E3B8 80240EE8 AFBF001C */ sw $ra, 0x1c($sp) +/* D9E3BC 80240EEC AFB20018 */ sw $s2, 0x18($sp) +/* D9E3C0 80240EF0 AFB10014 */ sw $s1, 0x14($sp) +/* D9E3C4 80240EF4 8E110148 */ lw $s1, 0x148($s0) +/* D9E3C8 80240EF8 86240008 */ lh $a0, 8($s1) +/* D9E3CC 80240EFC 0C00EABB */ jal get_npc_unsafe +/* D9E3D0 80240F00 00A0902D */ daddu $s2, $a1, $zero +/* D9E3D4 80240F04 8E2300CC */ lw $v1, 0xcc($s1) +/* D9E3D8 80240F08 0040202D */ daddu $a0, $v0, $zero +/* D9E3DC 80240F0C 8C630000 */ lw $v1, ($v1) +/* D9E3E0 80240F10 24020001 */ addiu $v0, $zero, 1 +/* D9E3E4 80240F14 AC830028 */ sw $v1, 0x28($a0) +/* D9E3E8 80240F18 AE020070 */ sw $v0, 0x70($s0) +/* D9E3EC 80240F1C 8E220000 */ lw $v0, ($s1) +/* D9E3F0 80240F20 3C030010 */ lui $v1, 0x10 +/* D9E3F4 80240F24 00431024 */ and $v0, $v0, $v1 +/* D9E3F8 80240F28 10400004 */ beqz $v0, .L80240F3C +/* D9E3FC 80240F2C 00000000 */ nop +/* D9E400 80240F30 C620006C */ lwc1 $f0, 0x6c($s1) +/* D9E404 80240F34 46800020 */ cvt.s.w $f0, $f0 +/* D9E408 80240F38 E480000C */ swc1 $f0, 0xc($a0) +.L80240F3C: +/* D9E40C 80240F3C 8E2200D0 */ lw $v0, 0xd0($s1) +/* D9E410 80240F40 8C420014 */ lw $v0, 0x14($v0) +/* D9E414 80240F44 1C400004 */ bgtz $v0, .L80240F58 +/* D9E418 80240F48 00000000 */ nop +/* D9E41C 80240F4C C640000C */ lwc1 $f0, 0xc($s2) +/* D9E420 80240F50 080903DE */ j .L80240F78 +/* D9E424 80240F54 E4800018 */ swc1 $f0, 0x18($a0) +.L80240F58: +/* D9E428 80240F58 3C018024 */ lui $at, 0x8024 +/* D9E42C 80240F5C D4227A10 */ ldc1 $f2, 0x7a10($at) +/* D9E430 80240F60 44820000 */ mtc1 $v0, $f0 +/* D9E434 80240F64 00000000 */ nop +/* D9E438 80240F68 46800021 */ cvt.d.w $f0, $f0 +/* D9E43C 80240F6C 46220003 */ div.d $f0, $f0, $f2 +/* D9E440 80240F70 46200020 */ cvt.s.d $f0, $f0 +/* D9E444 80240F74 E4800018 */ swc1 $f0, 0x18($a0) +.L80240F78: +/* D9E448 80240F78 8FBF001C */ lw $ra, 0x1c($sp) +/* D9E44C 80240F7C 8FB20018 */ lw $s2, 0x18($sp) +/* D9E450 80240F80 8FB10014 */ lw $s1, 0x14($sp) +/* D9E454 80240F84 8FB00010 */ lw $s0, 0x10($sp) +/* D9E458 80240F88 03E00008 */ jr $ra +/* D9E45C 80240F8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110.s deleted file mode 100644 index 5f286fd5a6..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241110 -/* D9E5E0 80241110 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9E5E4 80241114 AFB00010 */ sw $s0, 0x10($sp) -/* D9E5E8 80241118 0080802D */ daddu $s0, $a0, $zero -/* D9E5EC 8024111C AFBF0014 */ sw $ra, 0x14($sp) -/* D9E5F0 80241120 8E020148 */ lw $v0, 0x148($s0) -/* D9E5F4 80241124 0C00EABB */ jal get_npc_unsafe -/* D9E5F8 80241128 84440008 */ lh $a0, 8($v0) -/* D9E5FC 8024112C 0040202D */ daddu $a0, $v0, $zero -/* D9E600 80241130 C482003C */ lwc1 $f2, 0x3c($a0) -/* D9E604 80241134 C480001C */ lwc1 $f0, 0x1c($a0) -/* D9E608 80241138 46001080 */ add.s $f2, $f2, $f0 -/* D9E60C 8024113C C4840014 */ lwc1 $f4, 0x14($a0) -/* D9E610 80241140 46040001 */ sub.s $f0, $f0, $f4 -/* D9E614 80241144 C4840064 */ lwc1 $f4, 0x64($a0) -/* D9E618 80241148 4602203C */ c.lt.s $f4, $f2 -/* D9E61C 8024114C E482003C */ swc1 $f2, 0x3c($a0) -/* D9E620 80241150 45010009 */ bc1t .L80241178 -/* D9E624 80241154 E480001C */ swc1 $f0, 0x1c($a0) -/* D9E628 80241158 8C820000 */ lw $v0, ($a0) -/* D9E62C 8024115C 2403F7FF */ addiu $v1, $zero, -0x801 -/* D9E630 80241160 E484003C */ swc1 $f4, 0x3c($a0) -/* D9E634 80241164 AC80001C */ sw $zero, 0x1c($a0) -/* D9E638 80241168 00431024 */ and $v0, $v0, $v1 -/* D9E63C 8024116C AC820000 */ sw $v0, ($a0) -/* D9E640 80241170 2402000C */ addiu $v0, $zero, 0xc -/* D9E644 80241174 AE020070 */ sw $v0, 0x70($s0) -.L80241178: -/* D9E648 80241178 8FBF0014 */ lw $ra, 0x14($sp) -/* D9E64C 8024117C 8FB00010 */ lw $s0, 0x10($sp) -/* D9E650 80241180 03E00008 */ jr $ra -/* D9E654 80241184 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110_D9E5E0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110_D9E5E0.s new file mode 100644 index 0000000000..1d614e70bf --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241110_D9E5E0.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241110_D9E5E0 +/* D9E5E0 80241110 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D9E5E4 80241114 AFB00010 */ sw $s0, 0x10($sp) +/* D9E5E8 80241118 0080802D */ daddu $s0, $a0, $zero +/* D9E5EC 8024111C AFBF0014 */ sw $ra, 0x14($sp) +/* D9E5F0 80241120 8E020148 */ lw $v0, 0x148($s0) +/* D9E5F4 80241124 0C00EABB */ jal get_npc_unsafe +/* D9E5F8 80241128 84440008 */ lh $a0, 8($v0) +/* D9E5FC 8024112C 0040202D */ daddu $a0, $v0, $zero +/* D9E600 80241130 C482003C */ lwc1 $f2, 0x3c($a0) +/* D9E604 80241134 C480001C */ lwc1 $f0, 0x1c($a0) +/* D9E608 80241138 46001080 */ add.s $f2, $f2, $f0 +/* D9E60C 8024113C C4840014 */ lwc1 $f4, 0x14($a0) +/* D9E610 80241140 46040001 */ sub.s $f0, $f0, $f4 +/* D9E614 80241144 C4840064 */ lwc1 $f4, 0x64($a0) +/* D9E618 80241148 4602203C */ c.lt.s $f4, $f2 +/* D9E61C 8024114C E482003C */ swc1 $f2, 0x3c($a0) +/* D9E620 80241150 45010009 */ bc1t .L80241178 +/* D9E624 80241154 E480001C */ swc1 $f0, 0x1c($a0) +/* D9E628 80241158 8C820000 */ lw $v0, ($a0) +/* D9E62C 8024115C 2403F7FF */ addiu $v1, $zero, -0x801 +/* D9E630 80241160 E484003C */ swc1 $f4, 0x3c($a0) +/* D9E634 80241164 AC80001C */ sw $zero, 0x1c($a0) +/* D9E638 80241168 00431024 */ and $v0, $v0, $v1 +/* D9E63C 8024116C AC820000 */ sw $v0, ($a0) +/* D9E640 80241170 2402000C */ addiu $v0, $zero, 0xc +/* D9E644 80241174 AE020070 */ sw $v0, 0x70($s0) +.L80241178: +/* D9E648 80241178 8FBF0014 */ lw $ra, 0x14($sp) +/* D9E64C 8024117C 8FB00010 */ lw $s0, 0x10($sp) +/* D9E650 80241180 03E00008 */ jr $ra +/* D9E654 80241184 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s index 8aa90cb768..a104c74be8 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802416D0_D9EBA0.s @@ -109,31 +109,31 @@ glabel func_802416D0_D9EBA0 /* D9ED2C 8024185C 00000000 */ nop /* D9ED30 80241860 0280202D */ daddu $a0, $s4, $zero /* D9ED34 80241864 0260282D */ daddu $a1, $s3, $zero -/* D9ED38 80241868 0C0903B7 */ jal func_80240EDC +/* D9ED38 80241868 0C0903B7 */ jal func_80240EDC_D9E3AC /* D9ED3C 8024186C 02A0302D */ daddu $a2, $s5, $zero /* D9ED40 80241870 0280202D */ daddu $a0, $s4, $zero /* D9ED44 80241874 0260282D */ daddu $a1, $s3, $zero -/* D9ED48 80241878 0C0903E4 */ jal func_80240F90 +/* D9ED48 80241878 0C0903E4 */ jal func_80240F90_D9E460 /* D9ED4C 8024187C 02A0302D */ daddu $a2, $s5, $zero /* D9ED50 80241880 08090648 */ j .L80241920 /* D9ED54 80241884 00000000 */ nop /* D9ED58 80241888 0280202D */ daddu $a0, $s4, $zero /* D9ED5C 8024188C 0260282D */ daddu $a1, $s3, $zero -/* D9ED60 80241890 0C09042C */ jal func_802410B0 +/* D9ED60 80241890 0C09042C */ jal func_802410B0_D9E580 /* D9ED64 80241894 02A0302D */ daddu $a2, $s5, $zero /* D9ED68 80241898 0280202D */ daddu $a0, $s4, $zero /* D9ED6C 8024189C 0260282D */ daddu $a1, $s3, $zero -/* D9ED70 802418A0 0C090444 */ jal func_80241110 +/* D9ED70 802418A0 0C090444 */ jal func_80241110_D9E5E0 /* D9ED74 802418A4 02A0302D */ daddu $a2, $s5, $zero /* D9ED78 802418A8 08090648 */ j .L80241920 /* D9ED7C 802418AC 00000000 */ nop /* D9ED80 802418B0 0280202D */ daddu $a0, $s4, $zero /* D9ED84 802418B4 0260282D */ daddu $a1, $s3, $zero -/* D9ED88 802418B8 0C090462 */ jal func_80241188 +/* D9ED88 802418B8 0C090462 */ jal func_80241188_D9E658 /* D9ED8C 802418BC 02A0302D */ daddu $a2, $s5, $zero /* D9ED90 802418C0 0280202D */ daddu $a0, $s4, $zero /* D9ED94 802418C4 0260282D */ daddu $a1, $s3, $zero -/* D9ED98 802418C8 0C0904AE */ jal func_802412B8 +/* D9ED98 802418C8 0C0904AE */ jal func_802412B8_D9E788 /* D9ED9C 802418CC 02A0302D */ daddu $a2, $s5, $zero /* D9EDA0 802418D0 08090648 */ j .L80241920 /* D9EDA4 802418D4 00000000 */ nop @@ -145,11 +145,11 @@ glabel func_802416D0_D9EBA0 /* D9EDBC 802418EC 00000000 */ nop /* D9EDC0 802418F0 0280202D */ daddu $a0, $s4, $zero /* D9EDC4 802418F4 0260282D */ daddu $a1, $s3, $zero -/* D9EDC8 802418F8 0C090507 */ jal func_8024141C +/* D9EDC8 802418F8 0C090507 */ jal func_8024141C_D9E8EC /* D9EDCC 802418FC 02A0302D */ daddu $a2, $s5, $zero /* D9EDD0 80241900 0280202D */ daddu $a0, $s4, $zero /* D9EDD4 80241904 0260282D */ daddu $a1, $s3, $zero -/* D9EDD8 80241908 0C090532 */ jal func_802414C8 +/* D9EDD8 80241908 0C090532 */ jal func_802414C8_D9E998 /* D9EDDC 8024190C 02A0302D */ daddu $a2, $s5, $zero /* D9EDE0 80241910 08090648 */ j .L80241920 /* D9EDE4 80241914 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s index 08a531abb9..0edbcbbcb0 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241B38_D9F008.s @@ -55,7 +55,7 @@ glabel func_80241B38_D9F008 /* D9F0D0 80241C00 08090716 */ j .L80241C58 /* D9F0D4 80241C04 AE030028 */ sw $v1, 0x28($s0) .L80241C08: -/* D9F0D8 80241C08 0C090652 */ jal func_80241948 +/* D9F0D8 80241C08 0C090652 */ jal func_80241948_D9EE18 /* D9F0DC 80241C0C 0240202D */ daddu $a0, $s2, $zero /* D9F0E0 80241C10 0040202D */ daddu $a0, $v0, $zero /* D9F0E4 80241C14 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s index 960f258344..1e934332ea 100644 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241C7C_D9F14C.s @@ -18,7 +18,7 @@ glabel func_80241C7C_D9F14C /* D9F180 80241CB0 00021400 */ sll $v0, $v0, 0x10 /* D9F184 80241CB4 1C40002B */ bgtz $v0, .L80241D64 /* D9F188 80241CB8 00000000 */ nop -/* D9F18C 80241CBC 0C090652 */ jal func_80241948 +/* D9F18C 80241CBC 0C090652 */ jal func_80241948_D9EE18 /* D9F190 80241CC0 0240202D */ daddu $a0, $s2, $zero /* D9F194 80241CC4 0040202D */ daddu $a0, $v0, $zero /* D9F198 80241CC8 0481001A */ bgez $a0, .L80241D34 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60.s deleted file mode 100644 index bc1f7f3422..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E60 -/* D9F330 80241E60 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D9F334 80241E64 AFB00010 */ sw $s0, 0x10($sp) -/* D9F338 80241E68 0080802D */ daddu $s0, $a0, $zero -/* D9F33C 80241E6C AFBF0014 */ sw $ra, 0x14($sp) -/* D9F340 80241E70 8E020148 */ lw $v0, 0x148($s0) -/* D9F344 80241E74 0C00EABB */ jal get_npc_unsafe -/* D9F348 80241E78 84440008 */ lh $a0, 8($v0) -/* D9F34C 80241E7C 9443008E */ lhu $v1, 0x8e($v0) -/* D9F350 80241E80 2463FFFF */ addiu $v1, $v1, -1 -/* D9F354 80241E84 A443008E */ sh $v1, 0x8e($v0) -/* D9F358 80241E88 00031C00 */ sll $v1, $v1, 0x10 -/* D9F35C 80241E8C 58600001 */ blezl $v1, .L80241E94 -/* D9F360 80241E90 AE000070 */ sw $zero, 0x70($s0) -.L80241E94: -/* D9F364 80241E94 8FBF0014 */ lw $ra, 0x14($sp) -/* D9F368 80241E98 8FB00010 */ lw $s0, 0x10($sp) -/* D9F36C 80241E9C 03E00008 */ jr $ra -/* D9F370 80241EA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s new file mode 100644 index 0000000000..f208bede15 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241E60_D9F330.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E60_D9F330 +/* D9F330 80241E60 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D9F334 80241E64 AFB00010 */ sw $s0, 0x10($sp) +/* D9F338 80241E68 0080802D */ daddu $s0, $a0, $zero +/* D9F33C 80241E6C AFBF0014 */ sw $ra, 0x14($sp) +/* D9F340 80241E70 8E020148 */ lw $v0, 0x148($s0) +/* D9F344 80241E74 0C00EABB */ jal get_npc_unsafe +/* D9F348 80241E78 84440008 */ lh $a0, 8($v0) +/* D9F34C 80241E7C 9443008E */ lhu $v1, 0x8e($v0) +/* D9F350 80241E80 2463FFFF */ addiu $v1, $v1, -1 +/* D9F354 80241E84 A443008E */ sh $v1, 0x8e($v0) +/* D9F358 80241E88 00031C00 */ sll $v1, $v1, 0x10 +/* D9F35C 80241E8C 58600001 */ blezl $v1, .L80241E94 +/* D9F360 80241E90 AE000070 */ sw $zero, 0x70($s0) +.L80241E94: +/* D9F364 80241E94 8FBF0014 */ lw $ra, 0x14($sp) +/* D9F368 80241E98 8FB00010 */ lw $s0, 0x10($sp) +/* D9F36C 80241E9C 03E00008 */ jr $ra +/* D9F370 80241EA0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4.s deleted file mode 100644 index 4384c5615a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EA4 -/* D9F374 80241EA4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* D9F378 80241EA8 AFB7004C */ sw $s7, 0x4c($sp) -/* D9F37C 80241EAC 0080B82D */ daddu $s7, $a0, $zero -/* D9F380 80241EB0 AFB10034 */ sw $s1, 0x34($sp) -/* D9F384 80241EB4 00A0882D */ daddu $s1, $a1, $zero -/* D9F388 80241EB8 AFBF0050 */ sw $ra, 0x50($sp) -/* D9F38C 80241EBC AFB60048 */ sw $s6, 0x48($sp) -/* D9F390 80241EC0 AFB50044 */ sw $s5, 0x44($sp) -/* D9F394 80241EC4 AFB40040 */ sw $s4, 0x40($sp) -/* D9F398 80241EC8 AFB3003C */ sw $s3, 0x3c($sp) -/* D9F39C 80241ECC AFB20038 */ sw $s2, 0x38($sp) -/* D9F3A0 80241ED0 AFB00030 */ sw $s0, 0x30($sp) -/* D9F3A4 80241ED4 8EF30148 */ lw $s3, 0x148($s7) -/* D9F3A8 80241ED8 86640008 */ lh $a0, 8($s3) -/* D9F3AC 80241EDC 8EF0000C */ lw $s0, 0xc($s7) -/* D9F3B0 80241EE0 0C00FB5A */ jal get_enemy_safe -/* D9F3B4 80241EE4 0000B02D */ daddu $s6, $zero, $zero -/* D9F3B8 80241EE8 10400131 */ beqz $v0, .L802423B0 -/* D9F3BC 80241EEC 24020005 */ addiu $v0, $zero, 5 -/* D9F3C0 80241EF0 8E63006C */ lw $v1, 0x6c($s3) -/* D9F3C4 80241EF4 1062012F */ beq $v1, $v0, .L802423B4 -/* D9F3C8 80241EF8 0000102D */ daddu $v0, $zero, $zero -/* D9F3CC 80241EFC 8E050000 */ lw $a1, ($s0) -/* D9F3D0 80241F00 0C0B1EAF */ jal get_variable -/* D9F3D4 80241F04 02E0202D */ daddu $a0, $s7, $zero -/* D9F3D8 80241F08 86640008 */ lh $a0, 8($s3) -/* D9F3DC 80241F0C 0C00EABB */ jal get_npc_unsafe -/* D9F3E0 80241F10 0040A82D */ daddu $s5, $v0, $zero -/* D9F3E4 80241F14 8E630070 */ lw $v1, 0x70($s3) -/* D9F3E8 80241F18 30630002 */ andi $v1, $v1, 2 -/* D9F3EC 80241F1C 10600008 */ beqz $v1, .L80241F40 -/* D9F3F0 80241F20 0040902D */ daddu $s2, $v0, $zero -/* D9F3F4 80241F24 964200A8 */ lhu $v0, 0xa8($s2) -/* D9F3F8 80241F28 00021400 */ sll $v0, $v0, 0x10 -/* D9F3FC 80241F2C 00021C03 */ sra $v1, $v0, 0x10 -/* D9F400 80241F30 000217C2 */ srl $v0, $v0, 0x1f -/* D9F404 80241F34 00621821 */ addu $v1, $v1, $v0 -/* D9F408 80241F38 00031843 */ sra $v1, $v1, 1 -/* D9F40C 80241F3C A24300AB */ sb $v1, 0xab($s2) -.L80241F40: -/* D9F410 80241F40 16200005 */ bnez $s1, .L80241F58 -/* D9F414 80241F44 3C030004 */ lui $v1, 4 -/* D9F418 80241F48 8E6200B0 */ lw $v0, 0xb0($s3) -/* D9F41C 80241F4C 30420004 */ andi $v0, $v0, 4 -/* D9F420 80241F50 10400019 */ beqz $v0, .L80241FB8 -/* D9F424 80241F54 00000000 */ nop -.L80241F58: -/* D9F428 80241F58 34630102 */ ori $v1, $v1, 0x102 -/* D9F42C 80241F5C AEE00070 */ sw $zero, 0x70($s7) -/* D9F430 80241F60 8E420000 */ lw $v0, ($s2) -/* D9F434 80241F64 0240202D */ daddu $a0, $s2, $zero -/* D9F438 80241F68 A640008E */ sh $zero, 0x8e($s2) -/* D9F43C 80241F6C 00431025 */ or $v0, $v0, $v1 -/* D9F440 80241F70 0C00EAFF */ jal disable_npc_shadow -/* D9F444 80241F74 AE420000 */ sw $v0, ($s2) -/* D9F448 80241F78 3C041F30 */ lui $a0, 0x1f30 -/* D9F44C 80241F7C 8E420000 */ lw $v0, ($s2) -/* D9F450 80241F80 2403F7FF */ addiu $v1, $zero, -0x801 -/* D9F454 80241F84 00431024 */ and $v0, $v0, $v1 -/* D9F458 80241F88 AE420000 */ sw $v0, ($s2) -/* D9F45C 80241F8C 8E620000 */ lw $v0, ($s3) -/* D9F460 80241F90 8E6300B0 */ lw $v1, 0xb0($s3) -/* D9F464 80241F94 34840040 */ ori $a0, $a0, 0x40 -/* D9F468 80241F98 AE60006C */ sw $zero, 0x6c($s3) -/* D9F46C 80241F9C 00441025 */ or $v0, $v0, $a0 -/* D9F470 80241FA0 AE620000 */ sw $v0, ($s3) -/* D9F474 80241FA4 30620004 */ andi $v0, $v1, 4 -/* D9F478 80241FA8 10400003 */ beqz $v0, .L80241FB8 -/* D9F47C 80241FAC 2402FFFB */ addiu $v0, $zero, -5 -/* D9F480 80241FB0 00621024 */ and $v0, $v1, $v0 -/* D9F484 80241FB4 AE6200B0 */ sw $v0, 0xb0($s3) -.L80241FB8: -/* D9F488 80241FB8 8EE30070 */ lw $v1, 0x70($s7) -/* D9F48C 80241FBC 24100001 */ addiu $s0, $zero, 1 -/* D9F490 80241FC0 10700012 */ beq $v1, $s0, .L8024200C -/* D9F494 80241FC4 28620002 */ slti $v0, $v1, 2 -/* D9F498 80241FC8 10400005 */ beqz $v0, .L80241FE0 -/* D9F49C 80241FCC 24020002 */ addiu $v0, $zero, 2 -/* D9F4A0 80241FD0 10600007 */ beqz $v1, .L80241FF0 -/* D9F4A4 80241FD4 0000102D */ daddu $v0, $zero, $zero -/* D9F4A8 80241FD8 080908ED */ j .L802423B4 -/* D9F4AC 80241FDC 00000000 */ nop -.L80241FE0: -/* D9F4B0 80241FE0 1062005B */ beq $v1, $v0, .L80242150 -/* D9F4B4 80241FE4 0000102D */ daddu $v0, $zero, $zero -/* D9F4B8 80241FE8 080908ED */ j .L802423B4 -/* D9F4BC 80241FEC 00000000 */ nop -.L80241FF0: -/* D9F4C0 80241FF0 8E420000 */ lw $v0, ($s2) -/* D9F4C4 80241FF4 0240202D */ daddu $a0, $s2, $zero -/* D9F4C8 80241FF8 34420002 */ ori $v0, $v0, 2 -/* D9F4CC 80241FFC 0C00EAFF */ jal disable_npc_shadow -/* D9F4D0 80242000 AE420000 */ sw $v0, ($s2) -/* D9F4D4 80242004 AE60006C */ sw $zero, 0x6c($s3) -/* D9F4D8 80242008 AEF00070 */ sw $s0, 0x70($s7) -.L8024200C: -/* D9F4DC 8024200C 8E74006C */ lw $s4, 0x6c($s3) -/* D9F4E0 80242010 24020001 */ addiu $v0, $zero, 1 -/* D9F4E4 80242014 168200E7 */ bne $s4, $v0, .L802423B4 -/* D9F4E8 80242018 0000102D */ daddu $v0, $zero, $zero -/* D9F4EC 8024201C 8E64007C */ lw $a0, 0x7c($s3) -/* D9F4F0 80242020 24110002 */ addiu $s1, $zero, 2 -/* D9F4F4 80242024 0C00EABB */ jal get_npc_unsafe -/* D9F4F8 80242028 AE71006C */ sw $s1, 0x6c($s3) -/* D9F4FC 8024202C 0040802D */ daddu $s0, $v0, $zero -/* D9F500 80242030 C6000038 */ lwc1 $f0, 0x38($s0) -/* D9F504 80242034 E6400038 */ swc1 $f0, 0x38($s2) -/* D9F508 80242038 C6000040 */ lwc1 $f0, 0x40($s0) -/* D9F50C 8024203C E6400040 */ swc1 $f0, 0x40($s2) -/* D9F510 80242040 C6020034 */ lwc1 $f2, 0x34($s0) -/* D9F514 80242044 3C014387 */ lui $at, 0x4387 -/* D9F518 80242048 44810000 */ mtc1 $at, $f0 -/* D9F51C 8024204C 26440038 */ addiu $a0, $s2, 0x38 -/* D9F520 80242050 46020001 */ sub.s $f0, $f0, $f2 -/* D9F524 80242054 C6680078 */ lwc1 $f8, 0x78($s3) -/* D9F528 80242058 46804220 */ cvt.s.w $f8, $f8 -/* D9F52C 8024205C 44064000 */ mfc1 $a2, $f8 -/* D9F530 80242060 44070000 */ mfc1 $a3, $f0 -/* D9F534 80242064 0C00A7E7 */ jal add_vec2D_polar -/* D9F538 80242068 26450040 */ addiu $a1, $s2, 0x40 -/* D9F53C 8024206C C600003C */ lwc1 $f0, 0x3c($s0) -/* D9F540 80242070 C6620074 */ lwc1 $f2, 0x74($s3) -/* D9F544 80242074 468010A0 */ cvt.s.w $f2, $f2 -/* D9F548 80242078 46020000 */ add.s $f0, $f0, $f2 -/* D9F54C 8024207C E640003C */ swc1 $f0, 0x3c($s2) -/* D9F550 80242080 A2740007 */ sb $s4, 7($s3) -/* D9F554 80242084 C6400038 */ lwc1 $f0, 0x38($s2) -/* D9F558 80242088 4600020D */ trunc.w.s $f8, $f0 -/* D9F55C 8024208C 44024000 */ mfc1 $v0, $f8 -/* D9F560 80242090 00000000 */ nop -/* D9F564 80242094 A6620010 */ sh $v0, 0x10($s3) -/* D9F568 80242098 C640003C */ lwc1 $f0, 0x3c($s2) -/* D9F56C 8024209C 4600020D */ trunc.w.s $f8, $f0 -/* D9F570 802420A0 44024000 */ mfc1 $v0, $f8 -/* D9F574 802420A4 00000000 */ nop -/* D9F578 802420A8 A6620012 */ sh $v0, 0x12($s3) -/* D9F57C 802420AC C6400040 */ lwc1 $f0, 0x40($s2) -/* D9F580 802420B0 4600020D */ trunc.w.s $f8, $f0 -/* D9F584 802420B4 44024000 */ mfc1 $v0, $f8 -/* D9F588 802420B8 00000000 */ nop -/* D9F58C 802420BC A6620014 */ sh $v0, 0x14($s3) -/* D9F590 802420C0 AE400044 */ sw $zero, 0x44($s2) -/* D9F594 802420C4 AE400048 */ sw $zero, 0x48($s2) -/* D9F598 802420C8 AE40004C */ sw $zero, 0x4c($s2) -/* D9F59C 802420CC C6A00000 */ lwc1 $f0, ($s5) -/* D9F5A0 802420D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9F5A4 802420D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9F5A8 802420D8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* D9F5AC 802420DC C64E0040 */ lwc1 $f14, 0x40($s2) -/* D9F5B0 802420E0 E6400018 */ swc1 $f0, 0x18($s2) -/* D9F5B4 802420E4 8C460028 */ lw $a2, 0x28($v0) -/* D9F5B8 802420E8 0C00A720 */ jal atan2 -/* D9F5BC 802420EC 8C470030 */ lw $a3, 0x30($v0) -/* D9F5C0 802420F0 E640000C */ swc1 $f0, 0xc($s2) -/* D9F5C4 802420F4 C6A0000C */ lwc1 $f0, 0xc($s5) -/* D9F5C8 802420F8 8E420000 */ lw $v0, ($s2) -/* D9F5CC 802420FC 0240202D */ daddu $a0, $s2, $zero -/* D9F5D0 80242100 E640001C */ swc1 $f0, 0x1c($s2) -/* D9F5D4 80242104 C6A00010 */ lwc1 $f0, 0x10($s5) -/* D9F5D8 80242108 2403FFFD */ addiu $v1, $zero, -3 -/* D9F5DC 8024210C E6400014 */ swc1 $f0, 0x14($s2) -/* D9F5E0 80242110 C600003C */ lwc1 $f0, 0x3c($s0) -/* D9F5E4 80242114 00431024 */ and $v0, $v0, $v1 -/* D9F5E8 80242118 AE420000 */ sw $v0, ($s2) -/* D9F5EC 8024211C 0C00EAE8 */ jal enable_npc_shadow -/* D9F5F0 80242120 E6400064 */ swc1 $f0, 0x64($s2) -/* D9F5F4 80242124 8E420000 */ lw $v0, ($s2) -/* D9F5F8 80242128 3C03E0FF */ lui $v1, 0xe0ff -/* D9F5FC 8024212C 34420800 */ ori $v0, $v0, 0x800 -/* D9F600 80242130 AE420000 */ sw $v0, ($s2) -/* D9F604 80242134 8E620000 */ lw $v0, ($s3) -/* D9F608 80242138 3463FFFF */ ori $v1, $v1, 0xffff -/* D9F60C 8024213C 00431024 */ and $v0, $v0, $v1 -/* D9F610 80242140 AE620000 */ sw $v0, ($s3) -/* D9F614 80242144 2402005A */ addiu $v0, $zero, 0x5a -/* D9F618 80242148 A642008E */ sh $v0, 0x8e($s2) -/* D9F61C 8024214C AEF10070 */ sw $s1, 0x70($s7) -.L80242150: -/* D9F620 80242150 0000202D */ daddu $a0, $zero, $zero -/* D9F624 80242154 27B00020 */ addiu $s0, $sp, 0x20 -/* D9F628 80242158 864200A8 */ lh $v0, 0xa8($s2) -/* D9F62C 8024215C 3C013FE0 */ lui $at, 0x3fe0 -/* D9F630 80242160 44810800 */ mtc1 $at, $f1 -/* D9F634 80242164 44800000 */ mtc1 $zero, $f0 -/* D9F638 80242168 44821000 */ mtc1 $v0, $f2 -/* D9F63C 8024216C 00000000 */ nop -/* D9F640 80242170 468010A1 */ cvt.d.w $f2, $f2 -/* D9F644 80242174 46201082 */ mul.d $f2, $f2, $f0 -/* D9F648 80242178 00000000 */ nop -/* D9F64C 8024217C 0200282D */ daddu $a1, $s0, $zero -/* D9F650 80242180 C6440038 */ lwc1 $f4, 0x38($s2) -/* D9F654 80242184 C640003C */ lwc1 $f0, 0x3c($s2) -/* D9F658 80242188 27B10024 */ addiu $s1, $sp, 0x24 -/* D9F65C 8024218C E7A40020 */ swc1 $f4, 0x20($sp) -/* D9F660 80242190 C6440040 */ lwc1 $f4, 0x40($s2) -/* D9F664 80242194 46000021 */ cvt.d.s $f0, $f0 -/* D9F668 80242198 46220000 */ add.d $f0, $f0, $f2 -/* D9F66C 8024219C E7A40028 */ swc1 $f4, 0x28($sp) -/* D9F670 802421A0 C6420018 */ lwc1 $f2, 0x18($s2) -/* D9F674 802421A4 46200020 */ cvt.s.d $f0, $f0 -/* D9F678 802421A8 E7A00024 */ swc1 $f0, 0x24($sp) -/* D9F67C 802421AC E7A20010 */ swc1 $f2, 0x10($sp) -/* D9F680 802421B0 C640000C */ lwc1 $f0, 0xc($s2) -/* D9F684 802421B4 0220302D */ daddu $a2, $s1, $zero -/* D9F688 802421B8 E7A00014 */ swc1 $f0, 0x14($sp) -/* D9F68C 802421BC 864200A6 */ lh $v0, 0xa6($s2) -/* D9F690 802421C0 27B40028 */ addiu $s4, $sp, 0x28 -/* D9F694 802421C4 44820000 */ mtc1 $v0, $f0 -/* D9F698 802421C8 00000000 */ nop -/* D9F69C 802421CC 46800020 */ cvt.s.w $f0, $f0 -/* D9F6A0 802421D0 E7A00018 */ swc1 $f0, 0x18($sp) -/* D9F6A4 802421D4 864200A8 */ lh $v0, 0xa8($s2) -/* D9F6A8 802421D8 0280382D */ daddu $a3, $s4, $zero -/* D9F6AC 802421DC 44820000 */ mtc1 $v0, $f0 -/* D9F6B0 802421E0 00000000 */ nop -/* D9F6B4 802421E4 46800020 */ cvt.s.w $f0, $f0 -/* D9F6B8 802421E8 0C0376B9 */ jal func_800DDAE4 -/* D9F6BC 802421EC E7A0001C */ swc1 $f0, 0x1c($sp) -/* D9F6C0 802421F0 54400001 */ bnel $v0, $zero, .L802421F8 -/* D9F6C4 802421F4 24160001 */ addiu $s6, $zero, 1 -.L802421F8: -/* D9F6C8 802421F8 0200282D */ daddu $a1, $s0, $zero -/* D9F6CC 802421FC 0220302D */ daddu $a2, $s1, $zero -/* D9F6D0 80242200 C6400038 */ lwc1 $f0, 0x38($s2) -/* D9F6D4 80242204 C642003C */ lwc1 $f2, 0x3c($s2) -/* D9F6D8 80242208 C6440040 */ lwc1 $f4, 0x40($s2) -/* D9F6DC 8024220C 3C01447A */ lui $at, 0x447a -/* D9F6E0 80242210 44813000 */ mtc1 $at, $f6 -/* D9F6E4 80242214 27A2002C */ addiu $v0, $sp, 0x2c -/* D9F6E8 80242218 E7A00020 */ swc1 $f0, 0x20($sp) -/* D9F6EC 8024221C E7A20024 */ swc1 $f2, 0x24($sp) -/* D9F6F0 80242220 E7A40028 */ swc1 $f4, 0x28($sp) -/* D9F6F4 80242224 E7A6002C */ swc1 $f6, 0x2c($sp) -/* D9F6F8 80242228 AFA20010 */ sw $v0, 0x10($sp) -/* D9F6FC 8024222C 8E440080 */ lw $a0, 0x80($s2) -/* D9F700 80242230 0C0372DF */ jal func_800DCB7C -/* D9F704 80242234 0280382D */ daddu $a3, $s4, $zero -/* D9F708 80242238 10400019 */ beqz $v0, .L802422A0 -/* D9F70C 8024223C 00000000 */ nop -/* D9F710 80242240 C640001C */ lwc1 $f0, 0x1c($s2) -/* D9F714 80242244 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* D9F718 80242248 46000005 */ abs.s $f0, $f0 -/* D9F71C 8024224C 4600103C */ c.lt.s $f2, $f0 -/* D9F720 80242250 00000000 */ nop -/* D9F724 80242254 45000012 */ bc1f .L802422A0 -/* D9F728 80242258 00000000 */ nop -/* D9F72C 8024225C C7A40024 */ lwc1 $f4, 0x24($sp) -/* D9F730 80242260 C6400064 */ lwc1 $f0, 0x64($s2) -/* D9F734 80242264 46002001 */ sub.s $f0, $f4, $f0 -/* D9F738 80242268 3C014034 */ lui $at, 0x4034 -/* D9F73C 8024226C 44811800 */ mtc1 $at, $f3 -/* D9F740 80242270 44801000 */ mtc1 $zero, $f2 -/* D9F744 80242274 46000005 */ abs.s $f0, $f0 -/* D9F748 80242278 46000021 */ cvt.d.s $f0, $f0 -/* D9F74C 8024227C 4622003C */ c.lt.d $f0, $f2 -/* D9F750 80242280 00000000 */ nop -/* D9F754 80242284 45000006 */ bc1f .L802422A0 -/* D9F758 80242288 0240202D */ daddu $a0, $s2, $zero -/* D9F75C 8024228C 8E450018 */ lw $a1, 0x18($s2) -/* D9F760 80242290 8E46000C */ lw $a2, 0xc($s2) -/* D9F764 80242294 2416000A */ addiu $s6, $zero, 0xa -/* D9F768 80242298 0C00EA95 */ jal npc_move_heading -/* D9F76C 8024229C E644003C */ swc1 $f4, 0x3c($s2) -.L802422A0: -/* D9F770 802422A0 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* D9F774 802422A4 3C013FF0 */ lui $at, 0x3ff0 -/* D9F778 802422A8 44811800 */ mtc1 $at, $f3 -/* D9F77C 802422AC 44801000 */ mtc1 $zero, $f2 -/* D9F780 802422B0 46000021 */ cvt.d.s $f0, $f0 -/* D9F784 802422B4 4622003C */ c.lt.d $f0, $f2 -/* D9F788 802422B8 00000000 */ nop -/* D9F78C 802422BC 45030001 */ bc1tl .L802422C4 -/* D9F790 802422C0 2416000B */ addiu $s6, $zero, 0xb -.L802422C4: -/* D9F794 802422C4 9642008E */ lhu $v0, 0x8e($s2) -/* D9F798 802422C8 2442FFFF */ addiu $v0, $v0, -1 -/* D9F79C 802422CC A642008E */ sh $v0, 0x8e($s2) -/* D9F7A0 802422D0 00021400 */ sll $v0, $v0, 0x10 -/* D9F7A4 802422D4 58400001 */ blezl $v0, .L802422DC -/* D9F7A8 802422D8 24160014 */ addiu $s6, $zero, 0x14 -.L802422DC: -/* D9F7AC 802422DC 56C00019 */ bnel $s6, $zero, .L80242344 -/* D9F7B0 802422E0 AFA00010 */ sw $zero, 0x10($sp) -/* D9F7B4 802422E4 8E620070 */ lw $v0, 0x70($s3) -/* D9F7B8 802422E8 30420001 */ andi $v0, $v0, 1 -/* D9F7BC 802422EC 10400009 */ beqz $v0, .L80242314 -/* D9F7C0 802422F0 00000000 */ nop -/* D9F7C4 802422F4 C640004C */ lwc1 $f0, 0x4c($s2) -/* D9F7C8 802422F8 3C014044 */ lui $at, 0x4044 -/* D9F7CC 802422FC 44811800 */ mtc1 $at, $f3 -/* D9F7D0 80242300 44801000 */ mtc1 $zero, $f2 -/* D9F7D4 80242304 46000021 */ cvt.d.s $f0, $f0 -/* D9F7D8 80242308 46220000 */ add.d $f0, $f0, $f2 -/* D9F7DC 8024230C 46200020 */ cvt.s.d $f0, $f0 -/* D9F7E0 80242310 E640004C */ swc1 $f0, 0x4c($s2) -.L80242314: -/* D9F7E4 80242314 8E450018 */ lw $a1, 0x18($s2) -/* D9F7E8 80242318 8E46000C */ lw $a2, 0xc($s2) -/* D9F7EC 8024231C 0C00EA95 */ jal npc_move_heading -/* D9F7F0 80242320 0240202D */ daddu $a0, $s2, $zero -/* D9F7F4 80242324 C644003C */ lwc1 $f4, 0x3c($s2) -/* D9F7F8 80242328 C640001C */ lwc1 $f0, 0x1c($s2) -/* D9F7FC 8024232C 46002100 */ add.s $f4, $f4, $f0 -/* D9F800 80242330 C6420014 */ lwc1 $f2, 0x14($s2) -/* D9F804 80242334 46020001 */ sub.s $f0, $f0, $f2 -/* D9F808 80242338 E644003C */ swc1 $f4, 0x3c($s2) -/* D9F80C 8024233C 080908EC */ j .L802423B0 -/* D9F810 80242340 E640001C */ swc1 $f0, 0x1c($s2) -.L80242344: -/* D9F814 80242344 AFA00014 */ sw $zero, 0x14($sp) -/* D9F818 80242348 8E450038 */ lw $a1, 0x38($s2) -/* D9F81C 8024234C 8E46003C */ lw $a2, 0x3c($s2) -/* D9F820 80242350 8E470040 */ lw $a3, 0x40($s2) -/* D9F824 80242354 0C01BECC */ jal fx_walk_normal -/* D9F828 80242358 24040002 */ addiu $a0, $zero, 2 -/* D9F82C 8024235C 3C01C47A */ lui $at, 0xc47a -/* D9F830 80242360 44810000 */ mtc1 $at, $f0 -/* D9F834 80242364 AE60006C */ sw $zero, 0x6c($s3) -/* D9F838 80242368 8E420000 */ lw $v0, ($s2) -/* D9F83C 8024236C 0240202D */ daddu $a0, $s2, $zero -/* D9F840 80242370 AE400038 */ sw $zero, 0x38($s2) -/* D9F844 80242374 AE400040 */ sw $zero, 0x40($s2) -/* D9F848 80242378 AE40001C */ sw $zero, 0x1c($s2) -/* D9F84C 8024237C 34420002 */ ori $v0, $v0, 2 -/* D9F850 80242380 E640003C */ swc1 $f0, 0x3c($s2) -/* D9F854 80242384 0C00EAFF */ jal disable_npc_shadow -/* D9F858 80242388 AE420000 */ sw $v0, ($s2) -/* D9F85C 8024238C 8E420000 */ lw $v0, ($s2) -/* D9F860 80242390 2403F7FF */ addiu $v1, $zero, -0x801 -/* D9F864 80242394 00431024 */ and $v0, $v0, $v1 -/* D9F868 80242398 AE420000 */ sw $v0, ($s2) -/* D9F86C 8024239C 8E620000 */ lw $v0, ($s3) -/* D9F870 802423A0 3C031F00 */ lui $v1, 0x1f00 -/* D9F874 802423A4 00431025 */ or $v0, $v0, $v1 -/* D9F878 802423A8 AE620000 */ sw $v0, ($s3) -/* D9F87C 802423AC AEE00070 */ sw $zero, 0x70($s7) -.L802423B0: -/* D9F880 802423B0 0000102D */ daddu $v0, $zero, $zero -.L802423B4: -/* D9F884 802423B4 8FBF0050 */ lw $ra, 0x50($sp) -/* D9F888 802423B8 8FB7004C */ lw $s7, 0x4c($sp) -/* D9F88C 802423BC 8FB60048 */ lw $s6, 0x48($sp) -/* D9F890 802423C0 8FB50044 */ lw $s5, 0x44($sp) -/* D9F894 802423C4 8FB40040 */ lw $s4, 0x40($sp) -/* D9F898 802423C8 8FB3003C */ lw $s3, 0x3c($sp) -/* D9F89C 802423CC 8FB20038 */ lw $s2, 0x38($sp) -/* D9F8A0 802423D0 8FB10034 */ lw $s1, 0x34($sp) -/* D9F8A4 802423D4 8FB00030 */ lw $s0, 0x30($sp) -/* D9F8A8 802423D8 03E00008 */ jr $ra -/* D9F8AC 802423DC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s new file mode 100644 index 0000000000..344526e57e --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241EA4_D9F374.s @@ -0,0 +1,354 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241EA4_D9F374 +/* D9F374 80241EA4 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* D9F378 80241EA8 AFB7004C */ sw $s7, 0x4c($sp) +/* D9F37C 80241EAC 0080B82D */ daddu $s7, $a0, $zero +/* D9F380 80241EB0 AFB10034 */ sw $s1, 0x34($sp) +/* D9F384 80241EB4 00A0882D */ daddu $s1, $a1, $zero +/* D9F388 80241EB8 AFBF0050 */ sw $ra, 0x50($sp) +/* D9F38C 80241EBC AFB60048 */ sw $s6, 0x48($sp) +/* D9F390 80241EC0 AFB50044 */ sw $s5, 0x44($sp) +/* D9F394 80241EC4 AFB40040 */ sw $s4, 0x40($sp) +/* D9F398 80241EC8 AFB3003C */ sw $s3, 0x3c($sp) +/* D9F39C 80241ECC AFB20038 */ sw $s2, 0x38($sp) +/* D9F3A0 80241ED0 AFB00030 */ sw $s0, 0x30($sp) +/* D9F3A4 80241ED4 8EF30148 */ lw $s3, 0x148($s7) +/* D9F3A8 80241ED8 86640008 */ lh $a0, 8($s3) +/* D9F3AC 80241EDC 8EF0000C */ lw $s0, 0xc($s7) +/* D9F3B0 80241EE0 0C00FB5A */ jal get_enemy_safe +/* D9F3B4 80241EE4 0000B02D */ daddu $s6, $zero, $zero +/* D9F3B8 80241EE8 10400131 */ beqz $v0, .L802423B0 +/* D9F3BC 80241EEC 24020005 */ addiu $v0, $zero, 5 +/* D9F3C0 80241EF0 8E63006C */ lw $v1, 0x6c($s3) +/* D9F3C4 80241EF4 1062012F */ beq $v1, $v0, .L802423B4 +/* D9F3C8 80241EF8 0000102D */ daddu $v0, $zero, $zero +/* D9F3CC 80241EFC 8E050000 */ lw $a1, ($s0) +/* D9F3D0 80241F00 0C0B1EAF */ jal get_variable +/* D9F3D4 80241F04 02E0202D */ daddu $a0, $s7, $zero +/* D9F3D8 80241F08 86640008 */ lh $a0, 8($s3) +/* D9F3DC 80241F0C 0C00EABB */ jal get_npc_unsafe +/* D9F3E0 80241F10 0040A82D */ daddu $s5, $v0, $zero +/* D9F3E4 80241F14 8E630070 */ lw $v1, 0x70($s3) +/* D9F3E8 80241F18 30630002 */ andi $v1, $v1, 2 +/* D9F3EC 80241F1C 10600008 */ beqz $v1, .L80241F40 +/* D9F3F0 80241F20 0040902D */ daddu $s2, $v0, $zero +/* D9F3F4 80241F24 964200A8 */ lhu $v0, 0xa8($s2) +/* D9F3F8 80241F28 00021400 */ sll $v0, $v0, 0x10 +/* D9F3FC 80241F2C 00021C03 */ sra $v1, $v0, 0x10 +/* D9F400 80241F30 000217C2 */ srl $v0, $v0, 0x1f +/* D9F404 80241F34 00621821 */ addu $v1, $v1, $v0 +/* D9F408 80241F38 00031843 */ sra $v1, $v1, 1 +/* D9F40C 80241F3C A24300AB */ sb $v1, 0xab($s2) +.L80241F40: +/* D9F410 80241F40 16200005 */ bnez $s1, .L80241F58 +/* D9F414 80241F44 3C030004 */ lui $v1, 4 +/* D9F418 80241F48 8E6200B0 */ lw $v0, 0xb0($s3) +/* D9F41C 80241F4C 30420004 */ andi $v0, $v0, 4 +/* D9F420 80241F50 10400019 */ beqz $v0, .L80241FB8 +/* D9F424 80241F54 00000000 */ nop +.L80241F58: +/* D9F428 80241F58 34630102 */ ori $v1, $v1, 0x102 +/* D9F42C 80241F5C AEE00070 */ sw $zero, 0x70($s7) +/* D9F430 80241F60 8E420000 */ lw $v0, ($s2) +/* D9F434 80241F64 0240202D */ daddu $a0, $s2, $zero +/* D9F438 80241F68 A640008E */ sh $zero, 0x8e($s2) +/* D9F43C 80241F6C 00431025 */ or $v0, $v0, $v1 +/* D9F440 80241F70 0C00EAFF */ jal disable_npc_shadow +/* D9F444 80241F74 AE420000 */ sw $v0, ($s2) +/* D9F448 80241F78 3C041F30 */ lui $a0, 0x1f30 +/* D9F44C 80241F7C 8E420000 */ lw $v0, ($s2) +/* D9F450 80241F80 2403F7FF */ addiu $v1, $zero, -0x801 +/* D9F454 80241F84 00431024 */ and $v0, $v0, $v1 +/* D9F458 80241F88 AE420000 */ sw $v0, ($s2) +/* D9F45C 80241F8C 8E620000 */ lw $v0, ($s3) +/* D9F460 80241F90 8E6300B0 */ lw $v1, 0xb0($s3) +/* D9F464 80241F94 34840040 */ ori $a0, $a0, 0x40 +/* D9F468 80241F98 AE60006C */ sw $zero, 0x6c($s3) +/* D9F46C 80241F9C 00441025 */ or $v0, $v0, $a0 +/* D9F470 80241FA0 AE620000 */ sw $v0, ($s3) +/* D9F474 80241FA4 30620004 */ andi $v0, $v1, 4 +/* D9F478 80241FA8 10400003 */ beqz $v0, .L80241FB8 +/* D9F47C 80241FAC 2402FFFB */ addiu $v0, $zero, -5 +/* D9F480 80241FB0 00621024 */ and $v0, $v1, $v0 +/* D9F484 80241FB4 AE6200B0 */ sw $v0, 0xb0($s3) +.L80241FB8: +/* D9F488 80241FB8 8EE30070 */ lw $v1, 0x70($s7) +/* D9F48C 80241FBC 24100001 */ addiu $s0, $zero, 1 +/* D9F490 80241FC0 10700012 */ beq $v1, $s0, .L8024200C +/* D9F494 80241FC4 28620002 */ slti $v0, $v1, 2 +/* D9F498 80241FC8 10400005 */ beqz $v0, .L80241FE0 +/* D9F49C 80241FCC 24020002 */ addiu $v0, $zero, 2 +/* D9F4A0 80241FD0 10600007 */ beqz $v1, .L80241FF0 +/* D9F4A4 80241FD4 0000102D */ daddu $v0, $zero, $zero +/* D9F4A8 80241FD8 080908ED */ j .L802423B4 +/* D9F4AC 80241FDC 00000000 */ nop +.L80241FE0: +/* D9F4B0 80241FE0 1062005B */ beq $v1, $v0, .L80242150 +/* D9F4B4 80241FE4 0000102D */ daddu $v0, $zero, $zero +/* D9F4B8 80241FE8 080908ED */ j .L802423B4 +/* D9F4BC 80241FEC 00000000 */ nop +.L80241FF0: +/* D9F4C0 80241FF0 8E420000 */ lw $v0, ($s2) +/* D9F4C4 80241FF4 0240202D */ daddu $a0, $s2, $zero +/* D9F4C8 80241FF8 34420002 */ ori $v0, $v0, 2 +/* D9F4CC 80241FFC 0C00EAFF */ jal disable_npc_shadow +/* D9F4D0 80242000 AE420000 */ sw $v0, ($s2) +/* D9F4D4 80242004 AE60006C */ sw $zero, 0x6c($s3) +/* D9F4D8 80242008 AEF00070 */ sw $s0, 0x70($s7) +.L8024200C: +/* D9F4DC 8024200C 8E74006C */ lw $s4, 0x6c($s3) +/* D9F4E0 80242010 24020001 */ addiu $v0, $zero, 1 +/* D9F4E4 80242014 168200E7 */ bne $s4, $v0, .L802423B4 +/* D9F4E8 80242018 0000102D */ daddu $v0, $zero, $zero +/* D9F4EC 8024201C 8E64007C */ lw $a0, 0x7c($s3) +/* D9F4F0 80242020 24110002 */ addiu $s1, $zero, 2 +/* D9F4F4 80242024 0C00EABB */ jal get_npc_unsafe +/* D9F4F8 80242028 AE71006C */ sw $s1, 0x6c($s3) +/* D9F4FC 8024202C 0040802D */ daddu $s0, $v0, $zero +/* D9F500 80242030 C6000038 */ lwc1 $f0, 0x38($s0) +/* D9F504 80242034 E6400038 */ swc1 $f0, 0x38($s2) +/* D9F508 80242038 C6000040 */ lwc1 $f0, 0x40($s0) +/* D9F50C 8024203C E6400040 */ swc1 $f0, 0x40($s2) +/* D9F510 80242040 C6020034 */ lwc1 $f2, 0x34($s0) +/* D9F514 80242044 3C014387 */ lui $at, 0x4387 +/* D9F518 80242048 44810000 */ mtc1 $at, $f0 +/* D9F51C 8024204C 26440038 */ addiu $a0, $s2, 0x38 +/* D9F520 80242050 46020001 */ sub.s $f0, $f0, $f2 +/* D9F524 80242054 C6680078 */ lwc1 $f8, 0x78($s3) +/* D9F528 80242058 46804220 */ cvt.s.w $f8, $f8 +/* D9F52C 8024205C 44064000 */ mfc1 $a2, $f8 +/* D9F530 80242060 44070000 */ mfc1 $a3, $f0 +/* D9F534 80242064 0C00A7E7 */ jal add_vec2D_polar +/* D9F538 80242068 26450040 */ addiu $a1, $s2, 0x40 +/* D9F53C 8024206C C600003C */ lwc1 $f0, 0x3c($s0) +/* D9F540 80242070 C6620074 */ lwc1 $f2, 0x74($s3) +/* D9F544 80242074 468010A0 */ cvt.s.w $f2, $f2 +/* D9F548 80242078 46020000 */ add.s $f0, $f0, $f2 +/* D9F54C 8024207C E640003C */ swc1 $f0, 0x3c($s2) +/* D9F550 80242080 A2740007 */ sb $s4, 7($s3) +/* D9F554 80242084 C6400038 */ lwc1 $f0, 0x38($s2) +/* D9F558 80242088 4600020D */ trunc.w.s $f8, $f0 +/* D9F55C 8024208C 44024000 */ mfc1 $v0, $f8 +/* D9F560 80242090 00000000 */ nop +/* D9F564 80242094 A6620010 */ sh $v0, 0x10($s3) +/* D9F568 80242098 C640003C */ lwc1 $f0, 0x3c($s2) +/* D9F56C 8024209C 4600020D */ trunc.w.s $f8, $f0 +/* D9F570 802420A0 44024000 */ mfc1 $v0, $f8 +/* D9F574 802420A4 00000000 */ nop +/* D9F578 802420A8 A6620012 */ sh $v0, 0x12($s3) +/* D9F57C 802420AC C6400040 */ lwc1 $f0, 0x40($s2) +/* D9F580 802420B0 4600020D */ trunc.w.s $f8, $f0 +/* D9F584 802420B4 44024000 */ mfc1 $v0, $f8 +/* D9F588 802420B8 00000000 */ nop +/* D9F58C 802420BC A6620014 */ sh $v0, 0x14($s3) +/* D9F590 802420C0 AE400044 */ sw $zero, 0x44($s2) +/* D9F594 802420C4 AE400048 */ sw $zero, 0x48($s2) +/* D9F598 802420C8 AE40004C */ sw $zero, 0x4c($s2) +/* D9F59C 802420CC C6A00000 */ lwc1 $f0, ($s5) +/* D9F5A0 802420D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* D9F5A4 802420D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* D9F5A8 802420D8 C64C0038 */ lwc1 $f12, 0x38($s2) +/* D9F5AC 802420DC C64E0040 */ lwc1 $f14, 0x40($s2) +/* D9F5B0 802420E0 E6400018 */ swc1 $f0, 0x18($s2) +/* D9F5B4 802420E4 8C460028 */ lw $a2, 0x28($v0) +/* D9F5B8 802420E8 0C00A720 */ jal atan2 +/* D9F5BC 802420EC 8C470030 */ lw $a3, 0x30($v0) +/* D9F5C0 802420F0 E640000C */ swc1 $f0, 0xc($s2) +/* D9F5C4 802420F4 C6A0000C */ lwc1 $f0, 0xc($s5) +/* D9F5C8 802420F8 8E420000 */ lw $v0, ($s2) +/* D9F5CC 802420FC 0240202D */ daddu $a0, $s2, $zero +/* D9F5D0 80242100 E640001C */ swc1 $f0, 0x1c($s2) +/* D9F5D4 80242104 C6A00010 */ lwc1 $f0, 0x10($s5) +/* D9F5D8 80242108 2403FFFD */ addiu $v1, $zero, -3 +/* D9F5DC 8024210C E6400014 */ swc1 $f0, 0x14($s2) +/* D9F5E0 80242110 C600003C */ lwc1 $f0, 0x3c($s0) +/* D9F5E4 80242114 00431024 */ and $v0, $v0, $v1 +/* D9F5E8 80242118 AE420000 */ sw $v0, ($s2) +/* D9F5EC 8024211C 0C00EAE8 */ jal enable_npc_shadow +/* D9F5F0 80242120 E6400064 */ swc1 $f0, 0x64($s2) +/* D9F5F4 80242124 8E420000 */ lw $v0, ($s2) +/* D9F5F8 80242128 3C03E0FF */ lui $v1, 0xe0ff +/* D9F5FC 8024212C 34420800 */ ori $v0, $v0, 0x800 +/* D9F600 80242130 AE420000 */ sw $v0, ($s2) +/* D9F604 80242134 8E620000 */ lw $v0, ($s3) +/* D9F608 80242138 3463FFFF */ ori $v1, $v1, 0xffff +/* D9F60C 8024213C 00431024 */ and $v0, $v0, $v1 +/* D9F610 80242140 AE620000 */ sw $v0, ($s3) +/* D9F614 80242144 2402005A */ addiu $v0, $zero, 0x5a +/* D9F618 80242148 A642008E */ sh $v0, 0x8e($s2) +/* D9F61C 8024214C AEF10070 */ sw $s1, 0x70($s7) +.L80242150: +/* D9F620 80242150 0000202D */ daddu $a0, $zero, $zero +/* D9F624 80242154 27B00020 */ addiu $s0, $sp, 0x20 +/* D9F628 80242158 864200A8 */ lh $v0, 0xa8($s2) +/* D9F62C 8024215C 3C013FE0 */ lui $at, 0x3fe0 +/* D9F630 80242160 44810800 */ mtc1 $at, $f1 +/* D9F634 80242164 44800000 */ mtc1 $zero, $f0 +/* D9F638 80242168 44821000 */ mtc1 $v0, $f2 +/* D9F63C 8024216C 00000000 */ nop +/* D9F640 80242170 468010A1 */ cvt.d.w $f2, $f2 +/* D9F644 80242174 46201082 */ mul.d $f2, $f2, $f0 +/* D9F648 80242178 00000000 */ nop +/* D9F64C 8024217C 0200282D */ daddu $a1, $s0, $zero +/* D9F650 80242180 C6440038 */ lwc1 $f4, 0x38($s2) +/* D9F654 80242184 C640003C */ lwc1 $f0, 0x3c($s2) +/* D9F658 80242188 27B10024 */ addiu $s1, $sp, 0x24 +/* D9F65C 8024218C E7A40020 */ swc1 $f4, 0x20($sp) +/* D9F660 80242190 C6440040 */ lwc1 $f4, 0x40($s2) +/* D9F664 80242194 46000021 */ cvt.d.s $f0, $f0 +/* D9F668 80242198 46220000 */ add.d $f0, $f0, $f2 +/* D9F66C 8024219C E7A40028 */ swc1 $f4, 0x28($sp) +/* D9F670 802421A0 C6420018 */ lwc1 $f2, 0x18($s2) +/* D9F674 802421A4 46200020 */ cvt.s.d $f0, $f0 +/* D9F678 802421A8 E7A00024 */ swc1 $f0, 0x24($sp) +/* D9F67C 802421AC E7A20010 */ swc1 $f2, 0x10($sp) +/* D9F680 802421B0 C640000C */ lwc1 $f0, 0xc($s2) +/* D9F684 802421B4 0220302D */ daddu $a2, $s1, $zero +/* D9F688 802421B8 E7A00014 */ swc1 $f0, 0x14($sp) +/* D9F68C 802421BC 864200A6 */ lh $v0, 0xa6($s2) +/* D9F690 802421C0 27B40028 */ addiu $s4, $sp, 0x28 +/* D9F694 802421C4 44820000 */ mtc1 $v0, $f0 +/* D9F698 802421C8 00000000 */ nop +/* D9F69C 802421CC 46800020 */ cvt.s.w $f0, $f0 +/* D9F6A0 802421D0 E7A00018 */ swc1 $f0, 0x18($sp) +/* D9F6A4 802421D4 864200A8 */ lh $v0, 0xa8($s2) +/* D9F6A8 802421D8 0280382D */ daddu $a3, $s4, $zero +/* D9F6AC 802421DC 44820000 */ mtc1 $v0, $f0 +/* D9F6B0 802421E0 00000000 */ nop +/* D9F6B4 802421E4 46800020 */ cvt.s.w $f0, $f0 +/* D9F6B8 802421E8 0C0376B9 */ jal func_800DDAE4 +/* D9F6BC 802421EC E7A0001C */ swc1 $f0, 0x1c($sp) +/* D9F6C0 802421F0 54400001 */ bnel $v0, $zero, .L802421F8 +/* D9F6C4 802421F4 24160001 */ addiu $s6, $zero, 1 +.L802421F8: +/* D9F6C8 802421F8 0200282D */ daddu $a1, $s0, $zero +/* D9F6CC 802421FC 0220302D */ daddu $a2, $s1, $zero +/* D9F6D0 80242200 C6400038 */ lwc1 $f0, 0x38($s2) +/* D9F6D4 80242204 C642003C */ lwc1 $f2, 0x3c($s2) +/* D9F6D8 80242208 C6440040 */ lwc1 $f4, 0x40($s2) +/* D9F6DC 8024220C 3C01447A */ lui $at, 0x447a +/* D9F6E0 80242210 44813000 */ mtc1 $at, $f6 +/* D9F6E4 80242214 27A2002C */ addiu $v0, $sp, 0x2c +/* D9F6E8 80242218 E7A00020 */ swc1 $f0, 0x20($sp) +/* D9F6EC 8024221C E7A20024 */ swc1 $f2, 0x24($sp) +/* D9F6F0 80242220 E7A40028 */ swc1 $f4, 0x28($sp) +/* D9F6F4 80242224 E7A6002C */ swc1 $f6, 0x2c($sp) +/* D9F6F8 80242228 AFA20010 */ sw $v0, 0x10($sp) +/* D9F6FC 8024222C 8E440080 */ lw $a0, 0x80($s2) +/* D9F700 80242230 0C0372DF */ jal func_800DCB7C +/* D9F704 80242234 0280382D */ daddu $a3, $s4, $zero +/* D9F708 80242238 10400019 */ beqz $v0, .L802422A0 +/* D9F70C 8024223C 00000000 */ nop +/* D9F710 80242240 C640001C */ lwc1 $f0, 0x1c($s2) +/* D9F714 80242244 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* D9F718 80242248 46000005 */ abs.s $f0, $f0 +/* D9F71C 8024224C 4600103C */ c.lt.s $f2, $f0 +/* D9F720 80242250 00000000 */ nop +/* D9F724 80242254 45000012 */ bc1f .L802422A0 +/* D9F728 80242258 00000000 */ nop +/* D9F72C 8024225C C7A40024 */ lwc1 $f4, 0x24($sp) +/* D9F730 80242260 C6400064 */ lwc1 $f0, 0x64($s2) +/* D9F734 80242264 46002001 */ sub.s $f0, $f4, $f0 +/* D9F738 80242268 3C014034 */ lui $at, 0x4034 +/* D9F73C 8024226C 44811800 */ mtc1 $at, $f3 +/* D9F740 80242270 44801000 */ mtc1 $zero, $f2 +/* D9F744 80242274 46000005 */ abs.s $f0, $f0 +/* D9F748 80242278 46000021 */ cvt.d.s $f0, $f0 +/* D9F74C 8024227C 4622003C */ c.lt.d $f0, $f2 +/* D9F750 80242280 00000000 */ nop +/* D9F754 80242284 45000006 */ bc1f .L802422A0 +/* D9F758 80242288 0240202D */ daddu $a0, $s2, $zero +/* D9F75C 8024228C 8E450018 */ lw $a1, 0x18($s2) +/* D9F760 80242290 8E46000C */ lw $a2, 0xc($s2) +/* D9F764 80242294 2416000A */ addiu $s6, $zero, 0xa +/* D9F768 80242298 0C00EA95 */ jal npc_move_heading +/* D9F76C 8024229C E644003C */ swc1 $f4, 0x3c($s2) +.L802422A0: +/* D9F770 802422A0 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* D9F774 802422A4 3C013FF0 */ lui $at, 0x3ff0 +/* D9F778 802422A8 44811800 */ mtc1 $at, $f3 +/* D9F77C 802422AC 44801000 */ mtc1 $zero, $f2 +/* D9F780 802422B0 46000021 */ cvt.d.s $f0, $f0 +/* D9F784 802422B4 4622003C */ c.lt.d $f0, $f2 +/* D9F788 802422B8 00000000 */ nop +/* D9F78C 802422BC 45030001 */ bc1tl .L802422C4 +/* D9F790 802422C0 2416000B */ addiu $s6, $zero, 0xb +.L802422C4: +/* D9F794 802422C4 9642008E */ lhu $v0, 0x8e($s2) +/* D9F798 802422C8 2442FFFF */ addiu $v0, $v0, -1 +/* D9F79C 802422CC A642008E */ sh $v0, 0x8e($s2) +/* D9F7A0 802422D0 00021400 */ sll $v0, $v0, 0x10 +/* D9F7A4 802422D4 58400001 */ blezl $v0, .L802422DC +/* D9F7A8 802422D8 24160014 */ addiu $s6, $zero, 0x14 +.L802422DC: +/* D9F7AC 802422DC 56C00019 */ bnel $s6, $zero, .L80242344 +/* D9F7B0 802422E0 AFA00010 */ sw $zero, 0x10($sp) +/* D9F7B4 802422E4 8E620070 */ lw $v0, 0x70($s3) +/* D9F7B8 802422E8 30420001 */ andi $v0, $v0, 1 +/* D9F7BC 802422EC 10400009 */ beqz $v0, .L80242314 +/* D9F7C0 802422F0 00000000 */ nop +/* D9F7C4 802422F4 C640004C */ lwc1 $f0, 0x4c($s2) +/* D9F7C8 802422F8 3C014044 */ lui $at, 0x4044 +/* D9F7CC 802422FC 44811800 */ mtc1 $at, $f3 +/* D9F7D0 80242300 44801000 */ mtc1 $zero, $f2 +/* D9F7D4 80242304 46000021 */ cvt.d.s $f0, $f0 +/* D9F7D8 80242308 46220000 */ add.d $f0, $f0, $f2 +/* D9F7DC 8024230C 46200020 */ cvt.s.d $f0, $f0 +/* D9F7E0 80242310 E640004C */ swc1 $f0, 0x4c($s2) +.L80242314: +/* D9F7E4 80242314 8E450018 */ lw $a1, 0x18($s2) +/* D9F7E8 80242318 8E46000C */ lw $a2, 0xc($s2) +/* D9F7EC 8024231C 0C00EA95 */ jal npc_move_heading +/* D9F7F0 80242320 0240202D */ daddu $a0, $s2, $zero +/* D9F7F4 80242324 C644003C */ lwc1 $f4, 0x3c($s2) +/* D9F7F8 80242328 C640001C */ lwc1 $f0, 0x1c($s2) +/* D9F7FC 8024232C 46002100 */ add.s $f4, $f4, $f0 +/* D9F800 80242330 C6420014 */ lwc1 $f2, 0x14($s2) +/* D9F804 80242334 46020001 */ sub.s $f0, $f0, $f2 +/* D9F808 80242338 E644003C */ swc1 $f4, 0x3c($s2) +/* D9F80C 8024233C 080908EC */ j .L802423B0 +/* D9F810 80242340 E640001C */ swc1 $f0, 0x1c($s2) +.L80242344: +/* D9F814 80242344 AFA00014 */ sw $zero, 0x14($sp) +/* D9F818 80242348 8E450038 */ lw $a1, 0x38($s2) +/* D9F81C 8024234C 8E46003C */ lw $a2, 0x3c($s2) +/* D9F820 80242350 8E470040 */ lw $a3, 0x40($s2) +/* D9F824 80242354 0C01BECC */ jal fx_walk_normal +/* D9F828 80242358 24040002 */ addiu $a0, $zero, 2 +/* D9F82C 8024235C 3C01C47A */ lui $at, 0xc47a +/* D9F830 80242360 44810000 */ mtc1 $at, $f0 +/* D9F834 80242364 AE60006C */ sw $zero, 0x6c($s3) +/* D9F838 80242368 8E420000 */ lw $v0, ($s2) +/* D9F83C 8024236C 0240202D */ daddu $a0, $s2, $zero +/* D9F840 80242370 AE400038 */ sw $zero, 0x38($s2) +/* D9F844 80242374 AE400040 */ sw $zero, 0x40($s2) +/* D9F848 80242378 AE40001C */ sw $zero, 0x1c($s2) +/* D9F84C 8024237C 34420002 */ ori $v0, $v0, 2 +/* D9F850 80242380 E640003C */ swc1 $f0, 0x3c($s2) +/* D9F854 80242384 0C00EAFF */ jal disable_npc_shadow +/* D9F858 80242388 AE420000 */ sw $v0, ($s2) +/* D9F85C 8024238C 8E420000 */ lw $v0, ($s2) +/* D9F860 80242390 2403F7FF */ addiu $v1, $zero, -0x801 +/* D9F864 80242394 00431024 */ and $v0, $v0, $v1 +/* D9F868 80242398 AE420000 */ sw $v0, ($s2) +/* D9F86C 8024239C 8E620000 */ lw $v0, ($s3) +/* D9F870 802423A0 3C031F00 */ lui $v1, 0x1f00 +/* D9F874 802423A4 00431025 */ or $v0, $v0, $v1 +/* D9F878 802423A8 AE620000 */ sw $v0, ($s3) +/* D9F87C 802423AC AEE00070 */ sw $zero, 0x70($s7) +.L802423B0: +/* D9F880 802423B0 0000102D */ daddu $v0, $zero, $zero +.L802423B4: +/* D9F884 802423B4 8FBF0050 */ lw $ra, 0x50($sp) +/* D9F888 802423B8 8FB7004C */ lw $s7, 0x4c($sp) +/* D9F88C 802423BC 8FB60048 */ lw $s6, 0x48($sp) +/* D9F890 802423C0 8FB50044 */ lw $s5, 0x44($sp) +/* D9F894 802423C4 8FB40040 */ lw $s4, 0x40($sp) +/* D9F898 802423C8 8FB3003C */ lw $s3, 0x3c($sp) +/* D9F89C 802423CC 8FB20038 */ lw $s2, 0x38($sp) +/* D9F8A0 802423D0 8FB10034 */ lw $s1, 0x34($sp) +/* D9F8A4 802423D4 8FB00030 */ lw $s0, 0x30($sp) +/* D9F8A8 802423D8 03E00008 */ jr $ra +/* D9F8AC 802423DC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0.s deleted file mode 100644 index 63bd75a8be..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423E0 -/* D9F8B0 802423E0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* D9F8B4 802423E4 AFB3003C */ sw $s3, 0x3c($sp) -/* D9F8B8 802423E8 0080982D */ daddu $s3, $a0, $zero -/* D9F8BC 802423EC AFB40040 */ sw $s4, 0x40($sp) -/* D9F8C0 802423F0 0000A02D */ daddu $s4, $zero, $zero -/* D9F8C4 802423F4 3C03800A */ lui $v1, 0x800a -/* D9F8C8 802423F8 8463A634 */ lh $v1, -0x59cc($v1) -/* D9F8CC 802423FC 3C04800B */ lui $a0, %hi(gCameras) -/* D9F8D0 80242400 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* D9F8D4 80242404 AFBF0044 */ sw $ra, 0x44($sp) -/* D9F8D8 80242408 AFB20038 */ sw $s2, 0x38($sp) -/* D9F8DC 8024240C AFB10034 */ sw $s1, 0x34($sp) -/* D9F8E0 80242410 AFB00030 */ sw $s0, 0x30($sp) -/* D9F8E4 80242414 F7B80058 */ sdc1 $f24, 0x58($sp) -/* D9F8E8 80242418 F7B60050 */ sdc1 $f22, 0x50($sp) -/* D9F8EC 8024241C F7B40048 */ sdc1 $f20, 0x48($sp) -/* D9F8F0 80242420 8E710148 */ lw $s1, 0x148($s3) -/* D9F8F4 80242424 00031080 */ sll $v0, $v1, 2 -/* D9F8F8 80242428 00431021 */ addu $v0, $v0, $v1 -/* D9F8FC 8024242C 00021080 */ sll $v0, $v0, 2 -/* D9F900 80242430 00431023 */ subu $v0, $v0, $v1 -/* D9F904 80242434 000218C0 */ sll $v1, $v0, 3 -/* D9F908 80242438 00431021 */ addu $v0, $v0, $v1 -/* D9F90C 8024243C 000210C0 */ sll $v0, $v0, 3 -/* D9F910 80242440 10A00002 */ beqz $a1, .L8024244C -/* D9F914 80242444 00449021 */ addu $s2, $v0, $a0 -/* D9F918 80242448 AE600070 */ sw $zero, 0x70($s3) -.L8024244C: -/* D9F91C 8024244C 0C00FB5A */ jal get_enemy_safe -/* D9F920 80242450 86240008 */ lh $a0, 8($s1) -/* D9F924 80242454 14400006 */ bnez $v0, .L80242470 -/* D9F928 80242458 24020005 */ addiu $v0, $zero, 5 -/* D9F92C 8024245C 0260202D */ daddu $a0, $s3, $zero -/* D9F930 80242460 3C05FE36 */ lui $a1, 0xfe36 -/* D9F934 80242464 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D9F938 80242468 080909F4 */ j .L802427D0 -/* D9F93C 8024246C 0000302D */ daddu $a2, $zero, $zero -.L80242470: -/* D9F940 80242470 8E23006C */ lw $v1, 0x6c($s1) -/* D9F944 80242474 14620005 */ bne $v1, $v0, .L8024248C -/* D9F948 80242478 0260202D */ daddu $a0, $s3, $zero -/* D9F94C 8024247C 3C05FE36 */ lui $a1, 0xfe36 -/* D9F950 80242480 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D9F954 80242484 080909F4 */ j .L802427D0 -/* D9F958 80242488 0000302D */ daddu $a2, $zero, $zero -.L8024248C: -/* D9F95C 8024248C 86240008 */ lh $a0, 8($s1) -/* D9F960 80242490 0C00FB5A */ jal get_enemy_safe -/* D9F964 80242494 00000000 */ nop -/* D9F968 80242498 14400005 */ bnez $v0, .L802424B0 -/* D9F96C 8024249C 0260202D */ daddu $a0, $s3, $zero -/* D9F970 802424A0 3C05FE36 */ lui $a1, 0xfe36 -/* D9F974 802424A4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D9F978 802424A8 080909F4 */ j .L802427D0 -/* D9F97C 802424AC 0000302D */ daddu $a2, $zero, $zero -.L802424B0: -/* D9F980 802424B0 86240008 */ lh $a0, 8($s1) -/* D9F984 802424B4 0C00EABB */ jal get_npc_unsafe -/* D9F988 802424B8 00000000 */ nop -/* D9F98C 802424BC 8E630070 */ lw $v1, 0x70($s3) -/* D9F990 802424C0 10600006 */ beqz $v1, .L802424DC -/* D9F994 802424C4 0040802D */ daddu $s0, $v0, $zero -/* D9F998 802424C8 24020001 */ addiu $v0, $zero, 1 -/* D9F99C 802424CC 1062003F */ beq $v1, $v0, .L802425CC -/* D9F9A0 802424D0 0000102D */ daddu $v0, $zero, $zero -/* D9F9A4 802424D4 08090A04 */ j .L80242810 -/* D9F9A8 802424D8 00000000 */ nop -.L802424DC: -/* D9F9AC 802424DC AFA00010 */ sw $zero, 0x10($sp) -/* D9F9B0 802424E0 AFA00014 */ sw $zero, 0x14($sp) -/* D9F9B4 802424E4 8E050038 */ lw $a1, 0x38($s0) -/* D9F9B8 802424E8 8E06003C */ lw $a2, 0x3c($s0) -/* D9F9BC 802424EC 8E070040 */ lw $a3, 0x40($s0) -/* D9F9C0 802424F0 0C01BECC */ jal fx_walk_normal -/* D9F9C4 802424F4 24040002 */ addiu $a0, $zero, 2 -/* D9F9C8 802424F8 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D9F9CC 802424FC 0C00A6C9 */ jal clamp_angle -/* D9F9D0 80242500 00000000 */ nop -/* D9F9D4 80242504 3C018024 */ lui $at, 0x8024 -/* D9F9D8 80242508 D4387BC8 */ ldc1 $f24, 0x7bc8($at) -/* D9F9DC 8024250C 46000521 */ cvt.d.s $f20, $f0 -/* D9F9E0 80242510 4638A300 */ add.d $f12, $f20, $f24 -/* D9F9E4 80242514 3C018024 */ lui $at, 0x8024 -/* D9F9E8 80242518 D4367BD0 */ ldc1 $f22, 0x7bd0($at) -/* D9F9EC 8024251C 0C00A6C9 */ jal clamp_angle -/* D9F9F0 80242520 46206320 */ cvt.s.d $f12, $f12 -/* D9F9F4 80242524 4636A500 */ add.d $f20, $f20, $f22 -/* D9F9F8 80242528 4620A320 */ cvt.s.d $f12, $f20 -/* D9F9FC 8024252C 0C00A6C9 */ jal clamp_angle -/* D9FA00 80242530 46000506 */ mov.s $f20, $f0 -/* D9FA04 80242534 4600A521 */ cvt.d.s $f20, $f20 -/* D9FA08 80242538 4636A500 */ add.d $f20, $f20, $f22 -/* D9FA0C 8024253C 46000586 */ mov.s $f22, $f0 -/* D9FA10 80242540 0C00A6C9 */ jal clamp_angle -/* D9FA14 80242544 4620A320 */ cvt.s.d $f12, $f20 -/* D9FA18 80242548 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9FA1C 8024254C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9FA20 80242550 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D9FA24 80242554 C44E0084 */ lwc1 $f14, 0x84($v0) -/* D9FA28 80242558 0C00A70A */ jal get_clamped_angle_diff -/* D9FA2C 8024255C 46000506 */ mov.s $f20, $f0 -/* D9FA30 80242560 0C00A6C9 */ jal clamp_angle -/* D9FA34 80242564 46000306 */ mov.s $f12, $f0 -/* D9FA38 80242568 46000021 */ cvt.d.s $f0, $f0 -/* D9FA3C 8024256C 4638003C */ c.lt.d $f0, $f24 -/* D9FA40 80242570 00000000 */ nop -/* D9FA44 80242574 45020002 */ bc1fl .L80242580 -/* D9FA48 80242578 E614000C */ swc1 $f20, 0xc($s0) -/* D9FA4C 8024257C E616000C */ swc1 $f22, 0xc($s0) -.L80242580: -/* D9FA50 80242580 C6000018 */ lwc1 $f0, 0x18($s0) -/* D9FA54 80242584 3C018024 */ lui $at, 0x8024 -/* D9FA58 80242588 D4227BD8 */ ldc1 $f2, 0x7bd8($at) -/* D9FA5C 8024258C 46000021 */ cvt.d.s $f0, $f0 -/* D9FA60 80242590 46220002 */ mul.d $f0, $f0, $f2 -/* D9FA64 80242594 00000000 */ nop -/* D9FA68 80242598 3C013F66 */ lui $at, 0x3f66 -/* D9FA6C 8024259C 34216666 */ ori $at, $at, 0x6666 -/* D9FA70 802425A0 44812000 */ mtc1 $at, $f4 -/* D9FA74 802425A4 2402001E */ addiu $v0, $zero, 0x1e -/* D9FA78 802425A8 A602008E */ sh $v0, 0x8e($s0) -/* D9FA7C 802425AC 3C014120 */ lui $at, 0x4120 -/* D9FA80 802425B0 44811000 */ mtc1 $at, $f2 -/* D9FA84 802425B4 24020001 */ addiu $v0, $zero, 1 -/* D9FA88 802425B8 E6040014 */ swc1 $f4, 0x14($s0) -/* D9FA8C 802425BC E602001C */ swc1 $f2, 0x1c($s0) -/* D9FA90 802425C0 46200020 */ cvt.s.d $f0, $f0 -/* D9FA94 802425C4 E6000018 */ swc1 $f0, 0x18($s0) -/* D9FA98 802425C8 AE620070 */ sw $v0, 0x70($s3) -.L802425CC: -/* D9FA9C 802425CC C6000038 */ lwc1 $f0, 0x38($s0) -/* D9FAA0 802425D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* D9FAA4 802425D4 C6040040 */ lwc1 $f4, 0x40($s0) -/* D9FAA8 802425D8 C6060018 */ lwc1 $f6, 0x18($s0) -/* D9FAAC 802425DC 0000202D */ daddu $a0, $zero, $zero -/* D9FAB0 802425E0 E7A00020 */ swc1 $f0, 0x20($sp) -/* D9FAB4 802425E4 E7A20024 */ swc1 $f2, 0x24($sp) -/* D9FAB8 802425E8 E7A40028 */ swc1 $f4, 0x28($sp) -/* D9FABC 802425EC E7A60010 */ swc1 $f6, 0x10($sp) -/* D9FAC0 802425F0 C600000C */ lwc1 $f0, 0xc($s0) -/* D9FAC4 802425F4 27A50020 */ addiu $a1, $sp, 0x20 -/* D9FAC8 802425F8 E7A00014 */ swc1 $f0, 0x14($sp) -/* D9FACC 802425FC 860200A6 */ lh $v0, 0xa6($s0) -/* D9FAD0 80242600 27A60024 */ addiu $a2, $sp, 0x24 -/* D9FAD4 80242604 44820000 */ mtc1 $v0, $f0 -/* D9FAD8 80242608 00000000 */ nop -/* D9FADC 8024260C 46800020 */ cvt.s.w $f0, $f0 -/* D9FAE0 80242610 E7A00018 */ swc1 $f0, 0x18($sp) -/* D9FAE4 80242614 860200A8 */ lh $v0, 0xa8($s0) -/* D9FAE8 80242618 27A70028 */ addiu $a3, $sp, 0x28 -/* D9FAEC 8024261C 44820000 */ mtc1 $v0, $f0 -/* D9FAF0 80242620 00000000 */ nop -/* D9FAF4 80242624 46800020 */ cvt.s.w $f0, $f0 -/* D9FAF8 80242628 0C037711 */ jal func_800DDC44 -/* D9FAFC 8024262C E7A0001C */ swc1 $f0, 0x1c($sp) -/* D9FB00 80242630 54400007 */ bnel $v0, $zero, .L80242650 -/* D9FB04 80242634 24140001 */ addiu $s4, $zero, 1 -/* D9FB08 80242638 8E050018 */ lw $a1, 0x18($s0) -/* D9FB0C 8024263C 8E06000C */ lw $a2, 0xc($s0) -/* D9FB10 80242640 0C00EA95 */ jal npc_move_heading -/* D9FB14 80242644 0200202D */ daddu $a0, $s0, $zero -/* D9FB18 80242648 08090995 */ j .L80242654 -/* D9FB1C 8024264C 0000902D */ daddu $s2, $zero, $zero -.L80242650: -/* D9FB20 80242650 0000902D */ daddu $s2, $zero, $zero -.L80242654: -/* D9FB24 80242654 C600001C */ lwc1 $f0, 0x1c($s0) -/* D9FB28 80242658 44801000 */ mtc1 $zero, $f2 -/* D9FB2C 8024265C 44801800 */ mtc1 $zero, $f3 -/* D9FB30 80242660 46000021 */ cvt.d.s $f0, $f0 -/* D9FB34 80242664 4622003C */ c.lt.d $f0, $f2 -/* D9FB38 80242668 00000000 */ nop -/* D9FB3C 8024266C 45000028 */ bc1f .L80242710 -/* D9FB40 80242670 27A50020 */ addiu $a1, $sp, 0x20 -/* D9FB44 80242674 27A60024 */ addiu $a2, $sp, 0x24 -/* D9FB48 80242678 27A2002C */ addiu $v0, $sp, 0x2c -/* D9FB4C 8024267C C602003C */ lwc1 $f2, 0x3c($s0) -/* D9FB50 80242680 C6060038 */ lwc1 $f6, 0x38($s0) -/* D9FB54 80242684 3C01402A */ lui $at, 0x402a -/* D9FB58 80242688 4481A800 */ mtc1 $at, $f21 -/* D9FB5C 8024268C 4480A000 */ mtc1 $zero, $f20 -/* D9FB60 80242690 460010A1 */ cvt.d.s $f2, $f2 -/* D9FB64 80242694 46341080 */ add.d $f2, $f2, $f20 -/* D9FB68 80242698 C600001C */ lwc1 $f0, 0x1c($s0) -/* D9FB6C 8024269C C6040040 */ lwc1 $f4, 0x40($s0) -/* D9FB70 802426A0 46000005 */ abs.s $f0, $f0 -/* D9FB74 802426A4 E7A40028 */ swc1 $f4, 0x28($sp) -/* D9FB78 802426A8 3C014030 */ lui $at, 0x4030 -/* D9FB7C 802426AC 44812800 */ mtc1 $at, $f5 -/* D9FB80 802426B0 44802000 */ mtc1 $zero, $f4 -/* D9FB84 802426B4 46000021 */ cvt.d.s $f0, $f0 -/* D9FB88 802426B8 E7A60020 */ swc1 $f6, 0x20($sp) -/* D9FB8C 802426BC 46240000 */ add.d $f0, $f0, $f4 -/* D9FB90 802426C0 462010A0 */ cvt.s.d $f2, $f2 -/* D9FB94 802426C4 E7A20024 */ swc1 $f2, 0x24($sp) -/* D9FB98 802426C8 46200020 */ cvt.s.d $f0, $f0 -/* D9FB9C 802426CC E7A0002C */ swc1 $f0, 0x2c($sp) -/* D9FBA0 802426D0 AFA20010 */ sw $v0, 0x10($sp) -/* D9FBA4 802426D4 8E040080 */ lw $a0, 0x80($s0) -/* D9FBA8 802426D8 0C0372DF */ jal func_800DCB7C -/* D9FBAC 802426DC 27A70028 */ addiu $a3, $sp, 0x28 -/* D9FBB0 802426E0 1040000B */ beqz $v0, .L80242710 -/* D9FBB4 802426E4 00000000 */ nop -/* D9FBB8 802426E8 C600001C */ lwc1 $f0, 0x1c($s0) -/* D9FBBC 802426EC C7A2002C */ lwc1 $f2, 0x2c($sp) -/* D9FBC0 802426F0 46000005 */ abs.s $f0, $f0 -/* D9FBC4 802426F4 46000021 */ cvt.d.s $f0, $f0 -/* D9FBC8 802426F8 46340000 */ add.d $f0, $f0, $f20 -/* D9FBCC 802426FC 460010A1 */ cvt.d.s $f2, $f2 -/* D9FBD0 80242700 4620103E */ c.le.d $f2, $f0 -/* D9FBD4 80242704 00000000 */ nop -/* D9FBD8 80242708 45030001 */ bc1tl .L80242710 -/* D9FBDC 8024270C 24120001 */ addiu $s2, $zero, 1 -.L80242710: -/* D9FBE0 80242710 56400008 */ bnel $s2, $zero, .L80242734 -/* D9FBE4 80242714 2414000A */ addiu $s4, $zero, 0xa -/* D9FBE8 80242718 C604003C */ lwc1 $f4, 0x3c($s0) -/* D9FBEC 8024271C C600001C */ lwc1 $f0, 0x1c($s0) -/* D9FBF0 80242720 46002100 */ add.s $f4, $f4, $f0 -/* D9FBF4 80242724 C6020014 */ lwc1 $f2, 0x14($s0) -/* D9FBF8 80242728 46020001 */ sub.s $f0, $f0, $f2 -/* D9FBFC 8024272C E604003C */ swc1 $f4, 0x3c($s0) -/* D9FC00 80242730 E600001C */ swc1 $f0, 0x1c($s0) -.L80242734: -/* D9FC04 80242734 9602008E */ lhu $v0, 0x8e($s0) -/* D9FC08 80242738 2442FFFF */ addiu $v0, $v0, -1 -/* D9FC0C 8024273C A602008E */ sh $v0, 0x8e($s0) -/* D9FC10 80242740 00021400 */ sll $v0, $v0, 0x10 -/* D9FC14 80242744 58400001 */ blezl $v0, .L8024274C -/* D9FC18 80242748 2414000B */ addiu $s4, $zero, 0xb -.L8024274C: -/* D9FC1C 8024274C 12800024 */ beqz $s4, .L802427E0 -/* D9FC20 80242750 00000000 */ nop -/* D9FC24 80242754 AFA00010 */ sw $zero, 0x10($sp) -/* D9FC28 80242758 AFA00014 */ sw $zero, 0x14($sp) -/* D9FC2C 8024275C 8E050038 */ lw $a1, 0x38($s0) -/* D9FC30 80242760 8E06003C */ lw $a2, 0x3c($s0) -/* D9FC34 80242764 8E070040 */ lw $a3, 0x40($s0) -/* D9FC38 80242768 0C01BECC */ jal fx_walk_normal -/* D9FC3C 8024276C 24040002 */ addiu $a0, $zero, 2 -/* D9FC40 80242770 3C01C47A */ lui $at, 0xc47a -/* D9FC44 80242774 44810000 */ mtc1 $at, $f0 -/* D9FC48 80242778 AE20006C */ sw $zero, 0x6c($s1) -/* D9FC4C 8024277C 8E020000 */ lw $v0, ($s0) -/* D9FC50 80242780 0200202D */ daddu $a0, $s0, $zero -/* D9FC54 80242784 AE000038 */ sw $zero, 0x38($s0) -/* D9FC58 80242788 AE000040 */ sw $zero, 0x40($s0) -/* D9FC5C 8024278C 34420002 */ ori $v0, $v0, 2 -/* D9FC60 80242790 E600003C */ swc1 $f0, 0x3c($s0) -/* D9FC64 80242794 0C00EAFF */ jal disable_npc_shadow -/* D9FC68 80242798 AE020000 */ sw $v0, ($s0) -/* D9FC6C 8024279C 0260202D */ daddu $a0, $s3, $zero -/* D9FC70 802427A0 3C05FE36 */ lui $a1, 0xfe36 -/* D9FC74 802427A4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D9FC78 802427A8 24060001 */ addiu $a2, $zero, 1 -/* D9FC7C 802427AC 8E020000 */ lw $v0, ($s0) -/* D9FC80 802427B0 2403F7FF */ addiu $v1, $zero, -0x801 -/* D9FC84 802427B4 00431024 */ and $v0, $v0, $v1 -/* D9FC88 802427B8 AE020000 */ sw $v0, ($s0) -/* D9FC8C 802427BC 8E220000 */ lw $v0, ($s1) -/* D9FC90 802427C0 3C031F00 */ lui $v1, 0x1f00 -/* D9FC94 802427C4 00431025 */ or $v0, $v0, $v1 -/* D9FC98 802427C8 AE220000 */ sw $v0, ($s1) -/* D9FC9C 802427CC AC800070 */ sw $zero, 0x70($a0) -.L802427D0: -/* D9FCA0 802427D0 0C0B2026 */ jal set_variable -/* D9FCA4 802427D4 00000000 */ nop -/* D9FCA8 802427D8 08090A04 */ j .L80242810 -/* D9FCAC 802427DC 24020002 */ addiu $v0, $zero, 2 -.L802427E0: -/* D9FCB0 802427E0 8E220070 */ lw $v0, 0x70($s1) -/* D9FCB4 802427E4 30420001 */ andi $v0, $v0, 1 -/* D9FCB8 802427E8 10400009 */ beqz $v0, .L80242810 -/* D9FCBC 802427EC 0000102D */ daddu $v0, $zero, $zero -/* D9FCC0 802427F0 C600004C */ lwc1 $f0, 0x4c($s0) -/* D9FCC4 802427F4 3C01404E */ lui $at, 0x404e -/* D9FCC8 802427F8 44811800 */ mtc1 $at, $f3 -/* D9FCCC 802427FC 44801000 */ mtc1 $zero, $f2 -/* D9FCD0 80242800 46000021 */ cvt.d.s $f0, $f0 -/* D9FCD4 80242804 46220000 */ add.d $f0, $f0, $f2 -/* D9FCD8 80242808 46200020 */ cvt.s.d $f0, $f0 -/* D9FCDC 8024280C E600004C */ swc1 $f0, 0x4c($s0) -.L80242810: -/* D9FCE0 80242810 8FBF0044 */ lw $ra, 0x44($sp) -/* D9FCE4 80242814 8FB40040 */ lw $s4, 0x40($sp) -/* D9FCE8 80242818 8FB3003C */ lw $s3, 0x3c($sp) -/* D9FCEC 8024281C 8FB20038 */ lw $s2, 0x38($sp) -/* D9FCF0 80242820 8FB10034 */ lw $s1, 0x34($sp) -/* D9FCF4 80242824 8FB00030 */ lw $s0, 0x30($sp) -/* D9FCF8 80242828 D7B80058 */ ldc1 $f24, 0x58($sp) -/* D9FCFC 8024282C D7B60050 */ ldc1 $f22, 0x50($sp) -/* D9FD00 80242830 D7B40048 */ ldc1 $f20, 0x48($sp) -/* D9FD04 80242834 03E00008 */ jr $ra -/* D9FD08 80242838 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s new file mode 100644 index 0000000000..2470c7d6f6 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_802423E0_D9F8B0.s @@ -0,0 +1,298 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423E0_D9F8B0 +/* D9F8B0 802423E0 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* D9F8B4 802423E4 AFB3003C */ sw $s3, 0x3c($sp) +/* D9F8B8 802423E8 0080982D */ daddu $s3, $a0, $zero +/* D9F8BC 802423EC AFB40040 */ sw $s4, 0x40($sp) +/* D9F8C0 802423F0 0000A02D */ daddu $s4, $zero, $zero +/* D9F8C4 802423F4 3C03800A */ lui $v1, 0x800a +/* D9F8C8 802423F8 8463A634 */ lh $v1, -0x59cc($v1) +/* D9F8CC 802423FC 3C04800B */ lui $a0, %hi(gCameras) +/* D9F8D0 80242400 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* D9F8D4 80242404 AFBF0044 */ sw $ra, 0x44($sp) +/* D9F8D8 80242408 AFB20038 */ sw $s2, 0x38($sp) +/* D9F8DC 8024240C AFB10034 */ sw $s1, 0x34($sp) +/* D9F8E0 80242410 AFB00030 */ sw $s0, 0x30($sp) +/* D9F8E4 80242414 F7B80058 */ sdc1 $f24, 0x58($sp) +/* D9F8E8 80242418 F7B60050 */ sdc1 $f22, 0x50($sp) +/* D9F8EC 8024241C F7B40048 */ sdc1 $f20, 0x48($sp) +/* D9F8F0 80242420 8E710148 */ lw $s1, 0x148($s3) +/* D9F8F4 80242424 00031080 */ sll $v0, $v1, 2 +/* D9F8F8 80242428 00431021 */ addu $v0, $v0, $v1 +/* D9F8FC 8024242C 00021080 */ sll $v0, $v0, 2 +/* D9F900 80242430 00431023 */ subu $v0, $v0, $v1 +/* D9F904 80242434 000218C0 */ sll $v1, $v0, 3 +/* D9F908 80242438 00431021 */ addu $v0, $v0, $v1 +/* D9F90C 8024243C 000210C0 */ sll $v0, $v0, 3 +/* D9F910 80242440 10A00002 */ beqz $a1, .L8024244C +/* D9F914 80242444 00449021 */ addu $s2, $v0, $a0 +/* D9F918 80242448 AE600070 */ sw $zero, 0x70($s3) +.L8024244C: +/* D9F91C 8024244C 0C00FB5A */ jal get_enemy_safe +/* D9F920 80242450 86240008 */ lh $a0, 8($s1) +/* D9F924 80242454 14400006 */ bnez $v0, .L80242470 +/* D9F928 80242458 24020005 */ addiu $v0, $zero, 5 +/* D9F92C 8024245C 0260202D */ daddu $a0, $s3, $zero +/* D9F930 80242460 3C05FE36 */ lui $a1, 0xfe36 +/* D9F934 80242464 34A53C80 */ ori $a1, $a1, 0x3c80 +/* D9F938 80242468 080909F4 */ j .L802427D0 +/* D9F93C 8024246C 0000302D */ daddu $a2, $zero, $zero +.L80242470: +/* D9F940 80242470 8E23006C */ lw $v1, 0x6c($s1) +/* D9F944 80242474 14620005 */ bne $v1, $v0, .L8024248C +/* D9F948 80242478 0260202D */ daddu $a0, $s3, $zero +/* D9F94C 8024247C 3C05FE36 */ lui $a1, 0xfe36 +/* D9F950 80242480 34A53C80 */ ori $a1, $a1, 0x3c80 +/* D9F954 80242484 080909F4 */ j .L802427D0 +/* D9F958 80242488 0000302D */ daddu $a2, $zero, $zero +.L8024248C: +/* D9F95C 8024248C 86240008 */ lh $a0, 8($s1) +/* D9F960 80242490 0C00FB5A */ jal get_enemy_safe +/* D9F964 80242494 00000000 */ nop +/* D9F968 80242498 14400005 */ bnez $v0, .L802424B0 +/* D9F96C 8024249C 0260202D */ daddu $a0, $s3, $zero +/* D9F970 802424A0 3C05FE36 */ lui $a1, 0xfe36 +/* D9F974 802424A4 34A53C80 */ ori $a1, $a1, 0x3c80 +/* D9F978 802424A8 080909F4 */ j .L802427D0 +/* D9F97C 802424AC 0000302D */ daddu $a2, $zero, $zero +.L802424B0: +/* D9F980 802424B0 86240008 */ lh $a0, 8($s1) +/* D9F984 802424B4 0C00EABB */ jal get_npc_unsafe +/* D9F988 802424B8 00000000 */ nop +/* D9F98C 802424BC 8E630070 */ lw $v1, 0x70($s3) +/* D9F990 802424C0 10600006 */ beqz $v1, .L802424DC +/* D9F994 802424C4 0040802D */ daddu $s0, $v0, $zero +/* D9F998 802424C8 24020001 */ addiu $v0, $zero, 1 +/* D9F99C 802424CC 1062003F */ beq $v1, $v0, .L802425CC +/* D9F9A0 802424D0 0000102D */ daddu $v0, $zero, $zero +/* D9F9A4 802424D4 08090A04 */ j .L80242810 +/* D9F9A8 802424D8 00000000 */ nop +.L802424DC: +/* D9F9AC 802424DC AFA00010 */ sw $zero, 0x10($sp) +/* D9F9B0 802424E0 AFA00014 */ sw $zero, 0x14($sp) +/* D9F9B4 802424E4 8E050038 */ lw $a1, 0x38($s0) +/* D9F9B8 802424E8 8E06003C */ lw $a2, 0x3c($s0) +/* D9F9BC 802424EC 8E070040 */ lw $a3, 0x40($s0) +/* D9F9C0 802424F0 0C01BECC */ jal fx_walk_normal +/* D9F9C4 802424F4 24040002 */ addiu $a0, $zero, 2 +/* D9F9C8 802424F8 C64C006C */ lwc1 $f12, 0x6c($s2) +/* D9F9CC 802424FC 0C00A6C9 */ jal clamp_angle +/* D9F9D0 80242500 00000000 */ nop +/* D9F9D4 80242504 3C018024 */ lui $at, 0x8024 +/* D9F9D8 80242508 D4387BC8 */ ldc1 $f24, 0x7bc8($at) +/* D9F9DC 8024250C 46000521 */ cvt.d.s $f20, $f0 +/* D9F9E0 80242510 4638A300 */ add.d $f12, $f20, $f24 +/* D9F9E4 80242514 3C018024 */ lui $at, 0x8024 +/* D9F9E8 80242518 D4367BD0 */ ldc1 $f22, 0x7bd0($at) +/* D9F9EC 8024251C 0C00A6C9 */ jal clamp_angle +/* D9F9F0 80242520 46206320 */ cvt.s.d $f12, $f12 +/* D9F9F4 80242524 4636A500 */ add.d $f20, $f20, $f22 +/* D9F9F8 80242528 4620A320 */ cvt.s.d $f12, $f20 +/* D9F9FC 8024252C 0C00A6C9 */ jal clamp_angle +/* D9FA00 80242530 46000506 */ mov.s $f20, $f0 +/* D9FA04 80242534 4600A521 */ cvt.d.s $f20, $f20 +/* D9FA08 80242538 4636A500 */ add.d $f20, $f20, $f22 +/* D9FA0C 8024253C 46000586 */ mov.s $f22, $f0 +/* D9FA10 80242540 0C00A6C9 */ jal clamp_angle +/* D9FA14 80242544 4620A320 */ cvt.s.d $f12, $f20 +/* D9FA18 80242548 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* D9FA1C 8024254C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* D9FA20 80242550 C64C006C */ lwc1 $f12, 0x6c($s2) +/* D9FA24 80242554 C44E0084 */ lwc1 $f14, 0x84($v0) +/* D9FA28 80242558 0C00A70A */ jal get_clamped_angle_diff +/* D9FA2C 8024255C 46000506 */ mov.s $f20, $f0 +/* D9FA30 80242560 0C00A6C9 */ jal clamp_angle +/* D9FA34 80242564 46000306 */ mov.s $f12, $f0 +/* D9FA38 80242568 46000021 */ cvt.d.s $f0, $f0 +/* D9FA3C 8024256C 4638003C */ c.lt.d $f0, $f24 +/* D9FA40 80242570 00000000 */ nop +/* D9FA44 80242574 45020002 */ bc1fl .L80242580 +/* D9FA48 80242578 E614000C */ swc1 $f20, 0xc($s0) +/* D9FA4C 8024257C E616000C */ swc1 $f22, 0xc($s0) +.L80242580: +/* D9FA50 80242580 C6000018 */ lwc1 $f0, 0x18($s0) +/* D9FA54 80242584 3C018024 */ lui $at, 0x8024 +/* D9FA58 80242588 D4227BD8 */ ldc1 $f2, 0x7bd8($at) +/* D9FA5C 8024258C 46000021 */ cvt.d.s $f0, $f0 +/* D9FA60 80242590 46220002 */ mul.d $f0, $f0, $f2 +/* D9FA64 80242594 00000000 */ nop +/* D9FA68 80242598 3C013F66 */ lui $at, 0x3f66 +/* D9FA6C 8024259C 34216666 */ ori $at, $at, 0x6666 +/* D9FA70 802425A0 44812000 */ mtc1 $at, $f4 +/* D9FA74 802425A4 2402001E */ addiu $v0, $zero, 0x1e +/* D9FA78 802425A8 A602008E */ sh $v0, 0x8e($s0) +/* D9FA7C 802425AC 3C014120 */ lui $at, 0x4120 +/* D9FA80 802425B0 44811000 */ mtc1 $at, $f2 +/* D9FA84 802425B4 24020001 */ addiu $v0, $zero, 1 +/* D9FA88 802425B8 E6040014 */ swc1 $f4, 0x14($s0) +/* D9FA8C 802425BC E602001C */ swc1 $f2, 0x1c($s0) +/* D9FA90 802425C0 46200020 */ cvt.s.d $f0, $f0 +/* D9FA94 802425C4 E6000018 */ swc1 $f0, 0x18($s0) +/* D9FA98 802425C8 AE620070 */ sw $v0, 0x70($s3) +.L802425CC: +/* D9FA9C 802425CC C6000038 */ lwc1 $f0, 0x38($s0) +/* D9FAA0 802425D0 C602003C */ lwc1 $f2, 0x3c($s0) +/* D9FAA4 802425D4 C6040040 */ lwc1 $f4, 0x40($s0) +/* D9FAA8 802425D8 C6060018 */ lwc1 $f6, 0x18($s0) +/* D9FAAC 802425DC 0000202D */ daddu $a0, $zero, $zero +/* D9FAB0 802425E0 E7A00020 */ swc1 $f0, 0x20($sp) +/* D9FAB4 802425E4 E7A20024 */ swc1 $f2, 0x24($sp) +/* D9FAB8 802425E8 E7A40028 */ swc1 $f4, 0x28($sp) +/* D9FABC 802425EC E7A60010 */ swc1 $f6, 0x10($sp) +/* D9FAC0 802425F0 C600000C */ lwc1 $f0, 0xc($s0) +/* D9FAC4 802425F4 27A50020 */ addiu $a1, $sp, 0x20 +/* D9FAC8 802425F8 E7A00014 */ swc1 $f0, 0x14($sp) +/* D9FACC 802425FC 860200A6 */ lh $v0, 0xa6($s0) +/* D9FAD0 80242600 27A60024 */ addiu $a2, $sp, 0x24 +/* D9FAD4 80242604 44820000 */ mtc1 $v0, $f0 +/* D9FAD8 80242608 00000000 */ nop +/* D9FADC 8024260C 46800020 */ cvt.s.w $f0, $f0 +/* D9FAE0 80242610 E7A00018 */ swc1 $f0, 0x18($sp) +/* D9FAE4 80242614 860200A8 */ lh $v0, 0xa8($s0) +/* D9FAE8 80242618 27A70028 */ addiu $a3, $sp, 0x28 +/* D9FAEC 8024261C 44820000 */ mtc1 $v0, $f0 +/* D9FAF0 80242620 00000000 */ nop +/* D9FAF4 80242624 46800020 */ cvt.s.w $f0, $f0 +/* D9FAF8 80242628 0C037711 */ jal func_800DDC44 +/* D9FAFC 8024262C E7A0001C */ swc1 $f0, 0x1c($sp) +/* D9FB00 80242630 54400007 */ bnel $v0, $zero, .L80242650 +/* D9FB04 80242634 24140001 */ addiu $s4, $zero, 1 +/* D9FB08 80242638 8E050018 */ lw $a1, 0x18($s0) +/* D9FB0C 8024263C 8E06000C */ lw $a2, 0xc($s0) +/* D9FB10 80242640 0C00EA95 */ jal npc_move_heading +/* D9FB14 80242644 0200202D */ daddu $a0, $s0, $zero +/* D9FB18 80242648 08090995 */ j .L80242654 +/* D9FB1C 8024264C 0000902D */ daddu $s2, $zero, $zero +.L80242650: +/* D9FB20 80242650 0000902D */ daddu $s2, $zero, $zero +.L80242654: +/* D9FB24 80242654 C600001C */ lwc1 $f0, 0x1c($s0) +/* D9FB28 80242658 44801000 */ mtc1 $zero, $f2 +/* D9FB2C 8024265C 44801800 */ mtc1 $zero, $f3 +/* D9FB30 80242660 46000021 */ cvt.d.s $f0, $f0 +/* D9FB34 80242664 4622003C */ c.lt.d $f0, $f2 +/* D9FB38 80242668 00000000 */ nop +/* D9FB3C 8024266C 45000028 */ bc1f .L80242710 +/* D9FB40 80242670 27A50020 */ addiu $a1, $sp, 0x20 +/* D9FB44 80242674 27A60024 */ addiu $a2, $sp, 0x24 +/* D9FB48 80242678 27A2002C */ addiu $v0, $sp, 0x2c +/* D9FB4C 8024267C C602003C */ lwc1 $f2, 0x3c($s0) +/* D9FB50 80242680 C6060038 */ lwc1 $f6, 0x38($s0) +/* D9FB54 80242684 3C01402A */ lui $at, 0x402a +/* D9FB58 80242688 4481A800 */ mtc1 $at, $f21 +/* D9FB5C 8024268C 4480A000 */ mtc1 $zero, $f20 +/* D9FB60 80242690 460010A1 */ cvt.d.s $f2, $f2 +/* D9FB64 80242694 46341080 */ add.d $f2, $f2, $f20 +/* D9FB68 80242698 C600001C */ lwc1 $f0, 0x1c($s0) +/* D9FB6C 8024269C C6040040 */ lwc1 $f4, 0x40($s0) +/* D9FB70 802426A0 46000005 */ abs.s $f0, $f0 +/* D9FB74 802426A4 E7A40028 */ swc1 $f4, 0x28($sp) +/* D9FB78 802426A8 3C014030 */ lui $at, 0x4030 +/* D9FB7C 802426AC 44812800 */ mtc1 $at, $f5 +/* D9FB80 802426B0 44802000 */ mtc1 $zero, $f4 +/* D9FB84 802426B4 46000021 */ cvt.d.s $f0, $f0 +/* D9FB88 802426B8 E7A60020 */ swc1 $f6, 0x20($sp) +/* D9FB8C 802426BC 46240000 */ add.d $f0, $f0, $f4 +/* D9FB90 802426C0 462010A0 */ cvt.s.d $f2, $f2 +/* D9FB94 802426C4 E7A20024 */ swc1 $f2, 0x24($sp) +/* D9FB98 802426C8 46200020 */ cvt.s.d $f0, $f0 +/* D9FB9C 802426CC E7A0002C */ swc1 $f0, 0x2c($sp) +/* D9FBA0 802426D0 AFA20010 */ sw $v0, 0x10($sp) +/* D9FBA4 802426D4 8E040080 */ lw $a0, 0x80($s0) +/* D9FBA8 802426D8 0C0372DF */ jal func_800DCB7C +/* D9FBAC 802426DC 27A70028 */ addiu $a3, $sp, 0x28 +/* D9FBB0 802426E0 1040000B */ beqz $v0, .L80242710 +/* D9FBB4 802426E4 00000000 */ nop +/* D9FBB8 802426E8 C600001C */ lwc1 $f0, 0x1c($s0) +/* D9FBBC 802426EC C7A2002C */ lwc1 $f2, 0x2c($sp) +/* D9FBC0 802426F0 46000005 */ abs.s $f0, $f0 +/* D9FBC4 802426F4 46000021 */ cvt.d.s $f0, $f0 +/* D9FBC8 802426F8 46340000 */ add.d $f0, $f0, $f20 +/* D9FBCC 802426FC 460010A1 */ cvt.d.s $f2, $f2 +/* D9FBD0 80242700 4620103E */ c.le.d $f2, $f0 +/* D9FBD4 80242704 00000000 */ nop +/* D9FBD8 80242708 45030001 */ bc1tl .L80242710 +/* D9FBDC 8024270C 24120001 */ addiu $s2, $zero, 1 +.L80242710: +/* D9FBE0 80242710 56400008 */ bnel $s2, $zero, .L80242734 +/* D9FBE4 80242714 2414000A */ addiu $s4, $zero, 0xa +/* D9FBE8 80242718 C604003C */ lwc1 $f4, 0x3c($s0) +/* D9FBEC 8024271C C600001C */ lwc1 $f0, 0x1c($s0) +/* D9FBF0 80242720 46002100 */ add.s $f4, $f4, $f0 +/* D9FBF4 80242724 C6020014 */ lwc1 $f2, 0x14($s0) +/* D9FBF8 80242728 46020001 */ sub.s $f0, $f0, $f2 +/* D9FBFC 8024272C E604003C */ swc1 $f4, 0x3c($s0) +/* D9FC00 80242730 E600001C */ swc1 $f0, 0x1c($s0) +.L80242734: +/* D9FC04 80242734 9602008E */ lhu $v0, 0x8e($s0) +/* D9FC08 80242738 2442FFFF */ addiu $v0, $v0, -1 +/* D9FC0C 8024273C A602008E */ sh $v0, 0x8e($s0) +/* D9FC10 80242740 00021400 */ sll $v0, $v0, 0x10 +/* D9FC14 80242744 58400001 */ blezl $v0, .L8024274C +/* D9FC18 80242748 2414000B */ addiu $s4, $zero, 0xb +.L8024274C: +/* D9FC1C 8024274C 12800024 */ beqz $s4, .L802427E0 +/* D9FC20 80242750 00000000 */ nop +/* D9FC24 80242754 AFA00010 */ sw $zero, 0x10($sp) +/* D9FC28 80242758 AFA00014 */ sw $zero, 0x14($sp) +/* D9FC2C 8024275C 8E050038 */ lw $a1, 0x38($s0) +/* D9FC30 80242760 8E06003C */ lw $a2, 0x3c($s0) +/* D9FC34 80242764 8E070040 */ lw $a3, 0x40($s0) +/* D9FC38 80242768 0C01BECC */ jal fx_walk_normal +/* D9FC3C 8024276C 24040002 */ addiu $a0, $zero, 2 +/* D9FC40 80242770 3C01C47A */ lui $at, 0xc47a +/* D9FC44 80242774 44810000 */ mtc1 $at, $f0 +/* D9FC48 80242778 AE20006C */ sw $zero, 0x6c($s1) +/* D9FC4C 8024277C 8E020000 */ lw $v0, ($s0) +/* D9FC50 80242780 0200202D */ daddu $a0, $s0, $zero +/* D9FC54 80242784 AE000038 */ sw $zero, 0x38($s0) +/* D9FC58 80242788 AE000040 */ sw $zero, 0x40($s0) +/* D9FC5C 8024278C 34420002 */ ori $v0, $v0, 2 +/* D9FC60 80242790 E600003C */ swc1 $f0, 0x3c($s0) +/* D9FC64 80242794 0C00EAFF */ jal disable_npc_shadow +/* D9FC68 80242798 AE020000 */ sw $v0, ($s0) +/* D9FC6C 8024279C 0260202D */ daddu $a0, $s3, $zero +/* D9FC70 802427A0 3C05FE36 */ lui $a1, 0xfe36 +/* D9FC74 802427A4 34A53C80 */ ori $a1, $a1, 0x3c80 +/* D9FC78 802427A8 24060001 */ addiu $a2, $zero, 1 +/* D9FC7C 802427AC 8E020000 */ lw $v0, ($s0) +/* D9FC80 802427B0 2403F7FF */ addiu $v1, $zero, -0x801 +/* D9FC84 802427B4 00431024 */ and $v0, $v0, $v1 +/* D9FC88 802427B8 AE020000 */ sw $v0, ($s0) +/* D9FC8C 802427BC 8E220000 */ lw $v0, ($s1) +/* D9FC90 802427C0 3C031F00 */ lui $v1, 0x1f00 +/* D9FC94 802427C4 00431025 */ or $v0, $v0, $v1 +/* D9FC98 802427C8 AE220000 */ sw $v0, ($s1) +/* D9FC9C 802427CC AC800070 */ sw $zero, 0x70($a0) +.L802427D0: +/* D9FCA0 802427D0 0C0B2026 */ jal set_variable +/* D9FCA4 802427D4 00000000 */ nop +/* D9FCA8 802427D8 08090A04 */ j .L80242810 +/* D9FCAC 802427DC 24020002 */ addiu $v0, $zero, 2 +.L802427E0: +/* D9FCB0 802427E0 8E220070 */ lw $v0, 0x70($s1) +/* D9FCB4 802427E4 30420001 */ andi $v0, $v0, 1 +/* D9FCB8 802427E8 10400009 */ beqz $v0, .L80242810 +/* D9FCBC 802427EC 0000102D */ daddu $v0, $zero, $zero +/* D9FCC0 802427F0 C600004C */ lwc1 $f0, 0x4c($s0) +/* D9FCC4 802427F4 3C01404E */ lui $at, 0x404e +/* D9FCC8 802427F8 44811800 */ mtc1 $at, $f3 +/* D9FCCC 802427FC 44801000 */ mtc1 $zero, $f2 +/* D9FCD0 80242800 46000021 */ cvt.d.s $f0, $f0 +/* D9FCD4 80242804 46220000 */ add.d $f0, $f0, $f2 +/* D9FCD8 80242808 46200020 */ cvt.s.d $f0, $f0 +/* D9FCDC 8024280C E600004C */ swc1 $f0, 0x4c($s0) +.L80242810: +/* D9FCE0 80242810 8FBF0044 */ lw $ra, 0x44($sp) +/* D9FCE4 80242814 8FB40040 */ lw $s4, 0x40($sp) +/* D9FCE8 80242818 8FB3003C */ lw $s3, 0x3c($sp) +/* D9FCEC 8024281C 8FB20038 */ lw $s2, 0x38($sp) +/* D9FCF0 80242820 8FB10034 */ lw $s1, 0x34($sp) +/* D9FCF4 80242824 8FB00030 */ lw $s0, 0x30($sp) +/* D9FCF8 80242828 D7B80058 */ ldc1 $f24, 0x58($sp) +/* D9FCFC 8024282C D7B60050 */ ldc1 $f22, 0x50($sp) +/* D9FD00 80242830 D7B40048 */ ldc1 $f20, 0x48($sp) +/* D9FD04 80242834 03E00008 */ jr $ra +/* D9FD08 80242838 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C.s deleted file mode 100644 index 81d0b691f2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024283C -/* D9FD0C 8024283C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D9FD10 80242840 AFB3003C */ sw $s3, 0x3c($sp) -/* D9FD14 80242844 0080982D */ daddu $s3, $a0, $zero -/* D9FD18 80242848 AFBF0048 */ sw $ra, 0x48($sp) -/* D9FD1C 8024284C AFB50044 */ sw $s5, 0x44($sp) -/* D9FD20 80242850 AFB40040 */ sw $s4, 0x40($sp) -/* D9FD24 80242854 AFB20038 */ sw $s2, 0x38($sp) -/* D9FD28 80242858 AFB10034 */ sw $s1, 0x34($sp) -/* D9FD2C 8024285C AFB00030 */ sw $s0, 0x30($sp) -/* D9FD30 80242860 8E720148 */ lw $s2, 0x148($s3) -/* D9FD34 80242864 86440008 */ lh $a0, 8($s2) -/* D9FD38 80242868 8E70000C */ lw $s0, 0xc($s3) -/* D9FD3C 8024286C 0C00EABB */ jal get_npc_unsafe -/* D9FD40 80242870 00A0882D */ daddu $s1, $a1, $zero -/* D9FD44 80242874 0260202D */ daddu $a0, $s3, $zero -/* D9FD48 80242878 8E050000 */ lw $a1, ($s0) -/* D9FD4C 8024287C 0C0B1EAF */ jal get_variable -/* D9FD50 80242880 0040A02D */ daddu $s4, $v0, $zero -/* D9FD54 80242884 AFA00010 */ sw $zero, 0x10($sp) -/* D9FD58 80242888 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD5C 8024288C 8C630030 */ lw $v1, 0x30($v1) -/* D9FD60 80242890 AFA30014 */ sw $v1, 0x14($sp) -/* D9FD64 80242894 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD68 80242898 8C63001C */ lw $v1, 0x1c($v1) -/* D9FD6C 8024289C AFA30018 */ sw $v1, 0x18($sp) -/* D9FD70 802428A0 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD74 802428A4 8C630024 */ lw $v1, 0x24($v1) -/* D9FD78 802428A8 AFA3001C */ sw $v1, 0x1c($sp) -/* D9FD7C 802428AC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD80 802428B0 8C630028 */ lw $v1, 0x28($v1) -/* D9FD84 802428B4 27B50010 */ addiu $s5, $sp, 0x10 -/* D9FD88 802428B8 AFA30020 */ sw $v1, 0x20($sp) -/* D9FD8C 802428BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D9FD90 802428C0 3C014220 */ lui $at, 0x4220 -/* D9FD94 802428C4 44810000 */ mtc1 $at, $f0 -/* D9FD98 802428C8 8C63002C */ lw $v1, 0x2c($v1) -/* D9FD9C 802428CC 0040802D */ daddu $s0, $v0, $zero -/* D9FDA0 802428D0 E7A00028 */ swc1 $f0, 0x28($sp) -/* D9FDA4 802428D4 A7A0002C */ sh $zero, 0x2c($sp) -/* D9FDA8 802428D8 16200005 */ bnez $s1, .L802428F0 -/* D9FDAC 802428DC AFA30024 */ sw $v1, 0x24($sp) -/* D9FDB0 802428E0 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9FDB4 802428E4 30420004 */ andi $v0, $v0, 4 -/* D9FDB8 802428E8 1040002F */ beqz $v0, .L802429A8 -/* D9FDBC 802428EC 00000000 */ nop -.L802428F0: -/* D9FDC0 802428F0 2404F7FF */ addiu $a0, $zero, -0x801 -/* D9FDC4 802428F4 AE600070 */ sw $zero, 0x70($s3) -/* D9FDC8 802428F8 A680008E */ sh $zero, 0x8e($s4) -/* D9FDCC 802428FC 8E4200CC */ lw $v0, 0xcc($s2) -/* D9FDD0 80242900 8E830000 */ lw $v1, ($s4) -/* D9FDD4 80242904 8C420000 */ lw $v0, ($v0) -/* D9FDD8 80242908 00641824 */ and $v1, $v1, $a0 -/* D9FDDC 8024290C AE830000 */ sw $v1, ($s4) -/* D9FDE0 80242910 AE820028 */ sw $v0, 0x28($s4) -/* D9FDE4 80242914 8E4200D0 */ lw $v0, 0xd0($s2) -/* D9FDE8 80242918 8C420034 */ lw $v0, 0x34($v0) -/* D9FDEC 8024291C 54400005 */ bnel $v0, $zero, .L80242934 -/* D9FDF0 80242920 2402FDFF */ addiu $v0, $zero, -0x201 -/* D9FDF4 80242924 34620200 */ ori $v0, $v1, 0x200 -/* D9FDF8 80242928 2403FFF7 */ addiu $v1, $zero, -9 -/* D9FDFC 8024292C 08090A4F */ j .L8024293C -/* D9FE00 80242930 00431024 */ and $v0, $v0, $v1 -.L80242934: -/* D9FE04 80242934 00621024 */ and $v0, $v1, $v0 -/* D9FE08 80242938 34420008 */ ori $v0, $v0, 8 -.L8024293C: -/* D9FE0C 8024293C AE820000 */ sw $v0, ($s4) -/* D9FE10 80242940 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9FE14 80242944 30420004 */ andi $v0, $v0, 4 -/* D9FE18 80242948 10400008 */ beqz $v0, .L8024296C -/* D9FE1C 8024294C 24020063 */ addiu $v0, $zero, 0x63 -/* D9FE20 80242950 AE620070 */ sw $v0, 0x70($s3) -/* D9FE24 80242954 AE600074 */ sw $zero, 0x74($s3) -/* D9FE28 80242958 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9FE2C 8024295C 2403FFFB */ addiu $v1, $zero, -5 -/* D9FE30 80242960 00431024 */ and $v0, $v0, $v1 -/* D9FE34 80242964 08090A61 */ j .L80242984 -/* D9FE38 80242968 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024296C: -/* D9FE3C 8024296C 8E420000 */ lw $v0, ($s2) -/* D9FE40 80242970 3C034000 */ lui $v1, 0x4000 -/* D9FE44 80242974 00431024 */ and $v0, $v0, $v1 -/* D9FE48 80242978 10400002 */ beqz $v0, .L80242984 -/* D9FE4C 8024297C 2402000C */ addiu $v0, $zero, 0xc -/* D9FE50 80242980 AE620070 */ sw $v0, 0x70($s3) -.L80242984: -/* D9FE54 80242984 3C05BFFF */ lui $a1, 0xbfff -/* D9FE58 80242988 34A5FFFF */ ori $a1, $a1, 0xffff -/* D9FE5C 8024298C 2404FFFB */ addiu $a0, $zero, -5 -/* D9FE60 80242990 8E4200B0 */ lw $v0, 0xb0($s2) -/* D9FE64 80242994 8E430000 */ lw $v1, ($s2) -/* D9FE68 80242998 00441024 */ and $v0, $v0, $a0 -/* D9FE6C 8024299C 00651824 */ and $v1, $v1, $a1 -/* D9FE70 802429A0 AE4200B0 */ sw $v0, 0xb0($s2) -/* D9FE74 802429A4 AE430000 */ sw $v1, ($s2) -.L802429A8: -/* D9FE78 802429A8 8E630070 */ lw $v1, 0x70($s3) -/* D9FE7C 802429AC 2C620064 */ sltiu $v0, $v1, 0x64 -/* D9FE80 802429B0 10400060 */ beqz $v0, .L80242B34 -/* D9FE84 802429B4 00031080 */ sll $v0, $v1, 2 -/* D9FE88 802429B8 3C018024 */ lui $at, 0x8024 -/* D9FE8C 802429BC 00220821 */ addu $at, $at, $v0 -/* D9FE90 802429C0 8C227BE0 */ lw $v0, 0x7be0($at) -/* D9FE94 802429C4 00400008 */ jr $v0 -/* D9FE98 802429C8 00000000 */ nop -/* D9FE9C 802429CC 0260202D */ daddu $a0, $s3, $zero -/* D9FEA0 802429D0 0200282D */ daddu $a1, $s0, $zero -/* D9FEA4 802429D4 0C012568 */ jal func_800495A0 -/* D9FEA8 802429D8 02A0302D */ daddu $a2, $s5, $zero -/* D9FEAC 802429DC 0260202D */ daddu $a0, $s3, $zero -/* D9FEB0 802429E0 0200282D */ daddu $a1, $s0, $zero -/* D9FEB4 802429E4 0C0125AE */ jal func_800496B8 -/* D9FEB8 802429E8 02A0302D */ daddu $a2, $s5, $zero -/* D9FEBC 802429EC 08090ACD */ j .L80242B34 -/* D9FEC0 802429F0 00000000 */ nop -/* D9FEC4 802429F4 0260202D */ daddu $a0, $s3, $zero -/* D9FEC8 802429F8 0200282D */ daddu $a1, $s0, $zero -/* D9FECC 802429FC 0C0126D1 */ jal func_80049B44 -/* D9FED0 80242A00 02A0302D */ daddu $a2, $s5, $zero -/* D9FED4 80242A04 0260202D */ daddu $a0, $s3, $zero -/* D9FED8 80242A08 0200282D */ daddu $a1, $s0, $zero -/* D9FEDC 80242A0C 0C012701 */ jal func_80049C04 -/* D9FEE0 80242A10 02A0302D */ daddu $a2, $s5, $zero -/* D9FEE4 80242A14 08090ACD */ j .L80242B34 -/* D9FEE8 80242A18 00000000 */ nop -/* D9FEEC 80242A1C 0260202D */ daddu $a0, $s3, $zero -/* D9FEF0 80242A20 0200282D */ daddu $a1, $s0, $zero -/* D9FEF4 80242A24 0C01278F */ jal func_80049E3C -/* D9FEF8 80242A28 02A0302D */ daddu $a2, $s5, $zero -/* D9FEFC 80242A2C 0260202D */ daddu $a0, $s3, $zero -/* D9FF00 80242A30 0200282D */ daddu $a1, $s0, $zero -/* D9FF04 80242A34 0C0127B3 */ jal func_80049ECC -/* D9FF08 80242A38 02A0302D */ daddu $a2, $s5, $zero -/* D9FF0C 80242A3C 08090ACD */ j .L80242B34 -/* D9FF10 80242A40 00000000 */ nop -/* D9FF14 80242A44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* D9FF18 80242A48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* D9FF1C 80242A4C C68C0038 */ lwc1 $f12, 0x38($s4) -/* D9FF20 80242A50 C68E0040 */ lwc1 $f14, 0x40($s4) -/* D9FF24 80242A54 8C460028 */ lw $a2, 0x28($v0) -/* D9FF28 80242A58 0C00A7B5 */ jal dist2D -/* D9FF2C 80242A5C 8C470030 */ lw $a3, 0x30($v0) -/* D9FF30 80242A60 8E42006C */ lw $v0, 0x6c($s2) -/* D9FF34 80242A64 10400008 */ beqz $v0, .L80242A88 -/* D9FF38 80242A68 46000086 */ mov.s $f2, $f0 -/* D9FF3C 80242A6C 44820000 */ mtc1 $v0, $f0 -/* D9FF40 80242A70 00000000 */ nop -/* D9FF44 80242A74 46800020 */ cvt.s.w $f0, $f0 -/* D9FF48 80242A78 4602003C */ c.lt.s $f0, $f2 -/* D9FF4C 80242A7C 00000000 */ nop -/* D9FF50 80242A80 4500000B */ bc1f .L80242AB0 -/* D9FF54 80242A84 0260202D */ daddu $a0, $s3, $zero -.L80242A88: -/* D9FF58 80242A88 0260202D */ daddu $a0, $s3, $zero -/* D9FF5C 80242A8C 8E050024 */ lw $a1, 0x24($s0) -/* D9FF60 80242A90 8E060028 */ lw $a2, 0x28($s0) -/* D9FF64 80242A94 0C0906CE */ jal func_80241B38 -/* D9FF68 80242A98 02A0382D */ daddu $a3, $s5, $zero -/* D9FF6C 80242A9C 8E630070 */ lw $v1, 0x70($s3) -/* D9FF70 80242AA0 2402000C */ addiu $v0, $zero, 0xc -/* D9FF74 80242AA4 14620023 */ bne $v1, $v0, .L80242B34 -/* D9FF78 80242AA8 00000000 */ nop -/* D9FF7C 80242AAC 0260202D */ daddu $a0, $s3, $zero -.L80242AB0: -/* D9FF80 80242AB0 0200282D */ daddu $a1, $s0, $zero -/* D9FF84 80242AB4 0C0127DF */ jal func_80049F7C -/* D9FF88 80242AB8 02A0302D */ daddu $a2, $s5, $zero -/* D9FF8C 80242ABC 0260202D */ daddu $a0, $s3, $zero -/* D9FF90 80242AC0 0200282D */ daddu $a1, $s0, $zero -/* D9FF94 80242AC4 0C012849 */ jal func_8004A124 -/* D9FF98 80242AC8 02A0302D */ daddu $a2, $s5, $zero -/* D9FF9C 80242ACC 08090ACD */ j .L80242B34 -/* D9FFA0 80242AD0 00000000 */ nop -/* D9FFA4 80242AD4 0260202D */ daddu $a0, $s3, $zero -/* D9FFA8 80242AD8 0200282D */ daddu $a1, $s0, $zero -/* D9FFAC 80242ADC 0C0128FA */ jal func_8004A3E8 -/* D9FFB0 80242AE0 02A0302D */ daddu $a2, $s5, $zero -/* D9FFB4 80242AE4 08090ACD */ j .L80242B34 -/* D9FFB8 80242AE8 00000000 */ nop -/* D9FFBC 80242AEC 0C09071F */ jal func_80241C7C -/* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero -/* D9FFC4 80242AF4 08090ACD */ j .L80242B34 -/* D9FFC8 80242AF8 00000000 */ nop -/* D9FFCC 80242AFC 0C09075F */ jal func_80241D7C -/* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero -/* D9FFD4 80242B04 08090ACD */ j .L80242B34 -/* D9FFD8 80242B08 00000000 */ nop -/* D9FFDC 80242B0C 0C090770 */ jal func_80241DC0 -/* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero -/* D9FFE4 80242B14 08090ACD */ j .L80242B34 -/* D9FFE8 80242B18 00000000 */ nop -/* D9FFEC 80242B1C 0C090798 */ jal func_80241E60 -/* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero -/* D9FFF4 80242B24 08090ACD */ j .L80242B34 -/* D9FFF8 80242B28 00000000 */ nop -/* D9FFFC 80242B2C 0C0129CF */ jal func_8004A73C -/* DA0000 80242B30 0260202D */ daddu $a0, $s3, $zero -.L80242B34: -/* DA0004 80242B34 8FBF0048 */ lw $ra, 0x48($sp) -/* DA0008 80242B38 8FB50044 */ lw $s5, 0x44($sp) -/* DA000C 80242B3C 8FB40040 */ lw $s4, 0x40($sp) -/* DA0010 80242B40 8FB3003C */ lw $s3, 0x3c($sp) -/* DA0014 80242B44 8FB20038 */ lw $s2, 0x38($sp) -/* DA0018 80242B48 8FB10034 */ lw $s1, 0x34($sp) -/* DA001C 80242B4C 8FB00030 */ lw $s0, 0x30($sp) -/* DA0020 80242B50 0000102D */ daddu $v0, $zero, $zero -/* DA0024 80242B54 03E00008 */ jr $ra -/* DA0028 80242B58 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s new file mode 100644 index 0000000000..43a4c79f9c --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s @@ -0,0 +1,213 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024283C_D9FD0C +/* D9FD0C 8024283C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* D9FD10 80242840 AFB3003C */ sw $s3, 0x3c($sp) +/* D9FD14 80242844 0080982D */ daddu $s3, $a0, $zero +/* D9FD18 80242848 AFBF0048 */ sw $ra, 0x48($sp) +/* D9FD1C 8024284C AFB50044 */ sw $s5, 0x44($sp) +/* D9FD20 80242850 AFB40040 */ sw $s4, 0x40($sp) +/* D9FD24 80242854 AFB20038 */ sw $s2, 0x38($sp) +/* D9FD28 80242858 AFB10034 */ sw $s1, 0x34($sp) +/* D9FD2C 8024285C AFB00030 */ sw $s0, 0x30($sp) +/* D9FD30 80242860 8E720148 */ lw $s2, 0x148($s3) +/* D9FD34 80242864 86440008 */ lh $a0, 8($s2) +/* D9FD38 80242868 8E70000C */ lw $s0, 0xc($s3) +/* D9FD3C 8024286C 0C00EABB */ jal get_npc_unsafe +/* D9FD40 80242870 00A0882D */ daddu $s1, $a1, $zero +/* D9FD44 80242874 0260202D */ daddu $a0, $s3, $zero +/* D9FD48 80242878 8E050000 */ lw $a1, ($s0) +/* D9FD4C 8024287C 0C0B1EAF */ jal get_variable +/* D9FD50 80242880 0040A02D */ daddu $s4, $v0, $zero +/* D9FD54 80242884 AFA00010 */ sw $zero, 0x10($sp) +/* D9FD58 80242888 8E4300D0 */ lw $v1, 0xd0($s2) +/* D9FD5C 8024288C 8C630030 */ lw $v1, 0x30($v1) +/* D9FD60 80242890 AFA30014 */ sw $v1, 0x14($sp) +/* D9FD64 80242894 8E4300D0 */ lw $v1, 0xd0($s2) +/* D9FD68 80242898 8C63001C */ lw $v1, 0x1c($v1) +/* D9FD6C 8024289C AFA30018 */ sw $v1, 0x18($sp) +/* D9FD70 802428A0 8E4300D0 */ lw $v1, 0xd0($s2) +/* D9FD74 802428A4 8C630024 */ lw $v1, 0x24($v1) +/* D9FD78 802428A8 AFA3001C */ sw $v1, 0x1c($sp) +/* D9FD7C 802428AC 8E4300D0 */ lw $v1, 0xd0($s2) +/* D9FD80 802428B0 8C630028 */ lw $v1, 0x28($v1) +/* D9FD84 802428B4 27B50010 */ addiu $s5, $sp, 0x10 +/* D9FD88 802428B8 AFA30020 */ sw $v1, 0x20($sp) +/* D9FD8C 802428BC 8E4300D0 */ lw $v1, 0xd0($s2) +/* D9FD90 802428C0 3C014220 */ lui $at, 0x4220 +/* D9FD94 802428C4 44810000 */ mtc1 $at, $f0 +/* D9FD98 802428C8 8C63002C */ lw $v1, 0x2c($v1) +/* D9FD9C 802428CC 0040802D */ daddu $s0, $v0, $zero +/* D9FDA0 802428D0 E7A00028 */ swc1 $f0, 0x28($sp) +/* D9FDA4 802428D4 A7A0002C */ sh $zero, 0x2c($sp) +/* D9FDA8 802428D8 16200005 */ bnez $s1, .L802428F0 +/* D9FDAC 802428DC AFA30024 */ sw $v1, 0x24($sp) +/* D9FDB0 802428E0 8E4200B0 */ lw $v0, 0xb0($s2) +/* D9FDB4 802428E4 30420004 */ andi $v0, $v0, 4 +/* D9FDB8 802428E8 1040002F */ beqz $v0, .L802429A8 +/* D9FDBC 802428EC 00000000 */ nop +.L802428F0: +/* D9FDC0 802428F0 2404F7FF */ addiu $a0, $zero, -0x801 +/* D9FDC4 802428F4 AE600070 */ sw $zero, 0x70($s3) +/* D9FDC8 802428F8 A680008E */ sh $zero, 0x8e($s4) +/* D9FDCC 802428FC 8E4200CC */ lw $v0, 0xcc($s2) +/* D9FDD0 80242900 8E830000 */ lw $v1, ($s4) +/* D9FDD4 80242904 8C420000 */ lw $v0, ($v0) +/* D9FDD8 80242908 00641824 */ and $v1, $v1, $a0 +/* D9FDDC 8024290C AE830000 */ sw $v1, ($s4) +/* D9FDE0 80242910 AE820028 */ sw $v0, 0x28($s4) +/* D9FDE4 80242914 8E4200D0 */ lw $v0, 0xd0($s2) +/* D9FDE8 80242918 8C420034 */ lw $v0, 0x34($v0) +/* D9FDEC 8024291C 54400005 */ bnel $v0, $zero, .L80242934 +/* D9FDF0 80242920 2402FDFF */ addiu $v0, $zero, -0x201 +/* D9FDF4 80242924 34620200 */ ori $v0, $v1, 0x200 +/* D9FDF8 80242928 2403FFF7 */ addiu $v1, $zero, -9 +/* D9FDFC 8024292C 08090A4F */ j .L8024293C +/* D9FE00 80242930 00431024 */ and $v0, $v0, $v1 +.L80242934: +/* D9FE04 80242934 00621024 */ and $v0, $v1, $v0 +/* D9FE08 80242938 34420008 */ ori $v0, $v0, 8 +.L8024293C: +/* D9FE0C 8024293C AE820000 */ sw $v0, ($s4) +/* D9FE10 80242940 8E4200B0 */ lw $v0, 0xb0($s2) +/* D9FE14 80242944 30420004 */ andi $v0, $v0, 4 +/* D9FE18 80242948 10400008 */ beqz $v0, .L8024296C +/* D9FE1C 8024294C 24020063 */ addiu $v0, $zero, 0x63 +/* D9FE20 80242950 AE620070 */ sw $v0, 0x70($s3) +/* D9FE24 80242954 AE600074 */ sw $zero, 0x74($s3) +/* D9FE28 80242958 8E4200B0 */ lw $v0, 0xb0($s2) +/* D9FE2C 8024295C 2403FFFB */ addiu $v1, $zero, -5 +/* D9FE30 80242960 00431024 */ and $v0, $v0, $v1 +/* D9FE34 80242964 08090A61 */ j .L80242984 +/* D9FE38 80242968 AE4200B0 */ sw $v0, 0xb0($s2) +.L8024296C: +/* D9FE3C 8024296C 8E420000 */ lw $v0, ($s2) +/* D9FE40 80242970 3C034000 */ lui $v1, 0x4000 +/* D9FE44 80242974 00431024 */ and $v0, $v0, $v1 +/* D9FE48 80242978 10400002 */ beqz $v0, .L80242984 +/* D9FE4C 8024297C 2402000C */ addiu $v0, $zero, 0xc +/* D9FE50 80242980 AE620070 */ sw $v0, 0x70($s3) +.L80242984: +/* D9FE54 80242984 3C05BFFF */ lui $a1, 0xbfff +/* D9FE58 80242988 34A5FFFF */ ori $a1, $a1, 0xffff +/* D9FE5C 8024298C 2404FFFB */ addiu $a0, $zero, -5 +/* D9FE60 80242990 8E4200B0 */ lw $v0, 0xb0($s2) +/* D9FE64 80242994 8E430000 */ lw $v1, ($s2) +/* D9FE68 80242998 00441024 */ and $v0, $v0, $a0 +/* D9FE6C 8024299C 00651824 */ and $v1, $v1, $a1 +/* D9FE70 802429A0 AE4200B0 */ sw $v0, 0xb0($s2) +/* D9FE74 802429A4 AE430000 */ sw $v1, ($s2) +.L802429A8: +/* D9FE78 802429A8 8E630070 */ lw $v1, 0x70($s3) +/* D9FE7C 802429AC 2C620064 */ sltiu $v0, $v1, 0x64 +/* D9FE80 802429B0 10400060 */ beqz $v0, .L80242B34 +/* D9FE84 802429B4 00031080 */ sll $v0, $v1, 2 +/* D9FE88 802429B8 3C018024 */ lui $at, 0x8024 +/* D9FE8C 802429BC 00220821 */ addu $at, $at, $v0 +/* D9FE90 802429C0 8C227BE0 */ lw $v0, 0x7be0($at) +/* D9FE94 802429C4 00400008 */ jr $v0 +/* D9FE98 802429C8 00000000 */ nop +/* D9FE9C 802429CC 0260202D */ daddu $a0, $s3, $zero +/* D9FEA0 802429D0 0200282D */ daddu $a1, $s0, $zero +/* D9FEA4 802429D4 0C012568 */ jal func_800495A0 +/* D9FEA8 802429D8 02A0302D */ daddu $a2, $s5, $zero +/* D9FEAC 802429DC 0260202D */ daddu $a0, $s3, $zero +/* D9FEB0 802429E0 0200282D */ daddu $a1, $s0, $zero +/* D9FEB4 802429E4 0C0125AE */ jal func_800496B8 +/* D9FEB8 802429E8 02A0302D */ daddu $a2, $s5, $zero +/* D9FEBC 802429EC 08090ACD */ j .L80242B34 +/* D9FEC0 802429F0 00000000 */ nop +/* D9FEC4 802429F4 0260202D */ daddu $a0, $s3, $zero +/* D9FEC8 802429F8 0200282D */ daddu $a1, $s0, $zero +/* D9FECC 802429FC 0C0126D1 */ jal func_80049B44 +/* D9FED0 80242A00 02A0302D */ daddu $a2, $s5, $zero +/* D9FED4 80242A04 0260202D */ daddu $a0, $s3, $zero +/* D9FED8 80242A08 0200282D */ daddu $a1, $s0, $zero +/* D9FEDC 80242A0C 0C012701 */ jal func_80049C04 +/* D9FEE0 80242A10 02A0302D */ daddu $a2, $s5, $zero +/* D9FEE4 80242A14 08090ACD */ j .L80242B34 +/* D9FEE8 80242A18 00000000 */ nop +/* D9FEEC 80242A1C 0260202D */ daddu $a0, $s3, $zero +/* D9FEF0 80242A20 0200282D */ daddu $a1, $s0, $zero +/* D9FEF4 80242A24 0C01278F */ jal func_80049E3C +/* D9FEF8 80242A28 02A0302D */ daddu $a2, $s5, $zero +/* D9FEFC 80242A2C 0260202D */ daddu $a0, $s3, $zero +/* D9FF00 80242A30 0200282D */ daddu $a1, $s0, $zero +/* D9FF04 80242A34 0C0127B3 */ jal func_80049ECC +/* D9FF08 80242A38 02A0302D */ daddu $a2, $s5, $zero +/* D9FF0C 80242A3C 08090ACD */ j .L80242B34 +/* D9FF10 80242A40 00000000 */ nop +/* D9FF14 80242A44 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* D9FF18 80242A48 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* D9FF1C 80242A4C C68C0038 */ lwc1 $f12, 0x38($s4) +/* D9FF20 80242A50 C68E0040 */ lwc1 $f14, 0x40($s4) +/* D9FF24 80242A54 8C460028 */ lw $a2, 0x28($v0) +/* D9FF28 80242A58 0C00A7B5 */ jal dist2D +/* D9FF2C 80242A5C 8C470030 */ lw $a3, 0x30($v0) +/* D9FF30 80242A60 8E42006C */ lw $v0, 0x6c($s2) +/* D9FF34 80242A64 10400008 */ beqz $v0, .L80242A88 +/* D9FF38 80242A68 46000086 */ mov.s $f2, $f0 +/* D9FF3C 80242A6C 44820000 */ mtc1 $v0, $f0 +/* D9FF40 80242A70 00000000 */ nop +/* D9FF44 80242A74 46800020 */ cvt.s.w $f0, $f0 +/* D9FF48 80242A78 4602003C */ c.lt.s $f0, $f2 +/* D9FF4C 80242A7C 00000000 */ nop +/* D9FF50 80242A80 4500000B */ bc1f .L80242AB0 +/* D9FF54 80242A84 0260202D */ daddu $a0, $s3, $zero +.L80242A88: +/* D9FF58 80242A88 0260202D */ daddu $a0, $s3, $zero +/* D9FF5C 80242A8C 8E050024 */ lw $a1, 0x24($s0) +/* D9FF60 80242A90 8E060028 */ lw $a2, 0x28($s0) +/* D9FF64 80242A94 0C0906CE */ jal func_80241B38_D9F008 +/* D9FF68 80242A98 02A0382D */ daddu $a3, $s5, $zero +/* D9FF6C 80242A9C 8E630070 */ lw $v1, 0x70($s3) +/* D9FF70 80242AA0 2402000C */ addiu $v0, $zero, 0xc +/* D9FF74 80242AA4 14620023 */ bne $v1, $v0, .L80242B34 +/* D9FF78 80242AA8 00000000 */ nop +/* D9FF7C 80242AAC 0260202D */ daddu $a0, $s3, $zero +.L80242AB0: +/* D9FF80 80242AB0 0200282D */ daddu $a1, $s0, $zero +/* D9FF84 80242AB4 0C0127DF */ jal func_80049F7C +/* D9FF88 80242AB8 02A0302D */ daddu $a2, $s5, $zero +/* D9FF8C 80242ABC 0260202D */ daddu $a0, $s3, $zero +/* D9FF90 80242AC0 0200282D */ daddu $a1, $s0, $zero +/* D9FF94 80242AC4 0C012849 */ jal func_8004A124 +/* D9FF98 80242AC8 02A0302D */ daddu $a2, $s5, $zero +/* D9FF9C 80242ACC 08090ACD */ j .L80242B34 +/* D9FFA0 80242AD0 00000000 */ nop +/* D9FFA4 80242AD4 0260202D */ daddu $a0, $s3, $zero +/* D9FFA8 80242AD8 0200282D */ daddu $a1, $s0, $zero +/* D9FFAC 80242ADC 0C0128FA */ jal func_8004A3E8 +/* D9FFB0 80242AE0 02A0302D */ daddu $a2, $s5, $zero +/* D9FFB4 80242AE4 08090ACD */ j .L80242B34 +/* D9FFB8 80242AE8 00000000 */ nop +/* D9FFBC 80242AEC 0C09071F */ jal func_80241C7C_D9F14C +/* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero +/* D9FFC4 80242AF4 08090ACD */ j .L80242B34 +/* D9FFC8 80242AF8 00000000 */ nop +/* D9FFCC 80242AFC 0C09075F */ jal func_80241D7C_D9F24C +/* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero +/* D9FFD4 80242B04 08090ACD */ j .L80242B34 +/* D9FFD8 80242B08 00000000 */ nop +/* D9FFDC 80242B0C 0C090770 */ jal func_80241DC0_D9F290 +/* D9FFE0 80242B10 0260202D */ daddu $a0, $s3, $zero +/* D9FFE4 80242B14 08090ACD */ j .L80242B34 +/* D9FFE8 80242B18 00000000 */ nop +/* D9FFEC 80242B1C 0C090798 */ jal func_80241E60_D9F330 +/* D9FFF0 80242B20 0260202D */ daddu $a0, $s3, $zero +/* D9FFF4 80242B24 08090ACD */ j .L80242B34 +/* D9FFF8 80242B28 00000000 */ nop +/* D9FFFC 80242B2C 0C0129CF */ jal func_8004A73C +/* DA0000 80242B30 0260202D */ daddu $a0, $s3, $zero +.L80242B34: +/* DA0004 80242B34 8FBF0048 */ lw $ra, 0x48($sp) +/* DA0008 80242B38 8FB50044 */ lw $s5, 0x44($sp) +/* DA000C 80242B3C 8FB40040 */ lw $s4, 0x40($sp) +/* DA0010 80242B40 8FB3003C */ lw $s3, 0x3c($sp) +/* DA0014 80242B44 8FB20038 */ lw $s2, 0x38($sp) +/* DA0018 80242B48 8FB10034 */ lw $s1, 0x34($sp) +/* DA001C 80242B4C 8FB00030 */ lw $s0, 0x30($sp) +/* DA0020 80242B50 0000102D */ daddu $v0, $zero, $zero +/* DA0024 80242B54 03E00008 */ jr $ra +/* DA0028 80242B58 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B5C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B5C.s deleted file mode 100644 index 5eb6707ba3..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B5C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B5C -/* DA002C 80242B5C 8C830148 */ lw $v1, 0x148($a0) -/* DA0030 80242B60 24020003 */ addiu $v0, $zero, 3 -/* DA0034 80242B64 A06200B5 */ sb $v0, 0xb5($v1) -/* DA0038 80242B68 03E00008 */ jr $ra -/* DA003C 80242B6C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B5C_DA002C.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B5C_DA002C.s new file mode 100644 index 0000000000..7f2d9c7cf3 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B5C_DA002C.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B5C_DA002C +/* DA002C 80242B5C 8C830148 */ lw $v1, 0x148($a0) +/* DA0030 80242B60 24020003 */ addiu $v0, $zero, 3 +/* DA0034 80242B64 A06200B5 */ sb $v0, 0xb5($v1) +/* DA0038 80242B68 03E00008 */ jr $ra +/* DA003C 80242B6C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70.s deleted file mode 100644 index 7841ff8379..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B70 -/* DA0040 80242B70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DA0044 80242B74 3C05FE36 */ lui $a1, 0xfe36 -/* DA0048 80242B78 AFBF0010 */ sw $ra, 0x10($sp) -/* DA004C 80242B7C 8C820148 */ lw $v0, 0x148($a0) -/* DA0050 80242B80 3C06800B */ lui $a2, 0x800b -/* DA0054 80242B84 8CC60F9C */ lw $a2, 0xf9c($a2) -/* DA0058 80242B88 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DA005C 80242B8C 00C23026 */ xor $a2, $a2, $v0 -/* DA0060 80242B90 0C0B2026 */ jal set_variable -/* DA0064 80242B94 2CC60001 */ sltiu $a2, $a2, 1 -/* DA0068 80242B98 8FBF0010 */ lw $ra, 0x10($sp) -/* DA006C 80242B9C 24020002 */ addiu $v0, $zero, 2 -/* DA0070 80242BA0 03E00008 */ jr $ra -/* DA0074 80242BA4 27BD0018 */ addiu $sp, $sp, 0x18 -/* DA0078 80242BA8 00000000 */ nop -/* DA007C 80242BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s new file mode 100644 index 0000000000..5eaa0dbc89 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B70_DA0040 +/* DA0040 80242B70 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DA0044 80242B74 3C05FE36 */ lui $a1, 0xfe36 +/* DA0048 80242B78 AFBF0010 */ sw $ra, 0x10($sp) +/* DA004C 80242B7C 8C820148 */ lw $v0, 0x148($a0) +/* DA0050 80242B80 3C06800B */ lui $a2, 0x800b +/* DA0054 80242B84 8CC60F9C */ lw $a2, 0xf9c($a2) +/* DA0058 80242B88 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DA005C 80242B8C 00C23026 */ xor $a2, $a2, $v0 +/* DA0060 80242B90 0C0B2026 */ jal set_variable +/* DA0064 80242B94 2CC60001 */ sltiu $a2, $a2, 1 +/* DA0068 80242B98 8FBF0010 */ lw $ra, 0x10($sp) +/* DA006C 80242B9C 24020002 */ addiu $v0, $zero, 2 +/* DA0070 80242BA0 03E00008 */ jr $ra +/* DA0074 80242BA4 27BD0018 */ addiu $sp, $sp, 0x18 +/* DA0078 80242BA8 00000000 */ nop +/* DA007C 80242BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188.s deleted file mode 100644 index 5448071fc3..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240188 -/* DA53C8 80240188 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DA53CC 8024018C AFB20018 */ sw $s2, 0x18($sp) -/* DA53D0 80240190 0080902D */ daddu $s2, $a0, $zero -/* DA53D4 80240194 AFBF001C */ sw $ra, 0x1c($sp) -/* DA53D8 80240198 AFB10014 */ sw $s1, 0x14($sp) -/* DA53DC 8024019C AFB00010 */ sw $s0, 0x10($sp) -/* DA53E0 802401A0 8E50000C */ lw $s0, 0xc($s2) -/* DA53E4 802401A4 8E050000 */ lw $a1, ($s0) -/* DA53E8 802401A8 0C0B1EAF */ jal get_variable -/* DA53EC 802401AC 26100004 */ addiu $s0, $s0, 4 -/* DA53F0 802401B0 8E050000 */ lw $a1, ($s0) -/* DA53F4 802401B4 26100004 */ addiu $s0, $s0, 4 -/* DA53F8 802401B8 0240202D */ daddu $a0, $s2, $zero -/* DA53FC 802401BC 0C0B1EAF */ jal get_variable -/* DA5400 802401C0 0040882D */ daddu $s1, $v0, $zero -/* DA5404 802401C4 0240202D */ daddu $a0, $s2, $zero -/* DA5408 802401C8 8E050000 */ lw $a1, ($s0) -/* DA540C 802401CC 0C0B1EAF */ jal get_variable -/* DA5410 802401D0 0040802D */ daddu $s0, $v0, $zero -/* DA5414 802401D4 02020018 */ mult $s0, $v0 -/* DA5418 802401D8 24020002 */ addiu $v0, $zero, 2 -/* DA541C 802401DC 8E430138 */ lw $v1, 0x138($s2) -/* DA5420 802401E0 00003012 */ mflo $a2 -/* DA5424 802401E4 02268821 */ addu $s1, $s1, $a2 -/* DA5428 802401E8 00518804 */ sllv $s1, $s1, $v0 -/* DA542C 802401EC 00711821 */ addu $v1, $v1, $s1 -/* DA5430 802401F0 AE430138 */ sw $v1, 0x138($s2) -/* DA5434 802401F4 8FBF001C */ lw $ra, 0x1c($sp) -/* DA5438 802401F8 8FB20018 */ lw $s2, 0x18($sp) -/* DA543C 802401FC 8FB10014 */ lw $s1, 0x14($sp) -/* DA5440 80240200 8FB00010 */ lw $s0, 0x10($sp) -/* DA5444 80240204 03E00008 */ jr $ra -/* DA5448 80240208 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188_DA53C8.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188_DA53C8.s new file mode 100644 index 0000000000..0481aea232 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240188_DA53C8.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240188_DA53C8 +/* DA53C8 80240188 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DA53CC 8024018C AFB20018 */ sw $s2, 0x18($sp) +/* DA53D0 80240190 0080902D */ daddu $s2, $a0, $zero +/* DA53D4 80240194 AFBF001C */ sw $ra, 0x1c($sp) +/* DA53D8 80240198 AFB10014 */ sw $s1, 0x14($sp) +/* DA53DC 8024019C AFB00010 */ sw $s0, 0x10($sp) +/* DA53E0 802401A0 8E50000C */ lw $s0, 0xc($s2) +/* DA53E4 802401A4 8E050000 */ lw $a1, ($s0) +/* DA53E8 802401A8 0C0B1EAF */ jal get_variable +/* DA53EC 802401AC 26100004 */ addiu $s0, $s0, 4 +/* DA53F0 802401B0 8E050000 */ lw $a1, ($s0) +/* DA53F4 802401B4 26100004 */ addiu $s0, $s0, 4 +/* DA53F8 802401B8 0240202D */ daddu $a0, $s2, $zero +/* DA53FC 802401BC 0C0B1EAF */ jal get_variable +/* DA5400 802401C0 0040882D */ daddu $s1, $v0, $zero +/* DA5404 802401C4 0240202D */ daddu $a0, $s2, $zero +/* DA5408 802401C8 8E050000 */ lw $a1, ($s0) +/* DA540C 802401CC 0C0B1EAF */ jal get_variable +/* DA5410 802401D0 0040802D */ daddu $s0, $v0, $zero +/* DA5414 802401D4 02020018 */ mult $s0, $v0 +/* DA5418 802401D8 24020002 */ addiu $v0, $zero, 2 +/* DA541C 802401DC 8E430138 */ lw $v1, 0x138($s2) +/* DA5420 802401E0 00003012 */ mflo $a2 +/* DA5424 802401E4 02268821 */ addu $s1, $s1, $a2 +/* DA5428 802401E8 00518804 */ sllv $s1, $s1, $v0 +/* DA542C 802401EC 00711821 */ addu $v1, $v1, $s1 +/* DA5430 802401F0 AE430138 */ sw $v1, 0x138($s2) +/* DA5434 802401F4 8FBF001C */ lw $ra, 0x1c($sp) +/* DA5438 802401F8 8FB20018 */ lw $s2, 0x18($sp) +/* DA543C 802401FC 8FB10014 */ lw $s1, 0x14($sp) +/* DA5440 80240200 8FB00010 */ lw $s0, 0x10($sp) +/* DA5444 80240204 03E00008 */ jr $ra +/* DA5448 80240208 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C.s deleted file mode 100644 index 5ba9760a45..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024020C -/* DA544C 8024020C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DA5450 80240210 AFB10014 */ sw $s1, 0x14($sp) -/* DA5454 80240214 0080882D */ daddu $s1, $a0, $zero -/* DA5458 80240218 AFBF0018 */ sw $ra, 0x18($sp) -/* DA545C 8024021C AFB00010 */ sw $s0, 0x10($sp) -/* DA5460 80240220 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DA5464 80240224 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DA5468 80240228 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DA546C 8024022C 8E30000C */ lw $s0, 0xc($s1) -/* DA5470 80240230 8E050000 */ lw $a1, ($s0) -/* DA5474 80240234 0C0B210B */ jal get_float_variable -/* DA5478 80240238 26100004 */ addiu $s0, $s0, 4 -/* DA547C 8024023C 8E050000 */ lw $a1, ($s0) -/* DA5480 80240240 26100004 */ addiu $s0, $s0, 4 -/* DA5484 80240244 0220202D */ daddu $a0, $s1, $zero -/* DA5488 80240248 0C0B210B */ jal get_float_variable -/* DA548C 8024024C 46000606 */ mov.s $f24, $f0 -/* DA5490 80240250 8E050000 */ lw $a1, ($s0) -/* DA5494 80240254 26100004 */ addiu $s0, $s0, 4 -/* DA5498 80240258 0220202D */ daddu $a0, $s1, $zero -/* DA549C 8024025C 0C0B210B */ jal get_float_variable -/* DA54A0 80240260 46000586 */ mov.s $f22, $f0 -/* DA54A4 80240264 0220202D */ daddu $a0, $s1, $zero -/* DA54A8 80240268 8E050000 */ lw $a1, ($s0) -/* DA54AC 8024026C 0C0B210B */ jal get_float_variable -/* DA54B0 80240270 46000506 */ mov.s $f20, $f0 -/* DA54B4 80240274 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DA54B8 80240278 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DA54BC 8024027C E4580028 */ swc1 $f24, 0x28($v0) -/* DA54C0 80240280 E456002C */ swc1 $f22, 0x2c($v0) -/* DA54C4 80240284 E4540030 */ swc1 $f20, 0x30($v0) -/* DA54C8 80240288 E4400080 */ swc1 $f0, 0x80($v0) -/* DA54CC 8024028C 8FBF0018 */ lw $ra, 0x18($sp) -/* DA54D0 80240290 8FB10014 */ lw $s1, 0x14($sp) -/* DA54D4 80240294 8FB00010 */ lw $s0, 0x10($sp) -/* DA54D8 80240298 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DA54DC 8024029C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DA54E0 802402A0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DA54E4 802402A4 24020002 */ addiu $v0, $zero, 2 -/* DA54E8 802402A8 03E00008 */ jr $ra -/* DA54EC 802402AC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C_DA544C.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C_DA544C.s new file mode 100644 index 0000000000..29bc2cdcd8 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024020C_DA544C.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024020C_DA544C +/* DA544C 8024020C 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* DA5450 80240210 AFB10014 */ sw $s1, 0x14($sp) +/* DA5454 80240214 0080882D */ daddu $s1, $a0, $zero +/* DA5458 80240218 AFBF0018 */ sw $ra, 0x18($sp) +/* DA545C 8024021C AFB00010 */ sw $s0, 0x10($sp) +/* DA5460 80240220 F7B80030 */ sdc1 $f24, 0x30($sp) +/* DA5464 80240224 F7B60028 */ sdc1 $f22, 0x28($sp) +/* DA5468 80240228 F7B40020 */ sdc1 $f20, 0x20($sp) +/* DA546C 8024022C 8E30000C */ lw $s0, 0xc($s1) +/* DA5470 80240230 8E050000 */ lw $a1, ($s0) +/* DA5474 80240234 0C0B210B */ jal get_float_variable +/* DA5478 80240238 26100004 */ addiu $s0, $s0, 4 +/* DA547C 8024023C 8E050000 */ lw $a1, ($s0) +/* DA5480 80240240 26100004 */ addiu $s0, $s0, 4 +/* DA5484 80240244 0220202D */ daddu $a0, $s1, $zero +/* DA5488 80240248 0C0B210B */ jal get_float_variable +/* DA548C 8024024C 46000606 */ mov.s $f24, $f0 +/* DA5490 80240250 8E050000 */ lw $a1, ($s0) +/* DA5494 80240254 26100004 */ addiu $s0, $s0, 4 +/* DA5498 80240258 0220202D */ daddu $a0, $s1, $zero +/* DA549C 8024025C 0C0B210B */ jal get_float_variable +/* DA54A0 80240260 46000586 */ mov.s $f22, $f0 +/* DA54A4 80240264 0220202D */ daddu $a0, $s1, $zero +/* DA54A8 80240268 8E050000 */ lw $a1, ($s0) +/* DA54AC 8024026C 0C0B210B */ jal get_float_variable +/* DA54B0 80240270 46000506 */ mov.s $f20, $f0 +/* DA54B4 80240274 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* DA54B8 80240278 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* DA54BC 8024027C E4580028 */ swc1 $f24, 0x28($v0) +/* DA54C0 80240280 E456002C */ swc1 $f22, 0x2c($v0) +/* DA54C4 80240284 E4540030 */ swc1 $f20, 0x30($v0) +/* DA54C8 80240288 E4400080 */ swc1 $f0, 0x80($v0) +/* DA54CC 8024028C 8FBF0018 */ lw $ra, 0x18($sp) +/* DA54D0 80240290 8FB10014 */ lw $s1, 0x14($sp) +/* DA54D4 80240294 8FB00010 */ lw $s0, 0x10($sp) +/* DA54D8 80240298 D7B80030 */ ldc1 $f24, 0x30($sp) +/* DA54DC 8024029C D7B60028 */ ldc1 $f22, 0x28($sp) +/* DA54E0 802402A0 D7B40020 */ ldc1 $f20, 0x20($sp) +/* DA54E4 802402A4 24020002 */ addiu $v0, $zero, 2 +/* DA54E8 802402A8 03E00008 */ jr $ra +/* DA54EC 802402AC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538.s deleted file mode 100644 index bacef04c38..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240538 -/* DA5778 80240538 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* DA577C 8024053C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) -/* DA5780 80240540 8C620000 */ lw $v0, ($v1) -/* DA5784 80240544 AC800084 */ sw $zero, 0x84($a0) -/* DA5788 80240548 8C420010 */ lw $v0, 0x10($v0) -/* DA578C 8024054C 30428000 */ andi $v0, $v0, 0x8000 -/* DA5790 80240550 10400002 */ beqz $v0, .L8024055C -/* DA5794 80240554 24020001 */ addiu $v0, $zero, 1 -/* DA5798 80240558 AC820084 */ sw $v0, 0x84($a0) -.L8024055C: -/* DA579C 8024055C 8C620000 */ lw $v0, ($v1) -/* DA57A0 80240560 8C420010 */ lw $v0, 0x10($v0) -/* DA57A4 80240564 30424000 */ andi $v0, $v0, 0x4000 -/* DA57A8 80240568 10400002 */ beqz $v0, .L80240574 -/* DA57AC 8024056C 24020001 */ addiu $v0, $zero, 1 -/* DA57B0 80240570 AC820084 */ sw $v0, 0x84($a0) -.L80240574: -/* DA57B4 80240574 03E00008 */ jr $ra -/* DA57B8 80240578 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538_DA5778.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538_DA5778.s new file mode 100644 index 0000000000..1105d70da8 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240538_DA5778.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240538_DA5778 +/* DA5778 80240538 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* DA577C 8024053C 2463419C */ addiu $v1, $v1, %lo(gGameStatusPtr) +/* DA5780 80240540 8C620000 */ lw $v0, ($v1) +/* DA5784 80240544 AC800084 */ sw $zero, 0x84($a0) +/* DA5788 80240548 8C420010 */ lw $v0, 0x10($v0) +/* DA578C 8024054C 30428000 */ andi $v0, $v0, 0x8000 +/* DA5790 80240550 10400002 */ beqz $v0, .L8024055C +/* DA5794 80240554 24020001 */ addiu $v0, $zero, 1 +/* DA5798 80240558 AC820084 */ sw $v0, 0x84($a0) +.L8024055C: +/* DA579C 8024055C 8C620000 */ lw $v0, ($v1) +/* DA57A0 80240560 8C420010 */ lw $v0, 0x10($v0) +/* DA57A4 80240564 30424000 */ andi $v0, $v0, 0x4000 +/* DA57A8 80240568 10400002 */ beqz $v0, .L80240574 +/* DA57AC 8024056C 24020001 */ addiu $v0, $zero, 1 +/* DA57B0 80240570 AC820084 */ sw $v0, 0x84($a0) +.L80240574: +/* DA57B4 80240574 03E00008 */ jr $ra +/* DA57B8 80240578 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C.s deleted file mode 100644 index 1b99615b61..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024057C -/* DA57BC 8024057C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DA57C0 80240580 AFB00010 */ sw $s0, 0x10($sp) -/* DA57C4 80240584 0080802D */ daddu $s0, $a0, $zero -/* DA57C8 80240588 AFBF0014 */ sw $ra, 0x14($sp) -/* DA57CC 8024058C 8E0300A8 */ lw $v1, 0xa8($s0) -/* DA57D0 80240590 8E020088 */ lw $v0, 0x88($s0) -/* DA57D4 80240594 00621821 */ addu $v1, $v1, $v0 -/* DA57D8 80240598 04610004 */ bgez $v1, .L802405AC -/* DA57DC 8024059C AE0300A8 */ sw $v1, 0xa8($s0) -/* DA57E0 802405A0 3C020002 */ lui $v0, 2 -/* DA57E4 802405A4 0809016F */ j .L802405BC -/* DA57E8 802405A8 00621021 */ addu $v0, $v1, $v0 -.L802405AC: -/* DA57EC 802405AC 3C040002 */ lui $a0, 2 -/* DA57F0 802405B0 0083102A */ slt $v0, $a0, $v1 -/* DA57F4 802405B4 10400002 */ beqz $v0, .L802405C0 -/* DA57F8 802405B8 00641023 */ subu $v0, $v1, $a0 -.L802405BC: -/* DA57FC 802405BC AE0200A8 */ sw $v0, 0xa8($s0) -.L802405C0: -/* DA5800 802405C0 8E0300AC */ lw $v1, 0xac($s0) -/* DA5804 802405C4 8E02008C */ lw $v0, 0x8c($s0) -/* DA5808 802405C8 00621821 */ addu $v1, $v1, $v0 -/* DA580C 802405CC 04610004 */ bgez $v1, .L802405E0 -/* DA5810 802405D0 AE0300AC */ sw $v1, 0xac($s0) -/* DA5814 802405D4 3C020002 */ lui $v0, 2 -/* DA5818 802405D8 0809017C */ j .L802405F0 -/* DA581C 802405DC 00621021 */ addu $v0, $v1, $v0 -.L802405E0: -/* DA5820 802405E0 3C040002 */ lui $a0, 2 -/* DA5824 802405E4 0083102A */ slt $v0, $a0, $v1 -/* DA5828 802405E8 10400002 */ beqz $v0, .L802405F4 -/* DA582C 802405EC 00641023 */ subu $v0, $v1, $a0 -.L802405F0: -/* DA5830 802405F0 AE0200AC */ sw $v0, 0xac($s0) -.L802405F4: -/* DA5834 802405F4 8E0300B0 */ lw $v1, 0xb0($s0) -/* DA5838 802405F8 8E020090 */ lw $v0, 0x90($s0) -/* DA583C 802405FC 00621821 */ addu $v1, $v1, $v0 -/* DA5840 80240600 04610004 */ bgez $v1, .L80240614 -/* DA5844 80240604 AE0300B0 */ sw $v1, 0xb0($s0) -/* DA5848 80240608 3C020002 */ lui $v0, 2 -/* DA584C 8024060C 08090189 */ j .L80240624 -/* DA5850 80240610 00621021 */ addu $v0, $v1, $v0 -.L80240614: -/* DA5854 80240614 3C040002 */ lui $a0, 2 -/* DA5858 80240618 0083102A */ slt $v0, $a0, $v1 -/* DA585C 8024061C 10400002 */ beqz $v0, .L80240628 -/* DA5860 80240620 00641023 */ subu $v0, $v1, $a0 -.L80240624: -/* DA5864 80240624 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240628: -/* DA5868 80240628 8E0300B4 */ lw $v1, 0xb4($s0) -/* DA586C 8024062C 8E020094 */ lw $v0, 0x94($s0) -/* DA5870 80240630 00621821 */ addu $v1, $v1, $v0 -/* DA5874 80240634 04610004 */ bgez $v1, .L80240648 -/* DA5878 80240638 AE0300B4 */ sw $v1, 0xb4($s0) -/* DA587C 8024063C 3C020002 */ lui $v0, 2 -/* DA5880 80240640 08090196 */ j .L80240658 -/* DA5884 80240644 00621021 */ addu $v0, $v1, $v0 -.L80240648: -/* DA5888 80240648 3C040002 */ lui $a0, 2 -/* DA588C 8024064C 0083102A */ slt $v0, $a0, $v1 -/* DA5890 80240650 10400002 */ beqz $v0, .L8024065C -/* DA5894 80240654 00641023 */ subu $v0, $v1, $a0 -.L80240658: -/* DA5898 80240658 AE0200B4 */ sw $v0, 0xb4($s0) -.L8024065C: -/* DA589C 8024065C 8E040084 */ lw $a0, 0x84($s0) -/* DA58A0 80240660 0C046F07 */ jal set_main_pan_u -/* DA58A4 80240664 8E0500A8 */ lw $a1, 0xa8($s0) -/* DA58A8 80240668 8E040084 */ lw $a0, 0x84($s0) -/* DA58AC 8024066C 0C046F0D */ jal set_main_pan_v -/* DA58B0 80240670 8E0500AC */ lw $a1, 0xac($s0) -/* DA58B4 80240674 8E040084 */ lw $a0, 0x84($s0) -/* DA58B8 80240678 0C046F13 */ jal set_aux_pan_u -/* DA58BC 8024067C 8E0500B0 */ lw $a1, 0xb0($s0) -/* DA58C0 80240680 8E040084 */ lw $a0, 0x84($s0) -/* DA58C4 80240684 0C046F19 */ jal set_aux_pan_v -/* DA58C8 80240688 8E0500B4 */ lw $a1, 0xb4($s0) -/* DA58CC 8024068C 8FBF0014 */ lw $ra, 0x14($sp) -/* DA58D0 80240690 8FB00010 */ lw $s0, 0x10($sp) -/* DA58D4 80240694 0000102D */ daddu $v0, $zero, $zero -/* DA58D8 80240698 03E00008 */ jr $ra -/* DA58DC 8024069C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C_DA57BC.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C_DA57BC.s new file mode 100644 index 0000000000..08d94e4513 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_8024057C_DA57BC.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024057C_DA57BC +/* DA57BC 8024057C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DA57C0 80240580 AFB00010 */ sw $s0, 0x10($sp) +/* DA57C4 80240584 0080802D */ daddu $s0, $a0, $zero +/* DA57C8 80240588 AFBF0014 */ sw $ra, 0x14($sp) +/* DA57CC 8024058C 8E0300A8 */ lw $v1, 0xa8($s0) +/* DA57D0 80240590 8E020088 */ lw $v0, 0x88($s0) +/* DA57D4 80240594 00621821 */ addu $v1, $v1, $v0 +/* DA57D8 80240598 04610004 */ bgez $v1, .L802405AC +/* DA57DC 8024059C AE0300A8 */ sw $v1, 0xa8($s0) +/* DA57E0 802405A0 3C020002 */ lui $v0, 2 +/* DA57E4 802405A4 0809016F */ j .L802405BC +/* DA57E8 802405A8 00621021 */ addu $v0, $v1, $v0 +.L802405AC: +/* DA57EC 802405AC 3C040002 */ lui $a0, 2 +/* DA57F0 802405B0 0083102A */ slt $v0, $a0, $v1 +/* DA57F4 802405B4 10400002 */ beqz $v0, .L802405C0 +/* DA57F8 802405B8 00641023 */ subu $v0, $v1, $a0 +.L802405BC: +/* DA57FC 802405BC AE0200A8 */ sw $v0, 0xa8($s0) +.L802405C0: +/* DA5800 802405C0 8E0300AC */ lw $v1, 0xac($s0) +/* DA5804 802405C4 8E02008C */ lw $v0, 0x8c($s0) +/* DA5808 802405C8 00621821 */ addu $v1, $v1, $v0 +/* DA580C 802405CC 04610004 */ bgez $v1, .L802405E0 +/* DA5810 802405D0 AE0300AC */ sw $v1, 0xac($s0) +/* DA5814 802405D4 3C020002 */ lui $v0, 2 +/* DA5818 802405D8 0809017C */ j .L802405F0 +/* DA581C 802405DC 00621021 */ addu $v0, $v1, $v0 +.L802405E0: +/* DA5820 802405E0 3C040002 */ lui $a0, 2 +/* DA5824 802405E4 0083102A */ slt $v0, $a0, $v1 +/* DA5828 802405E8 10400002 */ beqz $v0, .L802405F4 +/* DA582C 802405EC 00641023 */ subu $v0, $v1, $a0 +.L802405F0: +/* DA5830 802405F0 AE0200AC */ sw $v0, 0xac($s0) +.L802405F4: +/* DA5834 802405F4 8E0300B0 */ lw $v1, 0xb0($s0) +/* DA5838 802405F8 8E020090 */ lw $v0, 0x90($s0) +/* DA583C 802405FC 00621821 */ addu $v1, $v1, $v0 +/* DA5840 80240600 04610004 */ bgez $v1, .L80240614 +/* DA5844 80240604 AE0300B0 */ sw $v1, 0xb0($s0) +/* DA5848 80240608 3C020002 */ lui $v0, 2 +/* DA584C 8024060C 08090189 */ j .L80240624 +/* DA5850 80240610 00621021 */ addu $v0, $v1, $v0 +.L80240614: +/* DA5854 80240614 3C040002 */ lui $a0, 2 +/* DA5858 80240618 0083102A */ slt $v0, $a0, $v1 +/* DA585C 8024061C 10400002 */ beqz $v0, .L80240628 +/* DA5860 80240620 00641023 */ subu $v0, $v1, $a0 +.L80240624: +/* DA5864 80240624 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240628: +/* DA5868 80240628 8E0300B4 */ lw $v1, 0xb4($s0) +/* DA586C 8024062C 8E020094 */ lw $v0, 0x94($s0) +/* DA5870 80240630 00621821 */ addu $v1, $v1, $v0 +/* DA5874 80240634 04610004 */ bgez $v1, .L80240648 +/* DA5878 80240638 AE0300B4 */ sw $v1, 0xb4($s0) +/* DA587C 8024063C 3C020002 */ lui $v0, 2 +/* DA5880 80240640 08090196 */ j .L80240658 +/* DA5884 80240644 00621021 */ addu $v0, $v1, $v0 +.L80240648: +/* DA5888 80240648 3C040002 */ lui $a0, 2 +/* DA588C 8024064C 0083102A */ slt $v0, $a0, $v1 +/* DA5890 80240650 10400002 */ beqz $v0, .L8024065C +/* DA5894 80240654 00641023 */ subu $v0, $v1, $a0 +.L80240658: +/* DA5898 80240658 AE0200B4 */ sw $v0, 0xb4($s0) +.L8024065C: +/* DA589C 8024065C 8E040084 */ lw $a0, 0x84($s0) +/* DA58A0 80240660 0C046F07 */ jal set_main_pan_u +/* DA58A4 80240664 8E0500A8 */ lw $a1, 0xa8($s0) +/* DA58A8 80240668 8E040084 */ lw $a0, 0x84($s0) +/* DA58AC 8024066C 0C046F0D */ jal set_main_pan_v +/* DA58B0 80240670 8E0500AC */ lw $a1, 0xac($s0) +/* DA58B4 80240674 8E040084 */ lw $a0, 0x84($s0) +/* DA58B8 80240678 0C046F13 */ jal set_aux_pan_u +/* DA58BC 8024067C 8E0500B0 */ lw $a1, 0xb0($s0) +/* DA58C0 80240680 8E040084 */ lw $a0, 0x84($s0) +/* DA58C4 80240684 0C046F19 */ jal set_aux_pan_v +/* DA58C8 80240688 8E0500B4 */ lw $a1, 0xb4($s0) +/* DA58CC 8024068C 8FBF0014 */ lw $ra, 0x14($sp) +/* DA58D0 80240690 8FB00010 */ lw $s0, 0x10($sp) +/* DA58D4 80240694 0000102D */ daddu $v0, $zero, $zero +/* DA58D8 80240698 03E00008 */ jr $ra +/* DA58DC 8024069C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4.s deleted file mode 100644 index edce03e559..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FF4 -/* DAE3F4 80240FF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DAE3F8 80240FF8 AFB00010 */ sw $s0, 0x10($sp) -/* DAE3FC 80240FFC 0080802D */ daddu $s0, $a0, $zero -/* DAE400 80241000 AFBF0014 */ sw $ra, 0x14($sp) -/* DAE404 80241004 8E020148 */ lw $v0, 0x148($s0) -/* DAE408 80241008 0C00EABB */ jal get_npc_unsafe -/* DAE40C 8024100C 84440008 */ lh $a0, 8($v0) -/* DAE410 80241010 9443008E */ lhu $v1, 0x8e($v0) -/* DAE414 80241014 C440003C */ lwc1 $f0, 0x3c($v0) -/* DAE418 80241018 24640001 */ addiu $a0, $v1, 1 -/* DAE41C 8024101C 00031C00 */ sll $v1, $v1, 0x10 -/* DAE420 80241020 00031B83 */ sra $v1, $v1, 0xe -/* DAE424 80241024 A444008E */ sh $a0, 0x8e($v0) -/* DAE428 80241028 3C018024 */ lui $at, 0x8024 -/* DAE42C 8024102C 00230821 */ addu $at, $at, $v1 -/* DAE430 80241030 C4222EF0 */ lwc1 $f2, 0x2ef0($at) -/* DAE434 80241034 8443008E */ lh $v1, 0x8e($v0) -/* DAE438 80241038 46020000 */ add.s $f0, $f0, $f2 -/* DAE43C 8024103C 28630005 */ slti $v1, $v1, 5 -/* DAE440 80241040 14600003 */ bnez $v1, .L80241050 -/* DAE444 80241044 E440003C */ swc1 $f0, 0x3c($v0) -/* DAE448 80241048 2402000C */ addiu $v0, $zero, 0xc -/* DAE44C 8024104C AE020070 */ sw $v0, 0x70($s0) -.L80241050: -/* DAE450 80241050 8FBF0014 */ lw $ra, 0x14($sp) -/* DAE454 80241054 8FB00010 */ lw $s0, 0x10($sp) -/* DAE458 80241058 03E00008 */ jr $ra -/* DAE45C 8024105C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s new file mode 100644 index 0000000000..e6e4374698 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80240FF4_DAE3F4.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FF4_DAE3F4 +/* DAE3F4 80240FF4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DAE3F8 80240FF8 AFB00010 */ sw $s0, 0x10($sp) +/* DAE3FC 80240FFC 0080802D */ daddu $s0, $a0, $zero +/* DAE400 80241000 AFBF0014 */ sw $ra, 0x14($sp) +/* DAE404 80241004 8E020148 */ lw $v0, 0x148($s0) +/* DAE408 80241008 0C00EABB */ jal get_npc_unsafe +/* DAE40C 8024100C 84440008 */ lh $a0, 8($v0) +/* DAE410 80241010 9443008E */ lhu $v1, 0x8e($v0) +/* DAE414 80241014 C440003C */ lwc1 $f0, 0x3c($v0) +/* DAE418 80241018 24640001 */ addiu $a0, $v1, 1 +/* DAE41C 8024101C 00031C00 */ sll $v1, $v1, 0x10 +/* DAE420 80241020 00031B83 */ sra $v1, $v1, 0xe +/* DAE424 80241024 A444008E */ sh $a0, 0x8e($v0) +/* DAE428 80241028 3C018024 */ lui $at, 0x8024 +/* DAE42C 8024102C 00230821 */ addu $at, $at, $v1 +/* DAE430 80241030 C4222EF0 */ lwc1 $f2, 0x2ef0($at) +/* DAE434 80241034 8443008E */ lh $v1, 0x8e($v0) +/* DAE438 80241038 46020000 */ add.s $f0, $f0, $f2 +/* DAE43C 8024103C 28630005 */ slti $v1, $v1, 5 +/* DAE440 80241040 14600003 */ bnez $v1, .L80241050 +/* DAE444 80241044 E440003C */ swc1 $f0, 0x3c($v0) +/* DAE448 80241048 2402000C */ addiu $v0, $zero, 0xc +/* DAE44C 8024104C AE020070 */ sw $v0, 0x70($s0) +.L80241050: +/* DAE450 80241050 8FBF0014 */ lw $ra, 0x14($sp) +/* DAE454 80241054 8FB00010 */ lw $s0, 0x10($sp) +/* DAE458 80241058 03E00008 */ jr $ra +/* DAE45C 8024105C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC.s deleted file mode 100644 index 4990aaaa48..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416AC -/* DAEAAC 802416AC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DAEAB0 802416B0 AFB40040 */ sw $s4, 0x40($sp) -/* DAEAB4 802416B4 0080A02D */ daddu $s4, $a0, $zero -/* DAEAB8 802416B8 AFBF0048 */ sw $ra, 0x48($sp) -/* DAEABC 802416BC AFB50044 */ sw $s5, 0x44($sp) -/* DAEAC0 802416C0 AFB3003C */ sw $s3, 0x3c($sp) -/* DAEAC4 802416C4 AFB20038 */ sw $s2, 0x38($sp) -/* DAEAC8 802416C8 AFB10034 */ sw $s1, 0x34($sp) -/* DAEACC 802416CC AFB00030 */ sw $s0, 0x30($sp) -/* DAEAD0 802416D0 8E920148 */ lw $s2, 0x148($s4) -/* DAEAD4 802416D4 86440008 */ lh $a0, 8($s2) -/* DAEAD8 802416D8 8E90000C */ lw $s0, 0xc($s4) -/* DAEADC 802416DC 0C00EABB */ jal get_npc_unsafe -/* DAEAE0 802416E0 00A0882D */ daddu $s1, $a1, $zero -/* DAEAE4 802416E4 0280202D */ daddu $a0, $s4, $zero -/* DAEAE8 802416E8 8E050000 */ lw $a1, ($s0) -/* DAEAEC 802416EC 0C0B1EAF */ jal get_variable -/* DAEAF0 802416F0 0040A82D */ daddu $s5, $v0, $zero -/* DAEAF4 802416F4 AFA00010 */ sw $zero, 0x10($sp) -/* DAEAF8 802416F8 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEAFC 802416FC 8C630030 */ lw $v1, 0x30($v1) -/* DAEB00 80241700 AFA30014 */ sw $v1, 0x14($sp) -/* DAEB04 80241704 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEB08 80241708 8C63001C */ lw $v1, 0x1c($v1) -/* DAEB0C 8024170C AFA30018 */ sw $v1, 0x18($sp) -/* DAEB10 80241710 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEB14 80241714 8C630024 */ lw $v1, 0x24($v1) -/* DAEB18 80241718 AFA3001C */ sw $v1, 0x1c($sp) -/* DAEB1C 8024171C 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEB20 80241720 8C630028 */ lw $v1, 0x28($v1) -/* DAEB24 80241724 27B30010 */ addiu $s3, $sp, 0x10 -/* DAEB28 80241728 AFA30020 */ sw $v1, 0x20($sp) -/* DAEB2C 8024172C 8E4300D0 */ lw $v1, 0xd0($s2) -/* DAEB30 80241730 3C0142F0 */ lui $at, 0x42f0 -/* DAEB34 80241734 44810000 */ mtc1 $at, $f0 -/* DAEB38 80241738 8C63002C */ lw $v1, 0x2c($v1) -/* DAEB3C 8024173C 0040802D */ daddu $s0, $v0, $zero -/* DAEB40 80241740 E7A00028 */ swc1 $f0, 0x28($sp) -/* DAEB44 80241744 A7A0002C */ sh $zero, 0x2c($sp) -/* DAEB48 80241748 12200006 */ beqz $s1, .L80241764 -/* DAEB4C 8024174C AFA30024 */ sw $v1, 0x24($sp) -/* DAEB50 80241750 02A0202D */ daddu $a0, $s5, $zero -/* DAEB54 80241754 0240282D */ daddu $a1, $s2, $zero -/* DAEB58 80241758 0280302D */ daddu $a2, $s4, $zero -/* DAEB5C 8024175C 0C090562 */ jal func_80241588 -/* DAEB60 80241760 0200382D */ daddu $a3, $s0, $zero -.L80241764: -/* DAEB64 80241764 2402FFFE */ addiu $v0, $zero, -2 -/* DAEB68 80241768 A2A200AB */ sb $v0, 0xab($s5) -/* DAEB6C 8024176C 8E4300B0 */ lw $v1, 0xb0($s2) -/* DAEB70 80241770 30620004 */ andi $v0, $v1, 4 -/* DAEB74 80241774 10400007 */ beqz $v0, .L80241794 -/* DAEB78 80241778 00000000 */ nop -/* DAEB7C 8024177C 824200B4 */ lb $v0, 0xb4($s2) -/* DAEB80 80241780 1440003C */ bnez $v0, .L80241874 -/* DAEB84 80241784 0000102D */ daddu $v0, $zero, $zero -/* DAEB88 80241788 2402FFFB */ addiu $v0, $zero, -5 -/* DAEB8C 8024178C 00621024 */ and $v0, $v1, $v0 -/* DAEB90 80241790 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241794: -/* DAEB94 80241794 8E830070 */ lw $v1, 0x70($s4) -/* DAEB98 80241798 2C62000F */ sltiu $v0, $v1, 0xf -/* DAEB9C 8024179C 10400034 */ beqz $v0, .L80241870 -/* DAEBA0 802417A0 00031080 */ sll $v0, $v1, 2 -/* DAEBA4 802417A4 3C018024 */ lui $at, 0x8024 -/* DAEBA8 802417A8 00220821 */ addu $at, $at, $v0 -/* DAEBAC 802417AC 8C224CC8 */ lw $v0, 0x4cc8($at) -/* DAEBB0 802417B0 00400008 */ jr $v0 -/* DAEBB4 802417B4 00000000 */ nop -/* DAEBB8 802417B8 0280202D */ daddu $a0, $s4, $zero -/* DAEBBC 802417BC 0200282D */ daddu $a1, $s0, $zero -/* DAEBC0 802417C0 0C0900E8 */ jal func_802403A0 -/* DAEBC4 802417C4 0260302D */ daddu $a2, $s3, $zero -/* DAEBC8 802417C8 0280202D */ daddu $a0, $s4, $zero -/* DAEBCC 802417CC 0200282D */ daddu $a1, $s0, $zero -/* DAEBD0 802417D0 0C090154 */ jal func_80240550 -/* DAEBD4 802417D4 0260302D */ daddu $a2, $s3, $zero -/* DAEBD8 802417D8 0809061D */ j .L80241874 -/* DAEBDC 802417DC 0000102D */ daddu $v0, $zero, $zero -/* DAEBE0 802417E0 0280202D */ daddu $a0, $s4, $zero -/* DAEBE4 802417E4 0200282D */ daddu $a1, $s0, $zero -/* DAEBE8 802417E8 0C0902DE */ jal func_80240B78 -/* DAEBEC 802417EC 0260302D */ daddu $a2, $s3, $zero -/* DAEBF0 802417F0 0280202D */ daddu $a0, $s4, $zero -/* DAEBF4 802417F4 0200282D */ daddu $a1, $s0, $zero -/* DAEBF8 802417F8 0C09030E */ jal func_80240C38 -/* DAEBFC 802417FC 0260302D */ daddu $a2, $s3, $zero -/* DAEC00 80241800 0809061D */ j .L80241874 -/* DAEC04 80241804 0000102D */ daddu $v0, $zero, $zero -/* DAEC08 80241808 0280202D */ daddu $a0, $s4, $zero -/* DAEC0C 8024180C 0200282D */ daddu $a1, $s0, $zero -/* DAEC10 80241810 0C0903DF */ jal func_80240F7C -/* DAEC14 80241814 0260302D */ daddu $a2, $s3, $zero -/* DAEC18 80241818 0280202D */ daddu $a0, $s4, $zero -/* DAEC1C 8024181C 0200282D */ daddu $a1, $s0, $zero -/* DAEC20 80241820 0C0903FD */ jal func_80240FF4 -/* DAEC24 80241824 0260302D */ daddu $a2, $s3, $zero -/* DAEC28 80241828 0809061D */ j .L80241874 -/* DAEC2C 8024182C 0000102D */ daddu $v0, $zero, $zero -/* DAEC30 80241830 0280202D */ daddu $a0, $s4, $zero -/* DAEC34 80241834 0200282D */ daddu $a1, $s0, $zero -/* DAEC38 80241838 0C090418 */ jal func_80241060 -/* DAEC3C 8024183C 0260302D */ daddu $a2, $s3, $zero -/* DAEC40 80241840 0809061D */ j .L80241874 -/* DAEC44 80241844 0000102D */ daddu $v0, $zero, $zero -/* DAEC48 80241848 0280202D */ daddu $a0, $s4, $zero -/* DAEC4C 8024184C 0200282D */ daddu $a1, $s0, $zero -/* DAEC50 80241850 0C090465 */ jal func_80241194 -/* DAEC54 80241854 0260302D */ daddu $a2, $s3, $zero -/* DAEC58 80241858 0809061D */ j .L80241874 -/* DAEC5C 8024185C 0000102D */ daddu $v0, $zero, $zero -/* DAEC60 80241860 0280202D */ daddu $a0, $s4, $zero -/* DAEC64 80241864 0200282D */ daddu $a1, $s0, $zero -/* DAEC68 80241868 0C09047E */ jal func_802411F8 -/* DAEC6C 8024186C 0260302D */ daddu $a2, $s3, $zero -.L80241870: -/* DAEC70 80241870 0000102D */ daddu $v0, $zero, $zero -.L80241874: -/* DAEC74 80241874 8FBF0048 */ lw $ra, 0x48($sp) -/* DAEC78 80241878 8FB50044 */ lw $s5, 0x44($sp) -/* DAEC7C 8024187C 8FB40040 */ lw $s4, 0x40($sp) -/* DAEC80 80241880 8FB3003C */ lw $s3, 0x3c($sp) -/* DAEC84 80241884 8FB20038 */ lw $s2, 0x38($sp) -/* DAEC88 80241888 8FB10034 */ lw $s1, 0x34($sp) -/* DAEC8C 8024188C 8FB00030 */ lw $s0, 0x30($sp) -/* DAEC90 80241890 03E00008 */ jr $ra -/* DAEC94 80241894 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s new file mode 100644 index 0000000000..c2cc66c093 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802416AC_DAEAAC.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416AC_DAEAAC +/* DAEAAC 802416AC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* DAEAB0 802416B0 AFB40040 */ sw $s4, 0x40($sp) +/* DAEAB4 802416B4 0080A02D */ daddu $s4, $a0, $zero +/* DAEAB8 802416B8 AFBF0048 */ sw $ra, 0x48($sp) +/* DAEABC 802416BC AFB50044 */ sw $s5, 0x44($sp) +/* DAEAC0 802416C0 AFB3003C */ sw $s3, 0x3c($sp) +/* DAEAC4 802416C4 AFB20038 */ sw $s2, 0x38($sp) +/* DAEAC8 802416C8 AFB10034 */ sw $s1, 0x34($sp) +/* DAEACC 802416CC AFB00030 */ sw $s0, 0x30($sp) +/* DAEAD0 802416D0 8E920148 */ lw $s2, 0x148($s4) +/* DAEAD4 802416D4 86440008 */ lh $a0, 8($s2) +/* DAEAD8 802416D8 8E90000C */ lw $s0, 0xc($s4) +/* DAEADC 802416DC 0C00EABB */ jal get_npc_unsafe +/* DAEAE0 802416E0 00A0882D */ daddu $s1, $a1, $zero +/* DAEAE4 802416E4 0280202D */ daddu $a0, $s4, $zero +/* DAEAE8 802416E8 8E050000 */ lw $a1, ($s0) +/* DAEAEC 802416EC 0C0B1EAF */ jal get_variable +/* DAEAF0 802416F0 0040A82D */ daddu $s5, $v0, $zero +/* DAEAF4 802416F4 AFA00010 */ sw $zero, 0x10($sp) +/* DAEAF8 802416F8 8E4300D0 */ lw $v1, 0xd0($s2) +/* DAEAFC 802416FC 8C630030 */ lw $v1, 0x30($v1) +/* DAEB00 80241700 AFA30014 */ sw $v1, 0x14($sp) +/* DAEB04 80241704 8E4300D0 */ lw $v1, 0xd0($s2) +/* DAEB08 80241708 8C63001C */ lw $v1, 0x1c($v1) +/* DAEB0C 8024170C AFA30018 */ sw $v1, 0x18($sp) +/* DAEB10 80241710 8E4300D0 */ lw $v1, 0xd0($s2) +/* DAEB14 80241714 8C630024 */ lw $v1, 0x24($v1) +/* DAEB18 80241718 AFA3001C */ sw $v1, 0x1c($sp) +/* DAEB1C 8024171C 8E4300D0 */ lw $v1, 0xd0($s2) +/* DAEB20 80241720 8C630028 */ lw $v1, 0x28($v1) +/* DAEB24 80241724 27B30010 */ addiu $s3, $sp, 0x10 +/* DAEB28 80241728 AFA30020 */ sw $v1, 0x20($sp) +/* DAEB2C 8024172C 8E4300D0 */ lw $v1, 0xd0($s2) +/* DAEB30 80241730 3C0142F0 */ lui $at, 0x42f0 +/* DAEB34 80241734 44810000 */ mtc1 $at, $f0 +/* DAEB38 80241738 8C63002C */ lw $v1, 0x2c($v1) +/* DAEB3C 8024173C 0040802D */ daddu $s0, $v0, $zero +/* DAEB40 80241740 E7A00028 */ swc1 $f0, 0x28($sp) +/* DAEB44 80241744 A7A0002C */ sh $zero, 0x2c($sp) +/* DAEB48 80241748 12200006 */ beqz $s1, .L80241764 +/* DAEB4C 8024174C AFA30024 */ sw $v1, 0x24($sp) +/* DAEB50 80241750 02A0202D */ daddu $a0, $s5, $zero +/* DAEB54 80241754 0240282D */ daddu $a1, $s2, $zero +/* DAEB58 80241758 0280302D */ daddu $a2, $s4, $zero +/* DAEB5C 8024175C 0C090562 */ jal func_80241588_DAE988 +/* DAEB60 80241760 0200382D */ daddu $a3, $s0, $zero +.L80241764: +/* DAEB64 80241764 2402FFFE */ addiu $v0, $zero, -2 +/* DAEB68 80241768 A2A200AB */ sb $v0, 0xab($s5) +/* DAEB6C 8024176C 8E4300B0 */ lw $v1, 0xb0($s2) +/* DAEB70 80241770 30620004 */ andi $v0, $v1, 4 +/* DAEB74 80241774 10400007 */ beqz $v0, .L80241794 +/* DAEB78 80241778 00000000 */ nop +/* DAEB7C 8024177C 824200B4 */ lb $v0, 0xb4($s2) +/* DAEB80 80241780 1440003C */ bnez $v0, .L80241874 +/* DAEB84 80241784 0000102D */ daddu $v0, $zero, $zero +/* DAEB88 80241788 2402FFFB */ addiu $v0, $zero, -5 +/* DAEB8C 8024178C 00621024 */ and $v0, $v1, $v0 +/* DAEB90 80241790 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241794: +/* DAEB94 80241794 8E830070 */ lw $v1, 0x70($s4) +/* DAEB98 80241798 2C62000F */ sltiu $v0, $v1, 0xf +/* DAEB9C 8024179C 10400034 */ beqz $v0, .L80241870 +/* DAEBA0 802417A0 00031080 */ sll $v0, $v1, 2 +/* DAEBA4 802417A4 3C018024 */ lui $at, 0x8024 +/* DAEBA8 802417A8 00220821 */ addu $at, $at, $v0 +/* DAEBAC 802417AC 8C224CC8 */ lw $v0, 0x4cc8($at) +/* DAEBB0 802417B0 00400008 */ jr $v0 +/* DAEBB4 802417B4 00000000 */ nop +/* DAEBB8 802417B8 0280202D */ daddu $a0, $s4, $zero +/* DAEBBC 802417BC 0200282D */ daddu $a1, $s0, $zero +/* DAEBC0 802417C0 0C0900E8 */ jal func_802403A0_DAD7A0 +/* DAEBC4 802417C4 0260302D */ daddu $a2, $s3, $zero +/* DAEBC8 802417C8 0280202D */ daddu $a0, $s4, $zero +/* DAEBCC 802417CC 0200282D */ daddu $a1, $s0, $zero +/* DAEBD0 802417D0 0C090154 */ jal func_80240550_DAD950 +/* DAEBD4 802417D4 0260302D */ daddu $a2, $s3, $zero +/* DAEBD8 802417D8 0809061D */ j .L80241874 +/* DAEBDC 802417DC 0000102D */ daddu $v0, $zero, $zero +/* DAEBE0 802417E0 0280202D */ daddu $a0, $s4, $zero +/* DAEBE4 802417E4 0200282D */ daddu $a1, $s0, $zero +/* DAEBE8 802417E8 0C0902DE */ jal func_80240B78_DADF78 +/* DAEBEC 802417EC 0260302D */ daddu $a2, $s3, $zero +/* DAEBF0 802417F0 0280202D */ daddu $a0, $s4, $zero +/* DAEBF4 802417F4 0200282D */ daddu $a1, $s0, $zero +/* DAEBF8 802417F8 0C09030E */ jal func_80240C38_DAE038 +/* DAEBFC 802417FC 0260302D */ daddu $a2, $s3, $zero +/* DAEC00 80241800 0809061D */ j .L80241874 +/* DAEC04 80241804 0000102D */ daddu $v0, $zero, $zero +/* DAEC08 80241808 0280202D */ daddu $a0, $s4, $zero +/* DAEC0C 8024180C 0200282D */ daddu $a1, $s0, $zero +/* DAEC10 80241810 0C0903DF */ jal func_80240F7C_DAE37C +/* DAEC14 80241814 0260302D */ daddu $a2, $s3, $zero +/* DAEC18 80241818 0280202D */ daddu $a0, $s4, $zero +/* DAEC1C 8024181C 0200282D */ daddu $a1, $s0, $zero +/* DAEC20 80241820 0C0903FD */ jal func_80240FF4_DAE3F4 +/* DAEC24 80241824 0260302D */ daddu $a2, $s3, $zero +/* DAEC28 80241828 0809061D */ j .L80241874 +/* DAEC2C 8024182C 0000102D */ daddu $v0, $zero, $zero +/* DAEC30 80241830 0280202D */ daddu $a0, $s4, $zero +/* DAEC34 80241834 0200282D */ daddu $a1, $s0, $zero +/* DAEC38 80241838 0C090418 */ jal func_80241060_DAE460 +/* DAEC3C 8024183C 0260302D */ daddu $a2, $s3, $zero +/* DAEC40 80241840 0809061D */ j .L80241874 +/* DAEC44 80241844 0000102D */ daddu $v0, $zero, $zero +/* DAEC48 80241848 0280202D */ daddu $a0, $s4, $zero +/* DAEC4C 8024184C 0200282D */ daddu $a1, $s0, $zero +/* DAEC50 80241850 0C090465 */ jal func_80241194_DAE594 +/* DAEC54 80241854 0260302D */ daddu $a2, $s3, $zero +/* DAEC58 80241858 0809061D */ j .L80241874 +/* DAEC5C 8024185C 0000102D */ daddu $v0, $zero, $zero +/* DAEC60 80241860 0280202D */ daddu $a0, $s4, $zero +/* DAEC64 80241864 0200282D */ daddu $a1, $s0, $zero +/* DAEC68 80241868 0C09047E */ jal func_802411F8_DAE5F8 +/* DAEC6C 8024186C 0260302D */ daddu $a2, $s3, $zero +.L80241870: +/* DAEC70 80241870 0000102D */ daddu $v0, $zero, $zero +.L80241874: +/* DAEC74 80241874 8FBF0048 */ lw $ra, 0x48($sp) +/* DAEC78 80241878 8FB50044 */ lw $s5, 0x44($sp) +/* DAEC7C 8024187C 8FB40040 */ lw $s4, 0x40($sp) +/* DAEC80 80241880 8FB3003C */ lw $s3, 0x3c($sp) +/* DAEC84 80241884 8FB20038 */ lw $s2, 0x38($sp) +/* DAEC88 80241888 8FB10034 */ lw $s1, 0x34($sp) +/* DAEC8C 8024188C 8FB00030 */ lw $s0, 0x30($sp) +/* DAEC90 80241890 03E00008 */ jr $ra +/* DAEC94 80241894 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908.s deleted file mode 100644 index a3bb0a4310..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241908 -/* DAED08 80241908 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DAED0C 8024190C AFB20028 */ sw $s2, 0x28($sp) -/* DAED10 80241910 0080902D */ daddu $s2, $a0, $zero -/* DAED14 80241914 AFBF002C */ sw $ra, 0x2c($sp) -/* DAED18 80241918 AFB10024 */ sw $s1, 0x24($sp) -/* DAED1C 8024191C AFB00020 */ sw $s0, 0x20($sp) -/* DAED20 80241920 8E510148 */ lw $s1, 0x148($s2) -/* DAED24 80241924 0C00EABB */ jal get_npc_unsafe -/* DAED28 80241928 86240008 */ lh $a0, 8($s1) -/* DAED2C 8024192C 0040802D */ daddu $s0, $v0, $zero -/* DAED30 80241930 0200202D */ daddu $a0, $s0, $zero -/* DAED34 80241934 C600000C */ lwc1 $f0, 0xc($s0) -/* DAED38 80241938 27A60018 */ addiu $a2, $sp, 0x18 -/* DAED3C 8024193C E7A00018 */ swc1 $f0, 0x18($sp) -/* DAED40 80241940 AFA00010 */ sw $zero, 0x10($sp) -/* DAED44 80241944 AFA00014 */ sw $zero, 0x14($sp) -/* DAED48 80241948 8E050018 */ lw $a1, 0x18($s0) -/* DAED4C 8024194C 0C0129E1 */ jal func_8004A784 -/* DAED50 80241950 0000382D */ daddu $a3, $zero, $zero -/* DAED54 80241954 14400005 */ bnez $v0, .L8024196C -/* DAED58 80241958 00000000 */ nop -/* DAED5C 8024195C 8E050018 */ lw $a1, 0x18($s0) -/* DAED60 80241960 8E06000C */ lw $a2, 0xc($s0) -/* DAED64 80241964 0C00EA95 */ jal npc_move_heading -/* DAED68 80241968 0200202D */ daddu $a0, $s0, $zero -.L8024196C: -/* DAED6C 8024196C 9602008E */ lhu $v0, 0x8e($s0) -/* DAED70 80241970 2442FFFF */ addiu $v0, $v0, -1 -/* DAED74 80241974 A602008E */ sh $v0, 0x8e($s0) -/* DAED78 80241978 00021400 */ sll $v0, $v0, 0x10 -/* DAED7C 8024197C 14400010 */ bnez $v0, .L802419C0 -/* DAED80 80241980 00000000 */ nop -/* DAED84 80241984 C6000018 */ lwc1 $f0, 0x18($s0) -/* DAED88 80241988 3C018024 */ lui $at, 0x8024 -/* DAED8C 8024198C D4224D10 */ ldc1 $f2, 0x4d10($at) -/* DAED90 80241990 46000021 */ cvt.d.s $f0, $f0 -/* DAED94 80241994 46220002 */ mul.d $f0, $f0, $f2 -/* DAED98 80241998 00000000 */ nop -/* DAED9C 8024199C 46200020 */ cvt.s.d $f0, $f0 -/* DAEDA0 802419A0 E6000018 */ swc1 $f0, 0x18($s0) -/* DAEDA4 802419A4 8E2200CC */ lw $v0, 0xcc($s1) -/* DAEDA8 802419A8 8C43002C */ lw $v1, 0x2c($v0) -/* DAEDAC 802419AC 2402000A */ addiu $v0, $zero, 0xa -/* DAEDB0 802419B0 A602008E */ sh $v0, 0x8e($s0) -/* DAEDB4 802419B4 24020010 */ addiu $v0, $zero, 0x10 -/* DAEDB8 802419B8 AE030028 */ sw $v1, 0x28($s0) -/* DAEDBC 802419BC AE420070 */ sw $v0, 0x70($s2) -.L802419C0: -/* DAEDC0 802419C0 8FBF002C */ lw $ra, 0x2c($sp) -/* DAEDC4 802419C4 8FB20028 */ lw $s2, 0x28($sp) -/* DAEDC8 802419C8 8FB10024 */ lw $s1, 0x24($sp) -/* DAEDCC 802419CC 8FB00020 */ lw $s0, 0x20($sp) -/* DAEDD0 802419D0 03E00008 */ jr $ra -/* DAEDD4 802419D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s new file mode 100644 index 0000000000..3b63c3ad17 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241908_DAED08.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241908_DAED08 +/* DAED08 80241908 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* DAED0C 8024190C AFB20028 */ sw $s2, 0x28($sp) +/* DAED10 80241910 0080902D */ daddu $s2, $a0, $zero +/* DAED14 80241914 AFBF002C */ sw $ra, 0x2c($sp) +/* DAED18 80241918 AFB10024 */ sw $s1, 0x24($sp) +/* DAED1C 8024191C AFB00020 */ sw $s0, 0x20($sp) +/* DAED20 80241920 8E510148 */ lw $s1, 0x148($s2) +/* DAED24 80241924 0C00EABB */ jal get_npc_unsafe +/* DAED28 80241928 86240008 */ lh $a0, 8($s1) +/* DAED2C 8024192C 0040802D */ daddu $s0, $v0, $zero +/* DAED30 80241930 0200202D */ daddu $a0, $s0, $zero +/* DAED34 80241934 C600000C */ lwc1 $f0, 0xc($s0) +/* DAED38 80241938 27A60018 */ addiu $a2, $sp, 0x18 +/* DAED3C 8024193C E7A00018 */ swc1 $f0, 0x18($sp) +/* DAED40 80241940 AFA00010 */ sw $zero, 0x10($sp) +/* DAED44 80241944 AFA00014 */ sw $zero, 0x14($sp) +/* DAED48 80241948 8E050018 */ lw $a1, 0x18($s0) +/* DAED4C 8024194C 0C0129E1 */ jal func_8004A784 +/* DAED50 80241950 0000382D */ daddu $a3, $zero, $zero +/* DAED54 80241954 14400005 */ bnez $v0, .L8024196C +/* DAED58 80241958 00000000 */ nop +/* DAED5C 8024195C 8E050018 */ lw $a1, 0x18($s0) +/* DAED60 80241960 8E06000C */ lw $a2, 0xc($s0) +/* DAED64 80241964 0C00EA95 */ jal npc_move_heading +/* DAED68 80241968 0200202D */ daddu $a0, $s0, $zero +.L8024196C: +/* DAED6C 8024196C 9602008E */ lhu $v0, 0x8e($s0) +/* DAED70 80241970 2442FFFF */ addiu $v0, $v0, -1 +/* DAED74 80241974 A602008E */ sh $v0, 0x8e($s0) +/* DAED78 80241978 00021400 */ sll $v0, $v0, 0x10 +/* DAED7C 8024197C 14400010 */ bnez $v0, .L802419C0 +/* DAED80 80241980 00000000 */ nop +/* DAED84 80241984 C6000018 */ lwc1 $f0, 0x18($s0) +/* DAED88 80241988 3C018024 */ lui $at, 0x8024 +/* DAED8C 8024198C D4224D10 */ ldc1 $f2, 0x4d10($at) +/* DAED90 80241990 46000021 */ cvt.d.s $f0, $f0 +/* DAED94 80241994 46220002 */ mul.d $f0, $f0, $f2 +/* DAED98 80241998 00000000 */ nop +/* DAED9C 8024199C 46200020 */ cvt.s.d $f0, $f0 +/* DAEDA0 802419A0 E6000018 */ swc1 $f0, 0x18($s0) +/* DAEDA4 802419A4 8E2200CC */ lw $v0, 0xcc($s1) +/* DAEDA8 802419A8 8C43002C */ lw $v1, 0x2c($v0) +/* DAEDAC 802419AC 2402000A */ addiu $v0, $zero, 0xa +/* DAEDB0 802419B0 A602008E */ sh $v0, 0x8e($s0) +/* DAEDB4 802419B4 24020010 */ addiu $v0, $zero, 0x10 +/* DAEDB8 802419B8 AE030028 */ sw $v1, 0x28($s0) +/* DAEDBC 802419BC AE420070 */ sw $v0, 0x70($s2) +.L802419C0: +/* DAEDC0 802419C0 8FBF002C */ lw $ra, 0x2c($sp) +/* DAEDC4 802419C4 8FB20028 */ lw $s2, 0x28($sp) +/* DAEDC8 802419C8 8FB10024 */ lw $s1, 0x24($sp) +/* DAEDCC 802419CC 8FB00020 */ lw $s0, 0x20($sp) +/* DAEDD0 802419D0 03E00008 */ jr $ra +/* DAEDD4 802419D4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70.s deleted file mode 100644 index 8aac496e68..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A70 -/* DAEE70 80241A70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DAEE74 80241A74 AFB10014 */ sw $s1, 0x14($sp) -/* DAEE78 80241A78 0080882D */ daddu $s1, $a0, $zero -/* DAEE7C 80241A7C AFBF0018 */ sw $ra, 0x18($sp) -/* DAEE80 80241A80 AFB00010 */ sw $s0, 0x10($sp) -/* DAEE84 80241A84 8E300148 */ lw $s0, 0x148($s1) -/* DAEE88 80241A88 0C00EABB */ jal get_npc_unsafe -/* DAEE8C 80241A8C 86040008 */ lh $a0, 8($s0) -/* DAEE90 80241A90 0040182D */ daddu $v1, $v0, $zero -/* DAEE94 80241A94 9462008E */ lhu $v0, 0x8e($v1) -/* DAEE98 80241A98 2442FFFF */ addiu $v0, $v0, -1 -/* DAEE9C 80241A9C A462008E */ sh $v0, 0x8e($v1) -/* DAEEA0 80241AA0 00021400 */ sll $v0, $v0, 0x10 -/* DAEEA4 80241AA4 14400005 */ bnez $v0, .L80241ABC -/* DAEEA8 80241AA8 00000000 */ nop -/* DAEEAC 80241AAC 8E0200CC */ lw $v0, 0xcc($s0) -/* DAEEB0 80241AB0 8C420000 */ lw $v0, ($v0) -/* DAEEB4 80241AB4 AC620028 */ sw $v0, 0x28($v1) -/* DAEEB8 80241AB8 AE200070 */ sw $zero, 0x70($s1) -.L80241ABC: -/* DAEEBC 80241ABC 8FBF0018 */ lw $ra, 0x18($sp) -/* DAEEC0 80241AC0 8FB10014 */ lw $s1, 0x14($sp) -/* DAEEC4 80241AC4 8FB00010 */ lw $s0, 0x10($sp) -/* DAEEC8 80241AC8 03E00008 */ jr $ra -/* DAEECC 80241ACC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s new file mode 100644 index 0000000000..232371aea1 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241A70_DAEE70.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A70_DAEE70 +/* DAEE70 80241A70 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DAEE74 80241A74 AFB10014 */ sw $s1, 0x14($sp) +/* DAEE78 80241A78 0080882D */ daddu $s1, $a0, $zero +/* DAEE7C 80241A7C AFBF0018 */ sw $ra, 0x18($sp) +/* DAEE80 80241A80 AFB00010 */ sw $s0, 0x10($sp) +/* DAEE84 80241A84 8E300148 */ lw $s0, 0x148($s1) +/* DAEE88 80241A88 0C00EABB */ jal get_npc_unsafe +/* DAEE8C 80241A8C 86040008 */ lh $a0, 8($s0) +/* DAEE90 80241A90 0040182D */ daddu $v1, $v0, $zero +/* DAEE94 80241A94 9462008E */ lhu $v0, 0x8e($v1) +/* DAEE98 80241A98 2442FFFF */ addiu $v0, $v0, -1 +/* DAEE9C 80241A9C A462008E */ sh $v0, 0x8e($v1) +/* DAEEA0 80241AA0 00021400 */ sll $v0, $v0, 0x10 +/* DAEEA4 80241AA4 14400005 */ bnez $v0, .L80241ABC +/* DAEEA8 80241AA8 00000000 */ nop +/* DAEEAC 80241AAC 8E0200CC */ lw $v0, 0xcc($s0) +/* DAEEB0 80241AB0 8C420000 */ lw $v0, ($v0) +/* DAEEB4 80241AB4 AC620028 */ sw $v0, 0x28($v1) +/* DAEEB8 80241AB8 AE200070 */ sw $zero, 0x70($s1) +.L80241ABC: +/* DAEEBC 80241ABC 8FBF0018 */ lw $ra, 0x18($sp) +/* DAEEC0 80241AC0 8FB10014 */ lw $s1, 0x14($sp) +/* DAEEC4 80241AC4 8FB00010 */ lw $s0, 0x10($sp) +/* DAEEC8 80241AC8 03E00008 */ jr $ra +/* DAEECC 80241ACC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s index fc0646ac05..f65e179a24 100644 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241AD0_DAEED0.s @@ -173,7 +173,7 @@ glabel func_80241AD0_DAEED0 /* DAF158 80241D58 00000000 */ nop /* DAF15C 80241D5C 0260202D */ daddu $a0, $s3, $zero /* DAF160 80241D60 0280282D */ daddu $a1, $s4, $zero -/* DAF164 80241D64 0C090626 */ jal func_80241898 +/* DAF164 80241D64 0C090626 */ jal func_80241898_DAEC98 /* DAF168 80241D68 02A0302D */ daddu $a2, $s5, $zero /* DAF16C 80241D6C 8E630070 */ lw $v1, 0x70($s3) /* DAF170 80241D70 2402000F */ addiu $v0, $zero, 0xf @@ -181,7 +181,7 @@ glabel func_80241AD0_DAEED0 /* DAF178 80241D78 00000000 */ nop /* DAF17C 80241D7C 0260202D */ daddu $a0, $s3, $zero /* DAF180 80241D80 0280282D */ daddu $a1, $s4, $zero -/* DAF184 80241D84 0C090642 */ jal func_80241908 +/* DAF184 80241D84 0C090642 */ jal func_80241908_DAED08 /* DAF188 80241D88 02A0302D */ daddu $a2, $s5, $zero /* DAF18C 80241D8C 8E630070 */ lw $v1, 0x70($s3) /* DAF190 80241D90 24020010 */ addiu $v0, $zero, 0x10 @@ -189,7 +189,7 @@ glabel func_80241AD0_DAEED0 /* DAF198 80241D98 00000000 */ nop /* DAF19C 80241D9C 0260202D */ daddu $a0, $s3, $zero /* DAF1A0 80241DA0 0280282D */ daddu $a1, $s4, $zero -/* DAF1A4 80241DA4 0C090676 */ jal func_802419D8 +/* DAF1A4 80241DA4 0C090676 */ jal func_802419D8_DAEDD8 /* DAF1A8 80241DA8 02A0302D */ daddu $a2, $s5, $zero /* DAF1AC 80241DAC 8E630070 */ lw $v1, 0x70($s3) /* DAF1B0 80241DB0 24020011 */ addiu $v0, $zero, 0x11 @@ -197,7 +197,7 @@ glabel func_80241AD0_DAEED0 /* DAF1B8 80241DB8 00000000 */ nop /* DAF1BC 80241DBC 0260202D */ daddu $a0, $s3, $zero /* DAF1C0 80241DC0 0280282D */ daddu $a1, $s4, $zero -/* DAF1C4 80241DC4 0C09069C */ jal func_80241A70 +/* DAF1C4 80241DC4 0C09069C */ jal func_80241A70_DAEE70 /* DAF1C8 80241DC8 02A0302D */ daddu $a2, $s5, $zero /* DAF1CC 80241DCC 08090777 */ j .L80241DDC /* DAF1D0 80241DD0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20.s deleted file mode 100644 index e832c4d917..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E20 -/* DAF220 80241E20 3C03800B */ lui $v1, %hi(gCameras) -/* DAF224 80241E24 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DAF228 80241E28 94620000 */ lhu $v0, ($v1) -/* DAF22C 80241E2C 3042EFFF */ andi $v0, $v0, 0xefff -/* DAF230 80241E30 A4620000 */ sh $v0, ($v1) -/* DAF234 80241E34 03E00008 */ jr $ra -/* DAF238 80241E38 24020002 */ addiu $v0, $zero, 2 -/* DAF23C 80241E3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s new file mode 100644 index 0000000000..99ba62bd53 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_80241E20_DAF220.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E20_DAF220 +/* DAF220 80241E20 3C03800B */ lui $v1, %hi(gCameras) +/* DAF224 80241E24 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* DAF228 80241E28 94620000 */ lhu $v0, ($v1) +/* DAF22C 80241E2C 3042EFFF */ andi $v0, $v0, 0xefff +/* DAF230 80241E30 A4620000 */ sh $v0, ($v1) +/* DAF234 80241E34 03E00008 */ jr $ra +/* DAF238 80241E38 24020002 */ addiu $v0, $zero, 2 +/* DAF23C 80241E3C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8.s deleted file mode 100644 index fba7990492..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401D8 -/* DB2498 802401D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB249C 802401DC AFB10014 */ sw $s1, 0x14($sp) -/* DB24A0 802401E0 0080882D */ daddu $s1, $a0, $zero -/* DB24A4 802401E4 AFBF0018 */ sw $ra, 0x18($sp) -/* DB24A8 802401E8 AFB00010 */ sw $s0, 0x10($sp) -/* DB24AC 802401EC 8E300148 */ lw $s0, 0x148($s1) -/* DB24B0 802401F0 0C00EABB */ jal get_npc_unsafe -/* DB24B4 802401F4 86040008 */ lh $a0, 8($s0) -/* DB24B8 802401F8 0040182D */ daddu $v1, $v0, $zero -/* DB24BC 802401FC 9462008E */ lhu $v0, 0x8e($v1) -/* DB24C0 80240200 2442FFFF */ addiu $v0, $v0, -1 -/* DB24C4 80240204 A462008E */ sh $v0, 0x8e($v1) -/* DB24C8 80240208 00021400 */ sll $v0, $v0, 0x10 -/* DB24CC 8024020C 14400005 */ bnez $v0, .L80240224 -/* DB24D0 80240210 00000000 */ nop -/* DB24D4 80240214 8E0200CC */ lw $v0, 0xcc($s0) -/* DB24D8 80240218 8C420000 */ lw $v0, ($v0) -/* DB24DC 8024021C AC620028 */ sw $v0, 0x28($v1) -/* DB24E0 80240220 AE200070 */ sw $zero, 0x70($s1) -.L80240224: -/* DB24E4 80240224 8FBF0018 */ lw $ra, 0x18($sp) -/* DB24E8 80240228 8FB10014 */ lw $s1, 0x14($sp) -/* DB24EC 8024022C 8FB00010 */ lw $s0, 0x10($sp) -/* DB24F0 80240230 03E00008 */ jr $ra -/* DB24F4 80240234 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s new file mode 100644 index 0000000000..ec58379cc5 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802401D8_DB2498.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401D8_DB2498 +/* DB2498 802401D8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DB249C 802401DC AFB10014 */ sw $s1, 0x14($sp) +/* DB24A0 802401E0 0080882D */ daddu $s1, $a0, $zero +/* DB24A4 802401E4 AFBF0018 */ sw $ra, 0x18($sp) +/* DB24A8 802401E8 AFB00010 */ sw $s0, 0x10($sp) +/* DB24AC 802401EC 8E300148 */ lw $s0, 0x148($s1) +/* DB24B0 802401F0 0C00EABB */ jal get_npc_unsafe +/* DB24B4 802401F4 86040008 */ lh $a0, 8($s0) +/* DB24B8 802401F8 0040182D */ daddu $v1, $v0, $zero +/* DB24BC 802401FC 9462008E */ lhu $v0, 0x8e($v1) +/* DB24C0 80240200 2442FFFF */ addiu $v0, $v0, -1 +/* DB24C4 80240204 A462008E */ sh $v0, 0x8e($v1) +/* DB24C8 80240208 00021400 */ sll $v0, $v0, 0x10 +/* DB24CC 8024020C 14400005 */ bnez $v0, .L80240224 +/* DB24D0 80240210 00000000 */ nop +/* DB24D4 80240214 8E0200CC */ lw $v0, 0xcc($s0) +/* DB24D8 80240218 8C420000 */ lw $v0, ($v0) +/* DB24DC 8024021C AC620028 */ sw $v0, 0x28($v1) +/* DB24E0 80240220 AE200070 */ sw $zero, 0x70($s1) +.L80240224: +/* DB24E4 80240224 8FBF0018 */ lw $ra, 0x18($sp) +/* DB24E8 80240228 8FB10014 */ lw $s1, 0x14($sp) +/* DB24EC 8024022C 8FB00010 */ lw $s0, 0x10($sp) +/* DB24F0 80240230 03E00008 */ jr $ra +/* DB24F4 80240234 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s index 09d44e4bbe..506ead4eac 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240238_DB24F8.s @@ -173,7 +173,7 @@ glabel func_80240238_DB24F8 /* DB2780 802404C0 00000000 */ nop /* DB2784 802404C4 0260202D */ daddu $a0, $s3, $zero /* DB2788 802404C8 0280282D */ daddu $a1, $s4, $zero -/* DB278C 802404CC 0C090000 */ jal func_80240000 +/* DB278C 802404CC 0C090000 */ jal func_80240000_DB22C0 /* DB2790 802404D0 02A0302D */ daddu $a2, $s5, $zero /* DB2794 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DB2798 802404D8 2402000F */ addiu $v0, $zero, 0xf @@ -181,7 +181,7 @@ glabel func_80240238_DB24F8 /* DB27A0 802404E0 00000000 */ nop /* DB27A4 802404E4 0260202D */ daddu $a0, $s3, $zero /* DB27A8 802404E8 0280282D */ daddu $a1, $s4, $zero -/* DB27AC 802404EC 0C09001C */ jal func_80240070 +/* DB27AC 802404EC 0C09001C */ jal func_80240070_DB2330 /* DB27B0 802404F0 02A0302D */ daddu $a2, $s5, $zero /* DB27B4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DB27B8 802404F8 24020010 */ addiu $v0, $zero, 0x10 @@ -189,7 +189,7 @@ glabel func_80240238_DB24F8 /* DB27C0 80240500 00000000 */ nop /* DB27C4 80240504 0260202D */ daddu $a0, $s3, $zero /* DB27C8 80240508 0280282D */ daddu $a1, $s4, $zero -/* DB27CC 8024050C 0C090050 */ jal func_80240140 +/* DB27CC 8024050C 0C090050 */ jal func_80240140_DB2400 /* DB27D0 80240510 02A0302D */ daddu $a2, $s5, $zero /* DB27D4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DB27D8 80240518 24020011 */ addiu $v0, $zero, 0x11 @@ -197,7 +197,7 @@ glabel func_80240238_DB24F8 /* DB27E0 80240520 00000000 */ nop /* DB27E4 80240524 0260202D */ daddu $a0, $s3, $zero /* DB27E8 80240528 0280282D */ daddu $a1, $s4, $zero -/* DB27EC 8024052C 0C090076 */ jal func_802401D8 +/* DB27EC 8024052C 0C090076 */ jal func_802401D8_DB2498 /* DB27F0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DB27F4 80240534 08090151 */ j .L80240544 /* DB27F8 80240538 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s index d89adcdcac..d411002bde 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240780_DB2A40.s @@ -141,11 +141,11 @@ glabel func_80240780_DB2A40 /* DB2C48 80240988 00000000 */ nop /* DB2C4C 8024098C 0260202D */ daddu $a0, $s3, $zero /* DB2C50 80240990 0280282D */ daddu $a1, $s4, $zero -/* DB2C54 80240994 0C09015B */ jal func_8024056C +/* DB2C54 80240994 0C09015B */ jal func_8024056C_DB282C /* DB2C58 80240998 02A0302D */ daddu $a2, $s5, $zero /* DB2C5C 8024099C 0260202D */ daddu $a0, $s3, $zero /* DB2C60 802409A0 0280282D */ daddu $a1, $s4, $zero -/* DB2C64 802409A4 0C09016F */ jal func_802405BC +/* DB2C64 802409A4 0C09016F */ jal func_802405BC_DB287C /* DB2C68 802409A8 02A0302D */ daddu $a2, $s5, $zero /* DB2C6C 802409AC 0809028B */ j .L80240A2C /* DB2C70 802409B0 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04.s deleted file mode 100644 index 73d8a5732c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C04 -/* DB2EC4 80240C04 27BDFF80 */ addiu $sp, $sp, -0x80 -/* DB2EC8 80240C08 AFB3004C */ sw $s3, 0x4c($sp) -/* DB2ECC 80240C0C 0080982D */ daddu $s3, $a0, $zero -/* DB2ED0 80240C10 AFBF0058 */ sw $ra, 0x58($sp) -/* DB2ED4 80240C14 AFB50054 */ sw $s5, 0x54($sp) -/* DB2ED8 80240C18 AFB40050 */ sw $s4, 0x50($sp) -/* DB2EDC 80240C1C AFB20048 */ sw $s2, 0x48($sp) -/* DB2EE0 80240C20 AFB10044 */ sw $s1, 0x44($sp) -/* DB2EE4 80240C24 AFB00040 */ sw $s0, 0x40($sp) -/* DB2EE8 80240C28 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* DB2EEC 80240C2C F7B80070 */ sdc1 $f24, 0x70($sp) -/* DB2EF0 80240C30 F7B60068 */ sdc1 $f22, 0x68($sp) -/* DB2EF4 80240C34 F7B40060 */ sdc1 $f20, 0x60($sp) -/* DB2EF8 80240C38 8E710148 */ lw $s1, 0x148($s3) -/* DB2EFC 80240C3C 00A0902D */ daddu $s2, $a1, $zero -/* DB2F00 80240C40 86240008 */ lh $a0, 8($s1) -/* DB2F04 80240C44 0C00EABB */ jal get_npc_unsafe -/* DB2F08 80240C48 00C0A82D */ daddu $s5, $a2, $zero -/* DB2F0C 80240C4C 0040802D */ daddu $s0, $v0, $zero -/* DB2F10 80240C50 0000A02D */ daddu $s4, $zero, $zero -/* DB2F14 80240C54 C624007C */ lwc1 $f4, 0x7c($s1) -/* DB2F18 80240C58 46802120 */ cvt.s.w $f4, $f4 -/* DB2F1C 80240C5C C6220088 */ lwc1 $f2, 0x88($s1) -/* DB2F20 80240C60 468010A0 */ cvt.s.w $f2, $f2 -/* DB2F24 80240C64 460010A1 */ cvt.d.s $f2, $f2 -/* DB2F28 80240C68 46002121 */ cvt.d.s $f4, $f4 -/* DB2F2C 80240C6C C600003C */ lwc1 $f0, 0x3c($s0) -/* DB2F30 80240C70 3C014059 */ lui $at, 0x4059 -/* DB2F34 80240C74 44813800 */ mtc1 $at, $f7 -/* DB2F38 80240C78 44803000 */ mtc1 $zero, $f6 -/* DB2F3C 80240C7C 46000021 */ cvt.d.s $f0, $f0 -/* DB2F40 80240C80 46260002 */ mul.d $f0, $f0, $f6 -/* DB2F44 80240C84 00000000 */ nop -/* DB2F48 80240C88 24020001 */ addiu $v0, $zero, 1 -/* DB2F4C 80240C8C 8E24006C */ lw $a0, 0x6c($s1) -/* DB2F50 80240C90 46261083 */ div.d $f2, $f2, $f6 -/* DB2F54 80240C94 462010A0 */ cvt.s.d $f2, $f2 -/* DB2F58 80240C98 46262103 */ div.d $f4, $f4, $f6 -/* DB2F5C 80240C9C 46202520 */ cvt.s.d $f20, $f4 -/* DB2F60 80240CA0 30830011 */ andi $v1, $a0, 0x11 -/* DB2F64 80240CA4 4620020D */ trunc.w.d $f8, $f0 -/* DB2F68 80240CA8 E628007C */ swc1 $f8, 0x7c($s1) -/* DB2F6C 80240CAC C6200078 */ lwc1 $f0, 0x78($s1) -/* DB2F70 80240CB0 46800020 */ cvt.s.w $f0, $f0 -/* DB2F74 80240CB4 46000021 */ cvt.d.s $f0, $f0 -/* DB2F78 80240CB8 46260003 */ div.d $f0, $f0, $f6 -/* DB2F7C 80240CBC 462006A0 */ cvt.s.d $f26, $f0 -/* DB2F80 80240CC0 C6200070 */ lwc1 $f0, 0x70($s1) -/* DB2F84 80240CC4 46800020 */ cvt.s.w $f0, $f0 -/* DB2F88 80240CC8 46000021 */ cvt.d.s $f0, $f0 -/* DB2F8C 80240CCC 46260003 */ div.d $f0, $f0, $f6 -/* DB2F90 80240CD0 462005A0 */ cvt.s.d $f22, $f0 -/* DB2F94 80240CD4 14620025 */ bne $v1, $v0, .L80240D6C -/* DB2F98 80240CD8 4602D600 */ add.s $f24, $f26, $f2 -/* DB2F9C 80240CDC 8E020000 */ lw $v0, ($s0) -/* DB2FA0 80240CE0 30420008 */ andi $v0, $v0, 8 -/* DB2FA4 80240CE4 10400009 */ beqz $v0, .L80240D0C -/* DB2FA8 80240CE8 27A50028 */ addiu $a1, $sp, 0x28 -/* DB2FAC 80240CEC C600003C */ lwc1 $f0, 0x3c($s0) -/* DB2FB0 80240CF0 4600C001 */ sub.s $f0, $f24, $f0 -/* DB2FB4 80240CF4 4600B03C */ c.lt.s $f22, $f0 -/* DB2FB8 80240CF8 00000000 */ nop -/* DB2FBC 80240CFC 4500001B */ bc1f .L80240D6C -/* DB2FC0 80240D00 34820010 */ ori $v0, $a0, 0x10 -/* DB2FC4 80240D04 0809035B */ j .L80240D6C -/* DB2FC8 80240D08 AE22006C */ sw $v0, 0x6c($s1) -.L80240D0C: -/* DB2FCC 80240D0C 27A6002C */ addiu $a2, $sp, 0x2c -/* DB2FD0 80240D10 C6000038 */ lwc1 $f0, 0x38($s0) -/* DB2FD4 80240D14 C602003C */ lwc1 $f2, 0x3c($s0) -/* DB2FD8 80240D18 C6040040 */ lwc1 $f4, 0x40($s0) -/* DB2FDC 80240D1C 3C01447A */ lui $at, 0x447a -/* DB2FE0 80240D20 44813000 */ mtc1 $at, $f6 -/* DB2FE4 80240D24 27A20034 */ addiu $v0, $sp, 0x34 -/* DB2FE8 80240D28 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB2FEC 80240D2C E7A2002C */ swc1 $f2, 0x2c($sp) -/* DB2FF0 80240D30 E7A40030 */ swc1 $f4, 0x30($sp) -/* DB2FF4 80240D34 E7A60034 */ swc1 $f6, 0x34($sp) -/* DB2FF8 80240D38 AFA20010 */ sw $v0, 0x10($sp) -/* DB2FFC 80240D3C 8E040080 */ lw $a0, 0x80($s0) -/* DB3000 80240D40 0C0372DF */ jal func_800DCB7C -/* DB3004 80240D44 27A70030 */ addiu $a3, $sp, 0x30 -/* DB3008 80240D48 C7A00034 */ lwc1 $f0, 0x34($sp) -/* DB300C 80240D4C 4600D001 */ sub.s $f0, $f26, $f0 -/* DB3010 80240D50 4600B03C */ c.lt.s $f22, $f0 -/* DB3014 80240D54 00000000 */ nop -/* DB3018 80240D58 45000004 */ bc1f .L80240D6C -/* DB301C 80240D5C 00000000 */ nop -/* DB3020 80240D60 8E22006C */ lw $v0, 0x6c($s1) -/* DB3024 80240D64 34420010 */ ori $v0, $v0, 0x10 -/* DB3028 80240D68 AE22006C */ sw $v0, 0x6c($s1) -.L80240D6C: -/* DB302C 80240D6C 8E22006C */ lw $v0, 0x6c($s1) -/* DB3030 80240D70 24030011 */ addiu $v1, $zero, 0x11 -/* DB3034 80240D74 30420011 */ andi $v0, $v0, 0x11 -/* DB3038 80240D78 14430039 */ bne $v0, $v1, .L80240E60 -/* DB303C 80240D7C 00000000 */ nop -/* DB3040 80240D80 8E020000 */ lw $v0, ($s0) -/* DB3044 80240D84 30420008 */ andi $v0, $v0, 8 -/* DB3048 80240D88 1040000A */ beqz $v0, .L80240DB4 -/* DB304C 80240D8C 4600C106 */ mov.s $f4, $f24 -/* DB3050 80240D90 4614C081 */ sub.s $f2, $f24, $f20 -/* DB3054 80240D94 3C018024 */ lui $at, 0x8024 -/* DB3058 80240D98 D42055F8 */ ldc1 $f0, 0x55f8($at) -/* DB305C 80240D9C 460010A1 */ cvt.d.s $f2, $f2 -/* DB3060 80240DA0 46201082 */ mul.d $f2, $f2, $f0 -/* DB3064 80240DA4 00000000 */ nop -/* DB3068 80240DA8 4600A021 */ cvt.d.s $f0, $f20 -/* DB306C 80240DAC 08090386 */ j .L80240E18 -/* DB3070 80240DB0 46220000 */ add.d $f0, $f0, $f2 -.L80240DB4: -/* DB3074 80240DB4 27A50028 */ addiu $a1, $sp, 0x28 -/* DB3078 80240DB8 27A6002C */ addiu $a2, $sp, 0x2c -/* DB307C 80240DBC C6000038 */ lwc1 $f0, 0x38($s0) -/* DB3080 80240DC0 C6020040 */ lwc1 $f2, 0x40($s0) -/* DB3084 80240DC4 3C01447A */ lui $at, 0x447a -/* DB3088 80240DC8 44812000 */ mtc1 $at, $f4 -/* DB308C 80240DCC 27A20034 */ addiu $v0, $sp, 0x34 -/* DB3090 80240DD0 E7B4002C */ swc1 $f20, 0x2c($sp) -/* DB3094 80240DD4 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB3098 80240DD8 E7A20030 */ swc1 $f2, 0x30($sp) -/* DB309C 80240DDC E7A40034 */ swc1 $f4, 0x34($sp) -/* DB30A0 80240DE0 AFA20010 */ sw $v0, 0x10($sp) -/* DB30A4 80240DE4 8E040080 */ lw $a0, 0x80($s0) -/* DB30A8 80240DE8 0C0372DF */ jal func_800DCB7C -/* DB30AC 80240DEC 27A70030 */ addiu $a3, $sp, 0x30 -/* DB30B0 80240DF0 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* DB30B4 80240DF4 461A2100 */ add.s $f4, $f4, $f26 -/* DB30B8 80240DF8 46142081 */ sub.s $f2, $f4, $f20 -/* DB30BC 80240DFC 3C018024 */ lui $at, 0x8024 -/* DB30C0 80240E00 D4205600 */ ldc1 $f0, 0x5600($at) -/* DB30C4 80240E04 460010A1 */ cvt.d.s $f2, $f2 -/* DB30C8 80240E08 46201082 */ mul.d $f2, $f2, $f0 -/* DB30CC 80240E0C 00000000 */ nop -/* DB30D0 80240E10 4600A021 */ cvt.d.s $f0, $f20 -/* DB30D4 80240E14 46220000 */ add.d $f0, $f0, $f2 -.L80240E18: -/* DB30D8 80240E18 46200020 */ cvt.s.d $f0, $f0 -/* DB30DC 80240E1C E600003C */ swc1 $f0, 0x3c($s0) -/* DB30E0 80240E20 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB30E4 80240E24 46002001 */ sub.s $f0, $f4, $f0 -/* DB30E8 80240E28 3C013FF0 */ lui $at, 0x3ff0 -/* DB30EC 80240E2C 44811800 */ mtc1 $at, $f3 -/* DB30F0 80240E30 44801000 */ mtc1 $zero, $f2 -/* DB30F4 80240E34 46000005 */ abs.s $f0, $f0 -/* DB30F8 80240E38 46000021 */ cvt.d.s $f0, $f0 -/* DB30FC 80240E3C 4622003C */ c.lt.d $f0, $f2 -/* DB3100 80240E40 00000000 */ nop -/* DB3104 80240E44 45000036 */ bc1f .L80240F20 -/* DB3108 80240E48 2403FFEF */ addiu $v1, $zero, -0x11 -/* DB310C 80240E4C E604003C */ swc1 $f4, 0x3c($s0) -/* DB3110 80240E50 8E22006C */ lw $v0, 0x6c($s1) -/* DB3114 80240E54 00431024 */ and $v0, $v0, $v1 -/* DB3118 80240E58 080903C8 */ j .L80240F20 -/* DB311C 80240E5C AE22006C */ sw $v0, 0x6c($s1) -.L80240E60: -/* DB3120 80240E60 8E220070 */ lw $v0, 0x70($s1) -/* DB3124 80240E64 1840002E */ blez $v0, .L80240F20 -/* DB3128 80240E68 00000000 */ nop -/* DB312C 80240E6C C62C0074 */ lwc1 $f12, 0x74($s1) -/* DB3130 80240E70 0C00A8BB */ jal sin_deg -/* DB3134 80240E74 46806320 */ cvt.s.w $f12, $f12 -/* DB3138 80240E78 8E020000 */ lw $v0, ($s0) -/* DB313C 80240E7C 30420008 */ andi $v0, $v0, 8 -/* DB3140 80240E80 10400003 */ beqz $v0, .L80240E90 -/* DB3144 80240E84 46000506 */ mov.s $f20, $f0 -/* DB3148 80240E88 080903B4 */ j .L80240ED0 -/* DB314C 80240E8C 0000102D */ daddu $v0, $zero, $zero -.L80240E90: -/* DB3150 80240E90 27A50028 */ addiu $a1, $sp, 0x28 -/* DB3154 80240E94 27A6002C */ addiu $a2, $sp, 0x2c -/* DB3158 80240E98 C6000038 */ lwc1 $f0, 0x38($s0) -/* DB315C 80240E9C C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3160 80240EA0 C6040040 */ lwc1 $f4, 0x40($s0) -/* DB3164 80240EA4 3C01447A */ lui $at, 0x447a -/* DB3168 80240EA8 44813000 */ mtc1 $at, $f6 -/* DB316C 80240EAC 27A20034 */ addiu $v0, $sp, 0x34 -/* DB3170 80240EB0 E7A00028 */ swc1 $f0, 0x28($sp) -/* DB3174 80240EB4 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DB3178 80240EB8 E7A40030 */ swc1 $f4, 0x30($sp) -/* DB317C 80240EBC E7A60034 */ swc1 $f6, 0x34($sp) -/* DB3180 80240EC0 AFA20010 */ sw $v0, 0x10($sp) -/* DB3184 80240EC4 8E040080 */ lw $a0, 0x80($s0) -/* DB3188 80240EC8 0C0372DF */ jal func_800DCB7C -/* DB318C 80240ECC 27A70030 */ addiu $a3, $sp, 0x30 -.L80240ED0: -/* DB3190 80240ED0 10400007 */ beqz $v0, .L80240EF0 -/* DB3194 80240ED4 00000000 */ nop -/* DB3198 80240ED8 4616A082 */ mul.s $f2, $f20, $f22 -/* DB319C 80240EDC 00000000 */ nop -/* DB31A0 80240EE0 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DB31A4 80240EE4 461A0000 */ add.s $f0, $f0, $f26 -/* DB31A8 80240EE8 080903BF */ j .L80240EFC -/* DB31AC 80240EEC 46020000 */ add.s $f0, $f0, $f2 -.L80240EF0: -/* DB31B0 80240EF0 4616A002 */ mul.s $f0, $f20, $f22 -/* DB31B4 80240EF4 00000000 */ nop -/* DB31B8 80240EF8 4600C000 */ add.s $f0, $f24, $f0 -.L80240EFC: -/* DB31BC 80240EFC E600003C */ swc1 $f0, 0x3c($s0) -/* DB31C0 80240F00 8E220074 */ lw $v0, 0x74($s1) -/* DB31C4 80240F04 2442000A */ addiu $v0, $v0, 0xa -/* DB31C8 80240F08 44826000 */ mtc1 $v0, $f12 -/* DB31CC 80240F0C 00000000 */ nop -/* DB31D0 80240F10 0C00A6C9 */ jal clamp_angle -/* DB31D4 80240F14 46806320 */ cvt.s.w $f12, $f12 -/* DB31D8 80240F18 4600020D */ trunc.w.s $f8, $f0 -/* DB31DC 80240F1C E6280074 */ swc1 $f8, 0x74($s1) -.L80240F20: -/* DB31E0 80240F20 8E220090 */ lw $v0, 0x90($s1) -/* DB31E4 80240F24 1C40004A */ bgtz $v0, .L80241050 -/* DB31E8 80240F28 2442FFFF */ addiu $v0, $v0, -1 -/* DB31EC 80240F2C 8E430014 */ lw $v1, 0x14($s2) -/* DB31F0 80240F30 04600048 */ bltz $v1, .L80241054 -/* DB31F4 80240F34 00000000 */ nop -/* DB31F8 80240F38 8E620074 */ lw $v0, 0x74($s3) -/* DB31FC 80240F3C 1C400042 */ bgtz $v0, .L80241048 -/* DB3200 80240F40 2442FFFF */ addiu $v0, $v0, -1 -/* DB3204 80240F44 AE630074 */ sw $v1, 0x74($s3) -/* DB3208 80240F48 860200A8 */ lh $v0, 0xa8($s0) -/* DB320C 80240F4C C602003C */ lwc1 $f2, 0x3c($s0) -/* DB3210 80240F50 44820000 */ mtc1 $v0, $f0 -/* DB3214 80240F54 00000000 */ nop -/* DB3218 80240F58 46800020 */ cvt.s.w $f0, $f0 -/* DB321C 80240F5C 46001080 */ add.s $f2, $f2, $f0 -/* DB3220 80240F60 3C014024 */ lui $at, 0x4024 -/* DB3224 80240F64 44810800 */ mtc1 $at, $f1 -/* DB3228 80240F68 44800000 */ mtc1 $zero, $f0 -/* DB322C 80240F6C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB3230 80240F70 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3234 80240F74 460010A1 */ cvt.d.s $f2, $f2 -/* DB3238 80240F78 46201080 */ add.d $f2, $f2, $f0 -/* DB323C 80240F7C C440002C */ lwc1 $f0, 0x2c($v0) -/* DB3240 80240F80 46000021 */ cvt.d.s $f0, $f0 -/* DB3244 80240F84 4622003C */ c.lt.d $f0, $f2 -/* DB3248 80240F88 00000000 */ nop -/* DB324C 80240F8C 4500002C */ bc1f .L80241040 -/* DB3250 80240F90 02A0202D */ daddu $a0, $s5, $zero -/* DB3254 80240F94 AFA00010 */ sw $zero, 0x10($sp) -/* DB3258 80240F98 8E46000C */ lw $a2, 0xc($s2) -/* DB325C 80240F9C 8E470010 */ lw $a3, 0x10($s2) -/* DB3260 80240FA0 0C01242D */ jal func_800490B4 -/* DB3264 80240FA4 0220282D */ daddu $a1, $s1, $zero -/* DB3268 80240FA8 10400025 */ beqz $v0, .L80241040 -/* DB326C 80240FAC 0000202D */ daddu $a0, $zero, $zero -/* DB3270 80240FB0 0200282D */ daddu $a1, $s0, $zero -/* DB3274 80240FB4 0000302D */ daddu $a2, $zero, $zero -/* DB3278 80240FB8 2412000C */ addiu $s2, $zero, 0xc -/* DB327C 80240FBC 860300A8 */ lh $v1, 0xa8($s0) -/* DB3280 80240FC0 3C013F80 */ lui $at, 0x3f80 -/* DB3284 80240FC4 44810000 */ mtc1 $at, $f0 -/* DB3288 80240FC8 3C014000 */ lui $at, 0x4000 -/* DB328C 80240FCC 44811000 */ mtc1 $at, $f2 -/* DB3290 80240FD0 3C01C1A0 */ lui $at, 0xc1a0 -/* DB3294 80240FD4 44812000 */ mtc1 $at, $f4 -/* DB3298 80240FD8 44834000 */ mtc1 $v1, $f8 -/* DB329C 80240FDC 00000000 */ nop -/* DB32A0 80240FE0 46804220 */ cvt.s.w $f8, $f8 -/* DB32A4 80240FE4 44074000 */ mfc1 $a3, $f8 -/* DB32A8 80240FE8 27A20038 */ addiu $v0, $sp, 0x38 -/* DB32AC 80240FEC AFB2001C */ sw $s2, 0x1c($sp) -/* DB32B0 80240FF0 AFA20020 */ sw $v0, 0x20($sp) -/* DB32B4 80240FF4 E7A00010 */ swc1 $f0, 0x10($sp) -/* DB32B8 80240FF8 E7A20014 */ swc1 $f2, 0x14($sp) -/* DB32BC 80240FFC 0C01BFA4 */ jal fx_emote -/* DB32C0 80241000 E7A40018 */ swc1 $f4, 0x18($sp) -/* DB32C4 80241004 0200202D */ daddu $a0, $s0, $zero -/* DB32C8 80241008 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DB32CC 8024100C C480003C */ lwc1 $f0, 0x3c($a0) -/* DB32D0 80241010 3C060020 */ lui $a2, 0x20 -/* DB32D4 80241014 0C012530 */ jal func_800494C0 -/* DB32D8 80241018 E4800064 */ swc1 $f0, 0x64($a0) -/* DB32DC 8024101C 8E220018 */ lw $v0, 0x18($s1) -/* DB32E0 80241020 9442002A */ lhu $v0, 0x2a($v0) -/* DB32E4 80241024 30420001 */ andi $v0, $v0, 1 -/* DB32E8 80241028 10400003 */ beqz $v0, .L80241038 -/* DB32EC 8024102C 2402000A */ addiu $v0, $zero, 0xa -/* DB32F0 80241030 0809047E */ j .L802411F8 -/* DB32F4 80241034 AE620070 */ sw $v0, 0x70($s3) -.L80241038: -/* DB32F8 80241038 0809047E */ j .L802411F8 -/* DB32FC 8024103C AE720070 */ sw $s2, 0x70($s3) -.L80241040: -/* DB3300 80241040 8E620074 */ lw $v0, 0x74($s3) -/* DB3304 80241044 2442FFFF */ addiu $v0, $v0, -1 -.L80241048: -/* DB3308 80241048 08090415 */ j .L80241054 -/* DB330C 8024104C AE620074 */ sw $v0, 0x74($s3) -.L80241050: -/* DB3310 80241050 AE220090 */ sw $v0, 0x90($s1) -.L80241054: -/* DB3314 80241054 8E2300D0 */ lw $v1, 0xd0($s1) -/* DB3318 80241058 C6000040 */ lwc1 $f0, 0x40($s0) -/* DB331C 8024105C C4620000 */ lwc1 $f2, ($v1) -/* DB3320 80241060 468010A0 */ cvt.s.w $f2, $f2 -/* DB3324 80241064 C4640008 */ lwc1 $f4, 8($v1) -/* DB3328 80241068 46802120 */ cvt.s.w $f4, $f4 -/* DB332C 8024106C E7A00010 */ swc1 $f0, 0x10($sp) -/* DB3330 80241070 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB3334 80241074 44051000 */ mfc1 $a1, $f2 -/* DB3338 80241078 C440000C */ lwc1 $f0, 0xc($v0) -/* DB333C 8024107C 46800020 */ cvt.s.w $f0, $f0 -/* DB3340 80241080 E7A00014 */ swc1 $f0, 0x14($sp) -/* DB3344 80241084 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB3348 80241088 44062000 */ mfc1 $a2, $f4 -/* DB334C 8024108C C4400010 */ lwc1 $f0, 0x10($v0) -/* DB3350 80241090 46800020 */ cvt.s.w $f0, $f0 -/* DB3354 80241094 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB3358 80241098 8C640018 */ lw $a0, 0x18($v1) -/* DB335C 8024109C 0C0123F5 */ jal is_point_within_region -/* DB3360 802410A0 8E070038 */ lw $a3, 0x38($s0) -/* DB3364 802410A4 1040001A */ beqz $v0, .L80241110 -/* DB3368 802410A8 00000000 */ nop -/* DB336C 802410AC 8E060038 */ lw $a2, 0x38($s0) -/* DB3370 802410B0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB3374 802410B4 8E070040 */ lw $a3, 0x40($s0) -/* DB3378 802410B8 C44C0000 */ lwc1 $f12, ($v0) -/* DB337C 802410BC 46806320 */ cvt.s.w $f12, $f12 -/* DB3380 802410C0 C44E0008 */ lwc1 $f14, 8($v0) -/* DB3384 802410C4 0C00A7B5 */ jal dist2D -/* DB3388 802410C8 468073A0 */ cvt.s.w $f14, $f14 -/* DB338C 802410CC C6020018 */ lwc1 $f2, 0x18($s0) -/* DB3390 802410D0 4600103C */ c.lt.s $f2, $f0 -/* DB3394 802410D4 00000000 */ nop -/* DB3398 802410D8 4500000D */ bc1f .L80241110 -/* DB339C 802410DC E7A00034 */ swc1 $f0, 0x34($sp) -/* DB33A0 802410E0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DB33A4 802410E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB33A8 802410E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DB33AC 802410EC C4480000 */ lwc1 $f8, ($v0) -/* DB33B0 802410F0 46804220 */ cvt.s.w $f8, $f8 -/* DB33B4 802410F4 44064000 */ mfc1 $a2, $f8 -/* DB33B8 802410F8 C4480008 */ lwc1 $f8, 8($v0) -/* DB33BC 802410FC 46804220 */ cvt.s.w $f8, $f8 -/* DB33C0 80241100 44074000 */ mfc1 $a3, $f8 -/* DB33C4 80241104 0C00A720 */ jal atan2 -/* DB33C8 80241108 24140001 */ addiu $s4, $zero, 1 -/* DB33CC 8024110C E600000C */ swc1 $f0, 0xc($s0) -.L80241110: -/* DB33D0 80241110 8E2200D0 */ lw $v0, 0xd0($s1) -/* DB33D4 80241114 8C43000C */ lw $v1, 0xc($v0) -/* DB33D8 80241118 8C420010 */ lw $v0, 0x10($v0) -/* DB33DC 8024111C 00621825 */ or $v1, $v1, $v0 -/* DB33E0 80241120 00741825 */ or $v1, $v1, $s4 -/* DB33E4 80241124 10600008 */ beqz $v1, .L80241148 -/* DB33E8 80241128 00000000 */ nop -/* DB33EC 8024112C 8602008C */ lh $v0, 0x8c($s0) -/* DB33F0 80241130 14400031 */ bnez $v0, .L802411F8 -/* DB33F4 80241134 00000000 */ nop -/* DB33F8 80241138 8E050018 */ lw $a1, 0x18($s0) -/* DB33FC 8024113C 8E06000C */ lw $a2, 0xc($s0) -/* DB3400 80241140 0C00EA95 */ jal npc_move_heading -/* DB3404 80241144 0200202D */ daddu $a0, $s0, $zero -.L80241148: -/* DB3408 80241148 C600003C */ lwc1 $f0, 0x3c($s0) -/* DB340C 8024114C 3C014059 */ lui $at, 0x4059 -/* DB3410 80241150 44811800 */ mtc1 $at, $f3 -/* DB3414 80241154 44801000 */ mtc1 $zero, $f2 -/* DB3418 80241158 46000021 */ cvt.d.s $f0, $f0 -/* DB341C 8024115C 46220002 */ mul.d $f0, $f0, $f2 -/* DB3420 80241160 00000000 */ nop -/* DB3424 80241164 4620020D */ trunc.w.d $f8, $f0 -/* DB3428 80241168 E628007C */ swc1 $f8, 0x7c($s1) -/* DB342C 8024116C 8E420004 */ lw $v0, 4($s2) -/* DB3430 80241170 18400021 */ blez $v0, .L802411F8 -/* DB3434 80241174 00000000 */ nop -/* DB3438 80241178 8602008E */ lh $v0, 0x8e($s0) -/* DB343C 8024117C 9603008E */ lhu $v1, 0x8e($s0) -/* DB3440 80241180 18400005 */ blez $v0, .L80241198 -/* DB3444 80241184 2462FFFF */ addiu $v0, $v1, -1 -/* DB3448 80241188 A602008E */ sh $v0, 0x8e($s0) -/* DB344C 8024118C 00021400 */ sll $v0, $v0, 0x10 -/* DB3450 80241190 1C400019 */ bgtz $v0, .L802411F8 -/* DB3454 80241194 00000000 */ nop -.L80241198: -/* DB3458 80241198 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DB345C 8024119C 24020002 */ addiu $v0, $zero, 2 -/* DB3460 802411A0 0C00A67F */ jal rand_int -/* DB3464 802411A4 AE620070 */ sw $v0, 0x70($s3) -/* DB3468 802411A8 3C035555 */ lui $v1, 0x5555 -/* DB346C 802411AC 34635556 */ ori $v1, $v1, 0x5556 -/* DB3470 802411B0 00430018 */ mult $v0, $v1 -/* DB3474 802411B4 000227C3 */ sra $a0, $v0, 0x1f -/* DB3478 802411B8 00004010 */ mfhi $t0 -/* DB347C 802411BC 01042023 */ subu $a0, $t0, $a0 -/* DB3480 802411C0 00041840 */ sll $v1, $a0, 1 -/* DB3484 802411C4 00641821 */ addu $v1, $v1, $a0 -/* DB3488 802411C8 00431023 */ subu $v0, $v0, $v1 -/* DB348C 802411CC 24430002 */ addiu $v1, $v0, 2 -/* DB3490 802411D0 AE630074 */ sw $v1, 0x74($s3) -/* DB3494 802411D4 8E42002C */ lw $v0, 0x2c($s2) -/* DB3498 802411D8 58400007 */ blezl $v0, .L802411F8 -/* DB349C 802411DC AE600070 */ sw $zero, 0x70($s3) -/* DB34A0 802411E0 8E420008 */ lw $v0, 8($s2) -/* DB34A4 802411E4 18400003 */ blez $v0, .L802411F4 -/* DB34A8 802411E8 28620003 */ slti $v0, $v1, 3 -/* DB34AC 802411EC 10400002 */ beqz $v0, .L802411F8 -/* DB34B0 802411F0 00000000 */ nop -.L802411F4: -/* DB34B4 802411F4 AE600070 */ sw $zero, 0x70($s3) -.L802411F8: -/* DB34B8 802411F8 8FBF0058 */ lw $ra, 0x58($sp) -/* DB34BC 802411FC 8FB50054 */ lw $s5, 0x54($sp) -/* DB34C0 80241200 8FB40050 */ lw $s4, 0x50($sp) -/* DB34C4 80241204 8FB3004C */ lw $s3, 0x4c($sp) -/* DB34C8 80241208 8FB20048 */ lw $s2, 0x48($sp) -/* DB34CC 8024120C 8FB10044 */ lw $s1, 0x44($sp) -/* DB34D0 80241210 8FB00040 */ lw $s0, 0x40($sp) -/* DB34D4 80241214 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* DB34D8 80241218 D7B80070 */ ldc1 $f24, 0x70($sp) -/* DB34DC 8024121C D7B60068 */ ldc1 $f22, 0x68($sp) -/* DB34E0 80241220 D7B40060 */ ldc1 $f20, 0x60($sp) -/* DB34E4 80241224 03E00008 */ jr $ra -/* DB34E8 80241228 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s new file mode 100644 index 0000000000..c89ee7bb7b --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80240C04_DB2EC4.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C04_DB2EC4 +/* DB2EC4 80240C04 27BDFF80 */ addiu $sp, $sp, -0x80 +/* DB2EC8 80240C08 AFB3004C */ sw $s3, 0x4c($sp) +/* DB2ECC 80240C0C 0080982D */ daddu $s3, $a0, $zero +/* DB2ED0 80240C10 AFBF0058 */ sw $ra, 0x58($sp) +/* DB2ED4 80240C14 AFB50054 */ sw $s5, 0x54($sp) +/* DB2ED8 80240C18 AFB40050 */ sw $s4, 0x50($sp) +/* DB2EDC 80240C1C AFB20048 */ sw $s2, 0x48($sp) +/* DB2EE0 80240C20 AFB10044 */ sw $s1, 0x44($sp) +/* DB2EE4 80240C24 AFB00040 */ sw $s0, 0x40($sp) +/* DB2EE8 80240C28 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* DB2EEC 80240C2C F7B80070 */ sdc1 $f24, 0x70($sp) +/* DB2EF0 80240C30 F7B60068 */ sdc1 $f22, 0x68($sp) +/* DB2EF4 80240C34 F7B40060 */ sdc1 $f20, 0x60($sp) +/* DB2EF8 80240C38 8E710148 */ lw $s1, 0x148($s3) +/* DB2EFC 80240C3C 00A0902D */ daddu $s2, $a1, $zero +/* DB2F00 80240C40 86240008 */ lh $a0, 8($s1) +/* DB2F04 80240C44 0C00EABB */ jal get_npc_unsafe +/* DB2F08 80240C48 00C0A82D */ daddu $s5, $a2, $zero +/* DB2F0C 80240C4C 0040802D */ daddu $s0, $v0, $zero +/* DB2F10 80240C50 0000A02D */ daddu $s4, $zero, $zero +/* DB2F14 80240C54 C624007C */ lwc1 $f4, 0x7c($s1) +/* DB2F18 80240C58 46802120 */ cvt.s.w $f4, $f4 +/* DB2F1C 80240C5C C6220088 */ lwc1 $f2, 0x88($s1) +/* DB2F20 80240C60 468010A0 */ cvt.s.w $f2, $f2 +/* DB2F24 80240C64 460010A1 */ cvt.d.s $f2, $f2 +/* DB2F28 80240C68 46002121 */ cvt.d.s $f4, $f4 +/* DB2F2C 80240C6C C600003C */ lwc1 $f0, 0x3c($s0) +/* DB2F30 80240C70 3C014059 */ lui $at, 0x4059 +/* DB2F34 80240C74 44813800 */ mtc1 $at, $f7 +/* DB2F38 80240C78 44803000 */ mtc1 $zero, $f6 +/* DB2F3C 80240C7C 46000021 */ cvt.d.s $f0, $f0 +/* DB2F40 80240C80 46260002 */ mul.d $f0, $f0, $f6 +/* DB2F44 80240C84 00000000 */ nop +/* DB2F48 80240C88 24020001 */ addiu $v0, $zero, 1 +/* DB2F4C 80240C8C 8E24006C */ lw $a0, 0x6c($s1) +/* DB2F50 80240C90 46261083 */ div.d $f2, $f2, $f6 +/* DB2F54 80240C94 462010A0 */ cvt.s.d $f2, $f2 +/* DB2F58 80240C98 46262103 */ div.d $f4, $f4, $f6 +/* DB2F5C 80240C9C 46202520 */ cvt.s.d $f20, $f4 +/* DB2F60 80240CA0 30830011 */ andi $v1, $a0, 0x11 +/* DB2F64 80240CA4 4620020D */ trunc.w.d $f8, $f0 +/* DB2F68 80240CA8 E628007C */ swc1 $f8, 0x7c($s1) +/* DB2F6C 80240CAC C6200078 */ lwc1 $f0, 0x78($s1) +/* DB2F70 80240CB0 46800020 */ cvt.s.w $f0, $f0 +/* DB2F74 80240CB4 46000021 */ cvt.d.s $f0, $f0 +/* DB2F78 80240CB8 46260003 */ div.d $f0, $f0, $f6 +/* DB2F7C 80240CBC 462006A0 */ cvt.s.d $f26, $f0 +/* DB2F80 80240CC0 C6200070 */ lwc1 $f0, 0x70($s1) +/* DB2F84 80240CC4 46800020 */ cvt.s.w $f0, $f0 +/* DB2F88 80240CC8 46000021 */ cvt.d.s $f0, $f0 +/* DB2F8C 80240CCC 46260003 */ div.d $f0, $f0, $f6 +/* DB2F90 80240CD0 462005A0 */ cvt.s.d $f22, $f0 +/* DB2F94 80240CD4 14620025 */ bne $v1, $v0, .L80240D6C +/* DB2F98 80240CD8 4602D600 */ add.s $f24, $f26, $f2 +/* DB2F9C 80240CDC 8E020000 */ lw $v0, ($s0) +/* DB2FA0 80240CE0 30420008 */ andi $v0, $v0, 8 +/* DB2FA4 80240CE4 10400009 */ beqz $v0, .L80240D0C +/* DB2FA8 80240CE8 27A50028 */ addiu $a1, $sp, 0x28 +/* DB2FAC 80240CEC C600003C */ lwc1 $f0, 0x3c($s0) +/* DB2FB0 80240CF0 4600C001 */ sub.s $f0, $f24, $f0 +/* DB2FB4 80240CF4 4600B03C */ c.lt.s $f22, $f0 +/* DB2FB8 80240CF8 00000000 */ nop +/* DB2FBC 80240CFC 4500001B */ bc1f .L80240D6C +/* DB2FC0 80240D00 34820010 */ ori $v0, $a0, 0x10 +/* DB2FC4 80240D04 0809035B */ j .L80240D6C +/* DB2FC8 80240D08 AE22006C */ sw $v0, 0x6c($s1) +.L80240D0C: +/* DB2FCC 80240D0C 27A6002C */ addiu $a2, $sp, 0x2c +/* DB2FD0 80240D10 C6000038 */ lwc1 $f0, 0x38($s0) +/* DB2FD4 80240D14 C602003C */ lwc1 $f2, 0x3c($s0) +/* DB2FD8 80240D18 C6040040 */ lwc1 $f4, 0x40($s0) +/* DB2FDC 80240D1C 3C01447A */ lui $at, 0x447a +/* DB2FE0 80240D20 44813000 */ mtc1 $at, $f6 +/* DB2FE4 80240D24 27A20034 */ addiu $v0, $sp, 0x34 +/* DB2FE8 80240D28 E7A00028 */ swc1 $f0, 0x28($sp) +/* DB2FEC 80240D2C E7A2002C */ swc1 $f2, 0x2c($sp) +/* DB2FF0 80240D30 E7A40030 */ swc1 $f4, 0x30($sp) +/* DB2FF4 80240D34 E7A60034 */ swc1 $f6, 0x34($sp) +/* DB2FF8 80240D38 AFA20010 */ sw $v0, 0x10($sp) +/* DB2FFC 80240D3C 8E040080 */ lw $a0, 0x80($s0) +/* DB3000 80240D40 0C0372DF */ jal func_800DCB7C +/* DB3004 80240D44 27A70030 */ addiu $a3, $sp, 0x30 +/* DB3008 80240D48 C7A00034 */ lwc1 $f0, 0x34($sp) +/* DB300C 80240D4C 4600D001 */ sub.s $f0, $f26, $f0 +/* DB3010 80240D50 4600B03C */ c.lt.s $f22, $f0 +/* DB3014 80240D54 00000000 */ nop +/* DB3018 80240D58 45000004 */ bc1f .L80240D6C +/* DB301C 80240D5C 00000000 */ nop +/* DB3020 80240D60 8E22006C */ lw $v0, 0x6c($s1) +/* DB3024 80240D64 34420010 */ ori $v0, $v0, 0x10 +/* DB3028 80240D68 AE22006C */ sw $v0, 0x6c($s1) +.L80240D6C: +/* DB302C 80240D6C 8E22006C */ lw $v0, 0x6c($s1) +/* DB3030 80240D70 24030011 */ addiu $v1, $zero, 0x11 +/* DB3034 80240D74 30420011 */ andi $v0, $v0, 0x11 +/* DB3038 80240D78 14430039 */ bne $v0, $v1, .L80240E60 +/* DB303C 80240D7C 00000000 */ nop +/* DB3040 80240D80 8E020000 */ lw $v0, ($s0) +/* DB3044 80240D84 30420008 */ andi $v0, $v0, 8 +/* DB3048 80240D88 1040000A */ beqz $v0, .L80240DB4 +/* DB304C 80240D8C 4600C106 */ mov.s $f4, $f24 +/* DB3050 80240D90 4614C081 */ sub.s $f2, $f24, $f20 +/* DB3054 80240D94 3C018024 */ lui $at, 0x8024 +/* DB3058 80240D98 D42055F8 */ ldc1 $f0, 0x55f8($at) +/* DB305C 80240D9C 460010A1 */ cvt.d.s $f2, $f2 +/* DB3060 80240DA0 46201082 */ mul.d $f2, $f2, $f0 +/* DB3064 80240DA4 00000000 */ nop +/* DB3068 80240DA8 4600A021 */ cvt.d.s $f0, $f20 +/* DB306C 80240DAC 08090386 */ j .L80240E18 +/* DB3070 80240DB0 46220000 */ add.d $f0, $f0, $f2 +.L80240DB4: +/* DB3074 80240DB4 27A50028 */ addiu $a1, $sp, 0x28 +/* DB3078 80240DB8 27A6002C */ addiu $a2, $sp, 0x2c +/* DB307C 80240DBC C6000038 */ lwc1 $f0, 0x38($s0) +/* DB3080 80240DC0 C6020040 */ lwc1 $f2, 0x40($s0) +/* DB3084 80240DC4 3C01447A */ lui $at, 0x447a +/* DB3088 80240DC8 44812000 */ mtc1 $at, $f4 +/* DB308C 80240DCC 27A20034 */ addiu $v0, $sp, 0x34 +/* DB3090 80240DD0 E7B4002C */ swc1 $f20, 0x2c($sp) +/* DB3094 80240DD4 E7A00028 */ swc1 $f0, 0x28($sp) +/* DB3098 80240DD8 E7A20030 */ swc1 $f2, 0x30($sp) +/* DB309C 80240DDC E7A40034 */ swc1 $f4, 0x34($sp) +/* DB30A0 80240DE0 AFA20010 */ sw $v0, 0x10($sp) +/* DB30A4 80240DE4 8E040080 */ lw $a0, 0x80($s0) +/* DB30A8 80240DE8 0C0372DF */ jal func_800DCB7C +/* DB30AC 80240DEC 27A70030 */ addiu $a3, $sp, 0x30 +/* DB30B0 80240DF0 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* DB30B4 80240DF4 461A2100 */ add.s $f4, $f4, $f26 +/* DB30B8 80240DF8 46142081 */ sub.s $f2, $f4, $f20 +/* DB30BC 80240DFC 3C018024 */ lui $at, 0x8024 +/* DB30C0 80240E00 D4205600 */ ldc1 $f0, 0x5600($at) +/* DB30C4 80240E04 460010A1 */ cvt.d.s $f2, $f2 +/* DB30C8 80240E08 46201082 */ mul.d $f2, $f2, $f0 +/* DB30CC 80240E0C 00000000 */ nop +/* DB30D0 80240E10 4600A021 */ cvt.d.s $f0, $f20 +/* DB30D4 80240E14 46220000 */ add.d $f0, $f0, $f2 +.L80240E18: +/* DB30D8 80240E18 46200020 */ cvt.s.d $f0, $f0 +/* DB30DC 80240E1C E600003C */ swc1 $f0, 0x3c($s0) +/* DB30E0 80240E20 C600003C */ lwc1 $f0, 0x3c($s0) +/* DB30E4 80240E24 46002001 */ sub.s $f0, $f4, $f0 +/* DB30E8 80240E28 3C013FF0 */ lui $at, 0x3ff0 +/* DB30EC 80240E2C 44811800 */ mtc1 $at, $f3 +/* DB30F0 80240E30 44801000 */ mtc1 $zero, $f2 +/* DB30F4 80240E34 46000005 */ abs.s $f0, $f0 +/* DB30F8 80240E38 46000021 */ cvt.d.s $f0, $f0 +/* DB30FC 80240E3C 4622003C */ c.lt.d $f0, $f2 +/* DB3100 80240E40 00000000 */ nop +/* DB3104 80240E44 45000036 */ bc1f .L80240F20 +/* DB3108 80240E48 2403FFEF */ addiu $v1, $zero, -0x11 +/* DB310C 80240E4C E604003C */ swc1 $f4, 0x3c($s0) +/* DB3110 80240E50 8E22006C */ lw $v0, 0x6c($s1) +/* DB3114 80240E54 00431024 */ and $v0, $v0, $v1 +/* DB3118 80240E58 080903C8 */ j .L80240F20 +/* DB311C 80240E5C AE22006C */ sw $v0, 0x6c($s1) +.L80240E60: +/* DB3120 80240E60 8E220070 */ lw $v0, 0x70($s1) +/* DB3124 80240E64 1840002E */ blez $v0, .L80240F20 +/* DB3128 80240E68 00000000 */ nop +/* DB312C 80240E6C C62C0074 */ lwc1 $f12, 0x74($s1) +/* DB3130 80240E70 0C00A8BB */ jal sin_deg +/* DB3134 80240E74 46806320 */ cvt.s.w $f12, $f12 +/* DB3138 80240E78 8E020000 */ lw $v0, ($s0) +/* DB313C 80240E7C 30420008 */ andi $v0, $v0, 8 +/* DB3140 80240E80 10400003 */ beqz $v0, .L80240E90 +/* DB3144 80240E84 46000506 */ mov.s $f20, $f0 +/* DB3148 80240E88 080903B4 */ j .L80240ED0 +/* DB314C 80240E8C 0000102D */ daddu $v0, $zero, $zero +.L80240E90: +/* DB3150 80240E90 27A50028 */ addiu $a1, $sp, 0x28 +/* DB3154 80240E94 27A6002C */ addiu $a2, $sp, 0x2c +/* DB3158 80240E98 C6000038 */ lwc1 $f0, 0x38($s0) +/* DB315C 80240E9C C602003C */ lwc1 $f2, 0x3c($s0) +/* DB3160 80240EA0 C6040040 */ lwc1 $f4, 0x40($s0) +/* DB3164 80240EA4 3C01447A */ lui $at, 0x447a +/* DB3168 80240EA8 44813000 */ mtc1 $at, $f6 +/* DB316C 80240EAC 27A20034 */ addiu $v0, $sp, 0x34 +/* DB3170 80240EB0 E7A00028 */ swc1 $f0, 0x28($sp) +/* DB3174 80240EB4 E7A2002C */ swc1 $f2, 0x2c($sp) +/* DB3178 80240EB8 E7A40030 */ swc1 $f4, 0x30($sp) +/* DB317C 80240EBC E7A60034 */ swc1 $f6, 0x34($sp) +/* DB3180 80240EC0 AFA20010 */ sw $v0, 0x10($sp) +/* DB3184 80240EC4 8E040080 */ lw $a0, 0x80($s0) +/* DB3188 80240EC8 0C0372DF */ jal func_800DCB7C +/* DB318C 80240ECC 27A70030 */ addiu $a3, $sp, 0x30 +.L80240ED0: +/* DB3190 80240ED0 10400007 */ beqz $v0, .L80240EF0 +/* DB3194 80240ED4 00000000 */ nop +/* DB3198 80240ED8 4616A082 */ mul.s $f2, $f20, $f22 +/* DB319C 80240EDC 00000000 */ nop +/* DB31A0 80240EE0 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* DB31A4 80240EE4 461A0000 */ add.s $f0, $f0, $f26 +/* DB31A8 80240EE8 080903BF */ j .L80240EFC +/* DB31AC 80240EEC 46020000 */ add.s $f0, $f0, $f2 +.L80240EF0: +/* DB31B0 80240EF0 4616A002 */ mul.s $f0, $f20, $f22 +/* DB31B4 80240EF4 00000000 */ nop +/* DB31B8 80240EF8 4600C000 */ add.s $f0, $f24, $f0 +.L80240EFC: +/* DB31BC 80240EFC E600003C */ swc1 $f0, 0x3c($s0) +/* DB31C0 80240F00 8E220074 */ lw $v0, 0x74($s1) +/* DB31C4 80240F04 2442000A */ addiu $v0, $v0, 0xa +/* DB31C8 80240F08 44826000 */ mtc1 $v0, $f12 +/* DB31CC 80240F0C 00000000 */ nop +/* DB31D0 80240F10 0C00A6C9 */ jal clamp_angle +/* DB31D4 80240F14 46806320 */ cvt.s.w $f12, $f12 +/* DB31D8 80240F18 4600020D */ trunc.w.s $f8, $f0 +/* DB31DC 80240F1C E6280074 */ swc1 $f8, 0x74($s1) +.L80240F20: +/* DB31E0 80240F20 8E220090 */ lw $v0, 0x90($s1) +/* DB31E4 80240F24 1C40004A */ bgtz $v0, .L80241050 +/* DB31E8 80240F28 2442FFFF */ addiu $v0, $v0, -1 +/* DB31EC 80240F2C 8E430014 */ lw $v1, 0x14($s2) +/* DB31F0 80240F30 04600048 */ bltz $v1, .L80241054 +/* DB31F4 80240F34 00000000 */ nop +/* DB31F8 80240F38 8E620074 */ lw $v0, 0x74($s3) +/* DB31FC 80240F3C 1C400042 */ bgtz $v0, .L80241048 +/* DB3200 80240F40 2442FFFF */ addiu $v0, $v0, -1 +/* DB3204 80240F44 AE630074 */ sw $v1, 0x74($s3) +/* DB3208 80240F48 860200A8 */ lh $v0, 0xa8($s0) +/* DB320C 80240F4C C602003C */ lwc1 $f2, 0x3c($s0) +/* DB3210 80240F50 44820000 */ mtc1 $v0, $f0 +/* DB3214 80240F54 00000000 */ nop +/* DB3218 80240F58 46800020 */ cvt.s.w $f0, $f0 +/* DB321C 80240F5C 46001080 */ add.s $f2, $f2, $f0 +/* DB3220 80240F60 3C014024 */ lui $at, 0x4024 +/* DB3224 80240F64 44810800 */ mtc1 $at, $f1 +/* DB3228 80240F68 44800000 */ mtc1 $zero, $f0 +/* DB322C 80240F6C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DB3230 80240F70 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DB3234 80240F74 460010A1 */ cvt.d.s $f2, $f2 +/* DB3238 80240F78 46201080 */ add.d $f2, $f2, $f0 +/* DB323C 80240F7C C440002C */ lwc1 $f0, 0x2c($v0) +/* DB3240 80240F80 46000021 */ cvt.d.s $f0, $f0 +/* DB3244 80240F84 4622003C */ c.lt.d $f0, $f2 +/* DB3248 80240F88 00000000 */ nop +/* DB324C 80240F8C 4500002C */ bc1f .L80241040 +/* DB3250 80240F90 02A0202D */ daddu $a0, $s5, $zero +/* DB3254 80240F94 AFA00010 */ sw $zero, 0x10($sp) +/* DB3258 80240F98 8E46000C */ lw $a2, 0xc($s2) +/* DB325C 80240F9C 8E470010 */ lw $a3, 0x10($s2) +/* DB3260 80240FA0 0C01242D */ jal func_800490B4 +/* DB3264 80240FA4 0220282D */ daddu $a1, $s1, $zero +/* DB3268 80240FA8 10400025 */ beqz $v0, .L80241040 +/* DB326C 80240FAC 0000202D */ daddu $a0, $zero, $zero +/* DB3270 80240FB0 0200282D */ daddu $a1, $s0, $zero +/* DB3274 80240FB4 0000302D */ daddu $a2, $zero, $zero +/* DB3278 80240FB8 2412000C */ addiu $s2, $zero, 0xc +/* DB327C 80240FBC 860300A8 */ lh $v1, 0xa8($s0) +/* DB3280 80240FC0 3C013F80 */ lui $at, 0x3f80 +/* DB3284 80240FC4 44810000 */ mtc1 $at, $f0 +/* DB3288 80240FC8 3C014000 */ lui $at, 0x4000 +/* DB328C 80240FCC 44811000 */ mtc1 $at, $f2 +/* DB3290 80240FD0 3C01C1A0 */ lui $at, 0xc1a0 +/* DB3294 80240FD4 44812000 */ mtc1 $at, $f4 +/* DB3298 80240FD8 44834000 */ mtc1 $v1, $f8 +/* DB329C 80240FDC 00000000 */ nop +/* DB32A0 80240FE0 46804220 */ cvt.s.w $f8, $f8 +/* DB32A4 80240FE4 44074000 */ mfc1 $a3, $f8 +/* DB32A8 80240FE8 27A20038 */ addiu $v0, $sp, 0x38 +/* DB32AC 80240FEC AFB2001C */ sw $s2, 0x1c($sp) +/* DB32B0 80240FF0 AFA20020 */ sw $v0, 0x20($sp) +/* DB32B4 80240FF4 E7A00010 */ swc1 $f0, 0x10($sp) +/* DB32B8 80240FF8 E7A20014 */ swc1 $f2, 0x14($sp) +/* DB32BC 80240FFC 0C01BFA4 */ jal fx_emote +/* DB32C0 80241000 E7A40018 */ swc1 $f4, 0x18($sp) +/* DB32C4 80241004 0200202D */ daddu $a0, $s0, $zero +/* DB32C8 80241008 240502F4 */ addiu $a1, $zero, 0x2f4 +/* DB32CC 8024100C C480003C */ lwc1 $f0, 0x3c($a0) +/* DB32D0 80241010 3C060020 */ lui $a2, 0x20 +/* DB32D4 80241014 0C012530 */ jal func_800494C0 +/* DB32D8 80241018 E4800064 */ swc1 $f0, 0x64($a0) +/* DB32DC 8024101C 8E220018 */ lw $v0, 0x18($s1) +/* DB32E0 80241020 9442002A */ lhu $v0, 0x2a($v0) +/* DB32E4 80241024 30420001 */ andi $v0, $v0, 1 +/* DB32E8 80241028 10400003 */ beqz $v0, .L80241038 +/* DB32EC 8024102C 2402000A */ addiu $v0, $zero, 0xa +/* DB32F0 80241030 0809047E */ j .L802411F8 +/* DB32F4 80241034 AE620070 */ sw $v0, 0x70($s3) +.L80241038: +/* DB32F8 80241038 0809047E */ j .L802411F8 +/* DB32FC 8024103C AE720070 */ sw $s2, 0x70($s3) +.L80241040: +/* DB3300 80241040 8E620074 */ lw $v0, 0x74($s3) +/* DB3304 80241044 2442FFFF */ addiu $v0, $v0, -1 +.L80241048: +/* DB3308 80241048 08090415 */ j .L80241054 +/* DB330C 8024104C AE620074 */ sw $v0, 0x74($s3) +.L80241050: +/* DB3310 80241050 AE220090 */ sw $v0, 0x90($s1) +.L80241054: +/* DB3314 80241054 8E2300D0 */ lw $v1, 0xd0($s1) +/* DB3318 80241058 C6000040 */ lwc1 $f0, 0x40($s0) +/* DB331C 8024105C C4620000 */ lwc1 $f2, ($v1) +/* DB3320 80241060 468010A0 */ cvt.s.w $f2, $f2 +/* DB3324 80241064 C4640008 */ lwc1 $f4, 8($v1) +/* DB3328 80241068 46802120 */ cvt.s.w $f4, $f4 +/* DB332C 8024106C E7A00010 */ swc1 $f0, 0x10($sp) +/* DB3330 80241070 8E2200D0 */ lw $v0, 0xd0($s1) +/* DB3334 80241074 44051000 */ mfc1 $a1, $f2 +/* DB3338 80241078 C440000C */ lwc1 $f0, 0xc($v0) +/* DB333C 8024107C 46800020 */ cvt.s.w $f0, $f0 +/* DB3340 80241080 E7A00014 */ swc1 $f0, 0x14($sp) +/* DB3344 80241084 8E2200D0 */ lw $v0, 0xd0($s1) +/* DB3348 80241088 44062000 */ mfc1 $a2, $f4 +/* DB334C 8024108C C4400010 */ lwc1 $f0, 0x10($v0) +/* DB3350 80241090 46800020 */ cvt.s.w $f0, $f0 +/* DB3354 80241094 E7A00018 */ swc1 $f0, 0x18($sp) +/* DB3358 80241098 8C640018 */ lw $a0, 0x18($v1) +/* DB335C 8024109C 0C0123F5 */ jal is_point_within_region +/* DB3360 802410A0 8E070038 */ lw $a3, 0x38($s0) +/* DB3364 802410A4 1040001A */ beqz $v0, .L80241110 +/* DB3368 802410A8 00000000 */ nop +/* DB336C 802410AC 8E060038 */ lw $a2, 0x38($s0) +/* DB3370 802410B0 8E2200D0 */ lw $v0, 0xd0($s1) +/* DB3374 802410B4 8E070040 */ lw $a3, 0x40($s0) +/* DB3378 802410B8 C44C0000 */ lwc1 $f12, ($v0) +/* DB337C 802410BC 46806320 */ cvt.s.w $f12, $f12 +/* DB3380 802410C0 C44E0008 */ lwc1 $f14, 8($v0) +/* DB3384 802410C4 0C00A7B5 */ jal dist2D +/* DB3388 802410C8 468073A0 */ cvt.s.w $f14, $f14 +/* DB338C 802410CC C6020018 */ lwc1 $f2, 0x18($s0) +/* DB3390 802410D0 4600103C */ c.lt.s $f2, $f0 +/* DB3394 802410D4 00000000 */ nop +/* DB3398 802410D8 4500000D */ bc1f .L80241110 +/* DB339C 802410DC E7A00034 */ swc1 $f0, 0x34($sp) +/* DB33A0 802410E0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* DB33A4 802410E4 8E2200D0 */ lw $v0, 0xd0($s1) +/* DB33A8 802410E8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* DB33AC 802410EC C4480000 */ lwc1 $f8, ($v0) +/* DB33B0 802410F0 46804220 */ cvt.s.w $f8, $f8 +/* DB33B4 802410F4 44064000 */ mfc1 $a2, $f8 +/* DB33B8 802410F8 C4480008 */ lwc1 $f8, 8($v0) +/* DB33BC 802410FC 46804220 */ cvt.s.w $f8, $f8 +/* DB33C0 80241100 44074000 */ mfc1 $a3, $f8 +/* DB33C4 80241104 0C00A720 */ jal atan2 +/* DB33C8 80241108 24140001 */ addiu $s4, $zero, 1 +/* DB33CC 8024110C E600000C */ swc1 $f0, 0xc($s0) +.L80241110: +/* DB33D0 80241110 8E2200D0 */ lw $v0, 0xd0($s1) +/* DB33D4 80241114 8C43000C */ lw $v1, 0xc($v0) +/* DB33D8 80241118 8C420010 */ lw $v0, 0x10($v0) +/* DB33DC 8024111C 00621825 */ or $v1, $v1, $v0 +/* DB33E0 80241120 00741825 */ or $v1, $v1, $s4 +/* DB33E4 80241124 10600008 */ beqz $v1, .L80241148 +/* DB33E8 80241128 00000000 */ nop +/* DB33EC 8024112C 8602008C */ lh $v0, 0x8c($s0) +/* DB33F0 80241130 14400031 */ bnez $v0, .L802411F8 +/* DB33F4 80241134 00000000 */ nop +/* DB33F8 80241138 8E050018 */ lw $a1, 0x18($s0) +/* DB33FC 8024113C 8E06000C */ lw $a2, 0xc($s0) +/* DB3400 80241140 0C00EA95 */ jal npc_move_heading +/* DB3404 80241144 0200202D */ daddu $a0, $s0, $zero +.L80241148: +/* DB3408 80241148 C600003C */ lwc1 $f0, 0x3c($s0) +/* DB340C 8024114C 3C014059 */ lui $at, 0x4059 +/* DB3410 80241150 44811800 */ mtc1 $at, $f3 +/* DB3414 80241154 44801000 */ mtc1 $zero, $f2 +/* DB3418 80241158 46000021 */ cvt.d.s $f0, $f0 +/* DB341C 8024115C 46220002 */ mul.d $f0, $f0, $f2 +/* DB3420 80241160 00000000 */ nop +/* DB3424 80241164 4620020D */ trunc.w.d $f8, $f0 +/* DB3428 80241168 E628007C */ swc1 $f8, 0x7c($s1) +/* DB342C 8024116C 8E420004 */ lw $v0, 4($s2) +/* DB3430 80241170 18400021 */ blez $v0, .L802411F8 +/* DB3434 80241174 00000000 */ nop +/* DB3438 80241178 8602008E */ lh $v0, 0x8e($s0) +/* DB343C 8024117C 9603008E */ lhu $v1, 0x8e($s0) +/* DB3440 80241180 18400005 */ blez $v0, .L80241198 +/* DB3444 80241184 2462FFFF */ addiu $v0, $v1, -1 +/* DB3448 80241188 A602008E */ sh $v0, 0x8e($s0) +/* DB344C 8024118C 00021400 */ sll $v0, $v0, 0x10 +/* DB3450 80241190 1C400019 */ bgtz $v0, .L802411F8 +/* DB3454 80241194 00000000 */ nop +.L80241198: +/* DB3458 80241198 240403E8 */ addiu $a0, $zero, 0x3e8 +/* DB345C 8024119C 24020002 */ addiu $v0, $zero, 2 +/* DB3460 802411A0 0C00A67F */ jal rand_int +/* DB3464 802411A4 AE620070 */ sw $v0, 0x70($s3) +/* DB3468 802411A8 3C035555 */ lui $v1, 0x5555 +/* DB346C 802411AC 34635556 */ ori $v1, $v1, 0x5556 +/* DB3470 802411B0 00430018 */ mult $v0, $v1 +/* DB3474 802411B4 000227C3 */ sra $a0, $v0, 0x1f +/* DB3478 802411B8 00004010 */ mfhi $t0 +/* DB347C 802411BC 01042023 */ subu $a0, $t0, $a0 +/* DB3480 802411C0 00041840 */ sll $v1, $a0, 1 +/* DB3484 802411C4 00641821 */ addu $v1, $v1, $a0 +/* DB3488 802411C8 00431023 */ subu $v0, $v0, $v1 +/* DB348C 802411CC 24430002 */ addiu $v1, $v0, 2 +/* DB3490 802411D0 AE630074 */ sw $v1, 0x74($s3) +/* DB3494 802411D4 8E42002C */ lw $v0, 0x2c($s2) +/* DB3498 802411D8 58400007 */ blezl $v0, .L802411F8 +/* DB349C 802411DC AE600070 */ sw $zero, 0x70($s3) +/* DB34A0 802411E0 8E420008 */ lw $v0, 8($s2) +/* DB34A4 802411E4 18400003 */ blez $v0, .L802411F4 +/* DB34A8 802411E8 28620003 */ slti $v0, $v1, 3 +/* DB34AC 802411EC 10400002 */ beqz $v0, .L802411F8 +/* DB34B0 802411F0 00000000 */ nop +.L802411F4: +/* DB34B4 802411F4 AE600070 */ sw $zero, 0x70($s3) +.L802411F8: +/* DB34B8 802411F8 8FBF0058 */ lw $ra, 0x58($sp) +/* DB34BC 802411FC 8FB50054 */ lw $s5, 0x54($sp) +/* DB34C0 80241200 8FB40050 */ lw $s4, 0x50($sp) +/* DB34C4 80241204 8FB3004C */ lw $s3, 0x4c($sp) +/* DB34C8 80241208 8FB20048 */ lw $s2, 0x48($sp) +/* DB34CC 8024120C 8FB10044 */ lw $s1, 0x44($sp) +/* DB34D0 80241210 8FB00040 */ lw $s0, 0x40($sp) +/* DB34D4 80241214 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* DB34D8 80241218 D7B80070 */ ldc1 $f24, 0x70($sp) +/* DB34DC 8024121C D7B60068 */ ldc1 $f22, 0x68($sp) +/* DB34E0 80241220 D7B40060 */ ldc1 $f20, 0x60($sp) +/* DB34E4 80241224 03E00008 */ jr $ra +/* DB34E8 80241228 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8.s deleted file mode 100644 index 20ebc80960..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416A8 -/* DB3968 802416A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB396C 802416AC AFB00010 */ sw $s0, 0x10($sp) -/* DB3970 802416B0 0080802D */ daddu $s0, $a0, $zero -/* DB3974 802416B4 AFBF0014 */ sw $ra, 0x14($sp) -/* DB3978 802416B8 8E020148 */ lw $v0, 0x148($s0) -/* DB397C 802416BC 0C00EABB */ jal get_npc_unsafe -/* DB3980 802416C0 84440008 */ lh $a0, 8($v0) -/* DB3984 802416C4 9443008E */ lhu $v1, 0x8e($v0) -/* DB3988 802416C8 C440003C */ lwc1 $f0, 0x3c($v0) -/* DB398C 802416CC 24640001 */ addiu $a0, $v1, 1 -/* DB3990 802416D0 00031C00 */ sll $v1, $v1, 0x10 -/* DB3994 802416D4 00031B83 */ sra $v1, $v1, 0xe -/* DB3998 802416D8 A444008E */ sh $a0, 0x8e($v0) -/* DB399C 802416DC 3C018024 */ lui $at, 0x8024 -/* DB39A0 802416E0 00230821 */ addu $at, $at, $v1 -/* DB39A4 802416E4 C4222F88 */ lwc1 $f2, 0x2f88($at) -/* DB39A8 802416E8 8443008E */ lh $v1, 0x8e($v0) -/* DB39AC 802416EC 46020000 */ add.s $f0, $f0, $f2 -/* DB39B0 802416F0 28630005 */ slti $v1, $v1, 5 -/* DB39B4 802416F4 14600003 */ bnez $v1, .L80241704 -/* DB39B8 802416F8 E440003C */ swc1 $f0, 0x3c($v0) -/* DB39BC 802416FC 2402000C */ addiu $v0, $zero, 0xc -/* DB39C0 80241700 AE020070 */ sw $v0, 0x70($s0) -.L80241704: -/* DB39C4 80241704 8FBF0014 */ lw $ra, 0x14($sp) -/* DB39C8 80241708 8FB00010 */ lw $s0, 0x10($sp) -/* DB39CC 8024170C 03E00008 */ jr $ra -/* DB39D0 80241710 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s new file mode 100644 index 0000000000..067a4ef3c3 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802416A8_DB3968.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416A8_DB3968 +/* DB3968 802416A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DB396C 802416AC AFB00010 */ sw $s0, 0x10($sp) +/* DB3970 802416B0 0080802D */ daddu $s0, $a0, $zero +/* DB3974 802416B4 AFBF0014 */ sw $ra, 0x14($sp) +/* DB3978 802416B8 8E020148 */ lw $v0, 0x148($s0) +/* DB397C 802416BC 0C00EABB */ jal get_npc_unsafe +/* DB3980 802416C0 84440008 */ lh $a0, 8($v0) +/* DB3984 802416C4 9443008E */ lhu $v1, 0x8e($v0) +/* DB3988 802416C8 C440003C */ lwc1 $f0, 0x3c($v0) +/* DB398C 802416CC 24640001 */ addiu $a0, $v1, 1 +/* DB3990 802416D0 00031C00 */ sll $v1, $v1, 0x10 +/* DB3994 802416D4 00031B83 */ sra $v1, $v1, 0xe +/* DB3998 802416D8 A444008E */ sh $a0, 0x8e($v0) +/* DB399C 802416DC 3C018024 */ lui $at, 0x8024 +/* DB39A0 802416E0 00230821 */ addu $at, $at, $v1 +/* DB39A4 802416E4 C4222F88 */ lwc1 $f2, 0x2f88($at) +/* DB39A8 802416E8 8443008E */ lh $v1, 0x8e($v0) +/* DB39AC 802416EC 46020000 */ add.s $f0, $f0, $f2 +/* DB39B0 802416F0 28630005 */ slti $v1, $v1, 5 +/* DB39B4 802416F4 14600003 */ bnez $v1, .L80241704 +/* DB39B8 802416F8 E440003C */ swc1 $f0, 0x3c($v0) +/* DB39BC 802416FC 2402000C */ addiu $v0, $zero, 0xc +/* DB39C0 80241700 AE020070 */ sw $v0, 0x70($s0) +.L80241704: +/* DB39C4 80241704 8FBF0014 */ lw $ra, 0x14($sp) +/* DB39C8 80241708 8FB00010 */ lw $s0, 0x10($sp) +/* DB39CC 8024170C 03E00008 */ jr $ra +/* DB39D0 80241710 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714.s deleted file mode 100644 index eea4be4f84..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241714 -/* DB39D4 80241714 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DB39D8 80241718 AFB3001C */ sw $s3, 0x1c($sp) -/* DB39DC 8024171C 0080982D */ daddu $s3, $a0, $zero -/* DB39E0 80241720 AFBF0020 */ sw $ra, 0x20($sp) -/* DB39E4 80241724 AFB20018 */ sw $s2, 0x18($sp) -/* DB39E8 80241728 AFB10014 */ sw $s1, 0x14($sp) -/* DB39EC 8024172C AFB00010 */ sw $s0, 0x10($sp) -/* DB39F0 80241730 8E720148 */ lw $s2, 0x148($s3) -/* DB39F4 80241734 86440008 */ lh $a0, 8($s2) -/* DB39F8 80241738 0C00EABB */ jal get_npc_unsafe -/* DB39FC 8024173C 00A0802D */ daddu $s0, $a1, $zero -/* DB3A00 80241740 0040882D */ daddu $s1, $v0, $zero -/* DB3A04 80241744 C6420080 */ lwc1 $f2, 0x80($s2) -/* DB3A08 80241748 468010A0 */ cvt.s.w $f2, $f2 -/* DB3A0C 8024174C 460010A1 */ cvt.d.s $f2, $f2 -/* DB3A10 80241750 C6400084 */ lwc1 $f0, 0x84($s2) -/* DB3A14 80241754 46800020 */ cvt.s.w $f0, $f0 -/* DB3A18 80241758 46000021 */ cvt.d.s $f0, $f0 -/* DB3A1C 8024175C 3C014059 */ lui $at, 0x4059 -/* DB3A20 80241760 44812800 */ mtc1 $at, $f5 -/* DB3A24 80241764 44802000 */ mtc1 $zero, $f4 -/* DB3A28 80241768 8E4200CC */ lw $v0, 0xcc($s2) -/* DB3A2C 8024176C C62C0038 */ lwc1 $f12, 0x38($s1) -/* DB3A30 80241770 C62E0040 */ lwc1 $f14, 0x40($s1) -/* DB3A34 80241774 46241083 */ div.d $f2, $f2, $f4 -/* DB3A38 80241778 462010A0 */ cvt.s.d $f2, $f2 -/* DB3A3C 8024177C 46240003 */ div.d $f0, $f0, $f4 -/* DB3A40 80241780 8C420020 */ lw $v0, 0x20($v0) -/* DB3A44 80241784 46200020 */ cvt.s.d $f0, $f0 -/* DB3A48 80241788 E622001C */ swc1 $f2, 0x1c($s1) -/* DB3A4C 8024178C E6200014 */ swc1 $f0, 0x14($s1) -/* DB3A50 80241790 AE220028 */ sw $v0, 0x28($s1) -/* DB3A54 80241794 C6000018 */ lwc1 $f0, 0x18($s0) -/* DB3A58 80241798 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DB3A5C 8024179C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DB3A60 802417A0 E6200018 */ swc1 $f0, 0x18($s1) -/* DB3A64 802417A4 8C460028 */ lw $a2, 0x28($v0) -/* DB3A68 802417A8 0C00A720 */ jal atan2 -/* DB3A6C 802417AC 8C470030 */ lw $a3, 0x30($v0) -/* DB3A70 802417B0 E620000C */ swc1 $f0, 0xc($s1) -/* DB3A74 802417B4 8E420018 */ lw $v0, 0x18($s2) -/* DB3A78 802417B8 AE400074 */ sw $zero, 0x74($s2) -/* DB3A7C 802417BC 9442002A */ lhu $v0, 0x2a($v0) -/* DB3A80 802417C0 30420002 */ andi $v0, $v0, 2 -/* DB3A84 802417C4 10400005 */ beqz $v0, .L802417DC -/* DB3A88 802417C8 24020003 */ addiu $v0, $zero, 3 -/* DB3A8C 802417CC A622008E */ sh $v0, 0x8e($s1) -/* DB3A90 802417D0 2402000D */ addiu $v0, $zero, 0xd -/* DB3A94 802417D4 0809060B */ j .L8024182C -/* DB3A98 802417D8 AE620070 */ sw $v0, 0x70($s3) -.L802417DC: -/* DB3A9C 802417DC 24030001 */ addiu $v1, $zero, 1 -/* DB3AA0 802417E0 2402000E */ addiu $v0, $zero, 0xe -/* DB3AA4 802417E4 A623008E */ sh $v1, 0x8e($s1) -/* DB3AA8 802417E8 AE620070 */ sw $v0, 0x70($s3) -/* DB3AAC 802417EC C6200038 */ lwc1 $f0, 0x38($s1) -/* DB3AB0 802417F0 4600018D */ trunc.w.s $f6, $f0 -/* DB3AB4 802417F4 44023000 */ mfc1 $v0, $f6 -/* DB3AB8 802417F8 00000000 */ nop -/* DB3ABC 802417FC A6420010 */ sh $v0, 0x10($s2) -/* DB3AC0 80241800 C620003C */ lwc1 $f0, 0x3c($s1) -/* DB3AC4 80241804 4600018D */ trunc.w.s $f6, $f0 -/* DB3AC8 80241808 44023000 */ mfc1 $v0, $f6 -/* DB3ACC 8024180C 00000000 */ nop -/* DB3AD0 80241810 A6420012 */ sh $v0, 0x12($s2) -/* DB3AD4 80241814 C6200040 */ lwc1 $f0, 0x40($s1) -/* DB3AD8 80241818 A2430007 */ sb $v1, 7($s2) -/* DB3ADC 8024181C 4600018D */ trunc.w.s $f6, $f0 -/* DB3AE0 80241820 44023000 */ mfc1 $v0, $f6 -/* DB3AE4 80241824 00000000 */ nop -/* DB3AE8 80241828 A6420014 */ sh $v0, 0x14($s2) -.L8024182C: -/* DB3AEC 8024182C 8FBF0020 */ lw $ra, 0x20($sp) -/* DB3AF0 80241830 8FB3001C */ lw $s3, 0x1c($sp) -/* DB3AF4 80241834 8FB20018 */ lw $s2, 0x18($sp) -/* DB3AF8 80241838 8FB10014 */ lw $s1, 0x14($sp) -/* DB3AFC 8024183C 8FB00010 */ lw $s0, 0x10($sp) -/* DB3B00 80241840 03E00008 */ jr $ra -/* DB3B04 80241844 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s new file mode 100644 index 0000000000..5faea0435a --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241714_DB39D4.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241714_DB39D4 +/* DB39D4 80241714 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* DB39D8 80241718 AFB3001C */ sw $s3, 0x1c($sp) +/* DB39DC 8024171C 0080982D */ daddu $s3, $a0, $zero +/* DB39E0 80241720 AFBF0020 */ sw $ra, 0x20($sp) +/* DB39E4 80241724 AFB20018 */ sw $s2, 0x18($sp) +/* DB39E8 80241728 AFB10014 */ sw $s1, 0x14($sp) +/* DB39EC 8024172C AFB00010 */ sw $s0, 0x10($sp) +/* DB39F0 80241730 8E720148 */ lw $s2, 0x148($s3) +/* DB39F4 80241734 86440008 */ lh $a0, 8($s2) +/* DB39F8 80241738 0C00EABB */ jal get_npc_unsafe +/* DB39FC 8024173C 00A0802D */ daddu $s0, $a1, $zero +/* DB3A00 80241740 0040882D */ daddu $s1, $v0, $zero +/* DB3A04 80241744 C6420080 */ lwc1 $f2, 0x80($s2) +/* DB3A08 80241748 468010A0 */ cvt.s.w $f2, $f2 +/* DB3A0C 8024174C 460010A1 */ cvt.d.s $f2, $f2 +/* DB3A10 80241750 C6400084 */ lwc1 $f0, 0x84($s2) +/* DB3A14 80241754 46800020 */ cvt.s.w $f0, $f0 +/* DB3A18 80241758 46000021 */ cvt.d.s $f0, $f0 +/* DB3A1C 8024175C 3C014059 */ lui $at, 0x4059 +/* DB3A20 80241760 44812800 */ mtc1 $at, $f5 +/* DB3A24 80241764 44802000 */ mtc1 $zero, $f4 +/* DB3A28 80241768 8E4200CC */ lw $v0, 0xcc($s2) +/* DB3A2C 8024176C C62C0038 */ lwc1 $f12, 0x38($s1) +/* DB3A30 80241770 C62E0040 */ lwc1 $f14, 0x40($s1) +/* DB3A34 80241774 46241083 */ div.d $f2, $f2, $f4 +/* DB3A38 80241778 462010A0 */ cvt.s.d $f2, $f2 +/* DB3A3C 8024177C 46240003 */ div.d $f0, $f0, $f4 +/* DB3A40 80241780 8C420020 */ lw $v0, 0x20($v0) +/* DB3A44 80241784 46200020 */ cvt.s.d $f0, $f0 +/* DB3A48 80241788 E622001C */ swc1 $f2, 0x1c($s1) +/* DB3A4C 8024178C E6200014 */ swc1 $f0, 0x14($s1) +/* DB3A50 80241790 AE220028 */ sw $v0, 0x28($s1) +/* DB3A54 80241794 C6000018 */ lwc1 $f0, 0x18($s0) +/* DB3A58 80241798 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DB3A5C 8024179C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DB3A60 802417A0 E6200018 */ swc1 $f0, 0x18($s1) +/* DB3A64 802417A4 8C460028 */ lw $a2, 0x28($v0) +/* DB3A68 802417A8 0C00A720 */ jal atan2 +/* DB3A6C 802417AC 8C470030 */ lw $a3, 0x30($v0) +/* DB3A70 802417B0 E620000C */ swc1 $f0, 0xc($s1) +/* DB3A74 802417B4 8E420018 */ lw $v0, 0x18($s2) +/* DB3A78 802417B8 AE400074 */ sw $zero, 0x74($s2) +/* DB3A7C 802417BC 9442002A */ lhu $v0, 0x2a($v0) +/* DB3A80 802417C0 30420002 */ andi $v0, $v0, 2 +/* DB3A84 802417C4 10400005 */ beqz $v0, .L802417DC +/* DB3A88 802417C8 24020003 */ addiu $v0, $zero, 3 +/* DB3A8C 802417CC A622008E */ sh $v0, 0x8e($s1) +/* DB3A90 802417D0 2402000D */ addiu $v0, $zero, 0xd +/* DB3A94 802417D4 0809060B */ j .L8024182C +/* DB3A98 802417D8 AE620070 */ sw $v0, 0x70($s3) +.L802417DC: +/* DB3A9C 802417DC 24030001 */ addiu $v1, $zero, 1 +/* DB3AA0 802417E0 2402000E */ addiu $v0, $zero, 0xe +/* DB3AA4 802417E4 A623008E */ sh $v1, 0x8e($s1) +/* DB3AA8 802417E8 AE620070 */ sw $v0, 0x70($s3) +/* DB3AAC 802417EC C6200038 */ lwc1 $f0, 0x38($s1) +/* DB3AB0 802417F0 4600018D */ trunc.w.s $f6, $f0 +/* DB3AB4 802417F4 44023000 */ mfc1 $v0, $f6 +/* DB3AB8 802417F8 00000000 */ nop +/* DB3ABC 802417FC A6420010 */ sh $v0, 0x10($s2) +/* DB3AC0 80241800 C620003C */ lwc1 $f0, 0x3c($s1) +/* DB3AC4 80241804 4600018D */ trunc.w.s $f6, $f0 +/* DB3AC8 80241808 44023000 */ mfc1 $v0, $f6 +/* DB3ACC 8024180C 00000000 */ nop +/* DB3AD0 80241810 A6420012 */ sh $v0, 0x12($s2) +/* DB3AD4 80241814 C6200040 */ lwc1 $f0, 0x40($s1) +/* DB3AD8 80241818 A2430007 */ sb $v1, 7($s2) +/* DB3ADC 8024181C 4600018D */ trunc.w.s $f6, $f0 +/* DB3AE0 80241820 44023000 */ mfc1 $v0, $f6 +/* DB3AE4 80241824 00000000 */ nop +/* DB3AE8 80241828 A6420014 */ sh $v0, 0x14($s2) +.L8024182C: +/* DB3AEC 8024182C 8FBF0020 */ lw $ra, 0x20($sp) +/* DB3AF0 80241830 8FB3001C */ lw $s3, 0x1c($sp) +/* DB3AF4 80241834 8FB20018 */ lw $s2, 0x18($sp) +/* DB3AF8 80241838 8FB10014 */ lw $s1, 0x14($sp) +/* DB3AFC 8024183C 8FB00010 */ lw $s0, 0x10($sp) +/* DB3B00 80241840 03E00008 */ jr $ra +/* DB3B04 80241844 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C.s deleted file mode 100644 index d6047552ad..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C3C -/* DB3EFC 80241C3C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DB3F00 80241C40 AFB00028 */ sw $s0, 0x28($sp) -/* DB3F04 80241C44 00A0802D */ daddu $s0, $a1, $zero -/* DB3F08 80241C48 AFB1002C */ sw $s1, 0x2c($sp) -/* DB3F0C 80241C4C 00C0882D */ daddu $s1, $a2, $zero -/* DB3F10 80241C50 AFBF0034 */ sw $ra, 0x34($sp) -/* DB3F14 80241C54 AFB20030 */ sw $s2, 0x30($sp) -/* DB3F18 80241C58 AE200070 */ sw $zero, 0x70($s1) -/* DB3F1C 80241C5C 8C830000 */ lw $v1, ($a0) -/* DB3F20 80241C60 2402FDFF */ addiu $v0, $zero, -0x201 -/* DB3F24 80241C64 A480008E */ sh $zero, 0x8e($a0) -/* DB3F28 80241C68 00621824 */ and $v1, $v1, $v0 -/* DB3F2C 80241C6C 34650800 */ ori $a1, $v1, 0x800 -/* DB3F30 80241C70 AC850000 */ sw $a1, ($a0) -/* DB3F34 80241C74 8E0200D0 */ lw $v0, 0xd0($s0) -/* DB3F38 80241C78 8C420034 */ lw $v0, 0x34($v0) -/* DB3F3C 80241C7C 10400003 */ beqz $v0, .L80241C8C -/* DB3F40 80241C80 00E0902D */ daddu $s2, $a3, $zero -/* DB3F44 80241C84 08090725 */ j .L80241C94 -/* DB3F48 80241C88 34620808 */ ori $v0, $v1, 0x808 -.L80241C8C: -/* DB3F4C 80241C8C 2402FFF7 */ addiu $v0, $zero, -9 -/* DB3F50 80241C90 00A21024 */ and $v0, $a1, $v0 -.L80241C94: -/* DB3F54 80241C94 AC820000 */ sw $v0, ($a0) -/* DB3F58 80241C98 27A20024 */ addiu $v0, $sp, 0x24 -/* DB3F5C 80241C9C 27A50018 */ addiu $a1, $sp, 0x18 -/* DB3F60 80241CA0 C4800038 */ lwc1 $f0, 0x38($a0) -/* DB3F64 80241CA4 C482003C */ lwc1 $f2, 0x3c($a0) -/* DB3F68 80241CA8 C4840040 */ lwc1 $f4, 0x40($a0) -/* DB3F6C 80241CAC 3C01447A */ lui $at, 0x447a -/* DB3F70 80241CB0 44813000 */ mtc1 $at, $f6 -/* DB3F74 80241CB4 27A6001C */ addiu $a2, $sp, 0x1c -/* DB3F78 80241CB8 E7A00018 */ swc1 $f0, 0x18($sp) -/* DB3F7C 80241CBC E7A2001C */ swc1 $f2, 0x1c($sp) -/* DB3F80 80241CC0 E7A40020 */ swc1 $f4, 0x20($sp) -/* DB3F84 80241CC4 E7A60024 */ swc1 $f6, 0x24($sp) -/* DB3F88 80241CC8 AFA20010 */ sw $v0, 0x10($sp) -/* DB3F8C 80241CCC 8C840080 */ lw $a0, 0x80($a0) -/* DB3F90 80241CD0 0C0372DF */ jal func_800DCB7C -/* DB3F94 80241CD4 27A70020 */ addiu $a3, $sp, 0x20 -/* DB3F98 80241CD8 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DB3F9C 80241CDC 3C014059 */ lui $at, 0x4059 -/* DB3FA0 80241CE0 44812800 */ mtc1 $at, $f5 -/* DB3FA4 80241CE4 44802000 */ mtc1 $zero, $f4 -/* DB3FA8 80241CE8 460010A1 */ cvt.d.s $f2, $f2 -/* DB3FAC 80241CEC 46241082 */ mul.d $f2, $f2, $f4 -/* DB3FB0 80241CF0 00000000 */ nop -/* DB3FB4 80241CF4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DB3FB8 80241CF8 46000021 */ cvt.d.s $f0, $f0 -/* DB3FBC 80241CFC 46240002 */ mul.d $f0, $f0, $f4 -/* DB3FC0 80241D00 00000000 */ nop -/* DB3FC4 80241D04 3C013FE0 */ lui $at, 0x3fe0 -/* DB3FC8 80241D08 44812800 */ mtc1 $at, $f5 -/* DB3FCC 80241D0C 44802000 */ mtc1 $zero, $f4 -/* DB3FD0 80241D10 00000000 */ nop -/* DB3FD4 80241D14 46241080 */ add.d $f2, $f2, $f4 -/* DB3FD8 80241D18 AE000074 */ sw $zero, 0x74($s0) -/* DB3FDC 80241D1C 46240000 */ add.d $f0, $f0, $f4 -/* DB3FE0 80241D20 AE000090 */ sw $zero, 0x90($s0) -/* DB3FE4 80241D24 4620120D */ trunc.w.d $f8, $f2 -/* DB3FE8 80241D28 E6080078 */ swc1 $f8, 0x78($s0) -/* DB3FEC 80241D2C 4620020D */ trunc.w.d $f8, $f0 -/* DB3FF0 80241D30 E6080088 */ swc1 $f8, 0x88($s0) -/* DB3FF4 80241D34 8E420014 */ lw $v0, 0x14($s2) -/* DB3FF8 80241D38 AE220074 */ sw $v0, 0x74($s1) -/* DB3FFC 80241D3C 8E0200B0 */ lw $v0, 0xb0($s0) -/* DB4000 80241D40 34420010 */ ori $v0, $v0, 0x10 -/* DB4004 80241D44 AE0200B0 */ sw $v0, 0xb0($s0) -/* DB4008 80241D48 8FBF0034 */ lw $ra, 0x34($sp) -/* DB400C 80241D4C 8FB20030 */ lw $s2, 0x30($sp) -/* DB4010 80241D50 8FB1002C */ lw $s1, 0x2c($sp) -/* DB4014 80241D54 8FB00028 */ lw $s0, 0x28($sp) -/* DB4018 80241D58 03E00008 */ jr $ra -/* DB401C 80241D5C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s new file mode 100644 index 0000000000..f50179b618 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241C3C_DB3EFC.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C3C_DB3EFC +/* DB3EFC 80241C3C 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* DB3F00 80241C40 AFB00028 */ sw $s0, 0x28($sp) +/* DB3F04 80241C44 00A0802D */ daddu $s0, $a1, $zero +/* DB3F08 80241C48 AFB1002C */ sw $s1, 0x2c($sp) +/* DB3F0C 80241C4C 00C0882D */ daddu $s1, $a2, $zero +/* DB3F10 80241C50 AFBF0034 */ sw $ra, 0x34($sp) +/* DB3F14 80241C54 AFB20030 */ sw $s2, 0x30($sp) +/* DB3F18 80241C58 AE200070 */ sw $zero, 0x70($s1) +/* DB3F1C 80241C5C 8C830000 */ lw $v1, ($a0) +/* DB3F20 80241C60 2402FDFF */ addiu $v0, $zero, -0x201 +/* DB3F24 80241C64 A480008E */ sh $zero, 0x8e($a0) +/* DB3F28 80241C68 00621824 */ and $v1, $v1, $v0 +/* DB3F2C 80241C6C 34650800 */ ori $a1, $v1, 0x800 +/* DB3F30 80241C70 AC850000 */ sw $a1, ($a0) +/* DB3F34 80241C74 8E0200D0 */ lw $v0, 0xd0($s0) +/* DB3F38 80241C78 8C420034 */ lw $v0, 0x34($v0) +/* DB3F3C 80241C7C 10400003 */ beqz $v0, .L80241C8C +/* DB3F40 80241C80 00E0902D */ daddu $s2, $a3, $zero +/* DB3F44 80241C84 08090725 */ j .L80241C94 +/* DB3F48 80241C88 34620808 */ ori $v0, $v1, 0x808 +.L80241C8C: +/* DB3F4C 80241C8C 2402FFF7 */ addiu $v0, $zero, -9 +/* DB3F50 80241C90 00A21024 */ and $v0, $a1, $v0 +.L80241C94: +/* DB3F54 80241C94 AC820000 */ sw $v0, ($a0) +/* DB3F58 80241C98 27A20024 */ addiu $v0, $sp, 0x24 +/* DB3F5C 80241C9C 27A50018 */ addiu $a1, $sp, 0x18 +/* DB3F60 80241CA0 C4800038 */ lwc1 $f0, 0x38($a0) +/* DB3F64 80241CA4 C482003C */ lwc1 $f2, 0x3c($a0) +/* DB3F68 80241CA8 C4840040 */ lwc1 $f4, 0x40($a0) +/* DB3F6C 80241CAC 3C01447A */ lui $at, 0x447a +/* DB3F70 80241CB0 44813000 */ mtc1 $at, $f6 +/* DB3F74 80241CB4 27A6001C */ addiu $a2, $sp, 0x1c +/* DB3F78 80241CB8 E7A00018 */ swc1 $f0, 0x18($sp) +/* DB3F7C 80241CBC E7A2001C */ swc1 $f2, 0x1c($sp) +/* DB3F80 80241CC0 E7A40020 */ swc1 $f4, 0x20($sp) +/* DB3F84 80241CC4 E7A60024 */ swc1 $f6, 0x24($sp) +/* DB3F88 80241CC8 AFA20010 */ sw $v0, 0x10($sp) +/* DB3F8C 80241CCC 8C840080 */ lw $a0, 0x80($a0) +/* DB3F90 80241CD0 0C0372DF */ jal func_800DCB7C +/* DB3F94 80241CD4 27A70020 */ addiu $a3, $sp, 0x20 +/* DB3F98 80241CD8 C7A20024 */ lwc1 $f2, 0x24($sp) +/* DB3F9C 80241CDC 3C014059 */ lui $at, 0x4059 +/* DB3FA0 80241CE0 44812800 */ mtc1 $at, $f5 +/* DB3FA4 80241CE4 44802000 */ mtc1 $zero, $f4 +/* DB3FA8 80241CE8 460010A1 */ cvt.d.s $f2, $f2 +/* DB3FAC 80241CEC 46241082 */ mul.d $f2, $f2, $f4 +/* DB3FB0 80241CF0 00000000 */ nop +/* DB3FB4 80241CF4 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* DB3FB8 80241CF8 46000021 */ cvt.d.s $f0, $f0 +/* DB3FBC 80241CFC 46240002 */ mul.d $f0, $f0, $f4 +/* DB3FC0 80241D00 00000000 */ nop +/* DB3FC4 80241D04 3C013FE0 */ lui $at, 0x3fe0 +/* DB3FC8 80241D08 44812800 */ mtc1 $at, $f5 +/* DB3FCC 80241D0C 44802000 */ mtc1 $zero, $f4 +/* DB3FD0 80241D10 00000000 */ nop +/* DB3FD4 80241D14 46241080 */ add.d $f2, $f2, $f4 +/* DB3FD8 80241D18 AE000074 */ sw $zero, 0x74($s0) +/* DB3FDC 80241D1C 46240000 */ add.d $f0, $f0, $f4 +/* DB3FE0 80241D20 AE000090 */ sw $zero, 0x90($s0) +/* DB3FE4 80241D24 4620120D */ trunc.w.d $f8, $f2 +/* DB3FE8 80241D28 E6080078 */ swc1 $f8, 0x78($s0) +/* DB3FEC 80241D2C 4620020D */ trunc.w.d $f8, $f0 +/* DB3FF0 80241D30 E6080088 */ swc1 $f8, 0x88($s0) +/* DB3FF4 80241D34 8E420014 */ lw $v0, 0x14($s2) +/* DB3FF8 80241D38 AE220074 */ sw $v0, 0x74($s1) +/* DB3FFC 80241D3C 8E0200B0 */ lw $v0, 0xb0($s0) +/* DB4000 80241D40 34420010 */ ori $v0, $v0, 0x10 +/* DB4004 80241D44 AE0200B0 */ sw $v0, 0xb0($s0) +/* DB4008 80241D48 8FBF0034 */ lw $ra, 0x34($sp) +/* DB400C 80241D4C 8FB20030 */ lw $s2, 0x30($sp) +/* DB4010 80241D50 8FB1002C */ lw $s1, 0x2c($sp) +/* DB4014 80241D54 8FB00028 */ lw $s0, 0x28($sp) +/* DB4018 80241D58 03E00008 */ jr $ra +/* DB401C 80241D5C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s index eee440545e..be38ea0d45 100644 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80241D60_DB4020.s @@ -46,7 +46,7 @@ glabel func_80241D60_DB4020 /* DB40C4 80241E04 02A0202D */ daddu $a0, $s5, $zero /* DB40C8 80241E08 0240282D */ daddu $a1, $s2, $zero /* DB40CC 80241E0C 0280302D */ daddu $a2, $s4, $zero -/* DB40D0 80241E10 0C09070F */ jal func_80241C3C +/* DB40D0 80241E10 0C09070F */ jal func_80241C3C_DB3EFC /* DB40D4 80241E14 0200382D */ daddu $a3, $s0, $zero .L80241E18: /* DB40D8 80241E18 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_80241D60_DB4020 /* DB4128 80241E68 00000000 */ nop /* DB412C 80241E6C 0280202D */ daddu $a0, $s4, $zero /* DB4130 80241E70 0200282D */ daddu $a1, $s0, $zero -/* DB4134 80241E74 0C090295 */ jal func_80240A54 +/* DB4134 80241E74 0C090295 */ jal func_80240A54_DB2D14 /* DB4138 80241E78 0260302D */ daddu $a2, $s3, $zero /* DB413C 80241E7C 0280202D */ daddu $a0, $s4, $zero /* DB4140 80241E80 0200282D */ daddu $a1, $s0, $zero -/* DB4144 80241E84 0C090301 */ jal func_80240C04 +/* DB4144 80241E84 0C090301 */ jal func_80240C04_DB2EC4 /* DB4148 80241E88 0260302D */ daddu $a2, $s3, $zero /* DB414C 80241E8C 080907CA */ j .L80241F28 /* DB4150 80241E90 0000102D */ daddu $v0, $zero, $zero /* DB4154 80241E94 0280202D */ daddu $a0, $s4, $zero /* DB4158 80241E98 0200282D */ daddu $a1, $s0, $zero -/* DB415C 80241E9C 0C09048B */ jal func_8024122C +/* DB415C 80241E9C 0C09048B */ jal func_8024122C_DB34EC /* DB4160 80241EA0 0260302D */ daddu $a2, $s3, $zero /* DB4164 80241EA4 0280202D */ daddu $a0, $s4, $zero /* DB4168 80241EA8 0200282D */ daddu $a1, $s0, $zero -/* DB416C 80241EAC 0C0904BB */ jal func_802412EC +/* DB416C 80241EAC 0C0904BB */ jal func_802412EC_DB35AC /* DB4170 80241EB0 0260302D */ daddu $a2, $s3, $zero /* DB4174 80241EB4 080907CA */ j .L80241F28 /* DB4178 80241EB8 0000102D */ daddu $v0, $zero, $zero /* DB417C 80241EBC 0280202D */ daddu $a0, $s4, $zero /* DB4180 80241EC0 0200282D */ daddu $a1, $s0, $zero -/* DB4184 80241EC4 0C09058C */ jal func_80241630 +/* DB4184 80241EC4 0C09058C */ jal func_80241630_DB38F0 /* DB4188 80241EC8 0260302D */ daddu $a2, $s3, $zero /* DB418C 80241ECC 0280202D */ daddu $a0, $s4, $zero /* DB4190 80241ED0 0200282D */ daddu $a1, $s0, $zero -/* DB4194 80241ED4 0C0905AA */ jal func_802416A8 +/* DB4194 80241ED4 0C0905AA */ jal func_802416A8_DB3968 /* DB4198 80241ED8 0260302D */ daddu $a2, $s3, $zero /* DB419C 80241EDC 080907CA */ j .L80241F28 /* DB41A0 80241EE0 0000102D */ daddu $v0, $zero, $zero /* DB41A4 80241EE4 0280202D */ daddu $a0, $s4, $zero /* DB41A8 80241EE8 0200282D */ daddu $a1, $s0, $zero -/* DB41AC 80241EEC 0C0905C5 */ jal func_80241714 +/* DB41AC 80241EEC 0C0905C5 */ jal func_80241714_DB39D4 /* DB41B0 80241EF0 0260302D */ daddu $a2, $s3, $zero /* DB41B4 80241EF4 080907CA */ j .L80241F28 /* DB41B8 80241EF8 0000102D */ daddu $v0, $zero, $zero /* DB41BC 80241EFC 0280202D */ daddu $a0, $s4, $zero /* DB41C0 80241F00 0200282D */ daddu $a1, $s0, $zero -/* DB41C4 80241F04 0C090612 */ jal func_80241848 +/* DB41C4 80241F04 0C090612 */ jal func_80241848_DB3B08 /* DB41C8 80241F08 0260302D */ daddu $a2, $s3, $zero /* DB41CC 80241F0C 080907CA */ j .L80241F28 /* DB41D0 80241F10 0000102D */ daddu $v0, $zero, $zero /* DB41D4 80241F14 0280202D */ daddu $a0, $s4, $zero /* DB41D8 80241F18 0200282D */ daddu $a1, $s0, $zero -/* DB41DC 80241F1C 0C09062B */ jal func_802418AC +/* DB41DC 80241F1C 0C09062B */ jal func_802418AC_DB3B6C /* DB41E0 80241F20 0260302D */ daddu $a2, $s3, $zero .L80241F24: /* DB41E4 80241F24 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204.s deleted file mode 100644 index 88a66f327f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242204 -/* DB44C4 80242204 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB44C8 80242208 AFBF0010 */ sw $ra, 0x10($sp) -/* DB44CC 8024220C 8C82000C */ lw $v0, 0xc($a0) -/* DB44D0 80242210 0C0B1EAF */ jal get_variable -/* DB44D4 80242214 8C450000 */ lw $a1, ($v0) -/* DB44D8 80242218 0040182D */ daddu $v1, $v0, $zero -/* DB44DC 8024221C 10600012 */ beqz $v1, .L80242268 -/* DB44E0 80242220 0000202D */ daddu $a0, $zero, $zero -/* DB44E4 80242224 8C620000 */ lw $v0, ($v1) -/* DB44E8 80242228 5040000A */ beql $v0, $zero, .L80242254 -/* DB44EC 8024222C 00041080 */ sll $v0, $a0, 2 -/* DB44F0 80242230 3C058024 */ lui $a1, 0x8024 -/* DB44F4 80242234 24A55650 */ addiu $a1, $a1, 0x5650 -.L80242238: -/* DB44F8 80242238 24630004 */ addiu $v1, $v1, 4 -/* DB44FC 8024223C 24840001 */ addiu $a0, $a0, 1 -/* DB4500 80242240 ACA20000 */ sw $v0, ($a1) -/* DB4504 80242244 8C620000 */ lw $v0, ($v1) -/* DB4508 80242248 1440FFFB */ bnez $v0, .L80242238 -/* DB450C 8024224C 24A50004 */ addiu $a1, $a1, 4 -/* DB4510 80242250 00041080 */ sll $v0, $a0, 2 -.L80242254: -/* DB4514 80242254 3C018024 */ lui $at, 0x8024 -/* DB4518 80242258 00220821 */ addu $at, $at, $v0 -/* DB451C 8024225C AC205650 */ sw $zero, 0x5650($at) -/* DB4520 80242260 080908A4 */ j .L80242290 -/* DB4524 80242264 00000000 */ nop -.L80242268: -/* DB4528 80242268 3C038024 */ lui $v1, 0x8024 -/* DB452C 8024226C 24635650 */ addiu $v1, $v1, 0x5650 -/* DB4530 80242270 0060282D */ daddu $a1, $v1, $zero -.L80242274: -/* DB4534 80242274 24820080 */ addiu $v0, $a0, 0x80 -/* DB4538 80242278 AC620000 */ sw $v0, ($v1) -/* DB453C 8024227C 24630004 */ addiu $v1, $v1, 4 -/* DB4540 80242280 24840001 */ addiu $a0, $a0, 1 -/* DB4544 80242284 2882005B */ slti $v0, $a0, 0x5b -/* DB4548 80242288 1440FFFA */ bnez $v0, .L80242274 -/* DB454C 8024228C ACA0016C */ sw $zero, 0x16c($a1) -.L80242290: -/* DB4550 80242290 8FBF0010 */ lw $ra, 0x10($sp) -/* DB4554 80242294 24020002 */ addiu $v0, $zero, 2 -/* DB4558 80242298 03E00008 */ jr $ra -/* DB455C 8024229C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s new file mode 100644 index 0000000000..7d4d7f99fa --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242204_DB44C4.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242204_DB44C4 +/* DB44C4 80242204 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DB44C8 80242208 AFBF0010 */ sw $ra, 0x10($sp) +/* DB44CC 8024220C 8C82000C */ lw $v0, 0xc($a0) +/* DB44D0 80242210 0C0B1EAF */ jal get_variable +/* DB44D4 80242214 8C450000 */ lw $a1, ($v0) +/* DB44D8 80242218 0040182D */ daddu $v1, $v0, $zero +/* DB44DC 8024221C 10600012 */ beqz $v1, .L80242268 +/* DB44E0 80242220 0000202D */ daddu $a0, $zero, $zero +/* DB44E4 80242224 8C620000 */ lw $v0, ($v1) +/* DB44E8 80242228 5040000A */ beql $v0, $zero, .L80242254 +/* DB44EC 8024222C 00041080 */ sll $v0, $a0, 2 +/* DB44F0 80242230 3C058024 */ lui $a1, 0x8024 +/* DB44F4 80242234 24A55650 */ addiu $a1, $a1, 0x5650 +.L80242238: +/* DB44F8 80242238 24630004 */ addiu $v1, $v1, 4 +/* DB44FC 8024223C 24840001 */ addiu $a0, $a0, 1 +/* DB4500 80242240 ACA20000 */ sw $v0, ($a1) +/* DB4504 80242244 8C620000 */ lw $v0, ($v1) +/* DB4508 80242248 1440FFFB */ bnez $v0, .L80242238 +/* DB450C 8024224C 24A50004 */ addiu $a1, $a1, 4 +/* DB4510 80242250 00041080 */ sll $v0, $a0, 2 +.L80242254: +/* DB4514 80242254 3C018024 */ lui $at, 0x8024 +/* DB4518 80242258 00220821 */ addu $at, $at, $v0 +/* DB451C 8024225C AC205650 */ sw $zero, 0x5650($at) +/* DB4520 80242260 080908A4 */ j .L80242290 +/* DB4524 80242264 00000000 */ nop +.L80242268: +/* DB4528 80242268 3C038024 */ lui $v1, 0x8024 +/* DB452C 8024226C 24635650 */ addiu $v1, $v1, 0x5650 +/* DB4530 80242270 0060282D */ daddu $a1, $v1, $zero +.L80242274: +/* DB4534 80242274 24820080 */ addiu $v0, $a0, 0x80 +/* DB4538 80242278 AC620000 */ sw $v0, ($v1) +/* DB453C 8024227C 24630004 */ addiu $v1, $v1, 4 +/* DB4540 80242280 24840001 */ addiu $a0, $a0, 1 +/* DB4544 80242284 2882005B */ slti $v0, $a0, 0x5b +/* DB4548 80242288 1440FFFA */ bnez $v0, .L80242274 +/* DB454C 8024228C ACA0016C */ sw $zero, 0x16c($a1) +.L80242290: +/* DB4550 80242290 8FBF0010 */ lw $ra, 0x10($sp) +/* DB4554 80242294 24020002 */ addiu $v0, $zero, 2 +/* DB4558 80242298 03E00008 */ jr $ra +/* DB455C 8024229C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328.s deleted file mode 100644 index 721e865899..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242328 -/* DB45E8 80242328 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB45EC 8024232C AFB00018 */ sw $s0, 0x18($sp) -/* DB45F0 80242330 0080802D */ daddu $s0, $a0, $zero -/* DB45F4 80242334 3C03800B */ lui $v1, %hi(gCameras) -/* DB45F8 80242338 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DB45FC 8024233C 0060202D */ daddu $a0, $v1, $zero -/* DB4600 80242340 10A00005 */ beqz $a1, .L80242358 -/* DB4604 80242344 AFBF001C */ sw $ra, 0x1c($sp) -/* DB4608 80242348 94620000 */ lhu $v0, ($v1) -/* DB460C 8024234C 34420008 */ ori $v0, $v0, 8 -/* DB4610 80242350 A4620000 */ sh $v0, ($v1) -/* DB4614 80242354 AE000070 */ sw $zero, 0x70($s0) -.L80242358: -/* DB4618 80242358 C6000070 */ lwc1 $f0, 0x70($s0) -/* DB461C 8024235C 3C014120 */ lui $at, 0x4120 -/* DB4620 80242360 44811000 */ mtc1 $at, $f2 -/* DB4624 80242364 00000000 */ nop -/* DB4628 80242368 46020000 */ add.s $f0, $f0, $f2 -/* DB462C 8024236C 3C01BF80 */ lui $at, 0xbf80 -/* DB4630 80242370 44811000 */ mtc1 $at, $f2 -/* DB4634 80242374 E6000070 */ swc1 $f0, 0x70($s0) -/* DB4638 80242378 44800000 */ mtc1 $zero, $f0 -/* DB463C 8024237C 24840194 */ addiu $a0, $a0, 0x194 -/* DB4640 80242380 E7A20010 */ swc1 $f2, 0x10($sp) -/* DB4644 80242384 44060000 */ mfc1 $a2, $f0 -/* DB4648 80242388 8E050070 */ lw $a1, 0x70($s0) -/* DB464C 8024238C 0C019EC8 */ jal guRotateF -/* DB4650 80242390 00C0382D */ daddu $a3, $a2, $zero -/* DB4654 80242394 C6000070 */ lwc1 $f0, 0x70($s0) -/* DB4658 80242398 3C018024 */ lui $at, 0x8024 -/* DB465C 8024239C D4225648 */ ldc1 $f2, 0x5648($at) -/* DB4660 802423A0 46000021 */ cvt.d.s $f0, $f0 -/* DB4664 802423A4 4620103E */ c.le.d $f2, $f0 -/* DB4668 802423A8 00000000 */ nop -/* DB466C 802423AC 45010002 */ bc1t .L802423B8 -/* DB4670 802423B0 24020002 */ addiu $v0, $zero, 2 -/* DB4674 802423B4 0000102D */ daddu $v0, $zero, $zero -.L802423B8: -/* DB4678 802423B8 8FBF001C */ lw $ra, 0x1c($sp) -/* DB467C 802423BC 8FB00018 */ lw $s0, 0x18($sp) -/* DB4680 802423C0 03E00008 */ jr $ra -/* DB4684 802423C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s new file mode 100644 index 0000000000..9ff592865a --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_80242328_DB45E8.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242328_DB45E8 +/* DB45E8 80242328 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DB45EC 8024232C AFB00018 */ sw $s0, 0x18($sp) +/* DB45F0 80242330 0080802D */ daddu $s0, $a0, $zero +/* DB45F4 80242334 3C03800B */ lui $v1, %hi(gCameras) +/* DB45F8 80242338 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* DB45FC 8024233C 0060202D */ daddu $a0, $v1, $zero +/* DB4600 80242340 10A00005 */ beqz $a1, .L80242358 +/* DB4604 80242344 AFBF001C */ sw $ra, 0x1c($sp) +/* DB4608 80242348 94620000 */ lhu $v0, ($v1) +/* DB460C 8024234C 34420008 */ ori $v0, $v0, 8 +/* DB4610 80242350 A4620000 */ sh $v0, ($v1) +/* DB4614 80242354 AE000070 */ sw $zero, 0x70($s0) +.L80242358: +/* DB4618 80242358 C6000070 */ lwc1 $f0, 0x70($s0) +/* DB461C 8024235C 3C014120 */ lui $at, 0x4120 +/* DB4620 80242360 44811000 */ mtc1 $at, $f2 +/* DB4624 80242364 00000000 */ nop +/* DB4628 80242368 46020000 */ add.s $f0, $f0, $f2 +/* DB462C 8024236C 3C01BF80 */ lui $at, 0xbf80 +/* DB4630 80242370 44811000 */ mtc1 $at, $f2 +/* DB4634 80242374 E6000070 */ swc1 $f0, 0x70($s0) +/* DB4638 80242378 44800000 */ mtc1 $zero, $f0 +/* DB463C 8024237C 24840194 */ addiu $a0, $a0, 0x194 +/* DB4640 80242380 E7A20010 */ swc1 $f2, 0x10($sp) +/* DB4644 80242384 44060000 */ mfc1 $a2, $f0 +/* DB4648 80242388 8E050070 */ lw $a1, 0x70($s0) +/* DB464C 8024238C 0C019EC8 */ jal guRotateF +/* DB4650 80242390 00C0382D */ daddu $a3, $a2, $zero +/* DB4654 80242394 C6000070 */ lwc1 $f0, 0x70($s0) +/* DB4658 80242398 3C018024 */ lui $at, 0x8024 +/* DB465C 8024239C D4225648 */ ldc1 $f2, 0x5648($at) +/* DB4660 802423A0 46000021 */ cvt.d.s $f0, $f0 +/* DB4664 802423A4 4620103E */ c.le.d $f2, $f0 +/* DB4668 802423A8 00000000 */ nop +/* DB466C 802423AC 45010002 */ bc1t .L802423B8 +/* DB4670 802423B0 24020002 */ addiu $v0, $zero, 2 +/* DB4674 802423B4 0000102D */ daddu $v0, $zero, $zero +.L802423B8: +/* DB4678 802423B8 8FBF001C */ lw $ra, 0x1c($sp) +/* DB467C 802423BC 8FB00018 */ lw $s0, 0x18($sp) +/* DB4680 802423C0 03E00008 */ jr $ra +/* DB4684 802423C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8.s deleted file mode 100644 index c88699252a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423C8 -/* DB4688 802423C8 2404005A */ addiu $a0, $zero, 0x5a -/* DB468C 802423CC 3C038024 */ lui $v1, 0x8024 -/* DB4690 802423D0 24635928 */ addiu $v1, $v1, 0x5928 -/* DB4694 802423D4 240200DA */ addiu $v0, $zero, 0xda -.L802423D8: -/* DB4698 802423D8 AC620000 */ sw $v0, ($v1) -/* DB469C 802423DC 2463FFFC */ addiu $v1, $v1, -4 -/* DB46A0 802423E0 2484FFFF */ addiu $a0, $a0, -1 -/* DB46A4 802423E4 0481FFFC */ bgez $a0, .L802423D8 -/* DB46A8 802423E8 2442FFFF */ addiu $v0, $v0, -1 -/* DB46AC 802423EC 3C018024 */ lui $at, 0x8024 -/* DB46B0 802423F0 AC20592C */ sw $zero, 0x592c($at) -/* DB46B4 802423F4 03E00008 */ jr $ra -/* DB46B8 802423F8 24020002 */ addiu $v0, $zero, 2 -/* DB46BC 802423FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s new file mode 100644 index 0000000000..ba26dfa4dc --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_05/DB22C0/func_802423C8_DB4688.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802423C8_DB4688 +/* DB4688 802423C8 2404005A */ addiu $a0, $zero, 0x5a +/* DB468C 802423CC 3C038024 */ lui $v1, 0x8024 +/* DB4690 802423D0 24635928 */ addiu $v1, $v1, 0x5928 +/* DB4694 802423D4 240200DA */ addiu $v0, $zero, 0xda +.L802423D8: +/* DB4698 802423D8 AC620000 */ sw $v0, ($v1) +/* DB469C 802423DC 2463FFFC */ addiu $v1, $v1, -4 +/* DB46A0 802423E0 2484FFFF */ addiu $a0, $a0, -1 +/* DB46A4 802423E4 0481FFFC */ bgez $a0, .L802423D8 +/* DB46A8 802423E8 2442FFFF */ addiu $v0, $v0, -1 +/* DB46AC 802423EC 3C018024 */ lui $at, 0x8024 +/* DB46B0 802423F0 AC20592C */ sw $zero, 0x592c($at) +/* DB46B4 802423F4 03E00008 */ jr $ra +/* DB46B8 802423F8 24020002 */ addiu $v0, $zero, 2 +/* DB46BC 802423FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168.s deleted file mode 100644 index c7bf2db21a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240168 -/* DB7A78 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB7A7C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* DB7A80 80240170 0080902D */ daddu $s2, $a0, $zero -/* DB7A84 80240174 AFBF001C */ sw $ra, 0x1c($sp) -/* DB7A88 80240178 AFB10014 */ sw $s1, 0x14($sp) -/* DB7A8C 8024017C AFB00010 */ sw $s0, 0x10($sp) -/* DB7A90 80240180 8E50000C */ lw $s0, 0xc($s2) -/* DB7A94 80240184 8E050000 */ lw $a1, ($s0) -/* DB7A98 80240188 0C0B1EAF */ jal get_variable -/* DB7A9C 8024018C 26100004 */ addiu $s0, $s0, 4 -/* DB7AA0 80240190 8E050000 */ lw $a1, ($s0) -/* DB7AA4 80240194 26100004 */ addiu $s0, $s0, 4 -/* DB7AA8 80240198 0240202D */ daddu $a0, $s2, $zero -/* DB7AAC 8024019C 0C0B1EAF */ jal get_variable -/* DB7AB0 802401A0 0040882D */ daddu $s1, $v0, $zero -/* DB7AB4 802401A4 0240202D */ daddu $a0, $s2, $zero -/* DB7AB8 802401A8 8E050000 */ lw $a1, ($s0) -/* DB7ABC 802401AC 0C0B1EAF */ jal get_variable -/* DB7AC0 802401B0 0040802D */ daddu $s0, $v0, $zero -/* DB7AC4 802401B4 02020018 */ mult $s0, $v0 -/* DB7AC8 802401B8 24020002 */ addiu $v0, $zero, 2 -/* DB7ACC 802401BC 8E430138 */ lw $v1, 0x138($s2) -/* DB7AD0 802401C0 00003012 */ mflo $a2 -/* DB7AD4 802401C4 02268821 */ addu $s1, $s1, $a2 -/* DB7AD8 802401C8 00518804 */ sllv $s1, $s1, $v0 -/* DB7ADC 802401CC 00711821 */ addu $v1, $v1, $s1 -/* DB7AE0 802401D0 AE430138 */ sw $v1, 0x138($s2) -/* DB7AE4 802401D4 8FBF001C */ lw $ra, 0x1c($sp) -/* DB7AE8 802401D8 8FB20018 */ lw $s2, 0x18($sp) -/* DB7AEC 802401DC 8FB10014 */ lw $s1, 0x14($sp) -/* DB7AF0 802401E0 8FB00010 */ lw $s0, 0x10($sp) -/* DB7AF4 802401E4 03E00008 */ jr $ra -/* DB7AF8 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168_DB7A78.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168_DB7A78.s new file mode 100644 index 0000000000..34d8e2fe02 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240168_DB7A78.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240168_DB7A78 +/* DB7A78 80240168 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DB7A7C 8024016C AFB20018 */ sw $s2, 0x18($sp) +/* DB7A80 80240170 0080902D */ daddu $s2, $a0, $zero +/* DB7A84 80240174 AFBF001C */ sw $ra, 0x1c($sp) +/* DB7A88 80240178 AFB10014 */ sw $s1, 0x14($sp) +/* DB7A8C 8024017C AFB00010 */ sw $s0, 0x10($sp) +/* DB7A90 80240180 8E50000C */ lw $s0, 0xc($s2) +/* DB7A94 80240184 8E050000 */ lw $a1, ($s0) +/* DB7A98 80240188 0C0B1EAF */ jal get_variable +/* DB7A9C 8024018C 26100004 */ addiu $s0, $s0, 4 +/* DB7AA0 80240190 8E050000 */ lw $a1, ($s0) +/* DB7AA4 80240194 26100004 */ addiu $s0, $s0, 4 +/* DB7AA8 80240198 0240202D */ daddu $a0, $s2, $zero +/* DB7AAC 8024019C 0C0B1EAF */ jal get_variable +/* DB7AB0 802401A0 0040882D */ daddu $s1, $v0, $zero +/* DB7AB4 802401A4 0240202D */ daddu $a0, $s2, $zero +/* DB7AB8 802401A8 8E050000 */ lw $a1, ($s0) +/* DB7ABC 802401AC 0C0B1EAF */ jal get_variable +/* DB7AC0 802401B0 0040802D */ daddu $s0, $v0, $zero +/* DB7AC4 802401B4 02020018 */ mult $s0, $v0 +/* DB7AC8 802401B8 24020002 */ addiu $v0, $zero, 2 +/* DB7ACC 802401BC 8E430138 */ lw $v1, 0x138($s2) +/* DB7AD0 802401C0 00003012 */ mflo $a2 +/* DB7AD4 802401C4 02268821 */ addu $s1, $s1, $a2 +/* DB7AD8 802401C8 00518804 */ sllv $s1, $s1, $v0 +/* DB7ADC 802401CC 00711821 */ addu $v1, $v1, $s1 +/* DB7AE0 802401D0 AE430138 */ sw $v1, 0x138($s2) +/* DB7AE4 802401D4 8FBF001C */ lw $ra, 0x1c($sp) +/* DB7AE8 802401D8 8FB20018 */ lw $s2, 0x18($sp) +/* DB7AEC 802401DC 8FB10014 */ lw $s1, 0x14($sp) +/* DB7AF0 802401E0 8FB00010 */ lw $s0, 0x10($sp) +/* DB7AF4 802401E4 03E00008 */ jr $ra +/* DB7AF8 802401E8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC.s deleted file mode 100644 index 9626c73b4c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401EC -/* DB7AFC 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DB7B00 802401F0 AFB10014 */ sw $s1, 0x14($sp) -/* DB7B04 802401F4 0080882D */ daddu $s1, $a0, $zero -/* DB7B08 802401F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DB7B0C 802401FC AFB00010 */ sw $s0, 0x10($sp) -/* DB7B10 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DB7B14 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DB7B18 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DB7B1C 8024020C 8E30000C */ lw $s0, 0xc($s1) -/* DB7B20 80240210 8E050000 */ lw $a1, ($s0) -/* DB7B24 80240214 0C0B210B */ jal get_float_variable -/* DB7B28 80240218 26100004 */ addiu $s0, $s0, 4 -/* DB7B2C 8024021C 8E050000 */ lw $a1, ($s0) -/* DB7B30 80240220 26100004 */ addiu $s0, $s0, 4 -/* DB7B34 80240224 0220202D */ daddu $a0, $s1, $zero -/* DB7B38 80240228 0C0B210B */ jal get_float_variable -/* DB7B3C 8024022C 46000606 */ mov.s $f24, $f0 -/* DB7B40 80240230 8E050000 */ lw $a1, ($s0) -/* DB7B44 80240234 26100004 */ addiu $s0, $s0, 4 -/* DB7B48 80240238 0220202D */ daddu $a0, $s1, $zero -/* DB7B4C 8024023C 0C0B210B */ jal get_float_variable -/* DB7B50 80240240 46000586 */ mov.s $f22, $f0 -/* DB7B54 80240244 0220202D */ daddu $a0, $s1, $zero -/* DB7B58 80240248 8E050000 */ lw $a1, ($s0) -/* DB7B5C 8024024C 0C0B210B */ jal get_float_variable -/* DB7B60 80240250 46000506 */ mov.s $f20, $f0 -/* DB7B64 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* DB7B68 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* DB7B6C 8024025C E4580028 */ swc1 $f24, 0x28($v0) -/* DB7B70 80240260 E456002C */ swc1 $f22, 0x2c($v0) -/* DB7B74 80240264 E4540030 */ swc1 $f20, 0x30($v0) -/* DB7B78 80240268 E4400080 */ swc1 $f0, 0x80($v0) -/* DB7B7C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) -/* DB7B80 80240270 8FB10014 */ lw $s1, 0x14($sp) -/* DB7B84 80240274 8FB00010 */ lw $s0, 0x10($sp) -/* DB7B88 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DB7B8C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) -/* DB7B90 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) -/* DB7B94 80240284 24020002 */ addiu $v0, $zero, 2 -/* DB7B98 80240288 03E00008 */ jr $ra -/* DB7B9C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC_DB7AFC.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC_DB7AFC.s new file mode 100644 index 0000000000..1327a70101 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_802401EC_DB7AFC.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401EC_DB7AFC +/* DB7AFC 802401EC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* DB7B00 802401F0 AFB10014 */ sw $s1, 0x14($sp) +/* DB7B04 802401F4 0080882D */ daddu $s1, $a0, $zero +/* DB7B08 802401F8 AFBF0018 */ sw $ra, 0x18($sp) +/* DB7B0C 802401FC AFB00010 */ sw $s0, 0x10($sp) +/* DB7B10 80240200 F7B80030 */ sdc1 $f24, 0x30($sp) +/* DB7B14 80240204 F7B60028 */ sdc1 $f22, 0x28($sp) +/* DB7B18 80240208 F7B40020 */ sdc1 $f20, 0x20($sp) +/* DB7B1C 8024020C 8E30000C */ lw $s0, 0xc($s1) +/* DB7B20 80240210 8E050000 */ lw $a1, ($s0) +/* DB7B24 80240214 0C0B210B */ jal get_float_variable +/* DB7B28 80240218 26100004 */ addiu $s0, $s0, 4 +/* DB7B2C 8024021C 8E050000 */ lw $a1, ($s0) +/* DB7B30 80240220 26100004 */ addiu $s0, $s0, 4 +/* DB7B34 80240224 0220202D */ daddu $a0, $s1, $zero +/* DB7B38 80240228 0C0B210B */ jal get_float_variable +/* DB7B3C 8024022C 46000606 */ mov.s $f24, $f0 +/* DB7B40 80240230 8E050000 */ lw $a1, ($s0) +/* DB7B44 80240234 26100004 */ addiu $s0, $s0, 4 +/* DB7B48 80240238 0220202D */ daddu $a0, $s1, $zero +/* DB7B4C 8024023C 0C0B210B */ jal get_float_variable +/* DB7B50 80240240 46000586 */ mov.s $f22, $f0 +/* DB7B54 80240244 0220202D */ daddu $a0, $s1, $zero +/* DB7B58 80240248 8E050000 */ lw $a1, ($s0) +/* DB7B5C 8024024C 0C0B210B */ jal get_float_variable +/* DB7B60 80240250 46000506 */ mov.s $f20, $f0 +/* DB7B64 80240254 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* DB7B68 80240258 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* DB7B6C 8024025C E4580028 */ swc1 $f24, 0x28($v0) +/* DB7B70 80240260 E456002C */ swc1 $f22, 0x2c($v0) +/* DB7B74 80240264 E4540030 */ swc1 $f20, 0x30($v0) +/* DB7B78 80240268 E4400080 */ swc1 $f0, 0x80($v0) +/* DB7B7C 8024026C 8FBF0018 */ lw $ra, 0x18($sp) +/* DB7B80 80240270 8FB10014 */ lw $s1, 0x14($sp) +/* DB7B84 80240274 8FB00010 */ lw $s0, 0x10($sp) +/* DB7B88 80240278 D7B80030 */ ldc1 $f24, 0x30($sp) +/* DB7B8C 8024027C D7B60028 */ ldc1 $f22, 0x28($sp) +/* DB7B90 80240280 D7B40020 */ ldc1 $f20, 0x20($sp) +/* DB7B94 80240284 24020002 */ addiu $v0, $zero, 2 +/* DB7B98 80240288 03E00008 */ jr $ra +/* DB7B9C 8024028C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988.s deleted file mode 100644 index 08139d9597..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240988 -/* DB8298 80240988 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DB829C 8024098C AFB10014 */ sw $s1, 0x14($sp) -/* DB82A0 80240990 0080882D */ daddu $s1, $a0, $zero -/* DB82A4 80240994 AFBF001C */ sw $ra, 0x1c($sp) -/* DB82A8 80240998 AFB20018 */ sw $s2, 0x18($sp) -/* DB82AC 8024099C AFB00010 */ sw $s0, 0x10($sp) -/* DB82B0 802409A0 8E240084 */ lw $a0, 0x84($s1) -/* DB82B4 802409A4 0C04C3D6 */ jal get_item_entity -/* DB82B8 802409A8 00A0802D */ daddu $s0, $a1, $zero -/* DB82BC 802409AC 12000005 */ beqz $s0, .L802409C4 -/* DB82C0 802409B0 0040902D */ daddu $s2, $v0, $zero -/* DB82C4 802409B4 C640000C */ lwc1 $f0, 0xc($s2) -/* DB82C8 802409B8 AE200074 */ sw $zero, 0x74($s1) -/* DB82CC 802409BC AE20007C */ sw $zero, 0x7c($s1) -/* DB82D0 802409C0 E6200078 */ swc1 $f0, 0x78($s1) -.L802409C4: -/* DB82D4 802409C4 8E230074 */ lw $v1, 0x74($s1) -/* DB82D8 802409C8 10600005 */ beqz $v1, .L802409E0 -/* DB82DC 802409CC 24020001 */ addiu $v0, $zero, 1 -/* DB82E0 802409D0 10620024 */ beq $v1, $v0, .L80240A64 -/* DB82E4 802409D4 00000000 */ nop -/* DB82E8 802409D8 080902AF */ j .L80240ABC -/* DB82EC 802409DC 00000000 */ nop -.L802409E0: -/* DB82F0 802409E0 3C013FC9 */ lui $at, 0x3fc9 -/* DB82F4 802409E4 34210FD8 */ ori $at, $at, 0xfd8 -/* DB82F8 802409E8 44810000 */ mtc1 $at, $f0 -/* DB82FC 802409EC C62C007C */ lwc1 $f12, 0x7c($s1) -/* DB8300 802409F0 46806320 */ cvt.s.w $f12, $f12 -/* DB8304 802409F4 46006302 */ mul.s $f12, $f12, $f0 -/* DB8308 802409F8 00000000 */ nop -/* DB830C 802409FC 3C0141F0 */ lui $at, 0x41f0 -/* DB8310 80240A00 44810000 */ mtc1 $at, $f0 -/* DB8314 80240A04 0C00A874 */ jal cos_rad -/* DB8318 80240A08 46006303 */ div.s $f12, $f12, $f0 -/* DB831C 80240A0C 3C013F80 */ lui $at, 0x3f80 -/* DB8320 80240A10 44811000 */ mtc1 $at, $f2 -/* DB8324 80240A14 00000000 */ nop -/* DB8328 80240A18 46001081 */ sub.s $f2, $f2, $f0 -/* DB832C 80240A1C 3C0141A0 */ lui $at, 0x41a0 -/* DB8330 80240A20 44810000 */ mtc1 $at, $f0 -/* DB8334 80240A24 00000000 */ nop -/* DB8338 80240A28 46001082 */ mul.s $f2, $f2, $f0 -/* DB833C 80240A2C 00000000 */ nop -/* DB8340 80240A30 C6200078 */ lwc1 $f0, 0x78($s1) -/* DB8344 80240A34 46020000 */ add.s $f0, $f0, $f2 -/* DB8348 80240A38 E640000C */ swc1 $f0, 0xc($s2) -/* DB834C 80240A3C 8E23007C */ lw $v1, 0x7c($s1) -/* DB8350 80240A40 2402001E */ addiu $v0, $zero, 0x1e -/* DB8354 80240A44 14620005 */ bne $v1, $v0, .L80240A5C -/* DB8358 80240A48 24620001 */ addiu $v0, $v1, 1 -/* DB835C 80240A4C 24020001 */ addiu $v0, $zero, 1 -/* DB8360 80240A50 AE220074 */ sw $v0, 0x74($s1) -/* DB8364 80240A54 080902AF */ j .L80240ABC -/* DB8368 80240A58 AE20007C */ sw $zero, 0x7c($s1) -.L80240A5C: -/* DB836C 80240A5C 080902AF */ j .L80240ABC -/* DB8370 80240A60 AE22007C */ sw $v0, 0x7c($s1) -.L80240A64: -/* DB8374 80240A64 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DB8378 80240A68 0C00A8D4 */ jal cos_deg -/* DB837C 80240A6C 46806320 */ cvt.s.w $f12, $f12 -/* DB8380 80240A70 3C014040 */ lui $at, 0x4040 -/* DB8384 80240A74 44811000 */ mtc1 $at, $f2 -/* DB8388 80240A78 00000000 */ nop -/* DB838C 80240A7C 46020002 */ mul.s $f0, $f0, $f2 -/* DB8390 80240A80 00000000 */ nop -/* DB8394 80240A84 3C014188 */ lui $at, 0x4188 -/* DB8398 80240A88 44812000 */ mtc1 $at, $f4 -/* DB839C 80240A8C C6220078 */ lwc1 $f2, 0x78($s1) -/* DB83A0 80240A90 46041080 */ add.s $f2, $f2, $f4 -/* DB83A4 80240A94 46001080 */ add.s $f2, $f2, $f0 -/* DB83A8 80240A98 E642000C */ swc1 $f2, 0xc($s2) -/* DB83AC 80240A9C 8E22007C */ lw $v0, 0x7c($s1) -/* DB83B0 80240AA0 24420009 */ addiu $v0, $v0, 9 -/* DB83B4 80240AA4 44826000 */ mtc1 $v0, $f12 -/* DB83B8 80240AA8 00000000 */ nop -/* DB83BC 80240AAC 0C00A6C9 */ jal clamp_angle -/* DB83C0 80240AB0 46806320 */ cvt.s.w $f12, $f12 -/* DB83C4 80240AB4 4600018D */ trunc.w.s $f6, $f0 -/* DB83C8 80240AB8 E626007C */ swc1 $f6, 0x7c($s1) -.L80240ABC: -/* DB83CC 80240ABC 8FBF001C */ lw $ra, 0x1c($sp) -/* DB83D0 80240AC0 8FB20018 */ lw $s2, 0x18($sp) -/* DB83D4 80240AC4 8FB10014 */ lw $s1, 0x14($sp) -/* DB83D8 80240AC8 8FB00010 */ lw $s0, 0x10($sp) -/* DB83DC 80240ACC 0000102D */ daddu $v0, $zero, $zero -/* DB83E0 80240AD0 03E00008 */ jr $ra -/* DB83E4 80240AD4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s new file mode 100644 index 0000000000..245e633602 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240988_DB8298.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240988_DB8298 +/* DB8298 80240988 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DB829C 8024098C AFB10014 */ sw $s1, 0x14($sp) +/* DB82A0 80240990 0080882D */ daddu $s1, $a0, $zero +/* DB82A4 80240994 AFBF001C */ sw $ra, 0x1c($sp) +/* DB82A8 80240998 AFB20018 */ sw $s2, 0x18($sp) +/* DB82AC 8024099C AFB00010 */ sw $s0, 0x10($sp) +/* DB82B0 802409A0 8E240084 */ lw $a0, 0x84($s1) +/* DB82B4 802409A4 0C04C3D6 */ jal get_item_entity +/* DB82B8 802409A8 00A0802D */ daddu $s0, $a1, $zero +/* DB82BC 802409AC 12000005 */ beqz $s0, .L802409C4 +/* DB82C0 802409B0 0040902D */ daddu $s2, $v0, $zero +/* DB82C4 802409B4 C640000C */ lwc1 $f0, 0xc($s2) +/* DB82C8 802409B8 AE200074 */ sw $zero, 0x74($s1) +/* DB82CC 802409BC AE20007C */ sw $zero, 0x7c($s1) +/* DB82D0 802409C0 E6200078 */ swc1 $f0, 0x78($s1) +.L802409C4: +/* DB82D4 802409C4 8E230074 */ lw $v1, 0x74($s1) +/* DB82D8 802409C8 10600005 */ beqz $v1, .L802409E0 +/* DB82DC 802409CC 24020001 */ addiu $v0, $zero, 1 +/* DB82E0 802409D0 10620024 */ beq $v1, $v0, .L80240A64 +/* DB82E4 802409D4 00000000 */ nop +/* DB82E8 802409D8 080902AF */ j .L80240ABC +/* DB82EC 802409DC 00000000 */ nop +.L802409E0: +/* DB82F0 802409E0 3C013FC9 */ lui $at, 0x3fc9 +/* DB82F4 802409E4 34210FD8 */ ori $at, $at, 0xfd8 +/* DB82F8 802409E8 44810000 */ mtc1 $at, $f0 +/* DB82FC 802409EC C62C007C */ lwc1 $f12, 0x7c($s1) +/* DB8300 802409F0 46806320 */ cvt.s.w $f12, $f12 +/* DB8304 802409F4 46006302 */ mul.s $f12, $f12, $f0 +/* DB8308 802409F8 00000000 */ nop +/* DB830C 802409FC 3C0141F0 */ lui $at, 0x41f0 +/* DB8310 80240A00 44810000 */ mtc1 $at, $f0 +/* DB8314 80240A04 0C00A874 */ jal cos_rad +/* DB8318 80240A08 46006303 */ div.s $f12, $f12, $f0 +/* DB831C 80240A0C 3C013F80 */ lui $at, 0x3f80 +/* DB8320 80240A10 44811000 */ mtc1 $at, $f2 +/* DB8324 80240A14 00000000 */ nop +/* DB8328 80240A18 46001081 */ sub.s $f2, $f2, $f0 +/* DB832C 80240A1C 3C0141A0 */ lui $at, 0x41a0 +/* DB8330 80240A20 44810000 */ mtc1 $at, $f0 +/* DB8334 80240A24 00000000 */ nop +/* DB8338 80240A28 46001082 */ mul.s $f2, $f2, $f0 +/* DB833C 80240A2C 00000000 */ nop +/* DB8340 80240A30 C6200078 */ lwc1 $f0, 0x78($s1) +/* DB8344 80240A34 46020000 */ add.s $f0, $f0, $f2 +/* DB8348 80240A38 E640000C */ swc1 $f0, 0xc($s2) +/* DB834C 80240A3C 8E23007C */ lw $v1, 0x7c($s1) +/* DB8350 80240A40 2402001E */ addiu $v0, $zero, 0x1e +/* DB8354 80240A44 14620005 */ bne $v1, $v0, .L80240A5C +/* DB8358 80240A48 24620001 */ addiu $v0, $v1, 1 +/* DB835C 80240A4C 24020001 */ addiu $v0, $zero, 1 +/* DB8360 80240A50 AE220074 */ sw $v0, 0x74($s1) +/* DB8364 80240A54 080902AF */ j .L80240ABC +/* DB8368 80240A58 AE20007C */ sw $zero, 0x7c($s1) +.L80240A5C: +/* DB836C 80240A5C 080902AF */ j .L80240ABC +/* DB8370 80240A60 AE22007C */ sw $v0, 0x7c($s1) +.L80240A64: +/* DB8374 80240A64 C62C007C */ lwc1 $f12, 0x7c($s1) +/* DB8378 80240A68 0C00A8D4 */ jal cos_deg +/* DB837C 80240A6C 46806320 */ cvt.s.w $f12, $f12 +/* DB8380 80240A70 3C014040 */ lui $at, 0x4040 +/* DB8384 80240A74 44811000 */ mtc1 $at, $f2 +/* DB8388 80240A78 00000000 */ nop +/* DB838C 80240A7C 46020002 */ mul.s $f0, $f0, $f2 +/* DB8390 80240A80 00000000 */ nop +/* DB8394 80240A84 3C014188 */ lui $at, 0x4188 +/* DB8398 80240A88 44812000 */ mtc1 $at, $f4 +/* DB839C 80240A8C C6220078 */ lwc1 $f2, 0x78($s1) +/* DB83A0 80240A90 46041080 */ add.s $f2, $f2, $f4 +/* DB83A4 80240A94 46001080 */ add.s $f2, $f2, $f0 +/* DB83A8 80240A98 E642000C */ swc1 $f2, 0xc($s2) +/* DB83AC 80240A9C 8E22007C */ lw $v0, 0x7c($s1) +/* DB83B0 80240AA0 24420009 */ addiu $v0, $v0, 9 +/* DB83B4 80240AA4 44826000 */ mtc1 $v0, $f12 +/* DB83B8 80240AA8 00000000 */ nop +/* DB83BC 80240AAC 0C00A6C9 */ jal clamp_angle +/* DB83C0 80240AB0 46806320 */ cvt.s.w $f12, $f12 +/* DB83C4 80240AB4 4600018D */ trunc.w.s $f6, $f0 +/* DB83C8 80240AB8 E626007C */ swc1 $f6, 0x7c($s1) +.L80240ABC: +/* DB83CC 80240ABC 8FBF001C */ lw $ra, 0x1c($sp) +/* DB83D0 80240AC0 8FB20018 */ lw $s2, 0x18($sp) +/* DB83D4 80240AC4 8FB10014 */ lw $s1, 0x14($sp) +/* DB83D8 80240AC8 8FB00010 */ lw $s0, 0x10($sp) +/* DB83DC 80240ACC 0000102D */ daddu $v0, $zero, $zero +/* DB83E0 80240AD0 03E00008 */ jr $ra +/* DB83E4 80240AD4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8.s deleted file mode 100644 index 0c05b1fa72..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD8 -/* DB83E8 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DB83EC 80240ADC AFB00010 */ sw $s0, 0x10($sp) -/* DB83F0 80240AE0 0080802D */ daddu $s0, $a0, $zero -/* DB83F4 80240AE4 AFBF0014 */ sw $ra, 0x14($sp) -/* DB83F8 80240AE8 8E02000C */ lw $v0, 0xc($s0) -/* DB83FC 80240AEC 0C0B1EAF */ jal get_variable -/* DB8400 80240AF0 8C450000 */ lw $a1, ($v0) -/* DB8404 80240AF4 00021140 */ sll $v0, $v0, 5 -/* DB8408 80240AF8 AE000084 */ sw $zero, 0x84($s0) -/* DB840C 80240AFC 3C018008 */ lui $at, 0x8008 -/* DB8410 80240B00 00220821 */ addu $at, $at, $v0 -/* DB8414 80240B04 942278F8 */ lhu $v0, 0x78f8($at) -/* DB8418 80240B08 30420040 */ andi $v0, $v0, 0x40 -/* DB841C 80240B0C 10400002 */ beqz $v0, .L80240B18 -/* DB8420 80240B10 24020001 */ addiu $v0, $zero, 1 -/* DB8424 80240B14 AE020084 */ sw $v0, 0x84($s0) -.L80240B18: -/* DB8428 80240B18 8FBF0014 */ lw $ra, 0x14($sp) -/* DB842C 80240B1C 8FB00010 */ lw $s0, 0x10($sp) -/* DB8430 80240B20 24020002 */ addiu $v0, $zero, 2 -/* DB8434 80240B24 03E00008 */ jr $ra -/* DB8438 80240B28 27BD0018 */ addiu $sp, $sp, 0x18 -/* DB843C 80240B2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s new file mode 100644 index 0000000000..4901d0a90a --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_06/DB8180/func_80240AD8_DB83E8.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AD8_DB83E8 +/* DB83E8 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DB83EC 80240ADC AFB00010 */ sw $s0, 0x10($sp) +/* DB83F0 80240AE0 0080802D */ daddu $s0, $a0, $zero +/* DB83F4 80240AE4 AFBF0014 */ sw $ra, 0x14($sp) +/* DB83F8 80240AE8 8E02000C */ lw $v0, 0xc($s0) +/* DB83FC 80240AEC 0C0B1EAF */ jal get_variable +/* DB8400 80240AF0 8C450000 */ lw $a1, ($v0) +/* DB8404 80240AF4 00021140 */ sll $v0, $v0, 5 +/* DB8408 80240AF8 AE000084 */ sw $zero, 0x84($s0) +/* DB840C 80240AFC 3C018008 */ lui $at, 0x8008 +/* DB8410 80240B00 00220821 */ addu $at, $at, $v0 +/* DB8414 80240B04 942278F8 */ lhu $v0, 0x78f8($at) +/* DB8418 80240B08 30420040 */ andi $v0, $v0, 0x40 +/* DB841C 80240B0C 10400002 */ beqz $v0, .L80240B18 +/* DB8420 80240B10 24020001 */ addiu $v0, $zero, 1 +/* DB8424 80240B14 AE020084 */ sw $v0, 0x84($s0) +.L80240B18: +/* DB8428 80240B18 8FBF0014 */ lw $ra, 0x14($sp) +/* DB842C 80240B1C 8FB00010 */ lw $s0, 0x10($sp) +/* DB8430 80240B20 24020002 */ addiu $v0, $zero, 2 +/* DB8434 80240B24 03E00008 */ jr $ra +/* DB8438 80240B28 27BD0018 */ addiu $sp, $sp, 0x18 +/* DB843C 80240B2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s index a5021c4f6e..74b11f3898 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80240238_DBD4E8.s @@ -173,7 +173,7 @@ glabel func_80240238_DBD4E8 /* DBD770 802404C0 00000000 */ nop /* DBD774 802404C4 0260202D */ daddu $a0, $s3, $zero /* DBD778 802404C8 0280282D */ daddu $a1, $s4, $zero -/* DBD77C 802404CC 0C090000 */ jal func_80240000 +/* DBD77C 802404CC 0C090000 */ jal func_80240000_DBD2B0 /* DBD780 802404D0 02A0302D */ daddu $a2, $s5, $zero /* DBD784 802404D4 8E630070 */ lw $v1, 0x70($s3) /* DBD788 802404D8 2402000F */ addiu $v0, $zero, 0xf @@ -181,7 +181,7 @@ glabel func_80240238_DBD4E8 /* DBD790 802404E0 00000000 */ nop /* DBD794 802404E4 0260202D */ daddu $a0, $s3, $zero /* DBD798 802404E8 0280282D */ daddu $a1, $s4, $zero -/* DBD79C 802404EC 0C09001C */ jal func_80240070 +/* DBD79C 802404EC 0C09001C */ jal func_80240070_DBD320 /* DBD7A0 802404F0 02A0302D */ daddu $a2, $s5, $zero /* DBD7A4 802404F4 8E630070 */ lw $v1, 0x70($s3) /* DBD7A8 802404F8 24020010 */ addiu $v0, $zero, 0x10 @@ -189,7 +189,7 @@ glabel func_80240238_DBD4E8 /* DBD7B0 80240500 00000000 */ nop /* DBD7B4 80240504 0260202D */ daddu $a0, $s3, $zero /* DBD7B8 80240508 0280282D */ daddu $a1, $s4, $zero -/* DBD7BC 8024050C 0C090050 */ jal func_80240140 +/* DBD7BC 8024050C 0C090050 */ jal func_80240140_DBD3F0 /* DBD7C0 80240510 02A0302D */ daddu $a2, $s5, $zero /* DBD7C4 80240514 8E630070 */ lw $v1, 0x70($s3) /* DBD7C8 80240518 24020011 */ addiu $v0, $zero, 0x11 @@ -197,7 +197,7 @@ glabel func_80240238_DBD4E8 /* DBD7D0 80240520 00000000 */ nop /* DBD7D4 80240524 0260202D */ daddu $a0, $s3, $zero /* DBD7D8 80240528 0280282D */ daddu $a1, $s4, $zero -/* DBD7DC 8024052C 0C090076 */ jal func_802401D8 +/* DBD7DC 8024052C 0C090076 */ jal func_802401D8_DBD488 /* DBD7E0 80240530 02A0302D */ daddu $a2, $s5, $zero /* DBD7E4 80240534 08090151 */ j .L80240544 /* DBD7E8 80240538 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C.s deleted file mode 100644 index 0a6bb0c0a8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024096C -/* DBDC1C 8024096C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DBDC20 80240970 AFB3001C */ sw $s3, 0x1c($sp) -/* DBDC24 80240974 0080982D */ daddu $s3, $a0, $zero -/* DBDC28 80240978 AFBF0020 */ sw $ra, 0x20($sp) -/* DBDC2C 8024097C AFB20018 */ sw $s2, 0x18($sp) -/* DBDC30 80240980 AFB10014 */ sw $s1, 0x14($sp) -/* DBDC34 80240984 AFB00010 */ sw $s0, 0x10($sp) -/* DBDC38 80240988 8E720148 */ lw $s2, 0x148($s3) -/* DBDC3C 8024098C 86440008 */ lh $a0, 8($s2) -/* DBDC40 80240990 0C00EABB */ jal get_npc_unsafe -/* DBDC44 80240994 00A0882D */ daddu $s1, $a1, $zero -/* DBDC48 80240998 8E240008 */ lw $a0, 8($s1) -/* DBDC4C 8024099C 0040802D */ daddu $s0, $v0, $zero -/* DBDC50 802409A0 00041FC2 */ srl $v1, $a0, 0x1f -/* DBDC54 802409A4 00832021 */ addu $a0, $a0, $v1 -/* DBDC58 802409A8 00042043 */ sra $a0, $a0, 1 -/* DBDC5C 802409AC 0C00A67F */ jal rand_int -/* DBDC60 802409B0 24840001 */ addiu $a0, $a0, 1 -/* DBDC64 802409B4 8E230008 */ lw $v1, 8($s1) -/* DBDC68 802409B8 240400B4 */ addiu $a0, $zero, 0xb4 -/* DBDC6C 802409BC 00032FC2 */ srl $a1, $v1, 0x1f -/* DBDC70 802409C0 00651821 */ addu $v1, $v1, $a1 -/* DBDC74 802409C4 00031843 */ sra $v1, $v1, 1 -/* DBDC78 802409C8 00621821 */ addu $v1, $v1, $v0 -/* DBDC7C 802409CC 0C00A67F */ jal rand_int -/* DBDC80 802409D0 A603008E */ sh $v1, 0x8e($s0) -/* DBDC84 802409D4 C60C000C */ lwc1 $f12, 0xc($s0) -/* DBDC88 802409D8 44820000 */ mtc1 $v0, $f0 -/* DBDC8C 802409DC 00000000 */ nop -/* DBDC90 802409E0 46800020 */ cvt.s.w $f0, $f0 -/* DBDC94 802409E4 46006300 */ add.s $f12, $f12, $f0 -/* DBDC98 802409E8 3C0142B4 */ lui $at, 0x42b4 -/* DBDC9C 802409EC 44810000 */ mtc1 $at, $f0 -/* DBDCA0 802409F0 0C00A6C9 */ jal clamp_angle -/* DBDCA4 802409F4 46006301 */ sub.s $f12, $f12, $f0 -/* DBDCA8 802409F8 E600000C */ swc1 $f0, 0xc($s0) -/* DBDCAC 802409FC 8E4200CC */ lw $v0, 0xcc($s2) -/* DBDCB0 80240A00 8C420000 */ lw $v0, ($v0) -/* DBDCB4 80240A04 AE020028 */ sw $v0, 0x28($s0) -/* DBDCB8 80240A08 24020003 */ addiu $v0, $zero, 3 -/* DBDCBC 80240A0C AE620070 */ sw $v0, 0x70($s3) -/* DBDCC0 80240A10 8FBF0020 */ lw $ra, 0x20($sp) -/* DBDCC4 80240A14 8FB3001C */ lw $s3, 0x1c($sp) -/* DBDCC8 80240A18 8FB20018 */ lw $s2, 0x18($sp) -/* DBDCCC 80240A1C 8FB10014 */ lw $s1, 0x14($sp) -/* DBDCD0 80240A20 8FB00010 */ lw $s0, 0x10($sp) -/* DBDCD4 80240A24 03E00008 */ jr $ra -/* DBDCD8 80240A28 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s new file mode 100644 index 0000000000..1fd4d54aeb --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024096C_DBDC1C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024096C_DBDC1C +/* DBDC1C 8024096C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* DBDC20 80240970 AFB3001C */ sw $s3, 0x1c($sp) +/* DBDC24 80240974 0080982D */ daddu $s3, $a0, $zero +/* DBDC28 80240978 AFBF0020 */ sw $ra, 0x20($sp) +/* DBDC2C 8024097C AFB20018 */ sw $s2, 0x18($sp) +/* DBDC30 80240980 AFB10014 */ sw $s1, 0x14($sp) +/* DBDC34 80240984 AFB00010 */ sw $s0, 0x10($sp) +/* DBDC38 80240988 8E720148 */ lw $s2, 0x148($s3) +/* DBDC3C 8024098C 86440008 */ lh $a0, 8($s2) +/* DBDC40 80240990 0C00EABB */ jal get_npc_unsafe +/* DBDC44 80240994 00A0882D */ daddu $s1, $a1, $zero +/* DBDC48 80240998 8E240008 */ lw $a0, 8($s1) +/* DBDC4C 8024099C 0040802D */ daddu $s0, $v0, $zero +/* DBDC50 802409A0 00041FC2 */ srl $v1, $a0, 0x1f +/* DBDC54 802409A4 00832021 */ addu $a0, $a0, $v1 +/* DBDC58 802409A8 00042043 */ sra $a0, $a0, 1 +/* DBDC5C 802409AC 0C00A67F */ jal rand_int +/* DBDC60 802409B0 24840001 */ addiu $a0, $a0, 1 +/* DBDC64 802409B4 8E230008 */ lw $v1, 8($s1) +/* DBDC68 802409B8 240400B4 */ addiu $a0, $zero, 0xb4 +/* DBDC6C 802409BC 00032FC2 */ srl $a1, $v1, 0x1f +/* DBDC70 802409C0 00651821 */ addu $v1, $v1, $a1 +/* DBDC74 802409C4 00031843 */ sra $v1, $v1, 1 +/* DBDC78 802409C8 00621821 */ addu $v1, $v1, $v0 +/* DBDC7C 802409CC 0C00A67F */ jal rand_int +/* DBDC80 802409D0 A603008E */ sh $v1, 0x8e($s0) +/* DBDC84 802409D4 C60C000C */ lwc1 $f12, 0xc($s0) +/* DBDC88 802409D8 44820000 */ mtc1 $v0, $f0 +/* DBDC8C 802409DC 00000000 */ nop +/* DBDC90 802409E0 46800020 */ cvt.s.w $f0, $f0 +/* DBDC94 802409E4 46006300 */ add.s $f12, $f12, $f0 +/* DBDC98 802409E8 3C0142B4 */ lui $at, 0x42b4 +/* DBDC9C 802409EC 44810000 */ mtc1 $at, $f0 +/* DBDCA0 802409F0 0C00A6C9 */ jal clamp_angle +/* DBDCA4 802409F4 46006301 */ sub.s $f12, $f12, $f0 +/* DBDCA8 802409F8 E600000C */ swc1 $f0, 0xc($s0) +/* DBDCAC 802409FC 8E4200CC */ lw $v0, 0xcc($s2) +/* DBDCB0 80240A00 8C420000 */ lw $v0, ($v0) +/* DBDCB4 80240A04 AE020028 */ sw $v0, 0x28($s0) +/* DBDCB8 80240A08 24020003 */ addiu $v0, $zero, 3 +/* DBDCBC 80240A0C AE620070 */ sw $v0, 0x70($s3) +/* DBDCC0 80240A10 8FBF0020 */ lw $ra, 0x20($sp) +/* DBDCC4 80240A14 8FB3001C */ lw $s3, 0x1c($sp) +/* DBDCC8 80240A18 8FB20018 */ lw $s2, 0x18($sp) +/* DBDCCC 80240A1C 8FB10014 */ lw $s1, 0x14($sp) +/* DBDCD0 80240A20 8FB00010 */ lw $s0, 0x10($sp) +/* DBDCD4 80240A24 03E00008 */ jr $ra +/* DBDCD8 80240A28 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100.s deleted file mode 100644 index 410e43d68a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241100 -/* DBE3B0 80241100 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DBE3B4 80241104 AFB40058 */ sw $s4, 0x58($sp) -/* DBE3B8 80241108 0080A02D */ daddu $s4, $a0, $zero -/* DBE3BC 8024110C AFBF0060 */ sw $ra, 0x60($sp) -/* DBE3C0 80241110 AFB5005C */ sw $s5, 0x5c($sp) -/* DBE3C4 80241114 AFB30054 */ sw $s3, 0x54($sp) -/* DBE3C8 80241118 AFB20050 */ sw $s2, 0x50($sp) -/* DBE3CC 8024111C AFB1004C */ sw $s1, 0x4c($sp) -/* DBE3D0 80241120 AFB00048 */ sw $s0, 0x48($sp) -/* DBE3D4 80241124 8E910148 */ lw $s1, 0x148($s4) -/* DBE3D8 80241128 86240008 */ lh $a0, 8($s1) -/* DBE3DC 8024112C 0C00EABB */ jal get_npc_unsafe -/* DBE3E0 80241130 00A0802D */ daddu $s0, $a1, $zero -/* DBE3E4 80241134 8E83000C */ lw $v1, 0xc($s4) -/* DBE3E8 80241138 0280202D */ daddu $a0, $s4, $zero -/* DBE3EC 8024113C 8C650000 */ lw $a1, ($v1) -/* DBE3F0 80241140 0C0B1EAF */ jal get_variable -/* DBE3F4 80241144 0040902D */ daddu $s2, $v0, $zero -/* DBE3F8 80241148 AFA00018 */ sw $zero, 0x18($sp) -/* DBE3FC 8024114C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE400 80241150 8C630094 */ lw $v1, 0x94($v1) -/* DBE404 80241154 AFA3001C */ sw $v1, 0x1c($sp) -/* DBE408 80241158 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE40C 8024115C 8C630080 */ lw $v1, 0x80($v1) -/* DBE410 80241160 AFA30020 */ sw $v1, 0x20($sp) -/* DBE414 80241164 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE418 80241168 8C630088 */ lw $v1, 0x88($v1) -/* DBE41C 8024116C AFA30024 */ sw $v1, 0x24($sp) -/* DBE420 80241170 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE424 80241174 8C63008C */ lw $v1, 0x8c($v1) -/* DBE428 80241178 27B50018 */ addiu $s5, $sp, 0x18 -/* DBE42C 8024117C AFA30028 */ sw $v1, 0x28($sp) -/* DBE430 80241180 8E2300D0 */ lw $v1, 0xd0($s1) -/* DBE434 80241184 3C014282 */ lui $at, 0x4282 -/* DBE438 80241188 44810000 */ mtc1 $at, $f0 -/* DBE43C 8024118C 8C630090 */ lw $v1, 0x90($v1) -/* DBE440 80241190 0040982D */ daddu $s3, $v0, $zero -/* DBE444 80241194 E7A00030 */ swc1 $f0, 0x30($sp) -/* DBE448 80241198 A7A00034 */ sh $zero, 0x34($sp) -/* DBE44C 8024119C 16000005 */ bnez $s0, .L802411B4 -/* DBE450 802411A0 AFA3002C */ sw $v1, 0x2c($sp) -/* DBE454 802411A4 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBE458 802411A8 30420004 */ andi $v0, $v0, 4 -/* DBE45C 802411AC 10400044 */ beqz $v0, .L802412C0 -/* DBE460 802411B0 00000000 */ nop -.L802411B4: -/* DBE464 802411B4 2404F7FF */ addiu $a0, $zero, -0x801 -/* DBE468 802411B8 AE800070 */ sw $zero, 0x70($s4) -/* DBE46C 802411BC A640008E */ sh $zero, 0x8e($s2) -/* DBE470 802411C0 8E2200CC */ lw $v0, 0xcc($s1) -/* DBE474 802411C4 8E430000 */ lw $v1, ($s2) -/* DBE478 802411C8 8C420000 */ lw $v0, ($v0) -/* DBE47C 802411CC 00641824 */ and $v1, $v1, $a0 -/* DBE480 802411D0 AE430000 */ sw $v1, ($s2) -/* DBE484 802411D4 AE420028 */ sw $v0, 0x28($s2) -/* DBE488 802411D8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DBE48C 802411DC 8C420098 */ lw $v0, 0x98($v0) -/* DBE490 802411E0 54400005 */ bnel $v0, $zero, .L802411F8 -/* DBE494 802411E4 2402FDFF */ addiu $v0, $zero, -0x201 -/* DBE498 802411E8 34620200 */ ori $v0, $v1, 0x200 -/* DBE49C 802411EC 2403FFF7 */ addiu $v1, $zero, -9 -/* DBE4A0 802411F0 08090480 */ j .L80241200 -/* DBE4A4 802411F4 00431024 */ and $v0, $v0, $v1 -.L802411F8: -/* DBE4A8 802411F8 00621024 */ and $v0, $v1, $v0 -/* DBE4AC 802411FC 34420008 */ ori $v0, $v0, 8 -.L80241200: -/* DBE4B0 80241200 AE420000 */ sw $v0, ($s2) -/* DBE4B4 80241204 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBE4B8 80241208 30420004 */ andi $v0, $v0, 4 -/* DBE4BC 8024120C 10400008 */ beqz $v0, .L80241230 -/* DBE4C0 80241210 24020063 */ addiu $v0, $zero, 0x63 -/* DBE4C4 80241214 AE820070 */ sw $v0, 0x70($s4) -/* DBE4C8 80241218 AE800074 */ sw $zero, 0x74($s4) -/* DBE4CC 8024121C 8E2200B0 */ lw $v0, 0xb0($s1) -/* DBE4D0 80241220 2403FFFB */ addiu $v1, $zero, -5 -/* DBE4D4 80241224 00431024 */ and $v0, $v0, $v1 -/* DBE4D8 80241228 08090497 */ j .L8024125C -/* DBE4DC 8024122C AE2200B0 */ sw $v0, 0xb0($s1) -.L80241230: -/* DBE4E0 80241230 8E220000 */ lw $v0, ($s1) -/* DBE4E4 80241234 3C034000 */ lui $v1, 0x4000 -/* DBE4E8 80241238 00431024 */ and $v0, $v0, $v1 -/* DBE4EC 8024123C 10400007 */ beqz $v0, .L8024125C -/* DBE4F0 80241240 3C03BFFF */ lui $v1, 0xbfff -/* DBE4F4 80241244 2402000C */ addiu $v0, $zero, 0xc -/* DBE4F8 80241248 AE820070 */ sw $v0, 0x70($s4) -/* DBE4FC 8024124C 8E220000 */ lw $v0, ($s1) -/* DBE500 80241250 3463FFFF */ ori $v1, $v1, 0xffff -/* DBE504 80241254 00431024 */ and $v0, $v0, $v1 -/* DBE508 80241258 AE220000 */ sw $v0, ($s1) -.L8024125C: -/* DBE50C 8024125C 27A50038 */ addiu $a1, $sp, 0x38 -/* DBE510 80241260 27A6003C */ addiu $a2, $sp, 0x3c -/* DBE514 80241264 C6400038 */ lwc1 $f0, 0x38($s2) -/* DBE518 80241268 864200A8 */ lh $v0, 0xa8($s2) -/* DBE51C 8024126C 3C0142C8 */ lui $at, 0x42c8 -/* DBE520 80241270 44812000 */ mtc1 $at, $f4 -/* DBE524 80241274 44823000 */ mtc1 $v0, $f6 -/* DBE528 80241278 00000000 */ nop -/* DBE52C 8024127C 468031A0 */ cvt.s.w $f6, $f6 -/* DBE530 80241280 27A20044 */ addiu $v0, $sp, 0x44 -/* DBE534 80241284 E7A00038 */ swc1 $f0, 0x38($sp) -/* DBE538 80241288 C640003C */ lwc1 $f0, 0x3c($s2) -/* DBE53C 8024128C C6420040 */ lwc1 $f2, 0x40($s2) -/* DBE540 80241290 46060000 */ add.s $f0, $f0, $f6 -/* DBE544 80241294 E7A40044 */ swc1 $f4, 0x44($sp) -/* DBE548 80241298 E7A20040 */ swc1 $f2, 0x40($sp) -/* DBE54C 8024129C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DBE550 802412A0 AFA20010 */ sw $v0, 0x10($sp) -/* DBE554 802412A4 8E440080 */ lw $a0, 0x80($s2) -/* DBE558 802412A8 0C0372DF */ jal func_800DCB7C -/* DBE55C 802412AC 27A70040 */ addiu $a3, $sp, 0x40 -/* DBE560 802412B0 10400003 */ beqz $v0, .L802412C0 -/* DBE564 802412B4 00000000 */ nop -/* DBE568 802412B8 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DBE56C 802412BC E640003C */ swc1 $f0, 0x3c($s2) -.L802412C0: -/* DBE570 802412C0 8E830070 */ lw $v1, 0x70($s4) -/* DBE574 802412C4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DBE578 802412C8 10400042 */ beqz $v0, .L802413D4 -/* DBE57C 802412CC 00031080 */ sll $v0, $v1, 2 -/* DBE580 802412D0 3C018024 */ lui $at, 0x8024 -/* DBE584 802412D4 00220821 */ addu $at, $at, $v0 -/* DBE588 802412D8 8C226D80 */ lw $v0, 0x6d80($at) -/* DBE58C 802412DC 00400008 */ jr $v0 -/* DBE590 802412E0 00000000 */ nop -/* DBE594 802412E4 0280202D */ daddu $a0, $s4, $zero -/* DBE598 802412E8 0260282D */ daddu $a1, $s3, $zero -/* DBE59C 802412EC 0C09015B */ jal func_8024056C -/* DBE5A0 802412F0 02A0302D */ daddu $a2, $s5, $zero -/* DBE5A4 802412F4 0280202D */ daddu $a0, $s4, $zero -/* DBE5A8 802412F8 0260282D */ daddu $a1, $s3, $zero -/* DBE5AC 802412FC 0C0901B1 */ jal func_802406C4 -/* DBE5B0 80241300 02A0302D */ daddu $a2, $s5, $zero -/* DBE5B4 80241304 080904F5 */ j .L802413D4 -/* DBE5B8 80241308 00000000 */ nop -/* DBE5BC 8024130C 0280202D */ daddu $a0, $s4, $zero -/* DBE5C0 80241310 0260282D */ daddu $a1, $s3, $zero -/* DBE5C4 80241314 0C09025B */ jal func_8024096C -/* DBE5C8 80241318 02A0302D */ daddu $a2, $s5, $zero -/* DBE5CC 8024131C 0280202D */ daddu $a0, $s4, $zero -/* DBE5D0 80241320 0260282D */ daddu $a1, $s3, $zero -/* DBE5D4 80241324 0C09028B */ jal func_80240A2C -/* DBE5D8 80241328 02A0302D */ daddu $a2, $s5, $zero -/* DBE5DC 8024132C 080904F5 */ j .L802413D4 -/* DBE5E0 80241330 00000000 */ nop -/* DBE5E4 80241334 0280202D */ daddu $a0, $s4, $zero -/* DBE5E8 80241338 0260282D */ daddu $a1, $s3, $zero -/* DBE5EC 8024133C 0C0902FA */ jal func_80240BE8 -/* DBE5F0 80241340 02A0302D */ daddu $a2, $s5, $zero -/* DBE5F4 80241344 080904F5 */ j .L802413D4 -/* DBE5F8 80241348 00000000 */ nop -/* DBE5FC 8024134C 0280202D */ daddu $a0, $s4, $zero -/* DBE600 80241350 0260282D */ daddu $a1, $s3, $zero -/* DBE604 80241354 0C090327 */ jal func_80240C9C -/* DBE608 80241358 02A0302D */ daddu $a2, $s5, $zero -/* DBE60C 8024135C 0280202D */ daddu $a0, $s4, $zero -/* DBE610 80241360 0260282D */ daddu $a1, $s3, $zero -/* DBE614 80241364 0C090344 */ jal func_80240D10 -/* DBE618 80241368 02A0302D */ daddu $a2, $s5, $zero -/* DBE61C 8024136C 080904F5 */ j .L802413D4 -/* DBE620 80241370 00000000 */ nop -/* DBE624 80241374 0280202D */ daddu $a0, $s4, $zero -/* DBE628 80241378 0260282D */ daddu $a1, $s3, $zero -/* DBE62C 8024137C 0C090362 */ jal func_80240D88 -/* DBE630 80241380 02A0302D */ daddu $a2, $s5, $zero -/* DBE634 80241384 0280202D */ daddu $a0, $s4, $zero -/* DBE638 80241388 0260282D */ daddu $a1, $s3, $zero -/* DBE63C 8024138C 0C0903AE */ jal func_80240EB8 -/* DBE640 80241390 02A0302D */ daddu $a2, $s5, $zero -/* DBE644 80241394 080904F5 */ j .L802413D4 -/* DBE648 80241398 00000000 */ nop -/* DBE64C 8024139C 0280202D */ daddu $a0, $s4, $zero -/* DBE650 802413A0 0260282D */ daddu $a1, $s3, $zero -/* DBE654 802413A4 0C0903F6 */ jal func_80240FD8 -/* DBE658 802413A8 02A0302D */ daddu $a2, $s5, $zero -/* DBE65C 802413AC 080904F5 */ j .L802413D4 -/* DBE660 802413B0 00000000 */ nop -/* DBE664 802413B4 0280202D */ daddu $a0, $s4, $zero -/* DBE668 802413B8 0260282D */ daddu $a1, $s3, $zero -/* DBE66C 802413BC 0C090410 */ jal func_80241040 -/* DBE670 802413C0 02A0302D */ daddu $a2, $s5, $zero -/* DBE674 802413C4 080904F5 */ j .L802413D4 -/* DBE678 802413C8 00000000 */ nop -/* DBE67C 802413CC 0C0129CF */ jal func_8004A73C -/* DBE680 802413D0 0280202D */ daddu $a0, $s4, $zero -.L802413D4: -/* DBE684 802413D4 8FBF0060 */ lw $ra, 0x60($sp) -/* DBE688 802413D8 8FB5005C */ lw $s5, 0x5c($sp) -/* DBE68C 802413DC 8FB40058 */ lw $s4, 0x58($sp) -/* DBE690 802413E0 8FB30054 */ lw $s3, 0x54($sp) -/* DBE694 802413E4 8FB20050 */ lw $s2, 0x50($sp) -/* DBE698 802413E8 8FB1004C */ lw $s1, 0x4c($sp) -/* DBE69C 802413EC 8FB00048 */ lw $s0, 0x48($sp) -/* DBE6A0 802413F0 0000102D */ daddu $v0, $zero, $zero -/* DBE6A4 802413F4 03E00008 */ jr $ra -/* DBE6A8 802413F8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s new file mode 100644 index 0000000000..2552222db7 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241100_DBE3B0.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241100_DBE3B0 +/* DBE3B0 80241100 27BDFF98 */ addiu $sp, $sp, -0x68 +/* DBE3B4 80241104 AFB40058 */ sw $s4, 0x58($sp) +/* DBE3B8 80241108 0080A02D */ daddu $s4, $a0, $zero +/* DBE3BC 8024110C AFBF0060 */ sw $ra, 0x60($sp) +/* DBE3C0 80241110 AFB5005C */ sw $s5, 0x5c($sp) +/* DBE3C4 80241114 AFB30054 */ sw $s3, 0x54($sp) +/* DBE3C8 80241118 AFB20050 */ sw $s2, 0x50($sp) +/* DBE3CC 8024111C AFB1004C */ sw $s1, 0x4c($sp) +/* DBE3D0 80241120 AFB00048 */ sw $s0, 0x48($sp) +/* DBE3D4 80241124 8E910148 */ lw $s1, 0x148($s4) +/* DBE3D8 80241128 86240008 */ lh $a0, 8($s1) +/* DBE3DC 8024112C 0C00EABB */ jal get_npc_unsafe +/* DBE3E0 80241130 00A0802D */ daddu $s0, $a1, $zero +/* DBE3E4 80241134 8E83000C */ lw $v1, 0xc($s4) +/* DBE3E8 80241138 0280202D */ daddu $a0, $s4, $zero +/* DBE3EC 8024113C 8C650000 */ lw $a1, ($v1) +/* DBE3F0 80241140 0C0B1EAF */ jal get_variable +/* DBE3F4 80241144 0040902D */ daddu $s2, $v0, $zero +/* DBE3F8 80241148 AFA00018 */ sw $zero, 0x18($sp) +/* DBE3FC 8024114C 8E2300D0 */ lw $v1, 0xd0($s1) +/* DBE400 80241150 8C630094 */ lw $v1, 0x94($v1) +/* DBE404 80241154 AFA3001C */ sw $v1, 0x1c($sp) +/* DBE408 80241158 8E2300D0 */ lw $v1, 0xd0($s1) +/* DBE40C 8024115C 8C630080 */ lw $v1, 0x80($v1) +/* DBE410 80241160 AFA30020 */ sw $v1, 0x20($sp) +/* DBE414 80241164 8E2300D0 */ lw $v1, 0xd0($s1) +/* DBE418 80241168 8C630088 */ lw $v1, 0x88($v1) +/* DBE41C 8024116C AFA30024 */ sw $v1, 0x24($sp) +/* DBE420 80241170 8E2300D0 */ lw $v1, 0xd0($s1) +/* DBE424 80241174 8C63008C */ lw $v1, 0x8c($v1) +/* DBE428 80241178 27B50018 */ addiu $s5, $sp, 0x18 +/* DBE42C 8024117C AFA30028 */ sw $v1, 0x28($sp) +/* DBE430 80241180 8E2300D0 */ lw $v1, 0xd0($s1) +/* DBE434 80241184 3C014282 */ lui $at, 0x4282 +/* DBE438 80241188 44810000 */ mtc1 $at, $f0 +/* DBE43C 8024118C 8C630090 */ lw $v1, 0x90($v1) +/* DBE440 80241190 0040982D */ daddu $s3, $v0, $zero +/* DBE444 80241194 E7A00030 */ swc1 $f0, 0x30($sp) +/* DBE448 80241198 A7A00034 */ sh $zero, 0x34($sp) +/* DBE44C 8024119C 16000005 */ bnez $s0, .L802411B4 +/* DBE450 802411A0 AFA3002C */ sw $v1, 0x2c($sp) +/* DBE454 802411A4 8E2200B0 */ lw $v0, 0xb0($s1) +/* DBE458 802411A8 30420004 */ andi $v0, $v0, 4 +/* DBE45C 802411AC 10400044 */ beqz $v0, .L802412C0 +/* DBE460 802411B0 00000000 */ nop +.L802411B4: +/* DBE464 802411B4 2404F7FF */ addiu $a0, $zero, -0x801 +/* DBE468 802411B8 AE800070 */ sw $zero, 0x70($s4) +/* DBE46C 802411BC A640008E */ sh $zero, 0x8e($s2) +/* DBE470 802411C0 8E2200CC */ lw $v0, 0xcc($s1) +/* DBE474 802411C4 8E430000 */ lw $v1, ($s2) +/* DBE478 802411C8 8C420000 */ lw $v0, ($v0) +/* DBE47C 802411CC 00641824 */ and $v1, $v1, $a0 +/* DBE480 802411D0 AE430000 */ sw $v1, ($s2) +/* DBE484 802411D4 AE420028 */ sw $v0, 0x28($s2) +/* DBE488 802411D8 8E2200D0 */ lw $v0, 0xd0($s1) +/* DBE48C 802411DC 8C420098 */ lw $v0, 0x98($v0) +/* DBE490 802411E0 54400005 */ bnel $v0, $zero, .L802411F8 +/* DBE494 802411E4 2402FDFF */ addiu $v0, $zero, -0x201 +/* DBE498 802411E8 34620200 */ ori $v0, $v1, 0x200 +/* DBE49C 802411EC 2403FFF7 */ addiu $v1, $zero, -9 +/* DBE4A0 802411F0 08090480 */ j .L80241200 +/* DBE4A4 802411F4 00431024 */ and $v0, $v0, $v1 +.L802411F8: +/* DBE4A8 802411F8 00621024 */ and $v0, $v1, $v0 +/* DBE4AC 802411FC 34420008 */ ori $v0, $v0, 8 +.L80241200: +/* DBE4B0 80241200 AE420000 */ sw $v0, ($s2) +/* DBE4B4 80241204 8E2200B0 */ lw $v0, 0xb0($s1) +/* DBE4B8 80241208 30420004 */ andi $v0, $v0, 4 +/* DBE4BC 8024120C 10400008 */ beqz $v0, .L80241230 +/* DBE4C0 80241210 24020063 */ addiu $v0, $zero, 0x63 +/* DBE4C4 80241214 AE820070 */ sw $v0, 0x70($s4) +/* DBE4C8 80241218 AE800074 */ sw $zero, 0x74($s4) +/* DBE4CC 8024121C 8E2200B0 */ lw $v0, 0xb0($s1) +/* DBE4D0 80241220 2403FFFB */ addiu $v1, $zero, -5 +/* DBE4D4 80241224 00431024 */ and $v0, $v0, $v1 +/* DBE4D8 80241228 08090497 */ j .L8024125C +/* DBE4DC 8024122C AE2200B0 */ sw $v0, 0xb0($s1) +.L80241230: +/* DBE4E0 80241230 8E220000 */ lw $v0, ($s1) +/* DBE4E4 80241234 3C034000 */ lui $v1, 0x4000 +/* DBE4E8 80241238 00431024 */ and $v0, $v0, $v1 +/* DBE4EC 8024123C 10400007 */ beqz $v0, .L8024125C +/* DBE4F0 80241240 3C03BFFF */ lui $v1, 0xbfff +/* DBE4F4 80241244 2402000C */ addiu $v0, $zero, 0xc +/* DBE4F8 80241248 AE820070 */ sw $v0, 0x70($s4) +/* DBE4FC 8024124C 8E220000 */ lw $v0, ($s1) +/* DBE500 80241250 3463FFFF */ ori $v1, $v1, 0xffff +/* DBE504 80241254 00431024 */ and $v0, $v0, $v1 +/* DBE508 80241258 AE220000 */ sw $v0, ($s1) +.L8024125C: +/* DBE50C 8024125C 27A50038 */ addiu $a1, $sp, 0x38 +/* DBE510 80241260 27A6003C */ addiu $a2, $sp, 0x3c +/* DBE514 80241264 C6400038 */ lwc1 $f0, 0x38($s2) +/* DBE518 80241268 864200A8 */ lh $v0, 0xa8($s2) +/* DBE51C 8024126C 3C0142C8 */ lui $at, 0x42c8 +/* DBE520 80241270 44812000 */ mtc1 $at, $f4 +/* DBE524 80241274 44823000 */ mtc1 $v0, $f6 +/* DBE528 80241278 00000000 */ nop +/* DBE52C 8024127C 468031A0 */ cvt.s.w $f6, $f6 +/* DBE530 80241280 27A20044 */ addiu $v0, $sp, 0x44 +/* DBE534 80241284 E7A00038 */ swc1 $f0, 0x38($sp) +/* DBE538 80241288 C640003C */ lwc1 $f0, 0x3c($s2) +/* DBE53C 8024128C C6420040 */ lwc1 $f2, 0x40($s2) +/* DBE540 80241290 46060000 */ add.s $f0, $f0, $f6 +/* DBE544 80241294 E7A40044 */ swc1 $f4, 0x44($sp) +/* DBE548 80241298 E7A20040 */ swc1 $f2, 0x40($sp) +/* DBE54C 8024129C E7A0003C */ swc1 $f0, 0x3c($sp) +/* DBE550 802412A0 AFA20010 */ sw $v0, 0x10($sp) +/* DBE554 802412A4 8E440080 */ lw $a0, 0x80($s2) +/* DBE558 802412A8 0C0372DF */ jal func_800DCB7C +/* DBE55C 802412AC 27A70040 */ addiu $a3, $sp, 0x40 +/* DBE560 802412B0 10400003 */ beqz $v0, .L802412C0 +/* DBE564 802412B4 00000000 */ nop +/* DBE568 802412B8 C7A0003C */ lwc1 $f0, 0x3c($sp) +/* DBE56C 802412BC E640003C */ swc1 $f0, 0x3c($s2) +.L802412C0: +/* DBE570 802412C0 8E830070 */ lw $v1, 0x70($s4) +/* DBE574 802412C4 2C620064 */ sltiu $v0, $v1, 0x64 +/* DBE578 802412C8 10400042 */ beqz $v0, .L802413D4 +/* DBE57C 802412CC 00031080 */ sll $v0, $v1, 2 +/* DBE580 802412D0 3C018024 */ lui $at, 0x8024 +/* DBE584 802412D4 00220821 */ addu $at, $at, $v0 +/* DBE588 802412D8 8C226D80 */ lw $v0, 0x6d80($at) +/* DBE58C 802412DC 00400008 */ jr $v0 +/* DBE590 802412E0 00000000 */ nop +/* DBE594 802412E4 0280202D */ daddu $a0, $s4, $zero +/* DBE598 802412E8 0260282D */ daddu $a1, $s3, $zero +/* DBE59C 802412EC 0C09015B */ jal func_8024056C_DBD81C +/* DBE5A0 802412F0 02A0302D */ daddu $a2, $s5, $zero +/* DBE5A4 802412F4 0280202D */ daddu $a0, $s4, $zero +/* DBE5A8 802412F8 0260282D */ daddu $a1, $s3, $zero +/* DBE5AC 802412FC 0C0901B1 */ jal func_802406C4_DBD974 +/* DBE5B0 80241300 02A0302D */ daddu $a2, $s5, $zero +/* DBE5B4 80241304 080904F5 */ j .L802413D4 +/* DBE5B8 80241308 00000000 */ nop +/* DBE5BC 8024130C 0280202D */ daddu $a0, $s4, $zero +/* DBE5C0 80241310 0260282D */ daddu $a1, $s3, $zero +/* DBE5C4 80241314 0C09025B */ jal func_8024096C_DBDC1C +/* DBE5C8 80241318 02A0302D */ daddu $a2, $s5, $zero +/* DBE5CC 8024131C 0280202D */ daddu $a0, $s4, $zero +/* DBE5D0 80241320 0260282D */ daddu $a1, $s3, $zero +/* DBE5D4 80241324 0C09028B */ jal func_80240A2C_DBDCDC +/* DBE5D8 80241328 02A0302D */ daddu $a2, $s5, $zero +/* DBE5DC 8024132C 080904F5 */ j .L802413D4 +/* DBE5E0 80241330 00000000 */ nop +/* DBE5E4 80241334 0280202D */ daddu $a0, $s4, $zero +/* DBE5E8 80241338 0260282D */ daddu $a1, $s3, $zero +/* DBE5EC 8024133C 0C0902FA */ jal func_80240BE8_DBDE98 +/* DBE5F0 80241340 02A0302D */ daddu $a2, $s5, $zero +/* DBE5F4 80241344 080904F5 */ j .L802413D4 +/* DBE5F8 80241348 00000000 */ nop +/* DBE5FC 8024134C 0280202D */ daddu $a0, $s4, $zero +/* DBE600 80241350 0260282D */ daddu $a1, $s3, $zero +/* DBE604 80241354 0C090327 */ jal func_80240C9C_DBDF4C +/* DBE608 80241358 02A0302D */ daddu $a2, $s5, $zero +/* DBE60C 8024135C 0280202D */ daddu $a0, $s4, $zero +/* DBE610 80241360 0260282D */ daddu $a1, $s3, $zero +/* DBE614 80241364 0C090344 */ jal func_80240D10_DBDFC0 +/* DBE618 80241368 02A0302D */ daddu $a2, $s5, $zero +/* DBE61C 8024136C 080904F5 */ j .L802413D4 +/* DBE620 80241370 00000000 */ nop +/* DBE624 80241374 0280202D */ daddu $a0, $s4, $zero +/* DBE628 80241378 0260282D */ daddu $a1, $s3, $zero +/* DBE62C 8024137C 0C090362 */ jal func_80240D88_DBE038 +/* DBE630 80241380 02A0302D */ daddu $a2, $s5, $zero +/* DBE634 80241384 0280202D */ daddu $a0, $s4, $zero +/* DBE638 80241388 0260282D */ daddu $a1, $s3, $zero +/* DBE63C 8024138C 0C0903AE */ jal func_80240EB8_DBE168 +/* DBE640 80241390 02A0302D */ daddu $a2, $s5, $zero +/* DBE644 80241394 080904F5 */ j .L802413D4 +/* DBE648 80241398 00000000 */ nop +/* DBE64C 8024139C 0280202D */ daddu $a0, $s4, $zero +/* DBE650 802413A0 0260282D */ daddu $a1, $s3, $zero +/* DBE654 802413A4 0C0903F6 */ jal func_80240FD8_DBE288 +/* DBE658 802413A8 02A0302D */ daddu $a2, $s5, $zero +/* DBE65C 802413AC 080904F5 */ j .L802413D4 +/* DBE660 802413B0 00000000 */ nop +/* DBE664 802413B4 0280202D */ daddu $a0, $s4, $zero +/* DBE668 802413B8 0260282D */ daddu $a1, $s3, $zero +/* DBE66C 802413BC 0C090410 */ jal func_80241040_DBE2F0 +/* DBE670 802413C0 02A0302D */ daddu $a2, $s5, $zero +/* DBE674 802413C4 080904F5 */ j .L802413D4 +/* DBE678 802413C8 00000000 */ nop +/* DBE67C 802413CC 0C0129CF */ jal func_8004A73C +/* DBE680 802413D0 0280202D */ daddu $a0, $s4, $zero +.L802413D4: +/* DBE684 802413D4 8FBF0060 */ lw $ra, 0x60($sp) +/* DBE688 802413D8 8FB5005C */ lw $s5, 0x5c($sp) +/* DBE68C 802413DC 8FB40058 */ lw $s4, 0x58($sp) +/* DBE690 802413E0 8FB30054 */ lw $s3, 0x54($sp) +/* DBE694 802413E4 8FB20050 */ lw $s2, 0x50($sp) +/* DBE698 802413E8 8FB1004C */ lw $s1, 0x4c($sp) +/* DBE69C 802413EC 8FB00048 */ lw $s0, 0x48($sp) +/* DBE6A0 802413F0 0000102D */ daddu $v0, $zero, $zero +/* DBE6A4 802413F4 03E00008 */ jr $ra +/* DBE6A8 802413F8 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C.s deleted file mode 100644 index 4bc35d6cf6..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024153C -/* DBE7EC 8024153C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DBE7F0 80241540 AFB10024 */ sw $s1, 0x24($sp) -/* DBE7F4 80241544 0080882D */ daddu $s1, $a0, $zero -/* DBE7F8 80241548 AFBF0028 */ sw $ra, 0x28($sp) -/* DBE7FC 8024154C AFB00020 */ sw $s0, 0x20($sp) -/* DBE800 80241550 8E220148 */ lw $v0, 0x148($s1) -/* DBE804 80241554 0C00EABB */ jal get_npc_unsafe -/* DBE808 80241558 84440008 */ lh $a0, 8($v0) -/* DBE80C 8024155C 0040802D */ daddu $s0, $v0, $zero -/* DBE810 80241560 0200202D */ daddu $a0, $s0, $zero -/* DBE814 80241564 C600000C */ lwc1 $f0, 0xc($s0) -/* DBE818 80241568 27A60018 */ addiu $a2, $sp, 0x18 -/* DBE81C 8024156C E7A00018 */ swc1 $f0, 0x18($sp) -/* DBE820 80241570 AFA00010 */ sw $zero, 0x10($sp) -/* DBE824 80241574 AFA00014 */ sw $zero, 0x14($sp) -/* DBE828 80241578 8E050018 */ lw $a1, 0x18($s0) -/* DBE82C 8024157C 0C0129E1 */ jal func_8004A784 -/* DBE830 80241580 0000382D */ daddu $a3, $zero, $zero -/* DBE834 80241584 14400005 */ bnez $v0, .L8024159C -/* DBE838 80241588 00000000 */ nop -/* DBE83C 8024158C 8E050018 */ lw $a1, 0x18($s0) -/* DBE840 80241590 8E06000C */ lw $a2, 0xc($s0) -/* DBE844 80241594 0C00EA95 */ jal npc_move_heading -/* DBE848 80241598 0200202D */ daddu $a0, $s0, $zero -.L8024159C: -/* DBE84C 8024159C 9602008E */ lhu $v0, 0x8e($s0) -/* DBE850 802415A0 2442FFFF */ addiu $v0, $v0, -1 -/* DBE854 802415A4 A602008E */ sh $v0, 0x8e($s0) -/* DBE858 802415A8 00021400 */ sll $v0, $v0, 0x10 -/* DBE85C 802415AC 14400004 */ bnez $v0, .L802415C0 -/* DBE860 802415B0 2402001E */ addiu $v0, $zero, 0x1e -/* DBE864 802415B4 A602008E */ sh $v0, 0x8e($s0) -/* DBE868 802415B8 24020011 */ addiu $v0, $zero, 0x11 -/* DBE86C 802415BC AE220070 */ sw $v0, 0x70($s1) -.L802415C0: -/* DBE870 802415C0 8FBF0028 */ lw $ra, 0x28($sp) -/* DBE874 802415C4 8FB10024 */ lw $s1, 0x24($sp) -/* DBE878 802415C8 8FB00020 */ lw $s0, 0x20($sp) -/* DBE87C 802415CC 03E00008 */ jr $ra -/* DBE880 802415D0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s new file mode 100644 index 0000000000..401f97ee86 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024153C_DBE7EC.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024153C_DBE7EC +/* DBE7EC 8024153C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* DBE7F0 80241540 AFB10024 */ sw $s1, 0x24($sp) +/* DBE7F4 80241544 0080882D */ daddu $s1, $a0, $zero +/* DBE7F8 80241548 AFBF0028 */ sw $ra, 0x28($sp) +/* DBE7FC 8024154C AFB00020 */ sw $s0, 0x20($sp) +/* DBE800 80241550 8E220148 */ lw $v0, 0x148($s1) +/* DBE804 80241554 0C00EABB */ jal get_npc_unsafe +/* DBE808 80241558 84440008 */ lh $a0, 8($v0) +/* DBE80C 8024155C 0040802D */ daddu $s0, $v0, $zero +/* DBE810 80241560 0200202D */ daddu $a0, $s0, $zero +/* DBE814 80241564 C600000C */ lwc1 $f0, 0xc($s0) +/* DBE818 80241568 27A60018 */ addiu $a2, $sp, 0x18 +/* DBE81C 8024156C E7A00018 */ swc1 $f0, 0x18($sp) +/* DBE820 80241570 AFA00010 */ sw $zero, 0x10($sp) +/* DBE824 80241574 AFA00014 */ sw $zero, 0x14($sp) +/* DBE828 80241578 8E050018 */ lw $a1, 0x18($s0) +/* DBE82C 8024157C 0C0129E1 */ jal func_8004A784 +/* DBE830 80241580 0000382D */ daddu $a3, $zero, $zero +/* DBE834 80241584 14400005 */ bnez $v0, .L8024159C +/* DBE838 80241588 00000000 */ nop +/* DBE83C 8024158C 8E050018 */ lw $a1, 0x18($s0) +/* DBE840 80241590 8E06000C */ lw $a2, 0xc($s0) +/* DBE844 80241594 0C00EA95 */ jal npc_move_heading +/* DBE848 80241598 0200202D */ daddu $a0, $s0, $zero +.L8024159C: +/* DBE84C 8024159C 9602008E */ lhu $v0, 0x8e($s0) +/* DBE850 802415A0 2442FFFF */ addiu $v0, $v0, -1 +/* DBE854 802415A4 A602008E */ sh $v0, 0x8e($s0) +/* DBE858 802415A8 00021400 */ sll $v0, $v0, 0x10 +/* DBE85C 802415AC 14400004 */ bnez $v0, .L802415C0 +/* DBE860 802415B0 2402001E */ addiu $v0, $zero, 0x1e +/* DBE864 802415B4 A602008E */ sh $v0, 0x8e($s0) +/* DBE868 802415B8 24020011 */ addiu $v0, $zero, 0x11 +/* DBE86C 802415BC AE220070 */ sw $v0, 0x70($s1) +.L802415C0: +/* DBE870 802415C0 8FBF0028 */ lw $ra, 0x28($sp) +/* DBE874 802415C4 8FB10024 */ lw $s1, 0x24($sp) +/* DBE878 802415C8 8FB00020 */ lw $s0, 0x20($sp) +/* DBE87C 802415CC 03E00008 */ jr $ra +/* DBE880 802415D0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s index edf5d217f3..0555f0e4a1 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80241634_DBE8E4.s @@ -131,53 +131,53 @@ glabel func_80241634_DBE8E4 /* DBEAC4 80241814 00000000 */ nop /* DBEAC8 80241818 0260202D */ daddu $a0, $s3, $zero /* DBEACC 8024181C 0280282D */ daddu $a1, $s4, $zero -/* DBEAD0 80241820 0C09015B */ jal func_8024056C +/* DBEAD0 80241820 0C09015B */ jal func_8024056C_DBD81C /* DBEAD4 80241824 02A0302D */ daddu $a2, $s5, $zero /* DBEAD8 80241828 0260202D */ daddu $a0, $s3, $zero /* DBEADC 8024182C 0280282D */ daddu $a1, $s4, $zero -/* DBEAE0 80241830 0C0901B1 */ jal func_802406C4 +/* DBEAE0 80241830 0C0901B1 */ jal func_802406C4_DBD974 /* DBEAE4 80241834 02A0302D */ daddu $a2, $s5, $zero /* DBEAE8 80241838 08090654 */ j .L80241950 /* DBEAEC 8024183C 00000000 */ nop /* DBEAF0 80241840 0260202D */ daddu $a0, $s3, $zero /* DBEAF4 80241844 0280282D */ daddu $a1, $s4, $zero -/* DBEAF8 80241848 0C09025B */ jal func_8024096C +/* DBEAF8 80241848 0C09025B */ jal func_8024096C_DBDC1C /* DBEAFC 8024184C 02A0302D */ daddu $a2, $s5, $zero /* DBEB00 80241850 0260202D */ daddu $a0, $s3, $zero /* DBEB04 80241854 0280282D */ daddu $a1, $s4, $zero -/* DBEB08 80241858 0C09028B */ jal func_80240A2C +/* DBEB08 80241858 0C09028B */ jal func_80240A2C_DBDCDC /* DBEB0C 8024185C 02A0302D */ daddu $a2, $s5, $zero /* DBEB10 80241860 08090654 */ j .L80241950 /* DBEB14 80241864 00000000 */ nop /* DBEB18 80241868 0260202D */ daddu $a0, $s3, $zero /* DBEB1C 8024186C 0280282D */ daddu $a1, $s4, $zero -/* DBEB20 80241870 0C0902FA */ jal func_80240BE8 +/* DBEB20 80241870 0C0902FA */ jal func_80240BE8_DBDE98 /* DBEB24 80241874 02A0302D */ daddu $a2, $s5, $zero /* DBEB28 80241878 08090654 */ j .L80241950 /* DBEB2C 8024187C 00000000 */ nop /* DBEB30 80241880 0260202D */ daddu $a0, $s3, $zero /* DBEB34 80241884 0280282D */ daddu $a1, $s4, $zero -/* DBEB38 80241888 0C090327 */ jal func_80240C9C +/* DBEB38 80241888 0C090327 */ jal func_80240C9C_DBDF4C /* DBEB3C 8024188C 02A0302D */ daddu $a2, $s5, $zero /* DBEB40 80241890 0260202D */ daddu $a0, $s3, $zero /* DBEB44 80241894 0280282D */ daddu $a1, $s4, $zero -/* DBEB48 80241898 0C090344 */ jal func_80240D10 +/* DBEB48 80241898 0C090344 */ jal func_80240D10_DBDFC0 /* DBEB4C 8024189C 02A0302D */ daddu $a2, $s5, $zero /* DBEB50 802418A0 08090654 */ j .L80241950 /* DBEB54 802418A4 00000000 */ nop /* DBEB58 802418A8 0260202D */ daddu $a0, $s3, $zero /* DBEB5C 802418AC 0280282D */ daddu $a1, $s4, $zero -/* DBEB60 802418B0 0C090362 */ jal func_80240D88 +/* DBEB60 802418B0 0C090362 */ jal func_80240D88_DBE038 /* DBEB64 802418B4 02A0302D */ daddu $a2, $s5, $zero /* DBEB68 802418B8 0260202D */ daddu $a0, $s3, $zero /* DBEB6C 802418BC 0280282D */ daddu $a1, $s4, $zero -/* DBEB70 802418C0 0C0903AE */ jal func_80240EB8 +/* DBEB70 802418C0 0C0903AE */ jal func_80240EB8_DBE168 /* DBEB74 802418C4 02A0302D */ daddu $a2, $s5, $zero /* DBEB78 802418C8 08090654 */ j .L80241950 /* DBEB7C 802418CC 00000000 */ nop /* DBEB80 802418D0 0260202D */ daddu $a0, $s3, $zero /* DBEB84 802418D4 0280282D */ daddu $a1, $s4, $zero -/* DBEB88 802418D8 0C0904FF */ jal func_802413FC +/* DBEB88 802418D8 0C0904FF */ jal func_802413FC_DBE6AC /* DBEB8C 802418DC 02A0302D */ daddu $a2, $s5, $zero /* DBEB90 802418E0 8E630070 */ lw $v1, 0x70($s3) /* DBEB94 802418E4 2402000F */ addiu $v0, $zero, 0xf @@ -185,7 +185,7 @@ glabel func_80241634_DBE8E4 /* DBEB9C 802418EC 00000000 */ nop /* DBEBA0 802418F0 0260202D */ daddu $a0, $s3, $zero /* DBEBA4 802418F4 0280282D */ daddu $a1, $s4, $zero -/* DBEBA8 802418F8 0C09051B */ jal func_8024146C +/* DBEBA8 802418F8 0C09051B */ jal func_8024146C_DBE71C /* DBEBAC 802418FC 02A0302D */ daddu $a2, $s5, $zero /* DBEBB0 80241900 8E630070 */ lw $v1, 0x70($s3) /* DBEBB4 80241904 24020010 */ addiu $v0, $zero, 0x10 @@ -193,7 +193,7 @@ glabel func_80241634_DBE8E4 /* DBEBBC 8024190C 00000000 */ nop /* DBEBC0 80241910 0260202D */ daddu $a0, $s3, $zero /* DBEBC4 80241914 0280282D */ daddu $a1, $s4, $zero -/* DBEBC8 80241918 0C09054F */ jal func_8024153C +/* DBEBC8 80241918 0C09054F */ jal func_8024153C_DBE7EC /* DBEBCC 8024191C 02A0302D */ daddu $a2, $s5, $zero /* DBEBD0 80241920 8E630070 */ lw $v1, 0x70($s3) /* DBEBD4 80241924 24020011 */ addiu $v0, $zero, 0x11 @@ -201,7 +201,7 @@ glabel func_80241634_DBE8E4 /* DBEBDC 8024192C 00000000 */ nop /* DBEBE0 80241930 0260202D */ daddu $a0, $s3, $zero /* DBEBE4 80241934 0280282D */ daddu $a1, $s4, $zero -/* DBEBE8 80241938 0C090575 */ jal func_802415D4 +/* DBEBE8 80241938 0C090575 */ jal func_802415D4_DBE884 /* DBEBEC 8024193C 02A0302D */ daddu $a2, $s5, $zero /* DBEBF0 80241940 08090654 */ j .L80241950 /* DBEBF4 80241944 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210.s deleted file mode 100644 index 000cb7ecac..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242210 -/* DBF4C0 80242210 27BDFF88 */ addiu $sp, $sp, -0x78 -/* DBF4C4 80242214 AFB3004C */ sw $s3, 0x4c($sp) -/* DBF4C8 80242218 0080982D */ daddu $s3, $a0, $zero -/* DBF4CC 8024221C AFBF0054 */ sw $ra, 0x54($sp) -/* DBF4D0 80242220 AFB40050 */ sw $s4, 0x50($sp) -/* DBF4D4 80242224 AFB20048 */ sw $s2, 0x48($sp) -/* DBF4D8 80242228 AFB10044 */ sw $s1, 0x44($sp) -/* DBF4DC 8024222C AFB00040 */ sw $s0, 0x40($sp) -/* DBF4E0 80242230 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* DBF4E4 80242234 F7B80068 */ sdc1 $f24, 0x68($sp) -/* DBF4E8 80242238 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DBF4EC 8024223C F7B40058 */ sdc1 $f20, 0x58($sp) -/* DBF4F0 80242240 8E710148 */ lw $s1, 0x148($s3) -/* DBF4F4 80242244 00A0902D */ daddu $s2, $a1, $zero -/* DBF4F8 80242248 86240008 */ lh $a0, 8($s1) -/* DBF4FC 8024224C 0C00EABB */ jal get_npc_unsafe -/* DBF500 80242250 00C0A02D */ daddu $s4, $a2, $zero -/* DBF504 80242254 0040802D */ daddu $s0, $v0, $zero -/* DBF508 80242258 C6200078 */ lwc1 $f0, 0x78($s1) -/* DBF50C 8024225C 46800020 */ cvt.s.w $f0, $f0 -/* DBF510 80242260 46000021 */ cvt.d.s $f0, $f0 -/* DBF514 80242264 3C014059 */ lui $at, 0x4059 -/* DBF518 80242268 44811800 */ mtc1 $at, $f3 -/* DBF51C 8024226C 44801000 */ mtc1 $zero, $f2 -/* DBF520 80242270 8602008E */ lh $v0, 0x8e($s0) -/* DBF524 80242274 9603008E */ lhu $v1, 0x8e($s0) -/* DBF528 80242278 46220003 */ div.d $f0, $f0, $f2 -/* DBF52C 8024227C 46200620 */ cvt.s.d $f24, $f0 -/* DBF530 80242280 C6200088 */ lwc1 $f0, 0x88($s1) -/* DBF534 80242284 46800020 */ cvt.s.w $f0, $f0 -/* DBF538 80242288 46000021 */ cvt.d.s $f0, $f0 -/* DBF53C 8024228C 46220003 */ div.d $f0, $f0, $f2 -/* DBF540 80242290 46200020 */ cvt.s.d $f0, $f0 -/* DBF544 80242294 18400003 */ blez $v0, .L802422A4 -/* DBF548 80242298 4600C680 */ add.s $f26, $f24, $f0 -/* DBF54C 8024229C 2462FFFF */ addiu $v0, $v1, -1 -/* DBF550 802422A0 A602008E */ sh $v0, 0x8e($s0) -.L802422A4: -/* DBF554 802422A4 8E220070 */ lw $v0, 0x70($s1) -/* DBF558 802422A8 18400034 */ blez $v0, .L8024237C -/* DBF55C 802422AC 00000000 */ nop -/* DBF560 802422B0 C62C0074 */ lwc1 $f12, 0x74($s1) -/* DBF564 802422B4 46806320 */ cvt.s.w $f12, $f12 -/* DBF568 802422B8 44820000 */ mtc1 $v0, $f0 -/* DBF56C 802422BC 00000000 */ nop -/* DBF570 802422C0 46800020 */ cvt.s.w $f0, $f0 -/* DBF574 802422C4 46000021 */ cvt.d.s $f0, $f0 -/* DBF578 802422C8 46220003 */ div.d $f0, $f0, $f2 -/* DBF57C 802422CC 0C00A8BB */ jal sin_deg -/* DBF580 802422D0 462005A0 */ cvt.s.d $f22, $f0 -/* DBF584 802422D4 8E020000 */ lw $v0, ($s0) -/* DBF588 802422D8 30420008 */ andi $v0, $v0, 8 -/* DBF58C 802422DC 10400003 */ beqz $v0, .L802422EC -/* DBF590 802422E0 46000506 */ mov.s $f20, $f0 -/* DBF594 802422E4 080908CB */ j .L8024232C -/* DBF598 802422E8 0000102D */ daddu $v0, $zero, $zero -.L802422EC: -/* DBF59C 802422EC 27A50028 */ addiu $a1, $sp, 0x28 -/* DBF5A0 802422F0 27A6002C */ addiu $a2, $sp, 0x2c -/* DBF5A4 802422F4 C6000038 */ lwc1 $f0, 0x38($s0) -/* DBF5A8 802422F8 C602003C */ lwc1 $f2, 0x3c($s0) -/* DBF5AC 802422FC C6040040 */ lwc1 $f4, 0x40($s0) -/* DBF5B0 80242300 3C01447A */ lui $at, 0x447a -/* DBF5B4 80242304 44813000 */ mtc1 $at, $f6 -/* DBF5B8 80242308 27A20034 */ addiu $v0, $sp, 0x34 -/* DBF5BC 8024230C E7A00028 */ swc1 $f0, 0x28($sp) -/* DBF5C0 80242310 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DBF5C4 80242314 E7A40030 */ swc1 $f4, 0x30($sp) -/* DBF5C8 80242318 E7A60034 */ swc1 $f6, 0x34($sp) -/* DBF5CC 8024231C AFA20010 */ sw $v0, 0x10($sp) -/* DBF5D0 80242320 8E040080 */ lw $a0, 0x80($s0) -/* DBF5D4 80242324 0C0372DF */ jal func_800DCB7C -/* DBF5D8 80242328 27A70030 */ addiu $a3, $sp, 0x30 -.L8024232C: -/* DBF5DC 8024232C 10400007 */ beqz $v0, .L8024234C -/* DBF5E0 80242330 00000000 */ nop -/* DBF5E4 80242334 4616A082 */ mul.s $f2, $f20, $f22 -/* DBF5E8 80242338 00000000 */ nop -/* DBF5EC 8024233C C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DBF5F0 80242340 46180000 */ add.s $f0, $f0, $f24 -/* DBF5F4 80242344 080908D6 */ j .L80242358 -/* DBF5F8 80242348 46020000 */ add.s $f0, $f0, $f2 -.L8024234C: -/* DBF5FC 8024234C 4616A002 */ mul.s $f0, $f20, $f22 -/* DBF600 80242350 00000000 */ nop -/* DBF604 80242354 4600D000 */ add.s $f0, $f26, $f0 -.L80242358: -/* DBF608 80242358 E600003C */ swc1 $f0, 0x3c($s0) -/* DBF60C 8024235C 8E220074 */ lw $v0, 0x74($s1) -/* DBF610 80242360 2442000A */ addiu $v0, $v0, 0xa -/* DBF614 80242364 44826000 */ mtc1 $v0, $f12 -/* DBF618 80242368 00000000 */ nop -/* DBF61C 8024236C 0C00A6C9 */ jal clamp_angle -/* DBF620 80242370 46806320 */ cvt.s.w $f12, $f12 -/* DBF624 80242374 4600020D */ trunc.w.s $f8, $f0 -/* DBF628 80242378 E6280074 */ swc1 $f8, 0x74($s1) -.L8024237C: -/* DBF62C 8024237C 8E220090 */ lw $v0, 0x90($s1) -/* DBF630 80242380 1C400040 */ bgtz $v0, .L80242484 -/* DBF634 80242384 2442FFFF */ addiu $v0, $v0, -1 -/* DBF638 80242388 860200A8 */ lh $v0, 0xa8($s0) -/* DBF63C 8024238C C600003C */ lwc1 $f0, 0x3c($s0) -/* DBF640 80242390 44821000 */ mtc1 $v0, $f2 -/* DBF644 80242394 00000000 */ nop -/* DBF648 80242398 468010A0 */ cvt.s.w $f2, $f2 -/* DBF64C 8024239C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBF650 802423A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBF654 802423A4 46020000 */ add.s $f0, $f0, $f2 -/* DBF658 802423A8 3C014024 */ lui $at, 0x4024 -/* DBF65C 802423AC 44812800 */ mtc1 $at, $f5 -/* DBF660 802423B0 44802000 */ mtc1 $zero, $f4 -/* DBF664 802423B4 C442002C */ lwc1 $f2, 0x2c($v0) -/* DBF668 802423B8 46000021 */ cvt.d.s $f0, $f0 -/* DBF66C 802423BC 46240000 */ add.d $f0, $f0, $f4 -/* DBF670 802423C0 460010A1 */ cvt.d.s $f2, $f2 -/* DBF674 802423C4 4620103C */ c.lt.d $f2, $f0 -/* DBF678 802423C8 00000000 */ nop -/* DBF67C 802423CC 4500002E */ bc1f .L80242488 -/* DBF680 802423D0 0280202D */ daddu $a0, $s4, $zero -/* DBF684 802423D4 24020001 */ addiu $v0, $zero, 1 -/* DBF688 802423D8 AFA20010 */ sw $v0, 0x10($sp) -/* DBF68C 802423DC 8E460024 */ lw $a2, 0x24($s2) -/* DBF690 802423E0 8E470028 */ lw $a3, 0x28($s2) -/* DBF694 802423E4 0C01242D */ jal func_800490B4 -/* DBF698 802423E8 0220282D */ daddu $a1, $s1, $zero -/* DBF69C 802423EC 10400026 */ beqz $v0, .L80242488 -/* DBF6A0 802423F0 0000202D */ daddu $a0, $zero, $zero -/* DBF6A4 802423F4 0200282D */ daddu $a1, $s0, $zero -/* DBF6A8 802423F8 0000302D */ daddu $a2, $zero, $zero -/* DBF6AC 802423FC 2412000C */ addiu $s2, $zero, 0xc -/* DBF6B0 80242400 860300A8 */ lh $v1, 0xa8($s0) -/* DBF6B4 80242404 3C013F80 */ lui $at, 0x3f80 -/* DBF6B8 80242408 44810000 */ mtc1 $at, $f0 -/* DBF6BC 8024240C 3C014000 */ lui $at, 0x4000 -/* DBF6C0 80242410 44811000 */ mtc1 $at, $f2 -/* DBF6C4 80242414 3C01C1A0 */ lui $at, 0xc1a0 -/* DBF6C8 80242418 44812000 */ mtc1 $at, $f4 -/* DBF6CC 8024241C 44834000 */ mtc1 $v1, $f8 -/* DBF6D0 80242420 00000000 */ nop -/* DBF6D4 80242424 46804220 */ cvt.s.w $f8, $f8 -/* DBF6D8 80242428 44074000 */ mfc1 $a3, $f8 -/* DBF6DC 8024242C 27A20038 */ addiu $v0, $sp, 0x38 -/* DBF6E0 80242430 AFB2001C */ sw $s2, 0x1c($sp) -/* DBF6E4 80242434 AFA20020 */ sw $v0, 0x20($sp) -/* DBF6E8 80242438 E7A00010 */ swc1 $f0, 0x10($sp) -/* DBF6EC 8024243C E7A20014 */ swc1 $f2, 0x14($sp) -/* DBF6F0 80242440 0C01BFA4 */ jal fx_emote -/* DBF6F4 80242444 E7A40018 */ swc1 $f4, 0x18($sp) -/* DBF6F8 80242448 0200202D */ daddu $a0, $s0, $zero -/* DBF6FC 8024244C 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DBF700 80242450 C480003C */ lwc1 $f0, 0x3c($a0) -/* DBF704 80242454 3C060020 */ lui $a2, 0x20 -/* DBF708 80242458 0C012530 */ jal func_800494C0 -/* DBF70C 8024245C E4800064 */ swc1 $f0, 0x64($a0) -/* DBF710 80242460 8E220018 */ lw $v0, 0x18($s1) -/* DBF714 80242464 9442002A */ lhu $v0, 0x2a($v0) -/* DBF718 80242468 30420001 */ andi $v0, $v0, 1 -/* DBF71C 8024246C 10400003 */ beqz $v0, .L8024247C -/* DBF720 80242470 2402000A */ addiu $v0, $zero, 0xa -/* DBF724 80242474 08090949 */ j .L80242524 -/* DBF728 80242478 AE620070 */ sw $v0, 0x70($s3) -.L8024247C: -/* DBF72C 8024247C 08090949 */ j .L80242524 -/* DBF730 80242480 AE720070 */ sw $s2, 0x70($s3) -.L80242484: -/* DBF734 80242484 AE220090 */ sw $v0, 0x90($s1) -.L80242488: -/* DBF738 80242488 8602008C */ lh $v0, 0x8c($s0) -/* DBF73C 8024248C 14400025 */ bnez $v0, .L80242524 -/* DBF740 80242490 00000000 */ nop -/* DBF744 80242494 8602008E */ lh $v0, 0x8e($s0) -/* DBF748 80242498 1C400022 */ bgtz $v0, .L80242524 -/* DBF74C 8024249C 00000000 */ nop -/* DBF750 802424A0 8E620074 */ lw $v0, 0x74($s3) -/* DBF754 802424A4 2442FFFF */ addiu $v0, $v0, -1 -/* DBF758 802424A8 1840001D */ blez $v0, .L80242520 -/* DBF75C 802424AC AE620074 */ sw $v0, 0x74($s3) -/* DBF760 802424B0 8E220018 */ lw $v0, 0x18($s1) -/* DBF764 802424B4 9442002A */ lhu $v0, 0x2a($v0) -/* DBF768 802424B8 30420010 */ andi $v0, $v0, 0x10 -/* DBF76C 802424BC 14400007 */ bnez $v0, .L802424DC -/* DBF770 802424C0 00000000 */ nop -/* DBF774 802424C4 C600000C */ lwc1 $f0, 0xc($s0) -/* DBF778 802424C8 3C014334 */ lui $at, 0x4334 -/* DBF77C 802424CC 44816000 */ mtc1 $at, $f12 -/* DBF780 802424D0 0C00A6C9 */ jal clamp_angle -/* DBF784 802424D4 460C0300 */ add.s $f12, $f0, $f12 -/* DBF788 802424D8 E600000C */ swc1 $f0, 0xc($s0) -.L802424DC: -/* DBF78C 802424DC 0C00A67F */ jal rand_int -/* DBF790 802424E0 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DBF794 802424E4 3C032E8B */ lui $v1, 0x2e8b -/* DBF798 802424E8 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* DBF79C 802424EC 00430018 */ mult $v0, $v1 -/* DBF7A0 802424F0 00021FC3 */ sra $v1, $v0, 0x1f -/* DBF7A4 802424F4 00004010 */ mfhi $t0 -/* DBF7A8 802424F8 00082043 */ sra $a0, $t0, 1 -/* DBF7AC 802424FC 00832023 */ subu $a0, $a0, $v1 -/* DBF7B0 80242500 00041840 */ sll $v1, $a0, 1 -/* DBF7B4 80242504 00641821 */ addu $v1, $v1, $a0 -/* DBF7B8 80242508 00031880 */ sll $v1, $v1, 2 -/* DBF7BC 8024250C 00641823 */ subu $v1, $v1, $a0 -/* DBF7C0 80242510 00431023 */ subu $v0, $v0, $v1 -/* DBF7C4 80242514 24420005 */ addiu $v0, $v0, 5 -/* DBF7C8 80242518 08090949 */ j .L80242524 -/* DBF7CC 8024251C A602008E */ sh $v0, 0x8e($s0) -.L80242520: -/* DBF7D0 80242520 AE600070 */ sw $zero, 0x70($s3) -.L80242524: -/* DBF7D4 80242524 8FBF0054 */ lw $ra, 0x54($sp) -/* DBF7D8 80242528 8FB40050 */ lw $s4, 0x50($sp) -/* DBF7DC 8024252C 8FB3004C */ lw $s3, 0x4c($sp) -/* DBF7E0 80242530 8FB20048 */ lw $s2, 0x48($sp) -/* DBF7E4 80242534 8FB10044 */ lw $s1, 0x44($sp) -/* DBF7E8 80242538 8FB00040 */ lw $s0, 0x40($sp) -/* DBF7EC 8024253C D7BA0070 */ ldc1 $f26, 0x70($sp) -/* DBF7F0 80242540 D7B80068 */ ldc1 $f24, 0x68($sp) -/* DBF7F4 80242544 D7B60060 */ ldc1 $f22, 0x60($sp) -/* DBF7F8 80242548 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DBF7FC 8024254C 03E00008 */ jr $ra -/* DBF800 80242550 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s new file mode 100644 index 0000000000..1b658df0a7 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242210_DBF4C0.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242210_DBF4C0 +/* DBF4C0 80242210 27BDFF88 */ addiu $sp, $sp, -0x78 +/* DBF4C4 80242214 AFB3004C */ sw $s3, 0x4c($sp) +/* DBF4C8 80242218 0080982D */ daddu $s3, $a0, $zero +/* DBF4CC 8024221C AFBF0054 */ sw $ra, 0x54($sp) +/* DBF4D0 80242220 AFB40050 */ sw $s4, 0x50($sp) +/* DBF4D4 80242224 AFB20048 */ sw $s2, 0x48($sp) +/* DBF4D8 80242228 AFB10044 */ sw $s1, 0x44($sp) +/* DBF4DC 8024222C AFB00040 */ sw $s0, 0x40($sp) +/* DBF4E0 80242230 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* DBF4E4 80242234 F7B80068 */ sdc1 $f24, 0x68($sp) +/* DBF4E8 80242238 F7B60060 */ sdc1 $f22, 0x60($sp) +/* DBF4EC 8024223C F7B40058 */ sdc1 $f20, 0x58($sp) +/* DBF4F0 80242240 8E710148 */ lw $s1, 0x148($s3) +/* DBF4F4 80242244 00A0902D */ daddu $s2, $a1, $zero +/* DBF4F8 80242248 86240008 */ lh $a0, 8($s1) +/* DBF4FC 8024224C 0C00EABB */ jal get_npc_unsafe +/* DBF500 80242250 00C0A02D */ daddu $s4, $a2, $zero +/* DBF504 80242254 0040802D */ daddu $s0, $v0, $zero +/* DBF508 80242258 C6200078 */ lwc1 $f0, 0x78($s1) +/* DBF50C 8024225C 46800020 */ cvt.s.w $f0, $f0 +/* DBF510 80242260 46000021 */ cvt.d.s $f0, $f0 +/* DBF514 80242264 3C014059 */ lui $at, 0x4059 +/* DBF518 80242268 44811800 */ mtc1 $at, $f3 +/* DBF51C 8024226C 44801000 */ mtc1 $zero, $f2 +/* DBF520 80242270 8602008E */ lh $v0, 0x8e($s0) +/* DBF524 80242274 9603008E */ lhu $v1, 0x8e($s0) +/* DBF528 80242278 46220003 */ div.d $f0, $f0, $f2 +/* DBF52C 8024227C 46200620 */ cvt.s.d $f24, $f0 +/* DBF530 80242280 C6200088 */ lwc1 $f0, 0x88($s1) +/* DBF534 80242284 46800020 */ cvt.s.w $f0, $f0 +/* DBF538 80242288 46000021 */ cvt.d.s $f0, $f0 +/* DBF53C 8024228C 46220003 */ div.d $f0, $f0, $f2 +/* DBF540 80242290 46200020 */ cvt.s.d $f0, $f0 +/* DBF544 80242294 18400003 */ blez $v0, .L802422A4 +/* DBF548 80242298 4600C680 */ add.s $f26, $f24, $f0 +/* DBF54C 8024229C 2462FFFF */ addiu $v0, $v1, -1 +/* DBF550 802422A0 A602008E */ sh $v0, 0x8e($s0) +.L802422A4: +/* DBF554 802422A4 8E220070 */ lw $v0, 0x70($s1) +/* DBF558 802422A8 18400034 */ blez $v0, .L8024237C +/* DBF55C 802422AC 00000000 */ nop +/* DBF560 802422B0 C62C0074 */ lwc1 $f12, 0x74($s1) +/* DBF564 802422B4 46806320 */ cvt.s.w $f12, $f12 +/* DBF568 802422B8 44820000 */ mtc1 $v0, $f0 +/* DBF56C 802422BC 00000000 */ nop +/* DBF570 802422C0 46800020 */ cvt.s.w $f0, $f0 +/* DBF574 802422C4 46000021 */ cvt.d.s $f0, $f0 +/* DBF578 802422C8 46220003 */ div.d $f0, $f0, $f2 +/* DBF57C 802422CC 0C00A8BB */ jal sin_deg +/* DBF580 802422D0 462005A0 */ cvt.s.d $f22, $f0 +/* DBF584 802422D4 8E020000 */ lw $v0, ($s0) +/* DBF588 802422D8 30420008 */ andi $v0, $v0, 8 +/* DBF58C 802422DC 10400003 */ beqz $v0, .L802422EC +/* DBF590 802422E0 46000506 */ mov.s $f20, $f0 +/* DBF594 802422E4 080908CB */ j .L8024232C +/* DBF598 802422E8 0000102D */ daddu $v0, $zero, $zero +.L802422EC: +/* DBF59C 802422EC 27A50028 */ addiu $a1, $sp, 0x28 +/* DBF5A0 802422F0 27A6002C */ addiu $a2, $sp, 0x2c +/* DBF5A4 802422F4 C6000038 */ lwc1 $f0, 0x38($s0) +/* DBF5A8 802422F8 C602003C */ lwc1 $f2, 0x3c($s0) +/* DBF5AC 802422FC C6040040 */ lwc1 $f4, 0x40($s0) +/* DBF5B0 80242300 3C01447A */ lui $at, 0x447a +/* DBF5B4 80242304 44813000 */ mtc1 $at, $f6 +/* DBF5B8 80242308 27A20034 */ addiu $v0, $sp, 0x34 +/* DBF5BC 8024230C E7A00028 */ swc1 $f0, 0x28($sp) +/* DBF5C0 80242310 E7A2002C */ swc1 $f2, 0x2c($sp) +/* DBF5C4 80242314 E7A40030 */ swc1 $f4, 0x30($sp) +/* DBF5C8 80242318 E7A60034 */ swc1 $f6, 0x34($sp) +/* DBF5CC 8024231C AFA20010 */ sw $v0, 0x10($sp) +/* DBF5D0 80242320 8E040080 */ lw $a0, 0x80($s0) +/* DBF5D4 80242324 0C0372DF */ jal func_800DCB7C +/* DBF5D8 80242328 27A70030 */ addiu $a3, $sp, 0x30 +.L8024232C: +/* DBF5DC 8024232C 10400007 */ beqz $v0, .L8024234C +/* DBF5E0 80242330 00000000 */ nop +/* DBF5E4 80242334 4616A082 */ mul.s $f2, $f20, $f22 +/* DBF5E8 80242338 00000000 */ nop +/* DBF5EC 8024233C C7A0002C */ lwc1 $f0, 0x2c($sp) +/* DBF5F0 80242340 46180000 */ add.s $f0, $f0, $f24 +/* DBF5F4 80242344 080908D6 */ j .L80242358 +/* DBF5F8 80242348 46020000 */ add.s $f0, $f0, $f2 +.L8024234C: +/* DBF5FC 8024234C 4616A002 */ mul.s $f0, $f20, $f22 +/* DBF600 80242350 00000000 */ nop +/* DBF604 80242354 4600D000 */ add.s $f0, $f26, $f0 +.L80242358: +/* DBF608 80242358 E600003C */ swc1 $f0, 0x3c($s0) +/* DBF60C 8024235C 8E220074 */ lw $v0, 0x74($s1) +/* DBF610 80242360 2442000A */ addiu $v0, $v0, 0xa +/* DBF614 80242364 44826000 */ mtc1 $v0, $f12 +/* DBF618 80242368 00000000 */ nop +/* DBF61C 8024236C 0C00A6C9 */ jal clamp_angle +/* DBF620 80242370 46806320 */ cvt.s.w $f12, $f12 +/* DBF624 80242374 4600020D */ trunc.w.s $f8, $f0 +/* DBF628 80242378 E6280074 */ swc1 $f8, 0x74($s1) +.L8024237C: +/* DBF62C 8024237C 8E220090 */ lw $v0, 0x90($s1) +/* DBF630 80242380 1C400040 */ bgtz $v0, .L80242484 +/* DBF634 80242384 2442FFFF */ addiu $v0, $v0, -1 +/* DBF638 80242388 860200A8 */ lh $v0, 0xa8($s0) +/* DBF63C 8024238C C600003C */ lwc1 $f0, 0x3c($s0) +/* DBF640 80242390 44821000 */ mtc1 $v0, $f2 +/* DBF644 80242394 00000000 */ nop +/* DBF648 80242398 468010A0 */ cvt.s.w $f2, $f2 +/* DBF64C 8024239C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DBF650 802423A0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DBF654 802423A4 46020000 */ add.s $f0, $f0, $f2 +/* DBF658 802423A8 3C014024 */ lui $at, 0x4024 +/* DBF65C 802423AC 44812800 */ mtc1 $at, $f5 +/* DBF660 802423B0 44802000 */ mtc1 $zero, $f4 +/* DBF664 802423B4 C442002C */ lwc1 $f2, 0x2c($v0) +/* DBF668 802423B8 46000021 */ cvt.d.s $f0, $f0 +/* DBF66C 802423BC 46240000 */ add.d $f0, $f0, $f4 +/* DBF670 802423C0 460010A1 */ cvt.d.s $f2, $f2 +/* DBF674 802423C4 4620103C */ c.lt.d $f2, $f0 +/* DBF678 802423C8 00000000 */ nop +/* DBF67C 802423CC 4500002E */ bc1f .L80242488 +/* DBF680 802423D0 0280202D */ daddu $a0, $s4, $zero +/* DBF684 802423D4 24020001 */ addiu $v0, $zero, 1 +/* DBF688 802423D8 AFA20010 */ sw $v0, 0x10($sp) +/* DBF68C 802423DC 8E460024 */ lw $a2, 0x24($s2) +/* DBF690 802423E0 8E470028 */ lw $a3, 0x28($s2) +/* DBF694 802423E4 0C01242D */ jal func_800490B4 +/* DBF698 802423E8 0220282D */ daddu $a1, $s1, $zero +/* DBF69C 802423EC 10400026 */ beqz $v0, .L80242488 +/* DBF6A0 802423F0 0000202D */ daddu $a0, $zero, $zero +/* DBF6A4 802423F4 0200282D */ daddu $a1, $s0, $zero +/* DBF6A8 802423F8 0000302D */ daddu $a2, $zero, $zero +/* DBF6AC 802423FC 2412000C */ addiu $s2, $zero, 0xc +/* DBF6B0 80242400 860300A8 */ lh $v1, 0xa8($s0) +/* DBF6B4 80242404 3C013F80 */ lui $at, 0x3f80 +/* DBF6B8 80242408 44810000 */ mtc1 $at, $f0 +/* DBF6BC 8024240C 3C014000 */ lui $at, 0x4000 +/* DBF6C0 80242410 44811000 */ mtc1 $at, $f2 +/* DBF6C4 80242414 3C01C1A0 */ lui $at, 0xc1a0 +/* DBF6C8 80242418 44812000 */ mtc1 $at, $f4 +/* DBF6CC 8024241C 44834000 */ mtc1 $v1, $f8 +/* DBF6D0 80242420 00000000 */ nop +/* DBF6D4 80242424 46804220 */ cvt.s.w $f8, $f8 +/* DBF6D8 80242428 44074000 */ mfc1 $a3, $f8 +/* DBF6DC 8024242C 27A20038 */ addiu $v0, $sp, 0x38 +/* DBF6E0 80242430 AFB2001C */ sw $s2, 0x1c($sp) +/* DBF6E4 80242434 AFA20020 */ sw $v0, 0x20($sp) +/* DBF6E8 80242438 E7A00010 */ swc1 $f0, 0x10($sp) +/* DBF6EC 8024243C E7A20014 */ swc1 $f2, 0x14($sp) +/* DBF6F0 80242440 0C01BFA4 */ jal fx_emote +/* DBF6F4 80242444 E7A40018 */ swc1 $f4, 0x18($sp) +/* DBF6F8 80242448 0200202D */ daddu $a0, $s0, $zero +/* DBF6FC 8024244C 240502F4 */ addiu $a1, $zero, 0x2f4 +/* DBF700 80242450 C480003C */ lwc1 $f0, 0x3c($a0) +/* DBF704 80242454 3C060020 */ lui $a2, 0x20 +/* DBF708 80242458 0C012530 */ jal func_800494C0 +/* DBF70C 8024245C E4800064 */ swc1 $f0, 0x64($a0) +/* DBF710 80242460 8E220018 */ lw $v0, 0x18($s1) +/* DBF714 80242464 9442002A */ lhu $v0, 0x2a($v0) +/* DBF718 80242468 30420001 */ andi $v0, $v0, 1 +/* DBF71C 8024246C 10400003 */ beqz $v0, .L8024247C +/* DBF720 80242470 2402000A */ addiu $v0, $zero, 0xa +/* DBF724 80242474 08090949 */ j .L80242524 +/* DBF728 80242478 AE620070 */ sw $v0, 0x70($s3) +.L8024247C: +/* DBF72C 8024247C 08090949 */ j .L80242524 +/* DBF730 80242480 AE720070 */ sw $s2, 0x70($s3) +.L80242484: +/* DBF734 80242484 AE220090 */ sw $v0, 0x90($s1) +.L80242488: +/* DBF738 80242488 8602008C */ lh $v0, 0x8c($s0) +/* DBF73C 8024248C 14400025 */ bnez $v0, .L80242524 +/* DBF740 80242490 00000000 */ nop +/* DBF744 80242494 8602008E */ lh $v0, 0x8e($s0) +/* DBF748 80242498 1C400022 */ bgtz $v0, .L80242524 +/* DBF74C 8024249C 00000000 */ nop +/* DBF750 802424A0 8E620074 */ lw $v0, 0x74($s3) +/* DBF754 802424A4 2442FFFF */ addiu $v0, $v0, -1 +/* DBF758 802424A8 1840001D */ blez $v0, .L80242520 +/* DBF75C 802424AC AE620074 */ sw $v0, 0x74($s3) +/* DBF760 802424B0 8E220018 */ lw $v0, 0x18($s1) +/* DBF764 802424B4 9442002A */ lhu $v0, 0x2a($v0) +/* DBF768 802424B8 30420010 */ andi $v0, $v0, 0x10 +/* DBF76C 802424BC 14400007 */ bnez $v0, .L802424DC +/* DBF770 802424C0 00000000 */ nop +/* DBF774 802424C4 C600000C */ lwc1 $f0, 0xc($s0) +/* DBF778 802424C8 3C014334 */ lui $at, 0x4334 +/* DBF77C 802424CC 44816000 */ mtc1 $at, $f12 +/* DBF780 802424D0 0C00A6C9 */ jal clamp_angle +/* DBF784 802424D4 460C0300 */ add.s $f12, $f0, $f12 +/* DBF788 802424D8 E600000C */ swc1 $f0, 0xc($s0) +.L802424DC: +/* DBF78C 802424DC 0C00A67F */ jal rand_int +/* DBF790 802424E0 240403E8 */ addiu $a0, $zero, 0x3e8 +/* DBF794 802424E4 3C032E8B */ lui $v1, 0x2e8b +/* DBF798 802424E8 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* DBF79C 802424EC 00430018 */ mult $v0, $v1 +/* DBF7A0 802424F0 00021FC3 */ sra $v1, $v0, 0x1f +/* DBF7A4 802424F4 00004010 */ mfhi $t0 +/* DBF7A8 802424F8 00082043 */ sra $a0, $t0, 1 +/* DBF7AC 802424FC 00832023 */ subu $a0, $a0, $v1 +/* DBF7B0 80242500 00041840 */ sll $v1, $a0, 1 +/* DBF7B4 80242504 00641821 */ addu $v1, $v1, $a0 +/* DBF7B8 80242508 00031880 */ sll $v1, $v1, 2 +/* DBF7BC 8024250C 00641823 */ subu $v1, $v1, $a0 +/* DBF7C0 80242510 00431023 */ subu $v0, $v0, $v1 +/* DBF7C4 80242514 24420005 */ addiu $v0, $v0, 5 +/* DBF7C8 80242518 08090949 */ j .L80242524 +/* DBF7CC 8024251C A602008E */ sh $v0, 0x8e($s0) +.L80242520: +/* DBF7D0 80242520 AE600070 */ sw $zero, 0x70($s3) +.L80242524: +/* DBF7D4 80242524 8FBF0054 */ lw $ra, 0x54($sp) +/* DBF7D8 80242528 8FB40050 */ lw $s4, 0x50($sp) +/* DBF7DC 8024252C 8FB3004C */ lw $s3, 0x4c($sp) +/* DBF7E0 80242530 8FB20048 */ lw $s2, 0x48($sp) +/* DBF7E4 80242534 8FB10044 */ lw $s1, 0x44($sp) +/* DBF7E8 80242538 8FB00040 */ lw $s0, 0x40($sp) +/* DBF7EC 8024253C D7BA0070 */ ldc1 $f26, 0x70($sp) +/* DBF7F0 80242540 D7B80068 */ ldc1 $f24, 0x68($sp) +/* DBF7F4 80242544 D7B60060 */ ldc1 $f22, 0x60($sp) +/* DBF7F8 80242548 D7B40058 */ ldc1 $f20, 0x58($sp) +/* DBF7FC 8024254C 03E00008 */ jr $ra +/* DBF800 80242550 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC.s deleted file mode 100644 index 97d76d819b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425CC -/* DBF87C 802425CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DBF880 802425D0 AFB00010 */ sw $s0, 0x10($sp) -/* DBF884 802425D4 0080802D */ daddu $s0, $a0, $zero -/* DBF888 802425D8 AFBF0014 */ sw $ra, 0x14($sp) -/* DBF88C 802425DC 8E020148 */ lw $v0, 0x148($s0) -/* DBF890 802425E0 0C00EABB */ jal get_npc_unsafe -/* DBF894 802425E4 84440008 */ lh $a0, 8($v0) -/* DBF898 802425E8 9443008E */ lhu $v1, 0x8e($v0) -/* DBF89C 802425EC C440003C */ lwc1 $f0, 0x3c($v0) -/* DBF8A0 802425F0 24640001 */ addiu $a0, $v1, 1 -/* DBF8A4 802425F4 00031C00 */ sll $v1, $v1, 0x10 -/* DBF8A8 802425F8 00031B83 */ sra $v1, $v1, 0xe -/* DBF8AC 802425FC A444008E */ sh $a0, 0x8e($v0) -/* DBF8B0 80242600 3C018024 */ lui $at, 0x8024 -/* DBF8B4 80242604 00230821 */ addu $at, $at, $v1 -/* DBF8B8 80242608 C4223A14 */ lwc1 $f2, 0x3a14($at) -/* DBF8BC 8024260C 8443008E */ lh $v1, 0x8e($v0) -/* DBF8C0 80242610 46020000 */ add.s $f0, $f0, $f2 -/* DBF8C4 80242614 28630005 */ slti $v1, $v1, 5 -/* DBF8C8 80242618 14600003 */ bnez $v1, .L80242628 -/* DBF8CC 8024261C E440003C */ swc1 $f0, 0x3c($v0) -/* DBF8D0 80242620 2402000C */ addiu $v0, $zero, 0xc -/* DBF8D4 80242624 AE020070 */ sw $v0, 0x70($s0) -.L80242628: -/* DBF8D8 80242628 8FBF0014 */ lw $ra, 0x14($sp) -/* DBF8DC 8024262C 8FB00010 */ lw $s0, 0x10($sp) -/* DBF8E0 80242630 03E00008 */ jr $ra -/* DBF8E4 80242634 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s new file mode 100644 index 0000000000..1c29a826cc --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_802425CC_DBF87C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425CC_DBF87C +/* DBF87C 802425CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DBF880 802425D0 AFB00010 */ sw $s0, 0x10($sp) +/* DBF884 802425D4 0080802D */ daddu $s0, $a0, $zero +/* DBF888 802425D8 AFBF0014 */ sw $ra, 0x14($sp) +/* DBF88C 802425DC 8E020148 */ lw $v0, 0x148($s0) +/* DBF890 802425E0 0C00EABB */ jal get_npc_unsafe +/* DBF894 802425E4 84440008 */ lh $a0, 8($v0) +/* DBF898 802425E8 9443008E */ lhu $v1, 0x8e($v0) +/* DBF89C 802425EC C440003C */ lwc1 $f0, 0x3c($v0) +/* DBF8A0 802425F0 24640001 */ addiu $a0, $v1, 1 +/* DBF8A4 802425F4 00031C00 */ sll $v1, $v1, 0x10 +/* DBF8A8 802425F8 00031B83 */ sra $v1, $v1, 0xe +/* DBF8AC 802425FC A444008E */ sh $a0, 0x8e($v0) +/* DBF8B0 80242600 3C018024 */ lui $at, 0x8024 +/* DBF8B4 80242604 00230821 */ addu $at, $at, $v1 +/* DBF8B8 80242608 C4223A14 */ lwc1 $f2, 0x3a14($at) +/* DBF8BC 8024260C 8443008E */ lh $v1, 0x8e($v0) +/* DBF8C0 80242610 46020000 */ add.s $f0, $f0, $f2 +/* DBF8C4 80242614 28630005 */ slti $v1, $v1, 5 +/* DBF8C8 80242618 14600003 */ bnez $v1, .L80242628 +/* DBF8CC 8024261C E440003C */ swc1 $f0, 0x3c($v0) +/* DBF8D0 80242620 2402000C */ addiu $v0, $zero, 0xc +/* DBF8D4 80242624 AE020070 */ sw $v0, 0x70($s0) +.L80242628: +/* DBF8D8 80242628 8FBF0014 */ lw $ra, 0x14($sp) +/* DBF8DC 8024262C 8FB00010 */ lw $s0, 0x10($sp) +/* DBF8E0 80242630 03E00008 */ jr $ra +/* DBF8E4 80242634 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638.s deleted file mode 100644 index dccac581b6..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242638 -/* DBF8E8 80242638 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DBF8EC 8024263C AFB3001C */ sw $s3, 0x1c($sp) -/* DBF8F0 80242640 0080982D */ daddu $s3, $a0, $zero -/* DBF8F4 80242644 AFBF0020 */ sw $ra, 0x20($sp) -/* DBF8F8 80242648 AFB20018 */ sw $s2, 0x18($sp) -/* DBF8FC 8024264C AFB10014 */ sw $s1, 0x14($sp) -/* DBF900 80242650 AFB00010 */ sw $s0, 0x10($sp) -/* DBF904 80242654 8E720148 */ lw $s2, 0x148($s3) -/* DBF908 80242658 86440008 */ lh $a0, 8($s2) -/* DBF90C 8024265C 0C00EABB */ jal get_npc_unsafe -/* DBF910 80242660 00A0802D */ daddu $s0, $a1, $zero -/* DBF914 80242664 0040882D */ daddu $s1, $v0, $zero -/* DBF918 80242668 C6420080 */ lwc1 $f2, 0x80($s2) -/* DBF91C 8024266C 468010A0 */ cvt.s.w $f2, $f2 -/* DBF920 80242670 460010A1 */ cvt.d.s $f2, $f2 -/* DBF924 80242674 C6400084 */ lwc1 $f0, 0x84($s2) -/* DBF928 80242678 46800020 */ cvt.s.w $f0, $f0 -/* DBF92C 8024267C 46000021 */ cvt.d.s $f0, $f0 -/* DBF930 80242680 3C014059 */ lui $at, 0x4059 -/* DBF934 80242684 44812800 */ mtc1 $at, $f5 -/* DBF938 80242688 44802000 */ mtc1 $zero, $f4 -/* DBF93C 8024268C 8E4200CC */ lw $v0, 0xcc($s2) -/* DBF940 80242690 C62C0038 */ lwc1 $f12, 0x38($s1) -/* DBF944 80242694 C62E0040 */ lwc1 $f14, 0x40($s1) -/* DBF948 80242698 46241083 */ div.d $f2, $f2, $f4 -/* DBF94C 8024269C 462010A0 */ cvt.s.d $f2, $f2 -/* DBF950 802426A0 46240003 */ div.d $f0, $f0, $f4 -/* DBF954 802426A4 8C420020 */ lw $v0, 0x20($v0) -/* DBF958 802426A8 46200020 */ cvt.s.d $f0, $f0 -/* DBF95C 802426AC E622001C */ swc1 $f2, 0x1c($s1) -/* DBF960 802426B0 E6200014 */ swc1 $f0, 0x14($s1) -/* DBF964 802426B4 AE220028 */ sw $v0, 0x28($s1) -/* DBF968 802426B8 C6000018 */ lwc1 $f0, 0x18($s0) -/* DBF96C 802426BC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DBF970 802426C0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DBF974 802426C4 E6200018 */ swc1 $f0, 0x18($s1) -/* DBF978 802426C8 8C460028 */ lw $a2, 0x28($v0) -/* DBF97C 802426CC 0C00A720 */ jal atan2 -/* DBF980 802426D0 8C470030 */ lw $a3, 0x30($v0) -/* DBF984 802426D4 E620000C */ swc1 $f0, 0xc($s1) -/* DBF988 802426D8 8E420018 */ lw $v0, 0x18($s2) -/* DBF98C 802426DC AE400074 */ sw $zero, 0x74($s2) -/* DBF990 802426E0 9442002A */ lhu $v0, 0x2a($v0) -/* DBF994 802426E4 30420002 */ andi $v0, $v0, 2 -/* DBF998 802426E8 10400005 */ beqz $v0, .L80242700 -/* DBF99C 802426EC 24020003 */ addiu $v0, $zero, 3 -/* DBF9A0 802426F0 A622008E */ sh $v0, 0x8e($s1) -/* DBF9A4 802426F4 2402000D */ addiu $v0, $zero, 0xd -/* DBF9A8 802426F8 080909D4 */ j .L80242750 -/* DBF9AC 802426FC AE620070 */ sw $v0, 0x70($s3) -.L80242700: -/* DBF9B0 80242700 24030001 */ addiu $v1, $zero, 1 -/* DBF9B4 80242704 2402000E */ addiu $v0, $zero, 0xe -/* DBF9B8 80242708 A623008E */ sh $v1, 0x8e($s1) -/* DBF9BC 8024270C AE620070 */ sw $v0, 0x70($s3) -/* DBF9C0 80242710 C6200038 */ lwc1 $f0, 0x38($s1) -/* DBF9C4 80242714 4600018D */ trunc.w.s $f6, $f0 -/* DBF9C8 80242718 44023000 */ mfc1 $v0, $f6 -/* DBF9CC 8024271C 00000000 */ nop -/* DBF9D0 80242720 A6420010 */ sh $v0, 0x10($s2) -/* DBF9D4 80242724 C620003C */ lwc1 $f0, 0x3c($s1) -/* DBF9D8 80242728 4600018D */ trunc.w.s $f6, $f0 -/* DBF9DC 8024272C 44023000 */ mfc1 $v0, $f6 -/* DBF9E0 80242730 00000000 */ nop -/* DBF9E4 80242734 A6420012 */ sh $v0, 0x12($s2) -/* DBF9E8 80242738 C6200040 */ lwc1 $f0, 0x40($s1) -/* DBF9EC 8024273C A2430007 */ sb $v1, 7($s2) -/* DBF9F0 80242740 4600018D */ trunc.w.s $f6, $f0 -/* DBF9F4 80242744 44023000 */ mfc1 $v0, $f6 -/* DBF9F8 80242748 00000000 */ nop -/* DBF9FC 8024274C A6420014 */ sh $v0, 0x14($s2) -.L80242750: -/* DBFA00 80242750 8FBF0020 */ lw $ra, 0x20($sp) -/* DBFA04 80242754 8FB3001C */ lw $s3, 0x1c($sp) -/* DBFA08 80242758 8FB20018 */ lw $s2, 0x18($sp) -/* DBFA0C 8024275C 8FB10014 */ lw $s1, 0x14($sp) -/* DBFA10 80242760 8FB00010 */ lw $s0, 0x10($sp) -/* DBFA14 80242764 03E00008 */ jr $ra -/* DBFA18 80242768 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s new file mode 100644 index 0000000000..458de808a6 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242638_DBF8E8.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242638_DBF8E8 +/* DBF8E8 80242638 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* DBF8EC 8024263C AFB3001C */ sw $s3, 0x1c($sp) +/* DBF8F0 80242640 0080982D */ daddu $s3, $a0, $zero +/* DBF8F4 80242644 AFBF0020 */ sw $ra, 0x20($sp) +/* DBF8F8 80242648 AFB20018 */ sw $s2, 0x18($sp) +/* DBF8FC 8024264C AFB10014 */ sw $s1, 0x14($sp) +/* DBF900 80242650 AFB00010 */ sw $s0, 0x10($sp) +/* DBF904 80242654 8E720148 */ lw $s2, 0x148($s3) +/* DBF908 80242658 86440008 */ lh $a0, 8($s2) +/* DBF90C 8024265C 0C00EABB */ jal get_npc_unsafe +/* DBF910 80242660 00A0802D */ daddu $s0, $a1, $zero +/* DBF914 80242664 0040882D */ daddu $s1, $v0, $zero +/* DBF918 80242668 C6420080 */ lwc1 $f2, 0x80($s2) +/* DBF91C 8024266C 468010A0 */ cvt.s.w $f2, $f2 +/* DBF920 80242670 460010A1 */ cvt.d.s $f2, $f2 +/* DBF924 80242674 C6400084 */ lwc1 $f0, 0x84($s2) +/* DBF928 80242678 46800020 */ cvt.s.w $f0, $f0 +/* DBF92C 8024267C 46000021 */ cvt.d.s $f0, $f0 +/* DBF930 80242680 3C014059 */ lui $at, 0x4059 +/* DBF934 80242684 44812800 */ mtc1 $at, $f5 +/* DBF938 80242688 44802000 */ mtc1 $zero, $f4 +/* DBF93C 8024268C 8E4200CC */ lw $v0, 0xcc($s2) +/* DBF940 80242690 C62C0038 */ lwc1 $f12, 0x38($s1) +/* DBF944 80242694 C62E0040 */ lwc1 $f14, 0x40($s1) +/* DBF948 80242698 46241083 */ div.d $f2, $f2, $f4 +/* DBF94C 8024269C 462010A0 */ cvt.s.d $f2, $f2 +/* DBF950 802426A0 46240003 */ div.d $f0, $f0, $f4 +/* DBF954 802426A4 8C420020 */ lw $v0, 0x20($v0) +/* DBF958 802426A8 46200020 */ cvt.s.d $f0, $f0 +/* DBF95C 802426AC E622001C */ swc1 $f2, 0x1c($s1) +/* DBF960 802426B0 E6200014 */ swc1 $f0, 0x14($s1) +/* DBF964 802426B4 AE220028 */ sw $v0, 0x28($s1) +/* DBF968 802426B8 C6000018 */ lwc1 $f0, 0x18($s0) +/* DBF96C 802426BC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DBF970 802426C0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DBF974 802426C4 E6200018 */ swc1 $f0, 0x18($s1) +/* DBF978 802426C8 8C460028 */ lw $a2, 0x28($v0) +/* DBF97C 802426CC 0C00A720 */ jal atan2 +/* DBF980 802426D0 8C470030 */ lw $a3, 0x30($v0) +/* DBF984 802426D4 E620000C */ swc1 $f0, 0xc($s1) +/* DBF988 802426D8 8E420018 */ lw $v0, 0x18($s2) +/* DBF98C 802426DC AE400074 */ sw $zero, 0x74($s2) +/* DBF990 802426E0 9442002A */ lhu $v0, 0x2a($v0) +/* DBF994 802426E4 30420002 */ andi $v0, $v0, 2 +/* DBF998 802426E8 10400005 */ beqz $v0, .L80242700 +/* DBF99C 802426EC 24020003 */ addiu $v0, $zero, 3 +/* DBF9A0 802426F0 A622008E */ sh $v0, 0x8e($s1) +/* DBF9A4 802426F4 2402000D */ addiu $v0, $zero, 0xd +/* DBF9A8 802426F8 080909D4 */ j .L80242750 +/* DBF9AC 802426FC AE620070 */ sw $v0, 0x70($s3) +.L80242700: +/* DBF9B0 80242700 24030001 */ addiu $v1, $zero, 1 +/* DBF9B4 80242704 2402000E */ addiu $v0, $zero, 0xe +/* DBF9B8 80242708 A623008E */ sh $v1, 0x8e($s1) +/* DBF9BC 8024270C AE620070 */ sw $v0, 0x70($s3) +/* DBF9C0 80242710 C6200038 */ lwc1 $f0, 0x38($s1) +/* DBF9C4 80242714 4600018D */ trunc.w.s $f6, $f0 +/* DBF9C8 80242718 44023000 */ mfc1 $v0, $f6 +/* DBF9CC 8024271C 00000000 */ nop +/* DBF9D0 80242720 A6420010 */ sh $v0, 0x10($s2) +/* DBF9D4 80242724 C620003C */ lwc1 $f0, 0x3c($s1) +/* DBF9D8 80242728 4600018D */ trunc.w.s $f6, $f0 +/* DBF9DC 8024272C 44023000 */ mfc1 $v0, $f6 +/* DBF9E0 80242730 00000000 */ nop +/* DBF9E4 80242734 A6420012 */ sh $v0, 0x12($s2) +/* DBF9E8 80242738 C6200040 */ lwc1 $f0, 0x40($s1) +/* DBF9EC 8024273C A2430007 */ sb $v1, 7($s2) +/* DBF9F0 80242740 4600018D */ trunc.w.s $f6, $f0 +/* DBF9F4 80242744 44023000 */ mfc1 $v0, $f6 +/* DBF9F8 80242748 00000000 */ nop +/* DBF9FC 8024274C A6420014 */ sh $v0, 0x14($s2) +.L80242750: +/* DBFA00 80242750 8FBF0020 */ lw $ra, 0x20($sp) +/* DBFA04 80242754 8FB3001C */ lw $s3, 0x1c($sp) +/* DBFA08 80242758 8FB20018 */ lw $s2, 0x18($sp) +/* DBFA0C 8024275C 8FB10014 */ lw $s1, 0x14($sp) +/* DBFA10 80242760 8FB00010 */ lw $s0, 0x10($sp) +/* DBFA14 80242764 03E00008 */ jr $ra +/* DBFA18 80242768 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C.s deleted file mode 100644 index 9447f2ac4e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024276C -/* DBFA1C 8024276C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DBFA20 80242770 AFB00010 */ sw $s0, 0x10($sp) -/* DBFA24 80242774 0080802D */ daddu $s0, $a0, $zero -/* DBFA28 80242778 AFBF0014 */ sw $ra, 0x14($sp) -/* DBFA2C 8024277C 8E020148 */ lw $v0, 0x148($s0) -/* DBFA30 80242780 0C00EABB */ jal get_npc_unsafe -/* DBFA34 80242784 84440008 */ lh $a0, 8($v0) -/* DBFA38 80242788 0040202D */ daddu $a0, $v0, $zero -/* DBFA3C 8024278C 8482008E */ lh $v0, 0x8e($a0) -/* DBFA40 80242790 9483008E */ lhu $v1, 0x8e($a0) -/* DBFA44 80242794 18400005 */ blez $v0, .L802427AC -/* DBFA48 80242798 2462FFFF */ addiu $v0, $v1, -1 -/* DBFA4C 8024279C A482008E */ sh $v0, 0x8e($a0) -/* DBFA50 802427A0 00021400 */ sll $v0, $v0, 0x10 -/* DBFA54 802427A4 1C400006 */ bgtz $v0, .L802427C0 -/* DBFA58 802427A8 00000000 */ nop -.L802427AC: -/* DBFA5C 802427AC 8482008C */ lh $v0, 0x8c($a0) -/* DBFA60 802427B0 14400003 */ bnez $v0, .L802427C0 -/* DBFA64 802427B4 2402000E */ addiu $v0, $zero, 0xe -/* DBFA68 802427B8 A480008E */ sh $zero, 0x8e($a0) -/* DBFA6C 802427BC AE020070 */ sw $v0, 0x70($s0) -.L802427C0: -/* DBFA70 802427C0 8FBF0014 */ lw $ra, 0x14($sp) -/* DBFA74 802427C4 8FB00010 */ lw $s0, 0x10($sp) -/* DBFA78 802427C8 03E00008 */ jr $ra -/* DBFA7C 802427CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s new file mode 100644 index 0000000000..36cd8a2a95 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_8024276C_DBFA1C.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024276C_DBFA1C +/* DBFA1C 8024276C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DBFA20 80242770 AFB00010 */ sw $s0, 0x10($sp) +/* DBFA24 80242774 0080802D */ daddu $s0, $a0, $zero +/* DBFA28 80242778 AFBF0014 */ sw $ra, 0x14($sp) +/* DBFA2C 8024277C 8E020148 */ lw $v0, 0x148($s0) +/* DBFA30 80242780 0C00EABB */ jal get_npc_unsafe +/* DBFA34 80242784 84440008 */ lh $a0, 8($v0) +/* DBFA38 80242788 0040202D */ daddu $a0, $v0, $zero +/* DBFA3C 8024278C 8482008E */ lh $v0, 0x8e($a0) +/* DBFA40 80242790 9483008E */ lhu $v1, 0x8e($a0) +/* DBFA44 80242794 18400005 */ blez $v0, .L802427AC +/* DBFA48 80242798 2462FFFF */ addiu $v0, $v1, -1 +/* DBFA4C 8024279C A482008E */ sh $v0, 0x8e($a0) +/* DBFA50 802427A0 00021400 */ sll $v0, $v0, 0x10 +/* DBFA54 802427A4 1C400006 */ bgtz $v0, .L802427C0 +/* DBFA58 802427A8 00000000 */ nop +.L802427AC: +/* DBFA5C 802427AC 8482008C */ lh $v0, 0x8c($a0) +/* DBFA60 802427B0 14400003 */ bnez $v0, .L802427C0 +/* DBFA64 802427B4 2402000E */ addiu $v0, $zero, 0xe +/* DBFA68 802427B8 A480008E */ sh $zero, 0x8e($a0) +/* DBFA6C 802427BC AE020070 */ sw $v0, 0x70($s0) +.L802427C0: +/* DBFA70 802427C0 8FBF0014 */ lw $ra, 0x14($sp) +/* DBFA74 802427C4 8FB00010 */ lw $s0, 0x10($sp) +/* DBFA78 802427C8 03E00008 */ jr $ra +/* DBFA7C 802427CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60.s deleted file mode 100644 index 0278c8faf8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B60 -/* DBFE10 80242B60 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DBFE14 80242B64 AFB00028 */ sw $s0, 0x28($sp) -/* DBFE18 80242B68 00A0802D */ daddu $s0, $a1, $zero -/* DBFE1C 80242B6C AFB1002C */ sw $s1, 0x2c($sp) -/* DBFE20 80242B70 00C0882D */ daddu $s1, $a2, $zero -/* DBFE24 80242B74 AFBF0034 */ sw $ra, 0x34($sp) -/* DBFE28 80242B78 AFB20030 */ sw $s2, 0x30($sp) -/* DBFE2C 80242B7C AE200070 */ sw $zero, 0x70($s1) -/* DBFE30 80242B80 8C830000 */ lw $v1, ($a0) -/* DBFE34 80242B84 2402FDFF */ addiu $v0, $zero, -0x201 -/* DBFE38 80242B88 A480008E */ sh $zero, 0x8e($a0) -/* DBFE3C 80242B8C 00621824 */ and $v1, $v1, $v0 -/* DBFE40 80242B90 34650800 */ ori $a1, $v1, 0x800 -/* DBFE44 80242B94 AC850000 */ sw $a1, ($a0) -/* DBFE48 80242B98 8E0200D0 */ lw $v0, 0xd0($s0) -/* DBFE4C 80242B9C 8C420034 */ lw $v0, 0x34($v0) -/* DBFE50 80242BA0 10400003 */ beqz $v0, .L80242BB0 -/* DBFE54 80242BA4 00E0902D */ daddu $s2, $a3, $zero -/* DBFE58 80242BA8 08090AEE */ j .L80242BB8 -/* DBFE5C 80242BAC 34620808 */ ori $v0, $v1, 0x808 -.L80242BB0: -/* DBFE60 80242BB0 2402FFF7 */ addiu $v0, $zero, -9 -/* DBFE64 80242BB4 00A21024 */ and $v0, $a1, $v0 -.L80242BB8: -/* DBFE68 80242BB8 AC820000 */ sw $v0, ($a0) -/* DBFE6C 80242BBC 27A20024 */ addiu $v0, $sp, 0x24 -/* DBFE70 80242BC0 27A50018 */ addiu $a1, $sp, 0x18 -/* DBFE74 80242BC4 C4800038 */ lwc1 $f0, 0x38($a0) -/* DBFE78 80242BC8 C482003C */ lwc1 $f2, 0x3c($a0) -/* DBFE7C 80242BCC C4840040 */ lwc1 $f4, 0x40($a0) -/* DBFE80 80242BD0 3C01447A */ lui $at, 0x447a -/* DBFE84 80242BD4 44813000 */ mtc1 $at, $f6 -/* DBFE88 80242BD8 27A6001C */ addiu $a2, $sp, 0x1c -/* DBFE8C 80242BDC E7A00018 */ swc1 $f0, 0x18($sp) -/* DBFE90 80242BE0 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DBFE94 80242BE4 E7A40020 */ swc1 $f4, 0x20($sp) -/* DBFE98 80242BE8 E7A60024 */ swc1 $f6, 0x24($sp) -/* DBFE9C 80242BEC AFA20010 */ sw $v0, 0x10($sp) -/* DBFEA0 80242BF0 8C840080 */ lw $a0, 0x80($a0) -/* DBFEA4 80242BF4 0C0372DF */ jal func_800DCB7C -/* DBFEA8 80242BF8 27A70020 */ addiu $a3, $sp, 0x20 -/* DBFEAC 80242BFC C7A20024 */ lwc1 $f2, 0x24($sp) -/* DBFEB0 80242C00 3C014059 */ lui $at, 0x4059 -/* DBFEB4 80242C04 44812800 */ mtc1 $at, $f5 -/* DBFEB8 80242C08 44802000 */ mtc1 $zero, $f4 -/* DBFEBC 80242C0C 460010A1 */ cvt.d.s $f2, $f2 -/* DBFEC0 80242C10 46241082 */ mul.d $f2, $f2, $f4 -/* DBFEC4 80242C14 00000000 */ nop -/* DBFEC8 80242C18 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DBFECC 80242C1C 46000021 */ cvt.d.s $f0, $f0 -/* DBFED0 80242C20 46240002 */ mul.d $f0, $f0, $f4 -/* DBFED4 80242C24 00000000 */ nop -/* DBFED8 80242C28 3C013FE0 */ lui $at, 0x3fe0 -/* DBFEDC 80242C2C 44812800 */ mtc1 $at, $f5 -/* DBFEE0 80242C30 44802000 */ mtc1 $zero, $f4 -/* DBFEE4 80242C34 00000000 */ nop -/* DBFEE8 80242C38 46241080 */ add.d $f2, $f2, $f4 -/* DBFEEC 80242C3C AE000074 */ sw $zero, 0x74($s0) -/* DBFEF0 80242C40 46240000 */ add.d $f0, $f0, $f4 -/* DBFEF4 80242C44 AE000090 */ sw $zero, 0x90($s0) -/* DBFEF8 80242C48 4620120D */ trunc.w.d $f8, $f2 -/* DBFEFC 80242C4C E6080078 */ swc1 $f8, 0x78($s0) -/* DBFF00 80242C50 4620020D */ trunc.w.d $f8, $f0 -/* DBFF04 80242C54 E6080088 */ swc1 $f8, 0x88($s0) -/* DBFF08 80242C58 8E420014 */ lw $v0, 0x14($s2) -/* DBFF0C 80242C5C AE220074 */ sw $v0, 0x74($s1) -/* DBFF10 80242C60 8E0200B0 */ lw $v0, 0xb0($s0) -/* DBFF14 80242C64 34420010 */ ori $v0, $v0, 0x10 -/* DBFF18 80242C68 AE0200B0 */ sw $v0, 0xb0($s0) -/* DBFF1C 80242C6C 8FBF0034 */ lw $ra, 0x34($sp) -/* DBFF20 80242C70 8FB20030 */ lw $s2, 0x30($sp) -/* DBFF24 80242C74 8FB1002C */ lw $s1, 0x2c($sp) -/* DBFF28 80242C78 8FB00028 */ lw $s0, 0x28($sp) -/* DBFF2C 80242C7C 03E00008 */ jr $ra -/* DBFF30 80242C80 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s new file mode 100644 index 0000000000..d477b75502 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242B60_DBFE10.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B60_DBFE10 +/* DBFE10 80242B60 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* DBFE14 80242B64 AFB00028 */ sw $s0, 0x28($sp) +/* DBFE18 80242B68 00A0802D */ daddu $s0, $a1, $zero +/* DBFE1C 80242B6C AFB1002C */ sw $s1, 0x2c($sp) +/* DBFE20 80242B70 00C0882D */ daddu $s1, $a2, $zero +/* DBFE24 80242B74 AFBF0034 */ sw $ra, 0x34($sp) +/* DBFE28 80242B78 AFB20030 */ sw $s2, 0x30($sp) +/* DBFE2C 80242B7C AE200070 */ sw $zero, 0x70($s1) +/* DBFE30 80242B80 8C830000 */ lw $v1, ($a0) +/* DBFE34 80242B84 2402FDFF */ addiu $v0, $zero, -0x201 +/* DBFE38 80242B88 A480008E */ sh $zero, 0x8e($a0) +/* DBFE3C 80242B8C 00621824 */ and $v1, $v1, $v0 +/* DBFE40 80242B90 34650800 */ ori $a1, $v1, 0x800 +/* DBFE44 80242B94 AC850000 */ sw $a1, ($a0) +/* DBFE48 80242B98 8E0200D0 */ lw $v0, 0xd0($s0) +/* DBFE4C 80242B9C 8C420034 */ lw $v0, 0x34($v0) +/* DBFE50 80242BA0 10400003 */ beqz $v0, .L80242BB0 +/* DBFE54 80242BA4 00E0902D */ daddu $s2, $a3, $zero +/* DBFE58 80242BA8 08090AEE */ j .L80242BB8 +/* DBFE5C 80242BAC 34620808 */ ori $v0, $v1, 0x808 +.L80242BB0: +/* DBFE60 80242BB0 2402FFF7 */ addiu $v0, $zero, -9 +/* DBFE64 80242BB4 00A21024 */ and $v0, $a1, $v0 +.L80242BB8: +/* DBFE68 80242BB8 AC820000 */ sw $v0, ($a0) +/* DBFE6C 80242BBC 27A20024 */ addiu $v0, $sp, 0x24 +/* DBFE70 80242BC0 27A50018 */ addiu $a1, $sp, 0x18 +/* DBFE74 80242BC4 C4800038 */ lwc1 $f0, 0x38($a0) +/* DBFE78 80242BC8 C482003C */ lwc1 $f2, 0x3c($a0) +/* DBFE7C 80242BCC C4840040 */ lwc1 $f4, 0x40($a0) +/* DBFE80 80242BD0 3C01447A */ lui $at, 0x447a +/* DBFE84 80242BD4 44813000 */ mtc1 $at, $f6 +/* DBFE88 80242BD8 27A6001C */ addiu $a2, $sp, 0x1c +/* DBFE8C 80242BDC E7A00018 */ swc1 $f0, 0x18($sp) +/* DBFE90 80242BE0 E7A2001C */ swc1 $f2, 0x1c($sp) +/* DBFE94 80242BE4 E7A40020 */ swc1 $f4, 0x20($sp) +/* DBFE98 80242BE8 E7A60024 */ swc1 $f6, 0x24($sp) +/* DBFE9C 80242BEC AFA20010 */ sw $v0, 0x10($sp) +/* DBFEA0 80242BF0 8C840080 */ lw $a0, 0x80($a0) +/* DBFEA4 80242BF4 0C0372DF */ jal func_800DCB7C +/* DBFEA8 80242BF8 27A70020 */ addiu $a3, $sp, 0x20 +/* DBFEAC 80242BFC C7A20024 */ lwc1 $f2, 0x24($sp) +/* DBFEB0 80242C00 3C014059 */ lui $at, 0x4059 +/* DBFEB4 80242C04 44812800 */ mtc1 $at, $f5 +/* DBFEB8 80242C08 44802000 */ mtc1 $zero, $f4 +/* DBFEBC 80242C0C 460010A1 */ cvt.d.s $f2, $f2 +/* DBFEC0 80242C10 46241082 */ mul.d $f2, $f2, $f4 +/* DBFEC4 80242C14 00000000 */ nop +/* DBFEC8 80242C18 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* DBFECC 80242C1C 46000021 */ cvt.d.s $f0, $f0 +/* DBFED0 80242C20 46240002 */ mul.d $f0, $f0, $f4 +/* DBFED4 80242C24 00000000 */ nop +/* DBFED8 80242C28 3C013FE0 */ lui $at, 0x3fe0 +/* DBFEDC 80242C2C 44812800 */ mtc1 $at, $f5 +/* DBFEE0 80242C30 44802000 */ mtc1 $zero, $f4 +/* DBFEE4 80242C34 00000000 */ nop +/* DBFEE8 80242C38 46241080 */ add.d $f2, $f2, $f4 +/* DBFEEC 80242C3C AE000074 */ sw $zero, 0x74($s0) +/* DBFEF0 80242C40 46240000 */ add.d $f0, $f0, $f4 +/* DBFEF4 80242C44 AE000090 */ sw $zero, 0x90($s0) +/* DBFEF8 80242C48 4620120D */ trunc.w.d $f8, $f2 +/* DBFEFC 80242C4C E6080078 */ swc1 $f8, 0x78($s0) +/* DBFF00 80242C50 4620020D */ trunc.w.d $f8, $f0 +/* DBFF04 80242C54 E6080088 */ swc1 $f8, 0x88($s0) +/* DBFF08 80242C58 8E420014 */ lw $v0, 0x14($s2) +/* DBFF0C 80242C5C AE220074 */ sw $v0, 0x74($s1) +/* DBFF10 80242C60 8E0200B0 */ lw $v0, 0xb0($s0) +/* DBFF14 80242C64 34420010 */ ori $v0, $v0, 0x10 +/* DBFF18 80242C68 AE0200B0 */ sw $v0, 0xb0($s0) +/* DBFF1C 80242C6C 8FBF0034 */ lw $ra, 0x34($sp) +/* DBFF20 80242C70 8FB20030 */ lw $s2, 0x30($sp) +/* DBFF24 80242C74 8FB1002C */ lw $s1, 0x2c($sp) +/* DBFF28 80242C78 8FB00028 */ lw $s0, 0x28($sp) +/* DBFF2C 80242C7C 03E00008 */ jr $ra +/* DBFF30 80242C80 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s index 72362ae6a1..e5383c5b9f 100644 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242C84_DBFF34.s @@ -46,7 +46,7 @@ glabel func_80242C84_DBFF34 /* DBFFD8 80242D28 02A0202D */ daddu $a0, $s5, $zero /* DBFFDC 80242D2C 0240282D */ daddu $a1, $s2, $zero /* DBFFE0 80242D30 0280302D */ daddu $a2, $s4, $zero -/* DBFFE4 80242D34 0C090AD8 */ jal func_80242B60 +/* DBFFE4 80242D34 0C090AD8 */ jal func_80242B60_DBFE10 /* DBFFE8 80242D38 0200382D */ daddu $a3, $s0, $zero .L80242D3C: /* DBFFEC 80242D3C 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_80242C84_DBFF34 /* DC003C 80242D8C 00000000 */ nop /* DC0040 80242D90 0280202D */ daddu $a0, $s4, $zero /* DC0044 80242D94 0200282D */ daddu $a1, $s0, $zero -/* DC0048 80242D98 0C09065E */ jal func_80241978 +/* DC0048 80242D98 0C09065E */ jal func_80241978_DBEC28 /* DC004C 80242D9C 0260302D */ daddu $a2, $s3, $zero /* DC0050 80242DA0 0280202D */ daddu $a0, $s4, $zero /* DC0054 80242DA4 0200282D */ daddu $a1, $s0, $zero -/* DC0058 80242DA8 0C0906CA */ jal func_80241B28 +/* DC0058 80242DA8 0C0906CA */ jal func_80241B28_DBEDD8 /* DC005C 80242DAC 0260302D */ daddu $a2, $s3, $zero /* DC0060 80242DB0 08090B93 */ j .L80242E4C /* DC0064 80242DB4 0000102D */ daddu $v0, $zero, $zero /* DC0068 80242DB8 0280202D */ daddu $a0, $s4, $zero /* DC006C 80242DBC 0200282D */ daddu $a1, $s0, $zero -/* DC0070 80242DC0 0C090854 */ jal func_80242150 +/* DC0070 80242DC0 0C090854 */ jal func_80242150_DBF400 /* DC0074 80242DC4 0260302D */ daddu $a2, $s3, $zero /* DC0078 80242DC8 0280202D */ daddu $a0, $s4, $zero /* DC007C 80242DCC 0200282D */ daddu $a1, $s0, $zero -/* DC0080 80242DD0 0C090884 */ jal func_80242210 +/* DC0080 80242DD0 0C090884 */ jal func_80242210_DBF4C0 /* DC0084 80242DD4 0260302D */ daddu $a2, $s3, $zero /* DC0088 80242DD8 08090B93 */ j .L80242E4C /* DC008C 80242DDC 0000102D */ daddu $v0, $zero, $zero /* DC0090 80242DE0 0280202D */ daddu $a0, $s4, $zero /* DC0094 80242DE4 0200282D */ daddu $a1, $s0, $zero -/* DC0098 80242DE8 0C090955 */ jal func_80242554 +/* DC0098 80242DE8 0C090955 */ jal func_80242554_DBF804 /* DC009C 80242DEC 0260302D */ daddu $a2, $s3, $zero /* DC00A0 80242DF0 0280202D */ daddu $a0, $s4, $zero /* DC00A4 80242DF4 0200282D */ daddu $a1, $s0, $zero -/* DC00A8 80242DF8 0C090973 */ jal func_802425CC +/* DC00A8 80242DF8 0C090973 */ jal func_802425CC_DBF87C /* DC00AC 80242DFC 0260302D */ daddu $a2, $s3, $zero /* DC00B0 80242E00 08090B93 */ j .L80242E4C /* DC00B4 80242E04 0000102D */ daddu $v0, $zero, $zero /* DC00B8 80242E08 0280202D */ daddu $a0, $s4, $zero /* DC00BC 80242E0C 0200282D */ daddu $a1, $s0, $zero -/* DC00C0 80242E10 0C09098E */ jal func_80242638 +/* DC00C0 80242E10 0C09098E */ jal func_80242638_DBF8E8 /* DC00C4 80242E14 0260302D */ daddu $a2, $s3, $zero /* DC00C8 80242E18 08090B93 */ j .L80242E4C /* DC00CC 80242E1C 0000102D */ daddu $v0, $zero, $zero /* DC00D0 80242E20 0280202D */ daddu $a0, $s4, $zero /* DC00D4 80242E24 0200282D */ daddu $a1, $s0, $zero -/* DC00D8 80242E28 0C0909DB */ jal func_8024276C +/* DC00D8 80242E28 0C0909DB */ jal func_8024276C_DBFA1C /* DC00DC 80242E2C 0260302D */ daddu $a2, $s3, $zero /* DC00E0 80242E30 08090B93 */ j .L80242E4C /* DC00E4 80242E34 0000102D */ daddu $v0, $zero, $zero /* DC00E8 80242E38 0280202D */ daddu $a0, $s4, $zero /* DC00EC 80242E3C 0200282D */ daddu $a1, $s0, $zero -/* DC00F0 80242E40 0C0909F4 */ jal func_802427D0 +/* DC00F0 80242E40 0C0909F4 */ jal func_802427D0_DBFA80 /* DC00F4 80242E44 0260302D */ daddu $a2, $s3, $zero .L80242E48: /* DC00F8 80242E48 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E70.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E70.s deleted file mode 100644 index 5b98555f3e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E70.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E70 -/* DC0120 80242E70 3C03800B */ lui $v1, %hi(gCameras) -/* DC0124 80242E74 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DC0128 80242E78 94620000 */ lhu $v0, ($v1) -/* DC012C 80242E7C 34421000 */ ori $v0, $v0, 0x1000 -/* DC0130 80242E80 A4620000 */ sh $v0, ($v1) -/* DC0134 80242E84 03E00008 */ jr $ra -/* DC0138 80242E88 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E70_DC0120.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E70_DC0120.s new file mode 100644 index 0000000000..4d90a610a3 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E70_DC0120.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E70_DC0120 +/* DC0120 80242E70 3C03800B */ lui $v1, %hi(gCameras) +/* DC0124 80242E74 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* DC0128 80242E78 94620000 */ lhu $v0, ($v1) +/* DC012C 80242E7C 34421000 */ ori $v0, $v0, 0x1000 +/* DC0130 80242E80 A4620000 */ sh $v0, ($v1) +/* DC0134 80242E84 03E00008 */ jr $ra +/* DC0138 80242E88 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E8C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E8C.s deleted file mode 100644 index e79117421b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E8C.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E8C -/* DC013C 80242E8C 3C03800B */ lui $v1, %hi(gCameras) -/* DC0140 80242E90 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DC0144 80242E94 94620000 */ lhu $v0, ($v1) -/* DC0148 80242E98 3042EFFF */ andi $v0, $v0, 0xefff -/* DC014C 80242E9C A4620000 */ sh $v0, ($v1) -/* DC0150 80242EA0 03E00008 */ jr $ra -/* DC0154 80242EA4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E8C_DC013C.s b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E8C_DC013C.s new file mode 100644 index 0000000000..6186ef1072 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DBD2B0/func_80242E8C_DC013C.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242E8C_DC013C +/* DC013C 80242E8C 3C03800B */ lui $v1, %hi(gCameras) +/* DC0140 80242E90 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* DC0144 80242E94 94620000 */ lhu $v0, ($v1) +/* DC0148 80242E98 3042EFFF */ andi $v0, $v0, 0xefff +/* DC014C 80242E9C A4620000 */ sh $v0, ($v1) +/* DC0150 80242EA0 03E00008 */ jr $ra +/* DC0154 80242EA4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20.s deleted file mode 100644 index 0c09434e18..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F20 -/* DC01D0 80242F20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC01D4 80242F24 AFB00010 */ sw $s0, 0x10($sp) -/* DC01D8 80242F28 3C108024 */ lui $s0, 0x8024 -/* DC01DC 80242F2C 26105E00 */ addiu $s0, $s0, 0x5e00 -/* DC01E0 80242F30 AFBF0018 */ sw $ra, 0x18($sp) -/* DC01E4 80242F34 AFB10014 */ sw $s1, 0x14($sp) -/* DC01E8 80242F38 8E020000 */ lw $v0, ($s0) -/* DC01EC 80242F3C 14400010 */ bnez $v0, .L80242F80 -/* DC01F0 80242F40 0080882D */ daddu $s1, $a0, $zero -/* DC01F4 80242F44 0C00AB39 */ jal heap_malloc -/* DC01F8 80242F48 24040040 */ addiu $a0, $zero, 0x40 -/* DC01FC 80242F4C AE020000 */ sw $v0, ($s0) -/* DC0200 80242F50 0000182D */ daddu $v1, $zero, $zero -/* DC0204 80242F54 0040282D */ daddu $a1, $v0, $zero -/* DC0208 80242F58 0220202D */ daddu $a0, $s1, $zero -.L80242F5C: -/* DC020C 80242F5C 8C820084 */ lw $v0, 0x84($a0) -/* DC0210 80242F60 24840004 */ addiu $a0, $a0, 4 -/* DC0214 80242F64 24630001 */ addiu $v1, $v1, 1 -/* DC0218 80242F68 ACA20000 */ sw $v0, ($a1) -/* DC021C 80242F6C 28620010 */ slti $v0, $v1, 0x10 -/* DC0220 80242F70 1440FFFA */ bnez $v0, .L80242F5C -/* DC0224 80242F74 24A50004 */ addiu $a1, $a1, 4 -/* DC0228 80242F78 08090BEF */ j .L80242FBC -/* DC022C 80242F7C 00000000 */ nop -.L80242F80: -/* DC0230 80242F80 0000182D */ daddu $v1, $zero, $zero -/* DC0234 80242F84 0040282D */ daddu $a1, $v0, $zero -/* DC0238 80242F88 0220202D */ daddu $a0, $s1, $zero -.L80242F8C: -/* DC023C 80242F8C 8CA20000 */ lw $v0, ($a1) -/* DC0240 80242F90 24A50004 */ addiu $a1, $a1, 4 -/* DC0244 80242F94 24630001 */ addiu $v1, $v1, 1 -/* DC0248 80242F98 AC820084 */ sw $v0, 0x84($a0) -/* DC024C 80242F9C 28620010 */ slti $v0, $v1, 0x10 -/* DC0250 80242FA0 1440FFFA */ bnez $v0, .L80242F8C -/* DC0254 80242FA4 24840004 */ addiu $a0, $a0, 4 -/* DC0258 80242FA8 3C108024 */ lui $s0, 0x8024 -/* DC025C 80242FAC 26105E00 */ addiu $s0, $s0, 0x5e00 -/* DC0260 80242FB0 0C00AB4B */ jal heap_free -/* DC0264 80242FB4 8E040000 */ lw $a0, ($s0) -/* DC0268 80242FB8 AE000000 */ sw $zero, ($s0) -.L80242FBC: -/* DC026C 80242FBC 8FBF0018 */ lw $ra, 0x18($sp) -/* DC0270 80242FC0 8FB10014 */ lw $s1, 0x14($sp) -/* DC0274 80242FC4 8FB00010 */ lw $s0, 0x10($sp) -/* DC0278 80242FC8 24020002 */ addiu $v0, $zero, 2 -/* DC027C 80242FCC 03E00008 */ jr $ra -/* DC0280 80242FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s new file mode 100644 index 0000000000..839419466f --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80242F20_DC01D0.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F20_DC01D0 +/* DC01D0 80242F20 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DC01D4 80242F24 AFB00010 */ sw $s0, 0x10($sp) +/* DC01D8 80242F28 3C108024 */ lui $s0, 0x8024 +/* DC01DC 80242F2C 26105E00 */ addiu $s0, $s0, 0x5e00 +/* DC01E0 80242F30 AFBF0018 */ sw $ra, 0x18($sp) +/* DC01E4 80242F34 AFB10014 */ sw $s1, 0x14($sp) +/* DC01E8 80242F38 8E020000 */ lw $v0, ($s0) +/* DC01EC 80242F3C 14400010 */ bnez $v0, .L80242F80 +/* DC01F0 80242F40 0080882D */ daddu $s1, $a0, $zero +/* DC01F4 80242F44 0C00AB39 */ jal heap_malloc +/* DC01F8 80242F48 24040040 */ addiu $a0, $zero, 0x40 +/* DC01FC 80242F4C AE020000 */ sw $v0, ($s0) +/* DC0200 80242F50 0000182D */ daddu $v1, $zero, $zero +/* DC0204 80242F54 0040282D */ daddu $a1, $v0, $zero +/* DC0208 80242F58 0220202D */ daddu $a0, $s1, $zero +.L80242F5C: +/* DC020C 80242F5C 8C820084 */ lw $v0, 0x84($a0) +/* DC0210 80242F60 24840004 */ addiu $a0, $a0, 4 +/* DC0214 80242F64 24630001 */ addiu $v1, $v1, 1 +/* DC0218 80242F68 ACA20000 */ sw $v0, ($a1) +/* DC021C 80242F6C 28620010 */ slti $v0, $v1, 0x10 +/* DC0220 80242F70 1440FFFA */ bnez $v0, .L80242F5C +/* DC0224 80242F74 24A50004 */ addiu $a1, $a1, 4 +/* DC0228 80242F78 08090BEF */ j .L80242FBC +/* DC022C 80242F7C 00000000 */ nop +.L80242F80: +/* DC0230 80242F80 0000182D */ daddu $v1, $zero, $zero +/* DC0234 80242F84 0040282D */ daddu $a1, $v0, $zero +/* DC0238 80242F88 0220202D */ daddu $a0, $s1, $zero +.L80242F8C: +/* DC023C 80242F8C 8CA20000 */ lw $v0, ($a1) +/* DC0240 80242F90 24A50004 */ addiu $a1, $a1, 4 +/* DC0244 80242F94 24630001 */ addiu $v1, $v1, 1 +/* DC0248 80242F98 AC820084 */ sw $v0, 0x84($a0) +/* DC024C 80242F9C 28620010 */ slti $v0, $v1, 0x10 +/* DC0250 80242FA0 1440FFFA */ bnez $v0, .L80242F8C +/* DC0254 80242FA4 24840004 */ addiu $a0, $a0, 4 +/* DC0258 80242FA8 3C108024 */ lui $s0, 0x8024 +/* DC025C 80242FAC 26105E00 */ addiu $s0, $s0, 0x5e00 +/* DC0260 80242FB0 0C00AB4B */ jal heap_free +/* DC0264 80242FB4 8E040000 */ lw $a0, ($s0) +/* DC0268 80242FB8 AE000000 */ sw $zero, ($s0) +.L80242FBC: +/* DC026C 80242FBC 8FBF0018 */ lw $ra, 0x18($sp) +/* DC0270 80242FC0 8FB10014 */ lw $s1, 0x14($sp) +/* DC0274 80242FC4 8FB00010 */ lw $s0, 0x10($sp) +/* DC0278 80242FC8 24020002 */ addiu $v0, $zero, 2 +/* DC027C 80242FCC 03E00008 */ jr $ra +/* DC0280 80242FD0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038.s deleted file mode 100644 index ca859d1615..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243038 -/* DC02E8 80243038 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DC02EC 8024303C AFB10014 */ sw $s1, 0x14($sp) -/* DC02F0 80243040 0080882D */ daddu $s1, $a0, $zero -/* DC02F4 80243044 AFBF001C */ sw $ra, 0x1c($sp) -/* DC02F8 80243048 AFB20018 */ sw $s2, 0x18($sp) -/* DC02FC 8024304C AFB00010 */ sw $s0, 0x10($sp) -/* DC0300 80243050 8E240084 */ lw $a0, 0x84($s1) -/* DC0304 80243054 0C04C3D6 */ jal get_item_entity -/* DC0308 80243058 00A0802D */ daddu $s0, $a1, $zero -/* DC030C 8024305C 12000005 */ beqz $s0, .L80243074 -/* DC0310 80243060 0040902D */ daddu $s2, $v0, $zero -/* DC0314 80243064 C640000C */ lwc1 $f0, 0xc($s2) -/* DC0318 80243068 AE200074 */ sw $zero, 0x74($s1) -/* DC031C 8024306C AE20007C */ sw $zero, 0x7c($s1) -/* DC0320 80243070 E6200078 */ swc1 $f0, 0x78($s1) -.L80243074: -/* DC0324 80243074 8E230074 */ lw $v1, 0x74($s1) -/* DC0328 80243078 10600005 */ beqz $v1, .L80243090 -/* DC032C 8024307C 24020001 */ addiu $v0, $zero, 1 -/* DC0330 80243080 10620024 */ beq $v1, $v0, .L80243114 -/* DC0334 80243084 00000000 */ nop -/* DC0338 80243088 08090C5B */ j .L8024316C -/* DC033C 8024308C 00000000 */ nop -.L80243090: -/* DC0340 80243090 3C013FC9 */ lui $at, 0x3fc9 -/* DC0344 80243094 34210FD8 */ ori $at, $at, 0xfd8 -/* DC0348 80243098 44810000 */ mtc1 $at, $f0 -/* DC034C 8024309C C62C007C */ lwc1 $f12, 0x7c($s1) -/* DC0350 802430A0 46806320 */ cvt.s.w $f12, $f12 -/* DC0354 802430A4 46006302 */ mul.s $f12, $f12, $f0 -/* DC0358 802430A8 00000000 */ nop -/* DC035C 802430AC 3C0141F0 */ lui $at, 0x41f0 -/* DC0360 802430B0 44810000 */ mtc1 $at, $f0 -/* DC0364 802430B4 0C00A874 */ jal cos_rad -/* DC0368 802430B8 46006303 */ div.s $f12, $f12, $f0 -/* DC036C 802430BC 3C013F80 */ lui $at, 0x3f80 -/* DC0370 802430C0 44811000 */ mtc1 $at, $f2 -/* DC0374 802430C4 00000000 */ nop -/* DC0378 802430C8 46001081 */ sub.s $f2, $f2, $f0 -/* DC037C 802430CC 3C0141A0 */ lui $at, 0x41a0 -/* DC0380 802430D0 44810000 */ mtc1 $at, $f0 -/* DC0384 802430D4 00000000 */ nop -/* DC0388 802430D8 46001082 */ mul.s $f2, $f2, $f0 -/* DC038C 802430DC 00000000 */ nop -/* DC0390 802430E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DC0394 802430E4 46020000 */ add.s $f0, $f0, $f2 -/* DC0398 802430E8 E640000C */ swc1 $f0, 0xc($s2) -/* DC039C 802430EC 8E23007C */ lw $v1, 0x7c($s1) -/* DC03A0 802430F0 2402001E */ addiu $v0, $zero, 0x1e -/* DC03A4 802430F4 14620005 */ bne $v1, $v0, .L8024310C -/* DC03A8 802430F8 24620001 */ addiu $v0, $v1, 1 -/* DC03AC 802430FC 24020001 */ addiu $v0, $zero, 1 -/* DC03B0 80243100 AE220074 */ sw $v0, 0x74($s1) -/* DC03B4 80243104 08090C5B */ j .L8024316C -/* DC03B8 80243108 AE20007C */ sw $zero, 0x7c($s1) -.L8024310C: -/* DC03BC 8024310C 08090C5B */ j .L8024316C -/* DC03C0 80243110 AE22007C */ sw $v0, 0x7c($s1) -.L80243114: -/* DC03C4 80243114 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DC03C8 80243118 0C00A8D4 */ jal cos_deg -/* DC03CC 8024311C 46806320 */ cvt.s.w $f12, $f12 -/* DC03D0 80243120 3C014040 */ lui $at, 0x4040 -/* DC03D4 80243124 44811000 */ mtc1 $at, $f2 -/* DC03D8 80243128 00000000 */ nop -/* DC03DC 8024312C 46020002 */ mul.s $f0, $f0, $f2 -/* DC03E0 80243130 00000000 */ nop -/* DC03E4 80243134 3C014188 */ lui $at, 0x4188 -/* DC03E8 80243138 44812000 */ mtc1 $at, $f4 -/* DC03EC 8024313C C6220078 */ lwc1 $f2, 0x78($s1) -/* DC03F0 80243140 46041080 */ add.s $f2, $f2, $f4 -/* DC03F4 80243144 46001080 */ add.s $f2, $f2, $f0 -/* DC03F8 80243148 E642000C */ swc1 $f2, 0xc($s2) -/* DC03FC 8024314C 8E22007C */ lw $v0, 0x7c($s1) -/* DC0400 80243150 24420009 */ addiu $v0, $v0, 9 -/* DC0404 80243154 44826000 */ mtc1 $v0, $f12 -/* DC0408 80243158 00000000 */ nop -/* DC040C 8024315C 0C00A6C9 */ jal clamp_angle -/* DC0410 80243160 46806320 */ cvt.s.w $f12, $f12 -/* DC0414 80243164 4600018D */ trunc.w.s $f6, $f0 -/* DC0418 80243168 E626007C */ swc1 $f6, 0x7c($s1) -.L8024316C: -/* DC041C 8024316C 8FBF001C */ lw $ra, 0x1c($sp) -/* DC0420 80243170 8FB20018 */ lw $s2, 0x18($sp) -/* DC0424 80243174 8FB10014 */ lw $s1, 0x14($sp) -/* DC0428 80243178 8FB00010 */ lw $s0, 0x10($sp) -/* DC042C 8024317C 0000102D */ daddu $v0, $zero, $zero -/* DC0430 80243180 03E00008 */ jr $ra -/* DC0434 80243184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s new file mode 100644 index 0000000000..b43cb60a89 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_80243038_DC02E8.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243038_DC02E8 +/* DC02E8 80243038 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DC02EC 8024303C AFB10014 */ sw $s1, 0x14($sp) +/* DC02F0 80243040 0080882D */ daddu $s1, $a0, $zero +/* DC02F4 80243044 AFBF001C */ sw $ra, 0x1c($sp) +/* DC02F8 80243048 AFB20018 */ sw $s2, 0x18($sp) +/* DC02FC 8024304C AFB00010 */ sw $s0, 0x10($sp) +/* DC0300 80243050 8E240084 */ lw $a0, 0x84($s1) +/* DC0304 80243054 0C04C3D6 */ jal get_item_entity +/* DC0308 80243058 00A0802D */ daddu $s0, $a1, $zero +/* DC030C 8024305C 12000005 */ beqz $s0, .L80243074 +/* DC0310 80243060 0040902D */ daddu $s2, $v0, $zero +/* DC0314 80243064 C640000C */ lwc1 $f0, 0xc($s2) +/* DC0318 80243068 AE200074 */ sw $zero, 0x74($s1) +/* DC031C 8024306C AE20007C */ sw $zero, 0x7c($s1) +/* DC0320 80243070 E6200078 */ swc1 $f0, 0x78($s1) +.L80243074: +/* DC0324 80243074 8E230074 */ lw $v1, 0x74($s1) +/* DC0328 80243078 10600005 */ beqz $v1, .L80243090 +/* DC032C 8024307C 24020001 */ addiu $v0, $zero, 1 +/* DC0330 80243080 10620024 */ beq $v1, $v0, .L80243114 +/* DC0334 80243084 00000000 */ nop +/* DC0338 80243088 08090C5B */ j .L8024316C +/* DC033C 8024308C 00000000 */ nop +.L80243090: +/* DC0340 80243090 3C013FC9 */ lui $at, 0x3fc9 +/* DC0344 80243094 34210FD8 */ ori $at, $at, 0xfd8 +/* DC0348 80243098 44810000 */ mtc1 $at, $f0 +/* DC034C 8024309C C62C007C */ lwc1 $f12, 0x7c($s1) +/* DC0350 802430A0 46806320 */ cvt.s.w $f12, $f12 +/* DC0354 802430A4 46006302 */ mul.s $f12, $f12, $f0 +/* DC0358 802430A8 00000000 */ nop +/* DC035C 802430AC 3C0141F0 */ lui $at, 0x41f0 +/* DC0360 802430B0 44810000 */ mtc1 $at, $f0 +/* DC0364 802430B4 0C00A874 */ jal cos_rad +/* DC0368 802430B8 46006303 */ div.s $f12, $f12, $f0 +/* DC036C 802430BC 3C013F80 */ lui $at, 0x3f80 +/* DC0370 802430C0 44811000 */ mtc1 $at, $f2 +/* DC0374 802430C4 00000000 */ nop +/* DC0378 802430C8 46001081 */ sub.s $f2, $f2, $f0 +/* DC037C 802430CC 3C0141A0 */ lui $at, 0x41a0 +/* DC0380 802430D0 44810000 */ mtc1 $at, $f0 +/* DC0384 802430D4 00000000 */ nop +/* DC0388 802430D8 46001082 */ mul.s $f2, $f2, $f0 +/* DC038C 802430DC 00000000 */ nop +/* DC0390 802430E0 C6200078 */ lwc1 $f0, 0x78($s1) +/* DC0394 802430E4 46020000 */ add.s $f0, $f0, $f2 +/* DC0398 802430E8 E640000C */ swc1 $f0, 0xc($s2) +/* DC039C 802430EC 8E23007C */ lw $v1, 0x7c($s1) +/* DC03A0 802430F0 2402001E */ addiu $v0, $zero, 0x1e +/* DC03A4 802430F4 14620005 */ bne $v1, $v0, .L8024310C +/* DC03A8 802430F8 24620001 */ addiu $v0, $v1, 1 +/* DC03AC 802430FC 24020001 */ addiu $v0, $zero, 1 +/* DC03B0 80243100 AE220074 */ sw $v0, 0x74($s1) +/* DC03B4 80243104 08090C5B */ j .L8024316C +/* DC03B8 80243108 AE20007C */ sw $zero, 0x7c($s1) +.L8024310C: +/* DC03BC 8024310C 08090C5B */ j .L8024316C +/* DC03C0 80243110 AE22007C */ sw $v0, 0x7c($s1) +.L80243114: +/* DC03C4 80243114 C62C007C */ lwc1 $f12, 0x7c($s1) +/* DC03C8 80243118 0C00A8D4 */ jal cos_deg +/* DC03CC 8024311C 46806320 */ cvt.s.w $f12, $f12 +/* DC03D0 80243120 3C014040 */ lui $at, 0x4040 +/* DC03D4 80243124 44811000 */ mtc1 $at, $f2 +/* DC03D8 80243128 00000000 */ nop +/* DC03DC 8024312C 46020002 */ mul.s $f0, $f0, $f2 +/* DC03E0 80243130 00000000 */ nop +/* DC03E4 80243134 3C014188 */ lui $at, 0x4188 +/* DC03E8 80243138 44812000 */ mtc1 $at, $f4 +/* DC03EC 8024313C C6220078 */ lwc1 $f2, 0x78($s1) +/* DC03F0 80243140 46041080 */ add.s $f2, $f2, $f4 +/* DC03F4 80243144 46001080 */ add.s $f2, $f2, $f0 +/* DC03F8 80243148 E642000C */ swc1 $f2, 0xc($s2) +/* DC03FC 8024314C 8E22007C */ lw $v0, 0x7c($s1) +/* DC0400 80243150 24420009 */ addiu $v0, $v0, 9 +/* DC0404 80243154 44826000 */ mtc1 $v0, $f12 +/* DC0408 80243158 00000000 */ nop +/* DC040C 8024315C 0C00A6C9 */ jal clamp_angle +/* DC0410 80243160 46806320 */ cvt.s.w $f12, $f12 +/* DC0414 80243164 4600018D */ trunc.w.s $f6, $f0 +/* DC0418 80243168 E626007C */ swc1 $f6, 0x7c($s1) +.L8024316C: +/* DC041C 8024316C 8FBF001C */ lw $ra, 0x1c($sp) +/* DC0420 80243170 8FB20018 */ lw $s2, 0x18($sp) +/* DC0424 80243174 8FB10014 */ lw $s1, 0x14($sp) +/* DC0428 80243178 8FB00010 */ lw $s0, 0x10($sp) +/* DC042C 8024317C 0000102D */ daddu $v0, $zero, $zero +/* DC0430 80243180 03E00008 */ jr $ra +/* DC0434 80243184 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC.s deleted file mode 100644 index ca07eec206..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431DC -/* DC048C 802431DC 3C03800B */ lui $v1, %hi(gCameras) -/* DC0490 802431E0 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DC0494 802431E4 94620002 */ lhu $v0, 2($v1) -/* DC0498 802431E8 3042FFFE */ andi $v0, $v0, 0xfffe -/* DC049C 802431EC A4620002 */ sh $v0, 2($v1) -/* DC04A0 802431F0 03E00008 */ jr $ra -/* DC04A4 802431F4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s new file mode 100644 index 0000000000..1d9f7dab27 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802431DC_DC048C +/* DC048C 802431DC 3C03800B */ lui $v1, %hi(gCameras) +/* DC0490 802431E0 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* DC0494 802431E4 94620002 */ lhu $v0, 2($v1) +/* DC0498 802431E8 3042FFFE */ andi $v0, $v0, 0xfffe +/* DC049C 802431EC A4620002 */ sh $v0, 2($v1) +/* DC04A0 802431F0 03E00008 */ jr $ra +/* DC04A4 802431F4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8.s deleted file mode 100644 index 142f76e903..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431F8 -/* DC04A8 802431F8 3C03800B */ lui $v1, %hi(gCameras) -/* DC04AC 802431FC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DC04B0 80243200 94620002 */ lhu $v0, 2($v1) -/* DC04B4 80243204 34420001 */ ori $v0, $v0, 1 -/* DC04B8 80243208 A4620002 */ sh $v0, 2($v1) -/* DC04BC 8024320C 03E00008 */ jr $ra -/* DC04C0 80243210 24020002 */ addiu $v0, $zero, 2 -/* DC04C4 80243214 00000000 */ nop -/* DC04C8 80243218 00000000 */ nop -/* DC04CC 8024321C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s new file mode 100644 index 0000000000..fabc1ad94e --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802431F8_DC04A8 +/* DC04A8 802431F8 3C03800B */ lui $v1, %hi(gCameras) +/* DC04AC 802431FC 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* DC04B0 80243200 94620002 */ lhu $v0, 2($v1) +/* DC04B4 80243204 34420001 */ ori $v0, $v0, 1 +/* DC04B8 80243208 A4620002 */ sh $v0, 2($v1) +/* DC04BC 8024320C 03E00008 */ jr $ra +/* DC04C0 80243210 24020002 */ addiu $v0, $zero, 2 +/* DC04C4 80243214 00000000 */ nop +/* DC04C8 80243218 00000000 */ nop +/* DC04CC 8024321C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220.s b/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220.s deleted file mode 100644 index df66473f29..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243220 -/* DC04D0 80243220 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DC04D4 80243224 AFB10014 */ sw $s1, 0x14($sp) -/* DC04D8 80243228 0080882D */ daddu $s1, $a0, $zero -/* DC04DC 8024322C AFBF001C */ sw $ra, 0x1c($sp) -/* DC04E0 80243230 AFB20018 */ sw $s2, 0x18($sp) -/* DC04E4 80243234 AFB00010 */ sw $s0, 0x10($sp) -/* DC04E8 80243238 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DC04EC 8024323C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DC04F0 80243240 0C00EABB */ jal get_npc_unsafe -/* DC04F4 80243244 24040007 */ addiu $a0, $zero, 7 -/* DC04F8 80243248 0040802D */ daddu $s0, $v0, $zero -/* DC04FC 8024324C 3C12800B */ lui $s2, %hi(gCameras) -/* DC0500 80243250 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* DC0504 80243254 C60C000C */ lwc1 $f12, 0xc($s0) -/* DC0508 80243258 C640006C */ lwc1 $f0, 0x6c($s2) -/* DC050C 8024325C 46006300 */ add.s $f12, $f12, $f0 -/* DC0510 80243260 3C014334 */ lui $at, 0x4334 -/* DC0514 80243264 4481A000 */ mtc1 $at, $f20 -/* DC0518 80243268 3C014220 */ lui $at, 0x4220 -/* DC051C 8024326C 4481B000 */ mtc1 $at, $f22 -/* DC0520 80243270 0C00A8BB */ jal sin_deg -/* DC0524 80243274 46146300 */ add.s $f12, $f12, $f20 -/* DC0528 80243278 46160002 */ mul.s $f0, $f0, $f22 -/* DC052C 8024327C 00000000 */ nop -/* DC0530 80243280 C6020038 */ lwc1 $f2, 0x38($s0) -/* DC0534 80243284 46001080 */ add.s $f2, $f2, $f0 -/* DC0538 80243288 4600110D */ trunc.w.s $f4, $f2 -/* DC053C 8024328C E6240084 */ swc1 $f4, 0x84($s1) -/* DC0540 80243290 C600003C */ lwc1 $f0, 0x3c($s0) -/* DC0544 80243294 3C014100 */ lui $at, 0x4100 -/* DC0548 80243298 44811000 */ mtc1 $at, $f2 -/* DC054C 8024329C 00000000 */ nop -/* DC0550 802432A0 46020000 */ add.s $f0, $f0, $f2 -/* DC0554 802432A4 4600010D */ trunc.w.s $f4, $f0 -/* DC0558 802432A8 E6240088 */ swc1 $f4, 0x88($s1) -/* DC055C 802432AC C60C000C */ lwc1 $f12, 0xc($s0) -/* DC0560 802432B0 C640006C */ lwc1 $f0, 0x6c($s2) -/* DC0564 802432B4 46006300 */ add.s $f12, $f12, $f0 -/* DC0568 802432B8 0C00A8D4 */ jal cos_deg -/* DC056C 802432BC 46146300 */ add.s $f12, $f12, $f20 -/* DC0570 802432C0 46160002 */ mul.s $f0, $f0, $f22 -/* DC0574 802432C4 00000000 */ nop -/* DC0578 802432C8 C6020040 */ lwc1 $f2, 0x40($s0) -/* DC057C 802432CC 46001081 */ sub.s $f2, $f2, $f0 -/* DC0580 802432D0 4600110D */ trunc.w.s $f4, $f2 -/* DC0584 802432D4 E624008C */ swc1 $f4, 0x8c($s1) -/* DC0588 802432D8 8FBF001C */ lw $ra, 0x1c($sp) -/* DC058C 802432DC 8FB20018 */ lw $s2, 0x18($sp) -/* DC0590 802432E0 8FB10014 */ lw $s1, 0x14($sp) -/* DC0594 802432E4 8FB00010 */ lw $s0, 0x10($sp) -/* DC0598 802432E8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DC059C 802432EC D7B40020 */ ldc1 $f20, 0x20($sp) -/* DC05A0 802432F0 24020002 */ addiu $v0, $zero, 2 -/* DC05A4 802432F4 03E00008 */ jr $ra -/* DC05A8 802432F8 27BD0030 */ addiu $sp, $sp, 0x30 -/* DC05AC 802432FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s b/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s new file mode 100644 index 0000000000..cb2d1d0ef6 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_07/DC04D0/func_80243220_DC04D0.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243220_DC04D0 +/* DC04D0 80243220 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* DC04D4 80243224 AFB10014 */ sw $s1, 0x14($sp) +/* DC04D8 80243228 0080882D */ daddu $s1, $a0, $zero +/* DC04DC 8024322C AFBF001C */ sw $ra, 0x1c($sp) +/* DC04E0 80243230 AFB20018 */ sw $s2, 0x18($sp) +/* DC04E4 80243234 AFB00010 */ sw $s0, 0x10($sp) +/* DC04E8 80243238 F7B60028 */ sdc1 $f22, 0x28($sp) +/* DC04EC 8024323C F7B40020 */ sdc1 $f20, 0x20($sp) +/* DC04F0 80243240 0C00EABB */ jal get_npc_unsafe +/* DC04F4 80243244 24040007 */ addiu $a0, $zero, 7 +/* DC04F8 80243248 0040802D */ daddu $s0, $v0, $zero +/* DC04FC 8024324C 3C12800B */ lui $s2, %hi(gCameras) +/* DC0500 80243250 26521D80 */ addiu $s2, $s2, %lo(gCameras) +/* DC0504 80243254 C60C000C */ lwc1 $f12, 0xc($s0) +/* DC0508 80243258 C640006C */ lwc1 $f0, 0x6c($s2) +/* DC050C 8024325C 46006300 */ add.s $f12, $f12, $f0 +/* DC0510 80243260 3C014334 */ lui $at, 0x4334 +/* DC0514 80243264 4481A000 */ mtc1 $at, $f20 +/* DC0518 80243268 3C014220 */ lui $at, 0x4220 +/* DC051C 8024326C 4481B000 */ mtc1 $at, $f22 +/* DC0520 80243270 0C00A8BB */ jal sin_deg +/* DC0524 80243274 46146300 */ add.s $f12, $f12, $f20 +/* DC0528 80243278 46160002 */ mul.s $f0, $f0, $f22 +/* DC052C 8024327C 00000000 */ nop +/* DC0530 80243280 C6020038 */ lwc1 $f2, 0x38($s0) +/* DC0534 80243284 46001080 */ add.s $f2, $f2, $f0 +/* DC0538 80243288 4600110D */ trunc.w.s $f4, $f2 +/* DC053C 8024328C E6240084 */ swc1 $f4, 0x84($s1) +/* DC0540 80243290 C600003C */ lwc1 $f0, 0x3c($s0) +/* DC0544 80243294 3C014100 */ lui $at, 0x4100 +/* DC0548 80243298 44811000 */ mtc1 $at, $f2 +/* DC054C 8024329C 00000000 */ nop +/* DC0550 802432A0 46020000 */ add.s $f0, $f0, $f2 +/* DC0554 802432A4 4600010D */ trunc.w.s $f4, $f0 +/* DC0558 802432A8 E6240088 */ swc1 $f4, 0x88($s1) +/* DC055C 802432AC C60C000C */ lwc1 $f12, 0xc($s0) +/* DC0560 802432B0 C640006C */ lwc1 $f0, 0x6c($s2) +/* DC0564 802432B4 46006300 */ add.s $f12, $f12, $f0 +/* DC0568 802432B8 0C00A8D4 */ jal cos_deg +/* DC056C 802432BC 46146300 */ add.s $f12, $f12, $f20 +/* DC0570 802432C0 46160002 */ mul.s $f0, $f0, $f22 +/* DC0574 802432C4 00000000 */ nop +/* DC0578 802432C8 C6020040 */ lwc1 $f2, 0x40($s0) +/* DC057C 802432CC 46001081 */ sub.s $f2, $f2, $f0 +/* DC0580 802432D0 4600110D */ trunc.w.s $f4, $f2 +/* DC0584 802432D4 E624008C */ swc1 $f4, 0x8c($s1) +/* DC0588 802432D8 8FBF001C */ lw $ra, 0x1c($sp) +/* DC058C 802432DC 8FB20018 */ lw $s2, 0x18($sp) +/* DC0590 802432E0 8FB10014 */ lw $s1, 0x14($sp) +/* DC0594 802432E4 8FB00010 */ lw $s0, 0x10($sp) +/* DC0598 802432E8 D7B60028 */ ldc1 $f22, 0x28($sp) +/* DC059C 802432EC D7B40020 */ ldc1 $f20, 0x20($sp) +/* DC05A0 802432F0 24020002 */ addiu $v0, $zero, 2 +/* DC05A4 802432F4 03E00008 */ jr $ra +/* DC05A8 802432F8 27BD0030 */ addiu $sp, $sp, 0x30 +/* DC05AC 802432FC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s index 12171aec8a..68470e0917 100644 --- a/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s +++ b/asm/nonmatchings/world/area_omo/omo_08/DC4C40/func_80240AA8_DC4E78.s @@ -173,7 +173,7 @@ glabel func_80240AA8_DC4E78 /* DC5100 80240D30 00000000 */ nop /* DC5104 80240D34 0260202D */ daddu $a0, $s3, $zero /* DC5108 80240D38 0280282D */ daddu $a1, $s4, $zero -/* DC510C 80240D3C 0C09021C */ jal func_80240870 +/* DC510C 80240D3C 0C09021C */ jal func_80240870_DC4C40 /* DC5110 80240D40 02A0302D */ daddu $a2, $s5, $zero /* DC5114 80240D44 8E630070 */ lw $v1, 0x70($s3) /* DC5118 80240D48 2402000F */ addiu $v0, $zero, 0xf @@ -181,7 +181,7 @@ glabel func_80240AA8_DC4E78 /* DC5120 80240D50 00000000 */ nop /* DC5124 80240D54 0260202D */ daddu $a0, $s3, $zero /* DC5128 80240D58 0280282D */ daddu $a1, $s4, $zero -/* DC512C 80240D5C 0C090238 */ jal func_802408E0 +/* DC512C 80240D5C 0C090238 */ jal func_802408E0_DC4CB0 /* DC5130 80240D60 02A0302D */ daddu $a2, $s5, $zero /* DC5134 80240D64 8E630070 */ lw $v1, 0x70($s3) /* DC5138 80240D68 24020010 */ addiu $v0, $zero, 0x10 @@ -189,7 +189,7 @@ glabel func_80240AA8_DC4E78 /* DC5140 80240D70 00000000 */ nop /* DC5144 80240D74 0260202D */ daddu $a0, $s3, $zero /* DC5148 80240D78 0280282D */ daddu $a1, $s4, $zero -/* DC514C 80240D7C 0C09026C */ jal func_802409B0 +/* DC514C 80240D7C 0C09026C */ jal func_802409B0_DC4D80 /* DC5150 80240D80 02A0302D */ daddu $a2, $s5, $zero /* DC5154 80240D84 8E630070 */ lw $v1, 0x70($s3) /* DC5158 80240D88 24020011 */ addiu $v0, $zero, 0x11 @@ -197,7 +197,7 @@ glabel func_80240AA8_DC4E78 /* DC5160 80240D90 00000000 */ nop /* DC5164 80240D94 0260202D */ daddu $a0, $s3, $zero /* DC5168 80240D98 0280282D */ daddu $a1, $s4, $zero -/* DC516C 80240D9C 0C090292 */ jal func_80240A48 +/* DC516C 80240D9C 0C090292 */ jal func_80240A48_DC4E18 /* DC5170 80240DA0 02A0302D */ daddu $a2, $s5, $zero /* DC5174 80240DA4 0809036D */ j .L80240DB4 /* DC5178 80240DA8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s index e5347ace0a..8ea990aadd 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240054_DCCD24.s @@ -4,7 +4,7 @@ glabel func_80240054_DCCD24 /* DCCD24 80240054 27BDFFE8 */ addiu $sp, $sp, -0x18 /* DCCD28 80240058 AFBF0010 */ sw $ra, 0x10($sp) -/* DCCD2C 8024005C 0C090000 */ jal func_80240000 +/* DCCD2C 8024005C 0C090000 */ jal func_80240000_DCCCD0 /* DCCD30 80240060 00000000 */ nop /* DCCD34 80240064 2C420001 */ sltiu $v0, $v0, 1 /* DCCD38 80240068 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078.s b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078.s deleted file mode 100644 index 3222ac34f2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078.s +++ /dev/null @@ -1,167 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240078 -/* DCCD48 80240078 27BDFF90 */ addiu $sp, $sp, -0x70 -/* DCCD4C 8024007C AFB00048 */ sw $s0, 0x48($sp) -/* DCCD50 80240080 0080802D */ daddu $s0, $a0, $zero -/* DCCD54 80240084 2404FFFC */ addiu $a0, $zero, -4 -/* DCCD58 80240088 AFBF006C */ sw $ra, 0x6c($sp) -/* DCCD5C 8024008C AFBE0068 */ sw $fp, 0x68($sp) -/* DCCD60 80240090 AFB70064 */ sw $s7, 0x64($sp) -/* DCCD64 80240094 AFB60060 */ sw $s6, 0x60($sp) -/* DCCD68 80240098 AFB5005C */ sw $s5, 0x5c($sp) -/* DCCD6C 8024009C AFB40058 */ sw $s4, 0x58($sp) -/* DCCD70 802400A0 AFB30054 */ sw $s3, 0x54($sp) -/* DCCD74 802400A4 AFB20050 */ sw $s2, 0x50($sp) -/* DCCD78 802400A8 0C00EABB */ jal get_npc_unsafe -/* DCCD7C 802400AC AFB1004C */ sw $s1, 0x4c($sp) -/* DCCD80 802400B0 3C158011 */ lui $s5, %hi(gPlayerStatus) -/* DCCD84 802400B4 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) -/* DCCD88 802400B8 0040982D */ daddu $s3, $v0, $zero -/* DCCD8C 802400BC 3C148011 */ lui $s4, %hi(D_8010EBB0) -/* DCCD90 802400C0 2694EBB0 */ addiu $s4, $s4, %lo(D_8010EBB0) -/* DCCD94 802400C4 0C090000 */ jal func_80240000 -/* DCCD98 802400C8 AE000084 */ sw $zero, 0x84($s0) -/* DCCD9C 802400CC 14400073 */ bnez $v0, .L8024029C -/* DCCDA0 802400D0 24020002 */ addiu $v0, $zero, 2 -/* DCCDA4 802400D4 82830003 */ lb $v1, 3($s4) -/* DCCDA8 802400D8 24020009 */ addiu $v0, $zero, 9 -/* DCCDAC 802400DC 14620039 */ bne $v1, $v0, .L802401C4 -/* DCCDB0 802400E0 24020008 */ addiu $v0, $zero, 8 -/* DCCDB4 802400E4 82820000 */ lb $v0, ($s4) -/* DCCDB8 802400E8 10400035 */ beqz $v0, .L802401C0 -/* DCCDBC 802400EC 24020080 */ addiu $v0, $zero, 0x80 -/* DCCDC0 802400F0 92A3000E */ lbu $v1, 0xe($s5) -/* DCCDC4 802400F4 14620031 */ bne $v1, $v0, .L802401BC -/* DCCDC8 802400F8 02A0202D */ daddu $a0, $s5, $zero -/* DCCDCC 802400FC 27A20034 */ addiu $v0, $sp, 0x34 -/* DCCDD0 80240100 27A50028 */ addiu $a1, $sp, 0x28 -/* DCCDD4 80240104 27A6002C */ addiu $a2, $sp, 0x2c -/* DCCDD8 80240108 C6A00028 */ lwc1 $f0, 0x28($s5) -/* DCCDDC 8024010C C6A2002C */ lwc1 $f2, 0x2c($s5) -/* DCCDE0 80240110 C6A40030 */ lwc1 $f4, 0x30($s5) -/* DCCDE4 80240114 3C01447A */ lui $at, 0x447a -/* DCCDE8 80240118 44813000 */ mtc1 $at, $f6 -/* DCCDEC 8024011C 27A70030 */ addiu $a3, $sp, 0x30 -/* DCCDF0 80240120 E7A00028 */ swc1 $f0, 0x28($sp) -/* DCCDF4 80240124 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DCCDF8 80240128 E7A40030 */ swc1 $f4, 0x30($sp) -/* DCCDFC 8024012C E7A60034 */ swc1 $f6, 0x34($sp) -/* DCCE00 80240130 AFA20010 */ sw $v0, 0x10($sp) -/* DCCE04 80240134 27A20038 */ addiu $v0, $sp, 0x38 -/* DCCE08 80240138 AFA20014 */ sw $v0, 0x14($sp) -/* DCCE0C 8024013C 27A2003C */ addiu $v0, $sp, 0x3c -/* DCCE10 80240140 AFA20018 */ sw $v0, 0x18($sp) -/* DCCE14 80240144 27A20040 */ addiu $v0, $sp, 0x40 -/* DCCE18 80240148 AFA2001C */ sw $v0, 0x1c($sp) -/* DCCE1C 8024014C 27A20044 */ addiu $v0, $sp, 0x44 -/* DCCE20 80240150 0C03791B */ jal func_800DE46C -/* DCCE24 80240154 AFA20020 */ sw $v0, 0x20($sp) -/* DCCE28 80240158 0040402D */ daddu $t0, $v0, $zero -/* DCCE2C 8024015C 0000302D */ daddu $a2, $zero, $zero -/* DCCE30 80240160 24050004 */ addiu $a1, $zero, 4 -/* DCCE34 80240164 3C078024 */ lui $a3, 0x8024 -/* DCCE38 80240168 24E73A90 */ addiu $a3, $a3, 0x3a90 -/* DCCE3C 8024016C 00E0202D */ daddu $a0, $a3, $zero -/* DCCE40 80240170 3C038024 */ lui $v1, 0x8024 -/* DCCE44 80240174 24633A80 */ addiu $v1, $v1, 0x3a80 -.L80240178: -/* DCCE48 80240178 8C620000 */ lw $v0, ($v1) -/* DCCE4C 8024017C 55020007 */ bnel $t0, $v0, .L8024019C -/* DCCE50 80240180 24A50008 */ addiu $a1, $a1, 8 -/* DCCE54 80240184 C4800000 */ lwc1 $f0, ($a0) -/* DCCE58 80240188 00A71021 */ addu $v0, $a1, $a3 -/* DCCE5C 8024018C E6A0001C */ swc1 $f0, 0x1c($s5) -/* DCCE60 80240190 C4400000 */ lwc1 $f0, ($v0) -/* DCCE64 80240194 E6A00024 */ swc1 $f0, 0x24($s5) -/* DCCE68 80240198 24A50008 */ addiu $a1, $a1, 8 -.L8024019C: -/* DCCE6C 8024019C 24840008 */ addiu $a0, $a0, 8 -/* DCCE70 802401A0 24C60001 */ addiu $a2, $a2, 1 -/* DCCE74 802401A4 2CC20004 */ sltiu $v0, $a2, 4 -/* DCCE78 802401A8 1440FFF3 */ bnez $v0, .L80240178 -/* DCCE7C 802401AC 24630004 */ addiu $v1, $v1, 4 -/* DCCE80 802401B0 24020001 */ addiu $v0, $zero, 1 -/* DCCE84 802401B4 080900A6 */ j .L80240298 -/* DCCE88 802401B8 AE020084 */ sw $v0, 0x84($s0) -.L802401BC: -/* DCCE8C 802401BC 82830003 */ lb $v1, 3($s4) -.L802401C0: -/* DCCE90 802401C0 24020008 */ addiu $v0, $zero, 8 -.L802401C4: -/* DCCE94 802401C4 14620004 */ bne $v1, $v0, .L802401D8 -/* DCCE98 802401C8 00000000 */ nop -/* DCCE9C 802401CC 82820000 */ lb $v0, ($s4) -/* DCCEA0 802401D0 14400032 */ bnez $v0, .L8024029C -/* DCCEA4 802401D4 24020002 */ addiu $v0, $zero, 2 -.L802401D8: -/* DCCEA8 802401D8 3C178016 */ lui $s7, 0x8016 -/* DCCEAC 802401DC 26F7A550 */ addiu $s7, $s7, -0x5ab0 -/* DCCEB0 802401E0 24120004 */ addiu $s2, $zero, 4 -/* DCCEB4 802401E4 3C168024 */ lui $s6, 0x8024 -/* DCCEB8 802401E8 26D63A90 */ addiu $s6, $s6, 0x3a90 -/* DCCEBC 802401EC 02C0802D */ daddu $s0, $s6, $zero -/* DCCEC0 802401F0 3C118024 */ lui $s1, 0x8024 -/* DCCEC4 802401F4 26313A80 */ addiu $s1, $s1, 0x3a80 -/* DCCEC8 802401F8 261E0020 */ addiu $fp, $s0, 0x20 -.L802401FC: -/* DCCECC 802401FC 86E20002 */ lh $v0, 2($s7) -/* DCCED0 80240200 8E230000 */ lw $v1, ($s1) -/* DCCED4 80240204 10430004 */ beq $v0, $v1, .L80240218 -/* DCCED8 80240208 00000000 */ nop -/* DCCEDC 8024020C 86E20004 */ lh $v0, 4($s7) -/* DCCEE0 80240210 14430006 */ bne $v0, $v1, .L8024022C -/* DCCEE4 80240214 00000000 */ nop -.L80240218: -/* DCCEE8 80240218 C6000000 */ lwc1 $f0, ($s0) -/* DCCEEC 8024021C 02561021 */ addu $v0, $s2, $s6 -/* DCCEF0 80240220 E6A0001C */ swc1 $f0, 0x1c($s5) -/* DCCEF4 80240224 C4400000 */ lwc1 $f0, ($v0) -/* DCCEF8 80240228 E6A00024 */ swc1 $f0, 0x24($s5) -.L8024022C: -/* DCCEFC 8024022C 86630084 */ lh $v1, 0x84($s3) -/* DCCF00 80240230 8E220000 */ lw $v0, ($s1) -/* DCCF04 80240234 54620014 */ bnel $v1, $v0, .L80240288 -/* DCCF08 80240238 26520008 */ addiu $s2, $s2, 8 -/* DCCF0C 8024023C 82830003 */ lb $v1, 3($s4) -/* DCCF10 80240240 24020002 */ addiu $v0, $zero, 2 -/* DCCF14 80240244 14620004 */ bne $v1, $v0, .L80240258 -/* DCCF18 80240248 00000000 */ nop -/* DCCF1C 8024024C 82820000 */ lb $v0, ($s4) -/* DCCF20 80240250 5440000D */ bnel $v0, $zero, .L80240288 -/* DCCF24 80240254 26520008 */ addiu $s2, $s2, 8 -.L80240258: -/* DCCF28 80240258 C6600038 */ lwc1 $f0, 0x38($s3) -/* DCCF2C 8024025C C6020000 */ lwc1 $f2, ($s0) -/* DCCF30 80240260 46020000 */ add.s $f0, $f0, $f2 -/* DCCF34 80240264 C6620040 */ lwc1 $f2, 0x40($s3) -/* DCCF38 80240268 02561021 */ addu $v0, $s2, $s6 -/* DCCF3C 8024026C E6600038 */ swc1 $f0, 0x38($s3) -/* DCCF40 80240270 C4400000 */ lwc1 $f0, ($v0) -/* DCCF44 80240274 46001080 */ add.s $f2, $f2, $f0 -/* DCCF48 80240278 0260202D */ daddu $a0, $s3, $zero -/* DCCF4C 8024027C 0C03BD17 */ jal clear_partner_move_history -/* DCCF50 80240280 E6620040 */ swc1 $f2, 0x40($s3) -/* DCCF54 80240284 26520008 */ addiu $s2, $s2, 8 -.L80240288: -/* DCCF58 80240288 26100008 */ addiu $s0, $s0, 8 -/* DCCF5C 8024028C 021E102B */ sltu $v0, $s0, $fp -/* DCCF60 80240290 1440FFDA */ bnez $v0, .L802401FC -/* DCCF64 80240294 26310004 */ addiu $s1, $s1, 4 -.L80240298: -/* DCCF68 80240298 24020002 */ addiu $v0, $zero, 2 -.L8024029C: -/* DCCF6C 8024029C 8FBF006C */ lw $ra, 0x6c($sp) -/* DCCF70 802402A0 8FBE0068 */ lw $fp, 0x68($sp) -/* DCCF74 802402A4 8FB70064 */ lw $s7, 0x64($sp) -/* DCCF78 802402A8 8FB60060 */ lw $s6, 0x60($sp) -/* DCCF7C 802402AC 8FB5005C */ lw $s5, 0x5c($sp) -/* DCCF80 802402B0 8FB40058 */ lw $s4, 0x58($sp) -/* DCCF84 802402B4 8FB30054 */ lw $s3, 0x54($sp) -/* DCCF88 802402B8 8FB20050 */ lw $s2, 0x50($sp) -/* DCCF8C 802402BC 8FB1004C */ lw $s1, 0x4c($sp) -/* DCCF90 802402C0 8FB00048 */ lw $s0, 0x48($sp) -/* DCCF94 802402C4 03E00008 */ jr $ra -/* DCCF98 802402C8 27BD0070 */ addiu $sp, $sp, 0x70 -/* DCCF9C 802402CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s new file mode 100644 index 0000000000..e438d4072e --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCCCD0/func_80240078_DCCD48.s @@ -0,0 +1,167 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240078_DCCD48 +/* DCCD48 80240078 27BDFF90 */ addiu $sp, $sp, -0x70 +/* DCCD4C 8024007C AFB00048 */ sw $s0, 0x48($sp) +/* DCCD50 80240080 0080802D */ daddu $s0, $a0, $zero +/* DCCD54 80240084 2404FFFC */ addiu $a0, $zero, -4 +/* DCCD58 80240088 AFBF006C */ sw $ra, 0x6c($sp) +/* DCCD5C 8024008C AFBE0068 */ sw $fp, 0x68($sp) +/* DCCD60 80240090 AFB70064 */ sw $s7, 0x64($sp) +/* DCCD64 80240094 AFB60060 */ sw $s6, 0x60($sp) +/* DCCD68 80240098 AFB5005C */ sw $s5, 0x5c($sp) +/* DCCD6C 8024009C AFB40058 */ sw $s4, 0x58($sp) +/* DCCD70 802400A0 AFB30054 */ sw $s3, 0x54($sp) +/* DCCD74 802400A4 AFB20050 */ sw $s2, 0x50($sp) +/* DCCD78 802400A8 0C00EABB */ jal get_npc_unsafe +/* DCCD7C 802400AC AFB1004C */ sw $s1, 0x4c($sp) +/* DCCD80 802400B0 3C158011 */ lui $s5, %hi(gPlayerStatus) +/* DCCD84 802400B4 26B5EFC8 */ addiu $s5, $s5, %lo(gPlayerStatus) +/* DCCD88 802400B8 0040982D */ daddu $s3, $v0, $zero +/* DCCD8C 802400BC 3C148011 */ lui $s4, %hi(D_8010EBB0) +/* DCCD90 802400C0 2694EBB0 */ addiu $s4, $s4, %lo(D_8010EBB0) +/* DCCD94 802400C4 0C090000 */ jal func_80240000_DCCCD0 +/* DCCD98 802400C8 AE000084 */ sw $zero, 0x84($s0) +/* DCCD9C 802400CC 14400073 */ bnez $v0, .L8024029C +/* DCCDA0 802400D0 24020002 */ addiu $v0, $zero, 2 +/* DCCDA4 802400D4 82830003 */ lb $v1, 3($s4) +/* DCCDA8 802400D8 24020009 */ addiu $v0, $zero, 9 +/* DCCDAC 802400DC 14620039 */ bne $v1, $v0, .L802401C4 +/* DCCDB0 802400E0 24020008 */ addiu $v0, $zero, 8 +/* DCCDB4 802400E4 82820000 */ lb $v0, ($s4) +/* DCCDB8 802400E8 10400035 */ beqz $v0, .L802401C0 +/* DCCDBC 802400EC 24020080 */ addiu $v0, $zero, 0x80 +/* DCCDC0 802400F0 92A3000E */ lbu $v1, 0xe($s5) +/* DCCDC4 802400F4 14620031 */ bne $v1, $v0, .L802401BC +/* DCCDC8 802400F8 02A0202D */ daddu $a0, $s5, $zero +/* DCCDCC 802400FC 27A20034 */ addiu $v0, $sp, 0x34 +/* DCCDD0 80240100 27A50028 */ addiu $a1, $sp, 0x28 +/* DCCDD4 80240104 27A6002C */ addiu $a2, $sp, 0x2c +/* DCCDD8 80240108 C6A00028 */ lwc1 $f0, 0x28($s5) +/* DCCDDC 8024010C C6A2002C */ lwc1 $f2, 0x2c($s5) +/* DCCDE0 80240110 C6A40030 */ lwc1 $f4, 0x30($s5) +/* DCCDE4 80240114 3C01447A */ lui $at, 0x447a +/* DCCDE8 80240118 44813000 */ mtc1 $at, $f6 +/* DCCDEC 8024011C 27A70030 */ addiu $a3, $sp, 0x30 +/* DCCDF0 80240120 E7A00028 */ swc1 $f0, 0x28($sp) +/* DCCDF4 80240124 E7A2002C */ swc1 $f2, 0x2c($sp) +/* DCCDF8 80240128 E7A40030 */ swc1 $f4, 0x30($sp) +/* DCCDFC 8024012C E7A60034 */ swc1 $f6, 0x34($sp) +/* DCCE00 80240130 AFA20010 */ sw $v0, 0x10($sp) +/* DCCE04 80240134 27A20038 */ addiu $v0, $sp, 0x38 +/* DCCE08 80240138 AFA20014 */ sw $v0, 0x14($sp) +/* DCCE0C 8024013C 27A2003C */ addiu $v0, $sp, 0x3c +/* DCCE10 80240140 AFA20018 */ sw $v0, 0x18($sp) +/* DCCE14 80240144 27A20040 */ addiu $v0, $sp, 0x40 +/* DCCE18 80240148 AFA2001C */ sw $v0, 0x1c($sp) +/* DCCE1C 8024014C 27A20044 */ addiu $v0, $sp, 0x44 +/* DCCE20 80240150 0C03791B */ jal func_800DE46C +/* DCCE24 80240154 AFA20020 */ sw $v0, 0x20($sp) +/* DCCE28 80240158 0040402D */ daddu $t0, $v0, $zero +/* DCCE2C 8024015C 0000302D */ daddu $a2, $zero, $zero +/* DCCE30 80240160 24050004 */ addiu $a1, $zero, 4 +/* DCCE34 80240164 3C078024 */ lui $a3, 0x8024 +/* DCCE38 80240168 24E73A90 */ addiu $a3, $a3, 0x3a90 +/* DCCE3C 8024016C 00E0202D */ daddu $a0, $a3, $zero +/* DCCE40 80240170 3C038024 */ lui $v1, 0x8024 +/* DCCE44 80240174 24633A80 */ addiu $v1, $v1, 0x3a80 +.L80240178: +/* DCCE48 80240178 8C620000 */ lw $v0, ($v1) +/* DCCE4C 8024017C 55020007 */ bnel $t0, $v0, .L8024019C +/* DCCE50 80240180 24A50008 */ addiu $a1, $a1, 8 +/* DCCE54 80240184 C4800000 */ lwc1 $f0, ($a0) +/* DCCE58 80240188 00A71021 */ addu $v0, $a1, $a3 +/* DCCE5C 8024018C E6A0001C */ swc1 $f0, 0x1c($s5) +/* DCCE60 80240190 C4400000 */ lwc1 $f0, ($v0) +/* DCCE64 80240194 E6A00024 */ swc1 $f0, 0x24($s5) +/* DCCE68 80240198 24A50008 */ addiu $a1, $a1, 8 +.L8024019C: +/* DCCE6C 8024019C 24840008 */ addiu $a0, $a0, 8 +/* DCCE70 802401A0 24C60001 */ addiu $a2, $a2, 1 +/* DCCE74 802401A4 2CC20004 */ sltiu $v0, $a2, 4 +/* DCCE78 802401A8 1440FFF3 */ bnez $v0, .L80240178 +/* DCCE7C 802401AC 24630004 */ addiu $v1, $v1, 4 +/* DCCE80 802401B0 24020001 */ addiu $v0, $zero, 1 +/* DCCE84 802401B4 080900A6 */ j .L80240298 +/* DCCE88 802401B8 AE020084 */ sw $v0, 0x84($s0) +.L802401BC: +/* DCCE8C 802401BC 82830003 */ lb $v1, 3($s4) +.L802401C0: +/* DCCE90 802401C0 24020008 */ addiu $v0, $zero, 8 +.L802401C4: +/* DCCE94 802401C4 14620004 */ bne $v1, $v0, .L802401D8 +/* DCCE98 802401C8 00000000 */ nop +/* DCCE9C 802401CC 82820000 */ lb $v0, ($s4) +/* DCCEA0 802401D0 14400032 */ bnez $v0, .L8024029C +/* DCCEA4 802401D4 24020002 */ addiu $v0, $zero, 2 +.L802401D8: +/* DCCEA8 802401D8 3C178016 */ lui $s7, 0x8016 +/* DCCEAC 802401DC 26F7A550 */ addiu $s7, $s7, -0x5ab0 +/* DCCEB0 802401E0 24120004 */ addiu $s2, $zero, 4 +/* DCCEB4 802401E4 3C168024 */ lui $s6, 0x8024 +/* DCCEB8 802401E8 26D63A90 */ addiu $s6, $s6, 0x3a90 +/* DCCEBC 802401EC 02C0802D */ daddu $s0, $s6, $zero +/* DCCEC0 802401F0 3C118024 */ lui $s1, 0x8024 +/* DCCEC4 802401F4 26313A80 */ addiu $s1, $s1, 0x3a80 +/* DCCEC8 802401F8 261E0020 */ addiu $fp, $s0, 0x20 +.L802401FC: +/* DCCECC 802401FC 86E20002 */ lh $v0, 2($s7) +/* DCCED0 80240200 8E230000 */ lw $v1, ($s1) +/* DCCED4 80240204 10430004 */ beq $v0, $v1, .L80240218 +/* DCCED8 80240208 00000000 */ nop +/* DCCEDC 8024020C 86E20004 */ lh $v0, 4($s7) +/* DCCEE0 80240210 14430006 */ bne $v0, $v1, .L8024022C +/* DCCEE4 80240214 00000000 */ nop +.L80240218: +/* DCCEE8 80240218 C6000000 */ lwc1 $f0, ($s0) +/* DCCEEC 8024021C 02561021 */ addu $v0, $s2, $s6 +/* DCCEF0 80240220 E6A0001C */ swc1 $f0, 0x1c($s5) +/* DCCEF4 80240224 C4400000 */ lwc1 $f0, ($v0) +/* DCCEF8 80240228 E6A00024 */ swc1 $f0, 0x24($s5) +.L8024022C: +/* DCCEFC 8024022C 86630084 */ lh $v1, 0x84($s3) +/* DCCF00 80240230 8E220000 */ lw $v0, ($s1) +/* DCCF04 80240234 54620014 */ bnel $v1, $v0, .L80240288 +/* DCCF08 80240238 26520008 */ addiu $s2, $s2, 8 +/* DCCF0C 8024023C 82830003 */ lb $v1, 3($s4) +/* DCCF10 80240240 24020002 */ addiu $v0, $zero, 2 +/* DCCF14 80240244 14620004 */ bne $v1, $v0, .L80240258 +/* DCCF18 80240248 00000000 */ nop +/* DCCF1C 8024024C 82820000 */ lb $v0, ($s4) +/* DCCF20 80240250 5440000D */ bnel $v0, $zero, .L80240288 +/* DCCF24 80240254 26520008 */ addiu $s2, $s2, 8 +.L80240258: +/* DCCF28 80240258 C6600038 */ lwc1 $f0, 0x38($s3) +/* DCCF2C 8024025C C6020000 */ lwc1 $f2, ($s0) +/* DCCF30 80240260 46020000 */ add.s $f0, $f0, $f2 +/* DCCF34 80240264 C6620040 */ lwc1 $f2, 0x40($s3) +/* DCCF38 80240268 02561021 */ addu $v0, $s2, $s6 +/* DCCF3C 8024026C E6600038 */ swc1 $f0, 0x38($s3) +/* DCCF40 80240270 C4400000 */ lwc1 $f0, ($v0) +/* DCCF44 80240274 46001080 */ add.s $f2, $f2, $f0 +/* DCCF48 80240278 0260202D */ daddu $a0, $s3, $zero +/* DCCF4C 8024027C 0C03BD17 */ jal clear_partner_move_history +/* DCCF50 80240280 E6620040 */ swc1 $f2, 0x40($s3) +/* DCCF54 80240284 26520008 */ addiu $s2, $s2, 8 +.L80240288: +/* DCCF58 80240288 26100008 */ addiu $s0, $s0, 8 +/* DCCF5C 8024028C 021E102B */ sltu $v0, $s0, $fp +/* DCCF60 80240290 1440FFDA */ bnez $v0, .L802401FC +/* DCCF64 80240294 26310004 */ addiu $s1, $s1, 4 +.L80240298: +/* DCCF68 80240298 24020002 */ addiu $v0, $zero, 2 +.L8024029C: +/* DCCF6C 8024029C 8FBF006C */ lw $ra, 0x6c($sp) +/* DCCF70 802402A0 8FBE0068 */ lw $fp, 0x68($sp) +/* DCCF74 802402A4 8FB70064 */ lw $s7, 0x64($sp) +/* DCCF78 802402A8 8FB60060 */ lw $s6, 0x60($sp) +/* DCCF7C 802402AC 8FB5005C */ lw $s5, 0x5c($sp) +/* DCCF80 802402B0 8FB40058 */ lw $s4, 0x58($sp) +/* DCCF84 802402B4 8FB30054 */ lw $s3, 0x54($sp) +/* DCCF88 802402B8 8FB20050 */ lw $s2, 0x50($sp) +/* DCCF8C 802402BC 8FB1004C */ lw $s1, 0x4c($sp) +/* DCCF90 802402C0 8FB00048 */ lw $s0, 0x48($sp) +/* DCCF94 802402C4 03E00008 */ jr $ra +/* DCCF98 802402C8 27BD0070 */ addiu $sp, $sp, 0x70 +/* DCCF9C 802402CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838.s deleted file mode 100644 index 829d0dea6e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240838 -/* DCD508 80240838 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCD50C 8024083C AFB10014 */ sw $s1, 0x14($sp) -/* DCD510 80240840 0080882D */ daddu $s1, $a0, $zero -/* DCD514 80240844 AFBF001C */ sw $ra, 0x1c($sp) -/* DCD518 80240848 AFB20018 */ sw $s2, 0x18($sp) -/* DCD51C 8024084C AFB00010 */ sw $s0, 0x10($sp) -/* DCD520 80240850 8E240084 */ lw $a0, 0x84($s1) -/* DCD524 80240854 0C04C3D6 */ jal get_item_entity -/* DCD528 80240858 00A0802D */ daddu $s0, $a1, $zero -/* DCD52C 8024085C 12000005 */ beqz $s0, .L80240874 -/* DCD530 80240860 0040902D */ daddu $s2, $v0, $zero -/* DCD534 80240864 C640000C */ lwc1 $f0, 0xc($s2) -/* DCD538 80240868 AE200074 */ sw $zero, 0x74($s1) -/* DCD53C 8024086C AE20007C */ sw $zero, 0x7c($s1) -/* DCD540 80240870 E6200078 */ swc1 $f0, 0x78($s1) -.L80240874: -/* DCD544 80240874 8E230074 */ lw $v1, 0x74($s1) -/* DCD548 80240878 10600005 */ beqz $v1, .L80240890 -/* DCD54C 8024087C 24020001 */ addiu $v0, $zero, 1 -/* DCD550 80240880 10620024 */ beq $v1, $v0, .L80240914 -/* DCD554 80240884 00000000 */ nop -/* DCD558 80240888 0809025B */ j .L8024096C -/* DCD55C 8024088C 00000000 */ nop -.L80240890: -/* DCD560 80240890 3C013FC9 */ lui $at, 0x3fc9 -/* DCD564 80240894 34210FD8 */ ori $at, $at, 0xfd8 -/* DCD568 80240898 44810000 */ mtc1 $at, $f0 -/* DCD56C 8024089C C62C007C */ lwc1 $f12, 0x7c($s1) -/* DCD570 802408A0 46806320 */ cvt.s.w $f12, $f12 -/* DCD574 802408A4 46006302 */ mul.s $f12, $f12, $f0 -/* DCD578 802408A8 00000000 */ nop -/* DCD57C 802408AC 3C0141F0 */ lui $at, 0x41f0 -/* DCD580 802408B0 44810000 */ mtc1 $at, $f0 -/* DCD584 802408B4 0C00A874 */ jal cos_rad -/* DCD588 802408B8 46006303 */ div.s $f12, $f12, $f0 -/* DCD58C 802408BC 3C013F80 */ lui $at, 0x3f80 -/* DCD590 802408C0 44811000 */ mtc1 $at, $f2 -/* DCD594 802408C4 00000000 */ nop -/* DCD598 802408C8 46001081 */ sub.s $f2, $f2, $f0 -/* DCD59C 802408CC 3C0141A0 */ lui $at, 0x41a0 -/* DCD5A0 802408D0 44810000 */ mtc1 $at, $f0 -/* DCD5A4 802408D4 00000000 */ nop -/* DCD5A8 802408D8 46001082 */ mul.s $f2, $f2, $f0 -/* DCD5AC 802408DC 00000000 */ nop -/* DCD5B0 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DCD5B4 802408E4 46020000 */ add.s $f0, $f0, $f2 -/* DCD5B8 802408E8 E640000C */ swc1 $f0, 0xc($s2) -/* DCD5BC 802408EC 8E23007C */ lw $v1, 0x7c($s1) -/* DCD5C0 802408F0 2402001E */ addiu $v0, $zero, 0x1e -/* DCD5C4 802408F4 14620005 */ bne $v1, $v0, .L8024090C -/* DCD5C8 802408F8 24620001 */ addiu $v0, $v1, 1 -/* DCD5CC 802408FC 24020001 */ addiu $v0, $zero, 1 -/* DCD5D0 80240900 AE220074 */ sw $v0, 0x74($s1) -/* DCD5D4 80240904 0809025B */ j .L8024096C -/* DCD5D8 80240908 AE20007C */ sw $zero, 0x7c($s1) -.L8024090C: -/* DCD5DC 8024090C 0809025B */ j .L8024096C -/* DCD5E0 80240910 AE22007C */ sw $v0, 0x7c($s1) -.L80240914: -/* DCD5E4 80240914 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DCD5E8 80240918 0C00A8D4 */ jal cos_deg -/* DCD5EC 8024091C 46806320 */ cvt.s.w $f12, $f12 -/* DCD5F0 80240920 3C014040 */ lui $at, 0x4040 -/* DCD5F4 80240924 44811000 */ mtc1 $at, $f2 -/* DCD5F8 80240928 00000000 */ nop -/* DCD5FC 8024092C 46020002 */ mul.s $f0, $f0, $f2 -/* DCD600 80240930 00000000 */ nop -/* DCD604 80240934 3C014188 */ lui $at, 0x4188 -/* DCD608 80240938 44812000 */ mtc1 $at, $f4 -/* DCD60C 8024093C C6220078 */ lwc1 $f2, 0x78($s1) -/* DCD610 80240940 46041080 */ add.s $f2, $f2, $f4 -/* DCD614 80240944 46001080 */ add.s $f2, $f2, $f0 -/* DCD618 80240948 E642000C */ swc1 $f2, 0xc($s2) -/* DCD61C 8024094C 8E22007C */ lw $v0, 0x7c($s1) -/* DCD620 80240950 24420009 */ addiu $v0, $v0, 9 -/* DCD624 80240954 44826000 */ mtc1 $v0, $f12 -/* DCD628 80240958 00000000 */ nop -/* DCD62C 8024095C 0C00A6C9 */ jal clamp_angle -/* DCD630 80240960 46806320 */ cvt.s.w $f12, $f12 -/* DCD634 80240964 4600018D */ trunc.w.s $f6, $f0 -/* DCD638 80240968 E626007C */ swc1 $f6, 0x7c($s1) -.L8024096C: -/* DCD63C 8024096C 8FBF001C */ lw $ra, 0x1c($sp) -/* DCD640 80240970 8FB20018 */ lw $s2, 0x18($sp) -/* DCD644 80240974 8FB10014 */ lw $s1, 0x14($sp) -/* DCD648 80240978 8FB00010 */ lw $s0, 0x10($sp) -/* DCD64C 8024097C 0000102D */ daddu $v0, $zero, $zero -/* DCD650 80240980 03E00008 */ jr $ra -/* DCD654 80240984 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s new file mode 100644 index 0000000000..09e72f96c4 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD3F0/func_80240838_DCD508.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240838_DCD508 +/* DCD508 80240838 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DCD50C 8024083C AFB10014 */ sw $s1, 0x14($sp) +/* DCD510 80240840 0080882D */ daddu $s1, $a0, $zero +/* DCD514 80240844 AFBF001C */ sw $ra, 0x1c($sp) +/* DCD518 80240848 AFB20018 */ sw $s2, 0x18($sp) +/* DCD51C 8024084C AFB00010 */ sw $s0, 0x10($sp) +/* DCD520 80240850 8E240084 */ lw $a0, 0x84($s1) +/* DCD524 80240854 0C04C3D6 */ jal get_item_entity +/* DCD528 80240858 00A0802D */ daddu $s0, $a1, $zero +/* DCD52C 8024085C 12000005 */ beqz $s0, .L80240874 +/* DCD530 80240860 0040902D */ daddu $s2, $v0, $zero +/* DCD534 80240864 C640000C */ lwc1 $f0, 0xc($s2) +/* DCD538 80240868 AE200074 */ sw $zero, 0x74($s1) +/* DCD53C 8024086C AE20007C */ sw $zero, 0x7c($s1) +/* DCD540 80240870 E6200078 */ swc1 $f0, 0x78($s1) +.L80240874: +/* DCD544 80240874 8E230074 */ lw $v1, 0x74($s1) +/* DCD548 80240878 10600005 */ beqz $v1, .L80240890 +/* DCD54C 8024087C 24020001 */ addiu $v0, $zero, 1 +/* DCD550 80240880 10620024 */ beq $v1, $v0, .L80240914 +/* DCD554 80240884 00000000 */ nop +/* DCD558 80240888 0809025B */ j .L8024096C +/* DCD55C 8024088C 00000000 */ nop +.L80240890: +/* DCD560 80240890 3C013FC9 */ lui $at, 0x3fc9 +/* DCD564 80240894 34210FD8 */ ori $at, $at, 0xfd8 +/* DCD568 80240898 44810000 */ mtc1 $at, $f0 +/* DCD56C 8024089C C62C007C */ lwc1 $f12, 0x7c($s1) +/* DCD570 802408A0 46806320 */ cvt.s.w $f12, $f12 +/* DCD574 802408A4 46006302 */ mul.s $f12, $f12, $f0 +/* DCD578 802408A8 00000000 */ nop +/* DCD57C 802408AC 3C0141F0 */ lui $at, 0x41f0 +/* DCD580 802408B0 44810000 */ mtc1 $at, $f0 +/* DCD584 802408B4 0C00A874 */ jal cos_rad +/* DCD588 802408B8 46006303 */ div.s $f12, $f12, $f0 +/* DCD58C 802408BC 3C013F80 */ lui $at, 0x3f80 +/* DCD590 802408C0 44811000 */ mtc1 $at, $f2 +/* DCD594 802408C4 00000000 */ nop +/* DCD598 802408C8 46001081 */ sub.s $f2, $f2, $f0 +/* DCD59C 802408CC 3C0141A0 */ lui $at, 0x41a0 +/* DCD5A0 802408D0 44810000 */ mtc1 $at, $f0 +/* DCD5A4 802408D4 00000000 */ nop +/* DCD5A8 802408D8 46001082 */ mul.s $f2, $f2, $f0 +/* DCD5AC 802408DC 00000000 */ nop +/* DCD5B0 802408E0 C6200078 */ lwc1 $f0, 0x78($s1) +/* DCD5B4 802408E4 46020000 */ add.s $f0, $f0, $f2 +/* DCD5B8 802408E8 E640000C */ swc1 $f0, 0xc($s2) +/* DCD5BC 802408EC 8E23007C */ lw $v1, 0x7c($s1) +/* DCD5C0 802408F0 2402001E */ addiu $v0, $zero, 0x1e +/* DCD5C4 802408F4 14620005 */ bne $v1, $v0, .L8024090C +/* DCD5C8 802408F8 24620001 */ addiu $v0, $v1, 1 +/* DCD5CC 802408FC 24020001 */ addiu $v0, $zero, 1 +/* DCD5D0 80240900 AE220074 */ sw $v0, 0x74($s1) +/* DCD5D4 80240904 0809025B */ j .L8024096C +/* DCD5D8 80240908 AE20007C */ sw $zero, 0x7c($s1) +.L8024090C: +/* DCD5DC 8024090C 0809025B */ j .L8024096C +/* DCD5E0 80240910 AE22007C */ sw $v0, 0x7c($s1) +.L80240914: +/* DCD5E4 80240914 C62C007C */ lwc1 $f12, 0x7c($s1) +/* DCD5E8 80240918 0C00A8D4 */ jal cos_deg +/* DCD5EC 8024091C 46806320 */ cvt.s.w $f12, $f12 +/* DCD5F0 80240920 3C014040 */ lui $at, 0x4040 +/* DCD5F4 80240924 44811000 */ mtc1 $at, $f2 +/* DCD5F8 80240928 00000000 */ nop +/* DCD5FC 8024092C 46020002 */ mul.s $f0, $f0, $f2 +/* DCD600 80240930 00000000 */ nop +/* DCD604 80240934 3C014188 */ lui $at, 0x4188 +/* DCD608 80240938 44812000 */ mtc1 $at, $f4 +/* DCD60C 8024093C C6220078 */ lwc1 $f2, 0x78($s1) +/* DCD610 80240940 46041080 */ add.s $f2, $f2, $f4 +/* DCD614 80240944 46001080 */ add.s $f2, $f2, $f0 +/* DCD618 80240948 E642000C */ swc1 $f2, 0xc($s2) +/* DCD61C 8024094C 8E22007C */ lw $v0, 0x7c($s1) +/* DCD620 80240950 24420009 */ addiu $v0, $v0, 9 +/* DCD624 80240954 44826000 */ mtc1 $v0, $f12 +/* DCD628 80240958 00000000 */ nop +/* DCD62C 8024095C 0C00A6C9 */ jal clamp_angle +/* DCD630 80240960 46806320 */ cvt.s.w $f12, $f12 +/* DCD634 80240964 4600018D */ trunc.w.s $f6, $f0 +/* DCD638 80240968 E626007C */ swc1 $f6, 0x7c($s1) +.L8024096C: +/* DCD63C 8024096C 8FBF001C */ lw $ra, 0x1c($sp) +/* DCD640 80240970 8FB20018 */ lw $s2, 0x18($sp) +/* DCD644 80240974 8FB10014 */ lw $s1, 0x14($sp) +/* DCD648 80240978 8FB00010 */ lw $s0, 0x10($sp) +/* DCD64C 8024097C 0000102D */ daddu $v0, $zero, $zero +/* DCD650 80240980 03E00008 */ jr $ra +/* DCD654 80240984 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s index 8400190707..ffd39b1639 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80240C18_DCD8E8.s @@ -173,7 +173,7 @@ glabel func_80240C18_DCD8E8 /* DCDB70 80240EA0 00000000 */ nop /* DCDB74 80240EA4 0260202D */ daddu $a0, $s3, $zero /* DCDB78 80240EA8 0280282D */ daddu $a1, $s4, $zero -/* DCDB7C 80240EAC 0C090278 */ jal func_802409E0 +/* DCDB7C 80240EAC 0C090278 */ jal func_802409E0_DCD6B0 /* DCDB80 80240EB0 02A0302D */ daddu $a2, $s5, $zero /* DCDB84 80240EB4 8E630070 */ lw $v1, 0x70($s3) /* DCDB88 80240EB8 2402000F */ addiu $v0, $zero, 0xf @@ -181,7 +181,7 @@ glabel func_80240C18_DCD8E8 /* DCDB90 80240EC0 00000000 */ nop /* DCDB94 80240EC4 0260202D */ daddu $a0, $s3, $zero /* DCDB98 80240EC8 0280282D */ daddu $a1, $s4, $zero -/* DCDB9C 80240ECC 0C090294 */ jal func_80240A50 +/* DCDB9C 80240ECC 0C090294 */ jal func_80240A50_DCD720 /* DCDBA0 80240ED0 02A0302D */ daddu $a2, $s5, $zero /* DCDBA4 80240ED4 8E630070 */ lw $v1, 0x70($s3) /* DCDBA8 80240ED8 24020010 */ addiu $v0, $zero, 0x10 @@ -189,7 +189,7 @@ glabel func_80240C18_DCD8E8 /* DCDBB0 80240EE0 00000000 */ nop /* DCDBB4 80240EE4 0260202D */ daddu $a0, $s3, $zero /* DCDBB8 80240EE8 0280282D */ daddu $a1, $s4, $zero -/* DCDBBC 80240EEC 0C0902C8 */ jal func_80240B20 +/* DCDBBC 80240EEC 0C0902C8 */ jal func_80240B20_DCD7F0 /* DCDBC0 80240EF0 02A0302D */ daddu $a2, $s5, $zero /* DCDBC4 80240EF4 8E630070 */ lw $v1, 0x70($s3) /* DCDBC8 80240EF8 24020011 */ addiu $v0, $zero, 0x11 @@ -197,7 +197,7 @@ glabel func_80240C18_DCD8E8 /* DCDBD0 80240F00 00000000 */ nop /* DCDBD4 80240F04 0260202D */ daddu $a0, $s3, $zero /* DCDBD8 80240F08 0280282D */ daddu $a1, $s4, $zero -/* DCDBDC 80240F0C 0C0902EE */ jal func_80240BB8 +/* DCDBDC 80240F0C 0C0902EE */ jal func_80240BB8_DCD888 /* DCDBE0 80240F10 02A0302D */ daddu $a2, $s5, $zero /* DCDBE4 80240F14 080903C9 */ j .L80240F24 /* DCDBE8 80240F18 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C.s deleted file mode 100644 index 7e6b63d878..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024167C -/* DCE34C 8024167C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCE350 80241680 AFB10014 */ sw $s1, 0x14($sp) -/* DCE354 80241684 0080882D */ daddu $s1, $a0, $zero -/* DCE358 80241688 AFBF0018 */ sw $ra, 0x18($sp) -/* DCE35C 8024168C AFB00010 */ sw $s0, 0x10($sp) -/* DCE360 80241690 8E300148 */ lw $s0, 0x148($s1) -/* DCE364 80241694 0C00EABB */ jal get_npc_unsafe -/* DCE368 80241698 86040008 */ lh $a0, 8($s0) -/* DCE36C 8024169C 8E0300CC */ lw $v1, 0xcc($s0) -/* DCE370 802416A0 3C014120 */ lui $at, 0x4120 -/* DCE374 802416A4 44812000 */ mtc1 $at, $f4 -/* DCE378 802416A8 3C014000 */ lui $at, 0x4000 -/* DCE37C 802416AC 44810000 */ mtc1 $at, $f0 -/* DCE380 802416B0 C442003C */ lwc1 $f2, 0x3c($v0) -/* DCE384 802416B4 8C640010 */ lw $a0, 0x10($v1) -/* DCE388 802416B8 8C430000 */ lw $v1, ($v0) -/* DCE38C 802416BC E444001C */ swc1 $f4, 0x1c($v0) -/* DCE390 802416C0 E4400014 */ swc1 $f0, 0x14($v0) -/* DCE394 802416C4 E4420064 */ swc1 $f2, 0x64($v0) -/* DCE398 802416C8 34630800 */ ori $v1, $v1, 0x800 -/* DCE39C 802416CC AC430000 */ sw $v1, ($v0) -/* DCE3A0 802416D0 AC440028 */ sw $a0, 0x28($v0) -/* DCE3A4 802416D4 2402000B */ addiu $v0, $zero, 0xb -/* DCE3A8 802416D8 AE220070 */ sw $v0, 0x70($s1) -/* DCE3AC 802416DC 8FBF0018 */ lw $ra, 0x18($sp) -/* DCE3B0 802416E0 8FB10014 */ lw $s1, 0x14($sp) -/* DCE3B4 802416E4 8FB00010 */ lw $s0, 0x10($sp) -/* DCE3B8 802416E8 03E00008 */ jr $ra -/* DCE3BC 802416EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C_DCE34C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C_DCE34C.s new file mode 100644 index 0000000000..24773a0496 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024167C_DCE34C.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024167C_DCE34C +/* DCE34C 8024167C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DCE350 80241680 AFB10014 */ sw $s1, 0x14($sp) +/* DCE354 80241684 0080882D */ daddu $s1, $a0, $zero +/* DCE358 80241688 AFBF0018 */ sw $ra, 0x18($sp) +/* DCE35C 8024168C AFB00010 */ sw $s0, 0x10($sp) +/* DCE360 80241690 8E300148 */ lw $s0, 0x148($s1) +/* DCE364 80241694 0C00EABB */ jal get_npc_unsafe +/* DCE368 80241698 86040008 */ lh $a0, 8($s0) +/* DCE36C 8024169C 8E0300CC */ lw $v1, 0xcc($s0) +/* DCE370 802416A0 3C014120 */ lui $at, 0x4120 +/* DCE374 802416A4 44812000 */ mtc1 $at, $f4 +/* DCE378 802416A8 3C014000 */ lui $at, 0x4000 +/* DCE37C 802416AC 44810000 */ mtc1 $at, $f0 +/* DCE380 802416B0 C442003C */ lwc1 $f2, 0x3c($v0) +/* DCE384 802416B4 8C640010 */ lw $a0, 0x10($v1) +/* DCE388 802416B8 8C430000 */ lw $v1, ($v0) +/* DCE38C 802416BC E444001C */ swc1 $f4, 0x1c($v0) +/* DCE390 802416C0 E4400014 */ swc1 $f0, 0x14($v0) +/* DCE394 802416C4 E4420064 */ swc1 $f2, 0x64($v0) +/* DCE398 802416C8 34630800 */ ori $v1, $v1, 0x800 +/* DCE39C 802416CC AC430000 */ sw $v1, ($v0) +/* DCE3A0 802416D0 AC440028 */ sw $a0, 0x28($v0) +/* DCE3A4 802416D4 2402000B */ addiu $v0, $zero, 0xb +/* DCE3A8 802416D8 AE220070 */ sw $v0, 0x70($s1) +/* DCE3AC 802416DC 8FBF0018 */ lw $ra, 0x18($sp) +/* DCE3B0 802416E0 8FB10014 */ lw $s1, 0x14($sp) +/* DCE3B4 802416E4 8FB00010 */ lw $s0, 0x10($sp) +/* DCE3B8 802416E8 03E00008 */ jr $ra +/* DCE3BC 802416EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768.s deleted file mode 100644 index f44499b814..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241768 -/* DCE438 80241768 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCE43C 8024176C AFB3001C */ sw $s3, 0x1c($sp) -/* DCE440 80241770 0080982D */ daddu $s3, $a0, $zero -/* DCE444 80241774 AFBF0020 */ sw $ra, 0x20($sp) -/* DCE448 80241778 AFB20018 */ sw $s2, 0x18($sp) -/* DCE44C 8024177C AFB10014 */ sw $s1, 0x14($sp) -/* DCE450 80241780 AFB00010 */ sw $s0, 0x10($sp) -/* DCE454 80241784 F7B40028 */ sdc1 $f20, 0x28($sp) -/* DCE458 80241788 8E710148 */ lw $s1, 0x148($s3) -/* DCE45C 8024178C 86240008 */ lh $a0, 8($s1) -/* DCE460 80241790 0C00EABB */ jal get_npc_unsafe -/* DCE464 80241794 00A0802D */ daddu $s0, $a1, $zero -/* DCE468 80241798 8E040020 */ lw $a0, 0x20($s0) -/* DCE46C 8024179C 0040902D */ daddu $s2, $v0, $zero -/* DCE470 802417A0 00041FC2 */ srl $v1, $a0, 0x1f -/* DCE474 802417A4 00832021 */ addu $a0, $a0, $v1 -/* DCE478 802417A8 00042043 */ sra $a0, $a0, 1 -/* DCE47C 802417AC 0C00A67F */ jal rand_int -/* DCE480 802417B0 24840001 */ addiu $a0, $a0, 1 -/* DCE484 802417B4 8E030020 */ lw $v1, 0x20($s0) -/* DCE488 802417B8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* DCE48C 802417BC 000327C2 */ srl $a0, $v1, 0x1f -/* DCE490 802417C0 00641821 */ addu $v1, $v1, $a0 -/* DCE494 802417C4 00031843 */ sra $v1, $v1, 1 -/* DCE498 802417C8 00621821 */ addu $v1, $v1, $v0 -/* DCE49C 802417CC A643008E */ sh $v1, 0x8e($s2) -/* DCE4A0 802417D0 8E2200CC */ lw $v0, 0xcc($s1) -/* DCE4A4 802417D4 C64E0040 */ lwc1 $f14, 0x40($s2) -/* DCE4A8 802417D8 8C42000C */ lw $v0, 0xc($v0) -/* DCE4AC 802417DC AE420028 */ sw $v0, 0x28($s2) -/* DCE4B0 802417E0 C6000018 */ lwc1 $f0, 0x18($s0) -/* DCE4B4 802417E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DCE4B8 802417E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DCE4BC 802417EC E6400018 */ swc1 $f0, 0x18($s2) -/* DCE4C0 802417F0 8C460028 */ lw $a2, 0x28($v0) -/* DCE4C4 802417F4 0C00A720 */ jal atan2 -/* DCE4C8 802417F8 8C470030 */ lw $a3, 0x30($v0) -/* DCE4CC 802417FC 46000506 */ mov.s $f20, $f0 -/* DCE4D0 80241800 C64C000C */ lwc1 $f12, 0xc($s2) -/* DCE4D4 80241804 0C00A70A */ jal get_clamped_angle_diff -/* DCE4D8 80241808 4600A386 */ mov.s $f14, $f20 -/* DCE4DC 8024180C 46000086 */ mov.s $f2, $f0 -/* DCE4E0 80241810 8E02001C */ lw $v0, 0x1c($s0) -/* DCE4E4 80241814 46001005 */ abs.s $f0, $f2 -/* DCE4E8 80241818 44822000 */ mtc1 $v0, $f4 -/* DCE4EC 8024181C 00000000 */ nop -/* DCE4F0 80241820 46802120 */ cvt.s.w $f4, $f4 -/* DCE4F4 80241824 4600203C */ c.lt.s $f4, $f0 -/* DCE4F8 80241828 00000000 */ nop -/* DCE4FC 8024182C 4500000D */ bc1f .L80241864 -/* DCE500 80241830 00000000 */ nop -/* DCE504 80241834 44800000 */ mtc1 $zero, $f0 -/* DCE508 80241838 C654000C */ lwc1 $f20, 0xc($s2) -/* DCE50C 8024183C 4600103C */ c.lt.s $f2, $f0 -/* DCE510 80241840 00000000 */ nop -/* DCE514 80241844 45000006 */ bc1f .L80241860 -/* DCE518 80241848 00021023 */ negu $v0, $v0 -/* DCE51C 8024184C 44820000 */ mtc1 $v0, $f0 -/* DCE520 80241850 00000000 */ nop -/* DCE524 80241854 46800020 */ cvt.s.w $f0, $f0 -/* DCE528 80241858 08090619 */ j .L80241864 -/* DCE52C 8024185C 4600A500 */ add.s $f20, $f20, $f0 -.L80241860: -/* DCE530 80241860 4604A500 */ add.s $f20, $f20, $f4 -.L80241864: -/* DCE534 80241864 0C00A6C9 */ jal clamp_angle -/* DCE538 80241868 4600A306 */ mov.s $f12, $f20 -/* DCE53C 8024186C 2402000D */ addiu $v0, $zero, 0xd -/* DCE540 80241870 E640000C */ swc1 $f0, 0xc($s2) -/* DCE544 80241874 AE620070 */ sw $v0, 0x70($s3) -/* DCE548 80241878 8FBF0020 */ lw $ra, 0x20($sp) -/* DCE54C 8024187C 8FB3001C */ lw $s3, 0x1c($sp) -/* DCE550 80241880 8FB20018 */ lw $s2, 0x18($sp) -/* DCE554 80241884 8FB10014 */ lw $s1, 0x14($sp) -/* DCE558 80241888 8FB00010 */ lw $s0, 0x10($sp) -/* DCE55C 8024188C D7B40028 */ ldc1 $f20, 0x28($sp) -/* DCE560 80241890 03E00008 */ jr $ra -/* DCE564 80241894 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768_DCE438.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768_DCE438.s new file mode 100644 index 0000000000..2ffc293aaa --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241768_DCE438.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241768_DCE438 +/* DCE438 80241768 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* DCE43C 8024176C AFB3001C */ sw $s3, 0x1c($sp) +/* DCE440 80241770 0080982D */ daddu $s3, $a0, $zero +/* DCE444 80241774 AFBF0020 */ sw $ra, 0x20($sp) +/* DCE448 80241778 AFB20018 */ sw $s2, 0x18($sp) +/* DCE44C 8024177C AFB10014 */ sw $s1, 0x14($sp) +/* DCE450 80241780 AFB00010 */ sw $s0, 0x10($sp) +/* DCE454 80241784 F7B40028 */ sdc1 $f20, 0x28($sp) +/* DCE458 80241788 8E710148 */ lw $s1, 0x148($s3) +/* DCE45C 8024178C 86240008 */ lh $a0, 8($s1) +/* DCE460 80241790 0C00EABB */ jal get_npc_unsafe +/* DCE464 80241794 00A0802D */ daddu $s0, $a1, $zero +/* DCE468 80241798 8E040020 */ lw $a0, 0x20($s0) +/* DCE46C 8024179C 0040902D */ daddu $s2, $v0, $zero +/* DCE470 802417A0 00041FC2 */ srl $v1, $a0, 0x1f +/* DCE474 802417A4 00832021 */ addu $a0, $a0, $v1 +/* DCE478 802417A8 00042043 */ sra $a0, $a0, 1 +/* DCE47C 802417AC 0C00A67F */ jal rand_int +/* DCE480 802417B0 24840001 */ addiu $a0, $a0, 1 +/* DCE484 802417B4 8E030020 */ lw $v1, 0x20($s0) +/* DCE488 802417B8 C64C0038 */ lwc1 $f12, 0x38($s2) +/* DCE48C 802417BC 000327C2 */ srl $a0, $v1, 0x1f +/* DCE490 802417C0 00641821 */ addu $v1, $v1, $a0 +/* DCE494 802417C4 00031843 */ sra $v1, $v1, 1 +/* DCE498 802417C8 00621821 */ addu $v1, $v1, $v0 +/* DCE49C 802417CC A643008E */ sh $v1, 0x8e($s2) +/* DCE4A0 802417D0 8E2200CC */ lw $v0, 0xcc($s1) +/* DCE4A4 802417D4 C64E0040 */ lwc1 $f14, 0x40($s2) +/* DCE4A8 802417D8 8C42000C */ lw $v0, 0xc($v0) +/* DCE4AC 802417DC AE420028 */ sw $v0, 0x28($s2) +/* DCE4B0 802417E0 C6000018 */ lwc1 $f0, 0x18($s0) +/* DCE4B4 802417E4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DCE4B8 802417E8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DCE4BC 802417EC E6400018 */ swc1 $f0, 0x18($s2) +/* DCE4C0 802417F0 8C460028 */ lw $a2, 0x28($v0) +/* DCE4C4 802417F4 0C00A720 */ jal atan2 +/* DCE4C8 802417F8 8C470030 */ lw $a3, 0x30($v0) +/* DCE4CC 802417FC 46000506 */ mov.s $f20, $f0 +/* DCE4D0 80241800 C64C000C */ lwc1 $f12, 0xc($s2) +/* DCE4D4 80241804 0C00A70A */ jal get_clamped_angle_diff +/* DCE4D8 80241808 4600A386 */ mov.s $f14, $f20 +/* DCE4DC 8024180C 46000086 */ mov.s $f2, $f0 +/* DCE4E0 80241810 8E02001C */ lw $v0, 0x1c($s0) +/* DCE4E4 80241814 46001005 */ abs.s $f0, $f2 +/* DCE4E8 80241818 44822000 */ mtc1 $v0, $f4 +/* DCE4EC 8024181C 00000000 */ nop +/* DCE4F0 80241820 46802120 */ cvt.s.w $f4, $f4 +/* DCE4F4 80241824 4600203C */ c.lt.s $f4, $f0 +/* DCE4F8 80241828 00000000 */ nop +/* DCE4FC 8024182C 4500000D */ bc1f .L80241864 +/* DCE500 80241830 00000000 */ nop +/* DCE504 80241834 44800000 */ mtc1 $zero, $f0 +/* DCE508 80241838 C654000C */ lwc1 $f20, 0xc($s2) +/* DCE50C 8024183C 4600103C */ c.lt.s $f2, $f0 +/* DCE510 80241840 00000000 */ nop +/* DCE514 80241844 45000006 */ bc1f .L80241860 +/* DCE518 80241848 00021023 */ negu $v0, $v0 +/* DCE51C 8024184C 44820000 */ mtc1 $v0, $f0 +/* DCE520 80241850 00000000 */ nop +/* DCE524 80241854 46800020 */ cvt.s.w $f0, $f0 +/* DCE528 80241858 08090619 */ j .L80241864 +/* DCE52C 8024185C 4600A500 */ add.s $f20, $f20, $f0 +.L80241860: +/* DCE530 80241860 4604A500 */ add.s $f20, $f20, $f4 +.L80241864: +/* DCE534 80241864 0C00A6C9 */ jal clamp_angle +/* DCE538 80241868 4600A306 */ mov.s $f12, $f20 +/* DCE53C 8024186C 2402000D */ addiu $v0, $zero, 0xd +/* DCE540 80241870 E640000C */ swc1 $f0, 0xc($s2) +/* DCE544 80241874 AE620070 */ sw $v0, 0x70($s3) +/* DCE548 80241878 8FBF0020 */ lw $ra, 0x20($sp) +/* DCE54C 8024187C 8FB3001C */ lw $s3, 0x1c($sp) +/* DCE550 80241880 8FB20018 */ lw $s2, 0x18($sp) +/* DCE554 80241884 8FB10014 */ lw $s1, 0x14($sp) +/* DCE558 80241888 8FB00010 */ lw $s0, 0x10($sp) +/* DCE55C 8024188C D7B40028 */ ldc1 $f20, 0x28($sp) +/* DCE560 80241890 03E00008 */ jr $ra +/* DCE564 80241894 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8.s deleted file mode 100644 index dcaf420985..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419B8 -/* DCE688 802419B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCE68C 802419BC AFB10014 */ sw $s1, 0x14($sp) -/* DCE690 802419C0 0080882D */ daddu $s1, $a0, $zero -/* DCE694 802419C4 AFBF0018 */ sw $ra, 0x18($sp) -/* DCE698 802419C8 AFB00010 */ sw $s0, 0x10($sp) -/* DCE69C 802419CC 8E300148 */ lw $s0, 0x148($s1) -/* DCE6A0 802419D0 0C00EABB */ jal get_npc_unsafe -/* DCE6A4 802419D4 86040008 */ lh $a0, 8($s0) -/* DCE6A8 802419D8 9443008E */ lhu $v1, 0x8e($v0) -/* DCE6AC 802419DC 2463FFFF */ addiu $v1, $v1, -1 -/* DCE6B0 802419E0 A443008E */ sh $v1, 0x8e($v0) -/* DCE6B4 802419E4 00031C00 */ sll $v1, $v1, 0x10 -/* DCE6B8 802419E8 14600008 */ bnez $v1, .L80241A0C -/* DCE6BC 802419EC 00000000 */ nop -/* DCE6C0 802419F0 8E0200B0 */ lw $v0, 0xb0($s0) -/* DCE6C4 802419F4 30420080 */ andi $v0, $v0, 0x80 -/* DCE6C8 802419F8 10400003 */ beqz $v0, .L80241A08 -/* DCE6CC 802419FC 2402000F */ addiu $v0, $zero, 0xf -/* DCE6D0 80241A00 08090683 */ j .L80241A0C -/* DCE6D4 80241A04 AE220070 */ sw $v0, 0x70($s1) -.L80241A08: -/* DCE6D8 80241A08 AE200070 */ sw $zero, 0x70($s1) -.L80241A0C: -/* DCE6DC 80241A0C 8FBF0018 */ lw $ra, 0x18($sp) -/* DCE6E0 80241A10 8FB10014 */ lw $s1, 0x14($sp) -/* DCE6E4 80241A14 8FB00010 */ lw $s0, 0x10($sp) -/* DCE6E8 80241A18 03E00008 */ jr $ra -/* DCE6EC 80241A1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s new file mode 100644 index 0000000000..6d1964bdbc --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802419B8_DCE688.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419B8_DCE688 +/* DCE688 802419B8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DCE68C 802419BC AFB10014 */ sw $s1, 0x14($sp) +/* DCE690 802419C0 0080882D */ daddu $s1, $a0, $zero +/* DCE694 802419C4 AFBF0018 */ sw $ra, 0x18($sp) +/* DCE698 802419C8 AFB00010 */ sw $s0, 0x10($sp) +/* DCE69C 802419CC 8E300148 */ lw $s0, 0x148($s1) +/* DCE6A0 802419D0 0C00EABB */ jal get_npc_unsafe +/* DCE6A4 802419D4 86040008 */ lh $a0, 8($s0) +/* DCE6A8 802419D8 9443008E */ lhu $v1, 0x8e($v0) +/* DCE6AC 802419DC 2463FFFF */ addiu $v1, $v1, -1 +/* DCE6B0 802419E0 A443008E */ sh $v1, 0x8e($v0) +/* DCE6B4 802419E4 00031C00 */ sll $v1, $v1, 0x10 +/* DCE6B8 802419E8 14600008 */ bnez $v1, .L80241A0C +/* DCE6BC 802419EC 00000000 */ nop +/* DCE6C0 802419F0 8E0200B0 */ lw $v0, 0xb0($s0) +/* DCE6C4 802419F4 30420080 */ andi $v0, $v0, 0x80 +/* DCE6C8 802419F8 10400003 */ beqz $v0, .L80241A08 +/* DCE6CC 802419FC 2402000F */ addiu $v0, $zero, 0xf +/* DCE6D0 80241A00 08090683 */ j .L80241A0C +/* DCE6D4 80241A04 AE220070 */ sw $v0, 0x70($s1) +.L80241A08: +/* DCE6D8 80241A08 AE200070 */ sw $zero, 0x70($s1) +.L80241A0C: +/* DCE6DC 80241A0C 8FBF0018 */ lw $ra, 0x18($sp) +/* DCE6E0 80241A10 8FB10014 */ lw $s1, 0x14($sp) +/* DCE6E4 80241A14 8FB00010 */ lw $s0, 0x10($sp) +/* DCE6E8 80241A18 03E00008 */ jr $ra +/* DCE6EC 80241A1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20.s deleted file mode 100644 index ddeb09d76f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A20 -/* DCE6F0 80241A20 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCE6F4 80241A24 AFB10014 */ sw $s1, 0x14($sp) -/* DCE6F8 80241A28 0080882D */ daddu $s1, $a0, $zero -/* DCE6FC 80241A2C AFBF001C */ sw $ra, 0x1c($sp) -/* DCE700 80241A30 AFB20018 */ sw $s2, 0x18($sp) -/* DCE704 80241A34 AFB00010 */ sw $s0, 0x10($sp) -/* DCE708 80241A38 8E300148 */ lw $s0, 0x148($s1) -/* DCE70C 80241A3C 86040008 */ lh $a0, 8($s0) -/* DCE710 80241A40 0C00EABB */ jal get_npc_unsafe -/* DCE714 80241A44 00A0902D */ daddu $s2, $a1, $zero -/* DCE718 80241A48 8E0300D0 */ lw $v1, 0xd0($s0) -/* DCE71C 80241A4C 8E240078 */ lw $a0, 0x78($s1) -/* DCE720 80241A50 8C630000 */ lw $v1, ($v1) -/* DCE724 80241A54 0083182A */ slt $v1, $a0, $v1 -/* DCE728 80241A58 10600013 */ beqz $v1, .L80241AA8 -/* DCE72C 80241A5C 0040302D */ daddu $a2, $v0, $zero -/* DCE730 80241A60 00041040 */ sll $v0, $a0, 1 -/* DCE734 80241A64 00441021 */ addu $v0, $v0, $a0 -/* DCE738 80241A68 00022880 */ sll $a1, $v0, 2 -.L80241A6C: -/* DCE73C 80241A6C 8E0300D0 */ lw $v1, 0xd0($s0) -/* DCE740 80241A70 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* DCE744 80241A74 00A31021 */ addu $v0, $a1, $v1 -/* DCE748 80241A78 C4400008 */ lwc1 $f0, 8($v0) -/* DCE74C 80241A7C 46800020 */ cvt.s.w $f0, $f0 -/* DCE750 80241A80 4602003E */ c.le.s $f0, $f2 -/* DCE754 80241A84 00000000 */ nop -/* DCE758 80241A88 45020003 */ bc1fl .L80241A98 -/* DCE75C 80241A8C 24840001 */ addiu $a0, $a0, 1 -/* DCE760 80241A90 080906AA */ j .L80241AA8 -/* DCE764 80241A94 AE240078 */ sw $a0, 0x78($s1) -.L80241A98: -/* DCE768 80241A98 8C620000 */ lw $v0, ($v1) -/* DCE76C 80241A9C 0082102A */ slt $v0, $a0, $v0 -/* DCE770 80241AA0 1440FFF2 */ bnez $v0, .L80241A6C -/* DCE774 80241AA4 24A5000C */ addiu $a1, $a1, 0xc -.L80241AA8: -/* DCE778 80241AA8 C6400000 */ lwc1 $f0, ($s2) -/* DCE77C 80241AAC E4C00018 */ swc1 $f0, 0x18($a2) -/* DCE780 80241AB0 8E0200CC */ lw $v0, 0xcc($s0) -/* DCE784 80241AB4 8C420004 */ lw $v0, 4($v0) -/* DCE788 80241AB8 ACC20028 */ sw $v0, 0x28($a2) -/* DCE78C 80241ABC 24020001 */ addiu $v0, $zero, 1 -/* DCE790 80241AC0 AE200074 */ sw $zero, 0x74($s1) -/* DCE794 80241AC4 AE220070 */ sw $v0, 0x70($s1) -/* DCE798 80241AC8 8FBF001C */ lw $ra, 0x1c($sp) -/* DCE79C 80241ACC 8FB20018 */ lw $s2, 0x18($sp) -/* DCE7A0 80241AD0 8FB10014 */ lw $s1, 0x14($sp) -/* DCE7A4 80241AD4 8FB00010 */ lw $s0, 0x10($sp) -/* DCE7A8 80241AD8 03E00008 */ jr $ra -/* DCE7AC 80241ADC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s new file mode 100644 index 0000000000..b32f052a2f --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241A20_DCE6F0.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A20_DCE6F0 +/* DCE6F0 80241A20 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DCE6F4 80241A24 AFB10014 */ sw $s1, 0x14($sp) +/* DCE6F8 80241A28 0080882D */ daddu $s1, $a0, $zero +/* DCE6FC 80241A2C AFBF001C */ sw $ra, 0x1c($sp) +/* DCE700 80241A30 AFB20018 */ sw $s2, 0x18($sp) +/* DCE704 80241A34 AFB00010 */ sw $s0, 0x10($sp) +/* DCE708 80241A38 8E300148 */ lw $s0, 0x148($s1) +/* DCE70C 80241A3C 86040008 */ lh $a0, 8($s0) +/* DCE710 80241A40 0C00EABB */ jal get_npc_unsafe +/* DCE714 80241A44 00A0902D */ daddu $s2, $a1, $zero +/* DCE718 80241A48 8E0300D0 */ lw $v1, 0xd0($s0) +/* DCE71C 80241A4C 8E240078 */ lw $a0, 0x78($s1) +/* DCE720 80241A50 8C630000 */ lw $v1, ($v1) +/* DCE724 80241A54 0083182A */ slt $v1, $a0, $v1 +/* DCE728 80241A58 10600013 */ beqz $v1, .L80241AA8 +/* DCE72C 80241A5C 0040302D */ daddu $a2, $v0, $zero +/* DCE730 80241A60 00041040 */ sll $v0, $a0, 1 +/* DCE734 80241A64 00441021 */ addu $v0, $v0, $a0 +/* DCE738 80241A68 00022880 */ sll $a1, $v0, 2 +.L80241A6C: +/* DCE73C 80241A6C 8E0300D0 */ lw $v1, 0xd0($s0) +/* DCE740 80241A70 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* DCE744 80241A74 00A31021 */ addu $v0, $a1, $v1 +/* DCE748 80241A78 C4400008 */ lwc1 $f0, 8($v0) +/* DCE74C 80241A7C 46800020 */ cvt.s.w $f0, $f0 +/* DCE750 80241A80 4602003E */ c.le.s $f0, $f2 +/* DCE754 80241A84 00000000 */ nop +/* DCE758 80241A88 45020003 */ bc1fl .L80241A98 +/* DCE75C 80241A8C 24840001 */ addiu $a0, $a0, 1 +/* DCE760 80241A90 080906AA */ j .L80241AA8 +/* DCE764 80241A94 AE240078 */ sw $a0, 0x78($s1) +.L80241A98: +/* DCE768 80241A98 8C620000 */ lw $v0, ($v1) +/* DCE76C 80241A9C 0082102A */ slt $v0, $a0, $v0 +/* DCE770 80241AA0 1440FFF2 */ bnez $v0, .L80241A6C +/* DCE774 80241AA4 24A5000C */ addiu $a1, $a1, 0xc +.L80241AA8: +/* DCE778 80241AA8 C6400000 */ lwc1 $f0, ($s2) +/* DCE77C 80241AAC E4C00018 */ swc1 $f0, 0x18($a2) +/* DCE780 80241AB0 8E0200CC */ lw $v0, 0xcc($s0) +/* DCE784 80241AB4 8C420004 */ lw $v0, 4($v0) +/* DCE788 80241AB8 ACC20028 */ sw $v0, 0x28($a2) +/* DCE78C 80241ABC 24020001 */ addiu $v0, $zero, 1 +/* DCE790 80241AC0 AE200074 */ sw $zero, 0x74($s1) +/* DCE794 80241AC4 AE220070 */ sw $v0, 0x70($s1) +/* DCE798 80241AC8 8FBF001C */ lw $ra, 0x1c($sp) +/* DCE79C 80241ACC 8FB20018 */ lw $s2, 0x18($sp) +/* DCE7A0 80241AD0 8FB10014 */ lw $s1, 0x14($sp) +/* DCE7A4 80241AD4 8FB00010 */ lw $s0, 0x10($sp) +/* DCE7A8 80241AD8 03E00008 */ jr $ra +/* DCE7AC 80241ADC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s index 2ca6d935d5..b96af05373 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241AE0_DCE7B0.s @@ -131,59 +131,59 @@ glabel func_80241AE0_DCE7B0 /* DCE990 80241CC0 00000000 */ nop /* DCE994 80241CC4 0280202D */ daddu $a0, $s4, $zero /* DCE998 80241CC8 0260282D */ daddu $a1, $s3, $zero -/* DCE99C 80241CCC 0C0903D3 */ jal func_80240F4C +/* DCE99C 80241CCC 0C0903D3 */ jal func_80240F4C_DCDC1C /* DCE9A0 80241CD0 02A0302D */ daddu $a2, $s5, $zero /* DCE9A4 80241CD4 0280202D */ daddu $a0, $s4, $zero /* DCE9A8 80241CD8 0260282D */ daddu $a1, $s3, $zero -/* DCE9AC 80241CDC 0C090429 */ jal func_802410A4 +/* DCE9AC 80241CDC 0C090429 */ jal func_802410A4_DCDD74 /* DCE9B0 80241CE0 02A0302D */ daddu $a2, $s5, $zero /* DCE9B4 80241CE4 0809076D */ j .L80241DB4 /* DCE9B8 80241CE8 00000000 */ nop /* DCE9BC 80241CEC 0280202D */ daddu $a0, $s4, $zero /* DCE9C0 80241CF0 0260282D */ daddu $a1, $s3, $zero -/* DCE9C4 80241CF4 0C0904D3 */ jal func_8024134C +/* DCE9C4 80241CF4 0C0904D3 */ jal func_8024134C_DCE01C /* DCE9C8 80241CF8 02A0302D */ daddu $a2, $s5, $zero /* DCE9CC 80241CFC 0280202D */ daddu $a0, $s4, $zero /* DCE9D0 80241D00 0260282D */ daddu $a1, $s3, $zero -/* DCE9D4 80241D04 0C090503 */ jal func_8024140C +/* DCE9D4 80241D04 0C090503 */ jal func_8024140C_DCE0DC /* DCE9D8 80241D08 02A0302D */ daddu $a2, $s5, $zero /* DCE9DC 80241D0C 0809076D */ j .L80241DB4 /* DCE9E0 80241D10 00000000 */ nop /* DCE9E4 80241D14 0280202D */ daddu $a0, $s4, $zero /* DCE9E8 80241D18 0260282D */ daddu $a1, $s3, $zero -/* DCE9EC 80241D1C 0C090572 */ jal func_802415C8 +/* DCE9EC 80241D1C 0C090572 */ jal func_802415C8_DCE298 /* DCE9F0 80241D20 02A0302D */ daddu $a2, $s5, $zero /* DCE9F4 80241D24 0809076D */ j .L80241DB4 /* DCE9F8 80241D28 00000000 */ nop /* DCE9FC 80241D2C 0280202D */ daddu $a0, $s4, $zero /* DCEA00 80241D30 0260282D */ daddu $a1, $s3, $zero -/* DCEA04 80241D34 0C09059F */ jal func_8024167C +/* DCEA04 80241D34 0C09059F */ jal func_8024167C_DCE34C /* DCEA08 80241D38 02A0302D */ daddu $a2, $s5, $zero /* DCEA0C 80241D3C 0280202D */ daddu $a0, $s4, $zero /* DCEA10 80241D40 0260282D */ daddu $a1, $s3, $zero -/* DCEA14 80241D44 0C0905BC */ jal func_802416F0 +/* DCEA14 80241D44 0C0905BC */ jal func_802416F0_DCE3C0 /* DCEA18 80241D48 02A0302D */ daddu $a2, $s5, $zero /* DCEA1C 80241D4C 0809076D */ j .L80241DB4 /* DCEA20 80241D50 00000000 */ nop /* DCEA24 80241D54 0280202D */ daddu $a0, $s4, $zero /* DCEA28 80241D58 0260282D */ daddu $a1, $s3, $zero -/* DCEA2C 80241D5C 0C0905DA */ jal func_80241768 +/* DCEA2C 80241D5C 0C0905DA */ jal func_80241768_DCE438 /* DCEA30 80241D60 02A0302D */ daddu $a2, $s5, $zero /* DCEA34 80241D64 0280202D */ daddu $a0, $s4, $zero /* DCEA38 80241D68 0260282D */ daddu $a1, $s3, $zero -/* DCEA3C 80241D6C 0C090626 */ jal func_80241898 +/* DCEA3C 80241D6C 0C090626 */ jal func_80241898_DCE568 /* DCEA40 80241D70 02A0302D */ daddu $a2, $s5, $zero /* DCEA44 80241D74 0809076D */ j .L80241DB4 /* DCEA48 80241D78 00000000 */ nop /* DCEA4C 80241D7C 0280202D */ daddu $a0, $s4, $zero /* DCEA50 80241D80 0260282D */ daddu $a1, $s3, $zero -/* DCEA54 80241D84 0C09066E */ jal func_802419B8 +/* DCEA54 80241D84 0C09066E */ jal func_802419B8_DCE688 /* DCEA58 80241D88 02A0302D */ daddu $a2, $s5, $zero /* DCEA5C 80241D8C 0809076D */ j .L80241DB4 /* DCEA60 80241D90 00000000 */ nop /* DCEA64 80241D94 0280202D */ daddu $a0, $s4, $zero /* DCEA68 80241D98 0260282D */ daddu $a1, $s3, $zero -/* DCEA6C 80241D9C 0C090688 */ jal func_80241A20 +/* DCEA6C 80241D9C 0C090688 */ jal func_80241A20_DCE6F0 /* DCEA70 80241DA0 02A0302D */ daddu $a2, $s5, $zero /* DCEA74 80241DA4 0809076D */ j .L80241DB4 /* DCEA78 80241DA8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC.s deleted file mode 100644 index 800a1f35a3..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DDC -/* DCEAAC 80241DDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCEAB0 80241DE0 AFB10014 */ sw $s1, 0x14($sp) -/* DCEAB4 80241DE4 0080882D */ daddu $s1, $a0, $zero -/* DCEAB8 80241DE8 AFBF0018 */ sw $ra, 0x18($sp) -/* DCEABC 80241DEC AFB00010 */ sw $s0, 0x10($sp) -/* DCEAC0 80241DF0 8E300148 */ lw $s0, 0x148($s1) -/* DCEAC4 80241DF4 0C00EABB */ jal get_npc_unsafe -/* DCEAC8 80241DF8 86040008 */ lh $a0, 8($s0) -/* DCEACC 80241DFC C4400018 */ lwc1 $f0, 0x18($v0) -/* DCEAD0 80241E00 3C018025 */ lui $at, 0x8025 -/* DCEAD4 80241E04 D422A970 */ ldc1 $f2, -0x5690($at) -/* DCEAD8 80241E08 46000021 */ cvt.d.s $f0, $f0 -/* DCEADC 80241E0C 46220002 */ mul.d $f0, $f0, $f2 -/* DCEAE0 80241E10 00000000 */ nop -/* DCEAE4 80241E14 46200020 */ cvt.s.d $f0, $f0 -/* DCEAE8 80241E18 E4400018 */ swc1 $f0, 0x18($v0) -/* DCEAEC 80241E1C 8E0300CC */ lw $v1, 0xcc($s0) -/* DCEAF0 80241E20 8C640030 */ lw $a0, 0x30($v1) -/* DCEAF4 80241E24 24030005 */ addiu $v1, $zero, 5 -/* DCEAF8 80241E28 A443008E */ sh $v1, 0x8e($v0) -/* DCEAFC 80241E2C AC440028 */ sw $a0, 0x28($v0) -/* DCEB00 80241E30 2402000F */ addiu $v0, $zero, 0xf -/* DCEB04 80241E34 AE220070 */ sw $v0, 0x70($s1) -/* DCEB08 80241E38 8FBF0018 */ lw $ra, 0x18($sp) -/* DCEB0C 80241E3C 8FB10014 */ lw $s1, 0x14($sp) -/* DCEB10 80241E40 8FB00010 */ lw $s0, 0x10($sp) -/* DCEB14 80241E44 03E00008 */ jr $ra -/* DCEB18 80241E48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s new file mode 100644 index 0000000000..d1f6b2117e --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241DDC_DCEAAC.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DDC_DCEAAC +/* DCEAAC 80241DDC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DCEAB0 80241DE0 AFB10014 */ sw $s1, 0x14($sp) +/* DCEAB4 80241DE4 0080882D */ daddu $s1, $a0, $zero +/* DCEAB8 80241DE8 AFBF0018 */ sw $ra, 0x18($sp) +/* DCEABC 80241DEC AFB00010 */ sw $s0, 0x10($sp) +/* DCEAC0 80241DF0 8E300148 */ lw $s0, 0x148($s1) +/* DCEAC4 80241DF4 0C00EABB */ jal get_npc_unsafe +/* DCEAC8 80241DF8 86040008 */ lh $a0, 8($s0) +/* DCEACC 80241DFC C4400018 */ lwc1 $f0, 0x18($v0) +/* DCEAD0 80241E00 3C018025 */ lui $at, 0x8025 +/* DCEAD4 80241E04 D422A970 */ ldc1 $f2, -0x5690($at) +/* DCEAD8 80241E08 46000021 */ cvt.d.s $f0, $f0 +/* DCEADC 80241E0C 46220002 */ mul.d $f0, $f0, $f2 +/* DCEAE0 80241E10 00000000 */ nop +/* DCEAE4 80241E14 46200020 */ cvt.s.d $f0, $f0 +/* DCEAE8 80241E18 E4400018 */ swc1 $f0, 0x18($v0) +/* DCEAEC 80241E1C 8E0300CC */ lw $v1, 0xcc($s0) +/* DCEAF0 80241E20 8C640030 */ lw $a0, 0x30($v1) +/* DCEAF4 80241E24 24030005 */ addiu $v1, $zero, 5 +/* DCEAF8 80241E28 A443008E */ sh $v1, 0x8e($v0) +/* DCEAFC 80241E2C AC440028 */ sw $a0, 0x28($v0) +/* DCEB00 80241E30 2402000F */ addiu $v0, $zero, 0xf +/* DCEB04 80241E34 AE220070 */ sw $v0, 0x70($s1) +/* DCEB08 80241E38 8FBF0018 */ lw $ra, 0x18($sp) +/* DCEB0C 80241E3C 8FB10014 */ lw $s1, 0x14($sp) +/* DCEB10 80241E40 8FB00010 */ lw $s0, 0x10($sp) +/* DCEB14 80241E44 03E00008 */ jr $ra +/* DCEB18 80241E48 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C.s deleted file mode 100644 index 76e445e11c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C.s +++ /dev/null @@ -1,58 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E4C -/* DCEB1C 80241E4C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCEB20 80241E50 AFB20028 */ sw $s2, 0x28($sp) -/* DCEB24 80241E54 0080902D */ daddu $s2, $a0, $zero -/* DCEB28 80241E58 AFBF002C */ sw $ra, 0x2c($sp) -/* DCEB2C 80241E5C AFB10024 */ sw $s1, 0x24($sp) -/* DCEB30 80241E60 AFB00020 */ sw $s0, 0x20($sp) -/* DCEB34 80241E64 8E510148 */ lw $s1, 0x148($s2) -/* DCEB38 80241E68 0C00EABB */ jal get_npc_unsafe -/* DCEB3C 80241E6C 86240008 */ lh $a0, 8($s1) -/* DCEB40 80241E70 0040802D */ daddu $s0, $v0, $zero -/* DCEB44 80241E74 0200202D */ daddu $a0, $s0, $zero -/* DCEB48 80241E78 C600000C */ lwc1 $f0, 0xc($s0) -/* DCEB4C 80241E7C 27A60018 */ addiu $a2, $sp, 0x18 -/* DCEB50 80241E80 E7A00018 */ swc1 $f0, 0x18($sp) -/* DCEB54 80241E84 AFA00010 */ sw $zero, 0x10($sp) -/* DCEB58 80241E88 AFA00014 */ sw $zero, 0x14($sp) -/* DCEB5C 80241E8C 8E050018 */ lw $a1, 0x18($s0) -/* DCEB60 80241E90 0C0129E1 */ jal func_8004A784 -/* DCEB64 80241E94 0000382D */ daddu $a3, $zero, $zero -/* DCEB68 80241E98 14400005 */ bnez $v0, .L80241EB0 -/* DCEB6C 80241E9C 00000000 */ nop -/* DCEB70 80241EA0 8E050018 */ lw $a1, 0x18($s0) -/* DCEB74 80241EA4 8E06000C */ lw $a2, 0xc($s0) -/* DCEB78 80241EA8 0C00EA95 */ jal npc_move_heading -/* DCEB7C 80241EAC 0200202D */ daddu $a0, $s0, $zero -.L80241EB0: -/* DCEB80 80241EB0 9602008E */ lhu $v0, 0x8e($s0) -/* DCEB84 80241EB4 2442FFFF */ addiu $v0, $v0, -1 -/* DCEB88 80241EB8 A602008E */ sh $v0, 0x8e($s0) -/* DCEB8C 80241EBC 00021400 */ sll $v0, $v0, 0x10 -/* DCEB90 80241EC0 14400010 */ bnez $v0, .L80241F04 -/* DCEB94 80241EC4 00000000 */ nop -/* DCEB98 80241EC8 C6000018 */ lwc1 $f0, 0x18($s0) -/* DCEB9C 80241ECC 3C018025 */ lui $at, 0x8025 -/* DCEBA0 80241ED0 D422A978 */ ldc1 $f2, -0x5688($at) -/* DCEBA4 80241ED4 46000021 */ cvt.d.s $f0, $f0 -/* DCEBA8 80241ED8 46220002 */ mul.d $f0, $f0, $f2 -/* DCEBAC 80241EDC 00000000 */ nop -/* DCEBB0 80241EE0 46200020 */ cvt.s.d $f0, $f0 -/* DCEBB4 80241EE4 E6000018 */ swc1 $f0, 0x18($s0) -/* DCEBB8 80241EE8 8E2200CC */ lw $v0, 0xcc($s1) -/* DCEBBC 80241EEC 8C43002C */ lw $v1, 0x2c($v0) -/* DCEBC0 80241EF0 2402000A */ addiu $v0, $zero, 0xa -/* DCEBC4 80241EF4 A602008E */ sh $v0, 0x8e($s0) -/* DCEBC8 80241EF8 24020010 */ addiu $v0, $zero, 0x10 -/* DCEBCC 80241EFC AE030028 */ sw $v1, 0x28($s0) -/* DCEBD0 80241F00 AE420070 */ sw $v0, 0x70($s2) -.L80241F04: -/* DCEBD4 80241F04 8FBF002C */ lw $ra, 0x2c($sp) -/* DCEBD8 80241F08 8FB20028 */ lw $s2, 0x28($sp) -/* DCEBDC 80241F0C 8FB10024 */ lw $s1, 0x24($sp) -/* DCEBE0 80241F10 8FB00020 */ lw $s0, 0x20($sp) -/* DCEBE4 80241F14 03E00008 */ jr $ra -/* DCEBE8 80241F18 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s new file mode 100644 index 0000000000..f362f80046 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241E4C_DCEB1C.s @@ -0,0 +1,58 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E4C_DCEB1C +/* DCEB1C 80241E4C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* DCEB20 80241E50 AFB20028 */ sw $s2, 0x28($sp) +/* DCEB24 80241E54 0080902D */ daddu $s2, $a0, $zero +/* DCEB28 80241E58 AFBF002C */ sw $ra, 0x2c($sp) +/* DCEB2C 80241E5C AFB10024 */ sw $s1, 0x24($sp) +/* DCEB30 80241E60 AFB00020 */ sw $s0, 0x20($sp) +/* DCEB34 80241E64 8E510148 */ lw $s1, 0x148($s2) +/* DCEB38 80241E68 0C00EABB */ jal get_npc_unsafe +/* DCEB3C 80241E6C 86240008 */ lh $a0, 8($s1) +/* DCEB40 80241E70 0040802D */ daddu $s0, $v0, $zero +/* DCEB44 80241E74 0200202D */ daddu $a0, $s0, $zero +/* DCEB48 80241E78 C600000C */ lwc1 $f0, 0xc($s0) +/* DCEB4C 80241E7C 27A60018 */ addiu $a2, $sp, 0x18 +/* DCEB50 80241E80 E7A00018 */ swc1 $f0, 0x18($sp) +/* DCEB54 80241E84 AFA00010 */ sw $zero, 0x10($sp) +/* DCEB58 80241E88 AFA00014 */ sw $zero, 0x14($sp) +/* DCEB5C 80241E8C 8E050018 */ lw $a1, 0x18($s0) +/* DCEB60 80241E90 0C0129E1 */ jal func_8004A784 +/* DCEB64 80241E94 0000382D */ daddu $a3, $zero, $zero +/* DCEB68 80241E98 14400005 */ bnez $v0, .L80241EB0 +/* DCEB6C 80241E9C 00000000 */ nop +/* DCEB70 80241EA0 8E050018 */ lw $a1, 0x18($s0) +/* DCEB74 80241EA4 8E06000C */ lw $a2, 0xc($s0) +/* DCEB78 80241EA8 0C00EA95 */ jal npc_move_heading +/* DCEB7C 80241EAC 0200202D */ daddu $a0, $s0, $zero +.L80241EB0: +/* DCEB80 80241EB0 9602008E */ lhu $v0, 0x8e($s0) +/* DCEB84 80241EB4 2442FFFF */ addiu $v0, $v0, -1 +/* DCEB88 80241EB8 A602008E */ sh $v0, 0x8e($s0) +/* DCEB8C 80241EBC 00021400 */ sll $v0, $v0, 0x10 +/* DCEB90 80241EC0 14400010 */ bnez $v0, .L80241F04 +/* DCEB94 80241EC4 00000000 */ nop +/* DCEB98 80241EC8 C6000018 */ lwc1 $f0, 0x18($s0) +/* DCEB9C 80241ECC 3C018025 */ lui $at, 0x8025 +/* DCEBA0 80241ED0 D422A978 */ ldc1 $f2, -0x5688($at) +/* DCEBA4 80241ED4 46000021 */ cvt.d.s $f0, $f0 +/* DCEBA8 80241ED8 46220002 */ mul.d $f0, $f0, $f2 +/* DCEBAC 80241EDC 00000000 */ nop +/* DCEBB0 80241EE0 46200020 */ cvt.s.d $f0, $f0 +/* DCEBB4 80241EE4 E6000018 */ swc1 $f0, 0x18($s0) +/* DCEBB8 80241EE8 8E2200CC */ lw $v0, 0xcc($s1) +/* DCEBBC 80241EEC 8C43002C */ lw $v1, 0x2c($v0) +/* DCEBC0 80241EF0 2402000A */ addiu $v0, $zero, 0xa +/* DCEBC4 80241EF4 A602008E */ sh $v0, 0x8e($s0) +/* DCEBC8 80241EF8 24020010 */ addiu $v0, $zero, 0x10 +/* DCEBCC 80241EFC AE030028 */ sw $v1, 0x28($s0) +/* DCEBD0 80241F00 AE420070 */ sw $v0, 0x70($s2) +.L80241F04: +/* DCEBD4 80241F04 8FBF002C */ lw $ra, 0x2c($sp) +/* DCEBD8 80241F08 8FB20028 */ lw $s2, 0x28($sp) +/* DCEBDC 80241F0C 8FB10024 */ lw $s1, 0x24($sp) +/* DCEBE0 80241F10 8FB00020 */ lw $s0, 0x20($sp) +/* DCEBE4 80241F14 03E00008 */ jr $ra +/* DCEBE8 80241F18 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C.s deleted file mode 100644 index f137d55e57..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F1C -/* DCEBEC 80241F1C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCEBF0 80241F20 AFB10024 */ sw $s1, 0x24($sp) -/* DCEBF4 80241F24 0080882D */ daddu $s1, $a0, $zero -/* DCEBF8 80241F28 AFBF0028 */ sw $ra, 0x28($sp) -/* DCEBFC 80241F2C AFB00020 */ sw $s0, 0x20($sp) -/* DCEC00 80241F30 8E220148 */ lw $v0, 0x148($s1) -/* DCEC04 80241F34 0C00EABB */ jal get_npc_unsafe -/* DCEC08 80241F38 84440008 */ lh $a0, 8($v0) -/* DCEC0C 80241F3C 0040802D */ daddu $s0, $v0, $zero -/* DCEC10 80241F40 0200202D */ daddu $a0, $s0, $zero -/* DCEC14 80241F44 C600000C */ lwc1 $f0, 0xc($s0) -/* DCEC18 80241F48 27A60018 */ addiu $a2, $sp, 0x18 -/* DCEC1C 80241F4C E7A00018 */ swc1 $f0, 0x18($sp) -/* DCEC20 80241F50 AFA00010 */ sw $zero, 0x10($sp) -/* DCEC24 80241F54 AFA00014 */ sw $zero, 0x14($sp) -/* DCEC28 80241F58 8E050018 */ lw $a1, 0x18($s0) -/* DCEC2C 80241F5C 0C0129E1 */ jal func_8004A784 -/* DCEC30 80241F60 0000382D */ daddu $a3, $zero, $zero -/* DCEC34 80241F64 14400005 */ bnez $v0, .L80241F7C -/* DCEC38 80241F68 00000000 */ nop -/* DCEC3C 80241F6C 8E050018 */ lw $a1, 0x18($s0) -/* DCEC40 80241F70 8E06000C */ lw $a2, 0xc($s0) -/* DCEC44 80241F74 0C00EA95 */ jal npc_move_heading -/* DCEC48 80241F78 0200202D */ daddu $a0, $s0, $zero -.L80241F7C: -/* DCEC4C 80241F7C 9602008E */ lhu $v0, 0x8e($s0) -/* DCEC50 80241F80 2442FFFF */ addiu $v0, $v0, -1 -/* DCEC54 80241F84 A602008E */ sh $v0, 0x8e($s0) -/* DCEC58 80241F88 00021400 */ sll $v0, $v0, 0x10 -/* DCEC5C 80241F8C 14400004 */ bnez $v0, .L80241FA0 -/* DCEC60 80241F90 2402001E */ addiu $v0, $zero, 0x1e -/* DCEC64 80241F94 A602008E */ sh $v0, 0x8e($s0) -/* DCEC68 80241F98 24020011 */ addiu $v0, $zero, 0x11 -/* DCEC6C 80241F9C AE220070 */ sw $v0, 0x70($s1) -.L80241FA0: -/* DCEC70 80241FA0 8FBF0028 */ lw $ra, 0x28($sp) -/* DCEC74 80241FA4 8FB10024 */ lw $s1, 0x24($sp) -/* DCEC78 80241FA8 8FB00020 */ lw $s0, 0x20($sp) -/* DCEC7C 80241FAC 03E00008 */ jr $ra -/* DCEC80 80241FB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s new file mode 100644 index 0000000000..d1012edefa --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80241F1C_DCEBEC.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F1C_DCEBEC +/* DCEBEC 80241F1C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* DCEBF0 80241F20 AFB10024 */ sw $s1, 0x24($sp) +/* DCEBF4 80241F24 0080882D */ daddu $s1, $a0, $zero +/* DCEBF8 80241F28 AFBF0028 */ sw $ra, 0x28($sp) +/* DCEBFC 80241F2C AFB00020 */ sw $s0, 0x20($sp) +/* DCEC00 80241F30 8E220148 */ lw $v0, 0x148($s1) +/* DCEC04 80241F34 0C00EABB */ jal get_npc_unsafe +/* DCEC08 80241F38 84440008 */ lh $a0, 8($v0) +/* DCEC0C 80241F3C 0040802D */ daddu $s0, $v0, $zero +/* DCEC10 80241F40 0200202D */ daddu $a0, $s0, $zero +/* DCEC14 80241F44 C600000C */ lwc1 $f0, 0xc($s0) +/* DCEC18 80241F48 27A60018 */ addiu $a2, $sp, 0x18 +/* DCEC1C 80241F4C E7A00018 */ swc1 $f0, 0x18($sp) +/* DCEC20 80241F50 AFA00010 */ sw $zero, 0x10($sp) +/* DCEC24 80241F54 AFA00014 */ sw $zero, 0x14($sp) +/* DCEC28 80241F58 8E050018 */ lw $a1, 0x18($s0) +/* DCEC2C 80241F5C 0C0129E1 */ jal func_8004A784 +/* DCEC30 80241F60 0000382D */ daddu $a3, $zero, $zero +/* DCEC34 80241F64 14400005 */ bnez $v0, .L80241F7C +/* DCEC38 80241F68 00000000 */ nop +/* DCEC3C 80241F6C 8E050018 */ lw $a1, 0x18($s0) +/* DCEC40 80241F70 8E06000C */ lw $a2, 0xc($s0) +/* DCEC44 80241F74 0C00EA95 */ jal npc_move_heading +/* DCEC48 80241F78 0200202D */ daddu $a0, $s0, $zero +.L80241F7C: +/* DCEC4C 80241F7C 9602008E */ lhu $v0, 0x8e($s0) +/* DCEC50 80241F80 2442FFFF */ addiu $v0, $v0, -1 +/* DCEC54 80241F84 A602008E */ sh $v0, 0x8e($s0) +/* DCEC58 80241F88 00021400 */ sll $v0, $v0, 0x10 +/* DCEC5C 80241F8C 14400004 */ bnez $v0, .L80241FA0 +/* DCEC60 80241F90 2402001E */ addiu $v0, $zero, 0x1e +/* DCEC64 80241F94 A602008E */ sh $v0, 0x8e($s0) +/* DCEC68 80241F98 24020011 */ addiu $v0, $zero, 0x11 +/* DCEC6C 80241F9C AE220070 */ sw $v0, 0x70($s1) +.L80241FA0: +/* DCEC70 80241FA0 8FBF0028 */ lw $ra, 0x28($sp) +/* DCEC74 80241FA4 8FB10024 */ lw $s1, 0x24($sp) +/* DCEC78 80241FA8 8FB00020 */ lw $s0, 0x20($sp) +/* DCEC7C 80241FAC 03E00008 */ jr $ra +/* DCEC80 80241FB0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s index 494aca8e34..0ed26c1877 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242014_DCECE4.s @@ -131,53 +131,53 @@ glabel func_80242014_DCECE4 /* DCEEC4 802421F4 00000000 */ nop /* DCEEC8 802421F8 0260202D */ daddu $a0, $s3, $zero /* DCEECC 802421FC 0280282D */ daddu $a1, $s4, $zero -/* DCEED0 80242200 0C0903D3 */ jal func_80240F4C +/* DCEED0 80242200 0C0903D3 */ jal func_80240F4C_DCDC1C /* DCEED4 80242204 02A0302D */ daddu $a2, $s5, $zero /* DCEED8 80242208 0260202D */ daddu $a0, $s3, $zero /* DCEEDC 8024220C 0280282D */ daddu $a1, $s4, $zero -/* DCEEE0 80242210 0C090429 */ jal func_802410A4 +/* DCEEE0 80242210 0C090429 */ jal func_802410A4_DCDD74 /* DCEEE4 80242214 02A0302D */ daddu $a2, $s5, $zero /* DCEEE8 80242218 080908CC */ j .L80242330 /* DCEEEC 8024221C 00000000 */ nop /* DCEEF0 80242220 0260202D */ daddu $a0, $s3, $zero /* DCEEF4 80242224 0280282D */ daddu $a1, $s4, $zero -/* DCEEF8 80242228 0C0904D3 */ jal func_8024134C +/* DCEEF8 80242228 0C0904D3 */ jal func_8024134C_DCE01C /* DCEEFC 8024222C 02A0302D */ daddu $a2, $s5, $zero /* DCEF00 80242230 0260202D */ daddu $a0, $s3, $zero /* DCEF04 80242234 0280282D */ daddu $a1, $s4, $zero -/* DCEF08 80242238 0C090503 */ jal func_8024140C +/* DCEF08 80242238 0C090503 */ jal func_8024140C_DCE0DC /* DCEF0C 8024223C 02A0302D */ daddu $a2, $s5, $zero /* DCEF10 80242240 080908CC */ j .L80242330 /* DCEF14 80242244 00000000 */ nop /* DCEF18 80242248 0260202D */ daddu $a0, $s3, $zero /* DCEF1C 8024224C 0280282D */ daddu $a1, $s4, $zero -/* DCEF20 80242250 0C090572 */ jal func_802415C8 +/* DCEF20 80242250 0C090572 */ jal func_802415C8_DCE298 /* DCEF24 80242254 02A0302D */ daddu $a2, $s5, $zero /* DCEF28 80242258 080908CC */ j .L80242330 /* DCEF2C 8024225C 00000000 */ nop /* DCEF30 80242260 0260202D */ daddu $a0, $s3, $zero /* DCEF34 80242264 0280282D */ daddu $a1, $s4, $zero -/* DCEF38 80242268 0C09059F */ jal func_8024167C +/* DCEF38 80242268 0C09059F */ jal func_8024167C_DCE34C /* DCEF3C 8024226C 02A0302D */ daddu $a2, $s5, $zero /* DCEF40 80242270 0260202D */ daddu $a0, $s3, $zero /* DCEF44 80242274 0280282D */ daddu $a1, $s4, $zero -/* DCEF48 80242278 0C0905BC */ jal func_802416F0 +/* DCEF48 80242278 0C0905BC */ jal func_802416F0_DCE3C0 /* DCEF4C 8024227C 02A0302D */ daddu $a2, $s5, $zero /* DCEF50 80242280 080908CC */ j .L80242330 /* DCEF54 80242284 00000000 */ nop /* DCEF58 80242288 0260202D */ daddu $a0, $s3, $zero /* DCEF5C 8024228C 0280282D */ daddu $a1, $s4, $zero -/* DCEF60 80242290 0C0905DA */ jal func_80241768 +/* DCEF60 80242290 0C0905DA */ jal func_80241768_DCE438 /* DCEF64 80242294 02A0302D */ daddu $a2, $s5, $zero /* DCEF68 80242298 0260202D */ daddu $a0, $s3, $zero /* DCEF6C 8024229C 0280282D */ daddu $a1, $s4, $zero -/* DCEF70 802422A0 0C090626 */ jal func_80241898 +/* DCEF70 802422A0 0C090626 */ jal func_80241898_DCE568 /* DCEF74 802422A4 02A0302D */ daddu $a2, $s5, $zero /* DCEF78 802422A8 080908CC */ j .L80242330 /* DCEF7C 802422AC 00000000 */ nop /* DCEF80 802422B0 0260202D */ daddu $a0, $s3, $zero /* DCEF84 802422B4 0280282D */ daddu $a1, $s4, $zero -/* DCEF88 802422B8 0C090777 */ jal func_80241DDC +/* DCEF88 802422B8 0C090777 */ jal func_80241DDC_DCEAAC /* DCEF8C 802422BC 02A0302D */ daddu $a2, $s5, $zero /* DCEF90 802422C0 8E630070 */ lw $v1, 0x70($s3) /* DCEF94 802422C4 2402000F */ addiu $v0, $zero, 0xf @@ -185,7 +185,7 @@ glabel func_80242014_DCECE4 /* DCEF9C 802422CC 00000000 */ nop /* DCEFA0 802422D0 0260202D */ daddu $a0, $s3, $zero /* DCEFA4 802422D4 0280282D */ daddu $a1, $s4, $zero -/* DCEFA8 802422D8 0C090793 */ jal func_80241E4C +/* DCEFA8 802422D8 0C090793 */ jal func_80241E4C_DCEB1C /* DCEFAC 802422DC 02A0302D */ daddu $a2, $s5, $zero /* DCEFB0 802422E0 8E630070 */ lw $v1, 0x70($s3) /* DCEFB4 802422E4 24020010 */ addiu $v0, $zero, 0x10 @@ -193,7 +193,7 @@ glabel func_80242014_DCECE4 /* DCEFBC 802422EC 00000000 */ nop /* DCEFC0 802422F0 0260202D */ daddu $a0, $s3, $zero /* DCEFC4 802422F4 0280282D */ daddu $a1, $s4, $zero -/* DCEFC8 802422F8 0C0907C7 */ jal func_80241F1C +/* DCEFC8 802422F8 0C0907C7 */ jal func_80241F1C_DCEBEC /* DCEFCC 802422FC 02A0302D */ daddu $a2, $s5, $zero /* DCEFD0 80242300 8E630070 */ lw $v1, 0x70($s3) /* DCEFD4 80242304 24020011 */ addiu $v0, $zero, 0x11 @@ -201,7 +201,7 @@ glabel func_80242014_DCECE4 /* DCEFDC 8024230C 00000000 */ nop /* DCEFE0 80242310 0260202D */ daddu $a0, $s3, $zero /* DCEFE4 80242314 0280282D */ daddu $a1, $s4, $zero -/* DCEFE8 80242318 0C0907ED */ jal func_80241FB4 +/* DCEFE8 80242318 0C0907ED */ jal func_80241FB4_DCEC84 /* DCEFEC 8024231C 02A0302D */ daddu $a2, $s5, $zero /* DCEFF0 80242320 080908CC */ j .L80242330 /* DCEFF4 80242324 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358.s deleted file mode 100644 index 653e115814..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242358 -/* DCF028 80242358 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DCF02C 8024235C AFB10014 */ sw $s1, 0x14($sp) -/* DCF030 80242360 0080882D */ daddu $s1, $a0, $zero -/* DCF034 80242364 3C05800B */ lui $a1, %hi(gCameras) -/* DCF038 80242368 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* DCF03C 8024236C AFBF0020 */ sw $ra, 0x20($sp) -/* DCF040 80242370 AFB3001C */ sw $s3, 0x1c($sp) -/* DCF044 80242374 AFB20018 */ sw $s2, 0x18($sp) -/* DCF048 80242378 AFB00010 */ sw $s0, 0x10($sp) -/* DCF04C 8024237C F7B40028 */ sdc1 $f20, 0x28($sp) -/* DCF050 80242380 8E330148 */ lw $s3, 0x148($s1) -/* DCF054 80242384 3C03800A */ lui $v1, 0x800a -/* DCF058 80242388 8463A634 */ lh $v1, -0x59cc($v1) -/* DCF05C 8024238C 8E30000C */ lw $s0, 0xc($s1) -/* DCF060 80242390 00031080 */ sll $v0, $v1, 2 -/* DCF064 80242394 00431021 */ addu $v0, $v0, $v1 -/* DCF068 80242398 00021080 */ sll $v0, $v0, 2 -/* DCF06C 8024239C 00431023 */ subu $v0, $v0, $v1 -/* DCF070 802423A0 000218C0 */ sll $v1, $v0, 3 -/* DCF074 802423A4 00431021 */ addu $v0, $v0, $v1 -/* DCF078 802423A8 000210C0 */ sll $v0, $v0, 3 -/* DCF07C 802423AC 86640008 */ lh $a0, 8($s3) -/* DCF080 802423B0 0C00EABB */ jal get_npc_unsafe -/* DCF084 802423B4 00459021 */ addu $s2, $v0, $a1 -/* DCF088 802423B8 0220202D */ daddu $a0, $s1, $zero -/* DCF08C 802423BC 8E050000 */ lw $a1, ($s0) -/* DCF090 802423C0 0C0B1EAF */ jal get_variable -/* DCF094 802423C4 0040802D */ daddu $s0, $v0, $zero -/* DCF098 802423C8 0260202D */ daddu $a0, $s3, $zero -/* DCF09C 802423CC 8C460024 */ lw $a2, 0x24($v0) -/* DCF0A0 802423D0 8C470028 */ lw $a3, 0x28($v0) -/* DCF0A4 802423D4 0C0124FB */ jal func_800493EC -/* DCF0A8 802423D8 0000282D */ daddu $a1, $zero, $zero -/* DCF0AC 802423DC 10400052 */ beqz $v0, .L80242528 -/* DCF0B0 802423E0 2402FFFF */ addiu $v0, $zero, -1 -/* DCF0B4 802423E4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* DCF0B8 802423E8 C60E000C */ lwc1 $f14, 0xc($s0) -/* DCF0BC 802423EC 3C014387 */ lui $at, 0x4387 -/* DCF0C0 802423F0 4481A000 */ mtc1 $at, $f20 -/* DCF0C4 802423F4 0C00A70A */ jal get_clamped_angle_diff -/* DCF0C8 802423F8 00000000 */ nop -/* DCF0CC 802423FC 0C00A6C9 */ jal clamp_angle -/* DCF0D0 80242400 46000306 */ mov.s $f12, $f0 -/* DCF0D4 80242404 3C018025 */ lui $at, 0x8025 -/* DCF0D8 80242408 D422AB10 */ ldc1 $f2, -0x54f0($at) -/* DCF0DC 8024240C 46000021 */ cvt.d.s $f0, $f0 -/* DCF0E0 80242410 4622003C */ c.lt.d $f0, $f2 -/* DCF0E4 80242414 00000000 */ nop -/* DCF0E8 80242418 45000003 */ bc1f .L80242428 -/* DCF0EC 8024241C 00000000 */ nop -/* DCF0F0 80242420 3C0142B4 */ lui $at, 0x42b4 -/* DCF0F4 80242424 4481A000 */ mtc1 $at, $f20 -.L80242428: -/* DCF0F8 80242428 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* DCF0FC 8024242C 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* DCF100 80242430 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DCF104 80242434 8E220000 */ lw $v0, ($s1) -/* DCF108 80242438 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DCF10C 8024243C 8C460028 */ lw $a2, 0x28($v0) -/* DCF110 80242440 0C00A720 */ jal atan2 -/* DCF114 80242444 8C470030 */ lw $a3, 0x30($v0) -/* DCF118 80242448 4600A306 */ mov.s $f12, $f20 -/* DCF11C 8024244C 0C00A70A */ jal get_clamped_angle_diff -/* DCF120 80242450 46000386 */ mov.s $f14, $f0 -/* DCF124 80242454 46000005 */ abs.s $f0, $f0 -/* DCF128 80242458 3C018025 */ lui $at, 0x8025 -/* DCF12C 8024245C D422AB18 */ ldc1 $f2, -0x54e8($at) -/* DCF130 80242460 46000021 */ cvt.d.s $f0, $f0 -/* DCF134 80242464 4620103C */ c.lt.d $f2, $f0 -/* DCF138 80242468 00000000 */ nop -/* DCF13C 8024246C 4501002E */ bc1t .L80242528 -/* DCF140 80242470 2402FFFF */ addiu $v0, $zero, -1 -/* DCF144 80242474 8E220000 */ lw $v0, ($s1) -/* DCF148 80242478 C600003C */ lwc1 $f0, 0x3c($s0) -/* DCF14C 8024247C C442002C */ lwc1 $f2, 0x2c($v0) -/* DCF150 80242480 860200A8 */ lh $v0, 0xa8($s0) -/* DCF154 80242484 46020001 */ sub.s $f0, $f0, $f2 -/* DCF158 80242488 44821000 */ mtc1 $v0, $f2 -/* DCF15C 8024248C 00000000 */ nop -/* DCF160 80242490 468010A1 */ cvt.d.w $f2, $f2 -/* DCF164 80242494 46221080 */ add.d $f2, $f2, $f2 -/* DCF168 80242498 46000005 */ abs.s $f0, $f0 -/* DCF16C 8024249C 46000021 */ cvt.d.s $f0, $f0 -/* DCF170 802424A0 4620103E */ c.le.d $f2, $f0 -/* DCF174 802424A4 00000000 */ nop -/* DCF178 802424A8 4501001F */ bc1t .L80242528 -/* DCF17C 802424AC 2402FFFF */ addiu $v0, $zero, -1 -/* DCF180 802424B0 3C038011 */ lui $v1, 0x8011 -/* DCF184 802424B4 8063EBB3 */ lb $v1, -0x144d($v1) -/* DCF188 802424B8 24020009 */ addiu $v0, $zero, 9 -/* DCF18C 802424BC 10620019 */ beq $v1, $v0, .L80242524 -/* DCF190 802424C0 24020007 */ addiu $v0, $zero, 7 -/* DCF194 802424C4 14620005 */ bne $v1, $v0, .L802424DC -/* DCF198 802424C8 2402FFFF */ addiu $v0, $zero, -1 -/* DCF19C 802424CC 0809094A */ j .L80242528 -/* DCF1A0 802424D0 00000000 */ nop -.L802424D4: -/* DCF1A4 802424D4 0809094A */ j .L80242528 -/* DCF1A8 802424D8 0240102D */ daddu $v0, $s2, $zero -.L802424DC: -/* DCF1AC 802424DC 8E620078 */ lw $v0, 0x78($s3) -/* DCF1B0 802424E0 18400010 */ blez $v0, .L80242524 -/* DCF1B4 802424E4 0000882D */ daddu $s1, $zero, $zero -.L802424E8: -/* DCF1B8 802424E8 86620008 */ lh $v0, 8($s3) -/* DCF1BC 802424EC 00511021 */ addu $v0, $v0, $s1 -/* DCF1C0 802424F0 24520001 */ addiu $s2, $v0, 1 -/* DCF1C4 802424F4 0C00FB3A */ jal get_enemy -/* DCF1C8 802424F8 0240202D */ daddu $a0, $s2, $zero -/* DCF1CC 802424FC 0240202D */ daddu $a0, $s2, $zero -/* DCF1D0 80242500 0C00EABB */ jal get_npc_unsafe -/* DCF1D4 80242504 0040802D */ daddu $s0, $v0, $zero -/* DCF1D8 80242508 8E02006C */ lw $v0, 0x6c($s0) -/* DCF1DC 8024250C 1040FFF1 */ beqz $v0, .L802424D4 -/* DCF1E0 80242510 26310001 */ addiu $s1, $s1, 1 -/* DCF1E4 80242514 8E620078 */ lw $v0, 0x78($s3) -/* DCF1E8 80242518 0222102A */ slt $v0, $s1, $v0 -/* DCF1EC 8024251C 1440FFF2 */ bnez $v0, .L802424E8 -/* DCF1F0 80242520 00000000 */ nop -.L80242524: -/* DCF1F4 80242524 2402FFFF */ addiu $v0, $zero, -1 -.L80242528: -/* DCF1F8 80242528 8FBF0020 */ lw $ra, 0x20($sp) -/* DCF1FC 8024252C 8FB3001C */ lw $s3, 0x1c($sp) -/* DCF200 80242530 8FB20018 */ lw $s2, 0x18($sp) -/* DCF204 80242534 8FB10014 */ lw $s1, 0x14($sp) -/* DCF208 80242538 8FB00010 */ lw $s0, 0x10($sp) -/* DCF20C 8024253C D7B40028 */ ldc1 $f20, 0x28($sp) -/* DCF210 80242540 03E00008 */ jr $ra -/* DCF214 80242544 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s new file mode 100644 index 0000000000..d22cc3ba79 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242358_DCF028.s @@ -0,0 +1,134 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242358_DCF028 +/* DCF028 80242358 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* DCF02C 8024235C AFB10014 */ sw $s1, 0x14($sp) +/* DCF030 80242360 0080882D */ daddu $s1, $a0, $zero +/* DCF034 80242364 3C05800B */ lui $a1, %hi(gCameras) +/* DCF038 80242368 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* DCF03C 8024236C AFBF0020 */ sw $ra, 0x20($sp) +/* DCF040 80242370 AFB3001C */ sw $s3, 0x1c($sp) +/* DCF044 80242374 AFB20018 */ sw $s2, 0x18($sp) +/* DCF048 80242378 AFB00010 */ sw $s0, 0x10($sp) +/* DCF04C 8024237C F7B40028 */ sdc1 $f20, 0x28($sp) +/* DCF050 80242380 8E330148 */ lw $s3, 0x148($s1) +/* DCF054 80242384 3C03800A */ lui $v1, 0x800a +/* DCF058 80242388 8463A634 */ lh $v1, -0x59cc($v1) +/* DCF05C 8024238C 8E30000C */ lw $s0, 0xc($s1) +/* DCF060 80242390 00031080 */ sll $v0, $v1, 2 +/* DCF064 80242394 00431021 */ addu $v0, $v0, $v1 +/* DCF068 80242398 00021080 */ sll $v0, $v0, 2 +/* DCF06C 8024239C 00431023 */ subu $v0, $v0, $v1 +/* DCF070 802423A0 000218C0 */ sll $v1, $v0, 3 +/* DCF074 802423A4 00431021 */ addu $v0, $v0, $v1 +/* DCF078 802423A8 000210C0 */ sll $v0, $v0, 3 +/* DCF07C 802423AC 86640008 */ lh $a0, 8($s3) +/* DCF080 802423B0 0C00EABB */ jal get_npc_unsafe +/* DCF084 802423B4 00459021 */ addu $s2, $v0, $a1 +/* DCF088 802423B8 0220202D */ daddu $a0, $s1, $zero +/* DCF08C 802423BC 8E050000 */ lw $a1, ($s0) +/* DCF090 802423C0 0C0B1EAF */ jal get_variable +/* DCF094 802423C4 0040802D */ daddu $s0, $v0, $zero +/* DCF098 802423C8 0260202D */ daddu $a0, $s3, $zero +/* DCF09C 802423CC 8C460024 */ lw $a2, 0x24($v0) +/* DCF0A0 802423D0 8C470028 */ lw $a3, 0x28($v0) +/* DCF0A4 802423D4 0C0124FB */ jal func_800493EC +/* DCF0A8 802423D8 0000282D */ daddu $a1, $zero, $zero +/* DCF0AC 802423DC 10400052 */ beqz $v0, .L80242528 +/* DCF0B0 802423E0 2402FFFF */ addiu $v0, $zero, -1 +/* DCF0B4 802423E4 C64C006C */ lwc1 $f12, 0x6c($s2) +/* DCF0B8 802423E8 C60E000C */ lwc1 $f14, 0xc($s0) +/* DCF0BC 802423EC 3C014387 */ lui $at, 0x4387 +/* DCF0C0 802423F0 4481A000 */ mtc1 $at, $f20 +/* DCF0C4 802423F4 0C00A70A */ jal get_clamped_angle_diff +/* DCF0C8 802423F8 00000000 */ nop +/* DCF0CC 802423FC 0C00A6C9 */ jal clamp_angle +/* DCF0D0 80242400 46000306 */ mov.s $f12, $f0 +/* DCF0D4 80242404 3C018025 */ lui $at, 0x8025 +/* DCF0D8 80242408 D422AB10 */ ldc1 $f2, -0x54f0($at) +/* DCF0DC 8024240C 46000021 */ cvt.d.s $f0, $f0 +/* DCF0E0 80242410 4622003C */ c.lt.d $f0, $f2 +/* DCF0E4 80242414 00000000 */ nop +/* DCF0E8 80242418 45000003 */ bc1f .L80242428 +/* DCF0EC 8024241C 00000000 */ nop +/* DCF0F0 80242420 3C0142B4 */ lui $at, 0x42b4 +/* DCF0F4 80242424 4481A000 */ mtc1 $at, $f20 +.L80242428: +/* DCF0F8 80242428 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) +/* DCF0FC 8024242C 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) +/* DCF100 80242430 C60C0038 */ lwc1 $f12, 0x38($s0) +/* DCF104 80242434 8E220000 */ lw $v0, ($s1) +/* DCF108 80242438 C60E0040 */ lwc1 $f14, 0x40($s0) +/* DCF10C 8024243C 8C460028 */ lw $a2, 0x28($v0) +/* DCF110 80242440 0C00A720 */ jal atan2 +/* DCF114 80242444 8C470030 */ lw $a3, 0x30($v0) +/* DCF118 80242448 4600A306 */ mov.s $f12, $f20 +/* DCF11C 8024244C 0C00A70A */ jal get_clamped_angle_diff +/* DCF120 80242450 46000386 */ mov.s $f14, $f0 +/* DCF124 80242454 46000005 */ abs.s $f0, $f0 +/* DCF128 80242458 3C018025 */ lui $at, 0x8025 +/* DCF12C 8024245C D422AB18 */ ldc1 $f2, -0x54e8($at) +/* DCF130 80242460 46000021 */ cvt.d.s $f0, $f0 +/* DCF134 80242464 4620103C */ c.lt.d $f2, $f0 +/* DCF138 80242468 00000000 */ nop +/* DCF13C 8024246C 4501002E */ bc1t .L80242528 +/* DCF140 80242470 2402FFFF */ addiu $v0, $zero, -1 +/* DCF144 80242474 8E220000 */ lw $v0, ($s1) +/* DCF148 80242478 C600003C */ lwc1 $f0, 0x3c($s0) +/* DCF14C 8024247C C442002C */ lwc1 $f2, 0x2c($v0) +/* DCF150 80242480 860200A8 */ lh $v0, 0xa8($s0) +/* DCF154 80242484 46020001 */ sub.s $f0, $f0, $f2 +/* DCF158 80242488 44821000 */ mtc1 $v0, $f2 +/* DCF15C 8024248C 00000000 */ nop +/* DCF160 80242490 468010A1 */ cvt.d.w $f2, $f2 +/* DCF164 80242494 46221080 */ add.d $f2, $f2, $f2 +/* DCF168 80242498 46000005 */ abs.s $f0, $f0 +/* DCF16C 8024249C 46000021 */ cvt.d.s $f0, $f0 +/* DCF170 802424A0 4620103E */ c.le.d $f2, $f0 +/* DCF174 802424A4 00000000 */ nop +/* DCF178 802424A8 4501001F */ bc1t .L80242528 +/* DCF17C 802424AC 2402FFFF */ addiu $v0, $zero, -1 +/* DCF180 802424B0 3C038011 */ lui $v1, 0x8011 +/* DCF184 802424B4 8063EBB3 */ lb $v1, -0x144d($v1) +/* DCF188 802424B8 24020009 */ addiu $v0, $zero, 9 +/* DCF18C 802424BC 10620019 */ beq $v1, $v0, .L80242524 +/* DCF190 802424C0 24020007 */ addiu $v0, $zero, 7 +/* DCF194 802424C4 14620005 */ bne $v1, $v0, .L802424DC +/* DCF198 802424C8 2402FFFF */ addiu $v0, $zero, -1 +/* DCF19C 802424CC 0809094A */ j .L80242528 +/* DCF1A0 802424D0 00000000 */ nop +.L802424D4: +/* DCF1A4 802424D4 0809094A */ j .L80242528 +/* DCF1A8 802424D8 0240102D */ daddu $v0, $s2, $zero +.L802424DC: +/* DCF1AC 802424DC 8E620078 */ lw $v0, 0x78($s3) +/* DCF1B0 802424E0 18400010 */ blez $v0, .L80242524 +/* DCF1B4 802424E4 0000882D */ daddu $s1, $zero, $zero +.L802424E8: +/* DCF1B8 802424E8 86620008 */ lh $v0, 8($s3) +/* DCF1BC 802424EC 00511021 */ addu $v0, $v0, $s1 +/* DCF1C0 802424F0 24520001 */ addiu $s2, $v0, 1 +/* DCF1C4 802424F4 0C00FB3A */ jal get_enemy +/* DCF1C8 802424F8 0240202D */ daddu $a0, $s2, $zero +/* DCF1CC 802424FC 0240202D */ daddu $a0, $s2, $zero +/* DCF1D0 80242500 0C00EABB */ jal get_npc_unsafe +/* DCF1D4 80242504 0040802D */ daddu $s0, $v0, $zero +/* DCF1D8 80242508 8E02006C */ lw $v0, 0x6c($s0) +/* DCF1DC 8024250C 1040FFF1 */ beqz $v0, .L802424D4 +/* DCF1E0 80242510 26310001 */ addiu $s1, $s1, 1 +/* DCF1E4 80242514 8E620078 */ lw $v0, 0x78($s3) +/* DCF1E8 80242518 0222102A */ slt $v0, $s1, $v0 +/* DCF1EC 8024251C 1440FFF2 */ bnez $v0, .L802424E8 +/* DCF1F0 80242520 00000000 */ nop +.L80242524: +/* DCF1F4 80242524 2402FFFF */ addiu $v0, $zero, -1 +.L80242528: +/* DCF1F8 80242528 8FBF0020 */ lw $ra, 0x20($sp) +/* DCF1FC 8024252C 8FB3001C */ lw $s3, 0x1c($sp) +/* DCF200 80242530 8FB20018 */ lw $s2, 0x18($sp) +/* DCF204 80242534 8FB10014 */ lw $s1, 0x14($sp) +/* DCF208 80242538 8FB00010 */ lw $s0, 0x10($sp) +/* DCF20C 8024253C D7B40028 */ ldc1 $f20, 0x28($sp) +/* DCF210 80242540 03E00008 */ jr $ra +/* DCF214 80242544 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548.s deleted file mode 100644 index 8be73454b5..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242548 -/* DCF218 80242548 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DCF21C 8024254C AFB20038 */ sw $s2, 0x38($sp) -/* DCF220 80242550 0080902D */ daddu $s2, $a0, $zero -/* DCF224 80242554 AFB00030 */ sw $s0, 0x30($sp) -/* DCF228 80242558 AFBF003C */ sw $ra, 0x3c($sp) -/* DCF22C 8024255C AFB10034 */ sw $s1, 0x34($sp) -/* DCF230 80242560 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DCF234 80242564 F7B40040 */ sdc1 $f20, 0x40($sp) -/* DCF238 80242568 8E510148 */ lw $s1, 0x148($s2) -/* DCF23C 8024256C 4485A000 */ mtc1 $a1, $f20 -/* DCF240 80242570 86240008 */ lh $a0, 8($s1) -/* DCF244 80242574 4486B000 */ mtc1 $a2, $f22 -/* DCF248 80242578 0C00EABB */ jal get_npc_unsafe -/* DCF24C 8024257C 00E0802D */ daddu $s0, $a3, $zero -/* DCF250 80242580 0200202D */ daddu $a0, $s0, $zero -/* DCF254 80242584 0220282D */ daddu $a1, $s1, $zero -/* DCF258 80242588 24030001 */ addiu $v1, $zero, 1 -/* DCF25C 8024258C 4406A000 */ mfc1 $a2, $f20 -/* DCF260 80242590 4407B000 */ mfc1 $a3, $f22 -/* DCF264 80242594 0040802D */ daddu $s0, $v0, $zero -/* DCF268 80242598 0C01242D */ jal func_800490B4 -/* DCF26C 8024259C AFA30010 */ sw $v1, 0x10($sp) -/* DCF270 802425A0 1440001D */ bnez $v0, .L80242618 -/* DCF274 802425A4 24040002 */ addiu $a0, $zero, 2 -/* DCF278 802425A8 0200282D */ daddu $a1, $s0, $zero -/* DCF27C 802425AC 0000302D */ daddu $a2, $zero, $zero -/* DCF280 802425B0 860300A8 */ lh $v1, 0xa8($s0) -/* DCF284 802425B4 3C013F80 */ lui $at, 0x3f80 -/* DCF288 802425B8 44810000 */ mtc1 $at, $f0 -/* DCF28C 802425BC 3C014000 */ lui $at, 0x4000 -/* DCF290 802425C0 44811000 */ mtc1 $at, $f2 -/* DCF294 802425C4 3C01C1A0 */ lui $at, 0xc1a0 -/* DCF298 802425C8 44812000 */ mtc1 $at, $f4 -/* DCF29C 802425CC 2402000F */ addiu $v0, $zero, 0xf -/* DCF2A0 802425D0 AFA2001C */ sw $v0, 0x1c($sp) -/* DCF2A4 802425D4 44833000 */ mtc1 $v1, $f6 -/* DCF2A8 802425D8 00000000 */ nop -/* DCF2AC 802425DC 468031A0 */ cvt.s.w $f6, $f6 -/* DCF2B0 802425E0 44073000 */ mfc1 $a3, $f6 -/* DCF2B4 802425E4 27A20028 */ addiu $v0, $sp, 0x28 -/* DCF2B8 802425E8 AFA20020 */ sw $v0, 0x20($sp) -/* DCF2BC 802425EC E7A00010 */ swc1 $f0, 0x10($sp) -/* DCF2C0 802425F0 E7A20014 */ swc1 $f2, 0x14($sp) -/* DCF2C4 802425F4 0C01BFA4 */ jal fx_emote -/* DCF2C8 802425F8 E7A40018 */ swc1 $f4, 0x18($sp) -/* DCF2CC 802425FC 8E2200CC */ lw $v0, 0xcc($s1) -/* DCF2D0 80242600 8C430000 */ lw $v1, ($v0) -/* DCF2D4 80242604 24020014 */ addiu $v0, $zero, 0x14 -/* DCF2D8 80242608 A602008E */ sh $v0, 0x8e($s0) -/* DCF2DC 8024260C 24020021 */ addiu $v0, $zero, 0x21 -/* DCF2E0 80242610 0809099A */ j .L80242668 -/* DCF2E4 80242614 AE030028 */ sw $v1, 0x28($s0) -.L80242618: -/* DCF2E8 80242618 0C0908D6 */ jal func_80242358 -/* DCF2EC 8024261C 0240202D */ daddu $a0, $s2, $zero -/* DCF2F0 80242620 0040202D */ daddu $a0, $v0, $zero -/* DCF2F4 80242624 2402FFFF */ addiu $v0, $zero, -1 -/* DCF2F8 80242628 10820010 */ beq $a0, $v0, .L8024266C -/* DCF2FC 8024262C 00000000 */ nop -/* DCF300 80242630 0C00FB3A */ jal get_enemy -/* DCF304 80242634 00000000 */ nop -/* DCF308 80242638 8C42006C */ lw $v0, 0x6c($v0) -/* DCF30C 8024263C 1440000B */ bnez $v0, .L8024266C -/* DCF310 80242640 00000000 */ nop -/* DCF314 80242644 8602008C */ lh $v0, 0x8c($s0) -/* DCF318 80242648 14400008 */ bnez $v0, .L8024266C -/* DCF31C 8024264C 00000000 */ nop -/* DCF320 80242650 8E2200CC */ lw $v0, 0xcc($s1) -/* DCF324 80242654 8C420020 */ lw $v0, 0x20($v0) -/* DCF328 80242658 AE020028 */ sw $v0, 0x28($s0) -/* DCF32C 8024265C 96220072 */ lhu $v0, 0x72($s1) -/* DCF330 80242660 A602008E */ sh $v0, 0x8e($s0) -/* DCF334 80242664 2402001E */ addiu $v0, $zero, 0x1e -.L80242668: -/* DCF338 80242668 AE420070 */ sw $v0, 0x70($s2) -.L8024266C: -/* DCF33C 8024266C 8FBF003C */ lw $ra, 0x3c($sp) -/* DCF340 80242670 8FB20038 */ lw $s2, 0x38($sp) -/* DCF344 80242674 8FB10034 */ lw $s1, 0x34($sp) -/* DCF348 80242678 8FB00030 */ lw $s0, 0x30($sp) -/* DCF34C 8024267C D7B60048 */ ldc1 $f22, 0x48($sp) -/* DCF350 80242680 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DCF354 80242684 03E00008 */ jr $ra -/* DCF358 80242688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s new file mode 100644 index 0000000000..ff4d4bb30e --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242548_DCF218.s @@ -0,0 +1,88 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242548_DCF218 +/* DCF218 80242548 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* DCF21C 8024254C AFB20038 */ sw $s2, 0x38($sp) +/* DCF220 80242550 0080902D */ daddu $s2, $a0, $zero +/* DCF224 80242554 AFB00030 */ sw $s0, 0x30($sp) +/* DCF228 80242558 AFBF003C */ sw $ra, 0x3c($sp) +/* DCF22C 8024255C AFB10034 */ sw $s1, 0x34($sp) +/* DCF230 80242560 F7B60048 */ sdc1 $f22, 0x48($sp) +/* DCF234 80242564 F7B40040 */ sdc1 $f20, 0x40($sp) +/* DCF238 80242568 8E510148 */ lw $s1, 0x148($s2) +/* DCF23C 8024256C 4485A000 */ mtc1 $a1, $f20 +/* DCF240 80242570 86240008 */ lh $a0, 8($s1) +/* DCF244 80242574 4486B000 */ mtc1 $a2, $f22 +/* DCF248 80242578 0C00EABB */ jal get_npc_unsafe +/* DCF24C 8024257C 00E0802D */ daddu $s0, $a3, $zero +/* DCF250 80242580 0200202D */ daddu $a0, $s0, $zero +/* DCF254 80242584 0220282D */ daddu $a1, $s1, $zero +/* DCF258 80242588 24030001 */ addiu $v1, $zero, 1 +/* DCF25C 8024258C 4406A000 */ mfc1 $a2, $f20 +/* DCF260 80242590 4407B000 */ mfc1 $a3, $f22 +/* DCF264 80242594 0040802D */ daddu $s0, $v0, $zero +/* DCF268 80242598 0C01242D */ jal func_800490B4 +/* DCF26C 8024259C AFA30010 */ sw $v1, 0x10($sp) +/* DCF270 802425A0 1440001D */ bnez $v0, .L80242618 +/* DCF274 802425A4 24040002 */ addiu $a0, $zero, 2 +/* DCF278 802425A8 0200282D */ daddu $a1, $s0, $zero +/* DCF27C 802425AC 0000302D */ daddu $a2, $zero, $zero +/* DCF280 802425B0 860300A8 */ lh $v1, 0xa8($s0) +/* DCF284 802425B4 3C013F80 */ lui $at, 0x3f80 +/* DCF288 802425B8 44810000 */ mtc1 $at, $f0 +/* DCF28C 802425BC 3C014000 */ lui $at, 0x4000 +/* DCF290 802425C0 44811000 */ mtc1 $at, $f2 +/* DCF294 802425C4 3C01C1A0 */ lui $at, 0xc1a0 +/* DCF298 802425C8 44812000 */ mtc1 $at, $f4 +/* DCF29C 802425CC 2402000F */ addiu $v0, $zero, 0xf +/* DCF2A0 802425D0 AFA2001C */ sw $v0, 0x1c($sp) +/* DCF2A4 802425D4 44833000 */ mtc1 $v1, $f6 +/* DCF2A8 802425D8 00000000 */ nop +/* DCF2AC 802425DC 468031A0 */ cvt.s.w $f6, $f6 +/* DCF2B0 802425E0 44073000 */ mfc1 $a3, $f6 +/* DCF2B4 802425E4 27A20028 */ addiu $v0, $sp, 0x28 +/* DCF2B8 802425E8 AFA20020 */ sw $v0, 0x20($sp) +/* DCF2BC 802425EC E7A00010 */ swc1 $f0, 0x10($sp) +/* DCF2C0 802425F0 E7A20014 */ swc1 $f2, 0x14($sp) +/* DCF2C4 802425F4 0C01BFA4 */ jal fx_emote +/* DCF2C8 802425F8 E7A40018 */ swc1 $f4, 0x18($sp) +/* DCF2CC 802425FC 8E2200CC */ lw $v0, 0xcc($s1) +/* DCF2D0 80242600 8C430000 */ lw $v1, ($v0) +/* DCF2D4 80242604 24020014 */ addiu $v0, $zero, 0x14 +/* DCF2D8 80242608 A602008E */ sh $v0, 0x8e($s0) +/* DCF2DC 8024260C 24020021 */ addiu $v0, $zero, 0x21 +/* DCF2E0 80242610 0809099A */ j .L80242668 +/* DCF2E4 80242614 AE030028 */ sw $v1, 0x28($s0) +.L80242618: +/* DCF2E8 80242618 0C0908D6 */ jal func_80242358_DCF028 +/* DCF2EC 8024261C 0240202D */ daddu $a0, $s2, $zero +/* DCF2F0 80242620 0040202D */ daddu $a0, $v0, $zero +/* DCF2F4 80242624 2402FFFF */ addiu $v0, $zero, -1 +/* DCF2F8 80242628 10820010 */ beq $a0, $v0, .L8024266C +/* DCF2FC 8024262C 00000000 */ nop +/* DCF300 80242630 0C00FB3A */ jal get_enemy +/* DCF304 80242634 00000000 */ nop +/* DCF308 80242638 8C42006C */ lw $v0, 0x6c($v0) +/* DCF30C 8024263C 1440000B */ bnez $v0, .L8024266C +/* DCF310 80242640 00000000 */ nop +/* DCF314 80242644 8602008C */ lh $v0, 0x8c($s0) +/* DCF318 80242648 14400008 */ bnez $v0, .L8024266C +/* DCF31C 8024264C 00000000 */ nop +/* DCF320 80242650 8E2200CC */ lw $v0, 0xcc($s1) +/* DCF324 80242654 8C420020 */ lw $v0, 0x20($v0) +/* DCF328 80242658 AE020028 */ sw $v0, 0x28($s0) +/* DCF32C 8024265C 96220072 */ lhu $v0, 0x72($s1) +/* DCF330 80242660 A602008E */ sh $v0, 0x8e($s0) +/* DCF334 80242664 2402001E */ addiu $v0, $zero, 0x1e +.L80242668: +/* DCF338 80242668 AE420070 */ sw $v0, 0x70($s2) +.L8024266C: +/* DCF33C 8024266C 8FBF003C */ lw $ra, 0x3c($sp) +/* DCF340 80242670 8FB20038 */ lw $s2, 0x38($sp) +/* DCF344 80242674 8FB10034 */ lw $s1, 0x34($sp) +/* DCF348 80242678 8FB00030 */ lw $s0, 0x30($sp) +/* DCF34C 8024267C D7B60048 */ ldc1 $f22, 0x48($sp) +/* DCF350 80242680 D7B40040 */ ldc1 $f20, 0x40($sp) +/* DCF354 80242684 03E00008 */ jr $ra +/* DCF358 80242688 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s index 5017ca7072..df3a0e596f 100644 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024268C_DCF35C.s @@ -18,7 +18,7 @@ glabel func_8024268C_DCF35C /* DCF390 802426C0 00021400 */ sll $v0, $v0, 0x10 /* DCF394 802426C4 1C40002B */ bgtz $v0, .L80242774 /* DCF398 802426C8 00000000 */ nop -/* DCF39C 802426CC 0C0908D6 */ jal func_80242358 +/* DCF39C 802426CC 0C0908D6 */ jal func_80242358_DCF028 /* DCF3A0 802426D0 0240202D */ daddu $a0, $s2, $zero /* DCF3A4 802426D4 0040202D */ daddu $a0, $v0, $zero /* DCF3A8 802426D8 0481001A */ bgez $a0, .L80242744 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C.s deleted file mode 100644 index 078c03b600..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024278C -/* DCF45C 8024278C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DCF460 80242790 AFB10014 */ sw $s1, 0x14($sp) -/* DCF464 80242794 0080882D */ daddu $s1, $a0, $zero -/* DCF468 80242798 AFBF0018 */ sw $ra, 0x18($sp) -/* DCF46C 8024279C AFB00010 */ sw $s0, 0x10($sp) -/* DCF470 802427A0 8E300148 */ lw $s0, 0x148($s1) -/* DCF474 802427A4 0C00EABB */ jal get_npc_unsafe -/* DCF478 802427A8 86040008 */ lh $a0, 8($s0) -/* DCF47C 802427AC 96030076 */ lhu $v1, 0x76($s0) -/* DCF480 802427B0 A443008E */ sh $v1, 0x8e($v0) -/* DCF484 802427B4 24020021 */ addiu $v0, $zero, 0x21 -/* DCF488 802427B8 AE220070 */ sw $v0, 0x70($s1) -/* DCF48C 802427BC 8FBF0018 */ lw $ra, 0x18($sp) -/* DCF490 802427C0 8FB10014 */ lw $s1, 0x14($sp) -/* DCF494 802427C4 8FB00010 */ lw $s0, 0x10($sp) -/* DCF498 802427C8 03E00008 */ jr $ra -/* DCF49C 802427CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s new file mode 100644 index 0000000000..ece5c8ac3c --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024278C_DCF45C +/* DCF45C 8024278C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DCF460 80242790 AFB10014 */ sw $s1, 0x14($sp) +/* DCF464 80242794 0080882D */ daddu $s1, $a0, $zero +/* DCF468 80242798 AFBF0018 */ sw $ra, 0x18($sp) +/* DCF46C 8024279C AFB00010 */ sw $s0, 0x10($sp) +/* DCF470 802427A0 8E300148 */ lw $s0, 0x148($s1) +/* DCF474 802427A4 0C00EABB */ jal get_npc_unsafe +/* DCF478 802427A8 86040008 */ lh $a0, 8($s0) +/* DCF47C 802427AC 96030076 */ lhu $v1, 0x76($s0) +/* DCF480 802427B0 A443008E */ sh $v1, 0x8e($v0) +/* DCF484 802427B4 24020021 */ addiu $v0, $zero, 0x21 +/* DCF488 802427B8 AE220070 */ sw $v0, 0x70($s1) +/* DCF48C 802427BC 8FBF0018 */ lw $ra, 0x18($sp) +/* DCF490 802427C0 8FB10014 */ lw $s1, 0x14($sp) +/* DCF494 802427C4 8FB00010 */ lw $s0, 0x10($sp) +/* DCF498 802427C8 03E00008 */ jr $ra +/* DCF49C 802427CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4.s deleted file mode 100644 index ad0b68f670..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4.s +++ /dev/null @@ -1,354 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802428B4 -/* DCF584 802428B4 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* DCF588 802428B8 AFB7004C */ sw $s7, 0x4c($sp) -/* DCF58C 802428BC 0080B82D */ daddu $s7, $a0, $zero -/* DCF590 802428C0 AFB10034 */ sw $s1, 0x34($sp) -/* DCF594 802428C4 00A0882D */ daddu $s1, $a1, $zero -/* DCF598 802428C8 AFBF0050 */ sw $ra, 0x50($sp) -/* DCF59C 802428CC AFB60048 */ sw $s6, 0x48($sp) -/* DCF5A0 802428D0 AFB50044 */ sw $s5, 0x44($sp) -/* DCF5A4 802428D4 AFB40040 */ sw $s4, 0x40($sp) -/* DCF5A8 802428D8 AFB3003C */ sw $s3, 0x3c($sp) -/* DCF5AC 802428DC AFB20038 */ sw $s2, 0x38($sp) -/* DCF5B0 802428E0 AFB00030 */ sw $s0, 0x30($sp) -/* DCF5B4 802428E4 8EF30148 */ lw $s3, 0x148($s7) -/* DCF5B8 802428E8 86640008 */ lh $a0, 8($s3) -/* DCF5BC 802428EC 8EF0000C */ lw $s0, 0xc($s7) -/* DCF5C0 802428F0 0C00FB5A */ jal get_enemy_safe -/* DCF5C4 802428F4 0000B02D */ daddu $s6, $zero, $zero -/* DCF5C8 802428F8 10400131 */ beqz $v0, .L80242DC0 -/* DCF5CC 802428FC 24020005 */ addiu $v0, $zero, 5 -/* DCF5D0 80242900 8E63006C */ lw $v1, 0x6c($s3) -/* DCF5D4 80242904 1062012F */ beq $v1, $v0, .L80242DC4 -/* DCF5D8 80242908 0000102D */ daddu $v0, $zero, $zero -/* DCF5DC 8024290C 8E050000 */ lw $a1, ($s0) -/* DCF5E0 80242910 0C0B1EAF */ jal get_variable -/* DCF5E4 80242914 02E0202D */ daddu $a0, $s7, $zero -/* DCF5E8 80242918 86640008 */ lh $a0, 8($s3) -/* DCF5EC 8024291C 0C00EABB */ jal get_npc_unsafe -/* DCF5F0 80242920 0040A82D */ daddu $s5, $v0, $zero -/* DCF5F4 80242924 8E630070 */ lw $v1, 0x70($s3) -/* DCF5F8 80242928 30630002 */ andi $v1, $v1, 2 -/* DCF5FC 8024292C 10600008 */ beqz $v1, .L80242950 -/* DCF600 80242930 0040902D */ daddu $s2, $v0, $zero -/* DCF604 80242934 964200A8 */ lhu $v0, 0xa8($s2) -/* DCF608 80242938 00021400 */ sll $v0, $v0, 0x10 -/* DCF60C 8024293C 00021C03 */ sra $v1, $v0, 0x10 -/* DCF610 80242940 000217C2 */ srl $v0, $v0, 0x1f -/* DCF614 80242944 00621821 */ addu $v1, $v1, $v0 -/* DCF618 80242948 00031843 */ sra $v1, $v1, 1 -/* DCF61C 8024294C A24300AB */ sb $v1, 0xab($s2) -.L80242950: -/* DCF620 80242950 16200005 */ bnez $s1, .L80242968 -/* DCF624 80242954 3C030004 */ lui $v1, 4 -/* DCF628 80242958 8E6200B0 */ lw $v0, 0xb0($s3) -/* DCF62C 8024295C 30420004 */ andi $v0, $v0, 4 -/* DCF630 80242960 10400019 */ beqz $v0, .L802429C8 -/* DCF634 80242964 00000000 */ nop -.L80242968: -/* DCF638 80242968 34630102 */ ori $v1, $v1, 0x102 -/* DCF63C 8024296C AEE00070 */ sw $zero, 0x70($s7) -/* DCF640 80242970 8E420000 */ lw $v0, ($s2) -/* DCF644 80242974 0240202D */ daddu $a0, $s2, $zero -/* DCF648 80242978 A640008E */ sh $zero, 0x8e($s2) -/* DCF64C 8024297C 00431025 */ or $v0, $v0, $v1 -/* DCF650 80242980 0C00EAFF */ jal disable_npc_shadow -/* DCF654 80242984 AE420000 */ sw $v0, ($s2) -/* DCF658 80242988 3C041F30 */ lui $a0, 0x1f30 -/* DCF65C 8024298C 8E420000 */ lw $v0, ($s2) -/* DCF660 80242990 2403F7FF */ addiu $v1, $zero, -0x801 -/* DCF664 80242994 00431024 */ and $v0, $v0, $v1 -/* DCF668 80242998 AE420000 */ sw $v0, ($s2) -/* DCF66C 8024299C 8E620000 */ lw $v0, ($s3) -/* DCF670 802429A0 8E6300B0 */ lw $v1, 0xb0($s3) -/* DCF674 802429A4 34840040 */ ori $a0, $a0, 0x40 -/* DCF678 802429A8 AE60006C */ sw $zero, 0x6c($s3) -/* DCF67C 802429AC 00441025 */ or $v0, $v0, $a0 -/* DCF680 802429B0 AE620000 */ sw $v0, ($s3) -/* DCF684 802429B4 30620004 */ andi $v0, $v1, 4 -/* DCF688 802429B8 10400003 */ beqz $v0, .L802429C8 -/* DCF68C 802429BC 2402FFFB */ addiu $v0, $zero, -5 -/* DCF690 802429C0 00621024 */ and $v0, $v1, $v0 -/* DCF694 802429C4 AE6200B0 */ sw $v0, 0xb0($s3) -.L802429C8: -/* DCF698 802429C8 8EE30070 */ lw $v1, 0x70($s7) -/* DCF69C 802429CC 24100001 */ addiu $s0, $zero, 1 -/* DCF6A0 802429D0 10700012 */ beq $v1, $s0, .L80242A1C -/* DCF6A4 802429D4 28620002 */ slti $v0, $v1, 2 -/* DCF6A8 802429D8 10400005 */ beqz $v0, .L802429F0 -/* DCF6AC 802429DC 24020002 */ addiu $v0, $zero, 2 -/* DCF6B0 802429E0 10600007 */ beqz $v1, .L80242A00 -/* DCF6B4 802429E4 0000102D */ daddu $v0, $zero, $zero -/* DCF6B8 802429E8 08090B71 */ j .L80242DC4 -/* DCF6BC 802429EC 00000000 */ nop -.L802429F0: -/* DCF6C0 802429F0 1062005B */ beq $v1, $v0, .L80242B60 -/* DCF6C4 802429F4 0000102D */ daddu $v0, $zero, $zero -/* DCF6C8 802429F8 08090B71 */ j .L80242DC4 -/* DCF6CC 802429FC 00000000 */ nop -.L80242A00: -/* DCF6D0 80242A00 8E420000 */ lw $v0, ($s2) -/* DCF6D4 80242A04 0240202D */ daddu $a0, $s2, $zero -/* DCF6D8 80242A08 34420002 */ ori $v0, $v0, 2 -/* DCF6DC 80242A0C 0C00EAFF */ jal disable_npc_shadow -/* DCF6E0 80242A10 AE420000 */ sw $v0, ($s2) -/* DCF6E4 80242A14 AE60006C */ sw $zero, 0x6c($s3) -/* DCF6E8 80242A18 AEF00070 */ sw $s0, 0x70($s7) -.L80242A1C: -/* DCF6EC 80242A1C 8E74006C */ lw $s4, 0x6c($s3) -/* DCF6F0 80242A20 24020001 */ addiu $v0, $zero, 1 -/* DCF6F4 80242A24 168200E7 */ bne $s4, $v0, .L80242DC4 -/* DCF6F8 80242A28 0000102D */ daddu $v0, $zero, $zero -/* DCF6FC 80242A2C 8E64007C */ lw $a0, 0x7c($s3) -/* DCF700 80242A30 24110002 */ addiu $s1, $zero, 2 -/* DCF704 80242A34 0C00EABB */ jal get_npc_unsafe -/* DCF708 80242A38 AE71006C */ sw $s1, 0x6c($s3) -/* DCF70C 80242A3C 0040802D */ daddu $s0, $v0, $zero -/* DCF710 80242A40 C6000038 */ lwc1 $f0, 0x38($s0) -/* DCF714 80242A44 E6400038 */ swc1 $f0, 0x38($s2) -/* DCF718 80242A48 C6000040 */ lwc1 $f0, 0x40($s0) -/* DCF71C 80242A4C E6400040 */ swc1 $f0, 0x40($s2) -/* DCF720 80242A50 C6020034 */ lwc1 $f2, 0x34($s0) -/* DCF724 80242A54 3C014387 */ lui $at, 0x4387 -/* DCF728 80242A58 44810000 */ mtc1 $at, $f0 -/* DCF72C 80242A5C 26440038 */ addiu $a0, $s2, 0x38 -/* DCF730 80242A60 46020001 */ sub.s $f0, $f0, $f2 -/* DCF734 80242A64 C6680078 */ lwc1 $f8, 0x78($s3) -/* DCF738 80242A68 46804220 */ cvt.s.w $f8, $f8 -/* DCF73C 80242A6C 44064000 */ mfc1 $a2, $f8 -/* DCF740 80242A70 44070000 */ mfc1 $a3, $f0 -/* DCF744 80242A74 0C00A7E7 */ jal add_vec2D_polar -/* DCF748 80242A78 26450040 */ addiu $a1, $s2, 0x40 -/* DCF74C 80242A7C C600003C */ lwc1 $f0, 0x3c($s0) -/* DCF750 80242A80 C6620074 */ lwc1 $f2, 0x74($s3) -/* DCF754 80242A84 468010A0 */ cvt.s.w $f2, $f2 -/* DCF758 80242A88 46020000 */ add.s $f0, $f0, $f2 -/* DCF75C 80242A8C E640003C */ swc1 $f0, 0x3c($s2) -/* DCF760 80242A90 A2740007 */ sb $s4, 7($s3) -/* DCF764 80242A94 C6400038 */ lwc1 $f0, 0x38($s2) -/* DCF768 80242A98 4600020D */ trunc.w.s $f8, $f0 -/* DCF76C 80242A9C 44024000 */ mfc1 $v0, $f8 -/* DCF770 80242AA0 00000000 */ nop -/* DCF774 80242AA4 A6620010 */ sh $v0, 0x10($s3) -/* DCF778 80242AA8 C640003C */ lwc1 $f0, 0x3c($s2) -/* DCF77C 80242AAC 4600020D */ trunc.w.s $f8, $f0 -/* DCF780 80242AB0 44024000 */ mfc1 $v0, $f8 -/* DCF784 80242AB4 00000000 */ nop -/* DCF788 80242AB8 A6620012 */ sh $v0, 0x12($s3) -/* DCF78C 80242ABC C6400040 */ lwc1 $f0, 0x40($s2) -/* DCF790 80242AC0 4600020D */ trunc.w.s $f8, $f0 -/* DCF794 80242AC4 44024000 */ mfc1 $v0, $f8 -/* DCF798 80242AC8 00000000 */ nop -/* DCF79C 80242ACC A6620014 */ sh $v0, 0x14($s3) -/* DCF7A0 80242AD0 AE400044 */ sw $zero, 0x44($s2) -/* DCF7A4 80242AD4 AE400048 */ sw $zero, 0x48($s2) -/* DCF7A8 80242AD8 AE40004C */ sw $zero, 0x4c($s2) -/* DCF7AC 80242ADC C6A00000 */ lwc1 $f0, ($s5) -/* DCF7B0 80242AE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DCF7B4 80242AE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DCF7B8 80242AE8 C64C0038 */ lwc1 $f12, 0x38($s2) -/* DCF7BC 80242AEC C64E0040 */ lwc1 $f14, 0x40($s2) -/* DCF7C0 80242AF0 E6400018 */ swc1 $f0, 0x18($s2) -/* DCF7C4 80242AF4 8C460028 */ lw $a2, 0x28($v0) -/* DCF7C8 80242AF8 0C00A720 */ jal atan2 -/* DCF7CC 80242AFC 8C470030 */ lw $a3, 0x30($v0) -/* DCF7D0 80242B00 E640000C */ swc1 $f0, 0xc($s2) -/* DCF7D4 80242B04 C6A0000C */ lwc1 $f0, 0xc($s5) -/* DCF7D8 80242B08 8E420000 */ lw $v0, ($s2) -/* DCF7DC 80242B0C 0240202D */ daddu $a0, $s2, $zero -/* DCF7E0 80242B10 E640001C */ swc1 $f0, 0x1c($s2) -/* DCF7E4 80242B14 C6A00010 */ lwc1 $f0, 0x10($s5) -/* DCF7E8 80242B18 2403FFFD */ addiu $v1, $zero, -3 -/* DCF7EC 80242B1C E6400014 */ swc1 $f0, 0x14($s2) -/* DCF7F0 80242B20 C600003C */ lwc1 $f0, 0x3c($s0) -/* DCF7F4 80242B24 00431024 */ and $v0, $v0, $v1 -/* DCF7F8 80242B28 AE420000 */ sw $v0, ($s2) -/* DCF7FC 80242B2C 0C00EAE8 */ jal enable_npc_shadow -/* DCF800 80242B30 E6400064 */ swc1 $f0, 0x64($s2) -/* DCF804 80242B34 8E420000 */ lw $v0, ($s2) -/* DCF808 80242B38 3C03E0FF */ lui $v1, 0xe0ff -/* DCF80C 80242B3C 34420800 */ ori $v0, $v0, 0x800 -/* DCF810 80242B40 AE420000 */ sw $v0, ($s2) -/* DCF814 80242B44 8E620000 */ lw $v0, ($s3) -/* DCF818 80242B48 3463FFFF */ ori $v1, $v1, 0xffff -/* DCF81C 80242B4C 00431024 */ and $v0, $v0, $v1 -/* DCF820 80242B50 AE620000 */ sw $v0, ($s3) -/* DCF824 80242B54 2402005A */ addiu $v0, $zero, 0x5a -/* DCF828 80242B58 A642008E */ sh $v0, 0x8e($s2) -/* DCF82C 80242B5C AEF10070 */ sw $s1, 0x70($s7) -.L80242B60: -/* DCF830 80242B60 0000202D */ daddu $a0, $zero, $zero -/* DCF834 80242B64 27B00020 */ addiu $s0, $sp, 0x20 -/* DCF838 80242B68 864200A8 */ lh $v0, 0xa8($s2) -/* DCF83C 80242B6C 3C013FE0 */ lui $at, 0x3fe0 -/* DCF840 80242B70 44810800 */ mtc1 $at, $f1 -/* DCF844 80242B74 44800000 */ mtc1 $zero, $f0 -/* DCF848 80242B78 44821000 */ mtc1 $v0, $f2 -/* DCF84C 80242B7C 00000000 */ nop -/* DCF850 80242B80 468010A1 */ cvt.d.w $f2, $f2 -/* DCF854 80242B84 46201082 */ mul.d $f2, $f2, $f0 -/* DCF858 80242B88 00000000 */ nop -/* DCF85C 80242B8C 0200282D */ daddu $a1, $s0, $zero -/* DCF860 80242B90 C6440038 */ lwc1 $f4, 0x38($s2) -/* DCF864 80242B94 C640003C */ lwc1 $f0, 0x3c($s2) -/* DCF868 80242B98 27B10024 */ addiu $s1, $sp, 0x24 -/* DCF86C 80242B9C E7A40020 */ swc1 $f4, 0x20($sp) -/* DCF870 80242BA0 C6440040 */ lwc1 $f4, 0x40($s2) -/* DCF874 80242BA4 46000021 */ cvt.d.s $f0, $f0 -/* DCF878 80242BA8 46220000 */ add.d $f0, $f0, $f2 -/* DCF87C 80242BAC E7A40028 */ swc1 $f4, 0x28($sp) -/* DCF880 80242BB0 C6420018 */ lwc1 $f2, 0x18($s2) -/* DCF884 80242BB4 46200020 */ cvt.s.d $f0, $f0 -/* DCF888 80242BB8 E7A00024 */ swc1 $f0, 0x24($sp) -/* DCF88C 80242BBC E7A20010 */ swc1 $f2, 0x10($sp) -/* DCF890 80242BC0 C640000C */ lwc1 $f0, 0xc($s2) -/* DCF894 80242BC4 0220302D */ daddu $a2, $s1, $zero -/* DCF898 80242BC8 E7A00014 */ swc1 $f0, 0x14($sp) -/* DCF89C 80242BCC 864200A6 */ lh $v0, 0xa6($s2) -/* DCF8A0 80242BD0 27B40028 */ addiu $s4, $sp, 0x28 -/* DCF8A4 80242BD4 44820000 */ mtc1 $v0, $f0 -/* DCF8A8 80242BD8 00000000 */ nop -/* DCF8AC 80242BDC 46800020 */ cvt.s.w $f0, $f0 -/* DCF8B0 80242BE0 E7A00018 */ swc1 $f0, 0x18($sp) -/* DCF8B4 80242BE4 864200A8 */ lh $v0, 0xa8($s2) -/* DCF8B8 80242BE8 0280382D */ daddu $a3, $s4, $zero -/* DCF8BC 80242BEC 44820000 */ mtc1 $v0, $f0 -/* DCF8C0 80242BF0 00000000 */ nop -/* DCF8C4 80242BF4 46800020 */ cvt.s.w $f0, $f0 -/* DCF8C8 80242BF8 0C0376B9 */ jal func_800DDAE4 -/* DCF8CC 80242BFC E7A0001C */ swc1 $f0, 0x1c($sp) -/* DCF8D0 80242C00 54400001 */ bnel $v0, $zero, .L80242C08 -/* DCF8D4 80242C04 24160001 */ addiu $s6, $zero, 1 -.L80242C08: -/* DCF8D8 80242C08 0200282D */ daddu $a1, $s0, $zero -/* DCF8DC 80242C0C 0220302D */ daddu $a2, $s1, $zero -/* DCF8E0 80242C10 C6400038 */ lwc1 $f0, 0x38($s2) -/* DCF8E4 80242C14 C642003C */ lwc1 $f2, 0x3c($s2) -/* DCF8E8 80242C18 C6440040 */ lwc1 $f4, 0x40($s2) -/* DCF8EC 80242C1C 3C01447A */ lui $at, 0x447a -/* DCF8F0 80242C20 44813000 */ mtc1 $at, $f6 -/* DCF8F4 80242C24 27A2002C */ addiu $v0, $sp, 0x2c -/* DCF8F8 80242C28 E7A00020 */ swc1 $f0, 0x20($sp) -/* DCF8FC 80242C2C E7A20024 */ swc1 $f2, 0x24($sp) -/* DCF900 80242C30 E7A40028 */ swc1 $f4, 0x28($sp) -/* DCF904 80242C34 E7A6002C */ swc1 $f6, 0x2c($sp) -/* DCF908 80242C38 AFA20010 */ sw $v0, 0x10($sp) -/* DCF90C 80242C3C 8E440080 */ lw $a0, 0x80($s2) -/* DCF910 80242C40 0C0372DF */ jal func_800DCB7C -/* DCF914 80242C44 0280382D */ daddu $a3, $s4, $zero -/* DCF918 80242C48 10400019 */ beqz $v0, .L80242CB0 -/* DCF91C 80242C4C 00000000 */ nop -/* DCF920 80242C50 C640001C */ lwc1 $f0, 0x1c($s2) -/* DCF924 80242C54 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* DCF928 80242C58 46000005 */ abs.s $f0, $f0 -/* DCF92C 80242C5C 4600103C */ c.lt.s $f2, $f0 -/* DCF930 80242C60 00000000 */ nop -/* DCF934 80242C64 45000012 */ bc1f .L80242CB0 -/* DCF938 80242C68 00000000 */ nop -/* DCF93C 80242C6C C7A40024 */ lwc1 $f4, 0x24($sp) -/* DCF940 80242C70 C6400064 */ lwc1 $f0, 0x64($s2) -/* DCF944 80242C74 46002001 */ sub.s $f0, $f4, $f0 -/* DCF948 80242C78 3C014034 */ lui $at, 0x4034 -/* DCF94C 80242C7C 44811800 */ mtc1 $at, $f3 -/* DCF950 80242C80 44801000 */ mtc1 $zero, $f2 -/* DCF954 80242C84 46000005 */ abs.s $f0, $f0 -/* DCF958 80242C88 46000021 */ cvt.d.s $f0, $f0 -/* DCF95C 80242C8C 4622003C */ c.lt.d $f0, $f2 -/* DCF960 80242C90 00000000 */ nop -/* DCF964 80242C94 45000006 */ bc1f .L80242CB0 -/* DCF968 80242C98 0240202D */ daddu $a0, $s2, $zero -/* DCF96C 80242C9C 8E450018 */ lw $a1, 0x18($s2) -/* DCF970 80242CA0 8E46000C */ lw $a2, 0xc($s2) -/* DCF974 80242CA4 2416000A */ addiu $s6, $zero, 0xa -/* DCF978 80242CA8 0C00EA95 */ jal npc_move_heading -/* DCF97C 80242CAC E644003C */ swc1 $f4, 0x3c($s2) -.L80242CB0: -/* DCF980 80242CB0 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DCF984 80242CB4 3C013FF0 */ lui $at, 0x3ff0 -/* DCF988 80242CB8 44811800 */ mtc1 $at, $f3 -/* DCF98C 80242CBC 44801000 */ mtc1 $zero, $f2 -/* DCF990 80242CC0 46000021 */ cvt.d.s $f0, $f0 -/* DCF994 80242CC4 4622003C */ c.lt.d $f0, $f2 -/* DCF998 80242CC8 00000000 */ nop -/* DCF99C 80242CCC 45030001 */ bc1tl .L80242CD4 -/* DCF9A0 80242CD0 2416000B */ addiu $s6, $zero, 0xb -.L80242CD4: -/* DCF9A4 80242CD4 9642008E */ lhu $v0, 0x8e($s2) -/* DCF9A8 80242CD8 2442FFFF */ addiu $v0, $v0, -1 -/* DCF9AC 80242CDC A642008E */ sh $v0, 0x8e($s2) -/* DCF9B0 80242CE0 00021400 */ sll $v0, $v0, 0x10 -/* DCF9B4 80242CE4 58400001 */ blezl $v0, .L80242CEC -/* DCF9B8 80242CE8 24160014 */ addiu $s6, $zero, 0x14 -.L80242CEC: -/* DCF9BC 80242CEC 56C00019 */ bnel $s6, $zero, .L80242D54 -/* DCF9C0 80242CF0 AFA00010 */ sw $zero, 0x10($sp) -/* DCF9C4 80242CF4 8E620070 */ lw $v0, 0x70($s3) -/* DCF9C8 80242CF8 30420001 */ andi $v0, $v0, 1 -/* DCF9CC 80242CFC 10400009 */ beqz $v0, .L80242D24 -/* DCF9D0 80242D00 00000000 */ nop -/* DCF9D4 80242D04 C640004C */ lwc1 $f0, 0x4c($s2) -/* DCF9D8 80242D08 3C014044 */ lui $at, 0x4044 -/* DCF9DC 80242D0C 44811800 */ mtc1 $at, $f3 -/* DCF9E0 80242D10 44801000 */ mtc1 $zero, $f2 -/* DCF9E4 80242D14 46000021 */ cvt.d.s $f0, $f0 -/* DCF9E8 80242D18 46220000 */ add.d $f0, $f0, $f2 -/* DCF9EC 80242D1C 46200020 */ cvt.s.d $f0, $f0 -/* DCF9F0 80242D20 E640004C */ swc1 $f0, 0x4c($s2) -.L80242D24: -/* DCF9F4 80242D24 8E450018 */ lw $a1, 0x18($s2) -/* DCF9F8 80242D28 8E46000C */ lw $a2, 0xc($s2) -/* DCF9FC 80242D2C 0C00EA95 */ jal npc_move_heading -/* DCFA00 80242D30 0240202D */ daddu $a0, $s2, $zero -/* DCFA04 80242D34 C644003C */ lwc1 $f4, 0x3c($s2) -/* DCFA08 80242D38 C640001C */ lwc1 $f0, 0x1c($s2) -/* DCFA0C 80242D3C 46002100 */ add.s $f4, $f4, $f0 -/* DCFA10 80242D40 C6420014 */ lwc1 $f2, 0x14($s2) -/* DCFA14 80242D44 46020001 */ sub.s $f0, $f0, $f2 -/* DCFA18 80242D48 E644003C */ swc1 $f4, 0x3c($s2) -/* DCFA1C 80242D4C 08090B70 */ j .L80242DC0 -/* DCFA20 80242D50 E640001C */ swc1 $f0, 0x1c($s2) -.L80242D54: -/* DCFA24 80242D54 AFA00014 */ sw $zero, 0x14($sp) -/* DCFA28 80242D58 8E450038 */ lw $a1, 0x38($s2) -/* DCFA2C 80242D5C 8E46003C */ lw $a2, 0x3c($s2) -/* DCFA30 80242D60 8E470040 */ lw $a3, 0x40($s2) -/* DCFA34 80242D64 0C01BECC */ jal fx_walk_normal -/* DCFA38 80242D68 24040002 */ addiu $a0, $zero, 2 -/* DCFA3C 80242D6C 3C01C47A */ lui $at, 0xc47a -/* DCFA40 80242D70 44810000 */ mtc1 $at, $f0 -/* DCFA44 80242D74 AE60006C */ sw $zero, 0x6c($s3) -/* DCFA48 80242D78 8E420000 */ lw $v0, ($s2) -/* DCFA4C 80242D7C 0240202D */ daddu $a0, $s2, $zero -/* DCFA50 80242D80 AE400038 */ sw $zero, 0x38($s2) -/* DCFA54 80242D84 AE400040 */ sw $zero, 0x40($s2) -/* DCFA58 80242D88 AE40001C */ sw $zero, 0x1c($s2) -/* DCFA5C 80242D8C 34420002 */ ori $v0, $v0, 2 -/* DCFA60 80242D90 E640003C */ swc1 $f0, 0x3c($s2) -/* DCFA64 80242D94 0C00EAFF */ jal disable_npc_shadow -/* DCFA68 80242D98 AE420000 */ sw $v0, ($s2) -/* DCFA6C 80242D9C 8E420000 */ lw $v0, ($s2) -/* DCFA70 80242DA0 2403F7FF */ addiu $v1, $zero, -0x801 -/* DCFA74 80242DA4 00431024 */ and $v0, $v0, $v1 -/* DCFA78 80242DA8 AE420000 */ sw $v0, ($s2) -/* DCFA7C 80242DAC 8E620000 */ lw $v0, ($s3) -/* DCFA80 80242DB0 3C031F00 */ lui $v1, 0x1f00 -/* DCFA84 80242DB4 00431025 */ or $v0, $v0, $v1 -/* DCFA88 80242DB8 AE620000 */ sw $v0, ($s3) -/* DCFA8C 80242DBC AEE00070 */ sw $zero, 0x70($s7) -.L80242DC0: -/* DCFA90 80242DC0 0000102D */ daddu $v0, $zero, $zero -.L80242DC4: -/* DCFA94 80242DC4 8FBF0050 */ lw $ra, 0x50($sp) -/* DCFA98 80242DC8 8FB7004C */ lw $s7, 0x4c($sp) -/* DCFA9C 80242DCC 8FB60048 */ lw $s6, 0x48($sp) -/* DCFAA0 80242DD0 8FB50044 */ lw $s5, 0x44($sp) -/* DCFAA4 80242DD4 8FB40040 */ lw $s4, 0x40($sp) -/* DCFAA8 80242DD8 8FB3003C */ lw $s3, 0x3c($sp) -/* DCFAAC 80242DDC 8FB20038 */ lw $s2, 0x38($sp) -/* DCFAB0 80242DE0 8FB10034 */ lw $s1, 0x34($sp) -/* DCFAB4 80242DE4 8FB00030 */ lw $s0, 0x30($sp) -/* DCFAB8 80242DE8 03E00008 */ jr $ra -/* DCFABC 80242DEC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s new file mode 100644 index 0000000000..dc062a602f --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802428B4_DCF584.s @@ -0,0 +1,354 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428B4_DCF584 +/* DCF584 802428B4 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* DCF588 802428B8 AFB7004C */ sw $s7, 0x4c($sp) +/* DCF58C 802428BC 0080B82D */ daddu $s7, $a0, $zero +/* DCF590 802428C0 AFB10034 */ sw $s1, 0x34($sp) +/* DCF594 802428C4 00A0882D */ daddu $s1, $a1, $zero +/* DCF598 802428C8 AFBF0050 */ sw $ra, 0x50($sp) +/* DCF59C 802428CC AFB60048 */ sw $s6, 0x48($sp) +/* DCF5A0 802428D0 AFB50044 */ sw $s5, 0x44($sp) +/* DCF5A4 802428D4 AFB40040 */ sw $s4, 0x40($sp) +/* DCF5A8 802428D8 AFB3003C */ sw $s3, 0x3c($sp) +/* DCF5AC 802428DC AFB20038 */ sw $s2, 0x38($sp) +/* DCF5B0 802428E0 AFB00030 */ sw $s0, 0x30($sp) +/* DCF5B4 802428E4 8EF30148 */ lw $s3, 0x148($s7) +/* DCF5B8 802428E8 86640008 */ lh $a0, 8($s3) +/* DCF5BC 802428EC 8EF0000C */ lw $s0, 0xc($s7) +/* DCF5C0 802428F0 0C00FB5A */ jal get_enemy_safe +/* DCF5C4 802428F4 0000B02D */ daddu $s6, $zero, $zero +/* DCF5C8 802428F8 10400131 */ beqz $v0, .L80242DC0 +/* DCF5CC 802428FC 24020005 */ addiu $v0, $zero, 5 +/* DCF5D0 80242900 8E63006C */ lw $v1, 0x6c($s3) +/* DCF5D4 80242904 1062012F */ beq $v1, $v0, .L80242DC4 +/* DCF5D8 80242908 0000102D */ daddu $v0, $zero, $zero +/* DCF5DC 8024290C 8E050000 */ lw $a1, ($s0) +/* DCF5E0 80242910 0C0B1EAF */ jal get_variable +/* DCF5E4 80242914 02E0202D */ daddu $a0, $s7, $zero +/* DCF5E8 80242918 86640008 */ lh $a0, 8($s3) +/* DCF5EC 8024291C 0C00EABB */ jal get_npc_unsafe +/* DCF5F0 80242920 0040A82D */ daddu $s5, $v0, $zero +/* DCF5F4 80242924 8E630070 */ lw $v1, 0x70($s3) +/* DCF5F8 80242928 30630002 */ andi $v1, $v1, 2 +/* DCF5FC 8024292C 10600008 */ beqz $v1, .L80242950 +/* DCF600 80242930 0040902D */ daddu $s2, $v0, $zero +/* DCF604 80242934 964200A8 */ lhu $v0, 0xa8($s2) +/* DCF608 80242938 00021400 */ sll $v0, $v0, 0x10 +/* DCF60C 8024293C 00021C03 */ sra $v1, $v0, 0x10 +/* DCF610 80242940 000217C2 */ srl $v0, $v0, 0x1f +/* DCF614 80242944 00621821 */ addu $v1, $v1, $v0 +/* DCF618 80242948 00031843 */ sra $v1, $v1, 1 +/* DCF61C 8024294C A24300AB */ sb $v1, 0xab($s2) +.L80242950: +/* DCF620 80242950 16200005 */ bnez $s1, .L80242968 +/* DCF624 80242954 3C030004 */ lui $v1, 4 +/* DCF628 80242958 8E6200B0 */ lw $v0, 0xb0($s3) +/* DCF62C 8024295C 30420004 */ andi $v0, $v0, 4 +/* DCF630 80242960 10400019 */ beqz $v0, .L802429C8 +/* DCF634 80242964 00000000 */ nop +.L80242968: +/* DCF638 80242968 34630102 */ ori $v1, $v1, 0x102 +/* DCF63C 8024296C AEE00070 */ sw $zero, 0x70($s7) +/* DCF640 80242970 8E420000 */ lw $v0, ($s2) +/* DCF644 80242974 0240202D */ daddu $a0, $s2, $zero +/* DCF648 80242978 A640008E */ sh $zero, 0x8e($s2) +/* DCF64C 8024297C 00431025 */ or $v0, $v0, $v1 +/* DCF650 80242980 0C00EAFF */ jal disable_npc_shadow +/* DCF654 80242984 AE420000 */ sw $v0, ($s2) +/* DCF658 80242988 3C041F30 */ lui $a0, 0x1f30 +/* DCF65C 8024298C 8E420000 */ lw $v0, ($s2) +/* DCF660 80242990 2403F7FF */ addiu $v1, $zero, -0x801 +/* DCF664 80242994 00431024 */ and $v0, $v0, $v1 +/* DCF668 80242998 AE420000 */ sw $v0, ($s2) +/* DCF66C 8024299C 8E620000 */ lw $v0, ($s3) +/* DCF670 802429A0 8E6300B0 */ lw $v1, 0xb0($s3) +/* DCF674 802429A4 34840040 */ ori $a0, $a0, 0x40 +/* DCF678 802429A8 AE60006C */ sw $zero, 0x6c($s3) +/* DCF67C 802429AC 00441025 */ or $v0, $v0, $a0 +/* DCF680 802429B0 AE620000 */ sw $v0, ($s3) +/* DCF684 802429B4 30620004 */ andi $v0, $v1, 4 +/* DCF688 802429B8 10400003 */ beqz $v0, .L802429C8 +/* DCF68C 802429BC 2402FFFB */ addiu $v0, $zero, -5 +/* DCF690 802429C0 00621024 */ and $v0, $v1, $v0 +/* DCF694 802429C4 AE6200B0 */ sw $v0, 0xb0($s3) +.L802429C8: +/* DCF698 802429C8 8EE30070 */ lw $v1, 0x70($s7) +/* DCF69C 802429CC 24100001 */ addiu $s0, $zero, 1 +/* DCF6A0 802429D0 10700012 */ beq $v1, $s0, .L80242A1C +/* DCF6A4 802429D4 28620002 */ slti $v0, $v1, 2 +/* DCF6A8 802429D8 10400005 */ beqz $v0, .L802429F0 +/* DCF6AC 802429DC 24020002 */ addiu $v0, $zero, 2 +/* DCF6B0 802429E0 10600007 */ beqz $v1, .L80242A00 +/* DCF6B4 802429E4 0000102D */ daddu $v0, $zero, $zero +/* DCF6B8 802429E8 08090B71 */ j .L80242DC4 +/* DCF6BC 802429EC 00000000 */ nop +.L802429F0: +/* DCF6C0 802429F0 1062005B */ beq $v1, $v0, .L80242B60 +/* DCF6C4 802429F4 0000102D */ daddu $v0, $zero, $zero +/* DCF6C8 802429F8 08090B71 */ j .L80242DC4 +/* DCF6CC 802429FC 00000000 */ nop +.L80242A00: +/* DCF6D0 80242A00 8E420000 */ lw $v0, ($s2) +/* DCF6D4 80242A04 0240202D */ daddu $a0, $s2, $zero +/* DCF6D8 80242A08 34420002 */ ori $v0, $v0, 2 +/* DCF6DC 80242A0C 0C00EAFF */ jal disable_npc_shadow +/* DCF6E0 80242A10 AE420000 */ sw $v0, ($s2) +/* DCF6E4 80242A14 AE60006C */ sw $zero, 0x6c($s3) +/* DCF6E8 80242A18 AEF00070 */ sw $s0, 0x70($s7) +.L80242A1C: +/* DCF6EC 80242A1C 8E74006C */ lw $s4, 0x6c($s3) +/* DCF6F0 80242A20 24020001 */ addiu $v0, $zero, 1 +/* DCF6F4 80242A24 168200E7 */ bne $s4, $v0, .L80242DC4 +/* DCF6F8 80242A28 0000102D */ daddu $v0, $zero, $zero +/* DCF6FC 80242A2C 8E64007C */ lw $a0, 0x7c($s3) +/* DCF700 80242A30 24110002 */ addiu $s1, $zero, 2 +/* DCF704 80242A34 0C00EABB */ jal get_npc_unsafe +/* DCF708 80242A38 AE71006C */ sw $s1, 0x6c($s3) +/* DCF70C 80242A3C 0040802D */ daddu $s0, $v0, $zero +/* DCF710 80242A40 C6000038 */ lwc1 $f0, 0x38($s0) +/* DCF714 80242A44 E6400038 */ swc1 $f0, 0x38($s2) +/* DCF718 80242A48 C6000040 */ lwc1 $f0, 0x40($s0) +/* DCF71C 80242A4C E6400040 */ swc1 $f0, 0x40($s2) +/* DCF720 80242A50 C6020034 */ lwc1 $f2, 0x34($s0) +/* DCF724 80242A54 3C014387 */ lui $at, 0x4387 +/* DCF728 80242A58 44810000 */ mtc1 $at, $f0 +/* DCF72C 80242A5C 26440038 */ addiu $a0, $s2, 0x38 +/* DCF730 80242A60 46020001 */ sub.s $f0, $f0, $f2 +/* DCF734 80242A64 C6680078 */ lwc1 $f8, 0x78($s3) +/* DCF738 80242A68 46804220 */ cvt.s.w $f8, $f8 +/* DCF73C 80242A6C 44064000 */ mfc1 $a2, $f8 +/* DCF740 80242A70 44070000 */ mfc1 $a3, $f0 +/* DCF744 80242A74 0C00A7E7 */ jal add_vec2D_polar +/* DCF748 80242A78 26450040 */ addiu $a1, $s2, 0x40 +/* DCF74C 80242A7C C600003C */ lwc1 $f0, 0x3c($s0) +/* DCF750 80242A80 C6620074 */ lwc1 $f2, 0x74($s3) +/* DCF754 80242A84 468010A0 */ cvt.s.w $f2, $f2 +/* DCF758 80242A88 46020000 */ add.s $f0, $f0, $f2 +/* DCF75C 80242A8C E640003C */ swc1 $f0, 0x3c($s2) +/* DCF760 80242A90 A2740007 */ sb $s4, 7($s3) +/* DCF764 80242A94 C6400038 */ lwc1 $f0, 0x38($s2) +/* DCF768 80242A98 4600020D */ trunc.w.s $f8, $f0 +/* DCF76C 80242A9C 44024000 */ mfc1 $v0, $f8 +/* DCF770 80242AA0 00000000 */ nop +/* DCF774 80242AA4 A6620010 */ sh $v0, 0x10($s3) +/* DCF778 80242AA8 C640003C */ lwc1 $f0, 0x3c($s2) +/* DCF77C 80242AAC 4600020D */ trunc.w.s $f8, $f0 +/* DCF780 80242AB0 44024000 */ mfc1 $v0, $f8 +/* DCF784 80242AB4 00000000 */ nop +/* DCF788 80242AB8 A6620012 */ sh $v0, 0x12($s3) +/* DCF78C 80242ABC C6400040 */ lwc1 $f0, 0x40($s2) +/* DCF790 80242AC0 4600020D */ trunc.w.s $f8, $f0 +/* DCF794 80242AC4 44024000 */ mfc1 $v0, $f8 +/* DCF798 80242AC8 00000000 */ nop +/* DCF79C 80242ACC A6620014 */ sh $v0, 0x14($s3) +/* DCF7A0 80242AD0 AE400044 */ sw $zero, 0x44($s2) +/* DCF7A4 80242AD4 AE400048 */ sw $zero, 0x48($s2) +/* DCF7A8 80242AD8 AE40004C */ sw $zero, 0x4c($s2) +/* DCF7AC 80242ADC C6A00000 */ lwc1 $f0, ($s5) +/* DCF7B0 80242AE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DCF7B4 80242AE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DCF7B8 80242AE8 C64C0038 */ lwc1 $f12, 0x38($s2) +/* DCF7BC 80242AEC C64E0040 */ lwc1 $f14, 0x40($s2) +/* DCF7C0 80242AF0 E6400018 */ swc1 $f0, 0x18($s2) +/* DCF7C4 80242AF4 8C460028 */ lw $a2, 0x28($v0) +/* DCF7C8 80242AF8 0C00A720 */ jal atan2 +/* DCF7CC 80242AFC 8C470030 */ lw $a3, 0x30($v0) +/* DCF7D0 80242B00 E640000C */ swc1 $f0, 0xc($s2) +/* DCF7D4 80242B04 C6A0000C */ lwc1 $f0, 0xc($s5) +/* DCF7D8 80242B08 8E420000 */ lw $v0, ($s2) +/* DCF7DC 80242B0C 0240202D */ daddu $a0, $s2, $zero +/* DCF7E0 80242B10 E640001C */ swc1 $f0, 0x1c($s2) +/* DCF7E4 80242B14 C6A00010 */ lwc1 $f0, 0x10($s5) +/* DCF7E8 80242B18 2403FFFD */ addiu $v1, $zero, -3 +/* DCF7EC 80242B1C E6400014 */ swc1 $f0, 0x14($s2) +/* DCF7F0 80242B20 C600003C */ lwc1 $f0, 0x3c($s0) +/* DCF7F4 80242B24 00431024 */ and $v0, $v0, $v1 +/* DCF7F8 80242B28 AE420000 */ sw $v0, ($s2) +/* DCF7FC 80242B2C 0C00EAE8 */ jal enable_npc_shadow +/* DCF800 80242B30 E6400064 */ swc1 $f0, 0x64($s2) +/* DCF804 80242B34 8E420000 */ lw $v0, ($s2) +/* DCF808 80242B38 3C03E0FF */ lui $v1, 0xe0ff +/* DCF80C 80242B3C 34420800 */ ori $v0, $v0, 0x800 +/* DCF810 80242B40 AE420000 */ sw $v0, ($s2) +/* DCF814 80242B44 8E620000 */ lw $v0, ($s3) +/* DCF818 80242B48 3463FFFF */ ori $v1, $v1, 0xffff +/* DCF81C 80242B4C 00431024 */ and $v0, $v0, $v1 +/* DCF820 80242B50 AE620000 */ sw $v0, ($s3) +/* DCF824 80242B54 2402005A */ addiu $v0, $zero, 0x5a +/* DCF828 80242B58 A642008E */ sh $v0, 0x8e($s2) +/* DCF82C 80242B5C AEF10070 */ sw $s1, 0x70($s7) +.L80242B60: +/* DCF830 80242B60 0000202D */ daddu $a0, $zero, $zero +/* DCF834 80242B64 27B00020 */ addiu $s0, $sp, 0x20 +/* DCF838 80242B68 864200A8 */ lh $v0, 0xa8($s2) +/* DCF83C 80242B6C 3C013FE0 */ lui $at, 0x3fe0 +/* DCF840 80242B70 44810800 */ mtc1 $at, $f1 +/* DCF844 80242B74 44800000 */ mtc1 $zero, $f0 +/* DCF848 80242B78 44821000 */ mtc1 $v0, $f2 +/* DCF84C 80242B7C 00000000 */ nop +/* DCF850 80242B80 468010A1 */ cvt.d.w $f2, $f2 +/* DCF854 80242B84 46201082 */ mul.d $f2, $f2, $f0 +/* DCF858 80242B88 00000000 */ nop +/* DCF85C 80242B8C 0200282D */ daddu $a1, $s0, $zero +/* DCF860 80242B90 C6440038 */ lwc1 $f4, 0x38($s2) +/* DCF864 80242B94 C640003C */ lwc1 $f0, 0x3c($s2) +/* DCF868 80242B98 27B10024 */ addiu $s1, $sp, 0x24 +/* DCF86C 80242B9C E7A40020 */ swc1 $f4, 0x20($sp) +/* DCF870 80242BA0 C6440040 */ lwc1 $f4, 0x40($s2) +/* DCF874 80242BA4 46000021 */ cvt.d.s $f0, $f0 +/* DCF878 80242BA8 46220000 */ add.d $f0, $f0, $f2 +/* DCF87C 80242BAC E7A40028 */ swc1 $f4, 0x28($sp) +/* DCF880 80242BB0 C6420018 */ lwc1 $f2, 0x18($s2) +/* DCF884 80242BB4 46200020 */ cvt.s.d $f0, $f0 +/* DCF888 80242BB8 E7A00024 */ swc1 $f0, 0x24($sp) +/* DCF88C 80242BBC E7A20010 */ swc1 $f2, 0x10($sp) +/* DCF890 80242BC0 C640000C */ lwc1 $f0, 0xc($s2) +/* DCF894 80242BC4 0220302D */ daddu $a2, $s1, $zero +/* DCF898 80242BC8 E7A00014 */ swc1 $f0, 0x14($sp) +/* DCF89C 80242BCC 864200A6 */ lh $v0, 0xa6($s2) +/* DCF8A0 80242BD0 27B40028 */ addiu $s4, $sp, 0x28 +/* DCF8A4 80242BD4 44820000 */ mtc1 $v0, $f0 +/* DCF8A8 80242BD8 00000000 */ nop +/* DCF8AC 80242BDC 46800020 */ cvt.s.w $f0, $f0 +/* DCF8B0 80242BE0 E7A00018 */ swc1 $f0, 0x18($sp) +/* DCF8B4 80242BE4 864200A8 */ lh $v0, 0xa8($s2) +/* DCF8B8 80242BE8 0280382D */ daddu $a3, $s4, $zero +/* DCF8BC 80242BEC 44820000 */ mtc1 $v0, $f0 +/* DCF8C0 80242BF0 00000000 */ nop +/* DCF8C4 80242BF4 46800020 */ cvt.s.w $f0, $f0 +/* DCF8C8 80242BF8 0C0376B9 */ jal func_800DDAE4 +/* DCF8CC 80242BFC E7A0001C */ swc1 $f0, 0x1c($sp) +/* DCF8D0 80242C00 54400001 */ bnel $v0, $zero, .L80242C08 +/* DCF8D4 80242C04 24160001 */ addiu $s6, $zero, 1 +.L80242C08: +/* DCF8D8 80242C08 0200282D */ daddu $a1, $s0, $zero +/* DCF8DC 80242C0C 0220302D */ daddu $a2, $s1, $zero +/* DCF8E0 80242C10 C6400038 */ lwc1 $f0, 0x38($s2) +/* DCF8E4 80242C14 C642003C */ lwc1 $f2, 0x3c($s2) +/* DCF8E8 80242C18 C6440040 */ lwc1 $f4, 0x40($s2) +/* DCF8EC 80242C1C 3C01447A */ lui $at, 0x447a +/* DCF8F0 80242C20 44813000 */ mtc1 $at, $f6 +/* DCF8F4 80242C24 27A2002C */ addiu $v0, $sp, 0x2c +/* DCF8F8 80242C28 E7A00020 */ swc1 $f0, 0x20($sp) +/* DCF8FC 80242C2C E7A20024 */ swc1 $f2, 0x24($sp) +/* DCF900 80242C30 E7A40028 */ swc1 $f4, 0x28($sp) +/* DCF904 80242C34 E7A6002C */ swc1 $f6, 0x2c($sp) +/* DCF908 80242C38 AFA20010 */ sw $v0, 0x10($sp) +/* DCF90C 80242C3C 8E440080 */ lw $a0, 0x80($s2) +/* DCF910 80242C40 0C0372DF */ jal func_800DCB7C +/* DCF914 80242C44 0280382D */ daddu $a3, $s4, $zero +/* DCF918 80242C48 10400019 */ beqz $v0, .L80242CB0 +/* DCF91C 80242C4C 00000000 */ nop +/* DCF920 80242C50 C640001C */ lwc1 $f0, 0x1c($s2) +/* DCF924 80242C54 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* DCF928 80242C58 46000005 */ abs.s $f0, $f0 +/* DCF92C 80242C5C 4600103C */ c.lt.s $f2, $f0 +/* DCF930 80242C60 00000000 */ nop +/* DCF934 80242C64 45000012 */ bc1f .L80242CB0 +/* DCF938 80242C68 00000000 */ nop +/* DCF93C 80242C6C C7A40024 */ lwc1 $f4, 0x24($sp) +/* DCF940 80242C70 C6400064 */ lwc1 $f0, 0x64($s2) +/* DCF944 80242C74 46002001 */ sub.s $f0, $f4, $f0 +/* DCF948 80242C78 3C014034 */ lui $at, 0x4034 +/* DCF94C 80242C7C 44811800 */ mtc1 $at, $f3 +/* DCF950 80242C80 44801000 */ mtc1 $zero, $f2 +/* DCF954 80242C84 46000005 */ abs.s $f0, $f0 +/* DCF958 80242C88 46000021 */ cvt.d.s $f0, $f0 +/* DCF95C 80242C8C 4622003C */ c.lt.d $f0, $f2 +/* DCF960 80242C90 00000000 */ nop +/* DCF964 80242C94 45000006 */ bc1f .L80242CB0 +/* DCF968 80242C98 0240202D */ daddu $a0, $s2, $zero +/* DCF96C 80242C9C 8E450018 */ lw $a1, 0x18($s2) +/* DCF970 80242CA0 8E46000C */ lw $a2, 0xc($s2) +/* DCF974 80242CA4 2416000A */ addiu $s6, $zero, 0xa +/* DCF978 80242CA8 0C00EA95 */ jal npc_move_heading +/* DCF97C 80242CAC E644003C */ swc1 $f4, 0x3c($s2) +.L80242CB0: +/* DCF980 80242CB0 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* DCF984 80242CB4 3C013FF0 */ lui $at, 0x3ff0 +/* DCF988 80242CB8 44811800 */ mtc1 $at, $f3 +/* DCF98C 80242CBC 44801000 */ mtc1 $zero, $f2 +/* DCF990 80242CC0 46000021 */ cvt.d.s $f0, $f0 +/* DCF994 80242CC4 4622003C */ c.lt.d $f0, $f2 +/* DCF998 80242CC8 00000000 */ nop +/* DCF99C 80242CCC 45030001 */ bc1tl .L80242CD4 +/* DCF9A0 80242CD0 2416000B */ addiu $s6, $zero, 0xb +.L80242CD4: +/* DCF9A4 80242CD4 9642008E */ lhu $v0, 0x8e($s2) +/* DCF9A8 80242CD8 2442FFFF */ addiu $v0, $v0, -1 +/* DCF9AC 80242CDC A642008E */ sh $v0, 0x8e($s2) +/* DCF9B0 80242CE0 00021400 */ sll $v0, $v0, 0x10 +/* DCF9B4 80242CE4 58400001 */ blezl $v0, .L80242CEC +/* DCF9B8 80242CE8 24160014 */ addiu $s6, $zero, 0x14 +.L80242CEC: +/* DCF9BC 80242CEC 56C00019 */ bnel $s6, $zero, .L80242D54 +/* DCF9C0 80242CF0 AFA00010 */ sw $zero, 0x10($sp) +/* DCF9C4 80242CF4 8E620070 */ lw $v0, 0x70($s3) +/* DCF9C8 80242CF8 30420001 */ andi $v0, $v0, 1 +/* DCF9CC 80242CFC 10400009 */ beqz $v0, .L80242D24 +/* DCF9D0 80242D00 00000000 */ nop +/* DCF9D4 80242D04 C640004C */ lwc1 $f0, 0x4c($s2) +/* DCF9D8 80242D08 3C014044 */ lui $at, 0x4044 +/* DCF9DC 80242D0C 44811800 */ mtc1 $at, $f3 +/* DCF9E0 80242D10 44801000 */ mtc1 $zero, $f2 +/* DCF9E4 80242D14 46000021 */ cvt.d.s $f0, $f0 +/* DCF9E8 80242D18 46220000 */ add.d $f0, $f0, $f2 +/* DCF9EC 80242D1C 46200020 */ cvt.s.d $f0, $f0 +/* DCF9F0 80242D20 E640004C */ swc1 $f0, 0x4c($s2) +.L80242D24: +/* DCF9F4 80242D24 8E450018 */ lw $a1, 0x18($s2) +/* DCF9F8 80242D28 8E46000C */ lw $a2, 0xc($s2) +/* DCF9FC 80242D2C 0C00EA95 */ jal npc_move_heading +/* DCFA00 80242D30 0240202D */ daddu $a0, $s2, $zero +/* DCFA04 80242D34 C644003C */ lwc1 $f4, 0x3c($s2) +/* DCFA08 80242D38 C640001C */ lwc1 $f0, 0x1c($s2) +/* DCFA0C 80242D3C 46002100 */ add.s $f4, $f4, $f0 +/* DCFA10 80242D40 C6420014 */ lwc1 $f2, 0x14($s2) +/* DCFA14 80242D44 46020001 */ sub.s $f0, $f0, $f2 +/* DCFA18 80242D48 E644003C */ swc1 $f4, 0x3c($s2) +/* DCFA1C 80242D4C 08090B70 */ j .L80242DC0 +/* DCFA20 80242D50 E640001C */ swc1 $f0, 0x1c($s2) +.L80242D54: +/* DCFA24 80242D54 AFA00014 */ sw $zero, 0x14($sp) +/* DCFA28 80242D58 8E450038 */ lw $a1, 0x38($s2) +/* DCFA2C 80242D5C 8E46003C */ lw $a2, 0x3c($s2) +/* DCFA30 80242D60 8E470040 */ lw $a3, 0x40($s2) +/* DCFA34 80242D64 0C01BECC */ jal fx_walk_normal +/* DCFA38 80242D68 24040002 */ addiu $a0, $zero, 2 +/* DCFA3C 80242D6C 3C01C47A */ lui $at, 0xc47a +/* DCFA40 80242D70 44810000 */ mtc1 $at, $f0 +/* DCFA44 80242D74 AE60006C */ sw $zero, 0x6c($s3) +/* DCFA48 80242D78 8E420000 */ lw $v0, ($s2) +/* DCFA4C 80242D7C 0240202D */ daddu $a0, $s2, $zero +/* DCFA50 80242D80 AE400038 */ sw $zero, 0x38($s2) +/* DCFA54 80242D84 AE400040 */ sw $zero, 0x40($s2) +/* DCFA58 80242D88 AE40001C */ sw $zero, 0x1c($s2) +/* DCFA5C 80242D8C 34420002 */ ori $v0, $v0, 2 +/* DCFA60 80242D90 E640003C */ swc1 $f0, 0x3c($s2) +/* DCFA64 80242D94 0C00EAFF */ jal disable_npc_shadow +/* DCFA68 80242D98 AE420000 */ sw $v0, ($s2) +/* DCFA6C 80242D9C 8E420000 */ lw $v0, ($s2) +/* DCFA70 80242DA0 2403F7FF */ addiu $v1, $zero, -0x801 +/* DCFA74 80242DA4 00431024 */ and $v0, $v0, $v1 +/* DCFA78 80242DA8 AE420000 */ sw $v0, ($s2) +/* DCFA7C 80242DAC 8E620000 */ lw $v0, ($s3) +/* DCFA80 80242DB0 3C031F00 */ lui $v1, 0x1f00 +/* DCFA84 80242DB4 00431025 */ or $v0, $v0, $v1 +/* DCFA88 80242DB8 AE620000 */ sw $v0, ($s3) +/* DCFA8C 80242DBC AEE00070 */ sw $zero, 0x70($s7) +.L80242DC0: +/* DCFA90 80242DC0 0000102D */ daddu $v0, $zero, $zero +.L80242DC4: +/* DCFA94 80242DC4 8FBF0050 */ lw $ra, 0x50($sp) +/* DCFA98 80242DC8 8FB7004C */ lw $s7, 0x4c($sp) +/* DCFA9C 80242DCC 8FB60048 */ lw $s6, 0x48($sp) +/* DCFAA0 80242DD0 8FB50044 */ lw $s5, 0x44($sp) +/* DCFAA4 80242DD4 8FB40040 */ lw $s4, 0x40($sp) +/* DCFAA8 80242DD8 8FB3003C */ lw $s3, 0x3c($sp) +/* DCFAAC 80242DDC 8FB20038 */ lw $s2, 0x38($sp) +/* DCFAB0 80242DE0 8FB10034 */ lw $s1, 0x34($sp) +/* DCFAB4 80242DE4 8FB00030 */ lw $s0, 0x30($sp) +/* DCFAB8 80242DE8 03E00008 */ jr $ra +/* DCFABC 80242DEC 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0.s deleted file mode 100644 index b968850216..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242DF0 -/* DCFAC0 80242DF0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* DCFAC4 80242DF4 AFB3003C */ sw $s3, 0x3c($sp) -/* DCFAC8 80242DF8 0080982D */ daddu $s3, $a0, $zero -/* DCFACC 80242DFC AFB40040 */ sw $s4, 0x40($sp) -/* DCFAD0 80242E00 0000A02D */ daddu $s4, $zero, $zero -/* DCFAD4 80242E04 3C03800A */ lui $v1, 0x800a -/* DCFAD8 80242E08 8463A634 */ lh $v1, -0x59cc($v1) -/* DCFADC 80242E0C 3C04800B */ lui $a0, %hi(gCameras) -/* DCFAE0 80242E10 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* DCFAE4 80242E14 AFBF0044 */ sw $ra, 0x44($sp) -/* DCFAE8 80242E18 AFB20038 */ sw $s2, 0x38($sp) -/* DCFAEC 80242E1C AFB10034 */ sw $s1, 0x34($sp) -/* DCFAF0 80242E20 AFB00030 */ sw $s0, 0x30($sp) -/* DCFAF4 80242E24 F7B80058 */ sdc1 $f24, 0x58($sp) -/* DCFAF8 80242E28 F7B60050 */ sdc1 $f22, 0x50($sp) -/* DCFAFC 80242E2C F7B40048 */ sdc1 $f20, 0x48($sp) -/* DCFB00 80242E30 8E710148 */ lw $s1, 0x148($s3) -/* DCFB04 80242E34 00031080 */ sll $v0, $v1, 2 -/* DCFB08 80242E38 00431021 */ addu $v0, $v0, $v1 -/* DCFB0C 80242E3C 00021080 */ sll $v0, $v0, 2 -/* DCFB10 80242E40 00431023 */ subu $v0, $v0, $v1 -/* DCFB14 80242E44 000218C0 */ sll $v1, $v0, 3 -/* DCFB18 80242E48 00431021 */ addu $v0, $v0, $v1 -/* DCFB1C 80242E4C 000210C0 */ sll $v0, $v0, 3 -/* DCFB20 80242E50 10A00002 */ beqz $a1, .L80242E5C -/* DCFB24 80242E54 00449021 */ addu $s2, $v0, $a0 -/* DCFB28 80242E58 AE600070 */ sw $zero, 0x70($s3) -.L80242E5C: -/* DCFB2C 80242E5C 0C00FB5A */ jal get_enemy_safe -/* DCFB30 80242E60 86240008 */ lh $a0, 8($s1) -/* DCFB34 80242E64 14400006 */ bnez $v0, .L80242E80 -/* DCFB38 80242E68 24020005 */ addiu $v0, $zero, 5 -/* DCFB3C 80242E6C 0260202D */ daddu $a0, $s3, $zero -/* DCFB40 80242E70 3C05FE36 */ lui $a1, 0xfe36 -/* DCFB44 80242E74 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DCFB48 80242E78 08090C78 */ j .L802431E0 -/* DCFB4C 80242E7C 0000302D */ daddu $a2, $zero, $zero -.L80242E80: -/* DCFB50 80242E80 8E23006C */ lw $v1, 0x6c($s1) -/* DCFB54 80242E84 14620005 */ bne $v1, $v0, .L80242E9C -/* DCFB58 80242E88 0260202D */ daddu $a0, $s3, $zero -/* DCFB5C 80242E8C 3C05FE36 */ lui $a1, 0xfe36 -/* DCFB60 80242E90 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DCFB64 80242E94 08090C78 */ j .L802431E0 -/* DCFB68 80242E98 0000302D */ daddu $a2, $zero, $zero -.L80242E9C: -/* DCFB6C 80242E9C 86240008 */ lh $a0, 8($s1) -/* DCFB70 80242EA0 0C00FB5A */ jal get_enemy_safe -/* DCFB74 80242EA4 00000000 */ nop -/* DCFB78 80242EA8 14400005 */ bnez $v0, .L80242EC0 -/* DCFB7C 80242EAC 0260202D */ daddu $a0, $s3, $zero -/* DCFB80 80242EB0 3C05FE36 */ lui $a1, 0xfe36 -/* DCFB84 80242EB4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DCFB88 80242EB8 08090C78 */ j .L802431E0 -/* DCFB8C 80242EBC 0000302D */ daddu $a2, $zero, $zero -.L80242EC0: -/* DCFB90 80242EC0 86240008 */ lh $a0, 8($s1) -/* DCFB94 80242EC4 0C00EABB */ jal get_npc_unsafe -/* DCFB98 80242EC8 00000000 */ nop -/* DCFB9C 80242ECC 8E630070 */ lw $v1, 0x70($s3) -/* DCFBA0 80242ED0 10600006 */ beqz $v1, .L80242EEC -/* DCFBA4 80242ED4 0040802D */ daddu $s0, $v0, $zero -/* DCFBA8 80242ED8 24020001 */ addiu $v0, $zero, 1 -/* DCFBAC 80242EDC 1062003F */ beq $v1, $v0, .L80242FDC -/* DCFBB0 80242EE0 0000102D */ daddu $v0, $zero, $zero -/* DCFBB4 80242EE4 08090C88 */ j .L80243220 -/* DCFBB8 80242EE8 00000000 */ nop -.L80242EEC: -/* DCFBBC 80242EEC AFA00010 */ sw $zero, 0x10($sp) -/* DCFBC0 80242EF0 AFA00014 */ sw $zero, 0x14($sp) -/* DCFBC4 80242EF4 8E050038 */ lw $a1, 0x38($s0) -/* DCFBC8 80242EF8 8E06003C */ lw $a2, 0x3c($s0) -/* DCFBCC 80242EFC 8E070040 */ lw $a3, 0x40($s0) -/* DCFBD0 80242F00 0C01BECC */ jal fx_walk_normal -/* DCFBD4 80242F04 24040002 */ addiu $a0, $zero, 2 -/* DCFBD8 80242F08 C64C006C */ lwc1 $f12, 0x6c($s2) -/* DCFBDC 80242F0C 0C00A6C9 */ jal clamp_angle -/* DCFBE0 80242F10 00000000 */ nop -/* DCFBE4 80242F14 3C018025 */ lui $at, 0x8025 -/* DCFBE8 80242F18 D438AB20 */ ldc1 $f24, -0x54e0($at) -/* DCFBEC 80242F1C 46000521 */ cvt.d.s $f20, $f0 -/* DCFBF0 80242F20 4638A300 */ add.d $f12, $f20, $f24 -/* DCFBF4 80242F24 3C018025 */ lui $at, 0x8025 -/* DCFBF8 80242F28 D436AB28 */ ldc1 $f22, -0x54d8($at) -/* DCFBFC 80242F2C 0C00A6C9 */ jal clamp_angle -/* DCFC00 80242F30 46206320 */ cvt.s.d $f12, $f12 -/* DCFC04 80242F34 4636A500 */ add.d $f20, $f20, $f22 -/* DCFC08 80242F38 4620A320 */ cvt.s.d $f12, $f20 -/* DCFC0C 80242F3C 0C00A6C9 */ jal clamp_angle -/* DCFC10 80242F40 46000506 */ mov.s $f20, $f0 -/* DCFC14 80242F44 4600A521 */ cvt.d.s $f20, $f20 -/* DCFC18 80242F48 4636A500 */ add.d $f20, $f20, $f22 -/* DCFC1C 80242F4C 46000586 */ mov.s $f22, $f0 -/* DCFC20 80242F50 0C00A6C9 */ jal clamp_angle -/* DCFC24 80242F54 4620A320 */ cvt.s.d $f12, $f20 -/* DCFC28 80242F58 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DCFC2C 80242F5C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DCFC30 80242F60 C64C006C */ lwc1 $f12, 0x6c($s2) -/* DCFC34 80242F64 C44E0084 */ lwc1 $f14, 0x84($v0) -/* DCFC38 80242F68 0C00A70A */ jal get_clamped_angle_diff -/* DCFC3C 80242F6C 46000506 */ mov.s $f20, $f0 -/* DCFC40 80242F70 0C00A6C9 */ jal clamp_angle -/* DCFC44 80242F74 46000306 */ mov.s $f12, $f0 -/* DCFC48 80242F78 46000021 */ cvt.d.s $f0, $f0 -/* DCFC4C 80242F7C 4638003C */ c.lt.d $f0, $f24 -/* DCFC50 80242F80 00000000 */ nop -/* DCFC54 80242F84 45020002 */ bc1fl .L80242F90 -/* DCFC58 80242F88 E614000C */ swc1 $f20, 0xc($s0) -/* DCFC5C 80242F8C E616000C */ swc1 $f22, 0xc($s0) -.L80242F90: -/* DCFC60 80242F90 C6000018 */ lwc1 $f0, 0x18($s0) -/* DCFC64 80242F94 3C018025 */ lui $at, 0x8025 -/* DCFC68 80242F98 D422AB30 */ ldc1 $f2, -0x54d0($at) -/* DCFC6C 80242F9C 46000021 */ cvt.d.s $f0, $f0 -/* DCFC70 80242FA0 46220002 */ mul.d $f0, $f0, $f2 -/* DCFC74 80242FA4 00000000 */ nop -/* DCFC78 80242FA8 3C013F66 */ lui $at, 0x3f66 -/* DCFC7C 80242FAC 34216666 */ ori $at, $at, 0x6666 -/* DCFC80 80242FB0 44812000 */ mtc1 $at, $f4 -/* DCFC84 80242FB4 2402001E */ addiu $v0, $zero, 0x1e -/* DCFC88 80242FB8 A602008E */ sh $v0, 0x8e($s0) -/* DCFC8C 80242FBC 3C014120 */ lui $at, 0x4120 -/* DCFC90 80242FC0 44811000 */ mtc1 $at, $f2 -/* DCFC94 80242FC4 24020001 */ addiu $v0, $zero, 1 -/* DCFC98 80242FC8 E6040014 */ swc1 $f4, 0x14($s0) -/* DCFC9C 80242FCC E602001C */ swc1 $f2, 0x1c($s0) -/* DCFCA0 80242FD0 46200020 */ cvt.s.d $f0, $f0 -/* DCFCA4 80242FD4 E6000018 */ swc1 $f0, 0x18($s0) -/* DCFCA8 80242FD8 AE620070 */ sw $v0, 0x70($s3) -.L80242FDC: -/* DCFCAC 80242FDC C6000038 */ lwc1 $f0, 0x38($s0) -/* DCFCB0 80242FE0 C602003C */ lwc1 $f2, 0x3c($s0) -/* DCFCB4 80242FE4 C6040040 */ lwc1 $f4, 0x40($s0) -/* DCFCB8 80242FE8 C6060018 */ lwc1 $f6, 0x18($s0) -/* DCFCBC 80242FEC 0000202D */ daddu $a0, $zero, $zero -/* DCFCC0 80242FF0 E7A00020 */ swc1 $f0, 0x20($sp) -/* DCFCC4 80242FF4 E7A20024 */ swc1 $f2, 0x24($sp) -/* DCFCC8 80242FF8 E7A40028 */ swc1 $f4, 0x28($sp) -/* DCFCCC 80242FFC E7A60010 */ swc1 $f6, 0x10($sp) -/* DCFCD0 80243000 C600000C */ lwc1 $f0, 0xc($s0) -/* DCFCD4 80243004 27A50020 */ addiu $a1, $sp, 0x20 -/* DCFCD8 80243008 E7A00014 */ swc1 $f0, 0x14($sp) -/* DCFCDC 8024300C 860200A6 */ lh $v0, 0xa6($s0) -/* DCFCE0 80243010 27A60024 */ addiu $a2, $sp, 0x24 -/* DCFCE4 80243014 44820000 */ mtc1 $v0, $f0 -/* DCFCE8 80243018 00000000 */ nop -/* DCFCEC 8024301C 46800020 */ cvt.s.w $f0, $f0 -/* DCFCF0 80243020 E7A00018 */ swc1 $f0, 0x18($sp) -/* DCFCF4 80243024 860200A8 */ lh $v0, 0xa8($s0) -/* DCFCF8 80243028 27A70028 */ addiu $a3, $sp, 0x28 -/* DCFCFC 8024302C 44820000 */ mtc1 $v0, $f0 -/* DCFD00 80243030 00000000 */ nop -/* DCFD04 80243034 46800020 */ cvt.s.w $f0, $f0 -/* DCFD08 80243038 0C037711 */ jal func_800DDC44 -/* DCFD0C 8024303C E7A0001C */ swc1 $f0, 0x1c($sp) -/* DCFD10 80243040 54400007 */ bnel $v0, $zero, .L80243060 -/* DCFD14 80243044 24140001 */ addiu $s4, $zero, 1 -/* DCFD18 80243048 8E050018 */ lw $a1, 0x18($s0) -/* DCFD1C 8024304C 8E06000C */ lw $a2, 0xc($s0) -/* DCFD20 80243050 0C00EA95 */ jal npc_move_heading -/* DCFD24 80243054 0200202D */ daddu $a0, $s0, $zero -/* DCFD28 80243058 08090C19 */ j .L80243064 -/* DCFD2C 8024305C 0000902D */ daddu $s2, $zero, $zero -.L80243060: -/* DCFD30 80243060 0000902D */ daddu $s2, $zero, $zero -.L80243064: -/* DCFD34 80243064 C600001C */ lwc1 $f0, 0x1c($s0) -/* DCFD38 80243068 44801000 */ mtc1 $zero, $f2 -/* DCFD3C 8024306C 44801800 */ mtc1 $zero, $f3 -/* DCFD40 80243070 46000021 */ cvt.d.s $f0, $f0 -/* DCFD44 80243074 4622003C */ c.lt.d $f0, $f2 -/* DCFD48 80243078 00000000 */ nop -/* DCFD4C 8024307C 45000028 */ bc1f .L80243120 -/* DCFD50 80243080 27A50020 */ addiu $a1, $sp, 0x20 -/* DCFD54 80243084 27A60024 */ addiu $a2, $sp, 0x24 -/* DCFD58 80243088 27A2002C */ addiu $v0, $sp, 0x2c -/* DCFD5C 8024308C C602003C */ lwc1 $f2, 0x3c($s0) -/* DCFD60 80243090 C6060038 */ lwc1 $f6, 0x38($s0) -/* DCFD64 80243094 3C01402A */ lui $at, 0x402a -/* DCFD68 80243098 4481A800 */ mtc1 $at, $f21 -/* DCFD6C 8024309C 4480A000 */ mtc1 $zero, $f20 -/* DCFD70 802430A0 460010A1 */ cvt.d.s $f2, $f2 -/* DCFD74 802430A4 46341080 */ add.d $f2, $f2, $f20 -/* DCFD78 802430A8 C600001C */ lwc1 $f0, 0x1c($s0) -/* DCFD7C 802430AC C6040040 */ lwc1 $f4, 0x40($s0) -/* DCFD80 802430B0 46000005 */ abs.s $f0, $f0 -/* DCFD84 802430B4 E7A40028 */ swc1 $f4, 0x28($sp) -/* DCFD88 802430B8 3C014030 */ lui $at, 0x4030 -/* DCFD8C 802430BC 44812800 */ mtc1 $at, $f5 -/* DCFD90 802430C0 44802000 */ mtc1 $zero, $f4 -/* DCFD94 802430C4 46000021 */ cvt.d.s $f0, $f0 -/* DCFD98 802430C8 E7A60020 */ swc1 $f6, 0x20($sp) -/* DCFD9C 802430CC 46240000 */ add.d $f0, $f0, $f4 -/* DCFDA0 802430D0 462010A0 */ cvt.s.d $f2, $f2 -/* DCFDA4 802430D4 E7A20024 */ swc1 $f2, 0x24($sp) -/* DCFDA8 802430D8 46200020 */ cvt.s.d $f0, $f0 -/* DCFDAC 802430DC E7A0002C */ swc1 $f0, 0x2c($sp) -/* DCFDB0 802430E0 AFA20010 */ sw $v0, 0x10($sp) -/* DCFDB4 802430E4 8E040080 */ lw $a0, 0x80($s0) -/* DCFDB8 802430E8 0C0372DF */ jal func_800DCB7C -/* DCFDBC 802430EC 27A70028 */ addiu $a3, $sp, 0x28 -/* DCFDC0 802430F0 1040000B */ beqz $v0, .L80243120 -/* DCFDC4 802430F4 00000000 */ nop -/* DCFDC8 802430F8 C600001C */ lwc1 $f0, 0x1c($s0) -/* DCFDCC 802430FC C7A2002C */ lwc1 $f2, 0x2c($sp) -/* DCFDD0 80243100 46000005 */ abs.s $f0, $f0 -/* DCFDD4 80243104 46000021 */ cvt.d.s $f0, $f0 -/* DCFDD8 80243108 46340000 */ add.d $f0, $f0, $f20 -/* DCFDDC 8024310C 460010A1 */ cvt.d.s $f2, $f2 -/* DCFDE0 80243110 4620103E */ c.le.d $f2, $f0 -/* DCFDE4 80243114 00000000 */ nop -/* DCFDE8 80243118 45030001 */ bc1tl .L80243120 -/* DCFDEC 8024311C 24120001 */ addiu $s2, $zero, 1 -.L80243120: -/* DCFDF0 80243120 56400008 */ bnel $s2, $zero, .L80243144 -/* DCFDF4 80243124 2414000A */ addiu $s4, $zero, 0xa -/* DCFDF8 80243128 C604003C */ lwc1 $f4, 0x3c($s0) -/* DCFDFC 8024312C C600001C */ lwc1 $f0, 0x1c($s0) -/* DCFE00 80243130 46002100 */ add.s $f4, $f4, $f0 -/* DCFE04 80243134 C6020014 */ lwc1 $f2, 0x14($s0) -/* DCFE08 80243138 46020001 */ sub.s $f0, $f0, $f2 -/* DCFE0C 8024313C E604003C */ swc1 $f4, 0x3c($s0) -/* DCFE10 80243140 E600001C */ swc1 $f0, 0x1c($s0) -.L80243144: -/* DCFE14 80243144 9602008E */ lhu $v0, 0x8e($s0) -/* DCFE18 80243148 2442FFFF */ addiu $v0, $v0, -1 -/* DCFE1C 8024314C A602008E */ sh $v0, 0x8e($s0) -/* DCFE20 80243150 00021400 */ sll $v0, $v0, 0x10 -/* DCFE24 80243154 58400001 */ blezl $v0, .L8024315C -/* DCFE28 80243158 2414000B */ addiu $s4, $zero, 0xb -.L8024315C: -/* DCFE2C 8024315C 12800024 */ beqz $s4, .L802431F0 -/* DCFE30 80243160 00000000 */ nop -/* DCFE34 80243164 AFA00010 */ sw $zero, 0x10($sp) -/* DCFE38 80243168 AFA00014 */ sw $zero, 0x14($sp) -/* DCFE3C 8024316C 8E050038 */ lw $a1, 0x38($s0) -/* DCFE40 80243170 8E06003C */ lw $a2, 0x3c($s0) -/* DCFE44 80243174 8E070040 */ lw $a3, 0x40($s0) -/* DCFE48 80243178 0C01BECC */ jal fx_walk_normal -/* DCFE4C 8024317C 24040002 */ addiu $a0, $zero, 2 -/* DCFE50 80243180 3C01C47A */ lui $at, 0xc47a -/* DCFE54 80243184 44810000 */ mtc1 $at, $f0 -/* DCFE58 80243188 AE20006C */ sw $zero, 0x6c($s1) -/* DCFE5C 8024318C 8E020000 */ lw $v0, ($s0) -/* DCFE60 80243190 0200202D */ daddu $a0, $s0, $zero -/* DCFE64 80243194 AE000038 */ sw $zero, 0x38($s0) -/* DCFE68 80243198 AE000040 */ sw $zero, 0x40($s0) -/* DCFE6C 8024319C 34420002 */ ori $v0, $v0, 2 -/* DCFE70 802431A0 E600003C */ swc1 $f0, 0x3c($s0) -/* DCFE74 802431A4 0C00EAFF */ jal disable_npc_shadow -/* DCFE78 802431A8 AE020000 */ sw $v0, ($s0) -/* DCFE7C 802431AC 0260202D */ daddu $a0, $s3, $zero -/* DCFE80 802431B0 3C05FE36 */ lui $a1, 0xfe36 -/* DCFE84 802431B4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DCFE88 802431B8 24060001 */ addiu $a2, $zero, 1 -/* DCFE8C 802431BC 8E020000 */ lw $v0, ($s0) -/* DCFE90 802431C0 2403F7FF */ addiu $v1, $zero, -0x801 -/* DCFE94 802431C4 00431024 */ and $v0, $v0, $v1 -/* DCFE98 802431C8 AE020000 */ sw $v0, ($s0) -/* DCFE9C 802431CC 8E220000 */ lw $v0, ($s1) -/* DCFEA0 802431D0 3C031F00 */ lui $v1, 0x1f00 -/* DCFEA4 802431D4 00431025 */ or $v0, $v0, $v1 -/* DCFEA8 802431D8 AE220000 */ sw $v0, ($s1) -/* DCFEAC 802431DC AC800070 */ sw $zero, 0x70($a0) -.L802431E0: -/* DCFEB0 802431E0 0C0B2026 */ jal set_variable -/* DCFEB4 802431E4 00000000 */ nop -/* DCFEB8 802431E8 08090C88 */ j .L80243220 -/* DCFEBC 802431EC 24020002 */ addiu $v0, $zero, 2 -.L802431F0: -/* DCFEC0 802431F0 8E220070 */ lw $v0, 0x70($s1) -/* DCFEC4 802431F4 30420001 */ andi $v0, $v0, 1 -/* DCFEC8 802431F8 10400009 */ beqz $v0, .L80243220 -/* DCFECC 802431FC 0000102D */ daddu $v0, $zero, $zero -/* DCFED0 80243200 C600004C */ lwc1 $f0, 0x4c($s0) -/* DCFED4 80243204 3C01404E */ lui $at, 0x404e -/* DCFED8 80243208 44811800 */ mtc1 $at, $f3 -/* DCFEDC 8024320C 44801000 */ mtc1 $zero, $f2 -/* DCFEE0 80243210 46000021 */ cvt.d.s $f0, $f0 -/* DCFEE4 80243214 46220000 */ add.d $f0, $f0, $f2 -/* DCFEE8 80243218 46200020 */ cvt.s.d $f0, $f0 -/* DCFEEC 8024321C E600004C */ swc1 $f0, 0x4c($s0) -.L80243220: -/* DCFEF0 80243220 8FBF0044 */ lw $ra, 0x44($sp) -/* DCFEF4 80243224 8FB40040 */ lw $s4, 0x40($sp) -/* DCFEF8 80243228 8FB3003C */ lw $s3, 0x3c($sp) -/* DCFEFC 8024322C 8FB20038 */ lw $s2, 0x38($sp) -/* DCFF00 80243230 8FB10034 */ lw $s1, 0x34($sp) -/* DCFF04 80243234 8FB00030 */ lw $s0, 0x30($sp) -/* DCFF08 80243238 D7B80058 */ ldc1 $f24, 0x58($sp) -/* DCFF0C 8024323C D7B60050 */ ldc1 $f22, 0x50($sp) -/* DCFF10 80243240 D7B40048 */ ldc1 $f20, 0x48($sp) -/* DCFF14 80243244 03E00008 */ jr $ra -/* DCFF18 80243248 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s new file mode 100644 index 0000000000..ab8c55b01f --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80242DF0_DCFAC0.s @@ -0,0 +1,298 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242DF0_DCFAC0 +/* DCFAC0 80242DF0 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* DCFAC4 80242DF4 AFB3003C */ sw $s3, 0x3c($sp) +/* DCFAC8 80242DF8 0080982D */ daddu $s3, $a0, $zero +/* DCFACC 80242DFC AFB40040 */ sw $s4, 0x40($sp) +/* DCFAD0 80242E00 0000A02D */ daddu $s4, $zero, $zero +/* DCFAD4 80242E04 3C03800A */ lui $v1, 0x800a +/* DCFAD8 80242E08 8463A634 */ lh $v1, -0x59cc($v1) +/* DCFADC 80242E0C 3C04800B */ lui $a0, %hi(gCameras) +/* DCFAE0 80242E10 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* DCFAE4 80242E14 AFBF0044 */ sw $ra, 0x44($sp) +/* DCFAE8 80242E18 AFB20038 */ sw $s2, 0x38($sp) +/* DCFAEC 80242E1C AFB10034 */ sw $s1, 0x34($sp) +/* DCFAF0 80242E20 AFB00030 */ sw $s0, 0x30($sp) +/* DCFAF4 80242E24 F7B80058 */ sdc1 $f24, 0x58($sp) +/* DCFAF8 80242E28 F7B60050 */ sdc1 $f22, 0x50($sp) +/* DCFAFC 80242E2C F7B40048 */ sdc1 $f20, 0x48($sp) +/* DCFB00 80242E30 8E710148 */ lw $s1, 0x148($s3) +/* DCFB04 80242E34 00031080 */ sll $v0, $v1, 2 +/* DCFB08 80242E38 00431021 */ addu $v0, $v0, $v1 +/* DCFB0C 80242E3C 00021080 */ sll $v0, $v0, 2 +/* DCFB10 80242E40 00431023 */ subu $v0, $v0, $v1 +/* DCFB14 80242E44 000218C0 */ sll $v1, $v0, 3 +/* DCFB18 80242E48 00431021 */ addu $v0, $v0, $v1 +/* DCFB1C 80242E4C 000210C0 */ sll $v0, $v0, 3 +/* DCFB20 80242E50 10A00002 */ beqz $a1, .L80242E5C +/* DCFB24 80242E54 00449021 */ addu $s2, $v0, $a0 +/* DCFB28 80242E58 AE600070 */ sw $zero, 0x70($s3) +.L80242E5C: +/* DCFB2C 80242E5C 0C00FB5A */ jal get_enemy_safe +/* DCFB30 80242E60 86240008 */ lh $a0, 8($s1) +/* DCFB34 80242E64 14400006 */ bnez $v0, .L80242E80 +/* DCFB38 80242E68 24020005 */ addiu $v0, $zero, 5 +/* DCFB3C 80242E6C 0260202D */ daddu $a0, $s3, $zero +/* DCFB40 80242E70 3C05FE36 */ lui $a1, 0xfe36 +/* DCFB44 80242E74 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DCFB48 80242E78 08090C78 */ j .L802431E0 +/* DCFB4C 80242E7C 0000302D */ daddu $a2, $zero, $zero +.L80242E80: +/* DCFB50 80242E80 8E23006C */ lw $v1, 0x6c($s1) +/* DCFB54 80242E84 14620005 */ bne $v1, $v0, .L80242E9C +/* DCFB58 80242E88 0260202D */ daddu $a0, $s3, $zero +/* DCFB5C 80242E8C 3C05FE36 */ lui $a1, 0xfe36 +/* DCFB60 80242E90 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DCFB64 80242E94 08090C78 */ j .L802431E0 +/* DCFB68 80242E98 0000302D */ daddu $a2, $zero, $zero +.L80242E9C: +/* DCFB6C 80242E9C 86240008 */ lh $a0, 8($s1) +/* DCFB70 80242EA0 0C00FB5A */ jal get_enemy_safe +/* DCFB74 80242EA4 00000000 */ nop +/* DCFB78 80242EA8 14400005 */ bnez $v0, .L80242EC0 +/* DCFB7C 80242EAC 0260202D */ daddu $a0, $s3, $zero +/* DCFB80 80242EB0 3C05FE36 */ lui $a1, 0xfe36 +/* DCFB84 80242EB4 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DCFB88 80242EB8 08090C78 */ j .L802431E0 +/* DCFB8C 80242EBC 0000302D */ daddu $a2, $zero, $zero +.L80242EC0: +/* DCFB90 80242EC0 86240008 */ lh $a0, 8($s1) +/* DCFB94 80242EC4 0C00EABB */ jal get_npc_unsafe +/* DCFB98 80242EC8 00000000 */ nop +/* DCFB9C 80242ECC 8E630070 */ lw $v1, 0x70($s3) +/* DCFBA0 80242ED0 10600006 */ beqz $v1, .L80242EEC +/* DCFBA4 80242ED4 0040802D */ daddu $s0, $v0, $zero +/* DCFBA8 80242ED8 24020001 */ addiu $v0, $zero, 1 +/* DCFBAC 80242EDC 1062003F */ beq $v1, $v0, .L80242FDC +/* DCFBB0 80242EE0 0000102D */ daddu $v0, $zero, $zero +/* DCFBB4 80242EE4 08090C88 */ j .L80243220 +/* DCFBB8 80242EE8 00000000 */ nop +.L80242EEC: +/* DCFBBC 80242EEC AFA00010 */ sw $zero, 0x10($sp) +/* DCFBC0 80242EF0 AFA00014 */ sw $zero, 0x14($sp) +/* DCFBC4 80242EF4 8E050038 */ lw $a1, 0x38($s0) +/* DCFBC8 80242EF8 8E06003C */ lw $a2, 0x3c($s0) +/* DCFBCC 80242EFC 8E070040 */ lw $a3, 0x40($s0) +/* DCFBD0 80242F00 0C01BECC */ jal fx_walk_normal +/* DCFBD4 80242F04 24040002 */ addiu $a0, $zero, 2 +/* DCFBD8 80242F08 C64C006C */ lwc1 $f12, 0x6c($s2) +/* DCFBDC 80242F0C 0C00A6C9 */ jal clamp_angle +/* DCFBE0 80242F10 00000000 */ nop +/* DCFBE4 80242F14 3C018025 */ lui $at, 0x8025 +/* DCFBE8 80242F18 D438AB20 */ ldc1 $f24, -0x54e0($at) +/* DCFBEC 80242F1C 46000521 */ cvt.d.s $f20, $f0 +/* DCFBF0 80242F20 4638A300 */ add.d $f12, $f20, $f24 +/* DCFBF4 80242F24 3C018025 */ lui $at, 0x8025 +/* DCFBF8 80242F28 D436AB28 */ ldc1 $f22, -0x54d8($at) +/* DCFBFC 80242F2C 0C00A6C9 */ jal clamp_angle +/* DCFC00 80242F30 46206320 */ cvt.s.d $f12, $f12 +/* DCFC04 80242F34 4636A500 */ add.d $f20, $f20, $f22 +/* DCFC08 80242F38 4620A320 */ cvt.s.d $f12, $f20 +/* DCFC0C 80242F3C 0C00A6C9 */ jal clamp_angle +/* DCFC10 80242F40 46000506 */ mov.s $f20, $f0 +/* DCFC14 80242F44 4600A521 */ cvt.d.s $f20, $f20 +/* DCFC18 80242F48 4636A500 */ add.d $f20, $f20, $f22 +/* DCFC1C 80242F4C 46000586 */ mov.s $f22, $f0 +/* DCFC20 80242F50 0C00A6C9 */ jal clamp_angle +/* DCFC24 80242F54 4620A320 */ cvt.s.d $f12, $f20 +/* DCFC28 80242F58 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DCFC2C 80242F5C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DCFC30 80242F60 C64C006C */ lwc1 $f12, 0x6c($s2) +/* DCFC34 80242F64 C44E0084 */ lwc1 $f14, 0x84($v0) +/* DCFC38 80242F68 0C00A70A */ jal get_clamped_angle_diff +/* DCFC3C 80242F6C 46000506 */ mov.s $f20, $f0 +/* DCFC40 80242F70 0C00A6C9 */ jal clamp_angle +/* DCFC44 80242F74 46000306 */ mov.s $f12, $f0 +/* DCFC48 80242F78 46000021 */ cvt.d.s $f0, $f0 +/* DCFC4C 80242F7C 4638003C */ c.lt.d $f0, $f24 +/* DCFC50 80242F80 00000000 */ nop +/* DCFC54 80242F84 45020002 */ bc1fl .L80242F90 +/* DCFC58 80242F88 E614000C */ swc1 $f20, 0xc($s0) +/* DCFC5C 80242F8C E616000C */ swc1 $f22, 0xc($s0) +.L80242F90: +/* DCFC60 80242F90 C6000018 */ lwc1 $f0, 0x18($s0) +/* DCFC64 80242F94 3C018025 */ lui $at, 0x8025 +/* DCFC68 80242F98 D422AB30 */ ldc1 $f2, -0x54d0($at) +/* DCFC6C 80242F9C 46000021 */ cvt.d.s $f0, $f0 +/* DCFC70 80242FA0 46220002 */ mul.d $f0, $f0, $f2 +/* DCFC74 80242FA4 00000000 */ nop +/* DCFC78 80242FA8 3C013F66 */ lui $at, 0x3f66 +/* DCFC7C 80242FAC 34216666 */ ori $at, $at, 0x6666 +/* DCFC80 80242FB0 44812000 */ mtc1 $at, $f4 +/* DCFC84 80242FB4 2402001E */ addiu $v0, $zero, 0x1e +/* DCFC88 80242FB8 A602008E */ sh $v0, 0x8e($s0) +/* DCFC8C 80242FBC 3C014120 */ lui $at, 0x4120 +/* DCFC90 80242FC0 44811000 */ mtc1 $at, $f2 +/* DCFC94 80242FC4 24020001 */ addiu $v0, $zero, 1 +/* DCFC98 80242FC8 E6040014 */ swc1 $f4, 0x14($s0) +/* DCFC9C 80242FCC E602001C */ swc1 $f2, 0x1c($s0) +/* DCFCA0 80242FD0 46200020 */ cvt.s.d $f0, $f0 +/* DCFCA4 80242FD4 E6000018 */ swc1 $f0, 0x18($s0) +/* DCFCA8 80242FD8 AE620070 */ sw $v0, 0x70($s3) +.L80242FDC: +/* DCFCAC 80242FDC C6000038 */ lwc1 $f0, 0x38($s0) +/* DCFCB0 80242FE0 C602003C */ lwc1 $f2, 0x3c($s0) +/* DCFCB4 80242FE4 C6040040 */ lwc1 $f4, 0x40($s0) +/* DCFCB8 80242FE8 C6060018 */ lwc1 $f6, 0x18($s0) +/* DCFCBC 80242FEC 0000202D */ daddu $a0, $zero, $zero +/* DCFCC0 80242FF0 E7A00020 */ swc1 $f0, 0x20($sp) +/* DCFCC4 80242FF4 E7A20024 */ swc1 $f2, 0x24($sp) +/* DCFCC8 80242FF8 E7A40028 */ swc1 $f4, 0x28($sp) +/* DCFCCC 80242FFC E7A60010 */ swc1 $f6, 0x10($sp) +/* DCFCD0 80243000 C600000C */ lwc1 $f0, 0xc($s0) +/* DCFCD4 80243004 27A50020 */ addiu $a1, $sp, 0x20 +/* DCFCD8 80243008 E7A00014 */ swc1 $f0, 0x14($sp) +/* DCFCDC 8024300C 860200A6 */ lh $v0, 0xa6($s0) +/* DCFCE0 80243010 27A60024 */ addiu $a2, $sp, 0x24 +/* DCFCE4 80243014 44820000 */ mtc1 $v0, $f0 +/* DCFCE8 80243018 00000000 */ nop +/* DCFCEC 8024301C 46800020 */ cvt.s.w $f0, $f0 +/* DCFCF0 80243020 E7A00018 */ swc1 $f0, 0x18($sp) +/* DCFCF4 80243024 860200A8 */ lh $v0, 0xa8($s0) +/* DCFCF8 80243028 27A70028 */ addiu $a3, $sp, 0x28 +/* DCFCFC 8024302C 44820000 */ mtc1 $v0, $f0 +/* DCFD00 80243030 00000000 */ nop +/* DCFD04 80243034 46800020 */ cvt.s.w $f0, $f0 +/* DCFD08 80243038 0C037711 */ jal func_800DDC44 +/* DCFD0C 8024303C E7A0001C */ swc1 $f0, 0x1c($sp) +/* DCFD10 80243040 54400007 */ bnel $v0, $zero, .L80243060 +/* DCFD14 80243044 24140001 */ addiu $s4, $zero, 1 +/* DCFD18 80243048 8E050018 */ lw $a1, 0x18($s0) +/* DCFD1C 8024304C 8E06000C */ lw $a2, 0xc($s0) +/* DCFD20 80243050 0C00EA95 */ jal npc_move_heading +/* DCFD24 80243054 0200202D */ daddu $a0, $s0, $zero +/* DCFD28 80243058 08090C19 */ j .L80243064 +/* DCFD2C 8024305C 0000902D */ daddu $s2, $zero, $zero +.L80243060: +/* DCFD30 80243060 0000902D */ daddu $s2, $zero, $zero +.L80243064: +/* DCFD34 80243064 C600001C */ lwc1 $f0, 0x1c($s0) +/* DCFD38 80243068 44801000 */ mtc1 $zero, $f2 +/* DCFD3C 8024306C 44801800 */ mtc1 $zero, $f3 +/* DCFD40 80243070 46000021 */ cvt.d.s $f0, $f0 +/* DCFD44 80243074 4622003C */ c.lt.d $f0, $f2 +/* DCFD48 80243078 00000000 */ nop +/* DCFD4C 8024307C 45000028 */ bc1f .L80243120 +/* DCFD50 80243080 27A50020 */ addiu $a1, $sp, 0x20 +/* DCFD54 80243084 27A60024 */ addiu $a2, $sp, 0x24 +/* DCFD58 80243088 27A2002C */ addiu $v0, $sp, 0x2c +/* DCFD5C 8024308C C602003C */ lwc1 $f2, 0x3c($s0) +/* DCFD60 80243090 C6060038 */ lwc1 $f6, 0x38($s0) +/* DCFD64 80243094 3C01402A */ lui $at, 0x402a +/* DCFD68 80243098 4481A800 */ mtc1 $at, $f21 +/* DCFD6C 8024309C 4480A000 */ mtc1 $zero, $f20 +/* DCFD70 802430A0 460010A1 */ cvt.d.s $f2, $f2 +/* DCFD74 802430A4 46341080 */ add.d $f2, $f2, $f20 +/* DCFD78 802430A8 C600001C */ lwc1 $f0, 0x1c($s0) +/* DCFD7C 802430AC C6040040 */ lwc1 $f4, 0x40($s0) +/* DCFD80 802430B0 46000005 */ abs.s $f0, $f0 +/* DCFD84 802430B4 E7A40028 */ swc1 $f4, 0x28($sp) +/* DCFD88 802430B8 3C014030 */ lui $at, 0x4030 +/* DCFD8C 802430BC 44812800 */ mtc1 $at, $f5 +/* DCFD90 802430C0 44802000 */ mtc1 $zero, $f4 +/* DCFD94 802430C4 46000021 */ cvt.d.s $f0, $f0 +/* DCFD98 802430C8 E7A60020 */ swc1 $f6, 0x20($sp) +/* DCFD9C 802430CC 46240000 */ add.d $f0, $f0, $f4 +/* DCFDA0 802430D0 462010A0 */ cvt.s.d $f2, $f2 +/* DCFDA4 802430D4 E7A20024 */ swc1 $f2, 0x24($sp) +/* DCFDA8 802430D8 46200020 */ cvt.s.d $f0, $f0 +/* DCFDAC 802430DC E7A0002C */ swc1 $f0, 0x2c($sp) +/* DCFDB0 802430E0 AFA20010 */ sw $v0, 0x10($sp) +/* DCFDB4 802430E4 8E040080 */ lw $a0, 0x80($s0) +/* DCFDB8 802430E8 0C0372DF */ jal func_800DCB7C +/* DCFDBC 802430EC 27A70028 */ addiu $a3, $sp, 0x28 +/* DCFDC0 802430F0 1040000B */ beqz $v0, .L80243120 +/* DCFDC4 802430F4 00000000 */ nop +/* DCFDC8 802430F8 C600001C */ lwc1 $f0, 0x1c($s0) +/* DCFDCC 802430FC C7A2002C */ lwc1 $f2, 0x2c($sp) +/* DCFDD0 80243100 46000005 */ abs.s $f0, $f0 +/* DCFDD4 80243104 46000021 */ cvt.d.s $f0, $f0 +/* DCFDD8 80243108 46340000 */ add.d $f0, $f0, $f20 +/* DCFDDC 8024310C 460010A1 */ cvt.d.s $f2, $f2 +/* DCFDE0 80243110 4620103E */ c.le.d $f2, $f0 +/* DCFDE4 80243114 00000000 */ nop +/* DCFDE8 80243118 45030001 */ bc1tl .L80243120 +/* DCFDEC 8024311C 24120001 */ addiu $s2, $zero, 1 +.L80243120: +/* DCFDF0 80243120 56400008 */ bnel $s2, $zero, .L80243144 +/* DCFDF4 80243124 2414000A */ addiu $s4, $zero, 0xa +/* DCFDF8 80243128 C604003C */ lwc1 $f4, 0x3c($s0) +/* DCFDFC 8024312C C600001C */ lwc1 $f0, 0x1c($s0) +/* DCFE00 80243130 46002100 */ add.s $f4, $f4, $f0 +/* DCFE04 80243134 C6020014 */ lwc1 $f2, 0x14($s0) +/* DCFE08 80243138 46020001 */ sub.s $f0, $f0, $f2 +/* DCFE0C 8024313C E604003C */ swc1 $f4, 0x3c($s0) +/* DCFE10 80243140 E600001C */ swc1 $f0, 0x1c($s0) +.L80243144: +/* DCFE14 80243144 9602008E */ lhu $v0, 0x8e($s0) +/* DCFE18 80243148 2442FFFF */ addiu $v0, $v0, -1 +/* DCFE1C 8024314C A602008E */ sh $v0, 0x8e($s0) +/* DCFE20 80243150 00021400 */ sll $v0, $v0, 0x10 +/* DCFE24 80243154 58400001 */ blezl $v0, .L8024315C +/* DCFE28 80243158 2414000B */ addiu $s4, $zero, 0xb +.L8024315C: +/* DCFE2C 8024315C 12800024 */ beqz $s4, .L802431F0 +/* DCFE30 80243160 00000000 */ nop +/* DCFE34 80243164 AFA00010 */ sw $zero, 0x10($sp) +/* DCFE38 80243168 AFA00014 */ sw $zero, 0x14($sp) +/* DCFE3C 8024316C 8E050038 */ lw $a1, 0x38($s0) +/* DCFE40 80243170 8E06003C */ lw $a2, 0x3c($s0) +/* DCFE44 80243174 8E070040 */ lw $a3, 0x40($s0) +/* DCFE48 80243178 0C01BECC */ jal fx_walk_normal +/* DCFE4C 8024317C 24040002 */ addiu $a0, $zero, 2 +/* DCFE50 80243180 3C01C47A */ lui $at, 0xc47a +/* DCFE54 80243184 44810000 */ mtc1 $at, $f0 +/* DCFE58 80243188 AE20006C */ sw $zero, 0x6c($s1) +/* DCFE5C 8024318C 8E020000 */ lw $v0, ($s0) +/* DCFE60 80243190 0200202D */ daddu $a0, $s0, $zero +/* DCFE64 80243194 AE000038 */ sw $zero, 0x38($s0) +/* DCFE68 80243198 AE000040 */ sw $zero, 0x40($s0) +/* DCFE6C 8024319C 34420002 */ ori $v0, $v0, 2 +/* DCFE70 802431A0 E600003C */ swc1 $f0, 0x3c($s0) +/* DCFE74 802431A4 0C00EAFF */ jal disable_npc_shadow +/* DCFE78 802431A8 AE020000 */ sw $v0, ($s0) +/* DCFE7C 802431AC 0260202D */ daddu $a0, $s3, $zero +/* DCFE80 802431B0 3C05FE36 */ lui $a1, 0xfe36 +/* DCFE84 802431B4 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DCFE88 802431B8 24060001 */ addiu $a2, $zero, 1 +/* DCFE8C 802431BC 8E020000 */ lw $v0, ($s0) +/* DCFE90 802431C0 2403F7FF */ addiu $v1, $zero, -0x801 +/* DCFE94 802431C4 00431024 */ and $v0, $v0, $v1 +/* DCFE98 802431C8 AE020000 */ sw $v0, ($s0) +/* DCFE9C 802431CC 8E220000 */ lw $v0, ($s1) +/* DCFEA0 802431D0 3C031F00 */ lui $v1, 0x1f00 +/* DCFEA4 802431D4 00431025 */ or $v0, $v0, $v1 +/* DCFEA8 802431D8 AE220000 */ sw $v0, ($s1) +/* DCFEAC 802431DC AC800070 */ sw $zero, 0x70($a0) +.L802431E0: +/* DCFEB0 802431E0 0C0B2026 */ jal set_variable +/* DCFEB4 802431E4 00000000 */ nop +/* DCFEB8 802431E8 08090C88 */ j .L80243220 +/* DCFEBC 802431EC 24020002 */ addiu $v0, $zero, 2 +.L802431F0: +/* DCFEC0 802431F0 8E220070 */ lw $v0, 0x70($s1) +/* DCFEC4 802431F4 30420001 */ andi $v0, $v0, 1 +/* DCFEC8 802431F8 10400009 */ beqz $v0, .L80243220 +/* DCFECC 802431FC 0000102D */ daddu $v0, $zero, $zero +/* DCFED0 80243200 C600004C */ lwc1 $f0, 0x4c($s0) +/* DCFED4 80243204 3C01404E */ lui $at, 0x404e +/* DCFED8 80243208 44811800 */ mtc1 $at, $f3 +/* DCFEDC 8024320C 44801000 */ mtc1 $zero, $f2 +/* DCFEE0 80243210 46000021 */ cvt.d.s $f0, $f0 +/* DCFEE4 80243214 46220000 */ add.d $f0, $f0, $f2 +/* DCFEE8 80243218 46200020 */ cvt.s.d $f0, $f0 +/* DCFEEC 8024321C E600004C */ swc1 $f0, 0x4c($s0) +.L80243220: +/* DCFEF0 80243220 8FBF0044 */ lw $ra, 0x44($sp) +/* DCFEF4 80243224 8FB40040 */ lw $s4, 0x40($sp) +/* DCFEF8 80243228 8FB3003C */ lw $s3, 0x3c($sp) +/* DCFEFC 8024322C 8FB20038 */ lw $s2, 0x38($sp) +/* DCFF00 80243230 8FB10034 */ lw $s1, 0x34($sp) +/* DCFF04 80243234 8FB00030 */ lw $s0, 0x30($sp) +/* DCFF08 80243238 D7B80058 */ ldc1 $f24, 0x58($sp) +/* DCFF0C 8024323C D7B60050 */ ldc1 $f22, 0x50($sp) +/* DCFF10 80243240 D7B40048 */ ldc1 $f20, 0x48($sp) +/* DCFF14 80243244 03E00008 */ jr $ra +/* DCFF18 80243248 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C.s deleted file mode 100644 index 849e90f196..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024324C -/* DCFF1C 8024324C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DCFF20 80243250 AFB3003C */ sw $s3, 0x3c($sp) -/* DCFF24 80243254 0080982D */ daddu $s3, $a0, $zero -/* DCFF28 80243258 AFBF0048 */ sw $ra, 0x48($sp) -/* DCFF2C 8024325C AFB50044 */ sw $s5, 0x44($sp) -/* DCFF30 80243260 AFB40040 */ sw $s4, 0x40($sp) -/* DCFF34 80243264 AFB20038 */ sw $s2, 0x38($sp) -/* DCFF38 80243268 AFB10034 */ sw $s1, 0x34($sp) -/* DCFF3C 8024326C AFB00030 */ sw $s0, 0x30($sp) -/* DCFF40 80243270 8E720148 */ lw $s2, 0x148($s3) -/* DCFF44 80243274 86440008 */ lh $a0, 8($s2) -/* DCFF48 80243278 8E70000C */ lw $s0, 0xc($s3) -/* DCFF4C 8024327C 0C00EABB */ jal get_npc_unsafe -/* DCFF50 80243280 00A0882D */ daddu $s1, $a1, $zero -/* DCFF54 80243284 0260202D */ daddu $a0, $s3, $zero -/* DCFF58 80243288 8E050000 */ lw $a1, ($s0) -/* DCFF5C 8024328C 0C0B1EAF */ jal get_variable -/* DCFF60 80243290 0040A02D */ daddu $s4, $v0, $zero -/* DCFF64 80243294 AFA00010 */ sw $zero, 0x10($sp) -/* DCFF68 80243298 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFF6C 8024329C 8C630030 */ lw $v1, 0x30($v1) -/* DCFF70 802432A0 AFA30014 */ sw $v1, 0x14($sp) -/* DCFF74 802432A4 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFF78 802432A8 8C63001C */ lw $v1, 0x1c($v1) -/* DCFF7C 802432AC AFA30018 */ sw $v1, 0x18($sp) -/* DCFF80 802432B0 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFF84 802432B4 8C630024 */ lw $v1, 0x24($v1) -/* DCFF88 802432B8 AFA3001C */ sw $v1, 0x1c($sp) -/* DCFF8C 802432BC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFF90 802432C0 8C630028 */ lw $v1, 0x28($v1) -/* DCFF94 802432C4 27B50010 */ addiu $s5, $sp, 0x10 -/* DCFF98 802432C8 AFA30020 */ sw $v1, 0x20($sp) -/* DCFF9C 802432CC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DCFFA0 802432D0 3C014220 */ lui $at, 0x4220 -/* DCFFA4 802432D4 44810000 */ mtc1 $at, $f0 -/* DCFFA8 802432D8 8C63002C */ lw $v1, 0x2c($v1) -/* DCFFAC 802432DC 0040802D */ daddu $s0, $v0, $zero -/* DCFFB0 802432E0 E7A00028 */ swc1 $f0, 0x28($sp) -/* DCFFB4 802432E4 A7A0002C */ sh $zero, 0x2c($sp) -/* DCFFB8 802432E8 16200005 */ bnez $s1, .L80243300 -/* DCFFBC 802432EC AFA30024 */ sw $v1, 0x24($sp) -/* DCFFC0 802432F0 8E4200B0 */ lw $v0, 0xb0($s2) -/* DCFFC4 802432F4 30420004 */ andi $v0, $v0, 4 -/* DCFFC8 802432F8 1040002F */ beqz $v0, .L802433B8 -/* DCFFCC 802432FC 00000000 */ nop -.L80243300: -/* DCFFD0 80243300 2404F7FF */ addiu $a0, $zero, -0x801 -/* DCFFD4 80243304 AE600070 */ sw $zero, 0x70($s3) -/* DCFFD8 80243308 A680008E */ sh $zero, 0x8e($s4) -/* DCFFDC 8024330C 8E4200CC */ lw $v0, 0xcc($s2) -/* DCFFE0 80243310 8E830000 */ lw $v1, ($s4) -/* DCFFE4 80243314 8C420000 */ lw $v0, ($v0) -/* DCFFE8 80243318 00641824 */ and $v1, $v1, $a0 -/* DCFFEC 8024331C AE830000 */ sw $v1, ($s4) -/* DCFFF0 80243320 AE820028 */ sw $v0, 0x28($s4) -/* DCFFF4 80243324 8E4200D0 */ lw $v0, 0xd0($s2) -/* DCFFF8 80243328 8C420034 */ lw $v0, 0x34($v0) -/* DCFFFC 8024332C 54400005 */ bnel $v0, $zero, .L80243344 -/* DD0000 80243330 2402FDFF */ addiu $v0, $zero, -0x201 -/* DD0004 80243334 34620200 */ ori $v0, $v1, 0x200 -/* DD0008 80243338 2403FFF7 */ addiu $v1, $zero, -9 -/* DD000C 8024333C 08090CD3 */ j .L8024334C -/* DD0010 80243340 00431024 */ and $v0, $v0, $v1 -.L80243344: -/* DD0014 80243344 00621024 */ and $v0, $v1, $v0 -/* DD0018 80243348 34420008 */ ori $v0, $v0, 8 -.L8024334C: -/* DD001C 8024334C AE820000 */ sw $v0, ($s4) -/* DD0020 80243350 8E4200B0 */ lw $v0, 0xb0($s2) -/* DD0024 80243354 30420004 */ andi $v0, $v0, 4 -/* DD0028 80243358 10400008 */ beqz $v0, .L8024337C -/* DD002C 8024335C 24020063 */ addiu $v0, $zero, 0x63 -/* DD0030 80243360 AE620070 */ sw $v0, 0x70($s3) -/* DD0034 80243364 AE600074 */ sw $zero, 0x74($s3) -/* DD0038 80243368 8E4200B0 */ lw $v0, 0xb0($s2) -/* DD003C 8024336C 2403FFFB */ addiu $v1, $zero, -5 -/* DD0040 80243370 00431024 */ and $v0, $v0, $v1 -/* DD0044 80243374 08090CE5 */ j .L80243394 -/* DD0048 80243378 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024337C: -/* DD004C 8024337C 8E420000 */ lw $v0, ($s2) -/* DD0050 80243380 3C034000 */ lui $v1, 0x4000 -/* DD0054 80243384 00431024 */ and $v0, $v0, $v1 -/* DD0058 80243388 10400002 */ beqz $v0, .L80243394 -/* DD005C 8024338C 2402000C */ addiu $v0, $zero, 0xc -/* DD0060 80243390 AE620070 */ sw $v0, 0x70($s3) -.L80243394: -/* DD0064 80243394 3C05BFFF */ lui $a1, 0xbfff -/* DD0068 80243398 34A5FFFF */ ori $a1, $a1, 0xffff -/* DD006C 8024339C 2404FFFB */ addiu $a0, $zero, -5 -/* DD0070 802433A0 8E4200B0 */ lw $v0, 0xb0($s2) -/* DD0074 802433A4 8E430000 */ lw $v1, ($s2) -/* DD0078 802433A8 00441024 */ and $v0, $v0, $a0 -/* DD007C 802433AC 00651824 */ and $v1, $v1, $a1 -/* DD0080 802433B0 AE4200B0 */ sw $v0, 0xb0($s2) -/* DD0084 802433B4 AE430000 */ sw $v1, ($s2) -.L802433B8: -/* DD0088 802433B8 8E630070 */ lw $v1, 0x70($s3) -/* DD008C 802433BC 2C620064 */ sltiu $v0, $v1, 0x64 -/* DD0090 802433C0 10400060 */ beqz $v0, .L80243544 -/* DD0094 802433C4 00031080 */ sll $v0, $v1, 2 -/* DD0098 802433C8 3C018025 */ lui $at, 0x8025 -/* DD009C 802433CC 00220821 */ addu $at, $at, $v0 -/* DD00A0 802433D0 8C22AB38 */ lw $v0, -0x54c8($at) -/* DD00A4 802433D4 00400008 */ jr $v0 -/* DD00A8 802433D8 00000000 */ nop -/* DD00AC 802433DC 0260202D */ daddu $a0, $s3, $zero -/* DD00B0 802433E0 0200282D */ daddu $a1, $s0, $zero -/* DD00B4 802433E4 0C012568 */ jal func_800495A0 -/* DD00B8 802433E8 02A0302D */ daddu $a2, $s5, $zero -/* DD00BC 802433EC 0260202D */ daddu $a0, $s3, $zero -/* DD00C0 802433F0 0200282D */ daddu $a1, $s0, $zero -/* DD00C4 802433F4 0C0125AE */ jal func_800496B8 -/* DD00C8 802433F8 02A0302D */ daddu $a2, $s5, $zero -/* DD00CC 802433FC 08090D51 */ j .L80243544 -/* DD00D0 80243400 00000000 */ nop -/* DD00D4 80243404 0260202D */ daddu $a0, $s3, $zero -/* DD00D8 80243408 0200282D */ daddu $a1, $s0, $zero -/* DD00DC 8024340C 0C0126D1 */ jal func_80049B44 -/* DD00E0 80243410 02A0302D */ daddu $a2, $s5, $zero -/* DD00E4 80243414 0260202D */ daddu $a0, $s3, $zero -/* DD00E8 80243418 0200282D */ daddu $a1, $s0, $zero -/* DD00EC 8024341C 0C012701 */ jal func_80049C04 -/* DD00F0 80243420 02A0302D */ daddu $a2, $s5, $zero -/* DD00F4 80243424 08090D51 */ j .L80243544 -/* DD00F8 80243428 00000000 */ nop -/* DD00FC 8024342C 0260202D */ daddu $a0, $s3, $zero -/* DD0100 80243430 0200282D */ daddu $a1, $s0, $zero -/* DD0104 80243434 0C01278F */ jal func_80049E3C -/* DD0108 80243438 02A0302D */ daddu $a2, $s5, $zero -/* DD010C 8024343C 0260202D */ daddu $a0, $s3, $zero -/* DD0110 80243440 0200282D */ daddu $a1, $s0, $zero -/* DD0114 80243444 0C0127B3 */ jal func_80049ECC -/* DD0118 80243448 02A0302D */ daddu $a2, $s5, $zero -/* DD011C 8024344C 08090D51 */ j .L80243544 -/* DD0120 80243450 00000000 */ nop -/* DD0124 80243454 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DD0128 80243458 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DD012C 8024345C C68C0038 */ lwc1 $f12, 0x38($s4) -/* DD0130 80243460 C68E0040 */ lwc1 $f14, 0x40($s4) -/* DD0134 80243464 8C460028 */ lw $a2, 0x28($v0) -/* DD0138 80243468 0C00A7B5 */ jal dist2D -/* DD013C 8024346C 8C470030 */ lw $a3, 0x30($v0) -/* DD0140 80243470 8E42006C */ lw $v0, 0x6c($s2) -/* DD0144 80243474 10400008 */ beqz $v0, .L80243498 -/* DD0148 80243478 46000086 */ mov.s $f2, $f0 -/* DD014C 8024347C 44820000 */ mtc1 $v0, $f0 -/* DD0150 80243480 00000000 */ nop -/* DD0154 80243484 46800020 */ cvt.s.w $f0, $f0 -/* DD0158 80243488 4602003C */ c.lt.s $f0, $f2 -/* DD015C 8024348C 00000000 */ nop -/* DD0160 80243490 4500000B */ bc1f .L802434C0 -/* DD0164 80243494 0260202D */ daddu $a0, $s3, $zero -.L80243498: -/* DD0168 80243498 0260202D */ daddu $a0, $s3, $zero -/* DD016C 8024349C 8E050024 */ lw $a1, 0x24($s0) -/* DD0170 802434A0 8E060028 */ lw $a2, 0x28($s0) -/* DD0174 802434A4 0C090952 */ jal func_80242548 -/* DD0178 802434A8 02A0382D */ daddu $a3, $s5, $zero -/* DD017C 802434AC 8E630070 */ lw $v1, 0x70($s3) -/* DD0180 802434B0 2402000C */ addiu $v0, $zero, 0xc -/* DD0184 802434B4 14620023 */ bne $v1, $v0, .L80243544 -/* DD0188 802434B8 00000000 */ nop -/* DD018C 802434BC 0260202D */ daddu $a0, $s3, $zero -.L802434C0: -/* DD0190 802434C0 0200282D */ daddu $a1, $s0, $zero -/* DD0194 802434C4 0C0127DF */ jal func_80049F7C -/* DD0198 802434C8 02A0302D */ daddu $a2, $s5, $zero -/* DD019C 802434CC 0260202D */ daddu $a0, $s3, $zero -/* DD01A0 802434D0 0200282D */ daddu $a1, $s0, $zero -/* DD01A4 802434D4 0C012849 */ jal func_8004A124 -/* DD01A8 802434D8 02A0302D */ daddu $a2, $s5, $zero -/* DD01AC 802434DC 08090D51 */ j .L80243544 -/* DD01B0 802434E0 00000000 */ nop -/* DD01B4 802434E4 0260202D */ daddu $a0, $s3, $zero -/* DD01B8 802434E8 0200282D */ daddu $a1, $s0, $zero -/* DD01BC 802434EC 0C0128FA */ jal func_8004A3E8 -/* DD01C0 802434F0 02A0302D */ daddu $a2, $s5, $zero -/* DD01C4 802434F4 08090D51 */ j .L80243544 -/* DD01C8 802434F8 00000000 */ nop -/* DD01CC 802434FC 0C0909A3 */ jal func_8024268C -/* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero -/* DD01D4 80243504 08090D51 */ j .L80243544 -/* DD01D8 80243508 00000000 */ nop -/* DD01DC 8024350C 0C0909E3 */ jal func_8024278C -/* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero -/* DD01E4 80243514 08090D51 */ j .L80243544 -/* DD01E8 80243518 00000000 */ nop -/* DD01EC 8024351C 0C0909F4 */ jal func_802427D0 -/* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero -/* DD01F4 80243524 08090D51 */ j .L80243544 -/* DD01F8 80243528 00000000 */ nop -/* DD01FC 8024352C 0C090A1C */ jal func_80242870 -/* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero -/* DD0204 80243534 08090D51 */ j .L80243544 -/* DD0208 80243538 00000000 */ nop -/* DD020C 8024353C 0C0129CF */ jal func_8004A73C -/* DD0210 80243540 0260202D */ daddu $a0, $s3, $zero -.L80243544: -/* DD0214 80243544 8FBF0048 */ lw $ra, 0x48($sp) -/* DD0218 80243548 8FB50044 */ lw $s5, 0x44($sp) -/* DD021C 8024354C 8FB40040 */ lw $s4, 0x40($sp) -/* DD0220 80243550 8FB3003C */ lw $s3, 0x3c($sp) -/* DD0224 80243554 8FB20038 */ lw $s2, 0x38($sp) -/* DD0228 80243558 8FB10034 */ lw $s1, 0x34($sp) -/* DD022C 8024355C 8FB00030 */ lw $s0, 0x30($sp) -/* DD0230 80243560 0000102D */ daddu $v0, $zero, $zero -/* DD0234 80243564 03E00008 */ jr $ra -/* DD0238 80243568 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s new file mode 100644 index 0000000000..b42d328927 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s @@ -0,0 +1,213 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024324C_DCFF1C +/* DCFF1C 8024324C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* DCFF20 80243250 AFB3003C */ sw $s3, 0x3c($sp) +/* DCFF24 80243254 0080982D */ daddu $s3, $a0, $zero +/* DCFF28 80243258 AFBF0048 */ sw $ra, 0x48($sp) +/* DCFF2C 8024325C AFB50044 */ sw $s5, 0x44($sp) +/* DCFF30 80243260 AFB40040 */ sw $s4, 0x40($sp) +/* DCFF34 80243264 AFB20038 */ sw $s2, 0x38($sp) +/* DCFF38 80243268 AFB10034 */ sw $s1, 0x34($sp) +/* DCFF3C 8024326C AFB00030 */ sw $s0, 0x30($sp) +/* DCFF40 80243270 8E720148 */ lw $s2, 0x148($s3) +/* DCFF44 80243274 86440008 */ lh $a0, 8($s2) +/* DCFF48 80243278 8E70000C */ lw $s0, 0xc($s3) +/* DCFF4C 8024327C 0C00EABB */ jal get_npc_unsafe +/* DCFF50 80243280 00A0882D */ daddu $s1, $a1, $zero +/* DCFF54 80243284 0260202D */ daddu $a0, $s3, $zero +/* DCFF58 80243288 8E050000 */ lw $a1, ($s0) +/* DCFF5C 8024328C 0C0B1EAF */ jal get_variable +/* DCFF60 80243290 0040A02D */ daddu $s4, $v0, $zero +/* DCFF64 80243294 AFA00010 */ sw $zero, 0x10($sp) +/* DCFF68 80243298 8E4300D0 */ lw $v1, 0xd0($s2) +/* DCFF6C 8024329C 8C630030 */ lw $v1, 0x30($v1) +/* DCFF70 802432A0 AFA30014 */ sw $v1, 0x14($sp) +/* DCFF74 802432A4 8E4300D0 */ lw $v1, 0xd0($s2) +/* DCFF78 802432A8 8C63001C */ lw $v1, 0x1c($v1) +/* DCFF7C 802432AC AFA30018 */ sw $v1, 0x18($sp) +/* DCFF80 802432B0 8E4300D0 */ lw $v1, 0xd0($s2) +/* DCFF84 802432B4 8C630024 */ lw $v1, 0x24($v1) +/* DCFF88 802432B8 AFA3001C */ sw $v1, 0x1c($sp) +/* DCFF8C 802432BC 8E4300D0 */ lw $v1, 0xd0($s2) +/* DCFF90 802432C0 8C630028 */ lw $v1, 0x28($v1) +/* DCFF94 802432C4 27B50010 */ addiu $s5, $sp, 0x10 +/* DCFF98 802432C8 AFA30020 */ sw $v1, 0x20($sp) +/* DCFF9C 802432CC 8E4300D0 */ lw $v1, 0xd0($s2) +/* DCFFA0 802432D0 3C014220 */ lui $at, 0x4220 +/* DCFFA4 802432D4 44810000 */ mtc1 $at, $f0 +/* DCFFA8 802432D8 8C63002C */ lw $v1, 0x2c($v1) +/* DCFFAC 802432DC 0040802D */ daddu $s0, $v0, $zero +/* DCFFB0 802432E0 E7A00028 */ swc1 $f0, 0x28($sp) +/* DCFFB4 802432E4 A7A0002C */ sh $zero, 0x2c($sp) +/* DCFFB8 802432E8 16200005 */ bnez $s1, .L80243300 +/* DCFFBC 802432EC AFA30024 */ sw $v1, 0x24($sp) +/* DCFFC0 802432F0 8E4200B0 */ lw $v0, 0xb0($s2) +/* DCFFC4 802432F4 30420004 */ andi $v0, $v0, 4 +/* DCFFC8 802432F8 1040002F */ beqz $v0, .L802433B8 +/* DCFFCC 802432FC 00000000 */ nop +.L80243300: +/* DCFFD0 80243300 2404F7FF */ addiu $a0, $zero, -0x801 +/* DCFFD4 80243304 AE600070 */ sw $zero, 0x70($s3) +/* DCFFD8 80243308 A680008E */ sh $zero, 0x8e($s4) +/* DCFFDC 8024330C 8E4200CC */ lw $v0, 0xcc($s2) +/* DCFFE0 80243310 8E830000 */ lw $v1, ($s4) +/* DCFFE4 80243314 8C420000 */ lw $v0, ($v0) +/* DCFFE8 80243318 00641824 */ and $v1, $v1, $a0 +/* DCFFEC 8024331C AE830000 */ sw $v1, ($s4) +/* DCFFF0 80243320 AE820028 */ sw $v0, 0x28($s4) +/* DCFFF4 80243324 8E4200D0 */ lw $v0, 0xd0($s2) +/* DCFFF8 80243328 8C420034 */ lw $v0, 0x34($v0) +/* DCFFFC 8024332C 54400005 */ bnel $v0, $zero, .L80243344 +/* DD0000 80243330 2402FDFF */ addiu $v0, $zero, -0x201 +/* DD0004 80243334 34620200 */ ori $v0, $v1, 0x200 +/* DD0008 80243338 2403FFF7 */ addiu $v1, $zero, -9 +/* DD000C 8024333C 08090CD3 */ j .L8024334C +/* DD0010 80243340 00431024 */ and $v0, $v0, $v1 +.L80243344: +/* DD0014 80243344 00621024 */ and $v0, $v1, $v0 +/* DD0018 80243348 34420008 */ ori $v0, $v0, 8 +.L8024334C: +/* DD001C 8024334C AE820000 */ sw $v0, ($s4) +/* DD0020 80243350 8E4200B0 */ lw $v0, 0xb0($s2) +/* DD0024 80243354 30420004 */ andi $v0, $v0, 4 +/* DD0028 80243358 10400008 */ beqz $v0, .L8024337C +/* DD002C 8024335C 24020063 */ addiu $v0, $zero, 0x63 +/* DD0030 80243360 AE620070 */ sw $v0, 0x70($s3) +/* DD0034 80243364 AE600074 */ sw $zero, 0x74($s3) +/* DD0038 80243368 8E4200B0 */ lw $v0, 0xb0($s2) +/* DD003C 8024336C 2403FFFB */ addiu $v1, $zero, -5 +/* DD0040 80243370 00431024 */ and $v0, $v0, $v1 +/* DD0044 80243374 08090CE5 */ j .L80243394 +/* DD0048 80243378 AE4200B0 */ sw $v0, 0xb0($s2) +.L8024337C: +/* DD004C 8024337C 8E420000 */ lw $v0, ($s2) +/* DD0050 80243380 3C034000 */ lui $v1, 0x4000 +/* DD0054 80243384 00431024 */ and $v0, $v0, $v1 +/* DD0058 80243388 10400002 */ beqz $v0, .L80243394 +/* DD005C 8024338C 2402000C */ addiu $v0, $zero, 0xc +/* DD0060 80243390 AE620070 */ sw $v0, 0x70($s3) +.L80243394: +/* DD0064 80243394 3C05BFFF */ lui $a1, 0xbfff +/* DD0068 80243398 34A5FFFF */ ori $a1, $a1, 0xffff +/* DD006C 8024339C 2404FFFB */ addiu $a0, $zero, -5 +/* DD0070 802433A0 8E4200B0 */ lw $v0, 0xb0($s2) +/* DD0074 802433A4 8E430000 */ lw $v1, ($s2) +/* DD0078 802433A8 00441024 */ and $v0, $v0, $a0 +/* DD007C 802433AC 00651824 */ and $v1, $v1, $a1 +/* DD0080 802433B0 AE4200B0 */ sw $v0, 0xb0($s2) +/* DD0084 802433B4 AE430000 */ sw $v1, ($s2) +.L802433B8: +/* DD0088 802433B8 8E630070 */ lw $v1, 0x70($s3) +/* DD008C 802433BC 2C620064 */ sltiu $v0, $v1, 0x64 +/* DD0090 802433C0 10400060 */ beqz $v0, .L80243544 +/* DD0094 802433C4 00031080 */ sll $v0, $v1, 2 +/* DD0098 802433C8 3C018025 */ lui $at, 0x8025 +/* DD009C 802433CC 00220821 */ addu $at, $at, $v0 +/* DD00A0 802433D0 8C22AB38 */ lw $v0, -0x54c8($at) +/* DD00A4 802433D4 00400008 */ jr $v0 +/* DD00A8 802433D8 00000000 */ nop +/* DD00AC 802433DC 0260202D */ daddu $a0, $s3, $zero +/* DD00B0 802433E0 0200282D */ daddu $a1, $s0, $zero +/* DD00B4 802433E4 0C012568 */ jal func_800495A0 +/* DD00B8 802433E8 02A0302D */ daddu $a2, $s5, $zero +/* DD00BC 802433EC 0260202D */ daddu $a0, $s3, $zero +/* DD00C0 802433F0 0200282D */ daddu $a1, $s0, $zero +/* DD00C4 802433F4 0C0125AE */ jal func_800496B8 +/* DD00C8 802433F8 02A0302D */ daddu $a2, $s5, $zero +/* DD00CC 802433FC 08090D51 */ j .L80243544 +/* DD00D0 80243400 00000000 */ nop +/* DD00D4 80243404 0260202D */ daddu $a0, $s3, $zero +/* DD00D8 80243408 0200282D */ daddu $a1, $s0, $zero +/* DD00DC 8024340C 0C0126D1 */ jal func_80049B44 +/* DD00E0 80243410 02A0302D */ daddu $a2, $s5, $zero +/* DD00E4 80243414 0260202D */ daddu $a0, $s3, $zero +/* DD00E8 80243418 0200282D */ daddu $a1, $s0, $zero +/* DD00EC 8024341C 0C012701 */ jal func_80049C04 +/* DD00F0 80243420 02A0302D */ daddu $a2, $s5, $zero +/* DD00F4 80243424 08090D51 */ j .L80243544 +/* DD00F8 80243428 00000000 */ nop +/* DD00FC 8024342C 0260202D */ daddu $a0, $s3, $zero +/* DD0100 80243430 0200282D */ daddu $a1, $s0, $zero +/* DD0104 80243434 0C01278F */ jal func_80049E3C +/* DD0108 80243438 02A0302D */ daddu $a2, $s5, $zero +/* DD010C 8024343C 0260202D */ daddu $a0, $s3, $zero +/* DD0110 80243440 0200282D */ daddu $a1, $s0, $zero +/* DD0114 80243444 0C0127B3 */ jal func_80049ECC +/* DD0118 80243448 02A0302D */ daddu $a2, $s5, $zero +/* DD011C 8024344C 08090D51 */ j .L80243544 +/* DD0120 80243450 00000000 */ nop +/* DD0124 80243454 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DD0128 80243458 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DD012C 8024345C C68C0038 */ lwc1 $f12, 0x38($s4) +/* DD0130 80243460 C68E0040 */ lwc1 $f14, 0x40($s4) +/* DD0134 80243464 8C460028 */ lw $a2, 0x28($v0) +/* DD0138 80243468 0C00A7B5 */ jal dist2D +/* DD013C 8024346C 8C470030 */ lw $a3, 0x30($v0) +/* DD0140 80243470 8E42006C */ lw $v0, 0x6c($s2) +/* DD0144 80243474 10400008 */ beqz $v0, .L80243498 +/* DD0148 80243478 46000086 */ mov.s $f2, $f0 +/* DD014C 8024347C 44820000 */ mtc1 $v0, $f0 +/* DD0150 80243480 00000000 */ nop +/* DD0154 80243484 46800020 */ cvt.s.w $f0, $f0 +/* DD0158 80243488 4602003C */ c.lt.s $f0, $f2 +/* DD015C 8024348C 00000000 */ nop +/* DD0160 80243490 4500000B */ bc1f .L802434C0 +/* DD0164 80243494 0260202D */ daddu $a0, $s3, $zero +.L80243498: +/* DD0168 80243498 0260202D */ daddu $a0, $s3, $zero +/* DD016C 8024349C 8E050024 */ lw $a1, 0x24($s0) +/* DD0170 802434A0 8E060028 */ lw $a2, 0x28($s0) +/* DD0174 802434A4 0C090952 */ jal func_80242548_DCF218 +/* DD0178 802434A8 02A0382D */ daddu $a3, $s5, $zero +/* DD017C 802434AC 8E630070 */ lw $v1, 0x70($s3) +/* DD0180 802434B0 2402000C */ addiu $v0, $zero, 0xc +/* DD0184 802434B4 14620023 */ bne $v1, $v0, .L80243544 +/* DD0188 802434B8 00000000 */ nop +/* DD018C 802434BC 0260202D */ daddu $a0, $s3, $zero +.L802434C0: +/* DD0190 802434C0 0200282D */ daddu $a1, $s0, $zero +/* DD0194 802434C4 0C0127DF */ jal func_80049F7C +/* DD0198 802434C8 02A0302D */ daddu $a2, $s5, $zero +/* DD019C 802434CC 0260202D */ daddu $a0, $s3, $zero +/* DD01A0 802434D0 0200282D */ daddu $a1, $s0, $zero +/* DD01A4 802434D4 0C012849 */ jal func_8004A124 +/* DD01A8 802434D8 02A0302D */ daddu $a2, $s5, $zero +/* DD01AC 802434DC 08090D51 */ j .L80243544 +/* DD01B0 802434E0 00000000 */ nop +/* DD01B4 802434E4 0260202D */ daddu $a0, $s3, $zero +/* DD01B8 802434E8 0200282D */ daddu $a1, $s0, $zero +/* DD01BC 802434EC 0C0128FA */ jal func_8004A3E8 +/* DD01C0 802434F0 02A0302D */ daddu $a2, $s5, $zero +/* DD01C4 802434F4 08090D51 */ j .L80243544 +/* DD01C8 802434F8 00000000 */ nop +/* DD01CC 802434FC 0C0909A3 */ jal func_8024268C_DCF35C +/* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero +/* DD01D4 80243504 08090D51 */ j .L80243544 +/* DD01D8 80243508 00000000 */ nop +/* DD01DC 8024350C 0C0909E3 */ jal func_8024278C_DCF45C +/* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero +/* DD01E4 80243514 08090D51 */ j .L80243544 +/* DD01E8 80243518 00000000 */ nop +/* DD01EC 8024351C 0C0909F4 */ jal func_802427D0_DCF4A0 +/* DD01F0 80243520 0260202D */ daddu $a0, $s3, $zero +/* DD01F4 80243524 08090D51 */ j .L80243544 +/* DD01F8 80243528 00000000 */ nop +/* DD01FC 8024352C 0C090A1C */ jal func_80242870_DCF540 +/* DD0200 80243530 0260202D */ daddu $a0, $s3, $zero +/* DD0204 80243534 08090D51 */ j .L80243544 +/* DD0208 80243538 00000000 */ nop +/* DD020C 8024353C 0C0129CF */ jal func_8004A73C +/* DD0210 80243540 0260202D */ daddu $a0, $s3, $zero +.L80243544: +/* DD0214 80243544 8FBF0048 */ lw $ra, 0x48($sp) +/* DD0218 80243548 8FB50044 */ lw $s5, 0x44($sp) +/* DD021C 8024354C 8FB40040 */ lw $s4, 0x40($sp) +/* DD0220 80243550 8FB3003C */ lw $s3, 0x3c($sp) +/* DD0224 80243554 8FB20038 */ lw $s2, 0x38($sp) +/* DD0228 80243558 8FB10034 */ lw $s1, 0x34($sp) +/* DD022C 8024355C 8FB00030 */ lw $s0, 0x30($sp) +/* DD0230 80243560 0000102D */ daddu $v0, $zero, $zero +/* DD0234 80243564 03E00008 */ jr $ra +/* DD0238 80243568 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024356C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024356C.s deleted file mode 100644 index 12b88e6749..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024356C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024356C -/* DD023C 8024356C 8C830148 */ lw $v1, 0x148($a0) -/* DD0240 80243570 24020003 */ addiu $v0, $zero, 3 -/* DD0244 80243574 A06200B5 */ sb $v0, 0xb5($v1) -/* DD0248 80243578 03E00008 */ jr $ra -/* DD024C 8024357C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024356C_DD023C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024356C_DD023C.s new file mode 100644 index 0000000000..53d0f1a697 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024356C_DD023C.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024356C_DD023C +/* DD023C 8024356C 8C830148 */ lw $v1, 0x148($a0) +/* DD0240 80243570 24020003 */ addiu $v0, $zero, 3 +/* DD0244 80243574 A06200B5 */ sb $v0, 0xb5($v1) +/* DD0248 80243578 03E00008 */ jr $ra +/* DD024C 8024357C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580.s deleted file mode 100644 index 0b15633ce9..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243580 -/* DD0250 80243580 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DD0254 80243584 3C05FE36 */ lui $a1, 0xfe36 -/* DD0258 80243588 AFBF0010 */ sw $ra, 0x10($sp) -/* DD025C 8024358C 8C820148 */ lw $v0, 0x148($a0) -/* DD0260 80243590 3C06800B */ lui $a2, 0x800b -/* DD0264 80243594 8CC60F9C */ lw $a2, 0xf9c($a2) -/* DD0268 80243598 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DD026C 8024359C 00C23026 */ xor $a2, $a2, $v0 -/* DD0270 802435A0 0C0B2026 */ jal set_variable -/* DD0274 802435A4 2CC60001 */ sltiu $a2, $a2, 1 -/* DD0278 802435A8 8FBF0010 */ lw $ra, 0x10($sp) -/* DD027C 802435AC 24020002 */ addiu $v0, $zero, 2 -/* DD0280 802435B0 03E00008 */ jr $ra -/* DD0284 802435B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s new file mode 100644 index 0000000000..3d833e26e1 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243580_DD0250 +/* DD0250 80243580 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DD0254 80243584 3C05FE36 */ lui $a1, 0xfe36 +/* DD0258 80243588 AFBF0010 */ sw $ra, 0x10($sp) +/* DD025C 8024358C 8C820148 */ lw $v0, 0x148($a0) +/* DD0260 80243590 3C06800B */ lui $a2, 0x800b +/* DD0264 80243594 8CC60F9C */ lw $a2, 0xf9c($a2) +/* DD0268 80243598 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DD026C 8024359C 00C23026 */ xor $a2, $a2, $v0 +/* DD0270 802435A0 0C0B2026 */ jal set_variable +/* DD0274 802435A4 2CC60001 */ sltiu $a2, $a2, 1 +/* DD0278 802435A8 8FBF0010 */ lw $ra, 0x10($sp) +/* DD027C 802435AC 24020002 */ addiu $v0, $zero, 2 +/* DD0280 802435B0 03E00008 */ jr $ra +/* DD0284 802435B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435B8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435B8.s deleted file mode 100644 index fd4d2b83ac..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435B8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435B8 -/* DD0288 802435B8 8C830148 */ lw $v1, 0x148($a0) -/* DD028C 802435BC 24020003 */ addiu $v0, $zero, 3 -/* DD0290 802435C0 A06200B5 */ sb $v0, 0xb5($v1) -/* DD0294 802435C4 03E00008 */ jr $ra -/* DD0298 802435C8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435B8_DD0288.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435B8_DD0288.s new file mode 100644 index 0000000000..618962939d --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435B8_DD0288.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435B8_DD0288 +/* DD0288 802435B8 8C830148 */ lw $v1, 0x148($a0) +/* DD028C 802435BC 24020003 */ addiu $v0, $zero, 3 +/* DD0290 802435C0 A06200B5 */ sb $v0, 0xb5($v1) +/* DD0294 802435C4 03E00008 */ jr $ra +/* DD0298 802435C8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435CC.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435CC.s deleted file mode 100644 index d8a579c181..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435CC.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435CC -/* DD029C 802435CC 3C03800B */ lui $v1, %hi(gCameras) -/* DD02A0 802435D0 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DD02A4 802435D4 94620000 */ lhu $v0, ($v1) -/* DD02A8 802435D8 34421000 */ ori $v0, $v0, 0x1000 -/* DD02AC 802435DC A4620000 */ sh $v0, ($v1) -/* DD02B0 802435E0 03E00008 */ jr $ra -/* DD02B4 802435E4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435CC_DD029C.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435CC_DD029C.s new file mode 100644 index 0000000000..c99e8f41d8 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435CC_DD029C.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435CC_DD029C +/* DD029C 802435CC 3C03800B */ lui $v1, %hi(gCameras) +/* DD02A0 802435D0 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* DD02A4 802435D4 94620000 */ lhu $v0, ($v1) +/* DD02A8 802435D8 34421000 */ ori $v0, $v0, 0x1000 +/* DD02AC 802435DC A4620000 */ sh $v0, ($v1) +/* DD02B0 802435E0 03E00008 */ jr $ra +/* DD02B4 802435E4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8.s deleted file mode 100644 index e45e789cfe..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435E8 -/* DD02B8 802435E8 3C03800B */ lui $v1, %hi(gCameras) -/* DD02BC 802435EC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DD02C0 802435F0 94620000 */ lhu $v0, ($v1) -/* DD02C4 802435F4 3042EFFF */ andi $v0, $v0, 0xefff -/* DD02C8 802435F8 A4620000 */ sh $v0, ($v1) -/* DD02CC 802435FC 03E00008 */ jr $ra -/* DD02D0 80243600 24020002 */ addiu $v0, $zero, 2 -/* DD02D4 80243604 00000000 */ nop -/* DD02D8 80243608 00000000 */ nop -/* DD02DC 8024360C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s new file mode 100644 index 0000000000..fd076dc835 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_802435E8_DD02B8.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802435E8_DD02B8 +/* DD02B8 802435E8 3C03800B */ lui $v1, %hi(gCameras) +/* DD02BC 802435EC 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* DD02C0 802435F0 94620000 */ lhu $v0, ($v1) +/* DD02C4 802435F4 3042EFFF */ andi $v0, $v0, 0xefff +/* DD02C8 802435F8 A4620000 */ sh $v0, ($v1) +/* DD02CC 802435FC 03E00008 */ jr $ra +/* DD02D0 80243600 24020002 */ addiu $v0, $zero, 2 +/* DD02D4 80243604 00000000 */ nop +/* DD02D8 80243608 00000000 */ nop +/* DD02DC 8024360C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610.s b/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610.s deleted file mode 100644 index 9b03d426e2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243610 -/* DD02E0 80243610 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DD02E4 80243614 AFB10014 */ sw $s1, 0x14($sp) -/* DD02E8 80243618 0080882D */ daddu $s1, $a0, $zero -/* DD02EC 8024361C AFBF001C */ sw $ra, 0x1c($sp) -/* DD02F0 80243620 AFB20018 */ sw $s2, 0x18($sp) -/* DD02F4 80243624 AFB00010 */ sw $s0, 0x10($sp) -/* DD02F8 80243628 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DD02FC 8024362C F7B40020 */ sdc1 $f20, 0x20($sp) -/* DD0300 80243630 0C00EABB */ jal get_npc_unsafe -/* DD0304 80243634 24040007 */ addiu $a0, $zero, 7 -/* DD0308 80243638 0040802D */ daddu $s0, $v0, $zero -/* DD030C 8024363C 3C12800B */ lui $s2, %hi(gCameras) -/* DD0310 80243640 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* DD0314 80243644 C60C000C */ lwc1 $f12, 0xc($s0) -/* DD0318 80243648 C640006C */ lwc1 $f0, 0x6c($s2) -/* DD031C 8024364C 46006300 */ add.s $f12, $f12, $f0 -/* DD0320 80243650 3C014334 */ lui $at, 0x4334 -/* DD0324 80243654 4481A000 */ mtc1 $at, $f20 -/* DD0328 80243658 3C014220 */ lui $at, 0x4220 -/* DD032C 8024365C 4481B000 */ mtc1 $at, $f22 -/* DD0330 80243660 0C00A8BB */ jal sin_deg -/* DD0334 80243664 46146300 */ add.s $f12, $f12, $f20 -/* DD0338 80243668 46160002 */ mul.s $f0, $f0, $f22 -/* DD033C 8024366C 00000000 */ nop -/* DD0340 80243670 C6020038 */ lwc1 $f2, 0x38($s0) -/* DD0344 80243674 46001080 */ add.s $f2, $f2, $f0 -/* DD0348 80243678 4600110D */ trunc.w.s $f4, $f2 -/* DD034C 8024367C E6240084 */ swc1 $f4, 0x84($s1) -/* DD0350 80243680 C600003C */ lwc1 $f0, 0x3c($s0) -/* DD0354 80243684 3C014100 */ lui $at, 0x4100 -/* DD0358 80243688 44811000 */ mtc1 $at, $f2 -/* DD035C 8024368C 00000000 */ nop -/* DD0360 80243690 46020000 */ add.s $f0, $f0, $f2 -/* DD0364 80243694 4600010D */ trunc.w.s $f4, $f0 -/* DD0368 80243698 E6240088 */ swc1 $f4, 0x88($s1) -/* DD036C 8024369C C60C000C */ lwc1 $f12, 0xc($s0) -/* DD0370 802436A0 C640006C */ lwc1 $f0, 0x6c($s2) -/* DD0374 802436A4 46006300 */ add.s $f12, $f12, $f0 -/* DD0378 802436A8 0C00A8D4 */ jal cos_deg -/* DD037C 802436AC 46146300 */ add.s $f12, $f12, $f20 -/* DD0380 802436B0 46160002 */ mul.s $f0, $f0, $f22 -/* DD0384 802436B4 00000000 */ nop -/* DD0388 802436B8 C6020040 */ lwc1 $f2, 0x40($s0) -/* DD038C 802436BC 46001081 */ sub.s $f2, $f2, $f0 -/* DD0390 802436C0 4600110D */ trunc.w.s $f4, $f2 -/* DD0394 802436C4 E624008C */ swc1 $f4, 0x8c($s1) -/* DD0398 802436C8 8FBF001C */ lw $ra, 0x1c($sp) -/* DD039C 802436CC 8FB20018 */ lw $s2, 0x18($sp) -/* DD03A0 802436D0 8FB10014 */ lw $s1, 0x14($sp) -/* DD03A4 802436D4 8FB00010 */ lw $s0, 0x10($sp) -/* DD03A8 802436D8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DD03AC 802436DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* DD03B0 802436E0 24020002 */ addiu $v0, $zero, 2 -/* DD03B4 802436E4 03E00008 */ jr $ra -/* DD03B8 802436E8 27BD0030 */ addiu $sp, $sp, 0x30 -/* DD03BC 802436EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s b/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s new file mode 100644 index 0000000000..5fc1fca04f --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_09/DD02E0/func_80243610_DD02E0.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243610_DD02E0 +/* DD02E0 80243610 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* DD02E4 80243614 AFB10014 */ sw $s1, 0x14($sp) +/* DD02E8 80243618 0080882D */ daddu $s1, $a0, $zero +/* DD02EC 8024361C AFBF001C */ sw $ra, 0x1c($sp) +/* DD02F0 80243620 AFB20018 */ sw $s2, 0x18($sp) +/* DD02F4 80243624 AFB00010 */ sw $s0, 0x10($sp) +/* DD02F8 80243628 F7B60028 */ sdc1 $f22, 0x28($sp) +/* DD02FC 8024362C F7B40020 */ sdc1 $f20, 0x20($sp) +/* DD0300 80243630 0C00EABB */ jal get_npc_unsafe +/* DD0304 80243634 24040007 */ addiu $a0, $zero, 7 +/* DD0308 80243638 0040802D */ daddu $s0, $v0, $zero +/* DD030C 8024363C 3C12800B */ lui $s2, %hi(gCameras) +/* DD0310 80243640 26521D80 */ addiu $s2, $s2, %lo(gCameras) +/* DD0314 80243644 C60C000C */ lwc1 $f12, 0xc($s0) +/* DD0318 80243648 C640006C */ lwc1 $f0, 0x6c($s2) +/* DD031C 8024364C 46006300 */ add.s $f12, $f12, $f0 +/* DD0320 80243650 3C014334 */ lui $at, 0x4334 +/* DD0324 80243654 4481A000 */ mtc1 $at, $f20 +/* DD0328 80243658 3C014220 */ lui $at, 0x4220 +/* DD032C 8024365C 4481B000 */ mtc1 $at, $f22 +/* DD0330 80243660 0C00A8BB */ jal sin_deg +/* DD0334 80243664 46146300 */ add.s $f12, $f12, $f20 +/* DD0338 80243668 46160002 */ mul.s $f0, $f0, $f22 +/* DD033C 8024366C 00000000 */ nop +/* DD0340 80243670 C6020038 */ lwc1 $f2, 0x38($s0) +/* DD0344 80243674 46001080 */ add.s $f2, $f2, $f0 +/* DD0348 80243678 4600110D */ trunc.w.s $f4, $f2 +/* DD034C 8024367C E6240084 */ swc1 $f4, 0x84($s1) +/* DD0350 80243680 C600003C */ lwc1 $f0, 0x3c($s0) +/* DD0354 80243684 3C014100 */ lui $at, 0x4100 +/* DD0358 80243688 44811000 */ mtc1 $at, $f2 +/* DD035C 8024368C 00000000 */ nop +/* DD0360 80243690 46020000 */ add.s $f0, $f0, $f2 +/* DD0364 80243694 4600010D */ trunc.w.s $f4, $f0 +/* DD0368 80243698 E6240088 */ swc1 $f4, 0x88($s1) +/* DD036C 8024369C C60C000C */ lwc1 $f12, 0xc($s0) +/* DD0370 802436A0 C640006C */ lwc1 $f0, 0x6c($s2) +/* DD0374 802436A4 46006300 */ add.s $f12, $f12, $f0 +/* DD0378 802436A8 0C00A8D4 */ jal cos_deg +/* DD037C 802436AC 46146300 */ add.s $f12, $f12, $f20 +/* DD0380 802436B0 46160002 */ mul.s $f0, $f0, $f22 +/* DD0384 802436B4 00000000 */ nop +/* DD0388 802436B8 C6020040 */ lwc1 $f2, 0x40($s0) +/* DD038C 802436BC 46001081 */ sub.s $f2, $f2, $f0 +/* DD0390 802436C0 4600110D */ trunc.w.s $f4, $f2 +/* DD0394 802436C4 E624008C */ swc1 $f4, 0x8c($s1) +/* DD0398 802436C8 8FBF001C */ lw $ra, 0x1c($sp) +/* DD039C 802436CC 8FB20018 */ lw $s2, 0x18($sp) +/* DD03A0 802436D0 8FB10014 */ lw $s1, 0x14($sp) +/* DD03A4 802436D4 8FB00010 */ lw $s0, 0x10($sp) +/* DD03A8 802436D8 D7B60028 */ ldc1 $f22, 0x28($sp) +/* DD03AC 802436DC D7B40020 */ ldc1 $f20, 0x20($sp) +/* DD03B0 802436E0 24020002 */ addiu $v0, $zero, 2 +/* DD03B4 802436E4 03E00008 */ jr $ra +/* DD03B8 802436E8 27BD0030 */ addiu $sp, $sp, 0x30 +/* DD03BC 802436EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8.s deleted file mode 100644 index 5c20294cf7..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F8 -/* DDD028 802407F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDD02C 802407FC AFB00010 */ sw $s0, 0x10($sp) -/* DDD030 80240800 0080802D */ daddu $s0, $a0, $zero -/* DDD034 80240804 AFBF0018 */ sw $ra, 0x18($sp) -/* DDD038 80240808 AFB10014 */ sw $s1, 0x14($sp) -/* DDD03C 8024080C 8E11000C */ lw $s1, 0xc($s0) -/* DDD040 80240810 8E250000 */ lw $a1, ($s1) -/* DDD044 80240814 0C0B1EAF */ jal get_variable -/* DDD048 80240818 26310004 */ addiu $s1, $s1, 4 -/* DDD04C 8024081C 0200202D */ daddu $a0, $s0, $zero -/* DDD050 80240820 3C038011 */ lui $v1, %hi(gPlayerData) -/* DDD054 80240824 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* DDD058 80240828 000210C0 */ sll $v0, $v0, 3 -/* DDD05C 8024082C 00431021 */ addu $v0, $v0, $v1 -/* DDD060 80240830 90460015 */ lbu $a2, 0x15($v0) -/* DDD064 80240834 8E250000 */ lw $a1, ($s1) -/* DDD068 80240838 24C60001 */ addiu $a2, $a2, 1 -/* DDD06C 8024083C A0460015 */ sb $a2, 0x15($v0) -/* DDD070 80240840 00063600 */ sll $a2, $a2, 0x18 -/* DDD074 80240844 0C0B2026 */ jal set_variable -/* DDD078 80240848 00063603 */ sra $a2, $a2, 0x18 -/* DDD07C 8024084C 8FBF0018 */ lw $ra, 0x18($sp) -/* DDD080 80240850 8FB10014 */ lw $s1, 0x14($sp) -/* DDD084 80240854 8FB00010 */ lw $s0, 0x10($sp) -/* DDD088 80240858 24020002 */ addiu $v0, $zero, 2 -/* DDD08C 8024085C 03E00008 */ jr $ra -/* DDD090 80240860 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8_DDD028.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8_DDD028.s new file mode 100644 index 0000000000..71bf6cf93b --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802407F8_DDD028.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407F8_DDD028 +/* DDD028 802407F8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DDD02C 802407FC AFB00010 */ sw $s0, 0x10($sp) +/* DDD030 80240800 0080802D */ daddu $s0, $a0, $zero +/* DDD034 80240804 AFBF0018 */ sw $ra, 0x18($sp) +/* DDD038 80240808 AFB10014 */ sw $s1, 0x14($sp) +/* DDD03C 8024080C 8E11000C */ lw $s1, 0xc($s0) +/* DDD040 80240810 8E250000 */ lw $a1, ($s1) +/* DDD044 80240814 0C0B1EAF */ jal get_variable +/* DDD048 80240818 26310004 */ addiu $s1, $s1, 4 +/* DDD04C 8024081C 0200202D */ daddu $a0, $s0, $zero +/* DDD050 80240820 3C038011 */ lui $v1, %hi(gPlayerData) +/* DDD054 80240824 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* DDD058 80240828 000210C0 */ sll $v0, $v0, 3 +/* DDD05C 8024082C 00431021 */ addu $v0, $v0, $v1 +/* DDD060 80240830 90460015 */ lbu $a2, 0x15($v0) +/* DDD064 80240834 8E250000 */ lw $a1, ($s1) +/* DDD068 80240838 24C60001 */ addiu $a2, $a2, 1 +/* DDD06C 8024083C A0460015 */ sb $a2, 0x15($v0) +/* DDD070 80240840 00063600 */ sll $a2, $a2, 0x18 +/* DDD074 80240844 0C0B2026 */ jal set_variable +/* DDD078 80240848 00063603 */ sra $a2, $a2, 0x18 +/* DDD07C 8024084C 8FBF0018 */ lw $ra, 0x18($sp) +/* DDD080 80240850 8FB10014 */ lw $s1, 0x14($sp) +/* DDD084 80240854 8FB00010 */ lw $s0, 0x10($sp) +/* DDD088 80240858 24020002 */ addiu $v0, $zero, 2 +/* DDD08C 8024085C 03E00008 */ jr $ra +/* DDD090 80240860 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864.s deleted file mode 100644 index e2a39c723a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240864 -/* DDD094 80240864 3C028011 */ lui $v0, %hi(gPlayerData) -/* DDD098 80240868 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* DDD09C 8024086C 000420C0 */ sll $a0, $a0, 3 -/* DDD0A0 80240870 00822021 */ addu $a0, $a0, $v0 -/* DDD0A4 80240874 90820014 */ lbu $v0, 0x14($a0) -/* DDD0A8 80240878 10400009 */ beqz $v0, .L802408A0 -/* DDD0AC 8024087C 00000000 */ nop -/* DDD0B0 80240880 90820015 */ lbu $v0, 0x15($a0) -/* DDD0B4 80240884 00022600 */ sll $a0, $v0, 0x18 -/* DDD0B8 80240888 00041E03 */ sra $v1, $a0, 0x18 -/* DDD0BC 8024088C 00051400 */ sll $v0, $a1, 0x10 -/* DDD0C0 80240890 00021403 */ sra $v0, $v0, 0x10 -/* DDD0C4 80240894 0043102A */ slt $v0, $v0, $v1 -/* DDD0C8 80240898 10400003 */ beqz $v0, .L802408A8 -/* DDD0CC 8024089C 00000000 */ nop -.L802408A0: -/* DDD0D0 802408A0 03E00008 */ jr $ra -/* DDD0D4 802408A4 2402FFFF */ addiu $v0, $zero, -1 -.L802408A8: -/* DDD0D8 802408A8 03E00008 */ jr $ra -/* DDD0DC 802408AC 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s new file mode 100644 index 0000000000..498e57d0db --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240864_DDD094.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240864_DDD094 +/* DDD094 80240864 3C028011 */ lui $v0, %hi(gPlayerData) +/* DDD098 80240868 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* DDD09C 8024086C 000420C0 */ sll $a0, $a0, 3 +/* DDD0A0 80240870 00822021 */ addu $a0, $a0, $v0 +/* DDD0A4 80240874 90820014 */ lbu $v0, 0x14($a0) +/* DDD0A8 80240878 10400009 */ beqz $v0, .L802408A0 +/* DDD0AC 8024087C 00000000 */ nop +/* DDD0B0 80240880 90820015 */ lbu $v0, 0x15($a0) +/* DDD0B4 80240884 00022600 */ sll $a0, $v0, 0x18 +/* DDD0B8 80240888 00041E03 */ sra $v1, $a0, 0x18 +/* DDD0BC 8024088C 00051400 */ sll $v0, $a1, 0x10 +/* DDD0C0 80240890 00021403 */ sra $v0, $v0, 0x10 +/* DDD0C4 80240894 0043102A */ slt $v0, $v0, $v1 +/* DDD0C8 80240898 10400003 */ beqz $v0, .L802408A8 +/* DDD0CC 8024089C 00000000 */ nop +.L802408A0: +/* DDD0D0 802408A0 03E00008 */ jr $ra +/* DDD0D4 802408A4 2402FFFF */ addiu $v0, $zero, -1 +.L802408A8: +/* DDD0D8 802408A8 03E00008 */ jr $ra +/* DDD0DC 802408AC 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s index e7f9f32c77..bdd6db4f0b 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s @@ -27,7 +27,7 @@ glabel func_802408B0_DDD0E0 /* DDD134 80240904 50400008 */ beql $v0, $zero, .L80240928 /* DDD138 80240908 26100001 */ addiu $s0, $s0, 1 /* DDD13C 8024090C 0200202D */ daddu $a0, $s0, $zero -/* DDD140 80240910 0C090219 */ jal func_80240864 +/* DDD140 80240910 0C090219 */ jal func_80240864_DDD094 /* DDD144 80240914 00122C03 */ sra $a1, $s2, 0x10 /* DDD148 80240918 10540003 */ beq $v0, $s4, .L80240928 /* DDD14C 8024091C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s index 7d9b73a34e..dd8842da04 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_8024095C_DDD18C.s @@ -49,7 +49,7 @@ glabel func_8024095C_DDD18C /* DDD238 80240A08 AE300108 */ sw $s0, 0x108($s1) /* DDD23C 80240A0C 8C420000 */ lw $v0, ($v0) /* DDD240 80240A10 02E0282D */ daddu $a1, $s7, $zero -/* DDD244 80240A14 0C090219 */ jal func_80240864 +/* DDD244 80240A14 0C090219 */ jal func_80240864_DDD094 /* DDD248 80240A18 AE220084 */ sw $v0, 0x84($s1) /* DDD24C 80240A1C 0040202D */ daddu $a0, $v0, $zero /* DDD250 80240A20 04800011 */ bltz $a0, .L80240A68 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408.s deleted file mode 100644 index e6b772c0df..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241408 -/* DDDC38 80241408 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DDDC3C 8024140C AFBF0018 */ sw $ra, 0x18($sp) -/* DDDC40 80241410 0C00EAD2 */ jal get_npc_safe -/* DDDC44 80241414 2404FFFC */ addiu $a0, $zero, -4 -/* DDDC48 80241418 3C0141F0 */ lui $at, 0x41f0 -/* DDDC4C 8024141C 44810000 */ mtc1 $at, $f0 -/* DDDC50 80241420 C442003C */ lwc1 $f2, 0x3c($v0) -/* DDDC54 80241424 46001080 */ add.s $f2, $f2, $f0 -/* DDDC58 80241428 E7A00010 */ swc1 $f0, 0x10($sp) -/* DDDC5C 8024142C 8C450038 */ lw $a1, 0x38($v0) -/* DDDC60 80241430 8C470040 */ lw $a3, 0x40($v0) -/* DDDC64 80241434 44061000 */ mfc1 $a2, $f2 -/* DDDC68 80241438 0C01BFBC */ jal func_8006FEF0 -/* DDDC6C 8024143C 24040002 */ addiu $a0, $zero, 2 -/* DDDC70 80241440 8FBF0018 */ lw $ra, 0x18($sp) -/* DDDC74 80241444 24020002 */ addiu $v0, $zero, 2 -/* DDDC78 80241448 03E00008 */ jr $ra -/* DDDC7C 8024144C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408_DDDC38.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408_DDDC38.s new file mode 100644 index 0000000000..334d976c83 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241408_DDDC38.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241408_DDDC38 +/* DDDC38 80241408 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DDDC3C 8024140C AFBF0018 */ sw $ra, 0x18($sp) +/* DDDC40 80241410 0C00EAD2 */ jal get_npc_safe +/* DDDC44 80241414 2404FFFC */ addiu $a0, $zero, -4 +/* DDDC48 80241418 3C0141F0 */ lui $at, 0x41f0 +/* DDDC4C 8024141C 44810000 */ mtc1 $at, $f0 +/* DDDC50 80241420 C442003C */ lwc1 $f2, 0x3c($v0) +/* DDDC54 80241424 46001080 */ add.s $f2, $f2, $f0 +/* DDDC58 80241428 E7A00010 */ swc1 $f0, 0x10($sp) +/* DDDC5C 8024142C 8C450038 */ lw $a1, 0x38($v0) +/* DDDC60 80241430 8C470040 */ lw $a3, 0x40($v0) +/* DDDC64 80241434 44061000 */ mfc1 $a2, $f2 +/* DDDC68 80241438 0C01BFBC */ jal func_8006FEF0 +/* DDDC6C 8024143C 24040002 */ addiu $a0, $zero, 2 +/* DDDC70 80241440 8FBF0018 */ lw $ra, 0x18($sp) +/* DDDC74 80241444 24020002 */ addiu $v0, $zero, 2 +/* DDDC78 80241448 03E00008 */ jr $ra +/* DDDC7C 8024144C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498.s deleted file mode 100644 index 2097302270..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241498 -/* DDDCC8 80241498 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* DDDCCC 8024149C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* DDDCD0 802414A0 AC800084 */ sw $zero, 0x84($a0) -/* DDDCD4 802414A4 80620000 */ lb $v0, ($v1) -/* DDDCD8 802414A8 10400005 */ beqz $v0, .L802414C0 -/* DDDCDC 802414AC 24020003 */ addiu $v0, $zero, 3 -/* DDDCE0 802414B0 80630003 */ lb $v1, 3($v1) -/* DDDCE4 802414B4 14620002 */ bne $v1, $v0, .L802414C0 -/* DDDCE8 802414B8 24020001 */ addiu $v0, $zero, 1 -/* DDDCEC 802414BC AC820084 */ sw $v0, 0x84($a0) -.L802414C0: -/* DDDCF0 802414C0 03E00008 */ jr $ra -/* DDDCF4 802414C4 24020002 */ addiu $v0, $zero, 2 -/* DDDCF8 802414C8 00000000 */ nop -/* DDDCFC 802414CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s new file mode 100644 index 0000000000..d6dd8544e4 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80241498_DDDCC8.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241498_DDDCC8 +/* DDDCC8 80241498 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* DDDCCC 8024149C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* DDDCD0 802414A0 AC800084 */ sw $zero, 0x84($a0) +/* DDDCD4 802414A4 80620000 */ lb $v0, ($v1) +/* DDDCD8 802414A8 10400005 */ beqz $v0, .L802414C0 +/* DDDCDC 802414AC 24020003 */ addiu $v0, $zero, 3 +/* DDDCE0 802414B0 80630003 */ lb $v1, 3($v1) +/* DDDCE4 802414B4 14620002 */ bne $v1, $v0, .L802414C0 +/* DDDCE8 802414B8 24020001 */ addiu $v0, $zero, 1 +/* DDDCEC 802414BC AC820084 */ sw $v0, 0x84($a0) +.L802414C0: +/* DDDCF0 802414C0 03E00008 */ jr $ra +/* DDDCF4 802414C4 24020002 */ addiu $v0, $zero, 2 +/* DDDCF8 802414C8 00000000 */ nop +/* DDDCFC 802414CC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802402DC.s b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802402DC.s deleted file mode 100644 index bb20647212..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802402DC.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402DC -/* DDF5EC 802402DC 3C03800B */ lui $v1, %hi(gCameras) -/* DDF5F0 802402E0 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DDF5F4 802402E4 94620000 */ lhu $v0, ($v1) -/* DDF5F8 802402E8 34421000 */ ori $v0, $v0, 0x1000 -/* DDF5FC 802402EC A4620000 */ sh $v0, ($v1) -/* DDF600 802402F0 03E00008 */ jr $ra -/* DDF604 802402F4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802402DC_DDF5EC.s b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802402DC_DDF5EC.s new file mode 100644 index 0000000000..f14380119a --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_12/DDF310/func_802402DC_DDF5EC.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402DC_DDF5EC +/* DDF5EC 802402DC 3C03800B */ lui $v1, %hi(gCameras) +/* DDF5F0 802402E0 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* DDF5F4 802402E4 94620000 */ lhu $v0, ($v1) +/* DDF5F8 802402E8 34421000 */ ori $v0, $v0, 0x1000 +/* DDF5FC 802402EC A4620000 */ sh $v0, ($v1) +/* DDF600 802402F0 03E00008 */ jr $ra +/* DDF604 802402F4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s index 0fee1a947a..5c9d53ebd1 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802404B8_DE2948.s @@ -173,7 +173,7 @@ glabel func_802404B8_DE2948 /* DE2BD0 80240740 00000000 */ nop /* DE2BD4 80240744 0260202D */ daddu $a0, $s3, $zero /* DE2BD8 80240748 0280282D */ daddu $a1, $s4, $zero -/* DE2BDC 8024074C 0C0900A0 */ jal func_80240280 +/* DE2BDC 8024074C 0C0900A0 */ jal func_80240280_DE2710 /* DE2BE0 80240750 02A0302D */ daddu $a2, $s5, $zero /* DE2BE4 80240754 8E630070 */ lw $v1, 0x70($s3) /* DE2BE8 80240758 2402000F */ addiu $v0, $zero, 0xf @@ -181,7 +181,7 @@ glabel func_802404B8_DE2948 /* DE2BF0 80240760 00000000 */ nop /* DE2BF4 80240764 0260202D */ daddu $a0, $s3, $zero /* DE2BF8 80240768 0280282D */ daddu $a1, $s4, $zero -/* DE2BFC 8024076C 0C0900BC */ jal func_802402F0 +/* DE2BFC 8024076C 0C0900BC */ jal func_802402F0_DE2780 /* DE2C00 80240770 02A0302D */ daddu $a2, $s5, $zero /* DE2C04 80240774 8E630070 */ lw $v1, 0x70($s3) /* DE2C08 80240778 24020010 */ addiu $v0, $zero, 0x10 @@ -189,7 +189,7 @@ glabel func_802404B8_DE2948 /* DE2C10 80240780 00000000 */ nop /* DE2C14 80240784 0260202D */ daddu $a0, $s3, $zero /* DE2C18 80240788 0280282D */ daddu $a1, $s4, $zero -/* DE2C1C 8024078C 0C0900F0 */ jal func_802403C0 +/* DE2C1C 8024078C 0C0900F0 */ jal func_802403C0_DE2850 /* DE2C20 80240790 02A0302D */ daddu $a2, $s5, $zero /* DE2C24 80240794 8E630070 */ lw $v1, 0x70($s3) /* DE2C28 80240798 24020011 */ addiu $v0, $zero, 0x11 @@ -197,7 +197,7 @@ glabel func_802404B8_DE2948 /* DE2C30 802407A0 00000000 */ nop /* DE2C34 802407A4 0260202D */ daddu $a0, $s3, $zero /* DE2C38 802407A8 0280282D */ daddu $a1, $s4, $zero -/* DE2C3C 802407AC 0C090116 */ jal func_80240458 +/* DE2C3C 802407AC 0C090116 */ jal func_80240458_DE28E8 /* DE2C40 802407B0 02A0302D */ daddu $a2, $s5, $zero /* DE2C44 802407B4 080901F1 */ j .L802407C4 /* DE2C48 802407B8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC.s deleted file mode 100644 index fefea9c696..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC.s +++ /dev/null @@ -1,24 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407EC -/* DE2C7C 802407EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE2C80 802407F0 AFB10014 */ sw $s1, 0x14($sp) -/* DE2C84 802407F4 0080882D */ daddu $s1, $a0, $zero -/* DE2C88 802407F8 AFBF0018 */ sw $ra, 0x18($sp) -/* DE2C8C 802407FC AFB00010 */ sw $s0, 0x10($sp) -/* DE2C90 80240800 8E300148 */ lw $s0, 0x148($s1) -/* DE2C94 80240804 0C00EABB */ jal get_npc_unsafe -/* DE2C98 80240808 86040008 */ lh $a0, 8($s0) -/* DE2C9C 8024080C 3C054387 */ lui $a1, 0x4387 -/* DE2CA0 80240810 0040202D */ daddu $a0, $v0, $zero -/* DE2CA4 80240814 0C00ECD0 */ jal set_npc_yaw -/* DE2CA8 80240818 A480008E */ sh $zero, 0x8e($a0) -/* DE2CAC 8024081C 24020003 */ addiu $v0, $zero, 3 -/* DE2CB0 80240820 AE00006C */ sw $zero, 0x6c($s0) -/* DE2CB4 80240824 AE220070 */ sw $v0, 0x70($s1) -/* DE2CB8 80240828 8FBF0018 */ lw $ra, 0x18($sp) -/* DE2CBC 8024082C 8FB10014 */ lw $s1, 0x14($sp) -/* DE2CC0 80240830 8FB00010 */ lw $s0, 0x10($sp) -/* DE2CC4 80240834 03E00008 */ jr $ra -/* DE2CC8 80240838 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC_DE2C7C.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC_DE2C7C.s new file mode 100644 index 0000000000..218372290f --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_802407EC_DE2C7C.s @@ -0,0 +1,24 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407EC_DE2C7C +/* DE2C7C 802407EC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DE2C80 802407F0 AFB10014 */ sw $s1, 0x14($sp) +/* DE2C84 802407F4 0080882D */ daddu $s1, $a0, $zero +/* DE2C88 802407F8 AFBF0018 */ sw $ra, 0x18($sp) +/* DE2C8C 802407FC AFB00010 */ sw $s0, 0x10($sp) +/* DE2C90 80240800 8E300148 */ lw $s0, 0x148($s1) +/* DE2C94 80240804 0C00EABB */ jal get_npc_unsafe +/* DE2C98 80240808 86040008 */ lh $a0, 8($s0) +/* DE2C9C 8024080C 3C054387 */ lui $a1, 0x4387 +/* DE2CA0 80240810 0040202D */ daddu $a0, $v0, $zero +/* DE2CA4 80240814 0C00ECD0 */ jal set_npc_yaw +/* DE2CA8 80240818 A480008E */ sh $zero, 0x8e($a0) +/* DE2CAC 8024081C 24020003 */ addiu $v0, $zero, 3 +/* DE2CB0 80240820 AE00006C */ sw $zero, 0x6c($s0) +/* DE2CB4 80240824 AE220070 */ sw $v0, 0x70($s1) +/* DE2CB8 80240828 8FBF0018 */ lw $ra, 0x18($sp) +/* DE2CBC 8024082C 8FB10014 */ lw $s1, 0x14($sp) +/* DE2CC0 80240830 8FB00010 */ lw $s0, 0x10($sp) +/* DE2CC4 80240834 03E00008 */ jr $ra +/* DE2CC8 80240838 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s index a74fc6ddb2..fbb7b9f23d 100644 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80240A00_DE2E90.s @@ -141,11 +141,11 @@ glabel func_80240A00_DE2E90 /* DE3098 80240C08 00000000 */ nop /* DE309C 80240C0C 0260202D */ daddu $a0, $s3, $zero /* DE30A0 80240C10 0280282D */ daddu $a1, $s4, $zero -/* DE30A4 80240C14 0C0901FB */ jal func_802407EC +/* DE30A4 80240C14 0C0901FB */ jal func_802407EC_DE2C7C /* DE30A8 80240C18 02A0302D */ daddu $a2, $s5, $zero /* DE30AC 80240C1C 0260202D */ daddu $a0, $s3, $zero /* DE30B0 80240C20 0280282D */ daddu $a1, $s4, $zero -/* DE30B4 80240C24 0C09020F */ jal func_8024083C +/* DE30B4 80240C24 0C09020F */ jal func_8024083C_DE2CCC /* DE30B8 80240C28 02A0302D */ daddu $a2, $s5, $zero /* DE30BC 80240C2C 0809032B */ j .L80240CAC /* DE30C0 80240C30 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028.s deleted file mode 100644 index 54d0ad799a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028.s +++ /dev/null @@ -1,142 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241028 -/* DE34B8 80241028 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* DE34BC 8024102C AFB20018 */ sw $s2, 0x18($sp) -/* DE34C0 80241030 0080902D */ daddu $s2, $a0, $zero -/* DE34C4 80241034 AFBF001C */ sw $ra, 0x1c($sp) -/* DE34C8 80241038 AFB10014 */ sw $s1, 0x14($sp) -/* DE34CC 8024103C AFB00010 */ sw $s0, 0x10($sp) -/* DE34D0 80241040 F7B80030 */ sdc1 $f24, 0x30($sp) -/* DE34D4 80241044 F7B60028 */ sdc1 $f22, 0x28($sp) -/* DE34D8 80241048 F7B40020 */ sdc1 $f20, 0x20($sp) -/* DE34DC 8024104C 0C00EAD2 */ jal get_npc_safe -/* DE34E0 80241050 0000202D */ daddu $a0, $zero, $zero -/* DE34E4 80241054 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* DE34E8 80241058 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* DE34EC 8024105C 0040802D */ daddu $s0, $v0, $zero -/* DE34F0 80241060 8E260028 */ lw $a2, 0x28($s1) -/* DE34F4 80241064 8E270030 */ lw $a3, 0x30($s1) -/* DE34F8 80241068 3C0142DC */ lui $at, 0x42dc -/* DE34FC 8024106C 4481A000 */ mtc1 $at, $f20 -/* DE3500 80241070 3C01C234 */ lui $at, 0xc234 -/* DE3504 80241074 4481B000 */ mtc1 $at, $f22 -/* DE3508 80241078 4600A306 */ mov.s $f12, $f20 -/* DE350C 8024107C 0C00A7B5 */ jal dist2D -/* DE3510 80241080 4600B386 */ mov.s $f14, $f22 -/* DE3514 80241084 4600A306 */ mov.s $f12, $f20 -/* DE3518 80241088 8E260028 */ lw $a2, 0x28($s1) -/* DE351C 8024108C 8E270030 */ lw $a3, 0x30($s1) -/* DE3520 80241090 0C00A720 */ jal atan2 -/* DE3524 80241094 4600B386 */ mov.s $f14, $f22 -/* DE3528 80241098 0C00A6C9 */ jal clamp_angle -/* DE352C 8024109C 46000306 */ mov.s $f12, $f0 -/* DE3530 802410A0 46000586 */ mov.s $f22, $f0 -/* DE3534 802410A4 0C00A8BB */ jal sin_deg -/* DE3538 802410A8 4600B306 */ mov.s $f12, $f22 -/* DE353C 802410AC 3C0141F0 */ lui $at, 0x41f0 -/* DE3540 802410B0 44811000 */ mtc1 $at, $f2 -/* DE3544 802410B4 00000000 */ nop -/* DE3548 802410B8 46020002 */ mul.s $f0, $f0, $f2 -/* DE354C 802410BC 00000000 */ nop -/* DE3550 802410C0 8E4200B0 */ lw $v0, 0xb0($s2) -/* DE3554 802410C4 10400009 */ beqz $v0, .L802410EC -/* DE3558 802410C8 46140600 */ add.s $f24, $f0, $f20 -/* DE355C 802410CC C622002C */ lwc1 $f2, 0x2c($s1) -/* DE3560 802410D0 3C013F33 */ lui $at, 0x3f33 -/* DE3564 802410D4 34213333 */ ori $at, $at, 0x3333 -/* DE3568 802410D8 44810000 */ mtc1 $at, $f0 -/* DE356C 802410DC 00000000 */ nop -/* DE3570 802410E0 46001502 */ mul.s $f20, $f2, $f0 -/* DE3574 802410E4 0809043C */ j .L802410F0 -/* DE3578 802410E8 00000000 */ nop -.L802410EC: -/* DE357C 802410EC C614003C */ lwc1 $f20, 0x3c($s0) -.L802410F0: -/* DE3580 802410F0 0C00A8D4 */ jal cos_deg -/* DE3584 802410F4 4600B306 */ mov.s $f12, $f22 -/* DE3588 802410F8 3C0141F0 */ lui $at, 0x41f0 -/* DE358C 802410FC 44811000 */ mtc1 $at, $f2 -/* DE3590 80241100 00000000 */ nop -/* DE3594 80241104 46020002 */ mul.s $f0, $f0, $f2 -/* DE3598 80241108 00000000 */ nop -/* DE359C 8024110C 3C01C234 */ lui $at, 0xc234 -/* DE35A0 80241110 44811000 */ mtc1 $at, $f2 -/* DE35A4 80241114 8E4200B0 */ lw $v0, 0xb0($s2) -/* DE35A8 80241118 10400008 */ beqz $v0, .L8024113C -/* DE35AC 8024111C 46001101 */ sub.s $f4, $f2, $f0 -/* DE35B0 80241120 C602003C */ lwc1 $f2, 0x3c($s0) -/* DE35B4 80241124 44800000 */ mtc1 $zero, $f0 -/* DE35B8 80241128 00000000 */ nop -/* DE35BC 8024112C 46001032 */ c.eq.s $f2, $f0 -/* DE35C0 80241130 00000000 */ nop -/* DE35C4 80241134 45030001 */ bc1tl .L8024113C -/* DE35C8 80241138 AE4000B0 */ sw $zero, 0xb0($s2) -.L8024113C: -/* DE35CC 8024113C C6000038 */ lwc1 $f0, 0x38($s0) -/* DE35D0 80241140 46180032 */ c.eq.s $f0, $f24 -/* DE35D4 80241144 00000000 */ nop -/* DE35D8 80241148 4500000C */ bc1f .L8024117C -/* DE35DC 8024114C 3C04003B */ lui $a0, 0x3b -/* DE35E0 80241150 C600003C */ lwc1 $f0, 0x3c($s0) -/* DE35E4 80241154 46140032 */ c.eq.s $f0, $f20 -/* DE35E8 80241158 00000000 */ nop -/* DE35EC 8024115C 45000007 */ bc1f .L8024117C -/* DE35F0 80241160 00000000 */ nop -/* DE35F4 80241164 C6000040 */ lwc1 $f0, 0x40($s0) -/* DE35F8 80241168 46040032 */ c.eq.s $f0, $f4 -/* DE35FC 8024116C 00000000 */ nop -/* DE3600 80241170 4501001A */ bc1t .L802411DC -/* DE3604 80241174 3C03003B */ lui $v1, 0x3b -/* DE3608 80241178 3C04003B */ lui $a0, 0x3b -.L8024117C: -/* DE360C 8024117C 8E020028 */ lw $v0, 0x28($s0) -/* DE3610 80241180 34840502 */ ori $a0, $a0, 0x502 -/* DE3614 80241184 5044000A */ beql $v0, $a0, .L802411B0 -/* DE3618 80241188 E6180038 */ swc1 $f24, 0x38($s0) -/* DE361C 8024118C 8E4200AC */ lw $v0, 0xac($s2) -/* DE3620 80241190 0040182D */ daddu $v1, $v0, $zero -/* DE3624 80241194 24420001 */ addiu $v0, $v0, 1 -/* DE3628 80241198 28630006 */ slti $v1, $v1, 6 -/* DE362C 8024119C 14600003 */ bnez $v1, .L802411AC -/* DE3630 802411A0 AE4200AC */ sw $v0, 0xac($s2) -/* DE3634 802411A4 AE040028 */ sw $a0, 0x28($s0) -/* DE3638 802411A8 AE4000AC */ sw $zero, 0xac($s2) -.L802411AC: -/* DE363C 802411AC E6180038 */ swc1 $f24, 0x38($s0) -.L802411B0: -/* DE3640 802411B0 4600C006 */ mov.s $f0, $f24 -/* DE3644 802411B4 C602003C */ lwc1 $f2, 0x3c($s0) -/* DE3648 802411B8 8E020000 */ lw $v0, ($s0) -/* DE364C 802411BC 3C030001 */ lui $v1, 1 -/* DE3650 802411C0 E6040040 */ swc1 $f4, 0x40($s0) -/* DE3654 802411C4 E600006C */ swc1 $f0, 0x6c($s0) -/* DE3658 802411C8 E6040074 */ swc1 $f4, 0x74($s0) -/* DE365C 802411CC 00431025 */ or $v0, $v0, $v1 -/* DE3660 802411D0 E6020070 */ swc1 $f2, 0x70($s0) -/* DE3664 802411D4 0809047B */ j .L802411EC -/* DE3668 802411D8 AE020000 */ sw $v0, ($s0) -.L802411DC: -/* DE366C 802411DC 8E020028 */ lw $v0, 0x28($s0) -/* DE3670 802411E0 34630501 */ ori $v1, $v1, 0x501 -/* DE3674 802411E4 54430001 */ bnel $v0, $v1, .L802411EC -/* DE3678 802411E8 AE030028 */ sw $v1, 0x28($s0) -.L802411EC: -/* DE367C 802411EC C60C0038 */ lwc1 $f12, 0x38($s0) -/* DE3680 802411F0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DE3684 802411F4 8E260028 */ lw $a2, 0x28($s1) -/* DE3688 802411F8 0C00A720 */ jal atan2 -/* DE368C 802411FC 8E270030 */ lw $a3, 0x30($s1) -/* DE3690 80241200 E600000C */ swc1 $f0, 0xc($s0) -/* DE3694 80241204 8FBF001C */ lw $ra, 0x1c($sp) -/* DE3698 80241208 8FB20018 */ lw $s2, 0x18($sp) -/* DE369C 8024120C 8FB10014 */ lw $s1, 0x14($sp) -/* DE36A0 80241210 8FB00010 */ lw $s0, 0x10($sp) -/* DE36A4 80241214 D7B80030 */ ldc1 $f24, 0x30($sp) -/* DE36A8 80241218 D7B60028 */ ldc1 $f22, 0x28($sp) -/* DE36AC 8024121C D7B40020 */ ldc1 $f20, 0x20($sp) -/* DE36B0 80241220 24020002 */ addiu $v0, $zero, 2 -/* DE36B4 80241224 03E00008 */ jr $ra -/* DE36B8 80241228 27BD0038 */ addiu $sp, $sp, 0x38 -/* DE36BC 8024122C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028_DE34B8.s b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028_DE34B8.s new file mode 100644 index 0000000000..982015d27d --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_13/DE2710/func_80241028_DE34B8.s @@ -0,0 +1,142 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241028_DE34B8 +/* DE34B8 80241028 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* DE34BC 8024102C AFB20018 */ sw $s2, 0x18($sp) +/* DE34C0 80241030 0080902D */ daddu $s2, $a0, $zero +/* DE34C4 80241034 AFBF001C */ sw $ra, 0x1c($sp) +/* DE34C8 80241038 AFB10014 */ sw $s1, 0x14($sp) +/* DE34CC 8024103C AFB00010 */ sw $s0, 0x10($sp) +/* DE34D0 80241040 F7B80030 */ sdc1 $f24, 0x30($sp) +/* DE34D4 80241044 F7B60028 */ sdc1 $f22, 0x28($sp) +/* DE34D8 80241048 F7B40020 */ sdc1 $f20, 0x20($sp) +/* DE34DC 8024104C 0C00EAD2 */ jal get_npc_safe +/* DE34E0 80241050 0000202D */ daddu $a0, $zero, $zero +/* DE34E4 80241054 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* DE34E8 80241058 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* DE34EC 8024105C 0040802D */ daddu $s0, $v0, $zero +/* DE34F0 80241060 8E260028 */ lw $a2, 0x28($s1) +/* DE34F4 80241064 8E270030 */ lw $a3, 0x30($s1) +/* DE34F8 80241068 3C0142DC */ lui $at, 0x42dc +/* DE34FC 8024106C 4481A000 */ mtc1 $at, $f20 +/* DE3500 80241070 3C01C234 */ lui $at, 0xc234 +/* DE3504 80241074 4481B000 */ mtc1 $at, $f22 +/* DE3508 80241078 4600A306 */ mov.s $f12, $f20 +/* DE350C 8024107C 0C00A7B5 */ jal dist2D +/* DE3510 80241080 4600B386 */ mov.s $f14, $f22 +/* DE3514 80241084 4600A306 */ mov.s $f12, $f20 +/* DE3518 80241088 8E260028 */ lw $a2, 0x28($s1) +/* DE351C 8024108C 8E270030 */ lw $a3, 0x30($s1) +/* DE3520 80241090 0C00A720 */ jal atan2 +/* DE3524 80241094 4600B386 */ mov.s $f14, $f22 +/* DE3528 80241098 0C00A6C9 */ jal clamp_angle +/* DE352C 8024109C 46000306 */ mov.s $f12, $f0 +/* DE3530 802410A0 46000586 */ mov.s $f22, $f0 +/* DE3534 802410A4 0C00A8BB */ jal sin_deg +/* DE3538 802410A8 4600B306 */ mov.s $f12, $f22 +/* DE353C 802410AC 3C0141F0 */ lui $at, 0x41f0 +/* DE3540 802410B0 44811000 */ mtc1 $at, $f2 +/* DE3544 802410B4 00000000 */ nop +/* DE3548 802410B8 46020002 */ mul.s $f0, $f0, $f2 +/* DE354C 802410BC 00000000 */ nop +/* DE3550 802410C0 8E4200B0 */ lw $v0, 0xb0($s2) +/* DE3554 802410C4 10400009 */ beqz $v0, .L802410EC +/* DE3558 802410C8 46140600 */ add.s $f24, $f0, $f20 +/* DE355C 802410CC C622002C */ lwc1 $f2, 0x2c($s1) +/* DE3560 802410D0 3C013F33 */ lui $at, 0x3f33 +/* DE3564 802410D4 34213333 */ ori $at, $at, 0x3333 +/* DE3568 802410D8 44810000 */ mtc1 $at, $f0 +/* DE356C 802410DC 00000000 */ nop +/* DE3570 802410E0 46001502 */ mul.s $f20, $f2, $f0 +/* DE3574 802410E4 0809043C */ j .L802410F0 +/* DE3578 802410E8 00000000 */ nop +.L802410EC: +/* DE357C 802410EC C614003C */ lwc1 $f20, 0x3c($s0) +.L802410F0: +/* DE3580 802410F0 0C00A8D4 */ jal cos_deg +/* DE3584 802410F4 4600B306 */ mov.s $f12, $f22 +/* DE3588 802410F8 3C0141F0 */ lui $at, 0x41f0 +/* DE358C 802410FC 44811000 */ mtc1 $at, $f2 +/* DE3590 80241100 00000000 */ nop +/* DE3594 80241104 46020002 */ mul.s $f0, $f0, $f2 +/* DE3598 80241108 00000000 */ nop +/* DE359C 8024110C 3C01C234 */ lui $at, 0xc234 +/* DE35A0 80241110 44811000 */ mtc1 $at, $f2 +/* DE35A4 80241114 8E4200B0 */ lw $v0, 0xb0($s2) +/* DE35A8 80241118 10400008 */ beqz $v0, .L8024113C +/* DE35AC 8024111C 46001101 */ sub.s $f4, $f2, $f0 +/* DE35B0 80241120 C602003C */ lwc1 $f2, 0x3c($s0) +/* DE35B4 80241124 44800000 */ mtc1 $zero, $f0 +/* DE35B8 80241128 00000000 */ nop +/* DE35BC 8024112C 46001032 */ c.eq.s $f2, $f0 +/* DE35C0 80241130 00000000 */ nop +/* DE35C4 80241134 45030001 */ bc1tl .L8024113C +/* DE35C8 80241138 AE4000B0 */ sw $zero, 0xb0($s2) +.L8024113C: +/* DE35CC 8024113C C6000038 */ lwc1 $f0, 0x38($s0) +/* DE35D0 80241140 46180032 */ c.eq.s $f0, $f24 +/* DE35D4 80241144 00000000 */ nop +/* DE35D8 80241148 4500000C */ bc1f .L8024117C +/* DE35DC 8024114C 3C04003B */ lui $a0, 0x3b +/* DE35E0 80241150 C600003C */ lwc1 $f0, 0x3c($s0) +/* DE35E4 80241154 46140032 */ c.eq.s $f0, $f20 +/* DE35E8 80241158 00000000 */ nop +/* DE35EC 8024115C 45000007 */ bc1f .L8024117C +/* DE35F0 80241160 00000000 */ nop +/* DE35F4 80241164 C6000040 */ lwc1 $f0, 0x40($s0) +/* DE35F8 80241168 46040032 */ c.eq.s $f0, $f4 +/* DE35FC 8024116C 00000000 */ nop +/* DE3600 80241170 4501001A */ bc1t .L802411DC +/* DE3604 80241174 3C03003B */ lui $v1, 0x3b +/* DE3608 80241178 3C04003B */ lui $a0, 0x3b +.L8024117C: +/* DE360C 8024117C 8E020028 */ lw $v0, 0x28($s0) +/* DE3610 80241180 34840502 */ ori $a0, $a0, 0x502 +/* DE3614 80241184 5044000A */ beql $v0, $a0, .L802411B0 +/* DE3618 80241188 E6180038 */ swc1 $f24, 0x38($s0) +/* DE361C 8024118C 8E4200AC */ lw $v0, 0xac($s2) +/* DE3620 80241190 0040182D */ daddu $v1, $v0, $zero +/* DE3624 80241194 24420001 */ addiu $v0, $v0, 1 +/* DE3628 80241198 28630006 */ slti $v1, $v1, 6 +/* DE362C 8024119C 14600003 */ bnez $v1, .L802411AC +/* DE3630 802411A0 AE4200AC */ sw $v0, 0xac($s2) +/* DE3634 802411A4 AE040028 */ sw $a0, 0x28($s0) +/* DE3638 802411A8 AE4000AC */ sw $zero, 0xac($s2) +.L802411AC: +/* DE363C 802411AC E6180038 */ swc1 $f24, 0x38($s0) +.L802411B0: +/* DE3640 802411B0 4600C006 */ mov.s $f0, $f24 +/* DE3644 802411B4 C602003C */ lwc1 $f2, 0x3c($s0) +/* DE3648 802411B8 8E020000 */ lw $v0, ($s0) +/* DE364C 802411BC 3C030001 */ lui $v1, 1 +/* DE3650 802411C0 E6040040 */ swc1 $f4, 0x40($s0) +/* DE3654 802411C4 E600006C */ swc1 $f0, 0x6c($s0) +/* DE3658 802411C8 E6040074 */ swc1 $f4, 0x74($s0) +/* DE365C 802411CC 00431025 */ or $v0, $v0, $v1 +/* DE3660 802411D0 E6020070 */ swc1 $f2, 0x70($s0) +/* DE3664 802411D4 0809047B */ j .L802411EC +/* DE3668 802411D8 AE020000 */ sw $v0, ($s0) +.L802411DC: +/* DE366C 802411DC 8E020028 */ lw $v0, 0x28($s0) +/* DE3670 802411E0 34630501 */ ori $v1, $v1, 0x501 +/* DE3674 802411E4 54430001 */ bnel $v0, $v1, .L802411EC +/* DE3678 802411E8 AE030028 */ sw $v1, 0x28($s0) +.L802411EC: +/* DE367C 802411EC C60C0038 */ lwc1 $f12, 0x38($s0) +/* DE3680 802411F0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* DE3684 802411F4 8E260028 */ lw $a2, 0x28($s1) +/* DE3688 802411F8 0C00A720 */ jal atan2 +/* DE368C 802411FC 8E270030 */ lw $a3, 0x30($s1) +/* DE3690 80241200 E600000C */ swc1 $f0, 0xc($s0) +/* DE3694 80241204 8FBF001C */ lw $ra, 0x1c($sp) +/* DE3698 80241208 8FB20018 */ lw $s2, 0x18($sp) +/* DE369C 8024120C 8FB10014 */ lw $s1, 0x14($sp) +/* DE36A0 80241210 8FB00010 */ lw $s0, 0x10($sp) +/* DE36A4 80241214 D7B80030 */ ldc1 $f24, 0x30($sp) +/* DE36A8 80241218 D7B60028 */ ldc1 $f22, 0x28($sp) +/* DE36AC 8024121C D7B40020 */ ldc1 $f20, 0x20($sp) +/* DE36B0 80241220 24020002 */ addiu $v0, $zero, 2 +/* DE36B4 80241224 03E00008 */ jr $ra +/* DE36B8 80241228 27BD0038 */ addiu $sp, $sp, 0x38 +/* DE36BC 8024122C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348.s deleted file mode 100644 index bf3a044d22..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241348 -/* DE37D8 80241348 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* DE37DC 8024134C AFB10014 */ sw $s1, 0x14($sp) -/* DE37E0 80241350 0080882D */ daddu $s1, $a0, $zero -/* DE37E4 80241354 AFBF001C */ sw $ra, 0x1c($sp) -/* DE37E8 80241358 AFB20018 */ sw $s2, 0x18($sp) -/* DE37EC 8024135C AFB00010 */ sw $s0, 0x10($sp) -/* DE37F0 80241360 8E240084 */ lw $a0, 0x84($s1) -/* DE37F4 80241364 0C04C3D6 */ jal get_item_entity -/* DE37F8 80241368 00A0802D */ daddu $s0, $a1, $zero -/* DE37FC 8024136C 12000005 */ beqz $s0, .L80241384 -/* DE3800 80241370 0040902D */ daddu $s2, $v0, $zero -/* DE3804 80241374 C640000C */ lwc1 $f0, 0xc($s2) -/* DE3808 80241378 AE200074 */ sw $zero, 0x74($s1) -/* DE380C 8024137C AE20007C */ sw $zero, 0x7c($s1) -/* DE3810 80241380 E6200078 */ swc1 $f0, 0x78($s1) -.L80241384: -/* DE3814 80241384 8E230074 */ lw $v1, 0x74($s1) -/* DE3818 80241388 10600005 */ beqz $v1, .L802413A0 -/* DE381C 8024138C 24020001 */ addiu $v0, $zero, 1 -/* DE3820 80241390 10620024 */ beq $v1, $v0, .L80241424 -/* DE3824 80241394 00000000 */ nop -/* DE3828 80241398 0809051F */ j .L8024147C -/* DE382C 8024139C 00000000 */ nop -.L802413A0: -/* DE3830 802413A0 3C013FC9 */ lui $at, 0x3fc9 -/* DE3834 802413A4 34210FD8 */ ori $at, $at, 0xfd8 -/* DE3838 802413A8 44810000 */ mtc1 $at, $f0 -/* DE383C 802413AC C62C007C */ lwc1 $f12, 0x7c($s1) -/* DE3840 802413B0 46806320 */ cvt.s.w $f12, $f12 -/* DE3844 802413B4 46006302 */ mul.s $f12, $f12, $f0 -/* DE3848 802413B8 00000000 */ nop -/* DE384C 802413BC 3C0141F0 */ lui $at, 0x41f0 -/* DE3850 802413C0 44810000 */ mtc1 $at, $f0 -/* DE3854 802413C4 0C00A874 */ jal cos_rad -/* DE3858 802413C8 46006303 */ div.s $f12, $f12, $f0 -/* DE385C 802413CC 3C013F80 */ lui $at, 0x3f80 -/* DE3860 802413D0 44811000 */ mtc1 $at, $f2 -/* DE3864 802413D4 00000000 */ nop -/* DE3868 802413D8 46001081 */ sub.s $f2, $f2, $f0 -/* DE386C 802413DC 3C0141A0 */ lui $at, 0x41a0 -/* DE3870 802413E0 44810000 */ mtc1 $at, $f0 -/* DE3874 802413E4 00000000 */ nop -/* DE3878 802413E8 46001082 */ mul.s $f2, $f2, $f0 -/* DE387C 802413EC 00000000 */ nop -/* DE3880 802413F0 C6200078 */ lwc1 $f0, 0x78($s1) -/* DE3884 802413F4 46020000 */ add.s $f0, $f0, $f2 -/* DE3888 802413F8 E640000C */ swc1 $f0, 0xc($s2) -/* DE388C 802413FC 8E23007C */ lw $v1, 0x7c($s1) -/* DE3890 80241400 2402001E */ addiu $v0, $zero, 0x1e -/* DE3894 80241404 14620005 */ bne $v1, $v0, .L8024141C -/* DE3898 80241408 24620001 */ addiu $v0, $v1, 1 -/* DE389C 8024140C 24020001 */ addiu $v0, $zero, 1 -/* DE38A0 80241410 AE220074 */ sw $v0, 0x74($s1) -/* DE38A4 80241414 0809051F */ j .L8024147C -/* DE38A8 80241418 AE20007C */ sw $zero, 0x7c($s1) -.L8024141C: -/* DE38AC 8024141C 0809051F */ j .L8024147C -/* DE38B0 80241420 AE22007C */ sw $v0, 0x7c($s1) -.L80241424: -/* DE38B4 80241424 C62C007C */ lwc1 $f12, 0x7c($s1) -/* DE38B8 80241428 0C00A8D4 */ jal cos_deg -/* DE38BC 8024142C 46806320 */ cvt.s.w $f12, $f12 -/* DE38C0 80241430 3C014040 */ lui $at, 0x4040 -/* DE38C4 80241434 44811000 */ mtc1 $at, $f2 -/* DE38C8 80241438 00000000 */ nop -/* DE38CC 8024143C 46020002 */ mul.s $f0, $f0, $f2 -/* DE38D0 80241440 00000000 */ nop -/* DE38D4 80241444 3C014188 */ lui $at, 0x4188 -/* DE38D8 80241448 44812000 */ mtc1 $at, $f4 -/* DE38DC 8024144C C6220078 */ lwc1 $f2, 0x78($s1) -/* DE38E0 80241450 46041080 */ add.s $f2, $f2, $f4 -/* DE38E4 80241454 46001080 */ add.s $f2, $f2, $f0 -/* DE38E8 80241458 E642000C */ swc1 $f2, 0xc($s2) -/* DE38EC 8024145C 8E22007C */ lw $v0, 0x7c($s1) -/* DE38F0 80241460 24420009 */ addiu $v0, $v0, 9 -/* DE38F4 80241464 44826000 */ mtc1 $v0, $f12 -/* DE38F8 80241468 00000000 */ nop -/* DE38FC 8024146C 0C00A6C9 */ jal clamp_angle -/* DE3900 80241470 46806320 */ cvt.s.w $f12, $f12 -/* DE3904 80241474 4600018D */ trunc.w.s $f6, $f0 -/* DE3908 80241478 E626007C */ swc1 $f6, 0x7c($s1) -.L8024147C: -/* DE390C 8024147C 8FBF001C */ lw $ra, 0x1c($sp) -/* DE3910 80241480 8FB20018 */ lw $s2, 0x18($sp) -/* DE3914 80241484 8FB10014 */ lw $s1, 0x14($sp) -/* DE3918 80241488 8FB00010 */ lw $s0, 0x10($sp) -/* DE391C 8024148C 0000102D */ daddu $v0, $zero, $zero -/* DE3920 80241490 03E00008 */ jr $ra -/* DE3924 80241494 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s new file mode 100644 index 0000000000..50c5cc4781 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_13/DE36C0/func_80241348_DE37D8.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241348_DE37D8 +/* DE37D8 80241348 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* DE37DC 8024134C AFB10014 */ sw $s1, 0x14($sp) +/* DE37E0 80241350 0080882D */ daddu $s1, $a0, $zero +/* DE37E4 80241354 AFBF001C */ sw $ra, 0x1c($sp) +/* DE37E8 80241358 AFB20018 */ sw $s2, 0x18($sp) +/* DE37EC 8024135C AFB00010 */ sw $s0, 0x10($sp) +/* DE37F0 80241360 8E240084 */ lw $a0, 0x84($s1) +/* DE37F4 80241364 0C04C3D6 */ jal get_item_entity +/* DE37F8 80241368 00A0802D */ daddu $s0, $a1, $zero +/* DE37FC 8024136C 12000005 */ beqz $s0, .L80241384 +/* DE3800 80241370 0040902D */ daddu $s2, $v0, $zero +/* DE3804 80241374 C640000C */ lwc1 $f0, 0xc($s2) +/* DE3808 80241378 AE200074 */ sw $zero, 0x74($s1) +/* DE380C 8024137C AE20007C */ sw $zero, 0x7c($s1) +/* DE3810 80241380 E6200078 */ swc1 $f0, 0x78($s1) +.L80241384: +/* DE3814 80241384 8E230074 */ lw $v1, 0x74($s1) +/* DE3818 80241388 10600005 */ beqz $v1, .L802413A0 +/* DE381C 8024138C 24020001 */ addiu $v0, $zero, 1 +/* DE3820 80241390 10620024 */ beq $v1, $v0, .L80241424 +/* DE3824 80241394 00000000 */ nop +/* DE3828 80241398 0809051F */ j .L8024147C +/* DE382C 8024139C 00000000 */ nop +.L802413A0: +/* DE3830 802413A0 3C013FC9 */ lui $at, 0x3fc9 +/* DE3834 802413A4 34210FD8 */ ori $at, $at, 0xfd8 +/* DE3838 802413A8 44810000 */ mtc1 $at, $f0 +/* DE383C 802413AC C62C007C */ lwc1 $f12, 0x7c($s1) +/* DE3840 802413B0 46806320 */ cvt.s.w $f12, $f12 +/* DE3844 802413B4 46006302 */ mul.s $f12, $f12, $f0 +/* DE3848 802413B8 00000000 */ nop +/* DE384C 802413BC 3C0141F0 */ lui $at, 0x41f0 +/* DE3850 802413C0 44810000 */ mtc1 $at, $f0 +/* DE3854 802413C4 0C00A874 */ jal cos_rad +/* DE3858 802413C8 46006303 */ div.s $f12, $f12, $f0 +/* DE385C 802413CC 3C013F80 */ lui $at, 0x3f80 +/* DE3860 802413D0 44811000 */ mtc1 $at, $f2 +/* DE3864 802413D4 00000000 */ nop +/* DE3868 802413D8 46001081 */ sub.s $f2, $f2, $f0 +/* DE386C 802413DC 3C0141A0 */ lui $at, 0x41a0 +/* DE3870 802413E0 44810000 */ mtc1 $at, $f0 +/* DE3874 802413E4 00000000 */ nop +/* DE3878 802413E8 46001082 */ mul.s $f2, $f2, $f0 +/* DE387C 802413EC 00000000 */ nop +/* DE3880 802413F0 C6200078 */ lwc1 $f0, 0x78($s1) +/* DE3884 802413F4 46020000 */ add.s $f0, $f0, $f2 +/* DE3888 802413F8 E640000C */ swc1 $f0, 0xc($s2) +/* DE388C 802413FC 8E23007C */ lw $v1, 0x7c($s1) +/* DE3890 80241400 2402001E */ addiu $v0, $zero, 0x1e +/* DE3894 80241404 14620005 */ bne $v1, $v0, .L8024141C +/* DE3898 80241408 24620001 */ addiu $v0, $v1, 1 +/* DE389C 8024140C 24020001 */ addiu $v0, $zero, 1 +/* DE38A0 80241410 AE220074 */ sw $v0, 0x74($s1) +/* DE38A4 80241414 0809051F */ j .L8024147C +/* DE38A8 80241418 AE20007C */ sw $zero, 0x7c($s1) +.L8024141C: +/* DE38AC 8024141C 0809051F */ j .L8024147C +/* DE38B0 80241420 AE22007C */ sw $v0, 0x7c($s1) +.L80241424: +/* DE38B4 80241424 C62C007C */ lwc1 $f12, 0x7c($s1) +/* DE38B8 80241428 0C00A8D4 */ jal cos_deg +/* DE38BC 8024142C 46806320 */ cvt.s.w $f12, $f12 +/* DE38C0 80241430 3C014040 */ lui $at, 0x4040 +/* DE38C4 80241434 44811000 */ mtc1 $at, $f2 +/* DE38C8 80241438 00000000 */ nop +/* DE38CC 8024143C 46020002 */ mul.s $f0, $f0, $f2 +/* DE38D0 80241440 00000000 */ nop +/* DE38D4 80241444 3C014188 */ lui $at, 0x4188 +/* DE38D8 80241448 44812000 */ mtc1 $at, $f4 +/* DE38DC 8024144C C6220078 */ lwc1 $f2, 0x78($s1) +/* DE38E0 80241450 46041080 */ add.s $f2, $f2, $f4 +/* DE38E4 80241454 46001080 */ add.s $f2, $f2, $f0 +/* DE38E8 80241458 E642000C */ swc1 $f2, 0xc($s2) +/* DE38EC 8024145C 8E22007C */ lw $v0, 0x7c($s1) +/* DE38F0 80241460 24420009 */ addiu $v0, $v0, 9 +/* DE38F4 80241464 44826000 */ mtc1 $v0, $f12 +/* DE38F8 80241468 00000000 */ nop +/* DE38FC 8024146C 0C00A6C9 */ jal clamp_angle +/* DE3900 80241470 46806320 */ cvt.s.w $f12, $f12 +/* DE3904 80241474 4600018D */ trunc.w.s $f6, $f0 +/* DE3908 80241478 E626007C */ swc1 $f6, 0x7c($s1) +.L8024147C: +/* DE390C 8024147C 8FBF001C */ lw $ra, 0x1c($sp) +/* DE3910 80241480 8FB20018 */ lw $s2, 0x18($sp) +/* DE3914 80241484 8FB10014 */ lw $s1, 0x14($sp) +/* DE3918 80241488 8FB00010 */ lw $s0, 0x10($sp) +/* DE391C 8024148C 0000102D */ daddu $v0, $zero, $zero +/* DE3920 80241490 03E00008 */ jr $ra +/* DE3924 80241494 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s index 9059cae0af..352f3a5e8f 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240798_DEF638.s @@ -173,7 +173,7 @@ glabel func_80240798_DEF638 /* DEF8C0 80240A20 00000000 */ nop /* DEF8C4 80240A24 0260202D */ daddu $a0, $s3, $zero /* DEF8C8 80240A28 0280282D */ daddu $a1, $s4, $zero -/* DEF8CC 80240A2C 0C090158 */ jal func_80240560 +/* DEF8CC 80240A2C 0C090158 */ jal func_80240560_DEF400 /* DEF8D0 80240A30 02A0302D */ daddu $a2, $s5, $zero /* DEF8D4 80240A34 8E630070 */ lw $v1, 0x70($s3) /* DEF8D8 80240A38 2402000F */ addiu $v0, $zero, 0xf @@ -181,7 +181,7 @@ glabel func_80240798_DEF638 /* DEF8E0 80240A40 00000000 */ nop /* DEF8E4 80240A44 0260202D */ daddu $a0, $s3, $zero /* DEF8E8 80240A48 0280282D */ daddu $a1, $s4, $zero -/* DEF8EC 80240A4C 0C090174 */ jal func_802405D0 +/* DEF8EC 80240A4C 0C090174 */ jal func_802405D0_DEF470 /* DEF8F0 80240A50 02A0302D */ daddu $a2, $s5, $zero /* DEF8F4 80240A54 8E630070 */ lw $v1, 0x70($s3) /* DEF8F8 80240A58 24020010 */ addiu $v0, $zero, 0x10 @@ -189,7 +189,7 @@ glabel func_80240798_DEF638 /* DEF900 80240A60 00000000 */ nop /* DEF904 80240A64 0260202D */ daddu $a0, $s3, $zero /* DEF908 80240A68 0280282D */ daddu $a1, $s4, $zero -/* DEF90C 80240A6C 0C0901A8 */ jal func_802406A0 +/* DEF90C 80240A6C 0C0901A8 */ jal func_802406A0_DEF540 /* DEF910 80240A70 02A0302D */ daddu $a2, $s5, $zero /* DEF914 80240A74 8E630070 */ lw $v1, 0x70($s3) /* DEF918 80240A78 24020011 */ addiu $v0, $zero, 0x11 @@ -197,7 +197,7 @@ glabel func_80240798_DEF638 /* DEF920 80240A80 00000000 */ nop /* DEF924 80240A84 0260202D */ daddu $a0, $s3, $zero /* DEF928 80240A88 0280282D */ daddu $a1, $s4, $zero -/* DEF92C 80240A8C 0C0901CE */ jal func_80240738 +/* DEF92C 80240A8C 0C0901CE */ jal func_80240738_DEF5D8 /* DEF930 80240A90 02A0302D */ daddu $a2, $s5, $zero /* DEF934 80240A94 080902A9 */ j .L80240AA4 /* DEF938 80240A98 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0.s deleted file mode 100644 index baf8bdde5e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0.s +++ /dev/null @@ -1,192 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CE0 -/* DEFB80 80240CE0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* DEFB84 80240CE4 AFB30054 */ sw $s3, 0x54($sp) -/* DEFB88 80240CE8 0080982D */ daddu $s3, $a0, $zero -/* DEFB8C 80240CEC AFBF0060 */ sw $ra, 0x60($sp) -/* DEFB90 80240CF0 AFB5005C */ sw $s5, 0x5c($sp) -/* DEFB94 80240CF4 AFB40058 */ sw $s4, 0x58($sp) -/* DEFB98 80240CF8 AFB20050 */ sw $s2, 0x50($sp) -/* DEFB9C 80240CFC AFB1004C */ sw $s1, 0x4c($sp) -/* DEFBA0 80240D00 AFB00048 */ sw $s0, 0x48($sp) -/* DEFBA4 80240D04 8E710148 */ lw $s1, 0x148($s3) -/* DEFBA8 80240D08 86240008 */ lh $a0, 8($s1) -/* DEFBAC 80240D0C 0C00EABB */ jal get_npc_unsafe -/* DEFBB0 80240D10 00A0802D */ daddu $s0, $a1, $zero -/* DEFBB4 80240D14 8E63000C */ lw $v1, 0xc($s3) -/* DEFBB8 80240D18 0260202D */ daddu $a0, $s3, $zero -/* DEFBBC 80240D1C 8C650000 */ lw $a1, ($v1) -/* DEFBC0 80240D20 0C0B1EAF */ jal get_variable -/* DEFBC4 80240D24 0040902D */ daddu $s2, $v0, $zero -/* DEFBC8 80240D28 AFA00018 */ sw $zero, 0x18($sp) -/* DEFBCC 80240D2C 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFBD0 80240D30 8C630030 */ lw $v1, 0x30($v1) -/* DEFBD4 80240D34 AFA3001C */ sw $v1, 0x1c($sp) -/* DEFBD8 80240D38 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFBDC 80240D3C 8C63001C */ lw $v1, 0x1c($v1) -/* DEFBE0 80240D40 AFA30020 */ sw $v1, 0x20($sp) -/* DEFBE4 80240D44 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFBE8 80240D48 8C630024 */ lw $v1, 0x24($v1) -/* DEFBEC 80240D4C AFA30024 */ sw $v1, 0x24($sp) -/* DEFBF0 80240D50 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFBF4 80240D54 8C630028 */ lw $v1, 0x28($v1) -/* DEFBF8 80240D58 27B50018 */ addiu $s5, $sp, 0x18 -/* DEFBFC 80240D5C AFA30028 */ sw $v1, 0x28($sp) -/* DEFC00 80240D60 8E2300D0 */ lw $v1, 0xd0($s1) -/* DEFC04 80240D64 3C014282 */ lui $at, 0x4282 -/* DEFC08 80240D68 44810000 */ mtc1 $at, $f0 -/* DEFC0C 80240D6C 8C63002C */ lw $v1, 0x2c($v1) -/* DEFC10 80240D70 0040A02D */ daddu $s4, $v0, $zero -/* DEFC14 80240D74 E7A00030 */ swc1 $f0, 0x30($sp) -/* DEFC18 80240D78 A7A00034 */ sh $zero, 0x34($sp) -/* DEFC1C 80240D7C 16000005 */ bnez $s0, .L80240D94 -/* DEFC20 80240D80 AFA3002C */ sw $v1, 0x2c($sp) -/* DEFC24 80240D84 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEFC28 80240D88 30420004 */ andi $v0, $v0, 4 -/* DEFC2C 80240D8C 10400044 */ beqz $v0, .L80240EA0 -/* DEFC30 80240D90 00000000 */ nop -.L80240D94: -/* DEFC34 80240D94 2404F7FF */ addiu $a0, $zero, -0x801 -/* DEFC38 80240D98 AE600070 */ sw $zero, 0x70($s3) -/* DEFC3C 80240D9C A640008E */ sh $zero, 0x8e($s2) -/* DEFC40 80240DA0 8E2200CC */ lw $v0, 0xcc($s1) -/* DEFC44 80240DA4 8E430000 */ lw $v1, ($s2) -/* DEFC48 80240DA8 8C420000 */ lw $v0, ($v0) -/* DEFC4C 80240DAC 00641824 */ and $v1, $v1, $a0 -/* DEFC50 80240DB0 AE430000 */ sw $v1, ($s2) -/* DEFC54 80240DB4 AE420028 */ sw $v0, 0x28($s2) -/* DEFC58 80240DB8 8E2200D0 */ lw $v0, 0xd0($s1) -/* DEFC5C 80240DBC 8C420034 */ lw $v0, 0x34($v0) -/* DEFC60 80240DC0 54400005 */ bnel $v0, $zero, .L80240DD8 -/* DEFC64 80240DC4 2402FDFF */ addiu $v0, $zero, -0x201 -/* DEFC68 80240DC8 34620200 */ ori $v0, $v1, 0x200 -/* DEFC6C 80240DCC 2403FFF7 */ addiu $v1, $zero, -9 -/* DEFC70 80240DD0 08090378 */ j .L80240DE0 -/* DEFC74 80240DD4 00431024 */ and $v0, $v0, $v1 -.L80240DD8: -/* DEFC78 80240DD8 00621024 */ and $v0, $v1, $v0 -/* DEFC7C 80240DDC 34420008 */ ori $v0, $v0, 8 -.L80240DE0: -/* DEFC80 80240DE0 AE420000 */ sw $v0, ($s2) -/* DEFC84 80240DE4 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEFC88 80240DE8 30420004 */ andi $v0, $v0, 4 -/* DEFC8C 80240DEC 10400004 */ beqz $v0, .L80240E00 -/* DEFC90 80240DF0 24020063 */ addiu $v0, $zero, 0x63 -/* DEFC94 80240DF4 AE620070 */ sw $v0, 0x70($s3) -/* DEFC98 80240DF8 08090386 */ j .L80240E18 -/* DEFC9C 80240DFC AE600074 */ sw $zero, 0x74($s3) -.L80240E00: -/* DEFCA0 80240E00 8E220000 */ lw $v0, ($s1) -/* DEFCA4 80240E04 3C034000 */ lui $v1, 0x4000 -/* DEFCA8 80240E08 00431024 */ and $v0, $v0, $v1 -/* DEFCAC 80240E0C 10400002 */ beqz $v0, .L80240E18 -/* DEFCB0 80240E10 2402000C */ addiu $v0, $zero, 0xc -/* DEFCB4 80240E14 AE620070 */ sw $v0, 0x70($s3) -.L80240E18: -/* DEFCB8 80240E18 3C06BFFF */ lui $a2, 0xbfff -/* DEFCBC 80240E1C 34C6FFFF */ ori $a2, $a2, 0xffff -/* DEFCC0 80240E20 27A50038 */ addiu $a1, $sp, 0x38 -/* DEFCC4 80240E24 2404FFFB */ addiu $a0, $zero, -5 -/* DEFCC8 80240E28 8E2200B0 */ lw $v0, 0xb0($s1) -/* DEFCCC 80240E2C 8E230000 */ lw $v1, ($s1) -/* DEFCD0 80240E30 3C0142C8 */ lui $at, 0x42c8 -/* DEFCD4 80240E34 44810000 */ mtc1 $at, $f0 -/* DEFCD8 80240E38 00441024 */ and $v0, $v0, $a0 -/* DEFCDC 80240E3C 00661824 */ and $v1, $v1, $a2 -/* DEFCE0 80240E40 AE2200B0 */ sw $v0, 0xb0($s1) -/* DEFCE4 80240E44 AE230000 */ sw $v1, ($s1) -/* DEFCE8 80240E48 864200A8 */ lh $v0, 0xa8($s2) -/* DEFCEC 80240E4C 27A70040 */ addiu $a3, $sp, 0x40 -/* DEFCF0 80240E50 E7A00044 */ swc1 $f0, 0x44($sp) -/* DEFCF4 80240E54 C6460038 */ lwc1 $f6, 0x38($s2) -/* DEFCF8 80240E58 C640003C */ lwc1 $f0, 0x3c($s2) -/* DEFCFC 80240E5C C6420040 */ lwc1 $f2, 0x40($s2) -/* DEFD00 80240E60 44822000 */ mtc1 $v0, $f4 -/* DEFD04 80240E64 00000000 */ nop -/* DEFD08 80240E68 46802120 */ cvt.s.w $f4, $f4 -/* DEFD0C 80240E6C 27A20044 */ addiu $v0, $sp, 0x44 -/* DEFD10 80240E70 46040000 */ add.s $f0, $f0, $f4 -/* DEFD14 80240E74 E7A60038 */ swc1 $f6, 0x38($sp) -/* DEFD18 80240E78 E7A20040 */ swc1 $f2, 0x40($sp) -/* DEFD1C 80240E7C E7A0003C */ swc1 $f0, 0x3c($sp) -/* DEFD20 80240E80 AFA20010 */ sw $v0, 0x10($sp) -/* DEFD24 80240E84 8E440080 */ lw $a0, 0x80($s2) -/* DEFD28 80240E88 0C0372DF */ jal func_800DCB7C -/* DEFD2C 80240E8C 27A6003C */ addiu $a2, $sp, 0x3c -/* DEFD30 80240E90 10400003 */ beqz $v0, .L80240EA0 -/* DEFD34 80240E94 00000000 */ nop -/* DEFD38 80240E98 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* DEFD3C 80240E9C E640003C */ swc1 $f0, 0x3c($s2) -.L80240EA0: -/* DEFD40 80240EA0 8E630070 */ lw $v1, 0x70($s3) -/* DEFD44 80240EA4 2C620064 */ sltiu $v0, $v1, 0x64 -/* DEFD48 80240EA8 10400038 */ beqz $v0, .L80240F8C -/* DEFD4C 80240EAC 00031080 */ sll $v0, $v1, 2 -/* DEFD50 80240EB0 3C018024 */ lui $at, 0x8024 -/* DEFD54 80240EB4 00220821 */ addu $at, $at, $v0 -/* DEFD58 80240EB8 8C2277C0 */ lw $v0, 0x77c0($at) -/* DEFD5C 80240EBC 00400008 */ jr $v0 -/* DEFD60 80240EC0 00000000 */ nop -/* DEFD64 80240EC4 0260202D */ daddu $a0, $s3, $zero -/* DEFD68 80240EC8 0280282D */ daddu $a1, $s4, $zero -/* DEFD6C 80240ECC 0C012568 */ jal func_800495A0 -/* DEFD70 80240ED0 02A0302D */ daddu $a2, $s5, $zero -/* DEFD74 80240ED4 0260202D */ daddu $a0, $s3, $zero -/* DEFD78 80240ED8 0280282D */ daddu $a1, $s4, $zero -/* DEFD7C 80240EDC 0C0125AE */ jal func_800496B8 -/* DEFD80 80240EE0 02A0302D */ daddu $a2, $s5, $zero -/* DEFD84 80240EE4 080903E3 */ j .L80240F8C -/* DEFD88 80240EE8 00000000 */ nop -/* DEFD8C 80240EEC 0260202D */ daddu $a0, $s3, $zero -/* DEFD90 80240EF0 0280282D */ daddu $a1, $s4, $zero -/* DEFD94 80240EF4 0C0902B3 */ jal func_80240ACC -/* DEFD98 80240EF8 02A0302D */ daddu $a2, $s5, $zero -/* DEFD9C 80240EFC 0260202D */ daddu $a0, $s3, $zero -/* DEFDA0 80240F00 0280282D */ daddu $a1, $s4, $zero -/* DEFDA4 80240F04 0C0902C7 */ jal func_80240B1C -/* DEFDA8 80240F08 02A0302D */ daddu $a2, $s5, $zero -/* DEFDAC 80240F0C 080903E3 */ j .L80240F8C -/* DEFDB0 80240F10 00000000 */ nop -/* DEFDB4 80240F14 0260202D */ daddu $a0, $s3, $zero -/* DEFDB8 80240F18 0280282D */ daddu $a1, $s4, $zero -/* DEFDBC 80240F1C 0C01278F */ jal func_80049E3C -/* DEFDC0 80240F20 02A0302D */ daddu $a2, $s5, $zero -/* DEFDC4 80240F24 0260202D */ daddu $a0, $s3, $zero -/* DEFDC8 80240F28 0280282D */ daddu $a1, $s4, $zero -/* DEFDCC 80240F2C 0C0127B3 */ jal func_80049ECC -/* DEFDD0 80240F30 02A0302D */ daddu $a2, $s5, $zero -/* DEFDD4 80240F34 080903E3 */ j .L80240F8C -/* DEFDD8 80240F38 00000000 */ nop -/* DEFDDC 80240F3C 0260202D */ daddu $a0, $s3, $zero -/* DEFDE0 80240F40 0280282D */ daddu $a1, $s4, $zero -/* DEFDE4 80240F44 0C0127DF */ jal func_80049F7C -/* DEFDE8 80240F48 02A0302D */ daddu $a2, $s5, $zero -/* DEFDEC 80240F4C 0260202D */ daddu $a0, $s3, $zero -/* DEFDF0 80240F50 0280282D */ daddu $a1, $s4, $zero -/* DEFDF4 80240F54 0C012849 */ jal func_8004A124 -/* DEFDF8 80240F58 02A0302D */ daddu $a2, $s5, $zero -/* DEFDFC 80240F5C 8E630070 */ lw $v1, 0x70($s3) -/* DEFE00 80240F60 2402000E */ addiu $v0, $zero, 0xe -/* DEFE04 80240F64 14620009 */ bne $v1, $v0, .L80240F8C -/* DEFE08 80240F68 00000000 */ nop -/* DEFE0C 80240F6C 0260202D */ daddu $a0, $s3, $zero -/* DEFE10 80240F70 0280282D */ daddu $a1, $s4, $zero -/* DEFE14 80240F74 0C0128FA */ jal func_8004A3E8 -/* DEFE18 80240F78 02A0302D */ daddu $a2, $s5, $zero -/* DEFE1C 80240F7C 080903E3 */ j .L80240F8C -/* DEFE20 80240F80 00000000 */ nop -/* DEFE24 80240F84 0C0129CF */ jal func_8004A73C -/* DEFE28 80240F88 0260202D */ daddu $a0, $s3, $zero -.L80240F8C: -/* DEFE2C 80240F8C 8FBF0060 */ lw $ra, 0x60($sp) -/* DEFE30 80240F90 8FB5005C */ lw $s5, 0x5c($sp) -/* DEFE34 80240F94 8FB40058 */ lw $s4, 0x58($sp) -/* DEFE38 80240F98 8FB30054 */ lw $s3, 0x54($sp) -/* DEFE3C 80240F9C 8FB20050 */ lw $s2, 0x50($sp) -/* DEFE40 80240FA0 8FB1004C */ lw $s1, 0x4c($sp) -/* DEFE44 80240FA4 8FB00048 */ lw $s0, 0x48($sp) -/* DEFE48 80240FA8 0000102D */ daddu $v0, $zero, $zero -/* DEFE4C 80240FAC 03E00008 */ jr $ra -/* DEFE50 80240FB0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s new file mode 100644 index 0000000000..2fde5e8de0 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80240CE0_DEFB80.s @@ -0,0 +1,192 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CE0_DEFB80 +/* DEFB80 80240CE0 27BDFF98 */ addiu $sp, $sp, -0x68 +/* DEFB84 80240CE4 AFB30054 */ sw $s3, 0x54($sp) +/* DEFB88 80240CE8 0080982D */ daddu $s3, $a0, $zero +/* DEFB8C 80240CEC AFBF0060 */ sw $ra, 0x60($sp) +/* DEFB90 80240CF0 AFB5005C */ sw $s5, 0x5c($sp) +/* DEFB94 80240CF4 AFB40058 */ sw $s4, 0x58($sp) +/* DEFB98 80240CF8 AFB20050 */ sw $s2, 0x50($sp) +/* DEFB9C 80240CFC AFB1004C */ sw $s1, 0x4c($sp) +/* DEFBA0 80240D00 AFB00048 */ sw $s0, 0x48($sp) +/* DEFBA4 80240D04 8E710148 */ lw $s1, 0x148($s3) +/* DEFBA8 80240D08 86240008 */ lh $a0, 8($s1) +/* DEFBAC 80240D0C 0C00EABB */ jal get_npc_unsafe +/* DEFBB0 80240D10 00A0802D */ daddu $s0, $a1, $zero +/* DEFBB4 80240D14 8E63000C */ lw $v1, 0xc($s3) +/* DEFBB8 80240D18 0260202D */ daddu $a0, $s3, $zero +/* DEFBBC 80240D1C 8C650000 */ lw $a1, ($v1) +/* DEFBC0 80240D20 0C0B1EAF */ jal get_variable +/* DEFBC4 80240D24 0040902D */ daddu $s2, $v0, $zero +/* DEFBC8 80240D28 AFA00018 */ sw $zero, 0x18($sp) +/* DEFBCC 80240D2C 8E2300D0 */ lw $v1, 0xd0($s1) +/* DEFBD0 80240D30 8C630030 */ lw $v1, 0x30($v1) +/* DEFBD4 80240D34 AFA3001C */ sw $v1, 0x1c($sp) +/* DEFBD8 80240D38 8E2300D0 */ lw $v1, 0xd0($s1) +/* DEFBDC 80240D3C 8C63001C */ lw $v1, 0x1c($v1) +/* DEFBE0 80240D40 AFA30020 */ sw $v1, 0x20($sp) +/* DEFBE4 80240D44 8E2300D0 */ lw $v1, 0xd0($s1) +/* DEFBE8 80240D48 8C630024 */ lw $v1, 0x24($v1) +/* DEFBEC 80240D4C AFA30024 */ sw $v1, 0x24($sp) +/* DEFBF0 80240D50 8E2300D0 */ lw $v1, 0xd0($s1) +/* DEFBF4 80240D54 8C630028 */ lw $v1, 0x28($v1) +/* DEFBF8 80240D58 27B50018 */ addiu $s5, $sp, 0x18 +/* DEFBFC 80240D5C AFA30028 */ sw $v1, 0x28($sp) +/* DEFC00 80240D60 8E2300D0 */ lw $v1, 0xd0($s1) +/* DEFC04 80240D64 3C014282 */ lui $at, 0x4282 +/* DEFC08 80240D68 44810000 */ mtc1 $at, $f0 +/* DEFC0C 80240D6C 8C63002C */ lw $v1, 0x2c($v1) +/* DEFC10 80240D70 0040A02D */ daddu $s4, $v0, $zero +/* DEFC14 80240D74 E7A00030 */ swc1 $f0, 0x30($sp) +/* DEFC18 80240D78 A7A00034 */ sh $zero, 0x34($sp) +/* DEFC1C 80240D7C 16000005 */ bnez $s0, .L80240D94 +/* DEFC20 80240D80 AFA3002C */ sw $v1, 0x2c($sp) +/* DEFC24 80240D84 8E2200B0 */ lw $v0, 0xb0($s1) +/* DEFC28 80240D88 30420004 */ andi $v0, $v0, 4 +/* DEFC2C 80240D8C 10400044 */ beqz $v0, .L80240EA0 +/* DEFC30 80240D90 00000000 */ nop +.L80240D94: +/* DEFC34 80240D94 2404F7FF */ addiu $a0, $zero, -0x801 +/* DEFC38 80240D98 AE600070 */ sw $zero, 0x70($s3) +/* DEFC3C 80240D9C A640008E */ sh $zero, 0x8e($s2) +/* DEFC40 80240DA0 8E2200CC */ lw $v0, 0xcc($s1) +/* DEFC44 80240DA4 8E430000 */ lw $v1, ($s2) +/* DEFC48 80240DA8 8C420000 */ lw $v0, ($v0) +/* DEFC4C 80240DAC 00641824 */ and $v1, $v1, $a0 +/* DEFC50 80240DB0 AE430000 */ sw $v1, ($s2) +/* DEFC54 80240DB4 AE420028 */ sw $v0, 0x28($s2) +/* DEFC58 80240DB8 8E2200D0 */ lw $v0, 0xd0($s1) +/* DEFC5C 80240DBC 8C420034 */ lw $v0, 0x34($v0) +/* DEFC60 80240DC0 54400005 */ bnel $v0, $zero, .L80240DD8 +/* DEFC64 80240DC4 2402FDFF */ addiu $v0, $zero, -0x201 +/* DEFC68 80240DC8 34620200 */ ori $v0, $v1, 0x200 +/* DEFC6C 80240DCC 2403FFF7 */ addiu $v1, $zero, -9 +/* DEFC70 80240DD0 08090378 */ j .L80240DE0 +/* DEFC74 80240DD4 00431024 */ and $v0, $v0, $v1 +.L80240DD8: +/* DEFC78 80240DD8 00621024 */ and $v0, $v1, $v0 +/* DEFC7C 80240DDC 34420008 */ ori $v0, $v0, 8 +.L80240DE0: +/* DEFC80 80240DE0 AE420000 */ sw $v0, ($s2) +/* DEFC84 80240DE4 8E2200B0 */ lw $v0, 0xb0($s1) +/* DEFC88 80240DE8 30420004 */ andi $v0, $v0, 4 +/* DEFC8C 80240DEC 10400004 */ beqz $v0, .L80240E00 +/* DEFC90 80240DF0 24020063 */ addiu $v0, $zero, 0x63 +/* DEFC94 80240DF4 AE620070 */ sw $v0, 0x70($s3) +/* DEFC98 80240DF8 08090386 */ j .L80240E18 +/* DEFC9C 80240DFC AE600074 */ sw $zero, 0x74($s3) +.L80240E00: +/* DEFCA0 80240E00 8E220000 */ lw $v0, ($s1) +/* DEFCA4 80240E04 3C034000 */ lui $v1, 0x4000 +/* DEFCA8 80240E08 00431024 */ and $v0, $v0, $v1 +/* DEFCAC 80240E0C 10400002 */ beqz $v0, .L80240E18 +/* DEFCB0 80240E10 2402000C */ addiu $v0, $zero, 0xc +/* DEFCB4 80240E14 AE620070 */ sw $v0, 0x70($s3) +.L80240E18: +/* DEFCB8 80240E18 3C06BFFF */ lui $a2, 0xbfff +/* DEFCBC 80240E1C 34C6FFFF */ ori $a2, $a2, 0xffff +/* DEFCC0 80240E20 27A50038 */ addiu $a1, $sp, 0x38 +/* DEFCC4 80240E24 2404FFFB */ addiu $a0, $zero, -5 +/* DEFCC8 80240E28 8E2200B0 */ lw $v0, 0xb0($s1) +/* DEFCCC 80240E2C 8E230000 */ lw $v1, ($s1) +/* DEFCD0 80240E30 3C0142C8 */ lui $at, 0x42c8 +/* DEFCD4 80240E34 44810000 */ mtc1 $at, $f0 +/* DEFCD8 80240E38 00441024 */ and $v0, $v0, $a0 +/* DEFCDC 80240E3C 00661824 */ and $v1, $v1, $a2 +/* DEFCE0 80240E40 AE2200B0 */ sw $v0, 0xb0($s1) +/* DEFCE4 80240E44 AE230000 */ sw $v1, ($s1) +/* DEFCE8 80240E48 864200A8 */ lh $v0, 0xa8($s2) +/* DEFCEC 80240E4C 27A70040 */ addiu $a3, $sp, 0x40 +/* DEFCF0 80240E50 E7A00044 */ swc1 $f0, 0x44($sp) +/* DEFCF4 80240E54 C6460038 */ lwc1 $f6, 0x38($s2) +/* DEFCF8 80240E58 C640003C */ lwc1 $f0, 0x3c($s2) +/* DEFCFC 80240E5C C6420040 */ lwc1 $f2, 0x40($s2) +/* DEFD00 80240E60 44822000 */ mtc1 $v0, $f4 +/* DEFD04 80240E64 00000000 */ nop +/* DEFD08 80240E68 46802120 */ cvt.s.w $f4, $f4 +/* DEFD0C 80240E6C 27A20044 */ addiu $v0, $sp, 0x44 +/* DEFD10 80240E70 46040000 */ add.s $f0, $f0, $f4 +/* DEFD14 80240E74 E7A60038 */ swc1 $f6, 0x38($sp) +/* DEFD18 80240E78 E7A20040 */ swc1 $f2, 0x40($sp) +/* DEFD1C 80240E7C E7A0003C */ swc1 $f0, 0x3c($sp) +/* DEFD20 80240E80 AFA20010 */ sw $v0, 0x10($sp) +/* DEFD24 80240E84 8E440080 */ lw $a0, 0x80($s2) +/* DEFD28 80240E88 0C0372DF */ jal func_800DCB7C +/* DEFD2C 80240E8C 27A6003C */ addiu $a2, $sp, 0x3c +/* DEFD30 80240E90 10400003 */ beqz $v0, .L80240EA0 +/* DEFD34 80240E94 00000000 */ nop +/* DEFD38 80240E98 C7A0003C */ lwc1 $f0, 0x3c($sp) +/* DEFD3C 80240E9C E640003C */ swc1 $f0, 0x3c($s2) +.L80240EA0: +/* DEFD40 80240EA0 8E630070 */ lw $v1, 0x70($s3) +/* DEFD44 80240EA4 2C620064 */ sltiu $v0, $v1, 0x64 +/* DEFD48 80240EA8 10400038 */ beqz $v0, .L80240F8C +/* DEFD4C 80240EAC 00031080 */ sll $v0, $v1, 2 +/* DEFD50 80240EB0 3C018024 */ lui $at, 0x8024 +/* DEFD54 80240EB4 00220821 */ addu $at, $at, $v0 +/* DEFD58 80240EB8 8C2277C0 */ lw $v0, 0x77c0($at) +/* DEFD5C 80240EBC 00400008 */ jr $v0 +/* DEFD60 80240EC0 00000000 */ nop +/* DEFD64 80240EC4 0260202D */ daddu $a0, $s3, $zero +/* DEFD68 80240EC8 0280282D */ daddu $a1, $s4, $zero +/* DEFD6C 80240ECC 0C012568 */ jal func_800495A0 +/* DEFD70 80240ED0 02A0302D */ daddu $a2, $s5, $zero +/* DEFD74 80240ED4 0260202D */ daddu $a0, $s3, $zero +/* DEFD78 80240ED8 0280282D */ daddu $a1, $s4, $zero +/* DEFD7C 80240EDC 0C0125AE */ jal func_800496B8 +/* DEFD80 80240EE0 02A0302D */ daddu $a2, $s5, $zero +/* DEFD84 80240EE4 080903E3 */ j .L80240F8C +/* DEFD88 80240EE8 00000000 */ nop +/* DEFD8C 80240EEC 0260202D */ daddu $a0, $s3, $zero +/* DEFD90 80240EF0 0280282D */ daddu $a1, $s4, $zero +/* DEFD94 80240EF4 0C0902B3 */ jal func_80240ACC_DEF96C +/* DEFD98 80240EF8 02A0302D */ daddu $a2, $s5, $zero +/* DEFD9C 80240EFC 0260202D */ daddu $a0, $s3, $zero +/* DEFDA0 80240F00 0280282D */ daddu $a1, $s4, $zero +/* DEFDA4 80240F04 0C0902C7 */ jal func_80240B1C_DEF9BC +/* DEFDA8 80240F08 02A0302D */ daddu $a2, $s5, $zero +/* DEFDAC 80240F0C 080903E3 */ j .L80240F8C +/* DEFDB0 80240F10 00000000 */ nop +/* DEFDB4 80240F14 0260202D */ daddu $a0, $s3, $zero +/* DEFDB8 80240F18 0280282D */ daddu $a1, $s4, $zero +/* DEFDBC 80240F1C 0C01278F */ jal func_80049E3C +/* DEFDC0 80240F20 02A0302D */ daddu $a2, $s5, $zero +/* DEFDC4 80240F24 0260202D */ daddu $a0, $s3, $zero +/* DEFDC8 80240F28 0280282D */ daddu $a1, $s4, $zero +/* DEFDCC 80240F2C 0C0127B3 */ jal func_80049ECC +/* DEFDD0 80240F30 02A0302D */ daddu $a2, $s5, $zero +/* DEFDD4 80240F34 080903E3 */ j .L80240F8C +/* DEFDD8 80240F38 00000000 */ nop +/* DEFDDC 80240F3C 0260202D */ daddu $a0, $s3, $zero +/* DEFDE0 80240F40 0280282D */ daddu $a1, $s4, $zero +/* DEFDE4 80240F44 0C0127DF */ jal func_80049F7C +/* DEFDE8 80240F48 02A0302D */ daddu $a2, $s5, $zero +/* DEFDEC 80240F4C 0260202D */ daddu $a0, $s3, $zero +/* DEFDF0 80240F50 0280282D */ daddu $a1, $s4, $zero +/* DEFDF4 80240F54 0C012849 */ jal func_8004A124 +/* DEFDF8 80240F58 02A0302D */ daddu $a2, $s5, $zero +/* DEFDFC 80240F5C 8E630070 */ lw $v1, 0x70($s3) +/* DEFE00 80240F60 2402000E */ addiu $v0, $zero, 0xe +/* DEFE04 80240F64 14620009 */ bne $v1, $v0, .L80240F8C +/* DEFE08 80240F68 00000000 */ nop +/* DEFE0C 80240F6C 0260202D */ daddu $a0, $s3, $zero +/* DEFE10 80240F70 0280282D */ daddu $a1, $s4, $zero +/* DEFE14 80240F74 0C0128FA */ jal func_8004A3E8 +/* DEFE18 80240F78 02A0302D */ daddu $a2, $s5, $zero +/* DEFE1C 80240F7C 080903E3 */ j .L80240F8C +/* DEFE20 80240F80 00000000 */ nop +/* DEFE24 80240F84 0C0129CF */ jal func_8004A73C +/* DEFE28 80240F88 0260202D */ daddu $a0, $s3, $zero +.L80240F8C: +/* DEFE2C 80240F8C 8FBF0060 */ lw $ra, 0x60($sp) +/* DEFE30 80240F90 8FB5005C */ lw $s5, 0x5c($sp) +/* DEFE34 80240F94 8FB40058 */ lw $s4, 0x58($sp) +/* DEFE38 80240F98 8FB30054 */ lw $s3, 0x54($sp) +/* DEFE3C 80240F9C 8FB20050 */ lw $s2, 0x50($sp) +/* DEFE40 80240FA0 8FB1004C */ lw $s1, 0x4c($sp) +/* DEFE44 80240FA4 8FB00048 */ lw $s0, 0x48($sp) +/* DEFE48 80240FA8 0000102D */ daddu $v0, $zero, $zero +/* DEFE4C 80240FAC 03E00008 */ jr $ra +/* DEFE50 80240FB0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164.s deleted file mode 100644 index 294ddae072..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241164 -/* DF0004 80241164 27BDFF80 */ addiu $sp, $sp, -0x80 -/* DF0008 80241168 AFB3004C */ sw $s3, 0x4c($sp) -/* DF000C 8024116C 0080982D */ daddu $s3, $a0, $zero -/* DF0010 80241170 AFBF0058 */ sw $ra, 0x58($sp) -/* DF0014 80241174 AFB50054 */ sw $s5, 0x54($sp) -/* DF0018 80241178 AFB40050 */ sw $s4, 0x50($sp) -/* DF001C 8024117C AFB20048 */ sw $s2, 0x48($sp) -/* DF0020 80241180 AFB10044 */ sw $s1, 0x44($sp) -/* DF0024 80241184 AFB00040 */ sw $s0, 0x40($sp) -/* DF0028 80241188 F7BA0078 */ sdc1 $f26, 0x78($sp) -/* DF002C 8024118C F7B80070 */ sdc1 $f24, 0x70($sp) -/* DF0030 80241190 F7B60068 */ sdc1 $f22, 0x68($sp) -/* DF0034 80241194 F7B40060 */ sdc1 $f20, 0x60($sp) -/* DF0038 80241198 8E710148 */ lw $s1, 0x148($s3) -/* DF003C 8024119C 00A0902D */ daddu $s2, $a1, $zero -/* DF0040 802411A0 86240008 */ lh $a0, 8($s1) -/* DF0044 802411A4 0C00EABB */ jal get_npc_unsafe -/* DF0048 802411A8 00C0A82D */ daddu $s5, $a2, $zero -/* DF004C 802411AC 0040802D */ daddu $s0, $v0, $zero -/* DF0050 802411B0 0000A02D */ daddu $s4, $zero, $zero -/* DF0054 802411B4 C624007C */ lwc1 $f4, 0x7c($s1) -/* DF0058 802411B8 46802120 */ cvt.s.w $f4, $f4 -/* DF005C 802411BC C6220088 */ lwc1 $f2, 0x88($s1) -/* DF0060 802411C0 468010A0 */ cvt.s.w $f2, $f2 -/* DF0064 802411C4 460010A1 */ cvt.d.s $f2, $f2 -/* DF0068 802411C8 46002121 */ cvt.d.s $f4, $f4 -/* DF006C 802411CC C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0070 802411D0 3C014059 */ lui $at, 0x4059 -/* DF0074 802411D4 44813800 */ mtc1 $at, $f7 -/* DF0078 802411D8 44803000 */ mtc1 $zero, $f6 -/* DF007C 802411DC 46000021 */ cvt.d.s $f0, $f0 -/* DF0080 802411E0 46260002 */ mul.d $f0, $f0, $f6 -/* DF0084 802411E4 00000000 */ nop -/* DF0088 802411E8 24020001 */ addiu $v0, $zero, 1 -/* DF008C 802411EC 8E24006C */ lw $a0, 0x6c($s1) -/* DF0090 802411F0 46261083 */ div.d $f2, $f2, $f6 -/* DF0094 802411F4 462010A0 */ cvt.s.d $f2, $f2 -/* DF0098 802411F8 46262103 */ div.d $f4, $f4, $f6 -/* DF009C 802411FC 46202520 */ cvt.s.d $f20, $f4 -/* DF00A0 80241200 30830011 */ andi $v1, $a0, 0x11 -/* DF00A4 80241204 4620020D */ trunc.w.d $f8, $f0 -/* DF00A8 80241208 E628007C */ swc1 $f8, 0x7c($s1) -/* DF00AC 8024120C C6200078 */ lwc1 $f0, 0x78($s1) -/* DF00B0 80241210 46800020 */ cvt.s.w $f0, $f0 -/* DF00B4 80241214 46000021 */ cvt.d.s $f0, $f0 -/* DF00B8 80241218 46260003 */ div.d $f0, $f0, $f6 -/* DF00BC 8024121C 462006A0 */ cvt.s.d $f26, $f0 -/* DF00C0 80241220 C6200070 */ lwc1 $f0, 0x70($s1) -/* DF00C4 80241224 46800020 */ cvt.s.w $f0, $f0 -/* DF00C8 80241228 46000021 */ cvt.d.s $f0, $f0 -/* DF00CC 8024122C 46260003 */ div.d $f0, $f0, $f6 -/* DF00D0 80241230 462005A0 */ cvt.s.d $f22, $f0 -/* DF00D4 80241234 14620025 */ bne $v1, $v0, .L802412CC -/* DF00D8 80241238 4602D600 */ add.s $f24, $f26, $f2 -/* DF00DC 8024123C 8E020000 */ lw $v0, ($s0) -/* DF00E0 80241240 30420008 */ andi $v0, $v0, 8 -/* DF00E4 80241244 10400009 */ beqz $v0, .L8024126C -/* DF00E8 80241248 27A50028 */ addiu $a1, $sp, 0x28 -/* DF00EC 8024124C C600003C */ lwc1 $f0, 0x3c($s0) -/* DF00F0 80241250 4600C001 */ sub.s $f0, $f24, $f0 -/* DF00F4 80241254 4600B03C */ c.lt.s $f22, $f0 -/* DF00F8 80241258 00000000 */ nop -/* DF00FC 8024125C 4500001B */ bc1f .L802412CC -/* DF0100 80241260 34820010 */ ori $v0, $a0, 0x10 -/* DF0104 80241264 080904B3 */ j .L802412CC -/* DF0108 80241268 AE22006C */ sw $v0, 0x6c($s1) -.L8024126C: -/* DF010C 8024126C 27A6002C */ addiu $a2, $sp, 0x2c -/* DF0110 80241270 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF0114 80241274 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0118 80241278 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF011C 8024127C 3C01447A */ lui $at, 0x447a -/* DF0120 80241280 44813000 */ mtc1 $at, $f6 -/* DF0124 80241284 27A20034 */ addiu $v0, $sp, 0x34 -/* DF0128 80241288 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF012C 8024128C E7A2002C */ swc1 $f2, 0x2c($sp) -/* DF0130 80241290 E7A40030 */ swc1 $f4, 0x30($sp) -/* DF0134 80241294 E7A60034 */ swc1 $f6, 0x34($sp) -/* DF0138 80241298 AFA20010 */ sw $v0, 0x10($sp) -/* DF013C 8024129C 8E040080 */ lw $a0, 0x80($s0) -/* DF0140 802412A0 0C0372DF */ jal func_800DCB7C -/* DF0144 802412A4 27A70030 */ addiu $a3, $sp, 0x30 -/* DF0148 802412A8 C7A00034 */ lwc1 $f0, 0x34($sp) -/* DF014C 802412AC 4600D001 */ sub.s $f0, $f26, $f0 -/* DF0150 802412B0 4600B03C */ c.lt.s $f22, $f0 -/* DF0154 802412B4 00000000 */ nop -/* DF0158 802412B8 45000004 */ bc1f .L802412CC -/* DF015C 802412BC 00000000 */ nop -/* DF0160 802412C0 8E22006C */ lw $v0, 0x6c($s1) -/* DF0164 802412C4 34420010 */ ori $v0, $v0, 0x10 -/* DF0168 802412C8 AE22006C */ sw $v0, 0x6c($s1) -.L802412CC: -/* DF016C 802412CC 8E22006C */ lw $v0, 0x6c($s1) -/* DF0170 802412D0 24030011 */ addiu $v1, $zero, 0x11 -/* DF0174 802412D4 30420011 */ andi $v0, $v0, 0x11 -/* DF0178 802412D8 14430039 */ bne $v0, $v1, .L802413C0 -/* DF017C 802412DC 00000000 */ nop -/* DF0180 802412E0 8E020000 */ lw $v0, ($s0) -/* DF0184 802412E4 30420008 */ andi $v0, $v0, 8 -/* DF0188 802412E8 1040000A */ beqz $v0, .L80241314 -/* DF018C 802412EC 4600C106 */ mov.s $f4, $f24 -/* DF0190 802412F0 4614C081 */ sub.s $f2, $f24, $f20 -/* DF0194 802412F4 3C018024 */ lui $at, 0x8024 -/* DF0198 802412F8 D4207958 */ ldc1 $f0, 0x7958($at) -/* DF019C 802412FC 460010A1 */ cvt.d.s $f2, $f2 -/* DF01A0 80241300 46201082 */ mul.d $f2, $f2, $f0 -/* DF01A4 80241304 00000000 */ nop -/* DF01A8 80241308 4600A021 */ cvt.d.s $f0, $f20 -/* DF01AC 8024130C 080904DE */ j .L80241378 -/* DF01B0 80241310 46220000 */ add.d $f0, $f0, $f2 -.L80241314: -/* DF01B4 80241314 27A50028 */ addiu $a1, $sp, 0x28 -/* DF01B8 80241318 27A6002C */ addiu $a2, $sp, 0x2c -/* DF01BC 8024131C C6000038 */ lwc1 $f0, 0x38($s0) -/* DF01C0 80241320 C6020040 */ lwc1 $f2, 0x40($s0) -/* DF01C4 80241324 3C01447A */ lui $at, 0x447a -/* DF01C8 80241328 44812000 */ mtc1 $at, $f4 -/* DF01CC 8024132C 27A20034 */ addiu $v0, $sp, 0x34 -/* DF01D0 80241330 E7B4002C */ swc1 $f20, 0x2c($sp) -/* DF01D4 80241334 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF01D8 80241338 E7A20030 */ swc1 $f2, 0x30($sp) -/* DF01DC 8024133C E7A40034 */ swc1 $f4, 0x34($sp) -/* DF01E0 80241340 AFA20010 */ sw $v0, 0x10($sp) -/* DF01E4 80241344 8E040080 */ lw $a0, 0x80($s0) -/* DF01E8 80241348 0C0372DF */ jal func_800DCB7C -/* DF01EC 8024134C 27A70030 */ addiu $a3, $sp, 0x30 -/* DF01F0 80241350 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* DF01F4 80241354 461A2100 */ add.s $f4, $f4, $f26 -/* DF01F8 80241358 46142081 */ sub.s $f2, $f4, $f20 -/* DF01FC 8024135C 3C018024 */ lui $at, 0x8024 -/* DF0200 80241360 D4207960 */ ldc1 $f0, 0x7960($at) -/* DF0204 80241364 460010A1 */ cvt.d.s $f2, $f2 -/* DF0208 80241368 46201082 */ mul.d $f2, $f2, $f0 -/* DF020C 8024136C 00000000 */ nop -/* DF0210 80241370 4600A021 */ cvt.d.s $f0, $f20 -/* DF0214 80241374 46220000 */ add.d $f0, $f0, $f2 -.L80241378: -/* DF0218 80241378 46200020 */ cvt.s.d $f0, $f0 -/* DF021C 8024137C E600003C */ swc1 $f0, 0x3c($s0) -/* DF0220 80241380 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0224 80241384 46002001 */ sub.s $f0, $f4, $f0 -/* DF0228 80241388 3C013FF0 */ lui $at, 0x3ff0 -/* DF022C 8024138C 44811800 */ mtc1 $at, $f3 -/* DF0230 80241390 44801000 */ mtc1 $zero, $f2 -/* DF0234 80241394 46000005 */ abs.s $f0, $f0 -/* DF0238 80241398 46000021 */ cvt.d.s $f0, $f0 -/* DF023C 8024139C 4622003C */ c.lt.d $f0, $f2 -/* DF0240 802413A0 00000000 */ nop -/* DF0244 802413A4 45000036 */ bc1f .L80241480 -/* DF0248 802413A8 2403FFEF */ addiu $v1, $zero, -0x11 -/* DF024C 802413AC E604003C */ swc1 $f4, 0x3c($s0) -/* DF0250 802413B0 8E22006C */ lw $v0, 0x6c($s1) -/* DF0254 802413B4 00431024 */ and $v0, $v0, $v1 -/* DF0258 802413B8 08090520 */ j .L80241480 -/* DF025C 802413BC AE22006C */ sw $v0, 0x6c($s1) -.L802413C0: -/* DF0260 802413C0 8E220070 */ lw $v0, 0x70($s1) -/* DF0264 802413C4 1840002E */ blez $v0, .L80241480 -/* DF0268 802413C8 00000000 */ nop -/* DF026C 802413CC C62C0074 */ lwc1 $f12, 0x74($s1) -/* DF0270 802413D0 0C00A8BB */ jal sin_deg -/* DF0274 802413D4 46806320 */ cvt.s.w $f12, $f12 -/* DF0278 802413D8 8E020000 */ lw $v0, ($s0) -/* DF027C 802413DC 30420008 */ andi $v0, $v0, 8 -/* DF0280 802413E0 10400003 */ beqz $v0, .L802413F0 -/* DF0284 802413E4 46000506 */ mov.s $f20, $f0 -/* DF0288 802413E8 0809050C */ j .L80241430 -/* DF028C 802413EC 0000102D */ daddu $v0, $zero, $zero -.L802413F0: -/* DF0290 802413F0 27A50028 */ addiu $a1, $sp, 0x28 -/* DF0294 802413F4 27A6002C */ addiu $a2, $sp, 0x2c -/* DF0298 802413F8 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF029C 802413FC C602003C */ lwc1 $f2, 0x3c($s0) -/* DF02A0 80241400 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF02A4 80241404 3C01447A */ lui $at, 0x447a -/* DF02A8 80241408 44813000 */ mtc1 $at, $f6 -/* DF02AC 8024140C 27A20034 */ addiu $v0, $sp, 0x34 -/* DF02B0 80241410 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF02B4 80241414 E7A2002C */ swc1 $f2, 0x2c($sp) -/* DF02B8 80241418 E7A40030 */ swc1 $f4, 0x30($sp) -/* DF02BC 8024141C E7A60034 */ swc1 $f6, 0x34($sp) -/* DF02C0 80241420 AFA20010 */ sw $v0, 0x10($sp) -/* DF02C4 80241424 8E040080 */ lw $a0, 0x80($s0) -/* DF02C8 80241428 0C0372DF */ jal func_800DCB7C -/* DF02CC 8024142C 27A70030 */ addiu $a3, $sp, 0x30 -.L80241430: -/* DF02D0 80241430 10400007 */ beqz $v0, .L80241450 -/* DF02D4 80241434 00000000 */ nop -/* DF02D8 80241438 4616A082 */ mul.s $f2, $f20, $f22 -/* DF02DC 8024143C 00000000 */ nop -/* DF02E0 80241440 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DF02E4 80241444 461A0000 */ add.s $f0, $f0, $f26 -/* DF02E8 80241448 08090517 */ j .L8024145C -/* DF02EC 8024144C 46020000 */ add.s $f0, $f0, $f2 -.L80241450: -/* DF02F0 80241450 4616A002 */ mul.s $f0, $f20, $f22 -/* DF02F4 80241454 00000000 */ nop -/* DF02F8 80241458 4600C000 */ add.s $f0, $f24, $f0 -.L8024145C: -/* DF02FC 8024145C E600003C */ swc1 $f0, 0x3c($s0) -/* DF0300 80241460 8E220074 */ lw $v0, 0x74($s1) -/* DF0304 80241464 2442000A */ addiu $v0, $v0, 0xa -/* DF0308 80241468 44826000 */ mtc1 $v0, $f12 -/* DF030C 8024146C 00000000 */ nop -/* DF0310 80241470 0C00A6C9 */ jal clamp_angle -/* DF0314 80241474 46806320 */ cvt.s.w $f12, $f12 -/* DF0318 80241478 4600020D */ trunc.w.s $f8, $f0 -/* DF031C 8024147C E6280074 */ swc1 $f8, 0x74($s1) -.L80241480: -/* DF0320 80241480 8E220090 */ lw $v0, 0x90($s1) -/* DF0324 80241484 1C40004A */ bgtz $v0, .L802415B0 -/* DF0328 80241488 2442FFFF */ addiu $v0, $v0, -1 -/* DF032C 8024148C 8E430014 */ lw $v1, 0x14($s2) -/* DF0330 80241490 04600048 */ bltz $v1, .L802415B4 -/* DF0334 80241494 00000000 */ nop -/* DF0338 80241498 8E620074 */ lw $v0, 0x74($s3) -/* DF033C 8024149C 1C400042 */ bgtz $v0, .L802415A8 -/* DF0340 802414A0 2442FFFF */ addiu $v0, $v0, -1 -/* DF0344 802414A4 AE630074 */ sw $v1, 0x74($s3) -/* DF0348 802414A8 860200A8 */ lh $v0, 0xa8($s0) -/* DF034C 802414AC C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0350 802414B0 44820000 */ mtc1 $v0, $f0 -/* DF0354 802414B4 00000000 */ nop -/* DF0358 802414B8 46800020 */ cvt.s.w $f0, $f0 -/* DF035C 802414BC 46001080 */ add.s $f2, $f2, $f0 -/* DF0360 802414C0 3C014024 */ lui $at, 0x4024 -/* DF0364 802414C4 44810800 */ mtc1 $at, $f1 -/* DF0368 802414C8 44800000 */ mtc1 $zero, $f0 -/* DF036C 802414CC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF0370 802414D0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0374 802414D4 460010A1 */ cvt.d.s $f2, $f2 -/* DF0378 802414D8 46201080 */ add.d $f2, $f2, $f0 -/* DF037C 802414DC C440002C */ lwc1 $f0, 0x2c($v0) -/* DF0380 802414E0 46000021 */ cvt.d.s $f0, $f0 -/* DF0384 802414E4 4622003C */ c.lt.d $f0, $f2 -/* DF0388 802414E8 00000000 */ nop -/* DF038C 802414EC 4500002C */ bc1f .L802415A0 -/* DF0390 802414F0 02A0202D */ daddu $a0, $s5, $zero -/* DF0394 802414F4 AFA00010 */ sw $zero, 0x10($sp) -/* DF0398 802414F8 8E46000C */ lw $a2, 0xc($s2) -/* DF039C 802414FC 8E470010 */ lw $a3, 0x10($s2) -/* DF03A0 80241500 0C01242D */ jal func_800490B4 -/* DF03A4 80241504 0220282D */ daddu $a1, $s1, $zero -/* DF03A8 80241508 10400025 */ beqz $v0, .L802415A0 -/* DF03AC 8024150C 0000202D */ daddu $a0, $zero, $zero -/* DF03B0 80241510 0200282D */ daddu $a1, $s0, $zero -/* DF03B4 80241514 0000302D */ daddu $a2, $zero, $zero -/* DF03B8 80241518 2412000C */ addiu $s2, $zero, 0xc -/* DF03BC 8024151C 860300A8 */ lh $v1, 0xa8($s0) -/* DF03C0 80241520 3C013F80 */ lui $at, 0x3f80 -/* DF03C4 80241524 44810000 */ mtc1 $at, $f0 -/* DF03C8 80241528 3C014000 */ lui $at, 0x4000 -/* DF03CC 8024152C 44811000 */ mtc1 $at, $f2 -/* DF03D0 80241530 3C01C1A0 */ lui $at, 0xc1a0 -/* DF03D4 80241534 44812000 */ mtc1 $at, $f4 -/* DF03D8 80241538 44834000 */ mtc1 $v1, $f8 -/* DF03DC 8024153C 00000000 */ nop -/* DF03E0 80241540 46804220 */ cvt.s.w $f8, $f8 -/* DF03E4 80241544 44074000 */ mfc1 $a3, $f8 -/* DF03E8 80241548 27A20038 */ addiu $v0, $sp, 0x38 -/* DF03EC 8024154C AFB2001C */ sw $s2, 0x1c($sp) -/* DF03F0 80241550 AFA20020 */ sw $v0, 0x20($sp) -/* DF03F4 80241554 E7A00010 */ swc1 $f0, 0x10($sp) -/* DF03F8 80241558 E7A20014 */ swc1 $f2, 0x14($sp) -/* DF03FC 8024155C 0C01BFA4 */ jal fx_emote -/* DF0400 80241560 E7A40018 */ swc1 $f4, 0x18($sp) -/* DF0404 80241564 0200202D */ daddu $a0, $s0, $zero -/* DF0408 80241568 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DF040C 8024156C C480003C */ lwc1 $f0, 0x3c($a0) -/* DF0410 80241570 3C060020 */ lui $a2, 0x20 -/* DF0414 80241574 0C012530 */ jal func_800494C0 -/* DF0418 80241578 E4800064 */ swc1 $f0, 0x64($a0) -/* DF041C 8024157C 8E220018 */ lw $v0, 0x18($s1) -/* DF0420 80241580 9442002A */ lhu $v0, 0x2a($v0) -/* DF0424 80241584 30420001 */ andi $v0, $v0, 1 -/* DF0428 80241588 10400003 */ beqz $v0, .L80241598 -/* DF042C 8024158C 2402000A */ addiu $v0, $zero, 0xa -/* DF0430 80241590 080905D6 */ j .L80241758 -/* DF0434 80241594 AE620070 */ sw $v0, 0x70($s3) -.L80241598: -/* DF0438 80241598 080905D6 */ j .L80241758 -/* DF043C 8024159C AE720070 */ sw $s2, 0x70($s3) -.L802415A0: -/* DF0440 802415A0 8E620074 */ lw $v0, 0x74($s3) -/* DF0444 802415A4 2442FFFF */ addiu $v0, $v0, -1 -.L802415A8: -/* DF0448 802415A8 0809056D */ j .L802415B4 -/* DF044C 802415AC AE620074 */ sw $v0, 0x74($s3) -.L802415B0: -/* DF0450 802415B0 AE220090 */ sw $v0, 0x90($s1) -.L802415B4: -/* DF0454 802415B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* DF0458 802415B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* DF045C 802415BC C4620000 */ lwc1 $f2, ($v1) -/* DF0460 802415C0 468010A0 */ cvt.s.w $f2, $f2 -/* DF0464 802415C4 C4640008 */ lwc1 $f4, 8($v1) -/* DF0468 802415C8 46802120 */ cvt.s.w $f4, $f4 -/* DF046C 802415CC E7A00010 */ swc1 $f0, 0x10($sp) -/* DF0470 802415D0 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF0474 802415D4 44051000 */ mfc1 $a1, $f2 -/* DF0478 802415D8 C440000C */ lwc1 $f0, 0xc($v0) -/* DF047C 802415DC 46800020 */ cvt.s.w $f0, $f0 -/* DF0480 802415E0 E7A00014 */ swc1 $f0, 0x14($sp) -/* DF0484 802415E4 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF0488 802415E8 44062000 */ mfc1 $a2, $f4 -/* DF048C 802415EC C4400010 */ lwc1 $f0, 0x10($v0) -/* DF0490 802415F0 46800020 */ cvt.s.w $f0, $f0 -/* DF0494 802415F4 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF0498 802415F8 8C640018 */ lw $a0, 0x18($v1) -/* DF049C 802415FC 0C0123F5 */ jal is_point_within_region -/* DF04A0 80241600 8E070038 */ lw $a3, 0x38($s0) -/* DF04A4 80241604 1040001A */ beqz $v0, .L80241670 -/* DF04A8 80241608 00000000 */ nop -/* DF04AC 8024160C 8E060038 */ lw $a2, 0x38($s0) -/* DF04B0 80241610 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF04B4 80241614 8E070040 */ lw $a3, 0x40($s0) -/* DF04B8 80241618 C44C0000 */ lwc1 $f12, ($v0) -/* DF04BC 8024161C 46806320 */ cvt.s.w $f12, $f12 -/* DF04C0 80241620 C44E0008 */ lwc1 $f14, 8($v0) -/* DF04C4 80241624 0C00A7B5 */ jal dist2D -/* DF04C8 80241628 468073A0 */ cvt.s.w $f14, $f14 -/* DF04CC 8024162C C6020018 */ lwc1 $f2, 0x18($s0) -/* DF04D0 80241630 4600103C */ c.lt.s $f2, $f0 -/* DF04D4 80241634 00000000 */ nop -/* DF04D8 80241638 4500000D */ bc1f .L80241670 -/* DF04DC 8024163C E7A00034 */ swc1 $f0, 0x34($sp) -/* DF04E0 80241640 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DF04E4 80241644 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF04E8 80241648 C60E0040 */ lwc1 $f14, 0x40($s0) -/* DF04EC 8024164C C4480000 */ lwc1 $f8, ($v0) -/* DF04F0 80241650 46804220 */ cvt.s.w $f8, $f8 -/* DF04F4 80241654 44064000 */ mfc1 $a2, $f8 -/* DF04F8 80241658 C4480008 */ lwc1 $f8, 8($v0) -/* DF04FC 8024165C 46804220 */ cvt.s.w $f8, $f8 -/* DF0500 80241660 44074000 */ mfc1 $a3, $f8 -/* DF0504 80241664 0C00A720 */ jal atan2 -/* DF0508 80241668 24140001 */ addiu $s4, $zero, 1 -/* DF050C 8024166C E600000C */ swc1 $f0, 0xc($s0) -.L80241670: -/* DF0510 80241670 8E2200D0 */ lw $v0, 0xd0($s1) -/* DF0514 80241674 8C43000C */ lw $v1, 0xc($v0) -/* DF0518 80241678 8C420010 */ lw $v0, 0x10($v0) -/* DF051C 8024167C 00621825 */ or $v1, $v1, $v0 -/* DF0520 80241680 00741825 */ or $v1, $v1, $s4 -/* DF0524 80241684 10600008 */ beqz $v1, .L802416A8 -/* DF0528 80241688 00000000 */ nop -/* DF052C 8024168C 8602008C */ lh $v0, 0x8c($s0) -/* DF0530 80241690 14400031 */ bnez $v0, .L80241758 -/* DF0534 80241694 00000000 */ nop -/* DF0538 80241698 8E050018 */ lw $a1, 0x18($s0) -/* DF053C 8024169C 8E06000C */ lw $a2, 0xc($s0) -/* DF0540 802416A0 0C00EA95 */ jal npc_move_heading -/* DF0544 802416A4 0200202D */ daddu $a0, $s0, $zero -.L802416A8: -/* DF0548 802416A8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF054C 802416AC 3C014059 */ lui $at, 0x4059 -/* DF0550 802416B0 44811800 */ mtc1 $at, $f3 -/* DF0554 802416B4 44801000 */ mtc1 $zero, $f2 -/* DF0558 802416B8 46000021 */ cvt.d.s $f0, $f0 -/* DF055C 802416BC 46220002 */ mul.d $f0, $f0, $f2 -/* DF0560 802416C0 00000000 */ nop -/* DF0564 802416C4 4620020D */ trunc.w.d $f8, $f0 -/* DF0568 802416C8 E628007C */ swc1 $f8, 0x7c($s1) -/* DF056C 802416CC 8E420004 */ lw $v0, 4($s2) -/* DF0570 802416D0 18400021 */ blez $v0, .L80241758 -/* DF0574 802416D4 00000000 */ nop -/* DF0578 802416D8 8602008E */ lh $v0, 0x8e($s0) -/* DF057C 802416DC 9603008E */ lhu $v1, 0x8e($s0) -/* DF0580 802416E0 18400005 */ blez $v0, .L802416F8 -/* DF0584 802416E4 2462FFFF */ addiu $v0, $v1, -1 -/* DF0588 802416E8 A602008E */ sh $v0, 0x8e($s0) -/* DF058C 802416EC 00021400 */ sll $v0, $v0, 0x10 -/* DF0590 802416F0 1C400019 */ bgtz $v0, .L80241758 -/* DF0594 802416F4 00000000 */ nop -.L802416F8: -/* DF0598 802416F8 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DF059C 802416FC 24020002 */ addiu $v0, $zero, 2 -/* DF05A0 80241700 0C00A67F */ jal rand_int -/* DF05A4 80241704 AE620070 */ sw $v0, 0x70($s3) -/* DF05A8 80241708 3C035555 */ lui $v1, 0x5555 -/* DF05AC 8024170C 34635556 */ ori $v1, $v1, 0x5556 -/* DF05B0 80241710 00430018 */ mult $v0, $v1 -/* DF05B4 80241714 000227C3 */ sra $a0, $v0, 0x1f -/* DF05B8 80241718 00004010 */ mfhi $t0 -/* DF05BC 8024171C 01042023 */ subu $a0, $t0, $a0 -/* DF05C0 80241720 00041840 */ sll $v1, $a0, 1 -/* DF05C4 80241724 00641821 */ addu $v1, $v1, $a0 -/* DF05C8 80241728 00431023 */ subu $v0, $v0, $v1 -/* DF05CC 8024172C 24430002 */ addiu $v1, $v0, 2 -/* DF05D0 80241730 AE630074 */ sw $v1, 0x74($s3) -/* DF05D4 80241734 8E42002C */ lw $v0, 0x2c($s2) -/* DF05D8 80241738 58400007 */ blezl $v0, .L80241758 -/* DF05DC 8024173C AE600070 */ sw $zero, 0x70($s3) -/* DF05E0 80241740 8E420008 */ lw $v0, 8($s2) -/* DF05E4 80241744 18400003 */ blez $v0, .L80241754 -/* DF05E8 80241748 28620003 */ slti $v0, $v1, 3 -/* DF05EC 8024174C 10400002 */ beqz $v0, .L80241758 -/* DF05F0 80241750 00000000 */ nop -.L80241754: -/* DF05F4 80241754 AE600070 */ sw $zero, 0x70($s3) -.L80241758: -/* DF05F8 80241758 8FBF0058 */ lw $ra, 0x58($sp) -/* DF05FC 8024175C 8FB50054 */ lw $s5, 0x54($sp) -/* DF0600 80241760 8FB40050 */ lw $s4, 0x50($sp) -/* DF0604 80241764 8FB3004C */ lw $s3, 0x4c($sp) -/* DF0608 80241768 8FB20048 */ lw $s2, 0x48($sp) -/* DF060C 8024176C 8FB10044 */ lw $s1, 0x44($sp) -/* DF0610 80241770 8FB00040 */ lw $s0, 0x40($sp) -/* DF0614 80241774 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* DF0618 80241778 D7B80070 */ ldc1 $f24, 0x70($sp) -/* DF061C 8024177C D7B60068 */ ldc1 $f22, 0x68($sp) -/* DF0620 80241780 D7B40060 */ ldc1 $f20, 0x60($sp) -/* DF0624 80241784 03E00008 */ jr $ra -/* DF0628 80241788 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s new file mode 100644 index 0000000000..dcb7937604 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241164_DF0004.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241164_DF0004 +/* DF0004 80241164 27BDFF80 */ addiu $sp, $sp, -0x80 +/* DF0008 80241168 AFB3004C */ sw $s3, 0x4c($sp) +/* DF000C 8024116C 0080982D */ daddu $s3, $a0, $zero +/* DF0010 80241170 AFBF0058 */ sw $ra, 0x58($sp) +/* DF0014 80241174 AFB50054 */ sw $s5, 0x54($sp) +/* DF0018 80241178 AFB40050 */ sw $s4, 0x50($sp) +/* DF001C 8024117C AFB20048 */ sw $s2, 0x48($sp) +/* DF0020 80241180 AFB10044 */ sw $s1, 0x44($sp) +/* DF0024 80241184 AFB00040 */ sw $s0, 0x40($sp) +/* DF0028 80241188 F7BA0078 */ sdc1 $f26, 0x78($sp) +/* DF002C 8024118C F7B80070 */ sdc1 $f24, 0x70($sp) +/* DF0030 80241190 F7B60068 */ sdc1 $f22, 0x68($sp) +/* DF0034 80241194 F7B40060 */ sdc1 $f20, 0x60($sp) +/* DF0038 80241198 8E710148 */ lw $s1, 0x148($s3) +/* DF003C 8024119C 00A0902D */ daddu $s2, $a1, $zero +/* DF0040 802411A0 86240008 */ lh $a0, 8($s1) +/* DF0044 802411A4 0C00EABB */ jal get_npc_unsafe +/* DF0048 802411A8 00C0A82D */ daddu $s5, $a2, $zero +/* DF004C 802411AC 0040802D */ daddu $s0, $v0, $zero +/* DF0050 802411B0 0000A02D */ daddu $s4, $zero, $zero +/* DF0054 802411B4 C624007C */ lwc1 $f4, 0x7c($s1) +/* DF0058 802411B8 46802120 */ cvt.s.w $f4, $f4 +/* DF005C 802411BC C6220088 */ lwc1 $f2, 0x88($s1) +/* DF0060 802411C0 468010A0 */ cvt.s.w $f2, $f2 +/* DF0064 802411C4 460010A1 */ cvt.d.s $f2, $f2 +/* DF0068 802411C8 46002121 */ cvt.d.s $f4, $f4 +/* DF006C 802411CC C600003C */ lwc1 $f0, 0x3c($s0) +/* DF0070 802411D0 3C014059 */ lui $at, 0x4059 +/* DF0074 802411D4 44813800 */ mtc1 $at, $f7 +/* DF0078 802411D8 44803000 */ mtc1 $zero, $f6 +/* DF007C 802411DC 46000021 */ cvt.d.s $f0, $f0 +/* DF0080 802411E0 46260002 */ mul.d $f0, $f0, $f6 +/* DF0084 802411E4 00000000 */ nop +/* DF0088 802411E8 24020001 */ addiu $v0, $zero, 1 +/* DF008C 802411EC 8E24006C */ lw $a0, 0x6c($s1) +/* DF0090 802411F0 46261083 */ div.d $f2, $f2, $f6 +/* DF0094 802411F4 462010A0 */ cvt.s.d $f2, $f2 +/* DF0098 802411F8 46262103 */ div.d $f4, $f4, $f6 +/* DF009C 802411FC 46202520 */ cvt.s.d $f20, $f4 +/* DF00A0 80241200 30830011 */ andi $v1, $a0, 0x11 +/* DF00A4 80241204 4620020D */ trunc.w.d $f8, $f0 +/* DF00A8 80241208 E628007C */ swc1 $f8, 0x7c($s1) +/* DF00AC 8024120C C6200078 */ lwc1 $f0, 0x78($s1) +/* DF00B0 80241210 46800020 */ cvt.s.w $f0, $f0 +/* DF00B4 80241214 46000021 */ cvt.d.s $f0, $f0 +/* DF00B8 80241218 46260003 */ div.d $f0, $f0, $f6 +/* DF00BC 8024121C 462006A0 */ cvt.s.d $f26, $f0 +/* DF00C0 80241220 C6200070 */ lwc1 $f0, 0x70($s1) +/* DF00C4 80241224 46800020 */ cvt.s.w $f0, $f0 +/* DF00C8 80241228 46000021 */ cvt.d.s $f0, $f0 +/* DF00CC 8024122C 46260003 */ div.d $f0, $f0, $f6 +/* DF00D0 80241230 462005A0 */ cvt.s.d $f22, $f0 +/* DF00D4 80241234 14620025 */ bne $v1, $v0, .L802412CC +/* DF00D8 80241238 4602D600 */ add.s $f24, $f26, $f2 +/* DF00DC 8024123C 8E020000 */ lw $v0, ($s0) +/* DF00E0 80241240 30420008 */ andi $v0, $v0, 8 +/* DF00E4 80241244 10400009 */ beqz $v0, .L8024126C +/* DF00E8 80241248 27A50028 */ addiu $a1, $sp, 0x28 +/* DF00EC 8024124C C600003C */ lwc1 $f0, 0x3c($s0) +/* DF00F0 80241250 4600C001 */ sub.s $f0, $f24, $f0 +/* DF00F4 80241254 4600B03C */ c.lt.s $f22, $f0 +/* DF00F8 80241258 00000000 */ nop +/* DF00FC 8024125C 4500001B */ bc1f .L802412CC +/* DF0100 80241260 34820010 */ ori $v0, $a0, 0x10 +/* DF0104 80241264 080904B3 */ j .L802412CC +/* DF0108 80241268 AE22006C */ sw $v0, 0x6c($s1) +.L8024126C: +/* DF010C 8024126C 27A6002C */ addiu $a2, $sp, 0x2c +/* DF0110 80241270 C6000038 */ lwc1 $f0, 0x38($s0) +/* DF0114 80241274 C602003C */ lwc1 $f2, 0x3c($s0) +/* DF0118 80241278 C6040040 */ lwc1 $f4, 0x40($s0) +/* DF011C 8024127C 3C01447A */ lui $at, 0x447a +/* DF0120 80241280 44813000 */ mtc1 $at, $f6 +/* DF0124 80241284 27A20034 */ addiu $v0, $sp, 0x34 +/* DF0128 80241288 E7A00028 */ swc1 $f0, 0x28($sp) +/* DF012C 8024128C E7A2002C */ swc1 $f2, 0x2c($sp) +/* DF0130 80241290 E7A40030 */ swc1 $f4, 0x30($sp) +/* DF0134 80241294 E7A60034 */ swc1 $f6, 0x34($sp) +/* DF0138 80241298 AFA20010 */ sw $v0, 0x10($sp) +/* DF013C 8024129C 8E040080 */ lw $a0, 0x80($s0) +/* DF0140 802412A0 0C0372DF */ jal func_800DCB7C +/* DF0144 802412A4 27A70030 */ addiu $a3, $sp, 0x30 +/* DF0148 802412A8 C7A00034 */ lwc1 $f0, 0x34($sp) +/* DF014C 802412AC 4600D001 */ sub.s $f0, $f26, $f0 +/* DF0150 802412B0 4600B03C */ c.lt.s $f22, $f0 +/* DF0154 802412B4 00000000 */ nop +/* DF0158 802412B8 45000004 */ bc1f .L802412CC +/* DF015C 802412BC 00000000 */ nop +/* DF0160 802412C0 8E22006C */ lw $v0, 0x6c($s1) +/* DF0164 802412C4 34420010 */ ori $v0, $v0, 0x10 +/* DF0168 802412C8 AE22006C */ sw $v0, 0x6c($s1) +.L802412CC: +/* DF016C 802412CC 8E22006C */ lw $v0, 0x6c($s1) +/* DF0170 802412D0 24030011 */ addiu $v1, $zero, 0x11 +/* DF0174 802412D4 30420011 */ andi $v0, $v0, 0x11 +/* DF0178 802412D8 14430039 */ bne $v0, $v1, .L802413C0 +/* DF017C 802412DC 00000000 */ nop +/* DF0180 802412E0 8E020000 */ lw $v0, ($s0) +/* DF0184 802412E4 30420008 */ andi $v0, $v0, 8 +/* DF0188 802412E8 1040000A */ beqz $v0, .L80241314 +/* DF018C 802412EC 4600C106 */ mov.s $f4, $f24 +/* DF0190 802412F0 4614C081 */ sub.s $f2, $f24, $f20 +/* DF0194 802412F4 3C018024 */ lui $at, 0x8024 +/* DF0198 802412F8 D4207958 */ ldc1 $f0, 0x7958($at) +/* DF019C 802412FC 460010A1 */ cvt.d.s $f2, $f2 +/* DF01A0 80241300 46201082 */ mul.d $f2, $f2, $f0 +/* DF01A4 80241304 00000000 */ nop +/* DF01A8 80241308 4600A021 */ cvt.d.s $f0, $f20 +/* DF01AC 8024130C 080904DE */ j .L80241378 +/* DF01B0 80241310 46220000 */ add.d $f0, $f0, $f2 +.L80241314: +/* DF01B4 80241314 27A50028 */ addiu $a1, $sp, 0x28 +/* DF01B8 80241318 27A6002C */ addiu $a2, $sp, 0x2c +/* DF01BC 8024131C C6000038 */ lwc1 $f0, 0x38($s0) +/* DF01C0 80241320 C6020040 */ lwc1 $f2, 0x40($s0) +/* DF01C4 80241324 3C01447A */ lui $at, 0x447a +/* DF01C8 80241328 44812000 */ mtc1 $at, $f4 +/* DF01CC 8024132C 27A20034 */ addiu $v0, $sp, 0x34 +/* DF01D0 80241330 E7B4002C */ swc1 $f20, 0x2c($sp) +/* DF01D4 80241334 E7A00028 */ swc1 $f0, 0x28($sp) +/* DF01D8 80241338 E7A20030 */ swc1 $f2, 0x30($sp) +/* DF01DC 8024133C E7A40034 */ swc1 $f4, 0x34($sp) +/* DF01E0 80241340 AFA20010 */ sw $v0, 0x10($sp) +/* DF01E4 80241344 8E040080 */ lw $a0, 0x80($s0) +/* DF01E8 80241348 0C0372DF */ jal func_800DCB7C +/* DF01EC 8024134C 27A70030 */ addiu $a3, $sp, 0x30 +/* DF01F0 80241350 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* DF01F4 80241354 461A2100 */ add.s $f4, $f4, $f26 +/* DF01F8 80241358 46142081 */ sub.s $f2, $f4, $f20 +/* DF01FC 8024135C 3C018024 */ lui $at, 0x8024 +/* DF0200 80241360 D4207960 */ ldc1 $f0, 0x7960($at) +/* DF0204 80241364 460010A1 */ cvt.d.s $f2, $f2 +/* DF0208 80241368 46201082 */ mul.d $f2, $f2, $f0 +/* DF020C 8024136C 00000000 */ nop +/* DF0210 80241370 4600A021 */ cvt.d.s $f0, $f20 +/* DF0214 80241374 46220000 */ add.d $f0, $f0, $f2 +.L80241378: +/* DF0218 80241378 46200020 */ cvt.s.d $f0, $f0 +/* DF021C 8024137C E600003C */ swc1 $f0, 0x3c($s0) +/* DF0220 80241380 C600003C */ lwc1 $f0, 0x3c($s0) +/* DF0224 80241384 46002001 */ sub.s $f0, $f4, $f0 +/* DF0228 80241388 3C013FF0 */ lui $at, 0x3ff0 +/* DF022C 8024138C 44811800 */ mtc1 $at, $f3 +/* DF0230 80241390 44801000 */ mtc1 $zero, $f2 +/* DF0234 80241394 46000005 */ abs.s $f0, $f0 +/* DF0238 80241398 46000021 */ cvt.d.s $f0, $f0 +/* DF023C 8024139C 4622003C */ c.lt.d $f0, $f2 +/* DF0240 802413A0 00000000 */ nop +/* DF0244 802413A4 45000036 */ bc1f .L80241480 +/* DF0248 802413A8 2403FFEF */ addiu $v1, $zero, -0x11 +/* DF024C 802413AC E604003C */ swc1 $f4, 0x3c($s0) +/* DF0250 802413B0 8E22006C */ lw $v0, 0x6c($s1) +/* DF0254 802413B4 00431024 */ and $v0, $v0, $v1 +/* DF0258 802413B8 08090520 */ j .L80241480 +/* DF025C 802413BC AE22006C */ sw $v0, 0x6c($s1) +.L802413C0: +/* DF0260 802413C0 8E220070 */ lw $v0, 0x70($s1) +/* DF0264 802413C4 1840002E */ blez $v0, .L80241480 +/* DF0268 802413C8 00000000 */ nop +/* DF026C 802413CC C62C0074 */ lwc1 $f12, 0x74($s1) +/* DF0270 802413D0 0C00A8BB */ jal sin_deg +/* DF0274 802413D4 46806320 */ cvt.s.w $f12, $f12 +/* DF0278 802413D8 8E020000 */ lw $v0, ($s0) +/* DF027C 802413DC 30420008 */ andi $v0, $v0, 8 +/* DF0280 802413E0 10400003 */ beqz $v0, .L802413F0 +/* DF0284 802413E4 46000506 */ mov.s $f20, $f0 +/* DF0288 802413E8 0809050C */ j .L80241430 +/* DF028C 802413EC 0000102D */ daddu $v0, $zero, $zero +.L802413F0: +/* DF0290 802413F0 27A50028 */ addiu $a1, $sp, 0x28 +/* DF0294 802413F4 27A6002C */ addiu $a2, $sp, 0x2c +/* DF0298 802413F8 C6000038 */ lwc1 $f0, 0x38($s0) +/* DF029C 802413FC C602003C */ lwc1 $f2, 0x3c($s0) +/* DF02A0 80241400 C6040040 */ lwc1 $f4, 0x40($s0) +/* DF02A4 80241404 3C01447A */ lui $at, 0x447a +/* DF02A8 80241408 44813000 */ mtc1 $at, $f6 +/* DF02AC 8024140C 27A20034 */ addiu $v0, $sp, 0x34 +/* DF02B0 80241410 E7A00028 */ swc1 $f0, 0x28($sp) +/* DF02B4 80241414 E7A2002C */ swc1 $f2, 0x2c($sp) +/* DF02B8 80241418 E7A40030 */ swc1 $f4, 0x30($sp) +/* DF02BC 8024141C E7A60034 */ swc1 $f6, 0x34($sp) +/* DF02C0 80241420 AFA20010 */ sw $v0, 0x10($sp) +/* DF02C4 80241424 8E040080 */ lw $a0, 0x80($s0) +/* DF02C8 80241428 0C0372DF */ jal func_800DCB7C +/* DF02CC 8024142C 27A70030 */ addiu $a3, $sp, 0x30 +.L80241430: +/* DF02D0 80241430 10400007 */ beqz $v0, .L80241450 +/* DF02D4 80241434 00000000 */ nop +/* DF02D8 80241438 4616A082 */ mul.s $f2, $f20, $f22 +/* DF02DC 8024143C 00000000 */ nop +/* DF02E0 80241440 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* DF02E4 80241444 461A0000 */ add.s $f0, $f0, $f26 +/* DF02E8 80241448 08090517 */ j .L8024145C +/* DF02EC 8024144C 46020000 */ add.s $f0, $f0, $f2 +.L80241450: +/* DF02F0 80241450 4616A002 */ mul.s $f0, $f20, $f22 +/* DF02F4 80241454 00000000 */ nop +/* DF02F8 80241458 4600C000 */ add.s $f0, $f24, $f0 +.L8024145C: +/* DF02FC 8024145C E600003C */ swc1 $f0, 0x3c($s0) +/* DF0300 80241460 8E220074 */ lw $v0, 0x74($s1) +/* DF0304 80241464 2442000A */ addiu $v0, $v0, 0xa +/* DF0308 80241468 44826000 */ mtc1 $v0, $f12 +/* DF030C 8024146C 00000000 */ nop +/* DF0310 80241470 0C00A6C9 */ jal clamp_angle +/* DF0314 80241474 46806320 */ cvt.s.w $f12, $f12 +/* DF0318 80241478 4600020D */ trunc.w.s $f8, $f0 +/* DF031C 8024147C E6280074 */ swc1 $f8, 0x74($s1) +.L80241480: +/* DF0320 80241480 8E220090 */ lw $v0, 0x90($s1) +/* DF0324 80241484 1C40004A */ bgtz $v0, .L802415B0 +/* DF0328 80241488 2442FFFF */ addiu $v0, $v0, -1 +/* DF032C 8024148C 8E430014 */ lw $v1, 0x14($s2) +/* DF0330 80241490 04600048 */ bltz $v1, .L802415B4 +/* DF0334 80241494 00000000 */ nop +/* DF0338 80241498 8E620074 */ lw $v0, 0x74($s3) +/* DF033C 8024149C 1C400042 */ bgtz $v0, .L802415A8 +/* DF0340 802414A0 2442FFFF */ addiu $v0, $v0, -1 +/* DF0344 802414A4 AE630074 */ sw $v1, 0x74($s3) +/* DF0348 802414A8 860200A8 */ lh $v0, 0xa8($s0) +/* DF034C 802414AC C602003C */ lwc1 $f2, 0x3c($s0) +/* DF0350 802414B0 44820000 */ mtc1 $v0, $f0 +/* DF0354 802414B4 00000000 */ nop +/* DF0358 802414B8 46800020 */ cvt.s.w $f0, $f0 +/* DF035C 802414BC 46001080 */ add.s $f2, $f2, $f0 +/* DF0360 802414C0 3C014024 */ lui $at, 0x4024 +/* DF0364 802414C4 44810800 */ mtc1 $at, $f1 +/* DF0368 802414C8 44800000 */ mtc1 $zero, $f0 +/* DF036C 802414CC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DF0370 802414D0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DF0374 802414D4 460010A1 */ cvt.d.s $f2, $f2 +/* DF0378 802414D8 46201080 */ add.d $f2, $f2, $f0 +/* DF037C 802414DC C440002C */ lwc1 $f0, 0x2c($v0) +/* DF0380 802414E0 46000021 */ cvt.d.s $f0, $f0 +/* DF0384 802414E4 4622003C */ c.lt.d $f0, $f2 +/* DF0388 802414E8 00000000 */ nop +/* DF038C 802414EC 4500002C */ bc1f .L802415A0 +/* DF0390 802414F0 02A0202D */ daddu $a0, $s5, $zero +/* DF0394 802414F4 AFA00010 */ sw $zero, 0x10($sp) +/* DF0398 802414F8 8E46000C */ lw $a2, 0xc($s2) +/* DF039C 802414FC 8E470010 */ lw $a3, 0x10($s2) +/* DF03A0 80241500 0C01242D */ jal func_800490B4 +/* DF03A4 80241504 0220282D */ daddu $a1, $s1, $zero +/* DF03A8 80241508 10400025 */ beqz $v0, .L802415A0 +/* DF03AC 8024150C 0000202D */ daddu $a0, $zero, $zero +/* DF03B0 80241510 0200282D */ daddu $a1, $s0, $zero +/* DF03B4 80241514 0000302D */ daddu $a2, $zero, $zero +/* DF03B8 80241518 2412000C */ addiu $s2, $zero, 0xc +/* DF03BC 8024151C 860300A8 */ lh $v1, 0xa8($s0) +/* DF03C0 80241520 3C013F80 */ lui $at, 0x3f80 +/* DF03C4 80241524 44810000 */ mtc1 $at, $f0 +/* DF03C8 80241528 3C014000 */ lui $at, 0x4000 +/* DF03CC 8024152C 44811000 */ mtc1 $at, $f2 +/* DF03D0 80241530 3C01C1A0 */ lui $at, 0xc1a0 +/* DF03D4 80241534 44812000 */ mtc1 $at, $f4 +/* DF03D8 80241538 44834000 */ mtc1 $v1, $f8 +/* DF03DC 8024153C 00000000 */ nop +/* DF03E0 80241540 46804220 */ cvt.s.w $f8, $f8 +/* DF03E4 80241544 44074000 */ mfc1 $a3, $f8 +/* DF03E8 80241548 27A20038 */ addiu $v0, $sp, 0x38 +/* DF03EC 8024154C AFB2001C */ sw $s2, 0x1c($sp) +/* DF03F0 80241550 AFA20020 */ sw $v0, 0x20($sp) +/* DF03F4 80241554 E7A00010 */ swc1 $f0, 0x10($sp) +/* DF03F8 80241558 E7A20014 */ swc1 $f2, 0x14($sp) +/* DF03FC 8024155C 0C01BFA4 */ jal fx_emote +/* DF0400 80241560 E7A40018 */ swc1 $f4, 0x18($sp) +/* DF0404 80241564 0200202D */ daddu $a0, $s0, $zero +/* DF0408 80241568 240502F4 */ addiu $a1, $zero, 0x2f4 +/* DF040C 8024156C C480003C */ lwc1 $f0, 0x3c($a0) +/* DF0410 80241570 3C060020 */ lui $a2, 0x20 +/* DF0414 80241574 0C012530 */ jal func_800494C0 +/* DF0418 80241578 E4800064 */ swc1 $f0, 0x64($a0) +/* DF041C 8024157C 8E220018 */ lw $v0, 0x18($s1) +/* DF0420 80241580 9442002A */ lhu $v0, 0x2a($v0) +/* DF0424 80241584 30420001 */ andi $v0, $v0, 1 +/* DF0428 80241588 10400003 */ beqz $v0, .L80241598 +/* DF042C 8024158C 2402000A */ addiu $v0, $zero, 0xa +/* DF0430 80241590 080905D6 */ j .L80241758 +/* DF0434 80241594 AE620070 */ sw $v0, 0x70($s3) +.L80241598: +/* DF0438 80241598 080905D6 */ j .L80241758 +/* DF043C 8024159C AE720070 */ sw $s2, 0x70($s3) +.L802415A0: +/* DF0440 802415A0 8E620074 */ lw $v0, 0x74($s3) +/* DF0444 802415A4 2442FFFF */ addiu $v0, $v0, -1 +.L802415A8: +/* DF0448 802415A8 0809056D */ j .L802415B4 +/* DF044C 802415AC AE620074 */ sw $v0, 0x74($s3) +.L802415B0: +/* DF0450 802415B0 AE220090 */ sw $v0, 0x90($s1) +.L802415B4: +/* DF0454 802415B4 8E2300D0 */ lw $v1, 0xd0($s1) +/* DF0458 802415B8 C6000040 */ lwc1 $f0, 0x40($s0) +/* DF045C 802415BC C4620000 */ lwc1 $f2, ($v1) +/* DF0460 802415C0 468010A0 */ cvt.s.w $f2, $f2 +/* DF0464 802415C4 C4640008 */ lwc1 $f4, 8($v1) +/* DF0468 802415C8 46802120 */ cvt.s.w $f4, $f4 +/* DF046C 802415CC E7A00010 */ swc1 $f0, 0x10($sp) +/* DF0470 802415D0 8E2200D0 */ lw $v0, 0xd0($s1) +/* DF0474 802415D4 44051000 */ mfc1 $a1, $f2 +/* DF0478 802415D8 C440000C */ lwc1 $f0, 0xc($v0) +/* DF047C 802415DC 46800020 */ cvt.s.w $f0, $f0 +/* DF0480 802415E0 E7A00014 */ swc1 $f0, 0x14($sp) +/* DF0484 802415E4 8E2200D0 */ lw $v0, 0xd0($s1) +/* DF0488 802415E8 44062000 */ mfc1 $a2, $f4 +/* DF048C 802415EC C4400010 */ lwc1 $f0, 0x10($v0) +/* DF0490 802415F0 46800020 */ cvt.s.w $f0, $f0 +/* DF0494 802415F4 E7A00018 */ swc1 $f0, 0x18($sp) +/* DF0498 802415F8 8C640018 */ lw $a0, 0x18($v1) +/* DF049C 802415FC 0C0123F5 */ jal is_point_within_region +/* DF04A0 80241600 8E070038 */ lw $a3, 0x38($s0) +/* DF04A4 80241604 1040001A */ beqz $v0, .L80241670 +/* DF04A8 80241608 00000000 */ nop +/* DF04AC 8024160C 8E060038 */ lw $a2, 0x38($s0) +/* DF04B0 80241610 8E2200D0 */ lw $v0, 0xd0($s1) +/* DF04B4 80241614 8E070040 */ lw $a3, 0x40($s0) +/* DF04B8 80241618 C44C0000 */ lwc1 $f12, ($v0) +/* DF04BC 8024161C 46806320 */ cvt.s.w $f12, $f12 +/* DF04C0 80241620 C44E0008 */ lwc1 $f14, 8($v0) +/* DF04C4 80241624 0C00A7B5 */ jal dist2D +/* DF04C8 80241628 468073A0 */ cvt.s.w $f14, $f14 +/* DF04CC 8024162C C6020018 */ lwc1 $f2, 0x18($s0) +/* DF04D0 80241630 4600103C */ c.lt.s $f2, $f0 +/* DF04D4 80241634 00000000 */ nop +/* DF04D8 80241638 4500000D */ bc1f .L80241670 +/* DF04DC 8024163C E7A00034 */ swc1 $f0, 0x34($sp) +/* DF04E0 80241640 C60C0038 */ lwc1 $f12, 0x38($s0) +/* DF04E4 80241644 8E2200D0 */ lw $v0, 0xd0($s1) +/* DF04E8 80241648 C60E0040 */ lwc1 $f14, 0x40($s0) +/* DF04EC 8024164C C4480000 */ lwc1 $f8, ($v0) +/* DF04F0 80241650 46804220 */ cvt.s.w $f8, $f8 +/* DF04F4 80241654 44064000 */ mfc1 $a2, $f8 +/* DF04F8 80241658 C4480008 */ lwc1 $f8, 8($v0) +/* DF04FC 8024165C 46804220 */ cvt.s.w $f8, $f8 +/* DF0500 80241660 44074000 */ mfc1 $a3, $f8 +/* DF0504 80241664 0C00A720 */ jal atan2 +/* DF0508 80241668 24140001 */ addiu $s4, $zero, 1 +/* DF050C 8024166C E600000C */ swc1 $f0, 0xc($s0) +.L80241670: +/* DF0510 80241670 8E2200D0 */ lw $v0, 0xd0($s1) +/* DF0514 80241674 8C43000C */ lw $v1, 0xc($v0) +/* DF0518 80241678 8C420010 */ lw $v0, 0x10($v0) +/* DF051C 8024167C 00621825 */ or $v1, $v1, $v0 +/* DF0520 80241680 00741825 */ or $v1, $v1, $s4 +/* DF0524 80241684 10600008 */ beqz $v1, .L802416A8 +/* DF0528 80241688 00000000 */ nop +/* DF052C 8024168C 8602008C */ lh $v0, 0x8c($s0) +/* DF0530 80241690 14400031 */ bnez $v0, .L80241758 +/* DF0534 80241694 00000000 */ nop +/* DF0538 80241698 8E050018 */ lw $a1, 0x18($s0) +/* DF053C 8024169C 8E06000C */ lw $a2, 0xc($s0) +/* DF0540 802416A0 0C00EA95 */ jal npc_move_heading +/* DF0544 802416A4 0200202D */ daddu $a0, $s0, $zero +.L802416A8: +/* DF0548 802416A8 C600003C */ lwc1 $f0, 0x3c($s0) +/* DF054C 802416AC 3C014059 */ lui $at, 0x4059 +/* DF0550 802416B0 44811800 */ mtc1 $at, $f3 +/* DF0554 802416B4 44801000 */ mtc1 $zero, $f2 +/* DF0558 802416B8 46000021 */ cvt.d.s $f0, $f0 +/* DF055C 802416BC 46220002 */ mul.d $f0, $f0, $f2 +/* DF0560 802416C0 00000000 */ nop +/* DF0564 802416C4 4620020D */ trunc.w.d $f8, $f0 +/* DF0568 802416C8 E628007C */ swc1 $f8, 0x7c($s1) +/* DF056C 802416CC 8E420004 */ lw $v0, 4($s2) +/* DF0570 802416D0 18400021 */ blez $v0, .L80241758 +/* DF0574 802416D4 00000000 */ nop +/* DF0578 802416D8 8602008E */ lh $v0, 0x8e($s0) +/* DF057C 802416DC 9603008E */ lhu $v1, 0x8e($s0) +/* DF0580 802416E0 18400005 */ blez $v0, .L802416F8 +/* DF0584 802416E4 2462FFFF */ addiu $v0, $v1, -1 +/* DF0588 802416E8 A602008E */ sh $v0, 0x8e($s0) +/* DF058C 802416EC 00021400 */ sll $v0, $v0, 0x10 +/* DF0590 802416F0 1C400019 */ bgtz $v0, .L80241758 +/* DF0594 802416F4 00000000 */ nop +.L802416F8: +/* DF0598 802416F8 240403E8 */ addiu $a0, $zero, 0x3e8 +/* DF059C 802416FC 24020002 */ addiu $v0, $zero, 2 +/* DF05A0 80241700 0C00A67F */ jal rand_int +/* DF05A4 80241704 AE620070 */ sw $v0, 0x70($s3) +/* DF05A8 80241708 3C035555 */ lui $v1, 0x5555 +/* DF05AC 8024170C 34635556 */ ori $v1, $v1, 0x5556 +/* DF05B0 80241710 00430018 */ mult $v0, $v1 +/* DF05B4 80241714 000227C3 */ sra $a0, $v0, 0x1f +/* DF05B8 80241718 00004010 */ mfhi $t0 +/* DF05BC 8024171C 01042023 */ subu $a0, $t0, $a0 +/* DF05C0 80241720 00041840 */ sll $v1, $a0, 1 +/* DF05C4 80241724 00641821 */ addu $v1, $v1, $a0 +/* DF05C8 80241728 00431023 */ subu $v0, $v0, $v1 +/* DF05CC 8024172C 24430002 */ addiu $v1, $v0, 2 +/* DF05D0 80241730 AE630074 */ sw $v1, 0x74($s3) +/* DF05D4 80241734 8E42002C */ lw $v0, 0x2c($s2) +/* DF05D8 80241738 58400007 */ blezl $v0, .L80241758 +/* DF05DC 8024173C AE600070 */ sw $zero, 0x70($s3) +/* DF05E0 80241740 8E420008 */ lw $v0, 8($s2) +/* DF05E4 80241744 18400003 */ blez $v0, .L80241754 +/* DF05E8 80241748 28620003 */ slti $v0, $v1, 3 +/* DF05EC 8024174C 10400002 */ beqz $v0, .L80241758 +/* DF05F0 80241750 00000000 */ nop +.L80241754: +/* DF05F4 80241754 AE600070 */ sw $zero, 0x70($s3) +.L80241758: +/* DF05F8 80241758 8FBF0058 */ lw $ra, 0x58($sp) +/* DF05FC 8024175C 8FB50054 */ lw $s5, 0x54($sp) +/* DF0600 80241760 8FB40050 */ lw $s4, 0x50($sp) +/* DF0604 80241764 8FB3004C */ lw $s3, 0x4c($sp) +/* DF0608 80241768 8FB20048 */ lw $s2, 0x48($sp) +/* DF060C 8024176C 8FB10044 */ lw $s1, 0x44($sp) +/* DF0610 80241770 8FB00040 */ lw $s0, 0x40($sp) +/* DF0614 80241774 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* DF0618 80241778 D7B80070 */ ldc1 $f24, 0x70($sp) +/* DF061C 8024177C D7B60068 */ ldc1 $f22, 0x68($sp) +/* DF0620 80241780 D7B40060 */ ldc1 $f20, 0x60($sp) +/* DF0624 80241784 03E00008 */ jr $ra +/* DF0628 80241788 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C.s deleted file mode 100644 index 9255760b2f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024178C -/* DF062C 8024178C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DF0630 80241790 AFB3001C */ sw $s3, 0x1c($sp) -/* DF0634 80241794 0080982D */ daddu $s3, $a0, $zero -/* DF0638 80241798 AFBF0020 */ sw $ra, 0x20($sp) -/* DF063C 8024179C AFB20018 */ sw $s2, 0x18($sp) -/* DF0640 802417A0 AFB10014 */ sw $s1, 0x14($sp) -/* DF0644 802417A4 AFB00010 */ sw $s0, 0x10($sp) -/* DF0648 802417A8 8E720148 */ lw $s2, 0x148($s3) -/* DF064C 802417AC 86440008 */ lh $a0, 8($s2) -/* DF0650 802417B0 0C00EABB */ jal get_npc_unsafe -/* DF0654 802417B4 00A0882D */ daddu $s1, $a1, $zero -/* DF0658 802417B8 8E240008 */ lw $a0, 8($s1) -/* DF065C 802417BC 0040802D */ daddu $s0, $v0, $zero -/* DF0660 802417C0 00041FC2 */ srl $v1, $a0, 0x1f -/* DF0664 802417C4 00832021 */ addu $a0, $a0, $v1 -/* DF0668 802417C8 00042043 */ sra $a0, $a0, 1 -/* DF066C 802417CC 0C00A67F */ jal rand_int -/* DF0670 802417D0 24840001 */ addiu $a0, $a0, 1 -/* DF0674 802417D4 8E230008 */ lw $v1, 8($s1) -/* DF0678 802417D8 240400B4 */ addiu $a0, $zero, 0xb4 -/* DF067C 802417DC 00032FC2 */ srl $a1, $v1, 0x1f -/* DF0680 802417E0 00651821 */ addu $v1, $v1, $a1 -/* DF0684 802417E4 00031843 */ sra $v1, $v1, 1 -/* DF0688 802417E8 00621821 */ addu $v1, $v1, $v0 -/* DF068C 802417EC 0C00A67F */ jal rand_int -/* DF0690 802417F0 A603008E */ sh $v1, 0x8e($s0) -/* DF0694 802417F4 C60C000C */ lwc1 $f12, 0xc($s0) -/* DF0698 802417F8 44820000 */ mtc1 $v0, $f0 -/* DF069C 802417FC 00000000 */ nop -/* DF06A0 80241800 46800020 */ cvt.s.w $f0, $f0 -/* DF06A4 80241804 46006300 */ add.s $f12, $f12, $f0 -/* DF06A8 80241808 3C0142B4 */ lui $at, 0x42b4 -/* DF06AC 8024180C 44810000 */ mtc1 $at, $f0 -/* DF06B0 80241810 0C00A6C9 */ jal clamp_angle -/* DF06B4 80241814 46006301 */ sub.s $f12, $f12, $f0 -/* DF06B8 80241818 E600000C */ swc1 $f0, 0xc($s0) -/* DF06BC 8024181C 8E4200CC */ lw $v0, 0xcc($s2) -/* DF06C0 80241820 8C420000 */ lw $v0, ($v0) -/* DF06C4 80241824 AE020028 */ sw $v0, 0x28($s0) -/* DF06C8 80241828 24020003 */ addiu $v0, $zero, 3 -/* DF06CC 8024182C AE620070 */ sw $v0, 0x70($s3) -/* DF06D0 80241830 8FBF0020 */ lw $ra, 0x20($sp) -/* DF06D4 80241834 8FB3001C */ lw $s3, 0x1c($sp) -/* DF06D8 80241838 8FB20018 */ lw $s2, 0x18($sp) -/* DF06DC 8024183C 8FB10014 */ lw $s1, 0x14($sp) -/* DF06E0 80241840 8FB00010 */ lw $s0, 0x10($sp) -/* DF06E4 80241844 03E00008 */ jr $ra -/* DF06E8 80241848 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s new file mode 100644 index 0000000000..1fa9a42b98 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024178C_DF062C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024178C_DF062C +/* DF062C 8024178C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* DF0630 80241790 AFB3001C */ sw $s3, 0x1c($sp) +/* DF0634 80241794 0080982D */ daddu $s3, $a0, $zero +/* DF0638 80241798 AFBF0020 */ sw $ra, 0x20($sp) +/* DF063C 8024179C AFB20018 */ sw $s2, 0x18($sp) +/* DF0640 802417A0 AFB10014 */ sw $s1, 0x14($sp) +/* DF0644 802417A4 AFB00010 */ sw $s0, 0x10($sp) +/* DF0648 802417A8 8E720148 */ lw $s2, 0x148($s3) +/* DF064C 802417AC 86440008 */ lh $a0, 8($s2) +/* DF0650 802417B0 0C00EABB */ jal get_npc_unsafe +/* DF0654 802417B4 00A0882D */ daddu $s1, $a1, $zero +/* DF0658 802417B8 8E240008 */ lw $a0, 8($s1) +/* DF065C 802417BC 0040802D */ daddu $s0, $v0, $zero +/* DF0660 802417C0 00041FC2 */ srl $v1, $a0, 0x1f +/* DF0664 802417C4 00832021 */ addu $a0, $a0, $v1 +/* DF0668 802417C8 00042043 */ sra $a0, $a0, 1 +/* DF066C 802417CC 0C00A67F */ jal rand_int +/* DF0670 802417D0 24840001 */ addiu $a0, $a0, 1 +/* DF0674 802417D4 8E230008 */ lw $v1, 8($s1) +/* DF0678 802417D8 240400B4 */ addiu $a0, $zero, 0xb4 +/* DF067C 802417DC 00032FC2 */ srl $a1, $v1, 0x1f +/* DF0680 802417E0 00651821 */ addu $v1, $v1, $a1 +/* DF0684 802417E4 00031843 */ sra $v1, $v1, 1 +/* DF0688 802417E8 00621821 */ addu $v1, $v1, $v0 +/* DF068C 802417EC 0C00A67F */ jal rand_int +/* DF0690 802417F0 A603008E */ sh $v1, 0x8e($s0) +/* DF0694 802417F4 C60C000C */ lwc1 $f12, 0xc($s0) +/* DF0698 802417F8 44820000 */ mtc1 $v0, $f0 +/* DF069C 802417FC 00000000 */ nop +/* DF06A0 80241800 46800020 */ cvt.s.w $f0, $f0 +/* DF06A4 80241804 46006300 */ add.s $f12, $f12, $f0 +/* DF06A8 80241808 3C0142B4 */ lui $at, 0x42b4 +/* DF06AC 8024180C 44810000 */ mtc1 $at, $f0 +/* DF06B0 80241810 0C00A6C9 */ jal clamp_angle +/* DF06B4 80241814 46006301 */ sub.s $f12, $f12, $f0 +/* DF06B8 80241818 E600000C */ swc1 $f0, 0xc($s0) +/* DF06BC 8024181C 8E4200CC */ lw $v0, 0xcc($s2) +/* DF06C0 80241820 8C420000 */ lw $v0, ($v0) +/* DF06C4 80241824 AE020028 */ sw $v0, 0x28($s0) +/* DF06C8 80241828 24020003 */ addiu $v0, $zero, 3 +/* DF06CC 8024182C AE620070 */ sw $v0, 0x70($s3) +/* DF06D0 80241830 8FBF0020 */ lw $ra, 0x20($sp) +/* DF06D4 80241834 8FB3001C */ lw $s3, 0x1c($sp) +/* DF06D8 80241838 8FB20018 */ lw $s2, 0x18($sp) +/* DF06DC 8024183C 8FB10014 */ lw $s1, 0x14($sp) +/* DF06E0 80241840 8FB00010 */ lw $s0, 0x10($sp) +/* DF06E4 80241844 03E00008 */ jr $ra +/* DF06E8 80241848 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C.s deleted file mode 100644 index c86c96d710..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024184C -/* DF06EC 8024184C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* DF06F0 80241850 AFB3004C */ sw $s3, 0x4c($sp) -/* DF06F4 80241854 0080982D */ daddu $s3, $a0, $zero -/* DF06F8 80241858 AFBF0054 */ sw $ra, 0x54($sp) -/* DF06FC 8024185C AFB40050 */ sw $s4, 0x50($sp) -/* DF0700 80241860 AFB20048 */ sw $s2, 0x48($sp) -/* DF0704 80241864 AFB10044 */ sw $s1, 0x44($sp) -/* DF0708 80241868 AFB00040 */ sw $s0, 0x40($sp) -/* DF070C 8024186C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* DF0710 80241870 F7B80068 */ sdc1 $f24, 0x68($sp) -/* DF0714 80241874 F7B60060 */ sdc1 $f22, 0x60($sp) -/* DF0718 80241878 F7B40058 */ sdc1 $f20, 0x58($sp) -/* DF071C 8024187C 8E710148 */ lw $s1, 0x148($s3) -/* DF0720 80241880 00A0902D */ daddu $s2, $a1, $zero -/* DF0724 80241884 86240008 */ lh $a0, 8($s1) -/* DF0728 80241888 0C00EABB */ jal get_npc_unsafe -/* DF072C 8024188C 00C0A02D */ daddu $s4, $a2, $zero -/* DF0730 80241890 0040802D */ daddu $s0, $v0, $zero -/* DF0734 80241894 C6200078 */ lwc1 $f0, 0x78($s1) -/* DF0738 80241898 46800020 */ cvt.s.w $f0, $f0 -/* DF073C 8024189C 46000021 */ cvt.d.s $f0, $f0 -/* DF0740 802418A0 3C014059 */ lui $at, 0x4059 -/* DF0744 802418A4 44811800 */ mtc1 $at, $f3 -/* DF0748 802418A8 44801000 */ mtc1 $zero, $f2 -/* DF074C 802418AC 8602008E */ lh $v0, 0x8e($s0) -/* DF0750 802418B0 9603008E */ lhu $v1, 0x8e($s0) -/* DF0754 802418B4 46220003 */ div.d $f0, $f0, $f2 -/* DF0758 802418B8 46200620 */ cvt.s.d $f24, $f0 -/* DF075C 802418BC C6200088 */ lwc1 $f0, 0x88($s1) -/* DF0760 802418C0 46800020 */ cvt.s.w $f0, $f0 -/* DF0764 802418C4 46000021 */ cvt.d.s $f0, $f0 -/* DF0768 802418C8 46220003 */ div.d $f0, $f0, $f2 -/* DF076C 802418CC 46200020 */ cvt.s.d $f0, $f0 -/* DF0770 802418D0 18400003 */ blez $v0, .L802418E0 -/* DF0774 802418D4 4600C680 */ add.s $f26, $f24, $f0 -/* DF0778 802418D8 2462FFFF */ addiu $v0, $v1, -1 -/* DF077C 802418DC A602008E */ sh $v0, 0x8e($s0) -.L802418E0: -/* DF0780 802418E0 8E220070 */ lw $v0, 0x70($s1) -/* DF0784 802418E4 18400034 */ blez $v0, .L802419B8 -/* DF0788 802418E8 00000000 */ nop -/* DF078C 802418EC C62C0074 */ lwc1 $f12, 0x74($s1) -/* DF0790 802418F0 46806320 */ cvt.s.w $f12, $f12 -/* DF0794 802418F4 44820000 */ mtc1 $v0, $f0 -/* DF0798 802418F8 00000000 */ nop -/* DF079C 802418FC 46800020 */ cvt.s.w $f0, $f0 -/* DF07A0 80241900 46000021 */ cvt.d.s $f0, $f0 -/* DF07A4 80241904 46220003 */ div.d $f0, $f0, $f2 -/* DF07A8 80241908 0C00A8BB */ jal sin_deg -/* DF07AC 8024190C 462005A0 */ cvt.s.d $f22, $f0 -/* DF07B0 80241910 8E020000 */ lw $v0, ($s0) -/* DF07B4 80241914 30420008 */ andi $v0, $v0, 8 -/* DF07B8 80241918 10400003 */ beqz $v0, .L80241928 -/* DF07BC 8024191C 46000506 */ mov.s $f20, $f0 -/* DF07C0 80241920 0809065A */ j .L80241968 -/* DF07C4 80241924 0000102D */ daddu $v0, $zero, $zero -.L80241928: -/* DF07C8 80241928 27A50028 */ addiu $a1, $sp, 0x28 -/* DF07CC 8024192C 27A6002C */ addiu $a2, $sp, 0x2c -/* DF07D0 80241930 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF07D4 80241934 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF07D8 80241938 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF07DC 8024193C 3C01447A */ lui $at, 0x447a -/* DF07E0 80241940 44813000 */ mtc1 $at, $f6 -/* DF07E4 80241944 27A20034 */ addiu $v0, $sp, 0x34 -/* DF07E8 80241948 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF07EC 8024194C E7A2002C */ swc1 $f2, 0x2c($sp) -/* DF07F0 80241950 E7A40030 */ swc1 $f4, 0x30($sp) -/* DF07F4 80241954 E7A60034 */ swc1 $f6, 0x34($sp) -/* DF07F8 80241958 AFA20010 */ sw $v0, 0x10($sp) -/* DF07FC 8024195C 8E040080 */ lw $a0, 0x80($s0) -/* DF0800 80241960 0C0372DF */ jal func_800DCB7C -/* DF0804 80241964 27A70030 */ addiu $a3, $sp, 0x30 -.L80241968: -/* DF0808 80241968 10400007 */ beqz $v0, .L80241988 -/* DF080C 8024196C 00000000 */ nop -/* DF0810 80241970 4616A082 */ mul.s $f2, $f20, $f22 -/* DF0814 80241974 00000000 */ nop -/* DF0818 80241978 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* DF081C 8024197C 46180000 */ add.s $f0, $f0, $f24 -/* DF0820 80241980 08090665 */ j .L80241994 -/* DF0824 80241984 46020000 */ add.s $f0, $f0, $f2 -.L80241988: -/* DF0828 80241988 4616A002 */ mul.s $f0, $f20, $f22 -/* DF082C 8024198C 00000000 */ nop -/* DF0830 80241990 4600D000 */ add.s $f0, $f26, $f0 -.L80241994: -/* DF0834 80241994 E600003C */ swc1 $f0, 0x3c($s0) -/* DF0838 80241998 8E220074 */ lw $v0, 0x74($s1) -/* DF083C 8024199C 2442000A */ addiu $v0, $v0, 0xa -/* DF0840 802419A0 44826000 */ mtc1 $v0, $f12 -/* DF0844 802419A4 00000000 */ nop -/* DF0848 802419A8 0C00A6C9 */ jal clamp_angle -/* DF084C 802419AC 46806320 */ cvt.s.w $f12, $f12 -/* DF0850 802419B0 4600020D */ trunc.w.s $f8, $f0 -/* DF0854 802419B4 E6280074 */ swc1 $f8, 0x74($s1) -.L802419B8: -/* DF0858 802419B8 8E220090 */ lw $v0, 0x90($s1) -/* DF085C 802419BC 1C400040 */ bgtz $v0, .L80241AC0 -/* DF0860 802419C0 2442FFFF */ addiu $v0, $v0, -1 -/* DF0864 802419C4 860200A8 */ lh $v0, 0xa8($s0) -/* DF0868 802419C8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF086C 802419CC 44821000 */ mtc1 $v0, $f2 -/* DF0870 802419D0 00000000 */ nop -/* DF0874 802419D4 468010A0 */ cvt.s.w $f2, $f2 -/* DF0878 802419D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF087C 802419DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0880 802419E0 46020000 */ add.s $f0, $f0, $f2 -/* DF0884 802419E4 3C014024 */ lui $at, 0x4024 -/* DF0888 802419E8 44812800 */ mtc1 $at, $f5 -/* DF088C 802419EC 44802000 */ mtc1 $zero, $f4 -/* DF0890 802419F0 C442002C */ lwc1 $f2, 0x2c($v0) -/* DF0894 802419F4 46000021 */ cvt.d.s $f0, $f0 -/* DF0898 802419F8 46240000 */ add.d $f0, $f0, $f4 -/* DF089C 802419FC 460010A1 */ cvt.d.s $f2, $f2 -/* DF08A0 80241A00 4620103C */ c.lt.d $f2, $f0 -/* DF08A4 80241A04 00000000 */ nop -/* DF08A8 80241A08 4500002E */ bc1f .L80241AC4 -/* DF08AC 80241A0C 0280202D */ daddu $a0, $s4, $zero -/* DF08B0 80241A10 24020001 */ addiu $v0, $zero, 1 -/* DF08B4 80241A14 AFA20010 */ sw $v0, 0x10($sp) -/* DF08B8 80241A18 8E460024 */ lw $a2, 0x24($s2) -/* DF08BC 80241A1C 8E470028 */ lw $a3, 0x28($s2) -/* DF08C0 80241A20 0C01242D */ jal func_800490B4 -/* DF08C4 80241A24 0220282D */ daddu $a1, $s1, $zero -/* DF08C8 80241A28 10400026 */ beqz $v0, .L80241AC4 -/* DF08CC 80241A2C 0000202D */ daddu $a0, $zero, $zero -/* DF08D0 80241A30 0200282D */ daddu $a1, $s0, $zero -/* DF08D4 80241A34 0000302D */ daddu $a2, $zero, $zero -/* DF08D8 80241A38 2412000C */ addiu $s2, $zero, 0xc -/* DF08DC 80241A3C 860300A8 */ lh $v1, 0xa8($s0) -/* DF08E0 80241A40 3C013F80 */ lui $at, 0x3f80 -/* DF08E4 80241A44 44810000 */ mtc1 $at, $f0 -/* DF08E8 80241A48 3C014000 */ lui $at, 0x4000 -/* DF08EC 80241A4C 44811000 */ mtc1 $at, $f2 -/* DF08F0 80241A50 3C01C1A0 */ lui $at, 0xc1a0 -/* DF08F4 80241A54 44812000 */ mtc1 $at, $f4 -/* DF08F8 80241A58 44834000 */ mtc1 $v1, $f8 -/* DF08FC 80241A5C 00000000 */ nop -/* DF0900 80241A60 46804220 */ cvt.s.w $f8, $f8 -/* DF0904 80241A64 44074000 */ mfc1 $a3, $f8 -/* DF0908 80241A68 27A20038 */ addiu $v0, $sp, 0x38 -/* DF090C 80241A6C AFB2001C */ sw $s2, 0x1c($sp) -/* DF0910 80241A70 AFA20020 */ sw $v0, 0x20($sp) -/* DF0914 80241A74 E7A00010 */ swc1 $f0, 0x10($sp) -/* DF0918 80241A78 E7A20014 */ swc1 $f2, 0x14($sp) -/* DF091C 80241A7C 0C01BFA4 */ jal fx_emote -/* DF0920 80241A80 E7A40018 */ swc1 $f4, 0x18($sp) -/* DF0924 80241A84 0200202D */ daddu $a0, $s0, $zero -/* DF0928 80241A88 240502F4 */ addiu $a1, $zero, 0x2f4 -/* DF092C 80241A8C C480003C */ lwc1 $f0, 0x3c($a0) -/* DF0930 80241A90 3C060020 */ lui $a2, 0x20 -/* DF0934 80241A94 0C012530 */ jal func_800494C0 -/* DF0938 80241A98 E4800064 */ swc1 $f0, 0x64($a0) -/* DF093C 80241A9C 8E220018 */ lw $v0, 0x18($s1) -/* DF0940 80241AA0 9442002A */ lhu $v0, 0x2a($v0) -/* DF0944 80241AA4 30420001 */ andi $v0, $v0, 1 -/* DF0948 80241AA8 10400003 */ beqz $v0, .L80241AB8 -/* DF094C 80241AAC 2402000A */ addiu $v0, $zero, 0xa -/* DF0950 80241AB0 080906D8 */ j .L80241B60 -/* DF0954 80241AB4 AE620070 */ sw $v0, 0x70($s3) -.L80241AB8: -/* DF0958 80241AB8 080906D8 */ j .L80241B60 -/* DF095C 80241ABC AE720070 */ sw $s2, 0x70($s3) -.L80241AC0: -/* DF0960 80241AC0 AE220090 */ sw $v0, 0x90($s1) -.L80241AC4: -/* DF0964 80241AC4 8602008C */ lh $v0, 0x8c($s0) -/* DF0968 80241AC8 14400025 */ bnez $v0, .L80241B60 -/* DF096C 80241ACC 00000000 */ nop -/* DF0970 80241AD0 8602008E */ lh $v0, 0x8e($s0) -/* DF0974 80241AD4 1C400022 */ bgtz $v0, .L80241B60 -/* DF0978 80241AD8 00000000 */ nop -/* DF097C 80241ADC 8E620074 */ lw $v0, 0x74($s3) -/* DF0980 80241AE0 2442FFFF */ addiu $v0, $v0, -1 -/* DF0984 80241AE4 1840001D */ blez $v0, .L80241B5C -/* DF0988 80241AE8 AE620074 */ sw $v0, 0x74($s3) -/* DF098C 80241AEC 8E220018 */ lw $v0, 0x18($s1) -/* DF0990 80241AF0 9442002A */ lhu $v0, 0x2a($v0) -/* DF0994 80241AF4 30420010 */ andi $v0, $v0, 0x10 -/* DF0998 80241AF8 14400007 */ bnez $v0, .L80241B18 -/* DF099C 80241AFC 00000000 */ nop -/* DF09A0 80241B00 C600000C */ lwc1 $f0, 0xc($s0) -/* DF09A4 80241B04 3C014334 */ lui $at, 0x4334 -/* DF09A8 80241B08 44816000 */ mtc1 $at, $f12 -/* DF09AC 80241B0C 0C00A6C9 */ jal clamp_angle -/* DF09B0 80241B10 460C0300 */ add.s $f12, $f0, $f12 -/* DF09B4 80241B14 E600000C */ swc1 $f0, 0xc($s0) -.L80241B18: -/* DF09B8 80241B18 0C00A67F */ jal rand_int -/* DF09BC 80241B1C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* DF09C0 80241B20 3C032E8B */ lui $v1, 0x2e8b -/* DF09C4 80241B24 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* DF09C8 80241B28 00430018 */ mult $v0, $v1 -/* DF09CC 80241B2C 00021FC3 */ sra $v1, $v0, 0x1f -/* DF09D0 80241B30 00004010 */ mfhi $t0 -/* DF09D4 80241B34 00082043 */ sra $a0, $t0, 1 -/* DF09D8 80241B38 00832023 */ subu $a0, $a0, $v1 -/* DF09DC 80241B3C 00041840 */ sll $v1, $a0, 1 -/* DF09E0 80241B40 00641821 */ addu $v1, $v1, $a0 -/* DF09E4 80241B44 00031880 */ sll $v1, $v1, 2 -/* DF09E8 80241B48 00641823 */ subu $v1, $v1, $a0 -/* DF09EC 80241B4C 00431023 */ subu $v0, $v0, $v1 -/* DF09F0 80241B50 24420005 */ addiu $v0, $v0, 5 -/* DF09F4 80241B54 080906D8 */ j .L80241B60 -/* DF09F8 80241B58 A602008E */ sh $v0, 0x8e($s0) -.L80241B5C: -/* DF09FC 80241B5C AE600070 */ sw $zero, 0x70($s3) -.L80241B60: -/* DF0A00 80241B60 8FBF0054 */ lw $ra, 0x54($sp) -/* DF0A04 80241B64 8FB40050 */ lw $s4, 0x50($sp) -/* DF0A08 80241B68 8FB3004C */ lw $s3, 0x4c($sp) -/* DF0A0C 80241B6C 8FB20048 */ lw $s2, 0x48($sp) -/* DF0A10 80241B70 8FB10044 */ lw $s1, 0x44($sp) -/* DF0A14 80241B74 8FB00040 */ lw $s0, 0x40($sp) -/* DF0A18 80241B78 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* DF0A1C 80241B7C D7B80068 */ ldc1 $f24, 0x68($sp) -/* DF0A20 80241B80 D7B60060 */ ldc1 $f22, 0x60($sp) -/* DF0A24 80241B84 D7B40058 */ ldc1 $f20, 0x58($sp) -/* DF0A28 80241B88 03E00008 */ jr $ra -/* DF0A2C 80241B8C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s new file mode 100644 index 0000000000..9517ab865e --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024184C_DF06EC.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024184C_DF06EC +/* DF06EC 8024184C 27BDFF88 */ addiu $sp, $sp, -0x78 +/* DF06F0 80241850 AFB3004C */ sw $s3, 0x4c($sp) +/* DF06F4 80241854 0080982D */ daddu $s3, $a0, $zero +/* DF06F8 80241858 AFBF0054 */ sw $ra, 0x54($sp) +/* DF06FC 8024185C AFB40050 */ sw $s4, 0x50($sp) +/* DF0700 80241860 AFB20048 */ sw $s2, 0x48($sp) +/* DF0704 80241864 AFB10044 */ sw $s1, 0x44($sp) +/* DF0708 80241868 AFB00040 */ sw $s0, 0x40($sp) +/* DF070C 8024186C F7BA0070 */ sdc1 $f26, 0x70($sp) +/* DF0710 80241870 F7B80068 */ sdc1 $f24, 0x68($sp) +/* DF0714 80241874 F7B60060 */ sdc1 $f22, 0x60($sp) +/* DF0718 80241878 F7B40058 */ sdc1 $f20, 0x58($sp) +/* DF071C 8024187C 8E710148 */ lw $s1, 0x148($s3) +/* DF0720 80241880 00A0902D */ daddu $s2, $a1, $zero +/* DF0724 80241884 86240008 */ lh $a0, 8($s1) +/* DF0728 80241888 0C00EABB */ jal get_npc_unsafe +/* DF072C 8024188C 00C0A02D */ daddu $s4, $a2, $zero +/* DF0730 80241890 0040802D */ daddu $s0, $v0, $zero +/* DF0734 80241894 C6200078 */ lwc1 $f0, 0x78($s1) +/* DF0738 80241898 46800020 */ cvt.s.w $f0, $f0 +/* DF073C 8024189C 46000021 */ cvt.d.s $f0, $f0 +/* DF0740 802418A0 3C014059 */ lui $at, 0x4059 +/* DF0744 802418A4 44811800 */ mtc1 $at, $f3 +/* DF0748 802418A8 44801000 */ mtc1 $zero, $f2 +/* DF074C 802418AC 8602008E */ lh $v0, 0x8e($s0) +/* DF0750 802418B0 9603008E */ lhu $v1, 0x8e($s0) +/* DF0754 802418B4 46220003 */ div.d $f0, $f0, $f2 +/* DF0758 802418B8 46200620 */ cvt.s.d $f24, $f0 +/* DF075C 802418BC C6200088 */ lwc1 $f0, 0x88($s1) +/* DF0760 802418C0 46800020 */ cvt.s.w $f0, $f0 +/* DF0764 802418C4 46000021 */ cvt.d.s $f0, $f0 +/* DF0768 802418C8 46220003 */ div.d $f0, $f0, $f2 +/* DF076C 802418CC 46200020 */ cvt.s.d $f0, $f0 +/* DF0770 802418D0 18400003 */ blez $v0, .L802418E0 +/* DF0774 802418D4 4600C680 */ add.s $f26, $f24, $f0 +/* DF0778 802418D8 2462FFFF */ addiu $v0, $v1, -1 +/* DF077C 802418DC A602008E */ sh $v0, 0x8e($s0) +.L802418E0: +/* DF0780 802418E0 8E220070 */ lw $v0, 0x70($s1) +/* DF0784 802418E4 18400034 */ blez $v0, .L802419B8 +/* DF0788 802418E8 00000000 */ nop +/* DF078C 802418EC C62C0074 */ lwc1 $f12, 0x74($s1) +/* DF0790 802418F0 46806320 */ cvt.s.w $f12, $f12 +/* DF0794 802418F4 44820000 */ mtc1 $v0, $f0 +/* DF0798 802418F8 00000000 */ nop +/* DF079C 802418FC 46800020 */ cvt.s.w $f0, $f0 +/* DF07A0 80241900 46000021 */ cvt.d.s $f0, $f0 +/* DF07A4 80241904 46220003 */ div.d $f0, $f0, $f2 +/* DF07A8 80241908 0C00A8BB */ jal sin_deg +/* DF07AC 8024190C 462005A0 */ cvt.s.d $f22, $f0 +/* DF07B0 80241910 8E020000 */ lw $v0, ($s0) +/* DF07B4 80241914 30420008 */ andi $v0, $v0, 8 +/* DF07B8 80241918 10400003 */ beqz $v0, .L80241928 +/* DF07BC 8024191C 46000506 */ mov.s $f20, $f0 +/* DF07C0 80241920 0809065A */ j .L80241968 +/* DF07C4 80241924 0000102D */ daddu $v0, $zero, $zero +.L80241928: +/* DF07C8 80241928 27A50028 */ addiu $a1, $sp, 0x28 +/* DF07CC 8024192C 27A6002C */ addiu $a2, $sp, 0x2c +/* DF07D0 80241930 C6000038 */ lwc1 $f0, 0x38($s0) +/* DF07D4 80241934 C602003C */ lwc1 $f2, 0x3c($s0) +/* DF07D8 80241938 C6040040 */ lwc1 $f4, 0x40($s0) +/* DF07DC 8024193C 3C01447A */ lui $at, 0x447a +/* DF07E0 80241940 44813000 */ mtc1 $at, $f6 +/* DF07E4 80241944 27A20034 */ addiu $v0, $sp, 0x34 +/* DF07E8 80241948 E7A00028 */ swc1 $f0, 0x28($sp) +/* DF07EC 8024194C E7A2002C */ swc1 $f2, 0x2c($sp) +/* DF07F0 80241950 E7A40030 */ swc1 $f4, 0x30($sp) +/* DF07F4 80241954 E7A60034 */ swc1 $f6, 0x34($sp) +/* DF07F8 80241958 AFA20010 */ sw $v0, 0x10($sp) +/* DF07FC 8024195C 8E040080 */ lw $a0, 0x80($s0) +/* DF0800 80241960 0C0372DF */ jal func_800DCB7C +/* DF0804 80241964 27A70030 */ addiu $a3, $sp, 0x30 +.L80241968: +/* DF0808 80241968 10400007 */ beqz $v0, .L80241988 +/* DF080C 8024196C 00000000 */ nop +/* DF0810 80241970 4616A082 */ mul.s $f2, $f20, $f22 +/* DF0814 80241974 00000000 */ nop +/* DF0818 80241978 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* DF081C 8024197C 46180000 */ add.s $f0, $f0, $f24 +/* DF0820 80241980 08090665 */ j .L80241994 +/* DF0824 80241984 46020000 */ add.s $f0, $f0, $f2 +.L80241988: +/* DF0828 80241988 4616A002 */ mul.s $f0, $f20, $f22 +/* DF082C 8024198C 00000000 */ nop +/* DF0830 80241990 4600D000 */ add.s $f0, $f26, $f0 +.L80241994: +/* DF0834 80241994 E600003C */ swc1 $f0, 0x3c($s0) +/* DF0838 80241998 8E220074 */ lw $v0, 0x74($s1) +/* DF083C 8024199C 2442000A */ addiu $v0, $v0, 0xa +/* DF0840 802419A0 44826000 */ mtc1 $v0, $f12 +/* DF0844 802419A4 00000000 */ nop +/* DF0848 802419A8 0C00A6C9 */ jal clamp_angle +/* DF084C 802419AC 46806320 */ cvt.s.w $f12, $f12 +/* DF0850 802419B0 4600020D */ trunc.w.s $f8, $f0 +/* DF0854 802419B4 E6280074 */ swc1 $f8, 0x74($s1) +.L802419B8: +/* DF0858 802419B8 8E220090 */ lw $v0, 0x90($s1) +/* DF085C 802419BC 1C400040 */ bgtz $v0, .L80241AC0 +/* DF0860 802419C0 2442FFFF */ addiu $v0, $v0, -1 +/* DF0864 802419C4 860200A8 */ lh $v0, 0xa8($s0) +/* DF0868 802419C8 C600003C */ lwc1 $f0, 0x3c($s0) +/* DF086C 802419CC 44821000 */ mtc1 $v0, $f2 +/* DF0870 802419D0 00000000 */ nop +/* DF0874 802419D4 468010A0 */ cvt.s.w $f2, $f2 +/* DF0878 802419D8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DF087C 802419DC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DF0880 802419E0 46020000 */ add.s $f0, $f0, $f2 +/* DF0884 802419E4 3C014024 */ lui $at, 0x4024 +/* DF0888 802419E8 44812800 */ mtc1 $at, $f5 +/* DF088C 802419EC 44802000 */ mtc1 $zero, $f4 +/* DF0890 802419F0 C442002C */ lwc1 $f2, 0x2c($v0) +/* DF0894 802419F4 46000021 */ cvt.d.s $f0, $f0 +/* DF0898 802419F8 46240000 */ add.d $f0, $f0, $f4 +/* DF089C 802419FC 460010A1 */ cvt.d.s $f2, $f2 +/* DF08A0 80241A00 4620103C */ c.lt.d $f2, $f0 +/* DF08A4 80241A04 00000000 */ nop +/* DF08A8 80241A08 4500002E */ bc1f .L80241AC4 +/* DF08AC 80241A0C 0280202D */ daddu $a0, $s4, $zero +/* DF08B0 80241A10 24020001 */ addiu $v0, $zero, 1 +/* DF08B4 80241A14 AFA20010 */ sw $v0, 0x10($sp) +/* DF08B8 80241A18 8E460024 */ lw $a2, 0x24($s2) +/* DF08BC 80241A1C 8E470028 */ lw $a3, 0x28($s2) +/* DF08C0 80241A20 0C01242D */ jal func_800490B4 +/* DF08C4 80241A24 0220282D */ daddu $a1, $s1, $zero +/* DF08C8 80241A28 10400026 */ beqz $v0, .L80241AC4 +/* DF08CC 80241A2C 0000202D */ daddu $a0, $zero, $zero +/* DF08D0 80241A30 0200282D */ daddu $a1, $s0, $zero +/* DF08D4 80241A34 0000302D */ daddu $a2, $zero, $zero +/* DF08D8 80241A38 2412000C */ addiu $s2, $zero, 0xc +/* DF08DC 80241A3C 860300A8 */ lh $v1, 0xa8($s0) +/* DF08E0 80241A40 3C013F80 */ lui $at, 0x3f80 +/* DF08E4 80241A44 44810000 */ mtc1 $at, $f0 +/* DF08E8 80241A48 3C014000 */ lui $at, 0x4000 +/* DF08EC 80241A4C 44811000 */ mtc1 $at, $f2 +/* DF08F0 80241A50 3C01C1A0 */ lui $at, 0xc1a0 +/* DF08F4 80241A54 44812000 */ mtc1 $at, $f4 +/* DF08F8 80241A58 44834000 */ mtc1 $v1, $f8 +/* DF08FC 80241A5C 00000000 */ nop +/* DF0900 80241A60 46804220 */ cvt.s.w $f8, $f8 +/* DF0904 80241A64 44074000 */ mfc1 $a3, $f8 +/* DF0908 80241A68 27A20038 */ addiu $v0, $sp, 0x38 +/* DF090C 80241A6C AFB2001C */ sw $s2, 0x1c($sp) +/* DF0910 80241A70 AFA20020 */ sw $v0, 0x20($sp) +/* DF0914 80241A74 E7A00010 */ swc1 $f0, 0x10($sp) +/* DF0918 80241A78 E7A20014 */ swc1 $f2, 0x14($sp) +/* DF091C 80241A7C 0C01BFA4 */ jal fx_emote +/* DF0920 80241A80 E7A40018 */ swc1 $f4, 0x18($sp) +/* DF0924 80241A84 0200202D */ daddu $a0, $s0, $zero +/* DF0928 80241A88 240502F4 */ addiu $a1, $zero, 0x2f4 +/* DF092C 80241A8C C480003C */ lwc1 $f0, 0x3c($a0) +/* DF0930 80241A90 3C060020 */ lui $a2, 0x20 +/* DF0934 80241A94 0C012530 */ jal func_800494C0 +/* DF0938 80241A98 E4800064 */ swc1 $f0, 0x64($a0) +/* DF093C 80241A9C 8E220018 */ lw $v0, 0x18($s1) +/* DF0940 80241AA0 9442002A */ lhu $v0, 0x2a($v0) +/* DF0944 80241AA4 30420001 */ andi $v0, $v0, 1 +/* DF0948 80241AA8 10400003 */ beqz $v0, .L80241AB8 +/* DF094C 80241AAC 2402000A */ addiu $v0, $zero, 0xa +/* DF0950 80241AB0 080906D8 */ j .L80241B60 +/* DF0954 80241AB4 AE620070 */ sw $v0, 0x70($s3) +.L80241AB8: +/* DF0958 80241AB8 080906D8 */ j .L80241B60 +/* DF095C 80241ABC AE720070 */ sw $s2, 0x70($s3) +.L80241AC0: +/* DF0960 80241AC0 AE220090 */ sw $v0, 0x90($s1) +.L80241AC4: +/* DF0964 80241AC4 8602008C */ lh $v0, 0x8c($s0) +/* DF0968 80241AC8 14400025 */ bnez $v0, .L80241B60 +/* DF096C 80241ACC 00000000 */ nop +/* DF0970 80241AD0 8602008E */ lh $v0, 0x8e($s0) +/* DF0974 80241AD4 1C400022 */ bgtz $v0, .L80241B60 +/* DF0978 80241AD8 00000000 */ nop +/* DF097C 80241ADC 8E620074 */ lw $v0, 0x74($s3) +/* DF0980 80241AE0 2442FFFF */ addiu $v0, $v0, -1 +/* DF0984 80241AE4 1840001D */ blez $v0, .L80241B5C +/* DF0988 80241AE8 AE620074 */ sw $v0, 0x74($s3) +/* DF098C 80241AEC 8E220018 */ lw $v0, 0x18($s1) +/* DF0990 80241AF0 9442002A */ lhu $v0, 0x2a($v0) +/* DF0994 80241AF4 30420010 */ andi $v0, $v0, 0x10 +/* DF0998 80241AF8 14400007 */ bnez $v0, .L80241B18 +/* DF099C 80241AFC 00000000 */ nop +/* DF09A0 80241B00 C600000C */ lwc1 $f0, 0xc($s0) +/* DF09A4 80241B04 3C014334 */ lui $at, 0x4334 +/* DF09A8 80241B08 44816000 */ mtc1 $at, $f12 +/* DF09AC 80241B0C 0C00A6C9 */ jal clamp_angle +/* DF09B0 80241B10 460C0300 */ add.s $f12, $f0, $f12 +/* DF09B4 80241B14 E600000C */ swc1 $f0, 0xc($s0) +.L80241B18: +/* DF09B8 80241B18 0C00A67F */ jal rand_int +/* DF09BC 80241B1C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* DF09C0 80241B20 3C032E8B */ lui $v1, 0x2e8b +/* DF09C4 80241B24 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* DF09C8 80241B28 00430018 */ mult $v0, $v1 +/* DF09CC 80241B2C 00021FC3 */ sra $v1, $v0, 0x1f +/* DF09D0 80241B30 00004010 */ mfhi $t0 +/* DF09D4 80241B34 00082043 */ sra $a0, $t0, 1 +/* DF09D8 80241B38 00832023 */ subu $a0, $a0, $v1 +/* DF09DC 80241B3C 00041840 */ sll $v1, $a0, 1 +/* DF09E0 80241B40 00641821 */ addu $v1, $v1, $a0 +/* DF09E4 80241B44 00031880 */ sll $v1, $v1, 2 +/* DF09E8 80241B48 00641823 */ subu $v1, $v1, $a0 +/* DF09EC 80241B4C 00431023 */ subu $v0, $v0, $v1 +/* DF09F0 80241B50 24420005 */ addiu $v0, $v0, 5 +/* DF09F4 80241B54 080906D8 */ j .L80241B60 +/* DF09F8 80241B58 A602008E */ sh $v0, 0x8e($s0) +.L80241B5C: +/* DF09FC 80241B5C AE600070 */ sw $zero, 0x70($s3) +.L80241B60: +/* DF0A00 80241B60 8FBF0054 */ lw $ra, 0x54($sp) +/* DF0A04 80241B64 8FB40050 */ lw $s4, 0x50($sp) +/* DF0A08 80241B68 8FB3004C */ lw $s3, 0x4c($sp) +/* DF0A0C 80241B6C 8FB20048 */ lw $s2, 0x48($sp) +/* DF0A10 80241B70 8FB10044 */ lw $s1, 0x44($sp) +/* DF0A14 80241B74 8FB00040 */ lw $s0, 0x40($sp) +/* DF0A18 80241B78 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* DF0A1C 80241B7C D7B80068 */ ldc1 $f24, 0x68($sp) +/* DF0A20 80241B80 D7B60060 */ ldc1 $f22, 0x60($sp) +/* DF0A24 80241B84 D7B40058 */ ldc1 $f20, 0x58($sp) +/* DF0A28 80241B88 03E00008 */ jr $ra +/* DF0A2C 80241B8C 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08.s deleted file mode 100644 index 7e4aefadb4..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C08 -/* DF0AA8 80241C08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF0AAC 80241C0C AFB00010 */ sw $s0, 0x10($sp) -/* DF0AB0 80241C10 0080802D */ daddu $s0, $a0, $zero -/* DF0AB4 80241C14 AFBF0014 */ sw $ra, 0x14($sp) -/* DF0AB8 80241C18 8E020148 */ lw $v0, 0x148($s0) -/* DF0ABC 80241C1C 0C00EABB */ jal get_npc_unsafe -/* DF0AC0 80241C20 84440008 */ lh $a0, 8($v0) -/* DF0AC4 80241C24 9443008E */ lhu $v1, 0x8e($v0) -/* DF0AC8 80241C28 C440003C */ lwc1 $f0, 0x3c($v0) -/* DF0ACC 80241C2C 24640001 */ addiu $a0, $v1, 1 -/* DF0AD0 80241C30 00031C00 */ sll $v1, $v1, 0x10 -/* DF0AD4 80241C34 00031B83 */ sra $v1, $v1, 0xe -/* DF0AD8 80241C38 A444008E */ sh $a0, 0x8e($v0) -/* DF0ADC 80241C3C 3C018024 */ lui $at, 0x8024 -/* DF0AE0 80241C40 00230821 */ addu $at, $at, $v1 -/* DF0AE4 80241C44 C4226184 */ lwc1 $f2, 0x6184($at) -/* DF0AE8 80241C48 8443008E */ lh $v1, 0x8e($v0) -/* DF0AEC 80241C4C 46020000 */ add.s $f0, $f0, $f2 -/* DF0AF0 80241C50 28630005 */ slti $v1, $v1, 5 -/* DF0AF4 80241C54 14600003 */ bnez $v1, .L80241C64 -/* DF0AF8 80241C58 E440003C */ swc1 $f0, 0x3c($v0) -/* DF0AFC 80241C5C 2402000C */ addiu $v0, $zero, 0xc -/* DF0B00 80241C60 AE020070 */ sw $v0, 0x70($s0) -.L80241C64: -/* DF0B04 80241C64 8FBF0014 */ lw $ra, 0x14($sp) -/* DF0B08 80241C68 8FB00010 */ lw $s0, 0x10($sp) -/* DF0B0C 80241C6C 03E00008 */ jr $ra -/* DF0B10 80241C70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s new file mode 100644 index 0000000000..47254dd2e1 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241C08_DF0AA8.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C08_DF0AA8 +/* DF0AA8 80241C08 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DF0AAC 80241C0C AFB00010 */ sw $s0, 0x10($sp) +/* DF0AB0 80241C10 0080802D */ daddu $s0, $a0, $zero +/* DF0AB4 80241C14 AFBF0014 */ sw $ra, 0x14($sp) +/* DF0AB8 80241C18 8E020148 */ lw $v0, 0x148($s0) +/* DF0ABC 80241C1C 0C00EABB */ jal get_npc_unsafe +/* DF0AC0 80241C20 84440008 */ lh $a0, 8($v0) +/* DF0AC4 80241C24 9443008E */ lhu $v1, 0x8e($v0) +/* DF0AC8 80241C28 C440003C */ lwc1 $f0, 0x3c($v0) +/* DF0ACC 80241C2C 24640001 */ addiu $a0, $v1, 1 +/* DF0AD0 80241C30 00031C00 */ sll $v1, $v1, 0x10 +/* DF0AD4 80241C34 00031B83 */ sra $v1, $v1, 0xe +/* DF0AD8 80241C38 A444008E */ sh $a0, 0x8e($v0) +/* DF0ADC 80241C3C 3C018024 */ lui $at, 0x8024 +/* DF0AE0 80241C40 00230821 */ addu $at, $at, $v1 +/* DF0AE4 80241C44 C4226184 */ lwc1 $f2, 0x6184($at) +/* DF0AE8 80241C48 8443008E */ lh $v1, 0x8e($v0) +/* DF0AEC 80241C4C 46020000 */ add.s $f0, $f0, $f2 +/* DF0AF0 80241C50 28630005 */ slti $v1, $v1, 5 +/* DF0AF4 80241C54 14600003 */ bnez $v1, .L80241C64 +/* DF0AF8 80241C58 E440003C */ swc1 $f0, 0x3c($v0) +/* DF0AFC 80241C5C 2402000C */ addiu $v0, $zero, 0xc +/* DF0B00 80241C60 AE020070 */ sw $v0, 0x70($s0) +.L80241C64: +/* DF0B04 80241C64 8FBF0014 */ lw $ra, 0x14($sp) +/* DF0B08 80241C68 8FB00010 */ lw $s0, 0x10($sp) +/* DF0B0C 80241C6C 03E00008 */ jr $ra +/* DF0B10 80241C70 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C.s deleted file mode 100644 index d42c26422b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E0C -/* DF0CAC 80241E0C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DF0CB0 80241E10 AFB20030 */ sw $s2, 0x30($sp) -/* DF0CB4 80241E14 0080902D */ daddu $s2, $a0, $zero -/* DF0CB8 80241E18 AFBF0038 */ sw $ra, 0x38($sp) -/* DF0CBC 80241E1C AFB30034 */ sw $s3, 0x34($sp) -/* DF0CC0 80241E20 AFB1002C */ sw $s1, 0x2c($sp) -/* DF0CC4 80241E24 AFB00028 */ sw $s0, 0x28($sp) -/* DF0CC8 80241E28 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DF0CCC 80241E2C F7B40040 */ sdc1 $f20, 0x40($sp) -/* DF0CD0 80241E30 8E510148 */ lw $s1, 0x148($s2) -/* DF0CD4 80241E34 86240008 */ lh $a0, 8($s1) -/* DF0CD8 80241E38 0C00EABB */ jal get_npc_unsafe -/* DF0CDC 80241E3C 00A0982D */ daddu $s3, $a1, $zero -/* DF0CE0 80241E40 0040802D */ daddu $s0, $v0, $zero -/* DF0CE4 80241E44 0200202D */ daddu $a0, $s0, $zero -/* DF0CE8 80241E48 C6220088 */ lwc1 $f2, 0x88($s1) -/* DF0CEC 80241E4C 468010A0 */ cvt.s.w $f2, $f2 -/* DF0CF0 80241E50 460010A1 */ cvt.d.s $f2, $f2 -/* DF0CF4 80241E54 C604001C */ lwc1 $f4, 0x1c($s0) -/* DF0CF8 80241E58 C6000014 */ lwc1 $f0, 0x14($s0) -/* DF0CFC 80241E5C 8E050018 */ lw $a1, 0x18($s0) -/* DF0D00 80241E60 46002100 */ add.s $f4, $f4, $f0 -/* DF0D04 80241E64 8E06000C */ lw $a2, 0xc($s0) -/* DF0D08 80241E68 C6200078 */ lwc1 $f0, 0x78($s1) -/* DF0D0C 80241E6C 46800020 */ cvt.s.w $f0, $f0 -/* DF0D10 80241E70 E604001C */ swc1 $f4, 0x1c($s0) -/* DF0D14 80241E74 3C014059 */ lui $at, 0x4059 -/* DF0D18 80241E78 44812800 */ mtc1 $at, $f5 -/* DF0D1C 80241E7C 44802000 */ mtc1 $zero, $f4 -/* DF0D20 80241E80 46000021 */ cvt.d.s $f0, $f0 -/* DF0D24 80241E84 46240003 */ div.d $f0, $f0, $f4 -/* DF0D28 80241E88 46200520 */ cvt.s.d $f20, $f0 -/* DF0D2C 80241E8C 46241083 */ div.d $f2, $f2, $f4 -/* DF0D30 80241E90 0C00EA95 */ jal npc_move_heading -/* DF0D34 80241E94 462015A0 */ cvt.s.d $f22, $f2 -/* DF0D38 80241E98 C604001C */ lwc1 $f4, 0x1c($s0) -/* DF0D3C 80241E9C 44801000 */ mtc1 $zero, $f2 -/* DF0D40 80241EA0 44801800 */ mtc1 $zero, $f3 -/* DF0D44 80241EA4 46002021 */ cvt.d.s $f0, $f4 -/* DF0D48 80241EA8 4620103E */ c.le.d $f2, $f0 -/* DF0D4C 80241EAC 00000000 */ nop -/* DF0D50 80241EB0 45000030 */ bc1f .L80241F74 -/* DF0D54 80241EB4 00000000 */ nop -/* DF0D58 80241EB8 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0D5C 80241EBC 46040000 */ add.s $f0, $f0, $f4 -/* DF0D60 80241EC0 E600003C */ swc1 $f0, 0x3c($s0) -/* DF0D64 80241EC4 8E2200CC */ lw $v0, 0xcc($s1) -/* DF0D68 80241EC8 8C420024 */ lw $v0, 0x24($v0) -/* DF0D6C 80241ECC AE020028 */ sw $v0, 0x28($s0) -/* DF0D70 80241ED0 A2200007 */ sb $zero, 7($s1) -/* DF0D74 80241ED4 8E020000 */ lw $v0, ($s0) -/* DF0D78 80241ED8 30420008 */ andi $v0, $v0, 8 -/* DF0D7C 80241EDC 14400011 */ bnez $v0, .L80241F24 -/* DF0D80 80241EE0 0000102D */ daddu $v0, $zero, $zero -/* DF0D84 80241EE4 27A50018 */ addiu $a1, $sp, 0x18 -/* DF0D88 80241EE8 27A6001C */ addiu $a2, $sp, 0x1c -/* DF0D8C 80241EEC C6000038 */ lwc1 $f0, 0x38($s0) -/* DF0D90 80241EF0 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0D94 80241EF4 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF0D98 80241EF8 3C01447A */ lui $at, 0x447a -/* DF0D9C 80241EFC 44813000 */ mtc1 $at, $f6 -/* DF0DA0 80241F00 27A20024 */ addiu $v0, $sp, 0x24 -/* DF0DA4 80241F04 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF0DA8 80241F08 E7A2001C */ swc1 $f2, 0x1c($sp) -/* DF0DAC 80241F0C E7A40020 */ swc1 $f4, 0x20($sp) -/* DF0DB0 80241F10 E7A60024 */ swc1 $f6, 0x24($sp) -/* DF0DB4 80241F14 AFA20010 */ sw $v0, 0x10($sp) -/* DF0DB8 80241F18 8E040080 */ lw $a0, 0x80($s0) -/* DF0DBC 80241F1C 0C0372DF */ jal func_800DCB7C -/* DF0DC0 80241F20 27A70020 */ addiu $a3, $sp, 0x20 -.L80241F24: -/* DF0DC4 80241F24 1040000B */ beqz $v0, .L80241F54 -/* DF0DC8 80241F28 00000000 */ nop -/* DF0DCC 80241F2C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DF0DD0 80241F30 46140080 */ add.s $f2, $f0, $f20 -/* DF0DD4 80241F34 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0DD8 80241F38 4600103E */ c.le.s $f2, $f0 -/* DF0DDC 80241F3C 00000000 */ nop -/* DF0DE0 80241F40 4500008D */ bc1f .L80242178 -/* DF0DE4 80241F44 00000000 */ nop -/* DF0DE8 80241F48 E602003C */ swc1 $f2, 0x3c($s0) -/* DF0DEC 80241F4C 0809085E */ j .L80242178 -/* DF0DF0 80241F50 AE400070 */ sw $zero, 0x70($s2) -.L80241F54: -/* DF0DF4 80241F54 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0DF8 80241F58 C6000064 */ lwc1 $f0, 0x64($s0) -/* DF0DFC 80241F5C 4602003E */ c.le.s $f0, $f2 -/* DF0E00 80241F60 00000000 */ nop -/* DF0E04 80241F64 45030084 */ bc1tl .L80242178 -/* DF0E08 80241F68 AE400070 */ sw $zero, 0x70($s2) -/* DF0E0C 80241F6C 0809085E */ j .L80242178 -/* DF0E10 80241F70 00000000 */ nop -.L80241F74: -/* DF0E14 80241F74 4622003C */ c.lt.d $f0, $f2 -/* DF0E18 80241F78 00000000 */ nop -/* DF0E1C 80241F7C 4500007E */ bc1f .L80242178 -/* DF0E20 80241F80 00000000 */ nop -/* DF0E24 80241F84 9602008E */ lhu $v0, 0x8e($s0) -/* DF0E28 80241F88 24420001 */ addiu $v0, $v0, 1 -/* DF0E2C 80241F8C A602008E */ sh $v0, 0x8e($s0) -/* DF0E30 80241F90 00021400 */ sll $v0, $v0, 0x10 -/* DF0E34 80241F94 8E630020 */ lw $v1, 0x20($s3) -/* DF0E38 80241F98 00021403 */ sra $v0, $v0, 0x10 -/* DF0E3C 80241F9C 0043102A */ slt $v0, $v0, $v1 -/* DF0E40 80241FA0 14400026 */ bnez $v0, .L8024203C -/* DF0E44 80241FA4 00000000 */ nop -/* DF0E48 80241FA8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DF0E4C 80241FAC C60E0040 */ lwc1 $f14, 0x40($s0) -/* DF0E50 80241FB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF0E54 80241FB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF0E58 80241FB8 A600008E */ sh $zero, 0x8e($s0) -/* DF0E5C 80241FBC 8C460028 */ lw $a2, 0x28($v0) -/* DF0E60 80241FC0 0C00A720 */ jal atan2 -/* DF0E64 80241FC4 8C470030 */ lw $a3, 0x30($v0) -/* DF0E68 80241FC8 46000506 */ mov.s $f20, $f0 -/* DF0E6C 80241FCC C60C000C */ lwc1 $f12, 0xc($s0) -/* DF0E70 80241FD0 0C00A70A */ jal get_clamped_angle_diff -/* DF0E74 80241FD4 4600A386 */ mov.s $f14, $f20 -/* DF0E78 80241FD8 46000086 */ mov.s $f2, $f0 -/* DF0E7C 80241FDC 8E62001C */ lw $v0, 0x1c($s3) -/* DF0E80 80241FE0 46001005 */ abs.s $f0, $f2 -/* DF0E84 80241FE4 44822000 */ mtc1 $v0, $f4 -/* DF0E88 80241FE8 00000000 */ nop -/* DF0E8C 80241FEC 46802120 */ cvt.s.w $f4, $f4 -/* DF0E90 80241FF0 4600203C */ c.lt.s $f4, $f0 -/* DF0E94 80241FF4 00000000 */ nop -/* DF0E98 80241FF8 4500000D */ bc1f .L80242030 -/* DF0E9C 80241FFC 00000000 */ nop -/* DF0EA0 80242000 44800000 */ mtc1 $zero, $f0 -/* DF0EA4 80242004 C614000C */ lwc1 $f20, 0xc($s0) -/* DF0EA8 80242008 4600103C */ c.lt.s $f2, $f0 -/* DF0EAC 8024200C 00000000 */ nop -/* DF0EB0 80242010 45000006 */ bc1f .L8024202C -/* DF0EB4 80242014 00021023 */ negu $v0, $v0 -/* DF0EB8 80242018 44820000 */ mtc1 $v0, $f0 -/* DF0EBC 8024201C 00000000 */ nop -/* DF0EC0 80242020 46800020 */ cvt.s.w $f0, $f0 -/* DF0EC4 80242024 0809080C */ j .L80242030 -/* DF0EC8 80242028 4600A500 */ add.s $f20, $f20, $f0 -.L8024202C: -/* DF0ECC 8024202C 4604A500 */ add.s $f20, $f20, $f4 -.L80242030: -/* DF0ED0 80242030 0C00A6C9 */ jal clamp_angle -/* DF0ED4 80242034 4600A306 */ mov.s $f12, $f20 -/* DF0ED8 80242038 E600000C */ swc1 $f0, 0xc($s0) -.L8024203C: -/* DF0EDC 8024203C 8E020000 */ lw $v0, ($s0) -/* DF0EE0 80242040 30420008 */ andi $v0, $v0, 8 -/* DF0EE4 80242044 1040000A */ beqz $v0, .L80242070 -/* DF0EE8 80242048 27A50018 */ addiu $a1, $sp, 0x18 -/* DF0EEC 8024204C C602003C */ lwc1 $f2, 0x3c($s0) -/* DF0EF0 80242050 C600001C */ lwc1 $f0, 0x1c($s0) -/* DF0EF4 80242054 46001080 */ add.s $f2, $f2, $f0 -/* DF0EF8 80242058 4616103C */ c.lt.s $f2, $f22 -/* DF0EFC 8024205C 00000000 */ nop -/* DF0F00 80242060 45020045 */ bc1fl .L80242178 -/* DF0F04 80242064 E602003C */ swc1 $f2, 0x3c($s0) -/* DF0F08 80242068 0809085D */ j .L80242174 -/* DF0F0C 8024206C E616003C */ swc1 $f22, 0x3c($s0) -.L80242070: -/* DF0F10 80242070 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF0F14 80242074 27A6001C */ addiu $a2, $sp, 0x1c -/* DF0F18 80242078 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF0F1C 8024207C 860200A8 */ lh $v0, 0xa8($s0) -/* DF0F20 80242080 C600001C */ lwc1 $f0, 0x1c($s0) -/* DF0F24 80242084 C604003C */ lwc1 $f4, 0x3c($s0) -/* DF0F28 80242088 44821000 */ mtc1 $v0, $f2 -/* DF0F2C 8024208C 00000000 */ nop -/* DF0F30 80242090 468010A0 */ cvt.s.w $f2, $f2 -/* DF0F34 80242094 46000005 */ abs.s $f0, $f0 -/* DF0F38 80242098 46020000 */ add.s $f0, $f0, $f2 -/* DF0F3C 8024209C C6060040 */ lwc1 $f6, 0x40($s0) -/* DF0F40 802420A0 27A20024 */ addiu $v0, $sp, 0x24 -/* DF0F44 802420A4 46022100 */ add.s $f4, $f4, $f2 -/* DF0F48 802420A8 3C014024 */ lui $at, 0x4024 -/* DF0F4C 802420AC 44811800 */ mtc1 $at, $f3 -/* DF0F50 802420B0 44801000 */ mtc1 $zero, $f2 -/* DF0F54 802420B4 46000021 */ cvt.d.s $f0, $f0 -/* DF0F58 802420B8 46220000 */ add.d $f0, $f0, $f2 -/* DF0F5C 802420BC E7A60020 */ swc1 $f6, 0x20($sp) -/* DF0F60 802420C0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* DF0F64 802420C4 46200020 */ cvt.s.d $f0, $f0 -/* DF0F68 802420C8 E7A00024 */ swc1 $f0, 0x24($sp) -/* DF0F6C 802420CC AFA20010 */ sw $v0, 0x10($sp) -/* DF0F70 802420D0 8E040080 */ lw $a0, 0x80($s0) -/* DF0F74 802420D4 0C0372DF */ jal func_800DCB7C -/* DF0F78 802420D8 27A70020 */ addiu $a3, $sp, 0x20 -/* DF0F7C 802420DC 10400015 */ beqz $v0, .L80242134 -/* DF0F80 802420E0 00000000 */ nop -/* DF0F84 802420E4 860200A8 */ lh $v0, 0xa8($s0) -/* DF0F88 802420E8 C604001C */ lwc1 $f4, 0x1c($s0) -/* DF0F8C 802420EC 44820000 */ mtc1 $v0, $f0 -/* DF0F90 802420F0 00000000 */ nop -/* DF0F94 802420F4 46800020 */ cvt.s.w $f0, $f0 -/* DF0F98 802420F8 46002085 */ abs.s $f2, $f4 -/* DF0F9C 802420FC 46020000 */ add.s $f0, $f0, $f2 -/* DF0FA0 80242100 C7A20024 */ lwc1 $f2, 0x24($sp) -/* DF0FA4 80242104 4600103E */ c.le.s $f2, $f0 -/* DF0FA8 80242108 00000000 */ nop -/* DF0FAC 8024210C 45000005 */ bc1f .L80242124 -/* DF0FB0 80242110 00000000 */ nop -/* DF0FB4 80242114 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* DF0FB8 80242118 AE00001C */ sw $zero, 0x1c($s0) -/* DF0FBC 8024211C 0809085E */ j .L80242178 -/* DF0FC0 80242120 E600003C */ swc1 $f0, 0x3c($s0) -.L80242124: -/* DF0FC4 80242124 C600003C */ lwc1 $f0, 0x3c($s0) -/* DF0FC8 80242128 46040000 */ add.s $f0, $f0, $f4 -/* DF0FCC 8024212C 0809085E */ j .L80242178 -/* DF0FD0 80242130 E600003C */ swc1 $f0, 0x3c($s0) -.L80242134: -/* DF0FD4 80242134 C606003C */ lwc1 $f6, 0x3c($s0) -/* DF0FD8 80242138 860200A8 */ lh $v0, 0xa8($s0) -/* DF0FDC 8024213C 46163081 */ sub.s $f2, $f6, $f22 -/* DF0FE0 80242140 44820000 */ mtc1 $v0, $f0 -/* DF0FE4 80242144 00000000 */ nop -/* DF0FE8 80242148 46800020 */ cvt.s.w $f0, $f0 -/* DF0FEC 8024214C 46001080 */ add.s $f2, $f2, $f0 -/* DF0FF0 80242150 C604001C */ lwc1 $f4, 0x1c($s0) -/* DF0FF4 80242154 46002005 */ abs.s $f0, $f4 -/* DF0FF8 80242158 4602003C */ c.lt.s $f0, $f2 -/* DF0FFC 8024215C 00000000 */ nop -/* DF1000 80242160 45020005 */ bc1fl .L80242178 -/* DF1004 80242164 AE00001C */ sw $zero, 0x1c($s0) -/* DF1008 80242168 46043000 */ add.s $f0, $f6, $f4 -/* DF100C 8024216C 0809085E */ j .L80242178 -/* DF1010 80242170 E600003C */ swc1 $f0, 0x3c($s0) -.L80242174: -/* DF1014 80242174 AE00001C */ sw $zero, 0x1c($s0) -.L80242178: -/* DF1018 80242178 8FBF0038 */ lw $ra, 0x38($sp) -/* DF101C 8024217C 8FB30034 */ lw $s3, 0x34($sp) -/* DF1020 80242180 8FB20030 */ lw $s2, 0x30($sp) -/* DF1024 80242184 8FB1002C */ lw $s1, 0x2c($sp) -/* DF1028 80242188 8FB00028 */ lw $s0, 0x28($sp) -/* DF102C 8024218C D7B60048 */ ldc1 $f22, 0x48($sp) -/* DF1030 80242190 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DF1034 80242194 03E00008 */ jr $ra -/* DF1038 80242198 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s new file mode 100644 index 0000000000..48dbe321ba --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80241E0C_DF0CAC.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E0C_DF0CAC +/* DF0CAC 80241E0C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* DF0CB0 80241E10 AFB20030 */ sw $s2, 0x30($sp) +/* DF0CB4 80241E14 0080902D */ daddu $s2, $a0, $zero +/* DF0CB8 80241E18 AFBF0038 */ sw $ra, 0x38($sp) +/* DF0CBC 80241E1C AFB30034 */ sw $s3, 0x34($sp) +/* DF0CC0 80241E20 AFB1002C */ sw $s1, 0x2c($sp) +/* DF0CC4 80241E24 AFB00028 */ sw $s0, 0x28($sp) +/* DF0CC8 80241E28 F7B60048 */ sdc1 $f22, 0x48($sp) +/* DF0CCC 80241E2C F7B40040 */ sdc1 $f20, 0x40($sp) +/* DF0CD0 80241E30 8E510148 */ lw $s1, 0x148($s2) +/* DF0CD4 80241E34 86240008 */ lh $a0, 8($s1) +/* DF0CD8 80241E38 0C00EABB */ jal get_npc_unsafe +/* DF0CDC 80241E3C 00A0982D */ daddu $s3, $a1, $zero +/* DF0CE0 80241E40 0040802D */ daddu $s0, $v0, $zero +/* DF0CE4 80241E44 0200202D */ daddu $a0, $s0, $zero +/* DF0CE8 80241E48 C6220088 */ lwc1 $f2, 0x88($s1) +/* DF0CEC 80241E4C 468010A0 */ cvt.s.w $f2, $f2 +/* DF0CF0 80241E50 460010A1 */ cvt.d.s $f2, $f2 +/* DF0CF4 80241E54 C604001C */ lwc1 $f4, 0x1c($s0) +/* DF0CF8 80241E58 C6000014 */ lwc1 $f0, 0x14($s0) +/* DF0CFC 80241E5C 8E050018 */ lw $a1, 0x18($s0) +/* DF0D00 80241E60 46002100 */ add.s $f4, $f4, $f0 +/* DF0D04 80241E64 8E06000C */ lw $a2, 0xc($s0) +/* DF0D08 80241E68 C6200078 */ lwc1 $f0, 0x78($s1) +/* DF0D0C 80241E6C 46800020 */ cvt.s.w $f0, $f0 +/* DF0D10 80241E70 E604001C */ swc1 $f4, 0x1c($s0) +/* DF0D14 80241E74 3C014059 */ lui $at, 0x4059 +/* DF0D18 80241E78 44812800 */ mtc1 $at, $f5 +/* DF0D1C 80241E7C 44802000 */ mtc1 $zero, $f4 +/* DF0D20 80241E80 46000021 */ cvt.d.s $f0, $f0 +/* DF0D24 80241E84 46240003 */ div.d $f0, $f0, $f4 +/* DF0D28 80241E88 46200520 */ cvt.s.d $f20, $f0 +/* DF0D2C 80241E8C 46241083 */ div.d $f2, $f2, $f4 +/* DF0D30 80241E90 0C00EA95 */ jal npc_move_heading +/* DF0D34 80241E94 462015A0 */ cvt.s.d $f22, $f2 +/* DF0D38 80241E98 C604001C */ lwc1 $f4, 0x1c($s0) +/* DF0D3C 80241E9C 44801000 */ mtc1 $zero, $f2 +/* DF0D40 80241EA0 44801800 */ mtc1 $zero, $f3 +/* DF0D44 80241EA4 46002021 */ cvt.d.s $f0, $f4 +/* DF0D48 80241EA8 4620103E */ c.le.d $f2, $f0 +/* DF0D4C 80241EAC 00000000 */ nop +/* DF0D50 80241EB0 45000030 */ bc1f .L80241F74 +/* DF0D54 80241EB4 00000000 */ nop +/* DF0D58 80241EB8 C600003C */ lwc1 $f0, 0x3c($s0) +/* DF0D5C 80241EBC 46040000 */ add.s $f0, $f0, $f4 +/* DF0D60 80241EC0 E600003C */ swc1 $f0, 0x3c($s0) +/* DF0D64 80241EC4 8E2200CC */ lw $v0, 0xcc($s1) +/* DF0D68 80241EC8 8C420024 */ lw $v0, 0x24($v0) +/* DF0D6C 80241ECC AE020028 */ sw $v0, 0x28($s0) +/* DF0D70 80241ED0 A2200007 */ sb $zero, 7($s1) +/* DF0D74 80241ED4 8E020000 */ lw $v0, ($s0) +/* DF0D78 80241ED8 30420008 */ andi $v0, $v0, 8 +/* DF0D7C 80241EDC 14400011 */ bnez $v0, .L80241F24 +/* DF0D80 80241EE0 0000102D */ daddu $v0, $zero, $zero +/* DF0D84 80241EE4 27A50018 */ addiu $a1, $sp, 0x18 +/* DF0D88 80241EE8 27A6001C */ addiu $a2, $sp, 0x1c +/* DF0D8C 80241EEC C6000038 */ lwc1 $f0, 0x38($s0) +/* DF0D90 80241EF0 C602003C */ lwc1 $f2, 0x3c($s0) +/* DF0D94 80241EF4 C6040040 */ lwc1 $f4, 0x40($s0) +/* DF0D98 80241EF8 3C01447A */ lui $at, 0x447a +/* DF0D9C 80241EFC 44813000 */ mtc1 $at, $f6 +/* DF0DA0 80241F00 27A20024 */ addiu $v0, $sp, 0x24 +/* DF0DA4 80241F04 E7A00018 */ swc1 $f0, 0x18($sp) +/* DF0DA8 80241F08 E7A2001C */ swc1 $f2, 0x1c($sp) +/* DF0DAC 80241F0C E7A40020 */ swc1 $f4, 0x20($sp) +/* DF0DB0 80241F10 E7A60024 */ swc1 $f6, 0x24($sp) +/* DF0DB4 80241F14 AFA20010 */ sw $v0, 0x10($sp) +/* DF0DB8 80241F18 8E040080 */ lw $a0, 0x80($s0) +/* DF0DBC 80241F1C 0C0372DF */ jal func_800DCB7C +/* DF0DC0 80241F20 27A70020 */ addiu $a3, $sp, 0x20 +.L80241F24: +/* DF0DC4 80241F24 1040000B */ beqz $v0, .L80241F54 +/* DF0DC8 80241F28 00000000 */ nop +/* DF0DCC 80241F2C C7A0001C */ lwc1 $f0, 0x1c($sp) +/* DF0DD0 80241F30 46140080 */ add.s $f2, $f0, $f20 +/* DF0DD4 80241F34 C600003C */ lwc1 $f0, 0x3c($s0) +/* DF0DD8 80241F38 4600103E */ c.le.s $f2, $f0 +/* DF0DDC 80241F3C 00000000 */ nop +/* DF0DE0 80241F40 4500008D */ bc1f .L80242178 +/* DF0DE4 80241F44 00000000 */ nop +/* DF0DE8 80241F48 E602003C */ swc1 $f2, 0x3c($s0) +/* DF0DEC 80241F4C 0809085E */ j .L80242178 +/* DF0DF0 80241F50 AE400070 */ sw $zero, 0x70($s2) +.L80241F54: +/* DF0DF4 80241F54 C602003C */ lwc1 $f2, 0x3c($s0) +/* DF0DF8 80241F58 C6000064 */ lwc1 $f0, 0x64($s0) +/* DF0DFC 80241F5C 4602003E */ c.le.s $f0, $f2 +/* DF0E00 80241F60 00000000 */ nop +/* DF0E04 80241F64 45030084 */ bc1tl .L80242178 +/* DF0E08 80241F68 AE400070 */ sw $zero, 0x70($s2) +/* DF0E0C 80241F6C 0809085E */ j .L80242178 +/* DF0E10 80241F70 00000000 */ nop +.L80241F74: +/* DF0E14 80241F74 4622003C */ c.lt.d $f0, $f2 +/* DF0E18 80241F78 00000000 */ nop +/* DF0E1C 80241F7C 4500007E */ bc1f .L80242178 +/* DF0E20 80241F80 00000000 */ nop +/* DF0E24 80241F84 9602008E */ lhu $v0, 0x8e($s0) +/* DF0E28 80241F88 24420001 */ addiu $v0, $v0, 1 +/* DF0E2C 80241F8C A602008E */ sh $v0, 0x8e($s0) +/* DF0E30 80241F90 00021400 */ sll $v0, $v0, 0x10 +/* DF0E34 80241F94 8E630020 */ lw $v1, 0x20($s3) +/* DF0E38 80241F98 00021403 */ sra $v0, $v0, 0x10 +/* DF0E3C 80241F9C 0043102A */ slt $v0, $v0, $v1 +/* DF0E40 80241FA0 14400026 */ bnez $v0, .L8024203C +/* DF0E44 80241FA4 00000000 */ nop +/* DF0E48 80241FA8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* DF0E4C 80241FAC C60E0040 */ lwc1 $f14, 0x40($s0) +/* DF0E50 80241FB0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DF0E54 80241FB4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DF0E58 80241FB8 A600008E */ sh $zero, 0x8e($s0) +/* DF0E5C 80241FBC 8C460028 */ lw $a2, 0x28($v0) +/* DF0E60 80241FC0 0C00A720 */ jal atan2 +/* DF0E64 80241FC4 8C470030 */ lw $a3, 0x30($v0) +/* DF0E68 80241FC8 46000506 */ mov.s $f20, $f0 +/* DF0E6C 80241FCC C60C000C */ lwc1 $f12, 0xc($s0) +/* DF0E70 80241FD0 0C00A70A */ jal get_clamped_angle_diff +/* DF0E74 80241FD4 4600A386 */ mov.s $f14, $f20 +/* DF0E78 80241FD8 46000086 */ mov.s $f2, $f0 +/* DF0E7C 80241FDC 8E62001C */ lw $v0, 0x1c($s3) +/* DF0E80 80241FE0 46001005 */ abs.s $f0, $f2 +/* DF0E84 80241FE4 44822000 */ mtc1 $v0, $f4 +/* DF0E88 80241FE8 00000000 */ nop +/* DF0E8C 80241FEC 46802120 */ cvt.s.w $f4, $f4 +/* DF0E90 80241FF0 4600203C */ c.lt.s $f4, $f0 +/* DF0E94 80241FF4 00000000 */ nop +/* DF0E98 80241FF8 4500000D */ bc1f .L80242030 +/* DF0E9C 80241FFC 00000000 */ nop +/* DF0EA0 80242000 44800000 */ mtc1 $zero, $f0 +/* DF0EA4 80242004 C614000C */ lwc1 $f20, 0xc($s0) +/* DF0EA8 80242008 4600103C */ c.lt.s $f2, $f0 +/* DF0EAC 8024200C 00000000 */ nop +/* DF0EB0 80242010 45000006 */ bc1f .L8024202C +/* DF0EB4 80242014 00021023 */ negu $v0, $v0 +/* DF0EB8 80242018 44820000 */ mtc1 $v0, $f0 +/* DF0EBC 8024201C 00000000 */ nop +/* DF0EC0 80242020 46800020 */ cvt.s.w $f0, $f0 +/* DF0EC4 80242024 0809080C */ j .L80242030 +/* DF0EC8 80242028 4600A500 */ add.s $f20, $f20, $f0 +.L8024202C: +/* DF0ECC 8024202C 4604A500 */ add.s $f20, $f20, $f4 +.L80242030: +/* DF0ED0 80242030 0C00A6C9 */ jal clamp_angle +/* DF0ED4 80242034 4600A306 */ mov.s $f12, $f20 +/* DF0ED8 80242038 E600000C */ swc1 $f0, 0xc($s0) +.L8024203C: +/* DF0EDC 8024203C 8E020000 */ lw $v0, ($s0) +/* DF0EE0 80242040 30420008 */ andi $v0, $v0, 8 +/* DF0EE4 80242044 1040000A */ beqz $v0, .L80242070 +/* DF0EE8 80242048 27A50018 */ addiu $a1, $sp, 0x18 +/* DF0EEC 8024204C C602003C */ lwc1 $f2, 0x3c($s0) +/* DF0EF0 80242050 C600001C */ lwc1 $f0, 0x1c($s0) +/* DF0EF4 80242054 46001080 */ add.s $f2, $f2, $f0 +/* DF0EF8 80242058 4616103C */ c.lt.s $f2, $f22 +/* DF0EFC 8024205C 00000000 */ nop +/* DF0F00 80242060 45020045 */ bc1fl .L80242178 +/* DF0F04 80242064 E602003C */ swc1 $f2, 0x3c($s0) +/* DF0F08 80242068 0809085D */ j .L80242174 +/* DF0F0C 8024206C E616003C */ swc1 $f22, 0x3c($s0) +.L80242070: +/* DF0F10 80242070 C6000038 */ lwc1 $f0, 0x38($s0) +/* DF0F14 80242074 27A6001C */ addiu $a2, $sp, 0x1c +/* DF0F18 80242078 E7A00018 */ swc1 $f0, 0x18($sp) +/* DF0F1C 8024207C 860200A8 */ lh $v0, 0xa8($s0) +/* DF0F20 80242080 C600001C */ lwc1 $f0, 0x1c($s0) +/* DF0F24 80242084 C604003C */ lwc1 $f4, 0x3c($s0) +/* DF0F28 80242088 44821000 */ mtc1 $v0, $f2 +/* DF0F2C 8024208C 00000000 */ nop +/* DF0F30 80242090 468010A0 */ cvt.s.w $f2, $f2 +/* DF0F34 80242094 46000005 */ abs.s $f0, $f0 +/* DF0F38 80242098 46020000 */ add.s $f0, $f0, $f2 +/* DF0F3C 8024209C C6060040 */ lwc1 $f6, 0x40($s0) +/* DF0F40 802420A0 27A20024 */ addiu $v0, $sp, 0x24 +/* DF0F44 802420A4 46022100 */ add.s $f4, $f4, $f2 +/* DF0F48 802420A8 3C014024 */ lui $at, 0x4024 +/* DF0F4C 802420AC 44811800 */ mtc1 $at, $f3 +/* DF0F50 802420B0 44801000 */ mtc1 $zero, $f2 +/* DF0F54 802420B4 46000021 */ cvt.d.s $f0, $f0 +/* DF0F58 802420B8 46220000 */ add.d $f0, $f0, $f2 +/* DF0F5C 802420BC E7A60020 */ swc1 $f6, 0x20($sp) +/* DF0F60 802420C0 E7A4001C */ swc1 $f4, 0x1c($sp) +/* DF0F64 802420C4 46200020 */ cvt.s.d $f0, $f0 +/* DF0F68 802420C8 E7A00024 */ swc1 $f0, 0x24($sp) +/* DF0F6C 802420CC AFA20010 */ sw $v0, 0x10($sp) +/* DF0F70 802420D0 8E040080 */ lw $a0, 0x80($s0) +/* DF0F74 802420D4 0C0372DF */ jal func_800DCB7C +/* DF0F78 802420D8 27A70020 */ addiu $a3, $sp, 0x20 +/* DF0F7C 802420DC 10400015 */ beqz $v0, .L80242134 +/* DF0F80 802420E0 00000000 */ nop +/* DF0F84 802420E4 860200A8 */ lh $v0, 0xa8($s0) +/* DF0F88 802420E8 C604001C */ lwc1 $f4, 0x1c($s0) +/* DF0F8C 802420EC 44820000 */ mtc1 $v0, $f0 +/* DF0F90 802420F0 00000000 */ nop +/* DF0F94 802420F4 46800020 */ cvt.s.w $f0, $f0 +/* DF0F98 802420F8 46002085 */ abs.s $f2, $f4 +/* DF0F9C 802420FC 46020000 */ add.s $f0, $f0, $f2 +/* DF0FA0 80242100 C7A20024 */ lwc1 $f2, 0x24($sp) +/* DF0FA4 80242104 4600103E */ c.le.s $f2, $f0 +/* DF0FA8 80242108 00000000 */ nop +/* DF0FAC 8024210C 45000005 */ bc1f .L80242124 +/* DF0FB0 80242110 00000000 */ nop +/* DF0FB4 80242114 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* DF0FB8 80242118 AE00001C */ sw $zero, 0x1c($s0) +/* DF0FBC 8024211C 0809085E */ j .L80242178 +/* DF0FC0 80242120 E600003C */ swc1 $f0, 0x3c($s0) +.L80242124: +/* DF0FC4 80242124 C600003C */ lwc1 $f0, 0x3c($s0) +/* DF0FC8 80242128 46040000 */ add.s $f0, $f0, $f4 +/* DF0FCC 8024212C 0809085E */ j .L80242178 +/* DF0FD0 80242130 E600003C */ swc1 $f0, 0x3c($s0) +.L80242134: +/* DF0FD4 80242134 C606003C */ lwc1 $f6, 0x3c($s0) +/* DF0FD8 80242138 860200A8 */ lh $v0, 0xa8($s0) +/* DF0FDC 8024213C 46163081 */ sub.s $f2, $f6, $f22 +/* DF0FE0 80242140 44820000 */ mtc1 $v0, $f0 +/* DF0FE4 80242144 00000000 */ nop +/* DF0FE8 80242148 46800020 */ cvt.s.w $f0, $f0 +/* DF0FEC 8024214C 46001080 */ add.s $f2, $f2, $f0 +/* DF0FF0 80242150 C604001C */ lwc1 $f4, 0x1c($s0) +/* DF0FF4 80242154 46002005 */ abs.s $f0, $f4 +/* DF0FF8 80242158 4602003C */ c.lt.s $f0, $f2 +/* DF0FFC 8024215C 00000000 */ nop +/* DF1000 80242160 45020005 */ bc1fl .L80242178 +/* DF1004 80242164 AE00001C */ sw $zero, 0x1c($s0) +/* DF1008 80242168 46043000 */ add.s $f0, $f6, $f4 +/* DF100C 8024216C 0809085E */ j .L80242178 +/* DF1010 80242170 E600003C */ swc1 $f0, 0x3c($s0) +.L80242174: +/* DF1014 80242174 AE00001C */ sw $zero, 0x1c($s0) +.L80242178: +/* DF1018 80242178 8FBF0038 */ lw $ra, 0x38($sp) +/* DF101C 8024217C 8FB30034 */ lw $s3, 0x34($sp) +/* DF1020 80242180 8FB20030 */ lw $s2, 0x30($sp) +/* DF1024 80242184 8FB1002C */ lw $s1, 0x2c($sp) +/* DF1028 80242188 8FB00028 */ lw $s0, 0x28($sp) +/* DF102C 8024218C D7B60048 */ ldc1 $f22, 0x48($sp) +/* DF1030 80242190 D7B40040 */ ldc1 $f20, 0x40($sp) +/* DF1034 80242194 03E00008 */ jr $ra +/* DF1038 80242198 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s index 959ae116e6..32adbed9c2 100644 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802422C0_DF1160.s @@ -46,7 +46,7 @@ glabel func_802422C0_DF1160 /* DF1204 80242364 02A0202D */ daddu $a0, $s5, $zero /* DF1208 80242368 0240282D */ daddu $a1, $s2, $zero /* DF120C 8024236C 0280302D */ daddu $a2, $s4, $zero -/* DF1210 80242370 0C090867 */ jal func_8024219C +/* DF1210 80242370 0C090867 */ jal func_8024219C_DF103C /* DF1214 80242374 0200382D */ daddu $a3, $s0, $zero .L80242378: /* DF1218 80242378 2402FFFE */ addiu $v0, $zero, -2 @@ -73,49 +73,49 @@ glabel func_802422C0_DF1160 /* DF1268 802423C8 00000000 */ nop /* DF126C 802423CC 0280202D */ daddu $a0, $s4, $zero /* DF1270 802423D0 0200282D */ daddu $a1, $s0, $zero -/* DF1274 802423D4 0C0903ED */ jal func_80240FB4 +/* DF1274 802423D4 0C0903ED */ jal func_80240FB4_DEFE54 /* DF1278 802423D8 0260302D */ daddu $a2, $s3, $zero /* DF127C 802423DC 0280202D */ daddu $a0, $s4, $zero /* DF1280 802423E0 0200282D */ daddu $a1, $s0, $zero -/* DF1284 802423E4 0C090459 */ jal func_80241164 +/* DF1284 802423E4 0C090459 */ jal func_80241164_DF0004 /* DF1288 802423E8 0260302D */ daddu $a2, $s3, $zero /* DF128C 802423EC 08090922 */ j .L80242488 /* DF1290 802423F0 0000102D */ daddu $v0, $zero, $zero /* DF1294 802423F4 0280202D */ daddu $a0, $s4, $zero /* DF1298 802423F8 0200282D */ daddu $a1, $s0, $zero -/* DF129C 802423FC 0C0905E3 */ jal func_8024178C +/* DF129C 802423FC 0C0905E3 */ jal func_8024178C_DF062C /* DF12A0 80242400 0260302D */ daddu $a2, $s3, $zero /* DF12A4 80242404 0280202D */ daddu $a0, $s4, $zero /* DF12A8 80242408 0200282D */ daddu $a1, $s0, $zero -/* DF12AC 8024240C 0C090613 */ jal func_8024184C +/* DF12AC 8024240C 0C090613 */ jal func_8024184C_DF06EC /* DF12B0 80242410 0260302D */ daddu $a2, $s3, $zero /* DF12B4 80242414 08090922 */ j .L80242488 /* DF12B8 80242418 0000102D */ daddu $v0, $zero, $zero /* DF12BC 8024241C 0280202D */ daddu $a0, $s4, $zero /* DF12C0 80242420 0200282D */ daddu $a1, $s0, $zero -/* DF12C4 80242424 0C0906E4 */ jal func_80241B90 +/* DF12C4 80242424 0C0906E4 */ jal func_80241B90_DF0A30 /* DF12C8 80242428 0260302D */ daddu $a2, $s3, $zero /* DF12CC 8024242C 0280202D */ daddu $a0, $s4, $zero /* DF12D0 80242430 0200282D */ daddu $a1, $s0, $zero -/* DF12D4 80242434 0C090702 */ jal func_80241C08 +/* DF12D4 80242434 0C090702 */ jal func_80241C08_DF0AA8 /* DF12D8 80242438 0260302D */ daddu $a2, $s3, $zero /* DF12DC 8024243C 08090922 */ j .L80242488 /* DF12E0 80242440 0000102D */ daddu $v0, $zero, $zero /* DF12E4 80242444 0280202D */ daddu $a0, $s4, $zero /* DF12E8 80242448 0200282D */ daddu $a1, $s0, $zero -/* DF12EC 8024244C 0C09071D */ jal func_80241C74 +/* DF12EC 8024244C 0C09071D */ jal func_80241C74_DF0B14 /* DF12F0 80242450 0260302D */ daddu $a2, $s3, $zero /* DF12F4 80242454 08090922 */ j .L80242488 /* DF12F8 80242458 0000102D */ daddu $v0, $zero, $zero /* DF12FC 8024245C 0280202D */ daddu $a0, $s4, $zero /* DF1300 80242460 0200282D */ daddu $a1, $s0, $zero -/* DF1304 80242464 0C09076A */ jal func_80241DA8 +/* DF1304 80242464 0C09076A */ jal func_80241DA8_DF0C48 /* DF1308 80242468 0260302D */ daddu $a2, $s3, $zero /* DF130C 8024246C 08090922 */ j .L80242488 /* DF1310 80242470 0000102D */ daddu $v0, $zero, $zero /* DF1314 80242474 0280202D */ daddu $a0, $s4, $zero /* DF1318 80242478 0200282D */ daddu $a1, $s0, $zero -/* DF131C 8024247C 0C090783 */ jal func_80241E0C +/* DF131C 8024247C 0C090783 */ jal func_80241E0C_DF0CAC /* DF1320 80242480 0260302D */ daddu $a2, $s3, $zero .L80242484: /* DF1324 80242484 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC.s deleted file mode 100644 index 450421912d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC.s +++ /dev/null @@ -1,134 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424AC -/* DF134C 802424AC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* DF1350 802424B0 AFB10014 */ sw $s1, 0x14($sp) -/* DF1354 802424B4 0080882D */ daddu $s1, $a0, $zero -/* DF1358 802424B8 3C05800B */ lui $a1, %hi(gCameras) -/* DF135C 802424BC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* DF1360 802424C0 AFBF0020 */ sw $ra, 0x20($sp) -/* DF1364 802424C4 AFB3001C */ sw $s3, 0x1c($sp) -/* DF1368 802424C8 AFB20018 */ sw $s2, 0x18($sp) -/* DF136C 802424CC AFB00010 */ sw $s0, 0x10($sp) -/* DF1370 802424D0 F7B40028 */ sdc1 $f20, 0x28($sp) -/* DF1374 802424D4 8E330148 */ lw $s3, 0x148($s1) -/* DF1378 802424D8 3C03800A */ lui $v1, 0x800a -/* DF137C 802424DC 8463A634 */ lh $v1, -0x59cc($v1) -/* DF1380 802424E0 8E30000C */ lw $s0, 0xc($s1) -/* DF1384 802424E4 00031080 */ sll $v0, $v1, 2 -/* DF1388 802424E8 00431021 */ addu $v0, $v0, $v1 -/* DF138C 802424EC 00021080 */ sll $v0, $v0, 2 -/* DF1390 802424F0 00431023 */ subu $v0, $v0, $v1 -/* DF1394 802424F4 000218C0 */ sll $v1, $v0, 3 -/* DF1398 802424F8 00431021 */ addu $v0, $v0, $v1 -/* DF139C 802424FC 000210C0 */ sll $v0, $v0, 3 -/* DF13A0 80242500 86640008 */ lh $a0, 8($s3) -/* DF13A4 80242504 0C00EABB */ jal get_npc_unsafe -/* DF13A8 80242508 00459021 */ addu $s2, $v0, $a1 -/* DF13AC 8024250C 0220202D */ daddu $a0, $s1, $zero -/* DF13B0 80242510 8E050000 */ lw $a1, ($s0) -/* DF13B4 80242514 0C0B1EAF */ jal get_variable -/* DF13B8 80242518 0040802D */ daddu $s0, $v0, $zero -/* DF13BC 8024251C 0260202D */ daddu $a0, $s3, $zero -/* DF13C0 80242520 8C460024 */ lw $a2, 0x24($v0) -/* DF13C4 80242524 8C470028 */ lw $a3, 0x28($v0) -/* DF13C8 80242528 0C0124FB */ jal func_800493EC -/* DF13CC 8024252C 0000282D */ daddu $a1, $zero, $zero -/* DF13D0 80242530 10400052 */ beqz $v0, .L8024267C -/* DF13D4 80242534 2402FFFF */ addiu $v0, $zero, -1 -/* DF13D8 80242538 C64C006C */ lwc1 $f12, 0x6c($s2) -/* DF13DC 8024253C C60E000C */ lwc1 $f14, 0xc($s0) -/* DF13E0 80242540 3C014387 */ lui $at, 0x4387 -/* DF13E4 80242544 4481A000 */ mtc1 $at, $f20 -/* DF13E8 80242548 0C00A70A */ jal get_clamped_angle_diff -/* DF13EC 8024254C 00000000 */ nop -/* DF13F0 80242550 0C00A6C9 */ jal clamp_angle -/* DF13F4 80242554 46000306 */ mov.s $f12, $f0 -/* DF13F8 80242558 3C018024 */ lui $at, 0x8024 -/* DF13FC 8024255C D42279A8 */ ldc1 $f2, 0x79a8($at) -/* DF1400 80242560 46000021 */ cvt.d.s $f0, $f0 -/* DF1404 80242564 4622003C */ c.lt.d $f0, $f2 -/* DF1408 80242568 00000000 */ nop -/* DF140C 8024256C 45000003 */ bc1f .L8024257C -/* DF1410 80242570 00000000 */ nop -/* DF1414 80242574 3C0142B4 */ lui $at, 0x42b4 -/* DF1418 80242578 4481A000 */ mtc1 $at, $f20 -.L8024257C: -/* DF141C 8024257C 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) -/* DF1420 80242580 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) -/* DF1424 80242584 C60C0038 */ lwc1 $f12, 0x38($s0) -/* DF1428 80242588 8E220000 */ lw $v0, ($s1) -/* DF142C 8024258C C60E0040 */ lwc1 $f14, 0x40($s0) -/* DF1430 80242590 8C460028 */ lw $a2, 0x28($v0) -/* DF1434 80242594 0C00A720 */ jal atan2 -/* DF1438 80242598 8C470030 */ lw $a3, 0x30($v0) -/* DF143C 8024259C 4600A306 */ mov.s $f12, $f20 -/* DF1440 802425A0 0C00A70A */ jal get_clamped_angle_diff -/* DF1444 802425A4 46000386 */ mov.s $f14, $f0 -/* DF1448 802425A8 46000005 */ abs.s $f0, $f0 -/* DF144C 802425AC 3C018024 */ lui $at, 0x8024 -/* DF1450 802425B0 D42279B0 */ ldc1 $f2, 0x79b0($at) -/* DF1454 802425B4 46000021 */ cvt.d.s $f0, $f0 -/* DF1458 802425B8 4620103C */ c.lt.d $f2, $f0 -/* DF145C 802425BC 00000000 */ nop -/* DF1460 802425C0 4501002E */ bc1t .L8024267C -/* DF1464 802425C4 2402FFFF */ addiu $v0, $zero, -1 -/* DF1468 802425C8 8E220000 */ lw $v0, ($s1) -/* DF146C 802425CC C600003C */ lwc1 $f0, 0x3c($s0) -/* DF1470 802425D0 C442002C */ lwc1 $f2, 0x2c($v0) -/* DF1474 802425D4 860200A8 */ lh $v0, 0xa8($s0) -/* DF1478 802425D8 46020001 */ sub.s $f0, $f0, $f2 -/* DF147C 802425DC 44821000 */ mtc1 $v0, $f2 -/* DF1480 802425E0 00000000 */ nop -/* DF1484 802425E4 468010A1 */ cvt.d.w $f2, $f2 -/* DF1488 802425E8 46221080 */ add.d $f2, $f2, $f2 -/* DF148C 802425EC 46000005 */ abs.s $f0, $f0 -/* DF1490 802425F0 46000021 */ cvt.d.s $f0, $f0 -/* DF1494 802425F4 4620103E */ c.le.d $f2, $f0 -/* DF1498 802425F8 00000000 */ nop -/* DF149C 802425FC 4501001F */ bc1t .L8024267C -/* DF14A0 80242600 2402FFFF */ addiu $v0, $zero, -1 -/* DF14A4 80242604 3C038011 */ lui $v1, 0x8011 -/* DF14A8 80242608 8063EBB3 */ lb $v1, -0x144d($v1) -/* DF14AC 8024260C 24020009 */ addiu $v0, $zero, 9 -/* DF14B0 80242610 10620019 */ beq $v1, $v0, .L80242678 -/* DF14B4 80242614 24020007 */ addiu $v0, $zero, 7 -/* DF14B8 80242618 14620005 */ bne $v1, $v0, .L80242630 -/* DF14BC 8024261C 2402FFFF */ addiu $v0, $zero, -1 -/* DF14C0 80242620 0809099F */ j .L8024267C -/* DF14C4 80242624 00000000 */ nop -.L80242628: -/* DF14C8 80242628 0809099F */ j .L8024267C -/* DF14CC 8024262C 0240102D */ daddu $v0, $s2, $zero -.L80242630: -/* DF14D0 80242630 8E620078 */ lw $v0, 0x78($s3) -/* DF14D4 80242634 18400010 */ blez $v0, .L80242678 -/* DF14D8 80242638 0000882D */ daddu $s1, $zero, $zero -.L8024263C: -/* DF14DC 8024263C 86620008 */ lh $v0, 8($s3) -/* DF14E0 80242640 00511021 */ addu $v0, $v0, $s1 -/* DF14E4 80242644 24520001 */ addiu $s2, $v0, 1 -/* DF14E8 80242648 0C00FB3A */ jal get_enemy -/* DF14EC 8024264C 0240202D */ daddu $a0, $s2, $zero -/* DF14F0 80242650 0240202D */ daddu $a0, $s2, $zero -/* DF14F4 80242654 0C00EABB */ jal get_npc_unsafe -/* DF14F8 80242658 0040802D */ daddu $s0, $v0, $zero -/* DF14FC 8024265C 8E02006C */ lw $v0, 0x6c($s0) -/* DF1500 80242660 1040FFF1 */ beqz $v0, .L80242628 -/* DF1504 80242664 26310001 */ addiu $s1, $s1, 1 -/* DF1508 80242668 8E620078 */ lw $v0, 0x78($s3) -/* DF150C 8024266C 0222102A */ slt $v0, $s1, $v0 -/* DF1510 80242670 1440FFF2 */ bnez $v0, .L8024263C -/* DF1514 80242674 00000000 */ nop -.L80242678: -/* DF1518 80242678 2402FFFF */ addiu $v0, $zero, -1 -.L8024267C: -/* DF151C 8024267C 8FBF0020 */ lw $ra, 0x20($sp) -/* DF1520 80242680 8FB3001C */ lw $s3, 0x1c($sp) -/* DF1524 80242684 8FB20018 */ lw $s2, 0x18($sp) -/* DF1528 80242688 8FB10014 */ lw $s1, 0x14($sp) -/* DF152C 8024268C 8FB00010 */ lw $s0, 0x10($sp) -/* DF1530 80242690 D7B40028 */ ldc1 $f20, 0x28($sp) -/* DF1534 80242694 03E00008 */ jr $ra -/* DF1538 80242698 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s new file mode 100644 index 0000000000..9e1e27b7f1 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802424AC_DF134C.s @@ -0,0 +1,134 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424AC_DF134C +/* DF134C 802424AC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* DF1350 802424B0 AFB10014 */ sw $s1, 0x14($sp) +/* DF1354 802424B4 0080882D */ daddu $s1, $a0, $zero +/* DF1358 802424B8 3C05800B */ lui $a1, %hi(gCameras) +/* DF135C 802424BC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* DF1360 802424C0 AFBF0020 */ sw $ra, 0x20($sp) +/* DF1364 802424C4 AFB3001C */ sw $s3, 0x1c($sp) +/* DF1368 802424C8 AFB20018 */ sw $s2, 0x18($sp) +/* DF136C 802424CC AFB00010 */ sw $s0, 0x10($sp) +/* DF1370 802424D0 F7B40028 */ sdc1 $f20, 0x28($sp) +/* DF1374 802424D4 8E330148 */ lw $s3, 0x148($s1) +/* DF1378 802424D8 3C03800A */ lui $v1, 0x800a +/* DF137C 802424DC 8463A634 */ lh $v1, -0x59cc($v1) +/* DF1380 802424E0 8E30000C */ lw $s0, 0xc($s1) +/* DF1384 802424E4 00031080 */ sll $v0, $v1, 2 +/* DF1388 802424E8 00431021 */ addu $v0, $v0, $v1 +/* DF138C 802424EC 00021080 */ sll $v0, $v0, 2 +/* DF1390 802424F0 00431023 */ subu $v0, $v0, $v1 +/* DF1394 802424F4 000218C0 */ sll $v1, $v0, 3 +/* DF1398 802424F8 00431021 */ addu $v0, $v0, $v1 +/* DF139C 802424FC 000210C0 */ sll $v0, $v0, 3 +/* DF13A0 80242500 86640008 */ lh $a0, 8($s3) +/* DF13A4 80242504 0C00EABB */ jal get_npc_unsafe +/* DF13A8 80242508 00459021 */ addu $s2, $v0, $a1 +/* DF13AC 8024250C 0220202D */ daddu $a0, $s1, $zero +/* DF13B0 80242510 8E050000 */ lw $a1, ($s0) +/* DF13B4 80242514 0C0B1EAF */ jal get_variable +/* DF13B8 80242518 0040802D */ daddu $s0, $v0, $zero +/* DF13BC 8024251C 0260202D */ daddu $a0, $s3, $zero +/* DF13C0 80242520 8C460024 */ lw $a2, 0x24($v0) +/* DF13C4 80242524 8C470028 */ lw $a3, 0x28($v0) +/* DF13C8 80242528 0C0124FB */ jal func_800493EC +/* DF13CC 8024252C 0000282D */ daddu $a1, $zero, $zero +/* DF13D0 80242530 10400052 */ beqz $v0, .L8024267C +/* DF13D4 80242534 2402FFFF */ addiu $v0, $zero, -1 +/* DF13D8 80242538 C64C006C */ lwc1 $f12, 0x6c($s2) +/* DF13DC 8024253C C60E000C */ lwc1 $f14, 0xc($s0) +/* DF13E0 80242540 3C014387 */ lui $at, 0x4387 +/* DF13E4 80242544 4481A000 */ mtc1 $at, $f20 +/* DF13E8 80242548 0C00A70A */ jal get_clamped_angle_diff +/* DF13EC 8024254C 00000000 */ nop +/* DF13F0 80242550 0C00A6C9 */ jal clamp_angle +/* DF13F4 80242554 46000306 */ mov.s $f12, $f0 +/* DF13F8 80242558 3C018024 */ lui $at, 0x8024 +/* DF13FC 8024255C D42279A8 */ ldc1 $f2, 0x79a8($at) +/* DF1400 80242560 46000021 */ cvt.d.s $f0, $f0 +/* DF1404 80242564 4622003C */ c.lt.d $f0, $f2 +/* DF1408 80242568 00000000 */ nop +/* DF140C 8024256C 45000003 */ bc1f .L8024257C +/* DF1410 80242570 00000000 */ nop +/* DF1414 80242574 3C0142B4 */ lui $at, 0x42b4 +/* DF1418 80242578 4481A000 */ mtc1 $at, $f20 +.L8024257C: +/* DF141C 8024257C 3C11800F */ lui $s1, %hi(gPlayerStatusPtr) +/* DF1420 80242580 26317B30 */ addiu $s1, $s1, %lo(gPlayerStatusPtr) +/* DF1424 80242584 C60C0038 */ lwc1 $f12, 0x38($s0) +/* DF1428 80242588 8E220000 */ lw $v0, ($s1) +/* DF142C 8024258C C60E0040 */ lwc1 $f14, 0x40($s0) +/* DF1430 80242590 8C460028 */ lw $a2, 0x28($v0) +/* DF1434 80242594 0C00A720 */ jal atan2 +/* DF1438 80242598 8C470030 */ lw $a3, 0x30($v0) +/* DF143C 8024259C 4600A306 */ mov.s $f12, $f20 +/* DF1440 802425A0 0C00A70A */ jal get_clamped_angle_diff +/* DF1444 802425A4 46000386 */ mov.s $f14, $f0 +/* DF1448 802425A8 46000005 */ abs.s $f0, $f0 +/* DF144C 802425AC 3C018024 */ lui $at, 0x8024 +/* DF1450 802425B0 D42279B0 */ ldc1 $f2, 0x79b0($at) +/* DF1454 802425B4 46000021 */ cvt.d.s $f0, $f0 +/* DF1458 802425B8 4620103C */ c.lt.d $f2, $f0 +/* DF145C 802425BC 00000000 */ nop +/* DF1460 802425C0 4501002E */ bc1t .L8024267C +/* DF1464 802425C4 2402FFFF */ addiu $v0, $zero, -1 +/* DF1468 802425C8 8E220000 */ lw $v0, ($s1) +/* DF146C 802425CC C600003C */ lwc1 $f0, 0x3c($s0) +/* DF1470 802425D0 C442002C */ lwc1 $f2, 0x2c($v0) +/* DF1474 802425D4 860200A8 */ lh $v0, 0xa8($s0) +/* DF1478 802425D8 46020001 */ sub.s $f0, $f0, $f2 +/* DF147C 802425DC 44821000 */ mtc1 $v0, $f2 +/* DF1480 802425E0 00000000 */ nop +/* DF1484 802425E4 468010A1 */ cvt.d.w $f2, $f2 +/* DF1488 802425E8 46221080 */ add.d $f2, $f2, $f2 +/* DF148C 802425EC 46000005 */ abs.s $f0, $f0 +/* DF1490 802425F0 46000021 */ cvt.d.s $f0, $f0 +/* DF1494 802425F4 4620103E */ c.le.d $f2, $f0 +/* DF1498 802425F8 00000000 */ nop +/* DF149C 802425FC 4501001F */ bc1t .L8024267C +/* DF14A0 80242600 2402FFFF */ addiu $v0, $zero, -1 +/* DF14A4 80242604 3C038011 */ lui $v1, 0x8011 +/* DF14A8 80242608 8063EBB3 */ lb $v1, -0x144d($v1) +/* DF14AC 8024260C 24020009 */ addiu $v0, $zero, 9 +/* DF14B0 80242610 10620019 */ beq $v1, $v0, .L80242678 +/* DF14B4 80242614 24020007 */ addiu $v0, $zero, 7 +/* DF14B8 80242618 14620005 */ bne $v1, $v0, .L80242630 +/* DF14BC 8024261C 2402FFFF */ addiu $v0, $zero, -1 +/* DF14C0 80242620 0809099F */ j .L8024267C +/* DF14C4 80242624 00000000 */ nop +.L80242628: +/* DF14C8 80242628 0809099F */ j .L8024267C +/* DF14CC 8024262C 0240102D */ daddu $v0, $s2, $zero +.L80242630: +/* DF14D0 80242630 8E620078 */ lw $v0, 0x78($s3) +/* DF14D4 80242634 18400010 */ blez $v0, .L80242678 +/* DF14D8 80242638 0000882D */ daddu $s1, $zero, $zero +.L8024263C: +/* DF14DC 8024263C 86620008 */ lh $v0, 8($s3) +/* DF14E0 80242640 00511021 */ addu $v0, $v0, $s1 +/* DF14E4 80242644 24520001 */ addiu $s2, $v0, 1 +/* DF14E8 80242648 0C00FB3A */ jal get_enemy +/* DF14EC 8024264C 0240202D */ daddu $a0, $s2, $zero +/* DF14F0 80242650 0240202D */ daddu $a0, $s2, $zero +/* DF14F4 80242654 0C00EABB */ jal get_npc_unsafe +/* DF14F8 80242658 0040802D */ daddu $s0, $v0, $zero +/* DF14FC 8024265C 8E02006C */ lw $v0, 0x6c($s0) +/* DF1500 80242660 1040FFF1 */ beqz $v0, .L80242628 +/* DF1504 80242664 26310001 */ addiu $s1, $s1, 1 +/* DF1508 80242668 8E620078 */ lw $v0, 0x78($s3) +/* DF150C 8024266C 0222102A */ slt $v0, $s1, $v0 +/* DF1510 80242670 1440FFF2 */ bnez $v0, .L8024263C +/* DF1514 80242674 00000000 */ nop +.L80242678: +/* DF1518 80242678 2402FFFF */ addiu $v0, $zero, -1 +.L8024267C: +/* DF151C 8024267C 8FBF0020 */ lw $ra, 0x20($sp) +/* DF1520 80242680 8FB3001C */ lw $s3, 0x1c($sp) +/* DF1524 80242684 8FB20018 */ lw $s2, 0x18($sp) +/* DF1528 80242688 8FB10014 */ lw $s1, 0x14($sp) +/* DF152C 8024268C 8FB00010 */ lw $s0, 0x10($sp) +/* DF1530 80242690 D7B40028 */ ldc1 $f20, 0x28($sp) +/* DF1534 80242694 03E00008 */ jr $ra +/* DF1538 80242698 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C.s deleted file mode 100644 index 4776e5c071..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C.s +++ /dev/null @@ -1,88 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024269C -/* DF153C 8024269C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DF1540 802426A0 AFB20038 */ sw $s2, 0x38($sp) -/* DF1544 802426A4 0080902D */ daddu $s2, $a0, $zero -/* DF1548 802426A8 AFB00030 */ sw $s0, 0x30($sp) -/* DF154C 802426AC AFBF003C */ sw $ra, 0x3c($sp) -/* DF1550 802426B0 AFB10034 */ sw $s1, 0x34($sp) -/* DF1554 802426B4 F7B60048 */ sdc1 $f22, 0x48($sp) -/* DF1558 802426B8 F7B40040 */ sdc1 $f20, 0x40($sp) -/* DF155C 802426BC 8E510148 */ lw $s1, 0x148($s2) -/* DF1560 802426C0 4485A000 */ mtc1 $a1, $f20 -/* DF1564 802426C4 86240008 */ lh $a0, 8($s1) -/* DF1568 802426C8 4486B000 */ mtc1 $a2, $f22 -/* DF156C 802426CC 0C00EABB */ jal get_npc_unsafe -/* DF1570 802426D0 00E0802D */ daddu $s0, $a3, $zero -/* DF1574 802426D4 0200202D */ daddu $a0, $s0, $zero -/* DF1578 802426D8 0220282D */ daddu $a1, $s1, $zero -/* DF157C 802426DC 24030001 */ addiu $v1, $zero, 1 -/* DF1580 802426E0 4406A000 */ mfc1 $a2, $f20 -/* DF1584 802426E4 4407B000 */ mfc1 $a3, $f22 -/* DF1588 802426E8 0040802D */ daddu $s0, $v0, $zero -/* DF158C 802426EC 0C01242D */ jal func_800490B4 -/* DF1590 802426F0 AFA30010 */ sw $v1, 0x10($sp) -/* DF1594 802426F4 1440001D */ bnez $v0, .L8024276C -/* DF1598 802426F8 24040002 */ addiu $a0, $zero, 2 -/* DF159C 802426FC 0200282D */ daddu $a1, $s0, $zero -/* DF15A0 80242700 0000302D */ daddu $a2, $zero, $zero -/* DF15A4 80242704 860300A8 */ lh $v1, 0xa8($s0) -/* DF15A8 80242708 3C013F80 */ lui $at, 0x3f80 -/* DF15AC 8024270C 44810000 */ mtc1 $at, $f0 -/* DF15B0 80242710 3C014000 */ lui $at, 0x4000 -/* DF15B4 80242714 44811000 */ mtc1 $at, $f2 -/* DF15B8 80242718 3C01C1A0 */ lui $at, 0xc1a0 -/* DF15BC 8024271C 44812000 */ mtc1 $at, $f4 -/* DF15C0 80242720 2402000F */ addiu $v0, $zero, 0xf -/* DF15C4 80242724 AFA2001C */ sw $v0, 0x1c($sp) -/* DF15C8 80242728 44833000 */ mtc1 $v1, $f6 -/* DF15CC 8024272C 00000000 */ nop -/* DF15D0 80242730 468031A0 */ cvt.s.w $f6, $f6 -/* DF15D4 80242734 44073000 */ mfc1 $a3, $f6 -/* DF15D8 80242738 27A20028 */ addiu $v0, $sp, 0x28 -/* DF15DC 8024273C AFA20020 */ sw $v0, 0x20($sp) -/* DF15E0 80242740 E7A00010 */ swc1 $f0, 0x10($sp) -/* DF15E4 80242744 E7A20014 */ swc1 $f2, 0x14($sp) -/* DF15E8 80242748 0C01BFA4 */ jal fx_emote -/* DF15EC 8024274C E7A40018 */ swc1 $f4, 0x18($sp) -/* DF15F0 80242750 8E2200CC */ lw $v0, 0xcc($s1) -/* DF15F4 80242754 8C430000 */ lw $v1, ($v0) -/* DF15F8 80242758 24020014 */ addiu $v0, $zero, 0x14 -/* DF15FC 8024275C A602008E */ sh $v0, 0x8e($s0) -/* DF1600 80242760 24020021 */ addiu $v0, $zero, 0x21 -/* DF1604 80242764 080909EF */ j .L802427BC -/* DF1608 80242768 AE030028 */ sw $v1, 0x28($s0) -.L8024276C: -/* DF160C 8024276C 0C09092B */ jal func_802424AC -/* DF1610 80242770 0240202D */ daddu $a0, $s2, $zero -/* DF1614 80242774 0040202D */ daddu $a0, $v0, $zero -/* DF1618 80242778 2402FFFF */ addiu $v0, $zero, -1 -/* DF161C 8024277C 10820010 */ beq $a0, $v0, .L802427C0 -/* DF1620 80242780 00000000 */ nop -/* DF1624 80242784 0C00FB3A */ jal get_enemy -/* DF1628 80242788 00000000 */ nop -/* DF162C 8024278C 8C42006C */ lw $v0, 0x6c($v0) -/* DF1630 80242790 1440000B */ bnez $v0, .L802427C0 -/* DF1634 80242794 00000000 */ nop -/* DF1638 80242798 8602008C */ lh $v0, 0x8c($s0) -/* DF163C 8024279C 14400008 */ bnez $v0, .L802427C0 -/* DF1640 802427A0 00000000 */ nop -/* DF1644 802427A4 8E2200CC */ lw $v0, 0xcc($s1) -/* DF1648 802427A8 8C420020 */ lw $v0, 0x20($v0) -/* DF164C 802427AC AE020028 */ sw $v0, 0x28($s0) -/* DF1650 802427B0 96220072 */ lhu $v0, 0x72($s1) -/* DF1654 802427B4 A602008E */ sh $v0, 0x8e($s0) -/* DF1658 802427B8 2402001E */ addiu $v0, $zero, 0x1e -.L802427BC: -/* DF165C 802427BC AE420070 */ sw $v0, 0x70($s2) -.L802427C0: -/* DF1660 802427C0 8FBF003C */ lw $ra, 0x3c($sp) -/* DF1664 802427C4 8FB20038 */ lw $s2, 0x38($sp) -/* DF1668 802427C8 8FB10034 */ lw $s1, 0x34($sp) -/* DF166C 802427CC 8FB00030 */ lw $s0, 0x30($sp) -/* DF1670 802427D0 D7B60048 */ ldc1 $f22, 0x48($sp) -/* DF1674 802427D4 D7B40040 */ ldc1 $f20, 0x40($sp) -/* DF1678 802427D8 03E00008 */ jr $ra -/* DF167C 802427DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s new file mode 100644 index 0000000000..d8dd4f41ad --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_8024269C_DF153C.s @@ -0,0 +1,88 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024269C_DF153C +/* DF153C 8024269C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* DF1540 802426A0 AFB20038 */ sw $s2, 0x38($sp) +/* DF1544 802426A4 0080902D */ daddu $s2, $a0, $zero +/* DF1548 802426A8 AFB00030 */ sw $s0, 0x30($sp) +/* DF154C 802426AC AFBF003C */ sw $ra, 0x3c($sp) +/* DF1550 802426B0 AFB10034 */ sw $s1, 0x34($sp) +/* DF1554 802426B4 F7B60048 */ sdc1 $f22, 0x48($sp) +/* DF1558 802426B8 F7B40040 */ sdc1 $f20, 0x40($sp) +/* DF155C 802426BC 8E510148 */ lw $s1, 0x148($s2) +/* DF1560 802426C0 4485A000 */ mtc1 $a1, $f20 +/* DF1564 802426C4 86240008 */ lh $a0, 8($s1) +/* DF1568 802426C8 4486B000 */ mtc1 $a2, $f22 +/* DF156C 802426CC 0C00EABB */ jal get_npc_unsafe +/* DF1570 802426D0 00E0802D */ daddu $s0, $a3, $zero +/* DF1574 802426D4 0200202D */ daddu $a0, $s0, $zero +/* DF1578 802426D8 0220282D */ daddu $a1, $s1, $zero +/* DF157C 802426DC 24030001 */ addiu $v1, $zero, 1 +/* DF1580 802426E0 4406A000 */ mfc1 $a2, $f20 +/* DF1584 802426E4 4407B000 */ mfc1 $a3, $f22 +/* DF1588 802426E8 0040802D */ daddu $s0, $v0, $zero +/* DF158C 802426EC 0C01242D */ jal func_800490B4 +/* DF1590 802426F0 AFA30010 */ sw $v1, 0x10($sp) +/* DF1594 802426F4 1440001D */ bnez $v0, .L8024276C +/* DF1598 802426F8 24040002 */ addiu $a0, $zero, 2 +/* DF159C 802426FC 0200282D */ daddu $a1, $s0, $zero +/* DF15A0 80242700 0000302D */ daddu $a2, $zero, $zero +/* DF15A4 80242704 860300A8 */ lh $v1, 0xa8($s0) +/* DF15A8 80242708 3C013F80 */ lui $at, 0x3f80 +/* DF15AC 8024270C 44810000 */ mtc1 $at, $f0 +/* DF15B0 80242710 3C014000 */ lui $at, 0x4000 +/* DF15B4 80242714 44811000 */ mtc1 $at, $f2 +/* DF15B8 80242718 3C01C1A0 */ lui $at, 0xc1a0 +/* DF15BC 8024271C 44812000 */ mtc1 $at, $f4 +/* DF15C0 80242720 2402000F */ addiu $v0, $zero, 0xf +/* DF15C4 80242724 AFA2001C */ sw $v0, 0x1c($sp) +/* DF15C8 80242728 44833000 */ mtc1 $v1, $f6 +/* DF15CC 8024272C 00000000 */ nop +/* DF15D0 80242730 468031A0 */ cvt.s.w $f6, $f6 +/* DF15D4 80242734 44073000 */ mfc1 $a3, $f6 +/* DF15D8 80242738 27A20028 */ addiu $v0, $sp, 0x28 +/* DF15DC 8024273C AFA20020 */ sw $v0, 0x20($sp) +/* DF15E0 80242740 E7A00010 */ swc1 $f0, 0x10($sp) +/* DF15E4 80242744 E7A20014 */ swc1 $f2, 0x14($sp) +/* DF15E8 80242748 0C01BFA4 */ jal fx_emote +/* DF15EC 8024274C E7A40018 */ swc1 $f4, 0x18($sp) +/* DF15F0 80242750 8E2200CC */ lw $v0, 0xcc($s1) +/* DF15F4 80242754 8C430000 */ lw $v1, ($v0) +/* DF15F8 80242758 24020014 */ addiu $v0, $zero, 0x14 +/* DF15FC 8024275C A602008E */ sh $v0, 0x8e($s0) +/* DF1600 80242760 24020021 */ addiu $v0, $zero, 0x21 +/* DF1604 80242764 080909EF */ j .L802427BC +/* DF1608 80242768 AE030028 */ sw $v1, 0x28($s0) +.L8024276C: +/* DF160C 8024276C 0C09092B */ jal func_802424AC_DF134C +/* DF1610 80242770 0240202D */ daddu $a0, $s2, $zero +/* DF1614 80242774 0040202D */ daddu $a0, $v0, $zero +/* DF1618 80242778 2402FFFF */ addiu $v0, $zero, -1 +/* DF161C 8024277C 10820010 */ beq $a0, $v0, .L802427C0 +/* DF1620 80242780 00000000 */ nop +/* DF1624 80242784 0C00FB3A */ jal get_enemy +/* DF1628 80242788 00000000 */ nop +/* DF162C 8024278C 8C42006C */ lw $v0, 0x6c($v0) +/* DF1630 80242790 1440000B */ bnez $v0, .L802427C0 +/* DF1634 80242794 00000000 */ nop +/* DF1638 80242798 8602008C */ lh $v0, 0x8c($s0) +/* DF163C 8024279C 14400008 */ bnez $v0, .L802427C0 +/* DF1640 802427A0 00000000 */ nop +/* DF1644 802427A4 8E2200CC */ lw $v0, 0xcc($s1) +/* DF1648 802427A8 8C420020 */ lw $v0, 0x20($v0) +/* DF164C 802427AC AE020028 */ sw $v0, 0x28($s0) +/* DF1650 802427B0 96220072 */ lhu $v0, 0x72($s1) +/* DF1654 802427B4 A602008E */ sh $v0, 0x8e($s0) +/* DF1658 802427B8 2402001E */ addiu $v0, $zero, 0x1e +.L802427BC: +/* DF165C 802427BC AE420070 */ sw $v0, 0x70($s2) +.L802427C0: +/* DF1660 802427C0 8FBF003C */ lw $ra, 0x3c($sp) +/* DF1664 802427C4 8FB20038 */ lw $s2, 0x38($sp) +/* DF1668 802427C8 8FB10034 */ lw $s1, 0x34($sp) +/* DF166C 802427CC 8FB00030 */ lw $s0, 0x30($sp) +/* DF1670 802427D0 D7B60048 */ ldc1 $f22, 0x48($sp) +/* DF1674 802427D4 D7B40040 */ ldc1 $f20, 0x40($sp) +/* DF1678 802427D8 03E00008 */ jr $ra +/* DF167C 802427DC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0.s deleted file mode 100644 index 56b9c9bb9e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0.s +++ /dev/null @@ -1,71 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427E0 -/* DF1680 802427E0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* DF1684 802427E4 AFB20038 */ sw $s2, 0x38($sp) -/* DF1688 802427E8 0080902D */ daddu $s2, $a0, $zero -/* DF168C 802427EC AFBF003C */ sw $ra, 0x3c($sp) -/* DF1690 802427F0 AFB10034 */ sw $s1, 0x34($sp) -/* DF1694 802427F4 AFB00030 */ sw $s0, 0x30($sp) -/* DF1698 802427F8 8E510148 */ lw $s1, 0x148($s2) -/* DF169C 802427FC 0C00EABB */ jal get_npc_unsafe -/* DF16A0 80242800 86240008 */ lh $a0, 8($s1) -/* DF16A4 80242804 0040802D */ daddu $s0, $v0, $zero -/* DF16A8 80242808 9602008E */ lhu $v0, 0x8e($s0) -/* DF16AC 8024280C 2442FFFF */ addiu $v0, $v0, -1 -/* DF16B0 80242810 A602008E */ sh $v0, 0x8e($s0) -/* DF16B4 80242814 00021400 */ sll $v0, $v0, 0x10 -/* DF16B8 80242818 1C40002B */ bgtz $v0, .L802428C8 -/* DF16BC 8024281C 00000000 */ nop -/* DF16C0 80242820 0C09092B */ jal func_802424AC -/* DF16C4 80242824 0240202D */ daddu $a0, $s2, $zero -/* DF16C8 80242828 0040202D */ daddu $a0, $v0, $zero -/* DF16CC 8024282C 0481001A */ bgez $a0, .L80242898 -/* DF16D0 80242830 2402000F */ addiu $v0, $zero, 0xf -/* DF16D4 80242834 24040002 */ addiu $a0, $zero, 2 -/* DF16D8 80242838 860300A8 */ lh $v1, 0xa8($s0) -/* DF16DC 8024283C AFA2001C */ sw $v0, 0x1c($sp) -/* DF16E0 80242840 27A20028 */ addiu $v0, $sp, 0x28 -/* DF16E4 80242844 0200282D */ daddu $a1, $s0, $zero -/* DF16E8 80242848 3C013F80 */ lui $at, 0x3f80 -/* DF16EC 8024284C 44810000 */ mtc1 $at, $f0 -/* DF16F0 80242850 3C014000 */ lui $at, 0x4000 -/* DF16F4 80242854 44811000 */ mtc1 $at, $f2 -/* DF16F8 80242858 3C01C1A0 */ lui $at, 0xc1a0 -/* DF16FC 8024285C 44812000 */ mtc1 $at, $f4 -/* DF1700 80242860 44833000 */ mtc1 $v1, $f6 -/* DF1704 80242864 00000000 */ nop -/* DF1708 80242868 468031A0 */ cvt.s.w $f6, $f6 -/* DF170C 8024286C 44073000 */ mfc1 $a3, $f6 -/* DF1710 80242870 0000302D */ daddu $a2, $zero, $zero -/* DF1714 80242874 AFA20020 */ sw $v0, 0x20($sp) -/* DF1718 80242878 E7A00010 */ swc1 $f0, 0x10($sp) -/* DF171C 8024287C E7A20014 */ swc1 $f2, 0x14($sp) -/* DF1720 80242880 0C01BFA4 */ jal fx_emote -/* DF1724 80242884 E7A40018 */ swc1 $f4, 0x18($sp) -/* DF1728 80242888 8E2200CC */ lw $v0, 0xcc($s1) -/* DF172C 8024288C 8C420000 */ lw $v0, ($v0) -/* DF1730 80242890 08090A2E */ j .L802428B8 -/* DF1734 80242894 AE020028 */ sw $v0, 0x28($s0) -.L80242898: -/* DF1738 80242898 8E2200CC */ lw $v0, 0xcc($s1) -/* DF173C 8024289C 8C420024 */ lw $v0, 0x24($v0) -/* DF1740 802428A0 0C00FB3A */ jal get_enemy -/* DF1744 802428A4 AE020028 */ sw $v0, 0x28($s0) -/* DF1748 802428A8 86240008 */ lh $a0, 8($s1) -/* DF174C 802428AC 24030001 */ addiu $v1, $zero, 1 -/* DF1750 802428B0 AC43006C */ sw $v1, 0x6c($v0) -/* DF1754 802428B4 AC44007C */ sw $a0, 0x7c($v0) -.L802428B8: -/* DF1758 802428B8 96220076 */ lhu $v0, 0x76($s1) -/* DF175C 802428BC A602008E */ sh $v0, 0x8e($s0) -/* DF1760 802428C0 24020021 */ addiu $v0, $zero, 0x21 -/* DF1764 802428C4 AE420070 */ sw $v0, 0x70($s2) -.L802428C8: -/* DF1768 802428C8 8FBF003C */ lw $ra, 0x3c($sp) -/* DF176C 802428CC 8FB20038 */ lw $s2, 0x38($sp) -/* DF1770 802428D0 8FB10034 */ lw $s1, 0x34($sp) -/* DF1774 802428D4 8FB00030 */ lw $s0, 0x30($sp) -/* DF1778 802428D8 03E00008 */ jr $ra -/* DF177C 802428DC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s new file mode 100644 index 0000000000..3d7b008e59 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802427E0_DF1680.s @@ -0,0 +1,71 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427E0_DF1680 +/* DF1680 802427E0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* DF1684 802427E4 AFB20038 */ sw $s2, 0x38($sp) +/* DF1688 802427E8 0080902D */ daddu $s2, $a0, $zero +/* DF168C 802427EC AFBF003C */ sw $ra, 0x3c($sp) +/* DF1690 802427F0 AFB10034 */ sw $s1, 0x34($sp) +/* DF1694 802427F4 AFB00030 */ sw $s0, 0x30($sp) +/* DF1698 802427F8 8E510148 */ lw $s1, 0x148($s2) +/* DF169C 802427FC 0C00EABB */ jal get_npc_unsafe +/* DF16A0 80242800 86240008 */ lh $a0, 8($s1) +/* DF16A4 80242804 0040802D */ daddu $s0, $v0, $zero +/* DF16A8 80242808 9602008E */ lhu $v0, 0x8e($s0) +/* DF16AC 8024280C 2442FFFF */ addiu $v0, $v0, -1 +/* DF16B0 80242810 A602008E */ sh $v0, 0x8e($s0) +/* DF16B4 80242814 00021400 */ sll $v0, $v0, 0x10 +/* DF16B8 80242818 1C40002B */ bgtz $v0, .L802428C8 +/* DF16BC 8024281C 00000000 */ nop +/* DF16C0 80242820 0C09092B */ jal func_802424AC_DF134C +/* DF16C4 80242824 0240202D */ daddu $a0, $s2, $zero +/* DF16C8 80242828 0040202D */ daddu $a0, $v0, $zero +/* DF16CC 8024282C 0481001A */ bgez $a0, .L80242898 +/* DF16D0 80242830 2402000F */ addiu $v0, $zero, 0xf +/* DF16D4 80242834 24040002 */ addiu $a0, $zero, 2 +/* DF16D8 80242838 860300A8 */ lh $v1, 0xa8($s0) +/* DF16DC 8024283C AFA2001C */ sw $v0, 0x1c($sp) +/* DF16E0 80242840 27A20028 */ addiu $v0, $sp, 0x28 +/* DF16E4 80242844 0200282D */ daddu $a1, $s0, $zero +/* DF16E8 80242848 3C013F80 */ lui $at, 0x3f80 +/* DF16EC 8024284C 44810000 */ mtc1 $at, $f0 +/* DF16F0 80242850 3C014000 */ lui $at, 0x4000 +/* DF16F4 80242854 44811000 */ mtc1 $at, $f2 +/* DF16F8 80242858 3C01C1A0 */ lui $at, 0xc1a0 +/* DF16FC 8024285C 44812000 */ mtc1 $at, $f4 +/* DF1700 80242860 44833000 */ mtc1 $v1, $f6 +/* DF1704 80242864 00000000 */ nop +/* DF1708 80242868 468031A0 */ cvt.s.w $f6, $f6 +/* DF170C 8024286C 44073000 */ mfc1 $a3, $f6 +/* DF1710 80242870 0000302D */ daddu $a2, $zero, $zero +/* DF1714 80242874 AFA20020 */ sw $v0, 0x20($sp) +/* DF1718 80242878 E7A00010 */ swc1 $f0, 0x10($sp) +/* DF171C 8024287C E7A20014 */ swc1 $f2, 0x14($sp) +/* DF1720 80242880 0C01BFA4 */ jal fx_emote +/* DF1724 80242884 E7A40018 */ swc1 $f4, 0x18($sp) +/* DF1728 80242888 8E2200CC */ lw $v0, 0xcc($s1) +/* DF172C 8024288C 8C420000 */ lw $v0, ($v0) +/* DF1730 80242890 08090A2E */ j .L802428B8 +/* DF1734 80242894 AE020028 */ sw $v0, 0x28($s0) +.L80242898: +/* DF1738 80242898 8E2200CC */ lw $v0, 0xcc($s1) +/* DF173C 8024289C 8C420024 */ lw $v0, 0x24($v0) +/* DF1740 802428A0 0C00FB3A */ jal get_enemy +/* DF1744 802428A4 AE020028 */ sw $v0, 0x28($s0) +/* DF1748 802428A8 86240008 */ lh $a0, 8($s1) +/* DF174C 802428AC 24030001 */ addiu $v1, $zero, 1 +/* DF1750 802428B0 AC43006C */ sw $v1, 0x6c($v0) +/* DF1754 802428B4 AC44007C */ sw $a0, 0x7c($v0) +.L802428B8: +/* DF1758 802428B8 96220076 */ lhu $v0, 0x76($s1) +/* DF175C 802428BC A602008E */ sh $v0, 0x8e($s0) +/* DF1760 802428C0 24020021 */ addiu $v0, $zero, 0x21 +/* DF1764 802428C4 AE420070 */ sw $v0, 0x70($s2) +.L802428C8: +/* DF1768 802428C8 8FBF003C */ lw $ra, 0x3c($sp) +/* DF176C 802428CC 8FB20038 */ lw $s2, 0x38($sp) +/* DF1770 802428D0 8FB10034 */ lw $s1, 0x34($sp) +/* DF1774 802428D4 8FB00030 */ lw $s0, 0x30($sp) +/* DF1778 802428D8 03E00008 */ jr $ra +/* DF177C 802428DC 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924.s deleted file mode 100644 index 25a70e1510..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242924 -/* DF17C4 80242924 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* DF17C8 80242928 AFB3001C */ sw $s3, 0x1c($sp) -/* DF17CC 8024292C 0080982D */ daddu $s3, $a0, $zero -/* DF17D0 80242930 AFBF0020 */ sw $ra, 0x20($sp) -/* DF17D4 80242934 AFB20018 */ sw $s2, 0x18($sp) -/* DF17D8 80242938 AFB10014 */ sw $s1, 0x14($sp) -/* DF17DC 8024293C AFB00010 */ sw $s0, 0x10($sp) -/* DF17E0 80242940 8E720148 */ lw $s2, 0x148($s3) -/* DF17E4 80242944 0C00EABB */ jal get_npc_unsafe -/* DF17E8 80242948 86440008 */ lh $a0, 8($s2) -/* DF17EC 8024294C 86440008 */ lh $a0, 8($s2) -/* DF17F0 80242950 0040882D */ daddu $s1, $v0, $zero -/* DF17F4 80242954 0C00FB3A */ jal get_enemy -/* DF17F8 80242958 24840001 */ addiu $a0, $a0, 1 -/* DF17FC 8024295C 0040802D */ daddu $s0, $v0, $zero -/* DF1800 80242960 0C00EABB */ jal get_npc_unsafe -/* DF1804 80242964 86040008 */ lh $a0, 8($s0) -/* DF1808 80242968 C62C0038 */ lwc1 $f12, 0x38($s1) -/* DF180C 8024296C C62E0040 */ lwc1 $f14, 0x40($s1) -/* DF1810 80242970 8C460038 */ lw $a2, 0x38($v0) -/* DF1814 80242974 0C00A720 */ jal atan2 -/* DF1818 80242978 8C470040 */ lw $a3, 0x40($v0) -/* DF181C 8024297C E620000C */ swc1 $f0, 0xc($s1) -/* DF1820 80242980 8E02006C */ lw $v0, 0x6c($s0) -/* DF1824 80242984 14400008 */ bnez $v0, .L802429A8 -/* DF1828 80242988 00000000 */ nop -/* DF182C 8024298C 8E4200CC */ lw $v0, 0xcc($s2) -/* DF1830 80242990 8C420000 */ lw $v0, ($v0) -/* DF1834 80242994 AE220028 */ sw $v0, 0x28($s1) -/* DF1838 80242998 96420076 */ lhu $v0, 0x76($s2) -/* DF183C 8024299C A622008E */ sh $v0, 0x8e($s1) -/* DF1840 802429A0 24020021 */ addiu $v0, $zero, 0x21 -/* DF1844 802429A4 AE620070 */ sw $v0, 0x70($s3) -.L802429A8: -/* DF1848 802429A8 8FBF0020 */ lw $ra, 0x20($sp) -/* DF184C 802429AC 8FB3001C */ lw $s3, 0x1c($sp) -/* DF1850 802429B0 8FB20018 */ lw $s2, 0x18($sp) -/* DF1854 802429B4 8FB10014 */ lw $s1, 0x14($sp) -/* DF1858 802429B8 8FB00010 */ lw $s0, 0x10($sp) -/* DF185C 802429BC 03E00008 */ jr $ra -/* DF1860 802429C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924_DF17C4.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924_DF17C4.s new file mode 100644 index 0000000000..5d5b197c89 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242924_DF17C4.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242924_DF17C4 +/* DF17C4 80242924 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* DF17C8 80242928 AFB3001C */ sw $s3, 0x1c($sp) +/* DF17CC 8024292C 0080982D */ daddu $s3, $a0, $zero +/* DF17D0 80242930 AFBF0020 */ sw $ra, 0x20($sp) +/* DF17D4 80242934 AFB20018 */ sw $s2, 0x18($sp) +/* DF17D8 80242938 AFB10014 */ sw $s1, 0x14($sp) +/* DF17DC 8024293C AFB00010 */ sw $s0, 0x10($sp) +/* DF17E0 80242940 8E720148 */ lw $s2, 0x148($s3) +/* DF17E4 80242944 0C00EABB */ jal get_npc_unsafe +/* DF17E8 80242948 86440008 */ lh $a0, 8($s2) +/* DF17EC 8024294C 86440008 */ lh $a0, 8($s2) +/* DF17F0 80242950 0040882D */ daddu $s1, $v0, $zero +/* DF17F4 80242954 0C00FB3A */ jal get_enemy +/* DF17F8 80242958 24840001 */ addiu $a0, $a0, 1 +/* DF17FC 8024295C 0040802D */ daddu $s0, $v0, $zero +/* DF1800 80242960 0C00EABB */ jal get_npc_unsafe +/* DF1804 80242964 86040008 */ lh $a0, 8($s0) +/* DF1808 80242968 C62C0038 */ lwc1 $f12, 0x38($s1) +/* DF180C 8024296C C62E0040 */ lwc1 $f14, 0x40($s1) +/* DF1810 80242970 8C460038 */ lw $a2, 0x38($v0) +/* DF1814 80242974 0C00A720 */ jal atan2 +/* DF1818 80242978 8C470040 */ lw $a3, 0x40($v0) +/* DF181C 8024297C E620000C */ swc1 $f0, 0xc($s1) +/* DF1820 80242980 8E02006C */ lw $v0, 0x6c($s0) +/* DF1824 80242984 14400008 */ bnez $v0, .L802429A8 +/* DF1828 80242988 00000000 */ nop +/* DF182C 8024298C 8E4200CC */ lw $v0, 0xcc($s2) +/* DF1830 80242990 8C420000 */ lw $v0, ($v0) +/* DF1834 80242994 AE220028 */ sw $v0, 0x28($s1) +/* DF1838 80242998 96420076 */ lhu $v0, 0x76($s2) +/* DF183C 8024299C A622008E */ sh $v0, 0x8e($s1) +/* DF1840 802429A0 24020021 */ addiu $v0, $zero, 0x21 +/* DF1844 802429A4 AE620070 */ sw $v0, 0x70($s3) +.L802429A8: +/* DF1848 802429A8 8FBF0020 */ lw $ra, 0x20($sp) +/* DF184C 802429AC 8FB3001C */ lw $s3, 0x1c($sp) +/* DF1850 802429B0 8FB20018 */ lw $s2, 0x18($sp) +/* DF1854 802429B4 8FB10014 */ lw $s1, 0x14($sp) +/* DF1858 802429B8 8FB00010 */ lw $s0, 0x10($sp) +/* DF185C 802429BC 03E00008 */ jr $ra +/* DF1860 802429C0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44.s deleted file mode 100644 index 532ee30d3a..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44.s +++ /dev/null @@ -1,298 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242F44 -/* DF1DE4 80242F44 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* DF1DE8 80242F48 AFB3003C */ sw $s3, 0x3c($sp) -/* DF1DEC 80242F4C 0080982D */ daddu $s3, $a0, $zero -/* DF1DF0 80242F50 AFB40040 */ sw $s4, 0x40($sp) -/* DF1DF4 80242F54 0000A02D */ daddu $s4, $zero, $zero -/* DF1DF8 80242F58 3C03800A */ lui $v1, 0x800a -/* DF1DFC 80242F5C 8463A634 */ lh $v1, -0x59cc($v1) -/* DF1E00 80242F60 3C04800B */ lui $a0, %hi(gCameras) -/* DF1E04 80242F64 24841D80 */ addiu $a0, $a0, %lo(gCameras) -/* DF1E08 80242F68 AFBF0044 */ sw $ra, 0x44($sp) -/* DF1E0C 80242F6C AFB20038 */ sw $s2, 0x38($sp) -/* DF1E10 80242F70 AFB10034 */ sw $s1, 0x34($sp) -/* DF1E14 80242F74 AFB00030 */ sw $s0, 0x30($sp) -/* DF1E18 80242F78 F7B80058 */ sdc1 $f24, 0x58($sp) -/* DF1E1C 80242F7C F7B60050 */ sdc1 $f22, 0x50($sp) -/* DF1E20 80242F80 F7B40048 */ sdc1 $f20, 0x48($sp) -/* DF1E24 80242F84 8E710148 */ lw $s1, 0x148($s3) -/* DF1E28 80242F88 00031080 */ sll $v0, $v1, 2 -/* DF1E2C 80242F8C 00431021 */ addu $v0, $v0, $v1 -/* DF1E30 80242F90 00021080 */ sll $v0, $v0, 2 -/* DF1E34 80242F94 00431023 */ subu $v0, $v0, $v1 -/* DF1E38 80242F98 000218C0 */ sll $v1, $v0, 3 -/* DF1E3C 80242F9C 00431021 */ addu $v0, $v0, $v1 -/* DF1E40 80242FA0 000210C0 */ sll $v0, $v0, 3 -/* DF1E44 80242FA4 10A00002 */ beqz $a1, .L80242FB0 -/* DF1E48 80242FA8 00449021 */ addu $s2, $v0, $a0 -/* DF1E4C 80242FAC AE600070 */ sw $zero, 0x70($s3) -.L80242FB0: -/* DF1E50 80242FB0 0C00FB5A */ jal get_enemy_safe -/* DF1E54 80242FB4 86240008 */ lh $a0, 8($s1) -/* DF1E58 80242FB8 14400006 */ bnez $v0, .L80242FD4 -/* DF1E5C 80242FBC 24020005 */ addiu $v0, $zero, 5 -/* DF1E60 80242FC0 0260202D */ daddu $a0, $s3, $zero -/* DF1E64 80242FC4 3C05FE36 */ lui $a1, 0xfe36 -/* DF1E68 80242FC8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DF1E6C 80242FCC 08090CCD */ j .L80243334 -/* DF1E70 80242FD0 0000302D */ daddu $a2, $zero, $zero -.L80242FD4: -/* DF1E74 80242FD4 8E23006C */ lw $v1, 0x6c($s1) -/* DF1E78 80242FD8 14620005 */ bne $v1, $v0, .L80242FF0 -/* DF1E7C 80242FDC 0260202D */ daddu $a0, $s3, $zero -/* DF1E80 80242FE0 3C05FE36 */ lui $a1, 0xfe36 -/* DF1E84 80242FE4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DF1E88 80242FE8 08090CCD */ j .L80243334 -/* DF1E8C 80242FEC 0000302D */ daddu $a2, $zero, $zero -.L80242FF0: -/* DF1E90 80242FF0 86240008 */ lh $a0, 8($s1) -/* DF1E94 80242FF4 0C00FB5A */ jal get_enemy_safe -/* DF1E98 80242FF8 00000000 */ nop -/* DF1E9C 80242FFC 14400005 */ bnez $v0, .L80243014 -/* DF1EA0 80243000 0260202D */ daddu $a0, $s3, $zero -/* DF1EA4 80243004 3C05FE36 */ lui $a1, 0xfe36 -/* DF1EA8 80243008 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DF1EAC 8024300C 08090CCD */ j .L80243334 -/* DF1EB0 80243010 0000302D */ daddu $a2, $zero, $zero -.L80243014: -/* DF1EB4 80243014 86240008 */ lh $a0, 8($s1) -/* DF1EB8 80243018 0C00EABB */ jal get_npc_unsafe -/* DF1EBC 8024301C 00000000 */ nop -/* DF1EC0 80243020 8E630070 */ lw $v1, 0x70($s3) -/* DF1EC4 80243024 10600006 */ beqz $v1, .L80243040 -/* DF1EC8 80243028 0040802D */ daddu $s0, $v0, $zero -/* DF1ECC 8024302C 24020001 */ addiu $v0, $zero, 1 -/* DF1ED0 80243030 1062003F */ beq $v1, $v0, .L80243130 -/* DF1ED4 80243034 0000102D */ daddu $v0, $zero, $zero -/* DF1ED8 80243038 08090CDD */ j .L80243374 -/* DF1EDC 8024303C 00000000 */ nop -.L80243040: -/* DF1EE0 80243040 AFA00010 */ sw $zero, 0x10($sp) -/* DF1EE4 80243044 AFA00014 */ sw $zero, 0x14($sp) -/* DF1EE8 80243048 8E050038 */ lw $a1, 0x38($s0) -/* DF1EEC 8024304C 8E06003C */ lw $a2, 0x3c($s0) -/* DF1EF0 80243050 8E070040 */ lw $a3, 0x40($s0) -/* DF1EF4 80243054 0C01BECC */ jal fx_walk_normal -/* DF1EF8 80243058 24040002 */ addiu $a0, $zero, 2 -/* DF1EFC 8024305C C64C006C */ lwc1 $f12, 0x6c($s2) -/* DF1F00 80243060 0C00A6C9 */ jal clamp_angle -/* DF1F04 80243064 00000000 */ nop -/* DF1F08 80243068 3C018024 */ lui $at, 0x8024 -/* DF1F0C 8024306C D43879B8 */ ldc1 $f24, 0x79b8($at) -/* DF1F10 80243070 46000521 */ cvt.d.s $f20, $f0 -/* DF1F14 80243074 4638A300 */ add.d $f12, $f20, $f24 -/* DF1F18 80243078 3C018024 */ lui $at, 0x8024 -/* DF1F1C 8024307C D43679C0 */ ldc1 $f22, 0x79c0($at) -/* DF1F20 80243080 0C00A6C9 */ jal clamp_angle -/* DF1F24 80243084 46206320 */ cvt.s.d $f12, $f12 -/* DF1F28 80243088 4636A500 */ add.d $f20, $f20, $f22 -/* DF1F2C 8024308C 4620A320 */ cvt.s.d $f12, $f20 -/* DF1F30 80243090 0C00A6C9 */ jal clamp_angle -/* DF1F34 80243094 46000506 */ mov.s $f20, $f0 -/* DF1F38 80243098 4600A521 */ cvt.d.s $f20, $f20 -/* DF1F3C 8024309C 4636A500 */ add.d $f20, $f20, $f22 -/* DF1F40 802430A0 46000586 */ mov.s $f22, $f0 -/* DF1F44 802430A4 0C00A6C9 */ jal clamp_angle -/* DF1F48 802430A8 4620A320 */ cvt.s.d $f12, $f20 -/* DF1F4C 802430AC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF1F50 802430B0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF1F54 802430B4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* DF1F58 802430B8 C44E0084 */ lwc1 $f14, 0x84($v0) -/* DF1F5C 802430BC 0C00A70A */ jal get_clamped_angle_diff -/* DF1F60 802430C0 46000506 */ mov.s $f20, $f0 -/* DF1F64 802430C4 0C00A6C9 */ jal clamp_angle -/* DF1F68 802430C8 46000306 */ mov.s $f12, $f0 -/* DF1F6C 802430CC 46000021 */ cvt.d.s $f0, $f0 -/* DF1F70 802430D0 4638003C */ c.lt.d $f0, $f24 -/* DF1F74 802430D4 00000000 */ nop -/* DF1F78 802430D8 45020002 */ bc1fl .L802430E4 -/* DF1F7C 802430DC E614000C */ swc1 $f20, 0xc($s0) -/* DF1F80 802430E0 E616000C */ swc1 $f22, 0xc($s0) -.L802430E4: -/* DF1F84 802430E4 C6000018 */ lwc1 $f0, 0x18($s0) -/* DF1F88 802430E8 3C018024 */ lui $at, 0x8024 -/* DF1F8C 802430EC D42279C8 */ ldc1 $f2, 0x79c8($at) -/* DF1F90 802430F0 46000021 */ cvt.d.s $f0, $f0 -/* DF1F94 802430F4 46220002 */ mul.d $f0, $f0, $f2 -/* DF1F98 802430F8 00000000 */ nop -/* DF1F9C 802430FC 3C013F66 */ lui $at, 0x3f66 -/* DF1FA0 80243100 34216666 */ ori $at, $at, 0x6666 -/* DF1FA4 80243104 44812000 */ mtc1 $at, $f4 -/* DF1FA8 80243108 2402001E */ addiu $v0, $zero, 0x1e -/* DF1FAC 8024310C A602008E */ sh $v0, 0x8e($s0) -/* DF1FB0 80243110 3C014120 */ lui $at, 0x4120 -/* DF1FB4 80243114 44811000 */ mtc1 $at, $f2 -/* DF1FB8 80243118 24020001 */ addiu $v0, $zero, 1 -/* DF1FBC 8024311C E6040014 */ swc1 $f4, 0x14($s0) -/* DF1FC0 80243120 E602001C */ swc1 $f2, 0x1c($s0) -/* DF1FC4 80243124 46200020 */ cvt.s.d $f0, $f0 -/* DF1FC8 80243128 E6000018 */ swc1 $f0, 0x18($s0) -/* DF1FCC 8024312C AE620070 */ sw $v0, 0x70($s3) -.L80243130: -/* DF1FD0 80243130 C6000038 */ lwc1 $f0, 0x38($s0) -/* DF1FD4 80243134 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF1FD8 80243138 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF1FDC 8024313C C6060018 */ lwc1 $f6, 0x18($s0) -/* DF1FE0 80243140 0000202D */ daddu $a0, $zero, $zero -/* DF1FE4 80243144 E7A00020 */ swc1 $f0, 0x20($sp) -/* DF1FE8 80243148 E7A20024 */ swc1 $f2, 0x24($sp) -/* DF1FEC 8024314C E7A40028 */ swc1 $f4, 0x28($sp) -/* DF1FF0 80243150 E7A60010 */ swc1 $f6, 0x10($sp) -/* DF1FF4 80243154 C600000C */ lwc1 $f0, 0xc($s0) -/* DF1FF8 80243158 27A50020 */ addiu $a1, $sp, 0x20 -/* DF1FFC 8024315C E7A00014 */ swc1 $f0, 0x14($sp) -/* DF2000 80243160 860200A6 */ lh $v0, 0xa6($s0) -/* DF2004 80243164 27A60024 */ addiu $a2, $sp, 0x24 -/* DF2008 80243168 44820000 */ mtc1 $v0, $f0 -/* DF200C 8024316C 00000000 */ nop -/* DF2010 80243170 46800020 */ cvt.s.w $f0, $f0 -/* DF2014 80243174 E7A00018 */ swc1 $f0, 0x18($sp) -/* DF2018 80243178 860200A8 */ lh $v0, 0xa8($s0) -/* DF201C 8024317C 27A70028 */ addiu $a3, $sp, 0x28 -/* DF2020 80243180 44820000 */ mtc1 $v0, $f0 -/* DF2024 80243184 00000000 */ nop -/* DF2028 80243188 46800020 */ cvt.s.w $f0, $f0 -/* DF202C 8024318C 0C037711 */ jal func_800DDC44 -/* DF2030 80243190 E7A0001C */ swc1 $f0, 0x1c($sp) -/* DF2034 80243194 54400007 */ bnel $v0, $zero, .L802431B4 -/* DF2038 80243198 24140001 */ addiu $s4, $zero, 1 -/* DF203C 8024319C 8E050018 */ lw $a1, 0x18($s0) -/* DF2040 802431A0 8E06000C */ lw $a2, 0xc($s0) -/* DF2044 802431A4 0C00EA95 */ jal npc_move_heading -/* DF2048 802431A8 0200202D */ daddu $a0, $s0, $zero -/* DF204C 802431AC 08090C6E */ j .L802431B8 -/* DF2050 802431B0 0000902D */ daddu $s2, $zero, $zero -.L802431B4: -/* DF2054 802431B4 0000902D */ daddu $s2, $zero, $zero -.L802431B8: -/* DF2058 802431B8 C600001C */ lwc1 $f0, 0x1c($s0) -/* DF205C 802431BC 44801000 */ mtc1 $zero, $f2 -/* DF2060 802431C0 44801800 */ mtc1 $zero, $f3 -/* DF2064 802431C4 46000021 */ cvt.d.s $f0, $f0 -/* DF2068 802431C8 4622003C */ c.lt.d $f0, $f2 -/* DF206C 802431CC 00000000 */ nop -/* DF2070 802431D0 45000028 */ bc1f .L80243274 -/* DF2074 802431D4 27A50020 */ addiu $a1, $sp, 0x20 -/* DF2078 802431D8 27A60024 */ addiu $a2, $sp, 0x24 -/* DF207C 802431DC 27A2002C */ addiu $v0, $sp, 0x2c -/* DF2080 802431E0 C602003C */ lwc1 $f2, 0x3c($s0) -/* DF2084 802431E4 C6060038 */ lwc1 $f6, 0x38($s0) -/* DF2088 802431E8 3C01402A */ lui $at, 0x402a -/* DF208C 802431EC 4481A800 */ mtc1 $at, $f21 -/* DF2090 802431F0 4480A000 */ mtc1 $zero, $f20 -/* DF2094 802431F4 460010A1 */ cvt.d.s $f2, $f2 -/* DF2098 802431F8 46341080 */ add.d $f2, $f2, $f20 -/* DF209C 802431FC C600001C */ lwc1 $f0, 0x1c($s0) -/* DF20A0 80243200 C6040040 */ lwc1 $f4, 0x40($s0) -/* DF20A4 80243204 46000005 */ abs.s $f0, $f0 -/* DF20A8 80243208 E7A40028 */ swc1 $f4, 0x28($sp) -/* DF20AC 8024320C 3C014030 */ lui $at, 0x4030 -/* DF20B0 80243210 44812800 */ mtc1 $at, $f5 -/* DF20B4 80243214 44802000 */ mtc1 $zero, $f4 -/* DF20B8 80243218 46000021 */ cvt.d.s $f0, $f0 -/* DF20BC 8024321C E7A60020 */ swc1 $f6, 0x20($sp) -/* DF20C0 80243220 46240000 */ add.d $f0, $f0, $f4 -/* DF20C4 80243224 462010A0 */ cvt.s.d $f2, $f2 -/* DF20C8 80243228 E7A20024 */ swc1 $f2, 0x24($sp) -/* DF20CC 8024322C 46200020 */ cvt.s.d $f0, $f0 -/* DF20D0 80243230 E7A0002C */ swc1 $f0, 0x2c($sp) -/* DF20D4 80243234 AFA20010 */ sw $v0, 0x10($sp) -/* DF20D8 80243238 8E040080 */ lw $a0, 0x80($s0) -/* DF20DC 8024323C 0C0372DF */ jal func_800DCB7C -/* DF20E0 80243240 27A70028 */ addiu $a3, $sp, 0x28 -/* DF20E4 80243244 1040000B */ beqz $v0, .L80243274 -/* DF20E8 80243248 00000000 */ nop -/* DF20EC 8024324C C600001C */ lwc1 $f0, 0x1c($s0) -/* DF20F0 80243250 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* DF20F4 80243254 46000005 */ abs.s $f0, $f0 -/* DF20F8 80243258 46000021 */ cvt.d.s $f0, $f0 -/* DF20FC 8024325C 46340000 */ add.d $f0, $f0, $f20 -/* DF2100 80243260 460010A1 */ cvt.d.s $f2, $f2 -/* DF2104 80243264 4620103E */ c.le.d $f2, $f0 -/* DF2108 80243268 00000000 */ nop -/* DF210C 8024326C 45030001 */ bc1tl .L80243274 -/* DF2110 80243270 24120001 */ addiu $s2, $zero, 1 -.L80243274: -/* DF2114 80243274 56400008 */ bnel $s2, $zero, .L80243298 -/* DF2118 80243278 2414000A */ addiu $s4, $zero, 0xa -/* DF211C 8024327C C604003C */ lwc1 $f4, 0x3c($s0) -/* DF2120 80243280 C600001C */ lwc1 $f0, 0x1c($s0) -/* DF2124 80243284 46002100 */ add.s $f4, $f4, $f0 -/* DF2128 80243288 C6020014 */ lwc1 $f2, 0x14($s0) -/* DF212C 8024328C 46020001 */ sub.s $f0, $f0, $f2 -/* DF2130 80243290 E604003C */ swc1 $f4, 0x3c($s0) -/* DF2134 80243294 E600001C */ swc1 $f0, 0x1c($s0) -.L80243298: -/* DF2138 80243298 9602008E */ lhu $v0, 0x8e($s0) -/* DF213C 8024329C 2442FFFF */ addiu $v0, $v0, -1 -/* DF2140 802432A0 A602008E */ sh $v0, 0x8e($s0) -/* DF2144 802432A4 00021400 */ sll $v0, $v0, 0x10 -/* DF2148 802432A8 58400001 */ blezl $v0, .L802432B0 -/* DF214C 802432AC 2414000B */ addiu $s4, $zero, 0xb -.L802432B0: -/* DF2150 802432B0 12800024 */ beqz $s4, .L80243344 -/* DF2154 802432B4 00000000 */ nop -/* DF2158 802432B8 AFA00010 */ sw $zero, 0x10($sp) -/* DF215C 802432BC AFA00014 */ sw $zero, 0x14($sp) -/* DF2160 802432C0 8E050038 */ lw $a1, 0x38($s0) -/* DF2164 802432C4 8E06003C */ lw $a2, 0x3c($s0) -/* DF2168 802432C8 8E070040 */ lw $a3, 0x40($s0) -/* DF216C 802432CC 0C01BECC */ jal fx_walk_normal -/* DF2170 802432D0 24040002 */ addiu $a0, $zero, 2 -/* DF2174 802432D4 3C01C47A */ lui $at, 0xc47a -/* DF2178 802432D8 44810000 */ mtc1 $at, $f0 -/* DF217C 802432DC AE20006C */ sw $zero, 0x6c($s1) -/* DF2180 802432E0 8E020000 */ lw $v0, ($s0) -/* DF2184 802432E4 0200202D */ daddu $a0, $s0, $zero -/* DF2188 802432E8 AE000038 */ sw $zero, 0x38($s0) -/* DF218C 802432EC AE000040 */ sw $zero, 0x40($s0) -/* DF2190 802432F0 34420002 */ ori $v0, $v0, 2 -/* DF2194 802432F4 E600003C */ swc1 $f0, 0x3c($s0) -/* DF2198 802432F8 0C00EAFF */ jal disable_npc_shadow -/* DF219C 802432FC AE020000 */ sw $v0, ($s0) -/* DF21A0 80243300 0260202D */ daddu $a0, $s3, $zero -/* DF21A4 80243304 3C05FE36 */ lui $a1, 0xfe36 -/* DF21A8 80243308 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DF21AC 8024330C 24060001 */ addiu $a2, $zero, 1 -/* DF21B0 80243310 8E020000 */ lw $v0, ($s0) -/* DF21B4 80243314 2403F7FF */ addiu $v1, $zero, -0x801 -/* DF21B8 80243318 00431024 */ and $v0, $v0, $v1 -/* DF21BC 8024331C AE020000 */ sw $v0, ($s0) -/* DF21C0 80243320 8E220000 */ lw $v0, ($s1) -/* DF21C4 80243324 3C031F00 */ lui $v1, 0x1f00 -/* DF21C8 80243328 00431025 */ or $v0, $v0, $v1 -/* DF21CC 8024332C AE220000 */ sw $v0, ($s1) -/* DF21D0 80243330 AC800070 */ sw $zero, 0x70($a0) -.L80243334: -/* DF21D4 80243334 0C0B2026 */ jal set_variable -/* DF21D8 80243338 00000000 */ nop -/* DF21DC 8024333C 08090CDD */ j .L80243374 -/* DF21E0 80243340 24020002 */ addiu $v0, $zero, 2 -.L80243344: -/* DF21E4 80243344 8E220070 */ lw $v0, 0x70($s1) -/* DF21E8 80243348 30420001 */ andi $v0, $v0, 1 -/* DF21EC 8024334C 10400009 */ beqz $v0, .L80243374 -/* DF21F0 80243350 0000102D */ daddu $v0, $zero, $zero -/* DF21F4 80243354 C600004C */ lwc1 $f0, 0x4c($s0) -/* DF21F8 80243358 3C01404E */ lui $at, 0x404e -/* DF21FC 8024335C 44811800 */ mtc1 $at, $f3 -/* DF2200 80243360 44801000 */ mtc1 $zero, $f2 -/* DF2204 80243364 46000021 */ cvt.d.s $f0, $f0 -/* DF2208 80243368 46220000 */ add.d $f0, $f0, $f2 -/* DF220C 8024336C 46200020 */ cvt.s.d $f0, $f0 -/* DF2210 80243370 E600004C */ swc1 $f0, 0x4c($s0) -.L80243374: -/* DF2214 80243374 8FBF0044 */ lw $ra, 0x44($sp) -/* DF2218 80243378 8FB40040 */ lw $s4, 0x40($sp) -/* DF221C 8024337C 8FB3003C */ lw $s3, 0x3c($sp) -/* DF2220 80243380 8FB20038 */ lw $s2, 0x38($sp) -/* DF2224 80243384 8FB10034 */ lw $s1, 0x34($sp) -/* DF2228 80243388 8FB00030 */ lw $s0, 0x30($sp) -/* DF222C 8024338C D7B80058 */ ldc1 $f24, 0x58($sp) -/* DF2230 80243390 D7B60050 */ ldc1 $f22, 0x50($sp) -/* DF2234 80243394 D7B40048 */ ldc1 $f20, 0x48($sp) -/* DF2238 80243398 03E00008 */ jr $ra -/* DF223C 8024339C 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s new file mode 100644 index 0000000000..8a7d74c883 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_80242F44_DF1DE4.s @@ -0,0 +1,298 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242F44_DF1DE4 +/* DF1DE4 80242F44 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* DF1DE8 80242F48 AFB3003C */ sw $s3, 0x3c($sp) +/* DF1DEC 80242F4C 0080982D */ daddu $s3, $a0, $zero +/* DF1DF0 80242F50 AFB40040 */ sw $s4, 0x40($sp) +/* DF1DF4 80242F54 0000A02D */ daddu $s4, $zero, $zero +/* DF1DF8 80242F58 3C03800A */ lui $v1, 0x800a +/* DF1DFC 80242F5C 8463A634 */ lh $v1, -0x59cc($v1) +/* DF1E00 80242F60 3C04800B */ lui $a0, %hi(gCameras) +/* DF1E04 80242F64 24841D80 */ addiu $a0, $a0, %lo(gCameras) +/* DF1E08 80242F68 AFBF0044 */ sw $ra, 0x44($sp) +/* DF1E0C 80242F6C AFB20038 */ sw $s2, 0x38($sp) +/* DF1E10 80242F70 AFB10034 */ sw $s1, 0x34($sp) +/* DF1E14 80242F74 AFB00030 */ sw $s0, 0x30($sp) +/* DF1E18 80242F78 F7B80058 */ sdc1 $f24, 0x58($sp) +/* DF1E1C 80242F7C F7B60050 */ sdc1 $f22, 0x50($sp) +/* DF1E20 80242F80 F7B40048 */ sdc1 $f20, 0x48($sp) +/* DF1E24 80242F84 8E710148 */ lw $s1, 0x148($s3) +/* DF1E28 80242F88 00031080 */ sll $v0, $v1, 2 +/* DF1E2C 80242F8C 00431021 */ addu $v0, $v0, $v1 +/* DF1E30 80242F90 00021080 */ sll $v0, $v0, 2 +/* DF1E34 80242F94 00431023 */ subu $v0, $v0, $v1 +/* DF1E38 80242F98 000218C0 */ sll $v1, $v0, 3 +/* DF1E3C 80242F9C 00431021 */ addu $v0, $v0, $v1 +/* DF1E40 80242FA0 000210C0 */ sll $v0, $v0, 3 +/* DF1E44 80242FA4 10A00002 */ beqz $a1, .L80242FB0 +/* DF1E48 80242FA8 00449021 */ addu $s2, $v0, $a0 +/* DF1E4C 80242FAC AE600070 */ sw $zero, 0x70($s3) +.L80242FB0: +/* DF1E50 80242FB0 0C00FB5A */ jal get_enemy_safe +/* DF1E54 80242FB4 86240008 */ lh $a0, 8($s1) +/* DF1E58 80242FB8 14400006 */ bnez $v0, .L80242FD4 +/* DF1E5C 80242FBC 24020005 */ addiu $v0, $zero, 5 +/* DF1E60 80242FC0 0260202D */ daddu $a0, $s3, $zero +/* DF1E64 80242FC4 3C05FE36 */ lui $a1, 0xfe36 +/* DF1E68 80242FC8 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DF1E6C 80242FCC 08090CCD */ j .L80243334 +/* DF1E70 80242FD0 0000302D */ daddu $a2, $zero, $zero +.L80242FD4: +/* DF1E74 80242FD4 8E23006C */ lw $v1, 0x6c($s1) +/* DF1E78 80242FD8 14620005 */ bne $v1, $v0, .L80242FF0 +/* DF1E7C 80242FDC 0260202D */ daddu $a0, $s3, $zero +/* DF1E80 80242FE0 3C05FE36 */ lui $a1, 0xfe36 +/* DF1E84 80242FE4 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DF1E88 80242FE8 08090CCD */ j .L80243334 +/* DF1E8C 80242FEC 0000302D */ daddu $a2, $zero, $zero +.L80242FF0: +/* DF1E90 80242FF0 86240008 */ lh $a0, 8($s1) +/* DF1E94 80242FF4 0C00FB5A */ jal get_enemy_safe +/* DF1E98 80242FF8 00000000 */ nop +/* DF1E9C 80242FFC 14400005 */ bnez $v0, .L80243014 +/* DF1EA0 80243000 0260202D */ daddu $a0, $s3, $zero +/* DF1EA4 80243004 3C05FE36 */ lui $a1, 0xfe36 +/* DF1EA8 80243008 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DF1EAC 8024300C 08090CCD */ j .L80243334 +/* DF1EB0 80243010 0000302D */ daddu $a2, $zero, $zero +.L80243014: +/* DF1EB4 80243014 86240008 */ lh $a0, 8($s1) +/* DF1EB8 80243018 0C00EABB */ jal get_npc_unsafe +/* DF1EBC 8024301C 00000000 */ nop +/* DF1EC0 80243020 8E630070 */ lw $v1, 0x70($s3) +/* DF1EC4 80243024 10600006 */ beqz $v1, .L80243040 +/* DF1EC8 80243028 0040802D */ daddu $s0, $v0, $zero +/* DF1ECC 8024302C 24020001 */ addiu $v0, $zero, 1 +/* DF1ED0 80243030 1062003F */ beq $v1, $v0, .L80243130 +/* DF1ED4 80243034 0000102D */ daddu $v0, $zero, $zero +/* DF1ED8 80243038 08090CDD */ j .L80243374 +/* DF1EDC 8024303C 00000000 */ nop +.L80243040: +/* DF1EE0 80243040 AFA00010 */ sw $zero, 0x10($sp) +/* DF1EE4 80243044 AFA00014 */ sw $zero, 0x14($sp) +/* DF1EE8 80243048 8E050038 */ lw $a1, 0x38($s0) +/* DF1EEC 8024304C 8E06003C */ lw $a2, 0x3c($s0) +/* DF1EF0 80243050 8E070040 */ lw $a3, 0x40($s0) +/* DF1EF4 80243054 0C01BECC */ jal fx_walk_normal +/* DF1EF8 80243058 24040002 */ addiu $a0, $zero, 2 +/* DF1EFC 8024305C C64C006C */ lwc1 $f12, 0x6c($s2) +/* DF1F00 80243060 0C00A6C9 */ jal clamp_angle +/* DF1F04 80243064 00000000 */ nop +/* DF1F08 80243068 3C018024 */ lui $at, 0x8024 +/* DF1F0C 8024306C D43879B8 */ ldc1 $f24, 0x79b8($at) +/* DF1F10 80243070 46000521 */ cvt.d.s $f20, $f0 +/* DF1F14 80243074 4638A300 */ add.d $f12, $f20, $f24 +/* DF1F18 80243078 3C018024 */ lui $at, 0x8024 +/* DF1F1C 8024307C D43679C0 */ ldc1 $f22, 0x79c0($at) +/* DF1F20 80243080 0C00A6C9 */ jal clamp_angle +/* DF1F24 80243084 46206320 */ cvt.s.d $f12, $f12 +/* DF1F28 80243088 4636A500 */ add.d $f20, $f20, $f22 +/* DF1F2C 8024308C 4620A320 */ cvt.s.d $f12, $f20 +/* DF1F30 80243090 0C00A6C9 */ jal clamp_angle +/* DF1F34 80243094 46000506 */ mov.s $f20, $f0 +/* DF1F38 80243098 4600A521 */ cvt.d.s $f20, $f20 +/* DF1F3C 8024309C 4636A500 */ add.d $f20, $f20, $f22 +/* DF1F40 802430A0 46000586 */ mov.s $f22, $f0 +/* DF1F44 802430A4 0C00A6C9 */ jal clamp_angle +/* DF1F48 802430A8 4620A320 */ cvt.s.d $f12, $f20 +/* DF1F4C 802430AC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DF1F50 802430B0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DF1F54 802430B4 C64C006C */ lwc1 $f12, 0x6c($s2) +/* DF1F58 802430B8 C44E0084 */ lwc1 $f14, 0x84($v0) +/* DF1F5C 802430BC 0C00A70A */ jal get_clamped_angle_diff +/* DF1F60 802430C0 46000506 */ mov.s $f20, $f0 +/* DF1F64 802430C4 0C00A6C9 */ jal clamp_angle +/* DF1F68 802430C8 46000306 */ mov.s $f12, $f0 +/* DF1F6C 802430CC 46000021 */ cvt.d.s $f0, $f0 +/* DF1F70 802430D0 4638003C */ c.lt.d $f0, $f24 +/* DF1F74 802430D4 00000000 */ nop +/* DF1F78 802430D8 45020002 */ bc1fl .L802430E4 +/* DF1F7C 802430DC E614000C */ swc1 $f20, 0xc($s0) +/* DF1F80 802430E0 E616000C */ swc1 $f22, 0xc($s0) +.L802430E4: +/* DF1F84 802430E4 C6000018 */ lwc1 $f0, 0x18($s0) +/* DF1F88 802430E8 3C018024 */ lui $at, 0x8024 +/* DF1F8C 802430EC D42279C8 */ ldc1 $f2, 0x79c8($at) +/* DF1F90 802430F0 46000021 */ cvt.d.s $f0, $f0 +/* DF1F94 802430F4 46220002 */ mul.d $f0, $f0, $f2 +/* DF1F98 802430F8 00000000 */ nop +/* DF1F9C 802430FC 3C013F66 */ lui $at, 0x3f66 +/* DF1FA0 80243100 34216666 */ ori $at, $at, 0x6666 +/* DF1FA4 80243104 44812000 */ mtc1 $at, $f4 +/* DF1FA8 80243108 2402001E */ addiu $v0, $zero, 0x1e +/* DF1FAC 8024310C A602008E */ sh $v0, 0x8e($s0) +/* DF1FB0 80243110 3C014120 */ lui $at, 0x4120 +/* DF1FB4 80243114 44811000 */ mtc1 $at, $f2 +/* DF1FB8 80243118 24020001 */ addiu $v0, $zero, 1 +/* DF1FBC 8024311C E6040014 */ swc1 $f4, 0x14($s0) +/* DF1FC0 80243120 E602001C */ swc1 $f2, 0x1c($s0) +/* DF1FC4 80243124 46200020 */ cvt.s.d $f0, $f0 +/* DF1FC8 80243128 E6000018 */ swc1 $f0, 0x18($s0) +/* DF1FCC 8024312C AE620070 */ sw $v0, 0x70($s3) +.L80243130: +/* DF1FD0 80243130 C6000038 */ lwc1 $f0, 0x38($s0) +/* DF1FD4 80243134 C602003C */ lwc1 $f2, 0x3c($s0) +/* DF1FD8 80243138 C6040040 */ lwc1 $f4, 0x40($s0) +/* DF1FDC 8024313C C6060018 */ lwc1 $f6, 0x18($s0) +/* DF1FE0 80243140 0000202D */ daddu $a0, $zero, $zero +/* DF1FE4 80243144 E7A00020 */ swc1 $f0, 0x20($sp) +/* DF1FE8 80243148 E7A20024 */ swc1 $f2, 0x24($sp) +/* DF1FEC 8024314C E7A40028 */ swc1 $f4, 0x28($sp) +/* DF1FF0 80243150 E7A60010 */ swc1 $f6, 0x10($sp) +/* DF1FF4 80243154 C600000C */ lwc1 $f0, 0xc($s0) +/* DF1FF8 80243158 27A50020 */ addiu $a1, $sp, 0x20 +/* DF1FFC 8024315C E7A00014 */ swc1 $f0, 0x14($sp) +/* DF2000 80243160 860200A6 */ lh $v0, 0xa6($s0) +/* DF2004 80243164 27A60024 */ addiu $a2, $sp, 0x24 +/* DF2008 80243168 44820000 */ mtc1 $v0, $f0 +/* DF200C 8024316C 00000000 */ nop +/* DF2010 80243170 46800020 */ cvt.s.w $f0, $f0 +/* DF2014 80243174 E7A00018 */ swc1 $f0, 0x18($sp) +/* DF2018 80243178 860200A8 */ lh $v0, 0xa8($s0) +/* DF201C 8024317C 27A70028 */ addiu $a3, $sp, 0x28 +/* DF2020 80243180 44820000 */ mtc1 $v0, $f0 +/* DF2024 80243184 00000000 */ nop +/* DF2028 80243188 46800020 */ cvt.s.w $f0, $f0 +/* DF202C 8024318C 0C037711 */ jal func_800DDC44 +/* DF2030 80243190 E7A0001C */ swc1 $f0, 0x1c($sp) +/* DF2034 80243194 54400007 */ bnel $v0, $zero, .L802431B4 +/* DF2038 80243198 24140001 */ addiu $s4, $zero, 1 +/* DF203C 8024319C 8E050018 */ lw $a1, 0x18($s0) +/* DF2040 802431A0 8E06000C */ lw $a2, 0xc($s0) +/* DF2044 802431A4 0C00EA95 */ jal npc_move_heading +/* DF2048 802431A8 0200202D */ daddu $a0, $s0, $zero +/* DF204C 802431AC 08090C6E */ j .L802431B8 +/* DF2050 802431B0 0000902D */ daddu $s2, $zero, $zero +.L802431B4: +/* DF2054 802431B4 0000902D */ daddu $s2, $zero, $zero +.L802431B8: +/* DF2058 802431B8 C600001C */ lwc1 $f0, 0x1c($s0) +/* DF205C 802431BC 44801000 */ mtc1 $zero, $f2 +/* DF2060 802431C0 44801800 */ mtc1 $zero, $f3 +/* DF2064 802431C4 46000021 */ cvt.d.s $f0, $f0 +/* DF2068 802431C8 4622003C */ c.lt.d $f0, $f2 +/* DF206C 802431CC 00000000 */ nop +/* DF2070 802431D0 45000028 */ bc1f .L80243274 +/* DF2074 802431D4 27A50020 */ addiu $a1, $sp, 0x20 +/* DF2078 802431D8 27A60024 */ addiu $a2, $sp, 0x24 +/* DF207C 802431DC 27A2002C */ addiu $v0, $sp, 0x2c +/* DF2080 802431E0 C602003C */ lwc1 $f2, 0x3c($s0) +/* DF2084 802431E4 C6060038 */ lwc1 $f6, 0x38($s0) +/* DF2088 802431E8 3C01402A */ lui $at, 0x402a +/* DF208C 802431EC 4481A800 */ mtc1 $at, $f21 +/* DF2090 802431F0 4480A000 */ mtc1 $zero, $f20 +/* DF2094 802431F4 460010A1 */ cvt.d.s $f2, $f2 +/* DF2098 802431F8 46341080 */ add.d $f2, $f2, $f20 +/* DF209C 802431FC C600001C */ lwc1 $f0, 0x1c($s0) +/* DF20A0 80243200 C6040040 */ lwc1 $f4, 0x40($s0) +/* DF20A4 80243204 46000005 */ abs.s $f0, $f0 +/* DF20A8 80243208 E7A40028 */ swc1 $f4, 0x28($sp) +/* DF20AC 8024320C 3C014030 */ lui $at, 0x4030 +/* DF20B0 80243210 44812800 */ mtc1 $at, $f5 +/* DF20B4 80243214 44802000 */ mtc1 $zero, $f4 +/* DF20B8 80243218 46000021 */ cvt.d.s $f0, $f0 +/* DF20BC 8024321C E7A60020 */ swc1 $f6, 0x20($sp) +/* DF20C0 80243220 46240000 */ add.d $f0, $f0, $f4 +/* DF20C4 80243224 462010A0 */ cvt.s.d $f2, $f2 +/* DF20C8 80243228 E7A20024 */ swc1 $f2, 0x24($sp) +/* DF20CC 8024322C 46200020 */ cvt.s.d $f0, $f0 +/* DF20D0 80243230 E7A0002C */ swc1 $f0, 0x2c($sp) +/* DF20D4 80243234 AFA20010 */ sw $v0, 0x10($sp) +/* DF20D8 80243238 8E040080 */ lw $a0, 0x80($s0) +/* DF20DC 8024323C 0C0372DF */ jal func_800DCB7C +/* DF20E0 80243240 27A70028 */ addiu $a3, $sp, 0x28 +/* DF20E4 80243244 1040000B */ beqz $v0, .L80243274 +/* DF20E8 80243248 00000000 */ nop +/* DF20EC 8024324C C600001C */ lwc1 $f0, 0x1c($s0) +/* DF20F0 80243250 C7A2002C */ lwc1 $f2, 0x2c($sp) +/* DF20F4 80243254 46000005 */ abs.s $f0, $f0 +/* DF20F8 80243258 46000021 */ cvt.d.s $f0, $f0 +/* DF20FC 8024325C 46340000 */ add.d $f0, $f0, $f20 +/* DF2100 80243260 460010A1 */ cvt.d.s $f2, $f2 +/* DF2104 80243264 4620103E */ c.le.d $f2, $f0 +/* DF2108 80243268 00000000 */ nop +/* DF210C 8024326C 45030001 */ bc1tl .L80243274 +/* DF2110 80243270 24120001 */ addiu $s2, $zero, 1 +.L80243274: +/* DF2114 80243274 56400008 */ bnel $s2, $zero, .L80243298 +/* DF2118 80243278 2414000A */ addiu $s4, $zero, 0xa +/* DF211C 8024327C C604003C */ lwc1 $f4, 0x3c($s0) +/* DF2120 80243280 C600001C */ lwc1 $f0, 0x1c($s0) +/* DF2124 80243284 46002100 */ add.s $f4, $f4, $f0 +/* DF2128 80243288 C6020014 */ lwc1 $f2, 0x14($s0) +/* DF212C 8024328C 46020001 */ sub.s $f0, $f0, $f2 +/* DF2130 80243290 E604003C */ swc1 $f4, 0x3c($s0) +/* DF2134 80243294 E600001C */ swc1 $f0, 0x1c($s0) +.L80243298: +/* DF2138 80243298 9602008E */ lhu $v0, 0x8e($s0) +/* DF213C 8024329C 2442FFFF */ addiu $v0, $v0, -1 +/* DF2140 802432A0 A602008E */ sh $v0, 0x8e($s0) +/* DF2144 802432A4 00021400 */ sll $v0, $v0, 0x10 +/* DF2148 802432A8 58400001 */ blezl $v0, .L802432B0 +/* DF214C 802432AC 2414000B */ addiu $s4, $zero, 0xb +.L802432B0: +/* DF2150 802432B0 12800024 */ beqz $s4, .L80243344 +/* DF2154 802432B4 00000000 */ nop +/* DF2158 802432B8 AFA00010 */ sw $zero, 0x10($sp) +/* DF215C 802432BC AFA00014 */ sw $zero, 0x14($sp) +/* DF2160 802432C0 8E050038 */ lw $a1, 0x38($s0) +/* DF2164 802432C4 8E06003C */ lw $a2, 0x3c($s0) +/* DF2168 802432C8 8E070040 */ lw $a3, 0x40($s0) +/* DF216C 802432CC 0C01BECC */ jal fx_walk_normal +/* DF2170 802432D0 24040002 */ addiu $a0, $zero, 2 +/* DF2174 802432D4 3C01C47A */ lui $at, 0xc47a +/* DF2178 802432D8 44810000 */ mtc1 $at, $f0 +/* DF217C 802432DC AE20006C */ sw $zero, 0x6c($s1) +/* DF2180 802432E0 8E020000 */ lw $v0, ($s0) +/* DF2184 802432E4 0200202D */ daddu $a0, $s0, $zero +/* DF2188 802432E8 AE000038 */ sw $zero, 0x38($s0) +/* DF218C 802432EC AE000040 */ sw $zero, 0x40($s0) +/* DF2190 802432F0 34420002 */ ori $v0, $v0, 2 +/* DF2194 802432F4 E600003C */ swc1 $f0, 0x3c($s0) +/* DF2198 802432F8 0C00EAFF */ jal disable_npc_shadow +/* DF219C 802432FC AE020000 */ sw $v0, ($s0) +/* DF21A0 80243300 0260202D */ daddu $a0, $s3, $zero +/* DF21A4 80243304 3C05FE36 */ lui $a1, 0xfe36 +/* DF21A8 80243308 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DF21AC 8024330C 24060001 */ addiu $a2, $zero, 1 +/* DF21B0 80243310 8E020000 */ lw $v0, ($s0) +/* DF21B4 80243314 2403F7FF */ addiu $v1, $zero, -0x801 +/* DF21B8 80243318 00431024 */ and $v0, $v0, $v1 +/* DF21BC 8024331C AE020000 */ sw $v0, ($s0) +/* DF21C0 80243320 8E220000 */ lw $v0, ($s1) +/* DF21C4 80243324 3C031F00 */ lui $v1, 0x1f00 +/* DF21C8 80243328 00431025 */ or $v0, $v0, $v1 +/* DF21CC 8024332C AE220000 */ sw $v0, ($s1) +/* DF21D0 80243330 AC800070 */ sw $zero, 0x70($a0) +.L80243334: +/* DF21D4 80243334 0C0B2026 */ jal set_variable +/* DF21D8 80243338 00000000 */ nop +/* DF21DC 8024333C 08090CDD */ j .L80243374 +/* DF21E0 80243340 24020002 */ addiu $v0, $zero, 2 +.L80243344: +/* DF21E4 80243344 8E220070 */ lw $v0, 0x70($s1) +/* DF21E8 80243348 30420001 */ andi $v0, $v0, 1 +/* DF21EC 8024334C 10400009 */ beqz $v0, .L80243374 +/* DF21F0 80243350 0000102D */ daddu $v0, $zero, $zero +/* DF21F4 80243354 C600004C */ lwc1 $f0, 0x4c($s0) +/* DF21F8 80243358 3C01404E */ lui $at, 0x404e +/* DF21FC 8024335C 44811800 */ mtc1 $at, $f3 +/* DF2200 80243360 44801000 */ mtc1 $zero, $f2 +/* DF2204 80243364 46000021 */ cvt.d.s $f0, $f0 +/* DF2208 80243368 46220000 */ add.d $f0, $f0, $f2 +/* DF220C 8024336C 46200020 */ cvt.s.d $f0, $f0 +/* DF2210 80243370 E600004C */ swc1 $f0, 0x4c($s0) +.L80243374: +/* DF2214 80243374 8FBF0044 */ lw $ra, 0x44($sp) +/* DF2218 80243378 8FB40040 */ lw $s4, 0x40($sp) +/* DF221C 8024337C 8FB3003C */ lw $s3, 0x3c($sp) +/* DF2220 80243380 8FB20038 */ lw $s2, 0x38($sp) +/* DF2224 80243384 8FB10034 */ lw $s1, 0x34($sp) +/* DF2228 80243388 8FB00030 */ lw $s0, 0x30($sp) +/* DF222C 8024338C D7B80058 */ ldc1 $f24, 0x58($sp) +/* DF2230 80243390 D7B60050 */ ldc1 $f22, 0x50($sp) +/* DF2234 80243394 D7B40048 */ ldc1 $f20, 0x48($sp) +/* DF2238 80243398 03E00008 */ jr $ra +/* DF223C 8024339C 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0.s deleted file mode 100644 index e3254dba0b..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0.s +++ /dev/null @@ -1,213 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433A0 -/* DF2240 802433A0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* DF2244 802433A4 AFB3003C */ sw $s3, 0x3c($sp) -/* DF2248 802433A8 0080982D */ daddu $s3, $a0, $zero -/* DF224C 802433AC AFBF0048 */ sw $ra, 0x48($sp) -/* DF2250 802433B0 AFB50044 */ sw $s5, 0x44($sp) -/* DF2254 802433B4 AFB40040 */ sw $s4, 0x40($sp) -/* DF2258 802433B8 AFB20038 */ sw $s2, 0x38($sp) -/* DF225C 802433BC AFB10034 */ sw $s1, 0x34($sp) -/* DF2260 802433C0 AFB00030 */ sw $s0, 0x30($sp) -/* DF2264 802433C4 8E720148 */ lw $s2, 0x148($s3) -/* DF2268 802433C8 86440008 */ lh $a0, 8($s2) -/* DF226C 802433CC 8E70000C */ lw $s0, 0xc($s3) -/* DF2270 802433D0 0C00EABB */ jal get_npc_unsafe -/* DF2274 802433D4 00A0882D */ daddu $s1, $a1, $zero -/* DF2278 802433D8 0260202D */ daddu $a0, $s3, $zero -/* DF227C 802433DC 8E050000 */ lw $a1, ($s0) -/* DF2280 802433E0 0C0B1EAF */ jal get_variable -/* DF2284 802433E4 0040A02D */ daddu $s4, $v0, $zero -/* DF2288 802433E8 AFA00010 */ sw $zero, 0x10($sp) -/* DF228C 802433EC 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF2290 802433F0 8C630030 */ lw $v1, 0x30($v1) -/* DF2294 802433F4 AFA30014 */ sw $v1, 0x14($sp) -/* DF2298 802433F8 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF229C 802433FC 8C63001C */ lw $v1, 0x1c($v1) -/* DF22A0 80243400 AFA30018 */ sw $v1, 0x18($sp) -/* DF22A4 80243404 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF22A8 80243408 8C630024 */ lw $v1, 0x24($v1) -/* DF22AC 8024340C AFA3001C */ sw $v1, 0x1c($sp) -/* DF22B0 80243410 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF22B4 80243414 8C630028 */ lw $v1, 0x28($v1) -/* DF22B8 80243418 27B50010 */ addiu $s5, $sp, 0x10 -/* DF22BC 8024341C AFA30020 */ sw $v1, 0x20($sp) -/* DF22C0 80243420 8E4300D0 */ lw $v1, 0xd0($s2) -/* DF22C4 80243424 3C014220 */ lui $at, 0x4220 -/* DF22C8 80243428 44810000 */ mtc1 $at, $f0 -/* DF22CC 8024342C 8C63002C */ lw $v1, 0x2c($v1) -/* DF22D0 80243430 0040802D */ daddu $s0, $v0, $zero -/* DF22D4 80243434 E7A00028 */ swc1 $f0, 0x28($sp) -/* DF22D8 80243438 A7A0002C */ sh $zero, 0x2c($sp) -/* DF22DC 8024343C 16200005 */ bnez $s1, .L80243454 -/* DF22E0 80243440 AFA30024 */ sw $v1, 0x24($sp) -/* DF22E4 80243444 8E4200B0 */ lw $v0, 0xb0($s2) -/* DF22E8 80243448 30420004 */ andi $v0, $v0, 4 -/* DF22EC 8024344C 1040002F */ beqz $v0, .L8024350C -/* DF22F0 80243450 00000000 */ nop -.L80243454: -/* DF22F4 80243454 2404F7FF */ addiu $a0, $zero, -0x801 -/* DF22F8 80243458 AE600070 */ sw $zero, 0x70($s3) -/* DF22FC 8024345C A680008E */ sh $zero, 0x8e($s4) -/* DF2300 80243460 8E4200CC */ lw $v0, 0xcc($s2) -/* DF2304 80243464 8E830000 */ lw $v1, ($s4) -/* DF2308 80243468 8C420000 */ lw $v0, ($v0) -/* DF230C 8024346C 00641824 */ and $v1, $v1, $a0 -/* DF2310 80243470 AE830000 */ sw $v1, ($s4) -/* DF2314 80243474 AE820028 */ sw $v0, 0x28($s4) -/* DF2318 80243478 8E4200D0 */ lw $v0, 0xd0($s2) -/* DF231C 8024347C 8C420034 */ lw $v0, 0x34($v0) -/* DF2320 80243480 54400005 */ bnel $v0, $zero, .L80243498 -/* DF2324 80243484 2402FDFF */ addiu $v0, $zero, -0x201 -/* DF2328 80243488 34620200 */ ori $v0, $v1, 0x200 -/* DF232C 8024348C 2403FFF7 */ addiu $v1, $zero, -9 -/* DF2330 80243490 08090D28 */ j .L802434A0 -/* DF2334 80243494 00431024 */ and $v0, $v0, $v1 -.L80243498: -/* DF2338 80243498 00621024 */ and $v0, $v1, $v0 -/* DF233C 8024349C 34420008 */ ori $v0, $v0, 8 -.L802434A0: -/* DF2340 802434A0 AE820000 */ sw $v0, ($s4) -/* DF2344 802434A4 8E4200B0 */ lw $v0, 0xb0($s2) -/* DF2348 802434A8 30420004 */ andi $v0, $v0, 4 -/* DF234C 802434AC 10400008 */ beqz $v0, .L802434D0 -/* DF2350 802434B0 24020063 */ addiu $v0, $zero, 0x63 -/* DF2354 802434B4 AE620070 */ sw $v0, 0x70($s3) -/* DF2358 802434B8 AE600074 */ sw $zero, 0x74($s3) -/* DF235C 802434BC 8E4200B0 */ lw $v0, 0xb0($s2) -/* DF2360 802434C0 2403FFFB */ addiu $v1, $zero, -5 -/* DF2364 802434C4 00431024 */ and $v0, $v0, $v1 -/* DF2368 802434C8 08090D3A */ j .L802434E8 -/* DF236C 802434CC AE4200B0 */ sw $v0, 0xb0($s2) -.L802434D0: -/* DF2370 802434D0 8E420000 */ lw $v0, ($s2) -/* DF2374 802434D4 3C034000 */ lui $v1, 0x4000 -/* DF2378 802434D8 00431024 */ and $v0, $v0, $v1 -/* DF237C 802434DC 10400002 */ beqz $v0, .L802434E8 -/* DF2380 802434E0 2402000C */ addiu $v0, $zero, 0xc -/* DF2384 802434E4 AE620070 */ sw $v0, 0x70($s3) -.L802434E8: -/* DF2388 802434E8 3C05BFFF */ lui $a1, 0xbfff -/* DF238C 802434EC 34A5FFFF */ ori $a1, $a1, 0xffff -/* DF2390 802434F0 2404FFFB */ addiu $a0, $zero, -5 -/* DF2394 802434F4 8E4200B0 */ lw $v0, 0xb0($s2) -/* DF2398 802434F8 8E430000 */ lw $v1, ($s2) -/* DF239C 802434FC 00441024 */ and $v0, $v0, $a0 -/* DF23A0 80243500 00651824 */ and $v1, $v1, $a1 -/* DF23A4 80243504 AE4200B0 */ sw $v0, 0xb0($s2) -/* DF23A8 80243508 AE430000 */ sw $v1, ($s2) -.L8024350C: -/* DF23AC 8024350C 8E630070 */ lw $v1, 0x70($s3) -/* DF23B0 80243510 2C620064 */ sltiu $v0, $v1, 0x64 -/* DF23B4 80243514 10400060 */ beqz $v0, .L80243698 -/* DF23B8 80243518 00031080 */ sll $v0, $v1, 2 -/* DF23BC 8024351C 3C018024 */ lui $at, 0x8024 -/* DF23C0 80243520 00220821 */ addu $at, $at, $v0 -/* DF23C4 80243524 8C2279D0 */ lw $v0, 0x79d0($at) -/* DF23C8 80243528 00400008 */ jr $v0 -/* DF23CC 8024352C 00000000 */ nop -/* DF23D0 80243530 0260202D */ daddu $a0, $s3, $zero -/* DF23D4 80243534 0200282D */ daddu $a1, $s0, $zero -/* DF23D8 80243538 0C012568 */ jal func_800495A0 -/* DF23DC 8024353C 02A0302D */ daddu $a2, $s5, $zero -/* DF23E0 80243540 0260202D */ daddu $a0, $s3, $zero -/* DF23E4 80243544 0200282D */ daddu $a1, $s0, $zero -/* DF23E8 80243548 0C0125AE */ jal func_800496B8 -/* DF23EC 8024354C 02A0302D */ daddu $a2, $s5, $zero -/* DF23F0 80243550 08090DA6 */ j .L80243698 -/* DF23F4 80243554 00000000 */ nop -/* DF23F8 80243558 0260202D */ daddu $a0, $s3, $zero -/* DF23FC 8024355C 0200282D */ daddu $a1, $s0, $zero -/* DF2400 80243560 0C0126D1 */ jal func_80049B44 -/* DF2404 80243564 02A0302D */ daddu $a2, $s5, $zero -/* DF2408 80243568 0260202D */ daddu $a0, $s3, $zero -/* DF240C 8024356C 0200282D */ daddu $a1, $s0, $zero -/* DF2410 80243570 0C012701 */ jal func_80049C04 -/* DF2414 80243574 02A0302D */ daddu $a2, $s5, $zero -/* DF2418 80243578 08090DA6 */ j .L80243698 -/* DF241C 8024357C 00000000 */ nop -/* DF2420 80243580 0260202D */ daddu $a0, $s3, $zero -/* DF2424 80243584 0200282D */ daddu $a1, $s0, $zero -/* DF2428 80243588 0C01278F */ jal func_80049E3C -/* DF242C 8024358C 02A0302D */ daddu $a2, $s5, $zero -/* DF2430 80243590 0260202D */ daddu $a0, $s3, $zero -/* DF2434 80243594 0200282D */ daddu $a1, $s0, $zero -/* DF2438 80243598 0C0127B3 */ jal func_80049ECC -/* DF243C 8024359C 02A0302D */ daddu $a2, $s5, $zero -/* DF2440 802435A0 08090DA6 */ j .L80243698 -/* DF2444 802435A4 00000000 */ nop -/* DF2448 802435A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* DF244C 802435AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* DF2450 802435B0 C68C0038 */ lwc1 $f12, 0x38($s4) -/* DF2454 802435B4 C68E0040 */ lwc1 $f14, 0x40($s4) -/* DF2458 802435B8 8C460028 */ lw $a2, 0x28($v0) -/* DF245C 802435BC 0C00A7B5 */ jal dist2D -/* DF2460 802435C0 8C470030 */ lw $a3, 0x30($v0) -/* DF2464 802435C4 8E42006C */ lw $v0, 0x6c($s2) -/* DF2468 802435C8 10400008 */ beqz $v0, .L802435EC -/* DF246C 802435CC 46000086 */ mov.s $f2, $f0 -/* DF2470 802435D0 44820000 */ mtc1 $v0, $f0 -/* DF2474 802435D4 00000000 */ nop -/* DF2478 802435D8 46800020 */ cvt.s.w $f0, $f0 -/* DF247C 802435DC 4602003C */ c.lt.s $f0, $f2 -/* DF2480 802435E0 00000000 */ nop -/* DF2484 802435E4 4500000B */ bc1f .L80243614 -/* DF2488 802435E8 0260202D */ daddu $a0, $s3, $zero -.L802435EC: -/* DF248C 802435EC 0260202D */ daddu $a0, $s3, $zero -/* DF2490 802435F0 8E050024 */ lw $a1, 0x24($s0) -/* DF2494 802435F4 8E060028 */ lw $a2, 0x28($s0) -/* DF2498 802435F8 0C0909A7 */ jal func_8024269C -/* DF249C 802435FC 02A0382D */ daddu $a3, $s5, $zero -/* DF24A0 80243600 8E630070 */ lw $v1, 0x70($s3) -/* DF24A4 80243604 2402000C */ addiu $v0, $zero, 0xc -/* DF24A8 80243608 14620023 */ bne $v1, $v0, .L80243698 -/* DF24AC 8024360C 00000000 */ nop -/* DF24B0 80243610 0260202D */ daddu $a0, $s3, $zero -.L80243614: -/* DF24B4 80243614 0200282D */ daddu $a1, $s0, $zero -/* DF24B8 80243618 0C0127DF */ jal func_80049F7C -/* DF24BC 8024361C 02A0302D */ daddu $a2, $s5, $zero -/* DF24C0 80243620 0260202D */ daddu $a0, $s3, $zero -/* DF24C4 80243624 0200282D */ daddu $a1, $s0, $zero -/* DF24C8 80243628 0C012849 */ jal func_8004A124 -/* DF24CC 8024362C 02A0302D */ daddu $a2, $s5, $zero -/* DF24D0 80243630 08090DA6 */ j .L80243698 -/* DF24D4 80243634 00000000 */ nop -/* DF24D8 80243638 0260202D */ daddu $a0, $s3, $zero -/* DF24DC 8024363C 0200282D */ daddu $a1, $s0, $zero -/* DF24E0 80243640 0C0128FA */ jal func_8004A3E8 -/* DF24E4 80243644 02A0302D */ daddu $a2, $s5, $zero -/* DF24E8 80243648 08090DA6 */ j .L80243698 -/* DF24EC 8024364C 00000000 */ nop -/* DF24F0 80243650 0C0909F8 */ jal func_802427E0 -/* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero -/* DF24F8 80243658 08090DA6 */ j .L80243698 -/* DF24FC 8024365C 00000000 */ nop -/* DF2500 80243660 0C090A38 */ jal func_802428E0 -/* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero -/* DF2508 80243668 08090DA6 */ j .L80243698 -/* DF250C 8024366C 00000000 */ nop -/* DF2510 80243670 0C090A49 */ jal func_80242924 -/* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero -/* DF2518 80243678 08090DA6 */ j .L80243698 -/* DF251C 8024367C 00000000 */ nop -/* DF2520 80243680 0C090A71 */ jal func_802429C4 -/* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero -/* DF2528 80243688 08090DA6 */ j .L80243698 -/* DF252C 8024368C 00000000 */ nop -/* DF2530 80243690 0C0129CF */ jal func_8004A73C -/* DF2534 80243694 0260202D */ daddu $a0, $s3, $zero -.L80243698: -/* DF2538 80243698 8FBF0048 */ lw $ra, 0x48($sp) -/* DF253C 8024369C 8FB50044 */ lw $s5, 0x44($sp) -/* DF2540 802436A0 8FB40040 */ lw $s4, 0x40($sp) -/* DF2544 802436A4 8FB3003C */ lw $s3, 0x3c($sp) -/* DF2548 802436A8 8FB20038 */ lw $s2, 0x38($sp) -/* DF254C 802436AC 8FB10034 */ lw $s1, 0x34($sp) -/* DF2550 802436B0 8FB00030 */ lw $s0, 0x30($sp) -/* DF2554 802436B4 0000102D */ daddu $v0, $zero, $zero -/* DF2558 802436B8 03E00008 */ jr $ra -/* DF255C 802436BC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s new file mode 100644 index 0000000000..29086d5938 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s @@ -0,0 +1,213 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802433A0_DF2240 +/* DF2240 802433A0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* DF2244 802433A4 AFB3003C */ sw $s3, 0x3c($sp) +/* DF2248 802433A8 0080982D */ daddu $s3, $a0, $zero +/* DF224C 802433AC AFBF0048 */ sw $ra, 0x48($sp) +/* DF2250 802433B0 AFB50044 */ sw $s5, 0x44($sp) +/* DF2254 802433B4 AFB40040 */ sw $s4, 0x40($sp) +/* DF2258 802433B8 AFB20038 */ sw $s2, 0x38($sp) +/* DF225C 802433BC AFB10034 */ sw $s1, 0x34($sp) +/* DF2260 802433C0 AFB00030 */ sw $s0, 0x30($sp) +/* DF2264 802433C4 8E720148 */ lw $s2, 0x148($s3) +/* DF2268 802433C8 86440008 */ lh $a0, 8($s2) +/* DF226C 802433CC 8E70000C */ lw $s0, 0xc($s3) +/* DF2270 802433D0 0C00EABB */ jal get_npc_unsafe +/* DF2274 802433D4 00A0882D */ daddu $s1, $a1, $zero +/* DF2278 802433D8 0260202D */ daddu $a0, $s3, $zero +/* DF227C 802433DC 8E050000 */ lw $a1, ($s0) +/* DF2280 802433E0 0C0B1EAF */ jal get_variable +/* DF2284 802433E4 0040A02D */ daddu $s4, $v0, $zero +/* DF2288 802433E8 AFA00010 */ sw $zero, 0x10($sp) +/* DF228C 802433EC 8E4300D0 */ lw $v1, 0xd0($s2) +/* DF2290 802433F0 8C630030 */ lw $v1, 0x30($v1) +/* DF2294 802433F4 AFA30014 */ sw $v1, 0x14($sp) +/* DF2298 802433F8 8E4300D0 */ lw $v1, 0xd0($s2) +/* DF229C 802433FC 8C63001C */ lw $v1, 0x1c($v1) +/* DF22A0 80243400 AFA30018 */ sw $v1, 0x18($sp) +/* DF22A4 80243404 8E4300D0 */ lw $v1, 0xd0($s2) +/* DF22A8 80243408 8C630024 */ lw $v1, 0x24($v1) +/* DF22AC 8024340C AFA3001C */ sw $v1, 0x1c($sp) +/* DF22B0 80243410 8E4300D0 */ lw $v1, 0xd0($s2) +/* DF22B4 80243414 8C630028 */ lw $v1, 0x28($v1) +/* DF22B8 80243418 27B50010 */ addiu $s5, $sp, 0x10 +/* DF22BC 8024341C AFA30020 */ sw $v1, 0x20($sp) +/* DF22C0 80243420 8E4300D0 */ lw $v1, 0xd0($s2) +/* DF22C4 80243424 3C014220 */ lui $at, 0x4220 +/* DF22C8 80243428 44810000 */ mtc1 $at, $f0 +/* DF22CC 8024342C 8C63002C */ lw $v1, 0x2c($v1) +/* DF22D0 80243430 0040802D */ daddu $s0, $v0, $zero +/* DF22D4 80243434 E7A00028 */ swc1 $f0, 0x28($sp) +/* DF22D8 80243438 A7A0002C */ sh $zero, 0x2c($sp) +/* DF22DC 8024343C 16200005 */ bnez $s1, .L80243454 +/* DF22E0 80243440 AFA30024 */ sw $v1, 0x24($sp) +/* DF22E4 80243444 8E4200B0 */ lw $v0, 0xb0($s2) +/* DF22E8 80243448 30420004 */ andi $v0, $v0, 4 +/* DF22EC 8024344C 1040002F */ beqz $v0, .L8024350C +/* DF22F0 80243450 00000000 */ nop +.L80243454: +/* DF22F4 80243454 2404F7FF */ addiu $a0, $zero, -0x801 +/* DF22F8 80243458 AE600070 */ sw $zero, 0x70($s3) +/* DF22FC 8024345C A680008E */ sh $zero, 0x8e($s4) +/* DF2300 80243460 8E4200CC */ lw $v0, 0xcc($s2) +/* DF2304 80243464 8E830000 */ lw $v1, ($s4) +/* DF2308 80243468 8C420000 */ lw $v0, ($v0) +/* DF230C 8024346C 00641824 */ and $v1, $v1, $a0 +/* DF2310 80243470 AE830000 */ sw $v1, ($s4) +/* DF2314 80243474 AE820028 */ sw $v0, 0x28($s4) +/* DF2318 80243478 8E4200D0 */ lw $v0, 0xd0($s2) +/* DF231C 8024347C 8C420034 */ lw $v0, 0x34($v0) +/* DF2320 80243480 54400005 */ bnel $v0, $zero, .L80243498 +/* DF2324 80243484 2402FDFF */ addiu $v0, $zero, -0x201 +/* DF2328 80243488 34620200 */ ori $v0, $v1, 0x200 +/* DF232C 8024348C 2403FFF7 */ addiu $v1, $zero, -9 +/* DF2330 80243490 08090D28 */ j .L802434A0 +/* DF2334 80243494 00431024 */ and $v0, $v0, $v1 +.L80243498: +/* DF2338 80243498 00621024 */ and $v0, $v1, $v0 +/* DF233C 8024349C 34420008 */ ori $v0, $v0, 8 +.L802434A0: +/* DF2340 802434A0 AE820000 */ sw $v0, ($s4) +/* DF2344 802434A4 8E4200B0 */ lw $v0, 0xb0($s2) +/* DF2348 802434A8 30420004 */ andi $v0, $v0, 4 +/* DF234C 802434AC 10400008 */ beqz $v0, .L802434D0 +/* DF2350 802434B0 24020063 */ addiu $v0, $zero, 0x63 +/* DF2354 802434B4 AE620070 */ sw $v0, 0x70($s3) +/* DF2358 802434B8 AE600074 */ sw $zero, 0x74($s3) +/* DF235C 802434BC 8E4200B0 */ lw $v0, 0xb0($s2) +/* DF2360 802434C0 2403FFFB */ addiu $v1, $zero, -5 +/* DF2364 802434C4 00431024 */ and $v0, $v0, $v1 +/* DF2368 802434C8 08090D3A */ j .L802434E8 +/* DF236C 802434CC AE4200B0 */ sw $v0, 0xb0($s2) +.L802434D0: +/* DF2370 802434D0 8E420000 */ lw $v0, ($s2) +/* DF2374 802434D4 3C034000 */ lui $v1, 0x4000 +/* DF2378 802434D8 00431024 */ and $v0, $v0, $v1 +/* DF237C 802434DC 10400002 */ beqz $v0, .L802434E8 +/* DF2380 802434E0 2402000C */ addiu $v0, $zero, 0xc +/* DF2384 802434E4 AE620070 */ sw $v0, 0x70($s3) +.L802434E8: +/* DF2388 802434E8 3C05BFFF */ lui $a1, 0xbfff +/* DF238C 802434EC 34A5FFFF */ ori $a1, $a1, 0xffff +/* DF2390 802434F0 2404FFFB */ addiu $a0, $zero, -5 +/* DF2394 802434F4 8E4200B0 */ lw $v0, 0xb0($s2) +/* DF2398 802434F8 8E430000 */ lw $v1, ($s2) +/* DF239C 802434FC 00441024 */ and $v0, $v0, $a0 +/* DF23A0 80243500 00651824 */ and $v1, $v1, $a1 +/* DF23A4 80243504 AE4200B0 */ sw $v0, 0xb0($s2) +/* DF23A8 80243508 AE430000 */ sw $v1, ($s2) +.L8024350C: +/* DF23AC 8024350C 8E630070 */ lw $v1, 0x70($s3) +/* DF23B0 80243510 2C620064 */ sltiu $v0, $v1, 0x64 +/* DF23B4 80243514 10400060 */ beqz $v0, .L80243698 +/* DF23B8 80243518 00031080 */ sll $v0, $v1, 2 +/* DF23BC 8024351C 3C018024 */ lui $at, 0x8024 +/* DF23C0 80243520 00220821 */ addu $at, $at, $v0 +/* DF23C4 80243524 8C2279D0 */ lw $v0, 0x79d0($at) +/* DF23C8 80243528 00400008 */ jr $v0 +/* DF23CC 8024352C 00000000 */ nop +/* DF23D0 80243530 0260202D */ daddu $a0, $s3, $zero +/* DF23D4 80243534 0200282D */ daddu $a1, $s0, $zero +/* DF23D8 80243538 0C012568 */ jal func_800495A0 +/* DF23DC 8024353C 02A0302D */ daddu $a2, $s5, $zero +/* DF23E0 80243540 0260202D */ daddu $a0, $s3, $zero +/* DF23E4 80243544 0200282D */ daddu $a1, $s0, $zero +/* DF23E8 80243548 0C0125AE */ jal func_800496B8 +/* DF23EC 8024354C 02A0302D */ daddu $a2, $s5, $zero +/* DF23F0 80243550 08090DA6 */ j .L80243698 +/* DF23F4 80243554 00000000 */ nop +/* DF23F8 80243558 0260202D */ daddu $a0, $s3, $zero +/* DF23FC 8024355C 0200282D */ daddu $a1, $s0, $zero +/* DF2400 80243560 0C0126D1 */ jal func_80049B44 +/* DF2404 80243564 02A0302D */ daddu $a2, $s5, $zero +/* DF2408 80243568 0260202D */ daddu $a0, $s3, $zero +/* DF240C 8024356C 0200282D */ daddu $a1, $s0, $zero +/* DF2410 80243570 0C012701 */ jal func_80049C04 +/* DF2414 80243574 02A0302D */ daddu $a2, $s5, $zero +/* DF2418 80243578 08090DA6 */ j .L80243698 +/* DF241C 8024357C 00000000 */ nop +/* DF2420 80243580 0260202D */ daddu $a0, $s3, $zero +/* DF2424 80243584 0200282D */ daddu $a1, $s0, $zero +/* DF2428 80243588 0C01278F */ jal func_80049E3C +/* DF242C 8024358C 02A0302D */ daddu $a2, $s5, $zero +/* DF2430 80243590 0260202D */ daddu $a0, $s3, $zero +/* DF2434 80243594 0200282D */ daddu $a1, $s0, $zero +/* DF2438 80243598 0C0127B3 */ jal func_80049ECC +/* DF243C 8024359C 02A0302D */ daddu $a2, $s5, $zero +/* DF2440 802435A0 08090DA6 */ j .L80243698 +/* DF2444 802435A4 00000000 */ nop +/* DF2448 802435A8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* DF244C 802435AC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* DF2450 802435B0 C68C0038 */ lwc1 $f12, 0x38($s4) +/* DF2454 802435B4 C68E0040 */ lwc1 $f14, 0x40($s4) +/* DF2458 802435B8 8C460028 */ lw $a2, 0x28($v0) +/* DF245C 802435BC 0C00A7B5 */ jal dist2D +/* DF2460 802435C0 8C470030 */ lw $a3, 0x30($v0) +/* DF2464 802435C4 8E42006C */ lw $v0, 0x6c($s2) +/* DF2468 802435C8 10400008 */ beqz $v0, .L802435EC +/* DF246C 802435CC 46000086 */ mov.s $f2, $f0 +/* DF2470 802435D0 44820000 */ mtc1 $v0, $f0 +/* DF2474 802435D4 00000000 */ nop +/* DF2478 802435D8 46800020 */ cvt.s.w $f0, $f0 +/* DF247C 802435DC 4602003C */ c.lt.s $f0, $f2 +/* DF2480 802435E0 00000000 */ nop +/* DF2484 802435E4 4500000B */ bc1f .L80243614 +/* DF2488 802435E8 0260202D */ daddu $a0, $s3, $zero +.L802435EC: +/* DF248C 802435EC 0260202D */ daddu $a0, $s3, $zero +/* DF2490 802435F0 8E050024 */ lw $a1, 0x24($s0) +/* DF2494 802435F4 8E060028 */ lw $a2, 0x28($s0) +/* DF2498 802435F8 0C0909A7 */ jal func_8024269C_DF153C +/* DF249C 802435FC 02A0382D */ daddu $a3, $s5, $zero +/* DF24A0 80243600 8E630070 */ lw $v1, 0x70($s3) +/* DF24A4 80243604 2402000C */ addiu $v0, $zero, 0xc +/* DF24A8 80243608 14620023 */ bne $v1, $v0, .L80243698 +/* DF24AC 8024360C 00000000 */ nop +/* DF24B0 80243610 0260202D */ daddu $a0, $s3, $zero +.L80243614: +/* DF24B4 80243614 0200282D */ daddu $a1, $s0, $zero +/* DF24B8 80243618 0C0127DF */ jal func_80049F7C +/* DF24BC 8024361C 02A0302D */ daddu $a2, $s5, $zero +/* DF24C0 80243620 0260202D */ daddu $a0, $s3, $zero +/* DF24C4 80243624 0200282D */ daddu $a1, $s0, $zero +/* DF24C8 80243628 0C012849 */ jal func_8004A124 +/* DF24CC 8024362C 02A0302D */ daddu $a2, $s5, $zero +/* DF24D0 80243630 08090DA6 */ j .L80243698 +/* DF24D4 80243634 00000000 */ nop +/* DF24D8 80243638 0260202D */ daddu $a0, $s3, $zero +/* DF24DC 8024363C 0200282D */ daddu $a1, $s0, $zero +/* DF24E0 80243640 0C0128FA */ jal func_8004A3E8 +/* DF24E4 80243644 02A0302D */ daddu $a2, $s5, $zero +/* DF24E8 80243648 08090DA6 */ j .L80243698 +/* DF24EC 8024364C 00000000 */ nop +/* DF24F0 80243650 0C0909F8 */ jal func_802427E0_DF1680 +/* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero +/* DF24F8 80243658 08090DA6 */ j .L80243698 +/* DF24FC 8024365C 00000000 */ nop +/* DF2500 80243660 0C090A38 */ jal func_802428E0_DF1780 +/* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero +/* DF2508 80243668 08090DA6 */ j .L80243698 +/* DF250C 8024366C 00000000 */ nop +/* DF2510 80243670 0C090A49 */ jal func_80242924_DF17C4 +/* DF2514 80243674 0260202D */ daddu $a0, $s3, $zero +/* DF2518 80243678 08090DA6 */ j .L80243698 +/* DF251C 8024367C 00000000 */ nop +/* DF2520 80243680 0C090A71 */ jal func_802429C4_DF1864 +/* DF2524 80243684 0260202D */ daddu $a0, $s3, $zero +/* DF2528 80243688 08090DA6 */ j .L80243698 +/* DF252C 8024368C 00000000 */ nop +/* DF2530 80243690 0C0129CF */ jal func_8004A73C +/* DF2534 80243694 0260202D */ daddu $a0, $s3, $zero +.L80243698: +/* DF2538 80243698 8FBF0048 */ lw $ra, 0x48($sp) +/* DF253C 8024369C 8FB50044 */ lw $s5, 0x44($sp) +/* DF2540 802436A0 8FB40040 */ lw $s4, 0x40($sp) +/* DF2544 802436A4 8FB3003C */ lw $s3, 0x3c($sp) +/* DF2548 802436A8 8FB20038 */ lw $s2, 0x38($sp) +/* DF254C 802436AC 8FB10034 */ lw $s1, 0x34($sp) +/* DF2550 802436B0 8FB00030 */ lw $s0, 0x30($sp) +/* DF2554 802436B4 0000102D */ daddu $v0, $zero, $zero +/* DF2558 802436B8 03E00008 */ jr $ra +/* DF255C 802436BC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436C0.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436C0.s deleted file mode 100644 index 386d257420..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436C0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802436C0 -/* DF2560 802436C0 8C830148 */ lw $v1, 0x148($a0) -/* DF2564 802436C4 24020003 */ addiu $v0, $zero, 3 -/* DF2568 802436C8 A06200B5 */ sb $v0, 0xb5($v1) -/* DF256C 802436CC 03E00008 */ jr $ra -/* DF2570 802436D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436C0_DF2560.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436C0_DF2560.s new file mode 100644 index 0000000000..2f917e57ab --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436C0_DF2560.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802436C0_DF2560 +/* DF2560 802436C0 8C830148 */ lw $v1, 0x148($a0) +/* DF2564 802436C4 24020003 */ addiu $v0, $zero, 3 +/* DF2568 802436C8 A06200B5 */ sb $v0, 0xb5($v1) +/* DF256C 802436CC 03E00008 */ jr $ra +/* DF2570 802436D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4.s deleted file mode 100644 index 10164f4cfd..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802436D4 -/* DF2574 802436D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF2578 802436D8 3C05FE36 */ lui $a1, 0xfe36 -/* DF257C 802436DC AFBF0010 */ sw $ra, 0x10($sp) -/* DF2580 802436E0 8C820148 */ lw $v0, 0x148($a0) -/* DF2584 802436E4 3C06800B */ lui $a2, 0x800b -/* DF2588 802436E8 8CC60F9C */ lw $a2, 0xf9c($a2) -/* DF258C 802436EC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DF2590 802436F0 00C23026 */ xor $a2, $a2, $v0 -/* DF2594 802436F4 0C0B2026 */ jal set_variable -/* DF2598 802436F8 2CC60001 */ sltiu $a2, $a2, 1 -/* DF259C 802436FC 8FBF0010 */ lw $ra, 0x10($sp) -/* DF25A0 80243700 24020002 */ addiu $v0, $zero, 2 -/* DF25A4 80243704 03E00008 */ jr $ra -/* DF25A8 80243708 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF25AC 8024370C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s new file mode 100644 index 0000000000..951f2cf354 --- /dev/null +++ b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802436D4_DF2574 +/* DF2574 802436D4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* DF2578 802436D8 3C05FE36 */ lui $a1, 0xfe36 +/* DF257C 802436DC AFBF0010 */ sw $ra, 0x10($sp) +/* DF2580 802436E0 8C820148 */ lw $v0, 0x148($a0) +/* DF2584 802436E4 3C06800B */ lui $a2, 0x800b +/* DF2588 802436E8 8CC60F9C */ lw $a2, 0xf9c($a2) +/* DF258C 802436EC 34A53C80 */ ori $a1, $a1, 0x3c80 +/* DF2590 802436F0 00C23026 */ xor $a2, $a2, $v0 +/* DF2594 802436F4 0C0B2026 */ jal set_variable +/* DF2598 802436F8 2CC60001 */ sltiu $a2, $a2, 1 +/* DF259C 802436FC 8FBF0010 */ lw $ra, 0x10($sp) +/* DF25A0 80243700 24020002 */ addiu $v0, $zero, 2 +/* DF25A4 80243704 03E00008 */ jr $ra +/* DF25A8 80243708 27BD0018 */ addiu $sp, $sp, 0x18 +/* DF25AC 8024370C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8.s deleted file mode 100644 index 477651501e..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406F8 -/* AB06E8 802406F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AB06EC 802406FC AFBF0010 */ sw $ra, 0x10($sp) -/* AB06F0 80240700 8C82000C */ lw $v0, 0xc($a0) -/* AB06F4 80240704 0C0B1EAF */ jal get_variable -/* AB06F8 80240708 8C450000 */ lw $a1, ($v0) -/* AB06FC 8024070C 3C018024 */ lui $at, 0x8024 -/* AB0700 80240710 AC221220 */ sw $v0, 0x1220($at) -/* AB0704 80240714 24020002 */ addiu $v0, $zero, 2 -/* AB0708 80240718 8FBF0010 */ lw $ra, 0x10($sp) -/* AB070C 8024071C 24030001 */ addiu $v1, $zero, 1 -/* AB0710 80240720 3C018024 */ lui $at, 0x8024 -/* AB0714 80240724 AC23121C */ sw $v1, 0x121c($at) -/* AB0718 80240728 03E00008 */ jr $ra -/* AB071C 8024072C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s new file mode 100644 index 0000000000..87438c4034 --- /dev/null +++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802406F8_AB06E8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406F8_AB06E8 +/* AB06E8 802406F8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* AB06EC 802406FC AFBF0010 */ sw $ra, 0x10($sp) +/* AB06F0 80240700 8C82000C */ lw $v0, 0xc($a0) +/* AB06F4 80240704 0C0B1EAF */ jal get_variable +/* AB06F8 80240708 8C450000 */ lw $a1, ($v0) +/* AB06FC 8024070C 3C018024 */ lui $at, 0x8024 +/* AB0700 80240710 AC221220 */ sw $v0, 0x1220($at) +/* AB0704 80240714 24020002 */ addiu $v0, $zero, 2 +/* AB0708 80240718 8FBF0010 */ lw $ra, 0x10($sp) +/* AB070C 8024071C 24030001 */ addiu $v1, $zero, 1 +/* AB0710 80240720 3C018024 */ lui $at, 0x8024 +/* AB0714 80240724 AC23121C */ sw $v1, 0x121c($at) +/* AB0718 80240728 03E00008 */ jr $ra +/* AB071C 8024072C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC.s deleted file mode 100644 index 70dfc96848..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408BC -/* AB08AC 802408BC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* AB08B0 802408C0 AFB1001C */ sw $s1, 0x1c($sp) -/* AB08B4 802408C4 0080882D */ daddu $s1, $a0, $zero -/* AB08B8 802408C8 AFBF0034 */ sw $ra, 0x34($sp) -/* AB08BC 802408CC AFB60030 */ sw $s6, 0x30($sp) -/* AB08C0 802408D0 AFB5002C */ sw $s5, 0x2c($sp) -/* AB08C4 802408D4 AFB40028 */ sw $s4, 0x28($sp) -/* AB08C8 802408D8 AFB30024 */ sw $s3, 0x24($sp) -/* AB08CC 802408DC AFB20020 */ sw $s2, 0x20($sp) -/* AB08D0 802408E0 AFB00018 */ sw $s0, 0x18($sp) -/* AB08D4 802408E4 F7B60040 */ sdc1 $f22, 0x40($sp) -/* AB08D8 802408E8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* AB08DC 802408EC 8E30000C */ lw $s0, 0xc($s1) -/* AB08E0 802408F0 8E160000 */ lw $s6, ($s0) -/* AB08E4 802408F4 26100004 */ addiu $s0, $s0, 4 -/* AB08E8 802408F8 0C0B1EAF */ jal get_variable -/* AB08EC 802408FC 02C0282D */ daddu $a1, $s6, $zero -/* AB08F0 80240900 44820000 */ mtc1 $v0, $f0 -/* AB08F4 80240904 00000000 */ nop -/* AB08F8 80240908 46800020 */ cvt.s.w $f0, $f0 -/* AB08FC 8024090C E7A00010 */ swc1 $f0, 0x10($sp) -/* AB0900 80240910 8E140000 */ lw $s4, ($s0) -/* AB0904 80240914 26100004 */ addiu $s0, $s0, 4 -/* AB0908 80240918 0220202D */ daddu $a0, $s1, $zero -/* AB090C 8024091C 0C0B1EAF */ jal get_variable -/* AB0910 80240920 0280282D */ daddu $a1, $s4, $zero -/* AB0914 80240924 0220202D */ daddu $a0, $s1, $zero -/* AB0918 80240928 8E150000 */ lw $s5, ($s0) -/* AB091C 8024092C 4482B000 */ mtc1 $v0, $f22 -/* AB0920 80240930 00000000 */ nop -/* AB0924 80240934 4680B5A0 */ cvt.s.w $f22, $f22 -/* AB0928 80240938 0C0B1EAF */ jal get_variable -/* AB092C 8024093C 02A0282D */ daddu $a1, $s5, $zero -/* AB0930 80240940 2404FFFC */ addiu $a0, $zero, -4 -/* AB0934 80240944 44820000 */ mtc1 $v0, $f0 -/* AB0938 80240948 00000000 */ nop -/* AB093C 8024094C 46800020 */ cvt.s.w $f0, $f0 -/* AB0940 80240950 0C00EABB */ jal get_npc_unsafe -/* AB0944 80240954 E7A00014 */ swc1 $f0, 0x14($sp) -/* AB0948 80240958 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* AB094C 8024095C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* AB0950 80240960 3C014334 */ lui $at, 0x4334 -/* AB0954 80240964 44816000 */ mtc1 $at, $f12 -/* AB0958 80240968 00041880 */ sll $v1, $a0, 2 -/* AB095C 8024096C 00641821 */ addu $v1, $v1, $a0 -/* AB0960 80240970 00031880 */ sll $v1, $v1, 2 -/* AB0964 80240974 00641823 */ subu $v1, $v1, $a0 -/* AB0968 80240978 000320C0 */ sll $a0, $v1, 3 -/* AB096C 8024097C 00641821 */ addu $v1, $v1, $a0 -/* AB0970 80240980 000318C0 */ sll $v1, $v1, 3 -/* AB0974 80240984 3C01800B */ lui $at, 0x800b -/* AB0978 80240988 00230821 */ addu $at, $at, $v1 -/* AB097C 8024098C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* AB0980 80240990 460C0300 */ add.s $f12, $f0, $f12 -/* AB0984 80240994 0C00A6C9 */ jal clamp_angle -/* AB0988 80240998 0040982D */ daddu $s3, $v0, $zero -/* AB098C 8024099C 27B00010 */ addiu $s0, $sp, 0x10 -/* AB0990 802409A0 0200202D */ daddu $a0, $s0, $zero -/* AB0994 802409A4 27B20014 */ addiu $s2, $sp, 0x14 -/* AB0998 802409A8 0240282D */ daddu $a1, $s2, $zero -/* AB099C 802409AC 3C064170 */ lui $a2, 0x4170 -/* AB09A0 802409B0 8E67000C */ lw $a3, 0xc($s3) -/* AB09A4 802409B4 0C00A7E7 */ jal add_vec2D_polar -/* AB09A8 802409B8 46000506 */ mov.s $f20, $f0 -/* AB09AC 802409BC 0200202D */ daddu $a0, $s0, $zero -/* AB09B0 802409C0 3C064120 */ lui $a2, 0x4120 -/* AB09B4 802409C4 4407A000 */ mfc1 $a3, $f20 -/* AB09B8 802409C8 0C00A7E7 */ jal add_vec2D_polar -/* AB09BC 802409CC 0240282D */ daddu $a1, $s2, $zero -/* AB09C0 802409D0 0220202D */ daddu $a0, $s1, $zero -/* AB09C4 802409D4 C7A00010 */ lwc1 $f0, 0x10($sp) -/* AB09C8 802409D8 4600008D */ trunc.w.s $f2, $f0 -/* AB09CC 802409DC 44061000 */ mfc1 $a2, $f2 -/* AB09D0 802409E0 0C0B2026 */ jal set_variable -/* AB09D4 802409E4 02C0282D */ daddu $a1, $s6, $zero -/* AB09D8 802409E8 0220202D */ daddu $a0, $s1, $zero -/* AB09DC 802409EC 4600B08D */ trunc.w.s $f2, $f22 -/* AB09E0 802409F0 44061000 */ mfc1 $a2, $f2 -/* AB09E4 802409F4 0C0B2026 */ jal set_variable -/* AB09E8 802409F8 0280282D */ daddu $a1, $s4, $zero -/* AB09EC 802409FC 0220202D */ daddu $a0, $s1, $zero -/* AB09F0 80240A00 C7A00014 */ lwc1 $f0, 0x14($sp) -/* AB09F4 80240A04 4600008D */ trunc.w.s $f2, $f0 -/* AB09F8 80240A08 44061000 */ mfc1 $a2, $f2 -/* AB09FC 80240A0C 0C0B2026 */ jal set_variable -/* AB0A00 80240A10 02A0282D */ daddu $a1, $s5, $zero -/* AB0A04 80240A14 8FBF0034 */ lw $ra, 0x34($sp) -/* AB0A08 80240A18 8FB60030 */ lw $s6, 0x30($sp) -/* AB0A0C 80240A1C 8FB5002C */ lw $s5, 0x2c($sp) -/* AB0A10 80240A20 8FB40028 */ lw $s4, 0x28($sp) -/* AB0A14 80240A24 8FB30024 */ lw $s3, 0x24($sp) -/* AB0A18 80240A28 8FB20020 */ lw $s2, 0x20($sp) -/* AB0A1C 80240A2C 8FB1001C */ lw $s1, 0x1c($sp) -/* AB0A20 80240A30 8FB00018 */ lw $s0, 0x18($sp) -/* AB0A24 80240A34 D7B60040 */ ldc1 $f22, 0x40($sp) -/* AB0A28 80240A38 D7B40038 */ ldc1 $f20, 0x38($sp) -/* AB0A2C 80240A3C 24020002 */ addiu $v0, $zero, 2 -/* AB0A30 80240A40 03E00008 */ jr $ra -/* AB0A34 80240A44 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC_AB08AC.s b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC_AB08AC.s new file mode 100644 index 0000000000..fd7635d27f --- /dev/null +++ b/asm/nonmatchings/world/area_osr/osr_01/AB0350/func_802408BC_AB08AC.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408BC_AB08AC +/* AB08AC 802408BC 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* AB08B0 802408C0 AFB1001C */ sw $s1, 0x1c($sp) +/* AB08B4 802408C4 0080882D */ daddu $s1, $a0, $zero +/* AB08B8 802408C8 AFBF0034 */ sw $ra, 0x34($sp) +/* AB08BC 802408CC AFB60030 */ sw $s6, 0x30($sp) +/* AB08C0 802408D0 AFB5002C */ sw $s5, 0x2c($sp) +/* AB08C4 802408D4 AFB40028 */ sw $s4, 0x28($sp) +/* AB08C8 802408D8 AFB30024 */ sw $s3, 0x24($sp) +/* AB08CC 802408DC AFB20020 */ sw $s2, 0x20($sp) +/* AB08D0 802408E0 AFB00018 */ sw $s0, 0x18($sp) +/* AB08D4 802408E4 F7B60040 */ sdc1 $f22, 0x40($sp) +/* AB08D8 802408E8 F7B40038 */ sdc1 $f20, 0x38($sp) +/* AB08DC 802408EC 8E30000C */ lw $s0, 0xc($s1) +/* AB08E0 802408F0 8E160000 */ lw $s6, ($s0) +/* AB08E4 802408F4 26100004 */ addiu $s0, $s0, 4 +/* AB08E8 802408F8 0C0B1EAF */ jal get_variable +/* AB08EC 802408FC 02C0282D */ daddu $a1, $s6, $zero +/* AB08F0 80240900 44820000 */ mtc1 $v0, $f0 +/* AB08F4 80240904 00000000 */ nop +/* AB08F8 80240908 46800020 */ cvt.s.w $f0, $f0 +/* AB08FC 8024090C E7A00010 */ swc1 $f0, 0x10($sp) +/* AB0900 80240910 8E140000 */ lw $s4, ($s0) +/* AB0904 80240914 26100004 */ addiu $s0, $s0, 4 +/* AB0908 80240918 0220202D */ daddu $a0, $s1, $zero +/* AB090C 8024091C 0C0B1EAF */ jal get_variable +/* AB0910 80240920 0280282D */ daddu $a1, $s4, $zero +/* AB0914 80240924 0220202D */ daddu $a0, $s1, $zero +/* AB0918 80240928 8E150000 */ lw $s5, ($s0) +/* AB091C 8024092C 4482B000 */ mtc1 $v0, $f22 +/* AB0920 80240930 00000000 */ nop +/* AB0924 80240934 4680B5A0 */ cvt.s.w $f22, $f22 +/* AB0928 80240938 0C0B1EAF */ jal get_variable +/* AB092C 8024093C 02A0282D */ daddu $a1, $s5, $zero +/* AB0930 80240940 2404FFFC */ addiu $a0, $zero, -4 +/* AB0934 80240944 44820000 */ mtc1 $v0, $f0 +/* AB0938 80240948 00000000 */ nop +/* AB093C 8024094C 46800020 */ cvt.s.w $f0, $f0 +/* AB0940 80240950 0C00EABB */ jal get_npc_unsafe +/* AB0944 80240954 E7A00014 */ swc1 $f0, 0x14($sp) +/* AB0948 80240958 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* AB094C 8024095C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* AB0950 80240960 3C014334 */ lui $at, 0x4334 +/* AB0954 80240964 44816000 */ mtc1 $at, $f12 +/* AB0958 80240968 00041880 */ sll $v1, $a0, 2 +/* AB095C 8024096C 00641821 */ addu $v1, $v1, $a0 +/* AB0960 80240970 00031880 */ sll $v1, $v1, 2 +/* AB0964 80240974 00641823 */ subu $v1, $v1, $a0 +/* AB0968 80240978 000320C0 */ sll $a0, $v1, 3 +/* AB096C 8024097C 00641821 */ addu $v1, $v1, $a0 +/* AB0970 80240980 000318C0 */ sll $v1, $v1, 3 +/* AB0974 80240984 3C01800B */ lui $at, 0x800b +/* AB0978 80240988 00230821 */ addu $at, $at, $v1 +/* AB097C 8024098C C4201DEC */ lwc1 $f0, 0x1dec($at) +/* AB0980 80240990 460C0300 */ add.s $f12, $f0, $f12 +/* AB0984 80240994 0C00A6C9 */ jal clamp_angle +/* AB0988 80240998 0040982D */ daddu $s3, $v0, $zero +/* AB098C 8024099C 27B00010 */ addiu $s0, $sp, 0x10 +/* AB0990 802409A0 0200202D */ daddu $a0, $s0, $zero +/* AB0994 802409A4 27B20014 */ addiu $s2, $sp, 0x14 +/* AB0998 802409A8 0240282D */ daddu $a1, $s2, $zero +/* AB099C 802409AC 3C064170 */ lui $a2, 0x4170 +/* AB09A0 802409B0 8E67000C */ lw $a3, 0xc($s3) +/* AB09A4 802409B4 0C00A7E7 */ jal add_vec2D_polar +/* AB09A8 802409B8 46000506 */ mov.s $f20, $f0 +/* AB09AC 802409BC 0200202D */ daddu $a0, $s0, $zero +/* AB09B0 802409C0 3C064120 */ lui $a2, 0x4120 +/* AB09B4 802409C4 4407A000 */ mfc1 $a3, $f20 +/* AB09B8 802409C8 0C00A7E7 */ jal add_vec2D_polar +/* AB09BC 802409CC 0240282D */ daddu $a1, $s2, $zero +/* AB09C0 802409D0 0220202D */ daddu $a0, $s1, $zero +/* AB09C4 802409D4 C7A00010 */ lwc1 $f0, 0x10($sp) +/* AB09C8 802409D8 4600008D */ trunc.w.s $f2, $f0 +/* AB09CC 802409DC 44061000 */ mfc1 $a2, $f2 +/* AB09D0 802409E0 0C0B2026 */ jal set_variable +/* AB09D4 802409E4 02C0282D */ daddu $a1, $s6, $zero +/* AB09D8 802409E8 0220202D */ daddu $a0, $s1, $zero +/* AB09DC 802409EC 4600B08D */ trunc.w.s $f2, $f22 +/* AB09E0 802409F0 44061000 */ mfc1 $a2, $f2 +/* AB09E4 802409F4 0C0B2026 */ jal set_variable +/* AB09E8 802409F8 0280282D */ daddu $a1, $s4, $zero +/* AB09EC 802409FC 0220202D */ daddu $a0, $s1, $zero +/* AB09F0 80240A00 C7A00014 */ lwc1 $f0, 0x14($sp) +/* AB09F4 80240A04 4600008D */ trunc.w.s $f2, $f0 +/* AB09F8 80240A08 44061000 */ mfc1 $a2, $f2 +/* AB09FC 80240A0C 0C0B2026 */ jal set_variable +/* AB0A00 80240A10 02A0282D */ daddu $a1, $s5, $zero +/* AB0A04 80240A14 8FBF0034 */ lw $ra, 0x34($sp) +/* AB0A08 80240A18 8FB60030 */ lw $s6, 0x30($sp) +/* AB0A0C 80240A1C 8FB5002C */ lw $s5, 0x2c($sp) +/* AB0A10 80240A20 8FB40028 */ lw $s4, 0x28($sp) +/* AB0A14 80240A24 8FB30024 */ lw $s3, 0x24($sp) +/* AB0A18 80240A28 8FB20020 */ lw $s2, 0x20($sp) +/* AB0A1C 80240A2C 8FB1001C */ lw $s1, 0x1c($sp) +/* AB0A20 80240A30 8FB00018 */ lw $s0, 0x18($sp) +/* AB0A24 80240A34 D7B60040 */ ldc1 $f22, 0x40($sp) +/* AB0A28 80240A38 D7B40038 */ ldc1 $f20, 0x38($sp) +/* AB0A2C 80240A3C 24020002 */ addiu $v0, $zero, 2 +/* AB0A30 80240A40 03E00008 */ jr $ra +/* AB0A34 80240A44 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240090.s b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240090.s deleted file mode 100644 index 83f01721c5..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240090.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240090 -/* AB6320 80240090 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* AB6324 80240094 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* AB6328 80240098 9062007E */ lbu $v0, 0x7e($v1) -/* AB632C 8024009C 34420001 */ ori $v0, $v0, 1 -/* AB6330 802400A0 A062007E */ sb $v0, 0x7e($v1) -/* AB6334 802400A4 3C038011 */ lui $v1, %hi(gPlayerData) -/* AB6338 802400A8 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* AB633C 802400AC 80620012 */ lb $v0, 0x12($v1) -/* AB6340 802400B0 AC820084 */ sw $v0, 0x84($a0) -/* AB6344 802400B4 2402000B */ addiu $v0, $zero, 0xb -/* AB6348 802400B8 A0620012 */ sb $v0, 0x12($v1) -/* AB634C 802400BC 03E00008 */ jr $ra -/* AB6350 802400C0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240090_AB6320.s b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240090_AB6320.s new file mode 100644 index 0000000000..24f5f162c3 --- /dev/null +++ b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_80240090_AB6320.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240090_AB6320 +/* AB6320 80240090 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* AB6324 80240094 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* AB6328 80240098 9062007E */ lbu $v0, 0x7e($v1) +/* AB632C 8024009C 34420001 */ ori $v0, $v0, 1 +/* AB6330 802400A0 A062007E */ sb $v0, 0x7e($v1) +/* AB6334 802400A4 3C038011 */ lui $v1, %hi(gPlayerData) +/* AB6338 802400A8 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* AB633C 802400AC 80620012 */ lb $v0, 0x12($v1) +/* AB6340 802400B0 AC820084 */ sw $v0, 0x84($a0) +/* AB6344 802400B4 2402000B */ addiu $v0, $zero, 0xb +/* AB6348 802400B8 A0620012 */ sb $v0, 0x12($v1) +/* AB634C 802400BC 03E00008 */ jr $ra +/* AB6350 802400C0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4.s b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4.s deleted file mode 100644 index 51c6711c47..0000000000 --- a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C4 -/* AB6354 802400C4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* AB6358 802400C8 AFB10014 */ sw $s1, 0x14($sp) -/* AB635C 802400CC 0080882D */ daddu $s1, $a0, $zero -/* AB6360 802400D0 AFBF001C */ sw $ra, 0x1c($sp) -/* AB6364 802400D4 AFB20018 */ sw $s2, 0x18($sp) -/* AB6368 802400D8 AFB00010 */ sw $s0, 0x10($sp) -/* AB636C 802400DC F7B60028 */ sdc1 $f22, 0x28($sp) -/* AB6370 802400E0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* AB6374 802400E4 0C00EABB */ jal get_npc_unsafe -/* AB6378 802400E8 0000202D */ daddu $a0, $zero, $zero -/* AB637C 802400EC 0040802D */ daddu $s0, $v0, $zero -/* AB6380 802400F0 3C12800B */ lui $s2, %hi(gCameras) -/* AB6384 802400F4 26521D80 */ addiu $s2, $s2, %lo(gCameras) -/* AB6388 802400F8 C60C000C */ lwc1 $f12, 0xc($s0) -/* AB638C 802400FC C640006C */ lwc1 $f0, 0x6c($s2) -/* AB6390 80240100 46006300 */ add.s $f12, $f12, $f0 -/* AB6394 80240104 3C014334 */ lui $at, 0x4334 -/* AB6398 80240108 4481A000 */ mtc1 $at, $f20 -/* AB639C 8024010C 3C0141A0 */ lui $at, 0x41a0 -/* AB63A0 80240110 4481B000 */ mtc1 $at, $f22 -/* AB63A4 80240114 0C00A8BB */ jal sin_deg -/* AB63A8 80240118 46146300 */ add.s $f12, $f12, $f20 -/* AB63AC 8024011C 46160002 */ mul.s $f0, $f0, $f22 -/* AB63B0 80240120 00000000 */ nop -/* AB63B4 80240124 C6020038 */ lwc1 $f2, 0x38($s0) -/* AB63B8 80240128 46001080 */ add.s $f2, $f2, $f0 -/* AB63BC 8024012C 4600110D */ trunc.w.s $f4, $f2 -/* AB63C0 80240130 E6240084 */ swc1 $f4, 0x84($s1) -/* AB63C4 80240134 C600003C */ lwc1 $f0, 0x3c($s0) -/* AB63C8 80240138 3C014190 */ lui $at, 0x4190 -/* AB63CC 8024013C 44811000 */ mtc1 $at, $f2 -/* AB63D0 80240140 00000000 */ nop -/* AB63D4 80240144 46020000 */ add.s $f0, $f0, $f2 -/* AB63D8 80240148 4600010D */ trunc.w.s $f4, $f0 -/* AB63DC 8024014C E6240088 */ swc1 $f4, 0x88($s1) -/* AB63E0 80240150 C60C000C */ lwc1 $f12, 0xc($s0) -/* AB63E4 80240154 C640006C */ lwc1 $f0, 0x6c($s2) -/* AB63E8 80240158 46006300 */ add.s $f12, $f12, $f0 -/* AB63EC 8024015C 0C00A8D4 */ jal cos_deg -/* AB63F0 80240160 46146300 */ add.s $f12, $f12, $f20 -/* AB63F4 80240164 46160002 */ mul.s $f0, $f0, $f22 -/* AB63F8 80240168 00000000 */ nop -/* AB63FC 8024016C C6020040 */ lwc1 $f2, 0x40($s0) -/* AB6400 80240170 46001081 */ sub.s $f2, $f2, $f0 -/* AB6404 80240174 4600110D */ trunc.w.s $f4, $f2 -/* AB6408 80240178 E624008C */ swc1 $f4, 0x8c($s1) -/* AB640C 8024017C 8FBF001C */ lw $ra, 0x1c($sp) -/* AB6410 80240180 8FB20018 */ lw $s2, 0x18($sp) -/* AB6414 80240184 8FB10014 */ lw $s1, 0x14($sp) -/* AB6418 80240188 8FB00010 */ lw $s0, 0x10($sp) -/* AB641C 8024018C D7B60028 */ ldc1 $f22, 0x28($sp) -/* AB6420 80240190 D7B40020 */ ldc1 $f20, 0x20($sp) -/* AB6424 80240194 24020002 */ addiu $v0, $zero, 2 -/* AB6428 80240198 03E00008 */ jr $ra -/* AB642C 8024019C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s new file mode 100644 index 0000000000..71a9716676 --- /dev/null +++ b/asm/nonmatchings/world/area_osr/osr_03/AB62B0/func_802400C4_AB6354.s @@ -0,0 +1,59 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400C4_AB6354 +/* AB6354 802400C4 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* AB6358 802400C8 AFB10014 */ sw $s1, 0x14($sp) +/* AB635C 802400CC 0080882D */ daddu $s1, $a0, $zero +/* AB6360 802400D0 AFBF001C */ sw $ra, 0x1c($sp) +/* AB6364 802400D4 AFB20018 */ sw $s2, 0x18($sp) +/* AB6368 802400D8 AFB00010 */ sw $s0, 0x10($sp) +/* AB636C 802400DC F7B60028 */ sdc1 $f22, 0x28($sp) +/* AB6370 802400E0 F7B40020 */ sdc1 $f20, 0x20($sp) +/* AB6374 802400E4 0C00EABB */ jal get_npc_unsafe +/* AB6378 802400E8 0000202D */ daddu $a0, $zero, $zero +/* AB637C 802400EC 0040802D */ daddu $s0, $v0, $zero +/* AB6380 802400F0 3C12800B */ lui $s2, %hi(gCameras) +/* AB6384 802400F4 26521D80 */ addiu $s2, $s2, %lo(gCameras) +/* AB6388 802400F8 C60C000C */ lwc1 $f12, 0xc($s0) +/* AB638C 802400FC C640006C */ lwc1 $f0, 0x6c($s2) +/* AB6390 80240100 46006300 */ add.s $f12, $f12, $f0 +/* AB6394 80240104 3C014334 */ lui $at, 0x4334 +/* AB6398 80240108 4481A000 */ mtc1 $at, $f20 +/* AB639C 8024010C 3C0141A0 */ lui $at, 0x41a0 +/* AB63A0 80240110 4481B000 */ mtc1 $at, $f22 +/* AB63A4 80240114 0C00A8BB */ jal sin_deg +/* AB63A8 80240118 46146300 */ add.s $f12, $f12, $f20 +/* AB63AC 8024011C 46160002 */ mul.s $f0, $f0, $f22 +/* AB63B0 80240120 00000000 */ nop +/* AB63B4 80240124 C6020038 */ lwc1 $f2, 0x38($s0) +/* AB63B8 80240128 46001080 */ add.s $f2, $f2, $f0 +/* AB63BC 8024012C 4600110D */ trunc.w.s $f4, $f2 +/* AB63C0 80240130 E6240084 */ swc1 $f4, 0x84($s1) +/* AB63C4 80240134 C600003C */ lwc1 $f0, 0x3c($s0) +/* AB63C8 80240138 3C014190 */ lui $at, 0x4190 +/* AB63CC 8024013C 44811000 */ mtc1 $at, $f2 +/* AB63D0 80240140 00000000 */ nop +/* AB63D4 80240144 46020000 */ add.s $f0, $f0, $f2 +/* AB63D8 80240148 4600010D */ trunc.w.s $f4, $f0 +/* AB63DC 8024014C E6240088 */ swc1 $f4, 0x88($s1) +/* AB63E0 80240150 C60C000C */ lwc1 $f12, 0xc($s0) +/* AB63E4 80240154 C640006C */ lwc1 $f0, 0x6c($s2) +/* AB63E8 80240158 46006300 */ add.s $f12, $f12, $f0 +/* AB63EC 8024015C 0C00A8D4 */ jal cos_deg +/* AB63F0 80240160 46146300 */ add.s $f12, $f12, $f20 +/* AB63F4 80240164 46160002 */ mul.s $f0, $f0, $f22 +/* AB63F8 80240168 00000000 */ nop +/* AB63FC 8024016C C6020040 */ lwc1 $f2, 0x40($s0) +/* AB6400 80240170 46001081 */ sub.s $f2, $f2, $f0 +/* AB6404 80240174 4600110D */ trunc.w.s $f4, $f2 +/* AB6408 80240178 E624008C */ swc1 $f4, 0x8c($s1) +/* AB640C 8024017C 8FBF001C */ lw $ra, 0x1c($sp) +/* AB6410 80240180 8FB20018 */ lw $s2, 0x18($sp) +/* AB6414 80240184 8FB10014 */ lw $s1, 0x14($sp) +/* AB6418 80240188 8FB00010 */ lw $s0, 0x10($sp) +/* AB641C 8024018C D7B60028 */ ldc1 $f22, 0x28($sp) +/* AB6420 80240190 D7B40020 */ ldc1 $f20, 0x20($sp) +/* AB6424 80240194 24020002 */ addiu $v0, $zero, 2 +/* AB6428 80240198 03E00008 */ jr $ra +/* AB642C 8024019C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054.s deleted file mode 100644 index cb4a97260b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240054 -/* D4D094 80240054 00041403 */ sra $v0, $a0, 0x10 -/* D4D098 80240058 304300FF */ andi $v1, $v0, 0xff -/* D4D09C 8024005C 24020006 */ addiu $v0, $zero, 6 -/* D4D0A0 80240060 10620015 */ beq $v1, $v0, .L802400B8 -/* D4D0A4 80240064 28620007 */ slti $v0, $v1, 7 -/* D4D0A8 80240068 10400005 */ beqz $v0, .L80240080 -/* D4D0AC 8024006C 24020001 */ addiu $v0, $zero, 1 -/* D4D0B0 80240070 1062000A */ beq $v1, $v0, .L8024009C -/* D4D0B4 80240074 3C020100 */ lui $v0, 0x100 -/* D4D0B8 80240078 03E00008 */ jr $ra -/* D4D0BC 8024007C 00821025 */ or $v0, $a0, $v0 -.L80240080: -/* D4D0C0 80240080 2862000A */ slti $v0, $v1, 0xa -/* D4D0C4 80240084 10400016 */ beqz $v0, .L802400E0 -/* D4D0C8 80240088 28620008 */ slti $v0, $v1, 8 -/* D4D0CC 8024008C 14400015 */ bnez $v0, .L802400E4 -/* D4D0D0 80240090 3C020100 */ lui $v0, 0x100 -/* D4D0D4 80240094 03E00008 */ jr $ra -/* D4D0D8 80240098 0080102D */ daddu $v0, $a0, $zero -.L8024009C: -/* D4D0DC 8024009C 3C020001 */ lui $v0, 1 -/* D4D0E0 802400A0 3442000C */ ori $v0, $v0, 0xc -/* D4D0E4 802400A4 0044102A */ slt $v0, $v0, $a0 -/* D4D0E8 802400A8 1040000E */ beqz $v0, .L802400E4 -/* D4D0EC 802400AC 3C020100 */ lui $v0, 0x100 -.L802400B0: -/* D4D0F0 802400B0 03E00008 */ jr $ra -/* D4D0F4 802400B4 0080102D */ daddu $v0, $a0, $zero -.L802400B8: -/* D4D0F8 802400B8 3C02FFF9 */ lui $v0, 0xfff9 -/* D4D0FC 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D4D100 802400C0 00821821 */ addu $v1, $a0, $v0 -/* D4D104 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D4D108 802400C8 10400005 */ beqz $v0, .L802400E0 -/* D4D10C 802400CC 30620001 */ andi $v0, $v1, 1 -/* D4D110 802400D0 1440FFF7 */ bnez $v0, .L802400B0 -/* D4D114 802400D4 24820001 */ addiu $v0, $a0, 1 -/* D4D118 802400D8 03E00008 */ jr $ra -/* D4D11C 802400DC 00000000 */ nop -.L802400E0: -/* D4D120 802400E0 3C020100 */ lui $v0, 0x100 -.L802400E4: -/* D4D124 802400E4 03E00008 */ jr $ra -/* D4D128 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054_D4D094.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054_D4D094.s new file mode 100644 index 0000000000..6f35538c19 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240054_D4D094.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240054_D4D094 +/* D4D094 80240054 00041403 */ sra $v0, $a0, 0x10 +/* D4D098 80240058 304300FF */ andi $v1, $v0, 0xff +/* D4D09C 8024005C 24020006 */ addiu $v0, $zero, 6 +/* D4D0A0 80240060 10620015 */ beq $v1, $v0, .L802400B8 +/* D4D0A4 80240064 28620007 */ slti $v0, $v1, 7 +/* D4D0A8 80240068 10400005 */ beqz $v0, .L80240080 +/* D4D0AC 8024006C 24020001 */ addiu $v0, $zero, 1 +/* D4D0B0 80240070 1062000A */ beq $v1, $v0, .L8024009C +/* D4D0B4 80240074 3C020100 */ lui $v0, 0x100 +/* D4D0B8 80240078 03E00008 */ jr $ra +/* D4D0BC 8024007C 00821025 */ or $v0, $a0, $v0 +.L80240080: +/* D4D0C0 80240080 2862000A */ slti $v0, $v1, 0xa +/* D4D0C4 80240084 10400016 */ beqz $v0, .L802400E0 +/* D4D0C8 80240088 28620008 */ slti $v0, $v1, 8 +/* D4D0CC 8024008C 14400015 */ bnez $v0, .L802400E4 +/* D4D0D0 80240090 3C020100 */ lui $v0, 0x100 +/* D4D0D4 80240094 03E00008 */ jr $ra +/* D4D0D8 80240098 0080102D */ daddu $v0, $a0, $zero +.L8024009C: +/* D4D0DC 8024009C 3C020001 */ lui $v0, 1 +/* D4D0E0 802400A0 3442000C */ ori $v0, $v0, 0xc +/* D4D0E4 802400A4 0044102A */ slt $v0, $v0, $a0 +/* D4D0E8 802400A8 1040000E */ beqz $v0, .L802400E4 +/* D4D0EC 802400AC 3C020100 */ lui $v0, 0x100 +.L802400B0: +/* D4D0F0 802400B0 03E00008 */ jr $ra +/* D4D0F4 802400B4 0080102D */ daddu $v0, $a0, $zero +.L802400B8: +/* D4D0F8 802400B8 3C02FFF9 */ lui $v0, 0xfff9 +/* D4D0FC 802400BC 3442FFF4 */ ori $v0, $v0, 0xfff4 +/* D4D100 802400C0 00821821 */ addu $v1, $a0, $v0 +/* D4D104 802400C4 2C620010 */ sltiu $v0, $v1, 0x10 +/* D4D108 802400C8 10400005 */ beqz $v0, .L802400E0 +/* D4D10C 802400CC 30620001 */ andi $v0, $v1, 1 +/* D4D110 802400D0 1440FFF7 */ bnez $v0, .L802400B0 +/* D4D114 802400D4 24820001 */ addiu $v0, $a0, 1 +/* D4D118 802400D8 03E00008 */ jr $ra +/* D4D11C 802400DC 00000000 */ nop +.L802400E0: +/* D4D120 802400E0 3C020100 */ lui $v0, 0x100 +.L802400E4: +/* D4D124 802400E4 03E00008 */ jr $ra +/* D4D128 802400E8 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128.s deleted file mode 100644 index b72338483e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128.s +++ /dev/null @@ -1,125 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240128 -/* D4D168 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D4D16C 8024012C AFB00040 */ sw $s0, 0x40($sp) -/* D4D170 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D4D174 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D4D178 80240138 AFB20048 */ sw $s2, 0x48($sp) -/* D4D17C 8024013C AFBF004C */ sw $ra, 0x4c($sp) -/* D4D180 80240140 AFB10044 */ sw $s1, 0x44($sp) -/* D4D184 80240144 8E020000 */ lw $v0, ($s0) -/* D4D188 80240148 821100BE */ lb $s1, 0xbe($s0) -/* D4D18C 8024014C 30420001 */ andi $v0, $v0, 1 -/* D4D190 80240150 10400061 */ beqz $v0, .L802402D8 -/* D4D194 80240154 27B20020 */ addiu $s2, $sp, 0x20 -/* D4D198 80240158 8E0400CC */ lw $a0, 0xcc($s0) -/* D4D19C 8024015C 0C044181 */ jal get_shadow_by_index -/* D4D1A0 80240160 00000000 */ nop -/* D4D1A4 80240164 0C048B77 */ jal func_80122DDC -/* D4D1A8 80240168 84440008 */ lh $a0, 8($v0) -/* D4D1AC 8024016C 8C430000 */ lw $v1, ($v0) -/* D4D1B0 80240170 34630200 */ ori $v1, $v1, 0x200 -/* D4D1B4 80240174 AC430000 */ sw $v1, ($v0) -/* D4D1B8 80240178 8E050028 */ lw $a1, 0x28($s0) -/* D4D1BC 8024017C 8E06002C */ lw $a2, 0x2c($s0) -/* D4D1C0 80240180 27A20030 */ addiu $v0, $sp, 0x30 -/* D4D1C4 80240184 AFA20010 */ sw $v0, 0x10($sp) -/* D4D1C8 80240188 27A20034 */ addiu $v0, $sp, 0x34 -/* D4D1CC 8024018C AFA20014 */ sw $v0, 0x14($sp) -/* D4D1D0 80240190 C6000030 */ lwc1 $f0, 0x30($s0) -/* D4D1D4 80240194 3C04800A */ lui $a0, 0x800a -/* D4D1D8 80240198 8484A634 */ lh $a0, -0x59cc($a0) -/* D4D1DC 8024019C 46000007 */ neg.s $f0, $f0 -/* D4D1E0 802401A0 44070000 */ mfc1 $a3, $f0 -/* D4D1E4 802401A4 27A20038 */ addiu $v0, $sp, 0x38 -/* D4D1E8 802401A8 0C00B94E */ jal get_screen_coords -/* D4D1EC 802401AC AFA20018 */ sw $v0, 0x18($sp) -/* D4D1F0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D4D1F4 802401B4 0C090008 */ jal func_80240020 -/* D4D1F8 802401B8 00000000 */ nop -/* D4D1FC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) -/* D4D200 802401C0 3C014307 */ lui $at, 0x4307 -/* D4D204 802401C4 44810000 */ mtc1 $at, $f0 -/* D4D208 802401C8 00000000 */ nop -/* D4D20C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D4D210 802401D0 00000000 */ nop -/* D4D214 802401D4 4500000B */ bc1f .L80240204 -/* D4D218 802401D8 24040002 */ addiu $a0, $zero, 2 -/* D4D21C 802401DC 3C014361 */ lui $at, 0x4361 -/* D4D220 802401E0 44810000 */ mtc1 $at, $f0 -/* D4D224 802401E4 00000000 */ nop -/* D4D228 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D4D22C 802401EC 00000000 */ nop -/* D4D230 802401F0 45000004 */ bc1f .L80240204 -/* D4D234 802401F4 00000000 */ nop -/* D4D238 802401F8 0C090015 */ jal func_80240054 -/* D4D23C 802401FC 0040202D */ daddu $a0, $v0, $zero -/* D4D240 80240200 24040002 */ addiu $a0, $zero, 2 -.L80240204: -/* D4D244 80240204 3C063F80 */ lui $a2, 0x3f80 -/* D4D248 80240208 0C0B76A3 */ jal func_802DDA8C -/* D4D24C 8024020C 0040282D */ daddu $a1, $v0, $zero -/* D4D250 80240210 8E020000 */ lw $v0, ($s0) -/* D4D254 80240214 3C030002 */ lui $v1, 2 -/* D4D258 80240218 00431024 */ and $v0, $v0, $v1 -/* D4D25C 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 -/* D4D260 80240220 24110011 */ addiu $s1, $zero, 0x11 -/* D4D264 80240224 9203000E */ lbu $v1, 0xe($s0) -/* D4D268 80240228 3C02802E */ lui $v0, 0x802e -/* D4D26C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) -/* D4D270 80240230 10620018 */ beq $v1, $v0, .L80240294 -/* D4D274 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe -/* D4D278 80240238 1040000B */ beqz $v0, .L80240268 -/* D4D27C 8024023C 24110011 */ addiu $s1, $zero, 0x11 -/* D4D280 80240240 24040002 */ addiu $a0, $zero, 2 -/* D4D284 80240244 2405FFFF */ addiu $a1, $zero, -1 -/* D4D288 80240248 24060007 */ addiu $a2, $zero, 7 -/* D4D28C 8024024C 0060102D */ daddu $v0, $v1, $zero -/* D4D290 80240250 0000382D */ daddu $a3, $zero, $zero -/* D4D294 80240254 AFA00010 */ sw $zero, 0x10($sp) -/* D4D298 80240258 AFA00014 */ sw $zero, 0x14($sp) -/* D4D29C 8024025C AFA0001C */ sw $zero, 0x1c($sp) -/* D4D2A0 80240260 080900A3 */ j .L8024028C -/* D4D2A4 80240264 AFA20018 */ sw $v0, 0x18($sp) -.L80240268: -/* D4D2A8 80240268 2411000D */ addiu $s1, $zero, 0xd -/* D4D2AC 8024026C 24040002 */ addiu $a0, $zero, 2 -/* D4D2B0 80240270 2405FFFF */ addiu $a1, $zero, -1 -/* D4D2B4 80240274 0000302D */ daddu $a2, $zero, $zero -/* D4D2B8 80240278 00C0382D */ daddu $a3, $a2, $zero -/* D4D2BC 8024027C AFA00010 */ sw $zero, 0x10($sp) -/* D4D2C0 80240280 AFA00014 */ sw $zero, 0x14($sp) -/* D4D2C4 80240284 AFA00018 */ sw $zero, 0x18($sp) -/* D4D2C8 80240288 AFA0001C */ sw $zero, 0x1c($sp) -.L8024028C: -/* D4D2CC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D4D2D0 80240290 00000000 */ nop -.L80240294: -/* D4D2D4 80240294 9202000E */ lbu $v0, 0xe($s0) -/* D4D2D8 80240298 3C01802E */ lui $at, 0x802e -/* D4D2DC 8024029C A0229D70 */ sb $v0, -0x6290($at) -/* D4D2E0 802402A0 080900AD */ j .L802402B4 -/* D4D2E4 802402A4 0240202D */ daddu $a0, $s2, $zero -.L802402A8: -/* D4D2E8 802402A8 3C01802E */ lui $at, 0x802e -/* D4D2EC 802402AC A0209D70 */ sb $zero, -0x6290($at) -/* D4D2F0 802402B0 0240202D */ daddu $a0, $s2, $zero -.L802402B4: -/* D4D2F4 802402B4 AC910000 */ sw $s1, ($a0) -/* D4D2F8 802402B8 AC900008 */ sw $s0, 8($a0) -/* D4D2FC 802402BC 8FA20038 */ lw $v0, 0x38($sp) -/* D4D300 802402C0 3C038024 */ lui $v1, 0x8024 -/* D4D304 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 -/* D4D308 802402C8 AC83000C */ sw $v1, 0xc($a0) -/* D4D30C 802402CC 00021023 */ negu $v0, $v0 -/* D4D310 802402D0 0C047644 */ jal queue_render_task -/* D4D314 802402D4 AC820004 */ sw $v0, 4($a0) -.L802402D8: -/* D4D318 802402D8 8FBF004C */ lw $ra, 0x4c($sp) -/* D4D31C 802402DC 8FB20048 */ lw $s2, 0x48($sp) -/* D4D320 802402E0 8FB10044 */ lw $s1, 0x44($sp) -/* D4D324 802402E4 8FB00040 */ lw $s0, 0x40($sp) -/* D4D328 802402E8 03E00008 */ jr $ra -/* D4D32C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s new file mode 100644 index 0000000000..9ce76f12ab --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s @@ -0,0 +1,125 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240128_D4D168 +/* D4D168 80240128 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* D4D16C 8024012C AFB00040 */ sw $s0, 0x40($sp) +/* D4D170 80240130 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* D4D174 80240134 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* D4D178 80240138 AFB20048 */ sw $s2, 0x48($sp) +/* D4D17C 8024013C AFBF004C */ sw $ra, 0x4c($sp) +/* D4D180 80240140 AFB10044 */ sw $s1, 0x44($sp) +/* D4D184 80240144 8E020000 */ lw $v0, ($s0) +/* D4D188 80240148 821100BE */ lb $s1, 0xbe($s0) +/* D4D18C 8024014C 30420001 */ andi $v0, $v0, 1 +/* D4D190 80240150 10400061 */ beqz $v0, .L802402D8 +/* D4D194 80240154 27B20020 */ addiu $s2, $sp, 0x20 +/* D4D198 80240158 8E0400CC */ lw $a0, 0xcc($s0) +/* D4D19C 8024015C 0C044181 */ jal get_shadow_by_index +/* D4D1A0 80240160 00000000 */ nop +/* D4D1A4 80240164 0C048B77 */ jal func_80122DDC +/* D4D1A8 80240168 84440008 */ lh $a0, 8($v0) +/* D4D1AC 8024016C 8C430000 */ lw $v1, ($v0) +/* D4D1B0 80240170 34630200 */ ori $v1, $v1, 0x200 +/* D4D1B4 80240174 AC430000 */ sw $v1, ($v0) +/* D4D1B8 80240178 8E050028 */ lw $a1, 0x28($s0) +/* D4D1BC 8024017C 8E06002C */ lw $a2, 0x2c($s0) +/* D4D1C0 80240180 27A20030 */ addiu $v0, $sp, 0x30 +/* D4D1C4 80240184 AFA20010 */ sw $v0, 0x10($sp) +/* D4D1C8 80240188 27A20034 */ addiu $v0, $sp, 0x34 +/* D4D1CC 8024018C AFA20014 */ sw $v0, 0x14($sp) +/* D4D1D0 80240190 C6000030 */ lwc1 $f0, 0x30($s0) +/* D4D1D4 80240194 3C04800A */ lui $a0, 0x800a +/* D4D1D8 80240198 8484A634 */ lh $a0, -0x59cc($a0) +/* D4D1DC 8024019C 46000007 */ neg.s $f0, $f0 +/* D4D1E0 802401A0 44070000 */ mfc1 $a3, $f0 +/* D4D1E4 802401A4 27A20038 */ addiu $v0, $sp, 0x38 +/* D4D1E8 802401A8 0C00B94E */ jal get_screen_coords +/* D4D1EC 802401AC AFA20018 */ sw $v0, 0x18($sp) +/* D4D1F0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) +/* D4D1F4 802401B4 0C090008 */ jal func_80240020_D4D060 +/* D4D1F8 802401B8 00000000 */ nop +/* D4D1FC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) +/* D4D200 802401C0 3C014307 */ lui $at, 0x4307 +/* D4D204 802401C4 44810000 */ mtc1 $at, $f0 +/* D4D208 802401C8 00000000 */ nop +/* D4D20C 802401CC 4602003C */ c.lt.s $f0, $f2 +/* D4D210 802401D0 00000000 */ nop +/* D4D214 802401D4 4500000B */ bc1f .L80240204 +/* D4D218 802401D8 24040002 */ addiu $a0, $zero, 2 +/* D4D21C 802401DC 3C014361 */ lui $at, 0x4361 +/* D4D220 802401E0 44810000 */ mtc1 $at, $f0 +/* D4D224 802401E4 00000000 */ nop +/* D4D228 802401E8 4600103C */ c.lt.s $f2, $f0 +/* D4D22C 802401EC 00000000 */ nop +/* D4D230 802401F0 45000004 */ bc1f .L80240204 +/* D4D234 802401F4 00000000 */ nop +/* D4D238 802401F8 0C090015 */ jal func_80240054_D4D094 +/* D4D23C 802401FC 0040202D */ daddu $a0, $v0, $zero +/* D4D240 80240200 24040002 */ addiu $a0, $zero, 2 +.L80240204: +/* D4D244 80240204 3C063F80 */ lui $a2, 0x3f80 +/* D4D248 80240208 0C0B76A3 */ jal func_802DDA8C +/* D4D24C 8024020C 0040282D */ daddu $a1, $v0, $zero +/* D4D250 80240210 8E020000 */ lw $v0, ($s0) +/* D4D254 80240214 3C030002 */ lui $v1, 2 +/* D4D258 80240218 00431024 */ and $v0, $v0, $v1 +/* D4D25C 8024021C 54400022 */ bnel $v0, $zero, .L802402A8 +/* D4D260 80240220 24110011 */ addiu $s1, $zero, 0x11 +/* D4D264 80240224 9203000E */ lbu $v1, 0xe($s0) +/* D4D268 80240228 3C02802E */ lui $v0, 0x802e +/* D4D26C 8024022C 90429D70 */ lbu $v0, -0x6290($v0) +/* D4D270 80240230 10620018 */ beq $v1, $v0, .L80240294 +/* D4D274 80240234 2C6200FE */ sltiu $v0, $v1, 0xfe +/* D4D278 80240238 1040000B */ beqz $v0, .L80240268 +/* D4D27C 8024023C 24110011 */ addiu $s1, $zero, 0x11 +/* D4D280 80240240 24040002 */ addiu $a0, $zero, 2 +/* D4D284 80240244 2405FFFF */ addiu $a1, $zero, -1 +/* D4D288 80240248 24060007 */ addiu $a2, $zero, 7 +/* D4D28C 8024024C 0060102D */ daddu $v0, $v1, $zero +/* D4D290 80240250 0000382D */ daddu $a3, $zero, $zero +/* D4D294 80240254 AFA00010 */ sw $zero, 0x10($sp) +/* D4D298 80240258 AFA00014 */ sw $zero, 0x14($sp) +/* D4D29C 8024025C AFA0001C */ sw $zero, 0x1c($sp) +/* D4D2A0 80240260 080900A3 */ j .L8024028C +/* D4D2A4 80240264 AFA20018 */ sw $v0, 0x18($sp) +.L80240268: +/* D4D2A8 80240268 2411000D */ addiu $s1, $zero, 0xd +/* D4D2AC 8024026C 24040002 */ addiu $a0, $zero, 2 +/* D4D2B0 80240270 2405FFFF */ addiu $a1, $zero, -1 +/* D4D2B4 80240274 0000302D */ daddu $a2, $zero, $zero +/* D4D2B8 80240278 00C0382D */ daddu $a3, $a2, $zero +/* D4D2BC 8024027C AFA00010 */ sw $zero, 0x10($sp) +/* D4D2C0 80240280 AFA00014 */ sw $zero, 0x14($sp) +/* D4D2C4 80240284 AFA00018 */ sw $zero, 0x18($sp) +/* D4D2C8 80240288 AFA0001C */ sw $zero, 0x1c($sp) +.L8024028C: +/* D4D2CC 8024028C 0C0B77B9 */ jal func_802DDEE4 +/* D4D2D0 80240290 00000000 */ nop +.L80240294: +/* D4D2D4 80240294 9202000E */ lbu $v0, 0xe($s0) +/* D4D2D8 80240298 3C01802E */ lui $at, 0x802e +/* D4D2DC 8024029C A0229D70 */ sb $v0, -0x6290($at) +/* D4D2E0 802402A0 080900AD */ j .L802402B4 +/* D4D2E4 802402A4 0240202D */ daddu $a0, $s2, $zero +.L802402A8: +/* D4D2E8 802402A8 3C01802E */ lui $at, 0x802e +/* D4D2EC 802402AC A0209D70 */ sb $zero, -0x6290($at) +/* D4D2F0 802402B0 0240202D */ daddu $a0, $s2, $zero +.L802402B4: +/* D4D2F4 802402B4 AC910000 */ sw $s1, ($a0) +/* D4D2F8 802402B8 AC900008 */ sw $s0, 8($a0) +/* D4D2FC 802402BC 8FA20038 */ lw $v0, 0x38($sp) +/* D4D300 802402C0 3C038024 */ lui $v1, 0x8024 +/* D4D304 802402C4 246302F0 */ addiu $v1, $v1, 0x2f0 +/* D4D308 802402C8 AC83000C */ sw $v1, 0xc($a0) +/* D4D30C 802402CC 00021023 */ negu $v0, $v0 +/* D4D310 802402D0 0C047644 */ jal queue_render_task +/* D4D314 802402D4 AC820004 */ sw $v0, 4($a0) +.L802402D8: +/* D4D318 802402D8 8FBF004C */ lw $ra, 0x4c($sp) +/* D4D31C 802402DC 8FB20048 */ lw $s2, 0x48($sp) +/* D4D320 802402E0 8FB10044 */ lw $s1, 0x44($sp) +/* D4D324 802402E4 8FB00040 */ lw $s0, 0x40($sp) +/* D4D328 802402E8 03E00008 */ jr $ra +/* D4D32C 802402EC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238.s deleted file mode 100644 index d311e11944..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241238 -/* D4E278 80241238 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4E27C 8024123C AFBF0010 */ sw $ra, 0x10($sp) -/* D4E280 80241240 8C82000C */ lw $v0, 0xc($a0) -/* D4E284 80241244 0C0B1EAF */ jal get_variable -/* D4E288 80241248 8C450000 */ lw $a1, ($v0) -/* D4E28C 8024124C 0040182D */ daddu $v1, $v0, $zero -/* D4E290 80241250 10600012 */ beqz $v1, .L8024129C -/* D4E294 80241254 0000202D */ daddu $a0, $zero, $zero -/* D4E298 80241258 8C620000 */ lw $v0, ($v1) -/* D4E29C 8024125C 5040000A */ beql $v0, $zero, .L80241288 -/* D4E2A0 80241260 00041080 */ sll $v0, $a0, 2 -/* D4E2A4 80241264 3C058024 */ lui $a1, 0x8024 -/* D4E2A8 80241268 24A52FB0 */ addiu $a1, $a1, 0x2fb0 -.L8024126C: -/* D4E2AC 8024126C 24630004 */ addiu $v1, $v1, 4 -/* D4E2B0 80241270 24840001 */ addiu $a0, $a0, 1 -/* D4E2B4 80241274 ACA20000 */ sw $v0, ($a1) -/* D4E2B8 80241278 8C620000 */ lw $v0, ($v1) -/* D4E2BC 8024127C 1440FFFB */ bnez $v0, .L8024126C -/* D4E2C0 80241280 24A50004 */ addiu $a1, $a1, 4 -/* D4E2C4 80241284 00041080 */ sll $v0, $a0, 2 -.L80241288: -/* D4E2C8 80241288 3C018024 */ lui $at, 0x8024 -/* D4E2CC 8024128C 00220821 */ addu $at, $at, $v0 -/* D4E2D0 80241290 AC202FB0 */ sw $zero, 0x2fb0($at) -/* D4E2D4 80241294 080904B1 */ j .L802412C4 -/* D4E2D8 80241298 00000000 */ nop -.L8024129C: -/* D4E2DC 8024129C 3C038024 */ lui $v1, 0x8024 -/* D4E2E0 802412A0 24632FB0 */ addiu $v1, $v1, 0x2fb0 -/* D4E2E4 802412A4 0060282D */ daddu $a1, $v1, $zero -.L802412A8: -/* D4E2E8 802412A8 24820010 */ addiu $v0, $a0, 0x10 -/* D4E2EC 802412AC AC620000 */ sw $v0, ($v1) -/* D4E2F0 802412B0 24630004 */ addiu $v1, $v1, 4 -/* D4E2F4 802412B4 24840001 */ addiu $a0, $a0, 1 -/* D4E2F8 802412B8 28820070 */ slti $v0, $a0, 0x70 -/* D4E2FC 802412BC 1440FFFA */ bnez $v0, .L802412A8 -/* D4E300 802412C0 ACA001C0 */ sw $zero, 0x1c0($a1) -.L802412C4: -/* D4E304 802412C4 8FBF0010 */ lw $ra, 0x10($sp) -/* D4E308 802412C8 24020002 */ addiu $v0, $zero, 2 -/* D4E30C 802412CC 03E00008 */ jr $ra -/* D4E310 802412D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s new file mode 100644 index 0000000000..c57e16fe05 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80241238_D4E278.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241238_D4E278 +/* D4E278 80241238 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D4E27C 8024123C AFBF0010 */ sw $ra, 0x10($sp) +/* D4E280 80241240 8C82000C */ lw $v0, 0xc($a0) +/* D4E284 80241244 0C0B1EAF */ jal get_variable +/* D4E288 80241248 8C450000 */ lw $a1, ($v0) +/* D4E28C 8024124C 0040182D */ daddu $v1, $v0, $zero +/* D4E290 80241250 10600012 */ beqz $v1, .L8024129C +/* D4E294 80241254 0000202D */ daddu $a0, $zero, $zero +/* D4E298 80241258 8C620000 */ lw $v0, ($v1) +/* D4E29C 8024125C 5040000A */ beql $v0, $zero, .L80241288 +/* D4E2A0 80241260 00041080 */ sll $v0, $a0, 2 +/* D4E2A4 80241264 3C058024 */ lui $a1, 0x8024 +/* D4E2A8 80241268 24A52FB0 */ addiu $a1, $a1, 0x2fb0 +.L8024126C: +/* D4E2AC 8024126C 24630004 */ addiu $v1, $v1, 4 +/* D4E2B0 80241270 24840001 */ addiu $a0, $a0, 1 +/* D4E2B4 80241274 ACA20000 */ sw $v0, ($a1) +/* D4E2B8 80241278 8C620000 */ lw $v0, ($v1) +/* D4E2BC 8024127C 1440FFFB */ bnez $v0, .L8024126C +/* D4E2C0 80241280 24A50004 */ addiu $a1, $a1, 4 +/* D4E2C4 80241284 00041080 */ sll $v0, $a0, 2 +.L80241288: +/* D4E2C8 80241288 3C018024 */ lui $at, 0x8024 +/* D4E2CC 8024128C 00220821 */ addu $at, $at, $v0 +/* D4E2D0 80241290 AC202FB0 */ sw $zero, 0x2fb0($at) +/* D4E2D4 80241294 080904B1 */ j .L802412C4 +/* D4E2D8 80241298 00000000 */ nop +.L8024129C: +/* D4E2DC 8024129C 3C038024 */ lui $v1, 0x8024 +/* D4E2E0 802412A0 24632FB0 */ addiu $v1, $v1, 0x2fb0 +/* D4E2E4 802412A4 0060282D */ daddu $a1, $v1, $zero +.L802412A8: +/* D4E2E8 802412A8 24820010 */ addiu $v0, $a0, 0x10 +/* D4E2EC 802412AC AC620000 */ sw $v0, ($v1) +/* D4E2F0 802412B0 24630004 */ addiu $v1, $v1, 4 +/* D4E2F4 802412B4 24840001 */ addiu $a0, $a0, 1 +/* D4E2F8 802412B8 28820070 */ slti $v0, $a0, 0x70 +/* D4E2FC 802412BC 1440FFFA */ bnez $v0, .L802412A8 +/* D4E300 802412C0 ACA001C0 */ sw $zero, 0x1c0($a1) +.L802412C4: +/* D4E304 802412C4 8FBF0010 */ lw $ra, 0x10($sp) +/* D4E308 802412C8 24020002 */ addiu $v0, $zero, 2 +/* D4E30C 802412CC 03E00008 */ jr $ra +/* D4E310 802412D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s index c0f934b1ac..b44857d3df 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s @@ -37,7 +37,7 @@ glabel func_80240128_D50118 /* D50198 802401A8 0C00B94E */ jal get_screen_coords /* D5019C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D501A0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D501A4 802401B4 0C090008 */ jal func_80240020 +/* D501A4 802401B4 0C090008 */ jal func_80240020_D50010 /* D501A8 802401B8 00000000 */ nop /* D501AC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D501B0 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D50118 /* D501DC 802401EC 00000000 */ nop /* D501E0 802401F0 45000004 */ bc1f .L80240204 /* D501E4 802401F4 00000000 */ nop -/* D501E8 802401F8 0C090015 */ jal func_80240054 +/* D501E8 802401F8 0C090015 */ jal func_80240054_D50044 /* D501EC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D501F0 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310.s deleted file mode 100644 index a26168e806..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241310 -/* D51300 80241310 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* D51304 80241314 AFB10014 */ sw $s1, 0x14($sp) -/* D51308 80241318 0080882D */ daddu $s1, $a0, $zero -/* D5130C 8024131C AFBF001C */ sw $ra, 0x1c($sp) -/* D51310 80241320 AFB20018 */ sw $s2, 0x18($sp) -/* D51314 80241324 AFB00010 */ sw $s0, 0x10($sp) -/* D51318 80241328 F7B80030 */ sdc1 $f24, 0x30($sp) -/* D5131C 8024132C F7B60028 */ sdc1 $f22, 0x28($sp) -/* D51320 80241330 F7B40020 */ sdc1 $f20, 0x20($sp) -/* D51324 80241334 8E30000C */ lw $s0, 0xc($s1) -/* D51328 80241338 8E050000 */ lw $a1, ($s0) -/* D5132C 8024133C 0C0B1EAF */ jal get_variable -/* D51330 80241340 26100004 */ addiu $s0, $s0, 4 -/* D51334 80241344 8E050000 */ lw $a1, ($s0) -/* D51338 80241348 26100004 */ addiu $s0, $s0, 4 -/* D5133C 8024134C 0220202D */ daddu $a0, $s1, $zero -/* D51340 80241350 0C0B1EAF */ jal get_variable -/* D51344 80241354 0040902D */ daddu $s2, $v0, $zero -/* D51348 80241358 8E050000 */ lw $a1, ($s0) -/* D5134C 8024135C 26100004 */ addiu $s0, $s0, 4 -/* D51350 80241360 4482C000 */ mtc1 $v0, $f24 -/* D51354 80241364 00000000 */ nop -/* D51358 80241368 4680C620 */ cvt.s.w $f24, $f24 -/* D5135C 8024136C 0C0B1EAF */ jal get_variable -/* D51360 80241370 0220202D */ daddu $a0, $s1, $zero -/* D51364 80241374 8E050000 */ lw $a1, ($s0) -/* D51368 80241378 4482B000 */ mtc1 $v0, $f22 -/* D5136C 8024137C 00000000 */ nop -/* D51370 80241380 4680B5A0 */ cvt.s.w $f22, $f22 -/* D51374 80241384 0C0B1EAF */ jal get_variable -/* D51378 80241388 0220202D */ daddu $a0, $s1, $zero -/* D5137C 8024138C 4482A000 */ mtc1 $v0, $f20 -/* D51380 80241390 00000000 */ nop -/* D51384 80241394 4680A520 */ cvt.s.w $f20, $f20 -/* D51388 80241398 0C04417A */ jal get_entity_by_index -/* D5138C 8024139C 0240202D */ daddu $a0, $s2, $zero -/* D51390 802413A0 0040182D */ daddu $v1, $v0, $zero -/* D51394 802413A4 E4780048 */ swc1 $f24, 0x48($v1) -/* D51398 802413A8 E476004C */ swc1 $f22, 0x4c($v1) -/* D5139C 802413AC E4740050 */ swc1 $f20, 0x50($v1) -/* D513A0 802413B0 8FBF001C */ lw $ra, 0x1c($sp) -/* D513A4 802413B4 8FB20018 */ lw $s2, 0x18($sp) -/* D513A8 802413B8 8FB10014 */ lw $s1, 0x14($sp) -/* D513AC 802413BC 8FB00010 */ lw $s0, 0x10($sp) -/* D513B0 802413C0 D7B80030 */ ldc1 $f24, 0x30($sp) -/* D513B4 802413C4 D7B60028 */ ldc1 $f22, 0x28($sp) -/* D513B8 802413C8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D513BC 802413CC 24020002 */ addiu $v0, $zero, 2 -/* D513C0 802413D0 03E00008 */ jr $ra -/* D513C4 802413D4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310_D51300.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310_D51300.s new file mode 100644 index 0000000000..5c4cd1ab93 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80241310_D51300.s @@ -0,0 +1,54 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241310_D51300 +/* D51300 80241310 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* D51304 80241314 AFB10014 */ sw $s1, 0x14($sp) +/* D51308 80241318 0080882D */ daddu $s1, $a0, $zero +/* D5130C 8024131C AFBF001C */ sw $ra, 0x1c($sp) +/* D51310 80241320 AFB20018 */ sw $s2, 0x18($sp) +/* D51314 80241324 AFB00010 */ sw $s0, 0x10($sp) +/* D51318 80241328 F7B80030 */ sdc1 $f24, 0x30($sp) +/* D5131C 8024132C F7B60028 */ sdc1 $f22, 0x28($sp) +/* D51320 80241330 F7B40020 */ sdc1 $f20, 0x20($sp) +/* D51324 80241334 8E30000C */ lw $s0, 0xc($s1) +/* D51328 80241338 8E050000 */ lw $a1, ($s0) +/* D5132C 8024133C 0C0B1EAF */ jal get_variable +/* D51330 80241340 26100004 */ addiu $s0, $s0, 4 +/* D51334 80241344 8E050000 */ lw $a1, ($s0) +/* D51338 80241348 26100004 */ addiu $s0, $s0, 4 +/* D5133C 8024134C 0220202D */ daddu $a0, $s1, $zero +/* D51340 80241350 0C0B1EAF */ jal get_variable +/* D51344 80241354 0040902D */ daddu $s2, $v0, $zero +/* D51348 80241358 8E050000 */ lw $a1, ($s0) +/* D5134C 8024135C 26100004 */ addiu $s0, $s0, 4 +/* D51350 80241360 4482C000 */ mtc1 $v0, $f24 +/* D51354 80241364 00000000 */ nop +/* D51358 80241368 4680C620 */ cvt.s.w $f24, $f24 +/* D5135C 8024136C 0C0B1EAF */ jal get_variable +/* D51360 80241370 0220202D */ daddu $a0, $s1, $zero +/* D51364 80241374 8E050000 */ lw $a1, ($s0) +/* D51368 80241378 4482B000 */ mtc1 $v0, $f22 +/* D5136C 8024137C 00000000 */ nop +/* D51370 80241380 4680B5A0 */ cvt.s.w $f22, $f22 +/* D51374 80241384 0C0B1EAF */ jal get_variable +/* D51378 80241388 0220202D */ daddu $a0, $s1, $zero +/* D5137C 8024138C 4482A000 */ mtc1 $v0, $f20 +/* D51380 80241390 00000000 */ nop +/* D51384 80241394 4680A520 */ cvt.s.w $f20, $f20 +/* D51388 80241398 0C04417A */ jal get_entity_by_index +/* D5138C 8024139C 0240202D */ daddu $a0, $s2, $zero +/* D51390 802413A0 0040182D */ daddu $v1, $v0, $zero +/* D51394 802413A4 E4780048 */ swc1 $f24, 0x48($v1) +/* D51398 802413A8 E476004C */ swc1 $f22, 0x4c($v1) +/* D5139C 802413AC E4740050 */ swc1 $f20, 0x50($v1) +/* D513A0 802413B0 8FBF001C */ lw $ra, 0x1c($sp) +/* D513A4 802413B4 8FB20018 */ lw $s2, 0x18($sp) +/* D513A8 802413B8 8FB10014 */ lw $s1, 0x14($sp) +/* D513AC 802413BC 8FB00010 */ lw $s0, 0x10($sp) +/* D513B0 802413C0 D7B80030 */ ldc1 $f24, 0x30($sp) +/* D513B4 802413C4 D7B60028 */ ldc1 $f22, 0x28($sp) +/* D513B8 802413C8 D7B40020 */ ldc1 $f20, 0x20($sp) +/* D513BC 802413CC 24020002 */ addiu $v0, $zero, 2 +/* D513C0 802413D0 03E00008 */ jr $ra +/* D513C4 802413D4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8.s deleted file mode 100644 index d4f1fd61e9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413D8 -/* D513C8 802413D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D513CC 802413DC AFB20018 */ sw $s2, 0x18($sp) -/* D513D0 802413E0 0080902D */ daddu $s2, $a0, $zero -/* D513D4 802413E4 AFBF001C */ sw $ra, 0x1c($sp) -/* D513D8 802413E8 AFB10014 */ sw $s1, 0x14($sp) -/* D513DC 802413EC AFB00010 */ sw $s0, 0x10($sp) -/* D513E0 802413F0 8E50000C */ lw $s0, 0xc($s2) -/* D513E4 802413F4 8E050000 */ lw $a1, ($s0) -/* D513E8 802413F8 0C0B1EAF */ jal get_variable -/* D513EC 802413FC 26100004 */ addiu $s0, $s0, 4 -/* D513F0 80241400 0C04417A */ jal get_entity_by_index -/* D513F4 80241404 0040202D */ daddu $a0, $v0, $zero -/* D513F8 80241408 8E050000 */ lw $a1, ($s0) -/* D513FC 8024140C 26100004 */ addiu $s0, $s0, 4 -/* D51400 80241410 0040882D */ daddu $s1, $v0, $zero -/* D51404 80241414 C6200048 */ lwc1 $f0, 0x48($s1) -/* D51408 80241418 4600008D */ trunc.w.s $f2, $f0 -/* D5140C 8024141C 44061000 */ mfc1 $a2, $f2 -/* D51410 80241420 0C0B2026 */ jal set_variable -/* D51414 80241424 0240202D */ daddu $a0, $s2, $zero -/* D51418 80241428 8E050000 */ lw $a1, ($s0) -/* D5141C 8024142C 26100004 */ addiu $s0, $s0, 4 -/* D51420 80241430 C620004C */ lwc1 $f0, 0x4c($s1) -/* D51424 80241434 4600008D */ trunc.w.s $f2, $f0 -/* D51428 80241438 44061000 */ mfc1 $a2, $f2 -/* D5142C 8024143C 0C0B2026 */ jal set_variable -/* D51430 80241440 0240202D */ daddu $a0, $s2, $zero -/* D51434 80241444 C6200050 */ lwc1 $f0, 0x50($s1) -/* D51438 80241448 8E050000 */ lw $a1, ($s0) -/* D5143C 8024144C 4600008D */ trunc.w.s $f2, $f0 -/* D51440 80241450 44061000 */ mfc1 $a2, $f2 -/* D51444 80241454 0C0B2026 */ jal set_variable -/* D51448 80241458 0240202D */ daddu $a0, $s2, $zero -/* D5144C 8024145C 8FBF001C */ lw $ra, 0x1c($sp) -/* D51450 80241460 8FB20018 */ lw $s2, 0x18($sp) -/* D51454 80241464 8FB10014 */ lw $s1, 0x14($sp) -/* D51458 80241468 8FB00010 */ lw $s0, 0x10($sp) -/* D5145C 8024146C 24020002 */ addiu $v0, $zero, 2 -/* D51460 80241470 03E00008 */ jr $ra -/* D51464 80241474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8_D513C8.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8_D513C8.s new file mode 100644 index 0000000000..092a037d37 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802413D8_D513C8.s @@ -0,0 +1,44 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413D8_D513C8 +/* D513C8 802413D8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D513CC 802413DC AFB20018 */ sw $s2, 0x18($sp) +/* D513D0 802413E0 0080902D */ daddu $s2, $a0, $zero +/* D513D4 802413E4 AFBF001C */ sw $ra, 0x1c($sp) +/* D513D8 802413E8 AFB10014 */ sw $s1, 0x14($sp) +/* D513DC 802413EC AFB00010 */ sw $s0, 0x10($sp) +/* D513E0 802413F0 8E50000C */ lw $s0, 0xc($s2) +/* D513E4 802413F4 8E050000 */ lw $a1, ($s0) +/* D513E8 802413F8 0C0B1EAF */ jal get_variable +/* D513EC 802413FC 26100004 */ addiu $s0, $s0, 4 +/* D513F0 80241400 0C04417A */ jal get_entity_by_index +/* D513F4 80241404 0040202D */ daddu $a0, $v0, $zero +/* D513F8 80241408 8E050000 */ lw $a1, ($s0) +/* D513FC 8024140C 26100004 */ addiu $s0, $s0, 4 +/* D51400 80241410 0040882D */ daddu $s1, $v0, $zero +/* D51404 80241414 C6200048 */ lwc1 $f0, 0x48($s1) +/* D51408 80241418 4600008D */ trunc.w.s $f2, $f0 +/* D5140C 8024141C 44061000 */ mfc1 $a2, $f2 +/* D51410 80241420 0C0B2026 */ jal set_variable +/* D51414 80241424 0240202D */ daddu $a0, $s2, $zero +/* D51418 80241428 8E050000 */ lw $a1, ($s0) +/* D5141C 8024142C 26100004 */ addiu $s0, $s0, 4 +/* D51420 80241430 C620004C */ lwc1 $f0, 0x4c($s1) +/* D51424 80241434 4600008D */ trunc.w.s $f2, $f0 +/* D51428 80241438 44061000 */ mfc1 $a2, $f2 +/* D5142C 8024143C 0C0B2026 */ jal set_variable +/* D51430 80241440 0240202D */ daddu $a0, $s2, $zero +/* D51434 80241444 C6200050 */ lwc1 $f0, 0x50($s1) +/* D51438 80241448 8E050000 */ lw $a1, ($s0) +/* D5143C 8024144C 4600008D */ trunc.w.s $f2, $f0 +/* D51440 80241450 44061000 */ mfc1 $a2, $f2 +/* D51444 80241454 0C0B2026 */ jal set_variable +/* D51448 80241458 0240202D */ daddu $a0, $s2, $zero +/* D5144C 8024145C 8FBF001C */ lw $ra, 0x1c($sp) +/* D51450 80241460 8FB20018 */ lw $s2, 0x18($sp) +/* D51454 80241464 8FB10014 */ lw $s1, 0x14($sp) +/* D51458 80241468 8FB00010 */ lw $s0, 0x10($sp) +/* D5145C 8024146C 24020002 */ addiu $v0, $zero, 2 +/* D51460 80241470 03E00008 */ jr $ra +/* D51464 80241474 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802415BC.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802415BC.s deleted file mode 100644 index d54cc68c93..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802415BC.s +++ /dev/null @@ -1,45 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415BC -/* D515AC 802415BC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D515B0 802415C0 AFB20018 */ sw $s2, 0x18($sp) -/* D515B4 802415C4 0080902D */ daddu $s2, $a0, $zero -/* D515B8 802415C8 AFBF001C */ sw $ra, 0x1c($sp) -/* D515BC 802415CC AFB10014 */ sw $s1, 0x14($sp) -/* D515C0 802415D0 AFB00010 */ sw $s0, 0x10($sp) -/* D515C4 802415D4 8E50000C */ lw $s0, 0xc($s2) -/* D515C8 802415D8 8E050000 */ lw $a1, ($s0) -/* D515CC 802415DC 0C0B1EAF */ jal get_variable -/* D515D0 802415E0 26100004 */ addiu $s0, $s0, 4 -/* D515D4 802415E4 0C04417A */ jal get_entity_by_index -/* D515D8 802415E8 0040202D */ daddu $a0, $v0, $zero -/* D515DC 802415EC 8E050000 */ lw $a1, ($s0) -/* D515E0 802415F0 26100004 */ addiu $s0, $s0, 4 -/* D515E4 802415F4 0040882D */ daddu $s1, $v0, $zero -/* D515E8 802415F8 C6200048 */ lwc1 $f0, 0x48($s1) -/* D515EC 802415FC 4600008D */ trunc.w.s $f2, $f0 -/* D515F0 80241600 44061000 */ mfc1 $a2, $f2 -/* D515F4 80241604 0C0B2026 */ jal set_variable -/* D515F8 80241608 0240202D */ daddu $a0, $s2, $zero -/* D515FC 8024160C 8E050000 */ lw $a1, ($s0) -/* D51600 80241610 26100004 */ addiu $s0, $s0, 4 -/* D51604 80241614 C620004C */ lwc1 $f0, 0x4c($s1) -/* D51608 80241618 4600008D */ trunc.w.s $f2, $f0 -/* D5160C 8024161C 44061000 */ mfc1 $a2, $f2 -/* D51610 80241620 0C0B2026 */ jal set_variable -/* D51614 80241624 0240202D */ daddu $a0, $s2, $zero -/* D51618 80241628 C6200050 */ lwc1 $f0, 0x50($s1) -/* D5161C 8024162C 8E050000 */ lw $a1, ($s0) -/* D51620 80241630 4600008D */ trunc.w.s $f2, $f0 -/* D51624 80241634 44061000 */ mfc1 $a2, $f2 -/* D51628 80241638 0C0B2026 */ jal set_variable -/* D5162C 8024163C 0240202D */ daddu $a0, $s2, $zero -/* D51630 80241640 8FBF001C */ lw $ra, 0x1c($sp) -/* D51634 80241644 8FB20018 */ lw $s2, 0x18($sp) -/* D51638 80241648 8FB10014 */ lw $s1, 0x14($sp) -/* D5163C 8024164C 8FB00010 */ lw $s0, 0x10($sp) -/* D51640 80241650 24020002 */ addiu $v0, $zero, 2 -/* D51644 80241654 03E00008 */ jr $ra -/* D51648 80241658 27BD0020 */ addiu $sp, $sp, 0x20 -/* D5164C 8024165C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802415BC_D515AC.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802415BC_D515AC.s new file mode 100644 index 0000000000..d049239ace --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_802415BC_D515AC.s @@ -0,0 +1,45 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415BC_D515AC +/* D515AC 802415BC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D515B0 802415C0 AFB20018 */ sw $s2, 0x18($sp) +/* D515B4 802415C4 0080902D */ daddu $s2, $a0, $zero +/* D515B8 802415C8 AFBF001C */ sw $ra, 0x1c($sp) +/* D515BC 802415CC AFB10014 */ sw $s1, 0x14($sp) +/* D515C0 802415D0 AFB00010 */ sw $s0, 0x10($sp) +/* D515C4 802415D4 8E50000C */ lw $s0, 0xc($s2) +/* D515C8 802415D8 8E050000 */ lw $a1, ($s0) +/* D515CC 802415DC 0C0B1EAF */ jal get_variable +/* D515D0 802415E0 26100004 */ addiu $s0, $s0, 4 +/* D515D4 802415E4 0C04417A */ jal get_entity_by_index +/* D515D8 802415E8 0040202D */ daddu $a0, $v0, $zero +/* D515DC 802415EC 8E050000 */ lw $a1, ($s0) +/* D515E0 802415F0 26100004 */ addiu $s0, $s0, 4 +/* D515E4 802415F4 0040882D */ daddu $s1, $v0, $zero +/* D515E8 802415F8 C6200048 */ lwc1 $f0, 0x48($s1) +/* D515EC 802415FC 4600008D */ trunc.w.s $f2, $f0 +/* D515F0 80241600 44061000 */ mfc1 $a2, $f2 +/* D515F4 80241604 0C0B2026 */ jal set_variable +/* D515F8 80241608 0240202D */ daddu $a0, $s2, $zero +/* D515FC 8024160C 8E050000 */ lw $a1, ($s0) +/* D51600 80241610 26100004 */ addiu $s0, $s0, 4 +/* D51604 80241614 C620004C */ lwc1 $f0, 0x4c($s1) +/* D51608 80241618 4600008D */ trunc.w.s $f2, $f0 +/* D5160C 8024161C 44061000 */ mfc1 $a2, $f2 +/* D51610 80241620 0C0B2026 */ jal set_variable +/* D51614 80241624 0240202D */ daddu $a0, $s2, $zero +/* D51618 80241628 C6200050 */ lwc1 $f0, 0x50($s1) +/* D5161C 8024162C 8E050000 */ lw $a1, ($s0) +/* D51620 80241630 4600008D */ trunc.w.s $f2, $f0 +/* D51624 80241634 44061000 */ mfc1 $a2, $f2 +/* D51628 80241638 0C0B2026 */ jal set_variable +/* D5162C 8024163C 0240202D */ daddu $a0, $s2, $zero +/* D51630 80241640 8FBF001C */ lw $ra, 0x1c($sp) +/* D51634 80241644 8FB20018 */ lw $s2, 0x18($sp) +/* D51638 80241648 8FB10014 */ lw $s1, 0x14($sp) +/* D5163C 8024164C 8FB00010 */ lw $s0, 0x10($sp) +/* D51640 80241650 24020002 */ addiu $v0, $zero, 2 +/* D51644 80241654 03E00008 */ jr $ra +/* D51648 80241658 27BD0020 */ addiu $sp, $sp, 0x20 +/* D5164C 8024165C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138.s b/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138.s deleted file mode 100644 index e607ebbde6..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240138 -/* D53DE8 80240138 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D53DEC 8024013C AFB10014 */ sw $s1, 0x14($sp) -/* D53DF0 80240140 0080882D */ daddu $s1, $a0, $zero -/* D53DF4 80240144 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* D53DF8 80240148 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* D53DFC 8024014C AFBF0018 */ sw $ra, 0x18($sp) -/* D53E00 80240150 AFB00010 */ sw $s0, 0x10($sp) -/* D53E04 80240154 84430018 */ lh $v1, 0x18($v0) -/* D53E08 80240158 14600005 */ bnez $v1, .L80240170 -/* D53E0C 8024015C 0040802D */ daddu $s0, $v0, $zero -/* D53E10 80240160 3C05FD05 */ lui $a1, 0xfd05 -/* D53E14 80240164 34A50F80 */ ori $a1, $a1, 0xf80 -/* D53E18 80240168 0C0B2026 */ jal set_variable -/* D53E1C 8024016C 0000302D */ daddu $a2, $zero, $zero -.L80240170: -/* D53E20 80240170 86030018 */ lh $v1, 0x18($s0) -/* D53E24 80240174 2402FF38 */ addiu $v0, $zero, -0xc8 -/* D53E28 80240178 14620005 */ bne $v1, $v0, .L80240190 -/* D53E2C 8024017C 0220202D */ daddu $a0, $s1, $zero -/* D53E30 80240180 3C05FD05 */ lui $a1, 0xfd05 -/* D53E34 80240184 34A50F80 */ ori $a1, $a1, 0xf80 -/* D53E38 80240188 0C0B2026 */ jal set_variable -/* D53E3C 8024018C 24060001 */ addiu $a2, $zero, 1 -.L80240190: -/* D53E40 80240190 8FBF0018 */ lw $ra, 0x18($sp) -/* D53E44 80240194 8FB10014 */ lw $s1, 0x14($sp) -/* D53E48 80240198 8FB00010 */ lw $s0, 0x10($sp) -/* D53E4C 8024019C 0000102D */ daddu $v0, $zero, $zero -/* D53E50 802401A0 03E00008 */ jr $ra -/* D53E54 802401A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* D53E58 802401A8 00000000 */ nop -/* D53E5C 802401AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s b/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s new file mode 100644 index 0000000000..e089704ae1 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_03/D53CD0/func_80240138_D53DE8.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240138_D53DE8 +/* D53DE8 80240138 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D53DEC 8024013C AFB10014 */ sw $s1, 0x14($sp) +/* D53DF0 80240140 0080882D */ daddu $s1, $a0, $zero +/* D53DF4 80240144 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* D53DF8 80240148 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* D53DFC 8024014C AFBF0018 */ sw $ra, 0x18($sp) +/* D53E00 80240150 AFB00010 */ sw $s0, 0x10($sp) +/* D53E04 80240154 84430018 */ lh $v1, 0x18($v0) +/* D53E08 80240158 14600005 */ bnez $v1, .L80240170 +/* D53E0C 8024015C 0040802D */ daddu $s0, $v0, $zero +/* D53E10 80240160 3C05FD05 */ lui $a1, 0xfd05 +/* D53E14 80240164 34A50F80 */ ori $a1, $a1, 0xf80 +/* D53E18 80240168 0C0B2026 */ jal set_variable +/* D53E1C 8024016C 0000302D */ daddu $a2, $zero, $zero +.L80240170: +/* D53E20 80240170 86030018 */ lh $v1, 0x18($s0) +/* D53E24 80240174 2402FF38 */ addiu $v0, $zero, -0xc8 +/* D53E28 80240178 14620005 */ bne $v1, $v0, .L80240190 +/* D53E2C 8024017C 0220202D */ daddu $a0, $s1, $zero +/* D53E30 80240180 3C05FD05 */ lui $a1, 0xfd05 +/* D53E34 80240184 34A50F80 */ ori $a1, $a1, 0xf80 +/* D53E38 80240188 0C0B2026 */ jal set_variable +/* D53E3C 8024018C 24060001 */ addiu $a2, $zero, 1 +.L80240190: +/* D53E40 80240190 8FBF0018 */ lw $ra, 0x18($sp) +/* D53E44 80240194 8FB10014 */ lw $s1, 0x14($sp) +/* D53E48 80240198 8FB00010 */ lw $s0, 0x10($sp) +/* D53E4C 8024019C 0000102D */ daddu $v0, $zero, $zero +/* D53E50 802401A0 03E00008 */ jr $ra +/* D53E54 802401A4 27BD0020 */ addiu $sp, $sp, 0x20 +/* D53E58 802401A8 00000000 */ nop +/* D53E5C 802401AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s index 27908897fd..fb4cd0c6c5 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D55CD8 /* D55D58 802401A8 0C00B94E */ jal get_screen_coords /* D55D5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D55D60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D55D64 802401B4 0C090008 */ jal func_80240020 +/* D55D64 802401B4 0C090008 */ jal func_80240020_D55BD0 /* D55D68 802401B8 00000000 */ nop /* D55D6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D55D70 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D55CD8 /* D55D9C 802401EC 00000000 */ nop /* D55DA0 802401F0 45000004 */ bc1f .L80240204 /* D55DA4 802401F4 00000000 */ nop -/* D55DA8 802401F8 0C090015 */ jal func_80240054 +/* D55DA8 802401F8 0C090015 */ jal func_80240054_D55C04 /* D55DAC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D55DB0 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188.s deleted file mode 100644 index 331f8d3f38..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241188 -/* D56D38 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D56D3C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* D56D40 80241190 0080802D */ daddu $s0, $a0, $zero -/* D56D44 80241194 AFBF0014 */ sw $ra, 0x14($sp) -/* D56D48 80241198 8E02000C */ lw $v0, 0xc($s0) -/* D56D4C 8024119C 0C0B1EAF */ jal get_variable -/* D56D50 802411A0 8C450000 */ lw $a1, ($v0) -/* D56D54 802411A4 00021140 */ sll $v0, $v0, 5 -/* D56D58 802411A8 AE000084 */ sw $zero, 0x84($s0) -/* D56D5C 802411AC 3C018008 */ lui $at, 0x8008 -/* D56D60 802411B0 00220821 */ addu $at, $at, $v0 -/* D56D64 802411B4 942278F8 */ lhu $v0, 0x78f8($at) -/* D56D68 802411B8 30420040 */ andi $v0, $v0, 0x40 -/* D56D6C 802411BC 10400002 */ beqz $v0, .L802411C8 -/* D56D70 802411C0 24020001 */ addiu $v0, $zero, 1 -/* D56D74 802411C4 AE020084 */ sw $v0, 0x84($s0) -.L802411C8: -/* D56D78 802411C8 8FBF0014 */ lw $ra, 0x14($sp) -/* D56D7C 802411CC 8FB00010 */ lw $s0, 0x10($sp) -/* D56D80 802411D0 24020002 */ addiu $v0, $zero, 2 -/* D56D84 802411D4 03E00008 */ jr $ra -/* D56D88 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* D56D8C 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s new file mode 100644 index 0000000000..8d12a9f9be --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80241188_D56D38.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241188_D56D38 +/* D56D38 80241188 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D56D3C 8024118C AFB00010 */ sw $s0, 0x10($sp) +/* D56D40 80241190 0080802D */ daddu $s0, $a0, $zero +/* D56D44 80241194 AFBF0014 */ sw $ra, 0x14($sp) +/* D56D48 80241198 8E02000C */ lw $v0, 0xc($s0) +/* D56D4C 8024119C 0C0B1EAF */ jal get_variable +/* D56D50 802411A0 8C450000 */ lw $a1, ($v0) +/* D56D54 802411A4 00021140 */ sll $v0, $v0, 5 +/* D56D58 802411A8 AE000084 */ sw $zero, 0x84($s0) +/* D56D5C 802411AC 3C018008 */ lui $at, 0x8008 +/* D56D60 802411B0 00220821 */ addu $at, $at, $v0 +/* D56D64 802411B4 942278F8 */ lhu $v0, 0x78f8($at) +/* D56D68 802411B8 30420040 */ andi $v0, $v0, 0x40 +/* D56D6C 802411BC 10400002 */ beqz $v0, .L802411C8 +/* D56D70 802411C0 24020001 */ addiu $v0, $zero, 1 +/* D56D74 802411C4 AE020084 */ sw $v0, 0x84($s0) +.L802411C8: +/* D56D78 802411C8 8FBF0014 */ lw $ra, 0x14($sp) +/* D56D7C 802411CC 8FB00010 */ lw $s0, 0x10($sp) +/* D56D80 802411D0 24020002 */ addiu $v0, $zero, 2 +/* D56D84 802411D4 03E00008 */ jr $ra +/* D56D88 802411D8 27BD0018 */ addiu $sp, $sp, 0x18 +/* D56D8C 802411DC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084.s deleted file mode 100644 index 18c8645fd7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240084 -/* D574B4 80240084 00041403 */ sra $v0, $a0, 0x10 -/* D574B8 80240088 304300FF */ andi $v1, $v0, 0xff -/* D574BC 8024008C 24020006 */ addiu $v0, $zero, 6 -/* D574C0 80240090 10620015 */ beq $v1, $v0, .L802400E8 -/* D574C4 80240094 28620007 */ slti $v0, $v1, 7 -/* D574C8 80240098 10400005 */ beqz $v0, .L802400B0 -/* D574CC 8024009C 24020001 */ addiu $v0, $zero, 1 -/* D574D0 802400A0 1062000A */ beq $v1, $v0, .L802400CC -/* D574D4 802400A4 3C020100 */ lui $v0, 0x100 -/* D574D8 802400A8 03E00008 */ jr $ra -/* D574DC 802400AC 00821025 */ or $v0, $a0, $v0 -.L802400B0: -/* D574E0 802400B0 2862000A */ slti $v0, $v1, 0xa -/* D574E4 802400B4 10400016 */ beqz $v0, .L80240110 -/* D574E8 802400B8 28620008 */ slti $v0, $v1, 8 -/* D574EC 802400BC 14400015 */ bnez $v0, .L80240114 -/* D574F0 802400C0 3C020100 */ lui $v0, 0x100 -/* D574F4 802400C4 03E00008 */ jr $ra -/* D574F8 802400C8 0080102D */ daddu $v0, $a0, $zero -.L802400CC: -/* D574FC 802400CC 3C020001 */ lui $v0, 1 -/* D57500 802400D0 3442000C */ ori $v0, $v0, 0xc -/* D57504 802400D4 0044102A */ slt $v0, $v0, $a0 -/* D57508 802400D8 1040000E */ beqz $v0, .L80240114 -/* D5750C 802400DC 3C020100 */ lui $v0, 0x100 -.L802400E0: -/* D57510 802400E0 03E00008 */ jr $ra -/* D57514 802400E4 0080102D */ daddu $v0, $a0, $zero -.L802400E8: -/* D57518 802400E8 3C02FFF9 */ lui $v0, 0xfff9 -/* D5751C 802400EC 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D57520 802400F0 00821821 */ addu $v1, $a0, $v0 -/* D57524 802400F4 2C620010 */ sltiu $v0, $v1, 0x10 -/* D57528 802400F8 10400005 */ beqz $v0, .L80240110 -/* D5752C 802400FC 30620001 */ andi $v0, $v1, 1 -/* D57530 80240100 1440FFF7 */ bnez $v0, .L802400E0 -/* D57534 80240104 24820001 */ addiu $v0, $a0, 1 -/* D57538 80240108 03E00008 */ jr $ra -/* D5753C 8024010C 00000000 */ nop -.L80240110: -/* D57540 80240110 3C020100 */ lui $v0, 0x100 -.L80240114: -/* D57544 80240114 03E00008 */ jr $ra -/* D57548 80240118 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084_D574B4.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084_D574B4.s new file mode 100644 index 0000000000..02a3020391 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240084_D574B4.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240084_D574B4 +/* D574B4 80240084 00041403 */ sra $v0, $a0, 0x10 +/* D574B8 80240088 304300FF */ andi $v1, $v0, 0xff +/* D574BC 8024008C 24020006 */ addiu $v0, $zero, 6 +/* D574C0 80240090 10620015 */ beq $v1, $v0, .L802400E8 +/* D574C4 80240094 28620007 */ slti $v0, $v1, 7 +/* D574C8 80240098 10400005 */ beqz $v0, .L802400B0 +/* D574CC 8024009C 24020001 */ addiu $v0, $zero, 1 +/* D574D0 802400A0 1062000A */ beq $v1, $v0, .L802400CC +/* D574D4 802400A4 3C020100 */ lui $v0, 0x100 +/* D574D8 802400A8 03E00008 */ jr $ra +/* D574DC 802400AC 00821025 */ or $v0, $a0, $v0 +.L802400B0: +/* D574E0 802400B0 2862000A */ slti $v0, $v1, 0xa +/* D574E4 802400B4 10400016 */ beqz $v0, .L80240110 +/* D574E8 802400B8 28620008 */ slti $v0, $v1, 8 +/* D574EC 802400BC 14400015 */ bnez $v0, .L80240114 +/* D574F0 802400C0 3C020100 */ lui $v0, 0x100 +/* D574F4 802400C4 03E00008 */ jr $ra +/* D574F8 802400C8 0080102D */ daddu $v0, $a0, $zero +.L802400CC: +/* D574FC 802400CC 3C020001 */ lui $v0, 1 +/* D57500 802400D0 3442000C */ ori $v0, $v0, 0xc +/* D57504 802400D4 0044102A */ slt $v0, $v0, $a0 +/* D57508 802400D8 1040000E */ beqz $v0, .L80240114 +/* D5750C 802400DC 3C020100 */ lui $v0, 0x100 +.L802400E0: +/* D57510 802400E0 03E00008 */ jr $ra +/* D57514 802400E4 0080102D */ daddu $v0, $a0, $zero +.L802400E8: +/* D57518 802400E8 3C02FFF9 */ lui $v0, 0xfff9 +/* D5751C 802400EC 3442FFF4 */ ori $v0, $v0, 0xfff4 +/* D57520 802400F0 00821821 */ addu $v1, $a0, $v0 +/* D57524 802400F4 2C620010 */ sltiu $v0, $v1, 0x10 +/* D57528 802400F8 10400005 */ beqz $v0, .L80240110 +/* D5752C 802400FC 30620001 */ andi $v0, $v1, 1 +/* D57530 80240100 1440FFF7 */ bnez $v0, .L802400E0 +/* D57534 80240104 24820001 */ addiu $v0, $a0, 1 +/* D57538 80240108 03E00008 */ jr $ra +/* D5753C 8024010C 00000000 */ nop +.L80240110: +/* D57540 80240110 3C020100 */ lui $v0, 0x100 +.L80240114: +/* D57544 80240114 03E00008 */ jr $ra +/* D57548 80240118 00821025 */ or $v0, $a0, $v0 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s index 3ecc24c17b..ae0e05920a 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s @@ -37,7 +37,7 @@ glabel func_80240158_D57588 /* D57608 802401D8 0C00B94E */ jal get_screen_coords /* D5760C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D57610 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D57614 802401E4 0C090014 */ jal func_80240050 +/* D57614 802401E4 0C090014 */ jal func_80240050_D57480 /* D57618 802401E8 00000000 */ nop /* D5761C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D57620 802401F0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240158_D57588 /* D5764C 8024021C 00000000 */ nop /* D57650 80240220 45000004 */ bc1f .L80240234 /* D57654 80240224 00000000 */ nop -/* D57658 80240228 0C090021 */ jal func_80240084 +/* D57658 80240228 0C090021 */ jal func_80240084_D574B4 /* D5765C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D57660 80240230 24040002 */ addiu $a0, $zero, 2 .L80240234: diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8.s deleted file mode 100644 index 8d9cdcc950..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE8 -/* D58318 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D5831C 80240EEC AFBF0010 */ sw $ra, 0x10($sp) -/* D58320 80240EF0 0C00EAD2 */ jal get_npc_safe -/* D58324 80240EF4 2404FFFC */ addiu $a0, $zero, -4 -/* D58328 80240EF8 0040202D */ daddu $a0, $v0, $zero -/* D5832C 80240EFC 10800004 */ beqz $a0, .L80240F10 -/* D58330 80240F00 3C030008 */ lui $v1, 8 -/* D58334 80240F04 8C820000 */ lw $v0, ($a0) -/* D58338 80240F08 00431025 */ or $v0, $v0, $v1 -/* D5833C 80240F0C AC820000 */ sw $v0, ($a0) -.L80240F10: -/* D58340 80240F10 8FBF0010 */ lw $ra, 0x10($sp) -/* D58344 80240F14 03E00008 */ jr $ra -/* D58348 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s new file mode 100644 index 0000000000..66f6fd48e4 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240EE8_D58318.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240EE8_D58318 +/* D58318 80240EE8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D5831C 80240EEC AFBF0010 */ sw $ra, 0x10($sp) +/* D58320 80240EF0 0C00EAD2 */ jal get_npc_safe +/* D58324 80240EF4 2404FFFC */ addiu $a0, $zero, -4 +/* D58328 80240EF8 0040202D */ daddu $a0, $v0, $zero +/* D5832C 80240EFC 10800004 */ beqz $a0, .L80240F10 +/* D58330 80240F00 3C030008 */ lui $v1, 8 +/* D58334 80240F04 8C820000 */ lw $v0, ($a0) +/* D58338 80240F08 00431025 */ or $v0, $v0, $v1 +/* D5833C 80240F0C AC820000 */ sw $v0, ($a0) +.L80240F10: +/* D58340 80240F10 8FBF0010 */ lw $ra, 0x10($sp) +/* D58344 80240F14 03E00008 */ jr $ra +/* D58348 80240F18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C.s deleted file mode 100644 index e8eee8c235..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F1C -/* D5834C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D58350 80240F20 AFBF0010 */ sw $ra, 0x10($sp) -/* D58354 80240F24 0C00EAD2 */ jal get_npc_safe -/* D58358 80240F28 2404FFFC */ addiu $a0, $zero, -4 -/* D5835C 80240F2C 0040202D */ daddu $a0, $v0, $zero -/* D58360 80240F30 10800004 */ beqz $a0, .L80240F44 -/* D58364 80240F34 3C030002 */ lui $v1, 2 -/* D58368 80240F38 8C820000 */ lw $v0, ($a0) -/* D5836C 80240F3C 00431025 */ or $v0, $v0, $v1 -/* D58370 80240F40 AC820000 */ sw $v0, ($a0) -.L80240F44: -/* D58374 80240F44 8FBF0010 */ lw $ra, 0x10($sp) -/* D58378 80240F48 03E00008 */ jr $ra -/* D5837C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C_D5834C.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C_D5834C.s new file mode 100644 index 0000000000..5ed59478d0 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240F1C_D5834C.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F1C_D5834C +/* D5834C 80240F1C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D58350 80240F20 AFBF0010 */ sw $ra, 0x10($sp) +/* D58354 80240F24 0C00EAD2 */ jal get_npc_safe +/* D58358 80240F28 2404FFFC */ addiu $a0, $zero, -4 +/* D5835C 80240F2C 0040202D */ daddu $a0, $v0, $zero +/* D58360 80240F30 10800004 */ beqz $a0, .L80240F44 +/* D58364 80240F34 3C030002 */ lui $v1, 2 +/* D58368 80240F38 8C820000 */ lw $v0, ($a0) +/* D5836C 80240F3C 00431025 */ or $v0, $v0, $v1 +/* D58370 80240F40 AC820000 */ sw $v0, ($a0) +.L80240F44: +/* D58374 80240F44 8FBF0010 */ lw $ra, 0x10($sp) +/* D58378 80240F48 03E00008 */ jr $ra +/* D5837C 80240F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s index 4facca2231..6491b2eeb7 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s @@ -37,7 +37,7 @@ glabel func_80240128_D589B8 /* D58A38 802401A8 0C00B94E */ jal get_screen_coords /* D58A3C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D58A40 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D58A44 802401B4 0C090008 */ jal func_80240020 +/* D58A44 802401B4 0C090008 */ jal func_80240020_D588B0 /* D58A48 802401B8 00000000 */ nop /* D58A4C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D58A50 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D589B8 /* D58A7C 802401EC 00000000 */ nop /* D58A80 802401F0 45000004 */ bc1f .L80240204 /* D58A84 802401F4 00000000 */ nop -/* D58A88 802401F8 0C090015 */ jal func_80240054 +/* D58A88 802401F8 0C090015 */ jal func_80240054_D588E4 /* D58A8C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D58A90 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s index 80a45abdfe..8309fbbb4f 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D5F3D8 /* D5F458 802401A8 0C00B94E */ jal get_screen_coords /* D5F45C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D5F460 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D5F464 802401B4 0C090008 */ jal func_80240020 +/* D5F464 802401B4 0C090008 */ jal func_80240020_D5F2D0 /* D5F468 802401B8 00000000 */ nop /* D5F46C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D5F470 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D5F3D8 /* D5F49C 802401EC 00000000 */ nop /* D5F4A0 802401F0 45000004 */ bc1f .L80240204 /* D5F4A4 802401F4 00000000 */ nop -/* D5F4A8 802401F8 0C090015 */ jal func_80240054 +/* D5F4A8 802401F8 0C090015 */ jal func_80240054_D5F304 /* D5F4AC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D5F4B0 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s index 3bec3962a1..f07d561c4b 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s @@ -37,7 +37,7 @@ glabel func_80240128_D61628 /* D616A8 802401A8 0C00B94E */ jal get_screen_coords /* D616AC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D616B0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D616B4 802401B4 0C090008 */ jal func_80240020 +/* D616B4 802401B4 0C090008 */ jal func_80240020_D61520 /* D616B8 802401B8 00000000 */ nop /* D616BC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D616C0 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D61628 /* D616EC 802401EC 00000000 */ nop /* D616F0 802401F0 45000004 */ bc1f .L80240204 /* D616F4 802401F4 00000000 */ nop -/* D616F8 802401F8 0C090015 */ jal func_80240054 +/* D616F8 802401F8 0C090015 */ jal func_80240054_D61554 /* D616FC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D61700 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s index b2e9243f49..17c2dd065d 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s @@ -37,7 +37,7 @@ glabel func_80240158_D62E68 /* D62EE8 802401D8 0C00B94E */ jal get_screen_coords /* D62EEC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D62EF0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D62EF4 802401E4 0C090014 */ jal func_80240050 +/* D62EF4 802401E4 0C090014 */ jal func_80240050_D62D60 /* D62EF8 802401E8 00000000 */ nop /* D62EFC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D62F00 802401F0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240158_D62E68 /* D62F2C 8024021C 00000000 */ nop /* D62F30 80240220 45000004 */ bc1f .L80240234 /* D62F34 80240224 00000000 */ nop -/* D62F38 80240228 0C090021 */ jal func_80240084 +/* D62F38 80240228 0C090021 */ jal func_80240084_D62D94 /* D62F3C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D62F40 80240230 24040002 */ addiu $a0, $zero, 2 .L80240234: diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s index c20a182b1a..d89cecbc6d 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s @@ -37,7 +37,7 @@ glabel func_80240128_D64708 /* D64788 802401A8 0C00B94E */ jal get_screen_coords /* D6478C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D64790 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D64794 802401B4 0C090008 */ jal func_80240020 +/* D64794 802401B4 0C090008 */ jal func_80240020_D64600 /* D64798 802401B8 00000000 */ nop /* D6479C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D647A0 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D64708 /* D647CC 802401EC 00000000 */ nop /* D647D0 802401F0 45000004 */ bc1f .L80240204 /* D647D4 802401F4 00000000 */ nop -/* D647D8 802401F8 0C090015 */ jal func_80240054 +/* D647D8 802401F8 0C090015 */ jal func_80240054_D64634 /* D647DC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D647E0 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s index f8d01a18eb..31ef5814f5 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s @@ -37,7 +37,7 @@ glabel func_80240128_D67E28 /* D67EA8 802401A8 0C00B94E */ jal get_screen_coords /* D67EAC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D67EB0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D67EB4 802401B4 0C090008 */ jal func_80240020 +/* D67EB4 802401B4 0C090008 */ jal func_80240020_D67D20 /* D67EB8 802401B8 00000000 */ nop /* D67EBC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D67EC0 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D67E28 /* D67EEC 802401EC 00000000 */ nop /* D67EF0 802401F0 45000004 */ bc1f .L80240204 /* D67EF4 802401F4 00000000 */ nop -/* D67EF8 802401F8 0C090015 */ jal func_80240054 +/* D67EF8 802401F8 0C090015 */ jal func_80240054_D67D54 /* D67EFC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D67F00 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s index b6fa7e0ae0..d2c4425153 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s @@ -37,7 +37,7 @@ glabel func_80240128_D69C48 /* D69CC8 802401A8 0C00B94E */ jal get_screen_coords /* D69CCC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D69CD0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D69CD4 802401B4 0C090008 */ jal func_80240020 +/* D69CD4 802401B4 0C090008 */ jal func_80240020_D69B40 /* D69CD8 802401B8 00000000 */ nop /* D69CDC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D69CE0 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D69C48 /* D69D0C 802401EC 00000000 */ nop /* D69D10 802401F0 45000004 */ bc1f .L80240204 /* D69D14 802401F4 00000000 */ nop -/* D69D18 802401F8 0C090015 */ jal func_80240054 +/* D69D18 802401F8 0C090015 */ jal func_80240054_D69B74 /* D69D1C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D69D20 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s index ffa7a52ad9..342f0eeacd 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s @@ -37,7 +37,7 @@ glabel func_80240128_D6B748 /* D6B7C8 802401A8 0C00B94E */ jal get_screen_coords /* D6B7CC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6B7D0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6B7D4 802401B4 0C090008 */ jal func_80240020 +/* D6B7D4 802401B4 0C090008 */ jal func_80240020_D6B640 /* D6B7D8 802401B8 00000000 */ nop /* D6B7DC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6B7E0 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D6B748 /* D6B80C 802401EC 00000000 */ nop /* D6B810 802401F0 45000004 */ bc1f .L80240204 /* D6B814 802401F4 00000000 */ nop -/* D6B818 802401F8 0C090015 */ jal func_80240054 +/* D6B818 802401F8 0C090015 */ jal func_80240054_D6B674 /* D6B81C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D6B820 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s index 064d687529..d4e135fa38 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D6EAD8 /* D6EB58 802401A8 0C00B94E */ jal get_screen_coords /* D6EB5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6EB60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6EB64 802401B4 0C090008 */ jal func_80240020 +/* D6EB64 802401B4 0C090008 */ jal func_80240020_D6E9D0 /* D6EB68 802401B8 00000000 */ nop /* D6EB6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6EB70 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D6EAD8 /* D6EB9C 802401EC 00000000 */ nop /* D6EBA0 802401F0 45000004 */ bc1f .L80240204 /* D6EBA4 802401F4 00000000 */ nop -/* D6EBA8 802401F8 0C090015 */ jal func_80240054 +/* D6EBA8 802401F8 0C090015 */ jal func_80240054_D6EA04 /* D6EBAC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D6EBB0 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C.s deleted file mode 100644 index 835f9003e1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024175C -/* D7010C 8024175C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D70110 80241760 0000202D */ daddu $a0, $zero, $zero -/* D70114 80241764 AFBF0020 */ sw $ra, 0x20($sp) -/* D70118 80241768 AFB3001C */ sw $s3, 0x1c($sp) -/* D7011C 8024176C AFB20018 */ sw $s2, 0x18($sp) -/* D70120 80241770 AFB10014 */ sw $s1, 0x14($sp) -/* D70124 80241774 0C00EABB */ jal get_npc_unsafe -/* D70128 80241778 AFB00010 */ sw $s0, 0x10($sp) -/* D7012C 8024177C 24040001 */ addiu $a0, $zero, 1 -/* D70130 80241780 0C00EABB */ jal get_npc_unsafe -/* D70134 80241784 0040802D */ daddu $s0, $v0, $zero -/* D70138 80241788 24040002 */ addiu $a0, $zero, 2 -/* D7013C 8024178C 0C00EABB */ jal get_npc_unsafe -/* D70140 80241790 0040882D */ daddu $s1, $v0, $zero -/* D70144 80241794 24040003 */ addiu $a0, $zero, 3 -/* D70148 80241798 0C00EABB */ jal get_npc_unsafe -/* D7014C 8024179C 0040902D */ daddu $s2, $v0, $zero -/* D70150 802417A0 24040004 */ addiu $a0, $zero, 4 -/* D70154 802417A4 0C00EABB */ jal get_npc_unsafe -/* D70158 802417A8 0040982D */ daddu $s3, $v0, $zero -/* D7015C 802417AC 3C018011 */ lui $at, 0x8011 -/* D70160 802417B0 C422EFF0 */ lwc1 $f2, -0x1010($at) -/* D70164 802417B4 C6000038 */ lwc1 $f0, 0x38($s0) -/* D70168 802417B8 4602003C */ c.lt.s $f0, $f2 -/* D7016C 802417BC 00000000 */ nop -/* D70170 802417C0 45030016 */ bc1tl .L8024181C -/* D70174 802417C4 24020002 */ addiu $v0, $zero, 2 -/* D70178 802417C8 C6200038 */ lwc1 $f0, 0x38($s1) -/* D7017C 802417CC 4602003C */ c.lt.s $f0, $f2 -/* D70180 802417D0 00000000 */ nop -/* D70184 802417D4 45030011 */ bc1tl .L8024181C -/* D70188 802417D8 24020002 */ addiu $v0, $zero, 2 -/* D7018C 802417DC C6400038 */ lwc1 $f0, 0x38($s2) -/* D70190 802417E0 4602003C */ c.lt.s $f0, $f2 -/* D70194 802417E4 00000000 */ nop -/* D70198 802417E8 4503000C */ bc1tl .L8024181C -/* D7019C 802417EC 24020002 */ addiu $v0, $zero, 2 -/* D701A0 802417F0 C6600038 */ lwc1 $f0, 0x38($s3) -/* D701A4 802417F4 4602003C */ c.lt.s $f0, $f2 -/* D701A8 802417F8 00000000 */ nop -/* D701AC 802417FC 45030007 */ bc1tl .L8024181C -/* D701B0 80241800 24020002 */ addiu $v0, $zero, 2 -/* D701B4 80241804 C4400038 */ lwc1 $f0, 0x38($v0) -/* D701B8 80241808 4602003C */ c.lt.s $f0, $f2 -/* D701BC 8024180C 00000000 */ nop -/* D701C0 80241810 45010002 */ bc1t .L8024181C -/* D701C4 80241814 24020002 */ addiu $v0, $zero, 2 -/* D701C8 80241818 0000102D */ daddu $v0, $zero, $zero -.L8024181C: -/* D701CC 8024181C 8FBF0020 */ lw $ra, 0x20($sp) -/* D701D0 80241820 8FB3001C */ lw $s3, 0x1c($sp) -/* D701D4 80241824 8FB20018 */ lw $s2, 0x18($sp) -/* D701D8 80241828 8FB10014 */ lw $s1, 0x14($sp) -/* D701DC 8024182C 8FB00010 */ lw $s0, 0x10($sp) -/* D701E0 80241830 03E00008 */ jr $ra -/* D701E4 80241834 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s new file mode 100644 index 0000000000..c7a338d361 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_8024175C_D7010C.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024175C_D7010C +/* D7010C 8024175C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* D70110 80241760 0000202D */ daddu $a0, $zero, $zero +/* D70114 80241764 AFBF0020 */ sw $ra, 0x20($sp) +/* D70118 80241768 AFB3001C */ sw $s3, 0x1c($sp) +/* D7011C 8024176C AFB20018 */ sw $s2, 0x18($sp) +/* D70120 80241770 AFB10014 */ sw $s1, 0x14($sp) +/* D70124 80241774 0C00EABB */ jal get_npc_unsafe +/* D70128 80241778 AFB00010 */ sw $s0, 0x10($sp) +/* D7012C 8024177C 24040001 */ addiu $a0, $zero, 1 +/* D70130 80241780 0C00EABB */ jal get_npc_unsafe +/* D70134 80241784 0040802D */ daddu $s0, $v0, $zero +/* D70138 80241788 24040002 */ addiu $a0, $zero, 2 +/* D7013C 8024178C 0C00EABB */ jal get_npc_unsafe +/* D70140 80241790 0040882D */ daddu $s1, $v0, $zero +/* D70144 80241794 24040003 */ addiu $a0, $zero, 3 +/* D70148 80241798 0C00EABB */ jal get_npc_unsafe +/* D7014C 8024179C 0040902D */ daddu $s2, $v0, $zero +/* D70150 802417A0 24040004 */ addiu $a0, $zero, 4 +/* D70154 802417A4 0C00EABB */ jal get_npc_unsafe +/* D70158 802417A8 0040982D */ daddu $s3, $v0, $zero +/* D7015C 802417AC 3C018011 */ lui $at, 0x8011 +/* D70160 802417B0 C422EFF0 */ lwc1 $f2, -0x1010($at) +/* D70164 802417B4 C6000038 */ lwc1 $f0, 0x38($s0) +/* D70168 802417B8 4602003C */ c.lt.s $f0, $f2 +/* D7016C 802417BC 00000000 */ nop +/* D70170 802417C0 45030016 */ bc1tl .L8024181C +/* D70174 802417C4 24020002 */ addiu $v0, $zero, 2 +/* D70178 802417C8 C6200038 */ lwc1 $f0, 0x38($s1) +/* D7017C 802417CC 4602003C */ c.lt.s $f0, $f2 +/* D70180 802417D0 00000000 */ nop +/* D70184 802417D4 45030011 */ bc1tl .L8024181C +/* D70188 802417D8 24020002 */ addiu $v0, $zero, 2 +/* D7018C 802417DC C6400038 */ lwc1 $f0, 0x38($s2) +/* D70190 802417E0 4602003C */ c.lt.s $f0, $f2 +/* D70194 802417E4 00000000 */ nop +/* D70198 802417E8 4503000C */ bc1tl .L8024181C +/* D7019C 802417EC 24020002 */ addiu $v0, $zero, 2 +/* D701A0 802417F0 C6600038 */ lwc1 $f0, 0x38($s3) +/* D701A4 802417F4 4602003C */ c.lt.s $f0, $f2 +/* D701A8 802417F8 00000000 */ nop +/* D701AC 802417FC 45030007 */ bc1tl .L8024181C +/* D701B0 80241800 24020002 */ addiu $v0, $zero, 2 +/* D701B4 80241804 C4400038 */ lwc1 $f0, 0x38($v0) +/* D701B8 80241808 4602003C */ c.lt.s $f0, $f2 +/* D701BC 8024180C 00000000 */ nop +/* D701C0 80241810 45010002 */ bc1t .L8024181C +/* D701C4 80241814 24020002 */ addiu $v0, $zero, 2 +/* D701C8 80241818 0000102D */ daddu $v0, $zero, $zero +.L8024181C: +/* D701CC 8024181C 8FBF0020 */ lw $ra, 0x20($sp) +/* D701D0 80241820 8FB3001C */ lw $s3, 0x1c($sp) +/* D701D4 80241824 8FB20018 */ lw $s2, 0x18($sp) +/* D701D8 80241828 8FB10014 */ lw $s1, 0x14($sp) +/* D701DC 8024182C 8FB00010 */ lw $s0, 0x10($sp) +/* D701E0 80241830 03E00008 */ jr $ra +/* D701E4 80241834 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s index 3aa7b668f9..0af37f6f41 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s @@ -37,7 +37,7 @@ glabel func_80240128_D764C8 /* D76548 802401A8 0C00B94E */ jal get_screen_coords /* D7654C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D76550 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D76554 802401B4 0C090008 */ jal func_80240020 +/* D76554 802401B4 0C090008 */ jal func_80240020_D763C0 /* D76558 802401B8 00000000 */ nop /* D7655C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D76560 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D764C8 /* D7658C 802401EC 00000000 */ nop /* D76590 802401F0 45000004 */ bc1f .L80240204 /* D76594 802401F4 00000000 */ nop -/* D76598 802401F8 0C090015 */ jal func_80240054 +/* D76598 802401F8 0C090015 */ jal func_80240054_D763F4 /* D7659C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D765A0 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s index 405fba3273..48038b0b0d 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s @@ -37,7 +37,7 @@ glabel func_80240158_D79B48 /* D79BC8 802401D8 0C00B94E */ jal get_screen_coords /* D79BCC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D79BD0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D79BD4 802401E4 0C090014 */ jal func_80240050 +/* D79BD4 802401E4 0C090014 */ jal func_80240050_D79A40 /* D79BD8 802401E8 00000000 */ nop /* D79BDC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D79BE0 802401F0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240158_D79B48 /* D79C0C 8024021C 00000000 */ nop /* D79C10 80240220 45000004 */ bc1f .L80240234 /* D79C14 80240224 00000000 */ nop -/* D79C18 80240228 0C090021 */ jal func_80240084 +/* D79C18 80240228 0C090021 */ jal func_80240084_D79A74 /* D79C1C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D79C20 80240230 24040002 */ addiu $a0, $zero, 2 .L80240234: diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s index 35a373a686..b67ceb78fa 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s @@ -37,7 +37,7 @@ glabel func_80240158_D7B3F8 /* D7B478 802401D8 0C00B94E */ jal get_screen_coords /* D7B47C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D7B480 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7B484 802401E4 0C090014 */ jal func_80240050 +/* D7B484 802401E4 0C090014 */ jal func_80240050_D7B2F0 /* D7B488 802401E8 00000000 */ nop /* D7B48C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D7B490 802401F0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240158_D7B3F8 /* D7B4BC 8024021C 00000000 */ nop /* D7B4C0 80240220 45000004 */ bc1f .L80240234 /* D7B4C4 80240224 00000000 */ nop -/* D7B4C8 80240228 0C090021 */ jal func_80240084 +/* D7B4C8 80240228 0C090021 */ jal func_80240084_D7B324 /* D7B4CC 8024022C 0040202D */ daddu $a0, $v0, $zero /* D7B4D0 80240230 24040002 */ addiu $a0, $zero, 2 .L80240234: diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s index 2634b59ef0..0f28f20826 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s @@ -37,7 +37,7 @@ glabel func_80240128_D7CC78 /* D7CCF8 802401A8 0C00B94E */ jal get_screen_coords /* D7CCFC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D7CD00 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7CD04 802401B4 0C090008 */ jal func_80240020 +/* D7CD04 802401B4 0C090008 */ jal func_80240020_D7CB70 /* D7CD08 802401B8 00000000 */ nop /* D7CD0C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D7CD10 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D7CC78 /* D7CD3C 802401EC 00000000 */ nop /* D7CD40 802401F0 45000004 */ bc1f .L80240204 /* D7CD44 802401F4 00000000 */ nop -/* D7CD48 802401F8 0C090015 */ jal func_80240054 +/* D7CD48 802401F8 0C090015 */ jal func_80240054_D7CBA4 /* D7CD4C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D7CD50 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: 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 5eb0e1055b..3ca42422f5 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 @@ -32,7 +32,7 @@ glabel func_802410B0_D7DC00 /* D7DC6C 8024111C 8FA50018 */ lw $a1, 0x18($sp) /* D7DC70 80241120 8FA6001C */ lw $a2, 0x1c($sp) /* D7DC74 80241124 8FA70020 */ lw $a3, 0x20($sp) -/* D7DC78 80241128 0C0903C8 */ jal func_80240F20 +/* D7DC78 80241128 0C0903C8 */ jal func_80240F20_D7DA70 /* D7DC7C 8024112C AFB20010 */ sw $s2, 0x10($sp) /* D7DC80 80241130 12400022 */ beqz $s2, .L802411BC /* D7DC84 80241134 00000000 */ nop @@ -57,7 +57,7 @@ glabel func_802410B0_D7DC00 /* D7DCCC 8024117C 8FA6001C */ lw $a2, 0x1c($sp) /* D7DCD0 80241180 8FA70020 */ lw $a3, 0x20($sp) /* D7DCD4 80241184 2642FF00 */ addiu $v0, $s2, -0x100 -/* D7DCD8 80241188 0C0903C8 */ jal func_80240F20 +/* D7DCD8 80241188 0C0903C8 */ jal func_80240F20_D7DA70 /* D7DCDC 8024118C AFA20010 */ sw $v0, 0x10($sp) .L80241190: /* D7DCE0 80241190 3C03800A */ lui $v1, 0x800a diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8.s deleted file mode 100644 index eaf521dd4f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D8 -/* D7F038 802402D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D7F03C 802402DC AFBF0010 */ sw $ra, 0x10($sp) -/* D7F040 802402E0 8C82000C */ lw $v0, 0xc($a0) -/* D7F044 802402E4 0C0B1EAF */ jal get_variable -/* D7F048 802402E8 8C450000 */ lw $a1, ($v0) -/* D7F04C 802402EC 0040182D */ daddu $v1, $v0, $zero -/* D7F050 802402F0 10600012 */ beqz $v1, .L8024033C -/* D7F054 802402F4 0000202D */ daddu $a0, $zero, $zero -/* D7F058 802402F8 8C620000 */ lw $v0, ($v1) -/* D7F05C 802402FC 5040000A */ beql $v0, $zero, .L80240328 -/* D7F060 80240300 00041080 */ sll $v0, $a0, 2 -/* D7F064 80240304 3C058024 */ lui $a1, 0x8024 -/* D7F068 80240308 24A57CA0 */ addiu $a1, $a1, 0x7ca0 -.L8024030C: -/* D7F06C 8024030C 24630004 */ addiu $v1, $v1, 4 -/* D7F070 80240310 24840001 */ addiu $a0, $a0, 1 -/* D7F074 80240314 ACA20000 */ sw $v0, ($a1) -/* D7F078 80240318 8C620000 */ lw $v0, ($v1) -/* D7F07C 8024031C 1440FFFB */ bnez $v0, .L8024030C -/* D7F080 80240320 24A50004 */ addiu $a1, $a1, 4 -/* D7F084 80240324 00041080 */ sll $v0, $a0, 2 -.L80240328: -/* D7F088 80240328 3C018024 */ lui $at, 0x8024 -/* D7F08C 8024032C 00220821 */ addu $at, $at, $v0 -/* D7F090 80240330 AC207CA0 */ sw $zero, 0x7ca0($at) -/* D7F094 80240334 080900D9 */ j .L80240364 -/* D7F098 80240338 00000000 */ nop -.L8024033C: -/* D7F09C 8024033C 3C038024 */ lui $v1, 0x8024 -/* D7F0A0 80240340 24637CA0 */ addiu $v1, $v1, 0x7ca0 -/* D7F0A4 80240344 0060282D */ daddu $a1, $v1, $zero -.L80240348: -/* D7F0A8 80240348 24820010 */ addiu $v0, $a0, 0x10 -/* D7F0AC 8024034C AC620000 */ sw $v0, ($v1) -/* D7F0B0 80240350 24630004 */ addiu $v1, $v1, 4 -/* D7F0B4 80240354 24840001 */ addiu $a0, $a0, 1 -/* D7F0B8 80240358 28820070 */ slti $v0, $a0, 0x70 -/* D7F0BC 8024035C 1440FFFA */ bnez $v0, .L80240348 -/* D7F0C0 80240360 ACA001C0 */ sw $zero, 0x1c0($a1) -.L80240364: -/* D7F0C4 80240364 8FBF0010 */ lw $ra, 0x10($sp) -/* D7F0C8 80240368 24020002 */ addiu $v0, $zero, 2 -/* D7F0CC 8024036C 03E00008 */ jr $ra -/* D7F0D0 80240370 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s new file mode 100644 index 0000000000..172f942807 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_31/D7ED80/func_802402D8_D7F038.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402D8_D7F038 +/* D7F038 802402D8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D7F03C 802402DC AFBF0010 */ sw $ra, 0x10($sp) +/* D7F040 802402E0 8C82000C */ lw $v0, 0xc($a0) +/* D7F044 802402E4 0C0B1EAF */ jal get_variable +/* D7F048 802402E8 8C450000 */ lw $a1, ($v0) +/* D7F04C 802402EC 0040182D */ daddu $v1, $v0, $zero +/* D7F050 802402F0 10600012 */ beqz $v1, .L8024033C +/* D7F054 802402F4 0000202D */ daddu $a0, $zero, $zero +/* D7F058 802402F8 8C620000 */ lw $v0, ($v1) +/* D7F05C 802402FC 5040000A */ beql $v0, $zero, .L80240328 +/* D7F060 80240300 00041080 */ sll $v0, $a0, 2 +/* D7F064 80240304 3C058024 */ lui $a1, 0x8024 +/* D7F068 80240308 24A57CA0 */ addiu $a1, $a1, 0x7ca0 +.L8024030C: +/* D7F06C 8024030C 24630004 */ addiu $v1, $v1, 4 +/* D7F070 80240310 24840001 */ addiu $a0, $a0, 1 +/* D7F074 80240314 ACA20000 */ sw $v0, ($a1) +/* D7F078 80240318 8C620000 */ lw $v0, ($v1) +/* D7F07C 8024031C 1440FFFB */ bnez $v0, .L8024030C +/* D7F080 80240320 24A50004 */ addiu $a1, $a1, 4 +/* D7F084 80240324 00041080 */ sll $v0, $a0, 2 +.L80240328: +/* D7F088 80240328 3C018024 */ lui $at, 0x8024 +/* D7F08C 8024032C 00220821 */ addu $at, $at, $v0 +/* D7F090 80240330 AC207CA0 */ sw $zero, 0x7ca0($at) +/* D7F094 80240334 080900D9 */ j .L80240364 +/* D7F098 80240338 00000000 */ nop +.L8024033C: +/* D7F09C 8024033C 3C038024 */ lui $v1, 0x8024 +/* D7F0A0 80240340 24637CA0 */ addiu $v1, $v1, 0x7ca0 +/* D7F0A4 80240344 0060282D */ daddu $a1, $v1, $zero +.L80240348: +/* D7F0A8 80240348 24820010 */ addiu $v0, $a0, 0x10 +/* D7F0AC 8024034C AC620000 */ sw $v0, ($v1) +/* D7F0B0 80240350 24630004 */ addiu $v1, $v1, 4 +/* D7F0B4 80240354 24840001 */ addiu $a0, $a0, 1 +/* D7F0B8 80240358 28820070 */ slti $v0, $a0, 0x70 +/* D7F0BC 8024035C 1440FFFA */ bnez $v0, .L80240348 +/* D7F0C0 80240360 ACA001C0 */ sw $zero, 0x1c0($a1) +.L80240364: +/* D7F0C4 80240364 8FBF0010 */ lw $ra, 0x10($sp) +/* D7F0C8 80240368 24020002 */ addiu $v0, $zero, 2 +/* D7F0CC 8024036C 03E00008 */ jr $ra +/* D7F0D0 80240370 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70.s deleted file mode 100644 index 9e6985b79f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70.s +++ /dev/null @@ -1,95 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C70 -/* D7F9D0 80240C70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D7F9D4 80240C74 AFB10014 */ sw $s1, 0x14($sp) -/* D7F9D8 80240C78 0080882D */ daddu $s1, $a0, $zero -/* D7F9DC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) -/* D7F9E0 80240C80 AFB00010 */ sw $s0, 0x10($sp) -/* D7F9E4 80240C84 8E22000C */ lw $v0, 0xc($s1) -/* D7F9E8 80240C88 0C0B1EAF */ jal get_variable -/* D7F9EC 80240C8C 8C450000 */ lw $a1, ($v0) -/* D7F9F0 80240C90 0220202D */ daddu $a0, $s1, $zero -/* D7F9F4 80240C94 3C05FD05 */ lui $a1, 0xfd05 -/* D7F9F8 80240C98 34A50F80 */ ori $a1, $a1, 0xf80 -/* D7F9FC 80240C9C 0C0B1EAF */ jal get_variable -/* D7FA00 80240CA0 0040802D */ daddu $s0, $v0, $zero -/* D7FA04 80240CA4 00101840 */ sll $v1, $s0, 1 -/* D7FA08 80240CA8 00701821 */ addu $v1, $v1, $s0 -/* D7FA0C 80240CAC 000318C0 */ sll $v1, $v1, 3 -/* D7FA10 80240CB0 00431021 */ addu $v0, $v0, $v1 -/* D7FA14 80240CB4 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D7FA18 80240CB8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D7FA1C 80240CBC C4400014 */ lwc1 $f0, 0x14($v0) -/* D7FA20 80240CC0 2402005A */ addiu $v0, $zero, 0x5a -/* D7FA24 80240CC4 4600010D */ trunc.w.s $f4, $f0 -/* D7FA28 80240CC8 44032000 */ mfc1 $v1, $f4 -/* D7FA2C 80240CCC 00000000 */ nop -/* D7FA30 80240CD0 10620015 */ beq $v1, $v0, .L80240D28 -/* D7FA34 80240CD4 2862005B */ slti $v0, $v1, 0x5b -/* D7FA38 80240CD8 10400005 */ beqz $v0, .L80240CF0 -/* D7FA3C 80240CDC 240200B4 */ addiu $v0, $zero, 0xb4 -/* D7FA40 80240CE0 10600009 */ beqz $v1, .L80240D08 -/* D7FA44 80240CE4 00000000 */ nop -/* D7FA48 80240CE8 08090369 */ j .L80240DA4 -/* D7FA4C 80240CEC 00000000 */ nop -.L80240CF0: -/* D7FA50 80240CF0 10620015 */ beq $v1, $v0, .L80240D48 -/* D7FA54 80240CF4 2402010E */ addiu $v0, $zero, 0x10e -/* D7FA58 80240CF8 10620020 */ beq $v1, $v0, .L80240D7C -/* D7FA5C 80240CFC 00000000 */ nop -/* D7FA60 80240D00 08090369 */ j .L80240DA4 -/* D7FA64 80240D04 00000000 */ nop -.L80240D08: -/* D7FA68 80240D08 C6000030 */ lwc1 $f0, 0x30($s0) -/* D7FA6C 80240D0C 4600010D */ trunc.w.s $f4, $f0 -/* D7FA70 80240D10 E6240090 */ swc1 $f4, 0x90($s1) -/* D7FA74 80240D14 C6020030 */ lwc1 $f2, 0x30($s0) -/* D7FA78 80240D18 3C014248 */ lui $at, 0x4248 -/* D7FA7C 80240D1C 44810000 */ mtc1 $at, $f0 -/* D7FA80 80240D20 0809035A */ j .L80240D68 -/* D7FA84 80240D24 46001080 */ add.s $f2, $f2, $f0 -.L80240D28: -/* D7FA88 80240D28 C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FA8C 80240D2C 3C014248 */ lui $at, 0x4248 -/* D7FA90 80240D30 44811000 */ mtc1 $at, $f2 -/* D7FA94 80240D34 4600010D */ trunc.w.s $f4, $f0 -/* D7FA98 80240D38 E6240090 */ swc1 $f4, 0x90($s1) -/* D7FA9C 80240D3C C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FAA0 80240D40 08090366 */ j .L80240D98 -/* D7FAA4 80240D44 46020000 */ add.s $f0, $f0, $f2 -.L80240D48: -/* D7FAA8 80240D48 C6000030 */ lwc1 $f0, 0x30($s0) -/* D7FAAC 80240D4C 4600010D */ trunc.w.s $f4, $f0 -/* D7FAB0 80240D50 E6240090 */ swc1 $f4, 0x90($s1) -/* D7FAB4 80240D54 C6020030 */ lwc1 $f2, 0x30($s0) -/* D7FAB8 80240D58 3C014248 */ lui $at, 0x4248 -/* D7FABC 80240D5C 44810000 */ mtc1 $at, $f0 -/* D7FAC0 80240D60 00000000 */ nop -/* D7FAC4 80240D64 46001081 */ sub.s $f2, $f2, $f0 -.L80240D68: -/* D7FAC8 80240D68 24020001 */ addiu $v0, $zero, 1 -/* D7FACC 80240D6C AE220098 */ sw $v0, 0x98($s1) -/* D7FAD0 80240D70 4600110D */ trunc.w.s $f4, $f2 -/* D7FAD4 80240D74 08090369 */ j .L80240DA4 -/* D7FAD8 80240D78 E6240094 */ swc1 $f4, 0x94($s1) -.L80240D7C: -/* D7FADC 80240D7C C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FAE0 80240D80 3C014248 */ lui $at, 0x4248 -/* D7FAE4 80240D84 44811000 */ mtc1 $at, $f2 -/* D7FAE8 80240D88 4600010D */ trunc.w.s $f4, $f0 -/* D7FAEC 80240D8C E6240090 */ swc1 $f4, 0x90($s1) -/* D7FAF0 80240D90 C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FAF4 80240D94 46020001 */ sub.s $f0, $f0, $f2 -.L80240D98: -/* D7FAF8 80240D98 AE200098 */ sw $zero, 0x98($s1) -/* D7FAFC 80240D9C 4600010D */ trunc.w.s $f4, $f0 -/* D7FB00 80240DA0 E6240094 */ swc1 $f4, 0x94($s1) -.L80240DA4: -/* D7FB04 80240DA4 8FBF0018 */ lw $ra, 0x18($sp) -/* D7FB08 80240DA8 8FB10014 */ lw $s1, 0x14($sp) -/* D7FB0C 80240DAC 8FB00010 */ lw $s0, 0x10($sp) -/* D7FB10 80240DB0 24020002 */ addiu $v0, $zero, 2 -/* D7FB14 80240DB4 03E00008 */ jr $ra -/* D7FB18 80240DB8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s new file mode 100644 index 0000000000..0e3d67f2cf --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240C70_D7F9D0.s @@ -0,0 +1,95 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C70_D7F9D0 +/* D7F9D0 80240C70 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D7F9D4 80240C74 AFB10014 */ sw $s1, 0x14($sp) +/* D7F9D8 80240C78 0080882D */ daddu $s1, $a0, $zero +/* D7F9DC 80240C7C AFBF0018 */ sw $ra, 0x18($sp) +/* D7F9E0 80240C80 AFB00010 */ sw $s0, 0x10($sp) +/* D7F9E4 80240C84 8E22000C */ lw $v0, 0xc($s1) +/* D7F9E8 80240C88 0C0B1EAF */ jal get_variable +/* D7F9EC 80240C8C 8C450000 */ lw $a1, ($v0) +/* D7F9F0 80240C90 0220202D */ daddu $a0, $s1, $zero +/* D7F9F4 80240C94 3C05FD05 */ lui $a1, 0xfd05 +/* D7F9F8 80240C98 34A50F80 */ ori $a1, $a1, 0xf80 +/* D7F9FC 80240C9C 0C0B1EAF */ jal get_variable +/* D7FA00 80240CA0 0040802D */ daddu $s0, $v0, $zero +/* D7FA04 80240CA4 00101840 */ sll $v1, $s0, 1 +/* D7FA08 80240CA8 00701821 */ addu $v1, $v1, $s0 +/* D7FA0C 80240CAC 000318C0 */ sll $v1, $v1, 3 +/* D7FA10 80240CB0 00431021 */ addu $v0, $v0, $v1 +/* D7FA14 80240CB4 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* D7FA18 80240CB8 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* D7FA1C 80240CBC C4400014 */ lwc1 $f0, 0x14($v0) +/* D7FA20 80240CC0 2402005A */ addiu $v0, $zero, 0x5a +/* D7FA24 80240CC4 4600010D */ trunc.w.s $f4, $f0 +/* D7FA28 80240CC8 44032000 */ mfc1 $v1, $f4 +/* D7FA2C 80240CCC 00000000 */ nop +/* D7FA30 80240CD0 10620015 */ beq $v1, $v0, .L80240D28 +/* D7FA34 80240CD4 2862005B */ slti $v0, $v1, 0x5b +/* D7FA38 80240CD8 10400005 */ beqz $v0, .L80240CF0 +/* D7FA3C 80240CDC 240200B4 */ addiu $v0, $zero, 0xb4 +/* D7FA40 80240CE0 10600009 */ beqz $v1, .L80240D08 +/* D7FA44 80240CE4 00000000 */ nop +/* D7FA48 80240CE8 08090369 */ j .L80240DA4 +/* D7FA4C 80240CEC 00000000 */ nop +.L80240CF0: +/* D7FA50 80240CF0 10620015 */ beq $v1, $v0, .L80240D48 +/* D7FA54 80240CF4 2402010E */ addiu $v0, $zero, 0x10e +/* D7FA58 80240CF8 10620020 */ beq $v1, $v0, .L80240D7C +/* D7FA5C 80240CFC 00000000 */ nop +/* D7FA60 80240D00 08090369 */ j .L80240DA4 +/* D7FA64 80240D04 00000000 */ nop +.L80240D08: +/* D7FA68 80240D08 C6000030 */ lwc1 $f0, 0x30($s0) +/* D7FA6C 80240D0C 4600010D */ trunc.w.s $f4, $f0 +/* D7FA70 80240D10 E6240090 */ swc1 $f4, 0x90($s1) +/* D7FA74 80240D14 C6020030 */ lwc1 $f2, 0x30($s0) +/* D7FA78 80240D18 3C014248 */ lui $at, 0x4248 +/* D7FA7C 80240D1C 44810000 */ mtc1 $at, $f0 +/* D7FA80 80240D20 0809035A */ j .L80240D68 +/* D7FA84 80240D24 46001080 */ add.s $f2, $f2, $f0 +.L80240D28: +/* D7FA88 80240D28 C6000028 */ lwc1 $f0, 0x28($s0) +/* D7FA8C 80240D2C 3C014248 */ lui $at, 0x4248 +/* D7FA90 80240D30 44811000 */ mtc1 $at, $f2 +/* D7FA94 80240D34 4600010D */ trunc.w.s $f4, $f0 +/* D7FA98 80240D38 E6240090 */ swc1 $f4, 0x90($s1) +/* D7FA9C 80240D3C C6000028 */ lwc1 $f0, 0x28($s0) +/* D7FAA0 80240D40 08090366 */ j .L80240D98 +/* D7FAA4 80240D44 46020000 */ add.s $f0, $f0, $f2 +.L80240D48: +/* D7FAA8 80240D48 C6000030 */ lwc1 $f0, 0x30($s0) +/* D7FAAC 80240D4C 4600010D */ trunc.w.s $f4, $f0 +/* D7FAB0 80240D50 E6240090 */ swc1 $f4, 0x90($s1) +/* D7FAB4 80240D54 C6020030 */ lwc1 $f2, 0x30($s0) +/* D7FAB8 80240D58 3C014248 */ lui $at, 0x4248 +/* D7FABC 80240D5C 44810000 */ mtc1 $at, $f0 +/* D7FAC0 80240D60 00000000 */ nop +/* D7FAC4 80240D64 46001081 */ sub.s $f2, $f2, $f0 +.L80240D68: +/* D7FAC8 80240D68 24020001 */ addiu $v0, $zero, 1 +/* D7FACC 80240D6C AE220098 */ sw $v0, 0x98($s1) +/* D7FAD0 80240D70 4600110D */ trunc.w.s $f4, $f2 +/* D7FAD4 80240D74 08090369 */ j .L80240DA4 +/* D7FAD8 80240D78 E6240094 */ swc1 $f4, 0x94($s1) +.L80240D7C: +/* D7FADC 80240D7C C6000028 */ lwc1 $f0, 0x28($s0) +/* D7FAE0 80240D80 3C014248 */ lui $at, 0x4248 +/* D7FAE4 80240D84 44811000 */ mtc1 $at, $f2 +/* D7FAE8 80240D88 4600010D */ trunc.w.s $f4, $f0 +/* D7FAEC 80240D8C E6240090 */ swc1 $f4, 0x90($s1) +/* D7FAF0 80240D90 C6000028 */ lwc1 $f0, 0x28($s0) +/* D7FAF4 80240D94 46020001 */ sub.s $f0, $f0, $f2 +.L80240D98: +/* D7FAF8 80240D98 AE200098 */ sw $zero, 0x98($s1) +/* D7FAFC 80240D9C 4600010D */ trunc.w.s $f4, $f0 +/* D7FB00 80240DA0 E6240094 */ swc1 $f4, 0x94($s1) +.L80240DA4: +/* D7FB04 80240DA4 8FBF0018 */ lw $ra, 0x18($sp) +/* D7FB08 80240DA8 8FB10014 */ lw $s1, 0x14($sp) +/* D7FB0C 80240DAC 8FB00010 */ lw $s0, 0x10($sp) +/* D7FB10 80240DB0 24020002 */ addiu $v0, $zero, 2 +/* D7FB14 80240DB4 03E00008 */ jr $ra +/* D7FB18 80240DB8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC.s deleted file mode 100644 index bfdecb93d9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC.s +++ /dev/null @@ -1,51 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DBC -/* D7FB1C 80240DBC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D7FB20 80240DC0 AFBF002C */ sw $ra, 0x2c($sp) -/* D7FB24 80240DC4 AFB00028 */ sw $s0, 0x28($sp) -/* D7FB28 80240DC8 8C820098 */ lw $v0, 0x98($a0) -/* D7FB2C 80240DCC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D7FB30 80240DD0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D7FB34 80240DD4 14400005 */ bnez $v0, .L80240DEC -/* D7FB38 80240DD8 00000000 */ nop -/* D7FB3C 80240DDC C4800084 */ lwc1 $f0, 0x84($a0) -/* D7FB40 80240DE0 46800020 */ cvt.s.w $f0, $f0 -/* D7FB44 80240DE4 0809037E */ j .L80240DF8 -/* D7FB48 80240DE8 E6000028 */ swc1 $f0, 0x28($s0) -.L80240DEC: -/* D7FB4C 80240DEC C4800084 */ lwc1 $f0, 0x84($a0) -/* D7FB50 80240DF0 46800020 */ cvt.s.w $f0, $f0 -/* D7FB54 80240DF4 E6000030 */ swc1 $f0, 0x30($s0) -.L80240DF8: -/* D7FB58 80240DF8 27A20024 */ addiu $v0, $sp, 0x24 -/* D7FB5C 80240DFC 0000202D */ daddu $a0, $zero, $zero -/* D7FB60 80240E00 27A50018 */ addiu $a1, $sp, 0x18 -/* D7FB64 80240E04 27A6001C */ addiu $a2, $sp, 0x1c -/* D7FB68 80240E08 C6000028 */ lwc1 $f0, 0x28($s0) -/* D7FB6C 80240E0C 3C014120 */ lui $at, 0x4120 -/* D7FB70 80240E10 44811000 */ mtc1 $at, $f2 -/* D7FB74 80240E14 3C014220 */ lui $at, 0x4220 -/* D7FB78 80240E18 44813000 */ mtc1 $at, $f6 -/* D7FB7C 80240E1C 27A70020 */ addiu $a3, $sp, 0x20 -/* D7FB80 80240E20 E7A00018 */ swc1 $f0, 0x18($sp) -/* D7FB84 80240E24 C600002C */ lwc1 $f0, 0x2c($s0) -/* D7FB88 80240E28 C6040030 */ lwc1 $f4, 0x30($s0) -/* D7FB8C 80240E2C 46020000 */ add.s $f0, $f0, $f2 -/* D7FB90 80240E30 E7A60024 */ swc1 $f6, 0x24($sp) -/* D7FB94 80240E34 E7A40020 */ swc1 $f4, 0x20($sp) -/* D7FB98 80240E38 E7A0001C */ swc1 $f0, 0x1c($sp) -/* D7FB9C 80240E3C 0C0372DF */ jal func_800DCB7C -/* D7FBA0 80240E40 AFA20010 */ sw $v0, 0x10($sp) -/* D7FBA4 80240E44 C7A00018 */ lwc1 $f0, 0x18($sp) -/* D7FBA8 80240E48 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* D7FBAC 80240E4C C7A40020 */ lwc1 $f4, 0x20($sp) -/* D7FBB0 80240E50 E6000028 */ swc1 $f0, 0x28($s0) -/* D7FBB4 80240E54 E602002C */ swc1 $f2, 0x2c($s0) -/* D7FBB8 80240E58 E6040030 */ swc1 $f4, 0x30($s0) -/* D7FBBC 80240E5C 8FBF002C */ lw $ra, 0x2c($sp) -/* D7FBC0 80240E60 8FB00028 */ lw $s0, 0x28($sp) -/* D7FBC4 80240E64 24020002 */ addiu $v0, $zero, 2 -/* D7FBC8 80240E68 03E00008 */ jr $ra -/* D7FBCC 80240E6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s new file mode 100644 index 0000000000..08fa65e7c4 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_31/D7F270/func_80240DBC_D7FB1C.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DBC_D7FB1C +/* D7FB1C 80240DBC 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* D7FB20 80240DC0 AFBF002C */ sw $ra, 0x2c($sp) +/* D7FB24 80240DC4 AFB00028 */ sw $s0, 0x28($sp) +/* D7FB28 80240DC8 8C820098 */ lw $v0, 0x98($a0) +/* D7FB2C 80240DCC 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* D7FB30 80240DD0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* D7FB34 80240DD4 14400005 */ bnez $v0, .L80240DEC +/* D7FB38 80240DD8 00000000 */ nop +/* D7FB3C 80240DDC C4800084 */ lwc1 $f0, 0x84($a0) +/* D7FB40 80240DE0 46800020 */ cvt.s.w $f0, $f0 +/* D7FB44 80240DE4 0809037E */ j .L80240DF8 +/* D7FB48 80240DE8 E6000028 */ swc1 $f0, 0x28($s0) +.L80240DEC: +/* D7FB4C 80240DEC C4800084 */ lwc1 $f0, 0x84($a0) +/* D7FB50 80240DF0 46800020 */ cvt.s.w $f0, $f0 +/* D7FB54 80240DF4 E6000030 */ swc1 $f0, 0x30($s0) +.L80240DF8: +/* D7FB58 80240DF8 27A20024 */ addiu $v0, $sp, 0x24 +/* D7FB5C 80240DFC 0000202D */ daddu $a0, $zero, $zero +/* D7FB60 80240E00 27A50018 */ addiu $a1, $sp, 0x18 +/* D7FB64 80240E04 27A6001C */ addiu $a2, $sp, 0x1c +/* D7FB68 80240E08 C6000028 */ lwc1 $f0, 0x28($s0) +/* D7FB6C 80240E0C 3C014120 */ lui $at, 0x4120 +/* D7FB70 80240E10 44811000 */ mtc1 $at, $f2 +/* D7FB74 80240E14 3C014220 */ lui $at, 0x4220 +/* D7FB78 80240E18 44813000 */ mtc1 $at, $f6 +/* D7FB7C 80240E1C 27A70020 */ addiu $a3, $sp, 0x20 +/* D7FB80 80240E20 E7A00018 */ swc1 $f0, 0x18($sp) +/* D7FB84 80240E24 C600002C */ lwc1 $f0, 0x2c($s0) +/* D7FB88 80240E28 C6040030 */ lwc1 $f4, 0x30($s0) +/* D7FB8C 80240E2C 46020000 */ add.s $f0, $f0, $f2 +/* D7FB90 80240E30 E7A60024 */ swc1 $f6, 0x24($sp) +/* D7FB94 80240E34 E7A40020 */ swc1 $f4, 0x20($sp) +/* D7FB98 80240E38 E7A0001C */ swc1 $f0, 0x1c($sp) +/* D7FB9C 80240E3C 0C0372DF */ jal func_800DCB7C +/* D7FBA0 80240E40 AFA20010 */ sw $v0, 0x10($sp) +/* D7FBA4 80240E44 C7A00018 */ lwc1 $f0, 0x18($sp) +/* D7FBA8 80240E48 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* D7FBAC 80240E4C C7A40020 */ lwc1 $f4, 0x20($sp) +/* D7FBB0 80240E50 E6000028 */ swc1 $f0, 0x28($s0) +/* D7FBB4 80240E54 E602002C */ swc1 $f2, 0x2c($s0) +/* D7FBB8 80240E58 E6040030 */ swc1 $f4, 0x30($s0) +/* D7FBBC 80240E5C 8FBF002C */ lw $ra, 0x2c($sp) +/* D7FBC0 80240E60 8FB00028 */ lw $s0, 0x28($sp) +/* D7FBC4 80240E64 24020002 */ addiu $v0, $zero, 2 +/* D7FBC8 80240E68 03E00008 */ jr $ra +/* D7FBCC 80240E6C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s index b2c5aabd0a..28067cd1b5 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s @@ -37,7 +37,7 @@ glabel func_80240128_D89808 /* D89888 802401A8 0C00B94E */ jal get_screen_coords /* D8988C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D89890 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D89894 802401B4 0C090008 */ jal func_80240020 +/* D89894 802401B4 0C090008 */ jal func_80240020_D89700 /* D89898 802401B8 00000000 */ nop /* D8989C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D898A0 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D89808 /* D898CC 802401EC 00000000 */ nop /* D898D0 802401F0 45000004 */ bc1f .L80240204 /* D898D4 802401F4 00000000 */ nop -/* D898D8 802401F8 0C090015 */ jal func_80240054 +/* D898D8 802401F8 0C090015 */ jal func_80240054_D89734 /* D898DC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D898E0 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s index 6c4a52025e..f9feb63413 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D8B4D8 /* D8B558 802401A8 0C00B94E */ jal get_screen_coords /* D8B55C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8B560 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8B564 802401B4 0C090008 */ jal func_80240020 +/* D8B564 802401B4 0C090008 */ jal func_80240020_D8B3D0 /* D8B568 802401B8 00000000 */ nop /* D8B56C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8B570 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D8B4D8 /* D8B59C 802401EC 00000000 */ nop /* D8B5A0 802401F0 45000004 */ bc1f .L80240204 /* D8B5A4 802401F4 00000000 */ nop -/* D8B5A8 802401F8 0C090015 */ jal func_80240054 +/* D8B5A8 802401F8 0C090015 */ jal func_80240054_D8B404 /* D8B5AC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D8B5B0 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54.s deleted file mode 100644 index 62e67a421f..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F54 -/* D8C304 80240F54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8C308 80240F58 AFB20018 */ sw $s2, 0x18($sp) -/* D8C30C 80240F5C 0080902D */ daddu $s2, $a0, $zero -/* D8C310 80240F60 AFBF001C */ sw $ra, 0x1c($sp) -/* D8C314 80240F64 AFB10014 */ sw $s1, 0x14($sp) -/* D8C318 80240F68 AFB00010 */ sw $s0, 0x10($sp) -/* D8C31C 80240F6C 8E50000C */ lw $s0, 0xc($s2) -/* D8C320 80240F70 8E050000 */ lw $a1, ($s0) -/* D8C324 80240F74 0C0B1EAF */ jal get_variable -/* D8C328 80240F78 26100004 */ addiu $s0, $s0, 4 -/* D8C32C 80240F7C 0C04417A */ jal get_entity_by_index -/* D8C330 80240F80 0040202D */ daddu $a0, $v0, $zero -/* D8C334 80240F84 8E050000 */ lw $a1, ($s0) -/* D8C338 80240F88 26100004 */ addiu $s0, $s0, 4 -/* D8C33C 80240F8C 0040882D */ daddu $s1, $v0, $zero -/* D8C340 80240F90 C6200048 */ lwc1 $f0, 0x48($s1) -/* D8C344 80240F94 4600008D */ trunc.w.s $f2, $f0 -/* D8C348 80240F98 44061000 */ mfc1 $a2, $f2 -/* D8C34C 80240F9C 0C0B2026 */ jal set_variable -/* D8C350 80240FA0 0240202D */ daddu $a0, $s2, $zero -/* D8C354 80240FA4 8E050000 */ lw $a1, ($s0) -/* D8C358 80240FA8 26100004 */ addiu $s0, $s0, 4 -/* D8C35C 80240FAC C620004C */ lwc1 $f0, 0x4c($s1) -/* D8C360 80240FB0 4600008D */ trunc.w.s $f2, $f0 -/* D8C364 80240FB4 44061000 */ mfc1 $a2, $f2 -/* D8C368 80240FB8 0C0B2026 */ jal set_variable -/* D8C36C 80240FBC 0240202D */ daddu $a0, $s2, $zero -/* D8C370 80240FC0 C6200050 */ lwc1 $f0, 0x50($s1) -/* D8C374 80240FC4 8E050000 */ lw $a1, ($s0) -/* D8C378 80240FC8 4600008D */ trunc.w.s $f2, $f0 -/* D8C37C 80240FCC 44061000 */ mfc1 $a2, $f2 -/* D8C380 80240FD0 0C0B2026 */ jal set_variable -/* D8C384 80240FD4 0240202D */ daddu $a0, $s2, $zero -/* D8C388 80240FD8 8FBF001C */ lw $ra, 0x1c($sp) -/* D8C38C 80240FDC 8FB20018 */ lw $s2, 0x18($sp) -/* D8C390 80240FE0 8FB10014 */ lw $s1, 0x14($sp) -/* D8C394 80240FE4 8FB00010 */ lw $s0, 0x10($sp) -/* D8C398 80240FE8 24020002 */ addiu $v0, $zero, 2 -/* D8C39C 80240FEC 03E00008 */ jr $ra -/* D8C3A0 80240FF0 27BD0020 */ addiu $sp, $sp, 0x20 -/* D8C3A4 80240FF4 00000000 */ nop -/* D8C3A8 80240FF8 00000000 */ nop -/* D8C3AC 80240FFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s new file mode 100644 index 0000000000..1320fbe78c --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240F54_D8C304.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F54_D8C304 +/* D8C304 80240F54 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D8C308 80240F58 AFB20018 */ sw $s2, 0x18($sp) +/* D8C30C 80240F5C 0080902D */ daddu $s2, $a0, $zero +/* D8C310 80240F60 AFBF001C */ sw $ra, 0x1c($sp) +/* D8C314 80240F64 AFB10014 */ sw $s1, 0x14($sp) +/* D8C318 80240F68 AFB00010 */ sw $s0, 0x10($sp) +/* D8C31C 80240F6C 8E50000C */ lw $s0, 0xc($s2) +/* D8C320 80240F70 8E050000 */ lw $a1, ($s0) +/* D8C324 80240F74 0C0B1EAF */ jal get_variable +/* D8C328 80240F78 26100004 */ addiu $s0, $s0, 4 +/* D8C32C 80240F7C 0C04417A */ jal get_entity_by_index +/* D8C330 80240F80 0040202D */ daddu $a0, $v0, $zero +/* D8C334 80240F84 8E050000 */ lw $a1, ($s0) +/* D8C338 80240F88 26100004 */ addiu $s0, $s0, 4 +/* D8C33C 80240F8C 0040882D */ daddu $s1, $v0, $zero +/* D8C340 80240F90 C6200048 */ lwc1 $f0, 0x48($s1) +/* D8C344 80240F94 4600008D */ trunc.w.s $f2, $f0 +/* D8C348 80240F98 44061000 */ mfc1 $a2, $f2 +/* D8C34C 80240F9C 0C0B2026 */ jal set_variable +/* D8C350 80240FA0 0240202D */ daddu $a0, $s2, $zero +/* D8C354 80240FA4 8E050000 */ lw $a1, ($s0) +/* D8C358 80240FA8 26100004 */ addiu $s0, $s0, 4 +/* D8C35C 80240FAC C620004C */ lwc1 $f0, 0x4c($s1) +/* D8C360 80240FB0 4600008D */ trunc.w.s $f2, $f0 +/* D8C364 80240FB4 44061000 */ mfc1 $a2, $f2 +/* D8C368 80240FB8 0C0B2026 */ jal set_variable +/* D8C36C 80240FBC 0240202D */ daddu $a0, $s2, $zero +/* D8C370 80240FC0 C6200050 */ lwc1 $f0, 0x50($s1) +/* D8C374 80240FC4 8E050000 */ lw $a1, ($s0) +/* D8C378 80240FC8 4600008D */ trunc.w.s $f2, $f0 +/* D8C37C 80240FCC 44061000 */ mfc1 $a2, $f2 +/* D8C380 80240FD0 0C0B2026 */ jal set_variable +/* D8C384 80240FD4 0240202D */ daddu $a0, $s2, $zero +/* D8C388 80240FD8 8FBF001C */ lw $ra, 0x1c($sp) +/* D8C38C 80240FDC 8FB20018 */ lw $s2, 0x18($sp) +/* D8C390 80240FE0 8FB10014 */ lw $s1, 0x14($sp) +/* D8C394 80240FE4 8FB00010 */ lw $s0, 0x10($sp) +/* D8C398 80240FE8 24020002 */ addiu $v0, $zero, 2 +/* D8C39C 80240FEC 03E00008 */ jr $ra +/* D8C3A0 80240FF0 27BD0020 */ addiu $sp, $sp, 0x20 +/* D8C3A4 80240FF4 00000000 */ nop +/* D8C3A8 80240FF8 00000000 */ nop +/* D8C3AC 80240FFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s index 96fc97f55f..b790eb4750 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s @@ -37,7 +37,7 @@ glabel func_80240128_D8D378 /* D8D3F8 802401A8 0C00B94E */ jal get_screen_coords /* D8D3FC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8D400 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8D404 802401B4 0C090008 */ jal func_80240020 +/* D8D404 802401B4 0C090008 */ jal func_80240020_D8D270 /* D8D408 802401B8 00000000 */ nop /* D8D40C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8D410 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D8D378 /* D8D43C 802401EC 00000000 */ nop /* D8D440 802401F0 45000004 */ bc1f .L80240204 /* D8D444 802401F4 00000000 */ nop -/* D8D448 802401F8 0C090015 */ jal func_80240054 +/* D8D448 802401F8 0C090015 */ jal func_80240054_D8D2A4 /* D8D44C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D8D450 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C.s deleted file mode 100644 index d5eb8a074b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024186C -/* D8EABC 8024186C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D8EAC0 80241870 AFB3003C */ sw $s3, 0x3c($sp) -/* D8EAC4 80241874 0080982D */ daddu $s3, $a0, $zero -/* D8EAC8 80241878 AFBF0040 */ sw $ra, 0x40($sp) -/* D8EACC 8024187C AFB20038 */ sw $s2, 0x38($sp) -/* D8EAD0 80241880 AFB10034 */ sw $s1, 0x34($sp) -/* D8EAD4 80241884 AFB00030 */ sw $s0, 0x30($sp) -/* D8EAD8 80241888 8E720148 */ lw $s2, 0x148($s3) -/* D8EADC 8024188C 00A0882D */ daddu $s1, $a1, $zero -/* D8EAE0 80241890 86440008 */ lh $a0, 8($s2) -/* D8EAE4 80241894 0C00EABB */ jal get_npc_unsafe -/* D8EAE8 80241898 00C0802D */ daddu $s0, $a2, $zero -/* D8EAEC 8024189C 0200202D */ daddu $a0, $s0, $zero -/* D8EAF0 802418A0 0240282D */ daddu $a1, $s2, $zero -/* D8EAF4 802418A4 24030001 */ addiu $v1, $zero, 1 -/* D8EAF8 802418A8 AFA30010 */ sw $v1, 0x10($sp) -/* D8EAFC 802418AC 8E260024 */ lw $a2, 0x24($s1) -/* D8EB00 802418B0 8E270028 */ lw $a3, 0x28($s1) -/* D8EB04 802418B4 0C01242D */ jal func_800490B4 -/* D8EB08 802418B8 0040802D */ daddu $s0, $v0, $zero -/* D8EB0C 802418BC 1440001E */ bnez $v0, .L80241938 -/* D8EB10 802418C0 0200202D */ daddu $a0, $s0, $zero -/* D8EB14 802418C4 24040002 */ addiu $a0, $zero, 2 -/* D8EB18 802418C8 0200282D */ daddu $a1, $s0, $zero -/* D8EB1C 802418CC 0000302D */ daddu $a2, $zero, $zero -/* D8EB20 802418D0 860300A8 */ lh $v1, 0xa8($s0) -/* D8EB24 802418D4 3C013F80 */ lui $at, 0x3f80 -/* D8EB28 802418D8 44810000 */ mtc1 $at, $f0 -/* D8EB2C 802418DC 3C014000 */ lui $at, 0x4000 -/* D8EB30 802418E0 44811000 */ mtc1 $at, $f2 -/* D8EB34 802418E4 3C01C1A0 */ lui $at, 0xc1a0 -/* D8EB38 802418E8 44812000 */ mtc1 $at, $f4 -/* D8EB3C 802418EC 2402000F */ addiu $v0, $zero, 0xf -/* D8EB40 802418F0 AFA2001C */ sw $v0, 0x1c($sp) -/* D8EB44 802418F4 44833000 */ mtc1 $v1, $f6 -/* D8EB48 802418F8 00000000 */ nop -/* D8EB4C 802418FC 468031A0 */ cvt.s.w $f6, $f6 -/* D8EB50 80241900 44073000 */ mfc1 $a3, $f6 -/* D8EB54 80241904 27A20028 */ addiu $v0, $sp, 0x28 -/* D8EB58 80241908 AFA20020 */ sw $v0, 0x20($sp) -/* D8EB5C 8024190C E7A00010 */ swc1 $f0, 0x10($sp) -/* D8EB60 80241910 E7A20014 */ swc1 $f2, 0x14($sp) -/* D8EB64 80241914 0C01BFA4 */ jal fx_emote -/* D8EB68 80241918 E7A40018 */ swc1 $f4, 0x18($sp) -/* D8EB6C 8024191C 8E4200CC */ lw $v0, 0xcc($s2) -/* D8EB70 80241920 8C430000 */ lw $v1, ($v0) -/* D8EB74 80241924 24020019 */ addiu $v0, $zero, 0x19 -/* D8EB78 80241928 A602008E */ sh $v0, 0x8e($s0) -/* D8EB7C 8024192C 2402000E */ addiu $v0, $zero, 0xe -/* D8EB80 80241930 0809065B */ j .L8024196C -/* D8EB84 80241934 AE030028 */ sw $v1, 0x28($s0) -.L80241938: -/* D8EB88 80241938 0C00F598 */ jal func_8003D660 -/* D8EB8C 8024193C 24050001 */ addiu $a1, $zero, 1 -/* D8EB90 80241940 8E050018 */ lw $a1, 0x18($s0) -/* D8EB94 80241944 8E06000C */ lw $a2, 0xc($s0) -/* D8EB98 80241948 0C00EA95 */ jal npc_move_heading -/* D8EB9C 8024194C 0200202D */ daddu $a0, $s0, $zero -/* D8EBA0 80241950 8602008E */ lh $v0, 0x8e($s0) -/* D8EBA4 80241954 9603008E */ lhu $v1, 0x8e($s0) -/* D8EBA8 80241958 18400003 */ blez $v0, .L80241968 -/* D8EBAC 8024195C 2462FFFF */ addiu $v0, $v1, -1 -/* D8EBB0 80241960 0809065C */ j .L80241970 -/* D8EBB4 80241964 A602008E */ sh $v0, 0x8e($s0) -.L80241968: -/* D8EBB8 80241968 2402000C */ addiu $v0, $zero, 0xc -.L8024196C: -/* D8EBBC 8024196C AE620070 */ sw $v0, 0x70($s3) -.L80241970: -/* D8EBC0 80241970 8FBF0040 */ lw $ra, 0x40($sp) -/* D8EBC4 80241974 8FB3003C */ lw $s3, 0x3c($sp) -/* D8EBC8 80241978 8FB20038 */ lw $s2, 0x38($sp) -/* D8EBCC 8024197C 8FB10034 */ lw $s1, 0x34($sp) -/* D8EBD0 80241980 8FB00030 */ lw $s0, 0x30($sp) -/* D8EBD4 80241984 03E00008 */ jr $ra -/* D8EBD8 80241988 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s new file mode 100644 index 0000000000..20824c5382 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024186C_D8EABC.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024186C_D8EABC +/* D8EABC 8024186C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* D8EAC0 80241870 AFB3003C */ sw $s3, 0x3c($sp) +/* D8EAC4 80241874 0080982D */ daddu $s3, $a0, $zero +/* D8EAC8 80241878 AFBF0040 */ sw $ra, 0x40($sp) +/* D8EACC 8024187C AFB20038 */ sw $s2, 0x38($sp) +/* D8EAD0 80241880 AFB10034 */ sw $s1, 0x34($sp) +/* D8EAD4 80241884 AFB00030 */ sw $s0, 0x30($sp) +/* D8EAD8 80241888 8E720148 */ lw $s2, 0x148($s3) +/* D8EADC 8024188C 00A0882D */ daddu $s1, $a1, $zero +/* D8EAE0 80241890 86440008 */ lh $a0, 8($s2) +/* D8EAE4 80241894 0C00EABB */ jal get_npc_unsafe +/* D8EAE8 80241898 00C0802D */ daddu $s0, $a2, $zero +/* D8EAEC 8024189C 0200202D */ daddu $a0, $s0, $zero +/* D8EAF0 802418A0 0240282D */ daddu $a1, $s2, $zero +/* D8EAF4 802418A4 24030001 */ addiu $v1, $zero, 1 +/* D8EAF8 802418A8 AFA30010 */ sw $v1, 0x10($sp) +/* D8EAFC 802418AC 8E260024 */ lw $a2, 0x24($s1) +/* D8EB00 802418B0 8E270028 */ lw $a3, 0x28($s1) +/* D8EB04 802418B4 0C01242D */ jal func_800490B4 +/* D8EB08 802418B8 0040802D */ daddu $s0, $v0, $zero +/* D8EB0C 802418BC 1440001E */ bnez $v0, .L80241938 +/* D8EB10 802418C0 0200202D */ daddu $a0, $s0, $zero +/* D8EB14 802418C4 24040002 */ addiu $a0, $zero, 2 +/* D8EB18 802418C8 0200282D */ daddu $a1, $s0, $zero +/* D8EB1C 802418CC 0000302D */ daddu $a2, $zero, $zero +/* D8EB20 802418D0 860300A8 */ lh $v1, 0xa8($s0) +/* D8EB24 802418D4 3C013F80 */ lui $at, 0x3f80 +/* D8EB28 802418D8 44810000 */ mtc1 $at, $f0 +/* D8EB2C 802418DC 3C014000 */ lui $at, 0x4000 +/* D8EB30 802418E0 44811000 */ mtc1 $at, $f2 +/* D8EB34 802418E4 3C01C1A0 */ lui $at, 0xc1a0 +/* D8EB38 802418E8 44812000 */ mtc1 $at, $f4 +/* D8EB3C 802418EC 2402000F */ addiu $v0, $zero, 0xf +/* D8EB40 802418F0 AFA2001C */ sw $v0, 0x1c($sp) +/* D8EB44 802418F4 44833000 */ mtc1 $v1, $f6 +/* D8EB48 802418F8 00000000 */ nop +/* D8EB4C 802418FC 468031A0 */ cvt.s.w $f6, $f6 +/* D8EB50 80241900 44073000 */ mfc1 $a3, $f6 +/* D8EB54 80241904 27A20028 */ addiu $v0, $sp, 0x28 +/* D8EB58 80241908 AFA20020 */ sw $v0, 0x20($sp) +/* D8EB5C 8024190C E7A00010 */ swc1 $f0, 0x10($sp) +/* D8EB60 80241910 E7A20014 */ swc1 $f2, 0x14($sp) +/* D8EB64 80241914 0C01BFA4 */ jal fx_emote +/* D8EB68 80241918 E7A40018 */ swc1 $f4, 0x18($sp) +/* D8EB6C 8024191C 8E4200CC */ lw $v0, 0xcc($s2) +/* D8EB70 80241920 8C430000 */ lw $v1, ($v0) +/* D8EB74 80241924 24020019 */ addiu $v0, $zero, 0x19 +/* D8EB78 80241928 A602008E */ sh $v0, 0x8e($s0) +/* D8EB7C 8024192C 2402000E */ addiu $v0, $zero, 0xe +/* D8EB80 80241930 0809065B */ j .L8024196C +/* D8EB84 80241934 AE030028 */ sw $v1, 0x28($s0) +.L80241938: +/* D8EB88 80241938 0C00F598 */ jal func_8003D660 +/* D8EB8C 8024193C 24050001 */ addiu $a1, $zero, 1 +/* D8EB90 80241940 8E050018 */ lw $a1, 0x18($s0) +/* D8EB94 80241944 8E06000C */ lw $a2, 0xc($s0) +/* D8EB98 80241948 0C00EA95 */ jal npc_move_heading +/* D8EB9C 8024194C 0200202D */ daddu $a0, $s0, $zero +/* D8EBA0 80241950 8602008E */ lh $v0, 0x8e($s0) +/* D8EBA4 80241954 9603008E */ lhu $v1, 0x8e($s0) +/* D8EBA8 80241958 18400003 */ blez $v0, .L80241968 +/* D8EBAC 8024195C 2462FFFF */ addiu $v0, $v1, -1 +/* D8EBB0 80241960 0809065C */ j .L80241970 +/* D8EBB4 80241964 A602008E */ sh $v0, 0x8e($s0) +.L80241968: +/* D8EBB8 80241968 2402000C */ addiu $v0, $zero, 0xc +.L8024196C: +/* D8EBBC 8024196C AE620070 */ sw $v0, 0x70($s3) +.L80241970: +/* D8EBC0 80241970 8FBF0040 */ lw $ra, 0x40($sp) +/* D8EBC4 80241974 8FB3003C */ lw $s3, 0x3c($sp) +/* D8EBC8 80241978 8FB20038 */ lw $s2, 0x38($sp) +/* D8EBCC 8024197C 8FB10034 */ lw $s1, 0x34($sp) +/* D8EBD0 80241980 8FB00030 */ lw $s0, 0x30($sp) +/* D8EBD4 80241984 03E00008 */ jr $ra +/* D8EBD8 80241988 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C.s deleted file mode 100644 index ce9f130e2e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024198C -/* D8EBDC 8024198C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8EBE0 80241990 AFB10014 */ sw $s1, 0x14($sp) -/* D8EBE4 80241994 0080882D */ daddu $s1, $a0, $zero -/* D8EBE8 80241998 AFBF0018 */ sw $ra, 0x18($sp) -/* D8EBEC 8024199C AFB00010 */ sw $s0, 0x10($sp) -/* D8EBF0 802419A0 8E300148 */ lw $s0, 0x148($s1) -/* D8EBF4 802419A4 0C00EABB */ jal get_npc_unsafe -/* D8EBF8 802419A8 86040008 */ lh $a0, 8($s0) -/* D8EBFC 802419AC 9443008E */ lhu $v1, 0x8e($v0) -/* D8EC00 802419B0 2463FFFF */ addiu $v1, $v1, -1 -/* D8EC04 802419B4 A443008E */ sh $v1, 0x8e($v0) -/* D8EC08 802419B8 00031C00 */ sll $v1, $v1, 0x10 -/* D8EC0C 802419BC 14600008 */ bnez $v1, .L802419E0 -/* D8EC10 802419C0 00000000 */ nop -/* D8EC14 802419C4 8E0200B0 */ lw $v0, 0xb0($s0) -/* D8EC18 802419C8 30420080 */ andi $v0, $v0, 0x80 -/* D8EC1C 802419CC 10400003 */ beqz $v0, .L802419DC -/* D8EC20 802419D0 2402000F */ addiu $v0, $zero, 0xf -/* D8EC24 802419D4 08090678 */ j .L802419E0 -/* D8EC28 802419D8 AE220070 */ sw $v0, 0x70($s1) -.L802419DC: -/* D8EC2C 802419DC AE200070 */ sw $zero, 0x70($s1) -.L802419E0: -/* D8EC30 802419E0 8FBF0018 */ lw $ra, 0x18($sp) -/* D8EC34 802419E4 8FB10014 */ lw $s1, 0x14($sp) -/* D8EC38 802419E8 8FB00010 */ lw $s0, 0x10($sp) -/* D8EC3C 802419EC 03E00008 */ jr $ra -/* D8EC40 802419F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s new file mode 100644 index 0000000000..29131e9657 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_8024198C_D8EBDC.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024198C_D8EBDC +/* D8EBDC 8024198C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D8EBE0 80241990 AFB10014 */ sw $s1, 0x14($sp) +/* D8EBE4 80241994 0080882D */ daddu $s1, $a0, $zero +/* D8EBE8 80241998 AFBF0018 */ sw $ra, 0x18($sp) +/* D8EBEC 8024199C AFB00010 */ sw $s0, 0x10($sp) +/* D8EBF0 802419A0 8E300148 */ lw $s0, 0x148($s1) +/* D8EBF4 802419A4 0C00EABB */ jal get_npc_unsafe +/* D8EBF8 802419A8 86040008 */ lh $a0, 8($s0) +/* D8EBFC 802419AC 9443008E */ lhu $v1, 0x8e($v0) +/* D8EC00 802419B0 2463FFFF */ addiu $v1, $v1, -1 +/* D8EC04 802419B4 A443008E */ sh $v1, 0x8e($v0) +/* D8EC08 802419B8 00031C00 */ sll $v1, $v1, 0x10 +/* D8EC0C 802419BC 14600008 */ bnez $v1, .L802419E0 +/* D8EC10 802419C0 00000000 */ nop +/* D8EC14 802419C4 8E0200B0 */ lw $v0, 0xb0($s0) +/* D8EC18 802419C8 30420080 */ andi $v0, $v0, 0x80 +/* D8EC1C 802419CC 10400003 */ beqz $v0, .L802419DC +/* D8EC20 802419D0 2402000F */ addiu $v0, $zero, 0xf +/* D8EC24 802419D4 08090678 */ j .L802419E0 +/* D8EC28 802419D8 AE220070 */ sw $v0, 0x70($s1) +.L802419DC: +/* D8EC2C 802419DC AE200070 */ sw $zero, 0x70($s1) +.L802419E0: +/* D8EC30 802419E0 8FBF0018 */ lw $ra, 0x18($sp) +/* D8EC34 802419E4 8FB10014 */ lw $s1, 0x14($sp) +/* D8EC38 802419E8 8FB00010 */ lw $s0, 0x10($sp) +/* D8EC3C 802419EC 03E00008 */ jr $ra +/* D8EC40 802419F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s index fa82163181..69e646a70d 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241AB4_D8ED04.s @@ -131,33 +131,33 @@ glabel func_80241AB4_D8ED04 /* D8EEE4 80241C94 00000000 */ nop /* D8EEE8 80241C98 0280202D */ daddu $a0, $s4, $zero /* D8EEEC 80241C9C 0260282D */ daddu $a1, $s3, $zero -/* D8EEF0 80241CA0 0C0903C8 */ jal func_80240F20 +/* D8EEF0 80241CA0 0C0903C8 */ jal func_80240F20_D8E170 /* D8EEF4 80241CA4 02A0302D */ daddu $a2, $s5, $zero /* D8EEF8 80241CA8 0280202D */ daddu $a0, $s4, $zero /* D8EEFC 80241CAC 0260282D */ daddu $a1, $s3, $zero -/* D8EF00 80241CB0 0C09041E */ jal func_80241078 +/* D8EF00 80241CB0 0C09041E */ jal func_80241078_D8E2C8 /* D8EF04 80241CB4 02A0302D */ daddu $a2, $s5, $zero /* D8EF08 80241CB8 08090762 */ j .L80241D88 /* D8EF0C 80241CBC 00000000 */ nop /* D8EF10 80241CC0 0280202D */ daddu $a0, $s4, $zero /* D8EF14 80241CC4 0260282D */ daddu $a1, $s3, $zero -/* D8EF18 80241CC8 0C0904C8 */ jal func_80241320 +/* D8EF18 80241CC8 0C0904C8 */ jal func_80241320_D8E570 /* D8EF1C 80241CCC 02A0302D */ daddu $a2, $s5, $zero /* D8EF20 80241CD0 0280202D */ daddu $a0, $s4, $zero /* D8EF24 80241CD4 0260282D */ daddu $a1, $s3, $zero -/* D8EF28 80241CD8 0C0904F8 */ jal func_802413E0 +/* D8EF28 80241CD8 0C0904F8 */ jal func_802413E0_D8E630 /* D8EF2C 80241CDC 02A0302D */ daddu $a2, $s5, $zero /* D8EF30 80241CE0 08090762 */ j .L80241D88 /* D8EF34 80241CE4 00000000 */ nop /* D8EF38 80241CE8 0280202D */ daddu $a0, $s4, $zero /* D8EF3C 80241CEC 0260282D */ daddu $a1, $s3, $zero -/* D8EF40 80241CF0 0C090567 */ jal func_8024159C +/* D8EF40 80241CF0 0C090567 */ jal func_8024159C_D8E7EC /* D8EF44 80241CF4 02A0302D */ daddu $a2, $s5, $zero /* D8EF48 80241CF8 08090762 */ j .L80241D88 /* D8EF4C 80241CFC 00000000 */ nop /* D8EF50 80241D00 0280202D */ daddu $a0, $s4, $zero /* D8EF54 80241D04 0260282D */ daddu $a1, $s3, $zero -/* D8EF58 80241D08 0C090594 */ jal func_80241650 +/* D8EF58 80241D08 0C090594 */ jal func_80241650_D8E8A0 /* D8EF5C 80241D0C 02A0302D */ daddu $a2, $s5, $zero /* D8EF60 80241D10 0280202D */ daddu $a0, $s4, $zero /* D8EF64 80241D14 0260282D */ daddu $a1, $s3, $zero @@ -167,23 +167,23 @@ glabel func_80241AB4_D8ED04 /* D8EF74 80241D24 00000000 */ nop /* D8EF78 80241D28 0280202D */ daddu $a0, $s4, $zero /* D8EF7C 80241D2C 0260282D */ daddu $a1, $s3, $zero -/* D8EF80 80241D30 0C0905CF */ jal func_8024173C +/* D8EF80 80241D30 0C0905CF */ jal func_8024173C_D8E98C /* D8EF84 80241D34 02A0302D */ daddu $a2, $s5, $zero /* D8EF88 80241D38 0280202D */ daddu $a0, $s4, $zero /* D8EF8C 80241D3C 0260282D */ daddu $a1, $s3, $zero -/* D8EF90 80241D40 0C09061B */ jal func_8024186C +/* D8EF90 80241D40 0C09061B */ jal func_8024186C_D8EABC /* D8EF94 80241D44 02A0302D */ daddu $a2, $s5, $zero /* D8EF98 80241D48 08090762 */ j .L80241D88 /* D8EF9C 80241D4C 00000000 */ nop /* D8EFA0 80241D50 0280202D */ daddu $a0, $s4, $zero /* D8EFA4 80241D54 0260282D */ daddu $a1, $s3, $zero -/* D8EFA8 80241D58 0C090663 */ jal func_8024198C +/* D8EFA8 80241D58 0C090663 */ jal func_8024198C_D8EBDC /* D8EFAC 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* D8EFB0 80241D60 08090762 */ j .L80241D88 /* D8EFB4 80241D64 00000000 */ nop /* D8EFB8 80241D68 0280202D */ daddu $a0, $s4, $zero /* D8EFBC 80241D6C 0260282D */ daddu $a1, $s3, $zero -/* D8EFC0 80241D70 0C09067D */ jal func_802419F4 +/* D8EFC0 80241D70 0C09067D */ jal func_802419F4_D8EC44 /* D8EFC4 80241D74 02A0302D */ daddu $a2, $s5, $zero /* D8EFC8 80241D78 08090762 */ j .L80241D88 /* D8EFCC 80241D7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0.s deleted file mode 100644 index 2205188698..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DB0 -/* D8F000 80241DB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8F004 80241DB4 AFB10014 */ sw $s1, 0x14($sp) -/* D8F008 80241DB8 0080882D */ daddu $s1, $a0, $zero -/* D8F00C 80241DBC AFBF0018 */ sw $ra, 0x18($sp) -/* D8F010 80241DC0 AFB00010 */ sw $s0, 0x10($sp) -/* D8F014 80241DC4 8E300148 */ lw $s0, 0x148($s1) -/* D8F018 80241DC8 0C00EABB */ jal get_npc_unsafe -/* D8F01C 80241DCC 86040008 */ lh $a0, 8($s0) -/* D8F020 80241DD0 24030001 */ addiu $v1, $zero, 1 -/* D8F024 80241DD4 0040202D */ daddu $a0, $v0, $zero -/* D8F028 80241DD8 AE03006C */ sw $v1, 0x6c($s0) -/* D8F02C 80241DDC 8482008C */ lh $v0, 0x8c($a0) -/* D8F030 80241DE0 14400009 */ bnez $v0, .L80241E08 -/* D8F034 80241DE4 24020002 */ addiu $v0, $zero, 2 -/* D8F038 80241DE8 96030072 */ lhu $v1, 0x72($s0) -/* D8F03C 80241DEC AE02006C */ sw $v0, 0x6c($s0) -/* D8F040 80241DF0 A483008E */ sh $v1, 0x8e($a0) -/* D8F044 80241DF4 8E0200CC */ lw $v0, 0xcc($s0) -/* D8F048 80241DF8 8C420020 */ lw $v0, 0x20($v0) -/* D8F04C 80241DFC AC820028 */ sw $v0, 0x28($a0) -/* D8F050 80241E00 2402001F */ addiu $v0, $zero, 0x1f -/* D8F054 80241E04 AE220070 */ sw $v0, 0x70($s1) -.L80241E08: -/* D8F058 80241E08 8FBF0018 */ lw $ra, 0x18($sp) -/* D8F05C 80241E0C 8FB10014 */ lw $s1, 0x14($sp) -/* D8F060 80241E10 8FB00010 */ lw $s0, 0x10($sp) -/* D8F064 80241E14 03E00008 */ jr $ra -/* D8F068 80241E18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0_D8F000.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0_D8F000.s new file mode 100644 index 0000000000..3a37b657e1 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241DB0_D8F000.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DB0_D8F000 +/* D8F000 80241DB0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D8F004 80241DB4 AFB10014 */ sw $s1, 0x14($sp) +/* D8F008 80241DB8 0080882D */ daddu $s1, $a0, $zero +/* D8F00C 80241DBC AFBF0018 */ sw $ra, 0x18($sp) +/* D8F010 80241DC0 AFB00010 */ sw $s0, 0x10($sp) +/* D8F014 80241DC4 8E300148 */ lw $s0, 0x148($s1) +/* D8F018 80241DC8 0C00EABB */ jal get_npc_unsafe +/* D8F01C 80241DCC 86040008 */ lh $a0, 8($s0) +/* D8F020 80241DD0 24030001 */ addiu $v1, $zero, 1 +/* D8F024 80241DD4 0040202D */ daddu $a0, $v0, $zero +/* D8F028 80241DD8 AE03006C */ sw $v1, 0x6c($s0) +/* D8F02C 80241DDC 8482008C */ lh $v0, 0x8c($a0) +/* D8F030 80241DE0 14400009 */ bnez $v0, .L80241E08 +/* D8F034 80241DE4 24020002 */ addiu $v0, $zero, 2 +/* D8F038 80241DE8 96030072 */ lhu $v1, 0x72($s0) +/* D8F03C 80241DEC AE02006C */ sw $v0, 0x6c($s0) +/* D8F040 80241DF0 A483008E */ sh $v1, 0x8e($a0) +/* D8F044 80241DF4 8E0200CC */ lw $v0, 0xcc($s0) +/* D8F048 80241DF8 8C420020 */ lw $v0, 0x20($v0) +/* D8F04C 80241DFC AC820028 */ sw $v0, 0x28($a0) +/* D8F050 80241E00 2402001F */ addiu $v0, $zero, 0x1f +/* D8F054 80241E04 AE220070 */ sw $v0, 0x70($s1) +.L80241E08: +/* D8F058 80241E08 8FBF0018 */ lw $ra, 0x18($sp) +/* D8F05C 80241E0C 8FB10014 */ lw $s1, 0x14($sp) +/* D8F060 80241E10 8FB00010 */ lw $s0, 0x10($sp) +/* D8F064 80241E14 03E00008 */ jr $ra +/* D8F068 80241E18 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64.s deleted file mode 100644 index e176d7a488..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F64 -/* D8F1B4 80241F64 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8F1B8 80241F68 AFB10014 */ sw $s1, 0x14($sp) -/* D8F1BC 80241F6C 0080882D */ daddu $s1, $a0, $zero -/* D8F1C0 80241F70 AFBF0018 */ sw $ra, 0x18($sp) -/* D8F1C4 80241F74 AFB00010 */ sw $s0, 0x10($sp) -/* D8F1C8 80241F78 8E300148 */ lw $s0, 0x148($s1) -/* D8F1CC 80241F7C 0C00EABB */ jal get_npc_unsafe -/* D8F1D0 80241F80 86040008 */ lh $a0, 8($s0) -/* D8F1D4 80241F84 9443008E */ lhu $v1, 0x8e($v0) -/* D8F1D8 80241F88 2463FFFF */ addiu $v1, $v1, -1 -/* D8F1DC 80241F8C A443008E */ sh $v1, 0x8e($v0) -/* D8F1E0 80241F90 00031C00 */ sll $v1, $v1, 0x10 -/* D8F1E4 80241F94 1C600003 */ bgtz $v1, .L80241FA4 -/* D8F1E8 80241F98 2402000C */ addiu $v0, $zero, 0xc -/* D8F1EC 80241F9C AE00006C */ sw $zero, 0x6c($s0) -/* D8F1F0 80241FA0 AE220070 */ sw $v0, 0x70($s1) -.L80241FA4: -/* D8F1F4 80241FA4 8FBF0018 */ lw $ra, 0x18($sp) -/* D8F1F8 80241FA8 8FB10014 */ lw $s1, 0x14($sp) -/* D8F1FC 80241FAC 8FB00010 */ lw $s0, 0x10($sp) -/* D8F200 80241FB0 03E00008 */ jr $ra -/* D8F204 80241FB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s new file mode 100644 index 0000000000..be2e74f077 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241F64_D8F1B4.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F64_D8F1B4 +/* D8F1B4 80241F64 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D8F1B8 80241F68 AFB10014 */ sw $s1, 0x14($sp) +/* D8F1BC 80241F6C 0080882D */ daddu $s1, $a0, $zero +/* D8F1C0 80241F70 AFBF0018 */ sw $ra, 0x18($sp) +/* D8F1C4 80241F74 AFB00010 */ sw $s0, 0x10($sp) +/* D8F1C8 80241F78 8E300148 */ lw $s0, 0x148($s1) +/* D8F1CC 80241F7C 0C00EABB */ jal get_npc_unsafe +/* D8F1D0 80241F80 86040008 */ lh $a0, 8($s0) +/* D8F1D4 80241F84 9443008E */ lhu $v1, 0x8e($v0) +/* D8F1D8 80241F88 2463FFFF */ addiu $v1, $v1, -1 +/* D8F1DC 80241F8C A443008E */ sh $v1, 0x8e($v0) +/* D8F1E0 80241F90 00031C00 */ sll $v1, $v1, 0x10 +/* D8F1E4 80241F94 1C600003 */ bgtz $v1, .L80241FA4 +/* D8F1E8 80241F98 2402000C */ addiu $v0, $zero, 0xc +/* D8F1EC 80241F9C AE00006C */ sw $zero, 0x6c($s0) +/* D8F1F0 80241FA0 AE220070 */ sw $v0, 0x70($s1) +.L80241FA4: +/* D8F1F4 80241FA4 8FBF0018 */ lw $ra, 0x18($sp) +/* D8F1F8 80241FA8 8FB10014 */ lw $s1, 0x14($sp) +/* D8F1FC 80241FAC 8FB00010 */ lw $s0, 0x10($sp) +/* D8F200 80241FB0 03E00008 */ jr $ra +/* D8F204 80241FB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8.s deleted file mode 100644 index 4b82fb3197..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FB8 -/* D8F208 80241FB8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D8F20C 80241FBC AFBF0024 */ sw $ra, 0x24($sp) -/* D8F210 80241FC0 AFB40020 */ sw $s4, 0x20($sp) -/* D8F214 80241FC4 AFB3001C */ sw $s3, 0x1c($sp) -/* D8F218 80241FC8 AFB20018 */ sw $s2, 0x18($sp) -/* D8F21C 80241FCC AFB10014 */ sw $s1, 0x14($sp) -/* D8F220 80241FD0 AFB00010 */ sw $s0, 0x10($sp) -/* D8F224 80241FD4 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D8F228 80241FD8 8C900148 */ lw $s0, 0x148($a0) -/* D8F22C 80241FDC 86040008 */ lh $a0, 8($s0) -/* D8F230 80241FE0 0C00EABB */ jal get_npc_unsafe -/* D8F234 80241FE4 24110001 */ addiu $s1, $zero, 1 -/* D8F238 80241FE8 86040008 */ lh $a0, 8($s0) -/* D8F23C 80241FEC 0040802D */ daddu $s0, $v0, $zero -/* D8F240 80241FF0 3C05800B */ lui $a1, %hi(gCameras) -/* D8F244 80241FF4 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D8F248 80241FF8 3C03800A */ lui $v1, 0x800a -/* D8F24C 80241FFC 8463A634 */ lh $v1, -0x59cc($v1) -/* D8F250 80242000 00912021 */ addu $a0, $a0, $s1 -/* D8F254 80242004 00031080 */ sll $v0, $v1, 2 -/* D8F258 80242008 00431021 */ addu $v0, $v0, $v1 -/* D8F25C 8024200C 00021080 */ sll $v0, $v0, 2 -/* D8F260 80242010 00431023 */ subu $v0, $v0, $v1 -/* D8F264 80242014 000218C0 */ sll $v1, $v0, 3 -/* D8F268 80242018 00431021 */ addu $v0, $v0, $v1 -/* D8F26C 8024201C 000210C0 */ sll $v0, $v0, 3 -/* D8F270 80242020 0C00FB3A */ jal get_enemy -/* D8F274 80242024 00459021 */ addu $s2, $v0, $a1 -/* D8F278 80242028 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* D8F27C 8024202C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* D8F280 80242030 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D8F284 80242034 8E830000 */ lw $v1, ($s4) -/* D8F288 80242038 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D8F28C 8024203C 8C660028 */ lw $a2, 0x28($v1) -/* D8F290 80242040 8C670030 */ lw $a3, 0x30($v1) -/* D8F294 80242044 0C00A7B5 */ jal dist2D -/* D8F298 80242048 0040982D */ daddu $s3, $v0, $zero -/* D8F29C 8024204C C6620074 */ lwc1 $f2, 0x74($s3) -/* D8F2A0 80242050 468010A0 */ cvt.s.w $f2, $f2 -/* D8F2A4 80242054 4600103C */ c.lt.s $f2, $f0 -/* D8F2A8 80242058 00000000 */ nop -/* D8F2AC 8024205C 45030001 */ bc1tl .L80242064 -/* D8F2B0 80242060 0000882D */ daddu $s1, $zero, $zero -.L80242064: -/* D8F2B4 80242064 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D8F2B8 80242068 C60E000C */ lwc1 $f14, 0xc($s0) -/* D8F2BC 8024206C 3C014387 */ lui $at, 0x4387 -/* D8F2C0 80242070 4481A000 */ mtc1 $at, $f20 -/* D8F2C4 80242074 0C00A70A */ jal get_clamped_angle_diff -/* D8F2C8 80242078 00000000 */ nop -/* D8F2CC 8024207C 0C00A6C9 */ jal clamp_angle -/* D8F2D0 80242080 46000306 */ mov.s $f12, $f0 -/* D8F2D4 80242084 3C018024 */ lui $at, 0x8024 -/* D8F2D8 80242088 D4224180 */ ldc1 $f2, 0x4180($at) -/* D8F2DC 8024208C 46000021 */ cvt.d.s $f0, $f0 -/* D8F2E0 80242090 4622003C */ c.lt.d $f0, $f2 -/* D8F2E4 80242094 00000000 */ nop -/* D8F2E8 80242098 45000003 */ bc1f .L802420A8 -/* D8F2EC 8024209C 00000000 */ nop -/* D8F2F0 802420A0 3C0142B4 */ lui $at, 0x42b4 -/* D8F2F4 802420A4 4481A000 */ mtc1 $at, $f20 -.L802420A8: -/* D8F2F8 802420A8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D8F2FC 802420AC 8E820000 */ lw $v0, ($s4) -/* D8F300 802420B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D8F304 802420B4 8C460028 */ lw $a2, 0x28($v0) -/* D8F308 802420B8 0C00A720 */ jal atan2 -/* D8F30C 802420BC 8C470030 */ lw $a3, 0x30($v0) -/* D8F310 802420C0 4600A306 */ mov.s $f12, $f20 -/* D8F314 802420C4 0C00A70A */ jal get_clamped_angle_diff -/* D8F318 802420C8 46000386 */ mov.s $f14, $f0 -/* D8F31C 802420CC C6620078 */ lwc1 $f2, 0x78($s3) -/* D8F320 802420D0 468010A0 */ cvt.s.w $f2, $f2 -/* D8F324 802420D4 46000005 */ abs.s $f0, $f0 -/* D8F328 802420D8 4600103C */ c.lt.s $f2, $f0 -/* D8F32C 802420DC 00000000 */ nop -/* D8F330 802420E0 45030001 */ bc1tl .L802420E8 -/* D8F334 802420E4 0000882D */ daddu $s1, $zero, $zero -.L802420E8: -/* D8F338 802420E8 8E820000 */ lw $v0, ($s4) -/* D8F33C 802420EC C600003C */ lwc1 $f0, 0x3c($s0) -/* D8F340 802420F0 C442002C */ lwc1 $f2, 0x2c($v0) -/* D8F344 802420F4 860200A8 */ lh $v0, 0xa8($s0) -/* D8F348 802420F8 46020001 */ sub.s $f0, $f0, $f2 -/* D8F34C 802420FC 44821000 */ mtc1 $v0, $f2 -/* D8F350 80242100 00000000 */ nop -/* D8F354 80242104 468010A1 */ cvt.d.w $f2, $f2 -/* D8F358 80242108 46221080 */ add.d $f2, $f2, $f2 -/* D8F35C 8024210C 46000005 */ abs.s $f0, $f0 -/* D8F360 80242110 46000021 */ cvt.d.s $f0, $f0 -/* D8F364 80242114 4620103E */ c.le.d $f2, $f0 -/* D8F368 80242118 00000000 */ nop -/* D8F36C 8024211C 45030001 */ bc1tl .L80242124 -/* D8F370 80242120 0000882D */ daddu $s1, $zero, $zero -.L80242124: -/* D8F374 80242124 3C038011 */ lui $v1, 0x8011 -/* D8F378 80242128 8063EBB3 */ lb $v1, -0x144d($v1) -/* D8F37C 8024212C 24020009 */ addiu $v0, $zero, 9 -/* D8F380 80242130 50620001 */ beql $v1, $v0, .L80242138 -/* D8F384 80242134 0000882D */ daddu $s1, $zero, $zero -.L80242138: -/* D8F388 80242138 24020007 */ addiu $v0, $zero, 7 -/* D8F38C 8024213C 50620001 */ beql $v1, $v0, .L80242144 -/* D8F390 80242140 0000882D */ daddu $s1, $zero, $zero -.L80242144: -/* D8F394 80242144 0220102D */ daddu $v0, $s1, $zero -/* D8F398 80242148 8FBF0024 */ lw $ra, 0x24($sp) -/* D8F39C 8024214C 8FB40020 */ lw $s4, 0x20($sp) -/* D8F3A0 80242150 8FB3001C */ lw $s3, 0x1c($sp) -/* D8F3A4 80242154 8FB20018 */ lw $s2, 0x18($sp) -/* D8F3A8 80242158 8FB10014 */ lw $s1, 0x14($sp) -/* D8F3AC 8024215C 8FB00010 */ lw $s0, 0x10($sp) -/* D8F3B0 80242160 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D8F3B4 80242164 03E00008 */ jr $ra -/* D8F3B8 80242168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s new file mode 100644 index 0000000000..0130e677ef --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80241FB8_D8F208.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FB8_D8F208 +/* D8F208 80241FB8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* D8F20C 80241FBC AFBF0024 */ sw $ra, 0x24($sp) +/* D8F210 80241FC0 AFB40020 */ sw $s4, 0x20($sp) +/* D8F214 80241FC4 AFB3001C */ sw $s3, 0x1c($sp) +/* D8F218 80241FC8 AFB20018 */ sw $s2, 0x18($sp) +/* D8F21C 80241FCC AFB10014 */ sw $s1, 0x14($sp) +/* D8F220 80241FD0 AFB00010 */ sw $s0, 0x10($sp) +/* D8F224 80241FD4 F7B40028 */ sdc1 $f20, 0x28($sp) +/* D8F228 80241FD8 8C900148 */ lw $s0, 0x148($a0) +/* D8F22C 80241FDC 86040008 */ lh $a0, 8($s0) +/* D8F230 80241FE0 0C00EABB */ jal get_npc_unsafe +/* D8F234 80241FE4 24110001 */ addiu $s1, $zero, 1 +/* D8F238 80241FE8 86040008 */ lh $a0, 8($s0) +/* D8F23C 80241FEC 0040802D */ daddu $s0, $v0, $zero +/* D8F240 80241FF0 3C05800B */ lui $a1, %hi(gCameras) +/* D8F244 80241FF4 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* D8F248 80241FF8 3C03800A */ lui $v1, 0x800a +/* D8F24C 80241FFC 8463A634 */ lh $v1, -0x59cc($v1) +/* D8F250 80242000 00912021 */ addu $a0, $a0, $s1 +/* D8F254 80242004 00031080 */ sll $v0, $v1, 2 +/* D8F258 80242008 00431021 */ addu $v0, $v0, $v1 +/* D8F25C 8024200C 00021080 */ sll $v0, $v0, 2 +/* D8F260 80242010 00431023 */ subu $v0, $v0, $v1 +/* D8F264 80242014 000218C0 */ sll $v1, $v0, 3 +/* D8F268 80242018 00431021 */ addu $v0, $v0, $v1 +/* D8F26C 8024201C 000210C0 */ sll $v0, $v0, 3 +/* D8F270 80242020 0C00FB3A */ jal get_enemy +/* D8F274 80242024 00459021 */ addu $s2, $v0, $a1 +/* D8F278 80242028 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) +/* D8F27C 8024202C 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) +/* D8F280 80242030 C60C0038 */ lwc1 $f12, 0x38($s0) +/* D8F284 80242034 8E830000 */ lw $v1, ($s4) +/* D8F288 80242038 C60E0040 */ lwc1 $f14, 0x40($s0) +/* D8F28C 8024203C 8C660028 */ lw $a2, 0x28($v1) +/* D8F290 80242040 8C670030 */ lw $a3, 0x30($v1) +/* D8F294 80242044 0C00A7B5 */ jal dist2D +/* D8F298 80242048 0040982D */ daddu $s3, $v0, $zero +/* D8F29C 8024204C C6620074 */ lwc1 $f2, 0x74($s3) +/* D8F2A0 80242050 468010A0 */ cvt.s.w $f2, $f2 +/* D8F2A4 80242054 4600103C */ c.lt.s $f2, $f0 +/* D8F2A8 80242058 00000000 */ nop +/* D8F2AC 8024205C 45030001 */ bc1tl .L80242064 +/* D8F2B0 80242060 0000882D */ daddu $s1, $zero, $zero +.L80242064: +/* D8F2B4 80242064 C64C006C */ lwc1 $f12, 0x6c($s2) +/* D8F2B8 80242068 C60E000C */ lwc1 $f14, 0xc($s0) +/* D8F2BC 8024206C 3C014387 */ lui $at, 0x4387 +/* D8F2C0 80242070 4481A000 */ mtc1 $at, $f20 +/* D8F2C4 80242074 0C00A70A */ jal get_clamped_angle_diff +/* D8F2C8 80242078 00000000 */ nop +/* D8F2CC 8024207C 0C00A6C9 */ jal clamp_angle +/* D8F2D0 80242080 46000306 */ mov.s $f12, $f0 +/* D8F2D4 80242084 3C018024 */ lui $at, 0x8024 +/* D8F2D8 80242088 D4224180 */ ldc1 $f2, 0x4180($at) +/* D8F2DC 8024208C 46000021 */ cvt.d.s $f0, $f0 +/* D8F2E0 80242090 4622003C */ c.lt.d $f0, $f2 +/* D8F2E4 80242094 00000000 */ nop +/* D8F2E8 80242098 45000003 */ bc1f .L802420A8 +/* D8F2EC 8024209C 00000000 */ nop +/* D8F2F0 802420A0 3C0142B4 */ lui $at, 0x42b4 +/* D8F2F4 802420A4 4481A000 */ mtc1 $at, $f20 +.L802420A8: +/* D8F2F8 802420A8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* D8F2FC 802420AC 8E820000 */ lw $v0, ($s4) +/* D8F300 802420B0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* D8F304 802420B4 8C460028 */ lw $a2, 0x28($v0) +/* D8F308 802420B8 0C00A720 */ jal atan2 +/* D8F30C 802420BC 8C470030 */ lw $a3, 0x30($v0) +/* D8F310 802420C0 4600A306 */ mov.s $f12, $f20 +/* D8F314 802420C4 0C00A70A */ jal get_clamped_angle_diff +/* D8F318 802420C8 46000386 */ mov.s $f14, $f0 +/* D8F31C 802420CC C6620078 */ lwc1 $f2, 0x78($s3) +/* D8F320 802420D0 468010A0 */ cvt.s.w $f2, $f2 +/* D8F324 802420D4 46000005 */ abs.s $f0, $f0 +/* D8F328 802420D8 4600103C */ c.lt.s $f2, $f0 +/* D8F32C 802420DC 00000000 */ nop +/* D8F330 802420E0 45030001 */ bc1tl .L802420E8 +/* D8F334 802420E4 0000882D */ daddu $s1, $zero, $zero +.L802420E8: +/* D8F338 802420E8 8E820000 */ lw $v0, ($s4) +/* D8F33C 802420EC C600003C */ lwc1 $f0, 0x3c($s0) +/* D8F340 802420F0 C442002C */ lwc1 $f2, 0x2c($v0) +/* D8F344 802420F4 860200A8 */ lh $v0, 0xa8($s0) +/* D8F348 802420F8 46020001 */ sub.s $f0, $f0, $f2 +/* D8F34C 802420FC 44821000 */ mtc1 $v0, $f2 +/* D8F350 80242100 00000000 */ nop +/* D8F354 80242104 468010A1 */ cvt.d.w $f2, $f2 +/* D8F358 80242108 46221080 */ add.d $f2, $f2, $f2 +/* D8F35C 8024210C 46000005 */ abs.s $f0, $f0 +/* D8F360 80242110 46000021 */ cvt.d.s $f0, $f0 +/* D8F364 80242114 4620103E */ c.le.d $f2, $f0 +/* D8F368 80242118 00000000 */ nop +/* D8F36C 8024211C 45030001 */ bc1tl .L80242124 +/* D8F370 80242120 0000882D */ daddu $s1, $zero, $zero +.L80242124: +/* D8F374 80242124 3C038011 */ lui $v1, 0x8011 +/* D8F378 80242128 8063EBB3 */ lb $v1, -0x144d($v1) +/* D8F37C 8024212C 24020009 */ addiu $v0, $zero, 9 +/* D8F380 80242130 50620001 */ beql $v1, $v0, .L80242138 +/* D8F384 80242134 0000882D */ daddu $s1, $zero, $zero +.L80242138: +/* D8F388 80242138 24020007 */ addiu $v0, $zero, 7 +/* D8F38C 8024213C 50620001 */ beql $v1, $v0, .L80242144 +/* D8F390 80242140 0000882D */ daddu $s1, $zero, $zero +.L80242144: +/* D8F394 80242144 0220102D */ daddu $v0, $s1, $zero +/* D8F398 80242148 8FBF0024 */ lw $ra, 0x24($sp) +/* D8F39C 8024214C 8FB40020 */ lw $s4, 0x20($sp) +/* D8F3A0 80242150 8FB3001C */ lw $s3, 0x1c($sp) +/* D8F3A4 80242154 8FB20018 */ lw $s2, 0x18($sp) +/* D8F3A8 80242158 8FB10014 */ lw $s1, 0x14($sp) +/* D8F3AC 8024215C 8FB00010 */ lw $s0, 0x10($sp) +/* D8F3B0 80242160 D7B40028 */ ldc1 $f20, 0x28($sp) +/* D8F3B4 80242164 03E00008 */ jr $ra +/* D8F3B8 80242168 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s index ff85c1a0d7..19f3e139ee 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_802423CC_D8F61C.s @@ -90,7 +90,7 @@ glabel func_802423CC_D8F61C /* D8F75C 8024250C 8E22006C */ lw $v0, 0x6c($s1) /* D8F760 80242510 14400006 */ bnez $v0, .L8024252C /* D8F764 80242514 00000000 */ nop -/* D8F768 80242518 0C0907EE */ jal func_80241FB8 +/* D8F768 80242518 0C0907EE */ jal func_80241FB8_D8F208 /* D8F76C 8024251C 0240202D */ daddu $a0, $s2, $zero /* D8F770 80242520 10400002 */ beqz $v0, .L8024252C /* D8F774 80242524 2402001E */ addiu $v0, $zero, 0x1e @@ -107,33 +107,33 @@ glabel func_802423CC_D8F61C /* D8F79C 8024254C 00000000 */ nop /* D8F7A0 80242550 0240202D */ daddu $a0, $s2, $zero /* D8F7A4 80242554 0260282D */ daddu $a1, $s3, $zero -/* D8F7A8 80242558 0C0903C8 */ jal func_80240F20 +/* D8F7A8 80242558 0C0903C8 */ jal func_80240F20_D8E170 /* D8F7AC 8024255C 0280302D */ daddu $a2, $s4, $zero /* D8F7B0 80242560 0240202D */ daddu $a0, $s2, $zero /* D8F7B4 80242564 0260282D */ daddu $a1, $s3, $zero -/* D8F7B8 80242568 0C09041E */ jal func_80241078 +/* D8F7B8 80242568 0C09041E */ jal func_80241078_D8E2C8 /* D8F7BC 8024256C 0280302D */ daddu $a2, $s4, $zero /* D8F7C0 80242570 0809099C */ j .L80242670 /* D8F7C4 80242574 00000000 */ nop /* D8F7C8 80242578 0240202D */ daddu $a0, $s2, $zero /* D8F7CC 8024257C 0260282D */ daddu $a1, $s3, $zero -/* D8F7D0 80242580 0C0904C8 */ jal func_80241320 +/* D8F7D0 80242580 0C0904C8 */ jal func_80241320_D8E570 /* D8F7D4 80242584 0280302D */ daddu $a2, $s4, $zero /* D8F7D8 80242588 0240202D */ daddu $a0, $s2, $zero /* D8F7DC 8024258C 0260282D */ daddu $a1, $s3, $zero -/* D8F7E0 80242590 0C0904F8 */ jal func_802413E0 +/* D8F7E0 80242590 0C0904F8 */ jal func_802413E0_D8E630 /* D8F7E4 80242594 0280302D */ daddu $a2, $s4, $zero /* D8F7E8 80242598 0809099C */ j .L80242670 /* D8F7EC 8024259C 00000000 */ nop /* D8F7F0 802425A0 0240202D */ daddu $a0, $s2, $zero /* D8F7F4 802425A4 0260282D */ daddu $a1, $s3, $zero -/* D8F7F8 802425A8 0C090567 */ jal func_8024159C +/* D8F7F8 802425A8 0C090567 */ jal func_8024159C_D8E7EC /* D8F7FC 802425AC 0280302D */ daddu $a2, $s4, $zero /* D8F800 802425B0 0809099C */ j .L80242670 /* D8F804 802425B4 00000000 */ nop /* D8F808 802425B8 0240202D */ daddu $a0, $s2, $zero /* D8F80C 802425BC 0260282D */ daddu $a1, $s3, $zero -/* D8F810 802425C0 0C090594 */ jal func_80241650 +/* D8F810 802425C0 0C090594 */ jal func_80241650_D8E8A0 /* D8F814 802425C4 0280302D */ daddu $a2, $s4, $zero /* D8F818 802425C8 0240202D */ daddu $a0, $s2, $zero /* D8F81C 802425CC 0260282D */ daddu $a1, $s3, $zero @@ -143,35 +143,35 @@ glabel func_802423CC_D8F61C /* D8F82C 802425DC 00000000 */ nop /* D8F830 802425E0 0240202D */ daddu $a0, $s2, $zero /* D8F834 802425E4 0260282D */ daddu $a1, $s3, $zero -/* D8F838 802425E8 0C0905CF */ jal func_8024173C +/* D8F838 802425E8 0C0905CF */ jal func_8024173C_D8E98C /* D8F83C 802425EC 0280302D */ daddu $a2, $s4, $zero /* D8F840 802425F0 0240202D */ daddu $a0, $s2, $zero /* D8F844 802425F4 0260282D */ daddu $a1, $s3, $zero -/* D8F848 802425F8 0C09061B */ jal func_8024186C +/* D8F848 802425F8 0C09061B */ jal func_8024186C_D8EABC /* D8F84C 802425FC 0280302D */ daddu $a2, $s4, $zero /* D8F850 80242600 0809099C */ j .L80242670 /* D8F854 80242604 00000000 */ nop /* D8F858 80242608 0240202D */ daddu $a0, $s2, $zero /* D8F85C 8024260C 0260282D */ daddu $a1, $s3, $zero -/* D8F860 80242610 0C090663 */ jal func_8024198C +/* D8F860 80242610 0C090663 */ jal func_8024198C_D8EBDC /* D8F864 80242614 0280302D */ daddu $a2, $s4, $zero /* D8F868 80242618 0809099C */ j .L80242670 /* D8F86C 8024261C 00000000 */ nop -/* D8F870 80242620 0C09076C */ jal func_80241DB0 +/* D8F870 80242620 0C09076C */ jal func_80241DB0_D8F000 /* D8F874 80242624 0240202D */ daddu $a0, $s2, $zero -/* D8F878 80242628 0C090787 */ jal func_80241E1C +/* D8F878 80242628 0C090787 */ jal func_80241E1C_D8F06C /* D8F87C 8024262C 0240202D */ daddu $a0, $s2, $zero /* D8F880 80242630 8E430070 */ lw $v1, 0x70($s2) /* D8F884 80242634 24020020 */ addiu $v0, $zero, 0x20 /* D8F888 80242638 1462000D */ bne $v1, $v0, .L80242670 /* D8F88C 8024263C 00000000 */ nop -/* D8F890 80242640 0C0907A3 */ jal func_80241E8C +/* D8F890 80242640 0C0907A3 */ jal func_80241E8C_D8F0DC /* D8F894 80242644 0240202D */ daddu $a0, $s2, $zero /* D8F898 80242648 8E430070 */ lw $v1, 0x70($s2) /* D8F89C 8024264C 24020021 */ addiu $v0, $zero, 0x21 /* D8F8A0 80242650 14620007 */ bne $v1, $v0, .L80242670 /* D8F8A4 80242654 00000000 */ nop -/* D8F8A8 80242658 0C0907D9 */ jal func_80241F64 +/* D8F8A8 80242658 0C0907D9 */ jal func_80241F64_D8F1B4 /* D8F8AC 8024265C 0240202D */ daddu $a0, $s2, $zero /* D8F8B0 80242660 0809099C */ j .L80242670 /* D8F8B4 80242664 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698.s deleted file mode 100644 index f2cafb367b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698.s +++ /dev/null @@ -1,185 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242698 -/* D8F8E8 80242698 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D8F8EC 8024269C AFB20038 */ sw $s2, 0x38($sp) -/* D8F8F0 802426A0 0080902D */ daddu $s2, $a0, $zero -/* D8F8F4 802426A4 AFBF0048 */ sw $ra, 0x48($sp) -/* D8F8F8 802426A8 AFB50044 */ sw $s5, 0x44($sp) -/* D8F8FC 802426AC AFB40040 */ sw $s4, 0x40($sp) -/* D8F900 802426B0 AFB3003C */ sw $s3, 0x3c($sp) -/* D8F904 802426B4 AFB10034 */ sw $s1, 0x34($sp) -/* D8F908 802426B8 AFB00030 */ sw $s0, 0x30($sp) -/* D8F90C 802426BC 8E510148 */ lw $s1, 0x148($s2) -/* D8F910 802426C0 86240008 */ lh $a0, 8($s1) -/* D8F914 802426C4 0C00EABB */ jal get_npc_unsafe -/* D8F918 802426C8 00A0802D */ daddu $s0, $a1, $zero -/* D8F91C 802426CC 8E43000C */ lw $v1, 0xc($s2) -/* D8F920 802426D0 0240202D */ daddu $a0, $s2, $zero -/* D8F924 802426D4 8C650000 */ lw $a1, ($v1) -/* D8F928 802426D8 0C0B1EAF */ jal get_variable -/* D8F92C 802426DC 0040A82D */ daddu $s5, $v0, $zero -/* D8F930 802426E0 AFA00010 */ sw $zero, 0x10($sp) -/* D8F934 802426E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F938 802426E8 8C630030 */ lw $v1, 0x30($v1) -/* D8F93C 802426EC AFA30014 */ sw $v1, 0x14($sp) -/* D8F940 802426F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F944 802426F4 8C63001C */ lw $v1, 0x1c($v1) -/* D8F948 802426F8 AFA30018 */ sw $v1, 0x18($sp) -/* D8F94C 802426FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F950 80242700 8C630024 */ lw $v1, 0x24($v1) -/* D8F954 80242704 AFA3001C */ sw $v1, 0x1c($sp) -/* D8F958 80242708 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F95C 8024270C 8C630028 */ lw $v1, 0x28($v1) -/* D8F960 80242710 27B40010 */ addiu $s4, $sp, 0x10 -/* D8F964 80242714 AFA30020 */ sw $v1, 0x20($sp) -/* D8F968 80242718 8E2300D0 */ lw $v1, 0xd0($s1) -/* D8F96C 8024271C 3C014282 */ lui $at, 0x4282 -/* D8F970 80242720 44810000 */ mtc1 $at, $f0 -/* D8F974 80242724 8C63002C */ lw $v1, 0x2c($v1) -/* D8F978 80242728 0040982D */ daddu $s3, $v0, $zero -/* D8F97C 8024272C E7A00028 */ swc1 $f0, 0x28($sp) -/* D8F980 80242730 A7A0002C */ sh $zero, 0x2c($sp) -/* D8F984 80242734 16000005 */ bnez $s0, .L8024274C -/* D8F988 80242738 AFA30024 */ sw $v1, 0x24($sp) -/* D8F98C 8024273C 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8F990 80242740 30420004 */ andi $v0, $v0, 4 -/* D8F994 80242744 10400020 */ beqz $v0, .L802427C8 -/* D8F998 80242748 00000000 */ nop -.L8024274C: -/* D8F99C 8024274C 2404F7FF */ addiu $a0, $zero, -0x801 -/* D8F9A0 80242750 AE400070 */ sw $zero, 0x70($s2) -/* D8F9A4 80242754 A6A0008E */ sh $zero, 0x8e($s5) -/* D8F9A8 80242758 8E2200CC */ lw $v0, 0xcc($s1) -/* D8F9AC 8024275C 8EA30000 */ lw $v1, ($s5) -/* D8F9B0 80242760 8C420000 */ lw $v0, ($v0) -/* D8F9B4 80242764 00641824 */ and $v1, $v1, $a0 -/* D8F9B8 80242768 AEA30000 */ sw $v1, ($s5) -/* D8F9BC 8024276C AEA20028 */ sw $v0, 0x28($s5) -/* D8F9C0 80242770 8E2200D0 */ lw $v0, 0xd0($s1) -/* D8F9C4 80242774 8C420034 */ lw $v0, 0x34($v0) -/* D8F9C8 80242778 54400005 */ bnel $v0, $zero, .L80242790 -/* D8F9CC 8024277C 2402FDFF */ addiu $v0, $zero, -0x201 -/* D8F9D0 80242780 34620200 */ ori $v0, $v1, 0x200 -/* D8F9D4 80242784 2403FFF7 */ addiu $v1, $zero, -9 -/* D8F9D8 80242788 080909E6 */ j .L80242798 -/* D8F9DC 8024278C 00431024 */ and $v0, $v0, $v1 -.L80242790: -/* D8F9E0 80242790 00621024 */ and $v0, $v1, $v0 -/* D8F9E4 80242794 34420008 */ ori $v0, $v0, 8 -.L80242798: -/* D8F9E8 80242798 AEA20000 */ sw $v0, ($s5) -/* D8F9EC 8024279C 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8F9F0 802427A0 30420004 */ andi $v0, $v0, 4 -/* D8F9F4 802427A4 10400007 */ beqz $v0, .L802427C4 -/* D8F9F8 802427A8 24020063 */ addiu $v0, $zero, 0x63 -/* D8F9FC 802427AC AE420070 */ sw $v0, 0x70($s2) -/* D8FA00 802427B0 AE400074 */ sw $zero, 0x74($s2) -/* D8FA04 802427B4 8E2200B0 */ lw $v0, 0xb0($s1) -/* D8FA08 802427B8 2403FFFB */ addiu $v1, $zero, -5 -/* D8FA0C 802427BC 00431024 */ and $v0, $v0, $v1 -/* D8FA10 802427C0 AE2200B0 */ sw $v0, 0xb0($s1) -.L802427C4: -/* D8FA14 802427C4 AE20006C */ sw $zero, 0x6c($s1) -.L802427C8: -/* D8FA18 802427C8 8E420070 */ lw $v0, 0x70($s2) -/* D8FA1C 802427CC 2842001E */ slti $v0, $v0, 0x1e -/* D8FA20 802427D0 10400009 */ beqz $v0, .L802427F8 -/* D8FA24 802427D4 00000000 */ nop -/* D8FA28 802427D8 8E22006C */ lw $v0, 0x6c($s1) -/* D8FA2C 802427DC 14400006 */ bnez $v0, .L802427F8 -/* D8FA30 802427E0 00000000 */ nop -/* D8FA34 802427E4 0C0907EE */ jal func_80241FB8 -/* D8FA38 802427E8 0240202D */ daddu $a0, $s2, $zero -/* D8FA3C 802427EC 10400002 */ beqz $v0, .L802427F8 -/* D8FA40 802427F0 2402001E */ addiu $v0, $zero, 0x1e -/* D8FA44 802427F4 AE420070 */ sw $v0, 0x70($s2) -.L802427F8: -/* D8FA48 802427F8 8E430070 */ lw $v1, 0x70($s2) -/* D8FA4C 802427FC 2C620064 */ sltiu $v0, $v1, 0x64 -/* D8FA50 80242800 10400048 */ beqz $v0, .L80242924 -/* D8FA54 80242804 00031080 */ sll $v0, $v1, 2 -/* D8FA58 80242808 3C018024 */ lui $at, 0x8024 -/* D8FA5C 8024280C 00220821 */ addu $at, $at, $v0 -/* D8FA60 80242810 8C224318 */ lw $v0, 0x4318($at) -/* D8FA64 80242814 00400008 */ jr $v0 -/* D8FA68 80242818 00000000 */ nop -/* D8FA6C 8024281C 0240202D */ daddu $a0, $s2, $zero -/* D8FA70 80242820 0260282D */ daddu $a1, $s3, $zero -/* D8FA74 80242824 0C012568 */ jal func_800495A0 -/* D8FA78 80242828 0280302D */ daddu $a2, $s4, $zero -/* D8FA7C 8024282C 0240202D */ daddu $a0, $s2, $zero -/* D8FA80 80242830 0260282D */ daddu $a1, $s3, $zero -/* D8FA84 80242834 0C0125AE */ jal func_800496B8 -/* D8FA88 80242838 0280302D */ daddu $a2, $s4, $zero -/* D8FA8C 8024283C 08090A49 */ j .L80242924 -/* D8FA90 80242840 00000000 */ nop -/* D8FA94 80242844 0240202D */ daddu $a0, $s2, $zero -/* D8FA98 80242848 0260282D */ daddu $a1, $s3, $zero -/* D8FA9C 8024284C 0C0126D1 */ jal func_80049B44 -/* D8FAA0 80242850 0280302D */ daddu $a2, $s4, $zero -/* D8FAA4 80242854 0240202D */ daddu $a0, $s2, $zero -/* D8FAA8 80242858 0260282D */ daddu $a1, $s3, $zero -/* D8FAAC 8024285C 0C012701 */ jal func_80049C04 -/* D8FAB0 80242860 0280302D */ daddu $a2, $s4, $zero -/* D8FAB4 80242864 08090A49 */ j .L80242924 -/* D8FAB8 80242868 00000000 */ nop -/* D8FABC 8024286C 0240202D */ daddu $a0, $s2, $zero -/* D8FAC0 80242870 0260282D */ daddu $a1, $s3, $zero -/* D8FAC4 80242874 0C01278F */ jal func_80049E3C -/* D8FAC8 80242878 0280302D */ daddu $a2, $s4, $zero -/* D8FACC 8024287C 0240202D */ daddu $a0, $s2, $zero -/* D8FAD0 80242880 0260282D */ daddu $a1, $s3, $zero -/* D8FAD4 80242884 0C0127B3 */ jal func_80049ECC -/* D8FAD8 80242888 0280302D */ daddu $a2, $s4, $zero -/* D8FADC 8024288C 08090A49 */ j .L80242924 -/* D8FAE0 80242890 00000000 */ nop -/* D8FAE4 80242894 0240202D */ daddu $a0, $s2, $zero -/* D8FAE8 80242898 0260282D */ daddu $a1, $s3, $zero -/* D8FAEC 8024289C 0C0127DF */ jal func_80049F7C -/* D8FAF0 802428A0 0280302D */ daddu $a2, $s4, $zero -/* D8FAF4 802428A4 0240202D */ daddu $a0, $s2, $zero -/* D8FAF8 802428A8 0260282D */ daddu $a1, $s3, $zero -/* D8FAFC 802428AC 0C012849 */ jal func_8004A124 -/* D8FB00 802428B0 0280302D */ daddu $a2, $s4, $zero -/* D8FB04 802428B4 08090A49 */ j .L80242924 -/* D8FB08 802428B8 00000000 */ nop -/* D8FB0C 802428BC 0240202D */ daddu $a0, $s2, $zero -/* D8FB10 802428C0 0260282D */ daddu $a1, $s3, $zero -/* D8FB14 802428C4 0C0128FA */ jal func_8004A3E8 -/* D8FB18 802428C8 0280302D */ daddu $a2, $s4, $zero -/* D8FB1C 802428CC 08090A49 */ j .L80242924 -/* D8FB20 802428D0 00000000 */ nop -/* D8FB24 802428D4 0C09076C */ jal func_80241DB0 -/* D8FB28 802428D8 0240202D */ daddu $a0, $s2, $zero -/* D8FB2C 802428DC 0C090787 */ jal func_80241E1C -/* D8FB30 802428E0 0240202D */ daddu $a0, $s2, $zero -/* D8FB34 802428E4 8E430070 */ lw $v1, 0x70($s2) -/* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 -/* D8FB3C 802428EC 1462000D */ bne $v1, $v0, .L80242924 -/* D8FB40 802428F0 00000000 */ nop -/* D8FB44 802428F4 0C0907A3 */ jal func_80241E8C -/* D8FB48 802428F8 0240202D */ daddu $a0, $s2, $zero -/* D8FB4C 802428FC 8E430070 */ lw $v1, 0x70($s2) -/* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 -/* D8FB54 80242904 14620007 */ bne $v1, $v0, .L80242924 -/* D8FB58 80242908 00000000 */ nop -/* D8FB5C 8024290C 0C0907D9 */ jal func_80241F64 -/* D8FB60 80242910 0240202D */ daddu $a0, $s2, $zero -/* D8FB64 80242914 08090A49 */ j .L80242924 -/* D8FB68 80242918 00000000 */ nop -/* D8FB6C 8024291C 0C0129CF */ jal func_8004A73C -/* D8FB70 80242920 0240202D */ daddu $a0, $s2, $zero -.L80242924: -/* D8FB74 80242924 8FBF0048 */ lw $ra, 0x48($sp) -/* D8FB78 80242928 8FB50044 */ lw $s5, 0x44($sp) -/* D8FB7C 8024292C 8FB40040 */ lw $s4, 0x40($sp) -/* D8FB80 80242930 8FB3003C */ lw $s3, 0x3c($sp) -/* D8FB84 80242934 8FB20038 */ lw $s2, 0x38($sp) -/* D8FB88 80242938 8FB10034 */ lw $s1, 0x34($sp) -/* D8FB8C 8024293C 8FB00030 */ lw $s0, 0x30($sp) -/* D8FB90 80242940 0000102D */ daddu $v0, $zero, $zero -/* D8FB94 80242944 03E00008 */ jr $ra -/* D8FB98 80242948 27BD0050 */ addiu $sp, $sp, 0x50 -/* D8FB9C 8024294C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s new file mode 100644 index 0000000000..8295349d85 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80242698_D8F8E8.s @@ -0,0 +1,185 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242698_D8F8E8 +/* D8F8E8 80242698 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* D8F8EC 8024269C AFB20038 */ sw $s2, 0x38($sp) +/* D8F8F0 802426A0 0080902D */ daddu $s2, $a0, $zero +/* D8F8F4 802426A4 AFBF0048 */ sw $ra, 0x48($sp) +/* D8F8F8 802426A8 AFB50044 */ sw $s5, 0x44($sp) +/* D8F8FC 802426AC AFB40040 */ sw $s4, 0x40($sp) +/* D8F900 802426B0 AFB3003C */ sw $s3, 0x3c($sp) +/* D8F904 802426B4 AFB10034 */ sw $s1, 0x34($sp) +/* D8F908 802426B8 AFB00030 */ sw $s0, 0x30($sp) +/* D8F90C 802426BC 8E510148 */ lw $s1, 0x148($s2) +/* D8F910 802426C0 86240008 */ lh $a0, 8($s1) +/* D8F914 802426C4 0C00EABB */ jal get_npc_unsafe +/* D8F918 802426C8 00A0802D */ daddu $s0, $a1, $zero +/* D8F91C 802426CC 8E43000C */ lw $v1, 0xc($s2) +/* D8F920 802426D0 0240202D */ daddu $a0, $s2, $zero +/* D8F924 802426D4 8C650000 */ lw $a1, ($v1) +/* D8F928 802426D8 0C0B1EAF */ jal get_variable +/* D8F92C 802426DC 0040A82D */ daddu $s5, $v0, $zero +/* D8F930 802426E0 AFA00010 */ sw $zero, 0x10($sp) +/* D8F934 802426E4 8E2300D0 */ lw $v1, 0xd0($s1) +/* D8F938 802426E8 8C630030 */ lw $v1, 0x30($v1) +/* D8F93C 802426EC AFA30014 */ sw $v1, 0x14($sp) +/* D8F940 802426F0 8E2300D0 */ lw $v1, 0xd0($s1) +/* D8F944 802426F4 8C63001C */ lw $v1, 0x1c($v1) +/* D8F948 802426F8 AFA30018 */ sw $v1, 0x18($sp) +/* D8F94C 802426FC 8E2300D0 */ lw $v1, 0xd0($s1) +/* D8F950 80242700 8C630024 */ lw $v1, 0x24($v1) +/* D8F954 80242704 AFA3001C */ sw $v1, 0x1c($sp) +/* D8F958 80242708 8E2300D0 */ lw $v1, 0xd0($s1) +/* D8F95C 8024270C 8C630028 */ lw $v1, 0x28($v1) +/* D8F960 80242710 27B40010 */ addiu $s4, $sp, 0x10 +/* D8F964 80242714 AFA30020 */ sw $v1, 0x20($sp) +/* D8F968 80242718 8E2300D0 */ lw $v1, 0xd0($s1) +/* D8F96C 8024271C 3C014282 */ lui $at, 0x4282 +/* D8F970 80242720 44810000 */ mtc1 $at, $f0 +/* D8F974 80242724 8C63002C */ lw $v1, 0x2c($v1) +/* D8F978 80242728 0040982D */ daddu $s3, $v0, $zero +/* D8F97C 8024272C E7A00028 */ swc1 $f0, 0x28($sp) +/* D8F980 80242730 A7A0002C */ sh $zero, 0x2c($sp) +/* D8F984 80242734 16000005 */ bnez $s0, .L8024274C +/* D8F988 80242738 AFA30024 */ sw $v1, 0x24($sp) +/* D8F98C 8024273C 8E2200B0 */ lw $v0, 0xb0($s1) +/* D8F990 80242740 30420004 */ andi $v0, $v0, 4 +/* D8F994 80242744 10400020 */ beqz $v0, .L802427C8 +/* D8F998 80242748 00000000 */ nop +.L8024274C: +/* D8F99C 8024274C 2404F7FF */ addiu $a0, $zero, -0x801 +/* D8F9A0 80242750 AE400070 */ sw $zero, 0x70($s2) +/* D8F9A4 80242754 A6A0008E */ sh $zero, 0x8e($s5) +/* D8F9A8 80242758 8E2200CC */ lw $v0, 0xcc($s1) +/* D8F9AC 8024275C 8EA30000 */ lw $v1, ($s5) +/* D8F9B0 80242760 8C420000 */ lw $v0, ($v0) +/* D8F9B4 80242764 00641824 */ and $v1, $v1, $a0 +/* D8F9B8 80242768 AEA30000 */ sw $v1, ($s5) +/* D8F9BC 8024276C AEA20028 */ sw $v0, 0x28($s5) +/* D8F9C0 80242770 8E2200D0 */ lw $v0, 0xd0($s1) +/* D8F9C4 80242774 8C420034 */ lw $v0, 0x34($v0) +/* D8F9C8 80242778 54400005 */ bnel $v0, $zero, .L80242790 +/* D8F9CC 8024277C 2402FDFF */ addiu $v0, $zero, -0x201 +/* D8F9D0 80242780 34620200 */ ori $v0, $v1, 0x200 +/* D8F9D4 80242784 2403FFF7 */ addiu $v1, $zero, -9 +/* D8F9D8 80242788 080909E6 */ j .L80242798 +/* D8F9DC 8024278C 00431024 */ and $v0, $v0, $v1 +.L80242790: +/* D8F9E0 80242790 00621024 */ and $v0, $v1, $v0 +/* D8F9E4 80242794 34420008 */ ori $v0, $v0, 8 +.L80242798: +/* D8F9E8 80242798 AEA20000 */ sw $v0, ($s5) +/* D8F9EC 8024279C 8E2200B0 */ lw $v0, 0xb0($s1) +/* D8F9F0 802427A0 30420004 */ andi $v0, $v0, 4 +/* D8F9F4 802427A4 10400007 */ beqz $v0, .L802427C4 +/* D8F9F8 802427A8 24020063 */ addiu $v0, $zero, 0x63 +/* D8F9FC 802427AC AE420070 */ sw $v0, 0x70($s2) +/* D8FA00 802427B0 AE400074 */ sw $zero, 0x74($s2) +/* D8FA04 802427B4 8E2200B0 */ lw $v0, 0xb0($s1) +/* D8FA08 802427B8 2403FFFB */ addiu $v1, $zero, -5 +/* D8FA0C 802427BC 00431024 */ and $v0, $v0, $v1 +/* D8FA10 802427C0 AE2200B0 */ sw $v0, 0xb0($s1) +.L802427C4: +/* D8FA14 802427C4 AE20006C */ sw $zero, 0x6c($s1) +.L802427C8: +/* D8FA18 802427C8 8E420070 */ lw $v0, 0x70($s2) +/* D8FA1C 802427CC 2842001E */ slti $v0, $v0, 0x1e +/* D8FA20 802427D0 10400009 */ beqz $v0, .L802427F8 +/* D8FA24 802427D4 00000000 */ nop +/* D8FA28 802427D8 8E22006C */ lw $v0, 0x6c($s1) +/* D8FA2C 802427DC 14400006 */ bnez $v0, .L802427F8 +/* D8FA30 802427E0 00000000 */ nop +/* D8FA34 802427E4 0C0907EE */ jal func_80241FB8_D8F208 +/* D8FA38 802427E8 0240202D */ daddu $a0, $s2, $zero +/* D8FA3C 802427EC 10400002 */ beqz $v0, .L802427F8 +/* D8FA40 802427F0 2402001E */ addiu $v0, $zero, 0x1e +/* D8FA44 802427F4 AE420070 */ sw $v0, 0x70($s2) +.L802427F8: +/* D8FA48 802427F8 8E430070 */ lw $v1, 0x70($s2) +/* D8FA4C 802427FC 2C620064 */ sltiu $v0, $v1, 0x64 +/* D8FA50 80242800 10400048 */ beqz $v0, .L80242924 +/* D8FA54 80242804 00031080 */ sll $v0, $v1, 2 +/* D8FA58 80242808 3C018024 */ lui $at, 0x8024 +/* D8FA5C 8024280C 00220821 */ addu $at, $at, $v0 +/* D8FA60 80242810 8C224318 */ lw $v0, 0x4318($at) +/* D8FA64 80242814 00400008 */ jr $v0 +/* D8FA68 80242818 00000000 */ nop +/* D8FA6C 8024281C 0240202D */ daddu $a0, $s2, $zero +/* D8FA70 80242820 0260282D */ daddu $a1, $s3, $zero +/* D8FA74 80242824 0C012568 */ jal func_800495A0 +/* D8FA78 80242828 0280302D */ daddu $a2, $s4, $zero +/* D8FA7C 8024282C 0240202D */ daddu $a0, $s2, $zero +/* D8FA80 80242830 0260282D */ daddu $a1, $s3, $zero +/* D8FA84 80242834 0C0125AE */ jal func_800496B8 +/* D8FA88 80242838 0280302D */ daddu $a2, $s4, $zero +/* D8FA8C 8024283C 08090A49 */ j .L80242924 +/* D8FA90 80242840 00000000 */ nop +/* D8FA94 80242844 0240202D */ daddu $a0, $s2, $zero +/* D8FA98 80242848 0260282D */ daddu $a1, $s3, $zero +/* D8FA9C 8024284C 0C0126D1 */ jal func_80049B44 +/* D8FAA0 80242850 0280302D */ daddu $a2, $s4, $zero +/* D8FAA4 80242854 0240202D */ daddu $a0, $s2, $zero +/* D8FAA8 80242858 0260282D */ daddu $a1, $s3, $zero +/* D8FAAC 8024285C 0C012701 */ jal func_80049C04 +/* D8FAB0 80242860 0280302D */ daddu $a2, $s4, $zero +/* D8FAB4 80242864 08090A49 */ j .L80242924 +/* D8FAB8 80242868 00000000 */ nop +/* D8FABC 8024286C 0240202D */ daddu $a0, $s2, $zero +/* D8FAC0 80242870 0260282D */ daddu $a1, $s3, $zero +/* D8FAC4 80242874 0C01278F */ jal func_80049E3C +/* D8FAC8 80242878 0280302D */ daddu $a2, $s4, $zero +/* D8FACC 8024287C 0240202D */ daddu $a0, $s2, $zero +/* D8FAD0 80242880 0260282D */ daddu $a1, $s3, $zero +/* D8FAD4 80242884 0C0127B3 */ jal func_80049ECC +/* D8FAD8 80242888 0280302D */ daddu $a2, $s4, $zero +/* D8FADC 8024288C 08090A49 */ j .L80242924 +/* D8FAE0 80242890 00000000 */ nop +/* D8FAE4 80242894 0240202D */ daddu $a0, $s2, $zero +/* D8FAE8 80242898 0260282D */ daddu $a1, $s3, $zero +/* D8FAEC 8024289C 0C0127DF */ jal func_80049F7C +/* D8FAF0 802428A0 0280302D */ daddu $a2, $s4, $zero +/* D8FAF4 802428A4 0240202D */ daddu $a0, $s2, $zero +/* D8FAF8 802428A8 0260282D */ daddu $a1, $s3, $zero +/* D8FAFC 802428AC 0C012849 */ jal func_8004A124 +/* D8FB00 802428B0 0280302D */ daddu $a2, $s4, $zero +/* D8FB04 802428B4 08090A49 */ j .L80242924 +/* D8FB08 802428B8 00000000 */ nop +/* D8FB0C 802428BC 0240202D */ daddu $a0, $s2, $zero +/* D8FB10 802428C0 0260282D */ daddu $a1, $s3, $zero +/* D8FB14 802428C4 0C0128FA */ jal func_8004A3E8 +/* D8FB18 802428C8 0280302D */ daddu $a2, $s4, $zero +/* D8FB1C 802428CC 08090A49 */ j .L80242924 +/* D8FB20 802428D0 00000000 */ nop +/* D8FB24 802428D4 0C09076C */ jal func_80241DB0_D8F000 +/* D8FB28 802428D8 0240202D */ daddu $a0, $s2, $zero +/* D8FB2C 802428DC 0C090787 */ jal func_80241E1C_D8F06C +/* D8FB30 802428E0 0240202D */ daddu $a0, $s2, $zero +/* D8FB34 802428E4 8E430070 */ lw $v1, 0x70($s2) +/* D8FB38 802428E8 24020020 */ addiu $v0, $zero, 0x20 +/* D8FB3C 802428EC 1462000D */ bne $v1, $v0, .L80242924 +/* D8FB40 802428F0 00000000 */ nop +/* D8FB44 802428F4 0C0907A3 */ jal func_80241E8C_D8F0DC +/* D8FB48 802428F8 0240202D */ daddu $a0, $s2, $zero +/* D8FB4C 802428FC 8E430070 */ lw $v1, 0x70($s2) +/* D8FB50 80242900 24020021 */ addiu $v0, $zero, 0x21 +/* D8FB54 80242904 14620007 */ bne $v1, $v0, .L80242924 +/* D8FB58 80242908 00000000 */ nop +/* D8FB5C 8024290C 0C0907D9 */ jal func_80241F64_D8F1B4 +/* D8FB60 80242910 0240202D */ daddu $a0, $s2, $zero +/* D8FB64 80242914 08090A49 */ j .L80242924 +/* D8FB68 80242918 00000000 */ nop +/* D8FB6C 8024291C 0C0129CF */ jal func_8004A73C +/* D8FB70 80242920 0240202D */ daddu $a0, $s2, $zero +.L80242924: +/* D8FB74 80242924 8FBF0048 */ lw $ra, 0x48($sp) +/* D8FB78 80242928 8FB50044 */ lw $s5, 0x44($sp) +/* D8FB7C 8024292C 8FB40040 */ lw $s4, 0x40($sp) +/* D8FB80 80242930 8FB3003C */ lw $s3, 0x3c($sp) +/* D8FB84 80242934 8FB20038 */ lw $s2, 0x38($sp) +/* D8FB88 80242938 8FB10034 */ lw $s1, 0x34($sp) +/* D8FB8C 8024293C 8FB00030 */ lw $s0, 0x30($sp) +/* D8FB90 80242940 0000102D */ daddu $v0, $zero, $zero +/* D8FB94 80242944 03E00008 */ jr $ra +/* D8FB98 80242948 27BD0050 */ addiu $sp, $sp, 0x50 +/* D8FB9C 8024294C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950.s deleted file mode 100644 index 9a3e0c9f03..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242950 -/* D8FBA0 80242950 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8FBA4 80242954 AFB00010 */ sw $s0, 0x10($sp) -/* D8FBA8 80242958 3C108024 */ lui $s0, 0x8024 -/* D8FBAC 8024295C 26103DE0 */ addiu $s0, $s0, 0x3de0 -/* D8FBB0 80242960 AFBF0018 */ sw $ra, 0x18($sp) -/* D8FBB4 80242964 AFB10014 */ sw $s1, 0x14($sp) -/* D8FBB8 80242968 8E020000 */ lw $v0, ($s0) -/* D8FBBC 8024296C 14400010 */ bnez $v0, .L802429B0 -/* D8FBC0 80242970 0080882D */ daddu $s1, $a0, $zero -/* D8FBC4 80242974 0C00AB39 */ jal heap_malloc -/* D8FBC8 80242978 24040040 */ addiu $a0, $zero, 0x40 -/* D8FBCC 8024297C AE020000 */ sw $v0, ($s0) -/* D8FBD0 80242980 0000182D */ daddu $v1, $zero, $zero -/* D8FBD4 80242984 0040282D */ daddu $a1, $v0, $zero -/* D8FBD8 80242988 0220202D */ daddu $a0, $s1, $zero -.L8024298C: -/* D8FBDC 8024298C 8C820084 */ lw $v0, 0x84($a0) -/* D8FBE0 80242990 24840004 */ addiu $a0, $a0, 4 -/* D8FBE4 80242994 24630001 */ addiu $v1, $v1, 1 -/* D8FBE8 80242998 ACA20000 */ sw $v0, ($a1) -/* D8FBEC 8024299C 28620010 */ slti $v0, $v1, 0x10 -/* D8FBF0 802429A0 1440FFFA */ bnez $v0, .L8024298C -/* D8FBF4 802429A4 24A50004 */ addiu $a1, $a1, 4 -/* D8FBF8 802429A8 08090A7B */ j .L802429EC -/* D8FBFC 802429AC 00000000 */ nop -.L802429B0: -/* D8FC00 802429B0 0000182D */ daddu $v1, $zero, $zero -/* D8FC04 802429B4 0040282D */ daddu $a1, $v0, $zero -/* D8FC08 802429B8 0220202D */ daddu $a0, $s1, $zero -.L802429BC: -/* D8FC0C 802429BC 8CA20000 */ lw $v0, ($a1) -/* D8FC10 802429C0 24A50004 */ addiu $a1, $a1, 4 -/* D8FC14 802429C4 24630001 */ addiu $v1, $v1, 1 -/* D8FC18 802429C8 AC820084 */ sw $v0, 0x84($a0) -/* D8FC1C 802429CC 28620010 */ slti $v0, $v1, 0x10 -/* D8FC20 802429D0 1440FFFA */ bnez $v0, .L802429BC -/* D8FC24 802429D4 24840004 */ addiu $a0, $a0, 4 -/* D8FC28 802429D8 3C108024 */ lui $s0, 0x8024 -/* D8FC2C 802429DC 26103DE0 */ addiu $s0, $s0, 0x3de0 -/* D8FC30 802429E0 0C00AB4B */ jal heap_free -/* D8FC34 802429E4 8E040000 */ lw $a0, ($s0) -/* D8FC38 802429E8 AE000000 */ sw $zero, ($s0) -.L802429EC: -/* D8FC3C 802429EC 8FBF0018 */ lw $ra, 0x18($sp) -/* D8FC40 802429F0 8FB10014 */ lw $s1, 0x14($sp) -/* D8FC44 802429F4 8FB00010 */ lw $s0, 0x10($sp) -/* D8FC48 802429F8 24020002 */ addiu $v0, $zero, 2 -/* D8FC4C 802429FC 03E00008 */ jr $ra -/* D8FC50 80242A00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s new file mode 100644 index 0000000000..4660cc589a --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242950_D8FBA0.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242950_D8FBA0 +/* D8FBA0 80242950 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D8FBA4 80242954 AFB00010 */ sw $s0, 0x10($sp) +/* D8FBA8 80242958 3C108024 */ lui $s0, 0x8024 +/* D8FBAC 8024295C 26103DE0 */ addiu $s0, $s0, 0x3de0 +/* D8FBB0 80242960 AFBF0018 */ sw $ra, 0x18($sp) +/* D8FBB4 80242964 AFB10014 */ sw $s1, 0x14($sp) +/* D8FBB8 80242968 8E020000 */ lw $v0, ($s0) +/* D8FBBC 8024296C 14400010 */ bnez $v0, .L802429B0 +/* D8FBC0 80242970 0080882D */ daddu $s1, $a0, $zero +/* D8FBC4 80242974 0C00AB39 */ jal heap_malloc +/* D8FBC8 80242978 24040040 */ addiu $a0, $zero, 0x40 +/* D8FBCC 8024297C AE020000 */ sw $v0, ($s0) +/* D8FBD0 80242980 0000182D */ daddu $v1, $zero, $zero +/* D8FBD4 80242984 0040282D */ daddu $a1, $v0, $zero +/* D8FBD8 80242988 0220202D */ daddu $a0, $s1, $zero +.L8024298C: +/* D8FBDC 8024298C 8C820084 */ lw $v0, 0x84($a0) +/* D8FBE0 80242990 24840004 */ addiu $a0, $a0, 4 +/* D8FBE4 80242994 24630001 */ addiu $v1, $v1, 1 +/* D8FBE8 80242998 ACA20000 */ sw $v0, ($a1) +/* D8FBEC 8024299C 28620010 */ slti $v0, $v1, 0x10 +/* D8FBF0 802429A0 1440FFFA */ bnez $v0, .L8024298C +/* D8FBF4 802429A4 24A50004 */ addiu $a1, $a1, 4 +/* D8FBF8 802429A8 08090A7B */ j .L802429EC +/* D8FBFC 802429AC 00000000 */ nop +.L802429B0: +/* D8FC00 802429B0 0000182D */ daddu $v1, $zero, $zero +/* D8FC04 802429B4 0040282D */ daddu $a1, $v0, $zero +/* D8FC08 802429B8 0220202D */ daddu $a0, $s1, $zero +.L802429BC: +/* D8FC0C 802429BC 8CA20000 */ lw $v0, ($a1) +/* D8FC10 802429C0 24A50004 */ addiu $a1, $a1, 4 +/* D8FC14 802429C4 24630001 */ addiu $v1, $v1, 1 +/* D8FC18 802429C8 AC820084 */ sw $v0, 0x84($a0) +/* D8FC1C 802429CC 28620010 */ slti $v0, $v1, 0x10 +/* D8FC20 802429D0 1440FFFA */ bnez $v0, .L802429BC +/* D8FC24 802429D4 24840004 */ addiu $a0, $a0, 4 +/* D8FC28 802429D8 3C108024 */ lui $s0, 0x8024 +/* D8FC2C 802429DC 26103DE0 */ addiu $s0, $s0, 0x3de0 +/* D8FC30 802429E0 0C00AB4B */ jal heap_free +/* D8FC34 802429E4 8E040000 */ lw $a0, ($s0) +/* D8FC38 802429E8 AE000000 */ sw $zero, ($s0) +.L802429EC: +/* D8FC3C 802429EC 8FBF0018 */ lw $ra, 0x18($sp) +/* D8FC40 802429F0 8FB10014 */ lw $s1, 0x14($sp) +/* D8FC44 802429F4 8FB00010 */ lw $s0, 0x10($sp) +/* D8FC48 802429F8 24020002 */ addiu $v0, $zero, 2 +/* D8FC4C 802429FC 03E00008 */ jr $ra +/* D8FC50 80242A00 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68.s deleted file mode 100644 index b8ef3259cd..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A68 -/* D8FCB8 80242A68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D8FCBC 80242A6C AFB10014 */ sw $s1, 0x14($sp) -/* D8FCC0 80242A70 0080882D */ daddu $s1, $a0, $zero -/* D8FCC4 80242A74 AFBF001C */ sw $ra, 0x1c($sp) -/* D8FCC8 80242A78 AFB20018 */ sw $s2, 0x18($sp) -/* D8FCCC 80242A7C AFB00010 */ sw $s0, 0x10($sp) -/* D8FCD0 80242A80 8E240084 */ lw $a0, 0x84($s1) -/* D8FCD4 80242A84 0C04C3D6 */ jal get_item_entity -/* D8FCD8 80242A88 00A0802D */ daddu $s0, $a1, $zero -/* D8FCDC 80242A8C 12000005 */ beqz $s0, .L80242AA4 -/* D8FCE0 80242A90 0040902D */ daddu $s2, $v0, $zero -/* D8FCE4 80242A94 C640000C */ lwc1 $f0, 0xc($s2) -/* D8FCE8 80242A98 AE200074 */ sw $zero, 0x74($s1) -/* D8FCEC 80242A9C AE20007C */ sw $zero, 0x7c($s1) -/* D8FCF0 80242AA0 E6200078 */ swc1 $f0, 0x78($s1) -.L80242AA4: -/* D8FCF4 80242AA4 8E230074 */ lw $v1, 0x74($s1) -/* D8FCF8 80242AA8 10600005 */ beqz $v1, .L80242AC0 -/* D8FCFC 80242AAC 24020001 */ addiu $v0, $zero, 1 -/* D8FD00 80242AB0 10620024 */ beq $v1, $v0, .L80242B44 -/* D8FD04 80242AB4 00000000 */ nop -/* D8FD08 80242AB8 08090AE7 */ j .L80242B9C -/* D8FD0C 80242ABC 00000000 */ nop -.L80242AC0: -/* D8FD10 80242AC0 3C013FC9 */ lui $at, 0x3fc9 -/* D8FD14 80242AC4 34210FD8 */ ori $at, $at, 0xfd8 -/* D8FD18 80242AC8 44810000 */ mtc1 $at, $f0 -/* D8FD1C 80242ACC C62C007C */ lwc1 $f12, 0x7c($s1) -/* D8FD20 80242AD0 46806320 */ cvt.s.w $f12, $f12 -/* D8FD24 80242AD4 46006302 */ mul.s $f12, $f12, $f0 -/* D8FD28 80242AD8 00000000 */ nop -/* D8FD2C 80242ADC 3C0141F0 */ lui $at, 0x41f0 -/* D8FD30 80242AE0 44810000 */ mtc1 $at, $f0 -/* D8FD34 80242AE4 0C00A874 */ jal cos_rad -/* D8FD38 80242AE8 46006303 */ div.s $f12, $f12, $f0 -/* D8FD3C 80242AEC 3C013F80 */ lui $at, 0x3f80 -/* D8FD40 80242AF0 44811000 */ mtc1 $at, $f2 -/* D8FD44 80242AF4 00000000 */ nop -/* D8FD48 80242AF8 46001081 */ sub.s $f2, $f2, $f0 -/* D8FD4C 80242AFC 3C0141A0 */ lui $at, 0x41a0 -/* D8FD50 80242B00 44810000 */ mtc1 $at, $f0 -/* D8FD54 80242B04 00000000 */ nop -/* D8FD58 80242B08 46001082 */ mul.s $f2, $f2, $f0 -/* D8FD5C 80242B0C 00000000 */ nop -/* D8FD60 80242B10 C6200078 */ lwc1 $f0, 0x78($s1) -/* D8FD64 80242B14 46020000 */ add.s $f0, $f0, $f2 -/* D8FD68 80242B18 E640000C */ swc1 $f0, 0xc($s2) -/* D8FD6C 80242B1C 8E23007C */ lw $v1, 0x7c($s1) -/* D8FD70 80242B20 2402001E */ addiu $v0, $zero, 0x1e -/* D8FD74 80242B24 14620005 */ bne $v1, $v0, .L80242B3C -/* D8FD78 80242B28 24620001 */ addiu $v0, $v1, 1 -/* D8FD7C 80242B2C 24020001 */ addiu $v0, $zero, 1 -/* D8FD80 80242B30 AE220074 */ sw $v0, 0x74($s1) -/* D8FD84 80242B34 08090AE7 */ j .L80242B9C -/* D8FD88 80242B38 AE20007C */ sw $zero, 0x7c($s1) -.L80242B3C: -/* D8FD8C 80242B3C 08090AE7 */ j .L80242B9C -/* D8FD90 80242B40 AE22007C */ sw $v0, 0x7c($s1) -.L80242B44: -/* D8FD94 80242B44 C62C007C */ lwc1 $f12, 0x7c($s1) -/* D8FD98 80242B48 0C00A8D4 */ jal cos_deg -/* D8FD9C 80242B4C 46806320 */ cvt.s.w $f12, $f12 -/* D8FDA0 80242B50 3C014040 */ lui $at, 0x4040 -/* D8FDA4 80242B54 44811000 */ mtc1 $at, $f2 -/* D8FDA8 80242B58 00000000 */ nop -/* D8FDAC 80242B5C 46020002 */ mul.s $f0, $f0, $f2 -/* D8FDB0 80242B60 00000000 */ nop -/* D8FDB4 80242B64 3C014188 */ lui $at, 0x4188 -/* D8FDB8 80242B68 44812000 */ mtc1 $at, $f4 -/* D8FDBC 80242B6C C6220078 */ lwc1 $f2, 0x78($s1) -/* D8FDC0 80242B70 46041080 */ add.s $f2, $f2, $f4 -/* D8FDC4 80242B74 46001080 */ add.s $f2, $f2, $f0 -/* D8FDC8 80242B78 E642000C */ swc1 $f2, 0xc($s2) -/* D8FDCC 80242B7C 8E22007C */ lw $v0, 0x7c($s1) -/* D8FDD0 80242B80 24420009 */ addiu $v0, $v0, 9 -/* D8FDD4 80242B84 44826000 */ mtc1 $v0, $f12 -/* D8FDD8 80242B88 00000000 */ nop -/* D8FDDC 80242B8C 0C00A6C9 */ jal clamp_angle -/* D8FDE0 80242B90 46806320 */ cvt.s.w $f12, $f12 -/* D8FDE4 80242B94 4600018D */ trunc.w.s $f6, $f0 -/* D8FDE8 80242B98 E626007C */ swc1 $f6, 0x7c($s1) -.L80242B9C: -/* D8FDEC 80242B9C 8FBF001C */ lw $ra, 0x1c($sp) -/* D8FDF0 80242BA0 8FB20018 */ lw $s2, 0x18($sp) -/* D8FDF4 80242BA4 8FB10014 */ lw $s1, 0x14($sp) -/* D8FDF8 80242BA8 8FB00010 */ lw $s0, 0x10($sp) -/* D8FDFC 80242BAC 0000102D */ daddu $v0, $zero, $zero -/* D8FE00 80242BB0 03E00008 */ jr $ra -/* D8FE04 80242BB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s new file mode 100644 index 0000000000..36788f7f01 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242A68_D8FCB8.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A68_D8FCB8 +/* D8FCB8 80242A68 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D8FCBC 80242A6C AFB10014 */ sw $s1, 0x14($sp) +/* D8FCC0 80242A70 0080882D */ daddu $s1, $a0, $zero +/* D8FCC4 80242A74 AFBF001C */ sw $ra, 0x1c($sp) +/* D8FCC8 80242A78 AFB20018 */ sw $s2, 0x18($sp) +/* D8FCCC 80242A7C AFB00010 */ sw $s0, 0x10($sp) +/* D8FCD0 80242A80 8E240084 */ lw $a0, 0x84($s1) +/* D8FCD4 80242A84 0C04C3D6 */ jal get_item_entity +/* D8FCD8 80242A88 00A0802D */ daddu $s0, $a1, $zero +/* D8FCDC 80242A8C 12000005 */ beqz $s0, .L80242AA4 +/* D8FCE0 80242A90 0040902D */ daddu $s2, $v0, $zero +/* D8FCE4 80242A94 C640000C */ lwc1 $f0, 0xc($s2) +/* D8FCE8 80242A98 AE200074 */ sw $zero, 0x74($s1) +/* D8FCEC 80242A9C AE20007C */ sw $zero, 0x7c($s1) +/* D8FCF0 80242AA0 E6200078 */ swc1 $f0, 0x78($s1) +.L80242AA4: +/* D8FCF4 80242AA4 8E230074 */ lw $v1, 0x74($s1) +/* D8FCF8 80242AA8 10600005 */ beqz $v1, .L80242AC0 +/* D8FCFC 80242AAC 24020001 */ addiu $v0, $zero, 1 +/* D8FD00 80242AB0 10620024 */ beq $v1, $v0, .L80242B44 +/* D8FD04 80242AB4 00000000 */ nop +/* D8FD08 80242AB8 08090AE7 */ j .L80242B9C +/* D8FD0C 80242ABC 00000000 */ nop +.L80242AC0: +/* D8FD10 80242AC0 3C013FC9 */ lui $at, 0x3fc9 +/* D8FD14 80242AC4 34210FD8 */ ori $at, $at, 0xfd8 +/* D8FD18 80242AC8 44810000 */ mtc1 $at, $f0 +/* D8FD1C 80242ACC C62C007C */ lwc1 $f12, 0x7c($s1) +/* D8FD20 80242AD0 46806320 */ cvt.s.w $f12, $f12 +/* D8FD24 80242AD4 46006302 */ mul.s $f12, $f12, $f0 +/* D8FD28 80242AD8 00000000 */ nop +/* D8FD2C 80242ADC 3C0141F0 */ lui $at, 0x41f0 +/* D8FD30 80242AE0 44810000 */ mtc1 $at, $f0 +/* D8FD34 80242AE4 0C00A874 */ jal cos_rad +/* D8FD38 80242AE8 46006303 */ div.s $f12, $f12, $f0 +/* D8FD3C 80242AEC 3C013F80 */ lui $at, 0x3f80 +/* D8FD40 80242AF0 44811000 */ mtc1 $at, $f2 +/* D8FD44 80242AF4 00000000 */ nop +/* D8FD48 80242AF8 46001081 */ sub.s $f2, $f2, $f0 +/* D8FD4C 80242AFC 3C0141A0 */ lui $at, 0x41a0 +/* D8FD50 80242B00 44810000 */ mtc1 $at, $f0 +/* D8FD54 80242B04 00000000 */ nop +/* D8FD58 80242B08 46001082 */ mul.s $f2, $f2, $f0 +/* D8FD5C 80242B0C 00000000 */ nop +/* D8FD60 80242B10 C6200078 */ lwc1 $f0, 0x78($s1) +/* D8FD64 80242B14 46020000 */ add.s $f0, $f0, $f2 +/* D8FD68 80242B18 E640000C */ swc1 $f0, 0xc($s2) +/* D8FD6C 80242B1C 8E23007C */ lw $v1, 0x7c($s1) +/* D8FD70 80242B20 2402001E */ addiu $v0, $zero, 0x1e +/* D8FD74 80242B24 14620005 */ bne $v1, $v0, .L80242B3C +/* D8FD78 80242B28 24620001 */ addiu $v0, $v1, 1 +/* D8FD7C 80242B2C 24020001 */ addiu $v0, $zero, 1 +/* D8FD80 80242B30 AE220074 */ sw $v0, 0x74($s1) +/* D8FD84 80242B34 08090AE7 */ j .L80242B9C +/* D8FD88 80242B38 AE20007C */ sw $zero, 0x7c($s1) +.L80242B3C: +/* D8FD8C 80242B3C 08090AE7 */ j .L80242B9C +/* D8FD90 80242B40 AE22007C */ sw $v0, 0x7c($s1) +.L80242B44: +/* D8FD94 80242B44 C62C007C */ lwc1 $f12, 0x7c($s1) +/* D8FD98 80242B48 0C00A8D4 */ jal cos_deg +/* D8FD9C 80242B4C 46806320 */ cvt.s.w $f12, $f12 +/* D8FDA0 80242B50 3C014040 */ lui $at, 0x4040 +/* D8FDA4 80242B54 44811000 */ mtc1 $at, $f2 +/* D8FDA8 80242B58 00000000 */ nop +/* D8FDAC 80242B5C 46020002 */ mul.s $f0, $f0, $f2 +/* D8FDB0 80242B60 00000000 */ nop +/* D8FDB4 80242B64 3C014188 */ lui $at, 0x4188 +/* D8FDB8 80242B68 44812000 */ mtc1 $at, $f4 +/* D8FDBC 80242B6C C6220078 */ lwc1 $f2, 0x78($s1) +/* D8FDC0 80242B70 46041080 */ add.s $f2, $f2, $f4 +/* D8FDC4 80242B74 46001080 */ add.s $f2, $f2, $f0 +/* D8FDC8 80242B78 E642000C */ swc1 $f2, 0xc($s2) +/* D8FDCC 80242B7C 8E22007C */ lw $v0, 0x7c($s1) +/* D8FDD0 80242B80 24420009 */ addiu $v0, $v0, 9 +/* D8FDD4 80242B84 44826000 */ mtc1 $v0, $f12 +/* D8FDD8 80242B88 00000000 */ nop +/* D8FDDC 80242B8C 0C00A6C9 */ jal clamp_angle +/* D8FDE0 80242B90 46806320 */ cvt.s.w $f12, $f12 +/* D8FDE4 80242B94 4600018D */ trunc.w.s $f6, $f0 +/* D8FDE8 80242B98 E626007C */ swc1 $f6, 0x7c($s1) +.L80242B9C: +/* D8FDEC 80242B9C 8FBF001C */ lw $ra, 0x1c($sp) +/* D8FDF0 80242BA0 8FB20018 */ lw $s2, 0x18($sp) +/* D8FDF4 80242BA4 8FB10014 */ lw $s1, 0x14($sp) +/* D8FDF8 80242BA8 8FB00010 */ lw $s0, 0x10($sp) +/* D8FDFC 80242BAC 0000102D */ daddu $v0, $zero, $zero +/* D8FE00 80242BB0 03E00008 */ jr $ra +/* D8FE04 80242BB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8.s deleted file mode 100644 index 833f80fb12..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242BB8 -/* D8FE08 80242BB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D8FE0C 80242BBC AFB00010 */ sw $s0, 0x10($sp) -/* D8FE10 80242BC0 0080802D */ daddu $s0, $a0, $zero -/* D8FE14 80242BC4 AFBF0014 */ sw $ra, 0x14($sp) -/* D8FE18 80242BC8 8E02000C */ lw $v0, 0xc($s0) -/* D8FE1C 80242BCC 0C0B1EAF */ jal get_variable -/* D8FE20 80242BD0 8C450000 */ lw $a1, ($v0) -/* D8FE24 80242BD4 00021140 */ sll $v0, $v0, 5 -/* D8FE28 80242BD8 AE000084 */ sw $zero, 0x84($s0) -/* D8FE2C 80242BDC 3C018008 */ lui $at, 0x8008 -/* D8FE30 80242BE0 00220821 */ addu $at, $at, $v0 -/* D8FE34 80242BE4 942278F8 */ lhu $v0, 0x78f8($at) -/* D8FE38 80242BE8 30420040 */ andi $v0, $v0, 0x40 -/* D8FE3C 80242BEC 10400002 */ beqz $v0, .L80242BF8 -/* D8FE40 80242BF0 24020001 */ addiu $v0, $zero, 1 -/* D8FE44 80242BF4 AE020084 */ sw $v0, 0x84($s0) -.L80242BF8: -/* D8FE48 80242BF8 8FBF0014 */ lw $ra, 0x14($sp) -/* D8FE4C 80242BFC 8FB00010 */ lw $s0, 0x10($sp) -/* D8FE50 80242C00 24020002 */ addiu $v0, $zero, 2 -/* D8FE54 80242C04 03E00008 */ jr $ra -/* D8FE58 80242C08 27BD0018 */ addiu $sp, $sp, 0x18 -/* D8FE5C 80242C0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s new file mode 100644 index 0000000000..15efa22f53 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_35/D8FBA0/func_80242BB8_D8FE08.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242BB8_D8FE08 +/* D8FE08 80242BB8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D8FE0C 80242BBC AFB00010 */ sw $s0, 0x10($sp) +/* D8FE10 80242BC0 0080802D */ daddu $s0, $a0, $zero +/* D8FE14 80242BC4 AFBF0014 */ sw $ra, 0x14($sp) +/* D8FE18 80242BC8 8E02000C */ lw $v0, 0xc($s0) +/* D8FE1C 80242BCC 0C0B1EAF */ jal get_variable +/* D8FE20 80242BD0 8C450000 */ lw $a1, ($v0) +/* D8FE24 80242BD4 00021140 */ sll $v0, $v0, 5 +/* D8FE28 80242BD8 AE000084 */ sw $zero, 0x84($s0) +/* D8FE2C 80242BDC 3C018008 */ lui $at, 0x8008 +/* D8FE30 80242BE0 00220821 */ addu $at, $at, $v0 +/* D8FE34 80242BE4 942278F8 */ lhu $v0, 0x78f8($at) +/* D8FE38 80242BE8 30420040 */ andi $v0, $v0, 0x40 +/* D8FE3C 80242BEC 10400002 */ beqz $v0, .L80242BF8 +/* D8FE40 80242BF0 24020001 */ addiu $v0, $zero, 1 +/* D8FE44 80242BF4 AE020084 */ sw $v0, 0x84($s0) +.L80242BF8: +/* D8FE48 80242BF8 8FBF0014 */ lw $ra, 0x14($sp) +/* D8FE4C 80242BFC 8FB00010 */ lw $s0, 0x10($sp) +/* D8FE50 80242C00 24020002 */ addiu $v0, $zero, 2 +/* D8FE54 80242C04 03E00008 */ jr $ra +/* D8FE58 80242C08 27BD0018 */ addiu $sp, $sp, 0x18 +/* D8FE5C 80242C0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s index 447005e38f..0ba2641c7f 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s @@ -37,7 +37,7 @@ glabel func_80240158_D91858 /* D918D8 802401D8 0C00B94E */ jal get_screen_coords /* D918DC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D918E0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D918E4 802401E4 0C090014 */ jal func_80240050 +/* D918E4 802401E4 0C090014 */ jal func_80240050_D91750 /* D918E8 802401E8 00000000 */ nop /* D918EC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D918F0 802401F0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240158_D91858 /* D9191C 8024021C 00000000 */ nop /* D91920 80240220 45000004 */ bc1f .L80240234 /* D91924 80240224 00000000 */ nop -/* D91928 80240228 0C090021 */ jal func_80240084 +/* D91928 80240228 0C090021 */ jal func_80240084_D91784 /* D9192C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D91930 80240230 24040002 */ addiu $a0, $zero, 2 .L80240234: diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s index da446aa502..cded2ee6bf 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s @@ -37,7 +37,7 @@ glabel func_80240158_D93098 /* D93118 802401D8 0C00B94E */ jal get_screen_coords /* D9311C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D93120 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D93124 802401E4 0C090014 */ jal func_80240050 +/* D93124 802401E4 0C090014 */ jal func_80240050_D92F90 /* D93128 802401E8 00000000 */ nop /* D9312C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D93130 802401F0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240158_D93098 /* D9315C 8024021C 00000000 */ nop /* D93160 80240220 45000004 */ bc1f .L80240234 /* D93164 80240224 00000000 */ nop -/* D93168 80240228 0C090021 */ jal func_80240084 +/* D93168 80240228 0C090021 */ jal func_80240084_D92FC4 /* D9316C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D93170 80240230 24040002 */ addiu $a0, $zero, 2 .L80240234: diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC.s deleted file mode 100644 index b5e55343fc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FBC -/* D93EFC 80240FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D93F00 80240FC0 AFB10014 */ sw $s1, 0x14($sp) -/* D93F04 80240FC4 0080882D */ daddu $s1, $a0, $zero -/* D93F08 80240FC8 AFBF0018 */ sw $ra, 0x18($sp) -/* D93F0C 80240FCC AFB00010 */ sw $s0, 0x10($sp) -/* D93F10 80240FD0 8E300148 */ lw $s0, 0x148($s1) -/* D93F14 80240FD4 0C00EABB */ jal get_npc_unsafe -/* D93F18 80240FD8 86040008 */ lh $a0, 8($s0) -/* D93F1C 80240FDC 0040202D */ daddu $a0, $v0, $zero -/* D93F20 80240FE0 9482008E */ lhu $v0, 0x8e($a0) -/* D93F24 80240FE4 2442FFFF */ addiu $v0, $v0, -1 -/* D93F28 80240FE8 A482008E */ sh $v0, 0x8e($a0) -/* D93F2C 80240FEC 00021400 */ sll $v0, $v0, 0x10 -/* D93F30 80240FF0 1C400009 */ bgtz $v0, .L80241018 -/* D93F34 80240FF4 24020003 */ addiu $v0, $zero, 3 -/* D93F38 80240FF8 96030076 */ lhu $v1, 0x76($s0) -/* D93F3C 80240FFC AE02006C */ sw $v0, 0x6c($s0) -/* D93F40 80241000 A483008E */ sh $v1, 0x8e($a0) -/* D93F44 80241004 8E0200CC */ lw $v0, 0xcc($s0) -/* D93F48 80241008 8C420024 */ lw $v0, 0x24($v0) -/* D93F4C 8024100C AC820028 */ sw $v0, 0x28($a0) -/* D93F50 80241010 24020020 */ addiu $v0, $zero, 0x20 -/* D93F54 80241014 AE220070 */ sw $v0, 0x70($s1) -.L80241018: -/* D93F58 80241018 8FBF0018 */ lw $ra, 0x18($sp) -/* D93F5C 8024101C 8FB10014 */ lw $s1, 0x14($sp) -/* D93F60 80241020 8FB00010 */ lw $s0, 0x10($sp) -/* D93F64 80241024 03E00008 */ jr $ra -/* D93F68 80241028 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s new file mode 100644 index 0000000000..6e196424e2 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240FBC_D93EFC.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FBC_D93EFC +/* D93EFC 80240FBC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D93F00 80240FC0 AFB10014 */ sw $s1, 0x14($sp) +/* D93F04 80240FC4 0080882D */ daddu $s1, $a0, $zero +/* D93F08 80240FC8 AFBF0018 */ sw $ra, 0x18($sp) +/* D93F0C 80240FCC AFB00010 */ sw $s0, 0x10($sp) +/* D93F10 80240FD0 8E300148 */ lw $s0, 0x148($s1) +/* D93F14 80240FD4 0C00EABB */ jal get_npc_unsafe +/* D93F18 80240FD8 86040008 */ lh $a0, 8($s0) +/* D93F1C 80240FDC 0040202D */ daddu $a0, $v0, $zero +/* D93F20 80240FE0 9482008E */ lhu $v0, 0x8e($a0) +/* D93F24 80240FE4 2442FFFF */ addiu $v0, $v0, -1 +/* D93F28 80240FE8 A482008E */ sh $v0, 0x8e($a0) +/* D93F2C 80240FEC 00021400 */ sll $v0, $v0, 0x10 +/* D93F30 80240FF0 1C400009 */ bgtz $v0, .L80241018 +/* D93F34 80240FF4 24020003 */ addiu $v0, $zero, 3 +/* D93F38 80240FF8 96030076 */ lhu $v1, 0x76($s0) +/* D93F3C 80240FFC AE02006C */ sw $v0, 0x6c($s0) +/* D93F40 80241000 A483008E */ sh $v1, 0x8e($a0) +/* D93F44 80241004 8E0200CC */ lw $v0, 0xcc($s0) +/* D93F48 80241008 8C420024 */ lw $v0, 0x24($v0) +/* D93F4C 8024100C AC820028 */ sw $v0, 0x28($a0) +/* D93F50 80241010 24020020 */ addiu $v0, $zero, 0x20 +/* D93F54 80241014 AE220070 */ sw $v0, 0x70($s1) +.L80241018: +/* D93F58 80241018 8FBF0018 */ lw $ra, 0x18($sp) +/* D93F5C 8024101C 8FB10014 */ lw $s1, 0x14($sp) +/* D93F60 80241020 8FB00010 */ lw $s0, 0x10($sp) +/* D93F64 80241024 03E00008 */ jr $ra +/* D93F68 80241028 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C.s deleted file mode 100644 index 841e15b168..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024102C -/* D93F6C 8024102C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D93F70 80241030 AFB10034 */ sw $s1, 0x34($sp) -/* D93F74 80241034 0080882D */ daddu $s1, $a0, $zero -/* D93F78 80241038 AFBF0038 */ sw $ra, 0x38($sp) -/* D93F7C 8024103C AFB00030 */ sw $s0, 0x30($sp) -/* D93F80 80241040 8E300148 */ lw $s0, 0x148($s1) -/* D93F84 80241044 0C00EABB */ jal get_npc_unsafe -/* D93F88 80241048 86040008 */ lh $a0, 8($s0) -/* D93F8C 8024104C 0040282D */ daddu $a1, $v0, $zero -/* D93F90 80241050 94A2008E */ lhu $v0, 0x8e($a1) -/* D93F94 80241054 2442FFFF */ addiu $v0, $v0, -1 -/* D93F98 80241058 A4A2008E */ sh $v0, 0x8e($a1) -/* D93F9C 8024105C 00021400 */ sll $v0, $v0, 0x10 -/* D93FA0 80241060 1C400023 */ bgtz $v0, .L802410F0 -/* D93FA4 80241064 24020004 */ addiu $v0, $zero, 4 -/* D93FA8 80241068 8E0300CC */ lw $v1, 0xcc($s0) -/* D93FAC 8024106C AE02006C */ sw $v0, 0x6c($s0) -/* D93FB0 80241070 8C620000 */ lw $v0, ($v1) -/* D93FB4 80241074 ACA20028 */ sw $v0, 0x28($a1) -/* D93FB8 80241078 9602007A */ lhu $v0, 0x7a($s0) -/* D93FBC 8024107C A4A2008E */ sh $v0, 0x8e($a1) -/* D93FC0 80241080 8E020078 */ lw $v0, 0x78($s0) -/* D93FC4 80241084 28420008 */ slti $v0, $v0, 8 -/* D93FC8 80241088 14400018 */ bnez $v0, .L802410EC -/* D93FCC 8024108C 24020021 */ addiu $v0, $zero, 0x21 -/* D93FD0 80241090 24040003 */ addiu $a0, $zero, 3 -/* D93FD4 80241094 27A30028 */ addiu $v1, $sp, 0x28 -/* D93FD8 80241098 84A700A8 */ lh $a3, 0xa8($a1) -/* D93FDC 8024109C 3C013F80 */ lui $at, 0x3f80 -/* D93FE0 802410A0 44810000 */ mtc1 $at, $f0 -/* D93FE4 802410A4 3C014000 */ lui $at, 0x4000 -/* D93FE8 802410A8 44811000 */ mtc1 $at, $f2 -/* D93FEC 802410AC 3C01C1A0 */ lui $at, 0xc1a0 -/* D93FF0 802410B0 44812000 */ mtc1 $at, $f4 -/* D93FF4 802410B4 44873000 */ mtc1 $a3, $f6 -/* D93FF8 802410B8 00000000 */ nop -/* D93FFC 802410BC 468031A0 */ cvt.s.w $f6, $f6 -/* D94000 802410C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D94004 802410C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D94008 802410C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D9400C 802410CC 8E020078 */ lw $v0, 0x78($s0) -/* D94010 802410D0 44073000 */ mfc1 $a3, $f6 -/* D94014 802410D4 0000302D */ daddu $a2, $zero, $zero -/* D94018 802410D8 AFA30020 */ sw $v1, 0x20($sp) -/* D9401C 802410DC 2442FFFF */ addiu $v0, $v0, -1 -/* D94020 802410E0 0C01BFA4 */ jal fx_emote -/* D94024 802410E4 AFA2001C */ sw $v0, 0x1c($sp) -/* D94028 802410E8 24020021 */ addiu $v0, $zero, 0x21 -.L802410EC: -/* D9402C 802410EC AE220070 */ sw $v0, 0x70($s1) -.L802410F0: -/* D94030 802410F0 8FBF0038 */ lw $ra, 0x38($sp) -/* D94034 802410F4 8FB10034 */ lw $s1, 0x34($sp) -/* D94038 802410F8 8FB00030 */ lw $s0, 0x30($sp) -/* D9403C 802410FC 03E00008 */ jr $ra -/* D94040 80241100 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s new file mode 100644 index 0000000000..6c0a9f40ec --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024102C_D93F6C.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024102C_D93F6C +/* D93F6C 8024102C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* D93F70 80241030 AFB10034 */ sw $s1, 0x34($sp) +/* D93F74 80241034 0080882D */ daddu $s1, $a0, $zero +/* D93F78 80241038 AFBF0038 */ sw $ra, 0x38($sp) +/* D93F7C 8024103C AFB00030 */ sw $s0, 0x30($sp) +/* D93F80 80241040 8E300148 */ lw $s0, 0x148($s1) +/* D93F84 80241044 0C00EABB */ jal get_npc_unsafe +/* D93F88 80241048 86040008 */ lh $a0, 8($s0) +/* D93F8C 8024104C 0040282D */ daddu $a1, $v0, $zero +/* D93F90 80241050 94A2008E */ lhu $v0, 0x8e($a1) +/* D93F94 80241054 2442FFFF */ addiu $v0, $v0, -1 +/* D93F98 80241058 A4A2008E */ sh $v0, 0x8e($a1) +/* D93F9C 8024105C 00021400 */ sll $v0, $v0, 0x10 +/* D93FA0 80241060 1C400023 */ bgtz $v0, .L802410F0 +/* D93FA4 80241064 24020004 */ addiu $v0, $zero, 4 +/* D93FA8 80241068 8E0300CC */ lw $v1, 0xcc($s0) +/* D93FAC 8024106C AE02006C */ sw $v0, 0x6c($s0) +/* D93FB0 80241070 8C620000 */ lw $v0, ($v1) +/* D93FB4 80241074 ACA20028 */ sw $v0, 0x28($a1) +/* D93FB8 80241078 9602007A */ lhu $v0, 0x7a($s0) +/* D93FBC 8024107C A4A2008E */ sh $v0, 0x8e($a1) +/* D93FC0 80241080 8E020078 */ lw $v0, 0x78($s0) +/* D93FC4 80241084 28420008 */ slti $v0, $v0, 8 +/* D93FC8 80241088 14400018 */ bnez $v0, .L802410EC +/* D93FCC 8024108C 24020021 */ addiu $v0, $zero, 0x21 +/* D93FD0 80241090 24040003 */ addiu $a0, $zero, 3 +/* D93FD4 80241094 27A30028 */ addiu $v1, $sp, 0x28 +/* D93FD8 80241098 84A700A8 */ lh $a3, 0xa8($a1) +/* D93FDC 8024109C 3C013F80 */ lui $at, 0x3f80 +/* D93FE0 802410A0 44810000 */ mtc1 $at, $f0 +/* D93FE4 802410A4 3C014000 */ lui $at, 0x4000 +/* D93FE8 802410A8 44811000 */ mtc1 $at, $f2 +/* D93FEC 802410AC 3C01C1A0 */ lui $at, 0xc1a0 +/* D93FF0 802410B0 44812000 */ mtc1 $at, $f4 +/* D93FF4 802410B4 44873000 */ mtc1 $a3, $f6 +/* D93FF8 802410B8 00000000 */ nop +/* D93FFC 802410BC 468031A0 */ cvt.s.w $f6, $f6 +/* D94000 802410C0 E7A00010 */ swc1 $f0, 0x10($sp) +/* D94004 802410C4 E7A20014 */ swc1 $f2, 0x14($sp) +/* D94008 802410C8 E7A40018 */ swc1 $f4, 0x18($sp) +/* D9400C 802410CC 8E020078 */ lw $v0, 0x78($s0) +/* D94010 802410D0 44073000 */ mfc1 $a3, $f6 +/* D94014 802410D4 0000302D */ daddu $a2, $zero, $zero +/* D94018 802410D8 AFA30020 */ sw $v1, 0x20($sp) +/* D9401C 802410DC 2442FFFF */ addiu $v0, $v0, -1 +/* D94020 802410E0 0C01BFA4 */ jal fx_emote +/* D94024 802410E4 AFA2001C */ sw $v0, 0x1c($sp) +/* D94028 802410E8 24020021 */ addiu $v0, $zero, 0x21 +.L802410EC: +/* D9402C 802410EC AE220070 */ sw $v0, 0x70($s1) +.L802410F0: +/* D94030 802410F0 8FBF0038 */ lw $ra, 0x38($sp) +/* D94034 802410F4 8FB10034 */ lw $s1, 0x34($sp) +/* D94038 802410F8 8FB00030 */ lw $s0, 0x30($sp) +/* D9403C 802410FC 03E00008 */ jr $ra +/* D94040 80241100 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C.s deleted file mode 100644 index 47eb6f40a1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024156C -/* D944AC 8024156C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D944B0 80241570 AFB20038 */ sw $s2, 0x38($sp) -/* D944B4 80241574 0080902D */ daddu $s2, $a0, $zero -/* D944B8 80241578 AFBF0048 */ sw $ra, 0x48($sp) -/* D944BC 8024157C AFB50044 */ sw $s5, 0x44($sp) -/* D944C0 80241580 AFB40040 */ sw $s4, 0x40($sp) -/* D944C4 80241584 AFB3003C */ sw $s3, 0x3c($sp) -/* D944C8 80241588 AFB10034 */ sw $s1, 0x34($sp) -/* D944CC 8024158C AFB00030 */ sw $s0, 0x30($sp) -/* D944D0 80241590 8E510148 */ lw $s1, 0x148($s2) -/* D944D4 80241594 86240008 */ lh $a0, 8($s1) -/* D944D8 80241598 0C00EABB */ jal get_npc_unsafe -/* D944DC 8024159C 00A0802D */ daddu $s0, $a1, $zero -/* D944E0 802415A0 8E43000C */ lw $v1, 0xc($s2) -/* D944E4 802415A4 0240202D */ daddu $a0, $s2, $zero -/* D944E8 802415A8 8C650000 */ lw $a1, ($v1) -/* D944EC 802415AC 0C0B1EAF */ jal get_variable -/* D944F0 802415B0 0040A82D */ daddu $s5, $v0, $zero -/* D944F4 802415B4 AFA00010 */ sw $zero, 0x10($sp) -/* D944F8 802415B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* D944FC 802415BC 8C630030 */ lw $v1, 0x30($v1) -/* D94500 802415C0 AFA30014 */ sw $v1, 0x14($sp) -/* D94504 802415C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D94508 802415C8 8C63001C */ lw $v1, 0x1c($v1) -/* D9450C 802415CC AFA30018 */ sw $v1, 0x18($sp) -/* D94510 802415D0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D94514 802415D4 8C630024 */ lw $v1, 0x24($v1) -/* D94518 802415D8 AFA3001C */ sw $v1, 0x1c($sp) -/* D9451C 802415DC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D94520 802415E0 8C630028 */ lw $v1, 0x28($v1) -/* D94524 802415E4 27B40010 */ addiu $s4, $sp, 0x10 -/* D94528 802415E8 AFA30020 */ sw $v1, 0x20($sp) -/* D9452C 802415EC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D94530 802415F0 3C014282 */ lui $at, 0x4282 -/* D94534 802415F4 44810000 */ mtc1 $at, $f0 -/* D94538 802415F8 8C63002C */ lw $v1, 0x2c($v1) -/* D9453C 802415FC 0040982D */ daddu $s3, $v0, $zero -/* D94540 80241600 E7A00028 */ swc1 $f0, 0x28($sp) -/* D94544 80241604 A7A0002C */ sh $zero, 0x2c($sp) -/* D94548 80241608 16000005 */ bnez $s0, .L80241620 -/* D9454C 8024160C AFA30024 */ sw $v1, 0x24($sp) -/* D94550 80241610 8E2200B0 */ lw $v0, 0xb0($s1) -/* D94554 80241614 30420004 */ andi $v0, $v0, 4 -/* D94558 80241618 10400020 */ beqz $v0, .L8024169C -/* D9455C 8024161C 00000000 */ nop -.L80241620: -/* D94560 80241620 2404F7FF */ addiu $a0, $zero, -0x801 -/* D94564 80241624 AE400070 */ sw $zero, 0x70($s2) -/* D94568 80241628 A6A0008E */ sh $zero, 0x8e($s5) -/* D9456C 8024162C 8E2200CC */ lw $v0, 0xcc($s1) -/* D94570 80241630 8EA30000 */ lw $v1, ($s5) -/* D94574 80241634 8C420000 */ lw $v0, ($v0) -/* D94578 80241638 00641824 */ and $v1, $v1, $a0 -/* D9457C 8024163C AEA30000 */ sw $v1, ($s5) -/* D94580 80241640 AEA20028 */ sw $v0, 0x28($s5) -/* D94584 80241644 8E2200D0 */ lw $v0, 0xd0($s1) -/* D94588 80241648 8C420034 */ lw $v0, 0x34($v0) -/* D9458C 8024164C 54400005 */ bnel $v0, $zero, .L80241664 -/* D94590 80241650 2402FDFF */ addiu $v0, $zero, -0x201 -/* D94594 80241654 34620200 */ ori $v0, $v1, 0x200 -/* D94598 80241658 2403FFF7 */ addiu $v1, $zero, -9 -/* D9459C 8024165C 0809059B */ j .L8024166C -/* D945A0 80241660 00431024 */ and $v0, $v0, $v1 -.L80241664: -/* D945A4 80241664 00621024 */ and $v0, $v1, $v0 -/* D945A8 80241668 34420008 */ ori $v0, $v0, 8 -.L8024166C: -/* D945AC 8024166C AEA20000 */ sw $v0, ($s5) -/* D945B0 80241670 8E2200B0 */ lw $v0, 0xb0($s1) -/* D945B4 80241674 30420004 */ andi $v0, $v0, 4 -/* D945B8 80241678 10400007 */ beqz $v0, .L80241698 -/* D945BC 8024167C 24020063 */ addiu $v0, $zero, 0x63 -/* D945C0 80241680 AE420070 */ sw $v0, 0x70($s2) -/* D945C4 80241684 AE400074 */ sw $zero, 0x74($s2) -/* D945C8 80241688 8E2200B0 */ lw $v0, 0xb0($s1) -/* D945CC 8024168C 2403FFFB */ addiu $v1, $zero, -5 -/* D945D0 80241690 00431024 */ and $v0, $v0, $v1 -/* D945D4 80241694 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241698: -/* D945D8 80241698 AE20006C */ sw $zero, 0x6c($s1) -.L8024169C: -/* D945DC 8024169C 8E420070 */ lw $v0, 0x70($s2) -/* D945E0 802416A0 2842001E */ slti $v0, $v0, 0x1e -/* D945E4 802416A4 10400009 */ beqz $v0, .L802416CC -/* D945E8 802416A8 00000000 */ nop -/* D945EC 802416AC 8E22006C */ lw $v0, 0x6c($s1) -/* D945F0 802416B0 14400006 */ bnez $v0, .L802416CC -/* D945F4 802416B4 00000000 */ nop -/* D945F8 802416B8 0C090456 */ jal func_80241158_D94098 -/* D945FC 802416BC 0240202D */ daddu $a0, $s2, $zero -/* D94600 802416C0 10400002 */ beqz $v0, .L802416CC -/* D94604 802416C4 2402001E */ addiu $v0, $zero, 0x1e -/* D94608 802416C8 AE420070 */ sw $v0, 0x70($s2) -.L802416CC: -/* D9460C 802416CC 8E430070 */ lw $v1, 0x70($s2) -/* D94610 802416D0 2C620064 */ sltiu $v0, $v1, 0x64 -/* D94614 802416D4 10400048 */ beqz $v0, .L802417F8 -/* D94618 802416D8 00031080 */ sll $v0, $v1, 2 -/* D9461C 802416DC 3C018024 */ lui $at, 0x8024 -/* D94620 802416E0 00220821 */ addu $at, $at, $v0 -/* D94624 802416E4 8C222518 */ lw $v0, 0x2518($at) -/* D94628 802416E8 00400008 */ jr $v0 -/* D9462C 802416EC 00000000 */ nop -/* D94630 802416F0 0240202D */ daddu $a0, $s2, $zero -/* D94634 802416F4 0260282D */ daddu $a1, $s3, $zero -/* D94638 802416F8 0C012568 */ jal func_800495A0 -/* D9463C 802416FC 0280302D */ daddu $a2, $s4, $zero -/* D94640 80241700 0240202D */ daddu $a0, $s2, $zero -/* D94644 80241704 0260282D */ daddu $a1, $s3, $zero -/* D94648 80241708 0C0125AE */ jal func_800496B8 -/* D9464C 8024170C 0280302D */ daddu $a2, $s4, $zero -/* D94650 80241710 080905FE */ j .L802417F8 -/* D94654 80241714 00000000 */ nop -/* D94658 80241718 0240202D */ daddu $a0, $s2, $zero -/* D9465C 8024171C 0260282D */ daddu $a1, $s3, $zero -/* D94660 80241720 0C0126D1 */ jal func_80049B44 -/* D94664 80241724 0280302D */ daddu $a2, $s4, $zero -/* D94668 80241728 0240202D */ daddu $a0, $s2, $zero -/* D9466C 8024172C 0260282D */ daddu $a1, $s3, $zero -/* D94670 80241730 0C012701 */ jal func_80049C04 -/* D94674 80241734 0280302D */ daddu $a2, $s4, $zero -/* D94678 80241738 080905FE */ j .L802417F8 -/* D9467C 8024173C 00000000 */ nop -/* D94680 80241740 0240202D */ daddu $a0, $s2, $zero -/* D94684 80241744 0260282D */ daddu $a1, $s3, $zero -/* D94688 80241748 0C01278F */ jal func_80049E3C -/* D9468C 8024174C 0280302D */ daddu $a2, $s4, $zero -/* D94690 80241750 0240202D */ daddu $a0, $s2, $zero -/* D94694 80241754 0260282D */ daddu $a1, $s3, $zero -/* D94698 80241758 0C0127B3 */ jal func_80049ECC -/* D9469C 8024175C 0280302D */ daddu $a2, $s4, $zero -/* D946A0 80241760 080905FE */ j .L802417F8 -/* D946A4 80241764 00000000 */ nop -/* D946A8 80241768 0240202D */ daddu $a0, $s2, $zero -/* D946AC 8024176C 0260282D */ daddu $a1, $s3, $zero -/* D946B0 80241770 0C0127DF */ jal func_80049F7C -/* D946B4 80241774 0280302D */ daddu $a2, $s4, $zero -/* D946B8 80241778 0240202D */ daddu $a0, $s2, $zero -/* D946BC 8024177C 0260282D */ daddu $a1, $s3, $zero -/* D946C0 80241780 0C012849 */ jal func_8004A124 -/* D946C4 80241784 0280302D */ daddu $a2, $s4, $zero -/* D946C8 80241788 080905FE */ j .L802417F8 -/* D946CC 8024178C 00000000 */ nop -/* D946D0 80241790 0240202D */ daddu $a0, $s2, $zero -/* D946D4 80241794 0260282D */ daddu $a1, $s3, $zero -/* D946D8 80241798 0C0128FA */ jal func_8004A3E8 -/* D946DC 8024179C 0280302D */ daddu $a2, $s4, $zero -/* D946E0 802417A0 080905FE */ j .L802417F8 -/* D946E4 802417A4 00000000 */ nop -/* D946E8 802417A8 0C0903D4 */ jal func_80240F50 -/* D946EC 802417AC 0240202D */ daddu $a0, $s2, $zero -/* D946F0 802417B0 0C0903EF */ jal func_80240FBC -/* D946F4 802417B4 0240202D */ daddu $a0, $s2, $zero -/* D946F8 802417B8 8E430070 */ lw $v1, 0x70($s2) -/* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 -/* D94700 802417C0 1462000D */ bne $v1, $v0, .L802417F8 -/* D94704 802417C4 00000000 */ nop -/* D94708 802417C8 0C09040B */ jal func_8024102C -/* D9470C 802417CC 0240202D */ daddu $a0, $s2, $zero -/* D94710 802417D0 8E430070 */ lw $v1, 0x70($s2) -/* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 -/* D94718 802417D8 14620007 */ bne $v1, $v0, .L802417F8 -/* D9471C 802417DC 00000000 */ nop -/* D94720 802417E0 0C090441 */ jal func_80241104 -/* D94724 802417E4 0240202D */ daddu $a0, $s2, $zero -/* D94728 802417E8 080905FE */ j .L802417F8 -/* D9472C 802417EC 00000000 */ nop -/* D94730 802417F0 0C0129CF */ jal func_8004A73C -/* D94734 802417F4 0240202D */ daddu $a0, $s2, $zero -.L802417F8: -/* D94738 802417F8 8FBF0048 */ lw $ra, 0x48($sp) -/* D9473C 802417FC 8FB50044 */ lw $s5, 0x44($sp) -/* D94740 80241800 8FB40040 */ lw $s4, 0x40($sp) -/* D94744 80241804 8FB3003C */ lw $s3, 0x3c($sp) -/* D94748 80241808 8FB20038 */ lw $s2, 0x38($sp) -/* D9474C 8024180C 8FB10034 */ lw $s1, 0x34($sp) -/* D94750 80241810 8FB00030 */ lw $s0, 0x30($sp) -/* D94754 80241814 0000102D */ daddu $v0, $zero, $zero -/* D94758 80241818 03E00008 */ jr $ra -/* D9475C 8024181C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s new file mode 100644 index 0000000000..2fb7575cf5 --- /dev/null +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_8024156C_D944AC.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024156C_D944AC +/* D944AC 8024156C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* D944B0 80241570 AFB20038 */ sw $s2, 0x38($sp) +/* D944B4 80241574 0080902D */ daddu $s2, $a0, $zero +/* D944B8 80241578 AFBF0048 */ sw $ra, 0x48($sp) +/* D944BC 8024157C AFB50044 */ sw $s5, 0x44($sp) +/* D944C0 80241580 AFB40040 */ sw $s4, 0x40($sp) +/* D944C4 80241584 AFB3003C */ sw $s3, 0x3c($sp) +/* D944C8 80241588 AFB10034 */ sw $s1, 0x34($sp) +/* D944CC 8024158C AFB00030 */ sw $s0, 0x30($sp) +/* D944D0 80241590 8E510148 */ lw $s1, 0x148($s2) +/* D944D4 80241594 86240008 */ lh $a0, 8($s1) +/* D944D8 80241598 0C00EABB */ jal get_npc_unsafe +/* D944DC 8024159C 00A0802D */ daddu $s0, $a1, $zero +/* D944E0 802415A0 8E43000C */ lw $v1, 0xc($s2) +/* D944E4 802415A4 0240202D */ daddu $a0, $s2, $zero +/* D944E8 802415A8 8C650000 */ lw $a1, ($v1) +/* D944EC 802415AC 0C0B1EAF */ jal get_variable +/* D944F0 802415B0 0040A82D */ daddu $s5, $v0, $zero +/* D944F4 802415B4 AFA00010 */ sw $zero, 0x10($sp) +/* D944F8 802415B8 8E2300D0 */ lw $v1, 0xd0($s1) +/* D944FC 802415BC 8C630030 */ lw $v1, 0x30($v1) +/* D94500 802415C0 AFA30014 */ sw $v1, 0x14($sp) +/* D94504 802415C4 8E2300D0 */ lw $v1, 0xd0($s1) +/* D94508 802415C8 8C63001C */ lw $v1, 0x1c($v1) +/* D9450C 802415CC AFA30018 */ sw $v1, 0x18($sp) +/* D94510 802415D0 8E2300D0 */ lw $v1, 0xd0($s1) +/* D94514 802415D4 8C630024 */ lw $v1, 0x24($v1) +/* D94518 802415D8 AFA3001C */ sw $v1, 0x1c($sp) +/* D9451C 802415DC 8E2300D0 */ lw $v1, 0xd0($s1) +/* D94520 802415E0 8C630028 */ lw $v1, 0x28($v1) +/* D94524 802415E4 27B40010 */ addiu $s4, $sp, 0x10 +/* D94528 802415E8 AFA30020 */ sw $v1, 0x20($sp) +/* D9452C 802415EC 8E2300D0 */ lw $v1, 0xd0($s1) +/* D94530 802415F0 3C014282 */ lui $at, 0x4282 +/* D94534 802415F4 44810000 */ mtc1 $at, $f0 +/* D94538 802415F8 8C63002C */ lw $v1, 0x2c($v1) +/* D9453C 802415FC 0040982D */ daddu $s3, $v0, $zero +/* D94540 80241600 E7A00028 */ swc1 $f0, 0x28($sp) +/* D94544 80241604 A7A0002C */ sh $zero, 0x2c($sp) +/* D94548 80241608 16000005 */ bnez $s0, .L80241620 +/* D9454C 8024160C AFA30024 */ sw $v1, 0x24($sp) +/* D94550 80241610 8E2200B0 */ lw $v0, 0xb0($s1) +/* D94554 80241614 30420004 */ andi $v0, $v0, 4 +/* D94558 80241618 10400020 */ beqz $v0, .L8024169C +/* D9455C 8024161C 00000000 */ nop +.L80241620: +/* D94560 80241620 2404F7FF */ addiu $a0, $zero, -0x801 +/* D94564 80241624 AE400070 */ sw $zero, 0x70($s2) +/* D94568 80241628 A6A0008E */ sh $zero, 0x8e($s5) +/* D9456C 8024162C 8E2200CC */ lw $v0, 0xcc($s1) +/* D94570 80241630 8EA30000 */ lw $v1, ($s5) +/* D94574 80241634 8C420000 */ lw $v0, ($v0) +/* D94578 80241638 00641824 */ and $v1, $v1, $a0 +/* D9457C 8024163C AEA30000 */ sw $v1, ($s5) +/* D94580 80241640 AEA20028 */ sw $v0, 0x28($s5) +/* D94584 80241644 8E2200D0 */ lw $v0, 0xd0($s1) +/* D94588 80241648 8C420034 */ lw $v0, 0x34($v0) +/* D9458C 8024164C 54400005 */ bnel $v0, $zero, .L80241664 +/* D94590 80241650 2402FDFF */ addiu $v0, $zero, -0x201 +/* D94594 80241654 34620200 */ ori $v0, $v1, 0x200 +/* D94598 80241658 2403FFF7 */ addiu $v1, $zero, -9 +/* D9459C 8024165C 0809059B */ j .L8024166C +/* D945A0 80241660 00431024 */ and $v0, $v0, $v1 +.L80241664: +/* D945A4 80241664 00621024 */ and $v0, $v1, $v0 +/* D945A8 80241668 34420008 */ ori $v0, $v0, 8 +.L8024166C: +/* D945AC 8024166C AEA20000 */ sw $v0, ($s5) +/* D945B0 80241670 8E2200B0 */ lw $v0, 0xb0($s1) +/* D945B4 80241674 30420004 */ andi $v0, $v0, 4 +/* D945B8 80241678 10400007 */ beqz $v0, .L80241698 +/* D945BC 8024167C 24020063 */ addiu $v0, $zero, 0x63 +/* D945C0 80241680 AE420070 */ sw $v0, 0x70($s2) +/* D945C4 80241684 AE400074 */ sw $zero, 0x74($s2) +/* D945C8 80241688 8E2200B0 */ lw $v0, 0xb0($s1) +/* D945CC 8024168C 2403FFFB */ addiu $v1, $zero, -5 +/* D945D0 80241690 00431024 */ and $v0, $v0, $v1 +/* D945D4 80241694 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241698: +/* D945D8 80241698 AE20006C */ sw $zero, 0x6c($s1) +.L8024169C: +/* D945DC 8024169C 8E420070 */ lw $v0, 0x70($s2) +/* D945E0 802416A0 2842001E */ slti $v0, $v0, 0x1e +/* D945E4 802416A4 10400009 */ beqz $v0, .L802416CC +/* D945E8 802416A8 00000000 */ nop +/* D945EC 802416AC 8E22006C */ lw $v0, 0x6c($s1) +/* D945F0 802416B0 14400006 */ bnez $v0, .L802416CC +/* D945F4 802416B4 00000000 */ nop +/* D945F8 802416B8 0C090456 */ jal func_80241158_D94098 +/* D945FC 802416BC 0240202D */ daddu $a0, $s2, $zero +/* D94600 802416C0 10400002 */ beqz $v0, .L802416CC +/* D94604 802416C4 2402001E */ addiu $v0, $zero, 0x1e +/* D94608 802416C8 AE420070 */ sw $v0, 0x70($s2) +.L802416CC: +/* D9460C 802416CC 8E430070 */ lw $v1, 0x70($s2) +/* D94610 802416D0 2C620064 */ sltiu $v0, $v1, 0x64 +/* D94614 802416D4 10400048 */ beqz $v0, .L802417F8 +/* D94618 802416D8 00031080 */ sll $v0, $v1, 2 +/* D9461C 802416DC 3C018024 */ lui $at, 0x8024 +/* D94620 802416E0 00220821 */ addu $at, $at, $v0 +/* D94624 802416E4 8C222518 */ lw $v0, 0x2518($at) +/* D94628 802416E8 00400008 */ jr $v0 +/* D9462C 802416EC 00000000 */ nop +/* D94630 802416F0 0240202D */ daddu $a0, $s2, $zero +/* D94634 802416F4 0260282D */ daddu $a1, $s3, $zero +/* D94638 802416F8 0C012568 */ jal func_800495A0 +/* D9463C 802416FC 0280302D */ daddu $a2, $s4, $zero +/* D94640 80241700 0240202D */ daddu $a0, $s2, $zero +/* D94644 80241704 0260282D */ daddu $a1, $s3, $zero +/* D94648 80241708 0C0125AE */ jal func_800496B8 +/* D9464C 8024170C 0280302D */ daddu $a2, $s4, $zero +/* D94650 80241710 080905FE */ j .L802417F8 +/* D94654 80241714 00000000 */ nop +/* D94658 80241718 0240202D */ daddu $a0, $s2, $zero +/* D9465C 8024171C 0260282D */ daddu $a1, $s3, $zero +/* D94660 80241720 0C0126D1 */ jal func_80049B44 +/* D94664 80241724 0280302D */ daddu $a2, $s4, $zero +/* D94668 80241728 0240202D */ daddu $a0, $s2, $zero +/* D9466C 8024172C 0260282D */ daddu $a1, $s3, $zero +/* D94670 80241730 0C012701 */ jal func_80049C04 +/* D94674 80241734 0280302D */ daddu $a2, $s4, $zero +/* D94678 80241738 080905FE */ j .L802417F8 +/* D9467C 8024173C 00000000 */ nop +/* D94680 80241740 0240202D */ daddu $a0, $s2, $zero +/* D94684 80241744 0260282D */ daddu $a1, $s3, $zero +/* D94688 80241748 0C01278F */ jal func_80049E3C +/* D9468C 8024174C 0280302D */ daddu $a2, $s4, $zero +/* D94690 80241750 0240202D */ daddu $a0, $s2, $zero +/* D94694 80241754 0260282D */ daddu $a1, $s3, $zero +/* D94698 80241758 0C0127B3 */ jal func_80049ECC +/* D9469C 8024175C 0280302D */ daddu $a2, $s4, $zero +/* D946A0 80241760 080905FE */ j .L802417F8 +/* D946A4 80241764 00000000 */ nop +/* D946A8 80241768 0240202D */ daddu $a0, $s2, $zero +/* D946AC 8024176C 0260282D */ daddu $a1, $s3, $zero +/* D946B0 80241770 0C0127DF */ jal func_80049F7C +/* D946B4 80241774 0280302D */ daddu $a2, $s4, $zero +/* D946B8 80241778 0240202D */ daddu $a0, $s2, $zero +/* D946BC 8024177C 0260282D */ daddu $a1, $s3, $zero +/* D946C0 80241780 0C012849 */ jal func_8004A124 +/* D946C4 80241784 0280302D */ daddu $a2, $s4, $zero +/* D946C8 80241788 080905FE */ j .L802417F8 +/* D946CC 8024178C 00000000 */ nop +/* D946D0 80241790 0240202D */ daddu $a0, $s2, $zero +/* D946D4 80241794 0260282D */ daddu $a1, $s3, $zero +/* D946D8 80241798 0C0128FA */ jal func_8004A3E8 +/* D946DC 8024179C 0280302D */ daddu $a2, $s4, $zero +/* D946E0 802417A0 080905FE */ j .L802417F8 +/* D946E4 802417A4 00000000 */ nop +/* D946E8 802417A8 0C0903D4 */ jal func_80240F50_D93E90 +/* D946EC 802417AC 0240202D */ daddu $a0, $s2, $zero +/* D946F0 802417B0 0C0903EF */ jal func_80240FBC_D93EFC +/* D946F4 802417B4 0240202D */ daddu $a0, $s2, $zero +/* D946F8 802417B8 8E430070 */ lw $v1, 0x70($s2) +/* D946FC 802417BC 24020020 */ addiu $v0, $zero, 0x20 +/* D94700 802417C0 1462000D */ bne $v1, $v0, .L802417F8 +/* D94704 802417C4 00000000 */ nop +/* D94708 802417C8 0C09040B */ jal func_8024102C_D93F6C +/* D9470C 802417CC 0240202D */ daddu $a0, $s2, $zero +/* D94710 802417D0 8E430070 */ lw $v1, 0x70($s2) +/* D94714 802417D4 24020021 */ addiu $v0, $zero, 0x21 +/* D94718 802417D8 14620007 */ bne $v1, $v0, .L802417F8 +/* D9471C 802417DC 00000000 */ nop +/* D94720 802417E0 0C090441 */ jal func_80241104_D94044 +/* D94724 802417E4 0240202D */ daddu $a0, $s2, $zero +/* D94728 802417E8 080905FE */ j .L802417F8 +/* D9472C 802417EC 00000000 */ nop +/* D94730 802417F0 0C0129CF */ jal func_8004A73C +/* D94734 802417F4 0240202D */ daddu $a0, $s2, $zero +.L802417F8: +/* D94738 802417F8 8FBF0048 */ lw $ra, 0x48($sp) +/* D9473C 802417FC 8FB50044 */ lw $s5, 0x44($sp) +/* D94740 80241800 8FB40040 */ lw $s4, 0x40($sp) +/* D94744 80241804 8FB3003C */ lw $s3, 0x3c($sp) +/* D94748 80241808 8FB20038 */ lw $s2, 0x38($sp) +/* D9474C 8024180C 8FB10034 */ lw $s1, 0x34($sp) +/* D94750 80241810 8FB00030 */ lw $s0, 0x30($sp) +/* D94754 80241814 0000102D */ daddu $v0, $zero, $zero +/* D94758 80241818 03E00008 */ jr $ra +/* D9475C 8024181C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s index d192cd555b..7f958d593a 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s @@ -37,7 +37,7 @@ glabel func_80240158_D95748 /* D957C8 802401D8 0C00B94E */ jal get_screen_coords /* D957CC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D957D0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D957D4 802401E4 0C090014 */ jal func_80240050 +/* D957D4 802401E4 0C090014 */ jal func_80240050_D95640 /* D957D8 802401E8 00000000 */ nop /* D957DC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D957E0 802401F0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240158_D95748 /* D9580C 8024021C 00000000 */ nop /* D95810 80240220 45000004 */ bc1f .L80240234 /* D95814 80240224 00000000 */ nop -/* D95818 80240228 0C090021 */ jal func_80240084 +/* D95818 80240228 0C090021 */ jal func_80240084_D95674 /* D9581C 8024022C 0040202D */ daddu $a0, $v0, $zero /* D95820 80240230 24040002 */ addiu $a0, $zero, 2 .L80240234: diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s index e032d61d97..cfc769b08e 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s @@ -37,7 +37,7 @@ glabel func_80240158_D979E8 /* D97A68 802401D8 0C00B94E */ jal get_screen_coords /* D97A6C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D97A70 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D97A74 802401E4 0C090014 */ jal func_80240050 +/* D97A74 802401E4 0C090014 */ jal func_80240050_D978E0 /* D97A78 802401E8 00000000 */ nop /* D97A7C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D97A80 802401F0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240158_D979E8 /* D97AAC 8024021C 00000000 */ nop /* D97AB0 80240220 45000004 */ bc1f .L80240234 /* D97AB4 80240224 00000000 */ nop -/* D97AB8 80240228 0C090021 */ jal func_80240084 +/* D97AB8 80240228 0C090021 */ jal func_80240084_D97914 /* D97ABC 8024022C 0040202D */ daddu $a0, $v0, $zero /* D97AC0 80240230 24040002 */ addiu $a0, $zero, 2 .L80240234: diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s index 4f73fffffb..14f35eaba7 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D99AD8 /* D99B58 802401A8 0C00B94E */ jal get_screen_coords /* D99B5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D99B60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D99B64 802401B4 0C090008 */ jal func_80240020 +/* D99B64 802401B4 0C090008 */ jal func_80240020_D999D0 /* D99B68 802401B8 00000000 */ nop /* D99B6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D99B70 802401C0 3C014307 */ lui $at, 0x4307 @@ -54,7 +54,7 @@ glabel func_80240128_D99AD8 /* D99B9C 802401EC 00000000 */ nop /* D99BA0 802401F0 45000004 */ bc1f .L80240204 /* D99BA4 802401F4 00000000 */ nop -/* D99BA8 802401F8 0C090015 */ jal func_80240054 +/* D99BA8 802401F8 0C090015 */ jal func_80240054_D99A04 /* D99BAC 802401FC 0040202D */ daddu $a0, $v0, $zero /* D99BB0 80240200 24040002 */ addiu $a0, $zero, 2 .L80240204: diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C.s deleted file mode 100644 index 780e44a130..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024053C -/* CF80AC 8024053C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF80B0 80240540 AFBF0010 */ sw $ra, 0x10($sp) -/* CF80B4 80240544 10A00003 */ beqz $a1, .L80240554 -/* CF80B8 80240548 8C86000C */ lw $a2, 0xc($a0) -/* CF80BC 8024054C 3C018024 */ lui $at, 0x8024 -/* CF80C0 80240550 AC2032D0 */ sw $zero, 0x32d0($at) -.L80240554: -/* CF80C4 80240554 3C038024 */ lui $v1, 0x8024 -/* CF80C8 80240558 246332D0 */ addiu $v1, $v1, 0x32d0 -/* CF80CC 8024055C 8C620000 */ lw $v0, ($v1) -/* CF80D0 80240560 54400003 */ bnel $v0, $zero, .L80240570 -/* CF80D4 80240564 AC600000 */ sw $zero, ($v1) -/* CF80D8 80240568 08090161 */ j .L80240584 -/* CF80DC 8024056C 0000102D */ daddu $v0, $zero, $zero -.L80240570: -/* CF80E0 80240570 8CC50000 */ lw $a1, ($a2) -/* CF80E4 80240574 3C068024 */ lui $a2, 0x8024 -/* CF80E8 80240578 0C0B2026 */ jal set_variable -/* CF80EC 8024057C 8CC632D4 */ lw $a2, 0x32d4($a2) -/* CF80F0 80240580 24020002 */ addiu $v0, $zero, 2 -.L80240584: -/* CF80F4 80240584 8FBF0010 */ lw $ra, 0x10($sp) -/* CF80F8 80240588 03E00008 */ jr $ra -/* CF80FC 8024058C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s new file mode 100644 index 0000000000..b401737155 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024053C_CF80AC.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024053C_CF80AC +/* CF80AC 8024053C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CF80B0 80240540 AFBF0010 */ sw $ra, 0x10($sp) +/* CF80B4 80240544 10A00003 */ beqz $a1, .L80240554 +/* CF80B8 80240548 8C86000C */ lw $a2, 0xc($a0) +/* CF80BC 8024054C 3C018024 */ lui $at, 0x8024 +/* CF80C0 80240550 AC2032D0 */ sw $zero, 0x32d0($at) +.L80240554: +/* CF80C4 80240554 3C038024 */ lui $v1, 0x8024 +/* CF80C8 80240558 246332D0 */ addiu $v1, $v1, 0x32d0 +/* CF80CC 8024055C 8C620000 */ lw $v0, ($v1) +/* CF80D0 80240560 54400003 */ bnel $v0, $zero, .L80240570 +/* CF80D4 80240564 AC600000 */ sw $zero, ($v1) +/* CF80D8 80240568 08090161 */ j .L80240584 +/* CF80DC 8024056C 0000102D */ daddu $v0, $zero, $zero +.L80240570: +/* CF80E0 80240570 8CC50000 */ lw $a1, ($a2) +/* CF80E4 80240574 3C068024 */ lui $a2, 0x8024 +/* CF80E8 80240578 0C0B2026 */ jal set_variable +/* CF80EC 8024057C 8CC632D4 */ lw $a2, 0x32d4($a2) +/* CF80F0 80240580 24020002 */ addiu $v0, $zero, 2 +.L80240584: +/* CF80F4 80240584 8FBF0010 */ lw $ra, 0x10($sp) +/* CF80F8 80240588 03E00008 */ jr $ra +/* CF80FC 8024058C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664.s deleted file mode 100644 index 0d94ec00e9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240664 -/* CF81D4 80240664 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF81D8 80240668 AFBF0010 */ sw $ra, 0x10($sp) -/* CF81DC 8024066C 8C82000C */ lw $v0, 0xc($a0) -/* CF81E0 80240670 0C0B1EAF */ jal get_variable -/* CF81E4 80240674 8C450000 */ lw $a1, ($v0) -/* CF81E8 80240678 0040182D */ daddu $v1, $v0, $zero -/* CF81EC 8024067C 10600012 */ beqz $v1, .L802406C8 -/* CF81F0 80240680 0000202D */ daddu $a0, $zero, $zero -/* CF81F4 80240684 8C620000 */ lw $v0, ($v1) -/* CF81F8 80240688 5040000A */ beql $v0, $zero, .L802406B4 -/* CF81FC 8024068C 00041080 */ sll $v0, $a0, 2 -/* CF8200 80240690 3C058025 */ lui $a1, 0x8025 -/* CF8204 80240694 24A5DD88 */ addiu $a1, $a1, -0x2278 -.L80240698: -/* CF8208 80240698 24630004 */ addiu $v1, $v1, 4 -/* CF820C 8024069C 24840001 */ addiu $a0, $a0, 1 -/* CF8210 802406A0 ACA20000 */ sw $v0, ($a1) -/* CF8214 802406A4 8C620000 */ lw $v0, ($v1) -/* CF8218 802406A8 1440FFFB */ bnez $v0, .L80240698 -/* CF821C 802406AC 24A50004 */ addiu $a1, $a1, 4 -/* CF8220 802406B0 00041080 */ sll $v0, $a0, 2 -.L802406B4: -/* CF8224 802406B4 3C018025 */ lui $at, 0x8025 -/* CF8228 802406B8 00220821 */ addu $at, $at, $v0 -/* CF822C 802406BC AC20DD88 */ sw $zero, -0x2278($at) -/* CF8230 802406C0 080901BC */ j .L802406F0 -/* CF8234 802406C4 00000000 */ nop -.L802406C8: -/* CF8238 802406C8 3C038025 */ lui $v1, 0x8025 -/* CF823C 802406CC 2463DD88 */ addiu $v1, $v1, -0x2278 -/* CF8240 802406D0 0060282D */ daddu $a1, $v1, $zero -.L802406D4: -/* CF8244 802406D4 24820080 */ addiu $v0, $a0, 0x80 -/* CF8248 802406D8 AC620000 */ sw $v0, ($v1) -/* CF824C 802406DC 24630004 */ addiu $v1, $v1, 4 -/* CF8250 802406E0 24840001 */ addiu $a0, $a0, 1 -/* CF8254 802406E4 2882005B */ slti $v0, $a0, 0x5b -/* CF8258 802406E8 1440FFFA */ bnez $v0, .L802406D4 -/* CF825C 802406EC ACA0016C */ sw $zero, 0x16c($a1) -.L802406F0: -/* CF8260 802406F0 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8264 802406F4 24020002 */ addiu $v0, $zero, 2 -/* CF8268 802406F8 03E00008 */ jr $ra -/* CF826C 802406FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s new file mode 100644 index 0000000000..1155d84013 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240664_CF81D4.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240664_CF81D4 +/* CF81D4 80240664 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CF81D8 80240668 AFBF0010 */ sw $ra, 0x10($sp) +/* CF81DC 8024066C 8C82000C */ lw $v0, 0xc($a0) +/* CF81E0 80240670 0C0B1EAF */ jal get_variable +/* CF81E4 80240674 8C450000 */ lw $a1, ($v0) +/* CF81E8 80240678 0040182D */ daddu $v1, $v0, $zero +/* CF81EC 8024067C 10600012 */ beqz $v1, .L802406C8 +/* CF81F0 80240680 0000202D */ daddu $a0, $zero, $zero +/* CF81F4 80240684 8C620000 */ lw $v0, ($v1) +/* CF81F8 80240688 5040000A */ beql $v0, $zero, .L802406B4 +/* CF81FC 8024068C 00041080 */ sll $v0, $a0, 2 +/* CF8200 80240690 3C058025 */ lui $a1, 0x8025 +/* CF8204 80240694 24A5DD88 */ addiu $a1, $a1, -0x2278 +.L80240698: +/* CF8208 80240698 24630004 */ addiu $v1, $v1, 4 +/* CF820C 8024069C 24840001 */ addiu $a0, $a0, 1 +/* CF8210 802406A0 ACA20000 */ sw $v0, ($a1) +/* CF8214 802406A4 8C620000 */ lw $v0, ($v1) +/* CF8218 802406A8 1440FFFB */ bnez $v0, .L80240698 +/* CF821C 802406AC 24A50004 */ addiu $a1, $a1, 4 +/* CF8220 802406B0 00041080 */ sll $v0, $a0, 2 +.L802406B4: +/* CF8224 802406B4 3C018025 */ lui $at, 0x8025 +/* CF8228 802406B8 00220821 */ addu $at, $at, $v0 +/* CF822C 802406BC AC20DD88 */ sw $zero, -0x2278($at) +/* CF8230 802406C0 080901BC */ j .L802406F0 +/* CF8234 802406C4 00000000 */ nop +.L802406C8: +/* CF8238 802406C8 3C038025 */ lui $v1, 0x8025 +/* CF823C 802406CC 2463DD88 */ addiu $v1, $v1, -0x2278 +/* CF8240 802406D0 0060282D */ daddu $a1, $v1, $zero +.L802406D4: +/* CF8244 802406D4 24820080 */ addiu $v0, $a0, 0x80 +/* CF8248 802406D8 AC620000 */ sw $v0, ($v1) +/* CF824C 802406DC 24630004 */ addiu $v1, $v1, 4 +/* CF8250 802406E0 24840001 */ addiu $a0, $a0, 1 +/* CF8254 802406E4 2882005B */ slti $v0, $a0, 0x5b +/* CF8258 802406E8 1440FFFA */ bnez $v0, .L802406D4 +/* CF825C 802406EC ACA0016C */ sw $zero, 0x16c($a1) +.L802406F0: +/* CF8260 802406F0 8FBF0010 */ lw $ra, 0x10($sp) +/* CF8264 802406F4 24020002 */ addiu $v0, $zero, 2 +/* CF8268 802406F8 03E00008 */ jr $ra +/* CF826C 802406FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700.s deleted file mode 100644 index 672d8a5bfb..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240700 -/* CF8270 80240700 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF8274 80240704 AFB00010 */ sw $s0, 0x10($sp) -/* CF8278 80240708 3C108024 */ lui $s0, 0x8024 -/* CF827C 8024070C 261035F0 */ addiu $s0, $s0, 0x35f0 -/* CF8280 80240710 AFBF0018 */ sw $ra, 0x18($sp) -/* CF8284 80240714 AFB10014 */ sw $s1, 0x14($sp) -/* CF8288 80240718 8E020000 */ lw $v0, ($s0) -/* CF828C 8024071C 14400010 */ bnez $v0, .L80240760 -/* CF8290 80240720 0080882D */ daddu $s1, $a0, $zero -/* CF8294 80240724 0C00AB39 */ jal heap_malloc -/* CF8298 80240728 24040040 */ addiu $a0, $zero, 0x40 -/* CF829C 8024072C AE020000 */ sw $v0, ($s0) -/* CF82A0 80240730 0000182D */ daddu $v1, $zero, $zero -/* CF82A4 80240734 0040282D */ daddu $a1, $v0, $zero -/* CF82A8 80240738 0220202D */ daddu $a0, $s1, $zero -.L8024073C: -/* CF82AC 8024073C 8C820084 */ lw $v0, 0x84($a0) -/* CF82B0 80240740 24840004 */ addiu $a0, $a0, 4 -/* CF82B4 80240744 24630001 */ addiu $v1, $v1, 1 -/* CF82B8 80240748 ACA20000 */ sw $v0, ($a1) -/* CF82BC 8024074C 28620010 */ slti $v0, $v1, 0x10 -/* CF82C0 80240750 1440FFFA */ bnez $v0, .L8024073C -/* CF82C4 80240754 24A50004 */ addiu $a1, $a1, 4 -/* CF82C8 80240758 080901E7 */ j .L8024079C -/* CF82CC 8024075C 00000000 */ nop -.L80240760: -/* CF82D0 80240760 0000182D */ daddu $v1, $zero, $zero -/* CF82D4 80240764 0040282D */ daddu $a1, $v0, $zero -/* CF82D8 80240768 0220202D */ daddu $a0, $s1, $zero -.L8024076C: -/* CF82DC 8024076C 8CA20000 */ lw $v0, ($a1) -/* CF82E0 80240770 24A50004 */ addiu $a1, $a1, 4 -/* CF82E4 80240774 24630001 */ addiu $v1, $v1, 1 -/* CF82E8 80240778 AC820084 */ sw $v0, 0x84($a0) -/* CF82EC 8024077C 28620010 */ slti $v0, $v1, 0x10 -/* CF82F0 80240780 1440FFFA */ bnez $v0, .L8024076C -/* CF82F4 80240784 24840004 */ addiu $a0, $a0, 4 -/* CF82F8 80240788 3C108024 */ lui $s0, 0x8024 -/* CF82FC 8024078C 261035F0 */ addiu $s0, $s0, 0x35f0 -/* CF8300 80240790 0C00AB4B */ jal heap_free -/* CF8304 80240794 8E040000 */ lw $a0, ($s0) -/* CF8308 80240798 AE000000 */ sw $zero, ($s0) -.L8024079C: -/* CF830C 8024079C 8FBF0018 */ lw $ra, 0x18($sp) -/* CF8310 802407A0 8FB10014 */ lw $s1, 0x14($sp) -/* CF8314 802407A4 8FB00010 */ lw $s0, 0x10($sp) -/* CF8318 802407A8 24020002 */ addiu $v0, $zero, 2 -/* CF831C 802407AC 03E00008 */ jr $ra -/* CF8320 802407B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s new file mode 100644 index 0000000000..0d4e425745 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240700_CF8270.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240700_CF8270 +/* CF8270 80240700 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* CF8274 80240704 AFB00010 */ sw $s0, 0x10($sp) +/* CF8278 80240708 3C108024 */ lui $s0, 0x8024 +/* CF827C 8024070C 261035F0 */ addiu $s0, $s0, 0x35f0 +/* CF8280 80240710 AFBF0018 */ sw $ra, 0x18($sp) +/* CF8284 80240714 AFB10014 */ sw $s1, 0x14($sp) +/* CF8288 80240718 8E020000 */ lw $v0, ($s0) +/* CF828C 8024071C 14400010 */ bnez $v0, .L80240760 +/* CF8290 80240720 0080882D */ daddu $s1, $a0, $zero +/* CF8294 80240724 0C00AB39 */ jal heap_malloc +/* CF8298 80240728 24040040 */ addiu $a0, $zero, 0x40 +/* CF829C 8024072C AE020000 */ sw $v0, ($s0) +/* CF82A0 80240730 0000182D */ daddu $v1, $zero, $zero +/* CF82A4 80240734 0040282D */ daddu $a1, $v0, $zero +/* CF82A8 80240738 0220202D */ daddu $a0, $s1, $zero +.L8024073C: +/* CF82AC 8024073C 8C820084 */ lw $v0, 0x84($a0) +/* CF82B0 80240740 24840004 */ addiu $a0, $a0, 4 +/* CF82B4 80240744 24630001 */ addiu $v1, $v1, 1 +/* CF82B8 80240748 ACA20000 */ sw $v0, ($a1) +/* CF82BC 8024074C 28620010 */ slti $v0, $v1, 0x10 +/* CF82C0 80240750 1440FFFA */ bnez $v0, .L8024073C +/* CF82C4 80240754 24A50004 */ addiu $a1, $a1, 4 +/* CF82C8 80240758 080901E7 */ j .L8024079C +/* CF82CC 8024075C 00000000 */ nop +.L80240760: +/* CF82D0 80240760 0000182D */ daddu $v1, $zero, $zero +/* CF82D4 80240764 0040282D */ daddu $a1, $v0, $zero +/* CF82D8 80240768 0220202D */ daddu $a0, $s1, $zero +.L8024076C: +/* CF82DC 8024076C 8CA20000 */ lw $v0, ($a1) +/* CF82E0 80240770 24A50004 */ addiu $a1, $a1, 4 +/* CF82E4 80240774 24630001 */ addiu $v1, $v1, 1 +/* CF82E8 80240778 AC820084 */ sw $v0, 0x84($a0) +/* CF82EC 8024077C 28620010 */ slti $v0, $v1, 0x10 +/* CF82F0 80240780 1440FFFA */ bnez $v0, .L8024076C +/* CF82F4 80240784 24840004 */ addiu $a0, $a0, 4 +/* CF82F8 80240788 3C108024 */ lui $s0, 0x8024 +/* CF82FC 8024078C 261035F0 */ addiu $s0, $s0, 0x35f0 +/* CF8300 80240790 0C00AB4B */ jal heap_free +/* CF8304 80240794 8E040000 */ lw $a0, ($s0) +/* CF8308 80240798 AE000000 */ sw $zero, ($s0) +.L8024079C: +/* CF830C 8024079C 8FBF0018 */ lw $ra, 0x18($sp) +/* CF8310 802407A0 8FB10014 */ lw $s1, 0x14($sp) +/* CF8314 802407A4 8FB00010 */ lw $s0, 0x10($sp) +/* CF8318 802407A8 24020002 */ addiu $v0, $zero, 2 +/* CF831C 802407AC 03E00008 */ jr $ra +/* CF8320 802407B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC.s deleted file mode 100644 index 1503343ab1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ACC -/* CF863C 80240ACC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF8640 80240AD0 3C03800A */ lui $v1, 0x800a -/* CF8644 80240AD4 8463A634 */ lh $v1, -0x59cc($v1) -/* CF8648 80240AD8 3C05800B */ lui $a1, %hi(gCameras) -/* CF864C 80240ADC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* CF8650 80240AE0 AFBF0010 */ sw $ra, 0x10($sp) -/* CF8654 80240AE4 00031080 */ sll $v0, $v1, 2 -/* CF8658 80240AE8 00431021 */ addu $v0, $v0, $v1 -/* CF865C 80240AEC 00021080 */ sll $v0, $v0, 2 -/* CF8660 80240AF0 00431023 */ subu $v0, $v0, $v1 -/* CF8664 80240AF4 000218C0 */ sll $v1, $v0, 3 -/* CF8668 80240AF8 00431021 */ addu $v0, $v0, $v1 -/* CF866C 80240AFC 8C830020 */ lw $v1, 0x20($a0) -/* CF8670 80240B00 000210C0 */ sll $v0, $v0, 3 -/* CF8674 80240B04 8C630000 */ lw $v1, ($v1) -/* CF8678 80240B08 30630001 */ andi $v1, $v1, 1 -/* CF867C 80240B0C 10600004 */ beqz $v1, .L80240B20 -/* CF8680 80240B10 00451021 */ addu $v0, $v0, $a1 -/* CF8684 80240B14 C44C006C */ lwc1 $f12, 0x6c($v0) -/* CF8688 80240B18 0C00A6C9 */ jal clamp_angle -/* CF868C 80240B1C 46006307 */ neg.s $f12, $f12 -.L80240B20: -/* CF8690 80240B20 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8694 80240B24 03E00008 */ jr $ra -/* CF8698 80240B28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s new file mode 100644 index 0000000000..d35f41fc70 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240ACC_CF863C.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240ACC_CF863C +/* CF863C 80240ACC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CF8640 80240AD0 3C03800A */ lui $v1, 0x800a +/* CF8644 80240AD4 8463A634 */ lh $v1, -0x59cc($v1) +/* CF8648 80240AD8 3C05800B */ lui $a1, %hi(gCameras) +/* CF864C 80240ADC 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* CF8650 80240AE0 AFBF0010 */ sw $ra, 0x10($sp) +/* CF8654 80240AE4 00031080 */ sll $v0, $v1, 2 +/* CF8658 80240AE8 00431021 */ addu $v0, $v0, $v1 +/* CF865C 80240AEC 00021080 */ sll $v0, $v0, 2 +/* CF8660 80240AF0 00431023 */ subu $v0, $v0, $v1 +/* CF8664 80240AF4 000218C0 */ sll $v1, $v0, 3 +/* CF8668 80240AF8 00431021 */ addu $v0, $v0, $v1 +/* CF866C 80240AFC 8C830020 */ lw $v1, 0x20($a0) +/* CF8670 80240B00 000210C0 */ sll $v0, $v0, 3 +/* CF8674 80240B04 8C630000 */ lw $v1, ($v1) +/* CF8678 80240B08 30630001 */ andi $v1, $v1, 1 +/* CF867C 80240B0C 10600004 */ beqz $v1, .L80240B20 +/* CF8680 80240B10 00451021 */ addu $v0, $v0, $a1 +/* CF8684 80240B14 C44C006C */ lwc1 $f12, 0x6c($v0) +/* CF8688 80240B18 0C00A6C9 */ jal clamp_angle +/* CF868C 80240B1C 46006307 */ neg.s $f12, $f12 +.L80240B20: +/* CF8690 80240B20 8FBF0010 */ lw $ra, 0x10($sp) +/* CF8694 80240B24 03E00008 */ jr $ra +/* CF8698 80240B28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088.s deleted file mode 100644 index 97a110a41a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241088 -/* CF8BF8 80241088 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF8BFC 8024108C 10A0000B */ beqz $a1, .L802410BC -/* CF8C00 80241090 AFBF0010 */ sw $ra, 0x10($sp) -/* CF8C04 80241094 3C038025 */ lui $v1, 0x8025 -/* CF8C08 80241098 8C63DF1C */ lw $v1, -0x20e4($v1) -/* CF8C0C 8024109C 8C620000 */ lw $v0, ($v1) -/* CF8C10 802410A0 3C048025 */ lui $a0, 0x8025 -/* CF8C14 802410A4 8C84DF20 */ lw $a0, -0x20e0($a0) -/* CF8C18 802410A8 34420010 */ ori $v0, $v0, 0x10 -/* CF8C1C 802410AC AC620000 */ sw $v0, ($v1) -/* CF8C20 802410B0 8C820000 */ lw $v0, ($a0) -/* CF8C24 802410B4 34420010 */ ori $v0, $v0, 0x10 -/* CF8C28 802410B8 AC820000 */ sw $v0, ($a0) -.L802410BC: -/* CF8C2C 802410BC 3C048025 */ lui $a0, 0x8025 -/* CF8C30 802410C0 8C84DF18 */ lw $a0, -0x20e8($a0) -/* CF8C34 802410C4 8C85000C */ lw $a1, 0xc($a0) -/* CF8C38 802410C8 8CA20018 */ lw $v0, 0x18($a1) -/* CF8C3C 802410CC 8CA30020 */ lw $v1, 0x20($a1) -/* CF8C40 802410D0 2442FFF6 */ addiu $v0, $v0, -0xa -/* CF8C44 802410D4 ACA20018 */ sw $v0, 0x18($a1) -/* CF8C48 802410D8 8CA20024 */ lw $v0, 0x24($a1) -/* CF8C4C 802410DC 2463FFF6 */ addiu $v1, $v1, -0xa -/* CF8C50 802410E0 ACA30020 */ sw $v1, 0x20($a1) -/* CF8C54 802410E4 8CA30028 */ lw $v1, 0x28($a1) -/* CF8C58 802410E8 2442FFF6 */ addiu $v0, $v0, -0xa -/* CF8C5C 802410EC ACA20024 */ sw $v0, 0x24($a1) -/* CF8C60 802410F0 8CA2001C */ lw $v0, 0x1c($a1) -/* CF8C64 802410F4 2463FFF6 */ addiu $v1, $v1, -0xa -/* CF8C68 802410F8 ACA30028 */ sw $v1, 0x28($a1) -/* CF8C6C 802410FC 8CA30018 */ lw $v1, 0x18($a1) -/* CF8C70 80241100 2442FFF6 */ addiu $v0, $v0, -0xa -/* CF8C74 80241104 18600003 */ blez $v1, .L80241114 -/* CF8C78 80241108 ACA2001C */ sw $v0, 0x1c($a1) -/* CF8C7C 8024110C 0809044C */ j .L80241130 -/* CF8C80 80241110 0000102D */ daddu $v0, $zero, $zero -.L80241114: -/* CF8C84 80241114 0C016914 */ jal remove_effect -/* CF8C88 80241118 ACA00018 */ sw $zero, 0x18($a1) -/* CF8C8C 8024111C 3C048025 */ lui $a0, 0x8025 -/* CF8C90 80241120 8C84DEF8 */ lw $a0, -0x2108($a0) -/* CF8C94 80241124 0C048D70 */ jal func_801235C0 -/* CF8C98 80241128 00000000 */ nop -/* CF8C9C 8024112C 24020002 */ addiu $v0, $zero, 2 -.L80241130: -/* CF8CA0 80241130 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8CA4 80241134 03E00008 */ jr $ra -/* CF8CA8 80241138 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s new file mode 100644 index 0000000000..91e0fb86a6 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241088_CF8BF8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241088_CF8BF8 +/* CF8BF8 80241088 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CF8BFC 8024108C 10A0000B */ beqz $a1, .L802410BC +/* CF8C00 80241090 AFBF0010 */ sw $ra, 0x10($sp) +/* CF8C04 80241094 3C038025 */ lui $v1, 0x8025 +/* CF8C08 80241098 8C63DF1C */ lw $v1, -0x20e4($v1) +/* CF8C0C 8024109C 8C620000 */ lw $v0, ($v1) +/* CF8C10 802410A0 3C048025 */ lui $a0, 0x8025 +/* CF8C14 802410A4 8C84DF20 */ lw $a0, -0x20e0($a0) +/* CF8C18 802410A8 34420010 */ ori $v0, $v0, 0x10 +/* CF8C1C 802410AC AC620000 */ sw $v0, ($v1) +/* CF8C20 802410B0 8C820000 */ lw $v0, ($a0) +/* CF8C24 802410B4 34420010 */ ori $v0, $v0, 0x10 +/* CF8C28 802410B8 AC820000 */ sw $v0, ($a0) +.L802410BC: +/* CF8C2C 802410BC 3C048025 */ lui $a0, 0x8025 +/* CF8C30 802410C0 8C84DF18 */ lw $a0, -0x20e8($a0) +/* CF8C34 802410C4 8C85000C */ lw $a1, 0xc($a0) +/* CF8C38 802410C8 8CA20018 */ lw $v0, 0x18($a1) +/* CF8C3C 802410CC 8CA30020 */ lw $v1, 0x20($a1) +/* CF8C40 802410D0 2442FFF6 */ addiu $v0, $v0, -0xa +/* CF8C44 802410D4 ACA20018 */ sw $v0, 0x18($a1) +/* CF8C48 802410D8 8CA20024 */ lw $v0, 0x24($a1) +/* CF8C4C 802410DC 2463FFF6 */ addiu $v1, $v1, -0xa +/* CF8C50 802410E0 ACA30020 */ sw $v1, 0x20($a1) +/* CF8C54 802410E4 8CA30028 */ lw $v1, 0x28($a1) +/* CF8C58 802410E8 2442FFF6 */ addiu $v0, $v0, -0xa +/* CF8C5C 802410EC ACA20024 */ sw $v0, 0x24($a1) +/* CF8C60 802410F0 8CA2001C */ lw $v0, 0x1c($a1) +/* CF8C64 802410F4 2463FFF6 */ addiu $v1, $v1, -0xa +/* CF8C68 802410F8 ACA30028 */ sw $v1, 0x28($a1) +/* CF8C6C 802410FC 8CA30018 */ lw $v1, 0x18($a1) +/* CF8C70 80241100 2442FFF6 */ addiu $v0, $v0, -0xa +/* CF8C74 80241104 18600003 */ blez $v1, .L80241114 +/* CF8C78 80241108 ACA2001C */ sw $v0, 0x1c($a1) +/* CF8C7C 8024110C 0809044C */ j .L80241130 +/* CF8C80 80241110 0000102D */ daddu $v0, $zero, $zero +.L80241114: +/* CF8C84 80241114 0C016914 */ jal remove_effect +/* CF8C88 80241118 ACA00018 */ sw $zero, 0x18($a1) +/* CF8C8C 8024111C 3C048025 */ lui $a0, 0x8025 +/* CF8C90 80241120 8C84DEF8 */ lw $a0, -0x2108($a0) +/* CF8C94 80241124 0C048D70 */ jal func_801235C0 +/* CF8C98 80241128 00000000 */ nop +/* CF8C9C 8024112C 24020002 */ addiu $v0, $zero, 2 +.L80241130: +/* CF8CA0 80241130 8FBF0010 */ lw $ra, 0x10($sp) +/* CF8CA4 80241134 03E00008 */ jr $ra +/* CF8CA8 80241138 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208.s deleted file mode 100644 index 917c05f833..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241208 -/* CF8D78 80241208 3C028025 */ lui $v0, 0x8025 -/* CF8D7C 8024120C 8C42DF20 */ lw $v0, -0x20e0($v0) -/* CF8D80 80241210 8C43000C */ lw $v1, 0xc($v0) -/* CF8D84 80241214 24020001 */ addiu $v0, $zero, 1 -/* CF8D88 80241218 AC62001C */ sw $v0, 0x1c($v1) -/* CF8D8C 8024121C 03E00008 */ jr $ra -/* CF8D90 80241220 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208_CF8D78.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208_CF8D78.s new file mode 100644 index 0000000000..e5d3c23a88 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241208_CF8D78.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241208_CF8D78 +/* CF8D78 80241208 3C028025 */ lui $v0, 0x8025 +/* CF8D7C 8024120C 8C42DF20 */ lw $v0, -0x20e0($v0) +/* CF8D80 80241210 8C43000C */ lw $v1, 0xc($v0) +/* CF8D84 80241214 24020001 */ addiu $v0, $zero, 1 +/* CF8D88 80241218 AC62001C */ sw $v0, 0x1c($v1) +/* CF8D8C 8024121C 03E00008 */ jr $ra +/* CF8D90 80241220 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C.s deleted file mode 100644 index 82afd203f3..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024123C -/* CF8DAC 8024123C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF8DB0 80241240 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* CF8DB4 80241244 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* CF8DB8 80241248 3C05FE36 */ lui $a1, 0xfe36 -/* CF8DBC 8024124C AFBF0010 */ sw $ra, 0x10($sp) -/* CF8DC0 80241250 80460075 */ lb $a2, 0x75($v0) -/* CF8DC4 80241254 0C0B2026 */ jal set_variable -/* CF8DC8 80241258 34A53C80 */ ori $a1, $a1, 0x3c80 -/* CF8DCC 8024125C 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8DD0 80241260 24020002 */ addiu $v0, $zero, 2 -/* CF8DD4 80241264 03E00008 */ jr $ra -/* CF8DD8 80241268 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s new file mode 100644 index 0000000000..ab47e3b9d1 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024123C_CF8DAC +/* CF8DAC 8024123C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CF8DB0 80241240 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* CF8DB4 80241244 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* CF8DB8 80241248 3C05FE36 */ lui $a1, 0xfe36 +/* CF8DBC 8024124C AFBF0010 */ sw $ra, 0x10($sp) +/* CF8DC0 80241250 80460075 */ lb $a2, 0x75($v0) +/* CF8DC4 80241254 0C0B2026 */ jal set_variable +/* CF8DC8 80241258 34A53C80 */ ori $a1, $a1, 0x3c80 +/* CF8DCC 8024125C 8FBF0010 */ lw $ra, 0x10($sp) +/* CF8DD0 80241260 24020002 */ addiu $v0, $zero, 2 +/* CF8DD4 80241264 03E00008 */ jr $ra +/* CF8DD8 80241268 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380.s deleted file mode 100644 index 6a9a03cbd0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241380 -/* CF8EF0 80241380 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CF8EF4 80241384 AFB20018 */ sw $s2, 0x18($sp) -/* CF8EF8 80241388 0080902D */ daddu $s2, $a0, $zero -/* CF8EFC 8024138C AFBF0030 */ sw $ra, 0x30($sp) -/* CF8F00 80241390 AFB7002C */ sw $s7, 0x2c($sp) -/* CF8F04 80241394 AFB60028 */ sw $s6, 0x28($sp) -/* CF8F08 80241398 AFB50024 */ sw $s5, 0x24($sp) -/* CF8F0C 8024139C AFB40020 */ sw $s4, 0x20($sp) -/* CF8F10 802413A0 AFB3001C */ sw $s3, 0x1c($sp) -/* CF8F14 802413A4 AFB10014 */ sw $s1, 0x14($sp) -/* CF8F18 802413A8 AFB00010 */ sw $s0, 0x10($sp) -/* CF8F1C 802413AC F7B60040 */ sdc1 $f22, 0x40($sp) -/* CF8F20 802413B0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* CF8F24 802413B4 8E50000C */ lw $s0, 0xc($s2) -/* CF8F28 802413B8 8E050000 */ lw $a1, ($s0) -/* CF8F2C 802413BC 0C0B1EAF */ jal get_variable -/* CF8F30 802413C0 26100004 */ addiu $s0, $s0, 4 -/* CF8F34 802413C4 8E050000 */ lw $a1, ($s0) -/* CF8F38 802413C8 26100004 */ addiu $s0, $s0, 4 -/* CF8F3C 802413CC 0240202D */ daddu $a0, $s2, $zero -/* CF8F40 802413D0 0C0B1EAF */ jal get_variable -/* CF8F44 802413D4 0040B82D */ daddu $s7, $v0, $zero -/* CF8F48 802413D8 8E050000 */ lw $a1, ($s0) -/* CF8F4C 802413DC 26100004 */ addiu $s0, $s0, 4 -/* CF8F50 802413E0 0240202D */ daddu $a0, $s2, $zero -/* CF8F54 802413E4 0C0B1EAF */ jal get_variable -/* CF8F58 802413E8 0040B02D */ daddu $s6, $v0, $zero -/* CF8F5C 802413EC 0240202D */ daddu $a0, $s2, $zero -/* CF8F60 802413F0 3C05F4AC */ lui $a1, 0xf4ac -/* CF8F64 802413F4 34A5D481 */ ori $a1, $a1, 0xd481 -/* CF8F68 802413F8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* CF8F6C 802413FC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* CF8F70 80241400 8E140000 */ lw $s4, ($s0) -/* CF8F74 80241404 00061880 */ sll $v1, $a2, 2 -/* CF8F78 80241408 00661821 */ addu $v1, $v1, $a2 -/* CF8F7C 8024140C 00031880 */ sll $v1, $v1, 2 -/* CF8F80 80241410 00661823 */ subu $v1, $v1, $a2 -/* CF8F84 80241414 000330C0 */ sll $a2, $v1, 3 -/* CF8F88 80241418 00661821 */ addu $v1, $v1, $a2 -/* CF8F8C 8024141C 000318C0 */ sll $v1, $v1, 3 -/* CF8F90 80241420 3C01800B */ lui $at, 0x800b -/* CF8F94 80241424 00230821 */ addu $at, $at, $v1 -/* CF8F98 80241428 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* CF8F9C 8024142C 8E150004 */ lw $s5, 4($s0) -/* CF8FA0 80241430 4600010D */ trunc.w.s $f4, $f0 -/* CF8FA4 80241434 44112000 */ mfc1 $s1, $f4 -/* CF8FA8 80241438 0C0B1EAF */ jal get_variable -/* CF8FAC 8024143C 0040982D */ daddu $s3, $v0, $zero -/* CF8FB0 80241440 4491B000 */ mtc1 $s1, $f22 -/* CF8FB4 80241444 00000000 */ nop -/* CF8FB8 80241448 4680B5A0 */ cvt.s.w $f22, $f22 -/* CF8FBC 8024144C 4600B306 */ mov.s $f12, $f22 -/* CF8FC0 80241450 0C00A8D4 */ jal cos_deg -/* CF8FC4 80241454 0040802D */ daddu $s0, $v0, $zero -/* CF8FC8 80241458 4493A000 */ mtc1 $s3, $f20 -/* CF8FCC 8024145C 00000000 */ nop -/* CF8FD0 80241460 4680A520 */ cvt.s.w $f20, $f20 -/* CF8FD4 80241464 4600A002 */ mul.s $f0, $f20, $f0 -/* CF8FD8 80241468 00000000 */ nop -/* CF8FDC 8024146C 0240202D */ daddu $a0, $s2, $zero -/* CF8FE0 80241470 44901000 */ mtc1 $s0, $f2 -/* CF8FE4 80241474 00000000 */ nop -/* CF8FE8 80241478 468010A0 */ cvt.s.w $f2, $f2 -/* CF8FEC 8024147C 46001081 */ sub.s $f2, $f2, $f0 -/* CF8FF0 80241480 3C05F4AC */ lui $a1, 0xf4ac -/* CF8FF4 80241484 4600110D */ trunc.w.s $f4, $f2 -/* CF8FF8 80241488 44102000 */ mfc1 $s0, $f4 -/* CF8FFC 8024148C 0C0B1EAF */ jal get_variable -/* CF9000 80241490 34A5D483 */ ori $a1, $a1, 0xd483 -/* CF9004 80241494 4600B306 */ mov.s $f12, $f22 -/* CF9008 80241498 0C00A8BB */ jal sin_deg -/* CF900C 8024149C 0040882D */ daddu $s1, $v0, $zero -/* CF9010 802414A0 4600A502 */ mul.s $f20, $f20, $f0 -/* CF9014 802414A4 00000000 */ nop -/* CF9018 802414A8 0240202D */ daddu $a0, $s2, $zero -/* CF901C 802414AC 44910000 */ mtc1 $s1, $f0 -/* CF9020 802414B0 00000000 */ nop -/* CF9024 802414B4 46800020 */ cvt.s.w $f0, $f0 -/* CF9028 802414B8 46140001 */ sub.s $f0, $f0, $f20 -/* CF902C 802414BC 0280282D */ daddu $a1, $s4, $zero -/* CF9030 802414C0 02173023 */ subu $a2, $s0, $s7 -/* CF9034 802414C4 4600010D */ trunc.w.s $f4, $f0 -/* CF9038 802414C8 44102000 */ mfc1 $s0, $f4 -/* CF903C 802414CC 0C0B2026 */ jal set_variable -/* CF9040 802414D0 02168023 */ subu $s0, $s0, $s6 -/* CF9044 802414D4 0240202D */ daddu $a0, $s2, $zero -/* CF9048 802414D8 02A0282D */ daddu $a1, $s5, $zero -/* CF904C 802414DC 0C0B2026 */ jal set_variable -/* CF9050 802414E0 0200302D */ daddu $a2, $s0, $zero -/* CF9054 802414E4 8FBF0030 */ lw $ra, 0x30($sp) -/* CF9058 802414E8 8FB7002C */ lw $s7, 0x2c($sp) -/* CF905C 802414EC 8FB60028 */ lw $s6, 0x28($sp) -/* CF9060 802414F0 8FB50024 */ lw $s5, 0x24($sp) -/* CF9064 802414F4 8FB40020 */ lw $s4, 0x20($sp) -/* CF9068 802414F8 8FB3001C */ lw $s3, 0x1c($sp) -/* CF906C 802414FC 8FB20018 */ lw $s2, 0x18($sp) -/* CF9070 80241500 8FB10014 */ lw $s1, 0x14($sp) -/* CF9074 80241504 8FB00010 */ lw $s0, 0x10($sp) -/* CF9078 80241508 D7B60040 */ ldc1 $f22, 0x40($sp) -/* CF907C 8024150C D7B40038 */ ldc1 $f20, 0x38($sp) -/* CF9080 80241510 24020002 */ addiu $v0, $zero, 2 -/* CF9084 80241514 03E00008 */ jr $ra -/* CF9088 80241518 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s new file mode 100644 index 0000000000..366f4cab7e --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s @@ -0,0 +1,107 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241380_CF8EF0 +/* CF8EF0 80241380 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* CF8EF4 80241384 AFB20018 */ sw $s2, 0x18($sp) +/* CF8EF8 80241388 0080902D */ daddu $s2, $a0, $zero +/* CF8EFC 8024138C AFBF0030 */ sw $ra, 0x30($sp) +/* CF8F00 80241390 AFB7002C */ sw $s7, 0x2c($sp) +/* CF8F04 80241394 AFB60028 */ sw $s6, 0x28($sp) +/* CF8F08 80241398 AFB50024 */ sw $s5, 0x24($sp) +/* CF8F0C 8024139C AFB40020 */ sw $s4, 0x20($sp) +/* CF8F10 802413A0 AFB3001C */ sw $s3, 0x1c($sp) +/* CF8F14 802413A4 AFB10014 */ sw $s1, 0x14($sp) +/* CF8F18 802413A8 AFB00010 */ sw $s0, 0x10($sp) +/* CF8F1C 802413AC F7B60040 */ sdc1 $f22, 0x40($sp) +/* CF8F20 802413B0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* CF8F24 802413B4 8E50000C */ lw $s0, 0xc($s2) +/* CF8F28 802413B8 8E050000 */ lw $a1, ($s0) +/* CF8F2C 802413BC 0C0B1EAF */ jal get_variable +/* CF8F30 802413C0 26100004 */ addiu $s0, $s0, 4 +/* CF8F34 802413C4 8E050000 */ lw $a1, ($s0) +/* CF8F38 802413C8 26100004 */ addiu $s0, $s0, 4 +/* CF8F3C 802413CC 0240202D */ daddu $a0, $s2, $zero +/* CF8F40 802413D0 0C0B1EAF */ jal get_variable +/* CF8F44 802413D4 0040B82D */ daddu $s7, $v0, $zero +/* CF8F48 802413D8 8E050000 */ lw $a1, ($s0) +/* CF8F4C 802413DC 26100004 */ addiu $s0, $s0, 4 +/* CF8F50 802413E0 0240202D */ daddu $a0, $s2, $zero +/* CF8F54 802413E4 0C0B1EAF */ jal get_variable +/* CF8F58 802413E8 0040B02D */ daddu $s6, $v0, $zero +/* CF8F5C 802413EC 0240202D */ daddu $a0, $s2, $zero +/* CF8F60 802413F0 3C05F4AC */ lui $a1, 0xf4ac +/* CF8F64 802413F4 34A5D481 */ ori $a1, $a1, 0xd481 +/* CF8F68 802413F8 3C068007 */ lui $a2, %hi(gCurrentCameraID) +/* CF8F6C 802413FC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) +/* CF8F70 80241400 8E140000 */ lw $s4, ($s0) +/* CF8F74 80241404 00061880 */ sll $v1, $a2, 2 +/* CF8F78 80241408 00661821 */ addu $v1, $v1, $a2 +/* CF8F7C 8024140C 00031880 */ sll $v1, $v1, 2 +/* CF8F80 80241410 00661823 */ subu $v1, $v1, $a2 +/* CF8F84 80241414 000330C0 */ sll $a2, $v1, 3 +/* CF8F88 80241418 00661821 */ addu $v1, $v1, $a2 +/* CF8F8C 8024141C 000318C0 */ sll $v1, $v1, 3 +/* CF8F90 80241420 3C01800B */ lui $at, 0x800b +/* CF8F94 80241424 00230821 */ addu $at, $at, $v1 +/* CF8F98 80241428 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* CF8F9C 8024142C 8E150004 */ lw $s5, 4($s0) +/* CF8FA0 80241430 4600010D */ trunc.w.s $f4, $f0 +/* CF8FA4 80241434 44112000 */ mfc1 $s1, $f4 +/* CF8FA8 80241438 0C0B1EAF */ jal get_variable +/* CF8FAC 8024143C 0040982D */ daddu $s3, $v0, $zero +/* CF8FB0 80241440 4491B000 */ mtc1 $s1, $f22 +/* CF8FB4 80241444 00000000 */ nop +/* CF8FB8 80241448 4680B5A0 */ cvt.s.w $f22, $f22 +/* CF8FBC 8024144C 4600B306 */ mov.s $f12, $f22 +/* CF8FC0 80241450 0C00A8D4 */ jal cos_deg +/* CF8FC4 80241454 0040802D */ daddu $s0, $v0, $zero +/* CF8FC8 80241458 4493A000 */ mtc1 $s3, $f20 +/* CF8FCC 8024145C 00000000 */ nop +/* CF8FD0 80241460 4680A520 */ cvt.s.w $f20, $f20 +/* CF8FD4 80241464 4600A002 */ mul.s $f0, $f20, $f0 +/* CF8FD8 80241468 00000000 */ nop +/* CF8FDC 8024146C 0240202D */ daddu $a0, $s2, $zero +/* CF8FE0 80241470 44901000 */ mtc1 $s0, $f2 +/* CF8FE4 80241474 00000000 */ nop +/* CF8FE8 80241478 468010A0 */ cvt.s.w $f2, $f2 +/* CF8FEC 8024147C 46001081 */ sub.s $f2, $f2, $f0 +/* CF8FF0 80241480 3C05F4AC */ lui $a1, 0xf4ac +/* CF8FF4 80241484 4600110D */ trunc.w.s $f4, $f2 +/* CF8FF8 80241488 44102000 */ mfc1 $s0, $f4 +/* CF8FFC 8024148C 0C0B1EAF */ jal get_variable +/* CF9000 80241490 34A5D483 */ ori $a1, $a1, 0xd483 +/* CF9004 80241494 4600B306 */ mov.s $f12, $f22 +/* CF9008 80241498 0C00A8BB */ jal sin_deg +/* CF900C 8024149C 0040882D */ daddu $s1, $v0, $zero +/* CF9010 802414A0 4600A502 */ mul.s $f20, $f20, $f0 +/* CF9014 802414A4 00000000 */ nop +/* CF9018 802414A8 0240202D */ daddu $a0, $s2, $zero +/* CF901C 802414AC 44910000 */ mtc1 $s1, $f0 +/* CF9020 802414B0 00000000 */ nop +/* CF9024 802414B4 46800020 */ cvt.s.w $f0, $f0 +/* CF9028 802414B8 46140001 */ sub.s $f0, $f0, $f20 +/* CF902C 802414BC 0280282D */ daddu $a1, $s4, $zero +/* CF9030 802414C0 02173023 */ subu $a2, $s0, $s7 +/* CF9034 802414C4 4600010D */ trunc.w.s $f4, $f0 +/* CF9038 802414C8 44102000 */ mfc1 $s0, $f4 +/* CF903C 802414CC 0C0B2026 */ jal set_variable +/* CF9040 802414D0 02168023 */ subu $s0, $s0, $s6 +/* CF9044 802414D4 0240202D */ daddu $a0, $s2, $zero +/* CF9048 802414D8 02A0282D */ daddu $a1, $s5, $zero +/* CF904C 802414DC 0C0B2026 */ jal set_variable +/* CF9050 802414E0 0200302D */ daddu $a2, $s0, $zero +/* CF9054 802414E4 8FBF0030 */ lw $ra, 0x30($sp) +/* CF9058 802414E8 8FB7002C */ lw $s7, 0x2c($sp) +/* CF905C 802414EC 8FB60028 */ lw $s6, 0x28($sp) +/* CF9060 802414F0 8FB50024 */ lw $s5, 0x24($sp) +/* CF9064 802414F4 8FB40020 */ lw $s4, 0x20($sp) +/* CF9068 802414F8 8FB3001C */ lw $s3, 0x1c($sp) +/* CF906C 802414FC 8FB20018 */ lw $s2, 0x18($sp) +/* CF9070 80241500 8FB10014 */ lw $s1, 0x14($sp) +/* CF9074 80241504 8FB00010 */ lw $s0, 0x10($sp) +/* CF9078 80241508 D7B60040 */ ldc1 $f22, 0x40($sp) +/* CF907C 8024150C D7B40038 */ ldc1 $f20, 0x38($sp) +/* CF9080 80241510 24020002 */ addiu $v0, $zero, 2 +/* CF9084 80241514 03E00008 */ jr $ra +/* CF9088 80241518 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241794.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241794.s deleted file mode 100644 index 25df6bdf0a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241794.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241794 -/* CF9304 80241794 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF9308 80241798 AFB10014 */ sw $s1, 0x14($sp) -/* CF930C 8024179C 0080882D */ daddu $s1, $a0, $zero -/* CF9310 802417A0 AFBF0018 */ sw $ra, 0x18($sp) -/* CF9314 802417A4 AFB00010 */ sw $s0, 0x10($sp) -/* CF9318 802417A8 8E30000C */ lw $s0, 0xc($s1) -/* CF931C 802417AC 8E050000 */ lw $a1, ($s0) -/* CF9320 802417B0 0C0B1EAF */ jal get_variable -/* CF9324 802417B4 26100004 */ addiu $s0, $s0, 4 -/* CF9328 802417B8 AE22008C */ sw $v0, 0x8c($s1) -/* CF932C 802417BC 8E050000 */ lw $a1, ($s0) -/* CF9330 802417C0 26100004 */ addiu $s0, $s0, 4 -/* CF9334 802417C4 0C0B1EAF */ jal get_variable -/* CF9338 802417C8 0220202D */ daddu $a0, $s1, $zero -/* CF933C 802417CC AE220090 */ sw $v0, 0x90($s1) -/* CF9340 802417D0 8E050000 */ lw $a1, ($s0) -/* CF9344 802417D4 26100004 */ addiu $s0, $s0, 4 -/* CF9348 802417D8 0C0B1EAF */ jal get_variable -/* CF934C 802417DC 0220202D */ daddu $a0, $s1, $zero -/* CF9350 802417E0 AE220094 */ sw $v0, 0x94($s1) -/* CF9354 802417E4 8E050000 */ lw $a1, ($s0) -/* CF9358 802417E8 26100004 */ addiu $s0, $s0, 4 -/* CF935C 802417EC 0C0B1EAF */ jal get_variable -/* CF9360 802417F0 0220202D */ daddu $a0, $s1, $zero -/* CF9364 802417F4 AE220098 */ sw $v0, 0x98($s1) -/* CF9368 802417F8 8E050000 */ lw $a1, ($s0) -/* CF936C 802417FC 26100004 */ addiu $s0, $s0, 4 -/* CF9370 80241800 0C0B1EAF */ jal get_variable -/* CF9374 80241804 0220202D */ daddu $a0, $s1, $zero -/* CF9378 80241808 AE22009C */ sw $v0, 0x9c($s1) -/* CF937C 8024180C 8E050000 */ lw $a1, ($s0) -/* CF9380 80241810 26100004 */ addiu $s0, $s0, 4 -/* CF9384 80241814 0C0B1EAF */ jal get_variable -/* CF9388 80241818 0220202D */ daddu $a0, $s1, $zero -/* CF938C 8024181C AE2200A0 */ sw $v0, 0xa0($s1) -/* CF9390 80241820 8E050000 */ lw $a1, ($s0) -/* CF9394 80241824 26100004 */ addiu $s0, $s0, 4 -/* CF9398 80241828 0C0B1EAF */ jal get_variable -/* CF939C 8024182C 0220202D */ daddu $a0, $s1, $zero -/* CF93A0 80241830 AE2200A4 */ sw $v0, 0xa4($s1) -/* CF93A4 80241834 8E050000 */ lw $a1, ($s0) -/* CF93A8 80241838 26100004 */ addiu $s0, $s0, 4 -/* CF93AC 8024183C 0C0B1EAF */ jal get_variable -/* CF93B0 80241840 0220202D */ daddu $a0, $s1, $zero -/* CF93B4 80241844 AE2200A8 */ sw $v0, 0xa8($s1) -/* CF93B8 80241848 8E050000 */ lw $a1, ($s0) -/* CF93BC 8024184C 26100004 */ addiu $s0, $s0, 4 -/* CF93C0 80241850 0C0B1EAF */ jal get_variable -/* CF93C4 80241854 0220202D */ daddu $a0, $s1, $zero -/* CF93C8 80241858 AE2200AC */ sw $v0, 0xac($s1) -/* CF93CC 8024185C 8E050000 */ lw $a1, ($s0) -/* CF93D0 80241860 0C0B1EAF */ jal get_variable -/* CF93D4 80241864 0220202D */ daddu $a0, $s1, $zero -/* CF93D8 80241868 AE2200B0 */ sw $v0, 0xb0($s1) -/* CF93DC 8024186C 8FBF0018 */ lw $ra, 0x18($sp) -/* CF93E0 80241870 8FB10014 */ lw $s1, 0x14($sp) -/* CF93E4 80241874 8FB00010 */ lw $s0, 0x10($sp) -/* CF93E8 80241878 24020002 */ addiu $v0, $zero, 2 -/* CF93EC 8024187C 03E00008 */ jr $ra -/* CF93F0 80241880 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241794_CF9304.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241794_CF9304.s new file mode 100644 index 0000000000..5b45117350 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241794_CF9304.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241794_CF9304 +/* CF9304 80241794 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* CF9308 80241798 AFB10014 */ sw $s1, 0x14($sp) +/* CF930C 8024179C 0080882D */ daddu $s1, $a0, $zero +/* CF9310 802417A0 AFBF0018 */ sw $ra, 0x18($sp) +/* CF9314 802417A4 AFB00010 */ sw $s0, 0x10($sp) +/* CF9318 802417A8 8E30000C */ lw $s0, 0xc($s1) +/* CF931C 802417AC 8E050000 */ lw $a1, ($s0) +/* CF9320 802417B0 0C0B1EAF */ jal get_variable +/* CF9324 802417B4 26100004 */ addiu $s0, $s0, 4 +/* CF9328 802417B8 AE22008C */ sw $v0, 0x8c($s1) +/* CF932C 802417BC 8E050000 */ lw $a1, ($s0) +/* CF9330 802417C0 26100004 */ addiu $s0, $s0, 4 +/* CF9334 802417C4 0C0B1EAF */ jal get_variable +/* CF9338 802417C8 0220202D */ daddu $a0, $s1, $zero +/* CF933C 802417CC AE220090 */ sw $v0, 0x90($s1) +/* CF9340 802417D0 8E050000 */ lw $a1, ($s0) +/* CF9344 802417D4 26100004 */ addiu $s0, $s0, 4 +/* CF9348 802417D8 0C0B1EAF */ jal get_variable +/* CF934C 802417DC 0220202D */ daddu $a0, $s1, $zero +/* CF9350 802417E0 AE220094 */ sw $v0, 0x94($s1) +/* CF9354 802417E4 8E050000 */ lw $a1, ($s0) +/* CF9358 802417E8 26100004 */ addiu $s0, $s0, 4 +/* CF935C 802417EC 0C0B1EAF */ jal get_variable +/* CF9360 802417F0 0220202D */ daddu $a0, $s1, $zero +/* CF9364 802417F4 AE220098 */ sw $v0, 0x98($s1) +/* CF9368 802417F8 8E050000 */ lw $a1, ($s0) +/* CF936C 802417FC 26100004 */ addiu $s0, $s0, 4 +/* CF9370 80241800 0C0B1EAF */ jal get_variable +/* CF9374 80241804 0220202D */ daddu $a0, $s1, $zero +/* CF9378 80241808 AE22009C */ sw $v0, 0x9c($s1) +/* CF937C 8024180C 8E050000 */ lw $a1, ($s0) +/* CF9380 80241810 26100004 */ addiu $s0, $s0, 4 +/* CF9384 80241814 0C0B1EAF */ jal get_variable +/* CF9388 80241818 0220202D */ daddu $a0, $s1, $zero +/* CF938C 8024181C AE2200A0 */ sw $v0, 0xa0($s1) +/* CF9390 80241820 8E050000 */ lw $a1, ($s0) +/* CF9394 80241824 26100004 */ addiu $s0, $s0, 4 +/* CF9398 80241828 0C0B1EAF */ jal get_variable +/* CF939C 8024182C 0220202D */ daddu $a0, $s1, $zero +/* CF93A0 80241830 AE2200A4 */ sw $v0, 0xa4($s1) +/* CF93A4 80241834 8E050000 */ lw $a1, ($s0) +/* CF93A8 80241838 26100004 */ addiu $s0, $s0, 4 +/* CF93AC 8024183C 0C0B1EAF */ jal get_variable +/* CF93B0 80241840 0220202D */ daddu $a0, $s1, $zero +/* CF93B4 80241844 AE2200A8 */ sw $v0, 0xa8($s1) +/* CF93B8 80241848 8E050000 */ lw $a1, ($s0) +/* CF93BC 8024184C 26100004 */ addiu $s0, $s0, 4 +/* CF93C0 80241850 0C0B1EAF */ jal get_variable +/* CF93C4 80241854 0220202D */ daddu $a0, $s1, $zero +/* CF93C8 80241858 AE2200AC */ sw $v0, 0xac($s1) +/* CF93CC 8024185C 8E050000 */ lw $a1, ($s0) +/* CF93D0 80241860 0C0B1EAF */ jal get_variable +/* CF93D4 80241864 0220202D */ daddu $a0, $s1, $zero +/* CF93D8 80241868 AE2200B0 */ sw $v0, 0xb0($s1) +/* CF93DC 8024186C 8FBF0018 */ lw $ra, 0x18($sp) +/* CF93E0 80241870 8FB10014 */ lw $s1, 0x14($sp) +/* CF93E4 80241874 8FB00010 */ lw $s0, 0x10($sp) +/* CF93E8 80241878 24020002 */ addiu $v0, $zero, 2 +/* CF93EC 8024187C 03E00008 */ jr $ra +/* CF93F0 80241880 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884.s deleted file mode 100644 index e95dc6695f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884.s +++ /dev/null @@ -1,103 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241884 -/* CF93F4 80241884 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CF93F8 80241888 AFB1001C */ sw $s1, 0x1c($sp) -/* CF93FC 8024188C 0080882D */ daddu $s1, $a0, $zero -/* CF9400 80241890 AFBF0034 */ sw $ra, 0x34($sp) -/* CF9404 80241894 AFB60030 */ sw $s6, 0x30($sp) -/* CF9408 80241898 AFB5002C */ sw $s5, 0x2c($sp) -/* CF940C 8024189C AFB40028 */ sw $s4, 0x28($sp) -/* CF9410 802418A0 AFB30024 */ sw $s3, 0x24($sp) -/* CF9414 802418A4 AFB20020 */ sw $s2, 0x20($sp) -/* CF9418 802418A8 AFB00018 */ sw $s0, 0x18($sp) -/* CF941C 802418AC F7B60040 */ sdc1 $f22, 0x40($sp) -/* CF9420 802418B0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* CF9424 802418B4 8E30000C */ lw $s0, 0xc($s1) -/* CF9428 802418B8 8E160000 */ lw $s6, ($s0) -/* CF942C 802418BC 26100004 */ addiu $s0, $s0, 4 -/* CF9430 802418C0 0C0B1EAF */ jal get_variable -/* CF9434 802418C4 02C0282D */ daddu $a1, $s6, $zero -/* CF9438 802418C8 44820000 */ mtc1 $v0, $f0 -/* CF943C 802418CC 00000000 */ nop -/* CF9440 802418D0 46800020 */ cvt.s.w $f0, $f0 -/* CF9444 802418D4 E7A00010 */ swc1 $f0, 0x10($sp) -/* CF9448 802418D8 8E140000 */ lw $s4, ($s0) -/* CF944C 802418DC 26100004 */ addiu $s0, $s0, 4 -/* CF9450 802418E0 0220202D */ daddu $a0, $s1, $zero -/* CF9454 802418E4 0C0B1EAF */ jal get_variable -/* CF9458 802418E8 0280282D */ daddu $a1, $s4, $zero -/* CF945C 802418EC 0220202D */ daddu $a0, $s1, $zero -/* CF9460 802418F0 8E150000 */ lw $s5, ($s0) -/* CF9464 802418F4 4482B000 */ mtc1 $v0, $f22 -/* CF9468 802418F8 00000000 */ nop -/* CF946C 802418FC 4680B5A0 */ cvt.s.w $f22, $f22 -/* CF9470 80241900 0C0B1EAF */ jal get_variable -/* CF9474 80241904 02A0282D */ daddu $a1, $s5, $zero -/* CF9478 80241908 2404FFFC */ addiu $a0, $zero, -4 -/* CF947C 8024190C 44820000 */ mtc1 $v0, $f0 -/* CF9480 80241910 00000000 */ nop -/* CF9484 80241914 46800020 */ cvt.s.w $f0, $f0 -/* CF9488 80241918 0C00EABB */ jal get_npc_unsafe -/* CF948C 8024191C E7A00014 */ swc1 $f0, 0x14($sp) -/* CF9490 80241920 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* CF9494 80241924 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* CF9498 80241928 3C014334 */ lui $at, 0x4334 -/* CF949C 8024192C 44816000 */ mtc1 $at, $f12 -/* CF94A0 80241930 00041880 */ sll $v1, $a0, 2 -/* CF94A4 80241934 00641821 */ addu $v1, $v1, $a0 -/* CF94A8 80241938 00031880 */ sll $v1, $v1, 2 -/* CF94AC 8024193C 00641823 */ subu $v1, $v1, $a0 -/* CF94B0 80241940 000320C0 */ sll $a0, $v1, 3 -/* CF94B4 80241944 00641821 */ addu $v1, $v1, $a0 -/* CF94B8 80241948 000318C0 */ sll $v1, $v1, 3 -/* CF94BC 8024194C 3C01800B */ lui $at, 0x800b -/* CF94C0 80241950 00230821 */ addu $at, $at, $v1 -/* CF94C4 80241954 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* CF94C8 80241958 460C0300 */ add.s $f12, $f0, $f12 -/* CF94CC 8024195C 0C00A6C9 */ jal clamp_angle -/* CF94D0 80241960 0040982D */ daddu $s3, $v0, $zero -/* CF94D4 80241964 27B00010 */ addiu $s0, $sp, 0x10 -/* CF94D8 80241968 0200202D */ daddu $a0, $s0, $zero -/* CF94DC 8024196C 27B20014 */ addiu $s2, $sp, 0x14 -/* CF94E0 80241970 0240282D */ daddu $a1, $s2, $zero -/* CF94E4 80241974 3C064170 */ lui $a2, 0x4170 -/* CF94E8 80241978 8E67000C */ lw $a3, 0xc($s3) -/* CF94EC 8024197C 0C00A7E7 */ jal add_vec2D_polar -/* CF94F0 80241980 46000506 */ mov.s $f20, $f0 -/* CF94F4 80241984 0200202D */ daddu $a0, $s0, $zero -/* CF94F8 80241988 3C064120 */ lui $a2, 0x4120 -/* CF94FC 8024198C 4407A000 */ mfc1 $a3, $f20 -/* CF9500 80241990 0C00A7E7 */ jal add_vec2D_polar -/* CF9504 80241994 0240282D */ daddu $a1, $s2, $zero -/* CF9508 80241998 0220202D */ daddu $a0, $s1, $zero -/* CF950C 8024199C C7A00010 */ lwc1 $f0, 0x10($sp) -/* CF9510 802419A0 4600008D */ trunc.w.s $f2, $f0 -/* CF9514 802419A4 44061000 */ mfc1 $a2, $f2 -/* CF9518 802419A8 0C0B2026 */ jal set_variable -/* CF951C 802419AC 02C0282D */ daddu $a1, $s6, $zero -/* CF9520 802419B0 0220202D */ daddu $a0, $s1, $zero -/* CF9524 802419B4 4600B08D */ trunc.w.s $f2, $f22 -/* CF9528 802419B8 44061000 */ mfc1 $a2, $f2 -/* CF952C 802419BC 0C0B2026 */ jal set_variable -/* CF9530 802419C0 0280282D */ daddu $a1, $s4, $zero -/* CF9534 802419C4 0220202D */ daddu $a0, $s1, $zero -/* CF9538 802419C8 C7A00014 */ lwc1 $f0, 0x14($sp) -/* CF953C 802419CC 4600008D */ trunc.w.s $f2, $f0 -/* CF9540 802419D0 44061000 */ mfc1 $a2, $f2 -/* CF9544 802419D4 0C0B2026 */ jal set_variable -/* CF9548 802419D8 02A0282D */ daddu $a1, $s5, $zero -/* CF954C 802419DC 8FBF0034 */ lw $ra, 0x34($sp) -/* CF9550 802419E0 8FB60030 */ lw $s6, 0x30($sp) -/* CF9554 802419E4 8FB5002C */ lw $s5, 0x2c($sp) -/* CF9558 802419E8 8FB40028 */ lw $s4, 0x28($sp) -/* CF955C 802419EC 8FB30024 */ lw $s3, 0x24($sp) -/* CF9560 802419F0 8FB20020 */ lw $s2, 0x20($sp) -/* CF9564 802419F4 8FB1001C */ lw $s1, 0x1c($sp) -/* CF9568 802419F8 8FB00018 */ lw $s0, 0x18($sp) -/* CF956C 802419FC D7B60040 */ ldc1 $f22, 0x40($sp) -/* CF9570 80241A00 D7B40038 */ ldc1 $f20, 0x38($sp) -/* CF9574 80241A04 24020002 */ addiu $v0, $zero, 2 -/* CF9578 80241A08 03E00008 */ jr $ra -/* CF957C 80241A0C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884_CF93F4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884_CF93F4.s new file mode 100644 index 0000000000..aa32e11140 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241884_CF93F4.s @@ -0,0 +1,103 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241884_CF93F4 +/* CF93F4 80241884 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* CF93F8 80241888 AFB1001C */ sw $s1, 0x1c($sp) +/* CF93FC 8024188C 0080882D */ daddu $s1, $a0, $zero +/* CF9400 80241890 AFBF0034 */ sw $ra, 0x34($sp) +/* CF9404 80241894 AFB60030 */ sw $s6, 0x30($sp) +/* CF9408 80241898 AFB5002C */ sw $s5, 0x2c($sp) +/* CF940C 8024189C AFB40028 */ sw $s4, 0x28($sp) +/* CF9410 802418A0 AFB30024 */ sw $s3, 0x24($sp) +/* CF9414 802418A4 AFB20020 */ sw $s2, 0x20($sp) +/* CF9418 802418A8 AFB00018 */ sw $s0, 0x18($sp) +/* CF941C 802418AC F7B60040 */ sdc1 $f22, 0x40($sp) +/* CF9420 802418B0 F7B40038 */ sdc1 $f20, 0x38($sp) +/* CF9424 802418B4 8E30000C */ lw $s0, 0xc($s1) +/* CF9428 802418B8 8E160000 */ lw $s6, ($s0) +/* CF942C 802418BC 26100004 */ addiu $s0, $s0, 4 +/* CF9430 802418C0 0C0B1EAF */ jal get_variable +/* CF9434 802418C4 02C0282D */ daddu $a1, $s6, $zero +/* CF9438 802418C8 44820000 */ mtc1 $v0, $f0 +/* CF943C 802418CC 00000000 */ nop +/* CF9440 802418D0 46800020 */ cvt.s.w $f0, $f0 +/* CF9444 802418D4 E7A00010 */ swc1 $f0, 0x10($sp) +/* CF9448 802418D8 8E140000 */ lw $s4, ($s0) +/* CF944C 802418DC 26100004 */ addiu $s0, $s0, 4 +/* CF9450 802418E0 0220202D */ daddu $a0, $s1, $zero +/* CF9454 802418E4 0C0B1EAF */ jal get_variable +/* CF9458 802418E8 0280282D */ daddu $a1, $s4, $zero +/* CF945C 802418EC 0220202D */ daddu $a0, $s1, $zero +/* CF9460 802418F0 8E150000 */ lw $s5, ($s0) +/* CF9464 802418F4 4482B000 */ mtc1 $v0, $f22 +/* CF9468 802418F8 00000000 */ nop +/* CF946C 802418FC 4680B5A0 */ cvt.s.w $f22, $f22 +/* CF9470 80241900 0C0B1EAF */ jal get_variable +/* CF9474 80241904 02A0282D */ daddu $a1, $s5, $zero +/* CF9478 80241908 2404FFFC */ addiu $a0, $zero, -4 +/* CF947C 8024190C 44820000 */ mtc1 $v0, $f0 +/* CF9480 80241910 00000000 */ nop +/* CF9484 80241914 46800020 */ cvt.s.w $f0, $f0 +/* CF9488 80241918 0C00EABB */ jal get_npc_unsafe +/* CF948C 8024191C E7A00014 */ swc1 $f0, 0x14($sp) +/* CF9490 80241920 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* CF9494 80241924 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* CF9498 80241928 3C014334 */ lui $at, 0x4334 +/* CF949C 8024192C 44816000 */ mtc1 $at, $f12 +/* CF94A0 80241930 00041880 */ sll $v1, $a0, 2 +/* CF94A4 80241934 00641821 */ addu $v1, $v1, $a0 +/* CF94A8 80241938 00031880 */ sll $v1, $v1, 2 +/* CF94AC 8024193C 00641823 */ subu $v1, $v1, $a0 +/* CF94B0 80241940 000320C0 */ sll $a0, $v1, 3 +/* CF94B4 80241944 00641821 */ addu $v1, $v1, $a0 +/* CF94B8 80241948 000318C0 */ sll $v1, $v1, 3 +/* CF94BC 8024194C 3C01800B */ lui $at, 0x800b +/* CF94C0 80241950 00230821 */ addu $at, $at, $v1 +/* CF94C4 80241954 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* CF94C8 80241958 460C0300 */ add.s $f12, $f0, $f12 +/* CF94CC 8024195C 0C00A6C9 */ jal clamp_angle +/* CF94D0 80241960 0040982D */ daddu $s3, $v0, $zero +/* CF94D4 80241964 27B00010 */ addiu $s0, $sp, 0x10 +/* CF94D8 80241968 0200202D */ daddu $a0, $s0, $zero +/* CF94DC 8024196C 27B20014 */ addiu $s2, $sp, 0x14 +/* CF94E0 80241970 0240282D */ daddu $a1, $s2, $zero +/* CF94E4 80241974 3C064170 */ lui $a2, 0x4170 +/* CF94E8 80241978 8E67000C */ lw $a3, 0xc($s3) +/* CF94EC 8024197C 0C00A7E7 */ jal add_vec2D_polar +/* CF94F0 80241980 46000506 */ mov.s $f20, $f0 +/* CF94F4 80241984 0200202D */ daddu $a0, $s0, $zero +/* CF94F8 80241988 3C064120 */ lui $a2, 0x4120 +/* CF94FC 8024198C 4407A000 */ mfc1 $a3, $f20 +/* CF9500 80241990 0C00A7E7 */ jal add_vec2D_polar +/* CF9504 80241994 0240282D */ daddu $a1, $s2, $zero +/* CF9508 80241998 0220202D */ daddu $a0, $s1, $zero +/* CF950C 8024199C C7A00010 */ lwc1 $f0, 0x10($sp) +/* CF9510 802419A0 4600008D */ trunc.w.s $f2, $f0 +/* CF9514 802419A4 44061000 */ mfc1 $a2, $f2 +/* CF9518 802419A8 0C0B2026 */ jal set_variable +/* CF951C 802419AC 02C0282D */ daddu $a1, $s6, $zero +/* CF9520 802419B0 0220202D */ daddu $a0, $s1, $zero +/* CF9524 802419B4 4600B08D */ trunc.w.s $f2, $f22 +/* CF9528 802419B8 44061000 */ mfc1 $a2, $f2 +/* CF952C 802419BC 0C0B2026 */ jal set_variable +/* CF9530 802419C0 0280282D */ daddu $a1, $s4, $zero +/* CF9534 802419C4 0220202D */ daddu $a0, $s1, $zero +/* CF9538 802419C8 C7A00014 */ lwc1 $f0, 0x14($sp) +/* CF953C 802419CC 4600008D */ trunc.w.s $f2, $f0 +/* CF9540 802419D0 44061000 */ mfc1 $a2, $f2 +/* CF9544 802419D4 0C0B2026 */ jal set_variable +/* CF9548 802419D8 02A0282D */ daddu $a1, $s5, $zero +/* CF954C 802419DC 8FBF0034 */ lw $ra, 0x34($sp) +/* CF9550 802419E0 8FB60030 */ lw $s6, 0x30($sp) +/* CF9554 802419E4 8FB5002C */ lw $s5, 0x2c($sp) +/* CF9558 802419E8 8FB40028 */ lw $s4, 0x28($sp) +/* CF955C 802419EC 8FB30024 */ lw $s3, 0x24($sp) +/* CF9560 802419F0 8FB20020 */ lw $s2, 0x20($sp) +/* CF9564 802419F4 8FB1001C */ lw $s1, 0x1c($sp) +/* CF9568 802419F8 8FB00018 */ lw $s0, 0x18($sp) +/* CF956C 802419FC D7B60040 */ ldc1 $f22, 0x40($sp) +/* CF9570 80241A00 D7B40038 */ ldc1 $f20, 0x38($sp) +/* CF9574 80241A04 24020002 */ addiu $v0, $zero, 2 +/* CF9578 80241A08 03E00008 */ jr $ra +/* CF957C 80241A0C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54.s deleted file mode 100644 index 09968d3d38..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A54 -/* CF95C4 80241A54 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF95C8 80241A58 AFBF0010 */ sw $ra, 0x10($sp) -/* CF95CC 80241A5C 0C00EABB */ jal get_npc_unsafe -/* CF95D0 80241A60 8C84008C */ lw $a0, 0x8c($a0) -/* CF95D4 80241A64 3C038025 */ lui $v1, 0x8025 -/* CF95D8 80241A68 8C63DF24 */ lw $v1, -0x20dc($v1) -/* CF95DC 80241A6C AC430028 */ sw $v1, 0x28($v0) -/* CF95E0 80241A70 8FBF0010 */ lw $ra, 0x10($sp) -/* CF95E4 80241A74 24020002 */ addiu $v0, $zero, 2 -/* CF95E8 80241A78 03E00008 */ jr $ra -/* CF95EC 80241A7C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s new file mode 100644 index 0000000000..bf1175c475 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241A54_CF95C4.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A54_CF95C4 +/* CF95C4 80241A54 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* CF95C8 80241A58 AFBF0010 */ sw $ra, 0x10($sp) +/* CF95CC 80241A5C 0C00EABB */ jal get_npc_unsafe +/* CF95D0 80241A60 8C84008C */ lw $a0, 0x8c($a0) +/* CF95D4 80241A64 3C038025 */ lui $v1, 0x8025 +/* CF95D8 80241A68 8C63DF24 */ lw $v1, -0x20dc($v1) +/* CF95DC 80241A6C AC430028 */ sw $v1, 0x28($v0) +/* CF95E0 80241A70 8FBF0010 */ lw $ra, 0x10($sp) +/* CF95E4 80241A74 24020002 */ addiu $v0, $zero, 2 +/* CF95E8 80241A78 03E00008 */ jr $ra +/* CF95EC 80241A7C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8.s deleted file mode 100644 index f99302113b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DA8 -/* CF9918 80241DA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF991C 80241DAC AFB10014 */ sw $s1, 0x14($sp) -/* CF9920 80241DB0 0080882D */ daddu $s1, $a0, $zero -/* CF9924 80241DB4 AFBF001C */ sw $ra, 0x1c($sp) -/* CF9928 80241DB8 AFB20018 */ sw $s2, 0x18($sp) -/* CF992C 80241DBC AFB00010 */ sw $s0, 0x10($sp) -/* CF9930 80241DC0 8E240084 */ lw $a0, 0x84($s1) -/* CF9934 80241DC4 0C04C3D6 */ jal get_item_entity -/* CF9938 80241DC8 00A0802D */ daddu $s0, $a1, $zero -/* CF993C 80241DCC 12000005 */ beqz $s0, .L80241DE4 -/* CF9940 80241DD0 0040902D */ daddu $s2, $v0, $zero -/* CF9944 80241DD4 C640000C */ lwc1 $f0, 0xc($s2) -/* CF9948 80241DD8 AE200074 */ sw $zero, 0x74($s1) -/* CF994C 80241DDC AE20007C */ sw $zero, 0x7c($s1) -/* CF9950 80241DE0 E6200078 */ swc1 $f0, 0x78($s1) -.L80241DE4: -/* CF9954 80241DE4 8E230074 */ lw $v1, 0x74($s1) -/* CF9958 80241DE8 10600005 */ beqz $v1, .L80241E00 -/* CF995C 80241DEC 24020001 */ addiu $v0, $zero, 1 -/* CF9960 80241DF0 10620024 */ beq $v1, $v0, .L80241E84 -/* CF9964 80241DF4 00000000 */ nop -/* CF9968 80241DF8 080907B7 */ j .L80241EDC -/* CF996C 80241DFC 00000000 */ nop -.L80241E00: -/* CF9970 80241E00 3C013FC9 */ lui $at, 0x3fc9 -/* CF9974 80241E04 34210FD8 */ ori $at, $at, 0xfd8 -/* CF9978 80241E08 44810000 */ mtc1 $at, $f0 -/* CF997C 80241E0C C62C007C */ lwc1 $f12, 0x7c($s1) -/* CF9980 80241E10 46806320 */ cvt.s.w $f12, $f12 -/* CF9984 80241E14 46006302 */ mul.s $f12, $f12, $f0 -/* CF9988 80241E18 00000000 */ nop -/* CF998C 80241E1C 3C0141F0 */ lui $at, 0x41f0 -/* CF9990 80241E20 44810000 */ mtc1 $at, $f0 -/* CF9994 80241E24 0C00A874 */ jal cos_rad -/* CF9998 80241E28 46006303 */ div.s $f12, $f12, $f0 -/* CF999C 80241E2C 3C013F80 */ lui $at, 0x3f80 -/* CF99A0 80241E30 44811000 */ mtc1 $at, $f2 -/* CF99A4 80241E34 00000000 */ nop -/* CF99A8 80241E38 46001081 */ sub.s $f2, $f2, $f0 -/* CF99AC 80241E3C 3C0141A0 */ lui $at, 0x41a0 -/* CF99B0 80241E40 44810000 */ mtc1 $at, $f0 -/* CF99B4 80241E44 00000000 */ nop -/* CF99B8 80241E48 46001082 */ mul.s $f2, $f2, $f0 -/* CF99BC 80241E4C 00000000 */ nop -/* CF99C0 80241E50 C6200078 */ lwc1 $f0, 0x78($s1) -/* CF99C4 80241E54 46020000 */ add.s $f0, $f0, $f2 -/* CF99C8 80241E58 E640000C */ swc1 $f0, 0xc($s2) -/* CF99CC 80241E5C 8E23007C */ lw $v1, 0x7c($s1) -/* CF99D0 80241E60 2402001E */ addiu $v0, $zero, 0x1e -/* CF99D4 80241E64 14620005 */ bne $v1, $v0, .L80241E7C -/* CF99D8 80241E68 24620001 */ addiu $v0, $v1, 1 -/* CF99DC 80241E6C 24020001 */ addiu $v0, $zero, 1 -/* CF99E0 80241E70 AE220074 */ sw $v0, 0x74($s1) -/* CF99E4 80241E74 080907B7 */ j .L80241EDC -/* CF99E8 80241E78 AE20007C */ sw $zero, 0x7c($s1) -.L80241E7C: -/* CF99EC 80241E7C 080907B7 */ j .L80241EDC -/* CF99F0 80241E80 AE22007C */ sw $v0, 0x7c($s1) -.L80241E84: -/* CF99F4 80241E84 C62C007C */ lwc1 $f12, 0x7c($s1) -/* CF99F8 80241E88 0C00A8D4 */ jal cos_deg -/* CF99FC 80241E8C 46806320 */ cvt.s.w $f12, $f12 -/* CF9A00 80241E90 3C014040 */ lui $at, 0x4040 -/* CF9A04 80241E94 44811000 */ mtc1 $at, $f2 -/* CF9A08 80241E98 00000000 */ nop -/* CF9A0C 80241E9C 46020002 */ mul.s $f0, $f0, $f2 -/* CF9A10 80241EA0 00000000 */ nop -/* CF9A14 80241EA4 3C014188 */ lui $at, 0x4188 -/* CF9A18 80241EA8 44812000 */ mtc1 $at, $f4 -/* CF9A1C 80241EAC C6220078 */ lwc1 $f2, 0x78($s1) -/* CF9A20 80241EB0 46041080 */ add.s $f2, $f2, $f4 -/* CF9A24 80241EB4 46001080 */ add.s $f2, $f2, $f0 -/* CF9A28 80241EB8 E642000C */ swc1 $f2, 0xc($s2) -/* CF9A2C 80241EBC 8E22007C */ lw $v0, 0x7c($s1) -/* CF9A30 80241EC0 24420009 */ addiu $v0, $v0, 9 -/* CF9A34 80241EC4 44826000 */ mtc1 $v0, $f12 -/* CF9A38 80241EC8 00000000 */ nop -/* CF9A3C 80241ECC 0C00A6C9 */ jal clamp_angle -/* CF9A40 80241ED0 46806320 */ cvt.s.w $f12, $f12 -/* CF9A44 80241ED4 4600018D */ trunc.w.s $f6, $f0 -/* CF9A48 80241ED8 E626007C */ swc1 $f6, 0x7c($s1) -.L80241EDC: -/* CF9A4C 80241EDC 8FBF001C */ lw $ra, 0x1c($sp) -/* CF9A50 80241EE0 8FB20018 */ lw $s2, 0x18($sp) -/* CF9A54 80241EE4 8FB10014 */ lw $s1, 0x14($sp) -/* CF9A58 80241EE8 8FB00010 */ lw $s0, 0x10($sp) -/* CF9A5C 80241EEC 0000102D */ daddu $v0, $zero, $zero -/* CF9A60 80241EF0 03E00008 */ jr $ra -/* CF9A64 80241EF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s new file mode 100644 index 0000000000..d500f14c1a --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241DA8_CF9918.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DA8_CF9918 +/* CF9918 80241DA8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* CF991C 80241DAC AFB10014 */ sw $s1, 0x14($sp) +/* CF9920 80241DB0 0080882D */ daddu $s1, $a0, $zero +/* CF9924 80241DB4 AFBF001C */ sw $ra, 0x1c($sp) +/* CF9928 80241DB8 AFB20018 */ sw $s2, 0x18($sp) +/* CF992C 80241DBC AFB00010 */ sw $s0, 0x10($sp) +/* CF9930 80241DC0 8E240084 */ lw $a0, 0x84($s1) +/* CF9934 80241DC4 0C04C3D6 */ jal get_item_entity +/* CF9938 80241DC8 00A0802D */ daddu $s0, $a1, $zero +/* CF993C 80241DCC 12000005 */ beqz $s0, .L80241DE4 +/* CF9940 80241DD0 0040902D */ daddu $s2, $v0, $zero +/* CF9944 80241DD4 C640000C */ lwc1 $f0, 0xc($s2) +/* CF9948 80241DD8 AE200074 */ sw $zero, 0x74($s1) +/* CF994C 80241DDC AE20007C */ sw $zero, 0x7c($s1) +/* CF9950 80241DE0 E6200078 */ swc1 $f0, 0x78($s1) +.L80241DE4: +/* CF9954 80241DE4 8E230074 */ lw $v1, 0x74($s1) +/* CF9958 80241DE8 10600005 */ beqz $v1, .L80241E00 +/* CF995C 80241DEC 24020001 */ addiu $v0, $zero, 1 +/* CF9960 80241DF0 10620024 */ beq $v1, $v0, .L80241E84 +/* CF9964 80241DF4 00000000 */ nop +/* CF9968 80241DF8 080907B7 */ j .L80241EDC +/* CF996C 80241DFC 00000000 */ nop +.L80241E00: +/* CF9970 80241E00 3C013FC9 */ lui $at, 0x3fc9 +/* CF9974 80241E04 34210FD8 */ ori $at, $at, 0xfd8 +/* CF9978 80241E08 44810000 */ mtc1 $at, $f0 +/* CF997C 80241E0C C62C007C */ lwc1 $f12, 0x7c($s1) +/* CF9980 80241E10 46806320 */ cvt.s.w $f12, $f12 +/* CF9984 80241E14 46006302 */ mul.s $f12, $f12, $f0 +/* CF9988 80241E18 00000000 */ nop +/* CF998C 80241E1C 3C0141F0 */ lui $at, 0x41f0 +/* CF9990 80241E20 44810000 */ mtc1 $at, $f0 +/* CF9994 80241E24 0C00A874 */ jal cos_rad +/* CF9998 80241E28 46006303 */ div.s $f12, $f12, $f0 +/* CF999C 80241E2C 3C013F80 */ lui $at, 0x3f80 +/* CF99A0 80241E30 44811000 */ mtc1 $at, $f2 +/* CF99A4 80241E34 00000000 */ nop +/* CF99A8 80241E38 46001081 */ sub.s $f2, $f2, $f0 +/* CF99AC 80241E3C 3C0141A0 */ lui $at, 0x41a0 +/* CF99B0 80241E40 44810000 */ mtc1 $at, $f0 +/* CF99B4 80241E44 00000000 */ nop +/* CF99B8 80241E48 46001082 */ mul.s $f2, $f2, $f0 +/* CF99BC 80241E4C 00000000 */ nop +/* CF99C0 80241E50 C6200078 */ lwc1 $f0, 0x78($s1) +/* CF99C4 80241E54 46020000 */ add.s $f0, $f0, $f2 +/* CF99C8 80241E58 E640000C */ swc1 $f0, 0xc($s2) +/* CF99CC 80241E5C 8E23007C */ lw $v1, 0x7c($s1) +/* CF99D0 80241E60 2402001E */ addiu $v0, $zero, 0x1e +/* CF99D4 80241E64 14620005 */ bne $v1, $v0, .L80241E7C +/* CF99D8 80241E68 24620001 */ addiu $v0, $v1, 1 +/* CF99DC 80241E6C 24020001 */ addiu $v0, $zero, 1 +/* CF99E0 80241E70 AE220074 */ sw $v0, 0x74($s1) +/* CF99E4 80241E74 080907B7 */ j .L80241EDC +/* CF99E8 80241E78 AE20007C */ sw $zero, 0x7c($s1) +.L80241E7C: +/* CF99EC 80241E7C 080907B7 */ j .L80241EDC +/* CF99F0 80241E80 AE22007C */ sw $v0, 0x7c($s1) +.L80241E84: +/* CF99F4 80241E84 C62C007C */ lwc1 $f12, 0x7c($s1) +/* CF99F8 80241E88 0C00A8D4 */ jal cos_deg +/* CF99FC 80241E8C 46806320 */ cvt.s.w $f12, $f12 +/* CF9A00 80241E90 3C014040 */ lui $at, 0x4040 +/* CF9A04 80241E94 44811000 */ mtc1 $at, $f2 +/* CF9A08 80241E98 00000000 */ nop +/* CF9A0C 80241E9C 46020002 */ mul.s $f0, $f0, $f2 +/* CF9A10 80241EA0 00000000 */ nop +/* CF9A14 80241EA4 3C014188 */ lui $at, 0x4188 +/* CF9A18 80241EA8 44812000 */ mtc1 $at, $f4 +/* CF9A1C 80241EAC C6220078 */ lwc1 $f2, 0x78($s1) +/* CF9A20 80241EB0 46041080 */ add.s $f2, $f2, $f4 +/* CF9A24 80241EB4 46001080 */ add.s $f2, $f2, $f0 +/* CF9A28 80241EB8 E642000C */ swc1 $f2, 0xc($s2) +/* CF9A2C 80241EBC 8E22007C */ lw $v0, 0x7c($s1) +/* CF9A30 80241EC0 24420009 */ addiu $v0, $v0, 9 +/* CF9A34 80241EC4 44826000 */ mtc1 $v0, $f12 +/* CF9A38 80241EC8 00000000 */ nop +/* CF9A3C 80241ECC 0C00A6C9 */ jal clamp_angle +/* CF9A40 80241ED0 46806320 */ cvt.s.w $f12, $f12 +/* CF9A44 80241ED4 4600018D */ trunc.w.s $f6, $f0 +/* CF9A48 80241ED8 E626007C */ swc1 $f6, 0x7c($s1) +.L80241EDC: +/* CF9A4C 80241EDC 8FBF001C */ lw $ra, 0x1c($sp) +/* CF9A50 80241EE0 8FB20018 */ lw $s2, 0x18($sp) +/* CF9A54 80241EE4 8FB10014 */ lw $s1, 0x14($sp) +/* CF9A58 80241EE8 8FB00010 */ lw $s0, 0x10($sp) +/* CF9A5C 80241EEC 0000102D */ daddu $v0, $zero, $zero +/* CF9A60 80241EF0 03E00008 */ jr $ra +/* CF9A64 80241EF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_8024065C_D05D8C.s b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_8024065C_D05D8C.s index bf25e770e7..6ca7ed02ad 100644 --- a/asm/nonmatchings/world/area_sam/sam_02/D05730/func_8024065C_D05D8C.s +++ b/asm/nonmatchings/world/area_sam/sam_02/D05730/func_8024065C_D05D8C.s @@ -55,7 +55,7 @@ glabel func_8024065C_D05D8C /* D05E54 80240724 4405E000 */ mfc1 $a1, $f28 /* D05E58 80240728 4406D000 */ mfc1 $a2, $f26 /* D05E5C 8024072C 4407C000 */ mfc1 $a3, $f24 -/* D05E60 80240730 0C09017B */ jal func_802405EC +/* D05E60 80240730 0C09017B */ jal func_802405EC_D05D1C /* D05E64 80240734 27A40010 */ addiu $a0, $sp, 0x10 /* D05E68 80240738 27A40010 */ addiu $a0, $sp, 0x10 /* D05E6C 8024073C 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_8024065C_D05D8C /* D05EDC 802407AC 4405E000 */ mfc1 $a1, $f28 /* D05EE0 802407B0 4406D000 */ mfc1 $a2, $f26 /* D05EE4 802407B4 4407C000 */ mfc1 $a3, $f24 -/* D05EE8 802407B8 0C09017B */ jal func_802405EC +/* D05EE8 802407B8 0C09017B */ jal func_802405EC_D05D1C /* D05EEC 802407BC 27A40010 */ addiu $a0, $sp, 0x10 /* D05EF0 802407C0 27A40010 */ addiu $a0, $sp, 0x10 /* D05EF4 802407C4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4.s deleted file mode 100644 index 447bc00fd5..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4.s +++ /dev/null @@ -1,36 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408F4 -/* D06024 802408F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06028 802408F8 AFB10014 */ sw $s1, 0x14($sp) -/* D0602C 802408FC 0080882D */ daddu $s1, $a0, $zero -/* D06030 80240900 AFBF0018 */ sw $ra, 0x18($sp) -/* D06034 80240904 AFB00010 */ sw $s0, 0x10($sp) -/* D06038 80240908 8E30000C */ lw $s0, 0xc($s1) -/* D0603C 8024090C 8E050000 */ lw $a1, ($s0) -/* D06040 80240910 0C0B1EAF */ jal get_variable -/* D06044 80240914 26100004 */ addiu $s0, $s0, 4 -/* D06048 80240918 0220202D */ daddu $a0, $s1, $zero -/* D0604C 8024091C 8E050000 */ lw $a1, ($s0) -/* D06050 80240920 0C0B1EAF */ jal get_variable -/* D06054 80240924 0040802D */ daddu $s0, $v0, $zero -/* D06058 80240928 44820000 */ mtc1 $v0, $f0 -/* D0605C 8024092C 00000000 */ nop -/* D06060 80240930 46800020 */ cvt.s.w $f0, $f0 -/* D06064 80240934 24020002 */ addiu $v0, $zero, 2 -/* D06068 80240938 00501804 */ sllv $v1, $s0, $v0 -/* D0606C 8024093C 00701821 */ addu $v1, $v1, $s0 -/* D06070 80240940 00431804 */ sllv $v1, $v1, $v0 -/* D06074 80240944 00701823 */ subu $v1, $v1, $s0 -/* D06078 80240948 000320C0 */ sll $a0, $v1, 3 -/* D0607C 8024094C 00641821 */ addu $v1, $v1, $a0 -/* D06080 80240950 000318C0 */ sll $v1, $v1, 3 -/* D06084 80240954 3C01800B */ lui $at, 0x800b -/* D06088 80240958 00230821 */ addu $at, $at, $v1 -/* D0608C 8024095C E4201D98 */ swc1 $f0, 0x1d98($at) -/* D06090 80240960 8FBF0018 */ lw $ra, 0x18($sp) -/* D06094 80240964 8FB10014 */ lw $s1, 0x14($sp) -/* D06098 80240968 8FB00010 */ lw $s0, 0x10($sp) -/* D0609C 8024096C 03E00008 */ jr $ra -/* D060A0 80240970 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s new file mode 100644 index 0000000000..912ab57902 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802408F4_D06024.s @@ -0,0 +1,36 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408F4_D06024 +/* D06024 802408F4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D06028 802408F8 AFB10014 */ sw $s1, 0x14($sp) +/* D0602C 802408FC 0080882D */ daddu $s1, $a0, $zero +/* D06030 80240900 AFBF0018 */ sw $ra, 0x18($sp) +/* D06034 80240904 AFB00010 */ sw $s0, 0x10($sp) +/* D06038 80240908 8E30000C */ lw $s0, 0xc($s1) +/* D0603C 8024090C 8E050000 */ lw $a1, ($s0) +/* D06040 80240910 0C0B1EAF */ jal get_variable +/* D06044 80240914 26100004 */ addiu $s0, $s0, 4 +/* D06048 80240918 0220202D */ daddu $a0, $s1, $zero +/* D0604C 8024091C 8E050000 */ lw $a1, ($s0) +/* D06050 80240920 0C0B1EAF */ jal get_variable +/* D06054 80240924 0040802D */ daddu $s0, $v0, $zero +/* D06058 80240928 44820000 */ mtc1 $v0, $f0 +/* D0605C 8024092C 00000000 */ nop +/* D06060 80240930 46800020 */ cvt.s.w $f0, $f0 +/* D06064 80240934 24020002 */ addiu $v0, $zero, 2 +/* D06068 80240938 00501804 */ sllv $v1, $s0, $v0 +/* D0606C 8024093C 00701821 */ addu $v1, $v1, $s0 +/* D06070 80240940 00431804 */ sllv $v1, $v1, $v0 +/* D06074 80240944 00701823 */ subu $v1, $v1, $s0 +/* D06078 80240948 000320C0 */ sll $a0, $v1, 3 +/* D0607C 8024094C 00641821 */ addu $v1, $v1, $a0 +/* D06080 80240950 000318C0 */ sll $v1, $v1, 3 +/* D06084 80240954 3C01800B */ lui $at, 0x800b +/* D06088 80240958 00230821 */ addu $at, $at, $v1 +/* D0608C 8024095C E4201D98 */ swc1 $f0, 0x1d98($at) +/* D06090 80240960 8FBF0018 */ lw $ra, 0x18($sp) +/* D06094 80240964 8FB10014 */ lw $s1, 0x14($sp) +/* D06098 80240968 8FB00010 */ lw $s0, 0x10($sp) +/* D0609C 8024096C 03E00008 */ jr $ra +/* D060A0 80240970 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4.s deleted file mode 100644 index 1c816399e6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409A4 -/* D060D4 802409A4 3C028011 */ lui $v0, 0x8011 -/* D060D8 802409A8 8042F2A2 */ lb $v0, -0xd5e($v0) -/* D060DC 802409AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D060E0 802409B0 10400003 */ beqz $v0, .L802409C0 -/* D060E4 802409B4 AFBF0010 */ sw $ra, 0x10($sp) -/* D060E8 802409B8 0C03AE06 */ jal partner_suspend_ability_script -/* D060EC 802409BC 00000000 */ nop -.L802409C0: -/* D060F0 802409C0 24020002 */ addiu $v0, $zero, 2 -/* D060F4 802409C4 8FBF0010 */ lw $ra, 0x10($sp) -/* D060F8 802409C8 03E00008 */ jr $ra -/* D060FC 802409CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s new file mode 100644 index 0000000000..5e228d9dc5 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409A4_D060D4 +/* D060D4 802409A4 3C028011 */ lui $v0, 0x8011 +/* D060D8 802409A8 8042F2A2 */ lb $v0, -0xd5e($v0) +/* D060DC 802409AC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D060E0 802409B0 10400003 */ beqz $v0, .L802409C0 +/* D060E4 802409B4 AFBF0010 */ sw $ra, 0x10($sp) +/* D060E8 802409B8 0C03AE06 */ jal partner_suspend_ability_script +/* D060EC 802409BC 00000000 */ nop +.L802409C0: +/* D060F0 802409C0 24020002 */ addiu $v0, $zero, 2 +/* D060F4 802409C4 8FBF0010 */ lw $ra, 0x10($sp) +/* D060F8 802409C8 03E00008 */ jr $ra +/* D060FC 802409CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0.s deleted file mode 100644 index c2cbe0951c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AC0 -/* D061F0 80240AC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D061F4 80240AC4 AFBF0010 */ sw $ra, 0x10($sp) -/* D061F8 80240AC8 8C82000C */ lw $v0, 0xc($a0) -/* D061FC 80240ACC 3C068011 */ lui $a2, 0x8011 -/* D06200 80240AD0 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* D06204 80240AD4 0C0B2026 */ jal set_variable -/* D06208 80240AD8 8C450000 */ lw $a1, ($v0) -/* D0620C 80240ADC 0C03AC5A */ jal func_800EB168 -/* D06210 80240AE0 0000202D */ daddu $a0, $zero, $zero -/* D06214 80240AE4 8FBF0010 */ lw $ra, 0x10($sp) -/* D06218 80240AE8 24020002 */ addiu $v0, $zero, 2 -/* D0621C 80240AEC 03E00008 */ jr $ra -/* D06220 80240AF0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s new file mode 100644 index 0000000000..fa91a1cdfa --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AC0_D061F0 +/* D061F0 80240AC0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D061F4 80240AC4 AFBF0010 */ sw $ra, 0x10($sp) +/* D061F8 80240AC8 8C82000C */ lw $v0, 0xc($a0) +/* D061FC 80240ACC 3C068011 */ lui $a2, 0x8011 +/* D06200 80240AD0 80C6F2A2 */ lb $a2, -0xd5e($a2) +/* D06204 80240AD4 0C0B2026 */ jal set_variable +/* D06208 80240AD8 8C450000 */ lw $a1, ($v0) +/* D0620C 80240ADC 0C03AC5A */ jal func_800EB168 +/* D06210 80240AE0 0000202D */ daddu $a0, $zero, $zero +/* D06214 80240AE4 8FBF0010 */ lw $ra, 0x10($sp) +/* D06218 80240AE8 24020002 */ addiu $v0, $zero, 2 +/* D0621C 80240AEC 03E00008 */ jr $ra +/* D06220 80240AF0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4.s deleted file mode 100644 index aaadf649ba..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AF4 -/* D06224 80240AF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D06228 80240AF8 AFBF0010 */ sw $ra, 0x10($sp) -/* D0622C 80240AFC 8C82000C */ lw $v0, 0xc($a0) -/* D06230 80240B00 0C0B1EAF */ jal get_variable -/* D06234 80240B04 8C450000 */ lw $a1, ($v0) -/* D06238 80240B08 00021600 */ sll $v0, $v0, 0x18 -/* D0623C 80240B0C 0C03AC5A */ jal func_800EB168 -/* D06240 80240B10 00022603 */ sra $a0, $v0, 0x18 -/* D06244 80240B14 8FBF0010 */ lw $ra, 0x10($sp) -/* D06248 80240B18 24020002 */ addiu $v0, $zero, 2 -/* D0624C 80240B1C 03E00008 */ jr $ra -/* D06250 80240B20 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s new file mode 100644 index 0000000000..77d1ce5032 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AF4_D06224 +/* D06224 80240AF4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D06228 80240AF8 AFBF0010 */ sw $ra, 0x10($sp) +/* D0622C 80240AFC 8C82000C */ lw $v0, 0xc($a0) +/* D06230 80240B00 0C0B1EAF */ jal get_variable +/* D06234 80240B04 8C450000 */ lw $a1, ($v0) +/* D06238 80240B08 00021600 */ sll $v0, $v0, 0x18 +/* D0623C 80240B0C 0C03AC5A */ jal func_800EB168 +/* D06240 80240B10 00022603 */ sra $a0, $v0, 0x18 +/* D06244 80240B14 8FBF0010 */ lw $ra, 0x10($sp) +/* D06248 80240B18 24020002 */ addiu $v0, $zero, 2 +/* D0624C 80240B1C 03E00008 */ jr $ra +/* D06250 80240B20 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68.s deleted file mode 100644 index e0aaf80727..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C68 -/* D06398 80240C68 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D0639C 80240C6C AFB10024 */ sw $s1, 0x24($sp) -/* D063A0 80240C70 0080882D */ daddu $s1, $a0, $zero -/* D063A4 80240C74 3C05F840 */ lui $a1, 0xf840 -/* D063A8 80240C78 AFBF0044 */ sw $ra, 0x44($sp) -/* D063AC 80240C7C AFBE0040 */ sw $fp, 0x40($sp) -/* D063B0 80240C80 AFB7003C */ sw $s7, 0x3c($sp) -/* D063B4 80240C84 AFB60038 */ sw $s6, 0x38($sp) -/* D063B8 80240C88 AFB50034 */ sw $s5, 0x34($sp) -/* D063BC 80240C8C AFB40030 */ sw $s4, 0x30($sp) -/* D063C0 80240C90 AFB3002C */ sw $s3, 0x2c($sp) -/* D063C4 80240C94 AFB20028 */ sw $s2, 0x28($sp) -/* D063C8 80240C98 AFB00020 */ sw $s0, 0x20($sp) -/* D063CC 80240C9C 8E3E0148 */ lw $fp, 0x148($s1) -/* D063D0 80240CA0 0C0B1EAF */ jal get_variable -/* D063D4 80240CA4 34A56268 */ ori $a1, $a1, 0x6268 -/* D063D8 80240CA8 0040802D */ daddu $s0, $v0, $zero -/* D063DC 80240CAC 0220202D */ daddu $a0, $s1, $zero -/* D063E0 80240CB0 3C05F840 */ lui $a1, 0xf840 -/* D063E4 80240CB4 0C0B1EAF */ jal get_variable -/* D063E8 80240CB8 34A56269 */ ori $a1, $a1, 0x6269 -/* D063EC 80240CBC 0040B82D */ daddu $s7, $v0, $zero -/* D063F0 80240CC0 0220202D */ daddu $a0, $s1, $zero -/* D063F4 80240CC4 3C05F5DE */ lui $a1, 0xf5de -/* D063F8 80240CC8 0C0B1EAF */ jal get_variable -/* D063FC 80240CCC 34A502DE */ ori $a1, $a1, 0x2de -/* D06400 80240CD0 0040B02D */ daddu $s6, $v0, $zero -/* D06404 80240CD4 0220202D */ daddu $a0, $s1, $zero -/* D06408 80240CD8 3C05F5DE */ lui $a1, 0xf5de -/* D0640C 80240CDC 0C0B1EAF */ jal get_variable -/* D06410 80240CE0 34A502DF */ ori $a1, $a1, 0x2df -/* D06414 80240CE4 0040A82D */ daddu $s5, $v0, $zero -/* D06418 80240CE8 93D3006D */ lbu $s3, 0x6d($fp) -/* D0641C 80240CEC 32C2FFFF */ andi $v0, $s6, 0xffff -/* D06420 80240CF0 A7B30010 */ sh $s3, 0x10($sp) -/* D06424 80240CF4 93D2006E */ lbu $s2, 0x6e($fp) -/* D06428 80240CF8 93C7006F */ lbu $a3, 0x6f($fp) -/* D0642C 80240CFC 3274FFFF */ andi $s4, $s3, 0xffff -/* D06430 80240D00 12820003 */ beq $s4, $v0, .L80240D10 -/* D06434 80240D04 A7A7001E */ sh $a3, 0x1e($sp) -/* D06438 80240D08 0000B82D */ daddu $s7, $zero, $zero -/* D0643C 80240D0C 02E0802D */ daddu $s0, $s7, $zero -.L80240D10: -/* D06440 80240D10 3202FFFF */ andi $v0, $s0, 0xffff -/* D06444 80240D14 14400016 */ bnez $v0, .L80240D70 -/* D06448 80240D18 0220202D */ daddu $a0, $s1, $zero -/* D0644C 80240D1C 0C00A67F */ jal rand_int -/* D06450 80240D20 24040064 */ addiu $a0, $zero, 0x64 -/* D06454 80240D24 2842001E */ slti $v0, $v0, 0x1e -/* D06458 80240D28 10400011 */ beqz $v0, .L80240D70 -/* D0645C 80240D2C 0220202D */ daddu $a0, $s1, $zero -/* D06460 80240D30 0C00A67F */ jal rand_int -/* D06464 80240D34 2644FFFF */ addiu $a0, $s2, -1 -/* D06468 80240D38 0040A82D */ daddu $s5, $v0, $zero -/* D0646C 80240D3C 0260B02D */ daddu $s6, $s3, $zero -/* D06470 80240D40 0220202D */ daddu $a0, $s1, $zero -/* D06474 80240D44 3C05F5DE */ lui $a1, 0xf5de -/* D06478 80240D48 34A502DE */ ori $a1, $a1, 0x2de -/* D0647C 80240D4C 0C0B2026 */ jal set_variable -/* D06480 80240D50 0280302D */ daddu $a2, $s4, $zero -/* D06484 80240D54 0220202D */ daddu $a0, $s1, $zero -/* D06488 80240D58 3C05F5DE */ lui $a1, 0xf5de -/* D0648C 80240D5C 34A502DF */ ori $a1, $a1, 0x2df -/* D06490 80240D60 0C0B2026 */ jal set_variable -/* D06494 80240D64 32A6FFFF */ andi $a2, $s5, 0xffff -/* D06498 80240D68 24100001 */ addiu $s0, $zero, 1 -/* D0649C 80240D6C 0220202D */ daddu $a0, $s1, $zero -.L80240D70: -/* D064A0 80240D70 3C05F840 */ lui $a1, 0xf840 -/* D064A4 80240D74 34A56268 */ ori $a1, $a1, 0x6268 -/* D064A8 80240D78 0C0B2026 */ jal set_variable -/* D064AC 80240D7C 3206FFFF */ andi $a2, $s0, 0xffff -/* D064B0 80240D80 0220202D */ daddu $a0, $s1, $zero -/* D064B4 80240D84 3C05F840 */ lui $a1, 0xf840 -/* D064B8 80240D88 34A56269 */ ori $a1, $a1, 0x6269 -/* D064BC 80240D8C 0C0B2026 */ jal set_variable -/* D064C0 80240D90 32E6FFFF */ andi $a2, $s7, 0xffff -/* D064C4 80240D94 0000202D */ daddu $a0, $zero, $zero -/* D064C8 80240D98 3C05F5DE */ lui $a1, 0xf5de -/* D064CC 80240D9C 0C0B1EAF */ jal get_variable -/* D064D0 80240DA0 34A502E0 */ ori $a1, $a1, 0x2e0 -/* D064D4 80240DA4 0000202D */ daddu $a0, $zero, $zero -/* D064D8 80240DA8 3C05F5DE */ lui $a1, 0xf5de -/* D064DC 80240DAC 34A50180 */ ori $a1, $a1, 0x180 -/* D064E0 80240DB0 0C0B1EAF */ jal get_variable -/* D064E4 80240DB4 0040802D */ daddu $s0, $v0, $zero -/* D064E8 80240DB8 0040282D */ daddu $a1, $v0, $zero -/* D064EC 80240DBC 0000182D */ daddu $v1, $zero, $zero -/* D064F0 80240DC0 3C068024 */ lui $a2, 0x8024 -/* D064F4 80240DC4 24C66C04 */ addiu $a2, $a2, 0x6c04 -/* D064F8 80240DC8 00C0202D */ daddu $a0, $a2, $zero -.L80240DCC: -/* D064FC 80240DCC 8C820000 */ lw $v0, ($a0) -/* D06500 80240DD0 00A2102A */ slt $v0, $a1, $v0 -/* D06504 80240DD4 14400006 */ bnez $v0, .L80240DF0 -/* D06508 80240DD8 000310C0 */ sll $v0, $v1, 3 -/* D0650C 80240DDC 24630001 */ addiu $v1, $v1, 1 -/* D06510 80240DE0 28620008 */ slti $v0, $v1, 8 -/* D06514 80240DE4 1440FFF9 */ bnez $v0, .L80240DCC -/* D06518 80240DE8 24840008 */ addiu $a0, $a0, 8 -/* D0651C 80240DEC 000310C0 */ sll $v0, $v1, 3 -.L80240DF0: -/* D06520 80240DF0 00461021 */ addu $v0, $v0, $a2 -/* D06524 80240DF4 8C420004 */ lw $v0, 4($v0) -/* D06528 80240DF8 97A30010 */ lhu $v1, 0x10($sp) -/* D0652C 80240DFC 0202202A */ slt $a0, $s0, $v0 -/* D06530 80240E00 32C2FFFF */ andi $v0, $s6, 0xffff -/* D06534 80240E04 14620008 */ bne $v1, $v0, .L80240E28 -/* D06538 80240E08 32A2FFFF */ andi $v0, $s5, 0xffff -/* D0653C 80240E0C 97A7001E */ lhu $a3, 0x1e($sp) -/* D06540 80240E10 14E20005 */ bne $a3, $v0, .L80240E28 -/* D06544 80240E14 32E2FFFF */ andi $v0, $s7, 0xffff -/* D06548 80240E18 14400003 */ bnez $v0, .L80240E28 -/* D0654C 80240E1C 00000000 */ nop -/* D06550 80240E20 14800008 */ bnez $a0, .L80240E44 -/* D06554 80240E24 24020001 */ addiu $v0, $zero, 1 -.L80240E28: -/* D06558 80240E28 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* D0655C 80240E2C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* D06560 80240E30 80420075 */ lb $v0, 0x75($v0) -/* D06564 80240E34 10400005 */ beqz $v0, .L80240E4C -/* D06568 80240E38 00000000 */ nop -/* D0656C 80240E3C 10800003 */ beqz $a0, .L80240E4C -/* D06570 80240E40 24020001 */ addiu $v0, $zero, 1 -.L80240E44: -/* D06574 80240E44 08090396 */ j .L80240E58 -/* D06578 80240E48 AE220084 */ sw $v0, 0x84($s1) -.L80240E4C: -/* D0657C 80240E4C 0C00F9EB */ jal kill_enemy -/* D06580 80240E50 03C0202D */ daddu $a0, $fp, $zero -/* D06584 80240E54 AE200084 */ sw $zero, 0x84($s1) -.L80240E58: -/* D06588 80240E58 8FBF0044 */ lw $ra, 0x44($sp) -/* D0658C 80240E5C 8FBE0040 */ lw $fp, 0x40($sp) -/* D06590 80240E60 8FB7003C */ lw $s7, 0x3c($sp) -/* D06594 80240E64 8FB60038 */ lw $s6, 0x38($sp) -/* D06598 80240E68 8FB50034 */ lw $s5, 0x34($sp) -/* D0659C 80240E6C 8FB40030 */ lw $s4, 0x30($sp) -/* D065A0 80240E70 8FB3002C */ lw $s3, 0x2c($sp) -/* D065A4 80240E74 8FB20028 */ lw $s2, 0x28($sp) -/* D065A8 80240E78 8FB10024 */ lw $s1, 0x24($sp) -/* D065AC 80240E7C 8FB00020 */ lw $s0, 0x20($sp) -/* D065B0 80240E80 24020002 */ addiu $v0, $zero, 2 -/* D065B4 80240E84 03E00008 */ jr $ra -/* D065B8 80240E88 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s new file mode 100644 index 0000000000..b31321e694 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C68_D06398.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C68_D06398 +/* D06398 80240C68 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* D0639C 80240C6C AFB10024 */ sw $s1, 0x24($sp) +/* D063A0 80240C70 0080882D */ daddu $s1, $a0, $zero +/* D063A4 80240C74 3C05F840 */ lui $a1, 0xf840 +/* D063A8 80240C78 AFBF0044 */ sw $ra, 0x44($sp) +/* D063AC 80240C7C AFBE0040 */ sw $fp, 0x40($sp) +/* D063B0 80240C80 AFB7003C */ sw $s7, 0x3c($sp) +/* D063B4 80240C84 AFB60038 */ sw $s6, 0x38($sp) +/* D063B8 80240C88 AFB50034 */ sw $s5, 0x34($sp) +/* D063BC 80240C8C AFB40030 */ sw $s4, 0x30($sp) +/* D063C0 80240C90 AFB3002C */ sw $s3, 0x2c($sp) +/* D063C4 80240C94 AFB20028 */ sw $s2, 0x28($sp) +/* D063C8 80240C98 AFB00020 */ sw $s0, 0x20($sp) +/* D063CC 80240C9C 8E3E0148 */ lw $fp, 0x148($s1) +/* D063D0 80240CA0 0C0B1EAF */ jal get_variable +/* D063D4 80240CA4 34A56268 */ ori $a1, $a1, 0x6268 +/* D063D8 80240CA8 0040802D */ daddu $s0, $v0, $zero +/* D063DC 80240CAC 0220202D */ daddu $a0, $s1, $zero +/* D063E0 80240CB0 3C05F840 */ lui $a1, 0xf840 +/* D063E4 80240CB4 0C0B1EAF */ jal get_variable +/* D063E8 80240CB8 34A56269 */ ori $a1, $a1, 0x6269 +/* D063EC 80240CBC 0040B82D */ daddu $s7, $v0, $zero +/* D063F0 80240CC0 0220202D */ daddu $a0, $s1, $zero +/* D063F4 80240CC4 3C05F5DE */ lui $a1, 0xf5de +/* D063F8 80240CC8 0C0B1EAF */ jal get_variable +/* D063FC 80240CCC 34A502DE */ ori $a1, $a1, 0x2de +/* D06400 80240CD0 0040B02D */ daddu $s6, $v0, $zero +/* D06404 80240CD4 0220202D */ daddu $a0, $s1, $zero +/* D06408 80240CD8 3C05F5DE */ lui $a1, 0xf5de +/* D0640C 80240CDC 0C0B1EAF */ jal get_variable +/* D06410 80240CE0 34A502DF */ ori $a1, $a1, 0x2df +/* D06414 80240CE4 0040A82D */ daddu $s5, $v0, $zero +/* D06418 80240CE8 93D3006D */ lbu $s3, 0x6d($fp) +/* D0641C 80240CEC 32C2FFFF */ andi $v0, $s6, 0xffff +/* D06420 80240CF0 A7B30010 */ sh $s3, 0x10($sp) +/* D06424 80240CF4 93D2006E */ lbu $s2, 0x6e($fp) +/* D06428 80240CF8 93C7006F */ lbu $a3, 0x6f($fp) +/* D0642C 80240CFC 3274FFFF */ andi $s4, $s3, 0xffff +/* D06430 80240D00 12820003 */ beq $s4, $v0, .L80240D10 +/* D06434 80240D04 A7A7001E */ sh $a3, 0x1e($sp) +/* D06438 80240D08 0000B82D */ daddu $s7, $zero, $zero +/* D0643C 80240D0C 02E0802D */ daddu $s0, $s7, $zero +.L80240D10: +/* D06440 80240D10 3202FFFF */ andi $v0, $s0, 0xffff +/* D06444 80240D14 14400016 */ bnez $v0, .L80240D70 +/* D06448 80240D18 0220202D */ daddu $a0, $s1, $zero +/* D0644C 80240D1C 0C00A67F */ jal rand_int +/* D06450 80240D20 24040064 */ addiu $a0, $zero, 0x64 +/* D06454 80240D24 2842001E */ slti $v0, $v0, 0x1e +/* D06458 80240D28 10400011 */ beqz $v0, .L80240D70 +/* D0645C 80240D2C 0220202D */ daddu $a0, $s1, $zero +/* D06460 80240D30 0C00A67F */ jal rand_int +/* D06464 80240D34 2644FFFF */ addiu $a0, $s2, -1 +/* D06468 80240D38 0040A82D */ daddu $s5, $v0, $zero +/* D0646C 80240D3C 0260B02D */ daddu $s6, $s3, $zero +/* D06470 80240D40 0220202D */ daddu $a0, $s1, $zero +/* D06474 80240D44 3C05F5DE */ lui $a1, 0xf5de +/* D06478 80240D48 34A502DE */ ori $a1, $a1, 0x2de +/* D0647C 80240D4C 0C0B2026 */ jal set_variable +/* D06480 80240D50 0280302D */ daddu $a2, $s4, $zero +/* D06484 80240D54 0220202D */ daddu $a0, $s1, $zero +/* D06488 80240D58 3C05F5DE */ lui $a1, 0xf5de +/* D0648C 80240D5C 34A502DF */ ori $a1, $a1, 0x2df +/* D06490 80240D60 0C0B2026 */ jal set_variable +/* D06494 80240D64 32A6FFFF */ andi $a2, $s5, 0xffff +/* D06498 80240D68 24100001 */ addiu $s0, $zero, 1 +/* D0649C 80240D6C 0220202D */ daddu $a0, $s1, $zero +.L80240D70: +/* D064A0 80240D70 3C05F840 */ lui $a1, 0xf840 +/* D064A4 80240D74 34A56268 */ ori $a1, $a1, 0x6268 +/* D064A8 80240D78 0C0B2026 */ jal set_variable +/* D064AC 80240D7C 3206FFFF */ andi $a2, $s0, 0xffff +/* D064B0 80240D80 0220202D */ daddu $a0, $s1, $zero +/* D064B4 80240D84 3C05F840 */ lui $a1, 0xf840 +/* D064B8 80240D88 34A56269 */ ori $a1, $a1, 0x6269 +/* D064BC 80240D8C 0C0B2026 */ jal set_variable +/* D064C0 80240D90 32E6FFFF */ andi $a2, $s7, 0xffff +/* D064C4 80240D94 0000202D */ daddu $a0, $zero, $zero +/* D064C8 80240D98 3C05F5DE */ lui $a1, 0xf5de +/* D064CC 80240D9C 0C0B1EAF */ jal get_variable +/* D064D0 80240DA0 34A502E0 */ ori $a1, $a1, 0x2e0 +/* D064D4 80240DA4 0000202D */ daddu $a0, $zero, $zero +/* D064D8 80240DA8 3C05F5DE */ lui $a1, 0xf5de +/* D064DC 80240DAC 34A50180 */ ori $a1, $a1, 0x180 +/* D064E0 80240DB0 0C0B1EAF */ jal get_variable +/* D064E4 80240DB4 0040802D */ daddu $s0, $v0, $zero +/* D064E8 80240DB8 0040282D */ daddu $a1, $v0, $zero +/* D064EC 80240DBC 0000182D */ daddu $v1, $zero, $zero +/* D064F0 80240DC0 3C068024 */ lui $a2, 0x8024 +/* D064F4 80240DC4 24C66C04 */ addiu $a2, $a2, 0x6c04 +/* D064F8 80240DC8 00C0202D */ daddu $a0, $a2, $zero +.L80240DCC: +/* D064FC 80240DCC 8C820000 */ lw $v0, ($a0) +/* D06500 80240DD0 00A2102A */ slt $v0, $a1, $v0 +/* D06504 80240DD4 14400006 */ bnez $v0, .L80240DF0 +/* D06508 80240DD8 000310C0 */ sll $v0, $v1, 3 +/* D0650C 80240DDC 24630001 */ addiu $v1, $v1, 1 +/* D06510 80240DE0 28620008 */ slti $v0, $v1, 8 +/* D06514 80240DE4 1440FFF9 */ bnez $v0, .L80240DCC +/* D06518 80240DE8 24840008 */ addiu $a0, $a0, 8 +/* D0651C 80240DEC 000310C0 */ sll $v0, $v1, 3 +.L80240DF0: +/* D06520 80240DF0 00461021 */ addu $v0, $v0, $a2 +/* D06524 80240DF4 8C420004 */ lw $v0, 4($v0) +/* D06528 80240DF8 97A30010 */ lhu $v1, 0x10($sp) +/* D0652C 80240DFC 0202202A */ slt $a0, $s0, $v0 +/* D06530 80240E00 32C2FFFF */ andi $v0, $s6, 0xffff +/* D06534 80240E04 14620008 */ bne $v1, $v0, .L80240E28 +/* D06538 80240E08 32A2FFFF */ andi $v0, $s5, 0xffff +/* D0653C 80240E0C 97A7001E */ lhu $a3, 0x1e($sp) +/* D06540 80240E10 14E20005 */ bne $a3, $v0, .L80240E28 +/* D06544 80240E14 32E2FFFF */ andi $v0, $s7, 0xffff +/* D06548 80240E18 14400003 */ bnez $v0, .L80240E28 +/* D0654C 80240E1C 00000000 */ nop +/* D06550 80240E20 14800008 */ bnez $a0, .L80240E44 +/* D06554 80240E24 24020001 */ addiu $v0, $zero, 1 +.L80240E28: +/* D06558 80240E28 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* D0655C 80240E2C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* D06560 80240E30 80420075 */ lb $v0, 0x75($v0) +/* D06564 80240E34 10400005 */ beqz $v0, .L80240E4C +/* D06568 80240E38 00000000 */ nop +/* D0656C 80240E3C 10800003 */ beqz $a0, .L80240E4C +/* D06570 80240E40 24020001 */ addiu $v0, $zero, 1 +.L80240E44: +/* D06574 80240E44 08090396 */ j .L80240E58 +/* D06578 80240E48 AE220084 */ sw $v0, 0x84($s1) +.L80240E4C: +/* D0657C 80240E4C 0C00F9EB */ jal kill_enemy +/* D06580 80240E50 03C0202D */ daddu $a0, $fp, $zero +/* D06584 80240E54 AE200084 */ sw $zero, 0x84($s1) +.L80240E58: +/* D06588 80240E58 8FBF0044 */ lw $ra, 0x44($sp) +/* D0658C 80240E5C 8FBE0040 */ lw $fp, 0x40($sp) +/* D06590 80240E60 8FB7003C */ lw $s7, 0x3c($sp) +/* D06594 80240E64 8FB60038 */ lw $s6, 0x38($sp) +/* D06598 80240E68 8FB50034 */ lw $s5, 0x34($sp) +/* D0659C 80240E6C 8FB40030 */ lw $s4, 0x30($sp) +/* D065A0 80240E70 8FB3002C */ lw $s3, 0x2c($sp) +/* D065A4 80240E74 8FB20028 */ lw $s2, 0x28($sp) +/* D065A8 80240E78 8FB10024 */ lw $s1, 0x24($sp) +/* D065AC 80240E7C 8FB00020 */ lw $s0, 0x20($sp) +/* D065B0 80240E80 24020002 */ addiu $v0, $zero, 2 +/* D065B4 80240E84 03E00008 */ jr $ra +/* D065B8 80240E88 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C.s deleted file mode 100644 index dff27e9c39..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E8C -/* D065BC 80240E8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D065C0 80240E90 AFBF0014 */ sw $ra, 0x14($sp) -/* D065C4 80240E94 AFB00010 */ sw $s0, 0x10($sp) -/* D065C8 80240E98 0C00EABB */ jal get_npc_unsafe -/* D065CC 80240E9C 8C84014C */ lw $a0, 0x14c($a0) -/* D065D0 80240EA0 24040008 */ addiu $a0, $zero, 8 -/* D065D4 80240EA4 0040802D */ daddu $s0, $v0, $zero -/* D065D8 80240EA8 3C028024 */ lui $v0, 0x8024 -/* D065DC 80240EAC 24420EF8 */ addiu $v0, $v0, 0xef8 -/* D065E0 80240EB0 0C00AB39 */ jal heap_malloc -/* D065E4 80240EB4 AE020008 */ sw $v0, 8($s0) -/* D065E8 80240EB8 0040182D */ daddu $v1, $v0, $zero -/* D065EC 80240EBC AE030020 */ sw $v1, 0x20($s0) -/* D065F0 80240EC0 AC600000 */ sw $zero, ($v1) -/* D065F4 80240EC4 8FBF0014 */ lw $ra, 0x14($sp) -/* D065F8 80240EC8 8FB00010 */ lw $s0, 0x10($sp) -/* D065FC 80240ECC 24020001 */ addiu $v0, $zero, 1 -/* D06600 80240ED0 03E00008 */ jr $ra -/* D06604 80240ED4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s new file mode 100644 index 0000000000..c840fd0368 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240E8C_D065BC.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E8C_D065BC +/* D065BC 80240E8C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D065C0 80240E90 AFBF0014 */ sw $ra, 0x14($sp) +/* D065C4 80240E94 AFB00010 */ sw $s0, 0x10($sp) +/* D065C8 80240E98 0C00EABB */ jal get_npc_unsafe +/* D065CC 80240E9C 8C84014C */ lw $a0, 0x14c($a0) +/* D065D0 80240EA0 24040008 */ addiu $a0, $zero, 8 +/* D065D4 80240EA4 0040802D */ daddu $s0, $v0, $zero +/* D065D8 80240EA8 3C028024 */ lui $v0, 0x8024 +/* D065DC 80240EAC 24420EF8 */ addiu $v0, $v0, 0xef8 +/* D065E0 80240EB0 0C00AB39 */ jal heap_malloc +/* D065E4 80240EB4 AE020008 */ sw $v0, 8($s0) +/* D065E8 80240EB8 0040182D */ daddu $v1, $v0, $zero +/* D065EC 80240EBC AE030020 */ sw $v1, 0x20($s0) +/* D065F0 80240EC0 AC600000 */ sw $zero, ($v1) +/* D065F4 80240EC4 8FBF0014 */ lw $ra, 0x14($sp) +/* D065F8 80240EC8 8FB00010 */ lw $s0, 0x10($sp) +/* D065FC 80240ECC 24020001 */ addiu $v0, $zero, 1 +/* D06600 80240ED0 03E00008 */ jr $ra +/* D06604 80240ED4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C.s deleted file mode 100644 index 693856492a..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C.s +++ /dev/null @@ -1,10 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024161C -/* D06D4C 8024161C 3C028025 */ lui $v0, 0x8025 -/* D06D50 80241620 8C42B9B8 */ lw $v0, -0x4648($v0) -/* D06D54 80241624 8C42000C */ lw $v0, 0xc($v0) -/* D06D58 80241628 AC40001C */ sw $zero, 0x1c($v0) -/* D06D5C 8024162C 03E00008 */ jr $ra -/* D06D60 80241630 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C_D06D4C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C_D06D4C.s new file mode 100644 index 0000000000..2dd5c7023e --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024161C_D06D4C.s @@ -0,0 +1,10 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024161C_D06D4C +/* D06D4C 8024161C 3C028025 */ lui $v0, 0x8025 +/* D06D50 80241620 8C42B9B8 */ lw $v0, -0x4648($v0) +/* D06D54 80241624 8C42000C */ lw $v0, 0xc($v0) +/* D06D58 80241628 AC40001C */ sw $zero, 0x1c($v0) +/* D06D5C 8024162C 03E00008 */ jr $ra +/* D06D60 80241630 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634.s deleted file mode 100644 index 3538e44a06..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241634 -/* D06D64 80241634 3C028025 */ lui $v0, 0x8025 -/* D06D68 80241638 8C42B9B8 */ lw $v0, -0x4648($v0) -/* D06D6C 8024163C 8C43000C */ lw $v1, 0xc($v0) -/* D06D70 80241640 24020001 */ addiu $v0, $zero, 1 -/* D06D74 80241644 AC62001C */ sw $v0, 0x1c($v1) -/* D06D78 80241648 03E00008 */ jr $ra -/* D06D7C 8024164C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634_D06D64.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634_D06D64.s new file mode 100644 index 0000000000..20cbb34169 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241634_D06D64.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241634_D06D64 +/* D06D64 80241634 3C028025 */ lui $v0, 0x8025 +/* D06D68 80241638 8C42B9B8 */ lw $v0, -0x4648($v0) +/* D06D6C 8024163C 8C43000C */ lw $v1, 0xc($v0) +/* D06D70 80241640 24020001 */ addiu $v0, $zero, 1 +/* D06D74 80241644 AC62001C */ sw $v0, 0x1c($v1) +/* D06D78 80241648 03E00008 */ jr $ra +/* D06D7C 8024164C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698.s deleted file mode 100644 index f05b833230..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241698 -/* D06DC8 80241698 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06DCC 8024169C AFB10014 */ sw $s1, 0x14($sp) -/* D06DD0 802416A0 0080882D */ daddu $s1, $a0, $zero -/* D06DD4 802416A4 AFBF0018 */ sw $ra, 0x18($sp) -/* D06DD8 802416A8 AFB00010 */ sw $s0, 0x10($sp) -/* D06DDC 802416AC 8E30000C */ lw $s0, 0xc($s1) -/* D06DE0 802416B0 8E050000 */ lw $a1, ($s0) -/* D06DE4 802416B4 0C0B1EAF */ jal get_variable -/* D06DE8 802416B8 26100004 */ addiu $s0, $s0, 4 -/* D06DEC 802416BC 0220202D */ daddu $a0, $s1, $zero -/* D06DF0 802416C0 8E050000 */ lw $a1, ($s0) -/* D06DF4 802416C4 0C0B210B */ jal get_float_variable -/* D06DF8 802416C8 0040802D */ daddu $s0, $v0, $zero -/* D06DFC 802416CC 24020002 */ addiu $v0, $zero, 2 -/* D06E00 802416D0 00501804 */ sllv $v1, $s0, $v0 -/* D06E04 802416D4 00701821 */ addu $v1, $v1, $s0 -/* D06E08 802416D8 00431804 */ sllv $v1, $v1, $v0 -/* D06E0C 802416DC 00701823 */ subu $v1, $v1, $s0 -/* D06E10 802416E0 000320C0 */ sll $a0, $v1, 3 -/* D06E14 802416E4 00641821 */ addu $v1, $v1, $a0 -/* D06E18 802416E8 000318C0 */ sll $v1, $v1, 3 -/* D06E1C 802416EC 3C01800B */ lui $at, 0x800b -/* D06E20 802416F0 00230821 */ addu $at, $at, $v1 -/* D06E24 802416F4 E4201D98 */ swc1 $f0, 0x1d98($at) -/* D06E28 802416F8 8FBF0018 */ lw $ra, 0x18($sp) -/* D06E2C 802416FC 8FB10014 */ lw $s1, 0x14($sp) -/* D06E30 80241700 8FB00010 */ lw $s0, 0x10($sp) -/* D06E34 80241704 03E00008 */ jr $ra -/* D06E38 80241708 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s new file mode 100644 index 0000000000..7db5c1eb2d --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241698_D06DC8 +/* D06DC8 80241698 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D06DCC 8024169C AFB10014 */ sw $s1, 0x14($sp) +/* D06DD0 802416A0 0080882D */ daddu $s1, $a0, $zero +/* D06DD4 802416A4 AFBF0018 */ sw $ra, 0x18($sp) +/* D06DD8 802416A8 AFB00010 */ sw $s0, 0x10($sp) +/* D06DDC 802416AC 8E30000C */ lw $s0, 0xc($s1) +/* D06DE0 802416B0 8E050000 */ lw $a1, ($s0) +/* D06DE4 802416B4 0C0B1EAF */ jal get_variable +/* D06DE8 802416B8 26100004 */ addiu $s0, $s0, 4 +/* D06DEC 802416BC 0220202D */ daddu $a0, $s1, $zero +/* D06DF0 802416C0 8E050000 */ lw $a1, ($s0) +/* D06DF4 802416C4 0C0B210B */ jal get_float_variable +/* D06DF8 802416C8 0040802D */ daddu $s0, $v0, $zero +/* D06DFC 802416CC 24020002 */ addiu $v0, $zero, 2 +/* D06E00 802416D0 00501804 */ sllv $v1, $s0, $v0 +/* D06E04 802416D4 00701821 */ addu $v1, $v1, $s0 +/* D06E08 802416D8 00431804 */ sllv $v1, $v1, $v0 +/* D06E0C 802416DC 00701823 */ subu $v1, $v1, $s0 +/* D06E10 802416E0 000320C0 */ sll $a0, $v1, 3 +/* D06E14 802416E4 00641821 */ addu $v1, $v1, $a0 +/* D06E18 802416E8 000318C0 */ sll $v1, $v1, 3 +/* D06E1C 802416EC 3C01800B */ lui $at, 0x800b +/* D06E20 802416F0 00230821 */ addu $at, $at, $v1 +/* D06E24 802416F4 E4201D98 */ swc1 $f0, 0x1d98($at) +/* D06E28 802416F8 8FBF0018 */ lw $ra, 0x18($sp) +/* D06E2C 802416FC 8FB10014 */ lw $s1, 0x14($sp) +/* D06E30 80241700 8FB00010 */ lw $s0, 0x10($sp) +/* D06E34 80241704 03E00008 */ jr $ra +/* D06E38 80241708 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24.s deleted file mode 100644 index d9c6308083..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B24 -/* D07254 80241B24 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D07258 80241B28 3C058025 */ lui $a1, 0x8025 -/* D0725C 80241B2C 8CA5B9A8 */ lw $a1, -0x4658($a1) -/* D07260 80241B30 AFBF0010 */ sw $ra, 0x10($sp) -/* D07264 80241B34 0C0B1EAF */ jal get_variable -/* D07268 80241B38 0000202D */ daddu $a0, $zero, $zero -/* D0726C 80241B3C 0040182D */ daddu $v1, $v0, $zero -/* D07270 80241B40 24020001 */ addiu $v0, $zero, 1 -/* D07274 80241B44 14620006 */ bne $v1, $v0, .L80241B60 -/* D07278 80241B48 24020002 */ addiu $v0, $zero, 2 -/* D0727C 80241B4C 44800000 */ mtc1 $zero, $f0 -/* D07280 80241B50 00000000 */ nop -/* D07284 80241B54 44050000 */ mfc1 $a1, $f0 -/* D07288 80241B58 080906DE */ j .L80241B78 -/* D0728C 80241B5C 0000202D */ daddu $a0, $zero, $zero -.L80241B60: -/* D07290 80241B60 14620008 */ bne $v1, $v0, .L80241B84 -/* D07294 80241B64 24040001 */ addiu $a0, $zero, 1 -/* D07298 80241B68 44800000 */ mtc1 $zero, $f0 -/* D0729C 80241B6C 00000000 */ nop -/* D072A0 80241B70 44050000 */ mfc1 $a1, $f0 -/* D072A4 80241B74 00000000 */ nop -.L80241B78: -/* D072A8 80241B78 00A0302D */ daddu $a2, $a1, $zero -/* D072AC 80241B7C 0C01C5A4 */ jal func_80071690 -/* D072B0 80241B80 00A0382D */ daddu $a3, $a1, $zero -.L80241B84: -/* D072B4 80241B84 8FBF0010 */ lw $ra, 0x10($sp) -/* D072B8 80241B88 03E00008 */ jr $ra -/* D072BC 80241B8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s new file mode 100644 index 0000000000..9fc791d43c --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241B24_D07254.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B24_D07254 +/* D07254 80241B24 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D07258 80241B28 3C058025 */ lui $a1, 0x8025 +/* D0725C 80241B2C 8CA5B9A8 */ lw $a1, -0x4658($a1) +/* D07260 80241B30 AFBF0010 */ sw $ra, 0x10($sp) +/* D07264 80241B34 0C0B1EAF */ jal get_variable +/* D07268 80241B38 0000202D */ daddu $a0, $zero, $zero +/* D0726C 80241B3C 0040182D */ daddu $v1, $v0, $zero +/* D07270 80241B40 24020001 */ addiu $v0, $zero, 1 +/* D07274 80241B44 14620006 */ bne $v1, $v0, .L80241B60 +/* D07278 80241B48 24020002 */ addiu $v0, $zero, 2 +/* D0727C 80241B4C 44800000 */ mtc1 $zero, $f0 +/* D07280 80241B50 00000000 */ nop +/* D07284 80241B54 44050000 */ mfc1 $a1, $f0 +/* D07288 80241B58 080906DE */ j .L80241B78 +/* D0728C 80241B5C 0000202D */ daddu $a0, $zero, $zero +.L80241B60: +/* D07290 80241B60 14620008 */ bne $v1, $v0, .L80241B84 +/* D07294 80241B64 24040001 */ addiu $a0, $zero, 1 +/* D07298 80241B68 44800000 */ mtc1 $zero, $f0 +/* D0729C 80241B6C 00000000 */ nop +/* D072A0 80241B70 44050000 */ mfc1 $a1, $f0 +/* D072A4 80241B74 00000000 */ nop +.L80241B78: +/* D072A8 80241B78 00A0302D */ daddu $a2, $a1, $zero +/* D072AC 80241B7C 0C01C5A4 */ jal func_80071690 +/* D072B0 80241B80 00A0382D */ daddu $a3, $a1, $zero +.L80241B84: +/* D072B4 80241B84 8FBF0010 */ lw $ra, 0x10($sp) +/* D072B8 80241B88 03E00008 */ jr $ra +/* D072BC 80241B8C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C.s deleted file mode 100644 index ffdc768b4e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024012C -/* D111EC 8024012C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* D111F0 80240130 AFB10034 */ sw $s1, 0x34($sp) -/* D111F4 80240134 0080882D */ daddu $s1, $a0, $zero -/* D111F8 80240138 AFBF0038 */ sw $ra, 0x38($sp) -/* D111FC 8024013C AFB00030 */ sw $s0, 0x30($sp) -/* D11200 80240140 8E300148 */ lw $s0, 0x148($s1) -/* D11204 80240144 0C00EABB */ jal get_npc_unsafe -/* D11208 80240148 86040008 */ lh $a0, 8($s0) -/* D1120C 8024014C 0040282D */ daddu $a1, $v0, $zero -/* D11210 80240150 94A2008E */ lhu $v0, 0x8e($a1) -/* D11214 80240154 2442FFFF */ addiu $v0, $v0, -1 -/* D11218 80240158 A4A2008E */ sh $v0, 0x8e($a1) -/* D1121C 8024015C 00021400 */ sll $v0, $v0, 0x10 -/* D11220 80240160 1C400023 */ bgtz $v0, .L802401F0 -/* D11224 80240164 24020004 */ addiu $v0, $zero, 4 -/* D11228 80240168 8E0300CC */ lw $v1, 0xcc($s0) -/* D1122C 8024016C AE02006C */ sw $v0, 0x6c($s0) -/* D11230 80240170 8C620000 */ lw $v0, ($v1) -/* D11234 80240174 ACA20028 */ sw $v0, 0x28($a1) -/* D11238 80240178 9602007A */ lhu $v0, 0x7a($s0) -/* D1123C 8024017C A4A2008E */ sh $v0, 0x8e($a1) -/* D11240 80240180 8E020078 */ lw $v0, 0x78($s0) -/* D11244 80240184 28420008 */ slti $v0, $v0, 8 -/* D11248 80240188 14400018 */ bnez $v0, .L802401EC -/* D1124C 8024018C 24020021 */ addiu $v0, $zero, 0x21 -/* D11250 80240190 24040003 */ addiu $a0, $zero, 3 -/* D11254 80240194 27A30028 */ addiu $v1, $sp, 0x28 -/* D11258 80240198 84A700A8 */ lh $a3, 0xa8($a1) -/* D1125C 8024019C 3C013F80 */ lui $at, 0x3f80 -/* D11260 802401A0 44810000 */ mtc1 $at, $f0 -/* D11264 802401A4 3C014000 */ lui $at, 0x4000 -/* D11268 802401A8 44811000 */ mtc1 $at, $f2 -/* D1126C 802401AC 3C01C1A0 */ lui $at, 0xc1a0 -/* D11270 802401B0 44812000 */ mtc1 $at, $f4 -/* D11274 802401B4 44873000 */ mtc1 $a3, $f6 -/* D11278 802401B8 00000000 */ nop -/* D1127C 802401BC 468031A0 */ cvt.s.w $f6, $f6 -/* D11280 802401C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* D11284 802401C4 E7A20014 */ swc1 $f2, 0x14($sp) -/* D11288 802401C8 E7A40018 */ swc1 $f4, 0x18($sp) -/* D1128C 802401CC 8E020078 */ lw $v0, 0x78($s0) -/* D11290 802401D0 44073000 */ mfc1 $a3, $f6 -/* D11294 802401D4 0000302D */ daddu $a2, $zero, $zero -/* D11298 802401D8 AFA30020 */ sw $v1, 0x20($sp) -/* D1129C 802401DC 2442FFFF */ addiu $v0, $v0, -1 -/* D112A0 802401E0 0C01BFA4 */ jal fx_emote -/* D112A4 802401E4 AFA2001C */ sw $v0, 0x1c($sp) -/* D112A8 802401E8 24020021 */ addiu $v0, $zero, 0x21 -.L802401EC: -/* D112AC 802401EC AE220070 */ sw $v0, 0x70($s1) -.L802401F0: -/* D112B0 802401F0 8FBF0038 */ lw $ra, 0x38($sp) -/* D112B4 802401F4 8FB10034 */ lw $s1, 0x34($sp) -/* D112B8 802401F8 8FB00030 */ lw $s0, 0x30($sp) -/* D112BC 802401FC 03E00008 */ jr $ra -/* D112C0 80240200 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s new file mode 100644 index 0000000000..ccc5543baa --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024012C_D111EC.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024012C_D111EC +/* D111EC 8024012C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* D111F0 80240130 AFB10034 */ sw $s1, 0x34($sp) +/* D111F4 80240134 0080882D */ daddu $s1, $a0, $zero +/* D111F8 80240138 AFBF0038 */ sw $ra, 0x38($sp) +/* D111FC 8024013C AFB00030 */ sw $s0, 0x30($sp) +/* D11200 80240140 8E300148 */ lw $s0, 0x148($s1) +/* D11204 80240144 0C00EABB */ jal get_npc_unsafe +/* D11208 80240148 86040008 */ lh $a0, 8($s0) +/* D1120C 8024014C 0040282D */ daddu $a1, $v0, $zero +/* D11210 80240150 94A2008E */ lhu $v0, 0x8e($a1) +/* D11214 80240154 2442FFFF */ addiu $v0, $v0, -1 +/* D11218 80240158 A4A2008E */ sh $v0, 0x8e($a1) +/* D1121C 8024015C 00021400 */ sll $v0, $v0, 0x10 +/* D11220 80240160 1C400023 */ bgtz $v0, .L802401F0 +/* D11224 80240164 24020004 */ addiu $v0, $zero, 4 +/* D11228 80240168 8E0300CC */ lw $v1, 0xcc($s0) +/* D1122C 8024016C AE02006C */ sw $v0, 0x6c($s0) +/* D11230 80240170 8C620000 */ lw $v0, ($v1) +/* D11234 80240174 ACA20028 */ sw $v0, 0x28($a1) +/* D11238 80240178 9602007A */ lhu $v0, 0x7a($s0) +/* D1123C 8024017C A4A2008E */ sh $v0, 0x8e($a1) +/* D11240 80240180 8E020078 */ lw $v0, 0x78($s0) +/* D11244 80240184 28420008 */ slti $v0, $v0, 8 +/* D11248 80240188 14400018 */ bnez $v0, .L802401EC +/* D1124C 8024018C 24020021 */ addiu $v0, $zero, 0x21 +/* D11250 80240190 24040003 */ addiu $a0, $zero, 3 +/* D11254 80240194 27A30028 */ addiu $v1, $sp, 0x28 +/* D11258 80240198 84A700A8 */ lh $a3, 0xa8($a1) +/* D1125C 8024019C 3C013F80 */ lui $at, 0x3f80 +/* D11260 802401A0 44810000 */ mtc1 $at, $f0 +/* D11264 802401A4 3C014000 */ lui $at, 0x4000 +/* D11268 802401A8 44811000 */ mtc1 $at, $f2 +/* D1126C 802401AC 3C01C1A0 */ lui $at, 0xc1a0 +/* D11270 802401B0 44812000 */ mtc1 $at, $f4 +/* D11274 802401B4 44873000 */ mtc1 $a3, $f6 +/* D11278 802401B8 00000000 */ nop +/* D1127C 802401BC 468031A0 */ cvt.s.w $f6, $f6 +/* D11280 802401C0 E7A00010 */ swc1 $f0, 0x10($sp) +/* D11284 802401C4 E7A20014 */ swc1 $f2, 0x14($sp) +/* D11288 802401C8 E7A40018 */ swc1 $f4, 0x18($sp) +/* D1128C 802401CC 8E020078 */ lw $v0, 0x78($s0) +/* D11290 802401D0 44073000 */ mfc1 $a3, $f6 +/* D11294 802401D4 0000302D */ daddu $a2, $zero, $zero +/* D11298 802401D8 AFA30020 */ sw $v1, 0x20($sp) +/* D1129C 802401DC 2442FFFF */ addiu $v0, $v0, -1 +/* D112A0 802401E0 0C01BFA4 */ jal fx_emote +/* D112A4 802401E4 AFA2001C */ sw $v0, 0x1c($sp) +/* D112A8 802401E8 24020021 */ addiu $v0, $zero, 0x21 +.L802401EC: +/* D112AC 802401EC AE220070 */ sw $v0, 0x70($s1) +.L802401F0: +/* D112B0 802401F0 8FBF0038 */ lw $ra, 0x38($sp) +/* D112B4 802401F4 8FB10034 */ lw $s1, 0x34($sp) +/* D112B8 802401F8 8FB00030 */ lw $s0, 0x30($sp) +/* D112BC 802401FC 03E00008 */ jr $ra +/* D112C0 80240200 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258.s deleted file mode 100644 index 510c62935f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240258 -/* D11318 80240258 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D1131C 8024025C AFBF0024 */ sw $ra, 0x24($sp) -/* D11320 80240260 AFB40020 */ sw $s4, 0x20($sp) -/* D11324 80240264 AFB3001C */ sw $s3, 0x1c($sp) -/* D11328 80240268 AFB20018 */ sw $s2, 0x18($sp) -/* D1132C 8024026C AFB10014 */ sw $s1, 0x14($sp) -/* D11330 80240270 AFB00010 */ sw $s0, 0x10($sp) -/* D11334 80240274 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D11338 80240278 8C900148 */ lw $s0, 0x148($a0) -/* D1133C 8024027C 86040008 */ lh $a0, 8($s0) -/* D11340 80240280 0C00EABB */ jal get_npc_unsafe -/* D11344 80240284 24110001 */ addiu $s1, $zero, 1 -/* D11348 80240288 86040008 */ lh $a0, 8($s0) -/* D1134C 8024028C 0040802D */ daddu $s0, $v0, $zero -/* D11350 80240290 3C05800B */ lui $a1, %hi(gCameras) -/* D11354 80240294 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D11358 80240298 3C03800A */ lui $v1, 0x800a -/* D1135C 8024029C 8463A634 */ lh $v1, -0x59cc($v1) -/* D11360 802402A0 00912021 */ addu $a0, $a0, $s1 -/* D11364 802402A4 00031080 */ sll $v0, $v1, 2 -/* D11368 802402A8 00431021 */ addu $v0, $v0, $v1 -/* D1136C 802402AC 00021080 */ sll $v0, $v0, 2 -/* D11370 802402B0 00431023 */ subu $v0, $v0, $v1 -/* D11374 802402B4 000218C0 */ sll $v1, $v0, 3 -/* D11378 802402B8 00431021 */ addu $v0, $v0, $v1 -/* D1137C 802402BC 000210C0 */ sll $v0, $v0, 3 -/* D11380 802402C0 0C00FB3A */ jal get_enemy -/* D11384 802402C4 00459021 */ addu $s2, $v0, $a1 -/* D11388 802402C8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* D1138C 802402CC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* D11390 802402D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D11394 802402D4 8E830000 */ lw $v1, ($s4) -/* D11398 802402D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D1139C 802402DC 8C660028 */ lw $a2, 0x28($v1) -/* D113A0 802402E0 8C670030 */ lw $a3, 0x30($v1) -/* D113A4 802402E4 0C00A7B5 */ jal dist2D -/* D113A8 802402E8 0040982D */ daddu $s3, $v0, $zero -/* D113AC 802402EC C6620074 */ lwc1 $f2, 0x74($s3) -/* D113B0 802402F0 468010A0 */ cvt.s.w $f2, $f2 -/* D113B4 802402F4 4600103C */ c.lt.s $f2, $f0 -/* D113B8 802402F8 00000000 */ nop -/* D113BC 802402FC 45030001 */ bc1tl .L80240304 -/* D113C0 80240300 0000882D */ daddu $s1, $zero, $zero -.L80240304: -/* D113C4 80240304 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D113C8 80240308 C60E000C */ lwc1 $f14, 0xc($s0) -/* D113CC 8024030C 3C014387 */ lui $at, 0x4387 -/* D113D0 80240310 4481A000 */ mtc1 $at, $f20 -/* D113D4 80240314 0C00A70A */ jal get_clamped_angle_diff -/* D113D8 80240318 00000000 */ nop -/* D113DC 8024031C 0C00A6C9 */ jal clamp_angle -/* D113E0 80240320 46000306 */ mov.s $f12, $f0 -/* D113E4 80240324 3C018024 */ lui $at, 0x8024 -/* D113E8 80240328 D4222370 */ ldc1 $f2, 0x2370($at) -/* D113EC 8024032C 46000021 */ cvt.d.s $f0, $f0 -/* D113F0 80240330 4622003C */ c.lt.d $f0, $f2 -/* D113F4 80240334 00000000 */ nop -/* D113F8 80240338 45000003 */ bc1f .L80240348 -/* D113FC 8024033C 00000000 */ nop -/* D11400 80240340 3C0142B4 */ lui $at, 0x42b4 -/* D11404 80240344 4481A000 */ mtc1 $at, $f20 -.L80240348: -/* D11408 80240348 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D1140C 8024034C 8E820000 */ lw $v0, ($s4) -/* D11410 80240350 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D11414 80240354 8C460028 */ lw $a2, 0x28($v0) -/* D11418 80240358 0C00A720 */ jal atan2 -/* D1141C 8024035C 8C470030 */ lw $a3, 0x30($v0) -/* D11420 80240360 4600A306 */ mov.s $f12, $f20 -/* D11424 80240364 0C00A70A */ jal get_clamped_angle_diff -/* D11428 80240368 46000386 */ mov.s $f14, $f0 -/* D1142C 8024036C C6620078 */ lwc1 $f2, 0x78($s3) -/* D11430 80240370 468010A0 */ cvt.s.w $f2, $f2 -/* D11434 80240374 46000005 */ abs.s $f0, $f0 -/* D11438 80240378 4600103C */ c.lt.s $f2, $f0 -/* D1143C 8024037C 00000000 */ nop -/* D11440 80240380 45030001 */ bc1tl .L80240388 -/* D11444 80240384 0000882D */ daddu $s1, $zero, $zero -.L80240388: -/* D11448 80240388 8E820000 */ lw $v0, ($s4) -/* D1144C 8024038C C600003C */ lwc1 $f0, 0x3c($s0) -/* D11450 80240390 C442002C */ lwc1 $f2, 0x2c($v0) -/* D11454 80240394 860200A8 */ lh $v0, 0xa8($s0) -/* D11458 80240398 46020001 */ sub.s $f0, $f0, $f2 -/* D1145C 8024039C 44821000 */ mtc1 $v0, $f2 -/* D11460 802403A0 00000000 */ nop -/* D11464 802403A4 468010A1 */ cvt.d.w $f2, $f2 -/* D11468 802403A8 46221080 */ add.d $f2, $f2, $f2 -/* D1146C 802403AC 46000005 */ abs.s $f0, $f0 -/* D11470 802403B0 46000021 */ cvt.d.s $f0, $f0 -/* D11474 802403B4 4620103E */ c.le.d $f2, $f0 -/* D11478 802403B8 00000000 */ nop -/* D1147C 802403BC 45030001 */ bc1tl .L802403C4 -/* D11480 802403C0 0000882D */ daddu $s1, $zero, $zero -.L802403C4: -/* D11484 802403C4 3C038011 */ lui $v1, 0x8011 -/* D11488 802403C8 8063EBB3 */ lb $v1, -0x144d($v1) -/* D1148C 802403CC 24020009 */ addiu $v0, $zero, 9 -/* D11490 802403D0 50620001 */ beql $v1, $v0, .L802403D8 -/* D11494 802403D4 0000882D */ daddu $s1, $zero, $zero -.L802403D8: -/* D11498 802403D8 24020007 */ addiu $v0, $zero, 7 -/* D1149C 802403DC 50620001 */ beql $v1, $v0, .L802403E4 -/* D114A0 802403E0 0000882D */ daddu $s1, $zero, $zero -.L802403E4: -/* D114A4 802403E4 0220102D */ daddu $v0, $s1, $zero -/* D114A8 802403E8 8FBF0024 */ lw $ra, 0x24($sp) -/* D114AC 802403EC 8FB40020 */ lw $s4, 0x20($sp) -/* D114B0 802403F0 8FB3001C */ lw $s3, 0x1c($sp) -/* D114B4 802403F4 8FB20018 */ lw $s2, 0x18($sp) -/* D114B8 802403F8 8FB10014 */ lw $s1, 0x14($sp) -/* D114BC 802403FC 8FB00010 */ lw $s0, 0x10($sp) -/* D114C0 80240400 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D114C4 80240404 03E00008 */ jr $ra -/* D114C8 80240408 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s new file mode 100644 index 0000000000..28cfe09a91 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_80240258_D11318.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240258_D11318 +/* D11318 80240258 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* D1131C 8024025C AFBF0024 */ sw $ra, 0x24($sp) +/* D11320 80240260 AFB40020 */ sw $s4, 0x20($sp) +/* D11324 80240264 AFB3001C */ sw $s3, 0x1c($sp) +/* D11328 80240268 AFB20018 */ sw $s2, 0x18($sp) +/* D1132C 8024026C AFB10014 */ sw $s1, 0x14($sp) +/* D11330 80240270 AFB00010 */ sw $s0, 0x10($sp) +/* D11334 80240274 F7B40028 */ sdc1 $f20, 0x28($sp) +/* D11338 80240278 8C900148 */ lw $s0, 0x148($a0) +/* D1133C 8024027C 86040008 */ lh $a0, 8($s0) +/* D11340 80240280 0C00EABB */ jal get_npc_unsafe +/* D11344 80240284 24110001 */ addiu $s1, $zero, 1 +/* D11348 80240288 86040008 */ lh $a0, 8($s0) +/* D1134C 8024028C 0040802D */ daddu $s0, $v0, $zero +/* D11350 80240290 3C05800B */ lui $a1, %hi(gCameras) +/* D11354 80240294 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* D11358 80240298 3C03800A */ lui $v1, 0x800a +/* D1135C 8024029C 8463A634 */ lh $v1, -0x59cc($v1) +/* D11360 802402A0 00912021 */ addu $a0, $a0, $s1 +/* D11364 802402A4 00031080 */ sll $v0, $v1, 2 +/* D11368 802402A8 00431021 */ addu $v0, $v0, $v1 +/* D1136C 802402AC 00021080 */ sll $v0, $v0, 2 +/* D11370 802402B0 00431023 */ subu $v0, $v0, $v1 +/* D11374 802402B4 000218C0 */ sll $v1, $v0, 3 +/* D11378 802402B8 00431021 */ addu $v0, $v0, $v1 +/* D1137C 802402BC 000210C0 */ sll $v0, $v0, 3 +/* D11380 802402C0 0C00FB3A */ jal get_enemy +/* D11384 802402C4 00459021 */ addu $s2, $v0, $a1 +/* D11388 802402C8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) +/* D1138C 802402CC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) +/* D11390 802402D0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* D11394 802402D4 8E830000 */ lw $v1, ($s4) +/* D11398 802402D8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* D1139C 802402DC 8C660028 */ lw $a2, 0x28($v1) +/* D113A0 802402E0 8C670030 */ lw $a3, 0x30($v1) +/* D113A4 802402E4 0C00A7B5 */ jal dist2D +/* D113A8 802402E8 0040982D */ daddu $s3, $v0, $zero +/* D113AC 802402EC C6620074 */ lwc1 $f2, 0x74($s3) +/* D113B0 802402F0 468010A0 */ cvt.s.w $f2, $f2 +/* D113B4 802402F4 4600103C */ c.lt.s $f2, $f0 +/* D113B8 802402F8 00000000 */ nop +/* D113BC 802402FC 45030001 */ bc1tl .L80240304 +/* D113C0 80240300 0000882D */ daddu $s1, $zero, $zero +.L80240304: +/* D113C4 80240304 C64C006C */ lwc1 $f12, 0x6c($s2) +/* D113C8 80240308 C60E000C */ lwc1 $f14, 0xc($s0) +/* D113CC 8024030C 3C014387 */ lui $at, 0x4387 +/* D113D0 80240310 4481A000 */ mtc1 $at, $f20 +/* D113D4 80240314 0C00A70A */ jal get_clamped_angle_diff +/* D113D8 80240318 00000000 */ nop +/* D113DC 8024031C 0C00A6C9 */ jal clamp_angle +/* D113E0 80240320 46000306 */ mov.s $f12, $f0 +/* D113E4 80240324 3C018024 */ lui $at, 0x8024 +/* D113E8 80240328 D4222370 */ ldc1 $f2, 0x2370($at) +/* D113EC 8024032C 46000021 */ cvt.d.s $f0, $f0 +/* D113F0 80240330 4622003C */ c.lt.d $f0, $f2 +/* D113F4 80240334 00000000 */ nop +/* D113F8 80240338 45000003 */ bc1f .L80240348 +/* D113FC 8024033C 00000000 */ nop +/* D11400 80240340 3C0142B4 */ lui $at, 0x42b4 +/* D11404 80240344 4481A000 */ mtc1 $at, $f20 +.L80240348: +/* D11408 80240348 C60C0038 */ lwc1 $f12, 0x38($s0) +/* D1140C 8024034C 8E820000 */ lw $v0, ($s4) +/* D11410 80240350 C60E0040 */ lwc1 $f14, 0x40($s0) +/* D11414 80240354 8C460028 */ lw $a2, 0x28($v0) +/* D11418 80240358 0C00A720 */ jal atan2 +/* D1141C 8024035C 8C470030 */ lw $a3, 0x30($v0) +/* D11420 80240360 4600A306 */ mov.s $f12, $f20 +/* D11424 80240364 0C00A70A */ jal get_clamped_angle_diff +/* D11428 80240368 46000386 */ mov.s $f14, $f0 +/* D1142C 8024036C C6620078 */ lwc1 $f2, 0x78($s3) +/* D11430 80240370 468010A0 */ cvt.s.w $f2, $f2 +/* D11434 80240374 46000005 */ abs.s $f0, $f0 +/* D11438 80240378 4600103C */ c.lt.s $f2, $f0 +/* D1143C 8024037C 00000000 */ nop +/* D11440 80240380 45030001 */ bc1tl .L80240388 +/* D11444 80240384 0000882D */ daddu $s1, $zero, $zero +.L80240388: +/* D11448 80240388 8E820000 */ lw $v0, ($s4) +/* D1144C 8024038C C600003C */ lwc1 $f0, 0x3c($s0) +/* D11450 80240390 C442002C */ lwc1 $f2, 0x2c($v0) +/* D11454 80240394 860200A8 */ lh $v0, 0xa8($s0) +/* D11458 80240398 46020001 */ sub.s $f0, $f0, $f2 +/* D1145C 8024039C 44821000 */ mtc1 $v0, $f2 +/* D11460 802403A0 00000000 */ nop +/* D11464 802403A4 468010A1 */ cvt.d.w $f2, $f2 +/* D11468 802403A8 46221080 */ add.d $f2, $f2, $f2 +/* D1146C 802403AC 46000005 */ abs.s $f0, $f0 +/* D11470 802403B0 46000021 */ cvt.d.s $f0, $f0 +/* D11474 802403B4 4620103E */ c.le.d $f2, $f0 +/* D11478 802403B8 00000000 */ nop +/* D1147C 802403BC 45030001 */ bc1tl .L802403C4 +/* D11480 802403C0 0000882D */ daddu $s1, $zero, $zero +.L802403C4: +/* D11484 802403C4 3C038011 */ lui $v1, 0x8011 +/* D11488 802403C8 8063EBB3 */ lb $v1, -0x144d($v1) +/* D1148C 802403CC 24020009 */ addiu $v0, $zero, 9 +/* D11490 802403D0 50620001 */ beql $v1, $v0, .L802403D8 +/* D11494 802403D4 0000882D */ daddu $s1, $zero, $zero +.L802403D8: +/* D11498 802403D8 24020007 */ addiu $v0, $zero, 7 +/* D1149C 802403DC 50620001 */ beql $v1, $v0, .L802403E4 +/* D114A0 802403E0 0000882D */ daddu $s1, $zero, $zero +.L802403E4: +/* D114A4 802403E4 0220102D */ daddu $v0, $s1, $zero +/* D114A8 802403E8 8FBF0024 */ lw $ra, 0x24($sp) +/* D114AC 802403EC 8FB40020 */ lw $s4, 0x20($sp) +/* D114B0 802403F0 8FB3001C */ lw $s3, 0x1c($sp) +/* D114B4 802403F4 8FB20018 */ lw $s2, 0x18($sp) +/* D114B8 802403F8 8FB10014 */ lw $s1, 0x14($sp) +/* D114BC 802403FC 8FB00010 */ lw $s0, 0x10($sp) +/* D114C0 80240400 D7B40028 */ ldc1 $f20, 0x28($sp) +/* D114C4 80240404 03E00008 */ jr $ra +/* D114C8 80240408 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s index 2fbf4a5760..d6751735ee 100644 --- a/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s +++ b/asm/nonmatchings/world/area_sam/sam_03/D110C0/func_8024066C_D1172C.s @@ -90,7 +90,7 @@ glabel func_8024066C_D1172C /* D1186C 802407AC 8E22006C */ lw $v0, 0x6c($s1) /* D11870 802407B0 14400006 */ bnez $v0, .L802407CC /* D11874 802407B4 00000000 */ nop -/* D11878 802407B8 0C090096 */ jal func_80240258 +/* D11878 802407B8 0C090096 */ jal func_80240258_D11318 /* D1187C 802407BC 0240202D */ daddu $a0, $s2, $zero /* D11880 802407C0 10400002 */ beqz $v0, .L802407CC /* D11884 802407C4 2402001E */ addiu $v0, $zero, 0x1e @@ -151,21 +151,21 @@ glabel func_8024066C_D1172C /* D1195C 8024089C 0280302D */ daddu $a2, $s4, $zero /* D11960 802408A0 0809023E */ j .L802408F8 /* D11964 802408A4 00000000 */ nop -/* D11968 802408A8 0C090014 */ jal func_80240050 +/* D11968 802408A8 0C090014 */ jal func_80240050_D11110 /* D1196C 802408AC 0240202D */ daddu $a0, $s2, $zero -/* D11970 802408B0 0C09002F */ jal func_802400BC +/* D11970 802408B0 0C09002F */ jal func_802400BC_D1117C /* D11974 802408B4 0240202D */ daddu $a0, $s2, $zero /* D11978 802408B8 8E430070 */ lw $v1, 0x70($s2) /* D1197C 802408BC 24020020 */ addiu $v0, $zero, 0x20 /* D11980 802408C0 1462000D */ bne $v1, $v0, .L802408F8 /* D11984 802408C4 00000000 */ nop -/* D11988 802408C8 0C09004B */ jal func_8024012C +/* D11988 802408C8 0C09004B */ jal func_8024012C_D111EC /* D1198C 802408CC 0240202D */ daddu $a0, $s2, $zero /* D11990 802408D0 8E430070 */ lw $v1, 0x70($s2) /* D11994 802408D4 24020021 */ addiu $v0, $zero, 0x21 /* D11998 802408D8 14620007 */ bne $v1, $v0, .L802408F8 /* D1199C 802408DC 00000000 */ nop -/* D119A0 802408E0 0C090081 */ jal func_80240204 +/* D119A0 802408E0 0C090081 */ jal func_80240204_D112C4 /* D119A4 802408E4 0240202D */ daddu $a0, $s2, $zero /* D119A8 802408E8 0809023E */ j .L802408F8 /* D119AC 802408EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_04/D135D0/func_80240070_D13640.s b/asm/nonmatchings/world/area_sam/sam_04/D135D0/func_80240070_D13640.s index c87615d5a0..454e8385b0 100644 --- a/asm/nonmatchings/world/area_sam/sam_04/D135D0/func_80240070_D13640.s +++ b/asm/nonmatchings/world/area_sam/sam_04/D135D0/func_80240070_D13640.s @@ -55,7 +55,7 @@ glabel func_80240070_D13640 /* D13708 80240138 4405E000 */ mfc1 $a1, $f28 /* D1370C 8024013C 4406D000 */ mfc1 $a2, $f26 /* D13710 80240140 4407C000 */ mfc1 $a3, $f24 -/* D13714 80240144 0C090000 */ jal func_80240000 +/* D13714 80240144 0C090000 */ jal func_80240000_D135D0 /* D13718 80240148 27A40010 */ addiu $a0, $sp, 0x10 /* D1371C 8024014C 27A40010 */ addiu $a0, $sp, 0x10 /* D13720 80240150 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240070_D13640 /* D13790 802401C0 4405E000 */ mfc1 $a1, $f28 /* D13794 802401C4 4406D000 */ mfc1 $a2, $f26 /* D13798 802401C8 4407C000 */ mfc1 $a3, $f24 -/* D1379C 802401CC 0C090000 */ jal func_80240000 +/* D1379C 802401CC 0C090000 */ jal func_80240000_D135D0 /* D137A0 802401D0 27A40010 */ addiu $a0, $sp, 0x10 /* D137A4 802401D4 27A40010 */ addiu $a0, $sp, 0x10 /* D137A8 802401D8 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s index 8b97f0e8bd..231b0e26b4 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_8024061C_D18DFC.s @@ -90,7 +90,7 @@ glabel func_8024061C_D18DFC /* D18F3C 8024075C 8E22006C */ lw $v0, 0x6c($s1) /* D18F40 80240760 14400006 */ bnez $v0, .L8024077C /* D18F44 80240764 00000000 */ nop -/* D18F48 80240768 0C090082 */ jal func_80240208 +/* D18F48 80240768 0C090082 */ jal func_80240208_D189E8 /* D18F4C 8024076C 0240202D */ daddu $a0, $s2, $zero /* D18F50 80240770 10400002 */ beqz $v0, .L8024077C /* D18F54 80240774 2402001E */ addiu $v0, $zero, 0x1e @@ -151,15 +151,15 @@ glabel func_8024061C_D18DFC /* D1902C 8024084C 0280302D */ daddu $a2, $s4, $zero /* D19030 80240850 0809022A */ j .L802408A8 /* D19034 80240854 00000000 */ nop -/* D19038 80240858 0C090000 */ jal func_80240000 +/* D19038 80240858 0C090000 */ jal func_80240000_D187E0 /* D1903C 8024085C 0240202D */ daddu $a0, $s2, $zero -/* D19040 80240860 0C09001B */ jal func_8024006C +/* D19040 80240860 0C09001B */ jal func_8024006C_D1884C /* D19044 80240864 0240202D */ daddu $a0, $s2, $zero /* D19048 80240868 8E430070 */ lw $v1, 0x70($s2) /* D1904C 8024086C 24020020 */ addiu $v0, $zero, 0x20 /* D19050 80240870 1462000D */ bne $v1, $v0, .L802408A8 /* D19054 80240874 00000000 */ nop -/* D19058 80240878 0C090037 */ jal func_802400DC +/* D19058 80240878 0C090037 */ jal func_802400DC_D188BC /* D1905C 8024087C 0240202D */ daddu $a0, $s2, $zero /* D19060 80240880 8E430070 */ lw $v1, 0x70($s2) /* D19064 80240884 24020021 */ addiu $v0, $zero, 0x21 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478.s deleted file mode 100644 index d1d9508df8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241478 -/* D19C58 80241478 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D19C5C 8024147C AFB10014 */ sw $s1, 0x14($sp) -/* D19C60 80241480 0080882D */ daddu $s1, $a0, $zero -/* D19C64 80241484 AFBF0018 */ sw $ra, 0x18($sp) -/* D19C68 80241488 AFB00010 */ sw $s0, 0x10($sp) -/* D19C6C 8024148C 8E300148 */ lw $s0, 0x148($s1) -/* D19C70 80241490 0C00EABB */ jal get_npc_unsafe -/* D19C74 80241494 86040008 */ lh $a0, 8($s0) -/* D19C78 80241498 0040202D */ daddu $a0, $v0, $zero -/* D19C7C 8024149C 9482008E */ lhu $v0, 0x8e($a0) -/* D19C80 802414A0 2442FFFF */ addiu $v0, $v0, -1 -/* D19C84 802414A4 A482008E */ sh $v0, 0x8e($a0) -/* D19C88 802414A8 00021400 */ sll $v0, $v0, 0x10 -/* D19C8C 802414AC 8E030098 */ lw $v1, 0x98($s0) -/* D19C90 802414B0 00021403 */ sra $v0, $v0, 0x10 -/* D19C94 802414B4 0062182A */ slt $v1, $v1, $v0 -/* D19C98 802414B8 14600005 */ bnez $v1, .L802414D0 -/* D19C9C 802414BC 3C03E0EF */ lui $v1, 0xe0ef -/* D19CA0 802414C0 8E020000 */ lw $v0, ($s0) -/* D19CA4 802414C4 3463FFFF */ ori $v1, $v1, 0xffff -/* D19CA8 802414C8 00431024 */ and $v0, $v0, $v1 -/* D19CAC 802414CC AE020000 */ sw $v0, ($s0) -.L802414D0: -/* D19CB0 802414D0 8482008E */ lh $v0, 0x8e($a0) -/* D19CB4 802414D4 14400007 */ bnez $v0, .L802414F4 -/* D19CB8 802414D8 00000000 */ nop -/* D19CBC 802414DC 8E0200CC */ lw $v0, 0xcc($s0) -/* D19CC0 802414E0 8C420028 */ lw $v0, 0x28($v0) -/* D19CC4 802414E4 A480008E */ sh $zero, 0x8e($a0) -/* D19CC8 802414E8 AC820028 */ sw $v0, 0x28($a0) -/* D19CCC 802414EC 2402000C */ addiu $v0, $zero, 0xc -/* D19CD0 802414F0 AE220070 */ sw $v0, 0x70($s1) -.L802414F4: -/* D19CD4 802414F4 8FBF0018 */ lw $ra, 0x18($sp) -/* D19CD8 802414F8 8FB10014 */ lw $s1, 0x14($sp) -/* D19CDC 802414FC 8FB00010 */ lw $s0, 0x10($sp) -/* D19CE0 80241500 03E00008 */ jr $ra -/* D19CE4 80241504 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s new file mode 100644 index 0000000000..05340b316c --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241478_D19C58.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241478_D19C58 +/* D19C58 80241478 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D19C5C 8024147C AFB10014 */ sw $s1, 0x14($sp) +/* D19C60 80241480 0080882D */ daddu $s1, $a0, $zero +/* D19C64 80241484 AFBF0018 */ sw $ra, 0x18($sp) +/* D19C68 80241488 AFB00010 */ sw $s0, 0x10($sp) +/* D19C6C 8024148C 8E300148 */ lw $s0, 0x148($s1) +/* D19C70 80241490 0C00EABB */ jal get_npc_unsafe +/* D19C74 80241494 86040008 */ lh $a0, 8($s0) +/* D19C78 80241498 0040202D */ daddu $a0, $v0, $zero +/* D19C7C 8024149C 9482008E */ lhu $v0, 0x8e($a0) +/* D19C80 802414A0 2442FFFF */ addiu $v0, $v0, -1 +/* D19C84 802414A4 A482008E */ sh $v0, 0x8e($a0) +/* D19C88 802414A8 00021400 */ sll $v0, $v0, 0x10 +/* D19C8C 802414AC 8E030098 */ lw $v1, 0x98($s0) +/* D19C90 802414B0 00021403 */ sra $v0, $v0, 0x10 +/* D19C94 802414B4 0062182A */ slt $v1, $v1, $v0 +/* D19C98 802414B8 14600005 */ bnez $v1, .L802414D0 +/* D19C9C 802414BC 3C03E0EF */ lui $v1, 0xe0ef +/* D19CA0 802414C0 8E020000 */ lw $v0, ($s0) +/* D19CA4 802414C4 3463FFFF */ ori $v1, $v1, 0xffff +/* D19CA8 802414C8 00431024 */ and $v0, $v0, $v1 +/* D19CAC 802414CC AE020000 */ sw $v0, ($s0) +.L802414D0: +/* D19CB0 802414D0 8482008E */ lh $v0, 0x8e($a0) +/* D19CB4 802414D4 14400007 */ bnez $v0, .L802414F4 +/* D19CB8 802414D8 00000000 */ nop +/* D19CBC 802414DC 8E0200CC */ lw $v0, 0xcc($s0) +/* D19CC0 802414E0 8C420028 */ lw $v0, 0x28($v0) +/* D19CC4 802414E4 A480008E */ sh $zero, 0x8e($a0) +/* D19CC8 802414E8 AC820028 */ sw $v0, 0x28($a0) +/* D19CCC 802414EC 2402000C */ addiu $v0, $zero, 0xc +/* D19CD0 802414F0 AE220070 */ sw $v0, 0x70($s1) +.L802414F4: +/* D19CD4 802414F4 8FBF0018 */ lw $ra, 0x18($sp) +/* D19CD8 802414F8 8FB10014 */ lw $s1, 0x14($sp) +/* D19CDC 802414FC 8FB00010 */ lw $s0, 0x10($sp) +/* D19CE0 80241500 03E00008 */ jr $ra +/* D19CE4 80241504 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s index 9f6097f04f..caa865859c 100644 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_80241754_D19F34.s @@ -99,18 +99,18 @@ glabel func_80241754_D19F34 /* D1A09C 802418BC 00000000 */ nop .L802418C0: /* D1A0A0 802418C0 0260282D */ daddu $a1, $s3, $zero -/* D1A0A4 802418C4 0C090234 */ jal func_802408D0 +/* D1A0A4 802418C4 0C090234 */ jal func_802408D0_D190B0 /* D1A0A8 802418C8 0280302D */ daddu $a2, $s4, $zero .L802418CC: /* D1A0AC 802418CC 0240202D */ daddu $a0, $s2, $zero /* D1A0B0 802418D0 0260282D */ daddu $a1, $s3, $zero -/* D1A0B4 802418D4 0C09024F */ jal func_8024093C +/* D1A0B4 802418D4 0C09024F */ jal func_8024093C_D1911C /* D1A0B8 802418D8 0280302D */ daddu $a2, $s4, $zero /* D1A0BC 802418DC 0809065F */ j .L8024197C /* D1A0C0 802418E0 00000000 */ nop .L802418E4: /* D1A0C4 802418E4 0260282D */ daddu $a1, $s3, $zero -/* D1A0C8 802418E8 0C09028E */ jal func_80240A38 +/* D1A0C8 802418E8 0C09028E */ jal func_80240A38_D19218 /* D1A0CC 802418EC 0280302D */ daddu $a2, $s4, $zero /* D1A0D0 802418F0 8E420070 */ lw $v0, 0x70($s2) /* D1A0D4 802418F4 14500021 */ bne $v0, $s0, .L8024197C @@ -118,7 +118,7 @@ glabel func_80241754_D19F34 .L802418FC: /* D1A0DC 802418FC 0240202D */ daddu $a0, $s2, $zero /* D1A0E0 80241900 0260282D */ daddu $a1, $s3, $zero -/* D1A0E4 80241904 0C09051E */ jal func_80241478 +/* D1A0E4 80241904 0C09051E */ jal func_80241478_D19C58 /* D1A0E8 80241908 0280302D */ daddu $a2, $s4, $zero /* D1A0EC 8024190C 8E430070 */ lw $v1, 0x70($s2) /* D1A0F0 80241910 2402000C */ addiu $v0, $zero, 0xc @@ -127,7 +127,7 @@ glabel func_80241754_D19F34 /* D1A0FC 8024191C 0240202D */ daddu $a0, $s2, $zero .L80241920: /* D1A100 80241920 0260282D */ daddu $a1, $s3, $zero -/* D1A104 80241924 0C090542 */ jal func_80241508 +/* D1A104 80241924 0C090542 */ jal func_80241508_D19CE8 /* D1A108 80241928 0280302D */ daddu $a2, $s4, $zero /* D1A10C 8024192C 8E430070 */ lw $v1, 0x70($s2) /* D1A110 80241930 2402000D */ addiu $v0, $zero, 0xd @@ -136,7 +136,7 @@ glabel func_80241754_D19F34 .L8024193C: /* D1A11C 8024193C 0240202D */ daddu $a0, $s2, $zero /* D1A120 80241940 0260282D */ daddu $a1, $s3, $zero -/* D1A124 80241944 0C090582 */ jal func_80241608 +/* D1A124 80241944 0C090582 */ jal func_80241608_D19DE8 /* D1A128 80241948 0280302D */ daddu $a2, $s4, $zero /* D1A12C 8024194C 8E430070 */ lw $v1, 0x70($s2) /* D1A130 80241950 2402000E */ addiu $v0, $zero, 0xe @@ -145,7 +145,7 @@ glabel func_80241754_D19F34 /* D1A13C 8024195C 0240202D */ daddu $a0, $s2, $zero .L80241960: /* D1A140 80241960 0260282D */ daddu $a1, $s3, $zero -/* D1A144 80241964 0C09059A */ jal func_80241668 +/* D1A144 80241964 0C09059A */ jal func_80241668_D19E48 /* D1A148 80241968 0280302D */ daddu $a2, $s4, $zero /* D1A14C 8024196C 0809065F */ j .L8024197C /* D1A150 80241970 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4.s deleted file mode 100644 index 25038791f7..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4.s +++ /dev/null @@ -1,240 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419A4 -/* D1A184 802419A4 27BDFF40 */ addiu $sp, $sp, -0xc0 -/* D1A188 802419A8 AFBE00A0 */ sw $fp, 0xa0($sp) -/* D1A18C 802419AC 0080F02D */ daddu $fp, $a0, $zero -/* D1A190 802419B0 AFBF00A4 */ sw $ra, 0xa4($sp) -/* D1A194 802419B4 AFB7009C */ sw $s7, 0x9c($sp) -/* D1A198 802419B8 AFB60098 */ sw $s6, 0x98($sp) -/* D1A19C 802419BC AFB50094 */ sw $s5, 0x94($sp) -/* D1A1A0 802419C0 AFB40090 */ sw $s4, 0x90($sp) -/* D1A1A4 802419C4 AFB3008C */ sw $s3, 0x8c($sp) -/* D1A1A8 802419C8 AFB20088 */ sw $s2, 0x88($sp) -/* D1A1AC 802419CC AFB10084 */ sw $s1, 0x84($sp) -/* D1A1B0 802419D0 AFB00080 */ sw $s0, 0x80($sp) -/* D1A1B4 802419D4 F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* D1A1B8 802419D8 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* D1A1BC 802419DC F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* D1A1C0 802419E0 8FD70148 */ lw $s7, 0x148($fp) -/* D1A1C4 802419E4 86E40008 */ lh $a0, 8($s7) -/* D1A1C8 802419E8 0C00EABB */ jal get_npc_unsafe -/* D1A1CC 802419EC 00A0802D */ daddu $s0, $a1, $zero -/* D1A1D0 802419F0 12000003 */ beqz $s0, .L80241A00 -/* D1A1D4 802419F4 0040B02D */ daddu $s6, $v0, $zero -/* D1A1D8 802419F8 A6C0008E */ sh $zero, 0x8e($s6) -/* D1A1DC 802419FC AFC00070 */ sw $zero, 0x70($fp) -.L80241A00: -/* D1A1E0 80241A00 8EE20078 */ lw $v0, 0x78($s7) -/* D1A1E4 80241A04 1440000B */ bnez $v0, .L80241A34 -/* D1A1E8 80241A08 0000282D */ daddu $a1, $zero, $zero -/* D1A1EC 80241A0C 24050001 */ addiu $a1, $zero, 1 -/* D1A1F0 80241A10 24060007 */ addiu $a2, $zero, 7 -/* D1A1F4 80241A14 240200FF */ addiu $v0, $zero, 0xff -/* D1A1F8 80241A18 AFA20010 */ sw $v0, 0x10($sp) -/* D1A1FC 80241A1C AFA20014 */ sw $v0, 0x14($sp) -/* D1A200 80241A20 AFA00018 */ sw $zero, 0x18($sp) -/* D1A204 80241A24 AFA0001C */ sw $zero, 0x1c($sp) -/* D1A208 80241A28 8EC40024 */ lw $a0, 0x24($s6) -/* D1A20C 80241A2C 08090736 */ j .L80241CD8 -/* D1A210 80241A30 0040382D */ daddu $a3, $v0, $zero -.L80241A34: -/* D1A214 80241A34 24060011 */ addiu $a2, $zero, 0x11 -/* D1A218 80241A38 240200FF */ addiu $v0, $zero, 0xff -/* D1A21C 80241A3C AFA00010 */ sw $zero, 0x10($sp) -/* D1A220 80241A40 AFA00014 */ sw $zero, 0x14($sp) -/* D1A224 80241A44 AFA20018 */ sw $v0, 0x18($sp) -/* D1A228 80241A48 AFA0001C */ sw $zero, 0x1c($sp) -/* D1A22C 80241A4C 8EC40024 */ lw $a0, 0x24($s6) -/* D1A230 80241A50 0C0B79E0 */ jal func_802DE780 -/* D1A234 80241A54 24070014 */ addiu $a3, $zero, 0x14 -/* D1A238 80241A58 8FC20070 */ lw $v0, 0x70($fp) -/* D1A23C 80241A5C 2444000A */ addiu $a0, $v0, 0xa -/* D1A240 80241A60 28820168 */ slti $v0, $a0, 0x168 -/* D1A244 80241A64 14400010 */ bnez $v0, .L80241AA8 -/* D1A248 80241A68 AFC40070 */ sw $a0, 0x70($fp) -/* D1A24C 80241A6C 3C02B60B */ lui $v0, 0xb60b -/* D1A250 80241A70 344260B7 */ ori $v0, $v0, 0x60b7 -/* D1A254 80241A74 00820018 */ mult $a0, $v0 -/* D1A258 80241A78 00041FC3 */ sra $v1, $a0, 0x1f -/* D1A25C 80241A7C 00004810 */ mfhi $t1 -/* D1A260 80241A80 01241021 */ addu $v0, $t1, $a0 -/* D1A264 80241A84 00021203 */ sra $v0, $v0, 8 -/* D1A268 80241A88 00431023 */ subu $v0, $v0, $v1 -/* D1A26C 80241A8C 00021840 */ sll $v1, $v0, 1 -/* D1A270 80241A90 00621821 */ addu $v1, $v1, $v0 -/* D1A274 80241A94 00031100 */ sll $v0, $v1, 4 -/* D1A278 80241A98 00431023 */ subu $v0, $v0, $v1 -/* D1A27C 80241A9C 000210C0 */ sll $v0, $v0, 3 -/* D1A280 80241AA0 00821023 */ subu $v0, $a0, $v0 -/* D1A284 80241AA4 AFC20070 */ sw $v0, 0x70($fp) -.L80241AA8: -/* D1A288 80241AA8 0000882D */ daddu $s1, $zero, $zero -/* D1A28C 80241AAC 27B50050 */ addiu $s5, $sp, 0x50 -/* D1A290 80241AB0 27B40038 */ addiu $s4, $sp, 0x38 -/* D1A294 80241AB4 27B20020 */ addiu $s2, $sp, 0x20 -/* D1A298 80241AB8 0220802D */ daddu $s0, $s1, $zero -/* D1A29C 80241ABC 3C013FF0 */ lui $at, 0x3ff0 -/* D1A2A0 80241AC0 4481C800 */ mtc1 $at, $f25 -/* D1A2A4 80241AC4 4480C000 */ mtc1 $zero, $f24 -/* D1A2A8 80241AC8 3C01404C */ lui $at, 0x404c -/* D1A2AC 80241ACC 4481B800 */ mtc1 $at, $f23 -/* D1A2B0 80241AD0 4480B000 */ mtc1 $zero, $f22 -/* D1A2B4 80241AD4 3C0141E0 */ lui $at, 0x41e0 -/* D1A2B8 80241AD8 4481A800 */ mtc1 $at, $f21 -/* D1A2BC 80241ADC 4480A000 */ mtc1 $zero, $f20 -.L80241AE0: -/* D1A2C0 80241AE0 97C40072 */ lhu $a0, 0x72($fp) -/* D1A2C4 80241AE4 00902021 */ addu $a0, $a0, $s0 -/* D1A2C8 80241AE8 00042400 */ sll $a0, $a0, 0x10 -/* D1A2CC 80241AEC 0C00A4F5 */ jal cosine -/* D1A2D0 80241AF0 00042403 */ sra $a0, $a0, 0x10 -/* D1A2D4 80241AF4 46000021 */ cvt.d.s $f0, $f0 -/* D1A2D8 80241AF8 46380000 */ add.d $f0, $f0, $f24 -/* D1A2DC 80241AFC 46360002 */ mul.d $f0, $f0, $f22 -/* D1A2E0 80241B00 00000000 */ nop -/* D1A2E4 80241B04 4620A03E */ c.le.d $f20, $f0 -/* D1A2E8 80241B08 00000000 */ nop -/* D1A2EC 80241B0C 45030005 */ bc1tl .L80241B24 -/* D1A2F0 80241B10 46340001 */ sub.d $f0, $f0, $f20 -/* D1A2F4 80241B14 4620008D */ trunc.w.d $f2, $f0 -/* D1A2F8 80241B18 44021000 */ mfc1 $v0, $f2 -/* D1A2FC 80241B1C 080906CE */ j .L80241B38 -/* D1A300 80241B20 A2420000 */ sb $v0, ($s2) -.L80241B24: -/* D1A304 80241B24 4620008D */ trunc.w.d $f2, $f0 -/* D1A308 80241B28 44021000 */ mfc1 $v0, $f2 -/* D1A30C 80241B2C 3C098000 */ lui $t1, 0x8000 -/* D1A310 80241B30 00491025 */ or $v0, $v0, $t1 -/* D1A314 80241B34 A2420000 */ sb $v0, ($s2) -.L80241B38: -/* D1A318 80241B38 97C40072 */ lhu $a0, 0x72($fp) -/* D1A31C 80241B3C 00902021 */ addu $a0, $a0, $s0 -/* D1A320 80241B40 2484002D */ addiu $a0, $a0, 0x2d -/* D1A324 80241B44 00042400 */ sll $a0, $a0, 0x10 -/* D1A328 80241B48 0C00A4F5 */ jal cosine -/* D1A32C 80241B4C 00042403 */ sra $a0, $a0, 0x10 -/* D1A330 80241B50 46000021 */ cvt.d.s $f0, $f0 -/* D1A334 80241B54 46380000 */ add.d $f0, $f0, $f24 -/* D1A338 80241B58 46360002 */ mul.d $f0, $f0, $f22 -/* D1A33C 80241B5C 00000000 */ nop -/* D1A340 80241B60 4620A03E */ c.le.d $f20, $f0 -/* D1A344 80241B64 00000000 */ nop -/* D1A348 80241B68 45010005 */ bc1t .L80241B80 -/* D1A34C 80241B6C 0280182D */ daddu $v1, $s4, $zero -/* D1A350 80241B70 4620008D */ trunc.w.d $f2, $f0 -/* D1A354 80241B74 44021000 */ mfc1 $v0, $f2 -/* D1A358 80241B78 080906E6 */ j .L80241B98 -/* D1A35C 80241B7C A0620000 */ sb $v0, ($v1) -.L80241B80: -/* D1A360 80241B80 46340001 */ sub.d $f0, $f0, $f20 -/* D1A364 80241B84 4620008D */ trunc.w.d $f2, $f0 -/* D1A368 80241B88 44021000 */ mfc1 $v0, $f2 -/* D1A36C 80241B8C 3C098000 */ lui $t1, 0x8000 -/* D1A370 80241B90 00491025 */ or $v0, $v0, $t1 -/* D1A374 80241B94 A0620000 */ sb $v0, ($v1) -.L80241B98: -/* D1A378 80241B98 97C40072 */ lhu $a0, 0x72($fp) -/* D1A37C 80241B9C 00902021 */ addu $a0, $a0, $s0 -/* D1A380 80241BA0 2484005A */ addiu $a0, $a0, 0x5a -/* D1A384 80241BA4 00042400 */ sll $a0, $a0, 0x10 -/* D1A388 80241BA8 0C00A4F5 */ jal cosine -/* D1A38C 80241BAC 00042403 */ sra $a0, $a0, 0x10 -/* D1A390 80241BB0 46000021 */ cvt.d.s $f0, $f0 -/* D1A394 80241BB4 46380000 */ add.d $f0, $f0, $f24 -/* D1A398 80241BB8 46360002 */ mul.d $f0, $f0, $f22 -/* D1A39C 80241BBC 00000000 */ nop -/* D1A3A0 80241BC0 4620A03E */ c.le.d $f20, $f0 -/* D1A3A4 80241BC4 00000000 */ nop -/* D1A3A8 80241BC8 45010005 */ bc1t .L80241BE0 -/* D1A3AC 80241BCC 02A0182D */ daddu $v1, $s5, $zero -/* D1A3B0 80241BD0 4620008D */ trunc.w.d $f2, $f0 -/* D1A3B4 80241BD4 44021000 */ mfc1 $v0, $f2 -/* D1A3B8 80241BD8 080906FE */ j .L80241BF8 -/* D1A3BC 80241BDC 0000282D */ daddu $a1, $zero, $zero -.L80241BE0: -/* D1A3C0 80241BE0 46340001 */ sub.d $f0, $f0, $f20 -/* D1A3C4 80241BE4 4620008D */ trunc.w.d $f2, $f0 -/* D1A3C8 80241BE8 44021000 */ mfc1 $v0, $f2 -/* D1A3CC 80241BEC 3C098000 */ lui $t1, 0x8000 -/* D1A3D0 80241BF0 00491025 */ or $v0, $v0, $t1 -/* D1A3D4 80241BF4 0000282D */ daddu $a1, $zero, $zero -.L80241BF8: -/* D1A3D8 80241BF8 2406000C */ addiu $a2, $zero, 0xc -/* D1A3DC 80241BFC 0220382D */ daddu $a3, $s1, $zero -/* D1A3E0 80241C00 26100019 */ addiu $s0, $s0, 0x19 -/* D1A3E4 80241C04 A0620000 */ sb $v0, ($v1) -/* D1A3E8 80241C08 27A30068 */ addiu $v1, $sp, 0x68 -/* D1A3EC 80241C0C 00711821 */ addu $v1, $v1, $s1 -/* D1A3F0 80241C10 26310001 */ addiu $s1, $s1, 1 -/* D1A3F4 80241C14 92E2007B */ lbu $v0, 0x7b($s7) -/* D1A3F8 80241C18 241300FF */ addiu $s3, $zero, 0xff -/* D1A3FC 80241C1C A0620000 */ sb $v0, ($v1) -/* D1A400 80241C20 92A80000 */ lbu $t0, ($s5) -/* D1A404 80241C24 26B50001 */ addiu $s5, $s5, 1 -/* D1A408 80241C28 92420000 */ lbu $v0, ($s2) -/* D1A40C 80241C2C 92840000 */ lbu $a0, ($s4) -/* D1A410 80241C30 90630000 */ lbu $v1, ($v1) -/* D1A414 80241C34 26940001 */ addiu $s4, $s4, 1 -/* D1A418 80241C38 AFA00014 */ sw $zero, 0x14($sp) -/* D1A41C 80241C3C AFB30018 */ sw $s3, 0x18($sp) -/* D1A420 80241C40 AFA0001C */ sw $zero, 0x1c($sp) -/* D1A424 80241C44 00021600 */ sll $v0, $v0, 0x18 -/* D1A428 80241C48 00042400 */ sll $a0, $a0, 0x10 -/* D1A42C 80241C4C 00441025 */ or $v0, $v0, $a0 -/* D1A430 80241C50 00084200 */ sll $t0, $t0, 8 -/* D1A434 80241C54 00481025 */ or $v0, $v0, $t0 -/* D1A438 80241C58 00431025 */ or $v0, $v0, $v1 -/* D1A43C 80241C5C AFA20010 */ sw $v0, 0x10($sp) -/* D1A440 80241C60 8EC40024 */ lw $a0, 0x24($s6) -/* D1A444 80241C64 0C0B79E0 */ jal func_802DE780 -/* D1A448 80241C68 26520001 */ addiu $s2, $s2, 1 -/* D1A44C 80241C6C 2A220014 */ slti $v0, $s1, 0x14 -/* D1A450 80241C70 1440FF9B */ bnez $v0, .L80241AE0 -/* D1A454 80241C74 00000000 */ nop -/* D1A458 80241C78 8EE30078 */ lw $v1, 0x78($s7) -/* D1A45C 80241C7C 1473000A */ bne $v1, $s3, .L80241CA8 -/* D1A460 80241C80 24020016 */ addiu $v0, $zero, 0x16 -/* D1A464 80241C84 24050001 */ addiu $a1, $zero, 1 -/* D1A468 80241C88 2406000F */ addiu $a2, $zero, 0xf -/* D1A46C 80241C8C 2402000D */ addiu $v0, $zero, 0xd -/* D1A470 80241C90 A2C200AA */ sb $v0, 0xaa($s6) -/* D1A474 80241C94 AFA30010 */ sw $v1, 0x10($sp) -/* D1A478 80241C98 AFA00014 */ sw $zero, 0x14($sp) -/* D1A47C 80241C9C AFA30018 */ sw $v1, 0x18($sp) -/* D1A480 80241CA0 08090733 */ j .L80241CCC -/* D1A484 80241CA4 AFA0001C */ sw $zero, 0x1c($sp) -.L80241CA8: -/* D1A488 80241CA8 A2C200AA */ sb $v0, 0xaa($s6) -/* D1A48C 80241CAC 8EE20078 */ lw $v0, 0x78($s7) -/* D1A490 80241CB0 24050001 */ addiu $a1, $zero, 1 -/* D1A494 80241CB4 AFA00014 */ sw $zero, 0x14($sp) -/* D1A498 80241CB8 AFA20010 */ sw $v0, 0x10($sp) -/* D1A49C 80241CBC 8EE20078 */ lw $v0, 0x78($s7) -/* D1A4A0 80241CC0 2406000F */ addiu $a2, $zero, 0xf -/* D1A4A4 80241CC4 AFA0001C */ sw $zero, 0x1c($sp) -/* D1A4A8 80241CC8 AFA20018 */ sw $v0, 0x18($sp) -.L80241CCC: -/* D1A4AC 80241CCC 8EC40024 */ lw $a0, 0x24($s6) -/* D1A4B0 80241CD0 3C078024 */ lui $a3, 0x8024 -/* D1A4B4 80241CD4 24E72F90 */ addiu $a3, $a3, 0x2f90 -.L80241CD8: -/* D1A4B8 80241CD8 0C0B79E0 */ jal func_802DE780 -/* D1A4BC 80241CDC 00000000 */ nop -/* D1A4C0 80241CE0 0000102D */ daddu $v0, $zero, $zero -/* D1A4C4 80241CE4 8FBF00A4 */ lw $ra, 0xa4($sp) -/* D1A4C8 80241CE8 8FBE00A0 */ lw $fp, 0xa0($sp) -/* D1A4CC 80241CEC 8FB7009C */ lw $s7, 0x9c($sp) -/* D1A4D0 80241CF0 8FB60098 */ lw $s6, 0x98($sp) -/* D1A4D4 80241CF4 8FB50094 */ lw $s5, 0x94($sp) -/* D1A4D8 80241CF8 8FB40090 */ lw $s4, 0x90($sp) -/* D1A4DC 80241CFC 8FB3008C */ lw $s3, 0x8c($sp) -/* D1A4E0 80241D00 8FB20088 */ lw $s2, 0x88($sp) -/* D1A4E4 80241D04 8FB10084 */ lw $s1, 0x84($sp) -/* D1A4E8 80241D08 8FB00080 */ lw $s0, 0x80($sp) -/* D1A4EC 80241D0C D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* D1A4F0 80241D10 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* D1A4F4 80241D14 D7B400A8 */ ldc1 $f20, 0xa8($sp) -/* D1A4F8 80241D18 03E00008 */ jr $ra -/* D1A4FC 80241D1C 27BD00C0 */ addiu $sp, $sp, 0xc0 diff --git a/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s new file mode 100644 index 0000000000..43456b728d --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_05/D187E0/func_802419A4_D1A184.s @@ -0,0 +1,240 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419A4_D1A184 +/* D1A184 802419A4 27BDFF40 */ addiu $sp, $sp, -0xc0 +/* D1A188 802419A8 AFBE00A0 */ sw $fp, 0xa0($sp) +/* D1A18C 802419AC 0080F02D */ daddu $fp, $a0, $zero +/* D1A190 802419B0 AFBF00A4 */ sw $ra, 0xa4($sp) +/* D1A194 802419B4 AFB7009C */ sw $s7, 0x9c($sp) +/* D1A198 802419B8 AFB60098 */ sw $s6, 0x98($sp) +/* D1A19C 802419BC AFB50094 */ sw $s5, 0x94($sp) +/* D1A1A0 802419C0 AFB40090 */ sw $s4, 0x90($sp) +/* D1A1A4 802419C4 AFB3008C */ sw $s3, 0x8c($sp) +/* D1A1A8 802419C8 AFB20088 */ sw $s2, 0x88($sp) +/* D1A1AC 802419CC AFB10084 */ sw $s1, 0x84($sp) +/* D1A1B0 802419D0 AFB00080 */ sw $s0, 0x80($sp) +/* D1A1B4 802419D4 F7B800B8 */ sdc1 $f24, 0xb8($sp) +/* D1A1B8 802419D8 F7B600B0 */ sdc1 $f22, 0xb0($sp) +/* D1A1BC 802419DC F7B400A8 */ sdc1 $f20, 0xa8($sp) +/* D1A1C0 802419E0 8FD70148 */ lw $s7, 0x148($fp) +/* D1A1C4 802419E4 86E40008 */ lh $a0, 8($s7) +/* D1A1C8 802419E8 0C00EABB */ jal get_npc_unsafe +/* D1A1CC 802419EC 00A0802D */ daddu $s0, $a1, $zero +/* D1A1D0 802419F0 12000003 */ beqz $s0, .L80241A00 +/* D1A1D4 802419F4 0040B02D */ daddu $s6, $v0, $zero +/* D1A1D8 802419F8 A6C0008E */ sh $zero, 0x8e($s6) +/* D1A1DC 802419FC AFC00070 */ sw $zero, 0x70($fp) +.L80241A00: +/* D1A1E0 80241A00 8EE20078 */ lw $v0, 0x78($s7) +/* D1A1E4 80241A04 1440000B */ bnez $v0, .L80241A34 +/* D1A1E8 80241A08 0000282D */ daddu $a1, $zero, $zero +/* D1A1EC 80241A0C 24050001 */ addiu $a1, $zero, 1 +/* D1A1F0 80241A10 24060007 */ addiu $a2, $zero, 7 +/* D1A1F4 80241A14 240200FF */ addiu $v0, $zero, 0xff +/* D1A1F8 80241A18 AFA20010 */ sw $v0, 0x10($sp) +/* D1A1FC 80241A1C AFA20014 */ sw $v0, 0x14($sp) +/* D1A200 80241A20 AFA00018 */ sw $zero, 0x18($sp) +/* D1A204 80241A24 AFA0001C */ sw $zero, 0x1c($sp) +/* D1A208 80241A28 8EC40024 */ lw $a0, 0x24($s6) +/* D1A20C 80241A2C 08090736 */ j .L80241CD8 +/* D1A210 80241A30 0040382D */ daddu $a3, $v0, $zero +.L80241A34: +/* D1A214 80241A34 24060011 */ addiu $a2, $zero, 0x11 +/* D1A218 80241A38 240200FF */ addiu $v0, $zero, 0xff +/* D1A21C 80241A3C AFA00010 */ sw $zero, 0x10($sp) +/* D1A220 80241A40 AFA00014 */ sw $zero, 0x14($sp) +/* D1A224 80241A44 AFA20018 */ sw $v0, 0x18($sp) +/* D1A228 80241A48 AFA0001C */ sw $zero, 0x1c($sp) +/* D1A22C 80241A4C 8EC40024 */ lw $a0, 0x24($s6) +/* D1A230 80241A50 0C0B79E0 */ jal func_802DE780 +/* D1A234 80241A54 24070014 */ addiu $a3, $zero, 0x14 +/* D1A238 80241A58 8FC20070 */ lw $v0, 0x70($fp) +/* D1A23C 80241A5C 2444000A */ addiu $a0, $v0, 0xa +/* D1A240 80241A60 28820168 */ slti $v0, $a0, 0x168 +/* D1A244 80241A64 14400010 */ bnez $v0, .L80241AA8 +/* D1A248 80241A68 AFC40070 */ sw $a0, 0x70($fp) +/* D1A24C 80241A6C 3C02B60B */ lui $v0, 0xb60b +/* D1A250 80241A70 344260B7 */ ori $v0, $v0, 0x60b7 +/* D1A254 80241A74 00820018 */ mult $a0, $v0 +/* D1A258 80241A78 00041FC3 */ sra $v1, $a0, 0x1f +/* D1A25C 80241A7C 00004810 */ mfhi $t1 +/* D1A260 80241A80 01241021 */ addu $v0, $t1, $a0 +/* D1A264 80241A84 00021203 */ sra $v0, $v0, 8 +/* D1A268 80241A88 00431023 */ subu $v0, $v0, $v1 +/* D1A26C 80241A8C 00021840 */ sll $v1, $v0, 1 +/* D1A270 80241A90 00621821 */ addu $v1, $v1, $v0 +/* D1A274 80241A94 00031100 */ sll $v0, $v1, 4 +/* D1A278 80241A98 00431023 */ subu $v0, $v0, $v1 +/* D1A27C 80241A9C 000210C0 */ sll $v0, $v0, 3 +/* D1A280 80241AA0 00821023 */ subu $v0, $a0, $v0 +/* D1A284 80241AA4 AFC20070 */ sw $v0, 0x70($fp) +.L80241AA8: +/* D1A288 80241AA8 0000882D */ daddu $s1, $zero, $zero +/* D1A28C 80241AAC 27B50050 */ addiu $s5, $sp, 0x50 +/* D1A290 80241AB0 27B40038 */ addiu $s4, $sp, 0x38 +/* D1A294 80241AB4 27B20020 */ addiu $s2, $sp, 0x20 +/* D1A298 80241AB8 0220802D */ daddu $s0, $s1, $zero +/* D1A29C 80241ABC 3C013FF0 */ lui $at, 0x3ff0 +/* D1A2A0 80241AC0 4481C800 */ mtc1 $at, $f25 +/* D1A2A4 80241AC4 4480C000 */ mtc1 $zero, $f24 +/* D1A2A8 80241AC8 3C01404C */ lui $at, 0x404c +/* D1A2AC 80241ACC 4481B800 */ mtc1 $at, $f23 +/* D1A2B0 80241AD0 4480B000 */ mtc1 $zero, $f22 +/* D1A2B4 80241AD4 3C0141E0 */ lui $at, 0x41e0 +/* D1A2B8 80241AD8 4481A800 */ mtc1 $at, $f21 +/* D1A2BC 80241ADC 4480A000 */ mtc1 $zero, $f20 +.L80241AE0: +/* D1A2C0 80241AE0 97C40072 */ lhu $a0, 0x72($fp) +/* D1A2C4 80241AE4 00902021 */ addu $a0, $a0, $s0 +/* D1A2C8 80241AE8 00042400 */ sll $a0, $a0, 0x10 +/* D1A2CC 80241AEC 0C00A4F5 */ jal cosine +/* D1A2D0 80241AF0 00042403 */ sra $a0, $a0, 0x10 +/* D1A2D4 80241AF4 46000021 */ cvt.d.s $f0, $f0 +/* D1A2D8 80241AF8 46380000 */ add.d $f0, $f0, $f24 +/* D1A2DC 80241AFC 46360002 */ mul.d $f0, $f0, $f22 +/* D1A2E0 80241B00 00000000 */ nop +/* D1A2E4 80241B04 4620A03E */ c.le.d $f20, $f0 +/* D1A2E8 80241B08 00000000 */ nop +/* D1A2EC 80241B0C 45030005 */ bc1tl .L80241B24 +/* D1A2F0 80241B10 46340001 */ sub.d $f0, $f0, $f20 +/* D1A2F4 80241B14 4620008D */ trunc.w.d $f2, $f0 +/* D1A2F8 80241B18 44021000 */ mfc1 $v0, $f2 +/* D1A2FC 80241B1C 080906CE */ j .L80241B38 +/* D1A300 80241B20 A2420000 */ sb $v0, ($s2) +.L80241B24: +/* D1A304 80241B24 4620008D */ trunc.w.d $f2, $f0 +/* D1A308 80241B28 44021000 */ mfc1 $v0, $f2 +/* D1A30C 80241B2C 3C098000 */ lui $t1, 0x8000 +/* D1A310 80241B30 00491025 */ or $v0, $v0, $t1 +/* D1A314 80241B34 A2420000 */ sb $v0, ($s2) +.L80241B38: +/* D1A318 80241B38 97C40072 */ lhu $a0, 0x72($fp) +/* D1A31C 80241B3C 00902021 */ addu $a0, $a0, $s0 +/* D1A320 80241B40 2484002D */ addiu $a0, $a0, 0x2d +/* D1A324 80241B44 00042400 */ sll $a0, $a0, 0x10 +/* D1A328 80241B48 0C00A4F5 */ jal cosine +/* D1A32C 80241B4C 00042403 */ sra $a0, $a0, 0x10 +/* D1A330 80241B50 46000021 */ cvt.d.s $f0, $f0 +/* D1A334 80241B54 46380000 */ add.d $f0, $f0, $f24 +/* D1A338 80241B58 46360002 */ mul.d $f0, $f0, $f22 +/* D1A33C 80241B5C 00000000 */ nop +/* D1A340 80241B60 4620A03E */ c.le.d $f20, $f0 +/* D1A344 80241B64 00000000 */ nop +/* D1A348 80241B68 45010005 */ bc1t .L80241B80 +/* D1A34C 80241B6C 0280182D */ daddu $v1, $s4, $zero +/* D1A350 80241B70 4620008D */ trunc.w.d $f2, $f0 +/* D1A354 80241B74 44021000 */ mfc1 $v0, $f2 +/* D1A358 80241B78 080906E6 */ j .L80241B98 +/* D1A35C 80241B7C A0620000 */ sb $v0, ($v1) +.L80241B80: +/* D1A360 80241B80 46340001 */ sub.d $f0, $f0, $f20 +/* D1A364 80241B84 4620008D */ trunc.w.d $f2, $f0 +/* D1A368 80241B88 44021000 */ mfc1 $v0, $f2 +/* D1A36C 80241B8C 3C098000 */ lui $t1, 0x8000 +/* D1A370 80241B90 00491025 */ or $v0, $v0, $t1 +/* D1A374 80241B94 A0620000 */ sb $v0, ($v1) +.L80241B98: +/* D1A378 80241B98 97C40072 */ lhu $a0, 0x72($fp) +/* D1A37C 80241B9C 00902021 */ addu $a0, $a0, $s0 +/* D1A380 80241BA0 2484005A */ addiu $a0, $a0, 0x5a +/* D1A384 80241BA4 00042400 */ sll $a0, $a0, 0x10 +/* D1A388 80241BA8 0C00A4F5 */ jal cosine +/* D1A38C 80241BAC 00042403 */ sra $a0, $a0, 0x10 +/* D1A390 80241BB0 46000021 */ cvt.d.s $f0, $f0 +/* D1A394 80241BB4 46380000 */ add.d $f0, $f0, $f24 +/* D1A398 80241BB8 46360002 */ mul.d $f0, $f0, $f22 +/* D1A39C 80241BBC 00000000 */ nop +/* D1A3A0 80241BC0 4620A03E */ c.le.d $f20, $f0 +/* D1A3A4 80241BC4 00000000 */ nop +/* D1A3A8 80241BC8 45010005 */ bc1t .L80241BE0 +/* D1A3AC 80241BCC 02A0182D */ daddu $v1, $s5, $zero +/* D1A3B0 80241BD0 4620008D */ trunc.w.d $f2, $f0 +/* D1A3B4 80241BD4 44021000 */ mfc1 $v0, $f2 +/* D1A3B8 80241BD8 080906FE */ j .L80241BF8 +/* D1A3BC 80241BDC 0000282D */ daddu $a1, $zero, $zero +.L80241BE0: +/* D1A3C0 80241BE0 46340001 */ sub.d $f0, $f0, $f20 +/* D1A3C4 80241BE4 4620008D */ trunc.w.d $f2, $f0 +/* D1A3C8 80241BE8 44021000 */ mfc1 $v0, $f2 +/* D1A3CC 80241BEC 3C098000 */ lui $t1, 0x8000 +/* D1A3D0 80241BF0 00491025 */ or $v0, $v0, $t1 +/* D1A3D4 80241BF4 0000282D */ daddu $a1, $zero, $zero +.L80241BF8: +/* D1A3D8 80241BF8 2406000C */ addiu $a2, $zero, 0xc +/* D1A3DC 80241BFC 0220382D */ daddu $a3, $s1, $zero +/* D1A3E0 80241C00 26100019 */ addiu $s0, $s0, 0x19 +/* D1A3E4 80241C04 A0620000 */ sb $v0, ($v1) +/* D1A3E8 80241C08 27A30068 */ addiu $v1, $sp, 0x68 +/* D1A3EC 80241C0C 00711821 */ addu $v1, $v1, $s1 +/* D1A3F0 80241C10 26310001 */ addiu $s1, $s1, 1 +/* D1A3F4 80241C14 92E2007B */ lbu $v0, 0x7b($s7) +/* D1A3F8 80241C18 241300FF */ addiu $s3, $zero, 0xff +/* D1A3FC 80241C1C A0620000 */ sb $v0, ($v1) +/* D1A400 80241C20 92A80000 */ lbu $t0, ($s5) +/* D1A404 80241C24 26B50001 */ addiu $s5, $s5, 1 +/* D1A408 80241C28 92420000 */ lbu $v0, ($s2) +/* D1A40C 80241C2C 92840000 */ lbu $a0, ($s4) +/* D1A410 80241C30 90630000 */ lbu $v1, ($v1) +/* D1A414 80241C34 26940001 */ addiu $s4, $s4, 1 +/* D1A418 80241C38 AFA00014 */ sw $zero, 0x14($sp) +/* D1A41C 80241C3C AFB30018 */ sw $s3, 0x18($sp) +/* D1A420 80241C40 AFA0001C */ sw $zero, 0x1c($sp) +/* D1A424 80241C44 00021600 */ sll $v0, $v0, 0x18 +/* D1A428 80241C48 00042400 */ sll $a0, $a0, 0x10 +/* D1A42C 80241C4C 00441025 */ or $v0, $v0, $a0 +/* D1A430 80241C50 00084200 */ sll $t0, $t0, 8 +/* D1A434 80241C54 00481025 */ or $v0, $v0, $t0 +/* D1A438 80241C58 00431025 */ or $v0, $v0, $v1 +/* D1A43C 80241C5C AFA20010 */ sw $v0, 0x10($sp) +/* D1A440 80241C60 8EC40024 */ lw $a0, 0x24($s6) +/* D1A444 80241C64 0C0B79E0 */ jal func_802DE780 +/* D1A448 80241C68 26520001 */ addiu $s2, $s2, 1 +/* D1A44C 80241C6C 2A220014 */ slti $v0, $s1, 0x14 +/* D1A450 80241C70 1440FF9B */ bnez $v0, .L80241AE0 +/* D1A454 80241C74 00000000 */ nop +/* D1A458 80241C78 8EE30078 */ lw $v1, 0x78($s7) +/* D1A45C 80241C7C 1473000A */ bne $v1, $s3, .L80241CA8 +/* D1A460 80241C80 24020016 */ addiu $v0, $zero, 0x16 +/* D1A464 80241C84 24050001 */ addiu $a1, $zero, 1 +/* D1A468 80241C88 2406000F */ addiu $a2, $zero, 0xf +/* D1A46C 80241C8C 2402000D */ addiu $v0, $zero, 0xd +/* D1A470 80241C90 A2C200AA */ sb $v0, 0xaa($s6) +/* D1A474 80241C94 AFA30010 */ sw $v1, 0x10($sp) +/* D1A478 80241C98 AFA00014 */ sw $zero, 0x14($sp) +/* D1A47C 80241C9C AFA30018 */ sw $v1, 0x18($sp) +/* D1A480 80241CA0 08090733 */ j .L80241CCC +/* D1A484 80241CA4 AFA0001C */ sw $zero, 0x1c($sp) +.L80241CA8: +/* D1A488 80241CA8 A2C200AA */ sb $v0, 0xaa($s6) +/* D1A48C 80241CAC 8EE20078 */ lw $v0, 0x78($s7) +/* D1A490 80241CB0 24050001 */ addiu $a1, $zero, 1 +/* D1A494 80241CB4 AFA00014 */ sw $zero, 0x14($sp) +/* D1A498 80241CB8 AFA20010 */ sw $v0, 0x10($sp) +/* D1A49C 80241CBC 8EE20078 */ lw $v0, 0x78($s7) +/* D1A4A0 80241CC0 2406000F */ addiu $a2, $zero, 0xf +/* D1A4A4 80241CC4 AFA0001C */ sw $zero, 0x1c($sp) +/* D1A4A8 80241CC8 AFA20018 */ sw $v0, 0x18($sp) +.L80241CCC: +/* D1A4AC 80241CCC 8EC40024 */ lw $a0, 0x24($s6) +/* D1A4B0 80241CD0 3C078024 */ lui $a3, 0x8024 +/* D1A4B4 80241CD4 24E72F90 */ addiu $a3, $a3, 0x2f90 +.L80241CD8: +/* D1A4B8 80241CD8 0C0B79E0 */ jal func_802DE780 +/* D1A4BC 80241CDC 00000000 */ nop +/* D1A4C0 80241CE0 0000102D */ daddu $v0, $zero, $zero +/* D1A4C4 80241CE4 8FBF00A4 */ lw $ra, 0xa4($sp) +/* D1A4C8 80241CE8 8FBE00A0 */ lw $fp, 0xa0($sp) +/* D1A4CC 80241CEC 8FB7009C */ lw $s7, 0x9c($sp) +/* D1A4D0 80241CF0 8FB60098 */ lw $s6, 0x98($sp) +/* D1A4D4 80241CF4 8FB50094 */ lw $s5, 0x94($sp) +/* D1A4D8 80241CF8 8FB40090 */ lw $s4, 0x90($sp) +/* D1A4DC 80241CFC 8FB3008C */ lw $s3, 0x8c($sp) +/* D1A4E0 80241D00 8FB20088 */ lw $s2, 0x88($sp) +/* D1A4E4 80241D04 8FB10084 */ lw $s1, 0x84($sp) +/* D1A4E8 80241D08 8FB00080 */ lw $s0, 0x80($sp) +/* D1A4EC 80241D0C D7B800B8 */ ldc1 $f24, 0xb8($sp) +/* D1A4F0 80241D10 D7B600B0 */ ldc1 $f22, 0xb0($sp) +/* D1A4F4 80241D14 D7B400A8 */ ldc1 $f20, 0xa8($sp) +/* D1A4F8 80241D18 03E00008 */ jr $ra +/* D1A4FC 80241D1C 27BD00C0 */ addiu $sp, $sp, 0xc0 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D1FE90/func_8024037C_D2020C.s b/asm/nonmatchings/world/area_sam/sam_06/D1FE90/func_8024037C_D2020C.s index 6cd7270bbf..6136f2d218 100644 --- a/asm/nonmatchings/world/area_sam/sam_06/D1FE90/func_8024037C_D2020C.s +++ b/asm/nonmatchings/world/area_sam/sam_06/D1FE90/func_8024037C_D2020C.s @@ -55,7 +55,7 @@ glabel func_8024037C_D2020C /* D202D4 80240444 4405E000 */ mfc1 $a1, $f28 /* D202D8 80240448 4406D000 */ mfc1 $a2, $f26 /* D202DC 8024044C 4407C000 */ mfc1 $a3, $f24 -/* D202E0 80240450 0C0900C3 */ jal func_8024030C +/* D202E0 80240450 0C0900C3 */ jal func_8024030C_D2019C /* D202E4 80240454 27A40010 */ addiu $a0, $sp, 0x10 /* D202E8 80240458 27A40010 */ addiu $a0, $sp, 0x10 /* D202EC 8024045C 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_8024037C_D2020C /* D2035C 802404CC 4405E000 */ mfc1 $a1, $f28 /* D20360 802404D0 4406D000 */ mfc1 $a2, $f26 /* D20364 802404D4 4407C000 */ mfc1 $a3, $f24 -/* D20368 802404D8 0C0900C3 */ jal func_8024030C +/* D20368 802404D8 0C0900C3 */ jal func_8024030C_D2019C /* D2036C 802404DC 27A40010 */ addiu $a0, $sp, 0x10 /* D20370 802404E0 27A40010 */ addiu $a0, $sp, 0x10 /* D20374 802404E4 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28.s deleted file mode 100644 index fe33fddf77..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D28 -/* D20BB8 80240D28 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D20BBC 80240D2C AFB3001C */ sw $s3, 0x1c($sp) -/* D20BC0 80240D30 0080982D */ daddu $s3, $a0, $zero -/* D20BC4 80240D34 AFBF0020 */ sw $ra, 0x20($sp) -/* D20BC8 80240D38 AFB20018 */ sw $s2, 0x18($sp) -/* D20BCC 80240D3C AFB10014 */ sw $s1, 0x14($sp) -/* D20BD0 80240D40 AFB00010 */ sw $s0, 0x10($sp) -/* D20BD4 80240D44 8E720148 */ lw $s2, 0x148($s3) -/* D20BD8 80240D48 86440008 */ lh $a0, 8($s2) -/* D20BDC 80240D4C 0C00EABB */ jal get_npc_unsafe -/* D20BE0 80240D50 00A0882D */ daddu $s1, $a1, $zero -/* D20BE4 80240D54 8E240008 */ lw $a0, 8($s1) -/* D20BE8 80240D58 0040802D */ daddu $s0, $v0, $zero -/* D20BEC 80240D5C 00041FC2 */ srl $v1, $a0, 0x1f -/* D20BF0 80240D60 00832021 */ addu $a0, $a0, $v1 -/* D20BF4 80240D64 00042043 */ sra $a0, $a0, 1 -/* D20BF8 80240D68 0C00A67F */ jal rand_int -/* D20BFC 80240D6C 24840001 */ addiu $a0, $a0, 1 -/* D20C00 80240D70 8E230008 */ lw $v1, 8($s1) -/* D20C04 80240D74 240400B4 */ addiu $a0, $zero, 0xb4 -/* D20C08 80240D78 00032FC2 */ srl $a1, $v1, 0x1f -/* D20C0C 80240D7C 00651821 */ addu $v1, $v1, $a1 -/* D20C10 80240D80 00031843 */ sra $v1, $v1, 1 -/* D20C14 80240D84 00621821 */ addu $v1, $v1, $v0 -/* D20C18 80240D88 0C00A67F */ jal rand_int -/* D20C1C 80240D8C A603008E */ sh $v1, 0x8e($s0) -/* D20C20 80240D90 C60C000C */ lwc1 $f12, 0xc($s0) -/* D20C24 80240D94 44820000 */ mtc1 $v0, $f0 -/* D20C28 80240D98 00000000 */ nop -/* D20C2C 80240D9C 46800020 */ cvt.s.w $f0, $f0 -/* D20C30 80240DA0 46006300 */ add.s $f12, $f12, $f0 -/* D20C34 80240DA4 3C0142B4 */ lui $at, 0x42b4 -/* D20C38 80240DA8 44810000 */ mtc1 $at, $f0 -/* D20C3C 80240DAC 0C00A6C9 */ jal clamp_angle -/* D20C40 80240DB0 46006301 */ sub.s $f12, $f12, $f0 -/* D20C44 80240DB4 E600000C */ swc1 $f0, 0xc($s0) -/* D20C48 80240DB8 8E4200CC */ lw $v0, 0xcc($s2) -/* D20C4C 80240DBC 8C420000 */ lw $v0, ($v0) -/* D20C50 80240DC0 AE020028 */ sw $v0, 0x28($s0) -/* D20C54 80240DC4 24020003 */ addiu $v0, $zero, 3 -/* D20C58 80240DC8 AE620070 */ sw $v0, 0x70($s3) -/* D20C5C 80240DCC 8FBF0020 */ lw $ra, 0x20($sp) -/* D20C60 80240DD0 8FB3001C */ lw $s3, 0x1c($sp) -/* D20C64 80240DD4 8FB20018 */ lw $s2, 0x18($sp) -/* D20C68 80240DD8 8FB10014 */ lw $s1, 0x14($sp) -/* D20C6C 80240DDC 8FB00010 */ lw $s0, 0x10($sp) -/* D20C70 80240DE0 03E00008 */ jr $ra -/* D20C74 80240DE4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s new file mode 100644 index 0000000000..a3d18994b4 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80240D28_D20BB8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D28_D20BB8 +/* D20BB8 80240D28 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* D20BBC 80240D2C AFB3001C */ sw $s3, 0x1c($sp) +/* D20BC0 80240D30 0080982D */ daddu $s3, $a0, $zero +/* D20BC4 80240D34 AFBF0020 */ sw $ra, 0x20($sp) +/* D20BC8 80240D38 AFB20018 */ sw $s2, 0x18($sp) +/* D20BCC 80240D3C AFB10014 */ sw $s1, 0x14($sp) +/* D20BD0 80240D40 AFB00010 */ sw $s0, 0x10($sp) +/* D20BD4 80240D44 8E720148 */ lw $s2, 0x148($s3) +/* D20BD8 80240D48 86440008 */ lh $a0, 8($s2) +/* D20BDC 80240D4C 0C00EABB */ jal get_npc_unsafe +/* D20BE0 80240D50 00A0882D */ daddu $s1, $a1, $zero +/* D20BE4 80240D54 8E240008 */ lw $a0, 8($s1) +/* D20BE8 80240D58 0040802D */ daddu $s0, $v0, $zero +/* D20BEC 80240D5C 00041FC2 */ srl $v1, $a0, 0x1f +/* D20BF0 80240D60 00832021 */ addu $a0, $a0, $v1 +/* D20BF4 80240D64 00042043 */ sra $a0, $a0, 1 +/* D20BF8 80240D68 0C00A67F */ jal rand_int +/* D20BFC 80240D6C 24840001 */ addiu $a0, $a0, 1 +/* D20C00 80240D70 8E230008 */ lw $v1, 8($s1) +/* D20C04 80240D74 240400B4 */ addiu $a0, $zero, 0xb4 +/* D20C08 80240D78 00032FC2 */ srl $a1, $v1, 0x1f +/* D20C0C 80240D7C 00651821 */ addu $v1, $v1, $a1 +/* D20C10 80240D80 00031843 */ sra $v1, $v1, 1 +/* D20C14 80240D84 00621821 */ addu $v1, $v1, $v0 +/* D20C18 80240D88 0C00A67F */ jal rand_int +/* D20C1C 80240D8C A603008E */ sh $v1, 0x8e($s0) +/* D20C20 80240D90 C60C000C */ lwc1 $f12, 0xc($s0) +/* D20C24 80240D94 44820000 */ mtc1 $v0, $f0 +/* D20C28 80240D98 00000000 */ nop +/* D20C2C 80240D9C 46800020 */ cvt.s.w $f0, $f0 +/* D20C30 80240DA0 46006300 */ add.s $f12, $f12, $f0 +/* D20C34 80240DA4 3C0142B4 */ lui $at, 0x42b4 +/* D20C38 80240DA8 44810000 */ mtc1 $at, $f0 +/* D20C3C 80240DAC 0C00A6C9 */ jal clamp_angle +/* D20C40 80240DB0 46006301 */ sub.s $f12, $f12, $f0 +/* D20C44 80240DB4 E600000C */ swc1 $f0, 0xc($s0) +/* D20C48 80240DB8 8E4200CC */ lw $v0, 0xcc($s2) +/* D20C4C 80240DBC 8C420000 */ lw $v0, ($v0) +/* D20C50 80240DC0 AE020028 */ sw $v0, 0x28($s0) +/* D20C54 80240DC4 24020003 */ addiu $v0, $zero, 3 +/* D20C58 80240DC8 AE620070 */ sw $v0, 0x70($s3) +/* D20C5C 80240DCC 8FBF0020 */ lw $ra, 0x20($sp) +/* D20C60 80240DD0 8FB3001C */ lw $s3, 0x1c($sp) +/* D20C64 80240DD4 8FB20018 */ lw $s2, 0x18($sp) +/* D20C68 80240DD8 8FB10014 */ lw $s1, 0x14($sp) +/* D20C6C 80240DDC 8FB00010 */ lw $s0, 0x10($sp) +/* D20C70 80240DE0 03E00008 */ jr $ra +/* D20C74 80240DE4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344.s deleted file mode 100644 index 023d4b6602..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241344 -/* D211D4 80241344 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D211D8 80241348 AFB00010 */ sw $s0, 0x10($sp) -/* D211DC 8024134C 0080802D */ daddu $s0, $a0, $zero -/* D211E0 80241350 AFBF0014 */ sw $ra, 0x14($sp) -/* D211E4 80241354 8E020148 */ lw $v0, 0x148($s0) -/* D211E8 80241358 0C00EABB */ jal get_npc_unsafe -/* D211EC 8024135C 84440008 */ lh $a0, 8($v0) -/* D211F0 80241360 0040202D */ daddu $a0, $v0, $zero -/* D211F4 80241364 8482008E */ lh $v0, 0x8e($a0) -/* D211F8 80241368 9483008E */ lhu $v1, 0x8e($a0) -/* D211FC 8024136C 18400005 */ blez $v0, .L80241384 -/* D21200 80241370 2462FFFF */ addiu $v0, $v1, -1 -/* D21204 80241374 A482008E */ sh $v0, 0x8e($a0) -/* D21208 80241378 00021400 */ sll $v0, $v0, 0x10 -/* D2120C 8024137C 1C400006 */ bgtz $v0, .L80241398 -/* D21210 80241380 00000000 */ nop -.L80241384: -/* D21214 80241384 8482008C */ lh $v0, 0x8c($a0) -/* D21218 80241388 14400003 */ bnez $v0, .L80241398 -/* D2121C 8024138C 2402000E */ addiu $v0, $zero, 0xe -/* D21220 80241390 A480008E */ sh $zero, 0x8e($a0) -/* D21224 80241394 AE020070 */ sw $v0, 0x70($s0) -.L80241398: -/* D21228 80241398 8FBF0014 */ lw $ra, 0x14($sp) -/* D2122C 8024139C 8FB00010 */ lw $s0, 0x10($sp) -/* D21230 802413A0 03E00008 */ jr $ra -/* D21234 802413A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s new file mode 100644 index 0000000000..b7d170e5e2 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241344_D211D4.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241344_D211D4 +/* D211D4 80241344 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D211D8 80241348 AFB00010 */ sw $s0, 0x10($sp) +/* D211DC 8024134C 0080802D */ daddu $s0, $a0, $zero +/* D211E0 80241350 AFBF0014 */ sw $ra, 0x14($sp) +/* D211E4 80241354 8E020148 */ lw $v0, 0x148($s0) +/* D211E8 80241358 0C00EABB */ jal get_npc_unsafe +/* D211EC 8024135C 84440008 */ lh $a0, 8($v0) +/* D211F0 80241360 0040202D */ daddu $a0, $v0, $zero +/* D211F4 80241364 8482008E */ lh $v0, 0x8e($a0) +/* D211F8 80241368 9483008E */ lhu $v1, 0x8e($a0) +/* D211FC 8024136C 18400005 */ blez $v0, .L80241384 +/* D21200 80241370 2462FFFF */ addiu $v0, $v1, -1 +/* D21204 80241374 A482008E */ sh $v0, 0x8e($a0) +/* D21208 80241378 00021400 */ sll $v0, $v0, 0x10 +/* D2120C 8024137C 1C400006 */ bgtz $v0, .L80241398 +/* D21210 80241380 00000000 */ nop +.L80241384: +/* D21214 80241384 8482008C */ lh $v0, 0x8c($a0) +/* D21218 80241388 14400003 */ bnez $v0, .L80241398 +/* D2121C 8024138C 2402000E */ addiu $v0, $zero, 0xe +/* D21220 80241390 A480008E */ sh $zero, 0x8e($a0) +/* D21224 80241394 AE020070 */ sw $v0, 0x70($s0) +.L80241398: +/* D21228 80241398 8FBF0014 */ lw $ra, 0x14($sp) +/* D2122C 8024139C 8FB00010 */ lw $s0, 0x10($sp) +/* D21230 802413A0 03E00008 */ jr $ra +/* D21234 802413A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C.s deleted file mode 100644 index bb7db04f25..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024185C -/* D216EC 8024185C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D216F0 80241860 AFB40040 */ sw $s4, 0x40($sp) -/* D216F4 80241864 0080A02D */ daddu $s4, $a0, $zero -/* D216F8 80241868 AFBF0048 */ sw $ra, 0x48($sp) -/* D216FC 8024186C AFB50044 */ sw $s5, 0x44($sp) -/* D21700 80241870 AFB3003C */ sw $s3, 0x3c($sp) -/* D21704 80241874 AFB20038 */ sw $s2, 0x38($sp) -/* D21708 80241878 AFB10034 */ sw $s1, 0x34($sp) -/* D2170C 8024187C AFB00030 */ sw $s0, 0x30($sp) -/* D21710 80241880 8E920148 */ lw $s2, 0x148($s4) -/* D21714 80241884 86440008 */ lh $a0, 8($s2) -/* D21718 80241888 8E90000C */ lw $s0, 0xc($s4) -/* D2171C 8024188C 0C00EABB */ jal get_npc_unsafe -/* D21720 80241890 00A0882D */ daddu $s1, $a1, $zero -/* D21724 80241894 0280202D */ daddu $a0, $s4, $zero -/* D21728 80241898 8E050000 */ lw $a1, ($s0) -/* D2172C 8024189C 0C0B1EAF */ jal get_variable -/* D21730 802418A0 0040A82D */ daddu $s5, $v0, $zero -/* D21734 802418A4 AFA00010 */ sw $zero, 0x10($sp) -/* D21738 802418A8 8E4300D0 */ lw $v1, 0xd0($s2) -/* D2173C 802418AC 8C630030 */ lw $v1, 0x30($v1) -/* D21740 802418B0 AFA30014 */ sw $v1, 0x14($sp) -/* D21744 802418B4 8E4300D0 */ lw $v1, 0xd0($s2) -/* D21748 802418B8 8C63001C */ lw $v1, 0x1c($v1) -/* D2174C 802418BC AFA30018 */ sw $v1, 0x18($sp) -/* D21750 802418C0 8E4300D0 */ lw $v1, 0xd0($s2) -/* D21754 802418C4 8C630024 */ lw $v1, 0x24($v1) -/* D21758 802418C8 AFA3001C */ sw $v1, 0x1c($sp) -/* D2175C 802418CC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D21760 802418D0 8C630028 */ lw $v1, 0x28($v1) -/* D21764 802418D4 27B30010 */ addiu $s3, $sp, 0x10 -/* D21768 802418D8 AFA30020 */ sw $v1, 0x20($sp) -/* D2176C 802418DC 8E4300D0 */ lw $v1, 0xd0($s2) -/* D21770 802418E0 3C0142F0 */ lui $at, 0x42f0 -/* D21774 802418E4 44810000 */ mtc1 $at, $f0 -/* D21778 802418E8 8C63002C */ lw $v1, 0x2c($v1) -/* D2177C 802418EC 0040802D */ daddu $s0, $v0, $zero -/* D21780 802418F0 E7A00028 */ swc1 $f0, 0x28($sp) -/* D21784 802418F4 A7A0002C */ sh $zero, 0x2c($sp) -/* D21788 802418F8 12200006 */ beqz $s1, .L80241914 -/* D2178C 802418FC AFA30024 */ sw $v1, 0x24($sp) -/* D21790 80241900 02A0202D */ daddu $a0, $s5, $zero -/* D21794 80241904 0240282D */ daddu $a1, $s2, $zero -/* D21798 80241908 0280302D */ daddu $a2, $s4, $zero -/* D2179C 8024190C 0C0905CE */ jal func_80241738 -/* D217A0 80241910 0200382D */ daddu $a3, $s0, $zero -.L80241914: -/* D217A4 80241914 2402FFFE */ addiu $v0, $zero, -2 -/* D217A8 80241918 A2A200AB */ sb $v0, 0xab($s5) -/* D217AC 8024191C 8E4300B0 */ lw $v1, 0xb0($s2) -/* D217B0 80241920 30620004 */ andi $v0, $v1, 4 -/* D217B4 80241924 10400007 */ beqz $v0, .L80241944 -/* D217B8 80241928 00000000 */ nop -/* D217BC 8024192C 824200B4 */ lb $v0, 0xb4($s2) -/* D217C0 80241930 1440003C */ bnez $v0, .L80241A24 -/* D217C4 80241934 0000102D */ daddu $v0, $zero, $zero -/* D217C8 80241938 2402FFFB */ addiu $v0, $zero, -5 -/* D217CC 8024193C 00621024 */ and $v0, $v1, $v0 -/* D217D0 80241940 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241944: -/* D217D4 80241944 8E830070 */ lw $v1, 0x70($s4) -/* D217D8 80241948 2C62000F */ sltiu $v0, $v1, 0xf -/* D217DC 8024194C 10400034 */ beqz $v0, .L80241A20 -/* D217E0 80241950 00031080 */ sll $v0, $v1, 2 -/* D217E4 80241954 3C018025 */ lui $at, 0x8025 -/* D217E8 80241958 00220821 */ addu $at, $at, $v0 -/* D217EC 8024195C 8C22BE58 */ lw $v0, -0x41a8($at) -/* D217F0 80241960 00400008 */ jr $v0 -/* D217F4 80241964 00000000 */ nop -/* D217F8 80241968 0280202D */ daddu $a0, $s4, $zero -/* D217FC 8024196C 0200282D */ daddu $a1, $s0, $zero -/* D21800 80241970 0C090154 */ jal func_80240550 -/* D21804 80241974 0260302D */ daddu $a2, $s3, $zero -/* D21808 80241978 0280202D */ daddu $a0, $s4, $zero -/* D2180C 8024197C 0200282D */ daddu $a1, $s0, $zero -/* D21810 80241980 0C0901C0 */ jal func_80240700 -/* D21814 80241984 0260302D */ daddu $a2, $s3, $zero -/* D21818 80241988 08090689 */ j .L80241A24 -/* D2181C 8024198C 0000102D */ daddu $v0, $zero, $zero -/* D21820 80241990 0280202D */ daddu $a0, $s4, $zero -/* D21824 80241994 0200282D */ daddu $a1, $s0, $zero -/* D21828 80241998 0C09034A */ jal func_80240D28 -/* D2182C 8024199C 0260302D */ daddu $a2, $s3, $zero -/* D21830 802419A0 0280202D */ daddu $a0, $s4, $zero -/* D21834 802419A4 0200282D */ daddu $a1, $s0, $zero -/* D21838 802419A8 0C09037A */ jal func_80240DE8 -/* D2183C 802419AC 0260302D */ daddu $a2, $s3, $zero -/* D21840 802419B0 08090689 */ j .L80241A24 -/* D21844 802419B4 0000102D */ daddu $v0, $zero, $zero -/* D21848 802419B8 0280202D */ daddu $a0, $s4, $zero -/* D2184C 802419BC 0200282D */ daddu $a1, $s0, $zero -/* D21850 802419C0 0C09044B */ jal func_8024112C -/* D21854 802419C4 0260302D */ daddu $a2, $s3, $zero -/* D21858 802419C8 0280202D */ daddu $a0, $s4, $zero -/* D2185C 802419CC 0200282D */ daddu $a1, $s0, $zero -/* D21860 802419D0 0C090469 */ jal func_802411A4 -/* D21864 802419D4 0260302D */ daddu $a2, $s3, $zero -/* D21868 802419D8 08090689 */ j .L80241A24 -/* D2186C 802419DC 0000102D */ daddu $v0, $zero, $zero -/* D21870 802419E0 0280202D */ daddu $a0, $s4, $zero -/* D21874 802419E4 0200282D */ daddu $a1, $s0, $zero -/* D21878 802419E8 0C090484 */ jal func_80241210 -/* D2187C 802419EC 0260302D */ daddu $a2, $s3, $zero -/* D21880 802419F0 08090689 */ j .L80241A24 -/* D21884 802419F4 0000102D */ daddu $v0, $zero, $zero -/* D21888 802419F8 0280202D */ daddu $a0, $s4, $zero -/* D2188C 802419FC 0200282D */ daddu $a1, $s0, $zero -/* D21890 80241A00 0C0904D1 */ jal func_80241344 -/* D21894 80241A04 0260302D */ daddu $a2, $s3, $zero -/* D21898 80241A08 08090689 */ j .L80241A24 -/* D2189C 80241A0C 0000102D */ daddu $v0, $zero, $zero -/* D218A0 80241A10 0280202D */ daddu $a0, $s4, $zero -/* D218A4 80241A14 0200282D */ daddu $a1, $s0, $zero -/* D218A8 80241A18 0C0904EA */ jal func_802413A8 -/* D218AC 80241A1C 0260302D */ daddu $a2, $s3, $zero -.L80241A20: -/* D218B0 80241A20 0000102D */ daddu $v0, $zero, $zero -.L80241A24: -/* D218B4 80241A24 8FBF0048 */ lw $ra, 0x48($sp) -/* D218B8 80241A28 8FB50044 */ lw $s5, 0x44($sp) -/* D218BC 80241A2C 8FB40040 */ lw $s4, 0x40($sp) -/* D218C0 80241A30 8FB3003C */ lw $s3, 0x3c($sp) -/* D218C4 80241A34 8FB20038 */ lw $s2, 0x38($sp) -/* D218C8 80241A38 8FB10034 */ lw $s1, 0x34($sp) -/* D218CC 80241A3C 8FB00030 */ lw $s0, 0x30($sp) -/* D218D0 80241A40 03E00008 */ jr $ra -/* D218D4 80241A44 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s new file mode 100644 index 0000000000..43f5be683c --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024185C_D216EC.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024185C_D216EC +/* D216EC 8024185C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* D216F0 80241860 AFB40040 */ sw $s4, 0x40($sp) +/* D216F4 80241864 0080A02D */ daddu $s4, $a0, $zero +/* D216F8 80241868 AFBF0048 */ sw $ra, 0x48($sp) +/* D216FC 8024186C AFB50044 */ sw $s5, 0x44($sp) +/* D21700 80241870 AFB3003C */ sw $s3, 0x3c($sp) +/* D21704 80241874 AFB20038 */ sw $s2, 0x38($sp) +/* D21708 80241878 AFB10034 */ sw $s1, 0x34($sp) +/* D2170C 8024187C AFB00030 */ sw $s0, 0x30($sp) +/* D21710 80241880 8E920148 */ lw $s2, 0x148($s4) +/* D21714 80241884 86440008 */ lh $a0, 8($s2) +/* D21718 80241888 8E90000C */ lw $s0, 0xc($s4) +/* D2171C 8024188C 0C00EABB */ jal get_npc_unsafe +/* D21720 80241890 00A0882D */ daddu $s1, $a1, $zero +/* D21724 80241894 0280202D */ daddu $a0, $s4, $zero +/* D21728 80241898 8E050000 */ lw $a1, ($s0) +/* D2172C 8024189C 0C0B1EAF */ jal get_variable +/* D21730 802418A0 0040A82D */ daddu $s5, $v0, $zero +/* D21734 802418A4 AFA00010 */ sw $zero, 0x10($sp) +/* D21738 802418A8 8E4300D0 */ lw $v1, 0xd0($s2) +/* D2173C 802418AC 8C630030 */ lw $v1, 0x30($v1) +/* D21740 802418B0 AFA30014 */ sw $v1, 0x14($sp) +/* D21744 802418B4 8E4300D0 */ lw $v1, 0xd0($s2) +/* D21748 802418B8 8C63001C */ lw $v1, 0x1c($v1) +/* D2174C 802418BC AFA30018 */ sw $v1, 0x18($sp) +/* D21750 802418C0 8E4300D0 */ lw $v1, 0xd0($s2) +/* D21754 802418C4 8C630024 */ lw $v1, 0x24($v1) +/* D21758 802418C8 AFA3001C */ sw $v1, 0x1c($sp) +/* D2175C 802418CC 8E4300D0 */ lw $v1, 0xd0($s2) +/* D21760 802418D0 8C630028 */ lw $v1, 0x28($v1) +/* D21764 802418D4 27B30010 */ addiu $s3, $sp, 0x10 +/* D21768 802418D8 AFA30020 */ sw $v1, 0x20($sp) +/* D2176C 802418DC 8E4300D0 */ lw $v1, 0xd0($s2) +/* D21770 802418E0 3C0142F0 */ lui $at, 0x42f0 +/* D21774 802418E4 44810000 */ mtc1 $at, $f0 +/* D21778 802418E8 8C63002C */ lw $v1, 0x2c($v1) +/* D2177C 802418EC 0040802D */ daddu $s0, $v0, $zero +/* D21780 802418F0 E7A00028 */ swc1 $f0, 0x28($sp) +/* D21784 802418F4 A7A0002C */ sh $zero, 0x2c($sp) +/* D21788 802418F8 12200006 */ beqz $s1, .L80241914 +/* D2178C 802418FC AFA30024 */ sw $v1, 0x24($sp) +/* D21790 80241900 02A0202D */ daddu $a0, $s5, $zero +/* D21794 80241904 0240282D */ daddu $a1, $s2, $zero +/* D21798 80241908 0280302D */ daddu $a2, $s4, $zero +/* D2179C 8024190C 0C0905CE */ jal func_80241738_D215C8 +/* D217A0 80241910 0200382D */ daddu $a3, $s0, $zero +.L80241914: +/* D217A4 80241914 2402FFFE */ addiu $v0, $zero, -2 +/* D217A8 80241918 A2A200AB */ sb $v0, 0xab($s5) +/* D217AC 8024191C 8E4300B0 */ lw $v1, 0xb0($s2) +/* D217B0 80241920 30620004 */ andi $v0, $v1, 4 +/* D217B4 80241924 10400007 */ beqz $v0, .L80241944 +/* D217B8 80241928 00000000 */ nop +/* D217BC 8024192C 824200B4 */ lb $v0, 0xb4($s2) +/* D217C0 80241930 1440003C */ bnez $v0, .L80241A24 +/* D217C4 80241934 0000102D */ daddu $v0, $zero, $zero +/* D217C8 80241938 2402FFFB */ addiu $v0, $zero, -5 +/* D217CC 8024193C 00621024 */ and $v0, $v1, $v0 +/* D217D0 80241940 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241944: +/* D217D4 80241944 8E830070 */ lw $v1, 0x70($s4) +/* D217D8 80241948 2C62000F */ sltiu $v0, $v1, 0xf +/* D217DC 8024194C 10400034 */ beqz $v0, .L80241A20 +/* D217E0 80241950 00031080 */ sll $v0, $v1, 2 +/* D217E4 80241954 3C018025 */ lui $at, 0x8025 +/* D217E8 80241958 00220821 */ addu $at, $at, $v0 +/* D217EC 8024195C 8C22BE58 */ lw $v0, -0x41a8($at) +/* D217F0 80241960 00400008 */ jr $v0 +/* D217F4 80241964 00000000 */ nop +/* D217F8 80241968 0280202D */ daddu $a0, $s4, $zero +/* D217FC 8024196C 0200282D */ daddu $a1, $s0, $zero +/* D21800 80241970 0C090154 */ jal func_80240550_D203E0 +/* D21804 80241974 0260302D */ daddu $a2, $s3, $zero +/* D21808 80241978 0280202D */ daddu $a0, $s4, $zero +/* D2180C 8024197C 0200282D */ daddu $a1, $s0, $zero +/* D21810 80241980 0C0901C0 */ jal func_80240700_D20590 +/* D21814 80241984 0260302D */ daddu $a2, $s3, $zero +/* D21818 80241988 08090689 */ j .L80241A24 +/* D2181C 8024198C 0000102D */ daddu $v0, $zero, $zero +/* D21820 80241990 0280202D */ daddu $a0, $s4, $zero +/* D21824 80241994 0200282D */ daddu $a1, $s0, $zero +/* D21828 80241998 0C09034A */ jal func_80240D28_D20BB8 +/* D2182C 8024199C 0260302D */ daddu $a2, $s3, $zero +/* D21830 802419A0 0280202D */ daddu $a0, $s4, $zero +/* D21834 802419A4 0200282D */ daddu $a1, $s0, $zero +/* D21838 802419A8 0C09037A */ jal func_80240DE8_D20C78 +/* D2183C 802419AC 0260302D */ daddu $a2, $s3, $zero +/* D21840 802419B0 08090689 */ j .L80241A24 +/* D21844 802419B4 0000102D */ daddu $v0, $zero, $zero +/* D21848 802419B8 0280202D */ daddu $a0, $s4, $zero +/* D2184C 802419BC 0200282D */ daddu $a1, $s0, $zero +/* D21850 802419C0 0C09044B */ jal func_8024112C_D20FBC +/* D21854 802419C4 0260302D */ daddu $a2, $s3, $zero +/* D21858 802419C8 0280202D */ daddu $a0, $s4, $zero +/* D2185C 802419CC 0200282D */ daddu $a1, $s0, $zero +/* D21860 802419D0 0C090469 */ jal func_802411A4_D21034 +/* D21864 802419D4 0260302D */ daddu $a2, $s3, $zero +/* D21868 802419D8 08090689 */ j .L80241A24 +/* D2186C 802419DC 0000102D */ daddu $v0, $zero, $zero +/* D21870 802419E0 0280202D */ daddu $a0, $s4, $zero +/* D21874 802419E4 0200282D */ daddu $a1, $s0, $zero +/* D21878 802419E8 0C090484 */ jal func_80241210_D210A0 +/* D2187C 802419EC 0260302D */ daddu $a2, $s3, $zero +/* D21880 802419F0 08090689 */ j .L80241A24 +/* D21884 802419F4 0000102D */ daddu $v0, $zero, $zero +/* D21888 802419F8 0280202D */ daddu $a0, $s4, $zero +/* D2188C 802419FC 0200282D */ daddu $a1, $s0, $zero +/* D21890 80241A00 0C0904D1 */ jal func_80241344_D211D4 +/* D21894 80241A04 0260302D */ daddu $a2, $s3, $zero +/* D21898 80241A08 08090689 */ j .L80241A24 +/* D2189C 80241A0C 0000102D */ daddu $v0, $zero, $zero +/* D218A0 80241A10 0280202D */ daddu $a0, $s4, $zero +/* D218A4 80241A14 0200282D */ daddu $a1, $s0, $zero +/* D218A8 80241A18 0C0904EA */ jal func_802413A8_D21238 +/* D218AC 80241A1C 0260302D */ daddu $a2, $s3, $zero +.L80241A20: +/* D218B0 80241A20 0000102D */ daddu $v0, $zero, $zero +.L80241A24: +/* D218B4 80241A24 8FBF0048 */ lw $ra, 0x48($sp) +/* D218B8 80241A28 8FB50044 */ lw $s5, 0x44($sp) +/* D218BC 80241A2C 8FB40040 */ lw $s4, 0x40($sp) +/* D218C0 80241A30 8FB3003C */ lw $s3, 0x3c($sp) +/* D218C4 80241A34 8FB20038 */ lw $s2, 0x38($sp) +/* D218C8 80241A38 8FB10034 */ lw $s1, 0x34($sp) +/* D218CC 80241A3C 8FB00030 */ lw $s0, 0x30($sp) +/* D218D0 80241A40 03E00008 */ jr $ra +/* D218D4 80241A44 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48.s deleted file mode 100644 index 9239bb0f1f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A48 -/* D218D8 80241A48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D218DC 80241A4C AFB00010 */ sw $s0, 0x10($sp) -/* D218E0 80241A50 3C108024 */ lui $s0, 0x8024 -/* D218E4 80241A54 261043D0 */ addiu $s0, $s0, 0x43d0 -/* D218E8 80241A58 AFBF0018 */ sw $ra, 0x18($sp) -/* D218EC 80241A5C AFB10014 */ sw $s1, 0x14($sp) -/* D218F0 80241A60 8E020000 */ lw $v0, ($s0) -/* D218F4 80241A64 14400010 */ bnez $v0, .L80241AA8 -/* D218F8 80241A68 0080882D */ daddu $s1, $a0, $zero -/* D218FC 80241A6C 0C00AB39 */ jal heap_malloc -/* D21900 80241A70 24040040 */ addiu $a0, $zero, 0x40 -/* D21904 80241A74 AE020000 */ sw $v0, ($s0) -/* D21908 80241A78 0000182D */ daddu $v1, $zero, $zero -/* D2190C 80241A7C 0040282D */ daddu $a1, $v0, $zero -/* D21910 80241A80 0220202D */ daddu $a0, $s1, $zero -.L80241A84: -/* D21914 80241A84 8C820084 */ lw $v0, 0x84($a0) -/* D21918 80241A88 24840004 */ addiu $a0, $a0, 4 -/* D2191C 80241A8C 24630001 */ addiu $v1, $v1, 1 -/* D21920 80241A90 ACA20000 */ sw $v0, ($a1) -/* D21924 80241A94 28620010 */ slti $v0, $v1, 0x10 -/* D21928 80241A98 1440FFFA */ bnez $v0, .L80241A84 -/* D2192C 80241A9C 24A50004 */ addiu $a1, $a1, 4 -/* D21930 80241AA0 080906B9 */ j .L80241AE4 -/* D21934 80241AA4 00000000 */ nop -.L80241AA8: -/* D21938 80241AA8 0000182D */ daddu $v1, $zero, $zero -/* D2193C 80241AAC 0040282D */ daddu $a1, $v0, $zero -/* D21940 80241AB0 0220202D */ daddu $a0, $s1, $zero -.L80241AB4: -/* D21944 80241AB4 8CA20000 */ lw $v0, ($a1) -/* D21948 80241AB8 24A50004 */ addiu $a1, $a1, 4 -/* D2194C 80241ABC 24630001 */ addiu $v1, $v1, 1 -/* D21950 80241AC0 AC820084 */ sw $v0, 0x84($a0) -/* D21954 80241AC4 28620010 */ slti $v0, $v1, 0x10 -/* D21958 80241AC8 1440FFFA */ bnez $v0, .L80241AB4 -/* D2195C 80241ACC 24840004 */ addiu $a0, $a0, 4 -/* D21960 80241AD0 3C108024 */ lui $s0, 0x8024 -/* D21964 80241AD4 261043D0 */ addiu $s0, $s0, 0x43d0 -/* D21968 80241AD8 0C00AB4B */ jal heap_free -/* D2196C 80241ADC 8E040000 */ lw $a0, ($s0) -/* D21970 80241AE0 AE000000 */ sw $zero, ($s0) -.L80241AE4: -/* D21974 80241AE4 8FBF0018 */ lw $ra, 0x18($sp) -/* D21978 80241AE8 8FB10014 */ lw $s1, 0x14($sp) -/* D2197C 80241AEC 8FB00010 */ lw $s0, 0x10($sp) -/* D21980 80241AF0 24020002 */ addiu $v0, $zero, 2 -/* D21984 80241AF4 03E00008 */ jr $ra -/* D21988 80241AF8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s new file mode 100644 index 0000000000..ba8ad6694d --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241A48_D218D8.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241A48_D218D8 +/* D218D8 80241A48 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D218DC 80241A4C AFB00010 */ sw $s0, 0x10($sp) +/* D218E0 80241A50 3C108024 */ lui $s0, 0x8024 +/* D218E4 80241A54 261043D0 */ addiu $s0, $s0, 0x43d0 +/* D218E8 80241A58 AFBF0018 */ sw $ra, 0x18($sp) +/* D218EC 80241A5C AFB10014 */ sw $s1, 0x14($sp) +/* D218F0 80241A60 8E020000 */ lw $v0, ($s0) +/* D218F4 80241A64 14400010 */ bnez $v0, .L80241AA8 +/* D218F8 80241A68 0080882D */ daddu $s1, $a0, $zero +/* D218FC 80241A6C 0C00AB39 */ jal heap_malloc +/* D21900 80241A70 24040040 */ addiu $a0, $zero, 0x40 +/* D21904 80241A74 AE020000 */ sw $v0, ($s0) +/* D21908 80241A78 0000182D */ daddu $v1, $zero, $zero +/* D2190C 80241A7C 0040282D */ daddu $a1, $v0, $zero +/* D21910 80241A80 0220202D */ daddu $a0, $s1, $zero +.L80241A84: +/* D21914 80241A84 8C820084 */ lw $v0, 0x84($a0) +/* D21918 80241A88 24840004 */ addiu $a0, $a0, 4 +/* D2191C 80241A8C 24630001 */ addiu $v1, $v1, 1 +/* D21920 80241A90 ACA20000 */ sw $v0, ($a1) +/* D21924 80241A94 28620010 */ slti $v0, $v1, 0x10 +/* D21928 80241A98 1440FFFA */ bnez $v0, .L80241A84 +/* D2192C 80241A9C 24A50004 */ addiu $a1, $a1, 4 +/* D21930 80241AA0 080906B9 */ j .L80241AE4 +/* D21934 80241AA4 00000000 */ nop +.L80241AA8: +/* D21938 80241AA8 0000182D */ daddu $v1, $zero, $zero +/* D2193C 80241AAC 0040282D */ daddu $a1, $v0, $zero +/* D21940 80241AB0 0220202D */ daddu $a0, $s1, $zero +.L80241AB4: +/* D21944 80241AB4 8CA20000 */ lw $v0, ($a1) +/* D21948 80241AB8 24A50004 */ addiu $a1, $a1, 4 +/* D2194C 80241ABC 24630001 */ addiu $v1, $v1, 1 +/* D21950 80241AC0 AC820084 */ sw $v0, 0x84($a0) +/* D21954 80241AC4 28620010 */ slti $v0, $v1, 0x10 +/* D21958 80241AC8 1440FFFA */ bnez $v0, .L80241AB4 +/* D2195C 80241ACC 24840004 */ addiu $a0, $a0, 4 +/* D21960 80241AD0 3C108024 */ lui $s0, 0x8024 +/* D21964 80241AD4 261043D0 */ addiu $s0, $s0, 0x43d0 +/* D21968 80241AD8 0C00AB4B */ jal heap_free +/* D2196C 80241ADC 8E040000 */ lw $a0, ($s0) +/* D21970 80241AE0 AE000000 */ sw $zero, ($s0) +.L80241AE4: +/* D21974 80241AE4 8FBF0018 */ lw $ra, 0x18($sp) +/* D21978 80241AE8 8FB10014 */ lw $s1, 0x14($sp) +/* D2197C 80241AEC 8FB00010 */ lw $s0, 0x10($sp) +/* D21980 80241AF0 24020002 */ addiu $v0, $zero, 2 +/* D21984 80241AF4 03E00008 */ jr $ra +/* D21988 80241AF8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C.s deleted file mode 100644 index 99f2041940..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241D8C -/* D21C1C 80241D8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21C20 80241D90 AFBF0010 */ sw $ra, 0x10($sp) -/* D21C24 80241D94 10A00003 */ beqz $a1, .L80241DA4 -/* D21C28 80241D98 8C86000C */ lw $a2, 0xc($a0) -/* D21C2C 80241D9C 3C018024 */ lui $at, 0x8024 -/* D21C30 80241DA0 AC204434 */ sw $zero, 0x4434($at) -.L80241DA4: -/* D21C34 80241DA4 3C038024 */ lui $v1, 0x8024 -/* D21C38 80241DA8 24634434 */ addiu $v1, $v1, 0x4434 -/* D21C3C 80241DAC 8C620000 */ lw $v0, ($v1) -/* D21C40 80241DB0 54400003 */ bnel $v0, $zero, .L80241DC0 -/* D21C44 80241DB4 AC600000 */ sw $zero, ($v1) -/* D21C48 80241DB8 08090775 */ j .L80241DD4 -/* D21C4C 80241DBC 0000102D */ daddu $v0, $zero, $zero -.L80241DC0: -/* D21C50 80241DC0 8CC50000 */ lw $a1, ($a2) -/* D21C54 80241DC4 3C068024 */ lui $a2, 0x8024 -/* D21C58 80241DC8 0C0B2026 */ jal set_variable -/* D21C5C 80241DCC 8CC64438 */ lw $a2, 0x4438($a2) -/* D21C60 80241DD0 24020002 */ addiu $v0, $zero, 2 -.L80241DD4: -/* D21C64 80241DD4 8FBF0010 */ lw $ra, 0x10($sp) -/* D21C68 80241DD8 03E00008 */ jr $ra -/* D21C6C 80241DDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s new file mode 100644 index 0000000000..a791ef96e7 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241D8C_D21C1C.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241D8C_D21C1C +/* D21C1C 80241D8C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D21C20 80241D90 AFBF0010 */ sw $ra, 0x10($sp) +/* D21C24 80241D94 10A00003 */ beqz $a1, .L80241DA4 +/* D21C28 80241D98 8C86000C */ lw $a2, 0xc($a0) +/* D21C2C 80241D9C 3C018024 */ lui $at, 0x8024 +/* D21C30 80241DA0 AC204434 */ sw $zero, 0x4434($at) +.L80241DA4: +/* D21C34 80241DA4 3C038024 */ lui $v1, 0x8024 +/* D21C38 80241DA8 24634434 */ addiu $v1, $v1, 0x4434 +/* D21C3C 80241DAC 8C620000 */ lw $v0, ($v1) +/* D21C40 80241DB0 54400003 */ bnel $v0, $zero, .L80241DC0 +/* D21C44 80241DB4 AC600000 */ sw $zero, ($v1) +/* D21C48 80241DB8 08090775 */ j .L80241DD4 +/* D21C4C 80241DBC 0000102D */ daddu $v0, $zero, $zero +.L80241DC0: +/* D21C50 80241DC0 8CC50000 */ lw $a1, ($a2) +/* D21C54 80241DC4 3C068024 */ lui $a2, 0x8024 +/* D21C58 80241DC8 0C0B2026 */ jal set_variable +/* D21C5C 80241DCC 8CC64438 */ lw $a2, 0x4438($a2) +/* D21C60 80241DD0 24020002 */ addiu $v0, $zero, 2 +.L80241DD4: +/* D21C64 80241DD4 8FBF0010 */ lw $ra, 0x10($sp) +/* D21C68 80241DD8 03E00008 */ jr $ra +/* D21C6C 80241DDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0.s deleted file mode 100644 index 1eeffc5d68..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DE0 -/* D21C70 80241DE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21C74 80241DE4 AFBF0010 */ sw $ra, 0x10($sp) -/* D21C78 80241DE8 8C82000C */ lw $v0, 0xc($a0) -/* D21C7C 80241DEC 0C0B1EAF */ jal get_variable -/* D21C80 80241DF0 8C450000 */ lw $a1, ($v0) -/* D21C84 80241DF4 3C018024 */ lui $at, 0x8024 -/* D21C88 80241DF8 AC224438 */ sw $v0, 0x4438($at) -/* D21C8C 80241DFC 24020002 */ addiu $v0, $zero, 2 -/* D21C90 80241E00 8FBF0010 */ lw $ra, 0x10($sp) -/* D21C94 80241E04 24030001 */ addiu $v1, $zero, 1 -/* D21C98 80241E08 3C018024 */ lui $at, 0x8024 -/* D21C9C 80241E0C AC234434 */ sw $v1, 0x4434($at) -/* D21CA0 80241E10 03E00008 */ jr $ra -/* D21CA4 80241E14 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s new file mode 100644 index 0000000000..65eda04237 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241DE0_D21C70.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DE0_D21C70 +/* D21C70 80241DE0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D21C74 80241DE4 AFBF0010 */ sw $ra, 0x10($sp) +/* D21C78 80241DE8 8C82000C */ lw $v0, 0xc($a0) +/* D21C7C 80241DEC 0C0B1EAF */ jal get_variable +/* D21C80 80241DF0 8C450000 */ lw $a1, ($v0) +/* D21C84 80241DF4 3C018024 */ lui $at, 0x8024 +/* D21C88 80241DF8 AC224438 */ sw $v0, 0x4438($at) +/* D21C8C 80241DFC 24020002 */ addiu $v0, $zero, 2 +/* D21C90 80241E00 8FBF0010 */ lw $ra, 0x10($sp) +/* D21C94 80241E04 24030001 */ addiu $v1, $zero, 1 +/* D21C98 80241E08 3C018024 */ lui $at, 0x8024 +/* D21C9C 80241E0C AC234434 */ sw $v1, 0x4434($at) +/* D21CA0 80241E10 03E00008 */ jr $ra +/* D21CA4 80241E14 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4.s deleted file mode 100644 index 8d5b56333b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241EB4 -/* D21D44 80241EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21D48 80241EB8 AFBF0010 */ sw $ra, 0x10($sp) -/* D21D4C 80241EBC 8C82000C */ lw $v0, 0xc($a0) -/* D21D50 80241EC0 0C0B1EAF */ jal get_variable -/* D21D54 80241EC4 8C450000 */ lw $a1, ($v0) -/* D21D58 80241EC8 0040182D */ daddu $v1, $v0, $zero -/* D21D5C 80241ECC 10600012 */ beqz $v1, .L80241F18 -/* D21D60 80241ED0 0000202D */ daddu $a0, $zero, $zero -/* D21D64 80241ED4 8C620000 */ lw $v0, ($v1) -/* D21D68 80241ED8 5040000A */ beql $v0, $zero, .L80241F04 -/* D21D6C 80241EDC 00041080 */ sll $v0, $a0, 2 -/* D21D70 80241EE0 3C058025 */ lui $a1, 0x8025 -/* D21D74 80241EE4 24A5C068 */ addiu $a1, $a1, -0x3f98 -.L80241EE8: -/* D21D78 80241EE8 24630004 */ addiu $v1, $v1, 4 -/* D21D7C 80241EEC 24840001 */ addiu $a0, $a0, 1 -/* D21D80 80241EF0 ACA20000 */ sw $v0, ($a1) -/* D21D84 80241EF4 8C620000 */ lw $v0, ($v1) -/* D21D88 80241EF8 1440FFFB */ bnez $v0, .L80241EE8 -/* D21D8C 80241EFC 24A50004 */ addiu $a1, $a1, 4 -/* D21D90 80241F00 00041080 */ sll $v0, $a0, 2 -.L80241F04: -/* D21D94 80241F04 3C018025 */ lui $at, 0x8025 -/* D21D98 80241F08 00220821 */ addu $at, $at, $v0 -/* D21D9C 80241F0C AC20C068 */ sw $zero, -0x3f98($at) -/* D21DA0 80241F10 080907D0 */ j .L80241F40 -/* D21DA4 80241F14 00000000 */ nop -.L80241F18: -/* D21DA8 80241F18 3C038025 */ lui $v1, 0x8025 -/* D21DAC 80241F1C 2463C068 */ addiu $v1, $v1, -0x3f98 -/* D21DB0 80241F20 0060282D */ daddu $a1, $v1, $zero -.L80241F24: -/* D21DB4 80241F24 24820080 */ addiu $v0, $a0, 0x80 -/* D21DB8 80241F28 AC620000 */ sw $v0, ($v1) -/* D21DBC 80241F2C 24630004 */ addiu $v1, $v1, 4 -/* D21DC0 80241F30 24840001 */ addiu $a0, $a0, 1 -/* D21DC4 80241F34 2882005B */ slti $v0, $a0, 0x5b -/* D21DC8 80241F38 1440FFFA */ bnez $v0, .L80241F24 -/* D21DCC 80241F3C ACA0016C */ sw $zero, 0x16c($a1) -.L80241F40: -/* D21DD0 80241F40 8FBF0010 */ lw $ra, 0x10($sp) -/* D21DD4 80241F44 24020002 */ addiu $v0, $zero, 2 -/* D21DD8 80241F48 03E00008 */ jr $ra -/* D21DDC 80241F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s new file mode 100644 index 0000000000..8114c9a287 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241EB4_D21D44.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241EB4_D21D44 +/* D21D44 80241EB4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D21D48 80241EB8 AFBF0010 */ sw $ra, 0x10($sp) +/* D21D4C 80241EBC 8C82000C */ lw $v0, 0xc($a0) +/* D21D50 80241EC0 0C0B1EAF */ jal get_variable +/* D21D54 80241EC4 8C450000 */ lw $a1, ($v0) +/* D21D58 80241EC8 0040182D */ daddu $v1, $v0, $zero +/* D21D5C 80241ECC 10600012 */ beqz $v1, .L80241F18 +/* D21D60 80241ED0 0000202D */ daddu $a0, $zero, $zero +/* D21D64 80241ED4 8C620000 */ lw $v0, ($v1) +/* D21D68 80241ED8 5040000A */ beql $v0, $zero, .L80241F04 +/* D21D6C 80241EDC 00041080 */ sll $v0, $a0, 2 +/* D21D70 80241EE0 3C058025 */ lui $a1, 0x8025 +/* D21D74 80241EE4 24A5C068 */ addiu $a1, $a1, -0x3f98 +.L80241EE8: +/* D21D78 80241EE8 24630004 */ addiu $v1, $v1, 4 +/* D21D7C 80241EEC 24840001 */ addiu $a0, $a0, 1 +/* D21D80 80241EF0 ACA20000 */ sw $v0, ($a1) +/* D21D84 80241EF4 8C620000 */ lw $v0, ($v1) +/* D21D88 80241EF8 1440FFFB */ bnez $v0, .L80241EE8 +/* D21D8C 80241EFC 24A50004 */ addiu $a1, $a1, 4 +/* D21D90 80241F00 00041080 */ sll $v0, $a0, 2 +.L80241F04: +/* D21D94 80241F04 3C018025 */ lui $at, 0x8025 +/* D21D98 80241F08 00220821 */ addu $at, $at, $v0 +/* D21D9C 80241F0C AC20C068 */ sw $zero, -0x3f98($at) +/* D21DA0 80241F10 080907D0 */ j .L80241F40 +/* D21DA4 80241F14 00000000 */ nop +.L80241F18: +/* D21DA8 80241F18 3C038025 */ lui $v1, 0x8025 +/* D21DAC 80241F1C 2463C068 */ addiu $v1, $v1, -0x3f98 +/* D21DB0 80241F20 0060282D */ daddu $a1, $v1, $zero +.L80241F24: +/* D21DB4 80241F24 24820080 */ addiu $v0, $a0, 0x80 +/* D21DB8 80241F28 AC620000 */ sw $v0, ($v1) +/* D21DBC 80241F2C 24630004 */ addiu $v1, $v1, 4 +/* D21DC0 80241F30 24840001 */ addiu $a0, $a0, 1 +/* D21DC4 80241F34 2882005B */ slti $v0, $a0, 0x5b +/* D21DC8 80241F38 1440FFFA */ bnez $v0, .L80241F24 +/* D21DCC 80241F3C ACA0016C */ sw $zero, 0x16c($a1) +.L80241F40: +/* D21DD0 80241F40 8FBF0010 */ lw $ra, 0x10($sp) +/* D21DD4 80241F44 24020002 */ addiu $v0, $zero, 2 +/* D21DD8 80241F48 03E00008 */ jr $ra +/* D21DDC 80241F4C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50.s deleted file mode 100644 index 72b510cae1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F50 -/* D21DE0 80241F50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21DE4 80241F54 AFBF0010 */ sw $ra, 0x10($sp) -/* D21DE8 80241F58 0C03A625 */ jal func_800E9894 -/* D21DEC 80241F5C 00000000 */ nop -/* D21DF0 80241F60 8FBF0010 */ lw $ra, 0x10($sp) -/* D21DF4 80241F64 24020002 */ addiu $v0, $zero, 2 -/* D21DF8 80241F68 03E00008 */ jr $ra -/* D21DFC 80241F6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s new file mode 100644 index 0000000000..4d2f754750 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F50_D21DE0 +/* D21DE0 80241F50 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D21DE4 80241F54 AFBF0010 */ sw $ra, 0x10($sp) +/* D21DE8 80241F58 0C03A625 */ jal func_800E9894 +/* D21DEC 80241F5C 00000000 */ nop +/* D21DF0 80241F60 8FBF0010 */ lw $ra, 0x10($sp) +/* D21DF4 80241F64 24020002 */ addiu $v0, $zero, 2 +/* D21DF8 80241F68 03E00008 */ jr $ra +/* D21DFC 80241F6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70.s deleted file mode 100644 index 4aecfd62c8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F70 -/* D21E00 80241F70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21E04 80241F74 AFBF0010 */ sw $ra, 0x10($sp) -/* D21E08 80241F78 0C03A631 */ jal func_800E98C4 -/* D21E0C 80241F7C 00000000 */ nop -/* D21E10 80241F80 0C03A6DB */ jal sync_status_menu -/* D21E14 80241F84 00000000 */ nop -/* D21E18 80241F88 8FBF0010 */ lw $ra, 0x10($sp) -/* D21E1C 80241F8C 24020002 */ addiu $v0, $zero, 2 -/* D21E20 80241F90 03E00008 */ jr $ra -/* D21E24 80241F94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s new file mode 100644 index 0000000000..ab125b4731 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s @@ -0,0 +1,14 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241F70_D21E00 +/* D21E00 80241F70 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D21E04 80241F74 AFBF0010 */ sw $ra, 0x10($sp) +/* D21E08 80241F78 0C03A631 */ jal func_800E98C4 +/* D21E0C 80241F7C 00000000 */ nop +/* D21E10 80241F80 0C03A6DB */ jal sync_status_menu +/* D21E14 80241F84 00000000 */ nop +/* D21E18 80241F88 8FBF0010 */ lw $ra, 0x10($sp) +/* D21E1C 80241F8C 24020002 */ addiu $v0, $zero, 2 +/* D21E20 80241F90 03E00008 */ jr $ra +/* D21E24 80241F94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094.s deleted file mode 100644 index 06117a0259..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242094 -/* D21F24 80242094 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21F28 80242098 AFBF0010 */ sw $ra, 0x10($sp) -/* D21F2C 8024209C 8C82000C */ lw $v0, 0xc($a0) -/* D21F30 802420A0 0C0B1EAF */ jal get_variable -/* D21F34 802420A4 8C450000 */ lw $a1, ($v0) -/* D21F38 802420A8 0C0B1059 */ jal does_script_exist -/* D21F3C 802420AC 0040202D */ daddu $a0, $v0, $zero -/* D21F40 802420B0 2C420001 */ sltiu $v0, $v0, 1 -/* D21F44 802420B4 8FBF0010 */ lw $ra, 0x10($sp) -/* D21F48 802420B8 00021040 */ sll $v0, $v0, 1 -/* D21F4C 802420BC 03E00008 */ jr $ra -/* D21F50 802420C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s new file mode 100644 index 0000000000..cdb5372ebc --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242094_D21F24 +/* D21F24 80242094 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D21F28 80242098 AFBF0010 */ sw $ra, 0x10($sp) +/* D21F2C 8024209C 8C82000C */ lw $v0, 0xc($a0) +/* D21F30 802420A0 0C0B1EAF */ jal get_variable +/* D21F34 802420A4 8C450000 */ lw $a1, ($v0) +/* D21F38 802420A8 0C0B1059 */ jal does_script_exist +/* D21F3C 802420AC 0040202D */ daddu $a0, $v0, $zero +/* D21F40 802420B0 2C420001 */ sltiu $v0, $v0, 1 +/* D21F44 802420B4 8FBF0010 */ lw $ra, 0x10($sp) +/* D21F48 802420B8 00021040 */ sll $v0, $v0, 1 +/* D21F4C 802420BC 03E00008 */ jr $ra +/* D21F50 802420C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4.s deleted file mode 100644 index e912ede6cf..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420C4 -/* D21F54 802420C4 3C028011 */ lui $v0, 0x8011 -/* D21F58 802420C8 8042F2A2 */ lb $v0, -0xd5e($v0) -/* D21F5C 802420CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21F60 802420D0 10400003 */ beqz $v0, .L802420E0 -/* D21F64 802420D4 AFBF0010 */ sw $ra, 0x10($sp) -/* D21F68 802420D8 0C03AE06 */ jal partner_suspend_ability_script -/* D21F6C 802420DC 00000000 */ nop -.L802420E0: -/* D21F70 802420E0 24020002 */ addiu $v0, $zero, 2 -/* D21F74 802420E4 8FBF0010 */ lw $ra, 0x10($sp) -/* D21F78 802420E8 03E00008 */ jr $ra -/* D21F7C 802420EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s new file mode 100644 index 0000000000..09a4660d84 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420C4_D21F54 +/* D21F54 802420C4 3C028011 */ lui $v0, 0x8011 +/* D21F58 802420C8 8042F2A2 */ lb $v0, -0xd5e($v0) +/* D21F5C 802420CC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D21F60 802420D0 10400003 */ beqz $v0, .L802420E0 +/* D21F64 802420D4 AFBF0010 */ sw $ra, 0x10($sp) +/* D21F68 802420D8 0C03AE06 */ jal partner_suspend_ability_script +/* D21F6C 802420DC 00000000 */ nop +.L802420E0: +/* D21F70 802420E0 24020002 */ addiu $v0, $zero, 2 +/* D21F74 802420E4 8FBF0010 */ lw $ra, 0x10($sp) +/* D21F78 802420E8 03E00008 */ jr $ra +/* D21F7C 802420EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110.s deleted file mode 100644 index 24bbe36e28..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110.s +++ /dev/null @@ -1,27 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242110 -/* D21FA0 80242110 3C058011 */ lui $a1, %hi(gPlayerData) -/* D21FA4 80242114 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) -/* D21FA8 80242118 AC800088 */ sw $zero, 0x88($a0) -/* D21FAC 8024211C 80A30003 */ lb $v1, 3($a1) -/* D21FB0 80242120 80A20002 */ lb $v0, 2($a1) -/* D21FB4 80242124 1462000B */ bne $v1, $v0, .L80242154 -/* D21FB8 80242128 00A0302D */ daddu $a2, $a1, $zero -/* D21FBC 8024212C 80A30006 */ lb $v1, 6($a1) -/* D21FC0 80242130 80A20005 */ lb $v0, 5($a1) -/* D21FC4 80242134 14620007 */ bne $v1, $v0, .L80242154 -/* D21FC8 80242138 00000000 */ nop -/* D21FCC 8024213C 80C2028E */ lb $v0, 0x28e($a2) -/* D21FD0 80242140 84C30290 */ lh $v1, 0x290($a2) -/* D21FD4 80242144 00021200 */ sll $v0, $v0, 8 -/* D21FD8 80242148 14620004 */ bne $v1, $v0, .L8024215C -/* D21FDC 8024214C 24020001 */ addiu $v0, $zero, 1 -/* D21FE0 80242150 AC820088 */ sw $v0, 0x88($a0) -.L80242154: -/* D21FE4 80242154 03E00008 */ jr $ra -/* D21FE8 80242158 24020002 */ addiu $v0, $zero, 2 -.L8024215C: -/* D21FEC 8024215C 03E00008 */ jr $ra -/* D21FF0 80242160 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s new file mode 100644 index 0000000000..2617f7be65 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242110_D21FA0.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242110_D21FA0 +/* D21FA0 80242110 3C058011 */ lui $a1, %hi(gPlayerData) +/* D21FA4 80242114 24A5F290 */ addiu $a1, $a1, %lo(gPlayerData) +/* D21FA8 80242118 AC800088 */ sw $zero, 0x88($a0) +/* D21FAC 8024211C 80A30003 */ lb $v1, 3($a1) +/* D21FB0 80242120 80A20002 */ lb $v0, 2($a1) +/* D21FB4 80242124 1462000B */ bne $v1, $v0, .L80242154 +/* D21FB8 80242128 00A0302D */ daddu $a2, $a1, $zero +/* D21FBC 8024212C 80A30006 */ lb $v1, 6($a1) +/* D21FC0 80242130 80A20005 */ lb $v0, 5($a1) +/* D21FC4 80242134 14620007 */ bne $v1, $v0, .L80242154 +/* D21FC8 80242138 00000000 */ nop +/* D21FCC 8024213C 80C2028E */ lb $v0, 0x28e($a2) +/* D21FD0 80242140 84C30290 */ lh $v1, 0x290($a2) +/* D21FD4 80242144 00021200 */ sll $v0, $v0, 8 +/* D21FD8 80242148 14620004 */ bne $v1, $v0, .L8024215C +/* D21FDC 8024214C 24020001 */ addiu $v0, $zero, 1 +/* D21FE0 80242150 AC820088 */ sw $v0, 0x88($a0) +.L80242154: +/* D21FE4 80242154 03E00008 */ jr $ra +/* D21FE8 80242158 24020002 */ addiu $v0, $zero, 2 +.L8024215C: +/* D21FEC 8024215C 03E00008 */ jr $ra +/* D21FF0 80242160 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164.s deleted file mode 100644 index dd11a4a102..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242164 -/* D21FF4 80242164 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D21FF8 80242168 AFB10014 */ sw $s1, 0x14($sp) -/* D21FFC 8024216C 0080882D */ daddu $s1, $a0, $zero -/* D22000 80242170 AFBF001C */ sw $ra, 0x1c($sp) -/* D22004 80242174 AFB20018 */ sw $s2, 0x18($sp) -/* D22008 80242178 AFB00010 */ sw $s0, 0x10($sp) -/* D2200C 8024217C 8E30000C */ lw $s0, 0xc($s1) -/* D22010 80242180 8E050000 */ lw $a1, ($s0) -/* D22014 80242184 0C0B1EAF */ jal get_variable -/* D22018 80242188 26100004 */ addiu $s0, $s0, 4 -/* D2201C 8024218C 8E050000 */ lw $a1, ($s0) -/* D22020 80242190 26100004 */ addiu $s0, $s0, 4 -/* D22024 80242194 0220202D */ daddu $a0, $s1, $zero -/* D22028 80242198 0C0B1EAF */ jal get_variable -/* D2202C 8024219C 0040902D */ daddu $s2, $v0, $zero -/* D22030 802421A0 0220202D */ daddu $a0, $s1, $zero -/* D22034 802421A4 8E050000 */ lw $a1, ($s0) -/* D22038 802421A8 0C0B1EAF */ jal get_variable -/* D2203C 802421AC 0040802D */ daddu $s0, $v0, $zero -/* D22040 802421B0 0000202D */ daddu $a0, $zero, $zero -/* D22044 802421B4 324500FF */ andi $a1, $s2, 0xff -/* D22048 802421B8 320600FF */ andi $a2, $s0, 0xff -/* D2204C 802421BC 0C04DF84 */ jal func_80137E10 -/* D22050 802421C0 304700FF */ andi $a3, $v0, 0xff -/* D22054 802421C4 8FBF001C */ lw $ra, 0x1c($sp) -/* D22058 802421C8 8FB20018 */ lw $s2, 0x18($sp) -/* D2205C 802421CC 8FB10014 */ lw $s1, 0x14($sp) -/* D22060 802421D0 8FB00010 */ lw $s0, 0x10($sp) -/* D22064 802421D4 24020002 */ addiu $v0, $zero, 2 -/* D22068 802421D8 03E00008 */ jr $ra -/* D2206C 802421DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s new file mode 100644 index 0000000000..04b068105c --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242164_D21FF4.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242164_D21FF4 +/* D21FF4 80242164 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D21FF8 80242168 AFB10014 */ sw $s1, 0x14($sp) +/* D21FFC 8024216C 0080882D */ daddu $s1, $a0, $zero +/* D22000 80242170 AFBF001C */ sw $ra, 0x1c($sp) +/* D22004 80242174 AFB20018 */ sw $s2, 0x18($sp) +/* D22008 80242178 AFB00010 */ sw $s0, 0x10($sp) +/* D2200C 8024217C 8E30000C */ lw $s0, 0xc($s1) +/* D22010 80242180 8E050000 */ lw $a1, ($s0) +/* D22014 80242184 0C0B1EAF */ jal get_variable +/* D22018 80242188 26100004 */ addiu $s0, $s0, 4 +/* D2201C 8024218C 8E050000 */ lw $a1, ($s0) +/* D22020 80242190 26100004 */ addiu $s0, $s0, 4 +/* D22024 80242194 0220202D */ daddu $a0, $s1, $zero +/* D22028 80242198 0C0B1EAF */ jal get_variable +/* D2202C 8024219C 0040902D */ daddu $s2, $v0, $zero +/* D22030 802421A0 0220202D */ daddu $a0, $s1, $zero +/* D22034 802421A4 8E050000 */ lw $a1, ($s0) +/* D22038 802421A8 0C0B1EAF */ jal get_variable +/* D2203C 802421AC 0040802D */ daddu $s0, $v0, $zero +/* D22040 802421B0 0000202D */ daddu $a0, $zero, $zero +/* D22044 802421B4 324500FF */ andi $a1, $s2, 0xff +/* D22048 802421B8 320600FF */ andi $a2, $s0, 0xff +/* D2204C 802421BC 0C04DF84 */ jal func_80137E10 +/* D22050 802421C0 304700FF */ andi $a3, $v0, 0xff +/* D22054 802421C4 8FBF001C */ lw $ra, 0x1c($sp) +/* D22058 802421C8 8FB20018 */ lw $s2, 0x18($sp) +/* D2205C 802421CC 8FB10014 */ lw $s1, 0x14($sp) +/* D22060 802421D0 8FB00010 */ lw $s0, 0x10($sp) +/* D22064 802421D4 24020002 */ addiu $v0, $zero, 2 +/* D22068 802421D8 03E00008 */ jr $ra +/* D2206C 802421DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242244.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242244.s deleted file mode 100644 index 8180cf67d5..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242244.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242244 -/* D220D4 80242244 03E00008 */ jr $ra -/* D220D8 80242248 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242244_D220D4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242244_D220D4.s new file mode 100644 index 0000000000..8d3b467bb1 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242244_D220D4.s @@ -0,0 +1,6 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242244_D220D4 +/* D220D4 80242244 03E00008 */ jr $ra +/* D220D8 80242248 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024224C.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024224C.s deleted file mode 100644 index 8c15aafb9e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024224C.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024224C -/* D220DC 8024224C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D220E0 80242250 AFB10014 */ sw $s1, 0x14($sp) -/* D220E4 80242254 0080882D */ daddu $s1, $a0, $zero -/* D220E8 80242258 AFBF0018 */ sw $ra, 0x18($sp) -/* D220EC 8024225C AFB00010 */ sw $s0, 0x10($sp) -/* D220F0 80242260 8E30000C */ lw $s0, 0xc($s1) -/* D220F4 80242264 8E050000 */ lw $a1, ($s0) -/* D220F8 80242268 0C0B1EAF */ jal get_variable -/* D220FC 8024226C 26100004 */ addiu $s0, $s0, 4 -/* D22100 80242270 AE22008C */ sw $v0, 0x8c($s1) -/* D22104 80242274 8E050000 */ lw $a1, ($s0) -/* D22108 80242278 26100004 */ addiu $s0, $s0, 4 -/* D2210C 8024227C 0C0B1EAF */ jal get_variable -/* D22110 80242280 0220202D */ daddu $a0, $s1, $zero -/* D22114 80242284 AE220090 */ sw $v0, 0x90($s1) -/* D22118 80242288 8E050000 */ lw $a1, ($s0) -/* D2211C 8024228C 26100004 */ addiu $s0, $s0, 4 -/* D22120 80242290 0C0B1EAF */ jal get_variable -/* D22124 80242294 0220202D */ daddu $a0, $s1, $zero -/* D22128 80242298 AE220094 */ sw $v0, 0x94($s1) -/* D2212C 8024229C 8E050000 */ lw $a1, ($s0) -/* D22130 802422A0 26100004 */ addiu $s0, $s0, 4 -/* D22134 802422A4 0C0B1EAF */ jal get_variable -/* D22138 802422A8 0220202D */ daddu $a0, $s1, $zero -/* D2213C 802422AC AE220098 */ sw $v0, 0x98($s1) -/* D22140 802422B0 8E050000 */ lw $a1, ($s0) -/* D22144 802422B4 26100004 */ addiu $s0, $s0, 4 -/* D22148 802422B8 0C0B1EAF */ jal get_variable -/* D2214C 802422BC 0220202D */ daddu $a0, $s1, $zero -/* D22150 802422C0 AE22009C */ sw $v0, 0x9c($s1) -/* D22154 802422C4 8E050000 */ lw $a1, ($s0) -/* D22158 802422C8 26100004 */ addiu $s0, $s0, 4 -/* D2215C 802422CC 0C0B1EAF */ jal get_variable -/* D22160 802422D0 0220202D */ daddu $a0, $s1, $zero -/* D22164 802422D4 AE2200A0 */ sw $v0, 0xa0($s1) -/* D22168 802422D8 8E050000 */ lw $a1, ($s0) -/* D2216C 802422DC 26100004 */ addiu $s0, $s0, 4 -/* D22170 802422E0 0C0B1EAF */ jal get_variable -/* D22174 802422E4 0220202D */ daddu $a0, $s1, $zero -/* D22178 802422E8 AE2200A4 */ sw $v0, 0xa4($s1) -/* D2217C 802422EC 8E050000 */ lw $a1, ($s0) -/* D22180 802422F0 26100004 */ addiu $s0, $s0, 4 -/* D22184 802422F4 0C0B1EAF */ jal get_variable -/* D22188 802422F8 0220202D */ daddu $a0, $s1, $zero -/* D2218C 802422FC AE2200A8 */ sw $v0, 0xa8($s1) -/* D22190 80242300 8E050000 */ lw $a1, ($s0) -/* D22194 80242304 26100004 */ addiu $s0, $s0, 4 -/* D22198 80242308 0C0B1EAF */ jal get_variable -/* D2219C 8024230C 0220202D */ daddu $a0, $s1, $zero -/* D221A0 80242310 AE2200AC */ sw $v0, 0xac($s1) -/* D221A4 80242314 8E050000 */ lw $a1, ($s0) -/* D221A8 80242318 0C0B1EAF */ jal get_variable -/* D221AC 8024231C 0220202D */ daddu $a0, $s1, $zero -/* D221B0 80242320 AE2200B0 */ sw $v0, 0xb0($s1) -/* D221B4 80242324 8FBF0018 */ lw $ra, 0x18($sp) -/* D221B8 80242328 8FB10014 */ lw $s1, 0x14($sp) -/* D221BC 8024232C 8FB00010 */ lw $s0, 0x10($sp) -/* D221C0 80242330 24020002 */ addiu $v0, $zero, 2 -/* D221C4 80242334 03E00008 */ jr $ra -/* D221C8 80242338 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024224C_D220DC.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024224C_D220DC.s new file mode 100644 index 0000000000..75f273998e --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024224C_D220DC.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024224C_D220DC +/* D220DC 8024224C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D220E0 80242250 AFB10014 */ sw $s1, 0x14($sp) +/* D220E4 80242254 0080882D */ daddu $s1, $a0, $zero +/* D220E8 80242258 AFBF0018 */ sw $ra, 0x18($sp) +/* D220EC 8024225C AFB00010 */ sw $s0, 0x10($sp) +/* D220F0 80242260 8E30000C */ lw $s0, 0xc($s1) +/* D220F4 80242264 8E050000 */ lw $a1, ($s0) +/* D220F8 80242268 0C0B1EAF */ jal get_variable +/* D220FC 8024226C 26100004 */ addiu $s0, $s0, 4 +/* D22100 80242270 AE22008C */ sw $v0, 0x8c($s1) +/* D22104 80242274 8E050000 */ lw $a1, ($s0) +/* D22108 80242278 26100004 */ addiu $s0, $s0, 4 +/* D2210C 8024227C 0C0B1EAF */ jal get_variable +/* D22110 80242280 0220202D */ daddu $a0, $s1, $zero +/* D22114 80242284 AE220090 */ sw $v0, 0x90($s1) +/* D22118 80242288 8E050000 */ lw $a1, ($s0) +/* D2211C 8024228C 26100004 */ addiu $s0, $s0, 4 +/* D22120 80242290 0C0B1EAF */ jal get_variable +/* D22124 80242294 0220202D */ daddu $a0, $s1, $zero +/* D22128 80242298 AE220094 */ sw $v0, 0x94($s1) +/* D2212C 8024229C 8E050000 */ lw $a1, ($s0) +/* D22130 802422A0 26100004 */ addiu $s0, $s0, 4 +/* D22134 802422A4 0C0B1EAF */ jal get_variable +/* D22138 802422A8 0220202D */ daddu $a0, $s1, $zero +/* D2213C 802422AC AE220098 */ sw $v0, 0x98($s1) +/* D22140 802422B0 8E050000 */ lw $a1, ($s0) +/* D22144 802422B4 26100004 */ addiu $s0, $s0, 4 +/* D22148 802422B8 0C0B1EAF */ jal get_variable +/* D2214C 802422BC 0220202D */ daddu $a0, $s1, $zero +/* D22150 802422C0 AE22009C */ sw $v0, 0x9c($s1) +/* D22154 802422C4 8E050000 */ lw $a1, ($s0) +/* D22158 802422C8 26100004 */ addiu $s0, $s0, 4 +/* D2215C 802422CC 0C0B1EAF */ jal get_variable +/* D22160 802422D0 0220202D */ daddu $a0, $s1, $zero +/* D22164 802422D4 AE2200A0 */ sw $v0, 0xa0($s1) +/* D22168 802422D8 8E050000 */ lw $a1, ($s0) +/* D2216C 802422DC 26100004 */ addiu $s0, $s0, 4 +/* D22170 802422E0 0C0B1EAF */ jal get_variable +/* D22174 802422E4 0220202D */ daddu $a0, $s1, $zero +/* D22178 802422E8 AE2200A4 */ sw $v0, 0xa4($s1) +/* D2217C 802422EC 8E050000 */ lw $a1, ($s0) +/* D22180 802422F0 26100004 */ addiu $s0, $s0, 4 +/* D22184 802422F4 0C0B1EAF */ jal get_variable +/* D22188 802422F8 0220202D */ daddu $a0, $s1, $zero +/* D2218C 802422FC AE2200A8 */ sw $v0, 0xa8($s1) +/* D22190 80242300 8E050000 */ lw $a1, ($s0) +/* D22194 80242304 26100004 */ addiu $s0, $s0, 4 +/* D22198 80242308 0C0B1EAF */ jal get_variable +/* D2219C 8024230C 0220202D */ daddu $a0, $s1, $zero +/* D221A0 80242310 AE2200AC */ sw $v0, 0xac($s1) +/* D221A4 80242314 8E050000 */ lw $a1, ($s0) +/* D221A8 80242318 0C0B1EAF */ jal get_variable +/* D221AC 8024231C 0220202D */ daddu $a0, $s1, $zero +/* D221B0 80242320 AE2200B0 */ sw $v0, 0xb0($s1) +/* D221B4 80242324 8FBF0018 */ lw $ra, 0x18($sp) +/* D221B8 80242328 8FB10014 */ lw $s1, 0x14($sp) +/* D221BC 8024232C 8FB00010 */ lw $s0, 0x10($sp) +/* D221C0 80242330 24020002 */ addiu $v0, $zero, 2 +/* D221C4 80242334 03E00008 */ jr $ra +/* D221C8 80242338 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8.s deleted file mode 100644 index 328321e5df..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424C8 -/* D22358 802424C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D2235C 802424CC AFB00010 */ sw $s0, 0x10($sp) -/* D22360 802424D0 0080802D */ daddu $s0, $a0, $zero -/* D22364 802424D4 AFBF0014 */ sw $ra, 0x14($sp) -/* D22368 802424D8 0C00EABB */ jal get_npc_unsafe -/* D2236C 802424DC 8E04008C */ lw $a0, 0x8c($s0) -/* D22370 802424E0 0040282D */ daddu $a1, $v0, $zero -/* D22374 802424E4 8E040094 */ lw $a0, 0x94($s0) -/* D22378 802424E8 8CA30028 */ lw $v1, 0x28($a1) -/* D2237C 802424EC ACA40028 */ sw $a0, 0x28($a1) -/* D22380 802424F0 8FBF0014 */ lw $ra, 0x14($sp) -/* D22384 802424F4 8FB00010 */ lw $s0, 0x10($sp) -/* D22388 802424F8 24020002 */ addiu $v0, $zero, 2 -/* D2238C 802424FC 3C018025 */ lui $at, 0x8025 -/* D22390 80242500 AC23C1D8 */ sw $v1, -0x3e28($at) -/* D22394 80242504 03E00008 */ jr $ra -/* D22398 80242508 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s new file mode 100644 index 0000000000..43da178d04 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802424C8_D22358.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802424C8_D22358 +/* D22358 802424C8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D2235C 802424CC AFB00010 */ sw $s0, 0x10($sp) +/* D22360 802424D0 0080802D */ daddu $s0, $a0, $zero +/* D22364 802424D4 AFBF0014 */ sw $ra, 0x14($sp) +/* D22368 802424D8 0C00EABB */ jal get_npc_unsafe +/* D2236C 802424DC 8E04008C */ lw $a0, 0x8c($s0) +/* D22370 802424E0 0040282D */ daddu $a1, $v0, $zero +/* D22374 802424E4 8E040094 */ lw $a0, 0x94($s0) +/* D22378 802424E8 8CA30028 */ lw $v1, 0x28($a1) +/* D2237C 802424EC ACA40028 */ sw $a0, 0x28($a1) +/* D22380 802424F0 8FBF0014 */ lw $ra, 0x14($sp) +/* D22384 802424F4 8FB00010 */ lw $s0, 0x10($sp) +/* D22388 802424F8 24020002 */ addiu $v0, $zero, 2 +/* D2238C 802424FC 3C018025 */ lui $at, 0x8025 +/* D22390 80242500 AC23C1D8 */ sw $v1, -0x3e28($at) +/* D22394 80242504 03E00008 */ jr $ra +/* D22398 80242508 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C.s deleted file mode 100644 index 75c22d28b2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024250C -/* D2239C 8024250C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D223A0 80242510 AFBF0010 */ sw $ra, 0x10($sp) -/* D223A4 80242514 0C00EABB */ jal get_npc_unsafe -/* D223A8 80242518 8C84008C */ lw $a0, 0x8c($a0) -/* D223AC 8024251C 3C038025 */ lui $v1, 0x8025 -/* D223B0 80242520 8C63C1D8 */ lw $v1, -0x3e28($v1) -/* D223B4 80242524 AC430028 */ sw $v1, 0x28($v0) -/* D223B8 80242528 8FBF0010 */ lw $ra, 0x10($sp) -/* D223BC 8024252C 24020002 */ addiu $v0, $zero, 2 -/* D223C0 80242530 03E00008 */ jr $ra -/* D223C4 80242534 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s new file mode 100644 index 0000000000..0aaf16f76a --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_8024250C_D2239C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024250C_D2239C +/* D2239C 8024250C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D223A0 80242510 AFBF0010 */ sw $ra, 0x10($sp) +/* D223A4 80242514 0C00EABB */ jal get_npc_unsafe +/* D223A8 80242518 8C84008C */ lw $a0, 0x8c($a0) +/* D223AC 8024251C 3C038025 */ lui $v1, 0x8025 +/* D223B0 80242520 8C63C1D8 */ lw $v1, -0x3e28($v1) +/* D223B4 80242524 AC430028 */ sw $v1, 0x28($v0) +/* D223B8 80242528 8FBF0010 */ lw $ra, 0x10($sp) +/* D223BC 8024252C 24020002 */ addiu $v0, $zero, 2 +/* D223C0 80242530 03E00008 */ jr $ra +/* D223C4 80242534 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538.s deleted file mode 100644 index d716536d65..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538.s +++ /dev/null @@ -1,67 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242538 -/* D223C8 80242538 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D223CC 8024253C AFB00010 */ sw $s0, 0x10($sp) -/* D223D0 80242540 0080802D */ daddu $s0, $a0, $zero -/* D223D4 80242544 10A0000A */ beqz $a1, .L80242570 -/* D223D8 80242548 AFBF0014 */ sw $ra, 0x14($sp) -/* D223DC 8024254C 8E020084 */ lw $v0, 0x84($s0) -/* D223E0 80242550 54400007 */ bnel $v0, $zero, .L80242570 -/* D223E4 80242554 AE000070 */ sw $zero, 0x70($s0) -/* D223E8 80242558 960400C2 */ lhu $a0, 0xc2($s0) -/* D223EC 8024255C 2405FFFF */ addiu $a1, $zero, -1 -/* D223F0 80242560 24060001 */ addiu $a2, $zero, 1 -/* D223F4 80242564 0C046E54 */ jal func_8011B950 -/* D223F8 80242568 00C0382D */ daddu $a3, $a2, $zero -/* D223FC 8024256C AE000070 */ sw $zero, 0x70($s0) -.L80242570: -/* D22400 80242570 8E020070 */ lw $v0, 0x70($s0) -/* D22404 80242574 24420020 */ addiu $v0, $v0, 0x20 -/* D22408 80242578 AE020070 */ sw $v0, 0x70($s0) -/* D2240C 8024257C 28420100 */ slti $v0, $v0, 0x100 -/* D22410 80242580 14400002 */ bnez $v0, .L8024258C -/* D22414 80242584 240200FF */ addiu $v0, $zero, 0xff -/* D22418 80242588 AE020070 */ sw $v0, 0x70($s0) -.L8024258C: -/* D2241C 8024258C 8E020084 */ lw $v0, 0x84($s0) -/* D22420 80242590 14400004 */ bnez $v0, .L802425A4 -/* D22424 80242594 240200FF */ addiu $v0, $zero, 0xff -/* D22428 80242598 8E020070 */ lw $v0, 0x70($s0) -/* D2242C 8024259C 0809096C */ j .L802425B0 -/* D22430 802425A0 0000202D */ daddu $a0, $zero, $zero -.L802425A4: -/* D22434 802425A4 8E030070 */ lw $v1, 0x70($s0) -/* D22438 802425A8 00431023 */ subu $v0, $v0, $v1 -/* D2243C 802425AC 0000202D */ daddu $a0, $zero, $zero -.L802425B0: -/* D22440 802425B0 0080282D */ daddu $a1, $a0, $zero -/* D22444 802425B4 0080302D */ daddu $a2, $a0, $zero -/* D22448 802425B8 0C046F97 */ jal set_background_color_blend -/* D2244C 802425BC 304700FF */ andi $a3, $v0, 0xff -/* D22450 802425C0 3C02800B */ lui $v0, %hi(gCameras) -/* D22454 802425C4 24421D80 */ addiu $v0, $v0, %lo(gCameras) -/* D22458 802425C8 A440002C */ sh $zero, 0x2c($v0) -/* D2245C 802425CC A440002E */ sh $zero, 0x2e($v0) -/* D22460 802425D0 A4400030 */ sh $zero, 0x30($v0) -/* D22464 802425D4 8E020070 */ lw $v0, 0x70($s0) -/* D22468 802425D8 284200FF */ slti $v0, $v0, 0xff -/* D2246C 802425DC 1440000B */ bnez $v0, .L8024260C -/* D22470 802425E0 0000102D */ daddu $v0, $zero, $zero -/* D22474 802425E4 8E030084 */ lw $v1, 0x84($s0) -/* D22478 802425E8 24020003 */ addiu $v0, $zero, 3 -/* D2247C 802425EC 14620007 */ bne $v1, $v0, .L8024260C -/* D22480 802425F0 24020002 */ addiu $v0, $zero, 2 -/* D22484 802425F4 960400C2 */ lhu $a0, 0xc2($s0) -/* D22488 802425F8 2405FFFF */ addiu $a1, $zero, -1 -/* D2248C 802425FC 0000302D */ daddu $a2, $zero, $zero -/* D22490 80242600 0C046E54 */ jal func_8011B950 -/* D22494 80242604 24070001 */ addiu $a3, $zero, 1 -/* D22498 80242608 24020002 */ addiu $v0, $zero, 2 -.L8024260C: -/* D2249C 8024260C 8FBF0014 */ lw $ra, 0x14($sp) -/* D224A0 80242610 8FB00010 */ lw $s0, 0x10($sp) -/* D224A4 80242614 03E00008 */ jr $ra -/* D224A8 80242618 27BD0018 */ addiu $sp, $sp, 0x18 -/* D224AC 8024261C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s new file mode 100644 index 0000000000..04618e56b0 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242538_D223C8.s @@ -0,0 +1,67 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242538_D223C8 +/* D223C8 80242538 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D223CC 8024253C AFB00010 */ sw $s0, 0x10($sp) +/* D223D0 80242540 0080802D */ daddu $s0, $a0, $zero +/* D223D4 80242544 10A0000A */ beqz $a1, .L80242570 +/* D223D8 80242548 AFBF0014 */ sw $ra, 0x14($sp) +/* D223DC 8024254C 8E020084 */ lw $v0, 0x84($s0) +/* D223E0 80242550 54400007 */ bnel $v0, $zero, .L80242570 +/* D223E4 80242554 AE000070 */ sw $zero, 0x70($s0) +/* D223E8 80242558 960400C2 */ lhu $a0, 0xc2($s0) +/* D223EC 8024255C 2405FFFF */ addiu $a1, $zero, -1 +/* D223F0 80242560 24060001 */ addiu $a2, $zero, 1 +/* D223F4 80242564 0C046E54 */ jal func_8011B950 +/* D223F8 80242568 00C0382D */ daddu $a3, $a2, $zero +/* D223FC 8024256C AE000070 */ sw $zero, 0x70($s0) +.L80242570: +/* D22400 80242570 8E020070 */ lw $v0, 0x70($s0) +/* D22404 80242574 24420020 */ addiu $v0, $v0, 0x20 +/* D22408 80242578 AE020070 */ sw $v0, 0x70($s0) +/* D2240C 8024257C 28420100 */ slti $v0, $v0, 0x100 +/* D22410 80242580 14400002 */ bnez $v0, .L8024258C +/* D22414 80242584 240200FF */ addiu $v0, $zero, 0xff +/* D22418 80242588 AE020070 */ sw $v0, 0x70($s0) +.L8024258C: +/* D2241C 8024258C 8E020084 */ lw $v0, 0x84($s0) +/* D22420 80242590 14400004 */ bnez $v0, .L802425A4 +/* D22424 80242594 240200FF */ addiu $v0, $zero, 0xff +/* D22428 80242598 8E020070 */ lw $v0, 0x70($s0) +/* D2242C 8024259C 0809096C */ j .L802425B0 +/* D22430 802425A0 0000202D */ daddu $a0, $zero, $zero +.L802425A4: +/* D22434 802425A4 8E030070 */ lw $v1, 0x70($s0) +/* D22438 802425A8 00431023 */ subu $v0, $v0, $v1 +/* D2243C 802425AC 0000202D */ daddu $a0, $zero, $zero +.L802425B0: +/* D22440 802425B0 0080282D */ daddu $a1, $a0, $zero +/* D22444 802425B4 0080302D */ daddu $a2, $a0, $zero +/* D22448 802425B8 0C046F97 */ jal set_background_color_blend +/* D2244C 802425BC 304700FF */ andi $a3, $v0, 0xff +/* D22450 802425C0 3C02800B */ lui $v0, %hi(gCameras) +/* D22454 802425C4 24421D80 */ addiu $v0, $v0, %lo(gCameras) +/* D22458 802425C8 A440002C */ sh $zero, 0x2c($v0) +/* D2245C 802425CC A440002E */ sh $zero, 0x2e($v0) +/* D22460 802425D0 A4400030 */ sh $zero, 0x30($v0) +/* D22464 802425D4 8E020070 */ lw $v0, 0x70($s0) +/* D22468 802425D8 284200FF */ slti $v0, $v0, 0xff +/* D2246C 802425DC 1440000B */ bnez $v0, .L8024260C +/* D22470 802425E0 0000102D */ daddu $v0, $zero, $zero +/* D22474 802425E4 8E030084 */ lw $v1, 0x84($s0) +/* D22478 802425E8 24020003 */ addiu $v0, $zero, 3 +/* D2247C 802425EC 14620007 */ bne $v1, $v0, .L8024260C +/* D22480 802425F0 24020002 */ addiu $v0, $zero, 2 +/* D22484 802425F4 960400C2 */ lhu $a0, 0xc2($s0) +/* D22488 802425F8 2405FFFF */ addiu $a1, $zero, -1 +/* D2248C 802425FC 0000302D */ daddu $a2, $zero, $zero +/* D22490 80242600 0C046E54 */ jal func_8011B950 +/* D22494 80242604 24070001 */ addiu $a3, $zero, 1 +/* D22498 80242608 24020002 */ addiu $v0, $zero, 2 +.L8024260C: +/* D2249C 8024260C 8FBF0014 */ lw $ra, 0x14($sp) +/* D224A0 80242610 8FB00010 */ lw $s0, 0x10($sp) +/* D224A4 80242614 03E00008 */ jr $ra +/* D224A8 80242618 27BD0018 */ addiu $sp, $sp, 0x18 +/* D224AC 8024261C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650.s deleted file mode 100644 index 6786a3be06..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240650 -/* D2C380 80240650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C384 80240654 AFB10014 */ sw $s1, 0x14($sp) -/* D2C388 80240658 0080882D */ daddu $s1, $a0, $zero -/* D2C38C 8024065C AFBF0018 */ sw $ra, 0x18($sp) -/* D2C390 80240660 AFB00010 */ sw $s0, 0x10($sp) -/* D2C394 80240664 8E300148 */ lw $s0, 0x148($s1) -/* D2C398 80240668 0C00EABB */ jal get_npc_unsafe -/* D2C39C 8024066C 86040008 */ lh $a0, 8($s0) -/* D2C3A0 80240670 24030001 */ addiu $v1, $zero, 1 -/* D2C3A4 80240674 0040202D */ daddu $a0, $v0, $zero -/* D2C3A8 80240678 AE03006C */ sw $v1, 0x6c($s0) -/* D2C3AC 8024067C 8482008C */ lh $v0, 0x8c($a0) -/* D2C3B0 80240680 14400009 */ bnez $v0, .L802406A8 -/* D2C3B4 80240684 24020002 */ addiu $v0, $zero, 2 -/* D2C3B8 80240688 96030072 */ lhu $v1, 0x72($s0) -/* D2C3BC 8024068C AE02006C */ sw $v0, 0x6c($s0) -/* D2C3C0 80240690 A483008E */ sh $v1, 0x8e($a0) -/* D2C3C4 80240694 8E0200CC */ lw $v0, 0xcc($s0) -/* D2C3C8 80240698 8C420020 */ lw $v0, 0x20($v0) -/* D2C3CC 8024069C AC820028 */ sw $v0, 0x28($a0) -/* D2C3D0 802406A0 2402001F */ addiu $v0, $zero, 0x1f -/* D2C3D4 802406A4 AE220070 */ sw $v0, 0x70($s1) -.L802406A8: -/* D2C3D8 802406A8 8FBF0018 */ lw $ra, 0x18($sp) -/* D2C3DC 802406AC 8FB10014 */ lw $s1, 0x14($sp) -/* D2C3E0 802406B0 8FB00010 */ lw $s0, 0x10($sp) -/* D2C3E4 802406B4 03E00008 */ jr $ra -/* D2C3E8 802406B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650_D2C380.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650_D2C380.s new file mode 100644 index 0000000000..dd35c1044d --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240650_D2C380.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240650_D2C380 +/* D2C380 80240650 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D2C384 80240654 AFB10014 */ sw $s1, 0x14($sp) +/* D2C388 80240658 0080882D */ daddu $s1, $a0, $zero +/* D2C38C 8024065C AFBF0018 */ sw $ra, 0x18($sp) +/* D2C390 80240660 AFB00010 */ sw $s0, 0x10($sp) +/* D2C394 80240664 8E300148 */ lw $s0, 0x148($s1) +/* D2C398 80240668 0C00EABB */ jal get_npc_unsafe +/* D2C39C 8024066C 86040008 */ lh $a0, 8($s0) +/* D2C3A0 80240670 24030001 */ addiu $v1, $zero, 1 +/* D2C3A4 80240674 0040202D */ daddu $a0, $v0, $zero +/* D2C3A8 80240678 AE03006C */ sw $v1, 0x6c($s0) +/* D2C3AC 8024067C 8482008C */ lh $v0, 0x8c($a0) +/* D2C3B0 80240680 14400009 */ bnez $v0, .L802406A8 +/* D2C3B4 80240684 24020002 */ addiu $v0, $zero, 2 +/* D2C3B8 80240688 96030072 */ lhu $v1, 0x72($s0) +/* D2C3BC 8024068C AE02006C */ sw $v0, 0x6c($s0) +/* D2C3C0 80240690 A483008E */ sh $v1, 0x8e($a0) +/* D2C3C4 80240694 8E0200CC */ lw $v0, 0xcc($s0) +/* D2C3C8 80240698 8C420020 */ lw $v0, 0x20($v0) +/* D2C3CC 8024069C AC820028 */ sw $v0, 0x28($a0) +/* D2C3D0 802406A0 2402001F */ addiu $v0, $zero, 0x1f +/* D2C3D4 802406A4 AE220070 */ sw $v0, 0x70($s1) +.L802406A8: +/* D2C3D8 802406A8 8FBF0018 */ lw $ra, 0x18($sp) +/* D2C3DC 802406AC 8FB10014 */ lw $s1, 0x14($sp) +/* D2C3E0 802406B0 8FB00010 */ lw $s0, 0x10($sp) +/* D2C3E4 802406B4 03E00008 */ jr $ra +/* D2C3E8 802406B8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804.s deleted file mode 100644 index 7037c38786..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240804 -/* D2C534 80240804 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2C538 80240808 AFB10014 */ sw $s1, 0x14($sp) -/* D2C53C 8024080C 0080882D */ daddu $s1, $a0, $zero -/* D2C540 80240810 AFBF0018 */ sw $ra, 0x18($sp) -/* D2C544 80240814 AFB00010 */ sw $s0, 0x10($sp) -/* D2C548 80240818 8E300148 */ lw $s0, 0x148($s1) -/* D2C54C 8024081C 0C00EABB */ jal get_npc_unsafe -/* D2C550 80240820 86040008 */ lh $a0, 8($s0) -/* D2C554 80240824 9443008E */ lhu $v1, 0x8e($v0) -/* D2C558 80240828 2463FFFF */ addiu $v1, $v1, -1 -/* D2C55C 8024082C A443008E */ sh $v1, 0x8e($v0) -/* D2C560 80240830 00031C00 */ sll $v1, $v1, 0x10 -/* D2C564 80240834 1C600003 */ bgtz $v1, .L80240844 -/* D2C568 80240838 2402000C */ addiu $v0, $zero, 0xc -/* D2C56C 8024083C AE00006C */ sw $zero, 0x6c($s0) -/* D2C570 80240840 AE220070 */ sw $v0, 0x70($s1) -.L80240844: -/* D2C574 80240844 8FBF0018 */ lw $ra, 0x18($sp) -/* D2C578 80240848 8FB10014 */ lw $s1, 0x14($sp) -/* D2C57C 8024084C 8FB00010 */ lw $s0, 0x10($sp) -/* D2C580 80240850 03E00008 */ jr $ra -/* D2C584 80240854 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s new file mode 100644 index 0000000000..1bcfe1428d --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240804_D2C534.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240804_D2C534 +/* D2C534 80240804 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D2C538 80240808 AFB10014 */ sw $s1, 0x14($sp) +/* D2C53C 8024080C 0080882D */ daddu $s1, $a0, $zero +/* D2C540 80240810 AFBF0018 */ sw $ra, 0x18($sp) +/* D2C544 80240814 AFB00010 */ sw $s0, 0x10($sp) +/* D2C548 80240818 8E300148 */ lw $s0, 0x148($s1) +/* D2C54C 8024081C 0C00EABB */ jal get_npc_unsafe +/* D2C550 80240820 86040008 */ lh $a0, 8($s0) +/* D2C554 80240824 9443008E */ lhu $v1, 0x8e($v0) +/* D2C558 80240828 2463FFFF */ addiu $v1, $v1, -1 +/* D2C55C 8024082C A443008E */ sh $v1, 0x8e($v0) +/* D2C560 80240830 00031C00 */ sll $v1, $v1, 0x10 +/* D2C564 80240834 1C600003 */ bgtz $v1, .L80240844 +/* D2C568 80240838 2402000C */ addiu $v0, $zero, 0xc +/* D2C56C 8024083C AE00006C */ sw $zero, 0x6c($s0) +/* D2C570 80240840 AE220070 */ sw $v0, 0x70($s1) +.L80240844: +/* D2C574 80240844 8FBF0018 */ lw $ra, 0x18($sp) +/* D2C578 80240848 8FB10014 */ lw $s1, 0x14($sp) +/* D2C57C 8024084C 8FB00010 */ lw $s0, 0x10($sp) +/* D2C580 80240850 03E00008 */ jr $ra +/* D2C584 80240854 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C.s deleted file mode 100644 index 21f059dcac..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C6C -/* D2C99C 80240C6C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D2C9A0 80240C70 AFB20038 */ sw $s2, 0x38($sp) -/* D2C9A4 80240C74 0080902D */ daddu $s2, $a0, $zero -/* D2C9A8 80240C78 AFBF0048 */ sw $ra, 0x48($sp) -/* D2C9AC 80240C7C AFB50044 */ sw $s5, 0x44($sp) -/* D2C9B0 80240C80 AFB40040 */ sw $s4, 0x40($sp) -/* D2C9B4 80240C84 AFB3003C */ sw $s3, 0x3c($sp) -/* D2C9B8 80240C88 AFB10034 */ sw $s1, 0x34($sp) -/* D2C9BC 80240C8C AFB00030 */ sw $s0, 0x30($sp) -/* D2C9C0 80240C90 8E510148 */ lw $s1, 0x148($s2) -/* D2C9C4 80240C94 86240008 */ lh $a0, 8($s1) -/* D2C9C8 80240C98 0C00EABB */ jal get_npc_unsafe -/* D2C9CC 80240C9C 00A0802D */ daddu $s0, $a1, $zero -/* D2C9D0 80240CA0 8E43000C */ lw $v1, 0xc($s2) -/* D2C9D4 80240CA4 0240202D */ daddu $a0, $s2, $zero -/* D2C9D8 80240CA8 8C650000 */ lw $a1, ($v1) -/* D2C9DC 80240CAC 0C0B1EAF */ jal get_variable -/* D2C9E0 80240CB0 0040A82D */ daddu $s5, $v0, $zero -/* D2C9E4 80240CB4 AFA00010 */ sw $zero, 0x10($sp) -/* D2C9E8 80240CB8 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2C9EC 80240CBC 8C630030 */ lw $v1, 0x30($v1) -/* D2C9F0 80240CC0 AFA30014 */ sw $v1, 0x14($sp) -/* D2C9F4 80240CC4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2C9F8 80240CC8 8C63001C */ lw $v1, 0x1c($v1) -/* D2C9FC 80240CCC AFA30018 */ sw $v1, 0x18($sp) -/* D2CA00 80240CD0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2CA04 80240CD4 8C630024 */ lw $v1, 0x24($v1) -/* D2CA08 80240CD8 AFA3001C */ sw $v1, 0x1c($sp) -/* D2CA0C 80240CDC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2CA10 80240CE0 8C630028 */ lw $v1, 0x28($v1) -/* D2CA14 80240CE4 27B40010 */ addiu $s4, $sp, 0x10 -/* D2CA18 80240CE8 AFA30020 */ sw $v1, 0x20($sp) -/* D2CA1C 80240CEC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2CA20 80240CF0 3C014282 */ lui $at, 0x4282 -/* D2CA24 80240CF4 44810000 */ mtc1 $at, $f0 -/* D2CA28 80240CF8 8C63002C */ lw $v1, 0x2c($v1) -/* D2CA2C 80240CFC 0040982D */ daddu $s3, $v0, $zero -/* D2CA30 80240D00 E7A00028 */ swc1 $f0, 0x28($sp) -/* D2CA34 80240D04 A7A0002C */ sh $zero, 0x2c($sp) -/* D2CA38 80240D08 16000005 */ bnez $s0, .L80240D20 -/* D2CA3C 80240D0C AFA30024 */ sw $v1, 0x24($sp) -/* D2CA40 80240D10 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2CA44 80240D14 30420004 */ andi $v0, $v0, 4 -/* D2CA48 80240D18 10400020 */ beqz $v0, .L80240D9C -/* D2CA4C 80240D1C 00000000 */ nop -.L80240D20: -/* D2CA50 80240D20 2404F7FF */ addiu $a0, $zero, -0x801 -/* D2CA54 80240D24 AE400070 */ sw $zero, 0x70($s2) -/* D2CA58 80240D28 A6A0008E */ sh $zero, 0x8e($s5) -/* D2CA5C 80240D2C 8E2200CC */ lw $v0, 0xcc($s1) -/* D2CA60 80240D30 8EA30000 */ lw $v1, ($s5) -/* D2CA64 80240D34 8C420000 */ lw $v0, ($v0) -/* D2CA68 80240D38 00641824 */ and $v1, $v1, $a0 -/* D2CA6C 80240D3C AEA30000 */ sw $v1, ($s5) -/* D2CA70 80240D40 AEA20028 */ sw $v0, 0x28($s5) -/* D2CA74 80240D44 8E2200D0 */ lw $v0, 0xd0($s1) -/* D2CA78 80240D48 8C420034 */ lw $v0, 0x34($v0) -/* D2CA7C 80240D4C 54400005 */ bnel $v0, $zero, .L80240D64 -/* D2CA80 80240D50 2402FDFF */ addiu $v0, $zero, -0x201 -/* D2CA84 80240D54 34620200 */ ori $v0, $v1, 0x200 -/* D2CA88 80240D58 2403FFF7 */ addiu $v1, $zero, -9 -/* D2CA8C 80240D5C 0809035B */ j .L80240D6C -/* D2CA90 80240D60 00431024 */ and $v0, $v0, $v1 -.L80240D64: -/* D2CA94 80240D64 00621024 */ and $v0, $v1, $v0 -/* D2CA98 80240D68 34420008 */ ori $v0, $v0, 8 -.L80240D6C: -/* D2CA9C 80240D6C AEA20000 */ sw $v0, ($s5) -/* D2CAA0 80240D70 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2CAA4 80240D74 30420004 */ andi $v0, $v0, 4 -/* D2CAA8 80240D78 10400007 */ beqz $v0, .L80240D98 -/* D2CAAC 80240D7C 24020063 */ addiu $v0, $zero, 0x63 -/* D2CAB0 80240D80 AE420070 */ sw $v0, 0x70($s2) -/* D2CAB4 80240D84 AE400074 */ sw $zero, 0x74($s2) -/* D2CAB8 80240D88 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2CABC 80240D8C 2403FFFB */ addiu $v1, $zero, -5 -/* D2CAC0 80240D90 00431024 */ and $v0, $v0, $v1 -/* D2CAC4 80240D94 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240D98: -/* D2CAC8 80240D98 AE20006C */ sw $zero, 0x6c($s1) -.L80240D9C: -/* D2CACC 80240D9C 8E420070 */ lw $v0, 0x70($s2) -/* D2CAD0 80240DA0 2842001E */ slti $v0, $v0, 0x1e -/* D2CAD4 80240DA4 10400009 */ beqz $v0, .L80240DCC -/* D2CAD8 80240DA8 00000000 */ nop -/* D2CADC 80240DAC 8E22006C */ lw $v0, 0x6c($s1) -/* D2CAE0 80240DB0 14400006 */ bnez $v0, .L80240DCC -/* D2CAE4 80240DB4 00000000 */ nop -/* D2CAE8 80240DB8 0C090216 */ jal func_80240858 -/* D2CAEC 80240DBC 0240202D */ daddu $a0, $s2, $zero -/* D2CAF0 80240DC0 10400002 */ beqz $v0, .L80240DCC -/* D2CAF4 80240DC4 2402001E */ addiu $v0, $zero, 0x1e -/* D2CAF8 80240DC8 AE420070 */ sw $v0, 0x70($s2) -.L80240DCC: -/* D2CAFC 80240DCC 8E430070 */ lw $v1, 0x70($s2) -/* D2CB00 80240DD0 2C620064 */ sltiu $v0, $v1, 0x64 -/* D2CB04 80240DD4 10400048 */ beqz $v0, .L80240EF8 -/* D2CB08 80240DD8 00031080 */ sll $v0, $v1, 2 -/* D2CB0C 80240DDC 3C018024 */ lui $at, 0x8024 -/* D2CB10 80240DE0 00220821 */ addu $at, $at, $v0 -/* D2CB14 80240DE4 8C223D88 */ lw $v0, 0x3d88($at) -/* D2CB18 80240DE8 00400008 */ jr $v0 -/* D2CB1C 80240DEC 00000000 */ nop -/* D2CB20 80240DF0 0240202D */ daddu $a0, $s2, $zero -/* D2CB24 80240DF4 0260282D */ daddu $a1, $s3, $zero -/* D2CB28 80240DF8 0C012568 */ jal func_800495A0 -/* D2CB2C 80240DFC 0280302D */ daddu $a2, $s4, $zero -/* D2CB30 80240E00 0240202D */ daddu $a0, $s2, $zero -/* D2CB34 80240E04 0260282D */ daddu $a1, $s3, $zero -/* D2CB38 80240E08 0C0125AE */ jal func_800496B8 -/* D2CB3C 80240E0C 0280302D */ daddu $a2, $s4, $zero -/* D2CB40 80240E10 080903BE */ j .L80240EF8 -/* D2CB44 80240E14 00000000 */ nop -/* D2CB48 80240E18 0240202D */ daddu $a0, $s2, $zero -/* D2CB4C 80240E1C 0260282D */ daddu $a1, $s3, $zero -/* D2CB50 80240E20 0C0126D1 */ jal func_80049B44 -/* D2CB54 80240E24 0280302D */ daddu $a2, $s4, $zero -/* D2CB58 80240E28 0240202D */ daddu $a0, $s2, $zero -/* D2CB5C 80240E2C 0260282D */ daddu $a1, $s3, $zero -/* D2CB60 80240E30 0C012701 */ jal func_80049C04 -/* D2CB64 80240E34 0280302D */ daddu $a2, $s4, $zero -/* D2CB68 80240E38 080903BE */ j .L80240EF8 -/* D2CB6C 80240E3C 00000000 */ nop -/* D2CB70 80240E40 0240202D */ daddu $a0, $s2, $zero -/* D2CB74 80240E44 0260282D */ daddu $a1, $s3, $zero -/* D2CB78 80240E48 0C01278F */ jal func_80049E3C -/* D2CB7C 80240E4C 0280302D */ daddu $a2, $s4, $zero -/* D2CB80 80240E50 0240202D */ daddu $a0, $s2, $zero -/* D2CB84 80240E54 0260282D */ daddu $a1, $s3, $zero -/* D2CB88 80240E58 0C0127B3 */ jal func_80049ECC -/* D2CB8C 80240E5C 0280302D */ daddu $a2, $s4, $zero -/* D2CB90 80240E60 080903BE */ j .L80240EF8 -/* D2CB94 80240E64 00000000 */ nop -/* D2CB98 80240E68 0240202D */ daddu $a0, $s2, $zero -/* D2CB9C 80240E6C 0260282D */ daddu $a1, $s3, $zero -/* D2CBA0 80240E70 0C0127DF */ jal func_80049F7C -/* D2CBA4 80240E74 0280302D */ daddu $a2, $s4, $zero -/* D2CBA8 80240E78 0240202D */ daddu $a0, $s2, $zero -/* D2CBAC 80240E7C 0260282D */ daddu $a1, $s3, $zero -/* D2CBB0 80240E80 0C012849 */ jal func_8004A124 -/* D2CBB4 80240E84 0280302D */ daddu $a2, $s4, $zero -/* D2CBB8 80240E88 080903BE */ j .L80240EF8 -/* D2CBBC 80240E8C 00000000 */ nop -/* D2CBC0 80240E90 0240202D */ daddu $a0, $s2, $zero -/* D2CBC4 80240E94 0260282D */ daddu $a1, $s3, $zero -/* D2CBC8 80240E98 0C0128FA */ jal func_8004A3E8 -/* D2CBCC 80240E9C 0280302D */ daddu $a2, $s4, $zero -/* D2CBD0 80240EA0 080903BE */ j .L80240EF8 -/* D2CBD4 80240EA4 00000000 */ nop -/* D2CBD8 80240EA8 0C090194 */ jal func_80240650 -/* D2CBDC 80240EAC 0240202D */ daddu $a0, $s2, $zero -/* D2CBE0 80240EB0 0C0901AF */ jal func_802406BC -/* D2CBE4 80240EB4 0240202D */ daddu $a0, $s2, $zero -/* D2CBE8 80240EB8 8E430070 */ lw $v1, 0x70($s2) -/* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 -/* D2CBF0 80240EC0 1462000D */ bne $v1, $v0, .L80240EF8 -/* D2CBF4 80240EC4 00000000 */ nop -/* D2CBF8 80240EC8 0C0901CB */ jal func_8024072C -/* D2CBFC 80240ECC 0240202D */ daddu $a0, $s2, $zero -/* D2CC00 80240ED0 8E430070 */ lw $v1, 0x70($s2) -/* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 -/* D2CC08 80240ED8 14620007 */ bne $v1, $v0, .L80240EF8 -/* D2CC0C 80240EDC 00000000 */ nop -/* D2CC10 80240EE0 0C090201 */ jal func_80240804 -/* D2CC14 80240EE4 0240202D */ daddu $a0, $s2, $zero -/* D2CC18 80240EE8 080903BE */ j .L80240EF8 -/* D2CC1C 80240EEC 00000000 */ nop -/* D2CC20 80240EF0 0C0129CF */ jal func_8004A73C -/* D2CC24 80240EF4 0240202D */ daddu $a0, $s2, $zero -.L80240EF8: -/* D2CC28 80240EF8 8FBF0048 */ lw $ra, 0x48($sp) -/* D2CC2C 80240EFC 8FB50044 */ lw $s5, 0x44($sp) -/* D2CC30 80240F00 8FB40040 */ lw $s4, 0x40($sp) -/* D2CC34 80240F04 8FB3003C */ lw $s3, 0x3c($sp) -/* D2CC38 80240F08 8FB20038 */ lw $s2, 0x38($sp) -/* D2CC3C 80240F0C 8FB10034 */ lw $s1, 0x34($sp) -/* D2CC40 80240F10 8FB00030 */ lw $s0, 0x30($sp) -/* D2CC44 80240F14 0000102D */ daddu $v0, $zero, $zero -/* D2CC48 80240F18 03E00008 */ jr $ra -/* D2CC4C 80240F1C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s new file mode 100644 index 0000000000..64be16f42f --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240C6C_D2C99C.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C6C_D2C99C +/* D2C99C 80240C6C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* D2C9A0 80240C70 AFB20038 */ sw $s2, 0x38($sp) +/* D2C9A4 80240C74 0080902D */ daddu $s2, $a0, $zero +/* D2C9A8 80240C78 AFBF0048 */ sw $ra, 0x48($sp) +/* D2C9AC 80240C7C AFB50044 */ sw $s5, 0x44($sp) +/* D2C9B0 80240C80 AFB40040 */ sw $s4, 0x40($sp) +/* D2C9B4 80240C84 AFB3003C */ sw $s3, 0x3c($sp) +/* D2C9B8 80240C88 AFB10034 */ sw $s1, 0x34($sp) +/* D2C9BC 80240C8C AFB00030 */ sw $s0, 0x30($sp) +/* D2C9C0 80240C90 8E510148 */ lw $s1, 0x148($s2) +/* D2C9C4 80240C94 86240008 */ lh $a0, 8($s1) +/* D2C9C8 80240C98 0C00EABB */ jal get_npc_unsafe +/* D2C9CC 80240C9C 00A0802D */ daddu $s0, $a1, $zero +/* D2C9D0 80240CA0 8E43000C */ lw $v1, 0xc($s2) +/* D2C9D4 80240CA4 0240202D */ daddu $a0, $s2, $zero +/* D2C9D8 80240CA8 8C650000 */ lw $a1, ($v1) +/* D2C9DC 80240CAC 0C0B1EAF */ jal get_variable +/* D2C9E0 80240CB0 0040A82D */ daddu $s5, $v0, $zero +/* D2C9E4 80240CB4 AFA00010 */ sw $zero, 0x10($sp) +/* D2C9E8 80240CB8 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2C9EC 80240CBC 8C630030 */ lw $v1, 0x30($v1) +/* D2C9F0 80240CC0 AFA30014 */ sw $v1, 0x14($sp) +/* D2C9F4 80240CC4 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2C9F8 80240CC8 8C63001C */ lw $v1, 0x1c($v1) +/* D2C9FC 80240CCC AFA30018 */ sw $v1, 0x18($sp) +/* D2CA00 80240CD0 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2CA04 80240CD4 8C630024 */ lw $v1, 0x24($v1) +/* D2CA08 80240CD8 AFA3001C */ sw $v1, 0x1c($sp) +/* D2CA0C 80240CDC 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2CA10 80240CE0 8C630028 */ lw $v1, 0x28($v1) +/* D2CA14 80240CE4 27B40010 */ addiu $s4, $sp, 0x10 +/* D2CA18 80240CE8 AFA30020 */ sw $v1, 0x20($sp) +/* D2CA1C 80240CEC 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2CA20 80240CF0 3C014282 */ lui $at, 0x4282 +/* D2CA24 80240CF4 44810000 */ mtc1 $at, $f0 +/* D2CA28 80240CF8 8C63002C */ lw $v1, 0x2c($v1) +/* D2CA2C 80240CFC 0040982D */ daddu $s3, $v0, $zero +/* D2CA30 80240D00 E7A00028 */ swc1 $f0, 0x28($sp) +/* D2CA34 80240D04 A7A0002C */ sh $zero, 0x2c($sp) +/* D2CA38 80240D08 16000005 */ bnez $s0, .L80240D20 +/* D2CA3C 80240D0C AFA30024 */ sw $v1, 0x24($sp) +/* D2CA40 80240D10 8E2200B0 */ lw $v0, 0xb0($s1) +/* D2CA44 80240D14 30420004 */ andi $v0, $v0, 4 +/* D2CA48 80240D18 10400020 */ beqz $v0, .L80240D9C +/* D2CA4C 80240D1C 00000000 */ nop +.L80240D20: +/* D2CA50 80240D20 2404F7FF */ addiu $a0, $zero, -0x801 +/* D2CA54 80240D24 AE400070 */ sw $zero, 0x70($s2) +/* D2CA58 80240D28 A6A0008E */ sh $zero, 0x8e($s5) +/* D2CA5C 80240D2C 8E2200CC */ lw $v0, 0xcc($s1) +/* D2CA60 80240D30 8EA30000 */ lw $v1, ($s5) +/* D2CA64 80240D34 8C420000 */ lw $v0, ($v0) +/* D2CA68 80240D38 00641824 */ and $v1, $v1, $a0 +/* D2CA6C 80240D3C AEA30000 */ sw $v1, ($s5) +/* D2CA70 80240D40 AEA20028 */ sw $v0, 0x28($s5) +/* D2CA74 80240D44 8E2200D0 */ lw $v0, 0xd0($s1) +/* D2CA78 80240D48 8C420034 */ lw $v0, 0x34($v0) +/* D2CA7C 80240D4C 54400005 */ bnel $v0, $zero, .L80240D64 +/* D2CA80 80240D50 2402FDFF */ addiu $v0, $zero, -0x201 +/* D2CA84 80240D54 34620200 */ ori $v0, $v1, 0x200 +/* D2CA88 80240D58 2403FFF7 */ addiu $v1, $zero, -9 +/* D2CA8C 80240D5C 0809035B */ j .L80240D6C +/* D2CA90 80240D60 00431024 */ and $v0, $v0, $v1 +.L80240D64: +/* D2CA94 80240D64 00621024 */ and $v0, $v1, $v0 +/* D2CA98 80240D68 34420008 */ ori $v0, $v0, 8 +.L80240D6C: +/* D2CA9C 80240D6C AEA20000 */ sw $v0, ($s5) +/* D2CAA0 80240D70 8E2200B0 */ lw $v0, 0xb0($s1) +/* D2CAA4 80240D74 30420004 */ andi $v0, $v0, 4 +/* D2CAA8 80240D78 10400007 */ beqz $v0, .L80240D98 +/* D2CAAC 80240D7C 24020063 */ addiu $v0, $zero, 0x63 +/* D2CAB0 80240D80 AE420070 */ sw $v0, 0x70($s2) +/* D2CAB4 80240D84 AE400074 */ sw $zero, 0x74($s2) +/* D2CAB8 80240D88 8E2200B0 */ lw $v0, 0xb0($s1) +/* D2CABC 80240D8C 2403FFFB */ addiu $v1, $zero, -5 +/* D2CAC0 80240D90 00431024 */ and $v0, $v0, $v1 +/* D2CAC4 80240D94 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240D98: +/* D2CAC8 80240D98 AE20006C */ sw $zero, 0x6c($s1) +.L80240D9C: +/* D2CACC 80240D9C 8E420070 */ lw $v0, 0x70($s2) +/* D2CAD0 80240DA0 2842001E */ slti $v0, $v0, 0x1e +/* D2CAD4 80240DA4 10400009 */ beqz $v0, .L80240DCC +/* D2CAD8 80240DA8 00000000 */ nop +/* D2CADC 80240DAC 8E22006C */ lw $v0, 0x6c($s1) +/* D2CAE0 80240DB0 14400006 */ bnez $v0, .L80240DCC +/* D2CAE4 80240DB4 00000000 */ nop +/* D2CAE8 80240DB8 0C090216 */ jal func_80240858_D2C588 +/* D2CAEC 80240DBC 0240202D */ daddu $a0, $s2, $zero +/* D2CAF0 80240DC0 10400002 */ beqz $v0, .L80240DCC +/* D2CAF4 80240DC4 2402001E */ addiu $v0, $zero, 0x1e +/* D2CAF8 80240DC8 AE420070 */ sw $v0, 0x70($s2) +.L80240DCC: +/* D2CAFC 80240DCC 8E430070 */ lw $v1, 0x70($s2) +/* D2CB00 80240DD0 2C620064 */ sltiu $v0, $v1, 0x64 +/* D2CB04 80240DD4 10400048 */ beqz $v0, .L80240EF8 +/* D2CB08 80240DD8 00031080 */ sll $v0, $v1, 2 +/* D2CB0C 80240DDC 3C018024 */ lui $at, 0x8024 +/* D2CB10 80240DE0 00220821 */ addu $at, $at, $v0 +/* D2CB14 80240DE4 8C223D88 */ lw $v0, 0x3d88($at) +/* D2CB18 80240DE8 00400008 */ jr $v0 +/* D2CB1C 80240DEC 00000000 */ nop +/* D2CB20 80240DF0 0240202D */ daddu $a0, $s2, $zero +/* D2CB24 80240DF4 0260282D */ daddu $a1, $s3, $zero +/* D2CB28 80240DF8 0C012568 */ jal func_800495A0 +/* D2CB2C 80240DFC 0280302D */ daddu $a2, $s4, $zero +/* D2CB30 80240E00 0240202D */ daddu $a0, $s2, $zero +/* D2CB34 80240E04 0260282D */ daddu $a1, $s3, $zero +/* D2CB38 80240E08 0C0125AE */ jal func_800496B8 +/* D2CB3C 80240E0C 0280302D */ daddu $a2, $s4, $zero +/* D2CB40 80240E10 080903BE */ j .L80240EF8 +/* D2CB44 80240E14 00000000 */ nop +/* D2CB48 80240E18 0240202D */ daddu $a0, $s2, $zero +/* D2CB4C 80240E1C 0260282D */ daddu $a1, $s3, $zero +/* D2CB50 80240E20 0C0126D1 */ jal func_80049B44 +/* D2CB54 80240E24 0280302D */ daddu $a2, $s4, $zero +/* D2CB58 80240E28 0240202D */ daddu $a0, $s2, $zero +/* D2CB5C 80240E2C 0260282D */ daddu $a1, $s3, $zero +/* D2CB60 80240E30 0C012701 */ jal func_80049C04 +/* D2CB64 80240E34 0280302D */ daddu $a2, $s4, $zero +/* D2CB68 80240E38 080903BE */ j .L80240EF8 +/* D2CB6C 80240E3C 00000000 */ nop +/* D2CB70 80240E40 0240202D */ daddu $a0, $s2, $zero +/* D2CB74 80240E44 0260282D */ daddu $a1, $s3, $zero +/* D2CB78 80240E48 0C01278F */ jal func_80049E3C +/* D2CB7C 80240E4C 0280302D */ daddu $a2, $s4, $zero +/* D2CB80 80240E50 0240202D */ daddu $a0, $s2, $zero +/* D2CB84 80240E54 0260282D */ daddu $a1, $s3, $zero +/* D2CB88 80240E58 0C0127B3 */ jal func_80049ECC +/* D2CB8C 80240E5C 0280302D */ daddu $a2, $s4, $zero +/* D2CB90 80240E60 080903BE */ j .L80240EF8 +/* D2CB94 80240E64 00000000 */ nop +/* D2CB98 80240E68 0240202D */ daddu $a0, $s2, $zero +/* D2CB9C 80240E6C 0260282D */ daddu $a1, $s3, $zero +/* D2CBA0 80240E70 0C0127DF */ jal func_80049F7C +/* D2CBA4 80240E74 0280302D */ daddu $a2, $s4, $zero +/* D2CBA8 80240E78 0240202D */ daddu $a0, $s2, $zero +/* D2CBAC 80240E7C 0260282D */ daddu $a1, $s3, $zero +/* D2CBB0 80240E80 0C012849 */ jal func_8004A124 +/* D2CBB4 80240E84 0280302D */ daddu $a2, $s4, $zero +/* D2CBB8 80240E88 080903BE */ j .L80240EF8 +/* D2CBBC 80240E8C 00000000 */ nop +/* D2CBC0 80240E90 0240202D */ daddu $a0, $s2, $zero +/* D2CBC4 80240E94 0260282D */ daddu $a1, $s3, $zero +/* D2CBC8 80240E98 0C0128FA */ jal func_8004A3E8 +/* D2CBCC 80240E9C 0280302D */ daddu $a2, $s4, $zero +/* D2CBD0 80240EA0 080903BE */ j .L80240EF8 +/* D2CBD4 80240EA4 00000000 */ nop +/* D2CBD8 80240EA8 0C090194 */ jal func_80240650_D2C380 +/* D2CBDC 80240EAC 0240202D */ daddu $a0, $s2, $zero +/* D2CBE0 80240EB0 0C0901AF */ jal func_802406BC_D2C3EC +/* D2CBE4 80240EB4 0240202D */ daddu $a0, $s2, $zero +/* D2CBE8 80240EB8 8E430070 */ lw $v1, 0x70($s2) +/* D2CBEC 80240EBC 24020020 */ addiu $v0, $zero, 0x20 +/* D2CBF0 80240EC0 1462000D */ bne $v1, $v0, .L80240EF8 +/* D2CBF4 80240EC4 00000000 */ nop +/* D2CBF8 80240EC8 0C0901CB */ jal func_8024072C_D2C45C +/* D2CBFC 80240ECC 0240202D */ daddu $a0, $s2, $zero +/* D2CC00 80240ED0 8E430070 */ lw $v1, 0x70($s2) +/* D2CC04 80240ED4 24020021 */ addiu $v0, $zero, 0x21 +/* D2CC08 80240ED8 14620007 */ bne $v1, $v0, .L80240EF8 +/* D2CC0C 80240EDC 00000000 */ nop +/* D2CC10 80240EE0 0C090201 */ jal func_80240804_D2C534 +/* D2CC14 80240EE4 0240202D */ daddu $a0, $s2, $zero +/* D2CC18 80240EE8 080903BE */ j .L80240EF8 +/* D2CC1C 80240EEC 00000000 */ nop +/* D2CC20 80240EF0 0C0129CF */ jal func_8004A73C +/* D2CC24 80240EF4 0240202D */ daddu $a0, $s2, $zero +.L80240EF8: +/* D2CC28 80240EF8 8FBF0048 */ lw $ra, 0x48($sp) +/* D2CC2C 80240EFC 8FB50044 */ lw $s5, 0x44($sp) +/* D2CC30 80240F00 8FB40040 */ lw $s4, 0x40($sp) +/* D2CC34 80240F04 8FB3003C */ lw $s3, 0x3c($sp) +/* D2CC38 80240F08 8FB20038 */ lw $s2, 0x38($sp) +/* D2CC3C 80240F0C 8FB10034 */ lw $s1, 0x34($sp) +/* D2CC40 80240F10 8FB00030 */ lw $s0, 0x30($sp) +/* D2CC44 80240F14 0000102D */ daddu $v0, $zero, $zero +/* D2CC48 80240F18 03E00008 */ jr $ra +/* D2CC4C 80240F1C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8.s deleted file mode 100644 index 1aafc40197..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AC8 -/* D2D7F8 80241AC8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2D7FC 80241ACC AFB10014 */ sw $s1, 0x14($sp) -/* D2D800 80241AD0 0080882D */ daddu $s1, $a0, $zero -/* D2D804 80241AD4 AFBF0018 */ sw $ra, 0x18($sp) -/* D2D808 80241AD8 AFB00010 */ sw $s0, 0x10($sp) -/* D2D80C 80241ADC 8E300148 */ lw $s0, 0x148($s1) -/* D2D810 80241AE0 0C00EABB */ jal get_npc_unsafe -/* D2D814 80241AE4 86040008 */ lh $a0, 8($s0) -/* D2D818 80241AE8 0040202D */ daddu $a0, $v0, $zero -/* D2D81C 80241AEC 9482008E */ lhu $v0, 0x8e($a0) -/* D2D820 80241AF0 2442FFFF */ addiu $v0, $v0, -1 -/* D2D824 80241AF4 A482008E */ sh $v0, 0x8e($a0) -/* D2D828 80241AF8 00021400 */ sll $v0, $v0, 0x10 -/* D2D82C 80241AFC 8E030098 */ lw $v1, 0x98($s0) -/* D2D830 80241B00 00021403 */ sra $v0, $v0, 0x10 -/* D2D834 80241B04 0062182A */ slt $v1, $v1, $v0 -/* D2D838 80241B08 14600005 */ bnez $v1, .L80241B20 -/* D2D83C 80241B0C 3C03E0EF */ lui $v1, 0xe0ef -/* D2D840 80241B10 8E020000 */ lw $v0, ($s0) -/* D2D844 80241B14 3463FFFF */ ori $v1, $v1, 0xffff -/* D2D848 80241B18 00431024 */ and $v0, $v0, $v1 -/* D2D84C 80241B1C AE020000 */ sw $v0, ($s0) -.L80241B20: -/* D2D850 80241B20 8482008E */ lh $v0, 0x8e($a0) -/* D2D854 80241B24 14400007 */ bnez $v0, .L80241B44 -/* D2D858 80241B28 00000000 */ nop -/* D2D85C 80241B2C 8E0200CC */ lw $v0, 0xcc($s0) -/* D2D860 80241B30 8C420028 */ lw $v0, 0x28($v0) -/* D2D864 80241B34 A480008E */ sh $zero, 0x8e($a0) -/* D2D868 80241B38 AC820028 */ sw $v0, 0x28($a0) -/* D2D86C 80241B3C 2402000C */ addiu $v0, $zero, 0xc -/* D2D870 80241B40 AE220070 */ sw $v0, 0x70($s1) -.L80241B44: -/* D2D874 80241B44 8FBF0018 */ lw $ra, 0x18($sp) -/* D2D878 80241B48 8FB10014 */ lw $s1, 0x14($sp) -/* D2D87C 80241B4C 8FB00010 */ lw $s0, 0x10($sp) -/* D2D880 80241B50 03E00008 */ jr $ra -/* D2D884 80241B54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s new file mode 100644 index 0000000000..db6b53d168 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241AC8_D2D7F8.s @@ -0,0 +1,42 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AC8_D2D7F8 +/* D2D7F8 80241AC8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D2D7FC 80241ACC AFB10014 */ sw $s1, 0x14($sp) +/* D2D800 80241AD0 0080882D */ daddu $s1, $a0, $zero +/* D2D804 80241AD4 AFBF0018 */ sw $ra, 0x18($sp) +/* D2D808 80241AD8 AFB00010 */ sw $s0, 0x10($sp) +/* D2D80C 80241ADC 8E300148 */ lw $s0, 0x148($s1) +/* D2D810 80241AE0 0C00EABB */ jal get_npc_unsafe +/* D2D814 80241AE4 86040008 */ lh $a0, 8($s0) +/* D2D818 80241AE8 0040202D */ daddu $a0, $v0, $zero +/* D2D81C 80241AEC 9482008E */ lhu $v0, 0x8e($a0) +/* D2D820 80241AF0 2442FFFF */ addiu $v0, $v0, -1 +/* D2D824 80241AF4 A482008E */ sh $v0, 0x8e($a0) +/* D2D828 80241AF8 00021400 */ sll $v0, $v0, 0x10 +/* D2D82C 80241AFC 8E030098 */ lw $v1, 0x98($s0) +/* D2D830 80241B00 00021403 */ sra $v0, $v0, 0x10 +/* D2D834 80241B04 0062182A */ slt $v1, $v1, $v0 +/* D2D838 80241B08 14600005 */ bnez $v1, .L80241B20 +/* D2D83C 80241B0C 3C03E0EF */ lui $v1, 0xe0ef +/* D2D840 80241B10 8E020000 */ lw $v0, ($s0) +/* D2D844 80241B14 3463FFFF */ ori $v1, $v1, 0xffff +/* D2D848 80241B18 00431024 */ and $v0, $v0, $v1 +/* D2D84C 80241B1C AE020000 */ sw $v0, ($s0) +.L80241B20: +/* D2D850 80241B20 8482008E */ lh $v0, 0x8e($a0) +/* D2D854 80241B24 14400007 */ bnez $v0, .L80241B44 +/* D2D858 80241B28 00000000 */ nop +/* D2D85C 80241B2C 8E0200CC */ lw $v0, 0xcc($s0) +/* D2D860 80241B30 8C420028 */ lw $v0, 0x28($v0) +/* D2D864 80241B34 A480008E */ sh $zero, 0x8e($a0) +/* D2D868 80241B38 AC820028 */ sw $v0, 0x28($a0) +/* D2D86C 80241B3C 2402000C */ addiu $v0, $zero, 0xc +/* D2D870 80241B40 AE220070 */ sw $v0, 0x70($s1) +.L80241B44: +/* D2D874 80241B44 8FBF0018 */ lw $ra, 0x18($sp) +/* D2D878 80241B48 8FB10014 */ lw $s1, 0x14($sp) +/* D2D87C 80241B4C 8FB00010 */ lw $s0, 0x10($sp) +/* D2D880 80241B50 03E00008 */ jr $ra +/* D2D884 80241B54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58.s deleted file mode 100644 index b2baf5c18d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C58 -/* D2D988 80241C58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D2D98C 80241C5C AFB10014 */ sw $s1, 0x14($sp) -/* D2D990 80241C60 0080882D */ daddu $s1, $a0, $zero -/* D2D994 80241C64 AFBF0018 */ sw $ra, 0x18($sp) -/* D2D998 80241C68 AFB00010 */ sw $s0, 0x10($sp) -/* D2D99C 80241C6C 8E300148 */ lw $s0, 0x148($s1) -/* D2D9A0 80241C70 0C00EABB */ jal get_npc_unsafe -/* D2D9A4 80241C74 86040008 */ lh $a0, 8($s0) -/* D2D9A8 80241C78 0040182D */ daddu $v1, $v0, $zero -/* D2D9AC 80241C7C 9462008E */ lhu $v0, 0x8e($v1) -/* D2D9B0 80241C80 2442FFFF */ addiu $v0, $v0, -1 -/* D2D9B4 80241C84 A462008E */ sh $v0, 0x8e($v1) -/* D2D9B8 80241C88 00021400 */ sll $v0, $v0, 0x10 -/* D2D9BC 80241C8C 14400005 */ bnez $v0, .L80241CA4 -/* D2D9C0 80241C90 00000000 */ nop -/* D2D9C4 80241C94 960200AA */ lhu $v0, 0xaa($s0) -/* D2D9C8 80241C98 A462008E */ sh $v0, 0x8e($v1) -/* D2D9CC 80241C9C 2402000E */ addiu $v0, $zero, 0xe -/* D2D9D0 80241CA0 AE220070 */ sw $v0, 0x70($s1) -.L80241CA4: -/* D2D9D4 80241CA4 8FBF0018 */ lw $ra, 0x18($sp) -/* D2D9D8 80241CA8 8FB10014 */ lw $s1, 0x14($sp) -/* D2D9DC 80241CAC 8FB00010 */ lw $s0, 0x10($sp) -/* D2D9E0 80241CB0 03E00008 */ jr $ra -/* D2D9E4 80241CB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s new file mode 100644 index 0000000000..a2f8edc533 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241C58_D2D988.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C58_D2D988 +/* D2D988 80241C58 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D2D98C 80241C5C AFB10014 */ sw $s1, 0x14($sp) +/* D2D990 80241C60 0080882D */ daddu $s1, $a0, $zero +/* D2D994 80241C64 AFBF0018 */ sw $ra, 0x18($sp) +/* D2D998 80241C68 AFB00010 */ sw $s0, 0x10($sp) +/* D2D99C 80241C6C 8E300148 */ lw $s0, 0x148($s1) +/* D2D9A0 80241C70 0C00EABB */ jal get_npc_unsafe +/* D2D9A4 80241C74 86040008 */ lh $a0, 8($s0) +/* D2D9A8 80241C78 0040182D */ daddu $v1, $v0, $zero +/* D2D9AC 80241C7C 9462008E */ lhu $v0, 0x8e($v1) +/* D2D9B0 80241C80 2442FFFF */ addiu $v0, $v0, -1 +/* D2D9B4 80241C84 A462008E */ sh $v0, 0x8e($v1) +/* D2D9B8 80241C88 00021400 */ sll $v0, $v0, 0x10 +/* D2D9BC 80241C8C 14400005 */ bnez $v0, .L80241CA4 +/* D2D9C0 80241C90 00000000 */ nop +/* D2D9C4 80241C94 960200AA */ lhu $v0, 0xaa($s0) +/* D2D9C8 80241C98 A462008E */ sh $v0, 0x8e($v1) +/* D2D9CC 80241C9C 2402000E */ addiu $v0, $zero, 0xe +/* D2D9D0 80241CA0 AE220070 */ sw $v0, 0x70($s1) +.L80241CA4: +/* D2D9D4 80241CA4 8FBF0018 */ lw $ra, 0x18($sp) +/* D2D9D8 80241CA8 8FB10014 */ lw $s1, 0x14($sp) +/* D2D9DC 80241CAC 8FB00010 */ lw $s0, 0x10($sp) +/* D2D9E0 80241CB0 03E00008 */ jr $ra +/* D2D9E4 80241CB4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8.s deleted file mode 100644 index f8eb8019a2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CB8 -/* D2D9E8 80241CB8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D2D9EC 80241CBC AFB40040 */ sw $s4, 0x40($sp) -/* D2D9F0 80241CC0 0080A02D */ daddu $s4, $a0, $zero -/* D2D9F4 80241CC4 AFBF0044 */ sw $ra, 0x44($sp) -/* D2D9F8 80241CC8 AFB3003C */ sw $s3, 0x3c($sp) -/* D2D9FC 80241CCC AFB20038 */ sw $s2, 0x38($sp) -/* D2DA00 80241CD0 AFB10034 */ sw $s1, 0x34($sp) -/* D2DA04 80241CD4 AFB00030 */ sw $s0, 0x30($sp) -/* D2DA08 80241CD8 8E910148 */ lw $s1, 0x148($s4) -/* D2DA0C 80241CDC 00A0902D */ daddu $s2, $a1, $zero -/* D2DA10 80241CE0 86240008 */ lh $a0, 8($s1) -/* D2DA14 80241CE4 0C00EABB */ jal get_npc_unsafe -/* D2DA18 80241CE8 00C0982D */ daddu $s3, $a2, $zero -/* D2DA1C 80241CEC 0040802D */ daddu $s0, $v0, $zero -/* D2DA20 80241CF0 9602008E */ lhu $v0, 0x8e($s0) -/* D2DA24 80241CF4 2442FFFF */ addiu $v0, $v0, -1 -/* D2DA28 80241CF8 A602008E */ sh $v0, 0x8e($s0) -/* D2DA2C 80241CFC 00021400 */ sll $v0, $v0, 0x10 -/* D2DA30 80241D00 14400020 */ bnez $v0, .L80241D84 -/* D2DA34 80241D04 0260202D */ daddu $a0, $s3, $zero -/* D2DA38 80241D08 AFA00010 */ sw $zero, 0x10($sp) -/* D2DA3C 80241D0C 8E46000C */ lw $a2, 0xc($s2) -/* D2DA40 80241D10 8E470010 */ lw $a3, 0x10($s2) -/* D2DA44 80241D14 0C01242D */ jal func_800490B4 -/* D2DA48 80241D18 0220282D */ daddu $a1, $s1, $zero -/* D2DA4C 80241D1C 54400018 */ bnel $v0, $zero, .L80241D80 -/* D2DA50 80241D20 A600008E */ sh $zero, 0x8e($s0) -/* D2DA54 80241D24 24040002 */ addiu $a0, $zero, 2 -/* D2DA58 80241D28 0200282D */ daddu $a1, $s0, $zero -/* D2DA5C 80241D2C 0000302D */ daddu $a2, $zero, $zero -/* D2DA60 80241D30 860300A8 */ lh $v1, 0xa8($s0) -/* D2DA64 80241D34 3C013F80 */ lui $at, 0x3f80 -/* D2DA68 80241D38 44810000 */ mtc1 $at, $f0 -/* D2DA6C 80241D3C 3C014000 */ lui $at, 0x4000 -/* D2DA70 80241D40 44811000 */ mtc1 $at, $f2 -/* D2DA74 80241D44 3C01C1A0 */ lui $at, 0xc1a0 -/* D2DA78 80241D48 44812000 */ mtc1 $at, $f4 -/* D2DA7C 80241D4C 2402000F */ addiu $v0, $zero, 0xf -/* D2DA80 80241D50 AFA2001C */ sw $v0, 0x1c($sp) -/* D2DA84 80241D54 44833000 */ mtc1 $v1, $f6 -/* D2DA88 80241D58 00000000 */ nop -/* D2DA8C 80241D5C 468031A0 */ cvt.s.w $f6, $f6 -/* D2DA90 80241D60 44073000 */ mfc1 $a3, $f6 -/* D2DA94 80241D64 27A20028 */ addiu $v0, $sp, 0x28 -/* D2DA98 80241D68 AFA20020 */ sw $v0, 0x20($sp) -/* D2DA9C 80241D6C E7A00010 */ swc1 $f0, 0x10($sp) -/* D2DAA0 80241D70 E7A20014 */ swc1 $f2, 0x14($sp) -/* D2DAA4 80241D74 0C01BFA4 */ jal fx_emote -/* D2DAA8 80241D78 E7A40018 */ swc1 $f4, 0x18($sp) -/* D2DAAC 80241D7C A600008E */ sh $zero, 0x8e($s0) -.L80241D80: -/* D2DAB0 80241D80 AE800070 */ sw $zero, 0x70($s4) -.L80241D84: -/* D2DAB4 80241D84 8FBF0044 */ lw $ra, 0x44($sp) -/* D2DAB8 80241D88 8FB40040 */ lw $s4, 0x40($sp) -/* D2DABC 80241D8C 8FB3003C */ lw $s3, 0x3c($sp) -/* D2DAC0 80241D90 8FB20038 */ lw $s2, 0x38($sp) -/* D2DAC4 80241D94 8FB10034 */ lw $s1, 0x34($sp) -/* D2DAC8 80241D98 8FB00030 */ lw $s0, 0x30($sp) -/* D2DACC 80241D9C 03E00008 */ jr $ra -/* D2DAD0 80241DA0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s new file mode 100644 index 0000000000..6465994110 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241CB8_D2D9E8.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CB8_D2D9E8 +/* D2D9E8 80241CB8 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* D2D9EC 80241CBC AFB40040 */ sw $s4, 0x40($sp) +/* D2D9F0 80241CC0 0080A02D */ daddu $s4, $a0, $zero +/* D2D9F4 80241CC4 AFBF0044 */ sw $ra, 0x44($sp) +/* D2D9F8 80241CC8 AFB3003C */ sw $s3, 0x3c($sp) +/* D2D9FC 80241CCC AFB20038 */ sw $s2, 0x38($sp) +/* D2DA00 80241CD0 AFB10034 */ sw $s1, 0x34($sp) +/* D2DA04 80241CD4 AFB00030 */ sw $s0, 0x30($sp) +/* D2DA08 80241CD8 8E910148 */ lw $s1, 0x148($s4) +/* D2DA0C 80241CDC 00A0902D */ daddu $s2, $a1, $zero +/* D2DA10 80241CE0 86240008 */ lh $a0, 8($s1) +/* D2DA14 80241CE4 0C00EABB */ jal get_npc_unsafe +/* D2DA18 80241CE8 00C0982D */ daddu $s3, $a2, $zero +/* D2DA1C 80241CEC 0040802D */ daddu $s0, $v0, $zero +/* D2DA20 80241CF0 9602008E */ lhu $v0, 0x8e($s0) +/* D2DA24 80241CF4 2442FFFF */ addiu $v0, $v0, -1 +/* D2DA28 80241CF8 A602008E */ sh $v0, 0x8e($s0) +/* D2DA2C 80241CFC 00021400 */ sll $v0, $v0, 0x10 +/* D2DA30 80241D00 14400020 */ bnez $v0, .L80241D84 +/* D2DA34 80241D04 0260202D */ daddu $a0, $s3, $zero +/* D2DA38 80241D08 AFA00010 */ sw $zero, 0x10($sp) +/* D2DA3C 80241D0C 8E46000C */ lw $a2, 0xc($s2) +/* D2DA40 80241D10 8E470010 */ lw $a3, 0x10($s2) +/* D2DA44 80241D14 0C01242D */ jal func_800490B4 +/* D2DA48 80241D18 0220282D */ daddu $a1, $s1, $zero +/* D2DA4C 80241D1C 54400018 */ bnel $v0, $zero, .L80241D80 +/* D2DA50 80241D20 A600008E */ sh $zero, 0x8e($s0) +/* D2DA54 80241D24 24040002 */ addiu $a0, $zero, 2 +/* D2DA58 80241D28 0200282D */ daddu $a1, $s0, $zero +/* D2DA5C 80241D2C 0000302D */ daddu $a2, $zero, $zero +/* D2DA60 80241D30 860300A8 */ lh $v1, 0xa8($s0) +/* D2DA64 80241D34 3C013F80 */ lui $at, 0x3f80 +/* D2DA68 80241D38 44810000 */ mtc1 $at, $f0 +/* D2DA6C 80241D3C 3C014000 */ lui $at, 0x4000 +/* D2DA70 80241D40 44811000 */ mtc1 $at, $f2 +/* D2DA74 80241D44 3C01C1A0 */ lui $at, 0xc1a0 +/* D2DA78 80241D48 44812000 */ mtc1 $at, $f4 +/* D2DA7C 80241D4C 2402000F */ addiu $v0, $zero, 0xf +/* D2DA80 80241D50 AFA2001C */ sw $v0, 0x1c($sp) +/* D2DA84 80241D54 44833000 */ mtc1 $v1, $f6 +/* D2DA88 80241D58 00000000 */ nop +/* D2DA8C 80241D5C 468031A0 */ cvt.s.w $f6, $f6 +/* D2DA90 80241D60 44073000 */ mfc1 $a3, $f6 +/* D2DA94 80241D64 27A20028 */ addiu $v0, $sp, 0x28 +/* D2DA98 80241D68 AFA20020 */ sw $v0, 0x20($sp) +/* D2DA9C 80241D6C E7A00010 */ swc1 $f0, 0x10($sp) +/* D2DAA0 80241D70 E7A20014 */ swc1 $f2, 0x14($sp) +/* D2DAA4 80241D74 0C01BFA4 */ jal fx_emote +/* D2DAA8 80241D78 E7A40018 */ swc1 $f4, 0x18($sp) +/* D2DAAC 80241D7C A600008E */ sh $zero, 0x8e($s0) +.L80241D80: +/* D2DAB0 80241D80 AE800070 */ sw $zero, 0x70($s4) +.L80241D84: +/* D2DAB4 80241D84 8FBF0044 */ lw $ra, 0x44($sp) +/* D2DAB8 80241D88 8FB40040 */ lw $s4, 0x40($sp) +/* D2DABC 80241D8C 8FB3003C */ lw $s3, 0x3c($sp) +/* D2DAC0 80241D90 8FB20038 */ lw $s2, 0x38($sp) +/* D2DAC4 80241D94 8FB10034 */ lw $s1, 0x34($sp) +/* D2DAC8 80241D98 8FB00030 */ lw $s0, 0x30($sp) +/* D2DACC 80241D9C 03E00008 */ jr $ra +/* D2DAD0 80241DA0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4.s deleted file mode 100644 index 4018c114d1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DA4 -/* D2DAD4 80241DA4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D2DAD8 80241DA8 AFB20038 */ sw $s2, 0x38($sp) -/* D2DADC 80241DAC 0080902D */ daddu $s2, $a0, $zero -/* D2DAE0 80241DB0 AFBF0048 */ sw $ra, 0x48($sp) -/* D2DAE4 80241DB4 AFB50044 */ sw $s5, 0x44($sp) -/* D2DAE8 80241DB8 AFB40040 */ sw $s4, 0x40($sp) -/* D2DAEC 80241DBC AFB3003C */ sw $s3, 0x3c($sp) -/* D2DAF0 80241DC0 AFB10034 */ sw $s1, 0x34($sp) -/* D2DAF4 80241DC4 AFB00030 */ sw $s0, 0x30($sp) -/* D2DAF8 80241DC8 8E510148 */ lw $s1, 0x148($s2) -/* D2DAFC 80241DCC 86240008 */ lh $a0, 8($s1) -/* D2DB00 80241DD0 0C00EABB */ jal get_npc_unsafe -/* D2DB04 80241DD4 00A0802D */ daddu $s0, $a1, $zero -/* D2DB08 80241DD8 8E43000C */ lw $v1, 0xc($s2) -/* D2DB0C 80241DDC 0240202D */ daddu $a0, $s2, $zero -/* D2DB10 80241DE0 8C650000 */ lw $a1, ($v1) -/* D2DB14 80241DE4 0C0B1EAF */ jal get_variable -/* D2DB18 80241DE8 0040A82D */ daddu $s5, $v0, $zero -/* D2DB1C 80241DEC AFA00010 */ sw $zero, 0x10($sp) -/* D2DB20 80241DF0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB24 80241DF4 8C630030 */ lw $v1, 0x30($v1) -/* D2DB28 80241DF8 AFA30014 */ sw $v1, 0x14($sp) -/* D2DB2C 80241DFC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB30 80241E00 8C63001C */ lw $v1, 0x1c($v1) -/* D2DB34 80241E04 AFA30018 */ sw $v1, 0x18($sp) -/* D2DB38 80241E08 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB3C 80241E0C 8C630024 */ lw $v1, 0x24($v1) -/* D2DB40 80241E10 AFA3001C */ sw $v1, 0x1c($sp) -/* D2DB44 80241E14 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB48 80241E18 8C630028 */ lw $v1, 0x28($v1) -/* D2DB4C 80241E1C 27B40010 */ addiu $s4, $sp, 0x10 -/* D2DB50 80241E20 AFA30020 */ sw $v1, 0x20($sp) -/* D2DB54 80241E24 8E2300D0 */ lw $v1, 0xd0($s1) -/* D2DB58 80241E28 3C014348 */ lui $at, 0x4348 -/* D2DB5C 80241E2C 44810000 */ mtc1 $at, $f0 -/* D2DB60 80241E30 8C63002C */ lw $v1, 0x2c($v1) -/* D2DB64 80241E34 0040982D */ daddu $s3, $v0, $zero -/* D2DB68 80241E38 E7A00028 */ swc1 $f0, 0x28($sp) -/* D2DB6C 80241E3C A7A0002C */ sh $zero, 0x2c($sp) -/* D2DB70 80241E40 16000005 */ bnez $s0, .L80241E58 -/* D2DB74 80241E44 AFA30024 */ sw $v1, 0x24($sp) -/* D2DB78 80241E48 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2DB7C 80241E4C 30420004 */ andi $v0, $v0, 4 -/* D2DB80 80241E50 10400011 */ beqz $v0, .L80241E98 -/* D2DB84 80241E54 00000000 */ nop -.L80241E58: -/* D2DB88 80241E58 AE400070 */ sw $zero, 0x70($s2) -/* D2DB8C 80241E5C A6A0008E */ sh $zero, 0x8e($s5) -/* D2DB90 80241E60 8E2200CC */ lw $v0, 0xcc($s1) -/* D2DB94 80241E64 8C420000 */ lw $v0, ($v0) -/* D2DB98 80241E68 AEA20028 */ sw $v0, 0x28($s5) -/* D2DB9C 80241E6C 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2DBA0 80241E70 30420004 */ andi $v0, $v0, 4 -/* D2DBA4 80241E74 10400008 */ beqz $v0, .L80241E98 -/* D2DBA8 80241E78 AE20006C */ sw $zero, 0x6c($s1) -/* D2DBAC 80241E7C 24020063 */ addiu $v0, $zero, 0x63 -/* D2DBB0 80241E80 AE420070 */ sw $v0, 0x70($s2) -/* D2DBB4 80241E84 AE400074 */ sw $zero, 0x74($s2) -/* D2DBB8 80241E88 8E2200B0 */ lw $v0, 0xb0($s1) -/* D2DBBC 80241E8C 2403FFFB */ addiu $v1, $zero, -5 -/* D2DBC0 80241E90 00431024 */ and $v0, $v0, $v1 -/* D2DBC4 80241E94 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241E98: -/* D2DBC8 80241E98 8E430070 */ lw $v1, 0x70($s2) -/* D2DBCC 80241E9C 2410000B */ addiu $s0, $zero, 0xb -/* D2DBD0 80241EA0 1070002A */ beq $v1, $s0, .L80241F4C -/* D2DBD4 80241EA4 2862000C */ slti $v0, $v1, 0xc -/* D2DBD8 80241EA8 1040000D */ beqz $v0, .L80241EE0 -/* D2DBDC 80241EAC 24020001 */ addiu $v0, $zero, 1 -/* D2DBE0 80241EB0 1062001A */ beq $v1, $v0, .L80241F1C -/* D2DBE4 80241EB4 28620002 */ slti $v0, $v1, 2 -/* D2DBE8 80241EB8 10400005 */ beqz $v0, .L80241ED0 -/* D2DBEC 80241EBC 2402000A */ addiu $v0, $zero, 0xa -/* D2DBF0 80241EC0 10600013 */ beqz $v1, .L80241F10 -/* D2DBF4 80241EC4 0240202D */ daddu $a0, $s2, $zero -/* D2DBF8 80241EC8 080907F3 */ j .L80241FCC -/* D2DBFC 80241ECC 00000000 */ nop -.L80241ED0: -/* D2DC00 80241ED0 10620018 */ beq $v1, $v0, .L80241F34 -/* D2DC04 80241ED4 0240202D */ daddu $a0, $s2, $zero -/* D2DC08 80241ED8 080907F3 */ j .L80241FCC -/* D2DC0C 80241EDC 00000000 */ nop -.L80241EE0: -/* D2DC10 80241EE0 2402000D */ addiu $v0, $zero, 0xd -/* D2DC14 80241EE4 10620029 */ beq $v1, $v0, .L80241F8C -/* D2DC18 80241EE8 0062102A */ slt $v0, $v1, $v0 -/* D2DC1C 80241EEC 14400020 */ bnez $v0, .L80241F70 -/* D2DC20 80241EF0 0240202D */ daddu $a0, $s2, $zero -/* D2DC24 80241EF4 2402000E */ addiu $v0, $zero, 0xe -/* D2DC28 80241EF8 1062002D */ beq $v1, $v0, .L80241FB0 -/* D2DC2C 80241EFC 24020063 */ addiu $v0, $zero, 0x63 -/* D2DC30 80241F00 10620030 */ beq $v1, $v0, .L80241FC4 -/* D2DC34 80241F04 00000000 */ nop -/* D2DC38 80241F08 080907F3 */ j .L80241FCC -/* D2DC3C 80241F0C 00000000 */ nop -.L80241F10: -/* D2DC40 80241F10 0260282D */ daddu $a1, $s3, $zero -/* D2DC44 80241F14 0C0903C8 */ jal func_80240F20 -/* D2DC48 80241F18 0280302D */ daddu $a2, $s4, $zero -.L80241F1C: -/* D2DC4C 80241F1C 0240202D */ daddu $a0, $s2, $zero -/* D2DC50 80241F20 0260282D */ daddu $a1, $s3, $zero -/* D2DC54 80241F24 0C0903E3 */ jal func_80240F8C -/* D2DC58 80241F28 0280302D */ daddu $a2, $s4, $zero -/* D2DC5C 80241F2C 080907F3 */ j .L80241FCC -/* D2DC60 80241F30 00000000 */ nop -.L80241F34: -/* D2DC64 80241F34 0260282D */ daddu $a1, $s3, $zero -/* D2DC68 80241F38 0C090422 */ jal func_80241088 -/* D2DC6C 80241F3C 0280302D */ daddu $a2, $s4, $zero -/* D2DC70 80241F40 8E420070 */ lw $v0, 0x70($s2) -/* D2DC74 80241F44 14500021 */ bne $v0, $s0, .L80241FCC -/* D2DC78 80241F48 00000000 */ nop -.L80241F4C: -/* D2DC7C 80241F4C 0240202D */ daddu $a0, $s2, $zero -/* D2DC80 80241F50 0260282D */ daddu $a1, $s3, $zero -/* D2DC84 80241F54 0C0906B2 */ jal func_80241AC8 -/* D2DC88 80241F58 0280302D */ daddu $a2, $s4, $zero -/* D2DC8C 80241F5C 8E430070 */ lw $v1, 0x70($s2) -/* D2DC90 80241F60 2402000C */ addiu $v0, $zero, 0xc -/* D2DC94 80241F64 14620019 */ bne $v1, $v0, .L80241FCC -/* D2DC98 80241F68 00000000 */ nop -/* D2DC9C 80241F6C 0240202D */ daddu $a0, $s2, $zero -.L80241F70: -/* D2DCA0 80241F70 0260282D */ daddu $a1, $s3, $zero -/* D2DCA4 80241F74 0C0906D6 */ jal func_80241B58 -/* D2DCA8 80241F78 0280302D */ daddu $a2, $s4, $zero -/* D2DCAC 80241F7C 8E430070 */ lw $v1, 0x70($s2) -/* D2DCB0 80241F80 2402000D */ addiu $v0, $zero, 0xd -/* D2DCB4 80241F84 14620011 */ bne $v1, $v0, .L80241FCC -/* D2DCB8 80241F88 00000000 */ nop -.L80241F8C: -/* D2DCBC 80241F8C 0240202D */ daddu $a0, $s2, $zero -/* D2DCC0 80241F90 0260282D */ daddu $a1, $s3, $zero -/* D2DCC4 80241F94 0C090716 */ jal func_80241C58 -/* D2DCC8 80241F98 0280302D */ daddu $a2, $s4, $zero -/* D2DCCC 80241F9C 8E430070 */ lw $v1, 0x70($s2) -/* D2DCD0 80241FA0 2402000E */ addiu $v0, $zero, 0xe -/* D2DCD4 80241FA4 14620009 */ bne $v1, $v0, .L80241FCC -/* D2DCD8 80241FA8 00000000 */ nop -/* D2DCDC 80241FAC 0240202D */ daddu $a0, $s2, $zero -.L80241FB0: -/* D2DCE0 80241FB0 0260282D */ daddu $a1, $s3, $zero -/* D2DCE4 80241FB4 0C09072E */ jal func_80241CB8 -/* D2DCE8 80241FB8 0280302D */ daddu $a2, $s4, $zero -/* D2DCEC 80241FBC 080907F3 */ j .L80241FCC -/* D2DCF0 80241FC0 00000000 */ nop -.L80241FC4: -/* D2DCF4 80241FC4 0C0129CF */ jal func_8004A73C -/* D2DCF8 80241FC8 0240202D */ daddu $a0, $s2, $zero -.L80241FCC: -/* D2DCFC 80241FCC 8FBF0048 */ lw $ra, 0x48($sp) -/* D2DD00 80241FD0 8FB50044 */ lw $s5, 0x44($sp) -/* D2DD04 80241FD4 8FB40040 */ lw $s4, 0x40($sp) -/* D2DD08 80241FD8 8FB3003C */ lw $s3, 0x3c($sp) -/* D2DD0C 80241FDC 8FB20038 */ lw $s2, 0x38($sp) -/* D2DD10 80241FE0 8FB10034 */ lw $s1, 0x34($sp) -/* D2DD14 80241FE4 8FB00030 */ lw $s0, 0x30($sp) -/* D2DD18 80241FE8 0000102D */ daddu $v0, $zero, $zero -/* D2DD1C 80241FEC 03E00008 */ jr $ra -/* D2DD20 80241FF0 27BD0050 */ addiu $sp, $sp, 0x50 -/* D2DD24 80241FF4 00000000 */ nop -/* D2DD28 80241FF8 00000000 */ nop -/* D2DD2C 80241FFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s new file mode 100644 index 0000000000..f27020c1bb --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80241DA4_D2DAD4.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DA4_D2DAD4 +/* D2DAD4 80241DA4 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* D2DAD8 80241DA8 AFB20038 */ sw $s2, 0x38($sp) +/* D2DADC 80241DAC 0080902D */ daddu $s2, $a0, $zero +/* D2DAE0 80241DB0 AFBF0048 */ sw $ra, 0x48($sp) +/* D2DAE4 80241DB4 AFB50044 */ sw $s5, 0x44($sp) +/* D2DAE8 80241DB8 AFB40040 */ sw $s4, 0x40($sp) +/* D2DAEC 80241DBC AFB3003C */ sw $s3, 0x3c($sp) +/* D2DAF0 80241DC0 AFB10034 */ sw $s1, 0x34($sp) +/* D2DAF4 80241DC4 AFB00030 */ sw $s0, 0x30($sp) +/* D2DAF8 80241DC8 8E510148 */ lw $s1, 0x148($s2) +/* D2DAFC 80241DCC 86240008 */ lh $a0, 8($s1) +/* D2DB00 80241DD0 0C00EABB */ jal get_npc_unsafe +/* D2DB04 80241DD4 00A0802D */ daddu $s0, $a1, $zero +/* D2DB08 80241DD8 8E43000C */ lw $v1, 0xc($s2) +/* D2DB0C 80241DDC 0240202D */ daddu $a0, $s2, $zero +/* D2DB10 80241DE0 8C650000 */ lw $a1, ($v1) +/* D2DB14 80241DE4 0C0B1EAF */ jal get_variable +/* D2DB18 80241DE8 0040A82D */ daddu $s5, $v0, $zero +/* D2DB1C 80241DEC AFA00010 */ sw $zero, 0x10($sp) +/* D2DB20 80241DF0 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2DB24 80241DF4 8C630030 */ lw $v1, 0x30($v1) +/* D2DB28 80241DF8 AFA30014 */ sw $v1, 0x14($sp) +/* D2DB2C 80241DFC 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2DB30 80241E00 8C63001C */ lw $v1, 0x1c($v1) +/* D2DB34 80241E04 AFA30018 */ sw $v1, 0x18($sp) +/* D2DB38 80241E08 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2DB3C 80241E0C 8C630024 */ lw $v1, 0x24($v1) +/* D2DB40 80241E10 AFA3001C */ sw $v1, 0x1c($sp) +/* D2DB44 80241E14 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2DB48 80241E18 8C630028 */ lw $v1, 0x28($v1) +/* D2DB4C 80241E1C 27B40010 */ addiu $s4, $sp, 0x10 +/* D2DB50 80241E20 AFA30020 */ sw $v1, 0x20($sp) +/* D2DB54 80241E24 8E2300D0 */ lw $v1, 0xd0($s1) +/* D2DB58 80241E28 3C014348 */ lui $at, 0x4348 +/* D2DB5C 80241E2C 44810000 */ mtc1 $at, $f0 +/* D2DB60 80241E30 8C63002C */ lw $v1, 0x2c($v1) +/* D2DB64 80241E34 0040982D */ daddu $s3, $v0, $zero +/* D2DB68 80241E38 E7A00028 */ swc1 $f0, 0x28($sp) +/* D2DB6C 80241E3C A7A0002C */ sh $zero, 0x2c($sp) +/* D2DB70 80241E40 16000005 */ bnez $s0, .L80241E58 +/* D2DB74 80241E44 AFA30024 */ sw $v1, 0x24($sp) +/* D2DB78 80241E48 8E2200B0 */ lw $v0, 0xb0($s1) +/* D2DB7C 80241E4C 30420004 */ andi $v0, $v0, 4 +/* D2DB80 80241E50 10400011 */ beqz $v0, .L80241E98 +/* D2DB84 80241E54 00000000 */ nop +.L80241E58: +/* D2DB88 80241E58 AE400070 */ sw $zero, 0x70($s2) +/* D2DB8C 80241E5C A6A0008E */ sh $zero, 0x8e($s5) +/* D2DB90 80241E60 8E2200CC */ lw $v0, 0xcc($s1) +/* D2DB94 80241E64 8C420000 */ lw $v0, ($v0) +/* D2DB98 80241E68 AEA20028 */ sw $v0, 0x28($s5) +/* D2DB9C 80241E6C 8E2200B0 */ lw $v0, 0xb0($s1) +/* D2DBA0 80241E70 30420004 */ andi $v0, $v0, 4 +/* D2DBA4 80241E74 10400008 */ beqz $v0, .L80241E98 +/* D2DBA8 80241E78 AE20006C */ sw $zero, 0x6c($s1) +/* D2DBAC 80241E7C 24020063 */ addiu $v0, $zero, 0x63 +/* D2DBB0 80241E80 AE420070 */ sw $v0, 0x70($s2) +/* D2DBB4 80241E84 AE400074 */ sw $zero, 0x74($s2) +/* D2DBB8 80241E88 8E2200B0 */ lw $v0, 0xb0($s1) +/* D2DBBC 80241E8C 2403FFFB */ addiu $v1, $zero, -5 +/* D2DBC0 80241E90 00431024 */ and $v0, $v0, $v1 +/* D2DBC4 80241E94 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241E98: +/* D2DBC8 80241E98 8E430070 */ lw $v1, 0x70($s2) +/* D2DBCC 80241E9C 2410000B */ addiu $s0, $zero, 0xb +/* D2DBD0 80241EA0 1070002A */ beq $v1, $s0, .L80241F4C +/* D2DBD4 80241EA4 2862000C */ slti $v0, $v1, 0xc +/* D2DBD8 80241EA8 1040000D */ beqz $v0, .L80241EE0 +/* D2DBDC 80241EAC 24020001 */ addiu $v0, $zero, 1 +/* D2DBE0 80241EB0 1062001A */ beq $v1, $v0, .L80241F1C +/* D2DBE4 80241EB4 28620002 */ slti $v0, $v1, 2 +/* D2DBE8 80241EB8 10400005 */ beqz $v0, .L80241ED0 +/* D2DBEC 80241EBC 2402000A */ addiu $v0, $zero, 0xa +/* D2DBF0 80241EC0 10600013 */ beqz $v1, .L80241F10 +/* D2DBF4 80241EC4 0240202D */ daddu $a0, $s2, $zero +/* D2DBF8 80241EC8 080907F3 */ j .L80241FCC +/* D2DBFC 80241ECC 00000000 */ nop +.L80241ED0: +/* D2DC00 80241ED0 10620018 */ beq $v1, $v0, .L80241F34 +/* D2DC04 80241ED4 0240202D */ daddu $a0, $s2, $zero +/* D2DC08 80241ED8 080907F3 */ j .L80241FCC +/* D2DC0C 80241EDC 00000000 */ nop +.L80241EE0: +/* D2DC10 80241EE0 2402000D */ addiu $v0, $zero, 0xd +/* D2DC14 80241EE4 10620029 */ beq $v1, $v0, .L80241F8C +/* D2DC18 80241EE8 0062102A */ slt $v0, $v1, $v0 +/* D2DC1C 80241EEC 14400020 */ bnez $v0, .L80241F70 +/* D2DC20 80241EF0 0240202D */ daddu $a0, $s2, $zero +/* D2DC24 80241EF4 2402000E */ addiu $v0, $zero, 0xe +/* D2DC28 80241EF8 1062002D */ beq $v1, $v0, .L80241FB0 +/* D2DC2C 80241EFC 24020063 */ addiu $v0, $zero, 0x63 +/* D2DC30 80241F00 10620030 */ beq $v1, $v0, .L80241FC4 +/* D2DC34 80241F04 00000000 */ nop +/* D2DC38 80241F08 080907F3 */ j .L80241FCC +/* D2DC3C 80241F0C 00000000 */ nop +.L80241F10: +/* D2DC40 80241F10 0260282D */ daddu $a1, $s3, $zero +/* D2DC44 80241F14 0C0903C8 */ jal func_80240F20_D2CC50 +/* D2DC48 80241F18 0280302D */ daddu $a2, $s4, $zero +.L80241F1C: +/* D2DC4C 80241F1C 0240202D */ daddu $a0, $s2, $zero +/* D2DC50 80241F20 0260282D */ daddu $a1, $s3, $zero +/* D2DC54 80241F24 0C0903E3 */ jal func_80240F8C_D2CCBC +/* D2DC58 80241F28 0280302D */ daddu $a2, $s4, $zero +/* D2DC5C 80241F2C 080907F3 */ j .L80241FCC +/* D2DC60 80241F30 00000000 */ nop +.L80241F34: +/* D2DC64 80241F34 0260282D */ daddu $a1, $s3, $zero +/* D2DC68 80241F38 0C090422 */ jal func_80241088_D2CDB8 +/* D2DC6C 80241F3C 0280302D */ daddu $a2, $s4, $zero +/* D2DC70 80241F40 8E420070 */ lw $v0, 0x70($s2) +/* D2DC74 80241F44 14500021 */ bne $v0, $s0, .L80241FCC +/* D2DC78 80241F48 00000000 */ nop +.L80241F4C: +/* D2DC7C 80241F4C 0240202D */ daddu $a0, $s2, $zero +/* D2DC80 80241F50 0260282D */ daddu $a1, $s3, $zero +/* D2DC84 80241F54 0C0906B2 */ jal func_80241AC8_D2D7F8 +/* D2DC88 80241F58 0280302D */ daddu $a2, $s4, $zero +/* D2DC8C 80241F5C 8E430070 */ lw $v1, 0x70($s2) +/* D2DC90 80241F60 2402000C */ addiu $v0, $zero, 0xc +/* D2DC94 80241F64 14620019 */ bne $v1, $v0, .L80241FCC +/* D2DC98 80241F68 00000000 */ nop +/* D2DC9C 80241F6C 0240202D */ daddu $a0, $s2, $zero +.L80241F70: +/* D2DCA0 80241F70 0260282D */ daddu $a1, $s3, $zero +/* D2DCA4 80241F74 0C0906D6 */ jal func_80241B58_D2D888 +/* D2DCA8 80241F78 0280302D */ daddu $a2, $s4, $zero +/* D2DCAC 80241F7C 8E430070 */ lw $v1, 0x70($s2) +/* D2DCB0 80241F80 2402000D */ addiu $v0, $zero, 0xd +/* D2DCB4 80241F84 14620011 */ bne $v1, $v0, .L80241FCC +/* D2DCB8 80241F88 00000000 */ nop +.L80241F8C: +/* D2DCBC 80241F8C 0240202D */ daddu $a0, $s2, $zero +/* D2DCC0 80241F90 0260282D */ daddu $a1, $s3, $zero +/* D2DCC4 80241F94 0C090716 */ jal func_80241C58_D2D988 +/* D2DCC8 80241F98 0280302D */ daddu $a2, $s4, $zero +/* D2DCCC 80241F9C 8E430070 */ lw $v1, 0x70($s2) +/* D2DCD0 80241FA0 2402000E */ addiu $v0, $zero, 0xe +/* D2DCD4 80241FA4 14620009 */ bne $v1, $v0, .L80241FCC +/* D2DCD8 80241FA8 00000000 */ nop +/* D2DCDC 80241FAC 0240202D */ daddu $a0, $s2, $zero +.L80241FB0: +/* D2DCE0 80241FB0 0260282D */ daddu $a1, $s3, $zero +/* D2DCE4 80241FB4 0C09072E */ jal func_80241CB8_D2D9E8 +/* D2DCE8 80241FB8 0280302D */ daddu $a2, $s4, $zero +/* D2DCEC 80241FBC 080907F3 */ j .L80241FCC +/* D2DCF0 80241FC0 00000000 */ nop +.L80241FC4: +/* D2DCF4 80241FC4 0C0129CF */ jal func_8004A73C +/* D2DCF8 80241FC8 0240202D */ daddu $a0, $s2, $zero +.L80241FCC: +/* D2DCFC 80241FCC 8FBF0048 */ lw $ra, 0x48($sp) +/* D2DD00 80241FD0 8FB50044 */ lw $s5, 0x44($sp) +/* D2DD04 80241FD4 8FB40040 */ lw $s4, 0x40($sp) +/* D2DD08 80241FD8 8FB3003C */ lw $s3, 0x3c($sp) +/* D2DD0C 80241FDC 8FB20038 */ lw $s2, 0x38($sp) +/* D2DD10 80241FE0 8FB10034 */ lw $s1, 0x34($sp) +/* D2DD14 80241FE4 8FB00030 */ lw $s0, 0x30($sp) +/* D2DD18 80241FE8 0000102D */ daddu $v0, $zero, $zero +/* D2DD1C 80241FEC 03E00008 */ jr $ra +/* D2DD20 80241FF0 27BD0050 */ addiu $sp, $sp, 0x50 +/* D2DD24 80241FF4 00000000 */ nop +/* D2DD28 80241FF8 00000000 */ nop +/* D2DD2C 80241FFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s index 7f9997a0a9..992bb5f768 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s @@ -27,7 +27,7 @@ glabel func_80240120_D2FDA0 /* D2FDF4 80240174 50400008 */ beql $v0, $zero, .L80240198 /* D2FDF8 80240178 26100001 */ addiu $s0, $s0, 1 /* D2FDFC 8024017C 0200202D */ daddu $a0, $s0, $zero -/* D2FE00 80240180 0C090035 */ jal func_802400D4 +/* D2FE00 80240180 0C090035 */ jal func_802400D4_D2FD54 /* D2FE04 80240184 00122C03 */ sra $a1, $s2, 0x10 /* D2FE08 80240188 10540003 */ beq $v0, $s4, .L80240198 /* D2FE0C 8024018C 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s index 2d158b572f..09ab02bcfd 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_802401CC_D2FE4C.s @@ -49,7 +49,7 @@ glabel func_802401CC_D2FE4C /* D2FEF8 80240278 AE300108 */ sw $s0, 0x108($s1) /* D2FEFC 8024027C 8C420000 */ lw $v0, ($v0) /* D2FF00 80240280 02E0282D */ daddu $a1, $s7, $zero -/* D2FF04 80240284 0C090035 */ jal func_802400D4 +/* D2FF04 80240284 0C090035 */ jal func_802400D4_D2FD54 /* D2FF08 80240288 AE220084 */ sw $v0, 0x84($s1) /* D2FF0C 8024028C 0040202D */ daddu $a0, $v0, $zero /* D2FF10 80240290 04800011 */ bltz $a0, .L802402D8 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48.s deleted file mode 100644 index 7277a9f407..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48.s +++ /dev/null @@ -1,119 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F48 -/* D30BC8 80240F48 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D30BCC 80240F4C AFBF0024 */ sw $ra, 0x24($sp) -/* D30BD0 80240F50 AFB40020 */ sw $s4, 0x20($sp) -/* D30BD4 80240F54 AFB3001C */ sw $s3, 0x1c($sp) -/* D30BD8 80240F58 AFB20018 */ sw $s2, 0x18($sp) -/* D30BDC 80240F5C AFB10014 */ sw $s1, 0x14($sp) -/* D30BE0 80240F60 AFB00010 */ sw $s0, 0x10($sp) -/* D30BE4 80240F64 F7B40028 */ sdc1 $f20, 0x28($sp) -/* D30BE8 80240F68 8C900148 */ lw $s0, 0x148($a0) -/* D30BEC 80240F6C 86040008 */ lh $a0, 8($s0) -/* D30BF0 80240F70 0C00EABB */ jal get_npc_unsafe -/* D30BF4 80240F74 24110001 */ addiu $s1, $zero, 1 -/* D30BF8 80240F78 86040008 */ lh $a0, 8($s0) -/* D30BFC 80240F7C 0040802D */ daddu $s0, $v0, $zero -/* D30C00 80240F80 3C05800B */ lui $a1, %hi(gCameras) -/* D30C04 80240F84 24A51D80 */ addiu $a1, $a1, %lo(gCameras) -/* D30C08 80240F88 3C03800A */ lui $v1, 0x800a -/* D30C0C 80240F8C 8463A634 */ lh $v1, -0x59cc($v1) -/* D30C10 80240F90 00912021 */ addu $a0, $a0, $s1 -/* D30C14 80240F94 00031080 */ sll $v0, $v1, 2 -/* D30C18 80240F98 00431021 */ addu $v0, $v0, $v1 -/* D30C1C 80240F9C 00021080 */ sll $v0, $v0, 2 -/* D30C20 80240FA0 00431023 */ subu $v0, $v0, $v1 -/* D30C24 80240FA4 000218C0 */ sll $v1, $v0, 3 -/* D30C28 80240FA8 00431021 */ addu $v0, $v0, $v1 -/* D30C2C 80240FAC 000210C0 */ sll $v0, $v0, 3 -/* D30C30 80240FB0 0C00FB3A */ jal get_enemy -/* D30C34 80240FB4 00459021 */ addu $s2, $v0, $a1 -/* D30C38 80240FB8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) -/* D30C3C 80240FBC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) -/* D30C40 80240FC0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D30C44 80240FC4 8E830000 */ lw $v1, ($s4) -/* D30C48 80240FC8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D30C4C 80240FCC 8C660028 */ lw $a2, 0x28($v1) -/* D30C50 80240FD0 8C670030 */ lw $a3, 0x30($v1) -/* D30C54 80240FD4 0C00A7B5 */ jal dist2D -/* D30C58 80240FD8 0040982D */ daddu $s3, $v0, $zero -/* D30C5C 80240FDC C6620074 */ lwc1 $f2, 0x74($s3) -/* D30C60 80240FE0 468010A0 */ cvt.s.w $f2, $f2 -/* D30C64 80240FE4 4600103C */ c.lt.s $f2, $f0 -/* D30C68 80240FE8 00000000 */ nop -/* D30C6C 80240FEC 45030001 */ bc1tl .L80240FF4 -/* D30C70 80240FF0 0000882D */ daddu $s1, $zero, $zero -.L80240FF4: -/* D30C74 80240FF4 C64C006C */ lwc1 $f12, 0x6c($s2) -/* D30C78 80240FF8 C60E000C */ lwc1 $f14, 0xc($s0) -/* D30C7C 80240FFC 3C014387 */ lui $at, 0x4387 -/* D30C80 80241000 4481A000 */ mtc1 $at, $f20 -/* D30C84 80241004 0C00A70A */ jal get_clamped_angle_diff -/* D30C88 80241008 00000000 */ nop -/* D30C8C 8024100C 0C00A6C9 */ jal clamp_angle -/* D30C90 80241010 46000306 */ mov.s $f12, $f0 -/* D30C94 80241014 3C018024 */ lui $at, 0x8024 -/* D30C98 80241018 D42264D0 */ ldc1 $f2, 0x64d0($at) -/* D30C9C 8024101C 46000021 */ cvt.d.s $f0, $f0 -/* D30CA0 80241020 4622003C */ c.lt.d $f0, $f2 -/* D30CA4 80241024 00000000 */ nop -/* D30CA8 80241028 45000003 */ bc1f .L80241038 -/* D30CAC 8024102C 00000000 */ nop -/* D30CB0 80241030 3C0142B4 */ lui $at, 0x42b4 -/* D30CB4 80241034 4481A000 */ mtc1 $at, $f20 -.L80241038: -/* D30CB8 80241038 C60C0038 */ lwc1 $f12, 0x38($s0) -/* D30CBC 8024103C 8E820000 */ lw $v0, ($s4) -/* D30CC0 80241040 C60E0040 */ lwc1 $f14, 0x40($s0) -/* D30CC4 80241044 8C460028 */ lw $a2, 0x28($v0) -/* D30CC8 80241048 0C00A720 */ jal atan2 -/* D30CCC 8024104C 8C470030 */ lw $a3, 0x30($v0) -/* D30CD0 80241050 4600A306 */ mov.s $f12, $f20 -/* D30CD4 80241054 0C00A70A */ jal get_clamped_angle_diff -/* D30CD8 80241058 46000386 */ mov.s $f14, $f0 -/* D30CDC 8024105C C6620078 */ lwc1 $f2, 0x78($s3) -/* D30CE0 80241060 468010A0 */ cvt.s.w $f2, $f2 -/* D30CE4 80241064 46000005 */ abs.s $f0, $f0 -/* D30CE8 80241068 4600103C */ c.lt.s $f2, $f0 -/* D30CEC 8024106C 00000000 */ nop -/* D30CF0 80241070 45030001 */ bc1tl .L80241078 -/* D30CF4 80241074 0000882D */ daddu $s1, $zero, $zero -.L80241078: -/* D30CF8 80241078 8E820000 */ lw $v0, ($s4) -/* D30CFC 8024107C C600003C */ lwc1 $f0, 0x3c($s0) -/* D30D00 80241080 C442002C */ lwc1 $f2, 0x2c($v0) -/* D30D04 80241084 860200A8 */ lh $v0, 0xa8($s0) -/* D30D08 80241088 46020001 */ sub.s $f0, $f0, $f2 -/* D30D0C 8024108C 44821000 */ mtc1 $v0, $f2 -/* D30D10 80241090 00000000 */ nop -/* D30D14 80241094 468010A1 */ cvt.d.w $f2, $f2 -/* D30D18 80241098 46221080 */ add.d $f2, $f2, $f2 -/* D30D1C 8024109C 46000005 */ abs.s $f0, $f0 -/* D30D20 802410A0 46000021 */ cvt.d.s $f0, $f0 -/* D30D24 802410A4 4620103E */ c.le.d $f2, $f0 -/* D30D28 802410A8 00000000 */ nop -/* D30D2C 802410AC 45030001 */ bc1tl .L802410B4 -/* D30D30 802410B0 0000882D */ daddu $s1, $zero, $zero -.L802410B4: -/* D30D34 802410B4 3C038011 */ lui $v1, 0x8011 -/* D30D38 802410B8 8063EBB3 */ lb $v1, -0x144d($v1) -/* D30D3C 802410BC 24020009 */ addiu $v0, $zero, 9 -/* D30D40 802410C0 50620001 */ beql $v1, $v0, .L802410C8 -/* D30D44 802410C4 0000882D */ daddu $s1, $zero, $zero -.L802410C8: -/* D30D48 802410C8 24020007 */ addiu $v0, $zero, 7 -/* D30D4C 802410CC 50620001 */ beql $v1, $v0, .L802410D4 -/* D30D50 802410D0 0000882D */ daddu $s1, $zero, $zero -.L802410D4: -/* D30D54 802410D4 0220102D */ daddu $v0, $s1, $zero -/* D30D58 802410D8 8FBF0024 */ lw $ra, 0x24($sp) -/* D30D5C 802410DC 8FB40020 */ lw $s4, 0x20($sp) -/* D30D60 802410E0 8FB3001C */ lw $s3, 0x1c($sp) -/* D30D64 802410E4 8FB20018 */ lw $s2, 0x18($sp) -/* D30D68 802410E8 8FB10014 */ lw $s1, 0x14($sp) -/* D30D6C 802410EC 8FB00010 */ lw $s0, 0x10($sp) -/* D30D70 802410F0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* D30D74 802410F4 03E00008 */ jr $ra -/* D30D78 802410F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s new file mode 100644 index 0000000000..addbe27bd5 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_80240F48_D30BC8.s @@ -0,0 +1,119 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F48_D30BC8 +/* D30BC8 80240F48 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* D30BCC 80240F4C AFBF0024 */ sw $ra, 0x24($sp) +/* D30BD0 80240F50 AFB40020 */ sw $s4, 0x20($sp) +/* D30BD4 80240F54 AFB3001C */ sw $s3, 0x1c($sp) +/* D30BD8 80240F58 AFB20018 */ sw $s2, 0x18($sp) +/* D30BDC 80240F5C AFB10014 */ sw $s1, 0x14($sp) +/* D30BE0 80240F60 AFB00010 */ sw $s0, 0x10($sp) +/* D30BE4 80240F64 F7B40028 */ sdc1 $f20, 0x28($sp) +/* D30BE8 80240F68 8C900148 */ lw $s0, 0x148($a0) +/* D30BEC 80240F6C 86040008 */ lh $a0, 8($s0) +/* D30BF0 80240F70 0C00EABB */ jal get_npc_unsafe +/* D30BF4 80240F74 24110001 */ addiu $s1, $zero, 1 +/* D30BF8 80240F78 86040008 */ lh $a0, 8($s0) +/* D30BFC 80240F7C 0040802D */ daddu $s0, $v0, $zero +/* D30C00 80240F80 3C05800B */ lui $a1, %hi(gCameras) +/* D30C04 80240F84 24A51D80 */ addiu $a1, $a1, %lo(gCameras) +/* D30C08 80240F88 3C03800A */ lui $v1, 0x800a +/* D30C0C 80240F8C 8463A634 */ lh $v1, -0x59cc($v1) +/* D30C10 80240F90 00912021 */ addu $a0, $a0, $s1 +/* D30C14 80240F94 00031080 */ sll $v0, $v1, 2 +/* D30C18 80240F98 00431021 */ addu $v0, $v0, $v1 +/* D30C1C 80240F9C 00021080 */ sll $v0, $v0, 2 +/* D30C20 80240FA0 00431023 */ subu $v0, $v0, $v1 +/* D30C24 80240FA4 000218C0 */ sll $v1, $v0, 3 +/* D30C28 80240FA8 00431021 */ addu $v0, $v0, $v1 +/* D30C2C 80240FAC 000210C0 */ sll $v0, $v0, 3 +/* D30C30 80240FB0 0C00FB3A */ jal get_enemy +/* D30C34 80240FB4 00459021 */ addu $s2, $v0, $a1 +/* D30C38 80240FB8 3C14800F */ lui $s4, %hi(gPlayerStatusPtr) +/* D30C3C 80240FBC 26947B30 */ addiu $s4, $s4, %lo(gPlayerStatusPtr) +/* D30C40 80240FC0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* D30C44 80240FC4 8E830000 */ lw $v1, ($s4) +/* D30C48 80240FC8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* D30C4C 80240FCC 8C660028 */ lw $a2, 0x28($v1) +/* D30C50 80240FD0 8C670030 */ lw $a3, 0x30($v1) +/* D30C54 80240FD4 0C00A7B5 */ jal dist2D +/* D30C58 80240FD8 0040982D */ daddu $s3, $v0, $zero +/* D30C5C 80240FDC C6620074 */ lwc1 $f2, 0x74($s3) +/* D30C60 80240FE0 468010A0 */ cvt.s.w $f2, $f2 +/* D30C64 80240FE4 4600103C */ c.lt.s $f2, $f0 +/* D30C68 80240FE8 00000000 */ nop +/* D30C6C 80240FEC 45030001 */ bc1tl .L80240FF4 +/* D30C70 80240FF0 0000882D */ daddu $s1, $zero, $zero +.L80240FF4: +/* D30C74 80240FF4 C64C006C */ lwc1 $f12, 0x6c($s2) +/* D30C78 80240FF8 C60E000C */ lwc1 $f14, 0xc($s0) +/* D30C7C 80240FFC 3C014387 */ lui $at, 0x4387 +/* D30C80 80241000 4481A000 */ mtc1 $at, $f20 +/* D30C84 80241004 0C00A70A */ jal get_clamped_angle_diff +/* D30C88 80241008 00000000 */ nop +/* D30C8C 8024100C 0C00A6C9 */ jal clamp_angle +/* D30C90 80241010 46000306 */ mov.s $f12, $f0 +/* D30C94 80241014 3C018024 */ lui $at, 0x8024 +/* D30C98 80241018 D42264D0 */ ldc1 $f2, 0x64d0($at) +/* D30C9C 8024101C 46000021 */ cvt.d.s $f0, $f0 +/* D30CA0 80241020 4622003C */ c.lt.d $f0, $f2 +/* D30CA4 80241024 00000000 */ nop +/* D30CA8 80241028 45000003 */ bc1f .L80241038 +/* D30CAC 8024102C 00000000 */ nop +/* D30CB0 80241030 3C0142B4 */ lui $at, 0x42b4 +/* D30CB4 80241034 4481A000 */ mtc1 $at, $f20 +.L80241038: +/* D30CB8 80241038 C60C0038 */ lwc1 $f12, 0x38($s0) +/* D30CBC 8024103C 8E820000 */ lw $v0, ($s4) +/* D30CC0 80241040 C60E0040 */ lwc1 $f14, 0x40($s0) +/* D30CC4 80241044 8C460028 */ lw $a2, 0x28($v0) +/* D30CC8 80241048 0C00A720 */ jal atan2 +/* D30CCC 8024104C 8C470030 */ lw $a3, 0x30($v0) +/* D30CD0 80241050 4600A306 */ mov.s $f12, $f20 +/* D30CD4 80241054 0C00A70A */ jal get_clamped_angle_diff +/* D30CD8 80241058 46000386 */ mov.s $f14, $f0 +/* D30CDC 8024105C C6620078 */ lwc1 $f2, 0x78($s3) +/* D30CE0 80241060 468010A0 */ cvt.s.w $f2, $f2 +/* D30CE4 80241064 46000005 */ abs.s $f0, $f0 +/* D30CE8 80241068 4600103C */ c.lt.s $f2, $f0 +/* D30CEC 8024106C 00000000 */ nop +/* D30CF0 80241070 45030001 */ bc1tl .L80241078 +/* D30CF4 80241074 0000882D */ daddu $s1, $zero, $zero +.L80241078: +/* D30CF8 80241078 8E820000 */ lw $v0, ($s4) +/* D30CFC 8024107C C600003C */ lwc1 $f0, 0x3c($s0) +/* D30D00 80241080 C442002C */ lwc1 $f2, 0x2c($v0) +/* D30D04 80241084 860200A8 */ lh $v0, 0xa8($s0) +/* D30D08 80241088 46020001 */ sub.s $f0, $f0, $f2 +/* D30D0C 8024108C 44821000 */ mtc1 $v0, $f2 +/* D30D10 80241090 00000000 */ nop +/* D30D14 80241094 468010A1 */ cvt.d.w $f2, $f2 +/* D30D18 80241098 46221080 */ add.d $f2, $f2, $f2 +/* D30D1C 8024109C 46000005 */ abs.s $f0, $f0 +/* D30D20 802410A0 46000021 */ cvt.d.s $f0, $f0 +/* D30D24 802410A4 4620103E */ c.le.d $f2, $f0 +/* D30D28 802410A8 00000000 */ nop +/* D30D2C 802410AC 45030001 */ bc1tl .L802410B4 +/* D30D30 802410B0 0000882D */ daddu $s1, $zero, $zero +.L802410B4: +/* D30D34 802410B4 3C038011 */ lui $v1, 0x8011 +/* D30D38 802410B8 8063EBB3 */ lb $v1, -0x144d($v1) +/* D30D3C 802410BC 24020009 */ addiu $v0, $zero, 9 +/* D30D40 802410C0 50620001 */ beql $v1, $v0, .L802410C8 +/* D30D44 802410C4 0000882D */ daddu $s1, $zero, $zero +.L802410C8: +/* D30D48 802410C8 24020007 */ addiu $v0, $zero, 7 +/* D30D4C 802410CC 50620001 */ beql $v1, $v0, .L802410D4 +/* D30D50 802410D0 0000882D */ daddu $s1, $zero, $zero +.L802410D4: +/* D30D54 802410D4 0220102D */ daddu $v0, $s1, $zero +/* D30D58 802410D8 8FBF0024 */ lw $ra, 0x24($sp) +/* D30D5C 802410DC 8FB40020 */ lw $s4, 0x20($sp) +/* D30D60 802410E0 8FB3001C */ lw $s3, 0x1c($sp) +/* D30D64 802410E4 8FB20018 */ lw $s2, 0x18($sp) +/* D30D68 802410E8 8FB10014 */ lw $s1, 0x14($sp) +/* D30D6C 802410EC 8FB00010 */ lw $s0, 0x10($sp) +/* D30D70 802410F0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* D30D74 802410F4 03E00008 */ jr $ra +/* D30D78 802410F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s deleted file mode 100644 index d31f578235..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C.s +++ /dev/null @@ -1,184 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024135C -/* D30FDC 8024135C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* D30FE0 80241360 AFB20038 */ sw $s2, 0x38($sp) -/* D30FE4 80241364 0080902D */ daddu $s2, $a0, $zero -/* D30FE8 80241368 AFBF0048 */ sw $ra, 0x48($sp) -/* D30FEC 8024136C AFB50044 */ sw $s5, 0x44($sp) -/* D30FF0 80241370 AFB40040 */ sw $s4, 0x40($sp) -/* D30FF4 80241374 AFB3003C */ sw $s3, 0x3c($sp) -/* D30FF8 80241378 AFB10034 */ sw $s1, 0x34($sp) -/* D30FFC 8024137C AFB00030 */ sw $s0, 0x30($sp) -/* D31000 80241380 8E510148 */ lw $s1, 0x148($s2) -/* D31004 80241384 86240008 */ lh $a0, 8($s1) -/* D31008 80241388 0C00EABB */ jal get_npc_unsafe -/* D3100C 8024138C 00A0802D */ daddu $s0, $a1, $zero -/* D31010 80241390 8E43000C */ lw $v1, 0xc($s2) -/* D31014 80241394 0240202D */ daddu $a0, $s2, $zero -/* D31018 80241398 8C650000 */ lw $a1, ($v1) -/* D3101C 8024139C 0C0B1EAF */ jal get_variable -/* D31020 802413A0 0040A82D */ daddu $s5, $v0, $zero -/* D31024 802413A4 AFA00010 */ sw $zero, 0x10($sp) -/* D31028 802413A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* D3102C 802413AC 8C630030 */ lw $v1, 0x30($v1) -/* D31030 802413B0 AFA30014 */ sw $v1, 0x14($sp) -/* D31034 802413B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* D31038 802413B8 8C63001C */ lw $v1, 0x1c($v1) -/* D3103C 802413BC AFA30018 */ sw $v1, 0x18($sp) -/* D31040 802413C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* D31044 802413C4 8C630024 */ lw $v1, 0x24($v1) -/* D31048 802413C8 AFA3001C */ sw $v1, 0x1c($sp) -/* D3104C 802413CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D31050 802413D0 8C630028 */ lw $v1, 0x28($v1) -/* D31054 802413D4 27B40010 */ addiu $s4, $sp, 0x10 -/* D31058 802413D8 AFA30020 */ sw $v1, 0x20($sp) -/* D3105C 802413DC 8E2300D0 */ lw $v1, 0xd0($s1) -/* D31060 802413E0 3C014282 */ lui $at, 0x4282 -/* D31064 802413E4 44810000 */ mtc1 $at, $f0 -/* D31068 802413E8 8C63002C */ lw $v1, 0x2c($v1) -/* D3106C 802413EC 0040982D */ daddu $s3, $v0, $zero -/* D31070 802413F0 E7A00028 */ swc1 $f0, 0x28($sp) -/* D31074 802413F4 A7A0002C */ sh $zero, 0x2c($sp) -/* D31078 802413F8 16000005 */ bnez $s0, .L80241410 -/* D3107C 802413FC AFA30024 */ sw $v1, 0x24($sp) -/* D31080 80241400 8E2200B0 */ lw $v0, 0xb0($s1) -/* D31084 80241404 30420004 */ andi $v0, $v0, 4 -/* D31088 80241408 10400020 */ beqz $v0, .L8024148C -/* D3108C 8024140C 00000000 */ nop -.L80241410: -/* D31090 80241410 2404F7FF */ addiu $a0, $zero, -0x801 -/* D31094 80241414 AE400070 */ sw $zero, 0x70($s2) -/* D31098 80241418 A6A0008E */ sh $zero, 0x8e($s5) -/* D3109C 8024141C 8E2200CC */ lw $v0, 0xcc($s1) -/* D310A0 80241420 8EA30000 */ lw $v1, ($s5) -/* D310A4 80241424 8C420000 */ lw $v0, ($v0) -/* D310A8 80241428 00641824 */ and $v1, $v1, $a0 -/* D310AC 8024142C AEA30000 */ sw $v1, ($s5) -/* D310B0 80241430 AEA20028 */ sw $v0, 0x28($s5) -/* D310B4 80241434 8E2200D0 */ lw $v0, 0xd0($s1) -/* D310B8 80241438 8C420034 */ lw $v0, 0x34($v0) -/* D310BC 8024143C 54400005 */ bnel $v0, $zero, .L80241454 -/* D310C0 80241440 2402FDFF */ addiu $v0, $zero, -0x201 -/* D310C4 80241444 34620200 */ ori $v0, $v1, 0x200 -/* D310C8 80241448 2403FFF7 */ addiu $v1, $zero, -9 -/* D310CC 8024144C 08090517 */ j .L8024145C -/* D310D0 80241450 00431024 */ and $v0, $v0, $v1 -.L80241454: -/* D310D4 80241454 00621024 */ and $v0, $v1, $v0 -/* D310D8 80241458 34420008 */ ori $v0, $v0, 8 -.L8024145C: -/* D310DC 8024145C AEA20000 */ sw $v0, ($s5) -/* D310E0 80241460 8E2200B0 */ lw $v0, 0xb0($s1) -/* D310E4 80241464 30420004 */ andi $v0, $v0, 4 -/* D310E8 80241468 10400007 */ beqz $v0, .L80241488 -/* D310EC 8024146C 24020063 */ addiu $v0, $zero, 0x63 -/* D310F0 80241470 AE420070 */ sw $v0, 0x70($s2) -/* D310F4 80241474 AE400074 */ sw $zero, 0x74($s2) -/* D310F8 80241478 8E2200B0 */ lw $v0, 0xb0($s1) -/* D310FC 8024147C 2403FFFB */ addiu $v1, $zero, -5 -/* D31100 80241480 00431024 */ and $v0, $v0, $v1 -/* D31104 80241484 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241488: -/* D31108 80241488 AE20006C */ sw $zero, 0x6c($s1) -.L8024148C: -/* D3110C 8024148C 8E420070 */ lw $v0, 0x70($s2) -/* D31110 80241490 2842001E */ slti $v0, $v0, 0x1e -/* D31114 80241494 10400009 */ beqz $v0, .L802414BC -/* D31118 80241498 00000000 */ nop -/* D3111C 8024149C 8E22006C */ lw $v0, 0x6c($s1) -/* D31120 802414A0 14400006 */ bnez $v0, .L802414BC -/* D31124 802414A4 00000000 */ nop -/* D31128 802414A8 0C0903D2 */ jal func_80240F48 -/* D3112C 802414AC 0240202D */ daddu $a0, $s2, $zero -/* D31130 802414B0 10400002 */ beqz $v0, .L802414BC -/* D31134 802414B4 2402001E */ addiu $v0, $zero, 0x1e -/* D31138 802414B8 AE420070 */ sw $v0, 0x70($s2) -.L802414BC: -/* D3113C 802414BC 8E430070 */ lw $v1, 0x70($s2) -/* D31140 802414C0 2C620064 */ sltiu $v0, $v1, 0x64 -/* D31144 802414C4 10400048 */ beqz $v0, .L802415E8 -/* D31148 802414C8 00031080 */ sll $v0, $v1, 2 -/* D3114C 802414CC 3C018024 */ lui $at, 0x8024 -/* D31150 802414D0 00220821 */ addu $at, $at, $v0 -/* D31154 802414D4 8C2264D8 */ lw $v0, 0x64d8($at) -/* D31158 802414D8 00400008 */ jr $v0 -/* D3115C 802414DC 00000000 */ nop -/* D31160 802414E0 0240202D */ daddu $a0, $s2, $zero -/* D31164 802414E4 0260282D */ daddu $a1, $s3, $zero -/* D31168 802414E8 0C012568 */ jal func_800495A0 -/* D3116C 802414EC 0280302D */ daddu $a2, $s4, $zero -/* D31170 802414F0 0240202D */ daddu $a0, $s2, $zero -/* D31174 802414F4 0260282D */ daddu $a1, $s3, $zero -/* D31178 802414F8 0C0125AE */ jal func_800496B8 -/* D3117C 802414FC 0280302D */ daddu $a2, $s4, $zero -/* D31180 80241500 0809057A */ j .L802415E8 -/* D31184 80241504 00000000 */ nop -/* D31188 80241508 0240202D */ daddu $a0, $s2, $zero -/* D3118C 8024150C 0260282D */ daddu $a1, $s3, $zero -/* D31190 80241510 0C0126D1 */ jal func_80049B44 -/* D31194 80241514 0280302D */ daddu $a2, $s4, $zero -/* D31198 80241518 0240202D */ daddu $a0, $s2, $zero -/* D3119C 8024151C 0260282D */ daddu $a1, $s3, $zero -/* D311A0 80241520 0C012701 */ jal func_80049C04 -/* D311A4 80241524 0280302D */ daddu $a2, $s4, $zero -/* D311A8 80241528 0809057A */ j .L802415E8 -/* D311AC 8024152C 00000000 */ nop -/* D311B0 80241530 0240202D */ daddu $a0, $s2, $zero -/* D311B4 80241534 0260282D */ daddu $a1, $s3, $zero -/* D311B8 80241538 0C01278F */ jal func_80049E3C -/* D311BC 8024153C 0280302D */ daddu $a2, $s4, $zero -/* D311C0 80241540 0240202D */ daddu $a0, $s2, $zero -/* D311C4 80241544 0260282D */ daddu $a1, $s3, $zero -/* D311C8 80241548 0C0127B3 */ jal func_80049ECC -/* D311CC 8024154C 0280302D */ daddu $a2, $s4, $zero -/* D311D0 80241550 0809057A */ j .L802415E8 -/* D311D4 80241554 00000000 */ nop -/* D311D8 80241558 0240202D */ daddu $a0, $s2, $zero -/* D311DC 8024155C 0260282D */ daddu $a1, $s3, $zero -/* D311E0 80241560 0C0127DF */ jal func_80049F7C -/* D311E4 80241564 0280302D */ daddu $a2, $s4, $zero -/* D311E8 80241568 0240202D */ daddu $a0, $s2, $zero -/* D311EC 8024156C 0260282D */ daddu $a1, $s3, $zero -/* D311F0 80241570 0C012849 */ jal func_8004A124 -/* D311F4 80241574 0280302D */ daddu $a2, $s4, $zero -/* D311F8 80241578 0809057A */ j .L802415E8 -/* D311FC 8024157C 00000000 */ nop -/* D31200 80241580 0240202D */ daddu $a0, $s2, $zero -/* D31204 80241584 0260282D */ daddu $a1, $s3, $zero -/* D31208 80241588 0C0128FA */ jal func_8004A3E8 -/* D3120C 8024158C 0280302D */ daddu $a2, $s4, $zero -/* D31210 80241590 0809057A */ j .L802415E8 -/* D31214 80241594 00000000 */ nop -/* D31218 80241598 0C090350 */ jal func_80240D40 -/* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero -/* D31220 802415A0 0C09036B */ jal func_80240DAC_D30A2C -/* D31224 802415A4 0240202D */ daddu $a0, $s2, $zero -/* D31228 802415A8 8E430070 */ lw $v1, 0x70($s2) -/* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 -/* D31230 802415B0 1462000D */ bne $v1, $v0, .L802415E8 -/* D31234 802415B4 00000000 */ nop -/* D31238 802415B8 0C090387 */ jal func_80240E1C_D30A9C -/* D3123C 802415BC 0240202D */ daddu $a0, $s2, $zero -/* D31240 802415C0 8E430070 */ lw $v1, 0x70($s2) -/* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 -/* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 -/* D3124C 802415CC 00000000 */ nop -/* D31250 802415D0 0C0903BD */ jal func_80240EF4_D30B74 -/* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero -/* D31258 802415D8 0809057A */ j .L802415E8 -/* D3125C 802415DC 00000000 */ nop -/* D31260 802415E0 0C0129CF */ jal func_8004A73C -/* D31264 802415E4 0240202D */ daddu $a0, $s2, $zero -.L802415E8: -/* D31268 802415E8 8FBF0048 */ lw $ra, 0x48($sp) -/* D3126C 802415EC 8FB50044 */ lw $s5, 0x44($sp) -/* D31270 802415F0 8FB40040 */ lw $s4, 0x40($sp) -/* D31274 802415F4 8FB3003C */ lw $s3, 0x3c($sp) -/* D31278 802415F8 8FB20038 */ lw $s2, 0x38($sp) -/* D3127C 802415FC 8FB10034 */ lw $s1, 0x34($sp) -/* D31280 80241600 8FB00030 */ lw $s0, 0x30($sp) -/* D31284 80241604 0000102D */ daddu $v0, $zero, $zero -/* D31288 80241608 03E00008 */ jr $ra -/* D3128C 8024160C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s new file mode 100644 index 0000000000..a0cb09f033 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_08/D309C0/func_8024135C_D30FDC.s @@ -0,0 +1,184 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024135C_D30FDC +/* D30FDC 8024135C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* D30FE0 80241360 AFB20038 */ sw $s2, 0x38($sp) +/* D30FE4 80241364 0080902D */ daddu $s2, $a0, $zero +/* D30FE8 80241368 AFBF0048 */ sw $ra, 0x48($sp) +/* D30FEC 8024136C AFB50044 */ sw $s5, 0x44($sp) +/* D30FF0 80241370 AFB40040 */ sw $s4, 0x40($sp) +/* D30FF4 80241374 AFB3003C */ sw $s3, 0x3c($sp) +/* D30FF8 80241378 AFB10034 */ sw $s1, 0x34($sp) +/* D30FFC 8024137C AFB00030 */ sw $s0, 0x30($sp) +/* D31000 80241380 8E510148 */ lw $s1, 0x148($s2) +/* D31004 80241384 86240008 */ lh $a0, 8($s1) +/* D31008 80241388 0C00EABB */ jal get_npc_unsafe +/* D3100C 8024138C 00A0802D */ daddu $s0, $a1, $zero +/* D31010 80241390 8E43000C */ lw $v1, 0xc($s2) +/* D31014 80241394 0240202D */ daddu $a0, $s2, $zero +/* D31018 80241398 8C650000 */ lw $a1, ($v1) +/* D3101C 8024139C 0C0B1EAF */ jal get_variable +/* D31020 802413A0 0040A82D */ daddu $s5, $v0, $zero +/* D31024 802413A4 AFA00010 */ sw $zero, 0x10($sp) +/* D31028 802413A8 8E2300D0 */ lw $v1, 0xd0($s1) +/* D3102C 802413AC 8C630030 */ lw $v1, 0x30($v1) +/* D31030 802413B0 AFA30014 */ sw $v1, 0x14($sp) +/* D31034 802413B4 8E2300D0 */ lw $v1, 0xd0($s1) +/* D31038 802413B8 8C63001C */ lw $v1, 0x1c($v1) +/* D3103C 802413BC AFA30018 */ sw $v1, 0x18($sp) +/* D31040 802413C0 8E2300D0 */ lw $v1, 0xd0($s1) +/* D31044 802413C4 8C630024 */ lw $v1, 0x24($v1) +/* D31048 802413C8 AFA3001C */ sw $v1, 0x1c($sp) +/* D3104C 802413CC 8E2300D0 */ lw $v1, 0xd0($s1) +/* D31050 802413D0 8C630028 */ lw $v1, 0x28($v1) +/* D31054 802413D4 27B40010 */ addiu $s4, $sp, 0x10 +/* D31058 802413D8 AFA30020 */ sw $v1, 0x20($sp) +/* D3105C 802413DC 8E2300D0 */ lw $v1, 0xd0($s1) +/* D31060 802413E0 3C014282 */ lui $at, 0x4282 +/* D31064 802413E4 44810000 */ mtc1 $at, $f0 +/* D31068 802413E8 8C63002C */ lw $v1, 0x2c($v1) +/* D3106C 802413EC 0040982D */ daddu $s3, $v0, $zero +/* D31070 802413F0 E7A00028 */ swc1 $f0, 0x28($sp) +/* D31074 802413F4 A7A0002C */ sh $zero, 0x2c($sp) +/* D31078 802413F8 16000005 */ bnez $s0, .L80241410 +/* D3107C 802413FC AFA30024 */ sw $v1, 0x24($sp) +/* D31080 80241400 8E2200B0 */ lw $v0, 0xb0($s1) +/* D31084 80241404 30420004 */ andi $v0, $v0, 4 +/* D31088 80241408 10400020 */ beqz $v0, .L8024148C +/* D3108C 8024140C 00000000 */ nop +.L80241410: +/* D31090 80241410 2404F7FF */ addiu $a0, $zero, -0x801 +/* D31094 80241414 AE400070 */ sw $zero, 0x70($s2) +/* D31098 80241418 A6A0008E */ sh $zero, 0x8e($s5) +/* D3109C 8024141C 8E2200CC */ lw $v0, 0xcc($s1) +/* D310A0 80241420 8EA30000 */ lw $v1, ($s5) +/* D310A4 80241424 8C420000 */ lw $v0, ($v0) +/* D310A8 80241428 00641824 */ and $v1, $v1, $a0 +/* D310AC 8024142C AEA30000 */ sw $v1, ($s5) +/* D310B0 80241430 AEA20028 */ sw $v0, 0x28($s5) +/* D310B4 80241434 8E2200D0 */ lw $v0, 0xd0($s1) +/* D310B8 80241438 8C420034 */ lw $v0, 0x34($v0) +/* D310BC 8024143C 54400005 */ bnel $v0, $zero, .L80241454 +/* D310C0 80241440 2402FDFF */ addiu $v0, $zero, -0x201 +/* D310C4 80241444 34620200 */ ori $v0, $v1, 0x200 +/* D310C8 80241448 2403FFF7 */ addiu $v1, $zero, -9 +/* D310CC 8024144C 08090517 */ j .L8024145C +/* D310D0 80241450 00431024 */ and $v0, $v0, $v1 +.L80241454: +/* D310D4 80241454 00621024 */ and $v0, $v1, $v0 +/* D310D8 80241458 34420008 */ ori $v0, $v0, 8 +.L8024145C: +/* D310DC 8024145C AEA20000 */ sw $v0, ($s5) +/* D310E0 80241460 8E2200B0 */ lw $v0, 0xb0($s1) +/* D310E4 80241464 30420004 */ andi $v0, $v0, 4 +/* D310E8 80241468 10400007 */ beqz $v0, .L80241488 +/* D310EC 8024146C 24020063 */ addiu $v0, $zero, 0x63 +/* D310F0 80241470 AE420070 */ sw $v0, 0x70($s2) +/* D310F4 80241474 AE400074 */ sw $zero, 0x74($s2) +/* D310F8 80241478 8E2200B0 */ lw $v0, 0xb0($s1) +/* D310FC 8024147C 2403FFFB */ addiu $v1, $zero, -5 +/* D31100 80241480 00431024 */ and $v0, $v0, $v1 +/* D31104 80241484 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241488: +/* D31108 80241488 AE20006C */ sw $zero, 0x6c($s1) +.L8024148C: +/* D3110C 8024148C 8E420070 */ lw $v0, 0x70($s2) +/* D31110 80241490 2842001E */ slti $v0, $v0, 0x1e +/* D31114 80241494 10400009 */ beqz $v0, .L802414BC +/* D31118 80241498 00000000 */ nop +/* D3111C 8024149C 8E22006C */ lw $v0, 0x6c($s1) +/* D31120 802414A0 14400006 */ bnez $v0, .L802414BC +/* D31124 802414A4 00000000 */ nop +/* D31128 802414A8 0C0903D2 */ jal func_80240F48_D30BC8 +/* D3112C 802414AC 0240202D */ daddu $a0, $s2, $zero +/* D31130 802414B0 10400002 */ beqz $v0, .L802414BC +/* D31134 802414B4 2402001E */ addiu $v0, $zero, 0x1e +/* D31138 802414B8 AE420070 */ sw $v0, 0x70($s2) +.L802414BC: +/* D3113C 802414BC 8E430070 */ lw $v1, 0x70($s2) +/* D31140 802414C0 2C620064 */ sltiu $v0, $v1, 0x64 +/* D31144 802414C4 10400048 */ beqz $v0, .L802415E8 +/* D31148 802414C8 00031080 */ sll $v0, $v1, 2 +/* D3114C 802414CC 3C018024 */ lui $at, 0x8024 +/* D31150 802414D0 00220821 */ addu $at, $at, $v0 +/* D31154 802414D4 8C2264D8 */ lw $v0, 0x64d8($at) +/* D31158 802414D8 00400008 */ jr $v0 +/* D3115C 802414DC 00000000 */ nop +/* D31160 802414E0 0240202D */ daddu $a0, $s2, $zero +/* D31164 802414E4 0260282D */ daddu $a1, $s3, $zero +/* D31168 802414E8 0C012568 */ jal func_800495A0 +/* D3116C 802414EC 0280302D */ daddu $a2, $s4, $zero +/* D31170 802414F0 0240202D */ daddu $a0, $s2, $zero +/* D31174 802414F4 0260282D */ daddu $a1, $s3, $zero +/* D31178 802414F8 0C0125AE */ jal func_800496B8 +/* D3117C 802414FC 0280302D */ daddu $a2, $s4, $zero +/* D31180 80241500 0809057A */ j .L802415E8 +/* D31184 80241504 00000000 */ nop +/* D31188 80241508 0240202D */ daddu $a0, $s2, $zero +/* D3118C 8024150C 0260282D */ daddu $a1, $s3, $zero +/* D31190 80241510 0C0126D1 */ jal func_80049B44 +/* D31194 80241514 0280302D */ daddu $a2, $s4, $zero +/* D31198 80241518 0240202D */ daddu $a0, $s2, $zero +/* D3119C 8024151C 0260282D */ daddu $a1, $s3, $zero +/* D311A0 80241520 0C012701 */ jal func_80049C04 +/* D311A4 80241524 0280302D */ daddu $a2, $s4, $zero +/* D311A8 80241528 0809057A */ j .L802415E8 +/* D311AC 8024152C 00000000 */ nop +/* D311B0 80241530 0240202D */ daddu $a0, $s2, $zero +/* D311B4 80241534 0260282D */ daddu $a1, $s3, $zero +/* D311B8 80241538 0C01278F */ jal func_80049E3C +/* D311BC 8024153C 0280302D */ daddu $a2, $s4, $zero +/* D311C0 80241540 0240202D */ daddu $a0, $s2, $zero +/* D311C4 80241544 0260282D */ daddu $a1, $s3, $zero +/* D311C8 80241548 0C0127B3 */ jal func_80049ECC +/* D311CC 8024154C 0280302D */ daddu $a2, $s4, $zero +/* D311D0 80241550 0809057A */ j .L802415E8 +/* D311D4 80241554 00000000 */ nop +/* D311D8 80241558 0240202D */ daddu $a0, $s2, $zero +/* D311DC 8024155C 0260282D */ daddu $a1, $s3, $zero +/* D311E0 80241560 0C0127DF */ jal func_80049F7C +/* D311E4 80241564 0280302D */ daddu $a2, $s4, $zero +/* D311E8 80241568 0240202D */ daddu $a0, $s2, $zero +/* D311EC 8024156C 0260282D */ daddu $a1, $s3, $zero +/* D311F0 80241570 0C012849 */ jal func_8004A124 +/* D311F4 80241574 0280302D */ daddu $a2, $s4, $zero +/* D311F8 80241578 0809057A */ j .L802415E8 +/* D311FC 8024157C 00000000 */ nop +/* D31200 80241580 0240202D */ daddu $a0, $s2, $zero +/* D31204 80241584 0260282D */ daddu $a1, $s3, $zero +/* D31208 80241588 0C0128FA */ jal func_8004A3E8 +/* D3120C 8024158C 0280302D */ daddu $a2, $s4, $zero +/* D31210 80241590 0809057A */ j .L802415E8 +/* D31214 80241594 00000000 */ nop +/* D31218 80241598 0C090350 */ jal func_80240D40_D309C0 +/* D3121C 8024159C 0240202D */ daddu $a0, $s2, $zero +/* D31220 802415A0 0C09036B */ jal func_80240DAC_D30A2C +/* D31224 802415A4 0240202D */ daddu $a0, $s2, $zero +/* D31228 802415A8 8E430070 */ lw $v1, 0x70($s2) +/* D3122C 802415AC 24020020 */ addiu $v0, $zero, 0x20 +/* D31230 802415B0 1462000D */ bne $v1, $v0, .L802415E8 +/* D31234 802415B4 00000000 */ nop +/* D31238 802415B8 0C090387 */ jal func_80240E1C_D30A9C +/* D3123C 802415BC 0240202D */ daddu $a0, $s2, $zero +/* D31240 802415C0 8E430070 */ lw $v1, 0x70($s2) +/* D31244 802415C4 24020021 */ addiu $v0, $zero, 0x21 +/* D31248 802415C8 14620007 */ bne $v1, $v0, .L802415E8 +/* D3124C 802415CC 00000000 */ nop +/* D31250 802415D0 0C0903BD */ jal func_80240EF4_D30B74 +/* D31254 802415D4 0240202D */ daddu $a0, $s2, $zero +/* D31258 802415D8 0809057A */ j .L802415E8 +/* D3125C 802415DC 00000000 */ nop +/* D31260 802415E0 0C0129CF */ jal func_8004A73C +/* D31264 802415E4 0240202D */ daddu $a0, $s2, $zero +.L802415E8: +/* D31268 802415E8 8FBF0048 */ lw $ra, 0x48($sp) +/* D3126C 802415EC 8FB50044 */ lw $s5, 0x44($sp) +/* D31270 802415F0 8FB40040 */ lw $s4, 0x40($sp) +/* D31274 802415F4 8FB3003C */ lw $s3, 0x3c($sp) +/* D31278 802415F8 8FB20038 */ lw $s2, 0x38($sp) +/* D3127C 802415FC 8FB10034 */ lw $s1, 0x34($sp) +/* D31280 80241600 8FB00030 */ lw $s0, 0x30($sp) +/* D31284 80241604 0000102D */ daddu $v0, $zero, $zero +/* D31288 80241608 03E00008 */ jr $ra +/* D3128C 8024160C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s index b66faf5654..ccb86f4505 100644 --- a/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s +++ b/asm/nonmatchings/world/area_sam/sam_10/D37BD0/func_802409EC_D381EC.s @@ -90,7 +90,7 @@ glabel func_802409EC_D381EC /* D3832C 80240B2C 8E22006C */ lw $v0, 0x6c($s1) /* D38330 80240B30 14400006 */ bnez $v0, .L80240B4C /* D38334 80240B34 00000000 */ nop -/* D38338 80240B38 0C090176 */ jal func_802405D8 +/* D38338 80240B38 0C090176 */ jal func_802405D8_D37DD8 /* D3833C 80240B3C 0240202D */ daddu $a0, $s2, $zero /* D38340 80240B40 10400002 */ beqz $v0, .L80240B4C /* D38344 80240B44 2402001E */ addiu $v0, $zero, 0x1e @@ -151,21 +151,21 @@ glabel func_802409EC_D381EC /* D3841C 80240C1C 0280302D */ daddu $a2, $s4, $zero /* D38420 80240C20 0809031E */ j .L80240C78 /* D38424 80240C24 00000000 */ nop -/* D38428 80240C28 0C0900F4 */ jal func_802403D0 +/* D38428 80240C28 0C0900F4 */ jal func_802403D0_D37BD0 /* D3842C 80240C2C 0240202D */ daddu $a0, $s2, $zero -/* D38430 80240C30 0C09010F */ jal func_8024043C +/* D38430 80240C30 0C09010F */ jal func_8024043C_D37C3C /* D38434 80240C34 0240202D */ daddu $a0, $s2, $zero /* D38438 80240C38 8E430070 */ lw $v1, 0x70($s2) /* D3843C 80240C3C 24020020 */ addiu $v0, $zero, 0x20 /* D38440 80240C40 1462000D */ bne $v1, $v0, .L80240C78 /* D38444 80240C44 00000000 */ nop -/* D38448 80240C48 0C09012B */ jal func_802404AC +/* D38448 80240C48 0C09012B */ jal func_802404AC_D37CAC /* D3844C 80240C4C 0240202D */ daddu $a0, $s2, $zero /* D38450 80240C50 8E430070 */ lw $v1, 0x70($s2) /* D38454 80240C54 24020021 */ addiu $v0, $zero, 0x21 /* D38458 80240C58 14620007 */ bne $v1, $v0, .L80240C78 /* D3845C 80240C5C 00000000 */ nop -/* D38460 80240C60 0C090161 */ jal func_80240584 +/* D38460 80240C60 0C090161 */ jal func_80240584_D37D84 /* D38464 80240C64 0240202D */ daddu $a0, $s2, $zero /* D38468 80240C68 0809031E */ j .L80240C78 /* D3846C 80240C6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A610/func_802400B0_D3A680.s b/asm/nonmatchings/world/area_sam/sam_11/D3A610/func_802400B0_D3A680.s index 5f64a27b0d..03d522d675 100644 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A610/func_802400B0_D3A680.s +++ b/asm/nonmatchings/world/area_sam/sam_11/D3A610/func_802400B0_D3A680.s @@ -55,7 +55,7 @@ glabel func_802400B0_D3A680 /* D3A748 80240178 4405E000 */ mfc1 $a1, $f28 /* D3A74C 8024017C 4406D000 */ mfc1 $a2, $f26 /* D3A750 80240180 4407C000 */ mfc1 $a3, $f24 -/* D3A754 80240184 0C090010 */ jal func_80240040 +/* D3A754 80240184 0C090010 */ jal func_80240040_D3A610 /* D3A758 80240188 27A40010 */ addiu $a0, $sp, 0x10 /* D3A75C 8024018C 27A40010 */ addiu $a0, $sp, 0x10 /* D3A760 80240190 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802400B0_D3A680 /* D3A7D0 80240200 4405E000 */ mfc1 $a1, $f28 /* D3A7D4 80240204 4406D000 */ mfc1 $a2, $f26 /* D3A7D8 80240208 4407C000 */ mfc1 $a3, $f24 -/* D3A7DC 8024020C 0C090010 */ jal func_80240040 +/* D3A7DC 8024020C 0C090010 */ jal func_80240040_D3A610 /* D3A7E0 80240210 27A40010 */ addiu $a0, $sp, 0x10 /* D3A7E4 80240214 27A40010 */ addiu $a0, $sp, 0x10 /* D3A7E8 80240218 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580.s deleted file mode 100644 index 4e9d37adeb..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240580 -/* D3AB50 80240580 3C03800B */ lui $v1, %hi(gCameras) -/* D3AB54 80240584 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* D3AB58 80240588 94620002 */ lhu $v0, 2($v1) -/* D3AB5C 8024058C 34420001 */ ori $v0, $v0, 1 -/* D3AB60 80240590 A4620002 */ sh $v0, 2($v1) -/* D3AB64 80240594 03E00008 */ jr $ra -/* D3AB68 80240598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s new file mode 100644 index 0000000000..96c12a0374 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240580_D3AB50 +/* D3AB50 80240580 3C03800B */ lui $v1, %hi(gCameras) +/* D3AB54 80240584 24631D80 */ addiu $v1, $v1, %lo(gCameras) +/* D3AB58 80240588 94620002 */ lhu $v0, 2($v1) +/* D3AB5C 8024058C 34420001 */ ori $v0, $v0, 1 +/* D3AB60 80240590 A4620002 */ sh $v0, 2($v1) +/* D3AB64 80240594 03E00008 */ jr $ra +/* D3AB68 80240598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0.s deleted file mode 100644 index a6dab52d3f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407D0 -/* D3ADA0 802407D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3ADA4 802407D4 AFB00010 */ sw $s0, 0x10($sp) -/* D3ADA8 802407D8 3C108024 */ lui $s0, 0x8024 -/* D3ADAC 802407DC 26104F78 */ addiu $s0, $s0, 0x4f78 -/* D3ADB0 802407E0 AFBF0018 */ sw $ra, 0x18($sp) -/* D3ADB4 802407E4 AFB10014 */ sw $s1, 0x14($sp) -/* D3ADB8 802407E8 8E020000 */ lw $v0, ($s0) -/* D3ADBC 802407EC 14400010 */ bnez $v0, .L80240830 -/* D3ADC0 802407F0 0080882D */ daddu $s1, $a0, $zero -/* D3ADC4 802407F4 0C00AB39 */ jal heap_malloc -/* D3ADC8 802407F8 24040040 */ addiu $a0, $zero, 0x40 -/* D3ADCC 802407FC AE020000 */ sw $v0, ($s0) -/* D3ADD0 80240800 0000182D */ daddu $v1, $zero, $zero -/* D3ADD4 80240804 0040282D */ daddu $a1, $v0, $zero -/* D3ADD8 80240808 0220202D */ daddu $a0, $s1, $zero -.L8024080C: -/* D3ADDC 8024080C 8C820084 */ lw $v0, 0x84($a0) -/* D3ADE0 80240810 24840004 */ addiu $a0, $a0, 4 -/* D3ADE4 80240814 24630001 */ addiu $v1, $v1, 1 -/* D3ADE8 80240818 ACA20000 */ sw $v0, ($a1) -/* D3ADEC 8024081C 28620010 */ slti $v0, $v1, 0x10 -/* D3ADF0 80240820 1440FFFA */ bnez $v0, .L8024080C -/* D3ADF4 80240824 24A50004 */ addiu $a1, $a1, 4 -/* D3ADF8 80240828 0809021B */ j .L8024086C -/* D3ADFC 8024082C 00000000 */ nop -.L80240830: -/* D3AE00 80240830 0000182D */ daddu $v1, $zero, $zero -/* D3AE04 80240834 0040282D */ daddu $a1, $v0, $zero -/* D3AE08 80240838 0220202D */ daddu $a0, $s1, $zero -.L8024083C: -/* D3AE0C 8024083C 8CA20000 */ lw $v0, ($a1) -/* D3AE10 80240840 24A50004 */ addiu $a1, $a1, 4 -/* D3AE14 80240844 24630001 */ addiu $v1, $v1, 1 -/* D3AE18 80240848 AC820084 */ sw $v0, 0x84($a0) -/* D3AE1C 8024084C 28620010 */ slti $v0, $v1, 0x10 -/* D3AE20 80240850 1440FFFA */ bnez $v0, .L8024083C -/* D3AE24 80240854 24840004 */ addiu $a0, $a0, 4 -/* D3AE28 80240858 3C108024 */ lui $s0, 0x8024 -/* D3AE2C 8024085C 26104F78 */ addiu $s0, $s0, 0x4f78 -/* D3AE30 80240860 0C00AB4B */ jal heap_free -/* D3AE34 80240864 8E040000 */ lw $a0, ($s0) -/* D3AE38 80240868 AE000000 */ sw $zero, ($s0) -.L8024086C: -/* D3AE3C 8024086C 8FBF0018 */ lw $ra, 0x18($sp) -/* D3AE40 80240870 8FB10014 */ lw $s1, 0x14($sp) -/* D3AE44 80240874 8FB00010 */ lw $s0, 0x10($sp) -/* D3AE48 80240878 24020002 */ addiu $v0, $zero, 2 -/* D3AE4C 8024087C 03E00008 */ jr $ra -/* D3AE50 80240880 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s new file mode 100644 index 0000000000..714a1912a2 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802407D0_D3ADA0.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407D0_D3ADA0 +/* D3ADA0 802407D0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D3ADA4 802407D4 AFB00010 */ sw $s0, 0x10($sp) +/* D3ADA8 802407D8 3C108024 */ lui $s0, 0x8024 +/* D3ADAC 802407DC 26104F78 */ addiu $s0, $s0, 0x4f78 +/* D3ADB0 802407E0 AFBF0018 */ sw $ra, 0x18($sp) +/* D3ADB4 802407E4 AFB10014 */ sw $s1, 0x14($sp) +/* D3ADB8 802407E8 8E020000 */ lw $v0, ($s0) +/* D3ADBC 802407EC 14400010 */ bnez $v0, .L80240830 +/* D3ADC0 802407F0 0080882D */ daddu $s1, $a0, $zero +/* D3ADC4 802407F4 0C00AB39 */ jal heap_malloc +/* D3ADC8 802407F8 24040040 */ addiu $a0, $zero, 0x40 +/* D3ADCC 802407FC AE020000 */ sw $v0, ($s0) +/* D3ADD0 80240800 0000182D */ daddu $v1, $zero, $zero +/* D3ADD4 80240804 0040282D */ daddu $a1, $v0, $zero +/* D3ADD8 80240808 0220202D */ daddu $a0, $s1, $zero +.L8024080C: +/* D3ADDC 8024080C 8C820084 */ lw $v0, 0x84($a0) +/* D3ADE0 80240810 24840004 */ addiu $a0, $a0, 4 +/* D3ADE4 80240814 24630001 */ addiu $v1, $v1, 1 +/* D3ADE8 80240818 ACA20000 */ sw $v0, ($a1) +/* D3ADEC 8024081C 28620010 */ slti $v0, $v1, 0x10 +/* D3ADF0 80240820 1440FFFA */ bnez $v0, .L8024080C +/* D3ADF4 80240824 24A50004 */ addiu $a1, $a1, 4 +/* D3ADF8 80240828 0809021B */ j .L8024086C +/* D3ADFC 8024082C 00000000 */ nop +.L80240830: +/* D3AE00 80240830 0000182D */ daddu $v1, $zero, $zero +/* D3AE04 80240834 0040282D */ daddu $a1, $v0, $zero +/* D3AE08 80240838 0220202D */ daddu $a0, $s1, $zero +.L8024083C: +/* D3AE0C 8024083C 8CA20000 */ lw $v0, ($a1) +/* D3AE10 80240840 24A50004 */ addiu $a1, $a1, 4 +/* D3AE14 80240844 24630001 */ addiu $v1, $v1, 1 +/* D3AE18 80240848 AC820084 */ sw $v0, 0x84($a0) +/* D3AE1C 8024084C 28620010 */ slti $v0, $v1, 0x10 +/* D3AE20 80240850 1440FFFA */ bnez $v0, .L8024083C +/* D3AE24 80240854 24840004 */ addiu $a0, $a0, 4 +/* D3AE28 80240858 3C108024 */ lui $s0, 0x8024 +/* D3AE2C 8024085C 26104F78 */ addiu $s0, $s0, 0x4f78 +/* D3AE30 80240860 0C00AB4B */ jal heap_free +/* D3AE34 80240864 8E040000 */ lw $a0, ($s0) +/* D3AE38 80240868 AE000000 */ sw $zero, ($s0) +.L8024086C: +/* D3AE3C 8024086C 8FBF0018 */ lw $ra, 0x18($sp) +/* D3AE40 80240870 8FB10014 */ lw $s1, 0x14($sp) +/* D3AE44 80240874 8FB00010 */ lw $s0, 0x10($sp) +/* D3AE48 80240878 24020002 */ addiu $v0, $zero, 2 +/* D3AE4C 8024087C 03E00008 */ jr $ra +/* D3AE50 80240880 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C.s deleted file mode 100644 index b24d04c261..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C.s +++ /dev/null @@ -1,149 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024090C -/* D3AEDC 8024090C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D3AEE0 80240910 AFB10024 */ sw $s1, 0x24($sp) -/* D3AEE4 80240914 0080882D */ daddu $s1, $a0, $zero -/* D3AEE8 80240918 3C05F840 */ lui $a1, 0xf840 -/* D3AEEC 8024091C AFBF0044 */ sw $ra, 0x44($sp) -/* D3AEF0 80240920 AFBE0040 */ sw $fp, 0x40($sp) -/* D3AEF4 80240924 AFB7003C */ sw $s7, 0x3c($sp) -/* D3AEF8 80240928 AFB60038 */ sw $s6, 0x38($sp) -/* D3AEFC 8024092C AFB50034 */ sw $s5, 0x34($sp) -/* D3AF00 80240930 AFB40030 */ sw $s4, 0x30($sp) -/* D3AF04 80240934 AFB3002C */ sw $s3, 0x2c($sp) -/* D3AF08 80240938 AFB20028 */ sw $s2, 0x28($sp) -/* D3AF0C 8024093C AFB00020 */ sw $s0, 0x20($sp) -/* D3AF10 80240940 8E3E0148 */ lw $fp, 0x148($s1) -/* D3AF14 80240944 0C0B1EAF */ jal get_variable -/* D3AF18 80240948 34A56268 */ ori $a1, $a1, 0x6268 -/* D3AF1C 8024094C 0040802D */ daddu $s0, $v0, $zero -/* D3AF20 80240950 0220202D */ daddu $a0, $s1, $zero -/* D3AF24 80240954 3C05F840 */ lui $a1, 0xf840 -/* D3AF28 80240958 0C0B1EAF */ jal get_variable -/* D3AF2C 8024095C 34A56269 */ ori $a1, $a1, 0x6269 -/* D3AF30 80240960 0040B82D */ daddu $s7, $v0, $zero -/* D3AF34 80240964 0220202D */ daddu $a0, $s1, $zero -/* D3AF38 80240968 3C05F5DE */ lui $a1, 0xf5de -/* D3AF3C 8024096C 0C0B1EAF */ jal get_variable -/* D3AF40 80240970 34A502DE */ ori $a1, $a1, 0x2de -/* D3AF44 80240974 0040B02D */ daddu $s6, $v0, $zero -/* D3AF48 80240978 0220202D */ daddu $a0, $s1, $zero -/* D3AF4C 8024097C 3C05F5DE */ lui $a1, 0xf5de -/* D3AF50 80240980 0C0B1EAF */ jal get_variable -/* D3AF54 80240984 34A502DF */ ori $a1, $a1, 0x2df -/* D3AF58 80240988 0040A82D */ daddu $s5, $v0, $zero -/* D3AF5C 8024098C 93D3006D */ lbu $s3, 0x6d($fp) -/* D3AF60 80240990 32C2FFFF */ andi $v0, $s6, 0xffff -/* D3AF64 80240994 A7B30010 */ sh $s3, 0x10($sp) -/* D3AF68 80240998 93D2006E */ lbu $s2, 0x6e($fp) -/* D3AF6C 8024099C 93C7006F */ lbu $a3, 0x6f($fp) -/* D3AF70 802409A0 3274FFFF */ andi $s4, $s3, 0xffff -/* D3AF74 802409A4 12820003 */ beq $s4, $v0, .L802409B4 -/* D3AF78 802409A8 A7A7001E */ sh $a3, 0x1e($sp) -/* D3AF7C 802409AC 0000B82D */ daddu $s7, $zero, $zero -/* D3AF80 802409B0 02E0802D */ daddu $s0, $s7, $zero -.L802409B4: -/* D3AF84 802409B4 3202FFFF */ andi $v0, $s0, 0xffff -/* D3AF88 802409B8 14400016 */ bnez $v0, .L80240A14 -/* D3AF8C 802409BC 0220202D */ daddu $a0, $s1, $zero -/* D3AF90 802409C0 0C00A67F */ jal rand_int -/* D3AF94 802409C4 24040064 */ addiu $a0, $zero, 0x64 -/* D3AF98 802409C8 2842001E */ slti $v0, $v0, 0x1e -/* D3AF9C 802409CC 10400011 */ beqz $v0, .L80240A14 -/* D3AFA0 802409D0 0220202D */ daddu $a0, $s1, $zero -/* D3AFA4 802409D4 0C00A67F */ jal rand_int -/* D3AFA8 802409D8 2644FFFF */ addiu $a0, $s2, -1 -/* D3AFAC 802409DC 0040A82D */ daddu $s5, $v0, $zero -/* D3AFB0 802409E0 0260B02D */ daddu $s6, $s3, $zero -/* D3AFB4 802409E4 0220202D */ daddu $a0, $s1, $zero -/* D3AFB8 802409E8 3C05F5DE */ lui $a1, 0xf5de -/* D3AFBC 802409EC 34A502DE */ ori $a1, $a1, 0x2de -/* D3AFC0 802409F0 0C0B2026 */ jal set_variable -/* D3AFC4 802409F4 0280302D */ daddu $a2, $s4, $zero -/* D3AFC8 802409F8 0220202D */ daddu $a0, $s1, $zero -/* D3AFCC 802409FC 3C05F5DE */ lui $a1, 0xf5de -/* D3AFD0 80240A00 34A502DF */ ori $a1, $a1, 0x2df -/* D3AFD4 80240A04 0C0B2026 */ jal set_variable -/* D3AFD8 80240A08 32A6FFFF */ andi $a2, $s5, 0xffff -/* D3AFDC 80240A0C 24100001 */ addiu $s0, $zero, 1 -/* D3AFE0 80240A10 0220202D */ daddu $a0, $s1, $zero -.L80240A14: -/* D3AFE4 80240A14 3C05F840 */ lui $a1, 0xf840 -/* D3AFE8 80240A18 34A56268 */ ori $a1, $a1, 0x6268 -/* D3AFEC 80240A1C 0C0B2026 */ jal set_variable -/* D3AFF0 80240A20 3206FFFF */ andi $a2, $s0, 0xffff -/* D3AFF4 80240A24 0220202D */ daddu $a0, $s1, $zero -/* D3AFF8 80240A28 3C05F840 */ lui $a1, 0xf840 -/* D3AFFC 80240A2C 34A56269 */ ori $a1, $a1, 0x6269 -/* D3B000 80240A30 0C0B2026 */ jal set_variable -/* D3B004 80240A34 32E6FFFF */ andi $a2, $s7, 0xffff -/* D3B008 80240A38 0000202D */ daddu $a0, $zero, $zero -/* D3B00C 80240A3C 3C05F5DE */ lui $a1, 0xf5de -/* D3B010 80240A40 0C0B1EAF */ jal get_variable -/* D3B014 80240A44 34A502E0 */ ori $a1, $a1, 0x2e0 -/* D3B018 80240A48 0000202D */ daddu $a0, $zero, $zero -/* D3B01C 80240A4C 3C05F5DE */ lui $a1, 0xf5de -/* D3B020 80240A50 34A50180 */ ori $a1, $a1, 0x180 -/* D3B024 80240A54 0C0B1EAF */ jal get_variable -/* D3B028 80240A58 0040802D */ daddu $s0, $v0, $zero -/* D3B02C 80240A5C 0040282D */ daddu $a1, $v0, $zero -/* D3B030 80240A60 0000182D */ daddu $v1, $zero, $zero -/* D3B034 80240A64 3C068024 */ lui $a2, 0x8024 -/* D3B038 80240A68 24C6501C */ addiu $a2, $a2, 0x501c -/* D3B03C 80240A6C 00C0202D */ daddu $a0, $a2, $zero -.L80240A70: -/* D3B040 80240A70 8C820000 */ lw $v0, ($a0) -/* D3B044 80240A74 00A2102A */ slt $v0, $a1, $v0 -/* D3B048 80240A78 14400006 */ bnez $v0, .L80240A94 -/* D3B04C 80240A7C 000310C0 */ sll $v0, $v1, 3 -/* D3B050 80240A80 24630001 */ addiu $v1, $v1, 1 -/* D3B054 80240A84 28620008 */ slti $v0, $v1, 8 -/* D3B058 80240A88 1440FFF9 */ bnez $v0, .L80240A70 -/* D3B05C 80240A8C 24840008 */ addiu $a0, $a0, 8 -/* D3B060 80240A90 000310C0 */ sll $v0, $v1, 3 -.L80240A94: -/* D3B064 80240A94 00461021 */ addu $v0, $v0, $a2 -/* D3B068 80240A98 8C420004 */ lw $v0, 4($v0) -/* D3B06C 80240A9C 97A30010 */ lhu $v1, 0x10($sp) -/* D3B070 80240AA0 0202202A */ slt $a0, $s0, $v0 -/* D3B074 80240AA4 32C2FFFF */ andi $v0, $s6, 0xffff -/* D3B078 80240AA8 14620008 */ bne $v1, $v0, .L80240ACC -/* D3B07C 80240AAC 32A2FFFF */ andi $v0, $s5, 0xffff -/* D3B080 80240AB0 97A7001E */ lhu $a3, 0x1e($sp) -/* D3B084 80240AB4 14E20005 */ bne $a3, $v0, .L80240ACC -/* D3B088 80240AB8 32E2FFFF */ andi $v0, $s7, 0xffff -/* D3B08C 80240ABC 14400003 */ bnez $v0, .L80240ACC -/* D3B090 80240AC0 00000000 */ nop -/* D3B094 80240AC4 14800008 */ bnez $a0, .L80240AE8 -/* D3B098 80240AC8 24020001 */ addiu $v0, $zero, 1 -.L80240ACC: -/* D3B09C 80240ACC 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* D3B0A0 80240AD0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* D3B0A4 80240AD4 80420075 */ lb $v0, 0x75($v0) -/* D3B0A8 80240AD8 10400005 */ beqz $v0, .L80240AF0 -/* D3B0AC 80240ADC 00000000 */ nop -/* D3B0B0 80240AE0 10800003 */ beqz $a0, .L80240AF0 -/* D3B0B4 80240AE4 24020001 */ addiu $v0, $zero, 1 -.L80240AE8: -/* D3B0B8 80240AE8 080902BF */ j .L80240AFC -/* D3B0BC 80240AEC AE220084 */ sw $v0, 0x84($s1) -.L80240AF0: -/* D3B0C0 80240AF0 0C00F9EB */ jal kill_enemy -/* D3B0C4 80240AF4 03C0202D */ daddu $a0, $fp, $zero -/* D3B0C8 80240AF8 AE200084 */ sw $zero, 0x84($s1) -.L80240AFC: -/* D3B0CC 80240AFC 8FBF0044 */ lw $ra, 0x44($sp) -/* D3B0D0 80240B00 8FBE0040 */ lw $fp, 0x40($sp) -/* D3B0D4 80240B04 8FB7003C */ lw $s7, 0x3c($sp) -/* D3B0D8 80240B08 8FB60038 */ lw $s6, 0x38($sp) -/* D3B0DC 80240B0C 8FB50034 */ lw $s5, 0x34($sp) -/* D3B0E0 80240B10 8FB40030 */ lw $s4, 0x30($sp) -/* D3B0E4 80240B14 8FB3002C */ lw $s3, 0x2c($sp) -/* D3B0E8 80240B18 8FB20028 */ lw $s2, 0x28($sp) -/* D3B0EC 80240B1C 8FB10024 */ lw $s1, 0x24($sp) -/* D3B0F0 80240B20 8FB00020 */ lw $s0, 0x20($sp) -/* D3B0F4 80240B24 24020002 */ addiu $v0, $zero, 2 -/* D3B0F8 80240B28 03E00008 */ jr $ra -/* D3B0FC 80240B2C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s new file mode 100644 index 0000000000..d797b24a9e --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024090C_D3AEDC.s @@ -0,0 +1,149 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024090C_D3AEDC +/* D3AEDC 8024090C 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* D3AEE0 80240910 AFB10024 */ sw $s1, 0x24($sp) +/* D3AEE4 80240914 0080882D */ daddu $s1, $a0, $zero +/* D3AEE8 80240918 3C05F840 */ lui $a1, 0xf840 +/* D3AEEC 8024091C AFBF0044 */ sw $ra, 0x44($sp) +/* D3AEF0 80240920 AFBE0040 */ sw $fp, 0x40($sp) +/* D3AEF4 80240924 AFB7003C */ sw $s7, 0x3c($sp) +/* D3AEF8 80240928 AFB60038 */ sw $s6, 0x38($sp) +/* D3AEFC 8024092C AFB50034 */ sw $s5, 0x34($sp) +/* D3AF00 80240930 AFB40030 */ sw $s4, 0x30($sp) +/* D3AF04 80240934 AFB3002C */ sw $s3, 0x2c($sp) +/* D3AF08 80240938 AFB20028 */ sw $s2, 0x28($sp) +/* D3AF0C 8024093C AFB00020 */ sw $s0, 0x20($sp) +/* D3AF10 80240940 8E3E0148 */ lw $fp, 0x148($s1) +/* D3AF14 80240944 0C0B1EAF */ jal get_variable +/* D3AF18 80240948 34A56268 */ ori $a1, $a1, 0x6268 +/* D3AF1C 8024094C 0040802D */ daddu $s0, $v0, $zero +/* D3AF20 80240950 0220202D */ daddu $a0, $s1, $zero +/* D3AF24 80240954 3C05F840 */ lui $a1, 0xf840 +/* D3AF28 80240958 0C0B1EAF */ jal get_variable +/* D3AF2C 8024095C 34A56269 */ ori $a1, $a1, 0x6269 +/* D3AF30 80240960 0040B82D */ daddu $s7, $v0, $zero +/* D3AF34 80240964 0220202D */ daddu $a0, $s1, $zero +/* D3AF38 80240968 3C05F5DE */ lui $a1, 0xf5de +/* D3AF3C 8024096C 0C0B1EAF */ jal get_variable +/* D3AF40 80240970 34A502DE */ ori $a1, $a1, 0x2de +/* D3AF44 80240974 0040B02D */ daddu $s6, $v0, $zero +/* D3AF48 80240978 0220202D */ daddu $a0, $s1, $zero +/* D3AF4C 8024097C 3C05F5DE */ lui $a1, 0xf5de +/* D3AF50 80240980 0C0B1EAF */ jal get_variable +/* D3AF54 80240984 34A502DF */ ori $a1, $a1, 0x2df +/* D3AF58 80240988 0040A82D */ daddu $s5, $v0, $zero +/* D3AF5C 8024098C 93D3006D */ lbu $s3, 0x6d($fp) +/* D3AF60 80240990 32C2FFFF */ andi $v0, $s6, 0xffff +/* D3AF64 80240994 A7B30010 */ sh $s3, 0x10($sp) +/* D3AF68 80240998 93D2006E */ lbu $s2, 0x6e($fp) +/* D3AF6C 8024099C 93C7006F */ lbu $a3, 0x6f($fp) +/* D3AF70 802409A0 3274FFFF */ andi $s4, $s3, 0xffff +/* D3AF74 802409A4 12820003 */ beq $s4, $v0, .L802409B4 +/* D3AF78 802409A8 A7A7001E */ sh $a3, 0x1e($sp) +/* D3AF7C 802409AC 0000B82D */ daddu $s7, $zero, $zero +/* D3AF80 802409B0 02E0802D */ daddu $s0, $s7, $zero +.L802409B4: +/* D3AF84 802409B4 3202FFFF */ andi $v0, $s0, 0xffff +/* D3AF88 802409B8 14400016 */ bnez $v0, .L80240A14 +/* D3AF8C 802409BC 0220202D */ daddu $a0, $s1, $zero +/* D3AF90 802409C0 0C00A67F */ jal rand_int +/* D3AF94 802409C4 24040064 */ addiu $a0, $zero, 0x64 +/* D3AF98 802409C8 2842001E */ slti $v0, $v0, 0x1e +/* D3AF9C 802409CC 10400011 */ beqz $v0, .L80240A14 +/* D3AFA0 802409D0 0220202D */ daddu $a0, $s1, $zero +/* D3AFA4 802409D4 0C00A67F */ jal rand_int +/* D3AFA8 802409D8 2644FFFF */ addiu $a0, $s2, -1 +/* D3AFAC 802409DC 0040A82D */ daddu $s5, $v0, $zero +/* D3AFB0 802409E0 0260B02D */ daddu $s6, $s3, $zero +/* D3AFB4 802409E4 0220202D */ daddu $a0, $s1, $zero +/* D3AFB8 802409E8 3C05F5DE */ lui $a1, 0xf5de +/* D3AFBC 802409EC 34A502DE */ ori $a1, $a1, 0x2de +/* D3AFC0 802409F0 0C0B2026 */ jal set_variable +/* D3AFC4 802409F4 0280302D */ daddu $a2, $s4, $zero +/* D3AFC8 802409F8 0220202D */ daddu $a0, $s1, $zero +/* D3AFCC 802409FC 3C05F5DE */ lui $a1, 0xf5de +/* D3AFD0 80240A00 34A502DF */ ori $a1, $a1, 0x2df +/* D3AFD4 80240A04 0C0B2026 */ jal set_variable +/* D3AFD8 80240A08 32A6FFFF */ andi $a2, $s5, 0xffff +/* D3AFDC 80240A0C 24100001 */ addiu $s0, $zero, 1 +/* D3AFE0 80240A10 0220202D */ daddu $a0, $s1, $zero +.L80240A14: +/* D3AFE4 80240A14 3C05F840 */ lui $a1, 0xf840 +/* D3AFE8 80240A18 34A56268 */ ori $a1, $a1, 0x6268 +/* D3AFEC 80240A1C 0C0B2026 */ jal set_variable +/* D3AFF0 80240A20 3206FFFF */ andi $a2, $s0, 0xffff +/* D3AFF4 80240A24 0220202D */ daddu $a0, $s1, $zero +/* D3AFF8 80240A28 3C05F840 */ lui $a1, 0xf840 +/* D3AFFC 80240A2C 34A56269 */ ori $a1, $a1, 0x6269 +/* D3B000 80240A30 0C0B2026 */ jal set_variable +/* D3B004 80240A34 32E6FFFF */ andi $a2, $s7, 0xffff +/* D3B008 80240A38 0000202D */ daddu $a0, $zero, $zero +/* D3B00C 80240A3C 3C05F5DE */ lui $a1, 0xf5de +/* D3B010 80240A40 0C0B1EAF */ jal get_variable +/* D3B014 80240A44 34A502E0 */ ori $a1, $a1, 0x2e0 +/* D3B018 80240A48 0000202D */ daddu $a0, $zero, $zero +/* D3B01C 80240A4C 3C05F5DE */ lui $a1, 0xf5de +/* D3B020 80240A50 34A50180 */ ori $a1, $a1, 0x180 +/* D3B024 80240A54 0C0B1EAF */ jal get_variable +/* D3B028 80240A58 0040802D */ daddu $s0, $v0, $zero +/* D3B02C 80240A5C 0040282D */ daddu $a1, $v0, $zero +/* D3B030 80240A60 0000182D */ daddu $v1, $zero, $zero +/* D3B034 80240A64 3C068024 */ lui $a2, 0x8024 +/* D3B038 80240A68 24C6501C */ addiu $a2, $a2, 0x501c +/* D3B03C 80240A6C 00C0202D */ daddu $a0, $a2, $zero +.L80240A70: +/* D3B040 80240A70 8C820000 */ lw $v0, ($a0) +/* D3B044 80240A74 00A2102A */ slt $v0, $a1, $v0 +/* D3B048 80240A78 14400006 */ bnez $v0, .L80240A94 +/* D3B04C 80240A7C 000310C0 */ sll $v0, $v1, 3 +/* D3B050 80240A80 24630001 */ addiu $v1, $v1, 1 +/* D3B054 80240A84 28620008 */ slti $v0, $v1, 8 +/* D3B058 80240A88 1440FFF9 */ bnez $v0, .L80240A70 +/* D3B05C 80240A8C 24840008 */ addiu $a0, $a0, 8 +/* D3B060 80240A90 000310C0 */ sll $v0, $v1, 3 +.L80240A94: +/* D3B064 80240A94 00461021 */ addu $v0, $v0, $a2 +/* D3B068 80240A98 8C420004 */ lw $v0, 4($v0) +/* D3B06C 80240A9C 97A30010 */ lhu $v1, 0x10($sp) +/* D3B070 80240AA0 0202202A */ slt $a0, $s0, $v0 +/* D3B074 80240AA4 32C2FFFF */ andi $v0, $s6, 0xffff +/* D3B078 80240AA8 14620008 */ bne $v1, $v0, .L80240ACC +/* D3B07C 80240AAC 32A2FFFF */ andi $v0, $s5, 0xffff +/* D3B080 80240AB0 97A7001E */ lhu $a3, 0x1e($sp) +/* D3B084 80240AB4 14E20005 */ bne $a3, $v0, .L80240ACC +/* D3B088 80240AB8 32E2FFFF */ andi $v0, $s7, 0xffff +/* D3B08C 80240ABC 14400003 */ bnez $v0, .L80240ACC +/* D3B090 80240AC0 00000000 */ nop +/* D3B094 80240AC4 14800008 */ bnez $a0, .L80240AE8 +/* D3B098 80240AC8 24020001 */ addiu $v0, $zero, 1 +.L80240ACC: +/* D3B09C 80240ACC 3C028007 */ lui $v0, %hi(gGameStatusPtr) +/* D3B0A0 80240AD0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) +/* D3B0A4 80240AD4 80420075 */ lb $v0, 0x75($v0) +/* D3B0A8 80240AD8 10400005 */ beqz $v0, .L80240AF0 +/* D3B0AC 80240ADC 00000000 */ nop +/* D3B0B0 80240AE0 10800003 */ beqz $a0, .L80240AF0 +/* D3B0B4 80240AE4 24020001 */ addiu $v0, $zero, 1 +.L80240AE8: +/* D3B0B8 80240AE8 080902BF */ j .L80240AFC +/* D3B0BC 80240AEC AE220084 */ sw $v0, 0x84($s1) +.L80240AF0: +/* D3B0C0 80240AF0 0C00F9EB */ jal kill_enemy +/* D3B0C4 80240AF4 03C0202D */ daddu $a0, $fp, $zero +/* D3B0C8 80240AF8 AE200084 */ sw $zero, 0x84($s1) +.L80240AFC: +/* D3B0CC 80240AFC 8FBF0044 */ lw $ra, 0x44($sp) +/* D3B0D0 80240B00 8FBE0040 */ lw $fp, 0x40($sp) +/* D3B0D4 80240B04 8FB7003C */ lw $s7, 0x3c($sp) +/* D3B0D8 80240B08 8FB60038 */ lw $s6, 0x38($sp) +/* D3B0DC 80240B0C 8FB50034 */ lw $s5, 0x34($sp) +/* D3B0E0 80240B10 8FB40030 */ lw $s4, 0x30($sp) +/* D3B0E4 80240B14 8FB3002C */ lw $s3, 0x2c($sp) +/* D3B0E8 80240B18 8FB20028 */ lw $s2, 0x28($sp) +/* D3B0EC 80240B1C 8FB10024 */ lw $s1, 0x24($sp) +/* D3B0F0 80240B20 8FB00020 */ lw $s0, 0x20($sp) +/* D3B0F4 80240B24 24020002 */ addiu $v0, $zero, 2 +/* D3B0F8 80240B28 03E00008 */ jr $ra +/* D3B0FC 80240B2C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C.s deleted file mode 100644 index 8068efe716..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B7C -/* D3B14C 80240B7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3B150 80240B80 AFBF0010 */ sw $ra, 0x10($sp) -/* D3B154 80240B84 0C00EABB */ jal get_npc_unsafe -/* D3B158 80240B88 8C84014C */ lw $a0, 0x14c($a0) -/* D3B15C 80240B8C 8FBF0010 */ lw $ra, 0x10($sp) -/* D3B160 80240B90 0000102D */ daddu $v0, $zero, $zero -/* D3B164 80240B94 03E00008 */ jr $ra -/* D3B168 80240B98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s new file mode 100644 index 0000000000..d9ad763d88 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B7C_D3B14C +/* D3B14C 80240B7C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D3B150 80240B80 AFBF0010 */ sw $ra, 0x10($sp) +/* D3B154 80240B84 0C00EABB */ jal get_npc_unsafe +/* D3B158 80240B88 8C84014C */ lw $a0, 0x14c($a0) +/* D3B15C 80240B8C 8FBF0010 */ lw $ra, 0x10($sp) +/* D3B160 80240B90 0000102D */ daddu $v0, $zero, $zero +/* D3B164 80240B94 03E00008 */ jr $ra +/* D3B168 80240B98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C.s deleted file mode 100644 index f6a1f5b842..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024120C -/* D3B7DC 8024120C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3B7E0 80241210 AFBF0010 */ sw $ra, 0x10($sp) -/* D3B7E4 80241214 8C82000C */ lw $v0, 0xc($a0) -/* D3B7E8 80241218 0C0B1EAF */ jal get_variable -/* D3B7EC 8024121C 8C450000 */ lw $a1, ($v0) -/* D3B7F0 80241220 3C038025 */ lui $v1, 0x8025 -/* D3B7F4 80241224 8C631470 */ lw $v1, 0x1470($v1) -/* D3B7F8 80241228 8C63000C */ lw $v1, 0xc($v1) -/* D3B7FC 8024122C AC620034 */ sw $v0, 0x34($v1) -/* D3B800 80241230 8FBF0010 */ lw $ra, 0x10($sp) -/* D3B804 80241234 24020002 */ addiu $v0, $zero, 2 -/* D3B808 80241238 03E00008 */ jr $ra -/* D3B80C 8024123C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C_D3B7DC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C_D3B7DC.s new file mode 100644 index 0000000000..e22e1314c8 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024120C_D3B7DC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024120C_D3B7DC +/* D3B7DC 8024120C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D3B7E0 80241210 AFBF0010 */ sw $ra, 0x10($sp) +/* D3B7E4 80241214 8C82000C */ lw $v0, 0xc($a0) +/* D3B7E8 80241218 0C0B1EAF */ jal get_variable +/* D3B7EC 8024121C 8C450000 */ lw $a1, ($v0) +/* D3B7F0 80241220 3C038025 */ lui $v1, 0x8025 +/* D3B7F4 80241224 8C631470 */ lw $v1, 0x1470($v1) +/* D3B7F8 80241228 8C63000C */ lw $v1, 0xc($v1) +/* D3B7FC 8024122C AC620034 */ sw $v0, 0x34($v1) +/* D3B800 80241230 8FBF0010 */ lw $ra, 0x10($sp) +/* D3B804 80241234 24020002 */ addiu $v0, $zero, 2 +/* D3B808 80241238 03E00008 */ jr $ra +/* D3B80C 8024123C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240.s deleted file mode 100644 index a7b745e5a8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240.s +++ /dev/null @@ -1,41 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241240 -/* D3B810 80241240 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3B814 80241244 AFBF0010 */ sw $ra, 0x10($sp) -/* D3B818 80241248 8C82000C */ lw $v0, 0xc($a0) -/* D3B81C 8024124C 0C0B1EAF */ jal get_variable -/* D3B820 80241250 8C450000 */ lw $a1, ($v0) -/* D3B824 80241254 0040202D */ daddu $a0, $v0, $zero -/* D3B828 80241258 3C028025 */ lui $v0, 0x8025 -/* D3B82C 8024125C 8C421470 */ lw $v0, 0x1470($v0) -/* D3B830 80241260 24030001 */ addiu $v1, $zero, 1 -/* D3B834 80241264 8C45000C */ lw $a1, 0xc($v0) -/* D3B838 80241268 1083000D */ beq $a0, $v1, .L802412A0 -/* D3B83C 8024126C 28820002 */ slti $v0, $a0, 2 -/* D3B840 80241270 10400005 */ beqz $v0, .L80241288 -/* D3B844 80241274 24020002 */ addiu $v0, $zero, 2 -/* D3B848 80241278 10800007 */ beqz $a0, .L80241298 -/* D3B84C 8024127C 240200C0 */ addiu $v0, $zero, 0xc0 -/* D3B850 80241280 080904AC */ j .L802412B0 -/* D3B854 80241284 ACA00038 */ sw $zero, 0x38($a1) -.L80241288: -/* D3B858 80241288 10820008 */ beq $a0, $v0, .L802412AC -/* D3B85C 8024128C 24020040 */ addiu $v0, $zero, 0x40 -/* D3B860 80241290 080904AC */ j .L802412B0 -/* D3B864 80241294 ACA00038 */ sw $zero, 0x38($a1) -.L80241298: -/* D3B868 80241298 080904AC */ j .L802412B0 -/* D3B86C 8024129C ACA20038 */ sw $v0, 0x38($a1) -.L802412A0: -/* D3B870 802412A0 24020080 */ addiu $v0, $zero, 0x80 -/* D3B874 802412A4 080904AC */ j .L802412B0 -/* D3B878 802412A8 ACA20038 */ sw $v0, 0x38($a1) -.L802412AC: -/* D3B87C 802412AC ACA20038 */ sw $v0, 0x38($a1) -.L802412B0: -/* D3B880 802412B0 8FBF0010 */ lw $ra, 0x10($sp) -/* D3B884 802412B4 24020002 */ addiu $v0, $zero, 2 -/* D3B888 802412B8 03E00008 */ jr $ra -/* D3B88C 802412BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240_D3B810.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240_D3B810.s new file mode 100644 index 0000000000..ee0cd0c0b3 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241240_D3B810.s @@ -0,0 +1,41 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241240_D3B810 +/* D3B810 80241240 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D3B814 80241244 AFBF0010 */ sw $ra, 0x10($sp) +/* D3B818 80241248 8C82000C */ lw $v0, 0xc($a0) +/* D3B81C 8024124C 0C0B1EAF */ jal get_variable +/* D3B820 80241250 8C450000 */ lw $a1, ($v0) +/* D3B824 80241254 0040202D */ daddu $a0, $v0, $zero +/* D3B828 80241258 3C028025 */ lui $v0, 0x8025 +/* D3B82C 8024125C 8C421470 */ lw $v0, 0x1470($v0) +/* D3B830 80241260 24030001 */ addiu $v1, $zero, 1 +/* D3B834 80241264 8C45000C */ lw $a1, 0xc($v0) +/* D3B838 80241268 1083000D */ beq $a0, $v1, .L802412A0 +/* D3B83C 8024126C 28820002 */ slti $v0, $a0, 2 +/* D3B840 80241270 10400005 */ beqz $v0, .L80241288 +/* D3B844 80241274 24020002 */ addiu $v0, $zero, 2 +/* D3B848 80241278 10800007 */ beqz $a0, .L80241298 +/* D3B84C 8024127C 240200C0 */ addiu $v0, $zero, 0xc0 +/* D3B850 80241280 080904AC */ j .L802412B0 +/* D3B854 80241284 ACA00038 */ sw $zero, 0x38($a1) +.L80241288: +/* D3B858 80241288 10820008 */ beq $a0, $v0, .L802412AC +/* D3B85C 8024128C 24020040 */ addiu $v0, $zero, 0x40 +/* D3B860 80241290 080904AC */ j .L802412B0 +/* D3B864 80241294 ACA00038 */ sw $zero, 0x38($a1) +.L80241298: +/* D3B868 80241298 080904AC */ j .L802412B0 +/* D3B86C 8024129C ACA20038 */ sw $v0, 0x38($a1) +.L802412A0: +/* D3B870 802412A0 24020080 */ addiu $v0, $zero, 0x80 +/* D3B874 802412A4 080904AC */ j .L802412B0 +/* D3B878 802412A8 ACA20038 */ sw $v0, 0x38($a1) +.L802412AC: +/* D3B87C 802412AC ACA20038 */ sw $v0, 0x38($a1) +.L802412B0: +/* D3B880 802412B0 8FBF0010 */ lw $ra, 0x10($sp) +/* D3B884 802412B4 24020002 */ addiu $v0, $zero, 2 +/* D3B888 802412B8 03E00008 */ jr $ra +/* D3B88C 802412BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834.s deleted file mode 100644 index 4f1537ac59..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241834 -/* D3BE04 80241834 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3BE08 80241838 3C058024 */ lui $a1, 0x8024 -/* D3BE0C 8024183C 24A517C8 */ addiu $a1, $a1, 0x17c8 -/* D3BE10 80241840 AFBF0010 */ sw $ra, 0x10($sp) -/* D3BE14 80241844 0C048C8F */ jal bind_dynamic_entity_7 -/* D3BE18 80241848 0000202D */ daddu $a0, $zero, $zero -/* D3BE1C 8024184C 8FBF0010 */ lw $ra, 0x10($sp) -/* D3BE20 80241850 3C018025 */ lui $at, 0x8025 -/* D3BE24 80241854 AC221450 */ sw $v0, 0x1450($at) -/* D3BE28 80241858 24020002 */ addiu $v0, $zero, 2 -/* D3BE2C 8024185C 03E00008 */ jr $ra -/* D3BE30 80241860 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s new file mode 100644 index 0000000000..1b9bb018f6 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241834_D3BE04.s @@ -0,0 +1,16 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241834_D3BE04 +/* D3BE04 80241834 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D3BE08 80241838 3C058024 */ lui $a1, 0x8024 +/* D3BE0C 8024183C 24A517C8 */ addiu $a1, $a1, 0x17c8 +/* D3BE10 80241840 AFBF0010 */ sw $ra, 0x10($sp) +/* D3BE14 80241844 0C048C8F */ jal bind_dynamic_entity_7 +/* D3BE18 80241848 0000202D */ daddu $a0, $zero, $zero +/* D3BE1C 8024184C 8FBF0010 */ lw $ra, 0x10($sp) +/* D3BE20 80241850 3C018025 */ lui $at, 0x8025 +/* D3BE24 80241854 AC221450 */ sw $v0, 0x1450($at) +/* D3BE28 80241858 24020002 */ addiu $v0, $zero, 2 +/* D3BE2C 8024185C 03E00008 */ jr $ra +/* D3BE30 80241860 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4.s deleted file mode 100644 index 6d96bb57a6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418B4 -/* D3BE84 802418B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3BE88 802418B8 AFB00010 */ sw $s0, 0x10($sp) -/* D3BE8C 802418BC 0080802D */ daddu $s0, $a0, $zero -/* D3BE90 802418C0 24040001 */ addiu $a0, $zero, 1 -/* D3BE94 802418C4 AFBF001C */ sw $ra, 0x1c($sp) -/* D3BE98 802418C8 AFB20018 */ sw $s2, 0x18($sp) -/* D3BE9C 802418CC 0C00EAD2 */ jal get_npc_safe -/* D3BEA0 802418D0 AFB10014 */ sw $s1, 0x14($sp) -/* D3BEA4 802418D4 0040882D */ daddu $s1, $v0, $zero -/* D3BEA8 802418D8 3C128011 */ lui $s2, %hi(gPlayerStatus) -/* D3BEAC 802418DC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) -/* D3BEB0 802418E0 C60200AC */ lwc1 $f2, 0xac($s0) -/* D3BEB4 802418E4 C6200040 */ lwc1 $f0, 0x40($s1) -/* D3BEB8 802418E8 46001032 */ c.eq.s $f2, $f0 -/* D3BEBC 802418EC 00000000 */ nop -/* D3BEC0 802418F0 45000006 */ bc1f .L8024190C -/* D3BEC4 802418F4 261000AC */ addiu $s0, $s0, 0xac -/* D3BEC8 802418F8 3C03009A */ lui $v1, 0x9a -/* D3BECC 802418FC 8E220028 */ lw $v0, 0x28($s1) -/* D3BED0 80241900 34630001 */ ori $v1, $v1, 1 -/* D3BED4 80241904 54430001 */ bnel $v0, $v1, .L8024190C -/* D3BED8 80241908 AE230028 */ sw $v1, 0x28($s1) -.L8024190C: -/* D3BEDC 8024190C C6020000 */ lwc1 $f2, ($s0) -/* D3BEE0 80241910 C6200040 */ lwc1 $f0, 0x40($s1) -/* D3BEE4 80241914 46001032 */ c.eq.s $f2, $f0 -/* D3BEE8 80241918 00000000 */ nop -/* D3BEEC 8024191C 45030008 */ bc1tl .L80241940 -/* D3BEF0 80241920 E6000000 */ swc1 $f0, ($s0) -/* D3BEF4 80241924 3C03009A */ lui $v1, 0x9a -/* D3BEF8 80241928 8E220028 */ lw $v0, 0x28($s1) -/* D3BEFC 8024192C 34630002 */ ori $v1, $v1, 2 -/* D3BF00 80241930 54430001 */ bnel $v0, $v1, .L80241938 -/* D3BF04 80241934 AE230028 */ sw $v1, 0x28($s1) -.L80241938: -/* D3BF08 80241938 C6200040 */ lwc1 $f0, 0x40($s1) -/* D3BF0C 8024193C E6000000 */ swc1 $f0, ($s0) -.L80241940: -/* D3BF10 80241940 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D3BF14 80241944 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D3BF18 80241948 8E460028 */ lw $a2, 0x28($s2) -/* D3BF1C 8024194C 0C00A7B5 */ jal dist2D -/* D3BF20 80241950 8E470030 */ lw $a3, 0x30($s2) -/* D3BF24 80241954 3C0141F0 */ lui $at, 0x41f0 -/* D3BF28 80241958 44811000 */ mtc1 $at, $f2 -/* D3BF2C 8024195C 00000000 */ nop -/* D3BF30 80241960 4602003C */ c.lt.s $f0, $f2 -/* D3BF34 80241964 00000000 */ nop -/* D3BF38 80241968 4501003A */ bc1t .L80241A54 -/* D3BF3C 8024196C 24020002 */ addiu $v0, $zero, 2 -/* D3BF40 80241970 C62C0038 */ lwc1 $f12, 0x38($s1) -/* D3BF44 80241974 C62E0040 */ lwc1 $f14, 0x40($s1) -/* D3BF48 80241978 8E460028 */ lw $a2, 0x28($s2) -/* D3BF4C 8024197C 0C00A7B5 */ jal dist2D -/* D3BF50 80241980 8E470030 */ lw $a3, 0x30($s2) -/* D3BF54 80241984 3C014302 */ lui $at, 0x4302 -/* D3BF58 80241988 44811000 */ mtc1 $at, $f2 -/* D3BF5C 8024198C 00000000 */ nop -/* D3BF60 80241990 4600103C */ c.lt.s $f2, $f0 -/* D3BF64 80241994 00000000 */ nop -/* D3BF68 80241998 4501002E */ bc1t .L80241A54 -/* D3BF6C 8024199C 24020002 */ addiu $v0, $zero, 2 -/* D3BF70 802419A0 C6420030 */ lwc1 $f2, 0x30($s2) -/* D3BF74 802419A4 3C014248 */ lui $at, 0x4248 -/* D3BF78 802419A8 44812000 */ mtc1 $at, $f4 -/* D3BF7C 802419AC 00000000 */ nop -/* D3BF80 802419B0 4602203C */ c.lt.s $f4, $f2 -/* D3BF84 802419B4 00000000 */ nop -/* D3BF88 802419B8 45000002 */ bc1f .L802419C4 -/* D3BF8C 802419BC 46001006 */ mov.s $f0, $f2 -/* D3BF90 802419C0 46002086 */ mov.s $f2, $f4 -.L802419C4: -/* D3BF94 802419C4 3C01C220 */ lui $at, 0xc220 -/* D3BF98 802419C8 44812000 */ mtc1 $at, $f4 -/* D3BF9C 802419CC 00000000 */ nop -/* D3BFA0 802419D0 4604003C */ c.lt.s $f0, $f4 -/* D3BFA4 802419D4 00000000 */ nop -/* D3BFA8 802419D8 45030001 */ bc1tl .L802419E0 -/* D3BFAC 802419DC 46002086 */ mov.s $f2, $f4 -.L802419E0: -/* D3BFB0 802419E0 C6240040 */ lwc1 $f4, 0x40($s1) -/* D3BFB4 802419E4 4602203E */ c.le.s $f4, $f2 -/* D3BFB8 802419E8 00000000 */ nop -/* D3BFBC 802419EC 4500000B */ bc1f .L80241A1C -/* D3BFC0 802419F0 00000000 */ nop -/* D3BFC4 802419F4 3C014080 */ lui $at, 0x4080 -/* D3BFC8 802419F8 44810000 */ mtc1 $at, $f0 -/* D3BFCC 802419FC 00000000 */ nop -/* D3BFD0 80241A00 46002000 */ add.s $f0, $f4, $f0 -/* D3BFD4 80241A04 4600103C */ c.lt.s $f2, $f0 -/* D3BFD8 80241A08 00000000 */ nop -/* D3BFDC 80241A0C 45000002 */ bc1f .L80241A18 -/* D3BFE0 80241A10 E6200040 */ swc1 $f0, 0x40($s1) -/* D3BFE4 80241A14 E6220040 */ swc1 $f2, 0x40($s1) -.L80241A18: -/* D3BFE8 80241A18 C6240040 */ lwc1 $f4, 0x40($s1) -.L80241A1C: -/* D3BFEC 80241A1C 4604103C */ c.lt.s $f2, $f4 -/* D3BFF0 80241A20 00000000 */ nop -/* D3BFF4 80241A24 4500000B */ bc1f .L80241A54 -/* D3BFF8 80241A28 24020002 */ addiu $v0, $zero, 2 -/* D3BFFC 80241A2C 3C014080 */ lui $at, 0x4080 -/* D3C000 80241A30 44810000 */ mtc1 $at, $f0 -/* D3C004 80241A34 00000000 */ nop -/* D3C008 80241A38 46002001 */ sub.s $f0, $f4, $f0 -/* D3C00C 80241A3C 4602003E */ c.le.s $f0, $f2 -/* D3C010 80241A40 00000000 */ nop -/* D3C014 80241A44 45000003 */ bc1f .L80241A54 -/* D3C018 80241A48 E6200040 */ swc1 $f0, 0x40($s1) -/* D3C01C 80241A4C E6220040 */ swc1 $f2, 0x40($s1) -/* D3C020 80241A50 24020002 */ addiu $v0, $zero, 2 -.L80241A54: -/* D3C024 80241A54 8FBF001C */ lw $ra, 0x1c($sp) -/* D3C028 80241A58 8FB20018 */ lw $s2, 0x18($sp) -/* D3C02C 80241A5C 8FB10014 */ lw $s1, 0x14($sp) -/* D3C030 80241A60 8FB00010 */ lw $s0, 0x10($sp) -/* D3C034 80241A64 03E00008 */ jr $ra -/* D3C038 80241A68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s new file mode 100644 index 0000000000..e12bfe21b8 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802418B4_D3BE84.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418B4_D3BE84 +/* D3BE84 802418B4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* D3BE88 802418B8 AFB00010 */ sw $s0, 0x10($sp) +/* D3BE8C 802418BC 0080802D */ daddu $s0, $a0, $zero +/* D3BE90 802418C0 24040001 */ addiu $a0, $zero, 1 +/* D3BE94 802418C4 AFBF001C */ sw $ra, 0x1c($sp) +/* D3BE98 802418C8 AFB20018 */ sw $s2, 0x18($sp) +/* D3BE9C 802418CC 0C00EAD2 */ jal get_npc_safe +/* D3BEA0 802418D0 AFB10014 */ sw $s1, 0x14($sp) +/* D3BEA4 802418D4 0040882D */ daddu $s1, $v0, $zero +/* D3BEA8 802418D8 3C128011 */ lui $s2, %hi(gPlayerStatus) +/* D3BEAC 802418DC 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) +/* D3BEB0 802418E0 C60200AC */ lwc1 $f2, 0xac($s0) +/* D3BEB4 802418E4 C6200040 */ lwc1 $f0, 0x40($s1) +/* D3BEB8 802418E8 46001032 */ c.eq.s $f2, $f0 +/* D3BEBC 802418EC 00000000 */ nop +/* D3BEC0 802418F0 45000006 */ bc1f .L8024190C +/* D3BEC4 802418F4 261000AC */ addiu $s0, $s0, 0xac +/* D3BEC8 802418F8 3C03009A */ lui $v1, 0x9a +/* D3BECC 802418FC 8E220028 */ lw $v0, 0x28($s1) +/* D3BED0 80241900 34630001 */ ori $v1, $v1, 1 +/* D3BED4 80241904 54430001 */ bnel $v0, $v1, .L8024190C +/* D3BED8 80241908 AE230028 */ sw $v1, 0x28($s1) +.L8024190C: +/* D3BEDC 8024190C C6020000 */ lwc1 $f2, ($s0) +/* D3BEE0 80241910 C6200040 */ lwc1 $f0, 0x40($s1) +/* D3BEE4 80241914 46001032 */ c.eq.s $f2, $f0 +/* D3BEE8 80241918 00000000 */ nop +/* D3BEEC 8024191C 45030008 */ bc1tl .L80241940 +/* D3BEF0 80241920 E6000000 */ swc1 $f0, ($s0) +/* D3BEF4 80241924 3C03009A */ lui $v1, 0x9a +/* D3BEF8 80241928 8E220028 */ lw $v0, 0x28($s1) +/* D3BEFC 8024192C 34630002 */ ori $v1, $v1, 2 +/* D3BF00 80241930 54430001 */ bnel $v0, $v1, .L80241938 +/* D3BF04 80241934 AE230028 */ sw $v1, 0x28($s1) +.L80241938: +/* D3BF08 80241938 C6200040 */ lwc1 $f0, 0x40($s1) +/* D3BF0C 8024193C E6000000 */ swc1 $f0, ($s0) +.L80241940: +/* D3BF10 80241940 C62C0038 */ lwc1 $f12, 0x38($s1) +/* D3BF14 80241944 C62E0040 */ lwc1 $f14, 0x40($s1) +/* D3BF18 80241948 8E460028 */ lw $a2, 0x28($s2) +/* D3BF1C 8024194C 0C00A7B5 */ jal dist2D +/* D3BF20 80241950 8E470030 */ lw $a3, 0x30($s2) +/* D3BF24 80241954 3C0141F0 */ lui $at, 0x41f0 +/* D3BF28 80241958 44811000 */ mtc1 $at, $f2 +/* D3BF2C 8024195C 00000000 */ nop +/* D3BF30 80241960 4602003C */ c.lt.s $f0, $f2 +/* D3BF34 80241964 00000000 */ nop +/* D3BF38 80241968 4501003A */ bc1t .L80241A54 +/* D3BF3C 8024196C 24020002 */ addiu $v0, $zero, 2 +/* D3BF40 80241970 C62C0038 */ lwc1 $f12, 0x38($s1) +/* D3BF44 80241974 C62E0040 */ lwc1 $f14, 0x40($s1) +/* D3BF48 80241978 8E460028 */ lw $a2, 0x28($s2) +/* D3BF4C 8024197C 0C00A7B5 */ jal dist2D +/* D3BF50 80241980 8E470030 */ lw $a3, 0x30($s2) +/* D3BF54 80241984 3C014302 */ lui $at, 0x4302 +/* D3BF58 80241988 44811000 */ mtc1 $at, $f2 +/* D3BF5C 8024198C 00000000 */ nop +/* D3BF60 80241990 4600103C */ c.lt.s $f2, $f0 +/* D3BF64 80241994 00000000 */ nop +/* D3BF68 80241998 4501002E */ bc1t .L80241A54 +/* D3BF6C 8024199C 24020002 */ addiu $v0, $zero, 2 +/* D3BF70 802419A0 C6420030 */ lwc1 $f2, 0x30($s2) +/* D3BF74 802419A4 3C014248 */ lui $at, 0x4248 +/* D3BF78 802419A8 44812000 */ mtc1 $at, $f4 +/* D3BF7C 802419AC 00000000 */ nop +/* D3BF80 802419B0 4602203C */ c.lt.s $f4, $f2 +/* D3BF84 802419B4 00000000 */ nop +/* D3BF88 802419B8 45000002 */ bc1f .L802419C4 +/* D3BF8C 802419BC 46001006 */ mov.s $f0, $f2 +/* D3BF90 802419C0 46002086 */ mov.s $f2, $f4 +.L802419C4: +/* D3BF94 802419C4 3C01C220 */ lui $at, 0xc220 +/* D3BF98 802419C8 44812000 */ mtc1 $at, $f4 +/* D3BF9C 802419CC 00000000 */ nop +/* D3BFA0 802419D0 4604003C */ c.lt.s $f0, $f4 +/* D3BFA4 802419D4 00000000 */ nop +/* D3BFA8 802419D8 45030001 */ bc1tl .L802419E0 +/* D3BFAC 802419DC 46002086 */ mov.s $f2, $f4 +.L802419E0: +/* D3BFB0 802419E0 C6240040 */ lwc1 $f4, 0x40($s1) +/* D3BFB4 802419E4 4602203E */ c.le.s $f4, $f2 +/* D3BFB8 802419E8 00000000 */ nop +/* D3BFBC 802419EC 4500000B */ bc1f .L80241A1C +/* D3BFC0 802419F0 00000000 */ nop +/* D3BFC4 802419F4 3C014080 */ lui $at, 0x4080 +/* D3BFC8 802419F8 44810000 */ mtc1 $at, $f0 +/* D3BFCC 802419FC 00000000 */ nop +/* D3BFD0 80241A00 46002000 */ add.s $f0, $f4, $f0 +/* D3BFD4 80241A04 4600103C */ c.lt.s $f2, $f0 +/* D3BFD8 80241A08 00000000 */ nop +/* D3BFDC 80241A0C 45000002 */ bc1f .L80241A18 +/* D3BFE0 80241A10 E6200040 */ swc1 $f0, 0x40($s1) +/* D3BFE4 80241A14 E6220040 */ swc1 $f2, 0x40($s1) +.L80241A18: +/* D3BFE8 80241A18 C6240040 */ lwc1 $f4, 0x40($s1) +.L80241A1C: +/* D3BFEC 80241A1C 4604103C */ c.lt.s $f2, $f4 +/* D3BFF0 80241A20 00000000 */ nop +/* D3BFF4 80241A24 4500000B */ bc1f .L80241A54 +/* D3BFF8 80241A28 24020002 */ addiu $v0, $zero, 2 +/* D3BFFC 80241A2C 3C014080 */ lui $at, 0x4080 +/* D3C000 80241A30 44810000 */ mtc1 $at, $f0 +/* D3C004 80241A34 00000000 */ nop +/* D3C008 80241A38 46002001 */ sub.s $f0, $f4, $f0 +/* D3C00C 80241A3C 4602003E */ c.le.s $f0, $f2 +/* D3C010 80241A40 00000000 */ nop +/* D3C014 80241A44 45000003 */ bc1f .L80241A54 +/* D3C018 80241A48 E6200040 */ swc1 $f0, 0x40($s1) +/* D3C01C 80241A4C E6220040 */ swc1 $f2, 0x40($s1) +/* D3C020 80241A50 24020002 */ addiu $v0, $zero, 2 +.L80241A54: +/* D3C024 80241A54 8FBF001C */ lw $ra, 0x1c($sp) +/* D3C028 80241A58 8FB20018 */ lw $s2, 0x18($sp) +/* D3C02C 80241A5C 8FB10014 */ lw $s1, 0x14($sp) +/* D3C030 80241A60 8FB00010 */ lw $s0, 0x10($sp) +/* D3C034 80241A64 03E00008 */ jr $ra +/* D3C038 80241A68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0.s deleted file mode 100644 index ee6b9c3bd5..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241AA0 -/* D3C070 80241AA0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3C074 80241AA4 AFB00010 */ sw $s0, 0x10($sp) -/* D3C078 80241AA8 0080802D */ daddu $s0, $a0, $zero -/* D3C07C 80241AAC AFBF0014 */ sw $ra, 0x14($sp) -/* D3C080 80241AB0 8E0300A8 */ lw $v1, 0xa8($s0) -/* D3C084 80241AB4 8E020088 */ lw $v0, 0x88($s0) -/* D3C088 80241AB8 00621821 */ addu $v1, $v1, $v0 -/* D3C08C 80241ABC 04610004 */ bgez $v1, .L80241AD0 -/* D3C090 80241AC0 AE0300A8 */ sw $v1, 0xa8($s0) -/* D3C094 80241AC4 3C020002 */ lui $v0, 2 -/* D3C098 80241AC8 080906B8 */ j .L80241AE0 -/* D3C09C 80241ACC 00621021 */ addu $v0, $v1, $v0 -.L80241AD0: -/* D3C0A0 80241AD0 3C040002 */ lui $a0, 2 -/* D3C0A4 80241AD4 0083102A */ slt $v0, $a0, $v1 -/* D3C0A8 80241AD8 10400002 */ beqz $v0, .L80241AE4 -/* D3C0AC 80241ADC 00641023 */ subu $v0, $v1, $a0 -.L80241AE0: -/* D3C0B0 80241AE0 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241AE4: -/* D3C0B4 80241AE4 8E0300AC */ lw $v1, 0xac($s0) -/* D3C0B8 80241AE8 8E02008C */ lw $v0, 0x8c($s0) -/* D3C0BC 80241AEC 00621821 */ addu $v1, $v1, $v0 -/* D3C0C0 80241AF0 04610004 */ bgez $v1, .L80241B04 -/* D3C0C4 80241AF4 AE0300AC */ sw $v1, 0xac($s0) -/* D3C0C8 80241AF8 3C020002 */ lui $v0, 2 -/* D3C0CC 80241AFC 080906C5 */ j .L80241B14 -/* D3C0D0 80241B00 00621021 */ addu $v0, $v1, $v0 -.L80241B04: -/* D3C0D4 80241B04 3C040002 */ lui $a0, 2 -/* D3C0D8 80241B08 0083102A */ slt $v0, $a0, $v1 -/* D3C0DC 80241B0C 10400002 */ beqz $v0, .L80241B18 -/* D3C0E0 80241B10 00641023 */ subu $v0, $v1, $a0 -.L80241B14: -/* D3C0E4 80241B14 AE0200AC */ sw $v0, 0xac($s0) -.L80241B18: -/* D3C0E8 80241B18 8E0300B0 */ lw $v1, 0xb0($s0) -/* D3C0EC 80241B1C 8E020090 */ lw $v0, 0x90($s0) -/* D3C0F0 80241B20 00621821 */ addu $v1, $v1, $v0 -/* D3C0F4 80241B24 04610004 */ bgez $v1, .L80241B38 -/* D3C0F8 80241B28 AE0300B0 */ sw $v1, 0xb0($s0) -/* D3C0FC 80241B2C 3C020002 */ lui $v0, 2 -/* D3C100 80241B30 080906D2 */ j .L80241B48 -/* D3C104 80241B34 00621021 */ addu $v0, $v1, $v0 -.L80241B38: -/* D3C108 80241B38 3C040002 */ lui $a0, 2 -/* D3C10C 80241B3C 0083102A */ slt $v0, $a0, $v1 -/* D3C110 80241B40 10400002 */ beqz $v0, .L80241B4C -/* D3C114 80241B44 00641023 */ subu $v0, $v1, $a0 -.L80241B48: -/* D3C118 80241B48 AE0200B0 */ sw $v0, 0xb0($s0) -.L80241B4C: -/* D3C11C 80241B4C 8E0300B4 */ lw $v1, 0xb4($s0) -/* D3C120 80241B50 8E020094 */ lw $v0, 0x94($s0) -/* D3C124 80241B54 00621821 */ addu $v1, $v1, $v0 -/* D3C128 80241B58 04610004 */ bgez $v1, .L80241B6C -/* D3C12C 80241B5C AE0300B4 */ sw $v1, 0xb4($s0) -/* D3C130 80241B60 3C020002 */ lui $v0, 2 -/* D3C134 80241B64 080906DF */ j .L80241B7C -/* D3C138 80241B68 00621021 */ addu $v0, $v1, $v0 -.L80241B6C: -/* D3C13C 80241B6C 3C040002 */ lui $a0, 2 -/* D3C140 80241B70 0083102A */ slt $v0, $a0, $v1 -/* D3C144 80241B74 10400002 */ beqz $v0, .L80241B80 -/* D3C148 80241B78 00641023 */ subu $v0, $v1, $a0 -.L80241B7C: -/* D3C14C 80241B7C AE0200B4 */ sw $v0, 0xb4($s0) -.L80241B80: -/* D3C150 80241B80 8E040084 */ lw $a0, 0x84($s0) -/* D3C154 80241B84 0C046F07 */ jal set_main_pan_u -/* D3C158 80241B88 8E0500A8 */ lw $a1, 0xa8($s0) -/* D3C15C 80241B8C 8E040084 */ lw $a0, 0x84($s0) -/* D3C160 80241B90 0C046F0D */ jal set_main_pan_v -/* D3C164 80241B94 8E0500AC */ lw $a1, 0xac($s0) -/* D3C168 80241B98 8E040084 */ lw $a0, 0x84($s0) -/* D3C16C 80241B9C 0C046F13 */ jal set_aux_pan_u -/* D3C170 80241BA0 8E0500B0 */ lw $a1, 0xb0($s0) -/* D3C174 80241BA4 8E040084 */ lw $a0, 0x84($s0) -/* D3C178 80241BA8 0C046F19 */ jal set_aux_pan_v -/* D3C17C 80241BAC 8E0500B4 */ lw $a1, 0xb4($s0) -/* D3C180 80241BB0 8FBF0014 */ lw $ra, 0x14($sp) -/* D3C184 80241BB4 8FB00010 */ lw $s0, 0x10($sp) -/* D3C188 80241BB8 0000102D */ daddu $v0, $zero, $zero -/* D3C18C 80241BBC 03E00008 */ jr $ra -/* D3C190 80241BC0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0_D3C070.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0_D3C070.s new file mode 100644 index 0000000000..9b916fee1c --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241AA0_D3C070.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241AA0_D3C070 +/* D3C070 80241AA0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* D3C074 80241AA4 AFB00010 */ sw $s0, 0x10($sp) +/* D3C078 80241AA8 0080802D */ daddu $s0, $a0, $zero +/* D3C07C 80241AAC AFBF0014 */ sw $ra, 0x14($sp) +/* D3C080 80241AB0 8E0300A8 */ lw $v1, 0xa8($s0) +/* D3C084 80241AB4 8E020088 */ lw $v0, 0x88($s0) +/* D3C088 80241AB8 00621821 */ addu $v1, $v1, $v0 +/* D3C08C 80241ABC 04610004 */ bgez $v1, .L80241AD0 +/* D3C090 80241AC0 AE0300A8 */ sw $v1, 0xa8($s0) +/* D3C094 80241AC4 3C020002 */ lui $v0, 2 +/* D3C098 80241AC8 080906B8 */ j .L80241AE0 +/* D3C09C 80241ACC 00621021 */ addu $v0, $v1, $v0 +.L80241AD0: +/* D3C0A0 80241AD0 3C040002 */ lui $a0, 2 +/* D3C0A4 80241AD4 0083102A */ slt $v0, $a0, $v1 +/* D3C0A8 80241AD8 10400002 */ beqz $v0, .L80241AE4 +/* D3C0AC 80241ADC 00641023 */ subu $v0, $v1, $a0 +.L80241AE0: +/* D3C0B0 80241AE0 AE0200A8 */ sw $v0, 0xa8($s0) +.L80241AE4: +/* D3C0B4 80241AE4 8E0300AC */ lw $v1, 0xac($s0) +/* D3C0B8 80241AE8 8E02008C */ lw $v0, 0x8c($s0) +/* D3C0BC 80241AEC 00621821 */ addu $v1, $v1, $v0 +/* D3C0C0 80241AF0 04610004 */ bgez $v1, .L80241B04 +/* D3C0C4 80241AF4 AE0300AC */ sw $v1, 0xac($s0) +/* D3C0C8 80241AF8 3C020002 */ lui $v0, 2 +/* D3C0CC 80241AFC 080906C5 */ j .L80241B14 +/* D3C0D0 80241B00 00621021 */ addu $v0, $v1, $v0 +.L80241B04: +/* D3C0D4 80241B04 3C040002 */ lui $a0, 2 +/* D3C0D8 80241B08 0083102A */ slt $v0, $a0, $v1 +/* D3C0DC 80241B0C 10400002 */ beqz $v0, .L80241B18 +/* D3C0E0 80241B10 00641023 */ subu $v0, $v1, $a0 +.L80241B14: +/* D3C0E4 80241B14 AE0200AC */ sw $v0, 0xac($s0) +.L80241B18: +/* D3C0E8 80241B18 8E0300B0 */ lw $v1, 0xb0($s0) +/* D3C0EC 80241B1C 8E020090 */ lw $v0, 0x90($s0) +/* D3C0F0 80241B20 00621821 */ addu $v1, $v1, $v0 +/* D3C0F4 80241B24 04610004 */ bgez $v1, .L80241B38 +/* D3C0F8 80241B28 AE0300B0 */ sw $v1, 0xb0($s0) +/* D3C0FC 80241B2C 3C020002 */ lui $v0, 2 +/* D3C100 80241B30 080906D2 */ j .L80241B48 +/* D3C104 80241B34 00621021 */ addu $v0, $v1, $v0 +.L80241B38: +/* D3C108 80241B38 3C040002 */ lui $a0, 2 +/* D3C10C 80241B3C 0083102A */ slt $v0, $a0, $v1 +/* D3C110 80241B40 10400002 */ beqz $v0, .L80241B4C +/* D3C114 80241B44 00641023 */ subu $v0, $v1, $a0 +.L80241B48: +/* D3C118 80241B48 AE0200B0 */ sw $v0, 0xb0($s0) +.L80241B4C: +/* D3C11C 80241B4C 8E0300B4 */ lw $v1, 0xb4($s0) +/* D3C120 80241B50 8E020094 */ lw $v0, 0x94($s0) +/* D3C124 80241B54 00621821 */ addu $v1, $v1, $v0 +/* D3C128 80241B58 04610004 */ bgez $v1, .L80241B6C +/* D3C12C 80241B5C AE0300B4 */ sw $v1, 0xb4($s0) +/* D3C130 80241B60 3C020002 */ lui $v0, 2 +/* D3C134 80241B64 080906DF */ j .L80241B7C +/* D3C138 80241B68 00621021 */ addu $v0, $v1, $v0 +.L80241B6C: +/* D3C13C 80241B6C 3C040002 */ lui $a0, 2 +/* D3C140 80241B70 0083102A */ slt $v0, $a0, $v1 +/* D3C144 80241B74 10400002 */ beqz $v0, .L80241B80 +/* D3C148 80241B78 00641023 */ subu $v0, $v1, $a0 +.L80241B7C: +/* D3C14C 80241B7C AE0200B4 */ sw $v0, 0xb4($s0) +.L80241B80: +/* D3C150 80241B80 8E040084 */ lw $a0, 0x84($s0) +/* D3C154 80241B84 0C046F07 */ jal set_main_pan_u +/* D3C158 80241B88 8E0500A8 */ lw $a1, 0xa8($s0) +/* D3C15C 80241B8C 8E040084 */ lw $a0, 0x84($s0) +/* D3C160 80241B90 0C046F0D */ jal set_main_pan_v +/* D3C164 80241B94 8E0500AC */ lw $a1, 0xac($s0) +/* D3C168 80241B98 8E040084 */ lw $a0, 0x84($s0) +/* D3C16C 80241B9C 0C046F13 */ jal set_aux_pan_u +/* D3C170 80241BA0 8E0500B0 */ lw $a1, 0xb0($s0) +/* D3C174 80241BA4 8E040084 */ lw $a0, 0x84($s0) +/* D3C178 80241BA8 0C046F19 */ jal set_aux_pan_v +/* D3C17C 80241BAC 8E0500B4 */ lw $a1, 0xb4($s0) +/* D3C180 80241BB0 8FBF0014 */ lw $ra, 0x14($sp) +/* D3C184 80241BB4 8FB00010 */ lw $s0, 0x10($sp) +/* D3C188 80241BB8 0000102D */ daddu $v0, $zero, $zero +/* D3C18C 80241BBC 03E00008 */ jr $ra +/* D3C190 80241BC0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0.s deleted file mode 100644 index 0b3a1e1f0c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FB0 -/* D3C580 80241FB0 3C058016 */ lui $a1, 0x8016 -/* D3C584 80241FB4 24A5A550 */ addiu $a1, $a1, -0x5ab0 -/* D3C588 80241FB8 AC8000AC */ sw $zero, 0xac($a0) -/* D3C58C 80241FBC 84A20002 */ lh $v0, 2($a1) -/* D3C590 80241FC0 24030040 */ addiu $v1, $zero, 0x40 -/* D3C594 80241FC4 14430002 */ bne $v0, $v1, .L80241FD0 -/* D3C598 80241FC8 24020001 */ addiu $v0, $zero, 1 -/* D3C59C 80241FCC AC8200AC */ sw $v0, 0xac($a0) -.L80241FD0: -/* D3C5A0 80241FD0 84A20004 */ lh $v0, 4($a1) -/* D3C5A4 80241FD4 14430002 */ bne $v0, $v1, .L80241FE0 -/* D3C5A8 80241FD8 24020001 */ addiu $v0, $zero, 1 -/* D3C5AC 80241FDC AC8200AC */ sw $v0, 0xac($a0) -.L80241FE0: -/* D3C5B0 80241FE0 03E00008 */ jr $ra -/* D3C5B4 80241FE4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s new file mode 100644 index 0000000000..dce4d0c19a --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FB0_D3C580.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FB0_D3C580 +/* D3C580 80241FB0 3C058016 */ lui $a1, 0x8016 +/* D3C584 80241FB4 24A5A550 */ addiu $a1, $a1, -0x5ab0 +/* D3C588 80241FB8 AC8000AC */ sw $zero, 0xac($a0) +/* D3C58C 80241FBC 84A20002 */ lh $v0, 2($a1) +/* D3C590 80241FC0 24030040 */ addiu $v1, $zero, 0x40 +/* D3C594 80241FC4 14430002 */ bne $v0, $v1, .L80241FD0 +/* D3C598 80241FC8 24020001 */ addiu $v0, $zero, 1 +/* D3C59C 80241FCC AC8200AC */ sw $v0, 0xac($a0) +.L80241FD0: +/* D3C5A0 80241FD0 84A20004 */ lh $v0, 4($a1) +/* D3C5A4 80241FD4 14430002 */ bne $v0, $v1, .L80241FE0 +/* D3C5A8 80241FD8 24020001 */ addiu $v0, $zero, 1 +/* D3C5AC 80241FDC AC8200AC */ sw $v0, 0xac($a0) +.L80241FE0: +/* D3C5B0 80241FE0 03E00008 */ jr $ra +/* D3C5B4 80241FE4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FE8.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FE8.s deleted file mode 100644 index 9a730843c2..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FE8.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FE8 -/* D3C5B8 80241FE8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* D3C5BC 80241FEC AFB00028 */ sw $s0, 0x28($sp) -/* D3C5C0 80241FF0 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* D3C5C4 80241FF4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* D3C5C8 80241FF8 27A20024 */ addiu $v0, $sp, 0x24 -/* D3C5CC 80241FFC 0000202D */ daddu $a0, $zero, $zero -/* D3C5D0 80242000 27A50018 */ addiu $a1, $sp, 0x18 -/* D3C5D4 80242004 27A6001C */ addiu $a2, $sp, 0x1c -/* D3C5D8 80242008 AFBF002C */ sw $ra, 0x2c($sp) -/* D3C5DC 8024200C C6000028 */ lwc1 $f0, 0x28($s0) -/* D3C5E0 80242010 3C014120 */ lui $at, 0x4120 -/* D3C5E4 80242014 44811000 */ mtc1 $at, $f2 -/* D3C5E8 80242018 3C014220 */ lui $at, 0x4220 -/* D3C5EC 8024201C 44813000 */ mtc1 $at, $f6 -/* D3C5F0 80242020 27A70020 */ addiu $a3, $sp, 0x20 -/* D3C5F4 80242024 E7A00018 */ swc1 $f0, 0x18($sp) -/* D3C5F8 80242028 C600002C */ lwc1 $f0, 0x2c($s0) -/* D3C5FC 8024202C C6040030 */ lwc1 $f4, 0x30($s0) -/* D3C600 80242030 46020000 */ add.s $f0, $f0, $f2 -/* D3C604 80242034 E7A60024 */ swc1 $f6, 0x24($sp) -/* D3C608 80242038 E7A40020 */ swc1 $f4, 0x20($sp) -/* D3C60C 8024203C E7A0001C */ swc1 $f0, 0x1c($sp) -/* D3C610 80242040 0C0372DF */ jal func_800DCB7C -/* D3C614 80242044 AFA20010 */ sw $v0, 0x10($sp) -/* D3C618 80242048 C7A00018 */ lwc1 $f0, 0x18($sp) -/* D3C61C 8024204C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* D3C620 80242050 C7A40020 */ lwc1 $f4, 0x20($sp) -/* D3C624 80242054 E6000028 */ swc1 $f0, 0x28($s0) -/* D3C628 80242058 E602002C */ swc1 $f2, 0x2c($s0) -/* D3C62C 8024205C E6040030 */ swc1 $f4, 0x30($s0) -/* D3C630 80242060 8FBF002C */ lw $ra, 0x2c($sp) -/* D3C634 80242064 8FB00028 */ lw $s0, 0x28($sp) -/* D3C638 80242068 24020002 */ addiu $v0, $zero, 2 -/* D3C63C 8024206C 03E00008 */ jr $ra -/* D3C640 80242070 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FE8_D3C5B8.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FE8_D3C5B8.s new file mode 100644 index 0000000000..5c70f67dbd --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241FE8_D3C5B8.s @@ -0,0 +1,39 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FE8_D3C5B8 +/* D3C5B8 80241FE8 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* D3C5BC 80241FEC AFB00028 */ sw $s0, 0x28($sp) +/* D3C5C0 80241FF0 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* D3C5C4 80241FF4 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* D3C5C8 80241FF8 27A20024 */ addiu $v0, $sp, 0x24 +/* D3C5CC 80241FFC 0000202D */ daddu $a0, $zero, $zero +/* D3C5D0 80242000 27A50018 */ addiu $a1, $sp, 0x18 +/* D3C5D4 80242004 27A6001C */ addiu $a2, $sp, 0x1c +/* D3C5D8 80242008 AFBF002C */ sw $ra, 0x2c($sp) +/* D3C5DC 8024200C C6000028 */ lwc1 $f0, 0x28($s0) +/* D3C5E0 80242010 3C014120 */ lui $at, 0x4120 +/* D3C5E4 80242014 44811000 */ mtc1 $at, $f2 +/* D3C5E8 80242018 3C014220 */ lui $at, 0x4220 +/* D3C5EC 8024201C 44813000 */ mtc1 $at, $f6 +/* D3C5F0 80242020 27A70020 */ addiu $a3, $sp, 0x20 +/* D3C5F4 80242024 E7A00018 */ swc1 $f0, 0x18($sp) +/* D3C5F8 80242028 C600002C */ lwc1 $f0, 0x2c($s0) +/* D3C5FC 8024202C C6040030 */ lwc1 $f4, 0x30($s0) +/* D3C600 80242030 46020000 */ add.s $f0, $f0, $f2 +/* D3C604 80242034 E7A60024 */ swc1 $f6, 0x24($sp) +/* D3C608 80242038 E7A40020 */ swc1 $f4, 0x20($sp) +/* D3C60C 8024203C E7A0001C */ swc1 $f0, 0x1c($sp) +/* D3C610 80242040 0C0372DF */ jal func_800DCB7C +/* D3C614 80242044 AFA20010 */ sw $v0, 0x10($sp) +/* D3C618 80242048 C7A00018 */ lwc1 $f0, 0x18($sp) +/* D3C61C 8024204C C7A2001C */ lwc1 $f2, 0x1c($sp) +/* D3C620 80242050 C7A40020 */ lwc1 $f4, 0x20($sp) +/* D3C624 80242054 E6000028 */ swc1 $f0, 0x28($s0) +/* D3C628 80242058 E602002C */ swc1 $f2, 0x2c($s0) +/* D3C62C 8024205C E6040030 */ swc1 $f4, 0x30($s0) +/* D3C630 80242060 8FBF002C */ lw $ra, 0x2c($sp) +/* D3C634 80242064 8FB00028 */ lw $s0, 0x28($sp) +/* D3C638 80242068 24020002 */ addiu $v0, $zero, 2 +/* D3C63C 8024206C 03E00008 */ jr $ra +/* D3C640 80242070 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074.s deleted file mode 100644 index d3ab6cd9e5..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074.s +++ /dev/null @@ -1,69 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242074 -/* D3C644 80242074 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D3C648 80242078 AFB20038 */ sw $s2, 0x38($sp) -/* D3C64C 8024207C 0080902D */ daddu $s2, $a0, $zero -/* D3C650 80242080 AFBF003C */ sw $ra, 0x3c($sp) -/* D3C654 80242084 AFB10034 */ sw $s1, 0x34($sp) -/* D3C658 80242088 AFB00030 */ sw $s0, 0x30($sp) -/* D3C65C 8024208C F7B40040 */ sdc1 $f20, 0x40($sp) -/* D3C660 80242090 8E51000C */ lw $s1, 0xc($s2) -/* D3C664 80242094 0C00EAD2 */ jal get_npc_safe -/* D3C668 80242098 2404FFFC */ addiu $a0, $zero, -4 -/* D3C66C 8024209C 2410FFFF */ addiu $s0, $zero, -1 -/* D3C670 802420A0 3C038016 */ lui $v1, 0x8016 -/* D3C674 802420A4 8463A568 */ lh $v1, -0x5a98($v1) -/* D3C678 802420A8 04600025 */ bltz $v1, .L80242140 -/* D3C67C 802420AC 0040202D */ daddu $a0, $v0, $zero -/* D3C680 802420B0 3C014130 */ lui $at, 0x4130 -/* D3C684 802420B4 44812000 */ mtc1 $at, $f4 -/* D3C688 802420B8 C4800038 */ lwc1 $f0, 0x38($a0) -/* D3C68C 802420BC 3C014140 */ lui $at, 0x4140 -/* D3C690 802420C0 4481A000 */ mtc1 $at, $f20 -/* D3C694 802420C4 27A2002C */ addiu $v0, $sp, 0x2c -/* D3C698 802420C8 E7A4002C */ swc1 $f4, 0x2c($sp) -/* D3C69C 802420CC E7A00020 */ swc1 $f0, 0x20($sp) -/* D3C6A0 802420D0 C480003C */ lwc1 $f0, 0x3c($a0) -/* D3C6A4 802420D4 C4820040 */ lwc1 $f2, 0x40($a0) -/* D3C6A8 802420D8 46040000 */ add.s $f0, $f0, $f4 -/* D3C6AC 802420DC E7B4002C */ swc1 $f20, 0x2c($sp) -/* D3C6B0 802420E0 E7A20028 */ swc1 $f2, 0x28($sp) -/* D3C6B4 802420E4 E7A00024 */ swc1 $f0, 0x24($sp) -/* D3C6B8 802420E8 AFA20010 */ sw $v0, 0x10($sp) -/* D3C6BC 802420EC C480000C */ lwc1 $f0, 0xc($a0) -/* D3C6C0 802420F0 27A50020 */ addiu $a1, $sp, 0x20 -/* D3C6C4 802420F4 E7A00014 */ swc1 $f0, 0x14($sp) -/* D3C6C8 802420F8 848200A6 */ lh $v0, 0xa6($a0) -/* D3C6CC 802420FC 27A60024 */ addiu $a2, $sp, 0x24 -/* D3C6D0 80242100 44820000 */ mtc1 $v0, $f0 -/* D3C6D4 80242104 00000000 */ nop -/* D3C6D8 80242108 46800020 */ cvt.s.w $f0, $f0 -/* D3C6DC 8024210C E7A00018 */ swc1 $f0, 0x18($sp) -/* D3C6E0 80242110 8C840080 */ lw $a0, 0x80($a0) -/* D3C6E4 80242114 0C0371DE */ jal func_800DC778 -/* D3C6E8 80242118 27A70028 */ addiu $a3, $sp, 0x28 -/* D3C6EC 8024211C 10400009 */ beqz $v0, .L80242144 -/* D3C6F0 80242120 0240202D */ daddu $a0, $s2, $zero -/* D3C6F4 80242124 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* D3C6F8 80242128 4614003E */ c.le.s $f0, $f20 -/* D3C6FC 8024212C 00000000 */ nop -/* D3C700 80242130 45000004 */ bc1f .L80242144 -/* D3C704 80242134 00000000 */ nop -/* D3C708 80242138 3C108011 */ lui $s0, 0x8011 -/* D3C70C 8024213C 8E10C978 */ lw $s0, -0x3688($s0) -.L80242140: -/* D3C710 80242140 0240202D */ daddu $a0, $s2, $zero -.L80242144: -/* D3C714 80242144 8E250000 */ lw $a1, ($s1) -/* D3C718 80242148 0C0B2026 */ jal set_variable -/* D3C71C 8024214C 0200302D */ daddu $a2, $s0, $zero -/* D3C720 80242150 8FBF003C */ lw $ra, 0x3c($sp) -/* D3C724 80242154 8FB20038 */ lw $s2, 0x38($sp) -/* D3C728 80242158 8FB10034 */ lw $s1, 0x34($sp) -/* D3C72C 8024215C 8FB00030 */ lw $s0, 0x30($sp) -/* D3C730 80242160 D7B40040 */ ldc1 $f20, 0x40($sp) -/* D3C734 80242164 24020002 */ addiu $v0, $zero, 2 -/* D3C738 80242168 03E00008 */ jr $ra -/* D3C73C 8024216C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s new file mode 100644 index 0000000000..84615810a1 --- /dev/null +++ b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80242074_D3C644.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242074_D3C644 +/* D3C644 80242074 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* D3C648 80242078 AFB20038 */ sw $s2, 0x38($sp) +/* D3C64C 8024207C 0080902D */ daddu $s2, $a0, $zero +/* D3C650 80242080 AFBF003C */ sw $ra, 0x3c($sp) +/* D3C654 80242084 AFB10034 */ sw $s1, 0x34($sp) +/* D3C658 80242088 AFB00030 */ sw $s0, 0x30($sp) +/* D3C65C 8024208C F7B40040 */ sdc1 $f20, 0x40($sp) +/* D3C660 80242090 8E51000C */ lw $s1, 0xc($s2) +/* D3C664 80242094 0C00EAD2 */ jal get_npc_safe +/* D3C668 80242098 2404FFFC */ addiu $a0, $zero, -4 +/* D3C66C 8024209C 2410FFFF */ addiu $s0, $zero, -1 +/* D3C670 802420A0 3C038016 */ lui $v1, 0x8016 +/* D3C674 802420A4 8463A568 */ lh $v1, -0x5a98($v1) +/* D3C678 802420A8 04600025 */ bltz $v1, .L80242140 +/* D3C67C 802420AC 0040202D */ daddu $a0, $v0, $zero +/* D3C680 802420B0 3C014130 */ lui $at, 0x4130 +/* D3C684 802420B4 44812000 */ mtc1 $at, $f4 +/* D3C688 802420B8 C4800038 */ lwc1 $f0, 0x38($a0) +/* D3C68C 802420BC 3C014140 */ lui $at, 0x4140 +/* D3C690 802420C0 4481A000 */ mtc1 $at, $f20 +/* D3C694 802420C4 27A2002C */ addiu $v0, $sp, 0x2c +/* D3C698 802420C8 E7A4002C */ swc1 $f4, 0x2c($sp) +/* D3C69C 802420CC E7A00020 */ swc1 $f0, 0x20($sp) +/* D3C6A0 802420D0 C480003C */ lwc1 $f0, 0x3c($a0) +/* D3C6A4 802420D4 C4820040 */ lwc1 $f2, 0x40($a0) +/* D3C6A8 802420D8 46040000 */ add.s $f0, $f0, $f4 +/* D3C6AC 802420DC E7B4002C */ swc1 $f20, 0x2c($sp) +/* D3C6B0 802420E0 E7A20028 */ swc1 $f2, 0x28($sp) +/* D3C6B4 802420E4 E7A00024 */ swc1 $f0, 0x24($sp) +/* D3C6B8 802420E8 AFA20010 */ sw $v0, 0x10($sp) +/* D3C6BC 802420EC C480000C */ lwc1 $f0, 0xc($a0) +/* D3C6C0 802420F0 27A50020 */ addiu $a1, $sp, 0x20 +/* D3C6C4 802420F4 E7A00014 */ swc1 $f0, 0x14($sp) +/* D3C6C8 802420F8 848200A6 */ lh $v0, 0xa6($a0) +/* D3C6CC 802420FC 27A60024 */ addiu $a2, $sp, 0x24 +/* D3C6D0 80242100 44820000 */ mtc1 $v0, $f0 +/* D3C6D4 80242104 00000000 */ nop +/* D3C6D8 80242108 46800020 */ cvt.s.w $f0, $f0 +/* D3C6DC 8024210C E7A00018 */ swc1 $f0, 0x18($sp) +/* D3C6E0 80242110 8C840080 */ lw $a0, 0x80($a0) +/* D3C6E4 80242114 0C0371DE */ jal func_800DC778 +/* D3C6E8 80242118 27A70028 */ addiu $a3, $sp, 0x28 +/* D3C6EC 8024211C 10400009 */ beqz $v0, .L80242144 +/* D3C6F0 80242120 0240202D */ daddu $a0, $s2, $zero +/* D3C6F4 80242124 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* D3C6F8 80242128 4614003E */ c.le.s $f0, $f20 +/* D3C6FC 8024212C 00000000 */ nop +/* D3C700 80242130 45000004 */ bc1f .L80242144 +/* D3C704 80242134 00000000 */ nop +/* D3C708 80242138 3C108011 */ lui $s0, 0x8011 +/* D3C70C 8024213C 8E10C978 */ lw $s0, -0x3688($s0) +.L80242140: +/* D3C710 80242140 0240202D */ daddu $a0, $s2, $zero +.L80242144: +/* D3C714 80242144 8E250000 */ lw $a1, ($s1) +/* D3C718 80242148 0C0B2026 */ jal set_variable +/* D3C71C 8024214C 0200302D */ daddu $a2, $s0, $zero +/* D3C720 80242150 8FBF003C */ lw $ra, 0x3c($sp) +/* D3C724 80242154 8FB20038 */ lw $s2, 0x38($sp) +/* D3C728 80242158 8FB10034 */ lw $s1, 0x34($sp) +/* D3C72C 8024215C 8FB00030 */ lw $s0, 0x30($sp) +/* D3C730 80242160 D7B40040 */ ldc1 $f20, 0x40($sp) +/* D3C734 80242164 24020002 */ addiu $v0, $zero, 2 +/* D3C738 80242168 03E00008 */ jr $ra +/* D3C73C 8024216C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164.s deleted file mode 100644 index 83d6a0dac3..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164.s +++ /dev/null @@ -1,126 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240164 -/* 92A414 80240164 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 92A418 80240168 AFB10034 */ sw $s1, 0x34($sp) -/* 92A41C 8024016C 0080882D */ daddu $s1, $a0, $zero -/* 92A420 80240170 AFBF0054 */ sw $ra, 0x54($sp) -/* 92A424 80240174 AFBE0050 */ sw $fp, 0x50($sp) -/* 92A428 80240178 AFB7004C */ sw $s7, 0x4c($sp) -/* 92A42C 8024017C AFB60048 */ sw $s6, 0x48($sp) -/* 92A430 80240180 AFB50044 */ sw $s5, 0x44($sp) -/* 92A434 80240184 AFB40040 */ sw $s4, 0x40($sp) -/* 92A438 80240188 AFB3003C */ sw $s3, 0x3c($sp) -/* 92A43C 8024018C AFB20038 */ sw $s2, 0x38($sp) -/* 92A440 80240190 AFB00030 */ sw $s0, 0x30($sp) -/* 92A444 80240194 8E30000C */ lw $s0, 0xc($s1) -/* 92A448 80240198 8E050000 */ lw $a1, ($s0) -/* 92A44C 8024019C 0C0B1EAF */ jal get_variable -/* 92A450 802401A0 26100004 */ addiu $s0, $s0, 4 -/* 92A454 802401A4 8E050000 */ lw $a1, ($s0) -/* 92A458 802401A8 26100004 */ addiu $s0, $s0, 4 -/* 92A45C 802401AC 0220202D */ daddu $a0, $s1, $zero -/* 92A460 802401B0 0C0B1EAF */ jal get_variable -/* 92A464 802401B4 0040982D */ daddu $s3, $v0, $zero -/* 92A468 802401B8 8E050000 */ lw $a1, ($s0) -/* 92A46C 802401BC 26100004 */ addiu $s0, $s0, 4 -/* 92A470 802401C0 0220202D */ daddu $a0, $s1, $zero -/* 92A474 802401C4 0C0B1EAF */ jal get_variable -/* 92A478 802401C8 0040B02D */ daddu $s6, $v0, $zero -/* 92A47C 802401CC 8E050000 */ lw $a1, ($s0) -/* 92A480 802401D0 26100004 */ addiu $s0, $s0, 4 -/* 92A484 802401D4 0220202D */ daddu $a0, $s1, $zero -/* 92A488 802401D8 0C0B1EAF */ jal get_variable -/* 92A48C 802401DC 0040A82D */ daddu $s5, $v0, $zero -/* 92A490 802401E0 8E050000 */ lw $a1, ($s0) -/* 92A494 802401E4 26100004 */ addiu $s0, $s0, 4 -/* 92A498 802401E8 0220202D */ daddu $a0, $s1, $zero -/* 92A49C 802401EC 0C0B1EAF */ jal get_variable -/* 92A4A0 802401F0 0040A02D */ daddu $s4, $v0, $zero -/* 92A4A4 802401F4 8E050000 */ lw $a1, ($s0) -/* 92A4A8 802401F8 26100004 */ addiu $s0, $s0, 4 -/* 92A4AC 802401FC 0220202D */ daddu $a0, $s1, $zero -/* 92A4B0 80240200 0C0B1EAF */ jal get_variable -/* 92A4B4 80240204 0040902D */ daddu $s2, $v0, $zero -/* 92A4B8 80240208 8E050000 */ lw $a1, ($s0) -/* 92A4BC 8024020C 26100004 */ addiu $s0, $s0, 4 -/* 92A4C0 80240210 0220202D */ daddu $a0, $s1, $zero -/* 92A4C4 80240214 0C0B1EAF */ jal get_variable -/* 92A4C8 80240218 AFA20028 */ sw $v0, 0x28($sp) -/* 92A4CC 8024021C 8E050000 */ lw $a1, ($s0) -/* 92A4D0 80240220 26100004 */ addiu $s0, $s0, 4 -/* 92A4D4 80240224 0220202D */ daddu $a0, $s1, $zero -/* 92A4D8 80240228 0C0B1EAF */ jal get_variable -/* 92A4DC 8024022C 0040F02D */ daddu $fp, $v0, $zero -/* 92A4E0 80240230 8E050000 */ lw $a1, ($s0) -/* 92A4E4 80240234 26100004 */ addiu $s0, $s0, 4 -/* 92A4E8 80240238 0220202D */ daddu $a0, $s1, $zero -/* 92A4EC 8024023C 0C0B1EAF */ jal get_variable -/* 92A4F0 80240240 0040B82D */ daddu $s7, $v0, $zero -/* 92A4F4 80240244 0220202D */ daddu $a0, $s1, $zero -/* 92A4F8 80240248 8E050000 */ lw $a1, ($s0) -/* 92A4FC 8024024C 0C0B1EAF */ jal get_variable -/* 92A500 80240250 0040802D */ daddu $s0, $v0, $zero -/* 92A504 80240254 0040182D */ daddu $v1, $v0, $zero -/* 92A508 80240258 24020002 */ addiu $v0, $zero, 2 -/* 92A50C 8024025C 12620012 */ beq $s3, $v0, .L802402A8 -/* 92A510 80240260 2A620003 */ slti $v0, $s3, 3 -/* 92A514 80240264 10400005 */ beqz $v0, .L8024027C -/* 92A518 80240268 24020001 */ addiu $v0, $zero, 1 -/* 92A51C 8024026C 12620008 */ beq $s3, $v0, .L80240290 -/* 92A520 80240270 32C400FF */ andi $a0, $s6, 0xff -/* 92A524 80240274 080900C1 */ j .L80240304 -/* 92A528 80240278 00000000 */ nop -.L8024027C: -/* 92A52C 8024027C 24020003 */ addiu $v0, $zero, 3 -/* 92A530 80240280 12620018 */ beq $s3, $v0, .L802402E4 -/* 92A534 80240284 32C400FF */ andi $a0, $s6, 0xff -/* 92A538 80240288 080900C1 */ j .L80240304 -/* 92A53C 8024028C 00000000 */ nop -.L80240290: -/* 92A540 80240290 32A500FF */ andi $a1, $s5, 0xff -/* 92A544 80240294 328600FF */ andi $a2, $s4, 0xff -/* 92A548 80240298 0C046F97 */ jal set_background_color_blend -/* 92A54C 8024029C 324700FF */ andi $a3, $s2, 0xff -/* 92A550 802402A0 080900C1 */ j .L80240304 -/* 92A554 802402A4 00000000 */ nop -.L802402A8: -/* 92A558 802402A8 32C400FF */ andi $a0, $s6, 0xff -/* 92A55C 802402AC 32A500FF */ andi $a1, $s5, 0xff -/* 92A560 802402B0 328600FF */ andi $a2, $s4, 0xff -/* 92A564 802402B4 324700FF */ andi $a3, $s2, 0xff -/* 92A568 802402B8 93A2002B */ lbu $v0, 0x2b($sp) -/* 92A56C 802402BC AFB0001C */ sw $s0, 0x1c($sp) -/* 92A570 802402C0 AFA30020 */ sw $v1, 0x20($sp) -/* 92A574 802402C4 AFA20010 */ sw $v0, 0x10($sp) -/* 92A578 802402C8 33C200FF */ andi $v0, $fp, 0xff -/* 92A57C 802402CC AFA20014 */ sw $v0, 0x14($sp) -/* 92A580 802402D0 32E200FF */ andi $v0, $s7, 0xff -/* 92A584 802402D4 0C046FAD */ jal func_8011BEB4 -/* 92A588 802402D8 AFA20018 */ sw $v0, 0x18($sp) -/* 92A58C 802402DC 080900C1 */ j .L80240304 -/* 92A590 802402E0 00000000 */ nop -.L802402E4: -/* 92A594 802402E4 32A500FF */ andi $a1, $s5, 0xff -/* 92A598 802402E8 328600FF */ andi $a2, $s4, 0xff -/* 92A59C 802402EC 324700FF */ andi $a3, $s2, 0xff -/* 92A5A0 802402F0 93A2002B */ lbu $v0, 0x2b($sp) -/* 92A5A4 802402F4 AFA20010 */ sw $v0, 0x10($sp) -/* 92A5A8 802402F8 33C200FF */ andi $v0, $fp, 0xff -/* 92A5AC 802402FC 0C046FE6 */ jal func_8011BF98 -/* 92A5B0 80240300 AFA20014 */ sw $v0, 0x14($sp) -.L80240304: -/* 92A5B4 80240304 8FBF0054 */ lw $ra, 0x54($sp) -/* 92A5B8 80240308 8FBE0050 */ lw $fp, 0x50($sp) -/* 92A5BC 8024030C 8FB7004C */ lw $s7, 0x4c($sp) -/* 92A5C0 80240310 8FB60048 */ lw $s6, 0x48($sp) -/* 92A5C4 80240314 8FB50044 */ lw $s5, 0x44($sp) -/* 92A5C8 80240318 8FB40040 */ lw $s4, 0x40($sp) -/* 92A5CC 8024031C 8FB3003C */ lw $s3, 0x3c($sp) -/* 92A5D0 80240320 8FB20038 */ lw $s2, 0x38($sp) -/* 92A5D4 80240324 8FB10034 */ lw $s1, 0x34($sp) -/* 92A5D8 80240328 8FB00030 */ lw $s0, 0x30($sp) -/* 92A5DC 8024032C 24020002 */ addiu $v0, $zero, 2 -/* 92A5E0 80240330 03E00008 */ jr $ra -/* 92A5E4 80240334 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s new file mode 100644 index 0000000000..113b72dc4a --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240164_92A414.s @@ -0,0 +1,126 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240164_92A414 +/* 92A414 80240164 27BDFFA8 */ addiu $sp, $sp, -0x58 +/* 92A418 80240168 AFB10034 */ sw $s1, 0x34($sp) +/* 92A41C 8024016C 0080882D */ daddu $s1, $a0, $zero +/* 92A420 80240170 AFBF0054 */ sw $ra, 0x54($sp) +/* 92A424 80240174 AFBE0050 */ sw $fp, 0x50($sp) +/* 92A428 80240178 AFB7004C */ sw $s7, 0x4c($sp) +/* 92A42C 8024017C AFB60048 */ sw $s6, 0x48($sp) +/* 92A430 80240180 AFB50044 */ sw $s5, 0x44($sp) +/* 92A434 80240184 AFB40040 */ sw $s4, 0x40($sp) +/* 92A438 80240188 AFB3003C */ sw $s3, 0x3c($sp) +/* 92A43C 8024018C AFB20038 */ sw $s2, 0x38($sp) +/* 92A440 80240190 AFB00030 */ sw $s0, 0x30($sp) +/* 92A444 80240194 8E30000C */ lw $s0, 0xc($s1) +/* 92A448 80240198 8E050000 */ lw $a1, ($s0) +/* 92A44C 8024019C 0C0B1EAF */ jal get_variable +/* 92A450 802401A0 26100004 */ addiu $s0, $s0, 4 +/* 92A454 802401A4 8E050000 */ lw $a1, ($s0) +/* 92A458 802401A8 26100004 */ addiu $s0, $s0, 4 +/* 92A45C 802401AC 0220202D */ daddu $a0, $s1, $zero +/* 92A460 802401B0 0C0B1EAF */ jal get_variable +/* 92A464 802401B4 0040982D */ daddu $s3, $v0, $zero +/* 92A468 802401B8 8E050000 */ lw $a1, ($s0) +/* 92A46C 802401BC 26100004 */ addiu $s0, $s0, 4 +/* 92A470 802401C0 0220202D */ daddu $a0, $s1, $zero +/* 92A474 802401C4 0C0B1EAF */ jal get_variable +/* 92A478 802401C8 0040B02D */ daddu $s6, $v0, $zero +/* 92A47C 802401CC 8E050000 */ lw $a1, ($s0) +/* 92A480 802401D0 26100004 */ addiu $s0, $s0, 4 +/* 92A484 802401D4 0220202D */ daddu $a0, $s1, $zero +/* 92A488 802401D8 0C0B1EAF */ jal get_variable +/* 92A48C 802401DC 0040A82D */ daddu $s5, $v0, $zero +/* 92A490 802401E0 8E050000 */ lw $a1, ($s0) +/* 92A494 802401E4 26100004 */ addiu $s0, $s0, 4 +/* 92A498 802401E8 0220202D */ daddu $a0, $s1, $zero +/* 92A49C 802401EC 0C0B1EAF */ jal get_variable +/* 92A4A0 802401F0 0040A02D */ daddu $s4, $v0, $zero +/* 92A4A4 802401F4 8E050000 */ lw $a1, ($s0) +/* 92A4A8 802401F8 26100004 */ addiu $s0, $s0, 4 +/* 92A4AC 802401FC 0220202D */ daddu $a0, $s1, $zero +/* 92A4B0 80240200 0C0B1EAF */ jal get_variable +/* 92A4B4 80240204 0040902D */ daddu $s2, $v0, $zero +/* 92A4B8 80240208 8E050000 */ lw $a1, ($s0) +/* 92A4BC 8024020C 26100004 */ addiu $s0, $s0, 4 +/* 92A4C0 80240210 0220202D */ daddu $a0, $s1, $zero +/* 92A4C4 80240214 0C0B1EAF */ jal get_variable +/* 92A4C8 80240218 AFA20028 */ sw $v0, 0x28($sp) +/* 92A4CC 8024021C 8E050000 */ lw $a1, ($s0) +/* 92A4D0 80240220 26100004 */ addiu $s0, $s0, 4 +/* 92A4D4 80240224 0220202D */ daddu $a0, $s1, $zero +/* 92A4D8 80240228 0C0B1EAF */ jal get_variable +/* 92A4DC 8024022C 0040F02D */ daddu $fp, $v0, $zero +/* 92A4E0 80240230 8E050000 */ lw $a1, ($s0) +/* 92A4E4 80240234 26100004 */ addiu $s0, $s0, 4 +/* 92A4E8 80240238 0220202D */ daddu $a0, $s1, $zero +/* 92A4EC 8024023C 0C0B1EAF */ jal get_variable +/* 92A4F0 80240240 0040B82D */ daddu $s7, $v0, $zero +/* 92A4F4 80240244 0220202D */ daddu $a0, $s1, $zero +/* 92A4F8 80240248 8E050000 */ lw $a1, ($s0) +/* 92A4FC 8024024C 0C0B1EAF */ jal get_variable +/* 92A500 80240250 0040802D */ daddu $s0, $v0, $zero +/* 92A504 80240254 0040182D */ daddu $v1, $v0, $zero +/* 92A508 80240258 24020002 */ addiu $v0, $zero, 2 +/* 92A50C 8024025C 12620012 */ beq $s3, $v0, .L802402A8 +/* 92A510 80240260 2A620003 */ slti $v0, $s3, 3 +/* 92A514 80240264 10400005 */ beqz $v0, .L8024027C +/* 92A518 80240268 24020001 */ addiu $v0, $zero, 1 +/* 92A51C 8024026C 12620008 */ beq $s3, $v0, .L80240290 +/* 92A520 80240270 32C400FF */ andi $a0, $s6, 0xff +/* 92A524 80240274 080900C1 */ j .L80240304 +/* 92A528 80240278 00000000 */ nop +.L8024027C: +/* 92A52C 8024027C 24020003 */ addiu $v0, $zero, 3 +/* 92A530 80240280 12620018 */ beq $s3, $v0, .L802402E4 +/* 92A534 80240284 32C400FF */ andi $a0, $s6, 0xff +/* 92A538 80240288 080900C1 */ j .L80240304 +/* 92A53C 8024028C 00000000 */ nop +.L80240290: +/* 92A540 80240290 32A500FF */ andi $a1, $s5, 0xff +/* 92A544 80240294 328600FF */ andi $a2, $s4, 0xff +/* 92A548 80240298 0C046F97 */ jal set_background_color_blend +/* 92A54C 8024029C 324700FF */ andi $a3, $s2, 0xff +/* 92A550 802402A0 080900C1 */ j .L80240304 +/* 92A554 802402A4 00000000 */ nop +.L802402A8: +/* 92A558 802402A8 32C400FF */ andi $a0, $s6, 0xff +/* 92A55C 802402AC 32A500FF */ andi $a1, $s5, 0xff +/* 92A560 802402B0 328600FF */ andi $a2, $s4, 0xff +/* 92A564 802402B4 324700FF */ andi $a3, $s2, 0xff +/* 92A568 802402B8 93A2002B */ lbu $v0, 0x2b($sp) +/* 92A56C 802402BC AFB0001C */ sw $s0, 0x1c($sp) +/* 92A570 802402C0 AFA30020 */ sw $v1, 0x20($sp) +/* 92A574 802402C4 AFA20010 */ sw $v0, 0x10($sp) +/* 92A578 802402C8 33C200FF */ andi $v0, $fp, 0xff +/* 92A57C 802402CC AFA20014 */ sw $v0, 0x14($sp) +/* 92A580 802402D0 32E200FF */ andi $v0, $s7, 0xff +/* 92A584 802402D4 0C046FAD */ jal func_8011BEB4 +/* 92A588 802402D8 AFA20018 */ sw $v0, 0x18($sp) +/* 92A58C 802402DC 080900C1 */ j .L80240304 +/* 92A590 802402E0 00000000 */ nop +.L802402E4: +/* 92A594 802402E4 32A500FF */ andi $a1, $s5, 0xff +/* 92A598 802402E8 328600FF */ andi $a2, $s4, 0xff +/* 92A59C 802402EC 324700FF */ andi $a3, $s2, 0xff +/* 92A5A0 802402F0 93A2002B */ lbu $v0, 0x2b($sp) +/* 92A5A4 802402F4 AFA20010 */ sw $v0, 0x10($sp) +/* 92A5A8 802402F8 33C200FF */ andi $v0, $fp, 0xff +/* 92A5AC 802402FC 0C046FE6 */ jal func_8011BF98 +/* 92A5B0 80240300 AFA20014 */ sw $v0, 0x14($sp) +.L80240304: +/* 92A5B4 80240304 8FBF0054 */ lw $ra, 0x54($sp) +/* 92A5B8 80240308 8FBE0050 */ lw $fp, 0x50($sp) +/* 92A5BC 8024030C 8FB7004C */ lw $s7, 0x4c($sp) +/* 92A5C0 80240310 8FB60048 */ lw $s6, 0x48($sp) +/* 92A5C4 80240314 8FB50044 */ lw $s5, 0x44($sp) +/* 92A5C8 80240318 8FB40040 */ lw $s4, 0x40($sp) +/* 92A5CC 8024031C 8FB3003C */ lw $s3, 0x3c($sp) +/* 92A5D0 80240320 8FB20038 */ lw $s2, 0x38($sp) +/* 92A5D4 80240324 8FB10034 */ lw $s1, 0x34($sp) +/* 92A5D8 80240328 8FB00030 */ lw $s0, 0x30($sp) +/* 92A5DC 8024032C 24020002 */ addiu $v0, $zero, 2 +/* 92A5E0 80240330 03E00008 */ jr $ra +/* 92A5E4 80240334 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240338.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240338.s deleted file mode 100644 index 8ffa5fe57f..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240338.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240338 -/* 92A5E8 80240338 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 92A5EC 8024033C 3C05FD05 */ lui $a1, 0xfd05 -/* 92A5F0 80240340 AFBF0010 */ sw $ra, 0x10($sp) -/* 92A5F4 80240344 0C0B1EAF */ jal get_variable -/* 92A5F8 80240348 34A50F80 */ ori $a1, $a1, 0xf80 -/* 92A5FC 8024034C 8C43000C */ lw $v1, 0xc($v0) -/* 92A600 80240350 AC60003C */ sw $zero, 0x3c($v1) -/* 92A604 80240354 8FBF0010 */ lw $ra, 0x10($sp) -/* 92A608 80240358 24020002 */ addiu $v0, $zero, 2 -/* 92A60C 8024035C 03E00008 */ jr $ra -/* 92A610 80240360 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240338_92A5E8.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240338_92A5E8.s new file mode 100644 index 0000000000..8ec499f092 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240338_92A5E8.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240338_92A5E8 +/* 92A5E8 80240338 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 92A5EC 8024033C 3C05FD05 */ lui $a1, 0xfd05 +/* 92A5F0 80240340 AFBF0010 */ sw $ra, 0x10($sp) +/* 92A5F4 80240344 0C0B1EAF */ jal get_variable +/* 92A5F8 80240348 34A50F80 */ ori $a1, $a1, 0xf80 +/* 92A5FC 8024034C 8C43000C */ lw $v1, 0xc($v0) +/* 92A600 80240350 AC60003C */ sw $zero, 0x3c($v1) +/* 92A604 80240354 8FBF0010 */ lw $ra, 0x10($sp) +/* 92A608 80240358 24020002 */ addiu $v0, $zero, 2 +/* 92A60C 8024035C 03E00008 */ jr $ra +/* 92A610 80240360 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364.s deleted file mode 100644 index 2fb912c6e0..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364.s +++ /dev/null @@ -1,246 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240364 -/* 92A614 80240364 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 92A618 80240368 AFB1001C */ sw $s1, 0x1c($sp) -/* 92A61C 8024036C 0080882D */ daddu $s1, $a0, $zero -/* 92A620 80240370 AFBF0020 */ sw $ra, 0x20($sp) -/* 92A624 80240374 AFB00018 */ sw $s0, 0x18($sp) -/* 92A628 80240378 10A0003B */ beqz $a1, .L80240468 -/* 92A62C 8024037C 8E30000C */ lw $s0, 0xc($s1) -/* 92A630 80240380 3C048024 */ lui $a0, 0x8024 -/* 92A634 80240384 24845600 */ addiu $a0, $a0, 0x5600 -/* 92A638 80240388 3C058024 */ lui $a1, 0x8024 -/* 92A63C 8024038C 24A55601 */ addiu $a1, $a1, 0x5601 -/* 92A640 80240390 3C068024 */ lui $a2, 0x8024 -/* 92A644 80240394 24C65602 */ addiu $a2, $a2, 0x5602 -/* 92A648 80240398 3C078024 */ lui $a3, 0x8024 -/* 92A64C 8024039C 24E75603 */ addiu $a3, $a3, 0x5603 -/* 92A650 802403A0 3C028024 */ lui $v0, 0x8024 -/* 92A654 802403A4 24425604 */ addiu $v0, $v0, 0x5604 -/* 92A658 802403A8 AFA20010 */ sw $v0, 0x10($sp) -/* 92A65C 802403AC 3C028024 */ lui $v0, 0x8024 -/* 92A660 802403B0 24425605 */ addiu $v0, $v0, 0x5605 -/* 92A664 802403B4 0C046FF5 */ jal func_8011BFD4 -/* 92A668 802403B8 AFA20014 */ sw $v0, 0x14($sp) -/* 92A66C 802403BC 8E050000 */ lw $a1, ($s0) -/* 92A670 802403C0 26100004 */ addiu $s0, $s0, 4 -/* 92A674 802403C4 0C0B1EAF */ jal get_variable -/* 92A678 802403C8 0220202D */ daddu $a0, $s1, $zero -/* 92A67C 802403CC 3C018024 */ lui $at, 0x8024 -/* 92A680 802403D0 AC225608 */ sw $v0, 0x5608($at) -/* 92A684 802403D4 8E050000 */ lw $a1, ($s0) -/* 92A688 802403D8 26100004 */ addiu $s0, $s0, 4 -/* 92A68C 802403DC 0C0B1EAF */ jal get_variable -/* 92A690 802403E0 0220202D */ daddu $a0, $s1, $zero -/* 92A694 802403E4 3C018024 */ lui $at, 0x8024 -/* 92A698 802403E8 AC22560C */ sw $v0, 0x560c($at) -/* 92A69C 802403EC 8E050000 */ lw $a1, ($s0) -/* 92A6A0 802403F0 26100004 */ addiu $s0, $s0, 4 -/* 92A6A4 802403F4 0C0B1EAF */ jal get_variable -/* 92A6A8 802403F8 0220202D */ daddu $a0, $s1, $zero -/* 92A6AC 802403FC 3C018024 */ lui $at, 0x8024 -/* 92A6B0 80240400 AC225610 */ sw $v0, 0x5610($at) -/* 92A6B4 80240404 8E050000 */ lw $a1, ($s0) -/* 92A6B8 80240408 26100004 */ addiu $s0, $s0, 4 -/* 92A6BC 8024040C 0C0B1EAF */ jal get_variable -/* 92A6C0 80240410 0220202D */ daddu $a0, $s1, $zero -/* 92A6C4 80240414 3C018024 */ lui $at, 0x8024 -/* 92A6C8 80240418 AC225614 */ sw $v0, 0x5614($at) -/* 92A6CC 8024041C 8E050000 */ lw $a1, ($s0) -/* 92A6D0 80240420 26100004 */ addiu $s0, $s0, 4 -/* 92A6D4 80240424 0C0B1EAF */ jal get_variable -/* 92A6D8 80240428 0220202D */ daddu $a0, $s1, $zero -/* 92A6DC 8024042C 3C018024 */ lui $at, 0x8024 -/* 92A6E0 80240430 AC225618 */ sw $v0, 0x5618($at) -/* 92A6E4 80240434 8E050000 */ lw $a1, ($s0) -/* 92A6E8 80240438 26100004 */ addiu $s0, $s0, 4 -/* 92A6EC 8024043C 0C0B1EAF */ jal get_variable -/* 92A6F0 80240440 0220202D */ daddu $a0, $s1, $zero -/* 92A6F4 80240444 3C018024 */ lui $at, 0x8024 -/* 92A6F8 80240448 AC22561C */ sw $v0, 0x561c($at) -/* 92A6FC 8024044C 8E050000 */ lw $a1, ($s0) -/* 92A700 80240450 0C0B1EAF */ jal get_variable -/* 92A704 80240454 0220202D */ daddu $a0, $s1, $zero -/* 92A708 80240458 3C018024 */ lui $at, 0x8024 -/* 92A70C 8024045C AC225620 */ sw $v0, 0x5620($at) -/* 92A710 80240460 3C018024 */ lui $at, 0x8024 -/* 92A714 80240464 AC205624 */ sw $zero, 0x5624($at) -.L80240468: -/* 92A718 80240468 3C118024 */ lui $s1, 0x8024 -/* 92A71C 8024046C 26315620 */ addiu $s1, $s1, 0x5620 -/* 92A720 80240470 8E2F0000 */ lw $t7, ($s1) -/* 92A724 80240474 19E00088 */ blez $t7, .L80240698 -/* 92A728 80240478 00000000 */ nop -/* 92A72C 8024047C 3C108024 */ lui $s0, 0x8024 -/* 92A730 80240480 26105624 */ addiu $s0, $s0, 0x5624 -/* 92A734 80240484 8E030000 */ lw $v1, ($s0) -/* 92A738 80240488 3C048024 */ lui $a0, 0x8024 -/* 92A73C 8024048C 90845600 */ lbu $a0, 0x5600($a0) -/* 92A740 80240490 3C028024 */ lui $v0, 0x8024 -/* 92A744 80240494 8C425608 */ lw $v0, 0x5608($v0) -/* 92A748 80240498 24630001 */ addiu $v1, $v1, 1 -/* 92A74C 8024049C 00441023 */ subu $v0, $v0, $a0 -/* 92A750 802404A0 00430018 */ mult $v0, $v1 -/* 92A754 802404A4 00004012 */ mflo $t0 -/* 92A758 802404A8 00000000 */ nop -/* 92A75C 802404AC 15E00002 */ bnez $t7, .L802404B8 -/* 92A760 802404B0 010F001A */ div $zero, $t0, $t7 -/* 92A764 802404B4 0007000D */ break 7 -.L802404B8: -/* 92A768 802404B8 2401FFFF */ addiu $at, $zero, -1 -/* 92A76C 802404BC 15E10004 */ bne $t7, $at, .L802404D0 -/* 92A770 802404C0 3C018000 */ lui $at, 0x8000 -/* 92A774 802404C4 15010002 */ bne $t0, $at, .L802404D0 -/* 92A778 802404C8 00000000 */ nop -/* 92A77C 802404CC 0006000D */ break 6 -.L802404D0: -/* 92A780 802404D0 00007012 */ mflo $t6 -/* 92A784 802404D4 3C058024 */ lui $a1, 0x8024 -/* 92A788 802404D8 90A55601 */ lbu $a1, 0x5601($a1) -/* 92A78C 802404DC 3C028024 */ lui $v0, 0x8024 -/* 92A790 802404E0 8C42560C */ lw $v0, 0x560c($v0) -/* 92A794 802404E4 00451023 */ subu $v0, $v0, $a1 -/* 92A798 802404E8 00430018 */ mult $v0, $v1 -/* 92A79C 802404EC 00004012 */ mflo $t0 -/* 92A7A0 802404F0 00000000 */ nop -/* 92A7A4 802404F4 15E00002 */ bnez $t7, .L80240500 -/* 92A7A8 802404F8 010F001A */ div $zero, $t0, $t7 -/* 92A7AC 802404FC 0007000D */ break 7 -.L80240500: -/* 92A7B0 80240500 2401FFFF */ addiu $at, $zero, -1 -/* 92A7B4 80240504 15E10004 */ bne $t7, $at, .L80240518 -/* 92A7B8 80240508 3C018000 */ lui $at, 0x8000 -/* 92A7BC 8024050C 15010002 */ bne $t0, $at, .L80240518 -/* 92A7C0 80240510 00000000 */ nop -/* 92A7C4 80240514 0006000D */ break 6 -.L80240518: -/* 92A7C8 80240518 00006812 */ mflo $t5 -/* 92A7CC 8024051C 3C068024 */ lui $a2, 0x8024 -/* 92A7D0 80240520 90C65602 */ lbu $a2, 0x5602($a2) -/* 92A7D4 80240524 3C028024 */ lui $v0, 0x8024 -/* 92A7D8 80240528 8C425610 */ lw $v0, 0x5610($v0) -/* 92A7DC 8024052C 00461023 */ subu $v0, $v0, $a2 -/* 92A7E0 80240530 00430018 */ mult $v0, $v1 -/* 92A7E4 80240534 00004012 */ mflo $t0 -/* 92A7E8 80240538 00000000 */ nop -/* 92A7EC 8024053C 15E00002 */ bnez $t7, .L80240548 -/* 92A7F0 80240540 010F001A */ div $zero, $t0, $t7 -/* 92A7F4 80240544 0007000D */ break 7 -.L80240548: -/* 92A7F8 80240548 2401FFFF */ addiu $at, $zero, -1 -/* 92A7FC 8024054C 15E10004 */ bne $t7, $at, .L80240560 -/* 92A800 80240550 3C018000 */ lui $at, 0x8000 -/* 92A804 80240554 15010002 */ bne $t0, $at, .L80240560 -/* 92A808 80240558 00000000 */ nop -/* 92A80C 8024055C 0006000D */ break 6 -.L80240560: -/* 92A810 80240560 00006012 */ mflo $t4 -/* 92A814 80240564 3C078024 */ lui $a3, 0x8024 -/* 92A818 80240568 90E75603 */ lbu $a3, 0x5603($a3) -/* 92A81C 8024056C 3C028024 */ lui $v0, 0x8024 -/* 92A820 80240570 8C425614 */ lw $v0, 0x5614($v0) -/* 92A824 80240574 00471023 */ subu $v0, $v0, $a3 -/* 92A828 80240578 00430018 */ mult $v0, $v1 -/* 92A82C 8024057C 00004012 */ mflo $t0 -/* 92A830 80240580 00000000 */ nop -/* 92A834 80240584 15E00002 */ bnez $t7, .L80240590 -/* 92A838 80240588 010F001A */ div $zero, $t0, $t7 -/* 92A83C 8024058C 0007000D */ break 7 -.L80240590: -/* 92A840 80240590 2401FFFF */ addiu $at, $zero, -1 -/* 92A844 80240594 15E10004 */ bne $t7, $at, .L802405A8 -/* 92A848 80240598 3C018000 */ lui $at, 0x8000 -/* 92A84C 8024059C 15010002 */ bne $t0, $at, .L802405A8 -/* 92A850 802405A0 00000000 */ nop -/* 92A854 802405A4 0006000D */ break 6 -.L802405A8: -/* 92A858 802405A8 00005812 */ mflo $t3 -/* 92A85C 802405AC 3C098024 */ lui $t1, 0x8024 -/* 92A860 802405B0 91295604 */ lbu $t1, 0x5604($t1) -/* 92A864 802405B4 3C028024 */ lui $v0, 0x8024 -/* 92A868 802405B8 8C425618 */ lw $v0, 0x5618($v0) -/* 92A86C 802405BC 00491023 */ subu $v0, $v0, $t1 -/* 92A870 802405C0 00430018 */ mult $v0, $v1 -/* 92A874 802405C4 00004012 */ mflo $t0 -/* 92A878 802405C8 00000000 */ nop -/* 92A87C 802405CC 15E00002 */ bnez $t7, .L802405D8 -/* 92A880 802405D0 010F001A */ div $zero, $t0, $t7 -/* 92A884 802405D4 0007000D */ break 7 -.L802405D8: -/* 92A888 802405D8 2401FFFF */ addiu $at, $zero, -1 -/* 92A88C 802405DC 15E10004 */ bne $t7, $at, .L802405F0 -/* 92A890 802405E0 3C018000 */ lui $at, 0x8000 -/* 92A894 802405E4 15010002 */ bne $t0, $at, .L802405F0 -/* 92A898 802405E8 00000000 */ nop -/* 92A89C 802405EC 0006000D */ break 6 -.L802405F0: -/* 92A8A0 802405F0 00005012 */ mflo $t2 -/* 92A8A4 802405F4 3C088024 */ lui $t0, 0x8024 -/* 92A8A8 802405F8 91085605 */ lbu $t0, 0x5605($t0) -/* 92A8AC 802405FC 3C028024 */ lui $v0, 0x8024 -/* 92A8B0 80240600 8C42561C */ lw $v0, 0x561c($v0) -/* 92A8B4 80240604 00481023 */ subu $v0, $v0, $t0 -/* 92A8B8 80240608 00430018 */ mult $v0, $v1 -/* 92A8BC 8024060C 0000C812 */ mflo $t9 -/* 92A8C0 80240610 00000000 */ nop -/* 92A8C4 80240614 15E00002 */ bnez $t7, .L80240620 -/* 92A8C8 80240618 032F001A */ div $zero, $t9, $t7 -/* 92A8CC 8024061C 0007000D */ break 7 -.L80240620: -/* 92A8D0 80240620 2401FFFF */ addiu $at, $zero, -1 -/* 92A8D4 80240624 15E10004 */ bne $t7, $at, .L80240638 -/* 92A8D8 80240628 3C018000 */ lui $at, 0x8000 -/* 92A8DC 8024062C 17210002 */ bne $t9, $at, .L80240638 -/* 92A8E0 80240630 00000000 */ nop -/* 92A8E4 80240634 0006000D */ break 6 -.L80240638: -/* 92A8E8 80240638 00001012 */ mflo $v0 -/* 92A8EC 8024063C AE030000 */ sw $v1, ($s0) -/* 92A8F0 80240640 008E2021 */ addu $a0, $a0, $t6 -/* 92A8F4 80240644 308400FF */ andi $a0, $a0, 0xff -/* 92A8F8 80240648 00AD2821 */ addu $a1, $a1, $t5 -/* 92A8FC 8024064C 30A500FF */ andi $a1, $a1, 0xff -/* 92A900 80240650 00CC3021 */ addu $a2, $a2, $t4 -/* 92A904 80240654 30C600FF */ andi $a2, $a2, 0xff -/* 92A908 80240658 00EB3821 */ addu $a3, $a3, $t3 -/* 92A90C 8024065C 30E700FF */ andi $a3, $a3, 0xff -/* 92A910 80240660 012A4821 */ addu $t1, $t1, $t2 -/* 92A914 80240664 312900FF */ andi $t1, $t1, 0xff -/* 92A918 80240668 AFA90010 */ sw $t1, 0x10($sp) -/* 92A91C 8024066C 01024021 */ addu $t0, $t0, $v0 -/* 92A920 80240670 310800FF */ andi $t0, $t0, 0xff -/* 92A924 80240674 0C046FE6 */ jal func_8011BF98 -/* 92A928 80240678 AFA80014 */ sw $t0, 0x14($sp) -/* 92A92C 8024067C 8E020000 */ lw $v0, ($s0) -/* 92A930 80240680 8E230000 */ lw $v1, ($s1) -/* 92A934 80240684 0043102A */ slt $v0, $v0, $v1 -/* 92A938 80240688 14400013 */ bnez $v0, .L802406D8 -/* 92A93C 8024068C 0000102D */ daddu $v0, $zero, $zero -/* 92A940 80240690 080901B6 */ j .L802406D8 -/* 92A944 80240694 24020002 */ addiu $v0, $zero, 2 -.L80240698: -/* 92A948 80240698 3C028024 */ lui $v0, 0x8024 -/* 92A94C 8024069C 9042561B */ lbu $v0, 0x561b($v0) -/* 92A950 802406A0 3C048024 */ lui $a0, 0x8024 -/* 92A954 802406A4 9084560B */ lbu $a0, 0x560b($a0) -/* 92A958 802406A8 3C058024 */ lui $a1, 0x8024 -/* 92A95C 802406AC 90A5560F */ lbu $a1, 0x560f($a1) -/* 92A960 802406B0 3C068024 */ lui $a2, 0x8024 -/* 92A964 802406B4 90C65613 */ lbu $a2, 0x5613($a2) -/* 92A968 802406B8 3C078024 */ lui $a3, 0x8024 -/* 92A96C 802406BC 90E75617 */ lbu $a3, 0x5617($a3) -/* 92A970 802406C0 3C038024 */ lui $v1, 0x8024 -/* 92A974 802406C4 9063561F */ lbu $v1, 0x561f($v1) -/* 92A978 802406C8 AFA20010 */ sw $v0, 0x10($sp) -/* 92A97C 802406CC 0C046FE6 */ jal func_8011BF98 -/* 92A980 802406D0 AFA30014 */ sw $v1, 0x14($sp) -/* 92A984 802406D4 24020002 */ addiu $v0, $zero, 2 -.L802406D8: -/* 92A988 802406D8 8FBF0020 */ lw $ra, 0x20($sp) -/* 92A98C 802406DC 8FB1001C */ lw $s1, 0x1c($sp) -/* 92A990 802406E0 8FB00018 */ lw $s0, 0x18($sp) -/* 92A994 802406E4 03E00008 */ jr $ra -/* 92A998 802406E8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 92A99C 802406EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s new file mode 100644 index 0000000000..a2452f8b58 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A2B0/func_80240364_92A614.s @@ -0,0 +1,246 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240364_92A614 +/* 92A614 80240364 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 92A618 80240368 AFB1001C */ sw $s1, 0x1c($sp) +/* 92A61C 8024036C 0080882D */ daddu $s1, $a0, $zero +/* 92A620 80240370 AFBF0020 */ sw $ra, 0x20($sp) +/* 92A624 80240374 AFB00018 */ sw $s0, 0x18($sp) +/* 92A628 80240378 10A0003B */ beqz $a1, .L80240468 +/* 92A62C 8024037C 8E30000C */ lw $s0, 0xc($s1) +/* 92A630 80240380 3C048024 */ lui $a0, 0x8024 +/* 92A634 80240384 24845600 */ addiu $a0, $a0, 0x5600 +/* 92A638 80240388 3C058024 */ lui $a1, 0x8024 +/* 92A63C 8024038C 24A55601 */ addiu $a1, $a1, 0x5601 +/* 92A640 80240390 3C068024 */ lui $a2, 0x8024 +/* 92A644 80240394 24C65602 */ addiu $a2, $a2, 0x5602 +/* 92A648 80240398 3C078024 */ lui $a3, 0x8024 +/* 92A64C 8024039C 24E75603 */ addiu $a3, $a3, 0x5603 +/* 92A650 802403A0 3C028024 */ lui $v0, 0x8024 +/* 92A654 802403A4 24425604 */ addiu $v0, $v0, 0x5604 +/* 92A658 802403A8 AFA20010 */ sw $v0, 0x10($sp) +/* 92A65C 802403AC 3C028024 */ lui $v0, 0x8024 +/* 92A660 802403B0 24425605 */ addiu $v0, $v0, 0x5605 +/* 92A664 802403B4 0C046FF5 */ jal func_8011BFD4 +/* 92A668 802403B8 AFA20014 */ sw $v0, 0x14($sp) +/* 92A66C 802403BC 8E050000 */ lw $a1, ($s0) +/* 92A670 802403C0 26100004 */ addiu $s0, $s0, 4 +/* 92A674 802403C4 0C0B1EAF */ jal get_variable +/* 92A678 802403C8 0220202D */ daddu $a0, $s1, $zero +/* 92A67C 802403CC 3C018024 */ lui $at, 0x8024 +/* 92A680 802403D0 AC225608 */ sw $v0, 0x5608($at) +/* 92A684 802403D4 8E050000 */ lw $a1, ($s0) +/* 92A688 802403D8 26100004 */ addiu $s0, $s0, 4 +/* 92A68C 802403DC 0C0B1EAF */ jal get_variable +/* 92A690 802403E0 0220202D */ daddu $a0, $s1, $zero +/* 92A694 802403E4 3C018024 */ lui $at, 0x8024 +/* 92A698 802403E8 AC22560C */ sw $v0, 0x560c($at) +/* 92A69C 802403EC 8E050000 */ lw $a1, ($s0) +/* 92A6A0 802403F0 26100004 */ addiu $s0, $s0, 4 +/* 92A6A4 802403F4 0C0B1EAF */ jal get_variable +/* 92A6A8 802403F8 0220202D */ daddu $a0, $s1, $zero +/* 92A6AC 802403FC 3C018024 */ lui $at, 0x8024 +/* 92A6B0 80240400 AC225610 */ sw $v0, 0x5610($at) +/* 92A6B4 80240404 8E050000 */ lw $a1, ($s0) +/* 92A6B8 80240408 26100004 */ addiu $s0, $s0, 4 +/* 92A6BC 8024040C 0C0B1EAF */ jal get_variable +/* 92A6C0 80240410 0220202D */ daddu $a0, $s1, $zero +/* 92A6C4 80240414 3C018024 */ lui $at, 0x8024 +/* 92A6C8 80240418 AC225614 */ sw $v0, 0x5614($at) +/* 92A6CC 8024041C 8E050000 */ lw $a1, ($s0) +/* 92A6D0 80240420 26100004 */ addiu $s0, $s0, 4 +/* 92A6D4 80240424 0C0B1EAF */ jal get_variable +/* 92A6D8 80240428 0220202D */ daddu $a0, $s1, $zero +/* 92A6DC 8024042C 3C018024 */ lui $at, 0x8024 +/* 92A6E0 80240430 AC225618 */ sw $v0, 0x5618($at) +/* 92A6E4 80240434 8E050000 */ lw $a1, ($s0) +/* 92A6E8 80240438 26100004 */ addiu $s0, $s0, 4 +/* 92A6EC 8024043C 0C0B1EAF */ jal get_variable +/* 92A6F0 80240440 0220202D */ daddu $a0, $s1, $zero +/* 92A6F4 80240444 3C018024 */ lui $at, 0x8024 +/* 92A6F8 80240448 AC22561C */ sw $v0, 0x561c($at) +/* 92A6FC 8024044C 8E050000 */ lw $a1, ($s0) +/* 92A700 80240450 0C0B1EAF */ jal get_variable +/* 92A704 80240454 0220202D */ daddu $a0, $s1, $zero +/* 92A708 80240458 3C018024 */ lui $at, 0x8024 +/* 92A70C 8024045C AC225620 */ sw $v0, 0x5620($at) +/* 92A710 80240460 3C018024 */ lui $at, 0x8024 +/* 92A714 80240464 AC205624 */ sw $zero, 0x5624($at) +.L80240468: +/* 92A718 80240468 3C118024 */ lui $s1, 0x8024 +/* 92A71C 8024046C 26315620 */ addiu $s1, $s1, 0x5620 +/* 92A720 80240470 8E2F0000 */ lw $t7, ($s1) +/* 92A724 80240474 19E00088 */ blez $t7, .L80240698 +/* 92A728 80240478 00000000 */ nop +/* 92A72C 8024047C 3C108024 */ lui $s0, 0x8024 +/* 92A730 80240480 26105624 */ addiu $s0, $s0, 0x5624 +/* 92A734 80240484 8E030000 */ lw $v1, ($s0) +/* 92A738 80240488 3C048024 */ lui $a0, 0x8024 +/* 92A73C 8024048C 90845600 */ lbu $a0, 0x5600($a0) +/* 92A740 80240490 3C028024 */ lui $v0, 0x8024 +/* 92A744 80240494 8C425608 */ lw $v0, 0x5608($v0) +/* 92A748 80240498 24630001 */ addiu $v1, $v1, 1 +/* 92A74C 8024049C 00441023 */ subu $v0, $v0, $a0 +/* 92A750 802404A0 00430018 */ mult $v0, $v1 +/* 92A754 802404A4 00004012 */ mflo $t0 +/* 92A758 802404A8 00000000 */ nop +/* 92A75C 802404AC 15E00002 */ bnez $t7, .L802404B8 +/* 92A760 802404B0 010F001A */ div $zero, $t0, $t7 +/* 92A764 802404B4 0007000D */ break 7 +.L802404B8: +/* 92A768 802404B8 2401FFFF */ addiu $at, $zero, -1 +/* 92A76C 802404BC 15E10004 */ bne $t7, $at, .L802404D0 +/* 92A770 802404C0 3C018000 */ lui $at, 0x8000 +/* 92A774 802404C4 15010002 */ bne $t0, $at, .L802404D0 +/* 92A778 802404C8 00000000 */ nop +/* 92A77C 802404CC 0006000D */ break 6 +.L802404D0: +/* 92A780 802404D0 00007012 */ mflo $t6 +/* 92A784 802404D4 3C058024 */ lui $a1, 0x8024 +/* 92A788 802404D8 90A55601 */ lbu $a1, 0x5601($a1) +/* 92A78C 802404DC 3C028024 */ lui $v0, 0x8024 +/* 92A790 802404E0 8C42560C */ lw $v0, 0x560c($v0) +/* 92A794 802404E4 00451023 */ subu $v0, $v0, $a1 +/* 92A798 802404E8 00430018 */ mult $v0, $v1 +/* 92A79C 802404EC 00004012 */ mflo $t0 +/* 92A7A0 802404F0 00000000 */ nop +/* 92A7A4 802404F4 15E00002 */ bnez $t7, .L80240500 +/* 92A7A8 802404F8 010F001A */ div $zero, $t0, $t7 +/* 92A7AC 802404FC 0007000D */ break 7 +.L80240500: +/* 92A7B0 80240500 2401FFFF */ addiu $at, $zero, -1 +/* 92A7B4 80240504 15E10004 */ bne $t7, $at, .L80240518 +/* 92A7B8 80240508 3C018000 */ lui $at, 0x8000 +/* 92A7BC 8024050C 15010002 */ bne $t0, $at, .L80240518 +/* 92A7C0 80240510 00000000 */ nop +/* 92A7C4 80240514 0006000D */ break 6 +.L80240518: +/* 92A7C8 80240518 00006812 */ mflo $t5 +/* 92A7CC 8024051C 3C068024 */ lui $a2, 0x8024 +/* 92A7D0 80240520 90C65602 */ lbu $a2, 0x5602($a2) +/* 92A7D4 80240524 3C028024 */ lui $v0, 0x8024 +/* 92A7D8 80240528 8C425610 */ lw $v0, 0x5610($v0) +/* 92A7DC 8024052C 00461023 */ subu $v0, $v0, $a2 +/* 92A7E0 80240530 00430018 */ mult $v0, $v1 +/* 92A7E4 80240534 00004012 */ mflo $t0 +/* 92A7E8 80240538 00000000 */ nop +/* 92A7EC 8024053C 15E00002 */ bnez $t7, .L80240548 +/* 92A7F0 80240540 010F001A */ div $zero, $t0, $t7 +/* 92A7F4 80240544 0007000D */ break 7 +.L80240548: +/* 92A7F8 80240548 2401FFFF */ addiu $at, $zero, -1 +/* 92A7FC 8024054C 15E10004 */ bne $t7, $at, .L80240560 +/* 92A800 80240550 3C018000 */ lui $at, 0x8000 +/* 92A804 80240554 15010002 */ bne $t0, $at, .L80240560 +/* 92A808 80240558 00000000 */ nop +/* 92A80C 8024055C 0006000D */ break 6 +.L80240560: +/* 92A810 80240560 00006012 */ mflo $t4 +/* 92A814 80240564 3C078024 */ lui $a3, 0x8024 +/* 92A818 80240568 90E75603 */ lbu $a3, 0x5603($a3) +/* 92A81C 8024056C 3C028024 */ lui $v0, 0x8024 +/* 92A820 80240570 8C425614 */ lw $v0, 0x5614($v0) +/* 92A824 80240574 00471023 */ subu $v0, $v0, $a3 +/* 92A828 80240578 00430018 */ mult $v0, $v1 +/* 92A82C 8024057C 00004012 */ mflo $t0 +/* 92A830 80240580 00000000 */ nop +/* 92A834 80240584 15E00002 */ bnez $t7, .L80240590 +/* 92A838 80240588 010F001A */ div $zero, $t0, $t7 +/* 92A83C 8024058C 0007000D */ break 7 +.L80240590: +/* 92A840 80240590 2401FFFF */ addiu $at, $zero, -1 +/* 92A844 80240594 15E10004 */ bne $t7, $at, .L802405A8 +/* 92A848 80240598 3C018000 */ lui $at, 0x8000 +/* 92A84C 8024059C 15010002 */ bne $t0, $at, .L802405A8 +/* 92A850 802405A0 00000000 */ nop +/* 92A854 802405A4 0006000D */ break 6 +.L802405A8: +/* 92A858 802405A8 00005812 */ mflo $t3 +/* 92A85C 802405AC 3C098024 */ lui $t1, 0x8024 +/* 92A860 802405B0 91295604 */ lbu $t1, 0x5604($t1) +/* 92A864 802405B4 3C028024 */ lui $v0, 0x8024 +/* 92A868 802405B8 8C425618 */ lw $v0, 0x5618($v0) +/* 92A86C 802405BC 00491023 */ subu $v0, $v0, $t1 +/* 92A870 802405C0 00430018 */ mult $v0, $v1 +/* 92A874 802405C4 00004012 */ mflo $t0 +/* 92A878 802405C8 00000000 */ nop +/* 92A87C 802405CC 15E00002 */ bnez $t7, .L802405D8 +/* 92A880 802405D0 010F001A */ div $zero, $t0, $t7 +/* 92A884 802405D4 0007000D */ break 7 +.L802405D8: +/* 92A888 802405D8 2401FFFF */ addiu $at, $zero, -1 +/* 92A88C 802405DC 15E10004 */ bne $t7, $at, .L802405F0 +/* 92A890 802405E0 3C018000 */ lui $at, 0x8000 +/* 92A894 802405E4 15010002 */ bne $t0, $at, .L802405F0 +/* 92A898 802405E8 00000000 */ nop +/* 92A89C 802405EC 0006000D */ break 6 +.L802405F0: +/* 92A8A0 802405F0 00005012 */ mflo $t2 +/* 92A8A4 802405F4 3C088024 */ lui $t0, 0x8024 +/* 92A8A8 802405F8 91085605 */ lbu $t0, 0x5605($t0) +/* 92A8AC 802405FC 3C028024 */ lui $v0, 0x8024 +/* 92A8B0 80240600 8C42561C */ lw $v0, 0x561c($v0) +/* 92A8B4 80240604 00481023 */ subu $v0, $v0, $t0 +/* 92A8B8 80240608 00430018 */ mult $v0, $v1 +/* 92A8BC 8024060C 0000C812 */ mflo $t9 +/* 92A8C0 80240610 00000000 */ nop +/* 92A8C4 80240614 15E00002 */ bnez $t7, .L80240620 +/* 92A8C8 80240618 032F001A */ div $zero, $t9, $t7 +/* 92A8CC 8024061C 0007000D */ break 7 +.L80240620: +/* 92A8D0 80240620 2401FFFF */ addiu $at, $zero, -1 +/* 92A8D4 80240624 15E10004 */ bne $t7, $at, .L80240638 +/* 92A8D8 80240628 3C018000 */ lui $at, 0x8000 +/* 92A8DC 8024062C 17210002 */ bne $t9, $at, .L80240638 +/* 92A8E0 80240630 00000000 */ nop +/* 92A8E4 80240634 0006000D */ break 6 +.L80240638: +/* 92A8E8 80240638 00001012 */ mflo $v0 +/* 92A8EC 8024063C AE030000 */ sw $v1, ($s0) +/* 92A8F0 80240640 008E2021 */ addu $a0, $a0, $t6 +/* 92A8F4 80240644 308400FF */ andi $a0, $a0, 0xff +/* 92A8F8 80240648 00AD2821 */ addu $a1, $a1, $t5 +/* 92A8FC 8024064C 30A500FF */ andi $a1, $a1, 0xff +/* 92A900 80240650 00CC3021 */ addu $a2, $a2, $t4 +/* 92A904 80240654 30C600FF */ andi $a2, $a2, 0xff +/* 92A908 80240658 00EB3821 */ addu $a3, $a3, $t3 +/* 92A90C 8024065C 30E700FF */ andi $a3, $a3, 0xff +/* 92A910 80240660 012A4821 */ addu $t1, $t1, $t2 +/* 92A914 80240664 312900FF */ andi $t1, $t1, 0xff +/* 92A918 80240668 AFA90010 */ sw $t1, 0x10($sp) +/* 92A91C 8024066C 01024021 */ addu $t0, $t0, $v0 +/* 92A920 80240670 310800FF */ andi $t0, $t0, 0xff +/* 92A924 80240674 0C046FE6 */ jal func_8011BF98 +/* 92A928 80240678 AFA80014 */ sw $t0, 0x14($sp) +/* 92A92C 8024067C 8E020000 */ lw $v0, ($s0) +/* 92A930 80240680 8E230000 */ lw $v1, ($s1) +/* 92A934 80240684 0043102A */ slt $v0, $v0, $v1 +/* 92A938 80240688 14400013 */ bnez $v0, .L802406D8 +/* 92A93C 8024068C 0000102D */ daddu $v0, $zero, $zero +/* 92A940 80240690 080901B6 */ j .L802406D8 +/* 92A944 80240694 24020002 */ addiu $v0, $zero, 2 +.L80240698: +/* 92A948 80240698 3C028024 */ lui $v0, 0x8024 +/* 92A94C 8024069C 9042561B */ lbu $v0, 0x561b($v0) +/* 92A950 802406A0 3C048024 */ lui $a0, 0x8024 +/* 92A954 802406A4 9084560B */ lbu $a0, 0x560b($a0) +/* 92A958 802406A8 3C058024 */ lui $a1, 0x8024 +/* 92A95C 802406AC 90A5560F */ lbu $a1, 0x560f($a1) +/* 92A960 802406B0 3C068024 */ lui $a2, 0x8024 +/* 92A964 802406B4 90C65613 */ lbu $a2, 0x5613($a2) +/* 92A968 802406B8 3C078024 */ lui $a3, 0x8024 +/* 92A96C 802406BC 90E75617 */ lbu $a3, 0x5617($a3) +/* 92A970 802406C0 3C038024 */ lui $v1, 0x8024 +/* 92A974 802406C4 9063561F */ lbu $v1, 0x561f($v1) +/* 92A978 802406C8 AFA20010 */ sw $v0, 0x10($sp) +/* 92A97C 802406CC 0C046FE6 */ jal func_8011BF98 +/* 92A980 802406D0 AFA30014 */ sw $v1, 0x14($sp) +/* 92A984 802406D4 24020002 */ addiu $v0, $zero, 2 +.L802406D8: +/* 92A988 802406D8 8FBF0020 */ lw $ra, 0x20($sp) +/* 92A98C 802406DC 8FB1001C */ lw $s1, 0x1c($sp) +/* 92A990 802406E0 8FB00018 */ lw $s0, 0x18($sp) +/* 92A994 802406E4 03E00008 */ jr $ra +/* 92A998 802406E8 27BD0028 */ addiu $sp, $sp, 0x28 +/* 92A99C 802406EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C.s deleted file mode 100644 index f4a3fa7cb2..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024091C -/* 92ABCC 8024091C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 92ABD0 80240920 AFBF0010 */ sw $ra, 0x10($sp) -/* 92ABD4 80240924 10A00003 */ beqz $a1, .L80240934 -/* 92ABD8 80240928 8C86000C */ lw $a2, 0xc($a0) -/* 92ABDC 8024092C 3C018024 */ lui $at, 0x8024 -/* 92ABE0 80240930 AC20404C */ sw $zero, 0x404c($at) -.L80240934: -/* 92ABE4 80240934 3C038024 */ lui $v1, 0x8024 -/* 92ABE8 80240938 2463404C */ addiu $v1, $v1, 0x404c -/* 92ABEC 8024093C 8C620000 */ lw $v0, ($v1) -/* 92ABF0 80240940 54400003 */ bnel $v0, $zero, .L80240950 -/* 92ABF4 80240944 AC600000 */ sw $zero, ($v1) -/* 92ABF8 80240948 08090259 */ j .L80240964 -/* 92ABFC 8024094C 0000102D */ daddu $v0, $zero, $zero -.L80240950: -/* 92AC00 80240950 8CC50000 */ lw $a1, ($a2) -/* 92AC04 80240954 3C068024 */ lui $a2, 0x8024 -/* 92AC08 80240958 0C0B2026 */ jal set_variable -/* 92AC0C 8024095C 8CC64050 */ lw $a2, 0x4050($a2) -/* 92AC10 80240960 24020002 */ addiu $v0, $zero, 2 -.L80240964: -/* 92AC14 80240964 8FBF0010 */ lw $ra, 0x10($sp) -/* 92AC18 80240968 03E00008 */ jr $ra -/* 92AC1C 8024096C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s new file mode 100644 index 0000000000..6b1067f2ff --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_8024091C_92ABCC.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024091C_92ABCC +/* 92ABCC 8024091C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 92ABD0 80240920 AFBF0010 */ sw $ra, 0x10($sp) +/* 92ABD4 80240924 10A00003 */ beqz $a1, .L80240934 +/* 92ABD8 80240928 8C86000C */ lw $a2, 0xc($a0) +/* 92ABDC 8024092C 3C018024 */ lui $at, 0x8024 +/* 92ABE0 80240930 AC20404C */ sw $zero, 0x404c($at) +.L80240934: +/* 92ABE4 80240934 3C038024 */ lui $v1, 0x8024 +/* 92ABE8 80240938 2463404C */ addiu $v1, $v1, 0x404c +/* 92ABEC 8024093C 8C620000 */ lw $v0, ($v1) +/* 92ABF0 80240940 54400003 */ bnel $v0, $zero, .L80240950 +/* 92ABF4 80240944 AC600000 */ sw $zero, ($v1) +/* 92ABF8 80240948 08090259 */ j .L80240964 +/* 92ABFC 8024094C 0000102D */ daddu $v0, $zero, $zero +.L80240950: +/* 92AC00 80240950 8CC50000 */ lw $a1, ($a2) +/* 92AC04 80240954 3C068024 */ lui $a2, 0x8024 +/* 92AC08 80240958 0C0B2026 */ jal set_variable +/* 92AC0C 8024095C 8CC64050 */ lw $a2, 0x4050($a2) +/* 92AC10 80240960 24020002 */ addiu $v0, $zero, 2 +.L80240964: +/* 92AC14 80240964 8FBF0010 */ lw $ra, 0x10($sp) +/* 92AC18 80240968 03E00008 */ jr $ra +/* 92AC1C 8024096C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970.s deleted file mode 100644 index f9ef3f5d82..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240970 -/* 92AC20 80240970 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 92AC24 80240974 AFBF0010 */ sw $ra, 0x10($sp) -/* 92AC28 80240978 8C82000C */ lw $v0, 0xc($a0) -/* 92AC2C 8024097C 0C0B1EAF */ jal get_variable -/* 92AC30 80240980 8C450000 */ lw $a1, ($v0) -/* 92AC34 80240984 3C018024 */ lui $at, 0x8024 -/* 92AC38 80240988 AC224050 */ sw $v0, 0x4050($at) -/* 92AC3C 8024098C 24020002 */ addiu $v0, $zero, 2 -/* 92AC40 80240990 8FBF0010 */ lw $ra, 0x10($sp) -/* 92AC44 80240994 24030001 */ addiu $v1, $zero, 1 -/* 92AC48 80240998 3C018024 */ lui $at, 0x8024 -/* 92AC4C 8024099C AC23404C */ sw $v1, 0x404c($at) -/* 92AC50 802409A0 03E00008 */ jr $ra -/* 92AC54 802409A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970_92AC20.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970_92AC20.s new file mode 100644 index 0000000000..fa2eb68b90 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240970_92AC20.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240970_92AC20 +/* 92AC20 80240970 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 92AC24 80240974 AFBF0010 */ sw $ra, 0x10($sp) +/* 92AC28 80240978 8C82000C */ lw $v0, 0xc($a0) +/* 92AC2C 8024097C 0C0B1EAF */ jal get_variable +/* 92AC30 80240980 8C450000 */ lw $a1, ($v0) +/* 92AC34 80240984 3C018024 */ lui $at, 0x8024 +/* 92AC38 80240988 AC224050 */ sw $v0, 0x4050($at) +/* 92AC3C 8024098C 24020002 */ addiu $v0, $zero, 2 +/* 92AC40 80240990 8FBF0010 */ lw $ra, 0x10($sp) +/* 92AC44 80240994 24030001 */ addiu $v1, $zero, 1 +/* 92AC48 80240998 3C018024 */ lui $at, 0x8024 +/* 92AC4C 8024099C AC23404C */ sw $v1, 0x404c($at) +/* 92AC50 802409A0 03E00008 */ jr $ra +/* 92AC54 802409A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8.s deleted file mode 100644 index ec20d714e7..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409A8 -/* 92AC58 802409A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 92AC5C 802409AC AFBF0010 */ sw $ra, 0x10($sp) -/* 92AC60 802409B0 8C82000C */ lw $v0, 0xc($a0) -/* 92AC64 802409B4 0C0B1EAF */ jal get_variable -/* 92AC68 802409B8 8C450000 */ lw $a1, ($v0) -/* 92AC6C 802409BC 0040182D */ daddu $v1, $v0, $zero -/* 92AC70 802409C0 10600012 */ beqz $v1, .L80240A0C -/* 92AC74 802409C4 0000202D */ daddu $a0, $zero, $zero -/* 92AC78 802409C8 8C620000 */ lw $v0, ($v1) -/* 92AC7C 802409CC 5040000A */ beql $v0, $zero, .L802409F8 -/* 92AC80 802409D0 00041080 */ sll $v0, $a0, 2 -/* 92AC84 802409D4 3C058024 */ lui $a1, 0x8024 -/* 92AC88 802409D8 24A55630 */ addiu $a1, $a1, 0x5630 -.L802409DC: -/* 92AC8C 802409DC 24630004 */ addiu $v1, $v1, 4 -/* 92AC90 802409E0 24840001 */ addiu $a0, $a0, 1 -/* 92AC94 802409E4 ACA20000 */ sw $v0, ($a1) -/* 92AC98 802409E8 8C620000 */ lw $v0, ($v1) -/* 92AC9C 802409EC 1440FFFB */ bnez $v0, .L802409DC -/* 92ACA0 802409F0 24A50004 */ addiu $a1, $a1, 4 -/* 92ACA4 802409F4 00041080 */ sll $v0, $a0, 2 -.L802409F8: -/* 92ACA8 802409F8 3C018024 */ lui $at, 0x8024 -/* 92ACAC 802409FC 00220821 */ addu $at, $at, $v0 -/* 92ACB0 80240A00 AC205630 */ sw $zero, 0x5630($at) -/* 92ACB4 80240A04 0809028D */ j .L80240A34 -/* 92ACB8 80240A08 00000000 */ nop -.L80240A0C: -/* 92ACBC 80240A0C 3C038024 */ lui $v1, 0x8024 -/* 92ACC0 80240A10 24635630 */ addiu $v1, $v1, 0x5630 -/* 92ACC4 80240A14 0060282D */ daddu $a1, $v1, $zero -.L80240A18: -/* 92ACC8 80240A18 24820080 */ addiu $v0, $a0, 0x80 -/* 92ACCC 80240A1C AC620000 */ sw $v0, ($v1) -/* 92ACD0 80240A20 24630004 */ addiu $v1, $v1, 4 -/* 92ACD4 80240A24 24840001 */ addiu $a0, $a0, 1 -/* 92ACD8 80240A28 2882005B */ slti $v0, $a0, 0x5b -/* 92ACDC 80240A2C 1440FFFA */ bnez $v0, .L80240A18 -/* 92ACE0 80240A30 ACA0016C */ sw $zero, 0x16c($a1) -.L80240A34: -/* 92ACE4 80240A34 8FBF0010 */ lw $ra, 0x10($sp) -/* 92ACE8 80240A38 24020002 */ addiu $v0, $zero, 2 -/* 92ACEC 80240A3C 03E00008 */ jr $ra -/* 92ACF0 80240A40 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s new file mode 100644 index 0000000000..0a40679cf7 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_802409A8_92AC58.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409A8_92AC58 +/* 92AC58 802409A8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 92AC5C 802409AC AFBF0010 */ sw $ra, 0x10($sp) +/* 92AC60 802409B0 8C82000C */ lw $v0, 0xc($a0) +/* 92AC64 802409B4 0C0B1EAF */ jal get_variable +/* 92AC68 802409B8 8C450000 */ lw $a1, ($v0) +/* 92AC6C 802409BC 0040182D */ daddu $v1, $v0, $zero +/* 92AC70 802409C0 10600012 */ beqz $v1, .L80240A0C +/* 92AC74 802409C4 0000202D */ daddu $a0, $zero, $zero +/* 92AC78 802409C8 8C620000 */ lw $v0, ($v1) +/* 92AC7C 802409CC 5040000A */ beql $v0, $zero, .L802409F8 +/* 92AC80 802409D0 00041080 */ sll $v0, $a0, 2 +/* 92AC84 802409D4 3C058024 */ lui $a1, 0x8024 +/* 92AC88 802409D8 24A55630 */ addiu $a1, $a1, 0x5630 +.L802409DC: +/* 92AC8C 802409DC 24630004 */ addiu $v1, $v1, 4 +/* 92AC90 802409E0 24840001 */ addiu $a0, $a0, 1 +/* 92AC94 802409E4 ACA20000 */ sw $v0, ($a1) +/* 92AC98 802409E8 8C620000 */ lw $v0, ($v1) +/* 92AC9C 802409EC 1440FFFB */ bnez $v0, .L802409DC +/* 92ACA0 802409F0 24A50004 */ addiu $a1, $a1, 4 +/* 92ACA4 802409F4 00041080 */ sll $v0, $a0, 2 +.L802409F8: +/* 92ACA8 802409F8 3C018024 */ lui $at, 0x8024 +/* 92ACAC 802409FC 00220821 */ addu $at, $at, $v0 +/* 92ACB0 80240A00 AC205630 */ sw $zero, 0x5630($at) +/* 92ACB4 80240A04 0809028D */ j .L80240A34 +/* 92ACB8 80240A08 00000000 */ nop +.L80240A0C: +/* 92ACBC 80240A0C 3C038024 */ lui $v1, 0x8024 +/* 92ACC0 80240A10 24635630 */ addiu $v1, $v1, 0x5630 +/* 92ACC4 80240A14 0060282D */ daddu $a1, $v1, $zero +.L80240A18: +/* 92ACC8 80240A18 24820080 */ addiu $v0, $a0, 0x80 +/* 92ACCC 80240A1C AC620000 */ sw $v0, ($v1) +/* 92ACD0 80240A20 24630004 */ addiu $v1, $v1, 4 +/* 92ACD4 80240A24 24840001 */ addiu $a0, $a0, 1 +/* 92ACD8 80240A28 2882005B */ slti $v0, $a0, 0x5b +/* 92ACDC 80240A2C 1440FFFA */ bnez $v0, .L80240A18 +/* 92ACE0 80240A30 ACA0016C */ sw $zero, 0x16c($a1) +.L80240A34: +/* 92ACE4 80240A34 8FBF0010 */ lw $ra, 0x10($sp) +/* 92ACE8 80240A38 24020002 */ addiu $v0, $zero, 2 +/* 92ACEC 80240A3C 03E00008 */ jr $ra +/* 92ACF0 80240A40 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44.s deleted file mode 100644 index 39ae0120f5..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A44 -/* 92ACF4 80240A44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 92ACF8 80240A48 AFB00010 */ sw $s0, 0x10($sp) -/* 92ACFC 80240A4C 3C108024 */ lui $s0, 0x8024 -/* 92AD00 80240A50 261041D8 */ addiu $s0, $s0, 0x41d8 -/* 92AD04 80240A54 AFBF0018 */ sw $ra, 0x18($sp) -/* 92AD08 80240A58 AFB10014 */ sw $s1, 0x14($sp) -/* 92AD0C 80240A5C 8E020000 */ lw $v0, ($s0) -/* 92AD10 80240A60 14400010 */ bnez $v0, .L80240AA4 -/* 92AD14 80240A64 0080882D */ daddu $s1, $a0, $zero -/* 92AD18 80240A68 0C00AB39 */ jal heap_malloc -/* 92AD1C 80240A6C 24040040 */ addiu $a0, $zero, 0x40 -/* 92AD20 80240A70 AE020000 */ sw $v0, ($s0) -/* 92AD24 80240A74 0000182D */ daddu $v1, $zero, $zero -/* 92AD28 80240A78 0040282D */ daddu $a1, $v0, $zero -/* 92AD2C 80240A7C 0220202D */ daddu $a0, $s1, $zero -.L80240A80: -/* 92AD30 80240A80 8C820084 */ lw $v0, 0x84($a0) -/* 92AD34 80240A84 24840004 */ addiu $a0, $a0, 4 -/* 92AD38 80240A88 24630001 */ addiu $v1, $v1, 1 -/* 92AD3C 80240A8C ACA20000 */ sw $v0, ($a1) -/* 92AD40 80240A90 28620010 */ slti $v0, $v1, 0x10 -/* 92AD44 80240A94 1440FFFA */ bnez $v0, .L80240A80 -/* 92AD48 80240A98 24A50004 */ addiu $a1, $a1, 4 -/* 92AD4C 80240A9C 080902B8 */ j .L80240AE0 -/* 92AD50 80240AA0 00000000 */ nop -.L80240AA4: -/* 92AD54 80240AA4 0000182D */ daddu $v1, $zero, $zero -/* 92AD58 80240AA8 0040282D */ daddu $a1, $v0, $zero -/* 92AD5C 80240AAC 0220202D */ daddu $a0, $s1, $zero -.L80240AB0: -/* 92AD60 80240AB0 8CA20000 */ lw $v0, ($a1) -/* 92AD64 80240AB4 24A50004 */ addiu $a1, $a1, 4 -/* 92AD68 80240AB8 24630001 */ addiu $v1, $v1, 1 -/* 92AD6C 80240ABC AC820084 */ sw $v0, 0x84($a0) -/* 92AD70 80240AC0 28620010 */ slti $v0, $v1, 0x10 -/* 92AD74 80240AC4 1440FFFA */ bnez $v0, .L80240AB0 -/* 92AD78 80240AC8 24840004 */ addiu $a0, $a0, 4 -/* 92AD7C 80240ACC 3C108024 */ lui $s0, 0x8024 -/* 92AD80 80240AD0 261041D8 */ addiu $s0, $s0, 0x41d8 -/* 92AD84 80240AD4 0C00AB4B */ jal heap_free -/* 92AD88 80240AD8 8E040000 */ lw $a0, ($s0) -/* 92AD8C 80240ADC AE000000 */ sw $zero, ($s0) -.L80240AE0: -/* 92AD90 80240AE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 92AD94 80240AE4 8FB10014 */ lw $s1, 0x14($sp) -/* 92AD98 80240AE8 8FB00010 */ lw $s0, 0x10($sp) -/* 92AD9C 80240AEC 24020002 */ addiu $v0, $zero, 2 -/* 92ADA0 80240AF0 03E00008 */ jr $ra -/* 92ADA4 80240AF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s new file mode 100644 index 0000000000..0a40809781 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_02/92A9A0/func_80240A44_92ACF4.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A44_92ACF4 +/* 92ACF4 80240A44 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 92ACF8 80240A48 AFB00010 */ sw $s0, 0x10($sp) +/* 92ACFC 80240A4C 3C108024 */ lui $s0, 0x8024 +/* 92AD00 80240A50 261041D8 */ addiu $s0, $s0, 0x41d8 +/* 92AD04 80240A54 AFBF0018 */ sw $ra, 0x18($sp) +/* 92AD08 80240A58 AFB10014 */ sw $s1, 0x14($sp) +/* 92AD0C 80240A5C 8E020000 */ lw $v0, ($s0) +/* 92AD10 80240A60 14400010 */ bnez $v0, .L80240AA4 +/* 92AD14 80240A64 0080882D */ daddu $s1, $a0, $zero +/* 92AD18 80240A68 0C00AB39 */ jal heap_malloc +/* 92AD1C 80240A6C 24040040 */ addiu $a0, $zero, 0x40 +/* 92AD20 80240A70 AE020000 */ sw $v0, ($s0) +/* 92AD24 80240A74 0000182D */ daddu $v1, $zero, $zero +/* 92AD28 80240A78 0040282D */ daddu $a1, $v0, $zero +/* 92AD2C 80240A7C 0220202D */ daddu $a0, $s1, $zero +.L80240A80: +/* 92AD30 80240A80 8C820084 */ lw $v0, 0x84($a0) +/* 92AD34 80240A84 24840004 */ addiu $a0, $a0, 4 +/* 92AD38 80240A88 24630001 */ addiu $v1, $v1, 1 +/* 92AD3C 80240A8C ACA20000 */ sw $v0, ($a1) +/* 92AD40 80240A90 28620010 */ slti $v0, $v1, 0x10 +/* 92AD44 80240A94 1440FFFA */ bnez $v0, .L80240A80 +/* 92AD48 80240A98 24A50004 */ addiu $a1, $a1, 4 +/* 92AD4C 80240A9C 080902B8 */ j .L80240AE0 +/* 92AD50 80240AA0 00000000 */ nop +.L80240AA4: +/* 92AD54 80240AA4 0000182D */ daddu $v1, $zero, $zero +/* 92AD58 80240AA8 0040282D */ daddu $a1, $v0, $zero +/* 92AD5C 80240AAC 0220202D */ daddu $a0, $s1, $zero +.L80240AB0: +/* 92AD60 80240AB0 8CA20000 */ lw $v0, ($a1) +/* 92AD64 80240AB4 24A50004 */ addiu $a1, $a1, 4 +/* 92AD68 80240AB8 24630001 */ addiu $v1, $v1, 1 +/* 92AD6C 80240ABC AC820084 */ sw $v0, 0x84($a0) +/* 92AD70 80240AC0 28620010 */ slti $v0, $v1, 0x10 +/* 92AD74 80240AC4 1440FFFA */ bnez $v0, .L80240AB0 +/* 92AD78 80240AC8 24840004 */ addiu $a0, $a0, 4 +/* 92AD7C 80240ACC 3C108024 */ lui $s0, 0x8024 +/* 92AD80 80240AD0 261041D8 */ addiu $s0, $s0, 0x41d8 +/* 92AD84 80240AD4 0C00AB4B */ jal heap_free +/* 92AD88 80240AD8 8E040000 */ lw $a0, ($s0) +/* 92AD8C 80240ADC AE000000 */ sw $zero, ($s0) +.L80240AE0: +/* 92AD90 80240AE0 8FBF0018 */ lw $ra, 0x18($sp) +/* 92AD94 80240AE4 8FB10014 */ lw $s1, 0x14($sp) +/* 92AD98 80240AE8 8FB00010 */ lw $s0, 0x10($sp) +/* 92AD9C 80240AEC 24020002 */ addiu $v0, $zero, 2 +/* 92ADA0 80240AF0 03E00008 */ jr $ra +/* 92ADA4 80240AF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_80240140.s b/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_80240140.s deleted file mode 100644 index bdc5eda592..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_80240140.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240140 -/* 932700 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 932704 80240144 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 932708 80240148 4485A000 */ mtc1 $a1, $f20 -/* 93270C 8024014C F7B60020 */ sdc1 $f22, 0x20($sp) -/* 932710 80240150 4486B000 */ mtc1 $a2, $f22 -/* 932714 80240154 AFB00010 */ sw $s0, 0x10($sp) -/* 932718 80240158 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 93271C 8024015C 4487C000 */ mtc1 $a3, $f24 -/* 932720 80240160 AFBF0014 */ sw $ra, 0x14($sp) -/* 932724 80240164 0C019D28 */ jal guMtxIdentF -/* 932728 80240168 0080802D */ daddu $s0, $a0, $zero -/* 93272C 8024016C 4616A582 */ mul.s $f22, $f20, $f22 -/* 932730 80240170 00000000 */ nop -/* 932734 80240174 4618A502 */ mul.s $f20, $f20, $f24 -/* 932738 80240178 00000000 */ nop -/* 93273C 8024017C 3C013F80 */ lui $at, 0x3f80 -/* 932740 80240180 44810000 */ mtc1 $at, $f0 -/* 932744 80240184 00000000 */ nop -/* 932748 80240188 E6000014 */ swc1 $f0, 0x14($s0) -/* 93274C 8024018C E6160010 */ swc1 $f22, 0x10($s0) -/* 932750 80240190 E6140018 */ swc1 $f20, 0x18($s0) -/* 932754 80240194 8FBF0014 */ lw $ra, 0x14($sp) -/* 932758 80240198 8FB00010 */ lw $s0, 0x10($sp) -/* 93275C 8024019C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 932760 802401A0 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 932764 802401A4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 932768 802401A8 03E00008 */ jr $ra -/* 93276C 802401AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_80240140_932700.s b/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_80240140_932700.s new file mode 100644 index 0000000000..0e7f3d971e --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_80240140_932700.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240140_932700 +/* 932700 80240140 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 932704 80240144 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 932708 80240148 4485A000 */ mtc1 $a1, $f20 +/* 93270C 8024014C F7B60020 */ sdc1 $f22, 0x20($sp) +/* 932710 80240150 4486B000 */ mtc1 $a2, $f22 +/* 932714 80240154 AFB00010 */ sw $s0, 0x10($sp) +/* 932718 80240158 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 93271C 8024015C 4487C000 */ mtc1 $a3, $f24 +/* 932720 80240160 AFBF0014 */ sw $ra, 0x14($sp) +/* 932724 80240164 0C019D28 */ jal guMtxIdentF +/* 932728 80240168 0080802D */ daddu $s0, $a0, $zero +/* 93272C 8024016C 4616A582 */ mul.s $f22, $f20, $f22 +/* 932730 80240170 00000000 */ nop +/* 932734 80240174 4618A502 */ mul.s $f20, $f20, $f24 +/* 932738 80240178 00000000 */ nop +/* 93273C 8024017C 3C013F80 */ lui $at, 0x3f80 +/* 932740 80240180 44810000 */ mtc1 $at, $f0 +/* 932744 80240184 00000000 */ nop +/* 932748 80240188 E6000014 */ swc1 $f0, 0x14($s0) +/* 93274C 8024018C E6160010 */ swc1 $f22, 0x10($s0) +/* 932750 80240190 E6140018 */ swc1 $f20, 0x18($s0) +/* 932754 80240194 8FBF0014 */ lw $ra, 0x14($sp) +/* 932758 80240198 8FB00010 */ lw $s0, 0x10($sp) +/* 93275C 8024019C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 932760 802401A0 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 932764 802401A4 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 932768 802401A8 03E00008 */ jr $ra +/* 93276C 802401AC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_802401B0_932770.s b/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_802401B0_932770.s index 37838747a5..0a32ee2a0d 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_802401B0_932770.s +++ b/asm/nonmatchings/world/area_sbk/sbk_06/932600/func_802401B0_932770.s @@ -55,7 +55,7 @@ glabel func_802401B0_932770 /* 932838 80240278 4405E000 */ mfc1 $a1, $f28 /* 93283C 8024027C 4406D000 */ mfc1 $a2, $f26 /* 932840 80240280 4407C000 */ mfc1 $a3, $f24 -/* 932844 80240284 0C090050 */ jal func_80240140 +/* 932844 80240284 0C090050 */ jal func_80240140_932700 /* 932848 80240288 27A40010 */ addiu $a0, $sp, 0x10 /* 93284C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 /* 932850 80240290 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802401B0_932770 /* 9328C0 80240300 4405E000 */ mfc1 $a1, $f28 /* 9328C4 80240304 4406D000 */ mfc1 $a2, $f26 /* 9328C8 80240308 4407C000 */ mfc1 $a3, $f24 -/* 9328CC 8024030C 0C090050 */ jal func_80240140 +/* 9328CC 8024030C 0C090050 */ jal func_80240140_932700 /* 9328D0 80240310 27A40010 */ addiu $a0, $sp, 0x10 /* 9328D4 80240314 27A40010 */ addiu $a0, $sp, 0x10 /* 9328D8 80240318 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_16/9375B0/func_802400B0.s b/asm/nonmatchings/world/area_sbk/sbk_16/9375B0/func_802400B0.s deleted file mode 100644 index 804d20c60c..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_16/9375B0/func_802400B0.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400B0 -/* 937620 802400B0 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 937624 802400B4 AFB10054 */ sw $s1, 0x54($sp) -/* 937628 802400B8 0080882D */ daddu $s1, $a0, $zero -/* 93762C 802400BC AFBF005C */ sw $ra, 0x5c($sp) -/* 937630 802400C0 AFB20058 */ sw $s2, 0x58($sp) -/* 937634 802400C4 AFB00050 */ sw $s0, 0x50($sp) -/* 937638 802400C8 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 93763C 802400CC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 937640 802400D0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 937644 802400D4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 937648 802400D8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 93764C 802400DC 8E30000C */ lw $s0, 0xc($s1) -/* 937650 802400E0 8E050000 */ lw $a1, ($s0) -/* 937654 802400E4 0C0B1EAF */ jal get_variable -/* 937658 802400E8 26100004 */ addiu $s0, $s0, 4 -/* 93765C 802400EC 0C046C04 */ jal get_model_list_index_from_tree_index -/* 937660 802400F0 0040202D */ daddu $a0, $v0, $zero -/* 937664 802400F4 8E050000 */ lw $a1, ($s0) -/* 937668 802400F8 26100004 */ addiu $s0, $s0, 4 -/* 93766C 802400FC 0220202D */ daddu $a0, $s1, $zero -/* 937670 80240100 0C0B210B */ jal get_float_variable -/* 937674 80240104 0040902D */ daddu $s2, $v0, $zero -/* 937678 80240108 8E050000 */ lw $a1, ($s0) -/* 93767C 8024010C 26100004 */ addiu $s0, $s0, 4 -/* 937680 80240110 0220202D */ daddu $a0, $s1, $zero -/* 937684 80240114 0C0B210B */ jal get_float_variable -/* 937688 80240118 46000706 */ mov.s $f28, $f0 -/* 93768C 8024011C 8E050000 */ lw $a1, ($s0) -/* 937690 80240120 26100004 */ addiu $s0, $s0, 4 -/* 937694 80240124 0220202D */ daddu $a0, $s1, $zero -/* 937698 80240128 0C0B210B */ jal get_float_variable -/* 93769C 8024012C 46000686 */ mov.s $f26, $f0 -/* 9376A0 80240130 0220202D */ daddu $a0, $s1, $zero -/* 9376A4 80240134 8E050000 */ lw $a1, ($s0) -/* 9376A8 80240138 0C0B210B */ jal get_float_variable -/* 9376AC 8024013C 46000586 */ mov.s $f22, $f0 -/* 9376B0 80240140 0240202D */ daddu $a0, $s2, $zero -/* 9376B4 80240144 0C046B4C */ jal get_model_from_list_index -/* 9376B8 80240148 46000606 */ mov.s $f24, $f0 -/* 9376BC 8024014C 0040882D */ daddu $s1, $v0, $zero -/* 9376C0 80240150 96220000 */ lhu $v0, ($s1) -/* 9376C4 80240154 30420400 */ andi $v0, $v0, 0x400 -/* 9376C8 80240158 1440001E */ bnez $v0, .L802401D4 -/* 9376CC 8024015C 26300058 */ addiu $s0, $s1, 0x58 -/* 9376D0 80240160 4480A000 */ mtc1 $zero, $f20 -/* 9376D4 80240164 4406B000 */ mfc1 $a2, $f22 -/* 9376D8 80240168 4405A000 */ mfc1 $a1, $f20 -/* 9376DC 8024016C 4407A000 */ mfc1 $a3, $f20 -/* 9376E0 80240170 0C019E40 */ jal guTranslateF -/* 9376E4 80240174 0200202D */ daddu $a0, $s0, $zero -/* 9376E8 80240178 4405E000 */ mfc1 $a1, $f28 -/* 9376EC 8024017C 4406D000 */ mfc1 $a2, $f26 -/* 9376F0 80240180 4407C000 */ mfc1 $a3, $f24 -/* 9376F4 80240184 0C090010 */ jal func_80240040 -/* 9376F8 80240188 27A40010 */ addiu $a0, $sp, 0x10 -/* 9376FC 8024018C 27A40010 */ addiu $a0, $sp, 0x10 -/* 937700 80240190 0200282D */ daddu $a1, $s0, $zero -/* 937704 80240194 0C019D80 */ jal guMtxCatF -/* 937708 80240198 0200302D */ daddu $a2, $s0, $zero -/* 93770C 8024019C 27A40010 */ addiu $a0, $sp, 0x10 -/* 937710 802401A0 4600B587 */ neg.s $f22, $f22 -/* 937714 802401A4 4405A000 */ mfc1 $a1, $f20 -/* 937718 802401A8 4406B000 */ mfc1 $a2, $f22 -/* 93771C 802401AC 0C019E40 */ jal guTranslateF -/* 937720 802401B0 00A0382D */ daddu $a3, $a1, $zero -/* 937724 802401B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 937728 802401B8 0200282D */ daddu $a1, $s0, $zero -/* 93772C 802401BC 0C019D80 */ jal guMtxCatF -/* 937730 802401C0 00A0302D */ daddu $a2, $a1, $zero -/* 937734 802401C4 96220000 */ lhu $v0, ($s1) -/* 937738 802401C8 34421400 */ ori $v0, $v0, 0x1400 -/* 93773C 802401CC 08090093 */ j .L8024024C -/* 937740 802401D0 A6220000 */ sh $v0, ($s1) -.L802401D4: -/* 937744 802401D4 4480A000 */ mtc1 $zero, $f20 -/* 937748 802401D8 4406B000 */ mfc1 $a2, $f22 -/* 93774C 802401DC 4405A000 */ mfc1 $a1, $f20 -/* 937750 802401E0 4407A000 */ mfc1 $a3, $f20 -/* 937754 802401E4 0C019E40 */ jal guTranslateF -/* 937758 802401E8 27A40010 */ addiu $a0, $sp, 0x10 -/* 93775C 802401EC 27A40010 */ addiu $a0, $sp, 0x10 -/* 937760 802401F0 26300058 */ addiu $s0, $s1, 0x58 -/* 937764 802401F4 0200282D */ daddu $a1, $s0, $zero -/* 937768 802401F8 0C019D80 */ jal guMtxCatF -/* 93776C 802401FC 0200302D */ daddu $a2, $s0, $zero -/* 937770 80240200 4405E000 */ mfc1 $a1, $f28 -/* 937774 80240204 4406D000 */ mfc1 $a2, $f26 -/* 937778 80240208 4407C000 */ mfc1 $a3, $f24 -/* 93777C 8024020C 0C090010 */ jal func_80240040 -/* 937780 80240210 27A40010 */ addiu $a0, $sp, 0x10 -/* 937784 80240214 27A40010 */ addiu $a0, $sp, 0x10 -/* 937788 80240218 0200282D */ daddu $a1, $s0, $zero -/* 93778C 8024021C 0C019D80 */ jal guMtxCatF -/* 937790 80240220 0200302D */ daddu $a2, $s0, $zero -/* 937794 80240224 27A40010 */ addiu $a0, $sp, 0x10 -/* 937798 80240228 4600B587 */ neg.s $f22, $f22 -/* 93779C 8024022C 4405A000 */ mfc1 $a1, $f20 -/* 9377A0 80240230 4406B000 */ mfc1 $a2, $f22 -/* 9377A4 80240234 0C019E40 */ jal guTranslateF -/* 9377A8 80240238 00A0382D */ daddu $a3, $a1, $zero -/* 9377AC 8024023C 27A40010 */ addiu $a0, $sp, 0x10 -/* 9377B0 80240240 0200282D */ daddu $a1, $s0, $zero -/* 9377B4 80240244 0C019D80 */ jal guMtxCatF -/* 9377B8 80240248 00A0302D */ daddu $a2, $a1, $zero -.L8024024C: -/* 9377BC 8024024C 8FBF005C */ lw $ra, 0x5c($sp) -/* 9377C0 80240250 8FB20058 */ lw $s2, 0x58($sp) -/* 9377C4 80240254 8FB10054 */ lw $s1, 0x54($sp) -/* 9377C8 80240258 8FB00050 */ lw $s0, 0x50($sp) -/* 9377CC 8024025C D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 9377D0 80240260 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9377D4 80240264 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9377D8 80240268 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9377DC 8024026C D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9377E0 80240270 24020002 */ addiu $v0, $zero, 2 -/* 9377E4 80240274 03E00008 */ jr $ra -/* 9377E8 80240278 27BD0088 */ addiu $sp, $sp, 0x88 -/* 9377EC 8024027C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_16/9375B0/func_802400B0_937620.s b/asm/nonmatchings/world/area_sbk/sbk_16/9375B0/func_802400B0_937620.s new file mode 100644 index 0000000000..4c35d858d9 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_16/9375B0/func_802400B0_937620.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400B0_937620 +/* 937620 802400B0 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 937624 802400B4 AFB10054 */ sw $s1, 0x54($sp) +/* 937628 802400B8 0080882D */ daddu $s1, $a0, $zero +/* 93762C 802400BC AFBF005C */ sw $ra, 0x5c($sp) +/* 937630 802400C0 AFB20058 */ sw $s2, 0x58($sp) +/* 937634 802400C4 AFB00050 */ sw $s0, 0x50($sp) +/* 937638 802400C8 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 93763C 802400CC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 937640 802400D0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 937644 802400D4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 937648 802400D8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 93764C 802400DC 8E30000C */ lw $s0, 0xc($s1) +/* 937650 802400E0 8E050000 */ lw $a1, ($s0) +/* 937654 802400E4 0C0B1EAF */ jal get_variable +/* 937658 802400E8 26100004 */ addiu $s0, $s0, 4 +/* 93765C 802400EC 0C046C04 */ jal get_model_list_index_from_tree_index +/* 937660 802400F0 0040202D */ daddu $a0, $v0, $zero +/* 937664 802400F4 8E050000 */ lw $a1, ($s0) +/* 937668 802400F8 26100004 */ addiu $s0, $s0, 4 +/* 93766C 802400FC 0220202D */ daddu $a0, $s1, $zero +/* 937670 80240100 0C0B210B */ jal get_float_variable +/* 937674 80240104 0040902D */ daddu $s2, $v0, $zero +/* 937678 80240108 8E050000 */ lw $a1, ($s0) +/* 93767C 8024010C 26100004 */ addiu $s0, $s0, 4 +/* 937680 80240110 0220202D */ daddu $a0, $s1, $zero +/* 937684 80240114 0C0B210B */ jal get_float_variable +/* 937688 80240118 46000706 */ mov.s $f28, $f0 +/* 93768C 8024011C 8E050000 */ lw $a1, ($s0) +/* 937690 80240120 26100004 */ addiu $s0, $s0, 4 +/* 937694 80240124 0220202D */ daddu $a0, $s1, $zero +/* 937698 80240128 0C0B210B */ jal get_float_variable +/* 93769C 8024012C 46000686 */ mov.s $f26, $f0 +/* 9376A0 80240130 0220202D */ daddu $a0, $s1, $zero +/* 9376A4 80240134 8E050000 */ lw $a1, ($s0) +/* 9376A8 80240138 0C0B210B */ jal get_float_variable +/* 9376AC 8024013C 46000586 */ mov.s $f22, $f0 +/* 9376B0 80240140 0240202D */ daddu $a0, $s2, $zero +/* 9376B4 80240144 0C046B4C */ jal get_model_from_list_index +/* 9376B8 80240148 46000606 */ mov.s $f24, $f0 +/* 9376BC 8024014C 0040882D */ daddu $s1, $v0, $zero +/* 9376C0 80240150 96220000 */ lhu $v0, ($s1) +/* 9376C4 80240154 30420400 */ andi $v0, $v0, 0x400 +/* 9376C8 80240158 1440001E */ bnez $v0, .L802401D4 +/* 9376CC 8024015C 26300058 */ addiu $s0, $s1, 0x58 +/* 9376D0 80240160 4480A000 */ mtc1 $zero, $f20 +/* 9376D4 80240164 4406B000 */ mfc1 $a2, $f22 +/* 9376D8 80240168 4405A000 */ mfc1 $a1, $f20 +/* 9376DC 8024016C 4407A000 */ mfc1 $a3, $f20 +/* 9376E0 80240170 0C019E40 */ jal guTranslateF +/* 9376E4 80240174 0200202D */ daddu $a0, $s0, $zero +/* 9376E8 80240178 4405E000 */ mfc1 $a1, $f28 +/* 9376EC 8024017C 4406D000 */ mfc1 $a2, $f26 +/* 9376F0 80240180 4407C000 */ mfc1 $a3, $f24 +/* 9376F4 80240184 0C090010 */ jal func_80240040_9375B0 +/* 9376F8 80240188 27A40010 */ addiu $a0, $sp, 0x10 +/* 9376FC 8024018C 27A40010 */ addiu $a0, $sp, 0x10 +/* 937700 80240190 0200282D */ daddu $a1, $s0, $zero +/* 937704 80240194 0C019D80 */ jal guMtxCatF +/* 937708 80240198 0200302D */ daddu $a2, $s0, $zero +/* 93770C 8024019C 27A40010 */ addiu $a0, $sp, 0x10 +/* 937710 802401A0 4600B587 */ neg.s $f22, $f22 +/* 937714 802401A4 4405A000 */ mfc1 $a1, $f20 +/* 937718 802401A8 4406B000 */ mfc1 $a2, $f22 +/* 93771C 802401AC 0C019E40 */ jal guTranslateF +/* 937720 802401B0 00A0382D */ daddu $a3, $a1, $zero +/* 937724 802401B4 27A40010 */ addiu $a0, $sp, 0x10 +/* 937728 802401B8 0200282D */ daddu $a1, $s0, $zero +/* 93772C 802401BC 0C019D80 */ jal guMtxCatF +/* 937730 802401C0 00A0302D */ daddu $a2, $a1, $zero +/* 937734 802401C4 96220000 */ lhu $v0, ($s1) +/* 937738 802401C8 34421400 */ ori $v0, $v0, 0x1400 +/* 93773C 802401CC 08090093 */ j .L8024024C +/* 937740 802401D0 A6220000 */ sh $v0, ($s1) +.L802401D4: +/* 937744 802401D4 4480A000 */ mtc1 $zero, $f20 +/* 937748 802401D8 4406B000 */ mfc1 $a2, $f22 +/* 93774C 802401DC 4405A000 */ mfc1 $a1, $f20 +/* 937750 802401E0 4407A000 */ mfc1 $a3, $f20 +/* 937754 802401E4 0C019E40 */ jal guTranslateF +/* 937758 802401E8 27A40010 */ addiu $a0, $sp, 0x10 +/* 93775C 802401EC 27A40010 */ addiu $a0, $sp, 0x10 +/* 937760 802401F0 26300058 */ addiu $s0, $s1, 0x58 +/* 937764 802401F4 0200282D */ daddu $a1, $s0, $zero +/* 937768 802401F8 0C019D80 */ jal guMtxCatF +/* 93776C 802401FC 0200302D */ daddu $a2, $s0, $zero +/* 937770 80240200 4405E000 */ mfc1 $a1, $f28 +/* 937774 80240204 4406D000 */ mfc1 $a2, $f26 +/* 937778 80240208 4407C000 */ mfc1 $a3, $f24 +/* 93777C 8024020C 0C090010 */ jal func_80240040_9375B0 +/* 937780 80240210 27A40010 */ addiu $a0, $sp, 0x10 +/* 937784 80240214 27A40010 */ addiu $a0, $sp, 0x10 +/* 937788 80240218 0200282D */ daddu $a1, $s0, $zero +/* 93778C 8024021C 0C019D80 */ jal guMtxCatF +/* 937790 80240220 0200302D */ daddu $a2, $s0, $zero +/* 937794 80240224 27A40010 */ addiu $a0, $sp, 0x10 +/* 937798 80240228 4600B587 */ neg.s $f22, $f22 +/* 93779C 8024022C 4405A000 */ mfc1 $a1, $f20 +/* 9377A0 80240230 4406B000 */ mfc1 $a2, $f22 +/* 9377A4 80240234 0C019E40 */ jal guTranslateF +/* 9377A8 80240238 00A0382D */ daddu $a3, $a1, $zero +/* 9377AC 8024023C 27A40010 */ addiu $a0, $sp, 0x10 +/* 9377B0 80240240 0200282D */ daddu $a1, $s0, $zero +/* 9377B4 80240244 0C019D80 */ jal guMtxCatF +/* 9377B8 80240248 00A0302D */ daddu $a2, $a1, $zero +.L8024024C: +/* 9377BC 8024024C 8FBF005C */ lw $ra, 0x5c($sp) +/* 9377C0 80240250 8FB20058 */ lw $s2, 0x58($sp) +/* 9377C4 80240254 8FB10054 */ lw $s1, 0x54($sp) +/* 9377C8 80240258 8FB00050 */ lw $s0, 0x50($sp) +/* 9377CC 8024025C D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 9377D0 80240260 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 9377D4 80240264 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 9377D8 80240268 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 9377DC 8024026C D7B40060 */ ldc1 $f20, 0x60($sp) +/* 9377E0 80240270 24020002 */ addiu $v0, $zero, 2 +/* 9377E4 80240274 03E00008 */ jr $ra +/* 9377E8 80240278 27BD0088 */ addiu $sp, $sp, 0x88 +/* 9377EC 8024027C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_24/93AC70/func_802401B0_93ADE0.s b/asm/nonmatchings/world/area_sbk/sbk_24/93AC70/func_802401B0_93ADE0.s index c49b152608..af97e27110 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_24/93AC70/func_802401B0_93ADE0.s +++ b/asm/nonmatchings/world/area_sbk/sbk_24/93AC70/func_802401B0_93ADE0.s @@ -55,7 +55,7 @@ glabel func_802401B0_93ADE0 /* 93AEA8 80240278 4405E000 */ mfc1 $a1, $f28 /* 93AEAC 8024027C 4406D000 */ mfc1 $a2, $f26 /* 93AEB0 80240280 4407C000 */ mfc1 $a3, $f24 -/* 93AEB4 80240284 0C090050 */ jal func_80240140 +/* 93AEB4 80240284 0C090050 */ jal func_80240140_93AD70 /* 93AEB8 80240288 27A40010 */ addiu $a0, $sp, 0x10 /* 93AEBC 8024028C 27A40010 */ addiu $a0, $sp, 0x10 /* 93AEC0 80240290 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802401B0_93ADE0 /* 93AF30 80240300 4405E000 */ mfc1 $a1, $f28 /* 93AF34 80240304 4406D000 */ mfc1 $a2, $f26 /* 93AF38 80240308 4407C000 */ mfc1 $a3, $f24 -/* 93AF3C 8024030C 0C090050 */ jal func_80240140 +/* 93AF3C 8024030C 0C090050 */ jal func_80240140_93AD70 /* 93AF40 80240310 27A40010 */ addiu $a0, $sp, 0x10 /* 93AF44 80240314 27A40010 */ addiu $a0, $sp, 0x10 /* 93AF48 80240318 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_25/93C2C0/func_802401B0_93C430.s b/asm/nonmatchings/world/area_sbk/sbk_25/93C2C0/func_802401B0_93C430.s index 36f76908e5..1ef02b61ec 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_25/93C2C0/func_802401B0_93C430.s +++ b/asm/nonmatchings/world/area_sbk/sbk_25/93C2C0/func_802401B0_93C430.s @@ -55,7 +55,7 @@ glabel func_802401B0_93C430 /* 93C4F8 80240278 4405E000 */ mfc1 $a1, $f28 /* 93C4FC 8024027C 4406D000 */ mfc1 $a2, $f26 /* 93C500 80240280 4407C000 */ mfc1 $a3, $f24 -/* 93C504 80240284 0C090050 */ jal func_80240140 +/* 93C504 80240284 0C090050 */ jal func_80240140_93C3C0 /* 93C508 80240288 27A40010 */ addiu $a0, $sp, 0x10 /* 93C50C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 /* 93C510 80240290 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802401B0_93C430 /* 93C580 80240300 4405E000 */ mfc1 $a1, $f28 /* 93C584 80240304 4406D000 */ mfc1 $a2, $f26 /* 93C588 80240308 4407C000 */ mfc1 $a3, $f24 -/* 93C58C 8024030C 0C090050 */ jal func_80240140 +/* 93C58C 8024030C 0C090050 */ jal func_80240140_93C3C0 /* 93C590 80240310 27A40010 */ addiu $a0, $sp, 0x10 /* 93C594 80240314 27A40010 */ addiu $a0, $sp, 0x10 /* 93C598 80240318 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_26/93DE30/func_802401D0_93DEA0.s b/asm/nonmatchings/world/area_sbk/sbk_26/93DE30/func_802401D0_93DEA0.s index e0b3b2dfa3..58391844bc 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_26/93DE30/func_802401D0_93DEA0.s +++ b/asm/nonmatchings/world/area_sbk/sbk_26/93DE30/func_802401D0_93DEA0.s @@ -55,7 +55,7 @@ glabel func_802401D0_93DEA0 /* 93DF68 80240298 4405E000 */ mfc1 $a1, $f28 /* 93DF6C 8024029C 4406D000 */ mfc1 $a2, $f26 /* 93DF70 802402A0 4407C000 */ mfc1 $a3, $f24 -/* 93DF74 802402A4 0C090058 */ jal func_80240160 +/* 93DF74 802402A4 0C090058 */ jal func_80240160_93DE30 /* 93DF78 802402A8 27A40010 */ addiu $a0, $sp, 0x10 /* 93DF7C 802402AC 27A40010 */ addiu $a0, $sp, 0x10 /* 93DF80 802402B0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802401D0_93DEA0 /* 93DFF0 80240320 4405E000 */ mfc1 $a1, $f28 /* 93DFF4 80240324 4406D000 */ mfc1 $a2, $f26 /* 93DFF8 80240328 4407C000 */ mfc1 $a3, $f24 -/* 93DFFC 8024032C 0C090058 */ jal func_80240160 +/* 93DFFC 8024032C 0C090058 */ jal func_80240160_93DE30 /* 93E000 80240330 27A40010 */ addiu $a0, $sp, 0x10 /* 93E004 80240334 27A40010 */ addiu $a0, $sp, 0x10 /* 93E008 80240338 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s index ccd3e04d23..1c6d92e27f 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80240B64_940114.s @@ -109,47 +109,47 @@ glabel func_80240B64_940114 /* 9402A0 80240CF0 00000000 */ nop /* 9402A4 80240CF4 0280202D */ daddu $a0, $s4, $zero /* 9402A8 80240CF8 0260282D */ daddu $a1, $s3, $zero -/* 9402AC 80240CFC 0C0900DC */ jal func_80240370 +/* 9402AC 80240CFC 0C0900DC */ jal func_80240370_93F920 /* 9402B0 80240D00 02A0302D */ daddu $a2, $s5, $zero /* 9402B4 80240D04 0280202D */ daddu $a0, $s4, $zero /* 9402B8 80240D08 0260282D */ daddu $a1, $s3, $zero -/* 9402BC 80240D0C 0C090109 */ jal func_80240424 +/* 9402BC 80240D0C 0C090109 */ jal func_80240424_93F9D4 /* 9402C0 80240D10 02A0302D */ daddu $a2, $s5, $zero /* 9402C4 80240D14 0809036D */ j .L80240DB4 /* 9402C8 80240D18 00000000 */ nop /* 9402CC 80240D1C 0280202D */ daddu $a0, $s4, $zero /* 9402D0 80240D20 0260282D */ daddu $a1, $s3, $zero -/* 9402D4 80240D24 0C090151 */ jal func_80240544 +/* 9402D4 80240D24 0C090151 */ jal func_80240544_93FAF4 /* 9402D8 80240D28 02A0302D */ daddu $a2, $s5, $zero /* 9402DC 80240D2C 0280202D */ daddu $a0, $s4, $zero /* 9402E0 80240D30 0260282D */ daddu $a1, $s3, $zero -/* 9402E4 80240D34 0C090169 */ jal func_802405A4 +/* 9402E4 80240D34 0C090169 */ jal func_802405A4_93FB54 /* 9402E8 80240D38 02A0302D */ daddu $a2, $s5, $zero /* 9402EC 80240D3C 0809036D */ j .L80240DB4 /* 9402F0 80240D40 00000000 */ nop /* 9402F4 80240D44 0280202D */ daddu $a0, $s4, $zero /* 9402F8 80240D48 0260282D */ daddu $a1, $s3, $zero -/* 9402FC 80240D4C 0C090187 */ jal func_8024061C +/* 9402FC 80240D4C 0C090187 */ jal func_8024061C_93FBCC /* 940300 80240D50 02A0302D */ daddu $a2, $s5, $zero /* 940304 80240D54 0280202D */ daddu $a0, $s4, $zero /* 940308 80240D58 0260282D */ daddu $a1, $s3, $zero -/* 94030C 80240D5C 0C0901D3 */ jal func_8024074C +/* 94030C 80240D5C 0C0901D3 */ jal func_8024074C_93FCFC /* 940310 80240D60 02A0302D */ daddu $a2, $s5, $zero /* 940314 80240D64 0809036D */ j .L80240DB4 /* 940318 80240D68 00000000 */ nop /* 94031C 80240D6C 0280202D */ daddu $a0, $s4, $zero /* 940320 80240D70 0260282D */ daddu $a1, $s3, $zero -/* 940324 80240D74 0C09021A */ jal func_80240868 +/* 940324 80240D74 0C09021A */ jal func_80240868_93FE18 /* 940328 80240D78 02A0302D */ daddu $a2, $s5, $zero /* 94032C 80240D7C 0809036D */ j .L80240DB4 /* 940330 80240D80 00000000 */ nop /* 940334 80240D84 0280202D */ daddu $a0, $s4, $zero /* 940338 80240D88 0260282D */ daddu $a1, $s3, $zero -/* 94033C 80240D8C 0C09022C */ jal func_802408B0 +/* 94033C 80240D8C 0C09022C */ jal func_802408B0_93FE60 /* 940340 80240D90 02A0302D */ daddu $a2, $s5, $zero /* 940344 80240D94 0280202D */ daddu $a0, $s4, $zero /* 940348 80240D98 0260282D */ daddu $a1, $s3, $zero -/* 94034C 80240D9C 0C090257 */ jal func_8024095C +/* 94034C 80240D9C 0C090257 */ jal func_8024095C_93FF0C /* 940350 80240DA0 02A0302D */ daddu $a2, $s5, $zero /* 940354 80240DA4 0809036D */ j .L80240DB4 /* 940358 80240DA8 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248.s deleted file mode 100644 index 9ed8bc3890..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241248 -/* 9407F8 80241248 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9407FC 8024124C AFBF0010 */ sw $ra, 0x10($sp) -/* 940800 80241250 8C82000C */ lw $v0, 0xc($a0) -/* 940804 80241254 0C0B1EAF */ jal get_variable -/* 940808 80241258 8C450000 */ lw $a1, ($v0) -/* 94080C 8024125C 0040182D */ daddu $v1, $v0, $zero -/* 940810 80241260 10600012 */ beqz $v1, .L802412AC -/* 940814 80241264 0000202D */ daddu $a0, $zero, $zero -/* 940818 80241268 8C620000 */ lw $v0, ($v1) -/* 94081C 8024126C 5040000A */ beql $v0, $zero, .L80241298 -/* 940820 80241270 00041080 */ sll $v0, $a0, 2 -/* 940824 80241274 3C058024 */ lui $a1, 0x8024 -/* 940828 80241278 24A54C18 */ addiu $a1, $a1, 0x4c18 -.L8024127C: -/* 94082C 8024127C 24630004 */ addiu $v1, $v1, 4 -/* 940830 80241280 24840001 */ addiu $a0, $a0, 1 -/* 940834 80241284 ACA20000 */ sw $v0, ($a1) -/* 940838 80241288 8C620000 */ lw $v0, ($v1) -/* 94083C 8024128C 1440FFFB */ bnez $v0, .L8024127C -/* 940840 80241290 24A50004 */ addiu $a1, $a1, 4 -/* 940844 80241294 00041080 */ sll $v0, $a0, 2 -.L80241298: -/* 940848 80241298 3C018024 */ lui $at, 0x8024 -/* 94084C 8024129C 00220821 */ addu $at, $at, $v0 -/* 940850 802412A0 AC204C18 */ sw $zero, 0x4c18($at) -/* 940854 802412A4 080904B5 */ j .L802412D4 -/* 940858 802412A8 00000000 */ nop -.L802412AC: -/* 94085C 802412AC 3C038024 */ lui $v1, 0x8024 -/* 940860 802412B0 24634C18 */ addiu $v1, $v1, 0x4c18 -/* 940864 802412B4 0060282D */ daddu $a1, $v1, $zero -.L802412B8: -/* 940868 802412B8 24820080 */ addiu $v0, $a0, 0x80 -/* 94086C 802412BC AC620000 */ sw $v0, ($v1) -/* 940870 802412C0 24630004 */ addiu $v1, $v1, 4 -/* 940874 802412C4 24840001 */ addiu $a0, $a0, 1 -/* 940878 802412C8 2882005B */ slti $v0, $a0, 0x5b -/* 94087C 802412CC 1440FFFA */ bnez $v0, .L802412B8 -/* 940880 802412D0 ACA0016C */ sw $zero, 0x16c($a1) -.L802412D4: -/* 940884 802412D4 8FBF0010 */ lw $ra, 0x10($sp) -/* 940888 802412D8 24020002 */ addiu $v0, $zero, 2 -/* 94088C 802412DC 03E00008 */ jr $ra -/* 940890 802412E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s new file mode 100644 index 0000000000..c295db235a --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241248_9407F8.s @@ -0,0 +1,48 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241248_9407F8 +/* 9407F8 80241248 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9407FC 8024124C AFBF0010 */ sw $ra, 0x10($sp) +/* 940800 80241250 8C82000C */ lw $v0, 0xc($a0) +/* 940804 80241254 0C0B1EAF */ jal get_variable +/* 940808 80241258 8C450000 */ lw $a1, ($v0) +/* 94080C 8024125C 0040182D */ daddu $v1, $v0, $zero +/* 940810 80241260 10600012 */ beqz $v1, .L802412AC +/* 940814 80241264 0000202D */ daddu $a0, $zero, $zero +/* 940818 80241268 8C620000 */ lw $v0, ($v1) +/* 94081C 8024126C 5040000A */ beql $v0, $zero, .L80241298 +/* 940820 80241270 00041080 */ sll $v0, $a0, 2 +/* 940824 80241274 3C058024 */ lui $a1, 0x8024 +/* 940828 80241278 24A54C18 */ addiu $a1, $a1, 0x4c18 +.L8024127C: +/* 94082C 8024127C 24630004 */ addiu $v1, $v1, 4 +/* 940830 80241280 24840001 */ addiu $a0, $a0, 1 +/* 940834 80241284 ACA20000 */ sw $v0, ($a1) +/* 940838 80241288 8C620000 */ lw $v0, ($v1) +/* 94083C 8024128C 1440FFFB */ bnez $v0, .L8024127C +/* 940840 80241290 24A50004 */ addiu $a1, $a1, 4 +/* 940844 80241294 00041080 */ sll $v0, $a0, 2 +.L80241298: +/* 940848 80241298 3C018024 */ lui $at, 0x8024 +/* 94084C 8024129C 00220821 */ addu $at, $at, $v0 +/* 940850 802412A0 AC204C18 */ sw $zero, 0x4c18($at) +/* 940854 802412A4 080904B5 */ j .L802412D4 +/* 940858 802412A8 00000000 */ nop +.L802412AC: +/* 94085C 802412AC 3C038024 */ lui $v1, 0x8024 +/* 940860 802412B0 24634C18 */ addiu $v1, $v1, 0x4c18 +/* 940864 802412B4 0060282D */ daddu $a1, $v1, $zero +.L802412B8: +/* 940868 802412B8 24820080 */ addiu $v0, $a0, 0x80 +/* 94086C 802412BC AC620000 */ sw $v0, ($v1) +/* 940870 802412C0 24630004 */ addiu $v1, $v1, 4 +/* 940874 802412C4 24840001 */ addiu $a0, $a0, 1 +/* 940878 802412C8 2882005B */ slti $v0, $a0, 0x5b +/* 94087C 802412CC 1440FFFA */ bnez $v0, .L802412B8 +/* 940880 802412D0 ACA0016C */ sw $zero, 0x16c($a1) +.L802412D4: +/* 940884 802412D4 8FBF0010 */ lw $ra, 0x10($sp) +/* 940888 802412D8 24020002 */ addiu $v0, $zero, 2 +/* 94088C 802412DC 03E00008 */ jr $ra +/* 940890 802412E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802412E4.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802412E4.s deleted file mode 100644 index efd43b95ef..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802412E4.s +++ /dev/null @@ -1,64 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E4 -/* 940894 802412E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 940898 802412E8 AFB10014 */ sw $s1, 0x14($sp) -/* 94089C 802412EC 0080882D */ daddu $s1, $a0, $zero -/* 9408A0 802412F0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9408A4 802412F4 AFB00010 */ sw $s0, 0x10($sp) -/* 9408A8 802412F8 8E30000C */ lw $s0, 0xc($s1) -/* 9408AC 802412FC 8E050000 */ lw $a1, ($s0) -/* 9408B0 80241300 0C0B1EAF */ jal get_variable -/* 9408B4 80241304 26100004 */ addiu $s0, $s0, 4 -/* 9408B8 80241308 AE22008C */ sw $v0, 0x8c($s1) -/* 9408BC 8024130C 8E050000 */ lw $a1, ($s0) -/* 9408C0 80241310 26100004 */ addiu $s0, $s0, 4 -/* 9408C4 80241314 0C0B1EAF */ jal get_variable -/* 9408C8 80241318 0220202D */ daddu $a0, $s1, $zero -/* 9408CC 8024131C AE220090 */ sw $v0, 0x90($s1) -/* 9408D0 80241320 8E050000 */ lw $a1, ($s0) -/* 9408D4 80241324 26100004 */ addiu $s0, $s0, 4 -/* 9408D8 80241328 0C0B1EAF */ jal get_variable -/* 9408DC 8024132C 0220202D */ daddu $a0, $s1, $zero -/* 9408E0 80241330 AE220094 */ sw $v0, 0x94($s1) -/* 9408E4 80241334 8E050000 */ lw $a1, ($s0) -/* 9408E8 80241338 26100004 */ addiu $s0, $s0, 4 -/* 9408EC 8024133C 0C0B1EAF */ jal get_variable -/* 9408F0 80241340 0220202D */ daddu $a0, $s1, $zero -/* 9408F4 80241344 AE220098 */ sw $v0, 0x98($s1) -/* 9408F8 80241348 8E050000 */ lw $a1, ($s0) -/* 9408FC 8024134C 26100004 */ addiu $s0, $s0, 4 -/* 940900 80241350 0C0B1EAF */ jal get_variable -/* 940904 80241354 0220202D */ daddu $a0, $s1, $zero -/* 940908 80241358 AE22009C */ sw $v0, 0x9c($s1) -/* 94090C 8024135C 8E050000 */ lw $a1, ($s0) -/* 940910 80241360 26100004 */ addiu $s0, $s0, 4 -/* 940914 80241364 0C0B1EAF */ jal get_variable -/* 940918 80241368 0220202D */ daddu $a0, $s1, $zero -/* 94091C 8024136C AE2200A0 */ sw $v0, 0xa0($s1) -/* 940920 80241370 8E050000 */ lw $a1, ($s0) -/* 940924 80241374 26100004 */ addiu $s0, $s0, 4 -/* 940928 80241378 0C0B1EAF */ jal get_variable -/* 94092C 8024137C 0220202D */ daddu $a0, $s1, $zero -/* 940930 80241380 AE2200A4 */ sw $v0, 0xa4($s1) -/* 940934 80241384 8E050000 */ lw $a1, ($s0) -/* 940938 80241388 26100004 */ addiu $s0, $s0, 4 -/* 94093C 8024138C 0C0B1EAF */ jal get_variable -/* 940940 80241390 0220202D */ daddu $a0, $s1, $zero -/* 940944 80241394 AE2200A8 */ sw $v0, 0xa8($s1) -/* 940948 80241398 8E050000 */ lw $a1, ($s0) -/* 94094C 8024139C 26100004 */ addiu $s0, $s0, 4 -/* 940950 802413A0 0C0B1EAF */ jal get_variable -/* 940954 802413A4 0220202D */ daddu $a0, $s1, $zero -/* 940958 802413A8 AE2200AC */ sw $v0, 0xac($s1) -/* 94095C 802413AC 8E050000 */ lw $a1, ($s0) -/* 940960 802413B0 0C0B1EAF */ jal get_variable -/* 940964 802413B4 0220202D */ daddu $a0, $s1, $zero -/* 940968 802413B8 AE2200B0 */ sw $v0, 0xb0($s1) -/* 94096C 802413BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 940970 802413C0 8FB10014 */ lw $s1, 0x14($sp) -/* 940974 802413C4 8FB00010 */ lw $s0, 0x10($sp) -/* 940978 802413C8 24020002 */ addiu $v0, $zero, 2 -/* 94097C 802413CC 03E00008 */ jr $ra -/* 940980 802413D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802412E4_940894.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802412E4_940894.s new file mode 100644 index 0000000000..f6e2ece714 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802412E4_940894.s @@ -0,0 +1,64 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412E4_940894 +/* 940894 802412E4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 940898 802412E8 AFB10014 */ sw $s1, 0x14($sp) +/* 94089C 802412EC 0080882D */ daddu $s1, $a0, $zero +/* 9408A0 802412F0 AFBF0018 */ sw $ra, 0x18($sp) +/* 9408A4 802412F4 AFB00010 */ sw $s0, 0x10($sp) +/* 9408A8 802412F8 8E30000C */ lw $s0, 0xc($s1) +/* 9408AC 802412FC 8E050000 */ lw $a1, ($s0) +/* 9408B0 80241300 0C0B1EAF */ jal get_variable +/* 9408B4 80241304 26100004 */ addiu $s0, $s0, 4 +/* 9408B8 80241308 AE22008C */ sw $v0, 0x8c($s1) +/* 9408BC 8024130C 8E050000 */ lw $a1, ($s0) +/* 9408C0 80241310 26100004 */ addiu $s0, $s0, 4 +/* 9408C4 80241314 0C0B1EAF */ jal get_variable +/* 9408C8 80241318 0220202D */ daddu $a0, $s1, $zero +/* 9408CC 8024131C AE220090 */ sw $v0, 0x90($s1) +/* 9408D0 80241320 8E050000 */ lw $a1, ($s0) +/* 9408D4 80241324 26100004 */ addiu $s0, $s0, 4 +/* 9408D8 80241328 0C0B1EAF */ jal get_variable +/* 9408DC 8024132C 0220202D */ daddu $a0, $s1, $zero +/* 9408E0 80241330 AE220094 */ sw $v0, 0x94($s1) +/* 9408E4 80241334 8E050000 */ lw $a1, ($s0) +/* 9408E8 80241338 26100004 */ addiu $s0, $s0, 4 +/* 9408EC 8024133C 0C0B1EAF */ jal get_variable +/* 9408F0 80241340 0220202D */ daddu $a0, $s1, $zero +/* 9408F4 80241344 AE220098 */ sw $v0, 0x98($s1) +/* 9408F8 80241348 8E050000 */ lw $a1, ($s0) +/* 9408FC 8024134C 26100004 */ addiu $s0, $s0, 4 +/* 940900 80241350 0C0B1EAF */ jal get_variable +/* 940904 80241354 0220202D */ daddu $a0, $s1, $zero +/* 940908 80241358 AE22009C */ sw $v0, 0x9c($s1) +/* 94090C 8024135C 8E050000 */ lw $a1, ($s0) +/* 940910 80241360 26100004 */ addiu $s0, $s0, 4 +/* 940914 80241364 0C0B1EAF */ jal get_variable +/* 940918 80241368 0220202D */ daddu $a0, $s1, $zero +/* 94091C 8024136C AE2200A0 */ sw $v0, 0xa0($s1) +/* 940920 80241370 8E050000 */ lw $a1, ($s0) +/* 940924 80241374 26100004 */ addiu $s0, $s0, 4 +/* 940928 80241378 0C0B1EAF */ jal get_variable +/* 94092C 8024137C 0220202D */ daddu $a0, $s1, $zero +/* 940930 80241380 AE2200A4 */ sw $v0, 0xa4($s1) +/* 940934 80241384 8E050000 */ lw $a1, ($s0) +/* 940938 80241388 26100004 */ addiu $s0, $s0, 4 +/* 94093C 8024138C 0C0B1EAF */ jal get_variable +/* 940940 80241390 0220202D */ daddu $a0, $s1, $zero +/* 940944 80241394 AE2200A8 */ sw $v0, 0xa8($s1) +/* 940948 80241398 8E050000 */ lw $a1, ($s0) +/* 94094C 8024139C 26100004 */ addiu $s0, $s0, 4 +/* 940950 802413A0 0C0B1EAF */ jal get_variable +/* 940954 802413A4 0220202D */ daddu $a0, $s1, $zero +/* 940958 802413A8 AE2200AC */ sw $v0, 0xac($s1) +/* 94095C 802413AC 8E050000 */ lw $a1, ($s0) +/* 940960 802413B0 0C0B1EAF */ jal get_variable +/* 940964 802413B4 0220202D */ daddu $a0, $s1, $zero +/* 940968 802413B8 AE2200B0 */ sw $v0, 0xb0($s1) +/* 94096C 802413BC 8FBF0018 */ lw $ra, 0x18($sp) +/* 940970 802413C0 8FB10014 */ lw $s1, 0x14($sp) +/* 940974 802413C4 8FB00010 */ lw $s0, 0x10($sp) +/* 940978 802413C8 24020002 */ addiu $v0, $zero, 2 +/* 94097C 802413CC 03E00008 */ jr $ra +/* 940980 802413D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560.s deleted file mode 100644 index 688cc9d389..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241560 -/* 940B10 80241560 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 940B14 80241564 AFB00010 */ sw $s0, 0x10($sp) -/* 940B18 80241568 0080802D */ daddu $s0, $a0, $zero -/* 940B1C 8024156C AFBF0014 */ sw $ra, 0x14($sp) -/* 940B20 80241570 0C00EABB */ jal get_npc_unsafe -/* 940B24 80241574 8E04008C */ lw $a0, 0x8c($s0) -/* 940B28 80241578 0040282D */ daddu $a1, $v0, $zero -/* 940B2C 8024157C 8E040094 */ lw $a0, 0x94($s0) -/* 940B30 80241580 8CA30028 */ lw $v1, 0x28($a1) -/* 940B34 80241584 ACA40028 */ sw $a0, 0x28($a1) -/* 940B38 80241588 8FBF0014 */ lw $ra, 0x14($sp) -/* 940B3C 8024158C 8FB00010 */ lw $s0, 0x10($sp) -/* 940B40 80241590 24020002 */ addiu $v0, $zero, 2 -/* 940B44 80241594 3C018024 */ lui $at, 0x8024 -/* 940B48 80241598 AC234D88 */ sw $v1, 0x4d88($at) -/* 940B4C 8024159C 03E00008 */ jr $ra -/* 940B50 802415A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s new file mode 100644 index 0000000000..488f9f5b5a --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241560_940B10.s @@ -0,0 +1,21 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241560_940B10 +/* 940B10 80241560 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 940B14 80241564 AFB00010 */ sw $s0, 0x10($sp) +/* 940B18 80241568 0080802D */ daddu $s0, $a0, $zero +/* 940B1C 8024156C AFBF0014 */ sw $ra, 0x14($sp) +/* 940B20 80241570 0C00EABB */ jal get_npc_unsafe +/* 940B24 80241574 8E04008C */ lw $a0, 0x8c($s0) +/* 940B28 80241578 0040282D */ daddu $a1, $v0, $zero +/* 940B2C 8024157C 8E040094 */ lw $a0, 0x94($s0) +/* 940B30 80241580 8CA30028 */ lw $v1, 0x28($a1) +/* 940B34 80241584 ACA40028 */ sw $a0, 0x28($a1) +/* 940B38 80241588 8FBF0014 */ lw $ra, 0x14($sp) +/* 940B3C 8024158C 8FB00010 */ lw $s0, 0x10($sp) +/* 940B40 80241590 24020002 */ addiu $v0, $zero, 2 +/* 940B44 80241594 3C018024 */ lui $at, 0x8024 +/* 940B48 80241598 AC234D88 */ sw $v1, 0x4d88($at) +/* 940B4C 8024159C 03E00008 */ jr $ra +/* 940B50 802415A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4.s deleted file mode 100644 index 830cbe5e56..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415A4 -/* 940B54 802415A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 940B58 802415A8 AFBF0010 */ sw $ra, 0x10($sp) -/* 940B5C 802415AC 0C00EABB */ jal get_npc_unsafe -/* 940B60 802415B0 8C84008C */ lw $a0, 0x8c($a0) -/* 940B64 802415B4 3C038024 */ lui $v1, 0x8024 -/* 940B68 802415B8 8C634D88 */ lw $v1, 0x4d88($v1) -/* 940B6C 802415BC AC430028 */ sw $v1, 0x28($v0) -/* 940B70 802415C0 8FBF0010 */ lw $ra, 0x10($sp) -/* 940B74 802415C4 24020002 */ addiu $v0, $zero, 2 -/* 940B78 802415C8 03E00008 */ jr $ra -/* 940B7C 802415CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s new file mode 100644 index 0000000000..f5c2820f6c --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415A4_940B54.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415A4_940B54 +/* 940B54 802415A4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 940B58 802415A8 AFBF0010 */ sw $ra, 0x10($sp) +/* 940B5C 802415AC 0C00EABB */ jal get_npc_unsafe +/* 940B60 802415B0 8C84008C */ lw $a0, 0x8c($a0) +/* 940B64 802415B4 3C038024 */ lui $v1, 0x8024 +/* 940B68 802415B8 8C634D88 */ lw $v1, 0x4d88($v1) +/* 940B6C 802415BC AC430028 */ sw $v1, 0x28($v0) +/* 940B70 802415C0 8FBF0010 */ lw $ra, 0x10($sp) +/* 940B74 802415C4 24020002 */ addiu $v0, $zero, 2 +/* 940B78 802415C8 03E00008 */ jr $ra +/* 940B7C 802415CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415D0.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415D0.s deleted file mode 100644 index a91c5b5a11..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415D0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415D0 -/* 940B80 802415D0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 940B84 802415D4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 940B88 802415D8 4485A000 */ mtc1 $a1, $f20 -/* 940B8C 802415DC F7B60020 */ sdc1 $f22, 0x20($sp) -/* 940B90 802415E0 4486B000 */ mtc1 $a2, $f22 -/* 940B94 802415E4 AFB00010 */ sw $s0, 0x10($sp) -/* 940B98 802415E8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 940B9C 802415EC 4487C000 */ mtc1 $a3, $f24 -/* 940BA0 802415F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 940BA4 802415F4 0C019D28 */ jal guMtxIdentF -/* 940BA8 802415F8 0080802D */ daddu $s0, $a0, $zero -/* 940BAC 802415FC 4616A582 */ mul.s $f22, $f20, $f22 -/* 940BB0 80241600 00000000 */ nop -/* 940BB4 80241604 4618A502 */ mul.s $f20, $f20, $f24 -/* 940BB8 80241608 00000000 */ nop -/* 940BBC 8024160C 3C013F80 */ lui $at, 0x3f80 -/* 940BC0 80241610 44810000 */ mtc1 $at, $f0 -/* 940BC4 80241614 00000000 */ nop -/* 940BC8 80241618 E6000014 */ swc1 $f0, 0x14($s0) -/* 940BCC 8024161C E6160010 */ swc1 $f22, 0x10($s0) -/* 940BD0 80241620 E6140018 */ swc1 $f20, 0x18($s0) -/* 940BD4 80241624 8FBF0014 */ lw $ra, 0x14($sp) -/* 940BD8 80241628 8FB00010 */ lw $s0, 0x10($sp) -/* 940BDC 8024162C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 940BE0 80241630 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 940BE4 80241634 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 940BE8 80241638 03E00008 */ jr $ra -/* 940BEC 8024163C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415D0_940B80.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415D0_940B80.s new file mode 100644 index 0000000000..31cce07f7d --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_802415D0_940B80.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802415D0_940B80 +/* 940B80 802415D0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 940B84 802415D4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 940B88 802415D8 4485A000 */ mtc1 $a1, $f20 +/* 940B8C 802415DC F7B60020 */ sdc1 $f22, 0x20($sp) +/* 940B90 802415E0 4486B000 */ mtc1 $a2, $f22 +/* 940B94 802415E4 AFB00010 */ sw $s0, 0x10($sp) +/* 940B98 802415E8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 940B9C 802415EC 4487C000 */ mtc1 $a3, $f24 +/* 940BA0 802415F0 AFBF0014 */ sw $ra, 0x14($sp) +/* 940BA4 802415F4 0C019D28 */ jal guMtxIdentF +/* 940BA8 802415F8 0080802D */ daddu $s0, $a0, $zero +/* 940BAC 802415FC 4616A582 */ mul.s $f22, $f20, $f22 +/* 940BB0 80241600 00000000 */ nop +/* 940BB4 80241604 4618A502 */ mul.s $f20, $f20, $f24 +/* 940BB8 80241608 00000000 */ nop +/* 940BBC 8024160C 3C013F80 */ lui $at, 0x3f80 +/* 940BC0 80241610 44810000 */ mtc1 $at, $f0 +/* 940BC4 80241614 00000000 */ nop +/* 940BC8 80241618 E6000014 */ swc1 $f0, 0x14($s0) +/* 940BCC 8024161C E6160010 */ swc1 $f22, 0x10($s0) +/* 940BD0 80241620 E6140018 */ swc1 $f20, 0x18($s0) +/* 940BD4 80241624 8FBF0014 */ lw $ra, 0x14($sp) +/* 940BD8 80241628 8FB00010 */ lw $s0, 0x10($sp) +/* 940BDC 8024162C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 940BE0 80241630 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 940BE4 80241634 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 940BE8 80241638 03E00008 */ jr $ra +/* 940BEC 8024163C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241640.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241640.s deleted file mode 100644 index b11e45cdb6..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241640.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241640 -/* 940BF0 80241640 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 940BF4 80241644 AFB10054 */ sw $s1, 0x54($sp) -/* 940BF8 80241648 0080882D */ daddu $s1, $a0, $zero -/* 940BFC 8024164C AFBF005C */ sw $ra, 0x5c($sp) -/* 940C00 80241650 AFB20058 */ sw $s2, 0x58($sp) -/* 940C04 80241654 AFB00050 */ sw $s0, 0x50($sp) -/* 940C08 80241658 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 940C0C 8024165C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 940C10 80241660 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 940C14 80241664 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 940C18 80241668 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 940C1C 8024166C 8E30000C */ lw $s0, 0xc($s1) -/* 940C20 80241670 8E050000 */ lw $a1, ($s0) -/* 940C24 80241674 0C0B1EAF */ jal get_variable -/* 940C28 80241678 26100004 */ addiu $s0, $s0, 4 -/* 940C2C 8024167C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 940C30 80241680 0040202D */ daddu $a0, $v0, $zero -/* 940C34 80241684 8E050000 */ lw $a1, ($s0) -/* 940C38 80241688 26100004 */ addiu $s0, $s0, 4 -/* 940C3C 8024168C 0220202D */ daddu $a0, $s1, $zero -/* 940C40 80241690 0C0B210B */ jal get_float_variable -/* 940C44 80241694 0040902D */ daddu $s2, $v0, $zero -/* 940C48 80241698 8E050000 */ lw $a1, ($s0) -/* 940C4C 8024169C 26100004 */ addiu $s0, $s0, 4 -/* 940C50 802416A0 0220202D */ daddu $a0, $s1, $zero -/* 940C54 802416A4 0C0B210B */ jal get_float_variable -/* 940C58 802416A8 46000706 */ mov.s $f28, $f0 -/* 940C5C 802416AC 8E050000 */ lw $a1, ($s0) -/* 940C60 802416B0 26100004 */ addiu $s0, $s0, 4 -/* 940C64 802416B4 0220202D */ daddu $a0, $s1, $zero -/* 940C68 802416B8 0C0B210B */ jal get_float_variable -/* 940C6C 802416BC 46000686 */ mov.s $f26, $f0 -/* 940C70 802416C0 0220202D */ daddu $a0, $s1, $zero -/* 940C74 802416C4 8E050000 */ lw $a1, ($s0) -/* 940C78 802416C8 0C0B210B */ jal get_float_variable -/* 940C7C 802416CC 46000586 */ mov.s $f22, $f0 -/* 940C80 802416D0 0240202D */ daddu $a0, $s2, $zero -/* 940C84 802416D4 0C046B4C */ jal get_model_from_list_index -/* 940C88 802416D8 46000606 */ mov.s $f24, $f0 -/* 940C8C 802416DC 0040882D */ daddu $s1, $v0, $zero -/* 940C90 802416E0 96220000 */ lhu $v0, ($s1) -/* 940C94 802416E4 30420400 */ andi $v0, $v0, 0x400 -/* 940C98 802416E8 1440001E */ bnez $v0, .L80241764 -/* 940C9C 802416EC 26300058 */ addiu $s0, $s1, 0x58 -/* 940CA0 802416F0 4480A000 */ mtc1 $zero, $f20 -/* 940CA4 802416F4 4406B000 */ mfc1 $a2, $f22 -/* 940CA8 802416F8 4405A000 */ mfc1 $a1, $f20 -/* 940CAC 802416FC 4407A000 */ mfc1 $a3, $f20 -/* 940CB0 80241700 0C019E40 */ jal guTranslateF -/* 940CB4 80241704 0200202D */ daddu $a0, $s0, $zero -/* 940CB8 80241708 4405E000 */ mfc1 $a1, $f28 -/* 940CBC 8024170C 4406D000 */ mfc1 $a2, $f26 -/* 940CC0 80241710 4407C000 */ mfc1 $a3, $f24 -/* 940CC4 80241714 0C090574 */ jal func_802415D0 -/* 940CC8 80241718 27A40010 */ addiu $a0, $sp, 0x10 -/* 940CCC 8024171C 27A40010 */ addiu $a0, $sp, 0x10 -/* 940CD0 80241720 0200282D */ daddu $a1, $s0, $zero -/* 940CD4 80241724 0C019D80 */ jal guMtxCatF -/* 940CD8 80241728 0200302D */ daddu $a2, $s0, $zero -/* 940CDC 8024172C 27A40010 */ addiu $a0, $sp, 0x10 -/* 940CE0 80241730 4600B587 */ neg.s $f22, $f22 -/* 940CE4 80241734 4405A000 */ mfc1 $a1, $f20 -/* 940CE8 80241738 4406B000 */ mfc1 $a2, $f22 -/* 940CEC 8024173C 0C019E40 */ jal guTranslateF -/* 940CF0 80241740 00A0382D */ daddu $a3, $a1, $zero -/* 940CF4 80241744 27A40010 */ addiu $a0, $sp, 0x10 -/* 940CF8 80241748 0200282D */ daddu $a1, $s0, $zero -/* 940CFC 8024174C 0C019D80 */ jal guMtxCatF -/* 940D00 80241750 00A0302D */ daddu $a2, $a1, $zero -/* 940D04 80241754 96220000 */ lhu $v0, ($s1) -/* 940D08 80241758 34421400 */ ori $v0, $v0, 0x1400 -/* 940D0C 8024175C 080905F7 */ j .L802417DC -/* 940D10 80241760 A6220000 */ sh $v0, ($s1) -.L80241764: -/* 940D14 80241764 4480A000 */ mtc1 $zero, $f20 -/* 940D18 80241768 4406B000 */ mfc1 $a2, $f22 -/* 940D1C 8024176C 4405A000 */ mfc1 $a1, $f20 -/* 940D20 80241770 4407A000 */ mfc1 $a3, $f20 -/* 940D24 80241774 0C019E40 */ jal guTranslateF -/* 940D28 80241778 27A40010 */ addiu $a0, $sp, 0x10 -/* 940D2C 8024177C 27A40010 */ addiu $a0, $sp, 0x10 -/* 940D30 80241780 26300058 */ addiu $s0, $s1, 0x58 -/* 940D34 80241784 0200282D */ daddu $a1, $s0, $zero -/* 940D38 80241788 0C019D80 */ jal guMtxCatF -/* 940D3C 8024178C 0200302D */ daddu $a2, $s0, $zero -/* 940D40 80241790 4405E000 */ mfc1 $a1, $f28 -/* 940D44 80241794 4406D000 */ mfc1 $a2, $f26 -/* 940D48 80241798 4407C000 */ mfc1 $a3, $f24 -/* 940D4C 8024179C 0C090574 */ jal func_802415D0 -/* 940D50 802417A0 27A40010 */ addiu $a0, $sp, 0x10 -/* 940D54 802417A4 27A40010 */ addiu $a0, $sp, 0x10 -/* 940D58 802417A8 0200282D */ daddu $a1, $s0, $zero -/* 940D5C 802417AC 0C019D80 */ jal guMtxCatF -/* 940D60 802417B0 0200302D */ daddu $a2, $s0, $zero -/* 940D64 802417B4 27A40010 */ addiu $a0, $sp, 0x10 -/* 940D68 802417B8 4600B587 */ neg.s $f22, $f22 -/* 940D6C 802417BC 4405A000 */ mfc1 $a1, $f20 -/* 940D70 802417C0 4406B000 */ mfc1 $a2, $f22 -/* 940D74 802417C4 0C019E40 */ jal guTranslateF -/* 940D78 802417C8 00A0382D */ daddu $a3, $a1, $zero -/* 940D7C 802417CC 27A40010 */ addiu $a0, $sp, 0x10 -/* 940D80 802417D0 0200282D */ daddu $a1, $s0, $zero -/* 940D84 802417D4 0C019D80 */ jal guMtxCatF -/* 940D88 802417D8 00A0302D */ daddu $a2, $a1, $zero -.L802417DC: -/* 940D8C 802417DC 8FBF005C */ lw $ra, 0x5c($sp) -/* 940D90 802417E0 8FB20058 */ lw $s2, 0x58($sp) -/* 940D94 802417E4 8FB10054 */ lw $s1, 0x54($sp) -/* 940D98 802417E8 8FB00050 */ lw $s0, 0x50($sp) -/* 940D9C 802417EC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 940DA0 802417F0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 940DA4 802417F4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 940DA8 802417F8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 940DAC 802417FC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 940DB0 80241800 24020002 */ addiu $v0, $zero, 2 -/* 940DB4 80241804 03E00008 */ jr $ra -/* 940DB8 80241808 27BD0088 */ addiu $sp, $sp, 0x88 -/* 940DBC 8024180C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241640_940BF0.s b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241640_940BF0.s new file mode 100644 index 0000000000..a74fbff7b0 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_30/93F5B0/func_80241640_940BF0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241640_940BF0 +/* 940BF0 80241640 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 940BF4 80241644 AFB10054 */ sw $s1, 0x54($sp) +/* 940BF8 80241648 0080882D */ daddu $s1, $a0, $zero +/* 940BFC 8024164C AFBF005C */ sw $ra, 0x5c($sp) +/* 940C00 80241650 AFB20058 */ sw $s2, 0x58($sp) +/* 940C04 80241654 AFB00050 */ sw $s0, 0x50($sp) +/* 940C08 80241658 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 940C0C 8024165C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 940C10 80241660 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 940C14 80241664 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 940C18 80241668 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 940C1C 8024166C 8E30000C */ lw $s0, 0xc($s1) +/* 940C20 80241670 8E050000 */ lw $a1, ($s0) +/* 940C24 80241674 0C0B1EAF */ jal get_variable +/* 940C28 80241678 26100004 */ addiu $s0, $s0, 4 +/* 940C2C 8024167C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 940C30 80241680 0040202D */ daddu $a0, $v0, $zero +/* 940C34 80241684 8E050000 */ lw $a1, ($s0) +/* 940C38 80241688 26100004 */ addiu $s0, $s0, 4 +/* 940C3C 8024168C 0220202D */ daddu $a0, $s1, $zero +/* 940C40 80241690 0C0B210B */ jal get_float_variable +/* 940C44 80241694 0040902D */ daddu $s2, $v0, $zero +/* 940C48 80241698 8E050000 */ lw $a1, ($s0) +/* 940C4C 8024169C 26100004 */ addiu $s0, $s0, 4 +/* 940C50 802416A0 0220202D */ daddu $a0, $s1, $zero +/* 940C54 802416A4 0C0B210B */ jal get_float_variable +/* 940C58 802416A8 46000706 */ mov.s $f28, $f0 +/* 940C5C 802416AC 8E050000 */ lw $a1, ($s0) +/* 940C60 802416B0 26100004 */ addiu $s0, $s0, 4 +/* 940C64 802416B4 0220202D */ daddu $a0, $s1, $zero +/* 940C68 802416B8 0C0B210B */ jal get_float_variable +/* 940C6C 802416BC 46000686 */ mov.s $f26, $f0 +/* 940C70 802416C0 0220202D */ daddu $a0, $s1, $zero +/* 940C74 802416C4 8E050000 */ lw $a1, ($s0) +/* 940C78 802416C8 0C0B210B */ jal get_float_variable +/* 940C7C 802416CC 46000586 */ mov.s $f22, $f0 +/* 940C80 802416D0 0240202D */ daddu $a0, $s2, $zero +/* 940C84 802416D4 0C046B4C */ jal get_model_from_list_index +/* 940C88 802416D8 46000606 */ mov.s $f24, $f0 +/* 940C8C 802416DC 0040882D */ daddu $s1, $v0, $zero +/* 940C90 802416E0 96220000 */ lhu $v0, ($s1) +/* 940C94 802416E4 30420400 */ andi $v0, $v0, 0x400 +/* 940C98 802416E8 1440001E */ bnez $v0, .L80241764 +/* 940C9C 802416EC 26300058 */ addiu $s0, $s1, 0x58 +/* 940CA0 802416F0 4480A000 */ mtc1 $zero, $f20 +/* 940CA4 802416F4 4406B000 */ mfc1 $a2, $f22 +/* 940CA8 802416F8 4405A000 */ mfc1 $a1, $f20 +/* 940CAC 802416FC 4407A000 */ mfc1 $a3, $f20 +/* 940CB0 80241700 0C019E40 */ jal guTranslateF +/* 940CB4 80241704 0200202D */ daddu $a0, $s0, $zero +/* 940CB8 80241708 4405E000 */ mfc1 $a1, $f28 +/* 940CBC 8024170C 4406D000 */ mfc1 $a2, $f26 +/* 940CC0 80241710 4407C000 */ mfc1 $a3, $f24 +/* 940CC4 80241714 0C090574 */ jal func_802415D0_940B80 +/* 940CC8 80241718 27A40010 */ addiu $a0, $sp, 0x10 +/* 940CCC 8024171C 27A40010 */ addiu $a0, $sp, 0x10 +/* 940CD0 80241720 0200282D */ daddu $a1, $s0, $zero +/* 940CD4 80241724 0C019D80 */ jal guMtxCatF +/* 940CD8 80241728 0200302D */ daddu $a2, $s0, $zero +/* 940CDC 8024172C 27A40010 */ addiu $a0, $sp, 0x10 +/* 940CE0 80241730 4600B587 */ neg.s $f22, $f22 +/* 940CE4 80241734 4405A000 */ mfc1 $a1, $f20 +/* 940CE8 80241738 4406B000 */ mfc1 $a2, $f22 +/* 940CEC 8024173C 0C019E40 */ jal guTranslateF +/* 940CF0 80241740 00A0382D */ daddu $a3, $a1, $zero +/* 940CF4 80241744 27A40010 */ addiu $a0, $sp, 0x10 +/* 940CF8 80241748 0200282D */ daddu $a1, $s0, $zero +/* 940CFC 8024174C 0C019D80 */ jal guMtxCatF +/* 940D00 80241750 00A0302D */ daddu $a2, $a1, $zero +/* 940D04 80241754 96220000 */ lhu $v0, ($s1) +/* 940D08 80241758 34421400 */ ori $v0, $v0, 0x1400 +/* 940D0C 8024175C 080905F7 */ j .L802417DC +/* 940D10 80241760 A6220000 */ sh $v0, ($s1) +.L80241764: +/* 940D14 80241764 4480A000 */ mtc1 $zero, $f20 +/* 940D18 80241768 4406B000 */ mfc1 $a2, $f22 +/* 940D1C 8024176C 4405A000 */ mfc1 $a1, $f20 +/* 940D20 80241770 4407A000 */ mfc1 $a3, $f20 +/* 940D24 80241774 0C019E40 */ jal guTranslateF +/* 940D28 80241778 27A40010 */ addiu $a0, $sp, 0x10 +/* 940D2C 8024177C 27A40010 */ addiu $a0, $sp, 0x10 +/* 940D30 80241780 26300058 */ addiu $s0, $s1, 0x58 +/* 940D34 80241784 0200282D */ daddu $a1, $s0, $zero +/* 940D38 80241788 0C019D80 */ jal guMtxCatF +/* 940D3C 8024178C 0200302D */ daddu $a2, $s0, $zero +/* 940D40 80241790 4405E000 */ mfc1 $a1, $f28 +/* 940D44 80241794 4406D000 */ mfc1 $a2, $f26 +/* 940D48 80241798 4407C000 */ mfc1 $a3, $f24 +/* 940D4C 8024179C 0C090574 */ jal func_802415D0_940B80 +/* 940D50 802417A0 27A40010 */ addiu $a0, $sp, 0x10 +/* 940D54 802417A4 27A40010 */ addiu $a0, $sp, 0x10 +/* 940D58 802417A8 0200282D */ daddu $a1, $s0, $zero +/* 940D5C 802417AC 0C019D80 */ jal guMtxCatF +/* 940D60 802417B0 0200302D */ daddu $a2, $s0, $zero +/* 940D64 802417B4 27A40010 */ addiu $a0, $sp, 0x10 +/* 940D68 802417B8 4600B587 */ neg.s $f22, $f22 +/* 940D6C 802417BC 4405A000 */ mfc1 $a1, $f20 +/* 940D70 802417C0 4406B000 */ mfc1 $a2, $f22 +/* 940D74 802417C4 0C019E40 */ jal guTranslateF +/* 940D78 802417C8 00A0382D */ daddu $a3, $a1, $zero +/* 940D7C 802417CC 27A40010 */ addiu $a0, $sp, 0x10 +/* 940D80 802417D0 0200282D */ daddu $a1, $s0, $zero +/* 940D84 802417D4 0C019D80 */ jal guMtxCatF +/* 940D88 802417D8 00A0302D */ daddu $a2, $a1, $zero +.L802417DC: +/* 940D8C 802417DC 8FBF005C */ lw $ra, 0x5c($sp) +/* 940D90 802417E0 8FB20058 */ lw $s2, 0x58($sp) +/* 940D94 802417E4 8FB10054 */ lw $s1, 0x54($sp) +/* 940D98 802417E8 8FB00050 */ lw $s0, 0x50($sp) +/* 940D9C 802417EC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 940DA0 802417F0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 940DA4 802417F4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 940DA8 802417F8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 940DAC 802417FC D7B40060 */ ldc1 $f20, 0x60($sp) +/* 940DB0 80241800 24020002 */ addiu $v0, $zero, 2 +/* 940DB4 80241804 03E00008 */ jr $ra +/* 940DB8 80241808 27BD0088 */ addiu $sp, $sp, 0x88 +/* 940DBC 8024180C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8.s deleted file mode 100644 index 3a7cf0fa09..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403D8 -/* 9462A8 802403D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9462AC 802403DC AFBF0010 */ sw $ra, 0x10($sp) -/* 9462B0 802403E0 8C82000C */ lw $v0, 0xc($a0) -/* 9462B4 802403E4 0C0B1EAF */ jal get_variable -/* 9462B8 802403E8 8C450000 */ lw $a1, ($v0) -/* 9462BC 802403EC 3C018024 */ lui $at, 0x8024 -/* 9462C0 802403F0 AC220E04 */ sw $v0, 0xe04($at) -/* 9462C4 802403F4 24020002 */ addiu $v0, $zero, 2 -/* 9462C8 802403F8 8FBF0010 */ lw $ra, 0x10($sp) -/* 9462CC 802403FC 24030001 */ addiu $v1, $zero, 1 -/* 9462D0 80240400 3C018024 */ lui $at, 0x8024 -/* 9462D4 80240404 AC230E00 */ sw $v1, 0xe00($at) -/* 9462D8 80240408 03E00008 */ jr $ra -/* 9462DC 8024040C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s new file mode 100644 index 0000000000..c2f05f265e --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_34/945F10/func_802403D8_9462A8.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403D8_9462A8 +/* 9462A8 802403D8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9462AC 802403DC AFBF0010 */ sw $ra, 0x10($sp) +/* 9462B0 802403E0 8C82000C */ lw $v0, 0xc($a0) +/* 9462B4 802403E4 0C0B1EAF */ jal get_variable +/* 9462B8 802403E8 8C450000 */ lw $a1, ($v0) +/* 9462BC 802403EC 3C018024 */ lui $at, 0x8024 +/* 9462C0 802403F0 AC220E04 */ sw $v0, 0xe04($at) +/* 9462C4 802403F4 24020002 */ addiu $v0, $zero, 2 +/* 9462C8 802403F8 8FBF0010 */ lw $ra, 0x10($sp) +/* 9462CC 802403FC 24030001 */ addiu $v1, $zero, 1 +/* 9462D0 80240400 3C018024 */ lui $at, 0x8024 +/* 9462D4 80240404 AC230E00 */ sw $v1, 0xe00($at) +/* 9462D8 80240408 03E00008 */ jr $ra +/* 9462DC 8024040C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_34/946670/func_80240810_9466E0.s b/asm/nonmatchings/world/area_sbk/sbk_34/946670/func_80240810_9466E0.s index dd9f4417c8..b8d8e0c7d9 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_34/946670/func_80240810_9466E0.s +++ b/asm/nonmatchings/world/area_sbk/sbk_34/946670/func_80240810_9466E0.s @@ -55,7 +55,7 @@ glabel func_80240810_9466E0 /* 9467A8 802408D8 4405E000 */ mfc1 $a1, $f28 /* 9467AC 802408DC 4406D000 */ mfc1 $a2, $f26 /* 9467B0 802408E0 4407C000 */ mfc1 $a3, $f24 -/* 9467B4 802408E4 0C0901E8 */ jal func_802407A0 +/* 9467B4 802408E4 0C0901E8 */ jal func_802407A0_946670 /* 9467B8 802408E8 27A40010 */ addiu $a0, $sp, 0x10 /* 9467BC 802408EC 27A40010 */ addiu $a0, $sp, 0x10 /* 9467C0 802408F0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_80240810_9466E0 /* 946830 80240960 4405E000 */ mfc1 $a1, $f28 /* 946834 80240964 4406D000 */ mfc1 $a2, $f26 /* 946838 80240968 4407C000 */ mfc1 $a3, $f24 -/* 94683C 8024096C 0C0901E8 */ jal func_802407A0 +/* 94683C 8024096C 0C0901E8 */ jal func_802407A0_946670 /* 946840 80240970 27A40010 */ addiu $a0, $sp, 0x10 /* 946844 80240974 27A40010 */ addiu $a0, $sp, 0x10 /* 946848 80240978 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_35/9486F0/func_802401B0_948860.s b/asm/nonmatchings/world/area_sbk/sbk_35/9486F0/func_802401B0_948860.s index 68cdc13481..199e1f416c 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_35/9486F0/func_802401B0_948860.s +++ b/asm/nonmatchings/world/area_sbk/sbk_35/9486F0/func_802401B0_948860.s @@ -55,7 +55,7 @@ glabel func_802401B0_948860 /* 948928 80240278 4405E000 */ mfc1 $a1, $f28 /* 94892C 8024027C 4406D000 */ mfc1 $a2, $f26 /* 948930 80240280 4407C000 */ mfc1 $a3, $f24 -/* 948934 80240284 0C090050 */ jal func_80240140 +/* 948934 80240284 0C090050 */ jal func_80240140_9487F0 /* 948938 80240288 27A40010 */ addiu $a0, $sp, 0x10 /* 94893C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 /* 948940 80240290 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802401B0_948860 /* 9489B0 80240300 4405E000 */ mfc1 $a1, $f28 /* 9489B4 80240304 4406D000 */ mfc1 $a2, $f26 /* 9489B8 80240308 4407C000 */ mfc1 $a3, $f24 -/* 9489BC 8024030C 0C090050 */ jal func_80240140 +/* 9489BC 8024030C 0C090050 */ jal func_80240140_9487F0 /* 9489C0 80240310 27A40010 */ addiu $a0, $sp, 0x10 /* 9489C4 80240314 27A40010 */ addiu $a0, $sp, 0x10 /* 9489C8 80240318 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_36/949EA0/func_802400B0_949F10.s b/asm/nonmatchings/world/area_sbk/sbk_36/949EA0/func_802400B0_949F10.s index 7c0f97f9d7..9cabc987ec 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_36/949EA0/func_802400B0_949F10.s +++ b/asm/nonmatchings/world/area_sbk/sbk_36/949EA0/func_802400B0_949F10.s @@ -55,7 +55,7 @@ glabel func_802400B0_949F10 /* 949FD8 80240178 4405E000 */ mfc1 $a1, $f28 /* 949FDC 8024017C 4406D000 */ mfc1 $a2, $f26 /* 949FE0 80240180 4407C000 */ mfc1 $a3, $f24 -/* 949FE4 80240184 0C090010 */ jal func_80240040 +/* 949FE4 80240184 0C090010 */ jal func_80240040_949EA0 /* 949FE8 80240188 27A40010 */ addiu $a0, $sp, 0x10 /* 949FEC 8024018C 27A40010 */ addiu $a0, $sp, 0x10 /* 949FF0 80240190 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802400B0_949F10 /* 94A060 80240200 4405E000 */ mfc1 $a1, $f28 /* 94A064 80240204 4406D000 */ mfc1 $a2, $f26 /* 94A068 80240208 4407C000 */ mfc1 $a3, $f24 -/* 94A06C 8024020C 0C090010 */ jal func_80240040 +/* 94A06C 8024020C 0C090010 */ jal func_80240040_949EA0 /* 94A070 80240210 27A40010 */ addiu $a0, $sp, 0x10 /* 94A074 80240214 27A40010 */ addiu $a0, $sp, 0x10 /* 94A078 80240218 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_46/94EB00/func_802401D0_94EB70.s b/asm/nonmatchings/world/area_sbk/sbk_46/94EB00/func_802401D0_94EB70.s index ccb23ae0de..6092e273cc 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_46/94EB00/func_802401D0_94EB70.s +++ b/asm/nonmatchings/world/area_sbk/sbk_46/94EB00/func_802401D0_94EB70.s @@ -55,7 +55,7 @@ glabel func_802401D0_94EB70 /* 94EC38 80240298 4405E000 */ mfc1 $a1, $f28 /* 94EC3C 8024029C 4406D000 */ mfc1 $a2, $f26 /* 94EC40 802402A0 4407C000 */ mfc1 $a3, $f24 -/* 94EC44 802402A4 0C090058 */ jal func_80240160 +/* 94EC44 802402A4 0C090058 */ jal func_80240160_94EB00 /* 94EC48 802402A8 27A40010 */ addiu $a0, $sp, 0x10 /* 94EC4C 802402AC 27A40010 */ addiu $a0, $sp, 0x10 /* 94EC50 802402B0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802401D0_94EB70 /* 94ECC0 80240320 4405E000 */ mfc1 $a1, $f28 /* 94ECC4 80240324 4406D000 */ mfc1 $a2, $f26 /* 94ECC8 80240328 4407C000 */ mfc1 $a3, $f24 -/* 94ECCC 8024032C 0C090058 */ jal func_80240160 +/* 94ECCC 8024032C 0C090058 */ jal func_80240160_94EB00 /* 94ECD0 80240330 27A40010 */ addiu $a0, $sp, 0x10 /* 94ECD4 80240334 27A40010 */ addiu $a0, $sp, 0x10 /* 94ECD8 80240338 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_55/952AB0/func_802400D0_952B20.s b/asm/nonmatchings/world/area_sbk/sbk_55/952AB0/func_802400D0_952B20.s index 732b28d54a..d60903b877 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_55/952AB0/func_802400D0_952B20.s +++ b/asm/nonmatchings/world/area_sbk/sbk_55/952AB0/func_802400D0_952B20.s @@ -55,7 +55,7 @@ glabel func_802400D0_952B20 /* 952BE8 80240198 4405E000 */ mfc1 $a1, $f28 /* 952BEC 8024019C 4406D000 */ mfc1 $a2, $f26 /* 952BF0 802401A0 4407C000 */ mfc1 $a3, $f24 -/* 952BF4 802401A4 0C090018 */ jal func_80240060 +/* 952BF4 802401A4 0C090018 */ jal func_80240060_952AB0 /* 952BF8 802401A8 27A40010 */ addiu $a0, $sp, 0x10 /* 952BFC 802401AC 27A40010 */ addiu $a0, $sp, 0x10 /* 952C00 802401B0 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802400D0_952B20 /* 952C70 80240220 4405E000 */ mfc1 $a1, $f28 /* 952C74 80240224 4406D000 */ mfc1 $a2, $f26 /* 952C78 80240228 4407C000 */ mfc1 $a3, $f24 -/* 952C7C 8024022C 0C090018 */ jal func_80240060 +/* 952C7C 8024022C 0C090018 */ jal func_80240060_952AB0 /* 952C80 80240230 27A40010 */ addiu $a0, $sp, 0x10 /* 952C84 80240234 27A40010 */ addiu $a0, $sp, 0x10 /* 952C88 80240238 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024005C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024005C.s deleted file mode 100644 index fc791d9b08..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024005C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024005C -/* 95401C 8024005C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 954020 80240060 0000202D */ daddu $a0, $zero, $zero -/* 954024 80240064 AFBF0010 */ sw $ra, 0x10($sp) -/* 954028 80240068 0C052AED */ jal func_8014ABB4 -/* 95402C 8024006C 0080282D */ daddu $a1, $a0, $zero -/* 954030 80240070 8FBF0010 */ lw $ra, 0x10($sp) -/* 954034 80240074 24020002 */ addiu $v0, $zero, 2 -/* 954038 80240078 03E00008 */ jr $ra -/* 95403C 8024007C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024005C_95401C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024005C_95401C.s new file mode 100644 index 0000000000..f86815a2a3 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024005C_95401C.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024005C_95401C +/* 95401C 8024005C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 954020 80240060 0000202D */ daddu $a0, $zero, $zero +/* 954024 80240064 AFBF0010 */ sw $ra, 0x10($sp) +/* 954028 80240068 0C052AED */ jal func_8014ABB4 +/* 95402C 8024006C 0080282D */ daddu $a1, $a0, $zero +/* 954030 80240070 8FBF0010 */ lw $ra, 0x10($sp) +/* 954034 80240074 24020002 */ addiu $v0, $zero, 2 +/* 954038 80240078 03E00008 */ jr $ra +/* 95403C 8024007C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C.s deleted file mode 100644 index 3b3ebb03b0..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024009C -/* 95405C 8024009C 3C02800A */ lui $v0, %hi(D_8009A650) -/* 954060 802400A0 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 954064 802400A4 8C430000 */ lw $v1, ($v0) -/* 954068 802400A8 2404FFBF */ addiu $a0, $zero, -0x41 -/* 95406C 802400AC 00641824 */ and $v1, $v1, $a0 -/* 954070 802400B0 AC430000 */ sw $v1, ($v0) -/* 954074 802400B4 03E00008 */ jr $ra -/* 954078 802400B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C_95405C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C_95405C.s new file mode 100644 index 0000000000..cef7849b63 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024009C_95405C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024009C_95405C +/* 95405C 8024009C 3C02800A */ lui $v0, %hi(D_8009A650) +/* 954060 802400A0 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* 954064 802400A4 8C430000 */ lw $v1, ($v0) +/* 954068 802400A8 2404FFBF */ addiu $a0, $zero, -0x41 +/* 95406C 802400AC 00641824 */ and $v1, $v1, $a0 +/* 954070 802400B0 AC430000 */ sw $v1, ($v0) +/* 954074 802400B4 03E00008 */ jr $ra +/* 954078 802400B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400BC.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400BC.s deleted file mode 100644 index 61a90e2b7f..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400BC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400BC -/* 95407C 802400BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 954080 802400C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 954084 802400C4 8C82000C */ lw $v0, 0xc($a0) -/* 954088 802400C8 0C0B1EAF */ jal get_variable -/* 95408C 802400CC 8C450000 */ lw $a1, ($v0) -/* 954090 802400D0 0C0B95A4 */ jal func_802E5690 -/* 954094 802400D4 0040202D */ daddu $a0, $v0, $zero -/* 954098 802400D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 95409C 802400DC 24020002 */ addiu $v0, $zero, 2 -/* 9540A0 802400E0 03E00008 */ jr $ra -/* 9540A4 802400E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400BC_95407C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400BC_95407C.s new file mode 100644 index 0000000000..8d902258be --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400BC_95407C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400BC_95407C +/* 95407C 802400BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 954080 802400C0 AFBF0010 */ sw $ra, 0x10($sp) +/* 954084 802400C4 8C82000C */ lw $v0, 0xc($a0) +/* 954088 802400C8 0C0B1EAF */ jal get_variable +/* 95408C 802400CC 8C450000 */ lw $a1, ($v0) +/* 954090 802400D0 0C0B95A4 */ jal func_802E5690 +/* 954094 802400D4 0040202D */ daddu $a0, $v0, $zero +/* 954098 802400D8 8FBF0010 */ lw $ra, 0x10($sp) +/* 95409C 802400DC 24020002 */ addiu $v0, $zero, 2 +/* 9540A0 802400E0 03E00008 */ jr $ra +/* 9540A4 802400E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8.s deleted file mode 100644 index d255448efd..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E8 -/* 9540A8 802400E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9540AC 802400EC AFB00010 */ sw $s0, 0x10($sp) -/* 9540B0 802400F0 0080802D */ daddu $s0, $a0, $zero -/* 9540B4 802400F4 AFBF0018 */ sw $ra, 0x18($sp) -/* 9540B8 802400F8 AFB10014 */ sw $s1, 0x14($sp) -/* 9540BC 802400FC 8E11000C */ lw $s1, 0xc($s0) -/* 9540C0 80240100 8E250000 */ lw $a1, ($s1) -/* 9540C4 80240104 0C0B1EAF */ jal get_variable -/* 9540C8 80240108 26310004 */ addiu $s1, $s1, 4 -/* 9540CC 8024010C 0200202D */ daddu $a0, $s0, $zero -/* 9540D0 80240110 3C038011 */ lui $v1, %hi(gPlayerData) -/* 9540D4 80240114 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 9540D8 80240118 000210C0 */ sll $v0, $v0, 3 -/* 9540DC 8024011C 00431021 */ addu $v0, $v0, $v1 -/* 9540E0 80240120 90460015 */ lbu $a2, 0x15($v0) -/* 9540E4 80240124 8E250000 */ lw $a1, ($s1) -/* 9540E8 80240128 24C60001 */ addiu $a2, $a2, 1 -/* 9540EC 8024012C A0460015 */ sb $a2, 0x15($v0) -/* 9540F0 80240130 00063600 */ sll $a2, $a2, 0x18 -/* 9540F4 80240134 0C0B2026 */ jal set_variable -/* 9540F8 80240138 00063603 */ sra $a2, $a2, 0x18 -/* 9540FC 8024013C 8FBF0018 */ lw $ra, 0x18($sp) -/* 954100 80240140 8FB10014 */ lw $s1, 0x14($sp) -/* 954104 80240144 8FB00010 */ lw $s0, 0x10($sp) -/* 954108 80240148 24020002 */ addiu $v0, $zero, 2 -/* 95410C 8024014C 03E00008 */ jr $ra -/* 954110 80240150 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8_9540A8.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8_9540A8.s new file mode 100644 index 0000000000..dcb6633d77 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802400E8_9540A8.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400E8_9540A8 +/* 9540A8 802400E8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9540AC 802400EC AFB00010 */ sw $s0, 0x10($sp) +/* 9540B0 802400F0 0080802D */ daddu $s0, $a0, $zero +/* 9540B4 802400F4 AFBF0018 */ sw $ra, 0x18($sp) +/* 9540B8 802400F8 AFB10014 */ sw $s1, 0x14($sp) +/* 9540BC 802400FC 8E11000C */ lw $s1, 0xc($s0) +/* 9540C0 80240100 8E250000 */ lw $a1, ($s1) +/* 9540C4 80240104 0C0B1EAF */ jal get_variable +/* 9540C8 80240108 26310004 */ addiu $s1, $s1, 4 +/* 9540CC 8024010C 0200202D */ daddu $a0, $s0, $zero +/* 9540D0 80240110 3C038011 */ lui $v1, %hi(gPlayerData) +/* 9540D4 80240114 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 9540D8 80240118 000210C0 */ sll $v0, $v0, 3 +/* 9540DC 8024011C 00431021 */ addu $v0, $v0, $v1 +/* 9540E0 80240120 90460015 */ lbu $a2, 0x15($v0) +/* 9540E4 80240124 8E250000 */ lw $a1, ($s1) +/* 9540E8 80240128 24C60001 */ addiu $a2, $a2, 1 +/* 9540EC 8024012C A0460015 */ sb $a2, 0x15($v0) +/* 9540F0 80240130 00063600 */ sll $a2, $a2, 0x18 +/* 9540F4 80240134 0C0B2026 */ jal set_variable +/* 9540F8 80240138 00063603 */ sra $a2, $a2, 0x18 +/* 9540FC 8024013C 8FBF0018 */ lw $ra, 0x18($sp) +/* 954100 80240140 8FB10014 */ lw $s1, 0x14($sp) +/* 954104 80240144 8FB00010 */ lw $s0, 0x10($sp) +/* 954108 80240148 24020002 */ addiu $v0, $zero, 2 +/* 95410C 8024014C 03E00008 */ jr $ra +/* 954110 80240150 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0.s deleted file mode 100644 index 4fb3e7654a..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401A0 -/* 954160 802401A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 954164 802401A4 AFB3001C */ sw $s3, 0x1c($sp) -/* 954168 802401A8 0080982D */ daddu $s3, $a0, $zero -/* 95416C 802401AC AFB00010 */ sw $s0, 0x10($sp) -/* 954170 802401B0 24100001 */ addiu $s0, $zero, 1 -/* 954174 802401B4 AFB40020 */ sw $s4, 0x20($sp) -/* 954178 802401B8 2414FFFF */ addiu $s4, $zero, -1 -/* 95417C 802401BC AFB50024 */ sw $s5, 0x24($sp) -/* 954180 802401C0 0200A82D */ daddu $s5, $s0, $zero -/* 954184 802401C4 AFB10014 */ sw $s1, 0x14($sp) -/* 954188 802401C8 3C118011 */ lui $s1, 0x8011 -/* 95418C 802401CC 2631F298 */ addiu $s1, $s1, -0xd68 -/* 954190 802401D0 AFBF0028 */ sw $ra, 0x28($sp) -/* 954194 802401D4 AFB20018 */ sw $s2, 0x18($sp) -/* 954198 802401D8 8E6200B4 */ lw $v0, 0xb4($s3) -/* 95419C 802401DC 0280182D */ daddu $v1, $s4, $zero -/* 9541A0 802401E0 AE630084 */ sw $v1, 0x84($s3) -/* 9541A4 802401E4 00021027 */ nor $v0, $zero, $v0 -/* 9541A8 802401E8 000217C2 */ srl $v0, $v0, 0x1f -/* 9541AC 802401EC 00029400 */ sll $s2, $v0, 0x10 -.L802401F0: -/* 9541B0 802401F0 92220014 */ lbu $v0, 0x14($s1) -/* 9541B4 802401F4 50400008 */ beql $v0, $zero, .L80240218 -/* 9541B8 802401F8 26100001 */ addiu $s0, $s0, 1 -/* 9541BC 802401FC 0200202D */ daddu $a0, $s0, $zero -/* 9541C0 80240200 0C090055 */ jal func_80240154 -/* 9541C4 80240204 00122C03 */ sra $a1, $s2, 0x10 -/* 9541C8 80240208 10540003 */ beq $v0, $s4, .L80240218 -/* 9541CC 8024020C 26100001 */ addiu $s0, $s0, 1 -/* 9541D0 80240210 08090089 */ j .L80240224 -/* 9541D4 80240214 AE750084 */ sw $s5, 0x84($s3) -.L80240218: -/* 9541D8 80240218 2A02000C */ slti $v0, $s0, 0xc -/* 9541DC 8024021C 1440FFF4 */ bnez $v0, .L802401F0 -/* 9541E0 80240220 26310008 */ addiu $s1, $s1, 8 -.L80240224: -/* 9541E4 80240224 8FBF0028 */ lw $ra, 0x28($sp) -/* 9541E8 80240228 8FB50024 */ lw $s5, 0x24($sp) -/* 9541EC 8024022C 8FB40020 */ lw $s4, 0x20($sp) -/* 9541F0 80240230 8FB3001C */ lw $s3, 0x1c($sp) -/* 9541F4 80240234 8FB20018 */ lw $s2, 0x18($sp) -/* 9541F8 80240238 8FB10014 */ lw $s1, 0x14($sp) -/* 9541FC 8024023C 8FB00010 */ lw $s0, 0x10($sp) -/* 954200 80240240 24020002 */ addiu $v0, $zero, 2 -/* 954204 80240244 03E00008 */ jr $ra -/* 954208 80240248 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s new file mode 100644 index 0000000000..dfcc790296 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401A0_954160 +/* 954160 802401A0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 954164 802401A4 AFB3001C */ sw $s3, 0x1c($sp) +/* 954168 802401A8 0080982D */ daddu $s3, $a0, $zero +/* 95416C 802401AC AFB00010 */ sw $s0, 0x10($sp) +/* 954170 802401B0 24100001 */ addiu $s0, $zero, 1 +/* 954174 802401B4 AFB40020 */ sw $s4, 0x20($sp) +/* 954178 802401B8 2414FFFF */ addiu $s4, $zero, -1 +/* 95417C 802401BC AFB50024 */ sw $s5, 0x24($sp) +/* 954180 802401C0 0200A82D */ daddu $s5, $s0, $zero +/* 954184 802401C4 AFB10014 */ sw $s1, 0x14($sp) +/* 954188 802401C8 3C118011 */ lui $s1, 0x8011 +/* 95418C 802401CC 2631F298 */ addiu $s1, $s1, -0xd68 +/* 954190 802401D0 AFBF0028 */ sw $ra, 0x28($sp) +/* 954194 802401D4 AFB20018 */ sw $s2, 0x18($sp) +/* 954198 802401D8 8E6200B4 */ lw $v0, 0xb4($s3) +/* 95419C 802401DC 0280182D */ daddu $v1, $s4, $zero +/* 9541A0 802401E0 AE630084 */ sw $v1, 0x84($s3) +/* 9541A4 802401E4 00021027 */ nor $v0, $zero, $v0 +/* 9541A8 802401E8 000217C2 */ srl $v0, $v0, 0x1f +/* 9541AC 802401EC 00029400 */ sll $s2, $v0, 0x10 +.L802401F0: +/* 9541B0 802401F0 92220014 */ lbu $v0, 0x14($s1) +/* 9541B4 802401F4 50400008 */ beql $v0, $zero, .L80240218 +/* 9541B8 802401F8 26100001 */ addiu $s0, $s0, 1 +/* 9541BC 802401FC 0200202D */ daddu $a0, $s0, $zero +/* 9541C0 80240200 0C090055 */ jal func_80240154_954114 +/* 9541C4 80240204 00122C03 */ sra $a1, $s2, 0x10 +/* 9541C8 80240208 10540003 */ beq $v0, $s4, .L80240218 +/* 9541CC 8024020C 26100001 */ addiu $s0, $s0, 1 +/* 9541D0 80240210 08090089 */ j .L80240224 +/* 9541D4 80240214 AE750084 */ sw $s5, 0x84($s3) +.L80240218: +/* 9541D8 80240218 2A02000C */ slti $v0, $s0, 0xc +/* 9541DC 8024021C 1440FFF4 */ bnez $v0, .L802401F0 +/* 9541E0 80240220 26310008 */ addiu $s1, $s1, 8 +.L80240224: +/* 9541E4 80240224 8FBF0028 */ lw $ra, 0x28($sp) +/* 9541E8 80240228 8FB50024 */ lw $s5, 0x24($sp) +/* 9541EC 8024022C 8FB40020 */ lw $s4, 0x20($sp) +/* 9541F0 80240230 8FB3001C */ lw $s3, 0x1c($sp) +/* 9541F4 80240234 8FB20018 */ lw $s2, 0x18($sp) +/* 9541F8 80240238 8FB10014 */ lw $s1, 0x14($sp) +/* 9541FC 8024023C 8FB00010 */ lw $s0, 0x10($sp) +/* 954200 80240240 24020002 */ addiu $v0, $zero, 2 +/* 954204 80240244 03E00008 */ jr $ra +/* 954208 80240248 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C.s deleted file mode 100644 index 3a124b87fa..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024024C -/* 95420C 8024024C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 954210 80240250 AFB5002C */ sw $s5, 0x2c($sp) -/* 954214 80240254 0080A82D */ daddu $s5, $a0, $zero -/* 954218 80240258 AFBE0038 */ sw $fp, 0x38($sp) -/* 95421C 8024025C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 954220 80240260 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 954224 80240264 AFBF003C */ sw $ra, 0x3c($sp) -/* 954228 80240268 AFB70034 */ sw $s7, 0x34($sp) -/* 95422C 8024026C AFB60030 */ sw $s6, 0x30($sp) -/* 954230 80240270 AFB40028 */ sw $s4, 0x28($sp) -/* 954234 80240274 AFB30024 */ sw $s3, 0x24($sp) -/* 954238 80240278 AFB20020 */ sw $s2, 0x20($sp) -/* 95423C 8024027C AFB1001C */ sw $s1, 0x1c($sp) -/* 954240 80240280 10A0004F */ beqz $a1, .L802403C0 -/* 954244 80240284 AFB00018 */ sw $s0, 0x18($sp) -/* 954248 80240288 0C00AB39 */ jal heap_malloc -/* 95424C 8024028C 24040330 */ addiu $a0, $zero, 0x330 -/* 954250 80240290 0040982D */ daddu $s3, $v0, $zero -/* 954254 80240294 0000B02D */ daddu $s6, $zero, $zero -/* 954258 80240298 02C0902D */ daddu $s2, $s6, $zero -/* 95425C 8024029C 3C148024 */ lui $s4, 0x8024 -/* 954260 802402A0 26941438 */ addiu $s4, $s4, 0x1438 -/* 954264 802402A4 0260882D */ daddu $s1, $s3, $zero -/* 954268 802402A8 8EA200B4 */ lw $v0, 0xb4($s5) -/* 95426C 802402AC 3C038024 */ lui $v1, 0x8024 -/* 954270 802402B0 24631430 */ addiu $v1, $v1, 0x1430 -/* 954274 802402B4 AEB30078 */ sw $s3, 0x78($s5) -/* 954278 802402B8 00021027 */ nor $v0, $zero, $v0 -/* 95427C 802402BC 0002BFC2 */ srl $s7, $v0, 0x1f -/* 954280 802402C0 00171080 */ sll $v0, $s7, 2 -/* 954284 802402C4 00431021 */ addu $v0, $v0, $v1 -/* 954288 802402C8 AFA20010 */ sw $v0, 0x10($sp) -.L802402CC: -/* 95428C 802402CC 86900000 */ lh $s0, ($s4) -/* 954290 802402D0 001010C0 */ sll $v0, $s0, 3 -/* 954294 802402D4 03C21021 */ addu $v0, $fp, $v0 -/* 954298 802402D8 90420014 */ lbu $v0, 0x14($v0) -/* 95429C 802402DC 5040002E */ beql $v0, $zero, .L80240398 -/* 9542A0 802402E0 26520001 */ addiu $s2, $s2, 1 -/* 9542A4 802402E4 00101100 */ sll $v0, $s0, 4 -/* 9542A8 802402E8 3C068009 */ lui $a2, 0x8009 -/* 9542AC 802402EC 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* 9542B0 802402F0 00461021 */ addu $v0, $v0, $a2 -/* 9542B4 802402F4 0200202D */ daddu $a0, $s0, $zero -/* 9542B8 802402F8 AE300108 */ sw $s0, 0x108($s1) -/* 9542BC 802402FC 8C420000 */ lw $v0, ($v0) -/* 9542C0 80240300 02E0282D */ daddu $a1, $s7, $zero -/* 9542C4 80240304 0C090055 */ jal func_80240154 -/* 9542C8 80240308 AE220084 */ sw $v0, 0x84($s1) -/* 9542CC 8024030C 0040202D */ daddu $a0, $v0, $zero -/* 9542D0 80240310 04800011 */ bltz $a0, .L80240358 -/* 9542D4 80240314 00101080 */ sll $v0, $s0, 2 -/* 9542D8 80240318 3C06800F */ lui $a2, 0x800f -/* 9542DC 8024031C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* 9542E0 80240320 00461021 */ addu $v0, $v0, $a2 -/* 9542E4 80240324 8C430000 */ lw $v1, ($v0) -/* 9542E8 80240328 24020001 */ addiu $v0, $zero, 1 -/* 9542EC 8024032C AE22018C */ sw $v0, 0x18c($s1) -/* 9542F0 80240330 00041080 */ sll $v0, $a0, 2 -/* 9542F4 80240334 3C068024 */ lui $a2, 0x8024 -/* 9542F8 80240338 24C61448 */ addiu $a2, $a2, 0x1448 -/* 9542FC 8024033C AE230000 */ sw $v1, ($s1) -/* 954300 80240340 001218C0 */ sll $v1, $s2, 3 -/* 954304 80240344 00431021 */ addu $v0, $v0, $v1 -/* 954308 80240348 00461021 */ addu $v0, $v0, $a2 -/* 95430C 8024034C 8C420000 */ lw $v0, ($v0) -/* 954310 80240350 080900DF */ j .L8024037C -/* 954314 80240354 AE220294 */ sw $v0, 0x294($s1) -.L80240358: -/* 954318 80240358 3C06800F */ lui $a2, 0x800f -/* 95431C 8024035C 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* 954320 80240360 00461021 */ addu $v0, $v0, $a2 -/* 954324 80240364 8C420000 */ lw $v0, ($v0) -/* 954328 80240368 AE20018C */ sw $zero, 0x18c($s1) -/* 95432C 8024036C AE220000 */ sw $v0, ($s1) -/* 954330 80240370 8FA60010 */ lw $a2, 0x10($sp) -/* 954334 80240374 8CC20000 */ lw $v0, ($a2) -/* 954338 80240378 AE220294 */ sw $v0, 0x294($s1) -.L8024037C: -/* 95433C 8024037C 001010C0 */ sll $v0, $s0, 3 -/* 954340 80240380 03C21021 */ addu $v0, $fp, $v0 -/* 954344 80240384 80420015 */ lb $v0, 0x15($v0) -/* 954348 80240388 26D60001 */ addiu $s6, $s6, 1 -/* 95434C 8024038C AE220210 */ sw $v0, 0x210($s1) -/* 954350 80240390 26310004 */ addiu $s1, $s1, 4 -/* 954354 80240394 26520001 */ addiu $s2, $s2, 1 -.L80240398: -/* 954358 80240398 2A420008 */ slti $v0, $s2, 8 -/* 95435C 8024039C 1440FFCB */ bnez $v0, .L802402CC -/* 954360 802403A0 26940002 */ addiu $s4, $s4, 2 -/* 954364 802403A4 0260202D */ daddu $a0, $s3, $zero -/* 954368 802403A8 24020004 */ addiu $v0, $zero, 4 -/* 95436C 802403AC AC820318 */ sw $v0, 0x318($a0) -/* 954370 802403B0 AC960324 */ sw $s6, 0x324($a0) -/* 954374 802403B4 0C03D390 */ jal func_800F4E40 -/* 954378 802403B8 AC800328 */ sw $zero, 0x328($a0) -/* 95437C 802403BC AEA00070 */ sw $zero, 0x70($s5) -.L802403C0: -/* 954380 802403C0 8EA20070 */ lw $v0, 0x70($s5) -/* 954384 802403C4 8EB30078 */ lw $s3, 0x78($s5) -/* 954388 802403C8 14400008 */ bnez $v0, .L802403EC -/* 95438C 802403CC 24420001 */ addiu $v0, $v0, 1 -/* 954390 802403D0 8662032C */ lh $v0, 0x32c($s3) -/* 954394 802403D4 10400009 */ beqz $v0, .L802403FC -/* 954398 802403D8 AEA20074 */ sw $v0, 0x74($s5) -/* 95439C 802403DC 0C03C4EC */ jal func_800F13B0 -/* 9543A0 802403E0 00000000 */ nop -/* 9543A4 802403E4 8EA20070 */ lw $v0, 0x70($s5) -/* 9543A8 802403E8 24420001 */ addiu $v0, $v0, 1 -.L802403EC: -/* 9543AC 802403EC AEA20070 */ sw $v0, 0x70($s5) -/* 9543B0 802403F0 2842000F */ slti $v0, $v0, 0xf -/* 9543B4 802403F4 10400003 */ beqz $v0, .L80240404 -/* 9543B8 802403F8 00000000 */ nop -.L802403FC: -/* 9543BC 802403FC 0809011B */ j .L8024046C -/* 9543C0 80240400 0000102D */ daddu $v0, $zero, $zero -.L80240404: -/* 9543C4 80240404 0C03C54E */ jal func_800F1538 -/* 9543C8 80240408 00000000 */ nop -/* 9543CC 8024040C 8EA30074 */ lw $v1, 0x74($s5) -/* 9543D0 80240410 240200FF */ addiu $v0, $zero, 0xff -/* 9543D4 80240414 10620010 */ beq $v1, $v0, .L80240458 -/* 9543D8 80240418 2462FFFF */ addiu $v0, $v1, -1 -/* 9543DC 8024041C 00021080 */ sll $v0, $v0, 2 -/* 9543E0 80240420 02621021 */ addu $v0, $s3, $v0 -/* 9543E4 80240424 8C420108 */ lw $v0, 0x108($v0) -/* 9543E8 80240428 00021100 */ sll $v0, $v0, 4 -/* 9543EC 8024042C 3C038009 */ lui $v1, 0x8009 -/* 9543F0 80240430 00621821 */ addu $v1, $v1, $v0 -/* 9543F4 80240434 8C63EF20 */ lw $v1, -0x10e0($v1) -/* 9543F8 80240438 8EA20074 */ lw $v0, 0x74($s5) -/* 9543FC 8024043C 2442FFFF */ addiu $v0, $v0, -1 -/* 954400 80240440 00021080 */ sll $v0, $v0, 2 -/* 954404 80240444 02621021 */ addu $v0, $s3, $v0 -/* 954408 80240448 AEA30084 */ sw $v1, 0x84($s5) -/* 95440C 8024044C 8C420108 */ lw $v0, 0x108($v0) -/* 954410 80240450 08090118 */ j .L80240460 -/* 954414 80240454 AEA20088 */ sw $v0, 0x88($s5) -.L80240458: -/* 954418 80240458 2402FFFF */ addiu $v0, $zero, -1 -/* 95441C 8024045C AEA20084 */ sw $v0, 0x84($s5) -.L80240460: -/* 954420 80240460 0C00AB4B */ jal heap_free -/* 954424 80240464 8EA40078 */ lw $a0, 0x78($s5) -/* 954428 80240468 24020002 */ addiu $v0, $zero, 2 -.L8024046C: -/* 95442C 8024046C 8FBF003C */ lw $ra, 0x3c($sp) -/* 954430 80240470 8FBE0038 */ lw $fp, 0x38($sp) -/* 954434 80240474 8FB70034 */ lw $s7, 0x34($sp) -/* 954438 80240478 8FB60030 */ lw $s6, 0x30($sp) -/* 95443C 8024047C 8FB5002C */ lw $s5, 0x2c($sp) -/* 954440 80240480 8FB40028 */ lw $s4, 0x28($sp) -/* 954444 80240484 8FB30024 */ lw $s3, 0x24($sp) -/* 954448 80240488 8FB20020 */ lw $s2, 0x20($sp) -/* 95444C 8024048C 8FB1001C */ lw $s1, 0x1c($sp) -/* 954450 80240490 8FB00018 */ lw $s0, 0x18($sp) -/* 954454 80240494 03E00008 */ jr $ra -/* 954458 80240498 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s new file mode 100644 index 0000000000..7704bc58db --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024024C_95420C.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024024C_95420C +/* 95420C 8024024C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 954210 80240250 AFB5002C */ sw $s5, 0x2c($sp) +/* 954214 80240254 0080A82D */ daddu $s5, $a0, $zero +/* 954218 80240258 AFBE0038 */ sw $fp, 0x38($sp) +/* 95421C 8024025C 3C1E8011 */ lui $fp, %hi(gPlayerData) +/* 954220 80240260 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) +/* 954224 80240264 AFBF003C */ sw $ra, 0x3c($sp) +/* 954228 80240268 AFB70034 */ sw $s7, 0x34($sp) +/* 95422C 8024026C AFB60030 */ sw $s6, 0x30($sp) +/* 954230 80240270 AFB40028 */ sw $s4, 0x28($sp) +/* 954234 80240274 AFB30024 */ sw $s3, 0x24($sp) +/* 954238 80240278 AFB20020 */ sw $s2, 0x20($sp) +/* 95423C 8024027C AFB1001C */ sw $s1, 0x1c($sp) +/* 954240 80240280 10A0004F */ beqz $a1, .L802403C0 +/* 954244 80240284 AFB00018 */ sw $s0, 0x18($sp) +/* 954248 80240288 0C00AB39 */ jal heap_malloc +/* 95424C 8024028C 24040330 */ addiu $a0, $zero, 0x330 +/* 954250 80240290 0040982D */ daddu $s3, $v0, $zero +/* 954254 80240294 0000B02D */ daddu $s6, $zero, $zero +/* 954258 80240298 02C0902D */ daddu $s2, $s6, $zero +/* 95425C 8024029C 3C148024 */ lui $s4, 0x8024 +/* 954260 802402A0 26941438 */ addiu $s4, $s4, 0x1438 +/* 954264 802402A4 0260882D */ daddu $s1, $s3, $zero +/* 954268 802402A8 8EA200B4 */ lw $v0, 0xb4($s5) +/* 95426C 802402AC 3C038024 */ lui $v1, 0x8024 +/* 954270 802402B0 24631430 */ addiu $v1, $v1, 0x1430 +/* 954274 802402B4 AEB30078 */ sw $s3, 0x78($s5) +/* 954278 802402B8 00021027 */ nor $v0, $zero, $v0 +/* 95427C 802402BC 0002BFC2 */ srl $s7, $v0, 0x1f +/* 954280 802402C0 00171080 */ sll $v0, $s7, 2 +/* 954284 802402C4 00431021 */ addu $v0, $v0, $v1 +/* 954288 802402C8 AFA20010 */ sw $v0, 0x10($sp) +.L802402CC: +/* 95428C 802402CC 86900000 */ lh $s0, ($s4) +/* 954290 802402D0 001010C0 */ sll $v0, $s0, 3 +/* 954294 802402D4 03C21021 */ addu $v0, $fp, $v0 +/* 954298 802402D8 90420014 */ lbu $v0, 0x14($v0) +/* 95429C 802402DC 5040002E */ beql $v0, $zero, .L80240398 +/* 9542A0 802402E0 26520001 */ addiu $s2, $s2, 1 +/* 9542A4 802402E4 00101100 */ sll $v0, $s0, 4 +/* 9542A8 802402E8 3C068009 */ lui $a2, 0x8009 +/* 9542AC 802402EC 24C6EF20 */ addiu $a2, $a2, -0x10e0 +/* 9542B0 802402F0 00461021 */ addu $v0, $v0, $a2 +/* 9542B4 802402F4 0200202D */ daddu $a0, $s0, $zero +/* 9542B8 802402F8 AE300108 */ sw $s0, 0x108($s1) +/* 9542BC 802402FC 8C420000 */ lw $v0, ($v0) +/* 9542C0 80240300 02E0282D */ daddu $a1, $s7, $zero +/* 9542C4 80240304 0C090055 */ jal func_80240154_954114 +/* 9542C8 80240308 AE220084 */ sw $v0, 0x84($s1) +/* 9542CC 8024030C 0040202D */ daddu $a0, $v0, $zero +/* 9542D0 80240310 04800011 */ bltz $a0, .L80240358 +/* 9542D4 80240314 00101080 */ sll $v0, $s0, 2 +/* 9542D8 80240318 3C06800F */ lui $a2, 0x800f +/* 9542DC 8024031C 24C67F00 */ addiu $a2, $a2, 0x7f00 +/* 9542E0 80240320 00461021 */ addu $v0, $v0, $a2 +/* 9542E4 80240324 8C430000 */ lw $v1, ($v0) +/* 9542E8 80240328 24020001 */ addiu $v0, $zero, 1 +/* 9542EC 8024032C AE22018C */ sw $v0, 0x18c($s1) +/* 9542F0 80240330 00041080 */ sll $v0, $a0, 2 +/* 9542F4 80240334 3C068024 */ lui $a2, 0x8024 +/* 9542F8 80240338 24C61448 */ addiu $a2, $a2, 0x1448 +/* 9542FC 8024033C AE230000 */ sw $v1, ($s1) +/* 954300 80240340 001218C0 */ sll $v1, $s2, 3 +/* 954304 80240344 00431021 */ addu $v0, $v0, $v1 +/* 954308 80240348 00461021 */ addu $v0, $v0, $a2 +/* 95430C 8024034C 8C420000 */ lw $v0, ($v0) +/* 954310 80240350 080900DF */ j .L8024037C +/* 954314 80240354 AE220294 */ sw $v0, 0x294($s1) +.L80240358: +/* 954318 80240358 3C06800F */ lui $a2, 0x800f +/* 95431C 8024035C 24C67F40 */ addiu $a2, $a2, 0x7f40 +/* 954320 80240360 00461021 */ addu $v0, $v0, $a2 +/* 954324 80240364 8C420000 */ lw $v0, ($v0) +/* 954328 80240368 AE20018C */ sw $zero, 0x18c($s1) +/* 95432C 8024036C AE220000 */ sw $v0, ($s1) +/* 954330 80240370 8FA60010 */ lw $a2, 0x10($sp) +/* 954334 80240374 8CC20000 */ lw $v0, ($a2) +/* 954338 80240378 AE220294 */ sw $v0, 0x294($s1) +.L8024037C: +/* 95433C 8024037C 001010C0 */ sll $v0, $s0, 3 +/* 954340 80240380 03C21021 */ addu $v0, $fp, $v0 +/* 954344 80240384 80420015 */ lb $v0, 0x15($v0) +/* 954348 80240388 26D60001 */ addiu $s6, $s6, 1 +/* 95434C 8024038C AE220210 */ sw $v0, 0x210($s1) +/* 954350 80240390 26310004 */ addiu $s1, $s1, 4 +/* 954354 80240394 26520001 */ addiu $s2, $s2, 1 +.L80240398: +/* 954358 80240398 2A420008 */ slti $v0, $s2, 8 +/* 95435C 8024039C 1440FFCB */ bnez $v0, .L802402CC +/* 954360 802403A0 26940002 */ addiu $s4, $s4, 2 +/* 954364 802403A4 0260202D */ daddu $a0, $s3, $zero +/* 954368 802403A8 24020004 */ addiu $v0, $zero, 4 +/* 95436C 802403AC AC820318 */ sw $v0, 0x318($a0) +/* 954370 802403B0 AC960324 */ sw $s6, 0x324($a0) +/* 954374 802403B4 0C03D390 */ jal func_800F4E40 +/* 954378 802403B8 AC800328 */ sw $zero, 0x328($a0) +/* 95437C 802403BC AEA00070 */ sw $zero, 0x70($s5) +.L802403C0: +/* 954380 802403C0 8EA20070 */ lw $v0, 0x70($s5) +/* 954384 802403C4 8EB30078 */ lw $s3, 0x78($s5) +/* 954388 802403C8 14400008 */ bnez $v0, .L802403EC +/* 95438C 802403CC 24420001 */ addiu $v0, $v0, 1 +/* 954390 802403D0 8662032C */ lh $v0, 0x32c($s3) +/* 954394 802403D4 10400009 */ beqz $v0, .L802403FC +/* 954398 802403D8 AEA20074 */ sw $v0, 0x74($s5) +/* 95439C 802403DC 0C03C4EC */ jal func_800F13B0 +/* 9543A0 802403E0 00000000 */ nop +/* 9543A4 802403E4 8EA20070 */ lw $v0, 0x70($s5) +/* 9543A8 802403E8 24420001 */ addiu $v0, $v0, 1 +.L802403EC: +/* 9543AC 802403EC AEA20070 */ sw $v0, 0x70($s5) +/* 9543B0 802403F0 2842000F */ slti $v0, $v0, 0xf +/* 9543B4 802403F4 10400003 */ beqz $v0, .L80240404 +/* 9543B8 802403F8 00000000 */ nop +.L802403FC: +/* 9543BC 802403FC 0809011B */ j .L8024046C +/* 9543C0 80240400 0000102D */ daddu $v0, $zero, $zero +.L80240404: +/* 9543C4 80240404 0C03C54E */ jal func_800F1538 +/* 9543C8 80240408 00000000 */ nop +/* 9543CC 8024040C 8EA30074 */ lw $v1, 0x74($s5) +/* 9543D0 80240410 240200FF */ addiu $v0, $zero, 0xff +/* 9543D4 80240414 10620010 */ beq $v1, $v0, .L80240458 +/* 9543D8 80240418 2462FFFF */ addiu $v0, $v1, -1 +/* 9543DC 8024041C 00021080 */ sll $v0, $v0, 2 +/* 9543E0 80240420 02621021 */ addu $v0, $s3, $v0 +/* 9543E4 80240424 8C420108 */ lw $v0, 0x108($v0) +/* 9543E8 80240428 00021100 */ sll $v0, $v0, 4 +/* 9543EC 8024042C 3C038009 */ lui $v1, 0x8009 +/* 9543F0 80240430 00621821 */ addu $v1, $v1, $v0 +/* 9543F4 80240434 8C63EF20 */ lw $v1, -0x10e0($v1) +/* 9543F8 80240438 8EA20074 */ lw $v0, 0x74($s5) +/* 9543FC 8024043C 2442FFFF */ addiu $v0, $v0, -1 +/* 954400 80240440 00021080 */ sll $v0, $v0, 2 +/* 954404 80240444 02621021 */ addu $v0, $s3, $v0 +/* 954408 80240448 AEA30084 */ sw $v1, 0x84($s5) +/* 95440C 8024044C 8C420108 */ lw $v0, 0x108($v0) +/* 954410 80240450 08090118 */ j .L80240460 +/* 954414 80240454 AEA20088 */ sw $v0, 0x88($s5) +.L80240458: +/* 954418 80240458 2402FFFF */ addiu $v0, $zero, -1 +/* 95441C 8024045C AEA20084 */ sw $v0, 0x84($s5) +.L80240460: +/* 954420 80240460 0C00AB4B */ jal heap_free +/* 954424 80240464 8EA40078 */ lw $a0, 0x78($s5) +/* 954428 80240468 24020002 */ addiu $v0, $zero, 2 +.L8024046C: +/* 95442C 8024046C 8FBF003C */ lw $ra, 0x3c($sp) +/* 954430 80240470 8FBE0038 */ lw $fp, 0x38($sp) +/* 954434 80240474 8FB70034 */ lw $s7, 0x34($sp) +/* 954438 80240478 8FB60030 */ lw $s6, 0x30($sp) +/* 95443C 8024047C 8FB5002C */ lw $s5, 0x2c($sp) +/* 954440 80240480 8FB40028 */ lw $s4, 0x28($sp) +/* 954444 80240484 8FB30024 */ lw $s3, 0x24($sp) +/* 954448 80240488 8FB20020 */ lw $s2, 0x20($sp) +/* 95444C 8024048C 8FB1001C */ lw $s1, 0x1c($sp) +/* 954450 80240490 8FB00018 */ lw $s0, 0x18($sp) +/* 954454 80240494 03E00008 */ jr $ra +/* 954458 80240498 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C.s deleted file mode 100644 index 332dd7697f..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024049C -/* 95445C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 954460 802404A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 954464 802404A4 8C82000C */ lw $v0, 0xc($a0) -/* 954468 802404A8 0C0B1EAF */ jal get_variable -/* 95446C 802404AC 8C450000 */ lw $a1, ($v0) -/* 954470 802404B0 0C03AC5A */ jal func_800EB168 -/* 954474 802404B4 0040202D */ daddu $a0, $v0, $zero -/* 954478 802404B8 8FBF0010 */ lw $ra, 0x10($sp) -/* 95447C 802404BC 24020002 */ addiu $v0, $zero, 2 -/* 954480 802404C0 03E00008 */ jr $ra -/* 954484 802404C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C_95445C.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C_95445C.s new file mode 100644 index 0000000000..6a7ea68baa --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_8024049C_95445C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024049C_95445C +/* 95445C 8024049C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 954460 802404A0 AFBF0010 */ sw $ra, 0x10($sp) +/* 954464 802404A4 8C82000C */ lw $v0, 0xc($a0) +/* 954468 802404A8 0C0B1EAF */ jal get_variable +/* 95446C 802404AC 8C450000 */ lw $a1, ($v0) +/* 954470 802404B0 0C03AC5A */ jal func_800EB168 +/* 954474 802404B4 0040202D */ daddu $a0, $v0, $zero +/* 954478 802404B8 8FBF0010 */ lw $ra, 0x10($sp) +/* 95447C 802404BC 24020002 */ addiu $v0, $zero, 2 +/* 954480 802404C0 03E00008 */ jr $ra +/* 954484 802404C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8.s deleted file mode 100644 index adf6b10877..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404C8 -/* 954488 802404C8 3C028011 */ lui $v0, 0x8011 -/* 95448C 802404CC 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 954490 802404D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 954494 802404D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 954498 802404D8 00021100 */ sll $v0, $v0, 4 -/* 95449C 802404DC 3C048009 */ lui $a0, 0x8009 -/* 9544A0 802404E0 00822021 */ addu $a0, $a0, $v0 -/* 9544A4 802404E4 8C84EF20 */ lw $a0, -0x10e0($a0) -/* 9544A8 802404E8 0C0496CF */ jal set_message_string -/* 9544AC 802404EC 0000282D */ daddu $a1, $zero, $zero -/* 9544B0 802404F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9544B4 802404F4 24020002 */ addiu $v0, $zero, 2 -/* 9544B8 802404F8 03E00008 */ jr $ra -/* 9544BC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s new file mode 100644 index 0000000000..8bf79961fa --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404C8_954488 +/* 954488 802404C8 3C028011 */ lui $v0, 0x8011 +/* 95448C 802404CC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 954490 802404D0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 954494 802404D4 AFBF0010 */ sw $ra, 0x10($sp) +/* 954498 802404D8 00021100 */ sll $v0, $v0, 4 +/* 95449C 802404DC 3C048009 */ lui $a0, 0x8009 +/* 9544A0 802404E0 00822021 */ addu $a0, $a0, $v0 +/* 9544A4 802404E4 8C84EF20 */ lw $a0, -0x10e0($a0) +/* 9544A8 802404E8 0C0496CF */ jal set_message_string +/* 9544AC 802404EC 0000282D */ daddu $a1, $zero, $zero +/* 9544B0 802404F0 8FBF0010 */ lw $ra, 0x10($sp) +/* 9544B4 802404F4 24020002 */ addiu $v0, $zero, 2 +/* 9544B8 802404F8 03E00008 */ jr $ra +/* 9544BC 802404FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240590.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240590.s deleted file mode 100644 index 3513286397..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240590.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240590 -/* 954550 80240590 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 954554 80240594 AFBF0010 */ sw $ra, 0x10($sp) -/* 954558 80240598 8C82000C */ lw $v0, 0xc($a0) -/* 95455C 8024059C 0C0B1EAF */ jal get_variable -/* 954560 802405A0 8C450000 */ lw $a1, ($v0) -/* 954564 802405A4 0040202D */ daddu $a0, $v0, $zero -/* 954568 802405A8 8C830000 */ lw $v1, ($a0) -/* 95456C 802405AC 34630010 */ ori $v1, $v1, 0x10 -/* 954570 802405B0 AC830000 */ sw $v1, ($a0) -/* 954574 802405B4 8FBF0010 */ lw $ra, 0x10($sp) -/* 954578 802405B8 24020002 */ addiu $v0, $zero, 2 -/* 95457C 802405BC 03E00008 */ jr $ra -/* 954580 802405C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240590_954550.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240590_954550.s new file mode 100644 index 0000000000..f653e2edc6 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240590_954550.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240590_954550 +/* 954550 80240590 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 954554 80240594 AFBF0010 */ sw $ra, 0x10($sp) +/* 954558 80240598 8C82000C */ lw $v0, 0xc($a0) +/* 95455C 8024059C 0C0B1EAF */ jal get_variable +/* 954560 802405A0 8C450000 */ lw $a1, ($v0) +/* 954564 802405A4 0040202D */ daddu $a0, $v0, $zero +/* 954568 802405A8 8C830000 */ lw $v1, ($a0) +/* 95456C 802405AC 34630010 */ ori $v1, $v1, 0x10 +/* 954570 802405B0 AC830000 */ sw $v1, ($a0) +/* 954574 802405B4 8FBF0010 */ lw $ra, 0x10($sp) +/* 954578 802405B8 24020002 */ addiu $v0, $zero, 2 +/* 95457C 802405BC 03E00008 */ jr $ra +/* 954580 802405C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4.s deleted file mode 100644 index 8a39790271..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C4 -/* 954584 802405C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 954588 802405C8 AFBF0018 */ sw $ra, 0x18($sp) -/* 95458C 802405CC 8C82000C */ lw $v0, 0xc($a0) -/* 954590 802405D0 0C0B1EAF */ jal get_variable -/* 954594 802405D4 8C450000 */ lw $a1, ($v0) -/* 954598 802405D8 0C04417A */ jal get_entity_by_index -/* 95459C 802405DC 0040202D */ daddu $a0, $v0, $zero -/* 9545A0 802405E0 3C013F80 */ lui $at, 0x3f80 -/* 9545A4 802405E4 44810000 */ mtc1 $at, $f0 -/* 9545A8 802405E8 C442004C */ lwc1 $f2, 0x4c($v0) -/* 9545AC 802405EC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9545B0 802405F0 3C014148 */ lui $at, 0x4148 -/* 9545B4 802405F4 44810000 */ mtc1 $at, $f0 -/* 9545B8 802405F8 2403004B */ addiu $v1, $zero, 0x4b -/* 9545BC 802405FC AFA30014 */ sw $v1, 0x14($sp) -/* 9545C0 80240600 46001080 */ add.s $f2, $f2, $f0 -/* 9545C4 80240604 8C450048 */ lw $a1, 0x48($v0) -/* 9545C8 80240608 8C470050 */ lw $a3, 0x50($v0) -/* 9545CC 8024060C 44061000 */ mfc1 $a2, $f2 -/* 9545D0 80240610 0C01C2EC */ jal func_80070BB0 -/* 9545D4 80240614 24040004 */ addiu $a0, $zero, 4 -/* 9545D8 80240618 8FBF0018 */ lw $ra, 0x18($sp) -/* 9545DC 8024061C 24020002 */ addiu $v0, $zero, 2 -/* 9545E0 80240620 03E00008 */ jr $ra -/* 9545E4 80240624 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4_954584.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4_954584.s new file mode 100644 index 0000000000..5abb6d2953 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802405C4_954584.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405C4_954584 +/* 954584 802405C4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 954588 802405C8 AFBF0018 */ sw $ra, 0x18($sp) +/* 95458C 802405CC 8C82000C */ lw $v0, 0xc($a0) +/* 954590 802405D0 0C0B1EAF */ jal get_variable +/* 954594 802405D4 8C450000 */ lw $a1, ($v0) +/* 954598 802405D8 0C04417A */ jal get_entity_by_index +/* 95459C 802405DC 0040202D */ daddu $a0, $v0, $zero +/* 9545A0 802405E0 3C013F80 */ lui $at, 0x3f80 +/* 9545A4 802405E4 44810000 */ mtc1 $at, $f0 +/* 9545A8 802405E8 C442004C */ lwc1 $f2, 0x4c($v0) +/* 9545AC 802405EC E7A00010 */ swc1 $f0, 0x10($sp) +/* 9545B0 802405F0 3C014148 */ lui $at, 0x4148 +/* 9545B4 802405F4 44810000 */ mtc1 $at, $f0 +/* 9545B8 802405F8 2403004B */ addiu $v1, $zero, 0x4b +/* 9545BC 802405FC AFA30014 */ sw $v1, 0x14($sp) +/* 9545C0 80240600 46001080 */ add.s $f2, $f2, $f0 +/* 9545C4 80240604 8C450048 */ lw $a1, 0x48($v0) +/* 9545C8 80240608 8C470050 */ lw $a3, 0x50($v0) +/* 9545CC 8024060C 44061000 */ mfc1 $a2, $f2 +/* 9545D0 80240610 0C01C2EC */ jal func_80070BB0 +/* 9545D4 80240614 24040004 */ addiu $a0, $zero, 4 +/* 9545D8 80240618 8FBF0018 */ lw $ra, 0x18($sp) +/* 9545DC 8024061C 24020002 */ addiu $v0, $zero, 2 +/* 9545E0 80240620 03E00008 */ jr $ra +/* 9545E4 80240624 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8.s deleted file mode 100644 index 10ea5ad92a..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB8 -/* 954B78 80240BB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 954B7C 80240BBC AFB10014 */ sw $s1, 0x14($sp) -/* 954B80 80240BC0 0080882D */ daddu $s1, $a0, $zero -/* 954B84 80240BC4 AFB20018 */ sw $s2, 0x18($sp) -/* 954B88 80240BC8 AFBF001C */ sw $ra, 0x1c($sp) -/* 954B8C 80240BCC AFB00010 */ sw $s0, 0x10($sp) -/* 954B90 80240BD0 8E30000C */ lw $s0, 0xc($s1) -/* 954B94 80240BD4 10A00010 */ beqz $a1, .L80240C18 -/* 954B98 80240BD8 0000902D */ daddu $s2, $zero, $zero -/* 954B9C 80240BDC 8E050000 */ lw $a1, ($s0) -/* 954BA0 80240BE0 0C0B1EAF */ jal get_variable -/* 954BA4 80240BE4 26100004 */ addiu $s0, $s0, 4 -/* 954BA8 80240BE8 AE220084 */ sw $v0, 0x84($s1) -/* 954BAC 80240BEC 8E050000 */ lw $a1, ($s0) -/* 954BB0 80240BF0 0C0B1EAF */ jal get_variable -/* 954BB4 80240BF4 0220202D */ daddu $a0, $s1, $zero -/* 954BB8 80240BF8 0240202D */ daddu $a0, $s2, $zero -/* 954BBC 80240BFC 240500D0 */ addiu $a1, $zero, 0xd0 -/* 954BC0 80240C00 00A0302D */ daddu $a2, $a1, $zero -/* 954BC4 80240C04 00A0382D */ daddu $a3, $a1, $zero -/* 954BC8 80240C08 AE220088 */ sw $v0, 0x88($s1) -/* 954BCC 80240C0C AE200070 */ sw $zero, 0x70($s1) -/* 954BD0 80240C10 0C04DF84 */ jal func_80137E10 -/* 954BD4 80240C14 AE200074 */ sw $zero, 0x74($s1) -.L80240C18: -/* 954BD8 80240C18 8E230070 */ lw $v1, 0x70($s1) -/* 954BDC 80240C1C 24040001 */ addiu $a0, $zero, 1 -/* 954BE0 80240C20 10640019 */ beq $v1, $a0, .L80240C88 -/* 954BE4 80240C24 28620002 */ slti $v0, $v1, 2 -/* 954BE8 80240C28 10400005 */ beqz $v0, .L80240C40 -/* 954BEC 80240C2C 24020002 */ addiu $v0, $zero, 2 -/* 954BF0 80240C30 10600007 */ beqz $v1, .L80240C50 -/* 954BF4 80240C34 240500FF */ addiu $a1, $zero, 0xff -/* 954BF8 80240C38 08090332 */ j .L80240CC8 -/* 954BFC 80240C3C 00000000 */ nop -.L80240C40: -/* 954C00 80240C40 10620019 */ beq $v1, $v0, .L80240CA8 -/* 954C04 80240C44 00000000 */ nop -/* 954C08 80240C48 08090332 */ j .L80240CC8 -/* 954C0C 80240C4C 00000000 */ nop -.L80240C50: -/* 954C10 80240C50 8E220074 */ lw $v0, 0x74($s1) -/* 954C14 80240C54 14450004 */ bne $v0, $a1, .L80240C68 -/* 954C18 80240C58 00000000 */ nop -/* 954C1C 80240C5C AE240070 */ sw $a0, 0x70($s1) -/* 954C20 80240C60 AE200078 */ sw $zero, 0x78($s1) -/* 954C24 80240C64 8E220074 */ lw $v0, 0x74($s1) -.L80240C68: -/* 954C28 80240C68 8E230084 */ lw $v1, 0x84($s1) -/* 954C2C 80240C6C 00431021 */ addu $v0, $v0, $v1 -/* 954C30 80240C70 AE220074 */ sw $v0, 0x74($s1) -/* 954C34 80240C74 28420100 */ slti $v0, $v0, 0x100 -/* 954C38 80240C78 50400013 */ beql $v0, $zero, .L80240CC8 -/* 954C3C 80240C7C AE250074 */ sw $a1, 0x74($s1) -/* 954C40 80240C80 08090332 */ j .L80240CC8 -/* 954C44 80240C84 00000000 */ nop -.L80240C88: -/* 954C48 80240C88 8E220078 */ lw $v0, 0x78($s1) -/* 954C4C 80240C8C 24420001 */ addiu $v0, $v0, 1 -/* 954C50 80240C90 AE220078 */ sw $v0, 0x78($s1) -/* 954C54 80240C94 28420002 */ slti $v0, $v0, 2 -/* 954C58 80240C98 1440000B */ bnez $v0, .L80240CC8 -/* 954C5C 80240C9C 24020002 */ addiu $v0, $zero, 2 -/* 954C60 80240CA0 08090332 */ j .L80240CC8 -/* 954C64 80240CA4 AE220070 */ sw $v0, 0x70($s1) -.L80240CA8: -/* 954C68 80240CA8 8E230074 */ lw $v1, 0x74($s1) -/* 954C6C 80240CAC 50600001 */ beql $v1, $zero, .L80240CB4 -/* 954C70 80240CB0 24120001 */ addiu $s2, $zero, 1 -.L80240CB4: -/* 954C74 80240CB4 8E220088 */ lw $v0, 0x88($s1) -/* 954C78 80240CB8 00621023 */ subu $v0, $v1, $v0 -/* 954C7C 80240CBC 04410002 */ bgez $v0, .L80240CC8 -/* 954C80 80240CC0 AE220074 */ sw $v0, 0x74($s1) -/* 954C84 80240CC4 AE200074 */ sw $zero, 0x74($s1) -.L80240CC8: -/* 954C88 80240CC8 C6200074 */ lwc1 $f0, 0x74($s1) -/* 954C8C 80240CCC 46800020 */ cvt.s.w $f0, $f0 -/* 954C90 80240CD0 44050000 */ mfc1 $a1, $f0 -/* 954C94 80240CD4 0C04DF62 */ jal func_80137D88 -/* 954C98 80240CD8 24040001 */ addiu $a0, $zero, 1 -/* 954C9C 80240CDC 0240102D */ daddu $v0, $s2, $zero -/* 954CA0 80240CE0 8FBF001C */ lw $ra, 0x1c($sp) -/* 954CA4 80240CE4 8FB20018 */ lw $s2, 0x18($sp) -/* 954CA8 80240CE8 8FB10014 */ lw $s1, 0x14($sp) -/* 954CAC 80240CEC 8FB00010 */ lw $s0, 0x10($sp) -/* 954CB0 80240CF0 03E00008 */ jr $ra -/* 954CB4 80240CF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s new file mode 100644 index 0000000000..0838212cfc --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240BB8_954B78.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BB8_954B78 +/* 954B78 80240BB8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 954B7C 80240BBC AFB10014 */ sw $s1, 0x14($sp) +/* 954B80 80240BC0 0080882D */ daddu $s1, $a0, $zero +/* 954B84 80240BC4 AFB20018 */ sw $s2, 0x18($sp) +/* 954B88 80240BC8 AFBF001C */ sw $ra, 0x1c($sp) +/* 954B8C 80240BCC AFB00010 */ sw $s0, 0x10($sp) +/* 954B90 80240BD0 8E30000C */ lw $s0, 0xc($s1) +/* 954B94 80240BD4 10A00010 */ beqz $a1, .L80240C18 +/* 954B98 80240BD8 0000902D */ daddu $s2, $zero, $zero +/* 954B9C 80240BDC 8E050000 */ lw $a1, ($s0) +/* 954BA0 80240BE0 0C0B1EAF */ jal get_variable +/* 954BA4 80240BE4 26100004 */ addiu $s0, $s0, 4 +/* 954BA8 80240BE8 AE220084 */ sw $v0, 0x84($s1) +/* 954BAC 80240BEC 8E050000 */ lw $a1, ($s0) +/* 954BB0 80240BF0 0C0B1EAF */ jal get_variable +/* 954BB4 80240BF4 0220202D */ daddu $a0, $s1, $zero +/* 954BB8 80240BF8 0240202D */ daddu $a0, $s2, $zero +/* 954BBC 80240BFC 240500D0 */ addiu $a1, $zero, 0xd0 +/* 954BC0 80240C00 00A0302D */ daddu $a2, $a1, $zero +/* 954BC4 80240C04 00A0382D */ daddu $a3, $a1, $zero +/* 954BC8 80240C08 AE220088 */ sw $v0, 0x88($s1) +/* 954BCC 80240C0C AE200070 */ sw $zero, 0x70($s1) +/* 954BD0 80240C10 0C04DF84 */ jal func_80137E10 +/* 954BD4 80240C14 AE200074 */ sw $zero, 0x74($s1) +.L80240C18: +/* 954BD8 80240C18 8E230070 */ lw $v1, 0x70($s1) +/* 954BDC 80240C1C 24040001 */ addiu $a0, $zero, 1 +/* 954BE0 80240C20 10640019 */ beq $v1, $a0, .L80240C88 +/* 954BE4 80240C24 28620002 */ slti $v0, $v1, 2 +/* 954BE8 80240C28 10400005 */ beqz $v0, .L80240C40 +/* 954BEC 80240C2C 24020002 */ addiu $v0, $zero, 2 +/* 954BF0 80240C30 10600007 */ beqz $v1, .L80240C50 +/* 954BF4 80240C34 240500FF */ addiu $a1, $zero, 0xff +/* 954BF8 80240C38 08090332 */ j .L80240CC8 +/* 954BFC 80240C3C 00000000 */ nop +.L80240C40: +/* 954C00 80240C40 10620019 */ beq $v1, $v0, .L80240CA8 +/* 954C04 80240C44 00000000 */ nop +/* 954C08 80240C48 08090332 */ j .L80240CC8 +/* 954C0C 80240C4C 00000000 */ nop +.L80240C50: +/* 954C10 80240C50 8E220074 */ lw $v0, 0x74($s1) +/* 954C14 80240C54 14450004 */ bne $v0, $a1, .L80240C68 +/* 954C18 80240C58 00000000 */ nop +/* 954C1C 80240C5C AE240070 */ sw $a0, 0x70($s1) +/* 954C20 80240C60 AE200078 */ sw $zero, 0x78($s1) +/* 954C24 80240C64 8E220074 */ lw $v0, 0x74($s1) +.L80240C68: +/* 954C28 80240C68 8E230084 */ lw $v1, 0x84($s1) +/* 954C2C 80240C6C 00431021 */ addu $v0, $v0, $v1 +/* 954C30 80240C70 AE220074 */ sw $v0, 0x74($s1) +/* 954C34 80240C74 28420100 */ slti $v0, $v0, 0x100 +/* 954C38 80240C78 50400013 */ beql $v0, $zero, .L80240CC8 +/* 954C3C 80240C7C AE250074 */ sw $a1, 0x74($s1) +/* 954C40 80240C80 08090332 */ j .L80240CC8 +/* 954C44 80240C84 00000000 */ nop +.L80240C88: +/* 954C48 80240C88 8E220078 */ lw $v0, 0x78($s1) +/* 954C4C 80240C8C 24420001 */ addiu $v0, $v0, 1 +/* 954C50 80240C90 AE220078 */ sw $v0, 0x78($s1) +/* 954C54 80240C94 28420002 */ slti $v0, $v0, 2 +/* 954C58 80240C98 1440000B */ bnez $v0, .L80240CC8 +/* 954C5C 80240C9C 24020002 */ addiu $v0, $zero, 2 +/* 954C60 80240CA0 08090332 */ j .L80240CC8 +/* 954C64 80240CA4 AE220070 */ sw $v0, 0x70($s1) +.L80240CA8: +/* 954C68 80240CA8 8E230074 */ lw $v1, 0x74($s1) +/* 954C6C 80240CAC 50600001 */ beql $v1, $zero, .L80240CB4 +/* 954C70 80240CB0 24120001 */ addiu $s2, $zero, 1 +.L80240CB4: +/* 954C74 80240CB4 8E220088 */ lw $v0, 0x88($s1) +/* 954C78 80240CB8 00621023 */ subu $v0, $v1, $v0 +/* 954C7C 80240CBC 04410002 */ bgez $v0, .L80240CC8 +/* 954C80 80240CC0 AE220074 */ sw $v0, 0x74($s1) +/* 954C84 80240CC4 AE200074 */ sw $zero, 0x74($s1) +.L80240CC8: +/* 954C88 80240CC8 C6200074 */ lwc1 $f0, 0x74($s1) +/* 954C8C 80240CCC 46800020 */ cvt.s.w $f0, $f0 +/* 954C90 80240CD0 44050000 */ mfc1 $a1, $f0 +/* 954C94 80240CD4 0C04DF62 */ jal func_80137D88 +/* 954C98 80240CD8 24040001 */ addiu $a0, $zero, 1 +/* 954C9C 80240CDC 0240102D */ daddu $v0, $s2, $zero +/* 954CA0 80240CE0 8FBF001C */ lw $ra, 0x1c($sp) +/* 954CA4 80240CE4 8FB20018 */ lw $s2, 0x18($sp) +/* 954CA8 80240CE8 8FB10014 */ lw $s1, 0x14($sp) +/* 954CAC 80240CEC 8FB00010 */ lw $s0, 0x10($sp) +/* 954CB0 80240CF0 03E00008 */ jr $ra +/* 954CB4 80240CF4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8.s deleted file mode 100644 index 6fd7000c4d..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF8 -/* 954CB8 80240CF8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 954CBC 80240CFC AFBF0018 */ sw $ra, 0x18($sp) -/* 954CC0 80240D00 0C00EAD2 */ jal get_npc_safe -/* 954CC4 80240D04 2404FFFC */ addiu $a0, $zero, -4 -/* 954CC8 80240D08 3C0141F0 */ lui $at, 0x41f0 -/* 954CCC 80240D0C 44810000 */ mtc1 $at, $f0 -/* 954CD0 80240D10 C442003C */ lwc1 $f2, 0x3c($v0) -/* 954CD4 80240D14 46001080 */ add.s $f2, $f2, $f0 -/* 954CD8 80240D18 E7A00010 */ swc1 $f0, 0x10($sp) -/* 954CDC 80240D1C 8C450038 */ lw $a1, 0x38($v0) -/* 954CE0 80240D20 8C470040 */ lw $a3, 0x40($v0) -/* 954CE4 80240D24 44061000 */ mfc1 $a2, $f2 -/* 954CE8 80240D28 0C01BFBC */ jal func_8006FEF0 -/* 954CEC 80240D2C 24040002 */ addiu $a0, $zero, 2 -/* 954CF0 80240D30 8FBF0018 */ lw $ra, 0x18($sp) -/* 954CF4 80240D34 24020002 */ addiu $v0, $zero, 2 -/* 954CF8 80240D38 03E00008 */ jr $ra -/* 954CFC 80240D3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8_954CB8.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8_954CB8.s new file mode 100644 index 0000000000..642dfb985e --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240CF8_954CB8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CF8_954CB8 +/* 954CB8 80240CF8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 954CBC 80240CFC AFBF0018 */ sw $ra, 0x18($sp) +/* 954CC0 80240D00 0C00EAD2 */ jal get_npc_safe +/* 954CC4 80240D04 2404FFFC */ addiu $a0, $zero, -4 +/* 954CC8 80240D08 3C0141F0 */ lui $at, 0x41f0 +/* 954CCC 80240D0C 44810000 */ mtc1 $at, $f0 +/* 954CD0 80240D10 C442003C */ lwc1 $f2, 0x3c($v0) +/* 954CD4 80240D14 46001080 */ add.s $f2, $f2, $f0 +/* 954CD8 80240D18 E7A00010 */ swc1 $f0, 0x10($sp) +/* 954CDC 80240D1C 8C450038 */ lw $a1, 0x38($v0) +/* 954CE0 80240D20 8C470040 */ lw $a3, 0x40($v0) +/* 954CE4 80240D24 44061000 */ mfc1 $a2, $f2 +/* 954CE8 80240D28 0C01BFBC */ jal func_8006FEF0 +/* 954CEC 80240D2C 24040002 */ addiu $a0, $zero, 2 +/* 954CF0 80240D30 8FBF0018 */ lw $ra, 0x18($sp) +/* 954CF4 80240D34 24020002 */ addiu $v0, $zero, 2 +/* 954CF8 80240D38 03E00008 */ jr $ra +/* 954CFC 80240D3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40.s deleted file mode 100644 index 13bc752acf..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D40 -/* 954D00 80240D40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 954D04 80240D44 AFBF0018 */ sw $ra, 0x18($sp) -/* 954D08 80240D48 0C00EAD2 */ jal get_npc_safe -/* 954D0C 80240D4C 2404FFFC */ addiu $a0, $zero, -4 -/* 954D10 80240D50 3C0141F0 */ lui $at, 0x41f0 -/* 954D14 80240D54 44810000 */ mtc1 $at, $f0 -/* 954D18 80240D58 C442003C */ lwc1 $f2, 0x3c($v0) -/* 954D1C 80240D5C 46001080 */ add.s $f2, $f2, $f0 -/* 954D20 80240D60 E7A00010 */ swc1 $f0, 0x10($sp) -/* 954D24 80240D64 8C450038 */ lw $a1, 0x38($v0) -/* 954D28 80240D68 8C470040 */ lw $a3, 0x40($v0) -/* 954D2C 80240D6C 44061000 */ mfc1 $a2, $f2 -/* 954D30 80240D70 0C01BFBC */ jal func_8006FEF0 -/* 954D34 80240D74 24040004 */ addiu $a0, $zero, 4 -/* 954D38 80240D78 8FBF0018 */ lw $ra, 0x18($sp) -/* 954D3C 80240D7C 24020002 */ addiu $v0, $zero, 2 -/* 954D40 80240D80 03E00008 */ jr $ra -/* 954D44 80240D84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40_954D00.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40_954D00.s new file mode 100644 index 0000000000..4d36d3c1a7 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D40_954D00.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D40_954D00 +/* 954D00 80240D40 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 954D04 80240D44 AFBF0018 */ sw $ra, 0x18($sp) +/* 954D08 80240D48 0C00EAD2 */ jal get_npc_safe +/* 954D0C 80240D4C 2404FFFC */ addiu $a0, $zero, -4 +/* 954D10 80240D50 3C0141F0 */ lui $at, 0x41f0 +/* 954D14 80240D54 44810000 */ mtc1 $at, $f0 +/* 954D18 80240D58 C442003C */ lwc1 $f2, 0x3c($v0) +/* 954D1C 80240D5C 46001080 */ add.s $f2, $f2, $f0 +/* 954D20 80240D60 E7A00010 */ swc1 $f0, 0x10($sp) +/* 954D24 80240D64 8C450038 */ lw $a1, 0x38($v0) +/* 954D28 80240D68 8C470040 */ lw $a3, 0x40($v0) +/* 954D2C 80240D6C 44061000 */ mfc1 $a2, $f2 +/* 954D30 80240D70 0C01BFBC */ jal func_8006FEF0 +/* 954D34 80240D74 24040004 */ addiu $a0, $zero, 4 +/* 954D38 80240D78 8FBF0018 */ lw $ra, 0x18($sp) +/* 954D3C 80240D7C 24020002 */ addiu $v0, $zero, 2 +/* 954D40 80240D80 03E00008 */ jr $ra +/* 954D44 80240D84 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88.s deleted file mode 100644 index 985625be66..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D88 -/* 954D48 80240D88 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 954D4C 80240D8C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 954D50 80240D90 AC800084 */ sw $zero, 0x84($a0) -/* 954D54 80240D94 80620000 */ lb $v0, ($v1) -/* 954D58 80240D98 10400005 */ beqz $v0, .L80240DB0 -/* 954D5C 80240D9C 24020003 */ addiu $v0, $zero, 3 -/* 954D60 80240DA0 80630003 */ lb $v1, 3($v1) -/* 954D64 80240DA4 14620002 */ bne $v1, $v0, .L80240DB0 -/* 954D68 80240DA8 24020001 */ addiu $v0, $zero, 1 -/* 954D6C 80240DAC AC820084 */ sw $v0, 0x84($a0) -.L80240DB0: -/* 954D70 80240DB0 03E00008 */ jr $ra -/* 954D74 80240DB4 24020002 */ addiu $v0, $zero, 2 -/* 954D78 80240DB8 00000000 */ nop -/* 954D7C 80240DBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s new file mode 100644 index 0000000000..bbf6e450b4 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_80240D88_954D48.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D88_954D48 +/* 954D48 80240D88 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* 954D4C 80240D8C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 954D50 80240D90 AC800084 */ sw $zero, 0x84($a0) +/* 954D54 80240D94 80620000 */ lb $v0, ($v1) +/* 954D58 80240D98 10400005 */ beqz $v0, .L80240DB0 +/* 954D5C 80240D9C 24020003 */ addiu $v0, $zero, 3 +/* 954D60 80240DA0 80630003 */ lb $v1, 3($v1) +/* 954D64 80240DA4 14620002 */ bne $v1, $v0, .L80240DB0 +/* 954D68 80240DA8 24020001 */ addiu $v0, $zero, 1 +/* 954D6C 80240DAC AC820084 */ sw $v0, 0x84($a0) +.L80240DB0: +/* 954D70 80240DB0 03E00008 */ jr $ra +/* 954D74 80240DB4 24020002 */ addiu $v0, $zero, 2 +/* 954D78 80240DB8 00000000 */ nop +/* 954D7C 80240DBC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240DC0.s b/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240DC0.s deleted file mode 100644 index 1ec7e658bf..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240DC0.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DC0 -/* 954D80 80240DC0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 954D84 80240DC4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 954D88 80240DC8 4485A000 */ mtc1 $a1, $f20 -/* 954D8C 80240DCC F7B60020 */ sdc1 $f22, 0x20($sp) -/* 954D90 80240DD0 4486B000 */ mtc1 $a2, $f22 -/* 954D94 80240DD4 AFB00010 */ sw $s0, 0x10($sp) -/* 954D98 80240DD8 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 954D9C 80240DDC 4487C000 */ mtc1 $a3, $f24 -/* 954DA0 80240DE0 AFBF0014 */ sw $ra, 0x14($sp) -/* 954DA4 80240DE4 0C019D28 */ jal guMtxIdentF -/* 954DA8 80240DE8 0080802D */ daddu $s0, $a0, $zero -/* 954DAC 80240DEC 4616A582 */ mul.s $f22, $f20, $f22 -/* 954DB0 80240DF0 00000000 */ nop -/* 954DB4 80240DF4 4618A502 */ mul.s $f20, $f20, $f24 -/* 954DB8 80240DF8 00000000 */ nop -/* 954DBC 80240DFC 3C013F80 */ lui $at, 0x3f80 -/* 954DC0 80240E00 44810000 */ mtc1 $at, $f0 -/* 954DC4 80240E04 00000000 */ nop -/* 954DC8 80240E08 E6000014 */ swc1 $f0, 0x14($s0) -/* 954DCC 80240E0C E6160010 */ swc1 $f22, 0x10($s0) -/* 954DD0 80240E10 E6140018 */ swc1 $f20, 0x18($s0) -/* 954DD4 80240E14 8FBF0014 */ lw $ra, 0x14($sp) -/* 954DD8 80240E18 8FB00010 */ lw $s0, 0x10($sp) -/* 954DDC 80240E1C D7B80028 */ ldc1 $f24, 0x28($sp) -/* 954DE0 80240E20 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 954DE4 80240E24 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 954DE8 80240E28 03E00008 */ jr $ra -/* 954DEC 80240E2C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240DC0_954D80.s b/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240DC0_954D80.s new file mode 100644 index 0000000000..b9fc4b2a38 --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240DC0_954D80.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DC0_954D80 +/* 954D80 80240DC0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 954D84 80240DC4 F7B40018 */ sdc1 $f20, 0x18($sp) +/* 954D88 80240DC8 4485A000 */ mtc1 $a1, $f20 +/* 954D8C 80240DCC F7B60020 */ sdc1 $f22, 0x20($sp) +/* 954D90 80240DD0 4486B000 */ mtc1 $a2, $f22 +/* 954D94 80240DD4 AFB00010 */ sw $s0, 0x10($sp) +/* 954D98 80240DD8 F7B80028 */ sdc1 $f24, 0x28($sp) +/* 954D9C 80240DDC 4487C000 */ mtc1 $a3, $f24 +/* 954DA0 80240DE0 AFBF0014 */ sw $ra, 0x14($sp) +/* 954DA4 80240DE4 0C019D28 */ jal guMtxIdentF +/* 954DA8 80240DE8 0080802D */ daddu $s0, $a0, $zero +/* 954DAC 80240DEC 4616A582 */ mul.s $f22, $f20, $f22 +/* 954DB0 80240DF0 00000000 */ nop +/* 954DB4 80240DF4 4618A502 */ mul.s $f20, $f20, $f24 +/* 954DB8 80240DF8 00000000 */ nop +/* 954DBC 80240DFC 3C013F80 */ lui $at, 0x3f80 +/* 954DC0 80240E00 44810000 */ mtc1 $at, $f0 +/* 954DC4 80240E04 00000000 */ nop +/* 954DC8 80240E08 E6000014 */ swc1 $f0, 0x14($s0) +/* 954DCC 80240E0C E6160010 */ swc1 $f22, 0x10($s0) +/* 954DD0 80240E10 E6140018 */ swc1 $f20, 0x18($s0) +/* 954DD4 80240E14 8FBF0014 */ lw $ra, 0x14($sp) +/* 954DD8 80240E18 8FB00010 */ lw $s0, 0x10($sp) +/* 954DDC 80240E1C D7B80028 */ ldc1 $f24, 0x28($sp) +/* 954DE0 80240E20 D7B60020 */ ldc1 $f22, 0x20($sp) +/* 954DE4 80240E24 D7B40018 */ ldc1 $f20, 0x18($sp) +/* 954DE8 80240E28 03E00008 */ jr $ra +/* 954DEC 80240E2C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240E30.s b/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240E30.s deleted file mode 100644 index d05e5dab47..0000000000 --- a/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240E30.s +++ /dev/null @@ -1,122 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E30 -/* 954DF0 80240E30 27BDFF78 */ addiu $sp, $sp, -0x88 -/* 954DF4 80240E34 AFB10054 */ sw $s1, 0x54($sp) -/* 954DF8 80240E38 0080882D */ daddu $s1, $a0, $zero -/* 954DFC 80240E3C AFBF005C */ sw $ra, 0x5c($sp) -/* 954E00 80240E40 AFB20058 */ sw $s2, 0x58($sp) -/* 954E04 80240E44 AFB00050 */ sw $s0, 0x50($sp) -/* 954E08 80240E48 F7BC0080 */ sdc1 $f28, 0x80($sp) -/* 954E0C 80240E4C F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 954E10 80240E50 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 954E14 80240E54 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 954E18 80240E58 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 954E1C 80240E5C 8E30000C */ lw $s0, 0xc($s1) -/* 954E20 80240E60 8E050000 */ lw $a1, ($s0) -/* 954E24 80240E64 0C0B1EAF */ jal get_variable -/* 954E28 80240E68 26100004 */ addiu $s0, $s0, 4 -/* 954E2C 80240E6C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 954E30 80240E70 0040202D */ daddu $a0, $v0, $zero -/* 954E34 80240E74 8E050000 */ lw $a1, ($s0) -/* 954E38 80240E78 26100004 */ addiu $s0, $s0, 4 -/* 954E3C 80240E7C 0220202D */ daddu $a0, $s1, $zero -/* 954E40 80240E80 0C0B210B */ jal get_float_variable -/* 954E44 80240E84 0040902D */ daddu $s2, $v0, $zero -/* 954E48 80240E88 8E050000 */ lw $a1, ($s0) -/* 954E4C 80240E8C 26100004 */ addiu $s0, $s0, 4 -/* 954E50 80240E90 0220202D */ daddu $a0, $s1, $zero -/* 954E54 80240E94 0C0B210B */ jal get_float_variable -/* 954E58 80240E98 46000706 */ mov.s $f28, $f0 -/* 954E5C 80240E9C 8E050000 */ lw $a1, ($s0) -/* 954E60 80240EA0 26100004 */ addiu $s0, $s0, 4 -/* 954E64 80240EA4 0220202D */ daddu $a0, $s1, $zero -/* 954E68 80240EA8 0C0B210B */ jal get_float_variable -/* 954E6C 80240EAC 46000686 */ mov.s $f26, $f0 -/* 954E70 80240EB0 0220202D */ daddu $a0, $s1, $zero -/* 954E74 80240EB4 8E050000 */ lw $a1, ($s0) -/* 954E78 80240EB8 0C0B210B */ jal get_float_variable -/* 954E7C 80240EBC 46000586 */ mov.s $f22, $f0 -/* 954E80 80240EC0 0240202D */ daddu $a0, $s2, $zero -/* 954E84 80240EC4 0C046B4C */ jal get_model_from_list_index -/* 954E88 80240EC8 46000606 */ mov.s $f24, $f0 -/* 954E8C 80240ECC 0040882D */ daddu $s1, $v0, $zero -/* 954E90 80240ED0 96220000 */ lhu $v0, ($s1) -/* 954E94 80240ED4 30420400 */ andi $v0, $v0, 0x400 -/* 954E98 80240ED8 1440001E */ bnez $v0, .L80240F54 -/* 954E9C 80240EDC 26300058 */ addiu $s0, $s1, 0x58 -/* 954EA0 80240EE0 4480A000 */ mtc1 $zero, $f20 -/* 954EA4 80240EE4 4406B000 */ mfc1 $a2, $f22 -/* 954EA8 80240EE8 4405A000 */ mfc1 $a1, $f20 -/* 954EAC 80240EEC 4407A000 */ mfc1 $a3, $f20 -/* 954EB0 80240EF0 0C019E40 */ jal guTranslateF -/* 954EB4 80240EF4 0200202D */ daddu $a0, $s0, $zero -/* 954EB8 80240EF8 4405E000 */ mfc1 $a1, $f28 -/* 954EBC 80240EFC 4406D000 */ mfc1 $a2, $f26 -/* 954EC0 80240F00 4407C000 */ mfc1 $a3, $f24 -/* 954EC4 80240F04 0C090370 */ jal func_80240DC0 -/* 954EC8 80240F08 27A40010 */ addiu $a0, $sp, 0x10 -/* 954ECC 80240F0C 27A40010 */ addiu $a0, $sp, 0x10 -/* 954ED0 80240F10 0200282D */ daddu $a1, $s0, $zero -/* 954ED4 80240F14 0C019D80 */ jal guMtxCatF -/* 954ED8 80240F18 0200302D */ daddu $a2, $s0, $zero -/* 954EDC 80240F1C 27A40010 */ addiu $a0, $sp, 0x10 -/* 954EE0 80240F20 4600B587 */ neg.s $f22, $f22 -/* 954EE4 80240F24 4405A000 */ mfc1 $a1, $f20 -/* 954EE8 80240F28 4406B000 */ mfc1 $a2, $f22 -/* 954EEC 80240F2C 0C019E40 */ jal guTranslateF -/* 954EF0 80240F30 00A0382D */ daddu $a3, $a1, $zero -/* 954EF4 80240F34 27A40010 */ addiu $a0, $sp, 0x10 -/* 954EF8 80240F38 0200282D */ daddu $a1, $s0, $zero -/* 954EFC 80240F3C 0C019D80 */ jal guMtxCatF -/* 954F00 80240F40 00A0302D */ daddu $a2, $a1, $zero -/* 954F04 80240F44 96220000 */ lhu $v0, ($s1) -/* 954F08 80240F48 34421400 */ ori $v0, $v0, 0x1400 -/* 954F0C 80240F4C 080903F3 */ j .L80240FCC -/* 954F10 80240F50 A6220000 */ sh $v0, ($s1) -.L80240F54: -/* 954F14 80240F54 4480A000 */ mtc1 $zero, $f20 -/* 954F18 80240F58 4406B000 */ mfc1 $a2, $f22 -/* 954F1C 80240F5C 4405A000 */ mfc1 $a1, $f20 -/* 954F20 80240F60 4407A000 */ mfc1 $a3, $f20 -/* 954F24 80240F64 0C019E40 */ jal guTranslateF -/* 954F28 80240F68 27A40010 */ addiu $a0, $sp, 0x10 -/* 954F2C 80240F6C 27A40010 */ addiu $a0, $sp, 0x10 -/* 954F30 80240F70 26300058 */ addiu $s0, $s1, 0x58 -/* 954F34 80240F74 0200282D */ daddu $a1, $s0, $zero -/* 954F38 80240F78 0C019D80 */ jal guMtxCatF -/* 954F3C 80240F7C 0200302D */ daddu $a2, $s0, $zero -/* 954F40 80240F80 4405E000 */ mfc1 $a1, $f28 -/* 954F44 80240F84 4406D000 */ mfc1 $a2, $f26 -/* 954F48 80240F88 4407C000 */ mfc1 $a3, $f24 -/* 954F4C 80240F8C 0C090370 */ jal func_80240DC0 -/* 954F50 80240F90 27A40010 */ addiu $a0, $sp, 0x10 -/* 954F54 80240F94 27A40010 */ addiu $a0, $sp, 0x10 -/* 954F58 80240F98 0200282D */ daddu $a1, $s0, $zero -/* 954F5C 80240F9C 0C019D80 */ jal guMtxCatF -/* 954F60 80240FA0 0200302D */ daddu $a2, $s0, $zero -/* 954F64 80240FA4 27A40010 */ addiu $a0, $sp, 0x10 -/* 954F68 80240FA8 4600B587 */ neg.s $f22, $f22 -/* 954F6C 80240FAC 4405A000 */ mfc1 $a1, $f20 -/* 954F70 80240FB0 4406B000 */ mfc1 $a2, $f22 -/* 954F74 80240FB4 0C019E40 */ jal guTranslateF -/* 954F78 80240FB8 00A0382D */ daddu $a3, $a1, $zero -/* 954F7C 80240FBC 27A40010 */ addiu $a0, $sp, 0x10 -/* 954F80 80240FC0 0200282D */ daddu $a1, $s0, $zero -/* 954F84 80240FC4 0C019D80 */ jal guMtxCatF -/* 954F88 80240FC8 00A0302D */ daddu $a2, $a1, $zero -.L80240FCC: -/* 954F8C 80240FCC 8FBF005C */ lw $ra, 0x5c($sp) -/* 954F90 80240FD0 8FB20058 */ lw $s2, 0x58($sp) -/* 954F94 80240FD4 8FB10054 */ lw $s1, 0x54($sp) -/* 954F98 80240FD8 8FB00050 */ lw $s0, 0x50($sp) -/* 954F9C 80240FDC D7BC0080 */ ldc1 $f28, 0x80($sp) -/* 954FA0 80240FE0 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 954FA4 80240FE4 D7B80070 */ ldc1 $f24, 0x70($sp) -/* 954FA8 80240FE8 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 954FAC 80240FEC D7B40060 */ ldc1 $f20, 0x60($sp) -/* 954FB0 80240FF0 24020002 */ addiu $v0, $zero, 2 -/* 954FB4 80240FF4 03E00008 */ jr $ra -/* 954FB8 80240FF8 27BD0088 */ addiu $sp, $sp, 0x88 -/* 954FBC 80240FFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240E30_954DF0.s b/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240E30_954DF0.s new file mode 100644 index 0000000000..9330d1e7dc --- /dev/null +++ b/asm/nonmatchings/world/area_sbk/sbk_56/954D80/func_80240E30_954DF0.s @@ -0,0 +1,122 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E30_954DF0 +/* 954DF0 80240E30 27BDFF78 */ addiu $sp, $sp, -0x88 +/* 954DF4 80240E34 AFB10054 */ sw $s1, 0x54($sp) +/* 954DF8 80240E38 0080882D */ daddu $s1, $a0, $zero +/* 954DFC 80240E3C AFBF005C */ sw $ra, 0x5c($sp) +/* 954E00 80240E40 AFB20058 */ sw $s2, 0x58($sp) +/* 954E04 80240E44 AFB00050 */ sw $s0, 0x50($sp) +/* 954E08 80240E48 F7BC0080 */ sdc1 $f28, 0x80($sp) +/* 954E0C 80240E4C F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 954E10 80240E50 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 954E14 80240E54 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 954E18 80240E58 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 954E1C 80240E5C 8E30000C */ lw $s0, 0xc($s1) +/* 954E20 80240E60 8E050000 */ lw $a1, ($s0) +/* 954E24 80240E64 0C0B1EAF */ jal get_variable +/* 954E28 80240E68 26100004 */ addiu $s0, $s0, 4 +/* 954E2C 80240E6C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 954E30 80240E70 0040202D */ daddu $a0, $v0, $zero +/* 954E34 80240E74 8E050000 */ lw $a1, ($s0) +/* 954E38 80240E78 26100004 */ addiu $s0, $s0, 4 +/* 954E3C 80240E7C 0220202D */ daddu $a0, $s1, $zero +/* 954E40 80240E80 0C0B210B */ jal get_float_variable +/* 954E44 80240E84 0040902D */ daddu $s2, $v0, $zero +/* 954E48 80240E88 8E050000 */ lw $a1, ($s0) +/* 954E4C 80240E8C 26100004 */ addiu $s0, $s0, 4 +/* 954E50 80240E90 0220202D */ daddu $a0, $s1, $zero +/* 954E54 80240E94 0C0B210B */ jal get_float_variable +/* 954E58 80240E98 46000706 */ mov.s $f28, $f0 +/* 954E5C 80240E9C 8E050000 */ lw $a1, ($s0) +/* 954E60 80240EA0 26100004 */ addiu $s0, $s0, 4 +/* 954E64 80240EA4 0220202D */ daddu $a0, $s1, $zero +/* 954E68 80240EA8 0C0B210B */ jal get_float_variable +/* 954E6C 80240EAC 46000686 */ mov.s $f26, $f0 +/* 954E70 80240EB0 0220202D */ daddu $a0, $s1, $zero +/* 954E74 80240EB4 8E050000 */ lw $a1, ($s0) +/* 954E78 80240EB8 0C0B210B */ jal get_float_variable +/* 954E7C 80240EBC 46000586 */ mov.s $f22, $f0 +/* 954E80 80240EC0 0240202D */ daddu $a0, $s2, $zero +/* 954E84 80240EC4 0C046B4C */ jal get_model_from_list_index +/* 954E88 80240EC8 46000606 */ mov.s $f24, $f0 +/* 954E8C 80240ECC 0040882D */ daddu $s1, $v0, $zero +/* 954E90 80240ED0 96220000 */ lhu $v0, ($s1) +/* 954E94 80240ED4 30420400 */ andi $v0, $v0, 0x400 +/* 954E98 80240ED8 1440001E */ bnez $v0, .L80240F54 +/* 954E9C 80240EDC 26300058 */ addiu $s0, $s1, 0x58 +/* 954EA0 80240EE0 4480A000 */ mtc1 $zero, $f20 +/* 954EA4 80240EE4 4406B000 */ mfc1 $a2, $f22 +/* 954EA8 80240EE8 4405A000 */ mfc1 $a1, $f20 +/* 954EAC 80240EEC 4407A000 */ mfc1 $a3, $f20 +/* 954EB0 80240EF0 0C019E40 */ jal guTranslateF +/* 954EB4 80240EF4 0200202D */ daddu $a0, $s0, $zero +/* 954EB8 80240EF8 4405E000 */ mfc1 $a1, $f28 +/* 954EBC 80240EFC 4406D000 */ mfc1 $a2, $f26 +/* 954EC0 80240F00 4407C000 */ mfc1 $a3, $f24 +/* 954EC4 80240F04 0C090370 */ jal func_80240DC0_954D80 +/* 954EC8 80240F08 27A40010 */ addiu $a0, $sp, 0x10 +/* 954ECC 80240F0C 27A40010 */ addiu $a0, $sp, 0x10 +/* 954ED0 80240F10 0200282D */ daddu $a1, $s0, $zero +/* 954ED4 80240F14 0C019D80 */ jal guMtxCatF +/* 954ED8 80240F18 0200302D */ daddu $a2, $s0, $zero +/* 954EDC 80240F1C 27A40010 */ addiu $a0, $sp, 0x10 +/* 954EE0 80240F20 4600B587 */ neg.s $f22, $f22 +/* 954EE4 80240F24 4405A000 */ mfc1 $a1, $f20 +/* 954EE8 80240F28 4406B000 */ mfc1 $a2, $f22 +/* 954EEC 80240F2C 0C019E40 */ jal guTranslateF +/* 954EF0 80240F30 00A0382D */ daddu $a3, $a1, $zero +/* 954EF4 80240F34 27A40010 */ addiu $a0, $sp, 0x10 +/* 954EF8 80240F38 0200282D */ daddu $a1, $s0, $zero +/* 954EFC 80240F3C 0C019D80 */ jal guMtxCatF +/* 954F00 80240F40 00A0302D */ daddu $a2, $a1, $zero +/* 954F04 80240F44 96220000 */ lhu $v0, ($s1) +/* 954F08 80240F48 34421400 */ ori $v0, $v0, 0x1400 +/* 954F0C 80240F4C 080903F3 */ j .L80240FCC +/* 954F10 80240F50 A6220000 */ sh $v0, ($s1) +.L80240F54: +/* 954F14 80240F54 4480A000 */ mtc1 $zero, $f20 +/* 954F18 80240F58 4406B000 */ mfc1 $a2, $f22 +/* 954F1C 80240F5C 4405A000 */ mfc1 $a1, $f20 +/* 954F20 80240F60 4407A000 */ mfc1 $a3, $f20 +/* 954F24 80240F64 0C019E40 */ jal guTranslateF +/* 954F28 80240F68 27A40010 */ addiu $a0, $sp, 0x10 +/* 954F2C 80240F6C 27A40010 */ addiu $a0, $sp, 0x10 +/* 954F30 80240F70 26300058 */ addiu $s0, $s1, 0x58 +/* 954F34 80240F74 0200282D */ daddu $a1, $s0, $zero +/* 954F38 80240F78 0C019D80 */ jal guMtxCatF +/* 954F3C 80240F7C 0200302D */ daddu $a2, $s0, $zero +/* 954F40 80240F80 4405E000 */ mfc1 $a1, $f28 +/* 954F44 80240F84 4406D000 */ mfc1 $a2, $f26 +/* 954F48 80240F88 4407C000 */ mfc1 $a3, $f24 +/* 954F4C 80240F8C 0C090370 */ jal func_80240DC0_954D80 +/* 954F50 80240F90 27A40010 */ addiu $a0, $sp, 0x10 +/* 954F54 80240F94 27A40010 */ addiu $a0, $sp, 0x10 +/* 954F58 80240F98 0200282D */ daddu $a1, $s0, $zero +/* 954F5C 80240F9C 0C019D80 */ jal guMtxCatF +/* 954F60 80240FA0 0200302D */ daddu $a2, $s0, $zero +/* 954F64 80240FA4 27A40010 */ addiu $a0, $sp, 0x10 +/* 954F68 80240FA8 4600B587 */ neg.s $f22, $f22 +/* 954F6C 80240FAC 4405A000 */ mfc1 $a1, $f20 +/* 954F70 80240FB0 4406B000 */ mfc1 $a2, $f22 +/* 954F74 80240FB4 0C019E40 */ jal guTranslateF +/* 954F78 80240FB8 00A0382D */ daddu $a3, $a1, $zero +/* 954F7C 80240FBC 27A40010 */ addiu $a0, $sp, 0x10 +/* 954F80 80240FC0 0200282D */ daddu $a1, $s0, $zero +/* 954F84 80240FC4 0C019D80 */ jal guMtxCatF +/* 954F88 80240FC8 00A0302D */ daddu $a2, $a1, $zero +.L80240FCC: +/* 954F8C 80240FCC 8FBF005C */ lw $ra, 0x5c($sp) +/* 954F90 80240FD0 8FB20058 */ lw $s2, 0x58($sp) +/* 954F94 80240FD4 8FB10054 */ lw $s1, 0x54($sp) +/* 954F98 80240FD8 8FB00050 */ lw $s0, 0x50($sp) +/* 954F9C 80240FDC D7BC0080 */ ldc1 $f28, 0x80($sp) +/* 954FA0 80240FE0 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 954FA4 80240FE4 D7B80070 */ ldc1 $f24, 0x70($sp) +/* 954FA8 80240FE8 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 954FAC 80240FEC D7B40060 */ ldc1 $f20, 0x60($sp) +/* 954FB0 80240FF0 24020002 */ addiu $v0, $zero, 2 +/* 954FB4 80240FF4 03E00008 */ jr $ra +/* 954FB8 80240FF8 27BD0088 */ addiu $sp, $sp, 0x88 +/* 954FBC 80240FFC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sbk/sbk_66/958CF0/func_802401B0_958E60.s b/asm/nonmatchings/world/area_sbk/sbk_66/958CF0/func_802401B0_958E60.s index f7619d03a3..dea300a235 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_66/958CF0/func_802401B0_958E60.s +++ b/asm/nonmatchings/world/area_sbk/sbk_66/958CF0/func_802401B0_958E60.s @@ -55,7 +55,7 @@ glabel func_802401B0_958E60 /* 958F28 80240278 4405E000 */ mfc1 $a1, $f28 /* 958F2C 8024027C 4406D000 */ mfc1 $a2, $f26 /* 958F30 80240280 4407C000 */ mfc1 $a3, $f24 -/* 958F34 80240284 0C090050 */ jal func_80240140 +/* 958F34 80240284 0C090050 */ jal func_80240140_958DF0 /* 958F38 80240288 27A40010 */ addiu $a0, $sp, 0x10 /* 958F3C 8024028C 27A40010 */ addiu $a0, $sp, 0x10 /* 958F40 80240290 0200282D */ daddu $a1, $s0, $zero @@ -90,7 +90,7 @@ glabel func_802401B0_958E60 /* 958FB0 80240300 4405E000 */ mfc1 $a1, $f28 /* 958FB4 80240304 4406D000 */ mfc1 $a2, $f26 /* 958FB8 80240308 4407C000 */ mfc1 $a3, $f24 -/* 958FBC 8024030C 0C090050 */ jal func_80240140 +/* 958FBC 8024030C 0C090050 */ jal func_80240140_958DF0 /* 958FC0 80240310 27A40010 */ addiu $a0, $sp, 0x10 /* 958FC4 80240314 27A40010 */ addiu $a0, $sp, 0x10 /* 958FC8 80240318 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C.s deleted file mode 100644 index 7f61163dd5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024032C -/* 8697DC 8024032C 3C028016 */ lui $v0, 0x8016 -/* 8697E0 80240330 8442A552 */ lh $v0, -0x5aae($v0) -/* 8697E4 80240334 AC820084 */ sw $v0, 0x84($a0) -/* 8697E8 80240338 03E00008 */ jr $ra -/* 8697EC 8024033C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C_8697DC.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C_8697DC.s new file mode 100644 index 0000000000..5444126992 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_8024032C_8697DC.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024032C_8697DC +/* 8697DC 8024032C 3C028016 */ lui $v0, 0x8016 +/* 8697E0 80240330 8442A552 */ lh $v0, -0x5aae($v0) +/* 8697E4 80240334 AC820084 */ sw $v0, 0x84($a0) +/* 8697E8 80240338 03E00008 */ jr $ra +/* 8697EC 8024033C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340.s deleted file mode 100644 index 4ac7c4c514..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240340 -/* 8697F0 80240340 3C038016 */ lui $v1, 0x8016 -/* 8697F4 80240344 8463A552 */ lh $v1, -0x5aae($v1) -/* 8697F8 80240348 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8697FC 8024034C AFB00010 */ sw $s0, 0x10($sp) -/* 869800 80240350 0080802D */ daddu $s0, $a0, $zero -/* 869804 80240354 AFBF0014 */ sw $ra, 0x14($sp) -/* 869808 80240358 8E0200B0 */ lw $v0, 0xb0($s0) -/* 86980C 8024035C 10620003 */ beq $v1, $v0, .L8024036C -/* 869810 80240360 24020002 */ addiu $v0, $zero, 2 -/* 869814 80240364 080900FB */ j .L802403EC -/* 869818 80240368 AE000084 */ sw $zero, 0x84($s0) -.L8024036C: -/* 86981C 8024036C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 869820 80240370 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 869824 80240374 80620040 */ lb $v0, 0x40($v1) -/* 869828 80240378 80670044 */ lb $a3, 0x44($v1) -/* 86982C 8024037C 04420001 */ bltzl $v0, .L80240384 -/* 869830 80240380 00021023 */ negu $v0, $v0 -.L80240384: -/* 869834 80240384 14400003 */ bnez $v0, .L80240394 -/* 869838 80240388 00000000 */ nop -/* 86983C 8024038C 50E00017 */ beql $a3, $zero, .L802403EC -/* 869840 80240390 0000102D */ daddu $v0, $zero, $zero -.L80240394: -/* 869844 80240394 44822000 */ mtc1 $v0, $f4 -/* 869848 80240398 00000000 */ nop -/* 86984C 8024039C 46802120 */ cvt.s.w $f4, $f4 -/* 869850 802403A0 44062000 */ mfc1 $a2, $f4 -/* 869854 802403A4 44872000 */ mtc1 $a3, $f4 -/* 869858 802403A8 00000000 */ nop -/* 86985C 802403AC 46802120 */ cvt.s.w $f4, $f4 -/* 869860 802403B0 44806000 */ mtc1 $zero, $f12 -/* 869864 802403B4 44072000 */ mfc1 $a3, $f4 -/* 869868 802403B8 0C00A720 */ jal atan2 -/* 86986C 802403BC 46006386 */ mov.s $f14, $f12 -/* 869870 802403C0 3C014270 */ lui $at, 0x4270 -/* 869874 802403C4 44811000 */ mtc1 $at, $f2 -/* 869878 802403C8 00000000 */ nop -/* 86987C 802403CC 4602003C */ c.lt.s $f0, $f2 -/* 869880 802403D0 00000000 */ nop -/* 869884 802403D4 45000004 */ bc1f .L802403E8 -/* 869888 802403D8 24020001 */ addiu $v0, $zero, 1 -/* 86988C 802403DC AE020084 */ sw $v0, 0x84($s0) -/* 869890 802403E0 080900FB */ j .L802403EC -/* 869894 802403E4 24020002 */ addiu $v0, $zero, 2 -.L802403E8: -/* 869898 802403E8 0000102D */ daddu $v0, $zero, $zero -.L802403EC: -/* 86989C 802403EC 8FBF0014 */ lw $ra, 0x14($sp) -/* 8698A0 802403F0 8FB00010 */ lw $s0, 0x10($sp) -/* 8698A4 802403F4 03E00008 */ jr $ra -/* 8698A8 802403F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s new file mode 100644 index 0000000000..7324c99292 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240340_8697F0.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240340_8697F0 +/* 8697F0 80240340 3C038016 */ lui $v1, 0x8016 +/* 8697F4 80240344 8463A552 */ lh $v1, -0x5aae($v1) +/* 8697F8 80240348 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8697FC 8024034C AFB00010 */ sw $s0, 0x10($sp) +/* 869800 80240350 0080802D */ daddu $s0, $a0, $zero +/* 869804 80240354 AFBF0014 */ sw $ra, 0x14($sp) +/* 869808 80240358 8E0200B0 */ lw $v0, 0xb0($s0) +/* 86980C 8024035C 10620003 */ beq $v1, $v0, .L8024036C +/* 869810 80240360 24020002 */ addiu $v0, $zero, 2 +/* 869814 80240364 080900FB */ j .L802403EC +/* 869818 80240368 AE000084 */ sw $zero, 0x84($s0) +.L8024036C: +/* 86981C 8024036C 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 869820 80240370 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 869824 80240374 80620040 */ lb $v0, 0x40($v1) +/* 869828 80240378 80670044 */ lb $a3, 0x44($v1) +/* 86982C 8024037C 04420001 */ bltzl $v0, .L80240384 +/* 869830 80240380 00021023 */ negu $v0, $v0 +.L80240384: +/* 869834 80240384 14400003 */ bnez $v0, .L80240394 +/* 869838 80240388 00000000 */ nop +/* 86983C 8024038C 50E00017 */ beql $a3, $zero, .L802403EC +/* 869840 80240390 0000102D */ daddu $v0, $zero, $zero +.L80240394: +/* 869844 80240394 44822000 */ mtc1 $v0, $f4 +/* 869848 80240398 00000000 */ nop +/* 86984C 8024039C 46802120 */ cvt.s.w $f4, $f4 +/* 869850 802403A0 44062000 */ mfc1 $a2, $f4 +/* 869854 802403A4 44872000 */ mtc1 $a3, $f4 +/* 869858 802403A8 00000000 */ nop +/* 86985C 802403AC 46802120 */ cvt.s.w $f4, $f4 +/* 869860 802403B0 44806000 */ mtc1 $zero, $f12 +/* 869864 802403B4 44072000 */ mfc1 $a3, $f4 +/* 869868 802403B8 0C00A720 */ jal atan2 +/* 86986C 802403BC 46006386 */ mov.s $f14, $f12 +/* 869870 802403C0 3C014270 */ lui $at, 0x4270 +/* 869874 802403C4 44811000 */ mtc1 $at, $f2 +/* 869878 802403C8 00000000 */ nop +/* 86987C 802403CC 4602003C */ c.lt.s $f0, $f2 +/* 869880 802403D0 00000000 */ nop +/* 869884 802403D4 45000004 */ bc1f .L802403E8 +/* 869888 802403D8 24020001 */ addiu $v0, $zero, 1 +/* 86988C 802403DC AE020084 */ sw $v0, 0x84($s0) +/* 869890 802403E0 080900FB */ j .L802403EC +/* 869894 802403E4 24020002 */ addiu $v0, $zero, 2 +.L802403E8: +/* 869898 802403E8 0000102D */ daddu $v0, $zero, $zero +.L802403EC: +/* 86989C 802403EC 8FBF0014 */ lw $ra, 0x14($sp) +/* 8698A0 802403F0 8FB00010 */ lw $s0, 0x10($sp) +/* 8698A4 802403F4 03E00008 */ jr $ra +/* 8698A8 802403F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC.s deleted file mode 100644 index 87d2972f3f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403FC -/* 8698AC 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8698B0 80240400 AFB10014 */ sw $s1, 0x14($sp) -/* 8698B4 80240404 0080882D */ daddu $s1, $a0, $zero -/* 8698B8 80240408 AFBF001C */ sw $ra, 0x1c($sp) -/* 8698BC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 8698C0 80240410 0C016AFA */ jal get_current_map_header -/* 8698C4 80240414 AFB00010 */ sw $s0, 0x10($sp) -/* 8698C8 80240418 0220202D */ daddu $a0, $s1, $zero -/* 8698CC 8024041C 3C05FE36 */ lui $a1, 0xfe36 -/* 8698D0 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8698D4 80240424 0C0B1EAF */ jal get_variable -/* 8698D8 80240428 0040902D */ daddu $s2, $v0, $zero -/* 8698DC 8024042C 0220202D */ daddu $a0, $s1, $zero -/* 8698E0 80240430 3C05FE36 */ lui $a1, 0xfe36 -/* 8698E4 80240434 8E430014 */ lw $v1, 0x14($s2) -/* 8698E8 80240438 00028100 */ sll $s0, $v0, 4 -/* 8698EC 8024043C 02031821 */ addu $v1, $s0, $v1 -/* 8698F0 80240440 C4600000 */ lwc1 $f0, ($v1) -/* 8698F4 80240444 4600008D */ trunc.w.s $f2, $f0 -/* 8698F8 80240448 44061000 */ mfc1 $a2, $f2 -/* 8698FC 8024044C 0C0B2026 */ jal set_variable -/* 869900 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 869904 80240454 0220202D */ daddu $a0, $s1, $zero -/* 869908 80240458 8E420014 */ lw $v0, 0x14($s2) -/* 86990C 8024045C 3C05FE36 */ lui $a1, 0xfe36 -/* 869910 80240460 02021021 */ addu $v0, $s0, $v0 -/* 869914 80240464 C4400004 */ lwc1 $f0, 4($v0) -/* 869918 80240468 4600008D */ trunc.w.s $f2, $f0 -/* 86991C 8024046C 44061000 */ mfc1 $a2, $f2 -/* 869920 80240470 0C0B2026 */ jal set_variable -/* 869924 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 869928 80240478 0220202D */ daddu $a0, $s1, $zero -/* 86992C 8024047C 8E420014 */ lw $v0, 0x14($s2) -/* 869930 80240480 3C05FE36 */ lui $a1, 0xfe36 -/* 869934 80240484 02021021 */ addu $v0, $s0, $v0 -/* 869938 80240488 C4400008 */ lwc1 $f0, 8($v0) -/* 86993C 8024048C 4600008D */ trunc.w.s $f2, $f0 -/* 869940 80240490 44061000 */ mfc1 $a2, $f2 -/* 869944 80240494 0C0B2026 */ jal set_variable -/* 869948 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 86994C 8024049C 0220202D */ daddu $a0, $s1, $zero -/* 869950 802404A0 8E420014 */ lw $v0, 0x14($s2) -/* 869954 802404A4 3C05FE36 */ lui $a1, 0xfe36 -/* 869958 802404A8 02028021 */ addu $s0, $s0, $v0 -/* 86995C 802404AC C600000C */ lwc1 $f0, 0xc($s0) -/* 869960 802404B0 4600008D */ trunc.w.s $f2, $f0 -/* 869964 802404B4 44061000 */ mfc1 $a2, $f2 -/* 869968 802404B8 0C0B2026 */ jal set_variable -/* 86996C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 869970 802404C0 8FBF001C */ lw $ra, 0x1c($sp) -/* 869974 802404C4 8FB20018 */ lw $s2, 0x18($sp) -/* 869978 802404C8 8FB10014 */ lw $s1, 0x14($sp) -/* 86997C 802404CC 8FB00010 */ lw $s0, 0x10($sp) -/* 869980 802404D0 24020002 */ addiu $v0, $zero, 2 -/* 869984 802404D4 03E00008 */ jr $ra -/* 869988 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s new file mode 100644 index 0000000000..92056e71fc --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802403FC_8698AC.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403FC_8698AC +/* 8698AC 802403FC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8698B0 80240400 AFB10014 */ sw $s1, 0x14($sp) +/* 8698B4 80240404 0080882D */ daddu $s1, $a0, $zero +/* 8698B8 80240408 AFBF001C */ sw $ra, 0x1c($sp) +/* 8698BC 8024040C AFB20018 */ sw $s2, 0x18($sp) +/* 8698C0 80240410 0C016AFA */ jal get_current_map_header +/* 8698C4 80240414 AFB00010 */ sw $s0, 0x10($sp) +/* 8698C8 80240418 0220202D */ daddu $a0, $s1, $zero +/* 8698CC 8024041C 3C05FE36 */ lui $a1, 0xfe36 +/* 8698D0 80240420 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8698D4 80240424 0C0B1EAF */ jal get_variable +/* 8698D8 80240428 0040902D */ daddu $s2, $v0, $zero +/* 8698DC 8024042C 0220202D */ daddu $a0, $s1, $zero +/* 8698E0 80240430 3C05FE36 */ lui $a1, 0xfe36 +/* 8698E4 80240434 8E430014 */ lw $v1, 0x14($s2) +/* 8698E8 80240438 00028100 */ sll $s0, $v0, 4 +/* 8698EC 8024043C 02031821 */ addu $v1, $s0, $v1 +/* 8698F0 80240440 C4600000 */ lwc1 $f0, ($v1) +/* 8698F4 80240444 4600008D */ trunc.w.s $f2, $f0 +/* 8698F8 80240448 44061000 */ mfc1 $a2, $f2 +/* 8698FC 8024044C 0C0B2026 */ jal set_variable +/* 869900 80240450 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 869904 80240454 0220202D */ daddu $a0, $s1, $zero +/* 869908 80240458 8E420014 */ lw $v0, 0x14($s2) +/* 86990C 8024045C 3C05FE36 */ lui $a1, 0xfe36 +/* 869910 80240460 02021021 */ addu $v0, $s0, $v0 +/* 869914 80240464 C4400004 */ lwc1 $f0, 4($v0) +/* 869918 80240468 4600008D */ trunc.w.s $f2, $f0 +/* 86991C 8024046C 44061000 */ mfc1 $a2, $f2 +/* 869920 80240470 0C0B2026 */ jal set_variable +/* 869924 80240474 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 869928 80240478 0220202D */ daddu $a0, $s1, $zero +/* 86992C 8024047C 8E420014 */ lw $v0, 0x14($s2) +/* 869930 80240480 3C05FE36 */ lui $a1, 0xfe36 +/* 869934 80240484 02021021 */ addu $v0, $s0, $v0 +/* 869938 80240488 C4400008 */ lwc1 $f0, 8($v0) +/* 86993C 8024048C 4600008D */ trunc.w.s $f2, $f0 +/* 869940 80240490 44061000 */ mfc1 $a2, $f2 +/* 869944 80240494 0C0B2026 */ jal set_variable +/* 869948 80240498 34A53C83 */ ori $a1, $a1, 0x3c83 +/* 86994C 8024049C 0220202D */ daddu $a0, $s1, $zero +/* 869950 802404A0 8E420014 */ lw $v0, 0x14($s2) +/* 869954 802404A4 3C05FE36 */ lui $a1, 0xfe36 +/* 869958 802404A8 02028021 */ addu $s0, $s0, $v0 +/* 86995C 802404AC C600000C */ lwc1 $f0, 0xc($s0) +/* 869960 802404B0 4600008D */ trunc.w.s $f2, $f0 +/* 869964 802404B4 44061000 */ mfc1 $a2, $f2 +/* 869968 802404B8 0C0B2026 */ jal set_variable +/* 86996C 802404BC 34A53C84 */ ori $a1, $a1, 0x3c84 +/* 869970 802404C0 8FBF001C */ lw $ra, 0x1c($sp) +/* 869974 802404C4 8FB20018 */ lw $s2, 0x18($sp) +/* 869978 802404C8 8FB10014 */ lw $s1, 0x14($sp) +/* 86997C 802404CC 8FB00010 */ lw $s0, 0x10($sp) +/* 869980 802404D0 24020002 */ addiu $v0, $zero, 2 +/* 869984 802404D4 03E00008 */ jr $ra +/* 869988 802404D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC.s deleted file mode 100644 index d3091729cc..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404DC -/* 86998C 802404DC 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 869990 802404E0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 869994 802404E4 3C014334 */ lui $at, 0x4334 -/* 869998 802404E8 44816000 */ mtc1 $at, $f12 -/* 86999C 802404EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8699A0 802404F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 8699A4 802404F4 AFB00010 */ sw $s0, 0x10($sp) -/* 8699A8 802404F8 00031080 */ sll $v0, $v1, 2 -/* 8699AC 802404FC 00431021 */ addu $v0, $v0, $v1 -/* 8699B0 80240500 00021080 */ sll $v0, $v0, 2 -/* 8699B4 80240504 00431023 */ subu $v0, $v0, $v1 -/* 8699B8 80240508 000218C0 */ sll $v1, $v0, 3 -/* 8699BC 8024050C 00431021 */ addu $v0, $v0, $v1 -/* 8699C0 80240510 000210C0 */ sll $v0, $v0, 3 -/* 8699C4 80240514 3C01800B */ lui $at, 0x800b -/* 8699C8 80240518 00220821 */ addu $at, $at, $v0 -/* 8699CC 8024051C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8699D0 80240520 460C0300 */ add.s $f12, $f0, $f12 -/* 8699D4 80240524 0C00A6C9 */ jal clamp_angle -/* 8699D8 80240528 0080802D */ daddu $s0, $a0, $zero -/* 8699DC 8024052C 4600008D */ trunc.w.s $f2, $f0 -/* 8699E0 80240530 E6020084 */ swc1 $f2, 0x84($s0) -/* 8699E4 80240534 8FBF0014 */ lw $ra, 0x14($sp) -/* 8699E8 80240538 8FB00010 */ lw $s0, 0x10($sp) -/* 8699EC 8024053C 24020002 */ addiu $v0, $zero, 2 -/* 8699F0 80240540 03E00008 */ jr $ra -/* 8699F4 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC_86998C.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC_86998C.s new file mode 100644 index 0000000000..834d6a1813 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_802404DC_86998C.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404DC_86998C +/* 86998C 802404DC 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 869990 802404E0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 869994 802404E4 3C014334 */ lui $at, 0x4334 +/* 869998 802404E8 44816000 */ mtc1 $at, $f12 +/* 86999C 802404EC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8699A0 802404F0 AFBF0014 */ sw $ra, 0x14($sp) +/* 8699A4 802404F4 AFB00010 */ sw $s0, 0x10($sp) +/* 8699A8 802404F8 00031080 */ sll $v0, $v1, 2 +/* 8699AC 802404FC 00431021 */ addu $v0, $v0, $v1 +/* 8699B0 80240500 00021080 */ sll $v0, $v0, 2 +/* 8699B4 80240504 00431023 */ subu $v0, $v0, $v1 +/* 8699B8 80240508 000218C0 */ sll $v1, $v0, 3 +/* 8699BC 8024050C 00431021 */ addu $v0, $v0, $v1 +/* 8699C0 80240510 000210C0 */ sll $v0, $v0, 3 +/* 8699C4 80240514 3C01800B */ lui $at, 0x800b +/* 8699C8 80240518 00220821 */ addu $at, $at, $v0 +/* 8699CC 8024051C C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 8699D0 80240520 460C0300 */ add.s $f12, $f0, $f12 +/* 8699D4 80240524 0C00A6C9 */ jal clamp_angle +/* 8699D8 80240528 0080802D */ daddu $s0, $a0, $zero +/* 8699DC 8024052C 4600008D */ trunc.w.s $f2, $f0 +/* 8699E0 80240530 E6020084 */ swc1 $f2, 0x84($s0) +/* 8699E4 80240534 8FBF0014 */ lw $ra, 0x14($sp) +/* 8699E8 80240538 8FB00010 */ lw $s0, 0x10($sp) +/* 8699EC 8024053C 24020002 */ addiu $v0, $zero, 2 +/* 8699F0 80240540 03E00008 */ jr $ra +/* 8699F4 80240544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240548.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240548.s deleted file mode 100644 index ce52dd4de5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240548.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240548 -/* 8699F8 80240548 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8699FC 8024054C AFB00018 */ sw $s0, 0x18($sp) -/* 869A00 80240550 0080802D */ daddu $s0, $a0, $zero -/* 869A04 80240554 AFBF001C */ sw $ra, 0x1c($sp) -/* 869A08 80240558 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 869A0C 8024055C 8E02000C */ lw $v0, 0xc($s0) -/* 869A10 80240560 0C0B210B */ jal get_float_variable -/* 869A14 80240564 8C450000 */ lw $a1, ($v0) -/* 869A18 80240568 27A40010 */ addiu $a0, $sp, 0x10 -/* 869A1C 8024056C 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 869A20 80240570 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 869A24 80240574 44060000 */ mfc1 $a2, $f0 -/* 869A28 80240578 C4400028 */ lwc1 $f0, 0x28($v0) -/* 869A2C 8024057C C4420030 */ lwc1 $f2, 0x30($v0) -/* 869A30 80240580 E7A00010 */ swc1 $f0, 0x10($sp) -/* 869A34 80240584 E7A20014 */ swc1 $f2, 0x14($sp) -/* 869A38 80240588 8C470080 */ lw $a3, 0x80($v0) -/* 869A3C 8024058C C454002C */ lwc1 $f20, 0x2c($v0) -/* 869A40 80240590 0C00A7E7 */ jal add_vec2D_polar -/* 869A44 80240594 27A50014 */ addiu $a1, $sp, 0x14 -/* 869A48 80240598 0200202D */ daddu $a0, $s0, $zero -/* 869A4C 8024059C 3C05FE36 */ lui $a1, 0xfe36 -/* 869A50 802405A0 8FA60010 */ lw $a2, 0x10($sp) -/* 869A54 802405A4 0C0B2190 */ jal set_float_variable -/* 869A58 802405A8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 869A5C 802405AC 0200202D */ daddu $a0, $s0, $zero -/* 869A60 802405B0 3C05FE36 */ lui $a1, 0xfe36 -/* 869A64 802405B4 4406A000 */ mfc1 $a2, $f20 -/* 869A68 802405B8 0C0B2190 */ jal set_float_variable -/* 869A6C 802405BC 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 869A70 802405C0 0200202D */ daddu $a0, $s0, $zero -/* 869A74 802405C4 3C05FE36 */ lui $a1, 0xfe36 -/* 869A78 802405C8 8FA60014 */ lw $a2, 0x14($sp) -/* 869A7C 802405CC 0C0B2190 */ jal set_float_variable -/* 869A80 802405D0 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 869A84 802405D4 8FBF001C */ lw $ra, 0x1c($sp) -/* 869A88 802405D8 8FB00018 */ lw $s0, 0x18($sp) -/* 869A8C 802405DC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 869A90 802405E0 24020002 */ addiu $v0, $zero, 2 -/* 869A94 802405E4 03E00008 */ jr $ra -/* 869A98 802405E8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 869A9C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240548_8699F8.s b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240548_8699F8.s new file mode 100644 index 0000000000..fcf0b5602a --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_01/8694B0/func_80240548_8699F8.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240548_8699F8 +/* 8699F8 80240548 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8699FC 8024054C AFB00018 */ sw $s0, 0x18($sp) +/* 869A00 80240550 0080802D */ daddu $s0, $a0, $zero +/* 869A04 80240554 AFBF001C */ sw $ra, 0x1c($sp) +/* 869A08 80240558 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 869A0C 8024055C 8E02000C */ lw $v0, 0xc($s0) +/* 869A10 80240560 0C0B210B */ jal get_float_variable +/* 869A14 80240564 8C450000 */ lw $a1, ($v0) +/* 869A18 80240568 27A40010 */ addiu $a0, $sp, 0x10 +/* 869A1C 8024056C 3C028011 */ lui $v0, %hi(gPlayerStatus) +/* 869A20 80240570 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) +/* 869A24 80240574 44060000 */ mfc1 $a2, $f0 +/* 869A28 80240578 C4400028 */ lwc1 $f0, 0x28($v0) +/* 869A2C 8024057C C4420030 */ lwc1 $f2, 0x30($v0) +/* 869A30 80240580 E7A00010 */ swc1 $f0, 0x10($sp) +/* 869A34 80240584 E7A20014 */ swc1 $f2, 0x14($sp) +/* 869A38 80240588 8C470080 */ lw $a3, 0x80($v0) +/* 869A3C 8024058C C454002C */ lwc1 $f20, 0x2c($v0) +/* 869A40 80240590 0C00A7E7 */ jal add_vec2D_polar +/* 869A44 80240594 27A50014 */ addiu $a1, $sp, 0x14 +/* 869A48 80240598 0200202D */ daddu $a0, $s0, $zero +/* 869A4C 8024059C 3C05FE36 */ lui $a1, 0xfe36 +/* 869A50 802405A0 8FA60010 */ lw $a2, 0x10($sp) +/* 869A54 802405A4 0C0B2190 */ jal set_float_variable +/* 869A58 802405A8 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 869A5C 802405AC 0200202D */ daddu $a0, $s0, $zero +/* 869A60 802405B0 3C05FE36 */ lui $a1, 0xfe36 +/* 869A64 802405B4 4406A000 */ mfc1 $a2, $f20 +/* 869A68 802405B8 0C0B2190 */ jal set_float_variable +/* 869A6C 802405BC 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 869A70 802405C0 0200202D */ daddu $a0, $s0, $zero +/* 869A74 802405C4 3C05FE36 */ lui $a1, 0xfe36 +/* 869A78 802405C8 8FA60014 */ lw $a2, 0x14($sp) +/* 869A7C 802405CC 0C0B2190 */ jal set_float_variable +/* 869A80 802405D0 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 869A84 802405D4 8FBF001C */ lw $ra, 0x1c($sp) +/* 869A88 802405D8 8FB00018 */ lw $s0, 0x18($sp) +/* 869A8C 802405DC D7B40020 */ ldc1 $f20, 0x20($sp) +/* 869A90 802405E0 24020002 */ addiu $v0, $zero, 2 +/* 869A94 802405E4 03E00008 */ jr $ra +/* 869A98 802405E8 27BD0028 */ addiu $sp, $sp, 0x28 +/* 869A9C 802405EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960.s b/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960.s deleted file mode 100644 index 04fd7c6960..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240960 -/* 869E10 80240960 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 869E14 80240964 AFB10014 */ sw $s1, 0x14($sp) -/* 869E18 80240968 0080882D */ daddu $s1, $a0, $zero -/* 869E1C 8024096C AFBF0020 */ sw $ra, 0x20($sp) -/* 869E20 80240970 AFB3001C */ sw $s3, 0x1c($sp) -/* 869E24 80240974 AFB20018 */ sw $s2, 0x18($sp) -/* 869E28 80240978 AFB00010 */ sw $s0, 0x10($sp) -/* 869E2C 8024097C 8E30000C */ lw $s0, 0xc($s1) -/* 869E30 80240980 8E050000 */ lw $a1, ($s0) -/* 869E34 80240984 0C0B1EAF */ jal get_variable -/* 869E38 80240988 26100004 */ addiu $s0, $s0, 4 -/* 869E3C 8024098C 8E050000 */ lw $a1, ($s0) -/* 869E40 80240990 26100004 */ addiu $s0, $s0, 4 -/* 869E44 80240994 0220202D */ daddu $a0, $s1, $zero -/* 869E48 80240998 0C0B1EAF */ jal get_variable -/* 869E4C 8024099C 0040982D */ daddu $s3, $v0, $zero -/* 869E50 802409A0 8E050000 */ lw $a1, ($s0) -/* 869E54 802409A4 26100004 */ addiu $s0, $s0, 4 -/* 869E58 802409A8 0220202D */ daddu $a0, $s1, $zero -/* 869E5C 802409AC 0C0B1EAF */ jal get_variable -/* 869E60 802409B0 0040902D */ daddu $s2, $v0, $zero -/* 869E64 802409B4 0220202D */ daddu $a0, $s1, $zero -/* 869E68 802409B8 8E050000 */ lw $a1, ($s0) -/* 869E6C 802409BC 0C0B1EAF */ jal get_variable -/* 869E70 802409C0 0040882D */ daddu $s1, $v0, $zero -/* 869E74 802409C4 0260202D */ daddu $a0, $s3, $zero -/* 869E78 802409C8 0C04417A */ jal get_entity_by_index -/* 869E7C 802409CC 0040802D */ daddu $s0, $v0, $zero -/* 869E80 802409D0 0040182D */ daddu $v1, $v0, $zero -/* 869E84 802409D4 44920000 */ mtc1 $s2, $f0 -/* 869E88 802409D8 00000000 */ nop -/* 869E8C 802409DC 46800020 */ cvt.s.w $f0, $f0 -/* 869E90 802409E0 E4600048 */ swc1 $f0, 0x48($v1) -/* 869E94 802409E4 44910000 */ mtc1 $s1, $f0 -/* 869E98 802409E8 00000000 */ nop -/* 869E9C 802409EC 46800020 */ cvt.s.w $f0, $f0 -/* 869EA0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) -/* 869EA4 802409F4 44900000 */ mtc1 $s0, $f0 -/* 869EA8 802409F8 00000000 */ nop -/* 869EAC 802409FC 46800020 */ cvt.s.w $f0, $f0 -/* 869EB0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) -/* 869EB4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) -/* 869EB8 80240A08 8FB3001C */ lw $s3, 0x1c($sp) -/* 869EBC 80240A0C 8FB20018 */ lw $s2, 0x18($sp) -/* 869EC0 80240A10 8FB10014 */ lw $s1, 0x14($sp) -/* 869EC4 80240A14 8FB00010 */ lw $s0, 0x10($sp) -/* 869EC8 80240A18 24020002 */ addiu $v0, $zero, 2 -/* 869ECC 80240A1C 03E00008 */ jr $ra -/* 869ED0 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 -/* 869ED4 80240A24 00000000 */ nop -/* 869ED8 80240A28 00000000 */ nop -/* 869EDC 80240A2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s b/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s new file mode 100644 index 0000000000..f265a354c9 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_01/869AA0/func_80240960_869E10.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240960_869E10 +/* 869E10 80240960 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 869E14 80240964 AFB10014 */ sw $s1, 0x14($sp) +/* 869E18 80240968 0080882D */ daddu $s1, $a0, $zero +/* 869E1C 8024096C AFBF0020 */ sw $ra, 0x20($sp) +/* 869E20 80240970 AFB3001C */ sw $s3, 0x1c($sp) +/* 869E24 80240974 AFB20018 */ sw $s2, 0x18($sp) +/* 869E28 80240978 AFB00010 */ sw $s0, 0x10($sp) +/* 869E2C 8024097C 8E30000C */ lw $s0, 0xc($s1) +/* 869E30 80240980 8E050000 */ lw $a1, ($s0) +/* 869E34 80240984 0C0B1EAF */ jal get_variable +/* 869E38 80240988 26100004 */ addiu $s0, $s0, 4 +/* 869E3C 8024098C 8E050000 */ lw $a1, ($s0) +/* 869E40 80240990 26100004 */ addiu $s0, $s0, 4 +/* 869E44 80240994 0220202D */ daddu $a0, $s1, $zero +/* 869E48 80240998 0C0B1EAF */ jal get_variable +/* 869E4C 8024099C 0040982D */ daddu $s3, $v0, $zero +/* 869E50 802409A0 8E050000 */ lw $a1, ($s0) +/* 869E54 802409A4 26100004 */ addiu $s0, $s0, 4 +/* 869E58 802409A8 0220202D */ daddu $a0, $s1, $zero +/* 869E5C 802409AC 0C0B1EAF */ jal get_variable +/* 869E60 802409B0 0040902D */ daddu $s2, $v0, $zero +/* 869E64 802409B4 0220202D */ daddu $a0, $s1, $zero +/* 869E68 802409B8 8E050000 */ lw $a1, ($s0) +/* 869E6C 802409BC 0C0B1EAF */ jal get_variable +/* 869E70 802409C0 0040882D */ daddu $s1, $v0, $zero +/* 869E74 802409C4 0260202D */ daddu $a0, $s3, $zero +/* 869E78 802409C8 0C04417A */ jal get_entity_by_index +/* 869E7C 802409CC 0040802D */ daddu $s0, $v0, $zero +/* 869E80 802409D0 0040182D */ daddu $v1, $v0, $zero +/* 869E84 802409D4 44920000 */ mtc1 $s2, $f0 +/* 869E88 802409D8 00000000 */ nop +/* 869E8C 802409DC 46800020 */ cvt.s.w $f0, $f0 +/* 869E90 802409E0 E4600048 */ swc1 $f0, 0x48($v1) +/* 869E94 802409E4 44910000 */ mtc1 $s1, $f0 +/* 869E98 802409E8 00000000 */ nop +/* 869E9C 802409EC 46800020 */ cvt.s.w $f0, $f0 +/* 869EA0 802409F0 E460004C */ swc1 $f0, 0x4c($v1) +/* 869EA4 802409F4 44900000 */ mtc1 $s0, $f0 +/* 869EA8 802409F8 00000000 */ nop +/* 869EAC 802409FC 46800020 */ cvt.s.w $f0, $f0 +/* 869EB0 80240A00 E4600050 */ swc1 $f0, 0x50($v1) +/* 869EB4 80240A04 8FBF0020 */ lw $ra, 0x20($sp) +/* 869EB8 80240A08 8FB3001C */ lw $s3, 0x1c($sp) +/* 869EBC 80240A0C 8FB20018 */ lw $s2, 0x18($sp) +/* 869EC0 80240A10 8FB10014 */ lw $s1, 0x14($sp) +/* 869EC4 80240A14 8FB00010 */ lw $s0, 0x10($sp) +/* 869EC8 80240A18 24020002 */ addiu $v0, $zero, 2 +/* 869ECC 80240A1C 03E00008 */ jr $ra +/* 869ED0 80240A20 27BD0028 */ addiu $sp, $sp, 0x28 +/* 869ED4 80240A24 00000000 */ nop +/* 869ED8 80240A28 00000000 */ nop +/* 869EDC 80240A2C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30.s b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30.s deleted file mode 100644 index 97465e2970..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A30 -/* 869EE0 80240A30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 869EE4 80240A34 AFBF0014 */ sw $ra, 0x14($sp) -/* 869EE8 80240A38 AFB00010 */ sw $s0, 0x10($sp) -/* 869EEC 80240A3C 8C82000C */ lw $v0, 0xc($a0) -/* 869EF0 80240A40 8C450000 */ lw $a1, ($v0) -/* 869EF4 80240A44 0C0B1EAF */ jal get_variable -/* 869EF8 80240A48 8C900148 */ lw $s0, 0x148($a0) -/* 869EFC 80240A4C 82030004 */ lb $v1, 4($s0) -/* 869F00 80240A50 00021080 */ sll $v0, $v0, 2 -/* 869F04 80240A54 00031880 */ sll $v1, $v1, 2 -/* 869F08 80240A58 3C04800B */ lui $a0, 0x800b -/* 869F0C 80240A5C 00832021 */ addu $a0, $a0, $v1 -/* 869F10 80240A60 8C840F38 */ lw $a0, 0xf38($a0) -/* 869F14 80240A64 3C038024 */ lui $v1, 0x8024 -/* 869F18 80240A68 00621821 */ addu $v1, $v1, $v0 -/* 869F1C 80240A6C 94632B7E */ lhu $v1, 0x2b7e($v1) -/* 869F20 80240A70 A4830044 */ sh $v1, 0x44($a0) -/* 869F24 80240A74 8FBF0014 */ lw $ra, 0x14($sp) -/* 869F28 80240A78 8FB00010 */ lw $s0, 0x10($sp) -/* 869F2C 80240A7C 24020002 */ addiu $v0, $zero, 2 -/* 869F30 80240A80 03E00008 */ jr $ra -/* 869F34 80240A84 27BD0018 */ addiu $sp, $sp, 0x18 -/* 869F38 80240A88 00000000 */ nop -/* 869F3C 80240A8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s new file mode 100644 index 0000000000..b168610476 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_01/869EE0/func_80240A30_869EE0.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A30_869EE0 +/* 869EE0 80240A30 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 869EE4 80240A34 AFBF0014 */ sw $ra, 0x14($sp) +/* 869EE8 80240A38 AFB00010 */ sw $s0, 0x10($sp) +/* 869EEC 80240A3C 8C82000C */ lw $v0, 0xc($a0) +/* 869EF0 80240A40 8C450000 */ lw $a1, ($v0) +/* 869EF4 80240A44 0C0B1EAF */ jal get_variable +/* 869EF8 80240A48 8C900148 */ lw $s0, 0x148($a0) +/* 869EFC 80240A4C 82030004 */ lb $v1, 4($s0) +/* 869F00 80240A50 00021080 */ sll $v0, $v0, 2 +/* 869F04 80240A54 00031880 */ sll $v1, $v1, 2 +/* 869F08 80240A58 3C04800B */ lui $a0, 0x800b +/* 869F0C 80240A5C 00832021 */ addu $a0, $a0, $v1 +/* 869F10 80240A60 8C840F38 */ lw $a0, 0xf38($a0) +/* 869F14 80240A64 3C038024 */ lui $v1, 0x8024 +/* 869F18 80240A68 00621821 */ addu $v1, $v1, $v0 +/* 869F1C 80240A6C 94632B7E */ lhu $v1, 0x2b7e($v1) +/* 869F20 80240A70 A4830044 */ sh $v1, 0x44($a0) +/* 869F24 80240A74 8FBF0014 */ lw $ra, 0x14($sp) +/* 869F28 80240A78 8FB00010 */ lw $s0, 0x10($sp) +/* 869F2C 80240A7C 24020002 */ addiu $v0, $zero, 2 +/* 869F30 80240A80 03E00008 */ jr $ra +/* 869F34 80240A84 27BD0018 */ addiu $sp, $sp, 0x18 +/* 869F38 80240A88 00000000 */ nop +/* 869F3C 80240A8C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310.s deleted file mode 100644 index ae2bed3e48..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240310 -/* 86CA50 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86CA54 80240314 AFB00010 */ sw $s0, 0x10($sp) -/* 86CA58 80240318 3C108024 */ lui $s0, 0x8024 -/* 86CA5C 8024031C 261010C0 */ addiu $s0, $s0, 0x10c0 -/* 86CA60 80240320 AFBF0018 */ sw $ra, 0x18($sp) -/* 86CA64 80240324 AFB10014 */ sw $s1, 0x14($sp) -/* 86CA68 80240328 8E020000 */ lw $v0, ($s0) -/* 86CA6C 8024032C 14400010 */ bnez $v0, .L80240370 -/* 86CA70 80240330 0080882D */ daddu $s1, $a0, $zero -/* 86CA74 80240334 0C00AB39 */ jal heap_malloc -/* 86CA78 80240338 24040040 */ addiu $a0, $zero, 0x40 -/* 86CA7C 8024033C AE020000 */ sw $v0, ($s0) -/* 86CA80 80240340 0000182D */ daddu $v1, $zero, $zero -/* 86CA84 80240344 0040282D */ daddu $a1, $v0, $zero -/* 86CA88 80240348 0220202D */ daddu $a0, $s1, $zero -.L8024034C: -/* 86CA8C 8024034C 8C820084 */ lw $v0, 0x84($a0) -/* 86CA90 80240350 24840004 */ addiu $a0, $a0, 4 -/* 86CA94 80240354 24630001 */ addiu $v1, $v1, 1 -/* 86CA98 80240358 ACA20000 */ sw $v0, ($a1) -/* 86CA9C 8024035C 28620010 */ slti $v0, $v1, 0x10 -/* 86CAA0 80240360 1440FFFA */ bnez $v0, .L8024034C -/* 86CAA4 80240364 24A50004 */ addiu $a1, $a1, 4 -/* 86CAA8 80240368 080900EB */ j .L802403AC -/* 86CAAC 8024036C 00000000 */ nop -.L80240370: -/* 86CAB0 80240370 0000182D */ daddu $v1, $zero, $zero -/* 86CAB4 80240374 0040282D */ daddu $a1, $v0, $zero -/* 86CAB8 80240378 0220202D */ daddu $a0, $s1, $zero -.L8024037C: -/* 86CABC 8024037C 8CA20000 */ lw $v0, ($a1) -/* 86CAC0 80240380 24A50004 */ addiu $a1, $a1, 4 -/* 86CAC4 80240384 24630001 */ addiu $v1, $v1, 1 -/* 86CAC8 80240388 AC820084 */ sw $v0, 0x84($a0) -/* 86CACC 8024038C 28620010 */ slti $v0, $v1, 0x10 -/* 86CAD0 80240390 1440FFFA */ bnez $v0, .L8024037C -/* 86CAD4 80240394 24840004 */ addiu $a0, $a0, 4 -/* 86CAD8 80240398 3C108024 */ lui $s0, 0x8024 -/* 86CADC 8024039C 261010C0 */ addiu $s0, $s0, 0x10c0 -/* 86CAE0 802403A0 0C00AB4B */ jal heap_free -/* 86CAE4 802403A4 8E040000 */ lw $a0, ($s0) -/* 86CAE8 802403A8 AE000000 */ sw $zero, ($s0) -.L802403AC: -/* 86CAEC 802403AC 8FBF0018 */ lw $ra, 0x18($sp) -/* 86CAF0 802403B0 8FB10014 */ lw $s1, 0x14($sp) -/* 86CAF4 802403B4 8FB00010 */ lw $s0, 0x10($sp) -/* 86CAF8 802403B8 24020002 */ addiu $v0, $zero, 2 -/* 86CAFC 802403BC 03E00008 */ jr $ra -/* 86CB00 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s new file mode 100644 index 0000000000..7db8eace56 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240310_86CA50.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240310_86CA50 +/* 86CA50 80240310 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 86CA54 80240314 AFB00010 */ sw $s0, 0x10($sp) +/* 86CA58 80240318 3C108024 */ lui $s0, 0x8024 +/* 86CA5C 8024031C 261010C0 */ addiu $s0, $s0, 0x10c0 +/* 86CA60 80240320 AFBF0018 */ sw $ra, 0x18($sp) +/* 86CA64 80240324 AFB10014 */ sw $s1, 0x14($sp) +/* 86CA68 80240328 8E020000 */ lw $v0, ($s0) +/* 86CA6C 8024032C 14400010 */ bnez $v0, .L80240370 +/* 86CA70 80240330 0080882D */ daddu $s1, $a0, $zero +/* 86CA74 80240334 0C00AB39 */ jal heap_malloc +/* 86CA78 80240338 24040040 */ addiu $a0, $zero, 0x40 +/* 86CA7C 8024033C AE020000 */ sw $v0, ($s0) +/* 86CA80 80240340 0000182D */ daddu $v1, $zero, $zero +/* 86CA84 80240344 0040282D */ daddu $a1, $v0, $zero +/* 86CA88 80240348 0220202D */ daddu $a0, $s1, $zero +.L8024034C: +/* 86CA8C 8024034C 8C820084 */ lw $v0, 0x84($a0) +/* 86CA90 80240350 24840004 */ addiu $a0, $a0, 4 +/* 86CA94 80240354 24630001 */ addiu $v1, $v1, 1 +/* 86CA98 80240358 ACA20000 */ sw $v0, ($a1) +/* 86CA9C 8024035C 28620010 */ slti $v0, $v1, 0x10 +/* 86CAA0 80240360 1440FFFA */ bnez $v0, .L8024034C +/* 86CAA4 80240364 24A50004 */ addiu $a1, $a1, 4 +/* 86CAA8 80240368 080900EB */ j .L802403AC +/* 86CAAC 8024036C 00000000 */ nop +.L80240370: +/* 86CAB0 80240370 0000182D */ daddu $v1, $zero, $zero +/* 86CAB4 80240374 0040282D */ daddu $a1, $v0, $zero +/* 86CAB8 80240378 0220202D */ daddu $a0, $s1, $zero +.L8024037C: +/* 86CABC 8024037C 8CA20000 */ lw $v0, ($a1) +/* 86CAC0 80240380 24A50004 */ addiu $a1, $a1, 4 +/* 86CAC4 80240384 24630001 */ addiu $v1, $v1, 1 +/* 86CAC8 80240388 AC820084 */ sw $v0, 0x84($a0) +/* 86CACC 8024038C 28620010 */ slti $v0, $v1, 0x10 +/* 86CAD0 80240390 1440FFFA */ bnez $v0, .L8024037C +/* 86CAD4 80240394 24840004 */ addiu $a0, $a0, 4 +/* 86CAD8 80240398 3C108024 */ lui $s0, 0x8024 +/* 86CADC 8024039C 261010C0 */ addiu $s0, $s0, 0x10c0 +/* 86CAE0 802403A0 0C00AB4B */ jal heap_free +/* 86CAE4 802403A4 8E040000 */ lw $a0, ($s0) +/* 86CAE8 802403A8 AE000000 */ sw $zero, ($s0) +.L802403AC: +/* 86CAEC 802403AC 8FBF0018 */ lw $ra, 0x18($sp) +/* 86CAF0 802403B0 8FB10014 */ lw $s1, 0x14($sp) +/* 86CAF4 802403B4 8FB00010 */ lw $s0, 0x10($sp) +/* 86CAF8 802403B8 24020002 */ addiu $v0, $zero, 2 +/* 86CAFC 802403BC 03E00008 */ jr $ra +/* 86CB00 802403C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428.s deleted file mode 100644 index a8bb55cba8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240428 -/* 86CB68 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86CB6C 8024042C AFB10014 */ sw $s1, 0x14($sp) -/* 86CB70 80240430 0080882D */ daddu $s1, $a0, $zero -/* 86CB74 80240434 AFBF001C */ sw $ra, 0x1c($sp) -/* 86CB78 80240438 AFB20018 */ sw $s2, 0x18($sp) -/* 86CB7C 8024043C AFB00010 */ sw $s0, 0x10($sp) -/* 86CB80 80240440 8E240084 */ lw $a0, 0x84($s1) -/* 86CB84 80240444 0C04C3D6 */ jal get_item_entity -/* 86CB88 80240448 00A0802D */ daddu $s0, $a1, $zero -/* 86CB8C 8024044C 12000005 */ beqz $s0, .L80240464 -/* 86CB90 80240450 0040902D */ daddu $s2, $v0, $zero -/* 86CB94 80240454 C640000C */ lwc1 $f0, 0xc($s2) -/* 86CB98 80240458 AE200074 */ sw $zero, 0x74($s1) -/* 86CB9C 8024045C AE20007C */ sw $zero, 0x7c($s1) -/* 86CBA0 80240460 E6200078 */ swc1 $f0, 0x78($s1) -.L80240464: -/* 86CBA4 80240464 8E230074 */ lw $v1, 0x74($s1) -/* 86CBA8 80240468 10600005 */ beqz $v1, .L80240480 -/* 86CBAC 8024046C 24020001 */ addiu $v0, $zero, 1 -/* 86CBB0 80240470 10620024 */ beq $v1, $v0, .L80240504 -/* 86CBB4 80240474 00000000 */ nop -/* 86CBB8 80240478 08090157 */ j .L8024055C -/* 86CBBC 8024047C 00000000 */ nop -.L80240480: -/* 86CBC0 80240480 3C013FC9 */ lui $at, 0x3fc9 -/* 86CBC4 80240484 34210FD8 */ ori $at, $at, 0xfd8 -/* 86CBC8 80240488 44810000 */ mtc1 $at, $f0 -/* 86CBCC 8024048C C62C007C */ lwc1 $f12, 0x7c($s1) -/* 86CBD0 80240490 46806320 */ cvt.s.w $f12, $f12 -/* 86CBD4 80240494 46006302 */ mul.s $f12, $f12, $f0 -/* 86CBD8 80240498 00000000 */ nop -/* 86CBDC 8024049C 3C0141F0 */ lui $at, 0x41f0 -/* 86CBE0 802404A0 44810000 */ mtc1 $at, $f0 -/* 86CBE4 802404A4 0C00A874 */ jal cos_rad -/* 86CBE8 802404A8 46006303 */ div.s $f12, $f12, $f0 -/* 86CBEC 802404AC 3C013F80 */ lui $at, 0x3f80 -/* 86CBF0 802404B0 44811000 */ mtc1 $at, $f2 -/* 86CBF4 802404B4 00000000 */ nop -/* 86CBF8 802404B8 46001081 */ sub.s $f2, $f2, $f0 -/* 86CBFC 802404BC 3C0141A0 */ lui $at, 0x41a0 -/* 86CC00 802404C0 44810000 */ mtc1 $at, $f0 -/* 86CC04 802404C4 00000000 */ nop -/* 86CC08 802404C8 46001082 */ mul.s $f2, $f2, $f0 -/* 86CC0C 802404CC 00000000 */ nop -/* 86CC10 802404D0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 86CC14 802404D4 46020000 */ add.s $f0, $f0, $f2 -/* 86CC18 802404D8 E640000C */ swc1 $f0, 0xc($s2) -/* 86CC1C 802404DC 8E23007C */ lw $v1, 0x7c($s1) -/* 86CC20 802404E0 2402001E */ addiu $v0, $zero, 0x1e -/* 86CC24 802404E4 14620005 */ bne $v1, $v0, .L802404FC -/* 86CC28 802404E8 24620001 */ addiu $v0, $v1, 1 -/* 86CC2C 802404EC 24020001 */ addiu $v0, $zero, 1 -/* 86CC30 802404F0 AE220074 */ sw $v0, 0x74($s1) -/* 86CC34 802404F4 08090157 */ j .L8024055C -/* 86CC38 802404F8 AE20007C */ sw $zero, 0x7c($s1) -.L802404FC: -/* 86CC3C 802404FC 08090157 */ j .L8024055C -/* 86CC40 80240500 AE22007C */ sw $v0, 0x7c($s1) -.L80240504: -/* 86CC44 80240504 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 86CC48 80240508 0C00A8D4 */ jal cos_deg -/* 86CC4C 8024050C 46806320 */ cvt.s.w $f12, $f12 -/* 86CC50 80240510 3C014040 */ lui $at, 0x4040 -/* 86CC54 80240514 44811000 */ mtc1 $at, $f2 -/* 86CC58 80240518 00000000 */ nop -/* 86CC5C 8024051C 46020002 */ mul.s $f0, $f0, $f2 -/* 86CC60 80240520 00000000 */ nop -/* 86CC64 80240524 3C014188 */ lui $at, 0x4188 -/* 86CC68 80240528 44812000 */ mtc1 $at, $f4 -/* 86CC6C 8024052C C6220078 */ lwc1 $f2, 0x78($s1) -/* 86CC70 80240530 46041080 */ add.s $f2, $f2, $f4 -/* 86CC74 80240534 46001080 */ add.s $f2, $f2, $f0 -/* 86CC78 80240538 E642000C */ swc1 $f2, 0xc($s2) -/* 86CC7C 8024053C 8E22007C */ lw $v0, 0x7c($s1) -/* 86CC80 80240540 24420009 */ addiu $v0, $v0, 9 -/* 86CC84 80240544 44826000 */ mtc1 $v0, $f12 -/* 86CC88 80240548 00000000 */ nop -/* 86CC8C 8024054C 0C00A6C9 */ jal clamp_angle -/* 86CC90 80240550 46806320 */ cvt.s.w $f12, $f12 -/* 86CC94 80240554 4600018D */ trunc.w.s $f6, $f0 -/* 86CC98 80240558 E626007C */ swc1 $f6, 0x7c($s1) -.L8024055C: -/* 86CC9C 8024055C 8FBF001C */ lw $ra, 0x1c($sp) -/* 86CCA0 80240560 8FB20018 */ lw $s2, 0x18($sp) -/* 86CCA4 80240564 8FB10014 */ lw $s1, 0x14($sp) -/* 86CCA8 80240568 8FB00010 */ lw $s0, 0x10($sp) -/* 86CCAC 8024056C 0000102D */ daddu $v0, $zero, $zero -/* 86CCB0 80240570 03E00008 */ jr $ra -/* 86CCB4 80240574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s new file mode 100644 index 0000000000..d6eb629678 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_02/86CA50/func_80240428_86CB68.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240428_86CB68 +/* 86CB68 80240428 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 86CB6C 8024042C AFB10014 */ sw $s1, 0x14($sp) +/* 86CB70 80240430 0080882D */ daddu $s1, $a0, $zero +/* 86CB74 80240434 AFBF001C */ sw $ra, 0x1c($sp) +/* 86CB78 80240438 AFB20018 */ sw $s2, 0x18($sp) +/* 86CB7C 8024043C AFB00010 */ sw $s0, 0x10($sp) +/* 86CB80 80240440 8E240084 */ lw $a0, 0x84($s1) +/* 86CB84 80240444 0C04C3D6 */ jal get_item_entity +/* 86CB88 80240448 00A0802D */ daddu $s0, $a1, $zero +/* 86CB8C 8024044C 12000005 */ beqz $s0, .L80240464 +/* 86CB90 80240450 0040902D */ daddu $s2, $v0, $zero +/* 86CB94 80240454 C640000C */ lwc1 $f0, 0xc($s2) +/* 86CB98 80240458 AE200074 */ sw $zero, 0x74($s1) +/* 86CB9C 8024045C AE20007C */ sw $zero, 0x7c($s1) +/* 86CBA0 80240460 E6200078 */ swc1 $f0, 0x78($s1) +.L80240464: +/* 86CBA4 80240464 8E230074 */ lw $v1, 0x74($s1) +/* 86CBA8 80240468 10600005 */ beqz $v1, .L80240480 +/* 86CBAC 8024046C 24020001 */ addiu $v0, $zero, 1 +/* 86CBB0 80240470 10620024 */ beq $v1, $v0, .L80240504 +/* 86CBB4 80240474 00000000 */ nop +/* 86CBB8 80240478 08090157 */ j .L8024055C +/* 86CBBC 8024047C 00000000 */ nop +.L80240480: +/* 86CBC0 80240480 3C013FC9 */ lui $at, 0x3fc9 +/* 86CBC4 80240484 34210FD8 */ ori $at, $at, 0xfd8 +/* 86CBC8 80240488 44810000 */ mtc1 $at, $f0 +/* 86CBCC 8024048C C62C007C */ lwc1 $f12, 0x7c($s1) +/* 86CBD0 80240490 46806320 */ cvt.s.w $f12, $f12 +/* 86CBD4 80240494 46006302 */ mul.s $f12, $f12, $f0 +/* 86CBD8 80240498 00000000 */ nop +/* 86CBDC 8024049C 3C0141F0 */ lui $at, 0x41f0 +/* 86CBE0 802404A0 44810000 */ mtc1 $at, $f0 +/* 86CBE4 802404A4 0C00A874 */ jal cos_rad +/* 86CBE8 802404A8 46006303 */ div.s $f12, $f12, $f0 +/* 86CBEC 802404AC 3C013F80 */ lui $at, 0x3f80 +/* 86CBF0 802404B0 44811000 */ mtc1 $at, $f2 +/* 86CBF4 802404B4 00000000 */ nop +/* 86CBF8 802404B8 46001081 */ sub.s $f2, $f2, $f0 +/* 86CBFC 802404BC 3C0141A0 */ lui $at, 0x41a0 +/* 86CC00 802404C0 44810000 */ mtc1 $at, $f0 +/* 86CC04 802404C4 00000000 */ nop +/* 86CC08 802404C8 46001082 */ mul.s $f2, $f2, $f0 +/* 86CC0C 802404CC 00000000 */ nop +/* 86CC10 802404D0 C6200078 */ lwc1 $f0, 0x78($s1) +/* 86CC14 802404D4 46020000 */ add.s $f0, $f0, $f2 +/* 86CC18 802404D8 E640000C */ swc1 $f0, 0xc($s2) +/* 86CC1C 802404DC 8E23007C */ lw $v1, 0x7c($s1) +/* 86CC20 802404E0 2402001E */ addiu $v0, $zero, 0x1e +/* 86CC24 802404E4 14620005 */ bne $v1, $v0, .L802404FC +/* 86CC28 802404E8 24620001 */ addiu $v0, $v1, 1 +/* 86CC2C 802404EC 24020001 */ addiu $v0, $zero, 1 +/* 86CC30 802404F0 AE220074 */ sw $v0, 0x74($s1) +/* 86CC34 802404F4 08090157 */ j .L8024055C +/* 86CC38 802404F8 AE20007C */ sw $zero, 0x7c($s1) +.L802404FC: +/* 86CC3C 802404FC 08090157 */ j .L8024055C +/* 86CC40 80240500 AE22007C */ sw $v0, 0x7c($s1) +.L80240504: +/* 86CC44 80240504 C62C007C */ lwc1 $f12, 0x7c($s1) +/* 86CC48 80240508 0C00A8D4 */ jal cos_deg +/* 86CC4C 8024050C 46806320 */ cvt.s.w $f12, $f12 +/* 86CC50 80240510 3C014040 */ lui $at, 0x4040 +/* 86CC54 80240514 44811000 */ mtc1 $at, $f2 +/* 86CC58 80240518 00000000 */ nop +/* 86CC5C 8024051C 46020002 */ mul.s $f0, $f0, $f2 +/* 86CC60 80240520 00000000 */ nop +/* 86CC64 80240524 3C014188 */ lui $at, 0x4188 +/* 86CC68 80240528 44812000 */ mtc1 $at, $f4 +/* 86CC6C 8024052C C6220078 */ lwc1 $f2, 0x78($s1) +/* 86CC70 80240530 46041080 */ add.s $f2, $f2, $f4 +/* 86CC74 80240534 46001080 */ add.s $f2, $f2, $f0 +/* 86CC78 80240538 E642000C */ swc1 $f2, 0xc($s2) +/* 86CC7C 8024053C 8E22007C */ lw $v0, 0x7c($s1) +/* 86CC80 80240540 24420009 */ addiu $v0, $v0, 9 +/* 86CC84 80240544 44826000 */ mtc1 $v0, $f12 +/* 86CC88 80240548 00000000 */ nop +/* 86CC8C 8024054C 0C00A6C9 */ jal clamp_angle +/* 86CC90 80240550 46806320 */ cvt.s.w $f12, $f12 +/* 86CC94 80240554 4600018D */ trunc.w.s $f6, $f0 +/* 86CC98 80240558 E626007C */ swc1 $f6, 0x7c($s1) +.L8024055C: +/* 86CC9C 8024055C 8FBF001C */ lw $ra, 0x1c($sp) +/* 86CCA0 80240560 8FB20018 */ lw $s2, 0x18($sp) +/* 86CCA4 80240564 8FB10014 */ lw $s1, 0x14($sp) +/* 86CCA8 80240568 8FB00010 */ lw $s0, 0x10($sp) +/* 86CCAC 8024056C 0000102D */ daddu $v0, $zero, $zero +/* 86CCB0 80240570 03E00008 */ jr $ra +/* 86CCB4 80240574 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0.s b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0.s deleted file mode 100644 index caaf5df7ad..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D0 -/* 86CD10 802405D0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 86CD14 802405D4 AFB3001C */ sw $s3, 0x1c($sp) -/* 86CD18 802405D8 0080982D */ daddu $s3, $a0, $zero -/* 86CD1C 802405DC AFBF0020 */ sw $ra, 0x20($sp) -/* 86CD20 802405E0 AFB20018 */ sw $s2, 0x18($sp) -/* 86CD24 802405E4 AFB10014 */ sw $s1, 0x14($sp) -/* 86CD28 802405E8 AFB00010 */ sw $s0, 0x10($sp) -/* 86CD2C 802405EC F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 86CD30 802405F0 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 86CD34 802405F4 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 86CD38 802405F8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 86CD3C 802405FC 8E62000C */ lw $v0, 0xc($s3) -/* 86CD40 80240600 0C0B1EAF */ jal get_variable -/* 86CD44 80240604 8C450000 */ lw $a1, ($v0) -/* 86CD48 80240608 2404FFFC */ addiu $a0, $zero, -4 -/* 86CD4C 8024060C 0C00EABB */ jal get_npc_unsafe -/* 86CD50 80240610 0040802D */ daddu $s0, $v0, $zero -/* 86CD54 80240614 0200202D */ daddu $a0, $s0, $zero -/* 86CD58 80240618 0C046C04 */ jal get_model_list_index_from_tree_index -/* 86CD5C 8024061C 0040802D */ daddu $s0, $v0, $zero -/* 86CD60 80240620 0C046B4C */ jal get_model_from_list_index -/* 86CD64 80240624 0040202D */ daddu $a0, $v0, $zero -/* 86CD68 80240628 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 86CD6C 8024062C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 86CD70 80240630 0040902D */ daddu $s2, $v0, $zero -/* 86CD74 80240634 AE60008C */ sw $zero, 0x8c($s3) -/* 86CD78 80240638 C4620028 */ lwc1 $f2, 0x28($v1) -/* 86CD7C 8024063C C6400098 */ lwc1 $f0, 0x98($s2) -/* 86CD80 80240640 46001081 */ sub.s $f2, $f2, $f0 -/* 86CD84 80240644 46021182 */ mul.s $f6, $f2, $f2 -/* 86CD88 80240648 00000000 */ nop -/* 86CD8C 8024064C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86CD90 80240650 C4620030 */ lwc1 $f2, 0x30($v1) -/* 86CD94 80240654 46001081 */ sub.s $f2, $f2, $f0 -/* 86CD98 80240658 46021102 */ mul.s $f4, $f2, $f2 -/* 86CD9C 8024065C 00000000 */ nop -/* 86CDA0 80240660 846200B0 */ lh $v0, 0xb0($v1) -/* 86CDA4 80240664 C462002C */ lwc1 $f2, 0x2c($v1) -/* 86CDA8 80240668 44820000 */ mtc1 $v0, $f0 -/* 86CDAC 8024066C 00000000 */ nop -/* 86CDB0 80240670 46800020 */ cvt.s.w $f0, $f0 -/* 86CDB4 80240674 46001080 */ add.s $f2, $f2, $f0 -/* 86CDB8 80240678 3C013FC0 */ lui $at, 0x3fc0 -/* 86CDBC 8024067C 44810000 */ mtc1 $at, $f0 -/* 86CDC0 80240680 00000000 */ nop -/* 86CDC4 80240684 46001081 */ sub.s $f2, $f2, $f0 -/* 86CDC8 80240688 46043300 */ add.s $f12, $f6, $f4 -/* 86CDCC 8024068C C640009C */ lwc1 $f0, 0x9c($s2) -/* 86CDD0 80240690 46001501 */ sub.s $f20, $f2, $f0 -/* 86CDD4 80240694 46006084 */ sqrt.s $f2, $f12 -/* 86CDD8 80240698 46021032 */ c.eq.s $f2, $f2 -/* 86CDDC 8024069C 00000000 */ nop -/* 86CDE0 802406A0 45010004 */ bc1t .L802406B4 -/* 86CDE4 802406A4 0060882D */ daddu $s1, $v1, $zero -/* 86CDE8 802406A8 0C0187BC */ jal sqrtf -/* 86CDEC 802406AC 00000000 */ nop -/* 86CDF0 802406B0 46000086 */ mov.s $f2, $f0 -.L802406B4: -/* 86CDF4 802406B4 44800000 */ mtc1 $zero, $f0 -/* 86CDF8 802406B8 00000000 */ nop -/* 86CDFC 802406BC 4614003C */ c.lt.s $f0, $f20 -/* 86CE00 802406C0 00000000 */ nop -/* 86CE04 802406C4 45000016 */ bc1f .L80240720 -/* 86CE08 802406C8 46001106 */ mov.s $f4, $f2 -/* 86CE0C 802406CC 862200B0 */ lh $v0, 0xb0($s1) -/* 86CE10 802406D0 44820000 */ mtc1 $v0, $f0 -/* 86CE14 802406D4 00000000 */ nop -/* 86CE18 802406D8 46800020 */ cvt.s.w $f0, $f0 -/* 86CE1C 802406DC 4600A03C */ c.lt.s $f20, $f0 -/* 86CE20 802406E0 00000000 */ nop -/* 86CE24 802406E4 4500000E */ bc1f .L80240720 -/* 86CE28 802406E8 00000000 */ nop -/* 86CE2C 802406EC 862200B2 */ lh $v0, 0xb2($s1) -/* 86CE30 802406F0 3C013F00 */ lui $at, 0x3f00 -/* 86CE34 802406F4 44811000 */ mtc1 $at, $f2 -/* 86CE38 802406F8 44820000 */ mtc1 $v0, $f0 -/* 86CE3C 802406FC 00000000 */ nop -/* 86CE40 80240700 46800020 */ cvt.s.w $f0, $f0 -/* 86CE44 80240704 46020002 */ mul.s $f0, $f0, $f2 -/* 86CE48 80240708 00000000 */ nop -/* 86CE4C 8024070C 4600203C */ c.lt.s $f4, $f0 -/* 86CE50 80240710 00000000 */ nop -/* 86CE54 80240714 45000002 */ bc1f .L80240720 -/* 86CE58 80240718 24020001 */ addiu $v0, $zero, 1 -/* 86CE5C 8024071C AE62008C */ sw $v0, 0x8c($s3) -.L80240720: -/* 86CE60 80240720 C6020038 */ lwc1 $f2, 0x38($s0) -/* 86CE64 80240724 C6400098 */ lwc1 $f0, 0x98($s2) -/* 86CE68 80240728 46001081 */ sub.s $f2, $f2, $f0 -/* 86CE6C 8024072C 46021182 */ mul.s $f6, $f2, $f2 -/* 86CE70 80240730 00000000 */ nop -/* 86CE74 80240734 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86CE78 80240738 C6020040 */ lwc1 $f2, 0x40($s0) -/* 86CE7C 8024073C 46001081 */ sub.s $f2, $f2, $f0 -/* 86CE80 80240740 46021102 */ mul.s $f4, $f2, $f2 -/* 86CE84 80240744 00000000 */ nop -/* 86CE88 80240748 860200A8 */ lh $v0, 0xa8($s0) -/* 86CE8C 8024074C C602003C */ lwc1 $f2, 0x3c($s0) -/* 86CE90 80240750 44820000 */ mtc1 $v0, $f0 -/* 86CE94 80240754 00000000 */ nop -/* 86CE98 80240758 46800020 */ cvt.s.w $f0, $f0 -/* 86CE9C 8024075C 46001080 */ add.s $f2, $f2, $f0 -/* 86CEA0 80240760 3C013FC0 */ lui $at, 0x3fc0 -/* 86CEA4 80240764 44810000 */ mtc1 $at, $f0 -/* 86CEA8 80240768 00000000 */ nop -/* 86CEAC 8024076C 46001081 */ sub.s $f2, $f2, $f0 -/* 86CEB0 80240770 46043300 */ add.s $f12, $f6, $f4 -/* 86CEB4 80240774 C640009C */ lwc1 $f0, 0x9c($s2) -/* 86CEB8 80240778 46001501 */ sub.s $f20, $f2, $f0 -/* 86CEBC 8024077C 46006084 */ sqrt.s $f2, $f12 -/* 86CEC0 80240780 46021032 */ c.eq.s $f2, $f2 -/* 86CEC4 80240784 00000000 */ nop -/* 86CEC8 80240788 45010004 */ bc1t .L8024079C -/* 86CECC 8024078C 00000000 */ nop -/* 86CED0 80240790 0C0187BC */ jal sqrtf -/* 86CED4 80240794 00000000 */ nop -/* 86CED8 80240798 46000086 */ mov.s $f2, $f0 -.L8024079C: -/* 86CEDC 8024079C 44800000 */ mtc1 $zero, $f0 -/* 86CEE0 802407A0 00000000 */ nop -/* 86CEE4 802407A4 4614003C */ c.lt.s $f0, $f20 -/* 86CEE8 802407A8 00000000 */ nop -/* 86CEEC 802407AC 45000016 */ bc1f .L80240808 -/* 86CEF0 802407B0 46001106 */ mov.s $f4, $f2 -/* 86CEF4 802407B4 860200A8 */ lh $v0, 0xa8($s0) -/* 86CEF8 802407B8 44820000 */ mtc1 $v0, $f0 -/* 86CEFC 802407BC 00000000 */ nop -/* 86CF00 802407C0 46800020 */ cvt.s.w $f0, $f0 -/* 86CF04 802407C4 4600A03C */ c.lt.s $f20, $f0 -/* 86CF08 802407C8 00000000 */ nop -/* 86CF0C 802407CC 4500000F */ bc1f .L8024080C -/* 86CF10 802407D0 0000882D */ daddu $s1, $zero, $zero -/* 86CF14 802407D4 860200A6 */ lh $v0, 0xa6($s0) -/* 86CF18 802407D8 3C013F00 */ lui $at, 0x3f00 -/* 86CF1C 802407DC 44811000 */ mtc1 $at, $f2 -/* 86CF20 802407E0 44820000 */ mtc1 $v0, $f0 -/* 86CF24 802407E4 00000000 */ nop -/* 86CF28 802407E8 46800020 */ cvt.s.w $f0, $f0 -/* 86CF2C 802407EC 46020002 */ mul.s $f0, $f0, $f2 -/* 86CF30 802407F0 00000000 */ nop -/* 86CF34 802407F4 4600203C */ c.lt.s $f4, $f0 -/* 86CF38 802407F8 00000000 */ nop -/* 86CF3C 802407FC 45000003 */ bc1f .L8024080C -/* 86CF40 80240800 24020001 */ addiu $v0, $zero, 1 -/* 86CF44 80240804 AE62008C */ sw $v0, 0x8c($s3) -.L80240808: -/* 86CF48 80240808 0000882D */ daddu $s1, $zero, $zero -.L8024080C: -/* 86CF4C 8024080C 3C013FC0 */ lui $at, 0x3fc0 -/* 86CF50 80240810 4481D000 */ mtc1 $at, $f26 -/* 86CF54 80240814 4480C000 */ mtc1 $zero, $f24 -/* 86CF58 80240818 3C013F00 */ lui $at, 0x3f00 -/* 86CF5C 8024081C 4481B000 */ mtc1 $at, $f22 -.L80240820: -/* 86CF60 80240820 0C00EAD2 */ jal get_npc_safe -/* 86CF64 80240824 0220202D */ daddu $a0, $s1, $zero -/* 86CF68 80240828 0040802D */ daddu $s0, $v0, $zero -/* 86CF6C 8024082C 52000035 */ beql $s0, $zero, .L80240904 -/* 86CF70 80240830 26310001 */ addiu $s1, $s1, 1 -/* 86CF74 80240834 C6020038 */ lwc1 $f2, 0x38($s0) -/* 86CF78 80240838 C6400098 */ lwc1 $f0, 0x98($s2) -/* 86CF7C 8024083C 46001081 */ sub.s $f2, $f2, $f0 -/* 86CF80 80240840 46021182 */ mul.s $f6, $f2, $f2 -/* 86CF84 80240844 00000000 */ nop -/* 86CF88 80240848 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 86CF8C 8024084C C6020040 */ lwc1 $f2, 0x40($s0) -/* 86CF90 80240850 46001081 */ sub.s $f2, $f2, $f0 -/* 86CF94 80240854 46021102 */ mul.s $f4, $f2, $f2 -/* 86CF98 80240858 00000000 */ nop -/* 86CF9C 8024085C 860200A8 */ lh $v0, 0xa8($s0) -/* 86CFA0 80240860 C602003C */ lwc1 $f2, 0x3c($s0) -/* 86CFA4 80240864 44820000 */ mtc1 $v0, $f0 -/* 86CFA8 80240868 00000000 */ nop -/* 86CFAC 8024086C 46800020 */ cvt.s.w $f0, $f0 -/* 86CFB0 80240870 46001080 */ add.s $f2, $f2, $f0 -/* 86CFB4 80240874 461A1081 */ sub.s $f2, $f2, $f26 -/* 86CFB8 80240878 46043300 */ add.s $f12, $f6, $f4 -/* 86CFBC 8024087C C640009C */ lwc1 $f0, 0x9c($s2) -/* 86CFC0 80240880 46001501 */ sub.s $f20, $f2, $f0 -/* 86CFC4 80240884 46006004 */ sqrt.s $f0, $f12 -/* 86CFC8 80240888 46000032 */ c.eq.s $f0, $f0 -/* 86CFCC 8024088C 00000000 */ nop -/* 86CFD0 80240890 45010003 */ bc1t .L802408A0 -/* 86CFD4 80240894 00000000 */ nop -/* 86CFD8 80240898 0C0187BC */ jal sqrtf -/* 86CFDC 8024089C 00000000 */ nop -.L802408A0: -/* 86CFE0 802408A0 4614C03C */ c.lt.s $f24, $f20 -/* 86CFE4 802408A4 00000000 */ nop -/* 86CFE8 802408A8 45000015 */ bc1f .L80240900 -/* 86CFEC 802408AC 46000106 */ mov.s $f4, $f0 -/* 86CFF0 802408B0 860200A8 */ lh $v0, 0xa8($s0) -/* 86CFF4 802408B4 44820000 */ mtc1 $v0, $f0 -/* 86CFF8 802408B8 00000000 */ nop -/* 86CFFC 802408BC 46800020 */ cvt.s.w $f0, $f0 -/* 86D000 802408C0 4600A03C */ c.lt.s $f20, $f0 -/* 86D004 802408C4 00000000 */ nop -/* 86D008 802408C8 4500000E */ bc1f .L80240904 -/* 86D00C 802408CC 26310001 */ addiu $s1, $s1, 1 -/* 86D010 802408D0 860200A6 */ lh $v0, 0xa6($s0) -/* 86D014 802408D4 44820000 */ mtc1 $v0, $f0 -/* 86D018 802408D8 00000000 */ nop -/* 86D01C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 86D020 802408E0 46160002 */ mul.s $f0, $f0, $f22 -/* 86D024 802408E4 00000000 */ nop -/* 86D028 802408E8 4600203C */ c.lt.s $f4, $f0 -/* 86D02C 802408EC 00000000 */ nop -/* 86D030 802408F0 45000004 */ bc1f .L80240904 -/* 86D034 802408F4 24020001 */ addiu $v0, $zero, 1 -/* 86D038 802408F8 08090244 */ j .L80240910 -/* 86D03C 802408FC AE62008C */ sw $v0, 0x8c($s3) -.L80240900: -/* 86D040 80240900 26310001 */ addiu $s1, $s1, 1 -.L80240904: -/* 86D044 80240904 2A220040 */ slti $v0, $s1, 0x40 -/* 86D048 80240908 1440FFC5 */ bnez $v0, .L80240820 -/* 86D04C 8024090C 00000000 */ nop -.L80240910: -/* 86D050 80240910 8FBF0020 */ lw $ra, 0x20($sp) -/* 86D054 80240914 8FB3001C */ lw $s3, 0x1c($sp) -/* 86D058 80240918 8FB20018 */ lw $s2, 0x18($sp) -/* 86D05C 8024091C 8FB10014 */ lw $s1, 0x14($sp) -/* 86D060 80240920 8FB00010 */ lw $s0, 0x10($sp) -/* 86D064 80240924 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 86D068 80240928 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 86D06C 8024092C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 86D070 80240930 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 86D074 80240934 24020002 */ addiu $v0, $zero, 2 -/* 86D078 80240938 03E00008 */ jr $ra -/* 86D07C 8024093C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s new file mode 100644 index 0000000000..23cb8188ce --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_802405D0_86CD10.s @@ -0,0 +1,234 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405D0_86CD10 +/* 86CD10 802405D0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 86CD14 802405D4 AFB3001C */ sw $s3, 0x1c($sp) +/* 86CD18 802405D8 0080982D */ daddu $s3, $a0, $zero +/* 86CD1C 802405DC AFBF0020 */ sw $ra, 0x20($sp) +/* 86CD20 802405E0 AFB20018 */ sw $s2, 0x18($sp) +/* 86CD24 802405E4 AFB10014 */ sw $s1, 0x14($sp) +/* 86CD28 802405E8 AFB00010 */ sw $s0, 0x10($sp) +/* 86CD2C 802405EC F7BA0040 */ sdc1 $f26, 0x40($sp) +/* 86CD30 802405F0 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 86CD34 802405F4 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 86CD38 802405F8 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 86CD3C 802405FC 8E62000C */ lw $v0, 0xc($s3) +/* 86CD40 80240600 0C0B1EAF */ jal get_variable +/* 86CD44 80240604 8C450000 */ lw $a1, ($v0) +/* 86CD48 80240608 2404FFFC */ addiu $a0, $zero, -4 +/* 86CD4C 8024060C 0C00EABB */ jal get_npc_unsafe +/* 86CD50 80240610 0040802D */ daddu $s0, $v0, $zero +/* 86CD54 80240614 0200202D */ daddu $a0, $s0, $zero +/* 86CD58 80240618 0C046C04 */ jal get_model_list_index_from_tree_index +/* 86CD5C 8024061C 0040802D */ daddu $s0, $v0, $zero +/* 86CD60 80240620 0C046B4C */ jal get_model_from_list_index +/* 86CD64 80240624 0040202D */ daddu $a0, $v0, $zero +/* 86CD68 80240628 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 86CD6C 8024062C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 86CD70 80240630 0040902D */ daddu $s2, $v0, $zero +/* 86CD74 80240634 AE60008C */ sw $zero, 0x8c($s3) +/* 86CD78 80240638 C4620028 */ lwc1 $f2, 0x28($v1) +/* 86CD7C 8024063C C6400098 */ lwc1 $f0, 0x98($s2) +/* 86CD80 80240640 46001081 */ sub.s $f2, $f2, $f0 +/* 86CD84 80240644 46021182 */ mul.s $f6, $f2, $f2 +/* 86CD88 80240648 00000000 */ nop +/* 86CD8C 8024064C C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 86CD90 80240650 C4620030 */ lwc1 $f2, 0x30($v1) +/* 86CD94 80240654 46001081 */ sub.s $f2, $f2, $f0 +/* 86CD98 80240658 46021102 */ mul.s $f4, $f2, $f2 +/* 86CD9C 8024065C 00000000 */ nop +/* 86CDA0 80240660 846200B0 */ lh $v0, 0xb0($v1) +/* 86CDA4 80240664 C462002C */ lwc1 $f2, 0x2c($v1) +/* 86CDA8 80240668 44820000 */ mtc1 $v0, $f0 +/* 86CDAC 8024066C 00000000 */ nop +/* 86CDB0 80240670 46800020 */ cvt.s.w $f0, $f0 +/* 86CDB4 80240674 46001080 */ add.s $f2, $f2, $f0 +/* 86CDB8 80240678 3C013FC0 */ lui $at, 0x3fc0 +/* 86CDBC 8024067C 44810000 */ mtc1 $at, $f0 +/* 86CDC0 80240680 00000000 */ nop +/* 86CDC4 80240684 46001081 */ sub.s $f2, $f2, $f0 +/* 86CDC8 80240688 46043300 */ add.s $f12, $f6, $f4 +/* 86CDCC 8024068C C640009C */ lwc1 $f0, 0x9c($s2) +/* 86CDD0 80240690 46001501 */ sub.s $f20, $f2, $f0 +/* 86CDD4 80240694 46006084 */ sqrt.s $f2, $f12 +/* 86CDD8 80240698 46021032 */ c.eq.s $f2, $f2 +/* 86CDDC 8024069C 00000000 */ nop +/* 86CDE0 802406A0 45010004 */ bc1t .L802406B4 +/* 86CDE4 802406A4 0060882D */ daddu $s1, $v1, $zero +/* 86CDE8 802406A8 0C0187BC */ jal sqrtf +/* 86CDEC 802406AC 00000000 */ nop +/* 86CDF0 802406B0 46000086 */ mov.s $f2, $f0 +.L802406B4: +/* 86CDF4 802406B4 44800000 */ mtc1 $zero, $f0 +/* 86CDF8 802406B8 00000000 */ nop +/* 86CDFC 802406BC 4614003C */ c.lt.s $f0, $f20 +/* 86CE00 802406C0 00000000 */ nop +/* 86CE04 802406C4 45000016 */ bc1f .L80240720 +/* 86CE08 802406C8 46001106 */ mov.s $f4, $f2 +/* 86CE0C 802406CC 862200B0 */ lh $v0, 0xb0($s1) +/* 86CE10 802406D0 44820000 */ mtc1 $v0, $f0 +/* 86CE14 802406D4 00000000 */ nop +/* 86CE18 802406D8 46800020 */ cvt.s.w $f0, $f0 +/* 86CE1C 802406DC 4600A03C */ c.lt.s $f20, $f0 +/* 86CE20 802406E0 00000000 */ nop +/* 86CE24 802406E4 4500000E */ bc1f .L80240720 +/* 86CE28 802406E8 00000000 */ nop +/* 86CE2C 802406EC 862200B2 */ lh $v0, 0xb2($s1) +/* 86CE30 802406F0 3C013F00 */ lui $at, 0x3f00 +/* 86CE34 802406F4 44811000 */ mtc1 $at, $f2 +/* 86CE38 802406F8 44820000 */ mtc1 $v0, $f0 +/* 86CE3C 802406FC 00000000 */ nop +/* 86CE40 80240700 46800020 */ cvt.s.w $f0, $f0 +/* 86CE44 80240704 46020002 */ mul.s $f0, $f0, $f2 +/* 86CE48 80240708 00000000 */ nop +/* 86CE4C 8024070C 4600203C */ c.lt.s $f4, $f0 +/* 86CE50 80240710 00000000 */ nop +/* 86CE54 80240714 45000002 */ bc1f .L80240720 +/* 86CE58 80240718 24020001 */ addiu $v0, $zero, 1 +/* 86CE5C 8024071C AE62008C */ sw $v0, 0x8c($s3) +.L80240720: +/* 86CE60 80240720 C6020038 */ lwc1 $f2, 0x38($s0) +/* 86CE64 80240724 C6400098 */ lwc1 $f0, 0x98($s2) +/* 86CE68 80240728 46001081 */ sub.s $f2, $f2, $f0 +/* 86CE6C 8024072C 46021182 */ mul.s $f6, $f2, $f2 +/* 86CE70 80240730 00000000 */ nop +/* 86CE74 80240734 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 86CE78 80240738 C6020040 */ lwc1 $f2, 0x40($s0) +/* 86CE7C 8024073C 46001081 */ sub.s $f2, $f2, $f0 +/* 86CE80 80240740 46021102 */ mul.s $f4, $f2, $f2 +/* 86CE84 80240744 00000000 */ nop +/* 86CE88 80240748 860200A8 */ lh $v0, 0xa8($s0) +/* 86CE8C 8024074C C602003C */ lwc1 $f2, 0x3c($s0) +/* 86CE90 80240750 44820000 */ mtc1 $v0, $f0 +/* 86CE94 80240754 00000000 */ nop +/* 86CE98 80240758 46800020 */ cvt.s.w $f0, $f0 +/* 86CE9C 8024075C 46001080 */ add.s $f2, $f2, $f0 +/* 86CEA0 80240760 3C013FC0 */ lui $at, 0x3fc0 +/* 86CEA4 80240764 44810000 */ mtc1 $at, $f0 +/* 86CEA8 80240768 00000000 */ nop +/* 86CEAC 8024076C 46001081 */ sub.s $f2, $f2, $f0 +/* 86CEB0 80240770 46043300 */ add.s $f12, $f6, $f4 +/* 86CEB4 80240774 C640009C */ lwc1 $f0, 0x9c($s2) +/* 86CEB8 80240778 46001501 */ sub.s $f20, $f2, $f0 +/* 86CEBC 8024077C 46006084 */ sqrt.s $f2, $f12 +/* 86CEC0 80240780 46021032 */ c.eq.s $f2, $f2 +/* 86CEC4 80240784 00000000 */ nop +/* 86CEC8 80240788 45010004 */ bc1t .L8024079C +/* 86CECC 8024078C 00000000 */ nop +/* 86CED0 80240790 0C0187BC */ jal sqrtf +/* 86CED4 80240794 00000000 */ nop +/* 86CED8 80240798 46000086 */ mov.s $f2, $f0 +.L8024079C: +/* 86CEDC 8024079C 44800000 */ mtc1 $zero, $f0 +/* 86CEE0 802407A0 00000000 */ nop +/* 86CEE4 802407A4 4614003C */ c.lt.s $f0, $f20 +/* 86CEE8 802407A8 00000000 */ nop +/* 86CEEC 802407AC 45000016 */ bc1f .L80240808 +/* 86CEF0 802407B0 46001106 */ mov.s $f4, $f2 +/* 86CEF4 802407B4 860200A8 */ lh $v0, 0xa8($s0) +/* 86CEF8 802407B8 44820000 */ mtc1 $v0, $f0 +/* 86CEFC 802407BC 00000000 */ nop +/* 86CF00 802407C0 46800020 */ cvt.s.w $f0, $f0 +/* 86CF04 802407C4 4600A03C */ c.lt.s $f20, $f0 +/* 86CF08 802407C8 00000000 */ nop +/* 86CF0C 802407CC 4500000F */ bc1f .L8024080C +/* 86CF10 802407D0 0000882D */ daddu $s1, $zero, $zero +/* 86CF14 802407D4 860200A6 */ lh $v0, 0xa6($s0) +/* 86CF18 802407D8 3C013F00 */ lui $at, 0x3f00 +/* 86CF1C 802407DC 44811000 */ mtc1 $at, $f2 +/* 86CF20 802407E0 44820000 */ mtc1 $v0, $f0 +/* 86CF24 802407E4 00000000 */ nop +/* 86CF28 802407E8 46800020 */ cvt.s.w $f0, $f0 +/* 86CF2C 802407EC 46020002 */ mul.s $f0, $f0, $f2 +/* 86CF30 802407F0 00000000 */ nop +/* 86CF34 802407F4 4600203C */ c.lt.s $f4, $f0 +/* 86CF38 802407F8 00000000 */ nop +/* 86CF3C 802407FC 45000003 */ bc1f .L8024080C +/* 86CF40 80240800 24020001 */ addiu $v0, $zero, 1 +/* 86CF44 80240804 AE62008C */ sw $v0, 0x8c($s3) +.L80240808: +/* 86CF48 80240808 0000882D */ daddu $s1, $zero, $zero +.L8024080C: +/* 86CF4C 8024080C 3C013FC0 */ lui $at, 0x3fc0 +/* 86CF50 80240810 4481D000 */ mtc1 $at, $f26 +/* 86CF54 80240814 4480C000 */ mtc1 $zero, $f24 +/* 86CF58 80240818 3C013F00 */ lui $at, 0x3f00 +/* 86CF5C 8024081C 4481B000 */ mtc1 $at, $f22 +.L80240820: +/* 86CF60 80240820 0C00EAD2 */ jal get_npc_safe +/* 86CF64 80240824 0220202D */ daddu $a0, $s1, $zero +/* 86CF68 80240828 0040802D */ daddu $s0, $v0, $zero +/* 86CF6C 8024082C 52000035 */ beql $s0, $zero, .L80240904 +/* 86CF70 80240830 26310001 */ addiu $s1, $s1, 1 +/* 86CF74 80240834 C6020038 */ lwc1 $f2, 0x38($s0) +/* 86CF78 80240838 C6400098 */ lwc1 $f0, 0x98($s2) +/* 86CF7C 8024083C 46001081 */ sub.s $f2, $f2, $f0 +/* 86CF80 80240840 46021182 */ mul.s $f6, $f2, $f2 +/* 86CF84 80240844 00000000 */ nop +/* 86CF88 80240848 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 86CF8C 8024084C C6020040 */ lwc1 $f2, 0x40($s0) +/* 86CF90 80240850 46001081 */ sub.s $f2, $f2, $f0 +/* 86CF94 80240854 46021102 */ mul.s $f4, $f2, $f2 +/* 86CF98 80240858 00000000 */ nop +/* 86CF9C 8024085C 860200A8 */ lh $v0, 0xa8($s0) +/* 86CFA0 80240860 C602003C */ lwc1 $f2, 0x3c($s0) +/* 86CFA4 80240864 44820000 */ mtc1 $v0, $f0 +/* 86CFA8 80240868 00000000 */ nop +/* 86CFAC 8024086C 46800020 */ cvt.s.w $f0, $f0 +/* 86CFB0 80240870 46001080 */ add.s $f2, $f2, $f0 +/* 86CFB4 80240874 461A1081 */ sub.s $f2, $f2, $f26 +/* 86CFB8 80240878 46043300 */ add.s $f12, $f6, $f4 +/* 86CFBC 8024087C C640009C */ lwc1 $f0, 0x9c($s2) +/* 86CFC0 80240880 46001501 */ sub.s $f20, $f2, $f0 +/* 86CFC4 80240884 46006004 */ sqrt.s $f0, $f12 +/* 86CFC8 80240888 46000032 */ c.eq.s $f0, $f0 +/* 86CFCC 8024088C 00000000 */ nop +/* 86CFD0 80240890 45010003 */ bc1t .L802408A0 +/* 86CFD4 80240894 00000000 */ nop +/* 86CFD8 80240898 0C0187BC */ jal sqrtf +/* 86CFDC 8024089C 00000000 */ nop +.L802408A0: +/* 86CFE0 802408A0 4614C03C */ c.lt.s $f24, $f20 +/* 86CFE4 802408A4 00000000 */ nop +/* 86CFE8 802408A8 45000015 */ bc1f .L80240900 +/* 86CFEC 802408AC 46000106 */ mov.s $f4, $f0 +/* 86CFF0 802408B0 860200A8 */ lh $v0, 0xa8($s0) +/* 86CFF4 802408B4 44820000 */ mtc1 $v0, $f0 +/* 86CFF8 802408B8 00000000 */ nop +/* 86CFFC 802408BC 46800020 */ cvt.s.w $f0, $f0 +/* 86D000 802408C0 4600A03C */ c.lt.s $f20, $f0 +/* 86D004 802408C4 00000000 */ nop +/* 86D008 802408C8 4500000E */ bc1f .L80240904 +/* 86D00C 802408CC 26310001 */ addiu $s1, $s1, 1 +/* 86D010 802408D0 860200A6 */ lh $v0, 0xa6($s0) +/* 86D014 802408D4 44820000 */ mtc1 $v0, $f0 +/* 86D018 802408D8 00000000 */ nop +/* 86D01C 802408DC 46800020 */ cvt.s.w $f0, $f0 +/* 86D020 802408E0 46160002 */ mul.s $f0, $f0, $f22 +/* 86D024 802408E4 00000000 */ nop +/* 86D028 802408E8 4600203C */ c.lt.s $f4, $f0 +/* 86D02C 802408EC 00000000 */ nop +/* 86D030 802408F0 45000004 */ bc1f .L80240904 +/* 86D034 802408F4 24020001 */ addiu $v0, $zero, 1 +/* 86D038 802408F8 08090244 */ j .L80240910 +/* 86D03C 802408FC AE62008C */ sw $v0, 0x8c($s3) +.L80240900: +/* 86D040 80240900 26310001 */ addiu $s1, $s1, 1 +.L80240904: +/* 86D044 80240904 2A220040 */ slti $v0, $s1, 0x40 +/* 86D048 80240908 1440FFC5 */ bnez $v0, .L80240820 +/* 86D04C 8024090C 00000000 */ nop +.L80240910: +/* 86D050 80240910 8FBF0020 */ lw $ra, 0x20($sp) +/* 86D054 80240914 8FB3001C */ lw $s3, 0x1c($sp) +/* 86D058 80240918 8FB20018 */ lw $s2, 0x18($sp) +/* 86D05C 8024091C 8FB10014 */ lw $s1, 0x14($sp) +/* 86D060 80240920 8FB00010 */ lw $s0, 0x10($sp) +/* 86D064 80240924 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* 86D068 80240928 D7B80038 */ ldc1 $f24, 0x38($sp) +/* 86D06C 8024092C D7B60030 */ ldc1 $f22, 0x30($sp) +/* 86D070 80240930 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 86D074 80240934 24020002 */ addiu $v0, $zero, 2 +/* 86D078 80240938 03E00008 */ jr $ra +/* 86D07C 8024093C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940.s b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940.s deleted file mode 100644 index 46c79badf1..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240940 -/* 86D080 80240940 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86D084 80240944 AFBF0014 */ sw $ra, 0x14($sp) -/* 86D088 80240948 AFB00010 */ sw $s0, 0x10($sp) -/* 86D08C 8024094C 8C82000C */ lw $v0, 0xc($a0) -/* 86D090 80240950 8C450000 */ lw $a1, ($v0) -/* 86D094 80240954 0C0B1EAF */ jal get_variable -/* 86D098 80240958 8C900148 */ lw $s0, 0x148($a0) -/* 86D09C 8024095C 82030004 */ lb $v1, 4($s0) -/* 86D0A0 80240960 00021080 */ sll $v0, $v0, 2 -/* 86D0A4 80240964 00031880 */ sll $v1, $v1, 2 -/* 86D0A8 80240968 3C04800B */ lui $a0, 0x800b -/* 86D0AC 8024096C 00832021 */ addu $a0, $a0, $v1 -/* 86D0B0 80240970 8C840F38 */ lw $a0, 0xf38($a0) -/* 86D0B4 80240974 3C038024 */ lui $v1, 0x8024 -/* 86D0B8 80240978 00621821 */ addu $v1, $v1, $v0 -/* 86D0BC 8024097C 94631BAE */ lhu $v1, 0x1bae($v1) -/* 86D0C0 80240980 A4830044 */ sh $v1, 0x44($a0) -/* 86D0C4 80240984 8FBF0014 */ lw $ra, 0x14($sp) -/* 86D0C8 80240988 8FB00010 */ lw $s0, 0x10($sp) -/* 86D0CC 8024098C 24020002 */ addiu $v0, $zero, 2 -/* 86D0D0 80240990 03E00008 */ jr $ra -/* 86D0D4 80240994 27BD0018 */ addiu $sp, $sp, 0x18 -/* 86D0D8 80240998 00000000 */ nop -/* 86D0DC 8024099C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s new file mode 100644 index 0000000000..c9d206cdd5 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_02/86CD10/func_80240940_86D080.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240940_86D080 +/* 86D080 80240940 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 86D084 80240944 AFBF0014 */ sw $ra, 0x14($sp) +/* 86D088 80240948 AFB00010 */ sw $s0, 0x10($sp) +/* 86D08C 8024094C 8C82000C */ lw $v0, 0xc($a0) +/* 86D090 80240950 8C450000 */ lw $a1, ($v0) +/* 86D094 80240954 0C0B1EAF */ jal get_variable +/* 86D098 80240958 8C900148 */ lw $s0, 0x148($a0) +/* 86D09C 8024095C 82030004 */ lb $v1, 4($s0) +/* 86D0A0 80240960 00021080 */ sll $v0, $v0, 2 +/* 86D0A4 80240964 00031880 */ sll $v1, $v1, 2 +/* 86D0A8 80240968 3C04800B */ lui $a0, 0x800b +/* 86D0AC 8024096C 00832021 */ addu $a0, $a0, $v1 +/* 86D0B0 80240970 8C840F38 */ lw $a0, 0xf38($a0) +/* 86D0B4 80240974 3C038024 */ lui $v1, 0x8024 +/* 86D0B8 80240978 00621821 */ addu $v1, $v1, $v0 +/* 86D0BC 8024097C 94631BAE */ lhu $v1, 0x1bae($v1) +/* 86D0C0 80240980 A4830044 */ sh $v1, 0x44($a0) +/* 86D0C4 80240984 8FBF0014 */ lw $ra, 0x14($sp) +/* 86D0C8 80240988 8FB00010 */ lw $s0, 0x10($sp) +/* 86D0CC 8024098C 24020002 */ addiu $v0, $zero, 2 +/* 86D0D0 80240990 03E00008 */ jr $ra +/* 86D0D4 80240994 27BD0018 */ addiu $sp, $sp, 0x18 +/* 86D0D8 80240998 00000000 */ nop +/* 86D0DC 8024099C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0.s deleted file mode 100644 index e81b503a14..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409C0 -/* 86F4C0 802409C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 86F4C4 802409C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 86F4C8 802409C8 0C03BCC0 */ jal func_800EF300 -/* 86F4CC 802409CC 00000000 */ nop -/* 86F4D0 802409D0 8FBF0010 */ lw $ra, 0x10($sp) -/* 86F4D4 802409D4 24020002 */ addiu $v0, $zero, 2 -/* 86F4D8 802409D8 03E00008 */ jr $ra -/* 86F4DC 802409DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0_86F4C0.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0_86F4C0.s new file mode 100644 index 0000000000..cb699edf2d --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409C0_86F4C0.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409C0_86F4C0 +/* 86F4C0 802409C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 86F4C4 802409C4 AFBF0010 */ sw $ra, 0x10($sp) +/* 86F4C8 802409C8 0C03BCC0 */ jal func_800EF300 +/* 86F4CC 802409CC 00000000 */ nop +/* 86F4D0 802409D0 8FBF0010 */ lw $ra, 0x10($sp) +/* 86F4D4 802409D4 24020002 */ addiu $v0, $zero, 2 +/* 86F4D8 802409D8 03E00008 */ jr $ra +/* 86F4DC 802409DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0.s deleted file mode 100644 index 71ff5a799f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409E0 -/* 86F4E0 802409E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 86F4E4 802409E4 3C048024 */ lui $a0, 0x8024 -/* 86F4E8 802409E8 24842EBC */ addiu $a0, $a0, 0x2ebc -/* 86F4EC 802409EC AFBF0018 */ sw $ra, 0x18($sp) -/* 86F4F0 802409F0 AFB10014 */ sw $s1, 0x14($sp) -/* 86F4F4 802409F4 AFB00010 */ sw $s0, 0x10($sp) -/* 86F4F8 802409F8 8C830000 */ lw $v1, ($a0) -/* 86F4FC 802409FC 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 86F500 80240A00 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 86F504 80240A04 28620003 */ slti $v0, $v1, 3 -/* 86F508 80240A08 50400007 */ beql $v0, $zero, .L80240A28 -/* 86F50C 80240A0C 24020003 */ addiu $v0, $zero, 3 -/* 86F510 80240A10 1C60000C */ bgtz $v1, .L80240A44 -/* 86F514 80240A14 24620001 */ addiu $v0, $v1, 1 -/* 86F518 80240A18 10600007 */ beqz $v1, .L80240A38 -/* 86F51C 80240A1C 0000102D */ daddu $v0, $zero, $zero -/* 86F520 80240A20 080902AD */ j .L80240AB4 -/* 86F524 80240A24 00000000 */ nop -.L80240A28: -/* 86F528 80240A28 10620008 */ beq $v1, $v0, .L80240A4C -/* 86F52C 80240A2C 0000102D */ daddu $v0, $zero, $zero -/* 86F530 80240A30 080902AD */ j .L80240AB4 -/* 86F534 80240A34 00000000 */ nop -.L80240A38: -/* 86F538 80240A38 24020001 */ addiu $v0, $zero, 1 -/* 86F53C 80240A3C 080902AC */ j .L80240AB0 -/* 86F540 80240A40 AC820000 */ sw $v0, ($a0) -.L80240A44: -/* 86F544 80240A44 080902AC */ j .L80240AB0 -/* 86F548 80240A48 AC820000 */ sw $v0, ($a0) -.L80240A4C: -/* 86F54C 80240A4C 3C108011 */ lui $s0, 0x8011 -/* 86F550 80240A50 2610C930 */ addiu $s0, $s0, -0x36d0 -/* 86F554 80240A54 0C03BD17 */ jal clear_partner_move_history -/* 86F558 80240A58 8E040000 */ lw $a0, ($s0) -/* 86F55C 80240A5C C6200028 */ lwc1 $f0, 0x28($s1) -/* 86F560 80240A60 C6220030 */ lwc1 $f2, 0x30($s1) -/* 86F564 80240A64 4600010D */ trunc.w.s $f4, $f0 -/* 86F568 80240A68 44042000 */ mfc1 $a0, $f4 -/* 86F56C 80240A6C 4600110D */ trunc.w.s $f4, $f2 -/* 86F570 80240A70 44052000 */ mfc1 $a1, $f4 -/* 86F574 80240A74 0C03BCF0 */ jal func_800EF3C0 -/* 86F578 80240A78 00000000 */ nop -/* 86F57C 80240A7C 0C03BCF5 */ jal func_800EF3D4 -/* 86F580 80240A80 0000202D */ daddu $a0, $zero, $zero -/* 86F584 80240A84 8E030000 */ lw $v1, ($s0) -/* 86F588 80240A88 3C014387 */ lui $at, 0x4387 -/* 86F58C 80240A8C 44810000 */ mtc1 $at, $f0 -/* 86F590 80240A90 3C014334 */ lui $at, 0x4334 -/* 86F594 80240A94 44811000 */ mtc1 $at, $f2 -/* 86F598 80240A98 24020002 */ addiu $v0, $zero, 2 -/* 86F59C 80240A9C E460000C */ swc1 $f0, 0xc($v1) -/* 86F5A0 80240AA0 E6200080 */ swc1 $f0, 0x80($s1) -/* 86F5A4 80240AA4 E6200084 */ swc1 $f0, 0x84($s1) -/* 86F5A8 80240AA8 080902AD */ j .L80240AB4 -/* 86F5AC 80240AAC E62200A8 */ swc1 $f2, 0xa8($s1) -.L80240AB0: -/* 86F5B0 80240AB0 0000102D */ daddu $v0, $zero, $zero -.L80240AB4: -/* 86F5B4 80240AB4 8FBF0018 */ lw $ra, 0x18($sp) -/* 86F5B8 80240AB8 8FB10014 */ lw $s1, 0x14($sp) -/* 86F5BC 80240ABC 8FB00010 */ lw $s0, 0x10($sp) -/* 86F5C0 80240AC0 03E00008 */ jr $ra -/* 86F5C4 80240AC4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 86F5C8 80240AC8 00000000 */ nop -/* 86F5CC 80240ACC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s new file mode 100644 index 0000000000..088fe72ccc --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_03/86F0F0/func_802409E0_86F4E0.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409E0_86F4E0 +/* 86F4E0 802409E0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 86F4E4 802409E4 3C048024 */ lui $a0, 0x8024 +/* 86F4E8 802409E8 24842EBC */ addiu $a0, $a0, 0x2ebc +/* 86F4EC 802409EC AFBF0018 */ sw $ra, 0x18($sp) +/* 86F4F0 802409F0 AFB10014 */ sw $s1, 0x14($sp) +/* 86F4F4 802409F4 AFB00010 */ sw $s0, 0x10($sp) +/* 86F4F8 802409F8 8C830000 */ lw $v1, ($a0) +/* 86F4FC 802409FC 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* 86F500 80240A00 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* 86F504 80240A04 28620003 */ slti $v0, $v1, 3 +/* 86F508 80240A08 50400007 */ beql $v0, $zero, .L80240A28 +/* 86F50C 80240A0C 24020003 */ addiu $v0, $zero, 3 +/* 86F510 80240A10 1C60000C */ bgtz $v1, .L80240A44 +/* 86F514 80240A14 24620001 */ addiu $v0, $v1, 1 +/* 86F518 80240A18 10600007 */ beqz $v1, .L80240A38 +/* 86F51C 80240A1C 0000102D */ daddu $v0, $zero, $zero +/* 86F520 80240A20 080902AD */ j .L80240AB4 +/* 86F524 80240A24 00000000 */ nop +.L80240A28: +/* 86F528 80240A28 10620008 */ beq $v1, $v0, .L80240A4C +/* 86F52C 80240A2C 0000102D */ daddu $v0, $zero, $zero +/* 86F530 80240A30 080902AD */ j .L80240AB4 +/* 86F534 80240A34 00000000 */ nop +.L80240A38: +/* 86F538 80240A38 24020001 */ addiu $v0, $zero, 1 +/* 86F53C 80240A3C 080902AC */ j .L80240AB0 +/* 86F540 80240A40 AC820000 */ sw $v0, ($a0) +.L80240A44: +/* 86F544 80240A44 080902AC */ j .L80240AB0 +/* 86F548 80240A48 AC820000 */ sw $v0, ($a0) +.L80240A4C: +/* 86F54C 80240A4C 3C108011 */ lui $s0, 0x8011 +/* 86F550 80240A50 2610C930 */ addiu $s0, $s0, -0x36d0 +/* 86F554 80240A54 0C03BD17 */ jal clear_partner_move_history +/* 86F558 80240A58 8E040000 */ lw $a0, ($s0) +/* 86F55C 80240A5C C6200028 */ lwc1 $f0, 0x28($s1) +/* 86F560 80240A60 C6220030 */ lwc1 $f2, 0x30($s1) +/* 86F564 80240A64 4600010D */ trunc.w.s $f4, $f0 +/* 86F568 80240A68 44042000 */ mfc1 $a0, $f4 +/* 86F56C 80240A6C 4600110D */ trunc.w.s $f4, $f2 +/* 86F570 80240A70 44052000 */ mfc1 $a1, $f4 +/* 86F574 80240A74 0C03BCF0 */ jal func_800EF3C0 +/* 86F578 80240A78 00000000 */ nop +/* 86F57C 80240A7C 0C03BCF5 */ jal func_800EF3D4 +/* 86F580 80240A80 0000202D */ daddu $a0, $zero, $zero +/* 86F584 80240A84 8E030000 */ lw $v1, ($s0) +/* 86F588 80240A88 3C014387 */ lui $at, 0x4387 +/* 86F58C 80240A8C 44810000 */ mtc1 $at, $f0 +/* 86F590 80240A90 3C014334 */ lui $at, 0x4334 +/* 86F594 80240A94 44811000 */ mtc1 $at, $f2 +/* 86F598 80240A98 24020002 */ addiu $v0, $zero, 2 +/* 86F59C 80240A9C E460000C */ swc1 $f0, 0xc($v1) +/* 86F5A0 80240AA0 E6200080 */ swc1 $f0, 0x80($s1) +/* 86F5A4 80240AA4 E6200084 */ swc1 $f0, 0x84($s1) +/* 86F5A8 80240AA8 080902AD */ j .L80240AB4 +/* 86F5AC 80240AAC E62200A8 */ swc1 $f2, 0xa8($s1) +.L80240AB0: +/* 86F5B0 80240AB0 0000102D */ daddu $v0, $zero, $zero +.L80240AB4: +/* 86F5B4 80240AB4 8FBF0018 */ lw $ra, 0x18($sp) +/* 86F5B8 80240AB8 8FB10014 */ lw $s1, 0x14($sp) +/* 86F5BC 80240ABC 8FB00010 */ lw $s0, 0x10($sp) +/* 86F5C0 80240AC0 03E00008 */ jr $ra +/* 86F5C4 80240AC4 27BD0020 */ addiu $sp, $sp, 0x20 +/* 86F5C8 80240AC8 00000000 */ nop +/* 86F5CC 80240ACC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00.s b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00.s deleted file mode 100644 index 7afc61e760..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00.s +++ /dev/null @@ -1,129 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A00 -/* 872430 80240A00 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 872434 80240A04 AFB60048 */ sw $s6, 0x48($sp) -/* 872438 80240A08 0080B02D */ daddu $s6, $a0, $zero -/* 87243C 80240A0C AFBF0050 */ sw $ra, 0x50($sp) -/* 872440 80240A10 AFB7004C */ sw $s7, 0x4c($sp) -/* 872444 80240A14 AFB50044 */ sw $s5, 0x44($sp) -/* 872448 80240A18 AFB40040 */ sw $s4, 0x40($sp) -/* 87244C 80240A1C AFB3003C */ sw $s3, 0x3c($sp) -/* 872450 80240A20 AFB20038 */ sw $s2, 0x38($sp) -/* 872454 80240A24 AFB10034 */ sw $s1, 0x34($sp) -/* 872458 80240A28 AFB00030 */ sw $s0, 0x30($sp) -/* 87245C 80240A2C F7B60060 */ sdc1 $f22, 0x60($sp) -/* 872460 80240A30 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 872464 80240A34 8EC2013C */ lw $v0, 0x13c($s6) -/* 872468 80240A38 0C044181 */ jal get_shadow_by_index -/* 87246C 80240A3C 8C440000 */ lw $a0, ($v0) -/* 872470 80240A40 0040B82D */ daddu $s7, $v0, $zero -/* 872474 80240A44 0C046C04 */ jal get_model_list_index_from_tree_index -/* 872478 80240A48 24040012 */ addiu $a0, $zero, 0x12 -/* 87247C 80240A4C 0C046B4C */ jal get_model_from_list_index -/* 872480 80240A50 0040202D */ daddu $a0, $v0, $zero -/* 872484 80240A54 27B40018 */ addiu $s4, $sp, 0x18 -/* 872488 80240A58 0280202D */ daddu $a0, $s4, $zero -/* 87248C 80240A5C 27B3001C */ addiu $s3, $sp, 0x1c -/* 872490 80240A60 0260282D */ daddu $a1, $s3, $zero -/* 872494 80240A64 27B20020 */ addiu $s2, $sp, 0x20 -/* 872498 80240A68 0240302D */ daddu $a2, $s2, $zero -/* 87249C 80240A6C 27B50024 */ addiu $s5, $sp, 0x24 -/* 8724A0 80240A70 02A0382D */ daddu $a3, $s5, $zero -/* 8724A4 80240A74 27B10028 */ addiu $s1, $sp, 0x28 -/* 8724A8 80240A78 C4400098 */ lwc1 $f0, 0x98($v0) -/* 8724AC 80240A7C C442009C */ lwc1 $f2, 0x9c($v0) -/* 8724B0 80240A80 C44400A0 */ lwc1 $f4, 0xa0($v0) -/* 8724B4 80240A84 3C01447A */ lui $at, 0x447a -/* 8724B8 80240A88 4481B000 */ mtc1 $at, $f22 -/* 8724BC 80240A8C 27B0002C */ addiu $s0, $sp, 0x2c -/* 8724C0 80240A90 E7B6002C */ swc1 $f22, 0x2c($sp) -/* 8724C4 80240A94 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8724C8 80240A98 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 8724CC 80240A9C E7A40020 */ swc1 $f4, 0x20($sp) -/* 8724D0 80240AA0 AFB10010 */ sw $s1, 0x10($sp) -/* 8724D4 80240AA4 0C04497A */ jal func_801125E8 -/* 8724D8 80240AA8 AFB00014 */ sw $s0, 0x14($sp) -/* 8724DC 80240AAC 8FA5002C */ lw $a1, 0x2c($sp) -/* 8724E0 80240AB0 0C044A17 */ jal set_standard_shadow_scale -/* 8724E4 80240AB4 02E0202D */ daddu $a0, $s7, $zero -/* 8724E8 80240AB8 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 8724EC 80240ABC C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 8724F0 80240AC0 C6E2001C */ lwc1 $f2, 0x1c($s7) -/* 8724F4 80240AC4 3C014090 */ lui $at, 0x4090 -/* 8724F8 80240AC8 4481A000 */ mtc1 $at, $f20 -/* 8724FC 80240ACC AEE0002C */ sw $zero, 0x2c($s7) -/* 872500 80240AD0 46141082 */ mul.s $f2, $f2, $f20 -/* 872504 80240AD4 00000000 */ nop -/* 872508 80240AD8 E6E00010 */ swc1 $f0, 0x10($s7) -/* 87250C 80240ADC E6E40014 */ swc1 $f4, 0x14($s7) -/* 872510 80240AE0 C7A60020 */ lwc1 $f6, 0x20($sp) -/* 872514 80240AE4 C7A80024 */ lwc1 $f8, 0x24($sp) -/* 872518 80240AE8 C6E00024 */ lwc1 $f0, 0x24($s7) -/* 87251C 80240AEC C7A40028 */ lwc1 $f4, 0x28($sp) -/* 872520 80240AF0 46140002 */ mul.s $f0, $f0, $f20 -/* 872524 80240AF4 00000000 */ nop -/* 872528 80240AF8 E6E60018 */ swc1 $f6, 0x18($s7) -/* 87252C 80240AFC E6E80028 */ swc1 $f8, 0x28($s7) -/* 872530 80240B00 E6E40030 */ swc1 $f4, 0x30($s7) -/* 872534 80240B04 E6E2001C */ swc1 $f2, 0x1c($s7) -/* 872538 80240B08 E6E00024 */ swc1 $f0, 0x24($s7) -/* 87253C 80240B0C 8EC2013C */ lw $v0, 0x13c($s6) -/* 872540 80240B10 0C044181 */ jal get_shadow_by_index -/* 872544 80240B14 8C440004 */ lw $a0, 4($v0) -/* 872548 80240B18 0040B82D */ daddu $s7, $v0, $zero -/* 87254C 80240B1C 0C046C04 */ jal get_model_list_index_from_tree_index -/* 872550 80240B20 24040014 */ addiu $a0, $zero, 0x14 -/* 872554 80240B24 0C046B4C */ jal get_model_from_list_index -/* 872558 80240B28 0040202D */ daddu $a0, $v0, $zero -/* 87255C 80240B2C 0280202D */ daddu $a0, $s4, $zero -/* 872560 80240B30 0260282D */ daddu $a1, $s3, $zero -/* 872564 80240B34 0240302D */ daddu $a2, $s2, $zero -/* 872568 80240B38 C4400098 */ lwc1 $f0, 0x98($v0) -/* 87256C 80240B3C C442009C */ lwc1 $f2, 0x9c($v0) -/* 872570 80240B40 C44400A0 */ lwc1 $f4, 0xa0($v0) -/* 872574 80240B44 02A0382D */ daddu $a3, $s5, $zero -/* 872578 80240B48 E7B6002C */ swc1 $f22, 0x2c($sp) -/* 87257C 80240B4C E7A00018 */ swc1 $f0, 0x18($sp) -/* 872580 80240B50 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 872584 80240B54 E7A40020 */ swc1 $f4, 0x20($sp) -/* 872588 80240B58 AFB10010 */ sw $s1, 0x10($sp) -/* 87258C 80240B5C 0C04497A */ jal func_801125E8 -/* 872590 80240B60 AFB00014 */ sw $s0, 0x14($sp) -/* 872594 80240B64 8FA5002C */ lw $a1, 0x2c($sp) -/* 872598 80240B68 0C044A17 */ jal set_standard_shadow_scale -/* 87259C 80240B6C 02E0202D */ daddu $a0, $s7, $zero -/* 8725A0 80240B70 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 8725A4 80240B74 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 8725A8 80240B78 C6E2001C */ lwc1 $f2, 0x1c($s7) -/* 8725AC 80240B7C AEE0002C */ sw $zero, 0x2c($s7) -/* 8725B0 80240B80 46141082 */ mul.s $f2, $f2, $f20 -/* 8725B4 80240B84 00000000 */ nop -/* 8725B8 80240B88 E6E00010 */ swc1 $f0, 0x10($s7) -/* 8725BC 80240B8C E6E40014 */ swc1 $f4, 0x14($s7) -/* 8725C0 80240B90 C7A60020 */ lwc1 $f6, 0x20($sp) -/* 8725C4 80240B94 C7A80024 */ lwc1 $f8, 0x24($sp) -/* 8725C8 80240B98 C6E00024 */ lwc1 $f0, 0x24($s7) -/* 8725CC 80240B9C C7A40028 */ lwc1 $f4, 0x28($sp) -/* 8725D0 80240BA0 46140002 */ mul.s $f0, $f0, $f20 -/* 8725D4 80240BA4 00000000 */ nop -/* 8725D8 80240BA8 E6E60018 */ swc1 $f6, 0x18($s7) -/* 8725DC 80240BAC E6E80028 */ swc1 $f8, 0x28($s7) -/* 8725E0 80240BB0 E6E40030 */ swc1 $f4, 0x30($s7) -/* 8725E4 80240BB4 E6E2001C */ swc1 $f2, 0x1c($s7) -/* 8725E8 80240BB8 E6E00024 */ swc1 $f0, 0x24($s7) -/* 8725EC 80240BBC 8FBF0050 */ lw $ra, 0x50($sp) -/* 8725F0 80240BC0 8FB7004C */ lw $s7, 0x4c($sp) -/* 8725F4 80240BC4 8FB60048 */ lw $s6, 0x48($sp) -/* 8725F8 80240BC8 8FB50044 */ lw $s5, 0x44($sp) -/* 8725FC 80240BCC 8FB40040 */ lw $s4, 0x40($sp) -/* 872600 80240BD0 8FB3003C */ lw $s3, 0x3c($sp) -/* 872604 80240BD4 8FB20038 */ lw $s2, 0x38($sp) -/* 872608 80240BD8 8FB10034 */ lw $s1, 0x34($sp) -/* 87260C 80240BDC 8FB00030 */ lw $s0, 0x30($sp) -/* 872610 80240BE0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* 872614 80240BE4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 872618 80240BE8 24020002 */ addiu $v0, $zero, 2 -/* 87261C 80240BEC 03E00008 */ jr $ra -/* 872620 80240BF0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00_872430.s b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00_872430.s new file mode 100644 index 0000000000..7c5bc1a1af --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240A00_872430.s @@ -0,0 +1,129 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A00_872430 +/* 872430 80240A00 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 872434 80240A04 AFB60048 */ sw $s6, 0x48($sp) +/* 872438 80240A08 0080B02D */ daddu $s6, $a0, $zero +/* 87243C 80240A0C AFBF0050 */ sw $ra, 0x50($sp) +/* 872440 80240A10 AFB7004C */ sw $s7, 0x4c($sp) +/* 872444 80240A14 AFB50044 */ sw $s5, 0x44($sp) +/* 872448 80240A18 AFB40040 */ sw $s4, 0x40($sp) +/* 87244C 80240A1C AFB3003C */ sw $s3, 0x3c($sp) +/* 872450 80240A20 AFB20038 */ sw $s2, 0x38($sp) +/* 872454 80240A24 AFB10034 */ sw $s1, 0x34($sp) +/* 872458 80240A28 AFB00030 */ sw $s0, 0x30($sp) +/* 87245C 80240A2C F7B60060 */ sdc1 $f22, 0x60($sp) +/* 872460 80240A30 F7B40058 */ sdc1 $f20, 0x58($sp) +/* 872464 80240A34 8EC2013C */ lw $v0, 0x13c($s6) +/* 872468 80240A38 0C044181 */ jal get_shadow_by_index +/* 87246C 80240A3C 8C440000 */ lw $a0, ($v0) +/* 872470 80240A40 0040B82D */ daddu $s7, $v0, $zero +/* 872474 80240A44 0C046C04 */ jal get_model_list_index_from_tree_index +/* 872478 80240A48 24040012 */ addiu $a0, $zero, 0x12 +/* 87247C 80240A4C 0C046B4C */ jal get_model_from_list_index +/* 872480 80240A50 0040202D */ daddu $a0, $v0, $zero +/* 872484 80240A54 27B40018 */ addiu $s4, $sp, 0x18 +/* 872488 80240A58 0280202D */ daddu $a0, $s4, $zero +/* 87248C 80240A5C 27B3001C */ addiu $s3, $sp, 0x1c +/* 872490 80240A60 0260282D */ daddu $a1, $s3, $zero +/* 872494 80240A64 27B20020 */ addiu $s2, $sp, 0x20 +/* 872498 80240A68 0240302D */ daddu $a2, $s2, $zero +/* 87249C 80240A6C 27B50024 */ addiu $s5, $sp, 0x24 +/* 8724A0 80240A70 02A0382D */ daddu $a3, $s5, $zero +/* 8724A4 80240A74 27B10028 */ addiu $s1, $sp, 0x28 +/* 8724A8 80240A78 C4400098 */ lwc1 $f0, 0x98($v0) +/* 8724AC 80240A7C C442009C */ lwc1 $f2, 0x9c($v0) +/* 8724B0 80240A80 C44400A0 */ lwc1 $f4, 0xa0($v0) +/* 8724B4 80240A84 3C01447A */ lui $at, 0x447a +/* 8724B8 80240A88 4481B000 */ mtc1 $at, $f22 +/* 8724BC 80240A8C 27B0002C */ addiu $s0, $sp, 0x2c +/* 8724C0 80240A90 E7B6002C */ swc1 $f22, 0x2c($sp) +/* 8724C4 80240A94 E7A00018 */ swc1 $f0, 0x18($sp) +/* 8724C8 80240A98 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 8724CC 80240A9C E7A40020 */ swc1 $f4, 0x20($sp) +/* 8724D0 80240AA0 AFB10010 */ sw $s1, 0x10($sp) +/* 8724D4 80240AA4 0C04497A */ jal func_801125E8 +/* 8724D8 80240AA8 AFB00014 */ sw $s0, 0x14($sp) +/* 8724DC 80240AAC 8FA5002C */ lw $a1, 0x2c($sp) +/* 8724E0 80240AB0 0C044A17 */ jal set_standard_shadow_scale +/* 8724E4 80240AB4 02E0202D */ daddu $a0, $s7, $zero +/* 8724E8 80240AB8 C7A00018 */ lwc1 $f0, 0x18($sp) +/* 8724EC 80240ABC C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 8724F0 80240AC0 C6E2001C */ lwc1 $f2, 0x1c($s7) +/* 8724F4 80240AC4 3C014090 */ lui $at, 0x4090 +/* 8724F8 80240AC8 4481A000 */ mtc1 $at, $f20 +/* 8724FC 80240ACC AEE0002C */ sw $zero, 0x2c($s7) +/* 872500 80240AD0 46141082 */ mul.s $f2, $f2, $f20 +/* 872504 80240AD4 00000000 */ nop +/* 872508 80240AD8 E6E00010 */ swc1 $f0, 0x10($s7) +/* 87250C 80240ADC E6E40014 */ swc1 $f4, 0x14($s7) +/* 872510 80240AE0 C7A60020 */ lwc1 $f6, 0x20($sp) +/* 872514 80240AE4 C7A80024 */ lwc1 $f8, 0x24($sp) +/* 872518 80240AE8 C6E00024 */ lwc1 $f0, 0x24($s7) +/* 87251C 80240AEC C7A40028 */ lwc1 $f4, 0x28($sp) +/* 872520 80240AF0 46140002 */ mul.s $f0, $f0, $f20 +/* 872524 80240AF4 00000000 */ nop +/* 872528 80240AF8 E6E60018 */ swc1 $f6, 0x18($s7) +/* 87252C 80240AFC E6E80028 */ swc1 $f8, 0x28($s7) +/* 872530 80240B00 E6E40030 */ swc1 $f4, 0x30($s7) +/* 872534 80240B04 E6E2001C */ swc1 $f2, 0x1c($s7) +/* 872538 80240B08 E6E00024 */ swc1 $f0, 0x24($s7) +/* 87253C 80240B0C 8EC2013C */ lw $v0, 0x13c($s6) +/* 872540 80240B10 0C044181 */ jal get_shadow_by_index +/* 872544 80240B14 8C440004 */ lw $a0, 4($v0) +/* 872548 80240B18 0040B82D */ daddu $s7, $v0, $zero +/* 87254C 80240B1C 0C046C04 */ jal get_model_list_index_from_tree_index +/* 872550 80240B20 24040014 */ addiu $a0, $zero, 0x14 +/* 872554 80240B24 0C046B4C */ jal get_model_from_list_index +/* 872558 80240B28 0040202D */ daddu $a0, $v0, $zero +/* 87255C 80240B2C 0280202D */ daddu $a0, $s4, $zero +/* 872560 80240B30 0260282D */ daddu $a1, $s3, $zero +/* 872564 80240B34 0240302D */ daddu $a2, $s2, $zero +/* 872568 80240B38 C4400098 */ lwc1 $f0, 0x98($v0) +/* 87256C 80240B3C C442009C */ lwc1 $f2, 0x9c($v0) +/* 872570 80240B40 C44400A0 */ lwc1 $f4, 0xa0($v0) +/* 872574 80240B44 02A0382D */ daddu $a3, $s5, $zero +/* 872578 80240B48 E7B6002C */ swc1 $f22, 0x2c($sp) +/* 87257C 80240B4C E7A00018 */ swc1 $f0, 0x18($sp) +/* 872580 80240B50 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 872584 80240B54 E7A40020 */ swc1 $f4, 0x20($sp) +/* 872588 80240B58 AFB10010 */ sw $s1, 0x10($sp) +/* 87258C 80240B5C 0C04497A */ jal func_801125E8 +/* 872590 80240B60 AFB00014 */ sw $s0, 0x14($sp) +/* 872594 80240B64 8FA5002C */ lw $a1, 0x2c($sp) +/* 872598 80240B68 0C044A17 */ jal set_standard_shadow_scale +/* 87259C 80240B6C 02E0202D */ daddu $a0, $s7, $zero +/* 8725A0 80240B70 C7A00018 */ lwc1 $f0, 0x18($sp) +/* 8725A4 80240B74 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 8725A8 80240B78 C6E2001C */ lwc1 $f2, 0x1c($s7) +/* 8725AC 80240B7C AEE0002C */ sw $zero, 0x2c($s7) +/* 8725B0 80240B80 46141082 */ mul.s $f2, $f2, $f20 +/* 8725B4 80240B84 00000000 */ nop +/* 8725B8 80240B88 E6E00010 */ swc1 $f0, 0x10($s7) +/* 8725BC 80240B8C E6E40014 */ swc1 $f4, 0x14($s7) +/* 8725C0 80240B90 C7A60020 */ lwc1 $f6, 0x20($sp) +/* 8725C4 80240B94 C7A80024 */ lwc1 $f8, 0x24($sp) +/* 8725C8 80240B98 C6E00024 */ lwc1 $f0, 0x24($s7) +/* 8725CC 80240B9C C7A40028 */ lwc1 $f4, 0x28($sp) +/* 8725D0 80240BA0 46140002 */ mul.s $f0, $f0, $f20 +/* 8725D4 80240BA4 00000000 */ nop +/* 8725D8 80240BA8 E6E60018 */ swc1 $f6, 0x18($s7) +/* 8725DC 80240BAC E6E80028 */ swc1 $f8, 0x28($s7) +/* 8725E0 80240BB0 E6E40030 */ swc1 $f4, 0x30($s7) +/* 8725E4 80240BB4 E6E2001C */ swc1 $f2, 0x1c($s7) +/* 8725E8 80240BB8 E6E00024 */ swc1 $f0, 0x24($s7) +/* 8725EC 80240BBC 8FBF0050 */ lw $ra, 0x50($sp) +/* 8725F0 80240BC0 8FB7004C */ lw $s7, 0x4c($sp) +/* 8725F4 80240BC4 8FB60048 */ lw $s6, 0x48($sp) +/* 8725F8 80240BC8 8FB50044 */ lw $s5, 0x44($sp) +/* 8725FC 80240BCC 8FB40040 */ lw $s4, 0x40($sp) +/* 872600 80240BD0 8FB3003C */ lw $s3, 0x3c($sp) +/* 872604 80240BD4 8FB20038 */ lw $s2, 0x38($sp) +/* 872608 80240BD8 8FB10034 */ lw $s1, 0x34($sp) +/* 87260C 80240BDC 8FB00030 */ lw $s0, 0x30($sp) +/* 872610 80240BE0 D7B60060 */ ldc1 $f22, 0x60($sp) +/* 872614 80240BE4 D7B40058 */ ldc1 $f20, 0x58($sp) +/* 872618 80240BE8 24020002 */ addiu $v0, $zero, 2 +/* 87261C 80240BEC 03E00008 */ jr $ra +/* 872620 80240BF0 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240BF4.s b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240BF4.s deleted file mode 100644 index 4fcebec8f2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240BF4.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF4 -/* 872624 80240BF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 872628 80240BF8 AFBF0010 */ sw $ra, 0x10($sp) -/* 87262C 80240BFC 8C82000C */ lw $v0, 0xc($a0) -/* 872630 80240C00 3C068016 */ lui $a2, 0x8016 -/* 872634 80240C04 84C6A552 */ lh $a2, -0x5aae($a2) -/* 872638 80240C08 0C0B2026 */ jal set_variable -/* 87263C 80240C0C 8C450000 */ lw $a1, ($v0) -/* 872640 80240C10 8FBF0010 */ lw $ra, 0x10($sp) -/* 872644 80240C14 24020002 */ addiu $v0, $zero, 2 -/* 872648 80240C18 03E00008 */ jr $ra -/* 87264C 80240C1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240BF4_872624.s b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240BF4_872624.s new file mode 100644 index 0000000000..ab4849e24e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_04/872020/func_80240BF4_872624.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BF4_872624 +/* 872624 80240BF4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 872628 80240BF8 AFBF0010 */ sw $ra, 0x10($sp) +/* 87262C 80240BFC 8C82000C */ lw $v0, 0xc($a0) +/* 872630 80240C00 3C068016 */ lui $a2, 0x8016 +/* 872634 80240C04 84C6A552 */ lh $a2, -0x5aae($a2) +/* 872638 80240C08 0C0B2026 */ jal set_variable +/* 87263C 80240C0C 8C450000 */ lw $a1, ($v0) +/* 872640 80240C10 8FBF0010 */ lw $ra, 0x10($sp) +/* 872644 80240C14 24020002 */ addiu $v0, $zero, 2 +/* 872648 80240C18 03E00008 */ jr $ra +/* 87264C 80240C1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680.s deleted file mode 100644 index e346908861..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240680 -/* 875440 80240680 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 875444 80240684 AFB00010 */ sw $s0, 0x10($sp) -/* 875448 80240688 3C108024 */ lui $s0, 0x8024 -/* 87544C 8024068C 26101800 */ addiu $s0, $s0, 0x1800 -/* 875450 80240690 AFBF0018 */ sw $ra, 0x18($sp) -/* 875454 80240694 AFB10014 */ sw $s1, 0x14($sp) -/* 875458 80240698 8E020000 */ lw $v0, ($s0) -/* 87545C 8024069C 14400010 */ bnez $v0, .L802406E0 -/* 875460 802406A0 0080882D */ daddu $s1, $a0, $zero -/* 875464 802406A4 0C00AB39 */ jal heap_malloc -/* 875468 802406A8 24040040 */ addiu $a0, $zero, 0x40 -/* 87546C 802406AC AE020000 */ sw $v0, ($s0) -/* 875470 802406B0 0000182D */ daddu $v1, $zero, $zero -/* 875474 802406B4 0040282D */ daddu $a1, $v0, $zero -/* 875478 802406B8 0220202D */ daddu $a0, $s1, $zero -.L802406BC: -/* 87547C 802406BC 8C820084 */ lw $v0, 0x84($a0) -/* 875480 802406C0 24840004 */ addiu $a0, $a0, 4 -/* 875484 802406C4 24630001 */ addiu $v1, $v1, 1 -/* 875488 802406C8 ACA20000 */ sw $v0, ($a1) -/* 87548C 802406CC 28620010 */ slti $v0, $v1, 0x10 -/* 875490 802406D0 1440FFFA */ bnez $v0, .L802406BC -/* 875494 802406D4 24A50004 */ addiu $a1, $a1, 4 -/* 875498 802406D8 080901C7 */ j .L8024071C -/* 87549C 802406DC 00000000 */ nop -.L802406E0: -/* 8754A0 802406E0 0000182D */ daddu $v1, $zero, $zero -/* 8754A4 802406E4 0040282D */ daddu $a1, $v0, $zero -/* 8754A8 802406E8 0220202D */ daddu $a0, $s1, $zero -.L802406EC: -/* 8754AC 802406EC 8CA20000 */ lw $v0, ($a1) -/* 8754B0 802406F0 24A50004 */ addiu $a1, $a1, 4 -/* 8754B4 802406F4 24630001 */ addiu $v1, $v1, 1 -/* 8754B8 802406F8 AC820084 */ sw $v0, 0x84($a0) -/* 8754BC 802406FC 28620010 */ slti $v0, $v1, 0x10 -/* 8754C0 80240700 1440FFFA */ bnez $v0, .L802406EC -/* 8754C4 80240704 24840004 */ addiu $a0, $a0, 4 -/* 8754C8 80240708 3C108024 */ lui $s0, 0x8024 -/* 8754CC 8024070C 26101800 */ addiu $s0, $s0, 0x1800 -/* 8754D0 80240710 0C00AB4B */ jal heap_free -/* 8754D4 80240714 8E040000 */ lw $a0, ($s0) -/* 8754D8 80240718 AE000000 */ sw $zero, ($s0) -.L8024071C: -/* 8754DC 8024071C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8754E0 80240720 8FB10014 */ lw $s1, 0x14($sp) -/* 8754E4 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* 8754E8 80240728 24020002 */ addiu $v0, $zero, 2 -/* 8754EC 8024072C 03E00008 */ jr $ra -/* 8754F0 80240730 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s new file mode 100644 index 0000000000..6a026ebf9d --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240680_875440.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240680_875440 +/* 875440 80240680 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 875444 80240684 AFB00010 */ sw $s0, 0x10($sp) +/* 875448 80240688 3C108024 */ lui $s0, 0x8024 +/* 87544C 8024068C 26101800 */ addiu $s0, $s0, 0x1800 +/* 875450 80240690 AFBF0018 */ sw $ra, 0x18($sp) +/* 875454 80240694 AFB10014 */ sw $s1, 0x14($sp) +/* 875458 80240698 8E020000 */ lw $v0, ($s0) +/* 87545C 8024069C 14400010 */ bnez $v0, .L802406E0 +/* 875460 802406A0 0080882D */ daddu $s1, $a0, $zero +/* 875464 802406A4 0C00AB39 */ jal heap_malloc +/* 875468 802406A8 24040040 */ addiu $a0, $zero, 0x40 +/* 87546C 802406AC AE020000 */ sw $v0, ($s0) +/* 875470 802406B0 0000182D */ daddu $v1, $zero, $zero +/* 875474 802406B4 0040282D */ daddu $a1, $v0, $zero +/* 875478 802406B8 0220202D */ daddu $a0, $s1, $zero +.L802406BC: +/* 87547C 802406BC 8C820084 */ lw $v0, 0x84($a0) +/* 875480 802406C0 24840004 */ addiu $a0, $a0, 4 +/* 875484 802406C4 24630001 */ addiu $v1, $v1, 1 +/* 875488 802406C8 ACA20000 */ sw $v0, ($a1) +/* 87548C 802406CC 28620010 */ slti $v0, $v1, 0x10 +/* 875490 802406D0 1440FFFA */ bnez $v0, .L802406BC +/* 875494 802406D4 24A50004 */ addiu $a1, $a1, 4 +/* 875498 802406D8 080901C7 */ j .L8024071C +/* 87549C 802406DC 00000000 */ nop +.L802406E0: +/* 8754A0 802406E0 0000182D */ daddu $v1, $zero, $zero +/* 8754A4 802406E4 0040282D */ daddu $a1, $v0, $zero +/* 8754A8 802406E8 0220202D */ daddu $a0, $s1, $zero +.L802406EC: +/* 8754AC 802406EC 8CA20000 */ lw $v0, ($a1) +/* 8754B0 802406F0 24A50004 */ addiu $a1, $a1, 4 +/* 8754B4 802406F4 24630001 */ addiu $v1, $v1, 1 +/* 8754B8 802406F8 AC820084 */ sw $v0, 0x84($a0) +/* 8754BC 802406FC 28620010 */ slti $v0, $v1, 0x10 +/* 8754C0 80240700 1440FFFA */ bnez $v0, .L802406EC +/* 8754C4 80240704 24840004 */ addiu $a0, $a0, 4 +/* 8754C8 80240708 3C108024 */ lui $s0, 0x8024 +/* 8754CC 8024070C 26101800 */ addiu $s0, $s0, 0x1800 +/* 8754D0 80240710 0C00AB4B */ jal heap_free +/* 8754D4 80240714 8E040000 */ lw $a0, ($s0) +/* 8754D8 80240718 AE000000 */ sw $zero, ($s0) +.L8024071C: +/* 8754DC 8024071C 8FBF0018 */ lw $ra, 0x18($sp) +/* 8754E0 80240720 8FB10014 */ lw $s1, 0x14($sp) +/* 8754E4 80240724 8FB00010 */ lw $s0, 0x10($sp) +/* 8754E8 80240728 24020002 */ addiu $v0, $zero, 2 +/* 8754EC 8024072C 03E00008 */ jr $ra +/* 8754F0 80240730 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798.s deleted file mode 100644 index 7051fa8ddb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240798 -/* 875558 80240798 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87555C 8024079C AFB10014 */ sw $s1, 0x14($sp) -/* 875560 802407A0 0080882D */ daddu $s1, $a0, $zero -/* 875564 802407A4 AFBF001C */ sw $ra, 0x1c($sp) -/* 875568 802407A8 AFB20018 */ sw $s2, 0x18($sp) -/* 87556C 802407AC AFB00010 */ sw $s0, 0x10($sp) -/* 875570 802407B0 8E240084 */ lw $a0, 0x84($s1) -/* 875574 802407B4 0C04C3D6 */ jal get_item_entity -/* 875578 802407B8 00A0802D */ daddu $s0, $a1, $zero -/* 87557C 802407BC 12000005 */ beqz $s0, .L802407D4 -/* 875580 802407C0 0040902D */ daddu $s2, $v0, $zero -/* 875584 802407C4 C640000C */ lwc1 $f0, 0xc($s2) -/* 875588 802407C8 AE200074 */ sw $zero, 0x74($s1) -/* 87558C 802407CC AE20007C */ sw $zero, 0x7c($s1) -/* 875590 802407D0 E6200078 */ swc1 $f0, 0x78($s1) -.L802407D4: -/* 875594 802407D4 8E230074 */ lw $v1, 0x74($s1) -/* 875598 802407D8 10600005 */ beqz $v1, .L802407F0 -/* 87559C 802407DC 24020001 */ addiu $v0, $zero, 1 -/* 8755A0 802407E0 10620024 */ beq $v1, $v0, .L80240874 -/* 8755A4 802407E4 00000000 */ nop -/* 8755A8 802407E8 08090233 */ j .L802408CC -/* 8755AC 802407EC 00000000 */ nop -.L802407F0: -/* 8755B0 802407F0 3C013FC9 */ lui $at, 0x3fc9 -/* 8755B4 802407F4 34210FD8 */ ori $at, $at, 0xfd8 -/* 8755B8 802407F8 44810000 */ mtc1 $at, $f0 -/* 8755BC 802407FC C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8755C0 80240800 46806320 */ cvt.s.w $f12, $f12 -/* 8755C4 80240804 46006302 */ mul.s $f12, $f12, $f0 -/* 8755C8 80240808 00000000 */ nop -/* 8755CC 8024080C 3C0141F0 */ lui $at, 0x41f0 -/* 8755D0 80240810 44810000 */ mtc1 $at, $f0 -/* 8755D4 80240814 0C00A874 */ jal cos_rad -/* 8755D8 80240818 46006303 */ div.s $f12, $f12, $f0 -/* 8755DC 8024081C 3C013F80 */ lui $at, 0x3f80 -/* 8755E0 80240820 44811000 */ mtc1 $at, $f2 -/* 8755E4 80240824 00000000 */ nop -/* 8755E8 80240828 46001081 */ sub.s $f2, $f2, $f0 -/* 8755EC 8024082C 3C0141A0 */ lui $at, 0x41a0 -/* 8755F0 80240830 44810000 */ mtc1 $at, $f0 -/* 8755F4 80240834 00000000 */ nop -/* 8755F8 80240838 46001082 */ mul.s $f2, $f2, $f0 -/* 8755FC 8024083C 00000000 */ nop -/* 875600 80240840 C6200078 */ lwc1 $f0, 0x78($s1) -/* 875604 80240844 46020000 */ add.s $f0, $f0, $f2 -/* 875608 80240848 E640000C */ swc1 $f0, 0xc($s2) -/* 87560C 8024084C 8E23007C */ lw $v1, 0x7c($s1) -/* 875610 80240850 2402001E */ addiu $v0, $zero, 0x1e -/* 875614 80240854 14620005 */ bne $v1, $v0, .L8024086C -/* 875618 80240858 24620001 */ addiu $v0, $v1, 1 -/* 87561C 8024085C 24020001 */ addiu $v0, $zero, 1 -/* 875620 80240860 AE220074 */ sw $v0, 0x74($s1) -/* 875624 80240864 08090233 */ j .L802408CC -/* 875628 80240868 AE20007C */ sw $zero, 0x7c($s1) -.L8024086C: -/* 87562C 8024086C 08090233 */ j .L802408CC -/* 875630 80240870 AE22007C */ sw $v0, 0x7c($s1) -.L80240874: -/* 875634 80240874 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 875638 80240878 0C00A8D4 */ jal cos_deg -/* 87563C 8024087C 46806320 */ cvt.s.w $f12, $f12 -/* 875640 80240880 3C014040 */ lui $at, 0x4040 -/* 875644 80240884 44811000 */ mtc1 $at, $f2 -/* 875648 80240888 00000000 */ nop -/* 87564C 8024088C 46020002 */ mul.s $f0, $f0, $f2 -/* 875650 80240890 00000000 */ nop -/* 875654 80240894 3C014188 */ lui $at, 0x4188 -/* 875658 80240898 44812000 */ mtc1 $at, $f4 -/* 87565C 8024089C C6220078 */ lwc1 $f2, 0x78($s1) -/* 875660 802408A0 46041080 */ add.s $f2, $f2, $f4 -/* 875664 802408A4 46001080 */ add.s $f2, $f2, $f0 -/* 875668 802408A8 E642000C */ swc1 $f2, 0xc($s2) -/* 87566C 802408AC 8E22007C */ lw $v0, 0x7c($s1) -/* 875670 802408B0 24420009 */ addiu $v0, $v0, 9 -/* 875674 802408B4 44826000 */ mtc1 $v0, $f12 -/* 875678 802408B8 00000000 */ nop -/* 87567C 802408BC 0C00A6C9 */ jal clamp_angle -/* 875680 802408C0 46806320 */ cvt.s.w $f12, $f12 -/* 875684 802408C4 4600018D */ trunc.w.s $f6, $f0 -/* 875688 802408C8 E626007C */ swc1 $f6, 0x7c($s1) -.L802408CC: -/* 87568C 802408CC 8FBF001C */ lw $ra, 0x1c($sp) -/* 875690 802408D0 8FB20018 */ lw $s2, 0x18($sp) -/* 875694 802408D4 8FB10014 */ lw $s1, 0x14($sp) -/* 875698 802408D8 8FB00010 */ lw $s0, 0x10($sp) -/* 87569C 802408DC 0000102D */ daddu $v0, $zero, $zero -/* 8756A0 802408E0 03E00008 */ jr $ra -/* 8756A4 802408E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s new file mode 100644 index 0000000000..08bffd2ae2 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240798_875558.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240798_875558 +/* 875558 80240798 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 87555C 8024079C AFB10014 */ sw $s1, 0x14($sp) +/* 875560 802407A0 0080882D */ daddu $s1, $a0, $zero +/* 875564 802407A4 AFBF001C */ sw $ra, 0x1c($sp) +/* 875568 802407A8 AFB20018 */ sw $s2, 0x18($sp) +/* 87556C 802407AC AFB00010 */ sw $s0, 0x10($sp) +/* 875570 802407B0 8E240084 */ lw $a0, 0x84($s1) +/* 875574 802407B4 0C04C3D6 */ jal get_item_entity +/* 875578 802407B8 00A0802D */ daddu $s0, $a1, $zero +/* 87557C 802407BC 12000005 */ beqz $s0, .L802407D4 +/* 875580 802407C0 0040902D */ daddu $s2, $v0, $zero +/* 875584 802407C4 C640000C */ lwc1 $f0, 0xc($s2) +/* 875588 802407C8 AE200074 */ sw $zero, 0x74($s1) +/* 87558C 802407CC AE20007C */ sw $zero, 0x7c($s1) +/* 875590 802407D0 E6200078 */ swc1 $f0, 0x78($s1) +.L802407D4: +/* 875594 802407D4 8E230074 */ lw $v1, 0x74($s1) +/* 875598 802407D8 10600005 */ beqz $v1, .L802407F0 +/* 87559C 802407DC 24020001 */ addiu $v0, $zero, 1 +/* 8755A0 802407E0 10620024 */ beq $v1, $v0, .L80240874 +/* 8755A4 802407E4 00000000 */ nop +/* 8755A8 802407E8 08090233 */ j .L802408CC +/* 8755AC 802407EC 00000000 */ nop +.L802407F0: +/* 8755B0 802407F0 3C013FC9 */ lui $at, 0x3fc9 +/* 8755B4 802407F4 34210FD8 */ ori $at, $at, 0xfd8 +/* 8755B8 802407F8 44810000 */ mtc1 $at, $f0 +/* 8755BC 802407FC C62C007C */ lwc1 $f12, 0x7c($s1) +/* 8755C0 80240800 46806320 */ cvt.s.w $f12, $f12 +/* 8755C4 80240804 46006302 */ mul.s $f12, $f12, $f0 +/* 8755C8 80240808 00000000 */ nop +/* 8755CC 8024080C 3C0141F0 */ lui $at, 0x41f0 +/* 8755D0 80240810 44810000 */ mtc1 $at, $f0 +/* 8755D4 80240814 0C00A874 */ jal cos_rad +/* 8755D8 80240818 46006303 */ div.s $f12, $f12, $f0 +/* 8755DC 8024081C 3C013F80 */ lui $at, 0x3f80 +/* 8755E0 80240820 44811000 */ mtc1 $at, $f2 +/* 8755E4 80240824 00000000 */ nop +/* 8755E8 80240828 46001081 */ sub.s $f2, $f2, $f0 +/* 8755EC 8024082C 3C0141A0 */ lui $at, 0x41a0 +/* 8755F0 80240830 44810000 */ mtc1 $at, $f0 +/* 8755F4 80240834 00000000 */ nop +/* 8755F8 80240838 46001082 */ mul.s $f2, $f2, $f0 +/* 8755FC 8024083C 00000000 */ nop +/* 875600 80240840 C6200078 */ lwc1 $f0, 0x78($s1) +/* 875604 80240844 46020000 */ add.s $f0, $f0, $f2 +/* 875608 80240848 E640000C */ swc1 $f0, 0xc($s2) +/* 87560C 8024084C 8E23007C */ lw $v1, 0x7c($s1) +/* 875610 80240850 2402001E */ addiu $v0, $zero, 0x1e +/* 875614 80240854 14620005 */ bne $v1, $v0, .L8024086C +/* 875618 80240858 24620001 */ addiu $v0, $v1, 1 +/* 87561C 8024085C 24020001 */ addiu $v0, $zero, 1 +/* 875620 80240860 AE220074 */ sw $v0, 0x74($s1) +/* 875624 80240864 08090233 */ j .L802408CC +/* 875628 80240868 AE20007C */ sw $zero, 0x7c($s1) +.L8024086C: +/* 87562C 8024086C 08090233 */ j .L802408CC +/* 875630 80240870 AE22007C */ sw $v0, 0x7c($s1) +.L80240874: +/* 875634 80240874 C62C007C */ lwc1 $f12, 0x7c($s1) +/* 875638 80240878 0C00A8D4 */ jal cos_deg +/* 87563C 8024087C 46806320 */ cvt.s.w $f12, $f12 +/* 875640 80240880 3C014040 */ lui $at, 0x4040 +/* 875644 80240884 44811000 */ mtc1 $at, $f2 +/* 875648 80240888 00000000 */ nop +/* 87564C 8024088C 46020002 */ mul.s $f0, $f0, $f2 +/* 875650 80240890 00000000 */ nop +/* 875654 80240894 3C014188 */ lui $at, 0x4188 +/* 875658 80240898 44812000 */ mtc1 $at, $f4 +/* 87565C 8024089C C6220078 */ lwc1 $f2, 0x78($s1) +/* 875660 802408A0 46041080 */ add.s $f2, $f2, $f4 +/* 875664 802408A4 46001080 */ add.s $f2, $f2, $f0 +/* 875668 802408A8 E642000C */ swc1 $f2, 0xc($s2) +/* 87566C 802408AC 8E22007C */ lw $v0, 0x7c($s1) +/* 875670 802408B0 24420009 */ addiu $v0, $v0, 9 +/* 875674 802408B4 44826000 */ mtc1 $v0, $f12 +/* 875678 802408B8 00000000 */ nop +/* 87567C 802408BC 0C00A6C9 */ jal clamp_angle +/* 875680 802408C0 46806320 */ cvt.s.w $f12, $f12 +/* 875684 802408C4 4600018D */ trunc.w.s $f6, $f0 +/* 875688 802408C8 E626007C */ swc1 $f6, 0x7c($s1) +.L802408CC: +/* 87568C 802408CC 8FBF001C */ lw $ra, 0x1c($sp) +/* 875690 802408D0 8FB20018 */ lw $s2, 0x18($sp) +/* 875694 802408D4 8FB10014 */ lw $s1, 0x14($sp) +/* 875698 802408D8 8FB00010 */ lw $s0, 0x10($sp) +/* 87569C 802408DC 0000102D */ daddu $v0, $zero, $zero +/* 8756A0 802408E0 03E00008 */ jr $ra +/* 8756A4 802408E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8.s deleted file mode 100644 index 04c8e06d4f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408E8 -/* 8756A8 802408E8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8756AC 802408EC AFB00010 */ sw $s0, 0x10($sp) -/* 8756B0 802408F0 0080802D */ daddu $s0, $a0, $zero -/* 8756B4 802408F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8756B8 802408F8 8E02000C */ lw $v0, 0xc($s0) -/* 8756BC 802408FC 0C0B1EAF */ jal get_variable -/* 8756C0 80240900 8C450000 */ lw $a1, ($v0) -/* 8756C4 80240904 00021140 */ sll $v0, $v0, 5 -/* 8756C8 80240908 AE000084 */ sw $zero, 0x84($s0) -/* 8756CC 8024090C 3C018008 */ lui $at, 0x8008 -/* 8756D0 80240910 00220821 */ addu $at, $at, $v0 -/* 8756D4 80240914 942278F8 */ lhu $v0, 0x78f8($at) -/* 8756D8 80240918 30420040 */ andi $v0, $v0, 0x40 -/* 8756DC 8024091C 10400002 */ beqz $v0, .L80240928 -/* 8756E0 80240920 24020001 */ addiu $v0, $zero, 1 -/* 8756E4 80240924 AE020084 */ sw $v0, 0x84($s0) -.L80240928: -/* 8756E8 80240928 8FBF0014 */ lw $ra, 0x14($sp) -/* 8756EC 8024092C 8FB00010 */ lw $s0, 0x10($sp) -/* 8756F0 80240930 24020002 */ addiu $v0, $zero, 2 -/* 8756F4 80240934 03E00008 */ jr $ra -/* 8756F8 80240938 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s new file mode 100644 index 0000000000..1cf2fe6e11 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_802408E8_8756A8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408E8_8756A8 +/* 8756A8 802408E8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8756AC 802408EC AFB00010 */ sw $s0, 0x10($sp) +/* 8756B0 802408F0 0080802D */ daddu $s0, $a0, $zero +/* 8756B4 802408F4 AFBF0014 */ sw $ra, 0x14($sp) +/* 8756B8 802408F8 8E02000C */ lw $v0, 0xc($s0) +/* 8756BC 802408FC 0C0B1EAF */ jal get_variable +/* 8756C0 80240900 8C450000 */ lw $a1, ($v0) +/* 8756C4 80240904 00021140 */ sll $v0, $v0, 5 +/* 8756C8 80240908 AE000084 */ sw $zero, 0x84($s0) +/* 8756CC 8024090C 3C018008 */ lui $at, 0x8008 +/* 8756D0 80240910 00220821 */ addu $at, $at, $v0 +/* 8756D4 80240914 942278F8 */ lhu $v0, 0x78f8($at) +/* 8756D8 80240918 30420040 */ andi $v0, $v0, 0x40 +/* 8756DC 8024091C 10400002 */ beqz $v0, .L80240928 +/* 8756E0 80240920 24020001 */ addiu $v0, $zero, 1 +/* 8756E4 80240924 AE020084 */ sw $v0, 0x84($s0) +.L80240928: +/* 8756E8 80240928 8FBF0014 */ lw $ra, 0x14($sp) +/* 8756EC 8024092C 8FB00010 */ lw $s0, 0x10($sp) +/* 8756F0 80240930 24020002 */ addiu $v0, $zero, 2 +/* 8756F4 80240934 03E00008 */ jr $ra +/* 8756F8 80240938 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C.s deleted file mode 100644 index 52390f7fbb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024093C -/* 8756FC 8024093C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 875700 80240940 AFBF0010 */ sw $ra, 0x10($sp) -/* 875704 80240944 8C82000C */ lw $v0, 0xc($a0) -/* 875708 80240948 0C0B1EAF */ jal get_variable -/* 87570C 8024094C 8C450000 */ lw $a1, ($v0) -/* 875710 80240950 0C04417A */ jal get_entity_by_index -/* 875714 80240954 0040202D */ daddu $a0, $v0, $zero -/* 875718 80240958 50400007 */ beql $v0, $zero, .L80240978 -/* 87571C 8024095C 0000102D */ daddu $v0, $zero, $zero -/* 875720 80240960 84440014 */ lh $a0, 0x14($v0) -/* 875724 80240964 3C050000 */ lui $a1, 0 -/* 875728 80240968 24A501E4 */ addiu $a1, $a1, 0x1e4 -/* 87572C 8024096C 0C048052 */ jal play_model_animation -/* 875730 80240970 00000000 */ nop -/* 875734 80240974 24020002 */ addiu $v0, $zero, 2 -.L80240978: -/* 875738 80240978 8FBF0010 */ lw $ra, 0x10($sp) -/* 87573C 8024097C 03E00008 */ jr $ra -/* 875740 80240980 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C_8756FC.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C_8756FC.s new file mode 100644 index 0000000000..4815e7d91c --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_8024093C_8756FC.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024093C_8756FC +/* 8756FC 8024093C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 875700 80240940 AFBF0010 */ sw $ra, 0x10($sp) +/* 875704 80240944 8C82000C */ lw $v0, 0xc($a0) +/* 875708 80240948 0C0B1EAF */ jal get_variable +/* 87570C 8024094C 8C450000 */ lw $a1, ($v0) +/* 875710 80240950 0C04417A */ jal get_entity_by_index +/* 875714 80240954 0040202D */ daddu $a0, $v0, $zero +/* 875718 80240958 50400007 */ beql $v0, $zero, .L80240978 +/* 87571C 8024095C 0000102D */ daddu $v0, $zero, $zero +/* 875720 80240960 84440014 */ lh $a0, 0x14($v0) +/* 875724 80240964 3C050000 */ lui $a1, 0 +/* 875728 80240968 24A501E4 */ addiu $a1, $a1, 0x1e4 +/* 87572C 8024096C 0C048052 */ jal play_model_animation +/* 875730 80240970 00000000 */ nop +/* 875734 80240974 24020002 */ addiu $v0, $zero, 2 +.L80240978: +/* 875738 80240978 8FBF0010 */ lw $ra, 0x10($sp) +/* 87573C 8024097C 03E00008 */ jr $ra +/* 875740 80240980 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984.s deleted file mode 100644 index 61b6bad1cc..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240984 -/* 875744 80240984 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 875748 80240988 AFB10014 */ sw $s1, 0x14($sp) -/* 87574C 8024098C 0080882D */ daddu $s1, $a0, $zero -/* 875750 80240990 AFBF0020 */ sw $ra, 0x20($sp) -/* 875754 80240994 AFB3001C */ sw $s3, 0x1c($sp) -/* 875758 80240998 AFB20018 */ sw $s2, 0x18($sp) -/* 87575C 8024099C AFB00010 */ sw $s0, 0x10($sp) -/* 875760 802409A0 8E30000C */ lw $s0, 0xc($s1) -/* 875764 802409A4 8E050000 */ lw $a1, ($s0) -/* 875768 802409A8 0C0B1EAF */ jal get_variable -/* 87576C 802409AC 26100004 */ addiu $s0, $s0, 4 -/* 875770 802409B0 8E050000 */ lw $a1, ($s0) -/* 875774 802409B4 26100004 */ addiu $s0, $s0, 4 -/* 875778 802409B8 0220202D */ daddu $a0, $s1, $zero -/* 87577C 802409BC 0C0B1EAF */ jal get_variable -/* 875780 802409C0 0040982D */ daddu $s3, $v0, $zero -/* 875784 802409C4 8E050000 */ lw $a1, ($s0) -/* 875788 802409C8 26100004 */ addiu $s0, $s0, 4 -/* 87578C 802409CC 0220202D */ daddu $a0, $s1, $zero -/* 875790 802409D0 0C0B1EAF */ jal get_variable -/* 875794 802409D4 0040902D */ daddu $s2, $v0, $zero -/* 875798 802409D8 0220202D */ daddu $a0, $s1, $zero -/* 87579C 802409DC 8E050000 */ lw $a1, ($s0) -/* 8757A0 802409E0 0C0B1EAF */ jal get_variable -/* 8757A4 802409E4 0040882D */ daddu $s1, $v0, $zero -/* 8757A8 802409E8 0260202D */ daddu $a0, $s3, $zero -/* 8757AC 802409EC 0C04417A */ jal get_entity_by_index -/* 8757B0 802409F0 0040802D */ daddu $s0, $v0, $zero -/* 8757B4 802409F4 0040182D */ daddu $v1, $v0, $zero -/* 8757B8 802409F8 44920000 */ mtc1 $s2, $f0 -/* 8757BC 802409FC 00000000 */ nop -/* 8757C0 80240A00 46800020 */ cvt.s.w $f0, $f0 -/* 8757C4 80240A04 E4600048 */ swc1 $f0, 0x48($v1) -/* 8757C8 80240A08 44910000 */ mtc1 $s1, $f0 -/* 8757CC 80240A0C 00000000 */ nop -/* 8757D0 80240A10 46800020 */ cvt.s.w $f0, $f0 -/* 8757D4 80240A14 E460004C */ swc1 $f0, 0x4c($v1) -/* 8757D8 80240A18 44900000 */ mtc1 $s0, $f0 -/* 8757DC 80240A1C 00000000 */ nop -/* 8757E0 80240A20 46800020 */ cvt.s.w $f0, $f0 -/* 8757E4 80240A24 E4600050 */ swc1 $f0, 0x50($v1) -/* 8757E8 80240A28 8FBF0020 */ lw $ra, 0x20($sp) -/* 8757EC 80240A2C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8757F0 80240A30 8FB20018 */ lw $s2, 0x18($sp) -/* 8757F4 80240A34 8FB10014 */ lw $s1, 0x14($sp) -/* 8757F8 80240A38 8FB00010 */ lw $s0, 0x10($sp) -/* 8757FC 80240A3C 24020002 */ addiu $v0, $zero, 2 -/* 875800 80240A40 03E00008 */ jr $ra -/* 875804 80240A44 27BD0028 */ addiu $sp, $sp, 0x28 -/* 875808 80240A48 00000000 */ nop -/* 87580C 80240A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s new file mode 100644 index 0000000000..4e45c28b13 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_05/8750D0/func_80240984_875744.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240984_875744 +/* 875744 80240984 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 875748 80240988 AFB10014 */ sw $s1, 0x14($sp) +/* 87574C 8024098C 0080882D */ daddu $s1, $a0, $zero +/* 875750 80240990 AFBF0020 */ sw $ra, 0x20($sp) +/* 875754 80240994 AFB3001C */ sw $s3, 0x1c($sp) +/* 875758 80240998 AFB20018 */ sw $s2, 0x18($sp) +/* 87575C 8024099C AFB00010 */ sw $s0, 0x10($sp) +/* 875760 802409A0 8E30000C */ lw $s0, 0xc($s1) +/* 875764 802409A4 8E050000 */ lw $a1, ($s0) +/* 875768 802409A8 0C0B1EAF */ jal get_variable +/* 87576C 802409AC 26100004 */ addiu $s0, $s0, 4 +/* 875770 802409B0 8E050000 */ lw $a1, ($s0) +/* 875774 802409B4 26100004 */ addiu $s0, $s0, 4 +/* 875778 802409B8 0220202D */ daddu $a0, $s1, $zero +/* 87577C 802409BC 0C0B1EAF */ jal get_variable +/* 875780 802409C0 0040982D */ daddu $s3, $v0, $zero +/* 875784 802409C4 8E050000 */ lw $a1, ($s0) +/* 875788 802409C8 26100004 */ addiu $s0, $s0, 4 +/* 87578C 802409CC 0220202D */ daddu $a0, $s1, $zero +/* 875790 802409D0 0C0B1EAF */ jal get_variable +/* 875794 802409D4 0040902D */ daddu $s2, $v0, $zero +/* 875798 802409D8 0220202D */ daddu $a0, $s1, $zero +/* 87579C 802409DC 8E050000 */ lw $a1, ($s0) +/* 8757A0 802409E0 0C0B1EAF */ jal get_variable +/* 8757A4 802409E4 0040882D */ daddu $s1, $v0, $zero +/* 8757A8 802409E8 0260202D */ daddu $a0, $s3, $zero +/* 8757AC 802409EC 0C04417A */ jal get_entity_by_index +/* 8757B0 802409F0 0040802D */ daddu $s0, $v0, $zero +/* 8757B4 802409F4 0040182D */ daddu $v1, $v0, $zero +/* 8757B8 802409F8 44920000 */ mtc1 $s2, $f0 +/* 8757BC 802409FC 00000000 */ nop +/* 8757C0 80240A00 46800020 */ cvt.s.w $f0, $f0 +/* 8757C4 80240A04 E4600048 */ swc1 $f0, 0x48($v1) +/* 8757C8 80240A08 44910000 */ mtc1 $s1, $f0 +/* 8757CC 80240A0C 00000000 */ nop +/* 8757D0 80240A10 46800020 */ cvt.s.w $f0, $f0 +/* 8757D4 80240A14 E460004C */ swc1 $f0, 0x4c($v1) +/* 8757D8 80240A18 44900000 */ mtc1 $s0, $f0 +/* 8757DC 80240A1C 00000000 */ nop +/* 8757E0 80240A20 46800020 */ cvt.s.w $f0, $f0 +/* 8757E4 80240A24 E4600050 */ swc1 $f0, 0x50($v1) +/* 8757E8 80240A28 8FBF0020 */ lw $ra, 0x20($sp) +/* 8757EC 80240A2C 8FB3001C */ lw $s3, 0x1c($sp) +/* 8757F0 80240A30 8FB20018 */ lw $s2, 0x18($sp) +/* 8757F4 80240A34 8FB10014 */ lw $s1, 0x14($sp) +/* 8757F8 80240A38 8FB00010 */ lw $s0, 0x10($sp) +/* 8757FC 80240A3C 24020002 */ addiu $v0, $zero, 2 +/* 875800 80240A40 03E00008 */ jr $ra +/* 875804 80240A44 27BD0028 */ addiu $sp, $sp, 0x28 +/* 875808 80240A48 00000000 */ nop +/* 87580C 80240A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC.s deleted file mode 100644 index 88b5502677..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402FC -/* 879EDC 802402FC 3C02800A */ lui $v0, %hi(D_8009A650) -/* 879EE0 80240300 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 879EE4 80240304 8C430000 */ lw $v1, ($v0) -/* 879EE8 80240308 2404FFBF */ addiu $a0, $zero, -0x41 -/* 879EEC 8024030C 00641824 */ and $v1, $v1, $a0 -/* 879EF0 80240310 AC430000 */ sw $v1, ($v0) -/* 879EF4 80240314 03E00008 */ jr $ra -/* 879EF8 80240318 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC_879EDC.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC_879EDC.s new file mode 100644 index 0000000000..c116bea45e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802402FC_879EDC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402FC_879EDC +/* 879EDC 802402FC 3C02800A */ lui $v0, %hi(D_8009A650) +/* 879EE0 80240300 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* 879EE4 80240304 8C430000 */ lw $v1, ($v0) +/* 879EE8 80240308 2404FFBF */ addiu $a0, $zero, -0x41 +/* 879EEC 8024030C 00641824 */ and $v1, $v1, $a0 +/* 879EF0 80240310 AC430000 */ sw $v1, ($v0) +/* 879EF4 80240314 03E00008 */ jr $ra +/* 879EF8 80240318 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024031C.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024031C.s deleted file mode 100644 index 0aa3afadf0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024031C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024031C -/* 879EFC 8024031C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 879F00 80240320 AFBF0010 */ sw $ra, 0x10($sp) -/* 879F04 80240324 8C82000C */ lw $v0, 0xc($a0) -/* 879F08 80240328 0C0B1EAF */ jal get_variable -/* 879F0C 8024032C 8C450000 */ lw $a1, ($v0) -/* 879F10 80240330 0C0B95A4 */ jal func_802E5690 -/* 879F14 80240334 0040202D */ daddu $a0, $v0, $zero -/* 879F18 80240338 8FBF0010 */ lw $ra, 0x10($sp) -/* 879F1C 8024033C 24020002 */ addiu $v0, $zero, 2 -/* 879F20 80240340 03E00008 */ jr $ra -/* 879F24 80240344 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024031C_879EFC.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024031C_879EFC.s new file mode 100644 index 0000000000..36b1a1335c --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_8024031C_879EFC.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024031C_879EFC +/* 879EFC 8024031C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 879F00 80240320 AFBF0010 */ sw $ra, 0x10($sp) +/* 879F04 80240324 8C82000C */ lw $v0, 0xc($a0) +/* 879F08 80240328 0C0B1EAF */ jal get_variable +/* 879F0C 8024032C 8C450000 */ lw $a1, ($v0) +/* 879F10 80240330 0C0B95A4 */ jal func_802E5690 +/* 879F14 80240334 0040202D */ daddu $a0, $v0, $zero +/* 879F18 80240338 8FBF0010 */ lw $ra, 0x10($sp) +/* 879F1C 8024033C 24020002 */ addiu $v0, $zero, 2 +/* 879F20 80240340 03E00008 */ jr $ra +/* 879F24 80240344 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348.s deleted file mode 100644 index 9386f25cb5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240348 -/* 879F28 80240348 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 879F2C 8024034C AFB00010 */ sw $s0, 0x10($sp) -/* 879F30 80240350 0080802D */ daddu $s0, $a0, $zero -/* 879F34 80240354 AFBF0018 */ sw $ra, 0x18($sp) -/* 879F38 80240358 AFB10014 */ sw $s1, 0x14($sp) -/* 879F3C 8024035C 8E11000C */ lw $s1, 0xc($s0) -/* 879F40 80240360 8E250000 */ lw $a1, ($s1) -/* 879F44 80240364 0C0B1EAF */ jal get_variable -/* 879F48 80240368 26310004 */ addiu $s1, $s1, 4 -/* 879F4C 8024036C 0200202D */ daddu $a0, $s0, $zero -/* 879F50 80240370 3C038011 */ lui $v1, %hi(gPlayerData) -/* 879F54 80240374 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 879F58 80240378 000210C0 */ sll $v0, $v0, 3 -/* 879F5C 8024037C 00431021 */ addu $v0, $v0, $v1 -/* 879F60 80240380 90460015 */ lbu $a2, 0x15($v0) -/* 879F64 80240384 8E250000 */ lw $a1, ($s1) -/* 879F68 80240388 24C60001 */ addiu $a2, $a2, 1 -/* 879F6C 8024038C A0460015 */ sb $a2, 0x15($v0) -/* 879F70 80240390 00063600 */ sll $a2, $a2, 0x18 -/* 879F74 80240394 0C0B2026 */ jal set_variable -/* 879F78 80240398 00063603 */ sra $a2, $a2, 0x18 -/* 879F7C 8024039C 8FBF0018 */ lw $ra, 0x18($sp) -/* 879F80 802403A0 8FB10014 */ lw $s1, 0x14($sp) -/* 879F84 802403A4 8FB00010 */ lw $s0, 0x10($sp) -/* 879F88 802403A8 24020002 */ addiu $v0, $zero, 2 -/* 879F8C 802403AC 03E00008 */ jr $ra -/* 879F90 802403B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348_879F28.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348_879F28.s new file mode 100644 index 0000000000..8e7bf9f98a --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240348_879F28.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240348_879F28 +/* 879F28 80240348 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 879F2C 8024034C AFB00010 */ sw $s0, 0x10($sp) +/* 879F30 80240350 0080802D */ daddu $s0, $a0, $zero +/* 879F34 80240354 AFBF0018 */ sw $ra, 0x18($sp) +/* 879F38 80240358 AFB10014 */ sw $s1, 0x14($sp) +/* 879F3C 8024035C 8E11000C */ lw $s1, 0xc($s0) +/* 879F40 80240360 8E250000 */ lw $a1, ($s1) +/* 879F44 80240364 0C0B1EAF */ jal get_variable +/* 879F48 80240368 26310004 */ addiu $s1, $s1, 4 +/* 879F4C 8024036C 0200202D */ daddu $a0, $s0, $zero +/* 879F50 80240370 3C038011 */ lui $v1, %hi(gPlayerData) +/* 879F54 80240374 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 879F58 80240378 000210C0 */ sll $v0, $v0, 3 +/* 879F5C 8024037C 00431021 */ addu $v0, $v0, $v1 +/* 879F60 80240380 90460015 */ lbu $a2, 0x15($v0) +/* 879F64 80240384 8E250000 */ lw $a1, ($s1) +/* 879F68 80240388 24C60001 */ addiu $a2, $a2, 1 +/* 879F6C 8024038C A0460015 */ sb $a2, 0x15($v0) +/* 879F70 80240390 00063600 */ sll $a2, $a2, 0x18 +/* 879F74 80240394 0C0B2026 */ jal set_variable +/* 879F78 80240398 00063603 */ sra $a2, $a2, 0x18 +/* 879F7C 8024039C 8FBF0018 */ lw $ra, 0x18($sp) +/* 879F80 802403A0 8FB10014 */ lw $s1, 0x14($sp) +/* 879F84 802403A4 8FB00010 */ lw $s0, 0x10($sp) +/* 879F88 802403A8 24020002 */ addiu $v0, $zero, 2 +/* 879F8C 802403AC 03E00008 */ jr $ra +/* 879F90 802403B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4.s deleted file mode 100644 index febebd1968..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403B4 -/* 879F94 802403B4 3C028011 */ lui $v0, %hi(gPlayerData) -/* 879F98 802403B8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 879F9C 802403BC 000420C0 */ sll $a0, $a0, 3 -/* 879FA0 802403C0 00822021 */ addu $a0, $a0, $v0 -/* 879FA4 802403C4 90820014 */ lbu $v0, 0x14($a0) -/* 879FA8 802403C8 10400009 */ beqz $v0, .L802403F0 -/* 879FAC 802403CC 00000000 */ nop -/* 879FB0 802403D0 90820015 */ lbu $v0, 0x15($a0) -/* 879FB4 802403D4 00022600 */ sll $a0, $v0, 0x18 -/* 879FB8 802403D8 00041E03 */ sra $v1, $a0, 0x18 -/* 879FBC 802403DC 00051400 */ sll $v0, $a1, 0x10 -/* 879FC0 802403E0 00021403 */ sra $v0, $v0, 0x10 -/* 879FC4 802403E4 0043102A */ slt $v0, $v0, $v1 -/* 879FC8 802403E8 10400003 */ beqz $v0, .L802403F8 -/* 879FCC 802403EC 00000000 */ nop -.L802403F0: -/* 879FD0 802403F0 03E00008 */ jr $ra -/* 879FD4 802403F4 2402FFFF */ addiu $v0, $zero, -1 -.L802403F8: -/* 879FD8 802403F8 03E00008 */ jr $ra -/* 879FDC 802403FC 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s new file mode 100644 index 0000000000..b45ce95b76 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802403B4_879F94.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403B4_879F94 +/* 879F94 802403B4 3C028011 */ lui $v0, %hi(gPlayerData) +/* 879F98 802403B8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 879F9C 802403BC 000420C0 */ sll $a0, $a0, 3 +/* 879FA0 802403C0 00822021 */ addu $a0, $a0, $v0 +/* 879FA4 802403C4 90820014 */ lbu $v0, 0x14($a0) +/* 879FA8 802403C8 10400009 */ beqz $v0, .L802403F0 +/* 879FAC 802403CC 00000000 */ nop +/* 879FB0 802403D0 90820015 */ lbu $v0, 0x15($a0) +/* 879FB4 802403D4 00022600 */ sll $a0, $v0, 0x18 +/* 879FB8 802403D8 00041E03 */ sra $v1, $a0, 0x18 +/* 879FBC 802403DC 00051400 */ sll $v0, $a1, 0x10 +/* 879FC0 802403E0 00021403 */ sra $v0, $v0, 0x10 +/* 879FC4 802403E4 0043102A */ slt $v0, $v0, $v1 +/* 879FC8 802403E8 10400003 */ beqz $v0, .L802403F8 +/* 879FCC 802403EC 00000000 */ nop +.L802403F0: +/* 879FD0 802403F0 03E00008 */ jr $ra +/* 879FD4 802403F4 2402FFFF */ addiu $v0, $zero, -1 +.L802403F8: +/* 879FD8 802403F8 03E00008 */ jr $ra +/* 879FDC 802403FC 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400.s deleted file mode 100644 index 4b4ad42a69..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240400 -/* 879FE0 80240400 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 879FE4 80240404 AFB3001C */ sw $s3, 0x1c($sp) -/* 879FE8 80240408 0080982D */ daddu $s3, $a0, $zero -/* 879FEC 8024040C AFB00010 */ sw $s0, 0x10($sp) -/* 879FF0 80240410 24100001 */ addiu $s0, $zero, 1 -/* 879FF4 80240414 AFB40020 */ sw $s4, 0x20($sp) -/* 879FF8 80240418 2414FFFF */ addiu $s4, $zero, -1 -/* 879FFC 8024041C AFB50024 */ sw $s5, 0x24($sp) -/* 87A000 80240420 0200A82D */ daddu $s5, $s0, $zero -/* 87A004 80240424 AFB10014 */ sw $s1, 0x14($sp) -/* 87A008 80240428 3C118011 */ lui $s1, 0x8011 -/* 87A00C 8024042C 2631F298 */ addiu $s1, $s1, -0xd68 -/* 87A010 80240430 AFBF0028 */ sw $ra, 0x28($sp) -/* 87A014 80240434 AFB20018 */ sw $s2, 0x18($sp) -/* 87A018 80240438 8E6200B4 */ lw $v0, 0xb4($s3) -/* 87A01C 8024043C 0280182D */ daddu $v1, $s4, $zero -/* 87A020 80240440 AE630084 */ sw $v1, 0x84($s3) -/* 87A024 80240444 00021027 */ nor $v0, $zero, $v0 -/* 87A028 80240448 000217C2 */ srl $v0, $v0, 0x1f -/* 87A02C 8024044C 00029400 */ sll $s2, $v0, 0x10 -.L80240450: -/* 87A030 80240450 92220014 */ lbu $v0, 0x14($s1) -/* 87A034 80240454 50400008 */ beql $v0, $zero, .L80240478 -/* 87A038 80240458 26100001 */ addiu $s0, $s0, 1 -/* 87A03C 8024045C 0200202D */ daddu $a0, $s0, $zero -/* 87A040 80240460 0C0900ED */ jal func_802403B4 -/* 87A044 80240464 00122C03 */ sra $a1, $s2, 0x10 -/* 87A048 80240468 10540003 */ beq $v0, $s4, .L80240478 -/* 87A04C 8024046C 26100001 */ addiu $s0, $s0, 1 -/* 87A050 80240470 08090121 */ j .L80240484 -/* 87A054 80240474 AE750084 */ sw $s5, 0x84($s3) -.L80240478: -/* 87A058 80240478 2A02000C */ slti $v0, $s0, 0xc -/* 87A05C 8024047C 1440FFF4 */ bnez $v0, .L80240450 -/* 87A060 80240480 26310008 */ addiu $s1, $s1, 8 -.L80240484: -/* 87A064 80240484 8FBF0028 */ lw $ra, 0x28($sp) -/* 87A068 80240488 8FB50024 */ lw $s5, 0x24($sp) -/* 87A06C 8024048C 8FB40020 */ lw $s4, 0x20($sp) -/* 87A070 80240490 8FB3001C */ lw $s3, 0x1c($sp) -/* 87A074 80240494 8FB20018 */ lw $s2, 0x18($sp) -/* 87A078 80240498 8FB10014 */ lw $s1, 0x14($sp) -/* 87A07C 8024049C 8FB00010 */ lw $s0, 0x10($sp) -/* 87A080 802404A0 24020002 */ addiu $v0, $zero, 2 -/* 87A084 802404A4 03E00008 */ jr $ra -/* 87A088 802404A8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s new file mode 100644 index 0000000000..f012d08dc5 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240400_879FE0 +/* 879FE0 80240400 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 879FE4 80240404 AFB3001C */ sw $s3, 0x1c($sp) +/* 879FE8 80240408 0080982D */ daddu $s3, $a0, $zero +/* 879FEC 8024040C AFB00010 */ sw $s0, 0x10($sp) +/* 879FF0 80240410 24100001 */ addiu $s0, $zero, 1 +/* 879FF4 80240414 AFB40020 */ sw $s4, 0x20($sp) +/* 879FF8 80240418 2414FFFF */ addiu $s4, $zero, -1 +/* 879FFC 8024041C AFB50024 */ sw $s5, 0x24($sp) +/* 87A000 80240420 0200A82D */ daddu $s5, $s0, $zero +/* 87A004 80240424 AFB10014 */ sw $s1, 0x14($sp) +/* 87A008 80240428 3C118011 */ lui $s1, 0x8011 +/* 87A00C 8024042C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 87A010 80240430 AFBF0028 */ sw $ra, 0x28($sp) +/* 87A014 80240434 AFB20018 */ sw $s2, 0x18($sp) +/* 87A018 80240438 8E6200B4 */ lw $v0, 0xb4($s3) +/* 87A01C 8024043C 0280182D */ daddu $v1, $s4, $zero +/* 87A020 80240440 AE630084 */ sw $v1, 0x84($s3) +/* 87A024 80240444 00021027 */ nor $v0, $zero, $v0 +/* 87A028 80240448 000217C2 */ srl $v0, $v0, 0x1f +/* 87A02C 8024044C 00029400 */ sll $s2, $v0, 0x10 +.L80240450: +/* 87A030 80240450 92220014 */ lbu $v0, 0x14($s1) +/* 87A034 80240454 50400008 */ beql $v0, $zero, .L80240478 +/* 87A038 80240458 26100001 */ addiu $s0, $s0, 1 +/* 87A03C 8024045C 0200202D */ daddu $a0, $s0, $zero +/* 87A040 80240460 0C0900ED */ jal func_802403B4_879F94 +/* 87A044 80240464 00122C03 */ sra $a1, $s2, 0x10 +/* 87A048 80240468 10540003 */ beq $v0, $s4, .L80240478 +/* 87A04C 8024046C 26100001 */ addiu $s0, $s0, 1 +/* 87A050 80240470 08090121 */ j .L80240484 +/* 87A054 80240474 AE750084 */ sw $s5, 0x84($s3) +.L80240478: +/* 87A058 80240478 2A02000C */ slti $v0, $s0, 0xc +/* 87A05C 8024047C 1440FFF4 */ bnez $v0, .L80240450 +/* 87A060 80240480 26310008 */ addiu $s1, $s1, 8 +.L80240484: +/* 87A064 80240484 8FBF0028 */ lw $ra, 0x28($sp) +/* 87A068 80240488 8FB50024 */ lw $s5, 0x24($sp) +/* 87A06C 8024048C 8FB40020 */ lw $s4, 0x20($sp) +/* 87A070 80240490 8FB3001C */ lw $s3, 0x1c($sp) +/* 87A074 80240494 8FB20018 */ lw $s2, 0x18($sp) +/* 87A078 80240498 8FB10014 */ lw $s1, 0x14($sp) +/* 87A07C 8024049C 8FB00010 */ lw $s0, 0x10($sp) +/* 87A080 802404A0 24020002 */ addiu $v0, $zero, 2 +/* 87A084 802404A4 03E00008 */ jr $ra +/* 87A088 802404A8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC.s deleted file mode 100644 index e63d03d8ec..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404AC -/* 87A08C 802404AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 87A090 802404B0 AFB5002C */ sw $s5, 0x2c($sp) -/* 87A094 802404B4 0080A82D */ daddu $s5, $a0, $zero -/* 87A098 802404B8 AFBE0038 */ sw $fp, 0x38($sp) -/* 87A09C 802404BC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 87A0A0 802404C0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 87A0A4 802404C4 AFBF003C */ sw $ra, 0x3c($sp) -/* 87A0A8 802404C8 AFB70034 */ sw $s7, 0x34($sp) -/* 87A0AC 802404CC AFB60030 */ sw $s6, 0x30($sp) -/* 87A0B0 802404D0 AFB40028 */ sw $s4, 0x28($sp) -/* 87A0B4 802404D4 AFB30024 */ sw $s3, 0x24($sp) -/* 87A0B8 802404D8 AFB20020 */ sw $s2, 0x20($sp) -/* 87A0BC 802404DC AFB1001C */ sw $s1, 0x1c($sp) -/* 87A0C0 802404E0 10A0004F */ beqz $a1, .L80240620 -/* 87A0C4 802404E4 AFB00018 */ sw $s0, 0x18($sp) -/* 87A0C8 802404E8 0C00AB39 */ jal heap_malloc -/* 87A0CC 802404EC 24040330 */ addiu $a0, $zero, 0x330 -/* 87A0D0 802404F0 0040982D */ daddu $s3, $v0, $zero -/* 87A0D4 802404F4 0000B02D */ daddu $s6, $zero, $zero -/* 87A0D8 802404F8 02C0902D */ daddu $s2, $s6, $zero -/* 87A0DC 802404FC 3C148024 */ lui $s4, 0x8024 -/* 87A0E0 80240500 269439F8 */ addiu $s4, $s4, 0x39f8 -/* 87A0E4 80240504 0260882D */ daddu $s1, $s3, $zero -/* 87A0E8 80240508 8EA200B4 */ lw $v0, 0xb4($s5) -/* 87A0EC 8024050C 3C038024 */ lui $v1, 0x8024 -/* 87A0F0 80240510 246339F0 */ addiu $v1, $v1, 0x39f0 -/* 87A0F4 80240514 AEB30078 */ sw $s3, 0x78($s5) -/* 87A0F8 80240518 00021027 */ nor $v0, $zero, $v0 -/* 87A0FC 8024051C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 87A100 80240520 00171080 */ sll $v0, $s7, 2 -/* 87A104 80240524 00431021 */ addu $v0, $v0, $v1 -/* 87A108 80240528 AFA20010 */ sw $v0, 0x10($sp) -.L8024052C: -/* 87A10C 8024052C 86900000 */ lh $s0, ($s4) -/* 87A110 80240530 001010C0 */ sll $v0, $s0, 3 -/* 87A114 80240534 03C21021 */ addu $v0, $fp, $v0 -/* 87A118 80240538 90420014 */ lbu $v0, 0x14($v0) -/* 87A11C 8024053C 5040002E */ beql $v0, $zero, .L802405F8 -/* 87A120 80240540 26520001 */ addiu $s2, $s2, 1 -/* 87A124 80240544 00101100 */ sll $v0, $s0, 4 -/* 87A128 80240548 3C068009 */ lui $a2, 0x8009 -/* 87A12C 8024054C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* 87A130 80240550 00461021 */ addu $v0, $v0, $a2 -/* 87A134 80240554 0200202D */ daddu $a0, $s0, $zero -/* 87A138 80240558 AE300108 */ sw $s0, 0x108($s1) -/* 87A13C 8024055C 8C420000 */ lw $v0, ($v0) -/* 87A140 80240560 02E0282D */ daddu $a1, $s7, $zero -/* 87A144 80240564 0C0900ED */ jal func_802403B4 -/* 87A148 80240568 AE220084 */ sw $v0, 0x84($s1) -/* 87A14C 8024056C 0040202D */ daddu $a0, $v0, $zero -/* 87A150 80240570 04800011 */ bltz $a0, .L802405B8 -/* 87A154 80240574 00101080 */ sll $v0, $s0, 2 -/* 87A158 80240578 3C06800F */ lui $a2, 0x800f -/* 87A15C 8024057C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* 87A160 80240580 00461021 */ addu $v0, $v0, $a2 -/* 87A164 80240584 8C430000 */ lw $v1, ($v0) -/* 87A168 80240588 24020001 */ addiu $v0, $zero, 1 -/* 87A16C 8024058C AE22018C */ sw $v0, 0x18c($s1) -/* 87A170 80240590 00041080 */ sll $v0, $a0, 2 -/* 87A174 80240594 3C068024 */ lui $a2, 0x8024 -/* 87A178 80240598 24C63A08 */ addiu $a2, $a2, 0x3a08 -/* 87A17C 8024059C AE230000 */ sw $v1, ($s1) -/* 87A180 802405A0 001218C0 */ sll $v1, $s2, 3 -/* 87A184 802405A4 00431021 */ addu $v0, $v0, $v1 -/* 87A188 802405A8 00461021 */ addu $v0, $v0, $a2 -/* 87A18C 802405AC 8C420000 */ lw $v0, ($v0) -/* 87A190 802405B0 08090177 */ j .L802405DC -/* 87A194 802405B4 AE220294 */ sw $v0, 0x294($s1) -.L802405B8: -/* 87A198 802405B8 3C06800F */ lui $a2, 0x800f -/* 87A19C 802405BC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* 87A1A0 802405C0 00461021 */ addu $v0, $v0, $a2 -/* 87A1A4 802405C4 8C420000 */ lw $v0, ($v0) -/* 87A1A8 802405C8 AE20018C */ sw $zero, 0x18c($s1) -/* 87A1AC 802405CC AE220000 */ sw $v0, ($s1) -/* 87A1B0 802405D0 8FA60010 */ lw $a2, 0x10($sp) -/* 87A1B4 802405D4 8CC20000 */ lw $v0, ($a2) -/* 87A1B8 802405D8 AE220294 */ sw $v0, 0x294($s1) -.L802405DC: -/* 87A1BC 802405DC 001010C0 */ sll $v0, $s0, 3 -/* 87A1C0 802405E0 03C21021 */ addu $v0, $fp, $v0 -/* 87A1C4 802405E4 80420015 */ lb $v0, 0x15($v0) -/* 87A1C8 802405E8 26D60001 */ addiu $s6, $s6, 1 -/* 87A1CC 802405EC AE220210 */ sw $v0, 0x210($s1) -/* 87A1D0 802405F0 26310004 */ addiu $s1, $s1, 4 -/* 87A1D4 802405F4 26520001 */ addiu $s2, $s2, 1 -.L802405F8: -/* 87A1D8 802405F8 2A420008 */ slti $v0, $s2, 8 -/* 87A1DC 802405FC 1440FFCB */ bnez $v0, .L8024052C -/* 87A1E0 80240600 26940002 */ addiu $s4, $s4, 2 -/* 87A1E4 80240604 0260202D */ daddu $a0, $s3, $zero -/* 87A1E8 80240608 24020004 */ addiu $v0, $zero, 4 -/* 87A1EC 8024060C AC820318 */ sw $v0, 0x318($a0) -/* 87A1F0 80240610 AC960324 */ sw $s6, 0x324($a0) -/* 87A1F4 80240614 0C03D390 */ jal func_800F4E40 -/* 87A1F8 80240618 AC800328 */ sw $zero, 0x328($a0) -/* 87A1FC 8024061C AEA00070 */ sw $zero, 0x70($s5) -.L80240620: -/* 87A200 80240620 8EA20070 */ lw $v0, 0x70($s5) -/* 87A204 80240624 8EB30078 */ lw $s3, 0x78($s5) -/* 87A208 80240628 14400008 */ bnez $v0, .L8024064C -/* 87A20C 8024062C 24420001 */ addiu $v0, $v0, 1 -/* 87A210 80240630 8662032C */ lh $v0, 0x32c($s3) -/* 87A214 80240634 10400009 */ beqz $v0, .L8024065C -/* 87A218 80240638 AEA20074 */ sw $v0, 0x74($s5) -/* 87A21C 8024063C 0C03C4EC */ jal func_800F13B0 -/* 87A220 80240640 00000000 */ nop -/* 87A224 80240644 8EA20070 */ lw $v0, 0x70($s5) -/* 87A228 80240648 24420001 */ addiu $v0, $v0, 1 -.L8024064C: -/* 87A22C 8024064C AEA20070 */ sw $v0, 0x70($s5) -/* 87A230 80240650 2842000F */ slti $v0, $v0, 0xf -/* 87A234 80240654 10400003 */ beqz $v0, .L80240664 -/* 87A238 80240658 00000000 */ nop -.L8024065C: -/* 87A23C 8024065C 080901B3 */ j .L802406CC -/* 87A240 80240660 0000102D */ daddu $v0, $zero, $zero -.L80240664: -/* 87A244 80240664 0C03C54E */ jal func_800F1538 -/* 87A248 80240668 00000000 */ nop -/* 87A24C 8024066C 8EA30074 */ lw $v1, 0x74($s5) -/* 87A250 80240670 240200FF */ addiu $v0, $zero, 0xff -/* 87A254 80240674 10620010 */ beq $v1, $v0, .L802406B8 -/* 87A258 80240678 2462FFFF */ addiu $v0, $v1, -1 -/* 87A25C 8024067C 00021080 */ sll $v0, $v0, 2 -/* 87A260 80240680 02621021 */ addu $v0, $s3, $v0 -/* 87A264 80240684 8C420108 */ lw $v0, 0x108($v0) -/* 87A268 80240688 00021100 */ sll $v0, $v0, 4 -/* 87A26C 8024068C 3C038009 */ lui $v1, 0x8009 -/* 87A270 80240690 00621821 */ addu $v1, $v1, $v0 -/* 87A274 80240694 8C63EF20 */ lw $v1, -0x10e0($v1) -/* 87A278 80240698 8EA20074 */ lw $v0, 0x74($s5) -/* 87A27C 8024069C 2442FFFF */ addiu $v0, $v0, -1 -/* 87A280 802406A0 00021080 */ sll $v0, $v0, 2 -/* 87A284 802406A4 02621021 */ addu $v0, $s3, $v0 -/* 87A288 802406A8 AEA30084 */ sw $v1, 0x84($s5) -/* 87A28C 802406AC 8C420108 */ lw $v0, 0x108($v0) -/* 87A290 802406B0 080901B0 */ j .L802406C0 -/* 87A294 802406B4 AEA20088 */ sw $v0, 0x88($s5) -.L802406B8: -/* 87A298 802406B8 2402FFFF */ addiu $v0, $zero, -1 -/* 87A29C 802406BC AEA20084 */ sw $v0, 0x84($s5) -.L802406C0: -/* 87A2A0 802406C0 0C00AB4B */ jal heap_free -/* 87A2A4 802406C4 8EA40078 */ lw $a0, 0x78($s5) -/* 87A2A8 802406C8 24020002 */ addiu $v0, $zero, 2 -.L802406CC: -/* 87A2AC 802406CC 8FBF003C */ lw $ra, 0x3c($sp) -/* 87A2B0 802406D0 8FBE0038 */ lw $fp, 0x38($sp) -/* 87A2B4 802406D4 8FB70034 */ lw $s7, 0x34($sp) -/* 87A2B8 802406D8 8FB60030 */ lw $s6, 0x30($sp) -/* 87A2BC 802406DC 8FB5002C */ lw $s5, 0x2c($sp) -/* 87A2C0 802406E0 8FB40028 */ lw $s4, 0x28($sp) -/* 87A2C4 802406E4 8FB30024 */ lw $s3, 0x24($sp) -/* 87A2C8 802406E8 8FB20020 */ lw $s2, 0x20($sp) -/* 87A2CC 802406EC 8FB1001C */ lw $s1, 0x1c($sp) -/* 87A2D0 802406F0 8FB00018 */ lw $s0, 0x18($sp) -/* 87A2D4 802406F4 03E00008 */ jr $ra -/* 87A2D8 802406F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s new file mode 100644 index 0000000000..d3ef88e321 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802404AC_87A08C.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802404AC_87A08C +/* 87A08C 802404AC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 87A090 802404B0 AFB5002C */ sw $s5, 0x2c($sp) +/* 87A094 802404B4 0080A82D */ daddu $s5, $a0, $zero +/* 87A098 802404B8 AFBE0038 */ sw $fp, 0x38($sp) +/* 87A09C 802404BC 3C1E8011 */ lui $fp, %hi(gPlayerData) +/* 87A0A0 802404C0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) +/* 87A0A4 802404C4 AFBF003C */ sw $ra, 0x3c($sp) +/* 87A0A8 802404C8 AFB70034 */ sw $s7, 0x34($sp) +/* 87A0AC 802404CC AFB60030 */ sw $s6, 0x30($sp) +/* 87A0B0 802404D0 AFB40028 */ sw $s4, 0x28($sp) +/* 87A0B4 802404D4 AFB30024 */ sw $s3, 0x24($sp) +/* 87A0B8 802404D8 AFB20020 */ sw $s2, 0x20($sp) +/* 87A0BC 802404DC AFB1001C */ sw $s1, 0x1c($sp) +/* 87A0C0 802404E0 10A0004F */ beqz $a1, .L80240620 +/* 87A0C4 802404E4 AFB00018 */ sw $s0, 0x18($sp) +/* 87A0C8 802404E8 0C00AB39 */ jal heap_malloc +/* 87A0CC 802404EC 24040330 */ addiu $a0, $zero, 0x330 +/* 87A0D0 802404F0 0040982D */ daddu $s3, $v0, $zero +/* 87A0D4 802404F4 0000B02D */ daddu $s6, $zero, $zero +/* 87A0D8 802404F8 02C0902D */ daddu $s2, $s6, $zero +/* 87A0DC 802404FC 3C148024 */ lui $s4, 0x8024 +/* 87A0E0 80240500 269439F8 */ addiu $s4, $s4, 0x39f8 +/* 87A0E4 80240504 0260882D */ daddu $s1, $s3, $zero +/* 87A0E8 80240508 8EA200B4 */ lw $v0, 0xb4($s5) +/* 87A0EC 8024050C 3C038024 */ lui $v1, 0x8024 +/* 87A0F0 80240510 246339F0 */ addiu $v1, $v1, 0x39f0 +/* 87A0F4 80240514 AEB30078 */ sw $s3, 0x78($s5) +/* 87A0F8 80240518 00021027 */ nor $v0, $zero, $v0 +/* 87A0FC 8024051C 0002BFC2 */ srl $s7, $v0, 0x1f +/* 87A100 80240520 00171080 */ sll $v0, $s7, 2 +/* 87A104 80240524 00431021 */ addu $v0, $v0, $v1 +/* 87A108 80240528 AFA20010 */ sw $v0, 0x10($sp) +.L8024052C: +/* 87A10C 8024052C 86900000 */ lh $s0, ($s4) +/* 87A110 80240530 001010C0 */ sll $v0, $s0, 3 +/* 87A114 80240534 03C21021 */ addu $v0, $fp, $v0 +/* 87A118 80240538 90420014 */ lbu $v0, 0x14($v0) +/* 87A11C 8024053C 5040002E */ beql $v0, $zero, .L802405F8 +/* 87A120 80240540 26520001 */ addiu $s2, $s2, 1 +/* 87A124 80240544 00101100 */ sll $v0, $s0, 4 +/* 87A128 80240548 3C068009 */ lui $a2, 0x8009 +/* 87A12C 8024054C 24C6EF20 */ addiu $a2, $a2, -0x10e0 +/* 87A130 80240550 00461021 */ addu $v0, $v0, $a2 +/* 87A134 80240554 0200202D */ daddu $a0, $s0, $zero +/* 87A138 80240558 AE300108 */ sw $s0, 0x108($s1) +/* 87A13C 8024055C 8C420000 */ lw $v0, ($v0) +/* 87A140 80240560 02E0282D */ daddu $a1, $s7, $zero +/* 87A144 80240564 0C0900ED */ jal func_802403B4_879F94 +/* 87A148 80240568 AE220084 */ sw $v0, 0x84($s1) +/* 87A14C 8024056C 0040202D */ daddu $a0, $v0, $zero +/* 87A150 80240570 04800011 */ bltz $a0, .L802405B8 +/* 87A154 80240574 00101080 */ sll $v0, $s0, 2 +/* 87A158 80240578 3C06800F */ lui $a2, 0x800f +/* 87A15C 8024057C 24C67F00 */ addiu $a2, $a2, 0x7f00 +/* 87A160 80240580 00461021 */ addu $v0, $v0, $a2 +/* 87A164 80240584 8C430000 */ lw $v1, ($v0) +/* 87A168 80240588 24020001 */ addiu $v0, $zero, 1 +/* 87A16C 8024058C AE22018C */ sw $v0, 0x18c($s1) +/* 87A170 80240590 00041080 */ sll $v0, $a0, 2 +/* 87A174 80240594 3C068024 */ lui $a2, 0x8024 +/* 87A178 80240598 24C63A08 */ addiu $a2, $a2, 0x3a08 +/* 87A17C 8024059C AE230000 */ sw $v1, ($s1) +/* 87A180 802405A0 001218C0 */ sll $v1, $s2, 3 +/* 87A184 802405A4 00431021 */ addu $v0, $v0, $v1 +/* 87A188 802405A8 00461021 */ addu $v0, $v0, $a2 +/* 87A18C 802405AC 8C420000 */ lw $v0, ($v0) +/* 87A190 802405B0 08090177 */ j .L802405DC +/* 87A194 802405B4 AE220294 */ sw $v0, 0x294($s1) +.L802405B8: +/* 87A198 802405B8 3C06800F */ lui $a2, 0x800f +/* 87A19C 802405BC 24C67F40 */ addiu $a2, $a2, 0x7f40 +/* 87A1A0 802405C0 00461021 */ addu $v0, $v0, $a2 +/* 87A1A4 802405C4 8C420000 */ lw $v0, ($v0) +/* 87A1A8 802405C8 AE20018C */ sw $zero, 0x18c($s1) +/* 87A1AC 802405CC AE220000 */ sw $v0, ($s1) +/* 87A1B0 802405D0 8FA60010 */ lw $a2, 0x10($sp) +/* 87A1B4 802405D4 8CC20000 */ lw $v0, ($a2) +/* 87A1B8 802405D8 AE220294 */ sw $v0, 0x294($s1) +.L802405DC: +/* 87A1BC 802405DC 001010C0 */ sll $v0, $s0, 3 +/* 87A1C0 802405E0 03C21021 */ addu $v0, $fp, $v0 +/* 87A1C4 802405E4 80420015 */ lb $v0, 0x15($v0) +/* 87A1C8 802405E8 26D60001 */ addiu $s6, $s6, 1 +/* 87A1CC 802405EC AE220210 */ sw $v0, 0x210($s1) +/* 87A1D0 802405F0 26310004 */ addiu $s1, $s1, 4 +/* 87A1D4 802405F4 26520001 */ addiu $s2, $s2, 1 +.L802405F8: +/* 87A1D8 802405F8 2A420008 */ slti $v0, $s2, 8 +/* 87A1DC 802405FC 1440FFCB */ bnez $v0, .L8024052C +/* 87A1E0 80240600 26940002 */ addiu $s4, $s4, 2 +/* 87A1E4 80240604 0260202D */ daddu $a0, $s3, $zero +/* 87A1E8 80240608 24020004 */ addiu $v0, $zero, 4 +/* 87A1EC 8024060C AC820318 */ sw $v0, 0x318($a0) +/* 87A1F0 80240610 AC960324 */ sw $s6, 0x324($a0) +/* 87A1F4 80240614 0C03D390 */ jal func_800F4E40 +/* 87A1F8 80240618 AC800328 */ sw $zero, 0x328($a0) +/* 87A1FC 8024061C AEA00070 */ sw $zero, 0x70($s5) +.L80240620: +/* 87A200 80240620 8EA20070 */ lw $v0, 0x70($s5) +/* 87A204 80240624 8EB30078 */ lw $s3, 0x78($s5) +/* 87A208 80240628 14400008 */ bnez $v0, .L8024064C +/* 87A20C 8024062C 24420001 */ addiu $v0, $v0, 1 +/* 87A210 80240630 8662032C */ lh $v0, 0x32c($s3) +/* 87A214 80240634 10400009 */ beqz $v0, .L8024065C +/* 87A218 80240638 AEA20074 */ sw $v0, 0x74($s5) +/* 87A21C 8024063C 0C03C4EC */ jal func_800F13B0 +/* 87A220 80240640 00000000 */ nop +/* 87A224 80240644 8EA20070 */ lw $v0, 0x70($s5) +/* 87A228 80240648 24420001 */ addiu $v0, $v0, 1 +.L8024064C: +/* 87A22C 8024064C AEA20070 */ sw $v0, 0x70($s5) +/* 87A230 80240650 2842000F */ slti $v0, $v0, 0xf +/* 87A234 80240654 10400003 */ beqz $v0, .L80240664 +/* 87A238 80240658 00000000 */ nop +.L8024065C: +/* 87A23C 8024065C 080901B3 */ j .L802406CC +/* 87A240 80240660 0000102D */ daddu $v0, $zero, $zero +.L80240664: +/* 87A244 80240664 0C03C54E */ jal func_800F1538 +/* 87A248 80240668 00000000 */ nop +/* 87A24C 8024066C 8EA30074 */ lw $v1, 0x74($s5) +/* 87A250 80240670 240200FF */ addiu $v0, $zero, 0xff +/* 87A254 80240674 10620010 */ beq $v1, $v0, .L802406B8 +/* 87A258 80240678 2462FFFF */ addiu $v0, $v1, -1 +/* 87A25C 8024067C 00021080 */ sll $v0, $v0, 2 +/* 87A260 80240680 02621021 */ addu $v0, $s3, $v0 +/* 87A264 80240684 8C420108 */ lw $v0, 0x108($v0) +/* 87A268 80240688 00021100 */ sll $v0, $v0, 4 +/* 87A26C 8024068C 3C038009 */ lui $v1, 0x8009 +/* 87A270 80240690 00621821 */ addu $v1, $v1, $v0 +/* 87A274 80240694 8C63EF20 */ lw $v1, -0x10e0($v1) +/* 87A278 80240698 8EA20074 */ lw $v0, 0x74($s5) +/* 87A27C 8024069C 2442FFFF */ addiu $v0, $v0, -1 +/* 87A280 802406A0 00021080 */ sll $v0, $v0, 2 +/* 87A284 802406A4 02621021 */ addu $v0, $s3, $v0 +/* 87A288 802406A8 AEA30084 */ sw $v1, 0x84($s5) +/* 87A28C 802406AC 8C420108 */ lw $v0, 0x108($v0) +/* 87A290 802406B0 080901B0 */ j .L802406C0 +/* 87A294 802406B4 AEA20088 */ sw $v0, 0x88($s5) +.L802406B8: +/* 87A298 802406B8 2402FFFF */ addiu $v0, $zero, -1 +/* 87A29C 802406BC AEA20084 */ sw $v0, 0x84($s5) +.L802406C0: +/* 87A2A0 802406C0 0C00AB4B */ jal heap_free +/* 87A2A4 802406C4 8EA40078 */ lw $a0, 0x78($s5) +/* 87A2A8 802406C8 24020002 */ addiu $v0, $zero, 2 +.L802406CC: +/* 87A2AC 802406CC 8FBF003C */ lw $ra, 0x3c($sp) +/* 87A2B0 802406D0 8FBE0038 */ lw $fp, 0x38($sp) +/* 87A2B4 802406D4 8FB70034 */ lw $s7, 0x34($sp) +/* 87A2B8 802406D8 8FB60030 */ lw $s6, 0x30($sp) +/* 87A2BC 802406DC 8FB5002C */ lw $s5, 0x2c($sp) +/* 87A2C0 802406E0 8FB40028 */ lw $s4, 0x28($sp) +/* 87A2C4 802406E4 8FB30024 */ lw $s3, 0x24($sp) +/* 87A2C8 802406E8 8FB20020 */ lw $s2, 0x20($sp) +/* 87A2CC 802406EC 8FB1001C */ lw $s1, 0x1c($sp) +/* 87A2D0 802406F0 8FB00018 */ lw $s0, 0x18($sp) +/* 87A2D4 802406F4 03E00008 */ jr $ra +/* 87A2D8 802406F8 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC.s deleted file mode 100644 index b20032c6e7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406FC -/* 87A2DC 802406FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87A2E0 80240700 AFBF0010 */ sw $ra, 0x10($sp) -/* 87A2E4 80240704 8C82000C */ lw $v0, 0xc($a0) -/* 87A2E8 80240708 0C0B1EAF */ jal get_variable -/* 87A2EC 8024070C 8C450000 */ lw $a1, ($v0) -/* 87A2F0 80240710 0C03AC5A */ jal func_800EB168 -/* 87A2F4 80240714 0040202D */ daddu $a0, $v0, $zero -/* 87A2F8 80240718 8FBF0010 */ lw $ra, 0x10($sp) -/* 87A2FC 8024071C 24020002 */ addiu $v0, $zero, 2 -/* 87A300 80240720 03E00008 */ jr $ra -/* 87A304 80240724 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC_87A2DC.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC_87A2DC.s new file mode 100644 index 0000000000..3b9cb6569b --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802406FC_87A2DC.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406FC_87A2DC +/* 87A2DC 802406FC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 87A2E0 80240700 AFBF0010 */ sw $ra, 0x10($sp) +/* 87A2E4 80240704 8C82000C */ lw $v0, 0xc($a0) +/* 87A2E8 80240708 0C0B1EAF */ jal get_variable +/* 87A2EC 8024070C 8C450000 */ lw $a1, ($v0) +/* 87A2F0 80240710 0C03AC5A */ jal func_800EB168 +/* 87A2F4 80240714 0040202D */ daddu $a0, $v0, $zero +/* 87A2F8 80240718 8FBF0010 */ lw $ra, 0x10($sp) +/* 87A2FC 8024071C 24020002 */ addiu $v0, $zero, 2 +/* 87A300 80240720 03E00008 */ jr $ra +/* 87A304 80240724 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728.s deleted file mode 100644 index f7a44fa2f0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240728 -/* 87A308 80240728 3C028011 */ lui $v0, 0x8011 -/* 87A30C 8024072C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 87A310 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87A314 80240734 AFBF0010 */ sw $ra, 0x10($sp) -/* 87A318 80240738 00021100 */ sll $v0, $v0, 4 -/* 87A31C 8024073C 3C048009 */ lui $a0, 0x8009 -/* 87A320 80240740 00822021 */ addu $a0, $a0, $v0 -/* 87A324 80240744 8C84EF20 */ lw $a0, -0x10e0($a0) -/* 87A328 80240748 0C0496CF */ jal set_message_string -/* 87A32C 8024074C 0000282D */ daddu $a1, $zero, $zero -/* 87A330 80240750 8FBF0010 */ lw $ra, 0x10($sp) -/* 87A334 80240754 24020002 */ addiu $v0, $zero, 2 -/* 87A338 80240758 03E00008 */ jr $ra -/* 87A33C 8024075C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s new file mode 100644 index 0000000000..882caca4b4 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240728_87A308 +/* 87A308 80240728 3C028011 */ lui $v0, 0x8011 +/* 87A30C 8024072C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 87A310 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 87A314 80240734 AFBF0010 */ sw $ra, 0x10($sp) +/* 87A318 80240738 00021100 */ sll $v0, $v0, 4 +/* 87A31C 8024073C 3C048009 */ lui $a0, 0x8009 +/* 87A320 80240740 00822021 */ addu $a0, $a0, $v0 +/* 87A324 80240744 8C84EF20 */ lw $a0, -0x10e0($a0) +/* 87A328 80240748 0C0496CF */ jal set_message_string +/* 87A32C 8024074C 0000282D */ daddu $a1, $zero, $zero +/* 87A330 80240750 8FBF0010 */ lw $ra, 0x10($sp) +/* 87A334 80240754 24020002 */ addiu $v0, $zero, 2 +/* 87A338 80240758 03E00008 */ jr $ra +/* 87A33C 8024075C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760.s deleted file mode 100644 index c137f59d5e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240760 -/* 87A340 80240760 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87A344 80240764 AFB1001C */ sw $s1, 0x1c($sp) -/* 87A348 80240768 0080882D */ daddu $s1, $a0, $zero -/* 87A34C 8024076C AFBF0020 */ sw $ra, 0x20($sp) -/* 87A350 80240770 AFB00018 */ sw $s0, 0x18($sp) -/* 87A354 80240774 8E30000C */ lw $s0, 0xc($s1) -/* 87A358 80240778 8E050000 */ lw $a1, ($s0) -/* 87A35C 8024077C 0C0B1EAF */ jal get_variable -/* 87A360 80240780 26100004 */ addiu $s0, $s0, 4 -/* 87A364 80240784 0C04417A */ jal get_entity_by_index -/* 87A368 80240788 0040202D */ daddu $a0, $v0, $zero -/* 87A36C 8024078C 8E100000 */ lw $s0, ($s0) -/* 87A370 80240790 C444004C */ lwc1 $f4, 0x4c($v0) -/* 87A374 80240794 3C014148 */ lui $at, 0x4148 -/* 87A378 80240798 44810000 */ mtc1 $at, $f0 -/* 87A37C 8024079C 3C013F33 */ lui $at, 0x3f33 -/* 87A380 802407A0 34213333 */ ori $at, $at, 0x3333 -/* 87A384 802407A4 44811000 */ mtc1 $at, $f2 -/* 87A388 802407A8 AFA00014 */ sw $zero, 0x14($sp) -/* 87A38C 802407AC 46002100 */ add.s $f4, $f4, $f0 -/* 87A390 802407B0 E7A20010 */ swc1 $f2, 0x10($sp) -/* 87A394 802407B4 8C450048 */ lw $a1, 0x48($v0) -/* 87A398 802407B8 8C470050 */ lw $a3, 0x50($v0) -/* 87A39C 802407BC 44062000 */ mfc1 $a2, $f4 -/* 87A3A0 802407C0 0C01C5D4 */ jal func_80071750 -/* 87A3A4 802407C4 0000202D */ daddu $a0, $zero, $zero -/* 87A3A8 802407C8 0220202D */ daddu $a0, $s1, $zero -/* 87A3AC 802407CC 0200282D */ daddu $a1, $s0, $zero -/* 87A3B0 802407D0 0C0B2026 */ jal set_variable -/* 87A3B4 802407D4 0040302D */ daddu $a2, $v0, $zero -/* 87A3B8 802407D8 8FBF0020 */ lw $ra, 0x20($sp) -/* 87A3BC 802407DC 8FB1001C */ lw $s1, 0x1c($sp) -/* 87A3C0 802407E0 8FB00018 */ lw $s0, 0x18($sp) -/* 87A3C4 802407E4 24020002 */ addiu $v0, $zero, 2 -/* 87A3C8 802407E8 03E00008 */ jr $ra -/* 87A3CC 802407EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760_87A340.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760_87A340.s new file mode 100644 index 0000000000..6485868d3e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240760_87A340.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240760_87A340 +/* 87A340 80240760 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 87A344 80240764 AFB1001C */ sw $s1, 0x1c($sp) +/* 87A348 80240768 0080882D */ daddu $s1, $a0, $zero +/* 87A34C 8024076C AFBF0020 */ sw $ra, 0x20($sp) +/* 87A350 80240770 AFB00018 */ sw $s0, 0x18($sp) +/* 87A354 80240774 8E30000C */ lw $s0, 0xc($s1) +/* 87A358 80240778 8E050000 */ lw $a1, ($s0) +/* 87A35C 8024077C 0C0B1EAF */ jal get_variable +/* 87A360 80240780 26100004 */ addiu $s0, $s0, 4 +/* 87A364 80240784 0C04417A */ jal get_entity_by_index +/* 87A368 80240788 0040202D */ daddu $a0, $v0, $zero +/* 87A36C 8024078C 8E100000 */ lw $s0, ($s0) +/* 87A370 80240790 C444004C */ lwc1 $f4, 0x4c($v0) +/* 87A374 80240794 3C014148 */ lui $at, 0x4148 +/* 87A378 80240798 44810000 */ mtc1 $at, $f0 +/* 87A37C 8024079C 3C013F33 */ lui $at, 0x3f33 +/* 87A380 802407A0 34213333 */ ori $at, $at, 0x3333 +/* 87A384 802407A4 44811000 */ mtc1 $at, $f2 +/* 87A388 802407A8 AFA00014 */ sw $zero, 0x14($sp) +/* 87A38C 802407AC 46002100 */ add.s $f4, $f4, $f0 +/* 87A390 802407B0 E7A20010 */ swc1 $f2, 0x10($sp) +/* 87A394 802407B4 8C450048 */ lw $a1, 0x48($v0) +/* 87A398 802407B8 8C470050 */ lw $a3, 0x50($v0) +/* 87A39C 802407BC 44062000 */ mfc1 $a2, $f4 +/* 87A3A0 802407C0 0C01C5D4 */ jal func_80071750 +/* 87A3A4 802407C4 0000202D */ daddu $a0, $zero, $zero +/* 87A3A8 802407C8 0220202D */ daddu $a0, $s1, $zero +/* 87A3AC 802407CC 0200282D */ daddu $a1, $s0, $zero +/* 87A3B0 802407D0 0C0B2026 */ jal set_variable +/* 87A3B4 802407D4 0040302D */ daddu $a2, $v0, $zero +/* 87A3B8 802407D8 8FBF0020 */ lw $ra, 0x20($sp) +/* 87A3BC 802407DC 8FB1001C */ lw $s1, 0x1c($sp) +/* 87A3C0 802407E0 8FB00018 */ lw $s0, 0x18($sp) +/* 87A3C4 802407E4 24020002 */ addiu $v0, $zero, 2 +/* 87A3C8 802407E8 03E00008 */ jr $ra +/* 87A3CC 802407EC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802407F0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802407F0.s deleted file mode 100644 index f9ee4f8920..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802407F0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407F0 -/* 87A3D0 802407F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87A3D4 802407F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 87A3D8 802407F8 8C82000C */ lw $v0, 0xc($a0) -/* 87A3DC 802407FC 0C0B1EAF */ jal get_variable -/* 87A3E0 80240800 8C450000 */ lw $a1, ($v0) -/* 87A3E4 80240804 0040202D */ daddu $a0, $v0, $zero -/* 87A3E8 80240808 8C830000 */ lw $v1, ($a0) -/* 87A3EC 8024080C 34630010 */ ori $v1, $v1, 0x10 -/* 87A3F0 80240810 AC830000 */ sw $v1, ($a0) -/* 87A3F4 80240814 8FBF0010 */ lw $ra, 0x10($sp) -/* 87A3F8 80240818 24020002 */ addiu $v0, $zero, 2 -/* 87A3FC 8024081C 03E00008 */ jr $ra -/* 87A400 80240820 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802407F0_87A3D0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802407F0_87A3D0.s new file mode 100644 index 0000000000..d5c575a662 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802407F0_87A3D0.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407F0_87A3D0 +/* 87A3D0 802407F0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 87A3D4 802407F4 AFBF0010 */ sw $ra, 0x10($sp) +/* 87A3D8 802407F8 8C82000C */ lw $v0, 0xc($a0) +/* 87A3DC 802407FC 0C0B1EAF */ jal get_variable +/* 87A3E0 80240800 8C450000 */ lw $a1, ($v0) +/* 87A3E4 80240804 0040202D */ daddu $a0, $v0, $zero +/* 87A3E8 80240808 8C830000 */ lw $v1, ($a0) +/* 87A3EC 8024080C 34630010 */ ori $v1, $v1, 0x10 +/* 87A3F0 80240810 AC830000 */ sw $v1, ($a0) +/* 87A3F4 80240814 8FBF0010 */ lw $ra, 0x10($sp) +/* 87A3F8 80240818 24020002 */ addiu $v0, $zero, 2 +/* 87A3FC 8024081C 03E00008 */ jr $ra +/* 87A400 80240820 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824.s deleted file mode 100644 index e480c35a30..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240824 -/* 87A404 80240824 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87A408 80240828 AFBF0018 */ sw $ra, 0x18($sp) -/* 87A40C 8024082C 8C82000C */ lw $v0, 0xc($a0) -/* 87A410 80240830 0C0B1EAF */ jal get_variable -/* 87A414 80240834 8C450000 */ lw $a1, ($v0) -/* 87A418 80240838 0C04417A */ jal get_entity_by_index -/* 87A41C 8024083C 0040202D */ daddu $a0, $v0, $zero -/* 87A420 80240840 3C013F80 */ lui $at, 0x3f80 -/* 87A424 80240844 44810000 */ mtc1 $at, $f0 -/* 87A428 80240848 C442004C */ lwc1 $f2, 0x4c($v0) -/* 87A42C 8024084C E7A00010 */ swc1 $f0, 0x10($sp) -/* 87A430 80240850 3C014148 */ lui $at, 0x4148 -/* 87A434 80240854 44810000 */ mtc1 $at, $f0 -/* 87A438 80240858 2403004B */ addiu $v1, $zero, 0x4b -/* 87A43C 8024085C AFA30014 */ sw $v1, 0x14($sp) -/* 87A440 80240860 46001080 */ add.s $f2, $f2, $f0 -/* 87A444 80240864 8C450048 */ lw $a1, 0x48($v0) -/* 87A448 80240868 8C470050 */ lw $a3, 0x50($v0) -/* 87A44C 8024086C 44061000 */ mfc1 $a2, $f2 -/* 87A450 80240870 0C01C2EC */ jal func_80070BB0 -/* 87A454 80240874 24040004 */ addiu $a0, $zero, 4 -/* 87A458 80240878 8FBF0018 */ lw $ra, 0x18($sp) -/* 87A45C 8024087C 24020002 */ addiu $v0, $zero, 2 -/* 87A460 80240880 03E00008 */ jr $ra -/* 87A464 80240884 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824_87A404.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824_87A404.s new file mode 100644 index 0000000000..900a0dc6a9 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240824_87A404.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240824_87A404 +/* 87A404 80240824 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 87A408 80240828 AFBF0018 */ sw $ra, 0x18($sp) +/* 87A40C 8024082C 8C82000C */ lw $v0, 0xc($a0) +/* 87A410 80240830 0C0B1EAF */ jal get_variable +/* 87A414 80240834 8C450000 */ lw $a1, ($v0) +/* 87A418 80240838 0C04417A */ jal get_entity_by_index +/* 87A41C 8024083C 0040202D */ daddu $a0, $v0, $zero +/* 87A420 80240840 3C013F80 */ lui $at, 0x3f80 +/* 87A424 80240844 44810000 */ mtc1 $at, $f0 +/* 87A428 80240848 C442004C */ lwc1 $f2, 0x4c($v0) +/* 87A42C 8024084C E7A00010 */ swc1 $f0, 0x10($sp) +/* 87A430 80240850 3C014148 */ lui $at, 0x4148 +/* 87A434 80240854 44810000 */ mtc1 $at, $f0 +/* 87A438 80240858 2403004B */ addiu $v1, $zero, 0x4b +/* 87A43C 8024085C AFA30014 */ sw $v1, 0x14($sp) +/* 87A440 80240860 46001080 */ add.s $f2, $f2, $f0 +/* 87A444 80240864 8C450048 */ lw $a1, 0x48($v0) +/* 87A448 80240868 8C470050 */ lw $a3, 0x50($v0) +/* 87A44C 8024086C 44061000 */ mfc1 $a2, $f2 +/* 87A450 80240870 0C01C2EC */ jal func_80070BB0 +/* 87A454 80240874 24040004 */ addiu $a0, $zero, 4 +/* 87A458 80240878 8FBF0018 */ lw $ra, 0x18($sp) +/* 87A45C 8024087C 24020002 */ addiu $v0, $zero, 2 +/* 87A460 80240880 03E00008 */ jr $ra +/* 87A464 80240884 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888.s deleted file mode 100644 index 78332494b4..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240888 -/* 87A468 80240888 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87A46C 8024088C AFBF0018 */ sw $ra, 0x18($sp) -/* 87A470 80240890 0C00EAD2 */ jal get_npc_safe -/* 87A474 80240894 2404FFFC */ addiu $a0, $zero, -4 -/* 87A478 80240898 C444003C */ lwc1 $f4, 0x3c($v0) -/* 87A47C 8024089C 3C014148 */ lui $at, 0x4148 -/* 87A480 802408A0 44811000 */ mtc1 $at, $f2 -/* 87A484 802408A4 3C013F80 */ lui $at, 0x3f80 -/* 87A488 802408A8 44810000 */ mtc1 $at, $f0 -/* 87A48C 802408AC 2403001E */ addiu $v1, $zero, 0x1e -/* 87A490 802408B0 AFA30014 */ sw $v1, 0x14($sp) -/* 87A494 802408B4 46022100 */ add.s $f4, $f4, $f2 -/* 87A498 802408B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87A49C 802408BC 8C450038 */ lw $a1, 0x38($v0) -/* 87A4A0 802408C0 8C470040 */ lw $a3, 0x40($v0) -/* 87A4A4 802408C4 44062000 */ mfc1 $a2, $f4 -/* 87A4A8 802408C8 0C01C2EC */ jal func_80070BB0 -/* 87A4AC 802408CC 24040009 */ addiu $a0, $zero, 9 -/* 87A4B0 802408D0 8FBF0018 */ lw $ra, 0x18($sp) -/* 87A4B4 802408D4 24020002 */ addiu $v0, $zero, 2 -/* 87A4B8 802408D8 03E00008 */ jr $ra -/* 87A4BC 802408DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888_87A468.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888_87A468.s new file mode 100644 index 0000000000..8d82e0003e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240888_87A468.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240888_87A468 +/* 87A468 80240888 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 87A46C 8024088C AFBF0018 */ sw $ra, 0x18($sp) +/* 87A470 80240890 0C00EAD2 */ jal get_npc_safe +/* 87A474 80240894 2404FFFC */ addiu $a0, $zero, -4 +/* 87A478 80240898 C444003C */ lwc1 $f4, 0x3c($v0) +/* 87A47C 8024089C 3C014148 */ lui $at, 0x4148 +/* 87A480 802408A0 44811000 */ mtc1 $at, $f2 +/* 87A484 802408A4 3C013F80 */ lui $at, 0x3f80 +/* 87A488 802408A8 44810000 */ mtc1 $at, $f0 +/* 87A48C 802408AC 2403001E */ addiu $v1, $zero, 0x1e +/* 87A490 802408B0 AFA30014 */ sw $v1, 0x14($sp) +/* 87A494 802408B4 46022100 */ add.s $f4, $f4, $f2 +/* 87A498 802408B8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 87A49C 802408BC 8C450038 */ lw $a1, 0x38($v0) +/* 87A4A0 802408C0 8C470040 */ lw $a3, 0x40($v0) +/* 87A4A4 802408C4 44062000 */ mfc1 $a2, $f4 +/* 87A4A8 802408C8 0C01C2EC */ jal func_80070BB0 +/* 87A4AC 802408CC 24040009 */ addiu $a0, $zero, 9 +/* 87A4B0 802408D0 8FBF0018 */ lw $ra, 0x18($sp) +/* 87A4B4 802408D4 24020002 */ addiu $v0, $zero, 2 +/* 87A4B8 802408D8 03E00008 */ jr $ra +/* 87A4BC 802408DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0.s deleted file mode 100644 index d779018e29..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408E0 -/* 87A4C0 802408E0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 87A4C4 802408E4 AFB60040 */ sw $s6, 0x40($sp) -/* 87A4C8 802408E8 0080B02D */ daddu $s6, $a0, $zero -/* 87A4CC 802408EC AFB00028 */ sw $s0, 0x28($sp) -/* 87A4D0 802408F0 00A0802D */ daddu $s0, $a1, $zero -/* 87A4D4 802408F4 AFBF0044 */ sw $ra, 0x44($sp) -/* 87A4D8 802408F8 AFB5003C */ sw $s5, 0x3c($sp) -/* 87A4DC 802408FC AFB40038 */ sw $s4, 0x38($sp) -/* 87A4E0 80240900 AFB30034 */ sw $s3, 0x34($sp) -/* 87A4E4 80240904 AFB20030 */ sw $s2, 0x30($sp) -/* 87A4E8 80240908 AFB1002C */ sw $s1, 0x2c($sp) -/* 87A4EC 8024090C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 87A4F0 80240910 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 87A4F4 80240914 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 87A4F8 80240918 8ED3000C */ lw $s3, 0xc($s6) -/* 87A4FC 8024091C 0C00EAD2 */ jal get_npc_safe -/* 87A500 80240920 2404FFFC */ addiu $a0, $zero, -4 -/* 87A504 80240924 27A50018 */ addiu $a1, $sp, 0x18 -/* 87A508 80240928 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 87A50C 8024092C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 87A510 80240930 27A6001C */ addiu $a2, $sp, 0x1c -/* 87A514 80240934 00041880 */ sll $v1, $a0, 2 -/* 87A518 80240938 00641821 */ addu $v1, $v1, $a0 -/* 87A51C 8024093C 00031880 */ sll $v1, $v1, 2 -/* 87A520 80240940 00641823 */ subu $v1, $v1, $a0 -/* 87A524 80240944 000320C0 */ sll $a0, $v1, 3 -/* 87A528 80240948 00641821 */ addu $v1, $v1, $a0 -/* 87A52C 8024094C 000318C0 */ sll $v1, $v1, 3 -/* 87A530 80240950 3C01800B */ lui $at, 0x800b -/* 87A534 80240954 00230821 */ addu $at, $at, $v1 -/* 87A538 80240958 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* 87A53C 8024095C 0C00A88D */ jal sin_cos_deg -/* 87A540 80240960 0040A82D */ daddu $s5, $v0, $zero -/* 87A544 80240964 1200005D */ beqz $s0, .L80240ADC -/* 87A548 80240968 00000000 */ nop -/* 87A54C 8024096C 0C00AB0A */ jal general_heap_malloc -/* 87A550 80240970 24040068 */ addiu $a0, $zero, 0x68 -/* 87A554 80240974 0040902D */ daddu $s2, $v0, $zero -/* 87A558 80240978 02C0202D */ daddu $a0, $s6, $zero -/* 87A55C 8024097C 0000882D */ daddu $s1, $zero, $zero -/* 87A560 80240980 2414FFFF */ addiu $s4, $zero, -1 -/* 87A564 80240984 AED20060 */ sw $s2, 0x60($s6) -/* 87A568 80240988 8E650000 */ lw $a1, ($s3) -/* 87A56C 8024098C 3C014148 */ lui $at, 0x4148 -/* 87A570 80240990 4481C000 */ mtc1 $at, $f24 -/* 87A574 80240994 3C013F80 */ lui $at, 0x3f80 -/* 87A578 80240998 4481B000 */ mtc1 $at, $f22 -/* 87A57C 8024099C 4480A000 */ mtc1 $zero, $f20 -/* 87A580 802409A0 0C0B1EAF */ jal get_variable -/* 87A584 802409A4 0240802D */ daddu $s0, $s2, $zero -/* 87A588 802409A8 0C04417A */ jal get_entity_by_index -/* 87A58C 802409AC 0040202D */ daddu $a0, $v0, $zero -/* 87A590 802409B0 AE42005C */ sw $v0, 0x5c($s2) -.L802409B4: -/* 87A594 802409B4 8E42005C */ lw $v0, 0x5c($s2) -/* 87A598 802409B8 C440004C */ lwc1 $f0, 0x4c($v0) -/* 87A59C 802409BC 0000202D */ daddu $a0, $zero, $zero -/* 87A5A0 802409C0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 87A5A4 802409C4 AFB40014 */ sw $s4, 0x14($sp) -/* 87A5A8 802409C8 46180000 */ add.s $f0, $f0, $f24 -/* 87A5AC 802409CC 8C450048 */ lw $a1, 0x48($v0) -/* 87A5B0 802409D0 8C470050 */ lw $a3, 0x50($v0) -/* 87A5B4 802409D4 44060000 */ mfc1 $a2, $f0 -/* 87A5B8 802409D8 0C01C5BC */ jal func_800716F0 -/* 87A5BC 802409DC 26310001 */ addiu $s1, $s1, 1 -/* 87A5C0 802409E0 AE020008 */ sw $v0, 8($s0) -/* 87A5C4 802409E4 E614002C */ swc1 $f20, 0x2c($s0) -/* 87A5C8 802409E8 E6140020 */ swc1 $f20, 0x20($s0) -/* 87A5CC 802409EC E6140014 */ swc1 $f20, 0x14($s0) -/* 87A5D0 802409F0 E6140050 */ swc1 $f20, 0x50($s0) -/* 87A5D4 802409F4 E6140044 */ swc1 $f20, 0x44($s0) -/* 87A5D8 802409F8 E6140038 */ swc1 $f20, 0x38($s0) -/* 87A5DC 802409FC 2A220003 */ slti $v0, $s1, 3 -/* 87A5E0 80240A00 1440FFEC */ bnez $v0, .L802409B4 -/* 87A5E4 80240A04 26100004 */ addiu $s0, $s0, 4 -/* 87A5E8 80240A08 0000882D */ daddu $s1, $zero, $zero -/* 87A5EC 80240A0C 0240802D */ daddu $s0, $s2, $zero -/* 87A5F0 80240A10 3C148024 */ lui $s4, 0x8024 -/* 87A5F4 80240A14 26943A48 */ addiu $s4, $s4, 0x3a48 -/* 87A5F8 80240A18 3C014248 */ lui $at, 0x4248 -/* 87A5FC 80240A1C 4481A000 */ mtc1 $at, $f20 -/* 87A600 80240A20 24130044 */ addiu $s3, $zero, 0x44 -/* 87A604 80240A24 AE400000 */ sw $zero, ($s2) -/* 87A608 80240A28 AE400004 */ sw $zero, 4($s2) -/* 87A60C 80240A2C AE400060 */ sw $zero, 0x60($s2) -/* 87A610 80240A30 AE400064 */ sw $zero, 0x64($s2) -.L80240A34: -/* 87A614 80240A34 27A40020 */ addiu $a0, $sp, 0x20 -/* 87A618 80240A38 4406A000 */ mfc1 $a2, $f20 -/* 87A61C 80240A3C 8E870000 */ lw $a3, ($s4) -/* 87A620 80240A40 02532821 */ addu $a1, $s2, $s3 -/* 87A624 80240A44 0C00A7E7 */ jal add_vec2D_polar -/* 87A628 80240A48 AFA00020 */ sw $zero, 0x20($sp) -/* 87A62C 80240A4C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 87A630 80240A50 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 87A634 80240A54 46041082 */ mul.s $f2, $f2, $f4 -/* 87A638 80240A58 00000000 */ nop -/* 87A63C 80240A5C C7A00018 */ lwc1 $f0, 0x18($sp) -/* 87A640 80240A60 46040002 */ mul.s $f0, $f0, $f4 -/* 87A644 80240A64 00000000 */ nop -/* 87A648 80240A68 E6020038 */ swc1 $f2, 0x38($s0) -/* 87A64C 80240A6C E6000050 */ swc1 $f0, 0x50($s0) -/* 87A650 80240A70 8E42005C */ lw $v0, 0x5c($s2) -/* 87A654 80240A74 C6000038 */ lwc1 $f0, 0x38($s0) -/* 87A658 80240A78 C4420048 */ lwc1 $f2, 0x48($v0) -/* 87A65C 80240A7C 46001080 */ add.s $f2, $f2, $f0 -/* 87A660 80240A80 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 87A664 80240A84 46020001 */ sub.s $f0, $f0, $f2 -/* 87A668 80240A88 E6000038 */ swc1 $f0, 0x38($s0) -/* 87A66C 80240A8C 8E42005C */ lw $v0, 0x5c($s2) -/* 87A670 80240A90 C6000044 */ lwc1 $f0, 0x44($s0) -/* 87A674 80240A94 C442004C */ lwc1 $f2, 0x4c($v0) -/* 87A678 80240A98 46001080 */ add.s $f2, $f2, $f0 -/* 87A67C 80240A9C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 87A680 80240AA0 46020001 */ sub.s $f0, $f0, $f2 -/* 87A684 80240AA4 E6000044 */ swc1 $f0, 0x44($s0) -/* 87A688 80240AA8 8E42005C */ lw $v0, 0x5c($s2) -/* 87A68C 80240AAC C6000050 */ lwc1 $f0, 0x50($s0) -/* 87A690 80240AB0 C4420050 */ lwc1 $f2, 0x50($v0) -/* 87A694 80240AB4 26940004 */ addiu $s4, $s4, 4 -/* 87A698 80240AB8 46001080 */ add.s $f2, $f2, $f0 -/* 87A69C 80240ABC C6A00040 */ lwc1 $f0, 0x40($s5) -/* 87A6A0 80240AC0 26730004 */ addiu $s3, $s3, 4 -/* 87A6A4 80240AC4 46020001 */ sub.s $f0, $f0, $f2 -/* 87A6A8 80240AC8 26310001 */ addiu $s1, $s1, 1 -/* 87A6AC 80240ACC 2A220003 */ slti $v0, $s1, 3 -/* 87A6B0 80240AD0 E6000050 */ swc1 $f0, 0x50($s0) -/* 87A6B4 80240AD4 1440FFD7 */ bnez $v0, .L80240A34 -/* 87A6B8 80240AD8 26100004 */ addiu $s0, $s0, 4 -.L80240ADC: -/* 87A6BC 80240ADC 8ED20060 */ lw $s2, 0x60($s6) -/* 87A6C0 80240AE0 8E430000 */ lw $v1, ($s2) -/* 87A6C4 80240AE4 24020001 */ addiu $v0, $zero, 1 -/* 87A6C8 80240AE8 10620038 */ beq $v1, $v0, .L80240BCC -/* 87A6CC 80240AEC 28620002 */ slti $v0, $v1, 2 -/* 87A6D0 80240AF0 50400005 */ beql $v0, $zero, .L80240B08 -/* 87A6D4 80240AF4 24020002 */ addiu $v0, $zero, 2 -/* 87A6D8 80240AF8 10600007 */ beqz $v1, .L80240B18 -/* 87A6DC 80240AFC 24040005 */ addiu $a0, $zero, 5 -/* 87A6E0 80240B00 0809032C */ j .L80240CB0 -/* 87A6E4 80240B04 00000000 */ nop -.L80240B08: -/* 87A6E8 80240B08 10620058 */ beq $v1, $v0, .L80240C6C -/* 87A6EC 80240B0C 00000000 */ nop -/* 87A6F0 80240B10 0809032C */ j .L80240CB0 -/* 87A6F4 80240B14 00000000 */ nop -.L80240B18: -/* 87A6F8 80240B18 0000882D */ daddu $s1, $zero, $zero -/* 87A6FC 80240B1C 3C148024 */ lui $s4, 0x8024 -/* 87A700 80240B20 26943A48 */ addiu $s4, $s4, 0x3a48 -/* 87A704 80240B24 24130020 */ addiu $s3, $zero, 0x20 -/* 87A708 80240B28 3C064248 */ lui $a2, 0x4248 -/* 87A70C 80240B2C 44800000 */ mtc1 $zero, $f0 -/* 87A710 80240B30 24020014 */ addiu $v0, $zero, 0x14 -/* 87A714 80240B34 AFA20010 */ sw $v0, 0x10($sp) -/* 87A718 80240B38 44050000 */ mfc1 $a1, $f0 -/* 87A71C 80240B3C 8E470060 */ lw $a3, 0x60($s2) -/* 87A720 80240B40 4485B000 */ mtc1 $a1, $f22 -/* 87A724 80240B44 0C00A8ED */ jal update_lerp -/* 87A728 80240B48 0240802D */ daddu $s0, $s2, $zero -/* 87A72C 80240B4C 46000506 */ mov.s $f20, $f0 -.L80240B50: -/* 87A730 80240B50 4406A000 */ mfc1 $a2, $f20 -/* 87A734 80240B54 27A40020 */ addiu $a0, $sp, 0x20 -/* 87A738 80240B58 E6160020 */ swc1 $f22, 0x20($s0) -/* 87A73C 80240B5C 8E870000 */ lw $a3, ($s4) -/* 87A740 80240B60 02532821 */ addu $a1, $s2, $s3 -/* 87A744 80240B64 0C00A7E7 */ jal add_vec2D_polar -/* 87A748 80240B68 E7B60020 */ swc1 $f22, 0x20($sp) -/* 87A74C 80240B6C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 87A750 80240B70 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 87A754 80240B74 46002102 */ mul.s $f4, $f4, $f0 -/* 87A758 80240B78 00000000 */ nop -/* 87A75C 80240B7C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 87A760 80240B80 26940004 */ addiu $s4, $s4, 4 -/* 87A764 80240B84 46001082 */ mul.s $f2, $f2, $f0 -/* 87A768 80240B88 00000000 */ nop -/* 87A76C 80240B8C 26730004 */ addiu $s3, $s3, 4 -/* 87A770 80240B90 26310001 */ addiu $s1, $s1, 1 -/* 87A774 80240B94 2A220003 */ slti $v0, $s1, 3 -/* 87A778 80240B98 E6040014 */ swc1 $f4, 0x14($s0) -/* 87A77C 80240B9C E602002C */ swc1 $f2, 0x2c($s0) -/* 87A780 80240BA0 1440FFEB */ bnez $v0, .L80240B50 -/* 87A784 80240BA4 26100004 */ addiu $s0, $s0, 4 -/* 87A788 80240BA8 8E420060 */ lw $v0, 0x60($s2) -/* 87A78C 80240BAC 24420001 */ addiu $v0, $v0, 1 -/* 87A790 80240BB0 AE420060 */ sw $v0, 0x60($s2) -/* 87A794 80240BB4 28420015 */ slti $v0, $v0, 0x15 -/* 87A798 80240BB8 1440003D */ bnez $v0, .L80240CB0 -/* 87A79C 80240BBC 24020001 */ addiu $v0, $zero, 1 -/* 87A7A0 80240BC0 AE420000 */ sw $v0, ($s2) -/* 87A7A4 80240BC4 0809032C */ j .L80240CB0 -/* 87A7A8 80240BC8 AE400060 */ sw $zero, 0x60($s2) -.L80240BCC: -/* 87A7AC 80240BCC 0000882D */ daddu $s1, $zero, $zero -/* 87A7B0 80240BD0 3C148024 */ lui $s4, 0x8024 -/* 87A7B4 80240BD4 26943A48 */ addiu $s4, $s4, 0x3a48 -/* 87A7B8 80240BD8 24130020 */ addiu $s3, $zero, 0x20 -/* 87A7BC 80240BDC 0240802D */ daddu $s0, $s2, $zero -/* 87A7C0 80240BE0 3C014248 */ lui $at, 0x4248 -/* 87A7C4 80240BE4 4481A000 */ mtc1 $at, $f20 -/* 87A7C8 80240BE8 4480B000 */ mtc1 $zero, $f22 -.L80240BEC: -/* 87A7CC 80240BEC 4406A000 */ mfc1 $a2, $f20 -/* 87A7D0 80240BF0 27A40020 */ addiu $a0, $sp, 0x20 -/* 87A7D4 80240BF4 E6160020 */ swc1 $f22, 0x20($s0) -/* 87A7D8 80240BF8 8E870000 */ lw $a3, ($s4) -/* 87A7DC 80240BFC 02532821 */ addu $a1, $s2, $s3 -/* 87A7E0 80240C00 0C00A7E7 */ jal add_vec2D_polar -/* 87A7E4 80240C04 E7B60020 */ swc1 $f22, 0x20($sp) -/* 87A7E8 80240C08 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 87A7EC 80240C0C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 87A7F0 80240C10 46002102 */ mul.s $f4, $f4, $f0 -/* 87A7F4 80240C14 00000000 */ nop -/* 87A7F8 80240C18 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 87A7FC 80240C1C 26940004 */ addiu $s4, $s4, 4 -/* 87A800 80240C20 46001082 */ mul.s $f2, $f2, $f0 -/* 87A804 80240C24 00000000 */ nop -/* 87A808 80240C28 26730004 */ addiu $s3, $s3, 4 -/* 87A80C 80240C2C 26310001 */ addiu $s1, $s1, 1 -/* 87A810 80240C30 2A220003 */ slti $v0, $s1, 3 -/* 87A814 80240C34 E6040014 */ swc1 $f4, 0x14($s0) -/* 87A818 80240C38 E602002C */ swc1 $f2, 0x2c($s0) -/* 87A81C 80240C3C 1440FFEB */ bnez $v0, .L80240BEC -/* 87A820 80240C40 26100004 */ addiu $s0, $s0, 4 -/* 87A824 80240C44 8E420060 */ lw $v0, 0x60($s2) -/* 87A828 80240C48 24420001 */ addiu $v0, $v0, 1 -/* 87A82C 80240C4C AE420060 */ sw $v0, 0x60($s2) -/* 87A830 80240C50 28420010 */ slti $v0, $v0, 0x10 -/* 87A834 80240C54 14400016 */ bnez $v0, .L80240CB0 -/* 87A838 80240C58 2402000F */ addiu $v0, $zero, 0xf -/* 87A83C 80240C5C AE420060 */ sw $v0, 0x60($s2) -/* 87A840 80240C60 24020002 */ addiu $v0, $zero, 2 -/* 87A844 80240C64 0809032C */ j .L80240CB0 -/* 87A848 80240C68 AE420000 */ sw $v0, ($s2) -.L80240C6C: -/* 87A84C 80240C6C 8E420060 */ lw $v0, 0x60($s2) -/* 87A850 80240C70 24420001 */ addiu $v0, $v0, 1 -/* 87A854 80240C74 AE420060 */ sw $v0, 0x60($s2) -/* 87A858 80240C78 2842001F */ slti $v0, $v0, 0x1f -/* 87A85C 80240C7C 1440000C */ bnez $v0, .L80240CB0 -/* 87A860 80240C80 0000882D */ daddu $s1, $zero, $zero -/* 87A864 80240C84 0240282D */ daddu $a1, $s2, $zero -.L80240C88: -/* 87A868 80240C88 8CA20008 */ lw $v0, 8($a1) -/* 87A86C 80240C8C 8C430000 */ lw $v1, ($v0) -/* 87A870 80240C90 26310001 */ addiu $s1, $s1, 1 -/* 87A874 80240C94 34630010 */ ori $v1, $v1, 0x10 -/* 87A878 80240C98 AC430000 */ sw $v1, ($v0) -/* 87A87C 80240C9C 2A220003 */ slti $v0, $s1, 3 -/* 87A880 80240CA0 1440FFF9 */ bnez $v0, .L80240C88 -/* 87A884 80240CA4 24A50004 */ addiu $a1, $a1, 4 -/* 87A888 80240CA8 08090379 */ j .L80240DE4 -/* 87A88C 80240CAC 24020002 */ addiu $v0, $zero, 2 -.L80240CB0: -/* 87A890 80240CB0 8E430004 */ lw $v1, 4($s2) -/* 87A894 80240CB4 10600005 */ beqz $v1, .L80240CCC -/* 87A898 80240CB8 24020001 */ addiu $v0, $zero, 1 -/* 87A89C 80240CBC 1062000B */ beq $v1, $v0, .L80240CEC -/* 87A8A0 80240CC0 0000882D */ daddu $s1, $zero, $zero -/* 87A8A4 80240CC4 08090368 */ j .L80240DA0 -/* 87A8A8 80240CC8 0240282D */ daddu $a1, $s2, $zero -.L80240CCC: -/* 87A8AC 80240CCC 8E420064 */ lw $v0, 0x64($s2) -/* 87A8B0 80240CD0 24420001 */ addiu $v0, $v0, 1 -/* 87A8B4 80240CD4 AE420064 */ sw $v0, 0x64($s2) -/* 87A8B8 80240CD8 28420010 */ slti $v0, $v0, 0x10 -/* 87A8BC 80240CDC 1440002F */ bnez $v0, .L80240D9C -/* 87A8C0 80240CE0 0000882D */ daddu $s1, $zero, $zero -/* 87A8C4 80240CE4 08090364 */ j .L80240D90 -/* 87A8C8 80240CE8 24020001 */ addiu $v0, $zero, 1 -.L80240CEC: -/* 87A8CC 80240CEC 4480A000 */ mtc1 $zero, $f20 -/* 87A8D0 80240CF0 24130014 */ addiu $s3, $zero, 0x14 -/* 87A8D4 80240CF4 0240802D */ daddu $s0, $s2, $zero -.L80240CF8: -/* 87A8D8 80240CF8 4405A000 */ mfc1 $a1, $f20 -/* 87A8DC 80240CFC AFB30010 */ sw $s3, 0x10($sp) -/* 87A8E0 80240D00 8E060038 */ lw $a2, 0x38($s0) -/* 87A8E4 80240D04 8E470064 */ lw $a3, 0x64($s2) -/* 87A8E8 80240D08 0C00A8ED */ jal update_lerp -/* 87A8EC 80240D0C 24040001 */ addiu $a0, $zero, 1 -/* 87A8F0 80240D10 C6020014 */ lwc1 $f2, 0x14($s0) -/* 87A8F4 80240D14 46001080 */ add.s $f2, $f2, $f0 -/* 87A8F8 80240D18 4405A000 */ mfc1 $a1, $f20 -/* 87A8FC 80240D1C E6020014 */ swc1 $f2, 0x14($s0) -/* 87A900 80240D20 AFB30010 */ sw $s3, 0x10($sp) -/* 87A904 80240D24 8E060044 */ lw $a2, 0x44($s0) -/* 87A908 80240D28 8E470064 */ lw $a3, 0x64($s2) -/* 87A90C 80240D2C 0C00A8ED */ jal update_lerp -/* 87A910 80240D30 24040001 */ addiu $a0, $zero, 1 -/* 87A914 80240D34 C6020020 */ lwc1 $f2, 0x20($s0) -/* 87A918 80240D38 46001080 */ add.s $f2, $f2, $f0 -/* 87A91C 80240D3C 4405A000 */ mfc1 $a1, $f20 -/* 87A920 80240D40 E6020020 */ swc1 $f2, 0x20($s0) -/* 87A924 80240D44 AFB30010 */ sw $s3, 0x10($sp) -/* 87A928 80240D48 8E060050 */ lw $a2, 0x50($s0) -/* 87A92C 80240D4C 8E470064 */ lw $a3, 0x64($s2) -/* 87A930 80240D50 0C00A8ED */ jal update_lerp -/* 87A934 80240D54 24040001 */ addiu $a0, $zero, 1 -/* 87A938 80240D58 C602002C */ lwc1 $f2, 0x2c($s0) -/* 87A93C 80240D5C 46001080 */ add.s $f2, $f2, $f0 -/* 87A940 80240D60 26310001 */ addiu $s1, $s1, 1 -/* 87A944 80240D64 2A220003 */ slti $v0, $s1, 3 -/* 87A948 80240D68 E602002C */ swc1 $f2, 0x2c($s0) -/* 87A94C 80240D6C 1440FFE2 */ bnez $v0, .L80240CF8 -/* 87A950 80240D70 26100004 */ addiu $s0, $s0, 4 -/* 87A954 80240D74 8E420064 */ lw $v0, 0x64($s2) -/* 87A958 80240D78 24420001 */ addiu $v0, $v0, 1 -/* 87A95C 80240D7C AE420064 */ sw $v0, 0x64($s2) -/* 87A960 80240D80 28420015 */ slti $v0, $v0, 0x15 -/* 87A964 80240D84 14400005 */ bnez $v0, .L80240D9C -/* 87A968 80240D88 0000882D */ daddu $s1, $zero, $zero -/* 87A96C 80240D8C 24020002 */ addiu $v0, $zero, 2 -.L80240D90: -/* 87A970 80240D90 AE420004 */ sw $v0, 4($s2) -/* 87A974 80240D94 AE400064 */ sw $zero, 0x64($s2) -/* 87A978 80240D98 0000882D */ daddu $s1, $zero, $zero -.L80240D9C: -/* 87A97C 80240D9C 0240282D */ daddu $a1, $s2, $zero -.L80240DA0: -/* 87A980 80240DA0 8CA20008 */ lw $v0, 8($a1) -/* 87A984 80240DA4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 87A988 80240DA8 8C42000C */ lw $v0, 0xc($v0) -/* 87A98C 80240DAC E4400010 */ swc1 $f0, 0x10($v0) -/* 87A990 80240DB0 8CA20008 */ lw $v0, 8($a1) -/* 87A994 80240DB4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 87A998 80240DB8 8C42000C */ lw $v0, 0xc($v0) -/* 87A99C 80240DBC 26310001 */ addiu $s1, $s1, 1 -/* 87A9A0 80240DC0 E4400014 */ swc1 $f0, 0x14($v0) -/* 87A9A4 80240DC4 8CA20008 */ lw $v0, 8($a1) -/* 87A9A8 80240DC8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 87A9AC 80240DCC 8C42000C */ lw $v0, 0xc($v0) -/* 87A9B0 80240DD0 E4400018 */ swc1 $f0, 0x18($v0) -/* 87A9B4 80240DD4 2A220003 */ slti $v0, $s1, 3 -/* 87A9B8 80240DD8 1440FFF1 */ bnez $v0, .L80240DA0 -/* 87A9BC 80240DDC 24A50004 */ addiu $a1, $a1, 4 -/* 87A9C0 80240DE0 0000102D */ daddu $v0, $zero, $zero -.L80240DE4: -/* 87A9C4 80240DE4 8FBF0044 */ lw $ra, 0x44($sp) -/* 87A9C8 80240DE8 8FB60040 */ lw $s6, 0x40($sp) -/* 87A9CC 80240DEC 8FB5003C */ lw $s5, 0x3c($sp) -/* 87A9D0 80240DF0 8FB40038 */ lw $s4, 0x38($sp) -/* 87A9D4 80240DF4 8FB30034 */ lw $s3, 0x34($sp) -/* 87A9D8 80240DF8 8FB20030 */ lw $s2, 0x30($sp) -/* 87A9DC 80240DFC 8FB1002C */ lw $s1, 0x2c($sp) -/* 87A9E0 80240E00 8FB00028 */ lw $s0, 0x28($sp) -/* 87A9E4 80240E04 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 87A9E8 80240E08 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 87A9EC 80240E0C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 87A9F0 80240E10 03E00008 */ jr $ra -/* 87A9F4 80240E14 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s new file mode 100644 index 0000000000..13f862197e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_802408E0_87A4C0.s @@ -0,0 +1,356 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802408E0_87A4C0 +/* 87A4C0 802408E0 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* 87A4C4 802408E4 AFB60040 */ sw $s6, 0x40($sp) +/* 87A4C8 802408E8 0080B02D */ daddu $s6, $a0, $zero +/* 87A4CC 802408EC AFB00028 */ sw $s0, 0x28($sp) +/* 87A4D0 802408F0 00A0802D */ daddu $s0, $a1, $zero +/* 87A4D4 802408F4 AFBF0044 */ sw $ra, 0x44($sp) +/* 87A4D8 802408F8 AFB5003C */ sw $s5, 0x3c($sp) +/* 87A4DC 802408FC AFB40038 */ sw $s4, 0x38($sp) +/* 87A4E0 80240900 AFB30034 */ sw $s3, 0x34($sp) +/* 87A4E4 80240904 AFB20030 */ sw $s2, 0x30($sp) +/* 87A4E8 80240908 AFB1002C */ sw $s1, 0x2c($sp) +/* 87A4EC 8024090C F7B80058 */ sdc1 $f24, 0x58($sp) +/* 87A4F0 80240910 F7B60050 */ sdc1 $f22, 0x50($sp) +/* 87A4F4 80240914 F7B40048 */ sdc1 $f20, 0x48($sp) +/* 87A4F8 80240918 8ED3000C */ lw $s3, 0xc($s6) +/* 87A4FC 8024091C 0C00EAD2 */ jal get_npc_safe +/* 87A500 80240920 2404FFFC */ addiu $a0, $zero, -4 +/* 87A504 80240924 27A50018 */ addiu $a1, $sp, 0x18 +/* 87A508 80240928 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 87A50C 8024092C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 87A510 80240930 27A6001C */ addiu $a2, $sp, 0x1c +/* 87A514 80240934 00041880 */ sll $v1, $a0, 2 +/* 87A518 80240938 00641821 */ addu $v1, $v1, $a0 +/* 87A51C 8024093C 00031880 */ sll $v1, $v1, 2 +/* 87A520 80240940 00641823 */ subu $v1, $v1, $a0 +/* 87A524 80240944 000320C0 */ sll $a0, $v1, 3 +/* 87A528 80240948 00641821 */ addu $v1, $v1, $a0 +/* 87A52C 8024094C 000318C0 */ sll $v1, $v1, 3 +/* 87A530 80240950 3C01800B */ lui $at, 0x800b +/* 87A534 80240954 00230821 */ addu $at, $at, $v1 +/* 87A538 80240958 C42C1DEC */ lwc1 $f12, 0x1dec($at) +/* 87A53C 8024095C 0C00A88D */ jal sin_cos_deg +/* 87A540 80240960 0040A82D */ daddu $s5, $v0, $zero +/* 87A544 80240964 1200005D */ beqz $s0, .L80240ADC +/* 87A548 80240968 00000000 */ nop +/* 87A54C 8024096C 0C00AB0A */ jal general_heap_malloc +/* 87A550 80240970 24040068 */ addiu $a0, $zero, 0x68 +/* 87A554 80240974 0040902D */ daddu $s2, $v0, $zero +/* 87A558 80240978 02C0202D */ daddu $a0, $s6, $zero +/* 87A55C 8024097C 0000882D */ daddu $s1, $zero, $zero +/* 87A560 80240980 2414FFFF */ addiu $s4, $zero, -1 +/* 87A564 80240984 AED20060 */ sw $s2, 0x60($s6) +/* 87A568 80240988 8E650000 */ lw $a1, ($s3) +/* 87A56C 8024098C 3C014148 */ lui $at, 0x4148 +/* 87A570 80240990 4481C000 */ mtc1 $at, $f24 +/* 87A574 80240994 3C013F80 */ lui $at, 0x3f80 +/* 87A578 80240998 4481B000 */ mtc1 $at, $f22 +/* 87A57C 8024099C 4480A000 */ mtc1 $zero, $f20 +/* 87A580 802409A0 0C0B1EAF */ jal get_variable +/* 87A584 802409A4 0240802D */ daddu $s0, $s2, $zero +/* 87A588 802409A8 0C04417A */ jal get_entity_by_index +/* 87A58C 802409AC 0040202D */ daddu $a0, $v0, $zero +/* 87A590 802409B0 AE42005C */ sw $v0, 0x5c($s2) +.L802409B4: +/* 87A594 802409B4 8E42005C */ lw $v0, 0x5c($s2) +/* 87A598 802409B8 C440004C */ lwc1 $f0, 0x4c($v0) +/* 87A59C 802409BC 0000202D */ daddu $a0, $zero, $zero +/* 87A5A0 802409C0 E7B60010 */ swc1 $f22, 0x10($sp) +/* 87A5A4 802409C4 AFB40014 */ sw $s4, 0x14($sp) +/* 87A5A8 802409C8 46180000 */ add.s $f0, $f0, $f24 +/* 87A5AC 802409CC 8C450048 */ lw $a1, 0x48($v0) +/* 87A5B0 802409D0 8C470050 */ lw $a3, 0x50($v0) +/* 87A5B4 802409D4 44060000 */ mfc1 $a2, $f0 +/* 87A5B8 802409D8 0C01C5BC */ jal func_800716F0 +/* 87A5BC 802409DC 26310001 */ addiu $s1, $s1, 1 +/* 87A5C0 802409E0 AE020008 */ sw $v0, 8($s0) +/* 87A5C4 802409E4 E614002C */ swc1 $f20, 0x2c($s0) +/* 87A5C8 802409E8 E6140020 */ swc1 $f20, 0x20($s0) +/* 87A5CC 802409EC E6140014 */ swc1 $f20, 0x14($s0) +/* 87A5D0 802409F0 E6140050 */ swc1 $f20, 0x50($s0) +/* 87A5D4 802409F4 E6140044 */ swc1 $f20, 0x44($s0) +/* 87A5D8 802409F8 E6140038 */ swc1 $f20, 0x38($s0) +/* 87A5DC 802409FC 2A220003 */ slti $v0, $s1, 3 +/* 87A5E0 80240A00 1440FFEC */ bnez $v0, .L802409B4 +/* 87A5E4 80240A04 26100004 */ addiu $s0, $s0, 4 +/* 87A5E8 80240A08 0000882D */ daddu $s1, $zero, $zero +/* 87A5EC 80240A0C 0240802D */ daddu $s0, $s2, $zero +/* 87A5F0 80240A10 3C148024 */ lui $s4, 0x8024 +/* 87A5F4 80240A14 26943A48 */ addiu $s4, $s4, 0x3a48 +/* 87A5F8 80240A18 3C014248 */ lui $at, 0x4248 +/* 87A5FC 80240A1C 4481A000 */ mtc1 $at, $f20 +/* 87A600 80240A20 24130044 */ addiu $s3, $zero, 0x44 +/* 87A604 80240A24 AE400000 */ sw $zero, ($s2) +/* 87A608 80240A28 AE400004 */ sw $zero, 4($s2) +/* 87A60C 80240A2C AE400060 */ sw $zero, 0x60($s2) +/* 87A610 80240A30 AE400064 */ sw $zero, 0x64($s2) +.L80240A34: +/* 87A614 80240A34 27A40020 */ addiu $a0, $sp, 0x20 +/* 87A618 80240A38 4406A000 */ mfc1 $a2, $f20 +/* 87A61C 80240A3C 8E870000 */ lw $a3, ($s4) +/* 87A620 80240A40 02532821 */ addu $a1, $s2, $s3 +/* 87A624 80240A44 0C00A7E7 */ jal add_vec2D_polar +/* 87A628 80240A48 AFA00020 */ sw $zero, 0x20($sp) +/* 87A62C 80240A4C C7A2001C */ lwc1 $f2, 0x1c($sp) +/* 87A630 80240A50 C7A40020 */ lwc1 $f4, 0x20($sp) +/* 87A634 80240A54 46041082 */ mul.s $f2, $f2, $f4 +/* 87A638 80240A58 00000000 */ nop +/* 87A63C 80240A5C C7A00018 */ lwc1 $f0, 0x18($sp) +/* 87A640 80240A60 46040002 */ mul.s $f0, $f0, $f4 +/* 87A644 80240A64 00000000 */ nop +/* 87A648 80240A68 E6020038 */ swc1 $f2, 0x38($s0) +/* 87A64C 80240A6C E6000050 */ swc1 $f0, 0x50($s0) +/* 87A650 80240A70 8E42005C */ lw $v0, 0x5c($s2) +/* 87A654 80240A74 C6000038 */ lwc1 $f0, 0x38($s0) +/* 87A658 80240A78 C4420048 */ lwc1 $f2, 0x48($v0) +/* 87A65C 80240A7C 46001080 */ add.s $f2, $f2, $f0 +/* 87A660 80240A80 C6A00038 */ lwc1 $f0, 0x38($s5) +/* 87A664 80240A84 46020001 */ sub.s $f0, $f0, $f2 +/* 87A668 80240A88 E6000038 */ swc1 $f0, 0x38($s0) +/* 87A66C 80240A8C 8E42005C */ lw $v0, 0x5c($s2) +/* 87A670 80240A90 C6000044 */ lwc1 $f0, 0x44($s0) +/* 87A674 80240A94 C442004C */ lwc1 $f2, 0x4c($v0) +/* 87A678 80240A98 46001080 */ add.s $f2, $f2, $f0 +/* 87A67C 80240A9C C6A0003C */ lwc1 $f0, 0x3c($s5) +/* 87A680 80240AA0 46020001 */ sub.s $f0, $f0, $f2 +/* 87A684 80240AA4 E6000044 */ swc1 $f0, 0x44($s0) +/* 87A688 80240AA8 8E42005C */ lw $v0, 0x5c($s2) +/* 87A68C 80240AAC C6000050 */ lwc1 $f0, 0x50($s0) +/* 87A690 80240AB0 C4420050 */ lwc1 $f2, 0x50($v0) +/* 87A694 80240AB4 26940004 */ addiu $s4, $s4, 4 +/* 87A698 80240AB8 46001080 */ add.s $f2, $f2, $f0 +/* 87A69C 80240ABC C6A00040 */ lwc1 $f0, 0x40($s5) +/* 87A6A0 80240AC0 26730004 */ addiu $s3, $s3, 4 +/* 87A6A4 80240AC4 46020001 */ sub.s $f0, $f0, $f2 +/* 87A6A8 80240AC8 26310001 */ addiu $s1, $s1, 1 +/* 87A6AC 80240ACC 2A220003 */ slti $v0, $s1, 3 +/* 87A6B0 80240AD0 E6000050 */ swc1 $f0, 0x50($s0) +/* 87A6B4 80240AD4 1440FFD7 */ bnez $v0, .L80240A34 +/* 87A6B8 80240AD8 26100004 */ addiu $s0, $s0, 4 +.L80240ADC: +/* 87A6BC 80240ADC 8ED20060 */ lw $s2, 0x60($s6) +/* 87A6C0 80240AE0 8E430000 */ lw $v1, ($s2) +/* 87A6C4 80240AE4 24020001 */ addiu $v0, $zero, 1 +/* 87A6C8 80240AE8 10620038 */ beq $v1, $v0, .L80240BCC +/* 87A6CC 80240AEC 28620002 */ slti $v0, $v1, 2 +/* 87A6D0 80240AF0 50400005 */ beql $v0, $zero, .L80240B08 +/* 87A6D4 80240AF4 24020002 */ addiu $v0, $zero, 2 +/* 87A6D8 80240AF8 10600007 */ beqz $v1, .L80240B18 +/* 87A6DC 80240AFC 24040005 */ addiu $a0, $zero, 5 +/* 87A6E0 80240B00 0809032C */ j .L80240CB0 +/* 87A6E4 80240B04 00000000 */ nop +.L80240B08: +/* 87A6E8 80240B08 10620058 */ beq $v1, $v0, .L80240C6C +/* 87A6EC 80240B0C 00000000 */ nop +/* 87A6F0 80240B10 0809032C */ j .L80240CB0 +/* 87A6F4 80240B14 00000000 */ nop +.L80240B18: +/* 87A6F8 80240B18 0000882D */ daddu $s1, $zero, $zero +/* 87A6FC 80240B1C 3C148024 */ lui $s4, 0x8024 +/* 87A700 80240B20 26943A48 */ addiu $s4, $s4, 0x3a48 +/* 87A704 80240B24 24130020 */ addiu $s3, $zero, 0x20 +/* 87A708 80240B28 3C064248 */ lui $a2, 0x4248 +/* 87A70C 80240B2C 44800000 */ mtc1 $zero, $f0 +/* 87A710 80240B30 24020014 */ addiu $v0, $zero, 0x14 +/* 87A714 80240B34 AFA20010 */ sw $v0, 0x10($sp) +/* 87A718 80240B38 44050000 */ mfc1 $a1, $f0 +/* 87A71C 80240B3C 8E470060 */ lw $a3, 0x60($s2) +/* 87A720 80240B40 4485B000 */ mtc1 $a1, $f22 +/* 87A724 80240B44 0C00A8ED */ jal update_lerp +/* 87A728 80240B48 0240802D */ daddu $s0, $s2, $zero +/* 87A72C 80240B4C 46000506 */ mov.s $f20, $f0 +.L80240B50: +/* 87A730 80240B50 4406A000 */ mfc1 $a2, $f20 +/* 87A734 80240B54 27A40020 */ addiu $a0, $sp, 0x20 +/* 87A738 80240B58 E6160020 */ swc1 $f22, 0x20($s0) +/* 87A73C 80240B5C 8E870000 */ lw $a3, ($s4) +/* 87A740 80240B60 02532821 */ addu $a1, $s2, $s3 +/* 87A744 80240B64 0C00A7E7 */ jal add_vec2D_polar +/* 87A748 80240B68 E7B60020 */ swc1 $f22, 0x20($sp) +/* 87A74C 80240B6C C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 87A750 80240B70 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 87A754 80240B74 46002102 */ mul.s $f4, $f4, $f0 +/* 87A758 80240B78 00000000 */ nop +/* 87A75C 80240B7C C7A20018 */ lwc1 $f2, 0x18($sp) +/* 87A760 80240B80 26940004 */ addiu $s4, $s4, 4 +/* 87A764 80240B84 46001082 */ mul.s $f2, $f2, $f0 +/* 87A768 80240B88 00000000 */ nop +/* 87A76C 80240B8C 26730004 */ addiu $s3, $s3, 4 +/* 87A770 80240B90 26310001 */ addiu $s1, $s1, 1 +/* 87A774 80240B94 2A220003 */ slti $v0, $s1, 3 +/* 87A778 80240B98 E6040014 */ swc1 $f4, 0x14($s0) +/* 87A77C 80240B9C E602002C */ swc1 $f2, 0x2c($s0) +/* 87A780 80240BA0 1440FFEB */ bnez $v0, .L80240B50 +/* 87A784 80240BA4 26100004 */ addiu $s0, $s0, 4 +/* 87A788 80240BA8 8E420060 */ lw $v0, 0x60($s2) +/* 87A78C 80240BAC 24420001 */ addiu $v0, $v0, 1 +/* 87A790 80240BB0 AE420060 */ sw $v0, 0x60($s2) +/* 87A794 80240BB4 28420015 */ slti $v0, $v0, 0x15 +/* 87A798 80240BB8 1440003D */ bnez $v0, .L80240CB0 +/* 87A79C 80240BBC 24020001 */ addiu $v0, $zero, 1 +/* 87A7A0 80240BC0 AE420000 */ sw $v0, ($s2) +/* 87A7A4 80240BC4 0809032C */ j .L80240CB0 +/* 87A7A8 80240BC8 AE400060 */ sw $zero, 0x60($s2) +.L80240BCC: +/* 87A7AC 80240BCC 0000882D */ daddu $s1, $zero, $zero +/* 87A7B0 80240BD0 3C148024 */ lui $s4, 0x8024 +/* 87A7B4 80240BD4 26943A48 */ addiu $s4, $s4, 0x3a48 +/* 87A7B8 80240BD8 24130020 */ addiu $s3, $zero, 0x20 +/* 87A7BC 80240BDC 0240802D */ daddu $s0, $s2, $zero +/* 87A7C0 80240BE0 3C014248 */ lui $at, 0x4248 +/* 87A7C4 80240BE4 4481A000 */ mtc1 $at, $f20 +/* 87A7C8 80240BE8 4480B000 */ mtc1 $zero, $f22 +.L80240BEC: +/* 87A7CC 80240BEC 4406A000 */ mfc1 $a2, $f20 +/* 87A7D0 80240BF0 27A40020 */ addiu $a0, $sp, 0x20 +/* 87A7D4 80240BF4 E6160020 */ swc1 $f22, 0x20($s0) +/* 87A7D8 80240BF8 8E870000 */ lw $a3, ($s4) +/* 87A7DC 80240BFC 02532821 */ addu $a1, $s2, $s3 +/* 87A7E0 80240C00 0C00A7E7 */ jal add_vec2D_polar +/* 87A7E4 80240C04 E7B60020 */ swc1 $f22, 0x20($sp) +/* 87A7E8 80240C08 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 87A7EC 80240C0C C7A00020 */ lwc1 $f0, 0x20($sp) +/* 87A7F0 80240C10 46002102 */ mul.s $f4, $f4, $f0 +/* 87A7F4 80240C14 00000000 */ nop +/* 87A7F8 80240C18 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 87A7FC 80240C1C 26940004 */ addiu $s4, $s4, 4 +/* 87A800 80240C20 46001082 */ mul.s $f2, $f2, $f0 +/* 87A804 80240C24 00000000 */ nop +/* 87A808 80240C28 26730004 */ addiu $s3, $s3, 4 +/* 87A80C 80240C2C 26310001 */ addiu $s1, $s1, 1 +/* 87A810 80240C30 2A220003 */ slti $v0, $s1, 3 +/* 87A814 80240C34 E6040014 */ swc1 $f4, 0x14($s0) +/* 87A818 80240C38 E602002C */ swc1 $f2, 0x2c($s0) +/* 87A81C 80240C3C 1440FFEB */ bnez $v0, .L80240BEC +/* 87A820 80240C40 26100004 */ addiu $s0, $s0, 4 +/* 87A824 80240C44 8E420060 */ lw $v0, 0x60($s2) +/* 87A828 80240C48 24420001 */ addiu $v0, $v0, 1 +/* 87A82C 80240C4C AE420060 */ sw $v0, 0x60($s2) +/* 87A830 80240C50 28420010 */ slti $v0, $v0, 0x10 +/* 87A834 80240C54 14400016 */ bnez $v0, .L80240CB0 +/* 87A838 80240C58 2402000F */ addiu $v0, $zero, 0xf +/* 87A83C 80240C5C AE420060 */ sw $v0, 0x60($s2) +/* 87A840 80240C60 24020002 */ addiu $v0, $zero, 2 +/* 87A844 80240C64 0809032C */ j .L80240CB0 +/* 87A848 80240C68 AE420000 */ sw $v0, ($s2) +.L80240C6C: +/* 87A84C 80240C6C 8E420060 */ lw $v0, 0x60($s2) +/* 87A850 80240C70 24420001 */ addiu $v0, $v0, 1 +/* 87A854 80240C74 AE420060 */ sw $v0, 0x60($s2) +/* 87A858 80240C78 2842001F */ slti $v0, $v0, 0x1f +/* 87A85C 80240C7C 1440000C */ bnez $v0, .L80240CB0 +/* 87A860 80240C80 0000882D */ daddu $s1, $zero, $zero +/* 87A864 80240C84 0240282D */ daddu $a1, $s2, $zero +.L80240C88: +/* 87A868 80240C88 8CA20008 */ lw $v0, 8($a1) +/* 87A86C 80240C8C 8C430000 */ lw $v1, ($v0) +/* 87A870 80240C90 26310001 */ addiu $s1, $s1, 1 +/* 87A874 80240C94 34630010 */ ori $v1, $v1, 0x10 +/* 87A878 80240C98 AC430000 */ sw $v1, ($v0) +/* 87A87C 80240C9C 2A220003 */ slti $v0, $s1, 3 +/* 87A880 80240CA0 1440FFF9 */ bnez $v0, .L80240C88 +/* 87A884 80240CA4 24A50004 */ addiu $a1, $a1, 4 +/* 87A888 80240CA8 08090379 */ j .L80240DE4 +/* 87A88C 80240CAC 24020002 */ addiu $v0, $zero, 2 +.L80240CB0: +/* 87A890 80240CB0 8E430004 */ lw $v1, 4($s2) +/* 87A894 80240CB4 10600005 */ beqz $v1, .L80240CCC +/* 87A898 80240CB8 24020001 */ addiu $v0, $zero, 1 +/* 87A89C 80240CBC 1062000B */ beq $v1, $v0, .L80240CEC +/* 87A8A0 80240CC0 0000882D */ daddu $s1, $zero, $zero +/* 87A8A4 80240CC4 08090368 */ j .L80240DA0 +/* 87A8A8 80240CC8 0240282D */ daddu $a1, $s2, $zero +.L80240CCC: +/* 87A8AC 80240CCC 8E420064 */ lw $v0, 0x64($s2) +/* 87A8B0 80240CD0 24420001 */ addiu $v0, $v0, 1 +/* 87A8B4 80240CD4 AE420064 */ sw $v0, 0x64($s2) +/* 87A8B8 80240CD8 28420010 */ slti $v0, $v0, 0x10 +/* 87A8BC 80240CDC 1440002F */ bnez $v0, .L80240D9C +/* 87A8C0 80240CE0 0000882D */ daddu $s1, $zero, $zero +/* 87A8C4 80240CE4 08090364 */ j .L80240D90 +/* 87A8C8 80240CE8 24020001 */ addiu $v0, $zero, 1 +.L80240CEC: +/* 87A8CC 80240CEC 4480A000 */ mtc1 $zero, $f20 +/* 87A8D0 80240CF0 24130014 */ addiu $s3, $zero, 0x14 +/* 87A8D4 80240CF4 0240802D */ daddu $s0, $s2, $zero +.L80240CF8: +/* 87A8D8 80240CF8 4405A000 */ mfc1 $a1, $f20 +/* 87A8DC 80240CFC AFB30010 */ sw $s3, 0x10($sp) +/* 87A8E0 80240D00 8E060038 */ lw $a2, 0x38($s0) +/* 87A8E4 80240D04 8E470064 */ lw $a3, 0x64($s2) +/* 87A8E8 80240D08 0C00A8ED */ jal update_lerp +/* 87A8EC 80240D0C 24040001 */ addiu $a0, $zero, 1 +/* 87A8F0 80240D10 C6020014 */ lwc1 $f2, 0x14($s0) +/* 87A8F4 80240D14 46001080 */ add.s $f2, $f2, $f0 +/* 87A8F8 80240D18 4405A000 */ mfc1 $a1, $f20 +/* 87A8FC 80240D1C E6020014 */ swc1 $f2, 0x14($s0) +/* 87A900 80240D20 AFB30010 */ sw $s3, 0x10($sp) +/* 87A904 80240D24 8E060044 */ lw $a2, 0x44($s0) +/* 87A908 80240D28 8E470064 */ lw $a3, 0x64($s2) +/* 87A90C 80240D2C 0C00A8ED */ jal update_lerp +/* 87A910 80240D30 24040001 */ addiu $a0, $zero, 1 +/* 87A914 80240D34 C6020020 */ lwc1 $f2, 0x20($s0) +/* 87A918 80240D38 46001080 */ add.s $f2, $f2, $f0 +/* 87A91C 80240D3C 4405A000 */ mfc1 $a1, $f20 +/* 87A920 80240D40 E6020020 */ swc1 $f2, 0x20($s0) +/* 87A924 80240D44 AFB30010 */ sw $s3, 0x10($sp) +/* 87A928 80240D48 8E060050 */ lw $a2, 0x50($s0) +/* 87A92C 80240D4C 8E470064 */ lw $a3, 0x64($s2) +/* 87A930 80240D50 0C00A8ED */ jal update_lerp +/* 87A934 80240D54 24040001 */ addiu $a0, $zero, 1 +/* 87A938 80240D58 C602002C */ lwc1 $f2, 0x2c($s0) +/* 87A93C 80240D5C 46001080 */ add.s $f2, $f2, $f0 +/* 87A940 80240D60 26310001 */ addiu $s1, $s1, 1 +/* 87A944 80240D64 2A220003 */ slti $v0, $s1, 3 +/* 87A948 80240D68 E602002C */ swc1 $f2, 0x2c($s0) +/* 87A94C 80240D6C 1440FFE2 */ bnez $v0, .L80240CF8 +/* 87A950 80240D70 26100004 */ addiu $s0, $s0, 4 +/* 87A954 80240D74 8E420064 */ lw $v0, 0x64($s2) +/* 87A958 80240D78 24420001 */ addiu $v0, $v0, 1 +/* 87A95C 80240D7C AE420064 */ sw $v0, 0x64($s2) +/* 87A960 80240D80 28420015 */ slti $v0, $v0, 0x15 +/* 87A964 80240D84 14400005 */ bnez $v0, .L80240D9C +/* 87A968 80240D88 0000882D */ daddu $s1, $zero, $zero +/* 87A96C 80240D8C 24020002 */ addiu $v0, $zero, 2 +.L80240D90: +/* 87A970 80240D90 AE420004 */ sw $v0, 4($s2) +/* 87A974 80240D94 AE400064 */ sw $zero, 0x64($s2) +/* 87A978 80240D98 0000882D */ daddu $s1, $zero, $zero +.L80240D9C: +/* 87A97C 80240D9C 0240282D */ daddu $a1, $s2, $zero +.L80240DA0: +/* 87A980 80240DA0 8CA20008 */ lw $v0, 8($a1) +/* 87A984 80240DA4 C4A00014 */ lwc1 $f0, 0x14($a1) +/* 87A988 80240DA8 8C42000C */ lw $v0, 0xc($v0) +/* 87A98C 80240DAC E4400010 */ swc1 $f0, 0x10($v0) +/* 87A990 80240DB0 8CA20008 */ lw $v0, 8($a1) +/* 87A994 80240DB4 C4A00020 */ lwc1 $f0, 0x20($a1) +/* 87A998 80240DB8 8C42000C */ lw $v0, 0xc($v0) +/* 87A99C 80240DBC 26310001 */ addiu $s1, $s1, 1 +/* 87A9A0 80240DC0 E4400014 */ swc1 $f0, 0x14($v0) +/* 87A9A4 80240DC4 8CA20008 */ lw $v0, 8($a1) +/* 87A9A8 80240DC8 C4A0002C */ lwc1 $f0, 0x2c($a1) +/* 87A9AC 80240DCC 8C42000C */ lw $v0, 0xc($v0) +/* 87A9B0 80240DD0 E4400018 */ swc1 $f0, 0x18($v0) +/* 87A9B4 80240DD4 2A220003 */ slti $v0, $s1, 3 +/* 87A9B8 80240DD8 1440FFF1 */ bnez $v0, .L80240DA0 +/* 87A9BC 80240DDC 24A50004 */ addiu $a1, $a1, 4 +/* 87A9C0 80240DE0 0000102D */ daddu $v0, $zero, $zero +.L80240DE4: +/* 87A9C4 80240DE4 8FBF0044 */ lw $ra, 0x44($sp) +/* 87A9C8 80240DE8 8FB60040 */ lw $s6, 0x40($sp) +/* 87A9CC 80240DEC 8FB5003C */ lw $s5, 0x3c($sp) +/* 87A9D0 80240DF0 8FB40038 */ lw $s4, 0x38($sp) +/* 87A9D4 80240DF4 8FB30034 */ lw $s3, 0x34($sp) +/* 87A9D8 80240DF8 8FB20030 */ lw $s2, 0x30($sp) +/* 87A9DC 80240DFC 8FB1002C */ lw $s1, 0x2c($sp) +/* 87A9E0 80240E00 8FB00028 */ lw $s0, 0x28($sp) +/* 87A9E4 80240E04 D7B80058 */ ldc1 $f24, 0x58($sp) +/* 87A9E8 80240E08 D7B60050 */ ldc1 $f22, 0x50($sp) +/* 87A9EC 80240E0C D7B40048 */ ldc1 $f20, 0x48($sp) +/* 87A9F0 80240E10 03E00008 */ jr $ra +/* 87A9F4 80240E14 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18.s deleted file mode 100644 index 2468acae77..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E18 -/* 87A9F8 80240E18 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87A9FC 80240E1C AFB10014 */ sw $s1, 0x14($sp) -/* 87AA00 80240E20 0080882D */ daddu $s1, $a0, $zero -/* 87AA04 80240E24 AFB20018 */ sw $s2, 0x18($sp) -/* 87AA08 80240E28 AFBF001C */ sw $ra, 0x1c($sp) -/* 87AA0C 80240E2C AFB00010 */ sw $s0, 0x10($sp) -/* 87AA10 80240E30 8E30000C */ lw $s0, 0xc($s1) -/* 87AA14 80240E34 10A00010 */ beqz $a1, .L80240E78 -/* 87AA18 80240E38 0000902D */ daddu $s2, $zero, $zero -/* 87AA1C 80240E3C 8E050000 */ lw $a1, ($s0) -/* 87AA20 80240E40 0C0B1EAF */ jal get_variable -/* 87AA24 80240E44 26100004 */ addiu $s0, $s0, 4 -/* 87AA28 80240E48 AE220084 */ sw $v0, 0x84($s1) -/* 87AA2C 80240E4C 8E050000 */ lw $a1, ($s0) -/* 87AA30 80240E50 0C0B1EAF */ jal get_variable -/* 87AA34 80240E54 0220202D */ daddu $a0, $s1, $zero -/* 87AA38 80240E58 0240202D */ daddu $a0, $s2, $zero -/* 87AA3C 80240E5C 240500D0 */ addiu $a1, $zero, 0xd0 -/* 87AA40 80240E60 00A0302D */ daddu $a2, $a1, $zero -/* 87AA44 80240E64 00A0382D */ daddu $a3, $a1, $zero -/* 87AA48 80240E68 AE220088 */ sw $v0, 0x88($s1) -/* 87AA4C 80240E6C AE200070 */ sw $zero, 0x70($s1) -/* 87AA50 80240E70 0C04DF84 */ jal func_80137E10 -/* 87AA54 80240E74 AE200074 */ sw $zero, 0x74($s1) -.L80240E78: -/* 87AA58 80240E78 8E230070 */ lw $v1, 0x70($s1) -/* 87AA5C 80240E7C 24040001 */ addiu $a0, $zero, 1 -/* 87AA60 80240E80 10640019 */ beq $v1, $a0, .L80240EE8 -/* 87AA64 80240E84 28620002 */ slti $v0, $v1, 2 -/* 87AA68 80240E88 10400005 */ beqz $v0, .L80240EA0 -/* 87AA6C 80240E8C 24020002 */ addiu $v0, $zero, 2 -/* 87AA70 80240E90 10600007 */ beqz $v1, .L80240EB0 -/* 87AA74 80240E94 240500FF */ addiu $a1, $zero, 0xff -/* 87AA78 80240E98 080903CA */ j .L80240F28 -/* 87AA7C 80240E9C 00000000 */ nop -.L80240EA0: -/* 87AA80 80240EA0 10620019 */ beq $v1, $v0, .L80240F08 -/* 87AA84 80240EA4 00000000 */ nop -/* 87AA88 80240EA8 080903CA */ j .L80240F28 -/* 87AA8C 80240EAC 00000000 */ nop -.L80240EB0: -/* 87AA90 80240EB0 8E220074 */ lw $v0, 0x74($s1) -/* 87AA94 80240EB4 14450004 */ bne $v0, $a1, .L80240EC8 -/* 87AA98 80240EB8 00000000 */ nop -/* 87AA9C 80240EBC AE240070 */ sw $a0, 0x70($s1) -/* 87AAA0 80240EC0 AE200078 */ sw $zero, 0x78($s1) -/* 87AAA4 80240EC4 8E220074 */ lw $v0, 0x74($s1) -.L80240EC8: -/* 87AAA8 80240EC8 8E230084 */ lw $v1, 0x84($s1) -/* 87AAAC 80240ECC 00431021 */ addu $v0, $v0, $v1 -/* 87AAB0 80240ED0 AE220074 */ sw $v0, 0x74($s1) -/* 87AAB4 80240ED4 28420100 */ slti $v0, $v0, 0x100 -/* 87AAB8 80240ED8 50400013 */ beql $v0, $zero, .L80240F28 -/* 87AABC 80240EDC AE250074 */ sw $a1, 0x74($s1) -/* 87AAC0 80240EE0 080903CA */ j .L80240F28 -/* 87AAC4 80240EE4 00000000 */ nop -.L80240EE8: -/* 87AAC8 80240EE8 8E220078 */ lw $v0, 0x78($s1) -/* 87AACC 80240EEC 24420001 */ addiu $v0, $v0, 1 -/* 87AAD0 80240EF0 AE220078 */ sw $v0, 0x78($s1) -/* 87AAD4 80240EF4 28420002 */ slti $v0, $v0, 2 -/* 87AAD8 80240EF8 1440000B */ bnez $v0, .L80240F28 -/* 87AADC 80240EFC 24020002 */ addiu $v0, $zero, 2 -/* 87AAE0 80240F00 080903CA */ j .L80240F28 -/* 87AAE4 80240F04 AE220070 */ sw $v0, 0x70($s1) -.L80240F08: -/* 87AAE8 80240F08 8E230074 */ lw $v1, 0x74($s1) -/* 87AAEC 80240F0C 50600001 */ beql $v1, $zero, .L80240F14 -/* 87AAF0 80240F10 24120001 */ addiu $s2, $zero, 1 -.L80240F14: -/* 87AAF4 80240F14 8E220088 */ lw $v0, 0x88($s1) -/* 87AAF8 80240F18 00621023 */ subu $v0, $v1, $v0 -/* 87AAFC 80240F1C 04410002 */ bgez $v0, .L80240F28 -/* 87AB00 80240F20 AE220074 */ sw $v0, 0x74($s1) -/* 87AB04 80240F24 AE200074 */ sw $zero, 0x74($s1) -.L80240F28: -/* 87AB08 80240F28 C6200074 */ lwc1 $f0, 0x74($s1) -/* 87AB0C 80240F2C 46800020 */ cvt.s.w $f0, $f0 -/* 87AB10 80240F30 44050000 */ mfc1 $a1, $f0 -/* 87AB14 80240F34 0C04DF62 */ jal func_80137D88 -/* 87AB18 80240F38 24040001 */ addiu $a0, $zero, 1 -/* 87AB1C 80240F3C 0240102D */ daddu $v0, $s2, $zero -/* 87AB20 80240F40 8FBF001C */ lw $ra, 0x1c($sp) -/* 87AB24 80240F44 8FB20018 */ lw $s2, 0x18($sp) -/* 87AB28 80240F48 8FB10014 */ lw $s1, 0x14($sp) -/* 87AB2C 80240F4C 8FB00010 */ lw $s0, 0x10($sp) -/* 87AB30 80240F50 03E00008 */ jr $ra -/* 87AB34 80240F54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s new file mode 100644 index 0000000000..38bebb2963 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240E18_87A9F8.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E18_87A9F8 +/* 87A9F8 80240E18 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 87A9FC 80240E1C AFB10014 */ sw $s1, 0x14($sp) +/* 87AA00 80240E20 0080882D */ daddu $s1, $a0, $zero +/* 87AA04 80240E24 AFB20018 */ sw $s2, 0x18($sp) +/* 87AA08 80240E28 AFBF001C */ sw $ra, 0x1c($sp) +/* 87AA0C 80240E2C AFB00010 */ sw $s0, 0x10($sp) +/* 87AA10 80240E30 8E30000C */ lw $s0, 0xc($s1) +/* 87AA14 80240E34 10A00010 */ beqz $a1, .L80240E78 +/* 87AA18 80240E38 0000902D */ daddu $s2, $zero, $zero +/* 87AA1C 80240E3C 8E050000 */ lw $a1, ($s0) +/* 87AA20 80240E40 0C0B1EAF */ jal get_variable +/* 87AA24 80240E44 26100004 */ addiu $s0, $s0, 4 +/* 87AA28 80240E48 AE220084 */ sw $v0, 0x84($s1) +/* 87AA2C 80240E4C 8E050000 */ lw $a1, ($s0) +/* 87AA30 80240E50 0C0B1EAF */ jal get_variable +/* 87AA34 80240E54 0220202D */ daddu $a0, $s1, $zero +/* 87AA38 80240E58 0240202D */ daddu $a0, $s2, $zero +/* 87AA3C 80240E5C 240500D0 */ addiu $a1, $zero, 0xd0 +/* 87AA40 80240E60 00A0302D */ daddu $a2, $a1, $zero +/* 87AA44 80240E64 00A0382D */ daddu $a3, $a1, $zero +/* 87AA48 80240E68 AE220088 */ sw $v0, 0x88($s1) +/* 87AA4C 80240E6C AE200070 */ sw $zero, 0x70($s1) +/* 87AA50 80240E70 0C04DF84 */ jal func_80137E10 +/* 87AA54 80240E74 AE200074 */ sw $zero, 0x74($s1) +.L80240E78: +/* 87AA58 80240E78 8E230070 */ lw $v1, 0x70($s1) +/* 87AA5C 80240E7C 24040001 */ addiu $a0, $zero, 1 +/* 87AA60 80240E80 10640019 */ beq $v1, $a0, .L80240EE8 +/* 87AA64 80240E84 28620002 */ slti $v0, $v1, 2 +/* 87AA68 80240E88 10400005 */ beqz $v0, .L80240EA0 +/* 87AA6C 80240E8C 24020002 */ addiu $v0, $zero, 2 +/* 87AA70 80240E90 10600007 */ beqz $v1, .L80240EB0 +/* 87AA74 80240E94 240500FF */ addiu $a1, $zero, 0xff +/* 87AA78 80240E98 080903CA */ j .L80240F28 +/* 87AA7C 80240E9C 00000000 */ nop +.L80240EA0: +/* 87AA80 80240EA0 10620019 */ beq $v1, $v0, .L80240F08 +/* 87AA84 80240EA4 00000000 */ nop +/* 87AA88 80240EA8 080903CA */ j .L80240F28 +/* 87AA8C 80240EAC 00000000 */ nop +.L80240EB0: +/* 87AA90 80240EB0 8E220074 */ lw $v0, 0x74($s1) +/* 87AA94 80240EB4 14450004 */ bne $v0, $a1, .L80240EC8 +/* 87AA98 80240EB8 00000000 */ nop +/* 87AA9C 80240EBC AE240070 */ sw $a0, 0x70($s1) +/* 87AAA0 80240EC0 AE200078 */ sw $zero, 0x78($s1) +/* 87AAA4 80240EC4 8E220074 */ lw $v0, 0x74($s1) +.L80240EC8: +/* 87AAA8 80240EC8 8E230084 */ lw $v1, 0x84($s1) +/* 87AAAC 80240ECC 00431021 */ addu $v0, $v0, $v1 +/* 87AAB0 80240ED0 AE220074 */ sw $v0, 0x74($s1) +/* 87AAB4 80240ED4 28420100 */ slti $v0, $v0, 0x100 +/* 87AAB8 80240ED8 50400013 */ beql $v0, $zero, .L80240F28 +/* 87AABC 80240EDC AE250074 */ sw $a1, 0x74($s1) +/* 87AAC0 80240EE0 080903CA */ j .L80240F28 +/* 87AAC4 80240EE4 00000000 */ nop +.L80240EE8: +/* 87AAC8 80240EE8 8E220078 */ lw $v0, 0x78($s1) +/* 87AACC 80240EEC 24420001 */ addiu $v0, $v0, 1 +/* 87AAD0 80240EF0 AE220078 */ sw $v0, 0x78($s1) +/* 87AAD4 80240EF4 28420002 */ slti $v0, $v0, 2 +/* 87AAD8 80240EF8 1440000B */ bnez $v0, .L80240F28 +/* 87AADC 80240EFC 24020002 */ addiu $v0, $zero, 2 +/* 87AAE0 80240F00 080903CA */ j .L80240F28 +/* 87AAE4 80240F04 AE220070 */ sw $v0, 0x70($s1) +.L80240F08: +/* 87AAE8 80240F08 8E230074 */ lw $v1, 0x74($s1) +/* 87AAEC 80240F0C 50600001 */ beql $v1, $zero, .L80240F14 +/* 87AAF0 80240F10 24120001 */ addiu $s2, $zero, 1 +.L80240F14: +/* 87AAF4 80240F14 8E220088 */ lw $v0, 0x88($s1) +/* 87AAF8 80240F18 00621023 */ subu $v0, $v1, $v0 +/* 87AAFC 80240F1C 04410002 */ bgez $v0, .L80240F28 +/* 87AB00 80240F20 AE220074 */ sw $v0, 0x74($s1) +/* 87AB04 80240F24 AE200074 */ sw $zero, 0x74($s1) +.L80240F28: +/* 87AB08 80240F28 C6200074 */ lwc1 $f0, 0x74($s1) +/* 87AB0C 80240F2C 46800020 */ cvt.s.w $f0, $f0 +/* 87AB10 80240F30 44050000 */ mfc1 $a1, $f0 +/* 87AB14 80240F34 0C04DF62 */ jal func_80137D88 +/* 87AB18 80240F38 24040001 */ addiu $a0, $zero, 1 +/* 87AB1C 80240F3C 0240102D */ daddu $v0, $s2, $zero +/* 87AB20 80240F40 8FBF001C */ lw $ra, 0x1c($sp) +/* 87AB24 80240F44 8FB20018 */ lw $s2, 0x18($sp) +/* 87AB28 80240F48 8FB10014 */ lw $s1, 0x14($sp) +/* 87AB2C 80240F4C 8FB00010 */ lw $s0, 0x10($sp) +/* 87AB30 80240F50 03E00008 */ jr $ra +/* 87AB34 80240F54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58.s deleted file mode 100644 index f5680db1be..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F58 -/* 87AB38 80240F58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87AB3C 80240F5C AFBF0018 */ sw $ra, 0x18($sp) -/* 87AB40 80240F60 0C00EAD2 */ jal get_npc_safe -/* 87AB44 80240F64 2404FFFC */ addiu $a0, $zero, -4 -/* 87AB48 80240F68 3C0141F0 */ lui $at, 0x41f0 -/* 87AB4C 80240F6C 44810000 */ mtc1 $at, $f0 -/* 87AB50 80240F70 C442003C */ lwc1 $f2, 0x3c($v0) -/* 87AB54 80240F74 46001080 */ add.s $f2, $f2, $f0 -/* 87AB58 80240F78 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87AB5C 80240F7C 8C450038 */ lw $a1, 0x38($v0) -/* 87AB60 80240F80 8C470040 */ lw $a3, 0x40($v0) -/* 87AB64 80240F84 44061000 */ mfc1 $a2, $f2 -/* 87AB68 80240F88 0C01BFBC */ jal func_8006FEF0 -/* 87AB6C 80240F8C 24040002 */ addiu $a0, $zero, 2 -/* 87AB70 80240F90 8FBF0018 */ lw $ra, 0x18($sp) -/* 87AB74 80240F94 24020002 */ addiu $v0, $zero, 2 -/* 87AB78 80240F98 03E00008 */ jr $ra -/* 87AB7C 80240F9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58_87AB38.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58_87AB38.s new file mode 100644 index 0000000000..532ed0f70e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240F58_87AB38.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F58_87AB38 +/* 87AB38 80240F58 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 87AB3C 80240F5C AFBF0018 */ sw $ra, 0x18($sp) +/* 87AB40 80240F60 0C00EAD2 */ jal get_npc_safe +/* 87AB44 80240F64 2404FFFC */ addiu $a0, $zero, -4 +/* 87AB48 80240F68 3C0141F0 */ lui $at, 0x41f0 +/* 87AB4C 80240F6C 44810000 */ mtc1 $at, $f0 +/* 87AB50 80240F70 C442003C */ lwc1 $f2, 0x3c($v0) +/* 87AB54 80240F74 46001080 */ add.s $f2, $f2, $f0 +/* 87AB58 80240F78 E7A00010 */ swc1 $f0, 0x10($sp) +/* 87AB5C 80240F7C 8C450038 */ lw $a1, 0x38($v0) +/* 87AB60 80240F80 8C470040 */ lw $a3, 0x40($v0) +/* 87AB64 80240F84 44061000 */ mfc1 $a2, $f2 +/* 87AB68 80240F88 0C01BFBC */ jal func_8006FEF0 +/* 87AB6C 80240F8C 24040002 */ addiu $a0, $zero, 2 +/* 87AB70 80240F90 8FBF0018 */ lw $ra, 0x18($sp) +/* 87AB74 80240F94 24020002 */ addiu $v0, $zero, 2 +/* 87AB78 80240F98 03E00008 */ jr $ra +/* 87AB7C 80240F9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8.s deleted file mode 100644 index 92422aaa10..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE8 -/* 87ABC8 80240FE8 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 87ABCC 80240FEC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 87ABD0 80240FF0 AC800084 */ sw $zero, 0x84($a0) -/* 87ABD4 80240FF4 80620000 */ lb $v0, ($v1) -/* 87ABD8 80240FF8 10400005 */ beqz $v0, .L80241010 -/* 87ABDC 80240FFC 24020003 */ addiu $v0, $zero, 3 -/* 87ABE0 80241000 80630003 */ lb $v1, 3($v1) -/* 87ABE4 80241004 14620002 */ bne $v1, $v0, .L80241010 -/* 87ABE8 80241008 24020001 */ addiu $v0, $zero, 1 -/* 87ABEC 8024100C AC820084 */ sw $v0, 0x84($a0) -.L80241010: -/* 87ABF0 80241010 03E00008 */ jr $ra -/* 87ABF4 80241014 24020002 */ addiu $v0, $zero, 2 -/* 87ABF8 80241018 00000000 */ nop -/* 87ABFC 8024101C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s new file mode 100644 index 0000000000..1bb4feac14 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240FE8_87ABC8.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FE8_87ABC8 +/* 87ABC8 80240FE8 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* 87ABCC 80240FEC 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 87ABD0 80240FF0 AC800084 */ sw $zero, 0x84($a0) +/* 87ABD4 80240FF4 80620000 */ lb $v0, ($v1) +/* 87ABD8 80240FF8 10400005 */ beqz $v0, .L80241010 +/* 87ABDC 80240FFC 24020003 */ addiu $v0, $zero, 3 +/* 87ABE0 80241000 80630003 */ lb $v1, 3($v1) +/* 87ABE4 80241004 14620002 */ bne $v1, $v0, .L80241010 +/* 87ABE8 80241008 24020001 */ addiu $v0, $zero, 1 +/* 87ABEC 8024100C AC820084 */ sw $v0, 0x84($a0) +.L80241010: +/* 87ABF0 80241010 03E00008 */ jr $ra +/* 87ABF4 80241014 24020002 */ addiu $v0, $zero, 2 +/* 87ABF8 80241018 00000000 */ nop +/* 87ABFC 8024101C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020.s deleted file mode 100644 index d119fd8dfd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241020 -/* 87AC00 80241020 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 87AC04 80241024 AFB3001C */ sw $s3, 0x1c($sp) -/* 87AC08 80241028 0080982D */ daddu $s3, $a0, $zero -/* 87AC0C 8024102C AFBF0020 */ sw $ra, 0x20($sp) -/* 87AC10 80241030 AFB20018 */ sw $s2, 0x18($sp) -/* 87AC14 80241034 AFB10014 */ sw $s1, 0x14($sp) -/* 87AC18 80241038 AFB00010 */ sw $s0, 0x10($sp) -/* 87AC1C 8024103C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 87AC20 80241040 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 87AC24 80241044 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 87AC28 80241048 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 87AC2C 8024104C 8E62000C */ lw $v0, 0xc($s3) -/* 87AC30 80241050 0C0B1EAF */ jal get_variable -/* 87AC34 80241054 8C450000 */ lw $a1, ($v0) -/* 87AC38 80241058 2404FFFC */ addiu $a0, $zero, -4 -/* 87AC3C 8024105C 0C00EABB */ jal get_npc_unsafe -/* 87AC40 80241060 0040802D */ daddu $s0, $v0, $zero -/* 87AC44 80241064 0200202D */ daddu $a0, $s0, $zero -/* 87AC48 80241068 0C046C04 */ jal get_model_list_index_from_tree_index -/* 87AC4C 8024106C 0040802D */ daddu $s0, $v0, $zero -/* 87AC50 80241070 0C046B4C */ jal get_model_from_list_index -/* 87AC54 80241074 0040202D */ daddu $a0, $v0, $zero -/* 87AC58 80241078 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 87AC5C 8024107C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 87AC60 80241080 0040902D */ daddu $s2, $v0, $zero -/* 87AC64 80241084 AE60008C */ sw $zero, 0x8c($s3) -/* 87AC68 80241088 C4620028 */ lwc1 $f2, 0x28($v1) -/* 87AC6C 8024108C C6400098 */ lwc1 $f0, 0x98($s2) -/* 87AC70 80241090 46001081 */ sub.s $f2, $f2, $f0 -/* 87AC74 80241094 46021182 */ mul.s $f6, $f2, $f2 -/* 87AC78 80241098 00000000 */ nop -/* 87AC7C 8024109C C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87AC80 802410A0 C4620030 */ lwc1 $f2, 0x30($v1) -/* 87AC84 802410A4 46001081 */ sub.s $f2, $f2, $f0 -/* 87AC88 802410A8 46021102 */ mul.s $f4, $f2, $f2 -/* 87AC8C 802410AC 00000000 */ nop -/* 87AC90 802410B0 846200B0 */ lh $v0, 0xb0($v1) -/* 87AC94 802410B4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 87AC98 802410B8 44820000 */ mtc1 $v0, $f0 -/* 87AC9C 802410BC 00000000 */ nop -/* 87ACA0 802410C0 46800020 */ cvt.s.w $f0, $f0 -/* 87ACA4 802410C4 46001080 */ add.s $f2, $f2, $f0 -/* 87ACA8 802410C8 3C013FC0 */ lui $at, 0x3fc0 -/* 87ACAC 802410CC 44810000 */ mtc1 $at, $f0 -/* 87ACB0 802410D0 00000000 */ nop -/* 87ACB4 802410D4 46001081 */ sub.s $f2, $f2, $f0 -/* 87ACB8 802410D8 46043300 */ add.s $f12, $f6, $f4 -/* 87ACBC 802410DC C640009C */ lwc1 $f0, 0x9c($s2) -/* 87ACC0 802410E0 46001501 */ sub.s $f20, $f2, $f0 -/* 87ACC4 802410E4 46006084 */ sqrt.s $f2, $f12 -/* 87ACC8 802410E8 46021032 */ c.eq.s $f2, $f2 -/* 87ACCC 802410EC 00000000 */ nop -/* 87ACD0 802410F0 45010004 */ bc1t .L80241104 -/* 87ACD4 802410F4 0060882D */ daddu $s1, $v1, $zero -/* 87ACD8 802410F8 0C0187BC */ jal sqrtf -/* 87ACDC 802410FC 00000000 */ nop -/* 87ACE0 80241100 46000086 */ mov.s $f2, $f0 -.L80241104: -/* 87ACE4 80241104 44800000 */ mtc1 $zero, $f0 -/* 87ACE8 80241108 00000000 */ nop -/* 87ACEC 8024110C 4614003C */ c.lt.s $f0, $f20 -/* 87ACF0 80241110 00000000 */ nop -/* 87ACF4 80241114 45000016 */ bc1f .L80241170 -/* 87ACF8 80241118 46001106 */ mov.s $f4, $f2 -/* 87ACFC 8024111C 862200B0 */ lh $v0, 0xb0($s1) -/* 87AD00 80241120 44820000 */ mtc1 $v0, $f0 -/* 87AD04 80241124 00000000 */ nop -/* 87AD08 80241128 46800020 */ cvt.s.w $f0, $f0 -/* 87AD0C 8024112C 4600A03C */ c.lt.s $f20, $f0 -/* 87AD10 80241130 00000000 */ nop -/* 87AD14 80241134 4500000E */ bc1f .L80241170 -/* 87AD18 80241138 00000000 */ nop -/* 87AD1C 8024113C 862200B2 */ lh $v0, 0xb2($s1) -/* 87AD20 80241140 3C013F00 */ lui $at, 0x3f00 -/* 87AD24 80241144 44811000 */ mtc1 $at, $f2 -/* 87AD28 80241148 44820000 */ mtc1 $v0, $f0 -/* 87AD2C 8024114C 00000000 */ nop -/* 87AD30 80241150 46800020 */ cvt.s.w $f0, $f0 -/* 87AD34 80241154 46020002 */ mul.s $f0, $f0, $f2 -/* 87AD38 80241158 00000000 */ nop -/* 87AD3C 8024115C 4600203C */ c.lt.s $f4, $f0 -/* 87AD40 80241160 00000000 */ nop -/* 87AD44 80241164 45000002 */ bc1f .L80241170 -/* 87AD48 80241168 24020001 */ addiu $v0, $zero, 1 -/* 87AD4C 8024116C AE62008C */ sw $v0, 0x8c($s3) -.L80241170: -/* 87AD50 80241170 C6020038 */ lwc1 $f2, 0x38($s0) -/* 87AD54 80241174 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87AD58 80241178 46001081 */ sub.s $f2, $f2, $f0 -/* 87AD5C 8024117C 46021182 */ mul.s $f6, $f2, $f2 -/* 87AD60 80241180 00000000 */ nop -/* 87AD64 80241184 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87AD68 80241188 C6020040 */ lwc1 $f2, 0x40($s0) -/* 87AD6C 8024118C 46001081 */ sub.s $f2, $f2, $f0 -/* 87AD70 80241190 46021102 */ mul.s $f4, $f2, $f2 -/* 87AD74 80241194 00000000 */ nop -/* 87AD78 80241198 860200A8 */ lh $v0, 0xa8($s0) -/* 87AD7C 8024119C C602003C */ lwc1 $f2, 0x3c($s0) -/* 87AD80 802411A0 44820000 */ mtc1 $v0, $f0 -/* 87AD84 802411A4 00000000 */ nop -/* 87AD88 802411A8 46800020 */ cvt.s.w $f0, $f0 -/* 87AD8C 802411AC 46001080 */ add.s $f2, $f2, $f0 -/* 87AD90 802411B0 3C013FC0 */ lui $at, 0x3fc0 -/* 87AD94 802411B4 44810000 */ mtc1 $at, $f0 -/* 87AD98 802411B8 00000000 */ nop -/* 87AD9C 802411BC 46001081 */ sub.s $f2, $f2, $f0 -/* 87ADA0 802411C0 46043300 */ add.s $f12, $f6, $f4 -/* 87ADA4 802411C4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 87ADA8 802411C8 46001501 */ sub.s $f20, $f2, $f0 -/* 87ADAC 802411CC 46006084 */ sqrt.s $f2, $f12 -/* 87ADB0 802411D0 46021032 */ c.eq.s $f2, $f2 -/* 87ADB4 802411D4 00000000 */ nop -/* 87ADB8 802411D8 45010004 */ bc1t .L802411EC -/* 87ADBC 802411DC 00000000 */ nop -/* 87ADC0 802411E0 0C0187BC */ jal sqrtf -/* 87ADC4 802411E4 00000000 */ nop -/* 87ADC8 802411E8 46000086 */ mov.s $f2, $f0 -.L802411EC: -/* 87ADCC 802411EC 44800000 */ mtc1 $zero, $f0 -/* 87ADD0 802411F0 00000000 */ nop -/* 87ADD4 802411F4 4614003C */ c.lt.s $f0, $f20 -/* 87ADD8 802411F8 00000000 */ nop -/* 87ADDC 802411FC 45000016 */ bc1f .L80241258 -/* 87ADE0 80241200 46001106 */ mov.s $f4, $f2 -/* 87ADE4 80241204 860200A8 */ lh $v0, 0xa8($s0) -/* 87ADE8 80241208 44820000 */ mtc1 $v0, $f0 -/* 87ADEC 8024120C 00000000 */ nop -/* 87ADF0 80241210 46800020 */ cvt.s.w $f0, $f0 -/* 87ADF4 80241214 4600A03C */ c.lt.s $f20, $f0 -/* 87ADF8 80241218 00000000 */ nop -/* 87ADFC 8024121C 4500000F */ bc1f .L8024125C -/* 87AE00 80241220 0000882D */ daddu $s1, $zero, $zero -/* 87AE04 80241224 860200A6 */ lh $v0, 0xa6($s0) -/* 87AE08 80241228 3C013F00 */ lui $at, 0x3f00 -/* 87AE0C 8024122C 44811000 */ mtc1 $at, $f2 -/* 87AE10 80241230 44820000 */ mtc1 $v0, $f0 -/* 87AE14 80241234 00000000 */ nop -/* 87AE18 80241238 46800020 */ cvt.s.w $f0, $f0 -/* 87AE1C 8024123C 46020002 */ mul.s $f0, $f0, $f2 -/* 87AE20 80241240 00000000 */ nop -/* 87AE24 80241244 4600203C */ c.lt.s $f4, $f0 -/* 87AE28 80241248 00000000 */ nop -/* 87AE2C 8024124C 45000003 */ bc1f .L8024125C -/* 87AE30 80241250 24020001 */ addiu $v0, $zero, 1 -/* 87AE34 80241254 AE62008C */ sw $v0, 0x8c($s3) -.L80241258: -/* 87AE38 80241258 0000882D */ daddu $s1, $zero, $zero -.L8024125C: -/* 87AE3C 8024125C 3C013FC0 */ lui $at, 0x3fc0 -/* 87AE40 80241260 4481D000 */ mtc1 $at, $f26 -/* 87AE44 80241264 4480C000 */ mtc1 $zero, $f24 -/* 87AE48 80241268 3C013F00 */ lui $at, 0x3f00 -/* 87AE4C 8024126C 4481B000 */ mtc1 $at, $f22 -.L80241270: -/* 87AE50 80241270 0C00EAD2 */ jal get_npc_safe -/* 87AE54 80241274 0220202D */ daddu $a0, $s1, $zero -/* 87AE58 80241278 0040802D */ daddu $s0, $v0, $zero -/* 87AE5C 8024127C 52000035 */ beql $s0, $zero, .L80241354 -/* 87AE60 80241280 26310001 */ addiu $s1, $s1, 1 -/* 87AE64 80241284 C6020038 */ lwc1 $f2, 0x38($s0) -/* 87AE68 80241288 C6400098 */ lwc1 $f0, 0x98($s2) -/* 87AE6C 8024128C 46001081 */ sub.s $f2, $f2, $f0 -/* 87AE70 80241290 46021182 */ mul.s $f6, $f2, $f2 -/* 87AE74 80241294 00000000 */ nop -/* 87AE78 80241298 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 87AE7C 8024129C C6020040 */ lwc1 $f2, 0x40($s0) -/* 87AE80 802412A0 46001081 */ sub.s $f2, $f2, $f0 -/* 87AE84 802412A4 46021102 */ mul.s $f4, $f2, $f2 -/* 87AE88 802412A8 00000000 */ nop -/* 87AE8C 802412AC 860200A8 */ lh $v0, 0xa8($s0) -/* 87AE90 802412B0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87AE94 802412B4 44820000 */ mtc1 $v0, $f0 -/* 87AE98 802412B8 00000000 */ nop -/* 87AE9C 802412BC 46800020 */ cvt.s.w $f0, $f0 -/* 87AEA0 802412C0 46001080 */ add.s $f2, $f2, $f0 -/* 87AEA4 802412C4 461A1081 */ sub.s $f2, $f2, $f26 -/* 87AEA8 802412C8 46043300 */ add.s $f12, $f6, $f4 -/* 87AEAC 802412CC C640009C */ lwc1 $f0, 0x9c($s2) -/* 87AEB0 802412D0 46001501 */ sub.s $f20, $f2, $f0 -/* 87AEB4 802412D4 46006004 */ sqrt.s $f0, $f12 -/* 87AEB8 802412D8 46000032 */ c.eq.s $f0, $f0 -/* 87AEBC 802412DC 00000000 */ nop -/* 87AEC0 802412E0 45010003 */ bc1t .L802412F0 -/* 87AEC4 802412E4 00000000 */ nop -/* 87AEC8 802412E8 0C0187BC */ jal sqrtf -/* 87AECC 802412EC 00000000 */ nop -.L802412F0: -/* 87AED0 802412F0 4614C03C */ c.lt.s $f24, $f20 -/* 87AED4 802412F4 00000000 */ nop -/* 87AED8 802412F8 45000015 */ bc1f .L80241350 -/* 87AEDC 802412FC 46000106 */ mov.s $f4, $f0 -/* 87AEE0 80241300 860200A8 */ lh $v0, 0xa8($s0) -/* 87AEE4 80241304 44820000 */ mtc1 $v0, $f0 -/* 87AEE8 80241308 00000000 */ nop -/* 87AEEC 8024130C 46800020 */ cvt.s.w $f0, $f0 -/* 87AEF0 80241310 4600A03C */ c.lt.s $f20, $f0 -/* 87AEF4 80241314 00000000 */ nop -/* 87AEF8 80241318 4500000E */ bc1f .L80241354 -/* 87AEFC 8024131C 26310001 */ addiu $s1, $s1, 1 -/* 87AF00 80241320 860200A6 */ lh $v0, 0xa6($s0) -/* 87AF04 80241324 44820000 */ mtc1 $v0, $f0 -/* 87AF08 80241328 00000000 */ nop -/* 87AF0C 8024132C 46800020 */ cvt.s.w $f0, $f0 -/* 87AF10 80241330 46160002 */ mul.s $f0, $f0, $f22 -/* 87AF14 80241334 00000000 */ nop -/* 87AF18 80241338 4600203C */ c.lt.s $f4, $f0 -/* 87AF1C 8024133C 00000000 */ nop -/* 87AF20 80241340 45000004 */ bc1f .L80241354 -/* 87AF24 80241344 24020001 */ addiu $v0, $zero, 1 -/* 87AF28 80241348 080904D8 */ j .L80241360 -/* 87AF2C 8024134C AE62008C */ sw $v0, 0x8c($s3) -.L80241350: -/* 87AF30 80241350 26310001 */ addiu $s1, $s1, 1 -.L80241354: -/* 87AF34 80241354 2A220040 */ slti $v0, $s1, 0x40 -/* 87AF38 80241358 1440FFC5 */ bnez $v0, .L80241270 -/* 87AF3C 8024135C 00000000 */ nop -.L80241360: -/* 87AF40 80241360 8FBF0020 */ lw $ra, 0x20($sp) -/* 87AF44 80241364 8FB3001C */ lw $s3, 0x1c($sp) -/* 87AF48 80241368 8FB20018 */ lw $s2, 0x18($sp) -/* 87AF4C 8024136C 8FB10014 */ lw $s1, 0x14($sp) -/* 87AF50 80241370 8FB00010 */ lw $s0, 0x10($sp) -/* 87AF54 80241374 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 87AF58 80241378 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 87AF5C 8024137C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 87AF60 80241380 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 87AF64 80241384 24020002 */ addiu $v0, $zero, 2 -/* 87AF68 80241388 03E00008 */ jr $ra -/* 87AF6C 8024138C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s new file mode 100644 index 0000000000..647d4611ba --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241020_87AC00.s @@ -0,0 +1,234 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241020_87AC00 +/* 87AC00 80241020 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 87AC04 80241024 AFB3001C */ sw $s3, 0x1c($sp) +/* 87AC08 80241028 0080982D */ daddu $s3, $a0, $zero +/* 87AC0C 8024102C AFBF0020 */ sw $ra, 0x20($sp) +/* 87AC10 80241030 AFB20018 */ sw $s2, 0x18($sp) +/* 87AC14 80241034 AFB10014 */ sw $s1, 0x14($sp) +/* 87AC18 80241038 AFB00010 */ sw $s0, 0x10($sp) +/* 87AC1C 8024103C F7BA0040 */ sdc1 $f26, 0x40($sp) +/* 87AC20 80241040 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 87AC24 80241044 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 87AC28 80241048 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 87AC2C 8024104C 8E62000C */ lw $v0, 0xc($s3) +/* 87AC30 80241050 0C0B1EAF */ jal get_variable +/* 87AC34 80241054 8C450000 */ lw $a1, ($v0) +/* 87AC38 80241058 2404FFFC */ addiu $a0, $zero, -4 +/* 87AC3C 8024105C 0C00EABB */ jal get_npc_unsafe +/* 87AC40 80241060 0040802D */ daddu $s0, $v0, $zero +/* 87AC44 80241064 0200202D */ daddu $a0, $s0, $zero +/* 87AC48 80241068 0C046C04 */ jal get_model_list_index_from_tree_index +/* 87AC4C 8024106C 0040802D */ daddu $s0, $v0, $zero +/* 87AC50 80241070 0C046B4C */ jal get_model_from_list_index +/* 87AC54 80241074 0040202D */ daddu $a0, $v0, $zero +/* 87AC58 80241078 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 87AC5C 8024107C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 87AC60 80241080 0040902D */ daddu $s2, $v0, $zero +/* 87AC64 80241084 AE60008C */ sw $zero, 0x8c($s3) +/* 87AC68 80241088 C4620028 */ lwc1 $f2, 0x28($v1) +/* 87AC6C 8024108C C6400098 */ lwc1 $f0, 0x98($s2) +/* 87AC70 80241090 46001081 */ sub.s $f2, $f2, $f0 +/* 87AC74 80241094 46021182 */ mul.s $f6, $f2, $f2 +/* 87AC78 80241098 00000000 */ nop +/* 87AC7C 8024109C C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 87AC80 802410A0 C4620030 */ lwc1 $f2, 0x30($v1) +/* 87AC84 802410A4 46001081 */ sub.s $f2, $f2, $f0 +/* 87AC88 802410A8 46021102 */ mul.s $f4, $f2, $f2 +/* 87AC8C 802410AC 00000000 */ nop +/* 87AC90 802410B0 846200B0 */ lh $v0, 0xb0($v1) +/* 87AC94 802410B4 C462002C */ lwc1 $f2, 0x2c($v1) +/* 87AC98 802410B8 44820000 */ mtc1 $v0, $f0 +/* 87AC9C 802410BC 00000000 */ nop +/* 87ACA0 802410C0 46800020 */ cvt.s.w $f0, $f0 +/* 87ACA4 802410C4 46001080 */ add.s $f2, $f2, $f0 +/* 87ACA8 802410C8 3C013FC0 */ lui $at, 0x3fc0 +/* 87ACAC 802410CC 44810000 */ mtc1 $at, $f0 +/* 87ACB0 802410D0 00000000 */ nop +/* 87ACB4 802410D4 46001081 */ sub.s $f2, $f2, $f0 +/* 87ACB8 802410D8 46043300 */ add.s $f12, $f6, $f4 +/* 87ACBC 802410DC C640009C */ lwc1 $f0, 0x9c($s2) +/* 87ACC0 802410E0 46001501 */ sub.s $f20, $f2, $f0 +/* 87ACC4 802410E4 46006084 */ sqrt.s $f2, $f12 +/* 87ACC8 802410E8 46021032 */ c.eq.s $f2, $f2 +/* 87ACCC 802410EC 00000000 */ nop +/* 87ACD0 802410F0 45010004 */ bc1t .L80241104 +/* 87ACD4 802410F4 0060882D */ daddu $s1, $v1, $zero +/* 87ACD8 802410F8 0C0187BC */ jal sqrtf +/* 87ACDC 802410FC 00000000 */ nop +/* 87ACE0 80241100 46000086 */ mov.s $f2, $f0 +.L80241104: +/* 87ACE4 80241104 44800000 */ mtc1 $zero, $f0 +/* 87ACE8 80241108 00000000 */ nop +/* 87ACEC 8024110C 4614003C */ c.lt.s $f0, $f20 +/* 87ACF0 80241110 00000000 */ nop +/* 87ACF4 80241114 45000016 */ bc1f .L80241170 +/* 87ACF8 80241118 46001106 */ mov.s $f4, $f2 +/* 87ACFC 8024111C 862200B0 */ lh $v0, 0xb0($s1) +/* 87AD00 80241120 44820000 */ mtc1 $v0, $f0 +/* 87AD04 80241124 00000000 */ nop +/* 87AD08 80241128 46800020 */ cvt.s.w $f0, $f0 +/* 87AD0C 8024112C 4600A03C */ c.lt.s $f20, $f0 +/* 87AD10 80241130 00000000 */ nop +/* 87AD14 80241134 4500000E */ bc1f .L80241170 +/* 87AD18 80241138 00000000 */ nop +/* 87AD1C 8024113C 862200B2 */ lh $v0, 0xb2($s1) +/* 87AD20 80241140 3C013F00 */ lui $at, 0x3f00 +/* 87AD24 80241144 44811000 */ mtc1 $at, $f2 +/* 87AD28 80241148 44820000 */ mtc1 $v0, $f0 +/* 87AD2C 8024114C 00000000 */ nop +/* 87AD30 80241150 46800020 */ cvt.s.w $f0, $f0 +/* 87AD34 80241154 46020002 */ mul.s $f0, $f0, $f2 +/* 87AD38 80241158 00000000 */ nop +/* 87AD3C 8024115C 4600203C */ c.lt.s $f4, $f0 +/* 87AD40 80241160 00000000 */ nop +/* 87AD44 80241164 45000002 */ bc1f .L80241170 +/* 87AD48 80241168 24020001 */ addiu $v0, $zero, 1 +/* 87AD4C 8024116C AE62008C */ sw $v0, 0x8c($s3) +.L80241170: +/* 87AD50 80241170 C6020038 */ lwc1 $f2, 0x38($s0) +/* 87AD54 80241174 C6400098 */ lwc1 $f0, 0x98($s2) +/* 87AD58 80241178 46001081 */ sub.s $f2, $f2, $f0 +/* 87AD5C 8024117C 46021182 */ mul.s $f6, $f2, $f2 +/* 87AD60 80241180 00000000 */ nop +/* 87AD64 80241184 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 87AD68 80241188 C6020040 */ lwc1 $f2, 0x40($s0) +/* 87AD6C 8024118C 46001081 */ sub.s $f2, $f2, $f0 +/* 87AD70 80241190 46021102 */ mul.s $f4, $f2, $f2 +/* 87AD74 80241194 00000000 */ nop +/* 87AD78 80241198 860200A8 */ lh $v0, 0xa8($s0) +/* 87AD7C 8024119C C602003C */ lwc1 $f2, 0x3c($s0) +/* 87AD80 802411A0 44820000 */ mtc1 $v0, $f0 +/* 87AD84 802411A4 00000000 */ nop +/* 87AD88 802411A8 46800020 */ cvt.s.w $f0, $f0 +/* 87AD8C 802411AC 46001080 */ add.s $f2, $f2, $f0 +/* 87AD90 802411B0 3C013FC0 */ lui $at, 0x3fc0 +/* 87AD94 802411B4 44810000 */ mtc1 $at, $f0 +/* 87AD98 802411B8 00000000 */ nop +/* 87AD9C 802411BC 46001081 */ sub.s $f2, $f2, $f0 +/* 87ADA0 802411C0 46043300 */ add.s $f12, $f6, $f4 +/* 87ADA4 802411C4 C640009C */ lwc1 $f0, 0x9c($s2) +/* 87ADA8 802411C8 46001501 */ sub.s $f20, $f2, $f0 +/* 87ADAC 802411CC 46006084 */ sqrt.s $f2, $f12 +/* 87ADB0 802411D0 46021032 */ c.eq.s $f2, $f2 +/* 87ADB4 802411D4 00000000 */ nop +/* 87ADB8 802411D8 45010004 */ bc1t .L802411EC +/* 87ADBC 802411DC 00000000 */ nop +/* 87ADC0 802411E0 0C0187BC */ jal sqrtf +/* 87ADC4 802411E4 00000000 */ nop +/* 87ADC8 802411E8 46000086 */ mov.s $f2, $f0 +.L802411EC: +/* 87ADCC 802411EC 44800000 */ mtc1 $zero, $f0 +/* 87ADD0 802411F0 00000000 */ nop +/* 87ADD4 802411F4 4614003C */ c.lt.s $f0, $f20 +/* 87ADD8 802411F8 00000000 */ nop +/* 87ADDC 802411FC 45000016 */ bc1f .L80241258 +/* 87ADE0 80241200 46001106 */ mov.s $f4, $f2 +/* 87ADE4 80241204 860200A8 */ lh $v0, 0xa8($s0) +/* 87ADE8 80241208 44820000 */ mtc1 $v0, $f0 +/* 87ADEC 8024120C 00000000 */ nop +/* 87ADF0 80241210 46800020 */ cvt.s.w $f0, $f0 +/* 87ADF4 80241214 4600A03C */ c.lt.s $f20, $f0 +/* 87ADF8 80241218 00000000 */ nop +/* 87ADFC 8024121C 4500000F */ bc1f .L8024125C +/* 87AE00 80241220 0000882D */ daddu $s1, $zero, $zero +/* 87AE04 80241224 860200A6 */ lh $v0, 0xa6($s0) +/* 87AE08 80241228 3C013F00 */ lui $at, 0x3f00 +/* 87AE0C 8024122C 44811000 */ mtc1 $at, $f2 +/* 87AE10 80241230 44820000 */ mtc1 $v0, $f0 +/* 87AE14 80241234 00000000 */ nop +/* 87AE18 80241238 46800020 */ cvt.s.w $f0, $f0 +/* 87AE1C 8024123C 46020002 */ mul.s $f0, $f0, $f2 +/* 87AE20 80241240 00000000 */ nop +/* 87AE24 80241244 4600203C */ c.lt.s $f4, $f0 +/* 87AE28 80241248 00000000 */ nop +/* 87AE2C 8024124C 45000003 */ bc1f .L8024125C +/* 87AE30 80241250 24020001 */ addiu $v0, $zero, 1 +/* 87AE34 80241254 AE62008C */ sw $v0, 0x8c($s3) +.L80241258: +/* 87AE38 80241258 0000882D */ daddu $s1, $zero, $zero +.L8024125C: +/* 87AE3C 8024125C 3C013FC0 */ lui $at, 0x3fc0 +/* 87AE40 80241260 4481D000 */ mtc1 $at, $f26 +/* 87AE44 80241264 4480C000 */ mtc1 $zero, $f24 +/* 87AE48 80241268 3C013F00 */ lui $at, 0x3f00 +/* 87AE4C 8024126C 4481B000 */ mtc1 $at, $f22 +.L80241270: +/* 87AE50 80241270 0C00EAD2 */ jal get_npc_safe +/* 87AE54 80241274 0220202D */ daddu $a0, $s1, $zero +/* 87AE58 80241278 0040802D */ daddu $s0, $v0, $zero +/* 87AE5C 8024127C 52000035 */ beql $s0, $zero, .L80241354 +/* 87AE60 80241280 26310001 */ addiu $s1, $s1, 1 +/* 87AE64 80241284 C6020038 */ lwc1 $f2, 0x38($s0) +/* 87AE68 80241288 C6400098 */ lwc1 $f0, 0x98($s2) +/* 87AE6C 8024128C 46001081 */ sub.s $f2, $f2, $f0 +/* 87AE70 80241290 46021182 */ mul.s $f6, $f2, $f2 +/* 87AE74 80241294 00000000 */ nop +/* 87AE78 80241298 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 87AE7C 8024129C C6020040 */ lwc1 $f2, 0x40($s0) +/* 87AE80 802412A0 46001081 */ sub.s $f2, $f2, $f0 +/* 87AE84 802412A4 46021102 */ mul.s $f4, $f2, $f2 +/* 87AE88 802412A8 00000000 */ nop +/* 87AE8C 802412AC 860200A8 */ lh $v0, 0xa8($s0) +/* 87AE90 802412B0 C602003C */ lwc1 $f2, 0x3c($s0) +/* 87AE94 802412B4 44820000 */ mtc1 $v0, $f0 +/* 87AE98 802412B8 00000000 */ nop +/* 87AE9C 802412BC 46800020 */ cvt.s.w $f0, $f0 +/* 87AEA0 802412C0 46001080 */ add.s $f2, $f2, $f0 +/* 87AEA4 802412C4 461A1081 */ sub.s $f2, $f2, $f26 +/* 87AEA8 802412C8 46043300 */ add.s $f12, $f6, $f4 +/* 87AEAC 802412CC C640009C */ lwc1 $f0, 0x9c($s2) +/* 87AEB0 802412D0 46001501 */ sub.s $f20, $f2, $f0 +/* 87AEB4 802412D4 46006004 */ sqrt.s $f0, $f12 +/* 87AEB8 802412D8 46000032 */ c.eq.s $f0, $f0 +/* 87AEBC 802412DC 00000000 */ nop +/* 87AEC0 802412E0 45010003 */ bc1t .L802412F0 +/* 87AEC4 802412E4 00000000 */ nop +/* 87AEC8 802412E8 0C0187BC */ jal sqrtf +/* 87AECC 802412EC 00000000 */ nop +.L802412F0: +/* 87AED0 802412F0 4614C03C */ c.lt.s $f24, $f20 +/* 87AED4 802412F4 00000000 */ nop +/* 87AED8 802412F8 45000015 */ bc1f .L80241350 +/* 87AEDC 802412FC 46000106 */ mov.s $f4, $f0 +/* 87AEE0 80241300 860200A8 */ lh $v0, 0xa8($s0) +/* 87AEE4 80241304 44820000 */ mtc1 $v0, $f0 +/* 87AEE8 80241308 00000000 */ nop +/* 87AEEC 8024130C 46800020 */ cvt.s.w $f0, $f0 +/* 87AEF0 80241310 4600A03C */ c.lt.s $f20, $f0 +/* 87AEF4 80241314 00000000 */ nop +/* 87AEF8 80241318 4500000E */ bc1f .L80241354 +/* 87AEFC 8024131C 26310001 */ addiu $s1, $s1, 1 +/* 87AF00 80241320 860200A6 */ lh $v0, 0xa6($s0) +/* 87AF04 80241324 44820000 */ mtc1 $v0, $f0 +/* 87AF08 80241328 00000000 */ nop +/* 87AF0C 8024132C 46800020 */ cvt.s.w $f0, $f0 +/* 87AF10 80241330 46160002 */ mul.s $f0, $f0, $f22 +/* 87AF14 80241334 00000000 */ nop +/* 87AF18 80241338 4600203C */ c.lt.s $f4, $f0 +/* 87AF1C 8024133C 00000000 */ nop +/* 87AF20 80241340 45000004 */ bc1f .L80241354 +/* 87AF24 80241344 24020001 */ addiu $v0, $zero, 1 +/* 87AF28 80241348 080904D8 */ j .L80241360 +/* 87AF2C 8024134C AE62008C */ sw $v0, 0x8c($s3) +.L80241350: +/* 87AF30 80241350 26310001 */ addiu $s1, $s1, 1 +.L80241354: +/* 87AF34 80241354 2A220040 */ slti $v0, $s1, 0x40 +/* 87AF38 80241358 1440FFC5 */ bnez $v0, .L80241270 +/* 87AF3C 8024135C 00000000 */ nop +.L80241360: +/* 87AF40 80241360 8FBF0020 */ lw $ra, 0x20($sp) +/* 87AF44 80241364 8FB3001C */ lw $s3, 0x1c($sp) +/* 87AF48 80241368 8FB20018 */ lw $s2, 0x18($sp) +/* 87AF4C 8024136C 8FB10014 */ lw $s1, 0x14($sp) +/* 87AF50 80241370 8FB00010 */ lw $s0, 0x10($sp) +/* 87AF54 80241374 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* 87AF58 80241378 D7B80038 */ ldc1 $f24, 0x38($sp) +/* 87AF5C 8024137C D7B60030 */ ldc1 $f22, 0x30($sp) +/* 87AF60 80241380 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 87AF64 80241384 24020002 */ addiu $v0, $zero, 2 +/* 87AF68 80241388 03E00008 */ jr $ra +/* 87AF6C 8024138C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390.s deleted file mode 100644 index b98772f2c6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241390 -/* 87AF70 80241390 3C088011 */ lui $t0, %hi(gPlayerStatus) -/* 87AF74 80241394 2508EFC8 */ addiu $t0, $t0, %lo(gPlayerStatus) -/* 87AF78 80241398 0000202D */ daddu $a0, $zero, $zero -/* 87AF7C 8024139C 3C058016 */ lui $a1, 0x8016 -/* 87AF80 802413A0 84A5A552 */ lh $a1, -0x5aae($a1) -/* 87AF84 802413A4 2407000E */ addiu $a3, $zero, 0xe -/* 87AF88 802413A8 24060010 */ addiu $a2, $zero, 0x10 -/* 87AF8C 802413AC 3C038024 */ lui $v1, 0x8024 -/* 87AF90 802413B0 246349B0 */ addiu $v1, $v1, 0x49b0 -.L802413B4: -/* 87AF94 802413B4 8C620000 */ lw $v0, ($v1) -/* 87AF98 802413B8 54A20008 */ bnel $a1, $v0, .L802413DC -/* 87AF9C 802413BC 24840001 */ addiu $a0, $a0, 1 -/* 87AFA0 802413C0 810200B4 */ lb $v0, 0xb4($t0) -/* 87AFA4 802413C4 10470003 */ beq $v0, $a3, .L802413D4 -/* 87AFA8 802413C8 00000000 */ nop -/* 87AFAC 802413CC 14460003 */ bne $v0, $a2, .L802413DC -/* 87AFB0 802413D0 24840001 */ addiu $a0, $a0, 1 -.L802413D4: -/* 87AFB4 802413D4 03E00008 */ jr $ra -/* 87AFB8 802413D8 0000102D */ daddu $v0, $zero, $zero -.L802413DC: -/* 87AFBC 802413DC 2C820004 */ sltiu $v0, $a0, 4 -/* 87AFC0 802413E0 1440FFF4 */ bnez $v0, .L802413B4 -/* 87AFC4 802413E4 24630004 */ addiu $v1, $v1, 4 -/* 87AFC8 802413E8 03E00008 */ jr $ra -/* 87AFCC 802413EC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s new file mode 100644 index 0000000000..354139a022 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241390_87AF70.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241390_87AF70 +/* 87AF70 80241390 3C088011 */ lui $t0, %hi(gPlayerStatus) +/* 87AF74 80241394 2508EFC8 */ addiu $t0, $t0, %lo(gPlayerStatus) +/* 87AF78 80241398 0000202D */ daddu $a0, $zero, $zero +/* 87AF7C 8024139C 3C058016 */ lui $a1, 0x8016 +/* 87AF80 802413A0 84A5A552 */ lh $a1, -0x5aae($a1) +/* 87AF84 802413A4 2407000E */ addiu $a3, $zero, 0xe +/* 87AF88 802413A8 24060010 */ addiu $a2, $zero, 0x10 +/* 87AF8C 802413AC 3C038024 */ lui $v1, 0x8024 +/* 87AF90 802413B0 246349B0 */ addiu $v1, $v1, 0x49b0 +.L802413B4: +/* 87AF94 802413B4 8C620000 */ lw $v0, ($v1) +/* 87AF98 802413B8 54A20008 */ bnel $a1, $v0, .L802413DC +/* 87AF9C 802413BC 24840001 */ addiu $a0, $a0, 1 +/* 87AFA0 802413C0 810200B4 */ lb $v0, 0xb4($t0) +/* 87AFA4 802413C4 10470003 */ beq $v0, $a3, .L802413D4 +/* 87AFA8 802413C8 00000000 */ nop +/* 87AFAC 802413CC 14460003 */ bne $v0, $a2, .L802413DC +/* 87AFB0 802413D0 24840001 */ addiu $a0, $a0, 1 +.L802413D4: +/* 87AFB4 802413D4 03E00008 */ jr $ra +/* 87AFB8 802413D8 0000102D */ daddu $v0, $zero, $zero +.L802413DC: +/* 87AFBC 802413DC 2C820004 */ sltiu $v0, $a0, 4 +/* 87AFC0 802413E0 1440FFF4 */ bnez $v0, .L802413B4 +/* 87AFC4 802413E4 24630004 */ addiu $v1, $v1, 4 +/* 87AFC8 802413E8 03E00008 */ jr $ra +/* 87AFCC 802413EC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0.s deleted file mode 100644 index baccebf04c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413F0 -/* 87AFD0 802413F0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 87AFD4 802413F4 AFB3002C */ sw $s3, 0x2c($sp) -/* 87AFD8 802413F8 0080982D */ daddu $s3, $a0, $zero -/* 87AFDC 802413FC AFBF0030 */ sw $ra, 0x30($sp) -/* 87AFE0 80241400 AFB20028 */ sw $s2, 0x28($sp) -/* 87AFE4 80241404 AFB10024 */ sw $s1, 0x24($sp) -/* 87AFE8 80241408 AFB00020 */ sw $s0, 0x20($sp) -/* 87AFEC 8024140C 8E710148 */ lw $s1, 0x148($s3) -/* 87AFF0 80241410 86240008 */ lh $a0, 8($s1) -/* 87AFF4 80241414 0C00EABB */ jal get_npc_unsafe -/* 87AFF8 80241418 00A0902D */ daddu $s2, $a1, $zero -/* 87AFFC 8024141C 8E440004 */ lw $a0, 4($s2) -/* 87B000 80241420 0040802D */ daddu $s0, $v0, $zero -/* 87B004 80241424 00041FC2 */ srl $v1, $a0, 0x1f -/* 87B008 80241428 00832021 */ addu $a0, $a0, $v1 -/* 87B00C 8024142C 00042043 */ sra $a0, $a0, 1 -/* 87B010 80241430 0C00A67F */ jal rand_int -/* 87B014 80241434 24840001 */ addiu $a0, $a0, 1 -/* 87B018 80241438 8E430004 */ lw $v1, 4($s2) -/* 87B01C 8024143C 000327C2 */ srl $a0, $v1, 0x1f -/* 87B020 80241440 00641821 */ addu $v1, $v1, $a0 -/* 87B024 80241444 00031843 */ sra $v1, $v1, 1 -/* 87B028 80241448 00621821 */ addu $v1, $v1, $v0 -/* 87B02C 8024144C A603008E */ sh $v1, 0x8e($s0) -/* 87B030 80241450 8E2300D0 */ lw $v1, 0xd0($s1) -/* 87B034 80241454 C6000040 */ lwc1 $f0, 0x40($s0) -/* 87B038 80241458 C4640000 */ lwc1 $f4, ($v1) -/* 87B03C 8024145C 46802120 */ cvt.s.w $f4, $f4 -/* 87B040 80241460 C4620008 */ lwc1 $f2, 8($v1) -/* 87B044 80241464 468010A0 */ cvt.s.w $f2, $f2 -/* 87B048 80241468 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87B04C 8024146C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B050 80241470 44061000 */ mfc1 $a2, $f2 -/* 87B054 80241474 C440000C */ lwc1 $f0, 0xc($v0) -/* 87B058 80241478 46800020 */ cvt.s.w $f0, $f0 -/* 87B05C 8024147C E7A00014 */ swc1 $f0, 0x14($sp) -/* 87B060 80241480 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B064 80241484 44052000 */ mfc1 $a1, $f4 -/* 87B068 80241488 C4400010 */ lwc1 $f0, 0x10($v0) -/* 87B06C 8024148C 46800020 */ cvt.s.w $f0, $f0 -/* 87B070 80241490 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87B074 80241494 8C640018 */ lw $a0, 0x18($v1) -/* 87B078 80241498 0C0123F5 */ jal is_point_within_region -/* 87B07C 8024149C 8E070038 */ lw $a3, 0x38($s0) -/* 87B080 802414A0 1040000E */ beqz $v0, .L802414DC -/* 87B084 802414A4 00000000 */ nop -/* 87B088 802414A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B08C 802414AC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 87B090 802414B0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 87B094 802414B4 C4460000 */ lwc1 $f6, ($v0) -/* 87B098 802414B8 468031A0 */ cvt.s.w $f6, $f6 -/* 87B09C 802414BC 44063000 */ mfc1 $a2, $f6 -/* 87B0A0 802414C0 C4460008 */ lwc1 $f6, 8($v0) -/* 87B0A4 802414C4 468031A0 */ cvt.s.w $f6, $f6 -/* 87B0A8 802414C8 44073000 */ mfc1 $a3, $f6 -/* 87B0AC 802414CC 0C00A720 */ jal atan2 -/* 87B0B0 802414D0 00000000 */ nop -/* 87B0B4 802414D4 08090543 */ j .L8024150C -/* 87B0B8 802414D8 E600000C */ swc1 $f0, 0xc($s0) -.L802414DC: -/* 87B0BC 802414DC 0C00A67F */ jal rand_int -/* 87B0C0 802414E0 2404003C */ addiu $a0, $zero, 0x3c -/* 87B0C4 802414E4 C60C000C */ lwc1 $f12, 0xc($s0) -/* 87B0C8 802414E8 44820000 */ mtc1 $v0, $f0 -/* 87B0CC 802414EC 00000000 */ nop -/* 87B0D0 802414F0 46800020 */ cvt.s.w $f0, $f0 -/* 87B0D4 802414F4 46006300 */ add.s $f12, $f12, $f0 -/* 87B0D8 802414F8 3C0141F0 */ lui $at, 0x41f0 -/* 87B0DC 802414FC 44810000 */ mtc1 $at, $f0 -/* 87B0E0 80241500 0C00A6C9 */ jal clamp_angle -/* 87B0E4 80241504 46006301 */ sub.s $f12, $f12, $f0 -/* 87B0E8 80241508 E600000C */ swc1 $f0, 0xc($s0) -.L8024150C: -/* 87B0EC 8024150C 8E2200CC */ lw $v0, 0xcc($s1) -/* 87B0F0 80241510 8C420004 */ lw $v0, 4($v0) -/* 87B0F4 80241514 AE020028 */ sw $v0, 0x28($s0) -/* 87B0F8 80241518 AE600074 */ sw $zero, 0x74($s3) -/* 87B0FC 8024151C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 87B100 80241520 8C420014 */ lw $v0, 0x14($v0) -/* 87B104 80241524 04410004 */ bgez $v0, .L80241538 -/* 87B108 80241528 00000000 */ nop -/* 87B10C 8024152C C6400000 */ lwc1 $f0, ($s2) -/* 87B110 80241530 08090556 */ j .L80241558 -/* 87B114 80241534 E6000018 */ swc1 $f0, 0x18($s0) -.L80241538: -/* 87B118 80241538 3C018024 */ lui $at, 0x8024 -/* 87B11C 8024153C D42251B0 */ ldc1 $f2, 0x51b0($at) -/* 87B120 80241540 44820000 */ mtc1 $v0, $f0 -/* 87B124 80241544 00000000 */ nop -/* 87B128 80241548 46800021 */ cvt.d.w $f0, $f0 -/* 87B12C 8024154C 46220003 */ div.d $f0, $f0, $f2 -/* 87B130 80241550 46200020 */ cvt.s.d $f0, $f0 -/* 87B134 80241554 E6000018 */ swc1 $f0, 0x18($s0) -.L80241558: -/* 87B138 80241558 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B13C 8024155C 3C014059 */ lui $at, 0x4059 -/* 87B140 80241560 44811800 */ mtc1 $at, $f3 -/* 87B144 80241564 44801000 */ mtc1 $zero, $f2 -/* 87B148 80241568 46000021 */ cvt.d.s $f0, $f0 -/* 87B14C 8024156C 46220002 */ mul.d $f0, $f0, $f2 -/* 87B150 80241570 00000000 */ nop -/* 87B154 80241574 24020001 */ addiu $v0, $zero, 1 -/* 87B158 80241578 4620018D */ trunc.w.d $f6, $f0 -/* 87B15C 8024157C E626007C */ swc1 $f6, 0x7c($s1) -/* 87B160 80241580 AE620070 */ sw $v0, 0x70($s3) -/* 87B164 80241584 8FBF0030 */ lw $ra, 0x30($sp) -/* 87B168 80241588 8FB3002C */ lw $s3, 0x2c($sp) -/* 87B16C 8024158C 8FB20028 */ lw $s2, 0x28($sp) -/* 87B170 80241590 8FB10024 */ lw $s1, 0x24($sp) -/* 87B174 80241594 8FB00020 */ lw $s0, 0x20($sp) -/* 87B178 80241598 03E00008 */ jr $ra -/* 87B17C 8024159C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s new file mode 100644 index 0000000000..78574e2870 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802413F0_87AFD0.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413F0_87AFD0 +/* 87AFD0 802413F0 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 87AFD4 802413F4 AFB3002C */ sw $s3, 0x2c($sp) +/* 87AFD8 802413F8 0080982D */ daddu $s3, $a0, $zero +/* 87AFDC 802413FC AFBF0030 */ sw $ra, 0x30($sp) +/* 87AFE0 80241400 AFB20028 */ sw $s2, 0x28($sp) +/* 87AFE4 80241404 AFB10024 */ sw $s1, 0x24($sp) +/* 87AFE8 80241408 AFB00020 */ sw $s0, 0x20($sp) +/* 87AFEC 8024140C 8E710148 */ lw $s1, 0x148($s3) +/* 87AFF0 80241410 86240008 */ lh $a0, 8($s1) +/* 87AFF4 80241414 0C00EABB */ jal get_npc_unsafe +/* 87AFF8 80241418 00A0902D */ daddu $s2, $a1, $zero +/* 87AFFC 8024141C 8E440004 */ lw $a0, 4($s2) +/* 87B000 80241420 0040802D */ daddu $s0, $v0, $zero +/* 87B004 80241424 00041FC2 */ srl $v1, $a0, 0x1f +/* 87B008 80241428 00832021 */ addu $a0, $a0, $v1 +/* 87B00C 8024142C 00042043 */ sra $a0, $a0, 1 +/* 87B010 80241430 0C00A67F */ jal rand_int +/* 87B014 80241434 24840001 */ addiu $a0, $a0, 1 +/* 87B018 80241438 8E430004 */ lw $v1, 4($s2) +/* 87B01C 8024143C 000327C2 */ srl $a0, $v1, 0x1f +/* 87B020 80241440 00641821 */ addu $v1, $v1, $a0 +/* 87B024 80241444 00031843 */ sra $v1, $v1, 1 +/* 87B028 80241448 00621821 */ addu $v1, $v1, $v0 +/* 87B02C 8024144C A603008E */ sh $v1, 0x8e($s0) +/* 87B030 80241450 8E2300D0 */ lw $v1, 0xd0($s1) +/* 87B034 80241454 C6000040 */ lwc1 $f0, 0x40($s0) +/* 87B038 80241458 C4640000 */ lwc1 $f4, ($v1) +/* 87B03C 8024145C 46802120 */ cvt.s.w $f4, $f4 +/* 87B040 80241460 C4620008 */ lwc1 $f2, 8($v1) +/* 87B044 80241464 468010A0 */ cvt.s.w $f2, $f2 +/* 87B048 80241468 E7A00010 */ swc1 $f0, 0x10($sp) +/* 87B04C 8024146C 8E2200D0 */ lw $v0, 0xd0($s1) +/* 87B050 80241470 44061000 */ mfc1 $a2, $f2 +/* 87B054 80241474 C440000C */ lwc1 $f0, 0xc($v0) +/* 87B058 80241478 46800020 */ cvt.s.w $f0, $f0 +/* 87B05C 8024147C E7A00014 */ swc1 $f0, 0x14($sp) +/* 87B060 80241480 8E2200D0 */ lw $v0, 0xd0($s1) +/* 87B064 80241484 44052000 */ mfc1 $a1, $f4 +/* 87B068 80241488 C4400010 */ lwc1 $f0, 0x10($v0) +/* 87B06C 8024148C 46800020 */ cvt.s.w $f0, $f0 +/* 87B070 80241490 E7A00018 */ swc1 $f0, 0x18($sp) +/* 87B074 80241494 8C640018 */ lw $a0, 0x18($v1) +/* 87B078 80241498 0C0123F5 */ jal is_point_within_region +/* 87B07C 8024149C 8E070038 */ lw $a3, 0x38($s0) +/* 87B080 802414A0 1040000E */ beqz $v0, .L802414DC +/* 87B084 802414A4 00000000 */ nop +/* 87B088 802414A8 8E2200D0 */ lw $v0, 0xd0($s1) +/* 87B08C 802414AC C60C0038 */ lwc1 $f12, 0x38($s0) +/* 87B090 802414B0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 87B094 802414B4 C4460000 */ lwc1 $f6, ($v0) +/* 87B098 802414B8 468031A0 */ cvt.s.w $f6, $f6 +/* 87B09C 802414BC 44063000 */ mfc1 $a2, $f6 +/* 87B0A0 802414C0 C4460008 */ lwc1 $f6, 8($v0) +/* 87B0A4 802414C4 468031A0 */ cvt.s.w $f6, $f6 +/* 87B0A8 802414C8 44073000 */ mfc1 $a3, $f6 +/* 87B0AC 802414CC 0C00A720 */ jal atan2 +/* 87B0B0 802414D0 00000000 */ nop +/* 87B0B4 802414D4 08090543 */ j .L8024150C +/* 87B0B8 802414D8 E600000C */ swc1 $f0, 0xc($s0) +.L802414DC: +/* 87B0BC 802414DC 0C00A67F */ jal rand_int +/* 87B0C0 802414E0 2404003C */ addiu $a0, $zero, 0x3c +/* 87B0C4 802414E4 C60C000C */ lwc1 $f12, 0xc($s0) +/* 87B0C8 802414E8 44820000 */ mtc1 $v0, $f0 +/* 87B0CC 802414EC 00000000 */ nop +/* 87B0D0 802414F0 46800020 */ cvt.s.w $f0, $f0 +/* 87B0D4 802414F4 46006300 */ add.s $f12, $f12, $f0 +/* 87B0D8 802414F8 3C0141F0 */ lui $at, 0x41f0 +/* 87B0DC 802414FC 44810000 */ mtc1 $at, $f0 +/* 87B0E0 80241500 0C00A6C9 */ jal clamp_angle +/* 87B0E4 80241504 46006301 */ sub.s $f12, $f12, $f0 +/* 87B0E8 80241508 E600000C */ swc1 $f0, 0xc($s0) +.L8024150C: +/* 87B0EC 8024150C 8E2200CC */ lw $v0, 0xcc($s1) +/* 87B0F0 80241510 8C420004 */ lw $v0, 4($v0) +/* 87B0F4 80241514 AE020028 */ sw $v0, 0x28($s0) +/* 87B0F8 80241518 AE600074 */ sw $zero, 0x74($s3) +/* 87B0FC 8024151C 8E2200D0 */ lw $v0, 0xd0($s1) +/* 87B100 80241520 8C420014 */ lw $v0, 0x14($v0) +/* 87B104 80241524 04410004 */ bgez $v0, .L80241538 +/* 87B108 80241528 00000000 */ nop +/* 87B10C 8024152C C6400000 */ lwc1 $f0, ($s2) +/* 87B110 80241530 08090556 */ j .L80241558 +/* 87B114 80241534 E6000018 */ swc1 $f0, 0x18($s0) +.L80241538: +/* 87B118 80241538 3C018024 */ lui $at, 0x8024 +/* 87B11C 8024153C D42251B0 */ ldc1 $f2, 0x51b0($at) +/* 87B120 80241540 44820000 */ mtc1 $v0, $f0 +/* 87B124 80241544 00000000 */ nop +/* 87B128 80241548 46800021 */ cvt.d.w $f0, $f0 +/* 87B12C 8024154C 46220003 */ div.d $f0, $f0, $f2 +/* 87B130 80241550 46200020 */ cvt.s.d $f0, $f0 +/* 87B134 80241554 E6000018 */ swc1 $f0, 0x18($s0) +.L80241558: +/* 87B138 80241558 C600003C */ lwc1 $f0, 0x3c($s0) +/* 87B13C 8024155C 3C014059 */ lui $at, 0x4059 +/* 87B140 80241560 44811800 */ mtc1 $at, $f3 +/* 87B144 80241564 44801000 */ mtc1 $zero, $f2 +/* 87B148 80241568 46000021 */ cvt.d.s $f0, $f0 +/* 87B14C 8024156C 46220002 */ mul.d $f0, $f0, $f2 +/* 87B150 80241570 00000000 */ nop +/* 87B154 80241574 24020001 */ addiu $v0, $zero, 1 +/* 87B158 80241578 4620018D */ trunc.w.d $f6, $f0 +/* 87B15C 8024157C E626007C */ swc1 $f6, 0x7c($s1) +/* 87B160 80241580 AE620070 */ sw $v0, 0x70($s3) +/* 87B164 80241584 8FBF0030 */ lw $ra, 0x30($sp) +/* 87B168 80241588 8FB3002C */ lw $s3, 0x2c($sp) +/* 87B16C 8024158C 8FB20028 */ lw $s2, 0x28($sp) +/* 87B170 80241590 8FB10024 */ lw $s1, 0x24($sp) +/* 87B174 80241594 8FB00020 */ lw $s0, 0x20($sp) +/* 87B178 80241598 03E00008 */ jr $ra +/* 87B17C 8024159C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8.s deleted file mode 100644 index 90fedcd572..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BC8 -/* 87B7A8 80241BC8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87B7AC 80241BCC AFB3001C */ sw $s3, 0x1c($sp) -/* 87B7B0 80241BD0 0080982D */ daddu $s3, $a0, $zero -/* 87B7B4 80241BD4 AFBF0020 */ sw $ra, 0x20($sp) -/* 87B7B8 80241BD8 AFB20018 */ sw $s2, 0x18($sp) -/* 87B7BC 80241BDC AFB10014 */ sw $s1, 0x14($sp) -/* 87B7C0 80241BE0 AFB00010 */ sw $s0, 0x10($sp) -/* 87B7C4 80241BE4 8E720148 */ lw $s2, 0x148($s3) -/* 87B7C8 80241BE8 86440008 */ lh $a0, 8($s2) -/* 87B7CC 80241BEC 0C00EABB */ jal get_npc_unsafe -/* 87B7D0 80241BF0 00A0882D */ daddu $s1, $a1, $zero -/* 87B7D4 80241BF4 8E240008 */ lw $a0, 8($s1) -/* 87B7D8 80241BF8 0040802D */ daddu $s0, $v0, $zero -/* 87B7DC 80241BFC 00041FC2 */ srl $v1, $a0, 0x1f -/* 87B7E0 80241C00 00832021 */ addu $a0, $a0, $v1 -/* 87B7E4 80241C04 00042043 */ sra $a0, $a0, 1 -/* 87B7E8 80241C08 0C00A67F */ jal rand_int -/* 87B7EC 80241C0C 24840001 */ addiu $a0, $a0, 1 -/* 87B7F0 80241C10 8E230008 */ lw $v1, 8($s1) -/* 87B7F4 80241C14 240400B4 */ addiu $a0, $zero, 0xb4 -/* 87B7F8 80241C18 00032FC2 */ srl $a1, $v1, 0x1f -/* 87B7FC 80241C1C 00651821 */ addu $v1, $v1, $a1 -/* 87B800 80241C20 00031843 */ sra $v1, $v1, 1 -/* 87B804 80241C24 00621821 */ addu $v1, $v1, $v0 -/* 87B808 80241C28 0C00A67F */ jal rand_int -/* 87B80C 80241C2C A603008E */ sh $v1, 0x8e($s0) -/* 87B810 80241C30 C60C000C */ lwc1 $f12, 0xc($s0) -/* 87B814 80241C34 44820000 */ mtc1 $v0, $f0 -/* 87B818 80241C38 00000000 */ nop -/* 87B81C 80241C3C 46800020 */ cvt.s.w $f0, $f0 -/* 87B820 80241C40 46006300 */ add.s $f12, $f12, $f0 -/* 87B824 80241C44 3C0142B4 */ lui $at, 0x42b4 -/* 87B828 80241C48 44810000 */ mtc1 $at, $f0 -/* 87B82C 80241C4C 0C00A6C9 */ jal clamp_angle -/* 87B830 80241C50 46006301 */ sub.s $f12, $f12, $f0 -/* 87B834 80241C54 E600000C */ swc1 $f0, 0xc($s0) -/* 87B838 80241C58 8E4200CC */ lw $v0, 0xcc($s2) -/* 87B83C 80241C5C 8C420000 */ lw $v0, ($v0) -/* 87B840 80241C60 AE020028 */ sw $v0, 0x28($s0) -/* 87B844 80241C64 24020003 */ addiu $v0, $zero, 3 -/* 87B848 80241C68 AE620070 */ sw $v0, 0x70($s3) -/* 87B84C 80241C6C 8FBF0020 */ lw $ra, 0x20($sp) -/* 87B850 80241C70 8FB3001C */ lw $s3, 0x1c($sp) -/* 87B854 80241C74 8FB20018 */ lw $s2, 0x18($sp) -/* 87B858 80241C78 8FB10014 */ lw $s1, 0x14($sp) -/* 87B85C 80241C7C 8FB00010 */ lw $s0, 0x10($sp) -/* 87B860 80241C80 03E00008 */ jr $ra -/* 87B864 80241C84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s new file mode 100644 index 0000000000..e1ab7778a5 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241BC8_87B7A8.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241BC8_87B7A8 +/* 87B7A8 80241BC8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 87B7AC 80241BCC AFB3001C */ sw $s3, 0x1c($sp) +/* 87B7B0 80241BD0 0080982D */ daddu $s3, $a0, $zero +/* 87B7B4 80241BD4 AFBF0020 */ sw $ra, 0x20($sp) +/* 87B7B8 80241BD8 AFB20018 */ sw $s2, 0x18($sp) +/* 87B7BC 80241BDC AFB10014 */ sw $s1, 0x14($sp) +/* 87B7C0 80241BE0 AFB00010 */ sw $s0, 0x10($sp) +/* 87B7C4 80241BE4 8E720148 */ lw $s2, 0x148($s3) +/* 87B7C8 80241BE8 86440008 */ lh $a0, 8($s2) +/* 87B7CC 80241BEC 0C00EABB */ jal get_npc_unsafe +/* 87B7D0 80241BF0 00A0882D */ daddu $s1, $a1, $zero +/* 87B7D4 80241BF4 8E240008 */ lw $a0, 8($s1) +/* 87B7D8 80241BF8 0040802D */ daddu $s0, $v0, $zero +/* 87B7DC 80241BFC 00041FC2 */ srl $v1, $a0, 0x1f +/* 87B7E0 80241C00 00832021 */ addu $a0, $a0, $v1 +/* 87B7E4 80241C04 00042043 */ sra $a0, $a0, 1 +/* 87B7E8 80241C08 0C00A67F */ jal rand_int +/* 87B7EC 80241C0C 24840001 */ addiu $a0, $a0, 1 +/* 87B7F0 80241C10 8E230008 */ lw $v1, 8($s1) +/* 87B7F4 80241C14 240400B4 */ addiu $a0, $zero, 0xb4 +/* 87B7F8 80241C18 00032FC2 */ srl $a1, $v1, 0x1f +/* 87B7FC 80241C1C 00651821 */ addu $v1, $v1, $a1 +/* 87B800 80241C20 00031843 */ sra $v1, $v1, 1 +/* 87B804 80241C24 00621821 */ addu $v1, $v1, $v0 +/* 87B808 80241C28 0C00A67F */ jal rand_int +/* 87B80C 80241C2C A603008E */ sh $v1, 0x8e($s0) +/* 87B810 80241C30 C60C000C */ lwc1 $f12, 0xc($s0) +/* 87B814 80241C34 44820000 */ mtc1 $v0, $f0 +/* 87B818 80241C38 00000000 */ nop +/* 87B81C 80241C3C 46800020 */ cvt.s.w $f0, $f0 +/* 87B820 80241C40 46006300 */ add.s $f12, $f12, $f0 +/* 87B824 80241C44 3C0142B4 */ lui $at, 0x42b4 +/* 87B828 80241C48 44810000 */ mtc1 $at, $f0 +/* 87B82C 80241C4C 0C00A6C9 */ jal clamp_angle +/* 87B830 80241C50 46006301 */ sub.s $f12, $f12, $f0 +/* 87B834 80241C54 E600000C */ swc1 $f0, 0xc($s0) +/* 87B838 80241C58 8E4200CC */ lw $v0, 0xcc($s2) +/* 87B83C 80241C5C 8C420000 */ lw $v0, ($v0) +/* 87B840 80241C60 AE020028 */ sw $v0, 0x28($s0) +/* 87B844 80241C64 24020003 */ addiu $v0, $zero, 3 +/* 87B848 80241C68 AE620070 */ sw $v0, 0x70($s3) +/* 87B84C 80241C6C 8FBF0020 */ lw $ra, 0x20($sp) +/* 87B850 80241C70 8FB3001C */ lw $s3, 0x1c($sp) +/* 87B854 80241C74 8FB20018 */ lw $s2, 0x18($sp) +/* 87B858 80241C78 8FB10014 */ lw $s1, 0x14($sp) +/* 87B85C 80241C7C 8FB00010 */ lw $s0, 0x10($sp) +/* 87B860 80241C80 03E00008 */ jr $ra +/* 87B864 80241C84 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88.s deleted file mode 100644 index 7b14b182f3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C88 -/* 87B868 80241C88 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 87B86C 80241C8C AFB3004C */ sw $s3, 0x4c($sp) -/* 87B870 80241C90 0080982D */ daddu $s3, $a0, $zero -/* 87B874 80241C94 AFBF0054 */ sw $ra, 0x54($sp) -/* 87B878 80241C98 AFB40050 */ sw $s4, 0x50($sp) -/* 87B87C 80241C9C AFB20048 */ sw $s2, 0x48($sp) -/* 87B880 80241CA0 AFB10044 */ sw $s1, 0x44($sp) -/* 87B884 80241CA4 AFB00040 */ sw $s0, 0x40($sp) -/* 87B888 80241CA8 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 87B88C 80241CAC F7B80068 */ sdc1 $f24, 0x68($sp) -/* 87B890 80241CB0 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 87B894 80241CB4 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 87B898 80241CB8 8E710148 */ lw $s1, 0x148($s3) -/* 87B89C 80241CBC 00A0902D */ daddu $s2, $a1, $zero -/* 87B8A0 80241CC0 86240008 */ lh $a0, 8($s1) -/* 87B8A4 80241CC4 0C00EABB */ jal get_npc_unsafe -/* 87B8A8 80241CC8 00C0A02D */ daddu $s4, $a2, $zero -/* 87B8AC 80241CCC 0040802D */ daddu $s0, $v0, $zero -/* 87B8B0 80241CD0 C6200078 */ lwc1 $f0, 0x78($s1) -/* 87B8B4 80241CD4 46800020 */ cvt.s.w $f0, $f0 -/* 87B8B8 80241CD8 46000021 */ cvt.d.s $f0, $f0 -/* 87B8BC 80241CDC 3C014059 */ lui $at, 0x4059 -/* 87B8C0 80241CE0 44811800 */ mtc1 $at, $f3 -/* 87B8C4 80241CE4 44801000 */ mtc1 $zero, $f2 -/* 87B8C8 80241CE8 8602008E */ lh $v0, 0x8e($s0) -/* 87B8CC 80241CEC 9603008E */ lhu $v1, 0x8e($s0) -/* 87B8D0 80241CF0 46220003 */ div.d $f0, $f0, $f2 -/* 87B8D4 80241CF4 46200620 */ cvt.s.d $f24, $f0 -/* 87B8D8 80241CF8 C6200088 */ lwc1 $f0, 0x88($s1) -/* 87B8DC 80241CFC 46800020 */ cvt.s.w $f0, $f0 -/* 87B8E0 80241D00 46000021 */ cvt.d.s $f0, $f0 -/* 87B8E4 80241D04 46220003 */ div.d $f0, $f0, $f2 -/* 87B8E8 80241D08 46200020 */ cvt.s.d $f0, $f0 -/* 87B8EC 80241D0C 18400003 */ blez $v0, .L80241D1C -/* 87B8F0 80241D10 4600C680 */ add.s $f26, $f24, $f0 -/* 87B8F4 80241D14 2462FFFF */ addiu $v0, $v1, -1 -/* 87B8F8 80241D18 A602008E */ sh $v0, 0x8e($s0) -.L80241D1C: -/* 87B8FC 80241D1C 8E220070 */ lw $v0, 0x70($s1) -/* 87B900 80241D20 18400034 */ blez $v0, .L80241DF4 -/* 87B904 80241D24 00000000 */ nop -/* 87B908 80241D28 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 87B90C 80241D2C 46806320 */ cvt.s.w $f12, $f12 -/* 87B910 80241D30 44820000 */ mtc1 $v0, $f0 -/* 87B914 80241D34 00000000 */ nop -/* 87B918 80241D38 46800020 */ cvt.s.w $f0, $f0 -/* 87B91C 80241D3C 46000021 */ cvt.d.s $f0, $f0 -/* 87B920 80241D40 46220003 */ div.d $f0, $f0, $f2 -/* 87B924 80241D44 0C00A8BB */ jal sin_deg -/* 87B928 80241D48 462005A0 */ cvt.s.d $f22, $f0 -/* 87B92C 80241D4C 8E020000 */ lw $v0, ($s0) -/* 87B930 80241D50 30420008 */ andi $v0, $v0, 8 -/* 87B934 80241D54 10400003 */ beqz $v0, .L80241D64 -/* 87B938 80241D58 46000506 */ mov.s $f20, $f0 -/* 87B93C 80241D5C 08090769 */ j .L80241DA4 -/* 87B940 80241D60 0000102D */ daddu $v0, $zero, $zero -.L80241D64: -/* 87B944 80241D64 27A50028 */ addiu $a1, $sp, 0x28 -/* 87B948 80241D68 27A6002C */ addiu $a2, $sp, 0x2c -/* 87B94C 80241D6C C6000038 */ lwc1 $f0, 0x38($s0) -/* 87B950 80241D70 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87B954 80241D74 C6040040 */ lwc1 $f4, 0x40($s0) -/* 87B958 80241D78 3C01447A */ lui $at, 0x447a -/* 87B95C 80241D7C 44813000 */ mtc1 $at, $f6 -/* 87B960 80241D80 27A20034 */ addiu $v0, $sp, 0x34 -/* 87B964 80241D84 E7A00028 */ swc1 $f0, 0x28($sp) -/* 87B968 80241D88 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 87B96C 80241D8C E7A40030 */ swc1 $f4, 0x30($sp) -/* 87B970 80241D90 E7A60034 */ swc1 $f6, 0x34($sp) -/* 87B974 80241D94 AFA20010 */ sw $v0, 0x10($sp) -/* 87B978 80241D98 8E040080 */ lw $a0, 0x80($s0) -/* 87B97C 80241D9C 0C0372DF */ jal func_800DCB7C -/* 87B980 80241DA0 27A70030 */ addiu $a3, $sp, 0x30 -.L80241DA4: -/* 87B984 80241DA4 10400007 */ beqz $v0, .L80241DC4 -/* 87B988 80241DA8 00000000 */ nop -/* 87B98C 80241DAC 4616A082 */ mul.s $f2, $f20, $f22 -/* 87B990 80241DB0 00000000 */ nop -/* 87B994 80241DB4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 87B998 80241DB8 46180000 */ add.s $f0, $f0, $f24 -/* 87B99C 80241DBC 08090774 */ j .L80241DD0 -/* 87B9A0 80241DC0 46020000 */ add.s $f0, $f0, $f2 -.L80241DC4: -/* 87B9A4 80241DC4 4616A002 */ mul.s $f0, $f20, $f22 -/* 87B9A8 80241DC8 00000000 */ nop -/* 87B9AC 80241DCC 4600D000 */ add.s $f0, $f26, $f0 -.L80241DD0: -/* 87B9B0 80241DD0 E600003C */ swc1 $f0, 0x3c($s0) -/* 87B9B4 80241DD4 8E220074 */ lw $v0, 0x74($s1) -/* 87B9B8 80241DD8 2442000A */ addiu $v0, $v0, 0xa -/* 87B9BC 80241DDC 44826000 */ mtc1 $v0, $f12 -/* 87B9C0 80241DE0 00000000 */ nop -/* 87B9C4 80241DE4 0C00A6C9 */ jal clamp_angle -/* 87B9C8 80241DE8 46806320 */ cvt.s.w $f12, $f12 -/* 87B9CC 80241DEC 4600020D */ trunc.w.s $f8, $f0 -/* 87B9D0 80241DF0 E6280074 */ swc1 $f8, 0x74($s1) -.L80241DF4: -/* 87B9D4 80241DF4 8E220090 */ lw $v0, 0x90($s1) -/* 87B9D8 80241DF8 1C400040 */ bgtz $v0, .L80241EFC -/* 87B9DC 80241DFC 2442FFFF */ addiu $v0, $v0, -1 -/* 87B9E0 80241E00 860200A8 */ lh $v0, 0xa8($s0) -/* 87B9E4 80241E04 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87B9E8 80241E08 44821000 */ mtc1 $v0, $f2 -/* 87B9EC 80241E0C 00000000 */ nop -/* 87B9F0 80241E10 468010A0 */ cvt.s.w $f2, $f2 -/* 87B9F4 80241E14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87B9F8 80241E18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87B9FC 80241E1C 46020000 */ add.s $f0, $f0, $f2 -/* 87BA00 80241E20 3C014024 */ lui $at, 0x4024 -/* 87BA04 80241E24 44812800 */ mtc1 $at, $f5 -/* 87BA08 80241E28 44802000 */ mtc1 $zero, $f4 -/* 87BA0C 80241E2C C442002C */ lwc1 $f2, 0x2c($v0) -/* 87BA10 80241E30 46000021 */ cvt.d.s $f0, $f0 -/* 87BA14 80241E34 46240000 */ add.d $f0, $f0, $f4 -/* 87BA18 80241E38 460010A1 */ cvt.d.s $f2, $f2 -/* 87BA1C 80241E3C 4620103C */ c.lt.d $f2, $f0 -/* 87BA20 80241E40 00000000 */ nop -/* 87BA24 80241E44 4500002E */ bc1f .L80241F00 -/* 87BA28 80241E48 0280202D */ daddu $a0, $s4, $zero -/* 87BA2C 80241E4C 24020001 */ addiu $v0, $zero, 1 -/* 87BA30 80241E50 AFA20010 */ sw $v0, 0x10($sp) -/* 87BA34 80241E54 8E460024 */ lw $a2, 0x24($s2) -/* 87BA38 80241E58 8E470028 */ lw $a3, 0x28($s2) -/* 87BA3C 80241E5C 0C01242D */ jal func_800490B4 -/* 87BA40 80241E60 0220282D */ daddu $a1, $s1, $zero -/* 87BA44 80241E64 10400026 */ beqz $v0, .L80241F00 -/* 87BA48 80241E68 0000202D */ daddu $a0, $zero, $zero -/* 87BA4C 80241E6C 0200282D */ daddu $a1, $s0, $zero -/* 87BA50 80241E70 0000302D */ daddu $a2, $zero, $zero -/* 87BA54 80241E74 2412000C */ addiu $s2, $zero, 0xc -/* 87BA58 80241E78 860300A8 */ lh $v1, 0xa8($s0) -/* 87BA5C 80241E7C 3C013F80 */ lui $at, 0x3f80 -/* 87BA60 80241E80 44810000 */ mtc1 $at, $f0 -/* 87BA64 80241E84 3C014000 */ lui $at, 0x4000 -/* 87BA68 80241E88 44811000 */ mtc1 $at, $f2 -/* 87BA6C 80241E8C 3C01C1A0 */ lui $at, 0xc1a0 -/* 87BA70 80241E90 44812000 */ mtc1 $at, $f4 -/* 87BA74 80241E94 44834000 */ mtc1 $v1, $f8 -/* 87BA78 80241E98 00000000 */ nop -/* 87BA7C 80241E9C 46804220 */ cvt.s.w $f8, $f8 -/* 87BA80 80241EA0 44074000 */ mfc1 $a3, $f8 -/* 87BA84 80241EA4 27A20038 */ addiu $v0, $sp, 0x38 -/* 87BA88 80241EA8 AFB2001C */ sw $s2, 0x1c($sp) -/* 87BA8C 80241EAC AFA20020 */ sw $v0, 0x20($sp) -/* 87BA90 80241EB0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 87BA94 80241EB4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 87BA98 80241EB8 0C01BFA4 */ jal fx_emote -/* 87BA9C 80241EBC E7A40018 */ swc1 $f4, 0x18($sp) -/* 87BAA0 80241EC0 0200202D */ daddu $a0, $s0, $zero -/* 87BAA4 80241EC4 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 87BAA8 80241EC8 C480003C */ lwc1 $f0, 0x3c($a0) -/* 87BAAC 80241ECC 3C060020 */ lui $a2, 0x20 -/* 87BAB0 80241ED0 0C012530 */ jal func_800494C0 -/* 87BAB4 80241ED4 E4800064 */ swc1 $f0, 0x64($a0) -/* 87BAB8 80241ED8 8E220018 */ lw $v0, 0x18($s1) -/* 87BABC 80241EDC 9442002A */ lhu $v0, 0x2a($v0) -/* 87BAC0 80241EE0 30420001 */ andi $v0, $v0, 1 -/* 87BAC4 80241EE4 10400003 */ beqz $v0, .L80241EF4 -/* 87BAC8 80241EE8 2402000A */ addiu $v0, $zero, 0xa -/* 87BACC 80241EEC 080907E7 */ j .L80241F9C -/* 87BAD0 80241EF0 AE620070 */ sw $v0, 0x70($s3) -.L80241EF4: -/* 87BAD4 80241EF4 080907E7 */ j .L80241F9C -/* 87BAD8 80241EF8 AE720070 */ sw $s2, 0x70($s3) -.L80241EFC: -/* 87BADC 80241EFC AE220090 */ sw $v0, 0x90($s1) -.L80241F00: -/* 87BAE0 80241F00 8602008C */ lh $v0, 0x8c($s0) -/* 87BAE4 80241F04 14400025 */ bnez $v0, .L80241F9C -/* 87BAE8 80241F08 00000000 */ nop -/* 87BAEC 80241F0C 8602008E */ lh $v0, 0x8e($s0) -/* 87BAF0 80241F10 1C400022 */ bgtz $v0, .L80241F9C -/* 87BAF4 80241F14 00000000 */ nop -/* 87BAF8 80241F18 8E620074 */ lw $v0, 0x74($s3) -/* 87BAFC 80241F1C 2442FFFF */ addiu $v0, $v0, -1 -/* 87BB00 80241F20 1840001D */ blez $v0, .L80241F98 -/* 87BB04 80241F24 AE620074 */ sw $v0, 0x74($s3) -/* 87BB08 80241F28 8E220018 */ lw $v0, 0x18($s1) -/* 87BB0C 80241F2C 9442002A */ lhu $v0, 0x2a($v0) -/* 87BB10 80241F30 30420010 */ andi $v0, $v0, 0x10 -/* 87BB14 80241F34 14400007 */ bnez $v0, .L80241F54 -/* 87BB18 80241F38 00000000 */ nop -/* 87BB1C 80241F3C C600000C */ lwc1 $f0, 0xc($s0) -/* 87BB20 80241F40 3C014334 */ lui $at, 0x4334 -/* 87BB24 80241F44 44816000 */ mtc1 $at, $f12 -/* 87BB28 80241F48 0C00A6C9 */ jal clamp_angle -/* 87BB2C 80241F4C 460C0300 */ add.s $f12, $f0, $f12 -/* 87BB30 80241F50 E600000C */ swc1 $f0, 0xc($s0) -.L80241F54: -/* 87BB34 80241F54 0C00A67F */ jal rand_int -/* 87BB38 80241F58 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 87BB3C 80241F5C 3C032E8B */ lui $v1, 0x2e8b -/* 87BB40 80241F60 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 87BB44 80241F64 00430018 */ mult $v0, $v1 -/* 87BB48 80241F68 00021FC3 */ sra $v1, $v0, 0x1f -/* 87BB4C 80241F6C 00004010 */ mfhi $t0 -/* 87BB50 80241F70 00082043 */ sra $a0, $t0, 1 -/* 87BB54 80241F74 00832023 */ subu $a0, $a0, $v1 -/* 87BB58 80241F78 00041840 */ sll $v1, $a0, 1 -/* 87BB5C 80241F7C 00641821 */ addu $v1, $v1, $a0 -/* 87BB60 80241F80 00031880 */ sll $v1, $v1, 2 -/* 87BB64 80241F84 00641823 */ subu $v1, $v1, $a0 -/* 87BB68 80241F88 00431023 */ subu $v0, $v0, $v1 -/* 87BB6C 80241F8C 24420005 */ addiu $v0, $v0, 5 -/* 87BB70 80241F90 080907E7 */ j .L80241F9C -/* 87BB74 80241F94 A602008E */ sh $v0, 0x8e($s0) -.L80241F98: -/* 87BB78 80241F98 AE600070 */ sw $zero, 0x70($s3) -.L80241F9C: -/* 87BB7C 80241F9C 8FBF0054 */ lw $ra, 0x54($sp) -/* 87BB80 80241FA0 8FB40050 */ lw $s4, 0x50($sp) -/* 87BB84 80241FA4 8FB3004C */ lw $s3, 0x4c($sp) -/* 87BB88 80241FA8 8FB20048 */ lw $s2, 0x48($sp) -/* 87BB8C 80241FAC 8FB10044 */ lw $s1, 0x44($sp) -/* 87BB90 80241FB0 8FB00040 */ lw $s0, 0x40($sp) -/* 87BB94 80241FB4 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 87BB98 80241FB8 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 87BB9C 80241FBC D7B60060 */ ldc1 $f22, 0x60($sp) -/* 87BBA0 80241FC0 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 87BBA4 80241FC4 03E00008 */ jr $ra -/* 87BBA8 80241FC8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s new file mode 100644 index 0000000000..77868bd916 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241C88_87B868.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C88_87B868 +/* 87B868 80241C88 27BDFF88 */ addiu $sp, $sp, -0x78 +/* 87B86C 80241C8C AFB3004C */ sw $s3, 0x4c($sp) +/* 87B870 80241C90 0080982D */ daddu $s3, $a0, $zero +/* 87B874 80241C94 AFBF0054 */ sw $ra, 0x54($sp) +/* 87B878 80241C98 AFB40050 */ sw $s4, 0x50($sp) +/* 87B87C 80241C9C AFB20048 */ sw $s2, 0x48($sp) +/* 87B880 80241CA0 AFB10044 */ sw $s1, 0x44($sp) +/* 87B884 80241CA4 AFB00040 */ sw $s0, 0x40($sp) +/* 87B888 80241CA8 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* 87B88C 80241CAC F7B80068 */ sdc1 $f24, 0x68($sp) +/* 87B890 80241CB0 F7B60060 */ sdc1 $f22, 0x60($sp) +/* 87B894 80241CB4 F7B40058 */ sdc1 $f20, 0x58($sp) +/* 87B898 80241CB8 8E710148 */ lw $s1, 0x148($s3) +/* 87B89C 80241CBC 00A0902D */ daddu $s2, $a1, $zero +/* 87B8A0 80241CC0 86240008 */ lh $a0, 8($s1) +/* 87B8A4 80241CC4 0C00EABB */ jal get_npc_unsafe +/* 87B8A8 80241CC8 00C0A02D */ daddu $s4, $a2, $zero +/* 87B8AC 80241CCC 0040802D */ daddu $s0, $v0, $zero +/* 87B8B0 80241CD0 C6200078 */ lwc1 $f0, 0x78($s1) +/* 87B8B4 80241CD4 46800020 */ cvt.s.w $f0, $f0 +/* 87B8B8 80241CD8 46000021 */ cvt.d.s $f0, $f0 +/* 87B8BC 80241CDC 3C014059 */ lui $at, 0x4059 +/* 87B8C0 80241CE0 44811800 */ mtc1 $at, $f3 +/* 87B8C4 80241CE4 44801000 */ mtc1 $zero, $f2 +/* 87B8C8 80241CE8 8602008E */ lh $v0, 0x8e($s0) +/* 87B8CC 80241CEC 9603008E */ lhu $v1, 0x8e($s0) +/* 87B8D0 80241CF0 46220003 */ div.d $f0, $f0, $f2 +/* 87B8D4 80241CF4 46200620 */ cvt.s.d $f24, $f0 +/* 87B8D8 80241CF8 C6200088 */ lwc1 $f0, 0x88($s1) +/* 87B8DC 80241CFC 46800020 */ cvt.s.w $f0, $f0 +/* 87B8E0 80241D00 46000021 */ cvt.d.s $f0, $f0 +/* 87B8E4 80241D04 46220003 */ div.d $f0, $f0, $f2 +/* 87B8E8 80241D08 46200020 */ cvt.s.d $f0, $f0 +/* 87B8EC 80241D0C 18400003 */ blez $v0, .L80241D1C +/* 87B8F0 80241D10 4600C680 */ add.s $f26, $f24, $f0 +/* 87B8F4 80241D14 2462FFFF */ addiu $v0, $v1, -1 +/* 87B8F8 80241D18 A602008E */ sh $v0, 0x8e($s0) +.L80241D1C: +/* 87B8FC 80241D1C 8E220070 */ lw $v0, 0x70($s1) +/* 87B900 80241D20 18400034 */ blez $v0, .L80241DF4 +/* 87B904 80241D24 00000000 */ nop +/* 87B908 80241D28 C62C0074 */ lwc1 $f12, 0x74($s1) +/* 87B90C 80241D2C 46806320 */ cvt.s.w $f12, $f12 +/* 87B910 80241D30 44820000 */ mtc1 $v0, $f0 +/* 87B914 80241D34 00000000 */ nop +/* 87B918 80241D38 46800020 */ cvt.s.w $f0, $f0 +/* 87B91C 80241D3C 46000021 */ cvt.d.s $f0, $f0 +/* 87B920 80241D40 46220003 */ div.d $f0, $f0, $f2 +/* 87B924 80241D44 0C00A8BB */ jal sin_deg +/* 87B928 80241D48 462005A0 */ cvt.s.d $f22, $f0 +/* 87B92C 80241D4C 8E020000 */ lw $v0, ($s0) +/* 87B930 80241D50 30420008 */ andi $v0, $v0, 8 +/* 87B934 80241D54 10400003 */ beqz $v0, .L80241D64 +/* 87B938 80241D58 46000506 */ mov.s $f20, $f0 +/* 87B93C 80241D5C 08090769 */ j .L80241DA4 +/* 87B940 80241D60 0000102D */ daddu $v0, $zero, $zero +.L80241D64: +/* 87B944 80241D64 27A50028 */ addiu $a1, $sp, 0x28 +/* 87B948 80241D68 27A6002C */ addiu $a2, $sp, 0x2c +/* 87B94C 80241D6C C6000038 */ lwc1 $f0, 0x38($s0) +/* 87B950 80241D70 C602003C */ lwc1 $f2, 0x3c($s0) +/* 87B954 80241D74 C6040040 */ lwc1 $f4, 0x40($s0) +/* 87B958 80241D78 3C01447A */ lui $at, 0x447a +/* 87B95C 80241D7C 44813000 */ mtc1 $at, $f6 +/* 87B960 80241D80 27A20034 */ addiu $v0, $sp, 0x34 +/* 87B964 80241D84 E7A00028 */ swc1 $f0, 0x28($sp) +/* 87B968 80241D88 E7A2002C */ swc1 $f2, 0x2c($sp) +/* 87B96C 80241D8C E7A40030 */ swc1 $f4, 0x30($sp) +/* 87B970 80241D90 E7A60034 */ swc1 $f6, 0x34($sp) +/* 87B974 80241D94 AFA20010 */ sw $v0, 0x10($sp) +/* 87B978 80241D98 8E040080 */ lw $a0, 0x80($s0) +/* 87B97C 80241D9C 0C0372DF */ jal func_800DCB7C +/* 87B980 80241DA0 27A70030 */ addiu $a3, $sp, 0x30 +.L80241DA4: +/* 87B984 80241DA4 10400007 */ beqz $v0, .L80241DC4 +/* 87B988 80241DA8 00000000 */ nop +/* 87B98C 80241DAC 4616A082 */ mul.s $f2, $f20, $f22 +/* 87B990 80241DB0 00000000 */ nop +/* 87B994 80241DB4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* 87B998 80241DB8 46180000 */ add.s $f0, $f0, $f24 +/* 87B99C 80241DBC 08090774 */ j .L80241DD0 +/* 87B9A0 80241DC0 46020000 */ add.s $f0, $f0, $f2 +.L80241DC4: +/* 87B9A4 80241DC4 4616A002 */ mul.s $f0, $f20, $f22 +/* 87B9A8 80241DC8 00000000 */ nop +/* 87B9AC 80241DCC 4600D000 */ add.s $f0, $f26, $f0 +.L80241DD0: +/* 87B9B0 80241DD0 E600003C */ swc1 $f0, 0x3c($s0) +/* 87B9B4 80241DD4 8E220074 */ lw $v0, 0x74($s1) +/* 87B9B8 80241DD8 2442000A */ addiu $v0, $v0, 0xa +/* 87B9BC 80241DDC 44826000 */ mtc1 $v0, $f12 +/* 87B9C0 80241DE0 00000000 */ nop +/* 87B9C4 80241DE4 0C00A6C9 */ jal clamp_angle +/* 87B9C8 80241DE8 46806320 */ cvt.s.w $f12, $f12 +/* 87B9CC 80241DEC 4600020D */ trunc.w.s $f8, $f0 +/* 87B9D0 80241DF0 E6280074 */ swc1 $f8, 0x74($s1) +.L80241DF4: +/* 87B9D4 80241DF4 8E220090 */ lw $v0, 0x90($s1) +/* 87B9D8 80241DF8 1C400040 */ bgtz $v0, .L80241EFC +/* 87B9DC 80241DFC 2442FFFF */ addiu $v0, $v0, -1 +/* 87B9E0 80241E00 860200A8 */ lh $v0, 0xa8($s0) +/* 87B9E4 80241E04 C600003C */ lwc1 $f0, 0x3c($s0) +/* 87B9E8 80241E08 44821000 */ mtc1 $v0, $f2 +/* 87B9EC 80241E0C 00000000 */ nop +/* 87B9F0 80241E10 468010A0 */ cvt.s.w $f2, $f2 +/* 87B9F4 80241E14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 87B9F8 80241E18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 87B9FC 80241E1C 46020000 */ add.s $f0, $f0, $f2 +/* 87BA00 80241E20 3C014024 */ lui $at, 0x4024 +/* 87BA04 80241E24 44812800 */ mtc1 $at, $f5 +/* 87BA08 80241E28 44802000 */ mtc1 $zero, $f4 +/* 87BA0C 80241E2C C442002C */ lwc1 $f2, 0x2c($v0) +/* 87BA10 80241E30 46000021 */ cvt.d.s $f0, $f0 +/* 87BA14 80241E34 46240000 */ add.d $f0, $f0, $f4 +/* 87BA18 80241E38 460010A1 */ cvt.d.s $f2, $f2 +/* 87BA1C 80241E3C 4620103C */ c.lt.d $f2, $f0 +/* 87BA20 80241E40 00000000 */ nop +/* 87BA24 80241E44 4500002E */ bc1f .L80241F00 +/* 87BA28 80241E48 0280202D */ daddu $a0, $s4, $zero +/* 87BA2C 80241E4C 24020001 */ addiu $v0, $zero, 1 +/* 87BA30 80241E50 AFA20010 */ sw $v0, 0x10($sp) +/* 87BA34 80241E54 8E460024 */ lw $a2, 0x24($s2) +/* 87BA38 80241E58 8E470028 */ lw $a3, 0x28($s2) +/* 87BA3C 80241E5C 0C01242D */ jal func_800490B4 +/* 87BA40 80241E60 0220282D */ daddu $a1, $s1, $zero +/* 87BA44 80241E64 10400026 */ beqz $v0, .L80241F00 +/* 87BA48 80241E68 0000202D */ daddu $a0, $zero, $zero +/* 87BA4C 80241E6C 0200282D */ daddu $a1, $s0, $zero +/* 87BA50 80241E70 0000302D */ daddu $a2, $zero, $zero +/* 87BA54 80241E74 2412000C */ addiu $s2, $zero, 0xc +/* 87BA58 80241E78 860300A8 */ lh $v1, 0xa8($s0) +/* 87BA5C 80241E7C 3C013F80 */ lui $at, 0x3f80 +/* 87BA60 80241E80 44810000 */ mtc1 $at, $f0 +/* 87BA64 80241E84 3C014000 */ lui $at, 0x4000 +/* 87BA68 80241E88 44811000 */ mtc1 $at, $f2 +/* 87BA6C 80241E8C 3C01C1A0 */ lui $at, 0xc1a0 +/* 87BA70 80241E90 44812000 */ mtc1 $at, $f4 +/* 87BA74 80241E94 44834000 */ mtc1 $v1, $f8 +/* 87BA78 80241E98 00000000 */ nop +/* 87BA7C 80241E9C 46804220 */ cvt.s.w $f8, $f8 +/* 87BA80 80241EA0 44074000 */ mfc1 $a3, $f8 +/* 87BA84 80241EA4 27A20038 */ addiu $v0, $sp, 0x38 +/* 87BA88 80241EA8 AFB2001C */ sw $s2, 0x1c($sp) +/* 87BA8C 80241EAC AFA20020 */ sw $v0, 0x20($sp) +/* 87BA90 80241EB0 E7A00010 */ swc1 $f0, 0x10($sp) +/* 87BA94 80241EB4 E7A20014 */ swc1 $f2, 0x14($sp) +/* 87BA98 80241EB8 0C01BFA4 */ jal fx_emote +/* 87BA9C 80241EBC E7A40018 */ swc1 $f4, 0x18($sp) +/* 87BAA0 80241EC0 0200202D */ daddu $a0, $s0, $zero +/* 87BAA4 80241EC4 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 87BAA8 80241EC8 C480003C */ lwc1 $f0, 0x3c($a0) +/* 87BAAC 80241ECC 3C060020 */ lui $a2, 0x20 +/* 87BAB0 80241ED0 0C012530 */ jal func_800494C0 +/* 87BAB4 80241ED4 E4800064 */ swc1 $f0, 0x64($a0) +/* 87BAB8 80241ED8 8E220018 */ lw $v0, 0x18($s1) +/* 87BABC 80241EDC 9442002A */ lhu $v0, 0x2a($v0) +/* 87BAC0 80241EE0 30420001 */ andi $v0, $v0, 1 +/* 87BAC4 80241EE4 10400003 */ beqz $v0, .L80241EF4 +/* 87BAC8 80241EE8 2402000A */ addiu $v0, $zero, 0xa +/* 87BACC 80241EEC 080907E7 */ j .L80241F9C +/* 87BAD0 80241EF0 AE620070 */ sw $v0, 0x70($s3) +.L80241EF4: +/* 87BAD4 80241EF4 080907E7 */ j .L80241F9C +/* 87BAD8 80241EF8 AE720070 */ sw $s2, 0x70($s3) +.L80241EFC: +/* 87BADC 80241EFC AE220090 */ sw $v0, 0x90($s1) +.L80241F00: +/* 87BAE0 80241F00 8602008C */ lh $v0, 0x8c($s0) +/* 87BAE4 80241F04 14400025 */ bnez $v0, .L80241F9C +/* 87BAE8 80241F08 00000000 */ nop +/* 87BAEC 80241F0C 8602008E */ lh $v0, 0x8e($s0) +/* 87BAF0 80241F10 1C400022 */ bgtz $v0, .L80241F9C +/* 87BAF4 80241F14 00000000 */ nop +/* 87BAF8 80241F18 8E620074 */ lw $v0, 0x74($s3) +/* 87BAFC 80241F1C 2442FFFF */ addiu $v0, $v0, -1 +/* 87BB00 80241F20 1840001D */ blez $v0, .L80241F98 +/* 87BB04 80241F24 AE620074 */ sw $v0, 0x74($s3) +/* 87BB08 80241F28 8E220018 */ lw $v0, 0x18($s1) +/* 87BB0C 80241F2C 9442002A */ lhu $v0, 0x2a($v0) +/* 87BB10 80241F30 30420010 */ andi $v0, $v0, 0x10 +/* 87BB14 80241F34 14400007 */ bnez $v0, .L80241F54 +/* 87BB18 80241F38 00000000 */ nop +/* 87BB1C 80241F3C C600000C */ lwc1 $f0, 0xc($s0) +/* 87BB20 80241F40 3C014334 */ lui $at, 0x4334 +/* 87BB24 80241F44 44816000 */ mtc1 $at, $f12 +/* 87BB28 80241F48 0C00A6C9 */ jal clamp_angle +/* 87BB2C 80241F4C 460C0300 */ add.s $f12, $f0, $f12 +/* 87BB30 80241F50 E600000C */ swc1 $f0, 0xc($s0) +.L80241F54: +/* 87BB34 80241F54 0C00A67F */ jal rand_int +/* 87BB38 80241F58 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 87BB3C 80241F5C 3C032E8B */ lui $v1, 0x2e8b +/* 87BB40 80241F60 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* 87BB44 80241F64 00430018 */ mult $v0, $v1 +/* 87BB48 80241F68 00021FC3 */ sra $v1, $v0, 0x1f +/* 87BB4C 80241F6C 00004010 */ mfhi $t0 +/* 87BB50 80241F70 00082043 */ sra $a0, $t0, 1 +/* 87BB54 80241F74 00832023 */ subu $a0, $a0, $v1 +/* 87BB58 80241F78 00041840 */ sll $v1, $a0, 1 +/* 87BB5C 80241F7C 00641821 */ addu $v1, $v1, $a0 +/* 87BB60 80241F80 00031880 */ sll $v1, $v1, 2 +/* 87BB64 80241F84 00641823 */ subu $v1, $v1, $a0 +/* 87BB68 80241F88 00431023 */ subu $v0, $v0, $v1 +/* 87BB6C 80241F8C 24420005 */ addiu $v0, $v0, 5 +/* 87BB70 80241F90 080907E7 */ j .L80241F9C +/* 87BB74 80241F94 A602008E */ sh $v0, 0x8e($s0) +.L80241F98: +/* 87BB78 80241F98 AE600070 */ sw $zero, 0x70($s3) +.L80241F9C: +/* 87BB7C 80241F9C 8FBF0054 */ lw $ra, 0x54($sp) +/* 87BB80 80241FA0 8FB40050 */ lw $s4, 0x50($sp) +/* 87BB84 80241FA4 8FB3004C */ lw $s3, 0x4c($sp) +/* 87BB88 80241FA8 8FB20048 */ lw $s2, 0x48($sp) +/* 87BB8C 80241FAC 8FB10044 */ lw $s1, 0x44($sp) +/* 87BB90 80241FB0 8FB00040 */ lw $s0, 0x40($sp) +/* 87BB94 80241FB4 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* 87BB98 80241FB8 D7B80068 */ ldc1 $f24, 0x68($sp) +/* 87BB9C 80241FBC D7B60060 */ ldc1 $f22, 0x60($sp) +/* 87BBA0 80241FC0 D7B40058 */ ldc1 $f20, 0x58($sp) +/* 87BBA4 80241FC4 03E00008 */ jr $ra +/* 87BBA8 80241FC8 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC.s deleted file mode 100644 index 828d536748..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FCC -/* 87BBAC 80241FCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 87BBB0 80241FD0 AFB20018 */ sw $s2, 0x18($sp) -/* 87BBB4 80241FD4 0080902D */ daddu $s2, $a0, $zero -/* 87BBB8 80241FD8 AFBF001C */ sw $ra, 0x1c($sp) -/* 87BBBC 80241FDC AFB10014 */ sw $s1, 0x14($sp) -/* 87BBC0 80241FE0 AFB00010 */ sw $s0, 0x10($sp) -/* 87BBC4 80241FE4 8E510148 */ lw $s1, 0x148($s2) -/* 87BBC8 80241FE8 0C00EABB */ jal get_npc_unsafe -/* 87BBCC 80241FEC 86240008 */ lh $a0, 8($s1) -/* 87BBD0 80241FF0 0040802D */ daddu $s0, $v0, $zero -/* 87BBD4 80241FF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87BBD8 80241FF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87BBDC 80241FFC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 87BBE0 80242000 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 87BBE4 80242004 A600008E */ sh $zero, 0x8e($s0) -/* 87BBE8 80242008 8C460028 */ lw $a2, 0x28($v0) -/* 87BBEC 8024200C 0C00A720 */ jal atan2 -/* 87BBF0 80242010 8C470030 */ lw $a3, 0x30($v0) -/* 87BBF4 80242014 E600000C */ swc1 $f0, 0xc($s0) -/* 87BBF8 80242018 8E2200CC */ lw $v0, 0xcc($s1) -/* 87BBFC 8024201C 8C420020 */ lw $v0, 0x20($v0) -/* 87BC00 80242020 AE020028 */ sw $v0, 0x28($s0) -/* 87BC04 80242024 2402000B */ addiu $v0, $zero, 0xb -/* 87BC08 80242028 AE420070 */ sw $v0, 0x70($s2) -/* 87BC0C 8024202C 8FBF001C */ lw $ra, 0x1c($sp) -/* 87BC10 80242030 8FB20018 */ lw $s2, 0x18($sp) -/* 87BC14 80242034 8FB10014 */ lw $s1, 0x14($sp) -/* 87BC18 80242038 8FB00010 */ lw $s0, 0x10($sp) -/* 87BC1C 8024203C 03E00008 */ jr $ra -/* 87BC20 80242040 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC_87BBAC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC_87BBAC.s new file mode 100644 index 0000000000..8bd4508177 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80241FCC_87BBAC.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FCC_87BBAC +/* 87BBAC 80241FCC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 87BBB0 80241FD0 AFB20018 */ sw $s2, 0x18($sp) +/* 87BBB4 80241FD4 0080902D */ daddu $s2, $a0, $zero +/* 87BBB8 80241FD8 AFBF001C */ sw $ra, 0x1c($sp) +/* 87BBBC 80241FDC AFB10014 */ sw $s1, 0x14($sp) +/* 87BBC0 80241FE0 AFB00010 */ sw $s0, 0x10($sp) +/* 87BBC4 80241FE4 8E510148 */ lw $s1, 0x148($s2) +/* 87BBC8 80241FE8 0C00EABB */ jal get_npc_unsafe +/* 87BBCC 80241FEC 86240008 */ lh $a0, 8($s1) +/* 87BBD0 80241FF0 0040802D */ daddu $s0, $v0, $zero +/* 87BBD4 80241FF4 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 87BBD8 80241FF8 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 87BBDC 80241FFC C60C0038 */ lwc1 $f12, 0x38($s0) +/* 87BBE0 80242000 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 87BBE4 80242004 A600008E */ sh $zero, 0x8e($s0) +/* 87BBE8 80242008 8C460028 */ lw $a2, 0x28($v0) +/* 87BBEC 8024200C 0C00A720 */ jal atan2 +/* 87BBF0 80242010 8C470030 */ lw $a3, 0x30($v0) +/* 87BBF4 80242014 E600000C */ swc1 $f0, 0xc($s0) +/* 87BBF8 80242018 8E2200CC */ lw $v0, 0xcc($s1) +/* 87BBFC 8024201C 8C420020 */ lw $v0, 0x20($v0) +/* 87BC00 80242020 AE020028 */ sw $v0, 0x28($s0) +/* 87BC04 80242024 2402000B */ addiu $v0, $zero, 0xb +/* 87BC08 80242028 AE420070 */ sw $v0, 0x70($s2) +/* 87BC0C 8024202C 8FBF001C */ lw $ra, 0x1c($sp) +/* 87BC10 80242030 8FB20018 */ lw $s2, 0x18($sp) +/* 87BC14 80242034 8FB10014 */ lw $s1, 0x14($sp) +/* 87BC18 80242038 8FB00010 */ lw $s0, 0x10($sp) +/* 87BC1C 8024203C 03E00008 */ jr $ra +/* 87BC20 80242040 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044.s deleted file mode 100644 index 53fd6c1f1d..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242044 -/* 87BC24 80242044 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87BC28 80242048 AFB00010 */ sw $s0, 0x10($sp) -/* 87BC2C 8024204C 0080802D */ daddu $s0, $a0, $zero -/* 87BC30 80242050 AFBF0014 */ sw $ra, 0x14($sp) -/* 87BC34 80242054 8E020148 */ lw $v0, 0x148($s0) -/* 87BC38 80242058 0C00EABB */ jal get_npc_unsafe -/* 87BC3C 8024205C 84440008 */ lh $a0, 8($v0) -/* 87BC40 80242060 9443008E */ lhu $v1, 0x8e($v0) -/* 87BC44 80242064 C440003C */ lwc1 $f0, 0x3c($v0) -/* 87BC48 80242068 24640001 */ addiu $a0, $v1, 1 -/* 87BC4C 8024206C 00031C00 */ sll $v1, $v1, 0x10 -/* 87BC50 80242070 00031B83 */ sra $v1, $v1, 0xe -/* 87BC54 80242074 A444008E */ sh $a0, 0x8e($v0) -/* 87BC58 80242078 3C018024 */ lui $at, 0x8024 -/* 87BC5C 8024207C 00230821 */ addu $at, $at, $v1 -/* 87BC60 80242080 C4224CB0 */ lwc1 $f2, 0x4cb0($at) -/* 87BC64 80242084 8443008E */ lh $v1, 0x8e($v0) -/* 87BC68 80242088 46020000 */ add.s $f0, $f0, $f2 -/* 87BC6C 8024208C 28630005 */ slti $v1, $v1, 5 -/* 87BC70 80242090 14600003 */ bnez $v1, .L802420A0 -/* 87BC74 80242094 E440003C */ swc1 $f0, 0x3c($v0) -/* 87BC78 80242098 2402000C */ addiu $v0, $zero, 0xc -/* 87BC7C 8024209C AE020070 */ sw $v0, 0x70($s0) -.L802420A0: -/* 87BC80 802420A0 8FBF0014 */ lw $ra, 0x14($sp) -/* 87BC84 802420A4 8FB00010 */ lw $s0, 0x10($sp) -/* 87BC88 802420A8 03E00008 */ jr $ra -/* 87BC8C 802420AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s new file mode 100644 index 0000000000..c5669cd93f --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242044_87BC24.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242044_87BC24 +/* 87BC24 80242044 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 87BC28 80242048 AFB00010 */ sw $s0, 0x10($sp) +/* 87BC2C 8024204C 0080802D */ daddu $s0, $a0, $zero +/* 87BC30 80242050 AFBF0014 */ sw $ra, 0x14($sp) +/* 87BC34 80242054 8E020148 */ lw $v0, 0x148($s0) +/* 87BC38 80242058 0C00EABB */ jal get_npc_unsafe +/* 87BC3C 8024205C 84440008 */ lh $a0, 8($v0) +/* 87BC40 80242060 9443008E */ lhu $v1, 0x8e($v0) +/* 87BC44 80242064 C440003C */ lwc1 $f0, 0x3c($v0) +/* 87BC48 80242068 24640001 */ addiu $a0, $v1, 1 +/* 87BC4C 8024206C 00031C00 */ sll $v1, $v1, 0x10 +/* 87BC50 80242070 00031B83 */ sra $v1, $v1, 0xe +/* 87BC54 80242074 A444008E */ sh $a0, 0x8e($v0) +/* 87BC58 80242078 3C018024 */ lui $at, 0x8024 +/* 87BC5C 8024207C 00230821 */ addu $at, $at, $v1 +/* 87BC60 80242080 C4224CB0 */ lwc1 $f2, 0x4cb0($at) +/* 87BC64 80242084 8443008E */ lh $v1, 0x8e($v0) +/* 87BC68 80242088 46020000 */ add.s $f0, $f0, $f2 +/* 87BC6C 8024208C 28630005 */ slti $v1, $v1, 5 +/* 87BC70 80242090 14600003 */ bnez $v1, .L802420A0 +/* 87BC74 80242094 E440003C */ swc1 $f0, 0x3c($v0) +/* 87BC78 80242098 2402000C */ addiu $v0, $zero, 0xc +/* 87BC7C 8024209C AE020070 */ sw $v0, 0x70($s0) +.L802420A0: +/* 87BC80 802420A0 8FBF0014 */ lw $ra, 0x14($sp) +/* 87BC84 802420A4 8FB00010 */ lw $s0, 0x10($sp) +/* 87BC88 802420A8 03E00008 */ jr $ra +/* 87BC8C 802420AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0.s deleted file mode 100644 index e3921af5f8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420B0 -/* 87BC90 802420B0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 87BC94 802420B4 AFB3001C */ sw $s3, 0x1c($sp) -/* 87BC98 802420B8 0080982D */ daddu $s3, $a0, $zero -/* 87BC9C 802420BC AFBF0020 */ sw $ra, 0x20($sp) -/* 87BCA0 802420C0 AFB20018 */ sw $s2, 0x18($sp) -/* 87BCA4 802420C4 AFB10014 */ sw $s1, 0x14($sp) -/* 87BCA8 802420C8 AFB00010 */ sw $s0, 0x10($sp) -/* 87BCAC 802420CC 8E720148 */ lw $s2, 0x148($s3) -/* 87BCB0 802420D0 86440008 */ lh $a0, 8($s2) -/* 87BCB4 802420D4 0C00EABB */ jal get_npc_unsafe -/* 87BCB8 802420D8 00A0802D */ daddu $s0, $a1, $zero -/* 87BCBC 802420DC 0040882D */ daddu $s1, $v0, $zero -/* 87BCC0 802420E0 C6420080 */ lwc1 $f2, 0x80($s2) -/* 87BCC4 802420E4 468010A0 */ cvt.s.w $f2, $f2 -/* 87BCC8 802420E8 460010A1 */ cvt.d.s $f2, $f2 -/* 87BCCC 802420EC C6400084 */ lwc1 $f0, 0x84($s2) -/* 87BCD0 802420F0 46800020 */ cvt.s.w $f0, $f0 -/* 87BCD4 802420F4 46000021 */ cvt.d.s $f0, $f0 -/* 87BCD8 802420F8 3C014059 */ lui $at, 0x4059 -/* 87BCDC 802420FC 44812800 */ mtc1 $at, $f5 -/* 87BCE0 80242100 44802000 */ mtc1 $zero, $f4 -/* 87BCE4 80242104 8E4200CC */ lw $v0, 0xcc($s2) -/* 87BCE8 80242108 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 87BCEC 8024210C C62E0040 */ lwc1 $f14, 0x40($s1) -/* 87BCF0 80242110 46241083 */ div.d $f2, $f2, $f4 -/* 87BCF4 80242114 462010A0 */ cvt.s.d $f2, $f2 -/* 87BCF8 80242118 46240003 */ div.d $f0, $f0, $f4 -/* 87BCFC 8024211C 8C420020 */ lw $v0, 0x20($v0) -/* 87BD00 80242120 46200020 */ cvt.s.d $f0, $f0 -/* 87BD04 80242124 E622001C */ swc1 $f2, 0x1c($s1) -/* 87BD08 80242128 E6200014 */ swc1 $f0, 0x14($s1) -/* 87BD0C 8024212C AE220028 */ sw $v0, 0x28($s1) -/* 87BD10 80242130 C6000018 */ lwc1 $f0, 0x18($s0) -/* 87BD14 80242134 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87BD18 80242138 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87BD1C 8024213C E6200018 */ swc1 $f0, 0x18($s1) -/* 87BD20 80242140 8C460028 */ lw $a2, 0x28($v0) -/* 87BD24 80242144 0C00A720 */ jal atan2 -/* 87BD28 80242148 8C470030 */ lw $a3, 0x30($v0) -/* 87BD2C 8024214C E620000C */ swc1 $f0, 0xc($s1) -/* 87BD30 80242150 8E420018 */ lw $v0, 0x18($s2) -/* 87BD34 80242154 AE400074 */ sw $zero, 0x74($s2) -/* 87BD38 80242158 9442002A */ lhu $v0, 0x2a($v0) -/* 87BD3C 8024215C 30420002 */ andi $v0, $v0, 2 -/* 87BD40 80242160 10400005 */ beqz $v0, .L80242178 -/* 87BD44 80242164 24020003 */ addiu $v0, $zero, 3 -/* 87BD48 80242168 A622008E */ sh $v0, 0x8e($s1) -/* 87BD4C 8024216C 2402000D */ addiu $v0, $zero, 0xd -/* 87BD50 80242170 08090872 */ j .L802421C8 -/* 87BD54 80242174 AE620070 */ sw $v0, 0x70($s3) -.L80242178: -/* 87BD58 80242178 24030001 */ addiu $v1, $zero, 1 -/* 87BD5C 8024217C 2402000E */ addiu $v0, $zero, 0xe -/* 87BD60 80242180 A623008E */ sh $v1, 0x8e($s1) -/* 87BD64 80242184 AE620070 */ sw $v0, 0x70($s3) -/* 87BD68 80242188 C6200038 */ lwc1 $f0, 0x38($s1) -/* 87BD6C 8024218C 4600018D */ trunc.w.s $f6, $f0 -/* 87BD70 80242190 44023000 */ mfc1 $v0, $f6 -/* 87BD74 80242194 00000000 */ nop -/* 87BD78 80242198 A6420010 */ sh $v0, 0x10($s2) -/* 87BD7C 8024219C C620003C */ lwc1 $f0, 0x3c($s1) -/* 87BD80 802421A0 4600018D */ trunc.w.s $f6, $f0 -/* 87BD84 802421A4 44023000 */ mfc1 $v0, $f6 -/* 87BD88 802421A8 00000000 */ nop -/* 87BD8C 802421AC A6420012 */ sh $v0, 0x12($s2) -/* 87BD90 802421B0 C6200040 */ lwc1 $f0, 0x40($s1) -/* 87BD94 802421B4 A2430007 */ sb $v1, 7($s2) -/* 87BD98 802421B8 4600018D */ trunc.w.s $f6, $f0 -/* 87BD9C 802421BC 44023000 */ mfc1 $v0, $f6 -/* 87BDA0 802421C0 00000000 */ nop -/* 87BDA4 802421C4 A6420014 */ sh $v0, 0x14($s2) -.L802421C8: -/* 87BDA8 802421C8 8FBF0020 */ lw $ra, 0x20($sp) -/* 87BDAC 802421CC 8FB3001C */ lw $s3, 0x1c($sp) -/* 87BDB0 802421D0 8FB20018 */ lw $s2, 0x18($sp) -/* 87BDB4 802421D4 8FB10014 */ lw $s1, 0x14($sp) -/* 87BDB8 802421D8 8FB00010 */ lw $s0, 0x10($sp) -/* 87BDBC 802421DC 03E00008 */ jr $ra -/* 87BDC0 802421E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s new file mode 100644 index 0000000000..cba4da0cee --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802420B0_87BC90.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802420B0_87BC90 +/* 87BC90 802420B0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 87BC94 802420B4 AFB3001C */ sw $s3, 0x1c($sp) +/* 87BC98 802420B8 0080982D */ daddu $s3, $a0, $zero +/* 87BC9C 802420BC AFBF0020 */ sw $ra, 0x20($sp) +/* 87BCA0 802420C0 AFB20018 */ sw $s2, 0x18($sp) +/* 87BCA4 802420C4 AFB10014 */ sw $s1, 0x14($sp) +/* 87BCA8 802420C8 AFB00010 */ sw $s0, 0x10($sp) +/* 87BCAC 802420CC 8E720148 */ lw $s2, 0x148($s3) +/* 87BCB0 802420D0 86440008 */ lh $a0, 8($s2) +/* 87BCB4 802420D4 0C00EABB */ jal get_npc_unsafe +/* 87BCB8 802420D8 00A0802D */ daddu $s0, $a1, $zero +/* 87BCBC 802420DC 0040882D */ daddu $s1, $v0, $zero +/* 87BCC0 802420E0 C6420080 */ lwc1 $f2, 0x80($s2) +/* 87BCC4 802420E4 468010A0 */ cvt.s.w $f2, $f2 +/* 87BCC8 802420E8 460010A1 */ cvt.d.s $f2, $f2 +/* 87BCCC 802420EC C6400084 */ lwc1 $f0, 0x84($s2) +/* 87BCD0 802420F0 46800020 */ cvt.s.w $f0, $f0 +/* 87BCD4 802420F4 46000021 */ cvt.d.s $f0, $f0 +/* 87BCD8 802420F8 3C014059 */ lui $at, 0x4059 +/* 87BCDC 802420FC 44812800 */ mtc1 $at, $f5 +/* 87BCE0 80242100 44802000 */ mtc1 $zero, $f4 +/* 87BCE4 80242104 8E4200CC */ lw $v0, 0xcc($s2) +/* 87BCE8 80242108 C62C0038 */ lwc1 $f12, 0x38($s1) +/* 87BCEC 8024210C C62E0040 */ lwc1 $f14, 0x40($s1) +/* 87BCF0 80242110 46241083 */ div.d $f2, $f2, $f4 +/* 87BCF4 80242114 462010A0 */ cvt.s.d $f2, $f2 +/* 87BCF8 80242118 46240003 */ div.d $f0, $f0, $f4 +/* 87BCFC 8024211C 8C420020 */ lw $v0, 0x20($v0) +/* 87BD00 80242120 46200020 */ cvt.s.d $f0, $f0 +/* 87BD04 80242124 E622001C */ swc1 $f2, 0x1c($s1) +/* 87BD08 80242128 E6200014 */ swc1 $f0, 0x14($s1) +/* 87BD0C 8024212C AE220028 */ sw $v0, 0x28($s1) +/* 87BD10 80242130 C6000018 */ lwc1 $f0, 0x18($s0) +/* 87BD14 80242134 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 87BD18 80242138 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 87BD1C 8024213C E6200018 */ swc1 $f0, 0x18($s1) +/* 87BD20 80242140 8C460028 */ lw $a2, 0x28($v0) +/* 87BD24 80242144 0C00A720 */ jal atan2 +/* 87BD28 80242148 8C470030 */ lw $a3, 0x30($v0) +/* 87BD2C 8024214C E620000C */ swc1 $f0, 0xc($s1) +/* 87BD30 80242150 8E420018 */ lw $v0, 0x18($s2) +/* 87BD34 80242154 AE400074 */ sw $zero, 0x74($s2) +/* 87BD38 80242158 9442002A */ lhu $v0, 0x2a($v0) +/* 87BD3C 8024215C 30420002 */ andi $v0, $v0, 2 +/* 87BD40 80242160 10400005 */ beqz $v0, .L80242178 +/* 87BD44 80242164 24020003 */ addiu $v0, $zero, 3 +/* 87BD48 80242168 A622008E */ sh $v0, 0x8e($s1) +/* 87BD4C 8024216C 2402000D */ addiu $v0, $zero, 0xd +/* 87BD50 80242170 08090872 */ j .L802421C8 +/* 87BD54 80242174 AE620070 */ sw $v0, 0x70($s3) +.L80242178: +/* 87BD58 80242178 24030001 */ addiu $v1, $zero, 1 +/* 87BD5C 8024217C 2402000E */ addiu $v0, $zero, 0xe +/* 87BD60 80242180 A623008E */ sh $v1, 0x8e($s1) +/* 87BD64 80242184 AE620070 */ sw $v0, 0x70($s3) +/* 87BD68 80242188 C6200038 */ lwc1 $f0, 0x38($s1) +/* 87BD6C 8024218C 4600018D */ trunc.w.s $f6, $f0 +/* 87BD70 80242190 44023000 */ mfc1 $v0, $f6 +/* 87BD74 80242194 00000000 */ nop +/* 87BD78 80242198 A6420010 */ sh $v0, 0x10($s2) +/* 87BD7C 8024219C C620003C */ lwc1 $f0, 0x3c($s1) +/* 87BD80 802421A0 4600018D */ trunc.w.s $f6, $f0 +/* 87BD84 802421A4 44023000 */ mfc1 $v0, $f6 +/* 87BD88 802421A8 00000000 */ nop +/* 87BD8C 802421AC A6420012 */ sh $v0, 0x12($s2) +/* 87BD90 802421B0 C6200040 */ lwc1 $f0, 0x40($s1) +/* 87BD94 802421B4 A2430007 */ sb $v1, 7($s2) +/* 87BD98 802421B8 4600018D */ trunc.w.s $f6, $f0 +/* 87BD9C 802421BC 44023000 */ mfc1 $v0, $f6 +/* 87BDA0 802421C0 00000000 */ nop +/* 87BDA4 802421C4 A6420014 */ sh $v0, 0x14($s2) +.L802421C8: +/* 87BDA8 802421C8 8FBF0020 */ lw $ra, 0x20($sp) +/* 87BDAC 802421CC 8FB3001C */ lw $s3, 0x1c($sp) +/* 87BDB0 802421D0 8FB20018 */ lw $s2, 0x18($sp) +/* 87BDB4 802421D4 8FB10014 */ lw $s1, 0x14($sp) +/* 87BDB8 802421D8 8FB00010 */ lw $s0, 0x10($sp) +/* 87BDBC 802421DC 03E00008 */ jr $ra +/* 87BDC0 802421E0 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4.s deleted file mode 100644 index 3e8a2c21ed..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421E4 -/* 87BDC4 802421E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 87BDC8 802421E8 AFB00010 */ sw $s0, 0x10($sp) -/* 87BDCC 802421EC 0080802D */ daddu $s0, $a0, $zero -/* 87BDD0 802421F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 87BDD4 802421F4 8E020148 */ lw $v0, 0x148($s0) -/* 87BDD8 802421F8 0C00EABB */ jal get_npc_unsafe -/* 87BDDC 802421FC 84440008 */ lh $a0, 8($v0) -/* 87BDE0 80242200 0040202D */ daddu $a0, $v0, $zero -/* 87BDE4 80242204 8482008E */ lh $v0, 0x8e($a0) -/* 87BDE8 80242208 9483008E */ lhu $v1, 0x8e($a0) -/* 87BDEC 8024220C 18400005 */ blez $v0, .L80242224 -/* 87BDF0 80242210 2462FFFF */ addiu $v0, $v1, -1 -/* 87BDF4 80242214 A482008E */ sh $v0, 0x8e($a0) -/* 87BDF8 80242218 00021400 */ sll $v0, $v0, 0x10 -/* 87BDFC 8024221C 1C400006 */ bgtz $v0, .L80242238 -/* 87BE00 80242220 00000000 */ nop -.L80242224: -/* 87BE04 80242224 8482008C */ lh $v0, 0x8c($a0) -/* 87BE08 80242228 14400003 */ bnez $v0, .L80242238 -/* 87BE0C 8024222C 2402000E */ addiu $v0, $zero, 0xe -/* 87BE10 80242230 A480008E */ sh $zero, 0x8e($a0) -/* 87BE14 80242234 AE020070 */ sw $v0, 0x70($s0) -.L80242238: -/* 87BE18 80242238 8FBF0014 */ lw $ra, 0x14($sp) -/* 87BE1C 8024223C 8FB00010 */ lw $s0, 0x10($sp) -/* 87BE20 80242240 03E00008 */ jr $ra -/* 87BE24 80242244 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s new file mode 100644 index 0000000000..9773b38980 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802421E4_87BDC4.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421E4_87BDC4 +/* 87BDC4 802421E4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 87BDC8 802421E8 AFB00010 */ sw $s0, 0x10($sp) +/* 87BDCC 802421EC 0080802D */ daddu $s0, $a0, $zero +/* 87BDD0 802421F0 AFBF0014 */ sw $ra, 0x14($sp) +/* 87BDD4 802421F4 8E020148 */ lw $v0, 0x148($s0) +/* 87BDD8 802421F8 0C00EABB */ jal get_npc_unsafe +/* 87BDDC 802421FC 84440008 */ lh $a0, 8($v0) +/* 87BDE0 80242200 0040202D */ daddu $a0, $v0, $zero +/* 87BDE4 80242204 8482008E */ lh $v0, 0x8e($a0) +/* 87BDE8 80242208 9483008E */ lhu $v1, 0x8e($a0) +/* 87BDEC 8024220C 18400005 */ blez $v0, .L80242224 +/* 87BDF0 80242210 2462FFFF */ addiu $v0, $v1, -1 +/* 87BDF4 80242214 A482008E */ sh $v0, 0x8e($a0) +/* 87BDF8 80242218 00021400 */ sll $v0, $v0, 0x10 +/* 87BDFC 8024221C 1C400006 */ bgtz $v0, .L80242238 +/* 87BE00 80242220 00000000 */ nop +.L80242224: +/* 87BE04 80242224 8482008C */ lh $v0, 0x8c($a0) +/* 87BE08 80242228 14400003 */ bnez $v0, .L80242238 +/* 87BE0C 8024222C 2402000E */ addiu $v0, $zero, 0xe +/* 87BE10 80242230 A480008E */ sh $zero, 0x8e($a0) +/* 87BE14 80242234 AE020070 */ sw $v0, 0x70($s0) +.L80242238: +/* 87BE18 80242238 8FBF0014 */ lw $ra, 0x14($sp) +/* 87BE1C 8024223C 8FB00010 */ lw $s0, 0x10($sp) +/* 87BE20 80242240 03E00008 */ jr $ra +/* 87BE24 80242244 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248.s deleted file mode 100644 index 5779a869e6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242248 -/* 87BE28 80242248 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 87BE2C 8024224C AFB20030 */ sw $s2, 0x30($sp) -/* 87BE30 80242250 0080902D */ daddu $s2, $a0, $zero -/* 87BE34 80242254 AFBF0038 */ sw $ra, 0x38($sp) -/* 87BE38 80242258 AFB30034 */ sw $s3, 0x34($sp) -/* 87BE3C 8024225C AFB1002C */ sw $s1, 0x2c($sp) -/* 87BE40 80242260 AFB00028 */ sw $s0, 0x28($sp) -/* 87BE44 80242264 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 87BE48 80242268 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 87BE4C 8024226C 8E510148 */ lw $s1, 0x148($s2) -/* 87BE50 80242270 86240008 */ lh $a0, 8($s1) -/* 87BE54 80242274 0C00EABB */ jal get_npc_unsafe -/* 87BE58 80242278 00A0982D */ daddu $s3, $a1, $zero -/* 87BE5C 8024227C 0040802D */ daddu $s0, $v0, $zero -/* 87BE60 80242280 0200202D */ daddu $a0, $s0, $zero -/* 87BE64 80242284 C6220088 */ lwc1 $f2, 0x88($s1) -/* 87BE68 80242288 468010A0 */ cvt.s.w $f2, $f2 -/* 87BE6C 8024228C 460010A1 */ cvt.d.s $f2, $f2 -/* 87BE70 80242290 C604001C */ lwc1 $f4, 0x1c($s0) -/* 87BE74 80242294 C6000014 */ lwc1 $f0, 0x14($s0) -/* 87BE78 80242298 8E050018 */ lw $a1, 0x18($s0) -/* 87BE7C 8024229C 46002100 */ add.s $f4, $f4, $f0 -/* 87BE80 802422A0 8E06000C */ lw $a2, 0xc($s0) -/* 87BE84 802422A4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 87BE88 802422A8 46800020 */ cvt.s.w $f0, $f0 -/* 87BE8C 802422AC E604001C */ swc1 $f4, 0x1c($s0) -/* 87BE90 802422B0 3C014059 */ lui $at, 0x4059 -/* 87BE94 802422B4 44812800 */ mtc1 $at, $f5 -/* 87BE98 802422B8 44802000 */ mtc1 $zero, $f4 -/* 87BE9C 802422BC 46000021 */ cvt.d.s $f0, $f0 -/* 87BEA0 802422C0 46240003 */ div.d $f0, $f0, $f4 -/* 87BEA4 802422C4 46200520 */ cvt.s.d $f20, $f0 -/* 87BEA8 802422C8 46241083 */ div.d $f2, $f2, $f4 -/* 87BEAC 802422CC 0C00EA95 */ jal npc_move_heading -/* 87BEB0 802422D0 462015A0 */ cvt.s.d $f22, $f2 -/* 87BEB4 802422D4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 87BEB8 802422D8 44801000 */ mtc1 $zero, $f2 -/* 87BEBC 802422DC 44801800 */ mtc1 $zero, $f3 -/* 87BEC0 802422E0 46002021 */ cvt.d.s $f0, $f4 -/* 87BEC4 802422E4 4620103E */ c.le.d $f2, $f0 -/* 87BEC8 802422E8 00000000 */ nop -/* 87BECC 802422EC 45000030 */ bc1f .L802423B0 -/* 87BED0 802422F0 00000000 */ nop -/* 87BED4 802422F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87BED8 802422F8 46040000 */ add.s $f0, $f0, $f4 -/* 87BEDC 802422FC E600003C */ swc1 $f0, 0x3c($s0) -/* 87BEE0 80242300 8E2200CC */ lw $v0, 0xcc($s1) -/* 87BEE4 80242304 8C420024 */ lw $v0, 0x24($v0) -/* 87BEE8 80242308 AE020028 */ sw $v0, 0x28($s0) -/* 87BEEC 8024230C A2200007 */ sb $zero, 7($s1) -/* 87BEF0 80242310 8E020000 */ lw $v0, ($s0) -/* 87BEF4 80242314 30420008 */ andi $v0, $v0, 8 -/* 87BEF8 80242318 14400011 */ bnez $v0, .L80242360 -/* 87BEFC 8024231C 0000102D */ daddu $v0, $zero, $zero -/* 87BF00 80242320 27A50018 */ addiu $a1, $sp, 0x18 -/* 87BF04 80242324 27A6001C */ addiu $a2, $sp, 0x1c -/* 87BF08 80242328 C6000038 */ lwc1 $f0, 0x38($s0) -/* 87BF0C 8024232C C602003C */ lwc1 $f2, 0x3c($s0) -/* 87BF10 80242330 C6040040 */ lwc1 $f4, 0x40($s0) -/* 87BF14 80242334 3C01447A */ lui $at, 0x447a -/* 87BF18 80242338 44813000 */ mtc1 $at, $f6 -/* 87BF1C 8024233C 27A20024 */ addiu $v0, $sp, 0x24 -/* 87BF20 80242340 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87BF24 80242344 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 87BF28 80242348 E7A40020 */ swc1 $f4, 0x20($sp) -/* 87BF2C 8024234C E7A60024 */ swc1 $f6, 0x24($sp) -/* 87BF30 80242350 AFA20010 */ sw $v0, 0x10($sp) -/* 87BF34 80242354 8E040080 */ lw $a0, 0x80($s0) -/* 87BF38 80242358 0C0372DF */ jal func_800DCB7C -/* 87BF3C 8024235C 27A70020 */ addiu $a3, $sp, 0x20 -.L80242360: -/* 87BF40 80242360 1040000B */ beqz $v0, .L80242390 -/* 87BF44 80242364 00000000 */ nop -/* 87BF48 80242368 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 87BF4C 8024236C 46140080 */ add.s $f2, $f0, $f20 -/* 87BF50 80242370 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87BF54 80242374 4600103E */ c.le.s $f2, $f0 -/* 87BF58 80242378 00000000 */ nop -/* 87BF5C 8024237C 4500008D */ bc1f .L802425B4 -/* 87BF60 80242380 00000000 */ nop -/* 87BF64 80242384 E602003C */ swc1 $f2, 0x3c($s0) -/* 87BF68 80242388 0809096D */ j .L802425B4 -/* 87BF6C 8024238C AE400070 */ sw $zero, 0x70($s2) -.L80242390: -/* 87BF70 80242390 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87BF74 80242394 C6000064 */ lwc1 $f0, 0x64($s0) -/* 87BF78 80242398 4602003E */ c.le.s $f0, $f2 -/* 87BF7C 8024239C 00000000 */ nop -/* 87BF80 802423A0 45030084 */ bc1tl .L802425B4 -/* 87BF84 802423A4 AE400070 */ sw $zero, 0x70($s2) -/* 87BF88 802423A8 0809096D */ j .L802425B4 -/* 87BF8C 802423AC 00000000 */ nop -.L802423B0: -/* 87BF90 802423B0 4622003C */ c.lt.d $f0, $f2 -/* 87BF94 802423B4 00000000 */ nop -/* 87BF98 802423B8 4500007E */ bc1f .L802425B4 -/* 87BF9C 802423BC 00000000 */ nop -/* 87BFA0 802423C0 9602008E */ lhu $v0, 0x8e($s0) -/* 87BFA4 802423C4 24420001 */ addiu $v0, $v0, 1 -/* 87BFA8 802423C8 A602008E */ sh $v0, 0x8e($s0) -/* 87BFAC 802423CC 00021400 */ sll $v0, $v0, 0x10 -/* 87BFB0 802423D0 8E630020 */ lw $v1, 0x20($s3) -/* 87BFB4 802423D4 00021403 */ sra $v0, $v0, 0x10 -/* 87BFB8 802423D8 0043102A */ slt $v0, $v0, $v1 -/* 87BFBC 802423DC 14400026 */ bnez $v0, .L80242478 -/* 87BFC0 802423E0 00000000 */ nop -/* 87BFC4 802423E4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 87BFC8 802423E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 87BFCC 802423EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 87BFD0 802423F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 87BFD4 802423F4 A600008E */ sh $zero, 0x8e($s0) -/* 87BFD8 802423F8 8C460028 */ lw $a2, 0x28($v0) -/* 87BFDC 802423FC 0C00A720 */ jal atan2 -/* 87BFE0 80242400 8C470030 */ lw $a3, 0x30($v0) -/* 87BFE4 80242404 46000506 */ mov.s $f20, $f0 -/* 87BFE8 80242408 C60C000C */ lwc1 $f12, 0xc($s0) -/* 87BFEC 8024240C 0C00A70A */ jal get_clamped_angle_diff -/* 87BFF0 80242410 4600A386 */ mov.s $f14, $f20 -/* 87BFF4 80242414 46000086 */ mov.s $f2, $f0 -/* 87BFF8 80242418 8E62001C */ lw $v0, 0x1c($s3) -/* 87BFFC 8024241C 46001005 */ abs.s $f0, $f2 -/* 87C000 80242420 44822000 */ mtc1 $v0, $f4 -/* 87C004 80242424 00000000 */ nop -/* 87C008 80242428 46802120 */ cvt.s.w $f4, $f4 -/* 87C00C 8024242C 4600203C */ c.lt.s $f4, $f0 -/* 87C010 80242430 00000000 */ nop -/* 87C014 80242434 4500000D */ bc1f .L8024246C -/* 87C018 80242438 00000000 */ nop -/* 87C01C 8024243C 44800000 */ mtc1 $zero, $f0 -/* 87C020 80242440 C614000C */ lwc1 $f20, 0xc($s0) -/* 87C024 80242444 4600103C */ c.lt.s $f2, $f0 -/* 87C028 80242448 00000000 */ nop -/* 87C02C 8024244C 45000006 */ bc1f .L80242468 -/* 87C030 80242450 00021023 */ negu $v0, $v0 -/* 87C034 80242454 44820000 */ mtc1 $v0, $f0 -/* 87C038 80242458 00000000 */ nop -/* 87C03C 8024245C 46800020 */ cvt.s.w $f0, $f0 -/* 87C040 80242460 0809091B */ j .L8024246C -/* 87C044 80242464 4600A500 */ add.s $f20, $f20, $f0 -.L80242468: -/* 87C048 80242468 4604A500 */ add.s $f20, $f20, $f4 -.L8024246C: -/* 87C04C 8024246C 0C00A6C9 */ jal clamp_angle -/* 87C050 80242470 4600A306 */ mov.s $f12, $f20 -/* 87C054 80242474 E600000C */ swc1 $f0, 0xc($s0) -.L80242478: -/* 87C058 80242478 8E020000 */ lw $v0, ($s0) -/* 87C05C 8024247C 30420008 */ andi $v0, $v0, 8 -/* 87C060 80242480 1040000A */ beqz $v0, .L802424AC -/* 87C064 80242484 27A50018 */ addiu $a1, $sp, 0x18 -/* 87C068 80242488 C602003C */ lwc1 $f2, 0x3c($s0) -/* 87C06C 8024248C C600001C */ lwc1 $f0, 0x1c($s0) -/* 87C070 80242490 46001080 */ add.s $f2, $f2, $f0 -/* 87C074 80242494 4616103C */ c.lt.s $f2, $f22 -/* 87C078 80242498 00000000 */ nop -/* 87C07C 8024249C 45020045 */ bc1fl .L802425B4 -/* 87C080 802424A0 E602003C */ swc1 $f2, 0x3c($s0) -/* 87C084 802424A4 0809096C */ j .L802425B0 -/* 87C088 802424A8 E616003C */ swc1 $f22, 0x3c($s0) -.L802424AC: -/* 87C08C 802424AC C6000038 */ lwc1 $f0, 0x38($s0) -/* 87C090 802424B0 27A6001C */ addiu $a2, $sp, 0x1c -/* 87C094 802424B4 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87C098 802424B8 860200A8 */ lh $v0, 0xa8($s0) -/* 87C09C 802424BC C600001C */ lwc1 $f0, 0x1c($s0) -/* 87C0A0 802424C0 C604003C */ lwc1 $f4, 0x3c($s0) -/* 87C0A4 802424C4 44821000 */ mtc1 $v0, $f2 -/* 87C0A8 802424C8 00000000 */ nop -/* 87C0AC 802424CC 468010A0 */ cvt.s.w $f2, $f2 -/* 87C0B0 802424D0 46000005 */ abs.s $f0, $f0 -/* 87C0B4 802424D4 46020000 */ add.s $f0, $f0, $f2 -/* 87C0B8 802424D8 C6060040 */ lwc1 $f6, 0x40($s0) -/* 87C0BC 802424DC 27A20024 */ addiu $v0, $sp, 0x24 -/* 87C0C0 802424E0 46022100 */ add.s $f4, $f4, $f2 -/* 87C0C4 802424E4 3C014024 */ lui $at, 0x4024 -/* 87C0C8 802424E8 44811800 */ mtc1 $at, $f3 -/* 87C0CC 802424EC 44801000 */ mtc1 $zero, $f2 -/* 87C0D0 802424F0 46000021 */ cvt.d.s $f0, $f0 -/* 87C0D4 802424F4 46220000 */ add.d $f0, $f0, $f2 -/* 87C0D8 802424F8 E7A60020 */ swc1 $f6, 0x20($sp) -/* 87C0DC 802424FC E7A4001C */ swc1 $f4, 0x1c($sp) -/* 87C0E0 80242500 46200020 */ cvt.s.d $f0, $f0 -/* 87C0E4 80242504 E7A00024 */ swc1 $f0, 0x24($sp) -/* 87C0E8 80242508 AFA20010 */ sw $v0, 0x10($sp) -/* 87C0EC 8024250C 8E040080 */ lw $a0, 0x80($s0) -/* 87C0F0 80242510 0C0372DF */ jal func_800DCB7C -/* 87C0F4 80242514 27A70020 */ addiu $a3, $sp, 0x20 -/* 87C0F8 80242518 10400015 */ beqz $v0, .L80242570 -/* 87C0FC 8024251C 00000000 */ nop -/* 87C100 80242520 860200A8 */ lh $v0, 0xa8($s0) -/* 87C104 80242524 C604001C */ lwc1 $f4, 0x1c($s0) -/* 87C108 80242528 44820000 */ mtc1 $v0, $f0 -/* 87C10C 8024252C 00000000 */ nop -/* 87C110 80242530 46800020 */ cvt.s.w $f0, $f0 -/* 87C114 80242534 46002085 */ abs.s $f2, $f4 -/* 87C118 80242538 46020000 */ add.s $f0, $f0, $f2 -/* 87C11C 8024253C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 87C120 80242540 4600103E */ c.le.s $f2, $f0 -/* 87C124 80242544 00000000 */ nop -/* 87C128 80242548 45000005 */ bc1f .L80242560 -/* 87C12C 8024254C 00000000 */ nop -/* 87C130 80242550 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 87C134 80242554 AE00001C */ sw $zero, 0x1c($s0) -/* 87C138 80242558 0809096D */ j .L802425B4 -/* 87C13C 8024255C E600003C */ swc1 $f0, 0x3c($s0) -.L80242560: -/* 87C140 80242560 C600003C */ lwc1 $f0, 0x3c($s0) -/* 87C144 80242564 46040000 */ add.s $f0, $f0, $f4 -/* 87C148 80242568 0809096D */ j .L802425B4 -/* 87C14C 8024256C E600003C */ swc1 $f0, 0x3c($s0) -.L80242570: -/* 87C150 80242570 C606003C */ lwc1 $f6, 0x3c($s0) -/* 87C154 80242574 860200A8 */ lh $v0, 0xa8($s0) -/* 87C158 80242578 46163081 */ sub.s $f2, $f6, $f22 -/* 87C15C 8024257C 44820000 */ mtc1 $v0, $f0 -/* 87C160 80242580 00000000 */ nop -/* 87C164 80242584 46800020 */ cvt.s.w $f0, $f0 -/* 87C168 80242588 46001080 */ add.s $f2, $f2, $f0 -/* 87C16C 8024258C C604001C */ lwc1 $f4, 0x1c($s0) -/* 87C170 80242590 46002005 */ abs.s $f0, $f4 -/* 87C174 80242594 4602003C */ c.lt.s $f0, $f2 -/* 87C178 80242598 00000000 */ nop -/* 87C17C 8024259C 45020005 */ bc1fl .L802425B4 -/* 87C180 802425A0 AE00001C */ sw $zero, 0x1c($s0) -/* 87C184 802425A4 46043000 */ add.s $f0, $f6, $f4 -/* 87C188 802425A8 0809096D */ j .L802425B4 -/* 87C18C 802425AC E600003C */ swc1 $f0, 0x3c($s0) -.L802425B0: -/* 87C190 802425B0 AE00001C */ sw $zero, 0x1c($s0) -.L802425B4: -/* 87C194 802425B4 8FBF0038 */ lw $ra, 0x38($sp) -/* 87C198 802425B8 8FB30034 */ lw $s3, 0x34($sp) -/* 87C19C 802425BC 8FB20030 */ lw $s2, 0x30($sp) -/* 87C1A0 802425C0 8FB1002C */ lw $s1, 0x2c($sp) -/* 87C1A4 802425C4 8FB00028 */ lw $s0, 0x28($sp) -/* 87C1A8 802425C8 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 87C1AC 802425CC D7B40040 */ ldc1 $f20, 0x40($sp) -/* 87C1B0 802425D0 03E00008 */ jr $ra -/* 87C1B4 802425D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s new file mode 100644 index 0000000000..5ad59d1bf7 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_80242248_87BE28.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242248_87BE28 +/* 87BE28 80242248 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 87BE2C 8024224C AFB20030 */ sw $s2, 0x30($sp) +/* 87BE30 80242250 0080902D */ daddu $s2, $a0, $zero +/* 87BE34 80242254 AFBF0038 */ sw $ra, 0x38($sp) +/* 87BE38 80242258 AFB30034 */ sw $s3, 0x34($sp) +/* 87BE3C 8024225C AFB1002C */ sw $s1, 0x2c($sp) +/* 87BE40 80242260 AFB00028 */ sw $s0, 0x28($sp) +/* 87BE44 80242264 F7B60048 */ sdc1 $f22, 0x48($sp) +/* 87BE48 80242268 F7B40040 */ sdc1 $f20, 0x40($sp) +/* 87BE4C 8024226C 8E510148 */ lw $s1, 0x148($s2) +/* 87BE50 80242270 86240008 */ lh $a0, 8($s1) +/* 87BE54 80242274 0C00EABB */ jal get_npc_unsafe +/* 87BE58 80242278 00A0982D */ daddu $s3, $a1, $zero +/* 87BE5C 8024227C 0040802D */ daddu $s0, $v0, $zero +/* 87BE60 80242280 0200202D */ daddu $a0, $s0, $zero +/* 87BE64 80242284 C6220088 */ lwc1 $f2, 0x88($s1) +/* 87BE68 80242288 468010A0 */ cvt.s.w $f2, $f2 +/* 87BE6C 8024228C 460010A1 */ cvt.d.s $f2, $f2 +/* 87BE70 80242290 C604001C */ lwc1 $f4, 0x1c($s0) +/* 87BE74 80242294 C6000014 */ lwc1 $f0, 0x14($s0) +/* 87BE78 80242298 8E050018 */ lw $a1, 0x18($s0) +/* 87BE7C 8024229C 46002100 */ add.s $f4, $f4, $f0 +/* 87BE80 802422A0 8E06000C */ lw $a2, 0xc($s0) +/* 87BE84 802422A4 C6200078 */ lwc1 $f0, 0x78($s1) +/* 87BE88 802422A8 46800020 */ cvt.s.w $f0, $f0 +/* 87BE8C 802422AC E604001C */ swc1 $f4, 0x1c($s0) +/* 87BE90 802422B0 3C014059 */ lui $at, 0x4059 +/* 87BE94 802422B4 44812800 */ mtc1 $at, $f5 +/* 87BE98 802422B8 44802000 */ mtc1 $zero, $f4 +/* 87BE9C 802422BC 46000021 */ cvt.d.s $f0, $f0 +/* 87BEA0 802422C0 46240003 */ div.d $f0, $f0, $f4 +/* 87BEA4 802422C4 46200520 */ cvt.s.d $f20, $f0 +/* 87BEA8 802422C8 46241083 */ div.d $f2, $f2, $f4 +/* 87BEAC 802422CC 0C00EA95 */ jal npc_move_heading +/* 87BEB0 802422D0 462015A0 */ cvt.s.d $f22, $f2 +/* 87BEB4 802422D4 C604001C */ lwc1 $f4, 0x1c($s0) +/* 87BEB8 802422D8 44801000 */ mtc1 $zero, $f2 +/* 87BEBC 802422DC 44801800 */ mtc1 $zero, $f3 +/* 87BEC0 802422E0 46002021 */ cvt.d.s $f0, $f4 +/* 87BEC4 802422E4 4620103E */ c.le.d $f2, $f0 +/* 87BEC8 802422E8 00000000 */ nop +/* 87BECC 802422EC 45000030 */ bc1f .L802423B0 +/* 87BED0 802422F0 00000000 */ nop +/* 87BED4 802422F4 C600003C */ lwc1 $f0, 0x3c($s0) +/* 87BED8 802422F8 46040000 */ add.s $f0, $f0, $f4 +/* 87BEDC 802422FC E600003C */ swc1 $f0, 0x3c($s0) +/* 87BEE0 80242300 8E2200CC */ lw $v0, 0xcc($s1) +/* 87BEE4 80242304 8C420024 */ lw $v0, 0x24($v0) +/* 87BEE8 80242308 AE020028 */ sw $v0, 0x28($s0) +/* 87BEEC 8024230C A2200007 */ sb $zero, 7($s1) +/* 87BEF0 80242310 8E020000 */ lw $v0, ($s0) +/* 87BEF4 80242314 30420008 */ andi $v0, $v0, 8 +/* 87BEF8 80242318 14400011 */ bnez $v0, .L80242360 +/* 87BEFC 8024231C 0000102D */ daddu $v0, $zero, $zero +/* 87BF00 80242320 27A50018 */ addiu $a1, $sp, 0x18 +/* 87BF04 80242324 27A6001C */ addiu $a2, $sp, 0x1c +/* 87BF08 80242328 C6000038 */ lwc1 $f0, 0x38($s0) +/* 87BF0C 8024232C C602003C */ lwc1 $f2, 0x3c($s0) +/* 87BF10 80242330 C6040040 */ lwc1 $f4, 0x40($s0) +/* 87BF14 80242334 3C01447A */ lui $at, 0x447a +/* 87BF18 80242338 44813000 */ mtc1 $at, $f6 +/* 87BF1C 8024233C 27A20024 */ addiu $v0, $sp, 0x24 +/* 87BF20 80242340 E7A00018 */ swc1 $f0, 0x18($sp) +/* 87BF24 80242344 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 87BF28 80242348 E7A40020 */ swc1 $f4, 0x20($sp) +/* 87BF2C 8024234C E7A60024 */ swc1 $f6, 0x24($sp) +/* 87BF30 80242350 AFA20010 */ sw $v0, 0x10($sp) +/* 87BF34 80242354 8E040080 */ lw $a0, 0x80($s0) +/* 87BF38 80242358 0C0372DF */ jal func_800DCB7C +/* 87BF3C 8024235C 27A70020 */ addiu $a3, $sp, 0x20 +.L80242360: +/* 87BF40 80242360 1040000B */ beqz $v0, .L80242390 +/* 87BF44 80242364 00000000 */ nop +/* 87BF48 80242368 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 87BF4C 8024236C 46140080 */ add.s $f2, $f0, $f20 +/* 87BF50 80242370 C600003C */ lwc1 $f0, 0x3c($s0) +/* 87BF54 80242374 4600103E */ c.le.s $f2, $f0 +/* 87BF58 80242378 00000000 */ nop +/* 87BF5C 8024237C 4500008D */ bc1f .L802425B4 +/* 87BF60 80242380 00000000 */ nop +/* 87BF64 80242384 E602003C */ swc1 $f2, 0x3c($s0) +/* 87BF68 80242388 0809096D */ j .L802425B4 +/* 87BF6C 8024238C AE400070 */ sw $zero, 0x70($s2) +.L80242390: +/* 87BF70 80242390 C602003C */ lwc1 $f2, 0x3c($s0) +/* 87BF74 80242394 C6000064 */ lwc1 $f0, 0x64($s0) +/* 87BF78 80242398 4602003E */ c.le.s $f0, $f2 +/* 87BF7C 8024239C 00000000 */ nop +/* 87BF80 802423A0 45030084 */ bc1tl .L802425B4 +/* 87BF84 802423A4 AE400070 */ sw $zero, 0x70($s2) +/* 87BF88 802423A8 0809096D */ j .L802425B4 +/* 87BF8C 802423AC 00000000 */ nop +.L802423B0: +/* 87BF90 802423B0 4622003C */ c.lt.d $f0, $f2 +/* 87BF94 802423B4 00000000 */ nop +/* 87BF98 802423B8 4500007E */ bc1f .L802425B4 +/* 87BF9C 802423BC 00000000 */ nop +/* 87BFA0 802423C0 9602008E */ lhu $v0, 0x8e($s0) +/* 87BFA4 802423C4 24420001 */ addiu $v0, $v0, 1 +/* 87BFA8 802423C8 A602008E */ sh $v0, 0x8e($s0) +/* 87BFAC 802423CC 00021400 */ sll $v0, $v0, 0x10 +/* 87BFB0 802423D0 8E630020 */ lw $v1, 0x20($s3) +/* 87BFB4 802423D4 00021403 */ sra $v0, $v0, 0x10 +/* 87BFB8 802423D8 0043102A */ slt $v0, $v0, $v1 +/* 87BFBC 802423DC 14400026 */ bnez $v0, .L80242478 +/* 87BFC0 802423E0 00000000 */ nop +/* 87BFC4 802423E4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 87BFC8 802423E8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 87BFCC 802423EC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 87BFD0 802423F0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 87BFD4 802423F4 A600008E */ sh $zero, 0x8e($s0) +/* 87BFD8 802423F8 8C460028 */ lw $a2, 0x28($v0) +/* 87BFDC 802423FC 0C00A720 */ jal atan2 +/* 87BFE0 80242400 8C470030 */ lw $a3, 0x30($v0) +/* 87BFE4 80242404 46000506 */ mov.s $f20, $f0 +/* 87BFE8 80242408 C60C000C */ lwc1 $f12, 0xc($s0) +/* 87BFEC 8024240C 0C00A70A */ jal get_clamped_angle_diff +/* 87BFF0 80242410 4600A386 */ mov.s $f14, $f20 +/* 87BFF4 80242414 46000086 */ mov.s $f2, $f0 +/* 87BFF8 80242418 8E62001C */ lw $v0, 0x1c($s3) +/* 87BFFC 8024241C 46001005 */ abs.s $f0, $f2 +/* 87C000 80242420 44822000 */ mtc1 $v0, $f4 +/* 87C004 80242424 00000000 */ nop +/* 87C008 80242428 46802120 */ cvt.s.w $f4, $f4 +/* 87C00C 8024242C 4600203C */ c.lt.s $f4, $f0 +/* 87C010 80242430 00000000 */ nop +/* 87C014 80242434 4500000D */ bc1f .L8024246C +/* 87C018 80242438 00000000 */ nop +/* 87C01C 8024243C 44800000 */ mtc1 $zero, $f0 +/* 87C020 80242440 C614000C */ lwc1 $f20, 0xc($s0) +/* 87C024 80242444 4600103C */ c.lt.s $f2, $f0 +/* 87C028 80242448 00000000 */ nop +/* 87C02C 8024244C 45000006 */ bc1f .L80242468 +/* 87C030 80242450 00021023 */ negu $v0, $v0 +/* 87C034 80242454 44820000 */ mtc1 $v0, $f0 +/* 87C038 80242458 00000000 */ nop +/* 87C03C 8024245C 46800020 */ cvt.s.w $f0, $f0 +/* 87C040 80242460 0809091B */ j .L8024246C +/* 87C044 80242464 4600A500 */ add.s $f20, $f20, $f0 +.L80242468: +/* 87C048 80242468 4604A500 */ add.s $f20, $f20, $f4 +.L8024246C: +/* 87C04C 8024246C 0C00A6C9 */ jal clamp_angle +/* 87C050 80242470 4600A306 */ mov.s $f12, $f20 +/* 87C054 80242474 E600000C */ swc1 $f0, 0xc($s0) +.L80242478: +/* 87C058 80242478 8E020000 */ lw $v0, ($s0) +/* 87C05C 8024247C 30420008 */ andi $v0, $v0, 8 +/* 87C060 80242480 1040000A */ beqz $v0, .L802424AC +/* 87C064 80242484 27A50018 */ addiu $a1, $sp, 0x18 +/* 87C068 80242488 C602003C */ lwc1 $f2, 0x3c($s0) +/* 87C06C 8024248C C600001C */ lwc1 $f0, 0x1c($s0) +/* 87C070 80242490 46001080 */ add.s $f2, $f2, $f0 +/* 87C074 80242494 4616103C */ c.lt.s $f2, $f22 +/* 87C078 80242498 00000000 */ nop +/* 87C07C 8024249C 45020045 */ bc1fl .L802425B4 +/* 87C080 802424A0 E602003C */ swc1 $f2, 0x3c($s0) +/* 87C084 802424A4 0809096C */ j .L802425B0 +/* 87C088 802424A8 E616003C */ swc1 $f22, 0x3c($s0) +.L802424AC: +/* 87C08C 802424AC C6000038 */ lwc1 $f0, 0x38($s0) +/* 87C090 802424B0 27A6001C */ addiu $a2, $sp, 0x1c +/* 87C094 802424B4 E7A00018 */ swc1 $f0, 0x18($sp) +/* 87C098 802424B8 860200A8 */ lh $v0, 0xa8($s0) +/* 87C09C 802424BC C600001C */ lwc1 $f0, 0x1c($s0) +/* 87C0A0 802424C0 C604003C */ lwc1 $f4, 0x3c($s0) +/* 87C0A4 802424C4 44821000 */ mtc1 $v0, $f2 +/* 87C0A8 802424C8 00000000 */ nop +/* 87C0AC 802424CC 468010A0 */ cvt.s.w $f2, $f2 +/* 87C0B0 802424D0 46000005 */ abs.s $f0, $f0 +/* 87C0B4 802424D4 46020000 */ add.s $f0, $f0, $f2 +/* 87C0B8 802424D8 C6060040 */ lwc1 $f6, 0x40($s0) +/* 87C0BC 802424DC 27A20024 */ addiu $v0, $sp, 0x24 +/* 87C0C0 802424E0 46022100 */ add.s $f4, $f4, $f2 +/* 87C0C4 802424E4 3C014024 */ lui $at, 0x4024 +/* 87C0C8 802424E8 44811800 */ mtc1 $at, $f3 +/* 87C0CC 802424EC 44801000 */ mtc1 $zero, $f2 +/* 87C0D0 802424F0 46000021 */ cvt.d.s $f0, $f0 +/* 87C0D4 802424F4 46220000 */ add.d $f0, $f0, $f2 +/* 87C0D8 802424F8 E7A60020 */ swc1 $f6, 0x20($sp) +/* 87C0DC 802424FC E7A4001C */ swc1 $f4, 0x1c($sp) +/* 87C0E0 80242500 46200020 */ cvt.s.d $f0, $f0 +/* 87C0E4 80242504 E7A00024 */ swc1 $f0, 0x24($sp) +/* 87C0E8 80242508 AFA20010 */ sw $v0, 0x10($sp) +/* 87C0EC 8024250C 8E040080 */ lw $a0, 0x80($s0) +/* 87C0F0 80242510 0C0372DF */ jal func_800DCB7C +/* 87C0F4 80242514 27A70020 */ addiu $a3, $sp, 0x20 +/* 87C0F8 80242518 10400015 */ beqz $v0, .L80242570 +/* 87C0FC 8024251C 00000000 */ nop +/* 87C100 80242520 860200A8 */ lh $v0, 0xa8($s0) +/* 87C104 80242524 C604001C */ lwc1 $f4, 0x1c($s0) +/* 87C108 80242528 44820000 */ mtc1 $v0, $f0 +/* 87C10C 8024252C 00000000 */ nop +/* 87C110 80242530 46800020 */ cvt.s.w $f0, $f0 +/* 87C114 80242534 46002085 */ abs.s $f2, $f4 +/* 87C118 80242538 46020000 */ add.s $f0, $f0, $f2 +/* 87C11C 8024253C C7A20024 */ lwc1 $f2, 0x24($sp) +/* 87C120 80242540 4600103E */ c.le.s $f2, $f0 +/* 87C124 80242544 00000000 */ nop +/* 87C128 80242548 45000005 */ bc1f .L80242560 +/* 87C12C 8024254C 00000000 */ nop +/* 87C130 80242550 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 87C134 80242554 AE00001C */ sw $zero, 0x1c($s0) +/* 87C138 80242558 0809096D */ j .L802425B4 +/* 87C13C 8024255C E600003C */ swc1 $f0, 0x3c($s0) +.L80242560: +/* 87C140 80242560 C600003C */ lwc1 $f0, 0x3c($s0) +/* 87C144 80242564 46040000 */ add.s $f0, $f0, $f4 +/* 87C148 80242568 0809096D */ j .L802425B4 +/* 87C14C 8024256C E600003C */ swc1 $f0, 0x3c($s0) +.L80242570: +/* 87C150 80242570 C606003C */ lwc1 $f6, 0x3c($s0) +/* 87C154 80242574 860200A8 */ lh $v0, 0xa8($s0) +/* 87C158 80242578 46163081 */ sub.s $f2, $f6, $f22 +/* 87C15C 8024257C 44820000 */ mtc1 $v0, $f0 +/* 87C160 80242580 00000000 */ nop +/* 87C164 80242584 46800020 */ cvt.s.w $f0, $f0 +/* 87C168 80242588 46001080 */ add.s $f2, $f2, $f0 +/* 87C16C 8024258C C604001C */ lwc1 $f4, 0x1c($s0) +/* 87C170 80242590 46002005 */ abs.s $f0, $f4 +/* 87C174 80242594 4602003C */ c.lt.s $f0, $f2 +/* 87C178 80242598 00000000 */ nop +/* 87C17C 8024259C 45020005 */ bc1fl .L802425B4 +/* 87C180 802425A0 AE00001C */ sw $zero, 0x1c($s0) +/* 87C184 802425A4 46043000 */ add.s $f0, $f6, $f4 +/* 87C188 802425A8 0809096D */ j .L802425B4 +/* 87C18C 802425AC E600003C */ swc1 $f0, 0x3c($s0) +.L802425B0: +/* 87C190 802425B0 AE00001C */ sw $zero, 0x1c($s0) +.L802425B4: +/* 87C194 802425B4 8FBF0038 */ lw $ra, 0x38($sp) +/* 87C198 802425B8 8FB30034 */ lw $s3, 0x34($sp) +/* 87C19C 802425BC 8FB20030 */ lw $s2, 0x30($sp) +/* 87C1A0 802425C0 8FB1002C */ lw $s1, 0x2c($sp) +/* 87C1A4 802425C4 8FB00028 */ lw $s0, 0x28($sp) +/* 87C1A8 802425C8 D7B60048 */ ldc1 $f22, 0x48($sp) +/* 87C1AC 802425CC D7B40040 */ ldc1 $f20, 0x40($sp) +/* 87C1B0 802425D0 03E00008 */ jr $ra +/* 87C1B4 802425D4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8.s deleted file mode 100644 index fd93b25cd8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425D8 -/* 87C1B8 802425D8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 87C1BC 802425DC AFB00028 */ sw $s0, 0x28($sp) -/* 87C1C0 802425E0 00A0802D */ daddu $s0, $a1, $zero -/* 87C1C4 802425E4 AFB1002C */ sw $s1, 0x2c($sp) -/* 87C1C8 802425E8 00C0882D */ daddu $s1, $a2, $zero -/* 87C1CC 802425EC AFBF0034 */ sw $ra, 0x34($sp) -/* 87C1D0 802425F0 AFB20030 */ sw $s2, 0x30($sp) -/* 87C1D4 802425F4 AE200070 */ sw $zero, 0x70($s1) -/* 87C1D8 802425F8 8C830000 */ lw $v1, ($a0) -/* 87C1DC 802425FC 2402FDFF */ addiu $v0, $zero, -0x201 -/* 87C1E0 80242600 A480008E */ sh $zero, 0x8e($a0) -/* 87C1E4 80242604 00621824 */ and $v1, $v1, $v0 -/* 87C1E8 80242608 34650800 */ ori $a1, $v1, 0x800 -/* 87C1EC 8024260C AC850000 */ sw $a1, ($a0) -/* 87C1F0 80242610 8E0200D0 */ lw $v0, 0xd0($s0) -/* 87C1F4 80242614 8C420034 */ lw $v0, 0x34($v0) -/* 87C1F8 80242618 10400003 */ beqz $v0, .L80242628 -/* 87C1FC 8024261C 00E0902D */ daddu $s2, $a3, $zero -/* 87C200 80242620 0809098C */ j .L80242630 -/* 87C204 80242624 34620808 */ ori $v0, $v1, 0x808 -.L80242628: -/* 87C208 80242628 2402FFF7 */ addiu $v0, $zero, -9 -/* 87C20C 8024262C 00A21024 */ and $v0, $a1, $v0 -.L80242630: -/* 87C210 80242630 AC820000 */ sw $v0, ($a0) -/* 87C214 80242634 27A20024 */ addiu $v0, $sp, 0x24 -/* 87C218 80242638 27A50018 */ addiu $a1, $sp, 0x18 -/* 87C21C 8024263C C4800038 */ lwc1 $f0, 0x38($a0) -/* 87C220 80242640 C482003C */ lwc1 $f2, 0x3c($a0) -/* 87C224 80242644 C4840040 */ lwc1 $f4, 0x40($a0) -/* 87C228 80242648 3C01447A */ lui $at, 0x447a -/* 87C22C 8024264C 44813000 */ mtc1 $at, $f6 -/* 87C230 80242650 27A6001C */ addiu $a2, $sp, 0x1c -/* 87C234 80242654 E7A00018 */ swc1 $f0, 0x18($sp) -/* 87C238 80242658 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 87C23C 8024265C E7A40020 */ swc1 $f4, 0x20($sp) -/* 87C240 80242660 E7A60024 */ swc1 $f6, 0x24($sp) -/* 87C244 80242664 AFA20010 */ sw $v0, 0x10($sp) -/* 87C248 80242668 8C840080 */ lw $a0, 0x80($a0) -/* 87C24C 8024266C 0C0372DF */ jal func_800DCB7C -/* 87C250 80242670 27A70020 */ addiu $a3, $sp, 0x20 -/* 87C254 80242674 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 87C258 80242678 3C014059 */ lui $at, 0x4059 -/* 87C25C 8024267C 44812800 */ mtc1 $at, $f5 -/* 87C260 80242680 44802000 */ mtc1 $zero, $f4 -/* 87C264 80242684 460010A1 */ cvt.d.s $f2, $f2 -/* 87C268 80242688 46241082 */ mul.d $f2, $f2, $f4 -/* 87C26C 8024268C 00000000 */ nop -/* 87C270 80242690 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 87C274 80242694 46000021 */ cvt.d.s $f0, $f0 -/* 87C278 80242698 46240002 */ mul.d $f0, $f0, $f4 -/* 87C27C 8024269C 00000000 */ nop -/* 87C280 802426A0 3C013FE0 */ lui $at, 0x3fe0 -/* 87C284 802426A4 44812800 */ mtc1 $at, $f5 -/* 87C288 802426A8 44802000 */ mtc1 $zero, $f4 -/* 87C28C 802426AC 00000000 */ nop -/* 87C290 802426B0 46241080 */ add.d $f2, $f2, $f4 -/* 87C294 802426B4 AE000074 */ sw $zero, 0x74($s0) -/* 87C298 802426B8 46240000 */ add.d $f0, $f0, $f4 -/* 87C29C 802426BC AE000090 */ sw $zero, 0x90($s0) -/* 87C2A0 802426C0 4620120D */ trunc.w.d $f8, $f2 -/* 87C2A4 802426C4 E6080078 */ swc1 $f8, 0x78($s0) -/* 87C2A8 802426C8 4620020D */ trunc.w.d $f8, $f0 -/* 87C2AC 802426CC E6080088 */ swc1 $f8, 0x88($s0) -/* 87C2B0 802426D0 8E420014 */ lw $v0, 0x14($s2) -/* 87C2B4 802426D4 AE220074 */ sw $v0, 0x74($s1) -/* 87C2B8 802426D8 8E0200B0 */ lw $v0, 0xb0($s0) -/* 87C2BC 802426DC 34420010 */ ori $v0, $v0, 0x10 -/* 87C2C0 802426E0 AE0200B0 */ sw $v0, 0xb0($s0) -/* 87C2C4 802426E4 8FBF0034 */ lw $ra, 0x34($sp) -/* 87C2C8 802426E8 8FB20030 */ lw $s2, 0x30($sp) -/* 87C2CC 802426EC 8FB1002C */ lw $s1, 0x2c($sp) -/* 87C2D0 802426F0 8FB00028 */ lw $s0, 0x28($sp) -/* 87C2D4 802426F4 03E00008 */ jr $ra -/* 87C2D8 802426F8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s new file mode 100644 index 0000000000..531f481a1e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802425D8_87C1B8.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425D8_87C1B8 +/* 87C1B8 802425D8 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 87C1BC 802425DC AFB00028 */ sw $s0, 0x28($sp) +/* 87C1C0 802425E0 00A0802D */ daddu $s0, $a1, $zero +/* 87C1C4 802425E4 AFB1002C */ sw $s1, 0x2c($sp) +/* 87C1C8 802425E8 00C0882D */ daddu $s1, $a2, $zero +/* 87C1CC 802425EC AFBF0034 */ sw $ra, 0x34($sp) +/* 87C1D0 802425F0 AFB20030 */ sw $s2, 0x30($sp) +/* 87C1D4 802425F4 AE200070 */ sw $zero, 0x70($s1) +/* 87C1D8 802425F8 8C830000 */ lw $v1, ($a0) +/* 87C1DC 802425FC 2402FDFF */ addiu $v0, $zero, -0x201 +/* 87C1E0 80242600 A480008E */ sh $zero, 0x8e($a0) +/* 87C1E4 80242604 00621824 */ and $v1, $v1, $v0 +/* 87C1E8 80242608 34650800 */ ori $a1, $v1, 0x800 +/* 87C1EC 8024260C AC850000 */ sw $a1, ($a0) +/* 87C1F0 80242610 8E0200D0 */ lw $v0, 0xd0($s0) +/* 87C1F4 80242614 8C420034 */ lw $v0, 0x34($v0) +/* 87C1F8 80242618 10400003 */ beqz $v0, .L80242628 +/* 87C1FC 8024261C 00E0902D */ daddu $s2, $a3, $zero +/* 87C200 80242620 0809098C */ j .L80242630 +/* 87C204 80242624 34620808 */ ori $v0, $v1, 0x808 +.L80242628: +/* 87C208 80242628 2402FFF7 */ addiu $v0, $zero, -9 +/* 87C20C 8024262C 00A21024 */ and $v0, $a1, $v0 +.L80242630: +/* 87C210 80242630 AC820000 */ sw $v0, ($a0) +/* 87C214 80242634 27A20024 */ addiu $v0, $sp, 0x24 +/* 87C218 80242638 27A50018 */ addiu $a1, $sp, 0x18 +/* 87C21C 8024263C C4800038 */ lwc1 $f0, 0x38($a0) +/* 87C220 80242640 C482003C */ lwc1 $f2, 0x3c($a0) +/* 87C224 80242644 C4840040 */ lwc1 $f4, 0x40($a0) +/* 87C228 80242648 3C01447A */ lui $at, 0x447a +/* 87C22C 8024264C 44813000 */ mtc1 $at, $f6 +/* 87C230 80242650 27A6001C */ addiu $a2, $sp, 0x1c +/* 87C234 80242654 E7A00018 */ swc1 $f0, 0x18($sp) +/* 87C238 80242658 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 87C23C 8024265C E7A40020 */ swc1 $f4, 0x20($sp) +/* 87C240 80242660 E7A60024 */ swc1 $f6, 0x24($sp) +/* 87C244 80242664 AFA20010 */ sw $v0, 0x10($sp) +/* 87C248 80242668 8C840080 */ lw $a0, 0x80($a0) +/* 87C24C 8024266C 0C0372DF */ jal func_800DCB7C +/* 87C250 80242670 27A70020 */ addiu $a3, $sp, 0x20 +/* 87C254 80242674 C7A20024 */ lwc1 $f2, 0x24($sp) +/* 87C258 80242678 3C014059 */ lui $at, 0x4059 +/* 87C25C 8024267C 44812800 */ mtc1 $at, $f5 +/* 87C260 80242680 44802000 */ mtc1 $zero, $f4 +/* 87C264 80242684 460010A1 */ cvt.d.s $f2, $f2 +/* 87C268 80242688 46241082 */ mul.d $f2, $f2, $f4 +/* 87C26C 8024268C 00000000 */ nop +/* 87C270 80242690 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 87C274 80242694 46000021 */ cvt.d.s $f0, $f0 +/* 87C278 80242698 46240002 */ mul.d $f0, $f0, $f4 +/* 87C27C 8024269C 00000000 */ nop +/* 87C280 802426A0 3C013FE0 */ lui $at, 0x3fe0 +/* 87C284 802426A4 44812800 */ mtc1 $at, $f5 +/* 87C288 802426A8 44802000 */ mtc1 $zero, $f4 +/* 87C28C 802426AC 00000000 */ nop +/* 87C290 802426B0 46241080 */ add.d $f2, $f2, $f4 +/* 87C294 802426B4 AE000074 */ sw $zero, 0x74($s0) +/* 87C298 802426B8 46240000 */ add.d $f0, $f0, $f4 +/* 87C29C 802426BC AE000090 */ sw $zero, 0x90($s0) +/* 87C2A0 802426C0 4620120D */ trunc.w.d $f8, $f2 +/* 87C2A4 802426C4 E6080078 */ swc1 $f8, 0x78($s0) +/* 87C2A8 802426C8 4620020D */ trunc.w.d $f8, $f0 +/* 87C2AC 802426CC E6080088 */ swc1 $f8, 0x88($s0) +/* 87C2B0 802426D0 8E420014 */ lw $v0, 0x14($s2) +/* 87C2B4 802426D4 AE220074 */ sw $v0, 0x74($s1) +/* 87C2B8 802426D8 8E0200B0 */ lw $v0, 0xb0($s0) +/* 87C2BC 802426DC 34420010 */ ori $v0, $v0, 0x10 +/* 87C2C0 802426E0 AE0200B0 */ sw $v0, 0xb0($s0) +/* 87C2C4 802426E4 8FBF0034 */ lw $ra, 0x34($sp) +/* 87C2C8 802426E8 8FB20030 */ lw $s2, 0x30($sp) +/* 87C2CC 802426EC 8FB1002C */ lw $s1, 0x2c($sp) +/* 87C2D0 802426F0 8FB00028 */ lw $s0, 0x28($sp) +/* 87C2D4 802426F4 03E00008 */ jr $ra +/* 87C2D8 802426F8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC.s deleted file mode 100644 index 89a23e2b3b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC.s +++ /dev/null @@ -1,133 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426FC -/* 87C2DC 802426FC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 87C2E0 80242700 AFB40040 */ sw $s4, 0x40($sp) -/* 87C2E4 80242704 0080A02D */ daddu $s4, $a0, $zero -/* 87C2E8 80242708 AFBF0048 */ sw $ra, 0x48($sp) -/* 87C2EC 8024270C AFB50044 */ sw $s5, 0x44($sp) -/* 87C2F0 80242710 AFB3003C */ sw $s3, 0x3c($sp) -/* 87C2F4 80242714 AFB20038 */ sw $s2, 0x38($sp) -/* 87C2F8 80242718 AFB10034 */ sw $s1, 0x34($sp) -/* 87C2FC 8024271C AFB00030 */ sw $s0, 0x30($sp) -/* 87C300 80242720 8E920148 */ lw $s2, 0x148($s4) -/* 87C304 80242724 86440008 */ lh $a0, 8($s2) -/* 87C308 80242728 8E90000C */ lw $s0, 0xc($s4) -/* 87C30C 8024272C 0C00EABB */ jal get_npc_unsafe -/* 87C310 80242730 00A0882D */ daddu $s1, $a1, $zero -/* 87C314 80242734 0280202D */ daddu $a0, $s4, $zero -/* 87C318 80242738 8E050000 */ lw $a1, ($s0) -/* 87C31C 8024273C 0C0B1EAF */ jal get_variable -/* 87C320 80242740 0040A82D */ daddu $s5, $v0, $zero -/* 87C324 80242744 AFA00010 */ sw $zero, 0x10($sp) -/* 87C328 80242748 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C32C 8024274C 8C630030 */ lw $v1, 0x30($v1) -/* 87C330 80242750 AFA30014 */ sw $v1, 0x14($sp) -/* 87C334 80242754 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C338 80242758 8C63001C */ lw $v1, 0x1c($v1) -/* 87C33C 8024275C AFA30018 */ sw $v1, 0x18($sp) -/* 87C340 80242760 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C344 80242764 8C630024 */ lw $v1, 0x24($v1) -/* 87C348 80242768 AFA3001C */ sw $v1, 0x1c($sp) -/* 87C34C 8024276C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C350 80242770 8C630028 */ lw $v1, 0x28($v1) -/* 87C354 80242774 27B30010 */ addiu $s3, $sp, 0x10 -/* 87C358 80242778 AFA30020 */ sw $v1, 0x20($sp) -/* 87C35C 8024277C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 87C360 80242780 3C0142F0 */ lui $at, 0x42f0 -/* 87C364 80242784 44810000 */ mtc1 $at, $f0 -/* 87C368 80242788 8C63002C */ lw $v1, 0x2c($v1) -/* 87C36C 8024278C 0040802D */ daddu $s0, $v0, $zero -/* 87C370 80242790 E7A00028 */ swc1 $f0, 0x28($sp) -/* 87C374 80242794 A7A0002C */ sh $zero, 0x2c($sp) -/* 87C378 80242798 12200006 */ beqz $s1, .L802427B4 -/* 87C37C 8024279C AFA30024 */ sw $v1, 0x24($sp) -/* 87C380 802427A0 02A0202D */ daddu $a0, $s5, $zero -/* 87C384 802427A4 0240282D */ daddu $a1, $s2, $zero -/* 87C388 802427A8 0280302D */ daddu $a2, $s4, $zero -/* 87C38C 802427AC 0C090976 */ jal func_802425D8 -/* 87C390 802427B0 0200382D */ daddu $a3, $s0, $zero -.L802427B4: -/* 87C394 802427B4 2402FFFE */ addiu $v0, $zero, -2 -/* 87C398 802427B8 A2A200AB */ sb $v0, 0xab($s5) -/* 87C39C 802427BC 8E4300B0 */ lw $v1, 0xb0($s2) -/* 87C3A0 802427C0 30620004 */ andi $v0, $v1, 4 -/* 87C3A4 802427C4 10400007 */ beqz $v0, .L802427E4 -/* 87C3A8 802427C8 00000000 */ nop -/* 87C3AC 802427CC 824200B4 */ lb $v0, 0xb4($s2) -/* 87C3B0 802427D0 1440003C */ bnez $v0, .L802428C4 -/* 87C3B4 802427D4 0000102D */ daddu $v0, $zero, $zero -/* 87C3B8 802427D8 2402FFFB */ addiu $v0, $zero, -5 -/* 87C3BC 802427DC 00621024 */ and $v0, $v1, $v0 -/* 87C3C0 802427E0 AE4200B0 */ sw $v0, 0xb0($s2) -.L802427E4: -/* 87C3C4 802427E4 8E830070 */ lw $v1, 0x70($s4) -/* 87C3C8 802427E8 2C62000F */ sltiu $v0, $v1, 0xf -/* 87C3CC 802427EC 10400034 */ beqz $v0, .L802428C0 -/* 87C3D0 802427F0 00031080 */ sll $v0, $v1, 2 -/* 87C3D4 802427F4 3C018024 */ lui $at, 0x8024 -/* 87C3D8 802427F8 00220821 */ addu $at, $at, $v0 -/* 87C3DC 802427FC 8C2251C8 */ lw $v0, 0x51c8($at) -/* 87C3E0 80242800 00400008 */ jr $v0 -/* 87C3E4 80242804 00000000 */ nop -/* 87C3E8 80242808 0280202D */ daddu $a0, $s4, $zero -/* 87C3EC 8024280C 0200282D */ daddu $a1, $s0, $zero -/* 87C3F0 80242810 0C0904FC */ jal func_802413F0 -/* 87C3F4 80242814 0260302D */ daddu $a2, $s3, $zero -/* 87C3F8 80242818 0280202D */ daddu $a0, $s4, $zero -/* 87C3FC 8024281C 0200282D */ daddu $a1, $s0, $zero -/* 87C400 80242820 0C090568 */ jal func_802415A0_87B180 -/* 87C404 80242824 0260302D */ daddu $a2, $s3, $zero -/* 87C408 80242828 08090A31 */ j .L802428C4 -/* 87C40C 8024282C 0000102D */ daddu $v0, $zero, $zero -/* 87C410 80242830 0280202D */ daddu $a0, $s4, $zero -/* 87C414 80242834 0200282D */ daddu $a1, $s0, $zero -/* 87C418 80242838 0C0906F2 */ jal func_80241BC8 -/* 87C41C 8024283C 0260302D */ daddu $a2, $s3, $zero -/* 87C420 80242840 0280202D */ daddu $a0, $s4, $zero -/* 87C424 80242844 0200282D */ daddu $a1, $s0, $zero -/* 87C428 80242848 0C090722 */ jal func_80241C88 -/* 87C42C 8024284C 0260302D */ daddu $a2, $s3, $zero -/* 87C430 80242850 08090A31 */ j .L802428C4 -/* 87C434 80242854 0000102D */ daddu $v0, $zero, $zero -/* 87C438 80242858 0280202D */ daddu $a0, $s4, $zero -/* 87C43C 8024285C 0200282D */ daddu $a1, $s0, $zero -/* 87C440 80242860 0C0907F3 */ jal func_80241FCC -/* 87C444 80242864 0260302D */ daddu $a2, $s3, $zero -/* 87C448 80242868 0280202D */ daddu $a0, $s4, $zero -/* 87C44C 8024286C 0200282D */ daddu $a1, $s0, $zero -/* 87C450 80242870 0C090811 */ jal func_80242044 -/* 87C454 80242874 0260302D */ daddu $a2, $s3, $zero -/* 87C458 80242878 08090A31 */ j .L802428C4 -/* 87C45C 8024287C 0000102D */ daddu $v0, $zero, $zero -/* 87C460 80242880 0280202D */ daddu $a0, $s4, $zero -/* 87C464 80242884 0200282D */ daddu $a1, $s0, $zero -/* 87C468 80242888 0C09082C */ jal func_802420B0 -/* 87C46C 8024288C 0260302D */ daddu $a2, $s3, $zero -/* 87C470 80242890 08090A31 */ j .L802428C4 -/* 87C474 80242894 0000102D */ daddu $v0, $zero, $zero -/* 87C478 80242898 0280202D */ daddu $a0, $s4, $zero -/* 87C47C 8024289C 0200282D */ daddu $a1, $s0, $zero -/* 87C480 802428A0 0C090879 */ jal func_802421E4 -/* 87C484 802428A4 0260302D */ daddu $a2, $s3, $zero -/* 87C488 802428A8 08090A31 */ j .L802428C4 -/* 87C48C 802428AC 0000102D */ daddu $v0, $zero, $zero -/* 87C490 802428B0 0280202D */ daddu $a0, $s4, $zero -/* 87C494 802428B4 0200282D */ daddu $a1, $s0, $zero -/* 87C498 802428B8 0C090892 */ jal func_80242248 -/* 87C49C 802428BC 0260302D */ daddu $a2, $s3, $zero -.L802428C0: -/* 87C4A0 802428C0 0000102D */ daddu $v0, $zero, $zero -.L802428C4: -/* 87C4A4 802428C4 8FBF0048 */ lw $ra, 0x48($sp) -/* 87C4A8 802428C8 8FB50044 */ lw $s5, 0x44($sp) -/* 87C4AC 802428CC 8FB40040 */ lw $s4, 0x40($sp) -/* 87C4B0 802428D0 8FB3003C */ lw $s3, 0x3c($sp) -/* 87C4B4 802428D4 8FB20038 */ lw $s2, 0x38($sp) -/* 87C4B8 802428D8 8FB10034 */ lw $s1, 0x34($sp) -/* 87C4BC 802428DC 8FB00030 */ lw $s0, 0x30($sp) -/* 87C4C0 802428E0 03E00008 */ jr $ra -/* 87C4C4 802428E4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 87C4C8 802428E8 00000000 */ nop -/* 87C4CC 802428EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s new file mode 100644 index 0000000000..49b86e363e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_07/87AC00/func_802426FC_87C2DC.s @@ -0,0 +1,133 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426FC_87C2DC +/* 87C2DC 802426FC 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 87C2E0 80242700 AFB40040 */ sw $s4, 0x40($sp) +/* 87C2E4 80242704 0080A02D */ daddu $s4, $a0, $zero +/* 87C2E8 80242708 AFBF0048 */ sw $ra, 0x48($sp) +/* 87C2EC 8024270C AFB50044 */ sw $s5, 0x44($sp) +/* 87C2F0 80242710 AFB3003C */ sw $s3, 0x3c($sp) +/* 87C2F4 80242714 AFB20038 */ sw $s2, 0x38($sp) +/* 87C2F8 80242718 AFB10034 */ sw $s1, 0x34($sp) +/* 87C2FC 8024271C AFB00030 */ sw $s0, 0x30($sp) +/* 87C300 80242720 8E920148 */ lw $s2, 0x148($s4) +/* 87C304 80242724 86440008 */ lh $a0, 8($s2) +/* 87C308 80242728 8E90000C */ lw $s0, 0xc($s4) +/* 87C30C 8024272C 0C00EABB */ jal get_npc_unsafe +/* 87C310 80242730 00A0882D */ daddu $s1, $a1, $zero +/* 87C314 80242734 0280202D */ daddu $a0, $s4, $zero +/* 87C318 80242738 8E050000 */ lw $a1, ($s0) +/* 87C31C 8024273C 0C0B1EAF */ jal get_variable +/* 87C320 80242740 0040A82D */ daddu $s5, $v0, $zero +/* 87C324 80242744 AFA00010 */ sw $zero, 0x10($sp) +/* 87C328 80242748 8E4300D0 */ lw $v1, 0xd0($s2) +/* 87C32C 8024274C 8C630030 */ lw $v1, 0x30($v1) +/* 87C330 80242750 AFA30014 */ sw $v1, 0x14($sp) +/* 87C334 80242754 8E4300D0 */ lw $v1, 0xd0($s2) +/* 87C338 80242758 8C63001C */ lw $v1, 0x1c($v1) +/* 87C33C 8024275C AFA30018 */ sw $v1, 0x18($sp) +/* 87C340 80242760 8E4300D0 */ lw $v1, 0xd0($s2) +/* 87C344 80242764 8C630024 */ lw $v1, 0x24($v1) +/* 87C348 80242768 AFA3001C */ sw $v1, 0x1c($sp) +/* 87C34C 8024276C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 87C350 80242770 8C630028 */ lw $v1, 0x28($v1) +/* 87C354 80242774 27B30010 */ addiu $s3, $sp, 0x10 +/* 87C358 80242778 AFA30020 */ sw $v1, 0x20($sp) +/* 87C35C 8024277C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 87C360 80242780 3C0142F0 */ lui $at, 0x42f0 +/* 87C364 80242784 44810000 */ mtc1 $at, $f0 +/* 87C368 80242788 8C63002C */ lw $v1, 0x2c($v1) +/* 87C36C 8024278C 0040802D */ daddu $s0, $v0, $zero +/* 87C370 80242790 E7A00028 */ swc1 $f0, 0x28($sp) +/* 87C374 80242794 A7A0002C */ sh $zero, 0x2c($sp) +/* 87C378 80242798 12200006 */ beqz $s1, .L802427B4 +/* 87C37C 8024279C AFA30024 */ sw $v1, 0x24($sp) +/* 87C380 802427A0 02A0202D */ daddu $a0, $s5, $zero +/* 87C384 802427A4 0240282D */ daddu $a1, $s2, $zero +/* 87C388 802427A8 0280302D */ daddu $a2, $s4, $zero +/* 87C38C 802427AC 0C090976 */ jal func_802425D8_87C1B8 +/* 87C390 802427B0 0200382D */ daddu $a3, $s0, $zero +.L802427B4: +/* 87C394 802427B4 2402FFFE */ addiu $v0, $zero, -2 +/* 87C398 802427B8 A2A200AB */ sb $v0, 0xab($s5) +/* 87C39C 802427BC 8E4300B0 */ lw $v1, 0xb0($s2) +/* 87C3A0 802427C0 30620004 */ andi $v0, $v1, 4 +/* 87C3A4 802427C4 10400007 */ beqz $v0, .L802427E4 +/* 87C3A8 802427C8 00000000 */ nop +/* 87C3AC 802427CC 824200B4 */ lb $v0, 0xb4($s2) +/* 87C3B0 802427D0 1440003C */ bnez $v0, .L802428C4 +/* 87C3B4 802427D4 0000102D */ daddu $v0, $zero, $zero +/* 87C3B8 802427D8 2402FFFB */ addiu $v0, $zero, -5 +/* 87C3BC 802427DC 00621024 */ and $v0, $v1, $v0 +/* 87C3C0 802427E0 AE4200B0 */ sw $v0, 0xb0($s2) +.L802427E4: +/* 87C3C4 802427E4 8E830070 */ lw $v1, 0x70($s4) +/* 87C3C8 802427E8 2C62000F */ sltiu $v0, $v1, 0xf +/* 87C3CC 802427EC 10400034 */ beqz $v0, .L802428C0 +/* 87C3D0 802427F0 00031080 */ sll $v0, $v1, 2 +/* 87C3D4 802427F4 3C018024 */ lui $at, 0x8024 +/* 87C3D8 802427F8 00220821 */ addu $at, $at, $v0 +/* 87C3DC 802427FC 8C2251C8 */ lw $v0, 0x51c8($at) +/* 87C3E0 80242800 00400008 */ jr $v0 +/* 87C3E4 80242804 00000000 */ nop +/* 87C3E8 80242808 0280202D */ daddu $a0, $s4, $zero +/* 87C3EC 8024280C 0200282D */ daddu $a1, $s0, $zero +/* 87C3F0 80242810 0C0904FC */ jal func_802413F0_87AFD0 +/* 87C3F4 80242814 0260302D */ daddu $a2, $s3, $zero +/* 87C3F8 80242818 0280202D */ daddu $a0, $s4, $zero +/* 87C3FC 8024281C 0200282D */ daddu $a1, $s0, $zero +/* 87C400 80242820 0C090568 */ jal func_802415A0_87B180 +/* 87C404 80242824 0260302D */ daddu $a2, $s3, $zero +/* 87C408 80242828 08090A31 */ j .L802428C4 +/* 87C40C 8024282C 0000102D */ daddu $v0, $zero, $zero +/* 87C410 80242830 0280202D */ daddu $a0, $s4, $zero +/* 87C414 80242834 0200282D */ daddu $a1, $s0, $zero +/* 87C418 80242838 0C0906F2 */ jal func_80241BC8_87B7A8 +/* 87C41C 8024283C 0260302D */ daddu $a2, $s3, $zero +/* 87C420 80242840 0280202D */ daddu $a0, $s4, $zero +/* 87C424 80242844 0200282D */ daddu $a1, $s0, $zero +/* 87C428 80242848 0C090722 */ jal func_80241C88_87B868 +/* 87C42C 8024284C 0260302D */ daddu $a2, $s3, $zero +/* 87C430 80242850 08090A31 */ j .L802428C4 +/* 87C434 80242854 0000102D */ daddu $v0, $zero, $zero +/* 87C438 80242858 0280202D */ daddu $a0, $s4, $zero +/* 87C43C 8024285C 0200282D */ daddu $a1, $s0, $zero +/* 87C440 80242860 0C0907F3 */ jal func_80241FCC_87BBAC +/* 87C444 80242864 0260302D */ daddu $a2, $s3, $zero +/* 87C448 80242868 0280202D */ daddu $a0, $s4, $zero +/* 87C44C 8024286C 0200282D */ daddu $a1, $s0, $zero +/* 87C450 80242870 0C090811 */ jal func_80242044_87BC24 +/* 87C454 80242874 0260302D */ daddu $a2, $s3, $zero +/* 87C458 80242878 08090A31 */ j .L802428C4 +/* 87C45C 8024287C 0000102D */ daddu $v0, $zero, $zero +/* 87C460 80242880 0280202D */ daddu $a0, $s4, $zero +/* 87C464 80242884 0200282D */ daddu $a1, $s0, $zero +/* 87C468 80242888 0C09082C */ jal func_802420B0_87BC90 +/* 87C46C 8024288C 0260302D */ daddu $a2, $s3, $zero +/* 87C470 80242890 08090A31 */ j .L802428C4 +/* 87C474 80242894 0000102D */ daddu $v0, $zero, $zero +/* 87C478 80242898 0280202D */ daddu $a0, $s4, $zero +/* 87C47C 8024289C 0200282D */ daddu $a1, $s0, $zero +/* 87C480 802428A0 0C090879 */ jal func_802421E4_87BDC4 +/* 87C484 802428A4 0260302D */ daddu $a2, $s3, $zero +/* 87C488 802428A8 08090A31 */ j .L802428C4 +/* 87C48C 802428AC 0000102D */ daddu $v0, $zero, $zero +/* 87C490 802428B0 0280202D */ daddu $a0, $s4, $zero +/* 87C494 802428B4 0200282D */ daddu $a1, $s0, $zero +/* 87C498 802428B8 0C090892 */ jal func_80242248_87BE28 +/* 87C49C 802428BC 0260302D */ daddu $a2, $s3, $zero +.L802428C0: +/* 87C4A0 802428C0 0000102D */ daddu $v0, $zero, $zero +.L802428C4: +/* 87C4A4 802428C4 8FBF0048 */ lw $ra, 0x48($sp) +/* 87C4A8 802428C8 8FB50044 */ lw $s5, 0x44($sp) +/* 87C4AC 802428CC 8FB40040 */ lw $s4, 0x40($sp) +/* 87C4B0 802428D0 8FB3003C */ lw $s3, 0x3c($sp) +/* 87C4B4 802428D4 8FB20038 */ lw $s2, 0x38($sp) +/* 87C4B8 802428D8 8FB10034 */ lw $s1, 0x34($sp) +/* 87C4BC 802428DC 8FB00030 */ lw $s0, 0x30($sp) +/* 87C4C0 802428E0 03E00008 */ jr $ra +/* 87C4C4 802428E4 27BD0050 */ addiu $sp, $sp, 0x50 +/* 87C4C8 802428E8 00000000 */ nop +/* 87C4CC 802428EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC.s deleted file mode 100644 index 483093a15b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC -/* 882C6C 80240AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 882C70 80240AB0 AFB3001C */ sw $s3, 0x1c($sp) -/* 882C74 80240AB4 0080982D */ daddu $s3, $a0, $zero -/* 882C78 80240AB8 AFBF0020 */ sw $ra, 0x20($sp) -/* 882C7C 80240ABC AFB20018 */ sw $s2, 0x18($sp) -/* 882C80 80240AC0 AFB10014 */ sw $s1, 0x14($sp) -/* 882C84 80240AC4 AFB00010 */ sw $s0, 0x10($sp) -/* 882C88 80240AC8 8E710148 */ lw $s1, 0x148($s3) -/* 882C8C 80240ACC 86240008 */ lh $a0, 8($s1) -/* 882C90 80240AD0 0C00EABB */ jal get_npc_unsafe -/* 882C94 80240AD4 00A0902D */ daddu $s2, $a1, $zero -/* 882C98 80240AD8 0040802D */ daddu $s0, $v0, $zero -/* 882C9C 80240ADC 8602008E */ lh $v0, 0x8e($s0) -/* 882CA0 80240AE0 9603008E */ lhu $v1, 0x8e($s0) -/* 882CA4 80240AE4 18400005 */ blez $v0, .L80240AFC -/* 882CA8 80240AE8 2462FFFF */ addiu $v0, $v1, -1 -/* 882CAC 80240AEC A602008E */ sh $v0, 0x8e($s0) -/* 882CB0 80240AF0 00021400 */ sll $v0, $v0, 0x10 -/* 882CB4 80240AF4 1C400033 */ bgtz $v0, .L80240BC4 -/* 882CB8 80240AF8 00000000 */ nop -.L80240AFC: -/* 882CBC 80240AFC 8602008C */ lh $v0, 0x8c($s0) -/* 882CC0 80240B00 14400030 */ bnez $v0, .L80240BC4 -/* 882CC4 80240B04 00000000 */ nop -/* 882CC8 80240B08 8E2200CC */ lw $v0, 0xcc($s1) -/* 882CCC 80240B0C 8C420024 */ lw $v0, 0x24($v0) -/* 882CD0 80240B10 AE020028 */ sw $v0, 0x28($s0) -/* 882CD4 80240B14 C6400018 */ lwc1 $f0, 0x18($s2) -/* 882CD8 80240B18 E6000018 */ swc1 $f0, 0x18($s0) -/* 882CDC 80240B1C 8E230088 */ lw $v1, 0x88($s1) -/* 882CE0 80240B20 24020005 */ addiu $v0, $zero, 5 -/* 882CE4 80240B24 10620005 */ beq $v1, $v0, .L80240B3C -/* 882CE8 80240B28 00000000 */ nop -/* 882CEC 80240B2C 10600003 */ beqz $v1, .L80240B3C -/* 882CF0 80240B30 24020001 */ addiu $v0, $zero, 1 -/* 882CF4 80240B34 14620006 */ bne $v1, $v0, .L80240B50 -/* 882CF8 80240B38 00000000 */ nop -.L80240B3C: -/* 882CFC 80240B3C 8E220084 */ lw $v0, 0x84($s1) -/* 882D00 80240B40 00021FC2 */ srl $v1, $v0, 0x1f -/* 882D04 80240B44 00431021 */ addu $v0, $v0, $v1 -/* 882D08 80240B48 00021043 */ sra $v0, $v0, 1 -/* 882D0C 80240B4C A60200A8 */ sh $v0, 0xa8($s0) -.L80240B50: -/* 882D10 80240B50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 882D14 80240B54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 882D18 80240B58 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 882D1C 80240B5C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 882D20 80240B60 8C460028 */ lw $a2, 0x28($v0) -/* 882D24 80240B64 0C00A7B5 */ jal dist2D -/* 882D28 80240B68 8C470030 */ lw $a3, 0x30($v0) -/* 882D2C 80240B6C C6020018 */ lwc1 $f2, 0x18($s0) -/* 882D30 80240B70 46020003 */ div.s $f0, $f0, $f2 -/* 882D34 80240B74 3C018024 */ lui $at, 0x8024 -/* 882D38 80240B78 D42241A0 */ ldc1 $f2, 0x41a0($at) -/* 882D3C 80240B7C 46000021 */ cvt.d.s $f0, $f0 -/* 882D40 80240B80 46220000 */ add.d $f0, $f0, $f2 -/* 882D44 80240B84 4620010D */ trunc.w.d $f4, $f0 -/* 882D48 80240B88 44022000 */ mfc1 $v0, $f4 -/* 882D4C 80240B8C 00000000 */ nop -/* 882D50 80240B90 A602008E */ sh $v0, 0x8e($s0) -/* 882D54 80240B94 00021400 */ sll $v0, $v0, 0x10 -/* 882D58 80240B98 8E230078 */ lw $v1, 0x78($s1) -/* 882D5C 80240B9C 00021403 */ sra $v0, $v0, 0x10 -/* 882D60 80240BA0 0043102A */ slt $v0, $v0, $v1 -/* 882D64 80240BA4 10400003 */ beqz $v0, .L80240BB4 -/* 882D68 80240BA8 00000000 */ nop -/* 882D6C 80240BAC 9622007A */ lhu $v0, 0x7a($s1) -/* 882D70 80240BB0 A602008E */ sh $v0, 0x8e($s0) -.L80240BB4: -/* 882D74 80240BB4 8602008E */ lh $v0, 0x8e($s0) -/* 882D78 80240BB8 AE22007C */ sw $v0, 0x7c($s1) -/* 882D7C 80240BBC 2402000E */ addiu $v0, $zero, 0xe -/* 882D80 80240BC0 AE620070 */ sw $v0, 0x70($s3) -.L80240BC4: -/* 882D84 80240BC4 8FBF0020 */ lw $ra, 0x20($sp) -/* 882D88 80240BC8 8FB3001C */ lw $s3, 0x1c($sp) -/* 882D8C 80240BCC 8FB20018 */ lw $s2, 0x18($sp) -/* 882D90 80240BD0 8FB10014 */ lw $s1, 0x14($sp) -/* 882D94 80240BD4 8FB00010 */ lw $s0, 0x10($sp) -/* 882D98 80240BD8 03E00008 */ jr $ra -/* 882D9C 80240BDC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s new file mode 100644 index 0000000000..721a2918aa --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240AAC_882C6C.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AAC_882C6C +/* 882C6C 80240AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 882C70 80240AB0 AFB3001C */ sw $s3, 0x1c($sp) +/* 882C74 80240AB4 0080982D */ daddu $s3, $a0, $zero +/* 882C78 80240AB8 AFBF0020 */ sw $ra, 0x20($sp) +/* 882C7C 80240ABC AFB20018 */ sw $s2, 0x18($sp) +/* 882C80 80240AC0 AFB10014 */ sw $s1, 0x14($sp) +/* 882C84 80240AC4 AFB00010 */ sw $s0, 0x10($sp) +/* 882C88 80240AC8 8E710148 */ lw $s1, 0x148($s3) +/* 882C8C 80240ACC 86240008 */ lh $a0, 8($s1) +/* 882C90 80240AD0 0C00EABB */ jal get_npc_unsafe +/* 882C94 80240AD4 00A0902D */ daddu $s2, $a1, $zero +/* 882C98 80240AD8 0040802D */ daddu $s0, $v0, $zero +/* 882C9C 80240ADC 8602008E */ lh $v0, 0x8e($s0) +/* 882CA0 80240AE0 9603008E */ lhu $v1, 0x8e($s0) +/* 882CA4 80240AE4 18400005 */ blez $v0, .L80240AFC +/* 882CA8 80240AE8 2462FFFF */ addiu $v0, $v1, -1 +/* 882CAC 80240AEC A602008E */ sh $v0, 0x8e($s0) +/* 882CB0 80240AF0 00021400 */ sll $v0, $v0, 0x10 +/* 882CB4 80240AF4 1C400033 */ bgtz $v0, .L80240BC4 +/* 882CB8 80240AF8 00000000 */ nop +.L80240AFC: +/* 882CBC 80240AFC 8602008C */ lh $v0, 0x8c($s0) +/* 882CC0 80240B00 14400030 */ bnez $v0, .L80240BC4 +/* 882CC4 80240B04 00000000 */ nop +/* 882CC8 80240B08 8E2200CC */ lw $v0, 0xcc($s1) +/* 882CCC 80240B0C 8C420024 */ lw $v0, 0x24($v0) +/* 882CD0 80240B10 AE020028 */ sw $v0, 0x28($s0) +/* 882CD4 80240B14 C6400018 */ lwc1 $f0, 0x18($s2) +/* 882CD8 80240B18 E6000018 */ swc1 $f0, 0x18($s0) +/* 882CDC 80240B1C 8E230088 */ lw $v1, 0x88($s1) +/* 882CE0 80240B20 24020005 */ addiu $v0, $zero, 5 +/* 882CE4 80240B24 10620005 */ beq $v1, $v0, .L80240B3C +/* 882CE8 80240B28 00000000 */ nop +/* 882CEC 80240B2C 10600003 */ beqz $v1, .L80240B3C +/* 882CF0 80240B30 24020001 */ addiu $v0, $zero, 1 +/* 882CF4 80240B34 14620006 */ bne $v1, $v0, .L80240B50 +/* 882CF8 80240B38 00000000 */ nop +.L80240B3C: +/* 882CFC 80240B3C 8E220084 */ lw $v0, 0x84($s1) +/* 882D00 80240B40 00021FC2 */ srl $v1, $v0, 0x1f +/* 882D04 80240B44 00431021 */ addu $v0, $v0, $v1 +/* 882D08 80240B48 00021043 */ sra $v0, $v0, 1 +/* 882D0C 80240B4C A60200A8 */ sh $v0, 0xa8($s0) +.L80240B50: +/* 882D10 80240B50 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 882D14 80240B54 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 882D18 80240B58 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 882D1C 80240B5C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 882D20 80240B60 8C460028 */ lw $a2, 0x28($v0) +/* 882D24 80240B64 0C00A7B5 */ jal dist2D +/* 882D28 80240B68 8C470030 */ lw $a3, 0x30($v0) +/* 882D2C 80240B6C C6020018 */ lwc1 $f2, 0x18($s0) +/* 882D30 80240B70 46020003 */ div.s $f0, $f0, $f2 +/* 882D34 80240B74 3C018024 */ lui $at, 0x8024 +/* 882D38 80240B78 D42241A0 */ ldc1 $f2, 0x41a0($at) +/* 882D3C 80240B7C 46000021 */ cvt.d.s $f0, $f0 +/* 882D40 80240B80 46220000 */ add.d $f0, $f0, $f2 +/* 882D44 80240B84 4620010D */ trunc.w.d $f4, $f0 +/* 882D48 80240B88 44022000 */ mfc1 $v0, $f4 +/* 882D4C 80240B8C 00000000 */ nop +/* 882D50 80240B90 A602008E */ sh $v0, 0x8e($s0) +/* 882D54 80240B94 00021400 */ sll $v0, $v0, 0x10 +/* 882D58 80240B98 8E230078 */ lw $v1, 0x78($s1) +/* 882D5C 80240B9C 00021403 */ sra $v0, $v0, 0x10 +/* 882D60 80240BA0 0043102A */ slt $v0, $v0, $v1 +/* 882D64 80240BA4 10400003 */ beqz $v0, .L80240BB4 +/* 882D68 80240BA8 00000000 */ nop +/* 882D6C 80240BAC 9622007A */ lhu $v0, 0x7a($s1) +/* 882D70 80240BB0 A602008E */ sh $v0, 0x8e($s0) +.L80240BB4: +/* 882D74 80240BB4 8602008E */ lh $v0, 0x8e($s0) +/* 882D78 80240BB8 AE22007C */ sw $v0, 0x7c($s1) +/* 882D7C 80240BBC 2402000E */ addiu $v0, $zero, 0xe +/* 882D80 80240BC0 AE620070 */ sw $v0, 0x70($s3) +.L80240BC4: +/* 882D84 80240BC4 8FBF0020 */ lw $ra, 0x20($sp) +/* 882D88 80240BC8 8FB3001C */ lw $s3, 0x1c($sp) +/* 882D8C 80240BCC 8FB20018 */ lw $s2, 0x18($sp) +/* 882D90 80240BD0 8FB10014 */ lw $s1, 0x14($sp) +/* 882D94 80240BD4 8FB00010 */ lw $s0, 0x10($sp) +/* 882D98 80240BD8 03E00008 */ jr $ra +/* 882D9C 80240BDC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240BE0.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240BE0.s deleted file mode 100644 index ab47ae0b7c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240BE0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE0 -/* 882DA0 80240BE0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 882DA4 80240BE4 AFB3003C */ sw $s3, 0x3c($sp) -/* 882DA8 80240BE8 0080982D */ daddu $s3, $a0, $zero -/* 882DAC 80240BEC AFBF0040 */ sw $ra, 0x40($sp) -/* 882DB0 80240BF0 AFB20038 */ sw $s2, 0x38($sp) -/* 882DB4 80240BF4 AFB10034 */ sw $s1, 0x34($sp) -/* 882DB8 80240BF8 AFB00030 */ sw $s0, 0x30($sp) -/* 882DBC 80240BFC 8E710148 */ lw $s1, 0x148($s3) -/* 882DC0 80240C00 0C00EABB */ jal get_npc_unsafe -/* 882DC4 80240C04 86240008 */ lh $a0, 8($s1) -/* 882DC8 80240C08 0040802D */ daddu $s0, $v0, $zero -/* 882DCC 80240C0C 8E22007C */ lw $v0, 0x7c($s1) -/* 882DD0 80240C10 8603008E */ lh $v1, 0x8e($s0) -/* 882DD4 80240C14 2442FFFF */ addiu $v0, $v0, -1 -/* 882DD8 80240C18 14620012 */ bne $v1, $v0, .L80240C64 -/* 882DDC 80240C1C 00000000 */ nop -/* 882DE0 80240C20 C6000038 */ lwc1 $f0, 0x38($s0) -/* 882DE4 80240C24 4600020D */ trunc.w.s $f8, $f0 -/* 882DE8 80240C28 44024000 */ mfc1 $v0, $f8 -/* 882DEC 80240C2C 00000000 */ nop -/* 882DF0 80240C30 A6220010 */ sh $v0, 0x10($s1) -/* 882DF4 80240C34 C600003C */ lwc1 $f0, 0x3c($s0) -/* 882DF8 80240C38 4600020D */ trunc.w.s $f8, $f0 -/* 882DFC 80240C3C 44024000 */ mfc1 $v0, $f8 -/* 882E00 80240C40 00000000 */ nop -/* 882E04 80240C44 A6220012 */ sh $v0, 0x12($s1) -/* 882E08 80240C48 C6000040 */ lwc1 $f0, 0x40($s0) -/* 882E0C 80240C4C 24020001 */ addiu $v0, $zero, 1 -/* 882E10 80240C50 A2220007 */ sb $v0, 7($s1) -/* 882E14 80240C54 4600020D */ trunc.w.s $f8, $f0 -/* 882E18 80240C58 44024000 */ mfc1 $v0, $f8 -/* 882E1C 80240C5C 00000000 */ nop -/* 882E20 80240C60 A6220014 */ sh $v0, 0x14($s1) -.L80240C64: -/* 882E24 80240C64 C6000038 */ lwc1 $f0, 0x38($s0) -/* 882E28 80240C68 C602003C */ lwc1 $f2, 0x3c($s0) -/* 882E2C 80240C6C C6040040 */ lwc1 $f4, 0x40($s0) -/* 882E30 80240C70 C6060018 */ lwc1 $f6, 0x18($s0) -/* 882E34 80240C74 E7A00020 */ swc1 $f0, 0x20($sp) -/* 882E38 80240C78 E7A20024 */ swc1 $f2, 0x24($sp) -/* 882E3C 80240C7C E7A40028 */ swc1 $f4, 0x28($sp) -/* 882E40 80240C80 E7A60010 */ swc1 $f6, 0x10($sp) -/* 882E44 80240C84 C600000C */ lwc1 $f0, 0xc($s0) -/* 882E48 80240C88 E7A00014 */ swc1 $f0, 0x14($sp) -/* 882E4C 80240C8C 860200A8 */ lh $v0, 0xa8($s0) -/* 882E50 80240C90 27A50020 */ addiu $a1, $sp, 0x20 -/* 882E54 80240C94 44820000 */ mtc1 $v0, $f0 -/* 882E58 80240C98 00000000 */ nop -/* 882E5C 80240C9C 46800020 */ cvt.s.w $f0, $f0 -/* 882E60 80240CA0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 882E64 80240CA4 860200A6 */ lh $v0, 0xa6($s0) -/* 882E68 80240CA8 27A60024 */ addiu $a2, $sp, 0x24 -/* 882E6C 80240CAC 44820000 */ mtc1 $v0, $f0 -/* 882E70 80240CB0 00000000 */ nop -/* 882E74 80240CB4 46800020 */ cvt.s.w $f0, $f0 -/* 882E78 80240CB8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 882E7C 80240CBC 8E040080 */ lw $a0, 0x80($s0) -/* 882E80 80240CC0 0C037711 */ jal func_800DDC44 -/* 882E84 80240CC4 27A70028 */ addiu $a3, $sp, 0x28 -/* 882E88 80240CC8 0040902D */ daddu $s2, $v0, $zero -/* 882E8C 80240CCC 16400005 */ bnez $s2, .L80240CE4 -/* 882E90 80240CD0 00000000 */ nop -/* 882E94 80240CD4 8E050018 */ lw $a1, 0x18($s0) -/* 882E98 80240CD8 8E06000C */ lw $a2, 0xc($s0) -/* 882E9C 80240CDC 0C00EA95 */ jal npc_move_heading -/* 882EA0 80240CE0 0200202D */ daddu $a0, $s0, $zero -.L80240CE4: -/* 882EA4 80240CE4 8602008E */ lh $v0, 0x8e($s0) -/* 882EA8 80240CE8 9603008E */ lhu $v1, 0x8e($s0) -/* 882EAC 80240CEC 18400007 */ blez $v0, .L80240D0C -/* 882EB0 80240CF0 2462FFFF */ addiu $v0, $v1, -1 -/* 882EB4 80240CF4 A602008E */ sh $v0, 0x8e($s0) -/* 882EB8 80240CF8 00021400 */ sll $v0, $v0, 0x10 -/* 882EBC 80240CFC 18400003 */ blez $v0, .L80240D0C -/* 882EC0 80240D00 00000000 */ nop -/* 882EC4 80240D04 12400008 */ beqz $s2, .L80240D28 -/* 882EC8 80240D08 00000000 */ nop -.L80240D0C: -/* 882ECC 80240D0C 8E2200CC */ lw $v0, 0xcc($s1) -/* 882ED0 80240D10 A2200007 */ sb $zero, 7($s1) -/* 882ED4 80240D14 8C420028 */ lw $v0, 0x28($v0) -/* 882ED8 80240D18 A600008E */ sh $zero, 0x8e($s0) -/* 882EDC 80240D1C AE020028 */ sw $v0, 0x28($s0) -/* 882EE0 80240D20 2402000F */ addiu $v0, $zero, 0xf -/* 882EE4 80240D24 AE620070 */ sw $v0, 0x70($s3) -.L80240D28: -/* 882EE8 80240D28 8FBF0040 */ lw $ra, 0x40($sp) -/* 882EEC 80240D2C 8FB3003C */ lw $s3, 0x3c($sp) -/* 882EF0 80240D30 8FB20038 */ lw $s2, 0x38($sp) -/* 882EF4 80240D34 8FB10034 */ lw $s1, 0x34($sp) -/* 882EF8 80240D38 8FB00030 */ lw $s0, 0x30($sp) -/* 882EFC 80240D3C 03E00008 */ jr $ra -/* 882F00 80240D40 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240BE0_882DA0.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240BE0_882DA0.s new file mode 100644 index 0000000000..6aa319b691 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240BE0_882DA0.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BE0_882DA0 +/* 882DA0 80240BE0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 882DA4 80240BE4 AFB3003C */ sw $s3, 0x3c($sp) +/* 882DA8 80240BE8 0080982D */ daddu $s3, $a0, $zero +/* 882DAC 80240BEC AFBF0040 */ sw $ra, 0x40($sp) +/* 882DB0 80240BF0 AFB20038 */ sw $s2, 0x38($sp) +/* 882DB4 80240BF4 AFB10034 */ sw $s1, 0x34($sp) +/* 882DB8 80240BF8 AFB00030 */ sw $s0, 0x30($sp) +/* 882DBC 80240BFC 8E710148 */ lw $s1, 0x148($s3) +/* 882DC0 80240C00 0C00EABB */ jal get_npc_unsafe +/* 882DC4 80240C04 86240008 */ lh $a0, 8($s1) +/* 882DC8 80240C08 0040802D */ daddu $s0, $v0, $zero +/* 882DCC 80240C0C 8E22007C */ lw $v0, 0x7c($s1) +/* 882DD0 80240C10 8603008E */ lh $v1, 0x8e($s0) +/* 882DD4 80240C14 2442FFFF */ addiu $v0, $v0, -1 +/* 882DD8 80240C18 14620012 */ bne $v1, $v0, .L80240C64 +/* 882DDC 80240C1C 00000000 */ nop +/* 882DE0 80240C20 C6000038 */ lwc1 $f0, 0x38($s0) +/* 882DE4 80240C24 4600020D */ trunc.w.s $f8, $f0 +/* 882DE8 80240C28 44024000 */ mfc1 $v0, $f8 +/* 882DEC 80240C2C 00000000 */ nop +/* 882DF0 80240C30 A6220010 */ sh $v0, 0x10($s1) +/* 882DF4 80240C34 C600003C */ lwc1 $f0, 0x3c($s0) +/* 882DF8 80240C38 4600020D */ trunc.w.s $f8, $f0 +/* 882DFC 80240C3C 44024000 */ mfc1 $v0, $f8 +/* 882E00 80240C40 00000000 */ nop +/* 882E04 80240C44 A6220012 */ sh $v0, 0x12($s1) +/* 882E08 80240C48 C6000040 */ lwc1 $f0, 0x40($s0) +/* 882E0C 80240C4C 24020001 */ addiu $v0, $zero, 1 +/* 882E10 80240C50 A2220007 */ sb $v0, 7($s1) +/* 882E14 80240C54 4600020D */ trunc.w.s $f8, $f0 +/* 882E18 80240C58 44024000 */ mfc1 $v0, $f8 +/* 882E1C 80240C5C 00000000 */ nop +/* 882E20 80240C60 A6220014 */ sh $v0, 0x14($s1) +.L80240C64: +/* 882E24 80240C64 C6000038 */ lwc1 $f0, 0x38($s0) +/* 882E28 80240C68 C602003C */ lwc1 $f2, 0x3c($s0) +/* 882E2C 80240C6C C6040040 */ lwc1 $f4, 0x40($s0) +/* 882E30 80240C70 C6060018 */ lwc1 $f6, 0x18($s0) +/* 882E34 80240C74 E7A00020 */ swc1 $f0, 0x20($sp) +/* 882E38 80240C78 E7A20024 */ swc1 $f2, 0x24($sp) +/* 882E3C 80240C7C E7A40028 */ swc1 $f4, 0x28($sp) +/* 882E40 80240C80 E7A60010 */ swc1 $f6, 0x10($sp) +/* 882E44 80240C84 C600000C */ lwc1 $f0, 0xc($s0) +/* 882E48 80240C88 E7A00014 */ swc1 $f0, 0x14($sp) +/* 882E4C 80240C8C 860200A8 */ lh $v0, 0xa8($s0) +/* 882E50 80240C90 27A50020 */ addiu $a1, $sp, 0x20 +/* 882E54 80240C94 44820000 */ mtc1 $v0, $f0 +/* 882E58 80240C98 00000000 */ nop +/* 882E5C 80240C9C 46800020 */ cvt.s.w $f0, $f0 +/* 882E60 80240CA0 E7A00018 */ swc1 $f0, 0x18($sp) +/* 882E64 80240CA4 860200A6 */ lh $v0, 0xa6($s0) +/* 882E68 80240CA8 27A60024 */ addiu $a2, $sp, 0x24 +/* 882E6C 80240CAC 44820000 */ mtc1 $v0, $f0 +/* 882E70 80240CB0 00000000 */ nop +/* 882E74 80240CB4 46800020 */ cvt.s.w $f0, $f0 +/* 882E78 80240CB8 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 882E7C 80240CBC 8E040080 */ lw $a0, 0x80($s0) +/* 882E80 80240CC0 0C037711 */ jal func_800DDC44 +/* 882E84 80240CC4 27A70028 */ addiu $a3, $sp, 0x28 +/* 882E88 80240CC8 0040902D */ daddu $s2, $v0, $zero +/* 882E8C 80240CCC 16400005 */ bnez $s2, .L80240CE4 +/* 882E90 80240CD0 00000000 */ nop +/* 882E94 80240CD4 8E050018 */ lw $a1, 0x18($s0) +/* 882E98 80240CD8 8E06000C */ lw $a2, 0xc($s0) +/* 882E9C 80240CDC 0C00EA95 */ jal npc_move_heading +/* 882EA0 80240CE0 0200202D */ daddu $a0, $s0, $zero +.L80240CE4: +/* 882EA4 80240CE4 8602008E */ lh $v0, 0x8e($s0) +/* 882EA8 80240CE8 9603008E */ lhu $v1, 0x8e($s0) +/* 882EAC 80240CEC 18400007 */ blez $v0, .L80240D0C +/* 882EB0 80240CF0 2462FFFF */ addiu $v0, $v1, -1 +/* 882EB4 80240CF4 A602008E */ sh $v0, 0x8e($s0) +/* 882EB8 80240CF8 00021400 */ sll $v0, $v0, 0x10 +/* 882EBC 80240CFC 18400003 */ blez $v0, .L80240D0C +/* 882EC0 80240D00 00000000 */ nop +/* 882EC4 80240D04 12400008 */ beqz $s2, .L80240D28 +/* 882EC8 80240D08 00000000 */ nop +.L80240D0C: +/* 882ECC 80240D0C 8E2200CC */ lw $v0, 0xcc($s1) +/* 882ED0 80240D10 A2200007 */ sb $zero, 7($s1) +/* 882ED4 80240D14 8C420028 */ lw $v0, 0x28($v0) +/* 882ED8 80240D18 A600008E */ sh $zero, 0x8e($s0) +/* 882EDC 80240D1C AE020028 */ sw $v0, 0x28($s0) +/* 882EE0 80240D20 2402000F */ addiu $v0, $zero, 0xf +/* 882EE4 80240D24 AE620070 */ sw $v0, 0x70($s3) +.L80240D28: +/* 882EE8 80240D28 8FBF0040 */ lw $ra, 0x40($sp) +/* 882EEC 80240D2C 8FB3003C */ lw $s3, 0x3c($sp) +/* 882EF0 80240D30 8FB20038 */ lw $s2, 0x38($sp) +/* 882EF4 80240D34 8FB10034 */ lw $s1, 0x34($sp) +/* 882EF8 80240D38 8FB00030 */ lw $s0, 0x30($sp) +/* 882EFC 80240D3C 03E00008 */ jr $ra +/* 882F00 80240D40 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240D44.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240D44.s deleted file mode 100644 index c042d23974..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240D44.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D44 -/* 882F04 80240D44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 882F08 80240D48 AFB10014 */ sw $s1, 0x14($sp) -/* 882F0C 80240D4C 0080882D */ daddu $s1, $a0, $zero -/* 882F10 80240D50 AFBF0018 */ sw $ra, 0x18($sp) -/* 882F14 80240D54 AFB00010 */ sw $s0, 0x10($sp) -/* 882F18 80240D58 8E300148 */ lw $s0, 0x148($s1) -/* 882F1C 80240D5C 0C00EABB */ jal get_npc_unsafe -/* 882F20 80240D60 86040008 */ lh $a0, 8($s0) -/* 882F24 80240D64 0040202D */ daddu $a0, $v0, $zero -/* 882F28 80240D68 9482008E */ lhu $v0, 0x8e($a0) -/* 882F2C 80240D6C 24030003 */ addiu $v1, $zero, 3 -/* 882F30 80240D70 24420001 */ addiu $v0, $v0, 1 -/* 882F34 80240D74 A482008E */ sh $v0, 0x8e($a0) -/* 882F38 80240D78 00021400 */ sll $v0, $v0, 0x10 -/* 882F3C 80240D7C 00021403 */ sra $v0, $v0, 0x10 -/* 882F40 80240D80 14430003 */ bne $v0, $v1, .L80240D90 -/* 882F44 80240D84 00000000 */ nop -/* 882F48 80240D88 96020086 */ lhu $v0, 0x86($s0) -/* 882F4C 80240D8C A48200A8 */ sh $v0, 0xa8($a0) -.L80240D90: -/* 882F50 80240D90 8482008E */ lh $v0, 0x8e($a0) -/* 882F54 80240D94 8E030080 */ lw $v1, 0x80($s0) -/* 882F58 80240D98 0043102A */ slt $v0, $v0, $v1 -/* 882F5C 80240D9C 14400004 */ bnez $v0, .L80240DB0 -/* 882F60 80240DA0 00000000 */ nop -/* 882F64 80240DA4 96020086 */ lhu $v0, 0x86($s0) -/* 882F68 80240DA8 A48200A8 */ sh $v0, 0xa8($a0) -/* 882F6C 80240DAC AE200070 */ sw $zero, 0x70($s1) -.L80240DB0: -/* 882F70 80240DB0 8FBF0018 */ lw $ra, 0x18($sp) -/* 882F74 80240DB4 8FB10014 */ lw $s1, 0x14($sp) -/* 882F78 80240DB8 8FB00010 */ lw $s0, 0x10($sp) -/* 882F7C 80240DBC 03E00008 */ jr $ra -/* 882F80 80240DC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240D44_882F04.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240D44_882F04.s new file mode 100644 index 0000000000..b6534e6f93 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240D44_882F04.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D44_882F04 +/* 882F04 80240D44 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 882F08 80240D48 AFB10014 */ sw $s1, 0x14($sp) +/* 882F0C 80240D4C 0080882D */ daddu $s1, $a0, $zero +/* 882F10 80240D50 AFBF0018 */ sw $ra, 0x18($sp) +/* 882F14 80240D54 AFB00010 */ sw $s0, 0x10($sp) +/* 882F18 80240D58 8E300148 */ lw $s0, 0x148($s1) +/* 882F1C 80240D5C 0C00EABB */ jal get_npc_unsafe +/* 882F20 80240D60 86040008 */ lh $a0, 8($s0) +/* 882F24 80240D64 0040202D */ daddu $a0, $v0, $zero +/* 882F28 80240D68 9482008E */ lhu $v0, 0x8e($a0) +/* 882F2C 80240D6C 24030003 */ addiu $v1, $zero, 3 +/* 882F30 80240D70 24420001 */ addiu $v0, $v0, 1 +/* 882F34 80240D74 A482008E */ sh $v0, 0x8e($a0) +/* 882F38 80240D78 00021400 */ sll $v0, $v0, 0x10 +/* 882F3C 80240D7C 00021403 */ sra $v0, $v0, 0x10 +/* 882F40 80240D80 14430003 */ bne $v0, $v1, .L80240D90 +/* 882F44 80240D84 00000000 */ nop +/* 882F48 80240D88 96020086 */ lhu $v0, 0x86($s0) +/* 882F4C 80240D8C A48200A8 */ sh $v0, 0xa8($a0) +.L80240D90: +/* 882F50 80240D90 8482008E */ lh $v0, 0x8e($a0) +/* 882F54 80240D94 8E030080 */ lw $v1, 0x80($s0) +/* 882F58 80240D98 0043102A */ slt $v0, $v0, $v1 +/* 882F5C 80240D9C 14400004 */ bnez $v0, .L80240DB0 +/* 882F60 80240DA0 00000000 */ nop +/* 882F64 80240DA4 96020086 */ lhu $v0, 0x86($s0) +/* 882F68 80240DA8 A48200A8 */ sh $v0, 0xa8($a0) +/* 882F6C 80240DAC AE200070 */ sw $zero, 0x70($s1) +.L80240DB0: +/* 882F70 80240DB0 8FBF0018 */ lw $ra, 0x18($sp) +/* 882F74 80240DB4 8FB10014 */ lw $s1, 0x14($sp) +/* 882F78 80240DB8 8FB00010 */ lw $s0, 0x10($sp) +/* 882F7C 80240DBC 03E00008 */ jr $ra +/* 882F80 80240DC0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4.s deleted file mode 100644 index ee1937e1ff..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DC4 -/* 882F84 80240DC4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 882F88 80240DC8 AFB3005C */ sw $s3, 0x5c($sp) -/* 882F8C 80240DCC 0080982D */ daddu $s3, $a0, $zero -/* 882F90 80240DD0 AFBF0068 */ sw $ra, 0x68($sp) -/* 882F94 80240DD4 AFB50064 */ sw $s5, 0x64($sp) -/* 882F98 80240DD8 AFB40060 */ sw $s4, 0x60($sp) -/* 882F9C 80240DDC AFB20058 */ sw $s2, 0x58($sp) -/* 882FA0 80240DE0 AFB10054 */ sw $s1, 0x54($sp) -/* 882FA4 80240DE4 AFB00050 */ sw $s0, 0x50($sp) -/* 882FA8 80240DE8 8E710148 */ lw $s1, 0x148($s3) -/* 882FAC 80240DEC 86240008 */ lh $a0, 8($s1) -/* 882FB0 80240DF0 0C00EABB */ jal get_npc_unsafe -/* 882FB4 80240DF4 00A0802D */ daddu $s0, $a1, $zero -/* 882FB8 80240DF8 8E63000C */ lw $v1, 0xc($s3) -/* 882FBC 80240DFC 0260202D */ daddu $a0, $s3, $zero -/* 882FC0 80240E00 8C650000 */ lw $a1, ($v1) -/* 882FC4 80240E04 0C0B1EAF */ jal get_variable -/* 882FC8 80240E08 0040902D */ daddu $s2, $v0, $zero -/* 882FCC 80240E0C AFA00028 */ sw $zero, 0x28($sp) -/* 882FD0 80240E10 8E2300D0 */ lw $v1, 0xd0($s1) -/* 882FD4 80240E14 8C630030 */ lw $v1, 0x30($v1) -/* 882FD8 80240E18 AFA3002C */ sw $v1, 0x2c($sp) -/* 882FDC 80240E1C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 882FE0 80240E20 8C63001C */ lw $v1, 0x1c($v1) -/* 882FE4 80240E24 AFA30030 */ sw $v1, 0x30($sp) -/* 882FE8 80240E28 8E2300D0 */ lw $v1, 0xd0($s1) -/* 882FEC 80240E2C 8C630024 */ lw $v1, 0x24($v1) -/* 882FF0 80240E30 AFA30034 */ sw $v1, 0x34($sp) -/* 882FF4 80240E34 8E2300D0 */ lw $v1, 0xd0($s1) -/* 882FF8 80240E38 8C630028 */ lw $v1, 0x28($v1) -/* 882FFC 80240E3C 27B50028 */ addiu $s5, $sp, 0x28 -/* 883000 80240E40 AFA30038 */ sw $v1, 0x38($sp) -/* 883004 80240E44 8E2300D0 */ lw $v1, 0xd0($s1) -/* 883008 80240E48 3C0142C8 */ lui $at, 0x42c8 -/* 88300C 80240E4C 44810000 */ mtc1 $at, $f0 -/* 883010 80240E50 8C63002C */ lw $v1, 0x2c($v1) -/* 883014 80240E54 0040A02D */ daddu $s4, $v0, $zero -/* 883018 80240E58 E7A00040 */ swc1 $f0, 0x40($sp) -/* 88301C 80240E5C A7A00044 */ sh $zero, 0x44($sp) -/* 883020 80240E60 12000009 */ beqz $s0, .L80240E88 -/* 883024 80240E64 AFA3003C */ sw $v1, 0x3c($sp) -/* 883028 80240E68 864300A8 */ lh $v1, 0xa8($s2) -/* 88302C 80240E6C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 883030 80240E70 AE20008C */ sw $zero, 0x8c($s1) -/* 883034 80240E74 A22000B5 */ sb $zero, 0xb5($s1) -/* 883038 80240E78 34420008 */ ori $v0, $v0, 8 -/* 88303C 80240E7C AE230084 */ sw $v1, 0x84($s1) -/* 883040 80240E80 080903A6 */ j .L80240E98 -/* 883044 80240E84 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240E88: -/* 883048 80240E88 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88304C 80240E8C 30420004 */ andi $v0, $v0, 4 -/* 883050 80240E90 10400047 */ beqz $v0, .L80240FB0 -/* 883054 80240E94 00000000 */ nop -.L80240E98: -/* 883058 80240E98 AE600070 */ sw $zero, 0x70($s3) -/* 88305C 80240E9C A640008E */ sh $zero, 0x8e($s2) -/* 883060 80240EA0 8E2300CC */ lw $v1, 0xcc($s1) -/* 883064 80240EA4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 883068 80240EA8 A2200007 */ sb $zero, 7($s1) -/* 88306C 80240EAC 8E420000 */ lw $v0, ($s2) -/* 883070 80240EB0 8C630000 */ lw $v1, ($v1) -/* 883074 80240EB4 00441024 */ and $v0, $v0, $a0 -/* 883078 80240EB8 AE420000 */ sw $v0, ($s2) -/* 88307C 80240EBC AE430028 */ sw $v1, 0x28($s2) -/* 883080 80240EC0 96220086 */ lhu $v0, 0x86($s1) -/* 883084 80240EC4 A64200A8 */ sh $v0, 0xa8($s2) -/* 883088 80240EC8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 88308C 80240ECC AE200090 */ sw $zero, 0x90($s1) -/* 883090 80240ED0 8C420034 */ lw $v0, 0x34($v0) -/* 883094 80240ED4 14400006 */ bnez $v0, .L80240EF0 -/* 883098 80240ED8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 88309C 80240EDC 8E420000 */ lw $v0, ($s2) -/* 8830A0 80240EE0 2403FFF7 */ addiu $v1, $zero, -9 -/* 8830A4 80240EE4 34420200 */ ori $v0, $v0, 0x200 -/* 8830A8 80240EE8 080903BF */ j .L80240EFC -/* 8830AC 80240EEC 00431024 */ and $v0, $v0, $v1 -.L80240EF0: -/* 8830B0 80240EF0 8E420000 */ lw $v0, ($s2) -/* 8830B4 80240EF4 00431024 */ and $v0, $v0, $v1 -/* 8830B8 80240EF8 34420008 */ ori $v0, $v0, 8 -.L80240EFC: -/* 8830BC 80240EFC AE420000 */ sw $v0, ($s2) -/* 8830C0 80240F00 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8830C4 80240F04 30420004 */ andi $v0, $v0, 4 -/* 8830C8 80240F08 1040001E */ beqz $v0, .L80240F84 -/* 8830CC 80240F0C 24040002 */ addiu $a0, $zero, 2 -/* 8830D0 80240F10 0240282D */ daddu $a1, $s2, $zero -/* 8830D4 80240F14 0000302D */ daddu $a2, $zero, $zero -/* 8830D8 80240F18 24020063 */ addiu $v0, $zero, 0x63 -/* 8830DC 80240F1C AE620070 */ sw $v0, 0x70($s3) -/* 8830E0 80240F20 AE600074 */ sw $zero, 0x74($s3) -/* 8830E4 80240F24 864300A8 */ lh $v1, 0xa8($s2) -/* 8830E8 80240F28 3C013F80 */ lui $at, 0x3f80 -/* 8830EC 80240F2C 44810000 */ mtc1 $at, $f0 -/* 8830F0 80240F30 3C014000 */ lui $at, 0x4000 -/* 8830F4 80240F34 44811000 */ mtc1 $at, $f2 -/* 8830F8 80240F38 3C01C1A0 */ lui $at, 0xc1a0 -/* 8830FC 80240F3C 44812000 */ mtc1 $at, $f4 -/* 883100 80240F40 24020028 */ addiu $v0, $zero, 0x28 -/* 883104 80240F44 AFA2001C */ sw $v0, 0x1c($sp) -/* 883108 80240F48 44833000 */ mtc1 $v1, $f6 -/* 88310C 80240F4C 00000000 */ nop -/* 883110 80240F50 468031A0 */ cvt.s.w $f6, $f6 -/* 883114 80240F54 44073000 */ mfc1 $a3, $f6 -/* 883118 80240F58 27A20048 */ addiu $v0, $sp, 0x48 -/* 88311C 80240F5C AFA20020 */ sw $v0, 0x20($sp) -/* 883120 80240F60 E7A00010 */ swc1 $f0, 0x10($sp) -/* 883124 80240F64 E7A20014 */ swc1 $f2, 0x14($sp) -/* 883128 80240F68 0C01BFA4 */ jal fx_emote -/* 88312C 80240F6C E7A40018 */ swc1 $f4, 0x18($sp) -/* 883130 80240F70 8E2200B0 */ lw $v0, 0xb0($s1) -/* 883134 80240F74 2403FFFB */ addiu $v1, $zero, -5 -/* 883138 80240F78 00431024 */ and $v0, $v0, $v1 -/* 88313C 80240F7C 080903EC */ j .L80240FB0 -/* 883140 80240F80 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240F84: -/* 883144 80240F84 8E220000 */ lw $v0, ($s1) -/* 883148 80240F88 3C034000 */ lui $v1, 0x4000 -/* 88314C 80240F8C 00431024 */ and $v0, $v0, $v1 -/* 883150 80240F90 10400007 */ beqz $v0, .L80240FB0 -/* 883154 80240F94 3C03BFFF */ lui $v1, 0xbfff -/* 883158 80240F98 2402000C */ addiu $v0, $zero, 0xc -/* 88315C 80240F9C AE620070 */ sw $v0, 0x70($s3) -/* 883160 80240FA0 8E220000 */ lw $v0, ($s1) -/* 883164 80240FA4 3463FFFF */ ori $v1, $v1, 0xffff -/* 883168 80240FA8 00431024 */ and $v0, $v0, $v1 -/* 88316C 80240FAC AE220000 */ sw $v0, ($s1) -.L80240FB0: -/* 883170 80240FB0 8E220090 */ lw $v0, 0x90($s1) -/* 883174 80240FB4 1840000C */ blez $v0, .L80240FE8 -/* 883178 80240FB8 2442FFFF */ addiu $v0, $v0, -1 -/* 88317C 80240FBC 14400087 */ bnez $v0, .L802411DC -/* 883180 80240FC0 AE220090 */ sw $v0, 0x90($s1) -/* 883184 80240FC4 3C03FFAA */ lui $v1, 0xffaa -/* 883188 80240FC8 8E420028 */ lw $v0, 0x28($s2) -/* 88318C 80240FCC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 883190 80240FD0 00431021 */ addu $v0, $v0, $v1 -/* 883194 80240FD4 2C420002 */ sltiu $v0, $v0, 2 -/* 883198 80240FD8 10400003 */ beqz $v0, .L80240FE8 -/* 88319C 80240FDC 3C020055 */ lui $v0, 0x55 -/* 8831A0 80240FE0 3442000C */ ori $v0, $v0, 0xc -/* 8831A4 80240FE4 AE420028 */ sw $v0, 0x28($s2) -.L80240FE8: -/* 8831A8 80240FE8 8E630070 */ lw $v1, 0x70($s3) -/* 8831AC 80240FEC 2402000C */ addiu $v0, $zero, 0xc -/* 8831B0 80240FF0 10620048 */ beq $v1, $v0, .L80241114 -/* 8831B4 80240FF4 2862000D */ slti $v0, $v1, 0xd -/* 8831B8 80240FF8 1040000F */ beqz $v0, .L80241038 -/* 8831BC 80240FFC 24100001 */ addiu $s0, $zero, 1 -/* 8831C0 80241000 1070001E */ beq $v1, $s0, .L8024107C -/* 8831C4 80241004 28620002 */ slti $v0, $v1, 2 -/* 8831C8 80241008 10400005 */ beqz $v0, .L80241020 -/* 8831CC 8024100C 24020002 */ addiu $v0, $zero, 2 -/* 8831D0 80241010 10600015 */ beqz $v1, .L80241068 -/* 8831D4 80241014 0260202D */ daddu $a0, $s3, $zero -/* 8831D8 80241018 0809045C */ j .L80241170 -/* 8831DC 8024101C 00000000 */ nop -.L80241020: -/* 8831E0 80241020 1062001C */ beq $v1, $v0, .L80241094 -/* 8831E4 80241024 24020003 */ addiu $v0, $zero, 3 -/* 8831E8 80241028 10620035 */ beq $v1, $v0, .L80241100 -/* 8831EC 8024102C 0260202D */ daddu $a0, $s3, $zero -/* 8831F0 80241030 0809045C */ j .L80241170 -/* 8831F4 80241034 00000000 */ nop -.L80241038: -/* 8831F8 80241038 2402000E */ addiu $v0, $zero, 0xe -/* 8831FC 8024103C 1062003F */ beq $v1, $v0, .L8024113C -/* 883200 80241040 0062102A */ slt $v0, $v1, $v0 -/* 883204 80241044 14400038 */ bnez $v0, .L80241128 -/* 883208 80241048 0260202D */ daddu $a0, $s3, $zero -/* 88320C 8024104C 2402000F */ addiu $v0, $zero, 0xf -/* 883210 80241050 10620040 */ beq $v1, $v0, .L80241154 -/* 883214 80241054 24020063 */ addiu $v0, $zero, 0x63 -/* 883218 80241058 10620043 */ beq $v1, $v0, .L80241168 -/* 88321C 8024105C 00000000 */ nop -/* 883220 80241060 0809045C */ j .L80241170 -/* 883224 80241064 00000000 */ nop -.L80241068: -/* 883228 80241068 0280282D */ daddu $a1, $s4, $zero -/* 88322C 8024106C 0C012568 */ jal func_800495A0 -/* 883230 80241070 02A0302D */ daddu $a2, $s5, $zero -/* 883234 80241074 96220086 */ lhu $v0, 0x86($s1) -/* 883238 80241078 A64200A8 */ sh $v0, 0xa8($s2) -.L8024107C: -/* 88323C 8024107C 0260202D */ daddu $a0, $s3, $zero -/* 883240 80241080 0280282D */ daddu $a1, $s4, $zero -/* 883244 80241084 0C0125AE */ jal func_800496B8 -/* 883248 80241088 02A0302D */ daddu $a2, $s5, $zero -/* 88324C 8024108C 0809045C */ j .L80241170 -/* 883250 80241090 00000000 */ nop -.L80241094: -/* 883254 80241094 0260202D */ daddu $a0, $s3, $zero -/* 883258 80241098 0280282D */ daddu $a1, $s4, $zero -/* 88325C 8024109C 0C0126D1 */ jal func_80049B44 -/* 883260 802410A0 02A0302D */ daddu $a2, $s5, $zero -/* 883264 802410A4 8E230088 */ lw $v1, 0x88($s1) -/* 883268 802410A8 24020006 */ addiu $v0, $zero, 6 -/* 88326C 802410AC 14620014 */ bne $v1, $v0, .L80241100 -/* 883270 802410B0 0260202D */ daddu $a0, $s3, $zero -/* 883274 802410B4 0C00A67F */ jal rand_int -/* 883278 802410B8 24040064 */ addiu $a0, $zero, 0x64 -/* 88327C 802410BC 28420021 */ slti $v0, $v0, 0x21 -/* 883280 802410C0 5040000F */ beql $v0, $zero, .L80241100 -/* 883284 802410C4 0260202D */ daddu $a0, $s3, $zero -/* 883288 802410C8 8E22008C */ lw $v0, 0x8c($s1) -/* 88328C 802410CC 10400005 */ beqz $v0, .L802410E4 -/* 883290 802410D0 3C020055 */ lui $v0, 0x55 -/* 883294 802410D4 3442002F */ ori $v0, $v0, 0x2f -/* 883298 802410D8 AE20008C */ sw $zero, 0x8c($s1) -/* 88329C 802410DC 0809043C */ j .L802410F0 -/* 8832A0 802410E0 A22000B5 */ sb $zero, 0xb5($s1) -.L802410E4: -/* 8832A4 802410E4 3442002E */ ori $v0, $v0, 0x2e -/* 8832A8 802410E8 AE30008C */ sw $s0, 0x8c($s1) -/* 8832AC 802410EC A23000B5 */ sb $s0, 0xb5($s1) -.L802410F0: -/* 8832B0 802410F0 AE420028 */ sw $v0, 0x28($s2) -/* 8832B4 802410F4 24020007 */ addiu $v0, $zero, 7 -/* 8832B8 802410F8 08090477 */ j .L802411DC -/* 8832BC 802410FC AE220090 */ sw $v0, 0x90($s1) -.L80241100: -/* 8832C0 80241100 0280282D */ daddu $a1, $s4, $zero -/* 8832C4 80241104 0C012701 */ jal func_80049C04 -/* 8832C8 80241108 02A0302D */ daddu $a2, $s5, $zero -/* 8832CC 8024110C 0809045C */ j .L80241170 -/* 8832D0 80241110 00000000 */ nop -.L80241114: -/* 8832D4 80241114 0260202D */ daddu $a0, $s3, $zero -/* 8832D8 80241118 0280282D */ daddu $a1, $s4, $zero -/* 8832DC 8024111C 0C09028C */ jal func_80240A30 -/* 8832E0 80241120 02A0302D */ daddu $a2, $s5, $zero -/* 8832E4 80241124 0260202D */ daddu $a0, $s3, $zero -.L80241128: -/* 8832E8 80241128 0280282D */ daddu $a1, $s4, $zero -/* 8832EC 8024112C 0C0902AB */ jal func_80240AAC -/* 8832F0 80241130 02A0302D */ daddu $a2, $s5, $zero -/* 8832F4 80241134 0809045C */ j .L80241170 -/* 8832F8 80241138 00000000 */ nop -.L8024113C: -/* 8832FC 8024113C 0260202D */ daddu $a0, $s3, $zero -/* 883300 80241140 0280282D */ daddu $a1, $s4, $zero -/* 883304 80241144 0C0902F8 */ jal func_80240BE0 -/* 883308 80241148 02A0302D */ daddu $a2, $s5, $zero -/* 88330C 8024114C 0809045C */ j .L80241170 -/* 883310 80241150 00000000 */ nop -.L80241154: -/* 883314 80241154 0280282D */ daddu $a1, $s4, $zero -/* 883318 80241158 0C090351 */ jal func_80240D44 -/* 88331C 8024115C 02A0302D */ daddu $a2, $s5, $zero -/* 883320 80241160 0809045C */ j .L80241170 -/* 883324 80241164 00000000 */ nop -.L80241168: -/* 883328 80241168 0C0129CF */ jal func_8004A73C -/* 88332C 8024116C 0260202D */ daddu $a0, $s3, $zero -.L80241170: -/* 883330 80241170 8E230088 */ lw $v1, 0x88($s1) -/* 883334 80241174 24020006 */ addiu $v0, $zero, 6 -/* 883338 80241178 14620019 */ bne $v1, $v0, .L802411E0 -/* 88333C 8024117C 0000102D */ daddu $v0, $zero, $zero -/* 883340 80241180 8E22008C */ lw $v0, 0x8c($s1) -/* 883344 80241184 10400003 */ beqz $v0, .L80241194 -/* 883348 80241188 24020001 */ addiu $v0, $zero, 1 -/* 88334C 8024118C 08090466 */ j .L80241198 -/* 883350 80241190 A22200B5 */ sb $v0, 0xb5($s1) -.L80241194: -/* 883354 80241194 A22000B5 */ sb $zero, 0xb5($s1) -.L80241198: -/* 883358 80241198 8E22008C */ lw $v0, 0x8c($s1) -/* 88335C 8024119C 1040000F */ beqz $v0, .L802411DC -/* 883360 802411A0 3C03FFAA */ lui $v1, 0xffaa -/* 883364 802411A4 8E420028 */ lw $v0, 0x28($s2) -/* 883368 802411A8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 88336C 802411AC 00431821 */ addu $v1, $v0, $v1 -/* 883370 802411B0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 883374 802411B4 10400009 */ beqz $v0, .L802411DC -/* 883378 802411B8 00031080 */ sll $v0, $v1, 2 -/* 88337C 802411BC 3C018024 */ lui $at, 0x8024 -/* 883380 802411C0 00220821 */ addu $at, $at, $v0 -/* 883384 802411C4 8C2241A8 */ lw $v0, 0x41a8($at) -/* 883388 802411C8 00400008 */ jr $v0 -/* 88338C 802411CC 00000000 */ nop -/* 883390 802411D0 8E420028 */ lw $v0, 0x28($s2) -/* 883394 802411D4 24420001 */ addiu $v0, $v0, 1 -/* 883398 802411D8 AE420028 */ sw $v0, 0x28($s2) -.L802411DC: -/* 88339C 802411DC 0000102D */ daddu $v0, $zero, $zero -.L802411E0: -/* 8833A0 802411E0 8FBF0068 */ lw $ra, 0x68($sp) -/* 8833A4 802411E4 8FB50064 */ lw $s5, 0x64($sp) -/* 8833A8 802411E8 8FB40060 */ lw $s4, 0x60($sp) -/* 8833AC 802411EC 8FB3005C */ lw $s3, 0x5c($sp) -/* 8833B0 802411F0 8FB20058 */ lw $s2, 0x58($sp) -/* 8833B4 802411F4 8FB10054 */ lw $s1, 0x54($sp) -/* 8833B8 802411F8 8FB00050 */ lw $s0, 0x50($sp) -/* 8833BC 802411FC 03E00008 */ jr $ra -/* 8833C0 80241200 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s new file mode 100644 index 0000000000..d809d03d8c --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80240DC4_882F84.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240DC4_882F84 +/* 882F84 80240DC4 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 882F88 80240DC8 AFB3005C */ sw $s3, 0x5c($sp) +/* 882F8C 80240DCC 0080982D */ daddu $s3, $a0, $zero +/* 882F90 80240DD0 AFBF0068 */ sw $ra, 0x68($sp) +/* 882F94 80240DD4 AFB50064 */ sw $s5, 0x64($sp) +/* 882F98 80240DD8 AFB40060 */ sw $s4, 0x60($sp) +/* 882F9C 80240DDC AFB20058 */ sw $s2, 0x58($sp) +/* 882FA0 80240DE0 AFB10054 */ sw $s1, 0x54($sp) +/* 882FA4 80240DE4 AFB00050 */ sw $s0, 0x50($sp) +/* 882FA8 80240DE8 8E710148 */ lw $s1, 0x148($s3) +/* 882FAC 80240DEC 86240008 */ lh $a0, 8($s1) +/* 882FB0 80240DF0 0C00EABB */ jal get_npc_unsafe +/* 882FB4 80240DF4 00A0802D */ daddu $s0, $a1, $zero +/* 882FB8 80240DF8 8E63000C */ lw $v1, 0xc($s3) +/* 882FBC 80240DFC 0260202D */ daddu $a0, $s3, $zero +/* 882FC0 80240E00 8C650000 */ lw $a1, ($v1) +/* 882FC4 80240E04 0C0B1EAF */ jal get_variable +/* 882FC8 80240E08 0040902D */ daddu $s2, $v0, $zero +/* 882FCC 80240E0C AFA00028 */ sw $zero, 0x28($sp) +/* 882FD0 80240E10 8E2300D0 */ lw $v1, 0xd0($s1) +/* 882FD4 80240E14 8C630030 */ lw $v1, 0x30($v1) +/* 882FD8 80240E18 AFA3002C */ sw $v1, 0x2c($sp) +/* 882FDC 80240E1C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 882FE0 80240E20 8C63001C */ lw $v1, 0x1c($v1) +/* 882FE4 80240E24 AFA30030 */ sw $v1, 0x30($sp) +/* 882FE8 80240E28 8E2300D0 */ lw $v1, 0xd0($s1) +/* 882FEC 80240E2C 8C630024 */ lw $v1, 0x24($v1) +/* 882FF0 80240E30 AFA30034 */ sw $v1, 0x34($sp) +/* 882FF4 80240E34 8E2300D0 */ lw $v1, 0xd0($s1) +/* 882FF8 80240E38 8C630028 */ lw $v1, 0x28($v1) +/* 882FFC 80240E3C 27B50028 */ addiu $s5, $sp, 0x28 +/* 883000 80240E40 AFA30038 */ sw $v1, 0x38($sp) +/* 883004 80240E44 8E2300D0 */ lw $v1, 0xd0($s1) +/* 883008 80240E48 3C0142C8 */ lui $at, 0x42c8 +/* 88300C 80240E4C 44810000 */ mtc1 $at, $f0 +/* 883010 80240E50 8C63002C */ lw $v1, 0x2c($v1) +/* 883014 80240E54 0040A02D */ daddu $s4, $v0, $zero +/* 883018 80240E58 E7A00040 */ swc1 $f0, 0x40($sp) +/* 88301C 80240E5C A7A00044 */ sh $zero, 0x44($sp) +/* 883020 80240E60 12000009 */ beqz $s0, .L80240E88 +/* 883024 80240E64 AFA3003C */ sw $v1, 0x3c($sp) +/* 883028 80240E68 864300A8 */ lh $v1, 0xa8($s2) +/* 88302C 80240E6C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 883030 80240E70 AE20008C */ sw $zero, 0x8c($s1) +/* 883034 80240E74 A22000B5 */ sb $zero, 0xb5($s1) +/* 883038 80240E78 34420008 */ ori $v0, $v0, 8 +/* 88303C 80240E7C AE230084 */ sw $v1, 0x84($s1) +/* 883040 80240E80 080903A6 */ j .L80240E98 +/* 883044 80240E84 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240E88: +/* 883048 80240E88 8E2200B0 */ lw $v0, 0xb0($s1) +/* 88304C 80240E8C 30420004 */ andi $v0, $v0, 4 +/* 883050 80240E90 10400047 */ beqz $v0, .L80240FB0 +/* 883054 80240E94 00000000 */ nop +.L80240E98: +/* 883058 80240E98 AE600070 */ sw $zero, 0x70($s3) +/* 88305C 80240E9C A640008E */ sh $zero, 0x8e($s2) +/* 883060 80240EA0 8E2300CC */ lw $v1, 0xcc($s1) +/* 883064 80240EA4 2404F7FF */ addiu $a0, $zero, -0x801 +/* 883068 80240EA8 A2200007 */ sb $zero, 7($s1) +/* 88306C 80240EAC 8E420000 */ lw $v0, ($s2) +/* 883070 80240EB0 8C630000 */ lw $v1, ($v1) +/* 883074 80240EB4 00441024 */ and $v0, $v0, $a0 +/* 883078 80240EB8 AE420000 */ sw $v0, ($s2) +/* 88307C 80240EBC AE430028 */ sw $v1, 0x28($s2) +/* 883080 80240EC0 96220086 */ lhu $v0, 0x86($s1) +/* 883084 80240EC4 A64200A8 */ sh $v0, 0xa8($s2) +/* 883088 80240EC8 8E2200D0 */ lw $v0, 0xd0($s1) +/* 88308C 80240ECC AE200090 */ sw $zero, 0x90($s1) +/* 883090 80240ED0 8C420034 */ lw $v0, 0x34($v0) +/* 883094 80240ED4 14400006 */ bnez $v0, .L80240EF0 +/* 883098 80240ED8 2403FDFF */ addiu $v1, $zero, -0x201 +/* 88309C 80240EDC 8E420000 */ lw $v0, ($s2) +/* 8830A0 80240EE0 2403FFF7 */ addiu $v1, $zero, -9 +/* 8830A4 80240EE4 34420200 */ ori $v0, $v0, 0x200 +/* 8830A8 80240EE8 080903BF */ j .L80240EFC +/* 8830AC 80240EEC 00431024 */ and $v0, $v0, $v1 +.L80240EF0: +/* 8830B0 80240EF0 8E420000 */ lw $v0, ($s2) +/* 8830B4 80240EF4 00431024 */ and $v0, $v0, $v1 +/* 8830B8 80240EF8 34420008 */ ori $v0, $v0, 8 +.L80240EFC: +/* 8830BC 80240EFC AE420000 */ sw $v0, ($s2) +/* 8830C0 80240F00 8E2200B0 */ lw $v0, 0xb0($s1) +/* 8830C4 80240F04 30420004 */ andi $v0, $v0, 4 +/* 8830C8 80240F08 1040001E */ beqz $v0, .L80240F84 +/* 8830CC 80240F0C 24040002 */ addiu $a0, $zero, 2 +/* 8830D0 80240F10 0240282D */ daddu $a1, $s2, $zero +/* 8830D4 80240F14 0000302D */ daddu $a2, $zero, $zero +/* 8830D8 80240F18 24020063 */ addiu $v0, $zero, 0x63 +/* 8830DC 80240F1C AE620070 */ sw $v0, 0x70($s3) +/* 8830E0 80240F20 AE600074 */ sw $zero, 0x74($s3) +/* 8830E4 80240F24 864300A8 */ lh $v1, 0xa8($s2) +/* 8830E8 80240F28 3C013F80 */ lui $at, 0x3f80 +/* 8830EC 80240F2C 44810000 */ mtc1 $at, $f0 +/* 8830F0 80240F30 3C014000 */ lui $at, 0x4000 +/* 8830F4 80240F34 44811000 */ mtc1 $at, $f2 +/* 8830F8 80240F38 3C01C1A0 */ lui $at, 0xc1a0 +/* 8830FC 80240F3C 44812000 */ mtc1 $at, $f4 +/* 883100 80240F40 24020028 */ addiu $v0, $zero, 0x28 +/* 883104 80240F44 AFA2001C */ sw $v0, 0x1c($sp) +/* 883108 80240F48 44833000 */ mtc1 $v1, $f6 +/* 88310C 80240F4C 00000000 */ nop +/* 883110 80240F50 468031A0 */ cvt.s.w $f6, $f6 +/* 883114 80240F54 44073000 */ mfc1 $a3, $f6 +/* 883118 80240F58 27A20048 */ addiu $v0, $sp, 0x48 +/* 88311C 80240F5C AFA20020 */ sw $v0, 0x20($sp) +/* 883120 80240F60 E7A00010 */ swc1 $f0, 0x10($sp) +/* 883124 80240F64 E7A20014 */ swc1 $f2, 0x14($sp) +/* 883128 80240F68 0C01BFA4 */ jal fx_emote +/* 88312C 80240F6C E7A40018 */ swc1 $f4, 0x18($sp) +/* 883130 80240F70 8E2200B0 */ lw $v0, 0xb0($s1) +/* 883134 80240F74 2403FFFB */ addiu $v1, $zero, -5 +/* 883138 80240F78 00431024 */ and $v0, $v0, $v1 +/* 88313C 80240F7C 080903EC */ j .L80240FB0 +/* 883140 80240F80 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240F84: +/* 883144 80240F84 8E220000 */ lw $v0, ($s1) +/* 883148 80240F88 3C034000 */ lui $v1, 0x4000 +/* 88314C 80240F8C 00431024 */ and $v0, $v0, $v1 +/* 883150 80240F90 10400007 */ beqz $v0, .L80240FB0 +/* 883154 80240F94 3C03BFFF */ lui $v1, 0xbfff +/* 883158 80240F98 2402000C */ addiu $v0, $zero, 0xc +/* 88315C 80240F9C AE620070 */ sw $v0, 0x70($s3) +/* 883160 80240FA0 8E220000 */ lw $v0, ($s1) +/* 883164 80240FA4 3463FFFF */ ori $v1, $v1, 0xffff +/* 883168 80240FA8 00431024 */ and $v0, $v0, $v1 +/* 88316C 80240FAC AE220000 */ sw $v0, ($s1) +.L80240FB0: +/* 883170 80240FB0 8E220090 */ lw $v0, 0x90($s1) +/* 883174 80240FB4 1840000C */ blez $v0, .L80240FE8 +/* 883178 80240FB8 2442FFFF */ addiu $v0, $v0, -1 +/* 88317C 80240FBC 14400087 */ bnez $v0, .L802411DC +/* 883180 80240FC0 AE220090 */ sw $v0, 0x90($s1) +/* 883184 80240FC4 3C03FFAA */ lui $v1, 0xffaa +/* 883188 80240FC8 8E420028 */ lw $v0, 0x28($s2) +/* 88318C 80240FCC 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 883190 80240FD0 00431021 */ addu $v0, $v0, $v1 +/* 883194 80240FD4 2C420002 */ sltiu $v0, $v0, 2 +/* 883198 80240FD8 10400003 */ beqz $v0, .L80240FE8 +/* 88319C 80240FDC 3C020055 */ lui $v0, 0x55 +/* 8831A0 80240FE0 3442000C */ ori $v0, $v0, 0xc +/* 8831A4 80240FE4 AE420028 */ sw $v0, 0x28($s2) +.L80240FE8: +/* 8831A8 80240FE8 8E630070 */ lw $v1, 0x70($s3) +/* 8831AC 80240FEC 2402000C */ addiu $v0, $zero, 0xc +/* 8831B0 80240FF0 10620048 */ beq $v1, $v0, .L80241114 +/* 8831B4 80240FF4 2862000D */ slti $v0, $v1, 0xd +/* 8831B8 80240FF8 1040000F */ beqz $v0, .L80241038 +/* 8831BC 80240FFC 24100001 */ addiu $s0, $zero, 1 +/* 8831C0 80241000 1070001E */ beq $v1, $s0, .L8024107C +/* 8831C4 80241004 28620002 */ slti $v0, $v1, 2 +/* 8831C8 80241008 10400005 */ beqz $v0, .L80241020 +/* 8831CC 8024100C 24020002 */ addiu $v0, $zero, 2 +/* 8831D0 80241010 10600015 */ beqz $v1, .L80241068 +/* 8831D4 80241014 0260202D */ daddu $a0, $s3, $zero +/* 8831D8 80241018 0809045C */ j .L80241170 +/* 8831DC 8024101C 00000000 */ nop +.L80241020: +/* 8831E0 80241020 1062001C */ beq $v1, $v0, .L80241094 +/* 8831E4 80241024 24020003 */ addiu $v0, $zero, 3 +/* 8831E8 80241028 10620035 */ beq $v1, $v0, .L80241100 +/* 8831EC 8024102C 0260202D */ daddu $a0, $s3, $zero +/* 8831F0 80241030 0809045C */ j .L80241170 +/* 8831F4 80241034 00000000 */ nop +.L80241038: +/* 8831F8 80241038 2402000E */ addiu $v0, $zero, 0xe +/* 8831FC 8024103C 1062003F */ beq $v1, $v0, .L8024113C +/* 883200 80241040 0062102A */ slt $v0, $v1, $v0 +/* 883204 80241044 14400038 */ bnez $v0, .L80241128 +/* 883208 80241048 0260202D */ daddu $a0, $s3, $zero +/* 88320C 8024104C 2402000F */ addiu $v0, $zero, 0xf +/* 883210 80241050 10620040 */ beq $v1, $v0, .L80241154 +/* 883214 80241054 24020063 */ addiu $v0, $zero, 0x63 +/* 883218 80241058 10620043 */ beq $v1, $v0, .L80241168 +/* 88321C 8024105C 00000000 */ nop +/* 883220 80241060 0809045C */ j .L80241170 +/* 883224 80241064 00000000 */ nop +.L80241068: +/* 883228 80241068 0280282D */ daddu $a1, $s4, $zero +/* 88322C 8024106C 0C012568 */ jal func_800495A0 +/* 883230 80241070 02A0302D */ daddu $a2, $s5, $zero +/* 883234 80241074 96220086 */ lhu $v0, 0x86($s1) +/* 883238 80241078 A64200A8 */ sh $v0, 0xa8($s2) +.L8024107C: +/* 88323C 8024107C 0260202D */ daddu $a0, $s3, $zero +/* 883240 80241080 0280282D */ daddu $a1, $s4, $zero +/* 883244 80241084 0C0125AE */ jal func_800496B8 +/* 883248 80241088 02A0302D */ daddu $a2, $s5, $zero +/* 88324C 8024108C 0809045C */ j .L80241170 +/* 883250 80241090 00000000 */ nop +.L80241094: +/* 883254 80241094 0260202D */ daddu $a0, $s3, $zero +/* 883258 80241098 0280282D */ daddu $a1, $s4, $zero +/* 88325C 8024109C 0C0126D1 */ jal func_80049B44 +/* 883260 802410A0 02A0302D */ daddu $a2, $s5, $zero +/* 883264 802410A4 8E230088 */ lw $v1, 0x88($s1) +/* 883268 802410A8 24020006 */ addiu $v0, $zero, 6 +/* 88326C 802410AC 14620014 */ bne $v1, $v0, .L80241100 +/* 883270 802410B0 0260202D */ daddu $a0, $s3, $zero +/* 883274 802410B4 0C00A67F */ jal rand_int +/* 883278 802410B8 24040064 */ addiu $a0, $zero, 0x64 +/* 88327C 802410BC 28420021 */ slti $v0, $v0, 0x21 +/* 883280 802410C0 5040000F */ beql $v0, $zero, .L80241100 +/* 883284 802410C4 0260202D */ daddu $a0, $s3, $zero +/* 883288 802410C8 8E22008C */ lw $v0, 0x8c($s1) +/* 88328C 802410CC 10400005 */ beqz $v0, .L802410E4 +/* 883290 802410D0 3C020055 */ lui $v0, 0x55 +/* 883294 802410D4 3442002F */ ori $v0, $v0, 0x2f +/* 883298 802410D8 AE20008C */ sw $zero, 0x8c($s1) +/* 88329C 802410DC 0809043C */ j .L802410F0 +/* 8832A0 802410E0 A22000B5 */ sb $zero, 0xb5($s1) +.L802410E4: +/* 8832A4 802410E4 3442002E */ ori $v0, $v0, 0x2e +/* 8832A8 802410E8 AE30008C */ sw $s0, 0x8c($s1) +/* 8832AC 802410EC A23000B5 */ sb $s0, 0xb5($s1) +.L802410F0: +/* 8832B0 802410F0 AE420028 */ sw $v0, 0x28($s2) +/* 8832B4 802410F4 24020007 */ addiu $v0, $zero, 7 +/* 8832B8 802410F8 08090477 */ j .L802411DC +/* 8832BC 802410FC AE220090 */ sw $v0, 0x90($s1) +.L80241100: +/* 8832C0 80241100 0280282D */ daddu $a1, $s4, $zero +/* 8832C4 80241104 0C012701 */ jal func_80049C04 +/* 8832C8 80241108 02A0302D */ daddu $a2, $s5, $zero +/* 8832CC 8024110C 0809045C */ j .L80241170 +/* 8832D0 80241110 00000000 */ nop +.L80241114: +/* 8832D4 80241114 0260202D */ daddu $a0, $s3, $zero +/* 8832D8 80241118 0280282D */ daddu $a1, $s4, $zero +/* 8832DC 8024111C 0C09028C */ jal func_80240A30_882BF0 +/* 8832E0 80241120 02A0302D */ daddu $a2, $s5, $zero +/* 8832E4 80241124 0260202D */ daddu $a0, $s3, $zero +.L80241128: +/* 8832E8 80241128 0280282D */ daddu $a1, $s4, $zero +/* 8832EC 8024112C 0C0902AB */ jal func_80240AAC_882C6C +/* 8832F0 80241130 02A0302D */ daddu $a2, $s5, $zero +/* 8832F4 80241134 0809045C */ j .L80241170 +/* 8832F8 80241138 00000000 */ nop +.L8024113C: +/* 8832FC 8024113C 0260202D */ daddu $a0, $s3, $zero +/* 883300 80241140 0280282D */ daddu $a1, $s4, $zero +/* 883304 80241144 0C0902F8 */ jal func_80240BE0_882DA0 +/* 883308 80241148 02A0302D */ daddu $a2, $s5, $zero +/* 88330C 8024114C 0809045C */ j .L80241170 +/* 883310 80241150 00000000 */ nop +.L80241154: +/* 883314 80241154 0280282D */ daddu $a1, $s4, $zero +/* 883318 80241158 0C090351 */ jal func_80240D44_882F04 +/* 88331C 8024115C 02A0302D */ daddu $a2, $s5, $zero +/* 883320 80241160 0809045C */ j .L80241170 +/* 883324 80241164 00000000 */ nop +.L80241168: +/* 883328 80241168 0C0129CF */ jal func_8004A73C +/* 88332C 8024116C 0260202D */ daddu $a0, $s3, $zero +.L80241170: +/* 883330 80241170 8E230088 */ lw $v1, 0x88($s1) +/* 883334 80241174 24020006 */ addiu $v0, $zero, 6 +/* 883338 80241178 14620019 */ bne $v1, $v0, .L802411E0 +/* 88333C 8024117C 0000102D */ daddu $v0, $zero, $zero +/* 883340 80241180 8E22008C */ lw $v0, 0x8c($s1) +/* 883344 80241184 10400003 */ beqz $v0, .L80241194 +/* 883348 80241188 24020001 */ addiu $v0, $zero, 1 +/* 88334C 8024118C 08090466 */ j .L80241198 +/* 883350 80241190 A22200B5 */ sb $v0, 0xb5($s1) +.L80241194: +/* 883354 80241194 A22000B5 */ sb $zero, 0xb5($s1) +.L80241198: +/* 883358 80241198 8E22008C */ lw $v0, 0x8c($s1) +/* 88335C 8024119C 1040000F */ beqz $v0, .L802411DC +/* 883360 802411A0 3C03FFAA */ lui $v1, 0xffaa +/* 883364 802411A4 8E420028 */ lw $v0, 0x28($s2) +/* 883368 802411A8 3463FFFC */ ori $v1, $v1, 0xfffc +/* 88336C 802411AC 00431821 */ addu $v1, $v0, $v1 +/* 883370 802411B0 2C620015 */ sltiu $v0, $v1, 0x15 +/* 883374 802411B4 10400009 */ beqz $v0, .L802411DC +/* 883378 802411B8 00031080 */ sll $v0, $v1, 2 +/* 88337C 802411BC 3C018024 */ lui $at, 0x8024 +/* 883380 802411C0 00220821 */ addu $at, $at, $v0 +/* 883384 802411C4 8C2241A8 */ lw $v0, 0x41a8($at) +/* 883388 802411C8 00400008 */ jr $v0 +/* 88338C 802411CC 00000000 */ nop +/* 883390 802411D0 8E420028 */ lw $v0, 0x28($s2) +/* 883394 802411D4 24420001 */ addiu $v0, $v0, 1 +/* 883398 802411D8 AE420028 */ sw $v0, 0x28($s2) +.L802411DC: +/* 88339C 802411DC 0000102D */ daddu $v0, $zero, $zero +.L802411E0: +/* 8833A0 802411E0 8FBF0068 */ lw $ra, 0x68($sp) +/* 8833A4 802411E4 8FB50064 */ lw $s5, 0x64($sp) +/* 8833A8 802411E8 8FB40060 */ lw $s4, 0x60($sp) +/* 8833AC 802411EC 8FB3005C */ lw $s3, 0x5c($sp) +/* 8833B0 802411F0 8FB20058 */ lw $s2, 0x58($sp) +/* 8833B4 802411F4 8FB10054 */ lw $s1, 0x54($sp) +/* 8833B8 802411F8 8FB00050 */ lw $s0, 0x50($sp) +/* 8833BC 802411FC 03E00008 */ jr $ra +/* 8833C0 80241200 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204.s deleted file mode 100644 index 3f0aab420b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241204 -/* 8833C4 80241204 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8833C8 80241208 0000502D */ daddu $t2, $zero, $zero -/* 8833CC 8024120C 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* 8833D0 80241210 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* 8833D4 80241214 AFBF0010 */ sw $ra, 0x10($sp) -/* 8833D8 80241218 8062001C */ lb $v0, 0x1c($v1) -/* 8833DC 8024121C 8C85000C */ lw $a1, 0xc($a0) -/* 8833E0 80241220 18400016 */ blez $v0, .L8024127C -/* 8833E4 80241224 0140302D */ daddu $a2, $t2, $zero -/* 8833E8 80241228 0040582D */ daddu $t3, $v0, $zero -/* 8833EC 8024122C 0060482D */ daddu $t1, $v1, $zero -.L80241230: -/* 8833F0 80241230 8D220028 */ lw $v0, 0x28($t1) -/* 8833F4 80241234 5040000E */ beql $v0, $zero, .L80241270 -/* 8833F8 80241238 254A0001 */ addiu $t2, $t2, 1 -/* 8833FC 8024123C 8C430000 */ lw $v1, ($v0) -/* 883400 80241240 1860000A */ blez $v1, .L8024126C -/* 883404 80241244 0000382D */ daddu $a3, $zero, $zero -/* 883408 80241248 0060402D */ daddu $t0, $v1, $zero -/* 88340C 8024124C 0040182D */ daddu $v1, $v0, $zero -.L80241250: -/* 883410 80241250 8C620004 */ lw $v0, 4($v1) -/* 883414 80241254 54400001 */ bnel $v0, $zero, .L8024125C -/* 883418 80241258 24C60001 */ addiu $a2, $a2, 1 -.L8024125C: -/* 88341C 8024125C 24E70001 */ addiu $a3, $a3, 1 -/* 883420 80241260 00E8102A */ slt $v0, $a3, $t0 -/* 883424 80241264 1440FFFA */ bnez $v0, .L80241250 -/* 883428 80241268 24630004 */ addiu $v1, $v1, 4 -.L8024126C: -/* 88342C 8024126C 254A0001 */ addiu $t2, $t2, 1 -.L80241270: -/* 883430 80241270 014B102A */ slt $v0, $t2, $t3 -/* 883434 80241274 1440FFEE */ bnez $v0, .L80241230 -/* 883438 80241278 25290004 */ addiu $t1, $t1, 4 -.L8024127C: -/* 88343C 8024127C 8CA50000 */ lw $a1, ($a1) -/* 883440 80241280 0C0B2026 */ jal set_variable -/* 883444 80241284 00000000 */ nop -/* 883448 80241288 8FBF0010 */ lw $ra, 0x10($sp) -/* 88344C 8024128C 24020002 */ addiu $v0, $zero, 2 -/* 883450 80241290 03E00008 */ jr $ra -/* 883454 80241294 27BD0018 */ addiu $sp, $sp, 0x18 -/* 883458 80241298 00000000 */ nop -/* 88345C 8024129C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s new file mode 100644 index 0000000000..89e38c207d --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_09/882BF0/func_80241204_8833C4.s @@ -0,0 +1,49 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241204_8833C4 +/* 8833C4 80241204 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8833C8 80241208 0000502D */ daddu $t2, $zero, $zero +/* 8833CC 8024120C 3C03800B */ lui $v1, %hi(gCurrentEncounter) +/* 8833D0 80241210 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) +/* 8833D4 80241214 AFBF0010 */ sw $ra, 0x10($sp) +/* 8833D8 80241218 8062001C */ lb $v0, 0x1c($v1) +/* 8833DC 8024121C 8C85000C */ lw $a1, 0xc($a0) +/* 8833E0 80241220 18400016 */ blez $v0, .L8024127C +/* 8833E4 80241224 0140302D */ daddu $a2, $t2, $zero +/* 8833E8 80241228 0040582D */ daddu $t3, $v0, $zero +/* 8833EC 8024122C 0060482D */ daddu $t1, $v1, $zero +.L80241230: +/* 8833F0 80241230 8D220028 */ lw $v0, 0x28($t1) +/* 8833F4 80241234 5040000E */ beql $v0, $zero, .L80241270 +/* 8833F8 80241238 254A0001 */ addiu $t2, $t2, 1 +/* 8833FC 8024123C 8C430000 */ lw $v1, ($v0) +/* 883400 80241240 1860000A */ blez $v1, .L8024126C +/* 883404 80241244 0000382D */ daddu $a3, $zero, $zero +/* 883408 80241248 0060402D */ daddu $t0, $v1, $zero +/* 88340C 8024124C 0040182D */ daddu $v1, $v0, $zero +.L80241250: +/* 883410 80241250 8C620004 */ lw $v0, 4($v1) +/* 883414 80241254 54400001 */ bnel $v0, $zero, .L8024125C +/* 883418 80241258 24C60001 */ addiu $a2, $a2, 1 +.L8024125C: +/* 88341C 8024125C 24E70001 */ addiu $a3, $a3, 1 +/* 883420 80241260 00E8102A */ slt $v0, $a3, $t0 +/* 883424 80241264 1440FFFA */ bnez $v0, .L80241250 +/* 883428 80241268 24630004 */ addiu $v1, $v1, 4 +.L8024126C: +/* 88342C 8024126C 254A0001 */ addiu $t2, $t2, 1 +.L80241270: +/* 883430 80241270 014B102A */ slt $v0, $t2, $t3 +/* 883434 80241274 1440FFEE */ bnez $v0, .L80241230 +/* 883438 80241278 25290004 */ addiu $t1, $t1, 4 +.L8024127C: +/* 88343C 8024127C 8CA50000 */ lw $a1, ($a1) +/* 883440 80241280 0C0B2026 */ jal set_variable +/* 883444 80241284 00000000 */ nop +/* 883448 80241288 8FBF0010 */ lw $ra, 0x10($sp) +/* 88344C 8024128C 24020002 */ addiu $v0, $zero, 2 +/* 883450 80241290 03E00008 */ jr $ra +/* 883454 80241294 27BD0018 */ addiu $sp, $sp, 0x18 +/* 883458 80241298 00000000 */ nop +/* 88345C 8024129C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C.s deleted file mode 100644 index 992d25f730..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024069C -/* 886A5C 8024069C 3C02800A */ lui $v0, %hi(D_8009A650) -/* 886A60 802406A0 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 886A64 802406A4 8C430000 */ lw $v1, ($v0) -/* 886A68 802406A8 2404FFBF */ addiu $a0, $zero, -0x41 -/* 886A6C 802406AC 00641824 */ and $v1, $v1, $a0 -/* 886A70 802406B0 AC430000 */ sw $v1, ($v0) -/* 886A74 802406B4 03E00008 */ jr $ra -/* 886A78 802406B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C_886A5C.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C_886A5C.s new file mode 100644 index 0000000000..f08811499c --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024069C_886A5C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024069C_886A5C +/* 886A5C 8024069C 3C02800A */ lui $v0, %hi(D_8009A650) +/* 886A60 802406A0 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* 886A64 802406A4 8C430000 */ lw $v1, ($v0) +/* 886A68 802406A8 2404FFBF */ addiu $a0, $zero, -0x41 +/* 886A6C 802406AC 00641824 */ and $v1, $v1, $a0 +/* 886A70 802406B0 AC430000 */ sw $v1, ($v0) +/* 886A74 802406B4 03E00008 */ jr $ra +/* 886A78 802406B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406BC.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406BC.s deleted file mode 100644 index a9e2aed527..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406BC.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406BC -/* 886A7C 802406BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 886A80 802406C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 886A84 802406C4 8C82000C */ lw $v0, 0xc($a0) -/* 886A88 802406C8 0C0B1EAF */ jal get_variable -/* 886A8C 802406CC 8C450000 */ lw $a1, ($v0) -/* 886A90 802406D0 0C0B95A4 */ jal func_802E5690 -/* 886A94 802406D4 0040202D */ daddu $a0, $v0, $zero -/* 886A98 802406D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 886A9C 802406DC 24020002 */ addiu $v0, $zero, 2 -/* 886AA0 802406E0 03E00008 */ jr $ra -/* 886AA4 802406E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406BC_886A7C.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406BC_886A7C.s new file mode 100644 index 0000000000..74b281b8e4 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406BC_886A7C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406BC_886A7C +/* 886A7C 802406BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 886A80 802406C0 AFBF0010 */ sw $ra, 0x10($sp) +/* 886A84 802406C4 8C82000C */ lw $v0, 0xc($a0) +/* 886A88 802406C8 0C0B1EAF */ jal get_variable +/* 886A8C 802406CC 8C450000 */ lw $a1, ($v0) +/* 886A90 802406D0 0C0B95A4 */ jal func_802E5690 +/* 886A94 802406D4 0040202D */ daddu $a0, $v0, $zero +/* 886A98 802406D8 8FBF0010 */ lw $ra, 0x10($sp) +/* 886A9C 802406DC 24020002 */ addiu $v0, $zero, 2 +/* 886AA0 802406E0 03E00008 */ jr $ra +/* 886AA4 802406E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8.s deleted file mode 100644 index af9bc40e42..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406E8 -/* 886AA8 802406E8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 886AAC 802406EC AFB00010 */ sw $s0, 0x10($sp) -/* 886AB0 802406F0 0080802D */ daddu $s0, $a0, $zero -/* 886AB4 802406F4 AFBF0018 */ sw $ra, 0x18($sp) -/* 886AB8 802406F8 AFB10014 */ sw $s1, 0x14($sp) -/* 886ABC 802406FC 8E11000C */ lw $s1, 0xc($s0) -/* 886AC0 80240700 8E250000 */ lw $a1, ($s1) -/* 886AC4 80240704 0C0B1EAF */ jal get_variable -/* 886AC8 80240708 26310004 */ addiu $s1, $s1, 4 -/* 886ACC 8024070C 0200202D */ daddu $a0, $s0, $zero -/* 886AD0 80240710 3C038011 */ lui $v1, %hi(gPlayerData) -/* 886AD4 80240714 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 886AD8 80240718 000210C0 */ sll $v0, $v0, 3 -/* 886ADC 8024071C 00431021 */ addu $v0, $v0, $v1 -/* 886AE0 80240720 90460015 */ lbu $a2, 0x15($v0) -/* 886AE4 80240724 8E250000 */ lw $a1, ($s1) -/* 886AE8 80240728 24C60001 */ addiu $a2, $a2, 1 -/* 886AEC 8024072C A0460015 */ sb $a2, 0x15($v0) -/* 886AF0 80240730 00063600 */ sll $a2, $a2, 0x18 -/* 886AF4 80240734 0C0B2026 */ jal set_variable -/* 886AF8 80240738 00063603 */ sra $a2, $a2, 0x18 -/* 886AFC 8024073C 8FBF0018 */ lw $ra, 0x18($sp) -/* 886B00 80240740 8FB10014 */ lw $s1, 0x14($sp) -/* 886B04 80240744 8FB00010 */ lw $s0, 0x10($sp) -/* 886B08 80240748 24020002 */ addiu $v0, $zero, 2 -/* 886B0C 8024074C 03E00008 */ jr $ra -/* 886B10 80240750 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8_886AA8.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8_886AA8.s new file mode 100644 index 0000000000..ede94af3ff --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802406E8_886AA8.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406E8_886AA8 +/* 886AA8 802406E8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 886AAC 802406EC AFB00010 */ sw $s0, 0x10($sp) +/* 886AB0 802406F0 0080802D */ daddu $s0, $a0, $zero +/* 886AB4 802406F4 AFBF0018 */ sw $ra, 0x18($sp) +/* 886AB8 802406F8 AFB10014 */ sw $s1, 0x14($sp) +/* 886ABC 802406FC 8E11000C */ lw $s1, 0xc($s0) +/* 886AC0 80240700 8E250000 */ lw $a1, ($s1) +/* 886AC4 80240704 0C0B1EAF */ jal get_variable +/* 886AC8 80240708 26310004 */ addiu $s1, $s1, 4 +/* 886ACC 8024070C 0200202D */ daddu $a0, $s0, $zero +/* 886AD0 80240710 3C038011 */ lui $v1, %hi(gPlayerData) +/* 886AD4 80240714 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 886AD8 80240718 000210C0 */ sll $v0, $v0, 3 +/* 886ADC 8024071C 00431021 */ addu $v0, $v0, $v1 +/* 886AE0 80240720 90460015 */ lbu $a2, 0x15($v0) +/* 886AE4 80240724 8E250000 */ lw $a1, ($s1) +/* 886AE8 80240728 24C60001 */ addiu $a2, $a2, 1 +/* 886AEC 8024072C A0460015 */ sb $a2, 0x15($v0) +/* 886AF0 80240730 00063600 */ sll $a2, $a2, 0x18 +/* 886AF4 80240734 0C0B2026 */ jal set_variable +/* 886AF8 80240738 00063603 */ sra $a2, $a2, 0x18 +/* 886AFC 8024073C 8FBF0018 */ lw $ra, 0x18($sp) +/* 886B00 80240740 8FB10014 */ lw $s1, 0x14($sp) +/* 886B04 80240744 8FB00010 */ lw $s0, 0x10($sp) +/* 886B08 80240748 24020002 */ addiu $v0, $zero, 2 +/* 886B0C 8024074C 03E00008 */ jr $ra +/* 886B10 80240750 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754.s deleted file mode 100644 index f8e448f246..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240754 -/* 886B14 80240754 3C028011 */ lui $v0, %hi(gPlayerData) -/* 886B18 80240758 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 886B1C 8024075C 000420C0 */ sll $a0, $a0, 3 -/* 886B20 80240760 00822021 */ addu $a0, $a0, $v0 -/* 886B24 80240764 90820014 */ lbu $v0, 0x14($a0) -/* 886B28 80240768 10400009 */ beqz $v0, .L80240790 -/* 886B2C 8024076C 00000000 */ nop -/* 886B30 80240770 90820015 */ lbu $v0, 0x15($a0) -/* 886B34 80240774 00022600 */ sll $a0, $v0, 0x18 -/* 886B38 80240778 00041E03 */ sra $v1, $a0, 0x18 -/* 886B3C 8024077C 00051400 */ sll $v0, $a1, 0x10 -/* 886B40 80240780 00021403 */ sra $v0, $v0, 0x10 -/* 886B44 80240784 0043102A */ slt $v0, $v0, $v1 -/* 886B48 80240788 10400003 */ beqz $v0, .L80240798 -/* 886B4C 8024078C 00000000 */ nop -.L80240790: -/* 886B50 80240790 03E00008 */ jr $ra -/* 886B54 80240794 2402FFFF */ addiu $v0, $zero, -1 -.L80240798: -/* 886B58 80240798 03E00008 */ jr $ra -/* 886B5C 8024079C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s new file mode 100644 index 0000000000..6ccbabdc74 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240754_886B14.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240754_886B14 +/* 886B14 80240754 3C028011 */ lui $v0, %hi(gPlayerData) +/* 886B18 80240758 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 886B1C 8024075C 000420C0 */ sll $a0, $a0, 3 +/* 886B20 80240760 00822021 */ addu $a0, $a0, $v0 +/* 886B24 80240764 90820014 */ lbu $v0, 0x14($a0) +/* 886B28 80240768 10400009 */ beqz $v0, .L80240790 +/* 886B2C 8024076C 00000000 */ nop +/* 886B30 80240770 90820015 */ lbu $v0, 0x15($a0) +/* 886B34 80240774 00022600 */ sll $a0, $v0, 0x18 +/* 886B38 80240778 00041E03 */ sra $v1, $a0, 0x18 +/* 886B3C 8024077C 00051400 */ sll $v0, $a1, 0x10 +/* 886B40 80240780 00021403 */ sra $v0, $v0, 0x10 +/* 886B44 80240784 0043102A */ slt $v0, $v0, $v1 +/* 886B48 80240788 10400003 */ beqz $v0, .L80240798 +/* 886B4C 8024078C 00000000 */ nop +.L80240790: +/* 886B50 80240790 03E00008 */ jr $ra +/* 886B54 80240794 2402FFFF */ addiu $v0, $zero, -1 +.L80240798: +/* 886B58 80240798 03E00008 */ jr $ra +/* 886B5C 8024079C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0.s deleted file mode 100644 index a1d415f7d3..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407A0 -/* 886B60 802407A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 886B64 802407A4 AFB3001C */ sw $s3, 0x1c($sp) -/* 886B68 802407A8 0080982D */ daddu $s3, $a0, $zero -/* 886B6C 802407AC AFB00010 */ sw $s0, 0x10($sp) -/* 886B70 802407B0 24100001 */ addiu $s0, $zero, 1 -/* 886B74 802407B4 AFB40020 */ sw $s4, 0x20($sp) -/* 886B78 802407B8 2414FFFF */ addiu $s4, $zero, -1 -/* 886B7C 802407BC AFB50024 */ sw $s5, 0x24($sp) -/* 886B80 802407C0 0200A82D */ daddu $s5, $s0, $zero -/* 886B84 802407C4 AFB10014 */ sw $s1, 0x14($sp) -/* 886B88 802407C8 3C118011 */ lui $s1, 0x8011 -/* 886B8C 802407CC 2631F298 */ addiu $s1, $s1, -0xd68 -/* 886B90 802407D0 AFBF0028 */ sw $ra, 0x28($sp) -/* 886B94 802407D4 AFB20018 */ sw $s2, 0x18($sp) -/* 886B98 802407D8 8E6200B4 */ lw $v0, 0xb4($s3) -/* 886B9C 802407DC 0280182D */ daddu $v1, $s4, $zero -/* 886BA0 802407E0 AE630084 */ sw $v1, 0x84($s3) -/* 886BA4 802407E4 00021027 */ nor $v0, $zero, $v0 -/* 886BA8 802407E8 000217C2 */ srl $v0, $v0, 0x1f -/* 886BAC 802407EC 00029400 */ sll $s2, $v0, 0x10 -.L802407F0: -/* 886BB0 802407F0 92220014 */ lbu $v0, 0x14($s1) -/* 886BB4 802407F4 50400008 */ beql $v0, $zero, .L80240818 -/* 886BB8 802407F8 26100001 */ addiu $s0, $s0, 1 -/* 886BBC 802407FC 0200202D */ daddu $a0, $s0, $zero -/* 886BC0 80240800 0C0901D5 */ jal func_80240754 -/* 886BC4 80240804 00122C03 */ sra $a1, $s2, 0x10 -/* 886BC8 80240808 10540003 */ beq $v0, $s4, .L80240818 -/* 886BCC 8024080C 26100001 */ addiu $s0, $s0, 1 -/* 886BD0 80240810 08090209 */ j .L80240824 -/* 886BD4 80240814 AE750084 */ sw $s5, 0x84($s3) -.L80240818: -/* 886BD8 80240818 2A02000C */ slti $v0, $s0, 0xc -/* 886BDC 8024081C 1440FFF4 */ bnez $v0, .L802407F0 -/* 886BE0 80240820 26310008 */ addiu $s1, $s1, 8 -.L80240824: -/* 886BE4 80240824 8FBF0028 */ lw $ra, 0x28($sp) -/* 886BE8 80240828 8FB50024 */ lw $s5, 0x24($sp) -/* 886BEC 8024082C 8FB40020 */ lw $s4, 0x20($sp) -/* 886BF0 80240830 8FB3001C */ lw $s3, 0x1c($sp) -/* 886BF4 80240834 8FB20018 */ lw $s2, 0x18($sp) -/* 886BF8 80240838 8FB10014 */ lw $s1, 0x14($sp) -/* 886BFC 8024083C 8FB00010 */ lw $s0, 0x10($sp) -/* 886C00 80240840 24020002 */ addiu $v0, $zero, 2 -/* 886C04 80240844 03E00008 */ jr $ra -/* 886C08 80240848 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s new file mode 100644 index 0000000000..baf65714b0 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407A0_886B60 +/* 886B60 802407A0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 886B64 802407A4 AFB3001C */ sw $s3, 0x1c($sp) +/* 886B68 802407A8 0080982D */ daddu $s3, $a0, $zero +/* 886B6C 802407AC AFB00010 */ sw $s0, 0x10($sp) +/* 886B70 802407B0 24100001 */ addiu $s0, $zero, 1 +/* 886B74 802407B4 AFB40020 */ sw $s4, 0x20($sp) +/* 886B78 802407B8 2414FFFF */ addiu $s4, $zero, -1 +/* 886B7C 802407BC AFB50024 */ sw $s5, 0x24($sp) +/* 886B80 802407C0 0200A82D */ daddu $s5, $s0, $zero +/* 886B84 802407C4 AFB10014 */ sw $s1, 0x14($sp) +/* 886B88 802407C8 3C118011 */ lui $s1, 0x8011 +/* 886B8C 802407CC 2631F298 */ addiu $s1, $s1, -0xd68 +/* 886B90 802407D0 AFBF0028 */ sw $ra, 0x28($sp) +/* 886B94 802407D4 AFB20018 */ sw $s2, 0x18($sp) +/* 886B98 802407D8 8E6200B4 */ lw $v0, 0xb4($s3) +/* 886B9C 802407DC 0280182D */ daddu $v1, $s4, $zero +/* 886BA0 802407E0 AE630084 */ sw $v1, 0x84($s3) +/* 886BA4 802407E4 00021027 */ nor $v0, $zero, $v0 +/* 886BA8 802407E8 000217C2 */ srl $v0, $v0, 0x1f +/* 886BAC 802407EC 00029400 */ sll $s2, $v0, 0x10 +.L802407F0: +/* 886BB0 802407F0 92220014 */ lbu $v0, 0x14($s1) +/* 886BB4 802407F4 50400008 */ beql $v0, $zero, .L80240818 +/* 886BB8 802407F8 26100001 */ addiu $s0, $s0, 1 +/* 886BBC 802407FC 0200202D */ daddu $a0, $s0, $zero +/* 886BC0 80240800 0C0901D5 */ jal func_80240754_886B14 +/* 886BC4 80240804 00122C03 */ sra $a1, $s2, 0x10 +/* 886BC8 80240808 10540003 */ beq $v0, $s4, .L80240818 +/* 886BCC 8024080C 26100001 */ addiu $s0, $s0, 1 +/* 886BD0 80240810 08090209 */ j .L80240824 +/* 886BD4 80240814 AE750084 */ sw $s5, 0x84($s3) +.L80240818: +/* 886BD8 80240818 2A02000C */ slti $v0, $s0, 0xc +/* 886BDC 8024081C 1440FFF4 */ bnez $v0, .L802407F0 +/* 886BE0 80240820 26310008 */ addiu $s1, $s1, 8 +.L80240824: +/* 886BE4 80240824 8FBF0028 */ lw $ra, 0x28($sp) +/* 886BE8 80240828 8FB50024 */ lw $s5, 0x24($sp) +/* 886BEC 8024082C 8FB40020 */ lw $s4, 0x20($sp) +/* 886BF0 80240830 8FB3001C */ lw $s3, 0x1c($sp) +/* 886BF4 80240834 8FB20018 */ lw $s2, 0x18($sp) +/* 886BF8 80240838 8FB10014 */ lw $s1, 0x14($sp) +/* 886BFC 8024083C 8FB00010 */ lw $s0, 0x10($sp) +/* 886C00 80240840 24020002 */ addiu $v0, $zero, 2 +/* 886C04 80240844 03E00008 */ jr $ra +/* 886C08 80240848 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C.s deleted file mode 100644 index 913b120872..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024084C -/* 886C0C 8024084C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 886C10 80240850 AFB5002C */ sw $s5, 0x2c($sp) -/* 886C14 80240854 0080A82D */ daddu $s5, $a0, $zero -/* 886C18 80240858 AFBE0038 */ sw $fp, 0x38($sp) -/* 886C1C 8024085C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 886C20 80240860 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 886C24 80240864 AFBF003C */ sw $ra, 0x3c($sp) -/* 886C28 80240868 AFB70034 */ sw $s7, 0x34($sp) -/* 886C2C 8024086C AFB60030 */ sw $s6, 0x30($sp) -/* 886C30 80240870 AFB40028 */ sw $s4, 0x28($sp) -/* 886C34 80240874 AFB30024 */ sw $s3, 0x24($sp) -/* 886C38 80240878 AFB20020 */ sw $s2, 0x20($sp) -/* 886C3C 8024087C AFB1001C */ sw $s1, 0x1c($sp) -/* 886C40 80240880 10A0004F */ beqz $a1, .L802409C0 -/* 886C44 80240884 AFB00018 */ sw $s0, 0x18($sp) -/* 886C48 80240888 0C00AB39 */ jal heap_malloc -/* 886C4C 8024088C 24040330 */ addiu $a0, $zero, 0x330 -/* 886C50 80240890 0040982D */ daddu $s3, $v0, $zero -/* 886C54 80240894 0000B02D */ daddu $s6, $zero, $zero -/* 886C58 80240898 02C0902D */ daddu $s2, $s6, $zero -/* 886C5C 8024089C 3C148024 */ lui $s4, 0x8024 -/* 886C60 802408A0 26942038 */ addiu $s4, $s4, 0x2038 -/* 886C64 802408A4 0260882D */ daddu $s1, $s3, $zero -/* 886C68 802408A8 8EA200B4 */ lw $v0, 0xb4($s5) -/* 886C6C 802408AC 3C038024 */ lui $v1, 0x8024 -/* 886C70 802408B0 24632030 */ addiu $v1, $v1, 0x2030 -/* 886C74 802408B4 AEB30078 */ sw $s3, 0x78($s5) -/* 886C78 802408B8 00021027 */ nor $v0, $zero, $v0 -/* 886C7C 802408BC 0002BFC2 */ srl $s7, $v0, 0x1f -/* 886C80 802408C0 00171080 */ sll $v0, $s7, 2 -/* 886C84 802408C4 00431021 */ addu $v0, $v0, $v1 -/* 886C88 802408C8 AFA20010 */ sw $v0, 0x10($sp) -.L802408CC: -/* 886C8C 802408CC 86900000 */ lh $s0, ($s4) -/* 886C90 802408D0 001010C0 */ sll $v0, $s0, 3 -/* 886C94 802408D4 03C21021 */ addu $v0, $fp, $v0 -/* 886C98 802408D8 90420014 */ lbu $v0, 0x14($v0) -/* 886C9C 802408DC 5040002E */ beql $v0, $zero, .L80240998 -/* 886CA0 802408E0 26520001 */ addiu $s2, $s2, 1 -/* 886CA4 802408E4 00101100 */ sll $v0, $s0, 4 -/* 886CA8 802408E8 3C068009 */ lui $a2, 0x8009 -/* 886CAC 802408EC 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* 886CB0 802408F0 00461021 */ addu $v0, $v0, $a2 -/* 886CB4 802408F4 0200202D */ daddu $a0, $s0, $zero -/* 886CB8 802408F8 AE300108 */ sw $s0, 0x108($s1) -/* 886CBC 802408FC 8C420000 */ lw $v0, ($v0) -/* 886CC0 80240900 02E0282D */ daddu $a1, $s7, $zero -/* 886CC4 80240904 0C0901D5 */ jal func_80240754 -/* 886CC8 80240908 AE220084 */ sw $v0, 0x84($s1) -/* 886CCC 8024090C 0040202D */ daddu $a0, $v0, $zero -/* 886CD0 80240910 04800011 */ bltz $a0, .L80240958 -/* 886CD4 80240914 00101080 */ sll $v0, $s0, 2 -/* 886CD8 80240918 3C06800F */ lui $a2, 0x800f -/* 886CDC 8024091C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* 886CE0 80240920 00461021 */ addu $v0, $v0, $a2 -/* 886CE4 80240924 8C430000 */ lw $v1, ($v0) -/* 886CE8 80240928 24020001 */ addiu $v0, $zero, 1 -/* 886CEC 8024092C AE22018C */ sw $v0, 0x18c($s1) -/* 886CF0 80240930 00041080 */ sll $v0, $a0, 2 -/* 886CF4 80240934 3C068024 */ lui $a2, 0x8024 -/* 886CF8 80240938 24C62048 */ addiu $a2, $a2, 0x2048 -/* 886CFC 8024093C AE230000 */ sw $v1, ($s1) -/* 886D00 80240940 001218C0 */ sll $v1, $s2, 3 -/* 886D04 80240944 00431021 */ addu $v0, $v0, $v1 -/* 886D08 80240948 00461021 */ addu $v0, $v0, $a2 -/* 886D0C 8024094C 8C420000 */ lw $v0, ($v0) -/* 886D10 80240950 0809025F */ j .L8024097C -/* 886D14 80240954 AE220294 */ sw $v0, 0x294($s1) -.L80240958: -/* 886D18 80240958 3C06800F */ lui $a2, 0x800f -/* 886D1C 8024095C 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* 886D20 80240960 00461021 */ addu $v0, $v0, $a2 -/* 886D24 80240964 8C420000 */ lw $v0, ($v0) -/* 886D28 80240968 AE20018C */ sw $zero, 0x18c($s1) -/* 886D2C 8024096C AE220000 */ sw $v0, ($s1) -/* 886D30 80240970 8FA60010 */ lw $a2, 0x10($sp) -/* 886D34 80240974 8CC20000 */ lw $v0, ($a2) -/* 886D38 80240978 AE220294 */ sw $v0, 0x294($s1) -.L8024097C: -/* 886D3C 8024097C 001010C0 */ sll $v0, $s0, 3 -/* 886D40 80240980 03C21021 */ addu $v0, $fp, $v0 -/* 886D44 80240984 80420015 */ lb $v0, 0x15($v0) -/* 886D48 80240988 26D60001 */ addiu $s6, $s6, 1 -/* 886D4C 8024098C AE220210 */ sw $v0, 0x210($s1) -/* 886D50 80240990 26310004 */ addiu $s1, $s1, 4 -/* 886D54 80240994 26520001 */ addiu $s2, $s2, 1 -.L80240998: -/* 886D58 80240998 2A420008 */ slti $v0, $s2, 8 -/* 886D5C 8024099C 1440FFCB */ bnez $v0, .L802408CC -/* 886D60 802409A0 26940002 */ addiu $s4, $s4, 2 -/* 886D64 802409A4 0260202D */ daddu $a0, $s3, $zero -/* 886D68 802409A8 24020004 */ addiu $v0, $zero, 4 -/* 886D6C 802409AC AC820318 */ sw $v0, 0x318($a0) -/* 886D70 802409B0 AC960324 */ sw $s6, 0x324($a0) -/* 886D74 802409B4 0C03D390 */ jal func_800F4E40 -/* 886D78 802409B8 AC800328 */ sw $zero, 0x328($a0) -/* 886D7C 802409BC AEA00070 */ sw $zero, 0x70($s5) -.L802409C0: -/* 886D80 802409C0 8EA20070 */ lw $v0, 0x70($s5) -/* 886D84 802409C4 8EB30078 */ lw $s3, 0x78($s5) -/* 886D88 802409C8 14400008 */ bnez $v0, .L802409EC -/* 886D8C 802409CC 24420001 */ addiu $v0, $v0, 1 -/* 886D90 802409D0 8662032C */ lh $v0, 0x32c($s3) -/* 886D94 802409D4 10400009 */ beqz $v0, .L802409FC -/* 886D98 802409D8 AEA20074 */ sw $v0, 0x74($s5) -/* 886D9C 802409DC 0C03C4EC */ jal func_800F13B0 -/* 886DA0 802409E0 00000000 */ nop -/* 886DA4 802409E4 8EA20070 */ lw $v0, 0x70($s5) -/* 886DA8 802409E8 24420001 */ addiu $v0, $v0, 1 -.L802409EC: -/* 886DAC 802409EC AEA20070 */ sw $v0, 0x70($s5) -/* 886DB0 802409F0 2842000F */ slti $v0, $v0, 0xf -/* 886DB4 802409F4 10400003 */ beqz $v0, .L80240A04 -/* 886DB8 802409F8 00000000 */ nop -.L802409FC: -/* 886DBC 802409FC 0809029B */ j .L80240A6C -/* 886DC0 80240A00 0000102D */ daddu $v0, $zero, $zero -.L80240A04: -/* 886DC4 80240A04 0C03C54E */ jal func_800F1538 -/* 886DC8 80240A08 00000000 */ nop -/* 886DCC 80240A0C 8EA30074 */ lw $v1, 0x74($s5) -/* 886DD0 80240A10 240200FF */ addiu $v0, $zero, 0xff -/* 886DD4 80240A14 10620010 */ beq $v1, $v0, .L80240A58 -/* 886DD8 80240A18 2462FFFF */ addiu $v0, $v1, -1 -/* 886DDC 80240A1C 00021080 */ sll $v0, $v0, 2 -/* 886DE0 80240A20 02621021 */ addu $v0, $s3, $v0 -/* 886DE4 80240A24 8C420108 */ lw $v0, 0x108($v0) -/* 886DE8 80240A28 00021100 */ sll $v0, $v0, 4 -/* 886DEC 80240A2C 3C038009 */ lui $v1, 0x8009 -/* 886DF0 80240A30 00621821 */ addu $v1, $v1, $v0 -/* 886DF4 80240A34 8C63EF20 */ lw $v1, -0x10e0($v1) -/* 886DF8 80240A38 8EA20074 */ lw $v0, 0x74($s5) -/* 886DFC 80240A3C 2442FFFF */ addiu $v0, $v0, -1 -/* 886E00 80240A40 00021080 */ sll $v0, $v0, 2 -/* 886E04 80240A44 02621021 */ addu $v0, $s3, $v0 -/* 886E08 80240A48 AEA30084 */ sw $v1, 0x84($s5) -/* 886E0C 80240A4C 8C420108 */ lw $v0, 0x108($v0) -/* 886E10 80240A50 08090298 */ j .L80240A60 -/* 886E14 80240A54 AEA20088 */ sw $v0, 0x88($s5) -.L80240A58: -/* 886E18 80240A58 2402FFFF */ addiu $v0, $zero, -1 -/* 886E1C 80240A5C AEA20084 */ sw $v0, 0x84($s5) -.L80240A60: -/* 886E20 80240A60 0C00AB4B */ jal heap_free -/* 886E24 80240A64 8EA40078 */ lw $a0, 0x78($s5) -/* 886E28 80240A68 24020002 */ addiu $v0, $zero, 2 -.L80240A6C: -/* 886E2C 80240A6C 8FBF003C */ lw $ra, 0x3c($sp) -/* 886E30 80240A70 8FBE0038 */ lw $fp, 0x38($sp) -/* 886E34 80240A74 8FB70034 */ lw $s7, 0x34($sp) -/* 886E38 80240A78 8FB60030 */ lw $s6, 0x30($sp) -/* 886E3C 80240A7C 8FB5002C */ lw $s5, 0x2c($sp) -/* 886E40 80240A80 8FB40028 */ lw $s4, 0x28($sp) -/* 886E44 80240A84 8FB30024 */ lw $s3, 0x24($sp) -/* 886E48 80240A88 8FB20020 */ lw $s2, 0x20($sp) -/* 886E4C 80240A8C 8FB1001C */ lw $s1, 0x1c($sp) -/* 886E50 80240A90 8FB00018 */ lw $s0, 0x18($sp) -/* 886E54 80240A94 03E00008 */ jr $ra -/* 886E58 80240A98 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s new file mode 100644 index 0000000000..99f3a59b93 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_8024084C_886C0C.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024084C_886C0C +/* 886C0C 8024084C 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 886C10 80240850 AFB5002C */ sw $s5, 0x2c($sp) +/* 886C14 80240854 0080A82D */ daddu $s5, $a0, $zero +/* 886C18 80240858 AFBE0038 */ sw $fp, 0x38($sp) +/* 886C1C 8024085C 3C1E8011 */ lui $fp, %hi(gPlayerData) +/* 886C20 80240860 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) +/* 886C24 80240864 AFBF003C */ sw $ra, 0x3c($sp) +/* 886C28 80240868 AFB70034 */ sw $s7, 0x34($sp) +/* 886C2C 8024086C AFB60030 */ sw $s6, 0x30($sp) +/* 886C30 80240870 AFB40028 */ sw $s4, 0x28($sp) +/* 886C34 80240874 AFB30024 */ sw $s3, 0x24($sp) +/* 886C38 80240878 AFB20020 */ sw $s2, 0x20($sp) +/* 886C3C 8024087C AFB1001C */ sw $s1, 0x1c($sp) +/* 886C40 80240880 10A0004F */ beqz $a1, .L802409C0 +/* 886C44 80240884 AFB00018 */ sw $s0, 0x18($sp) +/* 886C48 80240888 0C00AB39 */ jal heap_malloc +/* 886C4C 8024088C 24040330 */ addiu $a0, $zero, 0x330 +/* 886C50 80240890 0040982D */ daddu $s3, $v0, $zero +/* 886C54 80240894 0000B02D */ daddu $s6, $zero, $zero +/* 886C58 80240898 02C0902D */ daddu $s2, $s6, $zero +/* 886C5C 8024089C 3C148024 */ lui $s4, 0x8024 +/* 886C60 802408A0 26942038 */ addiu $s4, $s4, 0x2038 +/* 886C64 802408A4 0260882D */ daddu $s1, $s3, $zero +/* 886C68 802408A8 8EA200B4 */ lw $v0, 0xb4($s5) +/* 886C6C 802408AC 3C038024 */ lui $v1, 0x8024 +/* 886C70 802408B0 24632030 */ addiu $v1, $v1, 0x2030 +/* 886C74 802408B4 AEB30078 */ sw $s3, 0x78($s5) +/* 886C78 802408B8 00021027 */ nor $v0, $zero, $v0 +/* 886C7C 802408BC 0002BFC2 */ srl $s7, $v0, 0x1f +/* 886C80 802408C0 00171080 */ sll $v0, $s7, 2 +/* 886C84 802408C4 00431021 */ addu $v0, $v0, $v1 +/* 886C88 802408C8 AFA20010 */ sw $v0, 0x10($sp) +.L802408CC: +/* 886C8C 802408CC 86900000 */ lh $s0, ($s4) +/* 886C90 802408D0 001010C0 */ sll $v0, $s0, 3 +/* 886C94 802408D4 03C21021 */ addu $v0, $fp, $v0 +/* 886C98 802408D8 90420014 */ lbu $v0, 0x14($v0) +/* 886C9C 802408DC 5040002E */ beql $v0, $zero, .L80240998 +/* 886CA0 802408E0 26520001 */ addiu $s2, $s2, 1 +/* 886CA4 802408E4 00101100 */ sll $v0, $s0, 4 +/* 886CA8 802408E8 3C068009 */ lui $a2, 0x8009 +/* 886CAC 802408EC 24C6EF20 */ addiu $a2, $a2, -0x10e0 +/* 886CB0 802408F0 00461021 */ addu $v0, $v0, $a2 +/* 886CB4 802408F4 0200202D */ daddu $a0, $s0, $zero +/* 886CB8 802408F8 AE300108 */ sw $s0, 0x108($s1) +/* 886CBC 802408FC 8C420000 */ lw $v0, ($v0) +/* 886CC0 80240900 02E0282D */ daddu $a1, $s7, $zero +/* 886CC4 80240904 0C0901D5 */ jal func_80240754_886B14 +/* 886CC8 80240908 AE220084 */ sw $v0, 0x84($s1) +/* 886CCC 8024090C 0040202D */ daddu $a0, $v0, $zero +/* 886CD0 80240910 04800011 */ bltz $a0, .L80240958 +/* 886CD4 80240914 00101080 */ sll $v0, $s0, 2 +/* 886CD8 80240918 3C06800F */ lui $a2, 0x800f +/* 886CDC 8024091C 24C67F00 */ addiu $a2, $a2, 0x7f00 +/* 886CE0 80240920 00461021 */ addu $v0, $v0, $a2 +/* 886CE4 80240924 8C430000 */ lw $v1, ($v0) +/* 886CE8 80240928 24020001 */ addiu $v0, $zero, 1 +/* 886CEC 8024092C AE22018C */ sw $v0, 0x18c($s1) +/* 886CF0 80240930 00041080 */ sll $v0, $a0, 2 +/* 886CF4 80240934 3C068024 */ lui $a2, 0x8024 +/* 886CF8 80240938 24C62048 */ addiu $a2, $a2, 0x2048 +/* 886CFC 8024093C AE230000 */ sw $v1, ($s1) +/* 886D00 80240940 001218C0 */ sll $v1, $s2, 3 +/* 886D04 80240944 00431021 */ addu $v0, $v0, $v1 +/* 886D08 80240948 00461021 */ addu $v0, $v0, $a2 +/* 886D0C 8024094C 8C420000 */ lw $v0, ($v0) +/* 886D10 80240950 0809025F */ j .L8024097C +/* 886D14 80240954 AE220294 */ sw $v0, 0x294($s1) +.L80240958: +/* 886D18 80240958 3C06800F */ lui $a2, 0x800f +/* 886D1C 8024095C 24C67F40 */ addiu $a2, $a2, 0x7f40 +/* 886D20 80240960 00461021 */ addu $v0, $v0, $a2 +/* 886D24 80240964 8C420000 */ lw $v0, ($v0) +/* 886D28 80240968 AE20018C */ sw $zero, 0x18c($s1) +/* 886D2C 8024096C AE220000 */ sw $v0, ($s1) +/* 886D30 80240970 8FA60010 */ lw $a2, 0x10($sp) +/* 886D34 80240974 8CC20000 */ lw $v0, ($a2) +/* 886D38 80240978 AE220294 */ sw $v0, 0x294($s1) +.L8024097C: +/* 886D3C 8024097C 001010C0 */ sll $v0, $s0, 3 +/* 886D40 80240980 03C21021 */ addu $v0, $fp, $v0 +/* 886D44 80240984 80420015 */ lb $v0, 0x15($v0) +/* 886D48 80240988 26D60001 */ addiu $s6, $s6, 1 +/* 886D4C 8024098C AE220210 */ sw $v0, 0x210($s1) +/* 886D50 80240990 26310004 */ addiu $s1, $s1, 4 +/* 886D54 80240994 26520001 */ addiu $s2, $s2, 1 +.L80240998: +/* 886D58 80240998 2A420008 */ slti $v0, $s2, 8 +/* 886D5C 8024099C 1440FFCB */ bnez $v0, .L802408CC +/* 886D60 802409A0 26940002 */ addiu $s4, $s4, 2 +/* 886D64 802409A4 0260202D */ daddu $a0, $s3, $zero +/* 886D68 802409A8 24020004 */ addiu $v0, $zero, 4 +/* 886D6C 802409AC AC820318 */ sw $v0, 0x318($a0) +/* 886D70 802409B0 AC960324 */ sw $s6, 0x324($a0) +/* 886D74 802409B4 0C03D390 */ jal func_800F4E40 +/* 886D78 802409B8 AC800328 */ sw $zero, 0x328($a0) +/* 886D7C 802409BC AEA00070 */ sw $zero, 0x70($s5) +.L802409C0: +/* 886D80 802409C0 8EA20070 */ lw $v0, 0x70($s5) +/* 886D84 802409C4 8EB30078 */ lw $s3, 0x78($s5) +/* 886D88 802409C8 14400008 */ bnez $v0, .L802409EC +/* 886D8C 802409CC 24420001 */ addiu $v0, $v0, 1 +/* 886D90 802409D0 8662032C */ lh $v0, 0x32c($s3) +/* 886D94 802409D4 10400009 */ beqz $v0, .L802409FC +/* 886D98 802409D8 AEA20074 */ sw $v0, 0x74($s5) +/* 886D9C 802409DC 0C03C4EC */ jal func_800F13B0 +/* 886DA0 802409E0 00000000 */ nop +/* 886DA4 802409E4 8EA20070 */ lw $v0, 0x70($s5) +/* 886DA8 802409E8 24420001 */ addiu $v0, $v0, 1 +.L802409EC: +/* 886DAC 802409EC AEA20070 */ sw $v0, 0x70($s5) +/* 886DB0 802409F0 2842000F */ slti $v0, $v0, 0xf +/* 886DB4 802409F4 10400003 */ beqz $v0, .L80240A04 +/* 886DB8 802409F8 00000000 */ nop +.L802409FC: +/* 886DBC 802409FC 0809029B */ j .L80240A6C +/* 886DC0 80240A00 0000102D */ daddu $v0, $zero, $zero +.L80240A04: +/* 886DC4 80240A04 0C03C54E */ jal func_800F1538 +/* 886DC8 80240A08 00000000 */ nop +/* 886DCC 80240A0C 8EA30074 */ lw $v1, 0x74($s5) +/* 886DD0 80240A10 240200FF */ addiu $v0, $zero, 0xff +/* 886DD4 80240A14 10620010 */ beq $v1, $v0, .L80240A58 +/* 886DD8 80240A18 2462FFFF */ addiu $v0, $v1, -1 +/* 886DDC 80240A1C 00021080 */ sll $v0, $v0, 2 +/* 886DE0 80240A20 02621021 */ addu $v0, $s3, $v0 +/* 886DE4 80240A24 8C420108 */ lw $v0, 0x108($v0) +/* 886DE8 80240A28 00021100 */ sll $v0, $v0, 4 +/* 886DEC 80240A2C 3C038009 */ lui $v1, 0x8009 +/* 886DF0 80240A30 00621821 */ addu $v1, $v1, $v0 +/* 886DF4 80240A34 8C63EF20 */ lw $v1, -0x10e0($v1) +/* 886DF8 80240A38 8EA20074 */ lw $v0, 0x74($s5) +/* 886DFC 80240A3C 2442FFFF */ addiu $v0, $v0, -1 +/* 886E00 80240A40 00021080 */ sll $v0, $v0, 2 +/* 886E04 80240A44 02621021 */ addu $v0, $s3, $v0 +/* 886E08 80240A48 AEA30084 */ sw $v1, 0x84($s5) +/* 886E0C 80240A4C 8C420108 */ lw $v0, 0x108($v0) +/* 886E10 80240A50 08090298 */ j .L80240A60 +/* 886E14 80240A54 AEA20088 */ sw $v0, 0x88($s5) +.L80240A58: +/* 886E18 80240A58 2402FFFF */ addiu $v0, $zero, -1 +/* 886E1C 80240A5C AEA20084 */ sw $v0, 0x84($s5) +.L80240A60: +/* 886E20 80240A60 0C00AB4B */ jal heap_free +/* 886E24 80240A64 8EA40078 */ lw $a0, 0x78($s5) +/* 886E28 80240A68 24020002 */ addiu $v0, $zero, 2 +.L80240A6C: +/* 886E2C 80240A6C 8FBF003C */ lw $ra, 0x3c($sp) +/* 886E30 80240A70 8FBE0038 */ lw $fp, 0x38($sp) +/* 886E34 80240A74 8FB70034 */ lw $s7, 0x34($sp) +/* 886E38 80240A78 8FB60030 */ lw $s6, 0x30($sp) +/* 886E3C 80240A7C 8FB5002C */ lw $s5, 0x2c($sp) +/* 886E40 80240A80 8FB40028 */ lw $s4, 0x28($sp) +/* 886E44 80240A84 8FB30024 */ lw $s3, 0x24($sp) +/* 886E48 80240A88 8FB20020 */ lw $s2, 0x20($sp) +/* 886E4C 80240A8C 8FB1001C */ lw $s1, 0x1c($sp) +/* 886E50 80240A90 8FB00018 */ lw $s0, 0x18($sp) +/* 886E54 80240A94 03E00008 */ jr $ra +/* 886E58 80240A98 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C.s deleted file mode 100644 index 182ea0cfb1..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A9C -/* 886E5C 80240A9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 886E60 80240AA0 AFBF0010 */ sw $ra, 0x10($sp) -/* 886E64 80240AA4 8C82000C */ lw $v0, 0xc($a0) -/* 886E68 80240AA8 0C0B1EAF */ jal get_variable -/* 886E6C 80240AAC 8C450000 */ lw $a1, ($v0) -/* 886E70 80240AB0 0C03AC5A */ jal func_800EB168 -/* 886E74 80240AB4 0040202D */ daddu $a0, $v0, $zero -/* 886E78 80240AB8 8FBF0010 */ lw $ra, 0x10($sp) -/* 886E7C 80240ABC 24020002 */ addiu $v0, $zero, 2 -/* 886E80 80240AC0 03E00008 */ jr $ra -/* 886E84 80240AC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C_886E5C.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C_886E5C.s new file mode 100644 index 0000000000..1494856dbc --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240A9C_886E5C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A9C_886E5C +/* 886E5C 80240A9C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 886E60 80240AA0 AFBF0010 */ sw $ra, 0x10($sp) +/* 886E64 80240AA4 8C82000C */ lw $v0, 0xc($a0) +/* 886E68 80240AA8 0C0B1EAF */ jal get_variable +/* 886E6C 80240AAC 8C450000 */ lw $a1, ($v0) +/* 886E70 80240AB0 0C03AC5A */ jal func_800EB168 +/* 886E74 80240AB4 0040202D */ daddu $a0, $v0, $zero +/* 886E78 80240AB8 8FBF0010 */ lw $ra, 0x10($sp) +/* 886E7C 80240ABC 24020002 */ addiu $v0, $zero, 2 +/* 886E80 80240AC0 03E00008 */ jr $ra +/* 886E84 80240AC4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8.s deleted file mode 100644 index 7b4c785c02..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AC8 -/* 886E88 80240AC8 3C028011 */ lui $v0, 0x8011 -/* 886E8C 80240ACC 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 886E90 80240AD0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 886E94 80240AD4 AFBF0010 */ sw $ra, 0x10($sp) -/* 886E98 80240AD8 00021100 */ sll $v0, $v0, 4 -/* 886E9C 80240ADC 3C048009 */ lui $a0, 0x8009 -/* 886EA0 80240AE0 00822021 */ addu $a0, $a0, $v0 -/* 886EA4 80240AE4 8C84EF20 */ lw $a0, -0x10e0($a0) -/* 886EA8 80240AE8 0C0496CF */ jal set_message_string -/* 886EAC 80240AEC 0000282D */ daddu $a1, $zero, $zero -/* 886EB0 80240AF0 8FBF0010 */ lw $ra, 0x10($sp) -/* 886EB4 80240AF4 24020002 */ addiu $v0, $zero, 2 -/* 886EB8 80240AF8 03E00008 */ jr $ra -/* 886EBC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s new file mode 100644 index 0000000000..ccdcc41a3c --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AC8_886E88 +/* 886E88 80240AC8 3C028011 */ lui $v0, 0x8011 +/* 886E8C 80240ACC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 886E90 80240AD0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 886E94 80240AD4 AFBF0010 */ sw $ra, 0x10($sp) +/* 886E98 80240AD8 00021100 */ sll $v0, $v0, 4 +/* 886E9C 80240ADC 3C048009 */ lui $a0, 0x8009 +/* 886EA0 80240AE0 00822021 */ addu $a0, $a0, $v0 +/* 886EA4 80240AE4 8C84EF20 */ lw $a0, -0x10e0($a0) +/* 886EA8 80240AE8 0C0496CF */ jal set_message_string +/* 886EAC 80240AEC 0000282D */ daddu $a1, $zero, $zero +/* 886EB0 80240AF0 8FBF0010 */ lw $ra, 0x10($sp) +/* 886EB4 80240AF4 24020002 */ addiu $v0, $zero, 2 +/* 886EB8 80240AF8 03E00008 */ jr $ra +/* 886EBC 80240AFC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00.s deleted file mode 100644 index 884b8210b6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B00 -/* 886EC0 80240B00 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 886EC4 80240B04 AFB1001C */ sw $s1, 0x1c($sp) -/* 886EC8 80240B08 0080882D */ daddu $s1, $a0, $zero -/* 886ECC 80240B0C AFBF0020 */ sw $ra, 0x20($sp) -/* 886ED0 80240B10 AFB00018 */ sw $s0, 0x18($sp) -/* 886ED4 80240B14 8E30000C */ lw $s0, 0xc($s1) -/* 886ED8 80240B18 8E050000 */ lw $a1, ($s0) -/* 886EDC 80240B1C 0C0B1EAF */ jal get_variable -/* 886EE0 80240B20 26100004 */ addiu $s0, $s0, 4 -/* 886EE4 80240B24 0C04417A */ jal get_entity_by_index -/* 886EE8 80240B28 0040202D */ daddu $a0, $v0, $zero -/* 886EEC 80240B2C 8E100000 */ lw $s0, ($s0) -/* 886EF0 80240B30 C444004C */ lwc1 $f4, 0x4c($v0) -/* 886EF4 80240B34 3C014148 */ lui $at, 0x4148 -/* 886EF8 80240B38 44810000 */ mtc1 $at, $f0 -/* 886EFC 80240B3C 3C013F33 */ lui $at, 0x3f33 -/* 886F00 80240B40 34213333 */ ori $at, $at, 0x3333 -/* 886F04 80240B44 44811000 */ mtc1 $at, $f2 -/* 886F08 80240B48 AFA00014 */ sw $zero, 0x14($sp) -/* 886F0C 80240B4C 46002100 */ add.s $f4, $f4, $f0 -/* 886F10 80240B50 E7A20010 */ swc1 $f2, 0x10($sp) -/* 886F14 80240B54 8C450048 */ lw $a1, 0x48($v0) -/* 886F18 80240B58 8C470050 */ lw $a3, 0x50($v0) -/* 886F1C 80240B5C 44062000 */ mfc1 $a2, $f4 -/* 886F20 80240B60 0C01C5D4 */ jal func_80071750 -/* 886F24 80240B64 0000202D */ daddu $a0, $zero, $zero -/* 886F28 80240B68 0220202D */ daddu $a0, $s1, $zero -/* 886F2C 80240B6C 0200282D */ daddu $a1, $s0, $zero -/* 886F30 80240B70 0C0B2026 */ jal set_variable -/* 886F34 80240B74 0040302D */ daddu $a2, $v0, $zero -/* 886F38 80240B78 8FBF0020 */ lw $ra, 0x20($sp) -/* 886F3C 80240B7C 8FB1001C */ lw $s1, 0x1c($sp) -/* 886F40 80240B80 8FB00018 */ lw $s0, 0x18($sp) -/* 886F44 80240B84 24020002 */ addiu $v0, $zero, 2 -/* 886F48 80240B88 03E00008 */ jr $ra -/* 886F4C 80240B8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00_886EC0.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00_886EC0.s new file mode 100644 index 0000000000..9a733e1265 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B00_886EC0.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B00_886EC0 +/* 886EC0 80240B00 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 886EC4 80240B04 AFB1001C */ sw $s1, 0x1c($sp) +/* 886EC8 80240B08 0080882D */ daddu $s1, $a0, $zero +/* 886ECC 80240B0C AFBF0020 */ sw $ra, 0x20($sp) +/* 886ED0 80240B10 AFB00018 */ sw $s0, 0x18($sp) +/* 886ED4 80240B14 8E30000C */ lw $s0, 0xc($s1) +/* 886ED8 80240B18 8E050000 */ lw $a1, ($s0) +/* 886EDC 80240B1C 0C0B1EAF */ jal get_variable +/* 886EE0 80240B20 26100004 */ addiu $s0, $s0, 4 +/* 886EE4 80240B24 0C04417A */ jal get_entity_by_index +/* 886EE8 80240B28 0040202D */ daddu $a0, $v0, $zero +/* 886EEC 80240B2C 8E100000 */ lw $s0, ($s0) +/* 886EF0 80240B30 C444004C */ lwc1 $f4, 0x4c($v0) +/* 886EF4 80240B34 3C014148 */ lui $at, 0x4148 +/* 886EF8 80240B38 44810000 */ mtc1 $at, $f0 +/* 886EFC 80240B3C 3C013F33 */ lui $at, 0x3f33 +/* 886F00 80240B40 34213333 */ ori $at, $at, 0x3333 +/* 886F04 80240B44 44811000 */ mtc1 $at, $f2 +/* 886F08 80240B48 AFA00014 */ sw $zero, 0x14($sp) +/* 886F0C 80240B4C 46002100 */ add.s $f4, $f4, $f0 +/* 886F10 80240B50 E7A20010 */ swc1 $f2, 0x10($sp) +/* 886F14 80240B54 8C450048 */ lw $a1, 0x48($v0) +/* 886F18 80240B58 8C470050 */ lw $a3, 0x50($v0) +/* 886F1C 80240B5C 44062000 */ mfc1 $a2, $f4 +/* 886F20 80240B60 0C01C5D4 */ jal func_80071750 +/* 886F24 80240B64 0000202D */ daddu $a0, $zero, $zero +/* 886F28 80240B68 0220202D */ daddu $a0, $s1, $zero +/* 886F2C 80240B6C 0200282D */ daddu $a1, $s0, $zero +/* 886F30 80240B70 0C0B2026 */ jal set_variable +/* 886F34 80240B74 0040302D */ daddu $a2, $v0, $zero +/* 886F38 80240B78 8FBF0020 */ lw $ra, 0x20($sp) +/* 886F3C 80240B7C 8FB1001C */ lw $s1, 0x1c($sp) +/* 886F40 80240B80 8FB00018 */ lw $s0, 0x18($sp) +/* 886F44 80240B84 24020002 */ addiu $v0, $zero, 2 +/* 886F48 80240B88 03E00008 */ jr $ra +/* 886F4C 80240B8C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B90.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B90.s deleted file mode 100644 index 9732576604..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B90.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B90 -/* 886F50 80240B90 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 886F54 80240B94 AFBF0010 */ sw $ra, 0x10($sp) -/* 886F58 80240B98 8C82000C */ lw $v0, 0xc($a0) -/* 886F5C 80240B9C 0C0B1EAF */ jal get_variable -/* 886F60 80240BA0 8C450000 */ lw $a1, ($v0) -/* 886F64 80240BA4 0040202D */ daddu $a0, $v0, $zero -/* 886F68 80240BA8 8C830000 */ lw $v1, ($a0) -/* 886F6C 80240BAC 34630010 */ ori $v1, $v1, 0x10 -/* 886F70 80240BB0 AC830000 */ sw $v1, ($a0) -/* 886F74 80240BB4 8FBF0010 */ lw $ra, 0x10($sp) -/* 886F78 80240BB8 24020002 */ addiu $v0, $zero, 2 -/* 886F7C 80240BBC 03E00008 */ jr $ra -/* 886F80 80240BC0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B90_886F50.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B90_886F50.s new file mode 100644 index 0000000000..219df6bd7e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240B90_886F50.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B90_886F50 +/* 886F50 80240B90 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 886F54 80240B94 AFBF0010 */ sw $ra, 0x10($sp) +/* 886F58 80240B98 8C82000C */ lw $v0, 0xc($a0) +/* 886F5C 80240B9C 0C0B1EAF */ jal get_variable +/* 886F60 80240BA0 8C450000 */ lw $a1, ($v0) +/* 886F64 80240BA4 0040202D */ daddu $a0, $v0, $zero +/* 886F68 80240BA8 8C830000 */ lw $v1, ($a0) +/* 886F6C 80240BAC 34630010 */ ori $v1, $v1, 0x10 +/* 886F70 80240BB0 AC830000 */ sw $v1, ($a0) +/* 886F74 80240BB4 8FBF0010 */ lw $ra, 0x10($sp) +/* 886F78 80240BB8 24020002 */ addiu $v0, $zero, 2 +/* 886F7C 80240BBC 03E00008 */ jr $ra +/* 886F80 80240BC0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4.s deleted file mode 100644 index 055a385c07..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BC4 -/* 886F84 80240BC4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 886F88 80240BC8 AFBF0018 */ sw $ra, 0x18($sp) -/* 886F8C 80240BCC 8C82000C */ lw $v0, 0xc($a0) -/* 886F90 80240BD0 0C0B1EAF */ jal get_variable -/* 886F94 80240BD4 8C450000 */ lw $a1, ($v0) -/* 886F98 80240BD8 0C04417A */ jal get_entity_by_index -/* 886F9C 80240BDC 0040202D */ daddu $a0, $v0, $zero -/* 886FA0 80240BE0 3C013F80 */ lui $at, 0x3f80 -/* 886FA4 80240BE4 44810000 */ mtc1 $at, $f0 -/* 886FA8 80240BE8 C442004C */ lwc1 $f2, 0x4c($v0) -/* 886FAC 80240BEC E7A00010 */ swc1 $f0, 0x10($sp) -/* 886FB0 80240BF0 3C014148 */ lui $at, 0x4148 -/* 886FB4 80240BF4 44810000 */ mtc1 $at, $f0 -/* 886FB8 80240BF8 2403004B */ addiu $v1, $zero, 0x4b -/* 886FBC 80240BFC AFA30014 */ sw $v1, 0x14($sp) -/* 886FC0 80240C00 46001080 */ add.s $f2, $f2, $f0 -/* 886FC4 80240C04 8C450048 */ lw $a1, 0x48($v0) -/* 886FC8 80240C08 8C470050 */ lw $a3, 0x50($v0) -/* 886FCC 80240C0C 44061000 */ mfc1 $a2, $f2 -/* 886FD0 80240C10 0C01C2EC */ jal func_80070BB0 -/* 886FD4 80240C14 24040004 */ addiu $a0, $zero, 4 -/* 886FD8 80240C18 8FBF0018 */ lw $ra, 0x18($sp) -/* 886FDC 80240C1C 24020002 */ addiu $v0, $zero, 2 -/* 886FE0 80240C20 03E00008 */ jr $ra -/* 886FE4 80240C24 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4_886F84.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4_886F84.s new file mode 100644 index 0000000000..a0820f26e1 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240BC4_886F84.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BC4_886F84 +/* 886F84 80240BC4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 886F88 80240BC8 AFBF0018 */ sw $ra, 0x18($sp) +/* 886F8C 80240BCC 8C82000C */ lw $v0, 0xc($a0) +/* 886F90 80240BD0 0C0B1EAF */ jal get_variable +/* 886F94 80240BD4 8C450000 */ lw $a1, ($v0) +/* 886F98 80240BD8 0C04417A */ jal get_entity_by_index +/* 886F9C 80240BDC 0040202D */ daddu $a0, $v0, $zero +/* 886FA0 80240BE0 3C013F80 */ lui $at, 0x3f80 +/* 886FA4 80240BE4 44810000 */ mtc1 $at, $f0 +/* 886FA8 80240BE8 C442004C */ lwc1 $f2, 0x4c($v0) +/* 886FAC 80240BEC E7A00010 */ swc1 $f0, 0x10($sp) +/* 886FB0 80240BF0 3C014148 */ lui $at, 0x4148 +/* 886FB4 80240BF4 44810000 */ mtc1 $at, $f0 +/* 886FB8 80240BF8 2403004B */ addiu $v1, $zero, 0x4b +/* 886FBC 80240BFC AFA30014 */ sw $v1, 0x14($sp) +/* 886FC0 80240C00 46001080 */ add.s $f2, $f2, $f0 +/* 886FC4 80240C04 8C450048 */ lw $a1, 0x48($v0) +/* 886FC8 80240C08 8C470050 */ lw $a3, 0x50($v0) +/* 886FCC 80240C0C 44061000 */ mfc1 $a2, $f2 +/* 886FD0 80240C10 0C01C2EC */ jal func_80070BB0 +/* 886FD4 80240C14 24040004 */ addiu $a0, $zero, 4 +/* 886FD8 80240C18 8FBF0018 */ lw $ra, 0x18($sp) +/* 886FDC 80240C1C 24020002 */ addiu $v0, $zero, 2 +/* 886FE0 80240C20 03E00008 */ jr $ra +/* 886FE4 80240C24 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28.s deleted file mode 100644 index 3ff92ab2d6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C28 -/* 886FE8 80240C28 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 886FEC 80240C2C AFBF0018 */ sw $ra, 0x18($sp) -/* 886FF0 80240C30 0C00EAD2 */ jal get_npc_safe -/* 886FF4 80240C34 2404FFFC */ addiu $a0, $zero, -4 -/* 886FF8 80240C38 C444003C */ lwc1 $f4, 0x3c($v0) -/* 886FFC 80240C3C 3C014148 */ lui $at, 0x4148 -/* 887000 80240C40 44811000 */ mtc1 $at, $f2 -/* 887004 80240C44 3C013F80 */ lui $at, 0x3f80 -/* 887008 80240C48 44810000 */ mtc1 $at, $f0 -/* 88700C 80240C4C 2403001E */ addiu $v1, $zero, 0x1e -/* 887010 80240C50 AFA30014 */ sw $v1, 0x14($sp) -/* 887014 80240C54 46022100 */ add.s $f4, $f4, $f2 -/* 887018 80240C58 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88701C 80240C5C 8C450038 */ lw $a1, 0x38($v0) -/* 887020 80240C60 8C470040 */ lw $a3, 0x40($v0) -/* 887024 80240C64 44062000 */ mfc1 $a2, $f4 -/* 887028 80240C68 0C01C2EC */ jal func_80070BB0 -/* 88702C 80240C6C 24040009 */ addiu $a0, $zero, 9 -/* 887030 80240C70 8FBF0018 */ lw $ra, 0x18($sp) -/* 887034 80240C74 24020002 */ addiu $v0, $zero, 2 -/* 887038 80240C78 03E00008 */ jr $ra -/* 88703C 80240C7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28_886FE8.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28_886FE8.s new file mode 100644 index 0000000000..2a6e2c0566 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C28_886FE8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C28_886FE8 +/* 886FE8 80240C28 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 886FEC 80240C2C AFBF0018 */ sw $ra, 0x18($sp) +/* 886FF0 80240C30 0C00EAD2 */ jal get_npc_safe +/* 886FF4 80240C34 2404FFFC */ addiu $a0, $zero, -4 +/* 886FF8 80240C38 C444003C */ lwc1 $f4, 0x3c($v0) +/* 886FFC 80240C3C 3C014148 */ lui $at, 0x4148 +/* 887000 80240C40 44811000 */ mtc1 $at, $f2 +/* 887004 80240C44 3C013F80 */ lui $at, 0x3f80 +/* 887008 80240C48 44810000 */ mtc1 $at, $f0 +/* 88700C 80240C4C 2403001E */ addiu $v1, $zero, 0x1e +/* 887010 80240C50 AFA30014 */ sw $v1, 0x14($sp) +/* 887014 80240C54 46022100 */ add.s $f4, $f4, $f2 +/* 887018 80240C58 E7A00010 */ swc1 $f0, 0x10($sp) +/* 88701C 80240C5C 8C450038 */ lw $a1, 0x38($v0) +/* 887020 80240C60 8C470040 */ lw $a3, 0x40($v0) +/* 887024 80240C64 44062000 */ mfc1 $a2, $f4 +/* 887028 80240C68 0C01C2EC */ jal func_80070BB0 +/* 88702C 80240C6C 24040009 */ addiu $a0, $zero, 9 +/* 887030 80240C70 8FBF0018 */ lw $ra, 0x18($sp) +/* 887034 80240C74 24020002 */ addiu $v0, $zero, 2 +/* 887038 80240C78 03E00008 */ jr $ra +/* 88703C 80240C7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80.s deleted file mode 100644 index 8d9be7b0a8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C80 -/* 887040 80240C80 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 887044 80240C84 AFB60040 */ sw $s6, 0x40($sp) -/* 887048 80240C88 0080B02D */ daddu $s6, $a0, $zero -/* 88704C 80240C8C AFB00028 */ sw $s0, 0x28($sp) -/* 887050 80240C90 00A0802D */ daddu $s0, $a1, $zero -/* 887054 80240C94 AFBF0044 */ sw $ra, 0x44($sp) -/* 887058 80240C98 AFB5003C */ sw $s5, 0x3c($sp) -/* 88705C 80240C9C AFB40038 */ sw $s4, 0x38($sp) -/* 887060 80240CA0 AFB30034 */ sw $s3, 0x34($sp) -/* 887064 80240CA4 AFB20030 */ sw $s2, 0x30($sp) -/* 887068 80240CA8 AFB1002C */ sw $s1, 0x2c($sp) -/* 88706C 80240CAC F7B80058 */ sdc1 $f24, 0x58($sp) -/* 887070 80240CB0 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 887074 80240CB4 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 887078 80240CB8 8ED3000C */ lw $s3, 0xc($s6) -/* 88707C 80240CBC 0C00EAD2 */ jal get_npc_safe -/* 887080 80240CC0 2404FFFC */ addiu $a0, $zero, -4 -/* 887084 80240CC4 27A50018 */ addiu $a1, $sp, 0x18 -/* 887088 80240CC8 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 88708C 80240CCC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 887090 80240CD0 27A6001C */ addiu $a2, $sp, 0x1c -/* 887094 80240CD4 00041880 */ sll $v1, $a0, 2 -/* 887098 80240CD8 00641821 */ addu $v1, $v1, $a0 -/* 88709C 80240CDC 00031880 */ sll $v1, $v1, 2 -/* 8870A0 80240CE0 00641823 */ subu $v1, $v1, $a0 -/* 8870A4 80240CE4 000320C0 */ sll $a0, $v1, 3 -/* 8870A8 80240CE8 00641821 */ addu $v1, $v1, $a0 -/* 8870AC 80240CEC 000318C0 */ sll $v1, $v1, 3 -/* 8870B0 80240CF0 3C01800B */ lui $at, 0x800b -/* 8870B4 80240CF4 00230821 */ addu $at, $at, $v1 -/* 8870B8 80240CF8 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* 8870BC 80240CFC 0C00A88D */ jal sin_cos_deg -/* 8870C0 80240D00 0040A82D */ daddu $s5, $v0, $zero -/* 8870C4 80240D04 1200005D */ beqz $s0, .L80240E7C -/* 8870C8 80240D08 00000000 */ nop -/* 8870CC 80240D0C 0C00AB0A */ jal general_heap_malloc -/* 8870D0 80240D10 24040068 */ addiu $a0, $zero, 0x68 -/* 8870D4 80240D14 0040902D */ daddu $s2, $v0, $zero -/* 8870D8 80240D18 02C0202D */ daddu $a0, $s6, $zero -/* 8870DC 80240D1C 0000882D */ daddu $s1, $zero, $zero -/* 8870E0 80240D20 2414FFFF */ addiu $s4, $zero, -1 -/* 8870E4 80240D24 AED20060 */ sw $s2, 0x60($s6) -/* 8870E8 80240D28 8E650000 */ lw $a1, ($s3) -/* 8870EC 80240D2C 3C014148 */ lui $at, 0x4148 -/* 8870F0 80240D30 4481C000 */ mtc1 $at, $f24 -/* 8870F4 80240D34 3C013F80 */ lui $at, 0x3f80 -/* 8870F8 80240D38 4481B000 */ mtc1 $at, $f22 -/* 8870FC 80240D3C 4480A000 */ mtc1 $zero, $f20 -/* 887100 80240D40 0C0B1EAF */ jal get_variable -/* 887104 80240D44 0240802D */ daddu $s0, $s2, $zero -/* 887108 80240D48 0C04417A */ jal get_entity_by_index -/* 88710C 80240D4C 0040202D */ daddu $a0, $v0, $zero -/* 887110 80240D50 AE42005C */ sw $v0, 0x5c($s2) -.L80240D54: -/* 887114 80240D54 8E42005C */ lw $v0, 0x5c($s2) -/* 887118 80240D58 C440004C */ lwc1 $f0, 0x4c($v0) -/* 88711C 80240D5C 0000202D */ daddu $a0, $zero, $zero -/* 887120 80240D60 E7B60010 */ swc1 $f22, 0x10($sp) -/* 887124 80240D64 AFB40014 */ sw $s4, 0x14($sp) -/* 887128 80240D68 46180000 */ add.s $f0, $f0, $f24 -/* 88712C 80240D6C 8C450048 */ lw $a1, 0x48($v0) -/* 887130 80240D70 8C470050 */ lw $a3, 0x50($v0) -/* 887134 80240D74 44060000 */ mfc1 $a2, $f0 -/* 887138 80240D78 0C01C5BC */ jal func_800716F0 -/* 88713C 80240D7C 26310001 */ addiu $s1, $s1, 1 -/* 887140 80240D80 AE020008 */ sw $v0, 8($s0) -/* 887144 80240D84 E614002C */ swc1 $f20, 0x2c($s0) -/* 887148 80240D88 E6140020 */ swc1 $f20, 0x20($s0) -/* 88714C 80240D8C E6140014 */ swc1 $f20, 0x14($s0) -/* 887150 80240D90 E6140050 */ swc1 $f20, 0x50($s0) -/* 887154 80240D94 E6140044 */ swc1 $f20, 0x44($s0) -/* 887158 80240D98 E6140038 */ swc1 $f20, 0x38($s0) -/* 88715C 80240D9C 2A220003 */ slti $v0, $s1, 3 -/* 887160 80240DA0 1440FFEC */ bnez $v0, .L80240D54 -/* 887164 80240DA4 26100004 */ addiu $s0, $s0, 4 -/* 887168 80240DA8 0000882D */ daddu $s1, $zero, $zero -/* 88716C 80240DAC 0240802D */ daddu $s0, $s2, $zero -/* 887170 80240DB0 3C148024 */ lui $s4, 0x8024 -/* 887174 80240DB4 26942088 */ addiu $s4, $s4, 0x2088 -/* 887178 80240DB8 3C014248 */ lui $at, 0x4248 -/* 88717C 80240DBC 4481A000 */ mtc1 $at, $f20 -/* 887180 80240DC0 24130044 */ addiu $s3, $zero, 0x44 -/* 887184 80240DC4 AE400000 */ sw $zero, ($s2) -/* 887188 80240DC8 AE400004 */ sw $zero, 4($s2) -/* 88718C 80240DCC AE400060 */ sw $zero, 0x60($s2) -/* 887190 80240DD0 AE400064 */ sw $zero, 0x64($s2) -.L80240DD4: -/* 887194 80240DD4 27A40020 */ addiu $a0, $sp, 0x20 -/* 887198 80240DD8 4406A000 */ mfc1 $a2, $f20 -/* 88719C 80240DDC 8E870000 */ lw $a3, ($s4) -/* 8871A0 80240DE0 02532821 */ addu $a1, $s2, $s3 -/* 8871A4 80240DE4 0C00A7E7 */ jal add_vec2D_polar -/* 8871A8 80240DE8 AFA00020 */ sw $zero, 0x20($sp) -/* 8871AC 80240DEC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 8871B0 80240DF0 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 8871B4 80240DF4 46041082 */ mul.s $f2, $f2, $f4 -/* 8871B8 80240DF8 00000000 */ nop -/* 8871BC 80240DFC C7A00018 */ lwc1 $f0, 0x18($sp) -/* 8871C0 80240E00 46040002 */ mul.s $f0, $f0, $f4 -/* 8871C4 80240E04 00000000 */ nop -/* 8871C8 80240E08 E6020038 */ swc1 $f2, 0x38($s0) -/* 8871CC 80240E0C E6000050 */ swc1 $f0, 0x50($s0) -/* 8871D0 80240E10 8E42005C */ lw $v0, 0x5c($s2) -/* 8871D4 80240E14 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8871D8 80240E18 C4420048 */ lwc1 $f2, 0x48($v0) -/* 8871DC 80240E1C 46001080 */ add.s $f2, $f2, $f0 -/* 8871E0 80240E20 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 8871E4 80240E24 46020001 */ sub.s $f0, $f0, $f2 -/* 8871E8 80240E28 E6000038 */ swc1 $f0, 0x38($s0) -/* 8871EC 80240E2C 8E42005C */ lw $v0, 0x5c($s2) -/* 8871F0 80240E30 C6000044 */ lwc1 $f0, 0x44($s0) -/* 8871F4 80240E34 C442004C */ lwc1 $f2, 0x4c($v0) -/* 8871F8 80240E38 46001080 */ add.s $f2, $f2, $f0 -/* 8871FC 80240E3C C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 887200 80240E40 46020001 */ sub.s $f0, $f0, $f2 -/* 887204 80240E44 E6000044 */ swc1 $f0, 0x44($s0) -/* 887208 80240E48 8E42005C */ lw $v0, 0x5c($s2) -/* 88720C 80240E4C C6000050 */ lwc1 $f0, 0x50($s0) -/* 887210 80240E50 C4420050 */ lwc1 $f2, 0x50($v0) -/* 887214 80240E54 26940004 */ addiu $s4, $s4, 4 -/* 887218 80240E58 46001080 */ add.s $f2, $f2, $f0 -/* 88721C 80240E5C C6A00040 */ lwc1 $f0, 0x40($s5) -/* 887220 80240E60 26730004 */ addiu $s3, $s3, 4 -/* 887224 80240E64 46020001 */ sub.s $f0, $f0, $f2 -/* 887228 80240E68 26310001 */ addiu $s1, $s1, 1 -/* 88722C 80240E6C 2A220003 */ slti $v0, $s1, 3 -/* 887230 80240E70 E6000050 */ swc1 $f0, 0x50($s0) -/* 887234 80240E74 1440FFD7 */ bnez $v0, .L80240DD4 -/* 887238 80240E78 26100004 */ addiu $s0, $s0, 4 -.L80240E7C: -/* 88723C 80240E7C 8ED20060 */ lw $s2, 0x60($s6) -/* 887240 80240E80 8E430000 */ lw $v1, ($s2) -/* 887244 80240E84 24020001 */ addiu $v0, $zero, 1 -/* 887248 80240E88 10620038 */ beq $v1, $v0, .L80240F6C -/* 88724C 80240E8C 28620002 */ slti $v0, $v1, 2 -/* 887250 80240E90 50400005 */ beql $v0, $zero, .L80240EA8 -/* 887254 80240E94 24020002 */ addiu $v0, $zero, 2 -/* 887258 80240E98 10600007 */ beqz $v1, .L80240EB8 -/* 88725C 80240E9C 24040005 */ addiu $a0, $zero, 5 -/* 887260 80240EA0 08090414 */ j .L80241050 -/* 887264 80240EA4 00000000 */ nop -.L80240EA8: -/* 887268 80240EA8 10620058 */ beq $v1, $v0, .L8024100C -/* 88726C 80240EAC 00000000 */ nop -/* 887270 80240EB0 08090414 */ j .L80241050 -/* 887274 80240EB4 00000000 */ nop -.L80240EB8: -/* 887278 80240EB8 0000882D */ daddu $s1, $zero, $zero -/* 88727C 80240EBC 3C148024 */ lui $s4, 0x8024 -/* 887280 80240EC0 26942088 */ addiu $s4, $s4, 0x2088 -/* 887284 80240EC4 24130020 */ addiu $s3, $zero, 0x20 -/* 887288 80240EC8 3C064248 */ lui $a2, 0x4248 -/* 88728C 80240ECC 44800000 */ mtc1 $zero, $f0 -/* 887290 80240ED0 24020014 */ addiu $v0, $zero, 0x14 -/* 887294 80240ED4 AFA20010 */ sw $v0, 0x10($sp) -/* 887298 80240ED8 44050000 */ mfc1 $a1, $f0 -/* 88729C 80240EDC 8E470060 */ lw $a3, 0x60($s2) -/* 8872A0 80240EE0 4485B000 */ mtc1 $a1, $f22 -/* 8872A4 80240EE4 0C00A8ED */ jal update_lerp -/* 8872A8 80240EE8 0240802D */ daddu $s0, $s2, $zero -/* 8872AC 80240EEC 46000506 */ mov.s $f20, $f0 -.L80240EF0: -/* 8872B0 80240EF0 4406A000 */ mfc1 $a2, $f20 -/* 8872B4 80240EF4 27A40020 */ addiu $a0, $sp, 0x20 -/* 8872B8 80240EF8 E6160020 */ swc1 $f22, 0x20($s0) -/* 8872BC 80240EFC 8E870000 */ lw $a3, ($s4) -/* 8872C0 80240F00 02532821 */ addu $a1, $s2, $s3 -/* 8872C4 80240F04 0C00A7E7 */ jal add_vec2D_polar -/* 8872C8 80240F08 E7B60020 */ swc1 $f22, 0x20($sp) -/* 8872CC 80240F0C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 8872D0 80240F10 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 8872D4 80240F14 46002102 */ mul.s $f4, $f4, $f0 -/* 8872D8 80240F18 00000000 */ nop -/* 8872DC 80240F1C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 8872E0 80240F20 26940004 */ addiu $s4, $s4, 4 -/* 8872E4 80240F24 46001082 */ mul.s $f2, $f2, $f0 -/* 8872E8 80240F28 00000000 */ nop -/* 8872EC 80240F2C 26730004 */ addiu $s3, $s3, 4 -/* 8872F0 80240F30 26310001 */ addiu $s1, $s1, 1 -/* 8872F4 80240F34 2A220003 */ slti $v0, $s1, 3 -/* 8872F8 80240F38 E6040014 */ swc1 $f4, 0x14($s0) -/* 8872FC 80240F3C E602002C */ swc1 $f2, 0x2c($s0) -/* 887300 80240F40 1440FFEB */ bnez $v0, .L80240EF0 -/* 887304 80240F44 26100004 */ addiu $s0, $s0, 4 -/* 887308 80240F48 8E420060 */ lw $v0, 0x60($s2) -/* 88730C 80240F4C 24420001 */ addiu $v0, $v0, 1 -/* 887310 80240F50 AE420060 */ sw $v0, 0x60($s2) -/* 887314 80240F54 28420015 */ slti $v0, $v0, 0x15 -/* 887318 80240F58 1440003D */ bnez $v0, .L80241050 -/* 88731C 80240F5C 24020001 */ addiu $v0, $zero, 1 -/* 887320 80240F60 AE420000 */ sw $v0, ($s2) -/* 887324 80240F64 08090414 */ j .L80241050 -/* 887328 80240F68 AE400060 */ sw $zero, 0x60($s2) -.L80240F6C: -/* 88732C 80240F6C 0000882D */ daddu $s1, $zero, $zero -/* 887330 80240F70 3C148024 */ lui $s4, 0x8024 -/* 887334 80240F74 26942088 */ addiu $s4, $s4, 0x2088 -/* 887338 80240F78 24130020 */ addiu $s3, $zero, 0x20 -/* 88733C 80240F7C 0240802D */ daddu $s0, $s2, $zero -/* 887340 80240F80 3C014248 */ lui $at, 0x4248 -/* 887344 80240F84 4481A000 */ mtc1 $at, $f20 -/* 887348 80240F88 4480B000 */ mtc1 $zero, $f22 -.L80240F8C: -/* 88734C 80240F8C 4406A000 */ mfc1 $a2, $f20 -/* 887350 80240F90 27A40020 */ addiu $a0, $sp, 0x20 -/* 887354 80240F94 E6160020 */ swc1 $f22, 0x20($s0) -/* 887358 80240F98 8E870000 */ lw $a3, ($s4) -/* 88735C 80240F9C 02532821 */ addu $a1, $s2, $s3 -/* 887360 80240FA0 0C00A7E7 */ jal add_vec2D_polar -/* 887364 80240FA4 E7B60020 */ swc1 $f22, 0x20($sp) -/* 887368 80240FA8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 88736C 80240FAC C7A00020 */ lwc1 $f0, 0x20($sp) -/* 887370 80240FB0 46002102 */ mul.s $f4, $f4, $f0 -/* 887374 80240FB4 00000000 */ nop -/* 887378 80240FB8 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 88737C 80240FBC 26940004 */ addiu $s4, $s4, 4 -/* 887380 80240FC0 46001082 */ mul.s $f2, $f2, $f0 -/* 887384 80240FC4 00000000 */ nop -/* 887388 80240FC8 26730004 */ addiu $s3, $s3, 4 -/* 88738C 80240FCC 26310001 */ addiu $s1, $s1, 1 -/* 887390 80240FD0 2A220003 */ slti $v0, $s1, 3 -/* 887394 80240FD4 E6040014 */ swc1 $f4, 0x14($s0) -/* 887398 80240FD8 E602002C */ swc1 $f2, 0x2c($s0) -/* 88739C 80240FDC 1440FFEB */ bnez $v0, .L80240F8C -/* 8873A0 80240FE0 26100004 */ addiu $s0, $s0, 4 -/* 8873A4 80240FE4 8E420060 */ lw $v0, 0x60($s2) -/* 8873A8 80240FE8 24420001 */ addiu $v0, $v0, 1 -/* 8873AC 80240FEC AE420060 */ sw $v0, 0x60($s2) -/* 8873B0 80240FF0 28420010 */ slti $v0, $v0, 0x10 -/* 8873B4 80240FF4 14400016 */ bnez $v0, .L80241050 -/* 8873B8 80240FF8 2402000F */ addiu $v0, $zero, 0xf -/* 8873BC 80240FFC AE420060 */ sw $v0, 0x60($s2) -/* 8873C0 80241000 24020002 */ addiu $v0, $zero, 2 -/* 8873C4 80241004 08090414 */ j .L80241050 -/* 8873C8 80241008 AE420000 */ sw $v0, ($s2) -.L8024100C: -/* 8873CC 8024100C 8E420060 */ lw $v0, 0x60($s2) -/* 8873D0 80241010 24420001 */ addiu $v0, $v0, 1 -/* 8873D4 80241014 AE420060 */ sw $v0, 0x60($s2) -/* 8873D8 80241018 2842001F */ slti $v0, $v0, 0x1f -/* 8873DC 8024101C 1440000C */ bnez $v0, .L80241050 -/* 8873E0 80241020 0000882D */ daddu $s1, $zero, $zero -/* 8873E4 80241024 0240282D */ daddu $a1, $s2, $zero -.L80241028: -/* 8873E8 80241028 8CA20008 */ lw $v0, 8($a1) -/* 8873EC 8024102C 8C430000 */ lw $v1, ($v0) -/* 8873F0 80241030 26310001 */ addiu $s1, $s1, 1 -/* 8873F4 80241034 34630010 */ ori $v1, $v1, 0x10 -/* 8873F8 80241038 AC430000 */ sw $v1, ($v0) -/* 8873FC 8024103C 2A220003 */ slti $v0, $s1, 3 -/* 887400 80241040 1440FFF9 */ bnez $v0, .L80241028 -/* 887404 80241044 24A50004 */ addiu $a1, $a1, 4 -/* 887408 80241048 08090461 */ j .L80241184 -/* 88740C 8024104C 24020002 */ addiu $v0, $zero, 2 -.L80241050: -/* 887410 80241050 8E430004 */ lw $v1, 4($s2) -/* 887414 80241054 10600005 */ beqz $v1, .L8024106C -/* 887418 80241058 24020001 */ addiu $v0, $zero, 1 -/* 88741C 8024105C 1062000B */ beq $v1, $v0, .L8024108C -/* 887420 80241060 0000882D */ daddu $s1, $zero, $zero -/* 887424 80241064 08090450 */ j .L80241140 -/* 887428 80241068 0240282D */ daddu $a1, $s2, $zero -.L8024106C: -/* 88742C 8024106C 8E420064 */ lw $v0, 0x64($s2) -/* 887430 80241070 24420001 */ addiu $v0, $v0, 1 -/* 887434 80241074 AE420064 */ sw $v0, 0x64($s2) -/* 887438 80241078 28420010 */ slti $v0, $v0, 0x10 -/* 88743C 8024107C 1440002F */ bnez $v0, .L8024113C -/* 887440 80241080 0000882D */ daddu $s1, $zero, $zero -/* 887444 80241084 0809044C */ j .L80241130 -/* 887448 80241088 24020001 */ addiu $v0, $zero, 1 -.L8024108C: -/* 88744C 8024108C 4480A000 */ mtc1 $zero, $f20 -/* 887450 80241090 24130014 */ addiu $s3, $zero, 0x14 -/* 887454 80241094 0240802D */ daddu $s0, $s2, $zero -.L80241098: -/* 887458 80241098 4405A000 */ mfc1 $a1, $f20 -/* 88745C 8024109C AFB30010 */ sw $s3, 0x10($sp) -/* 887460 802410A0 8E060038 */ lw $a2, 0x38($s0) -/* 887464 802410A4 8E470064 */ lw $a3, 0x64($s2) -/* 887468 802410A8 0C00A8ED */ jal update_lerp -/* 88746C 802410AC 24040001 */ addiu $a0, $zero, 1 -/* 887470 802410B0 C6020014 */ lwc1 $f2, 0x14($s0) -/* 887474 802410B4 46001080 */ add.s $f2, $f2, $f0 -/* 887478 802410B8 4405A000 */ mfc1 $a1, $f20 -/* 88747C 802410BC E6020014 */ swc1 $f2, 0x14($s0) -/* 887480 802410C0 AFB30010 */ sw $s3, 0x10($sp) -/* 887484 802410C4 8E060044 */ lw $a2, 0x44($s0) -/* 887488 802410C8 8E470064 */ lw $a3, 0x64($s2) -/* 88748C 802410CC 0C00A8ED */ jal update_lerp -/* 887490 802410D0 24040001 */ addiu $a0, $zero, 1 -/* 887494 802410D4 C6020020 */ lwc1 $f2, 0x20($s0) -/* 887498 802410D8 46001080 */ add.s $f2, $f2, $f0 -/* 88749C 802410DC 4405A000 */ mfc1 $a1, $f20 -/* 8874A0 802410E0 E6020020 */ swc1 $f2, 0x20($s0) -/* 8874A4 802410E4 AFB30010 */ sw $s3, 0x10($sp) -/* 8874A8 802410E8 8E060050 */ lw $a2, 0x50($s0) -/* 8874AC 802410EC 8E470064 */ lw $a3, 0x64($s2) -/* 8874B0 802410F0 0C00A8ED */ jal update_lerp -/* 8874B4 802410F4 24040001 */ addiu $a0, $zero, 1 -/* 8874B8 802410F8 C602002C */ lwc1 $f2, 0x2c($s0) -/* 8874BC 802410FC 46001080 */ add.s $f2, $f2, $f0 -/* 8874C0 80241100 26310001 */ addiu $s1, $s1, 1 -/* 8874C4 80241104 2A220003 */ slti $v0, $s1, 3 -/* 8874C8 80241108 E602002C */ swc1 $f2, 0x2c($s0) -/* 8874CC 8024110C 1440FFE2 */ bnez $v0, .L80241098 -/* 8874D0 80241110 26100004 */ addiu $s0, $s0, 4 -/* 8874D4 80241114 8E420064 */ lw $v0, 0x64($s2) -/* 8874D8 80241118 24420001 */ addiu $v0, $v0, 1 -/* 8874DC 8024111C AE420064 */ sw $v0, 0x64($s2) -/* 8874E0 80241120 28420015 */ slti $v0, $v0, 0x15 -/* 8874E4 80241124 14400005 */ bnez $v0, .L8024113C -/* 8874E8 80241128 0000882D */ daddu $s1, $zero, $zero -/* 8874EC 8024112C 24020002 */ addiu $v0, $zero, 2 -.L80241130: -/* 8874F0 80241130 AE420004 */ sw $v0, 4($s2) -/* 8874F4 80241134 AE400064 */ sw $zero, 0x64($s2) -/* 8874F8 80241138 0000882D */ daddu $s1, $zero, $zero -.L8024113C: -/* 8874FC 8024113C 0240282D */ daddu $a1, $s2, $zero -.L80241140: -/* 887500 80241140 8CA20008 */ lw $v0, 8($a1) -/* 887504 80241144 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 887508 80241148 8C42000C */ lw $v0, 0xc($v0) -/* 88750C 8024114C E4400010 */ swc1 $f0, 0x10($v0) -/* 887510 80241150 8CA20008 */ lw $v0, 8($a1) -/* 887514 80241154 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 887518 80241158 8C42000C */ lw $v0, 0xc($v0) -/* 88751C 8024115C 26310001 */ addiu $s1, $s1, 1 -/* 887520 80241160 E4400014 */ swc1 $f0, 0x14($v0) -/* 887524 80241164 8CA20008 */ lw $v0, 8($a1) -/* 887528 80241168 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 88752C 8024116C 8C42000C */ lw $v0, 0xc($v0) -/* 887530 80241170 E4400018 */ swc1 $f0, 0x18($v0) -/* 887534 80241174 2A220003 */ slti $v0, $s1, 3 -/* 887538 80241178 1440FFF1 */ bnez $v0, .L80241140 -/* 88753C 8024117C 24A50004 */ addiu $a1, $a1, 4 -/* 887540 80241180 0000102D */ daddu $v0, $zero, $zero -.L80241184: -/* 887544 80241184 8FBF0044 */ lw $ra, 0x44($sp) -/* 887548 80241188 8FB60040 */ lw $s6, 0x40($sp) -/* 88754C 8024118C 8FB5003C */ lw $s5, 0x3c($sp) -/* 887550 80241190 8FB40038 */ lw $s4, 0x38($sp) -/* 887554 80241194 8FB30034 */ lw $s3, 0x34($sp) -/* 887558 80241198 8FB20030 */ lw $s2, 0x30($sp) -/* 88755C 8024119C 8FB1002C */ lw $s1, 0x2c($sp) -/* 887560 802411A0 8FB00028 */ lw $s0, 0x28($sp) -/* 887564 802411A4 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 887568 802411A8 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 88756C 802411AC D7B40048 */ ldc1 $f20, 0x48($sp) -/* 887570 802411B0 03E00008 */ jr $ra -/* 887574 802411B4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s new file mode 100644 index 0000000000..e84b47a9ce --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240C80_887040.s @@ -0,0 +1,356 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C80_887040 +/* 887040 80240C80 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* 887044 80240C84 AFB60040 */ sw $s6, 0x40($sp) +/* 887048 80240C88 0080B02D */ daddu $s6, $a0, $zero +/* 88704C 80240C8C AFB00028 */ sw $s0, 0x28($sp) +/* 887050 80240C90 00A0802D */ daddu $s0, $a1, $zero +/* 887054 80240C94 AFBF0044 */ sw $ra, 0x44($sp) +/* 887058 80240C98 AFB5003C */ sw $s5, 0x3c($sp) +/* 88705C 80240C9C AFB40038 */ sw $s4, 0x38($sp) +/* 887060 80240CA0 AFB30034 */ sw $s3, 0x34($sp) +/* 887064 80240CA4 AFB20030 */ sw $s2, 0x30($sp) +/* 887068 80240CA8 AFB1002C */ sw $s1, 0x2c($sp) +/* 88706C 80240CAC F7B80058 */ sdc1 $f24, 0x58($sp) +/* 887070 80240CB0 F7B60050 */ sdc1 $f22, 0x50($sp) +/* 887074 80240CB4 F7B40048 */ sdc1 $f20, 0x48($sp) +/* 887078 80240CB8 8ED3000C */ lw $s3, 0xc($s6) +/* 88707C 80240CBC 0C00EAD2 */ jal get_npc_safe +/* 887080 80240CC0 2404FFFC */ addiu $a0, $zero, -4 +/* 887084 80240CC4 27A50018 */ addiu $a1, $sp, 0x18 +/* 887088 80240CC8 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 88708C 80240CCC 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 887090 80240CD0 27A6001C */ addiu $a2, $sp, 0x1c +/* 887094 80240CD4 00041880 */ sll $v1, $a0, 2 +/* 887098 80240CD8 00641821 */ addu $v1, $v1, $a0 +/* 88709C 80240CDC 00031880 */ sll $v1, $v1, 2 +/* 8870A0 80240CE0 00641823 */ subu $v1, $v1, $a0 +/* 8870A4 80240CE4 000320C0 */ sll $a0, $v1, 3 +/* 8870A8 80240CE8 00641821 */ addu $v1, $v1, $a0 +/* 8870AC 80240CEC 000318C0 */ sll $v1, $v1, 3 +/* 8870B0 80240CF0 3C01800B */ lui $at, 0x800b +/* 8870B4 80240CF4 00230821 */ addu $at, $at, $v1 +/* 8870B8 80240CF8 C42C1DEC */ lwc1 $f12, 0x1dec($at) +/* 8870BC 80240CFC 0C00A88D */ jal sin_cos_deg +/* 8870C0 80240D00 0040A82D */ daddu $s5, $v0, $zero +/* 8870C4 80240D04 1200005D */ beqz $s0, .L80240E7C +/* 8870C8 80240D08 00000000 */ nop +/* 8870CC 80240D0C 0C00AB0A */ jal general_heap_malloc +/* 8870D0 80240D10 24040068 */ addiu $a0, $zero, 0x68 +/* 8870D4 80240D14 0040902D */ daddu $s2, $v0, $zero +/* 8870D8 80240D18 02C0202D */ daddu $a0, $s6, $zero +/* 8870DC 80240D1C 0000882D */ daddu $s1, $zero, $zero +/* 8870E0 80240D20 2414FFFF */ addiu $s4, $zero, -1 +/* 8870E4 80240D24 AED20060 */ sw $s2, 0x60($s6) +/* 8870E8 80240D28 8E650000 */ lw $a1, ($s3) +/* 8870EC 80240D2C 3C014148 */ lui $at, 0x4148 +/* 8870F0 80240D30 4481C000 */ mtc1 $at, $f24 +/* 8870F4 80240D34 3C013F80 */ lui $at, 0x3f80 +/* 8870F8 80240D38 4481B000 */ mtc1 $at, $f22 +/* 8870FC 80240D3C 4480A000 */ mtc1 $zero, $f20 +/* 887100 80240D40 0C0B1EAF */ jal get_variable +/* 887104 80240D44 0240802D */ daddu $s0, $s2, $zero +/* 887108 80240D48 0C04417A */ jal get_entity_by_index +/* 88710C 80240D4C 0040202D */ daddu $a0, $v0, $zero +/* 887110 80240D50 AE42005C */ sw $v0, 0x5c($s2) +.L80240D54: +/* 887114 80240D54 8E42005C */ lw $v0, 0x5c($s2) +/* 887118 80240D58 C440004C */ lwc1 $f0, 0x4c($v0) +/* 88711C 80240D5C 0000202D */ daddu $a0, $zero, $zero +/* 887120 80240D60 E7B60010 */ swc1 $f22, 0x10($sp) +/* 887124 80240D64 AFB40014 */ sw $s4, 0x14($sp) +/* 887128 80240D68 46180000 */ add.s $f0, $f0, $f24 +/* 88712C 80240D6C 8C450048 */ lw $a1, 0x48($v0) +/* 887130 80240D70 8C470050 */ lw $a3, 0x50($v0) +/* 887134 80240D74 44060000 */ mfc1 $a2, $f0 +/* 887138 80240D78 0C01C5BC */ jal func_800716F0 +/* 88713C 80240D7C 26310001 */ addiu $s1, $s1, 1 +/* 887140 80240D80 AE020008 */ sw $v0, 8($s0) +/* 887144 80240D84 E614002C */ swc1 $f20, 0x2c($s0) +/* 887148 80240D88 E6140020 */ swc1 $f20, 0x20($s0) +/* 88714C 80240D8C E6140014 */ swc1 $f20, 0x14($s0) +/* 887150 80240D90 E6140050 */ swc1 $f20, 0x50($s0) +/* 887154 80240D94 E6140044 */ swc1 $f20, 0x44($s0) +/* 887158 80240D98 E6140038 */ swc1 $f20, 0x38($s0) +/* 88715C 80240D9C 2A220003 */ slti $v0, $s1, 3 +/* 887160 80240DA0 1440FFEC */ bnez $v0, .L80240D54 +/* 887164 80240DA4 26100004 */ addiu $s0, $s0, 4 +/* 887168 80240DA8 0000882D */ daddu $s1, $zero, $zero +/* 88716C 80240DAC 0240802D */ daddu $s0, $s2, $zero +/* 887170 80240DB0 3C148024 */ lui $s4, 0x8024 +/* 887174 80240DB4 26942088 */ addiu $s4, $s4, 0x2088 +/* 887178 80240DB8 3C014248 */ lui $at, 0x4248 +/* 88717C 80240DBC 4481A000 */ mtc1 $at, $f20 +/* 887180 80240DC0 24130044 */ addiu $s3, $zero, 0x44 +/* 887184 80240DC4 AE400000 */ sw $zero, ($s2) +/* 887188 80240DC8 AE400004 */ sw $zero, 4($s2) +/* 88718C 80240DCC AE400060 */ sw $zero, 0x60($s2) +/* 887190 80240DD0 AE400064 */ sw $zero, 0x64($s2) +.L80240DD4: +/* 887194 80240DD4 27A40020 */ addiu $a0, $sp, 0x20 +/* 887198 80240DD8 4406A000 */ mfc1 $a2, $f20 +/* 88719C 80240DDC 8E870000 */ lw $a3, ($s4) +/* 8871A0 80240DE0 02532821 */ addu $a1, $s2, $s3 +/* 8871A4 80240DE4 0C00A7E7 */ jal add_vec2D_polar +/* 8871A8 80240DE8 AFA00020 */ sw $zero, 0x20($sp) +/* 8871AC 80240DEC C7A2001C */ lwc1 $f2, 0x1c($sp) +/* 8871B0 80240DF0 C7A40020 */ lwc1 $f4, 0x20($sp) +/* 8871B4 80240DF4 46041082 */ mul.s $f2, $f2, $f4 +/* 8871B8 80240DF8 00000000 */ nop +/* 8871BC 80240DFC C7A00018 */ lwc1 $f0, 0x18($sp) +/* 8871C0 80240E00 46040002 */ mul.s $f0, $f0, $f4 +/* 8871C4 80240E04 00000000 */ nop +/* 8871C8 80240E08 E6020038 */ swc1 $f2, 0x38($s0) +/* 8871CC 80240E0C E6000050 */ swc1 $f0, 0x50($s0) +/* 8871D0 80240E10 8E42005C */ lw $v0, 0x5c($s2) +/* 8871D4 80240E14 C6000038 */ lwc1 $f0, 0x38($s0) +/* 8871D8 80240E18 C4420048 */ lwc1 $f2, 0x48($v0) +/* 8871DC 80240E1C 46001080 */ add.s $f2, $f2, $f0 +/* 8871E0 80240E20 C6A00038 */ lwc1 $f0, 0x38($s5) +/* 8871E4 80240E24 46020001 */ sub.s $f0, $f0, $f2 +/* 8871E8 80240E28 E6000038 */ swc1 $f0, 0x38($s0) +/* 8871EC 80240E2C 8E42005C */ lw $v0, 0x5c($s2) +/* 8871F0 80240E30 C6000044 */ lwc1 $f0, 0x44($s0) +/* 8871F4 80240E34 C442004C */ lwc1 $f2, 0x4c($v0) +/* 8871F8 80240E38 46001080 */ add.s $f2, $f2, $f0 +/* 8871FC 80240E3C C6A0003C */ lwc1 $f0, 0x3c($s5) +/* 887200 80240E40 46020001 */ sub.s $f0, $f0, $f2 +/* 887204 80240E44 E6000044 */ swc1 $f0, 0x44($s0) +/* 887208 80240E48 8E42005C */ lw $v0, 0x5c($s2) +/* 88720C 80240E4C C6000050 */ lwc1 $f0, 0x50($s0) +/* 887210 80240E50 C4420050 */ lwc1 $f2, 0x50($v0) +/* 887214 80240E54 26940004 */ addiu $s4, $s4, 4 +/* 887218 80240E58 46001080 */ add.s $f2, $f2, $f0 +/* 88721C 80240E5C C6A00040 */ lwc1 $f0, 0x40($s5) +/* 887220 80240E60 26730004 */ addiu $s3, $s3, 4 +/* 887224 80240E64 46020001 */ sub.s $f0, $f0, $f2 +/* 887228 80240E68 26310001 */ addiu $s1, $s1, 1 +/* 88722C 80240E6C 2A220003 */ slti $v0, $s1, 3 +/* 887230 80240E70 E6000050 */ swc1 $f0, 0x50($s0) +/* 887234 80240E74 1440FFD7 */ bnez $v0, .L80240DD4 +/* 887238 80240E78 26100004 */ addiu $s0, $s0, 4 +.L80240E7C: +/* 88723C 80240E7C 8ED20060 */ lw $s2, 0x60($s6) +/* 887240 80240E80 8E430000 */ lw $v1, ($s2) +/* 887244 80240E84 24020001 */ addiu $v0, $zero, 1 +/* 887248 80240E88 10620038 */ beq $v1, $v0, .L80240F6C +/* 88724C 80240E8C 28620002 */ slti $v0, $v1, 2 +/* 887250 80240E90 50400005 */ beql $v0, $zero, .L80240EA8 +/* 887254 80240E94 24020002 */ addiu $v0, $zero, 2 +/* 887258 80240E98 10600007 */ beqz $v1, .L80240EB8 +/* 88725C 80240E9C 24040005 */ addiu $a0, $zero, 5 +/* 887260 80240EA0 08090414 */ j .L80241050 +/* 887264 80240EA4 00000000 */ nop +.L80240EA8: +/* 887268 80240EA8 10620058 */ beq $v1, $v0, .L8024100C +/* 88726C 80240EAC 00000000 */ nop +/* 887270 80240EB0 08090414 */ j .L80241050 +/* 887274 80240EB4 00000000 */ nop +.L80240EB8: +/* 887278 80240EB8 0000882D */ daddu $s1, $zero, $zero +/* 88727C 80240EBC 3C148024 */ lui $s4, 0x8024 +/* 887280 80240EC0 26942088 */ addiu $s4, $s4, 0x2088 +/* 887284 80240EC4 24130020 */ addiu $s3, $zero, 0x20 +/* 887288 80240EC8 3C064248 */ lui $a2, 0x4248 +/* 88728C 80240ECC 44800000 */ mtc1 $zero, $f0 +/* 887290 80240ED0 24020014 */ addiu $v0, $zero, 0x14 +/* 887294 80240ED4 AFA20010 */ sw $v0, 0x10($sp) +/* 887298 80240ED8 44050000 */ mfc1 $a1, $f0 +/* 88729C 80240EDC 8E470060 */ lw $a3, 0x60($s2) +/* 8872A0 80240EE0 4485B000 */ mtc1 $a1, $f22 +/* 8872A4 80240EE4 0C00A8ED */ jal update_lerp +/* 8872A8 80240EE8 0240802D */ daddu $s0, $s2, $zero +/* 8872AC 80240EEC 46000506 */ mov.s $f20, $f0 +.L80240EF0: +/* 8872B0 80240EF0 4406A000 */ mfc1 $a2, $f20 +/* 8872B4 80240EF4 27A40020 */ addiu $a0, $sp, 0x20 +/* 8872B8 80240EF8 E6160020 */ swc1 $f22, 0x20($s0) +/* 8872BC 80240EFC 8E870000 */ lw $a3, ($s4) +/* 8872C0 80240F00 02532821 */ addu $a1, $s2, $s3 +/* 8872C4 80240F04 0C00A7E7 */ jal add_vec2D_polar +/* 8872C8 80240F08 E7B60020 */ swc1 $f22, 0x20($sp) +/* 8872CC 80240F0C C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 8872D0 80240F10 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 8872D4 80240F14 46002102 */ mul.s $f4, $f4, $f0 +/* 8872D8 80240F18 00000000 */ nop +/* 8872DC 80240F1C C7A20018 */ lwc1 $f2, 0x18($sp) +/* 8872E0 80240F20 26940004 */ addiu $s4, $s4, 4 +/* 8872E4 80240F24 46001082 */ mul.s $f2, $f2, $f0 +/* 8872E8 80240F28 00000000 */ nop +/* 8872EC 80240F2C 26730004 */ addiu $s3, $s3, 4 +/* 8872F0 80240F30 26310001 */ addiu $s1, $s1, 1 +/* 8872F4 80240F34 2A220003 */ slti $v0, $s1, 3 +/* 8872F8 80240F38 E6040014 */ swc1 $f4, 0x14($s0) +/* 8872FC 80240F3C E602002C */ swc1 $f2, 0x2c($s0) +/* 887300 80240F40 1440FFEB */ bnez $v0, .L80240EF0 +/* 887304 80240F44 26100004 */ addiu $s0, $s0, 4 +/* 887308 80240F48 8E420060 */ lw $v0, 0x60($s2) +/* 88730C 80240F4C 24420001 */ addiu $v0, $v0, 1 +/* 887310 80240F50 AE420060 */ sw $v0, 0x60($s2) +/* 887314 80240F54 28420015 */ slti $v0, $v0, 0x15 +/* 887318 80240F58 1440003D */ bnez $v0, .L80241050 +/* 88731C 80240F5C 24020001 */ addiu $v0, $zero, 1 +/* 887320 80240F60 AE420000 */ sw $v0, ($s2) +/* 887324 80240F64 08090414 */ j .L80241050 +/* 887328 80240F68 AE400060 */ sw $zero, 0x60($s2) +.L80240F6C: +/* 88732C 80240F6C 0000882D */ daddu $s1, $zero, $zero +/* 887330 80240F70 3C148024 */ lui $s4, 0x8024 +/* 887334 80240F74 26942088 */ addiu $s4, $s4, 0x2088 +/* 887338 80240F78 24130020 */ addiu $s3, $zero, 0x20 +/* 88733C 80240F7C 0240802D */ daddu $s0, $s2, $zero +/* 887340 80240F80 3C014248 */ lui $at, 0x4248 +/* 887344 80240F84 4481A000 */ mtc1 $at, $f20 +/* 887348 80240F88 4480B000 */ mtc1 $zero, $f22 +.L80240F8C: +/* 88734C 80240F8C 4406A000 */ mfc1 $a2, $f20 +/* 887350 80240F90 27A40020 */ addiu $a0, $sp, 0x20 +/* 887354 80240F94 E6160020 */ swc1 $f22, 0x20($s0) +/* 887358 80240F98 8E870000 */ lw $a3, ($s4) +/* 88735C 80240F9C 02532821 */ addu $a1, $s2, $s3 +/* 887360 80240FA0 0C00A7E7 */ jal add_vec2D_polar +/* 887364 80240FA4 E7B60020 */ swc1 $f22, 0x20($sp) +/* 887368 80240FA8 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 88736C 80240FAC C7A00020 */ lwc1 $f0, 0x20($sp) +/* 887370 80240FB0 46002102 */ mul.s $f4, $f4, $f0 +/* 887374 80240FB4 00000000 */ nop +/* 887378 80240FB8 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 88737C 80240FBC 26940004 */ addiu $s4, $s4, 4 +/* 887380 80240FC0 46001082 */ mul.s $f2, $f2, $f0 +/* 887384 80240FC4 00000000 */ nop +/* 887388 80240FC8 26730004 */ addiu $s3, $s3, 4 +/* 88738C 80240FCC 26310001 */ addiu $s1, $s1, 1 +/* 887390 80240FD0 2A220003 */ slti $v0, $s1, 3 +/* 887394 80240FD4 E6040014 */ swc1 $f4, 0x14($s0) +/* 887398 80240FD8 E602002C */ swc1 $f2, 0x2c($s0) +/* 88739C 80240FDC 1440FFEB */ bnez $v0, .L80240F8C +/* 8873A0 80240FE0 26100004 */ addiu $s0, $s0, 4 +/* 8873A4 80240FE4 8E420060 */ lw $v0, 0x60($s2) +/* 8873A8 80240FE8 24420001 */ addiu $v0, $v0, 1 +/* 8873AC 80240FEC AE420060 */ sw $v0, 0x60($s2) +/* 8873B0 80240FF0 28420010 */ slti $v0, $v0, 0x10 +/* 8873B4 80240FF4 14400016 */ bnez $v0, .L80241050 +/* 8873B8 80240FF8 2402000F */ addiu $v0, $zero, 0xf +/* 8873BC 80240FFC AE420060 */ sw $v0, 0x60($s2) +/* 8873C0 80241000 24020002 */ addiu $v0, $zero, 2 +/* 8873C4 80241004 08090414 */ j .L80241050 +/* 8873C8 80241008 AE420000 */ sw $v0, ($s2) +.L8024100C: +/* 8873CC 8024100C 8E420060 */ lw $v0, 0x60($s2) +/* 8873D0 80241010 24420001 */ addiu $v0, $v0, 1 +/* 8873D4 80241014 AE420060 */ sw $v0, 0x60($s2) +/* 8873D8 80241018 2842001F */ slti $v0, $v0, 0x1f +/* 8873DC 8024101C 1440000C */ bnez $v0, .L80241050 +/* 8873E0 80241020 0000882D */ daddu $s1, $zero, $zero +/* 8873E4 80241024 0240282D */ daddu $a1, $s2, $zero +.L80241028: +/* 8873E8 80241028 8CA20008 */ lw $v0, 8($a1) +/* 8873EC 8024102C 8C430000 */ lw $v1, ($v0) +/* 8873F0 80241030 26310001 */ addiu $s1, $s1, 1 +/* 8873F4 80241034 34630010 */ ori $v1, $v1, 0x10 +/* 8873F8 80241038 AC430000 */ sw $v1, ($v0) +/* 8873FC 8024103C 2A220003 */ slti $v0, $s1, 3 +/* 887400 80241040 1440FFF9 */ bnez $v0, .L80241028 +/* 887404 80241044 24A50004 */ addiu $a1, $a1, 4 +/* 887408 80241048 08090461 */ j .L80241184 +/* 88740C 8024104C 24020002 */ addiu $v0, $zero, 2 +.L80241050: +/* 887410 80241050 8E430004 */ lw $v1, 4($s2) +/* 887414 80241054 10600005 */ beqz $v1, .L8024106C +/* 887418 80241058 24020001 */ addiu $v0, $zero, 1 +/* 88741C 8024105C 1062000B */ beq $v1, $v0, .L8024108C +/* 887420 80241060 0000882D */ daddu $s1, $zero, $zero +/* 887424 80241064 08090450 */ j .L80241140 +/* 887428 80241068 0240282D */ daddu $a1, $s2, $zero +.L8024106C: +/* 88742C 8024106C 8E420064 */ lw $v0, 0x64($s2) +/* 887430 80241070 24420001 */ addiu $v0, $v0, 1 +/* 887434 80241074 AE420064 */ sw $v0, 0x64($s2) +/* 887438 80241078 28420010 */ slti $v0, $v0, 0x10 +/* 88743C 8024107C 1440002F */ bnez $v0, .L8024113C +/* 887440 80241080 0000882D */ daddu $s1, $zero, $zero +/* 887444 80241084 0809044C */ j .L80241130 +/* 887448 80241088 24020001 */ addiu $v0, $zero, 1 +.L8024108C: +/* 88744C 8024108C 4480A000 */ mtc1 $zero, $f20 +/* 887450 80241090 24130014 */ addiu $s3, $zero, 0x14 +/* 887454 80241094 0240802D */ daddu $s0, $s2, $zero +.L80241098: +/* 887458 80241098 4405A000 */ mfc1 $a1, $f20 +/* 88745C 8024109C AFB30010 */ sw $s3, 0x10($sp) +/* 887460 802410A0 8E060038 */ lw $a2, 0x38($s0) +/* 887464 802410A4 8E470064 */ lw $a3, 0x64($s2) +/* 887468 802410A8 0C00A8ED */ jal update_lerp +/* 88746C 802410AC 24040001 */ addiu $a0, $zero, 1 +/* 887470 802410B0 C6020014 */ lwc1 $f2, 0x14($s0) +/* 887474 802410B4 46001080 */ add.s $f2, $f2, $f0 +/* 887478 802410B8 4405A000 */ mfc1 $a1, $f20 +/* 88747C 802410BC E6020014 */ swc1 $f2, 0x14($s0) +/* 887480 802410C0 AFB30010 */ sw $s3, 0x10($sp) +/* 887484 802410C4 8E060044 */ lw $a2, 0x44($s0) +/* 887488 802410C8 8E470064 */ lw $a3, 0x64($s2) +/* 88748C 802410CC 0C00A8ED */ jal update_lerp +/* 887490 802410D0 24040001 */ addiu $a0, $zero, 1 +/* 887494 802410D4 C6020020 */ lwc1 $f2, 0x20($s0) +/* 887498 802410D8 46001080 */ add.s $f2, $f2, $f0 +/* 88749C 802410DC 4405A000 */ mfc1 $a1, $f20 +/* 8874A0 802410E0 E6020020 */ swc1 $f2, 0x20($s0) +/* 8874A4 802410E4 AFB30010 */ sw $s3, 0x10($sp) +/* 8874A8 802410E8 8E060050 */ lw $a2, 0x50($s0) +/* 8874AC 802410EC 8E470064 */ lw $a3, 0x64($s2) +/* 8874B0 802410F0 0C00A8ED */ jal update_lerp +/* 8874B4 802410F4 24040001 */ addiu $a0, $zero, 1 +/* 8874B8 802410F8 C602002C */ lwc1 $f2, 0x2c($s0) +/* 8874BC 802410FC 46001080 */ add.s $f2, $f2, $f0 +/* 8874C0 80241100 26310001 */ addiu $s1, $s1, 1 +/* 8874C4 80241104 2A220003 */ slti $v0, $s1, 3 +/* 8874C8 80241108 E602002C */ swc1 $f2, 0x2c($s0) +/* 8874CC 8024110C 1440FFE2 */ bnez $v0, .L80241098 +/* 8874D0 80241110 26100004 */ addiu $s0, $s0, 4 +/* 8874D4 80241114 8E420064 */ lw $v0, 0x64($s2) +/* 8874D8 80241118 24420001 */ addiu $v0, $v0, 1 +/* 8874DC 8024111C AE420064 */ sw $v0, 0x64($s2) +/* 8874E0 80241120 28420015 */ slti $v0, $v0, 0x15 +/* 8874E4 80241124 14400005 */ bnez $v0, .L8024113C +/* 8874E8 80241128 0000882D */ daddu $s1, $zero, $zero +/* 8874EC 8024112C 24020002 */ addiu $v0, $zero, 2 +.L80241130: +/* 8874F0 80241130 AE420004 */ sw $v0, 4($s2) +/* 8874F4 80241134 AE400064 */ sw $zero, 0x64($s2) +/* 8874F8 80241138 0000882D */ daddu $s1, $zero, $zero +.L8024113C: +/* 8874FC 8024113C 0240282D */ daddu $a1, $s2, $zero +.L80241140: +/* 887500 80241140 8CA20008 */ lw $v0, 8($a1) +/* 887504 80241144 C4A00014 */ lwc1 $f0, 0x14($a1) +/* 887508 80241148 8C42000C */ lw $v0, 0xc($v0) +/* 88750C 8024114C E4400010 */ swc1 $f0, 0x10($v0) +/* 887510 80241150 8CA20008 */ lw $v0, 8($a1) +/* 887514 80241154 C4A00020 */ lwc1 $f0, 0x20($a1) +/* 887518 80241158 8C42000C */ lw $v0, 0xc($v0) +/* 88751C 8024115C 26310001 */ addiu $s1, $s1, 1 +/* 887520 80241160 E4400014 */ swc1 $f0, 0x14($v0) +/* 887524 80241164 8CA20008 */ lw $v0, 8($a1) +/* 887528 80241168 C4A0002C */ lwc1 $f0, 0x2c($a1) +/* 88752C 8024116C 8C42000C */ lw $v0, 0xc($v0) +/* 887530 80241170 E4400018 */ swc1 $f0, 0x18($v0) +/* 887534 80241174 2A220003 */ slti $v0, $s1, 3 +/* 887538 80241178 1440FFF1 */ bnez $v0, .L80241140 +/* 88753C 8024117C 24A50004 */ addiu $a1, $a1, 4 +/* 887540 80241180 0000102D */ daddu $v0, $zero, $zero +.L80241184: +/* 887544 80241184 8FBF0044 */ lw $ra, 0x44($sp) +/* 887548 80241188 8FB60040 */ lw $s6, 0x40($sp) +/* 88754C 8024118C 8FB5003C */ lw $s5, 0x3c($sp) +/* 887550 80241190 8FB40038 */ lw $s4, 0x38($sp) +/* 887554 80241194 8FB30034 */ lw $s3, 0x34($sp) +/* 887558 80241198 8FB20030 */ lw $s2, 0x30($sp) +/* 88755C 8024119C 8FB1002C */ lw $s1, 0x2c($sp) +/* 887560 802411A0 8FB00028 */ lw $s0, 0x28($sp) +/* 887564 802411A4 D7B80058 */ ldc1 $f24, 0x58($sp) +/* 887568 802411A8 D7B60050 */ ldc1 $f22, 0x50($sp) +/* 88756C 802411AC D7B40048 */ ldc1 $f20, 0x48($sp) +/* 887570 802411B0 03E00008 */ jr $ra +/* 887574 802411B4 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8.s deleted file mode 100644 index c5d479b887..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B8 -/* 887578 802411B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88757C 802411BC AFB10014 */ sw $s1, 0x14($sp) -/* 887580 802411C0 0080882D */ daddu $s1, $a0, $zero -/* 887584 802411C4 AFB20018 */ sw $s2, 0x18($sp) -/* 887588 802411C8 AFBF001C */ sw $ra, 0x1c($sp) -/* 88758C 802411CC AFB00010 */ sw $s0, 0x10($sp) -/* 887590 802411D0 8E30000C */ lw $s0, 0xc($s1) -/* 887594 802411D4 10A00010 */ beqz $a1, .L80241218 -/* 887598 802411D8 0000902D */ daddu $s2, $zero, $zero -/* 88759C 802411DC 8E050000 */ lw $a1, ($s0) -/* 8875A0 802411E0 0C0B1EAF */ jal get_variable -/* 8875A4 802411E4 26100004 */ addiu $s0, $s0, 4 -/* 8875A8 802411E8 AE220084 */ sw $v0, 0x84($s1) -/* 8875AC 802411EC 8E050000 */ lw $a1, ($s0) -/* 8875B0 802411F0 0C0B1EAF */ jal get_variable -/* 8875B4 802411F4 0220202D */ daddu $a0, $s1, $zero -/* 8875B8 802411F8 0240202D */ daddu $a0, $s2, $zero -/* 8875BC 802411FC 240500D0 */ addiu $a1, $zero, 0xd0 -/* 8875C0 80241200 00A0302D */ daddu $a2, $a1, $zero -/* 8875C4 80241204 00A0382D */ daddu $a3, $a1, $zero -/* 8875C8 80241208 AE220088 */ sw $v0, 0x88($s1) -/* 8875CC 8024120C AE200070 */ sw $zero, 0x70($s1) -/* 8875D0 80241210 0C04DF84 */ jal func_80137E10 -/* 8875D4 80241214 AE200074 */ sw $zero, 0x74($s1) -.L80241218: -/* 8875D8 80241218 8E230070 */ lw $v1, 0x70($s1) -/* 8875DC 8024121C 24040001 */ addiu $a0, $zero, 1 -/* 8875E0 80241220 10640019 */ beq $v1, $a0, .L80241288 -/* 8875E4 80241224 28620002 */ slti $v0, $v1, 2 -/* 8875E8 80241228 10400005 */ beqz $v0, .L80241240 -/* 8875EC 8024122C 24020002 */ addiu $v0, $zero, 2 -/* 8875F0 80241230 10600007 */ beqz $v1, .L80241250 -/* 8875F4 80241234 240500FF */ addiu $a1, $zero, 0xff -/* 8875F8 80241238 080904B2 */ j .L802412C8 -/* 8875FC 8024123C 00000000 */ nop -.L80241240: -/* 887600 80241240 10620019 */ beq $v1, $v0, .L802412A8 -/* 887604 80241244 00000000 */ nop -/* 887608 80241248 080904B2 */ j .L802412C8 -/* 88760C 8024124C 00000000 */ nop -.L80241250: -/* 887610 80241250 8E220074 */ lw $v0, 0x74($s1) -/* 887614 80241254 14450004 */ bne $v0, $a1, .L80241268 -/* 887618 80241258 00000000 */ nop -/* 88761C 8024125C AE240070 */ sw $a0, 0x70($s1) -/* 887620 80241260 AE200078 */ sw $zero, 0x78($s1) -/* 887624 80241264 8E220074 */ lw $v0, 0x74($s1) -.L80241268: -/* 887628 80241268 8E230084 */ lw $v1, 0x84($s1) -/* 88762C 8024126C 00431021 */ addu $v0, $v0, $v1 -/* 887630 80241270 AE220074 */ sw $v0, 0x74($s1) -/* 887634 80241274 28420100 */ slti $v0, $v0, 0x100 -/* 887638 80241278 50400013 */ beql $v0, $zero, .L802412C8 -/* 88763C 8024127C AE250074 */ sw $a1, 0x74($s1) -/* 887640 80241280 080904B2 */ j .L802412C8 -/* 887644 80241284 00000000 */ nop -.L80241288: -/* 887648 80241288 8E220078 */ lw $v0, 0x78($s1) -/* 88764C 8024128C 24420001 */ addiu $v0, $v0, 1 -/* 887650 80241290 AE220078 */ sw $v0, 0x78($s1) -/* 887654 80241294 28420002 */ slti $v0, $v0, 2 -/* 887658 80241298 1440000B */ bnez $v0, .L802412C8 -/* 88765C 8024129C 24020002 */ addiu $v0, $zero, 2 -/* 887660 802412A0 080904B2 */ j .L802412C8 -/* 887664 802412A4 AE220070 */ sw $v0, 0x70($s1) -.L802412A8: -/* 887668 802412A8 8E230074 */ lw $v1, 0x74($s1) -/* 88766C 802412AC 50600001 */ beql $v1, $zero, .L802412B4 -/* 887670 802412B0 24120001 */ addiu $s2, $zero, 1 -.L802412B4: -/* 887674 802412B4 8E220088 */ lw $v0, 0x88($s1) -/* 887678 802412B8 00621023 */ subu $v0, $v1, $v0 -/* 88767C 802412BC 04410002 */ bgez $v0, .L802412C8 -/* 887680 802412C0 AE220074 */ sw $v0, 0x74($s1) -/* 887684 802412C4 AE200074 */ sw $zero, 0x74($s1) -.L802412C8: -/* 887688 802412C8 C6200074 */ lwc1 $f0, 0x74($s1) -/* 88768C 802412CC 46800020 */ cvt.s.w $f0, $f0 -/* 887690 802412D0 44050000 */ mfc1 $a1, $f0 -/* 887694 802412D4 0C04DF62 */ jal func_80137D88 -/* 887698 802412D8 24040001 */ addiu $a0, $zero, 1 -/* 88769C 802412DC 0240102D */ daddu $v0, $s2, $zero -/* 8876A0 802412E0 8FBF001C */ lw $ra, 0x1c($sp) -/* 8876A4 802412E4 8FB20018 */ lw $s2, 0x18($sp) -/* 8876A8 802412E8 8FB10014 */ lw $s1, 0x14($sp) -/* 8876AC 802412EC 8FB00010 */ lw $s0, 0x10($sp) -/* 8876B0 802412F0 03E00008 */ jr $ra -/* 8876B4 802412F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s new file mode 100644 index 0000000000..6e0b488569 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802411B8_887578.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411B8_887578 +/* 887578 802411B8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 88757C 802411BC AFB10014 */ sw $s1, 0x14($sp) +/* 887580 802411C0 0080882D */ daddu $s1, $a0, $zero +/* 887584 802411C4 AFB20018 */ sw $s2, 0x18($sp) +/* 887588 802411C8 AFBF001C */ sw $ra, 0x1c($sp) +/* 88758C 802411CC AFB00010 */ sw $s0, 0x10($sp) +/* 887590 802411D0 8E30000C */ lw $s0, 0xc($s1) +/* 887594 802411D4 10A00010 */ beqz $a1, .L80241218 +/* 887598 802411D8 0000902D */ daddu $s2, $zero, $zero +/* 88759C 802411DC 8E050000 */ lw $a1, ($s0) +/* 8875A0 802411E0 0C0B1EAF */ jal get_variable +/* 8875A4 802411E4 26100004 */ addiu $s0, $s0, 4 +/* 8875A8 802411E8 AE220084 */ sw $v0, 0x84($s1) +/* 8875AC 802411EC 8E050000 */ lw $a1, ($s0) +/* 8875B0 802411F0 0C0B1EAF */ jal get_variable +/* 8875B4 802411F4 0220202D */ daddu $a0, $s1, $zero +/* 8875B8 802411F8 0240202D */ daddu $a0, $s2, $zero +/* 8875BC 802411FC 240500D0 */ addiu $a1, $zero, 0xd0 +/* 8875C0 80241200 00A0302D */ daddu $a2, $a1, $zero +/* 8875C4 80241204 00A0382D */ daddu $a3, $a1, $zero +/* 8875C8 80241208 AE220088 */ sw $v0, 0x88($s1) +/* 8875CC 8024120C AE200070 */ sw $zero, 0x70($s1) +/* 8875D0 80241210 0C04DF84 */ jal func_80137E10 +/* 8875D4 80241214 AE200074 */ sw $zero, 0x74($s1) +.L80241218: +/* 8875D8 80241218 8E230070 */ lw $v1, 0x70($s1) +/* 8875DC 8024121C 24040001 */ addiu $a0, $zero, 1 +/* 8875E0 80241220 10640019 */ beq $v1, $a0, .L80241288 +/* 8875E4 80241224 28620002 */ slti $v0, $v1, 2 +/* 8875E8 80241228 10400005 */ beqz $v0, .L80241240 +/* 8875EC 8024122C 24020002 */ addiu $v0, $zero, 2 +/* 8875F0 80241230 10600007 */ beqz $v1, .L80241250 +/* 8875F4 80241234 240500FF */ addiu $a1, $zero, 0xff +/* 8875F8 80241238 080904B2 */ j .L802412C8 +/* 8875FC 8024123C 00000000 */ nop +.L80241240: +/* 887600 80241240 10620019 */ beq $v1, $v0, .L802412A8 +/* 887604 80241244 00000000 */ nop +/* 887608 80241248 080904B2 */ j .L802412C8 +/* 88760C 8024124C 00000000 */ nop +.L80241250: +/* 887610 80241250 8E220074 */ lw $v0, 0x74($s1) +/* 887614 80241254 14450004 */ bne $v0, $a1, .L80241268 +/* 887618 80241258 00000000 */ nop +/* 88761C 8024125C AE240070 */ sw $a0, 0x70($s1) +/* 887620 80241260 AE200078 */ sw $zero, 0x78($s1) +/* 887624 80241264 8E220074 */ lw $v0, 0x74($s1) +.L80241268: +/* 887628 80241268 8E230084 */ lw $v1, 0x84($s1) +/* 88762C 8024126C 00431021 */ addu $v0, $v0, $v1 +/* 887630 80241270 AE220074 */ sw $v0, 0x74($s1) +/* 887634 80241274 28420100 */ slti $v0, $v0, 0x100 +/* 887638 80241278 50400013 */ beql $v0, $zero, .L802412C8 +/* 88763C 8024127C AE250074 */ sw $a1, 0x74($s1) +/* 887640 80241280 080904B2 */ j .L802412C8 +/* 887644 80241284 00000000 */ nop +.L80241288: +/* 887648 80241288 8E220078 */ lw $v0, 0x78($s1) +/* 88764C 8024128C 24420001 */ addiu $v0, $v0, 1 +/* 887650 80241290 AE220078 */ sw $v0, 0x78($s1) +/* 887654 80241294 28420002 */ slti $v0, $v0, 2 +/* 887658 80241298 1440000B */ bnez $v0, .L802412C8 +/* 88765C 8024129C 24020002 */ addiu $v0, $zero, 2 +/* 887660 802412A0 080904B2 */ j .L802412C8 +/* 887664 802412A4 AE220070 */ sw $v0, 0x70($s1) +.L802412A8: +/* 887668 802412A8 8E230074 */ lw $v1, 0x74($s1) +/* 88766C 802412AC 50600001 */ beql $v1, $zero, .L802412B4 +/* 887670 802412B0 24120001 */ addiu $s2, $zero, 1 +.L802412B4: +/* 887674 802412B4 8E220088 */ lw $v0, 0x88($s1) +/* 887678 802412B8 00621023 */ subu $v0, $v1, $v0 +/* 88767C 802412BC 04410002 */ bgez $v0, .L802412C8 +/* 887680 802412C0 AE220074 */ sw $v0, 0x74($s1) +/* 887684 802412C4 AE200074 */ sw $zero, 0x74($s1) +.L802412C8: +/* 887688 802412C8 C6200074 */ lwc1 $f0, 0x74($s1) +/* 88768C 802412CC 46800020 */ cvt.s.w $f0, $f0 +/* 887690 802412D0 44050000 */ mfc1 $a1, $f0 +/* 887694 802412D4 0C04DF62 */ jal func_80137D88 +/* 887698 802412D8 24040001 */ addiu $a0, $zero, 1 +/* 88769C 802412DC 0240102D */ daddu $v0, $s2, $zero +/* 8876A0 802412E0 8FBF001C */ lw $ra, 0x1c($sp) +/* 8876A4 802412E4 8FB20018 */ lw $s2, 0x18($sp) +/* 8876A8 802412E8 8FB10014 */ lw $s1, 0x14($sp) +/* 8876AC 802412EC 8FB00010 */ lw $s0, 0x10($sp) +/* 8876B0 802412F0 03E00008 */ jr $ra +/* 8876B4 802412F4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8.s deleted file mode 100644 index 1737c6fa0a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412F8 -/* 8876B8 802412F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8876BC 802412FC AFBF0018 */ sw $ra, 0x18($sp) -/* 8876C0 80241300 0C00EAD2 */ jal get_npc_safe -/* 8876C4 80241304 2404FFFC */ addiu $a0, $zero, -4 -/* 8876C8 80241308 3C0141F0 */ lui $at, 0x41f0 -/* 8876CC 8024130C 44810000 */ mtc1 $at, $f0 -/* 8876D0 80241310 C442003C */ lwc1 $f2, 0x3c($v0) -/* 8876D4 80241314 46001080 */ add.s $f2, $f2, $f0 -/* 8876D8 80241318 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8876DC 8024131C 8C450038 */ lw $a1, 0x38($v0) -/* 8876E0 80241320 8C470040 */ lw $a3, 0x40($v0) -/* 8876E4 80241324 44061000 */ mfc1 $a2, $f2 -/* 8876E8 80241328 0C01BFBC */ jal func_8006FEF0 -/* 8876EC 8024132C 24040002 */ addiu $a0, $zero, 2 -/* 8876F0 80241330 8FBF0018 */ lw $ra, 0x18($sp) -/* 8876F4 80241334 24020002 */ addiu $v0, $zero, 2 -/* 8876F8 80241338 03E00008 */ jr $ra -/* 8876FC 8024133C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8_8876B8.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8_8876B8.s new file mode 100644 index 0000000000..2dbe7f5a77 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802412F8_8876B8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412F8_8876B8 +/* 8876B8 802412F8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8876BC 802412FC AFBF0018 */ sw $ra, 0x18($sp) +/* 8876C0 80241300 0C00EAD2 */ jal get_npc_safe +/* 8876C4 80241304 2404FFFC */ addiu $a0, $zero, -4 +/* 8876C8 80241308 3C0141F0 */ lui $at, 0x41f0 +/* 8876CC 8024130C 44810000 */ mtc1 $at, $f0 +/* 8876D0 80241310 C442003C */ lwc1 $f2, 0x3c($v0) +/* 8876D4 80241314 46001080 */ add.s $f2, $f2, $f0 +/* 8876D8 80241318 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8876DC 8024131C 8C450038 */ lw $a1, 0x38($v0) +/* 8876E0 80241320 8C470040 */ lw $a3, 0x40($v0) +/* 8876E4 80241324 44061000 */ mfc1 $a2, $f2 +/* 8876E8 80241328 0C01BFBC */ jal func_8006FEF0 +/* 8876EC 8024132C 24040002 */ addiu $a0, $zero, 2 +/* 8876F0 80241330 8FBF0018 */ lw $ra, 0x18($sp) +/* 8876F4 80241334 24020002 */ addiu $v0, $zero, 2 +/* 8876F8 80241338 03E00008 */ jr $ra +/* 8876FC 8024133C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340.s deleted file mode 100644 index 9c653166a6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241340 -/* 887700 80241340 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 887704 80241344 AFBF0018 */ sw $ra, 0x18($sp) -/* 887708 80241348 0C00EAD2 */ jal get_npc_safe -/* 88770C 8024134C 2404FFFC */ addiu $a0, $zero, -4 -/* 887710 80241350 3C0141F0 */ lui $at, 0x41f0 -/* 887714 80241354 44810000 */ mtc1 $at, $f0 -/* 887718 80241358 C442003C */ lwc1 $f2, 0x3c($v0) -/* 88771C 8024135C 46001080 */ add.s $f2, $f2, $f0 -/* 887720 80241360 E7A00010 */ swc1 $f0, 0x10($sp) -/* 887724 80241364 8C450038 */ lw $a1, 0x38($v0) -/* 887728 80241368 8C470040 */ lw $a3, 0x40($v0) -/* 88772C 8024136C 44061000 */ mfc1 $a2, $f2 -/* 887730 80241370 0C01BFBC */ jal func_8006FEF0 -/* 887734 80241374 24040004 */ addiu $a0, $zero, 4 -/* 887738 80241378 8FBF0018 */ lw $ra, 0x18($sp) -/* 88773C 8024137C 24020002 */ addiu $v0, $zero, 2 -/* 887740 80241380 03E00008 */ jr $ra -/* 887744 80241384 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340_887700.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340_887700.s new file mode 100644 index 0000000000..7edb6fd5c4 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80241340_887700.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241340_887700 +/* 887700 80241340 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 887704 80241344 AFBF0018 */ sw $ra, 0x18($sp) +/* 887708 80241348 0C00EAD2 */ jal get_npc_safe +/* 88770C 8024134C 2404FFFC */ addiu $a0, $zero, -4 +/* 887710 80241350 3C0141F0 */ lui $at, 0x41f0 +/* 887714 80241354 44810000 */ mtc1 $at, $f0 +/* 887718 80241358 C442003C */ lwc1 $f2, 0x3c($v0) +/* 88771C 8024135C 46001080 */ add.s $f2, $f2, $f0 +/* 887720 80241360 E7A00010 */ swc1 $f0, 0x10($sp) +/* 887724 80241364 8C450038 */ lw $a1, 0x38($v0) +/* 887728 80241368 8C470040 */ lw $a3, 0x40($v0) +/* 88772C 8024136C 44061000 */ mfc1 $a2, $f2 +/* 887730 80241370 0C01BFBC */ jal func_8006FEF0 +/* 887734 80241374 24040004 */ addiu $a0, $zero, 4 +/* 887738 80241378 8FBF0018 */ lw $ra, 0x18($sp) +/* 88773C 8024137C 24020002 */ addiu $v0, $zero, 2 +/* 887740 80241380 03E00008 */ jr $ra +/* 887744 80241384 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78.s deleted file mode 100644 index 63b2dd38bd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78.s +++ /dev/null @@ -1,93 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A78 -/* 889648 80240A78 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88964C 80240A7C AFB10014 */ sw $s1, 0x14($sp) -/* 889650 80240A80 0080882D */ daddu $s1, $a0, $zero -/* 889654 80240A84 AFBF001C */ sw $ra, 0x1c($sp) -/* 889658 80240A88 AFB20018 */ sw $s2, 0x18($sp) -/* 88965C 80240A8C AFB00010 */ sw $s0, 0x10($sp) -/* 889660 80240A90 8E240084 */ lw $a0, 0x84($s1) -/* 889664 80240A94 0C04C3D6 */ jal get_item_entity -/* 889668 80240A98 00A0802D */ daddu $s0, $a1, $zero -/* 88966C 80240A9C 12000005 */ beqz $s0, .L80240AB4 -/* 889670 80240AA0 0040902D */ daddu $s2, $v0, $zero -/* 889674 80240AA4 C640000C */ lwc1 $f0, 0xc($s2) -/* 889678 80240AA8 AE200074 */ sw $zero, 0x74($s1) -/* 88967C 80240AAC AE20007C */ sw $zero, 0x7c($s1) -/* 889680 80240AB0 E6200078 */ swc1 $f0, 0x78($s1) -.L80240AB4: -/* 889684 80240AB4 8E230074 */ lw $v1, 0x74($s1) -/* 889688 80240AB8 10600005 */ beqz $v1, .L80240AD0 -/* 88968C 80240ABC 24020001 */ addiu $v0, $zero, 1 -/* 889690 80240AC0 10620024 */ beq $v1, $v0, .L80240B54 -/* 889694 80240AC4 00000000 */ nop -/* 889698 80240AC8 080902EB */ j .L80240BAC -/* 88969C 80240ACC 00000000 */ nop -.L80240AD0: -/* 8896A0 80240AD0 3C013FC9 */ lui $at, 0x3fc9 -/* 8896A4 80240AD4 34210FD8 */ ori $at, $at, 0xfd8 -/* 8896A8 80240AD8 44810000 */ mtc1 $at, $f0 -/* 8896AC 80240ADC C62C007C */ lwc1 $f12, 0x7c($s1) -/* 8896B0 80240AE0 46806320 */ cvt.s.w $f12, $f12 -/* 8896B4 80240AE4 46006302 */ mul.s $f12, $f12, $f0 -/* 8896B8 80240AE8 00000000 */ nop -/* 8896BC 80240AEC 3C0141F0 */ lui $at, 0x41f0 -/* 8896C0 80240AF0 44810000 */ mtc1 $at, $f0 -/* 8896C4 80240AF4 0C00A874 */ jal cos_rad -/* 8896C8 80240AF8 46006303 */ div.s $f12, $f12, $f0 -/* 8896CC 80240AFC 3C013F80 */ lui $at, 0x3f80 -/* 8896D0 80240B00 44811000 */ mtc1 $at, $f2 -/* 8896D4 80240B04 00000000 */ nop -/* 8896D8 80240B08 46001081 */ sub.s $f2, $f2, $f0 -/* 8896DC 80240B0C 3C0141A0 */ lui $at, 0x41a0 -/* 8896E0 80240B10 44810000 */ mtc1 $at, $f0 -/* 8896E4 80240B14 00000000 */ nop -/* 8896E8 80240B18 46001082 */ mul.s $f2, $f2, $f0 -/* 8896EC 80240B1C 00000000 */ nop -/* 8896F0 80240B20 C6200078 */ lwc1 $f0, 0x78($s1) -/* 8896F4 80240B24 46020000 */ add.s $f0, $f0, $f2 -/* 8896F8 80240B28 E640000C */ swc1 $f0, 0xc($s2) -/* 8896FC 80240B2C 8E23007C */ lw $v1, 0x7c($s1) -/* 889700 80240B30 2402001E */ addiu $v0, $zero, 0x1e -/* 889704 80240B34 14620005 */ bne $v1, $v0, .L80240B4C -/* 889708 80240B38 24620001 */ addiu $v0, $v1, 1 -/* 88970C 80240B3C 24020001 */ addiu $v0, $zero, 1 -/* 889710 80240B40 AE220074 */ sw $v0, 0x74($s1) -/* 889714 80240B44 080902EB */ j .L80240BAC -/* 889718 80240B48 AE20007C */ sw $zero, 0x7c($s1) -.L80240B4C: -/* 88971C 80240B4C 080902EB */ j .L80240BAC -/* 889720 80240B50 AE22007C */ sw $v0, 0x7c($s1) -.L80240B54: -/* 889724 80240B54 C62C007C */ lwc1 $f12, 0x7c($s1) -/* 889728 80240B58 0C00A8D4 */ jal cos_deg -/* 88972C 80240B5C 46806320 */ cvt.s.w $f12, $f12 -/* 889730 80240B60 3C014040 */ lui $at, 0x4040 -/* 889734 80240B64 44811000 */ mtc1 $at, $f2 -/* 889738 80240B68 00000000 */ nop -/* 88973C 80240B6C 46020002 */ mul.s $f0, $f0, $f2 -/* 889740 80240B70 00000000 */ nop -/* 889744 80240B74 3C014188 */ lui $at, 0x4188 -/* 889748 80240B78 44812000 */ mtc1 $at, $f4 -/* 88974C 80240B7C C6220078 */ lwc1 $f2, 0x78($s1) -/* 889750 80240B80 46041080 */ add.s $f2, $f2, $f4 -/* 889754 80240B84 46001080 */ add.s $f2, $f2, $f0 -/* 889758 80240B88 E642000C */ swc1 $f2, 0xc($s2) -/* 88975C 80240B8C 8E22007C */ lw $v0, 0x7c($s1) -/* 889760 80240B90 24420009 */ addiu $v0, $v0, 9 -/* 889764 80240B94 44826000 */ mtc1 $v0, $f12 -/* 889768 80240B98 00000000 */ nop -/* 88976C 80240B9C 0C00A6C9 */ jal clamp_angle -/* 889770 80240BA0 46806320 */ cvt.s.w $f12, $f12 -/* 889774 80240BA4 4600018D */ trunc.w.s $f6, $f0 -/* 889778 80240BA8 E626007C */ swc1 $f6, 0x7c($s1) -.L80240BAC: -/* 88977C 80240BAC 8FBF001C */ lw $ra, 0x1c($sp) -/* 889780 80240BB0 8FB20018 */ lw $s2, 0x18($sp) -/* 889784 80240BB4 8FB10014 */ lw $s1, 0x14($sp) -/* 889788 80240BB8 8FB00010 */ lw $s0, 0x10($sp) -/* 88978C 80240BBC 0000102D */ daddu $v0, $zero, $zero -/* 889790 80240BC0 03E00008 */ jr $ra -/* 889794 80240BC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s new file mode 100644 index 0000000000..494c35202a --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240A78_889648.s @@ -0,0 +1,93 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A78_889648 +/* 889648 80240A78 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 88964C 80240A7C AFB10014 */ sw $s1, 0x14($sp) +/* 889650 80240A80 0080882D */ daddu $s1, $a0, $zero +/* 889654 80240A84 AFBF001C */ sw $ra, 0x1c($sp) +/* 889658 80240A88 AFB20018 */ sw $s2, 0x18($sp) +/* 88965C 80240A8C AFB00010 */ sw $s0, 0x10($sp) +/* 889660 80240A90 8E240084 */ lw $a0, 0x84($s1) +/* 889664 80240A94 0C04C3D6 */ jal get_item_entity +/* 889668 80240A98 00A0802D */ daddu $s0, $a1, $zero +/* 88966C 80240A9C 12000005 */ beqz $s0, .L80240AB4 +/* 889670 80240AA0 0040902D */ daddu $s2, $v0, $zero +/* 889674 80240AA4 C640000C */ lwc1 $f0, 0xc($s2) +/* 889678 80240AA8 AE200074 */ sw $zero, 0x74($s1) +/* 88967C 80240AAC AE20007C */ sw $zero, 0x7c($s1) +/* 889680 80240AB0 E6200078 */ swc1 $f0, 0x78($s1) +.L80240AB4: +/* 889684 80240AB4 8E230074 */ lw $v1, 0x74($s1) +/* 889688 80240AB8 10600005 */ beqz $v1, .L80240AD0 +/* 88968C 80240ABC 24020001 */ addiu $v0, $zero, 1 +/* 889690 80240AC0 10620024 */ beq $v1, $v0, .L80240B54 +/* 889694 80240AC4 00000000 */ nop +/* 889698 80240AC8 080902EB */ j .L80240BAC +/* 88969C 80240ACC 00000000 */ nop +.L80240AD0: +/* 8896A0 80240AD0 3C013FC9 */ lui $at, 0x3fc9 +/* 8896A4 80240AD4 34210FD8 */ ori $at, $at, 0xfd8 +/* 8896A8 80240AD8 44810000 */ mtc1 $at, $f0 +/* 8896AC 80240ADC C62C007C */ lwc1 $f12, 0x7c($s1) +/* 8896B0 80240AE0 46806320 */ cvt.s.w $f12, $f12 +/* 8896B4 80240AE4 46006302 */ mul.s $f12, $f12, $f0 +/* 8896B8 80240AE8 00000000 */ nop +/* 8896BC 80240AEC 3C0141F0 */ lui $at, 0x41f0 +/* 8896C0 80240AF0 44810000 */ mtc1 $at, $f0 +/* 8896C4 80240AF4 0C00A874 */ jal cos_rad +/* 8896C8 80240AF8 46006303 */ div.s $f12, $f12, $f0 +/* 8896CC 80240AFC 3C013F80 */ lui $at, 0x3f80 +/* 8896D0 80240B00 44811000 */ mtc1 $at, $f2 +/* 8896D4 80240B04 00000000 */ nop +/* 8896D8 80240B08 46001081 */ sub.s $f2, $f2, $f0 +/* 8896DC 80240B0C 3C0141A0 */ lui $at, 0x41a0 +/* 8896E0 80240B10 44810000 */ mtc1 $at, $f0 +/* 8896E4 80240B14 00000000 */ nop +/* 8896E8 80240B18 46001082 */ mul.s $f2, $f2, $f0 +/* 8896EC 80240B1C 00000000 */ nop +/* 8896F0 80240B20 C6200078 */ lwc1 $f0, 0x78($s1) +/* 8896F4 80240B24 46020000 */ add.s $f0, $f0, $f2 +/* 8896F8 80240B28 E640000C */ swc1 $f0, 0xc($s2) +/* 8896FC 80240B2C 8E23007C */ lw $v1, 0x7c($s1) +/* 889700 80240B30 2402001E */ addiu $v0, $zero, 0x1e +/* 889704 80240B34 14620005 */ bne $v1, $v0, .L80240B4C +/* 889708 80240B38 24620001 */ addiu $v0, $v1, 1 +/* 88970C 80240B3C 24020001 */ addiu $v0, $zero, 1 +/* 889710 80240B40 AE220074 */ sw $v0, 0x74($s1) +/* 889714 80240B44 080902EB */ j .L80240BAC +/* 889718 80240B48 AE20007C */ sw $zero, 0x7c($s1) +.L80240B4C: +/* 88971C 80240B4C 080902EB */ j .L80240BAC +/* 889720 80240B50 AE22007C */ sw $v0, 0x7c($s1) +.L80240B54: +/* 889724 80240B54 C62C007C */ lwc1 $f12, 0x7c($s1) +/* 889728 80240B58 0C00A8D4 */ jal cos_deg +/* 88972C 80240B5C 46806320 */ cvt.s.w $f12, $f12 +/* 889730 80240B60 3C014040 */ lui $at, 0x4040 +/* 889734 80240B64 44811000 */ mtc1 $at, $f2 +/* 889738 80240B68 00000000 */ nop +/* 88973C 80240B6C 46020002 */ mul.s $f0, $f0, $f2 +/* 889740 80240B70 00000000 */ nop +/* 889744 80240B74 3C014188 */ lui $at, 0x4188 +/* 889748 80240B78 44812000 */ mtc1 $at, $f4 +/* 88974C 80240B7C C6220078 */ lwc1 $f2, 0x78($s1) +/* 889750 80240B80 46041080 */ add.s $f2, $f2, $f4 +/* 889754 80240B84 46001080 */ add.s $f2, $f2, $f0 +/* 889758 80240B88 E642000C */ swc1 $f2, 0xc($s2) +/* 88975C 80240B8C 8E22007C */ lw $v0, 0x7c($s1) +/* 889760 80240B90 24420009 */ addiu $v0, $v0, 9 +/* 889764 80240B94 44826000 */ mtc1 $v0, $f12 +/* 889768 80240B98 00000000 */ nop +/* 88976C 80240B9C 0C00A6C9 */ jal clamp_angle +/* 889770 80240BA0 46806320 */ cvt.s.w $f12, $f12 +/* 889774 80240BA4 4600018D */ trunc.w.s $f6, $f0 +/* 889778 80240BA8 E626007C */ swc1 $f6, 0x7c($s1) +.L80240BAC: +/* 88977C 80240BAC 8FBF001C */ lw $ra, 0x1c($sp) +/* 889780 80240BB0 8FB20018 */ lw $s2, 0x18($sp) +/* 889784 80240BB4 8FB10014 */ lw $s1, 0x14($sp) +/* 889788 80240BB8 8FB00010 */ lw $s0, 0x10($sp) +/* 88978C 80240BBC 0000102D */ daddu $v0, $zero, $zero +/* 889790 80240BC0 03E00008 */ jr $ra +/* 889794 80240BC4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8.s deleted file mode 100644 index 8aecb822c5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BC8 -/* 889798 80240BC8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88979C 80240BCC AFB00010 */ sw $s0, 0x10($sp) -/* 8897A0 80240BD0 0080802D */ daddu $s0, $a0, $zero -/* 8897A4 80240BD4 AFBF0014 */ sw $ra, 0x14($sp) -/* 8897A8 80240BD8 8E02000C */ lw $v0, 0xc($s0) -/* 8897AC 80240BDC 0C0B1EAF */ jal get_variable -/* 8897B0 80240BE0 8C450000 */ lw $a1, ($v0) -/* 8897B4 80240BE4 00021140 */ sll $v0, $v0, 5 -/* 8897B8 80240BE8 AE000084 */ sw $zero, 0x84($s0) -/* 8897BC 80240BEC 3C018008 */ lui $at, 0x8008 -/* 8897C0 80240BF0 00220821 */ addu $at, $at, $v0 -/* 8897C4 80240BF4 942278F8 */ lhu $v0, 0x78f8($at) -/* 8897C8 80240BF8 30420040 */ andi $v0, $v0, 0x40 -/* 8897CC 80240BFC 10400002 */ beqz $v0, .L80240C08 -/* 8897D0 80240C00 24020001 */ addiu $v0, $zero, 1 -/* 8897D4 80240C04 AE020084 */ sw $v0, 0x84($s0) -.L80240C08: -/* 8897D8 80240C08 8FBF0014 */ lw $ra, 0x14($sp) -/* 8897DC 80240C0C 8FB00010 */ lw $s0, 0x10($sp) -/* 8897E0 80240C10 24020002 */ addiu $v0, $zero, 2 -/* 8897E4 80240C14 03E00008 */ jr $ra -/* 8897E8 80240C18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s new file mode 100644 index 0000000000..3e76e15376 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240BC8_889798.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BC8_889798 +/* 889798 80240BC8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 88979C 80240BCC AFB00010 */ sw $s0, 0x10($sp) +/* 8897A0 80240BD0 0080802D */ daddu $s0, $a0, $zero +/* 8897A4 80240BD4 AFBF0014 */ sw $ra, 0x14($sp) +/* 8897A8 80240BD8 8E02000C */ lw $v0, 0xc($s0) +/* 8897AC 80240BDC 0C0B1EAF */ jal get_variable +/* 8897B0 80240BE0 8C450000 */ lw $a1, ($v0) +/* 8897B4 80240BE4 00021140 */ sll $v0, $v0, 5 +/* 8897B8 80240BE8 AE000084 */ sw $zero, 0x84($s0) +/* 8897BC 80240BEC 3C018008 */ lui $at, 0x8008 +/* 8897C0 80240BF0 00220821 */ addu $at, $at, $v0 +/* 8897C4 80240BF4 942278F8 */ lhu $v0, 0x78f8($at) +/* 8897C8 80240BF8 30420040 */ andi $v0, $v0, 0x40 +/* 8897CC 80240BFC 10400002 */ beqz $v0, .L80240C08 +/* 8897D0 80240C00 24020001 */ addiu $v0, $zero, 1 +/* 8897D4 80240C04 AE020084 */ sw $v0, 0x84($s0) +.L80240C08: +/* 8897D8 80240C08 8FBF0014 */ lw $ra, 0x14($sp) +/* 8897DC 80240C0C 8FB00010 */ lw $s0, 0x10($sp) +/* 8897E0 80240C10 24020002 */ addiu $v0, $zero, 2 +/* 8897E4 80240C14 03E00008 */ jr $ra +/* 8897E8 80240C18 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C.s deleted file mode 100644 index 8fb9f6d1bb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C1C -/* 8897EC 80240C1C 3C03800A */ lui $v1, %hi(D_8009A650) -/* 8897F0 80240C20 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) -/* 8897F4 80240C24 8C620000 */ lw $v0, ($v1) -/* 8897F8 80240C28 34420040 */ ori $v0, $v0, 0x40 -/* 8897FC 80240C2C AC620000 */ sw $v0, ($v1) -/* 889800 80240C30 03E00008 */ jr $ra -/* 889804 80240C34 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C_8897EC.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C_8897EC.s new file mode 100644 index 0000000000..4976ff5f9e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C1C_8897EC.s @@ -0,0 +1,11 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C1C_8897EC +/* 8897EC 80240C1C 3C03800A */ lui $v1, %hi(D_8009A650) +/* 8897F0 80240C20 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) +/* 8897F4 80240C24 8C620000 */ lw $v0, ($v1) +/* 8897F8 80240C28 34420040 */ ori $v0, $v0, 0x40 +/* 8897FC 80240C2C AC620000 */ sw $v0, ($v1) +/* 889800 80240C30 03E00008 */ jr $ra +/* 889804 80240C34 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38.s deleted file mode 100644 index 47ab9e8e0a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C38 -/* 889808 80240C38 3C02800A */ lui $v0, %hi(D_8009A650) -/* 88980C 80240C3C 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 889810 80240C40 8C430000 */ lw $v1, ($v0) -/* 889814 80240C44 2404FFBF */ addiu $a0, $zero, -0x41 -/* 889818 80240C48 00641824 */ and $v1, $v1, $a0 -/* 88981C 80240C4C AC430000 */ sw $v1, ($v0) -/* 889820 80240C50 03E00008 */ jr $ra -/* 889824 80240C54 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38_889808.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38_889808.s new file mode 100644 index 0000000000..de27132741 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C38_889808.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C38_889808 +/* 889808 80240C38 3C02800A */ lui $v0, %hi(D_8009A650) +/* 88980C 80240C3C 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* 889810 80240C40 8C430000 */ lw $v1, ($v0) +/* 889814 80240C44 2404FFBF */ addiu $a0, $zero, -0x41 +/* 889818 80240C48 00641824 */ and $v1, $v1, $a0 +/* 88981C 80240C4C AC430000 */ sw $v1, ($v0) +/* 889820 80240C50 03E00008 */ jr $ra +/* 889824 80240C54 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C58.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C58.s deleted file mode 100644 index 26654b9985..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C58.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C58 -/* 889828 80240C58 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88982C 80240C5C AFBF0010 */ sw $ra, 0x10($sp) -/* 889830 80240C60 8C82000C */ lw $v0, 0xc($a0) -/* 889834 80240C64 0C0B1EAF */ jal get_variable -/* 889838 80240C68 8C450000 */ lw $a1, ($v0) -/* 88983C 80240C6C 0C0B95A4 */ jal func_802E5690 -/* 889840 80240C70 0040202D */ daddu $a0, $v0, $zero -/* 889844 80240C74 8FBF0010 */ lw $ra, 0x10($sp) -/* 889848 80240C78 24020002 */ addiu $v0, $zero, 2 -/* 88984C 80240C7C 03E00008 */ jr $ra -/* 889850 80240C80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C58_889828.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C58_889828.s new file mode 100644 index 0000000000..742d75a371 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C58_889828.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C58_889828 +/* 889828 80240C58 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 88982C 80240C5C AFBF0010 */ sw $ra, 0x10($sp) +/* 889830 80240C60 8C82000C */ lw $v0, 0xc($a0) +/* 889834 80240C64 0C0B1EAF */ jal get_variable +/* 889838 80240C68 8C450000 */ lw $a1, ($v0) +/* 88983C 80240C6C 0C0B95A4 */ jal func_802E5690 +/* 889840 80240C70 0040202D */ daddu $a0, $v0, $zero +/* 889844 80240C74 8FBF0010 */ lw $ra, 0x10($sp) +/* 889848 80240C78 24020002 */ addiu $v0, $zero, 2 +/* 88984C 80240C7C 03E00008 */ jr $ra +/* 889850 80240C80 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84.s deleted file mode 100644 index fa5bf8c3c6..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C84 -/* 889854 80240C84 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 889858 80240C88 AFB00010 */ sw $s0, 0x10($sp) -/* 88985C 80240C8C 0080802D */ daddu $s0, $a0, $zero -/* 889860 80240C90 AFBF0018 */ sw $ra, 0x18($sp) -/* 889864 80240C94 AFB10014 */ sw $s1, 0x14($sp) -/* 889868 80240C98 8E11000C */ lw $s1, 0xc($s0) -/* 88986C 80240C9C 8E250000 */ lw $a1, ($s1) -/* 889870 80240CA0 0C0B1EAF */ jal get_variable -/* 889874 80240CA4 26310004 */ addiu $s1, $s1, 4 -/* 889878 80240CA8 0200202D */ daddu $a0, $s0, $zero -/* 88987C 80240CAC 3C038011 */ lui $v1, %hi(gPlayerData) -/* 889880 80240CB0 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 889884 80240CB4 000210C0 */ sll $v0, $v0, 3 -/* 889888 80240CB8 00431021 */ addu $v0, $v0, $v1 -/* 88988C 80240CBC 90460015 */ lbu $a2, 0x15($v0) -/* 889890 80240CC0 8E250000 */ lw $a1, ($s1) -/* 889894 80240CC4 24C60001 */ addiu $a2, $a2, 1 -/* 889898 80240CC8 A0460015 */ sb $a2, 0x15($v0) -/* 88989C 80240CCC 00063600 */ sll $a2, $a2, 0x18 -/* 8898A0 80240CD0 0C0B2026 */ jal set_variable -/* 8898A4 80240CD4 00063603 */ sra $a2, $a2, 0x18 -/* 8898A8 80240CD8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8898AC 80240CDC 8FB10014 */ lw $s1, 0x14($sp) -/* 8898B0 80240CE0 8FB00010 */ lw $s0, 0x10($sp) -/* 8898B4 80240CE4 24020002 */ addiu $v0, $zero, 2 -/* 8898B8 80240CE8 03E00008 */ jr $ra -/* 8898BC 80240CEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84_889854.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84_889854.s new file mode 100644 index 0000000000..d0bc216970 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240C84_889854.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240C84_889854 +/* 889854 80240C84 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 889858 80240C88 AFB00010 */ sw $s0, 0x10($sp) +/* 88985C 80240C8C 0080802D */ daddu $s0, $a0, $zero +/* 889860 80240C90 AFBF0018 */ sw $ra, 0x18($sp) +/* 889864 80240C94 AFB10014 */ sw $s1, 0x14($sp) +/* 889868 80240C98 8E11000C */ lw $s1, 0xc($s0) +/* 88986C 80240C9C 8E250000 */ lw $a1, ($s1) +/* 889870 80240CA0 0C0B1EAF */ jal get_variable +/* 889874 80240CA4 26310004 */ addiu $s1, $s1, 4 +/* 889878 80240CA8 0200202D */ daddu $a0, $s0, $zero +/* 88987C 80240CAC 3C038011 */ lui $v1, %hi(gPlayerData) +/* 889880 80240CB0 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 889884 80240CB4 000210C0 */ sll $v0, $v0, 3 +/* 889888 80240CB8 00431021 */ addu $v0, $v0, $v1 +/* 88988C 80240CBC 90460015 */ lbu $a2, 0x15($v0) +/* 889890 80240CC0 8E250000 */ lw $a1, ($s1) +/* 889894 80240CC4 24C60001 */ addiu $a2, $a2, 1 +/* 889898 80240CC8 A0460015 */ sb $a2, 0x15($v0) +/* 88989C 80240CCC 00063600 */ sll $a2, $a2, 0x18 +/* 8898A0 80240CD0 0C0B2026 */ jal set_variable +/* 8898A4 80240CD4 00063603 */ sra $a2, $a2, 0x18 +/* 8898A8 80240CD8 8FBF0018 */ lw $ra, 0x18($sp) +/* 8898AC 80240CDC 8FB10014 */ lw $s1, 0x14($sp) +/* 8898B0 80240CE0 8FB00010 */ lw $s0, 0x10($sp) +/* 8898B4 80240CE4 24020002 */ addiu $v0, $zero, 2 +/* 8898B8 80240CE8 03E00008 */ jr $ra +/* 8898BC 80240CEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0.s deleted file mode 100644 index c60997fad1..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF0 -/* 8898C0 80240CF0 3C028011 */ lui $v0, %hi(gPlayerData) -/* 8898C4 80240CF4 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 8898C8 80240CF8 000420C0 */ sll $a0, $a0, 3 -/* 8898CC 80240CFC 00822021 */ addu $a0, $a0, $v0 -/* 8898D0 80240D00 90820014 */ lbu $v0, 0x14($a0) -/* 8898D4 80240D04 10400009 */ beqz $v0, .L80240D2C -/* 8898D8 80240D08 00000000 */ nop -/* 8898DC 80240D0C 90820015 */ lbu $v0, 0x15($a0) -/* 8898E0 80240D10 00022600 */ sll $a0, $v0, 0x18 -/* 8898E4 80240D14 00041E03 */ sra $v1, $a0, 0x18 -/* 8898E8 80240D18 00051400 */ sll $v0, $a1, 0x10 -/* 8898EC 80240D1C 00021403 */ sra $v0, $v0, 0x10 -/* 8898F0 80240D20 0043102A */ slt $v0, $v0, $v1 -/* 8898F4 80240D24 10400003 */ beqz $v0, .L80240D34 -/* 8898F8 80240D28 00000000 */ nop -.L80240D2C: -/* 8898FC 80240D2C 03E00008 */ jr $ra -/* 889900 80240D30 2402FFFF */ addiu $v0, $zero, -1 -.L80240D34: -/* 889904 80240D34 03E00008 */ jr $ra -/* 889908 80240D38 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s new file mode 100644 index 0000000000..0124312a83 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240CF0_8898C0.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CF0_8898C0 +/* 8898C0 80240CF0 3C028011 */ lui $v0, %hi(gPlayerData) +/* 8898C4 80240CF4 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 8898C8 80240CF8 000420C0 */ sll $a0, $a0, 3 +/* 8898CC 80240CFC 00822021 */ addu $a0, $a0, $v0 +/* 8898D0 80240D00 90820014 */ lbu $v0, 0x14($a0) +/* 8898D4 80240D04 10400009 */ beqz $v0, .L80240D2C +/* 8898D8 80240D08 00000000 */ nop +/* 8898DC 80240D0C 90820015 */ lbu $v0, 0x15($a0) +/* 8898E0 80240D10 00022600 */ sll $a0, $v0, 0x18 +/* 8898E4 80240D14 00041E03 */ sra $v1, $a0, 0x18 +/* 8898E8 80240D18 00051400 */ sll $v0, $a1, 0x10 +/* 8898EC 80240D1C 00021403 */ sra $v0, $v0, 0x10 +/* 8898F0 80240D20 0043102A */ slt $v0, $v0, $v1 +/* 8898F4 80240D24 10400003 */ beqz $v0, .L80240D34 +/* 8898F8 80240D28 00000000 */ nop +.L80240D2C: +/* 8898FC 80240D2C 03E00008 */ jr $ra +/* 889900 80240D30 2402FFFF */ addiu $v0, $zero, -1 +.L80240D34: +/* 889904 80240D34 03E00008 */ jr $ra +/* 889908 80240D38 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C.s deleted file mode 100644 index a96ab484a9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D3C -/* 88990C 80240D3C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 889910 80240D40 AFB3001C */ sw $s3, 0x1c($sp) -/* 889914 80240D44 0080982D */ daddu $s3, $a0, $zero -/* 889918 80240D48 AFB00010 */ sw $s0, 0x10($sp) -/* 88991C 80240D4C 24100001 */ addiu $s0, $zero, 1 -/* 889920 80240D50 AFB40020 */ sw $s4, 0x20($sp) -/* 889924 80240D54 2414FFFF */ addiu $s4, $zero, -1 -/* 889928 80240D58 AFB50024 */ sw $s5, 0x24($sp) -/* 88992C 80240D5C 0200A82D */ daddu $s5, $s0, $zero -/* 889930 80240D60 AFB10014 */ sw $s1, 0x14($sp) -/* 889934 80240D64 3C118011 */ lui $s1, 0x8011 -/* 889938 80240D68 2631F298 */ addiu $s1, $s1, -0xd68 -/* 88993C 80240D6C AFBF0028 */ sw $ra, 0x28($sp) -/* 889940 80240D70 AFB20018 */ sw $s2, 0x18($sp) -/* 889944 80240D74 8E6200B4 */ lw $v0, 0xb4($s3) -/* 889948 80240D78 0280182D */ daddu $v1, $s4, $zero -/* 88994C 80240D7C AE630084 */ sw $v1, 0x84($s3) -/* 889950 80240D80 00021027 */ nor $v0, $zero, $v0 -/* 889954 80240D84 000217C2 */ srl $v0, $v0, 0x1f -/* 889958 80240D88 00029400 */ sll $s2, $v0, 0x10 -.L80240D8C: -/* 88995C 80240D8C 92220014 */ lbu $v0, 0x14($s1) -/* 889960 80240D90 50400008 */ beql $v0, $zero, .L80240DB4 -/* 889964 80240D94 26100001 */ addiu $s0, $s0, 1 -/* 889968 80240D98 0200202D */ daddu $a0, $s0, $zero -/* 88996C 80240D9C 0C09033C */ jal func_80240CF0 -/* 889970 80240DA0 00122C03 */ sra $a1, $s2, 0x10 -/* 889974 80240DA4 10540003 */ beq $v0, $s4, .L80240DB4 -/* 889978 80240DA8 26100001 */ addiu $s0, $s0, 1 -/* 88997C 80240DAC 08090370 */ j .L80240DC0 -/* 889980 80240DB0 AE750084 */ sw $s5, 0x84($s3) -.L80240DB4: -/* 889984 80240DB4 2A02000C */ slti $v0, $s0, 0xc -/* 889988 80240DB8 1440FFF4 */ bnez $v0, .L80240D8C -/* 88998C 80240DBC 26310008 */ addiu $s1, $s1, 8 -.L80240DC0: -/* 889990 80240DC0 8FBF0028 */ lw $ra, 0x28($sp) -/* 889994 80240DC4 8FB50024 */ lw $s5, 0x24($sp) -/* 889998 80240DC8 8FB40020 */ lw $s4, 0x20($sp) -/* 88999C 80240DCC 8FB3001C */ lw $s3, 0x1c($sp) -/* 8899A0 80240DD0 8FB20018 */ lw $s2, 0x18($sp) -/* 8899A4 80240DD4 8FB10014 */ lw $s1, 0x14($sp) -/* 8899A8 80240DD8 8FB00010 */ lw $s0, 0x10($sp) -/* 8899AC 80240DDC 24020002 */ addiu $v0, $zero, 2 -/* 8899B0 80240DE0 03E00008 */ jr $ra -/* 8899B4 80240DE4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s new file mode 100644 index 0000000000..f175cb7772 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D3C_88990C +/* 88990C 80240D3C 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 889910 80240D40 AFB3001C */ sw $s3, 0x1c($sp) +/* 889914 80240D44 0080982D */ daddu $s3, $a0, $zero +/* 889918 80240D48 AFB00010 */ sw $s0, 0x10($sp) +/* 88991C 80240D4C 24100001 */ addiu $s0, $zero, 1 +/* 889920 80240D50 AFB40020 */ sw $s4, 0x20($sp) +/* 889924 80240D54 2414FFFF */ addiu $s4, $zero, -1 +/* 889928 80240D58 AFB50024 */ sw $s5, 0x24($sp) +/* 88992C 80240D5C 0200A82D */ daddu $s5, $s0, $zero +/* 889930 80240D60 AFB10014 */ sw $s1, 0x14($sp) +/* 889934 80240D64 3C118011 */ lui $s1, 0x8011 +/* 889938 80240D68 2631F298 */ addiu $s1, $s1, -0xd68 +/* 88993C 80240D6C AFBF0028 */ sw $ra, 0x28($sp) +/* 889940 80240D70 AFB20018 */ sw $s2, 0x18($sp) +/* 889944 80240D74 8E6200B4 */ lw $v0, 0xb4($s3) +/* 889948 80240D78 0280182D */ daddu $v1, $s4, $zero +/* 88994C 80240D7C AE630084 */ sw $v1, 0x84($s3) +/* 889950 80240D80 00021027 */ nor $v0, $zero, $v0 +/* 889954 80240D84 000217C2 */ srl $v0, $v0, 0x1f +/* 889958 80240D88 00029400 */ sll $s2, $v0, 0x10 +.L80240D8C: +/* 88995C 80240D8C 92220014 */ lbu $v0, 0x14($s1) +/* 889960 80240D90 50400008 */ beql $v0, $zero, .L80240DB4 +/* 889964 80240D94 26100001 */ addiu $s0, $s0, 1 +/* 889968 80240D98 0200202D */ daddu $a0, $s0, $zero +/* 88996C 80240D9C 0C09033C */ jal func_80240CF0_8898C0 +/* 889970 80240DA0 00122C03 */ sra $a1, $s2, 0x10 +/* 889974 80240DA4 10540003 */ beq $v0, $s4, .L80240DB4 +/* 889978 80240DA8 26100001 */ addiu $s0, $s0, 1 +/* 88997C 80240DAC 08090370 */ j .L80240DC0 +/* 889980 80240DB0 AE750084 */ sw $s5, 0x84($s3) +.L80240DB4: +/* 889984 80240DB4 2A02000C */ slti $v0, $s0, 0xc +/* 889988 80240DB8 1440FFF4 */ bnez $v0, .L80240D8C +/* 88998C 80240DBC 26310008 */ addiu $s1, $s1, 8 +.L80240DC0: +/* 889990 80240DC0 8FBF0028 */ lw $ra, 0x28($sp) +/* 889994 80240DC4 8FB50024 */ lw $s5, 0x24($sp) +/* 889998 80240DC8 8FB40020 */ lw $s4, 0x20($sp) +/* 88999C 80240DCC 8FB3001C */ lw $s3, 0x1c($sp) +/* 8899A0 80240DD0 8FB20018 */ lw $s2, 0x18($sp) +/* 8899A4 80240DD4 8FB10014 */ lw $s1, 0x14($sp) +/* 8899A8 80240DD8 8FB00010 */ lw $s0, 0x10($sp) +/* 8899AC 80240DDC 24020002 */ addiu $v0, $zero, 2 +/* 8899B0 80240DE0 03E00008 */ jr $ra +/* 8899B4 80240DE4 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s index 247c9da693..6bbecc0c49 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240DE8_8899B8.s @@ -49,7 +49,7 @@ glabel func_80240DE8_8899B8 /* 889A64 80240E94 AE300108 */ sw $s0, 0x108($s1) /* 889A68 80240E98 8C420000 */ lw $v0, ($v0) /* 889A6C 80240E9C 02E0282D */ daddu $a1, $s7, $zero -/* 889A70 80240EA0 0C09033C */ jal func_80240CF0 +/* 889A70 80240EA0 0C09033C */ jal func_80240CF0_8898C0 /* 889A74 80240EA4 AE220084 */ sw $v0, 0x84($s1) /* 889A78 80240EA8 0040202D */ daddu $a0, $v0, $zero /* 889A7C 80240EAC 04800011 */ bltz $a0, .L80240EF4 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038.s deleted file mode 100644 index 337a6667e8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241038 -/* 889C08 80241038 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 889C0C 8024103C AFBF0010 */ sw $ra, 0x10($sp) -/* 889C10 80241040 8C82000C */ lw $v0, 0xc($a0) -/* 889C14 80241044 0C0B1EAF */ jal get_variable -/* 889C18 80241048 8C450000 */ lw $a1, ($v0) -/* 889C1C 8024104C 0C03AC5A */ jal func_800EB168 -/* 889C20 80241050 0040202D */ daddu $a0, $v0, $zero -/* 889C24 80241054 8FBF0010 */ lw $ra, 0x10($sp) -/* 889C28 80241058 24020002 */ addiu $v0, $zero, 2 -/* 889C2C 8024105C 03E00008 */ jr $ra -/* 889C30 80241060 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038_889C08.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038_889C08.s new file mode 100644 index 0000000000..31adaa0a6e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241038_889C08.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241038_889C08 +/* 889C08 80241038 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 889C0C 8024103C AFBF0010 */ sw $ra, 0x10($sp) +/* 889C10 80241040 8C82000C */ lw $v0, 0xc($a0) +/* 889C14 80241044 0C0B1EAF */ jal get_variable +/* 889C18 80241048 8C450000 */ lw $a1, ($v0) +/* 889C1C 8024104C 0C03AC5A */ jal func_800EB168 +/* 889C20 80241050 0040202D */ daddu $a0, $v0, $zero +/* 889C24 80241054 8FBF0010 */ lw $ra, 0x10($sp) +/* 889C28 80241058 24020002 */ addiu $v0, $zero, 2 +/* 889C2C 8024105C 03E00008 */ jr $ra +/* 889C30 80241060 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064.s deleted file mode 100644 index d15456edb7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241064 -/* 889C34 80241064 3C028011 */ lui $v0, 0x8011 -/* 889C38 80241068 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 889C3C 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 889C40 80241070 AFBF0010 */ sw $ra, 0x10($sp) -/* 889C44 80241074 00021100 */ sll $v0, $v0, 4 -/* 889C48 80241078 3C048009 */ lui $a0, 0x8009 -/* 889C4C 8024107C 00822021 */ addu $a0, $a0, $v0 -/* 889C50 80241080 8C84EF20 */ lw $a0, -0x10e0($a0) -/* 889C54 80241084 0C0496CF */ jal set_message_string -/* 889C58 80241088 0000282D */ daddu $a1, $zero, $zero -/* 889C5C 8024108C 8FBF0010 */ lw $ra, 0x10($sp) -/* 889C60 80241090 24020002 */ addiu $v0, $zero, 2 -/* 889C64 80241094 03E00008 */ jr $ra -/* 889C68 80241098 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s new file mode 100644 index 0000000000..0a9d47f416 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241064_889C34 +/* 889C34 80241064 3C028011 */ lui $v0, 0x8011 +/* 889C38 80241068 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 889C3C 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 889C40 80241070 AFBF0010 */ sw $ra, 0x10($sp) +/* 889C44 80241074 00021100 */ sll $v0, $v0, 4 +/* 889C48 80241078 3C048009 */ lui $a0, 0x8009 +/* 889C4C 8024107C 00822021 */ addu $a0, $a0, $v0 +/* 889C50 80241080 8C84EF20 */ lw $a0, -0x10e0($a0) +/* 889C54 80241084 0C0496CF */ jal set_message_string +/* 889C58 80241088 0000282D */ daddu $a1, $zero, $zero +/* 889C5C 8024108C 8FBF0010 */ lw $ra, 0x10($sp) +/* 889C60 80241090 24020002 */ addiu $v0, $zero, 2 +/* 889C64 80241094 03E00008 */ jr $ra +/* 889C68 80241098 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C.s deleted file mode 100644 index f7f7eb474f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024109C -/* 889C6C 8024109C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 889C70 802410A0 AFB1001C */ sw $s1, 0x1c($sp) -/* 889C74 802410A4 0080882D */ daddu $s1, $a0, $zero -/* 889C78 802410A8 AFBF0020 */ sw $ra, 0x20($sp) -/* 889C7C 802410AC AFB00018 */ sw $s0, 0x18($sp) -/* 889C80 802410B0 8E30000C */ lw $s0, 0xc($s1) -/* 889C84 802410B4 8E050000 */ lw $a1, ($s0) -/* 889C88 802410B8 0C0B1EAF */ jal get_variable -/* 889C8C 802410BC 26100004 */ addiu $s0, $s0, 4 -/* 889C90 802410C0 0C04417A */ jal get_entity_by_index -/* 889C94 802410C4 0040202D */ daddu $a0, $v0, $zero -/* 889C98 802410C8 8E100000 */ lw $s0, ($s0) -/* 889C9C 802410CC C444004C */ lwc1 $f4, 0x4c($v0) -/* 889CA0 802410D0 3C014148 */ lui $at, 0x4148 -/* 889CA4 802410D4 44810000 */ mtc1 $at, $f0 -/* 889CA8 802410D8 3C013F33 */ lui $at, 0x3f33 -/* 889CAC 802410DC 34213333 */ ori $at, $at, 0x3333 -/* 889CB0 802410E0 44811000 */ mtc1 $at, $f2 -/* 889CB4 802410E4 AFA00014 */ sw $zero, 0x14($sp) -/* 889CB8 802410E8 46002100 */ add.s $f4, $f4, $f0 -/* 889CBC 802410EC E7A20010 */ swc1 $f2, 0x10($sp) -/* 889CC0 802410F0 8C450048 */ lw $a1, 0x48($v0) -/* 889CC4 802410F4 8C470050 */ lw $a3, 0x50($v0) -/* 889CC8 802410F8 44062000 */ mfc1 $a2, $f4 -/* 889CCC 802410FC 0C01C5D4 */ jal func_80071750 -/* 889CD0 80241100 0000202D */ daddu $a0, $zero, $zero -/* 889CD4 80241104 0220202D */ daddu $a0, $s1, $zero -/* 889CD8 80241108 0200282D */ daddu $a1, $s0, $zero -/* 889CDC 8024110C 0C0B2026 */ jal set_variable -/* 889CE0 80241110 0040302D */ daddu $a2, $v0, $zero -/* 889CE4 80241114 8FBF0020 */ lw $ra, 0x20($sp) -/* 889CE8 80241118 8FB1001C */ lw $s1, 0x1c($sp) -/* 889CEC 8024111C 8FB00018 */ lw $s0, 0x18($sp) -/* 889CF0 80241120 24020002 */ addiu $v0, $zero, 2 -/* 889CF4 80241124 03E00008 */ jr $ra -/* 889CF8 80241128 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C_889C6C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C_889C6C.s new file mode 100644 index 0000000000..52c2ae1d55 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024109C_889C6C.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024109C_889C6C +/* 889C6C 8024109C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 889C70 802410A0 AFB1001C */ sw $s1, 0x1c($sp) +/* 889C74 802410A4 0080882D */ daddu $s1, $a0, $zero +/* 889C78 802410A8 AFBF0020 */ sw $ra, 0x20($sp) +/* 889C7C 802410AC AFB00018 */ sw $s0, 0x18($sp) +/* 889C80 802410B0 8E30000C */ lw $s0, 0xc($s1) +/* 889C84 802410B4 8E050000 */ lw $a1, ($s0) +/* 889C88 802410B8 0C0B1EAF */ jal get_variable +/* 889C8C 802410BC 26100004 */ addiu $s0, $s0, 4 +/* 889C90 802410C0 0C04417A */ jal get_entity_by_index +/* 889C94 802410C4 0040202D */ daddu $a0, $v0, $zero +/* 889C98 802410C8 8E100000 */ lw $s0, ($s0) +/* 889C9C 802410CC C444004C */ lwc1 $f4, 0x4c($v0) +/* 889CA0 802410D0 3C014148 */ lui $at, 0x4148 +/* 889CA4 802410D4 44810000 */ mtc1 $at, $f0 +/* 889CA8 802410D8 3C013F33 */ lui $at, 0x3f33 +/* 889CAC 802410DC 34213333 */ ori $at, $at, 0x3333 +/* 889CB0 802410E0 44811000 */ mtc1 $at, $f2 +/* 889CB4 802410E4 AFA00014 */ sw $zero, 0x14($sp) +/* 889CB8 802410E8 46002100 */ add.s $f4, $f4, $f0 +/* 889CBC 802410EC E7A20010 */ swc1 $f2, 0x10($sp) +/* 889CC0 802410F0 8C450048 */ lw $a1, 0x48($v0) +/* 889CC4 802410F4 8C470050 */ lw $a3, 0x50($v0) +/* 889CC8 802410F8 44062000 */ mfc1 $a2, $f4 +/* 889CCC 802410FC 0C01C5D4 */ jal func_80071750 +/* 889CD0 80241100 0000202D */ daddu $a0, $zero, $zero +/* 889CD4 80241104 0220202D */ daddu $a0, $s1, $zero +/* 889CD8 80241108 0200282D */ daddu $a1, $s0, $zero +/* 889CDC 8024110C 0C0B2026 */ jal set_variable +/* 889CE0 80241110 0040302D */ daddu $a2, $v0, $zero +/* 889CE4 80241114 8FBF0020 */ lw $ra, 0x20($sp) +/* 889CE8 80241118 8FB1001C */ lw $s1, 0x1c($sp) +/* 889CEC 8024111C 8FB00018 */ lw $s0, 0x18($sp) +/* 889CF0 80241120 24020002 */ addiu $v0, $zero, 2 +/* 889CF4 80241124 03E00008 */ jr $ra +/* 889CF8 80241128 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024112C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024112C.s deleted file mode 100644 index 4779ae60fd..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024112C.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024112C -/* 889CFC 8024112C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 889D00 80241130 AFBF0010 */ sw $ra, 0x10($sp) -/* 889D04 80241134 8C82000C */ lw $v0, 0xc($a0) -/* 889D08 80241138 0C0B1EAF */ jal get_variable -/* 889D0C 8024113C 8C450000 */ lw $a1, ($v0) -/* 889D10 80241140 0040202D */ daddu $a0, $v0, $zero -/* 889D14 80241144 8C830000 */ lw $v1, ($a0) -/* 889D18 80241148 34630010 */ ori $v1, $v1, 0x10 -/* 889D1C 8024114C AC830000 */ sw $v1, ($a0) -/* 889D20 80241150 8FBF0010 */ lw $ra, 0x10($sp) -/* 889D24 80241154 24020002 */ addiu $v0, $zero, 2 -/* 889D28 80241158 03E00008 */ jr $ra -/* 889D2C 8024115C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024112C_889CFC.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024112C_889CFC.s new file mode 100644 index 0000000000..6456972912 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024112C_889CFC.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024112C_889CFC +/* 889CFC 8024112C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 889D00 80241130 AFBF0010 */ sw $ra, 0x10($sp) +/* 889D04 80241134 8C82000C */ lw $v0, 0xc($a0) +/* 889D08 80241138 0C0B1EAF */ jal get_variable +/* 889D0C 8024113C 8C450000 */ lw $a1, ($v0) +/* 889D10 80241140 0040202D */ daddu $a0, $v0, $zero +/* 889D14 80241144 8C830000 */ lw $v1, ($a0) +/* 889D18 80241148 34630010 */ ori $v1, $v1, 0x10 +/* 889D1C 8024114C AC830000 */ sw $v1, ($a0) +/* 889D20 80241150 8FBF0010 */ lw $ra, 0x10($sp) +/* 889D24 80241154 24020002 */ addiu $v0, $zero, 2 +/* 889D28 80241158 03E00008 */ jr $ra +/* 889D2C 8024115C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160.s deleted file mode 100644 index e6f4a33309..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241160 -/* 889D30 80241160 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 889D34 80241164 AFBF0018 */ sw $ra, 0x18($sp) -/* 889D38 80241168 8C82000C */ lw $v0, 0xc($a0) -/* 889D3C 8024116C 0C0B1EAF */ jal get_variable -/* 889D40 80241170 8C450000 */ lw $a1, ($v0) -/* 889D44 80241174 0C04417A */ jal get_entity_by_index -/* 889D48 80241178 0040202D */ daddu $a0, $v0, $zero -/* 889D4C 8024117C 3C013F80 */ lui $at, 0x3f80 -/* 889D50 80241180 44810000 */ mtc1 $at, $f0 -/* 889D54 80241184 C442004C */ lwc1 $f2, 0x4c($v0) -/* 889D58 80241188 E7A00010 */ swc1 $f0, 0x10($sp) -/* 889D5C 8024118C 3C014148 */ lui $at, 0x4148 -/* 889D60 80241190 44810000 */ mtc1 $at, $f0 -/* 889D64 80241194 2403004B */ addiu $v1, $zero, 0x4b -/* 889D68 80241198 AFA30014 */ sw $v1, 0x14($sp) -/* 889D6C 8024119C 46001080 */ add.s $f2, $f2, $f0 -/* 889D70 802411A0 8C450048 */ lw $a1, 0x48($v0) -/* 889D74 802411A4 8C470050 */ lw $a3, 0x50($v0) -/* 889D78 802411A8 44061000 */ mfc1 $a2, $f2 -/* 889D7C 802411AC 0C01C2EC */ jal func_80070BB0 -/* 889D80 802411B0 24040004 */ addiu $a0, $zero, 4 -/* 889D84 802411B4 8FBF0018 */ lw $ra, 0x18($sp) -/* 889D88 802411B8 24020002 */ addiu $v0, $zero, 2 -/* 889D8C 802411BC 03E00008 */ jr $ra -/* 889D90 802411C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160_889D30.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160_889D30.s new file mode 100644 index 0000000000..f23465fd07 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241160_889D30.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241160_889D30 +/* 889D30 80241160 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 889D34 80241164 AFBF0018 */ sw $ra, 0x18($sp) +/* 889D38 80241168 8C82000C */ lw $v0, 0xc($a0) +/* 889D3C 8024116C 0C0B1EAF */ jal get_variable +/* 889D40 80241170 8C450000 */ lw $a1, ($v0) +/* 889D44 80241174 0C04417A */ jal get_entity_by_index +/* 889D48 80241178 0040202D */ daddu $a0, $v0, $zero +/* 889D4C 8024117C 3C013F80 */ lui $at, 0x3f80 +/* 889D50 80241180 44810000 */ mtc1 $at, $f0 +/* 889D54 80241184 C442004C */ lwc1 $f2, 0x4c($v0) +/* 889D58 80241188 E7A00010 */ swc1 $f0, 0x10($sp) +/* 889D5C 8024118C 3C014148 */ lui $at, 0x4148 +/* 889D60 80241190 44810000 */ mtc1 $at, $f0 +/* 889D64 80241194 2403004B */ addiu $v1, $zero, 0x4b +/* 889D68 80241198 AFA30014 */ sw $v1, 0x14($sp) +/* 889D6C 8024119C 46001080 */ add.s $f2, $f2, $f0 +/* 889D70 802411A0 8C450048 */ lw $a1, 0x48($v0) +/* 889D74 802411A4 8C470050 */ lw $a3, 0x50($v0) +/* 889D78 802411A8 44061000 */ mfc1 $a2, $f2 +/* 889D7C 802411AC 0C01C2EC */ jal func_80070BB0 +/* 889D80 802411B0 24040004 */ addiu $a0, $zero, 4 +/* 889D84 802411B4 8FBF0018 */ lw $ra, 0x18($sp) +/* 889D88 802411B8 24020002 */ addiu $v0, $zero, 2 +/* 889D8C 802411BC 03E00008 */ jr $ra +/* 889D90 802411C0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4.s deleted file mode 100644 index 910b5a2c88..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411C4 -/* 889D94 802411C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 889D98 802411C8 AFBF0018 */ sw $ra, 0x18($sp) -/* 889D9C 802411CC 0C00EAD2 */ jal get_npc_safe -/* 889DA0 802411D0 2404FFFC */ addiu $a0, $zero, -4 -/* 889DA4 802411D4 C444003C */ lwc1 $f4, 0x3c($v0) -/* 889DA8 802411D8 3C014148 */ lui $at, 0x4148 -/* 889DAC 802411DC 44811000 */ mtc1 $at, $f2 -/* 889DB0 802411E0 3C013F80 */ lui $at, 0x3f80 -/* 889DB4 802411E4 44810000 */ mtc1 $at, $f0 -/* 889DB8 802411E8 2403001E */ addiu $v1, $zero, 0x1e -/* 889DBC 802411EC AFA30014 */ sw $v1, 0x14($sp) -/* 889DC0 802411F0 46022100 */ add.s $f4, $f4, $f2 -/* 889DC4 802411F4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 889DC8 802411F8 8C450038 */ lw $a1, 0x38($v0) -/* 889DCC 802411FC 8C470040 */ lw $a3, 0x40($v0) -/* 889DD0 80241200 44062000 */ mfc1 $a2, $f4 -/* 889DD4 80241204 0C01C2EC */ jal func_80070BB0 -/* 889DD8 80241208 24040009 */ addiu $a0, $zero, 9 -/* 889DDC 8024120C 8FBF0018 */ lw $ra, 0x18($sp) -/* 889DE0 80241210 24020002 */ addiu $v0, $zero, 2 -/* 889DE4 80241214 03E00008 */ jr $ra -/* 889DE8 80241218 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4_889D94.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4_889D94.s new file mode 100644 index 0000000000..fed4111d12 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802411C4_889D94.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411C4_889D94 +/* 889D94 802411C4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 889D98 802411C8 AFBF0018 */ sw $ra, 0x18($sp) +/* 889D9C 802411CC 0C00EAD2 */ jal get_npc_safe +/* 889DA0 802411D0 2404FFFC */ addiu $a0, $zero, -4 +/* 889DA4 802411D4 C444003C */ lwc1 $f4, 0x3c($v0) +/* 889DA8 802411D8 3C014148 */ lui $at, 0x4148 +/* 889DAC 802411DC 44811000 */ mtc1 $at, $f2 +/* 889DB0 802411E0 3C013F80 */ lui $at, 0x3f80 +/* 889DB4 802411E4 44810000 */ mtc1 $at, $f0 +/* 889DB8 802411E8 2403001E */ addiu $v1, $zero, 0x1e +/* 889DBC 802411EC AFA30014 */ sw $v1, 0x14($sp) +/* 889DC0 802411F0 46022100 */ add.s $f4, $f4, $f2 +/* 889DC4 802411F4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 889DC8 802411F8 8C450038 */ lw $a1, 0x38($v0) +/* 889DCC 802411FC 8C470040 */ lw $a3, 0x40($v0) +/* 889DD0 80241200 44062000 */ mfc1 $a2, $f4 +/* 889DD4 80241204 0C01C2EC */ jal func_80070BB0 +/* 889DD8 80241208 24040009 */ addiu $a0, $zero, 9 +/* 889DDC 8024120C 8FBF0018 */ lw $ra, 0x18($sp) +/* 889DE0 80241210 24020002 */ addiu $v0, $zero, 2 +/* 889DE4 80241214 03E00008 */ jr $ra +/* 889DE8 80241218 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C.s deleted file mode 100644 index 37aca49a22..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024121C -/* 889DEC 8024121C 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 889DF0 80241220 AFB60040 */ sw $s6, 0x40($sp) -/* 889DF4 80241224 0080B02D */ daddu $s6, $a0, $zero -/* 889DF8 80241228 AFB00028 */ sw $s0, 0x28($sp) -/* 889DFC 8024122C 00A0802D */ daddu $s0, $a1, $zero -/* 889E00 80241230 AFBF0044 */ sw $ra, 0x44($sp) -/* 889E04 80241234 AFB5003C */ sw $s5, 0x3c($sp) -/* 889E08 80241238 AFB40038 */ sw $s4, 0x38($sp) -/* 889E0C 8024123C AFB30034 */ sw $s3, 0x34($sp) -/* 889E10 80241240 AFB20030 */ sw $s2, 0x30($sp) -/* 889E14 80241244 AFB1002C */ sw $s1, 0x2c($sp) -/* 889E18 80241248 F7B80058 */ sdc1 $f24, 0x58($sp) -/* 889E1C 8024124C F7B60050 */ sdc1 $f22, 0x50($sp) -/* 889E20 80241250 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 889E24 80241254 8ED3000C */ lw $s3, 0xc($s6) -/* 889E28 80241258 0C00EAD2 */ jal get_npc_safe -/* 889E2C 8024125C 2404FFFC */ addiu $a0, $zero, -4 -/* 889E30 80241260 27A50018 */ addiu $a1, $sp, 0x18 -/* 889E34 80241264 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 889E38 80241268 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 889E3C 8024126C 27A6001C */ addiu $a2, $sp, 0x1c -/* 889E40 80241270 00041880 */ sll $v1, $a0, 2 -/* 889E44 80241274 00641821 */ addu $v1, $v1, $a0 -/* 889E48 80241278 00031880 */ sll $v1, $v1, 2 -/* 889E4C 8024127C 00641823 */ subu $v1, $v1, $a0 -/* 889E50 80241280 000320C0 */ sll $a0, $v1, 3 -/* 889E54 80241284 00641821 */ addu $v1, $v1, $a0 -/* 889E58 80241288 000318C0 */ sll $v1, $v1, 3 -/* 889E5C 8024128C 3C01800B */ lui $at, 0x800b -/* 889E60 80241290 00230821 */ addu $at, $at, $v1 -/* 889E64 80241294 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* 889E68 80241298 0C00A88D */ jal sin_cos_deg -/* 889E6C 8024129C 0040A82D */ daddu $s5, $v0, $zero -/* 889E70 802412A0 1200005D */ beqz $s0, .L80241418 -/* 889E74 802412A4 00000000 */ nop -/* 889E78 802412A8 0C00AB0A */ jal general_heap_malloc -/* 889E7C 802412AC 24040068 */ addiu $a0, $zero, 0x68 -/* 889E80 802412B0 0040902D */ daddu $s2, $v0, $zero -/* 889E84 802412B4 02C0202D */ daddu $a0, $s6, $zero -/* 889E88 802412B8 0000882D */ daddu $s1, $zero, $zero -/* 889E8C 802412BC 2414FFFF */ addiu $s4, $zero, -1 -/* 889E90 802412C0 AED20060 */ sw $s2, 0x60($s6) -/* 889E94 802412C4 8E650000 */ lw $a1, ($s3) -/* 889E98 802412C8 3C014148 */ lui $at, 0x4148 -/* 889E9C 802412CC 4481C000 */ mtc1 $at, $f24 -/* 889EA0 802412D0 3C013F80 */ lui $at, 0x3f80 -/* 889EA4 802412D4 4481B000 */ mtc1 $at, $f22 -/* 889EA8 802412D8 4480A000 */ mtc1 $zero, $f20 -/* 889EAC 802412DC 0C0B1EAF */ jal get_variable -/* 889EB0 802412E0 0240802D */ daddu $s0, $s2, $zero -/* 889EB4 802412E4 0C04417A */ jal get_entity_by_index -/* 889EB8 802412E8 0040202D */ daddu $a0, $v0, $zero -/* 889EBC 802412EC AE42005C */ sw $v0, 0x5c($s2) -.L802412F0: -/* 889EC0 802412F0 8E42005C */ lw $v0, 0x5c($s2) -/* 889EC4 802412F4 C440004C */ lwc1 $f0, 0x4c($v0) -/* 889EC8 802412F8 0000202D */ daddu $a0, $zero, $zero -/* 889ECC 802412FC E7B60010 */ swc1 $f22, 0x10($sp) -/* 889ED0 80241300 AFB40014 */ sw $s4, 0x14($sp) -/* 889ED4 80241304 46180000 */ add.s $f0, $f0, $f24 -/* 889ED8 80241308 8C450048 */ lw $a1, 0x48($v0) -/* 889EDC 8024130C 8C470050 */ lw $a3, 0x50($v0) -/* 889EE0 80241310 44060000 */ mfc1 $a2, $f0 -/* 889EE4 80241314 0C01C5BC */ jal func_800716F0 -/* 889EE8 80241318 26310001 */ addiu $s1, $s1, 1 -/* 889EEC 8024131C AE020008 */ sw $v0, 8($s0) -/* 889EF0 80241320 E614002C */ swc1 $f20, 0x2c($s0) -/* 889EF4 80241324 E6140020 */ swc1 $f20, 0x20($s0) -/* 889EF8 80241328 E6140014 */ swc1 $f20, 0x14($s0) -/* 889EFC 8024132C E6140050 */ swc1 $f20, 0x50($s0) -/* 889F00 80241330 E6140044 */ swc1 $f20, 0x44($s0) -/* 889F04 80241334 E6140038 */ swc1 $f20, 0x38($s0) -/* 889F08 80241338 2A220003 */ slti $v0, $s1, 3 -/* 889F0C 8024133C 1440FFEC */ bnez $v0, .L802412F0 -/* 889F10 80241340 26100004 */ addiu $s0, $s0, 4 -/* 889F14 80241344 0000882D */ daddu $s1, $zero, $zero -/* 889F18 80241348 0240802D */ daddu $s0, $s2, $zero -/* 889F1C 8024134C 3C148024 */ lui $s4, 0x8024 -/* 889F20 80241350 26943D04 */ addiu $s4, $s4, 0x3d04 -/* 889F24 80241354 3C014248 */ lui $at, 0x4248 -/* 889F28 80241358 4481A000 */ mtc1 $at, $f20 -/* 889F2C 8024135C 24130044 */ addiu $s3, $zero, 0x44 -/* 889F30 80241360 AE400000 */ sw $zero, ($s2) -/* 889F34 80241364 AE400004 */ sw $zero, 4($s2) -/* 889F38 80241368 AE400060 */ sw $zero, 0x60($s2) -/* 889F3C 8024136C AE400064 */ sw $zero, 0x64($s2) -.L80241370: -/* 889F40 80241370 27A40020 */ addiu $a0, $sp, 0x20 -/* 889F44 80241374 4406A000 */ mfc1 $a2, $f20 -/* 889F48 80241378 8E870000 */ lw $a3, ($s4) -/* 889F4C 8024137C 02532821 */ addu $a1, $s2, $s3 -/* 889F50 80241380 0C00A7E7 */ jal add_vec2D_polar -/* 889F54 80241384 AFA00020 */ sw $zero, 0x20($sp) -/* 889F58 80241388 C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 889F5C 8024138C C7A40020 */ lwc1 $f4, 0x20($sp) -/* 889F60 80241390 46041082 */ mul.s $f2, $f2, $f4 -/* 889F64 80241394 00000000 */ nop -/* 889F68 80241398 C7A00018 */ lwc1 $f0, 0x18($sp) -/* 889F6C 8024139C 46040002 */ mul.s $f0, $f0, $f4 -/* 889F70 802413A0 00000000 */ nop -/* 889F74 802413A4 E6020038 */ swc1 $f2, 0x38($s0) -/* 889F78 802413A8 E6000050 */ swc1 $f0, 0x50($s0) -/* 889F7C 802413AC 8E42005C */ lw $v0, 0x5c($s2) -/* 889F80 802413B0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 889F84 802413B4 C4420048 */ lwc1 $f2, 0x48($v0) -/* 889F88 802413B8 46001080 */ add.s $f2, $f2, $f0 -/* 889F8C 802413BC C6A00038 */ lwc1 $f0, 0x38($s5) -/* 889F90 802413C0 46020001 */ sub.s $f0, $f0, $f2 -/* 889F94 802413C4 E6000038 */ swc1 $f0, 0x38($s0) -/* 889F98 802413C8 8E42005C */ lw $v0, 0x5c($s2) -/* 889F9C 802413CC C6000044 */ lwc1 $f0, 0x44($s0) -/* 889FA0 802413D0 C442004C */ lwc1 $f2, 0x4c($v0) -/* 889FA4 802413D4 46001080 */ add.s $f2, $f2, $f0 -/* 889FA8 802413D8 C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 889FAC 802413DC 46020001 */ sub.s $f0, $f0, $f2 -/* 889FB0 802413E0 E6000044 */ swc1 $f0, 0x44($s0) -/* 889FB4 802413E4 8E42005C */ lw $v0, 0x5c($s2) -/* 889FB8 802413E8 C6000050 */ lwc1 $f0, 0x50($s0) -/* 889FBC 802413EC C4420050 */ lwc1 $f2, 0x50($v0) -/* 889FC0 802413F0 26940004 */ addiu $s4, $s4, 4 -/* 889FC4 802413F4 46001080 */ add.s $f2, $f2, $f0 -/* 889FC8 802413F8 C6A00040 */ lwc1 $f0, 0x40($s5) -/* 889FCC 802413FC 26730004 */ addiu $s3, $s3, 4 -/* 889FD0 80241400 46020001 */ sub.s $f0, $f0, $f2 -/* 889FD4 80241404 26310001 */ addiu $s1, $s1, 1 -/* 889FD8 80241408 2A220003 */ slti $v0, $s1, 3 -/* 889FDC 8024140C E6000050 */ swc1 $f0, 0x50($s0) -/* 889FE0 80241410 1440FFD7 */ bnez $v0, .L80241370 -/* 889FE4 80241414 26100004 */ addiu $s0, $s0, 4 -.L80241418: -/* 889FE8 80241418 8ED20060 */ lw $s2, 0x60($s6) -/* 889FEC 8024141C 8E430000 */ lw $v1, ($s2) -/* 889FF0 80241420 24020001 */ addiu $v0, $zero, 1 -/* 889FF4 80241424 10620038 */ beq $v1, $v0, .L80241508 -/* 889FF8 80241428 28620002 */ slti $v0, $v1, 2 -/* 889FFC 8024142C 50400005 */ beql $v0, $zero, .L80241444 -/* 88A000 80241430 24020002 */ addiu $v0, $zero, 2 -/* 88A004 80241434 10600007 */ beqz $v1, .L80241454 -/* 88A008 80241438 24040005 */ addiu $a0, $zero, 5 -/* 88A00C 8024143C 0809057B */ j .L802415EC -/* 88A010 80241440 00000000 */ nop -.L80241444: -/* 88A014 80241444 10620058 */ beq $v1, $v0, .L802415A8 -/* 88A018 80241448 00000000 */ nop -/* 88A01C 8024144C 0809057B */ j .L802415EC -/* 88A020 80241450 00000000 */ nop -.L80241454: -/* 88A024 80241454 0000882D */ daddu $s1, $zero, $zero -/* 88A028 80241458 3C148024 */ lui $s4, 0x8024 -/* 88A02C 8024145C 26943D04 */ addiu $s4, $s4, 0x3d04 -/* 88A030 80241460 24130020 */ addiu $s3, $zero, 0x20 -/* 88A034 80241464 3C064248 */ lui $a2, 0x4248 -/* 88A038 80241468 44800000 */ mtc1 $zero, $f0 -/* 88A03C 8024146C 24020014 */ addiu $v0, $zero, 0x14 -/* 88A040 80241470 AFA20010 */ sw $v0, 0x10($sp) -/* 88A044 80241474 44050000 */ mfc1 $a1, $f0 -/* 88A048 80241478 8E470060 */ lw $a3, 0x60($s2) -/* 88A04C 8024147C 4485B000 */ mtc1 $a1, $f22 -/* 88A050 80241480 0C00A8ED */ jal update_lerp -/* 88A054 80241484 0240802D */ daddu $s0, $s2, $zero -/* 88A058 80241488 46000506 */ mov.s $f20, $f0 -.L8024148C: -/* 88A05C 8024148C 4406A000 */ mfc1 $a2, $f20 -/* 88A060 80241490 27A40020 */ addiu $a0, $sp, 0x20 -/* 88A064 80241494 E6160020 */ swc1 $f22, 0x20($s0) -/* 88A068 80241498 8E870000 */ lw $a3, ($s4) -/* 88A06C 8024149C 02532821 */ addu $a1, $s2, $s3 -/* 88A070 802414A0 0C00A7E7 */ jal add_vec2D_polar -/* 88A074 802414A4 E7B60020 */ swc1 $f22, 0x20($sp) -/* 88A078 802414A8 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 88A07C 802414AC C7A00020 */ lwc1 $f0, 0x20($sp) -/* 88A080 802414B0 46002102 */ mul.s $f4, $f4, $f0 -/* 88A084 802414B4 00000000 */ nop -/* 88A088 802414B8 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 88A08C 802414BC 26940004 */ addiu $s4, $s4, 4 -/* 88A090 802414C0 46001082 */ mul.s $f2, $f2, $f0 -/* 88A094 802414C4 00000000 */ nop -/* 88A098 802414C8 26730004 */ addiu $s3, $s3, 4 -/* 88A09C 802414CC 26310001 */ addiu $s1, $s1, 1 -/* 88A0A0 802414D0 2A220003 */ slti $v0, $s1, 3 -/* 88A0A4 802414D4 E6040014 */ swc1 $f4, 0x14($s0) -/* 88A0A8 802414D8 E602002C */ swc1 $f2, 0x2c($s0) -/* 88A0AC 802414DC 1440FFEB */ bnez $v0, .L8024148C -/* 88A0B0 802414E0 26100004 */ addiu $s0, $s0, 4 -/* 88A0B4 802414E4 8E420060 */ lw $v0, 0x60($s2) -/* 88A0B8 802414E8 24420001 */ addiu $v0, $v0, 1 -/* 88A0BC 802414EC AE420060 */ sw $v0, 0x60($s2) -/* 88A0C0 802414F0 28420015 */ slti $v0, $v0, 0x15 -/* 88A0C4 802414F4 1440003D */ bnez $v0, .L802415EC -/* 88A0C8 802414F8 24020001 */ addiu $v0, $zero, 1 -/* 88A0CC 802414FC AE420000 */ sw $v0, ($s2) -/* 88A0D0 80241500 0809057B */ j .L802415EC -/* 88A0D4 80241504 AE400060 */ sw $zero, 0x60($s2) -.L80241508: -/* 88A0D8 80241508 0000882D */ daddu $s1, $zero, $zero -/* 88A0DC 8024150C 3C148024 */ lui $s4, 0x8024 -/* 88A0E0 80241510 26943D04 */ addiu $s4, $s4, 0x3d04 -/* 88A0E4 80241514 24130020 */ addiu $s3, $zero, 0x20 -/* 88A0E8 80241518 0240802D */ daddu $s0, $s2, $zero -/* 88A0EC 8024151C 3C014248 */ lui $at, 0x4248 -/* 88A0F0 80241520 4481A000 */ mtc1 $at, $f20 -/* 88A0F4 80241524 4480B000 */ mtc1 $zero, $f22 -.L80241528: -/* 88A0F8 80241528 4406A000 */ mfc1 $a2, $f20 -/* 88A0FC 8024152C 27A40020 */ addiu $a0, $sp, 0x20 -/* 88A100 80241530 E6160020 */ swc1 $f22, 0x20($s0) -/* 88A104 80241534 8E870000 */ lw $a3, ($s4) -/* 88A108 80241538 02532821 */ addu $a1, $s2, $s3 -/* 88A10C 8024153C 0C00A7E7 */ jal add_vec2D_polar -/* 88A110 80241540 E7B60020 */ swc1 $f22, 0x20($sp) -/* 88A114 80241544 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 88A118 80241548 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 88A11C 8024154C 46002102 */ mul.s $f4, $f4, $f0 -/* 88A120 80241550 00000000 */ nop -/* 88A124 80241554 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 88A128 80241558 26940004 */ addiu $s4, $s4, 4 -/* 88A12C 8024155C 46001082 */ mul.s $f2, $f2, $f0 -/* 88A130 80241560 00000000 */ nop -/* 88A134 80241564 26730004 */ addiu $s3, $s3, 4 -/* 88A138 80241568 26310001 */ addiu $s1, $s1, 1 -/* 88A13C 8024156C 2A220003 */ slti $v0, $s1, 3 -/* 88A140 80241570 E6040014 */ swc1 $f4, 0x14($s0) -/* 88A144 80241574 E602002C */ swc1 $f2, 0x2c($s0) -/* 88A148 80241578 1440FFEB */ bnez $v0, .L80241528 -/* 88A14C 8024157C 26100004 */ addiu $s0, $s0, 4 -/* 88A150 80241580 8E420060 */ lw $v0, 0x60($s2) -/* 88A154 80241584 24420001 */ addiu $v0, $v0, 1 -/* 88A158 80241588 AE420060 */ sw $v0, 0x60($s2) -/* 88A15C 8024158C 28420010 */ slti $v0, $v0, 0x10 -/* 88A160 80241590 14400016 */ bnez $v0, .L802415EC -/* 88A164 80241594 2402000F */ addiu $v0, $zero, 0xf -/* 88A168 80241598 AE420060 */ sw $v0, 0x60($s2) -/* 88A16C 8024159C 24020002 */ addiu $v0, $zero, 2 -/* 88A170 802415A0 0809057B */ j .L802415EC -/* 88A174 802415A4 AE420000 */ sw $v0, ($s2) -.L802415A8: -/* 88A178 802415A8 8E420060 */ lw $v0, 0x60($s2) -/* 88A17C 802415AC 24420001 */ addiu $v0, $v0, 1 -/* 88A180 802415B0 AE420060 */ sw $v0, 0x60($s2) -/* 88A184 802415B4 2842001F */ slti $v0, $v0, 0x1f -/* 88A188 802415B8 1440000C */ bnez $v0, .L802415EC -/* 88A18C 802415BC 0000882D */ daddu $s1, $zero, $zero -/* 88A190 802415C0 0240282D */ daddu $a1, $s2, $zero -.L802415C4: -/* 88A194 802415C4 8CA20008 */ lw $v0, 8($a1) -/* 88A198 802415C8 8C430000 */ lw $v1, ($v0) -/* 88A19C 802415CC 26310001 */ addiu $s1, $s1, 1 -/* 88A1A0 802415D0 34630010 */ ori $v1, $v1, 0x10 -/* 88A1A4 802415D4 AC430000 */ sw $v1, ($v0) -/* 88A1A8 802415D8 2A220003 */ slti $v0, $s1, 3 -/* 88A1AC 802415DC 1440FFF9 */ bnez $v0, .L802415C4 -/* 88A1B0 802415E0 24A50004 */ addiu $a1, $a1, 4 -/* 88A1B4 802415E4 080905C8 */ j .L80241720 -/* 88A1B8 802415E8 24020002 */ addiu $v0, $zero, 2 -.L802415EC: -/* 88A1BC 802415EC 8E430004 */ lw $v1, 4($s2) -/* 88A1C0 802415F0 10600005 */ beqz $v1, .L80241608 -/* 88A1C4 802415F4 24020001 */ addiu $v0, $zero, 1 -/* 88A1C8 802415F8 1062000B */ beq $v1, $v0, .L80241628 -/* 88A1CC 802415FC 0000882D */ daddu $s1, $zero, $zero -/* 88A1D0 80241600 080905B7 */ j .L802416DC -/* 88A1D4 80241604 0240282D */ daddu $a1, $s2, $zero -.L80241608: -/* 88A1D8 80241608 8E420064 */ lw $v0, 0x64($s2) -/* 88A1DC 8024160C 24420001 */ addiu $v0, $v0, 1 -/* 88A1E0 80241610 AE420064 */ sw $v0, 0x64($s2) -/* 88A1E4 80241614 28420010 */ slti $v0, $v0, 0x10 -/* 88A1E8 80241618 1440002F */ bnez $v0, .L802416D8 -/* 88A1EC 8024161C 0000882D */ daddu $s1, $zero, $zero -/* 88A1F0 80241620 080905B3 */ j .L802416CC -/* 88A1F4 80241624 24020001 */ addiu $v0, $zero, 1 -.L80241628: -/* 88A1F8 80241628 4480A000 */ mtc1 $zero, $f20 -/* 88A1FC 8024162C 24130014 */ addiu $s3, $zero, 0x14 -/* 88A200 80241630 0240802D */ daddu $s0, $s2, $zero -.L80241634: -/* 88A204 80241634 4405A000 */ mfc1 $a1, $f20 -/* 88A208 80241638 AFB30010 */ sw $s3, 0x10($sp) -/* 88A20C 8024163C 8E060038 */ lw $a2, 0x38($s0) -/* 88A210 80241640 8E470064 */ lw $a3, 0x64($s2) -/* 88A214 80241644 0C00A8ED */ jal update_lerp -/* 88A218 80241648 24040001 */ addiu $a0, $zero, 1 -/* 88A21C 8024164C C6020014 */ lwc1 $f2, 0x14($s0) -/* 88A220 80241650 46001080 */ add.s $f2, $f2, $f0 -/* 88A224 80241654 4405A000 */ mfc1 $a1, $f20 -/* 88A228 80241658 E6020014 */ swc1 $f2, 0x14($s0) -/* 88A22C 8024165C AFB30010 */ sw $s3, 0x10($sp) -/* 88A230 80241660 8E060044 */ lw $a2, 0x44($s0) -/* 88A234 80241664 8E470064 */ lw $a3, 0x64($s2) -/* 88A238 80241668 0C00A8ED */ jal update_lerp -/* 88A23C 8024166C 24040001 */ addiu $a0, $zero, 1 -/* 88A240 80241670 C6020020 */ lwc1 $f2, 0x20($s0) -/* 88A244 80241674 46001080 */ add.s $f2, $f2, $f0 -/* 88A248 80241678 4405A000 */ mfc1 $a1, $f20 -/* 88A24C 8024167C E6020020 */ swc1 $f2, 0x20($s0) -/* 88A250 80241680 AFB30010 */ sw $s3, 0x10($sp) -/* 88A254 80241684 8E060050 */ lw $a2, 0x50($s0) -/* 88A258 80241688 8E470064 */ lw $a3, 0x64($s2) -/* 88A25C 8024168C 0C00A8ED */ jal update_lerp -/* 88A260 80241690 24040001 */ addiu $a0, $zero, 1 -/* 88A264 80241694 C602002C */ lwc1 $f2, 0x2c($s0) -/* 88A268 80241698 46001080 */ add.s $f2, $f2, $f0 -/* 88A26C 8024169C 26310001 */ addiu $s1, $s1, 1 -/* 88A270 802416A0 2A220003 */ slti $v0, $s1, 3 -/* 88A274 802416A4 E602002C */ swc1 $f2, 0x2c($s0) -/* 88A278 802416A8 1440FFE2 */ bnez $v0, .L80241634 -/* 88A27C 802416AC 26100004 */ addiu $s0, $s0, 4 -/* 88A280 802416B0 8E420064 */ lw $v0, 0x64($s2) -/* 88A284 802416B4 24420001 */ addiu $v0, $v0, 1 -/* 88A288 802416B8 AE420064 */ sw $v0, 0x64($s2) -/* 88A28C 802416BC 28420015 */ slti $v0, $v0, 0x15 -/* 88A290 802416C0 14400005 */ bnez $v0, .L802416D8 -/* 88A294 802416C4 0000882D */ daddu $s1, $zero, $zero -/* 88A298 802416C8 24020002 */ addiu $v0, $zero, 2 -.L802416CC: -/* 88A29C 802416CC AE420004 */ sw $v0, 4($s2) -/* 88A2A0 802416D0 AE400064 */ sw $zero, 0x64($s2) -/* 88A2A4 802416D4 0000882D */ daddu $s1, $zero, $zero -.L802416D8: -/* 88A2A8 802416D8 0240282D */ daddu $a1, $s2, $zero -.L802416DC: -/* 88A2AC 802416DC 8CA20008 */ lw $v0, 8($a1) -/* 88A2B0 802416E0 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 88A2B4 802416E4 8C42000C */ lw $v0, 0xc($v0) -/* 88A2B8 802416E8 E4400010 */ swc1 $f0, 0x10($v0) -/* 88A2BC 802416EC 8CA20008 */ lw $v0, 8($a1) -/* 88A2C0 802416F0 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 88A2C4 802416F4 8C42000C */ lw $v0, 0xc($v0) -/* 88A2C8 802416F8 26310001 */ addiu $s1, $s1, 1 -/* 88A2CC 802416FC E4400014 */ swc1 $f0, 0x14($v0) -/* 88A2D0 80241700 8CA20008 */ lw $v0, 8($a1) -/* 88A2D4 80241704 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 88A2D8 80241708 8C42000C */ lw $v0, 0xc($v0) -/* 88A2DC 8024170C E4400018 */ swc1 $f0, 0x18($v0) -/* 88A2E0 80241710 2A220003 */ slti $v0, $s1, 3 -/* 88A2E4 80241714 1440FFF1 */ bnez $v0, .L802416DC -/* 88A2E8 80241718 24A50004 */ addiu $a1, $a1, 4 -/* 88A2EC 8024171C 0000102D */ daddu $v0, $zero, $zero -.L80241720: -/* 88A2F0 80241720 8FBF0044 */ lw $ra, 0x44($sp) -/* 88A2F4 80241724 8FB60040 */ lw $s6, 0x40($sp) -/* 88A2F8 80241728 8FB5003C */ lw $s5, 0x3c($sp) -/* 88A2FC 8024172C 8FB40038 */ lw $s4, 0x38($sp) -/* 88A300 80241730 8FB30034 */ lw $s3, 0x34($sp) -/* 88A304 80241734 8FB20030 */ lw $s2, 0x30($sp) -/* 88A308 80241738 8FB1002C */ lw $s1, 0x2c($sp) -/* 88A30C 8024173C 8FB00028 */ lw $s0, 0x28($sp) -/* 88A310 80241740 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 88A314 80241744 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 88A318 80241748 D7B40048 */ ldc1 $f20, 0x48($sp) -/* 88A31C 8024174C 03E00008 */ jr $ra -/* 88A320 80241750 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s new file mode 100644 index 0000000000..4c450c5fbd --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_8024121C_889DEC.s @@ -0,0 +1,356 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024121C_889DEC +/* 889DEC 8024121C 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* 889DF0 80241220 AFB60040 */ sw $s6, 0x40($sp) +/* 889DF4 80241224 0080B02D */ daddu $s6, $a0, $zero +/* 889DF8 80241228 AFB00028 */ sw $s0, 0x28($sp) +/* 889DFC 8024122C 00A0802D */ daddu $s0, $a1, $zero +/* 889E00 80241230 AFBF0044 */ sw $ra, 0x44($sp) +/* 889E04 80241234 AFB5003C */ sw $s5, 0x3c($sp) +/* 889E08 80241238 AFB40038 */ sw $s4, 0x38($sp) +/* 889E0C 8024123C AFB30034 */ sw $s3, 0x34($sp) +/* 889E10 80241240 AFB20030 */ sw $s2, 0x30($sp) +/* 889E14 80241244 AFB1002C */ sw $s1, 0x2c($sp) +/* 889E18 80241248 F7B80058 */ sdc1 $f24, 0x58($sp) +/* 889E1C 8024124C F7B60050 */ sdc1 $f22, 0x50($sp) +/* 889E20 80241250 F7B40048 */ sdc1 $f20, 0x48($sp) +/* 889E24 80241254 8ED3000C */ lw $s3, 0xc($s6) +/* 889E28 80241258 0C00EAD2 */ jal get_npc_safe +/* 889E2C 8024125C 2404FFFC */ addiu $a0, $zero, -4 +/* 889E30 80241260 27A50018 */ addiu $a1, $sp, 0x18 +/* 889E34 80241264 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 889E38 80241268 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 889E3C 8024126C 27A6001C */ addiu $a2, $sp, 0x1c +/* 889E40 80241270 00041880 */ sll $v1, $a0, 2 +/* 889E44 80241274 00641821 */ addu $v1, $v1, $a0 +/* 889E48 80241278 00031880 */ sll $v1, $v1, 2 +/* 889E4C 8024127C 00641823 */ subu $v1, $v1, $a0 +/* 889E50 80241280 000320C0 */ sll $a0, $v1, 3 +/* 889E54 80241284 00641821 */ addu $v1, $v1, $a0 +/* 889E58 80241288 000318C0 */ sll $v1, $v1, 3 +/* 889E5C 8024128C 3C01800B */ lui $at, 0x800b +/* 889E60 80241290 00230821 */ addu $at, $at, $v1 +/* 889E64 80241294 C42C1DEC */ lwc1 $f12, 0x1dec($at) +/* 889E68 80241298 0C00A88D */ jal sin_cos_deg +/* 889E6C 8024129C 0040A82D */ daddu $s5, $v0, $zero +/* 889E70 802412A0 1200005D */ beqz $s0, .L80241418 +/* 889E74 802412A4 00000000 */ nop +/* 889E78 802412A8 0C00AB0A */ jal general_heap_malloc +/* 889E7C 802412AC 24040068 */ addiu $a0, $zero, 0x68 +/* 889E80 802412B0 0040902D */ daddu $s2, $v0, $zero +/* 889E84 802412B4 02C0202D */ daddu $a0, $s6, $zero +/* 889E88 802412B8 0000882D */ daddu $s1, $zero, $zero +/* 889E8C 802412BC 2414FFFF */ addiu $s4, $zero, -1 +/* 889E90 802412C0 AED20060 */ sw $s2, 0x60($s6) +/* 889E94 802412C4 8E650000 */ lw $a1, ($s3) +/* 889E98 802412C8 3C014148 */ lui $at, 0x4148 +/* 889E9C 802412CC 4481C000 */ mtc1 $at, $f24 +/* 889EA0 802412D0 3C013F80 */ lui $at, 0x3f80 +/* 889EA4 802412D4 4481B000 */ mtc1 $at, $f22 +/* 889EA8 802412D8 4480A000 */ mtc1 $zero, $f20 +/* 889EAC 802412DC 0C0B1EAF */ jal get_variable +/* 889EB0 802412E0 0240802D */ daddu $s0, $s2, $zero +/* 889EB4 802412E4 0C04417A */ jal get_entity_by_index +/* 889EB8 802412E8 0040202D */ daddu $a0, $v0, $zero +/* 889EBC 802412EC AE42005C */ sw $v0, 0x5c($s2) +.L802412F0: +/* 889EC0 802412F0 8E42005C */ lw $v0, 0x5c($s2) +/* 889EC4 802412F4 C440004C */ lwc1 $f0, 0x4c($v0) +/* 889EC8 802412F8 0000202D */ daddu $a0, $zero, $zero +/* 889ECC 802412FC E7B60010 */ swc1 $f22, 0x10($sp) +/* 889ED0 80241300 AFB40014 */ sw $s4, 0x14($sp) +/* 889ED4 80241304 46180000 */ add.s $f0, $f0, $f24 +/* 889ED8 80241308 8C450048 */ lw $a1, 0x48($v0) +/* 889EDC 8024130C 8C470050 */ lw $a3, 0x50($v0) +/* 889EE0 80241310 44060000 */ mfc1 $a2, $f0 +/* 889EE4 80241314 0C01C5BC */ jal func_800716F0 +/* 889EE8 80241318 26310001 */ addiu $s1, $s1, 1 +/* 889EEC 8024131C AE020008 */ sw $v0, 8($s0) +/* 889EF0 80241320 E614002C */ swc1 $f20, 0x2c($s0) +/* 889EF4 80241324 E6140020 */ swc1 $f20, 0x20($s0) +/* 889EF8 80241328 E6140014 */ swc1 $f20, 0x14($s0) +/* 889EFC 8024132C E6140050 */ swc1 $f20, 0x50($s0) +/* 889F00 80241330 E6140044 */ swc1 $f20, 0x44($s0) +/* 889F04 80241334 E6140038 */ swc1 $f20, 0x38($s0) +/* 889F08 80241338 2A220003 */ slti $v0, $s1, 3 +/* 889F0C 8024133C 1440FFEC */ bnez $v0, .L802412F0 +/* 889F10 80241340 26100004 */ addiu $s0, $s0, 4 +/* 889F14 80241344 0000882D */ daddu $s1, $zero, $zero +/* 889F18 80241348 0240802D */ daddu $s0, $s2, $zero +/* 889F1C 8024134C 3C148024 */ lui $s4, 0x8024 +/* 889F20 80241350 26943D04 */ addiu $s4, $s4, 0x3d04 +/* 889F24 80241354 3C014248 */ lui $at, 0x4248 +/* 889F28 80241358 4481A000 */ mtc1 $at, $f20 +/* 889F2C 8024135C 24130044 */ addiu $s3, $zero, 0x44 +/* 889F30 80241360 AE400000 */ sw $zero, ($s2) +/* 889F34 80241364 AE400004 */ sw $zero, 4($s2) +/* 889F38 80241368 AE400060 */ sw $zero, 0x60($s2) +/* 889F3C 8024136C AE400064 */ sw $zero, 0x64($s2) +.L80241370: +/* 889F40 80241370 27A40020 */ addiu $a0, $sp, 0x20 +/* 889F44 80241374 4406A000 */ mfc1 $a2, $f20 +/* 889F48 80241378 8E870000 */ lw $a3, ($s4) +/* 889F4C 8024137C 02532821 */ addu $a1, $s2, $s3 +/* 889F50 80241380 0C00A7E7 */ jal add_vec2D_polar +/* 889F54 80241384 AFA00020 */ sw $zero, 0x20($sp) +/* 889F58 80241388 C7A2001C */ lwc1 $f2, 0x1c($sp) +/* 889F5C 8024138C C7A40020 */ lwc1 $f4, 0x20($sp) +/* 889F60 80241390 46041082 */ mul.s $f2, $f2, $f4 +/* 889F64 80241394 00000000 */ nop +/* 889F68 80241398 C7A00018 */ lwc1 $f0, 0x18($sp) +/* 889F6C 8024139C 46040002 */ mul.s $f0, $f0, $f4 +/* 889F70 802413A0 00000000 */ nop +/* 889F74 802413A4 E6020038 */ swc1 $f2, 0x38($s0) +/* 889F78 802413A8 E6000050 */ swc1 $f0, 0x50($s0) +/* 889F7C 802413AC 8E42005C */ lw $v0, 0x5c($s2) +/* 889F80 802413B0 C6000038 */ lwc1 $f0, 0x38($s0) +/* 889F84 802413B4 C4420048 */ lwc1 $f2, 0x48($v0) +/* 889F88 802413B8 46001080 */ add.s $f2, $f2, $f0 +/* 889F8C 802413BC C6A00038 */ lwc1 $f0, 0x38($s5) +/* 889F90 802413C0 46020001 */ sub.s $f0, $f0, $f2 +/* 889F94 802413C4 E6000038 */ swc1 $f0, 0x38($s0) +/* 889F98 802413C8 8E42005C */ lw $v0, 0x5c($s2) +/* 889F9C 802413CC C6000044 */ lwc1 $f0, 0x44($s0) +/* 889FA0 802413D0 C442004C */ lwc1 $f2, 0x4c($v0) +/* 889FA4 802413D4 46001080 */ add.s $f2, $f2, $f0 +/* 889FA8 802413D8 C6A0003C */ lwc1 $f0, 0x3c($s5) +/* 889FAC 802413DC 46020001 */ sub.s $f0, $f0, $f2 +/* 889FB0 802413E0 E6000044 */ swc1 $f0, 0x44($s0) +/* 889FB4 802413E4 8E42005C */ lw $v0, 0x5c($s2) +/* 889FB8 802413E8 C6000050 */ lwc1 $f0, 0x50($s0) +/* 889FBC 802413EC C4420050 */ lwc1 $f2, 0x50($v0) +/* 889FC0 802413F0 26940004 */ addiu $s4, $s4, 4 +/* 889FC4 802413F4 46001080 */ add.s $f2, $f2, $f0 +/* 889FC8 802413F8 C6A00040 */ lwc1 $f0, 0x40($s5) +/* 889FCC 802413FC 26730004 */ addiu $s3, $s3, 4 +/* 889FD0 80241400 46020001 */ sub.s $f0, $f0, $f2 +/* 889FD4 80241404 26310001 */ addiu $s1, $s1, 1 +/* 889FD8 80241408 2A220003 */ slti $v0, $s1, 3 +/* 889FDC 8024140C E6000050 */ swc1 $f0, 0x50($s0) +/* 889FE0 80241410 1440FFD7 */ bnez $v0, .L80241370 +/* 889FE4 80241414 26100004 */ addiu $s0, $s0, 4 +.L80241418: +/* 889FE8 80241418 8ED20060 */ lw $s2, 0x60($s6) +/* 889FEC 8024141C 8E430000 */ lw $v1, ($s2) +/* 889FF0 80241420 24020001 */ addiu $v0, $zero, 1 +/* 889FF4 80241424 10620038 */ beq $v1, $v0, .L80241508 +/* 889FF8 80241428 28620002 */ slti $v0, $v1, 2 +/* 889FFC 8024142C 50400005 */ beql $v0, $zero, .L80241444 +/* 88A000 80241430 24020002 */ addiu $v0, $zero, 2 +/* 88A004 80241434 10600007 */ beqz $v1, .L80241454 +/* 88A008 80241438 24040005 */ addiu $a0, $zero, 5 +/* 88A00C 8024143C 0809057B */ j .L802415EC +/* 88A010 80241440 00000000 */ nop +.L80241444: +/* 88A014 80241444 10620058 */ beq $v1, $v0, .L802415A8 +/* 88A018 80241448 00000000 */ nop +/* 88A01C 8024144C 0809057B */ j .L802415EC +/* 88A020 80241450 00000000 */ nop +.L80241454: +/* 88A024 80241454 0000882D */ daddu $s1, $zero, $zero +/* 88A028 80241458 3C148024 */ lui $s4, 0x8024 +/* 88A02C 8024145C 26943D04 */ addiu $s4, $s4, 0x3d04 +/* 88A030 80241460 24130020 */ addiu $s3, $zero, 0x20 +/* 88A034 80241464 3C064248 */ lui $a2, 0x4248 +/* 88A038 80241468 44800000 */ mtc1 $zero, $f0 +/* 88A03C 8024146C 24020014 */ addiu $v0, $zero, 0x14 +/* 88A040 80241470 AFA20010 */ sw $v0, 0x10($sp) +/* 88A044 80241474 44050000 */ mfc1 $a1, $f0 +/* 88A048 80241478 8E470060 */ lw $a3, 0x60($s2) +/* 88A04C 8024147C 4485B000 */ mtc1 $a1, $f22 +/* 88A050 80241480 0C00A8ED */ jal update_lerp +/* 88A054 80241484 0240802D */ daddu $s0, $s2, $zero +/* 88A058 80241488 46000506 */ mov.s $f20, $f0 +.L8024148C: +/* 88A05C 8024148C 4406A000 */ mfc1 $a2, $f20 +/* 88A060 80241490 27A40020 */ addiu $a0, $sp, 0x20 +/* 88A064 80241494 E6160020 */ swc1 $f22, 0x20($s0) +/* 88A068 80241498 8E870000 */ lw $a3, ($s4) +/* 88A06C 8024149C 02532821 */ addu $a1, $s2, $s3 +/* 88A070 802414A0 0C00A7E7 */ jal add_vec2D_polar +/* 88A074 802414A4 E7B60020 */ swc1 $f22, 0x20($sp) +/* 88A078 802414A8 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 88A07C 802414AC C7A00020 */ lwc1 $f0, 0x20($sp) +/* 88A080 802414B0 46002102 */ mul.s $f4, $f4, $f0 +/* 88A084 802414B4 00000000 */ nop +/* 88A088 802414B8 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 88A08C 802414BC 26940004 */ addiu $s4, $s4, 4 +/* 88A090 802414C0 46001082 */ mul.s $f2, $f2, $f0 +/* 88A094 802414C4 00000000 */ nop +/* 88A098 802414C8 26730004 */ addiu $s3, $s3, 4 +/* 88A09C 802414CC 26310001 */ addiu $s1, $s1, 1 +/* 88A0A0 802414D0 2A220003 */ slti $v0, $s1, 3 +/* 88A0A4 802414D4 E6040014 */ swc1 $f4, 0x14($s0) +/* 88A0A8 802414D8 E602002C */ swc1 $f2, 0x2c($s0) +/* 88A0AC 802414DC 1440FFEB */ bnez $v0, .L8024148C +/* 88A0B0 802414E0 26100004 */ addiu $s0, $s0, 4 +/* 88A0B4 802414E4 8E420060 */ lw $v0, 0x60($s2) +/* 88A0B8 802414E8 24420001 */ addiu $v0, $v0, 1 +/* 88A0BC 802414EC AE420060 */ sw $v0, 0x60($s2) +/* 88A0C0 802414F0 28420015 */ slti $v0, $v0, 0x15 +/* 88A0C4 802414F4 1440003D */ bnez $v0, .L802415EC +/* 88A0C8 802414F8 24020001 */ addiu $v0, $zero, 1 +/* 88A0CC 802414FC AE420000 */ sw $v0, ($s2) +/* 88A0D0 80241500 0809057B */ j .L802415EC +/* 88A0D4 80241504 AE400060 */ sw $zero, 0x60($s2) +.L80241508: +/* 88A0D8 80241508 0000882D */ daddu $s1, $zero, $zero +/* 88A0DC 8024150C 3C148024 */ lui $s4, 0x8024 +/* 88A0E0 80241510 26943D04 */ addiu $s4, $s4, 0x3d04 +/* 88A0E4 80241514 24130020 */ addiu $s3, $zero, 0x20 +/* 88A0E8 80241518 0240802D */ daddu $s0, $s2, $zero +/* 88A0EC 8024151C 3C014248 */ lui $at, 0x4248 +/* 88A0F0 80241520 4481A000 */ mtc1 $at, $f20 +/* 88A0F4 80241524 4480B000 */ mtc1 $zero, $f22 +.L80241528: +/* 88A0F8 80241528 4406A000 */ mfc1 $a2, $f20 +/* 88A0FC 8024152C 27A40020 */ addiu $a0, $sp, 0x20 +/* 88A100 80241530 E6160020 */ swc1 $f22, 0x20($s0) +/* 88A104 80241534 8E870000 */ lw $a3, ($s4) +/* 88A108 80241538 02532821 */ addu $a1, $s2, $s3 +/* 88A10C 8024153C 0C00A7E7 */ jal add_vec2D_polar +/* 88A110 80241540 E7B60020 */ swc1 $f22, 0x20($sp) +/* 88A114 80241544 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 88A118 80241548 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 88A11C 8024154C 46002102 */ mul.s $f4, $f4, $f0 +/* 88A120 80241550 00000000 */ nop +/* 88A124 80241554 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 88A128 80241558 26940004 */ addiu $s4, $s4, 4 +/* 88A12C 8024155C 46001082 */ mul.s $f2, $f2, $f0 +/* 88A130 80241560 00000000 */ nop +/* 88A134 80241564 26730004 */ addiu $s3, $s3, 4 +/* 88A138 80241568 26310001 */ addiu $s1, $s1, 1 +/* 88A13C 8024156C 2A220003 */ slti $v0, $s1, 3 +/* 88A140 80241570 E6040014 */ swc1 $f4, 0x14($s0) +/* 88A144 80241574 E602002C */ swc1 $f2, 0x2c($s0) +/* 88A148 80241578 1440FFEB */ bnez $v0, .L80241528 +/* 88A14C 8024157C 26100004 */ addiu $s0, $s0, 4 +/* 88A150 80241580 8E420060 */ lw $v0, 0x60($s2) +/* 88A154 80241584 24420001 */ addiu $v0, $v0, 1 +/* 88A158 80241588 AE420060 */ sw $v0, 0x60($s2) +/* 88A15C 8024158C 28420010 */ slti $v0, $v0, 0x10 +/* 88A160 80241590 14400016 */ bnez $v0, .L802415EC +/* 88A164 80241594 2402000F */ addiu $v0, $zero, 0xf +/* 88A168 80241598 AE420060 */ sw $v0, 0x60($s2) +/* 88A16C 8024159C 24020002 */ addiu $v0, $zero, 2 +/* 88A170 802415A0 0809057B */ j .L802415EC +/* 88A174 802415A4 AE420000 */ sw $v0, ($s2) +.L802415A8: +/* 88A178 802415A8 8E420060 */ lw $v0, 0x60($s2) +/* 88A17C 802415AC 24420001 */ addiu $v0, $v0, 1 +/* 88A180 802415B0 AE420060 */ sw $v0, 0x60($s2) +/* 88A184 802415B4 2842001F */ slti $v0, $v0, 0x1f +/* 88A188 802415B8 1440000C */ bnez $v0, .L802415EC +/* 88A18C 802415BC 0000882D */ daddu $s1, $zero, $zero +/* 88A190 802415C0 0240282D */ daddu $a1, $s2, $zero +.L802415C4: +/* 88A194 802415C4 8CA20008 */ lw $v0, 8($a1) +/* 88A198 802415C8 8C430000 */ lw $v1, ($v0) +/* 88A19C 802415CC 26310001 */ addiu $s1, $s1, 1 +/* 88A1A0 802415D0 34630010 */ ori $v1, $v1, 0x10 +/* 88A1A4 802415D4 AC430000 */ sw $v1, ($v0) +/* 88A1A8 802415D8 2A220003 */ slti $v0, $s1, 3 +/* 88A1AC 802415DC 1440FFF9 */ bnez $v0, .L802415C4 +/* 88A1B0 802415E0 24A50004 */ addiu $a1, $a1, 4 +/* 88A1B4 802415E4 080905C8 */ j .L80241720 +/* 88A1B8 802415E8 24020002 */ addiu $v0, $zero, 2 +.L802415EC: +/* 88A1BC 802415EC 8E430004 */ lw $v1, 4($s2) +/* 88A1C0 802415F0 10600005 */ beqz $v1, .L80241608 +/* 88A1C4 802415F4 24020001 */ addiu $v0, $zero, 1 +/* 88A1C8 802415F8 1062000B */ beq $v1, $v0, .L80241628 +/* 88A1CC 802415FC 0000882D */ daddu $s1, $zero, $zero +/* 88A1D0 80241600 080905B7 */ j .L802416DC +/* 88A1D4 80241604 0240282D */ daddu $a1, $s2, $zero +.L80241608: +/* 88A1D8 80241608 8E420064 */ lw $v0, 0x64($s2) +/* 88A1DC 8024160C 24420001 */ addiu $v0, $v0, 1 +/* 88A1E0 80241610 AE420064 */ sw $v0, 0x64($s2) +/* 88A1E4 80241614 28420010 */ slti $v0, $v0, 0x10 +/* 88A1E8 80241618 1440002F */ bnez $v0, .L802416D8 +/* 88A1EC 8024161C 0000882D */ daddu $s1, $zero, $zero +/* 88A1F0 80241620 080905B3 */ j .L802416CC +/* 88A1F4 80241624 24020001 */ addiu $v0, $zero, 1 +.L80241628: +/* 88A1F8 80241628 4480A000 */ mtc1 $zero, $f20 +/* 88A1FC 8024162C 24130014 */ addiu $s3, $zero, 0x14 +/* 88A200 80241630 0240802D */ daddu $s0, $s2, $zero +.L80241634: +/* 88A204 80241634 4405A000 */ mfc1 $a1, $f20 +/* 88A208 80241638 AFB30010 */ sw $s3, 0x10($sp) +/* 88A20C 8024163C 8E060038 */ lw $a2, 0x38($s0) +/* 88A210 80241640 8E470064 */ lw $a3, 0x64($s2) +/* 88A214 80241644 0C00A8ED */ jal update_lerp +/* 88A218 80241648 24040001 */ addiu $a0, $zero, 1 +/* 88A21C 8024164C C6020014 */ lwc1 $f2, 0x14($s0) +/* 88A220 80241650 46001080 */ add.s $f2, $f2, $f0 +/* 88A224 80241654 4405A000 */ mfc1 $a1, $f20 +/* 88A228 80241658 E6020014 */ swc1 $f2, 0x14($s0) +/* 88A22C 8024165C AFB30010 */ sw $s3, 0x10($sp) +/* 88A230 80241660 8E060044 */ lw $a2, 0x44($s0) +/* 88A234 80241664 8E470064 */ lw $a3, 0x64($s2) +/* 88A238 80241668 0C00A8ED */ jal update_lerp +/* 88A23C 8024166C 24040001 */ addiu $a0, $zero, 1 +/* 88A240 80241670 C6020020 */ lwc1 $f2, 0x20($s0) +/* 88A244 80241674 46001080 */ add.s $f2, $f2, $f0 +/* 88A248 80241678 4405A000 */ mfc1 $a1, $f20 +/* 88A24C 8024167C E6020020 */ swc1 $f2, 0x20($s0) +/* 88A250 80241680 AFB30010 */ sw $s3, 0x10($sp) +/* 88A254 80241684 8E060050 */ lw $a2, 0x50($s0) +/* 88A258 80241688 8E470064 */ lw $a3, 0x64($s2) +/* 88A25C 8024168C 0C00A8ED */ jal update_lerp +/* 88A260 80241690 24040001 */ addiu $a0, $zero, 1 +/* 88A264 80241694 C602002C */ lwc1 $f2, 0x2c($s0) +/* 88A268 80241698 46001080 */ add.s $f2, $f2, $f0 +/* 88A26C 8024169C 26310001 */ addiu $s1, $s1, 1 +/* 88A270 802416A0 2A220003 */ slti $v0, $s1, 3 +/* 88A274 802416A4 E602002C */ swc1 $f2, 0x2c($s0) +/* 88A278 802416A8 1440FFE2 */ bnez $v0, .L80241634 +/* 88A27C 802416AC 26100004 */ addiu $s0, $s0, 4 +/* 88A280 802416B0 8E420064 */ lw $v0, 0x64($s2) +/* 88A284 802416B4 24420001 */ addiu $v0, $v0, 1 +/* 88A288 802416B8 AE420064 */ sw $v0, 0x64($s2) +/* 88A28C 802416BC 28420015 */ slti $v0, $v0, 0x15 +/* 88A290 802416C0 14400005 */ bnez $v0, .L802416D8 +/* 88A294 802416C4 0000882D */ daddu $s1, $zero, $zero +/* 88A298 802416C8 24020002 */ addiu $v0, $zero, 2 +.L802416CC: +/* 88A29C 802416CC AE420004 */ sw $v0, 4($s2) +/* 88A2A0 802416D0 AE400064 */ sw $zero, 0x64($s2) +/* 88A2A4 802416D4 0000882D */ daddu $s1, $zero, $zero +.L802416D8: +/* 88A2A8 802416D8 0240282D */ daddu $a1, $s2, $zero +.L802416DC: +/* 88A2AC 802416DC 8CA20008 */ lw $v0, 8($a1) +/* 88A2B0 802416E0 C4A00014 */ lwc1 $f0, 0x14($a1) +/* 88A2B4 802416E4 8C42000C */ lw $v0, 0xc($v0) +/* 88A2B8 802416E8 E4400010 */ swc1 $f0, 0x10($v0) +/* 88A2BC 802416EC 8CA20008 */ lw $v0, 8($a1) +/* 88A2C0 802416F0 C4A00020 */ lwc1 $f0, 0x20($a1) +/* 88A2C4 802416F4 8C42000C */ lw $v0, 0xc($v0) +/* 88A2C8 802416F8 26310001 */ addiu $s1, $s1, 1 +/* 88A2CC 802416FC E4400014 */ swc1 $f0, 0x14($v0) +/* 88A2D0 80241700 8CA20008 */ lw $v0, 8($a1) +/* 88A2D4 80241704 C4A0002C */ lwc1 $f0, 0x2c($a1) +/* 88A2D8 80241708 8C42000C */ lw $v0, 0xc($v0) +/* 88A2DC 8024170C E4400018 */ swc1 $f0, 0x18($v0) +/* 88A2E0 80241710 2A220003 */ slti $v0, $s1, 3 +/* 88A2E4 80241714 1440FFF1 */ bnez $v0, .L802416DC +/* 88A2E8 80241718 24A50004 */ addiu $a1, $a1, 4 +/* 88A2EC 8024171C 0000102D */ daddu $v0, $zero, $zero +.L80241720: +/* 88A2F0 80241720 8FBF0044 */ lw $ra, 0x44($sp) +/* 88A2F4 80241724 8FB60040 */ lw $s6, 0x40($sp) +/* 88A2F8 80241728 8FB5003C */ lw $s5, 0x3c($sp) +/* 88A2FC 8024172C 8FB40038 */ lw $s4, 0x38($sp) +/* 88A300 80241730 8FB30034 */ lw $s3, 0x34($sp) +/* 88A304 80241734 8FB20030 */ lw $s2, 0x30($sp) +/* 88A308 80241738 8FB1002C */ lw $s1, 0x2c($sp) +/* 88A30C 8024173C 8FB00028 */ lw $s0, 0x28($sp) +/* 88A310 80241740 D7B80058 */ ldc1 $f24, 0x58($sp) +/* 88A314 80241744 D7B60050 */ ldc1 $f22, 0x50($sp) +/* 88A318 80241748 D7B40048 */ ldc1 $f20, 0x48($sp) +/* 88A31C 8024174C 03E00008 */ jr $ra +/* 88A320 80241750 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754.s deleted file mode 100644 index 9e8c8e617f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241754 -/* 88A324 80241754 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88A328 80241758 AFB10014 */ sw $s1, 0x14($sp) -/* 88A32C 8024175C 0080882D */ daddu $s1, $a0, $zero -/* 88A330 80241760 AFB20018 */ sw $s2, 0x18($sp) -/* 88A334 80241764 AFBF001C */ sw $ra, 0x1c($sp) -/* 88A338 80241768 AFB00010 */ sw $s0, 0x10($sp) -/* 88A33C 8024176C 8E30000C */ lw $s0, 0xc($s1) -/* 88A340 80241770 10A00010 */ beqz $a1, .L802417B4 -/* 88A344 80241774 0000902D */ daddu $s2, $zero, $zero -/* 88A348 80241778 8E050000 */ lw $a1, ($s0) -/* 88A34C 8024177C 0C0B1EAF */ jal get_variable -/* 88A350 80241780 26100004 */ addiu $s0, $s0, 4 -/* 88A354 80241784 AE220084 */ sw $v0, 0x84($s1) -/* 88A358 80241788 8E050000 */ lw $a1, ($s0) -/* 88A35C 8024178C 0C0B1EAF */ jal get_variable -/* 88A360 80241790 0220202D */ daddu $a0, $s1, $zero -/* 88A364 80241794 0240202D */ daddu $a0, $s2, $zero -/* 88A368 80241798 240500D0 */ addiu $a1, $zero, 0xd0 -/* 88A36C 8024179C 00A0302D */ daddu $a2, $a1, $zero -/* 88A370 802417A0 00A0382D */ daddu $a3, $a1, $zero -/* 88A374 802417A4 AE220088 */ sw $v0, 0x88($s1) -/* 88A378 802417A8 AE200070 */ sw $zero, 0x70($s1) -/* 88A37C 802417AC 0C04DF84 */ jal func_80137E10 -/* 88A380 802417B0 AE200074 */ sw $zero, 0x74($s1) -.L802417B4: -/* 88A384 802417B4 8E230070 */ lw $v1, 0x70($s1) -/* 88A388 802417B8 24040001 */ addiu $a0, $zero, 1 -/* 88A38C 802417BC 10640019 */ beq $v1, $a0, .L80241824 -/* 88A390 802417C0 28620002 */ slti $v0, $v1, 2 -/* 88A394 802417C4 10400005 */ beqz $v0, .L802417DC -/* 88A398 802417C8 24020002 */ addiu $v0, $zero, 2 -/* 88A39C 802417CC 10600007 */ beqz $v1, .L802417EC -/* 88A3A0 802417D0 240500FF */ addiu $a1, $zero, 0xff -/* 88A3A4 802417D4 08090619 */ j .L80241864 -/* 88A3A8 802417D8 00000000 */ nop -.L802417DC: -/* 88A3AC 802417DC 10620019 */ beq $v1, $v0, .L80241844 -/* 88A3B0 802417E0 00000000 */ nop -/* 88A3B4 802417E4 08090619 */ j .L80241864 -/* 88A3B8 802417E8 00000000 */ nop -.L802417EC: -/* 88A3BC 802417EC 8E220074 */ lw $v0, 0x74($s1) -/* 88A3C0 802417F0 14450004 */ bne $v0, $a1, .L80241804 -/* 88A3C4 802417F4 00000000 */ nop -/* 88A3C8 802417F8 AE240070 */ sw $a0, 0x70($s1) -/* 88A3CC 802417FC AE200078 */ sw $zero, 0x78($s1) -/* 88A3D0 80241800 8E220074 */ lw $v0, 0x74($s1) -.L80241804: -/* 88A3D4 80241804 8E230084 */ lw $v1, 0x84($s1) -/* 88A3D8 80241808 00431021 */ addu $v0, $v0, $v1 -/* 88A3DC 8024180C AE220074 */ sw $v0, 0x74($s1) -/* 88A3E0 80241810 28420100 */ slti $v0, $v0, 0x100 -/* 88A3E4 80241814 50400013 */ beql $v0, $zero, .L80241864 -/* 88A3E8 80241818 AE250074 */ sw $a1, 0x74($s1) -/* 88A3EC 8024181C 08090619 */ j .L80241864 -/* 88A3F0 80241820 00000000 */ nop -.L80241824: -/* 88A3F4 80241824 8E220078 */ lw $v0, 0x78($s1) -/* 88A3F8 80241828 24420001 */ addiu $v0, $v0, 1 -/* 88A3FC 8024182C AE220078 */ sw $v0, 0x78($s1) -/* 88A400 80241830 28420002 */ slti $v0, $v0, 2 -/* 88A404 80241834 1440000B */ bnez $v0, .L80241864 -/* 88A408 80241838 24020002 */ addiu $v0, $zero, 2 -/* 88A40C 8024183C 08090619 */ j .L80241864 -/* 88A410 80241840 AE220070 */ sw $v0, 0x70($s1) -.L80241844: -/* 88A414 80241844 8E230074 */ lw $v1, 0x74($s1) -/* 88A418 80241848 50600001 */ beql $v1, $zero, .L80241850 -/* 88A41C 8024184C 24120001 */ addiu $s2, $zero, 1 -.L80241850: -/* 88A420 80241850 8E220088 */ lw $v0, 0x88($s1) -/* 88A424 80241854 00621023 */ subu $v0, $v1, $v0 -/* 88A428 80241858 04410002 */ bgez $v0, .L80241864 -/* 88A42C 8024185C AE220074 */ sw $v0, 0x74($s1) -/* 88A430 80241860 AE200074 */ sw $zero, 0x74($s1) -.L80241864: -/* 88A434 80241864 C6200074 */ lwc1 $f0, 0x74($s1) -/* 88A438 80241868 46800020 */ cvt.s.w $f0, $f0 -/* 88A43C 8024186C 44050000 */ mfc1 $a1, $f0 -/* 88A440 80241870 0C04DF62 */ jal func_80137D88 -/* 88A444 80241874 24040001 */ addiu $a0, $zero, 1 -/* 88A448 80241878 0240102D */ daddu $v0, $s2, $zero -/* 88A44C 8024187C 8FBF001C */ lw $ra, 0x1c($sp) -/* 88A450 80241880 8FB20018 */ lw $s2, 0x18($sp) -/* 88A454 80241884 8FB10014 */ lw $s1, 0x14($sp) -/* 88A458 80241888 8FB00010 */ lw $s0, 0x10($sp) -/* 88A45C 8024188C 03E00008 */ jr $ra -/* 88A460 80241890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s new file mode 100644 index 0000000000..28570d15b7 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241754_88A324.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241754_88A324 +/* 88A324 80241754 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 88A328 80241758 AFB10014 */ sw $s1, 0x14($sp) +/* 88A32C 8024175C 0080882D */ daddu $s1, $a0, $zero +/* 88A330 80241760 AFB20018 */ sw $s2, 0x18($sp) +/* 88A334 80241764 AFBF001C */ sw $ra, 0x1c($sp) +/* 88A338 80241768 AFB00010 */ sw $s0, 0x10($sp) +/* 88A33C 8024176C 8E30000C */ lw $s0, 0xc($s1) +/* 88A340 80241770 10A00010 */ beqz $a1, .L802417B4 +/* 88A344 80241774 0000902D */ daddu $s2, $zero, $zero +/* 88A348 80241778 8E050000 */ lw $a1, ($s0) +/* 88A34C 8024177C 0C0B1EAF */ jal get_variable +/* 88A350 80241780 26100004 */ addiu $s0, $s0, 4 +/* 88A354 80241784 AE220084 */ sw $v0, 0x84($s1) +/* 88A358 80241788 8E050000 */ lw $a1, ($s0) +/* 88A35C 8024178C 0C0B1EAF */ jal get_variable +/* 88A360 80241790 0220202D */ daddu $a0, $s1, $zero +/* 88A364 80241794 0240202D */ daddu $a0, $s2, $zero +/* 88A368 80241798 240500D0 */ addiu $a1, $zero, 0xd0 +/* 88A36C 8024179C 00A0302D */ daddu $a2, $a1, $zero +/* 88A370 802417A0 00A0382D */ daddu $a3, $a1, $zero +/* 88A374 802417A4 AE220088 */ sw $v0, 0x88($s1) +/* 88A378 802417A8 AE200070 */ sw $zero, 0x70($s1) +/* 88A37C 802417AC 0C04DF84 */ jal func_80137E10 +/* 88A380 802417B0 AE200074 */ sw $zero, 0x74($s1) +.L802417B4: +/* 88A384 802417B4 8E230070 */ lw $v1, 0x70($s1) +/* 88A388 802417B8 24040001 */ addiu $a0, $zero, 1 +/* 88A38C 802417BC 10640019 */ beq $v1, $a0, .L80241824 +/* 88A390 802417C0 28620002 */ slti $v0, $v1, 2 +/* 88A394 802417C4 10400005 */ beqz $v0, .L802417DC +/* 88A398 802417C8 24020002 */ addiu $v0, $zero, 2 +/* 88A39C 802417CC 10600007 */ beqz $v1, .L802417EC +/* 88A3A0 802417D0 240500FF */ addiu $a1, $zero, 0xff +/* 88A3A4 802417D4 08090619 */ j .L80241864 +/* 88A3A8 802417D8 00000000 */ nop +.L802417DC: +/* 88A3AC 802417DC 10620019 */ beq $v1, $v0, .L80241844 +/* 88A3B0 802417E0 00000000 */ nop +/* 88A3B4 802417E4 08090619 */ j .L80241864 +/* 88A3B8 802417E8 00000000 */ nop +.L802417EC: +/* 88A3BC 802417EC 8E220074 */ lw $v0, 0x74($s1) +/* 88A3C0 802417F0 14450004 */ bne $v0, $a1, .L80241804 +/* 88A3C4 802417F4 00000000 */ nop +/* 88A3C8 802417F8 AE240070 */ sw $a0, 0x70($s1) +/* 88A3CC 802417FC AE200078 */ sw $zero, 0x78($s1) +/* 88A3D0 80241800 8E220074 */ lw $v0, 0x74($s1) +.L80241804: +/* 88A3D4 80241804 8E230084 */ lw $v1, 0x84($s1) +/* 88A3D8 80241808 00431021 */ addu $v0, $v0, $v1 +/* 88A3DC 8024180C AE220074 */ sw $v0, 0x74($s1) +/* 88A3E0 80241810 28420100 */ slti $v0, $v0, 0x100 +/* 88A3E4 80241814 50400013 */ beql $v0, $zero, .L80241864 +/* 88A3E8 80241818 AE250074 */ sw $a1, 0x74($s1) +/* 88A3EC 8024181C 08090619 */ j .L80241864 +/* 88A3F0 80241820 00000000 */ nop +.L80241824: +/* 88A3F4 80241824 8E220078 */ lw $v0, 0x78($s1) +/* 88A3F8 80241828 24420001 */ addiu $v0, $v0, 1 +/* 88A3FC 8024182C AE220078 */ sw $v0, 0x78($s1) +/* 88A400 80241830 28420002 */ slti $v0, $v0, 2 +/* 88A404 80241834 1440000B */ bnez $v0, .L80241864 +/* 88A408 80241838 24020002 */ addiu $v0, $zero, 2 +/* 88A40C 8024183C 08090619 */ j .L80241864 +/* 88A410 80241840 AE220070 */ sw $v0, 0x70($s1) +.L80241844: +/* 88A414 80241844 8E230074 */ lw $v1, 0x74($s1) +/* 88A418 80241848 50600001 */ beql $v1, $zero, .L80241850 +/* 88A41C 8024184C 24120001 */ addiu $s2, $zero, 1 +.L80241850: +/* 88A420 80241850 8E220088 */ lw $v0, 0x88($s1) +/* 88A424 80241854 00621023 */ subu $v0, $v1, $v0 +/* 88A428 80241858 04410002 */ bgez $v0, .L80241864 +/* 88A42C 8024185C AE220074 */ sw $v0, 0x74($s1) +/* 88A430 80241860 AE200074 */ sw $zero, 0x74($s1) +.L80241864: +/* 88A434 80241864 C6200074 */ lwc1 $f0, 0x74($s1) +/* 88A438 80241868 46800020 */ cvt.s.w $f0, $f0 +/* 88A43C 8024186C 44050000 */ mfc1 $a1, $f0 +/* 88A440 80241870 0C04DF62 */ jal func_80137D88 +/* 88A444 80241874 24040001 */ addiu $a0, $zero, 1 +/* 88A448 80241878 0240102D */ daddu $v0, $s2, $zero +/* 88A44C 8024187C 8FBF001C */ lw $ra, 0x1c($sp) +/* 88A450 80241880 8FB20018 */ lw $s2, 0x18($sp) +/* 88A454 80241884 8FB10014 */ lw $s1, 0x14($sp) +/* 88A458 80241888 8FB00010 */ lw $s0, 0x10($sp) +/* 88A45C 8024188C 03E00008 */ jr $ra +/* 88A460 80241890 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894.s deleted file mode 100644 index 6e89bf945a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241894 -/* 88A464 80241894 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88A468 80241898 AFBF0018 */ sw $ra, 0x18($sp) -/* 88A46C 8024189C 0C00EAD2 */ jal get_npc_safe -/* 88A470 802418A0 2404FFFC */ addiu $a0, $zero, -4 -/* 88A474 802418A4 3C0141F0 */ lui $at, 0x41f0 -/* 88A478 802418A8 44810000 */ mtc1 $at, $f0 -/* 88A47C 802418AC C442003C */ lwc1 $f2, 0x3c($v0) -/* 88A480 802418B0 46001080 */ add.s $f2, $f2, $f0 -/* 88A484 802418B4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88A488 802418B8 8C450038 */ lw $a1, 0x38($v0) -/* 88A48C 802418BC 8C470040 */ lw $a3, 0x40($v0) -/* 88A490 802418C0 44061000 */ mfc1 $a2, $f2 -/* 88A494 802418C4 0C01BFBC */ jal func_8006FEF0 -/* 88A498 802418C8 24040002 */ addiu $a0, $zero, 2 -/* 88A49C 802418CC 8FBF0018 */ lw $ra, 0x18($sp) -/* 88A4A0 802418D0 24020002 */ addiu $v0, $zero, 2 -/* 88A4A4 802418D4 03E00008 */ jr $ra -/* 88A4A8 802418D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894_88A464.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894_88A464.s new file mode 100644 index 0000000000..561938ddb3 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241894_88A464.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241894_88A464 +/* 88A464 80241894 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 88A468 80241898 AFBF0018 */ sw $ra, 0x18($sp) +/* 88A46C 8024189C 0C00EAD2 */ jal get_npc_safe +/* 88A470 802418A0 2404FFFC */ addiu $a0, $zero, -4 +/* 88A474 802418A4 3C0141F0 */ lui $at, 0x41f0 +/* 88A478 802418A8 44810000 */ mtc1 $at, $f0 +/* 88A47C 802418AC C442003C */ lwc1 $f2, 0x3c($v0) +/* 88A480 802418B0 46001080 */ add.s $f2, $f2, $f0 +/* 88A484 802418B4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 88A488 802418B8 8C450038 */ lw $a1, 0x38($v0) +/* 88A48C 802418BC 8C470040 */ lw $a3, 0x40($v0) +/* 88A490 802418C0 44061000 */ mfc1 $a2, $f2 +/* 88A494 802418C4 0C01BFBC */ jal func_8006FEF0 +/* 88A498 802418C8 24040002 */ addiu $a0, $zero, 2 +/* 88A49C 802418CC 8FBF0018 */ lw $ra, 0x18($sp) +/* 88A4A0 802418D0 24020002 */ addiu $v0, $zero, 2 +/* 88A4A4 802418D4 03E00008 */ jr $ra +/* 88A4A8 802418D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC.s deleted file mode 100644 index 018ebb2e9a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418DC -/* 88A4AC 802418DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88A4B0 802418E0 AFBF0018 */ sw $ra, 0x18($sp) -/* 88A4B4 802418E4 0C00EAD2 */ jal get_npc_safe -/* 88A4B8 802418E8 2404FFFC */ addiu $a0, $zero, -4 -/* 88A4BC 802418EC 3C0141F0 */ lui $at, 0x41f0 -/* 88A4C0 802418F0 44810000 */ mtc1 $at, $f0 -/* 88A4C4 802418F4 C442003C */ lwc1 $f2, 0x3c($v0) -/* 88A4C8 802418F8 46001080 */ add.s $f2, $f2, $f0 -/* 88A4CC 802418FC E7A00010 */ swc1 $f0, 0x10($sp) -/* 88A4D0 80241900 8C450038 */ lw $a1, 0x38($v0) -/* 88A4D4 80241904 8C470040 */ lw $a3, 0x40($v0) -/* 88A4D8 80241908 44061000 */ mfc1 $a2, $f2 -/* 88A4DC 8024190C 0C01BFBC */ jal func_8006FEF0 -/* 88A4E0 80241910 24040004 */ addiu $a0, $zero, 4 -/* 88A4E4 80241914 8FBF0018 */ lw $ra, 0x18($sp) -/* 88A4E8 80241918 24020002 */ addiu $v0, $zero, 2 -/* 88A4EC 8024191C 03E00008 */ jr $ra -/* 88A4F0 80241920 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC_88A4AC.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC_88A4AC.s new file mode 100644 index 0000000000..bbeb9a29ba --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_802418DC_88A4AC.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802418DC_88A4AC +/* 88A4AC 802418DC 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 88A4B0 802418E0 AFBF0018 */ sw $ra, 0x18($sp) +/* 88A4B4 802418E4 0C00EAD2 */ jal get_npc_safe +/* 88A4B8 802418E8 2404FFFC */ addiu $a0, $zero, -4 +/* 88A4BC 802418EC 3C0141F0 */ lui $at, 0x41f0 +/* 88A4C0 802418F0 44810000 */ mtc1 $at, $f0 +/* 88A4C4 802418F4 C442003C */ lwc1 $f2, 0x3c($v0) +/* 88A4C8 802418F8 46001080 */ add.s $f2, $f2, $f0 +/* 88A4CC 802418FC E7A00010 */ swc1 $f0, 0x10($sp) +/* 88A4D0 80241900 8C450038 */ lw $a1, 0x38($v0) +/* 88A4D4 80241904 8C470040 */ lw $a3, 0x40($v0) +/* 88A4D8 80241908 44061000 */ mfc1 $a2, $f2 +/* 88A4DC 8024190C 0C01BFBC */ jal func_8006FEF0 +/* 88A4E0 80241910 24040004 */ addiu $a0, $zero, 4 +/* 88A4E4 80241914 8FBF0018 */ lw $ra, 0x18($sp) +/* 88A4E8 80241918 24020002 */ addiu $v0, $zero, 2 +/* 88A4EC 8024191C 03E00008 */ jr $ra +/* 88A4F0 80241920 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924.s deleted file mode 100644 index acca272266..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241924 -/* 88A4F4 80241924 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 88A4F8 80241928 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 88A4FC 8024192C AC800084 */ sw $zero, 0x84($a0) -/* 88A500 80241930 80620000 */ lb $v0, ($v1) -/* 88A504 80241934 10400005 */ beqz $v0, .L8024194C -/* 88A508 80241938 24020003 */ addiu $v0, $zero, 3 -/* 88A50C 8024193C 80630003 */ lb $v1, 3($v1) -/* 88A510 80241940 14620002 */ bne $v1, $v0, .L8024194C -/* 88A514 80241944 24020001 */ addiu $v0, $zero, 1 -/* 88A518 80241948 AC820084 */ sw $v0, 0x84($a0) -.L8024194C: -/* 88A51C 8024194C 03E00008 */ jr $ra -/* 88A520 80241950 24020002 */ addiu $v0, $zero, 2 -/* 88A524 80241954 00000000 */ nop -/* 88A528 80241958 00000000 */ nop -/* 88A52C 8024195C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s new file mode 100644 index 0000000000..4f2fed304d --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241924_88A4F4.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241924_88A4F4 +/* 88A4F4 80241924 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* 88A4F8 80241928 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 88A4FC 8024192C AC800084 */ sw $zero, 0x84($a0) +/* 88A500 80241930 80620000 */ lb $v0, ($v1) +/* 88A504 80241934 10400005 */ beqz $v0, .L8024194C +/* 88A508 80241938 24020003 */ addiu $v0, $zero, 3 +/* 88A50C 8024193C 80630003 */ lb $v1, 3($v1) +/* 88A510 80241940 14620002 */ bne $v1, $v0, .L8024194C +/* 88A514 80241944 24020001 */ addiu $v0, $zero, 1 +/* 88A518 80241948 AC820084 */ sw $v0, 0x84($a0) +.L8024194C: +/* 88A51C 8024194C 03E00008 */ jr $ra +/* 88A520 80241950 24020002 */ addiu $v0, $zero, 2 +/* 88A524 80241954 00000000 */ nop +/* 88A528 80241958 00000000 */ nop +/* 88A52C 8024195C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241960.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241960.s deleted file mode 100644 index decaf031f9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241960.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241960 -/* 88A530 80241960 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88A534 80241964 AFB20018 */ sw $s2, 0x18($sp) -/* 88A538 80241968 0080902D */ daddu $s2, $a0, $zero -/* 88A53C 8024196C AFBF001C */ sw $ra, 0x1c($sp) -/* 88A540 80241970 AFB10014 */ sw $s1, 0x14($sp) -/* 88A544 80241974 AFB00010 */ sw $s0, 0x10($sp) -/* 88A548 80241978 8E510148 */ lw $s1, 0x148($s2) -/* 88A54C 8024197C 0C00EABB */ jal get_npc_unsafe -/* 88A550 80241980 86240008 */ lh $a0, 8($s1) -/* 88A554 80241984 0040802D */ daddu $s0, $v0, $zero -/* 88A558 80241988 8E2300CC */ lw $v1, 0xcc($s1) -/* 88A55C 8024198C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 88A560 80241990 8C630020 */ lw $v1, 0x20($v1) -/* 88A564 80241994 AE030028 */ sw $v1, 0x28($s0) -/* 88A568 80241998 96220076 */ lhu $v0, 0x76($s1) -/* 88A56C 8024199C A602008E */ sh $v0, 0x8e($s0) -/* 88A570 802419A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 88A574 802419A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 88A578 802419A8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 88A57C 802419AC 8C460028 */ lw $a2, 0x28($v0) -/* 88A580 802419B0 0C00A720 */ jal atan2 -/* 88A584 802419B4 8C470030 */ lw $a3, 0x30($v0) -/* 88A588 802419B8 2402000D */ addiu $v0, $zero, 0xd -/* 88A58C 802419BC E600000C */ swc1 $f0, 0xc($s0) -/* 88A590 802419C0 AE420070 */ sw $v0, 0x70($s2) -/* 88A594 802419C4 8FBF001C */ lw $ra, 0x1c($sp) -/* 88A598 802419C8 8FB20018 */ lw $s2, 0x18($sp) -/* 88A59C 802419CC 8FB10014 */ lw $s1, 0x14($sp) -/* 88A5A0 802419D0 8FB00010 */ lw $s0, 0x10($sp) -/* 88A5A4 802419D4 03E00008 */ jr $ra -/* 88A5A8 802419D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241960_88A530.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241960_88A530.s new file mode 100644 index 0000000000..491ffcf614 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241960_88A530.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241960_88A530 +/* 88A530 80241960 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 88A534 80241964 AFB20018 */ sw $s2, 0x18($sp) +/* 88A538 80241968 0080902D */ daddu $s2, $a0, $zero +/* 88A53C 8024196C AFBF001C */ sw $ra, 0x1c($sp) +/* 88A540 80241970 AFB10014 */ sw $s1, 0x14($sp) +/* 88A544 80241974 AFB00010 */ sw $s0, 0x10($sp) +/* 88A548 80241978 8E510148 */ lw $s1, 0x148($s2) +/* 88A54C 8024197C 0C00EABB */ jal get_npc_unsafe +/* 88A550 80241980 86240008 */ lh $a0, 8($s1) +/* 88A554 80241984 0040802D */ daddu $s0, $v0, $zero +/* 88A558 80241988 8E2300CC */ lw $v1, 0xcc($s1) +/* 88A55C 8024198C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 88A560 80241990 8C630020 */ lw $v1, 0x20($v1) +/* 88A564 80241994 AE030028 */ sw $v1, 0x28($s0) +/* 88A568 80241998 96220076 */ lhu $v0, 0x76($s1) +/* 88A56C 8024199C A602008E */ sh $v0, 0x8e($s0) +/* 88A570 802419A0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 88A574 802419A4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 88A578 802419A8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 88A57C 802419AC 8C460028 */ lw $a2, 0x28($v0) +/* 88A580 802419B0 0C00A720 */ jal atan2 +/* 88A584 802419B4 8C470030 */ lw $a3, 0x30($v0) +/* 88A588 802419B8 2402000D */ addiu $v0, $zero, 0xd +/* 88A58C 802419BC E600000C */ swc1 $f0, 0xc($s0) +/* 88A590 802419C0 AE420070 */ sw $v0, 0x70($s2) +/* 88A594 802419C4 8FBF001C */ lw $ra, 0x1c($sp) +/* 88A598 802419C8 8FB20018 */ lw $s2, 0x18($sp) +/* 88A59C 802419CC 8FB10014 */ lw $s1, 0x14($sp) +/* 88A5A0 802419D0 8FB00010 */ lw $s0, 0x10($sp) +/* 88A5A4 802419D4 03E00008 */ jr $ra +/* 88A5A8 802419D8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC.s deleted file mode 100644 index 6fc402243c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419DC -/* 88A5AC 802419DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 88A5B0 802419E0 AFB3001C */ sw $s3, 0x1c($sp) -/* 88A5B4 802419E4 0080982D */ daddu $s3, $a0, $zero -/* 88A5B8 802419E8 AFBF0020 */ sw $ra, 0x20($sp) -/* 88A5BC 802419EC AFB20018 */ sw $s2, 0x18($sp) -/* 88A5C0 802419F0 AFB10014 */ sw $s1, 0x14($sp) -/* 88A5C4 802419F4 AFB00010 */ sw $s0, 0x10($sp) -/* 88A5C8 802419F8 8E710148 */ lw $s1, 0x148($s3) -/* 88A5CC 802419FC 86240008 */ lh $a0, 8($s1) -/* 88A5D0 80241A00 0C00EABB */ jal get_npc_unsafe -/* 88A5D4 80241A04 00A0902D */ daddu $s2, $a1, $zero -/* 88A5D8 80241A08 0040802D */ daddu $s0, $v0, $zero -/* 88A5DC 80241A0C 8602008E */ lh $v0, 0x8e($s0) -/* 88A5E0 80241A10 9603008E */ lhu $v1, 0x8e($s0) -/* 88A5E4 80241A14 18400005 */ blez $v0, .L80241A2C -/* 88A5E8 80241A18 2462FFFF */ addiu $v0, $v1, -1 -/* 88A5EC 80241A1C A602008E */ sh $v0, 0x8e($s0) -/* 88A5F0 80241A20 00021400 */ sll $v0, $v0, 0x10 -/* 88A5F4 80241A24 1C400033 */ bgtz $v0, .L80241AF4 -/* 88A5F8 80241A28 00000000 */ nop -.L80241A2C: -/* 88A5FC 80241A2C 8602008C */ lh $v0, 0x8c($s0) -/* 88A600 80241A30 14400030 */ bnez $v0, .L80241AF4 -/* 88A604 80241A34 00000000 */ nop -/* 88A608 80241A38 8E2200CC */ lw $v0, 0xcc($s1) -/* 88A60C 80241A3C 8C420024 */ lw $v0, 0x24($v0) -/* 88A610 80241A40 AE020028 */ sw $v0, 0x28($s0) -/* 88A614 80241A44 C6400018 */ lwc1 $f0, 0x18($s2) -/* 88A618 80241A48 E6000018 */ swc1 $f0, 0x18($s0) -/* 88A61C 80241A4C 8E230088 */ lw $v1, 0x88($s1) -/* 88A620 80241A50 24020005 */ addiu $v0, $zero, 5 -/* 88A624 80241A54 10620005 */ beq $v1, $v0, .L80241A6C -/* 88A628 80241A58 00000000 */ nop -/* 88A62C 80241A5C 10600003 */ beqz $v1, .L80241A6C -/* 88A630 80241A60 24020001 */ addiu $v0, $zero, 1 -/* 88A634 80241A64 14620006 */ bne $v1, $v0, .L80241A80 -/* 88A638 80241A68 00000000 */ nop -.L80241A6C: -/* 88A63C 80241A6C 8E220084 */ lw $v0, 0x84($s1) -/* 88A640 80241A70 00021FC2 */ srl $v1, $v0, 0x1f -/* 88A644 80241A74 00431021 */ addu $v0, $v0, $v1 -/* 88A648 80241A78 00021043 */ sra $v0, $v0, 1 -/* 88A64C 80241A7C A60200A8 */ sh $v0, 0xa8($s0) -.L80241A80: -/* 88A650 80241A80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 88A654 80241A84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 88A658 80241A88 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 88A65C 80241A8C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 88A660 80241A90 8C460028 */ lw $a2, 0x28($v0) -/* 88A664 80241A94 0C00A7B5 */ jal dist2D -/* 88A668 80241A98 8C470030 */ lw $a3, 0x30($v0) -/* 88A66C 80241A9C C6020018 */ lwc1 $f2, 0x18($s0) -/* 88A670 80241AA0 46020003 */ div.s $f0, $f0, $f2 -/* 88A674 80241AA4 3C018024 */ lui $at, 0x8024 -/* 88A678 80241AA8 D42249D0 */ ldc1 $f2, 0x49d0($at) -/* 88A67C 80241AAC 46000021 */ cvt.d.s $f0, $f0 -/* 88A680 80241AB0 46220000 */ add.d $f0, $f0, $f2 -/* 88A684 80241AB4 4620010D */ trunc.w.d $f4, $f0 -/* 88A688 80241AB8 44022000 */ mfc1 $v0, $f4 -/* 88A68C 80241ABC 00000000 */ nop -/* 88A690 80241AC0 A602008E */ sh $v0, 0x8e($s0) -/* 88A694 80241AC4 00021400 */ sll $v0, $v0, 0x10 -/* 88A698 80241AC8 8E230078 */ lw $v1, 0x78($s1) -/* 88A69C 80241ACC 00021403 */ sra $v0, $v0, 0x10 -/* 88A6A0 80241AD0 0043102A */ slt $v0, $v0, $v1 -/* 88A6A4 80241AD4 10400003 */ beqz $v0, .L80241AE4 -/* 88A6A8 80241AD8 00000000 */ nop -/* 88A6AC 80241ADC 9622007A */ lhu $v0, 0x7a($s1) -/* 88A6B0 80241AE0 A602008E */ sh $v0, 0x8e($s0) -.L80241AE4: -/* 88A6B4 80241AE4 8602008E */ lh $v0, 0x8e($s0) -/* 88A6B8 80241AE8 AE22007C */ sw $v0, 0x7c($s1) -/* 88A6BC 80241AEC 2402000E */ addiu $v0, $zero, 0xe -/* 88A6C0 80241AF0 AE620070 */ sw $v0, 0x70($s3) -.L80241AF4: -/* 88A6C4 80241AF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 88A6C8 80241AF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 88A6CC 80241AFC 8FB20018 */ lw $s2, 0x18($sp) -/* 88A6D0 80241B00 8FB10014 */ lw $s1, 0x14($sp) -/* 88A6D4 80241B04 8FB00010 */ lw $s0, 0x10($sp) -/* 88A6D8 80241B08 03E00008 */ jr $ra -/* 88A6DC 80241B0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s new file mode 100644 index 0000000000..749f49cd00 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802419DC_88A5AC.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802419DC_88A5AC +/* 88A5AC 802419DC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 88A5B0 802419E0 AFB3001C */ sw $s3, 0x1c($sp) +/* 88A5B4 802419E4 0080982D */ daddu $s3, $a0, $zero +/* 88A5B8 802419E8 AFBF0020 */ sw $ra, 0x20($sp) +/* 88A5BC 802419EC AFB20018 */ sw $s2, 0x18($sp) +/* 88A5C0 802419F0 AFB10014 */ sw $s1, 0x14($sp) +/* 88A5C4 802419F4 AFB00010 */ sw $s0, 0x10($sp) +/* 88A5C8 802419F8 8E710148 */ lw $s1, 0x148($s3) +/* 88A5CC 802419FC 86240008 */ lh $a0, 8($s1) +/* 88A5D0 80241A00 0C00EABB */ jal get_npc_unsafe +/* 88A5D4 80241A04 00A0902D */ daddu $s2, $a1, $zero +/* 88A5D8 80241A08 0040802D */ daddu $s0, $v0, $zero +/* 88A5DC 80241A0C 8602008E */ lh $v0, 0x8e($s0) +/* 88A5E0 80241A10 9603008E */ lhu $v1, 0x8e($s0) +/* 88A5E4 80241A14 18400005 */ blez $v0, .L80241A2C +/* 88A5E8 80241A18 2462FFFF */ addiu $v0, $v1, -1 +/* 88A5EC 80241A1C A602008E */ sh $v0, 0x8e($s0) +/* 88A5F0 80241A20 00021400 */ sll $v0, $v0, 0x10 +/* 88A5F4 80241A24 1C400033 */ bgtz $v0, .L80241AF4 +/* 88A5F8 80241A28 00000000 */ nop +.L80241A2C: +/* 88A5FC 80241A2C 8602008C */ lh $v0, 0x8c($s0) +/* 88A600 80241A30 14400030 */ bnez $v0, .L80241AF4 +/* 88A604 80241A34 00000000 */ nop +/* 88A608 80241A38 8E2200CC */ lw $v0, 0xcc($s1) +/* 88A60C 80241A3C 8C420024 */ lw $v0, 0x24($v0) +/* 88A610 80241A40 AE020028 */ sw $v0, 0x28($s0) +/* 88A614 80241A44 C6400018 */ lwc1 $f0, 0x18($s2) +/* 88A618 80241A48 E6000018 */ swc1 $f0, 0x18($s0) +/* 88A61C 80241A4C 8E230088 */ lw $v1, 0x88($s1) +/* 88A620 80241A50 24020005 */ addiu $v0, $zero, 5 +/* 88A624 80241A54 10620005 */ beq $v1, $v0, .L80241A6C +/* 88A628 80241A58 00000000 */ nop +/* 88A62C 80241A5C 10600003 */ beqz $v1, .L80241A6C +/* 88A630 80241A60 24020001 */ addiu $v0, $zero, 1 +/* 88A634 80241A64 14620006 */ bne $v1, $v0, .L80241A80 +/* 88A638 80241A68 00000000 */ nop +.L80241A6C: +/* 88A63C 80241A6C 8E220084 */ lw $v0, 0x84($s1) +/* 88A640 80241A70 00021FC2 */ srl $v1, $v0, 0x1f +/* 88A644 80241A74 00431021 */ addu $v0, $v0, $v1 +/* 88A648 80241A78 00021043 */ sra $v0, $v0, 1 +/* 88A64C 80241A7C A60200A8 */ sh $v0, 0xa8($s0) +.L80241A80: +/* 88A650 80241A80 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 88A654 80241A84 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 88A658 80241A88 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 88A65C 80241A8C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 88A660 80241A90 8C460028 */ lw $a2, 0x28($v0) +/* 88A664 80241A94 0C00A7B5 */ jal dist2D +/* 88A668 80241A98 8C470030 */ lw $a3, 0x30($v0) +/* 88A66C 80241A9C C6020018 */ lwc1 $f2, 0x18($s0) +/* 88A670 80241AA0 46020003 */ div.s $f0, $f0, $f2 +/* 88A674 80241AA4 3C018024 */ lui $at, 0x8024 +/* 88A678 80241AA8 D42249D0 */ ldc1 $f2, 0x49d0($at) +/* 88A67C 80241AAC 46000021 */ cvt.d.s $f0, $f0 +/* 88A680 80241AB0 46220000 */ add.d $f0, $f0, $f2 +/* 88A684 80241AB4 4620010D */ trunc.w.d $f4, $f0 +/* 88A688 80241AB8 44022000 */ mfc1 $v0, $f4 +/* 88A68C 80241ABC 00000000 */ nop +/* 88A690 80241AC0 A602008E */ sh $v0, 0x8e($s0) +/* 88A694 80241AC4 00021400 */ sll $v0, $v0, 0x10 +/* 88A698 80241AC8 8E230078 */ lw $v1, 0x78($s1) +/* 88A69C 80241ACC 00021403 */ sra $v0, $v0, 0x10 +/* 88A6A0 80241AD0 0043102A */ slt $v0, $v0, $v1 +/* 88A6A4 80241AD4 10400003 */ beqz $v0, .L80241AE4 +/* 88A6A8 80241AD8 00000000 */ nop +/* 88A6AC 80241ADC 9622007A */ lhu $v0, 0x7a($s1) +/* 88A6B0 80241AE0 A602008E */ sh $v0, 0x8e($s0) +.L80241AE4: +/* 88A6B4 80241AE4 8602008E */ lh $v0, 0x8e($s0) +/* 88A6B8 80241AE8 AE22007C */ sw $v0, 0x7c($s1) +/* 88A6BC 80241AEC 2402000E */ addiu $v0, $zero, 0xe +/* 88A6C0 80241AF0 AE620070 */ sw $v0, 0x70($s3) +.L80241AF4: +/* 88A6C4 80241AF4 8FBF0020 */ lw $ra, 0x20($sp) +/* 88A6C8 80241AF8 8FB3001C */ lw $s3, 0x1c($sp) +/* 88A6CC 80241AFC 8FB20018 */ lw $s2, 0x18($sp) +/* 88A6D0 80241B00 8FB10014 */ lw $s1, 0x14($sp) +/* 88A6D4 80241B04 8FB00010 */ lw $s0, 0x10($sp) +/* 88A6D8 80241B08 03E00008 */ jr $ra +/* 88A6DC 80241B0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241B10.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241B10.s deleted file mode 100644 index 7617913f94..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241B10.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B10 -/* 88A6E0 80241B10 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 88A6E4 80241B14 AFB3003C */ sw $s3, 0x3c($sp) -/* 88A6E8 80241B18 0080982D */ daddu $s3, $a0, $zero -/* 88A6EC 80241B1C AFBF0040 */ sw $ra, 0x40($sp) -/* 88A6F0 80241B20 AFB20038 */ sw $s2, 0x38($sp) -/* 88A6F4 80241B24 AFB10034 */ sw $s1, 0x34($sp) -/* 88A6F8 80241B28 AFB00030 */ sw $s0, 0x30($sp) -/* 88A6FC 80241B2C 8E710148 */ lw $s1, 0x148($s3) -/* 88A700 80241B30 0C00EABB */ jal get_npc_unsafe -/* 88A704 80241B34 86240008 */ lh $a0, 8($s1) -/* 88A708 80241B38 0040802D */ daddu $s0, $v0, $zero -/* 88A70C 80241B3C 8E22007C */ lw $v0, 0x7c($s1) -/* 88A710 80241B40 8603008E */ lh $v1, 0x8e($s0) -/* 88A714 80241B44 2442FFFF */ addiu $v0, $v0, -1 -/* 88A718 80241B48 14620012 */ bne $v1, $v0, .L80241B94 -/* 88A71C 80241B4C 00000000 */ nop -/* 88A720 80241B50 C6000038 */ lwc1 $f0, 0x38($s0) -/* 88A724 80241B54 4600020D */ trunc.w.s $f8, $f0 -/* 88A728 80241B58 44024000 */ mfc1 $v0, $f8 -/* 88A72C 80241B5C 00000000 */ nop -/* 88A730 80241B60 A6220010 */ sh $v0, 0x10($s1) -/* 88A734 80241B64 C600003C */ lwc1 $f0, 0x3c($s0) -/* 88A738 80241B68 4600020D */ trunc.w.s $f8, $f0 -/* 88A73C 80241B6C 44024000 */ mfc1 $v0, $f8 -/* 88A740 80241B70 00000000 */ nop -/* 88A744 80241B74 A6220012 */ sh $v0, 0x12($s1) -/* 88A748 80241B78 C6000040 */ lwc1 $f0, 0x40($s0) -/* 88A74C 80241B7C 24020001 */ addiu $v0, $zero, 1 -/* 88A750 80241B80 A2220007 */ sb $v0, 7($s1) -/* 88A754 80241B84 4600020D */ trunc.w.s $f8, $f0 -/* 88A758 80241B88 44024000 */ mfc1 $v0, $f8 -/* 88A75C 80241B8C 00000000 */ nop -/* 88A760 80241B90 A6220014 */ sh $v0, 0x14($s1) -.L80241B94: -/* 88A764 80241B94 C6000038 */ lwc1 $f0, 0x38($s0) -/* 88A768 80241B98 C602003C */ lwc1 $f2, 0x3c($s0) -/* 88A76C 80241B9C C6040040 */ lwc1 $f4, 0x40($s0) -/* 88A770 80241BA0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 88A774 80241BA4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 88A778 80241BA8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 88A77C 80241BAC E7A40028 */ swc1 $f4, 0x28($sp) -/* 88A780 80241BB0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 88A784 80241BB4 C600000C */ lwc1 $f0, 0xc($s0) -/* 88A788 80241BB8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 88A78C 80241BBC 860200A8 */ lh $v0, 0xa8($s0) -/* 88A790 80241BC0 27A50020 */ addiu $a1, $sp, 0x20 -/* 88A794 80241BC4 44820000 */ mtc1 $v0, $f0 -/* 88A798 80241BC8 00000000 */ nop -/* 88A79C 80241BCC 46800020 */ cvt.s.w $f0, $f0 -/* 88A7A0 80241BD0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 88A7A4 80241BD4 860200A6 */ lh $v0, 0xa6($s0) -/* 88A7A8 80241BD8 27A60024 */ addiu $a2, $sp, 0x24 -/* 88A7AC 80241BDC 44820000 */ mtc1 $v0, $f0 -/* 88A7B0 80241BE0 00000000 */ nop -/* 88A7B4 80241BE4 46800020 */ cvt.s.w $f0, $f0 -/* 88A7B8 80241BE8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 88A7BC 80241BEC 8E040080 */ lw $a0, 0x80($s0) -/* 88A7C0 80241BF0 0C037711 */ jal func_800DDC44 -/* 88A7C4 80241BF4 27A70028 */ addiu $a3, $sp, 0x28 -/* 88A7C8 80241BF8 0040902D */ daddu $s2, $v0, $zero -/* 88A7CC 80241BFC 16400005 */ bnez $s2, .L80241C14 -/* 88A7D0 80241C00 00000000 */ nop -/* 88A7D4 80241C04 8E050018 */ lw $a1, 0x18($s0) -/* 88A7D8 80241C08 8E06000C */ lw $a2, 0xc($s0) -/* 88A7DC 80241C0C 0C00EA95 */ jal npc_move_heading -/* 88A7E0 80241C10 0200202D */ daddu $a0, $s0, $zero -.L80241C14: -/* 88A7E4 80241C14 8602008E */ lh $v0, 0x8e($s0) -/* 88A7E8 80241C18 9603008E */ lhu $v1, 0x8e($s0) -/* 88A7EC 80241C1C 18400007 */ blez $v0, .L80241C3C -/* 88A7F0 80241C20 2462FFFF */ addiu $v0, $v1, -1 -/* 88A7F4 80241C24 A602008E */ sh $v0, 0x8e($s0) -/* 88A7F8 80241C28 00021400 */ sll $v0, $v0, 0x10 -/* 88A7FC 80241C2C 18400003 */ blez $v0, .L80241C3C -/* 88A800 80241C30 00000000 */ nop -/* 88A804 80241C34 12400008 */ beqz $s2, .L80241C58 -/* 88A808 80241C38 00000000 */ nop -.L80241C3C: -/* 88A80C 80241C3C 8E2200CC */ lw $v0, 0xcc($s1) -/* 88A810 80241C40 A2200007 */ sb $zero, 7($s1) -/* 88A814 80241C44 8C420028 */ lw $v0, 0x28($v0) -/* 88A818 80241C48 A600008E */ sh $zero, 0x8e($s0) -/* 88A81C 80241C4C AE020028 */ sw $v0, 0x28($s0) -/* 88A820 80241C50 2402000F */ addiu $v0, $zero, 0xf -/* 88A824 80241C54 AE620070 */ sw $v0, 0x70($s3) -.L80241C58: -/* 88A828 80241C58 8FBF0040 */ lw $ra, 0x40($sp) -/* 88A82C 80241C5C 8FB3003C */ lw $s3, 0x3c($sp) -/* 88A830 80241C60 8FB20038 */ lw $s2, 0x38($sp) -/* 88A834 80241C64 8FB10034 */ lw $s1, 0x34($sp) -/* 88A838 80241C68 8FB00030 */ lw $s0, 0x30($sp) -/* 88A83C 80241C6C 03E00008 */ jr $ra -/* 88A840 80241C70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241B10_88A6E0.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241B10_88A6E0.s new file mode 100644 index 0000000000..547d8a1b7a --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241B10_88A6E0.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241B10_88A6E0 +/* 88A6E0 80241B10 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 88A6E4 80241B14 AFB3003C */ sw $s3, 0x3c($sp) +/* 88A6E8 80241B18 0080982D */ daddu $s3, $a0, $zero +/* 88A6EC 80241B1C AFBF0040 */ sw $ra, 0x40($sp) +/* 88A6F0 80241B20 AFB20038 */ sw $s2, 0x38($sp) +/* 88A6F4 80241B24 AFB10034 */ sw $s1, 0x34($sp) +/* 88A6F8 80241B28 AFB00030 */ sw $s0, 0x30($sp) +/* 88A6FC 80241B2C 8E710148 */ lw $s1, 0x148($s3) +/* 88A700 80241B30 0C00EABB */ jal get_npc_unsafe +/* 88A704 80241B34 86240008 */ lh $a0, 8($s1) +/* 88A708 80241B38 0040802D */ daddu $s0, $v0, $zero +/* 88A70C 80241B3C 8E22007C */ lw $v0, 0x7c($s1) +/* 88A710 80241B40 8603008E */ lh $v1, 0x8e($s0) +/* 88A714 80241B44 2442FFFF */ addiu $v0, $v0, -1 +/* 88A718 80241B48 14620012 */ bne $v1, $v0, .L80241B94 +/* 88A71C 80241B4C 00000000 */ nop +/* 88A720 80241B50 C6000038 */ lwc1 $f0, 0x38($s0) +/* 88A724 80241B54 4600020D */ trunc.w.s $f8, $f0 +/* 88A728 80241B58 44024000 */ mfc1 $v0, $f8 +/* 88A72C 80241B5C 00000000 */ nop +/* 88A730 80241B60 A6220010 */ sh $v0, 0x10($s1) +/* 88A734 80241B64 C600003C */ lwc1 $f0, 0x3c($s0) +/* 88A738 80241B68 4600020D */ trunc.w.s $f8, $f0 +/* 88A73C 80241B6C 44024000 */ mfc1 $v0, $f8 +/* 88A740 80241B70 00000000 */ nop +/* 88A744 80241B74 A6220012 */ sh $v0, 0x12($s1) +/* 88A748 80241B78 C6000040 */ lwc1 $f0, 0x40($s0) +/* 88A74C 80241B7C 24020001 */ addiu $v0, $zero, 1 +/* 88A750 80241B80 A2220007 */ sb $v0, 7($s1) +/* 88A754 80241B84 4600020D */ trunc.w.s $f8, $f0 +/* 88A758 80241B88 44024000 */ mfc1 $v0, $f8 +/* 88A75C 80241B8C 00000000 */ nop +/* 88A760 80241B90 A6220014 */ sh $v0, 0x14($s1) +.L80241B94: +/* 88A764 80241B94 C6000038 */ lwc1 $f0, 0x38($s0) +/* 88A768 80241B98 C602003C */ lwc1 $f2, 0x3c($s0) +/* 88A76C 80241B9C C6040040 */ lwc1 $f4, 0x40($s0) +/* 88A770 80241BA0 C6060018 */ lwc1 $f6, 0x18($s0) +/* 88A774 80241BA4 E7A00020 */ swc1 $f0, 0x20($sp) +/* 88A778 80241BA8 E7A20024 */ swc1 $f2, 0x24($sp) +/* 88A77C 80241BAC E7A40028 */ swc1 $f4, 0x28($sp) +/* 88A780 80241BB0 E7A60010 */ swc1 $f6, 0x10($sp) +/* 88A784 80241BB4 C600000C */ lwc1 $f0, 0xc($s0) +/* 88A788 80241BB8 E7A00014 */ swc1 $f0, 0x14($sp) +/* 88A78C 80241BBC 860200A8 */ lh $v0, 0xa8($s0) +/* 88A790 80241BC0 27A50020 */ addiu $a1, $sp, 0x20 +/* 88A794 80241BC4 44820000 */ mtc1 $v0, $f0 +/* 88A798 80241BC8 00000000 */ nop +/* 88A79C 80241BCC 46800020 */ cvt.s.w $f0, $f0 +/* 88A7A0 80241BD0 E7A00018 */ swc1 $f0, 0x18($sp) +/* 88A7A4 80241BD4 860200A6 */ lh $v0, 0xa6($s0) +/* 88A7A8 80241BD8 27A60024 */ addiu $a2, $sp, 0x24 +/* 88A7AC 80241BDC 44820000 */ mtc1 $v0, $f0 +/* 88A7B0 80241BE0 00000000 */ nop +/* 88A7B4 80241BE4 46800020 */ cvt.s.w $f0, $f0 +/* 88A7B8 80241BE8 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 88A7BC 80241BEC 8E040080 */ lw $a0, 0x80($s0) +/* 88A7C0 80241BF0 0C037711 */ jal func_800DDC44 +/* 88A7C4 80241BF4 27A70028 */ addiu $a3, $sp, 0x28 +/* 88A7C8 80241BF8 0040902D */ daddu $s2, $v0, $zero +/* 88A7CC 80241BFC 16400005 */ bnez $s2, .L80241C14 +/* 88A7D0 80241C00 00000000 */ nop +/* 88A7D4 80241C04 8E050018 */ lw $a1, 0x18($s0) +/* 88A7D8 80241C08 8E06000C */ lw $a2, 0xc($s0) +/* 88A7DC 80241C0C 0C00EA95 */ jal npc_move_heading +/* 88A7E0 80241C10 0200202D */ daddu $a0, $s0, $zero +.L80241C14: +/* 88A7E4 80241C14 8602008E */ lh $v0, 0x8e($s0) +/* 88A7E8 80241C18 9603008E */ lhu $v1, 0x8e($s0) +/* 88A7EC 80241C1C 18400007 */ blez $v0, .L80241C3C +/* 88A7F0 80241C20 2462FFFF */ addiu $v0, $v1, -1 +/* 88A7F4 80241C24 A602008E */ sh $v0, 0x8e($s0) +/* 88A7F8 80241C28 00021400 */ sll $v0, $v0, 0x10 +/* 88A7FC 80241C2C 18400003 */ blez $v0, .L80241C3C +/* 88A800 80241C30 00000000 */ nop +/* 88A804 80241C34 12400008 */ beqz $s2, .L80241C58 +/* 88A808 80241C38 00000000 */ nop +.L80241C3C: +/* 88A80C 80241C3C 8E2200CC */ lw $v0, 0xcc($s1) +/* 88A810 80241C40 A2200007 */ sb $zero, 7($s1) +/* 88A814 80241C44 8C420028 */ lw $v0, 0x28($v0) +/* 88A818 80241C48 A600008E */ sh $zero, 0x8e($s0) +/* 88A81C 80241C4C AE020028 */ sw $v0, 0x28($s0) +/* 88A820 80241C50 2402000F */ addiu $v0, $zero, 0xf +/* 88A824 80241C54 AE620070 */ sw $v0, 0x70($s3) +.L80241C58: +/* 88A828 80241C58 8FBF0040 */ lw $ra, 0x40($sp) +/* 88A82C 80241C5C 8FB3003C */ lw $s3, 0x3c($sp) +/* 88A830 80241C60 8FB20038 */ lw $s2, 0x38($sp) +/* 88A834 80241C64 8FB10034 */ lw $s1, 0x34($sp) +/* 88A838 80241C68 8FB00030 */ lw $s0, 0x30($sp) +/* 88A83C 80241C6C 03E00008 */ jr $ra +/* 88A840 80241C70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241C74.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241C74.s deleted file mode 100644 index e0e49d741d..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241C74.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C74 -/* 88A844 80241C74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88A848 80241C78 AFB10014 */ sw $s1, 0x14($sp) -/* 88A84C 80241C7C 0080882D */ daddu $s1, $a0, $zero -/* 88A850 80241C80 AFBF0018 */ sw $ra, 0x18($sp) -/* 88A854 80241C84 AFB00010 */ sw $s0, 0x10($sp) -/* 88A858 80241C88 8E300148 */ lw $s0, 0x148($s1) -/* 88A85C 80241C8C 0C00EABB */ jal get_npc_unsafe -/* 88A860 80241C90 86040008 */ lh $a0, 8($s0) -/* 88A864 80241C94 0040202D */ daddu $a0, $v0, $zero -/* 88A868 80241C98 9482008E */ lhu $v0, 0x8e($a0) -/* 88A86C 80241C9C 24030003 */ addiu $v1, $zero, 3 -/* 88A870 80241CA0 24420001 */ addiu $v0, $v0, 1 -/* 88A874 80241CA4 A482008E */ sh $v0, 0x8e($a0) -/* 88A878 80241CA8 00021400 */ sll $v0, $v0, 0x10 -/* 88A87C 80241CAC 00021403 */ sra $v0, $v0, 0x10 -/* 88A880 80241CB0 14430003 */ bne $v0, $v1, .L80241CC0 -/* 88A884 80241CB4 00000000 */ nop -/* 88A888 80241CB8 96020086 */ lhu $v0, 0x86($s0) -/* 88A88C 80241CBC A48200A8 */ sh $v0, 0xa8($a0) -.L80241CC0: -/* 88A890 80241CC0 8482008E */ lh $v0, 0x8e($a0) -/* 88A894 80241CC4 8E030080 */ lw $v1, 0x80($s0) -/* 88A898 80241CC8 0043102A */ slt $v0, $v0, $v1 -/* 88A89C 80241CCC 14400004 */ bnez $v0, .L80241CE0 -/* 88A8A0 80241CD0 00000000 */ nop -/* 88A8A4 80241CD4 96020086 */ lhu $v0, 0x86($s0) -/* 88A8A8 80241CD8 A48200A8 */ sh $v0, 0xa8($a0) -/* 88A8AC 80241CDC AE200070 */ sw $zero, 0x70($s1) -.L80241CE0: -/* 88A8B0 80241CE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 88A8B4 80241CE4 8FB10014 */ lw $s1, 0x14($sp) -/* 88A8B8 80241CE8 8FB00010 */ lw $s0, 0x10($sp) -/* 88A8BC 80241CEC 03E00008 */ jr $ra -/* 88A8C0 80241CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241C74_88A844.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241C74_88A844.s new file mode 100644 index 0000000000..c47a0500e0 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241C74_88A844.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241C74_88A844 +/* 88A844 80241C74 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 88A848 80241C78 AFB10014 */ sw $s1, 0x14($sp) +/* 88A84C 80241C7C 0080882D */ daddu $s1, $a0, $zero +/* 88A850 80241C80 AFBF0018 */ sw $ra, 0x18($sp) +/* 88A854 80241C84 AFB00010 */ sw $s0, 0x10($sp) +/* 88A858 80241C88 8E300148 */ lw $s0, 0x148($s1) +/* 88A85C 80241C8C 0C00EABB */ jal get_npc_unsafe +/* 88A860 80241C90 86040008 */ lh $a0, 8($s0) +/* 88A864 80241C94 0040202D */ daddu $a0, $v0, $zero +/* 88A868 80241C98 9482008E */ lhu $v0, 0x8e($a0) +/* 88A86C 80241C9C 24030003 */ addiu $v1, $zero, 3 +/* 88A870 80241CA0 24420001 */ addiu $v0, $v0, 1 +/* 88A874 80241CA4 A482008E */ sh $v0, 0x8e($a0) +/* 88A878 80241CA8 00021400 */ sll $v0, $v0, 0x10 +/* 88A87C 80241CAC 00021403 */ sra $v0, $v0, 0x10 +/* 88A880 80241CB0 14430003 */ bne $v0, $v1, .L80241CC0 +/* 88A884 80241CB4 00000000 */ nop +/* 88A888 80241CB8 96020086 */ lhu $v0, 0x86($s0) +/* 88A88C 80241CBC A48200A8 */ sh $v0, 0xa8($a0) +.L80241CC0: +/* 88A890 80241CC0 8482008E */ lh $v0, 0x8e($a0) +/* 88A894 80241CC4 8E030080 */ lw $v1, 0x80($s0) +/* 88A898 80241CC8 0043102A */ slt $v0, $v0, $v1 +/* 88A89C 80241CCC 14400004 */ bnez $v0, .L80241CE0 +/* 88A8A0 80241CD0 00000000 */ nop +/* 88A8A4 80241CD4 96020086 */ lhu $v0, 0x86($s0) +/* 88A8A8 80241CD8 A48200A8 */ sh $v0, 0xa8($a0) +/* 88A8AC 80241CDC AE200070 */ sw $zero, 0x70($s1) +.L80241CE0: +/* 88A8B0 80241CE0 8FBF0018 */ lw $ra, 0x18($sp) +/* 88A8B4 80241CE4 8FB10014 */ lw $s1, 0x14($sp) +/* 88A8B8 80241CE8 8FB00010 */ lw $s0, 0x10($sp) +/* 88A8BC 80241CEC 03E00008 */ jr $ra +/* 88A8C0 80241CF0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4.s deleted file mode 100644 index 9e75ee5570..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CF4 -/* 88A8C4 80241CF4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 88A8C8 80241CF8 AFB3005C */ sw $s3, 0x5c($sp) -/* 88A8CC 80241CFC 0080982D */ daddu $s3, $a0, $zero -/* 88A8D0 80241D00 AFBF0068 */ sw $ra, 0x68($sp) -/* 88A8D4 80241D04 AFB50064 */ sw $s5, 0x64($sp) -/* 88A8D8 80241D08 AFB40060 */ sw $s4, 0x60($sp) -/* 88A8DC 80241D0C AFB20058 */ sw $s2, 0x58($sp) -/* 88A8E0 80241D10 AFB10054 */ sw $s1, 0x54($sp) -/* 88A8E4 80241D14 AFB00050 */ sw $s0, 0x50($sp) -/* 88A8E8 80241D18 8E710148 */ lw $s1, 0x148($s3) -/* 88A8EC 80241D1C 86240008 */ lh $a0, 8($s1) -/* 88A8F0 80241D20 0C00EABB */ jal get_npc_unsafe -/* 88A8F4 80241D24 00A0802D */ daddu $s0, $a1, $zero -/* 88A8F8 80241D28 8E63000C */ lw $v1, 0xc($s3) -/* 88A8FC 80241D2C 0260202D */ daddu $a0, $s3, $zero -/* 88A900 80241D30 8C650000 */ lw $a1, ($v1) -/* 88A904 80241D34 0C0B1EAF */ jal get_variable -/* 88A908 80241D38 0040902D */ daddu $s2, $v0, $zero -/* 88A90C 80241D3C AFA00028 */ sw $zero, 0x28($sp) -/* 88A910 80241D40 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A914 80241D44 8C630030 */ lw $v1, 0x30($v1) -/* 88A918 80241D48 AFA3002C */ sw $v1, 0x2c($sp) -/* 88A91C 80241D4C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A920 80241D50 8C63001C */ lw $v1, 0x1c($v1) -/* 88A924 80241D54 AFA30030 */ sw $v1, 0x30($sp) -/* 88A928 80241D58 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A92C 80241D5C 8C630024 */ lw $v1, 0x24($v1) -/* 88A930 80241D60 AFA30034 */ sw $v1, 0x34($sp) -/* 88A934 80241D64 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A938 80241D68 8C630028 */ lw $v1, 0x28($v1) -/* 88A93C 80241D6C 27B50028 */ addiu $s5, $sp, 0x28 -/* 88A940 80241D70 AFA30038 */ sw $v1, 0x38($sp) -/* 88A944 80241D74 8E2300D0 */ lw $v1, 0xd0($s1) -/* 88A948 80241D78 3C0142C8 */ lui $at, 0x42c8 -/* 88A94C 80241D7C 44810000 */ mtc1 $at, $f0 -/* 88A950 80241D80 8C63002C */ lw $v1, 0x2c($v1) -/* 88A954 80241D84 0040A02D */ daddu $s4, $v0, $zero -/* 88A958 80241D88 E7A00040 */ swc1 $f0, 0x40($sp) -/* 88A95C 80241D8C A7A00044 */ sh $zero, 0x44($sp) -/* 88A960 80241D90 12000009 */ beqz $s0, .L80241DB8 -/* 88A964 80241D94 AFA3003C */ sw $v1, 0x3c($sp) -/* 88A968 80241D98 864300A8 */ lh $v1, 0xa8($s2) -/* 88A96C 80241D9C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88A970 80241DA0 AE20008C */ sw $zero, 0x8c($s1) -/* 88A974 80241DA4 A22000B5 */ sb $zero, 0xb5($s1) -/* 88A978 80241DA8 34420008 */ ori $v0, $v0, 8 -/* 88A97C 80241DAC AE230084 */ sw $v1, 0x84($s1) -/* 88A980 80241DB0 08090772 */ j .L80241DC8 -/* 88A984 80241DB4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241DB8: -/* 88A988 80241DB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88A98C 80241DBC 30420004 */ andi $v0, $v0, 4 -/* 88A990 80241DC0 10400047 */ beqz $v0, .L80241EE0 -/* 88A994 80241DC4 00000000 */ nop -.L80241DC8: -/* 88A998 80241DC8 AE600070 */ sw $zero, 0x70($s3) -/* 88A99C 80241DCC A640008E */ sh $zero, 0x8e($s2) -/* 88A9A0 80241DD0 8E2300CC */ lw $v1, 0xcc($s1) -/* 88A9A4 80241DD4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 88A9A8 80241DD8 A2200007 */ sb $zero, 7($s1) -/* 88A9AC 80241DDC 8E420000 */ lw $v0, ($s2) -/* 88A9B0 80241DE0 8C630000 */ lw $v1, ($v1) -/* 88A9B4 80241DE4 00441024 */ and $v0, $v0, $a0 -/* 88A9B8 80241DE8 AE420000 */ sw $v0, ($s2) -/* 88A9BC 80241DEC AE430028 */ sw $v1, 0x28($s2) -/* 88A9C0 80241DF0 96220086 */ lhu $v0, 0x86($s1) -/* 88A9C4 80241DF4 A64200A8 */ sh $v0, 0xa8($s2) -/* 88A9C8 80241DF8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 88A9CC 80241DFC AE200090 */ sw $zero, 0x90($s1) -/* 88A9D0 80241E00 8C420034 */ lw $v0, 0x34($v0) -/* 88A9D4 80241E04 14400006 */ bnez $v0, .L80241E20 -/* 88A9D8 80241E08 2403FDFF */ addiu $v1, $zero, -0x201 -/* 88A9DC 80241E0C 8E420000 */ lw $v0, ($s2) -/* 88A9E0 80241E10 2403FFF7 */ addiu $v1, $zero, -9 -/* 88A9E4 80241E14 34420200 */ ori $v0, $v0, 0x200 -/* 88A9E8 80241E18 0809078B */ j .L80241E2C -/* 88A9EC 80241E1C 00431024 */ and $v0, $v0, $v1 -.L80241E20: -/* 88A9F0 80241E20 8E420000 */ lw $v0, ($s2) -/* 88A9F4 80241E24 00431024 */ and $v0, $v0, $v1 -/* 88A9F8 80241E28 34420008 */ ori $v0, $v0, 8 -.L80241E2C: -/* 88A9FC 80241E2C AE420000 */ sw $v0, ($s2) -/* 88AA00 80241E30 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88AA04 80241E34 30420004 */ andi $v0, $v0, 4 -/* 88AA08 80241E38 1040001E */ beqz $v0, .L80241EB4 -/* 88AA0C 80241E3C 24040002 */ addiu $a0, $zero, 2 -/* 88AA10 80241E40 0240282D */ daddu $a1, $s2, $zero -/* 88AA14 80241E44 0000302D */ daddu $a2, $zero, $zero -/* 88AA18 80241E48 24020063 */ addiu $v0, $zero, 0x63 -/* 88AA1C 80241E4C AE620070 */ sw $v0, 0x70($s3) -/* 88AA20 80241E50 AE600074 */ sw $zero, 0x74($s3) -/* 88AA24 80241E54 864300A8 */ lh $v1, 0xa8($s2) -/* 88AA28 80241E58 3C013F80 */ lui $at, 0x3f80 -/* 88AA2C 80241E5C 44810000 */ mtc1 $at, $f0 -/* 88AA30 80241E60 3C014000 */ lui $at, 0x4000 -/* 88AA34 80241E64 44811000 */ mtc1 $at, $f2 -/* 88AA38 80241E68 3C01C1A0 */ lui $at, 0xc1a0 -/* 88AA3C 80241E6C 44812000 */ mtc1 $at, $f4 -/* 88AA40 80241E70 24020028 */ addiu $v0, $zero, 0x28 -/* 88AA44 80241E74 AFA2001C */ sw $v0, 0x1c($sp) -/* 88AA48 80241E78 44833000 */ mtc1 $v1, $f6 -/* 88AA4C 80241E7C 00000000 */ nop -/* 88AA50 80241E80 468031A0 */ cvt.s.w $f6, $f6 -/* 88AA54 80241E84 44073000 */ mfc1 $a3, $f6 -/* 88AA58 80241E88 27A20048 */ addiu $v0, $sp, 0x48 -/* 88AA5C 80241E8C AFA20020 */ sw $v0, 0x20($sp) -/* 88AA60 80241E90 E7A00010 */ swc1 $f0, 0x10($sp) -/* 88AA64 80241E94 E7A20014 */ swc1 $f2, 0x14($sp) -/* 88AA68 80241E98 0C01BFA4 */ jal fx_emote -/* 88AA6C 80241E9C E7A40018 */ swc1 $f4, 0x18($sp) -/* 88AA70 80241EA0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 88AA74 80241EA4 2403FFFB */ addiu $v1, $zero, -5 -/* 88AA78 80241EA8 00431024 */ and $v0, $v0, $v1 -/* 88AA7C 80241EAC 080907B8 */ j .L80241EE0 -/* 88AA80 80241EB0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241EB4: -/* 88AA84 80241EB4 8E220000 */ lw $v0, ($s1) -/* 88AA88 80241EB8 3C034000 */ lui $v1, 0x4000 -/* 88AA8C 80241EBC 00431024 */ and $v0, $v0, $v1 -/* 88AA90 80241EC0 10400007 */ beqz $v0, .L80241EE0 -/* 88AA94 80241EC4 3C03BFFF */ lui $v1, 0xbfff -/* 88AA98 80241EC8 2402000C */ addiu $v0, $zero, 0xc -/* 88AA9C 80241ECC AE620070 */ sw $v0, 0x70($s3) -/* 88AAA0 80241ED0 8E220000 */ lw $v0, ($s1) -/* 88AAA4 80241ED4 3463FFFF */ ori $v1, $v1, 0xffff -/* 88AAA8 80241ED8 00431024 */ and $v0, $v0, $v1 -/* 88AAAC 80241EDC AE220000 */ sw $v0, ($s1) -.L80241EE0: -/* 88AAB0 80241EE0 8E220090 */ lw $v0, 0x90($s1) -/* 88AAB4 80241EE4 1840000C */ blez $v0, .L80241F18 -/* 88AAB8 80241EE8 2442FFFF */ addiu $v0, $v0, -1 -/* 88AABC 80241EEC 14400087 */ bnez $v0, .L8024210C -/* 88AAC0 80241EF0 AE220090 */ sw $v0, 0x90($s1) -/* 88AAC4 80241EF4 3C03FFAA */ lui $v1, 0xffaa -/* 88AAC8 80241EF8 8E420028 */ lw $v0, 0x28($s2) -/* 88AACC 80241EFC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 88AAD0 80241F00 00431021 */ addu $v0, $v0, $v1 -/* 88AAD4 80241F04 2C420002 */ sltiu $v0, $v0, 2 -/* 88AAD8 80241F08 10400003 */ beqz $v0, .L80241F18 -/* 88AADC 80241F0C 3C020055 */ lui $v0, 0x55 -/* 88AAE0 80241F10 3442000C */ ori $v0, $v0, 0xc -/* 88AAE4 80241F14 AE420028 */ sw $v0, 0x28($s2) -.L80241F18: -/* 88AAE8 80241F18 8E630070 */ lw $v1, 0x70($s3) -/* 88AAEC 80241F1C 2402000C */ addiu $v0, $zero, 0xc -/* 88AAF0 80241F20 10620048 */ beq $v1, $v0, .L80242044 -/* 88AAF4 80241F24 2862000D */ slti $v0, $v1, 0xd -/* 88AAF8 80241F28 1040000F */ beqz $v0, .L80241F68 -/* 88AAFC 80241F2C 24100001 */ addiu $s0, $zero, 1 -/* 88AB00 80241F30 1070001E */ beq $v1, $s0, .L80241FAC -/* 88AB04 80241F34 28620002 */ slti $v0, $v1, 2 -/* 88AB08 80241F38 10400005 */ beqz $v0, .L80241F50 -/* 88AB0C 80241F3C 24020002 */ addiu $v0, $zero, 2 -/* 88AB10 80241F40 10600015 */ beqz $v1, .L80241F98 -/* 88AB14 80241F44 0260202D */ daddu $a0, $s3, $zero -/* 88AB18 80241F48 08090828 */ j .L802420A0 -/* 88AB1C 80241F4C 00000000 */ nop -.L80241F50: -/* 88AB20 80241F50 1062001C */ beq $v1, $v0, .L80241FC4 -/* 88AB24 80241F54 24020003 */ addiu $v0, $zero, 3 -/* 88AB28 80241F58 10620035 */ beq $v1, $v0, .L80242030 -/* 88AB2C 80241F5C 0260202D */ daddu $a0, $s3, $zero -/* 88AB30 80241F60 08090828 */ j .L802420A0 -/* 88AB34 80241F64 00000000 */ nop -.L80241F68: -/* 88AB38 80241F68 2402000E */ addiu $v0, $zero, 0xe -/* 88AB3C 80241F6C 1062003F */ beq $v1, $v0, .L8024206C -/* 88AB40 80241F70 0062102A */ slt $v0, $v1, $v0 -/* 88AB44 80241F74 14400038 */ bnez $v0, .L80242058 -/* 88AB48 80241F78 0260202D */ daddu $a0, $s3, $zero -/* 88AB4C 80241F7C 2402000F */ addiu $v0, $zero, 0xf -/* 88AB50 80241F80 10620040 */ beq $v1, $v0, .L80242084 -/* 88AB54 80241F84 24020063 */ addiu $v0, $zero, 0x63 -/* 88AB58 80241F88 10620043 */ beq $v1, $v0, .L80242098 -/* 88AB5C 80241F8C 00000000 */ nop -/* 88AB60 80241F90 08090828 */ j .L802420A0 -/* 88AB64 80241F94 00000000 */ nop -.L80241F98: -/* 88AB68 80241F98 0280282D */ daddu $a1, $s4, $zero -/* 88AB6C 80241F9C 0C012568 */ jal func_800495A0 -/* 88AB70 80241FA0 02A0302D */ daddu $a2, $s5, $zero -/* 88AB74 80241FA4 96220086 */ lhu $v0, 0x86($s1) -/* 88AB78 80241FA8 A64200A8 */ sh $v0, 0xa8($s2) -.L80241FAC: -/* 88AB7C 80241FAC 0260202D */ daddu $a0, $s3, $zero -/* 88AB80 80241FB0 0280282D */ daddu $a1, $s4, $zero -/* 88AB84 80241FB4 0C0125AE */ jal func_800496B8 -/* 88AB88 80241FB8 02A0302D */ daddu $a2, $s5, $zero -/* 88AB8C 80241FBC 08090828 */ j .L802420A0 -/* 88AB90 80241FC0 00000000 */ nop -.L80241FC4: -/* 88AB94 80241FC4 0260202D */ daddu $a0, $s3, $zero -/* 88AB98 80241FC8 0280282D */ daddu $a1, $s4, $zero -/* 88AB9C 80241FCC 0C0126D1 */ jal func_80049B44 -/* 88ABA0 80241FD0 02A0302D */ daddu $a2, $s5, $zero -/* 88ABA4 80241FD4 8E230088 */ lw $v1, 0x88($s1) -/* 88ABA8 80241FD8 24020006 */ addiu $v0, $zero, 6 -/* 88ABAC 80241FDC 14620014 */ bne $v1, $v0, .L80242030 -/* 88ABB0 80241FE0 0260202D */ daddu $a0, $s3, $zero -/* 88ABB4 80241FE4 0C00A67F */ jal rand_int -/* 88ABB8 80241FE8 24040064 */ addiu $a0, $zero, 0x64 -/* 88ABBC 80241FEC 28420021 */ slti $v0, $v0, 0x21 -/* 88ABC0 80241FF0 5040000F */ beql $v0, $zero, .L80242030 -/* 88ABC4 80241FF4 0260202D */ daddu $a0, $s3, $zero -/* 88ABC8 80241FF8 8E22008C */ lw $v0, 0x8c($s1) -/* 88ABCC 80241FFC 10400005 */ beqz $v0, .L80242014 -/* 88ABD0 80242000 3C020055 */ lui $v0, 0x55 -/* 88ABD4 80242004 3442002F */ ori $v0, $v0, 0x2f -/* 88ABD8 80242008 AE20008C */ sw $zero, 0x8c($s1) -/* 88ABDC 8024200C 08090808 */ j .L80242020 -/* 88ABE0 80242010 A22000B5 */ sb $zero, 0xb5($s1) -.L80242014: -/* 88ABE4 80242014 3442002E */ ori $v0, $v0, 0x2e -/* 88ABE8 80242018 AE30008C */ sw $s0, 0x8c($s1) -/* 88ABEC 8024201C A23000B5 */ sb $s0, 0xb5($s1) -.L80242020: -/* 88ABF0 80242020 AE420028 */ sw $v0, 0x28($s2) -/* 88ABF4 80242024 24020007 */ addiu $v0, $zero, 7 -/* 88ABF8 80242028 08090843 */ j .L8024210C -/* 88ABFC 8024202C AE220090 */ sw $v0, 0x90($s1) -.L80242030: -/* 88AC00 80242030 0280282D */ daddu $a1, $s4, $zero -/* 88AC04 80242034 0C012701 */ jal func_80049C04 -/* 88AC08 80242038 02A0302D */ daddu $a2, $s5, $zero -/* 88AC0C 8024203C 08090828 */ j .L802420A0 -/* 88AC10 80242040 00000000 */ nop -.L80242044: -/* 88AC14 80242044 0260202D */ daddu $a0, $s3, $zero -/* 88AC18 80242048 0280282D */ daddu $a1, $s4, $zero -/* 88AC1C 8024204C 0C090658 */ jal func_80241960 -/* 88AC20 80242050 02A0302D */ daddu $a2, $s5, $zero -/* 88AC24 80242054 0260202D */ daddu $a0, $s3, $zero -.L80242058: -/* 88AC28 80242058 0280282D */ daddu $a1, $s4, $zero -/* 88AC2C 8024205C 0C090677 */ jal func_802419DC -/* 88AC30 80242060 02A0302D */ daddu $a2, $s5, $zero -/* 88AC34 80242064 08090828 */ j .L802420A0 -/* 88AC38 80242068 00000000 */ nop -.L8024206C: -/* 88AC3C 8024206C 0260202D */ daddu $a0, $s3, $zero -/* 88AC40 80242070 0280282D */ daddu $a1, $s4, $zero -/* 88AC44 80242074 0C0906C4 */ jal func_80241B10 -/* 88AC48 80242078 02A0302D */ daddu $a2, $s5, $zero -/* 88AC4C 8024207C 08090828 */ j .L802420A0 -/* 88AC50 80242080 00000000 */ nop -.L80242084: -/* 88AC54 80242084 0280282D */ daddu $a1, $s4, $zero -/* 88AC58 80242088 0C09071D */ jal func_80241C74 -/* 88AC5C 8024208C 02A0302D */ daddu $a2, $s5, $zero -/* 88AC60 80242090 08090828 */ j .L802420A0 -/* 88AC64 80242094 00000000 */ nop -.L80242098: -/* 88AC68 80242098 0C0129CF */ jal func_8004A73C -/* 88AC6C 8024209C 0260202D */ daddu $a0, $s3, $zero -.L802420A0: -/* 88AC70 802420A0 8E230088 */ lw $v1, 0x88($s1) -/* 88AC74 802420A4 24020006 */ addiu $v0, $zero, 6 -/* 88AC78 802420A8 14620019 */ bne $v1, $v0, .L80242110 -/* 88AC7C 802420AC 0000102D */ daddu $v0, $zero, $zero -/* 88AC80 802420B0 8E22008C */ lw $v0, 0x8c($s1) -/* 88AC84 802420B4 10400003 */ beqz $v0, .L802420C4 -/* 88AC88 802420B8 24020001 */ addiu $v0, $zero, 1 -/* 88AC8C 802420BC 08090832 */ j .L802420C8 -/* 88AC90 802420C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802420C4: -/* 88AC94 802420C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802420C8: -/* 88AC98 802420C8 8E22008C */ lw $v0, 0x8c($s1) -/* 88AC9C 802420CC 1040000F */ beqz $v0, .L8024210C -/* 88ACA0 802420D0 3C03FFAA */ lui $v1, 0xffaa -/* 88ACA4 802420D4 8E420028 */ lw $v0, 0x28($s2) -/* 88ACA8 802420D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 88ACAC 802420DC 00431821 */ addu $v1, $v0, $v1 -/* 88ACB0 802420E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 88ACB4 802420E4 10400009 */ beqz $v0, .L8024210C -/* 88ACB8 802420E8 00031080 */ sll $v0, $v1, 2 -/* 88ACBC 802420EC 3C018024 */ lui $at, 0x8024 -/* 88ACC0 802420F0 00220821 */ addu $at, $at, $v0 -/* 88ACC4 802420F4 8C2249D8 */ lw $v0, 0x49d8($at) -/* 88ACC8 802420F8 00400008 */ jr $v0 -/* 88ACCC 802420FC 00000000 */ nop -/* 88ACD0 80242100 8E420028 */ lw $v0, 0x28($s2) -/* 88ACD4 80242104 24420001 */ addiu $v0, $v0, 1 -/* 88ACD8 80242108 AE420028 */ sw $v0, 0x28($s2) -.L8024210C: -/* 88ACDC 8024210C 0000102D */ daddu $v0, $zero, $zero -.L80242110: -/* 88ACE0 80242110 8FBF0068 */ lw $ra, 0x68($sp) -/* 88ACE4 80242114 8FB50064 */ lw $s5, 0x64($sp) -/* 88ACE8 80242118 8FB40060 */ lw $s4, 0x60($sp) -/* 88ACEC 8024211C 8FB3005C */ lw $s3, 0x5c($sp) -/* 88ACF0 80242120 8FB20058 */ lw $s2, 0x58($sp) -/* 88ACF4 80242124 8FB10054 */ lw $s1, 0x54($sp) -/* 88ACF8 80242128 8FB00050 */ lw $s0, 0x50($sp) -/* 88ACFC 8024212C 03E00008 */ jr $ra -/* 88AD00 80242130 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s new file mode 100644 index 0000000000..c46d3e9321 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80241CF4_88A8C4.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CF4_88A8C4 +/* 88A8C4 80241CF4 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 88A8C8 80241CF8 AFB3005C */ sw $s3, 0x5c($sp) +/* 88A8CC 80241CFC 0080982D */ daddu $s3, $a0, $zero +/* 88A8D0 80241D00 AFBF0068 */ sw $ra, 0x68($sp) +/* 88A8D4 80241D04 AFB50064 */ sw $s5, 0x64($sp) +/* 88A8D8 80241D08 AFB40060 */ sw $s4, 0x60($sp) +/* 88A8DC 80241D0C AFB20058 */ sw $s2, 0x58($sp) +/* 88A8E0 80241D10 AFB10054 */ sw $s1, 0x54($sp) +/* 88A8E4 80241D14 AFB00050 */ sw $s0, 0x50($sp) +/* 88A8E8 80241D18 8E710148 */ lw $s1, 0x148($s3) +/* 88A8EC 80241D1C 86240008 */ lh $a0, 8($s1) +/* 88A8F0 80241D20 0C00EABB */ jal get_npc_unsafe +/* 88A8F4 80241D24 00A0802D */ daddu $s0, $a1, $zero +/* 88A8F8 80241D28 8E63000C */ lw $v1, 0xc($s3) +/* 88A8FC 80241D2C 0260202D */ daddu $a0, $s3, $zero +/* 88A900 80241D30 8C650000 */ lw $a1, ($v1) +/* 88A904 80241D34 0C0B1EAF */ jal get_variable +/* 88A908 80241D38 0040902D */ daddu $s2, $v0, $zero +/* 88A90C 80241D3C AFA00028 */ sw $zero, 0x28($sp) +/* 88A910 80241D40 8E2300D0 */ lw $v1, 0xd0($s1) +/* 88A914 80241D44 8C630030 */ lw $v1, 0x30($v1) +/* 88A918 80241D48 AFA3002C */ sw $v1, 0x2c($sp) +/* 88A91C 80241D4C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 88A920 80241D50 8C63001C */ lw $v1, 0x1c($v1) +/* 88A924 80241D54 AFA30030 */ sw $v1, 0x30($sp) +/* 88A928 80241D58 8E2300D0 */ lw $v1, 0xd0($s1) +/* 88A92C 80241D5C 8C630024 */ lw $v1, 0x24($v1) +/* 88A930 80241D60 AFA30034 */ sw $v1, 0x34($sp) +/* 88A934 80241D64 8E2300D0 */ lw $v1, 0xd0($s1) +/* 88A938 80241D68 8C630028 */ lw $v1, 0x28($v1) +/* 88A93C 80241D6C 27B50028 */ addiu $s5, $sp, 0x28 +/* 88A940 80241D70 AFA30038 */ sw $v1, 0x38($sp) +/* 88A944 80241D74 8E2300D0 */ lw $v1, 0xd0($s1) +/* 88A948 80241D78 3C0142C8 */ lui $at, 0x42c8 +/* 88A94C 80241D7C 44810000 */ mtc1 $at, $f0 +/* 88A950 80241D80 8C63002C */ lw $v1, 0x2c($v1) +/* 88A954 80241D84 0040A02D */ daddu $s4, $v0, $zero +/* 88A958 80241D88 E7A00040 */ swc1 $f0, 0x40($sp) +/* 88A95C 80241D8C A7A00044 */ sh $zero, 0x44($sp) +/* 88A960 80241D90 12000009 */ beqz $s0, .L80241DB8 +/* 88A964 80241D94 AFA3003C */ sw $v1, 0x3c($sp) +/* 88A968 80241D98 864300A8 */ lh $v1, 0xa8($s2) +/* 88A96C 80241D9C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 88A970 80241DA0 AE20008C */ sw $zero, 0x8c($s1) +/* 88A974 80241DA4 A22000B5 */ sb $zero, 0xb5($s1) +/* 88A978 80241DA8 34420008 */ ori $v0, $v0, 8 +/* 88A97C 80241DAC AE230084 */ sw $v1, 0x84($s1) +/* 88A980 80241DB0 08090772 */ j .L80241DC8 +/* 88A984 80241DB4 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241DB8: +/* 88A988 80241DB8 8E2200B0 */ lw $v0, 0xb0($s1) +/* 88A98C 80241DBC 30420004 */ andi $v0, $v0, 4 +/* 88A990 80241DC0 10400047 */ beqz $v0, .L80241EE0 +/* 88A994 80241DC4 00000000 */ nop +.L80241DC8: +/* 88A998 80241DC8 AE600070 */ sw $zero, 0x70($s3) +/* 88A99C 80241DCC A640008E */ sh $zero, 0x8e($s2) +/* 88A9A0 80241DD0 8E2300CC */ lw $v1, 0xcc($s1) +/* 88A9A4 80241DD4 2404F7FF */ addiu $a0, $zero, -0x801 +/* 88A9A8 80241DD8 A2200007 */ sb $zero, 7($s1) +/* 88A9AC 80241DDC 8E420000 */ lw $v0, ($s2) +/* 88A9B0 80241DE0 8C630000 */ lw $v1, ($v1) +/* 88A9B4 80241DE4 00441024 */ and $v0, $v0, $a0 +/* 88A9B8 80241DE8 AE420000 */ sw $v0, ($s2) +/* 88A9BC 80241DEC AE430028 */ sw $v1, 0x28($s2) +/* 88A9C0 80241DF0 96220086 */ lhu $v0, 0x86($s1) +/* 88A9C4 80241DF4 A64200A8 */ sh $v0, 0xa8($s2) +/* 88A9C8 80241DF8 8E2200D0 */ lw $v0, 0xd0($s1) +/* 88A9CC 80241DFC AE200090 */ sw $zero, 0x90($s1) +/* 88A9D0 80241E00 8C420034 */ lw $v0, 0x34($v0) +/* 88A9D4 80241E04 14400006 */ bnez $v0, .L80241E20 +/* 88A9D8 80241E08 2403FDFF */ addiu $v1, $zero, -0x201 +/* 88A9DC 80241E0C 8E420000 */ lw $v0, ($s2) +/* 88A9E0 80241E10 2403FFF7 */ addiu $v1, $zero, -9 +/* 88A9E4 80241E14 34420200 */ ori $v0, $v0, 0x200 +/* 88A9E8 80241E18 0809078B */ j .L80241E2C +/* 88A9EC 80241E1C 00431024 */ and $v0, $v0, $v1 +.L80241E20: +/* 88A9F0 80241E20 8E420000 */ lw $v0, ($s2) +/* 88A9F4 80241E24 00431024 */ and $v0, $v0, $v1 +/* 88A9F8 80241E28 34420008 */ ori $v0, $v0, 8 +.L80241E2C: +/* 88A9FC 80241E2C AE420000 */ sw $v0, ($s2) +/* 88AA00 80241E30 8E2200B0 */ lw $v0, 0xb0($s1) +/* 88AA04 80241E34 30420004 */ andi $v0, $v0, 4 +/* 88AA08 80241E38 1040001E */ beqz $v0, .L80241EB4 +/* 88AA0C 80241E3C 24040002 */ addiu $a0, $zero, 2 +/* 88AA10 80241E40 0240282D */ daddu $a1, $s2, $zero +/* 88AA14 80241E44 0000302D */ daddu $a2, $zero, $zero +/* 88AA18 80241E48 24020063 */ addiu $v0, $zero, 0x63 +/* 88AA1C 80241E4C AE620070 */ sw $v0, 0x70($s3) +/* 88AA20 80241E50 AE600074 */ sw $zero, 0x74($s3) +/* 88AA24 80241E54 864300A8 */ lh $v1, 0xa8($s2) +/* 88AA28 80241E58 3C013F80 */ lui $at, 0x3f80 +/* 88AA2C 80241E5C 44810000 */ mtc1 $at, $f0 +/* 88AA30 80241E60 3C014000 */ lui $at, 0x4000 +/* 88AA34 80241E64 44811000 */ mtc1 $at, $f2 +/* 88AA38 80241E68 3C01C1A0 */ lui $at, 0xc1a0 +/* 88AA3C 80241E6C 44812000 */ mtc1 $at, $f4 +/* 88AA40 80241E70 24020028 */ addiu $v0, $zero, 0x28 +/* 88AA44 80241E74 AFA2001C */ sw $v0, 0x1c($sp) +/* 88AA48 80241E78 44833000 */ mtc1 $v1, $f6 +/* 88AA4C 80241E7C 00000000 */ nop +/* 88AA50 80241E80 468031A0 */ cvt.s.w $f6, $f6 +/* 88AA54 80241E84 44073000 */ mfc1 $a3, $f6 +/* 88AA58 80241E88 27A20048 */ addiu $v0, $sp, 0x48 +/* 88AA5C 80241E8C AFA20020 */ sw $v0, 0x20($sp) +/* 88AA60 80241E90 E7A00010 */ swc1 $f0, 0x10($sp) +/* 88AA64 80241E94 E7A20014 */ swc1 $f2, 0x14($sp) +/* 88AA68 80241E98 0C01BFA4 */ jal fx_emote +/* 88AA6C 80241E9C E7A40018 */ swc1 $f4, 0x18($sp) +/* 88AA70 80241EA0 8E2200B0 */ lw $v0, 0xb0($s1) +/* 88AA74 80241EA4 2403FFFB */ addiu $v1, $zero, -5 +/* 88AA78 80241EA8 00431024 */ and $v0, $v0, $v1 +/* 88AA7C 80241EAC 080907B8 */ j .L80241EE0 +/* 88AA80 80241EB0 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241EB4: +/* 88AA84 80241EB4 8E220000 */ lw $v0, ($s1) +/* 88AA88 80241EB8 3C034000 */ lui $v1, 0x4000 +/* 88AA8C 80241EBC 00431024 */ and $v0, $v0, $v1 +/* 88AA90 80241EC0 10400007 */ beqz $v0, .L80241EE0 +/* 88AA94 80241EC4 3C03BFFF */ lui $v1, 0xbfff +/* 88AA98 80241EC8 2402000C */ addiu $v0, $zero, 0xc +/* 88AA9C 80241ECC AE620070 */ sw $v0, 0x70($s3) +/* 88AAA0 80241ED0 8E220000 */ lw $v0, ($s1) +/* 88AAA4 80241ED4 3463FFFF */ ori $v1, $v1, 0xffff +/* 88AAA8 80241ED8 00431024 */ and $v0, $v0, $v1 +/* 88AAAC 80241EDC AE220000 */ sw $v0, ($s1) +.L80241EE0: +/* 88AAB0 80241EE0 8E220090 */ lw $v0, 0x90($s1) +/* 88AAB4 80241EE4 1840000C */ blez $v0, .L80241F18 +/* 88AAB8 80241EE8 2442FFFF */ addiu $v0, $v0, -1 +/* 88AABC 80241EEC 14400087 */ bnez $v0, .L8024210C +/* 88AAC0 80241EF0 AE220090 */ sw $v0, 0x90($s1) +/* 88AAC4 80241EF4 3C03FFAA */ lui $v1, 0xffaa +/* 88AAC8 80241EF8 8E420028 */ lw $v0, 0x28($s2) +/* 88AACC 80241EFC 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 88AAD0 80241F00 00431021 */ addu $v0, $v0, $v1 +/* 88AAD4 80241F04 2C420002 */ sltiu $v0, $v0, 2 +/* 88AAD8 80241F08 10400003 */ beqz $v0, .L80241F18 +/* 88AADC 80241F0C 3C020055 */ lui $v0, 0x55 +/* 88AAE0 80241F10 3442000C */ ori $v0, $v0, 0xc +/* 88AAE4 80241F14 AE420028 */ sw $v0, 0x28($s2) +.L80241F18: +/* 88AAE8 80241F18 8E630070 */ lw $v1, 0x70($s3) +/* 88AAEC 80241F1C 2402000C */ addiu $v0, $zero, 0xc +/* 88AAF0 80241F20 10620048 */ beq $v1, $v0, .L80242044 +/* 88AAF4 80241F24 2862000D */ slti $v0, $v1, 0xd +/* 88AAF8 80241F28 1040000F */ beqz $v0, .L80241F68 +/* 88AAFC 80241F2C 24100001 */ addiu $s0, $zero, 1 +/* 88AB00 80241F30 1070001E */ beq $v1, $s0, .L80241FAC +/* 88AB04 80241F34 28620002 */ slti $v0, $v1, 2 +/* 88AB08 80241F38 10400005 */ beqz $v0, .L80241F50 +/* 88AB0C 80241F3C 24020002 */ addiu $v0, $zero, 2 +/* 88AB10 80241F40 10600015 */ beqz $v1, .L80241F98 +/* 88AB14 80241F44 0260202D */ daddu $a0, $s3, $zero +/* 88AB18 80241F48 08090828 */ j .L802420A0 +/* 88AB1C 80241F4C 00000000 */ nop +.L80241F50: +/* 88AB20 80241F50 1062001C */ beq $v1, $v0, .L80241FC4 +/* 88AB24 80241F54 24020003 */ addiu $v0, $zero, 3 +/* 88AB28 80241F58 10620035 */ beq $v1, $v0, .L80242030 +/* 88AB2C 80241F5C 0260202D */ daddu $a0, $s3, $zero +/* 88AB30 80241F60 08090828 */ j .L802420A0 +/* 88AB34 80241F64 00000000 */ nop +.L80241F68: +/* 88AB38 80241F68 2402000E */ addiu $v0, $zero, 0xe +/* 88AB3C 80241F6C 1062003F */ beq $v1, $v0, .L8024206C +/* 88AB40 80241F70 0062102A */ slt $v0, $v1, $v0 +/* 88AB44 80241F74 14400038 */ bnez $v0, .L80242058 +/* 88AB48 80241F78 0260202D */ daddu $a0, $s3, $zero +/* 88AB4C 80241F7C 2402000F */ addiu $v0, $zero, 0xf +/* 88AB50 80241F80 10620040 */ beq $v1, $v0, .L80242084 +/* 88AB54 80241F84 24020063 */ addiu $v0, $zero, 0x63 +/* 88AB58 80241F88 10620043 */ beq $v1, $v0, .L80242098 +/* 88AB5C 80241F8C 00000000 */ nop +/* 88AB60 80241F90 08090828 */ j .L802420A0 +/* 88AB64 80241F94 00000000 */ nop +.L80241F98: +/* 88AB68 80241F98 0280282D */ daddu $a1, $s4, $zero +/* 88AB6C 80241F9C 0C012568 */ jal func_800495A0 +/* 88AB70 80241FA0 02A0302D */ daddu $a2, $s5, $zero +/* 88AB74 80241FA4 96220086 */ lhu $v0, 0x86($s1) +/* 88AB78 80241FA8 A64200A8 */ sh $v0, 0xa8($s2) +.L80241FAC: +/* 88AB7C 80241FAC 0260202D */ daddu $a0, $s3, $zero +/* 88AB80 80241FB0 0280282D */ daddu $a1, $s4, $zero +/* 88AB84 80241FB4 0C0125AE */ jal func_800496B8 +/* 88AB88 80241FB8 02A0302D */ daddu $a2, $s5, $zero +/* 88AB8C 80241FBC 08090828 */ j .L802420A0 +/* 88AB90 80241FC0 00000000 */ nop +.L80241FC4: +/* 88AB94 80241FC4 0260202D */ daddu $a0, $s3, $zero +/* 88AB98 80241FC8 0280282D */ daddu $a1, $s4, $zero +/* 88AB9C 80241FCC 0C0126D1 */ jal func_80049B44 +/* 88ABA0 80241FD0 02A0302D */ daddu $a2, $s5, $zero +/* 88ABA4 80241FD4 8E230088 */ lw $v1, 0x88($s1) +/* 88ABA8 80241FD8 24020006 */ addiu $v0, $zero, 6 +/* 88ABAC 80241FDC 14620014 */ bne $v1, $v0, .L80242030 +/* 88ABB0 80241FE0 0260202D */ daddu $a0, $s3, $zero +/* 88ABB4 80241FE4 0C00A67F */ jal rand_int +/* 88ABB8 80241FE8 24040064 */ addiu $a0, $zero, 0x64 +/* 88ABBC 80241FEC 28420021 */ slti $v0, $v0, 0x21 +/* 88ABC0 80241FF0 5040000F */ beql $v0, $zero, .L80242030 +/* 88ABC4 80241FF4 0260202D */ daddu $a0, $s3, $zero +/* 88ABC8 80241FF8 8E22008C */ lw $v0, 0x8c($s1) +/* 88ABCC 80241FFC 10400005 */ beqz $v0, .L80242014 +/* 88ABD0 80242000 3C020055 */ lui $v0, 0x55 +/* 88ABD4 80242004 3442002F */ ori $v0, $v0, 0x2f +/* 88ABD8 80242008 AE20008C */ sw $zero, 0x8c($s1) +/* 88ABDC 8024200C 08090808 */ j .L80242020 +/* 88ABE0 80242010 A22000B5 */ sb $zero, 0xb5($s1) +.L80242014: +/* 88ABE4 80242014 3442002E */ ori $v0, $v0, 0x2e +/* 88ABE8 80242018 AE30008C */ sw $s0, 0x8c($s1) +/* 88ABEC 8024201C A23000B5 */ sb $s0, 0xb5($s1) +.L80242020: +/* 88ABF0 80242020 AE420028 */ sw $v0, 0x28($s2) +/* 88ABF4 80242024 24020007 */ addiu $v0, $zero, 7 +/* 88ABF8 80242028 08090843 */ j .L8024210C +/* 88ABFC 8024202C AE220090 */ sw $v0, 0x90($s1) +.L80242030: +/* 88AC00 80242030 0280282D */ daddu $a1, $s4, $zero +/* 88AC04 80242034 0C012701 */ jal func_80049C04 +/* 88AC08 80242038 02A0302D */ daddu $a2, $s5, $zero +/* 88AC0C 8024203C 08090828 */ j .L802420A0 +/* 88AC10 80242040 00000000 */ nop +.L80242044: +/* 88AC14 80242044 0260202D */ daddu $a0, $s3, $zero +/* 88AC18 80242048 0280282D */ daddu $a1, $s4, $zero +/* 88AC1C 8024204C 0C090658 */ jal func_80241960_88A530 +/* 88AC20 80242050 02A0302D */ daddu $a2, $s5, $zero +/* 88AC24 80242054 0260202D */ daddu $a0, $s3, $zero +.L80242058: +/* 88AC28 80242058 0280282D */ daddu $a1, $s4, $zero +/* 88AC2C 8024205C 0C090677 */ jal func_802419DC_88A5AC +/* 88AC30 80242060 02A0302D */ daddu $a2, $s5, $zero +/* 88AC34 80242064 08090828 */ j .L802420A0 +/* 88AC38 80242068 00000000 */ nop +.L8024206C: +/* 88AC3C 8024206C 0260202D */ daddu $a0, $s3, $zero +/* 88AC40 80242070 0280282D */ daddu $a1, $s4, $zero +/* 88AC44 80242074 0C0906C4 */ jal func_80241B10_88A6E0 +/* 88AC48 80242078 02A0302D */ daddu $a2, $s5, $zero +/* 88AC4C 8024207C 08090828 */ j .L802420A0 +/* 88AC50 80242080 00000000 */ nop +.L80242084: +/* 88AC54 80242084 0280282D */ daddu $a1, $s4, $zero +/* 88AC58 80242088 0C09071D */ jal func_80241C74_88A844 +/* 88AC5C 8024208C 02A0302D */ daddu $a2, $s5, $zero +/* 88AC60 80242090 08090828 */ j .L802420A0 +/* 88AC64 80242094 00000000 */ nop +.L80242098: +/* 88AC68 80242098 0C0129CF */ jal func_8004A73C +/* 88AC6C 8024209C 0260202D */ daddu $a0, $s3, $zero +.L802420A0: +/* 88AC70 802420A0 8E230088 */ lw $v1, 0x88($s1) +/* 88AC74 802420A4 24020006 */ addiu $v0, $zero, 6 +/* 88AC78 802420A8 14620019 */ bne $v1, $v0, .L80242110 +/* 88AC7C 802420AC 0000102D */ daddu $v0, $zero, $zero +/* 88AC80 802420B0 8E22008C */ lw $v0, 0x8c($s1) +/* 88AC84 802420B4 10400003 */ beqz $v0, .L802420C4 +/* 88AC88 802420B8 24020001 */ addiu $v0, $zero, 1 +/* 88AC8C 802420BC 08090832 */ j .L802420C8 +/* 88AC90 802420C0 A22200B5 */ sb $v0, 0xb5($s1) +.L802420C4: +/* 88AC94 802420C4 A22000B5 */ sb $zero, 0xb5($s1) +.L802420C8: +/* 88AC98 802420C8 8E22008C */ lw $v0, 0x8c($s1) +/* 88AC9C 802420CC 1040000F */ beqz $v0, .L8024210C +/* 88ACA0 802420D0 3C03FFAA */ lui $v1, 0xffaa +/* 88ACA4 802420D4 8E420028 */ lw $v0, 0x28($s2) +/* 88ACA8 802420D8 3463FFFC */ ori $v1, $v1, 0xfffc +/* 88ACAC 802420DC 00431821 */ addu $v1, $v0, $v1 +/* 88ACB0 802420E0 2C620015 */ sltiu $v0, $v1, 0x15 +/* 88ACB4 802420E4 10400009 */ beqz $v0, .L8024210C +/* 88ACB8 802420E8 00031080 */ sll $v0, $v1, 2 +/* 88ACBC 802420EC 3C018024 */ lui $at, 0x8024 +/* 88ACC0 802420F0 00220821 */ addu $at, $at, $v0 +/* 88ACC4 802420F4 8C2249D8 */ lw $v0, 0x49d8($at) +/* 88ACC8 802420F8 00400008 */ jr $v0 +/* 88ACCC 802420FC 00000000 */ nop +/* 88ACD0 80242100 8E420028 */ lw $v0, 0x28($s2) +/* 88ACD4 80242104 24420001 */ addiu $v0, $v0, 1 +/* 88ACD8 80242108 AE420028 */ sw $v0, 0x28($s2) +.L8024210C: +/* 88ACDC 8024210C 0000102D */ daddu $v0, $zero, $zero +.L80242110: +/* 88ACE0 80242110 8FBF0068 */ lw $ra, 0x68($sp) +/* 88ACE4 80242114 8FB50064 */ lw $s5, 0x64($sp) +/* 88ACE8 80242118 8FB40060 */ lw $s4, 0x60($sp) +/* 88ACEC 8024211C 8FB3005C */ lw $s3, 0x5c($sp) +/* 88ACF0 80242120 8FB20058 */ lw $s2, 0x58($sp) +/* 88ACF4 80242124 8FB10054 */ lw $s1, 0x54($sp) +/* 88ACF8 80242128 8FB00050 */ lw $s0, 0x50($sp) +/* 88ACFC 8024212C 03E00008 */ jr $ra +/* 88AD00 80242130 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80242134.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80242134.s deleted file mode 100644 index 8ae3a0efdb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80242134.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242134 -/* 88AD04 80242134 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 88AD08 80242138 AFBF0010 */ sw $ra, 0x10($sp) -/* 88AD0C 8024213C 0C00EAD2 */ jal get_npc_safe -/* 88AD10 80242140 8C84014C */ lw $a0, 0x14c($a0) -/* 88AD14 80242144 0040182D */ daddu $v1, $v0, $zero -/* 88AD18 80242148 846200A8 */ lh $v0, 0xa8($v1) -/* 88AD1C 8024214C C462003C */ lwc1 $f2, 0x3c($v1) -/* 88AD20 80242150 906400A9 */ lbu $a0, 0xa9($v1) -/* 88AD24 80242154 44820000 */ mtc1 $v0, $f0 -/* 88AD28 80242158 00000000 */ nop -/* 88AD2C 8024215C 46800020 */ cvt.s.w $f0, $f0 -/* 88AD30 80242160 46001081 */ sub.s $f2, $f2, $f0 -/* 88AD34 80242164 A06400AB */ sb $a0, 0xab($v1) -/* 88AD38 80242168 E462003C */ swc1 $f2, 0x3c($v1) -/* 88AD3C 8024216C 8FBF0010 */ lw $ra, 0x10($sp) -/* 88AD40 80242170 24020002 */ addiu $v0, $zero, 2 -/* 88AD44 80242174 03E00008 */ jr $ra -/* 88AD48 80242178 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80242134_88AD04.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80242134_88AD04.s new file mode 100644 index 0000000000..8bf176aa29 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_80242134_88AD04.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242134_88AD04 +/* 88AD04 80242134 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 88AD08 80242138 AFBF0010 */ sw $ra, 0x10($sp) +/* 88AD0C 8024213C 0C00EAD2 */ jal get_npc_safe +/* 88AD10 80242140 8C84014C */ lw $a0, 0x14c($a0) +/* 88AD14 80242144 0040182D */ daddu $v1, $v0, $zero +/* 88AD18 80242148 846200A8 */ lh $v0, 0xa8($v1) +/* 88AD1C 8024214C C462003C */ lwc1 $f2, 0x3c($v1) +/* 88AD20 80242150 906400A9 */ lbu $a0, 0xa9($v1) +/* 88AD24 80242154 44820000 */ mtc1 $v0, $f0 +/* 88AD28 80242158 00000000 */ nop +/* 88AD2C 8024215C 46800020 */ cvt.s.w $f0, $f0 +/* 88AD30 80242160 46001081 */ sub.s $f2, $f2, $f0 +/* 88AD34 80242164 A06400AB */ sb $a0, 0xab($v1) +/* 88AD38 80242168 E462003C */ swc1 $f2, 0x3c($v1) +/* 88AD3C 8024216C 8FBF0010 */ lw $ra, 0x10($sp) +/* 88AD40 80242170 24020002 */ addiu $v0, $zero, 2 +/* 88AD44 80242174 03E00008 */ jr $ra +/* 88AD48 80242178 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802421D4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802421D4.s deleted file mode 100644 index d4c1e654cb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802421D4.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421D4 -/* 88ADA4 802421D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 88ADA8 802421D8 0080102D */ daddu $v0, $a0, $zero -/* 88ADAC 802421DC AFB00010 */ sw $s0, 0x10($sp) -/* 88ADB0 802421E0 AFBF0018 */ sw $ra, 0x18($sp) -/* 88ADB4 802421E4 AFB10014 */ sw $s1, 0x14($sp) -/* 88ADB8 802421E8 8C44014C */ lw $a0, 0x14c($v0) -/* 88ADBC 802421EC 8C510148 */ lw $s1, 0x148($v0) -/* 88ADC0 802421F0 0C00EAD2 */ jal get_npc_safe -/* 88ADC4 802421F4 00A0802D */ daddu $s0, $a1, $zero -/* 88ADC8 802421F8 56000001 */ bnel $s0, $zero, .L80242200 -/* 88ADCC 802421FC A04000AB */ sb $zero, 0xab($v0) -.L80242200: -/* 88ADD0 80242200 8C420000 */ lw $v0, ($v0) -/* 88ADD4 80242204 30421000 */ andi $v0, $v0, 0x1000 -/* 88ADD8 80242208 1040000A */ beqz $v0, .L80242234 -/* 88ADDC 8024220C 0000102D */ daddu $v0, $zero, $zero -/* 88ADE0 80242210 82220004 */ lb $v0, 4($s1) -/* 88ADE4 80242214 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* 88ADE8 80242218 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* 88ADEC 8024221C 00021080 */ sll $v0, $v0, 2 -/* 88ADF0 80242220 00431021 */ addu $v0, $v0, $v1 -/* 88ADF4 80242224 8C440028 */ lw $a0, 0x28($v0) -/* 88ADF8 80242228 9623006E */ lhu $v1, 0x6e($s1) -/* 88ADFC 8024222C 24020002 */ addiu $v0, $zero, 2 -/* 88AE00 80242230 A4830044 */ sh $v1, 0x44($a0) -.L80242234: -/* 88AE04 80242234 8FBF0018 */ lw $ra, 0x18($sp) -/* 88AE08 80242238 8FB10014 */ lw $s1, 0x14($sp) -/* 88AE0C 8024223C 8FB00010 */ lw $s0, 0x10($sp) -/* 88AE10 80242240 03E00008 */ jr $ra -/* 88AE14 80242244 27BD0020 */ addiu $sp, $sp, 0x20 -/* 88AE18 80242248 00000000 */ nop -/* 88AE1C 8024224C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802421D4_88ADA4.s b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802421D4_88ADA4.s new file mode 100644 index 0000000000..70c4561bb1 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_12/88A530/func_802421D4_88ADA4.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421D4_88ADA4 +/* 88ADA4 802421D4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 88ADA8 802421D8 0080102D */ daddu $v0, $a0, $zero +/* 88ADAC 802421DC AFB00010 */ sw $s0, 0x10($sp) +/* 88ADB0 802421E0 AFBF0018 */ sw $ra, 0x18($sp) +/* 88ADB4 802421E4 AFB10014 */ sw $s1, 0x14($sp) +/* 88ADB8 802421E8 8C44014C */ lw $a0, 0x14c($v0) +/* 88ADBC 802421EC 8C510148 */ lw $s1, 0x148($v0) +/* 88ADC0 802421F0 0C00EAD2 */ jal get_npc_safe +/* 88ADC4 802421F4 00A0802D */ daddu $s0, $a1, $zero +/* 88ADC8 802421F8 56000001 */ bnel $s0, $zero, .L80242200 +/* 88ADCC 802421FC A04000AB */ sb $zero, 0xab($v0) +.L80242200: +/* 88ADD0 80242200 8C420000 */ lw $v0, ($v0) +/* 88ADD4 80242204 30421000 */ andi $v0, $v0, 0x1000 +/* 88ADD8 80242208 1040000A */ beqz $v0, .L80242234 +/* 88ADDC 8024220C 0000102D */ daddu $v0, $zero, $zero +/* 88ADE0 80242210 82220004 */ lb $v0, 4($s1) +/* 88ADE4 80242214 3C03800B */ lui $v1, %hi(gCurrentEncounter) +/* 88ADE8 80242218 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) +/* 88ADEC 8024221C 00021080 */ sll $v0, $v0, 2 +/* 88ADF0 80242220 00431021 */ addu $v0, $v0, $v1 +/* 88ADF4 80242224 8C440028 */ lw $a0, 0x28($v0) +/* 88ADF8 80242228 9623006E */ lhu $v1, 0x6e($s1) +/* 88ADFC 8024222C 24020002 */ addiu $v0, $zero, 2 +/* 88AE00 80242230 A4830044 */ sh $v1, 0x44($a0) +.L80242234: +/* 88AE04 80242234 8FBF0018 */ lw $ra, 0x18($sp) +/* 88AE08 80242238 8FB10014 */ lw $s1, 0x14($sp) +/* 88AE0C 8024223C 8FB00010 */ lw $s0, 0x10($sp) +/* 88AE10 80242240 03E00008 */ jr $ra +/* 88AE14 80242244 27BD0020 */ addiu $sp, $sp, 0x20 +/* 88AE18 80242248 00000000 */ nop +/* 88AE1C 8024224C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AA4.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AA4.s deleted file mode 100644 index f45ff87a0b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AA4.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AA4 -/* 890644 80240AA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 890648 80240AA8 AFB00010 */ sw $s0, 0x10($sp) -/* 89064C 80240AAC AFBF0014 */ sw $ra, 0x14($sp) -/* 890650 80240AB0 0C039D88 */ jal get_item_empty_count -/* 890654 80240AB4 0080802D */ daddu $s0, $a0, $zero -/* 890658 80240AB8 AE020084 */ sw $v0, 0x84($s0) -/* 89065C 80240ABC 8FBF0014 */ lw $ra, 0x14($sp) -/* 890660 80240AC0 8FB00010 */ lw $s0, 0x10($sp) -/* 890664 80240AC4 24020002 */ addiu $v0, $zero, 2 -/* 890668 80240AC8 03E00008 */ jr $ra -/* 89066C 80240ACC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AA4_890644.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AA4_890644.s new file mode 100644 index 0000000000..7dc25aab29 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AA4_890644.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AA4_890644 +/* 890644 80240AA4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 890648 80240AA8 AFB00010 */ sw $s0, 0x10($sp) +/* 89064C 80240AAC AFBF0014 */ sw $ra, 0x14($sp) +/* 890650 80240AB0 0C039D88 */ jal get_item_empty_count +/* 890654 80240AB4 0080802D */ daddu $s0, $a0, $zero +/* 890658 80240AB8 AE020084 */ sw $v0, 0x84($s0) +/* 89065C 80240ABC 8FBF0014 */ lw $ra, 0x14($sp) +/* 890660 80240AC0 8FB00010 */ lw $s0, 0x10($sp) +/* 890664 80240AC4 24020002 */ addiu $v0, $zero, 2 +/* 890668 80240AC8 03E00008 */ jr $ra +/* 89066C 80240ACC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0.s deleted file mode 100644 index a492eef98f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AD0 -/* 890670 80240AD0 3C068011 */ lui $a2, 0x8011 -/* 890674 80240AD4 84C6F29C */ lh $a2, -0xd64($a2) -/* 890678 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 89067C 80240ADC AFBF0010 */ sw $ra, 0x10($sp) -/* 890680 80240AE0 8C82000C */ lw $v0, 0xc($a0) -/* 890684 80240AE4 28C60040 */ slti $a2, $a2, 0x40 -/* 890688 80240AE8 8C450000 */ lw $a1, ($v0) -/* 89068C 80240AEC 0C0B2026 */ jal set_variable -/* 890690 80240AF0 38C60001 */ xori $a2, $a2, 1 -/* 890694 80240AF4 8FBF0010 */ lw $ra, 0x10($sp) -/* 890698 80240AF8 24020002 */ addiu $v0, $zero, 2 -/* 89069C 80240AFC 03E00008 */ jr $ra -/* 8906A0 80240B00 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8906A4 80240B04 00000000 */ nop -/* 8906A8 80240B08 00000000 */ nop -/* 8906AC 80240B0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s new file mode 100644 index 0000000000..6af3cd00aa --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AD0_890670 +/* 890670 80240AD0 3C068011 */ lui $a2, 0x8011 +/* 890674 80240AD4 84C6F29C */ lh $a2, -0xd64($a2) +/* 890678 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 89067C 80240ADC AFBF0010 */ sw $ra, 0x10($sp) +/* 890680 80240AE0 8C82000C */ lw $v0, 0xc($a0) +/* 890684 80240AE4 28C60040 */ slti $a2, $a2, 0x40 +/* 890688 80240AE8 8C450000 */ lw $a1, ($v0) +/* 89068C 80240AEC 0C0B2026 */ jal set_variable +/* 890690 80240AF0 38C60001 */ xori $a2, $a2, 1 +/* 890694 80240AF4 8FBF0010 */ lw $ra, 0x10($sp) +/* 890698 80240AF8 24020002 */ addiu $v0, $zero, 2 +/* 89069C 80240AFC 03E00008 */ jr $ra +/* 8906A0 80240B00 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8906A4 80240B04 00000000 */ nop +/* 8906A8 80240B08 00000000 */ nop +/* 8906AC 80240B0C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C.s deleted file mode 100644 index 6d612eddf0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024004C -/* 892A6C 8024004C 3C02800A */ lui $v0, %hi(D_8009A650) -/* 892A70 80240050 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 892A74 80240054 8C430000 */ lw $v1, ($v0) -/* 892A78 80240058 2404FFBF */ addiu $a0, $zero, -0x41 -/* 892A7C 8024005C 00641824 */ and $v1, $v1, $a0 -/* 892A80 80240060 AC430000 */ sw $v1, ($v0) -/* 892A84 80240064 03E00008 */ jr $ra -/* 892A88 80240068 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C_892A6C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C_892A6C.s new file mode 100644 index 0000000000..45bbeb8499 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024004C_892A6C.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024004C_892A6C +/* 892A6C 8024004C 3C02800A */ lui $v0, %hi(D_8009A650) +/* 892A70 80240050 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* 892A74 80240054 8C430000 */ lw $v1, ($v0) +/* 892A78 80240058 2404FFBF */ addiu $a0, $zero, -0x41 +/* 892A7C 8024005C 00641824 */ and $v1, $v1, $a0 +/* 892A80 80240060 AC430000 */ sw $v1, ($v0) +/* 892A84 80240064 03E00008 */ jr $ra +/* 892A88 80240068 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024006C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024006C.s deleted file mode 100644 index cf066f66ca..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024006C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024006C -/* 892A8C 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 892A90 80240070 AFBF0010 */ sw $ra, 0x10($sp) -/* 892A94 80240074 8C82000C */ lw $v0, 0xc($a0) -/* 892A98 80240078 0C0B1EAF */ jal get_variable -/* 892A9C 8024007C 8C450000 */ lw $a1, ($v0) -/* 892AA0 80240080 0C0B95A4 */ jal func_802E5690 -/* 892AA4 80240084 0040202D */ daddu $a0, $v0, $zero -/* 892AA8 80240088 8FBF0010 */ lw $ra, 0x10($sp) -/* 892AAC 8024008C 24020002 */ addiu $v0, $zero, 2 -/* 892AB0 80240090 03E00008 */ jr $ra -/* 892AB4 80240094 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024006C_892A8C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024006C_892A8C.s new file mode 100644 index 0000000000..e242c0638f --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024006C_892A8C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024006C_892A8C +/* 892A8C 8024006C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 892A90 80240070 AFBF0010 */ sw $ra, 0x10($sp) +/* 892A94 80240074 8C82000C */ lw $v0, 0xc($a0) +/* 892A98 80240078 0C0B1EAF */ jal get_variable +/* 892A9C 8024007C 8C450000 */ lw $a1, ($v0) +/* 892AA0 80240080 0C0B95A4 */ jal func_802E5690 +/* 892AA4 80240084 0040202D */ daddu $a0, $v0, $zero +/* 892AA8 80240088 8FBF0010 */ lw $ra, 0x10($sp) +/* 892AAC 8024008C 24020002 */ addiu $v0, $zero, 2 +/* 892AB0 80240090 03E00008 */ jr $ra +/* 892AB4 80240094 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098.s deleted file mode 100644 index d32d810ea0..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240098 -/* 892AB8 80240098 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 892ABC 8024009C AFB00010 */ sw $s0, 0x10($sp) -/* 892AC0 802400A0 0080802D */ daddu $s0, $a0, $zero -/* 892AC4 802400A4 AFBF0018 */ sw $ra, 0x18($sp) -/* 892AC8 802400A8 AFB10014 */ sw $s1, 0x14($sp) -/* 892ACC 802400AC 8E11000C */ lw $s1, 0xc($s0) -/* 892AD0 802400B0 8E250000 */ lw $a1, ($s1) -/* 892AD4 802400B4 0C0B1EAF */ jal get_variable -/* 892AD8 802400B8 26310004 */ addiu $s1, $s1, 4 -/* 892ADC 802400BC 0200202D */ daddu $a0, $s0, $zero -/* 892AE0 802400C0 3C038011 */ lui $v1, %hi(gPlayerData) -/* 892AE4 802400C4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) -/* 892AE8 802400C8 000210C0 */ sll $v0, $v0, 3 -/* 892AEC 802400CC 00431021 */ addu $v0, $v0, $v1 -/* 892AF0 802400D0 90460015 */ lbu $a2, 0x15($v0) -/* 892AF4 802400D4 8E250000 */ lw $a1, ($s1) -/* 892AF8 802400D8 24C60001 */ addiu $a2, $a2, 1 -/* 892AFC 802400DC A0460015 */ sb $a2, 0x15($v0) -/* 892B00 802400E0 00063600 */ sll $a2, $a2, 0x18 -/* 892B04 802400E4 0C0B2026 */ jal set_variable -/* 892B08 802400E8 00063603 */ sra $a2, $a2, 0x18 -/* 892B0C 802400EC 8FBF0018 */ lw $ra, 0x18($sp) -/* 892B10 802400F0 8FB10014 */ lw $s1, 0x14($sp) -/* 892B14 802400F4 8FB00010 */ lw $s0, 0x10($sp) -/* 892B18 802400F8 24020002 */ addiu $v0, $zero, 2 -/* 892B1C 802400FC 03E00008 */ jr $ra -/* 892B20 80240100 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098_892AB8.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098_892AB8.s new file mode 100644 index 0000000000..71954aa10d --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240098_892AB8.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240098_892AB8 +/* 892AB8 80240098 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 892ABC 8024009C AFB00010 */ sw $s0, 0x10($sp) +/* 892AC0 802400A0 0080802D */ daddu $s0, $a0, $zero +/* 892AC4 802400A4 AFBF0018 */ sw $ra, 0x18($sp) +/* 892AC8 802400A8 AFB10014 */ sw $s1, 0x14($sp) +/* 892ACC 802400AC 8E11000C */ lw $s1, 0xc($s0) +/* 892AD0 802400B0 8E250000 */ lw $a1, ($s1) +/* 892AD4 802400B4 0C0B1EAF */ jal get_variable +/* 892AD8 802400B8 26310004 */ addiu $s1, $s1, 4 +/* 892ADC 802400BC 0200202D */ daddu $a0, $s0, $zero +/* 892AE0 802400C0 3C038011 */ lui $v1, %hi(gPlayerData) +/* 892AE4 802400C4 2463F290 */ addiu $v1, $v1, %lo(gPlayerData) +/* 892AE8 802400C8 000210C0 */ sll $v0, $v0, 3 +/* 892AEC 802400CC 00431021 */ addu $v0, $v0, $v1 +/* 892AF0 802400D0 90460015 */ lbu $a2, 0x15($v0) +/* 892AF4 802400D4 8E250000 */ lw $a1, ($s1) +/* 892AF8 802400D8 24C60001 */ addiu $a2, $a2, 1 +/* 892AFC 802400DC A0460015 */ sb $a2, 0x15($v0) +/* 892B00 802400E0 00063600 */ sll $a2, $a2, 0x18 +/* 892B04 802400E4 0C0B2026 */ jal set_variable +/* 892B08 802400E8 00063603 */ sra $a2, $a2, 0x18 +/* 892B0C 802400EC 8FBF0018 */ lw $ra, 0x18($sp) +/* 892B10 802400F0 8FB10014 */ lw $s1, 0x14($sp) +/* 892B14 802400F4 8FB00010 */ lw $s0, 0x10($sp) +/* 892B18 802400F8 24020002 */ addiu $v0, $zero, 2 +/* 892B1C 802400FC 03E00008 */ jr $ra +/* 892B20 80240100 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104.s deleted file mode 100644 index 396ccf6abb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240104 -/* 892B24 80240104 3C028011 */ lui $v0, %hi(gPlayerData) -/* 892B28 80240108 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 892B2C 8024010C 000420C0 */ sll $a0, $a0, 3 -/* 892B30 80240110 00822021 */ addu $a0, $a0, $v0 -/* 892B34 80240114 90820014 */ lbu $v0, 0x14($a0) -/* 892B38 80240118 10400009 */ beqz $v0, .L80240140 -/* 892B3C 8024011C 00000000 */ nop -/* 892B40 80240120 90820015 */ lbu $v0, 0x15($a0) -/* 892B44 80240124 00022600 */ sll $a0, $v0, 0x18 -/* 892B48 80240128 00041E03 */ sra $v1, $a0, 0x18 -/* 892B4C 8024012C 00051400 */ sll $v0, $a1, 0x10 -/* 892B50 80240130 00021403 */ sra $v0, $v0, 0x10 -/* 892B54 80240134 0043102A */ slt $v0, $v0, $v1 -/* 892B58 80240138 10400003 */ beqz $v0, .L80240148 -/* 892B5C 8024013C 00000000 */ nop -.L80240140: -/* 892B60 80240140 03E00008 */ jr $ra -/* 892B64 80240144 2402FFFF */ addiu $v0, $zero, -1 -.L80240148: -/* 892B68 80240148 03E00008 */ jr $ra -/* 892B6C 8024014C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s new file mode 100644 index 0000000000..a959b8427d --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240104_892B24.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240104_892B24 +/* 892B24 80240104 3C028011 */ lui $v0, %hi(gPlayerData) +/* 892B28 80240108 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 892B2C 8024010C 000420C0 */ sll $a0, $a0, 3 +/* 892B30 80240110 00822021 */ addu $a0, $a0, $v0 +/* 892B34 80240114 90820014 */ lbu $v0, 0x14($a0) +/* 892B38 80240118 10400009 */ beqz $v0, .L80240140 +/* 892B3C 8024011C 00000000 */ nop +/* 892B40 80240120 90820015 */ lbu $v0, 0x15($a0) +/* 892B44 80240124 00022600 */ sll $a0, $v0, 0x18 +/* 892B48 80240128 00041E03 */ sra $v1, $a0, 0x18 +/* 892B4C 8024012C 00051400 */ sll $v0, $a1, 0x10 +/* 892B50 80240130 00021403 */ sra $v0, $v0, 0x10 +/* 892B54 80240134 0043102A */ slt $v0, $v0, $v1 +/* 892B58 80240138 10400003 */ beqz $v0, .L80240148 +/* 892B5C 8024013C 00000000 */ nop +.L80240140: +/* 892B60 80240140 03E00008 */ jr $ra +/* 892B64 80240144 2402FFFF */ addiu $v0, $zero, -1 +.L80240148: +/* 892B68 80240148 03E00008 */ jr $ra +/* 892B6C 8024014C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150.s deleted file mode 100644 index a7a9091926..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240150 -/* 892B70 80240150 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 892B74 80240154 AFB3001C */ sw $s3, 0x1c($sp) -/* 892B78 80240158 0080982D */ daddu $s3, $a0, $zero -/* 892B7C 8024015C AFB00010 */ sw $s0, 0x10($sp) -/* 892B80 80240160 24100001 */ addiu $s0, $zero, 1 -/* 892B84 80240164 AFB40020 */ sw $s4, 0x20($sp) -/* 892B88 80240168 2414FFFF */ addiu $s4, $zero, -1 -/* 892B8C 8024016C AFB50024 */ sw $s5, 0x24($sp) -/* 892B90 80240170 0200A82D */ daddu $s5, $s0, $zero -/* 892B94 80240174 AFB10014 */ sw $s1, 0x14($sp) -/* 892B98 80240178 3C118011 */ lui $s1, 0x8011 -/* 892B9C 8024017C 2631F298 */ addiu $s1, $s1, -0xd68 -/* 892BA0 80240180 AFBF0028 */ sw $ra, 0x28($sp) -/* 892BA4 80240184 AFB20018 */ sw $s2, 0x18($sp) -/* 892BA8 80240188 8E6200B4 */ lw $v0, 0xb4($s3) -/* 892BAC 8024018C 0280182D */ daddu $v1, $s4, $zero -/* 892BB0 80240190 AE630084 */ sw $v1, 0x84($s3) -/* 892BB4 80240194 00021027 */ nor $v0, $zero, $v0 -/* 892BB8 80240198 000217C2 */ srl $v0, $v0, 0x1f -/* 892BBC 8024019C 00029400 */ sll $s2, $v0, 0x10 -.L802401A0: -/* 892BC0 802401A0 92220014 */ lbu $v0, 0x14($s1) -/* 892BC4 802401A4 50400008 */ beql $v0, $zero, .L802401C8 -/* 892BC8 802401A8 26100001 */ addiu $s0, $s0, 1 -/* 892BCC 802401AC 0200202D */ daddu $a0, $s0, $zero -/* 892BD0 802401B0 0C090041 */ jal func_80240104 -/* 892BD4 802401B4 00122C03 */ sra $a1, $s2, 0x10 -/* 892BD8 802401B8 10540003 */ beq $v0, $s4, .L802401C8 -/* 892BDC 802401BC 26100001 */ addiu $s0, $s0, 1 -/* 892BE0 802401C0 08090075 */ j .L802401D4 -/* 892BE4 802401C4 AE750084 */ sw $s5, 0x84($s3) -.L802401C8: -/* 892BE8 802401C8 2A02000C */ slti $v0, $s0, 0xc -/* 892BEC 802401CC 1440FFF4 */ bnez $v0, .L802401A0 -/* 892BF0 802401D0 26310008 */ addiu $s1, $s1, 8 -.L802401D4: -/* 892BF4 802401D4 8FBF0028 */ lw $ra, 0x28($sp) -/* 892BF8 802401D8 8FB50024 */ lw $s5, 0x24($sp) -/* 892BFC 802401DC 8FB40020 */ lw $s4, 0x20($sp) -/* 892C00 802401E0 8FB3001C */ lw $s3, 0x1c($sp) -/* 892C04 802401E4 8FB20018 */ lw $s2, 0x18($sp) -/* 892C08 802401E8 8FB10014 */ lw $s1, 0x14($sp) -/* 892C0C 802401EC 8FB00010 */ lw $s0, 0x10($sp) -/* 892C10 802401F0 24020002 */ addiu $v0, $zero, 2 -/* 892C14 802401F4 03E00008 */ jr $ra -/* 892C18 802401F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s new file mode 100644 index 0000000000..809235df88 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240150_892B70 +/* 892B70 80240150 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 892B74 80240154 AFB3001C */ sw $s3, 0x1c($sp) +/* 892B78 80240158 0080982D */ daddu $s3, $a0, $zero +/* 892B7C 8024015C AFB00010 */ sw $s0, 0x10($sp) +/* 892B80 80240160 24100001 */ addiu $s0, $zero, 1 +/* 892B84 80240164 AFB40020 */ sw $s4, 0x20($sp) +/* 892B88 80240168 2414FFFF */ addiu $s4, $zero, -1 +/* 892B8C 8024016C AFB50024 */ sw $s5, 0x24($sp) +/* 892B90 80240170 0200A82D */ daddu $s5, $s0, $zero +/* 892B94 80240174 AFB10014 */ sw $s1, 0x14($sp) +/* 892B98 80240178 3C118011 */ lui $s1, 0x8011 +/* 892B9C 8024017C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 892BA0 80240180 AFBF0028 */ sw $ra, 0x28($sp) +/* 892BA4 80240184 AFB20018 */ sw $s2, 0x18($sp) +/* 892BA8 80240188 8E6200B4 */ lw $v0, 0xb4($s3) +/* 892BAC 8024018C 0280182D */ daddu $v1, $s4, $zero +/* 892BB0 80240190 AE630084 */ sw $v1, 0x84($s3) +/* 892BB4 80240194 00021027 */ nor $v0, $zero, $v0 +/* 892BB8 80240198 000217C2 */ srl $v0, $v0, 0x1f +/* 892BBC 8024019C 00029400 */ sll $s2, $v0, 0x10 +.L802401A0: +/* 892BC0 802401A0 92220014 */ lbu $v0, 0x14($s1) +/* 892BC4 802401A4 50400008 */ beql $v0, $zero, .L802401C8 +/* 892BC8 802401A8 26100001 */ addiu $s0, $s0, 1 +/* 892BCC 802401AC 0200202D */ daddu $a0, $s0, $zero +/* 892BD0 802401B0 0C090041 */ jal func_80240104_892B24 +/* 892BD4 802401B4 00122C03 */ sra $a1, $s2, 0x10 +/* 892BD8 802401B8 10540003 */ beq $v0, $s4, .L802401C8 +/* 892BDC 802401BC 26100001 */ addiu $s0, $s0, 1 +/* 892BE0 802401C0 08090075 */ j .L802401D4 +/* 892BE4 802401C4 AE750084 */ sw $s5, 0x84($s3) +.L802401C8: +/* 892BE8 802401C8 2A02000C */ slti $v0, $s0, 0xc +/* 892BEC 802401CC 1440FFF4 */ bnez $v0, .L802401A0 +/* 892BF0 802401D0 26310008 */ addiu $s1, $s1, 8 +.L802401D4: +/* 892BF4 802401D4 8FBF0028 */ lw $ra, 0x28($sp) +/* 892BF8 802401D8 8FB50024 */ lw $s5, 0x24($sp) +/* 892BFC 802401DC 8FB40020 */ lw $s4, 0x20($sp) +/* 892C00 802401E0 8FB3001C */ lw $s3, 0x1c($sp) +/* 892C04 802401E4 8FB20018 */ lw $s2, 0x18($sp) +/* 892C08 802401E8 8FB10014 */ lw $s1, 0x14($sp) +/* 892C0C 802401EC 8FB00010 */ lw $s0, 0x10($sp) +/* 892C10 802401F0 24020002 */ addiu $v0, $zero, 2 +/* 892C14 802401F4 03E00008 */ jr $ra +/* 892C18 802401F8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC.s deleted file mode 100644 index 38c7e6f092..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401FC -/* 892C1C 802401FC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 892C20 80240200 AFB5002C */ sw $s5, 0x2c($sp) -/* 892C24 80240204 0080A82D */ daddu $s5, $a0, $zero -/* 892C28 80240208 AFBE0038 */ sw $fp, 0x38($sp) -/* 892C2C 8024020C 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 892C30 80240210 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 892C34 80240214 AFBF003C */ sw $ra, 0x3c($sp) -/* 892C38 80240218 AFB70034 */ sw $s7, 0x34($sp) -/* 892C3C 8024021C AFB60030 */ sw $s6, 0x30($sp) -/* 892C40 80240220 AFB40028 */ sw $s4, 0x28($sp) -/* 892C44 80240224 AFB30024 */ sw $s3, 0x24($sp) -/* 892C48 80240228 AFB20020 */ sw $s2, 0x20($sp) -/* 892C4C 8024022C AFB1001C */ sw $s1, 0x1c($sp) -/* 892C50 80240230 10A0004F */ beqz $a1, .L80240370 -/* 892C54 80240234 AFB00018 */ sw $s0, 0x18($sp) -/* 892C58 80240238 0C00AB39 */ jal heap_malloc -/* 892C5C 8024023C 24040330 */ addiu $a0, $zero, 0x330 -/* 892C60 80240240 0040982D */ daddu $s3, $v0, $zero -/* 892C64 80240244 0000B02D */ daddu $s6, $zero, $zero -/* 892C68 80240248 02C0902D */ daddu $s2, $s6, $zero -/* 892C6C 8024024C 3C148024 */ lui $s4, 0x8024 -/* 892C70 80240250 26941428 */ addiu $s4, $s4, 0x1428 -/* 892C74 80240254 0260882D */ daddu $s1, $s3, $zero -/* 892C78 80240258 8EA200B4 */ lw $v0, 0xb4($s5) -/* 892C7C 8024025C 3C038024 */ lui $v1, 0x8024 -/* 892C80 80240260 24631420 */ addiu $v1, $v1, 0x1420 -/* 892C84 80240264 AEB30078 */ sw $s3, 0x78($s5) -/* 892C88 80240268 00021027 */ nor $v0, $zero, $v0 -/* 892C8C 8024026C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 892C90 80240270 00171080 */ sll $v0, $s7, 2 -/* 892C94 80240274 00431021 */ addu $v0, $v0, $v1 -/* 892C98 80240278 AFA20010 */ sw $v0, 0x10($sp) -.L8024027C: -/* 892C9C 8024027C 86900000 */ lh $s0, ($s4) -/* 892CA0 80240280 001010C0 */ sll $v0, $s0, 3 -/* 892CA4 80240284 03C21021 */ addu $v0, $fp, $v0 -/* 892CA8 80240288 90420014 */ lbu $v0, 0x14($v0) -/* 892CAC 8024028C 5040002E */ beql $v0, $zero, .L80240348 -/* 892CB0 80240290 26520001 */ addiu $s2, $s2, 1 -/* 892CB4 80240294 00101100 */ sll $v0, $s0, 4 -/* 892CB8 80240298 3C068009 */ lui $a2, 0x8009 -/* 892CBC 8024029C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* 892CC0 802402A0 00461021 */ addu $v0, $v0, $a2 -/* 892CC4 802402A4 0200202D */ daddu $a0, $s0, $zero -/* 892CC8 802402A8 AE300108 */ sw $s0, 0x108($s1) -/* 892CCC 802402AC 8C420000 */ lw $v0, ($v0) -/* 892CD0 802402B0 02E0282D */ daddu $a1, $s7, $zero -/* 892CD4 802402B4 0C090041 */ jal func_80240104 -/* 892CD8 802402B8 AE220084 */ sw $v0, 0x84($s1) -/* 892CDC 802402BC 0040202D */ daddu $a0, $v0, $zero -/* 892CE0 802402C0 04800011 */ bltz $a0, .L80240308 -/* 892CE4 802402C4 00101080 */ sll $v0, $s0, 2 -/* 892CE8 802402C8 3C06800F */ lui $a2, 0x800f -/* 892CEC 802402CC 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* 892CF0 802402D0 00461021 */ addu $v0, $v0, $a2 -/* 892CF4 802402D4 8C430000 */ lw $v1, ($v0) -/* 892CF8 802402D8 24020001 */ addiu $v0, $zero, 1 -/* 892CFC 802402DC AE22018C */ sw $v0, 0x18c($s1) -/* 892D00 802402E0 00041080 */ sll $v0, $a0, 2 -/* 892D04 802402E4 3C068024 */ lui $a2, 0x8024 -/* 892D08 802402E8 24C61438 */ addiu $a2, $a2, 0x1438 -/* 892D0C 802402EC AE230000 */ sw $v1, ($s1) -/* 892D10 802402F0 001218C0 */ sll $v1, $s2, 3 -/* 892D14 802402F4 00431021 */ addu $v0, $v0, $v1 -/* 892D18 802402F8 00461021 */ addu $v0, $v0, $a2 -/* 892D1C 802402FC 8C420000 */ lw $v0, ($v0) -/* 892D20 80240300 080900CB */ j .L8024032C -/* 892D24 80240304 AE220294 */ sw $v0, 0x294($s1) -.L80240308: -/* 892D28 80240308 3C06800F */ lui $a2, 0x800f -/* 892D2C 8024030C 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* 892D30 80240310 00461021 */ addu $v0, $v0, $a2 -/* 892D34 80240314 8C420000 */ lw $v0, ($v0) -/* 892D38 80240318 AE20018C */ sw $zero, 0x18c($s1) -/* 892D3C 8024031C AE220000 */ sw $v0, ($s1) -/* 892D40 80240320 8FA60010 */ lw $a2, 0x10($sp) -/* 892D44 80240324 8CC20000 */ lw $v0, ($a2) -/* 892D48 80240328 AE220294 */ sw $v0, 0x294($s1) -.L8024032C: -/* 892D4C 8024032C 001010C0 */ sll $v0, $s0, 3 -/* 892D50 80240330 03C21021 */ addu $v0, $fp, $v0 -/* 892D54 80240334 80420015 */ lb $v0, 0x15($v0) -/* 892D58 80240338 26D60001 */ addiu $s6, $s6, 1 -/* 892D5C 8024033C AE220210 */ sw $v0, 0x210($s1) -/* 892D60 80240340 26310004 */ addiu $s1, $s1, 4 -/* 892D64 80240344 26520001 */ addiu $s2, $s2, 1 -.L80240348: -/* 892D68 80240348 2A420008 */ slti $v0, $s2, 8 -/* 892D6C 8024034C 1440FFCB */ bnez $v0, .L8024027C -/* 892D70 80240350 26940002 */ addiu $s4, $s4, 2 -/* 892D74 80240354 0260202D */ daddu $a0, $s3, $zero -/* 892D78 80240358 24020004 */ addiu $v0, $zero, 4 -/* 892D7C 8024035C AC820318 */ sw $v0, 0x318($a0) -/* 892D80 80240360 AC960324 */ sw $s6, 0x324($a0) -/* 892D84 80240364 0C03D390 */ jal func_800F4E40 -/* 892D88 80240368 AC800328 */ sw $zero, 0x328($a0) -/* 892D8C 8024036C AEA00070 */ sw $zero, 0x70($s5) -.L80240370: -/* 892D90 80240370 8EA20070 */ lw $v0, 0x70($s5) -/* 892D94 80240374 8EB30078 */ lw $s3, 0x78($s5) -/* 892D98 80240378 14400008 */ bnez $v0, .L8024039C -/* 892D9C 8024037C 24420001 */ addiu $v0, $v0, 1 -/* 892DA0 80240380 8662032C */ lh $v0, 0x32c($s3) -/* 892DA4 80240384 10400009 */ beqz $v0, .L802403AC -/* 892DA8 80240388 AEA20074 */ sw $v0, 0x74($s5) -/* 892DAC 8024038C 0C03C4EC */ jal func_800F13B0 -/* 892DB0 80240390 00000000 */ nop -/* 892DB4 80240394 8EA20070 */ lw $v0, 0x70($s5) -/* 892DB8 80240398 24420001 */ addiu $v0, $v0, 1 -.L8024039C: -/* 892DBC 8024039C AEA20070 */ sw $v0, 0x70($s5) -/* 892DC0 802403A0 2842000F */ slti $v0, $v0, 0xf -/* 892DC4 802403A4 10400003 */ beqz $v0, .L802403B4 -/* 892DC8 802403A8 00000000 */ nop -.L802403AC: -/* 892DCC 802403AC 08090107 */ j .L8024041C -/* 892DD0 802403B0 0000102D */ daddu $v0, $zero, $zero -.L802403B4: -/* 892DD4 802403B4 0C03C54E */ jal func_800F1538 -/* 892DD8 802403B8 00000000 */ nop -/* 892DDC 802403BC 8EA30074 */ lw $v1, 0x74($s5) -/* 892DE0 802403C0 240200FF */ addiu $v0, $zero, 0xff -/* 892DE4 802403C4 10620010 */ beq $v1, $v0, .L80240408 -/* 892DE8 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* 892DEC 802403CC 00021080 */ sll $v0, $v0, 2 -/* 892DF0 802403D0 02621021 */ addu $v0, $s3, $v0 -/* 892DF4 802403D4 8C420108 */ lw $v0, 0x108($v0) -/* 892DF8 802403D8 00021100 */ sll $v0, $v0, 4 -/* 892DFC 802403DC 3C038009 */ lui $v1, 0x8009 -/* 892E00 802403E0 00621821 */ addu $v1, $v1, $v0 -/* 892E04 802403E4 8C63EF20 */ lw $v1, -0x10e0($v1) -/* 892E08 802403E8 8EA20074 */ lw $v0, 0x74($s5) -/* 892E0C 802403EC 2442FFFF */ addiu $v0, $v0, -1 -/* 892E10 802403F0 00021080 */ sll $v0, $v0, 2 -/* 892E14 802403F4 02621021 */ addu $v0, $s3, $v0 -/* 892E18 802403F8 AEA30084 */ sw $v1, 0x84($s5) -/* 892E1C 802403FC 8C420108 */ lw $v0, 0x108($v0) -/* 892E20 80240400 08090104 */ j .L80240410 -/* 892E24 80240404 AEA20088 */ sw $v0, 0x88($s5) -.L80240408: -/* 892E28 80240408 2402FFFF */ addiu $v0, $zero, -1 -/* 892E2C 8024040C AEA20084 */ sw $v0, 0x84($s5) -.L80240410: -/* 892E30 80240410 0C00AB4B */ jal heap_free -/* 892E34 80240414 8EA40078 */ lw $a0, 0x78($s5) -/* 892E38 80240418 24020002 */ addiu $v0, $zero, 2 -.L8024041C: -/* 892E3C 8024041C 8FBF003C */ lw $ra, 0x3c($sp) -/* 892E40 80240420 8FBE0038 */ lw $fp, 0x38($sp) -/* 892E44 80240424 8FB70034 */ lw $s7, 0x34($sp) -/* 892E48 80240428 8FB60030 */ lw $s6, 0x30($sp) -/* 892E4C 8024042C 8FB5002C */ lw $s5, 0x2c($sp) -/* 892E50 80240430 8FB40028 */ lw $s4, 0x28($sp) -/* 892E54 80240434 8FB30024 */ lw $s3, 0x24($sp) -/* 892E58 80240438 8FB20020 */ lw $s2, 0x20($sp) -/* 892E5C 8024043C 8FB1001C */ lw $s1, 0x1c($sp) -/* 892E60 80240440 8FB00018 */ lw $s0, 0x18($sp) -/* 892E64 80240444 03E00008 */ jr $ra -/* 892E68 80240448 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s new file mode 100644 index 0000000000..063c8c91e1 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802401FC_892C1C.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802401FC_892C1C +/* 892C1C 802401FC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 892C20 80240200 AFB5002C */ sw $s5, 0x2c($sp) +/* 892C24 80240204 0080A82D */ daddu $s5, $a0, $zero +/* 892C28 80240208 AFBE0038 */ sw $fp, 0x38($sp) +/* 892C2C 8024020C 3C1E8011 */ lui $fp, %hi(gPlayerData) +/* 892C30 80240210 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) +/* 892C34 80240214 AFBF003C */ sw $ra, 0x3c($sp) +/* 892C38 80240218 AFB70034 */ sw $s7, 0x34($sp) +/* 892C3C 8024021C AFB60030 */ sw $s6, 0x30($sp) +/* 892C40 80240220 AFB40028 */ sw $s4, 0x28($sp) +/* 892C44 80240224 AFB30024 */ sw $s3, 0x24($sp) +/* 892C48 80240228 AFB20020 */ sw $s2, 0x20($sp) +/* 892C4C 8024022C AFB1001C */ sw $s1, 0x1c($sp) +/* 892C50 80240230 10A0004F */ beqz $a1, .L80240370 +/* 892C54 80240234 AFB00018 */ sw $s0, 0x18($sp) +/* 892C58 80240238 0C00AB39 */ jal heap_malloc +/* 892C5C 8024023C 24040330 */ addiu $a0, $zero, 0x330 +/* 892C60 80240240 0040982D */ daddu $s3, $v0, $zero +/* 892C64 80240244 0000B02D */ daddu $s6, $zero, $zero +/* 892C68 80240248 02C0902D */ daddu $s2, $s6, $zero +/* 892C6C 8024024C 3C148024 */ lui $s4, 0x8024 +/* 892C70 80240250 26941428 */ addiu $s4, $s4, 0x1428 +/* 892C74 80240254 0260882D */ daddu $s1, $s3, $zero +/* 892C78 80240258 8EA200B4 */ lw $v0, 0xb4($s5) +/* 892C7C 8024025C 3C038024 */ lui $v1, 0x8024 +/* 892C80 80240260 24631420 */ addiu $v1, $v1, 0x1420 +/* 892C84 80240264 AEB30078 */ sw $s3, 0x78($s5) +/* 892C88 80240268 00021027 */ nor $v0, $zero, $v0 +/* 892C8C 8024026C 0002BFC2 */ srl $s7, $v0, 0x1f +/* 892C90 80240270 00171080 */ sll $v0, $s7, 2 +/* 892C94 80240274 00431021 */ addu $v0, $v0, $v1 +/* 892C98 80240278 AFA20010 */ sw $v0, 0x10($sp) +.L8024027C: +/* 892C9C 8024027C 86900000 */ lh $s0, ($s4) +/* 892CA0 80240280 001010C0 */ sll $v0, $s0, 3 +/* 892CA4 80240284 03C21021 */ addu $v0, $fp, $v0 +/* 892CA8 80240288 90420014 */ lbu $v0, 0x14($v0) +/* 892CAC 8024028C 5040002E */ beql $v0, $zero, .L80240348 +/* 892CB0 80240290 26520001 */ addiu $s2, $s2, 1 +/* 892CB4 80240294 00101100 */ sll $v0, $s0, 4 +/* 892CB8 80240298 3C068009 */ lui $a2, 0x8009 +/* 892CBC 8024029C 24C6EF20 */ addiu $a2, $a2, -0x10e0 +/* 892CC0 802402A0 00461021 */ addu $v0, $v0, $a2 +/* 892CC4 802402A4 0200202D */ daddu $a0, $s0, $zero +/* 892CC8 802402A8 AE300108 */ sw $s0, 0x108($s1) +/* 892CCC 802402AC 8C420000 */ lw $v0, ($v0) +/* 892CD0 802402B0 02E0282D */ daddu $a1, $s7, $zero +/* 892CD4 802402B4 0C090041 */ jal func_80240104_892B24 +/* 892CD8 802402B8 AE220084 */ sw $v0, 0x84($s1) +/* 892CDC 802402BC 0040202D */ daddu $a0, $v0, $zero +/* 892CE0 802402C0 04800011 */ bltz $a0, .L80240308 +/* 892CE4 802402C4 00101080 */ sll $v0, $s0, 2 +/* 892CE8 802402C8 3C06800F */ lui $a2, 0x800f +/* 892CEC 802402CC 24C67F00 */ addiu $a2, $a2, 0x7f00 +/* 892CF0 802402D0 00461021 */ addu $v0, $v0, $a2 +/* 892CF4 802402D4 8C430000 */ lw $v1, ($v0) +/* 892CF8 802402D8 24020001 */ addiu $v0, $zero, 1 +/* 892CFC 802402DC AE22018C */ sw $v0, 0x18c($s1) +/* 892D00 802402E0 00041080 */ sll $v0, $a0, 2 +/* 892D04 802402E4 3C068024 */ lui $a2, 0x8024 +/* 892D08 802402E8 24C61438 */ addiu $a2, $a2, 0x1438 +/* 892D0C 802402EC AE230000 */ sw $v1, ($s1) +/* 892D10 802402F0 001218C0 */ sll $v1, $s2, 3 +/* 892D14 802402F4 00431021 */ addu $v0, $v0, $v1 +/* 892D18 802402F8 00461021 */ addu $v0, $v0, $a2 +/* 892D1C 802402FC 8C420000 */ lw $v0, ($v0) +/* 892D20 80240300 080900CB */ j .L8024032C +/* 892D24 80240304 AE220294 */ sw $v0, 0x294($s1) +.L80240308: +/* 892D28 80240308 3C06800F */ lui $a2, 0x800f +/* 892D2C 8024030C 24C67F40 */ addiu $a2, $a2, 0x7f40 +/* 892D30 80240310 00461021 */ addu $v0, $v0, $a2 +/* 892D34 80240314 8C420000 */ lw $v0, ($v0) +/* 892D38 80240318 AE20018C */ sw $zero, 0x18c($s1) +/* 892D3C 8024031C AE220000 */ sw $v0, ($s1) +/* 892D40 80240320 8FA60010 */ lw $a2, 0x10($sp) +/* 892D44 80240324 8CC20000 */ lw $v0, ($a2) +/* 892D48 80240328 AE220294 */ sw $v0, 0x294($s1) +.L8024032C: +/* 892D4C 8024032C 001010C0 */ sll $v0, $s0, 3 +/* 892D50 80240330 03C21021 */ addu $v0, $fp, $v0 +/* 892D54 80240334 80420015 */ lb $v0, 0x15($v0) +/* 892D58 80240338 26D60001 */ addiu $s6, $s6, 1 +/* 892D5C 8024033C AE220210 */ sw $v0, 0x210($s1) +/* 892D60 80240340 26310004 */ addiu $s1, $s1, 4 +/* 892D64 80240344 26520001 */ addiu $s2, $s2, 1 +.L80240348: +/* 892D68 80240348 2A420008 */ slti $v0, $s2, 8 +/* 892D6C 8024034C 1440FFCB */ bnez $v0, .L8024027C +/* 892D70 80240350 26940002 */ addiu $s4, $s4, 2 +/* 892D74 80240354 0260202D */ daddu $a0, $s3, $zero +/* 892D78 80240358 24020004 */ addiu $v0, $zero, 4 +/* 892D7C 8024035C AC820318 */ sw $v0, 0x318($a0) +/* 892D80 80240360 AC960324 */ sw $s6, 0x324($a0) +/* 892D84 80240364 0C03D390 */ jal func_800F4E40 +/* 892D88 80240368 AC800328 */ sw $zero, 0x328($a0) +/* 892D8C 8024036C AEA00070 */ sw $zero, 0x70($s5) +.L80240370: +/* 892D90 80240370 8EA20070 */ lw $v0, 0x70($s5) +/* 892D94 80240374 8EB30078 */ lw $s3, 0x78($s5) +/* 892D98 80240378 14400008 */ bnez $v0, .L8024039C +/* 892D9C 8024037C 24420001 */ addiu $v0, $v0, 1 +/* 892DA0 80240380 8662032C */ lh $v0, 0x32c($s3) +/* 892DA4 80240384 10400009 */ beqz $v0, .L802403AC +/* 892DA8 80240388 AEA20074 */ sw $v0, 0x74($s5) +/* 892DAC 8024038C 0C03C4EC */ jal func_800F13B0 +/* 892DB0 80240390 00000000 */ nop +/* 892DB4 80240394 8EA20070 */ lw $v0, 0x70($s5) +/* 892DB8 80240398 24420001 */ addiu $v0, $v0, 1 +.L8024039C: +/* 892DBC 8024039C AEA20070 */ sw $v0, 0x70($s5) +/* 892DC0 802403A0 2842000F */ slti $v0, $v0, 0xf +/* 892DC4 802403A4 10400003 */ beqz $v0, .L802403B4 +/* 892DC8 802403A8 00000000 */ nop +.L802403AC: +/* 892DCC 802403AC 08090107 */ j .L8024041C +/* 892DD0 802403B0 0000102D */ daddu $v0, $zero, $zero +.L802403B4: +/* 892DD4 802403B4 0C03C54E */ jal func_800F1538 +/* 892DD8 802403B8 00000000 */ nop +/* 892DDC 802403BC 8EA30074 */ lw $v1, 0x74($s5) +/* 892DE0 802403C0 240200FF */ addiu $v0, $zero, 0xff +/* 892DE4 802403C4 10620010 */ beq $v1, $v0, .L80240408 +/* 892DE8 802403C8 2462FFFF */ addiu $v0, $v1, -1 +/* 892DEC 802403CC 00021080 */ sll $v0, $v0, 2 +/* 892DF0 802403D0 02621021 */ addu $v0, $s3, $v0 +/* 892DF4 802403D4 8C420108 */ lw $v0, 0x108($v0) +/* 892DF8 802403D8 00021100 */ sll $v0, $v0, 4 +/* 892DFC 802403DC 3C038009 */ lui $v1, 0x8009 +/* 892E00 802403E0 00621821 */ addu $v1, $v1, $v0 +/* 892E04 802403E4 8C63EF20 */ lw $v1, -0x10e0($v1) +/* 892E08 802403E8 8EA20074 */ lw $v0, 0x74($s5) +/* 892E0C 802403EC 2442FFFF */ addiu $v0, $v0, -1 +/* 892E10 802403F0 00021080 */ sll $v0, $v0, 2 +/* 892E14 802403F4 02621021 */ addu $v0, $s3, $v0 +/* 892E18 802403F8 AEA30084 */ sw $v1, 0x84($s5) +/* 892E1C 802403FC 8C420108 */ lw $v0, 0x108($v0) +/* 892E20 80240400 08090104 */ j .L80240410 +/* 892E24 80240404 AEA20088 */ sw $v0, 0x88($s5) +.L80240408: +/* 892E28 80240408 2402FFFF */ addiu $v0, $zero, -1 +/* 892E2C 8024040C AEA20084 */ sw $v0, 0x84($s5) +.L80240410: +/* 892E30 80240410 0C00AB4B */ jal heap_free +/* 892E34 80240414 8EA40078 */ lw $a0, 0x78($s5) +/* 892E38 80240418 24020002 */ addiu $v0, $zero, 2 +.L8024041C: +/* 892E3C 8024041C 8FBF003C */ lw $ra, 0x3c($sp) +/* 892E40 80240420 8FBE0038 */ lw $fp, 0x38($sp) +/* 892E44 80240424 8FB70034 */ lw $s7, 0x34($sp) +/* 892E48 80240428 8FB60030 */ lw $s6, 0x30($sp) +/* 892E4C 8024042C 8FB5002C */ lw $s5, 0x2c($sp) +/* 892E50 80240430 8FB40028 */ lw $s4, 0x28($sp) +/* 892E54 80240434 8FB30024 */ lw $s3, 0x24($sp) +/* 892E58 80240438 8FB20020 */ lw $s2, 0x20($sp) +/* 892E5C 8024043C 8FB1001C */ lw $s1, 0x1c($sp) +/* 892E60 80240440 8FB00018 */ lw $s0, 0x18($sp) +/* 892E64 80240444 03E00008 */ jr $ra +/* 892E68 80240448 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C.s deleted file mode 100644 index a884198b34..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024044C -/* 892E6C 8024044C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 892E70 80240450 AFBF0010 */ sw $ra, 0x10($sp) -/* 892E74 80240454 8C82000C */ lw $v0, 0xc($a0) -/* 892E78 80240458 0C0B1EAF */ jal get_variable -/* 892E7C 8024045C 8C450000 */ lw $a1, ($v0) -/* 892E80 80240460 0C03AC5A */ jal func_800EB168 -/* 892E84 80240464 0040202D */ daddu $a0, $v0, $zero -/* 892E88 80240468 8FBF0010 */ lw $ra, 0x10($sp) -/* 892E8C 8024046C 24020002 */ addiu $v0, $zero, 2 -/* 892E90 80240470 03E00008 */ jr $ra -/* 892E94 80240474 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C_892E6C.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C_892E6C.s new file mode 100644 index 0000000000..2e26ec4e8a --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_8024044C_892E6C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024044C_892E6C +/* 892E6C 8024044C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 892E70 80240450 AFBF0010 */ sw $ra, 0x10($sp) +/* 892E74 80240454 8C82000C */ lw $v0, 0xc($a0) +/* 892E78 80240458 0C0B1EAF */ jal get_variable +/* 892E7C 8024045C 8C450000 */ lw $a1, ($v0) +/* 892E80 80240460 0C03AC5A */ jal func_800EB168 +/* 892E84 80240464 0040202D */ daddu $a0, $v0, $zero +/* 892E88 80240468 8FBF0010 */ lw $ra, 0x10($sp) +/* 892E8C 8024046C 24020002 */ addiu $v0, $zero, 2 +/* 892E90 80240470 03E00008 */ jr $ra +/* 892E94 80240474 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478.s deleted file mode 100644 index 784a8a37f2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240478 -/* 892E98 80240478 3C028011 */ lui $v0, 0x8011 -/* 892E9C 8024047C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 892EA0 80240480 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 892EA4 80240484 AFBF0010 */ sw $ra, 0x10($sp) -/* 892EA8 80240488 00021100 */ sll $v0, $v0, 4 -/* 892EAC 8024048C 3C048009 */ lui $a0, 0x8009 -/* 892EB0 80240490 00822021 */ addu $a0, $a0, $v0 -/* 892EB4 80240494 8C84EF20 */ lw $a0, -0x10e0($a0) -/* 892EB8 80240498 0C0496CF */ jal set_message_string -/* 892EBC 8024049C 0000282D */ daddu $a1, $zero, $zero -/* 892EC0 802404A0 8FBF0010 */ lw $ra, 0x10($sp) -/* 892EC4 802404A4 24020002 */ addiu $v0, $zero, 2 -/* 892EC8 802404A8 03E00008 */ jr $ra -/* 892ECC 802404AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s new file mode 100644 index 0000000000..fc1c5daadf --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240478_892E98 +/* 892E98 80240478 3C028011 */ lui $v0, 0x8011 +/* 892E9C 8024047C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 892EA0 80240480 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 892EA4 80240484 AFBF0010 */ sw $ra, 0x10($sp) +/* 892EA8 80240488 00021100 */ sll $v0, $v0, 4 +/* 892EAC 8024048C 3C048009 */ lui $a0, 0x8009 +/* 892EB0 80240490 00822021 */ addu $a0, $a0, $v0 +/* 892EB4 80240494 8C84EF20 */ lw $a0, -0x10e0($a0) +/* 892EB8 80240498 0C0496CF */ jal set_message_string +/* 892EBC 8024049C 0000282D */ daddu $a1, $zero, $zero +/* 892EC0 802404A0 8FBF0010 */ lw $ra, 0x10($sp) +/* 892EC4 802404A4 24020002 */ addiu $v0, $zero, 2 +/* 892EC8 802404A8 03E00008 */ jr $ra +/* 892ECC 802404AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240540.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240540.s deleted file mode 100644 index 7450f67e1a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240540.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540 -/* 892F60 80240540 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 892F64 80240544 AFBF0010 */ sw $ra, 0x10($sp) -/* 892F68 80240548 8C82000C */ lw $v0, 0xc($a0) -/* 892F6C 8024054C 0C0B1EAF */ jal get_variable -/* 892F70 80240550 8C450000 */ lw $a1, ($v0) -/* 892F74 80240554 0040202D */ daddu $a0, $v0, $zero -/* 892F78 80240558 8C830000 */ lw $v1, ($a0) -/* 892F7C 8024055C 34630010 */ ori $v1, $v1, 0x10 -/* 892F80 80240560 AC830000 */ sw $v1, ($a0) -/* 892F84 80240564 8FBF0010 */ lw $ra, 0x10($sp) -/* 892F88 80240568 24020002 */ addiu $v0, $zero, 2 -/* 892F8C 8024056C 03E00008 */ jr $ra -/* 892F90 80240570 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240540_892F60.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240540_892F60.s new file mode 100644 index 0000000000..52a28601fa --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240540_892F60.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240540_892F60 +/* 892F60 80240540 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 892F64 80240544 AFBF0010 */ sw $ra, 0x10($sp) +/* 892F68 80240548 8C82000C */ lw $v0, 0xc($a0) +/* 892F6C 8024054C 0C0B1EAF */ jal get_variable +/* 892F70 80240550 8C450000 */ lw $a1, ($v0) +/* 892F74 80240554 0040202D */ daddu $a0, $v0, $zero +/* 892F78 80240558 8C830000 */ lw $v1, ($a0) +/* 892F7C 8024055C 34630010 */ ori $v1, $v1, 0x10 +/* 892F80 80240560 AC830000 */ sw $v1, ($a0) +/* 892F84 80240564 8FBF0010 */ lw $ra, 0x10($sp) +/* 892F88 80240568 24020002 */ addiu $v0, $zero, 2 +/* 892F8C 8024056C 03E00008 */ jr $ra +/* 892F90 80240570 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574.s deleted file mode 100644 index 120a88860a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240574 -/* 892F94 80240574 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 892F98 80240578 AFBF0018 */ sw $ra, 0x18($sp) -/* 892F9C 8024057C 8C82000C */ lw $v0, 0xc($a0) -/* 892FA0 80240580 0C0B1EAF */ jal get_variable -/* 892FA4 80240584 8C450000 */ lw $a1, ($v0) -/* 892FA8 80240588 0C04417A */ jal get_entity_by_index -/* 892FAC 8024058C 0040202D */ daddu $a0, $v0, $zero -/* 892FB0 80240590 3C013F80 */ lui $at, 0x3f80 -/* 892FB4 80240594 44810000 */ mtc1 $at, $f0 -/* 892FB8 80240598 C442004C */ lwc1 $f2, 0x4c($v0) -/* 892FBC 8024059C E7A00010 */ swc1 $f0, 0x10($sp) -/* 892FC0 802405A0 3C014148 */ lui $at, 0x4148 -/* 892FC4 802405A4 44810000 */ mtc1 $at, $f0 -/* 892FC8 802405A8 2403004B */ addiu $v1, $zero, 0x4b -/* 892FCC 802405AC AFA30014 */ sw $v1, 0x14($sp) -/* 892FD0 802405B0 46001080 */ add.s $f2, $f2, $f0 -/* 892FD4 802405B4 8C450048 */ lw $a1, 0x48($v0) -/* 892FD8 802405B8 8C470050 */ lw $a3, 0x50($v0) -/* 892FDC 802405BC 44061000 */ mfc1 $a2, $f2 -/* 892FE0 802405C0 0C01C2EC */ jal func_80070BB0 -/* 892FE4 802405C4 24040004 */ addiu $a0, $zero, 4 -/* 892FE8 802405C8 8FBF0018 */ lw $ra, 0x18($sp) -/* 892FEC 802405CC 24020002 */ addiu $v0, $zero, 2 -/* 892FF0 802405D0 03E00008 */ jr $ra -/* 892FF4 802405D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574_892F94.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574_892F94.s new file mode 100644 index 0000000000..5958ac7b27 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240574_892F94.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240574_892F94 +/* 892F94 80240574 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 892F98 80240578 AFBF0018 */ sw $ra, 0x18($sp) +/* 892F9C 8024057C 8C82000C */ lw $v0, 0xc($a0) +/* 892FA0 80240580 0C0B1EAF */ jal get_variable +/* 892FA4 80240584 8C450000 */ lw $a1, ($v0) +/* 892FA8 80240588 0C04417A */ jal get_entity_by_index +/* 892FAC 8024058C 0040202D */ daddu $a0, $v0, $zero +/* 892FB0 80240590 3C013F80 */ lui $at, 0x3f80 +/* 892FB4 80240594 44810000 */ mtc1 $at, $f0 +/* 892FB8 80240598 C442004C */ lwc1 $f2, 0x4c($v0) +/* 892FBC 8024059C E7A00010 */ swc1 $f0, 0x10($sp) +/* 892FC0 802405A0 3C014148 */ lui $at, 0x4148 +/* 892FC4 802405A4 44810000 */ mtc1 $at, $f0 +/* 892FC8 802405A8 2403004B */ addiu $v1, $zero, 0x4b +/* 892FCC 802405AC AFA30014 */ sw $v1, 0x14($sp) +/* 892FD0 802405B0 46001080 */ add.s $f2, $f2, $f0 +/* 892FD4 802405B4 8C450048 */ lw $a1, 0x48($v0) +/* 892FD8 802405B8 8C470050 */ lw $a3, 0x50($v0) +/* 892FDC 802405BC 44061000 */ mfc1 $a2, $f2 +/* 892FE0 802405C0 0C01C2EC */ jal func_80070BB0 +/* 892FE4 802405C4 24040004 */ addiu $a0, $zero, 4 +/* 892FE8 802405C8 8FBF0018 */ lw $ra, 0x18($sp) +/* 892FEC 802405CC 24020002 */ addiu $v0, $zero, 2 +/* 892FF0 802405D0 03E00008 */ jr $ra +/* 892FF4 802405D4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8.s deleted file mode 100644 index d0809d38f2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D8 -/* 892FF8 802405D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 892FFC 802405DC AFBF0018 */ sw $ra, 0x18($sp) -/* 893000 802405E0 0C00EAD2 */ jal get_npc_safe -/* 893004 802405E4 2404FFFC */ addiu $a0, $zero, -4 -/* 893008 802405E8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 89300C 802405EC 3C014148 */ lui $at, 0x4148 -/* 893010 802405F0 44811000 */ mtc1 $at, $f2 -/* 893014 802405F4 3C013F80 */ lui $at, 0x3f80 -/* 893018 802405F8 44810000 */ mtc1 $at, $f0 -/* 89301C 802405FC 2403001E */ addiu $v1, $zero, 0x1e -/* 893020 80240600 AFA30014 */ sw $v1, 0x14($sp) -/* 893024 80240604 46022100 */ add.s $f4, $f4, $f2 -/* 893028 80240608 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89302C 8024060C 8C450038 */ lw $a1, 0x38($v0) -/* 893030 80240610 8C470040 */ lw $a3, 0x40($v0) -/* 893034 80240614 44062000 */ mfc1 $a2, $f4 -/* 893038 80240618 0C01C2EC */ jal func_80070BB0 -/* 89303C 8024061C 24040009 */ addiu $a0, $zero, 9 -/* 893040 80240620 8FBF0018 */ lw $ra, 0x18($sp) -/* 893044 80240624 24020002 */ addiu $v0, $zero, 2 -/* 893048 80240628 03E00008 */ jr $ra -/* 89304C 8024062C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8_892FF8.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8_892FF8.s new file mode 100644 index 0000000000..92df541dcd --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_802405D8_892FF8.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405D8_892FF8 +/* 892FF8 802405D8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 892FFC 802405DC AFBF0018 */ sw $ra, 0x18($sp) +/* 893000 802405E0 0C00EAD2 */ jal get_npc_safe +/* 893004 802405E4 2404FFFC */ addiu $a0, $zero, -4 +/* 893008 802405E8 C444003C */ lwc1 $f4, 0x3c($v0) +/* 89300C 802405EC 3C014148 */ lui $at, 0x4148 +/* 893010 802405F0 44811000 */ mtc1 $at, $f2 +/* 893014 802405F4 3C013F80 */ lui $at, 0x3f80 +/* 893018 802405F8 44810000 */ mtc1 $at, $f0 +/* 89301C 802405FC 2403001E */ addiu $v1, $zero, 0x1e +/* 893020 80240600 AFA30014 */ sw $v1, 0x14($sp) +/* 893024 80240604 46022100 */ add.s $f4, $f4, $f2 +/* 893028 80240608 E7A00010 */ swc1 $f0, 0x10($sp) +/* 89302C 8024060C 8C450038 */ lw $a1, 0x38($v0) +/* 893030 80240610 8C470040 */ lw $a3, 0x40($v0) +/* 893034 80240614 44062000 */ mfc1 $a2, $f4 +/* 893038 80240618 0C01C2EC */ jal func_80070BB0 +/* 89303C 8024061C 24040009 */ addiu $a0, $zero, 9 +/* 893040 80240620 8FBF0018 */ lw $ra, 0x18($sp) +/* 893044 80240624 24020002 */ addiu $v0, $zero, 2 +/* 893048 80240628 03E00008 */ jr $ra +/* 89304C 8024062C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68.s deleted file mode 100644 index 8da65e2c13..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B68 -/* 893588 80240B68 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89358C 80240B6C AFB10014 */ sw $s1, 0x14($sp) -/* 893590 80240B70 0080882D */ daddu $s1, $a0, $zero -/* 893594 80240B74 AFB20018 */ sw $s2, 0x18($sp) -/* 893598 80240B78 AFBF001C */ sw $ra, 0x1c($sp) -/* 89359C 80240B7C AFB00010 */ sw $s0, 0x10($sp) -/* 8935A0 80240B80 8E30000C */ lw $s0, 0xc($s1) -/* 8935A4 80240B84 10A00010 */ beqz $a1, .L80240BC8 -/* 8935A8 80240B88 0000902D */ daddu $s2, $zero, $zero -/* 8935AC 80240B8C 8E050000 */ lw $a1, ($s0) -/* 8935B0 80240B90 0C0B1EAF */ jal get_variable -/* 8935B4 80240B94 26100004 */ addiu $s0, $s0, 4 -/* 8935B8 80240B98 AE220084 */ sw $v0, 0x84($s1) -/* 8935BC 80240B9C 8E050000 */ lw $a1, ($s0) -/* 8935C0 80240BA0 0C0B1EAF */ jal get_variable -/* 8935C4 80240BA4 0220202D */ daddu $a0, $s1, $zero -/* 8935C8 80240BA8 0240202D */ daddu $a0, $s2, $zero -/* 8935CC 80240BAC 240500D0 */ addiu $a1, $zero, 0xd0 -/* 8935D0 80240BB0 00A0302D */ daddu $a2, $a1, $zero -/* 8935D4 80240BB4 00A0382D */ daddu $a3, $a1, $zero -/* 8935D8 80240BB8 AE220088 */ sw $v0, 0x88($s1) -/* 8935DC 80240BBC AE200070 */ sw $zero, 0x70($s1) -/* 8935E0 80240BC0 0C04DF84 */ jal func_80137E10 -/* 8935E4 80240BC4 AE200074 */ sw $zero, 0x74($s1) -.L80240BC8: -/* 8935E8 80240BC8 8E230070 */ lw $v1, 0x70($s1) -/* 8935EC 80240BCC 24040001 */ addiu $a0, $zero, 1 -/* 8935F0 80240BD0 10640019 */ beq $v1, $a0, .L80240C38 -/* 8935F4 80240BD4 28620002 */ slti $v0, $v1, 2 -/* 8935F8 80240BD8 10400005 */ beqz $v0, .L80240BF0 -/* 8935FC 80240BDC 24020002 */ addiu $v0, $zero, 2 -/* 893600 80240BE0 10600007 */ beqz $v1, .L80240C00 -/* 893604 80240BE4 240500FF */ addiu $a1, $zero, 0xff -/* 893608 80240BE8 0809031E */ j .L80240C78 -/* 89360C 80240BEC 00000000 */ nop -.L80240BF0: -/* 893610 80240BF0 10620019 */ beq $v1, $v0, .L80240C58 -/* 893614 80240BF4 00000000 */ nop -/* 893618 80240BF8 0809031E */ j .L80240C78 -/* 89361C 80240BFC 00000000 */ nop -.L80240C00: -/* 893620 80240C00 8E220074 */ lw $v0, 0x74($s1) -/* 893624 80240C04 14450004 */ bne $v0, $a1, .L80240C18 -/* 893628 80240C08 00000000 */ nop -/* 89362C 80240C0C AE240070 */ sw $a0, 0x70($s1) -/* 893630 80240C10 AE200078 */ sw $zero, 0x78($s1) -/* 893634 80240C14 8E220074 */ lw $v0, 0x74($s1) -.L80240C18: -/* 893638 80240C18 8E230084 */ lw $v1, 0x84($s1) -/* 89363C 80240C1C 00431021 */ addu $v0, $v0, $v1 -/* 893640 80240C20 AE220074 */ sw $v0, 0x74($s1) -/* 893644 80240C24 28420100 */ slti $v0, $v0, 0x100 -/* 893648 80240C28 50400013 */ beql $v0, $zero, .L80240C78 -/* 89364C 80240C2C AE250074 */ sw $a1, 0x74($s1) -/* 893650 80240C30 0809031E */ j .L80240C78 -/* 893654 80240C34 00000000 */ nop -.L80240C38: -/* 893658 80240C38 8E220078 */ lw $v0, 0x78($s1) -/* 89365C 80240C3C 24420001 */ addiu $v0, $v0, 1 -/* 893660 80240C40 AE220078 */ sw $v0, 0x78($s1) -/* 893664 80240C44 28420002 */ slti $v0, $v0, 2 -/* 893668 80240C48 1440000B */ bnez $v0, .L80240C78 -/* 89366C 80240C4C 24020002 */ addiu $v0, $zero, 2 -/* 893670 80240C50 0809031E */ j .L80240C78 -/* 893674 80240C54 AE220070 */ sw $v0, 0x70($s1) -.L80240C58: -/* 893678 80240C58 8E230074 */ lw $v1, 0x74($s1) -/* 89367C 80240C5C 50600001 */ beql $v1, $zero, .L80240C64 -/* 893680 80240C60 24120001 */ addiu $s2, $zero, 1 -.L80240C64: -/* 893684 80240C64 8E220088 */ lw $v0, 0x88($s1) -/* 893688 80240C68 00621023 */ subu $v0, $v1, $v0 -/* 89368C 80240C6C 04410002 */ bgez $v0, .L80240C78 -/* 893690 80240C70 AE220074 */ sw $v0, 0x74($s1) -/* 893694 80240C74 AE200074 */ sw $zero, 0x74($s1) -.L80240C78: -/* 893698 80240C78 C6200074 */ lwc1 $f0, 0x74($s1) -/* 89369C 80240C7C 46800020 */ cvt.s.w $f0, $f0 -/* 8936A0 80240C80 44050000 */ mfc1 $a1, $f0 -/* 8936A4 80240C84 0C04DF62 */ jal func_80137D88 -/* 8936A8 80240C88 24040001 */ addiu $a0, $zero, 1 -/* 8936AC 80240C8C 0240102D */ daddu $v0, $s2, $zero -/* 8936B0 80240C90 8FBF001C */ lw $ra, 0x1c($sp) -/* 8936B4 80240C94 8FB20018 */ lw $s2, 0x18($sp) -/* 8936B8 80240C98 8FB10014 */ lw $s1, 0x14($sp) -/* 8936BC 80240C9C 8FB00010 */ lw $s0, 0x10($sp) -/* 8936C0 80240CA0 03E00008 */ jr $ra -/* 8936C4 80240CA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s new file mode 100644 index 0000000000..5ca072b19f --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240B68_893588.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B68_893588 +/* 893588 80240B68 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 89358C 80240B6C AFB10014 */ sw $s1, 0x14($sp) +/* 893590 80240B70 0080882D */ daddu $s1, $a0, $zero +/* 893594 80240B74 AFB20018 */ sw $s2, 0x18($sp) +/* 893598 80240B78 AFBF001C */ sw $ra, 0x1c($sp) +/* 89359C 80240B7C AFB00010 */ sw $s0, 0x10($sp) +/* 8935A0 80240B80 8E30000C */ lw $s0, 0xc($s1) +/* 8935A4 80240B84 10A00010 */ beqz $a1, .L80240BC8 +/* 8935A8 80240B88 0000902D */ daddu $s2, $zero, $zero +/* 8935AC 80240B8C 8E050000 */ lw $a1, ($s0) +/* 8935B0 80240B90 0C0B1EAF */ jal get_variable +/* 8935B4 80240B94 26100004 */ addiu $s0, $s0, 4 +/* 8935B8 80240B98 AE220084 */ sw $v0, 0x84($s1) +/* 8935BC 80240B9C 8E050000 */ lw $a1, ($s0) +/* 8935C0 80240BA0 0C0B1EAF */ jal get_variable +/* 8935C4 80240BA4 0220202D */ daddu $a0, $s1, $zero +/* 8935C8 80240BA8 0240202D */ daddu $a0, $s2, $zero +/* 8935CC 80240BAC 240500D0 */ addiu $a1, $zero, 0xd0 +/* 8935D0 80240BB0 00A0302D */ daddu $a2, $a1, $zero +/* 8935D4 80240BB4 00A0382D */ daddu $a3, $a1, $zero +/* 8935D8 80240BB8 AE220088 */ sw $v0, 0x88($s1) +/* 8935DC 80240BBC AE200070 */ sw $zero, 0x70($s1) +/* 8935E0 80240BC0 0C04DF84 */ jal func_80137E10 +/* 8935E4 80240BC4 AE200074 */ sw $zero, 0x74($s1) +.L80240BC8: +/* 8935E8 80240BC8 8E230070 */ lw $v1, 0x70($s1) +/* 8935EC 80240BCC 24040001 */ addiu $a0, $zero, 1 +/* 8935F0 80240BD0 10640019 */ beq $v1, $a0, .L80240C38 +/* 8935F4 80240BD4 28620002 */ slti $v0, $v1, 2 +/* 8935F8 80240BD8 10400005 */ beqz $v0, .L80240BF0 +/* 8935FC 80240BDC 24020002 */ addiu $v0, $zero, 2 +/* 893600 80240BE0 10600007 */ beqz $v1, .L80240C00 +/* 893604 80240BE4 240500FF */ addiu $a1, $zero, 0xff +/* 893608 80240BE8 0809031E */ j .L80240C78 +/* 89360C 80240BEC 00000000 */ nop +.L80240BF0: +/* 893610 80240BF0 10620019 */ beq $v1, $v0, .L80240C58 +/* 893614 80240BF4 00000000 */ nop +/* 893618 80240BF8 0809031E */ j .L80240C78 +/* 89361C 80240BFC 00000000 */ nop +.L80240C00: +/* 893620 80240C00 8E220074 */ lw $v0, 0x74($s1) +/* 893624 80240C04 14450004 */ bne $v0, $a1, .L80240C18 +/* 893628 80240C08 00000000 */ nop +/* 89362C 80240C0C AE240070 */ sw $a0, 0x70($s1) +/* 893630 80240C10 AE200078 */ sw $zero, 0x78($s1) +/* 893634 80240C14 8E220074 */ lw $v0, 0x74($s1) +.L80240C18: +/* 893638 80240C18 8E230084 */ lw $v1, 0x84($s1) +/* 89363C 80240C1C 00431021 */ addu $v0, $v0, $v1 +/* 893640 80240C20 AE220074 */ sw $v0, 0x74($s1) +/* 893644 80240C24 28420100 */ slti $v0, $v0, 0x100 +/* 893648 80240C28 50400013 */ beql $v0, $zero, .L80240C78 +/* 89364C 80240C2C AE250074 */ sw $a1, 0x74($s1) +/* 893650 80240C30 0809031E */ j .L80240C78 +/* 893654 80240C34 00000000 */ nop +.L80240C38: +/* 893658 80240C38 8E220078 */ lw $v0, 0x78($s1) +/* 89365C 80240C3C 24420001 */ addiu $v0, $v0, 1 +/* 893660 80240C40 AE220078 */ sw $v0, 0x78($s1) +/* 893664 80240C44 28420002 */ slti $v0, $v0, 2 +/* 893668 80240C48 1440000B */ bnez $v0, .L80240C78 +/* 89366C 80240C4C 24020002 */ addiu $v0, $zero, 2 +/* 893670 80240C50 0809031E */ j .L80240C78 +/* 893674 80240C54 AE220070 */ sw $v0, 0x70($s1) +.L80240C58: +/* 893678 80240C58 8E230074 */ lw $v1, 0x74($s1) +/* 89367C 80240C5C 50600001 */ beql $v1, $zero, .L80240C64 +/* 893680 80240C60 24120001 */ addiu $s2, $zero, 1 +.L80240C64: +/* 893684 80240C64 8E220088 */ lw $v0, 0x88($s1) +/* 893688 80240C68 00621023 */ subu $v0, $v1, $v0 +/* 89368C 80240C6C 04410002 */ bgez $v0, .L80240C78 +/* 893690 80240C70 AE220074 */ sw $v0, 0x74($s1) +/* 893694 80240C74 AE200074 */ sw $zero, 0x74($s1) +.L80240C78: +/* 893698 80240C78 C6200074 */ lwc1 $f0, 0x74($s1) +/* 89369C 80240C7C 46800020 */ cvt.s.w $f0, $f0 +/* 8936A0 80240C80 44050000 */ mfc1 $a1, $f0 +/* 8936A4 80240C84 0C04DF62 */ jal func_80137D88 +/* 8936A8 80240C88 24040001 */ addiu $a0, $zero, 1 +/* 8936AC 80240C8C 0240102D */ daddu $v0, $s2, $zero +/* 8936B0 80240C90 8FBF001C */ lw $ra, 0x1c($sp) +/* 8936B4 80240C94 8FB20018 */ lw $s2, 0x18($sp) +/* 8936B8 80240C98 8FB10014 */ lw $s1, 0x14($sp) +/* 8936BC 80240C9C 8FB00010 */ lw $s0, 0x10($sp) +/* 8936C0 80240CA0 03E00008 */ jr $ra +/* 8936C4 80240CA4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8.s deleted file mode 100644 index a51be3341a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CA8 -/* 8936C8 80240CA8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8936CC 80240CAC AFBF0018 */ sw $ra, 0x18($sp) -/* 8936D0 80240CB0 0C00EAD2 */ jal get_npc_safe -/* 8936D4 80240CB4 2404FFFC */ addiu $a0, $zero, -4 -/* 8936D8 80240CB8 3C0141F0 */ lui $at, 0x41f0 -/* 8936DC 80240CBC 44810000 */ mtc1 $at, $f0 -/* 8936E0 80240CC0 C442003C */ lwc1 $f2, 0x3c($v0) -/* 8936E4 80240CC4 46001080 */ add.s $f2, $f2, $f0 -/* 8936E8 80240CC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8936EC 80240CCC 8C450038 */ lw $a1, 0x38($v0) -/* 8936F0 80240CD0 8C470040 */ lw $a3, 0x40($v0) -/* 8936F4 80240CD4 44061000 */ mfc1 $a2, $f2 -/* 8936F8 80240CD8 0C01BFBC */ jal func_8006FEF0 -/* 8936FC 80240CDC 24040002 */ addiu $a0, $zero, 2 -/* 893700 80240CE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 893704 80240CE4 24020002 */ addiu $v0, $zero, 2 -/* 893708 80240CE8 03E00008 */ jr $ra -/* 89370C 80240CEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8_8936C8.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8_8936C8.s new file mode 100644 index 0000000000..e80cbf9862 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240CA8_8936C8.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CA8_8936C8 +/* 8936C8 80240CA8 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8936CC 80240CAC AFBF0018 */ sw $ra, 0x18($sp) +/* 8936D0 80240CB0 0C00EAD2 */ jal get_npc_safe +/* 8936D4 80240CB4 2404FFFC */ addiu $a0, $zero, -4 +/* 8936D8 80240CB8 3C0141F0 */ lui $at, 0x41f0 +/* 8936DC 80240CBC 44810000 */ mtc1 $at, $f0 +/* 8936E0 80240CC0 C442003C */ lwc1 $f2, 0x3c($v0) +/* 8936E4 80240CC4 46001080 */ add.s $f2, $f2, $f0 +/* 8936E8 80240CC8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8936EC 80240CCC 8C450038 */ lw $a1, 0x38($v0) +/* 8936F0 80240CD0 8C470040 */ lw $a3, 0x40($v0) +/* 8936F4 80240CD4 44061000 */ mfc1 $a2, $f2 +/* 8936F8 80240CD8 0C01BFBC */ jal func_8006FEF0 +/* 8936FC 80240CDC 24040002 */ addiu $a0, $zero, 2 +/* 893700 80240CE0 8FBF0018 */ lw $ra, 0x18($sp) +/* 893704 80240CE4 24020002 */ addiu $v0, $zero, 2 +/* 893708 80240CE8 03E00008 */ jr $ra +/* 89370C 80240CEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38.s deleted file mode 100644 index 7e0890eb10..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D38 -/* 893758 80240D38 3C038011 */ lui $v1, %hi(D_8010EBB0) -/* 89375C 80240D3C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) -/* 893760 80240D40 AC800084 */ sw $zero, 0x84($a0) -/* 893764 80240D44 80620000 */ lb $v0, ($v1) -/* 893768 80240D48 10400005 */ beqz $v0, .L80240D60 -/* 89376C 80240D4C 24020003 */ addiu $v0, $zero, 3 -/* 893770 80240D50 80630003 */ lb $v1, 3($v1) -/* 893774 80240D54 14620002 */ bne $v1, $v0, .L80240D60 -/* 893778 80240D58 24020001 */ addiu $v0, $zero, 1 -/* 89377C 80240D5C AC820084 */ sw $v0, 0x84($a0) -.L80240D60: -/* 893780 80240D60 03E00008 */ jr $ra -/* 893784 80240D64 24020002 */ addiu $v0, $zero, 2 -/* 893788 80240D68 00000000 */ nop -/* 89378C 80240D6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s new file mode 100644 index 0000000000..28e50e60e3 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240D38_893758.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D38_893758 +/* 893758 80240D38 3C038011 */ lui $v1, %hi(D_8010EBB0) +/* 89375C 80240D3C 2463EBB0 */ addiu $v1, $v1, %lo(D_8010EBB0) +/* 893760 80240D40 AC800084 */ sw $zero, 0x84($a0) +/* 893764 80240D44 80620000 */ lb $v0, ($v1) +/* 893768 80240D48 10400005 */ beqz $v0, .L80240D60 +/* 89376C 80240D4C 24020003 */ addiu $v0, $zero, 3 +/* 893770 80240D50 80630003 */ lb $v1, 3($v1) +/* 893774 80240D54 14620002 */ bne $v1, $v0, .L80240D60 +/* 893778 80240D58 24020001 */ addiu $v0, $zero, 1 +/* 89377C 80240D5C AC820084 */ sw $v0, 0x84($a0) +.L80240D60: +/* 893780 80240D60 03E00008 */ jr $ra +/* 893784 80240D64 24020002 */ addiu $v0, $zero, 2 +/* 893788 80240D68 00000000 */ nop +/* 89378C 80240D6C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70.s deleted file mode 100644 index e38402dfb9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D70 -/* 893790 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 893794 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 893798 80240D78 8C430004 */ lw $v1, 4($v0) -/* 89379C 80240D7C 3C040010 */ lui $a0, 0x10 -/* 8937A0 80240D80 00641825 */ or $v1, $v1, $a0 -/* 8937A4 80240D84 AC430004 */ sw $v1, 4($v0) -/* 8937A8 80240D88 03E00008 */ jr $ra -/* 8937AC 80240D8C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70_893790.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70_893790.s new file mode 100644 index 0000000000..67ffcf28e5 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D70_893790.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D70_893790 +/* 893790 80240D70 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 893794 80240D74 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 893798 80240D78 8C430004 */ lw $v1, 4($v0) +/* 89379C 80240D7C 3C040010 */ lui $a0, 0x10 +/* 8937A0 80240D80 00641825 */ or $v1, $v1, $a0 +/* 8937A4 80240D84 AC430004 */ sw $v1, 4($v0) +/* 8937A8 80240D88 03E00008 */ jr $ra +/* 8937AC 80240D8C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90.s deleted file mode 100644 index f9f078c691..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D90 -/* 8937B0 80240D90 3C028016 */ lui $v0, 0x8016 -/* 8937B4 80240D94 8442A552 */ lh $v0, -0x5aae($v0) -/* 8937B8 80240D98 AC820084 */ sw $v0, 0x84($a0) -/* 8937BC 80240D9C 03E00008 */ jr $ra -/* 8937C0 80240DA0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90_8937B0.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90_8937B0.s new file mode 100644 index 0000000000..a5c3a0aebc --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240D90_8937B0.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D90_8937B0 +/* 8937B0 80240D90 3C028016 */ lui $v0, 0x8016 +/* 8937B4 80240D94 8442A552 */ lh $v0, -0x5aae($v0) +/* 8937B8 80240D98 AC820084 */ sw $v0, 0x84($a0) +/* 8937BC 80240D9C 03E00008 */ jr $ra +/* 8937C0 80240DA0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40.s deleted file mode 100644 index 24ed82bdbe..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F40 -/* 893960 80240F40 3C038007 */ lui $v1, %hi(gCurrentCameraID) -/* 893964 80240F44 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) -/* 893968 80240F48 3C014334 */ lui $at, 0x4334 -/* 89396C 80240F4C 44816000 */ mtc1 $at, $f12 -/* 893970 80240F50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 893974 80240F54 AFBF0014 */ sw $ra, 0x14($sp) -/* 893978 80240F58 AFB00010 */ sw $s0, 0x10($sp) -/* 89397C 80240F5C 00031080 */ sll $v0, $v1, 2 -/* 893980 80240F60 00431021 */ addu $v0, $v0, $v1 -/* 893984 80240F64 00021080 */ sll $v0, $v0, 2 -/* 893988 80240F68 00431023 */ subu $v0, $v0, $v1 -/* 89398C 80240F6C 000218C0 */ sll $v1, $v0, 3 -/* 893990 80240F70 00431021 */ addu $v0, $v0, $v1 -/* 893994 80240F74 000210C0 */ sll $v0, $v0, 3 -/* 893998 80240F78 3C01800B */ lui $at, 0x800b -/* 89399C 80240F7C 00220821 */ addu $at, $at, $v0 -/* 8939A0 80240F80 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8939A4 80240F84 460C0300 */ add.s $f12, $f0, $f12 -/* 8939A8 80240F88 0C00A6C9 */ jal clamp_angle -/* 8939AC 80240F8C 0080802D */ daddu $s0, $a0, $zero -/* 8939B0 80240F90 4600008D */ trunc.w.s $f2, $f0 -/* 8939B4 80240F94 E6020084 */ swc1 $f2, 0x84($s0) -/* 8939B8 80240F98 8FBF0014 */ lw $ra, 0x14($sp) -/* 8939BC 80240F9C 8FB00010 */ lw $s0, 0x10($sp) -/* 8939C0 80240FA0 24020002 */ addiu $v0, $zero, 2 -/* 8939C4 80240FA4 03E00008 */ jr $ra -/* 8939C8 80240FA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40_893960.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40_893960.s new file mode 100644 index 0000000000..1ebdc99db0 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80240F40_893960.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F40_893960 +/* 893960 80240F40 3C038007 */ lui $v1, %hi(gCurrentCameraID) +/* 893964 80240F44 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) +/* 893968 80240F48 3C014334 */ lui $at, 0x4334 +/* 89396C 80240F4C 44816000 */ mtc1 $at, $f12 +/* 893970 80240F50 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 893974 80240F54 AFBF0014 */ sw $ra, 0x14($sp) +/* 893978 80240F58 AFB00010 */ sw $s0, 0x10($sp) +/* 89397C 80240F5C 00031080 */ sll $v0, $v1, 2 +/* 893980 80240F60 00431021 */ addu $v0, $v0, $v1 +/* 893984 80240F64 00021080 */ sll $v0, $v0, 2 +/* 893988 80240F68 00431023 */ subu $v0, $v0, $v1 +/* 89398C 80240F6C 000218C0 */ sll $v1, $v0, 3 +/* 893990 80240F70 00431021 */ addu $v0, $v0, $v1 +/* 893994 80240F74 000210C0 */ sll $v0, $v0, 3 +/* 893998 80240F78 3C01800B */ lui $at, 0x800b +/* 89399C 80240F7C 00220821 */ addu $at, $at, $v0 +/* 8939A0 80240F80 C4201DEC */ lwc1 $f0, 0x1dec($at) +/* 8939A4 80240F84 460C0300 */ add.s $f12, $f0, $f12 +/* 8939A8 80240F88 0C00A6C9 */ jal clamp_angle +/* 8939AC 80240F8C 0080802D */ daddu $s0, $a0, $zero +/* 8939B0 80240F90 4600008D */ trunc.w.s $f2, $f0 +/* 8939B4 80240F94 E6020084 */ swc1 $f2, 0x84($s0) +/* 8939B8 80240F98 8FBF0014 */ lw $ra, 0x14($sp) +/* 8939BC 80240F9C 8FB00010 */ lw $s0, 0x10($sp) +/* 8939C0 80240FA0 24020002 */ addiu $v0, $zero, 2 +/* 8939C4 80240FA4 03E00008 */ jr $ra +/* 8939C8 80240FA8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050.s deleted file mode 100644 index dbd1300228..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050.s +++ /dev/null @@ -1,89 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241050 -/* 893A70 80241050 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 893A74 80241054 AFB00010 */ sw $s0, 0x10($sp) -/* 893A78 80241058 0080802D */ daddu $s0, $a0, $zero -/* 893A7C 8024105C AFBF0014 */ sw $ra, 0x14($sp) -/* 893A80 80241060 8E0300A8 */ lw $v1, 0xa8($s0) -/* 893A84 80241064 8E020088 */ lw $v0, 0x88($s0) -/* 893A88 80241068 00621821 */ addu $v1, $v1, $v0 -/* 893A8C 8024106C 04610004 */ bgez $v1, .L80241080 -/* 893A90 80241070 AE0300A8 */ sw $v1, 0xa8($s0) -/* 893A94 80241074 3C020002 */ lui $v0, 2 -/* 893A98 80241078 08090424 */ j .L80241090 -/* 893A9C 8024107C 00621021 */ addu $v0, $v1, $v0 -.L80241080: -/* 893AA0 80241080 3C040002 */ lui $a0, 2 -/* 893AA4 80241084 0083102A */ slt $v0, $a0, $v1 -/* 893AA8 80241088 10400002 */ beqz $v0, .L80241094 -/* 893AAC 8024108C 00641023 */ subu $v0, $v1, $a0 -.L80241090: -/* 893AB0 80241090 AE0200A8 */ sw $v0, 0xa8($s0) -.L80241094: -/* 893AB4 80241094 8E0300AC */ lw $v1, 0xac($s0) -/* 893AB8 80241098 8E02008C */ lw $v0, 0x8c($s0) -/* 893ABC 8024109C 00621821 */ addu $v1, $v1, $v0 -/* 893AC0 802410A0 04610004 */ bgez $v1, .L802410B4 -/* 893AC4 802410A4 AE0300AC */ sw $v1, 0xac($s0) -/* 893AC8 802410A8 3C020002 */ lui $v0, 2 -/* 893ACC 802410AC 08090431 */ j .L802410C4 -/* 893AD0 802410B0 00621021 */ addu $v0, $v1, $v0 -.L802410B4: -/* 893AD4 802410B4 3C040002 */ lui $a0, 2 -/* 893AD8 802410B8 0083102A */ slt $v0, $a0, $v1 -/* 893ADC 802410BC 10400002 */ beqz $v0, .L802410C8 -/* 893AE0 802410C0 00641023 */ subu $v0, $v1, $a0 -.L802410C4: -/* 893AE4 802410C4 AE0200AC */ sw $v0, 0xac($s0) -.L802410C8: -/* 893AE8 802410C8 8E0300B0 */ lw $v1, 0xb0($s0) -/* 893AEC 802410CC 8E020090 */ lw $v0, 0x90($s0) -/* 893AF0 802410D0 00621821 */ addu $v1, $v1, $v0 -/* 893AF4 802410D4 04610004 */ bgez $v1, .L802410E8 -/* 893AF8 802410D8 AE0300B0 */ sw $v1, 0xb0($s0) -/* 893AFC 802410DC 3C020002 */ lui $v0, 2 -/* 893B00 802410E0 0809043E */ j .L802410F8 -/* 893B04 802410E4 00621021 */ addu $v0, $v1, $v0 -.L802410E8: -/* 893B08 802410E8 3C040002 */ lui $a0, 2 -/* 893B0C 802410EC 0083102A */ slt $v0, $a0, $v1 -/* 893B10 802410F0 10400002 */ beqz $v0, .L802410FC -/* 893B14 802410F4 00641023 */ subu $v0, $v1, $a0 -.L802410F8: -/* 893B18 802410F8 AE0200B0 */ sw $v0, 0xb0($s0) -.L802410FC: -/* 893B1C 802410FC 8E0300B4 */ lw $v1, 0xb4($s0) -/* 893B20 80241100 8E020094 */ lw $v0, 0x94($s0) -/* 893B24 80241104 00621821 */ addu $v1, $v1, $v0 -/* 893B28 80241108 04610004 */ bgez $v1, .L8024111C -/* 893B2C 8024110C AE0300B4 */ sw $v1, 0xb4($s0) -/* 893B30 80241110 3C020002 */ lui $v0, 2 -/* 893B34 80241114 0809044B */ j .L8024112C -/* 893B38 80241118 00621021 */ addu $v0, $v1, $v0 -.L8024111C: -/* 893B3C 8024111C 3C040002 */ lui $a0, 2 -/* 893B40 80241120 0083102A */ slt $v0, $a0, $v1 -/* 893B44 80241124 10400002 */ beqz $v0, .L80241130 -/* 893B48 80241128 00641023 */ subu $v0, $v1, $a0 -.L8024112C: -/* 893B4C 8024112C AE0200B4 */ sw $v0, 0xb4($s0) -.L80241130: -/* 893B50 80241130 8E040084 */ lw $a0, 0x84($s0) -/* 893B54 80241134 0C046F07 */ jal set_main_pan_u -/* 893B58 80241138 8E0500A8 */ lw $a1, 0xa8($s0) -/* 893B5C 8024113C 8E040084 */ lw $a0, 0x84($s0) -/* 893B60 80241140 0C046F0D */ jal set_main_pan_v -/* 893B64 80241144 8E0500AC */ lw $a1, 0xac($s0) -/* 893B68 80241148 8E040084 */ lw $a0, 0x84($s0) -/* 893B6C 8024114C 0C046F13 */ jal set_aux_pan_u -/* 893B70 80241150 8E0500B0 */ lw $a1, 0xb0($s0) -/* 893B74 80241154 8E040084 */ lw $a0, 0x84($s0) -/* 893B78 80241158 0C046F19 */ jal set_aux_pan_v -/* 893B7C 8024115C 8E0500B4 */ lw $a1, 0xb4($s0) -/* 893B80 80241160 8FBF0014 */ lw $ra, 0x14($sp) -/* 893B84 80241164 8FB00010 */ lw $s0, 0x10($sp) -/* 893B88 80241168 0000102D */ daddu $v0, $zero, $zero -/* 893B8C 8024116C 03E00008 */ jr $ra -/* 893B90 80241170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050_893A70.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050_893A70.s new file mode 100644 index 0000000000..0f1431a92f --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241050_893A70.s @@ -0,0 +1,89 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241050_893A70 +/* 893A70 80241050 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 893A74 80241054 AFB00010 */ sw $s0, 0x10($sp) +/* 893A78 80241058 0080802D */ daddu $s0, $a0, $zero +/* 893A7C 8024105C AFBF0014 */ sw $ra, 0x14($sp) +/* 893A80 80241060 8E0300A8 */ lw $v1, 0xa8($s0) +/* 893A84 80241064 8E020088 */ lw $v0, 0x88($s0) +/* 893A88 80241068 00621821 */ addu $v1, $v1, $v0 +/* 893A8C 8024106C 04610004 */ bgez $v1, .L80241080 +/* 893A90 80241070 AE0300A8 */ sw $v1, 0xa8($s0) +/* 893A94 80241074 3C020002 */ lui $v0, 2 +/* 893A98 80241078 08090424 */ j .L80241090 +/* 893A9C 8024107C 00621021 */ addu $v0, $v1, $v0 +.L80241080: +/* 893AA0 80241080 3C040002 */ lui $a0, 2 +/* 893AA4 80241084 0083102A */ slt $v0, $a0, $v1 +/* 893AA8 80241088 10400002 */ beqz $v0, .L80241094 +/* 893AAC 8024108C 00641023 */ subu $v0, $v1, $a0 +.L80241090: +/* 893AB0 80241090 AE0200A8 */ sw $v0, 0xa8($s0) +.L80241094: +/* 893AB4 80241094 8E0300AC */ lw $v1, 0xac($s0) +/* 893AB8 80241098 8E02008C */ lw $v0, 0x8c($s0) +/* 893ABC 8024109C 00621821 */ addu $v1, $v1, $v0 +/* 893AC0 802410A0 04610004 */ bgez $v1, .L802410B4 +/* 893AC4 802410A4 AE0300AC */ sw $v1, 0xac($s0) +/* 893AC8 802410A8 3C020002 */ lui $v0, 2 +/* 893ACC 802410AC 08090431 */ j .L802410C4 +/* 893AD0 802410B0 00621021 */ addu $v0, $v1, $v0 +.L802410B4: +/* 893AD4 802410B4 3C040002 */ lui $a0, 2 +/* 893AD8 802410B8 0083102A */ slt $v0, $a0, $v1 +/* 893ADC 802410BC 10400002 */ beqz $v0, .L802410C8 +/* 893AE0 802410C0 00641023 */ subu $v0, $v1, $a0 +.L802410C4: +/* 893AE4 802410C4 AE0200AC */ sw $v0, 0xac($s0) +.L802410C8: +/* 893AE8 802410C8 8E0300B0 */ lw $v1, 0xb0($s0) +/* 893AEC 802410CC 8E020090 */ lw $v0, 0x90($s0) +/* 893AF0 802410D0 00621821 */ addu $v1, $v1, $v0 +/* 893AF4 802410D4 04610004 */ bgez $v1, .L802410E8 +/* 893AF8 802410D8 AE0300B0 */ sw $v1, 0xb0($s0) +/* 893AFC 802410DC 3C020002 */ lui $v0, 2 +/* 893B00 802410E0 0809043E */ j .L802410F8 +/* 893B04 802410E4 00621021 */ addu $v0, $v1, $v0 +.L802410E8: +/* 893B08 802410E8 3C040002 */ lui $a0, 2 +/* 893B0C 802410EC 0083102A */ slt $v0, $a0, $v1 +/* 893B10 802410F0 10400002 */ beqz $v0, .L802410FC +/* 893B14 802410F4 00641023 */ subu $v0, $v1, $a0 +.L802410F8: +/* 893B18 802410F8 AE0200B0 */ sw $v0, 0xb0($s0) +.L802410FC: +/* 893B1C 802410FC 8E0300B4 */ lw $v1, 0xb4($s0) +/* 893B20 80241100 8E020094 */ lw $v0, 0x94($s0) +/* 893B24 80241104 00621821 */ addu $v1, $v1, $v0 +/* 893B28 80241108 04610004 */ bgez $v1, .L8024111C +/* 893B2C 8024110C AE0300B4 */ sw $v1, 0xb4($s0) +/* 893B30 80241110 3C020002 */ lui $v0, 2 +/* 893B34 80241114 0809044B */ j .L8024112C +/* 893B38 80241118 00621021 */ addu $v0, $v1, $v0 +.L8024111C: +/* 893B3C 8024111C 3C040002 */ lui $a0, 2 +/* 893B40 80241120 0083102A */ slt $v0, $a0, $v1 +/* 893B44 80241124 10400002 */ beqz $v0, .L80241130 +/* 893B48 80241128 00641023 */ subu $v0, $v1, $a0 +.L8024112C: +/* 893B4C 8024112C AE0200B4 */ sw $v0, 0xb4($s0) +.L80241130: +/* 893B50 80241130 8E040084 */ lw $a0, 0x84($s0) +/* 893B54 80241134 0C046F07 */ jal set_main_pan_u +/* 893B58 80241138 8E0500A8 */ lw $a1, 0xa8($s0) +/* 893B5C 8024113C 8E040084 */ lw $a0, 0x84($s0) +/* 893B60 80241140 0C046F0D */ jal set_main_pan_v +/* 893B64 80241144 8E0500AC */ lw $a1, 0xac($s0) +/* 893B68 80241148 8E040084 */ lw $a0, 0x84($s0) +/* 893B6C 8024114C 0C046F13 */ jal set_aux_pan_u +/* 893B70 80241150 8E0500B0 */ lw $a1, 0xb0($s0) +/* 893B74 80241154 8E040084 */ lw $a0, 0x84($s0) +/* 893B78 80241158 0C046F19 */ jal set_aux_pan_v +/* 893B7C 8024115C 8E0500B4 */ lw $a1, 0xb4($s0) +/* 893B80 80241160 8FBF0014 */ lw $ra, 0x14($sp) +/* 893B84 80241164 8FB00010 */ lw $s0, 0x10($sp) +/* 893B88 80241168 0000102D */ daddu $v0, $zero, $zero +/* 893B8C 8024116C 03E00008 */ jr $ra +/* 893B90 80241170 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174.s deleted file mode 100644 index 16f2953708..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241174 -/* 893B94 80241174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 893B98 80241178 AFB00010 */ sw $s0, 0x10($sp) -/* 893B9C 8024117C 0080802D */ daddu $s0, $a0, $zero -/* 893BA0 80241180 10A00005 */ beqz $a1, .L80241198 -/* 893BA4 80241184 AFBF0014 */ sw $ra, 0x14($sp) -/* 893BA8 80241188 AE000070 */ sw $zero, 0x70($s0) -/* 893BAC 8024118C AE000074 */ sw $zero, 0x74($s0) -/* 893BB0 80241190 AE000078 */ sw $zero, 0x78($s0) -/* 893BB4 80241194 AE00007C */ sw $zero, 0x7c($s0) -.L80241198: -/* 893BB8 80241198 8E020070 */ lw $v0, 0x70($s0) -/* 893BBC 8024119C 1440000E */ bnez $v0, .L802411D8 -/* 893BC0 802411A0 00000000 */ nop -/* 893BC4 802411A4 8E0300A8 */ lw $v1, 0xa8($s0) -/* 893BC8 802411A8 8E020088 */ lw $v0, 0x88($s0) -/* 893BCC 802411AC 00621821 */ addu $v1, $v1, $v0 -/* 893BD0 802411B0 04610004 */ bgez $v1, .L802411C4 -/* 893BD4 802411B4 AE0300A8 */ sw $v1, 0xa8($s0) -/* 893BD8 802411B8 3C020002 */ lui $v0, 2 -/* 893BDC 802411BC 08090475 */ j .L802411D4 -/* 893BE0 802411C0 00621021 */ addu $v0, $v1, $v0 -.L802411C4: -/* 893BE4 802411C4 3C040002 */ lui $a0, 2 -/* 893BE8 802411C8 0083102A */ slt $v0, $a0, $v1 -/* 893BEC 802411CC 10400002 */ beqz $v0, .L802411D8 -/* 893BF0 802411D0 00641023 */ subu $v0, $v1, $a0 -.L802411D4: -/* 893BF4 802411D4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802411D8: -/* 893BF8 802411D8 8E020074 */ lw $v0, 0x74($s0) -/* 893BFC 802411DC 1440000E */ bnez $v0, .L80241218 -/* 893C00 802411E0 00000000 */ nop -/* 893C04 802411E4 8E0300AC */ lw $v1, 0xac($s0) -/* 893C08 802411E8 8E02008C */ lw $v0, 0x8c($s0) -/* 893C0C 802411EC 00621821 */ addu $v1, $v1, $v0 -/* 893C10 802411F0 04610004 */ bgez $v1, .L80241204 -/* 893C14 802411F4 AE0300AC */ sw $v1, 0xac($s0) -/* 893C18 802411F8 3C020002 */ lui $v0, 2 -/* 893C1C 802411FC 08090485 */ j .L80241214 -/* 893C20 80241200 00621021 */ addu $v0, $v1, $v0 -.L80241204: -/* 893C24 80241204 3C040002 */ lui $a0, 2 -/* 893C28 80241208 0083102A */ slt $v0, $a0, $v1 -/* 893C2C 8024120C 10400002 */ beqz $v0, .L80241218 -/* 893C30 80241210 00641023 */ subu $v0, $v1, $a0 -.L80241214: -/* 893C34 80241214 AE0200AC */ sw $v0, 0xac($s0) -.L80241218: -/* 893C38 80241218 8E020078 */ lw $v0, 0x78($s0) -/* 893C3C 8024121C 1440000E */ bnez $v0, .L80241258 -/* 893C40 80241220 00000000 */ nop -/* 893C44 80241224 8E0300B0 */ lw $v1, 0xb0($s0) -/* 893C48 80241228 8E020090 */ lw $v0, 0x90($s0) -/* 893C4C 8024122C 00621821 */ addu $v1, $v1, $v0 -/* 893C50 80241230 04610004 */ bgez $v1, .L80241244 -/* 893C54 80241234 AE0300B0 */ sw $v1, 0xb0($s0) -/* 893C58 80241238 3C020002 */ lui $v0, 2 -/* 893C5C 8024123C 08090495 */ j .L80241254 -/* 893C60 80241240 00621021 */ addu $v0, $v1, $v0 -.L80241244: -/* 893C64 80241244 3C040002 */ lui $a0, 2 -/* 893C68 80241248 0083102A */ slt $v0, $a0, $v1 -/* 893C6C 8024124C 10400002 */ beqz $v0, .L80241258 -/* 893C70 80241250 00641023 */ subu $v0, $v1, $a0 -.L80241254: -/* 893C74 80241254 AE0200B0 */ sw $v0, 0xb0($s0) -.L80241258: -/* 893C78 80241258 8E02007C */ lw $v0, 0x7c($s0) -/* 893C7C 8024125C 1440000E */ bnez $v0, .L80241298 -/* 893C80 80241260 00000000 */ nop -/* 893C84 80241264 8E0300B4 */ lw $v1, 0xb4($s0) -/* 893C88 80241268 8E020094 */ lw $v0, 0x94($s0) -/* 893C8C 8024126C 00621821 */ addu $v1, $v1, $v0 -/* 893C90 80241270 04610004 */ bgez $v1, .L80241284 -/* 893C94 80241274 AE0300B4 */ sw $v1, 0xb4($s0) -/* 893C98 80241278 3C020002 */ lui $v0, 2 -/* 893C9C 8024127C 080904A5 */ j .L80241294 -/* 893CA0 80241280 00621021 */ addu $v0, $v1, $v0 -.L80241284: -/* 893CA4 80241284 3C040002 */ lui $a0, 2 -/* 893CA8 80241288 0083102A */ slt $v0, $a0, $v1 -/* 893CAC 8024128C 10400002 */ beqz $v0, .L80241298 -/* 893CB0 80241290 00641023 */ subu $v0, $v1, $a0 -.L80241294: -/* 893CB4 80241294 AE0200B4 */ sw $v0, 0xb4($s0) -.L80241298: -/* 893CB8 80241298 8E040084 */ lw $a0, 0x84($s0) -/* 893CBC 8024129C 0C046F07 */ jal set_main_pan_u -/* 893CC0 802412A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* 893CC4 802412A4 8E040084 */ lw $a0, 0x84($s0) -/* 893CC8 802412A8 0C046F0D */ jal set_main_pan_v -/* 893CCC 802412AC 8E0500AC */ lw $a1, 0xac($s0) -/* 893CD0 802412B0 8E040084 */ lw $a0, 0x84($s0) -/* 893CD4 802412B4 0C046F13 */ jal set_aux_pan_u -/* 893CD8 802412B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* 893CDC 802412BC 8E040084 */ lw $a0, 0x84($s0) -/* 893CE0 802412C0 0C046F19 */ jal set_aux_pan_v -/* 893CE4 802412C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* 893CE8 802412C8 8E020070 */ lw $v0, 0x70($s0) -/* 893CEC 802412CC 8E030078 */ lw $v1, 0x78($s0) -/* 893CF0 802412D0 8E040098 */ lw $a0, 0x98($s0) -/* 893CF4 802412D4 24420001 */ addiu $v0, $v0, 1 -/* 893CF8 802412D8 AE020070 */ sw $v0, 0x70($s0) -/* 893CFC 802412DC 8E020074 */ lw $v0, 0x74($s0) -/* 893D00 802412E0 24630001 */ addiu $v1, $v1, 1 -/* 893D04 802412E4 AE030078 */ sw $v1, 0x78($s0) -/* 893D08 802412E8 8E030070 */ lw $v1, 0x70($s0) -/* 893D0C 802412EC 24420001 */ addiu $v0, $v0, 1 -/* 893D10 802412F0 AE020074 */ sw $v0, 0x74($s0) -/* 893D14 802412F4 8E02007C */ lw $v0, 0x7c($s0) -/* 893D18 802412F8 0064182A */ slt $v1, $v1, $a0 -/* 893D1C 802412FC 24420001 */ addiu $v0, $v0, 1 -/* 893D20 80241300 14600002 */ bnez $v1, .L8024130C -/* 893D24 80241304 AE02007C */ sw $v0, 0x7c($s0) -/* 893D28 80241308 AE000070 */ sw $zero, 0x70($s0) -.L8024130C: -/* 893D2C 8024130C 8E020074 */ lw $v0, 0x74($s0) -/* 893D30 80241310 8E03009C */ lw $v1, 0x9c($s0) -/* 893D34 80241314 0043102A */ slt $v0, $v0, $v1 -/* 893D38 80241318 50400001 */ beql $v0, $zero, .L80241320 -/* 893D3C 8024131C AE000074 */ sw $zero, 0x74($s0) -.L80241320: -/* 893D40 80241320 8E020078 */ lw $v0, 0x78($s0) -/* 893D44 80241324 8E0300A0 */ lw $v1, 0xa0($s0) -/* 893D48 80241328 0043102A */ slt $v0, $v0, $v1 -/* 893D4C 8024132C 50400001 */ beql $v0, $zero, .L80241334 -/* 893D50 80241330 AE000078 */ sw $zero, 0x78($s0) -.L80241334: -/* 893D54 80241334 8E02007C */ lw $v0, 0x7c($s0) -/* 893D58 80241338 8E0300A4 */ lw $v1, 0xa4($s0) -/* 893D5C 8024133C 0043102A */ slt $v0, $v0, $v1 -/* 893D60 80241340 50400001 */ beql $v0, $zero, .L80241348 -/* 893D64 80241344 AE00007C */ sw $zero, 0x7c($s0) -.L80241348: -/* 893D68 80241348 8FBF0014 */ lw $ra, 0x14($sp) -/* 893D6C 8024134C 8FB00010 */ lw $s0, 0x10($sp) -/* 893D70 80241350 0000102D */ daddu $v0, $zero, $zero -/* 893D74 80241354 03E00008 */ jr $ra -/* 893D78 80241358 27BD0018 */ addiu $sp, $sp, 0x18 -/* 893D7C 8024135C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174_893B94.s b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174_893B94.s new file mode 100644 index 0000000000..a69748dfc2 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_17/893790/func_80241174_893B94.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241174_893B94 +/* 893B94 80241174 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 893B98 80241178 AFB00010 */ sw $s0, 0x10($sp) +/* 893B9C 8024117C 0080802D */ daddu $s0, $a0, $zero +/* 893BA0 80241180 10A00005 */ beqz $a1, .L80241198 +/* 893BA4 80241184 AFBF0014 */ sw $ra, 0x14($sp) +/* 893BA8 80241188 AE000070 */ sw $zero, 0x70($s0) +/* 893BAC 8024118C AE000074 */ sw $zero, 0x74($s0) +/* 893BB0 80241190 AE000078 */ sw $zero, 0x78($s0) +/* 893BB4 80241194 AE00007C */ sw $zero, 0x7c($s0) +.L80241198: +/* 893BB8 80241198 8E020070 */ lw $v0, 0x70($s0) +/* 893BBC 8024119C 1440000E */ bnez $v0, .L802411D8 +/* 893BC0 802411A0 00000000 */ nop +/* 893BC4 802411A4 8E0300A8 */ lw $v1, 0xa8($s0) +/* 893BC8 802411A8 8E020088 */ lw $v0, 0x88($s0) +/* 893BCC 802411AC 00621821 */ addu $v1, $v1, $v0 +/* 893BD0 802411B0 04610004 */ bgez $v1, .L802411C4 +/* 893BD4 802411B4 AE0300A8 */ sw $v1, 0xa8($s0) +/* 893BD8 802411B8 3C020002 */ lui $v0, 2 +/* 893BDC 802411BC 08090475 */ j .L802411D4 +/* 893BE0 802411C0 00621021 */ addu $v0, $v1, $v0 +.L802411C4: +/* 893BE4 802411C4 3C040002 */ lui $a0, 2 +/* 893BE8 802411C8 0083102A */ slt $v0, $a0, $v1 +/* 893BEC 802411CC 10400002 */ beqz $v0, .L802411D8 +/* 893BF0 802411D0 00641023 */ subu $v0, $v1, $a0 +.L802411D4: +/* 893BF4 802411D4 AE0200A8 */ sw $v0, 0xa8($s0) +.L802411D8: +/* 893BF8 802411D8 8E020074 */ lw $v0, 0x74($s0) +/* 893BFC 802411DC 1440000E */ bnez $v0, .L80241218 +/* 893C00 802411E0 00000000 */ nop +/* 893C04 802411E4 8E0300AC */ lw $v1, 0xac($s0) +/* 893C08 802411E8 8E02008C */ lw $v0, 0x8c($s0) +/* 893C0C 802411EC 00621821 */ addu $v1, $v1, $v0 +/* 893C10 802411F0 04610004 */ bgez $v1, .L80241204 +/* 893C14 802411F4 AE0300AC */ sw $v1, 0xac($s0) +/* 893C18 802411F8 3C020002 */ lui $v0, 2 +/* 893C1C 802411FC 08090485 */ j .L80241214 +/* 893C20 80241200 00621021 */ addu $v0, $v1, $v0 +.L80241204: +/* 893C24 80241204 3C040002 */ lui $a0, 2 +/* 893C28 80241208 0083102A */ slt $v0, $a0, $v1 +/* 893C2C 8024120C 10400002 */ beqz $v0, .L80241218 +/* 893C30 80241210 00641023 */ subu $v0, $v1, $a0 +.L80241214: +/* 893C34 80241214 AE0200AC */ sw $v0, 0xac($s0) +.L80241218: +/* 893C38 80241218 8E020078 */ lw $v0, 0x78($s0) +/* 893C3C 8024121C 1440000E */ bnez $v0, .L80241258 +/* 893C40 80241220 00000000 */ nop +/* 893C44 80241224 8E0300B0 */ lw $v1, 0xb0($s0) +/* 893C48 80241228 8E020090 */ lw $v0, 0x90($s0) +/* 893C4C 8024122C 00621821 */ addu $v1, $v1, $v0 +/* 893C50 80241230 04610004 */ bgez $v1, .L80241244 +/* 893C54 80241234 AE0300B0 */ sw $v1, 0xb0($s0) +/* 893C58 80241238 3C020002 */ lui $v0, 2 +/* 893C5C 8024123C 08090495 */ j .L80241254 +/* 893C60 80241240 00621021 */ addu $v0, $v1, $v0 +.L80241244: +/* 893C64 80241244 3C040002 */ lui $a0, 2 +/* 893C68 80241248 0083102A */ slt $v0, $a0, $v1 +/* 893C6C 8024124C 10400002 */ beqz $v0, .L80241258 +/* 893C70 80241250 00641023 */ subu $v0, $v1, $a0 +.L80241254: +/* 893C74 80241254 AE0200B0 */ sw $v0, 0xb0($s0) +.L80241258: +/* 893C78 80241258 8E02007C */ lw $v0, 0x7c($s0) +/* 893C7C 8024125C 1440000E */ bnez $v0, .L80241298 +/* 893C80 80241260 00000000 */ nop +/* 893C84 80241264 8E0300B4 */ lw $v1, 0xb4($s0) +/* 893C88 80241268 8E020094 */ lw $v0, 0x94($s0) +/* 893C8C 8024126C 00621821 */ addu $v1, $v1, $v0 +/* 893C90 80241270 04610004 */ bgez $v1, .L80241284 +/* 893C94 80241274 AE0300B4 */ sw $v1, 0xb4($s0) +/* 893C98 80241278 3C020002 */ lui $v0, 2 +/* 893C9C 8024127C 080904A5 */ j .L80241294 +/* 893CA0 80241280 00621021 */ addu $v0, $v1, $v0 +.L80241284: +/* 893CA4 80241284 3C040002 */ lui $a0, 2 +/* 893CA8 80241288 0083102A */ slt $v0, $a0, $v1 +/* 893CAC 8024128C 10400002 */ beqz $v0, .L80241298 +/* 893CB0 80241290 00641023 */ subu $v0, $v1, $a0 +.L80241294: +/* 893CB4 80241294 AE0200B4 */ sw $v0, 0xb4($s0) +.L80241298: +/* 893CB8 80241298 8E040084 */ lw $a0, 0x84($s0) +/* 893CBC 8024129C 0C046F07 */ jal set_main_pan_u +/* 893CC0 802412A0 8E0500A8 */ lw $a1, 0xa8($s0) +/* 893CC4 802412A4 8E040084 */ lw $a0, 0x84($s0) +/* 893CC8 802412A8 0C046F0D */ jal set_main_pan_v +/* 893CCC 802412AC 8E0500AC */ lw $a1, 0xac($s0) +/* 893CD0 802412B0 8E040084 */ lw $a0, 0x84($s0) +/* 893CD4 802412B4 0C046F13 */ jal set_aux_pan_u +/* 893CD8 802412B8 8E0500B0 */ lw $a1, 0xb0($s0) +/* 893CDC 802412BC 8E040084 */ lw $a0, 0x84($s0) +/* 893CE0 802412C0 0C046F19 */ jal set_aux_pan_v +/* 893CE4 802412C4 8E0500B4 */ lw $a1, 0xb4($s0) +/* 893CE8 802412C8 8E020070 */ lw $v0, 0x70($s0) +/* 893CEC 802412CC 8E030078 */ lw $v1, 0x78($s0) +/* 893CF0 802412D0 8E040098 */ lw $a0, 0x98($s0) +/* 893CF4 802412D4 24420001 */ addiu $v0, $v0, 1 +/* 893CF8 802412D8 AE020070 */ sw $v0, 0x70($s0) +/* 893CFC 802412DC 8E020074 */ lw $v0, 0x74($s0) +/* 893D00 802412E0 24630001 */ addiu $v1, $v1, 1 +/* 893D04 802412E4 AE030078 */ sw $v1, 0x78($s0) +/* 893D08 802412E8 8E030070 */ lw $v1, 0x70($s0) +/* 893D0C 802412EC 24420001 */ addiu $v0, $v0, 1 +/* 893D10 802412F0 AE020074 */ sw $v0, 0x74($s0) +/* 893D14 802412F4 8E02007C */ lw $v0, 0x7c($s0) +/* 893D18 802412F8 0064182A */ slt $v1, $v1, $a0 +/* 893D1C 802412FC 24420001 */ addiu $v0, $v0, 1 +/* 893D20 80241300 14600002 */ bnez $v1, .L8024130C +/* 893D24 80241304 AE02007C */ sw $v0, 0x7c($s0) +/* 893D28 80241308 AE000070 */ sw $zero, 0x70($s0) +.L8024130C: +/* 893D2C 8024130C 8E020074 */ lw $v0, 0x74($s0) +/* 893D30 80241310 8E03009C */ lw $v1, 0x9c($s0) +/* 893D34 80241314 0043102A */ slt $v0, $v0, $v1 +/* 893D38 80241318 50400001 */ beql $v0, $zero, .L80241320 +/* 893D3C 8024131C AE000074 */ sw $zero, 0x74($s0) +.L80241320: +/* 893D40 80241320 8E020078 */ lw $v0, 0x78($s0) +/* 893D44 80241324 8E0300A0 */ lw $v1, 0xa0($s0) +/* 893D48 80241328 0043102A */ slt $v0, $v0, $v1 +/* 893D4C 8024132C 50400001 */ beql $v0, $zero, .L80241334 +/* 893D50 80241330 AE000078 */ sw $zero, 0x78($s0) +.L80241334: +/* 893D54 80241334 8E02007C */ lw $v0, 0x7c($s0) +/* 893D58 80241338 8E0300A4 */ lw $v1, 0xa4($s0) +/* 893D5C 8024133C 0043102A */ slt $v0, $v0, $v1 +/* 893D60 80241340 50400001 */ beql $v0, $zero, .L80241348 +/* 893D64 80241344 AE00007C */ sw $zero, 0x7c($s0) +.L80241348: +/* 893D68 80241348 8FBF0014 */ lw $ra, 0x14($sp) +/* 893D6C 8024134C 8FB00010 */ lw $s0, 0x10($sp) +/* 893D70 80241350 0000102D */ daddu $v0, $zero, $zero +/* 893D74 80241354 03E00008 */ jr $ra +/* 893D78 80241358 27BD0018 */ addiu $sp, $sp, 0x18 +/* 893D7C 8024135C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C.s deleted file mode 100644 index 78e87b549b..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024060C -/* 897BEC 8024060C 3C02800A */ lui $v0, %hi(D_8009A650) -/* 897BF0 80240610 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) -/* 897BF4 80240614 8C430000 */ lw $v1, ($v0) -/* 897BF8 80240618 2404FFBF */ addiu $a0, $zero, -0x41 -/* 897BFC 8024061C 00641824 */ and $v1, $v1, $a0 -/* 897C00 80240620 AC430000 */ sw $v1, ($v0) -/* 897C04 80240624 03E00008 */ jr $ra -/* 897C08 80240628 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C_897BEC.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C_897BEC.s new file mode 100644 index 0000000000..4bdd158001 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024060C_897BEC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024060C_897BEC +/* 897BEC 8024060C 3C02800A */ lui $v0, %hi(D_8009A650) +/* 897BF0 80240610 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) +/* 897BF4 80240614 8C430000 */ lw $v1, ($v0) +/* 897BF8 80240618 2404FFBF */ addiu $a0, $zero, -0x41 +/* 897BFC 8024061C 00641824 */ and $v1, $v1, $a0 +/* 897C00 80240620 AC430000 */ sw $v1, ($v0) +/* 897C04 80240624 03E00008 */ jr $ra +/* 897C08 80240628 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024062C.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024062C.s deleted file mode 100644 index 978d2783e2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024062C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024062C -/* 897C0C 8024062C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 897C10 80240630 AFBF0010 */ sw $ra, 0x10($sp) -/* 897C14 80240634 8C82000C */ lw $v0, 0xc($a0) -/* 897C18 80240638 0C0B1EAF */ jal get_variable -/* 897C1C 8024063C 8C450000 */ lw $a1, ($v0) -/* 897C20 80240640 0C0B95A4 */ jal func_802E5690 -/* 897C24 80240644 0040202D */ daddu $a0, $v0, $zero -/* 897C28 80240648 8FBF0010 */ lw $ra, 0x10($sp) -/* 897C2C 8024064C 24020002 */ addiu $v0, $zero, 2 -/* 897C30 80240650 03E00008 */ jr $ra -/* 897C34 80240654 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024062C_897C0C.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024062C_897C0C.s new file mode 100644 index 0000000000..8f6a1caa3c --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_8024062C_897C0C.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024062C_897C0C +/* 897C0C 8024062C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 897C10 80240630 AFBF0010 */ sw $ra, 0x10($sp) +/* 897C14 80240634 8C82000C */ lw $v0, 0xc($a0) +/* 897C18 80240638 0C0B1EAF */ jal get_variable +/* 897C1C 8024063C 8C450000 */ lw $a1, ($v0) +/* 897C20 80240640 0C0B95A4 */ jal func_802E5690 +/* 897C24 80240644 0040202D */ daddu $a0, $v0, $zero +/* 897C28 80240648 8FBF0010 */ lw $ra, 0x10($sp) +/* 897C2C 8024064C 24020002 */ addiu $v0, $zero, 2 +/* 897C30 80240650 03E00008 */ jr $ra +/* 897C34 80240654 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4.s deleted file mode 100644 index f74f329206..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406C4 -/* 897CA4 802406C4 3C028011 */ lui $v0, %hi(gPlayerData) -/* 897CA8 802406C8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) -/* 897CAC 802406CC 000420C0 */ sll $a0, $a0, 3 -/* 897CB0 802406D0 00822021 */ addu $a0, $a0, $v0 -/* 897CB4 802406D4 90820014 */ lbu $v0, 0x14($a0) -/* 897CB8 802406D8 10400009 */ beqz $v0, .L80240700 -/* 897CBC 802406DC 00000000 */ nop -/* 897CC0 802406E0 90820015 */ lbu $v0, 0x15($a0) -/* 897CC4 802406E4 00022600 */ sll $a0, $v0, 0x18 -/* 897CC8 802406E8 00041E03 */ sra $v1, $a0, 0x18 -/* 897CCC 802406EC 00051400 */ sll $v0, $a1, 0x10 -/* 897CD0 802406F0 00021403 */ sra $v0, $v0, 0x10 -/* 897CD4 802406F4 0043102A */ slt $v0, $v0, $v1 -/* 897CD8 802406F8 10400003 */ beqz $v0, .L80240708 -/* 897CDC 802406FC 00000000 */ nop -.L80240700: -/* 897CE0 80240700 03E00008 */ jr $ra -/* 897CE4 80240704 2402FFFF */ addiu $v0, $zero, -1 -.L80240708: -/* 897CE8 80240708 03E00008 */ jr $ra -/* 897CEC 8024070C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s new file mode 100644 index 0000000000..69a8449650 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802406C4_897CA4.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406C4_897CA4 +/* 897CA4 802406C4 3C028011 */ lui $v0, %hi(gPlayerData) +/* 897CA8 802406C8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) +/* 897CAC 802406CC 000420C0 */ sll $a0, $a0, 3 +/* 897CB0 802406D0 00822021 */ addu $a0, $a0, $v0 +/* 897CB4 802406D4 90820014 */ lbu $v0, 0x14($a0) +/* 897CB8 802406D8 10400009 */ beqz $v0, .L80240700 +/* 897CBC 802406DC 00000000 */ nop +/* 897CC0 802406E0 90820015 */ lbu $v0, 0x15($a0) +/* 897CC4 802406E4 00022600 */ sll $a0, $v0, 0x18 +/* 897CC8 802406E8 00041E03 */ sra $v1, $a0, 0x18 +/* 897CCC 802406EC 00051400 */ sll $v0, $a1, 0x10 +/* 897CD0 802406F0 00021403 */ sra $v0, $v0, 0x10 +/* 897CD4 802406F4 0043102A */ slt $v0, $v0, $v1 +/* 897CD8 802406F8 10400003 */ beqz $v0, .L80240708 +/* 897CDC 802406FC 00000000 */ nop +.L80240700: +/* 897CE0 80240700 03E00008 */ jr $ra +/* 897CE4 80240704 2402FFFF */ addiu $v0, $zero, -1 +.L80240708: +/* 897CE8 80240708 03E00008 */ jr $ra +/* 897CEC 8024070C 00041603 */ sra $v0, $a0, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710.s deleted file mode 100644 index e8a387f5d4..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240710 -/* 897CF0 80240710 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 897CF4 80240714 AFB3001C */ sw $s3, 0x1c($sp) -/* 897CF8 80240718 0080982D */ daddu $s3, $a0, $zero -/* 897CFC 8024071C AFB00010 */ sw $s0, 0x10($sp) -/* 897D00 80240720 24100001 */ addiu $s0, $zero, 1 -/* 897D04 80240724 AFB40020 */ sw $s4, 0x20($sp) -/* 897D08 80240728 2414FFFF */ addiu $s4, $zero, -1 -/* 897D0C 8024072C AFB50024 */ sw $s5, 0x24($sp) -/* 897D10 80240730 0200A82D */ daddu $s5, $s0, $zero -/* 897D14 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* 897D18 80240738 3C118011 */ lui $s1, 0x8011 -/* 897D1C 8024073C 2631F298 */ addiu $s1, $s1, -0xd68 -/* 897D20 80240740 AFBF0028 */ sw $ra, 0x28($sp) -/* 897D24 80240744 AFB20018 */ sw $s2, 0x18($sp) -/* 897D28 80240748 8E6200B4 */ lw $v0, 0xb4($s3) -/* 897D2C 8024074C 0280182D */ daddu $v1, $s4, $zero -/* 897D30 80240750 AE630084 */ sw $v1, 0x84($s3) -/* 897D34 80240754 00021027 */ nor $v0, $zero, $v0 -/* 897D38 80240758 000217C2 */ srl $v0, $v0, 0x1f -/* 897D3C 8024075C 00029400 */ sll $s2, $v0, 0x10 -.L80240760: -/* 897D40 80240760 92220014 */ lbu $v0, 0x14($s1) -/* 897D44 80240764 50400008 */ beql $v0, $zero, .L80240788 -/* 897D48 80240768 26100001 */ addiu $s0, $s0, 1 -/* 897D4C 8024076C 0200202D */ daddu $a0, $s0, $zero -/* 897D50 80240770 0C0901B1 */ jal func_802406C4 -/* 897D54 80240774 00122C03 */ sra $a1, $s2, 0x10 -/* 897D58 80240778 10540003 */ beq $v0, $s4, .L80240788 -/* 897D5C 8024077C 26100001 */ addiu $s0, $s0, 1 -/* 897D60 80240780 080901E5 */ j .L80240794 -/* 897D64 80240784 AE750084 */ sw $s5, 0x84($s3) -.L80240788: -/* 897D68 80240788 2A02000C */ slti $v0, $s0, 0xc -/* 897D6C 8024078C 1440FFF4 */ bnez $v0, .L80240760 -/* 897D70 80240790 26310008 */ addiu $s1, $s1, 8 -.L80240794: -/* 897D74 80240794 8FBF0028 */ lw $ra, 0x28($sp) -/* 897D78 80240798 8FB50024 */ lw $s5, 0x24($sp) -/* 897D7C 8024079C 8FB40020 */ lw $s4, 0x20($sp) -/* 897D80 802407A0 8FB3001C */ lw $s3, 0x1c($sp) -/* 897D84 802407A4 8FB20018 */ lw $s2, 0x18($sp) -/* 897D88 802407A8 8FB10014 */ lw $s1, 0x14($sp) -/* 897D8C 802407AC 8FB00010 */ lw $s0, 0x10($sp) -/* 897D90 802407B0 24020002 */ addiu $v0, $zero, 2 -/* 897D94 802407B4 03E00008 */ jr $ra -/* 897D98 802407B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s new file mode 100644 index 0000000000..b4830cf40d --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s @@ -0,0 +1,50 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240710_897CF0 +/* 897CF0 80240710 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 897CF4 80240714 AFB3001C */ sw $s3, 0x1c($sp) +/* 897CF8 80240718 0080982D */ daddu $s3, $a0, $zero +/* 897CFC 8024071C AFB00010 */ sw $s0, 0x10($sp) +/* 897D00 80240720 24100001 */ addiu $s0, $zero, 1 +/* 897D04 80240724 AFB40020 */ sw $s4, 0x20($sp) +/* 897D08 80240728 2414FFFF */ addiu $s4, $zero, -1 +/* 897D0C 8024072C AFB50024 */ sw $s5, 0x24($sp) +/* 897D10 80240730 0200A82D */ daddu $s5, $s0, $zero +/* 897D14 80240734 AFB10014 */ sw $s1, 0x14($sp) +/* 897D18 80240738 3C118011 */ lui $s1, 0x8011 +/* 897D1C 8024073C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 897D20 80240740 AFBF0028 */ sw $ra, 0x28($sp) +/* 897D24 80240744 AFB20018 */ sw $s2, 0x18($sp) +/* 897D28 80240748 8E6200B4 */ lw $v0, 0xb4($s3) +/* 897D2C 8024074C 0280182D */ daddu $v1, $s4, $zero +/* 897D30 80240750 AE630084 */ sw $v1, 0x84($s3) +/* 897D34 80240754 00021027 */ nor $v0, $zero, $v0 +/* 897D38 80240758 000217C2 */ srl $v0, $v0, 0x1f +/* 897D3C 8024075C 00029400 */ sll $s2, $v0, 0x10 +.L80240760: +/* 897D40 80240760 92220014 */ lbu $v0, 0x14($s1) +/* 897D44 80240764 50400008 */ beql $v0, $zero, .L80240788 +/* 897D48 80240768 26100001 */ addiu $s0, $s0, 1 +/* 897D4C 8024076C 0200202D */ daddu $a0, $s0, $zero +/* 897D50 80240770 0C0901B1 */ jal func_802406C4_897CA4 +/* 897D54 80240774 00122C03 */ sra $a1, $s2, 0x10 +/* 897D58 80240778 10540003 */ beq $v0, $s4, .L80240788 +/* 897D5C 8024077C 26100001 */ addiu $s0, $s0, 1 +/* 897D60 80240780 080901E5 */ j .L80240794 +/* 897D64 80240784 AE750084 */ sw $s5, 0x84($s3) +.L80240788: +/* 897D68 80240788 2A02000C */ slti $v0, $s0, 0xc +/* 897D6C 8024078C 1440FFF4 */ bnez $v0, .L80240760 +/* 897D70 80240790 26310008 */ addiu $s1, $s1, 8 +.L80240794: +/* 897D74 80240794 8FBF0028 */ lw $ra, 0x28($sp) +/* 897D78 80240798 8FB50024 */ lw $s5, 0x24($sp) +/* 897D7C 8024079C 8FB40020 */ lw $s4, 0x20($sp) +/* 897D80 802407A0 8FB3001C */ lw $s3, 0x1c($sp) +/* 897D84 802407A4 8FB20018 */ lw $s2, 0x18($sp) +/* 897D88 802407A8 8FB10014 */ lw $s1, 0x14($sp) +/* 897D8C 802407AC 8FB00010 */ lw $s0, 0x10($sp) +/* 897D90 802407B0 24020002 */ addiu $v0, $zero, 2 +/* 897D94 802407B4 03E00008 */ jr $ra +/* 897D98 802407B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC.s deleted file mode 100644 index 98e5260129..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC.s +++ /dev/null @@ -1,163 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407BC -/* 897D9C 802407BC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 897DA0 802407C0 AFB5002C */ sw $s5, 0x2c($sp) -/* 897DA4 802407C4 0080A82D */ daddu $s5, $a0, $zero -/* 897DA8 802407C8 AFBE0038 */ sw $fp, 0x38($sp) -/* 897DAC 802407CC 3C1E8011 */ lui $fp, %hi(gPlayerData) -/* 897DB0 802407D0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) -/* 897DB4 802407D4 AFBF003C */ sw $ra, 0x3c($sp) -/* 897DB8 802407D8 AFB70034 */ sw $s7, 0x34($sp) -/* 897DBC 802407DC AFB60030 */ sw $s6, 0x30($sp) -/* 897DC0 802407E0 AFB40028 */ sw $s4, 0x28($sp) -/* 897DC4 802407E4 AFB30024 */ sw $s3, 0x24($sp) -/* 897DC8 802407E8 AFB20020 */ sw $s2, 0x20($sp) -/* 897DCC 802407EC AFB1001C */ sw $s1, 0x1c($sp) -/* 897DD0 802407F0 10A0004F */ beqz $a1, .L80240930 -/* 897DD4 802407F4 AFB00018 */ sw $s0, 0x18($sp) -/* 897DD8 802407F8 0C00AB39 */ jal heap_malloc -/* 897DDC 802407FC 24040330 */ addiu $a0, $zero, 0x330 -/* 897DE0 80240800 0040982D */ daddu $s3, $v0, $zero -/* 897DE4 80240804 0000B02D */ daddu $s6, $zero, $zero -/* 897DE8 80240808 02C0902D */ daddu $s2, $s6, $zero -/* 897DEC 8024080C 3C148024 */ lui $s4, 0x8024 -/* 897DF0 80240810 269426B8 */ addiu $s4, $s4, 0x26b8 -/* 897DF4 80240814 0260882D */ daddu $s1, $s3, $zero -/* 897DF8 80240818 8EA200B4 */ lw $v0, 0xb4($s5) -/* 897DFC 8024081C 3C038024 */ lui $v1, 0x8024 -/* 897E00 80240820 246326B0 */ addiu $v1, $v1, 0x26b0 -/* 897E04 80240824 AEB30078 */ sw $s3, 0x78($s5) -/* 897E08 80240828 00021027 */ nor $v0, $zero, $v0 -/* 897E0C 8024082C 0002BFC2 */ srl $s7, $v0, 0x1f -/* 897E10 80240830 00171080 */ sll $v0, $s7, 2 -/* 897E14 80240834 00431021 */ addu $v0, $v0, $v1 -/* 897E18 80240838 AFA20010 */ sw $v0, 0x10($sp) -.L8024083C: -/* 897E1C 8024083C 86900000 */ lh $s0, ($s4) -/* 897E20 80240840 001010C0 */ sll $v0, $s0, 3 -/* 897E24 80240844 03C21021 */ addu $v0, $fp, $v0 -/* 897E28 80240848 90420014 */ lbu $v0, 0x14($v0) -/* 897E2C 8024084C 5040002E */ beql $v0, $zero, .L80240908 -/* 897E30 80240850 26520001 */ addiu $s2, $s2, 1 -/* 897E34 80240854 00101100 */ sll $v0, $s0, 4 -/* 897E38 80240858 3C068009 */ lui $a2, 0x8009 -/* 897E3C 8024085C 24C6EF20 */ addiu $a2, $a2, -0x10e0 -/* 897E40 80240860 00461021 */ addu $v0, $v0, $a2 -/* 897E44 80240864 0200202D */ daddu $a0, $s0, $zero -/* 897E48 80240868 AE300108 */ sw $s0, 0x108($s1) -/* 897E4C 8024086C 8C420000 */ lw $v0, ($v0) -/* 897E50 80240870 02E0282D */ daddu $a1, $s7, $zero -/* 897E54 80240874 0C0901B1 */ jal func_802406C4 -/* 897E58 80240878 AE220084 */ sw $v0, 0x84($s1) -/* 897E5C 8024087C 0040202D */ daddu $a0, $v0, $zero -/* 897E60 80240880 04800011 */ bltz $a0, .L802408C8 -/* 897E64 80240884 00101080 */ sll $v0, $s0, 2 -/* 897E68 80240888 3C06800F */ lui $a2, 0x800f -/* 897E6C 8024088C 24C67F00 */ addiu $a2, $a2, 0x7f00 -/* 897E70 80240890 00461021 */ addu $v0, $v0, $a2 -/* 897E74 80240894 8C430000 */ lw $v1, ($v0) -/* 897E78 80240898 24020001 */ addiu $v0, $zero, 1 -/* 897E7C 8024089C AE22018C */ sw $v0, 0x18c($s1) -/* 897E80 802408A0 00041080 */ sll $v0, $a0, 2 -/* 897E84 802408A4 3C068024 */ lui $a2, 0x8024 -/* 897E88 802408A8 24C626C8 */ addiu $a2, $a2, 0x26c8 -/* 897E8C 802408AC AE230000 */ sw $v1, ($s1) -/* 897E90 802408B0 001218C0 */ sll $v1, $s2, 3 -/* 897E94 802408B4 00431021 */ addu $v0, $v0, $v1 -/* 897E98 802408B8 00461021 */ addu $v0, $v0, $a2 -/* 897E9C 802408BC 8C420000 */ lw $v0, ($v0) -/* 897EA0 802408C0 0809023B */ j .L802408EC -/* 897EA4 802408C4 AE220294 */ sw $v0, 0x294($s1) -.L802408C8: -/* 897EA8 802408C8 3C06800F */ lui $a2, 0x800f -/* 897EAC 802408CC 24C67F40 */ addiu $a2, $a2, 0x7f40 -/* 897EB0 802408D0 00461021 */ addu $v0, $v0, $a2 -/* 897EB4 802408D4 8C420000 */ lw $v0, ($v0) -/* 897EB8 802408D8 AE20018C */ sw $zero, 0x18c($s1) -/* 897EBC 802408DC AE220000 */ sw $v0, ($s1) -/* 897EC0 802408E0 8FA60010 */ lw $a2, 0x10($sp) -/* 897EC4 802408E4 8CC20000 */ lw $v0, ($a2) -/* 897EC8 802408E8 AE220294 */ sw $v0, 0x294($s1) -.L802408EC: -/* 897ECC 802408EC 001010C0 */ sll $v0, $s0, 3 -/* 897ED0 802408F0 03C21021 */ addu $v0, $fp, $v0 -/* 897ED4 802408F4 80420015 */ lb $v0, 0x15($v0) -/* 897ED8 802408F8 26D60001 */ addiu $s6, $s6, 1 -/* 897EDC 802408FC AE220210 */ sw $v0, 0x210($s1) -/* 897EE0 80240900 26310004 */ addiu $s1, $s1, 4 -/* 897EE4 80240904 26520001 */ addiu $s2, $s2, 1 -.L80240908: -/* 897EE8 80240908 2A420008 */ slti $v0, $s2, 8 -/* 897EEC 8024090C 1440FFCB */ bnez $v0, .L8024083C -/* 897EF0 80240910 26940002 */ addiu $s4, $s4, 2 -/* 897EF4 80240914 0260202D */ daddu $a0, $s3, $zero -/* 897EF8 80240918 24020004 */ addiu $v0, $zero, 4 -/* 897EFC 8024091C AC820318 */ sw $v0, 0x318($a0) -/* 897F00 80240920 AC960324 */ sw $s6, 0x324($a0) -/* 897F04 80240924 0C03D390 */ jal func_800F4E40 -/* 897F08 80240928 AC800328 */ sw $zero, 0x328($a0) -/* 897F0C 8024092C AEA00070 */ sw $zero, 0x70($s5) -.L80240930: -/* 897F10 80240930 8EA20070 */ lw $v0, 0x70($s5) -/* 897F14 80240934 8EB30078 */ lw $s3, 0x78($s5) -/* 897F18 80240938 14400008 */ bnez $v0, .L8024095C -/* 897F1C 8024093C 24420001 */ addiu $v0, $v0, 1 -/* 897F20 80240940 8662032C */ lh $v0, 0x32c($s3) -/* 897F24 80240944 10400009 */ beqz $v0, .L8024096C -/* 897F28 80240948 AEA20074 */ sw $v0, 0x74($s5) -/* 897F2C 8024094C 0C03C4EC */ jal func_800F13B0 -/* 897F30 80240950 00000000 */ nop -/* 897F34 80240954 8EA20070 */ lw $v0, 0x70($s5) -/* 897F38 80240958 24420001 */ addiu $v0, $v0, 1 -.L8024095C: -/* 897F3C 8024095C AEA20070 */ sw $v0, 0x70($s5) -/* 897F40 80240960 2842000F */ slti $v0, $v0, 0xf -/* 897F44 80240964 10400003 */ beqz $v0, .L80240974 -/* 897F48 80240968 00000000 */ nop -.L8024096C: -/* 897F4C 8024096C 08090277 */ j .L802409DC -/* 897F50 80240970 0000102D */ daddu $v0, $zero, $zero -.L80240974: -/* 897F54 80240974 0C03C54E */ jal func_800F1538 -/* 897F58 80240978 00000000 */ nop -/* 897F5C 8024097C 8EA30074 */ lw $v1, 0x74($s5) -/* 897F60 80240980 240200FF */ addiu $v0, $zero, 0xff -/* 897F64 80240984 10620010 */ beq $v1, $v0, .L802409C8 -/* 897F68 80240988 2462FFFF */ addiu $v0, $v1, -1 -/* 897F6C 8024098C 00021080 */ sll $v0, $v0, 2 -/* 897F70 80240990 02621021 */ addu $v0, $s3, $v0 -/* 897F74 80240994 8C420108 */ lw $v0, 0x108($v0) -/* 897F78 80240998 00021100 */ sll $v0, $v0, 4 -/* 897F7C 8024099C 3C038009 */ lui $v1, 0x8009 -/* 897F80 802409A0 00621821 */ addu $v1, $v1, $v0 -/* 897F84 802409A4 8C63EF20 */ lw $v1, -0x10e0($v1) -/* 897F88 802409A8 8EA20074 */ lw $v0, 0x74($s5) -/* 897F8C 802409AC 2442FFFF */ addiu $v0, $v0, -1 -/* 897F90 802409B0 00021080 */ sll $v0, $v0, 2 -/* 897F94 802409B4 02621021 */ addu $v0, $s3, $v0 -/* 897F98 802409B8 AEA30084 */ sw $v1, 0x84($s5) -/* 897F9C 802409BC 8C420108 */ lw $v0, 0x108($v0) -/* 897FA0 802409C0 08090274 */ j .L802409D0 -/* 897FA4 802409C4 AEA20088 */ sw $v0, 0x88($s5) -.L802409C8: -/* 897FA8 802409C8 2402FFFF */ addiu $v0, $zero, -1 -/* 897FAC 802409CC AEA20084 */ sw $v0, 0x84($s5) -.L802409D0: -/* 897FB0 802409D0 0C00AB4B */ jal heap_free -/* 897FB4 802409D4 8EA40078 */ lw $a0, 0x78($s5) -/* 897FB8 802409D8 24020002 */ addiu $v0, $zero, 2 -.L802409DC: -/* 897FBC 802409DC 8FBF003C */ lw $ra, 0x3c($sp) -/* 897FC0 802409E0 8FBE0038 */ lw $fp, 0x38($sp) -/* 897FC4 802409E4 8FB70034 */ lw $s7, 0x34($sp) -/* 897FC8 802409E8 8FB60030 */ lw $s6, 0x30($sp) -/* 897FCC 802409EC 8FB5002C */ lw $s5, 0x2c($sp) -/* 897FD0 802409F0 8FB40028 */ lw $s4, 0x28($sp) -/* 897FD4 802409F4 8FB30024 */ lw $s3, 0x24($sp) -/* 897FD8 802409F8 8FB20020 */ lw $s2, 0x20($sp) -/* 897FDC 802409FC 8FB1001C */ lw $s1, 0x1c($sp) -/* 897FE0 80240A00 8FB00018 */ lw $s0, 0x18($sp) -/* 897FE4 80240A04 03E00008 */ jr $ra -/* 897FE8 80240A08 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s new file mode 100644 index 0000000000..cebe10267e --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_802407BC_897D9C.s @@ -0,0 +1,163 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407BC_897D9C +/* 897D9C 802407BC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 897DA0 802407C0 AFB5002C */ sw $s5, 0x2c($sp) +/* 897DA4 802407C4 0080A82D */ daddu $s5, $a0, $zero +/* 897DA8 802407C8 AFBE0038 */ sw $fp, 0x38($sp) +/* 897DAC 802407CC 3C1E8011 */ lui $fp, %hi(gPlayerData) +/* 897DB0 802407D0 27DEF290 */ addiu $fp, $fp, %lo(gPlayerData) +/* 897DB4 802407D4 AFBF003C */ sw $ra, 0x3c($sp) +/* 897DB8 802407D8 AFB70034 */ sw $s7, 0x34($sp) +/* 897DBC 802407DC AFB60030 */ sw $s6, 0x30($sp) +/* 897DC0 802407E0 AFB40028 */ sw $s4, 0x28($sp) +/* 897DC4 802407E4 AFB30024 */ sw $s3, 0x24($sp) +/* 897DC8 802407E8 AFB20020 */ sw $s2, 0x20($sp) +/* 897DCC 802407EC AFB1001C */ sw $s1, 0x1c($sp) +/* 897DD0 802407F0 10A0004F */ beqz $a1, .L80240930 +/* 897DD4 802407F4 AFB00018 */ sw $s0, 0x18($sp) +/* 897DD8 802407F8 0C00AB39 */ jal heap_malloc +/* 897DDC 802407FC 24040330 */ addiu $a0, $zero, 0x330 +/* 897DE0 80240800 0040982D */ daddu $s3, $v0, $zero +/* 897DE4 80240804 0000B02D */ daddu $s6, $zero, $zero +/* 897DE8 80240808 02C0902D */ daddu $s2, $s6, $zero +/* 897DEC 8024080C 3C148024 */ lui $s4, 0x8024 +/* 897DF0 80240810 269426B8 */ addiu $s4, $s4, 0x26b8 +/* 897DF4 80240814 0260882D */ daddu $s1, $s3, $zero +/* 897DF8 80240818 8EA200B4 */ lw $v0, 0xb4($s5) +/* 897DFC 8024081C 3C038024 */ lui $v1, 0x8024 +/* 897E00 80240820 246326B0 */ addiu $v1, $v1, 0x26b0 +/* 897E04 80240824 AEB30078 */ sw $s3, 0x78($s5) +/* 897E08 80240828 00021027 */ nor $v0, $zero, $v0 +/* 897E0C 8024082C 0002BFC2 */ srl $s7, $v0, 0x1f +/* 897E10 80240830 00171080 */ sll $v0, $s7, 2 +/* 897E14 80240834 00431021 */ addu $v0, $v0, $v1 +/* 897E18 80240838 AFA20010 */ sw $v0, 0x10($sp) +.L8024083C: +/* 897E1C 8024083C 86900000 */ lh $s0, ($s4) +/* 897E20 80240840 001010C0 */ sll $v0, $s0, 3 +/* 897E24 80240844 03C21021 */ addu $v0, $fp, $v0 +/* 897E28 80240848 90420014 */ lbu $v0, 0x14($v0) +/* 897E2C 8024084C 5040002E */ beql $v0, $zero, .L80240908 +/* 897E30 80240850 26520001 */ addiu $s2, $s2, 1 +/* 897E34 80240854 00101100 */ sll $v0, $s0, 4 +/* 897E38 80240858 3C068009 */ lui $a2, 0x8009 +/* 897E3C 8024085C 24C6EF20 */ addiu $a2, $a2, -0x10e0 +/* 897E40 80240860 00461021 */ addu $v0, $v0, $a2 +/* 897E44 80240864 0200202D */ daddu $a0, $s0, $zero +/* 897E48 80240868 AE300108 */ sw $s0, 0x108($s1) +/* 897E4C 8024086C 8C420000 */ lw $v0, ($v0) +/* 897E50 80240870 02E0282D */ daddu $a1, $s7, $zero +/* 897E54 80240874 0C0901B1 */ jal func_802406C4_897CA4 +/* 897E58 80240878 AE220084 */ sw $v0, 0x84($s1) +/* 897E5C 8024087C 0040202D */ daddu $a0, $v0, $zero +/* 897E60 80240880 04800011 */ bltz $a0, .L802408C8 +/* 897E64 80240884 00101080 */ sll $v0, $s0, 2 +/* 897E68 80240888 3C06800F */ lui $a2, 0x800f +/* 897E6C 8024088C 24C67F00 */ addiu $a2, $a2, 0x7f00 +/* 897E70 80240890 00461021 */ addu $v0, $v0, $a2 +/* 897E74 80240894 8C430000 */ lw $v1, ($v0) +/* 897E78 80240898 24020001 */ addiu $v0, $zero, 1 +/* 897E7C 8024089C AE22018C */ sw $v0, 0x18c($s1) +/* 897E80 802408A0 00041080 */ sll $v0, $a0, 2 +/* 897E84 802408A4 3C068024 */ lui $a2, 0x8024 +/* 897E88 802408A8 24C626C8 */ addiu $a2, $a2, 0x26c8 +/* 897E8C 802408AC AE230000 */ sw $v1, ($s1) +/* 897E90 802408B0 001218C0 */ sll $v1, $s2, 3 +/* 897E94 802408B4 00431021 */ addu $v0, $v0, $v1 +/* 897E98 802408B8 00461021 */ addu $v0, $v0, $a2 +/* 897E9C 802408BC 8C420000 */ lw $v0, ($v0) +/* 897EA0 802408C0 0809023B */ j .L802408EC +/* 897EA4 802408C4 AE220294 */ sw $v0, 0x294($s1) +.L802408C8: +/* 897EA8 802408C8 3C06800F */ lui $a2, 0x800f +/* 897EAC 802408CC 24C67F40 */ addiu $a2, $a2, 0x7f40 +/* 897EB0 802408D0 00461021 */ addu $v0, $v0, $a2 +/* 897EB4 802408D4 8C420000 */ lw $v0, ($v0) +/* 897EB8 802408D8 AE20018C */ sw $zero, 0x18c($s1) +/* 897EBC 802408DC AE220000 */ sw $v0, ($s1) +/* 897EC0 802408E0 8FA60010 */ lw $a2, 0x10($sp) +/* 897EC4 802408E4 8CC20000 */ lw $v0, ($a2) +/* 897EC8 802408E8 AE220294 */ sw $v0, 0x294($s1) +.L802408EC: +/* 897ECC 802408EC 001010C0 */ sll $v0, $s0, 3 +/* 897ED0 802408F0 03C21021 */ addu $v0, $fp, $v0 +/* 897ED4 802408F4 80420015 */ lb $v0, 0x15($v0) +/* 897ED8 802408F8 26D60001 */ addiu $s6, $s6, 1 +/* 897EDC 802408FC AE220210 */ sw $v0, 0x210($s1) +/* 897EE0 80240900 26310004 */ addiu $s1, $s1, 4 +/* 897EE4 80240904 26520001 */ addiu $s2, $s2, 1 +.L80240908: +/* 897EE8 80240908 2A420008 */ slti $v0, $s2, 8 +/* 897EEC 8024090C 1440FFCB */ bnez $v0, .L8024083C +/* 897EF0 80240910 26940002 */ addiu $s4, $s4, 2 +/* 897EF4 80240914 0260202D */ daddu $a0, $s3, $zero +/* 897EF8 80240918 24020004 */ addiu $v0, $zero, 4 +/* 897EFC 8024091C AC820318 */ sw $v0, 0x318($a0) +/* 897F00 80240920 AC960324 */ sw $s6, 0x324($a0) +/* 897F04 80240924 0C03D390 */ jal func_800F4E40 +/* 897F08 80240928 AC800328 */ sw $zero, 0x328($a0) +/* 897F0C 8024092C AEA00070 */ sw $zero, 0x70($s5) +.L80240930: +/* 897F10 80240930 8EA20070 */ lw $v0, 0x70($s5) +/* 897F14 80240934 8EB30078 */ lw $s3, 0x78($s5) +/* 897F18 80240938 14400008 */ bnez $v0, .L8024095C +/* 897F1C 8024093C 24420001 */ addiu $v0, $v0, 1 +/* 897F20 80240940 8662032C */ lh $v0, 0x32c($s3) +/* 897F24 80240944 10400009 */ beqz $v0, .L8024096C +/* 897F28 80240948 AEA20074 */ sw $v0, 0x74($s5) +/* 897F2C 8024094C 0C03C4EC */ jal func_800F13B0 +/* 897F30 80240950 00000000 */ nop +/* 897F34 80240954 8EA20070 */ lw $v0, 0x70($s5) +/* 897F38 80240958 24420001 */ addiu $v0, $v0, 1 +.L8024095C: +/* 897F3C 8024095C AEA20070 */ sw $v0, 0x70($s5) +/* 897F40 80240960 2842000F */ slti $v0, $v0, 0xf +/* 897F44 80240964 10400003 */ beqz $v0, .L80240974 +/* 897F48 80240968 00000000 */ nop +.L8024096C: +/* 897F4C 8024096C 08090277 */ j .L802409DC +/* 897F50 80240970 0000102D */ daddu $v0, $zero, $zero +.L80240974: +/* 897F54 80240974 0C03C54E */ jal func_800F1538 +/* 897F58 80240978 00000000 */ nop +/* 897F5C 8024097C 8EA30074 */ lw $v1, 0x74($s5) +/* 897F60 80240980 240200FF */ addiu $v0, $zero, 0xff +/* 897F64 80240984 10620010 */ beq $v1, $v0, .L802409C8 +/* 897F68 80240988 2462FFFF */ addiu $v0, $v1, -1 +/* 897F6C 8024098C 00021080 */ sll $v0, $v0, 2 +/* 897F70 80240990 02621021 */ addu $v0, $s3, $v0 +/* 897F74 80240994 8C420108 */ lw $v0, 0x108($v0) +/* 897F78 80240998 00021100 */ sll $v0, $v0, 4 +/* 897F7C 8024099C 3C038009 */ lui $v1, 0x8009 +/* 897F80 802409A0 00621821 */ addu $v1, $v1, $v0 +/* 897F84 802409A4 8C63EF20 */ lw $v1, -0x10e0($v1) +/* 897F88 802409A8 8EA20074 */ lw $v0, 0x74($s5) +/* 897F8C 802409AC 2442FFFF */ addiu $v0, $v0, -1 +/* 897F90 802409B0 00021080 */ sll $v0, $v0, 2 +/* 897F94 802409B4 02621021 */ addu $v0, $s3, $v0 +/* 897F98 802409B8 AEA30084 */ sw $v1, 0x84($s5) +/* 897F9C 802409BC 8C420108 */ lw $v0, 0x108($v0) +/* 897FA0 802409C0 08090274 */ j .L802409D0 +/* 897FA4 802409C4 AEA20088 */ sw $v0, 0x88($s5) +.L802409C8: +/* 897FA8 802409C8 2402FFFF */ addiu $v0, $zero, -1 +/* 897FAC 802409CC AEA20084 */ sw $v0, 0x84($s5) +.L802409D0: +/* 897FB0 802409D0 0C00AB4B */ jal heap_free +/* 897FB4 802409D4 8EA40078 */ lw $a0, 0x78($s5) +/* 897FB8 802409D8 24020002 */ addiu $v0, $zero, 2 +.L802409DC: +/* 897FBC 802409DC 8FBF003C */ lw $ra, 0x3c($sp) +/* 897FC0 802409E0 8FBE0038 */ lw $fp, 0x38($sp) +/* 897FC4 802409E4 8FB70034 */ lw $s7, 0x34($sp) +/* 897FC8 802409E8 8FB60030 */ lw $s6, 0x30($sp) +/* 897FCC 802409EC 8FB5002C */ lw $s5, 0x2c($sp) +/* 897FD0 802409F0 8FB40028 */ lw $s4, 0x28($sp) +/* 897FD4 802409F4 8FB30024 */ lw $s3, 0x24($sp) +/* 897FD8 802409F8 8FB20020 */ lw $s2, 0x20($sp) +/* 897FDC 802409FC 8FB1001C */ lw $s1, 0x1c($sp) +/* 897FE0 80240A00 8FB00018 */ lw $s0, 0x18($sp) +/* 897FE4 80240A04 03E00008 */ jr $ra +/* 897FE8 80240A08 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C.s deleted file mode 100644 index 9b72771167..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A0C -/* 897FEC 80240A0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 897FF0 80240A10 AFBF0010 */ sw $ra, 0x10($sp) -/* 897FF4 80240A14 8C82000C */ lw $v0, 0xc($a0) -/* 897FF8 80240A18 0C0B1EAF */ jal get_variable -/* 897FFC 80240A1C 8C450000 */ lw $a1, ($v0) -/* 898000 80240A20 0C03AC5A */ jal func_800EB168 -/* 898004 80240A24 0040202D */ daddu $a0, $v0, $zero -/* 898008 80240A28 8FBF0010 */ lw $ra, 0x10($sp) -/* 89800C 80240A2C 24020002 */ addiu $v0, $zero, 2 -/* 898010 80240A30 03E00008 */ jr $ra -/* 898014 80240A34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C_897FEC.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C_897FEC.s new file mode 100644 index 0000000000..c27f989b65 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A0C_897FEC.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A0C_897FEC +/* 897FEC 80240A0C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 897FF0 80240A10 AFBF0010 */ sw $ra, 0x10($sp) +/* 897FF4 80240A14 8C82000C */ lw $v0, 0xc($a0) +/* 897FF8 80240A18 0C0B1EAF */ jal get_variable +/* 897FFC 80240A1C 8C450000 */ lw $a1, ($v0) +/* 898000 80240A20 0C03AC5A */ jal func_800EB168 +/* 898004 80240A24 0040202D */ daddu $a0, $v0, $zero +/* 898008 80240A28 8FBF0010 */ lw $ra, 0x10($sp) +/* 89800C 80240A2C 24020002 */ addiu $v0, $zero, 2 +/* 898010 80240A30 03E00008 */ jr $ra +/* 898014 80240A34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38.s deleted file mode 100644 index 5c72bcd51a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A38 -/* 898018 80240A38 3C028011 */ lui $v0, 0x8011 -/* 89801C 80240A3C 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 898020 80240A40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 898024 80240A44 AFBF0010 */ sw $ra, 0x10($sp) -/* 898028 80240A48 00021100 */ sll $v0, $v0, 4 -/* 89802C 80240A4C 3C048009 */ lui $a0, 0x8009 -/* 898030 80240A50 00822021 */ addu $a0, $a0, $v0 -/* 898034 80240A54 8C84EF20 */ lw $a0, -0x10e0($a0) -/* 898038 80240A58 0C0496CF */ jal set_message_string -/* 89803C 80240A5C 0000282D */ daddu $a1, $zero, $zero -/* 898040 80240A60 8FBF0010 */ lw $ra, 0x10($sp) -/* 898044 80240A64 24020002 */ addiu $v0, $zero, 2 -/* 898048 80240A68 03E00008 */ jr $ra -/* 89804C 80240A6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s new file mode 100644 index 0000000000..b70f6286fe --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s @@ -0,0 +1,18 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A38_898018 +/* 898018 80240A38 3C028011 */ lui $v0, 0x8011 +/* 89801C 80240A3C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 898020 80240A40 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 898024 80240A44 AFBF0010 */ sw $ra, 0x10($sp) +/* 898028 80240A48 00021100 */ sll $v0, $v0, 4 +/* 89802C 80240A4C 3C048009 */ lui $a0, 0x8009 +/* 898030 80240A50 00822021 */ addu $a0, $a0, $v0 +/* 898034 80240A54 8C84EF20 */ lw $a0, -0x10e0($a0) +/* 898038 80240A58 0C0496CF */ jal set_message_string +/* 89803C 80240A5C 0000282D */ daddu $a1, $zero, $zero +/* 898040 80240A60 8FBF0010 */ lw $ra, 0x10($sp) +/* 898044 80240A64 24020002 */ addiu $v0, $zero, 2 +/* 898048 80240A68 03E00008 */ jr $ra +/* 89804C 80240A6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70.s deleted file mode 100644 index b225f86934..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A70 -/* 898050 80240A70 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 898054 80240A74 AFB1001C */ sw $s1, 0x1c($sp) -/* 898058 80240A78 0080882D */ daddu $s1, $a0, $zero -/* 89805C 80240A7C AFBF0020 */ sw $ra, 0x20($sp) -/* 898060 80240A80 AFB00018 */ sw $s0, 0x18($sp) -/* 898064 80240A84 8E30000C */ lw $s0, 0xc($s1) -/* 898068 80240A88 8E050000 */ lw $a1, ($s0) -/* 89806C 80240A8C 0C0B1EAF */ jal get_variable -/* 898070 80240A90 26100004 */ addiu $s0, $s0, 4 -/* 898074 80240A94 0C04417A */ jal get_entity_by_index -/* 898078 80240A98 0040202D */ daddu $a0, $v0, $zero -/* 89807C 80240A9C 8E100000 */ lw $s0, ($s0) -/* 898080 80240AA0 C444004C */ lwc1 $f4, 0x4c($v0) -/* 898084 80240AA4 3C014148 */ lui $at, 0x4148 -/* 898088 80240AA8 44810000 */ mtc1 $at, $f0 -/* 89808C 80240AAC 3C013F33 */ lui $at, 0x3f33 -/* 898090 80240AB0 34213333 */ ori $at, $at, 0x3333 -/* 898094 80240AB4 44811000 */ mtc1 $at, $f2 -/* 898098 80240AB8 AFA00014 */ sw $zero, 0x14($sp) -/* 89809C 80240ABC 46002100 */ add.s $f4, $f4, $f0 -/* 8980A0 80240AC0 E7A20010 */ swc1 $f2, 0x10($sp) -/* 8980A4 80240AC4 8C450048 */ lw $a1, 0x48($v0) -/* 8980A8 80240AC8 8C470050 */ lw $a3, 0x50($v0) -/* 8980AC 80240ACC 44062000 */ mfc1 $a2, $f4 -/* 8980B0 80240AD0 0C01C5D4 */ jal func_80071750 -/* 8980B4 80240AD4 0000202D */ daddu $a0, $zero, $zero -/* 8980B8 80240AD8 0220202D */ daddu $a0, $s1, $zero -/* 8980BC 80240ADC 0200282D */ daddu $a1, $s0, $zero -/* 8980C0 80240AE0 0C0B2026 */ jal set_variable -/* 8980C4 80240AE4 0040302D */ daddu $a2, $v0, $zero -/* 8980C8 80240AE8 8FBF0020 */ lw $ra, 0x20($sp) -/* 8980CC 80240AEC 8FB1001C */ lw $s1, 0x1c($sp) -/* 8980D0 80240AF0 8FB00018 */ lw $s0, 0x18($sp) -/* 8980D4 80240AF4 24020002 */ addiu $v0, $zero, 2 -/* 8980D8 80240AF8 03E00008 */ jr $ra -/* 8980DC 80240AFC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70_898050.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70_898050.s new file mode 100644 index 0000000000..bd083477dd --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A70_898050.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A70_898050 +/* 898050 80240A70 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 898054 80240A74 AFB1001C */ sw $s1, 0x1c($sp) +/* 898058 80240A78 0080882D */ daddu $s1, $a0, $zero +/* 89805C 80240A7C AFBF0020 */ sw $ra, 0x20($sp) +/* 898060 80240A80 AFB00018 */ sw $s0, 0x18($sp) +/* 898064 80240A84 8E30000C */ lw $s0, 0xc($s1) +/* 898068 80240A88 8E050000 */ lw $a1, ($s0) +/* 89806C 80240A8C 0C0B1EAF */ jal get_variable +/* 898070 80240A90 26100004 */ addiu $s0, $s0, 4 +/* 898074 80240A94 0C04417A */ jal get_entity_by_index +/* 898078 80240A98 0040202D */ daddu $a0, $v0, $zero +/* 89807C 80240A9C 8E100000 */ lw $s0, ($s0) +/* 898080 80240AA0 C444004C */ lwc1 $f4, 0x4c($v0) +/* 898084 80240AA4 3C014148 */ lui $at, 0x4148 +/* 898088 80240AA8 44810000 */ mtc1 $at, $f0 +/* 89808C 80240AAC 3C013F33 */ lui $at, 0x3f33 +/* 898090 80240AB0 34213333 */ ori $at, $at, 0x3333 +/* 898094 80240AB4 44811000 */ mtc1 $at, $f2 +/* 898098 80240AB8 AFA00014 */ sw $zero, 0x14($sp) +/* 89809C 80240ABC 46002100 */ add.s $f4, $f4, $f0 +/* 8980A0 80240AC0 E7A20010 */ swc1 $f2, 0x10($sp) +/* 8980A4 80240AC4 8C450048 */ lw $a1, 0x48($v0) +/* 8980A8 80240AC8 8C470050 */ lw $a3, 0x50($v0) +/* 8980AC 80240ACC 44062000 */ mfc1 $a2, $f4 +/* 8980B0 80240AD0 0C01C5D4 */ jal func_80071750 +/* 8980B4 80240AD4 0000202D */ daddu $a0, $zero, $zero +/* 8980B8 80240AD8 0220202D */ daddu $a0, $s1, $zero +/* 8980BC 80240ADC 0200282D */ daddu $a1, $s0, $zero +/* 8980C0 80240AE0 0C0B2026 */ jal set_variable +/* 8980C4 80240AE4 0040302D */ daddu $a2, $v0, $zero +/* 8980C8 80240AE8 8FBF0020 */ lw $ra, 0x20($sp) +/* 8980CC 80240AEC 8FB1001C */ lw $s1, 0x1c($sp) +/* 8980D0 80240AF0 8FB00018 */ lw $s0, 0x18($sp) +/* 8980D4 80240AF4 24020002 */ addiu $v0, $zero, 2 +/* 8980D8 80240AF8 03E00008 */ jr $ra +/* 8980DC 80240AFC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34.s deleted file mode 100644 index 563d7d0265..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B34 -/* 898114 80240B34 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 898118 80240B38 AFBF0018 */ sw $ra, 0x18($sp) -/* 89811C 80240B3C 8C82000C */ lw $v0, 0xc($a0) -/* 898120 80240B40 0C0B1EAF */ jal get_variable -/* 898124 80240B44 8C450000 */ lw $a1, ($v0) -/* 898128 80240B48 0C04417A */ jal get_entity_by_index -/* 89812C 80240B4C 0040202D */ daddu $a0, $v0, $zero -/* 898130 80240B50 3C013F80 */ lui $at, 0x3f80 -/* 898134 80240B54 44810000 */ mtc1 $at, $f0 -/* 898138 80240B58 C442004C */ lwc1 $f2, 0x4c($v0) -/* 89813C 80240B5C E7A00010 */ swc1 $f0, 0x10($sp) -/* 898140 80240B60 3C014148 */ lui $at, 0x4148 -/* 898144 80240B64 44810000 */ mtc1 $at, $f0 -/* 898148 80240B68 2403004B */ addiu $v1, $zero, 0x4b -/* 89814C 80240B6C AFA30014 */ sw $v1, 0x14($sp) -/* 898150 80240B70 46001080 */ add.s $f2, $f2, $f0 -/* 898154 80240B74 8C450048 */ lw $a1, 0x48($v0) -/* 898158 80240B78 8C470050 */ lw $a3, 0x50($v0) -/* 89815C 80240B7C 44061000 */ mfc1 $a2, $f2 -/* 898160 80240B80 0C01C2EC */ jal func_80070BB0 -/* 898164 80240B84 24040004 */ addiu $a0, $zero, 4 -/* 898168 80240B88 8FBF0018 */ lw $ra, 0x18($sp) -/* 89816C 80240B8C 24020002 */ addiu $v0, $zero, 2 -/* 898170 80240B90 03E00008 */ jr $ra -/* 898174 80240B94 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34_898114.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34_898114.s new file mode 100644 index 0000000000..2a8214a1c5 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B34_898114.s @@ -0,0 +1,29 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B34_898114 +/* 898114 80240B34 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 898118 80240B38 AFBF0018 */ sw $ra, 0x18($sp) +/* 89811C 80240B3C 8C82000C */ lw $v0, 0xc($a0) +/* 898120 80240B40 0C0B1EAF */ jal get_variable +/* 898124 80240B44 8C450000 */ lw $a1, ($v0) +/* 898128 80240B48 0C04417A */ jal get_entity_by_index +/* 89812C 80240B4C 0040202D */ daddu $a0, $v0, $zero +/* 898130 80240B50 3C013F80 */ lui $at, 0x3f80 +/* 898134 80240B54 44810000 */ mtc1 $at, $f0 +/* 898138 80240B58 C442004C */ lwc1 $f2, 0x4c($v0) +/* 89813C 80240B5C E7A00010 */ swc1 $f0, 0x10($sp) +/* 898140 80240B60 3C014148 */ lui $at, 0x4148 +/* 898144 80240B64 44810000 */ mtc1 $at, $f0 +/* 898148 80240B68 2403004B */ addiu $v1, $zero, 0x4b +/* 89814C 80240B6C AFA30014 */ sw $v1, 0x14($sp) +/* 898150 80240B70 46001080 */ add.s $f2, $f2, $f0 +/* 898154 80240B74 8C450048 */ lw $a1, 0x48($v0) +/* 898158 80240B78 8C470050 */ lw $a3, 0x50($v0) +/* 89815C 80240B7C 44061000 */ mfc1 $a2, $f2 +/* 898160 80240B80 0C01C2EC */ jal func_80070BB0 +/* 898164 80240B84 24040004 */ addiu $a0, $zero, 4 +/* 898168 80240B88 8FBF0018 */ lw $ra, 0x18($sp) +/* 89816C 80240B8C 24020002 */ addiu $v0, $zero, 2 +/* 898170 80240B90 03E00008 */ jr $ra +/* 898174 80240B94 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98.s deleted file mode 100644 index 3567eca5b9..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98.s +++ /dev/null @@ -1,26 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B98 -/* 898178 80240B98 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89817C 80240B9C AFBF0018 */ sw $ra, 0x18($sp) -/* 898180 80240BA0 0C00EAD2 */ jal get_npc_safe -/* 898184 80240BA4 2404FFFC */ addiu $a0, $zero, -4 -/* 898188 80240BA8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 89818C 80240BAC 3C014148 */ lui $at, 0x4148 -/* 898190 80240BB0 44811000 */ mtc1 $at, $f2 -/* 898194 80240BB4 3C013F80 */ lui $at, 0x3f80 -/* 898198 80240BB8 44810000 */ mtc1 $at, $f0 -/* 89819C 80240BBC 2403001E */ addiu $v1, $zero, 0x1e -/* 8981A0 80240BC0 AFA30014 */ sw $v1, 0x14($sp) -/* 8981A4 80240BC4 46022100 */ add.s $f4, $f4, $f2 -/* 8981A8 80240BC8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8981AC 80240BCC 8C450038 */ lw $a1, 0x38($v0) -/* 8981B0 80240BD0 8C470040 */ lw $a3, 0x40($v0) -/* 8981B4 80240BD4 44062000 */ mfc1 $a2, $f4 -/* 8981B8 80240BD8 0C01C2EC */ jal func_80070BB0 -/* 8981BC 80240BDC 24040009 */ addiu $a0, $zero, 9 -/* 8981C0 80240BE0 8FBF0018 */ lw $ra, 0x18($sp) -/* 8981C4 80240BE4 24020002 */ addiu $v0, $zero, 2 -/* 8981C8 80240BE8 03E00008 */ jr $ra -/* 8981CC 80240BEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98_898178.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98_898178.s new file mode 100644 index 0000000000..13b5495cba --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240B98_898178.s @@ -0,0 +1,26 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B98_898178 +/* 898178 80240B98 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 89817C 80240B9C AFBF0018 */ sw $ra, 0x18($sp) +/* 898180 80240BA0 0C00EAD2 */ jal get_npc_safe +/* 898184 80240BA4 2404FFFC */ addiu $a0, $zero, -4 +/* 898188 80240BA8 C444003C */ lwc1 $f4, 0x3c($v0) +/* 89818C 80240BAC 3C014148 */ lui $at, 0x4148 +/* 898190 80240BB0 44811000 */ mtc1 $at, $f2 +/* 898194 80240BB4 3C013F80 */ lui $at, 0x3f80 +/* 898198 80240BB8 44810000 */ mtc1 $at, $f0 +/* 89819C 80240BBC 2403001E */ addiu $v1, $zero, 0x1e +/* 8981A0 80240BC0 AFA30014 */ sw $v1, 0x14($sp) +/* 8981A4 80240BC4 46022100 */ add.s $f4, $f4, $f2 +/* 8981A8 80240BC8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8981AC 80240BCC 8C450038 */ lw $a1, 0x38($v0) +/* 8981B0 80240BD0 8C470040 */ lw $a3, 0x40($v0) +/* 8981B4 80240BD4 44062000 */ mfc1 $a2, $f4 +/* 8981B8 80240BD8 0C01C2EC */ jal func_80070BB0 +/* 8981BC 80240BDC 24040009 */ addiu $a0, $zero, 9 +/* 8981C0 80240BE0 8FBF0018 */ lw $ra, 0x18($sp) +/* 8981C4 80240BE4 24020002 */ addiu $v0, $zero, 2 +/* 8981C8 80240BE8 03E00008 */ jr $ra +/* 8981CC 80240BEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0.s deleted file mode 100644 index 2629fabc1c..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0.s +++ /dev/null @@ -1,356 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BF0 -/* 8981D0 80240BF0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 8981D4 80240BF4 AFB60040 */ sw $s6, 0x40($sp) -/* 8981D8 80240BF8 0080B02D */ daddu $s6, $a0, $zero -/* 8981DC 80240BFC AFB00028 */ sw $s0, 0x28($sp) -/* 8981E0 80240C00 00A0802D */ daddu $s0, $a1, $zero -/* 8981E4 80240C04 AFBF0044 */ sw $ra, 0x44($sp) -/* 8981E8 80240C08 AFB5003C */ sw $s5, 0x3c($sp) -/* 8981EC 80240C0C AFB40038 */ sw $s4, 0x38($sp) -/* 8981F0 80240C10 AFB30034 */ sw $s3, 0x34($sp) -/* 8981F4 80240C14 AFB20030 */ sw $s2, 0x30($sp) -/* 8981F8 80240C18 AFB1002C */ sw $s1, 0x2c($sp) -/* 8981FC 80240C1C F7B80058 */ sdc1 $f24, 0x58($sp) -/* 898200 80240C20 F7B60050 */ sdc1 $f22, 0x50($sp) -/* 898204 80240C24 F7B40048 */ sdc1 $f20, 0x48($sp) -/* 898208 80240C28 8ED3000C */ lw $s3, 0xc($s6) -/* 89820C 80240C2C 0C00EAD2 */ jal get_npc_safe -/* 898210 80240C30 2404FFFC */ addiu $a0, $zero, -4 -/* 898214 80240C34 27A50018 */ addiu $a1, $sp, 0x18 -/* 898218 80240C38 3C048007 */ lui $a0, %hi(gCurrentCameraID) -/* 89821C 80240C3C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) -/* 898220 80240C40 27A6001C */ addiu $a2, $sp, 0x1c -/* 898224 80240C44 00041880 */ sll $v1, $a0, 2 -/* 898228 80240C48 00641821 */ addu $v1, $v1, $a0 -/* 89822C 80240C4C 00031880 */ sll $v1, $v1, 2 -/* 898230 80240C50 00641823 */ subu $v1, $v1, $a0 -/* 898234 80240C54 000320C0 */ sll $a0, $v1, 3 -/* 898238 80240C58 00641821 */ addu $v1, $v1, $a0 -/* 89823C 80240C5C 000318C0 */ sll $v1, $v1, 3 -/* 898240 80240C60 3C01800B */ lui $at, 0x800b -/* 898244 80240C64 00230821 */ addu $at, $at, $v1 -/* 898248 80240C68 C42C1DEC */ lwc1 $f12, 0x1dec($at) -/* 89824C 80240C6C 0C00A88D */ jal sin_cos_deg -/* 898250 80240C70 0040A82D */ daddu $s5, $v0, $zero -/* 898254 80240C74 1200005D */ beqz $s0, .L80240DEC -/* 898258 80240C78 00000000 */ nop -/* 89825C 80240C7C 0C00AB0A */ jal general_heap_malloc -/* 898260 80240C80 24040068 */ addiu $a0, $zero, 0x68 -/* 898264 80240C84 0040902D */ daddu $s2, $v0, $zero -/* 898268 80240C88 02C0202D */ daddu $a0, $s6, $zero -/* 89826C 80240C8C 0000882D */ daddu $s1, $zero, $zero -/* 898270 80240C90 2414FFFF */ addiu $s4, $zero, -1 -/* 898274 80240C94 AED20060 */ sw $s2, 0x60($s6) -/* 898278 80240C98 8E650000 */ lw $a1, ($s3) -/* 89827C 80240C9C 3C014148 */ lui $at, 0x4148 -/* 898280 80240CA0 4481C000 */ mtc1 $at, $f24 -/* 898284 80240CA4 3C013F80 */ lui $at, 0x3f80 -/* 898288 80240CA8 4481B000 */ mtc1 $at, $f22 -/* 89828C 80240CAC 4480A000 */ mtc1 $zero, $f20 -/* 898290 80240CB0 0C0B1EAF */ jal get_variable -/* 898294 80240CB4 0240802D */ daddu $s0, $s2, $zero -/* 898298 80240CB8 0C04417A */ jal get_entity_by_index -/* 89829C 80240CBC 0040202D */ daddu $a0, $v0, $zero -/* 8982A0 80240CC0 AE42005C */ sw $v0, 0x5c($s2) -.L80240CC4: -/* 8982A4 80240CC4 8E42005C */ lw $v0, 0x5c($s2) -/* 8982A8 80240CC8 C440004C */ lwc1 $f0, 0x4c($v0) -/* 8982AC 80240CCC 0000202D */ daddu $a0, $zero, $zero -/* 8982B0 80240CD0 E7B60010 */ swc1 $f22, 0x10($sp) -/* 8982B4 80240CD4 AFB40014 */ sw $s4, 0x14($sp) -/* 8982B8 80240CD8 46180000 */ add.s $f0, $f0, $f24 -/* 8982BC 80240CDC 8C450048 */ lw $a1, 0x48($v0) -/* 8982C0 80240CE0 8C470050 */ lw $a3, 0x50($v0) -/* 8982C4 80240CE4 44060000 */ mfc1 $a2, $f0 -/* 8982C8 80240CE8 0C01C5BC */ jal func_800716F0 -/* 8982CC 80240CEC 26310001 */ addiu $s1, $s1, 1 -/* 8982D0 80240CF0 AE020008 */ sw $v0, 8($s0) -/* 8982D4 80240CF4 E614002C */ swc1 $f20, 0x2c($s0) -/* 8982D8 80240CF8 E6140020 */ swc1 $f20, 0x20($s0) -/* 8982DC 80240CFC E6140014 */ swc1 $f20, 0x14($s0) -/* 8982E0 80240D00 E6140050 */ swc1 $f20, 0x50($s0) -/* 8982E4 80240D04 E6140044 */ swc1 $f20, 0x44($s0) -/* 8982E8 80240D08 E6140038 */ swc1 $f20, 0x38($s0) -/* 8982EC 80240D0C 2A220003 */ slti $v0, $s1, 3 -/* 8982F0 80240D10 1440FFEC */ bnez $v0, .L80240CC4 -/* 8982F4 80240D14 26100004 */ addiu $s0, $s0, 4 -/* 8982F8 80240D18 0000882D */ daddu $s1, $zero, $zero -/* 8982FC 80240D1C 0240802D */ daddu $s0, $s2, $zero -/* 898300 80240D20 3C148024 */ lui $s4, 0x8024 -/* 898304 80240D24 26942708 */ addiu $s4, $s4, 0x2708 -/* 898308 80240D28 3C014248 */ lui $at, 0x4248 -/* 89830C 80240D2C 4481A000 */ mtc1 $at, $f20 -/* 898310 80240D30 24130044 */ addiu $s3, $zero, 0x44 -/* 898314 80240D34 AE400000 */ sw $zero, ($s2) -/* 898318 80240D38 AE400004 */ sw $zero, 4($s2) -/* 89831C 80240D3C AE400060 */ sw $zero, 0x60($s2) -/* 898320 80240D40 AE400064 */ sw $zero, 0x64($s2) -.L80240D44: -/* 898324 80240D44 27A40020 */ addiu $a0, $sp, 0x20 -/* 898328 80240D48 4406A000 */ mfc1 $a2, $f20 -/* 89832C 80240D4C 8E870000 */ lw $a3, ($s4) -/* 898330 80240D50 02532821 */ addu $a1, $s2, $s3 -/* 898334 80240D54 0C00A7E7 */ jal add_vec2D_polar -/* 898338 80240D58 AFA00020 */ sw $zero, 0x20($sp) -/* 89833C 80240D5C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 898340 80240D60 C7A40020 */ lwc1 $f4, 0x20($sp) -/* 898344 80240D64 46041082 */ mul.s $f2, $f2, $f4 -/* 898348 80240D68 00000000 */ nop -/* 89834C 80240D6C C7A00018 */ lwc1 $f0, 0x18($sp) -/* 898350 80240D70 46040002 */ mul.s $f0, $f0, $f4 -/* 898354 80240D74 00000000 */ nop -/* 898358 80240D78 E6020038 */ swc1 $f2, 0x38($s0) -/* 89835C 80240D7C E6000050 */ swc1 $f0, 0x50($s0) -/* 898360 80240D80 8E42005C */ lw $v0, 0x5c($s2) -/* 898364 80240D84 C6000038 */ lwc1 $f0, 0x38($s0) -/* 898368 80240D88 C4420048 */ lwc1 $f2, 0x48($v0) -/* 89836C 80240D8C 46001080 */ add.s $f2, $f2, $f0 -/* 898370 80240D90 C6A00038 */ lwc1 $f0, 0x38($s5) -/* 898374 80240D94 46020001 */ sub.s $f0, $f0, $f2 -/* 898378 80240D98 E6000038 */ swc1 $f0, 0x38($s0) -/* 89837C 80240D9C 8E42005C */ lw $v0, 0x5c($s2) -/* 898380 80240DA0 C6000044 */ lwc1 $f0, 0x44($s0) -/* 898384 80240DA4 C442004C */ lwc1 $f2, 0x4c($v0) -/* 898388 80240DA8 46001080 */ add.s $f2, $f2, $f0 -/* 89838C 80240DAC C6A0003C */ lwc1 $f0, 0x3c($s5) -/* 898390 80240DB0 46020001 */ sub.s $f0, $f0, $f2 -/* 898394 80240DB4 E6000044 */ swc1 $f0, 0x44($s0) -/* 898398 80240DB8 8E42005C */ lw $v0, 0x5c($s2) -/* 89839C 80240DBC C6000050 */ lwc1 $f0, 0x50($s0) -/* 8983A0 80240DC0 C4420050 */ lwc1 $f2, 0x50($v0) -/* 8983A4 80240DC4 26940004 */ addiu $s4, $s4, 4 -/* 8983A8 80240DC8 46001080 */ add.s $f2, $f2, $f0 -/* 8983AC 80240DCC C6A00040 */ lwc1 $f0, 0x40($s5) -/* 8983B0 80240DD0 26730004 */ addiu $s3, $s3, 4 -/* 8983B4 80240DD4 46020001 */ sub.s $f0, $f0, $f2 -/* 8983B8 80240DD8 26310001 */ addiu $s1, $s1, 1 -/* 8983BC 80240DDC 2A220003 */ slti $v0, $s1, 3 -/* 8983C0 80240DE0 E6000050 */ swc1 $f0, 0x50($s0) -/* 8983C4 80240DE4 1440FFD7 */ bnez $v0, .L80240D44 -/* 8983C8 80240DE8 26100004 */ addiu $s0, $s0, 4 -.L80240DEC: -/* 8983CC 80240DEC 8ED20060 */ lw $s2, 0x60($s6) -/* 8983D0 80240DF0 8E430000 */ lw $v1, ($s2) -/* 8983D4 80240DF4 24020001 */ addiu $v0, $zero, 1 -/* 8983D8 80240DF8 10620038 */ beq $v1, $v0, .L80240EDC -/* 8983DC 80240DFC 28620002 */ slti $v0, $v1, 2 -/* 8983E0 80240E00 50400005 */ beql $v0, $zero, .L80240E18 -/* 8983E4 80240E04 24020002 */ addiu $v0, $zero, 2 -/* 8983E8 80240E08 10600007 */ beqz $v1, .L80240E28 -/* 8983EC 80240E0C 24040005 */ addiu $a0, $zero, 5 -/* 8983F0 80240E10 080903F0 */ j .L80240FC0 -/* 8983F4 80240E14 00000000 */ nop -.L80240E18: -/* 8983F8 80240E18 10620058 */ beq $v1, $v0, .L80240F7C -/* 8983FC 80240E1C 00000000 */ nop -/* 898400 80240E20 080903F0 */ j .L80240FC0 -/* 898404 80240E24 00000000 */ nop -.L80240E28: -/* 898408 80240E28 0000882D */ daddu $s1, $zero, $zero -/* 89840C 80240E2C 3C148024 */ lui $s4, 0x8024 -/* 898410 80240E30 26942708 */ addiu $s4, $s4, 0x2708 -/* 898414 80240E34 24130020 */ addiu $s3, $zero, 0x20 -/* 898418 80240E38 3C064248 */ lui $a2, 0x4248 -/* 89841C 80240E3C 44800000 */ mtc1 $zero, $f0 -/* 898420 80240E40 24020014 */ addiu $v0, $zero, 0x14 -/* 898424 80240E44 AFA20010 */ sw $v0, 0x10($sp) -/* 898428 80240E48 44050000 */ mfc1 $a1, $f0 -/* 89842C 80240E4C 8E470060 */ lw $a3, 0x60($s2) -/* 898430 80240E50 4485B000 */ mtc1 $a1, $f22 -/* 898434 80240E54 0C00A8ED */ jal update_lerp -/* 898438 80240E58 0240802D */ daddu $s0, $s2, $zero -/* 89843C 80240E5C 46000506 */ mov.s $f20, $f0 -.L80240E60: -/* 898440 80240E60 4406A000 */ mfc1 $a2, $f20 -/* 898444 80240E64 27A40020 */ addiu $a0, $sp, 0x20 -/* 898448 80240E68 E6160020 */ swc1 $f22, 0x20($s0) -/* 89844C 80240E6C 8E870000 */ lw $a3, ($s4) -/* 898450 80240E70 02532821 */ addu $a1, $s2, $s3 -/* 898454 80240E74 0C00A7E7 */ jal add_vec2D_polar -/* 898458 80240E78 E7B60020 */ swc1 $f22, 0x20($sp) -/* 89845C 80240E7C C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 898460 80240E80 C7A00020 */ lwc1 $f0, 0x20($sp) -/* 898464 80240E84 46002102 */ mul.s $f4, $f4, $f0 -/* 898468 80240E88 00000000 */ nop -/* 89846C 80240E8C C7A20018 */ lwc1 $f2, 0x18($sp) -/* 898470 80240E90 26940004 */ addiu $s4, $s4, 4 -/* 898474 80240E94 46001082 */ mul.s $f2, $f2, $f0 -/* 898478 80240E98 00000000 */ nop -/* 89847C 80240E9C 26730004 */ addiu $s3, $s3, 4 -/* 898480 80240EA0 26310001 */ addiu $s1, $s1, 1 -/* 898484 80240EA4 2A220003 */ slti $v0, $s1, 3 -/* 898488 80240EA8 E6040014 */ swc1 $f4, 0x14($s0) -/* 89848C 80240EAC E602002C */ swc1 $f2, 0x2c($s0) -/* 898490 80240EB0 1440FFEB */ bnez $v0, .L80240E60 -/* 898494 80240EB4 26100004 */ addiu $s0, $s0, 4 -/* 898498 80240EB8 8E420060 */ lw $v0, 0x60($s2) -/* 89849C 80240EBC 24420001 */ addiu $v0, $v0, 1 -/* 8984A0 80240EC0 AE420060 */ sw $v0, 0x60($s2) -/* 8984A4 80240EC4 28420015 */ slti $v0, $v0, 0x15 -/* 8984A8 80240EC8 1440003D */ bnez $v0, .L80240FC0 -/* 8984AC 80240ECC 24020001 */ addiu $v0, $zero, 1 -/* 8984B0 80240ED0 AE420000 */ sw $v0, ($s2) -/* 8984B4 80240ED4 080903F0 */ j .L80240FC0 -/* 8984B8 80240ED8 AE400060 */ sw $zero, 0x60($s2) -.L80240EDC: -/* 8984BC 80240EDC 0000882D */ daddu $s1, $zero, $zero -/* 8984C0 80240EE0 3C148024 */ lui $s4, 0x8024 -/* 8984C4 80240EE4 26942708 */ addiu $s4, $s4, 0x2708 -/* 8984C8 80240EE8 24130020 */ addiu $s3, $zero, 0x20 -/* 8984CC 80240EEC 0240802D */ daddu $s0, $s2, $zero -/* 8984D0 80240EF0 3C014248 */ lui $at, 0x4248 -/* 8984D4 80240EF4 4481A000 */ mtc1 $at, $f20 -/* 8984D8 80240EF8 4480B000 */ mtc1 $zero, $f22 -.L80240EFC: -/* 8984DC 80240EFC 4406A000 */ mfc1 $a2, $f20 -/* 8984E0 80240F00 27A40020 */ addiu $a0, $sp, 0x20 -/* 8984E4 80240F04 E6160020 */ swc1 $f22, 0x20($s0) -/* 8984E8 80240F08 8E870000 */ lw $a3, ($s4) -/* 8984EC 80240F0C 02532821 */ addu $a1, $s2, $s3 -/* 8984F0 80240F10 0C00A7E7 */ jal add_vec2D_polar -/* 8984F4 80240F14 E7B60020 */ swc1 $f22, 0x20($sp) -/* 8984F8 80240F18 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* 8984FC 80240F1C C7A00020 */ lwc1 $f0, 0x20($sp) -/* 898500 80240F20 46002102 */ mul.s $f4, $f4, $f0 -/* 898504 80240F24 00000000 */ nop -/* 898508 80240F28 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 89850C 80240F2C 26940004 */ addiu $s4, $s4, 4 -/* 898510 80240F30 46001082 */ mul.s $f2, $f2, $f0 -/* 898514 80240F34 00000000 */ nop -/* 898518 80240F38 26730004 */ addiu $s3, $s3, 4 -/* 89851C 80240F3C 26310001 */ addiu $s1, $s1, 1 -/* 898520 80240F40 2A220003 */ slti $v0, $s1, 3 -/* 898524 80240F44 E6040014 */ swc1 $f4, 0x14($s0) -/* 898528 80240F48 E602002C */ swc1 $f2, 0x2c($s0) -/* 89852C 80240F4C 1440FFEB */ bnez $v0, .L80240EFC -/* 898530 80240F50 26100004 */ addiu $s0, $s0, 4 -/* 898534 80240F54 8E420060 */ lw $v0, 0x60($s2) -/* 898538 80240F58 24420001 */ addiu $v0, $v0, 1 -/* 89853C 80240F5C AE420060 */ sw $v0, 0x60($s2) -/* 898540 80240F60 28420010 */ slti $v0, $v0, 0x10 -/* 898544 80240F64 14400016 */ bnez $v0, .L80240FC0 -/* 898548 80240F68 2402000F */ addiu $v0, $zero, 0xf -/* 89854C 80240F6C AE420060 */ sw $v0, 0x60($s2) -/* 898550 80240F70 24020002 */ addiu $v0, $zero, 2 -/* 898554 80240F74 080903F0 */ j .L80240FC0 -/* 898558 80240F78 AE420000 */ sw $v0, ($s2) -.L80240F7C: -/* 89855C 80240F7C 8E420060 */ lw $v0, 0x60($s2) -/* 898560 80240F80 24420001 */ addiu $v0, $v0, 1 -/* 898564 80240F84 AE420060 */ sw $v0, 0x60($s2) -/* 898568 80240F88 2842001F */ slti $v0, $v0, 0x1f -/* 89856C 80240F8C 1440000C */ bnez $v0, .L80240FC0 -/* 898570 80240F90 0000882D */ daddu $s1, $zero, $zero -/* 898574 80240F94 0240282D */ daddu $a1, $s2, $zero -.L80240F98: -/* 898578 80240F98 8CA20008 */ lw $v0, 8($a1) -/* 89857C 80240F9C 8C430000 */ lw $v1, ($v0) -/* 898580 80240FA0 26310001 */ addiu $s1, $s1, 1 -/* 898584 80240FA4 34630010 */ ori $v1, $v1, 0x10 -/* 898588 80240FA8 AC430000 */ sw $v1, ($v0) -/* 89858C 80240FAC 2A220003 */ slti $v0, $s1, 3 -/* 898590 80240FB0 1440FFF9 */ bnez $v0, .L80240F98 -/* 898594 80240FB4 24A50004 */ addiu $a1, $a1, 4 -/* 898598 80240FB8 0809043D */ j .L802410F4 -/* 89859C 80240FBC 24020002 */ addiu $v0, $zero, 2 -.L80240FC0: -/* 8985A0 80240FC0 8E430004 */ lw $v1, 4($s2) -/* 8985A4 80240FC4 10600005 */ beqz $v1, .L80240FDC -/* 8985A8 80240FC8 24020001 */ addiu $v0, $zero, 1 -/* 8985AC 80240FCC 1062000B */ beq $v1, $v0, .L80240FFC -/* 8985B0 80240FD0 0000882D */ daddu $s1, $zero, $zero -/* 8985B4 80240FD4 0809042C */ j .L802410B0 -/* 8985B8 80240FD8 0240282D */ daddu $a1, $s2, $zero -.L80240FDC: -/* 8985BC 80240FDC 8E420064 */ lw $v0, 0x64($s2) -/* 8985C0 80240FE0 24420001 */ addiu $v0, $v0, 1 -/* 8985C4 80240FE4 AE420064 */ sw $v0, 0x64($s2) -/* 8985C8 80240FE8 28420010 */ slti $v0, $v0, 0x10 -/* 8985CC 80240FEC 1440002F */ bnez $v0, .L802410AC -/* 8985D0 80240FF0 0000882D */ daddu $s1, $zero, $zero -/* 8985D4 80240FF4 08090428 */ j .L802410A0 -/* 8985D8 80240FF8 24020001 */ addiu $v0, $zero, 1 -.L80240FFC: -/* 8985DC 80240FFC 4480A000 */ mtc1 $zero, $f20 -/* 8985E0 80241000 24130014 */ addiu $s3, $zero, 0x14 -/* 8985E4 80241004 0240802D */ daddu $s0, $s2, $zero -.L80241008: -/* 8985E8 80241008 4405A000 */ mfc1 $a1, $f20 -/* 8985EC 8024100C AFB30010 */ sw $s3, 0x10($sp) -/* 8985F0 80241010 8E060038 */ lw $a2, 0x38($s0) -/* 8985F4 80241014 8E470064 */ lw $a3, 0x64($s2) -/* 8985F8 80241018 0C00A8ED */ jal update_lerp -/* 8985FC 8024101C 24040001 */ addiu $a0, $zero, 1 -/* 898600 80241020 C6020014 */ lwc1 $f2, 0x14($s0) -/* 898604 80241024 46001080 */ add.s $f2, $f2, $f0 -/* 898608 80241028 4405A000 */ mfc1 $a1, $f20 -/* 89860C 8024102C E6020014 */ swc1 $f2, 0x14($s0) -/* 898610 80241030 AFB30010 */ sw $s3, 0x10($sp) -/* 898614 80241034 8E060044 */ lw $a2, 0x44($s0) -/* 898618 80241038 8E470064 */ lw $a3, 0x64($s2) -/* 89861C 8024103C 0C00A8ED */ jal update_lerp -/* 898620 80241040 24040001 */ addiu $a0, $zero, 1 -/* 898624 80241044 C6020020 */ lwc1 $f2, 0x20($s0) -/* 898628 80241048 46001080 */ add.s $f2, $f2, $f0 -/* 89862C 8024104C 4405A000 */ mfc1 $a1, $f20 -/* 898630 80241050 E6020020 */ swc1 $f2, 0x20($s0) -/* 898634 80241054 AFB30010 */ sw $s3, 0x10($sp) -/* 898638 80241058 8E060050 */ lw $a2, 0x50($s0) -/* 89863C 8024105C 8E470064 */ lw $a3, 0x64($s2) -/* 898640 80241060 0C00A8ED */ jal update_lerp -/* 898644 80241064 24040001 */ addiu $a0, $zero, 1 -/* 898648 80241068 C602002C */ lwc1 $f2, 0x2c($s0) -/* 89864C 8024106C 46001080 */ add.s $f2, $f2, $f0 -/* 898650 80241070 26310001 */ addiu $s1, $s1, 1 -/* 898654 80241074 2A220003 */ slti $v0, $s1, 3 -/* 898658 80241078 E602002C */ swc1 $f2, 0x2c($s0) -/* 89865C 8024107C 1440FFE2 */ bnez $v0, .L80241008 -/* 898660 80241080 26100004 */ addiu $s0, $s0, 4 -/* 898664 80241084 8E420064 */ lw $v0, 0x64($s2) -/* 898668 80241088 24420001 */ addiu $v0, $v0, 1 -/* 89866C 8024108C AE420064 */ sw $v0, 0x64($s2) -/* 898670 80241090 28420015 */ slti $v0, $v0, 0x15 -/* 898674 80241094 14400005 */ bnez $v0, .L802410AC -/* 898678 80241098 0000882D */ daddu $s1, $zero, $zero -/* 89867C 8024109C 24020002 */ addiu $v0, $zero, 2 -.L802410A0: -/* 898680 802410A0 AE420004 */ sw $v0, 4($s2) -/* 898684 802410A4 AE400064 */ sw $zero, 0x64($s2) -/* 898688 802410A8 0000882D */ daddu $s1, $zero, $zero -.L802410AC: -/* 89868C 802410AC 0240282D */ daddu $a1, $s2, $zero -.L802410B0: -/* 898690 802410B0 8CA20008 */ lw $v0, 8($a1) -/* 898694 802410B4 C4A00014 */ lwc1 $f0, 0x14($a1) -/* 898698 802410B8 8C42000C */ lw $v0, 0xc($v0) -/* 89869C 802410BC E4400010 */ swc1 $f0, 0x10($v0) -/* 8986A0 802410C0 8CA20008 */ lw $v0, 8($a1) -/* 8986A4 802410C4 C4A00020 */ lwc1 $f0, 0x20($a1) -/* 8986A8 802410C8 8C42000C */ lw $v0, 0xc($v0) -/* 8986AC 802410CC 26310001 */ addiu $s1, $s1, 1 -/* 8986B0 802410D0 E4400014 */ swc1 $f0, 0x14($v0) -/* 8986B4 802410D4 8CA20008 */ lw $v0, 8($a1) -/* 8986B8 802410D8 C4A0002C */ lwc1 $f0, 0x2c($a1) -/* 8986BC 802410DC 8C42000C */ lw $v0, 0xc($v0) -/* 8986C0 802410E0 E4400018 */ swc1 $f0, 0x18($v0) -/* 8986C4 802410E4 2A220003 */ slti $v0, $s1, 3 -/* 8986C8 802410E8 1440FFF1 */ bnez $v0, .L802410B0 -/* 8986CC 802410EC 24A50004 */ addiu $a1, $a1, 4 -/* 8986D0 802410F0 0000102D */ daddu $v0, $zero, $zero -.L802410F4: -/* 8986D4 802410F4 8FBF0044 */ lw $ra, 0x44($sp) -/* 8986D8 802410F8 8FB60040 */ lw $s6, 0x40($sp) -/* 8986DC 802410FC 8FB5003C */ lw $s5, 0x3c($sp) -/* 8986E0 80241100 8FB40038 */ lw $s4, 0x38($sp) -/* 8986E4 80241104 8FB30034 */ lw $s3, 0x34($sp) -/* 8986E8 80241108 8FB20030 */ lw $s2, 0x30($sp) -/* 8986EC 8024110C 8FB1002C */ lw $s1, 0x2c($sp) -/* 8986F0 80241110 8FB00028 */ lw $s0, 0x28($sp) -/* 8986F4 80241114 D7B80058 */ ldc1 $f24, 0x58($sp) -/* 8986F8 80241118 D7B60050 */ ldc1 $f22, 0x50($sp) -/* 8986FC 8024111C D7B40048 */ ldc1 $f20, 0x48($sp) -/* 898700 80241120 03E00008 */ jr $ra -/* 898704 80241124 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s new file mode 100644 index 0000000000..8e14dc6796 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240BF0_8981D0.s @@ -0,0 +1,356 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240BF0_8981D0 +/* 8981D0 80240BF0 27BDFFA0 */ addiu $sp, $sp, -0x60 +/* 8981D4 80240BF4 AFB60040 */ sw $s6, 0x40($sp) +/* 8981D8 80240BF8 0080B02D */ daddu $s6, $a0, $zero +/* 8981DC 80240BFC AFB00028 */ sw $s0, 0x28($sp) +/* 8981E0 80240C00 00A0802D */ daddu $s0, $a1, $zero +/* 8981E4 80240C04 AFBF0044 */ sw $ra, 0x44($sp) +/* 8981E8 80240C08 AFB5003C */ sw $s5, 0x3c($sp) +/* 8981EC 80240C0C AFB40038 */ sw $s4, 0x38($sp) +/* 8981F0 80240C10 AFB30034 */ sw $s3, 0x34($sp) +/* 8981F4 80240C14 AFB20030 */ sw $s2, 0x30($sp) +/* 8981F8 80240C18 AFB1002C */ sw $s1, 0x2c($sp) +/* 8981FC 80240C1C F7B80058 */ sdc1 $f24, 0x58($sp) +/* 898200 80240C20 F7B60050 */ sdc1 $f22, 0x50($sp) +/* 898204 80240C24 F7B40048 */ sdc1 $f20, 0x48($sp) +/* 898208 80240C28 8ED3000C */ lw $s3, 0xc($s6) +/* 89820C 80240C2C 0C00EAD2 */ jal get_npc_safe +/* 898210 80240C30 2404FFFC */ addiu $a0, $zero, -4 +/* 898214 80240C34 27A50018 */ addiu $a1, $sp, 0x18 +/* 898218 80240C38 3C048007 */ lui $a0, %hi(gCurrentCameraID) +/* 89821C 80240C3C 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0) +/* 898220 80240C40 27A6001C */ addiu $a2, $sp, 0x1c +/* 898224 80240C44 00041880 */ sll $v1, $a0, 2 +/* 898228 80240C48 00641821 */ addu $v1, $v1, $a0 +/* 89822C 80240C4C 00031880 */ sll $v1, $v1, 2 +/* 898230 80240C50 00641823 */ subu $v1, $v1, $a0 +/* 898234 80240C54 000320C0 */ sll $a0, $v1, 3 +/* 898238 80240C58 00641821 */ addu $v1, $v1, $a0 +/* 89823C 80240C5C 000318C0 */ sll $v1, $v1, 3 +/* 898240 80240C60 3C01800B */ lui $at, 0x800b +/* 898244 80240C64 00230821 */ addu $at, $at, $v1 +/* 898248 80240C68 C42C1DEC */ lwc1 $f12, 0x1dec($at) +/* 89824C 80240C6C 0C00A88D */ jal sin_cos_deg +/* 898250 80240C70 0040A82D */ daddu $s5, $v0, $zero +/* 898254 80240C74 1200005D */ beqz $s0, .L80240DEC +/* 898258 80240C78 00000000 */ nop +/* 89825C 80240C7C 0C00AB0A */ jal general_heap_malloc +/* 898260 80240C80 24040068 */ addiu $a0, $zero, 0x68 +/* 898264 80240C84 0040902D */ daddu $s2, $v0, $zero +/* 898268 80240C88 02C0202D */ daddu $a0, $s6, $zero +/* 89826C 80240C8C 0000882D */ daddu $s1, $zero, $zero +/* 898270 80240C90 2414FFFF */ addiu $s4, $zero, -1 +/* 898274 80240C94 AED20060 */ sw $s2, 0x60($s6) +/* 898278 80240C98 8E650000 */ lw $a1, ($s3) +/* 89827C 80240C9C 3C014148 */ lui $at, 0x4148 +/* 898280 80240CA0 4481C000 */ mtc1 $at, $f24 +/* 898284 80240CA4 3C013F80 */ lui $at, 0x3f80 +/* 898288 80240CA8 4481B000 */ mtc1 $at, $f22 +/* 89828C 80240CAC 4480A000 */ mtc1 $zero, $f20 +/* 898290 80240CB0 0C0B1EAF */ jal get_variable +/* 898294 80240CB4 0240802D */ daddu $s0, $s2, $zero +/* 898298 80240CB8 0C04417A */ jal get_entity_by_index +/* 89829C 80240CBC 0040202D */ daddu $a0, $v0, $zero +/* 8982A0 80240CC0 AE42005C */ sw $v0, 0x5c($s2) +.L80240CC4: +/* 8982A4 80240CC4 8E42005C */ lw $v0, 0x5c($s2) +/* 8982A8 80240CC8 C440004C */ lwc1 $f0, 0x4c($v0) +/* 8982AC 80240CCC 0000202D */ daddu $a0, $zero, $zero +/* 8982B0 80240CD0 E7B60010 */ swc1 $f22, 0x10($sp) +/* 8982B4 80240CD4 AFB40014 */ sw $s4, 0x14($sp) +/* 8982B8 80240CD8 46180000 */ add.s $f0, $f0, $f24 +/* 8982BC 80240CDC 8C450048 */ lw $a1, 0x48($v0) +/* 8982C0 80240CE0 8C470050 */ lw $a3, 0x50($v0) +/* 8982C4 80240CE4 44060000 */ mfc1 $a2, $f0 +/* 8982C8 80240CE8 0C01C5BC */ jal func_800716F0 +/* 8982CC 80240CEC 26310001 */ addiu $s1, $s1, 1 +/* 8982D0 80240CF0 AE020008 */ sw $v0, 8($s0) +/* 8982D4 80240CF4 E614002C */ swc1 $f20, 0x2c($s0) +/* 8982D8 80240CF8 E6140020 */ swc1 $f20, 0x20($s0) +/* 8982DC 80240CFC E6140014 */ swc1 $f20, 0x14($s0) +/* 8982E0 80240D00 E6140050 */ swc1 $f20, 0x50($s0) +/* 8982E4 80240D04 E6140044 */ swc1 $f20, 0x44($s0) +/* 8982E8 80240D08 E6140038 */ swc1 $f20, 0x38($s0) +/* 8982EC 80240D0C 2A220003 */ slti $v0, $s1, 3 +/* 8982F0 80240D10 1440FFEC */ bnez $v0, .L80240CC4 +/* 8982F4 80240D14 26100004 */ addiu $s0, $s0, 4 +/* 8982F8 80240D18 0000882D */ daddu $s1, $zero, $zero +/* 8982FC 80240D1C 0240802D */ daddu $s0, $s2, $zero +/* 898300 80240D20 3C148024 */ lui $s4, 0x8024 +/* 898304 80240D24 26942708 */ addiu $s4, $s4, 0x2708 +/* 898308 80240D28 3C014248 */ lui $at, 0x4248 +/* 89830C 80240D2C 4481A000 */ mtc1 $at, $f20 +/* 898310 80240D30 24130044 */ addiu $s3, $zero, 0x44 +/* 898314 80240D34 AE400000 */ sw $zero, ($s2) +/* 898318 80240D38 AE400004 */ sw $zero, 4($s2) +/* 89831C 80240D3C AE400060 */ sw $zero, 0x60($s2) +/* 898320 80240D40 AE400064 */ sw $zero, 0x64($s2) +.L80240D44: +/* 898324 80240D44 27A40020 */ addiu $a0, $sp, 0x20 +/* 898328 80240D48 4406A000 */ mfc1 $a2, $f20 +/* 89832C 80240D4C 8E870000 */ lw $a3, ($s4) +/* 898330 80240D50 02532821 */ addu $a1, $s2, $s3 +/* 898334 80240D54 0C00A7E7 */ jal add_vec2D_polar +/* 898338 80240D58 AFA00020 */ sw $zero, 0x20($sp) +/* 89833C 80240D5C C7A2001C */ lwc1 $f2, 0x1c($sp) +/* 898340 80240D60 C7A40020 */ lwc1 $f4, 0x20($sp) +/* 898344 80240D64 46041082 */ mul.s $f2, $f2, $f4 +/* 898348 80240D68 00000000 */ nop +/* 89834C 80240D6C C7A00018 */ lwc1 $f0, 0x18($sp) +/* 898350 80240D70 46040002 */ mul.s $f0, $f0, $f4 +/* 898354 80240D74 00000000 */ nop +/* 898358 80240D78 E6020038 */ swc1 $f2, 0x38($s0) +/* 89835C 80240D7C E6000050 */ swc1 $f0, 0x50($s0) +/* 898360 80240D80 8E42005C */ lw $v0, 0x5c($s2) +/* 898364 80240D84 C6000038 */ lwc1 $f0, 0x38($s0) +/* 898368 80240D88 C4420048 */ lwc1 $f2, 0x48($v0) +/* 89836C 80240D8C 46001080 */ add.s $f2, $f2, $f0 +/* 898370 80240D90 C6A00038 */ lwc1 $f0, 0x38($s5) +/* 898374 80240D94 46020001 */ sub.s $f0, $f0, $f2 +/* 898378 80240D98 E6000038 */ swc1 $f0, 0x38($s0) +/* 89837C 80240D9C 8E42005C */ lw $v0, 0x5c($s2) +/* 898380 80240DA0 C6000044 */ lwc1 $f0, 0x44($s0) +/* 898384 80240DA4 C442004C */ lwc1 $f2, 0x4c($v0) +/* 898388 80240DA8 46001080 */ add.s $f2, $f2, $f0 +/* 89838C 80240DAC C6A0003C */ lwc1 $f0, 0x3c($s5) +/* 898390 80240DB0 46020001 */ sub.s $f0, $f0, $f2 +/* 898394 80240DB4 E6000044 */ swc1 $f0, 0x44($s0) +/* 898398 80240DB8 8E42005C */ lw $v0, 0x5c($s2) +/* 89839C 80240DBC C6000050 */ lwc1 $f0, 0x50($s0) +/* 8983A0 80240DC0 C4420050 */ lwc1 $f2, 0x50($v0) +/* 8983A4 80240DC4 26940004 */ addiu $s4, $s4, 4 +/* 8983A8 80240DC8 46001080 */ add.s $f2, $f2, $f0 +/* 8983AC 80240DCC C6A00040 */ lwc1 $f0, 0x40($s5) +/* 8983B0 80240DD0 26730004 */ addiu $s3, $s3, 4 +/* 8983B4 80240DD4 46020001 */ sub.s $f0, $f0, $f2 +/* 8983B8 80240DD8 26310001 */ addiu $s1, $s1, 1 +/* 8983BC 80240DDC 2A220003 */ slti $v0, $s1, 3 +/* 8983C0 80240DE0 E6000050 */ swc1 $f0, 0x50($s0) +/* 8983C4 80240DE4 1440FFD7 */ bnez $v0, .L80240D44 +/* 8983C8 80240DE8 26100004 */ addiu $s0, $s0, 4 +.L80240DEC: +/* 8983CC 80240DEC 8ED20060 */ lw $s2, 0x60($s6) +/* 8983D0 80240DF0 8E430000 */ lw $v1, ($s2) +/* 8983D4 80240DF4 24020001 */ addiu $v0, $zero, 1 +/* 8983D8 80240DF8 10620038 */ beq $v1, $v0, .L80240EDC +/* 8983DC 80240DFC 28620002 */ slti $v0, $v1, 2 +/* 8983E0 80240E00 50400005 */ beql $v0, $zero, .L80240E18 +/* 8983E4 80240E04 24020002 */ addiu $v0, $zero, 2 +/* 8983E8 80240E08 10600007 */ beqz $v1, .L80240E28 +/* 8983EC 80240E0C 24040005 */ addiu $a0, $zero, 5 +/* 8983F0 80240E10 080903F0 */ j .L80240FC0 +/* 8983F4 80240E14 00000000 */ nop +.L80240E18: +/* 8983F8 80240E18 10620058 */ beq $v1, $v0, .L80240F7C +/* 8983FC 80240E1C 00000000 */ nop +/* 898400 80240E20 080903F0 */ j .L80240FC0 +/* 898404 80240E24 00000000 */ nop +.L80240E28: +/* 898408 80240E28 0000882D */ daddu $s1, $zero, $zero +/* 89840C 80240E2C 3C148024 */ lui $s4, 0x8024 +/* 898410 80240E30 26942708 */ addiu $s4, $s4, 0x2708 +/* 898414 80240E34 24130020 */ addiu $s3, $zero, 0x20 +/* 898418 80240E38 3C064248 */ lui $a2, 0x4248 +/* 89841C 80240E3C 44800000 */ mtc1 $zero, $f0 +/* 898420 80240E40 24020014 */ addiu $v0, $zero, 0x14 +/* 898424 80240E44 AFA20010 */ sw $v0, 0x10($sp) +/* 898428 80240E48 44050000 */ mfc1 $a1, $f0 +/* 89842C 80240E4C 8E470060 */ lw $a3, 0x60($s2) +/* 898430 80240E50 4485B000 */ mtc1 $a1, $f22 +/* 898434 80240E54 0C00A8ED */ jal update_lerp +/* 898438 80240E58 0240802D */ daddu $s0, $s2, $zero +/* 89843C 80240E5C 46000506 */ mov.s $f20, $f0 +.L80240E60: +/* 898440 80240E60 4406A000 */ mfc1 $a2, $f20 +/* 898444 80240E64 27A40020 */ addiu $a0, $sp, 0x20 +/* 898448 80240E68 E6160020 */ swc1 $f22, 0x20($s0) +/* 89844C 80240E6C 8E870000 */ lw $a3, ($s4) +/* 898450 80240E70 02532821 */ addu $a1, $s2, $s3 +/* 898454 80240E74 0C00A7E7 */ jal add_vec2D_polar +/* 898458 80240E78 E7B60020 */ swc1 $f22, 0x20($sp) +/* 89845C 80240E7C C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 898460 80240E80 C7A00020 */ lwc1 $f0, 0x20($sp) +/* 898464 80240E84 46002102 */ mul.s $f4, $f4, $f0 +/* 898468 80240E88 00000000 */ nop +/* 89846C 80240E8C C7A20018 */ lwc1 $f2, 0x18($sp) +/* 898470 80240E90 26940004 */ addiu $s4, $s4, 4 +/* 898474 80240E94 46001082 */ mul.s $f2, $f2, $f0 +/* 898478 80240E98 00000000 */ nop +/* 89847C 80240E9C 26730004 */ addiu $s3, $s3, 4 +/* 898480 80240EA0 26310001 */ addiu $s1, $s1, 1 +/* 898484 80240EA4 2A220003 */ slti $v0, $s1, 3 +/* 898488 80240EA8 E6040014 */ swc1 $f4, 0x14($s0) +/* 89848C 80240EAC E602002C */ swc1 $f2, 0x2c($s0) +/* 898490 80240EB0 1440FFEB */ bnez $v0, .L80240E60 +/* 898494 80240EB4 26100004 */ addiu $s0, $s0, 4 +/* 898498 80240EB8 8E420060 */ lw $v0, 0x60($s2) +/* 89849C 80240EBC 24420001 */ addiu $v0, $v0, 1 +/* 8984A0 80240EC0 AE420060 */ sw $v0, 0x60($s2) +/* 8984A4 80240EC4 28420015 */ slti $v0, $v0, 0x15 +/* 8984A8 80240EC8 1440003D */ bnez $v0, .L80240FC0 +/* 8984AC 80240ECC 24020001 */ addiu $v0, $zero, 1 +/* 8984B0 80240ED0 AE420000 */ sw $v0, ($s2) +/* 8984B4 80240ED4 080903F0 */ j .L80240FC0 +/* 8984B8 80240ED8 AE400060 */ sw $zero, 0x60($s2) +.L80240EDC: +/* 8984BC 80240EDC 0000882D */ daddu $s1, $zero, $zero +/* 8984C0 80240EE0 3C148024 */ lui $s4, 0x8024 +/* 8984C4 80240EE4 26942708 */ addiu $s4, $s4, 0x2708 +/* 8984C8 80240EE8 24130020 */ addiu $s3, $zero, 0x20 +/* 8984CC 80240EEC 0240802D */ daddu $s0, $s2, $zero +/* 8984D0 80240EF0 3C014248 */ lui $at, 0x4248 +/* 8984D4 80240EF4 4481A000 */ mtc1 $at, $f20 +/* 8984D8 80240EF8 4480B000 */ mtc1 $zero, $f22 +.L80240EFC: +/* 8984DC 80240EFC 4406A000 */ mfc1 $a2, $f20 +/* 8984E0 80240F00 27A40020 */ addiu $a0, $sp, 0x20 +/* 8984E4 80240F04 E6160020 */ swc1 $f22, 0x20($s0) +/* 8984E8 80240F08 8E870000 */ lw $a3, ($s4) +/* 8984EC 80240F0C 02532821 */ addu $a1, $s2, $s3 +/* 8984F0 80240F10 0C00A7E7 */ jal add_vec2D_polar +/* 8984F4 80240F14 E7B60020 */ swc1 $f22, 0x20($sp) +/* 8984F8 80240F18 C7A4001C */ lwc1 $f4, 0x1c($sp) +/* 8984FC 80240F1C C7A00020 */ lwc1 $f0, 0x20($sp) +/* 898500 80240F20 46002102 */ mul.s $f4, $f4, $f0 +/* 898504 80240F24 00000000 */ nop +/* 898508 80240F28 C7A20018 */ lwc1 $f2, 0x18($sp) +/* 89850C 80240F2C 26940004 */ addiu $s4, $s4, 4 +/* 898510 80240F30 46001082 */ mul.s $f2, $f2, $f0 +/* 898514 80240F34 00000000 */ nop +/* 898518 80240F38 26730004 */ addiu $s3, $s3, 4 +/* 89851C 80240F3C 26310001 */ addiu $s1, $s1, 1 +/* 898520 80240F40 2A220003 */ slti $v0, $s1, 3 +/* 898524 80240F44 E6040014 */ swc1 $f4, 0x14($s0) +/* 898528 80240F48 E602002C */ swc1 $f2, 0x2c($s0) +/* 89852C 80240F4C 1440FFEB */ bnez $v0, .L80240EFC +/* 898530 80240F50 26100004 */ addiu $s0, $s0, 4 +/* 898534 80240F54 8E420060 */ lw $v0, 0x60($s2) +/* 898538 80240F58 24420001 */ addiu $v0, $v0, 1 +/* 89853C 80240F5C AE420060 */ sw $v0, 0x60($s2) +/* 898540 80240F60 28420010 */ slti $v0, $v0, 0x10 +/* 898544 80240F64 14400016 */ bnez $v0, .L80240FC0 +/* 898548 80240F68 2402000F */ addiu $v0, $zero, 0xf +/* 89854C 80240F6C AE420060 */ sw $v0, 0x60($s2) +/* 898550 80240F70 24020002 */ addiu $v0, $zero, 2 +/* 898554 80240F74 080903F0 */ j .L80240FC0 +/* 898558 80240F78 AE420000 */ sw $v0, ($s2) +.L80240F7C: +/* 89855C 80240F7C 8E420060 */ lw $v0, 0x60($s2) +/* 898560 80240F80 24420001 */ addiu $v0, $v0, 1 +/* 898564 80240F84 AE420060 */ sw $v0, 0x60($s2) +/* 898568 80240F88 2842001F */ slti $v0, $v0, 0x1f +/* 89856C 80240F8C 1440000C */ bnez $v0, .L80240FC0 +/* 898570 80240F90 0000882D */ daddu $s1, $zero, $zero +/* 898574 80240F94 0240282D */ daddu $a1, $s2, $zero +.L80240F98: +/* 898578 80240F98 8CA20008 */ lw $v0, 8($a1) +/* 89857C 80240F9C 8C430000 */ lw $v1, ($v0) +/* 898580 80240FA0 26310001 */ addiu $s1, $s1, 1 +/* 898584 80240FA4 34630010 */ ori $v1, $v1, 0x10 +/* 898588 80240FA8 AC430000 */ sw $v1, ($v0) +/* 89858C 80240FAC 2A220003 */ slti $v0, $s1, 3 +/* 898590 80240FB0 1440FFF9 */ bnez $v0, .L80240F98 +/* 898594 80240FB4 24A50004 */ addiu $a1, $a1, 4 +/* 898598 80240FB8 0809043D */ j .L802410F4 +/* 89859C 80240FBC 24020002 */ addiu $v0, $zero, 2 +.L80240FC0: +/* 8985A0 80240FC0 8E430004 */ lw $v1, 4($s2) +/* 8985A4 80240FC4 10600005 */ beqz $v1, .L80240FDC +/* 8985A8 80240FC8 24020001 */ addiu $v0, $zero, 1 +/* 8985AC 80240FCC 1062000B */ beq $v1, $v0, .L80240FFC +/* 8985B0 80240FD0 0000882D */ daddu $s1, $zero, $zero +/* 8985B4 80240FD4 0809042C */ j .L802410B0 +/* 8985B8 80240FD8 0240282D */ daddu $a1, $s2, $zero +.L80240FDC: +/* 8985BC 80240FDC 8E420064 */ lw $v0, 0x64($s2) +/* 8985C0 80240FE0 24420001 */ addiu $v0, $v0, 1 +/* 8985C4 80240FE4 AE420064 */ sw $v0, 0x64($s2) +/* 8985C8 80240FE8 28420010 */ slti $v0, $v0, 0x10 +/* 8985CC 80240FEC 1440002F */ bnez $v0, .L802410AC +/* 8985D0 80240FF0 0000882D */ daddu $s1, $zero, $zero +/* 8985D4 80240FF4 08090428 */ j .L802410A0 +/* 8985D8 80240FF8 24020001 */ addiu $v0, $zero, 1 +.L80240FFC: +/* 8985DC 80240FFC 4480A000 */ mtc1 $zero, $f20 +/* 8985E0 80241000 24130014 */ addiu $s3, $zero, 0x14 +/* 8985E4 80241004 0240802D */ daddu $s0, $s2, $zero +.L80241008: +/* 8985E8 80241008 4405A000 */ mfc1 $a1, $f20 +/* 8985EC 8024100C AFB30010 */ sw $s3, 0x10($sp) +/* 8985F0 80241010 8E060038 */ lw $a2, 0x38($s0) +/* 8985F4 80241014 8E470064 */ lw $a3, 0x64($s2) +/* 8985F8 80241018 0C00A8ED */ jal update_lerp +/* 8985FC 8024101C 24040001 */ addiu $a0, $zero, 1 +/* 898600 80241020 C6020014 */ lwc1 $f2, 0x14($s0) +/* 898604 80241024 46001080 */ add.s $f2, $f2, $f0 +/* 898608 80241028 4405A000 */ mfc1 $a1, $f20 +/* 89860C 8024102C E6020014 */ swc1 $f2, 0x14($s0) +/* 898610 80241030 AFB30010 */ sw $s3, 0x10($sp) +/* 898614 80241034 8E060044 */ lw $a2, 0x44($s0) +/* 898618 80241038 8E470064 */ lw $a3, 0x64($s2) +/* 89861C 8024103C 0C00A8ED */ jal update_lerp +/* 898620 80241040 24040001 */ addiu $a0, $zero, 1 +/* 898624 80241044 C6020020 */ lwc1 $f2, 0x20($s0) +/* 898628 80241048 46001080 */ add.s $f2, $f2, $f0 +/* 89862C 8024104C 4405A000 */ mfc1 $a1, $f20 +/* 898630 80241050 E6020020 */ swc1 $f2, 0x20($s0) +/* 898634 80241054 AFB30010 */ sw $s3, 0x10($sp) +/* 898638 80241058 8E060050 */ lw $a2, 0x50($s0) +/* 89863C 8024105C 8E470064 */ lw $a3, 0x64($s2) +/* 898640 80241060 0C00A8ED */ jal update_lerp +/* 898644 80241064 24040001 */ addiu $a0, $zero, 1 +/* 898648 80241068 C602002C */ lwc1 $f2, 0x2c($s0) +/* 89864C 8024106C 46001080 */ add.s $f2, $f2, $f0 +/* 898650 80241070 26310001 */ addiu $s1, $s1, 1 +/* 898654 80241074 2A220003 */ slti $v0, $s1, 3 +/* 898658 80241078 E602002C */ swc1 $f2, 0x2c($s0) +/* 89865C 8024107C 1440FFE2 */ bnez $v0, .L80241008 +/* 898660 80241080 26100004 */ addiu $s0, $s0, 4 +/* 898664 80241084 8E420064 */ lw $v0, 0x64($s2) +/* 898668 80241088 24420001 */ addiu $v0, $v0, 1 +/* 89866C 8024108C AE420064 */ sw $v0, 0x64($s2) +/* 898670 80241090 28420015 */ slti $v0, $v0, 0x15 +/* 898674 80241094 14400005 */ bnez $v0, .L802410AC +/* 898678 80241098 0000882D */ daddu $s1, $zero, $zero +/* 89867C 8024109C 24020002 */ addiu $v0, $zero, 2 +.L802410A0: +/* 898680 802410A0 AE420004 */ sw $v0, 4($s2) +/* 898684 802410A4 AE400064 */ sw $zero, 0x64($s2) +/* 898688 802410A8 0000882D */ daddu $s1, $zero, $zero +.L802410AC: +/* 89868C 802410AC 0240282D */ daddu $a1, $s2, $zero +.L802410B0: +/* 898690 802410B0 8CA20008 */ lw $v0, 8($a1) +/* 898694 802410B4 C4A00014 */ lwc1 $f0, 0x14($a1) +/* 898698 802410B8 8C42000C */ lw $v0, 0xc($v0) +/* 89869C 802410BC E4400010 */ swc1 $f0, 0x10($v0) +/* 8986A0 802410C0 8CA20008 */ lw $v0, 8($a1) +/* 8986A4 802410C4 C4A00020 */ lwc1 $f0, 0x20($a1) +/* 8986A8 802410C8 8C42000C */ lw $v0, 0xc($v0) +/* 8986AC 802410CC 26310001 */ addiu $s1, $s1, 1 +/* 8986B0 802410D0 E4400014 */ swc1 $f0, 0x14($v0) +/* 8986B4 802410D4 8CA20008 */ lw $v0, 8($a1) +/* 8986B8 802410D8 C4A0002C */ lwc1 $f0, 0x2c($a1) +/* 8986BC 802410DC 8C42000C */ lw $v0, 0xc($v0) +/* 8986C0 802410E0 E4400018 */ swc1 $f0, 0x18($v0) +/* 8986C4 802410E4 2A220003 */ slti $v0, $s1, 3 +/* 8986C8 802410E8 1440FFF1 */ bnez $v0, .L802410B0 +/* 8986CC 802410EC 24A50004 */ addiu $a1, $a1, 4 +/* 8986D0 802410F0 0000102D */ daddu $v0, $zero, $zero +.L802410F4: +/* 8986D4 802410F4 8FBF0044 */ lw $ra, 0x44($sp) +/* 8986D8 802410F8 8FB60040 */ lw $s6, 0x40($sp) +/* 8986DC 802410FC 8FB5003C */ lw $s5, 0x3c($sp) +/* 8986E0 80241100 8FB40038 */ lw $s4, 0x38($sp) +/* 8986E4 80241104 8FB30034 */ lw $s3, 0x34($sp) +/* 8986E8 80241108 8FB20030 */ lw $s2, 0x30($sp) +/* 8986EC 8024110C 8FB1002C */ lw $s1, 0x2c($sp) +/* 8986F0 80241110 8FB00028 */ lw $s0, 0x28($sp) +/* 8986F4 80241114 D7B80058 */ ldc1 $f24, 0x58($sp) +/* 8986F8 80241118 D7B60050 */ ldc1 $f22, 0x50($sp) +/* 8986FC 8024111C D7B40048 */ ldc1 $f20, 0x48($sp) +/* 898700 80241120 03E00008 */ jr $ra +/* 898704 80241124 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128.s deleted file mode 100644 index 7ae728285e..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128.s +++ /dev/null @@ -1,92 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241128 -/* 898708 80241128 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89870C 8024112C AFB10014 */ sw $s1, 0x14($sp) -/* 898710 80241130 0080882D */ daddu $s1, $a0, $zero -/* 898714 80241134 AFB20018 */ sw $s2, 0x18($sp) -/* 898718 80241138 AFBF001C */ sw $ra, 0x1c($sp) -/* 89871C 8024113C AFB00010 */ sw $s0, 0x10($sp) -/* 898720 80241140 8E30000C */ lw $s0, 0xc($s1) -/* 898724 80241144 10A00010 */ beqz $a1, .L80241188 -/* 898728 80241148 0000902D */ daddu $s2, $zero, $zero -/* 89872C 8024114C 8E050000 */ lw $a1, ($s0) -/* 898730 80241150 0C0B1EAF */ jal get_variable -/* 898734 80241154 26100004 */ addiu $s0, $s0, 4 -/* 898738 80241158 AE220084 */ sw $v0, 0x84($s1) -/* 89873C 8024115C 8E050000 */ lw $a1, ($s0) -/* 898740 80241160 0C0B1EAF */ jal get_variable -/* 898744 80241164 0220202D */ daddu $a0, $s1, $zero -/* 898748 80241168 0240202D */ daddu $a0, $s2, $zero -/* 89874C 8024116C 240500D0 */ addiu $a1, $zero, 0xd0 -/* 898750 80241170 00A0302D */ daddu $a2, $a1, $zero -/* 898754 80241174 00A0382D */ daddu $a3, $a1, $zero -/* 898758 80241178 AE220088 */ sw $v0, 0x88($s1) -/* 89875C 8024117C AE200070 */ sw $zero, 0x70($s1) -/* 898760 80241180 0C04DF84 */ jal func_80137E10 -/* 898764 80241184 AE200074 */ sw $zero, 0x74($s1) -.L80241188: -/* 898768 80241188 8E230070 */ lw $v1, 0x70($s1) -/* 89876C 8024118C 24040001 */ addiu $a0, $zero, 1 -/* 898770 80241190 10640019 */ beq $v1, $a0, .L802411F8 -/* 898774 80241194 28620002 */ slti $v0, $v1, 2 -/* 898778 80241198 10400005 */ beqz $v0, .L802411B0 -/* 89877C 8024119C 24020002 */ addiu $v0, $zero, 2 -/* 898780 802411A0 10600007 */ beqz $v1, .L802411C0 -/* 898784 802411A4 240500FF */ addiu $a1, $zero, 0xff -/* 898788 802411A8 0809048E */ j .L80241238 -/* 89878C 802411AC 00000000 */ nop -.L802411B0: -/* 898790 802411B0 10620019 */ beq $v1, $v0, .L80241218 -/* 898794 802411B4 00000000 */ nop -/* 898798 802411B8 0809048E */ j .L80241238 -/* 89879C 802411BC 00000000 */ nop -.L802411C0: -/* 8987A0 802411C0 8E220074 */ lw $v0, 0x74($s1) -/* 8987A4 802411C4 14450004 */ bne $v0, $a1, .L802411D8 -/* 8987A8 802411C8 00000000 */ nop -/* 8987AC 802411CC AE240070 */ sw $a0, 0x70($s1) -/* 8987B0 802411D0 AE200078 */ sw $zero, 0x78($s1) -/* 8987B4 802411D4 8E220074 */ lw $v0, 0x74($s1) -.L802411D8: -/* 8987B8 802411D8 8E230084 */ lw $v1, 0x84($s1) -/* 8987BC 802411DC 00431021 */ addu $v0, $v0, $v1 -/* 8987C0 802411E0 AE220074 */ sw $v0, 0x74($s1) -/* 8987C4 802411E4 28420100 */ slti $v0, $v0, 0x100 -/* 8987C8 802411E8 50400013 */ beql $v0, $zero, .L80241238 -/* 8987CC 802411EC AE250074 */ sw $a1, 0x74($s1) -/* 8987D0 802411F0 0809048E */ j .L80241238 -/* 8987D4 802411F4 00000000 */ nop -.L802411F8: -/* 8987D8 802411F8 8E220078 */ lw $v0, 0x78($s1) -/* 8987DC 802411FC 24420001 */ addiu $v0, $v0, 1 -/* 8987E0 80241200 AE220078 */ sw $v0, 0x78($s1) -/* 8987E4 80241204 28420002 */ slti $v0, $v0, 2 -/* 8987E8 80241208 1440000B */ bnez $v0, .L80241238 -/* 8987EC 8024120C 24020002 */ addiu $v0, $zero, 2 -/* 8987F0 80241210 0809048E */ j .L80241238 -/* 8987F4 80241214 AE220070 */ sw $v0, 0x70($s1) -.L80241218: -/* 8987F8 80241218 8E230074 */ lw $v1, 0x74($s1) -/* 8987FC 8024121C 50600001 */ beql $v1, $zero, .L80241224 -/* 898800 80241220 24120001 */ addiu $s2, $zero, 1 -.L80241224: -/* 898804 80241224 8E220088 */ lw $v0, 0x88($s1) -/* 898808 80241228 00621023 */ subu $v0, $v1, $v0 -/* 89880C 8024122C 04410002 */ bgez $v0, .L80241238 -/* 898810 80241230 AE220074 */ sw $v0, 0x74($s1) -/* 898814 80241234 AE200074 */ sw $zero, 0x74($s1) -.L80241238: -/* 898818 80241238 C6200074 */ lwc1 $f0, 0x74($s1) -/* 89881C 8024123C 46800020 */ cvt.s.w $f0, $f0 -/* 898820 80241240 44050000 */ mfc1 $a1, $f0 -/* 898824 80241244 0C04DF62 */ jal func_80137D88 -/* 898828 80241248 24040001 */ addiu $a0, $zero, 1 -/* 89882C 8024124C 0240102D */ daddu $v0, $s2, $zero -/* 898830 80241250 8FBF001C */ lw $ra, 0x1c($sp) -/* 898834 80241254 8FB20018 */ lw $s2, 0x18($sp) -/* 898838 80241258 8FB10014 */ lw $s1, 0x14($sp) -/* 89883C 8024125C 8FB00010 */ lw $s0, 0x10($sp) -/* 898840 80241260 03E00008 */ jr $ra -/* 898844 80241264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s new file mode 100644 index 0000000000..4cd105bf26 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241128_898708.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241128_898708 +/* 898708 80241128 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 89870C 8024112C AFB10014 */ sw $s1, 0x14($sp) +/* 898710 80241130 0080882D */ daddu $s1, $a0, $zero +/* 898714 80241134 AFB20018 */ sw $s2, 0x18($sp) +/* 898718 80241138 AFBF001C */ sw $ra, 0x1c($sp) +/* 89871C 8024113C AFB00010 */ sw $s0, 0x10($sp) +/* 898720 80241140 8E30000C */ lw $s0, 0xc($s1) +/* 898724 80241144 10A00010 */ beqz $a1, .L80241188 +/* 898728 80241148 0000902D */ daddu $s2, $zero, $zero +/* 89872C 8024114C 8E050000 */ lw $a1, ($s0) +/* 898730 80241150 0C0B1EAF */ jal get_variable +/* 898734 80241154 26100004 */ addiu $s0, $s0, 4 +/* 898738 80241158 AE220084 */ sw $v0, 0x84($s1) +/* 89873C 8024115C 8E050000 */ lw $a1, ($s0) +/* 898740 80241160 0C0B1EAF */ jal get_variable +/* 898744 80241164 0220202D */ daddu $a0, $s1, $zero +/* 898748 80241168 0240202D */ daddu $a0, $s2, $zero +/* 89874C 8024116C 240500D0 */ addiu $a1, $zero, 0xd0 +/* 898750 80241170 00A0302D */ daddu $a2, $a1, $zero +/* 898754 80241174 00A0382D */ daddu $a3, $a1, $zero +/* 898758 80241178 AE220088 */ sw $v0, 0x88($s1) +/* 89875C 8024117C AE200070 */ sw $zero, 0x70($s1) +/* 898760 80241180 0C04DF84 */ jal func_80137E10 +/* 898764 80241184 AE200074 */ sw $zero, 0x74($s1) +.L80241188: +/* 898768 80241188 8E230070 */ lw $v1, 0x70($s1) +/* 89876C 8024118C 24040001 */ addiu $a0, $zero, 1 +/* 898770 80241190 10640019 */ beq $v1, $a0, .L802411F8 +/* 898774 80241194 28620002 */ slti $v0, $v1, 2 +/* 898778 80241198 10400005 */ beqz $v0, .L802411B0 +/* 89877C 8024119C 24020002 */ addiu $v0, $zero, 2 +/* 898780 802411A0 10600007 */ beqz $v1, .L802411C0 +/* 898784 802411A4 240500FF */ addiu $a1, $zero, 0xff +/* 898788 802411A8 0809048E */ j .L80241238 +/* 89878C 802411AC 00000000 */ nop +.L802411B0: +/* 898790 802411B0 10620019 */ beq $v1, $v0, .L80241218 +/* 898794 802411B4 00000000 */ nop +/* 898798 802411B8 0809048E */ j .L80241238 +/* 89879C 802411BC 00000000 */ nop +.L802411C0: +/* 8987A0 802411C0 8E220074 */ lw $v0, 0x74($s1) +/* 8987A4 802411C4 14450004 */ bne $v0, $a1, .L802411D8 +/* 8987A8 802411C8 00000000 */ nop +/* 8987AC 802411CC AE240070 */ sw $a0, 0x70($s1) +/* 8987B0 802411D0 AE200078 */ sw $zero, 0x78($s1) +/* 8987B4 802411D4 8E220074 */ lw $v0, 0x74($s1) +.L802411D8: +/* 8987B8 802411D8 8E230084 */ lw $v1, 0x84($s1) +/* 8987BC 802411DC 00431021 */ addu $v0, $v0, $v1 +/* 8987C0 802411E0 AE220074 */ sw $v0, 0x74($s1) +/* 8987C4 802411E4 28420100 */ slti $v0, $v0, 0x100 +/* 8987C8 802411E8 50400013 */ beql $v0, $zero, .L80241238 +/* 8987CC 802411EC AE250074 */ sw $a1, 0x74($s1) +/* 8987D0 802411F0 0809048E */ j .L80241238 +/* 8987D4 802411F4 00000000 */ nop +.L802411F8: +/* 8987D8 802411F8 8E220078 */ lw $v0, 0x78($s1) +/* 8987DC 802411FC 24420001 */ addiu $v0, $v0, 1 +/* 8987E0 80241200 AE220078 */ sw $v0, 0x78($s1) +/* 8987E4 80241204 28420002 */ slti $v0, $v0, 2 +/* 8987E8 80241208 1440000B */ bnez $v0, .L80241238 +/* 8987EC 8024120C 24020002 */ addiu $v0, $zero, 2 +/* 8987F0 80241210 0809048E */ j .L80241238 +/* 8987F4 80241214 AE220070 */ sw $v0, 0x70($s1) +.L80241218: +/* 8987F8 80241218 8E230074 */ lw $v1, 0x74($s1) +/* 8987FC 8024121C 50600001 */ beql $v1, $zero, .L80241224 +/* 898800 80241220 24120001 */ addiu $s2, $zero, 1 +.L80241224: +/* 898804 80241224 8E220088 */ lw $v0, 0x88($s1) +/* 898808 80241228 00621023 */ subu $v0, $v1, $v0 +/* 89880C 8024122C 04410002 */ bgez $v0, .L80241238 +/* 898810 80241230 AE220074 */ sw $v0, 0x74($s1) +/* 898814 80241234 AE200074 */ sw $zero, 0x74($s1) +.L80241238: +/* 898818 80241238 C6200074 */ lwc1 $f0, 0x74($s1) +/* 89881C 8024123C 46800020 */ cvt.s.w $f0, $f0 +/* 898820 80241240 44050000 */ mfc1 $a1, $f0 +/* 898824 80241244 0C04DF62 */ jal func_80137D88 +/* 898828 80241248 24040001 */ addiu $a0, $zero, 1 +/* 89882C 8024124C 0240102D */ daddu $v0, $s2, $zero +/* 898830 80241250 8FBF001C */ lw $ra, 0x1c($sp) +/* 898834 80241254 8FB20018 */ lw $s2, 0x18($sp) +/* 898838 80241258 8FB10014 */ lw $s1, 0x14($sp) +/* 89883C 8024125C 8FB00010 */ lw $s0, 0x10($sp) +/* 898840 80241260 03E00008 */ jr $ra +/* 898844 80241264 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268.s deleted file mode 100644 index 0a5d586a38..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241268 -/* 898848 80241268 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 89884C 8024126C AFBF0018 */ sw $ra, 0x18($sp) -/* 898850 80241270 0C00EAD2 */ jal get_npc_safe -/* 898854 80241274 2404FFFC */ addiu $a0, $zero, -4 -/* 898858 80241278 3C0141F0 */ lui $at, 0x41f0 -/* 89885C 8024127C 44810000 */ mtc1 $at, $f0 -/* 898860 80241280 C442003C */ lwc1 $f2, 0x3c($v0) -/* 898864 80241284 46001080 */ add.s $f2, $f2, $f0 -/* 898868 80241288 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89886C 8024128C 8C450038 */ lw $a1, 0x38($v0) -/* 898870 80241290 8C470040 */ lw $a3, 0x40($v0) -/* 898874 80241294 44061000 */ mfc1 $a2, $f2 -/* 898878 80241298 0C01BFBC */ jal func_8006FEF0 -/* 89887C 8024129C 24040002 */ addiu $a0, $zero, 2 -/* 898880 802412A0 8FBF0018 */ lw $ra, 0x18($sp) -/* 898884 802412A4 24020002 */ addiu $v0, $zero, 2 -/* 898888 802412A8 03E00008 */ jr $ra -/* 89888C 802412AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268_898848.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268_898848.s new file mode 100644 index 0000000000..2a62360939 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80241268_898848.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241268_898848 +/* 898848 80241268 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 89884C 8024126C AFBF0018 */ sw $ra, 0x18($sp) +/* 898850 80241270 0C00EAD2 */ jal get_npc_safe +/* 898854 80241274 2404FFFC */ addiu $a0, $zero, -4 +/* 898858 80241278 3C0141F0 */ lui $at, 0x41f0 +/* 89885C 8024127C 44810000 */ mtc1 $at, $f0 +/* 898860 80241280 C442003C */ lwc1 $f2, 0x3c($v0) +/* 898864 80241284 46001080 */ add.s $f2, $f2, $f0 +/* 898868 80241288 E7A00010 */ swc1 $f0, 0x10($sp) +/* 89886C 8024128C 8C450038 */ lw $a1, 0x38($v0) +/* 898870 80241290 8C470040 */ lw $a3, 0x40($v0) +/* 898874 80241294 44061000 */ mfc1 $a2, $f2 +/* 898878 80241298 0C01BFBC */ jal func_8006FEF0 +/* 89887C 8024129C 24040002 */ addiu $a0, $zero, 2 +/* 898880 802412A0 8FBF0018 */ lw $ra, 0x18($sp) +/* 898884 802412A4 24020002 */ addiu $v0, $zero, 2 +/* 898888 802412A8 03E00008 */ jr $ra +/* 89888C 802412AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240B10.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240B10.s deleted file mode 100644 index 072890f304..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240B10.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B10 -/* 89AE60 80240B10 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 89AE64 80240B14 AFB3003C */ sw $s3, 0x3c($sp) -/* 89AE68 80240B18 0080982D */ daddu $s3, $a0, $zero -/* 89AE6C 80240B1C AFBF0040 */ sw $ra, 0x40($sp) -/* 89AE70 80240B20 AFB20038 */ sw $s2, 0x38($sp) -/* 89AE74 80240B24 AFB10034 */ sw $s1, 0x34($sp) -/* 89AE78 80240B28 AFB00030 */ sw $s0, 0x30($sp) -/* 89AE7C 80240B2C 8E710148 */ lw $s1, 0x148($s3) -/* 89AE80 80240B30 0C00EABB */ jal get_npc_unsafe -/* 89AE84 80240B34 86240008 */ lh $a0, 8($s1) -/* 89AE88 80240B38 0040802D */ daddu $s0, $v0, $zero -/* 89AE8C 80240B3C 8E22007C */ lw $v0, 0x7c($s1) -/* 89AE90 80240B40 8603008E */ lh $v1, 0x8e($s0) -/* 89AE94 80240B44 2442FFFF */ addiu $v0, $v0, -1 -/* 89AE98 80240B48 14620012 */ bne $v1, $v0, .L80240B94 -/* 89AE9C 80240B4C 00000000 */ nop -/* 89AEA0 80240B50 C6000038 */ lwc1 $f0, 0x38($s0) -/* 89AEA4 80240B54 4600020D */ trunc.w.s $f8, $f0 -/* 89AEA8 80240B58 44024000 */ mfc1 $v0, $f8 -/* 89AEAC 80240B5C 00000000 */ nop -/* 89AEB0 80240B60 A6220010 */ sh $v0, 0x10($s1) -/* 89AEB4 80240B64 C600003C */ lwc1 $f0, 0x3c($s0) -/* 89AEB8 80240B68 4600020D */ trunc.w.s $f8, $f0 -/* 89AEBC 80240B6C 44024000 */ mfc1 $v0, $f8 -/* 89AEC0 80240B70 00000000 */ nop -/* 89AEC4 80240B74 A6220012 */ sh $v0, 0x12($s1) -/* 89AEC8 80240B78 C6000040 */ lwc1 $f0, 0x40($s0) -/* 89AECC 80240B7C 24020001 */ addiu $v0, $zero, 1 -/* 89AED0 80240B80 A2220007 */ sb $v0, 7($s1) -/* 89AED4 80240B84 4600020D */ trunc.w.s $f8, $f0 -/* 89AED8 80240B88 44024000 */ mfc1 $v0, $f8 -/* 89AEDC 80240B8C 00000000 */ nop -/* 89AEE0 80240B90 A6220014 */ sh $v0, 0x14($s1) -.L80240B94: -/* 89AEE4 80240B94 C6000038 */ lwc1 $f0, 0x38($s0) -/* 89AEE8 80240B98 C602003C */ lwc1 $f2, 0x3c($s0) -/* 89AEEC 80240B9C C6040040 */ lwc1 $f4, 0x40($s0) -/* 89AEF0 80240BA0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 89AEF4 80240BA4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 89AEF8 80240BA8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 89AEFC 80240BAC E7A40028 */ swc1 $f4, 0x28($sp) -/* 89AF00 80240BB0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 89AF04 80240BB4 C600000C */ lwc1 $f0, 0xc($s0) -/* 89AF08 80240BB8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 89AF0C 80240BBC 860200A8 */ lh $v0, 0xa8($s0) -/* 89AF10 80240BC0 27A50020 */ addiu $a1, $sp, 0x20 -/* 89AF14 80240BC4 44820000 */ mtc1 $v0, $f0 -/* 89AF18 80240BC8 00000000 */ nop -/* 89AF1C 80240BCC 46800020 */ cvt.s.w $f0, $f0 -/* 89AF20 80240BD0 E7A00018 */ swc1 $f0, 0x18($sp) -/* 89AF24 80240BD4 860200A6 */ lh $v0, 0xa6($s0) -/* 89AF28 80240BD8 27A60024 */ addiu $a2, $sp, 0x24 -/* 89AF2C 80240BDC 44820000 */ mtc1 $v0, $f0 -/* 89AF30 80240BE0 00000000 */ nop -/* 89AF34 80240BE4 46800020 */ cvt.s.w $f0, $f0 -/* 89AF38 80240BE8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 89AF3C 80240BEC 8E040080 */ lw $a0, 0x80($s0) -/* 89AF40 80240BF0 0C037711 */ jal func_800DDC44 -/* 89AF44 80240BF4 27A70028 */ addiu $a3, $sp, 0x28 -/* 89AF48 80240BF8 0040902D */ daddu $s2, $v0, $zero -/* 89AF4C 80240BFC 16400005 */ bnez $s2, .L80240C14 -/* 89AF50 80240C00 00000000 */ nop -/* 89AF54 80240C04 8E050018 */ lw $a1, 0x18($s0) -/* 89AF58 80240C08 8E06000C */ lw $a2, 0xc($s0) -/* 89AF5C 80240C0C 0C00EA95 */ jal npc_move_heading -/* 89AF60 80240C10 0200202D */ daddu $a0, $s0, $zero -.L80240C14: -/* 89AF64 80240C14 8602008E */ lh $v0, 0x8e($s0) -/* 89AF68 80240C18 9603008E */ lhu $v1, 0x8e($s0) -/* 89AF6C 80240C1C 18400007 */ blez $v0, .L80240C3C -/* 89AF70 80240C20 2462FFFF */ addiu $v0, $v1, -1 -/* 89AF74 80240C24 A602008E */ sh $v0, 0x8e($s0) -/* 89AF78 80240C28 00021400 */ sll $v0, $v0, 0x10 -/* 89AF7C 80240C2C 18400003 */ blez $v0, .L80240C3C -/* 89AF80 80240C30 00000000 */ nop -/* 89AF84 80240C34 12400008 */ beqz $s2, .L80240C58 -/* 89AF88 80240C38 00000000 */ nop -.L80240C3C: -/* 89AF8C 80240C3C 8E2200CC */ lw $v0, 0xcc($s1) -/* 89AF90 80240C40 A2200007 */ sb $zero, 7($s1) -/* 89AF94 80240C44 8C420028 */ lw $v0, 0x28($v0) -/* 89AF98 80240C48 A600008E */ sh $zero, 0x8e($s0) -/* 89AF9C 80240C4C AE020028 */ sw $v0, 0x28($s0) -/* 89AFA0 80240C50 2402000F */ addiu $v0, $zero, 0xf -/* 89AFA4 80240C54 AE620070 */ sw $v0, 0x70($s3) -.L80240C58: -/* 89AFA8 80240C58 8FBF0040 */ lw $ra, 0x40($sp) -/* 89AFAC 80240C5C 8FB3003C */ lw $s3, 0x3c($sp) -/* 89AFB0 80240C60 8FB20038 */ lw $s2, 0x38($sp) -/* 89AFB4 80240C64 8FB10034 */ lw $s1, 0x34($sp) -/* 89AFB8 80240C68 8FB00030 */ lw $s0, 0x30($sp) -/* 89AFBC 80240C6C 03E00008 */ jr $ra -/* 89AFC0 80240C70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240B10_89AE60.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240B10_89AE60.s new file mode 100644 index 0000000000..f149d12e74 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240B10_89AE60.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240B10_89AE60 +/* 89AE60 80240B10 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 89AE64 80240B14 AFB3003C */ sw $s3, 0x3c($sp) +/* 89AE68 80240B18 0080982D */ daddu $s3, $a0, $zero +/* 89AE6C 80240B1C AFBF0040 */ sw $ra, 0x40($sp) +/* 89AE70 80240B20 AFB20038 */ sw $s2, 0x38($sp) +/* 89AE74 80240B24 AFB10034 */ sw $s1, 0x34($sp) +/* 89AE78 80240B28 AFB00030 */ sw $s0, 0x30($sp) +/* 89AE7C 80240B2C 8E710148 */ lw $s1, 0x148($s3) +/* 89AE80 80240B30 0C00EABB */ jal get_npc_unsafe +/* 89AE84 80240B34 86240008 */ lh $a0, 8($s1) +/* 89AE88 80240B38 0040802D */ daddu $s0, $v0, $zero +/* 89AE8C 80240B3C 8E22007C */ lw $v0, 0x7c($s1) +/* 89AE90 80240B40 8603008E */ lh $v1, 0x8e($s0) +/* 89AE94 80240B44 2442FFFF */ addiu $v0, $v0, -1 +/* 89AE98 80240B48 14620012 */ bne $v1, $v0, .L80240B94 +/* 89AE9C 80240B4C 00000000 */ nop +/* 89AEA0 80240B50 C6000038 */ lwc1 $f0, 0x38($s0) +/* 89AEA4 80240B54 4600020D */ trunc.w.s $f8, $f0 +/* 89AEA8 80240B58 44024000 */ mfc1 $v0, $f8 +/* 89AEAC 80240B5C 00000000 */ nop +/* 89AEB0 80240B60 A6220010 */ sh $v0, 0x10($s1) +/* 89AEB4 80240B64 C600003C */ lwc1 $f0, 0x3c($s0) +/* 89AEB8 80240B68 4600020D */ trunc.w.s $f8, $f0 +/* 89AEBC 80240B6C 44024000 */ mfc1 $v0, $f8 +/* 89AEC0 80240B70 00000000 */ nop +/* 89AEC4 80240B74 A6220012 */ sh $v0, 0x12($s1) +/* 89AEC8 80240B78 C6000040 */ lwc1 $f0, 0x40($s0) +/* 89AECC 80240B7C 24020001 */ addiu $v0, $zero, 1 +/* 89AED0 80240B80 A2220007 */ sb $v0, 7($s1) +/* 89AED4 80240B84 4600020D */ trunc.w.s $f8, $f0 +/* 89AED8 80240B88 44024000 */ mfc1 $v0, $f8 +/* 89AEDC 80240B8C 00000000 */ nop +/* 89AEE0 80240B90 A6220014 */ sh $v0, 0x14($s1) +.L80240B94: +/* 89AEE4 80240B94 C6000038 */ lwc1 $f0, 0x38($s0) +/* 89AEE8 80240B98 C602003C */ lwc1 $f2, 0x3c($s0) +/* 89AEEC 80240B9C C6040040 */ lwc1 $f4, 0x40($s0) +/* 89AEF0 80240BA0 C6060018 */ lwc1 $f6, 0x18($s0) +/* 89AEF4 80240BA4 E7A00020 */ swc1 $f0, 0x20($sp) +/* 89AEF8 80240BA8 E7A20024 */ swc1 $f2, 0x24($sp) +/* 89AEFC 80240BAC E7A40028 */ swc1 $f4, 0x28($sp) +/* 89AF00 80240BB0 E7A60010 */ swc1 $f6, 0x10($sp) +/* 89AF04 80240BB4 C600000C */ lwc1 $f0, 0xc($s0) +/* 89AF08 80240BB8 E7A00014 */ swc1 $f0, 0x14($sp) +/* 89AF0C 80240BBC 860200A8 */ lh $v0, 0xa8($s0) +/* 89AF10 80240BC0 27A50020 */ addiu $a1, $sp, 0x20 +/* 89AF14 80240BC4 44820000 */ mtc1 $v0, $f0 +/* 89AF18 80240BC8 00000000 */ nop +/* 89AF1C 80240BCC 46800020 */ cvt.s.w $f0, $f0 +/* 89AF20 80240BD0 E7A00018 */ swc1 $f0, 0x18($sp) +/* 89AF24 80240BD4 860200A6 */ lh $v0, 0xa6($s0) +/* 89AF28 80240BD8 27A60024 */ addiu $a2, $sp, 0x24 +/* 89AF2C 80240BDC 44820000 */ mtc1 $v0, $f0 +/* 89AF30 80240BE0 00000000 */ nop +/* 89AF34 80240BE4 46800020 */ cvt.s.w $f0, $f0 +/* 89AF38 80240BE8 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 89AF3C 80240BEC 8E040080 */ lw $a0, 0x80($s0) +/* 89AF40 80240BF0 0C037711 */ jal func_800DDC44 +/* 89AF44 80240BF4 27A70028 */ addiu $a3, $sp, 0x28 +/* 89AF48 80240BF8 0040902D */ daddu $s2, $v0, $zero +/* 89AF4C 80240BFC 16400005 */ bnez $s2, .L80240C14 +/* 89AF50 80240C00 00000000 */ nop +/* 89AF54 80240C04 8E050018 */ lw $a1, 0x18($s0) +/* 89AF58 80240C08 8E06000C */ lw $a2, 0xc($s0) +/* 89AF5C 80240C0C 0C00EA95 */ jal npc_move_heading +/* 89AF60 80240C10 0200202D */ daddu $a0, $s0, $zero +.L80240C14: +/* 89AF64 80240C14 8602008E */ lh $v0, 0x8e($s0) +/* 89AF68 80240C18 9603008E */ lhu $v1, 0x8e($s0) +/* 89AF6C 80240C1C 18400007 */ blez $v0, .L80240C3C +/* 89AF70 80240C20 2462FFFF */ addiu $v0, $v1, -1 +/* 89AF74 80240C24 A602008E */ sh $v0, 0x8e($s0) +/* 89AF78 80240C28 00021400 */ sll $v0, $v0, 0x10 +/* 89AF7C 80240C2C 18400003 */ blez $v0, .L80240C3C +/* 89AF80 80240C30 00000000 */ nop +/* 89AF84 80240C34 12400008 */ beqz $s2, .L80240C58 +/* 89AF88 80240C38 00000000 */ nop +.L80240C3C: +/* 89AF8C 80240C3C 8E2200CC */ lw $v0, 0xcc($s1) +/* 89AF90 80240C40 A2200007 */ sb $zero, 7($s1) +/* 89AF94 80240C44 8C420028 */ lw $v0, 0x28($v0) +/* 89AF98 80240C48 A600008E */ sh $zero, 0x8e($s0) +/* 89AF9C 80240C4C AE020028 */ sw $v0, 0x28($s0) +/* 89AFA0 80240C50 2402000F */ addiu $v0, $zero, 0xf +/* 89AFA4 80240C54 AE620070 */ sw $v0, 0x70($s3) +.L80240C58: +/* 89AFA8 80240C58 8FBF0040 */ lw $ra, 0x40($sp) +/* 89AFAC 80240C5C 8FB3003C */ lw $s3, 0x3c($sp) +/* 89AFB0 80240C60 8FB20038 */ lw $s2, 0x38($sp) +/* 89AFB4 80240C64 8FB10034 */ lw $s1, 0x34($sp) +/* 89AFB8 80240C68 8FB00030 */ lw $s0, 0x30($sp) +/* 89AFBC 80240C6C 03E00008 */ jr $ra +/* 89AFC0 80240C70 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4.s deleted file mode 100644 index 7a9e24923a..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4.s +++ /dev/null @@ -1,304 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CF4 -/* 89B044 80240CF4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 89B048 80240CF8 AFB3005C */ sw $s3, 0x5c($sp) -/* 89B04C 80240CFC 0080982D */ daddu $s3, $a0, $zero -/* 89B050 80240D00 AFBF0068 */ sw $ra, 0x68($sp) -/* 89B054 80240D04 AFB50064 */ sw $s5, 0x64($sp) -/* 89B058 80240D08 AFB40060 */ sw $s4, 0x60($sp) -/* 89B05C 80240D0C AFB20058 */ sw $s2, 0x58($sp) -/* 89B060 80240D10 AFB10054 */ sw $s1, 0x54($sp) -/* 89B064 80240D14 AFB00050 */ sw $s0, 0x50($sp) -/* 89B068 80240D18 8E710148 */ lw $s1, 0x148($s3) -/* 89B06C 80240D1C 86240008 */ lh $a0, 8($s1) -/* 89B070 80240D20 0C00EABB */ jal get_npc_unsafe -/* 89B074 80240D24 00A0802D */ daddu $s0, $a1, $zero -/* 89B078 80240D28 8E63000C */ lw $v1, 0xc($s3) -/* 89B07C 80240D2C 0260202D */ daddu $a0, $s3, $zero -/* 89B080 80240D30 8C650000 */ lw $a1, ($v1) -/* 89B084 80240D34 0C0B1EAF */ jal get_variable -/* 89B088 80240D38 0040902D */ daddu $s2, $v0, $zero -/* 89B08C 80240D3C AFA00028 */ sw $zero, 0x28($sp) -/* 89B090 80240D40 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B094 80240D44 8C630030 */ lw $v1, 0x30($v1) -/* 89B098 80240D48 AFA3002C */ sw $v1, 0x2c($sp) -/* 89B09C 80240D4C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B0A0 80240D50 8C63001C */ lw $v1, 0x1c($v1) -/* 89B0A4 80240D54 AFA30030 */ sw $v1, 0x30($sp) -/* 89B0A8 80240D58 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B0AC 80240D5C 8C630024 */ lw $v1, 0x24($v1) -/* 89B0B0 80240D60 AFA30034 */ sw $v1, 0x34($sp) -/* 89B0B4 80240D64 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B0B8 80240D68 8C630028 */ lw $v1, 0x28($v1) -/* 89B0BC 80240D6C 27B50028 */ addiu $s5, $sp, 0x28 -/* 89B0C0 80240D70 AFA30038 */ sw $v1, 0x38($sp) -/* 89B0C4 80240D74 8E2300D0 */ lw $v1, 0xd0($s1) -/* 89B0C8 80240D78 3C0142C8 */ lui $at, 0x42c8 -/* 89B0CC 80240D7C 44810000 */ mtc1 $at, $f0 -/* 89B0D0 80240D80 8C63002C */ lw $v1, 0x2c($v1) -/* 89B0D4 80240D84 0040A02D */ daddu $s4, $v0, $zero -/* 89B0D8 80240D88 E7A00040 */ swc1 $f0, 0x40($sp) -/* 89B0DC 80240D8C A7A00044 */ sh $zero, 0x44($sp) -/* 89B0E0 80240D90 12000009 */ beqz $s0, .L80240DB8 -/* 89B0E4 80240D94 AFA3003C */ sw $v1, 0x3c($sp) -/* 89B0E8 80240D98 864300A8 */ lh $v1, 0xa8($s2) -/* 89B0EC 80240D9C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 89B0F0 80240DA0 AE20008C */ sw $zero, 0x8c($s1) -/* 89B0F4 80240DA4 A22000B5 */ sb $zero, 0xb5($s1) -/* 89B0F8 80240DA8 34420008 */ ori $v0, $v0, 8 -/* 89B0FC 80240DAC AE230084 */ sw $v1, 0x84($s1) -/* 89B100 80240DB0 08090372 */ j .L80240DC8 -/* 89B104 80240DB4 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240DB8: -/* 89B108 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 89B10C 80240DBC 30420004 */ andi $v0, $v0, 4 -/* 89B110 80240DC0 10400047 */ beqz $v0, .L80240EE0 -/* 89B114 80240DC4 00000000 */ nop -.L80240DC8: -/* 89B118 80240DC8 AE600070 */ sw $zero, 0x70($s3) -/* 89B11C 80240DCC A640008E */ sh $zero, 0x8e($s2) -/* 89B120 80240DD0 8E2300CC */ lw $v1, 0xcc($s1) -/* 89B124 80240DD4 2404F7FF */ addiu $a0, $zero, -0x801 -/* 89B128 80240DD8 A2200007 */ sb $zero, 7($s1) -/* 89B12C 80240DDC 8E420000 */ lw $v0, ($s2) -/* 89B130 80240DE0 8C630000 */ lw $v1, ($v1) -/* 89B134 80240DE4 00441024 */ and $v0, $v0, $a0 -/* 89B138 80240DE8 AE420000 */ sw $v0, ($s2) -/* 89B13C 80240DEC AE430028 */ sw $v1, 0x28($s2) -/* 89B140 80240DF0 96220086 */ lhu $v0, 0x86($s1) -/* 89B144 80240DF4 A64200A8 */ sh $v0, 0xa8($s2) -/* 89B148 80240DF8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 89B14C 80240DFC AE200090 */ sw $zero, 0x90($s1) -/* 89B150 80240E00 8C420034 */ lw $v0, 0x34($v0) -/* 89B154 80240E04 14400006 */ bnez $v0, .L80240E20 -/* 89B158 80240E08 2403FDFF */ addiu $v1, $zero, -0x201 -/* 89B15C 80240E0C 8E420000 */ lw $v0, ($s2) -/* 89B160 80240E10 2403FFF7 */ addiu $v1, $zero, -9 -/* 89B164 80240E14 34420200 */ ori $v0, $v0, 0x200 -/* 89B168 80240E18 0809038B */ j .L80240E2C -/* 89B16C 80240E1C 00431024 */ and $v0, $v0, $v1 -.L80240E20: -/* 89B170 80240E20 8E420000 */ lw $v0, ($s2) -/* 89B174 80240E24 00431024 */ and $v0, $v0, $v1 -/* 89B178 80240E28 34420008 */ ori $v0, $v0, 8 -.L80240E2C: -/* 89B17C 80240E2C AE420000 */ sw $v0, ($s2) -/* 89B180 80240E30 8E2200B0 */ lw $v0, 0xb0($s1) -/* 89B184 80240E34 30420004 */ andi $v0, $v0, 4 -/* 89B188 80240E38 1040001E */ beqz $v0, .L80240EB4 -/* 89B18C 80240E3C 24040002 */ addiu $a0, $zero, 2 -/* 89B190 80240E40 0240282D */ daddu $a1, $s2, $zero -/* 89B194 80240E44 0000302D */ daddu $a2, $zero, $zero -/* 89B198 80240E48 24020063 */ addiu $v0, $zero, 0x63 -/* 89B19C 80240E4C AE620070 */ sw $v0, 0x70($s3) -/* 89B1A0 80240E50 AE600074 */ sw $zero, 0x74($s3) -/* 89B1A4 80240E54 864300A8 */ lh $v1, 0xa8($s2) -/* 89B1A8 80240E58 3C013F80 */ lui $at, 0x3f80 -/* 89B1AC 80240E5C 44810000 */ mtc1 $at, $f0 -/* 89B1B0 80240E60 3C014000 */ lui $at, 0x4000 -/* 89B1B4 80240E64 44811000 */ mtc1 $at, $f2 -/* 89B1B8 80240E68 3C01C1A0 */ lui $at, 0xc1a0 -/* 89B1BC 80240E6C 44812000 */ mtc1 $at, $f4 -/* 89B1C0 80240E70 24020028 */ addiu $v0, $zero, 0x28 -/* 89B1C4 80240E74 AFA2001C */ sw $v0, 0x1c($sp) -/* 89B1C8 80240E78 44833000 */ mtc1 $v1, $f6 -/* 89B1CC 80240E7C 00000000 */ nop -/* 89B1D0 80240E80 468031A0 */ cvt.s.w $f6, $f6 -/* 89B1D4 80240E84 44073000 */ mfc1 $a3, $f6 -/* 89B1D8 80240E88 27A20048 */ addiu $v0, $sp, 0x48 -/* 89B1DC 80240E8C AFA20020 */ sw $v0, 0x20($sp) -/* 89B1E0 80240E90 E7A00010 */ swc1 $f0, 0x10($sp) -/* 89B1E4 80240E94 E7A20014 */ swc1 $f2, 0x14($sp) -/* 89B1E8 80240E98 0C01BFA4 */ jal fx_emote -/* 89B1EC 80240E9C E7A40018 */ swc1 $f4, 0x18($sp) -/* 89B1F0 80240EA0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 89B1F4 80240EA4 2403FFFB */ addiu $v1, $zero, -5 -/* 89B1F8 80240EA8 00431024 */ and $v0, $v0, $v1 -/* 89B1FC 80240EAC 080903B8 */ j .L80240EE0 -/* 89B200 80240EB0 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240EB4: -/* 89B204 80240EB4 8E220000 */ lw $v0, ($s1) -/* 89B208 80240EB8 3C034000 */ lui $v1, 0x4000 -/* 89B20C 80240EBC 00431024 */ and $v0, $v0, $v1 -/* 89B210 80240EC0 10400007 */ beqz $v0, .L80240EE0 -/* 89B214 80240EC4 3C03BFFF */ lui $v1, 0xbfff -/* 89B218 80240EC8 2402000C */ addiu $v0, $zero, 0xc -/* 89B21C 80240ECC AE620070 */ sw $v0, 0x70($s3) -/* 89B220 80240ED0 8E220000 */ lw $v0, ($s1) -/* 89B224 80240ED4 3463FFFF */ ori $v1, $v1, 0xffff -/* 89B228 80240ED8 00431024 */ and $v0, $v0, $v1 -/* 89B22C 80240EDC AE220000 */ sw $v0, ($s1) -.L80240EE0: -/* 89B230 80240EE0 8E220090 */ lw $v0, 0x90($s1) -/* 89B234 80240EE4 1840000C */ blez $v0, .L80240F18 -/* 89B238 80240EE8 2442FFFF */ addiu $v0, $v0, -1 -/* 89B23C 80240EEC 14400087 */ bnez $v0, .L8024110C -/* 89B240 80240EF0 AE220090 */ sw $v0, 0x90($s1) -/* 89B244 80240EF4 3C03FFAA */ lui $v1, 0xffaa -/* 89B248 80240EF8 8E420028 */ lw $v0, 0x28($s2) -/* 89B24C 80240EFC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 89B250 80240F00 00431021 */ addu $v0, $v0, $v1 -/* 89B254 80240F04 2C420002 */ sltiu $v0, $v0, 2 -/* 89B258 80240F08 10400003 */ beqz $v0, .L80240F18 -/* 89B25C 80240F0C 3C020055 */ lui $v0, 0x55 -/* 89B260 80240F10 3442000C */ ori $v0, $v0, 0xc -/* 89B264 80240F14 AE420028 */ sw $v0, 0x28($s2) -.L80240F18: -/* 89B268 80240F18 8E630070 */ lw $v1, 0x70($s3) -/* 89B26C 80240F1C 2402000C */ addiu $v0, $zero, 0xc -/* 89B270 80240F20 10620048 */ beq $v1, $v0, .L80241044 -/* 89B274 80240F24 2862000D */ slti $v0, $v1, 0xd -/* 89B278 80240F28 1040000F */ beqz $v0, .L80240F68 -/* 89B27C 80240F2C 24100001 */ addiu $s0, $zero, 1 -/* 89B280 80240F30 1070001E */ beq $v1, $s0, .L80240FAC -/* 89B284 80240F34 28620002 */ slti $v0, $v1, 2 -/* 89B288 80240F38 10400005 */ beqz $v0, .L80240F50 -/* 89B28C 80240F3C 24020002 */ addiu $v0, $zero, 2 -/* 89B290 80240F40 10600015 */ beqz $v1, .L80240F98 -/* 89B294 80240F44 0260202D */ daddu $a0, $s3, $zero -/* 89B298 80240F48 08090428 */ j .L802410A0 -/* 89B29C 80240F4C 00000000 */ nop -.L80240F50: -/* 89B2A0 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 -/* 89B2A4 80240F54 24020003 */ addiu $v0, $zero, 3 -/* 89B2A8 80240F58 10620035 */ beq $v1, $v0, .L80241030 -/* 89B2AC 80240F5C 0260202D */ daddu $a0, $s3, $zero -/* 89B2B0 80240F60 08090428 */ j .L802410A0 -/* 89B2B4 80240F64 00000000 */ nop -.L80240F68: -/* 89B2B8 80240F68 2402000E */ addiu $v0, $zero, 0xe -/* 89B2BC 80240F6C 1062003F */ beq $v1, $v0, .L8024106C -/* 89B2C0 80240F70 0062102A */ slt $v0, $v1, $v0 -/* 89B2C4 80240F74 14400038 */ bnez $v0, .L80241058 -/* 89B2C8 80240F78 0260202D */ daddu $a0, $s3, $zero -/* 89B2CC 80240F7C 2402000F */ addiu $v0, $zero, 0xf -/* 89B2D0 80240F80 10620040 */ beq $v1, $v0, .L80241084 -/* 89B2D4 80240F84 24020063 */ addiu $v0, $zero, 0x63 -/* 89B2D8 80240F88 10620043 */ beq $v1, $v0, .L80241098 -/* 89B2DC 80240F8C 00000000 */ nop -/* 89B2E0 80240F90 08090428 */ j .L802410A0 -/* 89B2E4 80240F94 00000000 */ nop -.L80240F98: -/* 89B2E8 80240F98 0280282D */ daddu $a1, $s4, $zero -/* 89B2EC 80240F9C 0C012568 */ jal func_800495A0 -/* 89B2F0 80240FA0 02A0302D */ daddu $a2, $s5, $zero -/* 89B2F4 80240FA4 96220086 */ lhu $v0, 0x86($s1) -/* 89B2F8 80240FA8 A64200A8 */ sh $v0, 0xa8($s2) -.L80240FAC: -/* 89B2FC 80240FAC 0260202D */ daddu $a0, $s3, $zero -/* 89B300 80240FB0 0280282D */ daddu $a1, $s4, $zero -/* 89B304 80240FB4 0C0125AE */ jal func_800496B8 -/* 89B308 80240FB8 02A0302D */ daddu $a2, $s5, $zero -/* 89B30C 80240FBC 08090428 */ j .L802410A0 -/* 89B310 80240FC0 00000000 */ nop -.L80240FC4: -/* 89B314 80240FC4 0260202D */ daddu $a0, $s3, $zero -/* 89B318 80240FC8 0280282D */ daddu $a1, $s4, $zero -/* 89B31C 80240FCC 0C0126D1 */ jal func_80049B44 -/* 89B320 80240FD0 02A0302D */ daddu $a2, $s5, $zero -/* 89B324 80240FD4 8E230088 */ lw $v1, 0x88($s1) -/* 89B328 80240FD8 24020006 */ addiu $v0, $zero, 6 -/* 89B32C 80240FDC 14620014 */ bne $v1, $v0, .L80241030 -/* 89B330 80240FE0 0260202D */ daddu $a0, $s3, $zero -/* 89B334 80240FE4 0C00A67F */ jal rand_int -/* 89B338 80240FE8 24040064 */ addiu $a0, $zero, 0x64 -/* 89B33C 80240FEC 28420021 */ slti $v0, $v0, 0x21 -/* 89B340 80240FF0 5040000F */ beql $v0, $zero, .L80241030 -/* 89B344 80240FF4 0260202D */ daddu $a0, $s3, $zero -/* 89B348 80240FF8 8E22008C */ lw $v0, 0x8c($s1) -/* 89B34C 80240FFC 10400005 */ beqz $v0, .L80241014 -/* 89B350 80241000 3C020055 */ lui $v0, 0x55 -/* 89B354 80241004 3442002F */ ori $v0, $v0, 0x2f -/* 89B358 80241008 AE20008C */ sw $zero, 0x8c($s1) -/* 89B35C 8024100C 08090408 */ j .L80241020 -/* 89B360 80241010 A22000B5 */ sb $zero, 0xb5($s1) -.L80241014: -/* 89B364 80241014 3442002E */ ori $v0, $v0, 0x2e -/* 89B368 80241018 AE30008C */ sw $s0, 0x8c($s1) -/* 89B36C 8024101C A23000B5 */ sb $s0, 0xb5($s1) -.L80241020: -/* 89B370 80241020 AE420028 */ sw $v0, 0x28($s2) -/* 89B374 80241024 24020007 */ addiu $v0, $zero, 7 -/* 89B378 80241028 08090443 */ j .L8024110C -/* 89B37C 8024102C AE220090 */ sw $v0, 0x90($s1) -.L80241030: -/* 89B380 80241030 0280282D */ daddu $a1, $s4, $zero -/* 89B384 80241034 0C012701 */ jal func_80049C04 -/* 89B388 80241038 02A0302D */ daddu $a2, $s5, $zero -/* 89B38C 8024103C 08090428 */ j .L802410A0 -/* 89B390 80241040 00000000 */ nop -.L80241044: -/* 89B394 80241044 0260202D */ daddu $a0, $s3, $zero -/* 89B398 80241048 0280282D */ daddu $a1, $s4, $zero -/* 89B39C 8024104C 0C090258 */ jal func_80240960 -/* 89B3A0 80241050 02A0302D */ daddu $a2, $s5, $zero -/* 89B3A4 80241054 0260202D */ daddu $a0, $s3, $zero -.L80241058: -/* 89B3A8 80241058 0280282D */ daddu $a1, $s4, $zero -/* 89B3AC 8024105C 0C090277 */ jal func_802409DC -/* 89B3B0 80241060 02A0302D */ daddu $a2, $s5, $zero -/* 89B3B4 80241064 08090428 */ j .L802410A0 -/* 89B3B8 80241068 00000000 */ nop -.L8024106C: -/* 89B3BC 8024106C 0260202D */ daddu $a0, $s3, $zero -/* 89B3C0 80241070 0280282D */ daddu $a1, $s4, $zero -/* 89B3C4 80241074 0C0902C4 */ jal func_80240B10 -/* 89B3C8 80241078 02A0302D */ daddu $a2, $s5, $zero -/* 89B3CC 8024107C 08090428 */ j .L802410A0 -/* 89B3D0 80241080 00000000 */ nop -.L80241084: -/* 89B3D4 80241084 0280282D */ daddu $a1, $s4, $zero -/* 89B3D8 80241088 0C09031D */ jal func_80240C74 -/* 89B3DC 8024108C 02A0302D */ daddu $a2, $s5, $zero -/* 89B3E0 80241090 08090428 */ j .L802410A0 -/* 89B3E4 80241094 00000000 */ nop -.L80241098: -/* 89B3E8 80241098 0C0129CF */ jal func_8004A73C -/* 89B3EC 8024109C 0260202D */ daddu $a0, $s3, $zero -.L802410A0: -/* 89B3F0 802410A0 8E230088 */ lw $v1, 0x88($s1) -/* 89B3F4 802410A4 24020006 */ addiu $v0, $zero, 6 -/* 89B3F8 802410A8 14620019 */ bne $v1, $v0, .L80241110 -/* 89B3FC 802410AC 0000102D */ daddu $v0, $zero, $zero -/* 89B400 802410B0 8E22008C */ lw $v0, 0x8c($s1) -/* 89B404 802410B4 10400003 */ beqz $v0, .L802410C4 -/* 89B408 802410B8 24020001 */ addiu $v0, $zero, 1 -/* 89B40C 802410BC 08090432 */ j .L802410C8 -/* 89B410 802410C0 A22200B5 */ sb $v0, 0xb5($s1) -.L802410C4: -/* 89B414 802410C4 A22000B5 */ sb $zero, 0xb5($s1) -.L802410C8: -/* 89B418 802410C8 8E22008C */ lw $v0, 0x8c($s1) -/* 89B41C 802410CC 1040000F */ beqz $v0, .L8024110C -/* 89B420 802410D0 3C03FFAA */ lui $v1, 0xffaa -/* 89B424 802410D4 8E420028 */ lw $v0, 0x28($s2) -/* 89B428 802410D8 3463FFFC */ ori $v1, $v1, 0xfffc -/* 89B42C 802410DC 00431821 */ addu $v1, $v0, $v1 -/* 89B430 802410E0 2C620015 */ sltiu $v0, $v1, 0x15 -/* 89B434 802410E4 10400009 */ beqz $v0, .L8024110C -/* 89B438 802410E8 00031080 */ sll $v0, $v1, 2 -/* 89B43C 802410EC 3C018024 */ lui $at, 0x8024 -/* 89B440 802410F0 00220821 */ addu $at, $at, $v0 -/* 89B444 802410F4 8C2233F8 */ lw $v0, 0x33f8($at) -/* 89B448 802410F8 00400008 */ jr $v0 -/* 89B44C 802410FC 00000000 */ nop -/* 89B450 80241100 8E420028 */ lw $v0, 0x28($s2) -/* 89B454 80241104 24420001 */ addiu $v0, $v0, 1 -/* 89B458 80241108 AE420028 */ sw $v0, 0x28($s2) -.L8024110C: -/* 89B45C 8024110C 0000102D */ daddu $v0, $zero, $zero -.L80241110: -/* 89B460 80241110 8FBF0068 */ lw $ra, 0x68($sp) -/* 89B464 80241114 8FB50064 */ lw $s5, 0x64($sp) -/* 89B468 80241118 8FB40060 */ lw $s4, 0x60($sp) -/* 89B46C 8024111C 8FB3005C */ lw $s3, 0x5c($sp) -/* 89B470 80241120 8FB20058 */ lw $s2, 0x58($sp) -/* 89B474 80241124 8FB10054 */ lw $s1, 0x54($sp) -/* 89B478 80241128 8FB00050 */ lw $s0, 0x50($sp) -/* 89B47C 8024112C 03E00008 */ jr $ra -/* 89B480 80241130 27BD0070 */ addiu $sp, $sp, 0x70 -/* 89B484 80241134 00000000 */ nop -/* 89B488 80241138 00000000 */ nop -/* 89B48C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s new file mode 100644 index 0000000000..9a4a7060e9 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_20/89ACB0/func_80240CF4_89B044.s @@ -0,0 +1,304 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CF4_89B044 +/* 89B044 80240CF4 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 89B048 80240CF8 AFB3005C */ sw $s3, 0x5c($sp) +/* 89B04C 80240CFC 0080982D */ daddu $s3, $a0, $zero +/* 89B050 80240D00 AFBF0068 */ sw $ra, 0x68($sp) +/* 89B054 80240D04 AFB50064 */ sw $s5, 0x64($sp) +/* 89B058 80240D08 AFB40060 */ sw $s4, 0x60($sp) +/* 89B05C 80240D0C AFB20058 */ sw $s2, 0x58($sp) +/* 89B060 80240D10 AFB10054 */ sw $s1, 0x54($sp) +/* 89B064 80240D14 AFB00050 */ sw $s0, 0x50($sp) +/* 89B068 80240D18 8E710148 */ lw $s1, 0x148($s3) +/* 89B06C 80240D1C 86240008 */ lh $a0, 8($s1) +/* 89B070 80240D20 0C00EABB */ jal get_npc_unsafe +/* 89B074 80240D24 00A0802D */ daddu $s0, $a1, $zero +/* 89B078 80240D28 8E63000C */ lw $v1, 0xc($s3) +/* 89B07C 80240D2C 0260202D */ daddu $a0, $s3, $zero +/* 89B080 80240D30 8C650000 */ lw $a1, ($v1) +/* 89B084 80240D34 0C0B1EAF */ jal get_variable +/* 89B088 80240D38 0040902D */ daddu $s2, $v0, $zero +/* 89B08C 80240D3C AFA00028 */ sw $zero, 0x28($sp) +/* 89B090 80240D40 8E2300D0 */ lw $v1, 0xd0($s1) +/* 89B094 80240D44 8C630030 */ lw $v1, 0x30($v1) +/* 89B098 80240D48 AFA3002C */ sw $v1, 0x2c($sp) +/* 89B09C 80240D4C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 89B0A0 80240D50 8C63001C */ lw $v1, 0x1c($v1) +/* 89B0A4 80240D54 AFA30030 */ sw $v1, 0x30($sp) +/* 89B0A8 80240D58 8E2300D0 */ lw $v1, 0xd0($s1) +/* 89B0AC 80240D5C 8C630024 */ lw $v1, 0x24($v1) +/* 89B0B0 80240D60 AFA30034 */ sw $v1, 0x34($sp) +/* 89B0B4 80240D64 8E2300D0 */ lw $v1, 0xd0($s1) +/* 89B0B8 80240D68 8C630028 */ lw $v1, 0x28($v1) +/* 89B0BC 80240D6C 27B50028 */ addiu $s5, $sp, 0x28 +/* 89B0C0 80240D70 AFA30038 */ sw $v1, 0x38($sp) +/* 89B0C4 80240D74 8E2300D0 */ lw $v1, 0xd0($s1) +/* 89B0C8 80240D78 3C0142C8 */ lui $at, 0x42c8 +/* 89B0CC 80240D7C 44810000 */ mtc1 $at, $f0 +/* 89B0D0 80240D80 8C63002C */ lw $v1, 0x2c($v1) +/* 89B0D4 80240D84 0040A02D */ daddu $s4, $v0, $zero +/* 89B0D8 80240D88 E7A00040 */ swc1 $f0, 0x40($sp) +/* 89B0DC 80240D8C A7A00044 */ sh $zero, 0x44($sp) +/* 89B0E0 80240D90 12000009 */ beqz $s0, .L80240DB8 +/* 89B0E4 80240D94 AFA3003C */ sw $v1, 0x3c($sp) +/* 89B0E8 80240D98 864300A8 */ lh $v1, 0xa8($s2) +/* 89B0EC 80240D9C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 89B0F0 80240DA0 AE20008C */ sw $zero, 0x8c($s1) +/* 89B0F4 80240DA4 A22000B5 */ sb $zero, 0xb5($s1) +/* 89B0F8 80240DA8 34420008 */ ori $v0, $v0, 8 +/* 89B0FC 80240DAC AE230084 */ sw $v1, 0x84($s1) +/* 89B100 80240DB0 08090372 */ j .L80240DC8 +/* 89B104 80240DB4 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240DB8: +/* 89B108 80240DB8 8E2200B0 */ lw $v0, 0xb0($s1) +/* 89B10C 80240DBC 30420004 */ andi $v0, $v0, 4 +/* 89B110 80240DC0 10400047 */ beqz $v0, .L80240EE0 +/* 89B114 80240DC4 00000000 */ nop +.L80240DC8: +/* 89B118 80240DC8 AE600070 */ sw $zero, 0x70($s3) +/* 89B11C 80240DCC A640008E */ sh $zero, 0x8e($s2) +/* 89B120 80240DD0 8E2300CC */ lw $v1, 0xcc($s1) +/* 89B124 80240DD4 2404F7FF */ addiu $a0, $zero, -0x801 +/* 89B128 80240DD8 A2200007 */ sb $zero, 7($s1) +/* 89B12C 80240DDC 8E420000 */ lw $v0, ($s2) +/* 89B130 80240DE0 8C630000 */ lw $v1, ($v1) +/* 89B134 80240DE4 00441024 */ and $v0, $v0, $a0 +/* 89B138 80240DE8 AE420000 */ sw $v0, ($s2) +/* 89B13C 80240DEC AE430028 */ sw $v1, 0x28($s2) +/* 89B140 80240DF0 96220086 */ lhu $v0, 0x86($s1) +/* 89B144 80240DF4 A64200A8 */ sh $v0, 0xa8($s2) +/* 89B148 80240DF8 8E2200D0 */ lw $v0, 0xd0($s1) +/* 89B14C 80240DFC AE200090 */ sw $zero, 0x90($s1) +/* 89B150 80240E00 8C420034 */ lw $v0, 0x34($v0) +/* 89B154 80240E04 14400006 */ bnez $v0, .L80240E20 +/* 89B158 80240E08 2403FDFF */ addiu $v1, $zero, -0x201 +/* 89B15C 80240E0C 8E420000 */ lw $v0, ($s2) +/* 89B160 80240E10 2403FFF7 */ addiu $v1, $zero, -9 +/* 89B164 80240E14 34420200 */ ori $v0, $v0, 0x200 +/* 89B168 80240E18 0809038B */ j .L80240E2C +/* 89B16C 80240E1C 00431024 */ and $v0, $v0, $v1 +.L80240E20: +/* 89B170 80240E20 8E420000 */ lw $v0, ($s2) +/* 89B174 80240E24 00431024 */ and $v0, $v0, $v1 +/* 89B178 80240E28 34420008 */ ori $v0, $v0, 8 +.L80240E2C: +/* 89B17C 80240E2C AE420000 */ sw $v0, ($s2) +/* 89B180 80240E30 8E2200B0 */ lw $v0, 0xb0($s1) +/* 89B184 80240E34 30420004 */ andi $v0, $v0, 4 +/* 89B188 80240E38 1040001E */ beqz $v0, .L80240EB4 +/* 89B18C 80240E3C 24040002 */ addiu $a0, $zero, 2 +/* 89B190 80240E40 0240282D */ daddu $a1, $s2, $zero +/* 89B194 80240E44 0000302D */ daddu $a2, $zero, $zero +/* 89B198 80240E48 24020063 */ addiu $v0, $zero, 0x63 +/* 89B19C 80240E4C AE620070 */ sw $v0, 0x70($s3) +/* 89B1A0 80240E50 AE600074 */ sw $zero, 0x74($s3) +/* 89B1A4 80240E54 864300A8 */ lh $v1, 0xa8($s2) +/* 89B1A8 80240E58 3C013F80 */ lui $at, 0x3f80 +/* 89B1AC 80240E5C 44810000 */ mtc1 $at, $f0 +/* 89B1B0 80240E60 3C014000 */ lui $at, 0x4000 +/* 89B1B4 80240E64 44811000 */ mtc1 $at, $f2 +/* 89B1B8 80240E68 3C01C1A0 */ lui $at, 0xc1a0 +/* 89B1BC 80240E6C 44812000 */ mtc1 $at, $f4 +/* 89B1C0 80240E70 24020028 */ addiu $v0, $zero, 0x28 +/* 89B1C4 80240E74 AFA2001C */ sw $v0, 0x1c($sp) +/* 89B1C8 80240E78 44833000 */ mtc1 $v1, $f6 +/* 89B1CC 80240E7C 00000000 */ nop +/* 89B1D0 80240E80 468031A0 */ cvt.s.w $f6, $f6 +/* 89B1D4 80240E84 44073000 */ mfc1 $a3, $f6 +/* 89B1D8 80240E88 27A20048 */ addiu $v0, $sp, 0x48 +/* 89B1DC 80240E8C AFA20020 */ sw $v0, 0x20($sp) +/* 89B1E0 80240E90 E7A00010 */ swc1 $f0, 0x10($sp) +/* 89B1E4 80240E94 E7A20014 */ swc1 $f2, 0x14($sp) +/* 89B1E8 80240E98 0C01BFA4 */ jal fx_emote +/* 89B1EC 80240E9C E7A40018 */ swc1 $f4, 0x18($sp) +/* 89B1F0 80240EA0 8E2200B0 */ lw $v0, 0xb0($s1) +/* 89B1F4 80240EA4 2403FFFB */ addiu $v1, $zero, -5 +/* 89B1F8 80240EA8 00431024 */ and $v0, $v0, $v1 +/* 89B1FC 80240EAC 080903B8 */ j .L80240EE0 +/* 89B200 80240EB0 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240EB4: +/* 89B204 80240EB4 8E220000 */ lw $v0, ($s1) +/* 89B208 80240EB8 3C034000 */ lui $v1, 0x4000 +/* 89B20C 80240EBC 00431024 */ and $v0, $v0, $v1 +/* 89B210 80240EC0 10400007 */ beqz $v0, .L80240EE0 +/* 89B214 80240EC4 3C03BFFF */ lui $v1, 0xbfff +/* 89B218 80240EC8 2402000C */ addiu $v0, $zero, 0xc +/* 89B21C 80240ECC AE620070 */ sw $v0, 0x70($s3) +/* 89B220 80240ED0 8E220000 */ lw $v0, ($s1) +/* 89B224 80240ED4 3463FFFF */ ori $v1, $v1, 0xffff +/* 89B228 80240ED8 00431024 */ and $v0, $v0, $v1 +/* 89B22C 80240EDC AE220000 */ sw $v0, ($s1) +.L80240EE0: +/* 89B230 80240EE0 8E220090 */ lw $v0, 0x90($s1) +/* 89B234 80240EE4 1840000C */ blez $v0, .L80240F18 +/* 89B238 80240EE8 2442FFFF */ addiu $v0, $v0, -1 +/* 89B23C 80240EEC 14400087 */ bnez $v0, .L8024110C +/* 89B240 80240EF0 AE220090 */ sw $v0, 0x90($s1) +/* 89B244 80240EF4 3C03FFAA */ lui $v1, 0xffaa +/* 89B248 80240EF8 8E420028 */ lw $v0, 0x28($s2) +/* 89B24C 80240EFC 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 89B250 80240F00 00431021 */ addu $v0, $v0, $v1 +/* 89B254 80240F04 2C420002 */ sltiu $v0, $v0, 2 +/* 89B258 80240F08 10400003 */ beqz $v0, .L80240F18 +/* 89B25C 80240F0C 3C020055 */ lui $v0, 0x55 +/* 89B260 80240F10 3442000C */ ori $v0, $v0, 0xc +/* 89B264 80240F14 AE420028 */ sw $v0, 0x28($s2) +.L80240F18: +/* 89B268 80240F18 8E630070 */ lw $v1, 0x70($s3) +/* 89B26C 80240F1C 2402000C */ addiu $v0, $zero, 0xc +/* 89B270 80240F20 10620048 */ beq $v1, $v0, .L80241044 +/* 89B274 80240F24 2862000D */ slti $v0, $v1, 0xd +/* 89B278 80240F28 1040000F */ beqz $v0, .L80240F68 +/* 89B27C 80240F2C 24100001 */ addiu $s0, $zero, 1 +/* 89B280 80240F30 1070001E */ beq $v1, $s0, .L80240FAC +/* 89B284 80240F34 28620002 */ slti $v0, $v1, 2 +/* 89B288 80240F38 10400005 */ beqz $v0, .L80240F50 +/* 89B28C 80240F3C 24020002 */ addiu $v0, $zero, 2 +/* 89B290 80240F40 10600015 */ beqz $v1, .L80240F98 +/* 89B294 80240F44 0260202D */ daddu $a0, $s3, $zero +/* 89B298 80240F48 08090428 */ j .L802410A0 +/* 89B29C 80240F4C 00000000 */ nop +.L80240F50: +/* 89B2A0 80240F50 1062001C */ beq $v1, $v0, .L80240FC4 +/* 89B2A4 80240F54 24020003 */ addiu $v0, $zero, 3 +/* 89B2A8 80240F58 10620035 */ beq $v1, $v0, .L80241030 +/* 89B2AC 80240F5C 0260202D */ daddu $a0, $s3, $zero +/* 89B2B0 80240F60 08090428 */ j .L802410A0 +/* 89B2B4 80240F64 00000000 */ nop +.L80240F68: +/* 89B2B8 80240F68 2402000E */ addiu $v0, $zero, 0xe +/* 89B2BC 80240F6C 1062003F */ beq $v1, $v0, .L8024106C +/* 89B2C0 80240F70 0062102A */ slt $v0, $v1, $v0 +/* 89B2C4 80240F74 14400038 */ bnez $v0, .L80241058 +/* 89B2C8 80240F78 0260202D */ daddu $a0, $s3, $zero +/* 89B2CC 80240F7C 2402000F */ addiu $v0, $zero, 0xf +/* 89B2D0 80240F80 10620040 */ beq $v1, $v0, .L80241084 +/* 89B2D4 80240F84 24020063 */ addiu $v0, $zero, 0x63 +/* 89B2D8 80240F88 10620043 */ beq $v1, $v0, .L80241098 +/* 89B2DC 80240F8C 00000000 */ nop +/* 89B2E0 80240F90 08090428 */ j .L802410A0 +/* 89B2E4 80240F94 00000000 */ nop +.L80240F98: +/* 89B2E8 80240F98 0280282D */ daddu $a1, $s4, $zero +/* 89B2EC 80240F9C 0C012568 */ jal func_800495A0 +/* 89B2F0 80240FA0 02A0302D */ daddu $a2, $s5, $zero +/* 89B2F4 80240FA4 96220086 */ lhu $v0, 0x86($s1) +/* 89B2F8 80240FA8 A64200A8 */ sh $v0, 0xa8($s2) +.L80240FAC: +/* 89B2FC 80240FAC 0260202D */ daddu $a0, $s3, $zero +/* 89B300 80240FB0 0280282D */ daddu $a1, $s4, $zero +/* 89B304 80240FB4 0C0125AE */ jal func_800496B8 +/* 89B308 80240FB8 02A0302D */ daddu $a2, $s5, $zero +/* 89B30C 80240FBC 08090428 */ j .L802410A0 +/* 89B310 80240FC0 00000000 */ nop +.L80240FC4: +/* 89B314 80240FC4 0260202D */ daddu $a0, $s3, $zero +/* 89B318 80240FC8 0280282D */ daddu $a1, $s4, $zero +/* 89B31C 80240FCC 0C0126D1 */ jal func_80049B44 +/* 89B320 80240FD0 02A0302D */ daddu $a2, $s5, $zero +/* 89B324 80240FD4 8E230088 */ lw $v1, 0x88($s1) +/* 89B328 80240FD8 24020006 */ addiu $v0, $zero, 6 +/* 89B32C 80240FDC 14620014 */ bne $v1, $v0, .L80241030 +/* 89B330 80240FE0 0260202D */ daddu $a0, $s3, $zero +/* 89B334 80240FE4 0C00A67F */ jal rand_int +/* 89B338 80240FE8 24040064 */ addiu $a0, $zero, 0x64 +/* 89B33C 80240FEC 28420021 */ slti $v0, $v0, 0x21 +/* 89B340 80240FF0 5040000F */ beql $v0, $zero, .L80241030 +/* 89B344 80240FF4 0260202D */ daddu $a0, $s3, $zero +/* 89B348 80240FF8 8E22008C */ lw $v0, 0x8c($s1) +/* 89B34C 80240FFC 10400005 */ beqz $v0, .L80241014 +/* 89B350 80241000 3C020055 */ lui $v0, 0x55 +/* 89B354 80241004 3442002F */ ori $v0, $v0, 0x2f +/* 89B358 80241008 AE20008C */ sw $zero, 0x8c($s1) +/* 89B35C 8024100C 08090408 */ j .L80241020 +/* 89B360 80241010 A22000B5 */ sb $zero, 0xb5($s1) +.L80241014: +/* 89B364 80241014 3442002E */ ori $v0, $v0, 0x2e +/* 89B368 80241018 AE30008C */ sw $s0, 0x8c($s1) +/* 89B36C 8024101C A23000B5 */ sb $s0, 0xb5($s1) +.L80241020: +/* 89B370 80241020 AE420028 */ sw $v0, 0x28($s2) +/* 89B374 80241024 24020007 */ addiu $v0, $zero, 7 +/* 89B378 80241028 08090443 */ j .L8024110C +/* 89B37C 8024102C AE220090 */ sw $v0, 0x90($s1) +.L80241030: +/* 89B380 80241030 0280282D */ daddu $a1, $s4, $zero +/* 89B384 80241034 0C012701 */ jal func_80049C04 +/* 89B388 80241038 02A0302D */ daddu $a2, $s5, $zero +/* 89B38C 8024103C 08090428 */ j .L802410A0 +/* 89B390 80241040 00000000 */ nop +.L80241044: +/* 89B394 80241044 0260202D */ daddu $a0, $s3, $zero +/* 89B398 80241048 0280282D */ daddu $a1, $s4, $zero +/* 89B39C 8024104C 0C090258 */ jal func_80240960_89ACB0 +/* 89B3A0 80241050 02A0302D */ daddu $a2, $s5, $zero +/* 89B3A4 80241054 0260202D */ daddu $a0, $s3, $zero +.L80241058: +/* 89B3A8 80241058 0280282D */ daddu $a1, $s4, $zero +/* 89B3AC 8024105C 0C090277 */ jal func_802409DC_89AD2C +/* 89B3B0 80241060 02A0302D */ daddu $a2, $s5, $zero +/* 89B3B4 80241064 08090428 */ j .L802410A0 +/* 89B3B8 80241068 00000000 */ nop +.L8024106C: +/* 89B3BC 8024106C 0260202D */ daddu $a0, $s3, $zero +/* 89B3C0 80241070 0280282D */ daddu $a1, $s4, $zero +/* 89B3C4 80241074 0C0902C4 */ jal func_80240B10_89AE60 +/* 89B3C8 80241078 02A0302D */ daddu $a2, $s5, $zero +/* 89B3CC 8024107C 08090428 */ j .L802410A0 +/* 89B3D0 80241080 00000000 */ nop +.L80241084: +/* 89B3D4 80241084 0280282D */ daddu $a1, $s4, $zero +/* 89B3D8 80241088 0C09031D */ jal func_80240C74_89AFC4 +/* 89B3DC 8024108C 02A0302D */ daddu $a2, $s5, $zero +/* 89B3E0 80241090 08090428 */ j .L802410A0 +/* 89B3E4 80241094 00000000 */ nop +.L80241098: +/* 89B3E8 80241098 0C0129CF */ jal func_8004A73C +/* 89B3EC 8024109C 0260202D */ daddu $a0, $s3, $zero +.L802410A0: +/* 89B3F0 802410A0 8E230088 */ lw $v1, 0x88($s1) +/* 89B3F4 802410A4 24020006 */ addiu $v0, $zero, 6 +/* 89B3F8 802410A8 14620019 */ bne $v1, $v0, .L80241110 +/* 89B3FC 802410AC 0000102D */ daddu $v0, $zero, $zero +/* 89B400 802410B0 8E22008C */ lw $v0, 0x8c($s1) +/* 89B404 802410B4 10400003 */ beqz $v0, .L802410C4 +/* 89B408 802410B8 24020001 */ addiu $v0, $zero, 1 +/* 89B40C 802410BC 08090432 */ j .L802410C8 +/* 89B410 802410C0 A22200B5 */ sb $v0, 0xb5($s1) +.L802410C4: +/* 89B414 802410C4 A22000B5 */ sb $zero, 0xb5($s1) +.L802410C8: +/* 89B418 802410C8 8E22008C */ lw $v0, 0x8c($s1) +/* 89B41C 802410CC 1040000F */ beqz $v0, .L8024110C +/* 89B420 802410D0 3C03FFAA */ lui $v1, 0xffaa +/* 89B424 802410D4 8E420028 */ lw $v0, 0x28($s2) +/* 89B428 802410D8 3463FFFC */ ori $v1, $v1, 0xfffc +/* 89B42C 802410DC 00431821 */ addu $v1, $v0, $v1 +/* 89B430 802410E0 2C620015 */ sltiu $v0, $v1, 0x15 +/* 89B434 802410E4 10400009 */ beqz $v0, .L8024110C +/* 89B438 802410E8 00031080 */ sll $v0, $v1, 2 +/* 89B43C 802410EC 3C018024 */ lui $at, 0x8024 +/* 89B440 802410F0 00220821 */ addu $at, $at, $v0 +/* 89B444 802410F4 8C2233F8 */ lw $v0, 0x33f8($at) +/* 89B448 802410F8 00400008 */ jr $v0 +/* 89B44C 802410FC 00000000 */ nop +/* 89B450 80241100 8E420028 */ lw $v0, 0x28($s2) +/* 89B454 80241104 24420001 */ addiu $v0, $v0, 1 +/* 89B458 80241108 AE420028 */ sw $v0, 0x28($s2) +.L8024110C: +/* 89B45C 8024110C 0000102D */ daddu $v0, $zero, $zero +.L80241110: +/* 89B460 80241110 8FBF0068 */ lw $ra, 0x68($sp) +/* 89B464 80241114 8FB50064 */ lw $s5, 0x64($sp) +/* 89B468 80241118 8FB40060 */ lw $s4, 0x60($sp) +/* 89B46C 8024111C 8FB3005C */ lw $s3, 0x5c($sp) +/* 89B470 80241120 8FB20058 */ lw $s2, 0x58($sp) +/* 89B474 80241124 8FB10054 */ lw $s1, 0x54($sp) +/* 89B478 80241128 8FB00050 */ lw $s0, 0x50($sp) +/* 89B47C 8024112C 03E00008 */ jr $ra +/* 89B480 80241130 27BD0070 */ addiu $sp, $sp, 0x70 +/* 89B484 80241134 00000000 */ nop +/* 89B488 80241138 00000000 */ nop +/* 89B48C 8024113C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240154.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240154.s deleted file mode 100644 index 2c35db71bb..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240154.s +++ /dev/null @@ -1,143 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240154 -/* 8A0014 80240154 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A0018 80240158 AFB00010 */ sw $s0, 0x10($sp) -/* 8A001C 8024015C 0080802D */ daddu $s0, $a0, $zero -/* 8A0020 80240160 10A00005 */ beqz $a1, .L80240178 -/* 8A0024 80240164 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A0028 80240168 AE000070 */ sw $zero, 0x70($s0) -/* 8A002C 8024016C AE000074 */ sw $zero, 0x74($s0) -/* 8A0030 80240170 AE000078 */ sw $zero, 0x78($s0) -/* 8A0034 80240174 AE00007C */ sw $zero, 0x7c($s0) -.L80240178: -/* 8A0038 80240178 8E020070 */ lw $v0, 0x70($s0) -/* 8A003C 8024017C 1440000E */ bnez $v0, .L802401B8 -/* 8A0040 80240180 00000000 */ nop -/* 8A0044 80240184 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A0048 80240188 8E020088 */ lw $v0, 0x88($s0) -/* 8A004C 8024018C 00621821 */ addu $v1, $v1, $v0 -/* 8A0050 80240190 04610004 */ bgez $v1, .L802401A4 -/* 8A0054 80240194 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A0058 80240198 3C020002 */ lui $v0, 2 -/* 8A005C 8024019C 0809006D */ j .L802401B4 -/* 8A0060 802401A0 00621021 */ addu $v0, $v1, $v0 -.L802401A4: -/* 8A0064 802401A4 3C040002 */ lui $a0, 2 -/* 8A0068 802401A8 0083102A */ slt $v0, $a0, $v1 -/* 8A006C 802401AC 10400002 */ beqz $v0, .L802401B8 -/* 8A0070 802401B0 00641023 */ subu $v0, $v1, $a0 -.L802401B4: -/* 8A0074 802401B4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401B8: -/* 8A0078 802401B8 8E020074 */ lw $v0, 0x74($s0) -/* 8A007C 802401BC 1440000E */ bnez $v0, .L802401F8 -/* 8A0080 802401C0 00000000 */ nop -/* 8A0084 802401C4 8E0300AC */ lw $v1, 0xac($s0) -/* 8A0088 802401C8 8E02008C */ lw $v0, 0x8c($s0) -/* 8A008C 802401CC 00621821 */ addu $v1, $v1, $v0 -/* 8A0090 802401D0 04610004 */ bgez $v1, .L802401E4 -/* 8A0094 802401D4 AE0300AC */ sw $v1, 0xac($s0) -/* 8A0098 802401D8 3C020002 */ lui $v0, 2 -/* 8A009C 802401DC 0809007D */ j .L802401F4 -/* 8A00A0 802401E0 00621021 */ addu $v0, $v1, $v0 -.L802401E4: -/* 8A00A4 802401E4 3C040002 */ lui $a0, 2 -/* 8A00A8 802401E8 0083102A */ slt $v0, $a0, $v1 -/* 8A00AC 802401EC 10400002 */ beqz $v0, .L802401F8 -/* 8A00B0 802401F0 00641023 */ subu $v0, $v1, $a0 -.L802401F4: -/* 8A00B4 802401F4 AE0200AC */ sw $v0, 0xac($s0) -.L802401F8: -/* 8A00B8 802401F8 8E020078 */ lw $v0, 0x78($s0) -/* 8A00BC 802401FC 1440000E */ bnez $v0, .L80240238 -/* 8A00C0 80240200 00000000 */ nop -/* 8A00C4 80240204 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A00C8 80240208 8E020090 */ lw $v0, 0x90($s0) -/* 8A00CC 8024020C 00621821 */ addu $v1, $v1, $v0 -/* 8A00D0 80240210 04610004 */ bgez $v1, .L80240224 -/* 8A00D4 80240214 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A00D8 80240218 3C020002 */ lui $v0, 2 -/* 8A00DC 8024021C 0809008D */ j .L80240234 -/* 8A00E0 80240220 00621021 */ addu $v0, $v1, $v0 -.L80240224: -/* 8A00E4 80240224 3C040002 */ lui $a0, 2 -/* 8A00E8 80240228 0083102A */ slt $v0, $a0, $v1 -/* 8A00EC 8024022C 10400002 */ beqz $v0, .L80240238 -/* 8A00F0 80240230 00641023 */ subu $v0, $v1, $a0 -.L80240234: -/* 8A00F4 80240234 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240238: -/* 8A00F8 80240238 8E02007C */ lw $v0, 0x7c($s0) -/* 8A00FC 8024023C 1440000E */ bnez $v0, .L80240278 -/* 8A0100 80240240 00000000 */ nop -/* 8A0104 80240244 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A0108 80240248 8E020094 */ lw $v0, 0x94($s0) -/* 8A010C 8024024C 00621821 */ addu $v1, $v1, $v0 -/* 8A0110 80240250 04610004 */ bgez $v1, .L80240264 -/* 8A0114 80240254 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A0118 80240258 3C020002 */ lui $v0, 2 -/* 8A011C 8024025C 0809009D */ j .L80240274 -/* 8A0120 80240260 00621021 */ addu $v0, $v1, $v0 -.L80240264: -/* 8A0124 80240264 3C040002 */ lui $a0, 2 -/* 8A0128 80240268 0083102A */ slt $v0, $a0, $v1 -/* 8A012C 8024026C 10400002 */ beqz $v0, .L80240278 -/* 8A0130 80240270 00641023 */ subu $v0, $v1, $a0 -.L80240274: -/* 8A0134 80240274 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240278: -/* 8A0138 80240278 8E040084 */ lw $a0, 0x84($s0) -/* 8A013C 8024027C 0C046F07 */ jal set_main_pan_u -/* 8A0140 80240280 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A0144 80240284 8E040084 */ lw $a0, 0x84($s0) -/* 8A0148 80240288 0C046F0D */ jal set_main_pan_v -/* 8A014C 8024028C 8E0500AC */ lw $a1, 0xac($s0) -/* 8A0150 80240290 8E040084 */ lw $a0, 0x84($s0) -/* 8A0154 80240294 0C046F13 */ jal set_aux_pan_u -/* 8A0158 80240298 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A015C 8024029C 8E040084 */ lw $a0, 0x84($s0) -/* 8A0160 802402A0 0C046F19 */ jal set_aux_pan_v -/* 8A0164 802402A4 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A0168 802402A8 8E020070 */ lw $v0, 0x70($s0) -/* 8A016C 802402AC 8E030078 */ lw $v1, 0x78($s0) -/* 8A0170 802402B0 8E040098 */ lw $a0, 0x98($s0) -/* 8A0174 802402B4 24420001 */ addiu $v0, $v0, 1 -/* 8A0178 802402B8 AE020070 */ sw $v0, 0x70($s0) -/* 8A017C 802402BC 8E020074 */ lw $v0, 0x74($s0) -/* 8A0180 802402C0 24630001 */ addiu $v1, $v1, 1 -/* 8A0184 802402C4 AE030078 */ sw $v1, 0x78($s0) -/* 8A0188 802402C8 8E030070 */ lw $v1, 0x70($s0) -/* 8A018C 802402CC 24420001 */ addiu $v0, $v0, 1 -/* 8A0190 802402D0 AE020074 */ sw $v0, 0x74($s0) -/* 8A0194 802402D4 8E02007C */ lw $v0, 0x7c($s0) -/* 8A0198 802402D8 0064182A */ slt $v1, $v1, $a0 -/* 8A019C 802402DC 24420001 */ addiu $v0, $v0, 1 -/* 8A01A0 802402E0 14600002 */ bnez $v1, .L802402EC -/* 8A01A4 802402E4 AE02007C */ sw $v0, 0x7c($s0) -/* 8A01A8 802402E8 AE000070 */ sw $zero, 0x70($s0) -.L802402EC: -/* 8A01AC 802402EC 8E020074 */ lw $v0, 0x74($s0) -/* 8A01B0 802402F0 8E03009C */ lw $v1, 0x9c($s0) -/* 8A01B4 802402F4 0043102A */ slt $v0, $v0, $v1 -/* 8A01B8 802402F8 50400001 */ beql $v0, $zero, .L80240300 -/* 8A01BC 802402FC AE000074 */ sw $zero, 0x74($s0) -.L80240300: -/* 8A01C0 80240300 8E020078 */ lw $v0, 0x78($s0) -/* 8A01C4 80240304 8E0300A0 */ lw $v1, 0xa0($s0) -/* 8A01C8 80240308 0043102A */ slt $v0, $v0, $v1 -/* 8A01CC 8024030C 50400001 */ beql $v0, $zero, .L80240314 -/* 8A01D0 80240310 AE000078 */ sw $zero, 0x78($s0) -.L80240314: -/* 8A01D4 80240314 8E02007C */ lw $v0, 0x7c($s0) -/* 8A01D8 80240318 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8A01DC 8024031C 0043102A */ slt $v0, $v0, $v1 -/* 8A01E0 80240320 50400001 */ beql $v0, $zero, .L80240328 -/* 8A01E4 80240324 AE00007C */ sw $zero, 0x7c($s0) -.L80240328: -/* 8A01E8 80240328 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A01EC 8024032C 8FB00010 */ lw $s0, 0x10($sp) -/* 8A01F0 80240330 0000102D */ daddu $v0, $zero, $zero -/* 8A01F4 80240334 03E00008 */ jr $ra -/* 8A01F8 80240338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240154_8A0014.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240154_8A0014.s new file mode 100644 index 0000000000..62c1efab37 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240154_8A0014.s @@ -0,0 +1,143 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240154_8A0014 +/* 8A0014 80240154 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8A0018 80240158 AFB00010 */ sw $s0, 0x10($sp) +/* 8A001C 8024015C 0080802D */ daddu $s0, $a0, $zero +/* 8A0020 80240160 10A00005 */ beqz $a1, .L80240178 +/* 8A0024 80240164 AFBF0014 */ sw $ra, 0x14($sp) +/* 8A0028 80240168 AE000070 */ sw $zero, 0x70($s0) +/* 8A002C 8024016C AE000074 */ sw $zero, 0x74($s0) +/* 8A0030 80240170 AE000078 */ sw $zero, 0x78($s0) +/* 8A0034 80240174 AE00007C */ sw $zero, 0x7c($s0) +.L80240178: +/* 8A0038 80240178 8E020070 */ lw $v0, 0x70($s0) +/* 8A003C 8024017C 1440000E */ bnez $v0, .L802401B8 +/* 8A0040 80240180 00000000 */ nop +/* 8A0044 80240184 8E0300A8 */ lw $v1, 0xa8($s0) +/* 8A0048 80240188 8E020088 */ lw $v0, 0x88($s0) +/* 8A004C 8024018C 00621821 */ addu $v1, $v1, $v0 +/* 8A0050 80240190 04610004 */ bgez $v1, .L802401A4 +/* 8A0054 80240194 AE0300A8 */ sw $v1, 0xa8($s0) +/* 8A0058 80240198 3C020002 */ lui $v0, 2 +/* 8A005C 8024019C 0809006D */ j .L802401B4 +/* 8A0060 802401A0 00621021 */ addu $v0, $v1, $v0 +.L802401A4: +/* 8A0064 802401A4 3C040002 */ lui $a0, 2 +/* 8A0068 802401A8 0083102A */ slt $v0, $a0, $v1 +/* 8A006C 802401AC 10400002 */ beqz $v0, .L802401B8 +/* 8A0070 802401B0 00641023 */ subu $v0, $v1, $a0 +.L802401B4: +/* 8A0074 802401B4 AE0200A8 */ sw $v0, 0xa8($s0) +.L802401B8: +/* 8A0078 802401B8 8E020074 */ lw $v0, 0x74($s0) +/* 8A007C 802401BC 1440000E */ bnez $v0, .L802401F8 +/* 8A0080 802401C0 00000000 */ nop +/* 8A0084 802401C4 8E0300AC */ lw $v1, 0xac($s0) +/* 8A0088 802401C8 8E02008C */ lw $v0, 0x8c($s0) +/* 8A008C 802401CC 00621821 */ addu $v1, $v1, $v0 +/* 8A0090 802401D0 04610004 */ bgez $v1, .L802401E4 +/* 8A0094 802401D4 AE0300AC */ sw $v1, 0xac($s0) +/* 8A0098 802401D8 3C020002 */ lui $v0, 2 +/* 8A009C 802401DC 0809007D */ j .L802401F4 +/* 8A00A0 802401E0 00621021 */ addu $v0, $v1, $v0 +.L802401E4: +/* 8A00A4 802401E4 3C040002 */ lui $a0, 2 +/* 8A00A8 802401E8 0083102A */ slt $v0, $a0, $v1 +/* 8A00AC 802401EC 10400002 */ beqz $v0, .L802401F8 +/* 8A00B0 802401F0 00641023 */ subu $v0, $v1, $a0 +.L802401F4: +/* 8A00B4 802401F4 AE0200AC */ sw $v0, 0xac($s0) +.L802401F8: +/* 8A00B8 802401F8 8E020078 */ lw $v0, 0x78($s0) +/* 8A00BC 802401FC 1440000E */ bnez $v0, .L80240238 +/* 8A00C0 80240200 00000000 */ nop +/* 8A00C4 80240204 8E0300B0 */ lw $v1, 0xb0($s0) +/* 8A00C8 80240208 8E020090 */ lw $v0, 0x90($s0) +/* 8A00CC 8024020C 00621821 */ addu $v1, $v1, $v0 +/* 8A00D0 80240210 04610004 */ bgez $v1, .L80240224 +/* 8A00D4 80240214 AE0300B0 */ sw $v1, 0xb0($s0) +/* 8A00D8 80240218 3C020002 */ lui $v0, 2 +/* 8A00DC 8024021C 0809008D */ j .L80240234 +/* 8A00E0 80240220 00621021 */ addu $v0, $v1, $v0 +.L80240224: +/* 8A00E4 80240224 3C040002 */ lui $a0, 2 +/* 8A00E8 80240228 0083102A */ slt $v0, $a0, $v1 +/* 8A00EC 8024022C 10400002 */ beqz $v0, .L80240238 +/* 8A00F0 80240230 00641023 */ subu $v0, $v1, $a0 +.L80240234: +/* 8A00F4 80240234 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240238: +/* 8A00F8 80240238 8E02007C */ lw $v0, 0x7c($s0) +/* 8A00FC 8024023C 1440000E */ bnez $v0, .L80240278 +/* 8A0100 80240240 00000000 */ nop +/* 8A0104 80240244 8E0300B4 */ lw $v1, 0xb4($s0) +/* 8A0108 80240248 8E020094 */ lw $v0, 0x94($s0) +/* 8A010C 8024024C 00621821 */ addu $v1, $v1, $v0 +/* 8A0110 80240250 04610004 */ bgez $v1, .L80240264 +/* 8A0114 80240254 AE0300B4 */ sw $v1, 0xb4($s0) +/* 8A0118 80240258 3C020002 */ lui $v0, 2 +/* 8A011C 8024025C 0809009D */ j .L80240274 +/* 8A0120 80240260 00621021 */ addu $v0, $v1, $v0 +.L80240264: +/* 8A0124 80240264 3C040002 */ lui $a0, 2 +/* 8A0128 80240268 0083102A */ slt $v0, $a0, $v1 +/* 8A012C 8024026C 10400002 */ beqz $v0, .L80240278 +/* 8A0130 80240270 00641023 */ subu $v0, $v1, $a0 +.L80240274: +/* 8A0134 80240274 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240278: +/* 8A0138 80240278 8E040084 */ lw $a0, 0x84($s0) +/* 8A013C 8024027C 0C046F07 */ jal set_main_pan_u +/* 8A0140 80240280 8E0500A8 */ lw $a1, 0xa8($s0) +/* 8A0144 80240284 8E040084 */ lw $a0, 0x84($s0) +/* 8A0148 80240288 0C046F0D */ jal set_main_pan_v +/* 8A014C 8024028C 8E0500AC */ lw $a1, 0xac($s0) +/* 8A0150 80240290 8E040084 */ lw $a0, 0x84($s0) +/* 8A0154 80240294 0C046F13 */ jal set_aux_pan_u +/* 8A0158 80240298 8E0500B0 */ lw $a1, 0xb0($s0) +/* 8A015C 8024029C 8E040084 */ lw $a0, 0x84($s0) +/* 8A0160 802402A0 0C046F19 */ jal set_aux_pan_v +/* 8A0164 802402A4 8E0500B4 */ lw $a1, 0xb4($s0) +/* 8A0168 802402A8 8E020070 */ lw $v0, 0x70($s0) +/* 8A016C 802402AC 8E030078 */ lw $v1, 0x78($s0) +/* 8A0170 802402B0 8E040098 */ lw $a0, 0x98($s0) +/* 8A0174 802402B4 24420001 */ addiu $v0, $v0, 1 +/* 8A0178 802402B8 AE020070 */ sw $v0, 0x70($s0) +/* 8A017C 802402BC 8E020074 */ lw $v0, 0x74($s0) +/* 8A0180 802402C0 24630001 */ addiu $v1, $v1, 1 +/* 8A0184 802402C4 AE030078 */ sw $v1, 0x78($s0) +/* 8A0188 802402C8 8E030070 */ lw $v1, 0x70($s0) +/* 8A018C 802402CC 24420001 */ addiu $v0, $v0, 1 +/* 8A0190 802402D0 AE020074 */ sw $v0, 0x74($s0) +/* 8A0194 802402D4 8E02007C */ lw $v0, 0x7c($s0) +/* 8A0198 802402D8 0064182A */ slt $v1, $v1, $a0 +/* 8A019C 802402DC 24420001 */ addiu $v0, $v0, 1 +/* 8A01A0 802402E0 14600002 */ bnez $v1, .L802402EC +/* 8A01A4 802402E4 AE02007C */ sw $v0, 0x7c($s0) +/* 8A01A8 802402E8 AE000070 */ sw $zero, 0x70($s0) +.L802402EC: +/* 8A01AC 802402EC 8E020074 */ lw $v0, 0x74($s0) +/* 8A01B0 802402F0 8E03009C */ lw $v1, 0x9c($s0) +/* 8A01B4 802402F4 0043102A */ slt $v0, $v0, $v1 +/* 8A01B8 802402F8 50400001 */ beql $v0, $zero, .L80240300 +/* 8A01BC 802402FC AE000074 */ sw $zero, 0x74($s0) +.L80240300: +/* 8A01C0 80240300 8E020078 */ lw $v0, 0x78($s0) +/* 8A01C4 80240304 8E0300A0 */ lw $v1, 0xa0($s0) +/* 8A01C8 80240308 0043102A */ slt $v0, $v0, $v1 +/* 8A01CC 8024030C 50400001 */ beql $v0, $zero, .L80240314 +/* 8A01D0 80240310 AE000078 */ sw $zero, 0x78($s0) +.L80240314: +/* 8A01D4 80240314 8E02007C */ lw $v0, 0x7c($s0) +/* 8A01D8 80240318 8E0300A4 */ lw $v1, 0xa4($s0) +/* 8A01DC 8024031C 0043102A */ slt $v0, $v0, $v1 +/* 8A01E0 80240320 50400001 */ beql $v0, $zero, .L80240328 +/* 8A01E4 80240324 AE00007C */ sw $zero, 0x7c($s0) +.L80240328: +/* 8A01E8 80240328 8FBF0014 */ lw $ra, 0x14($sp) +/* 8A01EC 8024032C 8FB00010 */ lw $s0, 0x10($sp) +/* 8A01F0 80240330 0000102D */ daddu $v0, $zero, $zero +/* 8A01F4 80240334 03E00008 */ jr $ra +/* 8A01F8 80240338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C.s deleted file mode 100644 index 6ec3ec6768..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024033C -/* 8A01FC 8024033C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8A0200 80240340 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8A0204 80240344 8C430004 */ lw $v1, 4($v0) -/* 8A0208 80240348 3C040010 */ lui $a0, 0x10 -/* 8A020C 8024034C 00641825 */ or $v1, $v1, $a0 -/* 8A0210 80240350 AC430004 */ sw $v1, 4($v0) -/* 8A0214 80240354 03E00008 */ jr $ra -/* 8A0218 80240358 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C_8A01FC.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C_8A01FC.s new file mode 100644 index 0000000000..3fe56fb096 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024033C_8A01FC.s @@ -0,0 +1,12 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024033C_8A01FC +/* 8A01FC 8024033C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8A0200 80240340 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8A0204 80240344 8C430004 */ lw $v1, 4($v0) +/* 8A0208 80240348 3C040010 */ lui $a0, 0x10 +/* 8A020C 8024034C 00641825 */ or $v1, $v1, $a0 +/* 8A0210 80240350 AC430004 */ sw $v1, 4($v0) +/* 8A0214 80240354 03E00008 */ jr $ra +/* 8A0218 80240358 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C.s deleted file mode 100644 index b4bc6830b8..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024035C -/* 8A021C 8024035C 3C028016 */ lui $v0, 0x8016 -/* 8A0220 80240360 8442A552 */ lh $v0, -0x5aae($v0) -/* 8A0224 80240364 AC820084 */ sw $v0, 0x84($a0) -/* 8A0228 80240368 03E00008 */ jr $ra -/* 8A022C 8024036C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C_8A021C.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C_8A021C.s new file mode 100644 index 0000000000..6f103550ec --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024035C_8A021C.s @@ -0,0 +1,9 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024035C_8A021C +/* 8A021C 8024035C 3C028016 */ lui $v0, 0x8016 +/* 8A0220 80240360 8442A552 */ lh $v0, -0x5aae($v0) +/* 8A0224 80240364 AC820084 */ sw $v0, 0x84($a0) +/* 8A0228 80240368 03E00008 */ jr $ra +/* 8A022C 8024036C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370.s deleted file mode 100644 index 4554c59fb5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370.s +++ /dev/null @@ -1,56 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240370 -/* 8A0230 80240370 3C038016 */ lui $v1, 0x8016 -/* 8A0234 80240374 8463A552 */ lh $v1, -0x5aae($v1) -/* 8A0238 80240378 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A023C 8024037C AFB00010 */ sw $s0, 0x10($sp) -/* 8A0240 80240380 0080802D */ daddu $s0, $a0, $zero -/* 8A0244 80240384 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A0248 80240388 8E0200B0 */ lw $v0, 0xb0($s0) -/* 8A024C 8024038C 10620003 */ beq $v1, $v0, .L8024039C -/* 8A0250 80240390 24020002 */ addiu $v0, $zero, 2 -/* 8A0254 80240394 08090107 */ j .L8024041C -/* 8A0258 80240398 AE000084 */ sw $zero, 0x84($s0) -.L8024039C: -/* 8A025C 8024039C 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8A0260 802403A0 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8A0264 802403A4 80620040 */ lb $v0, 0x40($v1) -/* 8A0268 802403A8 80670044 */ lb $a3, 0x44($v1) -/* 8A026C 802403AC 04420001 */ bltzl $v0, .L802403B4 -/* 8A0270 802403B0 00021023 */ negu $v0, $v0 -.L802403B4: -/* 8A0274 802403B4 14400003 */ bnez $v0, .L802403C4 -/* 8A0278 802403B8 00000000 */ nop -/* 8A027C 802403BC 50E00017 */ beql $a3, $zero, .L8024041C -/* 8A0280 802403C0 0000102D */ daddu $v0, $zero, $zero -.L802403C4: -/* 8A0284 802403C4 44822000 */ mtc1 $v0, $f4 -/* 8A0288 802403C8 00000000 */ nop -/* 8A028C 802403CC 46802120 */ cvt.s.w $f4, $f4 -/* 8A0290 802403D0 44062000 */ mfc1 $a2, $f4 -/* 8A0294 802403D4 44872000 */ mtc1 $a3, $f4 -/* 8A0298 802403D8 00000000 */ nop -/* 8A029C 802403DC 46802120 */ cvt.s.w $f4, $f4 -/* 8A02A0 802403E0 44806000 */ mtc1 $zero, $f12 -/* 8A02A4 802403E4 44072000 */ mfc1 $a3, $f4 -/* 8A02A8 802403E8 0C00A720 */ jal atan2 -/* 8A02AC 802403EC 46006386 */ mov.s $f14, $f12 -/* 8A02B0 802403F0 3C014270 */ lui $at, 0x4270 -/* 8A02B4 802403F4 44811000 */ mtc1 $at, $f2 -/* 8A02B8 802403F8 00000000 */ nop -/* 8A02BC 802403FC 4602003C */ c.lt.s $f0, $f2 -/* 8A02C0 80240400 00000000 */ nop -/* 8A02C4 80240404 45000004 */ bc1f .L80240418 -/* 8A02C8 80240408 24020001 */ addiu $v0, $zero, 1 -/* 8A02CC 8024040C AE020084 */ sw $v0, 0x84($s0) -/* 8A02D0 80240410 08090107 */ j .L8024041C -/* 8A02D4 80240414 24020002 */ addiu $v0, $zero, 2 -.L80240418: -/* 8A02D8 80240418 0000102D */ daddu $v0, $zero, $zero -.L8024041C: -/* 8A02DC 8024041C 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A02E0 80240420 8FB00010 */ lw $s0, 0x10($sp) -/* 8A02E4 80240424 03E00008 */ jr $ra -/* 8A02E8 80240428 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s new file mode 100644 index 0000000000..46798e8ab1 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240370_8A0230.s @@ -0,0 +1,56 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240370_8A0230 +/* 8A0230 80240370 3C038016 */ lui $v1, 0x8016 +/* 8A0234 80240374 8463A552 */ lh $v1, -0x5aae($v1) +/* 8A0238 80240378 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8A023C 8024037C AFB00010 */ sw $s0, 0x10($sp) +/* 8A0240 80240380 0080802D */ daddu $s0, $a0, $zero +/* 8A0244 80240384 AFBF0014 */ sw $ra, 0x14($sp) +/* 8A0248 80240388 8E0200B0 */ lw $v0, 0xb0($s0) +/* 8A024C 8024038C 10620003 */ beq $v1, $v0, .L8024039C +/* 8A0250 80240390 24020002 */ addiu $v0, $zero, 2 +/* 8A0254 80240394 08090107 */ j .L8024041C +/* 8A0258 80240398 AE000084 */ sw $zero, 0x84($s0) +.L8024039C: +/* 8A025C 8024039C 3C038007 */ lui $v1, %hi(gGameStatusPtr) +/* 8A0260 802403A0 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) +/* 8A0264 802403A4 80620040 */ lb $v0, 0x40($v1) +/* 8A0268 802403A8 80670044 */ lb $a3, 0x44($v1) +/* 8A026C 802403AC 04420001 */ bltzl $v0, .L802403B4 +/* 8A0270 802403B0 00021023 */ negu $v0, $v0 +.L802403B4: +/* 8A0274 802403B4 14400003 */ bnez $v0, .L802403C4 +/* 8A0278 802403B8 00000000 */ nop +/* 8A027C 802403BC 50E00017 */ beql $a3, $zero, .L8024041C +/* 8A0280 802403C0 0000102D */ daddu $v0, $zero, $zero +.L802403C4: +/* 8A0284 802403C4 44822000 */ mtc1 $v0, $f4 +/* 8A0288 802403C8 00000000 */ nop +/* 8A028C 802403CC 46802120 */ cvt.s.w $f4, $f4 +/* 8A0290 802403D0 44062000 */ mfc1 $a2, $f4 +/* 8A0294 802403D4 44872000 */ mtc1 $a3, $f4 +/* 8A0298 802403D8 00000000 */ nop +/* 8A029C 802403DC 46802120 */ cvt.s.w $f4, $f4 +/* 8A02A0 802403E0 44806000 */ mtc1 $zero, $f12 +/* 8A02A4 802403E4 44072000 */ mfc1 $a3, $f4 +/* 8A02A8 802403E8 0C00A720 */ jal atan2 +/* 8A02AC 802403EC 46006386 */ mov.s $f14, $f12 +/* 8A02B0 802403F0 3C014270 */ lui $at, 0x4270 +/* 8A02B4 802403F4 44811000 */ mtc1 $at, $f2 +/* 8A02B8 802403F8 00000000 */ nop +/* 8A02BC 802403FC 4602003C */ c.lt.s $f0, $f2 +/* 8A02C0 80240400 00000000 */ nop +/* 8A02C4 80240404 45000004 */ bc1f .L80240418 +/* 8A02C8 80240408 24020001 */ addiu $v0, $zero, 1 +/* 8A02CC 8024040C AE020084 */ sw $v0, 0x84($s0) +/* 8A02D0 80240410 08090107 */ j .L8024041C +/* 8A02D4 80240414 24020002 */ addiu $v0, $zero, 2 +.L80240418: +/* 8A02D8 80240418 0000102D */ daddu $v0, $zero, $zero +.L8024041C: +/* 8A02DC 8024041C 8FBF0014 */ lw $ra, 0x14($sp) +/* 8A02E0 80240420 8FB00010 */ lw $s0, 0x10($sp) +/* 8A02E4 80240424 03E00008 */ jr $ra +/* 8A02E8 80240428 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C.s deleted file mode 100644 index fe337eb57f..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C.s +++ /dev/null @@ -1,60 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024042C -/* 8A02EC 8024042C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A02F0 80240430 AFB10014 */ sw $s1, 0x14($sp) -/* 8A02F4 80240434 0080882D */ daddu $s1, $a0, $zero -/* 8A02F8 80240438 AFBF001C */ sw $ra, 0x1c($sp) -/* 8A02FC 8024043C AFB20018 */ sw $s2, 0x18($sp) -/* 8A0300 80240440 0C016AFA */ jal get_current_map_header -/* 8A0304 80240444 AFB00010 */ sw $s0, 0x10($sp) -/* 8A0308 80240448 0220202D */ daddu $a0, $s1, $zero -/* 8A030C 8024044C 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0310 80240450 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8A0314 80240454 0C0B1EAF */ jal get_variable -/* 8A0318 80240458 0040902D */ daddu $s2, $v0, $zero -/* 8A031C 8024045C 0220202D */ daddu $a0, $s1, $zero -/* 8A0320 80240460 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0324 80240464 8E430014 */ lw $v1, 0x14($s2) -/* 8A0328 80240468 00028100 */ sll $s0, $v0, 4 -/* 8A032C 8024046C 02031821 */ addu $v1, $s0, $v1 -/* 8A0330 80240470 C4600000 */ lwc1 $f0, ($v1) -/* 8A0334 80240474 4600008D */ trunc.w.s $f2, $f0 -/* 8A0338 80240478 44061000 */ mfc1 $a2, $f2 -/* 8A033C 8024047C 0C0B2026 */ jal set_variable -/* 8A0340 80240480 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8A0344 80240484 0220202D */ daddu $a0, $s1, $zero -/* 8A0348 80240488 8E420014 */ lw $v0, 0x14($s2) -/* 8A034C 8024048C 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0350 80240490 02021021 */ addu $v0, $s0, $v0 -/* 8A0354 80240494 C4400004 */ lwc1 $f0, 4($v0) -/* 8A0358 80240498 4600008D */ trunc.w.s $f2, $f0 -/* 8A035C 8024049C 44061000 */ mfc1 $a2, $f2 -/* 8A0360 802404A0 0C0B2026 */ jal set_variable -/* 8A0364 802404A4 34A53C82 */ ori $a1, $a1, 0x3c82 -/* 8A0368 802404A8 0220202D */ daddu $a0, $s1, $zero -/* 8A036C 802404AC 8E420014 */ lw $v0, 0x14($s2) -/* 8A0370 802404B0 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0374 802404B4 02021021 */ addu $v0, $s0, $v0 -/* 8A0378 802404B8 C4400008 */ lwc1 $f0, 8($v0) -/* 8A037C 802404BC 4600008D */ trunc.w.s $f2, $f0 -/* 8A0380 802404C0 44061000 */ mfc1 $a2, $f2 -/* 8A0384 802404C4 0C0B2026 */ jal set_variable -/* 8A0388 802404C8 34A53C83 */ ori $a1, $a1, 0x3c83 -/* 8A038C 802404CC 0220202D */ daddu $a0, $s1, $zero -/* 8A0390 802404D0 8E420014 */ lw $v0, 0x14($s2) -/* 8A0394 802404D4 3C05FE36 */ lui $a1, 0xfe36 -/* 8A0398 802404D8 02028021 */ addu $s0, $s0, $v0 -/* 8A039C 802404DC C600000C */ lwc1 $f0, 0xc($s0) -/* 8A03A0 802404E0 4600008D */ trunc.w.s $f2, $f0 -/* 8A03A4 802404E4 44061000 */ mfc1 $a2, $f2 -/* 8A03A8 802404E8 0C0B2026 */ jal set_variable -/* 8A03AC 802404EC 34A53C84 */ ori $a1, $a1, 0x3c84 -/* 8A03B0 802404F0 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A03B4 802404F4 8FB20018 */ lw $s2, 0x18($sp) -/* 8A03B8 802404F8 8FB10014 */ lw $s1, 0x14($sp) -/* 8A03BC 802404FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8A03C0 80240500 24020002 */ addiu $v0, $zero, 2 -/* 8A03C4 80240504 03E00008 */ jr $ra -/* 8A03C8 80240508 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s new file mode 100644 index 0000000000..29d794bc93 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024042C_8A02EC.s @@ -0,0 +1,60 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024042C_8A02EC +/* 8A02EC 8024042C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8A02F0 80240430 AFB10014 */ sw $s1, 0x14($sp) +/* 8A02F4 80240434 0080882D */ daddu $s1, $a0, $zero +/* 8A02F8 80240438 AFBF001C */ sw $ra, 0x1c($sp) +/* 8A02FC 8024043C AFB20018 */ sw $s2, 0x18($sp) +/* 8A0300 80240440 0C016AFA */ jal get_current_map_header +/* 8A0304 80240444 AFB00010 */ sw $s0, 0x10($sp) +/* 8A0308 80240448 0220202D */ daddu $a0, $s1, $zero +/* 8A030C 8024044C 3C05FE36 */ lui $a1, 0xfe36 +/* 8A0310 80240450 34A53C80 */ ori $a1, $a1, 0x3c80 +/* 8A0314 80240454 0C0B1EAF */ jal get_variable +/* 8A0318 80240458 0040902D */ daddu $s2, $v0, $zero +/* 8A031C 8024045C 0220202D */ daddu $a0, $s1, $zero +/* 8A0320 80240460 3C05FE36 */ lui $a1, 0xfe36 +/* 8A0324 80240464 8E430014 */ lw $v1, 0x14($s2) +/* 8A0328 80240468 00028100 */ sll $s0, $v0, 4 +/* 8A032C 8024046C 02031821 */ addu $v1, $s0, $v1 +/* 8A0330 80240470 C4600000 */ lwc1 $f0, ($v1) +/* 8A0334 80240474 4600008D */ trunc.w.s $f2, $f0 +/* 8A0338 80240478 44061000 */ mfc1 $a2, $f2 +/* 8A033C 8024047C 0C0B2026 */ jal set_variable +/* 8A0340 80240480 34A53C81 */ ori $a1, $a1, 0x3c81 +/* 8A0344 80240484 0220202D */ daddu $a0, $s1, $zero +/* 8A0348 80240488 8E420014 */ lw $v0, 0x14($s2) +/* 8A034C 8024048C 3C05FE36 */ lui $a1, 0xfe36 +/* 8A0350 80240490 02021021 */ addu $v0, $s0, $v0 +/* 8A0354 80240494 C4400004 */ lwc1 $f0, 4($v0) +/* 8A0358 80240498 4600008D */ trunc.w.s $f2, $f0 +/* 8A035C 8024049C 44061000 */ mfc1 $a2, $f2 +/* 8A0360 802404A0 0C0B2026 */ jal set_variable +/* 8A0364 802404A4 34A53C82 */ ori $a1, $a1, 0x3c82 +/* 8A0368 802404A8 0220202D */ daddu $a0, $s1, $zero +/* 8A036C 802404AC 8E420014 */ lw $v0, 0x14($s2) +/* 8A0370 802404B0 3C05FE36 */ lui $a1, 0xfe36 +/* 8A0374 802404B4 02021021 */ addu $v0, $s0, $v0 +/* 8A0378 802404B8 C4400008 */ lwc1 $f0, 8($v0) +/* 8A037C 802404BC 4600008D */ trunc.w.s $f2, $f0 +/* 8A0380 802404C0 44061000 */ mfc1 $a2, $f2 +/* 8A0384 802404C4 0C0B2026 */ jal set_variable +/* 8A0388 802404C8 34A53C83 */ ori $a1, $a1, 0x3c83 +/* 8A038C 802404CC 0220202D */ daddu $a0, $s1, $zero +/* 8A0390 802404D0 8E420014 */ lw $v0, 0x14($s2) +/* 8A0394 802404D4 3C05FE36 */ lui $a1, 0xfe36 +/* 8A0398 802404D8 02028021 */ addu $s0, $s0, $v0 +/* 8A039C 802404DC C600000C */ lwc1 $f0, 0xc($s0) +/* 8A03A0 802404E0 4600008D */ trunc.w.s $f2, $f0 +/* 8A03A4 802404E4 44061000 */ mfc1 $a2, $f2 +/* 8A03A8 802404E8 0C0B2026 */ jal set_variable +/* 8A03AC 802404EC 34A53C84 */ ori $a1, $a1, 0x3c84 +/* 8A03B0 802404F0 8FBF001C */ lw $ra, 0x1c($sp) +/* 8A03B4 802404F4 8FB20018 */ lw $s2, 0x18($sp) +/* 8A03B8 802404F8 8FB10014 */ lw $s1, 0x14($sp) +/* 8A03BC 802404FC 8FB00010 */ lw $s0, 0x10($sp) +/* 8A03C0 80240500 24020002 */ addiu $v0, $zero, 2 +/* 8A03C4 80240504 03E00008 */ jr $ra +/* 8A03C8 80240508 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024061C.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024061C.s deleted file mode 100644 index 387a00f8a7..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024061C.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024061C -/* 8A04DC 8024061C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A04E0 80240620 0000202D */ daddu $a0, $zero, $zero -/* 8A04E4 80240624 AFBF0010 */ sw $ra, 0x10($sp) -/* 8A04E8 80240628 0C052AD8 */ jal func_8014AB60 -/* 8A04EC 8024062C 24050002 */ addiu $a1, $zero, 2 -/* 8A04F0 80240630 8FBF0010 */ lw $ra, 0x10($sp) -/* 8A04F4 80240634 24020002 */ addiu $v0, $zero, 2 -/* 8A04F8 80240638 03E00008 */ jr $ra -/* 8A04FC 8024063C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024061C_8A04DC.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024061C_8A04DC.s new file mode 100644 index 0000000000..fe11f85664 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_8024061C_8A04DC.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024061C_8A04DC +/* 8A04DC 8024061C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8A04E0 80240620 0000202D */ daddu $a0, $zero, $zero +/* 8A04E4 80240624 AFBF0010 */ sw $ra, 0x10($sp) +/* 8A04E8 80240628 0C052AD8 */ jal func_8014AB60 +/* 8A04EC 8024062C 24050002 */ addiu $a1, $zero, 2 +/* 8A04F0 80240630 8FBF0010 */ lw $ra, 0x10($sp) +/* 8A04F4 80240634 24020002 */ addiu $v0, $zero, 2 +/* 8A04F8 80240638 03E00008 */ jr $ra +/* 8A04FC 8024063C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640.s deleted file mode 100644 index dfa720c875..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240640 -/* 8A0500 80240640 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A0504 80240644 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A0508 80240648 0080982D */ daddu $s3, $a0, $zero -/* 8A050C 8024064C AFBF0020 */ sw $ra, 0x20($sp) -/* 8A0510 80240650 AFB20018 */ sw $s2, 0x18($sp) -/* 8A0514 80240654 AFB10014 */ sw $s1, 0x14($sp) -/* 8A0518 80240658 AFB00010 */ sw $s0, 0x10($sp) -/* 8A051C 8024065C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8A0520 80240660 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8A0524 80240664 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8A0528 80240668 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8A052C 8024066C 8E62000C */ lw $v0, 0xc($s3) -/* 8A0530 80240670 0C0B1EAF */ jal get_variable -/* 8A0534 80240674 8C450000 */ lw $a1, ($v0) -/* 8A0538 80240678 2404FFFC */ addiu $a0, $zero, -4 -/* 8A053C 8024067C 0C00EABB */ jal get_npc_unsafe -/* 8A0540 80240680 0040802D */ daddu $s0, $v0, $zero -/* 8A0544 80240684 0200202D */ daddu $a0, $s0, $zero -/* 8A0548 80240688 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8A054C 8024068C 0040802D */ daddu $s0, $v0, $zero -/* 8A0550 80240690 0C046B4C */ jal get_model_from_list_index -/* 8A0554 80240694 0040202D */ daddu $a0, $v0, $zero -/* 8A0558 80240698 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8A055C 8024069C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8A0560 802406A0 0040902D */ daddu $s2, $v0, $zero -/* 8A0564 802406A4 AE60008C */ sw $zero, 0x8c($s3) -/* 8A0568 802406A8 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8A056C 802406AC C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A0570 802406B0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0574 802406B4 46021182 */ mul.s $f6, $f2, $f2 -/* 8A0578 802406B8 00000000 */ nop -/* 8A057C 802406BC C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A0580 802406C0 C4620030 */ lwc1 $f2, 0x30($v1) -/* 8A0584 802406C4 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0588 802406C8 46021102 */ mul.s $f4, $f2, $f2 -/* 8A058C 802406CC 00000000 */ nop -/* 8A0590 802406D0 846200B0 */ lh $v0, 0xb0($v1) -/* 8A0594 802406D4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8A0598 802406D8 44820000 */ mtc1 $v0, $f0 -/* 8A059C 802406DC 00000000 */ nop -/* 8A05A0 802406E0 46800020 */ cvt.s.w $f0, $f0 -/* 8A05A4 802406E4 46001080 */ add.s $f2, $f2, $f0 -/* 8A05A8 802406E8 3C013FC0 */ lui $at, 0x3fc0 -/* 8A05AC 802406EC 44810000 */ mtc1 $at, $f0 -/* 8A05B0 802406F0 00000000 */ nop -/* 8A05B4 802406F4 46001081 */ sub.s $f2, $f2, $f0 -/* 8A05B8 802406F8 46043300 */ add.s $f12, $f6, $f4 -/* 8A05BC 802406FC C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A05C0 80240700 46001501 */ sub.s $f20, $f2, $f0 -/* 8A05C4 80240704 46006084 */ sqrt.s $f2, $f12 -/* 8A05C8 80240708 46021032 */ c.eq.s $f2, $f2 -/* 8A05CC 8024070C 00000000 */ nop -/* 8A05D0 80240710 45010004 */ bc1t .L80240724 -/* 8A05D4 80240714 0060882D */ daddu $s1, $v1, $zero -/* 8A05D8 80240718 0C0187BC */ jal sqrtf -/* 8A05DC 8024071C 00000000 */ nop -/* 8A05E0 80240720 46000086 */ mov.s $f2, $f0 -.L80240724: -/* 8A05E4 80240724 44800000 */ mtc1 $zero, $f0 -/* 8A05E8 80240728 00000000 */ nop -/* 8A05EC 8024072C 4614003C */ c.lt.s $f0, $f20 -/* 8A05F0 80240730 00000000 */ nop -/* 8A05F4 80240734 45000016 */ bc1f .L80240790 -/* 8A05F8 80240738 46001106 */ mov.s $f4, $f2 -/* 8A05FC 8024073C 862200B0 */ lh $v0, 0xb0($s1) -/* 8A0600 80240740 44820000 */ mtc1 $v0, $f0 -/* 8A0604 80240744 00000000 */ nop -/* 8A0608 80240748 46800020 */ cvt.s.w $f0, $f0 -/* 8A060C 8024074C 4600A03C */ c.lt.s $f20, $f0 -/* 8A0610 80240750 00000000 */ nop -/* 8A0614 80240754 4500000E */ bc1f .L80240790 -/* 8A0618 80240758 00000000 */ nop -/* 8A061C 8024075C 862200B2 */ lh $v0, 0xb2($s1) -/* 8A0620 80240760 3C013F00 */ lui $at, 0x3f00 -/* 8A0624 80240764 44811000 */ mtc1 $at, $f2 -/* 8A0628 80240768 44820000 */ mtc1 $v0, $f0 -/* 8A062C 8024076C 00000000 */ nop -/* 8A0630 80240770 46800020 */ cvt.s.w $f0, $f0 -/* 8A0634 80240774 46020002 */ mul.s $f0, $f0, $f2 -/* 8A0638 80240778 00000000 */ nop -/* 8A063C 8024077C 4600203C */ c.lt.s $f4, $f0 -/* 8A0640 80240780 00000000 */ nop -/* 8A0644 80240784 45000002 */ bc1f .L80240790 -/* 8A0648 80240788 24020001 */ addiu $v0, $zero, 1 -/* 8A064C 8024078C AE62008C */ sw $v0, 0x8c($s3) -.L80240790: -/* 8A0650 80240790 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A0654 80240794 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A0658 80240798 46001081 */ sub.s $f2, $f2, $f0 -/* 8A065C 8024079C 46021182 */ mul.s $f6, $f2, $f2 -/* 8A0660 802407A0 00000000 */ nop -/* 8A0664 802407A4 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A0668 802407A8 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A066C 802407AC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0670 802407B0 46021102 */ mul.s $f4, $f2, $f2 -/* 8A0674 802407B4 00000000 */ nop -/* 8A0678 802407B8 860200A8 */ lh $v0, 0xa8($s0) -/* 8A067C 802407BC C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A0680 802407C0 44820000 */ mtc1 $v0, $f0 -/* 8A0684 802407C4 00000000 */ nop -/* 8A0688 802407C8 46800020 */ cvt.s.w $f0, $f0 -/* 8A068C 802407CC 46001080 */ add.s $f2, $f2, $f0 -/* 8A0690 802407D0 3C013FC0 */ lui $at, 0x3fc0 -/* 8A0694 802407D4 44810000 */ mtc1 $at, $f0 -/* 8A0698 802407D8 00000000 */ nop -/* 8A069C 802407DC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A06A0 802407E0 46043300 */ add.s $f12, $f6, $f4 -/* 8A06A4 802407E4 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A06A8 802407E8 46001501 */ sub.s $f20, $f2, $f0 -/* 8A06AC 802407EC 46006084 */ sqrt.s $f2, $f12 -/* 8A06B0 802407F0 46021032 */ c.eq.s $f2, $f2 -/* 8A06B4 802407F4 00000000 */ nop -/* 8A06B8 802407F8 45010004 */ bc1t .L8024080C -/* 8A06BC 802407FC 00000000 */ nop -/* 8A06C0 80240800 0C0187BC */ jal sqrtf -/* 8A06C4 80240804 00000000 */ nop -/* 8A06C8 80240808 46000086 */ mov.s $f2, $f0 -.L8024080C: -/* 8A06CC 8024080C 44800000 */ mtc1 $zero, $f0 -/* 8A06D0 80240810 00000000 */ nop -/* 8A06D4 80240814 4614003C */ c.lt.s $f0, $f20 -/* 8A06D8 80240818 00000000 */ nop -/* 8A06DC 8024081C 45000016 */ bc1f .L80240878 -/* 8A06E0 80240820 46001106 */ mov.s $f4, $f2 -/* 8A06E4 80240824 860200A8 */ lh $v0, 0xa8($s0) -/* 8A06E8 80240828 44820000 */ mtc1 $v0, $f0 -/* 8A06EC 8024082C 00000000 */ nop -/* 8A06F0 80240830 46800020 */ cvt.s.w $f0, $f0 -/* 8A06F4 80240834 4600A03C */ c.lt.s $f20, $f0 -/* 8A06F8 80240838 00000000 */ nop -/* 8A06FC 8024083C 4500000F */ bc1f .L8024087C -/* 8A0700 80240840 0000882D */ daddu $s1, $zero, $zero -/* 8A0704 80240844 860200A6 */ lh $v0, 0xa6($s0) -/* 8A0708 80240848 3C013F00 */ lui $at, 0x3f00 -/* 8A070C 8024084C 44811000 */ mtc1 $at, $f2 -/* 8A0710 80240850 44820000 */ mtc1 $v0, $f0 -/* 8A0714 80240854 00000000 */ nop -/* 8A0718 80240858 46800020 */ cvt.s.w $f0, $f0 -/* 8A071C 8024085C 46020002 */ mul.s $f0, $f0, $f2 -/* 8A0720 80240860 00000000 */ nop -/* 8A0724 80240864 4600203C */ c.lt.s $f4, $f0 -/* 8A0728 80240868 00000000 */ nop -/* 8A072C 8024086C 45000003 */ bc1f .L8024087C -/* 8A0730 80240870 24020001 */ addiu $v0, $zero, 1 -/* 8A0734 80240874 AE62008C */ sw $v0, 0x8c($s3) -.L80240878: -/* 8A0738 80240878 0000882D */ daddu $s1, $zero, $zero -.L8024087C: -/* 8A073C 8024087C 3C013FC0 */ lui $at, 0x3fc0 -/* 8A0740 80240880 4481D000 */ mtc1 $at, $f26 -/* 8A0744 80240884 4480C000 */ mtc1 $zero, $f24 -/* 8A0748 80240888 3C013F00 */ lui $at, 0x3f00 -/* 8A074C 8024088C 4481B000 */ mtc1 $at, $f22 -.L80240890: -/* 8A0750 80240890 0C00EAD2 */ jal get_npc_safe -/* 8A0754 80240894 0220202D */ daddu $a0, $s1, $zero -/* 8A0758 80240898 0040802D */ daddu $s0, $v0, $zero -/* 8A075C 8024089C 52000035 */ beql $s0, $zero, .L80240974 -/* 8A0760 802408A0 26310001 */ addiu $s1, $s1, 1 -/* 8A0764 802408A4 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A0768 802408A8 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A076C 802408AC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0770 802408B0 46021182 */ mul.s $f6, $f2, $f2 -/* 8A0774 802408B4 00000000 */ nop -/* 8A0778 802408B8 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A077C 802408BC C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A0780 802408C0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A0784 802408C4 46021102 */ mul.s $f4, $f2, $f2 -/* 8A0788 802408C8 00000000 */ nop -/* 8A078C 802408CC 860200A8 */ lh $v0, 0xa8($s0) -/* 8A0790 802408D0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A0794 802408D4 44820000 */ mtc1 $v0, $f0 -/* 8A0798 802408D8 00000000 */ nop -/* 8A079C 802408DC 46800020 */ cvt.s.w $f0, $f0 -/* 8A07A0 802408E0 46001080 */ add.s $f2, $f2, $f0 -/* 8A07A4 802408E4 461A1081 */ sub.s $f2, $f2, $f26 -/* 8A07A8 802408E8 46043300 */ add.s $f12, $f6, $f4 -/* 8A07AC 802408EC C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A07B0 802408F0 46001501 */ sub.s $f20, $f2, $f0 -/* 8A07B4 802408F4 46006004 */ sqrt.s $f0, $f12 -/* 8A07B8 802408F8 46000032 */ c.eq.s $f0, $f0 -/* 8A07BC 802408FC 00000000 */ nop -/* 8A07C0 80240900 45010003 */ bc1t .L80240910 -/* 8A07C4 80240904 00000000 */ nop -/* 8A07C8 80240908 0C0187BC */ jal sqrtf -/* 8A07CC 8024090C 00000000 */ nop -.L80240910: -/* 8A07D0 80240910 4614C03C */ c.lt.s $f24, $f20 -/* 8A07D4 80240914 00000000 */ nop -/* 8A07D8 80240918 45000015 */ bc1f .L80240970 -/* 8A07DC 8024091C 46000106 */ mov.s $f4, $f0 -/* 8A07E0 80240920 860200A8 */ lh $v0, 0xa8($s0) -/* 8A07E4 80240924 44820000 */ mtc1 $v0, $f0 -/* 8A07E8 80240928 00000000 */ nop -/* 8A07EC 8024092C 46800020 */ cvt.s.w $f0, $f0 -/* 8A07F0 80240930 4600A03C */ c.lt.s $f20, $f0 -/* 8A07F4 80240934 00000000 */ nop -/* 8A07F8 80240938 4500000E */ bc1f .L80240974 -/* 8A07FC 8024093C 26310001 */ addiu $s1, $s1, 1 -/* 8A0800 80240940 860200A6 */ lh $v0, 0xa6($s0) -/* 8A0804 80240944 44820000 */ mtc1 $v0, $f0 -/* 8A0808 80240948 00000000 */ nop -/* 8A080C 8024094C 46800020 */ cvt.s.w $f0, $f0 -/* 8A0810 80240950 46160002 */ mul.s $f0, $f0, $f22 -/* 8A0814 80240954 00000000 */ nop -/* 8A0818 80240958 4600203C */ c.lt.s $f4, $f0 -/* 8A081C 8024095C 00000000 */ nop -/* 8A0820 80240960 45000004 */ bc1f .L80240974 -/* 8A0824 80240964 24020001 */ addiu $v0, $zero, 1 -/* 8A0828 80240968 08090260 */ j .L80240980 -/* 8A082C 8024096C AE62008C */ sw $v0, 0x8c($s3) -.L80240970: -/* 8A0830 80240970 26310001 */ addiu $s1, $s1, 1 -.L80240974: -/* 8A0834 80240974 2A220040 */ slti $v0, $s1, 0x40 -/* 8A0838 80240978 1440FFC5 */ bnez $v0, .L80240890 -/* 8A083C 8024097C 00000000 */ nop -.L80240980: -/* 8A0840 80240980 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A0844 80240984 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A0848 80240988 8FB20018 */ lw $s2, 0x18($sp) -/* 8A084C 8024098C 8FB10014 */ lw $s1, 0x14($sp) -/* 8A0850 80240990 8FB00010 */ lw $s0, 0x10($sp) -/* 8A0854 80240994 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8A0858 80240998 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8A085C 8024099C D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8A0860 802409A0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8A0864 802409A4 24020002 */ addiu $v0, $zero, 2 -/* 8A0868 802409A8 03E00008 */ jr $ra -/* 8A086C 802409AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s new file mode 100644 index 0000000000..ef320f7063 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_22/89FEF0/func_80240640_8A0500.s @@ -0,0 +1,234 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240640_8A0500 +/* 8A0500 80240640 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8A0504 80240644 AFB3001C */ sw $s3, 0x1c($sp) +/* 8A0508 80240648 0080982D */ daddu $s3, $a0, $zero +/* 8A050C 8024064C AFBF0020 */ sw $ra, 0x20($sp) +/* 8A0510 80240650 AFB20018 */ sw $s2, 0x18($sp) +/* 8A0514 80240654 AFB10014 */ sw $s1, 0x14($sp) +/* 8A0518 80240658 AFB00010 */ sw $s0, 0x10($sp) +/* 8A051C 8024065C F7BA0040 */ sdc1 $f26, 0x40($sp) +/* 8A0520 80240660 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 8A0524 80240664 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 8A0528 80240668 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8A052C 8024066C 8E62000C */ lw $v0, 0xc($s3) +/* 8A0530 80240670 0C0B1EAF */ jal get_variable +/* 8A0534 80240674 8C450000 */ lw $a1, ($v0) +/* 8A0538 80240678 2404FFFC */ addiu $a0, $zero, -4 +/* 8A053C 8024067C 0C00EABB */ jal get_npc_unsafe +/* 8A0540 80240680 0040802D */ daddu $s0, $v0, $zero +/* 8A0544 80240684 0200202D */ daddu $a0, $s0, $zero +/* 8A0548 80240688 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8A054C 8024068C 0040802D */ daddu $s0, $v0, $zero +/* 8A0550 80240690 0C046B4C */ jal get_model_from_list_index +/* 8A0554 80240694 0040202D */ daddu $a0, $v0, $zero +/* 8A0558 80240698 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 8A055C 8024069C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 8A0560 802406A0 0040902D */ daddu $s2, $v0, $zero +/* 8A0564 802406A4 AE60008C */ sw $zero, 0x8c($s3) +/* 8A0568 802406A8 C4620028 */ lwc1 $f2, 0x28($v1) +/* 8A056C 802406AC C6400098 */ lwc1 $f0, 0x98($s2) +/* 8A0570 802406B0 46001081 */ sub.s $f2, $f2, $f0 +/* 8A0574 802406B4 46021182 */ mul.s $f6, $f2, $f2 +/* 8A0578 802406B8 00000000 */ nop +/* 8A057C 802406BC C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 8A0580 802406C0 C4620030 */ lwc1 $f2, 0x30($v1) +/* 8A0584 802406C4 46001081 */ sub.s $f2, $f2, $f0 +/* 8A0588 802406C8 46021102 */ mul.s $f4, $f2, $f2 +/* 8A058C 802406CC 00000000 */ nop +/* 8A0590 802406D0 846200B0 */ lh $v0, 0xb0($v1) +/* 8A0594 802406D4 C462002C */ lwc1 $f2, 0x2c($v1) +/* 8A0598 802406D8 44820000 */ mtc1 $v0, $f0 +/* 8A059C 802406DC 00000000 */ nop +/* 8A05A0 802406E0 46800020 */ cvt.s.w $f0, $f0 +/* 8A05A4 802406E4 46001080 */ add.s $f2, $f2, $f0 +/* 8A05A8 802406E8 3C013FC0 */ lui $at, 0x3fc0 +/* 8A05AC 802406EC 44810000 */ mtc1 $at, $f0 +/* 8A05B0 802406F0 00000000 */ nop +/* 8A05B4 802406F4 46001081 */ sub.s $f2, $f2, $f0 +/* 8A05B8 802406F8 46043300 */ add.s $f12, $f6, $f4 +/* 8A05BC 802406FC C640009C */ lwc1 $f0, 0x9c($s2) +/* 8A05C0 80240700 46001501 */ sub.s $f20, $f2, $f0 +/* 8A05C4 80240704 46006084 */ sqrt.s $f2, $f12 +/* 8A05C8 80240708 46021032 */ c.eq.s $f2, $f2 +/* 8A05CC 8024070C 00000000 */ nop +/* 8A05D0 80240710 45010004 */ bc1t .L80240724 +/* 8A05D4 80240714 0060882D */ daddu $s1, $v1, $zero +/* 8A05D8 80240718 0C0187BC */ jal sqrtf +/* 8A05DC 8024071C 00000000 */ nop +/* 8A05E0 80240720 46000086 */ mov.s $f2, $f0 +.L80240724: +/* 8A05E4 80240724 44800000 */ mtc1 $zero, $f0 +/* 8A05E8 80240728 00000000 */ nop +/* 8A05EC 8024072C 4614003C */ c.lt.s $f0, $f20 +/* 8A05F0 80240730 00000000 */ nop +/* 8A05F4 80240734 45000016 */ bc1f .L80240790 +/* 8A05F8 80240738 46001106 */ mov.s $f4, $f2 +/* 8A05FC 8024073C 862200B0 */ lh $v0, 0xb0($s1) +/* 8A0600 80240740 44820000 */ mtc1 $v0, $f0 +/* 8A0604 80240744 00000000 */ nop +/* 8A0608 80240748 46800020 */ cvt.s.w $f0, $f0 +/* 8A060C 8024074C 4600A03C */ c.lt.s $f20, $f0 +/* 8A0610 80240750 00000000 */ nop +/* 8A0614 80240754 4500000E */ bc1f .L80240790 +/* 8A0618 80240758 00000000 */ nop +/* 8A061C 8024075C 862200B2 */ lh $v0, 0xb2($s1) +/* 8A0620 80240760 3C013F00 */ lui $at, 0x3f00 +/* 8A0624 80240764 44811000 */ mtc1 $at, $f2 +/* 8A0628 80240768 44820000 */ mtc1 $v0, $f0 +/* 8A062C 8024076C 00000000 */ nop +/* 8A0630 80240770 46800020 */ cvt.s.w $f0, $f0 +/* 8A0634 80240774 46020002 */ mul.s $f0, $f0, $f2 +/* 8A0638 80240778 00000000 */ nop +/* 8A063C 8024077C 4600203C */ c.lt.s $f4, $f0 +/* 8A0640 80240780 00000000 */ nop +/* 8A0644 80240784 45000002 */ bc1f .L80240790 +/* 8A0648 80240788 24020001 */ addiu $v0, $zero, 1 +/* 8A064C 8024078C AE62008C */ sw $v0, 0x8c($s3) +.L80240790: +/* 8A0650 80240790 C6020038 */ lwc1 $f2, 0x38($s0) +/* 8A0654 80240794 C6400098 */ lwc1 $f0, 0x98($s2) +/* 8A0658 80240798 46001081 */ sub.s $f2, $f2, $f0 +/* 8A065C 8024079C 46021182 */ mul.s $f6, $f2, $f2 +/* 8A0660 802407A0 00000000 */ nop +/* 8A0664 802407A4 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 8A0668 802407A8 C6020040 */ lwc1 $f2, 0x40($s0) +/* 8A066C 802407AC 46001081 */ sub.s $f2, $f2, $f0 +/* 8A0670 802407B0 46021102 */ mul.s $f4, $f2, $f2 +/* 8A0674 802407B4 00000000 */ nop +/* 8A0678 802407B8 860200A8 */ lh $v0, 0xa8($s0) +/* 8A067C 802407BC C602003C */ lwc1 $f2, 0x3c($s0) +/* 8A0680 802407C0 44820000 */ mtc1 $v0, $f0 +/* 8A0684 802407C4 00000000 */ nop +/* 8A0688 802407C8 46800020 */ cvt.s.w $f0, $f0 +/* 8A068C 802407CC 46001080 */ add.s $f2, $f2, $f0 +/* 8A0690 802407D0 3C013FC0 */ lui $at, 0x3fc0 +/* 8A0694 802407D4 44810000 */ mtc1 $at, $f0 +/* 8A0698 802407D8 00000000 */ nop +/* 8A069C 802407DC 46001081 */ sub.s $f2, $f2, $f0 +/* 8A06A0 802407E0 46043300 */ add.s $f12, $f6, $f4 +/* 8A06A4 802407E4 C640009C */ lwc1 $f0, 0x9c($s2) +/* 8A06A8 802407E8 46001501 */ sub.s $f20, $f2, $f0 +/* 8A06AC 802407EC 46006084 */ sqrt.s $f2, $f12 +/* 8A06B0 802407F0 46021032 */ c.eq.s $f2, $f2 +/* 8A06B4 802407F4 00000000 */ nop +/* 8A06B8 802407F8 45010004 */ bc1t .L8024080C +/* 8A06BC 802407FC 00000000 */ nop +/* 8A06C0 80240800 0C0187BC */ jal sqrtf +/* 8A06C4 80240804 00000000 */ nop +/* 8A06C8 80240808 46000086 */ mov.s $f2, $f0 +.L8024080C: +/* 8A06CC 8024080C 44800000 */ mtc1 $zero, $f0 +/* 8A06D0 80240810 00000000 */ nop +/* 8A06D4 80240814 4614003C */ c.lt.s $f0, $f20 +/* 8A06D8 80240818 00000000 */ nop +/* 8A06DC 8024081C 45000016 */ bc1f .L80240878 +/* 8A06E0 80240820 46001106 */ mov.s $f4, $f2 +/* 8A06E4 80240824 860200A8 */ lh $v0, 0xa8($s0) +/* 8A06E8 80240828 44820000 */ mtc1 $v0, $f0 +/* 8A06EC 8024082C 00000000 */ nop +/* 8A06F0 80240830 46800020 */ cvt.s.w $f0, $f0 +/* 8A06F4 80240834 4600A03C */ c.lt.s $f20, $f0 +/* 8A06F8 80240838 00000000 */ nop +/* 8A06FC 8024083C 4500000F */ bc1f .L8024087C +/* 8A0700 80240840 0000882D */ daddu $s1, $zero, $zero +/* 8A0704 80240844 860200A6 */ lh $v0, 0xa6($s0) +/* 8A0708 80240848 3C013F00 */ lui $at, 0x3f00 +/* 8A070C 8024084C 44811000 */ mtc1 $at, $f2 +/* 8A0710 80240850 44820000 */ mtc1 $v0, $f0 +/* 8A0714 80240854 00000000 */ nop +/* 8A0718 80240858 46800020 */ cvt.s.w $f0, $f0 +/* 8A071C 8024085C 46020002 */ mul.s $f0, $f0, $f2 +/* 8A0720 80240860 00000000 */ nop +/* 8A0724 80240864 4600203C */ c.lt.s $f4, $f0 +/* 8A0728 80240868 00000000 */ nop +/* 8A072C 8024086C 45000003 */ bc1f .L8024087C +/* 8A0730 80240870 24020001 */ addiu $v0, $zero, 1 +/* 8A0734 80240874 AE62008C */ sw $v0, 0x8c($s3) +.L80240878: +/* 8A0738 80240878 0000882D */ daddu $s1, $zero, $zero +.L8024087C: +/* 8A073C 8024087C 3C013FC0 */ lui $at, 0x3fc0 +/* 8A0740 80240880 4481D000 */ mtc1 $at, $f26 +/* 8A0744 80240884 4480C000 */ mtc1 $zero, $f24 +/* 8A0748 80240888 3C013F00 */ lui $at, 0x3f00 +/* 8A074C 8024088C 4481B000 */ mtc1 $at, $f22 +.L80240890: +/* 8A0750 80240890 0C00EAD2 */ jal get_npc_safe +/* 8A0754 80240894 0220202D */ daddu $a0, $s1, $zero +/* 8A0758 80240898 0040802D */ daddu $s0, $v0, $zero +/* 8A075C 8024089C 52000035 */ beql $s0, $zero, .L80240974 +/* 8A0760 802408A0 26310001 */ addiu $s1, $s1, 1 +/* 8A0764 802408A4 C6020038 */ lwc1 $f2, 0x38($s0) +/* 8A0768 802408A8 C6400098 */ lwc1 $f0, 0x98($s2) +/* 8A076C 802408AC 46001081 */ sub.s $f2, $f2, $f0 +/* 8A0770 802408B0 46021182 */ mul.s $f6, $f2, $f2 +/* 8A0774 802408B4 00000000 */ nop +/* 8A0778 802408B8 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 8A077C 802408BC C6020040 */ lwc1 $f2, 0x40($s0) +/* 8A0780 802408C0 46001081 */ sub.s $f2, $f2, $f0 +/* 8A0784 802408C4 46021102 */ mul.s $f4, $f2, $f2 +/* 8A0788 802408C8 00000000 */ nop +/* 8A078C 802408CC 860200A8 */ lh $v0, 0xa8($s0) +/* 8A0790 802408D0 C602003C */ lwc1 $f2, 0x3c($s0) +/* 8A0794 802408D4 44820000 */ mtc1 $v0, $f0 +/* 8A0798 802408D8 00000000 */ nop +/* 8A079C 802408DC 46800020 */ cvt.s.w $f0, $f0 +/* 8A07A0 802408E0 46001080 */ add.s $f2, $f2, $f0 +/* 8A07A4 802408E4 461A1081 */ sub.s $f2, $f2, $f26 +/* 8A07A8 802408E8 46043300 */ add.s $f12, $f6, $f4 +/* 8A07AC 802408EC C640009C */ lwc1 $f0, 0x9c($s2) +/* 8A07B0 802408F0 46001501 */ sub.s $f20, $f2, $f0 +/* 8A07B4 802408F4 46006004 */ sqrt.s $f0, $f12 +/* 8A07B8 802408F8 46000032 */ c.eq.s $f0, $f0 +/* 8A07BC 802408FC 00000000 */ nop +/* 8A07C0 80240900 45010003 */ bc1t .L80240910 +/* 8A07C4 80240904 00000000 */ nop +/* 8A07C8 80240908 0C0187BC */ jal sqrtf +/* 8A07CC 8024090C 00000000 */ nop +.L80240910: +/* 8A07D0 80240910 4614C03C */ c.lt.s $f24, $f20 +/* 8A07D4 80240914 00000000 */ nop +/* 8A07D8 80240918 45000015 */ bc1f .L80240970 +/* 8A07DC 8024091C 46000106 */ mov.s $f4, $f0 +/* 8A07E0 80240920 860200A8 */ lh $v0, 0xa8($s0) +/* 8A07E4 80240924 44820000 */ mtc1 $v0, $f0 +/* 8A07E8 80240928 00000000 */ nop +/* 8A07EC 8024092C 46800020 */ cvt.s.w $f0, $f0 +/* 8A07F0 80240930 4600A03C */ c.lt.s $f20, $f0 +/* 8A07F4 80240934 00000000 */ nop +/* 8A07F8 80240938 4500000E */ bc1f .L80240974 +/* 8A07FC 8024093C 26310001 */ addiu $s1, $s1, 1 +/* 8A0800 80240940 860200A6 */ lh $v0, 0xa6($s0) +/* 8A0804 80240944 44820000 */ mtc1 $v0, $f0 +/* 8A0808 80240948 00000000 */ nop +/* 8A080C 8024094C 46800020 */ cvt.s.w $f0, $f0 +/* 8A0810 80240950 46160002 */ mul.s $f0, $f0, $f22 +/* 8A0814 80240954 00000000 */ nop +/* 8A0818 80240958 4600203C */ c.lt.s $f4, $f0 +/* 8A081C 8024095C 00000000 */ nop +/* 8A0820 80240960 45000004 */ bc1f .L80240974 +/* 8A0824 80240964 24020001 */ addiu $v0, $zero, 1 +/* 8A0828 80240968 08090260 */ j .L80240980 +/* 8A082C 8024096C AE62008C */ sw $v0, 0x8c($s3) +.L80240970: +/* 8A0830 80240970 26310001 */ addiu $s1, $s1, 1 +.L80240974: +/* 8A0834 80240974 2A220040 */ slti $v0, $s1, 0x40 +/* 8A0838 80240978 1440FFC5 */ bnez $v0, .L80240890 +/* 8A083C 8024097C 00000000 */ nop +.L80240980: +/* 8A0840 80240980 8FBF0020 */ lw $ra, 0x20($sp) +/* 8A0844 80240984 8FB3001C */ lw $s3, 0x1c($sp) +/* 8A0848 80240988 8FB20018 */ lw $s2, 0x18($sp) +/* 8A084C 8024098C 8FB10014 */ lw $s1, 0x14($sp) +/* 8A0850 80240990 8FB00010 */ lw $s0, 0x10($sp) +/* 8A0854 80240994 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* 8A0858 80240998 D7B80038 */ ldc1 $f24, 0x38($sp) +/* 8A085C 8024099C D7B60030 */ ldc1 $f22, 0x30($sp) +/* 8A0860 802409A0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8A0864 802409A4 24020002 */ addiu $v0, $zero, 2 +/* 8A0868 802409A8 03E00008 */ jr $ra +/* 8A086C 802409AC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s index 56f22ecf92..ca99fd24e2 100644 --- a/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s +++ b/asm/nonmatchings/world/area_tik/tik_23/8A2D30/func_80240CF4_8A30C4.s @@ -232,25 +232,25 @@ glabel func_80240CF4_8A30C4 .L80241044: /* 8A3414 80241044 0260202D */ daddu $a0, $s3, $zero /* 8A3418 80241048 0280282D */ daddu $a1, $s4, $zero -/* 8A341C 8024104C 0C090258 */ jal func_80240960 +/* 8A341C 8024104C 0C090258 */ jal func_80240960_8A2D30 /* 8A3420 80241050 02A0302D */ daddu $a2, $s5, $zero /* 8A3424 80241054 0260202D */ daddu $a0, $s3, $zero .L80241058: /* 8A3428 80241058 0280282D */ daddu $a1, $s4, $zero -/* 8A342C 8024105C 0C090277 */ jal func_802409DC +/* 8A342C 8024105C 0C090277 */ jal func_802409DC_8A2DAC /* 8A3430 80241060 02A0302D */ daddu $a2, $s5, $zero /* 8A3434 80241064 08090428 */ j .L802410A0 /* 8A3438 80241068 00000000 */ nop .L8024106C: /* 8A343C 8024106C 0260202D */ daddu $a0, $s3, $zero /* 8A3440 80241070 0280282D */ daddu $a1, $s4, $zero -/* 8A3444 80241074 0C0902C4 */ jal func_80240B10 +/* 8A3444 80241074 0C0902C4 */ jal func_80240B10_8A2EE0 /* 8A3448 80241078 02A0302D */ daddu $a2, $s5, $zero /* 8A344C 8024107C 08090428 */ j .L802410A0 /* 8A3450 80241080 00000000 */ nop .L80241084: /* 8A3454 80241084 0280282D */ daddu $a1, $s4, $zero -/* 8A3458 80241088 0C09031D */ jal func_80240C74 +/* 8A3458 80241088 0C09031D */ jal func_80240C74_8A3044 /* 8A345C 8024108C 02A0302D */ daddu $a2, $s5, $zero /* 8A3460 80241090 08090428 */ j .L802410A0 /* 8A3464 80241094 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174.s b/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174.s deleted file mode 100644 index e8091c83af..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174.s +++ /dev/null @@ -1,144 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240174 -/* 8A5BF4 80240174 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A5BF8 80240178 AFB00010 */ sw $s0, 0x10($sp) -/* 8A5BFC 8024017C 0080802D */ daddu $s0, $a0, $zero -/* 8A5C00 80240180 10A00005 */ beqz $a1, .L80240198 -/* 8A5C04 80240184 AFBF0014 */ sw $ra, 0x14($sp) -/* 8A5C08 80240188 AE000070 */ sw $zero, 0x70($s0) -/* 8A5C0C 8024018C AE000074 */ sw $zero, 0x74($s0) -/* 8A5C10 80240190 AE000078 */ sw $zero, 0x78($s0) -/* 8A5C14 80240194 AE00007C */ sw $zero, 0x7c($s0) -.L80240198: -/* 8A5C18 80240198 8E020070 */ lw $v0, 0x70($s0) -/* 8A5C1C 8024019C 1440000E */ bnez $v0, .L802401D8 -/* 8A5C20 802401A0 00000000 */ nop -/* 8A5C24 802401A4 8E0300A8 */ lw $v1, 0xa8($s0) -/* 8A5C28 802401A8 8E020088 */ lw $v0, 0x88($s0) -/* 8A5C2C 802401AC 00621821 */ addu $v1, $v1, $v0 -/* 8A5C30 802401B0 04610004 */ bgez $v1, .L802401C4 -/* 8A5C34 802401B4 AE0300A8 */ sw $v1, 0xa8($s0) -/* 8A5C38 802401B8 3C020002 */ lui $v0, 2 -/* 8A5C3C 802401BC 08090075 */ j .L802401D4 -/* 8A5C40 802401C0 00621021 */ addu $v0, $v1, $v0 -.L802401C4: -/* 8A5C44 802401C4 3C040002 */ lui $a0, 2 -/* 8A5C48 802401C8 0083102A */ slt $v0, $a0, $v1 -/* 8A5C4C 802401CC 10400002 */ beqz $v0, .L802401D8 -/* 8A5C50 802401D0 00641023 */ subu $v0, $v1, $a0 -.L802401D4: -/* 8A5C54 802401D4 AE0200A8 */ sw $v0, 0xa8($s0) -.L802401D8: -/* 8A5C58 802401D8 8E020074 */ lw $v0, 0x74($s0) -/* 8A5C5C 802401DC 1440000E */ bnez $v0, .L80240218 -/* 8A5C60 802401E0 00000000 */ nop -/* 8A5C64 802401E4 8E0300AC */ lw $v1, 0xac($s0) -/* 8A5C68 802401E8 8E02008C */ lw $v0, 0x8c($s0) -/* 8A5C6C 802401EC 00621821 */ addu $v1, $v1, $v0 -/* 8A5C70 802401F0 04610004 */ bgez $v1, .L80240204 -/* 8A5C74 802401F4 AE0300AC */ sw $v1, 0xac($s0) -/* 8A5C78 802401F8 3C020002 */ lui $v0, 2 -/* 8A5C7C 802401FC 08090085 */ j .L80240214 -/* 8A5C80 80240200 00621021 */ addu $v0, $v1, $v0 -.L80240204: -/* 8A5C84 80240204 3C040002 */ lui $a0, 2 -/* 8A5C88 80240208 0083102A */ slt $v0, $a0, $v1 -/* 8A5C8C 8024020C 10400002 */ beqz $v0, .L80240218 -/* 8A5C90 80240210 00641023 */ subu $v0, $v1, $a0 -.L80240214: -/* 8A5C94 80240214 AE0200AC */ sw $v0, 0xac($s0) -.L80240218: -/* 8A5C98 80240218 8E020078 */ lw $v0, 0x78($s0) -/* 8A5C9C 8024021C 1440000E */ bnez $v0, .L80240258 -/* 8A5CA0 80240220 00000000 */ nop -/* 8A5CA4 80240224 8E0300B0 */ lw $v1, 0xb0($s0) -/* 8A5CA8 80240228 8E020090 */ lw $v0, 0x90($s0) -/* 8A5CAC 8024022C 00621821 */ addu $v1, $v1, $v0 -/* 8A5CB0 80240230 04610004 */ bgez $v1, .L80240244 -/* 8A5CB4 80240234 AE0300B0 */ sw $v1, 0xb0($s0) -/* 8A5CB8 80240238 3C020002 */ lui $v0, 2 -/* 8A5CBC 8024023C 08090095 */ j .L80240254 -/* 8A5CC0 80240240 00621021 */ addu $v0, $v1, $v0 -.L80240244: -/* 8A5CC4 80240244 3C040002 */ lui $a0, 2 -/* 8A5CC8 80240248 0083102A */ slt $v0, $a0, $v1 -/* 8A5CCC 8024024C 10400002 */ beqz $v0, .L80240258 -/* 8A5CD0 80240250 00641023 */ subu $v0, $v1, $a0 -.L80240254: -/* 8A5CD4 80240254 AE0200B0 */ sw $v0, 0xb0($s0) -.L80240258: -/* 8A5CD8 80240258 8E02007C */ lw $v0, 0x7c($s0) -/* 8A5CDC 8024025C 1440000E */ bnez $v0, .L80240298 -/* 8A5CE0 80240260 00000000 */ nop -/* 8A5CE4 80240264 8E0300B4 */ lw $v1, 0xb4($s0) -/* 8A5CE8 80240268 8E020094 */ lw $v0, 0x94($s0) -/* 8A5CEC 8024026C 00621821 */ addu $v1, $v1, $v0 -/* 8A5CF0 80240270 04610004 */ bgez $v1, .L80240284 -/* 8A5CF4 80240274 AE0300B4 */ sw $v1, 0xb4($s0) -/* 8A5CF8 80240278 3C020002 */ lui $v0, 2 -/* 8A5CFC 8024027C 080900A5 */ j .L80240294 -/* 8A5D00 80240280 00621021 */ addu $v0, $v1, $v0 -.L80240284: -/* 8A5D04 80240284 3C040002 */ lui $a0, 2 -/* 8A5D08 80240288 0083102A */ slt $v0, $a0, $v1 -/* 8A5D0C 8024028C 10400002 */ beqz $v0, .L80240298 -/* 8A5D10 80240290 00641023 */ subu $v0, $v1, $a0 -.L80240294: -/* 8A5D14 80240294 AE0200B4 */ sw $v0, 0xb4($s0) -.L80240298: -/* 8A5D18 80240298 8E040084 */ lw $a0, 0x84($s0) -/* 8A5D1C 8024029C 0C046F07 */ jal set_main_pan_u -/* 8A5D20 802402A0 8E0500A8 */ lw $a1, 0xa8($s0) -/* 8A5D24 802402A4 8E040084 */ lw $a0, 0x84($s0) -/* 8A5D28 802402A8 0C046F0D */ jal set_main_pan_v -/* 8A5D2C 802402AC 8E0500AC */ lw $a1, 0xac($s0) -/* 8A5D30 802402B0 8E040084 */ lw $a0, 0x84($s0) -/* 8A5D34 802402B4 0C046F13 */ jal set_aux_pan_u -/* 8A5D38 802402B8 8E0500B0 */ lw $a1, 0xb0($s0) -/* 8A5D3C 802402BC 8E040084 */ lw $a0, 0x84($s0) -/* 8A5D40 802402C0 0C046F19 */ jal set_aux_pan_v -/* 8A5D44 802402C4 8E0500B4 */ lw $a1, 0xb4($s0) -/* 8A5D48 802402C8 8E020070 */ lw $v0, 0x70($s0) -/* 8A5D4C 802402CC 8E030078 */ lw $v1, 0x78($s0) -/* 8A5D50 802402D0 8E040098 */ lw $a0, 0x98($s0) -/* 8A5D54 802402D4 24420001 */ addiu $v0, $v0, 1 -/* 8A5D58 802402D8 AE020070 */ sw $v0, 0x70($s0) -/* 8A5D5C 802402DC 8E020074 */ lw $v0, 0x74($s0) -/* 8A5D60 802402E0 24630001 */ addiu $v1, $v1, 1 -/* 8A5D64 802402E4 AE030078 */ sw $v1, 0x78($s0) -/* 8A5D68 802402E8 8E030070 */ lw $v1, 0x70($s0) -/* 8A5D6C 802402EC 24420001 */ addiu $v0, $v0, 1 -/* 8A5D70 802402F0 AE020074 */ sw $v0, 0x74($s0) -/* 8A5D74 802402F4 8E02007C */ lw $v0, 0x7c($s0) -/* 8A5D78 802402F8 0064182A */ slt $v1, $v1, $a0 -/* 8A5D7C 802402FC 24420001 */ addiu $v0, $v0, 1 -/* 8A5D80 80240300 14600002 */ bnez $v1, .L8024030C -/* 8A5D84 80240304 AE02007C */ sw $v0, 0x7c($s0) -/* 8A5D88 80240308 AE000070 */ sw $zero, 0x70($s0) -.L8024030C: -/* 8A5D8C 8024030C 8E020074 */ lw $v0, 0x74($s0) -/* 8A5D90 80240310 8E03009C */ lw $v1, 0x9c($s0) -/* 8A5D94 80240314 0043102A */ slt $v0, $v0, $v1 -/* 8A5D98 80240318 50400001 */ beql $v0, $zero, .L80240320 -/* 8A5D9C 8024031C AE000074 */ sw $zero, 0x74($s0) -.L80240320: -/* 8A5DA0 80240320 8E020078 */ lw $v0, 0x78($s0) -/* 8A5DA4 80240324 8E0300A0 */ lw $v1, 0xa0($s0) -/* 8A5DA8 80240328 0043102A */ slt $v0, $v0, $v1 -/* 8A5DAC 8024032C 50400001 */ beql $v0, $zero, .L80240334 -/* 8A5DB0 80240330 AE000078 */ sw $zero, 0x78($s0) -.L80240334: -/* 8A5DB4 80240334 8E02007C */ lw $v0, 0x7c($s0) -/* 8A5DB8 80240338 8E0300A4 */ lw $v1, 0xa4($s0) -/* 8A5DBC 8024033C 0043102A */ slt $v0, $v0, $v1 -/* 8A5DC0 80240340 50400001 */ beql $v0, $zero, .L80240348 -/* 8A5DC4 80240344 AE00007C */ sw $zero, 0x7c($s0) -.L80240348: -/* 8A5DC8 80240348 8FBF0014 */ lw $ra, 0x14($sp) -/* 8A5DCC 8024034C 8FB00010 */ lw $s0, 0x10($sp) -/* 8A5DD0 80240350 0000102D */ daddu $v0, $zero, $zero -/* 8A5DD4 80240354 03E00008 */ jr $ra -/* 8A5DD8 80240358 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8A5DDC 8024035C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174_8A5BF4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174_8A5BF4.s new file mode 100644 index 0000000000..abb4bc7564 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5AD0/func_80240174_8A5BF4.s @@ -0,0 +1,144 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240174_8A5BF4 +/* 8A5BF4 80240174 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8A5BF8 80240178 AFB00010 */ sw $s0, 0x10($sp) +/* 8A5BFC 8024017C 0080802D */ daddu $s0, $a0, $zero +/* 8A5C00 80240180 10A00005 */ beqz $a1, .L80240198 +/* 8A5C04 80240184 AFBF0014 */ sw $ra, 0x14($sp) +/* 8A5C08 80240188 AE000070 */ sw $zero, 0x70($s0) +/* 8A5C0C 8024018C AE000074 */ sw $zero, 0x74($s0) +/* 8A5C10 80240190 AE000078 */ sw $zero, 0x78($s0) +/* 8A5C14 80240194 AE00007C */ sw $zero, 0x7c($s0) +.L80240198: +/* 8A5C18 80240198 8E020070 */ lw $v0, 0x70($s0) +/* 8A5C1C 8024019C 1440000E */ bnez $v0, .L802401D8 +/* 8A5C20 802401A0 00000000 */ nop +/* 8A5C24 802401A4 8E0300A8 */ lw $v1, 0xa8($s0) +/* 8A5C28 802401A8 8E020088 */ lw $v0, 0x88($s0) +/* 8A5C2C 802401AC 00621821 */ addu $v1, $v1, $v0 +/* 8A5C30 802401B0 04610004 */ bgez $v1, .L802401C4 +/* 8A5C34 802401B4 AE0300A8 */ sw $v1, 0xa8($s0) +/* 8A5C38 802401B8 3C020002 */ lui $v0, 2 +/* 8A5C3C 802401BC 08090075 */ j .L802401D4 +/* 8A5C40 802401C0 00621021 */ addu $v0, $v1, $v0 +.L802401C4: +/* 8A5C44 802401C4 3C040002 */ lui $a0, 2 +/* 8A5C48 802401C8 0083102A */ slt $v0, $a0, $v1 +/* 8A5C4C 802401CC 10400002 */ beqz $v0, .L802401D8 +/* 8A5C50 802401D0 00641023 */ subu $v0, $v1, $a0 +.L802401D4: +/* 8A5C54 802401D4 AE0200A8 */ sw $v0, 0xa8($s0) +.L802401D8: +/* 8A5C58 802401D8 8E020074 */ lw $v0, 0x74($s0) +/* 8A5C5C 802401DC 1440000E */ bnez $v0, .L80240218 +/* 8A5C60 802401E0 00000000 */ nop +/* 8A5C64 802401E4 8E0300AC */ lw $v1, 0xac($s0) +/* 8A5C68 802401E8 8E02008C */ lw $v0, 0x8c($s0) +/* 8A5C6C 802401EC 00621821 */ addu $v1, $v1, $v0 +/* 8A5C70 802401F0 04610004 */ bgez $v1, .L80240204 +/* 8A5C74 802401F4 AE0300AC */ sw $v1, 0xac($s0) +/* 8A5C78 802401F8 3C020002 */ lui $v0, 2 +/* 8A5C7C 802401FC 08090085 */ j .L80240214 +/* 8A5C80 80240200 00621021 */ addu $v0, $v1, $v0 +.L80240204: +/* 8A5C84 80240204 3C040002 */ lui $a0, 2 +/* 8A5C88 80240208 0083102A */ slt $v0, $a0, $v1 +/* 8A5C8C 8024020C 10400002 */ beqz $v0, .L80240218 +/* 8A5C90 80240210 00641023 */ subu $v0, $v1, $a0 +.L80240214: +/* 8A5C94 80240214 AE0200AC */ sw $v0, 0xac($s0) +.L80240218: +/* 8A5C98 80240218 8E020078 */ lw $v0, 0x78($s0) +/* 8A5C9C 8024021C 1440000E */ bnez $v0, .L80240258 +/* 8A5CA0 80240220 00000000 */ nop +/* 8A5CA4 80240224 8E0300B0 */ lw $v1, 0xb0($s0) +/* 8A5CA8 80240228 8E020090 */ lw $v0, 0x90($s0) +/* 8A5CAC 8024022C 00621821 */ addu $v1, $v1, $v0 +/* 8A5CB0 80240230 04610004 */ bgez $v1, .L80240244 +/* 8A5CB4 80240234 AE0300B0 */ sw $v1, 0xb0($s0) +/* 8A5CB8 80240238 3C020002 */ lui $v0, 2 +/* 8A5CBC 8024023C 08090095 */ j .L80240254 +/* 8A5CC0 80240240 00621021 */ addu $v0, $v1, $v0 +.L80240244: +/* 8A5CC4 80240244 3C040002 */ lui $a0, 2 +/* 8A5CC8 80240248 0083102A */ slt $v0, $a0, $v1 +/* 8A5CCC 8024024C 10400002 */ beqz $v0, .L80240258 +/* 8A5CD0 80240250 00641023 */ subu $v0, $v1, $a0 +.L80240254: +/* 8A5CD4 80240254 AE0200B0 */ sw $v0, 0xb0($s0) +.L80240258: +/* 8A5CD8 80240258 8E02007C */ lw $v0, 0x7c($s0) +/* 8A5CDC 8024025C 1440000E */ bnez $v0, .L80240298 +/* 8A5CE0 80240260 00000000 */ nop +/* 8A5CE4 80240264 8E0300B4 */ lw $v1, 0xb4($s0) +/* 8A5CE8 80240268 8E020094 */ lw $v0, 0x94($s0) +/* 8A5CEC 8024026C 00621821 */ addu $v1, $v1, $v0 +/* 8A5CF0 80240270 04610004 */ bgez $v1, .L80240284 +/* 8A5CF4 80240274 AE0300B4 */ sw $v1, 0xb4($s0) +/* 8A5CF8 80240278 3C020002 */ lui $v0, 2 +/* 8A5CFC 8024027C 080900A5 */ j .L80240294 +/* 8A5D00 80240280 00621021 */ addu $v0, $v1, $v0 +.L80240284: +/* 8A5D04 80240284 3C040002 */ lui $a0, 2 +/* 8A5D08 80240288 0083102A */ slt $v0, $a0, $v1 +/* 8A5D0C 8024028C 10400002 */ beqz $v0, .L80240298 +/* 8A5D10 80240290 00641023 */ subu $v0, $v1, $a0 +.L80240294: +/* 8A5D14 80240294 AE0200B4 */ sw $v0, 0xb4($s0) +.L80240298: +/* 8A5D18 80240298 8E040084 */ lw $a0, 0x84($s0) +/* 8A5D1C 8024029C 0C046F07 */ jal set_main_pan_u +/* 8A5D20 802402A0 8E0500A8 */ lw $a1, 0xa8($s0) +/* 8A5D24 802402A4 8E040084 */ lw $a0, 0x84($s0) +/* 8A5D28 802402A8 0C046F0D */ jal set_main_pan_v +/* 8A5D2C 802402AC 8E0500AC */ lw $a1, 0xac($s0) +/* 8A5D30 802402B0 8E040084 */ lw $a0, 0x84($s0) +/* 8A5D34 802402B4 0C046F13 */ jal set_aux_pan_u +/* 8A5D38 802402B8 8E0500B0 */ lw $a1, 0xb0($s0) +/* 8A5D3C 802402BC 8E040084 */ lw $a0, 0x84($s0) +/* 8A5D40 802402C0 0C046F19 */ jal set_aux_pan_v +/* 8A5D44 802402C4 8E0500B4 */ lw $a1, 0xb4($s0) +/* 8A5D48 802402C8 8E020070 */ lw $v0, 0x70($s0) +/* 8A5D4C 802402CC 8E030078 */ lw $v1, 0x78($s0) +/* 8A5D50 802402D0 8E040098 */ lw $a0, 0x98($s0) +/* 8A5D54 802402D4 24420001 */ addiu $v0, $v0, 1 +/* 8A5D58 802402D8 AE020070 */ sw $v0, 0x70($s0) +/* 8A5D5C 802402DC 8E020074 */ lw $v0, 0x74($s0) +/* 8A5D60 802402E0 24630001 */ addiu $v1, $v1, 1 +/* 8A5D64 802402E4 AE030078 */ sw $v1, 0x78($s0) +/* 8A5D68 802402E8 8E030070 */ lw $v1, 0x70($s0) +/* 8A5D6C 802402EC 24420001 */ addiu $v0, $v0, 1 +/* 8A5D70 802402F0 AE020074 */ sw $v0, 0x74($s0) +/* 8A5D74 802402F4 8E02007C */ lw $v0, 0x7c($s0) +/* 8A5D78 802402F8 0064182A */ slt $v1, $v1, $a0 +/* 8A5D7C 802402FC 24420001 */ addiu $v0, $v0, 1 +/* 8A5D80 80240300 14600002 */ bnez $v1, .L8024030C +/* 8A5D84 80240304 AE02007C */ sw $v0, 0x7c($s0) +/* 8A5D88 80240308 AE000070 */ sw $zero, 0x70($s0) +.L8024030C: +/* 8A5D8C 8024030C 8E020074 */ lw $v0, 0x74($s0) +/* 8A5D90 80240310 8E03009C */ lw $v1, 0x9c($s0) +/* 8A5D94 80240314 0043102A */ slt $v0, $v0, $v1 +/* 8A5D98 80240318 50400001 */ beql $v0, $zero, .L80240320 +/* 8A5D9C 8024031C AE000074 */ sw $zero, 0x74($s0) +.L80240320: +/* 8A5DA0 80240320 8E020078 */ lw $v0, 0x78($s0) +/* 8A5DA4 80240324 8E0300A0 */ lw $v1, 0xa0($s0) +/* 8A5DA8 80240328 0043102A */ slt $v0, $v0, $v1 +/* 8A5DAC 8024032C 50400001 */ beql $v0, $zero, .L80240334 +/* 8A5DB0 80240330 AE000078 */ sw $zero, 0x78($s0) +.L80240334: +/* 8A5DB4 80240334 8E02007C */ lw $v0, 0x7c($s0) +/* 8A5DB8 80240338 8E0300A4 */ lw $v1, 0xa4($s0) +/* 8A5DBC 8024033C 0043102A */ slt $v0, $v0, $v1 +/* 8A5DC0 80240340 50400001 */ beql $v0, $zero, .L80240348 +/* 8A5DC4 80240344 AE00007C */ sw $zero, 0x7c($s0) +.L80240348: +/* 8A5DC8 80240348 8FBF0014 */ lw $ra, 0x14($sp) +/* 8A5DCC 8024034C 8FB00010 */ lw $s0, 0x10($sp) +/* 8A5DD0 80240350 0000102D */ daddu $v0, $zero, $zero +/* 8A5DD4 80240354 03E00008 */ jr $ra +/* 8A5DD8 80240358 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8A5DDC 8024035C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360.s deleted file mode 100644 index 4315cad6f5..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360.s +++ /dev/null @@ -1,234 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240360 -/* 8A5DE0 80240360 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A5DE4 80240364 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A5DE8 80240368 0080982D */ daddu $s3, $a0, $zero -/* 8A5DEC 8024036C AFBF0020 */ sw $ra, 0x20($sp) -/* 8A5DF0 80240370 AFB20018 */ sw $s2, 0x18($sp) -/* 8A5DF4 80240374 AFB10014 */ sw $s1, 0x14($sp) -/* 8A5DF8 80240378 AFB00010 */ sw $s0, 0x10($sp) -/* 8A5DFC 8024037C F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 8A5E00 80240380 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 8A5E04 80240384 F7B60030 */ sdc1 $f22, 0x30($sp) -/* 8A5E08 80240388 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 8A5E0C 8024038C 8E62000C */ lw $v0, 0xc($s3) -/* 8A5E10 80240390 0C0B1EAF */ jal get_variable -/* 8A5E14 80240394 8C450000 */ lw $a1, ($v0) -/* 8A5E18 80240398 2404FFFC */ addiu $a0, $zero, -4 -/* 8A5E1C 8024039C 0C00EABB */ jal get_npc_unsafe -/* 8A5E20 802403A0 0040802D */ daddu $s0, $v0, $zero -/* 8A5E24 802403A4 0200202D */ daddu $a0, $s0, $zero -/* 8A5E28 802403A8 0C046C04 */ jal get_model_list_index_from_tree_index -/* 8A5E2C 802403AC 0040802D */ daddu $s0, $v0, $zero -/* 8A5E30 802403B0 0C046B4C */ jal get_model_from_list_index -/* 8A5E34 802403B4 0040202D */ daddu $a0, $v0, $zero -/* 8A5E38 802403B8 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8A5E3C 802403BC 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8A5E40 802403C0 0040902D */ daddu $s2, $v0, $zero -/* 8A5E44 802403C4 AE60008C */ sw $zero, 0x8c($s3) -/* 8A5E48 802403C8 C4620028 */ lwc1 $f2, 0x28($v1) -/* 8A5E4C 802403CC C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A5E50 802403D0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5E54 802403D4 46021182 */ mul.s $f6, $f2, $f2 -/* 8A5E58 802403D8 00000000 */ nop -/* 8A5E5C 802403DC C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A5E60 802403E0 C4620030 */ lwc1 $f2, 0x30($v1) -/* 8A5E64 802403E4 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5E68 802403E8 46021102 */ mul.s $f4, $f2, $f2 -/* 8A5E6C 802403EC 00000000 */ nop -/* 8A5E70 802403F0 846200B0 */ lh $v0, 0xb0($v1) -/* 8A5E74 802403F4 C462002C */ lwc1 $f2, 0x2c($v1) -/* 8A5E78 802403F8 44820000 */ mtc1 $v0, $f0 -/* 8A5E7C 802403FC 00000000 */ nop -/* 8A5E80 80240400 46800020 */ cvt.s.w $f0, $f0 -/* 8A5E84 80240404 46001080 */ add.s $f2, $f2, $f0 -/* 8A5E88 80240408 3C013FC0 */ lui $at, 0x3fc0 -/* 8A5E8C 8024040C 44810000 */ mtc1 $at, $f0 -/* 8A5E90 80240410 00000000 */ nop -/* 8A5E94 80240414 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5E98 80240418 46043300 */ add.s $f12, $f6, $f4 -/* 8A5E9C 8024041C C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A5EA0 80240420 46001501 */ sub.s $f20, $f2, $f0 -/* 8A5EA4 80240424 46006084 */ sqrt.s $f2, $f12 -/* 8A5EA8 80240428 46021032 */ c.eq.s $f2, $f2 -/* 8A5EAC 8024042C 00000000 */ nop -/* 8A5EB0 80240430 45010004 */ bc1t .L80240444 -/* 8A5EB4 80240434 0060882D */ daddu $s1, $v1, $zero -/* 8A5EB8 80240438 0C0187BC */ jal sqrtf -/* 8A5EBC 8024043C 00000000 */ nop -/* 8A5EC0 80240440 46000086 */ mov.s $f2, $f0 -.L80240444: -/* 8A5EC4 80240444 44800000 */ mtc1 $zero, $f0 -/* 8A5EC8 80240448 00000000 */ nop -/* 8A5ECC 8024044C 4614003C */ c.lt.s $f0, $f20 -/* 8A5ED0 80240450 00000000 */ nop -/* 8A5ED4 80240454 45000016 */ bc1f .L802404B0 -/* 8A5ED8 80240458 46001106 */ mov.s $f4, $f2 -/* 8A5EDC 8024045C 862200B0 */ lh $v0, 0xb0($s1) -/* 8A5EE0 80240460 44820000 */ mtc1 $v0, $f0 -/* 8A5EE4 80240464 00000000 */ nop -/* 8A5EE8 80240468 46800020 */ cvt.s.w $f0, $f0 -/* 8A5EEC 8024046C 4600A03C */ c.lt.s $f20, $f0 -/* 8A5EF0 80240470 00000000 */ nop -/* 8A5EF4 80240474 4500000E */ bc1f .L802404B0 -/* 8A5EF8 80240478 00000000 */ nop -/* 8A5EFC 8024047C 862200B2 */ lh $v0, 0xb2($s1) -/* 8A5F00 80240480 3C013F00 */ lui $at, 0x3f00 -/* 8A5F04 80240484 44811000 */ mtc1 $at, $f2 -/* 8A5F08 80240488 44820000 */ mtc1 $v0, $f0 -/* 8A5F0C 8024048C 00000000 */ nop -/* 8A5F10 80240490 46800020 */ cvt.s.w $f0, $f0 -/* 8A5F14 80240494 46020002 */ mul.s $f0, $f0, $f2 -/* 8A5F18 80240498 00000000 */ nop -/* 8A5F1C 8024049C 4600203C */ c.lt.s $f4, $f0 -/* 8A5F20 802404A0 00000000 */ nop -/* 8A5F24 802404A4 45000002 */ bc1f .L802404B0 -/* 8A5F28 802404A8 24020001 */ addiu $v0, $zero, 1 -/* 8A5F2C 802404AC AE62008C */ sw $v0, 0x8c($s3) -.L802404B0: -/* 8A5F30 802404B0 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A5F34 802404B4 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A5F38 802404B8 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5F3C 802404BC 46021182 */ mul.s $f6, $f2, $f2 -/* 8A5F40 802404C0 00000000 */ nop -/* 8A5F44 802404C4 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A5F48 802404C8 C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A5F4C 802404CC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5F50 802404D0 46021102 */ mul.s $f4, $f2, $f2 -/* 8A5F54 802404D4 00000000 */ nop -/* 8A5F58 802404D8 860200A8 */ lh $v0, 0xa8($s0) -/* 8A5F5C 802404DC C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A5F60 802404E0 44820000 */ mtc1 $v0, $f0 -/* 8A5F64 802404E4 00000000 */ nop -/* 8A5F68 802404E8 46800020 */ cvt.s.w $f0, $f0 -/* 8A5F6C 802404EC 46001080 */ add.s $f2, $f2, $f0 -/* 8A5F70 802404F0 3C013FC0 */ lui $at, 0x3fc0 -/* 8A5F74 802404F4 44810000 */ mtc1 $at, $f0 -/* 8A5F78 802404F8 00000000 */ nop -/* 8A5F7C 802404FC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A5F80 80240500 46043300 */ add.s $f12, $f6, $f4 -/* 8A5F84 80240504 C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A5F88 80240508 46001501 */ sub.s $f20, $f2, $f0 -/* 8A5F8C 8024050C 46006084 */ sqrt.s $f2, $f12 -/* 8A5F90 80240510 46021032 */ c.eq.s $f2, $f2 -/* 8A5F94 80240514 00000000 */ nop -/* 8A5F98 80240518 45010004 */ bc1t .L8024052C -/* 8A5F9C 8024051C 00000000 */ nop -/* 8A5FA0 80240520 0C0187BC */ jal sqrtf -/* 8A5FA4 80240524 00000000 */ nop -/* 8A5FA8 80240528 46000086 */ mov.s $f2, $f0 -.L8024052C: -/* 8A5FAC 8024052C 44800000 */ mtc1 $zero, $f0 -/* 8A5FB0 80240530 00000000 */ nop -/* 8A5FB4 80240534 4614003C */ c.lt.s $f0, $f20 -/* 8A5FB8 80240538 00000000 */ nop -/* 8A5FBC 8024053C 45000016 */ bc1f .L80240598 -/* 8A5FC0 80240540 46001106 */ mov.s $f4, $f2 -/* 8A5FC4 80240544 860200A8 */ lh $v0, 0xa8($s0) -/* 8A5FC8 80240548 44820000 */ mtc1 $v0, $f0 -/* 8A5FCC 8024054C 00000000 */ nop -/* 8A5FD0 80240550 46800020 */ cvt.s.w $f0, $f0 -/* 8A5FD4 80240554 4600A03C */ c.lt.s $f20, $f0 -/* 8A5FD8 80240558 00000000 */ nop -/* 8A5FDC 8024055C 4500000F */ bc1f .L8024059C -/* 8A5FE0 80240560 0000882D */ daddu $s1, $zero, $zero -/* 8A5FE4 80240564 860200A6 */ lh $v0, 0xa6($s0) -/* 8A5FE8 80240568 3C013F00 */ lui $at, 0x3f00 -/* 8A5FEC 8024056C 44811000 */ mtc1 $at, $f2 -/* 8A5FF0 80240570 44820000 */ mtc1 $v0, $f0 -/* 8A5FF4 80240574 00000000 */ nop -/* 8A5FF8 80240578 46800020 */ cvt.s.w $f0, $f0 -/* 8A5FFC 8024057C 46020002 */ mul.s $f0, $f0, $f2 -/* 8A6000 80240580 00000000 */ nop -/* 8A6004 80240584 4600203C */ c.lt.s $f4, $f0 -/* 8A6008 80240588 00000000 */ nop -/* 8A600C 8024058C 45000003 */ bc1f .L8024059C -/* 8A6010 80240590 24020001 */ addiu $v0, $zero, 1 -/* 8A6014 80240594 AE62008C */ sw $v0, 0x8c($s3) -.L80240598: -/* 8A6018 80240598 0000882D */ daddu $s1, $zero, $zero -.L8024059C: -/* 8A601C 8024059C 3C013FC0 */ lui $at, 0x3fc0 -/* 8A6020 802405A0 4481D000 */ mtc1 $at, $f26 -/* 8A6024 802405A4 4480C000 */ mtc1 $zero, $f24 -/* 8A6028 802405A8 3C013F00 */ lui $at, 0x3f00 -/* 8A602C 802405AC 4481B000 */ mtc1 $at, $f22 -.L802405B0: -/* 8A6030 802405B0 0C00EAD2 */ jal get_npc_safe -/* 8A6034 802405B4 0220202D */ daddu $a0, $s1, $zero -/* 8A6038 802405B8 0040802D */ daddu $s0, $v0, $zero -/* 8A603C 802405BC 52000035 */ beql $s0, $zero, .L80240694 -/* 8A6040 802405C0 26310001 */ addiu $s1, $s1, 1 -/* 8A6044 802405C4 C6020038 */ lwc1 $f2, 0x38($s0) -/* 8A6048 802405C8 C6400098 */ lwc1 $f0, 0x98($s2) -/* 8A604C 802405CC 46001081 */ sub.s $f2, $f2, $f0 -/* 8A6050 802405D0 46021182 */ mul.s $f6, $f2, $f2 -/* 8A6054 802405D4 00000000 */ nop -/* 8A6058 802405D8 C64000A0 */ lwc1 $f0, 0xa0($s2) -/* 8A605C 802405DC C6020040 */ lwc1 $f2, 0x40($s0) -/* 8A6060 802405E0 46001081 */ sub.s $f2, $f2, $f0 -/* 8A6064 802405E4 46021102 */ mul.s $f4, $f2, $f2 -/* 8A6068 802405E8 00000000 */ nop -/* 8A606C 802405EC 860200A8 */ lh $v0, 0xa8($s0) -/* 8A6070 802405F0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A6074 802405F4 44820000 */ mtc1 $v0, $f0 -/* 8A6078 802405F8 00000000 */ nop -/* 8A607C 802405FC 46800020 */ cvt.s.w $f0, $f0 -/* 8A6080 80240600 46001080 */ add.s $f2, $f2, $f0 -/* 8A6084 80240604 461A1081 */ sub.s $f2, $f2, $f26 -/* 8A6088 80240608 46043300 */ add.s $f12, $f6, $f4 -/* 8A608C 8024060C C640009C */ lwc1 $f0, 0x9c($s2) -/* 8A6090 80240610 46001501 */ sub.s $f20, $f2, $f0 -/* 8A6094 80240614 46006004 */ sqrt.s $f0, $f12 -/* 8A6098 80240618 46000032 */ c.eq.s $f0, $f0 -/* 8A609C 8024061C 00000000 */ nop -/* 8A60A0 80240620 45010003 */ bc1t .L80240630 -/* 8A60A4 80240624 00000000 */ nop -/* 8A60A8 80240628 0C0187BC */ jal sqrtf -/* 8A60AC 8024062C 00000000 */ nop -.L80240630: -/* 8A60B0 80240630 4614C03C */ c.lt.s $f24, $f20 -/* 8A60B4 80240634 00000000 */ nop -/* 8A60B8 80240638 45000015 */ bc1f .L80240690 -/* 8A60BC 8024063C 46000106 */ mov.s $f4, $f0 -/* 8A60C0 80240640 860200A8 */ lh $v0, 0xa8($s0) -/* 8A60C4 80240644 44820000 */ mtc1 $v0, $f0 -/* 8A60C8 80240648 00000000 */ nop -/* 8A60CC 8024064C 46800020 */ cvt.s.w $f0, $f0 -/* 8A60D0 80240650 4600A03C */ c.lt.s $f20, $f0 -/* 8A60D4 80240654 00000000 */ nop -/* 8A60D8 80240658 4500000E */ bc1f .L80240694 -/* 8A60DC 8024065C 26310001 */ addiu $s1, $s1, 1 -/* 8A60E0 80240660 860200A6 */ lh $v0, 0xa6($s0) -/* 8A60E4 80240664 44820000 */ mtc1 $v0, $f0 -/* 8A60E8 80240668 00000000 */ nop -/* 8A60EC 8024066C 46800020 */ cvt.s.w $f0, $f0 -/* 8A60F0 80240670 46160002 */ mul.s $f0, $f0, $f22 -/* 8A60F4 80240674 00000000 */ nop -/* 8A60F8 80240678 4600203C */ c.lt.s $f4, $f0 -/* 8A60FC 8024067C 00000000 */ nop -/* 8A6100 80240680 45000004 */ bc1f .L80240694 -/* 8A6104 80240684 24020001 */ addiu $v0, $zero, 1 -/* 8A6108 80240688 080901A8 */ j .L802406A0 -/* 8A610C 8024068C AE62008C */ sw $v0, 0x8c($s3) -.L80240690: -/* 8A6110 80240690 26310001 */ addiu $s1, $s1, 1 -.L80240694: -/* 8A6114 80240694 2A220040 */ slti $v0, $s1, 0x40 -/* 8A6118 80240698 1440FFC5 */ bnez $v0, .L802405B0 -/* 8A611C 8024069C 00000000 */ nop -.L802406A0: -/* 8A6120 802406A0 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A6124 802406A4 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A6128 802406A8 8FB20018 */ lw $s2, 0x18($sp) -/* 8A612C 802406AC 8FB10014 */ lw $s1, 0x14($sp) -/* 8A6130 802406B0 8FB00010 */ lw $s0, 0x10($sp) -/* 8A6134 802406B4 D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 8A6138 802406B8 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 8A613C 802406BC D7B60030 */ ldc1 $f22, 0x30($sp) -/* 8A6140 802406C0 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 8A6144 802406C4 24020002 */ addiu $v0, $zero, 2 -/* 8A6148 802406C8 03E00008 */ jr $ra -/* 8A614C 802406CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s new file mode 100644 index 0000000000..aa5dcb47fc --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240360_8A5DE0.s @@ -0,0 +1,234 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240360_8A5DE0 +/* 8A5DE0 80240360 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8A5DE4 80240364 AFB3001C */ sw $s3, 0x1c($sp) +/* 8A5DE8 80240368 0080982D */ daddu $s3, $a0, $zero +/* 8A5DEC 8024036C AFBF0020 */ sw $ra, 0x20($sp) +/* 8A5DF0 80240370 AFB20018 */ sw $s2, 0x18($sp) +/* 8A5DF4 80240374 AFB10014 */ sw $s1, 0x14($sp) +/* 8A5DF8 80240378 AFB00010 */ sw $s0, 0x10($sp) +/* 8A5DFC 8024037C F7BA0040 */ sdc1 $f26, 0x40($sp) +/* 8A5E00 80240380 F7B80038 */ sdc1 $f24, 0x38($sp) +/* 8A5E04 80240384 F7B60030 */ sdc1 $f22, 0x30($sp) +/* 8A5E08 80240388 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 8A5E0C 8024038C 8E62000C */ lw $v0, 0xc($s3) +/* 8A5E10 80240390 0C0B1EAF */ jal get_variable +/* 8A5E14 80240394 8C450000 */ lw $a1, ($v0) +/* 8A5E18 80240398 2404FFFC */ addiu $a0, $zero, -4 +/* 8A5E1C 8024039C 0C00EABB */ jal get_npc_unsafe +/* 8A5E20 802403A0 0040802D */ daddu $s0, $v0, $zero +/* 8A5E24 802403A4 0200202D */ daddu $a0, $s0, $zero +/* 8A5E28 802403A8 0C046C04 */ jal get_model_list_index_from_tree_index +/* 8A5E2C 802403AC 0040802D */ daddu $s0, $v0, $zero +/* 8A5E30 802403B0 0C046B4C */ jal get_model_from_list_index +/* 8A5E34 802403B4 0040202D */ daddu $a0, $v0, $zero +/* 8A5E38 802403B8 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 8A5E3C 802403BC 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 8A5E40 802403C0 0040902D */ daddu $s2, $v0, $zero +/* 8A5E44 802403C4 AE60008C */ sw $zero, 0x8c($s3) +/* 8A5E48 802403C8 C4620028 */ lwc1 $f2, 0x28($v1) +/* 8A5E4C 802403CC C6400098 */ lwc1 $f0, 0x98($s2) +/* 8A5E50 802403D0 46001081 */ sub.s $f2, $f2, $f0 +/* 8A5E54 802403D4 46021182 */ mul.s $f6, $f2, $f2 +/* 8A5E58 802403D8 00000000 */ nop +/* 8A5E5C 802403DC C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 8A5E60 802403E0 C4620030 */ lwc1 $f2, 0x30($v1) +/* 8A5E64 802403E4 46001081 */ sub.s $f2, $f2, $f0 +/* 8A5E68 802403E8 46021102 */ mul.s $f4, $f2, $f2 +/* 8A5E6C 802403EC 00000000 */ nop +/* 8A5E70 802403F0 846200B0 */ lh $v0, 0xb0($v1) +/* 8A5E74 802403F4 C462002C */ lwc1 $f2, 0x2c($v1) +/* 8A5E78 802403F8 44820000 */ mtc1 $v0, $f0 +/* 8A5E7C 802403FC 00000000 */ nop +/* 8A5E80 80240400 46800020 */ cvt.s.w $f0, $f0 +/* 8A5E84 80240404 46001080 */ add.s $f2, $f2, $f0 +/* 8A5E88 80240408 3C013FC0 */ lui $at, 0x3fc0 +/* 8A5E8C 8024040C 44810000 */ mtc1 $at, $f0 +/* 8A5E90 80240410 00000000 */ nop +/* 8A5E94 80240414 46001081 */ sub.s $f2, $f2, $f0 +/* 8A5E98 80240418 46043300 */ add.s $f12, $f6, $f4 +/* 8A5E9C 8024041C C640009C */ lwc1 $f0, 0x9c($s2) +/* 8A5EA0 80240420 46001501 */ sub.s $f20, $f2, $f0 +/* 8A5EA4 80240424 46006084 */ sqrt.s $f2, $f12 +/* 8A5EA8 80240428 46021032 */ c.eq.s $f2, $f2 +/* 8A5EAC 8024042C 00000000 */ nop +/* 8A5EB0 80240430 45010004 */ bc1t .L80240444 +/* 8A5EB4 80240434 0060882D */ daddu $s1, $v1, $zero +/* 8A5EB8 80240438 0C0187BC */ jal sqrtf +/* 8A5EBC 8024043C 00000000 */ nop +/* 8A5EC0 80240440 46000086 */ mov.s $f2, $f0 +.L80240444: +/* 8A5EC4 80240444 44800000 */ mtc1 $zero, $f0 +/* 8A5EC8 80240448 00000000 */ nop +/* 8A5ECC 8024044C 4614003C */ c.lt.s $f0, $f20 +/* 8A5ED0 80240450 00000000 */ nop +/* 8A5ED4 80240454 45000016 */ bc1f .L802404B0 +/* 8A5ED8 80240458 46001106 */ mov.s $f4, $f2 +/* 8A5EDC 8024045C 862200B0 */ lh $v0, 0xb0($s1) +/* 8A5EE0 80240460 44820000 */ mtc1 $v0, $f0 +/* 8A5EE4 80240464 00000000 */ nop +/* 8A5EE8 80240468 46800020 */ cvt.s.w $f0, $f0 +/* 8A5EEC 8024046C 4600A03C */ c.lt.s $f20, $f0 +/* 8A5EF0 80240470 00000000 */ nop +/* 8A5EF4 80240474 4500000E */ bc1f .L802404B0 +/* 8A5EF8 80240478 00000000 */ nop +/* 8A5EFC 8024047C 862200B2 */ lh $v0, 0xb2($s1) +/* 8A5F00 80240480 3C013F00 */ lui $at, 0x3f00 +/* 8A5F04 80240484 44811000 */ mtc1 $at, $f2 +/* 8A5F08 80240488 44820000 */ mtc1 $v0, $f0 +/* 8A5F0C 8024048C 00000000 */ nop +/* 8A5F10 80240490 46800020 */ cvt.s.w $f0, $f0 +/* 8A5F14 80240494 46020002 */ mul.s $f0, $f0, $f2 +/* 8A5F18 80240498 00000000 */ nop +/* 8A5F1C 8024049C 4600203C */ c.lt.s $f4, $f0 +/* 8A5F20 802404A0 00000000 */ nop +/* 8A5F24 802404A4 45000002 */ bc1f .L802404B0 +/* 8A5F28 802404A8 24020001 */ addiu $v0, $zero, 1 +/* 8A5F2C 802404AC AE62008C */ sw $v0, 0x8c($s3) +.L802404B0: +/* 8A5F30 802404B0 C6020038 */ lwc1 $f2, 0x38($s0) +/* 8A5F34 802404B4 C6400098 */ lwc1 $f0, 0x98($s2) +/* 8A5F38 802404B8 46001081 */ sub.s $f2, $f2, $f0 +/* 8A5F3C 802404BC 46021182 */ mul.s $f6, $f2, $f2 +/* 8A5F40 802404C0 00000000 */ nop +/* 8A5F44 802404C4 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 8A5F48 802404C8 C6020040 */ lwc1 $f2, 0x40($s0) +/* 8A5F4C 802404CC 46001081 */ sub.s $f2, $f2, $f0 +/* 8A5F50 802404D0 46021102 */ mul.s $f4, $f2, $f2 +/* 8A5F54 802404D4 00000000 */ nop +/* 8A5F58 802404D8 860200A8 */ lh $v0, 0xa8($s0) +/* 8A5F5C 802404DC C602003C */ lwc1 $f2, 0x3c($s0) +/* 8A5F60 802404E0 44820000 */ mtc1 $v0, $f0 +/* 8A5F64 802404E4 00000000 */ nop +/* 8A5F68 802404E8 46800020 */ cvt.s.w $f0, $f0 +/* 8A5F6C 802404EC 46001080 */ add.s $f2, $f2, $f0 +/* 8A5F70 802404F0 3C013FC0 */ lui $at, 0x3fc0 +/* 8A5F74 802404F4 44810000 */ mtc1 $at, $f0 +/* 8A5F78 802404F8 00000000 */ nop +/* 8A5F7C 802404FC 46001081 */ sub.s $f2, $f2, $f0 +/* 8A5F80 80240500 46043300 */ add.s $f12, $f6, $f4 +/* 8A5F84 80240504 C640009C */ lwc1 $f0, 0x9c($s2) +/* 8A5F88 80240508 46001501 */ sub.s $f20, $f2, $f0 +/* 8A5F8C 8024050C 46006084 */ sqrt.s $f2, $f12 +/* 8A5F90 80240510 46021032 */ c.eq.s $f2, $f2 +/* 8A5F94 80240514 00000000 */ nop +/* 8A5F98 80240518 45010004 */ bc1t .L8024052C +/* 8A5F9C 8024051C 00000000 */ nop +/* 8A5FA0 80240520 0C0187BC */ jal sqrtf +/* 8A5FA4 80240524 00000000 */ nop +/* 8A5FA8 80240528 46000086 */ mov.s $f2, $f0 +.L8024052C: +/* 8A5FAC 8024052C 44800000 */ mtc1 $zero, $f0 +/* 8A5FB0 80240530 00000000 */ nop +/* 8A5FB4 80240534 4614003C */ c.lt.s $f0, $f20 +/* 8A5FB8 80240538 00000000 */ nop +/* 8A5FBC 8024053C 45000016 */ bc1f .L80240598 +/* 8A5FC0 80240540 46001106 */ mov.s $f4, $f2 +/* 8A5FC4 80240544 860200A8 */ lh $v0, 0xa8($s0) +/* 8A5FC8 80240548 44820000 */ mtc1 $v0, $f0 +/* 8A5FCC 8024054C 00000000 */ nop +/* 8A5FD0 80240550 46800020 */ cvt.s.w $f0, $f0 +/* 8A5FD4 80240554 4600A03C */ c.lt.s $f20, $f0 +/* 8A5FD8 80240558 00000000 */ nop +/* 8A5FDC 8024055C 4500000F */ bc1f .L8024059C +/* 8A5FE0 80240560 0000882D */ daddu $s1, $zero, $zero +/* 8A5FE4 80240564 860200A6 */ lh $v0, 0xa6($s0) +/* 8A5FE8 80240568 3C013F00 */ lui $at, 0x3f00 +/* 8A5FEC 8024056C 44811000 */ mtc1 $at, $f2 +/* 8A5FF0 80240570 44820000 */ mtc1 $v0, $f0 +/* 8A5FF4 80240574 00000000 */ nop +/* 8A5FF8 80240578 46800020 */ cvt.s.w $f0, $f0 +/* 8A5FFC 8024057C 46020002 */ mul.s $f0, $f0, $f2 +/* 8A6000 80240580 00000000 */ nop +/* 8A6004 80240584 4600203C */ c.lt.s $f4, $f0 +/* 8A6008 80240588 00000000 */ nop +/* 8A600C 8024058C 45000003 */ bc1f .L8024059C +/* 8A6010 80240590 24020001 */ addiu $v0, $zero, 1 +/* 8A6014 80240594 AE62008C */ sw $v0, 0x8c($s3) +.L80240598: +/* 8A6018 80240598 0000882D */ daddu $s1, $zero, $zero +.L8024059C: +/* 8A601C 8024059C 3C013FC0 */ lui $at, 0x3fc0 +/* 8A6020 802405A0 4481D000 */ mtc1 $at, $f26 +/* 8A6024 802405A4 4480C000 */ mtc1 $zero, $f24 +/* 8A6028 802405A8 3C013F00 */ lui $at, 0x3f00 +/* 8A602C 802405AC 4481B000 */ mtc1 $at, $f22 +.L802405B0: +/* 8A6030 802405B0 0C00EAD2 */ jal get_npc_safe +/* 8A6034 802405B4 0220202D */ daddu $a0, $s1, $zero +/* 8A6038 802405B8 0040802D */ daddu $s0, $v0, $zero +/* 8A603C 802405BC 52000035 */ beql $s0, $zero, .L80240694 +/* 8A6040 802405C0 26310001 */ addiu $s1, $s1, 1 +/* 8A6044 802405C4 C6020038 */ lwc1 $f2, 0x38($s0) +/* 8A6048 802405C8 C6400098 */ lwc1 $f0, 0x98($s2) +/* 8A604C 802405CC 46001081 */ sub.s $f2, $f2, $f0 +/* 8A6050 802405D0 46021182 */ mul.s $f6, $f2, $f2 +/* 8A6054 802405D4 00000000 */ nop +/* 8A6058 802405D8 C64000A0 */ lwc1 $f0, 0xa0($s2) +/* 8A605C 802405DC C6020040 */ lwc1 $f2, 0x40($s0) +/* 8A6060 802405E0 46001081 */ sub.s $f2, $f2, $f0 +/* 8A6064 802405E4 46021102 */ mul.s $f4, $f2, $f2 +/* 8A6068 802405E8 00000000 */ nop +/* 8A606C 802405EC 860200A8 */ lh $v0, 0xa8($s0) +/* 8A6070 802405F0 C602003C */ lwc1 $f2, 0x3c($s0) +/* 8A6074 802405F4 44820000 */ mtc1 $v0, $f0 +/* 8A6078 802405F8 00000000 */ nop +/* 8A607C 802405FC 46800020 */ cvt.s.w $f0, $f0 +/* 8A6080 80240600 46001080 */ add.s $f2, $f2, $f0 +/* 8A6084 80240604 461A1081 */ sub.s $f2, $f2, $f26 +/* 8A6088 80240608 46043300 */ add.s $f12, $f6, $f4 +/* 8A608C 8024060C C640009C */ lwc1 $f0, 0x9c($s2) +/* 8A6090 80240610 46001501 */ sub.s $f20, $f2, $f0 +/* 8A6094 80240614 46006004 */ sqrt.s $f0, $f12 +/* 8A6098 80240618 46000032 */ c.eq.s $f0, $f0 +/* 8A609C 8024061C 00000000 */ nop +/* 8A60A0 80240620 45010003 */ bc1t .L80240630 +/* 8A60A4 80240624 00000000 */ nop +/* 8A60A8 80240628 0C0187BC */ jal sqrtf +/* 8A60AC 8024062C 00000000 */ nop +.L80240630: +/* 8A60B0 80240630 4614C03C */ c.lt.s $f24, $f20 +/* 8A60B4 80240634 00000000 */ nop +/* 8A60B8 80240638 45000015 */ bc1f .L80240690 +/* 8A60BC 8024063C 46000106 */ mov.s $f4, $f0 +/* 8A60C0 80240640 860200A8 */ lh $v0, 0xa8($s0) +/* 8A60C4 80240644 44820000 */ mtc1 $v0, $f0 +/* 8A60C8 80240648 00000000 */ nop +/* 8A60CC 8024064C 46800020 */ cvt.s.w $f0, $f0 +/* 8A60D0 80240650 4600A03C */ c.lt.s $f20, $f0 +/* 8A60D4 80240654 00000000 */ nop +/* 8A60D8 80240658 4500000E */ bc1f .L80240694 +/* 8A60DC 8024065C 26310001 */ addiu $s1, $s1, 1 +/* 8A60E0 80240660 860200A6 */ lh $v0, 0xa6($s0) +/* 8A60E4 80240664 44820000 */ mtc1 $v0, $f0 +/* 8A60E8 80240668 00000000 */ nop +/* 8A60EC 8024066C 46800020 */ cvt.s.w $f0, $f0 +/* 8A60F0 80240670 46160002 */ mul.s $f0, $f0, $f22 +/* 8A60F4 80240674 00000000 */ nop +/* 8A60F8 80240678 4600203C */ c.lt.s $f4, $f0 +/* 8A60FC 8024067C 00000000 */ nop +/* 8A6100 80240680 45000004 */ bc1f .L80240694 +/* 8A6104 80240684 24020001 */ addiu $v0, $zero, 1 +/* 8A6108 80240688 080901A8 */ j .L802406A0 +/* 8A610C 8024068C AE62008C */ sw $v0, 0x8c($s3) +.L80240690: +/* 8A6110 80240690 26310001 */ addiu $s1, $s1, 1 +.L80240694: +/* 8A6114 80240694 2A220040 */ slti $v0, $s1, 0x40 +/* 8A6118 80240698 1440FFC5 */ bnez $v0, .L802405B0 +/* 8A611C 8024069C 00000000 */ nop +.L802406A0: +/* 8A6120 802406A0 8FBF0020 */ lw $ra, 0x20($sp) +/* 8A6124 802406A4 8FB3001C */ lw $s3, 0x1c($sp) +/* 8A6128 802406A8 8FB20018 */ lw $s2, 0x18($sp) +/* 8A612C 802406AC 8FB10014 */ lw $s1, 0x14($sp) +/* 8A6130 802406B0 8FB00010 */ lw $s0, 0x10($sp) +/* 8A6134 802406B4 D7BA0040 */ ldc1 $f26, 0x40($sp) +/* 8A6138 802406B8 D7B80038 */ ldc1 $f24, 0x38($sp) +/* 8A613C 802406BC D7B60030 */ ldc1 $f22, 0x30($sp) +/* 8A6140 802406C0 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 8A6144 802406C4 24020002 */ addiu $v0, $zero, 2 +/* 8A6148 802406C8 03E00008 */ jr $ra +/* 8A614C 802406CC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802406D0.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802406D0.s deleted file mode 100644 index 1a9e65ea79..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802406D0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406D0 -/* 8A6150 802406D0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A6154 802406D4 AFB20018 */ sw $s2, 0x18($sp) -/* 8A6158 802406D8 0080902D */ daddu $s2, $a0, $zero -/* 8A615C 802406DC AFBF001C */ sw $ra, 0x1c($sp) -/* 8A6160 802406E0 AFB10014 */ sw $s1, 0x14($sp) -/* 8A6164 802406E4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A6168 802406E8 8E510148 */ lw $s1, 0x148($s2) -/* 8A616C 802406EC 0C00EABB */ jal get_npc_unsafe -/* 8A6170 802406F0 86240008 */ lh $a0, 8($s1) -/* 8A6174 802406F4 0040802D */ daddu $s0, $v0, $zero -/* 8A6178 802406F8 8E2300CC */ lw $v1, 0xcc($s1) -/* 8A617C 802406FC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8A6180 80240700 8C630020 */ lw $v1, 0x20($v1) -/* 8A6184 80240704 AE030028 */ sw $v1, 0x28($s0) -/* 8A6188 80240708 96220076 */ lhu $v0, 0x76($s1) -/* 8A618C 8024070C A602008E */ sh $v0, 0x8e($s0) -/* 8A6190 80240710 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8A6194 80240714 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8A6198 80240718 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8A619C 8024071C 8C460028 */ lw $a2, 0x28($v0) -/* 8A61A0 80240720 0C00A720 */ jal atan2 -/* 8A61A4 80240724 8C470030 */ lw $a3, 0x30($v0) -/* 8A61A8 80240728 2402000D */ addiu $v0, $zero, 0xd -/* 8A61AC 8024072C E600000C */ swc1 $f0, 0xc($s0) -/* 8A61B0 80240730 AE420070 */ sw $v0, 0x70($s2) -/* 8A61B4 80240734 8FBF001C */ lw $ra, 0x1c($sp) -/* 8A61B8 80240738 8FB20018 */ lw $s2, 0x18($sp) -/* 8A61BC 8024073C 8FB10014 */ lw $s1, 0x14($sp) -/* 8A61C0 80240740 8FB00010 */ lw $s0, 0x10($sp) -/* 8A61C4 80240744 03E00008 */ jr $ra -/* 8A61C8 80240748 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802406D0_8A6150.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802406D0_8A6150.s new file mode 100644 index 0000000000..684bcc89fa --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802406D0_8A6150.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406D0_8A6150 +/* 8A6150 802406D0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8A6154 802406D4 AFB20018 */ sw $s2, 0x18($sp) +/* 8A6158 802406D8 0080902D */ daddu $s2, $a0, $zero +/* 8A615C 802406DC AFBF001C */ sw $ra, 0x1c($sp) +/* 8A6160 802406E0 AFB10014 */ sw $s1, 0x14($sp) +/* 8A6164 802406E4 AFB00010 */ sw $s0, 0x10($sp) +/* 8A6168 802406E8 8E510148 */ lw $s1, 0x148($s2) +/* 8A616C 802406EC 0C00EABB */ jal get_npc_unsafe +/* 8A6170 802406F0 86240008 */ lh $a0, 8($s1) +/* 8A6174 802406F4 0040802D */ daddu $s0, $v0, $zero +/* 8A6178 802406F8 8E2300CC */ lw $v1, 0xcc($s1) +/* 8A617C 802406FC C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8A6180 80240700 8C630020 */ lw $v1, 0x20($v1) +/* 8A6184 80240704 AE030028 */ sw $v1, 0x28($s0) +/* 8A6188 80240708 96220076 */ lhu $v0, 0x76($s1) +/* 8A618C 8024070C A602008E */ sh $v0, 0x8e($s0) +/* 8A6190 80240710 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8A6194 80240714 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8A6198 80240718 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8A619C 8024071C 8C460028 */ lw $a2, 0x28($v0) +/* 8A61A0 80240720 0C00A720 */ jal atan2 +/* 8A61A4 80240724 8C470030 */ lw $a3, 0x30($v0) +/* 8A61A8 80240728 2402000D */ addiu $v0, $zero, 0xd +/* 8A61AC 8024072C E600000C */ swc1 $f0, 0xc($s0) +/* 8A61B0 80240730 AE420070 */ sw $v0, 0x70($s2) +/* 8A61B4 80240734 8FBF001C */ lw $ra, 0x1c($sp) +/* 8A61B8 80240738 8FB20018 */ lw $s2, 0x18($sp) +/* 8A61BC 8024073C 8FB10014 */ lw $s1, 0x14($sp) +/* 8A61C0 80240740 8FB00010 */ lw $s0, 0x10($sp) +/* 8A61C4 80240744 03E00008 */ jr $ra +/* 8A61C8 80240748 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C.s deleted file mode 100644 index bee4de7878..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024074C -/* 8A61CC 8024074C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A61D0 80240750 AFB3001C */ sw $s3, 0x1c($sp) -/* 8A61D4 80240754 0080982D */ daddu $s3, $a0, $zero -/* 8A61D8 80240758 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A61DC 8024075C AFB20018 */ sw $s2, 0x18($sp) -/* 8A61E0 80240760 AFB10014 */ sw $s1, 0x14($sp) -/* 8A61E4 80240764 AFB00010 */ sw $s0, 0x10($sp) -/* 8A61E8 80240768 8E710148 */ lw $s1, 0x148($s3) -/* 8A61EC 8024076C 86240008 */ lh $a0, 8($s1) -/* 8A61F0 80240770 0C00EABB */ jal get_npc_unsafe -/* 8A61F4 80240774 00A0902D */ daddu $s2, $a1, $zero -/* 8A61F8 80240778 0040802D */ daddu $s0, $v0, $zero -/* 8A61FC 8024077C 8602008E */ lh $v0, 0x8e($s0) -/* 8A6200 80240780 9603008E */ lhu $v1, 0x8e($s0) -/* 8A6204 80240784 18400005 */ blez $v0, .L8024079C -/* 8A6208 80240788 2462FFFF */ addiu $v0, $v1, -1 -/* 8A620C 8024078C A602008E */ sh $v0, 0x8e($s0) -/* 8A6210 80240790 00021400 */ sll $v0, $v0, 0x10 -/* 8A6214 80240794 1C400033 */ bgtz $v0, .L80240864 -/* 8A6218 80240798 00000000 */ nop -.L8024079C: -/* 8A621C 8024079C 8602008C */ lh $v0, 0x8c($s0) -/* 8A6220 802407A0 14400030 */ bnez $v0, .L80240864 -/* 8A6224 802407A4 00000000 */ nop -/* 8A6228 802407A8 8E2200CC */ lw $v0, 0xcc($s1) -/* 8A622C 802407AC 8C420024 */ lw $v0, 0x24($v0) -/* 8A6230 802407B0 AE020028 */ sw $v0, 0x28($s0) -/* 8A6234 802407B4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 8A6238 802407B8 E6000018 */ swc1 $f0, 0x18($s0) -/* 8A623C 802407BC 8E230088 */ lw $v1, 0x88($s1) -/* 8A6240 802407C0 24020005 */ addiu $v0, $zero, 5 -/* 8A6244 802407C4 10620005 */ beq $v1, $v0, .L802407DC -/* 8A6248 802407C8 00000000 */ nop -/* 8A624C 802407CC 10600003 */ beqz $v1, .L802407DC -/* 8A6250 802407D0 24020001 */ addiu $v0, $zero, 1 -/* 8A6254 802407D4 14620006 */ bne $v1, $v0, .L802407F0 -/* 8A6258 802407D8 00000000 */ nop -.L802407DC: -/* 8A625C 802407DC 8E220084 */ lw $v0, 0x84($s1) -/* 8A6260 802407E0 00021FC2 */ srl $v1, $v0, 0x1f -/* 8A6264 802407E4 00431021 */ addu $v0, $v0, $v1 -/* 8A6268 802407E8 00021043 */ sra $v0, $v0, 1 -/* 8A626C 802407EC A60200A8 */ sh $v0, 0xa8($s0) -.L802407F0: -/* 8A6270 802407F0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 8A6274 802407F4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 8A6278 802407F8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8A627C 802407FC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8A6280 80240800 8C460028 */ lw $a2, 0x28($v0) -/* 8A6284 80240804 0C00A7B5 */ jal dist2D -/* 8A6288 80240808 8C470030 */ lw $a3, 0x30($v0) -/* 8A628C 8024080C C6020018 */ lwc1 $f2, 0x18($s0) -/* 8A6290 80240810 46020003 */ div.s $f0, $f0, $f2 -/* 8A6294 80240814 3C018024 */ lui $at, 0x8024 -/* 8A6298 80240818 D42224A0 */ ldc1 $f2, 0x24a0($at) -/* 8A629C 8024081C 46000021 */ cvt.d.s $f0, $f0 -/* 8A62A0 80240820 46220000 */ add.d $f0, $f0, $f2 -/* 8A62A4 80240824 4620010D */ trunc.w.d $f4, $f0 -/* 8A62A8 80240828 44022000 */ mfc1 $v0, $f4 -/* 8A62AC 8024082C 00000000 */ nop -/* 8A62B0 80240830 A602008E */ sh $v0, 0x8e($s0) -/* 8A62B4 80240834 00021400 */ sll $v0, $v0, 0x10 -/* 8A62B8 80240838 8E230078 */ lw $v1, 0x78($s1) -/* 8A62BC 8024083C 00021403 */ sra $v0, $v0, 0x10 -/* 8A62C0 80240840 0043102A */ slt $v0, $v0, $v1 -/* 8A62C4 80240844 10400003 */ beqz $v0, .L80240854 -/* 8A62C8 80240848 00000000 */ nop -/* 8A62CC 8024084C 9622007A */ lhu $v0, 0x7a($s1) -/* 8A62D0 80240850 A602008E */ sh $v0, 0x8e($s0) -.L80240854: -/* 8A62D4 80240854 8602008E */ lh $v0, 0x8e($s0) -/* 8A62D8 80240858 AE22007C */ sw $v0, 0x7c($s1) -/* 8A62DC 8024085C 2402000E */ addiu $v0, $zero, 0xe -/* 8A62E0 80240860 AE620070 */ sw $v0, 0x70($s3) -.L80240864: -/* 8A62E4 80240864 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A62E8 80240868 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A62EC 8024086C 8FB20018 */ lw $s2, 0x18($sp) -/* 8A62F0 80240870 8FB10014 */ lw $s1, 0x14($sp) -/* 8A62F4 80240874 8FB00010 */ lw $s0, 0x10($sp) -/* 8A62F8 80240878 03E00008 */ jr $ra -/* 8A62FC 8024087C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s new file mode 100644 index 0000000000..9826ce72ea --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_8024074C_8A61CC.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024074C_8A61CC +/* 8A61CC 8024074C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8A61D0 80240750 AFB3001C */ sw $s3, 0x1c($sp) +/* 8A61D4 80240754 0080982D */ daddu $s3, $a0, $zero +/* 8A61D8 80240758 AFBF0020 */ sw $ra, 0x20($sp) +/* 8A61DC 8024075C AFB20018 */ sw $s2, 0x18($sp) +/* 8A61E0 80240760 AFB10014 */ sw $s1, 0x14($sp) +/* 8A61E4 80240764 AFB00010 */ sw $s0, 0x10($sp) +/* 8A61E8 80240768 8E710148 */ lw $s1, 0x148($s3) +/* 8A61EC 8024076C 86240008 */ lh $a0, 8($s1) +/* 8A61F0 80240770 0C00EABB */ jal get_npc_unsafe +/* 8A61F4 80240774 00A0902D */ daddu $s2, $a1, $zero +/* 8A61F8 80240778 0040802D */ daddu $s0, $v0, $zero +/* 8A61FC 8024077C 8602008E */ lh $v0, 0x8e($s0) +/* 8A6200 80240780 9603008E */ lhu $v1, 0x8e($s0) +/* 8A6204 80240784 18400005 */ blez $v0, .L8024079C +/* 8A6208 80240788 2462FFFF */ addiu $v0, $v1, -1 +/* 8A620C 8024078C A602008E */ sh $v0, 0x8e($s0) +/* 8A6210 80240790 00021400 */ sll $v0, $v0, 0x10 +/* 8A6214 80240794 1C400033 */ bgtz $v0, .L80240864 +/* 8A6218 80240798 00000000 */ nop +.L8024079C: +/* 8A621C 8024079C 8602008C */ lh $v0, 0x8c($s0) +/* 8A6220 802407A0 14400030 */ bnez $v0, .L80240864 +/* 8A6224 802407A4 00000000 */ nop +/* 8A6228 802407A8 8E2200CC */ lw $v0, 0xcc($s1) +/* 8A622C 802407AC 8C420024 */ lw $v0, 0x24($v0) +/* 8A6230 802407B0 AE020028 */ sw $v0, 0x28($s0) +/* 8A6234 802407B4 C6400018 */ lwc1 $f0, 0x18($s2) +/* 8A6238 802407B8 E6000018 */ swc1 $f0, 0x18($s0) +/* 8A623C 802407BC 8E230088 */ lw $v1, 0x88($s1) +/* 8A6240 802407C0 24020005 */ addiu $v0, $zero, 5 +/* 8A6244 802407C4 10620005 */ beq $v1, $v0, .L802407DC +/* 8A6248 802407C8 00000000 */ nop +/* 8A624C 802407CC 10600003 */ beqz $v1, .L802407DC +/* 8A6250 802407D0 24020001 */ addiu $v0, $zero, 1 +/* 8A6254 802407D4 14620006 */ bne $v1, $v0, .L802407F0 +/* 8A6258 802407D8 00000000 */ nop +.L802407DC: +/* 8A625C 802407DC 8E220084 */ lw $v0, 0x84($s1) +/* 8A6260 802407E0 00021FC2 */ srl $v1, $v0, 0x1f +/* 8A6264 802407E4 00431021 */ addu $v0, $v0, $v1 +/* 8A6268 802407E8 00021043 */ sra $v0, $v0, 1 +/* 8A626C 802407EC A60200A8 */ sh $v0, 0xa8($s0) +.L802407F0: +/* 8A6270 802407F0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 8A6274 802407F4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 8A6278 802407F8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 8A627C 802407FC C60E0040 */ lwc1 $f14, 0x40($s0) +/* 8A6280 80240800 8C460028 */ lw $a2, 0x28($v0) +/* 8A6284 80240804 0C00A7B5 */ jal dist2D +/* 8A6288 80240808 8C470030 */ lw $a3, 0x30($v0) +/* 8A628C 8024080C C6020018 */ lwc1 $f2, 0x18($s0) +/* 8A6290 80240810 46020003 */ div.s $f0, $f0, $f2 +/* 8A6294 80240814 3C018024 */ lui $at, 0x8024 +/* 8A6298 80240818 D42224A0 */ ldc1 $f2, 0x24a0($at) +/* 8A629C 8024081C 46000021 */ cvt.d.s $f0, $f0 +/* 8A62A0 80240820 46220000 */ add.d $f0, $f0, $f2 +/* 8A62A4 80240824 4620010D */ trunc.w.d $f4, $f0 +/* 8A62A8 80240828 44022000 */ mfc1 $v0, $f4 +/* 8A62AC 8024082C 00000000 */ nop +/* 8A62B0 80240830 A602008E */ sh $v0, 0x8e($s0) +/* 8A62B4 80240834 00021400 */ sll $v0, $v0, 0x10 +/* 8A62B8 80240838 8E230078 */ lw $v1, 0x78($s1) +/* 8A62BC 8024083C 00021403 */ sra $v0, $v0, 0x10 +/* 8A62C0 80240840 0043102A */ slt $v0, $v0, $v1 +/* 8A62C4 80240844 10400003 */ beqz $v0, .L80240854 +/* 8A62C8 80240848 00000000 */ nop +/* 8A62CC 8024084C 9622007A */ lhu $v0, 0x7a($s1) +/* 8A62D0 80240850 A602008E */ sh $v0, 0x8e($s0) +.L80240854: +/* 8A62D4 80240854 8602008E */ lh $v0, 0x8e($s0) +/* 8A62D8 80240858 AE22007C */ sw $v0, 0x7c($s1) +/* 8A62DC 8024085C 2402000E */ addiu $v0, $zero, 0xe +/* 8A62E0 80240860 AE620070 */ sw $v0, 0x70($s3) +.L80240864: +/* 8A62E4 80240864 8FBF0020 */ lw $ra, 0x20($sp) +/* 8A62E8 80240868 8FB3001C */ lw $s3, 0x1c($sp) +/* 8A62EC 8024086C 8FB20018 */ lw $s2, 0x18($sp) +/* 8A62F0 80240870 8FB10014 */ lw $s1, 0x14($sp) +/* 8A62F4 80240874 8FB00010 */ lw $s0, 0x10($sp) +/* 8A62F8 80240878 03E00008 */ jr $ra +/* 8A62FC 8024087C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240880.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240880.s deleted file mode 100644 index b1de1359f2..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240880.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240880 -/* 8A6300 80240880 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8A6304 80240884 AFB3003C */ sw $s3, 0x3c($sp) -/* 8A6308 80240888 0080982D */ daddu $s3, $a0, $zero -/* 8A630C 8024088C AFBF0040 */ sw $ra, 0x40($sp) -/* 8A6310 80240890 AFB20038 */ sw $s2, 0x38($sp) -/* 8A6314 80240894 AFB10034 */ sw $s1, 0x34($sp) -/* 8A6318 80240898 AFB00030 */ sw $s0, 0x30($sp) -/* 8A631C 8024089C 8E710148 */ lw $s1, 0x148($s3) -/* 8A6320 802408A0 0C00EABB */ jal get_npc_unsafe -/* 8A6324 802408A4 86240008 */ lh $a0, 8($s1) -/* 8A6328 802408A8 0040802D */ daddu $s0, $v0, $zero -/* 8A632C 802408AC 8E22007C */ lw $v0, 0x7c($s1) -/* 8A6330 802408B0 8603008E */ lh $v1, 0x8e($s0) -/* 8A6334 802408B4 2442FFFF */ addiu $v0, $v0, -1 -/* 8A6338 802408B8 14620012 */ bne $v1, $v0, .L80240904 -/* 8A633C 802408BC 00000000 */ nop -/* 8A6340 802408C0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8A6344 802408C4 4600020D */ trunc.w.s $f8, $f0 -/* 8A6348 802408C8 44024000 */ mfc1 $v0, $f8 -/* 8A634C 802408CC 00000000 */ nop -/* 8A6350 802408D0 A6220010 */ sh $v0, 0x10($s1) -/* 8A6354 802408D4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 8A6358 802408D8 4600020D */ trunc.w.s $f8, $f0 -/* 8A635C 802408DC 44024000 */ mfc1 $v0, $f8 -/* 8A6360 802408E0 00000000 */ nop -/* 8A6364 802408E4 A6220012 */ sh $v0, 0x12($s1) -/* 8A6368 802408E8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 8A636C 802408EC 24020001 */ addiu $v0, $zero, 1 -/* 8A6370 802408F0 A2220007 */ sb $v0, 7($s1) -/* 8A6374 802408F4 4600020D */ trunc.w.s $f8, $f0 -/* 8A6378 802408F8 44024000 */ mfc1 $v0, $f8 -/* 8A637C 802408FC 00000000 */ nop -/* 8A6380 80240900 A6220014 */ sh $v0, 0x14($s1) -.L80240904: -/* 8A6384 80240904 C6000038 */ lwc1 $f0, 0x38($s0) -/* 8A6388 80240908 C602003C */ lwc1 $f2, 0x3c($s0) -/* 8A638C 8024090C C6040040 */ lwc1 $f4, 0x40($s0) -/* 8A6390 80240910 C6060018 */ lwc1 $f6, 0x18($s0) -/* 8A6394 80240914 E7A00020 */ swc1 $f0, 0x20($sp) -/* 8A6398 80240918 E7A20024 */ swc1 $f2, 0x24($sp) -/* 8A639C 8024091C E7A40028 */ swc1 $f4, 0x28($sp) -/* 8A63A0 80240920 E7A60010 */ swc1 $f6, 0x10($sp) -/* 8A63A4 80240924 C600000C */ lwc1 $f0, 0xc($s0) -/* 8A63A8 80240928 E7A00014 */ swc1 $f0, 0x14($sp) -/* 8A63AC 8024092C 860200A8 */ lh $v0, 0xa8($s0) -/* 8A63B0 80240930 27A50020 */ addiu $a1, $sp, 0x20 -/* 8A63B4 80240934 44820000 */ mtc1 $v0, $f0 -/* 8A63B8 80240938 00000000 */ nop -/* 8A63BC 8024093C 46800020 */ cvt.s.w $f0, $f0 -/* 8A63C0 80240940 E7A00018 */ swc1 $f0, 0x18($sp) -/* 8A63C4 80240944 860200A6 */ lh $v0, 0xa6($s0) -/* 8A63C8 80240948 27A60024 */ addiu $a2, $sp, 0x24 -/* 8A63CC 8024094C 44820000 */ mtc1 $v0, $f0 -/* 8A63D0 80240950 00000000 */ nop -/* 8A63D4 80240954 46800020 */ cvt.s.w $f0, $f0 -/* 8A63D8 80240958 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 8A63DC 8024095C 8E040080 */ lw $a0, 0x80($s0) -/* 8A63E0 80240960 0C037711 */ jal func_800DDC44 -/* 8A63E4 80240964 27A70028 */ addiu $a3, $sp, 0x28 -/* 8A63E8 80240968 0040902D */ daddu $s2, $v0, $zero -/* 8A63EC 8024096C 16400005 */ bnez $s2, .L80240984 -/* 8A63F0 80240970 00000000 */ nop -/* 8A63F4 80240974 8E050018 */ lw $a1, 0x18($s0) -/* 8A63F8 80240978 8E06000C */ lw $a2, 0xc($s0) -/* 8A63FC 8024097C 0C00EA95 */ jal npc_move_heading -/* 8A6400 80240980 0200202D */ daddu $a0, $s0, $zero -.L80240984: -/* 8A6404 80240984 8602008E */ lh $v0, 0x8e($s0) -/* 8A6408 80240988 9603008E */ lhu $v1, 0x8e($s0) -/* 8A640C 8024098C 18400007 */ blez $v0, .L802409AC -/* 8A6410 80240990 2462FFFF */ addiu $v0, $v1, -1 -/* 8A6414 80240994 A602008E */ sh $v0, 0x8e($s0) -/* 8A6418 80240998 00021400 */ sll $v0, $v0, 0x10 -/* 8A641C 8024099C 18400003 */ blez $v0, .L802409AC -/* 8A6420 802409A0 00000000 */ nop -/* 8A6424 802409A4 12400008 */ beqz $s2, .L802409C8 -/* 8A6428 802409A8 00000000 */ nop -.L802409AC: -/* 8A642C 802409AC 8E2200CC */ lw $v0, 0xcc($s1) -/* 8A6430 802409B0 A2200007 */ sb $zero, 7($s1) -/* 8A6434 802409B4 8C420028 */ lw $v0, 0x28($v0) -/* 8A6438 802409B8 A600008E */ sh $zero, 0x8e($s0) -/* 8A643C 802409BC AE020028 */ sw $v0, 0x28($s0) -/* 8A6440 802409C0 2402000F */ addiu $v0, $zero, 0xf -/* 8A6444 802409C4 AE620070 */ sw $v0, 0x70($s3) -.L802409C8: -/* 8A6448 802409C8 8FBF0040 */ lw $ra, 0x40($sp) -/* 8A644C 802409CC 8FB3003C */ lw $s3, 0x3c($sp) -/* 8A6450 802409D0 8FB20038 */ lw $s2, 0x38($sp) -/* 8A6454 802409D4 8FB10034 */ lw $s1, 0x34($sp) -/* 8A6458 802409D8 8FB00030 */ lw $s0, 0x30($sp) -/* 8A645C 802409DC 03E00008 */ jr $ra -/* 8A6460 802409E0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240880_8A6300.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240880_8A6300.s new file mode 100644 index 0000000000..351e2b0846 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240880_8A6300.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240880_8A6300 +/* 8A6300 80240880 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 8A6304 80240884 AFB3003C */ sw $s3, 0x3c($sp) +/* 8A6308 80240888 0080982D */ daddu $s3, $a0, $zero +/* 8A630C 8024088C AFBF0040 */ sw $ra, 0x40($sp) +/* 8A6310 80240890 AFB20038 */ sw $s2, 0x38($sp) +/* 8A6314 80240894 AFB10034 */ sw $s1, 0x34($sp) +/* 8A6318 80240898 AFB00030 */ sw $s0, 0x30($sp) +/* 8A631C 8024089C 8E710148 */ lw $s1, 0x148($s3) +/* 8A6320 802408A0 0C00EABB */ jal get_npc_unsafe +/* 8A6324 802408A4 86240008 */ lh $a0, 8($s1) +/* 8A6328 802408A8 0040802D */ daddu $s0, $v0, $zero +/* 8A632C 802408AC 8E22007C */ lw $v0, 0x7c($s1) +/* 8A6330 802408B0 8603008E */ lh $v1, 0x8e($s0) +/* 8A6334 802408B4 2442FFFF */ addiu $v0, $v0, -1 +/* 8A6338 802408B8 14620012 */ bne $v1, $v0, .L80240904 +/* 8A633C 802408BC 00000000 */ nop +/* 8A6340 802408C0 C6000038 */ lwc1 $f0, 0x38($s0) +/* 8A6344 802408C4 4600020D */ trunc.w.s $f8, $f0 +/* 8A6348 802408C8 44024000 */ mfc1 $v0, $f8 +/* 8A634C 802408CC 00000000 */ nop +/* 8A6350 802408D0 A6220010 */ sh $v0, 0x10($s1) +/* 8A6354 802408D4 C600003C */ lwc1 $f0, 0x3c($s0) +/* 8A6358 802408D8 4600020D */ trunc.w.s $f8, $f0 +/* 8A635C 802408DC 44024000 */ mfc1 $v0, $f8 +/* 8A6360 802408E0 00000000 */ nop +/* 8A6364 802408E4 A6220012 */ sh $v0, 0x12($s1) +/* 8A6368 802408E8 C6000040 */ lwc1 $f0, 0x40($s0) +/* 8A636C 802408EC 24020001 */ addiu $v0, $zero, 1 +/* 8A6370 802408F0 A2220007 */ sb $v0, 7($s1) +/* 8A6374 802408F4 4600020D */ trunc.w.s $f8, $f0 +/* 8A6378 802408F8 44024000 */ mfc1 $v0, $f8 +/* 8A637C 802408FC 00000000 */ nop +/* 8A6380 80240900 A6220014 */ sh $v0, 0x14($s1) +.L80240904: +/* 8A6384 80240904 C6000038 */ lwc1 $f0, 0x38($s0) +/* 8A6388 80240908 C602003C */ lwc1 $f2, 0x3c($s0) +/* 8A638C 8024090C C6040040 */ lwc1 $f4, 0x40($s0) +/* 8A6390 80240910 C6060018 */ lwc1 $f6, 0x18($s0) +/* 8A6394 80240914 E7A00020 */ swc1 $f0, 0x20($sp) +/* 8A6398 80240918 E7A20024 */ swc1 $f2, 0x24($sp) +/* 8A639C 8024091C E7A40028 */ swc1 $f4, 0x28($sp) +/* 8A63A0 80240920 E7A60010 */ swc1 $f6, 0x10($sp) +/* 8A63A4 80240924 C600000C */ lwc1 $f0, 0xc($s0) +/* 8A63A8 80240928 E7A00014 */ swc1 $f0, 0x14($sp) +/* 8A63AC 8024092C 860200A8 */ lh $v0, 0xa8($s0) +/* 8A63B0 80240930 27A50020 */ addiu $a1, $sp, 0x20 +/* 8A63B4 80240934 44820000 */ mtc1 $v0, $f0 +/* 8A63B8 80240938 00000000 */ nop +/* 8A63BC 8024093C 46800020 */ cvt.s.w $f0, $f0 +/* 8A63C0 80240940 E7A00018 */ swc1 $f0, 0x18($sp) +/* 8A63C4 80240944 860200A6 */ lh $v0, 0xa6($s0) +/* 8A63C8 80240948 27A60024 */ addiu $a2, $sp, 0x24 +/* 8A63CC 8024094C 44820000 */ mtc1 $v0, $f0 +/* 8A63D0 80240950 00000000 */ nop +/* 8A63D4 80240954 46800020 */ cvt.s.w $f0, $f0 +/* 8A63D8 80240958 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 8A63DC 8024095C 8E040080 */ lw $a0, 0x80($s0) +/* 8A63E0 80240960 0C037711 */ jal func_800DDC44 +/* 8A63E4 80240964 27A70028 */ addiu $a3, $sp, 0x28 +/* 8A63E8 80240968 0040902D */ daddu $s2, $v0, $zero +/* 8A63EC 8024096C 16400005 */ bnez $s2, .L80240984 +/* 8A63F0 80240970 00000000 */ nop +/* 8A63F4 80240974 8E050018 */ lw $a1, 0x18($s0) +/* 8A63F8 80240978 8E06000C */ lw $a2, 0xc($s0) +/* 8A63FC 8024097C 0C00EA95 */ jal npc_move_heading +/* 8A6400 80240980 0200202D */ daddu $a0, $s0, $zero +.L80240984: +/* 8A6404 80240984 8602008E */ lh $v0, 0x8e($s0) +/* 8A6408 80240988 9603008E */ lhu $v1, 0x8e($s0) +/* 8A640C 8024098C 18400007 */ blez $v0, .L802409AC +/* 8A6410 80240990 2462FFFF */ addiu $v0, $v1, -1 +/* 8A6414 80240994 A602008E */ sh $v0, 0x8e($s0) +/* 8A6418 80240998 00021400 */ sll $v0, $v0, 0x10 +/* 8A641C 8024099C 18400003 */ blez $v0, .L802409AC +/* 8A6420 802409A0 00000000 */ nop +/* 8A6424 802409A4 12400008 */ beqz $s2, .L802409C8 +/* 8A6428 802409A8 00000000 */ nop +.L802409AC: +/* 8A642C 802409AC 8E2200CC */ lw $v0, 0xcc($s1) +/* 8A6430 802409B0 A2200007 */ sb $zero, 7($s1) +/* 8A6434 802409B4 8C420028 */ lw $v0, 0x28($v0) +/* 8A6438 802409B8 A600008E */ sh $zero, 0x8e($s0) +/* 8A643C 802409BC AE020028 */ sw $v0, 0x28($s0) +/* 8A6440 802409C0 2402000F */ addiu $v0, $zero, 0xf +/* 8A6444 802409C4 AE620070 */ sw $v0, 0x70($s3) +.L802409C8: +/* 8A6448 802409C8 8FBF0040 */ lw $ra, 0x40($sp) +/* 8A644C 802409CC 8FB3003C */ lw $s3, 0x3c($sp) +/* 8A6450 802409D0 8FB20038 */ lw $s2, 0x38($sp) +/* 8A6454 802409D4 8FB10034 */ lw $s1, 0x34($sp) +/* 8A6458 802409D8 8FB00030 */ lw $s0, 0x30($sp) +/* 8A645C 802409DC 03E00008 */ jr $ra +/* 8A6460 802409E0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802409E4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802409E4.s deleted file mode 100644 index 033e4c5568..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802409E4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409E4 -/* 8A6464 802409E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8A6468 802409E8 AFB10014 */ sw $s1, 0x14($sp) -/* 8A646C 802409EC 0080882D */ daddu $s1, $a0, $zero -/* 8A6470 802409F0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8A6474 802409F4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A6478 802409F8 8E300148 */ lw $s0, 0x148($s1) -/* 8A647C 802409FC 0C00EABB */ jal get_npc_unsafe -/* 8A6480 80240A00 86040008 */ lh $a0, 8($s0) -/* 8A6484 80240A04 0040202D */ daddu $a0, $v0, $zero -/* 8A6488 80240A08 9482008E */ lhu $v0, 0x8e($a0) -/* 8A648C 80240A0C 24030003 */ addiu $v1, $zero, 3 -/* 8A6490 80240A10 24420001 */ addiu $v0, $v0, 1 -/* 8A6494 80240A14 A482008E */ sh $v0, 0x8e($a0) -/* 8A6498 80240A18 00021400 */ sll $v0, $v0, 0x10 -/* 8A649C 80240A1C 00021403 */ sra $v0, $v0, 0x10 -/* 8A64A0 80240A20 14430003 */ bne $v0, $v1, .L80240A30 -/* 8A64A4 80240A24 00000000 */ nop -/* 8A64A8 80240A28 96020086 */ lhu $v0, 0x86($s0) -/* 8A64AC 80240A2C A48200A8 */ sh $v0, 0xa8($a0) -.L80240A30: -/* 8A64B0 80240A30 8482008E */ lh $v0, 0x8e($a0) -/* 8A64B4 80240A34 8E030080 */ lw $v1, 0x80($s0) -/* 8A64B8 80240A38 0043102A */ slt $v0, $v0, $v1 -/* 8A64BC 80240A3C 14400004 */ bnez $v0, .L80240A50 -/* 8A64C0 80240A40 00000000 */ nop -/* 8A64C4 80240A44 96020086 */ lhu $v0, 0x86($s0) -/* 8A64C8 80240A48 A48200A8 */ sh $v0, 0xa8($a0) -/* 8A64CC 80240A4C AE200070 */ sw $zero, 0x70($s1) -.L80240A50: -/* 8A64D0 80240A50 8FBF0018 */ lw $ra, 0x18($sp) -/* 8A64D4 80240A54 8FB10014 */ lw $s1, 0x14($sp) -/* 8A64D8 80240A58 8FB00010 */ lw $s0, 0x10($sp) -/* 8A64DC 80240A5C 03E00008 */ jr $ra -/* 8A64E0 80240A60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802409E4_8A6464.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802409E4_8A6464.s new file mode 100644 index 0000000000..e0ab99c969 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_802409E4_8A6464.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802409E4_8A6464 +/* 8A6464 802409E4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 8A6468 802409E8 AFB10014 */ sw $s1, 0x14($sp) +/* 8A646C 802409EC 0080882D */ daddu $s1, $a0, $zero +/* 8A6470 802409F0 AFBF0018 */ sw $ra, 0x18($sp) +/* 8A6474 802409F4 AFB00010 */ sw $s0, 0x10($sp) +/* 8A6478 802409F8 8E300148 */ lw $s0, 0x148($s1) +/* 8A647C 802409FC 0C00EABB */ jal get_npc_unsafe +/* 8A6480 80240A00 86040008 */ lh $a0, 8($s0) +/* 8A6484 80240A04 0040202D */ daddu $a0, $v0, $zero +/* 8A6488 80240A08 9482008E */ lhu $v0, 0x8e($a0) +/* 8A648C 80240A0C 24030003 */ addiu $v1, $zero, 3 +/* 8A6490 80240A10 24420001 */ addiu $v0, $v0, 1 +/* 8A6494 80240A14 A482008E */ sh $v0, 0x8e($a0) +/* 8A6498 80240A18 00021400 */ sll $v0, $v0, 0x10 +/* 8A649C 80240A1C 00021403 */ sra $v0, $v0, 0x10 +/* 8A64A0 80240A20 14430003 */ bne $v0, $v1, .L80240A30 +/* 8A64A4 80240A24 00000000 */ nop +/* 8A64A8 80240A28 96020086 */ lhu $v0, 0x86($s0) +/* 8A64AC 80240A2C A48200A8 */ sh $v0, 0xa8($a0) +.L80240A30: +/* 8A64B0 80240A30 8482008E */ lh $v0, 0x8e($a0) +/* 8A64B4 80240A34 8E030080 */ lw $v1, 0x80($s0) +/* 8A64B8 80240A38 0043102A */ slt $v0, $v0, $v1 +/* 8A64BC 80240A3C 14400004 */ bnez $v0, .L80240A50 +/* 8A64C0 80240A40 00000000 */ nop +/* 8A64C4 80240A44 96020086 */ lhu $v0, 0x86($s0) +/* 8A64C8 80240A48 A48200A8 */ sh $v0, 0xa8($a0) +/* 8A64CC 80240A4C AE200070 */ sw $zero, 0x70($s1) +.L80240A50: +/* 8A64D0 80240A50 8FBF0018 */ lw $ra, 0x18($sp) +/* 8A64D4 80240A54 8FB10014 */ lw $s1, 0x14($sp) +/* 8A64D8 80240A58 8FB00010 */ lw $s0, 0x10($sp) +/* 8A64DC 80240A5C 03E00008 */ jr $ra +/* 8A64E0 80240A60 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64.s deleted file mode 100644 index 0e44e6a9ba..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64.s +++ /dev/null @@ -1,304 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A64 -/* 8A64E4 80240A64 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 8A64E8 80240A68 AFB3005C */ sw $s3, 0x5c($sp) -/* 8A64EC 80240A6C 0080982D */ daddu $s3, $a0, $zero -/* 8A64F0 80240A70 AFBF0068 */ sw $ra, 0x68($sp) -/* 8A64F4 80240A74 AFB50064 */ sw $s5, 0x64($sp) -/* 8A64F8 80240A78 AFB40060 */ sw $s4, 0x60($sp) -/* 8A64FC 80240A7C AFB20058 */ sw $s2, 0x58($sp) -/* 8A6500 80240A80 AFB10054 */ sw $s1, 0x54($sp) -/* 8A6504 80240A84 AFB00050 */ sw $s0, 0x50($sp) -/* 8A6508 80240A88 8E710148 */ lw $s1, 0x148($s3) -/* 8A650C 80240A8C 86240008 */ lh $a0, 8($s1) -/* 8A6510 80240A90 0C00EABB */ jal get_npc_unsafe -/* 8A6514 80240A94 00A0802D */ daddu $s0, $a1, $zero -/* 8A6518 80240A98 8E63000C */ lw $v1, 0xc($s3) -/* 8A651C 80240A9C 0260202D */ daddu $a0, $s3, $zero -/* 8A6520 80240AA0 8C650000 */ lw $a1, ($v1) -/* 8A6524 80240AA4 0C0B1EAF */ jal get_variable -/* 8A6528 80240AA8 0040902D */ daddu $s2, $v0, $zero -/* 8A652C 80240AAC AFA00028 */ sw $zero, 0x28($sp) -/* 8A6530 80240AB0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A6534 80240AB4 8C630030 */ lw $v1, 0x30($v1) -/* 8A6538 80240AB8 AFA3002C */ sw $v1, 0x2c($sp) -/* 8A653C 80240ABC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A6540 80240AC0 8C63001C */ lw $v1, 0x1c($v1) -/* 8A6544 80240AC4 AFA30030 */ sw $v1, 0x30($sp) -/* 8A6548 80240AC8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A654C 80240ACC 8C630024 */ lw $v1, 0x24($v1) -/* 8A6550 80240AD0 AFA30034 */ sw $v1, 0x34($sp) -/* 8A6554 80240AD4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A6558 80240AD8 8C630028 */ lw $v1, 0x28($v1) -/* 8A655C 80240ADC 27B50028 */ addiu $s5, $sp, 0x28 -/* 8A6560 80240AE0 AFA30038 */ sw $v1, 0x38($sp) -/* 8A6564 80240AE4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 8A6568 80240AE8 3C0142C8 */ lui $at, 0x42c8 -/* 8A656C 80240AEC 44810000 */ mtc1 $at, $f0 -/* 8A6570 80240AF0 8C63002C */ lw $v1, 0x2c($v1) -/* 8A6574 80240AF4 0040A02D */ daddu $s4, $v0, $zero -/* 8A6578 80240AF8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 8A657C 80240AFC A7A00044 */ sh $zero, 0x44($sp) -/* 8A6580 80240B00 12000009 */ beqz $s0, .L80240B28 -/* 8A6584 80240B04 AFA3003C */ sw $v1, 0x3c($sp) -/* 8A6588 80240B08 864300A8 */ lh $v1, 0xa8($s2) -/* 8A658C 80240B0C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A6590 80240B10 AE20008C */ sw $zero, 0x8c($s1) -/* 8A6594 80240B14 A22000B5 */ sb $zero, 0xb5($s1) -/* 8A6598 80240B18 34420008 */ ori $v0, $v0, 8 -/* 8A659C 80240B1C AE230084 */ sw $v1, 0x84($s1) -/* 8A65A0 80240B20 080902CE */ j .L80240B38 -/* 8A65A4 80240B24 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240B28: -/* 8A65A8 80240B28 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A65AC 80240B2C 30420004 */ andi $v0, $v0, 4 -/* 8A65B0 80240B30 10400047 */ beqz $v0, .L80240C50 -/* 8A65B4 80240B34 00000000 */ nop -.L80240B38: -/* 8A65B8 80240B38 AE600070 */ sw $zero, 0x70($s3) -/* 8A65BC 80240B3C A640008E */ sh $zero, 0x8e($s2) -/* 8A65C0 80240B40 8E2300CC */ lw $v1, 0xcc($s1) -/* 8A65C4 80240B44 2404F7FF */ addiu $a0, $zero, -0x801 -/* 8A65C8 80240B48 A2200007 */ sb $zero, 7($s1) -/* 8A65CC 80240B4C 8E420000 */ lw $v0, ($s2) -/* 8A65D0 80240B50 8C630000 */ lw $v1, ($v1) -/* 8A65D4 80240B54 00441024 */ and $v0, $v0, $a0 -/* 8A65D8 80240B58 AE420000 */ sw $v0, ($s2) -/* 8A65DC 80240B5C AE430028 */ sw $v1, 0x28($s2) -/* 8A65E0 80240B60 96220086 */ lhu $v0, 0x86($s1) -/* 8A65E4 80240B64 A64200A8 */ sh $v0, 0xa8($s2) -/* 8A65E8 80240B68 8E2200D0 */ lw $v0, 0xd0($s1) -/* 8A65EC 80240B6C AE200090 */ sw $zero, 0x90($s1) -/* 8A65F0 80240B70 8C420034 */ lw $v0, 0x34($v0) -/* 8A65F4 80240B74 14400006 */ bnez $v0, .L80240B90 -/* 8A65F8 80240B78 2403FDFF */ addiu $v1, $zero, -0x201 -/* 8A65FC 80240B7C 8E420000 */ lw $v0, ($s2) -/* 8A6600 80240B80 2403FFF7 */ addiu $v1, $zero, -9 -/* 8A6604 80240B84 34420200 */ ori $v0, $v0, 0x200 -/* 8A6608 80240B88 080902E7 */ j .L80240B9C -/* 8A660C 80240B8C 00431024 */ and $v0, $v0, $v1 -.L80240B90: -/* 8A6610 80240B90 8E420000 */ lw $v0, ($s2) -/* 8A6614 80240B94 00431024 */ and $v0, $v0, $v1 -/* 8A6618 80240B98 34420008 */ ori $v0, $v0, 8 -.L80240B9C: -/* 8A661C 80240B9C AE420000 */ sw $v0, ($s2) -/* 8A6620 80240BA0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A6624 80240BA4 30420004 */ andi $v0, $v0, 4 -/* 8A6628 80240BA8 1040001E */ beqz $v0, .L80240C24 -/* 8A662C 80240BAC 24040002 */ addiu $a0, $zero, 2 -/* 8A6630 80240BB0 0240282D */ daddu $a1, $s2, $zero -/* 8A6634 80240BB4 0000302D */ daddu $a2, $zero, $zero -/* 8A6638 80240BB8 24020063 */ addiu $v0, $zero, 0x63 -/* 8A663C 80240BBC AE620070 */ sw $v0, 0x70($s3) -/* 8A6640 80240BC0 AE600074 */ sw $zero, 0x74($s3) -/* 8A6644 80240BC4 864300A8 */ lh $v1, 0xa8($s2) -/* 8A6648 80240BC8 3C013F80 */ lui $at, 0x3f80 -/* 8A664C 80240BCC 44810000 */ mtc1 $at, $f0 -/* 8A6650 80240BD0 3C014000 */ lui $at, 0x4000 -/* 8A6654 80240BD4 44811000 */ mtc1 $at, $f2 -/* 8A6658 80240BD8 3C01C1A0 */ lui $at, 0xc1a0 -/* 8A665C 80240BDC 44812000 */ mtc1 $at, $f4 -/* 8A6660 80240BE0 24020028 */ addiu $v0, $zero, 0x28 -/* 8A6664 80240BE4 AFA2001C */ sw $v0, 0x1c($sp) -/* 8A6668 80240BE8 44833000 */ mtc1 $v1, $f6 -/* 8A666C 80240BEC 00000000 */ nop -/* 8A6670 80240BF0 468031A0 */ cvt.s.w $f6, $f6 -/* 8A6674 80240BF4 44073000 */ mfc1 $a3, $f6 -/* 8A6678 80240BF8 27A20048 */ addiu $v0, $sp, 0x48 -/* 8A667C 80240BFC AFA20020 */ sw $v0, 0x20($sp) -/* 8A6680 80240C00 E7A00010 */ swc1 $f0, 0x10($sp) -/* 8A6684 80240C04 E7A20014 */ swc1 $f2, 0x14($sp) -/* 8A6688 80240C08 0C01BFA4 */ jal fx_emote -/* 8A668C 80240C0C E7A40018 */ swc1 $f4, 0x18($sp) -/* 8A6690 80240C10 8E2200B0 */ lw $v0, 0xb0($s1) -/* 8A6694 80240C14 2403FFFB */ addiu $v1, $zero, -5 -/* 8A6698 80240C18 00431024 */ and $v0, $v0, $v1 -/* 8A669C 80240C1C 08090314 */ j .L80240C50 -/* 8A66A0 80240C20 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240C24: -/* 8A66A4 80240C24 8E220000 */ lw $v0, ($s1) -/* 8A66A8 80240C28 3C034000 */ lui $v1, 0x4000 -/* 8A66AC 80240C2C 00431024 */ and $v0, $v0, $v1 -/* 8A66B0 80240C30 10400007 */ beqz $v0, .L80240C50 -/* 8A66B4 80240C34 3C03BFFF */ lui $v1, 0xbfff -/* 8A66B8 80240C38 2402000C */ addiu $v0, $zero, 0xc -/* 8A66BC 80240C3C AE620070 */ sw $v0, 0x70($s3) -/* 8A66C0 80240C40 8E220000 */ lw $v0, ($s1) -/* 8A66C4 80240C44 3463FFFF */ ori $v1, $v1, 0xffff -/* 8A66C8 80240C48 00431024 */ and $v0, $v0, $v1 -/* 8A66CC 80240C4C AE220000 */ sw $v0, ($s1) -.L80240C50: -/* 8A66D0 80240C50 8E220090 */ lw $v0, 0x90($s1) -/* 8A66D4 80240C54 1840000C */ blez $v0, .L80240C88 -/* 8A66D8 80240C58 2442FFFF */ addiu $v0, $v0, -1 -/* 8A66DC 80240C5C 14400087 */ bnez $v0, .L80240E7C -/* 8A66E0 80240C60 AE220090 */ sw $v0, 0x90($s1) -/* 8A66E4 80240C64 3C03FFAA */ lui $v1, 0xffaa -/* 8A66E8 80240C68 8E420028 */ lw $v0, 0x28($s2) -/* 8A66EC 80240C6C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 8A66F0 80240C70 00431021 */ addu $v0, $v0, $v1 -/* 8A66F4 80240C74 2C420002 */ sltiu $v0, $v0, 2 -/* 8A66F8 80240C78 10400003 */ beqz $v0, .L80240C88 -/* 8A66FC 80240C7C 3C020055 */ lui $v0, 0x55 -/* 8A6700 80240C80 3442000C */ ori $v0, $v0, 0xc -/* 8A6704 80240C84 AE420028 */ sw $v0, 0x28($s2) -.L80240C88: -/* 8A6708 80240C88 8E630070 */ lw $v1, 0x70($s3) -/* 8A670C 80240C8C 2402000C */ addiu $v0, $zero, 0xc -/* 8A6710 80240C90 10620048 */ beq $v1, $v0, .L80240DB4 -/* 8A6714 80240C94 2862000D */ slti $v0, $v1, 0xd -/* 8A6718 80240C98 1040000F */ beqz $v0, .L80240CD8 -/* 8A671C 80240C9C 24100001 */ addiu $s0, $zero, 1 -/* 8A6720 80240CA0 1070001E */ beq $v1, $s0, .L80240D1C -/* 8A6724 80240CA4 28620002 */ slti $v0, $v1, 2 -/* 8A6728 80240CA8 10400005 */ beqz $v0, .L80240CC0 -/* 8A672C 80240CAC 24020002 */ addiu $v0, $zero, 2 -/* 8A6730 80240CB0 10600015 */ beqz $v1, .L80240D08 -/* 8A6734 80240CB4 0260202D */ daddu $a0, $s3, $zero -/* 8A6738 80240CB8 08090384 */ j .L80240E10 -/* 8A673C 80240CBC 00000000 */ nop -.L80240CC0: -/* 8A6740 80240CC0 1062001C */ beq $v1, $v0, .L80240D34 -/* 8A6744 80240CC4 24020003 */ addiu $v0, $zero, 3 -/* 8A6748 80240CC8 10620035 */ beq $v1, $v0, .L80240DA0 -/* 8A674C 80240CCC 0260202D */ daddu $a0, $s3, $zero -/* 8A6750 80240CD0 08090384 */ j .L80240E10 -/* 8A6754 80240CD4 00000000 */ nop -.L80240CD8: -/* 8A6758 80240CD8 2402000E */ addiu $v0, $zero, 0xe -/* 8A675C 80240CDC 1062003F */ beq $v1, $v0, .L80240DDC -/* 8A6760 80240CE0 0062102A */ slt $v0, $v1, $v0 -/* 8A6764 80240CE4 14400038 */ bnez $v0, .L80240DC8 -/* 8A6768 80240CE8 0260202D */ daddu $a0, $s3, $zero -/* 8A676C 80240CEC 2402000F */ addiu $v0, $zero, 0xf -/* 8A6770 80240CF0 10620040 */ beq $v1, $v0, .L80240DF4 -/* 8A6774 80240CF4 24020063 */ addiu $v0, $zero, 0x63 -/* 8A6778 80240CF8 10620043 */ beq $v1, $v0, .L80240E08 -/* 8A677C 80240CFC 00000000 */ nop -/* 8A6780 80240D00 08090384 */ j .L80240E10 -/* 8A6784 80240D04 00000000 */ nop -.L80240D08: -/* 8A6788 80240D08 0280282D */ daddu $a1, $s4, $zero -/* 8A678C 80240D0C 0C012568 */ jal func_800495A0 -/* 8A6790 80240D10 02A0302D */ daddu $a2, $s5, $zero -/* 8A6794 80240D14 96220086 */ lhu $v0, 0x86($s1) -/* 8A6798 80240D18 A64200A8 */ sh $v0, 0xa8($s2) -.L80240D1C: -/* 8A679C 80240D1C 0260202D */ daddu $a0, $s3, $zero -/* 8A67A0 80240D20 0280282D */ daddu $a1, $s4, $zero -/* 8A67A4 80240D24 0C0125AE */ jal func_800496B8 -/* 8A67A8 80240D28 02A0302D */ daddu $a2, $s5, $zero -/* 8A67AC 80240D2C 08090384 */ j .L80240E10 -/* 8A67B0 80240D30 00000000 */ nop -.L80240D34: -/* 8A67B4 80240D34 0260202D */ daddu $a0, $s3, $zero -/* 8A67B8 80240D38 0280282D */ daddu $a1, $s4, $zero -/* 8A67BC 80240D3C 0C0126D1 */ jal func_80049B44 -/* 8A67C0 80240D40 02A0302D */ daddu $a2, $s5, $zero -/* 8A67C4 80240D44 8E230088 */ lw $v1, 0x88($s1) -/* 8A67C8 80240D48 24020006 */ addiu $v0, $zero, 6 -/* 8A67CC 80240D4C 14620014 */ bne $v1, $v0, .L80240DA0 -/* 8A67D0 80240D50 0260202D */ daddu $a0, $s3, $zero -/* 8A67D4 80240D54 0C00A67F */ jal rand_int -/* 8A67D8 80240D58 24040064 */ addiu $a0, $zero, 0x64 -/* 8A67DC 80240D5C 28420021 */ slti $v0, $v0, 0x21 -/* 8A67E0 80240D60 5040000F */ beql $v0, $zero, .L80240DA0 -/* 8A67E4 80240D64 0260202D */ daddu $a0, $s3, $zero -/* 8A67E8 80240D68 8E22008C */ lw $v0, 0x8c($s1) -/* 8A67EC 80240D6C 10400005 */ beqz $v0, .L80240D84 -/* 8A67F0 80240D70 3C020055 */ lui $v0, 0x55 -/* 8A67F4 80240D74 3442002F */ ori $v0, $v0, 0x2f -/* 8A67F8 80240D78 AE20008C */ sw $zero, 0x8c($s1) -/* 8A67FC 80240D7C 08090364 */ j .L80240D90 -/* 8A6800 80240D80 A22000B5 */ sb $zero, 0xb5($s1) -.L80240D84: -/* 8A6804 80240D84 3442002E */ ori $v0, $v0, 0x2e -/* 8A6808 80240D88 AE30008C */ sw $s0, 0x8c($s1) -/* 8A680C 80240D8C A23000B5 */ sb $s0, 0xb5($s1) -.L80240D90: -/* 8A6810 80240D90 AE420028 */ sw $v0, 0x28($s2) -/* 8A6814 80240D94 24020007 */ addiu $v0, $zero, 7 -/* 8A6818 80240D98 0809039F */ j .L80240E7C -/* 8A681C 80240D9C AE220090 */ sw $v0, 0x90($s1) -.L80240DA0: -/* 8A6820 80240DA0 0280282D */ daddu $a1, $s4, $zero -/* 8A6824 80240DA4 0C012701 */ jal func_80049C04 -/* 8A6828 80240DA8 02A0302D */ daddu $a2, $s5, $zero -/* 8A682C 80240DAC 08090384 */ j .L80240E10 -/* 8A6830 80240DB0 00000000 */ nop -.L80240DB4: -/* 8A6834 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* 8A6838 80240DB8 0280282D */ daddu $a1, $s4, $zero -/* 8A683C 80240DBC 0C0901B4 */ jal func_802406D0 -/* 8A6840 80240DC0 02A0302D */ daddu $a2, $s5, $zero -/* 8A6844 80240DC4 0260202D */ daddu $a0, $s3, $zero -.L80240DC8: -/* 8A6848 80240DC8 0280282D */ daddu $a1, $s4, $zero -/* 8A684C 80240DCC 0C0901D3 */ jal func_8024074C -/* 8A6850 80240DD0 02A0302D */ daddu $a2, $s5, $zero -/* 8A6854 80240DD4 08090384 */ j .L80240E10 -/* 8A6858 80240DD8 00000000 */ nop -.L80240DDC: -/* 8A685C 80240DDC 0260202D */ daddu $a0, $s3, $zero -/* 8A6860 80240DE0 0280282D */ daddu $a1, $s4, $zero -/* 8A6864 80240DE4 0C090220 */ jal func_80240880 -/* 8A6868 80240DE8 02A0302D */ daddu $a2, $s5, $zero -/* 8A686C 80240DEC 08090384 */ j .L80240E10 -/* 8A6870 80240DF0 00000000 */ nop -.L80240DF4: -/* 8A6874 80240DF4 0280282D */ daddu $a1, $s4, $zero -/* 8A6878 80240DF8 0C090279 */ jal func_802409E4 -/* 8A687C 80240DFC 02A0302D */ daddu $a2, $s5, $zero -/* 8A6880 80240E00 08090384 */ j .L80240E10 -/* 8A6884 80240E04 00000000 */ nop -.L80240E08: -/* 8A6888 80240E08 0C0129CF */ jal func_8004A73C -/* 8A688C 80240E0C 0260202D */ daddu $a0, $s3, $zero -.L80240E10: -/* 8A6890 80240E10 8E230088 */ lw $v1, 0x88($s1) -/* 8A6894 80240E14 24020006 */ addiu $v0, $zero, 6 -/* 8A6898 80240E18 14620019 */ bne $v1, $v0, .L80240E80 -/* 8A689C 80240E1C 0000102D */ daddu $v0, $zero, $zero -/* 8A68A0 80240E20 8E22008C */ lw $v0, 0x8c($s1) -/* 8A68A4 80240E24 10400003 */ beqz $v0, .L80240E34 -/* 8A68A8 80240E28 24020001 */ addiu $v0, $zero, 1 -/* 8A68AC 80240E2C 0809038E */ j .L80240E38 -/* 8A68B0 80240E30 A22200B5 */ sb $v0, 0xb5($s1) -.L80240E34: -/* 8A68B4 80240E34 A22000B5 */ sb $zero, 0xb5($s1) -.L80240E38: -/* 8A68B8 80240E38 8E22008C */ lw $v0, 0x8c($s1) -/* 8A68BC 80240E3C 1040000F */ beqz $v0, .L80240E7C -/* 8A68C0 80240E40 3C03FFAA */ lui $v1, 0xffaa -/* 8A68C4 80240E44 8E420028 */ lw $v0, 0x28($s2) -/* 8A68C8 80240E48 3463FFFC */ ori $v1, $v1, 0xfffc -/* 8A68CC 80240E4C 00431821 */ addu $v1, $v0, $v1 -/* 8A68D0 80240E50 2C620015 */ sltiu $v0, $v1, 0x15 -/* 8A68D4 80240E54 10400009 */ beqz $v0, .L80240E7C -/* 8A68D8 80240E58 00031080 */ sll $v0, $v1, 2 -/* 8A68DC 80240E5C 3C018024 */ lui $at, 0x8024 -/* 8A68E0 80240E60 00220821 */ addu $at, $at, $v0 -/* 8A68E4 80240E64 8C2224A8 */ lw $v0, 0x24a8($at) -/* 8A68E8 80240E68 00400008 */ jr $v0 -/* 8A68EC 80240E6C 00000000 */ nop -/* 8A68F0 80240E70 8E420028 */ lw $v0, 0x28($s2) -/* 8A68F4 80240E74 24420001 */ addiu $v0, $v0, 1 -/* 8A68F8 80240E78 AE420028 */ sw $v0, 0x28($s2) -.L80240E7C: -/* 8A68FC 80240E7C 0000102D */ daddu $v0, $zero, $zero -.L80240E80: -/* 8A6900 80240E80 8FBF0068 */ lw $ra, 0x68($sp) -/* 8A6904 80240E84 8FB50064 */ lw $s5, 0x64($sp) -/* 8A6908 80240E88 8FB40060 */ lw $s4, 0x60($sp) -/* 8A690C 80240E8C 8FB3005C */ lw $s3, 0x5c($sp) -/* 8A6910 80240E90 8FB20058 */ lw $s2, 0x58($sp) -/* 8A6914 80240E94 8FB10054 */ lw $s1, 0x54($sp) -/* 8A6918 80240E98 8FB00050 */ lw $s0, 0x50($sp) -/* 8A691C 80240E9C 03E00008 */ jr $ra -/* 8A6920 80240EA0 27BD0070 */ addiu $sp, $sp, 0x70 -/* 8A6924 80240EA4 00000000 */ nop -/* 8A6928 80240EA8 00000000 */ nop -/* 8A692C 80240EAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s new file mode 100644 index 0000000000..8c33c5a932 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_24/8A5DE0/func_80240A64_8A64E4.s @@ -0,0 +1,304 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240A64_8A64E4 +/* 8A64E4 80240A64 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 8A64E8 80240A68 AFB3005C */ sw $s3, 0x5c($sp) +/* 8A64EC 80240A6C 0080982D */ daddu $s3, $a0, $zero +/* 8A64F0 80240A70 AFBF0068 */ sw $ra, 0x68($sp) +/* 8A64F4 80240A74 AFB50064 */ sw $s5, 0x64($sp) +/* 8A64F8 80240A78 AFB40060 */ sw $s4, 0x60($sp) +/* 8A64FC 80240A7C AFB20058 */ sw $s2, 0x58($sp) +/* 8A6500 80240A80 AFB10054 */ sw $s1, 0x54($sp) +/* 8A6504 80240A84 AFB00050 */ sw $s0, 0x50($sp) +/* 8A6508 80240A88 8E710148 */ lw $s1, 0x148($s3) +/* 8A650C 80240A8C 86240008 */ lh $a0, 8($s1) +/* 8A6510 80240A90 0C00EABB */ jal get_npc_unsafe +/* 8A6514 80240A94 00A0802D */ daddu $s0, $a1, $zero +/* 8A6518 80240A98 8E63000C */ lw $v1, 0xc($s3) +/* 8A651C 80240A9C 0260202D */ daddu $a0, $s3, $zero +/* 8A6520 80240AA0 8C650000 */ lw $a1, ($v1) +/* 8A6524 80240AA4 0C0B1EAF */ jal get_variable +/* 8A6528 80240AA8 0040902D */ daddu $s2, $v0, $zero +/* 8A652C 80240AAC AFA00028 */ sw $zero, 0x28($sp) +/* 8A6530 80240AB0 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8A6534 80240AB4 8C630030 */ lw $v1, 0x30($v1) +/* 8A6538 80240AB8 AFA3002C */ sw $v1, 0x2c($sp) +/* 8A653C 80240ABC 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8A6540 80240AC0 8C63001C */ lw $v1, 0x1c($v1) +/* 8A6544 80240AC4 AFA30030 */ sw $v1, 0x30($sp) +/* 8A6548 80240AC8 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8A654C 80240ACC 8C630024 */ lw $v1, 0x24($v1) +/* 8A6550 80240AD0 AFA30034 */ sw $v1, 0x34($sp) +/* 8A6554 80240AD4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8A6558 80240AD8 8C630028 */ lw $v1, 0x28($v1) +/* 8A655C 80240ADC 27B50028 */ addiu $s5, $sp, 0x28 +/* 8A6560 80240AE0 AFA30038 */ sw $v1, 0x38($sp) +/* 8A6564 80240AE4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 8A6568 80240AE8 3C0142C8 */ lui $at, 0x42c8 +/* 8A656C 80240AEC 44810000 */ mtc1 $at, $f0 +/* 8A6570 80240AF0 8C63002C */ lw $v1, 0x2c($v1) +/* 8A6574 80240AF4 0040A02D */ daddu $s4, $v0, $zero +/* 8A6578 80240AF8 E7A00040 */ swc1 $f0, 0x40($sp) +/* 8A657C 80240AFC A7A00044 */ sh $zero, 0x44($sp) +/* 8A6580 80240B00 12000009 */ beqz $s0, .L80240B28 +/* 8A6584 80240B04 AFA3003C */ sw $v1, 0x3c($sp) +/* 8A6588 80240B08 864300A8 */ lh $v1, 0xa8($s2) +/* 8A658C 80240B0C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 8A6590 80240B10 AE20008C */ sw $zero, 0x8c($s1) +/* 8A6594 80240B14 A22000B5 */ sb $zero, 0xb5($s1) +/* 8A6598 80240B18 34420008 */ ori $v0, $v0, 8 +/* 8A659C 80240B1C AE230084 */ sw $v1, 0x84($s1) +/* 8A65A0 80240B20 080902CE */ j .L80240B38 +/* 8A65A4 80240B24 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240B28: +/* 8A65A8 80240B28 8E2200B0 */ lw $v0, 0xb0($s1) +/* 8A65AC 80240B2C 30420004 */ andi $v0, $v0, 4 +/* 8A65B0 80240B30 10400047 */ beqz $v0, .L80240C50 +/* 8A65B4 80240B34 00000000 */ nop +.L80240B38: +/* 8A65B8 80240B38 AE600070 */ sw $zero, 0x70($s3) +/* 8A65BC 80240B3C A640008E */ sh $zero, 0x8e($s2) +/* 8A65C0 80240B40 8E2300CC */ lw $v1, 0xcc($s1) +/* 8A65C4 80240B44 2404F7FF */ addiu $a0, $zero, -0x801 +/* 8A65C8 80240B48 A2200007 */ sb $zero, 7($s1) +/* 8A65CC 80240B4C 8E420000 */ lw $v0, ($s2) +/* 8A65D0 80240B50 8C630000 */ lw $v1, ($v1) +/* 8A65D4 80240B54 00441024 */ and $v0, $v0, $a0 +/* 8A65D8 80240B58 AE420000 */ sw $v0, ($s2) +/* 8A65DC 80240B5C AE430028 */ sw $v1, 0x28($s2) +/* 8A65E0 80240B60 96220086 */ lhu $v0, 0x86($s1) +/* 8A65E4 80240B64 A64200A8 */ sh $v0, 0xa8($s2) +/* 8A65E8 80240B68 8E2200D0 */ lw $v0, 0xd0($s1) +/* 8A65EC 80240B6C AE200090 */ sw $zero, 0x90($s1) +/* 8A65F0 80240B70 8C420034 */ lw $v0, 0x34($v0) +/* 8A65F4 80240B74 14400006 */ bnez $v0, .L80240B90 +/* 8A65F8 80240B78 2403FDFF */ addiu $v1, $zero, -0x201 +/* 8A65FC 80240B7C 8E420000 */ lw $v0, ($s2) +/* 8A6600 80240B80 2403FFF7 */ addiu $v1, $zero, -9 +/* 8A6604 80240B84 34420200 */ ori $v0, $v0, 0x200 +/* 8A6608 80240B88 080902E7 */ j .L80240B9C +/* 8A660C 80240B8C 00431024 */ and $v0, $v0, $v1 +.L80240B90: +/* 8A6610 80240B90 8E420000 */ lw $v0, ($s2) +/* 8A6614 80240B94 00431024 */ and $v0, $v0, $v1 +/* 8A6618 80240B98 34420008 */ ori $v0, $v0, 8 +.L80240B9C: +/* 8A661C 80240B9C AE420000 */ sw $v0, ($s2) +/* 8A6620 80240BA0 8E2200B0 */ lw $v0, 0xb0($s1) +/* 8A6624 80240BA4 30420004 */ andi $v0, $v0, 4 +/* 8A6628 80240BA8 1040001E */ beqz $v0, .L80240C24 +/* 8A662C 80240BAC 24040002 */ addiu $a0, $zero, 2 +/* 8A6630 80240BB0 0240282D */ daddu $a1, $s2, $zero +/* 8A6634 80240BB4 0000302D */ daddu $a2, $zero, $zero +/* 8A6638 80240BB8 24020063 */ addiu $v0, $zero, 0x63 +/* 8A663C 80240BBC AE620070 */ sw $v0, 0x70($s3) +/* 8A6640 80240BC0 AE600074 */ sw $zero, 0x74($s3) +/* 8A6644 80240BC4 864300A8 */ lh $v1, 0xa8($s2) +/* 8A6648 80240BC8 3C013F80 */ lui $at, 0x3f80 +/* 8A664C 80240BCC 44810000 */ mtc1 $at, $f0 +/* 8A6650 80240BD0 3C014000 */ lui $at, 0x4000 +/* 8A6654 80240BD4 44811000 */ mtc1 $at, $f2 +/* 8A6658 80240BD8 3C01C1A0 */ lui $at, 0xc1a0 +/* 8A665C 80240BDC 44812000 */ mtc1 $at, $f4 +/* 8A6660 80240BE0 24020028 */ addiu $v0, $zero, 0x28 +/* 8A6664 80240BE4 AFA2001C */ sw $v0, 0x1c($sp) +/* 8A6668 80240BE8 44833000 */ mtc1 $v1, $f6 +/* 8A666C 80240BEC 00000000 */ nop +/* 8A6670 80240BF0 468031A0 */ cvt.s.w $f6, $f6 +/* 8A6674 80240BF4 44073000 */ mfc1 $a3, $f6 +/* 8A6678 80240BF8 27A20048 */ addiu $v0, $sp, 0x48 +/* 8A667C 80240BFC AFA20020 */ sw $v0, 0x20($sp) +/* 8A6680 80240C00 E7A00010 */ swc1 $f0, 0x10($sp) +/* 8A6684 80240C04 E7A20014 */ swc1 $f2, 0x14($sp) +/* 8A6688 80240C08 0C01BFA4 */ jal fx_emote +/* 8A668C 80240C0C E7A40018 */ swc1 $f4, 0x18($sp) +/* 8A6690 80240C10 8E2200B0 */ lw $v0, 0xb0($s1) +/* 8A6694 80240C14 2403FFFB */ addiu $v1, $zero, -5 +/* 8A6698 80240C18 00431024 */ and $v0, $v0, $v1 +/* 8A669C 80240C1C 08090314 */ j .L80240C50 +/* 8A66A0 80240C20 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240C24: +/* 8A66A4 80240C24 8E220000 */ lw $v0, ($s1) +/* 8A66A8 80240C28 3C034000 */ lui $v1, 0x4000 +/* 8A66AC 80240C2C 00431024 */ and $v0, $v0, $v1 +/* 8A66B0 80240C30 10400007 */ beqz $v0, .L80240C50 +/* 8A66B4 80240C34 3C03BFFF */ lui $v1, 0xbfff +/* 8A66B8 80240C38 2402000C */ addiu $v0, $zero, 0xc +/* 8A66BC 80240C3C AE620070 */ sw $v0, 0x70($s3) +/* 8A66C0 80240C40 8E220000 */ lw $v0, ($s1) +/* 8A66C4 80240C44 3463FFFF */ ori $v1, $v1, 0xffff +/* 8A66C8 80240C48 00431024 */ and $v0, $v0, $v1 +/* 8A66CC 80240C4C AE220000 */ sw $v0, ($s1) +.L80240C50: +/* 8A66D0 80240C50 8E220090 */ lw $v0, 0x90($s1) +/* 8A66D4 80240C54 1840000C */ blez $v0, .L80240C88 +/* 8A66D8 80240C58 2442FFFF */ addiu $v0, $v0, -1 +/* 8A66DC 80240C5C 14400087 */ bnez $v0, .L80240E7C +/* 8A66E0 80240C60 AE220090 */ sw $v0, 0x90($s1) +/* 8A66E4 80240C64 3C03FFAA */ lui $v1, 0xffaa +/* 8A66E8 80240C68 8E420028 */ lw $v0, 0x28($s2) +/* 8A66EC 80240C6C 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 8A66F0 80240C70 00431021 */ addu $v0, $v0, $v1 +/* 8A66F4 80240C74 2C420002 */ sltiu $v0, $v0, 2 +/* 8A66F8 80240C78 10400003 */ beqz $v0, .L80240C88 +/* 8A66FC 80240C7C 3C020055 */ lui $v0, 0x55 +/* 8A6700 80240C80 3442000C */ ori $v0, $v0, 0xc +/* 8A6704 80240C84 AE420028 */ sw $v0, 0x28($s2) +.L80240C88: +/* 8A6708 80240C88 8E630070 */ lw $v1, 0x70($s3) +/* 8A670C 80240C8C 2402000C */ addiu $v0, $zero, 0xc +/* 8A6710 80240C90 10620048 */ beq $v1, $v0, .L80240DB4 +/* 8A6714 80240C94 2862000D */ slti $v0, $v1, 0xd +/* 8A6718 80240C98 1040000F */ beqz $v0, .L80240CD8 +/* 8A671C 80240C9C 24100001 */ addiu $s0, $zero, 1 +/* 8A6720 80240CA0 1070001E */ beq $v1, $s0, .L80240D1C +/* 8A6724 80240CA4 28620002 */ slti $v0, $v1, 2 +/* 8A6728 80240CA8 10400005 */ beqz $v0, .L80240CC0 +/* 8A672C 80240CAC 24020002 */ addiu $v0, $zero, 2 +/* 8A6730 80240CB0 10600015 */ beqz $v1, .L80240D08 +/* 8A6734 80240CB4 0260202D */ daddu $a0, $s3, $zero +/* 8A6738 80240CB8 08090384 */ j .L80240E10 +/* 8A673C 80240CBC 00000000 */ nop +.L80240CC0: +/* 8A6740 80240CC0 1062001C */ beq $v1, $v0, .L80240D34 +/* 8A6744 80240CC4 24020003 */ addiu $v0, $zero, 3 +/* 8A6748 80240CC8 10620035 */ beq $v1, $v0, .L80240DA0 +/* 8A674C 80240CCC 0260202D */ daddu $a0, $s3, $zero +/* 8A6750 80240CD0 08090384 */ j .L80240E10 +/* 8A6754 80240CD4 00000000 */ nop +.L80240CD8: +/* 8A6758 80240CD8 2402000E */ addiu $v0, $zero, 0xe +/* 8A675C 80240CDC 1062003F */ beq $v1, $v0, .L80240DDC +/* 8A6760 80240CE0 0062102A */ slt $v0, $v1, $v0 +/* 8A6764 80240CE4 14400038 */ bnez $v0, .L80240DC8 +/* 8A6768 80240CE8 0260202D */ daddu $a0, $s3, $zero +/* 8A676C 80240CEC 2402000F */ addiu $v0, $zero, 0xf +/* 8A6770 80240CF0 10620040 */ beq $v1, $v0, .L80240DF4 +/* 8A6774 80240CF4 24020063 */ addiu $v0, $zero, 0x63 +/* 8A6778 80240CF8 10620043 */ beq $v1, $v0, .L80240E08 +/* 8A677C 80240CFC 00000000 */ nop +/* 8A6780 80240D00 08090384 */ j .L80240E10 +/* 8A6784 80240D04 00000000 */ nop +.L80240D08: +/* 8A6788 80240D08 0280282D */ daddu $a1, $s4, $zero +/* 8A678C 80240D0C 0C012568 */ jal func_800495A0 +/* 8A6790 80240D10 02A0302D */ daddu $a2, $s5, $zero +/* 8A6794 80240D14 96220086 */ lhu $v0, 0x86($s1) +/* 8A6798 80240D18 A64200A8 */ sh $v0, 0xa8($s2) +.L80240D1C: +/* 8A679C 80240D1C 0260202D */ daddu $a0, $s3, $zero +/* 8A67A0 80240D20 0280282D */ daddu $a1, $s4, $zero +/* 8A67A4 80240D24 0C0125AE */ jal func_800496B8 +/* 8A67A8 80240D28 02A0302D */ daddu $a2, $s5, $zero +/* 8A67AC 80240D2C 08090384 */ j .L80240E10 +/* 8A67B0 80240D30 00000000 */ nop +.L80240D34: +/* 8A67B4 80240D34 0260202D */ daddu $a0, $s3, $zero +/* 8A67B8 80240D38 0280282D */ daddu $a1, $s4, $zero +/* 8A67BC 80240D3C 0C0126D1 */ jal func_80049B44 +/* 8A67C0 80240D40 02A0302D */ daddu $a2, $s5, $zero +/* 8A67C4 80240D44 8E230088 */ lw $v1, 0x88($s1) +/* 8A67C8 80240D48 24020006 */ addiu $v0, $zero, 6 +/* 8A67CC 80240D4C 14620014 */ bne $v1, $v0, .L80240DA0 +/* 8A67D0 80240D50 0260202D */ daddu $a0, $s3, $zero +/* 8A67D4 80240D54 0C00A67F */ jal rand_int +/* 8A67D8 80240D58 24040064 */ addiu $a0, $zero, 0x64 +/* 8A67DC 80240D5C 28420021 */ slti $v0, $v0, 0x21 +/* 8A67E0 80240D60 5040000F */ beql $v0, $zero, .L80240DA0 +/* 8A67E4 80240D64 0260202D */ daddu $a0, $s3, $zero +/* 8A67E8 80240D68 8E22008C */ lw $v0, 0x8c($s1) +/* 8A67EC 80240D6C 10400005 */ beqz $v0, .L80240D84 +/* 8A67F0 80240D70 3C020055 */ lui $v0, 0x55 +/* 8A67F4 80240D74 3442002F */ ori $v0, $v0, 0x2f +/* 8A67F8 80240D78 AE20008C */ sw $zero, 0x8c($s1) +/* 8A67FC 80240D7C 08090364 */ j .L80240D90 +/* 8A6800 80240D80 A22000B5 */ sb $zero, 0xb5($s1) +.L80240D84: +/* 8A6804 80240D84 3442002E */ ori $v0, $v0, 0x2e +/* 8A6808 80240D88 AE30008C */ sw $s0, 0x8c($s1) +/* 8A680C 80240D8C A23000B5 */ sb $s0, 0xb5($s1) +.L80240D90: +/* 8A6810 80240D90 AE420028 */ sw $v0, 0x28($s2) +/* 8A6814 80240D94 24020007 */ addiu $v0, $zero, 7 +/* 8A6818 80240D98 0809039F */ j .L80240E7C +/* 8A681C 80240D9C AE220090 */ sw $v0, 0x90($s1) +.L80240DA0: +/* 8A6820 80240DA0 0280282D */ daddu $a1, $s4, $zero +/* 8A6824 80240DA4 0C012701 */ jal func_80049C04 +/* 8A6828 80240DA8 02A0302D */ daddu $a2, $s5, $zero +/* 8A682C 80240DAC 08090384 */ j .L80240E10 +/* 8A6830 80240DB0 00000000 */ nop +.L80240DB4: +/* 8A6834 80240DB4 0260202D */ daddu $a0, $s3, $zero +/* 8A6838 80240DB8 0280282D */ daddu $a1, $s4, $zero +/* 8A683C 80240DBC 0C0901B4 */ jal func_802406D0_8A6150 +/* 8A6840 80240DC0 02A0302D */ daddu $a2, $s5, $zero +/* 8A6844 80240DC4 0260202D */ daddu $a0, $s3, $zero +.L80240DC8: +/* 8A6848 80240DC8 0280282D */ daddu $a1, $s4, $zero +/* 8A684C 80240DCC 0C0901D3 */ jal func_8024074C_8A61CC +/* 8A6850 80240DD0 02A0302D */ daddu $a2, $s5, $zero +/* 8A6854 80240DD4 08090384 */ j .L80240E10 +/* 8A6858 80240DD8 00000000 */ nop +.L80240DDC: +/* 8A685C 80240DDC 0260202D */ daddu $a0, $s3, $zero +/* 8A6860 80240DE0 0280282D */ daddu $a1, $s4, $zero +/* 8A6864 80240DE4 0C090220 */ jal func_80240880_8A6300 +/* 8A6868 80240DE8 02A0302D */ daddu $a2, $s5, $zero +/* 8A686C 80240DEC 08090384 */ j .L80240E10 +/* 8A6870 80240DF0 00000000 */ nop +.L80240DF4: +/* 8A6874 80240DF4 0280282D */ daddu $a1, $s4, $zero +/* 8A6878 80240DF8 0C090279 */ jal func_802409E4_8A6464 +/* 8A687C 80240DFC 02A0302D */ daddu $a2, $s5, $zero +/* 8A6880 80240E00 08090384 */ j .L80240E10 +/* 8A6884 80240E04 00000000 */ nop +.L80240E08: +/* 8A6888 80240E08 0C0129CF */ jal func_8004A73C +/* 8A688C 80240E0C 0260202D */ daddu $a0, $s3, $zero +.L80240E10: +/* 8A6890 80240E10 8E230088 */ lw $v1, 0x88($s1) +/* 8A6894 80240E14 24020006 */ addiu $v0, $zero, 6 +/* 8A6898 80240E18 14620019 */ bne $v1, $v0, .L80240E80 +/* 8A689C 80240E1C 0000102D */ daddu $v0, $zero, $zero +/* 8A68A0 80240E20 8E22008C */ lw $v0, 0x8c($s1) +/* 8A68A4 80240E24 10400003 */ beqz $v0, .L80240E34 +/* 8A68A8 80240E28 24020001 */ addiu $v0, $zero, 1 +/* 8A68AC 80240E2C 0809038E */ j .L80240E38 +/* 8A68B0 80240E30 A22200B5 */ sb $v0, 0xb5($s1) +.L80240E34: +/* 8A68B4 80240E34 A22000B5 */ sb $zero, 0xb5($s1) +.L80240E38: +/* 8A68B8 80240E38 8E22008C */ lw $v0, 0x8c($s1) +/* 8A68BC 80240E3C 1040000F */ beqz $v0, .L80240E7C +/* 8A68C0 80240E40 3C03FFAA */ lui $v1, 0xffaa +/* 8A68C4 80240E44 8E420028 */ lw $v0, 0x28($s2) +/* 8A68C8 80240E48 3463FFFC */ ori $v1, $v1, 0xfffc +/* 8A68CC 80240E4C 00431821 */ addu $v1, $v0, $v1 +/* 8A68D0 80240E50 2C620015 */ sltiu $v0, $v1, 0x15 +/* 8A68D4 80240E54 10400009 */ beqz $v0, .L80240E7C +/* 8A68D8 80240E58 00031080 */ sll $v0, $v1, 2 +/* 8A68DC 80240E5C 3C018024 */ lui $at, 0x8024 +/* 8A68E0 80240E60 00220821 */ addu $at, $at, $v0 +/* 8A68E4 80240E64 8C2224A8 */ lw $v0, 0x24a8($at) +/* 8A68E8 80240E68 00400008 */ jr $v0 +/* 8A68EC 80240E6C 00000000 */ nop +/* 8A68F0 80240E70 8E420028 */ lw $v0, 0x28($s2) +/* 8A68F4 80240E74 24420001 */ addiu $v0, $v0, 1 +/* 8A68F8 80240E78 AE420028 */ sw $v0, 0x28($s2) +.L80240E7C: +/* 8A68FC 80240E7C 0000102D */ daddu $v0, $zero, $zero +.L80240E80: +/* 8A6900 80240E80 8FBF0068 */ lw $ra, 0x68($sp) +/* 8A6904 80240E84 8FB50064 */ lw $s5, 0x64($sp) +/* 8A6908 80240E88 8FB40060 */ lw $s4, 0x60($sp) +/* 8A690C 80240E8C 8FB3005C */ lw $s3, 0x5c($sp) +/* 8A6910 80240E90 8FB20058 */ lw $s2, 0x58($sp) +/* 8A6914 80240E94 8FB10054 */ lw $s1, 0x54($sp) +/* 8A6918 80240E98 8FB00050 */ lw $s0, 0x50($sp) +/* 8A691C 80240E9C 03E00008 */ jr $ra +/* 8A6920 80240EA0 27BD0070 */ addiu $sp, $sp, 0x70 +/* 8A6924 80240EA4 00000000 */ nop +/* 8A6928 80240EA8 00000000 */ nop +/* 8A692C 80240EAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC.s b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC.s deleted file mode 100644 index 7503f6af32..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC.s +++ /dev/null @@ -1,53 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406AC -/* 8A862C 802406AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8A8630 802406B0 AFB10014 */ sw $s1, 0x14($sp) -/* 8A8634 802406B4 0080882D */ daddu $s1, $a0, $zero -/* 8A8638 802406B8 AFBF0020 */ sw $ra, 0x20($sp) -/* 8A863C 802406BC AFB3001C */ sw $s3, 0x1c($sp) -/* 8A8640 802406C0 AFB20018 */ sw $s2, 0x18($sp) -/* 8A8644 802406C4 AFB00010 */ sw $s0, 0x10($sp) -/* 8A8648 802406C8 8E30000C */ lw $s0, 0xc($s1) -/* 8A864C 802406CC 8E050000 */ lw $a1, ($s0) -/* 8A8650 802406D0 0C0B1EAF */ jal get_variable -/* 8A8654 802406D4 26100004 */ addiu $s0, $s0, 4 -/* 8A8658 802406D8 8E050000 */ lw $a1, ($s0) -/* 8A865C 802406DC 26100004 */ addiu $s0, $s0, 4 -/* 8A8660 802406E0 0220202D */ daddu $a0, $s1, $zero -/* 8A8664 802406E4 0C0B1EAF */ jal get_variable -/* 8A8668 802406E8 0040982D */ daddu $s3, $v0, $zero -/* 8A866C 802406EC 8E050000 */ lw $a1, ($s0) -/* 8A8670 802406F0 26100004 */ addiu $s0, $s0, 4 -/* 8A8674 802406F4 0220202D */ daddu $a0, $s1, $zero -/* 8A8678 802406F8 0C0B1EAF */ jal get_variable -/* 8A867C 802406FC 0040902D */ daddu $s2, $v0, $zero -/* 8A8680 80240700 0220202D */ daddu $a0, $s1, $zero -/* 8A8684 80240704 8E050000 */ lw $a1, ($s0) -/* 8A8688 80240708 0C0B1EAF */ jal get_variable -/* 8A868C 8024070C 0040882D */ daddu $s1, $v0, $zero -/* 8A8690 80240710 0260202D */ daddu $a0, $s3, $zero -/* 8A8694 80240714 0C04417A */ jal get_entity_by_index -/* 8A8698 80240718 0040802D */ daddu $s0, $v0, $zero -/* 8A869C 8024071C 0040182D */ daddu $v1, $v0, $zero -/* 8A86A0 80240720 44920000 */ mtc1 $s2, $f0 -/* 8A86A4 80240724 00000000 */ nop -/* 8A86A8 80240728 46800020 */ cvt.s.w $f0, $f0 -/* 8A86AC 8024072C E4600048 */ swc1 $f0, 0x48($v1) -/* 8A86B0 80240730 44910000 */ mtc1 $s1, $f0 -/* 8A86B4 80240734 00000000 */ nop -/* 8A86B8 80240738 46800020 */ cvt.s.w $f0, $f0 -/* 8A86BC 8024073C E460004C */ swc1 $f0, 0x4c($v1) -/* 8A86C0 80240740 44900000 */ mtc1 $s0, $f0 -/* 8A86C4 80240744 00000000 */ nop -/* 8A86C8 80240748 46800020 */ cvt.s.w $f0, $f0 -/* 8A86CC 8024074C E4600050 */ swc1 $f0, 0x50($v1) -/* 8A86D0 80240750 8FBF0020 */ lw $ra, 0x20($sp) -/* 8A86D4 80240754 8FB3001C */ lw $s3, 0x1c($sp) -/* 8A86D8 80240758 8FB20018 */ lw $s2, 0x18($sp) -/* 8A86DC 8024075C 8FB10014 */ lw $s1, 0x14($sp) -/* 8A86E0 80240760 8FB00010 */ lw $s0, 0x10($sp) -/* 8A86E4 80240764 24020002 */ addiu $v0, $zero, 2 -/* 8A86E8 80240768 03E00008 */ jr $ra -/* 8A86EC 8024076C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s new file mode 100644 index 0000000000..9ef97098b3 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_802406AC_8A862C.s @@ -0,0 +1,53 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406AC_8A862C +/* 8A862C 802406AC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 8A8630 802406B0 AFB10014 */ sw $s1, 0x14($sp) +/* 8A8634 802406B4 0080882D */ daddu $s1, $a0, $zero +/* 8A8638 802406B8 AFBF0020 */ sw $ra, 0x20($sp) +/* 8A863C 802406BC AFB3001C */ sw $s3, 0x1c($sp) +/* 8A8640 802406C0 AFB20018 */ sw $s2, 0x18($sp) +/* 8A8644 802406C4 AFB00010 */ sw $s0, 0x10($sp) +/* 8A8648 802406C8 8E30000C */ lw $s0, 0xc($s1) +/* 8A864C 802406CC 8E050000 */ lw $a1, ($s0) +/* 8A8650 802406D0 0C0B1EAF */ jal get_variable +/* 8A8654 802406D4 26100004 */ addiu $s0, $s0, 4 +/* 8A8658 802406D8 8E050000 */ lw $a1, ($s0) +/* 8A865C 802406DC 26100004 */ addiu $s0, $s0, 4 +/* 8A8660 802406E0 0220202D */ daddu $a0, $s1, $zero +/* 8A8664 802406E4 0C0B1EAF */ jal get_variable +/* 8A8668 802406E8 0040982D */ daddu $s3, $v0, $zero +/* 8A866C 802406EC 8E050000 */ lw $a1, ($s0) +/* 8A8670 802406F0 26100004 */ addiu $s0, $s0, 4 +/* 8A8674 802406F4 0220202D */ daddu $a0, $s1, $zero +/* 8A8678 802406F8 0C0B1EAF */ jal get_variable +/* 8A867C 802406FC 0040902D */ daddu $s2, $v0, $zero +/* 8A8680 80240700 0220202D */ daddu $a0, $s1, $zero +/* 8A8684 80240704 8E050000 */ lw $a1, ($s0) +/* 8A8688 80240708 0C0B1EAF */ jal get_variable +/* 8A868C 8024070C 0040882D */ daddu $s1, $v0, $zero +/* 8A8690 80240710 0260202D */ daddu $a0, $s3, $zero +/* 8A8694 80240714 0C04417A */ jal get_entity_by_index +/* 8A8698 80240718 0040802D */ daddu $s0, $v0, $zero +/* 8A869C 8024071C 0040182D */ daddu $v1, $v0, $zero +/* 8A86A0 80240720 44920000 */ mtc1 $s2, $f0 +/* 8A86A4 80240724 00000000 */ nop +/* 8A86A8 80240728 46800020 */ cvt.s.w $f0, $f0 +/* 8A86AC 8024072C E4600048 */ swc1 $f0, 0x48($v1) +/* 8A86B0 80240730 44910000 */ mtc1 $s1, $f0 +/* 8A86B4 80240734 00000000 */ nop +/* 8A86B8 80240738 46800020 */ cvt.s.w $f0, $f0 +/* 8A86BC 8024073C E460004C */ swc1 $f0, 0x4c($v1) +/* 8A86C0 80240740 44900000 */ mtc1 $s0, $f0 +/* 8A86C4 80240744 00000000 */ nop +/* 8A86C8 80240748 46800020 */ cvt.s.w $f0, $f0 +/* 8A86CC 8024074C E4600050 */ swc1 $f0, 0x50($v1) +/* 8A86D0 80240750 8FBF0020 */ lw $ra, 0x20($sp) +/* 8A86D4 80240754 8FB3001C */ lw $s3, 0x1c($sp) +/* 8A86D8 80240758 8FB20018 */ lw $s2, 0x18($sp) +/* 8A86DC 8024075C 8FB10014 */ lw $s1, 0x14($sp) +/* 8A86E0 80240760 8FB00010 */ lw $s0, 0x10($sp) +/* 8A86E4 80240764 24020002 */ addiu $v0, $zero, 2 +/* 8A86E8 80240768 03E00008 */ jr $ra +/* 8A86EC 8024076C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770.s b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770.s deleted file mode 100644 index 3c728e42dc..0000000000 --- a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240770 -/* 8A86F0 80240770 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8A86F4 80240774 AFBF0010 */ sw $ra, 0x10($sp) -/* 8A86F8 80240778 8C82000C */ lw $v0, 0xc($a0) -/* 8A86FC 8024077C 0C0B1EAF */ jal get_variable -/* 8A8700 80240780 8C450000 */ lw $a1, ($v0) -/* 8A8704 80240784 0C04417A */ jal get_entity_by_index -/* 8A8708 80240788 0040202D */ daddu $a0, $v0, $zero -/* 8A870C 8024078C 50400007 */ beql $v0, $zero, .L802407AC -/* 8A8710 80240790 0000102D */ daddu $v0, $zero, $zero -/* 8A8714 80240794 84440014 */ lh $a0, 0x14($v0) -/* 8A8718 80240798 3C050000 */ lui $a1, 0 -/* 8A871C 8024079C 24A501E4 */ addiu $a1, $a1, 0x1e4 -/* 8A8720 802407A0 0C048052 */ jal play_model_animation -/* 8A8724 802407A4 00000000 */ nop -/* 8A8728 802407A8 24020002 */ addiu $v0, $zero, 2 -.L802407AC: -/* 8A872C 802407AC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8A8730 802407B0 03E00008 */ jr $ra -/* 8A8734 802407B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8A8738 802407B8 00000000 */ nop -/* 8A873C 802407BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770_8A86F0.s b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770_8A86F0.s new file mode 100644 index 0000000000..fd2a77f672 --- /dev/null +++ b/asm/nonmatchings/world/area_tik/tik_25/8A8600/func_80240770_8A86F0.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240770_8A86F0 +/* 8A86F0 80240770 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 8A86F4 80240774 AFBF0010 */ sw $ra, 0x10($sp) +/* 8A86F8 80240778 8C82000C */ lw $v0, 0xc($a0) +/* 8A86FC 8024077C 0C0B1EAF */ jal get_variable +/* 8A8700 80240780 8C450000 */ lw $a1, ($v0) +/* 8A8704 80240784 0C04417A */ jal get_entity_by_index +/* 8A8708 80240788 0040202D */ daddu $a0, $v0, $zero +/* 8A870C 8024078C 50400007 */ beql $v0, $zero, .L802407AC +/* 8A8710 80240790 0000102D */ daddu $v0, $zero, $zero +/* 8A8714 80240794 84440014 */ lh $a0, 0x14($v0) +/* 8A8718 80240798 3C050000 */ lui $a1, 0 +/* 8A871C 8024079C 24A501E4 */ addiu $a1, $a1, 0x1e4 +/* 8A8720 802407A0 0C048052 */ jal play_model_animation +/* 8A8724 802407A4 00000000 */ nop +/* 8A8728 802407A8 24020002 */ addiu $v0, $zero, 2 +.L802407AC: +/* 8A872C 802407AC 8FBF0010 */ lw $ra, 0x10($sp) +/* 8A8730 802407B0 03E00008 */ jr $ra +/* 8A8734 802407B4 27BD0018 */ addiu $sp, $sp, 0x18 +/* 8A8738 802407B8 00000000 */ nop +/* 8A873C 802407BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C.s deleted file mode 100644 index b085ccfcf8..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024046C -/* 99CDFC 8024046C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 99CE00 80240470 AFB3001C */ sw $s3, 0x1c($sp) -/* 99CE04 80240474 0080982D */ daddu $s3, $a0, $zero -/* 99CE08 80240478 AFBF0020 */ sw $ra, 0x20($sp) -/* 99CE0C 8024047C AFB20018 */ sw $s2, 0x18($sp) -/* 99CE10 80240480 AFB10014 */ sw $s1, 0x14($sp) -/* 99CE14 80240484 AFB00010 */ sw $s0, 0x10($sp) -/* 99CE18 80240488 8E710148 */ lw $s1, 0x148($s3) -/* 99CE1C 8024048C 86240008 */ lh $a0, 8($s1) -/* 99CE20 80240490 0C00EABB */ jal get_npc_unsafe -/* 99CE24 80240494 00A0902D */ daddu $s2, $a1, $zero -/* 99CE28 80240498 0040802D */ daddu $s0, $v0, $zero -/* 99CE2C 8024049C 8602008E */ lh $v0, 0x8e($s0) -/* 99CE30 802404A0 9603008E */ lhu $v1, 0x8e($s0) -/* 99CE34 802404A4 18400005 */ blez $v0, .L802404BC -/* 99CE38 802404A8 2462FFFF */ addiu $v0, $v1, -1 -/* 99CE3C 802404AC A602008E */ sh $v0, 0x8e($s0) -/* 99CE40 802404B0 00021400 */ sll $v0, $v0, 0x10 -/* 99CE44 802404B4 1C400033 */ bgtz $v0, .L80240584 -/* 99CE48 802404B8 00000000 */ nop -.L802404BC: -/* 99CE4C 802404BC 8602008C */ lh $v0, 0x8c($s0) -/* 99CE50 802404C0 14400030 */ bnez $v0, .L80240584 -/* 99CE54 802404C4 00000000 */ nop -/* 99CE58 802404C8 8E2200CC */ lw $v0, 0xcc($s1) -/* 99CE5C 802404CC 8C420024 */ lw $v0, 0x24($v0) -/* 99CE60 802404D0 AE020028 */ sw $v0, 0x28($s0) -/* 99CE64 802404D4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 99CE68 802404D8 E6000018 */ swc1 $f0, 0x18($s0) -/* 99CE6C 802404DC 8E230088 */ lw $v1, 0x88($s1) -/* 99CE70 802404E0 24020005 */ addiu $v0, $zero, 5 -/* 99CE74 802404E4 10620005 */ beq $v1, $v0, .L802404FC -/* 99CE78 802404E8 00000000 */ nop -/* 99CE7C 802404EC 10600003 */ beqz $v1, .L802404FC -/* 99CE80 802404F0 24020001 */ addiu $v0, $zero, 1 -/* 99CE84 802404F4 14620006 */ bne $v1, $v0, .L80240510 -/* 99CE88 802404F8 00000000 */ nop -.L802404FC: -/* 99CE8C 802404FC 8E220084 */ lw $v0, 0x84($s1) -/* 99CE90 80240500 00021FC2 */ srl $v1, $v0, 0x1f -/* 99CE94 80240504 00431021 */ addu $v0, $v0, $v1 -/* 99CE98 80240508 00021043 */ sra $v0, $v0, 1 -/* 99CE9C 8024050C A60200A8 */ sh $v0, 0xa8($s0) -.L80240510: -/* 99CEA0 80240510 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 99CEA4 80240514 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 99CEA8 80240518 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99CEAC 8024051C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 99CEB0 80240520 8C460028 */ lw $a2, 0x28($v0) -/* 99CEB4 80240524 0C00A7B5 */ jal dist2D -/* 99CEB8 80240528 8C470030 */ lw $a3, 0x30($v0) -/* 99CEBC 8024052C C6020018 */ lwc1 $f2, 0x18($s0) -/* 99CEC0 80240530 46020003 */ div.s $f0, $f0, $f2 -/* 99CEC4 80240534 3C018024 */ lui $at, 0x8024 -/* 99CEC8 80240538 D4224440 */ ldc1 $f2, 0x4440($at) -/* 99CECC 8024053C 46000021 */ cvt.d.s $f0, $f0 -/* 99CED0 80240540 46220000 */ add.d $f0, $f0, $f2 -/* 99CED4 80240544 4620010D */ trunc.w.d $f4, $f0 -/* 99CED8 80240548 44022000 */ mfc1 $v0, $f4 -/* 99CEDC 8024054C 00000000 */ nop -/* 99CEE0 80240550 A602008E */ sh $v0, 0x8e($s0) -/* 99CEE4 80240554 00021400 */ sll $v0, $v0, 0x10 -/* 99CEE8 80240558 8E230078 */ lw $v1, 0x78($s1) -/* 99CEEC 8024055C 00021403 */ sra $v0, $v0, 0x10 -/* 99CEF0 80240560 0043102A */ slt $v0, $v0, $v1 -/* 99CEF4 80240564 10400003 */ beqz $v0, .L80240574 -/* 99CEF8 80240568 00000000 */ nop -/* 99CEFC 8024056C 9622007A */ lhu $v0, 0x7a($s1) -/* 99CF00 80240570 A602008E */ sh $v0, 0x8e($s0) -.L80240574: -/* 99CF04 80240574 8602008E */ lh $v0, 0x8e($s0) -/* 99CF08 80240578 AE22007C */ sw $v0, 0x7c($s1) -/* 99CF0C 8024057C 2402000E */ addiu $v0, $zero, 0xe -/* 99CF10 80240580 AE620070 */ sw $v0, 0x70($s3) -.L80240584: -/* 99CF14 80240584 8FBF0020 */ lw $ra, 0x20($sp) -/* 99CF18 80240588 8FB3001C */ lw $s3, 0x1c($sp) -/* 99CF1C 8024058C 8FB20018 */ lw $s2, 0x18($sp) -/* 99CF20 80240590 8FB10014 */ lw $s1, 0x14($sp) -/* 99CF24 80240594 8FB00010 */ lw $s0, 0x10($sp) -/* 99CF28 80240598 03E00008 */ jr $ra -/* 99CF2C 8024059C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s new file mode 100644 index 0000000000..9f432b184f --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_8024046C_99CDFC.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024046C_99CDFC +/* 99CDFC 8024046C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 99CE00 80240470 AFB3001C */ sw $s3, 0x1c($sp) +/* 99CE04 80240474 0080982D */ daddu $s3, $a0, $zero +/* 99CE08 80240478 AFBF0020 */ sw $ra, 0x20($sp) +/* 99CE0C 8024047C AFB20018 */ sw $s2, 0x18($sp) +/* 99CE10 80240480 AFB10014 */ sw $s1, 0x14($sp) +/* 99CE14 80240484 AFB00010 */ sw $s0, 0x10($sp) +/* 99CE18 80240488 8E710148 */ lw $s1, 0x148($s3) +/* 99CE1C 8024048C 86240008 */ lh $a0, 8($s1) +/* 99CE20 80240490 0C00EABB */ jal get_npc_unsafe +/* 99CE24 80240494 00A0902D */ daddu $s2, $a1, $zero +/* 99CE28 80240498 0040802D */ daddu $s0, $v0, $zero +/* 99CE2C 8024049C 8602008E */ lh $v0, 0x8e($s0) +/* 99CE30 802404A0 9603008E */ lhu $v1, 0x8e($s0) +/* 99CE34 802404A4 18400005 */ blez $v0, .L802404BC +/* 99CE38 802404A8 2462FFFF */ addiu $v0, $v1, -1 +/* 99CE3C 802404AC A602008E */ sh $v0, 0x8e($s0) +/* 99CE40 802404B0 00021400 */ sll $v0, $v0, 0x10 +/* 99CE44 802404B4 1C400033 */ bgtz $v0, .L80240584 +/* 99CE48 802404B8 00000000 */ nop +.L802404BC: +/* 99CE4C 802404BC 8602008C */ lh $v0, 0x8c($s0) +/* 99CE50 802404C0 14400030 */ bnez $v0, .L80240584 +/* 99CE54 802404C4 00000000 */ nop +/* 99CE58 802404C8 8E2200CC */ lw $v0, 0xcc($s1) +/* 99CE5C 802404CC 8C420024 */ lw $v0, 0x24($v0) +/* 99CE60 802404D0 AE020028 */ sw $v0, 0x28($s0) +/* 99CE64 802404D4 C6400018 */ lwc1 $f0, 0x18($s2) +/* 99CE68 802404D8 E6000018 */ swc1 $f0, 0x18($s0) +/* 99CE6C 802404DC 8E230088 */ lw $v1, 0x88($s1) +/* 99CE70 802404E0 24020005 */ addiu $v0, $zero, 5 +/* 99CE74 802404E4 10620005 */ beq $v1, $v0, .L802404FC +/* 99CE78 802404E8 00000000 */ nop +/* 99CE7C 802404EC 10600003 */ beqz $v1, .L802404FC +/* 99CE80 802404F0 24020001 */ addiu $v0, $zero, 1 +/* 99CE84 802404F4 14620006 */ bne $v1, $v0, .L80240510 +/* 99CE88 802404F8 00000000 */ nop +.L802404FC: +/* 99CE8C 802404FC 8E220084 */ lw $v0, 0x84($s1) +/* 99CE90 80240500 00021FC2 */ srl $v1, $v0, 0x1f +/* 99CE94 80240504 00431021 */ addu $v0, $v0, $v1 +/* 99CE98 80240508 00021043 */ sra $v0, $v0, 1 +/* 99CE9C 8024050C A60200A8 */ sh $v0, 0xa8($s0) +.L80240510: +/* 99CEA0 80240510 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 99CEA4 80240514 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 99CEA8 80240518 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 99CEAC 8024051C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 99CEB0 80240520 8C460028 */ lw $a2, 0x28($v0) +/* 99CEB4 80240524 0C00A7B5 */ jal dist2D +/* 99CEB8 80240528 8C470030 */ lw $a3, 0x30($v0) +/* 99CEBC 8024052C C6020018 */ lwc1 $f2, 0x18($s0) +/* 99CEC0 80240530 46020003 */ div.s $f0, $f0, $f2 +/* 99CEC4 80240534 3C018024 */ lui $at, 0x8024 +/* 99CEC8 80240538 D4224440 */ ldc1 $f2, 0x4440($at) +/* 99CECC 8024053C 46000021 */ cvt.d.s $f0, $f0 +/* 99CED0 80240540 46220000 */ add.d $f0, $f0, $f2 +/* 99CED4 80240544 4620010D */ trunc.w.d $f4, $f0 +/* 99CED8 80240548 44022000 */ mfc1 $v0, $f4 +/* 99CEDC 8024054C 00000000 */ nop +/* 99CEE0 80240550 A602008E */ sh $v0, 0x8e($s0) +/* 99CEE4 80240554 00021400 */ sll $v0, $v0, 0x10 +/* 99CEE8 80240558 8E230078 */ lw $v1, 0x78($s1) +/* 99CEEC 8024055C 00021403 */ sra $v0, $v0, 0x10 +/* 99CEF0 80240560 0043102A */ slt $v0, $v0, $v1 +/* 99CEF4 80240564 10400003 */ beqz $v0, .L80240574 +/* 99CEF8 80240568 00000000 */ nop +/* 99CEFC 8024056C 9622007A */ lhu $v0, 0x7a($s1) +/* 99CF00 80240570 A602008E */ sh $v0, 0x8e($s0) +.L80240574: +/* 99CF04 80240574 8602008E */ lh $v0, 0x8e($s0) +/* 99CF08 80240578 AE22007C */ sw $v0, 0x7c($s1) +/* 99CF0C 8024057C 2402000E */ addiu $v0, $zero, 0xe +/* 99CF10 80240580 AE620070 */ sw $v0, 0x70($s3) +.L80240584: +/* 99CF14 80240584 8FBF0020 */ lw $ra, 0x20($sp) +/* 99CF18 80240588 8FB3001C */ lw $s3, 0x1c($sp) +/* 99CF1C 8024058C 8FB20018 */ lw $s2, 0x18($sp) +/* 99CF20 80240590 8FB10014 */ lw $s1, 0x14($sp) +/* 99CF24 80240594 8FB00010 */ lw $s0, 0x10($sp) +/* 99CF28 80240598 03E00008 */ jr $ra +/* 99CF2C 8024059C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802405A0.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802405A0.s deleted file mode 100644 index aa5a2ea202..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802405A0.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405A0 -/* 99CF30 802405A0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 99CF34 802405A4 AFB3003C */ sw $s3, 0x3c($sp) -/* 99CF38 802405A8 0080982D */ daddu $s3, $a0, $zero -/* 99CF3C 802405AC AFBF0040 */ sw $ra, 0x40($sp) -/* 99CF40 802405B0 AFB20038 */ sw $s2, 0x38($sp) -/* 99CF44 802405B4 AFB10034 */ sw $s1, 0x34($sp) -/* 99CF48 802405B8 AFB00030 */ sw $s0, 0x30($sp) -/* 99CF4C 802405BC 8E710148 */ lw $s1, 0x148($s3) -/* 99CF50 802405C0 0C00EABB */ jal get_npc_unsafe -/* 99CF54 802405C4 86240008 */ lh $a0, 8($s1) -/* 99CF58 802405C8 0040802D */ daddu $s0, $v0, $zero -/* 99CF5C 802405CC 8E22007C */ lw $v0, 0x7c($s1) -/* 99CF60 802405D0 8603008E */ lh $v1, 0x8e($s0) -/* 99CF64 802405D4 2442FFFF */ addiu $v0, $v0, -1 -/* 99CF68 802405D8 14620012 */ bne $v1, $v0, .L80240624 -/* 99CF6C 802405DC 00000000 */ nop -/* 99CF70 802405E0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 99CF74 802405E4 4600020D */ trunc.w.s $f8, $f0 -/* 99CF78 802405E8 44024000 */ mfc1 $v0, $f8 -/* 99CF7C 802405EC 00000000 */ nop -/* 99CF80 802405F0 A6220010 */ sh $v0, 0x10($s1) -/* 99CF84 802405F4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 99CF88 802405F8 4600020D */ trunc.w.s $f8, $f0 -/* 99CF8C 802405FC 44024000 */ mfc1 $v0, $f8 -/* 99CF90 80240600 00000000 */ nop -/* 99CF94 80240604 A6220012 */ sh $v0, 0x12($s1) -/* 99CF98 80240608 C6000040 */ lwc1 $f0, 0x40($s0) -/* 99CF9C 8024060C 24020001 */ addiu $v0, $zero, 1 -/* 99CFA0 80240610 A2220007 */ sb $v0, 7($s1) -/* 99CFA4 80240614 4600020D */ trunc.w.s $f8, $f0 -/* 99CFA8 80240618 44024000 */ mfc1 $v0, $f8 -/* 99CFAC 8024061C 00000000 */ nop -/* 99CFB0 80240620 A6220014 */ sh $v0, 0x14($s1) -.L80240624: -/* 99CFB4 80240624 C6000038 */ lwc1 $f0, 0x38($s0) -/* 99CFB8 80240628 C602003C */ lwc1 $f2, 0x3c($s0) -/* 99CFBC 8024062C C6040040 */ lwc1 $f4, 0x40($s0) -/* 99CFC0 80240630 C6060018 */ lwc1 $f6, 0x18($s0) -/* 99CFC4 80240634 E7A00020 */ swc1 $f0, 0x20($sp) -/* 99CFC8 80240638 E7A20024 */ swc1 $f2, 0x24($sp) -/* 99CFCC 8024063C E7A40028 */ swc1 $f4, 0x28($sp) -/* 99CFD0 80240640 E7A60010 */ swc1 $f6, 0x10($sp) -/* 99CFD4 80240644 C600000C */ lwc1 $f0, 0xc($s0) -/* 99CFD8 80240648 E7A00014 */ swc1 $f0, 0x14($sp) -/* 99CFDC 8024064C 860200A8 */ lh $v0, 0xa8($s0) -/* 99CFE0 80240650 27A50020 */ addiu $a1, $sp, 0x20 -/* 99CFE4 80240654 44820000 */ mtc1 $v0, $f0 -/* 99CFE8 80240658 00000000 */ nop -/* 99CFEC 8024065C 46800020 */ cvt.s.w $f0, $f0 -/* 99CFF0 80240660 E7A00018 */ swc1 $f0, 0x18($sp) -/* 99CFF4 80240664 860200A6 */ lh $v0, 0xa6($s0) -/* 99CFF8 80240668 27A60024 */ addiu $a2, $sp, 0x24 -/* 99CFFC 8024066C 44820000 */ mtc1 $v0, $f0 -/* 99D000 80240670 00000000 */ nop -/* 99D004 80240674 46800020 */ cvt.s.w $f0, $f0 -/* 99D008 80240678 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 99D00C 8024067C 8E040080 */ lw $a0, 0x80($s0) -/* 99D010 80240680 0C037711 */ jal func_800DDC44 -/* 99D014 80240684 27A70028 */ addiu $a3, $sp, 0x28 -/* 99D018 80240688 0040902D */ daddu $s2, $v0, $zero -/* 99D01C 8024068C 16400005 */ bnez $s2, .L802406A4 -/* 99D020 80240690 00000000 */ nop -/* 99D024 80240694 8E050018 */ lw $a1, 0x18($s0) -/* 99D028 80240698 8E06000C */ lw $a2, 0xc($s0) -/* 99D02C 8024069C 0C00EA95 */ jal npc_move_heading -/* 99D030 802406A0 0200202D */ daddu $a0, $s0, $zero -.L802406A4: -/* 99D034 802406A4 8602008E */ lh $v0, 0x8e($s0) -/* 99D038 802406A8 9603008E */ lhu $v1, 0x8e($s0) -/* 99D03C 802406AC 18400007 */ blez $v0, .L802406CC -/* 99D040 802406B0 2462FFFF */ addiu $v0, $v1, -1 -/* 99D044 802406B4 A602008E */ sh $v0, 0x8e($s0) -/* 99D048 802406B8 00021400 */ sll $v0, $v0, 0x10 -/* 99D04C 802406BC 18400003 */ blez $v0, .L802406CC -/* 99D050 802406C0 00000000 */ nop -/* 99D054 802406C4 12400008 */ beqz $s2, .L802406E8 -/* 99D058 802406C8 00000000 */ nop -.L802406CC: -/* 99D05C 802406CC 8E2200CC */ lw $v0, 0xcc($s1) -/* 99D060 802406D0 A2200007 */ sb $zero, 7($s1) -/* 99D064 802406D4 8C420028 */ lw $v0, 0x28($v0) -/* 99D068 802406D8 A600008E */ sh $zero, 0x8e($s0) -/* 99D06C 802406DC AE020028 */ sw $v0, 0x28($s0) -/* 99D070 802406E0 2402000F */ addiu $v0, $zero, 0xf -/* 99D074 802406E4 AE620070 */ sw $v0, 0x70($s3) -.L802406E8: -/* 99D078 802406E8 8FBF0040 */ lw $ra, 0x40($sp) -/* 99D07C 802406EC 8FB3003C */ lw $s3, 0x3c($sp) -/* 99D080 802406F0 8FB20038 */ lw $s2, 0x38($sp) -/* 99D084 802406F4 8FB10034 */ lw $s1, 0x34($sp) -/* 99D088 802406F8 8FB00030 */ lw $s0, 0x30($sp) -/* 99D08C 802406FC 03E00008 */ jr $ra -/* 99D090 80240700 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802405A0_99CF30.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802405A0_99CF30.s new file mode 100644 index 0000000000..c7c5059b75 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802405A0_99CF30.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405A0_99CF30 +/* 99CF30 802405A0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 99CF34 802405A4 AFB3003C */ sw $s3, 0x3c($sp) +/* 99CF38 802405A8 0080982D */ daddu $s3, $a0, $zero +/* 99CF3C 802405AC AFBF0040 */ sw $ra, 0x40($sp) +/* 99CF40 802405B0 AFB20038 */ sw $s2, 0x38($sp) +/* 99CF44 802405B4 AFB10034 */ sw $s1, 0x34($sp) +/* 99CF48 802405B8 AFB00030 */ sw $s0, 0x30($sp) +/* 99CF4C 802405BC 8E710148 */ lw $s1, 0x148($s3) +/* 99CF50 802405C0 0C00EABB */ jal get_npc_unsafe +/* 99CF54 802405C4 86240008 */ lh $a0, 8($s1) +/* 99CF58 802405C8 0040802D */ daddu $s0, $v0, $zero +/* 99CF5C 802405CC 8E22007C */ lw $v0, 0x7c($s1) +/* 99CF60 802405D0 8603008E */ lh $v1, 0x8e($s0) +/* 99CF64 802405D4 2442FFFF */ addiu $v0, $v0, -1 +/* 99CF68 802405D8 14620012 */ bne $v1, $v0, .L80240624 +/* 99CF6C 802405DC 00000000 */ nop +/* 99CF70 802405E0 C6000038 */ lwc1 $f0, 0x38($s0) +/* 99CF74 802405E4 4600020D */ trunc.w.s $f8, $f0 +/* 99CF78 802405E8 44024000 */ mfc1 $v0, $f8 +/* 99CF7C 802405EC 00000000 */ nop +/* 99CF80 802405F0 A6220010 */ sh $v0, 0x10($s1) +/* 99CF84 802405F4 C600003C */ lwc1 $f0, 0x3c($s0) +/* 99CF88 802405F8 4600020D */ trunc.w.s $f8, $f0 +/* 99CF8C 802405FC 44024000 */ mfc1 $v0, $f8 +/* 99CF90 80240600 00000000 */ nop +/* 99CF94 80240604 A6220012 */ sh $v0, 0x12($s1) +/* 99CF98 80240608 C6000040 */ lwc1 $f0, 0x40($s0) +/* 99CF9C 8024060C 24020001 */ addiu $v0, $zero, 1 +/* 99CFA0 80240610 A2220007 */ sb $v0, 7($s1) +/* 99CFA4 80240614 4600020D */ trunc.w.s $f8, $f0 +/* 99CFA8 80240618 44024000 */ mfc1 $v0, $f8 +/* 99CFAC 8024061C 00000000 */ nop +/* 99CFB0 80240620 A6220014 */ sh $v0, 0x14($s1) +.L80240624: +/* 99CFB4 80240624 C6000038 */ lwc1 $f0, 0x38($s0) +/* 99CFB8 80240628 C602003C */ lwc1 $f2, 0x3c($s0) +/* 99CFBC 8024062C C6040040 */ lwc1 $f4, 0x40($s0) +/* 99CFC0 80240630 C6060018 */ lwc1 $f6, 0x18($s0) +/* 99CFC4 80240634 E7A00020 */ swc1 $f0, 0x20($sp) +/* 99CFC8 80240638 E7A20024 */ swc1 $f2, 0x24($sp) +/* 99CFCC 8024063C E7A40028 */ swc1 $f4, 0x28($sp) +/* 99CFD0 80240640 E7A60010 */ swc1 $f6, 0x10($sp) +/* 99CFD4 80240644 C600000C */ lwc1 $f0, 0xc($s0) +/* 99CFD8 80240648 E7A00014 */ swc1 $f0, 0x14($sp) +/* 99CFDC 8024064C 860200A8 */ lh $v0, 0xa8($s0) +/* 99CFE0 80240650 27A50020 */ addiu $a1, $sp, 0x20 +/* 99CFE4 80240654 44820000 */ mtc1 $v0, $f0 +/* 99CFE8 80240658 00000000 */ nop +/* 99CFEC 8024065C 46800020 */ cvt.s.w $f0, $f0 +/* 99CFF0 80240660 E7A00018 */ swc1 $f0, 0x18($sp) +/* 99CFF4 80240664 860200A6 */ lh $v0, 0xa6($s0) +/* 99CFF8 80240668 27A60024 */ addiu $a2, $sp, 0x24 +/* 99CFFC 8024066C 44820000 */ mtc1 $v0, $f0 +/* 99D000 80240670 00000000 */ nop +/* 99D004 80240674 46800020 */ cvt.s.w $f0, $f0 +/* 99D008 80240678 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 99D00C 8024067C 8E040080 */ lw $a0, 0x80($s0) +/* 99D010 80240680 0C037711 */ jal func_800DDC44 +/* 99D014 80240684 27A70028 */ addiu $a3, $sp, 0x28 +/* 99D018 80240688 0040902D */ daddu $s2, $v0, $zero +/* 99D01C 8024068C 16400005 */ bnez $s2, .L802406A4 +/* 99D020 80240690 00000000 */ nop +/* 99D024 80240694 8E050018 */ lw $a1, 0x18($s0) +/* 99D028 80240698 8E06000C */ lw $a2, 0xc($s0) +/* 99D02C 8024069C 0C00EA95 */ jal npc_move_heading +/* 99D030 802406A0 0200202D */ daddu $a0, $s0, $zero +.L802406A4: +/* 99D034 802406A4 8602008E */ lh $v0, 0x8e($s0) +/* 99D038 802406A8 9603008E */ lhu $v1, 0x8e($s0) +/* 99D03C 802406AC 18400007 */ blez $v0, .L802406CC +/* 99D040 802406B0 2462FFFF */ addiu $v0, $v1, -1 +/* 99D044 802406B4 A602008E */ sh $v0, 0x8e($s0) +/* 99D048 802406B8 00021400 */ sll $v0, $v0, 0x10 +/* 99D04C 802406BC 18400003 */ blez $v0, .L802406CC +/* 99D050 802406C0 00000000 */ nop +/* 99D054 802406C4 12400008 */ beqz $s2, .L802406E8 +/* 99D058 802406C8 00000000 */ nop +.L802406CC: +/* 99D05C 802406CC 8E2200CC */ lw $v0, 0xcc($s1) +/* 99D060 802406D0 A2200007 */ sb $zero, 7($s1) +/* 99D064 802406D4 8C420028 */ lw $v0, 0x28($v0) +/* 99D068 802406D8 A600008E */ sh $zero, 0x8e($s0) +/* 99D06C 802406DC AE020028 */ sw $v0, 0x28($s0) +/* 99D070 802406E0 2402000F */ addiu $v0, $zero, 0xf +/* 99D074 802406E4 AE620070 */ sw $v0, 0x70($s3) +.L802406E8: +/* 99D078 802406E8 8FBF0040 */ lw $ra, 0x40($sp) +/* 99D07C 802406EC 8FB3003C */ lw $s3, 0x3c($sp) +/* 99D080 802406F0 8FB20038 */ lw $s2, 0x38($sp) +/* 99D084 802406F4 8FB10034 */ lw $s1, 0x34($sp) +/* 99D088 802406F8 8FB00030 */ lw $s0, 0x30($sp) +/* 99D08C 802406FC 03E00008 */ jr $ra +/* 99D090 80240700 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240704.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240704.s deleted file mode 100644 index 18a2337e41..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240704.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240704 -/* 99D094 80240704 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99D098 80240708 AFB10014 */ sw $s1, 0x14($sp) -/* 99D09C 8024070C 0080882D */ daddu $s1, $a0, $zero -/* 99D0A0 80240710 AFBF0018 */ sw $ra, 0x18($sp) -/* 99D0A4 80240714 AFB00010 */ sw $s0, 0x10($sp) -/* 99D0A8 80240718 8E300148 */ lw $s0, 0x148($s1) -/* 99D0AC 8024071C 0C00EABB */ jal get_npc_unsafe -/* 99D0B0 80240720 86040008 */ lh $a0, 8($s0) -/* 99D0B4 80240724 0040202D */ daddu $a0, $v0, $zero -/* 99D0B8 80240728 9482008E */ lhu $v0, 0x8e($a0) -/* 99D0BC 8024072C 24030003 */ addiu $v1, $zero, 3 -/* 99D0C0 80240730 24420001 */ addiu $v0, $v0, 1 -/* 99D0C4 80240734 A482008E */ sh $v0, 0x8e($a0) -/* 99D0C8 80240738 00021400 */ sll $v0, $v0, 0x10 -/* 99D0CC 8024073C 00021403 */ sra $v0, $v0, 0x10 -/* 99D0D0 80240740 14430003 */ bne $v0, $v1, .L80240750 -/* 99D0D4 80240744 00000000 */ nop -/* 99D0D8 80240748 96020086 */ lhu $v0, 0x86($s0) -/* 99D0DC 8024074C A48200A8 */ sh $v0, 0xa8($a0) -.L80240750: -/* 99D0E0 80240750 8482008E */ lh $v0, 0x8e($a0) -/* 99D0E4 80240754 8E030080 */ lw $v1, 0x80($s0) -/* 99D0E8 80240758 0043102A */ slt $v0, $v0, $v1 -/* 99D0EC 8024075C 14400004 */ bnez $v0, .L80240770 -/* 99D0F0 80240760 00000000 */ nop -/* 99D0F4 80240764 96020086 */ lhu $v0, 0x86($s0) -/* 99D0F8 80240768 A48200A8 */ sh $v0, 0xa8($a0) -/* 99D0FC 8024076C AE200070 */ sw $zero, 0x70($s1) -.L80240770: -/* 99D100 80240770 8FBF0018 */ lw $ra, 0x18($sp) -/* 99D104 80240774 8FB10014 */ lw $s1, 0x14($sp) -/* 99D108 80240778 8FB00010 */ lw $s0, 0x10($sp) -/* 99D10C 8024077C 03E00008 */ jr $ra -/* 99D110 80240780 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240704_99D094.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240704_99D094.s new file mode 100644 index 0000000000..e2acad3053 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240704_99D094.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240704_99D094 +/* 99D094 80240704 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 99D098 80240708 AFB10014 */ sw $s1, 0x14($sp) +/* 99D09C 8024070C 0080882D */ daddu $s1, $a0, $zero +/* 99D0A0 80240710 AFBF0018 */ sw $ra, 0x18($sp) +/* 99D0A4 80240714 AFB00010 */ sw $s0, 0x10($sp) +/* 99D0A8 80240718 8E300148 */ lw $s0, 0x148($s1) +/* 99D0AC 8024071C 0C00EABB */ jal get_npc_unsafe +/* 99D0B0 80240720 86040008 */ lh $a0, 8($s0) +/* 99D0B4 80240724 0040202D */ daddu $a0, $v0, $zero +/* 99D0B8 80240728 9482008E */ lhu $v0, 0x8e($a0) +/* 99D0BC 8024072C 24030003 */ addiu $v1, $zero, 3 +/* 99D0C0 80240730 24420001 */ addiu $v0, $v0, 1 +/* 99D0C4 80240734 A482008E */ sh $v0, 0x8e($a0) +/* 99D0C8 80240738 00021400 */ sll $v0, $v0, 0x10 +/* 99D0CC 8024073C 00021403 */ sra $v0, $v0, 0x10 +/* 99D0D0 80240740 14430003 */ bne $v0, $v1, .L80240750 +/* 99D0D4 80240744 00000000 */ nop +/* 99D0D8 80240748 96020086 */ lhu $v0, 0x86($s0) +/* 99D0DC 8024074C A48200A8 */ sh $v0, 0xa8($a0) +.L80240750: +/* 99D0E0 80240750 8482008E */ lh $v0, 0x8e($a0) +/* 99D0E4 80240754 8E030080 */ lw $v1, 0x80($s0) +/* 99D0E8 80240758 0043102A */ slt $v0, $v0, $v1 +/* 99D0EC 8024075C 14400004 */ bnez $v0, .L80240770 +/* 99D0F0 80240760 00000000 */ nop +/* 99D0F4 80240764 96020086 */ lhu $v0, 0x86($s0) +/* 99D0F8 80240768 A48200A8 */ sh $v0, 0xa8($a0) +/* 99D0FC 8024076C AE200070 */ sw $zero, 0x70($s1) +.L80240770: +/* 99D100 80240770 8FBF0018 */ lw $ra, 0x18($sp) +/* 99D104 80240774 8FB10014 */ lw $s1, 0x14($sp) +/* 99D108 80240778 8FB00010 */ lw $s0, 0x10($sp) +/* 99D10C 8024077C 03E00008 */ jr $ra +/* 99D110 80240780 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784.s deleted file mode 100644 index 6a1933c885..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240784 -/* 99D114 80240784 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 99D118 80240788 AFB3005C */ sw $s3, 0x5c($sp) -/* 99D11C 8024078C 0080982D */ daddu $s3, $a0, $zero -/* 99D120 80240790 AFBF0068 */ sw $ra, 0x68($sp) -/* 99D124 80240794 AFB50064 */ sw $s5, 0x64($sp) -/* 99D128 80240798 AFB40060 */ sw $s4, 0x60($sp) -/* 99D12C 8024079C AFB20058 */ sw $s2, 0x58($sp) -/* 99D130 802407A0 AFB10054 */ sw $s1, 0x54($sp) -/* 99D134 802407A4 AFB00050 */ sw $s0, 0x50($sp) -/* 99D138 802407A8 8E710148 */ lw $s1, 0x148($s3) -/* 99D13C 802407AC 86240008 */ lh $a0, 8($s1) -/* 99D140 802407B0 0C00EABB */ jal get_npc_unsafe -/* 99D144 802407B4 00A0802D */ daddu $s0, $a1, $zero -/* 99D148 802407B8 8E63000C */ lw $v1, 0xc($s3) -/* 99D14C 802407BC 0260202D */ daddu $a0, $s3, $zero -/* 99D150 802407C0 8C650000 */ lw $a1, ($v1) -/* 99D154 802407C4 0C0B1EAF */ jal get_variable -/* 99D158 802407C8 0040902D */ daddu $s2, $v0, $zero -/* 99D15C 802407CC AFA00028 */ sw $zero, 0x28($sp) -/* 99D160 802407D0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D164 802407D4 8C630030 */ lw $v1, 0x30($v1) -/* 99D168 802407D8 AFA3002C */ sw $v1, 0x2c($sp) -/* 99D16C 802407DC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D170 802407E0 8C63001C */ lw $v1, 0x1c($v1) -/* 99D174 802407E4 AFA30030 */ sw $v1, 0x30($sp) -/* 99D178 802407E8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D17C 802407EC 8C630024 */ lw $v1, 0x24($v1) -/* 99D180 802407F0 AFA30034 */ sw $v1, 0x34($sp) -/* 99D184 802407F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D188 802407F8 8C630028 */ lw $v1, 0x28($v1) -/* 99D18C 802407FC 27B50028 */ addiu $s5, $sp, 0x28 -/* 99D190 80240800 AFA30038 */ sw $v1, 0x38($sp) -/* 99D194 80240804 8E2300D0 */ lw $v1, 0xd0($s1) -/* 99D198 80240808 3C0142C8 */ lui $at, 0x42c8 -/* 99D19C 8024080C 44810000 */ mtc1 $at, $f0 -/* 99D1A0 80240810 8C63002C */ lw $v1, 0x2c($v1) -/* 99D1A4 80240814 0040A02D */ daddu $s4, $v0, $zero -/* 99D1A8 80240818 E7A00040 */ swc1 $f0, 0x40($sp) -/* 99D1AC 8024081C A7A00044 */ sh $zero, 0x44($sp) -/* 99D1B0 80240820 12000009 */ beqz $s0, .L80240848 -/* 99D1B4 80240824 AFA3003C */ sw $v1, 0x3c($sp) -/* 99D1B8 80240828 864300A8 */ lh $v1, 0xa8($s2) -/* 99D1BC 8024082C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 99D1C0 80240830 AE20008C */ sw $zero, 0x8c($s1) -/* 99D1C4 80240834 A22000B5 */ sb $zero, 0xb5($s1) -/* 99D1C8 80240838 34420008 */ ori $v0, $v0, 8 -/* 99D1CC 8024083C AE230084 */ sw $v1, 0x84($s1) -/* 99D1D0 80240840 08090216 */ j .L80240858 -/* 99D1D4 80240844 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240848: -/* 99D1D8 80240848 8E2200B0 */ lw $v0, 0xb0($s1) -/* 99D1DC 8024084C 30420004 */ andi $v0, $v0, 4 -/* 99D1E0 80240850 10400047 */ beqz $v0, .L80240970 -/* 99D1E4 80240854 00000000 */ nop -.L80240858: -/* 99D1E8 80240858 AE600070 */ sw $zero, 0x70($s3) -/* 99D1EC 8024085C A640008E */ sh $zero, 0x8e($s2) -/* 99D1F0 80240860 8E2300CC */ lw $v1, 0xcc($s1) -/* 99D1F4 80240864 2404F7FF */ addiu $a0, $zero, -0x801 -/* 99D1F8 80240868 A2200007 */ sb $zero, 7($s1) -/* 99D1FC 8024086C 8E420000 */ lw $v0, ($s2) -/* 99D200 80240870 8C630000 */ lw $v1, ($v1) -/* 99D204 80240874 00441024 */ and $v0, $v0, $a0 -/* 99D208 80240878 AE420000 */ sw $v0, ($s2) -/* 99D20C 8024087C AE430028 */ sw $v1, 0x28($s2) -/* 99D210 80240880 96220086 */ lhu $v0, 0x86($s1) -/* 99D214 80240884 A64200A8 */ sh $v0, 0xa8($s2) -/* 99D218 80240888 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99D21C 8024088C AE200090 */ sw $zero, 0x90($s1) -/* 99D220 80240890 8C420034 */ lw $v0, 0x34($v0) -/* 99D224 80240894 14400006 */ bnez $v0, .L802408B0 -/* 99D228 80240898 2403FDFF */ addiu $v1, $zero, -0x201 -/* 99D22C 8024089C 8E420000 */ lw $v0, ($s2) -/* 99D230 802408A0 2403FFF7 */ addiu $v1, $zero, -9 -/* 99D234 802408A4 34420200 */ ori $v0, $v0, 0x200 -/* 99D238 802408A8 0809022F */ j .L802408BC -/* 99D23C 802408AC 00431024 */ and $v0, $v0, $v1 -.L802408B0: -/* 99D240 802408B0 8E420000 */ lw $v0, ($s2) -/* 99D244 802408B4 00431024 */ and $v0, $v0, $v1 -/* 99D248 802408B8 34420008 */ ori $v0, $v0, 8 -.L802408BC: -/* 99D24C 802408BC AE420000 */ sw $v0, ($s2) -/* 99D250 802408C0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 99D254 802408C4 30420004 */ andi $v0, $v0, 4 -/* 99D258 802408C8 1040001E */ beqz $v0, .L80240944 -/* 99D25C 802408CC 24040002 */ addiu $a0, $zero, 2 -/* 99D260 802408D0 0240282D */ daddu $a1, $s2, $zero -/* 99D264 802408D4 0000302D */ daddu $a2, $zero, $zero -/* 99D268 802408D8 24020063 */ addiu $v0, $zero, 0x63 -/* 99D26C 802408DC AE620070 */ sw $v0, 0x70($s3) -/* 99D270 802408E0 AE600074 */ sw $zero, 0x74($s3) -/* 99D274 802408E4 864300A8 */ lh $v1, 0xa8($s2) -/* 99D278 802408E8 3C013F80 */ lui $at, 0x3f80 -/* 99D27C 802408EC 44810000 */ mtc1 $at, $f0 -/* 99D280 802408F0 3C014000 */ lui $at, 0x4000 -/* 99D284 802408F4 44811000 */ mtc1 $at, $f2 -/* 99D288 802408F8 3C01C1A0 */ lui $at, 0xc1a0 -/* 99D28C 802408FC 44812000 */ mtc1 $at, $f4 -/* 99D290 80240900 24020028 */ addiu $v0, $zero, 0x28 -/* 99D294 80240904 AFA2001C */ sw $v0, 0x1c($sp) -/* 99D298 80240908 44833000 */ mtc1 $v1, $f6 -/* 99D29C 8024090C 00000000 */ nop -/* 99D2A0 80240910 468031A0 */ cvt.s.w $f6, $f6 -/* 99D2A4 80240914 44073000 */ mfc1 $a3, $f6 -/* 99D2A8 80240918 27A20048 */ addiu $v0, $sp, 0x48 -/* 99D2AC 8024091C AFA20020 */ sw $v0, 0x20($sp) -/* 99D2B0 80240920 E7A00010 */ swc1 $f0, 0x10($sp) -/* 99D2B4 80240924 E7A20014 */ swc1 $f2, 0x14($sp) -/* 99D2B8 80240928 0C01BFA4 */ jal fx_emote -/* 99D2BC 8024092C E7A40018 */ swc1 $f4, 0x18($sp) -/* 99D2C0 80240930 8E2200B0 */ lw $v0, 0xb0($s1) -/* 99D2C4 80240934 2403FFFB */ addiu $v1, $zero, -5 -/* 99D2C8 80240938 00431024 */ and $v0, $v0, $v1 -/* 99D2CC 8024093C 0809025C */ j .L80240970 -/* 99D2D0 80240940 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240944: -/* 99D2D4 80240944 8E220000 */ lw $v0, ($s1) -/* 99D2D8 80240948 3C034000 */ lui $v1, 0x4000 -/* 99D2DC 8024094C 00431024 */ and $v0, $v0, $v1 -/* 99D2E0 80240950 10400007 */ beqz $v0, .L80240970 -/* 99D2E4 80240954 3C03BFFF */ lui $v1, 0xbfff -/* 99D2E8 80240958 2402000C */ addiu $v0, $zero, 0xc -/* 99D2EC 8024095C AE620070 */ sw $v0, 0x70($s3) -/* 99D2F0 80240960 8E220000 */ lw $v0, ($s1) -/* 99D2F4 80240964 3463FFFF */ ori $v1, $v1, 0xffff -/* 99D2F8 80240968 00431024 */ and $v0, $v0, $v1 -/* 99D2FC 8024096C AE220000 */ sw $v0, ($s1) -.L80240970: -/* 99D300 80240970 8E220090 */ lw $v0, 0x90($s1) -/* 99D304 80240974 1840000C */ blez $v0, .L802409A8 -/* 99D308 80240978 2442FFFF */ addiu $v0, $v0, -1 -/* 99D30C 8024097C 14400087 */ bnez $v0, .L80240B9C -/* 99D310 80240980 AE220090 */ sw $v0, 0x90($s1) -/* 99D314 80240984 3C03FFAA */ lui $v1, 0xffaa -/* 99D318 80240988 8E420028 */ lw $v0, 0x28($s2) -/* 99D31C 8024098C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 99D320 80240990 00431021 */ addu $v0, $v0, $v1 -/* 99D324 80240994 2C420002 */ sltiu $v0, $v0, 2 -/* 99D328 80240998 10400003 */ beqz $v0, .L802409A8 -/* 99D32C 8024099C 3C020055 */ lui $v0, 0x55 -/* 99D330 802409A0 3442000C */ ori $v0, $v0, 0xc -/* 99D334 802409A4 AE420028 */ sw $v0, 0x28($s2) -.L802409A8: -/* 99D338 802409A8 8E630070 */ lw $v1, 0x70($s3) -/* 99D33C 802409AC 2402000C */ addiu $v0, $zero, 0xc -/* 99D340 802409B0 10620048 */ beq $v1, $v0, .L80240AD4 -/* 99D344 802409B4 2862000D */ slti $v0, $v1, 0xd -/* 99D348 802409B8 1040000F */ beqz $v0, .L802409F8 -/* 99D34C 802409BC 24100001 */ addiu $s0, $zero, 1 -/* 99D350 802409C0 1070001E */ beq $v1, $s0, .L80240A3C -/* 99D354 802409C4 28620002 */ slti $v0, $v1, 2 -/* 99D358 802409C8 10400005 */ beqz $v0, .L802409E0 -/* 99D35C 802409CC 24020002 */ addiu $v0, $zero, 2 -/* 99D360 802409D0 10600015 */ beqz $v1, .L80240A28 -/* 99D364 802409D4 0260202D */ daddu $a0, $s3, $zero -/* 99D368 802409D8 080902CC */ j .L80240B30 -/* 99D36C 802409DC 00000000 */ nop -.L802409E0: -/* 99D370 802409E0 1062001C */ beq $v1, $v0, .L80240A54 -/* 99D374 802409E4 24020003 */ addiu $v0, $zero, 3 -/* 99D378 802409E8 10620035 */ beq $v1, $v0, .L80240AC0 -/* 99D37C 802409EC 0260202D */ daddu $a0, $s3, $zero -/* 99D380 802409F0 080902CC */ j .L80240B30 -/* 99D384 802409F4 00000000 */ nop -.L802409F8: -/* 99D388 802409F8 2402000E */ addiu $v0, $zero, 0xe -/* 99D38C 802409FC 1062003F */ beq $v1, $v0, .L80240AFC -/* 99D390 80240A00 0062102A */ slt $v0, $v1, $v0 -/* 99D394 80240A04 14400038 */ bnez $v0, .L80240AE8 -/* 99D398 80240A08 0260202D */ daddu $a0, $s3, $zero -/* 99D39C 80240A0C 2402000F */ addiu $v0, $zero, 0xf -/* 99D3A0 80240A10 10620040 */ beq $v1, $v0, .L80240B14 -/* 99D3A4 80240A14 24020063 */ addiu $v0, $zero, 0x63 -/* 99D3A8 80240A18 10620043 */ beq $v1, $v0, .L80240B28 -/* 99D3AC 80240A1C 00000000 */ nop -/* 99D3B0 80240A20 080902CC */ j .L80240B30 -/* 99D3B4 80240A24 00000000 */ nop -.L80240A28: -/* 99D3B8 80240A28 0280282D */ daddu $a1, $s4, $zero -/* 99D3BC 80240A2C 0C012568 */ jal func_800495A0 -/* 99D3C0 80240A30 02A0302D */ daddu $a2, $s5, $zero -/* 99D3C4 80240A34 96220086 */ lhu $v0, 0x86($s1) -/* 99D3C8 80240A38 A64200A8 */ sh $v0, 0xa8($s2) -.L80240A3C: -/* 99D3CC 80240A3C 0260202D */ daddu $a0, $s3, $zero -/* 99D3D0 80240A40 0280282D */ daddu $a1, $s4, $zero -/* 99D3D4 80240A44 0C0125AE */ jal func_800496B8 -/* 99D3D8 80240A48 02A0302D */ daddu $a2, $s5, $zero -/* 99D3DC 80240A4C 080902CC */ j .L80240B30 -/* 99D3E0 80240A50 00000000 */ nop -.L80240A54: -/* 99D3E4 80240A54 0260202D */ daddu $a0, $s3, $zero -/* 99D3E8 80240A58 0280282D */ daddu $a1, $s4, $zero -/* 99D3EC 80240A5C 0C0126D1 */ jal func_80049B44 -/* 99D3F0 80240A60 02A0302D */ daddu $a2, $s5, $zero -/* 99D3F4 80240A64 8E230088 */ lw $v1, 0x88($s1) -/* 99D3F8 80240A68 24020006 */ addiu $v0, $zero, 6 -/* 99D3FC 80240A6C 14620014 */ bne $v1, $v0, .L80240AC0 -/* 99D400 80240A70 0260202D */ daddu $a0, $s3, $zero -/* 99D404 80240A74 0C00A67F */ jal rand_int -/* 99D408 80240A78 24040064 */ addiu $a0, $zero, 0x64 -/* 99D40C 80240A7C 28420021 */ slti $v0, $v0, 0x21 -/* 99D410 80240A80 5040000F */ beql $v0, $zero, .L80240AC0 -/* 99D414 80240A84 0260202D */ daddu $a0, $s3, $zero -/* 99D418 80240A88 8E22008C */ lw $v0, 0x8c($s1) -/* 99D41C 80240A8C 10400005 */ beqz $v0, .L80240AA4 -/* 99D420 80240A90 3C020055 */ lui $v0, 0x55 -/* 99D424 80240A94 3442002F */ ori $v0, $v0, 0x2f -/* 99D428 80240A98 AE20008C */ sw $zero, 0x8c($s1) -/* 99D42C 80240A9C 080902AC */ j .L80240AB0 -/* 99D430 80240AA0 A22000B5 */ sb $zero, 0xb5($s1) -.L80240AA4: -/* 99D434 80240AA4 3442002E */ ori $v0, $v0, 0x2e -/* 99D438 80240AA8 AE30008C */ sw $s0, 0x8c($s1) -/* 99D43C 80240AAC A23000B5 */ sb $s0, 0xb5($s1) -.L80240AB0: -/* 99D440 80240AB0 AE420028 */ sw $v0, 0x28($s2) -/* 99D444 80240AB4 24020007 */ addiu $v0, $zero, 7 -/* 99D448 80240AB8 080902E7 */ j .L80240B9C -/* 99D44C 80240ABC AE220090 */ sw $v0, 0x90($s1) -.L80240AC0: -/* 99D450 80240AC0 0280282D */ daddu $a1, $s4, $zero -/* 99D454 80240AC4 0C012701 */ jal func_80049C04 -/* 99D458 80240AC8 02A0302D */ daddu $a2, $s5, $zero -/* 99D45C 80240ACC 080902CC */ j .L80240B30 -/* 99D460 80240AD0 00000000 */ nop -.L80240AD4: -/* 99D464 80240AD4 0260202D */ daddu $a0, $s3, $zero -/* 99D468 80240AD8 0280282D */ daddu $a1, $s4, $zero -/* 99D46C 80240ADC 0C0900FC */ jal func_802403F0 -/* 99D470 80240AE0 02A0302D */ daddu $a2, $s5, $zero -/* 99D474 80240AE4 0260202D */ daddu $a0, $s3, $zero -.L80240AE8: -/* 99D478 80240AE8 0280282D */ daddu $a1, $s4, $zero -/* 99D47C 80240AEC 0C09011B */ jal func_8024046C -/* 99D480 80240AF0 02A0302D */ daddu $a2, $s5, $zero -/* 99D484 80240AF4 080902CC */ j .L80240B30 -/* 99D488 80240AF8 00000000 */ nop -.L80240AFC: -/* 99D48C 80240AFC 0260202D */ daddu $a0, $s3, $zero -/* 99D490 80240B00 0280282D */ daddu $a1, $s4, $zero -/* 99D494 80240B04 0C090168 */ jal func_802405A0 -/* 99D498 80240B08 02A0302D */ daddu $a2, $s5, $zero -/* 99D49C 80240B0C 080902CC */ j .L80240B30 -/* 99D4A0 80240B10 00000000 */ nop -.L80240B14: -/* 99D4A4 80240B14 0280282D */ daddu $a1, $s4, $zero -/* 99D4A8 80240B18 0C0901C1 */ jal func_80240704 -/* 99D4AC 80240B1C 02A0302D */ daddu $a2, $s5, $zero -/* 99D4B0 80240B20 080902CC */ j .L80240B30 -/* 99D4B4 80240B24 00000000 */ nop -.L80240B28: -/* 99D4B8 80240B28 0C0129CF */ jal func_8004A73C -/* 99D4BC 80240B2C 0260202D */ daddu $a0, $s3, $zero -.L80240B30: -/* 99D4C0 80240B30 8E230088 */ lw $v1, 0x88($s1) -/* 99D4C4 80240B34 24020006 */ addiu $v0, $zero, 6 -/* 99D4C8 80240B38 14620019 */ bne $v1, $v0, .L80240BA0 -/* 99D4CC 80240B3C 0000102D */ daddu $v0, $zero, $zero -/* 99D4D0 80240B40 8E22008C */ lw $v0, 0x8c($s1) -/* 99D4D4 80240B44 10400003 */ beqz $v0, .L80240B54 -/* 99D4D8 80240B48 24020001 */ addiu $v0, $zero, 1 -/* 99D4DC 80240B4C 080902D6 */ j .L80240B58 -/* 99D4E0 80240B50 A22200B5 */ sb $v0, 0xb5($s1) -.L80240B54: -/* 99D4E4 80240B54 A22000B5 */ sb $zero, 0xb5($s1) -.L80240B58: -/* 99D4E8 80240B58 8E22008C */ lw $v0, 0x8c($s1) -/* 99D4EC 80240B5C 1040000F */ beqz $v0, .L80240B9C -/* 99D4F0 80240B60 3C03FFAA */ lui $v1, 0xffaa -/* 99D4F4 80240B64 8E420028 */ lw $v0, 0x28($s2) -/* 99D4F8 80240B68 3463FFFC */ ori $v1, $v1, 0xfffc -/* 99D4FC 80240B6C 00431821 */ addu $v1, $v0, $v1 -/* 99D500 80240B70 2C620015 */ sltiu $v0, $v1, 0x15 -/* 99D504 80240B74 10400009 */ beqz $v0, .L80240B9C -/* 99D508 80240B78 00031080 */ sll $v0, $v1, 2 -/* 99D50C 80240B7C 3C018024 */ lui $at, 0x8024 -/* 99D510 80240B80 00220821 */ addu $at, $at, $v0 -/* 99D514 80240B84 8C224448 */ lw $v0, 0x4448($at) -/* 99D518 80240B88 00400008 */ jr $v0 -/* 99D51C 80240B8C 00000000 */ nop -/* 99D520 80240B90 8E420028 */ lw $v0, 0x28($s2) -/* 99D524 80240B94 24420001 */ addiu $v0, $v0, 1 -/* 99D528 80240B98 AE420028 */ sw $v0, 0x28($s2) -.L80240B9C: -/* 99D52C 80240B9C 0000102D */ daddu $v0, $zero, $zero -.L80240BA0: -/* 99D530 80240BA0 8FBF0068 */ lw $ra, 0x68($sp) -/* 99D534 80240BA4 8FB50064 */ lw $s5, 0x64($sp) -/* 99D538 80240BA8 8FB40060 */ lw $s4, 0x60($sp) -/* 99D53C 80240BAC 8FB3005C */ lw $s3, 0x5c($sp) -/* 99D540 80240BB0 8FB20058 */ lw $s2, 0x58($sp) -/* 99D544 80240BB4 8FB10054 */ lw $s1, 0x54($sp) -/* 99D548 80240BB8 8FB00050 */ lw $s0, 0x50($sp) -/* 99D54C 80240BBC 03E00008 */ jr $ra -/* 99D550 80240BC0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s new file mode 100644 index 0000000000..5b9006e042 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240784_99D114.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240784_99D114 +/* 99D114 80240784 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 99D118 80240788 AFB3005C */ sw $s3, 0x5c($sp) +/* 99D11C 8024078C 0080982D */ daddu $s3, $a0, $zero +/* 99D120 80240790 AFBF0068 */ sw $ra, 0x68($sp) +/* 99D124 80240794 AFB50064 */ sw $s5, 0x64($sp) +/* 99D128 80240798 AFB40060 */ sw $s4, 0x60($sp) +/* 99D12C 8024079C AFB20058 */ sw $s2, 0x58($sp) +/* 99D130 802407A0 AFB10054 */ sw $s1, 0x54($sp) +/* 99D134 802407A4 AFB00050 */ sw $s0, 0x50($sp) +/* 99D138 802407A8 8E710148 */ lw $s1, 0x148($s3) +/* 99D13C 802407AC 86240008 */ lh $a0, 8($s1) +/* 99D140 802407B0 0C00EABB */ jal get_npc_unsafe +/* 99D144 802407B4 00A0802D */ daddu $s0, $a1, $zero +/* 99D148 802407B8 8E63000C */ lw $v1, 0xc($s3) +/* 99D14C 802407BC 0260202D */ daddu $a0, $s3, $zero +/* 99D150 802407C0 8C650000 */ lw $a1, ($v1) +/* 99D154 802407C4 0C0B1EAF */ jal get_variable +/* 99D158 802407C8 0040902D */ daddu $s2, $v0, $zero +/* 99D15C 802407CC AFA00028 */ sw $zero, 0x28($sp) +/* 99D160 802407D0 8E2300D0 */ lw $v1, 0xd0($s1) +/* 99D164 802407D4 8C630030 */ lw $v1, 0x30($v1) +/* 99D168 802407D8 AFA3002C */ sw $v1, 0x2c($sp) +/* 99D16C 802407DC 8E2300D0 */ lw $v1, 0xd0($s1) +/* 99D170 802407E0 8C63001C */ lw $v1, 0x1c($v1) +/* 99D174 802407E4 AFA30030 */ sw $v1, 0x30($sp) +/* 99D178 802407E8 8E2300D0 */ lw $v1, 0xd0($s1) +/* 99D17C 802407EC 8C630024 */ lw $v1, 0x24($v1) +/* 99D180 802407F0 AFA30034 */ sw $v1, 0x34($sp) +/* 99D184 802407F4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 99D188 802407F8 8C630028 */ lw $v1, 0x28($v1) +/* 99D18C 802407FC 27B50028 */ addiu $s5, $sp, 0x28 +/* 99D190 80240800 AFA30038 */ sw $v1, 0x38($sp) +/* 99D194 80240804 8E2300D0 */ lw $v1, 0xd0($s1) +/* 99D198 80240808 3C0142C8 */ lui $at, 0x42c8 +/* 99D19C 8024080C 44810000 */ mtc1 $at, $f0 +/* 99D1A0 80240810 8C63002C */ lw $v1, 0x2c($v1) +/* 99D1A4 80240814 0040A02D */ daddu $s4, $v0, $zero +/* 99D1A8 80240818 E7A00040 */ swc1 $f0, 0x40($sp) +/* 99D1AC 8024081C A7A00044 */ sh $zero, 0x44($sp) +/* 99D1B0 80240820 12000009 */ beqz $s0, .L80240848 +/* 99D1B4 80240824 AFA3003C */ sw $v1, 0x3c($sp) +/* 99D1B8 80240828 864300A8 */ lh $v1, 0xa8($s2) +/* 99D1BC 8024082C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 99D1C0 80240830 AE20008C */ sw $zero, 0x8c($s1) +/* 99D1C4 80240834 A22000B5 */ sb $zero, 0xb5($s1) +/* 99D1C8 80240838 34420008 */ ori $v0, $v0, 8 +/* 99D1CC 8024083C AE230084 */ sw $v1, 0x84($s1) +/* 99D1D0 80240840 08090216 */ j .L80240858 +/* 99D1D4 80240844 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240848: +/* 99D1D8 80240848 8E2200B0 */ lw $v0, 0xb0($s1) +/* 99D1DC 8024084C 30420004 */ andi $v0, $v0, 4 +/* 99D1E0 80240850 10400047 */ beqz $v0, .L80240970 +/* 99D1E4 80240854 00000000 */ nop +.L80240858: +/* 99D1E8 80240858 AE600070 */ sw $zero, 0x70($s3) +/* 99D1EC 8024085C A640008E */ sh $zero, 0x8e($s2) +/* 99D1F0 80240860 8E2300CC */ lw $v1, 0xcc($s1) +/* 99D1F4 80240864 2404F7FF */ addiu $a0, $zero, -0x801 +/* 99D1F8 80240868 A2200007 */ sb $zero, 7($s1) +/* 99D1FC 8024086C 8E420000 */ lw $v0, ($s2) +/* 99D200 80240870 8C630000 */ lw $v1, ($v1) +/* 99D204 80240874 00441024 */ and $v0, $v0, $a0 +/* 99D208 80240878 AE420000 */ sw $v0, ($s2) +/* 99D20C 8024087C AE430028 */ sw $v1, 0x28($s2) +/* 99D210 80240880 96220086 */ lhu $v0, 0x86($s1) +/* 99D214 80240884 A64200A8 */ sh $v0, 0xa8($s2) +/* 99D218 80240888 8E2200D0 */ lw $v0, 0xd0($s1) +/* 99D21C 8024088C AE200090 */ sw $zero, 0x90($s1) +/* 99D220 80240890 8C420034 */ lw $v0, 0x34($v0) +/* 99D224 80240894 14400006 */ bnez $v0, .L802408B0 +/* 99D228 80240898 2403FDFF */ addiu $v1, $zero, -0x201 +/* 99D22C 8024089C 8E420000 */ lw $v0, ($s2) +/* 99D230 802408A0 2403FFF7 */ addiu $v1, $zero, -9 +/* 99D234 802408A4 34420200 */ ori $v0, $v0, 0x200 +/* 99D238 802408A8 0809022F */ j .L802408BC +/* 99D23C 802408AC 00431024 */ and $v0, $v0, $v1 +.L802408B0: +/* 99D240 802408B0 8E420000 */ lw $v0, ($s2) +/* 99D244 802408B4 00431024 */ and $v0, $v0, $v1 +/* 99D248 802408B8 34420008 */ ori $v0, $v0, 8 +.L802408BC: +/* 99D24C 802408BC AE420000 */ sw $v0, ($s2) +/* 99D250 802408C0 8E2200B0 */ lw $v0, 0xb0($s1) +/* 99D254 802408C4 30420004 */ andi $v0, $v0, 4 +/* 99D258 802408C8 1040001E */ beqz $v0, .L80240944 +/* 99D25C 802408CC 24040002 */ addiu $a0, $zero, 2 +/* 99D260 802408D0 0240282D */ daddu $a1, $s2, $zero +/* 99D264 802408D4 0000302D */ daddu $a2, $zero, $zero +/* 99D268 802408D8 24020063 */ addiu $v0, $zero, 0x63 +/* 99D26C 802408DC AE620070 */ sw $v0, 0x70($s3) +/* 99D270 802408E0 AE600074 */ sw $zero, 0x74($s3) +/* 99D274 802408E4 864300A8 */ lh $v1, 0xa8($s2) +/* 99D278 802408E8 3C013F80 */ lui $at, 0x3f80 +/* 99D27C 802408EC 44810000 */ mtc1 $at, $f0 +/* 99D280 802408F0 3C014000 */ lui $at, 0x4000 +/* 99D284 802408F4 44811000 */ mtc1 $at, $f2 +/* 99D288 802408F8 3C01C1A0 */ lui $at, 0xc1a0 +/* 99D28C 802408FC 44812000 */ mtc1 $at, $f4 +/* 99D290 80240900 24020028 */ addiu $v0, $zero, 0x28 +/* 99D294 80240904 AFA2001C */ sw $v0, 0x1c($sp) +/* 99D298 80240908 44833000 */ mtc1 $v1, $f6 +/* 99D29C 8024090C 00000000 */ nop +/* 99D2A0 80240910 468031A0 */ cvt.s.w $f6, $f6 +/* 99D2A4 80240914 44073000 */ mfc1 $a3, $f6 +/* 99D2A8 80240918 27A20048 */ addiu $v0, $sp, 0x48 +/* 99D2AC 8024091C AFA20020 */ sw $v0, 0x20($sp) +/* 99D2B0 80240920 E7A00010 */ swc1 $f0, 0x10($sp) +/* 99D2B4 80240924 E7A20014 */ swc1 $f2, 0x14($sp) +/* 99D2B8 80240928 0C01BFA4 */ jal fx_emote +/* 99D2BC 8024092C E7A40018 */ swc1 $f4, 0x18($sp) +/* 99D2C0 80240930 8E2200B0 */ lw $v0, 0xb0($s1) +/* 99D2C4 80240934 2403FFFB */ addiu $v1, $zero, -5 +/* 99D2C8 80240938 00431024 */ and $v0, $v0, $v1 +/* 99D2CC 8024093C 0809025C */ j .L80240970 +/* 99D2D0 80240940 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240944: +/* 99D2D4 80240944 8E220000 */ lw $v0, ($s1) +/* 99D2D8 80240948 3C034000 */ lui $v1, 0x4000 +/* 99D2DC 8024094C 00431024 */ and $v0, $v0, $v1 +/* 99D2E0 80240950 10400007 */ beqz $v0, .L80240970 +/* 99D2E4 80240954 3C03BFFF */ lui $v1, 0xbfff +/* 99D2E8 80240958 2402000C */ addiu $v0, $zero, 0xc +/* 99D2EC 8024095C AE620070 */ sw $v0, 0x70($s3) +/* 99D2F0 80240960 8E220000 */ lw $v0, ($s1) +/* 99D2F4 80240964 3463FFFF */ ori $v1, $v1, 0xffff +/* 99D2F8 80240968 00431024 */ and $v0, $v0, $v1 +/* 99D2FC 8024096C AE220000 */ sw $v0, ($s1) +.L80240970: +/* 99D300 80240970 8E220090 */ lw $v0, 0x90($s1) +/* 99D304 80240974 1840000C */ blez $v0, .L802409A8 +/* 99D308 80240978 2442FFFF */ addiu $v0, $v0, -1 +/* 99D30C 8024097C 14400087 */ bnez $v0, .L80240B9C +/* 99D310 80240980 AE220090 */ sw $v0, 0x90($s1) +/* 99D314 80240984 3C03FFAA */ lui $v1, 0xffaa +/* 99D318 80240988 8E420028 */ lw $v0, 0x28($s2) +/* 99D31C 8024098C 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 99D320 80240990 00431021 */ addu $v0, $v0, $v1 +/* 99D324 80240994 2C420002 */ sltiu $v0, $v0, 2 +/* 99D328 80240998 10400003 */ beqz $v0, .L802409A8 +/* 99D32C 8024099C 3C020055 */ lui $v0, 0x55 +/* 99D330 802409A0 3442000C */ ori $v0, $v0, 0xc +/* 99D334 802409A4 AE420028 */ sw $v0, 0x28($s2) +.L802409A8: +/* 99D338 802409A8 8E630070 */ lw $v1, 0x70($s3) +/* 99D33C 802409AC 2402000C */ addiu $v0, $zero, 0xc +/* 99D340 802409B0 10620048 */ beq $v1, $v0, .L80240AD4 +/* 99D344 802409B4 2862000D */ slti $v0, $v1, 0xd +/* 99D348 802409B8 1040000F */ beqz $v0, .L802409F8 +/* 99D34C 802409BC 24100001 */ addiu $s0, $zero, 1 +/* 99D350 802409C0 1070001E */ beq $v1, $s0, .L80240A3C +/* 99D354 802409C4 28620002 */ slti $v0, $v1, 2 +/* 99D358 802409C8 10400005 */ beqz $v0, .L802409E0 +/* 99D35C 802409CC 24020002 */ addiu $v0, $zero, 2 +/* 99D360 802409D0 10600015 */ beqz $v1, .L80240A28 +/* 99D364 802409D4 0260202D */ daddu $a0, $s3, $zero +/* 99D368 802409D8 080902CC */ j .L80240B30 +/* 99D36C 802409DC 00000000 */ nop +.L802409E0: +/* 99D370 802409E0 1062001C */ beq $v1, $v0, .L80240A54 +/* 99D374 802409E4 24020003 */ addiu $v0, $zero, 3 +/* 99D378 802409E8 10620035 */ beq $v1, $v0, .L80240AC0 +/* 99D37C 802409EC 0260202D */ daddu $a0, $s3, $zero +/* 99D380 802409F0 080902CC */ j .L80240B30 +/* 99D384 802409F4 00000000 */ nop +.L802409F8: +/* 99D388 802409F8 2402000E */ addiu $v0, $zero, 0xe +/* 99D38C 802409FC 1062003F */ beq $v1, $v0, .L80240AFC +/* 99D390 80240A00 0062102A */ slt $v0, $v1, $v0 +/* 99D394 80240A04 14400038 */ bnez $v0, .L80240AE8 +/* 99D398 80240A08 0260202D */ daddu $a0, $s3, $zero +/* 99D39C 80240A0C 2402000F */ addiu $v0, $zero, 0xf +/* 99D3A0 80240A10 10620040 */ beq $v1, $v0, .L80240B14 +/* 99D3A4 80240A14 24020063 */ addiu $v0, $zero, 0x63 +/* 99D3A8 80240A18 10620043 */ beq $v1, $v0, .L80240B28 +/* 99D3AC 80240A1C 00000000 */ nop +/* 99D3B0 80240A20 080902CC */ j .L80240B30 +/* 99D3B4 80240A24 00000000 */ nop +.L80240A28: +/* 99D3B8 80240A28 0280282D */ daddu $a1, $s4, $zero +/* 99D3BC 80240A2C 0C012568 */ jal func_800495A0 +/* 99D3C0 80240A30 02A0302D */ daddu $a2, $s5, $zero +/* 99D3C4 80240A34 96220086 */ lhu $v0, 0x86($s1) +/* 99D3C8 80240A38 A64200A8 */ sh $v0, 0xa8($s2) +.L80240A3C: +/* 99D3CC 80240A3C 0260202D */ daddu $a0, $s3, $zero +/* 99D3D0 80240A40 0280282D */ daddu $a1, $s4, $zero +/* 99D3D4 80240A44 0C0125AE */ jal func_800496B8 +/* 99D3D8 80240A48 02A0302D */ daddu $a2, $s5, $zero +/* 99D3DC 80240A4C 080902CC */ j .L80240B30 +/* 99D3E0 80240A50 00000000 */ nop +.L80240A54: +/* 99D3E4 80240A54 0260202D */ daddu $a0, $s3, $zero +/* 99D3E8 80240A58 0280282D */ daddu $a1, $s4, $zero +/* 99D3EC 80240A5C 0C0126D1 */ jal func_80049B44 +/* 99D3F0 80240A60 02A0302D */ daddu $a2, $s5, $zero +/* 99D3F4 80240A64 8E230088 */ lw $v1, 0x88($s1) +/* 99D3F8 80240A68 24020006 */ addiu $v0, $zero, 6 +/* 99D3FC 80240A6C 14620014 */ bne $v1, $v0, .L80240AC0 +/* 99D400 80240A70 0260202D */ daddu $a0, $s3, $zero +/* 99D404 80240A74 0C00A67F */ jal rand_int +/* 99D408 80240A78 24040064 */ addiu $a0, $zero, 0x64 +/* 99D40C 80240A7C 28420021 */ slti $v0, $v0, 0x21 +/* 99D410 80240A80 5040000F */ beql $v0, $zero, .L80240AC0 +/* 99D414 80240A84 0260202D */ daddu $a0, $s3, $zero +/* 99D418 80240A88 8E22008C */ lw $v0, 0x8c($s1) +/* 99D41C 80240A8C 10400005 */ beqz $v0, .L80240AA4 +/* 99D420 80240A90 3C020055 */ lui $v0, 0x55 +/* 99D424 80240A94 3442002F */ ori $v0, $v0, 0x2f +/* 99D428 80240A98 AE20008C */ sw $zero, 0x8c($s1) +/* 99D42C 80240A9C 080902AC */ j .L80240AB0 +/* 99D430 80240AA0 A22000B5 */ sb $zero, 0xb5($s1) +.L80240AA4: +/* 99D434 80240AA4 3442002E */ ori $v0, $v0, 0x2e +/* 99D438 80240AA8 AE30008C */ sw $s0, 0x8c($s1) +/* 99D43C 80240AAC A23000B5 */ sb $s0, 0xb5($s1) +.L80240AB0: +/* 99D440 80240AB0 AE420028 */ sw $v0, 0x28($s2) +/* 99D444 80240AB4 24020007 */ addiu $v0, $zero, 7 +/* 99D448 80240AB8 080902E7 */ j .L80240B9C +/* 99D44C 80240ABC AE220090 */ sw $v0, 0x90($s1) +.L80240AC0: +/* 99D450 80240AC0 0280282D */ daddu $a1, $s4, $zero +/* 99D454 80240AC4 0C012701 */ jal func_80049C04 +/* 99D458 80240AC8 02A0302D */ daddu $a2, $s5, $zero +/* 99D45C 80240ACC 080902CC */ j .L80240B30 +/* 99D460 80240AD0 00000000 */ nop +.L80240AD4: +/* 99D464 80240AD4 0260202D */ daddu $a0, $s3, $zero +/* 99D468 80240AD8 0280282D */ daddu $a1, $s4, $zero +/* 99D46C 80240ADC 0C0900FC */ jal func_802403F0_99CD80 +/* 99D470 80240AE0 02A0302D */ daddu $a2, $s5, $zero +/* 99D474 80240AE4 0260202D */ daddu $a0, $s3, $zero +.L80240AE8: +/* 99D478 80240AE8 0280282D */ daddu $a1, $s4, $zero +/* 99D47C 80240AEC 0C09011B */ jal func_8024046C_99CDFC +/* 99D480 80240AF0 02A0302D */ daddu $a2, $s5, $zero +/* 99D484 80240AF4 080902CC */ j .L80240B30 +/* 99D488 80240AF8 00000000 */ nop +.L80240AFC: +/* 99D48C 80240AFC 0260202D */ daddu $a0, $s3, $zero +/* 99D490 80240B00 0280282D */ daddu $a1, $s4, $zero +/* 99D494 80240B04 0C090168 */ jal func_802405A0_99CF30 +/* 99D498 80240B08 02A0302D */ daddu $a2, $s5, $zero +/* 99D49C 80240B0C 080902CC */ j .L80240B30 +/* 99D4A0 80240B10 00000000 */ nop +.L80240B14: +/* 99D4A4 80240B14 0280282D */ daddu $a1, $s4, $zero +/* 99D4A8 80240B18 0C0901C1 */ jal func_80240704_99D094 +/* 99D4AC 80240B1C 02A0302D */ daddu $a2, $s5, $zero +/* 99D4B0 80240B20 080902CC */ j .L80240B30 +/* 99D4B4 80240B24 00000000 */ nop +.L80240B28: +/* 99D4B8 80240B28 0C0129CF */ jal func_8004A73C +/* 99D4BC 80240B2C 0260202D */ daddu $a0, $s3, $zero +.L80240B30: +/* 99D4C0 80240B30 8E230088 */ lw $v1, 0x88($s1) +/* 99D4C4 80240B34 24020006 */ addiu $v0, $zero, 6 +/* 99D4C8 80240B38 14620019 */ bne $v1, $v0, .L80240BA0 +/* 99D4CC 80240B3C 0000102D */ daddu $v0, $zero, $zero +/* 99D4D0 80240B40 8E22008C */ lw $v0, 0x8c($s1) +/* 99D4D4 80240B44 10400003 */ beqz $v0, .L80240B54 +/* 99D4D8 80240B48 24020001 */ addiu $v0, $zero, 1 +/* 99D4DC 80240B4C 080902D6 */ j .L80240B58 +/* 99D4E0 80240B50 A22200B5 */ sb $v0, 0xb5($s1) +.L80240B54: +/* 99D4E4 80240B54 A22000B5 */ sb $zero, 0xb5($s1) +.L80240B58: +/* 99D4E8 80240B58 8E22008C */ lw $v0, 0x8c($s1) +/* 99D4EC 80240B5C 1040000F */ beqz $v0, .L80240B9C +/* 99D4F0 80240B60 3C03FFAA */ lui $v1, 0xffaa +/* 99D4F4 80240B64 8E420028 */ lw $v0, 0x28($s2) +/* 99D4F8 80240B68 3463FFFC */ ori $v1, $v1, 0xfffc +/* 99D4FC 80240B6C 00431821 */ addu $v1, $v0, $v1 +/* 99D500 80240B70 2C620015 */ sltiu $v0, $v1, 0x15 +/* 99D504 80240B74 10400009 */ beqz $v0, .L80240B9C +/* 99D508 80240B78 00031080 */ sll $v0, $v1, 2 +/* 99D50C 80240B7C 3C018024 */ lui $at, 0x8024 +/* 99D510 80240B80 00220821 */ addu $at, $at, $v0 +/* 99D514 80240B84 8C224448 */ lw $v0, 0x4448($at) +/* 99D518 80240B88 00400008 */ jr $v0 +/* 99D51C 80240B8C 00000000 */ nop +/* 99D520 80240B90 8E420028 */ lw $v0, 0x28($s2) +/* 99D524 80240B94 24420001 */ addiu $v0, $v0, 1 +/* 99D528 80240B98 AE420028 */ sw $v0, 0x28($s2) +.L80240B9C: +/* 99D52C 80240B9C 0000102D */ daddu $v0, $zero, $zero +.L80240BA0: +/* 99D530 80240BA0 8FBF0068 */ lw $ra, 0x68($sp) +/* 99D534 80240BA4 8FB50064 */ lw $s5, 0x64($sp) +/* 99D538 80240BA8 8FB40060 */ lw $s4, 0x60($sp) +/* 99D53C 80240BAC 8FB3005C */ lw $s3, 0x5c($sp) +/* 99D540 80240BB0 8FB20058 */ lw $s2, 0x58($sp) +/* 99D544 80240BB4 8FB10054 */ lw $s1, 0x54($sp) +/* 99D548 80240BB8 8FB00050 */ lw $s0, 0x50($sp) +/* 99D54C 80240BBC 03E00008 */ jr $ra +/* 99D550 80240BC0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98.s deleted file mode 100644 index 8f8bab735b..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D98 -/* 99D728 80240D98 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99D72C 80240D9C AFB00010 */ sw $s0, 0x10($sp) -/* 99D730 80240DA0 0080802D */ daddu $s0, $a0, $zero -/* 99D734 80240DA4 AFBF0014 */ sw $ra, 0x14($sp) -/* 99D738 80240DA8 8E020148 */ lw $v0, 0x148($s0) -/* 99D73C 80240DAC 0C00EABB */ jal get_npc_unsafe -/* 99D740 80240DB0 84440008 */ lh $a0, 8($v0) -/* 99D744 80240DB4 3C014120 */ lui $at, 0x4120 -/* 99D748 80240DB8 44810000 */ mtc1 $at, $f0 -/* 99D74C 80240DBC 3C014000 */ lui $at, 0x4000 -/* 99D750 80240DC0 44811000 */ mtc1 $at, $f2 -/* 99D754 80240DC4 8C430000 */ lw $v1, ($v0) -/* 99D758 80240DC8 C444003C */ lwc1 $f4, 0x3c($v0) -/* 99D75C 80240DCC 34630800 */ ori $v1, $v1, 0x800 -/* 99D760 80240DD0 E440001C */ swc1 $f0, 0x1c($v0) -/* 99D764 80240DD4 E4420014 */ swc1 $f2, 0x14($v0) -/* 99D768 80240DD8 E4440064 */ swc1 $f4, 0x64($v0) -/* 99D76C 80240DDC AC430000 */ sw $v1, ($v0) -/* 99D770 80240DE0 2402000B */ addiu $v0, $zero, 0xb -/* 99D774 80240DE4 AE020070 */ sw $v0, 0x70($s0) -/* 99D778 80240DE8 8FBF0014 */ lw $ra, 0x14($sp) -/* 99D77C 80240DEC 8FB00010 */ lw $s0, 0x10($sp) -/* 99D780 80240DF0 03E00008 */ jr $ra -/* 99D784 80240DF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98_99D728.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98_99D728.s new file mode 100644 index 0000000000..1c264c2457 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240D98_99D728.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D98_99D728 +/* 99D728 80240D98 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 99D72C 80240D9C AFB00010 */ sw $s0, 0x10($sp) +/* 99D730 80240DA0 0080802D */ daddu $s0, $a0, $zero +/* 99D734 80240DA4 AFBF0014 */ sw $ra, 0x14($sp) +/* 99D738 80240DA8 8E020148 */ lw $v0, 0x148($s0) +/* 99D73C 80240DAC 0C00EABB */ jal get_npc_unsafe +/* 99D740 80240DB0 84440008 */ lh $a0, 8($v0) +/* 99D744 80240DB4 3C014120 */ lui $at, 0x4120 +/* 99D748 80240DB8 44810000 */ mtc1 $at, $f0 +/* 99D74C 80240DBC 3C014000 */ lui $at, 0x4000 +/* 99D750 80240DC0 44811000 */ mtc1 $at, $f2 +/* 99D754 80240DC4 8C430000 */ lw $v1, ($v0) +/* 99D758 80240DC8 C444003C */ lwc1 $f4, 0x3c($v0) +/* 99D75C 80240DCC 34630800 */ ori $v1, $v1, 0x800 +/* 99D760 80240DD0 E440001C */ swc1 $f0, 0x1c($v0) +/* 99D764 80240DD4 E4420014 */ swc1 $f2, 0x14($v0) +/* 99D768 80240DD8 E4440064 */ swc1 $f4, 0x64($v0) +/* 99D76C 80240DDC AC430000 */ sw $v1, ($v0) +/* 99D770 80240DE0 2402000B */ addiu $v0, $zero, 0xb +/* 99D774 80240DE4 AE020070 */ sw $v0, 0x70($s0) +/* 99D778 80240DE8 8FBF0014 */ lw $ra, 0x14($sp) +/* 99D77C 80240DEC 8FB00010 */ lw $s0, 0x10($sp) +/* 99D780 80240DF0 03E00008 */ jr $ra +/* 99D784 80240DF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70.s deleted file mode 100644 index ae8148d403..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E70 -/* 99D800 80240E70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 99D804 80240E74 AFB3001C */ sw $s3, 0x1c($sp) -/* 99D808 80240E78 0080982D */ daddu $s3, $a0, $zero -/* 99D80C 80240E7C AFBF0020 */ sw $ra, 0x20($sp) -/* 99D810 80240E80 AFB20018 */ sw $s2, 0x18($sp) -/* 99D814 80240E84 AFB10014 */ sw $s1, 0x14($sp) -/* 99D818 80240E88 AFB00010 */ sw $s0, 0x10($sp) -/* 99D81C 80240E8C F7B40028 */ sdc1 $f20, 0x28($sp) -/* 99D820 80240E90 8E710148 */ lw $s1, 0x148($s3) -/* 99D824 80240E94 86240008 */ lh $a0, 8($s1) -/* 99D828 80240E98 0C00EABB */ jal get_npc_unsafe -/* 99D82C 80240E9C 00A0802D */ daddu $s0, $a1, $zero -/* 99D830 80240EA0 8E040014 */ lw $a0, 0x14($s0) -/* 99D834 80240EA4 0040902D */ daddu $s2, $v0, $zero -/* 99D838 80240EA8 00041FC2 */ srl $v1, $a0, 0x1f -/* 99D83C 80240EAC 00832021 */ addu $a0, $a0, $v1 -/* 99D840 80240EB0 00042043 */ sra $a0, $a0, 1 -/* 99D844 80240EB4 0C00A67F */ jal rand_int -/* 99D848 80240EB8 24840001 */ addiu $a0, $a0, 1 -/* 99D84C 80240EBC 8E030014 */ lw $v1, 0x14($s0) -/* 99D850 80240EC0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* 99D854 80240EC4 000327C2 */ srl $a0, $v1, 0x1f -/* 99D858 80240EC8 00641821 */ addu $v1, $v1, $a0 -/* 99D85C 80240ECC 00031843 */ sra $v1, $v1, 1 -/* 99D860 80240ED0 00621821 */ addu $v1, $v1, $v0 -/* 99D864 80240ED4 A643008E */ sh $v1, 0x8e($s2) -/* 99D868 80240ED8 8E2200CC */ lw $v0, 0xcc($s1) -/* 99D86C 80240EDC C64E0040 */ lwc1 $f14, 0x40($s2) -/* 99D870 80240EE0 8C42000C */ lw $v0, 0xc($v0) -/* 99D874 80240EE4 AE420028 */ sw $v0, 0x28($s2) -/* 99D878 80240EE8 C600000C */ lwc1 $f0, 0xc($s0) -/* 99D87C 80240EEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 99D880 80240EF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 99D884 80240EF4 E6400018 */ swc1 $f0, 0x18($s2) -/* 99D888 80240EF8 8C460028 */ lw $a2, 0x28($v0) -/* 99D88C 80240EFC 0C00A720 */ jal atan2 -/* 99D890 80240F00 8C470030 */ lw $a3, 0x30($v0) -/* 99D894 80240F04 46000506 */ mov.s $f20, $f0 -/* 99D898 80240F08 C64C000C */ lwc1 $f12, 0xc($s2) -/* 99D89C 80240F0C 0C00A70A */ jal get_clamped_angle_diff -/* 99D8A0 80240F10 4600A386 */ mov.s $f14, $f20 -/* 99D8A4 80240F14 46000086 */ mov.s $f2, $f0 -/* 99D8A8 80240F18 8E020010 */ lw $v0, 0x10($s0) -/* 99D8AC 80240F1C 46001005 */ abs.s $f0, $f2 -/* 99D8B0 80240F20 44822000 */ mtc1 $v0, $f4 -/* 99D8B4 80240F24 00000000 */ nop -/* 99D8B8 80240F28 46802120 */ cvt.s.w $f4, $f4 -/* 99D8BC 80240F2C 4600203C */ c.lt.s $f4, $f0 -/* 99D8C0 80240F30 00000000 */ nop -/* 99D8C4 80240F34 4500000D */ bc1f .L80240F6C -/* 99D8C8 80240F38 00000000 */ nop -/* 99D8CC 80240F3C 44800000 */ mtc1 $zero, $f0 -/* 99D8D0 80240F40 C654000C */ lwc1 $f20, 0xc($s2) -/* 99D8D4 80240F44 4600103C */ c.lt.s $f2, $f0 -/* 99D8D8 80240F48 00000000 */ nop -/* 99D8DC 80240F4C 45000006 */ bc1f .L80240F68 -/* 99D8E0 80240F50 00021023 */ negu $v0, $v0 -/* 99D8E4 80240F54 44820000 */ mtc1 $v0, $f0 -/* 99D8E8 80240F58 00000000 */ nop -/* 99D8EC 80240F5C 46800020 */ cvt.s.w $f0, $f0 -/* 99D8F0 80240F60 080903DB */ j .L80240F6C -/* 99D8F4 80240F64 4600A500 */ add.s $f20, $f20, $f0 -.L80240F68: -/* 99D8F8 80240F68 4604A500 */ add.s $f20, $f20, $f4 -.L80240F6C: -/* 99D8FC 80240F6C 0C00A6C9 */ jal clamp_angle -/* 99D900 80240F70 4600A306 */ mov.s $f12, $f20 -/* 99D904 80240F74 2402000D */ addiu $v0, $zero, 0xd -/* 99D908 80240F78 E640000C */ swc1 $f0, 0xc($s2) -/* 99D90C 80240F7C AE620070 */ sw $v0, 0x70($s3) -/* 99D910 80240F80 8FBF0020 */ lw $ra, 0x20($sp) -/* 99D914 80240F84 8FB3001C */ lw $s3, 0x1c($sp) -/* 99D918 80240F88 8FB20018 */ lw $s2, 0x18($sp) -/* 99D91C 80240F8C 8FB10014 */ lw $s1, 0x14($sp) -/* 99D920 80240F90 8FB00010 */ lw $s0, 0x10($sp) -/* 99D924 80240F94 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 99D928 80240F98 03E00008 */ jr $ra -/* 99D92C 80240F9C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70_99D800.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70_99D800.s new file mode 100644 index 0000000000..0e83573505 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80240E70_99D800.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240E70_99D800 +/* 99D800 80240E70 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 99D804 80240E74 AFB3001C */ sw $s3, 0x1c($sp) +/* 99D808 80240E78 0080982D */ daddu $s3, $a0, $zero +/* 99D80C 80240E7C AFBF0020 */ sw $ra, 0x20($sp) +/* 99D810 80240E80 AFB20018 */ sw $s2, 0x18($sp) +/* 99D814 80240E84 AFB10014 */ sw $s1, 0x14($sp) +/* 99D818 80240E88 AFB00010 */ sw $s0, 0x10($sp) +/* 99D81C 80240E8C F7B40028 */ sdc1 $f20, 0x28($sp) +/* 99D820 80240E90 8E710148 */ lw $s1, 0x148($s3) +/* 99D824 80240E94 86240008 */ lh $a0, 8($s1) +/* 99D828 80240E98 0C00EABB */ jal get_npc_unsafe +/* 99D82C 80240E9C 00A0802D */ daddu $s0, $a1, $zero +/* 99D830 80240EA0 8E040014 */ lw $a0, 0x14($s0) +/* 99D834 80240EA4 0040902D */ daddu $s2, $v0, $zero +/* 99D838 80240EA8 00041FC2 */ srl $v1, $a0, 0x1f +/* 99D83C 80240EAC 00832021 */ addu $a0, $a0, $v1 +/* 99D840 80240EB0 00042043 */ sra $a0, $a0, 1 +/* 99D844 80240EB4 0C00A67F */ jal rand_int +/* 99D848 80240EB8 24840001 */ addiu $a0, $a0, 1 +/* 99D84C 80240EBC 8E030014 */ lw $v1, 0x14($s0) +/* 99D850 80240EC0 C64C0038 */ lwc1 $f12, 0x38($s2) +/* 99D854 80240EC4 000327C2 */ srl $a0, $v1, 0x1f +/* 99D858 80240EC8 00641821 */ addu $v1, $v1, $a0 +/* 99D85C 80240ECC 00031843 */ sra $v1, $v1, 1 +/* 99D860 80240ED0 00621821 */ addu $v1, $v1, $v0 +/* 99D864 80240ED4 A643008E */ sh $v1, 0x8e($s2) +/* 99D868 80240ED8 8E2200CC */ lw $v0, 0xcc($s1) +/* 99D86C 80240EDC C64E0040 */ lwc1 $f14, 0x40($s2) +/* 99D870 80240EE0 8C42000C */ lw $v0, 0xc($v0) +/* 99D874 80240EE4 AE420028 */ sw $v0, 0x28($s2) +/* 99D878 80240EE8 C600000C */ lwc1 $f0, 0xc($s0) +/* 99D87C 80240EEC 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 99D880 80240EF0 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 99D884 80240EF4 E6400018 */ swc1 $f0, 0x18($s2) +/* 99D888 80240EF8 8C460028 */ lw $a2, 0x28($v0) +/* 99D88C 80240EFC 0C00A720 */ jal atan2 +/* 99D890 80240F00 8C470030 */ lw $a3, 0x30($v0) +/* 99D894 80240F04 46000506 */ mov.s $f20, $f0 +/* 99D898 80240F08 C64C000C */ lwc1 $f12, 0xc($s2) +/* 99D89C 80240F0C 0C00A70A */ jal get_clamped_angle_diff +/* 99D8A0 80240F10 4600A386 */ mov.s $f14, $f20 +/* 99D8A4 80240F14 46000086 */ mov.s $f2, $f0 +/* 99D8A8 80240F18 8E020010 */ lw $v0, 0x10($s0) +/* 99D8AC 80240F1C 46001005 */ abs.s $f0, $f2 +/* 99D8B0 80240F20 44822000 */ mtc1 $v0, $f4 +/* 99D8B4 80240F24 00000000 */ nop +/* 99D8B8 80240F28 46802120 */ cvt.s.w $f4, $f4 +/* 99D8BC 80240F2C 4600203C */ c.lt.s $f4, $f0 +/* 99D8C0 80240F30 00000000 */ nop +/* 99D8C4 80240F34 4500000D */ bc1f .L80240F6C +/* 99D8C8 80240F38 00000000 */ nop +/* 99D8CC 80240F3C 44800000 */ mtc1 $zero, $f0 +/* 99D8D0 80240F40 C654000C */ lwc1 $f20, 0xc($s2) +/* 99D8D4 80240F44 4600103C */ c.lt.s $f2, $f0 +/* 99D8D8 80240F48 00000000 */ nop +/* 99D8DC 80240F4C 45000006 */ bc1f .L80240F68 +/* 99D8E0 80240F50 00021023 */ negu $v0, $v0 +/* 99D8E4 80240F54 44820000 */ mtc1 $v0, $f0 +/* 99D8E8 80240F58 00000000 */ nop +/* 99D8EC 80240F5C 46800020 */ cvt.s.w $f0, $f0 +/* 99D8F0 80240F60 080903DB */ j .L80240F6C +/* 99D8F4 80240F64 4600A500 */ add.s $f20, $f20, $f0 +.L80240F68: +/* 99D8F8 80240F68 4604A500 */ add.s $f20, $f20, $f4 +.L80240F6C: +/* 99D8FC 80240F6C 0C00A6C9 */ jal clamp_angle +/* 99D900 80240F70 4600A306 */ mov.s $f12, $f20 +/* 99D904 80240F74 2402000D */ addiu $v0, $zero, 0xd +/* 99D908 80240F78 E640000C */ swc1 $f0, 0xc($s2) +/* 99D90C 80240F7C AE620070 */ sw $v0, 0x70($s3) +/* 99D910 80240F80 8FBF0020 */ lw $ra, 0x20($sp) +/* 99D914 80240F84 8FB3001C */ lw $s3, 0x1c($sp) +/* 99D918 80240F88 8FB20018 */ lw $s2, 0x18($sp) +/* 99D91C 80240F8C 8FB10014 */ lw $s1, 0x14($sp) +/* 99D920 80240F90 8FB00010 */ lw $s0, 0x10($sp) +/* 99D924 80240F94 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 99D928 80240F98 03E00008 */ jr $ra +/* 99D92C 80240F9C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC.s deleted file mode 100644 index 2298d56093..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410BC -/* 99DA4C 802410BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99DA50 802410C0 AFB00010 */ sw $s0, 0x10($sp) -/* 99DA54 802410C4 0080802D */ daddu $s0, $a0, $zero -/* 99DA58 802410C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 99DA5C 802410CC 8E020148 */ lw $v0, 0x148($s0) -/* 99DA60 802410D0 0C00EABB */ jal get_npc_unsafe -/* 99DA64 802410D4 84440008 */ lh $a0, 8($v0) -/* 99DA68 802410D8 9443008E */ lhu $v1, 0x8e($v0) -/* 99DA6C 802410DC 2463FFFF */ addiu $v1, $v1, -1 -/* 99DA70 802410E0 A443008E */ sh $v1, 0x8e($v0) -/* 99DA74 802410E4 00031C00 */ sll $v1, $v1, 0x10 -/* 99DA78 802410E8 14600002 */ bnez $v1, .L802410F4 -/* 99DA7C 802410EC 2402000F */ addiu $v0, $zero, 0xf -/* 99DA80 802410F0 AE020070 */ sw $v0, 0x70($s0) -.L802410F4: -/* 99DA84 802410F4 8FBF0014 */ lw $ra, 0x14($sp) -/* 99DA88 802410F8 8FB00010 */ lw $s0, 0x10($sp) -/* 99DA8C 802410FC 03E00008 */ jr $ra -/* 99DA90 80241100 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC_99DA4C.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC_99DA4C.s new file mode 100644 index 0000000000..7b60115ab7 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802410BC_99DA4C.s @@ -0,0 +1,23 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802410BC_99DA4C +/* 99DA4C 802410BC 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 99DA50 802410C0 AFB00010 */ sw $s0, 0x10($sp) +/* 99DA54 802410C4 0080802D */ daddu $s0, $a0, $zero +/* 99DA58 802410C8 AFBF0014 */ sw $ra, 0x14($sp) +/* 99DA5C 802410CC 8E020148 */ lw $v0, 0x148($s0) +/* 99DA60 802410D0 0C00EABB */ jal get_npc_unsafe +/* 99DA64 802410D4 84440008 */ lh $a0, 8($v0) +/* 99DA68 802410D8 9443008E */ lhu $v1, 0x8e($v0) +/* 99DA6C 802410DC 2463FFFF */ addiu $v1, $v1, -1 +/* 99DA70 802410E0 A443008E */ sh $v1, 0x8e($v0) +/* 99DA74 802410E4 00031C00 */ sll $v1, $v1, 0x10 +/* 99DA78 802410E8 14600002 */ bnez $v1, .L802410F4 +/* 99DA7C 802410EC 2402000F */ addiu $v0, $zero, 0xf +/* 99DA80 802410F0 AE020070 */ sw $v0, 0x70($s0) +.L802410F4: +/* 99DA84 802410F4 8FBF0014 */ lw $ra, 0x14($sp) +/* 99DA88 802410F8 8FB00010 */ lw $s0, 0x10($sp) +/* 99DA8C 802410FC 03E00008 */ jr $ra +/* 99DA90 80241100 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104.s deleted file mode 100644 index b28ee0b6ed..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104.s +++ /dev/null @@ -1,49 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241104 -/* 99DA94 80241104 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 99DA98 80241108 AFB10014 */ sw $s1, 0x14($sp) -/* 99DA9C 8024110C 0080882D */ daddu $s1, $a0, $zero -/* 99DAA0 80241110 AFBF001C */ sw $ra, 0x1c($sp) -/* 99DAA4 80241114 AFB20018 */ sw $s2, 0x18($sp) -/* 99DAA8 80241118 AFB00010 */ sw $s0, 0x10($sp) -/* 99DAAC 8024111C 8E300148 */ lw $s0, 0x148($s1) -/* 99DAB0 80241120 86040008 */ lh $a0, 8($s0) -/* 99DAB4 80241124 0C00EABB */ jal get_npc_unsafe -/* 99DAB8 80241128 00A0902D */ daddu $s2, $a1, $zero -/* 99DABC 8024112C 8E0300CC */ lw $v1, 0xcc($s0) -/* 99DAC0 80241130 8C630004 */ lw $v1, 4($v1) -/* 99DAC4 80241134 0040202D */ daddu $a0, $v0, $zero -/* 99DAC8 80241138 AC830028 */ sw $v1, 0x28($a0) -/* 99DACC 8024113C 8E0200D0 */ lw $v0, 0xd0($s0) -/* 99DAD0 80241140 8C420014 */ lw $v0, 0x14($v0) -/* 99DAD4 80241144 04410009 */ bgez $v0, .L8024116C -/* 99DAD8 80241148 00000000 */ nop -/* 99DADC 8024114C C640000C */ lwc1 $f0, 0xc($s2) -/* 99DAE0 80241150 3C018024 */ lui $at, 0x8024 -/* 99DAE4 80241154 D42244A8 */ ldc1 $f2, 0x44a8($at) -/* 99DAE8 80241158 46000021 */ cvt.d.s $f0, $f0 -/* 99DAEC 8024115C 46220002 */ mul.d $f0, $f0, $f2 -/* 99DAF0 80241160 00000000 */ nop -/* 99DAF4 80241164 08090462 */ j .L80241188 -/* 99DAF8 80241168 46200020 */ cvt.s.d $f0, $f0 -.L8024116C: -/* 99DAFC 8024116C 3C018024 */ lui $at, 0x8024 -/* 99DB00 80241170 D42244B0 */ ldc1 $f2, 0x44b0($at) -/* 99DB04 80241174 44820000 */ mtc1 $v0, $f0 -/* 99DB08 80241178 00000000 */ nop -/* 99DB0C 8024117C 46800021 */ cvt.d.w $f0, $f0 -/* 99DB10 80241180 46220003 */ div.d $f0, $f0, $f2 -/* 99DB14 80241184 46200020 */ cvt.s.d $f0, $f0 -.L80241188: -/* 99DB18 80241188 E4800018 */ swc1 $f0, 0x18($a0) -/* 99DB1C 8024118C 24020010 */ addiu $v0, $zero, 0x10 -/* 99DB20 80241190 AE200074 */ sw $zero, 0x74($s1) -/* 99DB24 80241194 AE220070 */ sw $v0, 0x70($s1) -/* 99DB28 80241198 8FBF001C */ lw $ra, 0x1c($sp) -/* 99DB2C 8024119C 8FB20018 */ lw $s2, 0x18($sp) -/* 99DB30 802411A0 8FB10014 */ lw $s1, 0x14($sp) -/* 99DB34 802411A4 8FB00010 */ lw $s0, 0x10($sp) -/* 99DB38 802411A8 03E00008 */ jr $ra -/* 99DB3C 802411AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s new file mode 100644 index 0000000000..641a27328b --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241104_99DA94.s @@ -0,0 +1,49 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241104_99DA94 +/* 99DA94 80241104 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 99DA98 80241108 AFB10014 */ sw $s1, 0x14($sp) +/* 99DA9C 8024110C 0080882D */ daddu $s1, $a0, $zero +/* 99DAA0 80241110 AFBF001C */ sw $ra, 0x1c($sp) +/* 99DAA4 80241114 AFB20018 */ sw $s2, 0x18($sp) +/* 99DAA8 80241118 AFB00010 */ sw $s0, 0x10($sp) +/* 99DAAC 8024111C 8E300148 */ lw $s0, 0x148($s1) +/* 99DAB0 80241120 86040008 */ lh $a0, 8($s0) +/* 99DAB4 80241124 0C00EABB */ jal get_npc_unsafe +/* 99DAB8 80241128 00A0902D */ daddu $s2, $a1, $zero +/* 99DABC 8024112C 8E0300CC */ lw $v1, 0xcc($s0) +/* 99DAC0 80241130 8C630004 */ lw $v1, 4($v1) +/* 99DAC4 80241134 0040202D */ daddu $a0, $v0, $zero +/* 99DAC8 80241138 AC830028 */ sw $v1, 0x28($a0) +/* 99DACC 8024113C 8E0200D0 */ lw $v0, 0xd0($s0) +/* 99DAD0 80241140 8C420014 */ lw $v0, 0x14($v0) +/* 99DAD4 80241144 04410009 */ bgez $v0, .L8024116C +/* 99DAD8 80241148 00000000 */ nop +/* 99DADC 8024114C C640000C */ lwc1 $f0, 0xc($s2) +/* 99DAE0 80241150 3C018024 */ lui $at, 0x8024 +/* 99DAE4 80241154 D42244A8 */ ldc1 $f2, 0x44a8($at) +/* 99DAE8 80241158 46000021 */ cvt.d.s $f0, $f0 +/* 99DAEC 8024115C 46220002 */ mul.d $f0, $f0, $f2 +/* 99DAF0 80241160 00000000 */ nop +/* 99DAF4 80241164 08090462 */ j .L80241188 +/* 99DAF8 80241168 46200020 */ cvt.s.d $f0, $f0 +.L8024116C: +/* 99DAFC 8024116C 3C018024 */ lui $at, 0x8024 +/* 99DB00 80241170 D42244B0 */ ldc1 $f2, 0x44b0($at) +/* 99DB04 80241174 44820000 */ mtc1 $v0, $f0 +/* 99DB08 80241178 00000000 */ nop +/* 99DB0C 8024117C 46800021 */ cvt.d.w $f0, $f0 +/* 99DB10 80241180 46220003 */ div.d $f0, $f0, $f2 +/* 99DB14 80241184 46200020 */ cvt.s.d $f0, $f0 +.L80241188: +/* 99DB18 80241188 E4800018 */ swc1 $f0, 0x18($a0) +/* 99DB1C 8024118C 24020010 */ addiu $v0, $zero, 0x10 +/* 99DB20 80241190 AE200074 */ sw $zero, 0x74($s1) +/* 99DB24 80241194 AE220070 */ sw $v0, 0x70($s1) +/* 99DB28 80241198 8FBF001C */ lw $ra, 0x1c($sp) +/* 99DB2C 8024119C 8FB20018 */ lw $s2, 0x18($sp) +/* 99DB30 802411A0 8FB10014 */ lw $s1, 0x14($sp) +/* 99DB34 802411A4 8FB00010 */ lw $s0, 0x10($sp) +/* 99DB38 802411A8 03E00008 */ jr $ra +/* 99DB3C 802411AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0.s deleted file mode 100644 index 1828e7812f..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0.s +++ /dev/null @@ -1,140 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411B0 -/* 99DB40 802411B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 99DB44 802411B4 AFB3003C */ sw $s3, 0x3c($sp) -/* 99DB48 802411B8 0080982D */ daddu $s3, $a0, $zero -/* 99DB4C 802411BC AFBF0044 */ sw $ra, 0x44($sp) -/* 99DB50 802411C0 AFB40040 */ sw $s4, 0x40($sp) -/* 99DB54 802411C4 AFB20038 */ sw $s2, 0x38($sp) -/* 99DB58 802411C8 AFB10034 */ sw $s1, 0x34($sp) -/* 99DB5C 802411CC AFB00030 */ sw $s0, 0x30($sp) -/* 99DB60 802411D0 8E710148 */ lw $s1, 0x148($s3) -/* 99DB64 802411D4 00A0902D */ daddu $s2, $a1, $zero -/* 99DB68 802411D8 86240008 */ lh $a0, 8($s1) -/* 99DB6C 802411DC 0C00EABB */ jal get_npc_unsafe -/* 99DB70 802411E0 00C0A02D */ daddu $s4, $a2, $zero -/* 99DB74 802411E4 8E430008 */ lw $v1, 8($s2) -/* 99DB78 802411E8 0460003B */ bltz $v1, .L802412D8 -/* 99DB7C 802411EC 0040802D */ daddu $s0, $v0, $zero -/* 99DB80 802411F0 8E620074 */ lw $v0, 0x74($s3) -/* 99DB84 802411F4 1C400037 */ bgtz $v0, .L802412D4 -/* 99DB88 802411F8 2442FFFF */ addiu $v0, $v0, -1 -/* 99DB8C 802411FC 0280202D */ daddu $a0, $s4, $zero -/* 99DB90 80241200 AE630074 */ sw $v1, 0x74($s3) -/* 99DB94 80241204 AFA00010 */ sw $zero, 0x10($sp) -/* 99DB98 80241208 8E460018 */ lw $a2, 0x18($s2) -/* 99DB9C 8024120C 8E47001C */ lw $a3, 0x1c($s2) -/* 99DBA0 80241210 0C01242D */ jal func_800490B4 -/* 99DBA4 80241214 0220282D */ daddu $a1, $s1, $zero -/* 99DBA8 80241218 1040002C */ beqz $v0, .L802412CC -/* 99DBAC 8024121C 0000202D */ daddu $a0, $zero, $zero -/* 99DBB0 80241220 0200282D */ daddu $a1, $s0, $zero -/* 99DBB4 80241224 0000302D */ daddu $a2, $zero, $zero -/* 99DBB8 80241228 860300A8 */ lh $v1, 0xa8($s0) -/* 99DBBC 8024122C 3C013F80 */ lui $at, 0x3f80 -/* 99DBC0 80241230 44810000 */ mtc1 $at, $f0 -/* 99DBC4 80241234 3C014000 */ lui $at, 0x4000 -/* 99DBC8 80241238 44811000 */ mtc1 $at, $f2 -/* 99DBCC 8024123C 3C01C1A0 */ lui $at, 0xc1a0 -/* 99DBD0 80241240 44812000 */ mtc1 $at, $f4 -/* 99DBD4 80241244 2402000F */ addiu $v0, $zero, 0xf -/* 99DBD8 80241248 AFA2001C */ sw $v0, 0x1c($sp) -/* 99DBDC 8024124C 44833000 */ mtc1 $v1, $f6 -/* 99DBE0 80241250 00000000 */ nop -/* 99DBE4 80241254 468031A0 */ cvt.s.w $f6, $f6 -/* 99DBE8 80241258 44073000 */ mfc1 $a3, $f6 -/* 99DBEC 8024125C 27A20028 */ addiu $v0, $sp, 0x28 -/* 99DBF0 80241260 AFA20020 */ sw $v0, 0x20($sp) -/* 99DBF4 80241264 E7A00010 */ swc1 $f0, 0x10($sp) -/* 99DBF8 80241268 E7A20014 */ swc1 $f2, 0x14($sp) -/* 99DBFC 8024126C 0C01BFA4 */ jal fx_emote -/* 99DC00 80241270 E7A40018 */ swc1 $f4, 0x18($sp) -/* 99DC04 80241274 0200202D */ daddu $a0, $s0, $zero -/* 99DC08 80241278 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 99DC0C 8024127C 0C012530 */ jal func_800494C0 -/* 99DC10 80241280 3C060020 */ lui $a2, 0x20 -/* 99DC14 80241284 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99DC18 80241288 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 99DC1C 8024128C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 99DC20 80241290 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 99DC24 80241294 8C460028 */ lw $a2, 0x28($v0) -/* 99DC28 80241298 0C00A720 */ jal atan2 -/* 99DC2C 8024129C 8C470030 */ lw $a3, 0x30($v0) -/* 99DC30 802412A0 E600000C */ swc1 $f0, 0xc($s0) -/* 99DC34 802412A4 8E220018 */ lw $v0, 0x18($s1) -/* 99DC38 802412A8 9442002A */ lhu $v0, 0x2a($v0) -/* 99DC3C 802412AC 30420001 */ andi $v0, $v0, 1 -/* 99DC40 802412B0 10400003 */ beqz $v0, .L802412C0 -/* 99DC44 802412B4 2402000A */ addiu $v0, $zero, 0xa -/* 99DC48 802412B8 080904E6 */ j .L80241398 -/* 99DC4C 802412BC AE620070 */ sw $v0, 0x70($s3) -.L802412C0: -/* 99DC50 802412C0 2402000C */ addiu $v0, $zero, 0xc -/* 99DC54 802412C4 080904E6 */ j .L80241398 -/* 99DC58 802412C8 AE620070 */ sw $v0, 0x70($s3) -.L802412CC: -/* 99DC5C 802412CC 8E620074 */ lw $v0, 0x74($s3) -/* 99DC60 802412D0 2442FFFF */ addiu $v0, $v0, -1 -.L802412D4: -/* 99DC64 802412D4 AE620074 */ sw $v0, 0x74($s3) -.L802412D8: -/* 99DC68 802412D8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99DC6C 802412DC 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DC70 802412E0 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 99DC74 802412E4 C4460000 */ lwc1 $f6, ($v0) -/* 99DC78 802412E8 468031A0 */ cvt.s.w $f6, $f6 -/* 99DC7C 802412EC 44063000 */ mfc1 $a2, $f6 -/* 99DC80 802412F0 C4460008 */ lwc1 $f6, 8($v0) -/* 99DC84 802412F4 468031A0 */ cvt.s.w $f6, $f6 -/* 99DC88 802412F8 44073000 */ mfc1 $a3, $f6 -/* 99DC8C 802412FC 0C00A7B5 */ jal dist2D -/* 99DC90 80241300 00000000 */ nop -/* 99DC94 80241304 C6020018 */ lwc1 $f2, 0x18($s0) -/* 99DC98 80241308 4602003C */ c.lt.s $f0, $f2 -/* 99DC9C 8024130C 00000000 */ nop -/* 99DCA0 80241310 4500000E */ bc1f .L8024134C -/* 99DCA4 80241314 00000000 */ nop -/* 99DCA8 80241318 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DCAC 8024131C C4400000 */ lwc1 $f0, ($v0) -/* 99DCB0 80241320 46800020 */ cvt.s.w $f0, $f0 -/* 99DCB4 80241324 E6000038 */ swc1 $f0, 0x38($s0) -/* 99DCB8 80241328 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DCBC 8024132C C4400008 */ lwc1 $f0, 8($v0) -/* 99DCC0 80241330 46800020 */ cvt.s.w $f0, $f0 -/* 99DCC4 80241334 E6000040 */ swc1 $f0, 0x40($s0) -/* 99DCC8 80241338 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DCCC 8024133C C440000C */ lwc1 $f0, 0xc($v0) -/* 99DCD0 80241340 46800020 */ cvt.s.w $f0, $f0 -/* 99DCD4 80241344 E600000C */ swc1 $f0, 0xc($s0) -/* 99DCD8 80241348 AE600070 */ sw $zero, 0x70($s3) -.L8024134C: -/* 99DCDC 8024134C 8602008C */ lh $v0, 0x8c($s0) -/* 99DCE0 80241350 14400011 */ bnez $v0, .L80241398 -/* 99DCE4 80241354 00000000 */ nop -/* 99DCE8 80241358 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 99DCEC 8024135C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 99DCF0 80241360 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 99DCF4 80241364 C4460000 */ lwc1 $f6, ($v0) -/* 99DCF8 80241368 468031A0 */ cvt.s.w $f6, $f6 -/* 99DCFC 8024136C 44063000 */ mfc1 $a2, $f6 -/* 99DD00 80241370 C4460008 */ lwc1 $f6, 8($v0) -/* 99DD04 80241374 468031A0 */ cvt.s.w $f6, $f6 -/* 99DD08 80241378 44073000 */ mfc1 $a3, $f6 -/* 99DD0C 8024137C 0C00A720 */ jal atan2 -/* 99DD10 80241380 00000000 */ nop -/* 99DD14 80241384 8E050018 */ lw $a1, 0x18($s0) -/* 99DD18 80241388 44060000 */ mfc1 $a2, $f0 -/* 99DD1C 8024138C 0200202D */ daddu $a0, $s0, $zero -/* 99DD20 80241390 0C00EA95 */ jal npc_move_heading -/* 99DD24 80241394 AC86000C */ sw $a2, 0xc($a0) -.L80241398: -/* 99DD28 80241398 8FBF0044 */ lw $ra, 0x44($sp) -/* 99DD2C 8024139C 8FB40040 */ lw $s4, 0x40($sp) -/* 99DD30 802413A0 8FB3003C */ lw $s3, 0x3c($sp) -/* 99DD34 802413A4 8FB20038 */ lw $s2, 0x38($sp) -/* 99DD38 802413A8 8FB10034 */ lw $s1, 0x34($sp) -/* 99DD3C 802413AC 8FB00030 */ lw $s0, 0x30($sp) -/* 99DD40 802413B0 03E00008 */ jr $ra -/* 99DD44 802413B4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s new file mode 100644 index 0000000000..3131e0006a --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802411B0_99DB40.s @@ -0,0 +1,140 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802411B0_99DB40 +/* 99DB40 802411B0 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 99DB44 802411B4 AFB3003C */ sw $s3, 0x3c($sp) +/* 99DB48 802411B8 0080982D */ daddu $s3, $a0, $zero +/* 99DB4C 802411BC AFBF0044 */ sw $ra, 0x44($sp) +/* 99DB50 802411C0 AFB40040 */ sw $s4, 0x40($sp) +/* 99DB54 802411C4 AFB20038 */ sw $s2, 0x38($sp) +/* 99DB58 802411C8 AFB10034 */ sw $s1, 0x34($sp) +/* 99DB5C 802411CC AFB00030 */ sw $s0, 0x30($sp) +/* 99DB60 802411D0 8E710148 */ lw $s1, 0x148($s3) +/* 99DB64 802411D4 00A0902D */ daddu $s2, $a1, $zero +/* 99DB68 802411D8 86240008 */ lh $a0, 8($s1) +/* 99DB6C 802411DC 0C00EABB */ jal get_npc_unsafe +/* 99DB70 802411E0 00C0A02D */ daddu $s4, $a2, $zero +/* 99DB74 802411E4 8E430008 */ lw $v1, 8($s2) +/* 99DB78 802411E8 0460003B */ bltz $v1, .L802412D8 +/* 99DB7C 802411EC 0040802D */ daddu $s0, $v0, $zero +/* 99DB80 802411F0 8E620074 */ lw $v0, 0x74($s3) +/* 99DB84 802411F4 1C400037 */ bgtz $v0, .L802412D4 +/* 99DB88 802411F8 2442FFFF */ addiu $v0, $v0, -1 +/* 99DB8C 802411FC 0280202D */ daddu $a0, $s4, $zero +/* 99DB90 80241200 AE630074 */ sw $v1, 0x74($s3) +/* 99DB94 80241204 AFA00010 */ sw $zero, 0x10($sp) +/* 99DB98 80241208 8E460018 */ lw $a2, 0x18($s2) +/* 99DB9C 8024120C 8E47001C */ lw $a3, 0x1c($s2) +/* 99DBA0 80241210 0C01242D */ jal func_800490B4 +/* 99DBA4 80241214 0220282D */ daddu $a1, $s1, $zero +/* 99DBA8 80241218 1040002C */ beqz $v0, .L802412CC +/* 99DBAC 8024121C 0000202D */ daddu $a0, $zero, $zero +/* 99DBB0 80241220 0200282D */ daddu $a1, $s0, $zero +/* 99DBB4 80241224 0000302D */ daddu $a2, $zero, $zero +/* 99DBB8 80241228 860300A8 */ lh $v1, 0xa8($s0) +/* 99DBBC 8024122C 3C013F80 */ lui $at, 0x3f80 +/* 99DBC0 80241230 44810000 */ mtc1 $at, $f0 +/* 99DBC4 80241234 3C014000 */ lui $at, 0x4000 +/* 99DBC8 80241238 44811000 */ mtc1 $at, $f2 +/* 99DBCC 8024123C 3C01C1A0 */ lui $at, 0xc1a0 +/* 99DBD0 80241240 44812000 */ mtc1 $at, $f4 +/* 99DBD4 80241244 2402000F */ addiu $v0, $zero, 0xf +/* 99DBD8 80241248 AFA2001C */ sw $v0, 0x1c($sp) +/* 99DBDC 8024124C 44833000 */ mtc1 $v1, $f6 +/* 99DBE0 80241250 00000000 */ nop +/* 99DBE4 80241254 468031A0 */ cvt.s.w $f6, $f6 +/* 99DBE8 80241258 44073000 */ mfc1 $a3, $f6 +/* 99DBEC 8024125C 27A20028 */ addiu $v0, $sp, 0x28 +/* 99DBF0 80241260 AFA20020 */ sw $v0, 0x20($sp) +/* 99DBF4 80241264 E7A00010 */ swc1 $f0, 0x10($sp) +/* 99DBF8 80241268 E7A20014 */ swc1 $f2, 0x14($sp) +/* 99DBFC 8024126C 0C01BFA4 */ jal fx_emote +/* 99DC00 80241270 E7A40018 */ swc1 $f4, 0x18($sp) +/* 99DC04 80241274 0200202D */ daddu $a0, $s0, $zero +/* 99DC08 80241278 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 99DC0C 8024127C 0C012530 */ jal func_800494C0 +/* 99DC10 80241280 3C060020 */ lui $a2, 0x20 +/* 99DC14 80241284 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 99DC18 80241288 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 99DC1C 8024128C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 99DC20 80241290 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 99DC24 80241294 8C460028 */ lw $a2, 0x28($v0) +/* 99DC28 80241298 0C00A720 */ jal atan2 +/* 99DC2C 8024129C 8C470030 */ lw $a3, 0x30($v0) +/* 99DC30 802412A0 E600000C */ swc1 $f0, 0xc($s0) +/* 99DC34 802412A4 8E220018 */ lw $v0, 0x18($s1) +/* 99DC38 802412A8 9442002A */ lhu $v0, 0x2a($v0) +/* 99DC3C 802412AC 30420001 */ andi $v0, $v0, 1 +/* 99DC40 802412B0 10400003 */ beqz $v0, .L802412C0 +/* 99DC44 802412B4 2402000A */ addiu $v0, $zero, 0xa +/* 99DC48 802412B8 080904E6 */ j .L80241398 +/* 99DC4C 802412BC AE620070 */ sw $v0, 0x70($s3) +.L802412C0: +/* 99DC50 802412C0 2402000C */ addiu $v0, $zero, 0xc +/* 99DC54 802412C4 080904E6 */ j .L80241398 +/* 99DC58 802412C8 AE620070 */ sw $v0, 0x70($s3) +.L802412CC: +/* 99DC5C 802412CC 8E620074 */ lw $v0, 0x74($s3) +/* 99DC60 802412D0 2442FFFF */ addiu $v0, $v0, -1 +.L802412D4: +/* 99DC64 802412D4 AE620074 */ sw $v0, 0x74($s3) +.L802412D8: +/* 99DC68 802412D8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 99DC6C 802412DC 8E2200D0 */ lw $v0, 0xd0($s1) +/* 99DC70 802412E0 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 99DC74 802412E4 C4460000 */ lwc1 $f6, ($v0) +/* 99DC78 802412E8 468031A0 */ cvt.s.w $f6, $f6 +/* 99DC7C 802412EC 44063000 */ mfc1 $a2, $f6 +/* 99DC80 802412F0 C4460008 */ lwc1 $f6, 8($v0) +/* 99DC84 802412F4 468031A0 */ cvt.s.w $f6, $f6 +/* 99DC88 802412F8 44073000 */ mfc1 $a3, $f6 +/* 99DC8C 802412FC 0C00A7B5 */ jal dist2D +/* 99DC90 80241300 00000000 */ nop +/* 99DC94 80241304 C6020018 */ lwc1 $f2, 0x18($s0) +/* 99DC98 80241308 4602003C */ c.lt.s $f0, $f2 +/* 99DC9C 8024130C 00000000 */ nop +/* 99DCA0 80241310 4500000E */ bc1f .L8024134C +/* 99DCA4 80241314 00000000 */ nop +/* 99DCA8 80241318 8E2200D0 */ lw $v0, 0xd0($s1) +/* 99DCAC 8024131C C4400000 */ lwc1 $f0, ($v0) +/* 99DCB0 80241320 46800020 */ cvt.s.w $f0, $f0 +/* 99DCB4 80241324 E6000038 */ swc1 $f0, 0x38($s0) +/* 99DCB8 80241328 8E2200D0 */ lw $v0, 0xd0($s1) +/* 99DCBC 8024132C C4400008 */ lwc1 $f0, 8($v0) +/* 99DCC0 80241330 46800020 */ cvt.s.w $f0, $f0 +/* 99DCC4 80241334 E6000040 */ swc1 $f0, 0x40($s0) +/* 99DCC8 80241338 8E2200D0 */ lw $v0, 0xd0($s1) +/* 99DCCC 8024133C C440000C */ lwc1 $f0, 0xc($v0) +/* 99DCD0 80241340 46800020 */ cvt.s.w $f0, $f0 +/* 99DCD4 80241344 E600000C */ swc1 $f0, 0xc($s0) +/* 99DCD8 80241348 AE600070 */ sw $zero, 0x70($s3) +.L8024134C: +/* 99DCDC 8024134C 8602008C */ lh $v0, 0x8c($s0) +/* 99DCE0 80241350 14400011 */ bnez $v0, .L80241398 +/* 99DCE4 80241354 00000000 */ nop +/* 99DCE8 80241358 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 99DCEC 8024135C 8E2200D0 */ lw $v0, 0xd0($s1) +/* 99DCF0 80241360 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 99DCF4 80241364 C4460000 */ lwc1 $f6, ($v0) +/* 99DCF8 80241368 468031A0 */ cvt.s.w $f6, $f6 +/* 99DCFC 8024136C 44063000 */ mfc1 $a2, $f6 +/* 99DD00 80241370 C4460008 */ lwc1 $f6, 8($v0) +/* 99DD04 80241374 468031A0 */ cvt.s.w $f6, $f6 +/* 99DD08 80241378 44073000 */ mfc1 $a3, $f6 +/* 99DD0C 8024137C 0C00A720 */ jal atan2 +/* 99DD10 80241380 00000000 */ nop +/* 99DD14 80241384 8E050018 */ lw $a1, 0x18($s0) +/* 99DD18 80241388 44060000 */ mfc1 $a2, $f0 +/* 99DD1C 8024138C 0200202D */ daddu $a0, $s0, $zero +/* 99DD20 80241390 0C00EA95 */ jal npc_move_heading +/* 99DD24 80241394 AC86000C */ sw $a2, 0xc($a0) +.L80241398: +/* 99DD28 80241398 8FBF0044 */ lw $ra, 0x44($sp) +/* 99DD2C 8024139C 8FB40040 */ lw $s4, 0x40($sp) +/* 99DD30 802413A0 8FB3003C */ lw $s3, 0x3c($sp) +/* 99DD34 802413A4 8FB20038 */ lw $s2, 0x38($sp) +/* 99DD38 802413A8 8FB10034 */ lw $s1, 0x34($sp) +/* 99DD3C 802413AC 8FB00030 */ lw $s0, 0x30($sp) +/* 99DD40 802413B0 03E00008 */ jr $ra +/* 99DD44 802413B4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8.s deleted file mode 100644 index 3440271a9f..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8.s +++ /dev/null @@ -1,168 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413B8 -/* 99DD48 802413B8 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 99DD4C 802413BC AFB40040 */ sw $s4, 0x40($sp) -/* 99DD50 802413C0 0080A02D */ daddu $s4, $a0, $zero -/* 99DD54 802413C4 AFBF0048 */ sw $ra, 0x48($sp) -/* 99DD58 802413C8 AFB50044 */ sw $s5, 0x44($sp) -/* 99DD5C 802413CC AFB3003C */ sw $s3, 0x3c($sp) -/* 99DD60 802413D0 AFB20038 */ sw $s2, 0x38($sp) -/* 99DD64 802413D4 AFB10034 */ sw $s1, 0x34($sp) -/* 99DD68 802413D8 AFB00030 */ sw $s0, 0x30($sp) -/* 99DD6C 802413DC 8E920148 */ lw $s2, 0x148($s4) -/* 99DD70 802413E0 86440008 */ lh $a0, 8($s2) -/* 99DD74 802413E4 8E90000C */ lw $s0, 0xc($s4) -/* 99DD78 802413E8 0C00EABB */ jal get_npc_unsafe -/* 99DD7C 802413EC 00A0882D */ daddu $s1, $a1, $zero -/* 99DD80 802413F0 0280202D */ daddu $a0, $s4, $zero -/* 99DD84 802413F4 8E050000 */ lw $a1, ($s0) -/* 99DD88 802413F8 0C0B1EAF */ jal get_variable -/* 99DD8C 802413FC 0040802D */ daddu $s0, $v0, $zero -/* 99DD90 80241400 AFA00010 */ sw $zero, 0x10($sp) -/* 99DD94 80241404 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DD98 80241408 8C630030 */ lw $v1, 0x30($v1) -/* 99DD9C 8024140C AFA30014 */ sw $v1, 0x14($sp) -/* 99DDA0 80241410 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DDA4 80241414 8C63001C */ lw $v1, 0x1c($v1) -/* 99DDA8 80241418 AFA30018 */ sw $v1, 0x18($sp) -/* 99DDAC 8024141C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DDB0 80241420 8C630024 */ lw $v1, 0x24($v1) -/* 99DDB4 80241424 AFA3001C */ sw $v1, 0x1c($sp) -/* 99DDB8 80241428 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DDBC 8024142C 8C630028 */ lw $v1, 0x28($v1) -/* 99DDC0 80241430 27B50010 */ addiu $s5, $sp, 0x10 -/* 99DDC4 80241434 AFA30020 */ sw $v1, 0x20($sp) -/* 99DDC8 80241438 8E4300D0 */ lw $v1, 0xd0($s2) -/* 99DDCC 8024143C 3C014282 */ lui $at, 0x4282 -/* 99DDD0 80241440 44810000 */ mtc1 $at, $f0 -/* 99DDD4 80241444 8C63002C */ lw $v1, 0x2c($v1) -/* 99DDD8 80241448 0040982D */ daddu $s3, $v0, $zero -/* 99DDDC 8024144C E7A00028 */ swc1 $f0, 0x28($sp) -/* 99DDE0 80241450 A7A0002C */ sh $zero, 0x2c($sp) -/* 99DDE4 80241454 16200005 */ bnez $s1, .L8024146C -/* 99DDE8 80241458 AFA30024 */ sw $v1, 0x24($sp) -/* 99DDEC 8024145C 8E4200B0 */ lw $v0, 0xb0($s2) -/* 99DDF0 80241460 30420004 */ andi $v0, $v0, 4 -/* 99DDF4 80241464 1040002F */ beqz $v0, .L80241524 -/* 99DDF8 80241468 00000000 */ nop -.L8024146C: -/* 99DDFC 8024146C AE800070 */ sw $zero, 0x70($s4) -/* 99DE00 80241470 C600000C */ lwc1 $f0, 0xc($s0) -/* 99DE04 80241474 A600008E */ sh $zero, 0x8e($s0) -/* 99DE08 80241478 8E4200CC */ lw $v0, 0xcc($s2) -/* 99DE0C 8024147C 4600008D */ trunc.w.s $f2, $f0 -/* 99DE10 80241480 E642006C */ swc1 $f2, 0x6c($s2) -/* 99DE14 80241484 8C420000 */ lw $v0, ($v0) -/* 99DE18 80241488 8E030000 */ lw $v1, ($s0) -/* 99DE1C 8024148C AE020028 */ sw $v0, 0x28($s0) -/* 99DE20 80241490 2402F7FF */ addiu $v0, $zero, -0x801 -/* 99DE24 80241494 00621824 */ and $v1, $v1, $v0 -/* 99DE28 80241498 AE030000 */ sw $v1, ($s0) -/* 99DE2C 8024149C 8E4200D0 */ lw $v0, 0xd0($s2) -/* 99DE30 802414A0 8C420034 */ lw $v0, 0x34($v0) -/* 99DE34 802414A4 54400005 */ bnel $v0, $zero, .L802414BC -/* 99DE38 802414A8 2402FDFF */ addiu $v0, $zero, -0x201 -/* 99DE3C 802414AC 34620200 */ ori $v0, $v1, 0x200 -/* 99DE40 802414B0 2403FFF7 */ addiu $v1, $zero, -9 -/* 99DE44 802414B4 08090531 */ j .L802414C4 -/* 99DE48 802414B8 00431024 */ and $v0, $v0, $v1 -.L802414BC: -/* 99DE4C 802414BC 00621024 */ and $v0, $v1, $v0 -/* 99DE50 802414C0 34420008 */ ori $v0, $v0, 8 -.L802414C4: -/* 99DE54 802414C4 AE020000 */ sw $v0, ($s0) -/* 99DE58 802414C8 8E4200B0 */ lw $v0, 0xb0($s2) -/* 99DE5C 802414CC 30420004 */ andi $v0, $v0, 4 -/* 99DE60 802414D0 10400009 */ beqz $v0, .L802414F8 -/* 99DE64 802414D4 24020063 */ addiu $v0, $zero, 0x63 -/* 99DE68 802414D8 AE820070 */ sw $v0, 0x70($s4) -/* 99DE6C 802414DC 2402000F */ addiu $v0, $zero, 0xf -/* 99DE70 802414E0 AE820074 */ sw $v0, 0x74($s4) -/* 99DE74 802414E4 8E4200B0 */ lw $v0, 0xb0($s2) -/* 99DE78 802414E8 2403FFFB */ addiu $v1, $zero, -5 -/* 99DE7C 802414EC 00431024 */ and $v0, $v0, $v1 -/* 99DE80 802414F0 08090549 */ j .L80241524 -/* 99DE84 802414F4 AE4200B0 */ sw $v0, 0xb0($s2) -.L802414F8: -/* 99DE88 802414F8 8E420000 */ lw $v0, ($s2) -/* 99DE8C 802414FC 3C034000 */ lui $v1, 0x4000 -/* 99DE90 80241500 00431024 */ and $v0, $v0, $v1 -/* 99DE94 80241504 10400007 */ beqz $v0, .L80241524 -/* 99DE98 80241508 3C03BFFF */ lui $v1, 0xbfff -/* 99DE9C 8024150C 2402000C */ addiu $v0, $zero, 0xc -/* 99DEA0 80241510 AE820070 */ sw $v0, 0x70($s4) -/* 99DEA4 80241514 8E420000 */ lw $v0, ($s2) -/* 99DEA8 80241518 3463FFFF */ ori $v1, $v1, 0xffff -/* 99DEAC 8024151C 00431024 */ and $v0, $v0, $v1 -/* 99DEB0 80241520 AE420000 */ sw $v0, ($s2) -.L80241524: -/* 99DEB4 80241524 8E830070 */ lw $v1, 0x70($s4) -/* 99DEB8 80241528 2C620064 */ sltiu $v0, $v1, 0x64 -/* 99DEBC 8024152C 10400036 */ beqz $v0, .L80241608 -/* 99DEC0 80241530 00031080 */ sll $v0, $v1, 2 -/* 99DEC4 80241534 3C018024 */ lui $at, 0x8024 -/* 99DEC8 80241538 00220821 */ addu $at, $at, $v0 -/* 99DECC 8024153C 8C2244B8 */ lw $v0, 0x44b8($at) -/* 99DED0 80241540 00400008 */ jr $v0 -/* 99DED4 80241544 00000000 */ nop -/* 99DED8 80241548 0280202D */ daddu $a0, $s4, $zero -/* 99DEDC 8024154C 0260282D */ daddu $a1, $s3, $zero -/* 99DEE0 80241550 0C0902F1 */ jal func_80240BC4 -/* 99DEE4 80241554 02A0302D */ daddu $a2, $s5, $zero -/* 99DEE8 80241558 0280202D */ daddu $a0, $s4, $zero -/* 99DEEC 8024155C 0260282D */ daddu $a1, $s3, $zero -/* 99DEF0 80241560 0C09031E */ jal func_80240C78 -/* 99DEF4 80241564 02A0302D */ daddu $a2, $s5, $zero -/* 99DEF8 80241568 08090582 */ j .L80241608 -/* 99DEFC 8024156C 00000000 */ nop -/* 99DF00 80241570 0280202D */ daddu $a0, $s4, $zero -/* 99DF04 80241574 0260282D */ daddu $a1, $s3, $zero -/* 99DF08 80241578 0C090366 */ jal func_80240D98 -/* 99DF0C 8024157C 02A0302D */ daddu $a2, $s5, $zero -/* 99DF10 80241580 0280202D */ daddu $a0, $s4, $zero -/* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero -/* 99DF18 80241588 0C09037E */ jal func_80240DF8 -/* 99DF1C 8024158C 02A0302D */ daddu $a2, $s5, $zero -/* 99DF20 80241590 08090582 */ j .L80241608 -/* 99DF24 80241594 00000000 */ nop -/* 99DF28 80241598 0280202D */ daddu $a0, $s4, $zero -/* 99DF2C 8024159C 0260282D */ daddu $a1, $s3, $zero -/* 99DF30 802415A0 0C09039C */ jal func_80240E70 -/* 99DF34 802415A4 02A0302D */ daddu $a2, $s5, $zero -/* 99DF38 802415A8 0280202D */ daddu $a0, $s4, $zero -/* 99DF3C 802415AC 0260282D */ daddu $a1, $s3, $zero -/* 99DF40 802415B0 0C0903E8 */ jal func_80240FA0 -/* 99DF44 802415B4 02A0302D */ daddu $a2, $s5, $zero -/* 99DF48 802415B8 08090582 */ j .L80241608 -/* 99DF4C 802415BC 00000000 */ nop -/* 99DF50 802415C0 0280202D */ daddu $a0, $s4, $zero -/* 99DF54 802415C4 0260282D */ daddu $a1, $s3, $zero -/* 99DF58 802415C8 0C09042F */ jal func_802410BC -/* 99DF5C 802415CC 02A0302D */ daddu $a2, $s5, $zero -/* 99DF60 802415D0 08090582 */ j .L80241608 -/* 99DF64 802415D4 00000000 */ nop -/* 99DF68 802415D8 0280202D */ daddu $a0, $s4, $zero -/* 99DF6C 802415DC 0260282D */ daddu $a1, $s3, $zero -/* 99DF70 802415E0 0C090441 */ jal func_80241104 -/* 99DF74 802415E4 02A0302D */ daddu $a2, $s5, $zero -/* 99DF78 802415E8 0280202D */ daddu $a0, $s4, $zero -/* 99DF7C 802415EC 0260282D */ daddu $a1, $s3, $zero -/* 99DF80 802415F0 0C09046C */ jal func_802411B0 -/* 99DF84 802415F4 02A0302D */ daddu $a2, $s5, $zero -/* 99DF88 802415F8 08090582 */ j .L80241608 -/* 99DF8C 802415FC 00000000 */ nop -/* 99DF90 80241600 0C0129CF */ jal func_8004A73C -/* 99DF94 80241604 0280202D */ daddu $a0, $s4, $zero -.L80241608: -/* 99DF98 80241608 8FBF0048 */ lw $ra, 0x48($sp) -/* 99DF9C 8024160C 8FB50044 */ lw $s5, 0x44($sp) -/* 99DFA0 80241610 8FB40040 */ lw $s4, 0x40($sp) -/* 99DFA4 80241614 8FB3003C */ lw $s3, 0x3c($sp) -/* 99DFA8 80241618 8FB20038 */ lw $s2, 0x38($sp) -/* 99DFAC 8024161C 8FB10034 */ lw $s1, 0x34($sp) -/* 99DFB0 80241620 8FB00030 */ lw $s0, 0x30($sp) -/* 99DFB4 80241624 0000102D */ daddu $v0, $zero, $zero -/* 99DFB8 80241628 03E00008 */ jr $ra -/* 99DFBC 8024162C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s new file mode 100644 index 0000000000..c4e84313dd --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_802413B8_99DD48.s @@ -0,0 +1,168 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413B8_99DD48 +/* 99DD48 802413B8 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 99DD4C 802413BC AFB40040 */ sw $s4, 0x40($sp) +/* 99DD50 802413C0 0080A02D */ daddu $s4, $a0, $zero +/* 99DD54 802413C4 AFBF0048 */ sw $ra, 0x48($sp) +/* 99DD58 802413C8 AFB50044 */ sw $s5, 0x44($sp) +/* 99DD5C 802413CC AFB3003C */ sw $s3, 0x3c($sp) +/* 99DD60 802413D0 AFB20038 */ sw $s2, 0x38($sp) +/* 99DD64 802413D4 AFB10034 */ sw $s1, 0x34($sp) +/* 99DD68 802413D8 AFB00030 */ sw $s0, 0x30($sp) +/* 99DD6C 802413DC 8E920148 */ lw $s2, 0x148($s4) +/* 99DD70 802413E0 86440008 */ lh $a0, 8($s2) +/* 99DD74 802413E4 8E90000C */ lw $s0, 0xc($s4) +/* 99DD78 802413E8 0C00EABB */ jal get_npc_unsafe +/* 99DD7C 802413EC 00A0882D */ daddu $s1, $a1, $zero +/* 99DD80 802413F0 0280202D */ daddu $a0, $s4, $zero +/* 99DD84 802413F4 8E050000 */ lw $a1, ($s0) +/* 99DD88 802413F8 0C0B1EAF */ jal get_variable +/* 99DD8C 802413FC 0040802D */ daddu $s0, $v0, $zero +/* 99DD90 80241400 AFA00010 */ sw $zero, 0x10($sp) +/* 99DD94 80241404 8E4300D0 */ lw $v1, 0xd0($s2) +/* 99DD98 80241408 8C630030 */ lw $v1, 0x30($v1) +/* 99DD9C 8024140C AFA30014 */ sw $v1, 0x14($sp) +/* 99DDA0 80241410 8E4300D0 */ lw $v1, 0xd0($s2) +/* 99DDA4 80241414 8C63001C */ lw $v1, 0x1c($v1) +/* 99DDA8 80241418 AFA30018 */ sw $v1, 0x18($sp) +/* 99DDAC 8024141C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 99DDB0 80241420 8C630024 */ lw $v1, 0x24($v1) +/* 99DDB4 80241424 AFA3001C */ sw $v1, 0x1c($sp) +/* 99DDB8 80241428 8E4300D0 */ lw $v1, 0xd0($s2) +/* 99DDBC 8024142C 8C630028 */ lw $v1, 0x28($v1) +/* 99DDC0 80241430 27B50010 */ addiu $s5, $sp, 0x10 +/* 99DDC4 80241434 AFA30020 */ sw $v1, 0x20($sp) +/* 99DDC8 80241438 8E4300D0 */ lw $v1, 0xd0($s2) +/* 99DDCC 8024143C 3C014282 */ lui $at, 0x4282 +/* 99DDD0 80241440 44810000 */ mtc1 $at, $f0 +/* 99DDD4 80241444 8C63002C */ lw $v1, 0x2c($v1) +/* 99DDD8 80241448 0040982D */ daddu $s3, $v0, $zero +/* 99DDDC 8024144C E7A00028 */ swc1 $f0, 0x28($sp) +/* 99DDE0 80241450 A7A0002C */ sh $zero, 0x2c($sp) +/* 99DDE4 80241454 16200005 */ bnez $s1, .L8024146C +/* 99DDE8 80241458 AFA30024 */ sw $v1, 0x24($sp) +/* 99DDEC 8024145C 8E4200B0 */ lw $v0, 0xb0($s2) +/* 99DDF0 80241460 30420004 */ andi $v0, $v0, 4 +/* 99DDF4 80241464 1040002F */ beqz $v0, .L80241524 +/* 99DDF8 80241468 00000000 */ nop +.L8024146C: +/* 99DDFC 8024146C AE800070 */ sw $zero, 0x70($s4) +/* 99DE00 80241470 C600000C */ lwc1 $f0, 0xc($s0) +/* 99DE04 80241474 A600008E */ sh $zero, 0x8e($s0) +/* 99DE08 80241478 8E4200CC */ lw $v0, 0xcc($s2) +/* 99DE0C 8024147C 4600008D */ trunc.w.s $f2, $f0 +/* 99DE10 80241480 E642006C */ swc1 $f2, 0x6c($s2) +/* 99DE14 80241484 8C420000 */ lw $v0, ($v0) +/* 99DE18 80241488 8E030000 */ lw $v1, ($s0) +/* 99DE1C 8024148C AE020028 */ sw $v0, 0x28($s0) +/* 99DE20 80241490 2402F7FF */ addiu $v0, $zero, -0x801 +/* 99DE24 80241494 00621824 */ and $v1, $v1, $v0 +/* 99DE28 80241498 AE030000 */ sw $v1, ($s0) +/* 99DE2C 8024149C 8E4200D0 */ lw $v0, 0xd0($s2) +/* 99DE30 802414A0 8C420034 */ lw $v0, 0x34($v0) +/* 99DE34 802414A4 54400005 */ bnel $v0, $zero, .L802414BC +/* 99DE38 802414A8 2402FDFF */ addiu $v0, $zero, -0x201 +/* 99DE3C 802414AC 34620200 */ ori $v0, $v1, 0x200 +/* 99DE40 802414B0 2403FFF7 */ addiu $v1, $zero, -9 +/* 99DE44 802414B4 08090531 */ j .L802414C4 +/* 99DE48 802414B8 00431024 */ and $v0, $v0, $v1 +.L802414BC: +/* 99DE4C 802414BC 00621024 */ and $v0, $v1, $v0 +/* 99DE50 802414C0 34420008 */ ori $v0, $v0, 8 +.L802414C4: +/* 99DE54 802414C4 AE020000 */ sw $v0, ($s0) +/* 99DE58 802414C8 8E4200B0 */ lw $v0, 0xb0($s2) +/* 99DE5C 802414CC 30420004 */ andi $v0, $v0, 4 +/* 99DE60 802414D0 10400009 */ beqz $v0, .L802414F8 +/* 99DE64 802414D4 24020063 */ addiu $v0, $zero, 0x63 +/* 99DE68 802414D8 AE820070 */ sw $v0, 0x70($s4) +/* 99DE6C 802414DC 2402000F */ addiu $v0, $zero, 0xf +/* 99DE70 802414E0 AE820074 */ sw $v0, 0x74($s4) +/* 99DE74 802414E4 8E4200B0 */ lw $v0, 0xb0($s2) +/* 99DE78 802414E8 2403FFFB */ addiu $v1, $zero, -5 +/* 99DE7C 802414EC 00431024 */ and $v0, $v0, $v1 +/* 99DE80 802414F0 08090549 */ j .L80241524 +/* 99DE84 802414F4 AE4200B0 */ sw $v0, 0xb0($s2) +.L802414F8: +/* 99DE88 802414F8 8E420000 */ lw $v0, ($s2) +/* 99DE8C 802414FC 3C034000 */ lui $v1, 0x4000 +/* 99DE90 80241500 00431024 */ and $v0, $v0, $v1 +/* 99DE94 80241504 10400007 */ beqz $v0, .L80241524 +/* 99DE98 80241508 3C03BFFF */ lui $v1, 0xbfff +/* 99DE9C 8024150C 2402000C */ addiu $v0, $zero, 0xc +/* 99DEA0 80241510 AE820070 */ sw $v0, 0x70($s4) +/* 99DEA4 80241514 8E420000 */ lw $v0, ($s2) +/* 99DEA8 80241518 3463FFFF */ ori $v1, $v1, 0xffff +/* 99DEAC 8024151C 00431024 */ and $v0, $v0, $v1 +/* 99DEB0 80241520 AE420000 */ sw $v0, ($s2) +.L80241524: +/* 99DEB4 80241524 8E830070 */ lw $v1, 0x70($s4) +/* 99DEB8 80241528 2C620064 */ sltiu $v0, $v1, 0x64 +/* 99DEBC 8024152C 10400036 */ beqz $v0, .L80241608 +/* 99DEC0 80241530 00031080 */ sll $v0, $v1, 2 +/* 99DEC4 80241534 3C018024 */ lui $at, 0x8024 +/* 99DEC8 80241538 00220821 */ addu $at, $at, $v0 +/* 99DECC 8024153C 8C2244B8 */ lw $v0, 0x44b8($at) +/* 99DED0 80241540 00400008 */ jr $v0 +/* 99DED4 80241544 00000000 */ nop +/* 99DED8 80241548 0280202D */ daddu $a0, $s4, $zero +/* 99DEDC 8024154C 0260282D */ daddu $a1, $s3, $zero +/* 99DEE0 80241550 0C0902F1 */ jal func_80240BC4_99D554 +/* 99DEE4 80241554 02A0302D */ daddu $a2, $s5, $zero +/* 99DEE8 80241558 0280202D */ daddu $a0, $s4, $zero +/* 99DEEC 8024155C 0260282D */ daddu $a1, $s3, $zero +/* 99DEF0 80241560 0C09031E */ jal func_80240C78_99D608 +/* 99DEF4 80241564 02A0302D */ daddu $a2, $s5, $zero +/* 99DEF8 80241568 08090582 */ j .L80241608 +/* 99DEFC 8024156C 00000000 */ nop +/* 99DF00 80241570 0280202D */ daddu $a0, $s4, $zero +/* 99DF04 80241574 0260282D */ daddu $a1, $s3, $zero +/* 99DF08 80241578 0C090366 */ jal func_80240D98_99D728 +/* 99DF0C 8024157C 02A0302D */ daddu $a2, $s5, $zero +/* 99DF10 80241580 0280202D */ daddu $a0, $s4, $zero +/* 99DF14 80241584 0260282D */ daddu $a1, $s3, $zero +/* 99DF18 80241588 0C09037E */ jal func_80240DF8_99D788 +/* 99DF1C 8024158C 02A0302D */ daddu $a2, $s5, $zero +/* 99DF20 80241590 08090582 */ j .L80241608 +/* 99DF24 80241594 00000000 */ nop +/* 99DF28 80241598 0280202D */ daddu $a0, $s4, $zero +/* 99DF2C 8024159C 0260282D */ daddu $a1, $s3, $zero +/* 99DF30 802415A0 0C09039C */ jal func_80240E70_99D800 +/* 99DF34 802415A4 02A0302D */ daddu $a2, $s5, $zero +/* 99DF38 802415A8 0280202D */ daddu $a0, $s4, $zero +/* 99DF3C 802415AC 0260282D */ daddu $a1, $s3, $zero +/* 99DF40 802415B0 0C0903E8 */ jal func_80240FA0_99D930 +/* 99DF44 802415B4 02A0302D */ daddu $a2, $s5, $zero +/* 99DF48 802415B8 08090582 */ j .L80241608 +/* 99DF4C 802415BC 00000000 */ nop +/* 99DF50 802415C0 0280202D */ daddu $a0, $s4, $zero +/* 99DF54 802415C4 0260282D */ daddu $a1, $s3, $zero +/* 99DF58 802415C8 0C09042F */ jal func_802410BC_99DA4C +/* 99DF5C 802415CC 02A0302D */ daddu $a2, $s5, $zero +/* 99DF60 802415D0 08090582 */ j .L80241608 +/* 99DF64 802415D4 00000000 */ nop +/* 99DF68 802415D8 0280202D */ daddu $a0, $s4, $zero +/* 99DF6C 802415DC 0260282D */ daddu $a1, $s3, $zero +/* 99DF70 802415E0 0C090441 */ jal func_80241104_99DA94 +/* 99DF74 802415E4 02A0302D */ daddu $a2, $s5, $zero +/* 99DF78 802415E8 0280202D */ daddu $a0, $s4, $zero +/* 99DF7C 802415EC 0260282D */ daddu $a1, $s3, $zero +/* 99DF80 802415F0 0C09046C */ jal func_802411B0_99DB40 +/* 99DF84 802415F4 02A0302D */ daddu $a2, $s5, $zero +/* 99DF88 802415F8 08090582 */ j .L80241608 +/* 99DF8C 802415FC 00000000 */ nop +/* 99DF90 80241600 0C0129CF */ jal func_8004A73C +/* 99DF94 80241604 0280202D */ daddu $a0, $s4, $zero +.L80241608: +/* 99DF98 80241608 8FBF0048 */ lw $ra, 0x48($sp) +/* 99DF9C 8024160C 8FB50044 */ lw $s5, 0x44($sp) +/* 99DFA0 80241610 8FB40040 */ lw $s4, 0x40($sp) +/* 99DFA4 80241614 8FB3003C */ lw $s3, 0x3c($sp) +/* 99DFA8 80241618 8FB20038 */ lw $s2, 0x38($sp) +/* 99DFAC 8024161C 8FB10034 */ lw $s1, 0x34($sp) +/* 99DFB0 80241620 8FB00030 */ lw $s0, 0x30($sp) +/* 99DFB4 80241624 0000102D */ daddu $v0, $zero, $zero +/* 99DFB8 80241628 03E00008 */ jr $ra +/* 99DFBC 8024162C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630.s deleted file mode 100644 index ae944517e6..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630.s +++ /dev/null @@ -1,40 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241630 -/* 99DFC0 80241630 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 99DFC4 80241634 0080102D */ daddu $v0, $a0, $zero -/* 99DFC8 80241638 AFBF0014 */ sw $ra, 0x14($sp) -/* 99DFCC 8024163C AFB00010 */ sw $s0, 0x10($sp) -/* 99DFD0 80241640 8C44014C */ lw $a0, 0x14c($v0) -/* 99DFD4 80241644 0C00EAD2 */ jal get_npc_safe -/* 99DFD8 80241648 8C500148 */ lw $s0, 0x148($v0) -/* 99DFDC 8024164C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99DFE0 80241650 C4400038 */ lwc1 $f0, 0x38($v0) -/* 99DFE4 80241654 4600008D */ trunc.w.s $f2, $f0 -/* 99DFE8 80241658 E4620000 */ swc1 $f2, ($v1) -/* 99DFEC 8024165C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99DFF0 80241660 C440003C */ lwc1 $f0, 0x3c($v0) -/* 99DFF4 80241664 4600008D */ trunc.w.s $f2, $f0 -/* 99DFF8 80241668 E4620004 */ swc1 $f2, 4($v1) -/* 99DFFC 8024166C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99E000 80241670 C4400040 */ lwc1 $f0, 0x40($v0) -/* 99E004 80241674 4600008D */ trunc.w.s $f2, $f0 -/* 99E008 80241678 E4620008 */ swc1 $f2, 8($v1) -/* 99E00C 8024167C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99E010 80241680 C4400038 */ lwc1 $f0, 0x38($v0) -/* 99E014 80241684 4600008D */ trunc.w.s $f2, $f0 -/* 99E018 80241688 E462001C */ swc1 $f2, 0x1c($v1) -/* 99E01C 8024168C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99E020 80241690 C440003C */ lwc1 $f0, 0x3c($v0) -/* 99E024 80241694 4600008D */ trunc.w.s $f2, $f0 -/* 99E028 80241698 E4620020 */ swc1 $f2, 0x20($v1) -/* 99E02C 8024169C 8E0300D0 */ lw $v1, 0xd0($s0) -/* 99E030 802416A0 C4400040 */ lwc1 $f0, 0x40($v0) -/* 99E034 802416A4 4600008D */ trunc.w.s $f2, $f0 -/* 99E038 802416A8 E4620024 */ swc1 $f2, 0x24($v1) -/* 99E03C 802416AC 8FBF0014 */ lw $ra, 0x14($sp) -/* 99E040 802416B0 8FB00010 */ lw $s0, 0x10($sp) -/* 99E044 802416B4 24020002 */ addiu $v0, $zero, 2 -/* 99E048 802416B8 03E00008 */ jr $ra -/* 99E04C 802416BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630_99DFC0.s b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630_99DFC0.s new file mode 100644 index 0000000000..fc7c96b3a1 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_01/99CD80/func_80241630_99DFC0.s @@ -0,0 +1,40 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241630_99DFC0 +/* 99DFC0 80241630 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 99DFC4 80241634 0080102D */ daddu $v0, $a0, $zero +/* 99DFC8 80241638 AFBF0014 */ sw $ra, 0x14($sp) +/* 99DFCC 8024163C AFB00010 */ sw $s0, 0x10($sp) +/* 99DFD0 80241640 8C44014C */ lw $a0, 0x14c($v0) +/* 99DFD4 80241644 0C00EAD2 */ jal get_npc_safe +/* 99DFD8 80241648 8C500148 */ lw $s0, 0x148($v0) +/* 99DFDC 8024164C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 99DFE0 80241650 C4400038 */ lwc1 $f0, 0x38($v0) +/* 99DFE4 80241654 4600008D */ trunc.w.s $f2, $f0 +/* 99DFE8 80241658 E4620000 */ swc1 $f2, ($v1) +/* 99DFEC 8024165C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 99DFF0 80241660 C440003C */ lwc1 $f0, 0x3c($v0) +/* 99DFF4 80241664 4600008D */ trunc.w.s $f2, $f0 +/* 99DFF8 80241668 E4620004 */ swc1 $f2, 4($v1) +/* 99DFFC 8024166C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 99E000 80241670 C4400040 */ lwc1 $f0, 0x40($v0) +/* 99E004 80241674 4600008D */ trunc.w.s $f2, $f0 +/* 99E008 80241678 E4620008 */ swc1 $f2, 8($v1) +/* 99E00C 8024167C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 99E010 80241680 C4400038 */ lwc1 $f0, 0x38($v0) +/* 99E014 80241684 4600008D */ trunc.w.s $f2, $f0 +/* 99E018 80241688 E462001C */ swc1 $f2, 0x1c($v1) +/* 99E01C 8024168C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 99E020 80241690 C440003C */ lwc1 $f0, 0x3c($v0) +/* 99E024 80241694 4600008D */ trunc.w.s $f2, $f0 +/* 99E028 80241698 E4620020 */ swc1 $f2, 0x20($v1) +/* 99E02C 8024169C 8E0300D0 */ lw $v1, 0xd0($s0) +/* 99E030 802416A0 C4400040 */ lwc1 $f0, 0x40($v0) +/* 99E034 802416A4 4600008D */ trunc.w.s $f2, $f0 +/* 99E038 802416A8 E4620024 */ swc1 $f2, 0x24($v1) +/* 99E03C 802416AC 8FBF0014 */ lw $ra, 0x14($sp) +/* 99E040 802416B0 8FB00010 */ lw $s0, 0x10($sp) +/* 99E044 802416B4 24020002 */ addiu $v0, $zero, 2 +/* 99E048 802416B8 03E00008 */ jr $ra +/* 99E04C 802416BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802400E0.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802400E0.s deleted file mode 100644 index e8c19e3b33..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802400E0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400E0 -/* 9A10C0 802400E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A10C4 802400E4 AFB20018 */ sw $s2, 0x18($sp) -/* 9A10C8 802400E8 0080902D */ daddu $s2, $a0, $zero -/* 9A10CC 802400EC AFBF001C */ sw $ra, 0x1c($sp) -/* 9A10D0 802400F0 AFB10014 */ sw $s1, 0x14($sp) -/* 9A10D4 802400F4 AFB00010 */ sw $s0, 0x10($sp) -/* 9A10D8 802400F8 8E510148 */ lw $s1, 0x148($s2) -/* 9A10DC 802400FC 0C00EABB */ jal get_npc_unsafe -/* 9A10E0 80240100 86240008 */ lh $a0, 8($s1) -/* 9A10E4 80240104 0040802D */ daddu $s0, $v0, $zero -/* 9A10E8 80240108 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A10EC 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A10F0 80240110 8C630020 */ lw $v1, 0x20($v1) -/* 9A10F4 80240114 AE030028 */ sw $v1, 0x28($s0) -/* 9A10F8 80240118 96220076 */ lhu $v0, 0x76($s1) -/* 9A10FC 8024011C A602008E */ sh $v0, 0x8e($s0) -/* 9A1100 80240120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A1104 80240124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A1108 80240128 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A110C 8024012C 8C460028 */ lw $a2, 0x28($v0) -/* 9A1110 80240130 0C00A720 */ jal atan2 -/* 9A1114 80240134 8C470030 */ lw $a3, 0x30($v0) -/* 9A1118 80240138 2402000D */ addiu $v0, $zero, 0xd -/* 9A111C 8024013C E600000C */ swc1 $f0, 0xc($s0) -/* 9A1120 80240140 AE420070 */ sw $v0, 0x70($s2) -/* 9A1124 80240144 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A1128 80240148 8FB20018 */ lw $s2, 0x18($sp) -/* 9A112C 8024014C 8FB10014 */ lw $s1, 0x14($sp) -/* 9A1130 80240150 8FB00010 */ lw $s0, 0x10($sp) -/* 9A1134 80240154 03E00008 */ jr $ra -/* 9A1138 80240158 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802400E0_9A10C0.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802400E0_9A10C0.s new file mode 100644 index 0000000000..15b9f7702a --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802400E0_9A10C0.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400E0_9A10C0 +/* 9A10C0 802400E0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A10C4 802400E4 AFB20018 */ sw $s2, 0x18($sp) +/* 9A10C8 802400E8 0080902D */ daddu $s2, $a0, $zero +/* 9A10CC 802400EC AFBF001C */ sw $ra, 0x1c($sp) +/* 9A10D0 802400F0 AFB10014 */ sw $s1, 0x14($sp) +/* 9A10D4 802400F4 AFB00010 */ sw $s0, 0x10($sp) +/* 9A10D8 802400F8 8E510148 */ lw $s1, 0x148($s2) +/* 9A10DC 802400FC 0C00EABB */ jal get_npc_unsafe +/* 9A10E0 80240100 86240008 */ lh $a0, 8($s1) +/* 9A10E4 80240104 0040802D */ daddu $s0, $v0, $zero +/* 9A10E8 80240108 8E2300CC */ lw $v1, 0xcc($s1) +/* 9A10EC 8024010C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9A10F0 80240110 8C630020 */ lw $v1, 0x20($v1) +/* 9A10F4 80240114 AE030028 */ sw $v1, 0x28($s0) +/* 9A10F8 80240118 96220076 */ lhu $v0, 0x76($s1) +/* 9A10FC 8024011C A602008E */ sh $v0, 0x8e($s0) +/* 9A1100 80240120 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9A1104 80240124 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9A1108 80240128 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9A110C 8024012C 8C460028 */ lw $a2, 0x28($v0) +/* 9A1110 80240130 0C00A720 */ jal atan2 +/* 9A1114 80240134 8C470030 */ lw $a3, 0x30($v0) +/* 9A1118 80240138 2402000D */ addiu $v0, $zero, 0xd +/* 9A111C 8024013C E600000C */ swc1 $f0, 0xc($s0) +/* 9A1120 80240140 AE420070 */ sw $v0, 0x70($s2) +/* 9A1124 80240144 8FBF001C */ lw $ra, 0x1c($sp) +/* 9A1128 80240148 8FB20018 */ lw $s2, 0x18($sp) +/* 9A112C 8024014C 8FB10014 */ lw $s1, 0x14($sp) +/* 9A1130 80240150 8FB00010 */ lw $s0, 0x10($sp) +/* 9A1134 80240154 03E00008 */ jr $ra +/* 9A1138 80240158 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C.s deleted file mode 100644 index 728730fb8e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024015C -/* 9A113C 8024015C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A1140 80240160 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A1144 80240164 0080982D */ daddu $s3, $a0, $zero -/* 9A1148 80240168 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A114C 8024016C AFB20018 */ sw $s2, 0x18($sp) -/* 9A1150 80240170 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1154 80240174 AFB00010 */ sw $s0, 0x10($sp) -/* 9A1158 80240178 8E710148 */ lw $s1, 0x148($s3) -/* 9A115C 8024017C 86240008 */ lh $a0, 8($s1) -/* 9A1160 80240180 0C00EABB */ jal get_npc_unsafe -/* 9A1164 80240184 00A0902D */ daddu $s2, $a1, $zero -/* 9A1168 80240188 0040802D */ daddu $s0, $v0, $zero -/* 9A116C 8024018C 8602008E */ lh $v0, 0x8e($s0) -/* 9A1170 80240190 9603008E */ lhu $v1, 0x8e($s0) -/* 9A1174 80240194 18400005 */ blez $v0, .L802401AC -/* 9A1178 80240198 2462FFFF */ addiu $v0, $v1, -1 -/* 9A117C 8024019C A602008E */ sh $v0, 0x8e($s0) -/* 9A1180 802401A0 00021400 */ sll $v0, $v0, 0x10 -/* 9A1184 802401A4 1C400033 */ bgtz $v0, .L80240274 -/* 9A1188 802401A8 00000000 */ nop -.L802401AC: -/* 9A118C 802401AC 8602008C */ lh $v0, 0x8c($s0) -/* 9A1190 802401B0 14400030 */ bnez $v0, .L80240274 -/* 9A1194 802401B4 00000000 */ nop -/* 9A1198 802401B8 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A119C 802401BC 8C420024 */ lw $v0, 0x24($v0) -/* 9A11A0 802401C0 AE020028 */ sw $v0, 0x28($s0) -/* 9A11A4 802401C4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9A11A8 802401C8 E6000018 */ swc1 $f0, 0x18($s0) -/* 9A11AC 802401CC 8E230088 */ lw $v1, 0x88($s1) -/* 9A11B0 802401D0 24020005 */ addiu $v0, $zero, 5 -/* 9A11B4 802401D4 10620005 */ beq $v1, $v0, .L802401EC -/* 9A11B8 802401D8 00000000 */ nop -/* 9A11BC 802401DC 10600003 */ beqz $v1, .L802401EC -/* 9A11C0 802401E0 24020001 */ addiu $v0, $zero, 1 -/* 9A11C4 802401E4 14620006 */ bne $v1, $v0, .L80240200 -/* 9A11C8 802401E8 00000000 */ nop -.L802401EC: -/* 9A11CC 802401EC 8E220084 */ lw $v0, 0x84($s1) -/* 9A11D0 802401F0 00021FC2 */ srl $v1, $v0, 0x1f -/* 9A11D4 802401F4 00431021 */ addu $v0, $v0, $v1 -/* 9A11D8 802401F8 00021043 */ sra $v0, $v0, 1 -/* 9A11DC 802401FC A60200A8 */ sh $v0, 0xa8($s0) -.L80240200: -/* 9A11E0 80240200 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A11E4 80240204 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A11E8 80240208 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A11EC 8024020C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A11F0 80240210 8C460028 */ lw $a2, 0x28($v0) -/* 9A11F4 80240214 0C00A7B5 */ jal dist2D -/* 9A11F8 80240218 8C470030 */ lw $a3, 0x30($v0) -/* 9A11FC 8024021C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A1200 80240220 46020003 */ div.s $f0, $f0, $f2 -/* 9A1204 80240224 3C018024 */ lui $at, 0x8024 -/* 9A1208 80240228 D42232E0 */ ldc1 $f2, 0x32e0($at) -/* 9A120C 8024022C 46000021 */ cvt.d.s $f0, $f0 -/* 9A1210 80240230 46220000 */ add.d $f0, $f0, $f2 -/* 9A1214 80240234 4620010D */ trunc.w.d $f4, $f0 -/* 9A1218 80240238 44022000 */ mfc1 $v0, $f4 -/* 9A121C 8024023C 00000000 */ nop -/* 9A1220 80240240 A602008E */ sh $v0, 0x8e($s0) -/* 9A1224 80240244 00021400 */ sll $v0, $v0, 0x10 -/* 9A1228 80240248 8E230078 */ lw $v1, 0x78($s1) -/* 9A122C 8024024C 00021403 */ sra $v0, $v0, 0x10 -/* 9A1230 80240250 0043102A */ slt $v0, $v0, $v1 -/* 9A1234 80240254 10400003 */ beqz $v0, .L80240264 -/* 9A1238 80240258 00000000 */ nop -/* 9A123C 8024025C 9622007A */ lhu $v0, 0x7a($s1) -/* 9A1240 80240260 A602008E */ sh $v0, 0x8e($s0) -.L80240264: -/* 9A1244 80240264 8602008E */ lh $v0, 0x8e($s0) -/* 9A1248 80240268 AE22007C */ sw $v0, 0x7c($s1) -/* 9A124C 8024026C 2402000E */ addiu $v0, $zero, 0xe -/* 9A1250 80240270 AE620070 */ sw $v0, 0x70($s3) -.L80240274: -/* 9A1254 80240274 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A1258 80240278 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A125C 8024027C 8FB20018 */ lw $s2, 0x18($sp) -/* 9A1260 80240280 8FB10014 */ lw $s1, 0x14($sp) -/* 9A1264 80240284 8FB00010 */ lw $s0, 0x10($sp) -/* 9A1268 80240288 03E00008 */ jr $ra -/* 9A126C 8024028C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s new file mode 100644 index 0000000000..1137592803 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_8024015C_9A113C.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024015C_9A113C +/* 9A113C 8024015C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9A1140 80240160 AFB3001C */ sw $s3, 0x1c($sp) +/* 9A1144 80240164 0080982D */ daddu $s3, $a0, $zero +/* 9A1148 80240168 AFBF0020 */ sw $ra, 0x20($sp) +/* 9A114C 8024016C AFB20018 */ sw $s2, 0x18($sp) +/* 9A1150 80240170 AFB10014 */ sw $s1, 0x14($sp) +/* 9A1154 80240174 AFB00010 */ sw $s0, 0x10($sp) +/* 9A1158 80240178 8E710148 */ lw $s1, 0x148($s3) +/* 9A115C 8024017C 86240008 */ lh $a0, 8($s1) +/* 9A1160 80240180 0C00EABB */ jal get_npc_unsafe +/* 9A1164 80240184 00A0902D */ daddu $s2, $a1, $zero +/* 9A1168 80240188 0040802D */ daddu $s0, $v0, $zero +/* 9A116C 8024018C 8602008E */ lh $v0, 0x8e($s0) +/* 9A1170 80240190 9603008E */ lhu $v1, 0x8e($s0) +/* 9A1174 80240194 18400005 */ blez $v0, .L802401AC +/* 9A1178 80240198 2462FFFF */ addiu $v0, $v1, -1 +/* 9A117C 8024019C A602008E */ sh $v0, 0x8e($s0) +/* 9A1180 802401A0 00021400 */ sll $v0, $v0, 0x10 +/* 9A1184 802401A4 1C400033 */ bgtz $v0, .L80240274 +/* 9A1188 802401A8 00000000 */ nop +.L802401AC: +/* 9A118C 802401AC 8602008C */ lh $v0, 0x8c($s0) +/* 9A1190 802401B0 14400030 */ bnez $v0, .L80240274 +/* 9A1194 802401B4 00000000 */ nop +/* 9A1198 802401B8 8E2200CC */ lw $v0, 0xcc($s1) +/* 9A119C 802401BC 8C420024 */ lw $v0, 0x24($v0) +/* 9A11A0 802401C0 AE020028 */ sw $v0, 0x28($s0) +/* 9A11A4 802401C4 C6400018 */ lwc1 $f0, 0x18($s2) +/* 9A11A8 802401C8 E6000018 */ swc1 $f0, 0x18($s0) +/* 9A11AC 802401CC 8E230088 */ lw $v1, 0x88($s1) +/* 9A11B0 802401D0 24020005 */ addiu $v0, $zero, 5 +/* 9A11B4 802401D4 10620005 */ beq $v1, $v0, .L802401EC +/* 9A11B8 802401D8 00000000 */ nop +/* 9A11BC 802401DC 10600003 */ beqz $v1, .L802401EC +/* 9A11C0 802401E0 24020001 */ addiu $v0, $zero, 1 +/* 9A11C4 802401E4 14620006 */ bne $v1, $v0, .L80240200 +/* 9A11C8 802401E8 00000000 */ nop +.L802401EC: +/* 9A11CC 802401EC 8E220084 */ lw $v0, 0x84($s1) +/* 9A11D0 802401F0 00021FC2 */ srl $v1, $v0, 0x1f +/* 9A11D4 802401F4 00431021 */ addu $v0, $v0, $v1 +/* 9A11D8 802401F8 00021043 */ sra $v0, $v0, 1 +/* 9A11DC 802401FC A60200A8 */ sh $v0, 0xa8($s0) +.L80240200: +/* 9A11E0 80240200 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9A11E4 80240204 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9A11E8 80240208 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9A11EC 8024020C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9A11F0 80240210 8C460028 */ lw $a2, 0x28($v0) +/* 9A11F4 80240214 0C00A7B5 */ jal dist2D +/* 9A11F8 80240218 8C470030 */ lw $a3, 0x30($v0) +/* 9A11FC 8024021C C6020018 */ lwc1 $f2, 0x18($s0) +/* 9A1200 80240220 46020003 */ div.s $f0, $f0, $f2 +/* 9A1204 80240224 3C018024 */ lui $at, 0x8024 +/* 9A1208 80240228 D42232E0 */ ldc1 $f2, 0x32e0($at) +/* 9A120C 8024022C 46000021 */ cvt.d.s $f0, $f0 +/* 9A1210 80240230 46220000 */ add.d $f0, $f0, $f2 +/* 9A1214 80240234 4620010D */ trunc.w.d $f4, $f0 +/* 9A1218 80240238 44022000 */ mfc1 $v0, $f4 +/* 9A121C 8024023C 00000000 */ nop +/* 9A1220 80240240 A602008E */ sh $v0, 0x8e($s0) +/* 9A1224 80240244 00021400 */ sll $v0, $v0, 0x10 +/* 9A1228 80240248 8E230078 */ lw $v1, 0x78($s1) +/* 9A122C 8024024C 00021403 */ sra $v0, $v0, 0x10 +/* 9A1230 80240250 0043102A */ slt $v0, $v0, $v1 +/* 9A1234 80240254 10400003 */ beqz $v0, .L80240264 +/* 9A1238 80240258 00000000 */ nop +/* 9A123C 8024025C 9622007A */ lhu $v0, 0x7a($s1) +/* 9A1240 80240260 A602008E */ sh $v0, 0x8e($s0) +.L80240264: +/* 9A1244 80240264 8602008E */ lh $v0, 0x8e($s0) +/* 9A1248 80240268 AE22007C */ sw $v0, 0x7c($s1) +/* 9A124C 8024026C 2402000E */ addiu $v0, $zero, 0xe +/* 9A1250 80240270 AE620070 */ sw $v0, 0x70($s3) +.L80240274: +/* 9A1254 80240274 8FBF0020 */ lw $ra, 0x20($sp) +/* 9A1258 80240278 8FB3001C */ lw $s3, 0x1c($sp) +/* 9A125C 8024027C 8FB20018 */ lw $s2, 0x18($sp) +/* 9A1260 80240280 8FB10014 */ lw $s1, 0x14($sp) +/* 9A1264 80240284 8FB00010 */ lw $s0, 0x10($sp) +/* 9A1268 80240288 03E00008 */ jr $ra +/* 9A126C 8024028C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802403F4.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802403F4.s deleted file mode 100644 index 05705318a7..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802403F4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802403F4 -/* 9A13D4 802403F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A13D8 802403F8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A13DC 802403FC 0080882D */ daddu $s1, $a0, $zero -/* 9A13E0 80240400 AFBF0018 */ sw $ra, 0x18($sp) -/* 9A13E4 80240404 AFB00010 */ sw $s0, 0x10($sp) -/* 9A13E8 80240408 8E300148 */ lw $s0, 0x148($s1) -/* 9A13EC 8024040C 0C00EABB */ jal get_npc_unsafe -/* 9A13F0 80240410 86040008 */ lh $a0, 8($s0) -/* 9A13F4 80240414 0040202D */ daddu $a0, $v0, $zero -/* 9A13F8 80240418 9482008E */ lhu $v0, 0x8e($a0) -/* 9A13FC 8024041C 24030003 */ addiu $v1, $zero, 3 -/* 9A1400 80240420 24420001 */ addiu $v0, $v0, 1 -/* 9A1404 80240424 A482008E */ sh $v0, 0x8e($a0) -/* 9A1408 80240428 00021400 */ sll $v0, $v0, 0x10 -/* 9A140C 8024042C 00021403 */ sra $v0, $v0, 0x10 -/* 9A1410 80240430 14430003 */ bne $v0, $v1, .L80240440 -/* 9A1414 80240434 00000000 */ nop -/* 9A1418 80240438 96020086 */ lhu $v0, 0x86($s0) -/* 9A141C 8024043C A48200A8 */ sh $v0, 0xa8($a0) -.L80240440: -/* 9A1420 80240440 8482008E */ lh $v0, 0x8e($a0) -/* 9A1424 80240444 8E030080 */ lw $v1, 0x80($s0) -/* 9A1428 80240448 0043102A */ slt $v0, $v0, $v1 -/* 9A142C 8024044C 14400004 */ bnez $v0, .L80240460 -/* 9A1430 80240450 00000000 */ nop -/* 9A1434 80240454 96020086 */ lhu $v0, 0x86($s0) -/* 9A1438 80240458 A48200A8 */ sh $v0, 0xa8($a0) -/* 9A143C 8024045C AE200070 */ sw $zero, 0x70($s1) -.L80240460: -/* 9A1440 80240460 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A1444 80240464 8FB10014 */ lw $s1, 0x14($sp) -/* 9A1448 80240468 8FB00010 */ lw $s0, 0x10($sp) -/* 9A144C 8024046C 03E00008 */ jr $ra -/* 9A1450 80240470 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802403F4_9A13D4.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802403F4_9A13D4.s new file mode 100644 index 0000000000..675f3fd59d --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_802403F4_9A13D4.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802403F4_9A13D4 +/* 9A13D4 802403F4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A13D8 802403F8 AFB10014 */ sw $s1, 0x14($sp) +/* 9A13DC 802403FC 0080882D */ daddu $s1, $a0, $zero +/* 9A13E0 80240400 AFBF0018 */ sw $ra, 0x18($sp) +/* 9A13E4 80240404 AFB00010 */ sw $s0, 0x10($sp) +/* 9A13E8 80240408 8E300148 */ lw $s0, 0x148($s1) +/* 9A13EC 8024040C 0C00EABB */ jal get_npc_unsafe +/* 9A13F0 80240410 86040008 */ lh $a0, 8($s0) +/* 9A13F4 80240414 0040202D */ daddu $a0, $v0, $zero +/* 9A13F8 80240418 9482008E */ lhu $v0, 0x8e($a0) +/* 9A13FC 8024041C 24030003 */ addiu $v1, $zero, 3 +/* 9A1400 80240420 24420001 */ addiu $v0, $v0, 1 +/* 9A1404 80240424 A482008E */ sh $v0, 0x8e($a0) +/* 9A1408 80240428 00021400 */ sll $v0, $v0, 0x10 +/* 9A140C 8024042C 00021403 */ sra $v0, $v0, 0x10 +/* 9A1410 80240430 14430003 */ bne $v0, $v1, .L80240440 +/* 9A1414 80240434 00000000 */ nop +/* 9A1418 80240438 96020086 */ lhu $v0, 0x86($s0) +/* 9A141C 8024043C A48200A8 */ sh $v0, 0xa8($a0) +.L80240440: +/* 9A1420 80240440 8482008E */ lh $v0, 0x8e($a0) +/* 9A1424 80240444 8E030080 */ lw $v1, 0x80($s0) +/* 9A1428 80240448 0043102A */ slt $v0, $v0, $v1 +/* 9A142C 8024044C 14400004 */ bnez $v0, .L80240460 +/* 9A1430 80240450 00000000 */ nop +/* 9A1434 80240454 96020086 */ lhu $v0, 0x86($s0) +/* 9A1438 80240458 A48200A8 */ sh $v0, 0xa8($a0) +/* 9A143C 8024045C AE200070 */ sw $zero, 0x70($s1) +.L80240460: +/* 9A1440 80240460 8FBF0018 */ lw $ra, 0x18($sp) +/* 9A1444 80240464 8FB10014 */ lw $s1, 0x14($sp) +/* 9A1448 80240468 8FB00010 */ lw $s0, 0x10($sp) +/* 9A144C 8024046C 03E00008 */ jr $ra +/* 9A1450 80240470 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474.s deleted file mode 100644 index ed15a970ff..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240474 -/* 9A1454 80240474 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A1458 80240478 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A145C 8024047C 0080982D */ daddu $s3, $a0, $zero -/* 9A1460 80240480 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A1464 80240484 AFB50064 */ sw $s5, 0x64($sp) -/* 9A1468 80240488 AFB40060 */ sw $s4, 0x60($sp) -/* 9A146C 8024048C AFB20058 */ sw $s2, 0x58($sp) -/* 9A1470 80240490 AFB10054 */ sw $s1, 0x54($sp) -/* 9A1474 80240494 AFB00050 */ sw $s0, 0x50($sp) -/* 9A1478 80240498 8E710148 */ lw $s1, 0x148($s3) -/* 9A147C 8024049C 86240008 */ lh $a0, 8($s1) -/* 9A1480 802404A0 0C00EABB */ jal get_npc_unsafe -/* 9A1484 802404A4 00A0802D */ daddu $s0, $a1, $zero -/* 9A1488 802404A8 8E63000C */ lw $v1, 0xc($s3) -/* 9A148C 802404AC 0260202D */ daddu $a0, $s3, $zero -/* 9A1490 802404B0 8C650000 */ lw $a1, ($v1) -/* 9A1494 802404B4 0C0B1EAF */ jal get_variable -/* 9A1498 802404B8 0040902D */ daddu $s2, $v0, $zero -/* 9A149C 802404BC AFA00028 */ sw $zero, 0x28($sp) -/* 9A14A0 802404C0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14A4 802404C4 8C630030 */ lw $v1, 0x30($v1) -/* 9A14A8 802404C8 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A14AC 802404CC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14B0 802404D0 8C63001C */ lw $v1, 0x1c($v1) -/* 9A14B4 802404D4 AFA30030 */ sw $v1, 0x30($sp) -/* 9A14B8 802404D8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14BC 802404DC 8C630024 */ lw $v1, 0x24($v1) -/* 9A14C0 802404E0 AFA30034 */ sw $v1, 0x34($sp) -/* 9A14C4 802404E4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14C8 802404E8 8C630028 */ lw $v1, 0x28($v1) -/* 9A14CC 802404EC 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A14D0 802404F0 AFA30038 */ sw $v1, 0x38($sp) -/* 9A14D4 802404F4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A14D8 802404F8 3C0142C8 */ lui $at, 0x42c8 -/* 9A14DC 802404FC 44810000 */ mtc1 $at, $f0 -/* 9A14E0 80240500 8C63002C */ lw $v1, 0x2c($v1) -/* 9A14E4 80240504 0040A02D */ daddu $s4, $v0, $zero -/* 9A14E8 80240508 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A14EC 8024050C A7A00044 */ sh $zero, 0x44($sp) -/* 9A14F0 80240510 12000009 */ beqz $s0, .L80240538 -/* 9A14F4 80240514 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A14F8 80240518 864300A8 */ lh $v1, 0xa8($s2) -/* 9A14FC 8024051C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A1500 80240520 AE20008C */ sw $zero, 0x8c($s1) -/* 9A1504 80240524 A22000B5 */ sb $zero, 0xb5($s1) -/* 9A1508 80240528 34420008 */ ori $v0, $v0, 8 -/* 9A150C 8024052C AE230084 */ sw $v1, 0x84($s1) -/* 9A1510 80240530 08090152 */ j .L80240548 -/* 9A1514 80240534 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240538: -/* 9A1518 80240538 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A151C 8024053C 30420004 */ andi $v0, $v0, 4 -/* 9A1520 80240540 10400047 */ beqz $v0, .L80240660 -/* 9A1524 80240544 00000000 */ nop -.L80240548: -/* 9A1528 80240548 AE600070 */ sw $zero, 0x70($s3) -/* 9A152C 8024054C A640008E */ sh $zero, 0x8e($s2) -/* 9A1530 80240550 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A1534 80240554 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A1538 80240558 A2200007 */ sb $zero, 7($s1) -/* 9A153C 8024055C 8E420000 */ lw $v0, ($s2) -/* 9A1540 80240560 8C630000 */ lw $v1, ($v1) -/* 9A1544 80240564 00441024 */ and $v0, $v0, $a0 -/* 9A1548 80240568 AE420000 */ sw $v0, ($s2) -/* 9A154C 8024056C AE430028 */ sw $v1, 0x28($s2) -/* 9A1550 80240570 96220086 */ lhu $v0, 0x86($s1) -/* 9A1554 80240574 A64200A8 */ sh $v0, 0xa8($s2) -/* 9A1558 80240578 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A155C 8024057C AE200090 */ sw $zero, 0x90($s1) -/* 9A1560 80240580 8C420034 */ lw $v0, 0x34($v0) -/* 9A1564 80240584 14400006 */ bnez $v0, .L802405A0 -/* 9A1568 80240588 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9A156C 8024058C 8E420000 */ lw $v0, ($s2) -/* 9A1570 80240590 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A1574 80240594 34420200 */ ori $v0, $v0, 0x200 -/* 9A1578 80240598 0809016B */ j .L802405AC -/* 9A157C 8024059C 00431024 */ and $v0, $v0, $v1 -.L802405A0: -/* 9A1580 802405A0 8E420000 */ lw $v0, ($s2) -/* 9A1584 802405A4 00431024 */ and $v0, $v0, $v1 -/* 9A1588 802405A8 34420008 */ ori $v0, $v0, 8 -.L802405AC: -/* 9A158C 802405AC AE420000 */ sw $v0, ($s2) -/* 9A1590 802405B0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A1594 802405B4 30420004 */ andi $v0, $v0, 4 -/* 9A1598 802405B8 1040001E */ beqz $v0, .L80240634 -/* 9A159C 802405BC 24040002 */ addiu $a0, $zero, 2 -/* 9A15A0 802405C0 0240282D */ daddu $a1, $s2, $zero -/* 9A15A4 802405C4 0000302D */ daddu $a2, $zero, $zero -/* 9A15A8 802405C8 24020063 */ addiu $v0, $zero, 0x63 -/* 9A15AC 802405CC AE620070 */ sw $v0, 0x70($s3) -/* 9A15B0 802405D0 AE600074 */ sw $zero, 0x74($s3) -/* 9A15B4 802405D4 864300A8 */ lh $v1, 0xa8($s2) -/* 9A15B8 802405D8 3C013F80 */ lui $at, 0x3f80 -/* 9A15BC 802405DC 44810000 */ mtc1 $at, $f0 -/* 9A15C0 802405E0 3C014000 */ lui $at, 0x4000 -/* 9A15C4 802405E4 44811000 */ mtc1 $at, $f2 -/* 9A15C8 802405E8 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A15CC 802405EC 44812000 */ mtc1 $at, $f4 -/* 9A15D0 802405F0 24020028 */ addiu $v0, $zero, 0x28 -/* 9A15D4 802405F4 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A15D8 802405F8 44833000 */ mtc1 $v1, $f6 -/* 9A15DC 802405FC 00000000 */ nop -/* 9A15E0 80240600 468031A0 */ cvt.s.w $f6, $f6 -/* 9A15E4 80240604 44073000 */ mfc1 $a3, $f6 -/* 9A15E8 80240608 27A20048 */ addiu $v0, $sp, 0x48 -/* 9A15EC 8024060C AFA20020 */ sw $v0, 0x20($sp) -/* 9A15F0 80240610 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A15F4 80240614 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A15F8 80240618 0C01BFA4 */ jal fx_emote -/* 9A15FC 8024061C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A1600 80240620 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A1604 80240624 2403FFFB */ addiu $v1, $zero, -5 -/* 9A1608 80240628 00431024 */ and $v0, $v0, $v1 -/* 9A160C 8024062C 08090198 */ j .L80240660 -/* 9A1610 80240630 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240634: -/* 9A1614 80240634 8E220000 */ lw $v0, ($s1) -/* 9A1618 80240638 3C034000 */ lui $v1, 0x4000 -/* 9A161C 8024063C 00431024 */ and $v0, $v0, $v1 -/* 9A1620 80240640 10400007 */ beqz $v0, .L80240660 -/* 9A1624 80240644 3C03BFFF */ lui $v1, 0xbfff -/* 9A1628 80240648 2402000C */ addiu $v0, $zero, 0xc -/* 9A162C 8024064C AE620070 */ sw $v0, 0x70($s3) -/* 9A1630 80240650 8E220000 */ lw $v0, ($s1) -/* 9A1634 80240654 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A1638 80240658 00431024 */ and $v0, $v0, $v1 -/* 9A163C 8024065C AE220000 */ sw $v0, ($s1) -.L80240660: -/* 9A1640 80240660 8E220090 */ lw $v0, 0x90($s1) -/* 9A1644 80240664 1840000C */ blez $v0, .L80240698 -/* 9A1648 80240668 2442FFFF */ addiu $v0, $v0, -1 -/* 9A164C 8024066C 14400087 */ bnez $v0, .L8024088C -/* 9A1650 80240670 AE220090 */ sw $v0, 0x90($s1) -/* 9A1654 80240674 3C03FFAA */ lui $v1, 0xffaa -/* 9A1658 80240678 8E420028 */ lw $v0, 0x28($s2) -/* 9A165C 8024067C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9A1660 80240680 00431021 */ addu $v0, $v0, $v1 -/* 9A1664 80240684 2C420002 */ sltiu $v0, $v0, 2 -/* 9A1668 80240688 10400003 */ beqz $v0, .L80240698 -/* 9A166C 8024068C 3C020055 */ lui $v0, 0x55 -/* 9A1670 80240690 3442000C */ ori $v0, $v0, 0xc -/* 9A1674 80240694 AE420028 */ sw $v0, 0x28($s2) -.L80240698: -/* 9A1678 80240698 8E630070 */ lw $v1, 0x70($s3) -/* 9A167C 8024069C 2402000C */ addiu $v0, $zero, 0xc -/* 9A1680 802406A0 10620048 */ beq $v1, $v0, .L802407C4 -/* 9A1684 802406A4 2862000D */ slti $v0, $v1, 0xd -/* 9A1688 802406A8 1040000F */ beqz $v0, .L802406E8 -/* 9A168C 802406AC 24100001 */ addiu $s0, $zero, 1 -/* 9A1690 802406B0 1070001E */ beq $v1, $s0, .L8024072C -/* 9A1694 802406B4 28620002 */ slti $v0, $v1, 2 -/* 9A1698 802406B8 10400005 */ beqz $v0, .L802406D0 -/* 9A169C 802406BC 24020002 */ addiu $v0, $zero, 2 -/* 9A16A0 802406C0 10600015 */ beqz $v1, .L80240718 -/* 9A16A4 802406C4 0260202D */ daddu $a0, $s3, $zero -/* 9A16A8 802406C8 08090208 */ j .L80240820 -/* 9A16AC 802406CC 00000000 */ nop -.L802406D0: -/* 9A16B0 802406D0 1062001C */ beq $v1, $v0, .L80240744 -/* 9A16B4 802406D4 24020003 */ addiu $v0, $zero, 3 -/* 9A16B8 802406D8 10620035 */ beq $v1, $v0, .L802407B0 -/* 9A16BC 802406DC 0260202D */ daddu $a0, $s3, $zero -/* 9A16C0 802406E0 08090208 */ j .L80240820 -/* 9A16C4 802406E4 00000000 */ nop -.L802406E8: -/* 9A16C8 802406E8 2402000E */ addiu $v0, $zero, 0xe -/* 9A16CC 802406EC 1062003F */ beq $v1, $v0, .L802407EC -/* 9A16D0 802406F0 0062102A */ slt $v0, $v1, $v0 -/* 9A16D4 802406F4 14400038 */ bnez $v0, .L802407D8 -/* 9A16D8 802406F8 0260202D */ daddu $a0, $s3, $zero -/* 9A16DC 802406FC 2402000F */ addiu $v0, $zero, 0xf -/* 9A16E0 80240700 10620040 */ beq $v1, $v0, .L80240804 -/* 9A16E4 80240704 24020063 */ addiu $v0, $zero, 0x63 -/* 9A16E8 80240708 10620043 */ beq $v1, $v0, .L80240818 -/* 9A16EC 8024070C 00000000 */ nop -/* 9A16F0 80240710 08090208 */ j .L80240820 -/* 9A16F4 80240714 00000000 */ nop -.L80240718: -/* 9A16F8 80240718 0280282D */ daddu $a1, $s4, $zero -/* 9A16FC 8024071C 0C012568 */ jal func_800495A0 -/* 9A1700 80240720 02A0302D */ daddu $a2, $s5, $zero -/* 9A1704 80240724 96220086 */ lhu $v0, 0x86($s1) -/* 9A1708 80240728 A64200A8 */ sh $v0, 0xa8($s2) -.L8024072C: -/* 9A170C 8024072C 0260202D */ daddu $a0, $s3, $zero -/* 9A1710 80240730 0280282D */ daddu $a1, $s4, $zero -/* 9A1714 80240734 0C0125AE */ jal func_800496B8 -/* 9A1718 80240738 02A0302D */ daddu $a2, $s5, $zero -/* 9A171C 8024073C 08090208 */ j .L80240820 -/* 9A1720 80240740 00000000 */ nop -.L80240744: -/* 9A1724 80240744 0260202D */ daddu $a0, $s3, $zero -/* 9A1728 80240748 0280282D */ daddu $a1, $s4, $zero -/* 9A172C 8024074C 0C0126D1 */ jal func_80049B44 -/* 9A1730 80240750 02A0302D */ daddu $a2, $s5, $zero -/* 9A1734 80240754 8E230088 */ lw $v1, 0x88($s1) -/* 9A1738 80240758 24020006 */ addiu $v0, $zero, 6 -/* 9A173C 8024075C 14620014 */ bne $v1, $v0, .L802407B0 -/* 9A1740 80240760 0260202D */ daddu $a0, $s3, $zero -/* 9A1744 80240764 0C00A67F */ jal rand_int -/* 9A1748 80240768 24040064 */ addiu $a0, $zero, 0x64 -/* 9A174C 8024076C 28420021 */ slti $v0, $v0, 0x21 -/* 9A1750 80240770 5040000F */ beql $v0, $zero, .L802407B0 -/* 9A1754 80240774 0260202D */ daddu $a0, $s3, $zero -/* 9A1758 80240778 8E22008C */ lw $v0, 0x8c($s1) -/* 9A175C 8024077C 10400005 */ beqz $v0, .L80240794 -/* 9A1760 80240780 3C020055 */ lui $v0, 0x55 -/* 9A1764 80240784 3442002F */ ori $v0, $v0, 0x2f -/* 9A1768 80240788 AE20008C */ sw $zero, 0x8c($s1) -/* 9A176C 8024078C 080901E8 */ j .L802407A0 -/* 9A1770 80240790 A22000B5 */ sb $zero, 0xb5($s1) -.L80240794: -/* 9A1774 80240794 3442002E */ ori $v0, $v0, 0x2e -/* 9A1778 80240798 AE30008C */ sw $s0, 0x8c($s1) -/* 9A177C 8024079C A23000B5 */ sb $s0, 0xb5($s1) -.L802407A0: -/* 9A1780 802407A0 AE420028 */ sw $v0, 0x28($s2) -/* 9A1784 802407A4 24020007 */ addiu $v0, $zero, 7 -/* 9A1788 802407A8 08090223 */ j .L8024088C -/* 9A178C 802407AC AE220090 */ sw $v0, 0x90($s1) -.L802407B0: -/* 9A1790 802407B0 0280282D */ daddu $a1, $s4, $zero -/* 9A1794 802407B4 0C012701 */ jal func_80049C04 -/* 9A1798 802407B8 02A0302D */ daddu $a2, $s5, $zero -/* 9A179C 802407BC 08090208 */ j .L80240820 -/* 9A17A0 802407C0 00000000 */ nop -.L802407C4: -/* 9A17A4 802407C4 0260202D */ daddu $a0, $s3, $zero -/* 9A17A8 802407C8 0280282D */ daddu $a1, $s4, $zero -/* 9A17AC 802407CC 0C090038 */ jal func_802400E0 -/* 9A17B0 802407D0 02A0302D */ daddu $a2, $s5, $zero -/* 9A17B4 802407D4 0260202D */ daddu $a0, $s3, $zero -.L802407D8: -/* 9A17B8 802407D8 0280282D */ daddu $a1, $s4, $zero -/* 9A17BC 802407DC 0C090057 */ jal func_8024015C -/* 9A17C0 802407E0 02A0302D */ daddu $a2, $s5, $zero -/* 9A17C4 802407E4 08090208 */ j .L80240820 -/* 9A17C8 802407E8 00000000 */ nop -.L802407EC: -/* 9A17CC 802407EC 0260202D */ daddu $a0, $s3, $zero -/* 9A17D0 802407F0 0280282D */ daddu $a1, $s4, $zero -/* 9A17D4 802407F4 0C0900A4 */ jal func_80240290 -/* 9A17D8 802407F8 02A0302D */ daddu $a2, $s5, $zero -/* 9A17DC 802407FC 08090208 */ j .L80240820 -/* 9A17E0 80240800 00000000 */ nop -.L80240804: -/* 9A17E4 80240804 0280282D */ daddu $a1, $s4, $zero -/* 9A17E8 80240808 0C0900FD */ jal func_802403F4 -/* 9A17EC 8024080C 02A0302D */ daddu $a2, $s5, $zero -/* 9A17F0 80240810 08090208 */ j .L80240820 -/* 9A17F4 80240814 00000000 */ nop -.L80240818: -/* 9A17F8 80240818 0C0129CF */ jal func_8004A73C -/* 9A17FC 8024081C 0260202D */ daddu $a0, $s3, $zero -.L80240820: -/* 9A1800 80240820 8E230088 */ lw $v1, 0x88($s1) -/* 9A1804 80240824 24020006 */ addiu $v0, $zero, 6 -/* 9A1808 80240828 14620019 */ bne $v1, $v0, .L80240890 -/* 9A180C 8024082C 0000102D */ daddu $v0, $zero, $zero -/* 9A1810 80240830 8E22008C */ lw $v0, 0x8c($s1) -/* 9A1814 80240834 10400003 */ beqz $v0, .L80240844 -/* 9A1818 80240838 24020001 */ addiu $v0, $zero, 1 -/* 9A181C 8024083C 08090212 */ j .L80240848 -/* 9A1820 80240840 A22200B5 */ sb $v0, 0xb5($s1) -.L80240844: -/* 9A1824 80240844 A22000B5 */ sb $zero, 0xb5($s1) -.L80240848: -/* 9A1828 80240848 8E22008C */ lw $v0, 0x8c($s1) -/* 9A182C 8024084C 1040000F */ beqz $v0, .L8024088C -/* 9A1830 80240850 3C03FFAA */ lui $v1, 0xffaa -/* 9A1834 80240854 8E420028 */ lw $v0, 0x28($s2) -/* 9A1838 80240858 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9A183C 8024085C 00431821 */ addu $v1, $v0, $v1 -/* 9A1840 80240860 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9A1844 80240864 10400009 */ beqz $v0, .L8024088C -/* 9A1848 80240868 00031080 */ sll $v0, $v1, 2 -/* 9A184C 8024086C 3C018024 */ lui $at, 0x8024 -/* 9A1850 80240870 00220821 */ addu $at, $at, $v0 -/* 9A1854 80240874 8C2232E8 */ lw $v0, 0x32e8($at) -/* 9A1858 80240878 00400008 */ jr $v0 -/* 9A185C 8024087C 00000000 */ nop -/* 9A1860 80240880 8E420028 */ lw $v0, 0x28($s2) -/* 9A1864 80240884 24420001 */ addiu $v0, $v0, 1 -/* 9A1868 80240888 AE420028 */ sw $v0, 0x28($s2) -.L8024088C: -/* 9A186C 8024088C 0000102D */ daddu $v0, $zero, $zero -.L80240890: -/* 9A1870 80240890 8FBF0068 */ lw $ra, 0x68($sp) -/* 9A1874 80240894 8FB50064 */ lw $s5, 0x64($sp) -/* 9A1878 80240898 8FB40060 */ lw $s4, 0x60($sp) -/* 9A187C 8024089C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9A1880 802408A0 8FB20058 */ lw $s2, 0x58($sp) -/* 9A1884 802408A4 8FB10054 */ lw $s1, 0x54($sp) -/* 9A1888 802408A8 8FB00050 */ lw $s0, 0x50($sp) -/* 9A188C 802408AC 03E00008 */ jr $ra -/* 9A1890 802408B0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s new file mode 100644 index 0000000000..f028890797 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240474_9A1454.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240474_9A1454 +/* 9A1454 80240474 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 9A1458 80240478 AFB3005C */ sw $s3, 0x5c($sp) +/* 9A145C 8024047C 0080982D */ daddu $s3, $a0, $zero +/* 9A1460 80240480 AFBF0068 */ sw $ra, 0x68($sp) +/* 9A1464 80240484 AFB50064 */ sw $s5, 0x64($sp) +/* 9A1468 80240488 AFB40060 */ sw $s4, 0x60($sp) +/* 9A146C 8024048C AFB20058 */ sw $s2, 0x58($sp) +/* 9A1470 80240490 AFB10054 */ sw $s1, 0x54($sp) +/* 9A1474 80240494 AFB00050 */ sw $s0, 0x50($sp) +/* 9A1478 80240498 8E710148 */ lw $s1, 0x148($s3) +/* 9A147C 8024049C 86240008 */ lh $a0, 8($s1) +/* 9A1480 802404A0 0C00EABB */ jal get_npc_unsafe +/* 9A1484 802404A4 00A0802D */ daddu $s0, $a1, $zero +/* 9A1488 802404A8 8E63000C */ lw $v1, 0xc($s3) +/* 9A148C 802404AC 0260202D */ daddu $a0, $s3, $zero +/* 9A1490 802404B0 8C650000 */ lw $a1, ($v1) +/* 9A1494 802404B4 0C0B1EAF */ jal get_variable +/* 9A1498 802404B8 0040902D */ daddu $s2, $v0, $zero +/* 9A149C 802404BC AFA00028 */ sw $zero, 0x28($sp) +/* 9A14A0 802404C0 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A14A4 802404C4 8C630030 */ lw $v1, 0x30($v1) +/* 9A14A8 802404C8 AFA3002C */ sw $v1, 0x2c($sp) +/* 9A14AC 802404CC 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A14B0 802404D0 8C63001C */ lw $v1, 0x1c($v1) +/* 9A14B4 802404D4 AFA30030 */ sw $v1, 0x30($sp) +/* 9A14B8 802404D8 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A14BC 802404DC 8C630024 */ lw $v1, 0x24($v1) +/* 9A14C0 802404E0 AFA30034 */ sw $v1, 0x34($sp) +/* 9A14C4 802404E4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A14C8 802404E8 8C630028 */ lw $v1, 0x28($v1) +/* 9A14CC 802404EC 27B50028 */ addiu $s5, $sp, 0x28 +/* 9A14D0 802404F0 AFA30038 */ sw $v1, 0x38($sp) +/* 9A14D4 802404F4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A14D8 802404F8 3C0142C8 */ lui $at, 0x42c8 +/* 9A14DC 802404FC 44810000 */ mtc1 $at, $f0 +/* 9A14E0 80240500 8C63002C */ lw $v1, 0x2c($v1) +/* 9A14E4 80240504 0040A02D */ daddu $s4, $v0, $zero +/* 9A14E8 80240508 E7A00040 */ swc1 $f0, 0x40($sp) +/* 9A14EC 8024050C A7A00044 */ sh $zero, 0x44($sp) +/* 9A14F0 80240510 12000009 */ beqz $s0, .L80240538 +/* 9A14F4 80240514 AFA3003C */ sw $v1, 0x3c($sp) +/* 9A14F8 80240518 864300A8 */ lh $v1, 0xa8($s2) +/* 9A14FC 8024051C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A1500 80240520 AE20008C */ sw $zero, 0x8c($s1) +/* 9A1504 80240524 A22000B5 */ sb $zero, 0xb5($s1) +/* 9A1508 80240528 34420008 */ ori $v0, $v0, 8 +/* 9A150C 8024052C AE230084 */ sw $v1, 0x84($s1) +/* 9A1510 80240530 08090152 */ j .L80240548 +/* 9A1514 80240534 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240538: +/* 9A1518 80240538 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A151C 8024053C 30420004 */ andi $v0, $v0, 4 +/* 9A1520 80240540 10400047 */ beqz $v0, .L80240660 +/* 9A1524 80240544 00000000 */ nop +.L80240548: +/* 9A1528 80240548 AE600070 */ sw $zero, 0x70($s3) +/* 9A152C 8024054C A640008E */ sh $zero, 0x8e($s2) +/* 9A1530 80240550 8E2300CC */ lw $v1, 0xcc($s1) +/* 9A1534 80240554 2404F7FF */ addiu $a0, $zero, -0x801 +/* 9A1538 80240558 A2200007 */ sb $zero, 7($s1) +/* 9A153C 8024055C 8E420000 */ lw $v0, ($s2) +/* 9A1540 80240560 8C630000 */ lw $v1, ($v1) +/* 9A1544 80240564 00441024 */ and $v0, $v0, $a0 +/* 9A1548 80240568 AE420000 */ sw $v0, ($s2) +/* 9A154C 8024056C AE430028 */ sw $v1, 0x28($s2) +/* 9A1550 80240570 96220086 */ lhu $v0, 0x86($s1) +/* 9A1554 80240574 A64200A8 */ sh $v0, 0xa8($s2) +/* 9A1558 80240578 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9A155C 8024057C AE200090 */ sw $zero, 0x90($s1) +/* 9A1560 80240580 8C420034 */ lw $v0, 0x34($v0) +/* 9A1564 80240584 14400006 */ bnez $v0, .L802405A0 +/* 9A1568 80240588 2403FDFF */ addiu $v1, $zero, -0x201 +/* 9A156C 8024058C 8E420000 */ lw $v0, ($s2) +/* 9A1570 80240590 2403FFF7 */ addiu $v1, $zero, -9 +/* 9A1574 80240594 34420200 */ ori $v0, $v0, 0x200 +/* 9A1578 80240598 0809016B */ j .L802405AC +/* 9A157C 8024059C 00431024 */ and $v0, $v0, $v1 +.L802405A0: +/* 9A1580 802405A0 8E420000 */ lw $v0, ($s2) +/* 9A1584 802405A4 00431024 */ and $v0, $v0, $v1 +/* 9A1588 802405A8 34420008 */ ori $v0, $v0, 8 +.L802405AC: +/* 9A158C 802405AC AE420000 */ sw $v0, ($s2) +/* 9A1590 802405B0 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A1594 802405B4 30420004 */ andi $v0, $v0, 4 +/* 9A1598 802405B8 1040001E */ beqz $v0, .L80240634 +/* 9A159C 802405BC 24040002 */ addiu $a0, $zero, 2 +/* 9A15A0 802405C0 0240282D */ daddu $a1, $s2, $zero +/* 9A15A4 802405C4 0000302D */ daddu $a2, $zero, $zero +/* 9A15A8 802405C8 24020063 */ addiu $v0, $zero, 0x63 +/* 9A15AC 802405CC AE620070 */ sw $v0, 0x70($s3) +/* 9A15B0 802405D0 AE600074 */ sw $zero, 0x74($s3) +/* 9A15B4 802405D4 864300A8 */ lh $v1, 0xa8($s2) +/* 9A15B8 802405D8 3C013F80 */ lui $at, 0x3f80 +/* 9A15BC 802405DC 44810000 */ mtc1 $at, $f0 +/* 9A15C0 802405E0 3C014000 */ lui $at, 0x4000 +/* 9A15C4 802405E4 44811000 */ mtc1 $at, $f2 +/* 9A15C8 802405E8 3C01C1A0 */ lui $at, 0xc1a0 +/* 9A15CC 802405EC 44812000 */ mtc1 $at, $f4 +/* 9A15D0 802405F0 24020028 */ addiu $v0, $zero, 0x28 +/* 9A15D4 802405F4 AFA2001C */ sw $v0, 0x1c($sp) +/* 9A15D8 802405F8 44833000 */ mtc1 $v1, $f6 +/* 9A15DC 802405FC 00000000 */ nop +/* 9A15E0 80240600 468031A0 */ cvt.s.w $f6, $f6 +/* 9A15E4 80240604 44073000 */ mfc1 $a3, $f6 +/* 9A15E8 80240608 27A20048 */ addiu $v0, $sp, 0x48 +/* 9A15EC 8024060C AFA20020 */ sw $v0, 0x20($sp) +/* 9A15F0 80240610 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9A15F4 80240614 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9A15F8 80240618 0C01BFA4 */ jal fx_emote +/* 9A15FC 8024061C E7A40018 */ swc1 $f4, 0x18($sp) +/* 9A1600 80240620 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A1604 80240624 2403FFFB */ addiu $v1, $zero, -5 +/* 9A1608 80240628 00431024 */ and $v0, $v0, $v1 +/* 9A160C 8024062C 08090198 */ j .L80240660 +/* 9A1610 80240630 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240634: +/* 9A1614 80240634 8E220000 */ lw $v0, ($s1) +/* 9A1618 80240638 3C034000 */ lui $v1, 0x4000 +/* 9A161C 8024063C 00431024 */ and $v0, $v0, $v1 +/* 9A1620 80240640 10400007 */ beqz $v0, .L80240660 +/* 9A1624 80240644 3C03BFFF */ lui $v1, 0xbfff +/* 9A1628 80240648 2402000C */ addiu $v0, $zero, 0xc +/* 9A162C 8024064C AE620070 */ sw $v0, 0x70($s3) +/* 9A1630 80240650 8E220000 */ lw $v0, ($s1) +/* 9A1634 80240654 3463FFFF */ ori $v1, $v1, 0xffff +/* 9A1638 80240658 00431024 */ and $v0, $v0, $v1 +/* 9A163C 8024065C AE220000 */ sw $v0, ($s1) +.L80240660: +/* 9A1640 80240660 8E220090 */ lw $v0, 0x90($s1) +/* 9A1644 80240664 1840000C */ blez $v0, .L80240698 +/* 9A1648 80240668 2442FFFF */ addiu $v0, $v0, -1 +/* 9A164C 8024066C 14400087 */ bnez $v0, .L8024088C +/* 9A1650 80240670 AE220090 */ sw $v0, 0x90($s1) +/* 9A1654 80240674 3C03FFAA */ lui $v1, 0xffaa +/* 9A1658 80240678 8E420028 */ lw $v0, 0x28($s2) +/* 9A165C 8024067C 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 9A1660 80240680 00431021 */ addu $v0, $v0, $v1 +/* 9A1664 80240684 2C420002 */ sltiu $v0, $v0, 2 +/* 9A1668 80240688 10400003 */ beqz $v0, .L80240698 +/* 9A166C 8024068C 3C020055 */ lui $v0, 0x55 +/* 9A1670 80240690 3442000C */ ori $v0, $v0, 0xc +/* 9A1674 80240694 AE420028 */ sw $v0, 0x28($s2) +.L80240698: +/* 9A1678 80240698 8E630070 */ lw $v1, 0x70($s3) +/* 9A167C 8024069C 2402000C */ addiu $v0, $zero, 0xc +/* 9A1680 802406A0 10620048 */ beq $v1, $v0, .L802407C4 +/* 9A1684 802406A4 2862000D */ slti $v0, $v1, 0xd +/* 9A1688 802406A8 1040000F */ beqz $v0, .L802406E8 +/* 9A168C 802406AC 24100001 */ addiu $s0, $zero, 1 +/* 9A1690 802406B0 1070001E */ beq $v1, $s0, .L8024072C +/* 9A1694 802406B4 28620002 */ slti $v0, $v1, 2 +/* 9A1698 802406B8 10400005 */ beqz $v0, .L802406D0 +/* 9A169C 802406BC 24020002 */ addiu $v0, $zero, 2 +/* 9A16A0 802406C0 10600015 */ beqz $v1, .L80240718 +/* 9A16A4 802406C4 0260202D */ daddu $a0, $s3, $zero +/* 9A16A8 802406C8 08090208 */ j .L80240820 +/* 9A16AC 802406CC 00000000 */ nop +.L802406D0: +/* 9A16B0 802406D0 1062001C */ beq $v1, $v0, .L80240744 +/* 9A16B4 802406D4 24020003 */ addiu $v0, $zero, 3 +/* 9A16B8 802406D8 10620035 */ beq $v1, $v0, .L802407B0 +/* 9A16BC 802406DC 0260202D */ daddu $a0, $s3, $zero +/* 9A16C0 802406E0 08090208 */ j .L80240820 +/* 9A16C4 802406E4 00000000 */ nop +.L802406E8: +/* 9A16C8 802406E8 2402000E */ addiu $v0, $zero, 0xe +/* 9A16CC 802406EC 1062003F */ beq $v1, $v0, .L802407EC +/* 9A16D0 802406F0 0062102A */ slt $v0, $v1, $v0 +/* 9A16D4 802406F4 14400038 */ bnez $v0, .L802407D8 +/* 9A16D8 802406F8 0260202D */ daddu $a0, $s3, $zero +/* 9A16DC 802406FC 2402000F */ addiu $v0, $zero, 0xf +/* 9A16E0 80240700 10620040 */ beq $v1, $v0, .L80240804 +/* 9A16E4 80240704 24020063 */ addiu $v0, $zero, 0x63 +/* 9A16E8 80240708 10620043 */ beq $v1, $v0, .L80240818 +/* 9A16EC 8024070C 00000000 */ nop +/* 9A16F0 80240710 08090208 */ j .L80240820 +/* 9A16F4 80240714 00000000 */ nop +.L80240718: +/* 9A16F8 80240718 0280282D */ daddu $a1, $s4, $zero +/* 9A16FC 8024071C 0C012568 */ jal func_800495A0 +/* 9A1700 80240720 02A0302D */ daddu $a2, $s5, $zero +/* 9A1704 80240724 96220086 */ lhu $v0, 0x86($s1) +/* 9A1708 80240728 A64200A8 */ sh $v0, 0xa8($s2) +.L8024072C: +/* 9A170C 8024072C 0260202D */ daddu $a0, $s3, $zero +/* 9A1710 80240730 0280282D */ daddu $a1, $s4, $zero +/* 9A1714 80240734 0C0125AE */ jal func_800496B8 +/* 9A1718 80240738 02A0302D */ daddu $a2, $s5, $zero +/* 9A171C 8024073C 08090208 */ j .L80240820 +/* 9A1720 80240740 00000000 */ nop +.L80240744: +/* 9A1724 80240744 0260202D */ daddu $a0, $s3, $zero +/* 9A1728 80240748 0280282D */ daddu $a1, $s4, $zero +/* 9A172C 8024074C 0C0126D1 */ jal func_80049B44 +/* 9A1730 80240750 02A0302D */ daddu $a2, $s5, $zero +/* 9A1734 80240754 8E230088 */ lw $v1, 0x88($s1) +/* 9A1738 80240758 24020006 */ addiu $v0, $zero, 6 +/* 9A173C 8024075C 14620014 */ bne $v1, $v0, .L802407B0 +/* 9A1740 80240760 0260202D */ daddu $a0, $s3, $zero +/* 9A1744 80240764 0C00A67F */ jal rand_int +/* 9A1748 80240768 24040064 */ addiu $a0, $zero, 0x64 +/* 9A174C 8024076C 28420021 */ slti $v0, $v0, 0x21 +/* 9A1750 80240770 5040000F */ beql $v0, $zero, .L802407B0 +/* 9A1754 80240774 0260202D */ daddu $a0, $s3, $zero +/* 9A1758 80240778 8E22008C */ lw $v0, 0x8c($s1) +/* 9A175C 8024077C 10400005 */ beqz $v0, .L80240794 +/* 9A1760 80240780 3C020055 */ lui $v0, 0x55 +/* 9A1764 80240784 3442002F */ ori $v0, $v0, 0x2f +/* 9A1768 80240788 AE20008C */ sw $zero, 0x8c($s1) +/* 9A176C 8024078C 080901E8 */ j .L802407A0 +/* 9A1770 80240790 A22000B5 */ sb $zero, 0xb5($s1) +.L80240794: +/* 9A1774 80240794 3442002E */ ori $v0, $v0, 0x2e +/* 9A1778 80240798 AE30008C */ sw $s0, 0x8c($s1) +/* 9A177C 8024079C A23000B5 */ sb $s0, 0xb5($s1) +.L802407A0: +/* 9A1780 802407A0 AE420028 */ sw $v0, 0x28($s2) +/* 9A1784 802407A4 24020007 */ addiu $v0, $zero, 7 +/* 9A1788 802407A8 08090223 */ j .L8024088C +/* 9A178C 802407AC AE220090 */ sw $v0, 0x90($s1) +.L802407B0: +/* 9A1790 802407B0 0280282D */ daddu $a1, $s4, $zero +/* 9A1794 802407B4 0C012701 */ jal func_80049C04 +/* 9A1798 802407B8 02A0302D */ daddu $a2, $s5, $zero +/* 9A179C 802407BC 08090208 */ j .L80240820 +/* 9A17A0 802407C0 00000000 */ nop +.L802407C4: +/* 9A17A4 802407C4 0260202D */ daddu $a0, $s3, $zero +/* 9A17A8 802407C8 0280282D */ daddu $a1, $s4, $zero +/* 9A17AC 802407CC 0C090038 */ jal func_802400E0_9A10C0 +/* 9A17B0 802407D0 02A0302D */ daddu $a2, $s5, $zero +/* 9A17B4 802407D4 0260202D */ daddu $a0, $s3, $zero +.L802407D8: +/* 9A17B8 802407D8 0280282D */ daddu $a1, $s4, $zero +/* 9A17BC 802407DC 0C090057 */ jal func_8024015C_9A113C +/* 9A17C0 802407E0 02A0302D */ daddu $a2, $s5, $zero +/* 9A17C4 802407E4 08090208 */ j .L80240820 +/* 9A17C8 802407E8 00000000 */ nop +.L802407EC: +/* 9A17CC 802407EC 0260202D */ daddu $a0, $s3, $zero +/* 9A17D0 802407F0 0280282D */ daddu $a1, $s4, $zero +/* 9A17D4 802407F4 0C0900A4 */ jal func_80240290_9A1270 +/* 9A17D8 802407F8 02A0302D */ daddu $a2, $s5, $zero +/* 9A17DC 802407FC 08090208 */ j .L80240820 +/* 9A17E0 80240800 00000000 */ nop +.L80240804: +/* 9A17E4 80240804 0280282D */ daddu $a1, $s4, $zero +/* 9A17E8 80240808 0C0900FD */ jal func_802403F4_9A13D4 +/* 9A17EC 8024080C 02A0302D */ daddu $a2, $s5, $zero +/* 9A17F0 80240810 08090208 */ j .L80240820 +/* 9A17F4 80240814 00000000 */ nop +.L80240818: +/* 9A17F8 80240818 0C0129CF */ jal func_8004A73C +/* 9A17FC 8024081C 0260202D */ daddu $a0, $s3, $zero +.L80240820: +/* 9A1800 80240820 8E230088 */ lw $v1, 0x88($s1) +/* 9A1804 80240824 24020006 */ addiu $v0, $zero, 6 +/* 9A1808 80240828 14620019 */ bne $v1, $v0, .L80240890 +/* 9A180C 8024082C 0000102D */ daddu $v0, $zero, $zero +/* 9A1810 80240830 8E22008C */ lw $v0, 0x8c($s1) +/* 9A1814 80240834 10400003 */ beqz $v0, .L80240844 +/* 9A1818 80240838 24020001 */ addiu $v0, $zero, 1 +/* 9A181C 8024083C 08090212 */ j .L80240848 +/* 9A1820 80240840 A22200B5 */ sb $v0, 0xb5($s1) +.L80240844: +/* 9A1824 80240844 A22000B5 */ sb $zero, 0xb5($s1) +.L80240848: +/* 9A1828 80240848 8E22008C */ lw $v0, 0x8c($s1) +/* 9A182C 8024084C 1040000F */ beqz $v0, .L8024088C +/* 9A1830 80240850 3C03FFAA */ lui $v1, 0xffaa +/* 9A1834 80240854 8E420028 */ lw $v0, 0x28($s2) +/* 9A1838 80240858 3463FFFC */ ori $v1, $v1, 0xfffc +/* 9A183C 8024085C 00431821 */ addu $v1, $v0, $v1 +/* 9A1840 80240860 2C620015 */ sltiu $v0, $v1, 0x15 +/* 9A1844 80240864 10400009 */ beqz $v0, .L8024088C +/* 9A1848 80240868 00031080 */ sll $v0, $v1, 2 +/* 9A184C 8024086C 3C018024 */ lui $at, 0x8024 +/* 9A1850 80240870 00220821 */ addu $at, $at, $v0 +/* 9A1854 80240874 8C2232E8 */ lw $v0, 0x32e8($at) +/* 9A1858 80240878 00400008 */ jr $v0 +/* 9A185C 8024087C 00000000 */ nop +/* 9A1860 80240880 8E420028 */ lw $v0, 0x28($s2) +/* 9A1864 80240884 24420001 */ addiu $v0, $v0, 1 +/* 9A1868 80240888 AE420028 */ sw $v0, 0x28($s2) +.L8024088C: +/* 9A186C 8024088C 0000102D */ daddu $v0, $zero, $zero +.L80240890: +/* 9A1870 80240890 8FBF0068 */ lw $ra, 0x68($sp) +/* 9A1874 80240894 8FB50064 */ lw $s5, 0x64($sp) +/* 9A1878 80240898 8FB40060 */ lw $s4, 0x60($sp) +/* 9A187C 8024089C 8FB3005C */ lw $s3, 0x5c($sp) +/* 9A1880 802408A0 8FB20058 */ lw $s2, 0x58($sp) +/* 9A1884 802408A4 8FB10054 */ lw $s1, 0x54($sp) +/* 9A1888 802408A8 8FB00050 */ lw $s0, 0x50($sp) +/* 9A188C 802408AC 03E00008 */ jr $ra +/* 9A1890 802408B0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4.s deleted file mode 100644 index 4d608fbc05..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CB4 -/* 9A1C94 80240CB4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A1C98 80240CB8 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A1C9C 80240CBC 0080982D */ daddu $s3, $a0, $zero -/* 9A1CA0 80240CC0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A1CA4 80240CC4 AFB20018 */ sw $s2, 0x18($sp) -/* 9A1CA8 80240CC8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1CAC 80240CCC AFB00010 */ sw $s0, 0x10($sp) -/* 9A1CB0 80240CD0 8E720148 */ lw $s2, 0x148($s3) -/* 9A1CB4 80240CD4 86440008 */ lh $a0, 8($s2) -/* 9A1CB8 80240CD8 0C00EABB */ jal get_npc_unsafe -/* 9A1CBC 80240CDC 00A0882D */ daddu $s1, $a1, $zero -/* 9A1CC0 80240CE0 8E240008 */ lw $a0, 8($s1) -/* 9A1CC4 80240CE4 0040802D */ daddu $s0, $v0, $zero -/* 9A1CC8 80240CE8 00041FC2 */ srl $v1, $a0, 0x1f -/* 9A1CCC 80240CEC 00832021 */ addu $a0, $a0, $v1 -/* 9A1CD0 80240CF0 00042043 */ sra $a0, $a0, 1 -/* 9A1CD4 80240CF4 0C00A67F */ jal rand_int -/* 9A1CD8 80240CF8 24840001 */ addiu $a0, $a0, 1 -/* 9A1CDC 80240CFC 8E230008 */ lw $v1, 8($s1) -/* 9A1CE0 80240D00 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9A1CE4 80240D04 00032FC2 */ srl $a1, $v1, 0x1f -/* 9A1CE8 80240D08 00651821 */ addu $v1, $v1, $a1 -/* 9A1CEC 80240D0C 00031843 */ sra $v1, $v1, 1 -/* 9A1CF0 80240D10 00621821 */ addu $v1, $v1, $v0 -/* 9A1CF4 80240D14 0C00A67F */ jal rand_int -/* 9A1CF8 80240D18 A603008E */ sh $v1, 0x8e($s0) -/* 9A1CFC 80240D1C C60C000C */ lwc1 $f12, 0xc($s0) -/* 9A1D00 80240D20 44820000 */ mtc1 $v0, $f0 -/* 9A1D04 80240D24 00000000 */ nop -/* 9A1D08 80240D28 46800020 */ cvt.s.w $f0, $f0 -/* 9A1D0C 80240D2C 46006300 */ add.s $f12, $f12, $f0 -/* 9A1D10 80240D30 3C0142B4 */ lui $at, 0x42b4 -/* 9A1D14 80240D34 44810000 */ mtc1 $at, $f0 -/* 9A1D18 80240D38 0C00A6C9 */ jal clamp_angle -/* 9A1D1C 80240D3C 46006301 */ sub.s $f12, $f12, $f0 -/* 9A1D20 80240D40 E600000C */ swc1 $f0, 0xc($s0) -/* 9A1D24 80240D44 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A1D28 80240D48 8C420000 */ lw $v0, ($v0) -/* 9A1D2C 80240D4C AE020028 */ sw $v0, 0x28($s0) -/* 9A1D30 80240D50 24020003 */ addiu $v0, $zero, 3 -/* 9A1D34 80240D54 AE620070 */ sw $v0, 0x70($s3) -/* 9A1D38 80240D58 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A1D3C 80240D5C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A1D40 80240D60 8FB20018 */ lw $s2, 0x18($sp) -/* 9A1D44 80240D64 8FB10014 */ lw $s1, 0x14($sp) -/* 9A1D48 80240D68 8FB00010 */ lw $s0, 0x10($sp) -/* 9A1D4C 80240D6C 03E00008 */ jr $ra -/* 9A1D50 80240D70 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s new file mode 100644 index 0000000000..6294825fa9 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240CB4_9A1C94.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240CB4_9A1C94 +/* 9A1C94 80240CB4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9A1C98 80240CB8 AFB3001C */ sw $s3, 0x1c($sp) +/* 9A1C9C 80240CBC 0080982D */ daddu $s3, $a0, $zero +/* 9A1CA0 80240CC0 AFBF0020 */ sw $ra, 0x20($sp) +/* 9A1CA4 80240CC4 AFB20018 */ sw $s2, 0x18($sp) +/* 9A1CA8 80240CC8 AFB10014 */ sw $s1, 0x14($sp) +/* 9A1CAC 80240CCC AFB00010 */ sw $s0, 0x10($sp) +/* 9A1CB0 80240CD0 8E720148 */ lw $s2, 0x148($s3) +/* 9A1CB4 80240CD4 86440008 */ lh $a0, 8($s2) +/* 9A1CB8 80240CD8 0C00EABB */ jal get_npc_unsafe +/* 9A1CBC 80240CDC 00A0882D */ daddu $s1, $a1, $zero +/* 9A1CC0 80240CE0 8E240008 */ lw $a0, 8($s1) +/* 9A1CC4 80240CE4 0040802D */ daddu $s0, $v0, $zero +/* 9A1CC8 80240CE8 00041FC2 */ srl $v1, $a0, 0x1f +/* 9A1CCC 80240CEC 00832021 */ addu $a0, $a0, $v1 +/* 9A1CD0 80240CF0 00042043 */ sra $a0, $a0, 1 +/* 9A1CD4 80240CF4 0C00A67F */ jal rand_int +/* 9A1CD8 80240CF8 24840001 */ addiu $a0, $a0, 1 +/* 9A1CDC 80240CFC 8E230008 */ lw $v1, 8($s1) +/* 9A1CE0 80240D00 240400B4 */ addiu $a0, $zero, 0xb4 +/* 9A1CE4 80240D04 00032FC2 */ srl $a1, $v1, 0x1f +/* 9A1CE8 80240D08 00651821 */ addu $v1, $v1, $a1 +/* 9A1CEC 80240D0C 00031843 */ sra $v1, $v1, 1 +/* 9A1CF0 80240D10 00621821 */ addu $v1, $v1, $v0 +/* 9A1CF4 80240D14 0C00A67F */ jal rand_int +/* 9A1CF8 80240D18 A603008E */ sh $v1, 0x8e($s0) +/* 9A1CFC 80240D1C C60C000C */ lwc1 $f12, 0xc($s0) +/* 9A1D00 80240D20 44820000 */ mtc1 $v0, $f0 +/* 9A1D04 80240D24 00000000 */ nop +/* 9A1D08 80240D28 46800020 */ cvt.s.w $f0, $f0 +/* 9A1D0C 80240D2C 46006300 */ add.s $f12, $f12, $f0 +/* 9A1D10 80240D30 3C0142B4 */ lui $at, 0x42b4 +/* 9A1D14 80240D34 44810000 */ mtc1 $at, $f0 +/* 9A1D18 80240D38 0C00A6C9 */ jal clamp_angle +/* 9A1D1C 80240D3C 46006301 */ sub.s $f12, $f12, $f0 +/* 9A1D20 80240D40 E600000C */ swc1 $f0, 0xc($s0) +/* 9A1D24 80240D44 8E4200CC */ lw $v0, 0xcc($s2) +/* 9A1D28 80240D48 8C420000 */ lw $v0, ($v0) +/* 9A1D2C 80240D4C AE020028 */ sw $v0, 0x28($s0) +/* 9A1D30 80240D50 24020003 */ addiu $v0, $zero, 3 +/* 9A1D34 80240D54 AE620070 */ sw $v0, 0x70($s3) +/* 9A1D38 80240D58 8FBF0020 */ lw $ra, 0x20($sp) +/* 9A1D3C 80240D5C 8FB3001C */ lw $s3, 0x1c($sp) +/* 9A1D40 80240D60 8FB20018 */ lw $s2, 0x18($sp) +/* 9A1D44 80240D64 8FB10014 */ lw $s1, 0x14($sp) +/* 9A1D48 80240D68 8FB00010 */ lw $s0, 0x10($sp) +/* 9A1D4C 80240D6C 03E00008 */ jr $ra +/* 9A1D50 80240D70 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74.s deleted file mode 100644 index f0d902708c..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D74 -/* 9A1D54 80240D74 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A1D58 80240D78 AFB40040 */ sw $s4, 0x40($sp) -/* 9A1D5C 80240D7C 0080A02D */ daddu $s4, $a0, $zero -/* 9A1D60 80240D80 AFBF0044 */ sw $ra, 0x44($sp) -/* 9A1D64 80240D84 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A1D68 80240D88 AFB20038 */ sw $s2, 0x38($sp) -/* 9A1D6C 80240D8C AFB10034 */ sw $s1, 0x34($sp) -/* 9A1D70 80240D90 AFB00030 */ sw $s0, 0x30($sp) -/* 9A1D74 80240D94 8E910148 */ lw $s1, 0x148($s4) -/* 9A1D78 80240D98 00A0902D */ daddu $s2, $a1, $zero -/* 9A1D7C 80240D9C 86240008 */ lh $a0, 8($s1) -/* 9A1D80 80240DA0 0C00EABB */ jal get_npc_unsafe -/* 9A1D84 80240DA4 00C0982D */ daddu $s3, $a2, $zero -/* 9A1D88 80240DA8 8E430014 */ lw $v1, 0x14($s2) -/* 9A1D8C 80240DAC 04600031 */ bltz $v1, .L80240E74 -/* 9A1D90 80240DB0 0040802D */ daddu $s0, $v0, $zero -/* 9A1D94 80240DB4 0260202D */ daddu $a0, $s3, $zero -/* 9A1D98 80240DB8 AFA00010 */ sw $zero, 0x10($sp) -/* 9A1D9C 80240DBC 8E460024 */ lw $a2, 0x24($s2) -/* 9A1DA0 80240DC0 8E470028 */ lw $a3, 0x28($s2) -/* 9A1DA4 80240DC4 0C01242D */ jal func_800490B4 -/* 9A1DA8 80240DC8 0220282D */ daddu $a1, $s1, $zero -/* 9A1DAC 80240DCC 10400029 */ beqz $v0, .L80240E74 -/* 9A1DB0 80240DD0 0000202D */ daddu $a0, $zero, $zero -/* 9A1DB4 80240DD4 0200282D */ daddu $a1, $s0, $zero -/* 9A1DB8 80240DD8 0000302D */ daddu $a2, $zero, $zero -/* 9A1DBC 80240DDC 860300A8 */ lh $v1, 0xa8($s0) -/* 9A1DC0 80240DE0 3C013F80 */ lui $at, 0x3f80 -/* 9A1DC4 80240DE4 44810000 */ mtc1 $at, $f0 -/* 9A1DC8 80240DE8 3C014000 */ lui $at, 0x4000 -/* 9A1DCC 80240DEC 44811000 */ mtc1 $at, $f2 -/* 9A1DD0 80240DF0 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A1DD4 80240DF4 44812000 */ mtc1 $at, $f4 -/* 9A1DD8 80240DF8 2402000F */ addiu $v0, $zero, 0xf -/* 9A1DDC 80240DFC AFA2001C */ sw $v0, 0x1c($sp) -/* 9A1DE0 80240E00 44833000 */ mtc1 $v1, $f6 -/* 9A1DE4 80240E04 00000000 */ nop -/* 9A1DE8 80240E08 468031A0 */ cvt.s.w $f6, $f6 -/* 9A1DEC 80240E0C 44073000 */ mfc1 $a3, $f6 -/* 9A1DF0 80240E10 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A1DF4 80240E14 AFA20020 */ sw $v0, 0x20($sp) -/* 9A1DF8 80240E18 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A1DFC 80240E1C E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A1E00 80240E20 0C01BFA4 */ jal fx_emote -/* 9A1E04 80240E24 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A1E08 80240E28 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A1E0C 80240E2C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A1E10 80240E30 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A1E14 80240E34 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A1E18 80240E38 8C460028 */ lw $a2, 0x28($v0) -/* 9A1E1C 80240E3C 0C00A720 */ jal atan2 -/* 9A1E20 80240E40 8C470030 */ lw $a3, 0x30($v0) -/* 9A1E24 80240E44 0200202D */ daddu $a0, $s0, $zero -/* 9A1E28 80240E48 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9A1E2C 80240E4C 3C060020 */ lui $a2, 0x20 -/* 9A1E30 80240E50 0C012530 */ jal func_800494C0 -/* 9A1E34 80240E54 E480000C */ swc1 $f0, 0xc($a0) -/* 9A1E38 80240E58 8E220018 */ lw $v0, 0x18($s1) -/* 9A1E3C 80240E5C 9442002A */ lhu $v0, 0x2a($v0) -/* 9A1E40 80240E60 30420001 */ andi $v0, $v0, 1 -/* 9A1E44 80240E64 14400029 */ bnez $v0, .L80240F0C -/* 9A1E48 80240E68 2402000A */ addiu $v0, $zero, 0xa -/* 9A1E4C 80240E6C 080903C3 */ j .L80240F0C -/* 9A1E50 80240E70 2402000C */ addiu $v0, $zero, 0xc -.L80240E74: -/* 9A1E54 80240E74 8602008C */ lh $v0, 0x8c($s0) -/* 9A1E58 80240E78 14400025 */ bnez $v0, .L80240F10 -/* 9A1E5C 80240E7C 00000000 */ nop -/* 9A1E60 80240E80 9602008E */ lhu $v0, 0x8e($s0) -/* 9A1E64 80240E84 2442FFFF */ addiu $v0, $v0, -1 -/* 9A1E68 80240E88 A602008E */ sh $v0, 0x8e($s0) -/* 9A1E6C 80240E8C 00021400 */ sll $v0, $v0, 0x10 -/* 9A1E70 80240E90 1440001F */ bnez $v0, .L80240F10 -/* 9A1E74 80240E94 00000000 */ nop -/* 9A1E78 80240E98 8E820074 */ lw $v0, 0x74($s4) -/* 9A1E7C 80240E9C 2442FFFF */ addiu $v0, $v0, -1 -/* 9A1E80 80240EA0 10400019 */ beqz $v0, .L80240F08 -/* 9A1E84 80240EA4 AE820074 */ sw $v0, 0x74($s4) -/* 9A1E88 80240EA8 8E220018 */ lw $v0, 0x18($s1) -/* 9A1E8C 80240EAC 9442002A */ lhu $v0, 0x2a($v0) -/* 9A1E90 80240EB0 30420010 */ andi $v0, $v0, 0x10 -/* 9A1E94 80240EB4 14400007 */ bnez $v0, .L80240ED4 -/* 9A1E98 80240EB8 00000000 */ nop -/* 9A1E9C 80240EBC C600000C */ lwc1 $f0, 0xc($s0) -/* 9A1EA0 80240EC0 3C014334 */ lui $at, 0x4334 -/* 9A1EA4 80240EC4 44816000 */ mtc1 $at, $f12 -/* 9A1EA8 80240EC8 0C00A6C9 */ jal clamp_angle -/* 9A1EAC 80240ECC 460C0300 */ add.s $f12, $f0, $f12 -/* 9A1EB0 80240ED0 E600000C */ swc1 $f0, 0xc($s0) -.L80240ED4: -/* 9A1EB4 80240ED4 8E440008 */ lw $a0, 8($s2) -/* 9A1EB8 80240ED8 000417C2 */ srl $v0, $a0, 0x1f -/* 9A1EBC 80240EDC 00822021 */ addu $a0, $a0, $v0 -/* 9A1EC0 80240EE0 00042043 */ sra $a0, $a0, 1 -/* 9A1EC4 80240EE4 0C00A67F */ jal rand_int -/* 9A1EC8 80240EE8 24840001 */ addiu $a0, $a0, 1 -/* 9A1ECC 80240EEC 8E430008 */ lw $v1, 8($s2) -/* 9A1ED0 80240EF0 000327C2 */ srl $a0, $v1, 0x1f -/* 9A1ED4 80240EF4 00641821 */ addu $v1, $v1, $a0 -/* 9A1ED8 80240EF8 00031843 */ sra $v1, $v1, 1 -/* 9A1EDC 80240EFC 00621821 */ addu $v1, $v1, $v0 -/* 9A1EE0 80240F00 080903C4 */ j .L80240F10 -/* 9A1EE4 80240F04 A603008E */ sh $v1, 0x8e($s0) -.L80240F08: -/* 9A1EE8 80240F08 24020004 */ addiu $v0, $zero, 4 -.L80240F0C: -/* 9A1EEC 80240F0C AE820070 */ sw $v0, 0x70($s4) -.L80240F10: -/* 9A1EF0 80240F10 8FBF0044 */ lw $ra, 0x44($sp) -/* 9A1EF4 80240F14 8FB40040 */ lw $s4, 0x40($sp) -/* 9A1EF8 80240F18 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A1EFC 80240F1C 8FB20038 */ lw $s2, 0x38($sp) -/* 9A1F00 80240F20 8FB10034 */ lw $s1, 0x34($sp) -/* 9A1F04 80240F24 8FB00030 */ lw $s0, 0x30($sp) -/* 9A1F08 80240F28 03E00008 */ jr $ra -/* 9A1F0C 80240F2C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s new file mode 100644 index 0000000000..9d6d5f7418 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240D74_9A1D54.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240D74_9A1D54 +/* 9A1D54 80240D74 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9A1D58 80240D78 AFB40040 */ sw $s4, 0x40($sp) +/* 9A1D5C 80240D7C 0080A02D */ daddu $s4, $a0, $zero +/* 9A1D60 80240D80 AFBF0044 */ sw $ra, 0x44($sp) +/* 9A1D64 80240D84 AFB3003C */ sw $s3, 0x3c($sp) +/* 9A1D68 80240D88 AFB20038 */ sw $s2, 0x38($sp) +/* 9A1D6C 80240D8C AFB10034 */ sw $s1, 0x34($sp) +/* 9A1D70 80240D90 AFB00030 */ sw $s0, 0x30($sp) +/* 9A1D74 80240D94 8E910148 */ lw $s1, 0x148($s4) +/* 9A1D78 80240D98 00A0902D */ daddu $s2, $a1, $zero +/* 9A1D7C 80240D9C 86240008 */ lh $a0, 8($s1) +/* 9A1D80 80240DA0 0C00EABB */ jal get_npc_unsafe +/* 9A1D84 80240DA4 00C0982D */ daddu $s3, $a2, $zero +/* 9A1D88 80240DA8 8E430014 */ lw $v1, 0x14($s2) +/* 9A1D8C 80240DAC 04600031 */ bltz $v1, .L80240E74 +/* 9A1D90 80240DB0 0040802D */ daddu $s0, $v0, $zero +/* 9A1D94 80240DB4 0260202D */ daddu $a0, $s3, $zero +/* 9A1D98 80240DB8 AFA00010 */ sw $zero, 0x10($sp) +/* 9A1D9C 80240DBC 8E460024 */ lw $a2, 0x24($s2) +/* 9A1DA0 80240DC0 8E470028 */ lw $a3, 0x28($s2) +/* 9A1DA4 80240DC4 0C01242D */ jal func_800490B4 +/* 9A1DA8 80240DC8 0220282D */ daddu $a1, $s1, $zero +/* 9A1DAC 80240DCC 10400029 */ beqz $v0, .L80240E74 +/* 9A1DB0 80240DD0 0000202D */ daddu $a0, $zero, $zero +/* 9A1DB4 80240DD4 0200282D */ daddu $a1, $s0, $zero +/* 9A1DB8 80240DD8 0000302D */ daddu $a2, $zero, $zero +/* 9A1DBC 80240DDC 860300A8 */ lh $v1, 0xa8($s0) +/* 9A1DC0 80240DE0 3C013F80 */ lui $at, 0x3f80 +/* 9A1DC4 80240DE4 44810000 */ mtc1 $at, $f0 +/* 9A1DC8 80240DE8 3C014000 */ lui $at, 0x4000 +/* 9A1DCC 80240DEC 44811000 */ mtc1 $at, $f2 +/* 9A1DD0 80240DF0 3C01C1A0 */ lui $at, 0xc1a0 +/* 9A1DD4 80240DF4 44812000 */ mtc1 $at, $f4 +/* 9A1DD8 80240DF8 2402000F */ addiu $v0, $zero, 0xf +/* 9A1DDC 80240DFC AFA2001C */ sw $v0, 0x1c($sp) +/* 9A1DE0 80240E00 44833000 */ mtc1 $v1, $f6 +/* 9A1DE4 80240E04 00000000 */ nop +/* 9A1DE8 80240E08 468031A0 */ cvt.s.w $f6, $f6 +/* 9A1DEC 80240E0C 44073000 */ mfc1 $a3, $f6 +/* 9A1DF0 80240E10 27A20028 */ addiu $v0, $sp, 0x28 +/* 9A1DF4 80240E14 AFA20020 */ sw $v0, 0x20($sp) +/* 9A1DF8 80240E18 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9A1DFC 80240E1C E7A20014 */ swc1 $f2, 0x14($sp) +/* 9A1E00 80240E20 0C01BFA4 */ jal fx_emote +/* 9A1E04 80240E24 E7A40018 */ swc1 $f4, 0x18($sp) +/* 9A1E08 80240E28 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9A1E0C 80240E2C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9A1E10 80240E30 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9A1E14 80240E34 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9A1E18 80240E38 8C460028 */ lw $a2, 0x28($v0) +/* 9A1E1C 80240E3C 0C00A720 */ jal atan2 +/* 9A1E20 80240E40 8C470030 */ lw $a3, 0x30($v0) +/* 9A1E24 80240E44 0200202D */ daddu $a0, $s0, $zero +/* 9A1E28 80240E48 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 9A1E2C 80240E4C 3C060020 */ lui $a2, 0x20 +/* 9A1E30 80240E50 0C012530 */ jal func_800494C0 +/* 9A1E34 80240E54 E480000C */ swc1 $f0, 0xc($a0) +/* 9A1E38 80240E58 8E220018 */ lw $v0, 0x18($s1) +/* 9A1E3C 80240E5C 9442002A */ lhu $v0, 0x2a($v0) +/* 9A1E40 80240E60 30420001 */ andi $v0, $v0, 1 +/* 9A1E44 80240E64 14400029 */ bnez $v0, .L80240F0C +/* 9A1E48 80240E68 2402000A */ addiu $v0, $zero, 0xa +/* 9A1E4C 80240E6C 080903C3 */ j .L80240F0C +/* 9A1E50 80240E70 2402000C */ addiu $v0, $zero, 0xc +.L80240E74: +/* 9A1E54 80240E74 8602008C */ lh $v0, 0x8c($s0) +/* 9A1E58 80240E78 14400025 */ bnez $v0, .L80240F10 +/* 9A1E5C 80240E7C 00000000 */ nop +/* 9A1E60 80240E80 9602008E */ lhu $v0, 0x8e($s0) +/* 9A1E64 80240E84 2442FFFF */ addiu $v0, $v0, -1 +/* 9A1E68 80240E88 A602008E */ sh $v0, 0x8e($s0) +/* 9A1E6C 80240E8C 00021400 */ sll $v0, $v0, 0x10 +/* 9A1E70 80240E90 1440001F */ bnez $v0, .L80240F10 +/* 9A1E74 80240E94 00000000 */ nop +/* 9A1E78 80240E98 8E820074 */ lw $v0, 0x74($s4) +/* 9A1E7C 80240E9C 2442FFFF */ addiu $v0, $v0, -1 +/* 9A1E80 80240EA0 10400019 */ beqz $v0, .L80240F08 +/* 9A1E84 80240EA4 AE820074 */ sw $v0, 0x74($s4) +/* 9A1E88 80240EA8 8E220018 */ lw $v0, 0x18($s1) +/* 9A1E8C 80240EAC 9442002A */ lhu $v0, 0x2a($v0) +/* 9A1E90 80240EB0 30420010 */ andi $v0, $v0, 0x10 +/* 9A1E94 80240EB4 14400007 */ bnez $v0, .L80240ED4 +/* 9A1E98 80240EB8 00000000 */ nop +/* 9A1E9C 80240EBC C600000C */ lwc1 $f0, 0xc($s0) +/* 9A1EA0 80240EC0 3C014334 */ lui $at, 0x4334 +/* 9A1EA4 80240EC4 44816000 */ mtc1 $at, $f12 +/* 9A1EA8 80240EC8 0C00A6C9 */ jal clamp_angle +/* 9A1EAC 80240ECC 460C0300 */ add.s $f12, $f0, $f12 +/* 9A1EB0 80240ED0 E600000C */ swc1 $f0, 0xc($s0) +.L80240ED4: +/* 9A1EB4 80240ED4 8E440008 */ lw $a0, 8($s2) +/* 9A1EB8 80240ED8 000417C2 */ srl $v0, $a0, 0x1f +/* 9A1EBC 80240EDC 00822021 */ addu $a0, $a0, $v0 +/* 9A1EC0 80240EE0 00042043 */ sra $a0, $a0, 1 +/* 9A1EC4 80240EE4 0C00A67F */ jal rand_int +/* 9A1EC8 80240EE8 24840001 */ addiu $a0, $a0, 1 +/* 9A1ECC 80240EEC 8E430008 */ lw $v1, 8($s2) +/* 9A1ED0 80240EF0 000327C2 */ srl $a0, $v1, 0x1f +/* 9A1ED4 80240EF4 00641821 */ addu $v1, $v1, $a0 +/* 9A1ED8 80240EF8 00031843 */ sra $v1, $v1, 1 +/* 9A1EDC 80240EFC 00621821 */ addu $v1, $v1, $v0 +/* 9A1EE0 80240F00 080903C4 */ j .L80240F10 +/* 9A1EE4 80240F04 A603008E */ sh $v1, 0x8e($s0) +.L80240F08: +/* 9A1EE8 80240F08 24020004 */ addiu $v0, $zero, 4 +.L80240F0C: +/* 9A1EEC 80240F0C AE820070 */ sw $v0, 0x70($s4) +.L80240F10: +/* 9A1EF0 80240F10 8FBF0044 */ lw $ra, 0x44($sp) +/* 9A1EF4 80240F14 8FB40040 */ lw $s4, 0x40($sp) +/* 9A1EF8 80240F18 8FB3003C */ lw $s3, 0x3c($sp) +/* 9A1EFC 80240F1C 8FB20038 */ lw $s2, 0x38($sp) +/* 9A1F00 80240F20 8FB10034 */ lw $s1, 0x34($sp) +/* 9A1F04 80240F24 8FB00030 */ lw $s0, 0x30($sp) +/* 9A1F08 80240F28 03E00008 */ jr $ra +/* 9A1F0C 80240F2C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30.s deleted file mode 100644 index c73832e89e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F30 -/* 9A1F10 80240F30 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A1F14 80240F34 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1F18 80240F38 0080882D */ daddu $s1, $a0, $zero -/* 9A1F1C 80240F3C AFBF001C */ sw $ra, 0x1c($sp) -/* 9A1F20 80240F40 AFB20018 */ sw $s2, 0x18($sp) -/* 9A1F24 80240F44 AFB00010 */ sw $s0, 0x10($sp) -/* 9A1F28 80240F48 8E300148 */ lw $s0, 0x148($s1) -/* 9A1F2C 80240F4C 86040008 */ lh $a0, 8($s0) -/* 9A1F30 80240F50 0C00EABB */ jal get_npc_unsafe -/* 9A1F34 80240F54 00A0902D */ daddu $s2, $a1, $zero -/* 9A1F38 80240F58 8E230078 */ lw $v1, 0x78($s1) -/* 9A1F3C 80240F5C 24630001 */ addiu $v1, $v1, 1 -/* 9A1F40 80240F60 AE230078 */ sw $v1, 0x78($s1) -/* 9A1F44 80240F64 8E0400D0 */ lw $a0, 0xd0($s0) -/* 9A1F48 80240F68 8C840000 */ lw $a0, ($a0) -/* 9A1F4C 80240F6C 0064182A */ slt $v1, $v1, $a0 -/* 9A1F50 80240F70 14600002 */ bnez $v1, .L80240F7C -/* 9A1F54 80240F74 0040282D */ daddu $a1, $v0, $zero -/* 9A1F58 80240F78 AE200078 */ sw $zero, 0x78($s1) -.L80240F7C: -/* 9A1F5C 80240F7C 8E0200CC */ lw $v0, 0xcc($s0) -/* 9A1F60 80240F80 8C420004 */ lw $v0, 4($v0) -/* 9A1F64 80240F84 ACA20028 */ sw $v0, 0x28($a1) -/* 9A1F68 80240F88 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9A1F6C 80240F8C 8C42007C */ lw $v0, 0x7c($v0) -/* 9A1F70 80240F90 04410004 */ bgez $v0, .L80240FA4 -/* 9A1F74 80240F94 00000000 */ nop -/* 9A1F78 80240F98 C6400000 */ lwc1 $f0, ($s2) -/* 9A1F7C 80240F9C 080903F1 */ j .L80240FC4 -/* 9A1F80 80240FA0 E4A00018 */ swc1 $f0, 0x18($a1) -.L80240FA4: -/* 9A1F84 80240FA4 3C018024 */ lui $at, 0x8024 -/* 9A1F88 80240FA8 D4223348 */ ldc1 $f2, 0x3348($at) -/* 9A1F8C 80240FAC 44820000 */ mtc1 $v0, $f0 -/* 9A1F90 80240FB0 00000000 */ nop -/* 9A1F94 80240FB4 46800021 */ cvt.d.w $f0, $f0 -/* 9A1F98 80240FB8 46220003 */ div.d $f0, $f0, $f2 -/* 9A1F9C 80240FBC 46200020 */ cvt.s.d $f0, $f0 -/* 9A1FA0 80240FC0 E4A00018 */ swc1 $f0, 0x18($a1) -.L80240FC4: -/* 9A1FA4 80240FC4 24020001 */ addiu $v0, $zero, 1 -/* 9A1FA8 80240FC8 AE220070 */ sw $v0, 0x70($s1) -/* 9A1FAC 80240FCC 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A1FB0 80240FD0 8FB20018 */ lw $s2, 0x18($sp) -/* 9A1FB4 80240FD4 8FB10014 */ lw $s1, 0x14($sp) -/* 9A1FB8 80240FD8 8FB00010 */ lw $s0, 0x10($sp) -/* 9A1FBC 80240FDC 03E00008 */ jr $ra -/* 9A1FC0 80240FE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s new file mode 100644 index 0000000000..63401084bd --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240F30_9A1F10.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240F30_9A1F10 +/* 9A1F10 80240F30 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A1F14 80240F34 AFB10014 */ sw $s1, 0x14($sp) +/* 9A1F18 80240F38 0080882D */ daddu $s1, $a0, $zero +/* 9A1F1C 80240F3C AFBF001C */ sw $ra, 0x1c($sp) +/* 9A1F20 80240F40 AFB20018 */ sw $s2, 0x18($sp) +/* 9A1F24 80240F44 AFB00010 */ sw $s0, 0x10($sp) +/* 9A1F28 80240F48 8E300148 */ lw $s0, 0x148($s1) +/* 9A1F2C 80240F4C 86040008 */ lh $a0, 8($s0) +/* 9A1F30 80240F50 0C00EABB */ jal get_npc_unsafe +/* 9A1F34 80240F54 00A0902D */ daddu $s2, $a1, $zero +/* 9A1F38 80240F58 8E230078 */ lw $v1, 0x78($s1) +/* 9A1F3C 80240F5C 24630001 */ addiu $v1, $v1, 1 +/* 9A1F40 80240F60 AE230078 */ sw $v1, 0x78($s1) +/* 9A1F44 80240F64 8E0400D0 */ lw $a0, 0xd0($s0) +/* 9A1F48 80240F68 8C840000 */ lw $a0, ($a0) +/* 9A1F4C 80240F6C 0064182A */ slt $v1, $v1, $a0 +/* 9A1F50 80240F70 14600002 */ bnez $v1, .L80240F7C +/* 9A1F54 80240F74 0040282D */ daddu $a1, $v0, $zero +/* 9A1F58 80240F78 AE200078 */ sw $zero, 0x78($s1) +.L80240F7C: +/* 9A1F5C 80240F7C 8E0200CC */ lw $v0, 0xcc($s0) +/* 9A1F60 80240F80 8C420004 */ lw $v0, 4($v0) +/* 9A1F64 80240F84 ACA20028 */ sw $v0, 0x28($a1) +/* 9A1F68 80240F88 8E0200D0 */ lw $v0, 0xd0($s0) +/* 9A1F6C 80240F8C 8C42007C */ lw $v0, 0x7c($v0) +/* 9A1F70 80240F90 04410004 */ bgez $v0, .L80240FA4 +/* 9A1F74 80240F94 00000000 */ nop +/* 9A1F78 80240F98 C6400000 */ lwc1 $f0, ($s2) +/* 9A1F7C 80240F9C 080903F1 */ j .L80240FC4 +/* 9A1F80 80240FA0 E4A00018 */ swc1 $f0, 0x18($a1) +.L80240FA4: +/* 9A1F84 80240FA4 3C018024 */ lui $at, 0x8024 +/* 9A1F88 80240FA8 D4223348 */ ldc1 $f2, 0x3348($at) +/* 9A1F8C 80240FAC 44820000 */ mtc1 $v0, $f0 +/* 9A1F90 80240FB0 00000000 */ nop +/* 9A1F94 80240FB4 46800021 */ cvt.d.w $f0, $f0 +/* 9A1F98 80240FB8 46220003 */ div.d $f0, $f0, $f2 +/* 9A1F9C 80240FBC 46200020 */ cvt.s.d $f0, $f0 +/* 9A1FA0 80240FC0 E4A00018 */ swc1 $f0, 0x18($a1) +.L80240FC4: +/* 9A1FA4 80240FC4 24020001 */ addiu $v0, $zero, 1 +/* 9A1FA8 80240FC8 AE220070 */ sw $v0, 0x70($s1) +/* 9A1FAC 80240FCC 8FBF001C */ lw $ra, 0x1c($sp) +/* 9A1FB0 80240FD0 8FB20018 */ lw $s2, 0x18($sp) +/* 9A1FB4 80240FD4 8FB10014 */ lw $s1, 0x14($sp) +/* 9A1FB8 80240FD8 8FB00010 */ lw $s0, 0x10($sp) +/* 9A1FBC 80240FDC 03E00008 */ jr $ra +/* 9A1FC0 80240FE0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4.s deleted file mode 100644 index 13b3202add..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FE4 -/* 9A1FC4 80240FE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A1FC8 80240FE8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A1FCC 80240FEC 0080882D */ daddu $s1, $a0, $zero -/* 9A1FD0 80240FF0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9A1FD4 80240FF4 AFB00010 */ sw $s0, 0x10($sp) -/* 9A1FD8 80240FF8 8E300148 */ lw $s0, 0x148($s1) -/* 9A1FDC 80240FFC 0C00EABB */ jal get_npc_unsafe -/* 9A1FE0 80241000 86040008 */ lh $a0, 8($s0) -/* 9A1FE4 80241004 8E0300CC */ lw $v1, 0xcc($s0) -/* 9A1FE8 80241008 3C014120 */ lui $at, 0x4120 -/* 9A1FEC 8024100C 44812000 */ mtc1 $at, $f4 -/* 9A1FF0 80241010 3C014000 */ lui $at, 0x4000 -/* 9A1FF4 80241014 44810000 */ mtc1 $at, $f0 -/* 9A1FF8 80241018 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9A1FFC 8024101C 8C640010 */ lw $a0, 0x10($v1) -/* 9A2000 80241020 8C430000 */ lw $v1, ($v0) -/* 9A2004 80241024 E444001C */ swc1 $f4, 0x1c($v0) -/* 9A2008 80241028 E4400014 */ swc1 $f0, 0x14($v0) -/* 9A200C 8024102C E4420064 */ swc1 $f2, 0x64($v0) -/* 9A2010 80241030 34630800 */ ori $v1, $v1, 0x800 -/* 9A2014 80241034 AC430000 */ sw $v1, ($v0) -/* 9A2018 80241038 AC440028 */ sw $a0, 0x28($v0) -/* 9A201C 8024103C 2402000B */ addiu $v0, $zero, 0xb -/* 9A2020 80241040 AE220070 */ sw $v0, 0x70($s1) -/* 9A2024 80241044 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A2028 80241048 8FB10014 */ lw $s1, 0x14($sp) -/* 9A202C 8024104C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A2030 80241050 03E00008 */ jr $ra -/* 9A2034 80241054 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4_9A1FC4.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4_9A1FC4.s new file mode 100644 index 0000000000..ac300c4097 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80240FE4_9A1FC4.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240FE4_9A1FC4 +/* 9A1FC4 80240FE4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A1FC8 80240FE8 AFB10014 */ sw $s1, 0x14($sp) +/* 9A1FCC 80240FEC 0080882D */ daddu $s1, $a0, $zero +/* 9A1FD0 80240FF0 AFBF0018 */ sw $ra, 0x18($sp) +/* 9A1FD4 80240FF4 AFB00010 */ sw $s0, 0x10($sp) +/* 9A1FD8 80240FF8 8E300148 */ lw $s0, 0x148($s1) +/* 9A1FDC 80240FFC 0C00EABB */ jal get_npc_unsafe +/* 9A1FE0 80241000 86040008 */ lh $a0, 8($s0) +/* 9A1FE4 80241004 8E0300CC */ lw $v1, 0xcc($s0) +/* 9A1FE8 80241008 3C014120 */ lui $at, 0x4120 +/* 9A1FEC 8024100C 44812000 */ mtc1 $at, $f4 +/* 9A1FF0 80241010 3C014000 */ lui $at, 0x4000 +/* 9A1FF4 80241014 44810000 */ mtc1 $at, $f0 +/* 9A1FF8 80241018 C442003C */ lwc1 $f2, 0x3c($v0) +/* 9A1FFC 8024101C 8C640010 */ lw $a0, 0x10($v1) +/* 9A2000 80241020 8C430000 */ lw $v1, ($v0) +/* 9A2004 80241024 E444001C */ swc1 $f4, 0x1c($v0) +/* 9A2008 80241028 E4400014 */ swc1 $f0, 0x14($v0) +/* 9A200C 8024102C E4420064 */ swc1 $f2, 0x64($v0) +/* 9A2010 80241030 34630800 */ ori $v1, $v1, 0x800 +/* 9A2014 80241034 AC430000 */ sw $v1, ($v0) +/* 9A2018 80241038 AC440028 */ sw $a0, 0x28($v0) +/* 9A201C 8024103C 2402000B */ addiu $v0, $zero, 0xb +/* 9A2020 80241040 AE220070 */ sw $v0, 0x70($s1) +/* 9A2024 80241044 8FBF0018 */ lw $ra, 0x18($sp) +/* 9A2028 80241048 8FB10014 */ lw $s1, 0x14($sp) +/* 9A202C 8024104C 8FB00010 */ lw $s0, 0x10($sp) +/* 9A2030 80241050 03E00008 */ jr $ra +/* 9A2034 80241054 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058.s deleted file mode 100644 index 1eacf3bca1..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241058 -/* 9A2038 80241058 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A203C 8024105C AFB00010 */ sw $s0, 0x10($sp) -/* 9A2040 80241060 0080802D */ daddu $s0, $a0, $zero -/* 9A2044 80241064 AFBF0014 */ sw $ra, 0x14($sp) -/* 9A2048 80241068 8E020148 */ lw $v0, 0x148($s0) -/* 9A204C 8024106C 0C00EABB */ jal get_npc_unsafe -/* 9A2050 80241070 84440008 */ lh $a0, 8($v0) -/* 9A2054 80241074 0040202D */ daddu $a0, $v0, $zero -/* 9A2058 80241078 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9A205C 8024107C C480001C */ lwc1 $f0, 0x1c($a0) -/* 9A2060 80241080 46001080 */ add.s $f2, $f2, $f0 -/* 9A2064 80241084 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9A2068 80241088 46040001 */ sub.s $f0, $f0, $f4 -/* 9A206C 8024108C C4840064 */ lwc1 $f4, 0x64($a0) -/* 9A2070 80241090 4602203C */ c.lt.s $f4, $f2 -/* 9A2074 80241094 E482003C */ swc1 $f2, 0x3c($a0) -/* 9A2078 80241098 45010009 */ bc1t .L802410C0 -/* 9A207C 8024109C E480001C */ swc1 $f0, 0x1c($a0) -/* 9A2080 802410A0 8C820000 */ lw $v0, ($a0) -/* 9A2084 802410A4 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9A2088 802410A8 E484003C */ swc1 $f4, 0x3c($a0) -/* 9A208C 802410AC AC80001C */ sw $zero, 0x1c($a0) -/* 9A2090 802410B0 00431024 */ and $v0, $v0, $v1 -/* 9A2094 802410B4 AC820000 */ sw $v0, ($a0) -/* 9A2098 802410B8 2402000C */ addiu $v0, $zero, 0xc -/* 9A209C 802410BC AE020070 */ sw $v0, 0x70($s0) -.L802410C0: -/* 9A20A0 802410C0 8FBF0014 */ lw $ra, 0x14($sp) -/* 9A20A4 802410C4 8FB00010 */ lw $s0, 0x10($sp) -/* 9A20A8 802410C8 03E00008 */ jr $ra -/* 9A20AC 802410CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058_9A2038.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058_9A2038.s new file mode 100644 index 0000000000..72df7abcb4 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241058_9A2038.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241058_9A2038 +/* 9A2038 80241058 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9A203C 8024105C AFB00010 */ sw $s0, 0x10($sp) +/* 9A2040 80241060 0080802D */ daddu $s0, $a0, $zero +/* 9A2044 80241064 AFBF0014 */ sw $ra, 0x14($sp) +/* 9A2048 80241068 8E020148 */ lw $v0, 0x148($s0) +/* 9A204C 8024106C 0C00EABB */ jal get_npc_unsafe +/* 9A2050 80241070 84440008 */ lh $a0, 8($v0) +/* 9A2054 80241074 0040202D */ daddu $a0, $v0, $zero +/* 9A2058 80241078 C482003C */ lwc1 $f2, 0x3c($a0) +/* 9A205C 8024107C C480001C */ lwc1 $f0, 0x1c($a0) +/* 9A2060 80241080 46001080 */ add.s $f2, $f2, $f0 +/* 9A2064 80241084 C4840014 */ lwc1 $f4, 0x14($a0) +/* 9A2068 80241088 46040001 */ sub.s $f0, $f0, $f4 +/* 9A206C 8024108C C4840064 */ lwc1 $f4, 0x64($a0) +/* 9A2070 80241090 4602203C */ c.lt.s $f4, $f2 +/* 9A2074 80241094 E482003C */ swc1 $f2, 0x3c($a0) +/* 9A2078 80241098 45010009 */ bc1t .L802410C0 +/* 9A207C 8024109C E480001C */ swc1 $f0, 0x1c($a0) +/* 9A2080 802410A0 8C820000 */ lw $v0, ($a0) +/* 9A2084 802410A4 2403F7FF */ addiu $v1, $zero, -0x801 +/* 9A2088 802410A8 E484003C */ swc1 $f4, 0x3c($a0) +/* 9A208C 802410AC AC80001C */ sw $zero, 0x1c($a0) +/* 9A2090 802410B0 00431024 */ and $v0, $v0, $v1 +/* 9A2094 802410B4 AC820000 */ sw $v0, ($a0) +/* 9A2098 802410B8 2402000C */ addiu $v0, $zero, 0xc +/* 9A209C 802410BC AE020070 */ sw $v0, 0x70($s0) +.L802410C0: +/* 9A20A0 802410C0 8FBF0014 */ lw $ra, 0x14($sp) +/* 9A20A4 802410C4 8FB00010 */ lw $s0, 0x10($sp) +/* 9A20A8 802410C8 03E00008 */ jr $ra +/* 9A20AC 802410CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200.s deleted file mode 100644 index 2570d8c1b0..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200.s +++ /dev/null @@ -1,80 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241200 -/* 9A21E0 80241200 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A21E4 80241204 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A21E8 80241208 0080982D */ daddu $s3, $a0, $zero -/* 9A21EC 8024120C AFBF0040 */ sw $ra, 0x40($sp) -/* 9A21F0 80241210 AFB20038 */ sw $s2, 0x38($sp) -/* 9A21F4 80241214 AFB10034 */ sw $s1, 0x34($sp) -/* 9A21F8 80241218 AFB00030 */ sw $s0, 0x30($sp) -/* 9A21FC 8024121C 8E720148 */ lw $s2, 0x148($s3) -/* 9A2200 80241220 00A0882D */ daddu $s1, $a1, $zero -/* 9A2204 80241224 86440008 */ lh $a0, 8($s2) -/* 9A2208 80241228 0C00EABB */ jal get_npc_unsafe -/* 9A220C 8024122C 00C0802D */ daddu $s0, $a2, $zero -/* 9A2210 80241230 0200202D */ daddu $a0, $s0, $zero -/* 9A2214 80241234 0240282D */ daddu $a1, $s2, $zero -/* 9A2218 80241238 24030001 */ addiu $v1, $zero, 1 -/* 9A221C 8024123C AFA30010 */ sw $v1, 0x10($sp) -/* 9A2220 80241240 8E260024 */ lw $a2, 0x24($s1) -/* 9A2224 80241244 8E270028 */ lw $a3, 0x28($s1) -/* 9A2228 80241248 0C01242D */ jal func_800490B4 -/* 9A222C 8024124C 0040802D */ daddu $s0, $v0, $zero -/* 9A2230 80241250 1440001E */ bnez $v0, .L802412CC -/* 9A2234 80241254 0200202D */ daddu $a0, $s0, $zero -/* 9A2238 80241258 24040002 */ addiu $a0, $zero, 2 -/* 9A223C 8024125C 0200282D */ daddu $a1, $s0, $zero -/* 9A2240 80241260 0000302D */ daddu $a2, $zero, $zero -/* 9A2244 80241264 860300A8 */ lh $v1, 0xa8($s0) -/* 9A2248 80241268 3C013F80 */ lui $at, 0x3f80 -/* 9A224C 8024126C 44810000 */ mtc1 $at, $f0 -/* 9A2250 80241270 3C014000 */ lui $at, 0x4000 -/* 9A2254 80241274 44811000 */ mtc1 $at, $f2 -/* 9A2258 80241278 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A225C 8024127C 44812000 */ mtc1 $at, $f4 -/* 9A2260 80241280 2402000F */ addiu $v0, $zero, 0xf -/* 9A2264 80241284 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A2268 80241288 44833000 */ mtc1 $v1, $f6 -/* 9A226C 8024128C 00000000 */ nop -/* 9A2270 80241290 468031A0 */ cvt.s.w $f6, $f6 -/* 9A2274 80241294 44073000 */ mfc1 $a3, $f6 -/* 9A2278 80241298 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A227C 8024129C AFA20020 */ sw $v0, 0x20($sp) -/* 9A2280 802412A0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A2284 802412A4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A2288 802412A8 0C01BFA4 */ jal fx_emote -/* 9A228C 802412AC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A2290 802412B0 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A2294 802412B4 8C430000 */ lw $v1, ($v0) -/* 9A2298 802412B8 24020019 */ addiu $v0, $zero, 0x19 -/* 9A229C 802412BC A602008E */ sh $v0, 0x8e($s0) -/* 9A22A0 802412C0 2402000E */ addiu $v0, $zero, 0xe -/* 9A22A4 802412C4 080904C0 */ j .L80241300 -/* 9A22A8 802412C8 AE030028 */ sw $v1, 0x28($s0) -.L802412CC: -/* 9A22AC 802412CC 0C00F598 */ jal func_8003D660 -/* 9A22B0 802412D0 24050001 */ addiu $a1, $zero, 1 -/* 9A22B4 802412D4 8E050018 */ lw $a1, 0x18($s0) -/* 9A22B8 802412D8 8E06000C */ lw $a2, 0xc($s0) -/* 9A22BC 802412DC 0C00EA95 */ jal npc_move_heading -/* 9A22C0 802412E0 0200202D */ daddu $a0, $s0, $zero -/* 9A22C4 802412E4 8602008E */ lh $v0, 0x8e($s0) -/* 9A22C8 802412E8 9603008E */ lhu $v1, 0x8e($s0) -/* 9A22CC 802412EC 18400003 */ blez $v0, .L802412FC -/* 9A22D0 802412F0 2462FFFF */ addiu $v0, $v1, -1 -/* 9A22D4 802412F4 080904C1 */ j .L80241304 -/* 9A22D8 802412F8 A602008E */ sh $v0, 0x8e($s0) -.L802412FC: -/* 9A22DC 802412FC 2402000C */ addiu $v0, $zero, 0xc -.L80241300: -/* 9A22E0 80241300 AE620070 */ sw $v0, 0x70($s3) -.L80241304: -/* 9A22E4 80241304 8FBF0040 */ lw $ra, 0x40($sp) -/* 9A22E8 80241308 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A22EC 8024130C 8FB20038 */ lw $s2, 0x38($sp) -/* 9A22F0 80241310 8FB10034 */ lw $s1, 0x34($sp) -/* 9A22F4 80241314 8FB00030 */ lw $s0, 0x30($sp) -/* 9A22F8 80241318 03E00008 */ jr $ra -/* 9A22FC 8024131C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s new file mode 100644 index 0000000000..5ed3246bd4 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241200_9A21E0.s @@ -0,0 +1,80 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241200_9A21E0 +/* 9A21E0 80241200 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9A21E4 80241204 AFB3003C */ sw $s3, 0x3c($sp) +/* 9A21E8 80241208 0080982D */ daddu $s3, $a0, $zero +/* 9A21EC 8024120C AFBF0040 */ sw $ra, 0x40($sp) +/* 9A21F0 80241210 AFB20038 */ sw $s2, 0x38($sp) +/* 9A21F4 80241214 AFB10034 */ sw $s1, 0x34($sp) +/* 9A21F8 80241218 AFB00030 */ sw $s0, 0x30($sp) +/* 9A21FC 8024121C 8E720148 */ lw $s2, 0x148($s3) +/* 9A2200 80241220 00A0882D */ daddu $s1, $a1, $zero +/* 9A2204 80241224 86440008 */ lh $a0, 8($s2) +/* 9A2208 80241228 0C00EABB */ jal get_npc_unsafe +/* 9A220C 8024122C 00C0802D */ daddu $s0, $a2, $zero +/* 9A2210 80241230 0200202D */ daddu $a0, $s0, $zero +/* 9A2214 80241234 0240282D */ daddu $a1, $s2, $zero +/* 9A2218 80241238 24030001 */ addiu $v1, $zero, 1 +/* 9A221C 8024123C AFA30010 */ sw $v1, 0x10($sp) +/* 9A2220 80241240 8E260024 */ lw $a2, 0x24($s1) +/* 9A2224 80241244 8E270028 */ lw $a3, 0x28($s1) +/* 9A2228 80241248 0C01242D */ jal func_800490B4 +/* 9A222C 8024124C 0040802D */ daddu $s0, $v0, $zero +/* 9A2230 80241250 1440001E */ bnez $v0, .L802412CC +/* 9A2234 80241254 0200202D */ daddu $a0, $s0, $zero +/* 9A2238 80241258 24040002 */ addiu $a0, $zero, 2 +/* 9A223C 8024125C 0200282D */ daddu $a1, $s0, $zero +/* 9A2240 80241260 0000302D */ daddu $a2, $zero, $zero +/* 9A2244 80241264 860300A8 */ lh $v1, 0xa8($s0) +/* 9A2248 80241268 3C013F80 */ lui $at, 0x3f80 +/* 9A224C 8024126C 44810000 */ mtc1 $at, $f0 +/* 9A2250 80241270 3C014000 */ lui $at, 0x4000 +/* 9A2254 80241274 44811000 */ mtc1 $at, $f2 +/* 9A2258 80241278 3C01C1A0 */ lui $at, 0xc1a0 +/* 9A225C 8024127C 44812000 */ mtc1 $at, $f4 +/* 9A2260 80241280 2402000F */ addiu $v0, $zero, 0xf +/* 9A2264 80241284 AFA2001C */ sw $v0, 0x1c($sp) +/* 9A2268 80241288 44833000 */ mtc1 $v1, $f6 +/* 9A226C 8024128C 00000000 */ nop +/* 9A2270 80241290 468031A0 */ cvt.s.w $f6, $f6 +/* 9A2274 80241294 44073000 */ mfc1 $a3, $f6 +/* 9A2278 80241298 27A20028 */ addiu $v0, $sp, 0x28 +/* 9A227C 8024129C AFA20020 */ sw $v0, 0x20($sp) +/* 9A2280 802412A0 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9A2284 802412A4 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9A2288 802412A8 0C01BFA4 */ jal fx_emote +/* 9A228C 802412AC E7A40018 */ swc1 $f4, 0x18($sp) +/* 9A2290 802412B0 8E4200CC */ lw $v0, 0xcc($s2) +/* 9A2294 802412B4 8C430000 */ lw $v1, ($v0) +/* 9A2298 802412B8 24020019 */ addiu $v0, $zero, 0x19 +/* 9A229C 802412BC A602008E */ sh $v0, 0x8e($s0) +/* 9A22A0 802412C0 2402000E */ addiu $v0, $zero, 0xe +/* 9A22A4 802412C4 080904C0 */ j .L80241300 +/* 9A22A8 802412C8 AE030028 */ sw $v1, 0x28($s0) +.L802412CC: +/* 9A22AC 802412CC 0C00F598 */ jal func_8003D660 +/* 9A22B0 802412D0 24050001 */ addiu $a1, $zero, 1 +/* 9A22B4 802412D4 8E050018 */ lw $a1, 0x18($s0) +/* 9A22B8 802412D8 8E06000C */ lw $a2, 0xc($s0) +/* 9A22BC 802412DC 0C00EA95 */ jal npc_move_heading +/* 9A22C0 802412E0 0200202D */ daddu $a0, $s0, $zero +/* 9A22C4 802412E4 8602008E */ lh $v0, 0x8e($s0) +/* 9A22C8 802412E8 9603008E */ lhu $v1, 0x8e($s0) +/* 9A22CC 802412EC 18400003 */ blez $v0, .L802412FC +/* 9A22D0 802412F0 2462FFFF */ addiu $v0, $v1, -1 +/* 9A22D4 802412F4 080904C1 */ j .L80241304 +/* 9A22D8 802412F8 A602008E */ sh $v0, 0x8e($s0) +.L802412FC: +/* 9A22DC 802412FC 2402000C */ addiu $v0, $zero, 0xc +.L80241300: +/* 9A22E0 80241300 AE620070 */ sw $v0, 0x70($s3) +.L80241304: +/* 9A22E4 80241304 8FBF0040 */ lw $ra, 0x40($sp) +/* 9A22E8 80241308 8FB3003C */ lw $s3, 0x3c($sp) +/* 9A22EC 8024130C 8FB20038 */ lw $s2, 0x38($sp) +/* 9A22F0 80241310 8FB10034 */ lw $s1, 0x34($sp) +/* 9A22F4 80241314 8FB00030 */ lw $s0, 0x30($sp) +/* 9A22F8 80241318 03E00008 */ jr $ra +/* 9A22FC 8024131C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448.s deleted file mode 100644 index fe15b0befb..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241448 -/* 9A2428 80241448 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 9A242C 8024144C AFB40058 */ sw $s4, 0x58($sp) -/* 9A2430 80241450 0080A02D */ daddu $s4, $a0, $zero -/* 9A2434 80241454 AFBF0060 */ sw $ra, 0x60($sp) -/* 9A2438 80241458 AFB5005C */ sw $s5, 0x5c($sp) -/* 9A243C 8024145C AFB30054 */ sw $s3, 0x54($sp) -/* 9A2440 80241460 AFB20050 */ sw $s2, 0x50($sp) -/* 9A2444 80241464 AFB1004C */ sw $s1, 0x4c($sp) -/* 9A2448 80241468 AFB00048 */ sw $s0, 0x48($sp) -/* 9A244C 8024146C 8E910148 */ lw $s1, 0x148($s4) -/* 9A2450 80241470 86240008 */ lh $a0, 8($s1) -/* 9A2454 80241474 0C00EABB */ jal get_npc_unsafe -/* 9A2458 80241478 00A0802D */ daddu $s0, $a1, $zero -/* 9A245C 8024147C 8E83000C */ lw $v1, 0xc($s4) -/* 9A2460 80241480 0280202D */ daddu $a0, $s4, $zero -/* 9A2464 80241484 8C650000 */ lw $a1, ($v1) -/* 9A2468 80241488 0C0B1EAF */ jal get_variable -/* 9A246C 8024148C 0040902D */ daddu $s2, $v0, $zero -/* 9A2470 80241490 AFA00018 */ sw $zero, 0x18($sp) -/* 9A2474 80241494 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A2478 80241498 8C630094 */ lw $v1, 0x94($v1) -/* 9A247C 8024149C AFA3001C */ sw $v1, 0x1c($sp) -/* 9A2480 802414A0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A2484 802414A4 8C630080 */ lw $v1, 0x80($v1) -/* 9A2488 802414A8 AFA30020 */ sw $v1, 0x20($sp) -/* 9A248C 802414AC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A2490 802414B0 8C630088 */ lw $v1, 0x88($v1) -/* 9A2494 802414B4 AFA30024 */ sw $v1, 0x24($sp) -/* 9A2498 802414B8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A249C 802414BC 8C63008C */ lw $v1, 0x8c($v1) -/* 9A24A0 802414C0 27B50018 */ addiu $s5, $sp, 0x18 -/* 9A24A4 802414C4 AFA30028 */ sw $v1, 0x28($sp) -/* 9A24A8 802414C8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A24AC 802414CC 3C014282 */ lui $at, 0x4282 -/* 9A24B0 802414D0 44810000 */ mtc1 $at, $f0 -/* 9A24B4 802414D4 8C630090 */ lw $v1, 0x90($v1) -/* 9A24B8 802414D8 0040982D */ daddu $s3, $v0, $zero -/* 9A24BC 802414DC E7A00030 */ swc1 $f0, 0x30($sp) -/* 9A24C0 802414E0 A7A00034 */ sh $zero, 0x34($sp) -/* 9A24C4 802414E4 16000005 */ bnez $s0, .L802414FC -/* 9A24C8 802414E8 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A24CC 802414EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A24D0 802414F0 30420004 */ andi $v0, $v0, 4 -/* 9A24D4 802414F4 10400044 */ beqz $v0, .L80241608 -/* 9A24D8 802414F8 00000000 */ nop -.L802414FC: -/* 9A24DC 802414FC 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A24E0 80241500 AE800070 */ sw $zero, 0x70($s4) -/* 9A24E4 80241504 A640008E */ sh $zero, 0x8e($s2) -/* 9A24E8 80241508 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A24EC 8024150C 8E430000 */ lw $v1, ($s2) -/* 9A24F0 80241510 8C420000 */ lw $v0, ($v0) -/* 9A24F4 80241514 00641824 */ and $v1, $v1, $a0 -/* 9A24F8 80241518 AE430000 */ sw $v1, ($s2) -/* 9A24FC 8024151C AE420028 */ sw $v0, 0x28($s2) -/* 9A2500 80241520 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A2504 80241524 8C420098 */ lw $v0, 0x98($v0) -/* 9A2508 80241528 54400005 */ bnel $v0, $zero, .L80241540 -/* 9A250C 8024152C 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9A2510 80241530 34620200 */ ori $v0, $v1, 0x200 -/* 9A2514 80241534 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A2518 80241538 08090552 */ j .L80241548 -/* 9A251C 8024153C 00431024 */ and $v0, $v0, $v1 -.L80241540: -/* 9A2520 80241540 00621024 */ and $v0, $v1, $v0 -/* 9A2524 80241544 34420008 */ ori $v0, $v0, 8 -.L80241548: -/* 9A2528 80241548 AE420000 */ sw $v0, ($s2) -/* 9A252C 8024154C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A2530 80241550 30420004 */ andi $v0, $v0, 4 -/* 9A2534 80241554 10400008 */ beqz $v0, .L80241578 -/* 9A2538 80241558 24020063 */ addiu $v0, $zero, 0x63 -/* 9A253C 8024155C AE820070 */ sw $v0, 0x70($s4) -/* 9A2540 80241560 AE800074 */ sw $zero, 0x74($s4) -/* 9A2544 80241564 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A2548 80241568 2403FFFB */ addiu $v1, $zero, -5 -/* 9A254C 8024156C 00431024 */ and $v0, $v0, $v1 -/* 9A2550 80241570 08090569 */ j .L802415A4 -/* 9A2554 80241574 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241578: -/* 9A2558 80241578 8E220000 */ lw $v0, ($s1) -/* 9A255C 8024157C 3C034000 */ lui $v1, 0x4000 -/* 9A2560 80241580 00431024 */ and $v0, $v0, $v1 -/* 9A2564 80241584 10400007 */ beqz $v0, .L802415A4 -/* 9A2568 80241588 3C03BFFF */ lui $v1, 0xbfff -/* 9A256C 8024158C 2402000C */ addiu $v0, $zero, 0xc -/* 9A2570 80241590 AE820070 */ sw $v0, 0x70($s4) -/* 9A2574 80241594 8E220000 */ lw $v0, ($s1) -/* 9A2578 80241598 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A257C 8024159C 00431024 */ and $v0, $v0, $v1 -/* 9A2580 802415A0 AE220000 */ sw $v0, ($s1) -.L802415A4: -/* 9A2584 802415A4 27A50038 */ addiu $a1, $sp, 0x38 -/* 9A2588 802415A8 27A6003C */ addiu $a2, $sp, 0x3c -/* 9A258C 802415AC C6400038 */ lwc1 $f0, 0x38($s2) -/* 9A2590 802415B0 864200A8 */ lh $v0, 0xa8($s2) -/* 9A2594 802415B4 3C0142C8 */ lui $at, 0x42c8 -/* 9A2598 802415B8 44812000 */ mtc1 $at, $f4 -/* 9A259C 802415BC 44823000 */ mtc1 $v0, $f6 -/* 9A25A0 802415C0 00000000 */ nop -/* 9A25A4 802415C4 468031A0 */ cvt.s.w $f6, $f6 -/* 9A25A8 802415C8 27A20044 */ addiu $v0, $sp, 0x44 -/* 9A25AC 802415CC E7A00038 */ swc1 $f0, 0x38($sp) -/* 9A25B0 802415D0 C640003C */ lwc1 $f0, 0x3c($s2) -/* 9A25B4 802415D4 C6420040 */ lwc1 $f2, 0x40($s2) -/* 9A25B8 802415D8 46060000 */ add.s $f0, $f0, $f6 -/* 9A25BC 802415DC E7A40044 */ swc1 $f4, 0x44($sp) -/* 9A25C0 802415E0 E7A20040 */ swc1 $f2, 0x40($sp) -/* 9A25C4 802415E4 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 9A25C8 802415E8 AFA20010 */ sw $v0, 0x10($sp) -/* 9A25CC 802415EC 8E440080 */ lw $a0, 0x80($s2) -/* 9A25D0 802415F0 0C0372DF */ jal func_800DCB7C -/* 9A25D4 802415F4 27A70040 */ addiu $a3, $sp, 0x40 -/* 9A25D8 802415F8 10400003 */ beqz $v0, .L80241608 -/* 9A25DC 802415FC 00000000 */ nop -/* 9A25E0 80241600 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 9A25E4 80241604 E640003C */ swc1 $f0, 0x3c($s2) -.L80241608: -/* 9A25E8 80241608 8E830070 */ lw $v1, 0x70($s4) -/* 9A25EC 8024160C 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9A25F0 80241610 10400042 */ beqz $v0, .L8024171C -/* 9A25F4 80241614 00031080 */ sll $v0, $v1, 2 -/* 9A25F8 80241618 3C018024 */ lui $at, 0x8024 -/* 9A25FC 8024161C 00220821 */ addu $at, $at, $v0 -/* 9A2600 80241620 8C223350 */ lw $v0, 0x3350($at) -/* 9A2604 80241624 00400008 */ jr $v0 -/* 9A2608 80241628 00000000 */ nop -/* 9A260C 8024162C 0280202D */ daddu $a0, $s4, $zero -/* 9A2610 80241630 0260282D */ daddu $a1, $s3, $zero -/* 9A2614 80241634 0C09022D */ jal func_802408B4 -/* 9A2618 80241638 02A0302D */ daddu $a2, $s5, $zero -/* 9A261C 8024163C 0280202D */ daddu $a0, $s4, $zero -/* 9A2620 80241640 0260282D */ daddu $a1, $s3, $zero -/* 9A2624 80241644 0C090283 */ jal func_80240A0C -/* 9A2628 80241648 02A0302D */ daddu $a2, $s5, $zero -/* 9A262C 8024164C 080905C7 */ j .L8024171C -/* 9A2630 80241650 00000000 */ nop -/* 9A2634 80241654 0280202D */ daddu $a0, $s4, $zero -/* 9A2638 80241658 0260282D */ daddu $a1, $s3, $zero -/* 9A263C 8024165C 0C09032D */ jal func_80240CB4 -/* 9A2640 80241660 02A0302D */ daddu $a2, $s5, $zero -/* 9A2644 80241664 0280202D */ daddu $a0, $s4, $zero -/* 9A2648 80241668 0260282D */ daddu $a1, $s3, $zero -/* 9A264C 8024166C 0C09035D */ jal func_80240D74 -/* 9A2650 80241670 02A0302D */ daddu $a2, $s5, $zero -/* 9A2654 80241674 080905C7 */ j .L8024171C -/* 9A2658 80241678 00000000 */ nop -/* 9A265C 8024167C 0280202D */ daddu $a0, $s4, $zero -/* 9A2660 80241680 0260282D */ daddu $a1, $s3, $zero -/* 9A2664 80241684 0C0903CC */ jal func_80240F30 -/* 9A2668 80241688 02A0302D */ daddu $a2, $s5, $zero -/* 9A266C 8024168C 080905C7 */ j .L8024171C -/* 9A2670 80241690 00000000 */ nop -/* 9A2674 80241694 0280202D */ daddu $a0, $s4, $zero -/* 9A2678 80241698 0260282D */ daddu $a1, $s3, $zero -/* 9A267C 8024169C 0C0903F9 */ jal func_80240FE4 -/* 9A2680 802416A0 02A0302D */ daddu $a2, $s5, $zero -/* 9A2684 802416A4 0280202D */ daddu $a0, $s4, $zero -/* 9A2688 802416A8 0260282D */ daddu $a1, $s3, $zero -/* 9A268C 802416AC 0C090416 */ jal func_80241058 -/* 9A2690 802416B0 02A0302D */ daddu $a2, $s5, $zero -/* 9A2694 802416B4 080905C7 */ j .L8024171C -/* 9A2698 802416B8 00000000 */ nop -/* 9A269C 802416BC 0280202D */ daddu $a0, $s4, $zero -/* 9A26A0 802416C0 0260282D */ daddu $a1, $s3, $zero -/* 9A26A4 802416C4 0C090434 */ jal func_802410D0 -/* 9A26A8 802416C8 02A0302D */ daddu $a2, $s5, $zero -/* 9A26AC 802416CC 0280202D */ daddu $a0, $s4, $zero -/* 9A26B0 802416D0 0260282D */ daddu $a1, $s3, $zero -/* 9A26B4 802416D4 0C090480 */ jal func_80241200 -/* 9A26B8 802416D8 02A0302D */ daddu $a2, $s5, $zero -/* 9A26BC 802416DC 080905C7 */ j .L8024171C -/* 9A26C0 802416E0 00000000 */ nop -/* 9A26C4 802416E4 0280202D */ daddu $a0, $s4, $zero -/* 9A26C8 802416E8 0260282D */ daddu $a1, $s3, $zero -/* 9A26CC 802416EC 0C0904C8 */ jal func_80241320 -/* 9A26D0 802416F0 02A0302D */ daddu $a2, $s5, $zero -/* 9A26D4 802416F4 080905C7 */ j .L8024171C -/* 9A26D8 802416F8 00000000 */ nop -/* 9A26DC 802416FC 0280202D */ daddu $a0, $s4, $zero -/* 9A26E0 80241700 0260282D */ daddu $a1, $s3, $zero -/* 9A26E4 80241704 0C0904E2 */ jal func_80241388 -/* 9A26E8 80241708 02A0302D */ daddu $a2, $s5, $zero -/* 9A26EC 8024170C 080905C7 */ j .L8024171C -/* 9A26F0 80241710 00000000 */ nop -/* 9A26F4 80241714 0C0129CF */ jal func_8004A73C -/* 9A26F8 80241718 0280202D */ daddu $a0, $s4, $zero -.L8024171C: -/* 9A26FC 8024171C 8FBF0060 */ lw $ra, 0x60($sp) -/* 9A2700 80241720 8FB5005C */ lw $s5, 0x5c($sp) -/* 9A2704 80241724 8FB40058 */ lw $s4, 0x58($sp) -/* 9A2708 80241728 8FB30054 */ lw $s3, 0x54($sp) -/* 9A270C 8024172C 8FB20050 */ lw $s2, 0x50($sp) -/* 9A2710 80241730 8FB1004C */ lw $s1, 0x4c($sp) -/* 9A2714 80241734 8FB00048 */ lw $s0, 0x48($sp) -/* 9A2718 80241738 0000102D */ daddu $v0, $zero, $zero -/* 9A271C 8024173C 03E00008 */ jr $ra -/* 9A2720 80241740 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s new file mode 100644 index 0000000000..1e193d0c6a --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241448_9A2428.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241448_9A2428 +/* 9A2428 80241448 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 9A242C 8024144C AFB40058 */ sw $s4, 0x58($sp) +/* 9A2430 80241450 0080A02D */ daddu $s4, $a0, $zero +/* 9A2434 80241454 AFBF0060 */ sw $ra, 0x60($sp) +/* 9A2438 80241458 AFB5005C */ sw $s5, 0x5c($sp) +/* 9A243C 8024145C AFB30054 */ sw $s3, 0x54($sp) +/* 9A2440 80241460 AFB20050 */ sw $s2, 0x50($sp) +/* 9A2444 80241464 AFB1004C */ sw $s1, 0x4c($sp) +/* 9A2448 80241468 AFB00048 */ sw $s0, 0x48($sp) +/* 9A244C 8024146C 8E910148 */ lw $s1, 0x148($s4) +/* 9A2450 80241470 86240008 */ lh $a0, 8($s1) +/* 9A2454 80241474 0C00EABB */ jal get_npc_unsafe +/* 9A2458 80241478 00A0802D */ daddu $s0, $a1, $zero +/* 9A245C 8024147C 8E83000C */ lw $v1, 0xc($s4) +/* 9A2460 80241480 0280202D */ daddu $a0, $s4, $zero +/* 9A2464 80241484 8C650000 */ lw $a1, ($v1) +/* 9A2468 80241488 0C0B1EAF */ jal get_variable +/* 9A246C 8024148C 0040902D */ daddu $s2, $v0, $zero +/* 9A2470 80241490 AFA00018 */ sw $zero, 0x18($sp) +/* 9A2474 80241494 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A2478 80241498 8C630094 */ lw $v1, 0x94($v1) +/* 9A247C 8024149C AFA3001C */ sw $v1, 0x1c($sp) +/* 9A2480 802414A0 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A2484 802414A4 8C630080 */ lw $v1, 0x80($v1) +/* 9A2488 802414A8 AFA30020 */ sw $v1, 0x20($sp) +/* 9A248C 802414AC 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A2490 802414B0 8C630088 */ lw $v1, 0x88($v1) +/* 9A2494 802414B4 AFA30024 */ sw $v1, 0x24($sp) +/* 9A2498 802414B8 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A249C 802414BC 8C63008C */ lw $v1, 0x8c($v1) +/* 9A24A0 802414C0 27B50018 */ addiu $s5, $sp, 0x18 +/* 9A24A4 802414C4 AFA30028 */ sw $v1, 0x28($sp) +/* 9A24A8 802414C8 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A24AC 802414CC 3C014282 */ lui $at, 0x4282 +/* 9A24B0 802414D0 44810000 */ mtc1 $at, $f0 +/* 9A24B4 802414D4 8C630090 */ lw $v1, 0x90($v1) +/* 9A24B8 802414D8 0040982D */ daddu $s3, $v0, $zero +/* 9A24BC 802414DC E7A00030 */ swc1 $f0, 0x30($sp) +/* 9A24C0 802414E0 A7A00034 */ sh $zero, 0x34($sp) +/* 9A24C4 802414E4 16000005 */ bnez $s0, .L802414FC +/* 9A24C8 802414E8 AFA3002C */ sw $v1, 0x2c($sp) +/* 9A24CC 802414EC 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A24D0 802414F0 30420004 */ andi $v0, $v0, 4 +/* 9A24D4 802414F4 10400044 */ beqz $v0, .L80241608 +/* 9A24D8 802414F8 00000000 */ nop +.L802414FC: +/* 9A24DC 802414FC 2404F7FF */ addiu $a0, $zero, -0x801 +/* 9A24E0 80241500 AE800070 */ sw $zero, 0x70($s4) +/* 9A24E4 80241504 A640008E */ sh $zero, 0x8e($s2) +/* 9A24E8 80241508 8E2200CC */ lw $v0, 0xcc($s1) +/* 9A24EC 8024150C 8E430000 */ lw $v1, ($s2) +/* 9A24F0 80241510 8C420000 */ lw $v0, ($v0) +/* 9A24F4 80241514 00641824 */ and $v1, $v1, $a0 +/* 9A24F8 80241518 AE430000 */ sw $v1, ($s2) +/* 9A24FC 8024151C AE420028 */ sw $v0, 0x28($s2) +/* 9A2500 80241520 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9A2504 80241524 8C420098 */ lw $v0, 0x98($v0) +/* 9A2508 80241528 54400005 */ bnel $v0, $zero, .L80241540 +/* 9A250C 8024152C 2402FDFF */ addiu $v0, $zero, -0x201 +/* 9A2510 80241530 34620200 */ ori $v0, $v1, 0x200 +/* 9A2514 80241534 2403FFF7 */ addiu $v1, $zero, -9 +/* 9A2518 80241538 08090552 */ j .L80241548 +/* 9A251C 8024153C 00431024 */ and $v0, $v0, $v1 +.L80241540: +/* 9A2520 80241540 00621024 */ and $v0, $v1, $v0 +/* 9A2524 80241544 34420008 */ ori $v0, $v0, 8 +.L80241548: +/* 9A2528 80241548 AE420000 */ sw $v0, ($s2) +/* 9A252C 8024154C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A2530 80241550 30420004 */ andi $v0, $v0, 4 +/* 9A2534 80241554 10400008 */ beqz $v0, .L80241578 +/* 9A2538 80241558 24020063 */ addiu $v0, $zero, 0x63 +/* 9A253C 8024155C AE820070 */ sw $v0, 0x70($s4) +/* 9A2540 80241560 AE800074 */ sw $zero, 0x74($s4) +/* 9A2544 80241564 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A2548 80241568 2403FFFB */ addiu $v1, $zero, -5 +/* 9A254C 8024156C 00431024 */ and $v0, $v0, $v1 +/* 9A2550 80241570 08090569 */ j .L802415A4 +/* 9A2554 80241574 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241578: +/* 9A2558 80241578 8E220000 */ lw $v0, ($s1) +/* 9A255C 8024157C 3C034000 */ lui $v1, 0x4000 +/* 9A2560 80241580 00431024 */ and $v0, $v0, $v1 +/* 9A2564 80241584 10400007 */ beqz $v0, .L802415A4 +/* 9A2568 80241588 3C03BFFF */ lui $v1, 0xbfff +/* 9A256C 8024158C 2402000C */ addiu $v0, $zero, 0xc +/* 9A2570 80241590 AE820070 */ sw $v0, 0x70($s4) +/* 9A2574 80241594 8E220000 */ lw $v0, ($s1) +/* 9A2578 80241598 3463FFFF */ ori $v1, $v1, 0xffff +/* 9A257C 8024159C 00431024 */ and $v0, $v0, $v1 +/* 9A2580 802415A0 AE220000 */ sw $v0, ($s1) +.L802415A4: +/* 9A2584 802415A4 27A50038 */ addiu $a1, $sp, 0x38 +/* 9A2588 802415A8 27A6003C */ addiu $a2, $sp, 0x3c +/* 9A258C 802415AC C6400038 */ lwc1 $f0, 0x38($s2) +/* 9A2590 802415B0 864200A8 */ lh $v0, 0xa8($s2) +/* 9A2594 802415B4 3C0142C8 */ lui $at, 0x42c8 +/* 9A2598 802415B8 44812000 */ mtc1 $at, $f4 +/* 9A259C 802415BC 44823000 */ mtc1 $v0, $f6 +/* 9A25A0 802415C0 00000000 */ nop +/* 9A25A4 802415C4 468031A0 */ cvt.s.w $f6, $f6 +/* 9A25A8 802415C8 27A20044 */ addiu $v0, $sp, 0x44 +/* 9A25AC 802415CC E7A00038 */ swc1 $f0, 0x38($sp) +/* 9A25B0 802415D0 C640003C */ lwc1 $f0, 0x3c($s2) +/* 9A25B4 802415D4 C6420040 */ lwc1 $f2, 0x40($s2) +/* 9A25B8 802415D8 46060000 */ add.s $f0, $f0, $f6 +/* 9A25BC 802415DC E7A40044 */ swc1 $f4, 0x44($sp) +/* 9A25C0 802415E0 E7A20040 */ swc1 $f2, 0x40($sp) +/* 9A25C4 802415E4 E7A0003C */ swc1 $f0, 0x3c($sp) +/* 9A25C8 802415E8 AFA20010 */ sw $v0, 0x10($sp) +/* 9A25CC 802415EC 8E440080 */ lw $a0, 0x80($s2) +/* 9A25D0 802415F0 0C0372DF */ jal func_800DCB7C +/* 9A25D4 802415F4 27A70040 */ addiu $a3, $sp, 0x40 +/* 9A25D8 802415F8 10400003 */ beqz $v0, .L80241608 +/* 9A25DC 802415FC 00000000 */ nop +/* 9A25E0 80241600 C7A0003C */ lwc1 $f0, 0x3c($sp) +/* 9A25E4 80241604 E640003C */ swc1 $f0, 0x3c($s2) +.L80241608: +/* 9A25E8 80241608 8E830070 */ lw $v1, 0x70($s4) +/* 9A25EC 8024160C 2C620064 */ sltiu $v0, $v1, 0x64 +/* 9A25F0 80241610 10400042 */ beqz $v0, .L8024171C +/* 9A25F4 80241614 00031080 */ sll $v0, $v1, 2 +/* 9A25F8 80241618 3C018024 */ lui $at, 0x8024 +/* 9A25FC 8024161C 00220821 */ addu $at, $at, $v0 +/* 9A2600 80241620 8C223350 */ lw $v0, 0x3350($at) +/* 9A2604 80241624 00400008 */ jr $v0 +/* 9A2608 80241628 00000000 */ nop +/* 9A260C 8024162C 0280202D */ daddu $a0, $s4, $zero +/* 9A2610 80241630 0260282D */ daddu $a1, $s3, $zero +/* 9A2614 80241634 0C09022D */ jal func_802408B4_9A1894 +/* 9A2618 80241638 02A0302D */ daddu $a2, $s5, $zero +/* 9A261C 8024163C 0280202D */ daddu $a0, $s4, $zero +/* 9A2620 80241640 0260282D */ daddu $a1, $s3, $zero +/* 9A2624 80241644 0C090283 */ jal func_80240A0C_9A19EC +/* 9A2628 80241648 02A0302D */ daddu $a2, $s5, $zero +/* 9A262C 8024164C 080905C7 */ j .L8024171C +/* 9A2630 80241650 00000000 */ nop +/* 9A2634 80241654 0280202D */ daddu $a0, $s4, $zero +/* 9A2638 80241658 0260282D */ daddu $a1, $s3, $zero +/* 9A263C 8024165C 0C09032D */ jal func_80240CB4_9A1C94 +/* 9A2640 80241660 02A0302D */ daddu $a2, $s5, $zero +/* 9A2644 80241664 0280202D */ daddu $a0, $s4, $zero +/* 9A2648 80241668 0260282D */ daddu $a1, $s3, $zero +/* 9A264C 8024166C 0C09035D */ jal func_80240D74_9A1D54 +/* 9A2650 80241670 02A0302D */ daddu $a2, $s5, $zero +/* 9A2654 80241674 080905C7 */ j .L8024171C +/* 9A2658 80241678 00000000 */ nop +/* 9A265C 8024167C 0280202D */ daddu $a0, $s4, $zero +/* 9A2660 80241680 0260282D */ daddu $a1, $s3, $zero +/* 9A2664 80241684 0C0903CC */ jal func_80240F30_9A1F10 +/* 9A2668 80241688 02A0302D */ daddu $a2, $s5, $zero +/* 9A266C 8024168C 080905C7 */ j .L8024171C +/* 9A2670 80241690 00000000 */ nop +/* 9A2674 80241694 0280202D */ daddu $a0, $s4, $zero +/* 9A2678 80241698 0260282D */ daddu $a1, $s3, $zero +/* 9A267C 8024169C 0C0903F9 */ jal func_80240FE4_9A1FC4 +/* 9A2680 802416A0 02A0302D */ daddu $a2, $s5, $zero +/* 9A2684 802416A4 0280202D */ daddu $a0, $s4, $zero +/* 9A2688 802416A8 0260282D */ daddu $a1, $s3, $zero +/* 9A268C 802416AC 0C090416 */ jal func_80241058_9A2038 +/* 9A2690 802416B0 02A0302D */ daddu $a2, $s5, $zero +/* 9A2694 802416B4 080905C7 */ j .L8024171C +/* 9A2698 802416B8 00000000 */ nop +/* 9A269C 802416BC 0280202D */ daddu $a0, $s4, $zero +/* 9A26A0 802416C0 0260282D */ daddu $a1, $s3, $zero +/* 9A26A4 802416C4 0C090434 */ jal func_802410D0_9A20B0 +/* 9A26A8 802416C8 02A0302D */ daddu $a2, $s5, $zero +/* 9A26AC 802416CC 0280202D */ daddu $a0, $s4, $zero +/* 9A26B0 802416D0 0260282D */ daddu $a1, $s3, $zero +/* 9A26B4 802416D4 0C090480 */ jal func_80241200_9A21E0 +/* 9A26B8 802416D8 02A0302D */ daddu $a2, $s5, $zero +/* 9A26BC 802416DC 080905C7 */ j .L8024171C +/* 9A26C0 802416E0 00000000 */ nop +/* 9A26C4 802416E4 0280202D */ daddu $a0, $s4, $zero +/* 9A26C8 802416E8 0260282D */ daddu $a1, $s3, $zero +/* 9A26CC 802416EC 0C0904C8 */ jal func_80241320_9A2300 +/* 9A26D0 802416F0 02A0302D */ daddu $a2, $s5, $zero +/* 9A26D4 802416F4 080905C7 */ j .L8024171C +/* 9A26D8 802416F8 00000000 */ nop +/* 9A26DC 802416FC 0280202D */ daddu $a0, $s4, $zero +/* 9A26E0 80241700 0260282D */ daddu $a1, $s3, $zero +/* 9A26E4 80241704 0C0904E2 */ jal func_80241388_9A2368 +/* 9A26E8 80241708 02A0302D */ daddu $a2, $s5, $zero +/* 9A26EC 8024170C 080905C7 */ j .L8024171C +/* 9A26F0 80241710 00000000 */ nop +/* 9A26F4 80241714 0C0129CF */ jal func_8004A73C +/* 9A26F8 80241718 0280202D */ daddu $a0, $s4, $zero +.L8024171C: +/* 9A26FC 8024171C 8FBF0060 */ lw $ra, 0x60($sp) +/* 9A2700 80241720 8FB5005C */ lw $s5, 0x5c($sp) +/* 9A2704 80241724 8FB40058 */ lw $s4, 0x58($sp) +/* 9A2708 80241728 8FB30054 */ lw $s3, 0x54($sp) +/* 9A270C 8024172C 8FB20050 */ lw $s2, 0x50($sp) +/* 9A2710 80241730 8FB1004C */ lw $s1, 0x4c($sp) +/* 9A2714 80241734 8FB00048 */ lw $s0, 0x48($sp) +/* 9A2718 80241738 0000102D */ daddu $v0, $zero, $zero +/* 9A271C 8024173C 03E00008 */ jr $ra +/* 9A2720 80241740 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744.s deleted file mode 100644 index 27174310ff..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744.s +++ /dev/null @@ -1,206 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241744 -/* 9A2724 80241744 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A2728 80241748 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A272C 8024174C 0080982D */ daddu $s3, $a0, $zero -/* 9A2730 80241750 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A2734 80241754 AFB50064 */ sw $s5, 0x64($sp) -/* 9A2738 80241758 AFB40060 */ sw $s4, 0x60($sp) -/* 9A273C 8024175C AFB20058 */ sw $s2, 0x58($sp) -/* 9A2740 80241760 AFB10054 */ sw $s1, 0x54($sp) -/* 9A2744 80241764 AFB00050 */ sw $s0, 0x50($sp) -/* 9A2748 80241768 8E710148 */ lw $s1, 0x148($s3) -/* 9A274C 8024176C 86240008 */ lh $a0, 8($s1) -/* 9A2750 80241770 0C00EABB */ jal get_npc_unsafe -/* 9A2754 80241774 00A0802D */ daddu $s0, $a1, $zero -/* 9A2758 80241778 8E63000C */ lw $v1, 0xc($s3) -/* 9A275C 8024177C 0260202D */ daddu $a0, $s3, $zero -/* 9A2760 80241780 8C650000 */ lw $a1, ($v1) -/* 9A2764 80241784 0C0B1EAF */ jal get_variable -/* 9A2768 80241788 0040902D */ daddu $s2, $v0, $zero -/* 9A276C 8024178C AFA00028 */ sw $zero, 0x28($sp) -/* 9A2770 80241790 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A2774 80241794 8C630094 */ lw $v1, 0x94($v1) -/* 9A2778 80241798 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A277C 8024179C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A2780 802417A0 8C630080 */ lw $v1, 0x80($v1) -/* 9A2784 802417A4 AFA30030 */ sw $v1, 0x30($sp) -/* 9A2788 802417A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A278C 802417AC 8C630088 */ lw $v1, 0x88($v1) -/* 9A2790 802417B0 AFA30034 */ sw $v1, 0x34($sp) -/* 9A2794 802417B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A2798 802417B8 8C63008C */ lw $v1, 0x8c($v1) -/* 9A279C 802417BC 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A27A0 802417C0 AFA30038 */ sw $v1, 0x38($sp) -/* 9A27A4 802417C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A27A8 802417C8 3C0142C8 */ lui $at, 0x42c8 -/* 9A27AC 802417CC 44810000 */ mtc1 $at, $f0 -/* 9A27B0 802417D0 8C630090 */ lw $v1, 0x90($v1) -/* 9A27B4 802417D4 0040A02D */ daddu $s4, $v0, $zero -/* 9A27B8 802417D8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A27BC 802417DC A7A00044 */ sh $zero, 0x44($sp) -/* 9A27C0 802417E0 12000007 */ beqz $s0, .L80241800 -/* 9A27C4 802417E4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A27C8 802417E8 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A27CC 802417EC 864300A8 */ lh $v1, 0xa8($s2) -/* 9A27D0 802417F0 34420008 */ ori $v0, $v0, 8 -/* 9A27D4 802417F4 AE230084 */ sw $v1, 0x84($s1) -/* 9A27D8 802417F8 08090604 */ j .L80241810 -/* 9A27DC 802417FC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241800: -/* 9A27E0 80241800 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A27E4 80241804 30420004 */ andi $v0, $v0, 4 -/* 9A27E8 80241808 10400048 */ beqz $v0, .L8024192C -/* 9A27EC 8024180C 00000000 */ nop -.L80241810: -/* 9A27F0 80241810 A640008E */ sh $zero, 0x8e($s2) -/* 9A27F4 80241814 AE600070 */ sw $zero, 0x70($s3) -/* 9A27F8 80241818 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A27FC 8024181C 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A2800 80241820 A2200007 */ sb $zero, 7($s1) -/* 9A2804 80241824 8E420000 */ lw $v0, ($s2) -/* 9A2808 80241828 8C630000 */ lw $v1, ($v1) -/* 9A280C 8024182C 00441024 */ and $v0, $v0, $a0 -/* 9A2810 80241830 AE420000 */ sw $v0, ($s2) -/* 9A2814 80241834 AE430028 */ sw $v1, 0x28($s2) -/* 9A2818 80241838 96220086 */ lhu $v0, 0x86($s1) -/* 9A281C 8024183C A64200A8 */ sh $v0, 0xa8($s2) -/* 9A2820 80241840 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A2824 80241844 A22000B5 */ sb $zero, 0xb5($s1) -/* 9A2828 80241848 AE20008C */ sw $zero, 0x8c($s1) -/* 9A282C 8024184C 8C420098 */ lw $v0, 0x98($v0) -/* 9A2830 80241850 14400006 */ bnez $v0, .L8024186C -/* 9A2834 80241854 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9A2838 80241858 8E420000 */ lw $v0, ($s2) -/* 9A283C 8024185C 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A2840 80241860 34420200 */ ori $v0, $v0, 0x200 -/* 9A2844 80241864 0809061E */ j .L80241878 -/* 9A2848 80241868 00431024 */ and $v0, $v0, $v1 -.L8024186C: -/* 9A284C 8024186C 8E420000 */ lw $v0, ($s2) -/* 9A2850 80241870 00431024 */ and $v0, $v0, $v1 -/* 9A2854 80241874 34420008 */ ori $v0, $v0, 8 -.L80241878: -/* 9A2858 80241878 AE420000 */ sw $v0, ($s2) -/* 9A285C 8024187C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A2860 80241880 30420004 */ andi $v0, $v0, 4 -/* 9A2864 80241884 1040001E */ beqz $v0, .L80241900 -/* 9A2868 80241888 24040002 */ addiu $a0, $zero, 2 -/* 9A286C 8024188C 0240282D */ daddu $a1, $s2, $zero -/* 9A2870 80241890 0000302D */ daddu $a2, $zero, $zero -/* 9A2874 80241894 24020063 */ addiu $v0, $zero, 0x63 -/* 9A2878 80241898 AE620070 */ sw $v0, 0x70($s3) -/* 9A287C 8024189C AE600074 */ sw $zero, 0x74($s3) -/* 9A2880 802418A0 864300A8 */ lh $v1, 0xa8($s2) -/* 9A2884 802418A4 3C013F80 */ lui $at, 0x3f80 -/* 9A2888 802418A8 44810000 */ mtc1 $at, $f0 -/* 9A288C 802418AC 3C014000 */ lui $at, 0x4000 -/* 9A2890 802418B0 44811000 */ mtc1 $at, $f2 -/* 9A2894 802418B4 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A2898 802418B8 44812000 */ mtc1 $at, $f4 -/* 9A289C 802418BC 24020028 */ addiu $v0, $zero, 0x28 -/* 9A28A0 802418C0 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A28A4 802418C4 44833000 */ mtc1 $v1, $f6 -/* 9A28A8 802418C8 00000000 */ nop -/* 9A28AC 802418CC 468031A0 */ cvt.s.w $f6, $f6 -/* 9A28B0 802418D0 44073000 */ mfc1 $a3, $f6 -/* 9A28B4 802418D4 27A20048 */ addiu $v0, $sp, 0x48 -/* 9A28B8 802418D8 AFA20020 */ sw $v0, 0x20($sp) -/* 9A28BC 802418DC E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A28C0 802418E0 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A28C4 802418E4 0C01BFA4 */ jal fx_emote -/* 9A28C8 802418E8 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A28CC 802418EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A28D0 802418F0 2403FFFB */ addiu $v1, $zero, -5 -/* 9A28D4 802418F4 00431024 */ and $v0, $v0, $v1 -/* 9A28D8 802418F8 0809064B */ j .L8024192C -/* 9A28DC 802418FC AE2200B0 */ sw $v0, 0xb0($s1) -.L80241900: -/* 9A28E0 80241900 8E220000 */ lw $v0, ($s1) -/* 9A28E4 80241904 3C034000 */ lui $v1, 0x4000 -/* 9A28E8 80241908 00431024 */ and $v0, $v0, $v1 -/* 9A28EC 8024190C 10400007 */ beqz $v0, .L8024192C -/* 9A28F0 80241910 3C03BFFF */ lui $v1, 0xbfff -/* 9A28F4 80241914 2402000C */ addiu $v0, $zero, 0xc -/* 9A28F8 80241918 AE620070 */ sw $v0, 0x70($s3) -/* 9A28FC 8024191C 8E220000 */ lw $v0, ($s1) -/* 9A2900 80241920 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A2904 80241924 00431024 */ and $v0, $v0, $v1 -/* 9A2908 80241928 AE220000 */ sw $v0, ($s1) -.L8024192C: -/* 9A290C 8024192C 8E630070 */ lw $v1, 0x70($s3) -/* 9A2910 80241930 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9A2914 80241934 1040003A */ beqz $v0, .L80241A20 -/* 9A2918 80241938 00031080 */ sll $v0, $v1, 2 -/* 9A291C 8024193C 3C018024 */ lui $at, 0x8024 -/* 9A2920 80241940 00220821 */ addu $at, $at, $v0 -/* 9A2924 80241944 8C2234E0 */ lw $v0, 0x34e0($at) -/* 9A2928 80241948 00400008 */ jr $v0 -/* 9A292C 8024194C 00000000 */ nop -/* 9A2930 80241950 0260202D */ daddu $a0, $s3, $zero -/* 9A2934 80241954 0280282D */ daddu $a1, $s4, $zero -/* 9A2938 80241958 0C09022D */ jal func_802408B4 -/* 9A293C 8024195C 02A0302D */ daddu $a2, $s5, $zero -/* 9A2940 80241960 96220086 */ lhu $v0, 0x86($s1) -/* 9A2944 80241964 A64200A8 */ sh $v0, 0xa8($s2) -/* 9A2948 80241968 0260202D */ daddu $a0, $s3, $zero -/* 9A294C 8024196C 0280282D */ daddu $a1, $s4, $zero -/* 9A2950 80241970 0C090283 */ jal func_80240A0C -/* 9A2954 80241974 02A0302D */ daddu $a2, $s5, $zero -/* 9A2958 80241978 08090688 */ j .L80241A20 -/* 9A295C 8024197C 00000000 */ nop -/* 9A2960 80241980 0260202D */ daddu $a0, $s3, $zero -/* 9A2964 80241984 0280282D */ daddu $a1, $s4, $zero -/* 9A2968 80241988 0C09032D */ jal func_80240CB4 -/* 9A296C 8024198C 02A0302D */ daddu $a2, $s5, $zero -/* 9A2970 80241990 0260202D */ daddu $a0, $s3, $zero -/* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero -/* 9A2978 80241998 0C09035D */ jal func_80240D74 -/* 9A297C 8024199C 02A0302D */ daddu $a2, $s5, $zero -/* 9A2980 802419A0 08090688 */ j .L80241A20 -/* 9A2984 802419A4 00000000 */ nop -/* 9A2988 802419A8 0260202D */ daddu $a0, $s3, $zero -/* 9A298C 802419AC 0280282D */ daddu $a1, $s4, $zero -/* 9A2990 802419B0 0C0903CC */ jal func_80240F30 -/* 9A2994 802419B4 02A0302D */ daddu $a2, $s5, $zero -/* 9A2998 802419B8 08090688 */ j .L80241A20 -/* 9A299C 802419BC 00000000 */ nop -/* 9A29A0 802419C0 0260202D */ daddu $a0, $s3, $zero -/* 9A29A4 802419C4 0280282D */ daddu $a1, $s4, $zero -/* 9A29A8 802419C8 0C090038 */ jal func_802400E0 -/* 9A29AC 802419CC 02A0302D */ daddu $a2, $s5, $zero -/* 9A29B0 802419D0 0260202D */ daddu $a0, $s3, $zero -/* 9A29B4 802419D4 0280282D */ daddu $a1, $s4, $zero -/* 9A29B8 802419D8 0C090057 */ jal func_8024015C -/* 9A29BC 802419DC 02A0302D */ daddu $a2, $s5, $zero -/* 9A29C0 802419E0 08090688 */ j .L80241A20 -/* 9A29C4 802419E4 00000000 */ nop -/* 9A29C8 802419E8 0260202D */ daddu $a0, $s3, $zero -/* 9A29CC 802419EC 0280282D */ daddu $a1, $s4, $zero -/* 9A29D0 802419F0 0C0900A4 */ jal func_80240290 -/* 9A29D4 802419F4 02A0302D */ daddu $a2, $s5, $zero -/* 9A29D8 802419F8 08090688 */ j .L80241A20 -/* 9A29DC 802419FC 00000000 */ nop -/* 9A29E0 80241A00 0260202D */ daddu $a0, $s3, $zero -/* 9A29E4 80241A04 0280282D */ daddu $a1, $s4, $zero -/* 9A29E8 80241A08 0C0900FD */ jal func_802403F4 -/* 9A29EC 80241A0C 02A0302D */ daddu $a2, $s5, $zero -/* 9A29F0 80241A10 08090688 */ j .L80241A20 -/* 9A29F4 80241A14 00000000 */ nop -/* 9A29F8 80241A18 0C0129CF */ jal func_8004A73C -/* 9A29FC 80241A1C 0260202D */ daddu $a0, $s3, $zero -.L80241A20: -/* 9A2A00 80241A20 8FBF0068 */ lw $ra, 0x68($sp) -/* 9A2A04 80241A24 8FB50064 */ lw $s5, 0x64($sp) -/* 9A2A08 80241A28 8FB40060 */ lw $s4, 0x60($sp) -/* 9A2A0C 80241A2C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9A2A10 80241A30 8FB20058 */ lw $s2, 0x58($sp) -/* 9A2A14 80241A34 8FB10054 */ lw $s1, 0x54($sp) -/* 9A2A18 80241A38 8FB00050 */ lw $s0, 0x50($sp) -/* 9A2A1C 80241A3C 0000102D */ daddu $v0, $zero, $zero -/* 9A2A20 80241A40 03E00008 */ jr $ra -/* 9A2A24 80241A44 27BD0070 */ addiu $sp, $sp, 0x70 -/* 9A2A28 80241A48 00000000 */ nop -/* 9A2A2C 80241A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s new file mode 100644 index 0000000000..f8aa5cb3da --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_02/9A10C0/func_80241744_9A2724.s @@ -0,0 +1,206 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241744_9A2724 +/* 9A2724 80241744 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 9A2728 80241748 AFB3005C */ sw $s3, 0x5c($sp) +/* 9A272C 8024174C 0080982D */ daddu $s3, $a0, $zero +/* 9A2730 80241750 AFBF0068 */ sw $ra, 0x68($sp) +/* 9A2734 80241754 AFB50064 */ sw $s5, 0x64($sp) +/* 9A2738 80241758 AFB40060 */ sw $s4, 0x60($sp) +/* 9A273C 8024175C AFB20058 */ sw $s2, 0x58($sp) +/* 9A2740 80241760 AFB10054 */ sw $s1, 0x54($sp) +/* 9A2744 80241764 AFB00050 */ sw $s0, 0x50($sp) +/* 9A2748 80241768 8E710148 */ lw $s1, 0x148($s3) +/* 9A274C 8024176C 86240008 */ lh $a0, 8($s1) +/* 9A2750 80241770 0C00EABB */ jal get_npc_unsafe +/* 9A2754 80241774 00A0802D */ daddu $s0, $a1, $zero +/* 9A2758 80241778 8E63000C */ lw $v1, 0xc($s3) +/* 9A275C 8024177C 0260202D */ daddu $a0, $s3, $zero +/* 9A2760 80241780 8C650000 */ lw $a1, ($v1) +/* 9A2764 80241784 0C0B1EAF */ jal get_variable +/* 9A2768 80241788 0040902D */ daddu $s2, $v0, $zero +/* 9A276C 8024178C AFA00028 */ sw $zero, 0x28($sp) +/* 9A2770 80241790 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A2774 80241794 8C630094 */ lw $v1, 0x94($v1) +/* 9A2778 80241798 AFA3002C */ sw $v1, 0x2c($sp) +/* 9A277C 8024179C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A2780 802417A0 8C630080 */ lw $v1, 0x80($v1) +/* 9A2784 802417A4 AFA30030 */ sw $v1, 0x30($sp) +/* 9A2788 802417A8 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A278C 802417AC 8C630088 */ lw $v1, 0x88($v1) +/* 9A2790 802417B0 AFA30034 */ sw $v1, 0x34($sp) +/* 9A2794 802417B4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A2798 802417B8 8C63008C */ lw $v1, 0x8c($v1) +/* 9A279C 802417BC 27B50028 */ addiu $s5, $sp, 0x28 +/* 9A27A0 802417C0 AFA30038 */ sw $v1, 0x38($sp) +/* 9A27A4 802417C4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A27A8 802417C8 3C0142C8 */ lui $at, 0x42c8 +/* 9A27AC 802417CC 44810000 */ mtc1 $at, $f0 +/* 9A27B0 802417D0 8C630090 */ lw $v1, 0x90($v1) +/* 9A27B4 802417D4 0040A02D */ daddu $s4, $v0, $zero +/* 9A27B8 802417D8 E7A00040 */ swc1 $f0, 0x40($sp) +/* 9A27BC 802417DC A7A00044 */ sh $zero, 0x44($sp) +/* 9A27C0 802417E0 12000007 */ beqz $s0, .L80241800 +/* 9A27C4 802417E4 AFA3003C */ sw $v1, 0x3c($sp) +/* 9A27C8 802417E8 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A27CC 802417EC 864300A8 */ lh $v1, 0xa8($s2) +/* 9A27D0 802417F0 34420008 */ ori $v0, $v0, 8 +/* 9A27D4 802417F4 AE230084 */ sw $v1, 0x84($s1) +/* 9A27D8 802417F8 08090604 */ j .L80241810 +/* 9A27DC 802417FC AE2200B0 */ sw $v0, 0xb0($s1) +.L80241800: +/* 9A27E0 80241800 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A27E4 80241804 30420004 */ andi $v0, $v0, 4 +/* 9A27E8 80241808 10400048 */ beqz $v0, .L8024192C +/* 9A27EC 8024180C 00000000 */ nop +.L80241810: +/* 9A27F0 80241810 A640008E */ sh $zero, 0x8e($s2) +/* 9A27F4 80241814 AE600070 */ sw $zero, 0x70($s3) +/* 9A27F8 80241818 8E2300CC */ lw $v1, 0xcc($s1) +/* 9A27FC 8024181C 2404F7FF */ addiu $a0, $zero, -0x801 +/* 9A2800 80241820 A2200007 */ sb $zero, 7($s1) +/* 9A2804 80241824 8E420000 */ lw $v0, ($s2) +/* 9A2808 80241828 8C630000 */ lw $v1, ($v1) +/* 9A280C 8024182C 00441024 */ and $v0, $v0, $a0 +/* 9A2810 80241830 AE420000 */ sw $v0, ($s2) +/* 9A2814 80241834 AE430028 */ sw $v1, 0x28($s2) +/* 9A2818 80241838 96220086 */ lhu $v0, 0x86($s1) +/* 9A281C 8024183C A64200A8 */ sh $v0, 0xa8($s2) +/* 9A2820 80241840 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9A2824 80241844 A22000B5 */ sb $zero, 0xb5($s1) +/* 9A2828 80241848 AE20008C */ sw $zero, 0x8c($s1) +/* 9A282C 8024184C 8C420098 */ lw $v0, 0x98($v0) +/* 9A2830 80241850 14400006 */ bnez $v0, .L8024186C +/* 9A2834 80241854 2403FDFF */ addiu $v1, $zero, -0x201 +/* 9A2838 80241858 8E420000 */ lw $v0, ($s2) +/* 9A283C 8024185C 2403FFF7 */ addiu $v1, $zero, -9 +/* 9A2840 80241860 34420200 */ ori $v0, $v0, 0x200 +/* 9A2844 80241864 0809061E */ j .L80241878 +/* 9A2848 80241868 00431024 */ and $v0, $v0, $v1 +.L8024186C: +/* 9A284C 8024186C 8E420000 */ lw $v0, ($s2) +/* 9A2850 80241870 00431024 */ and $v0, $v0, $v1 +/* 9A2854 80241874 34420008 */ ori $v0, $v0, 8 +.L80241878: +/* 9A2858 80241878 AE420000 */ sw $v0, ($s2) +/* 9A285C 8024187C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A2860 80241880 30420004 */ andi $v0, $v0, 4 +/* 9A2864 80241884 1040001E */ beqz $v0, .L80241900 +/* 9A2868 80241888 24040002 */ addiu $a0, $zero, 2 +/* 9A286C 8024188C 0240282D */ daddu $a1, $s2, $zero +/* 9A2870 80241890 0000302D */ daddu $a2, $zero, $zero +/* 9A2874 80241894 24020063 */ addiu $v0, $zero, 0x63 +/* 9A2878 80241898 AE620070 */ sw $v0, 0x70($s3) +/* 9A287C 8024189C AE600074 */ sw $zero, 0x74($s3) +/* 9A2880 802418A0 864300A8 */ lh $v1, 0xa8($s2) +/* 9A2884 802418A4 3C013F80 */ lui $at, 0x3f80 +/* 9A2888 802418A8 44810000 */ mtc1 $at, $f0 +/* 9A288C 802418AC 3C014000 */ lui $at, 0x4000 +/* 9A2890 802418B0 44811000 */ mtc1 $at, $f2 +/* 9A2894 802418B4 3C01C1A0 */ lui $at, 0xc1a0 +/* 9A2898 802418B8 44812000 */ mtc1 $at, $f4 +/* 9A289C 802418BC 24020028 */ addiu $v0, $zero, 0x28 +/* 9A28A0 802418C0 AFA2001C */ sw $v0, 0x1c($sp) +/* 9A28A4 802418C4 44833000 */ mtc1 $v1, $f6 +/* 9A28A8 802418C8 00000000 */ nop +/* 9A28AC 802418CC 468031A0 */ cvt.s.w $f6, $f6 +/* 9A28B0 802418D0 44073000 */ mfc1 $a3, $f6 +/* 9A28B4 802418D4 27A20048 */ addiu $v0, $sp, 0x48 +/* 9A28B8 802418D8 AFA20020 */ sw $v0, 0x20($sp) +/* 9A28BC 802418DC E7A00010 */ swc1 $f0, 0x10($sp) +/* 9A28C0 802418E0 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9A28C4 802418E4 0C01BFA4 */ jal fx_emote +/* 9A28C8 802418E8 E7A40018 */ swc1 $f4, 0x18($sp) +/* 9A28CC 802418EC 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A28D0 802418F0 2403FFFB */ addiu $v1, $zero, -5 +/* 9A28D4 802418F4 00431024 */ and $v0, $v0, $v1 +/* 9A28D8 802418F8 0809064B */ j .L8024192C +/* 9A28DC 802418FC AE2200B0 */ sw $v0, 0xb0($s1) +.L80241900: +/* 9A28E0 80241900 8E220000 */ lw $v0, ($s1) +/* 9A28E4 80241904 3C034000 */ lui $v1, 0x4000 +/* 9A28E8 80241908 00431024 */ and $v0, $v0, $v1 +/* 9A28EC 8024190C 10400007 */ beqz $v0, .L8024192C +/* 9A28F0 80241910 3C03BFFF */ lui $v1, 0xbfff +/* 9A28F4 80241914 2402000C */ addiu $v0, $zero, 0xc +/* 9A28F8 80241918 AE620070 */ sw $v0, 0x70($s3) +/* 9A28FC 8024191C 8E220000 */ lw $v0, ($s1) +/* 9A2900 80241920 3463FFFF */ ori $v1, $v1, 0xffff +/* 9A2904 80241924 00431024 */ and $v0, $v0, $v1 +/* 9A2908 80241928 AE220000 */ sw $v0, ($s1) +.L8024192C: +/* 9A290C 8024192C 8E630070 */ lw $v1, 0x70($s3) +/* 9A2910 80241930 2C620064 */ sltiu $v0, $v1, 0x64 +/* 9A2914 80241934 1040003A */ beqz $v0, .L80241A20 +/* 9A2918 80241938 00031080 */ sll $v0, $v1, 2 +/* 9A291C 8024193C 3C018024 */ lui $at, 0x8024 +/* 9A2920 80241940 00220821 */ addu $at, $at, $v0 +/* 9A2924 80241944 8C2234E0 */ lw $v0, 0x34e0($at) +/* 9A2928 80241948 00400008 */ jr $v0 +/* 9A292C 8024194C 00000000 */ nop +/* 9A2930 80241950 0260202D */ daddu $a0, $s3, $zero +/* 9A2934 80241954 0280282D */ daddu $a1, $s4, $zero +/* 9A2938 80241958 0C09022D */ jal func_802408B4_9A1894 +/* 9A293C 8024195C 02A0302D */ daddu $a2, $s5, $zero +/* 9A2940 80241960 96220086 */ lhu $v0, 0x86($s1) +/* 9A2944 80241964 A64200A8 */ sh $v0, 0xa8($s2) +/* 9A2948 80241968 0260202D */ daddu $a0, $s3, $zero +/* 9A294C 8024196C 0280282D */ daddu $a1, $s4, $zero +/* 9A2950 80241970 0C090283 */ jal func_80240A0C_9A19EC +/* 9A2954 80241974 02A0302D */ daddu $a2, $s5, $zero +/* 9A2958 80241978 08090688 */ j .L80241A20 +/* 9A295C 8024197C 00000000 */ nop +/* 9A2960 80241980 0260202D */ daddu $a0, $s3, $zero +/* 9A2964 80241984 0280282D */ daddu $a1, $s4, $zero +/* 9A2968 80241988 0C09032D */ jal func_80240CB4_9A1C94 +/* 9A296C 8024198C 02A0302D */ daddu $a2, $s5, $zero +/* 9A2970 80241990 0260202D */ daddu $a0, $s3, $zero +/* 9A2974 80241994 0280282D */ daddu $a1, $s4, $zero +/* 9A2978 80241998 0C09035D */ jal func_80240D74_9A1D54 +/* 9A297C 8024199C 02A0302D */ daddu $a2, $s5, $zero +/* 9A2980 802419A0 08090688 */ j .L80241A20 +/* 9A2984 802419A4 00000000 */ nop +/* 9A2988 802419A8 0260202D */ daddu $a0, $s3, $zero +/* 9A298C 802419AC 0280282D */ daddu $a1, $s4, $zero +/* 9A2990 802419B0 0C0903CC */ jal func_80240F30_9A1F10 +/* 9A2994 802419B4 02A0302D */ daddu $a2, $s5, $zero +/* 9A2998 802419B8 08090688 */ j .L80241A20 +/* 9A299C 802419BC 00000000 */ nop +/* 9A29A0 802419C0 0260202D */ daddu $a0, $s3, $zero +/* 9A29A4 802419C4 0280282D */ daddu $a1, $s4, $zero +/* 9A29A8 802419C8 0C090038 */ jal func_802400E0_9A10C0 +/* 9A29AC 802419CC 02A0302D */ daddu $a2, $s5, $zero +/* 9A29B0 802419D0 0260202D */ daddu $a0, $s3, $zero +/* 9A29B4 802419D4 0280282D */ daddu $a1, $s4, $zero +/* 9A29B8 802419D8 0C090057 */ jal func_8024015C_9A113C +/* 9A29BC 802419DC 02A0302D */ daddu $a2, $s5, $zero +/* 9A29C0 802419E0 08090688 */ j .L80241A20 +/* 9A29C4 802419E4 00000000 */ nop +/* 9A29C8 802419E8 0260202D */ daddu $a0, $s3, $zero +/* 9A29CC 802419EC 0280282D */ daddu $a1, $s4, $zero +/* 9A29D0 802419F0 0C0900A4 */ jal func_80240290_9A1270 +/* 9A29D4 802419F4 02A0302D */ daddu $a2, $s5, $zero +/* 9A29D8 802419F8 08090688 */ j .L80241A20 +/* 9A29DC 802419FC 00000000 */ nop +/* 9A29E0 80241A00 0260202D */ daddu $a0, $s3, $zero +/* 9A29E4 80241A04 0280282D */ daddu $a1, $s4, $zero +/* 9A29E8 80241A08 0C0900FD */ jal func_802403F4_9A13D4 +/* 9A29EC 80241A0C 02A0302D */ daddu $a2, $s5, $zero +/* 9A29F0 80241A10 08090688 */ j .L80241A20 +/* 9A29F4 80241A14 00000000 */ nop +/* 9A29F8 80241A18 0C0129CF */ jal func_8004A73C +/* 9A29FC 80241A1C 0260202D */ daddu $a0, $s3, $zero +.L80241A20: +/* 9A2A00 80241A20 8FBF0068 */ lw $ra, 0x68($sp) +/* 9A2A04 80241A24 8FB50064 */ lw $s5, 0x64($sp) +/* 9A2A08 80241A28 8FB40060 */ lw $s4, 0x60($sp) +/* 9A2A0C 80241A2C 8FB3005C */ lw $s3, 0x5c($sp) +/* 9A2A10 80241A30 8FB20058 */ lw $s2, 0x58($sp) +/* 9A2A14 80241A34 8FB10054 */ lw $s1, 0x54($sp) +/* 9A2A18 80241A38 8FB00050 */ lw $s0, 0x50($sp) +/* 9A2A1C 80241A3C 0000102D */ daddu $v0, $zero, $zero +/* 9A2A20 80241A40 03E00008 */ jr $ra +/* 9A2A24 80241A44 27BD0070 */ addiu $sp, $sp, 0x70 +/* 9A2A28 80241A48 00000000 */ nop +/* 9A2A2C 80241A4C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_802400A0.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_802400A0.s deleted file mode 100644 index 8bdbec2945..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_802400A0.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400A0 -/* 9A46F0 802400A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A46F4 802400A4 AFB20018 */ sw $s2, 0x18($sp) -/* 9A46F8 802400A8 0080902D */ daddu $s2, $a0, $zero -/* 9A46FC 802400AC AFBF001C */ sw $ra, 0x1c($sp) -/* 9A4700 802400B0 AFB10014 */ sw $s1, 0x14($sp) -/* 9A4704 802400B4 AFB00010 */ sw $s0, 0x10($sp) -/* 9A4708 802400B8 8E510148 */ lw $s1, 0x148($s2) -/* 9A470C 802400BC 0C00EABB */ jal get_npc_unsafe -/* 9A4710 802400C0 86240008 */ lh $a0, 8($s1) -/* 9A4714 802400C4 0040802D */ daddu $s0, $v0, $zero -/* 9A4718 802400C8 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A471C 802400CC C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A4720 802400D0 8C630020 */ lw $v1, 0x20($v1) -/* 9A4724 802400D4 AE030028 */ sw $v1, 0x28($s0) -/* 9A4728 802400D8 96220076 */ lhu $v0, 0x76($s1) -/* 9A472C 802400DC A602008E */ sh $v0, 0x8e($s0) -/* 9A4730 802400E0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A4734 802400E4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A4738 802400E8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A473C 802400EC 8C460028 */ lw $a2, 0x28($v0) -/* 9A4740 802400F0 0C00A720 */ jal atan2 -/* 9A4744 802400F4 8C470030 */ lw $a3, 0x30($v0) -/* 9A4748 802400F8 2402000D */ addiu $v0, $zero, 0xd -/* 9A474C 802400FC E600000C */ swc1 $f0, 0xc($s0) -/* 9A4750 80240100 AE420070 */ sw $v0, 0x70($s2) -/* 9A4754 80240104 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A4758 80240108 8FB20018 */ lw $s2, 0x18($sp) -/* 9A475C 8024010C 8FB10014 */ lw $s1, 0x14($sp) -/* 9A4760 80240110 8FB00010 */ lw $s0, 0x10($sp) -/* 9A4764 80240114 03E00008 */ jr $ra -/* 9A4768 80240118 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_802400A0_9A46F0.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_802400A0_9A46F0.s new file mode 100644 index 0000000000..1a3ed94248 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_802400A0_9A46F0.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400A0_9A46F0 +/* 9A46F0 802400A0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A46F4 802400A4 AFB20018 */ sw $s2, 0x18($sp) +/* 9A46F8 802400A8 0080902D */ daddu $s2, $a0, $zero +/* 9A46FC 802400AC AFBF001C */ sw $ra, 0x1c($sp) +/* 9A4700 802400B0 AFB10014 */ sw $s1, 0x14($sp) +/* 9A4704 802400B4 AFB00010 */ sw $s0, 0x10($sp) +/* 9A4708 802400B8 8E510148 */ lw $s1, 0x148($s2) +/* 9A470C 802400BC 0C00EABB */ jal get_npc_unsafe +/* 9A4710 802400C0 86240008 */ lh $a0, 8($s1) +/* 9A4714 802400C4 0040802D */ daddu $s0, $v0, $zero +/* 9A4718 802400C8 8E2300CC */ lw $v1, 0xcc($s1) +/* 9A471C 802400CC C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9A4720 802400D0 8C630020 */ lw $v1, 0x20($v1) +/* 9A4724 802400D4 AE030028 */ sw $v1, 0x28($s0) +/* 9A4728 802400D8 96220076 */ lhu $v0, 0x76($s1) +/* 9A472C 802400DC A602008E */ sh $v0, 0x8e($s0) +/* 9A4730 802400E0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9A4734 802400E4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9A4738 802400E8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9A473C 802400EC 8C460028 */ lw $a2, 0x28($v0) +/* 9A4740 802400F0 0C00A720 */ jal atan2 +/* 9A4744 802400F4 8C470030 */ lw $a3, 0x30($v0) +/* 9A4748 802400F8 2402000D */ addiu $v0, $zero, 0xd +/* 9A474C 802400FC E600000C */ swc1 $f0, 0xc($s0) +/* 9A4750 80240100 AE420070 */ sw $v0, 0x70($s2) +/* 9A4754 80240104 8FBF001C */ lw $ra, 0x1c($sp) +/* 9A4758 80240108 8FB20018 */ lw $s2, 0x18($sp) +/* 9A475C 8024010C 8FB10014 */ lw $s1, 0x14($sp) +/* 9A4760 80240110 8FB00010 */ lw $s0, 0x10($sp) +/* 9A4764 80240114 03E00008 */ jr $ra +/* 9A4768 80240118 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C.s deleted file mode 100644 index b3be4d1e73..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024011C -/* 9A476C 8024011C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A4770 80240120 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A4774 80240124 0080982D */ daddu $s3, $a0, $zero -/* 9A4778 80240128 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A477C 8024012C AFB20018 */ sw $s2, 0x18($sp) -/* 9A4780 80240130 AFB10014 */ sw $s1, 0x14($sp) -/* 9A4784 80240134 AFB00010 */ sw $s0, 0x10($sp) -/* 9A4788 80240138 8E710148 */ lw $s1, 0x148($s3) -/* 9A478C 8024013C 86240008 */ lh $a0, 8($s1) -/* 9A4790 80240140 0C00EABB */ jal get_npc_unsafe -/* 9A4794 80240144 00A0902D */ daddu $s2, $a1, $zero -/* 9A4798 80240148 0040802D */ daddu $s0, $v0, $zero -/* 9A479C 8024014C 8602008E */ lh $v0, 0x8e($s0) -/* 9A47A0 80240150 9603008E */ lhu $v1, 0x8e($s0) -/* 9A47A4 80240154 18400005 */ blez $v0, .L8024016C -/* 9A47A8 80240158 2462FFFF */ addiu $v0, $v1, -1 -/* 9A47AC 8024015C A602008E */ sh $v0, 0x8e($s0) -/* 9A47B0 80240160 00021400 */ sll $v0, $v0, 0x10 -/* 9A47B4 80240164 1C400033 */ bgtz $v0, .L80240234 -/* 9A47B8 80240168 00000000 */ nop -.L8024016C: -/* 9A47BC 8024016C 8602008C */ lh $v0, 0x8c($s0) -/* 9A47C0 80240170 14400030 */ bnez $v0, .L80240234 -/* 9A47C4 80240174 00000000 */ nop -/* 9A47C8 80240178 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A47CC 8024017C 8C420024 */ lw $v0, 0x24($v0) -/* 9A47D0 80240180 AE020028 */ sw $v0, 0x28($s0) -/* 9A47D4 80240184 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9A47D8 80240188 E6000018 */ swc1 $f0, 0x18($s0) -/* 9A47DC 8024018C 8E230088 */ lw $v1, 0x88($s1) -/* 9A47E0 80240190 24020005 */ addiu $v0, $zero, 5 -/* 9A47E4 80240194 10620005 */ beq $v1, $v0, .L802401AC -/* 9A47E8 80240198 00000000 */ nop -/* 9A47EC 8024019C 10600003 */ beqz $v1, .L802401AC -/* 9A47F0 802401A0 24020001 */ addiu $v0, $zero, 1 -/* 9A47F4 802401A4 14620006 */ bne $v1, $v0, .L802401C0 -/* 9A47F8 802401A8 00000000 */ nop -.L802401AC: -/* 9A47FC 802401AC 8E220084 */ lw $v0, 0x84($s1) -/* 9A4800 802401B0 00021FC2 */ srl $v1, $v0, 0x1f -/* 9A4804 802401B4 00431021 */ addu $v0, $v0, $v1 -/* 9A4808 802401B8 00021043 */ sra $v0, $v0, 1 -/* 9A480C 802401BC A60200A8 */ sh $v0, 0xa8($s0) -.L802401C0: -/* 9A4810 802401C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A4814 802401C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A4818 802401C8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A481C 802401CC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A4820 802401D0 8C460028 */ lw $a2, 0x28($v0) -/* 9A4824 802401D4 0C00A7B5 */ jal dist2D -/* 9A4828 802401D8 8C470030 */ lw $a3, 0x30($v0) -/* 9A482C 802401DC C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A4830 802401E0 46020003 */ div.s $f0, $f0, $f2 -/* 9A4834 802401E4 3C018024 */ lui $at, 0x8024 -/* 9A4838 802401E8 D4223D40 */ ldc1 $f2, 0x3d40($at) -/* 9A483C 802401EC 46000021 */ cvt.d.s $f0, $f0 -/* 9A4840 802401F0 46220000 */ add.d $f0, $f0, $f2 -/* 9A4844 802401F4 4620010D */ trunc.w.d $f4, $f0 -/* 9A4848 802401F8 44022000 */ mfc1 $v0, $f4 -/* 9A484C 802401FC 00000000 */ nop -/* 9A4850 80240200 A602008E */ sh $v0, 0x8e($s0) -/* 9A4854 80240204 00021400 */ sll $v0, $v0, 0x10 -/* 9A4858 80240208 8E230078 */ lw $v1, 0x78($s1) -/* 9A485C 8024020C 00021403 */ sra $v0, $v0, 0x10 -/* 9A4860 80240210 0043102A */ slt $v0, $v0, $v1 -/* 9A4864 80240214 10400003 */ beqz $v0, .L80240224 -/* 9A4868 80240218 00000000 */ nop -/* 9A486C 8024021C 9622007A */ lhu $v0, 0x7a($s1) -/* 9A4870 80240220 A602008E */ sh $v0, 0x8e($s0) -.L80240224: -/* 9A4874 80240224 8602008E */ lh $v0, 0x8e($s0) -/* 9A4878 80240228 AE22007C */ sw $v0, 0x7c($s1) -/* 9A487C 8024022C 2402000E */ addiu $v0, $zero, 0xe -/* 9A4880 80240230 AE620070 */ sw $v0, 0x70($s3) -.L80240234: -/* 9A4884 80240234 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A4888 80240238 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A488C 8024023C 8FB20018 */ lw $s2, 0x18($sp) -/* 9A4890 80240240 8FB10014 */ lw $s1, 0x14($sp) -/* 9A4894 80240244 8FB00010 */ lw $s0, 0x10($sp) -/* 9A4898 80240248 03E00008 */ jr $ra -/* 9A489C 8024024C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s new file mode 100644 index 0000000000..ddec172aea --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_8024011C_9A476C.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024011C_9A476C +/* 9A476C 8024011C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9A4770 80240120 AFB3001C */ sw $s3, 0x1c($sp) +/* 9A4774 80240124 0080982D */ daddu $s3, $a0, $zero +/* 9A4778 80240128 AFBF0020 */ sw $ra, 0x20($sp) +/* 9A477C 8024012C AFB20018 */ sw $s2, 0x18($sp) +/* 9A4780 80240130 AFB10014 */ sw $s1, 0x14($sp) +/* 9A4784 80240134 AFB00010 */ sw $s0, 0x10($sp) +/* 9A4788 80240138 8E710148 */ lw $s1, 0x148($s3) +/* 9A478C 8024013C 86240008 */ lh $a0, 8($s1) +/* 9A4790 80240140 0C00EABB */ jal get_npc_unsafe +/* 9A4794 80240144 00A0902D */ daddu $s2, $a1, $zero +/* 9A4798 80240148 0040802D */ daddu $s0, $v0, $zero +/* 9A479C 8024014C 8602008E */ lh $v0, 0x8e($s0) +/* 9A47A0 80240150 9603008E */ lhu $v1, 0x8e($s0) +/* 9A47A4 80240154 18400005 */ blez $v0, .L8024016C +/* 9A47A8 80240158 2462FFFF */ addiu $v0, $v1, -1 +/* 9A47AC 8024015C A602008E */ sh $v0, 0x8e($s0) +/* 9A47B0 80240160 00021400 */ sll $v0, $v0, 0x10 +/* 9A47B4 80240164 1C400033 */ bgtz $v0, .L80240234 +/* 9A47B8 80240168 00000000 */ nop +.L8024016C: +/* 9A47BC 8024016C 8602008C */ lh $v0, 0x8c($s0) +/* 9A47C0 80240170 14400030 */ bnez $v0, .L80240234 +/* 9A47C4 80240174 00000000 */ nop +/* 9A47C8 80240178 8E2200CC */ lw $v0, 0xcc($s1) +/* 9A47CC 8024017C 8C420024 */ lw $v0, 0x24($v0) +/* 9A47D0 80240180 AE020028 */ sw $v0, 0x28($s0) +/* 9A47D4 80240184 C6400018 */ lwc1 $f0, 0x18($s2) +/* 9A47D8 80240188 E6000018 */ swc1 $f0, 0x18($s0) +/* 9A47DC 8024018C 8E230088 */ lw $v1, 0x88($s1) +/* 9A47E0 80240190 24020005 */ addiu $v0, $zero, 5 +/* 9A47E4 80240194 10620005 */ beq $v1, $v0, .L802401AC +/* 9A47E8 80240198 00000000 */ nop +/* 9A47EC 8024019C 10600003 */ beqz $v1, .L802401AC +/* 9A47F0 802401A0 24020001 */ addiu $v0, $zero, 1 +/* 9A47F4 802401A4 14620006 */ bne $v1, $v0, .L802401C0 +/* 9A47F8 802401A8 00000000 */ nop +.L802401AC: +/* 9A47FC 802401AC 8E220084 */ lw $v0, 0x84($s1) +/* 9A4800 802401B0 00021FC2 */ srl $v1, $v0, 0x1f +/* 9A4804 802401B4 00431021 */ addu $v0, $v0, $v1 +/* 9A4808 802401B8 00021043 */ sra $v0, $v0, 1 +/* 9A480C 802401BC A60200A8 */ sh $v0, 0xa8($s0) +.L802401C0: +/* 9A4810 802401C0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9A4814 802401C4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9A4818 802401C8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9A481C 802401CC C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9A4820 802401D0 8C460028 */ lw $a2, 0x28($v0) +/* 9A4824 802401D4 0C00A7B5 */ jal dist2D +/* 9A4828 802401D8 8C470030 */ lw $a3, 0x30($v0) +/* 9A482C 802401DC C6020018 */ lwc1 $f2, 0x18($s0) +/* 9A4830 802401E0 46020003 */ div.s $f0, $f0, $f2 +/* 9A4834 802401E4 3C018024 */ lui $at, 0x8024 +/* 9A4838 802401E8 D4223D40 */ ldc1 $f2, 0x3d40($at) +/* 9A483C 802401EC 46000021 */ cvt.d.s $f0, $f0 +/* 9A4840 802401F0 46220000 */ add.d $f0, $f0, $f2 +/* 9A4844 802401F4 4620010D */ trunc.w.d $f4, $f0 +/* 9A4848 802401F8 44022000 */ mfc1 $v0, $f4 +/* 9A484C 802401FC 00000000 */ nop +/* 9A4850 80240200 A602008E */ sh $v0, 0x8e($s0) +/* 9A4854 80240204 00021400 */ sll $v0, $v0, 0x10 +/* 9A4858 80240208 8E230078 */ lw $v1, 0x78($s1) +/* 9A485C 8024020C 00021403 */ sra $v0, $v0, 0x10 +/* 9A4860 80240210 0043102A */ slt $v0, $v0, $v1 +/* 9A4864 80240214 10400003 */ beqz $v0, .L80240224 +/* 9A4868 80240218 00000000 */ nop +/* 9A486C 8024021C 9622007A */ lhu $v0, 0x7a($s1) +/* 9A4870 80240220 A602008E */ sh $v0, 0x8e($s0) +.L80240224: +/* 9A4874 80240224 8602008E */ lh $v0, 0x8e($s0) +/* 9A4878 80240228 AE22007C */ sw $v0, 0x7c($s1) +/* 9A487C 8024022C 2402000E */ addiu $v0, $zero, 0xe +/* 9A4880 80240230 AE620070 */ sw $v0, 0x70($s3) +.L80240234: +/* 9A4884 80240234 8FBF0020 */ lw $ra, 0x20($sp) +/* 9A4888 80240238 8FB3001C */ lw $s3, 0x1c($sp) +/* 9A488C 8024023C 8FB20018 */ lw $s2, 0x18($sp) +/* 9A4890 80240240 8FB10014 */ lw $s1, 0x14($sp) +/* 9A4894 80240244 8FB00010 */ lw $s0, 0x10($sp) +/* 9A4898 80240248 03E00008 */ jr $ra +/* 9A489C 8024024C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240250.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240250.s deleted file mode 100644 index 15c4af6b59..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240250.s +++ /dev/null @@ -1,97 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240250 -/* 9A48A0 80240250 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A48A4 80240254 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A48A8 80240258 0080982D */ daddu $s3, $a0, $zero -/* 9A48AC 8024025C AFBF0040 */ sw $ra, 0x40($sp) -/* 9A48B0 80240260 AFB20038 */ sw $s2, 0x38($sp) -/* 9A48B4 80240264 AFB10034 */ sw $s1, 0x34($sp) -/* 9A48B8 80240268 AFB00030 */ sw $s0, 0x30($sp) -/* 9A48BC 8024026C 8E710148 */ lw $s1, 0x148($s3) -/* 9A48C0 80240270 0C00EABB */ jal get_npc_unsafe -/* 9A48C4 80240274 86240008 */ lh $a0, 8($s1) -/* 9A48C8 80240278 0040802D */ daddu $s0, $v0, $zero -/* 9A48CC 8024027C 8E22007C */ lw $v0, 0x7c($s1) -/* 9A48D0 80240280 8603008E */ lh $v1, 0x8e($s0) -/* 9A48D4 80240284 2442FFFF */ addiu $v0, $v0, -1 -/* 9A48D8 80240288 14620012 */ bne $v1, $v0, .L802402D4 -/* 9A48DC 8024028C 00000000 */ nop -/* 9A48E0 80240290 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9A48E4 80240294 4600020D */ trunc.w.s $f8, $f0 -/* 9A48E8 80240298 44024000 */ mfc1 $v0, $f8 -/* 9A48EC 8024029C 00000000 */ nop -/* 9A48F0 802402A0 A6220010 */ sh $v0, 0x10($s1) -/* 9A48F4 802402A4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9A48F8 802402A8 4600020D */ trunc.w.s $f8, $f0 -/* 9A48FC 802402AC 44024000 */ mfc1 $v0, $f8 -/* 9A4900 802402B0 00000000 */ nop -/* 9A4904 802402B4 A6220012 */ sh $v0, 0x12($s1) -/* 9A4908 802402B8 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9A490C 802402BC 24020001 */ addiu $v0, $zero, 1 -/* 9A4910 802402C0 A2220007 */ sb $v0, 7($s1) -/* 9A4914 802402C4 4600020D */ trunc.w.s $f8, $f0 -/* 9A4918 802402C8 44024000 */ mfc1 $v0, $f8 -/* 9A491C 802402CC 00000000 */ nop -/* 9A4920 802402D0 A6220014 */ sh $v0, 0x14($s1) -.L802402D4: -/* 9A4924 802402D4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9A4928 802402D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9A492C 802402DC C6040040 */ lwc1 $f4, 0x40($s0) -/* 9A4930 802402E0 C6060018 */ lwc1 $f6, 0x18($s0) -/* 9A4934 802402E4 E7A00020 */ swc1 $f0, 0x20($sp) -/* 9A4938 802402E8 E7A20024 */ swc1 $f2, 0x24($sp) -/* 9A493C 802402EC E7A40028 */ swc1 $f4, 0x28($sp) -/* 9A4940 802402F0 E7A60010 */ swc1 $f6, 0x10($sp) -/* 9A4944 802402F4 C600000C */ lwc1 $f0, 0xc($s0) -/* 9A4948 802402F8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9A494C 802402FC 860200A8 */ lh $v0, 0xa8($s0) -/* 9A4950 80240300 27A50020 */ addiu $a1, $sp, 0x20 -/* 9A4954 80240304 44820000 */ mtc1 $v0, $f0 -/* 9A4958 80240308 00000000 */ nop -/* 9A495C 8024030C 46800020 */ cvt.s.w $f0, $f0 -/* 9A4960 80240310 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9A4964 80240314 860200A6 */ lh $v0, 0xa6($s0) -/* 9A4968 80240318 27A60024 */ addiu $a2, $sp, 0x24 -/* 9A496C 8024031C 44820000 */ mtc1 $v0, $f0 -/* 9A4970 80240320 00000000 */ nop -/* 9A4974 80240324 46800020 */ cvt.s.w $f0, $f0 -/* 9A4978 80240328 E7A0001C */ swc1 $f0, 0x1c($sp) -/* 9A497C 8024032C 8E040080 */ lw $a0, 0x80($s0) -/* 9A4980 80240330 0C037711 */ jal func_800DDC44 -/* 9A4984 80240334 27A70028 */ addiu $a3, $sp, 0x28 -/* 9A4988 80240338 0040902D */ daddu $s2, $v0, $zero -/* 9A498C 8024033C 16400005 */ bnez $s2, .L80240354 -/* 9A4990 80240340 00000000 */ nop -/* 9A4994 80240344 8E050018 */ lw $a1, 0x18($s0) -/* 9A4998 80240348 8E06000C */ lw $a2, 0xc($s0) -/* 9A499C 8024034C 0C00EA95 */ jal npc_move_heading -/* 9A49A0 80240350 0200202D */ daddu $a0, $s0, $zero -.L80240354: -/* 9A49A4 80240354 8602008E */ lh $v0, 0x8e($s0) -/* 9A49A8 80240358 9603008E */ lhu $v1, 0x8e($s0) -/* 9A49AC 8024035C 18400007 */ blez $v0, .L8024037C -/* 9A49B0 80240360 2462FFFF */ addiu $v0, $v1, -1 -/* 9A49B4 80240364 A602008E */ sh $v0, 0x8e($s0) -/* 9A49B8 80240368 00021400 */ sll $v0, $v0, 0x10 -/* 9A49BC 8024036C 18400003 */ blez $v0, .L8024037C -/* 9A49C0 80240370 00000000 */ nop -/* 9A49C4 80240374 12400008 */ beqz $s2, .L80240398 -/* 9A49C8 80240378 00000000 */ nop -.L8024037C: -/* 9A49CC 8024037C 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A49D0 80240380 A2200007 */ sb $zero, 7($s1) -/* 9A49D4 80240384 8C420028 */ lw $v0, 0x28($v0) -/* 9A49D8 80240388 A600008E */ sh $zero, 0x8e($s0) -/* 9A49DC 8024038C AE020028 */ sw $v0, 0x28($s0) -/* 9A49E0 80240390 2402000F */ addiu $v0, $zero, 0xf -/* 9A49E4 80240394 AE620070 */ sw $v0, 0x70($s3) -.L80240398: -/* 9A49E8 80240398 8FBF0040 */ lw $ra, 0x40($sp) -/* 9A49EC 8024039C 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A49F0 802403A0 8FB20038 */ lw $s2, 0x38($sp) -/* 9A49F4 802403A4 8FB10034 */ lw $s1, 0x34($sp) -/* 9A49F8 802403A8 8FB00030 */ lw $s0, 0x30($sp) -/* 9A49FC 802403AC 03E00008 */ jr $ra -/* 9A4A00 802403B0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240250_9A48A0.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240250_9A48A0.s new file mode 100644 index 0000000000..5a69ca5f31 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240250_9A48A0.s @@ -0,0 +1,97 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240250_9A48A0 +/* 9A48A0 80240250 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9A48A4 80240254 AFB3003C */ sw $s3, 0x3c($sp) +/* 9A48A8 80240258 0080982D */ daddu $s3, $a0, $zero +/* 9A48AC 8024025C AFBF0040 */ sw $ra, 0x40($sp) +/* 9A48B0 80240260 AFB20038 */ sw $s2, 0x38($sp) +/* 9A48B4 80240264 AFB10034 */ sw $s1, 0x34($sp) +/* 9A48B8 80240268 AFB00030 */ sw $s0, 0x30($sp) +/* 9A48BC 8024026C 8E710148 */ lw $s1, 0x148($s3) +/* 9A48C0 80240270 0C00EABB */ jal get_npc_unsafe +/* 9A48C4 80240274 86240008 */ lh $a0, 8($s1) +/* 9A48C8 80240278 0040802D */ daddu $s0, $v0, $zero +/* 9A48CC 8024027C 8E22007C */ lw $v0, 0x7c($s1) +/* 9A48D0 80240280 8603008E */ lh $v1, 0x8e($s0) +/* 9A48D4 80240284 2442FFFF */ addiu $v0, $v0, -1 +/* 9A48D8 80240288 14620012 */ bne $v1, $v0, .L802402D4 +/* 9A48DC 8024028C 00000000 */ nop +/* 9A48E0 80240290 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9A48E4 80240294 4600020D */ trunc.w.s $f8, $f0 +/* 9A48E8 80240298 44024000 */ mfc1 $v0, $f8 +/* 9A48EC 8024029C 00000000 */ nop +/* 9A48F0 802402A0 A6220010 */ sh $v0, 0x10($s1) +/* 9A48F4 802402A4 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9A48F8 802402A8 4600020D */ trunc.w.s $f8, $f0 +/* 9A48FC 802402AC 44024000 */ mfc1 $v0, $f8 +/* 9A4900 802402B0 00000000 */ nop +/* 9A4904 802402B4 A6220012 */ sh $v0, 0x12($s1) +/* 9A4908 802402B8 C6000040 */ lwc1 $f0, 0x40($s0) +/* 9A490C 802402BC 24020001 */ addiu $v0, $zero, 1 +/* 9A4910 802402C0 A2220007 */ sb $v0, 7($s1) +/* 9A4914 802402C4 4600020D */ trunc.w.s $f8, $f0 +/* 9A4918 802402C8 44024000 */ mfc1 $v0, $f8 +/* 9A491C 802402CC 00000000 */ nop +/* 9A4920 802402D0 A6220014 */ sh $v0, 0x14($s1) +.L802402D4: +/* 9A4924 802402D4 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9A4928 802402D8 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9A492C 802402DC C6040040 */ lwc1 $f4, 0x40($s0) +/* 9A4930 802402E0 C6060018 */ lwc1 $f6, 0x18($s0) +/* 9A4934 802402E4 E7A00020 */ swc1 $f0, 0x20($sp) +/* 9A4938 802402E8 E7A20024 */ swc1 $f2, 0x24($sp) +/* 9A493C 802402EC E7A40028 */ swc1 $f4, 0x28($sp) +/* 9A4940 802402F0 E7A60010 */ swc1 $f6, 0x10($sp) +/* 9A4944 802402F4 C600000C */ lwc1 $f0, 0xc($s0) +/* 9A4948 802402F8 E7A00014 */ swc1 $f0, 0x14($sp) +/* 9A494C 802402FC 860200A8 */ lh $v0, 0xa8($s0) +/* 9A4950 80240300 27A50020 */ addiu $a1, $sp, 0x20 +/* 9A4954 80240304 44820000 */ mtc1 $v0, $f0 +/* 9A4958 80240308 00000000 */ nop +/* 9A495C 8024030C 46800020 */ cvt.s.w $f0, $f0 +/* 9A4960 80240310 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9A4964 80240314 860200A6 */ lh $v0, 0xa6($s0) +/* 9A4968 80240318 27A60024 */ addiu $a2, $sp, 0x24 +/* 9A496C 8024031C 44820000 */ mtc1 $v0, $f0 +/* 9A4970 80240320 00000000 */ nop +/* 9A4974 80240324 46800020 */ cvt.s.w $f0, $f0 +/* 9A4978 80240328 E7A0001C */ swc1 $f0, 0x1c($sp) +/* 9A497C 8024032C 8E040080 */ lw $a0, 0x80($s0) +/* 9A4980 80240330 0C037711 */ jal func_800DDC44 +/* 9A4984 80240334 27A70028 */ addiu $a3, $sp, 0x28 +/* 9A4988 80240338 0040902D */ daddu $s2, $v0, $zero +/* 9A498C 8024033C 16400005 */ bnez $s2, .L80240354 +/* 9A4990 80240340 00000000 */ nop +/* 9A4994 80240344 8E050018 */ lw $a1, 0x18($s0) +/* 9A4998 80240348 8E06000C */ lw $a2, 0xc($s0) +/* 9A499C 8024034C 0C00EA95 */ jal npc_move_heading +/* 9A49A0 80240350 0200202D */ daddu $a0, $s0, $zero +.L80240354: +/* 9A49A4 80240354 8602008E */ lh $v0, 0x8e($s0) +/* 9A49A8 80240358 9603008E */ lhu $v1, 0x8e($s0) +/* 9A49AC 8024035C 18400007 */ blez $v0, .L8024037C +/* 9A49B0 80240360 2462FFFF */ addiu $v0, $v1, -1 +/* 9A49B4 80240364 A602008E */ sh $v0, 0x8e($s0) +/* 9A49B8 80240368 00021400 */ sll $v0, $v0, 0x10 +/* 9A49BC 8024036C 18400003 */ blez $v0, .L8024037C +/* 9A49C0 80240370 00000000 */ nop +/* 9A49C4 80240374 12400008 */ beqz $s2, .L80240398 +/* 9A49C8 80240378 00000000 */ nop +.L8024037C: +/* 9A49CC 8024037C 8E2200CC */ lw $v0, 0xcc($s1) +/* 9A49D0 80240380 A2200007 */ sb $zero, 7($s1) +/* 9A49D4 80240384 8C420028 */ lw $v0, 0x28($v0) +/* 9A49D8 80240388 A600008E */ sh $zero, 0x8e($s0) +/* 9A49DC 8024038C AE020028 */ sw $v0, 0x28($s0) +/* 9A49E0 80240390 2402000F */ addiu $v0, $zero, 0xf +/* 9A49E4 80240394 AE620070 */ sw $v0, 0x70($s3) +.L80240398: +/* 9A49E8 80240398 8FBF0040 */ lw $ra, 0x40($sp) +/* 9A49EC 8024039C 8FB3003C */ lw $s3, 0x3c($sp) +/* 9A49F0 802403A0 8FB20038 */ lw $s2, 0x38($sp) +/* 9A49F4 802403A4 8FB10034 */ lw $s1, 0x34($sp) +/* 9A49F8 802403A8 8FB00030 */ lw $s0, 0x30($sp) +/* 9A49FC 802403AC 03E00008 */ jr $ra +/* 9A4A00 802403B0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s index 618c0d1e7a..f3c5f2627c 100644 --- a/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s +++ b/asm/nonmatchings/world/area_trd/trd_03/9A46F0/func_80240434_9A4A84.s @@ -232,25 +232,25 @@ glabel func_80240434_9A4A84 .L80240784: /* 9A4DD4 80240784 0260202D */ daddu $a0, $s3, $zero /* 9A4DD8 80240788 0280282D */ daddu $a1, $s4, $zero -/* 9A4DDC 8024078C 0C090028 */ jal func_802400A0 +/* 9A4DDC 8024078C 0C090028 */ jal func_802400A0_9A46F0 /* 9A4DE0 80240790 02A0302D */ daddu $a2, $s5, $zero /* 9A4DE4 80240794 0260202D */ daddu $a0, $s3, $zero .L80240798: /* 9A4DE8 80240798 0280282D */ daddu $a1, $s4, $zero -/* 9A4DEC 8024079C 0C090047 */ jal func_8024011C +/* 9A4DEC 8024079C 0C090047 */ jal func_8024011C_9A476C /* 9A4DF0 802407A0 02A0302D */ daddu $a2, $s5, $zero /* 9A4DF4 802407A4 080901F8 */ j .L802407E0 /* 9A4DF8 802407A8 00000000 */ nop .L802407AC: /* 9A4DFC 802407AC 0260202D */ daddu $a0, $s3, $zero /* 9A4E00 802407B0 0280282D */ daddu $a1, $s4, $zero -/* 9A4E04 802407B4 0C090094 */ jal func_80240250 +/* 9A4E04 802407B4 0C090094 */ jal func_80240250_9A48A0 /* 9A4E08 802407B8 02A0302D */ daddu $a2, $s5, $zero /* 9A4E0C 802407BC 080901F8 */ j .L802407E0 /* 9A4E10 802407C0 00000000 */ nop .L802407C4: /* 9A4E14 802407C4 0280282D */ daddu $a1, $s4, $zero -/* 9A4E18 802407C8 0C0900ED */ jal func_802403B4 +/* 9A4E18 802407C8 0C0900ED */ jal func_802403B4_9A4A04 /* 9A4E1C 802407CC 02A0302D */ daddu $a2, $s5, $zero /* 9A4E20 802407D0 080901F8 */ j .L802407E0 /* 9A4E24 802407D4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408.s b/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408.s deleted file mode 100644 index 190f0e9e21..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240408 -/* 9A87F8 80240408 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A87FC 8024040C AFB20018 */ sw $s2, 0x18($sp) -/* 9A8800 80240410 0080902D */ daddu $s2, $a0, $zero -/* 9A8804 80240414 AFBF001C */ sw $ra, 0x1c($sp) -/* 9A8808 80240418 AFB10014 */ sw $s1, 0x14($sp) -/* 9A880C 8024041C AFB00010 */ sw $s0, 0x10($sp) -/* 9A8810 80240420 8E50000C */ lw $s0, 0xc($s2) -/* 9A8814 80240424 8E050000 */ lw $a1, ($s0) -/* 9A8818 80240428 0C0B1EAF */ jal get_variable -/* 9A881C 8024042C 26100004 */ addiu $s0, $s0, 4 -/* 9A8820 80240430 0C04417A */ jal get_entity_by_index -/* 9A8824 80240434 0040202D */ daddu $a0, $v0, $zero -/* 9A8828 80240438 8E050000 */ lw $a1, ($s0) -/* 9A882C 8024043C 26100004 */ addiu $s0, $s0, 4 -/* 9A8830 80240440 0040882D */ daddu $s1, $v0, $zero -/* 9A8834 80240444 C6200048 */ lwc1 $f0, 0x48($s1) -/* 9A8838 80240448 4600008D */ trunc.w.s $f2, $f0 -/* 9A883C 8024044C 44061000 */ mfc1 $a2, $f2 -/* 9A8840 80240450 0C0B2026 */ jal set_variable -/* 9A8844 80240454 0240202D */ daddu $a0, $s2, $zero -/* 9A8848 80240458 8E050000 */ lw $a1, ($s0) -/* 9A884C 8024045C 26100004 */ addiu $s0, $s0, 4 -/* 9A8850 80240460 C620004C */ lwc1 $f0, 0x4c($s1) -/* 9A8854 80240464 4600008D */ trunc.w.s $f2, $f0 -/* 9A8858 80240468 44061000 */ mfc1 $a2, $f2 -/* 9A885C 8024046C 0C0B2026 */ jal set_variable -/* 9A8860 80240470 0240202D */ daddu $a0, $s2, $zero -/* 9A8864 80240474 C6200050 */ lwc1 $f0, 0x50($s1) -/* 9A8868 80240478 8E050000 */ lw $a1, ($s0) -/* 9A886C 8024047C 4600008D */ trunc.w.s $f2, $f0 -/* 9A8870 80240480 44061000 */ mfc1 $a2, $f2 -/* 9A8874 80240484 0C0B2026 */ jal set_variable -/* 9A8878 80240488 0240202D */ daddu $a0, $s2, $zero -/* 9A887C 8024048C 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A8880 80240490 8FB20018 */ lw $s2, 0x18($sp) -/* 9A8884 80240494 8FB10014 */ lw $s1, 0x14($sp) -/* 9A8888 80240498 8FB00010 */ lw $s0, 0x10($sp) -/* 9A888C 8024049C 24020002 */ addiu $v0, $zero, 2 -/* 9A8890 802404A0 03E00008 */ jr $ra -/* 9A8894 802404A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 9A8898 802404A8 00000000 */ nop -/* 9A889C 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408_9A87F8.s b/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408_9A87F8.s new file mode 100644 index 0000000000..de8ba5582a --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A8700/func_80240408_9A87F8.s @@ -0,0 +1,46 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240408_9A87F8 +/* 9A87F8 80240408 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A87FC 8024040C AFB20018 */ sw $s2, 0x18($sp) +/* 9A8800 80240410 0080902D */ daddu $s2, $a0, $zero +/* 9A8804 80240414 AFBF001C */ sw $ra, 0x1c($sp) +/* 9A8808 80240418 AFB10014 */ sw $s1, 0x14($sp) +/* 9A880C 8024041C AFB00010 */ sw $s0, 0x10($sp) +/* 9A8810 80240420 8E50000C */ lw $s0, 0xc($s2) +/* 9A8814 80240424 8E050000 */ lw $a1, ($s0) +/* 9A8818 80240428 0C0B1EAF */ jal get_variable +/* 9A881C 8024042C 26100004 */ addiu $s0, $s0, 4 +/* 9A8820 80240430 0C04417A */ jal get_entity_by_index +/* 9A8824 80240434 0040202D */ daddu $a0, $v0, $zero +/* 9A8828 80240438 8E050000 */ lw $a1, ($s0) +/* 9A882C 8024043C 26100004 */ addiu $s0, $s0, 4 +/* 9A8830 80240440 0040882D */ daddu $s1, $v0, $zero +/* 9A8834 80240444 C6200048 */ lwc1 $f0, 0x48($s1) +/* 9A8838 80240448 4600008D */ trunc.w.s $f2, $f0 +/* 9A883C 8024044C 44061000 */ mfc1 $a2, $f2 +/* 9A8840 80240450 0C0B2026 */ jal set_variable +/* 9A8844 80240454 0240202D */ daddu $a0, $s2, $zero +/* 9A8848 80240458 8E050000 */ lw $a1, ($s0) +/* 9A884C 8024045C 26100004 */ addiu $s0, $s0, 4 +/* 9A8850 80240460 C620004C */ lwc1 $f0, 0x4c($s1) +/* 9A8854 80240464 4600008D */ trunc.w.s $f2, $f0 +/* 9A8858 80240468 44061000 */ mfc1 $a2, $f2 +/* 9A885C 8024046C 0C0B2026 */ jal set_variable +/* 9A8860 80240470 0240202D */ daddu $a0, $s2, $zero +/* 9A8864 80240474 C6200050 */ lwc1 $f0, 0x50($s1) +/* 9A8868 80240478 8E050000 */ lw $a1, ($s0) +/* 9A886C 8024047C 4600008D */ trunc.w.s $f2, $f0 +/* 9A8870 80240480 44061000 */ mfc1 $a2, $f2 +/* 9A8874 80240484 0C0B2026 */ jal set_variable +/* 9A8878 80240488 0240202D */ daddu $a0, $s2, $zero +/* 9A887C 8024048C 8FBF001C */ lw $ra, 0x1c($sp) +/* 9A8880 80240490 8FB20018 */ lw $s2, 0x18($sp) +/* 9A8884 80240494 8FB10014 */ lw $s1, 0x14($sp) +/* 9A8888 80240498 8FB00010 */ lw $s0, 0x10($sp) +/* 9A888C 8024049C 24020002 */ addiu $v0, $zero, 2 +/* 9A8890 802404A0 03E00008 */ jr $ra +/* 9A8894 802404A4 27BD0020 */ addiu $sp, $sp, 0x20 +/* 9A8898 802404A8 00000000 */ nop +/* 9A889C 802404AC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C.s deleted file mode 100644 index cd844eba34..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024052C -/* 9A891C 8024052C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A8920 80240530 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A8924 80240534 0080982D */ daddu $s3, $a0, $zero -/* 9A8928 80240538 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A892C 8024053C AFB20018 */ sw $s2, 0x18($sp) -/* 9A8930 80240540 AFB10014 */ sw $s1, 0x14($sp) -/* 9A8934 80240544 AFB00010 */ sw $s0, 0x10($sp) -/* 9A8938 80240548 8E710148 */ lw $s1, 0x148($s3) -/* 9A893C 8024054C 86240008 */ lh $a0, 8($s1) -/* 9A8940 80240550 0C00EABB */ jal get_npc_unsafe -/* 9A8944 80240554 00A0902D */ daddu $s2, $a1, $zero -/* 9A8948 80240558 0040802D */ daddu $s0, $v0, $zero -/* 9A894C 8024055C 8602008E */ lh $v0, 0x8e($s0) -/* 9A8950 80240560 9603008E */ lhu $v1, 0x8e($s0) -/* 9A8954 80240564 18400005 */ blez $v0, .L8024057C -/* 9A8958 80240568 2462FFFF */ addiu $v0, $v1, -1 -/* 9A895C 8024056C A602008E */ sh $v0, 0x8e($s0) -/* 9A8960 80240570 00021400 */ sll $v0, $v0, 0x10 -/* 9A8964 80240574 1C400033 */ bgtz $v0, .L80240644 -/* 9A8968 80240578 00000000 */ nop -.L8024057C: -/* 9A896C 8024057C 8602008C */ lh $v0, 0x8c($s0) -/* 9A8970 80240580 14400030 */ bnez $v0, .L80240644 -/* 9A8974 80240584 00000000 */ nop -/* 9A8978 80240588 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A897C 8024058C 8C420024 */ lw $v0, 0x24($v0) -/* 9A8980 80240590 AE020028 */ sw $v0, 0x28($s0) -/* 9A8984 80240594 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9A8988 80240598 E6000018 */ swc1 $f0, 0x18($s0) -/* 9A898C 8024059C 8E230088 */ lw $v1, 0x88($s1) -/* 9A8990 802405A0 24020005 */ addiu $v0, $zero, 5 -/* 9A8994 802405A4 10620005 */ beq $v1, $v0, .L802405BC -/* 9A8998 802405A8 00000000 */ nop -/* 9A899C 802405AC 10600003 */ beqz $v1, .L802405BC -/* 9A89A0 802405B0 24020001 */ addiu $v0, $zero, 1 -/* 9A89A4 802405B4 14620006 */ bne $v1, $v0, .L802405D0 -/* 9A89A8 802405B8 00000000 */ nop -.L802405BC: -/* 9A89AC 802405BC 8E220084 */ lw $v0, 0x84($s1) -/* 9A89B0 802405C0 00021FC2 */ srl $v1, $v0, 0x1f -/* 9A89B4 802405C4 00431021 */ addu $v0, $v0, $v1 -/* 9A89B8 802405C8 00021043 */ sra $v0, $v0, 1 -/* 9A89BC 802405CC A60200A8 */ sh $v0, 0xa8($s0) -.L802405D0: -/* 9A89C0 802405D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A89C4 802405D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A89C8 802405D8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A89CC 802405DC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A89D0 802405E0 8C460028 */ lw $a2, 0x28($v0) -/* 9A89D4 802405E4 0C00A7B5 */ jal dist2D -/* 9A89D8 802405E8 8C470030 */ lw $a3, 0x30($v0) -/* 9A89DC 802405EC C6020018 */ lwc1 $f2, 0x18($s0) -/* 9A89E0 802405F0 46020003 */ div.s $f0, $f0, $f2 -/* 9A89E4 802405F4 3C018024 */ lui $at, 0x8024 -/* 9A89E8 802405F8 D4225EE0 */ ldc1 $f2, 0x5ee0($at) -/* 9A89EC 802405FC 46000021 */ cvt.d.s $f0, $f0 -/* 9A89F0 80240600 46220000 */ add.d $f0, $f0, $f2 -/* 9A89F4 80240604 4620010D */ trunc.w.d $f4, $f0 -/* 9A89F8 80240608 44022000 */ mfc1 $v0, $f4 -/* 9A89FC 8024060C 00000000 */ nop -/* 9A8A00 80240610 A602008E */ sh $v0, 0x8e($s0) -/* 9A8A04 80240614 00021400 */ sll $v0, $v0, 0x10 -/* 9A8A08 80240618 8E230078 */ lw $v1, 0x78($s1) -/* 9A8A0C 8024061C 00021403 */ sra $v0, $v0, 0x10 -/* 9A8A10 80240620 0043102A */ slt $v0, $v0, $v1 -/* 9A8A14 80240624 10400003 */ beqz $v0, .L80240634 -/* 9A8A18 80240628 00000000 */ nop -/* 9A8A1C 8024062C 9622007A */ lhu $v0, 0x7a($s1) -/* 9A8A20 80240630 A602008E */ sh $v0, 0x8e($s0) -.L80240634: -/* 9A8A24 80240634 8602008E */ lh $v0, 0x8e($s0) -/* 9A8A28 80240638 AE22007C */ sw $v0, 0x7c($s1) -/* 9A8A2C 8024063C 2402000E */ addiu $v0, $zero, 0xe -/* 9A8A30 80240640 AE620070 */ sw $v0, 0x70($s3) -.L80240644: -/* 9A8A34 80240644 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A8A38 80240648 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A8A3C 8024064C 8FB20018 */ lw $s2, 0x18($sp) -/* 9A8A40 80240650 8FB10014 */ lw $s1, 0x14($sp) -/* 9A8A44 80240654 8FB00010 */ lw $s0, 0x10($sp) -/* 9A8A48 80240658 03E00008 */ jr $ra -/* 9A8A4C 8024065C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s new file mode 100644 index 0000000000..eb42d0f4ab --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024052C_9A891C.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024052C_9A891C +/* 9A891C 8024052C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9A8920 80240530 AFB3001C */ sw $s3, 0x1c($sp) +/* 9A8924 80240534 0080982D */ daddu $s3, $a0, $zero +/* 9A8928 80240538 AFBF0020 */ sw $ra, 0x20($sp) +/* 9A892C 8024053C AFB20018 */ sw $s2, 0x18($sp) +/* 9A8930 80240540 AFB10014 */ sw $s1, 0x14($sp) +/* 9A8934 80240544 AFB00010 */ sw $s0, 0x10($sp) +/* 9A8938 80240548 8E710148 */ lw $s1, 0x148($s3) +/* 9A893C 8024054C 86240008 */ lh $a0, 8($s1) +/* 9A8940 80240550 0C00EABB */ jal get_npc_unsafe +/* 9A8944 80240554 00A0902D */ daddu $s2, $a1, $zero +/* 9A8948 80240558 0040802D */ daddu $s0, $v0, $zero +/* 9A894C 8024055C 8602008E */ lh $v0, 0x8e($s0) +/* 9A8950 80240560 9603008E */ lhu $v1, 0x8e($s0) +/* 9A8954 80240564 18400005 */ blez $v0, .L8024057C +/* 9A8958 80240568 2462FFFF */ addiu $v0, $v1, -1 +/* 9A895C 8024056C A602008E */ sh $v0, 0x8e($s0) +/* 9A8960 80240570 00021400 */ sll $v0, $v0, 0x10 +/* 9A8964 80240574 1C400033 */ bgtz $v0, .L80240644 +/* 9A8968 80240578 00000000 */ nop +.L8024057C: +/* 9A896C 8024057C 8602008C */ lh $v0, 0x8c($s0) +/* 9A8970 80240580 14400030 */ bnez $v0, .L80240644 +/* 9A8974 80240584 00000000 */ nop +/* 9A8978 80240588 8E2200CC */ lw $v0, 0xcc($s1) +/* 9A897C 8024058C 8C420024 */ lw $v0, 0x24($v0) +/* 9A8980 80240590 AE020028 */ sw $v0, 0x28($s0) +/* 9A8984 80240594 C6400018 */ lwc1 $f0, 0x18($s2) +/* 9A8988 80240598 E6000018 */ swc1 $f0, 0x18($s0) +/* 9A898C 8024059C 8E230088 */ lw $v1, 0x88($s1) +/* 9A8990 802405A0 24020005 */ addiu $v0, $zero, 5 +/* 9A8994 802405A4 10620005 */ beq $v1, $v0, .L802405BC +/* 9A8998 802405A8 00000000 */ nop +/* 9A899C 802405AC 10600003 */ beqz $v1, .L802405BC +/* 9A89A0 802405B0 24020001 */ addiu $v0, $zero, 1 +/* 9A89A4 802405B4 14620006 */ bne $v1, $v0, .L802405D0 +/* 9A89A8 802405B8 00000000 */ nop +.L802405BC: +/* 9A89AC 802405BC 8E220084 */ lw $v0, 0x84($s1) +/* 9A89B0 802405C0 00021FC2 */ srl $v1, $v0, 0x1f +/* 9A89B4 802405C4 00431021 */ addu $v0, $v0, $v1 +/* 9A89B8 802405C8 00021043 */ sra $v0, $v0, 1 +/* 9A89BC 802405CC A60200A8 */ sh $v0, 0xa8($s0) +.L802405D0: +/* 9A89C0 802405D0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9A89C4 802405D4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9A89C8 802405D8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9A89CC 802405DC C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9A89D0 802405E0 8C460028 */ lw $a2, 0x28($v0) +/* 9A89D4 802405E4 0C00A7B5 */ jal dist2D +/* 9A89D8 802405E8 8C470030 */ lw $a3, 0x30($v0) +/* 9A89DC 802405EC C6020018 */ lwc1 $f2, 0x18($s0) +/* 9A89E0 802405F0 46020003 */ div.s $f0, $f0, $f2 +/* 9A89E4 802405F4 3C018024 */ lui $at, 0x8024 +/* 9A89E8 802405F8 D4225EE0 */ ldc1 $f2, 0x5ee0($at) +/* 9A89EC 802405FC 46000021 */ cvt.d.s $f0, $f0 +/* 9A89F0 80240600 46220000 */ add.d $f0, $f0, $f2 +/* 9A89F4 80240604 4620010D */ trunc.w.d $f4, $f0 +/* 9A89F8 80240608 44022000 */ mfc1 $v0, $f4 +/* 9A89FC 8024060C 00000000 */ nop +/* 9A8A00 80240610 A602008E */ sh $v0, 0x8e($s0) +/* 9A8A04 80240614 00021400 */ sll $v0, $v0, 0x10 +/* 9A8A08 80240618 8E230078 */ lw $v1, 0x78($s1) +/* 9A8A0C 8024061C 00021403 */ sra $v0, $v0, 0x10 +/* 9A8A10 80240620 0043102A */ slt $v0, $v0, $v1 +/* 9A8A14 80240624 10400003 */ beqz $v0, .L80240634 +/* 9A8A18 80240628 00000000 */ nop +/* 9A8A1C 8024062C 9622007A */ lhu $v0, 0x7a($s1) +/* 9A8A20 80240630 A602008E */ sh $v0, 0x8e($s0) +.L80240634: +/* 9A8A24 80240634 8602008E */ lh $v0, 0x8e($s0) +/* 9A8A28 80240638 AE22007C */ sw $v0, 0x7c($s1) +/* 9A8A2C 8024063C 2402000E */ addiu $v0, $zero, 0xe +/* 9A8A30 80240640 AE620070 */ sw $v0, 0x70($s3) +.L80240644: +/* 9A8A34 80240644 8FBF0020 */ lw $ra, 0x20($sp) +/* 9A8A38 80240648 8FB3001C */ lw $s3, 0x1c($sp) +/* 9A8A3C 8024064C 8FB20018 */ lw $s2, 0x18($sp) +/* 9A8A40 80240650 8FB10014 */ lw $s1, 0x14($sp) +/* 9A8A44 80240654 8FB00010 */ lw $s0, 0x10($sp) +/* 9A8A48 80240658 03E00008 */ jr $ra +/* 9A8A4C 8024065C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802407C4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802407C4.s deleted file mode 100644 index f1674766bd..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802407C4.s +++ /dev/null @@ -1,38 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802407C4 -/* 9A8BB4 802407C4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A8BB8 802407C8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A8BBC 802407CC 0080882D */ daddu $s1, $a0, $zero -/* 9A8BC0 802407D0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9A8BC4 802407D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9A8BC8 802407D8 8E300148 */ lw $s0, 0x148($s1) -/* 9A8BCC 802407DC 0C00EABB */ jal get_npc_unsafe -/* 9A8BD0 802407E0 86040008 */ lh $a0, 8($s0) -/* 9A8BD4 802407E4 0040202D */ daddu $a0, $v0, $zero -/* 9A8BD8 802407E8 9482008E */ lhu $v0, 0x8e($a0) -/* 9A8BDC 802407EC 24030003 */ addiu $v1, $zero, 3 -/* 9A8BE0 802407F0 24420001 */ addiu $v0, $v0, 1 -/* 9A8BE4 802407F4 A482008E */ sh $v0, 0x8e($a0) -/* 9A8BE8 802407F8 00021400 */ sll $v0, $v0, 0x10 -/* 9A8BEC 802407FC 00021403 */ sra $v0, $v0, 0x10 -/* 9A8BF0 80240800 14430003 */ bne $v0, $v1, .L80240810 -/* 9A8BF4 80240804 00000000 */ nop -/* 9A8BF8 80240808 96020086 */ lhu $v0, 0x86($s0) -/* 9A8BFC 8024080C A48200A8 */ sh $v0, 0xa8($a0) -.L80240810: -/* 9A8C00 80240810 8482008E */ lh $v0, 0x8e($a0) -/* 9A8C04 80240814 8E030080 */ lw $v1, 0x80($s0) -/* 9A8C08 80240818 0043102A */ slt $v0, $v0, $v1 -/* 9A8C0C 8024081C 14400004 */ bnez $v0, .L80240830 -/* 9A8C10 80240820 00000000 */ nop -/* 9A8C14 80240824 96020086 */ lhu $v0, 0x86($s0) -/* 9A8C18 80240828 A48200A8 */ sh $v0, 0xa8($a0) -/* 9A8C1C 8024082C AE200070 */ sw $zero, 0x70($s1) -.L80240830: -/* 9A8C20 80240830 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A8C24 80240834 8FB10014 */ lw $s1, 0x14($sp) -/* 9A8C28 80240838 8FB00010 */ lw $s0, 0x10($sp) -/* 9A8C2C 8024083C 03E00008 */ jr $ra -/* 9A8C30 80240840 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802407C4_9A8BB4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802407C4_9A8BB4.s new file mode 100644 index 0000000000..df88e185bf --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802407C4_9A8BB4.s @@ -0,0 +1,38 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802407C4_9A8BB4 +/* 9A8BB4 802407C4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A8BB8 802407C8 AFB10014 */ sw $s1, 0x14($sp) +/* 9A8BBC 802407CC 0080882D */ daddu $s1, $a0, $zero +/* 9A8BC0 802407D0 AFBF0018 */ sw $ra, 0x18($sp) +/* 9A8BC4 802407D4 AFB00010 */ sw $s0, 0x10($sp) +/* 9A8BC8 802407D8 8E300148 */ lw $s0, 0x148($s1) +/* 9A8BCC 802407DC 0C00EABB */ jal get_npc_unsafe +/* 9A8BD0 802407E0 86040008 */ lh $a0, 8($s0) +/* 9A8BD4 802407E4 0040202D */ daddu $a0, $v0, $zero +/* 9A8BD8 802407E8 9482008E */ lhu $v0, 0x8e($a0) +/* 9A8BDC 802407EC 24030003 */ addiu $v1, $zero, 3 +/* 9A8BE0 802407F0 24420001 */ addiu $v0, $v0, 1 +/* 9A8BE4 802407F4 A482008E */ sh $v0, 0x8e($a0) +/* 9A8BE8 802407F8 00021400 */ sll $v0, $v0, 0x10 +/* 9A8BEC 802407FC 00021403 */ sra $v0, $v0, 0x10 +/* 9A8BF0 80240800 14430003 */ bne $v0, $v1, .L80240810 +/* 9A8BF4 80240804 00000000 */ nop +/* 9A8BF8 80240808 96020086 */ lhu $v0, 0x86($s0) +/* 9A8BFC 8024080C A48200A8 */ sh $v0, 0xa8($a0) +.L80240810: +/* 9A8C00 80240810 8482008E */ lh $v0, 0x8e($a0) +/* 9A8C04 80240814 8E030080 */ lw $v1, 0x80($s0) +/* 9A8C08 80240818 0043102A */ slt $v0, $v0, $v1 +/* 9A8C0C 8024081C 14400004 */ bnez $v0, .L80240830 +/* 9A8C10 80240820 00000000 */ nop +/* 9A8C14 80240824 96020086 */ lhu $v0, 0x86($s0) +/* 9A8C18 80240828 A48200A8 */ sh $v0, 0xa8($a0) +/* 9A8C1C 8024082C AE200070 */ sw $zero, 0x70($s1) +.L80240830: +/* 9A8C20 80240830 8FBF0018 */ lw $ra, 0x18($sp) +/* 9A8C24 80240834 8FB10014 */ lw $s1, 0x14($sp) +/* 9A8C28 80240838 8FB00010 */ lw $s0, 0x10($sp) +/* 9A8C2C 8024083C 03E00008 */ jr $ra +/* 9A8C30 80240840 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844.s deleted file mode 100644 index afab2c9908..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240844 -/* 9A8C34 80240844 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9A8C38 80240848 AFB3005C */ sw $s3, 0x5c($sp) -/* 9A8C3C 8024084C 0080982D */ daddu $s3, $a0, $zero -/* 9A8C40 80240850 AFBF0068 */ sw $ra, 0x68($sp) -/* 9A8C44 80240854 AFB50064 */ sw $s5, 0x64($sp) -/* 9A8C48 80240858 AFB40060 */ sw $s4, 0x60($sp) -/* 9A8C4C 8024085C AFB20058 */ sw $s2, 0x58($sp) -/* 9A8C50 80240860 AFB10054 */ sw $s1, 0x54($sp) -/* 9A8C54 80240864 AFB00050 */ sw $s0, 0x50($sp) -/* 9A8C58 80240868 8E710148 */ lw $s1, 0x148($s3) -/* 9A8C5C 8024086C 86240008 */ lh $a0, 8($s1) -/* 9A8C60 80240870 0C00EABB */ jal get_npc_unsafe -/* 9A8C64 80240874 00A0802D */ daddu $s0, $a1, $zero -/* 9A8C68 80240878 8E63000C */ lw $v1, 0xc($s3) -/* 9A8C6C 8024087C 0260202D */ daddu $a0, $s3, $zero -/* 9A8C70 80240880 8C650000 */ lw $a1, ($v1) -/* 9A8C74 80240884 0C0B1EAF */ jal get_variable -/* 9A8C78 80240888 0040902D */ daddu $s2, $v0, $zero -/* 9A8C7C 8024088C AFA00028 */ sw $zero, 0x28($sp) -/* 9A8C80 80240890 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8C84 80240894 8C630030 */ lw $v1, 0x30($v1) -/* 9A8C88 80240898 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A8C8C 8024089C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8C90 802408A0 8C63001C */ lw $v1, 0x1c($v1) -/* 9A8C94 802408A4 AFA30030 */ sw $v1, 0x30($sp) -/* 9A8C98 802408A8 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8C9C 802408AC 8C630024 */ lw $v1, 0x24($v1) -/* 9A8CA0 802408B0 AFA30034 */ sw $v1, 0x34($sp) -/* 9A8CA4 802408B4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8CA8 802408B8 8C630028 */ lw $v1, 0x28($v1) -/* 9A8CAC 802408BC 27B50028 */ addiu $s5, $sp, 0x28 -/* 9A8CB0 802408C0 AFA30038 */ sw $v1, 0x38($sp) -/* 9A8CB4 802408C4 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A8CB8 802408C8 3C0142C8 */ lui $at, 0x42c8 -/* 9A8CBC 802408CC 44810000 */ mtc1 $at, $f0 -/* 9A8CC0 802408D0 8C63002C */ lw $v1, 0x2c($v1) -/* 9A8CC4 802408D4 0040A02D */ daddu $s4, $v0, $zero -/* 9A8CC8 802408D8 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9A8CCC 802408DC A7A00044 */ sh $zero, 0x44($sp) -/* 9A8CD0 802408E0 12000009 */ beqz $s0, .L80240908 -/* 9A8CD4 802408E4 AFA3003C */ sw $v1, 0x3c($sp) -/* 9A8CD8 802408E8 864300A8 */ lh $v1, 0xa8($s2) -/* 9A8CDC 802408EC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A8CE0 802408F0 AE20008C */ sw $zero, 0x8c($s1) -/* 9A8CE4 802408F4 A22000B5 */ sb $zero, 0xb5($s1) -/* 9A8CE8 802408F8 34420008 */ ori $v0, $v0, 8 -/* 9A8CEC 802408FC AE230084 */ sw $v1, 0x84($s1) -/* 9A8CF0 80240900 08090246 */ j .L80240918 -/* 9A8CF4 80240904 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240908: -/* 9A8CF8 80240908 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A8CFC 8024090C 30420004 */ andi $v0, $v0, 4 -/* 9A8D00 80240910 10400047 */ beqz $v0, .L80240A30 -/* 9A8D04 80240914 00000000 */ nop -.L80240918: -/* 9A8D08 80240918 AE600070 */ sw $zero, 0x70($s3) -/* 9A8D0C 8024091C A640008E */ sh $zero, 0x8e($s2) -/* 9A8D10 80240920 8E2300CC */ lw $v1, 0xcc($s1) -/* 9A8D14 80240924 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A8D18 80240928 A2200007 */ sb $zero, 7($s1) -/* 9A8D1C 8024092C 8E420000 */ lw $v0, ($s2) -/* 9A8D20 80240930 8C630000 */ lw $v1, ($v1) -/* 9A8D24 80240934 00441024 */ and $v0, $v0, $a0 -/* 9A8D28 80240938 AE420000 */ sw $v0, ($s2) -/* 9A8D2C 8024093C AE430028 */ sw $v1, 0x28($s2) -/* 9A8D30 80240940 96220086 */ lhu $v0, 0x86($s1) -/* 9A8D34 80240944 A64200A8 */ sh $v0, 0xa8($s2) -/* 9A8D38 80240948 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A8D3C 8024094C AE200090 */ sw $zero, 0x90($s1) -/* 9A8D40 80240950 8C420034 */ lw $v0, 0x34($v0) -/* 9A8D44 80240954 14400006 */ bnez $v0, .L80240970 -/* 9A8D48 80240958 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9A8D4C 8024095C 8E420000 */ lw $v0, ($s2) -/* 9A8D50 80240960 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A8D54 80240964 34420200 */ ori $v0, $v0, 0x200 -/* 9A8D58 80240968 0809025F */ j .L8024097C -/* 9A8D5C 8024096C 00431024 */ and $v0, $v0, $v1 -.L80240970: -/* 9A8D60 80240970 8E420000 */ lw $v0, ($s2) -/* 9A8D64 80240974 00431024 */ and $v0, $v0, $v1 -/* 9A8D68 80240978 34420008 */ ori $v0, $v0, 8 -.L8024097C: -/* 9A8D6C 8024097C AE420000 */ sw $v0, ($s2) -/* 9A8D70 80240980 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A8D74 80240984 30420004 */ andi $v0, $v0, 4 -/* 9A8D78 80240988 1040001E */ beqz $v0, .L80240A04 -/* 9A8D7C 8024098C 24040002 */ addiu $a0, $zero, 2 -/* 9A8D80 80240990 0240282D */ daddu $a1, $s2, $zero -/* 9A8D84 80240994 0000302D */ daddu $a2, $zero, $zero -/* 9A8D88 80240998 24020063 */ addiu $v0, $zero, 0x63 -/* 9A8D8C 8024099C AE620070 */ sw $v0, 0x70($s3) -/* 9A8D90 802409A0 AE600074 */ sw $zero, 0x74($s3) -/* 9A8D94 802409A4 864300A8 */ lh $v1, 0xa8($s2) -/* 9A8D98 802409A8 3C013F80 */ lui $at, 0x3f80 -/* 9A8D9C 802409AC 44810000 */ mtc1 $at, $f0 -/* 9A8DA0 802409B0 3C014000 */ lui $at, 0x4000 -/* 9A8DA4 802409B4 44811000 */ mtc1 $at, $f2 -/* 9A8DA8 802409B8 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A8DAC 802409BC 44812000 */ mtc1 $at, $f4 -/* 9A8DB0 802409C0 24020028 */ addiu $v0, $zero, 0x28 -/* 9A8DB4 802409C4 AFA2001C */ sw $v0, 0x1c($sp) -/* 9A8DB8 802409C8 44833000 */ mtc1 $v1, $f6 -/* 9A8DBC 802409CC 00000000 */ nop -/* 9A8DC0 802409D0 468031A0 */ cvt.s.w $f6, $f6 -/* 9A8DC4 802409D4 44073000 */ mfc1 $a3, $f6 -/* 9A8DC8 802409D8 27A20048 */ addiu $v0, $sp, 0x48 -/* 9A8DCC 802409DC AFA20020 */ sw $v0, 0x20($sp) -/* 9A8DD0 802409E0 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A8DD4 802409E4 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A8DD8 802409E8 0C01BFA4 */ jal fx_emote -/* 9A8DDC 802409EC E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A8DE0 802409F0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A8DE4 802409F4 2403FFFB */ addiu $v1, $zero, -5 -/* 9A8DE8 802409F8 00431024 */ and $v0, $v0, $v1 -/* 9A8DEC 802409FC 0809028C */ j .L80240A30 -/* 9A8DF0 80240A00 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240A04: -/* 9A8DF4 80240A04 8E220000 */ lw $v0, ($s1) -/* 9A8DF8 80240A08 3C034000 */ lui $v1, 0x4000 -/* 9A8DFC 80240A0C 00431024 */ and $v0, $v0, $v1 -/* 9A8E00 80240A10 10400007 */ beqz $v0, .L80240A30 -/* 9A8E04 80240A14 3C03BFFF */ lui $v1, 0xbfff -/* 9A8E08 80240A18 2402000C */ addiu $v0, $zero, 0xc -/* 9A8E0C 80240A1C AE620070 */ sw $v0, 0x70($s3) -/* 9A8E10 80240A20 8E220000 */ lw $v0, ($s1) -/* 9A8E14 80240A24 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A8E18 80240A28 00431024 */ and $v0, $v0, $v1 -/* 9A8E1C 80240A2C AE220000 */ sw $v0, ($s1) -.L80240A30: -/* 9A8E20 80240A30 8E220090 */ lw $v0, 0x90($s1) -/* 9A8E24 80240A34 1840000C */ blez $v0, .L80240A68 -/* 9A8E28 80240A38 2442FFFF */ addiu $v0, $v0, -1 -/* 9A8E2C 80240A3C 14400087 */ bnez $v0, .L80240C5C -/* 9A8E30 80240A40 AE220090 */ sw $v0, 0x90($s1) -/* 9A8E34 80240A44 3C03FFAA */ lui $v1, 0xffaa -/* 9A8E38 80240A48 8E420028 */ lw $v0, 0x28($s2) -/* 9A8E3C 80240A4C 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9A8E40 80240A50 00431021 */ addu $v0, $v0, $v1 -/* 9A8E44 80240A54 2C420002 */ sltiu $v0, $v0, 2 -/* 9A8E48 80240A58 10400003 */ beqz $v0, .L80240A68 -/* 9A8E4C 80240A5C 3C020055 */ lui $v0, 0x55 -/* 9A8E50 80240A60 3442000C */ ori $v0, $v0, 0xc -/* 9A8E54 80240A64 AE420028 */ sw $v0, 0x28($s2) -.L80240A68: -/* 9A8E58 80240A68 8E630070 */ lw $v1, 0x70($s3) -/* 9A8E5C 80240A6C 2402000C */ addiu $v0, $zero, 0xc -/* 9A8E60 80240A70 10620048 */ beq $v1, $v0, .L80240B94 -/* 9A8E64 80240A74 2862000D */ slti $v0, $v1, 0xd -/* 9A8E68 80240A78 1040000F */ beqz $v0, .L80240AB8 -/* 9A8E6C 80240A7C 24100001 */ addiu $s0, $zero, 1 -/* 9A8E70 80240A80 1070001E */ beq $v1, $s0, .L80240AFC -/* 9A8E74 80240A84 28620002 */ slti $v0, $v1, 2 -/* 9A8E78 80240A88 10400005 */ beqz $v0, .L80240AA0 -/* 9A8E7C 80240A8C 24020002 */ addiu $v0, $zero, 2 -/* 9A8E80 80240A90 10600015 */ beqz $v1, .L80240AE8 -/* 9A8E84 80240A94 0260202D */ daddu $a0, $s3, $zero -/* 9A8E88 80240A98 080902FC */ j .L80240BF0 -/* 9A8E8C 80240A9C 00000000 */ nop -.L80240AA0: -/* 9A8E90 80240AA0 1062001C */ beq $v1, $v0, .L80240B14 -/* 9A8E94 80240AA4 24020003 */ addiu $v0, $zero, 3 -/* 9A8E98 80240AA8 10620035 */ beq $v1, $v0, .L80240B80 -/* 9A8E9C 80240AAC 0260202D */ daddu $a0, $s3, $zero -/* 9A8EA0 80240AB0 080902FC */ j .L80240BF0 -/* 9A8EA4 80240AB4 00000000 */ nop -.L80240AB8: -/* 9A8EA8 80240AB8 2402000E */ addiu $v0, $zero, 0xe -/* 9A8EAC 80240ABC 1062003F */ beq $v1, $v0, .L80240BBC -/* 9A8EB0 80240AC0 0062102A */ slt $v0, $v1, $v0 -/* 9A8EB4 80240AC4 14400038 */ bnez $v0, .L80240BA8 -/* 9A8EB8 80240AC8 0260202D */ daddu $a0, $s3, $zero -/* 9A8EBC 80240ACC 2402000F */ addiu $v0, $zero, 0xf -/* 9A8EC0 80240AD0 10620040 */ beq $v1, $v0, .L80240BD4 -/* 9A8EC4 80240AD4 24020063 */ addiu $v0, $zero, 0x63 -/* 9A8EC8 80240AD8 10620043 */ beq $v1, $v0, .L80240BE8 -/* 9A8ECC 80240ADC 00000000 */ nop -/* 9A8ED0 80240AE0 080902FC */ j .L80240BF0 -/* 9A8ED4 80240AE4 00000000 */ nop -.L80240AE8: -/* 9A8ED8 80240AE8 0280282D */ daddu $a1, $s4, $zero -/* 9A8EDC 80240AEC 0C012568 */ jal func_800495A0 -/* 9A8EE0 80240AF0 02A0302D */ daddu $a2, $s5, $zero -/* 9A8EE4 80240AF4 96220086 */ lhu $v0, 0x86($s1) -/* 9A8EE8 80240AF8 A64200A8 */ sh $v0, 0xa8($s2) -.L80240AFC: -/* 9A8EEC 80240AFC 0260202D */ daddu $a0, $s3, $zero -/* 9A8EF0 80240B00 0280282D */ daddu $a1, $s4, $zero -/* 9A8EF4 80240B04 0C0125AE */ jal func_800496B8 -/* 9A8EF8 80240B08 02A0302D */ daddu $a2, $s5, $zero -/* 9A8EFC 80240B0C 080902FC */ j .L80240BF0 -/* 9A8F00 80240B10 00000000 */ nop -.L80240B14: -/* 9A8F04 80240B14 0260202D */ daddu $a0, $s3, $zero -/* 9A8F08 80240B18 0280282D */ daddu $a1, $s4, $zero -/* 9A8F0C 80240B1C 0C0126D1 */ jal func_80049B44 -/* 9A8F10 80240B20 02A0302D */ daddu $a2, $s5, $zero -/* 9A8F14 80240B24 8E230088 */ lw $v1, 0x88($s1) -/* 9A8F18 80240B28 24020006 */ addiu $v0, $zero, 6 -/* 9A8F1C 80240B2C 14620014 */ bne $v1, $v0, .L80240B80 -/* 9A8F20 80240B30 0260202D */ daddu $a0, $s3, $zero -/* 9A8F24 80240B34 0C00A67F */ jal rand_int -/* 9A8F28 80240B38 24040064 */ addiu $a0, $zero, 0x64 -/* 9A8F2C 80240B3C 28420021 */ slti $v0, $v0, 0x21 -/* 9A8F30 80240B40 5040000F */ beql $v0, $zero, .L80240B80 -/* 9A8F34 80240B44 0260202D */ daddu $a0, $s3, $zero -/* 9A8F38 80240B48 8E22008C */ lw $v0, 0x8c($s1) -/* 9A8F3C 80240B4C 10400005 */ beqz $v0, .L80240B64 -/* 9A8F40 80240B50 3C020055 */ lui $v0, 0x55 -/* 9A8F44 80240B54 3442002F */ ori $v0, $v0, 0x2f -/* 9A8F48 80240B58 AE20008C */ sw $zero, 0x8c($s1) -/* 9A8F4C 80240B5C 080902DC */ j .L80240B70 -/* 9A8F50 80240B60 A22000B5 */ sb $zero, 0xb5($s1) -.L80240B64: -/* 9A8F54 80240B64 3442002E */ ori $v0, $v0, 0x2e -/* 9A8F58 80240B68 AE30008C */ sw $s0, 0x8c($s1) -/* 9A8F5C 80240B6C A23000B5 */ sb $s0, 0xb5($s1) -.L80240B70: -/* 9A8F60 80240B70 AE420028 */ sw $v0, 0x28($s2) -/* 9A8F64 80240B74 24020007 */ addiu $v0, $zero, 7 -/* 9A8F68 80240B78 08090317 */ j .L80240C5C -/* 9A8F6C 80240B7C AE220090 */ sw $v0, 0x90($s1) -.L80240B80: -/* 9A8F70 80240B80 0280282D */ daddu $a1, $s4, $zero -/* 9A8F74 80240B84 0C012701 */ jal func_80049C04 -/* 9A8F78 80240B88 02A0302D */ daddu $a2, $s5, $zero -/* 9A8F7C 80240B8C 080902FC */ j .L80240BF0 -/* 9A8F80 80240B90 00000000 */ nop -.L80240B94: -/* 9A8F84 80240B94 0260202D */ daddu $a0, $s3, $zero -/* 9A8F88 80240B98 0280282D */ daddu $a1, $s4, $zero -/* 9A8F8C 80240B9C 0C09012C */ jal func_802404B0 -/* 9A8F90 80240BA0 02A0302D */ daddu $a2, $s5, $zero -/* 9A8F94 80240BA4 0260202D */ daddu $a0, $s3, $zero -.L80240BA8: -/* 9A8F98 80240BA8 0280282D */ daddu $a1, $s4, $zero -/* 9A8F9C 80240BAC 0C09014B */ jal func_8024052C -/* 9A8FA0 80240BB0 02A0302D */ daddu $a2, $s5, $zero -/* 9A8FA4 80240BB4 080902FC */ j .L80240BF0 -/* 9A8FA8 80240BB8 00000000 */ nop -.L80240BBC: -/* 9A8FAC 80240BBC 0260202D */ daddu $a0, $s3, $zero -/* 9A8FB0 80240BC0 0280282D */ daddu $a1, $s4, $zero -/* 9A8FB4 80240BC4 0C090198 */ jal func_80240660 -/* 9A8FB8 80240BC8 02A0302D */ daddu $a2, $s5, $zero -/* 9A8FBC 80240BCC 080902FC */ j .L80240BF0 -/* 9A8FC0 80240BD0 00000000 */ nop -.L80240BD4: -/* 9A8FC4 80240BD4 0280282D */ daddu $a1, $s4, $zero -/* 9A8FC8 80240BD8 0C0901F1 */ jal func_802407C4 -/* 9A8FCC 80240BDC 02A0302D */ daddu $a2, $s5, $zero -/* 9A8FD0 80240BE0 080902FC */ j .L80240BF0 -/* 9A8FD4 80240BE4 00000000 */ nop -.L80240BE8: -/* 9A8FD8 80240BE8 0C0129CF */ jal func_8004A73C -/* 9A8FDC 80240BEC 0260202D */ daddu $a0, $s3, $zero -.L80240BF0: -/* 9A8FE0 80240BF0 8E230088 */ lw $v1, 0x88($s1) -/* 9A8FE4 80240BF4 24020006 */ addiu $v0, $zero, 6 -/* 9A8FE8 80240BF8 14620019 */ bne $v1, $v0, .L80240C60 -/* 9A8FEC 80240BFC 0000102D */ daddu $v0, $zero, $zero -/* 9A8FF0 80240C00 8E22008C */ lw $v0, 0x8c($s1) -/* 9A8FF4 80240C04 10400003 */ beqz $v0, .L80240C14 -/* 9A8FF8 80240C08 24020001 */ addiu $v0, $zero, 1 -/* 9A8FFC 80240C0C 08090306 */ j .L80240C18 -/* 9A9000 80240C10 A22200B5 */ sb $v0, 0xb5($s1) -.L80240C14: -/* 9A9004 80240C14 A22000B5 */ sb $zero, 0xb5($s1) -.L80240C18: -/* 9A9008 80240C18 8E22008C */ lw $v0, 0x8c($s1) -/* 9A900C 80240C1C 1040000F */ beqz $v0, .L80240C5C -/* 9A9010 80240C20 3C03FFAA */ lui $v1, 0xffaa -/* 9A9014 80240C24 8E420028 */ lw $v0, 0x28($s2) -/* 9A9018 80240C28 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9A901C 80240C2C 00431821 */ addu $v1, $v0, $v1 -/* 9A9020 80240C30 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9A9024 80240C34 10400009 */ beqz $v0, .L80240C5C -/* 9A9028 80240C38 00031080 */ sll $v0, $v1, 2 -/* 9A902C 80240C3C 3C018024 */ lui $at, 0x8024 -/* 9A9030 80240C40 00220821 */ addu $at, $at, $v0 -/* 9A9034 80240C44 8C225EE8 */ lw $v0, 0x5ee8($at) -/* 9A9038 80240C48 00400008 */ jr $v0 -/* 9A903C 80240C4C 00000000 */ nop -/* 9A9040 80240C50 8E420028 */ lw $v0, 0x28($s2) -/* 9A9044 80240C54 24420001 */ addiu $v0, $v0, 1 -/* 9A9048 80240C58 AE420028 */ sw $v0, 0x28($s2) -.L80240C5C: -/* 9A904C 80240C5C 0000102D */ daddu $v0, $zero, $zero -.L80240C60: -/* 9A9050 80240C60 8FBF0068 */ lw $ra, 0x68($sp) -/* 9A9054 80240C64 8FB50064 */ lw $s5, 0x64($sp) -/* 9A9058 80240C68 8FB40060 */ lw $s4, 0x60($sp) -/* 9A905C 80240C6C 8FB3005C */ lw $s3, 0x5c($sp) -/* 9A9060 80240C70 8FB20058 */ lw $s2, 0x58($sp) -/* 9A9064 80240C74 8FB10054 */ lw $s1, 0x54($sp) -/* 9A9068 80240C78 8FB00050 */ lw $s0, 0x50($sp) -/* 9A906C 80240C7C 03E00008 */ jr $ra -/* 9A9070 80240C80 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s new file mode 100644 index 0000000000..0f488f6de1 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80240844_9A8C34.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240844_9A8C34 +/* 9A8C34 80240844 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 9A8C38 80240848 AFB3005C */ sw $s3, 0x5c($sp) +/* 9A8C3C 8024084C 0080982D */ daddu $s3, $a0, $zero +/* 9A8C40 80240850 AFBF0068 */ sw $ra, 0x68($sp) +/* 9A8C44 80240854 AFB50064 */ sw $s5, 0x64($sp) +/* 9A8C48 80240858 AFB40060 */ sw $s4, 0x60($sp) +/* 9A8C4C 8024085C AFB20058 */ sw $s2, 0x58($sp) +/* 9A8C50 80240860 AFB10054 */ sw $s1, 0x54($sp) +/* 9A8C54 80240864 AFB00050 */ sw $s0, 0x50($sp) +/* 9A8C58 80240868 8E710148 */ lw $s1, 0x148($s3) +/* 9A8C5C 8024086C 86240008 */ lh $a0, 8($s1) +/* 9A8C60 80240870 0C00EABB */ jal get_npc_unsafe +/* 9A8C64 80240874 00A0802D */ daddu $s0, $a1, $zero +/* 9A8C68 80240878 8E63000C */ lw $v1, 0xc($s3) +/* 9A8C6C 8024087C 0260202D */ daddu $a0, $s3, $zero +/* 9A8C70 80240880 8C650000 */ lw $a1, ($v1) +/* 9A8C74 80240884 0C0B1EAF */ jal get_variable +/* 9A8C78 80240888 0040902D */ daddu $s2, $v0, $zero +/* 9A8C7C 8024088C AFA00028 */ sw $zero, 0x28($sp) +/* 9A8C80 80240890 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A8C84 80240894 8C630030 */ lw $v1, 0x30($v1) +/* 9A8C88 80240898 AFA3002C */ sw $v1, 0x2c($sp) +/* 9A8C8C 8024089C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A8C90 802408A0 8C63001C */ lw $v1, 0x1c($v1) +/* 9A8C94 802408A4 AFA30030 */ sw $v1, 0x30($sp) +/* 9A8C98 802408A8 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A8C9C 802408AC 8C630024 */ lw $v1, 0x24($v1) +/* 9A8CA0 802408B0 AFA30034 */ sw $v1, 0x34($sp) +/* 9A8CA4 802408B4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A8CA8 802408B8 8C630028 */ lw $v1, 0x28($v1) +/* 9A8CAC 802408BC 27B50028 */ addiu $s5, $sp, 0x28 +/* 9A8CB0 802408C0 AFA30038 */ sw $v1, 0x38($sp) +/* 9A8CB4 802408C4 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A8CB8 802408C8 3C0142C8 */ lui $at, 0x42c8 +/* 9A8CBC 802408CC 44810000 */ mtc1 $at, $f0 +/* 9A8CC0 802408D0 8C63002C */ lw $v1, 0x2c($v1) +/* 9A8CC4 802408D4 0040A02D */ daddu $s4, $v0, $zero +/* 9A8CC8 802408D8 E7A00040 */ swc1 $f0, 0x40($sp) +/* 9A8CCC 802408DC A7A00044 */ sh $zero, 0x44($sp) +/* 9A8CD0 802408E0 12000009 */ beqz $s0, .L80240908 +/* 9A8CD4 802408E4 AFA3003C */ sw $v1, 0x3c($sp) +/* 9A8CD8 802408E8 864300A8 */ lh $v1, 0xa8($s2) +/* 9A8CDC 802408EC 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A8CE0 802408F0 AE20008C */ sw $zero, 0x8c($s1) +/* 9A8CE4 802408F4 A22000B5 */ sb $zero, 0xb5($s1) +/* 9A8CE8 802408F8 34420008 */ ori $v0, $v0, 8 +/* 9A8CEC 802408FC AE230084 */ sw $v1, 0x84($s1) +/* 9A8CF0 80240900 08090246 */ j .L80240918 +/* 9A8CF4 80240904 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240908: +/* 9A8CF8 80240908 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A8CFC 8024090C 30420004 */ andi $v0, $v0, 4 +/* 9A8D00 80240910 10400047 */ beqz $v0, .L80240A30 +/* 9A8D04 80240914 00000000 */ nop +.L80240918: +/* 9A8D08 80240918 AE600070 */ sw $zero, 0x70($s3) +/* 9A8D0C 8024091C A640008E */ sh $zero, 0x8e($s2) +/* 9A8D10 80240920 8E2300CC */ lw $v1, 0xcc($s1) +/* 9A8D14 80240924 2404F7FF */ addiu $a0, $zero, -0x801 +/* 9A8D18 80240928 A2200007 */ sb $zero, 7($s1) +/* 9A8D1C 8024092C 8E420000 */ lw $v0, ($s2) +/* 9A8D20 80240930 8C630000 */ lw $v1, ($v1) +/* 9A8D24 80240934 00441024 */ and $v0, $v0, $a0 +/* 9A8D28 80240938 AE420000 */ sw $v0, ($s2) +/* 9A8D2C 8024093C AE430028 */ sw $v1, 0x28($s2) +/* 9A8D30 80240940 96220086 */ lhu $v0, 0x86($s1) +/* 9A8D34 80240944 A64200A8 */ sh $v0, 0xa8($s2) +/* 9A8D38 80240948 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9A8D3C 8024094C AE200090 */ sw $zero, 0x90($s1) +/* 9A8D40 80240950 8C420034 */ lw $v0, 0x34($v0) +/* 9A8D44 80240954 14400006 */ bnez $v0, .L80240970 +/* 9A8D48 80240958 2403FDFF */ addiu $v1, $zero, -0x201 +/* 9A8D4C 8024095C 8E420000 */ lw $v0, ($s2) +/* 9A8D50 80240960 2403FFF7 */ addiu $v1, $zero, -9 +/* 9A8D54 80240964 34420200 */ ori $v0, $v0, 0x200 +/* 9A8D58 80240968 0809025F */ j .L8024097C +/* 9A8D5C 8024096C 00431024 */ and $v0, $v0, $v1 +.L80240970: +/* 9A8D60 80240970 8E420000 */ lw $v0, ($s2) +/* 9A8D64 80240974 00431024 */ and $v0, $v0, $v1 +/* 9A8D68 80240978 34420008 */ ori $v0, $v0, 8 +.L8024097C: +/* 9A8D6C 8024097C AE420000 */ sw $v0, ($s2) +/* 9A8D70 80240980 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A8D74 80240984 30420004 */ andi $v0, $v0, 4 +/* 9A8D78 80240988 1040001E */ beqz $v0, .L80240A04 +/* 9A8D7C 8024098C 24040002 */ addiu $a0, $zero, 2 +/* 9A8D80 80240990 0240282D */ daddu $a1, $s2, $zero +/* 9A8D84 80240994 0000302D */ daddu $a2, $zero, $zero +/* 9A8D88 80240998 24020063 */ addiu $v0, $zero, 0x63 +/* 9A8D8C 8024099C AE620070 */ sw $v0, 0x70($s3) +/* 9A8D90 802409A0 AE600074 */ sw $zero, 0x74($s3) +/* 9A8D94 802409A4 864300A8 */ lh $v1, 0xa8($s2) +/* 9A8D98 802409A8 3C013F80 */ lui $at, 0x3f80 +/* 9A8D9C 802409AC 44810000 */ mtc1 $at, $f0 +/* 9A8DA0 802409B0 3C014000 */ lui $at, 0x4000 +/* 9A8DA4 802409B4 44811000 */ mtc1 $at, $f2 +/* 9A8DA8 802409B8 3C01C1A0 */ lui $at, 0xc1a0 +/* 9A8DAC 802409BC 44812000 */ mtc1 $at, $f4 +/* 9A8DB0 802409C0 24020028 */ addiu $v0, $zero, 0x28 +/* 9A8DB4 802409C4 AFA2001C */ sw $v0, 0x1c($sp) +/* 9A8DB8 802409C8 44833000 */ mtc1 $v1, $f6 +/* 9A8DBC 802409CC 00000000 */ nop +/* 9A8DC0 802409D0 468031A0 */ cvt.s.w $f6, $f6 +/* 9A8DC4 802409D4 44073000 */ mfc1 $a3, $f6 +/* 9A8DC8 802409D8 27A20048 */ addiu $v0, $sp, 0x48 +/* 9A8DCC 802409DC AFA20020 */ sw $v0, 0x20($sp) +/* 9A8DD0 802409E0 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9A8DD4 802409E4 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9A8DD8 802409E8 0C01BFA4 */ jal fx_emote +/* 9A8DDC 802409EC E7A40018 */ swc1 $f4, 0x18($sp) +/* 9A8DE0 802409F0 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A8DE4 802409F4 2403FFFB */ addiu $v1, $zero, -5 +/* 9A8DE8 802409F8 00431024 */ and $v0, $v0, $v1 +/* 9A8DEC 802409FC 0809028C */ j .L80240A30 +/* 9A8DF0 80240A00 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240A04: +/* 9A8DF4 80240A04 8E220000 */ lw $v0, ($s1) +/* 9A8DF8 80240A08 3C034000 */ lui $v1, 0x4000 +/* 9A8DFC 80240A0C 00431024 */ and $v0, $v0, $v1 +/* 9A8E00 80240A10 10400007 */ beqz $v0, .L80240A30 +/* 9A8E04 80240A14 3C03BFFF */ lui $v1, 0xbfff +/* 9A8E08 80240A18 2402000C */ addiu $v0, $zero, 0xc +/* 9A8E0C 80240A1C AE620070 */ sw $v0, 0x70($s3) +/* 9A8E10 80240A20 8E220000 */ lw $v0, ($s1) +/* 9A8E14 80240A24 3463FFFF */ ori $v1, $v1, 0xffff +/* 9A8E18 80240A28 00431024 */ and $v0, $v0, $v1 +/* 9A8E1C 80240A2C AE220000 */ sw $v0, ($s1) +.L80240A30: +/* 9A8E20 80240A30 8E220090 */ lw $v0, 0x90($s1) +/* 9A8E24 80240A34 1840000C */ blez $v0, .L80240A68 +/* 9A8E28 80240A38 2442FFFF */ addiu $v0, $v0, -1 +/* 9A8E2C 80240A3C 14400087 */ bnez $v0, .L80240C5C +/* 9A8E30 80240A40 AE220090 */ sw $v0, 0x90($s1) +/* 9A8E34 80240A44 3C03FFAA */ lui $v1, 0xffaa +/* 9A8E38 80240A48 8E420028 */ lw $v0, 0x28($s2) +/* 9A8E3C 80240A4C 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 9A8E40 80240A50 00431021 */ addu $v0, $v0, $v1 +/* 9A8E44 80240A54 2C420002 */ sltiu $v0, $v0, 2 +/* 9A8E48 80240A58 10400003 */ beqz $v0, .L80240A68 +/* 9A8E4C 80240A5C 3C020055 */ lui $v0, 0x55 +/* 9A8E50 80240A60 3442000C */ ori $v0, $v0, 0xc +/* 9A8E54 80240A64 AE420028 */ sw $v0, 0x28($s2) +.L80240A68: +/* 9A8E58 80240A68 8E630070 */ lw $v1, 0x70($s3) +/* 9A8E5C 80240A6C 2402000C */ addiu $v0, $zero, 0xc +/* 9A8E60 80240A70 10620048 */ beq $v1, $v0, .L80240B94 +/* 9A8E64 80240A74 2862000D */ slti $v0, $v1, 0xd +/* 9A8E68 80240A78 1040000F */ beqz $v0, .L80240AB8 +/* 9A8E6C 80240A7C 24100001 */ addiu $s0, $zero, 1 +/* 9A8E70 80240A80 1070001E */ beq $v1, $s0, .L80240AFC +/* 9A8E74 80240A84 28620002 */ slti $v0, $v1, 2 +/* 9A8E78 80240A88 10400005 */ beqz $v0, .L80240AA0 +/* 9A8E7C 80240A8C 24020002 */ addiu $v0, $zero, 2 +/* 9A8E80 80240A90 10600015 */ beqz $v1, .L80240AE8 +/* 9A8E84 80240A94 0260202D */ daddu $a0, $s3, $zero +/* 9A8E88 80240A98 080902FC */ j .L80240BF0 +/* 9A8E8C 80240A9C 00000000 */ nop +.L80240AA0: +/* 9A8E90 80240AA0 1062001C */ beq $v1, $v0, .L80240B14 +/* 9A8E94 80240AA4 24020003 */ addiu $v0, $zero, 3 +/* 9A8E98 80240AA8 10620035 */ beq $v1, $v0, .L80240B80 +/* 9A8E9C 80240AAC 0260202D */ daddu $a0, $s3, $zero +/* 9A8EA0 80240AB0 080902FC */ j .L80240BF0 +/* 9A8EA4 80240AB4 00000000 */ nop +.L80240AB8: +/* 9A8EA8 80240AB8 2402000E */ addiu $v0, $zero, 0xe +/* 9A8EAC 80240ABC 1062003F */ beq $v1, $v0, .L80240BBC +/* 9A8EB0 80240AC0 0062102A */ slt $v0, $v1, $v0 +/* 9A8EB4 80240AC4 14400038 */ bnez $v0, .L80240BA8 +/* 9A8EB8 80240AC8 0260202D */ daddu $a0, $s3, $zero +/* 9A8EBC 80240ACC 2402000F */ addiu $v0, $zero, 0xf +/* 9A8EC0 80240AD0 10620040 */ beq $v1, $v0, .L80240BD4 +/* 9A8EC4 80240AD4 24020063 */ addiu $v0, $zero, 0x63 +/* 9A8EC8 80240AD8 10620043 */ beq $v1, $v0, .L80240BE8 +/* 9A8ECC 80240ADC 00000000 */ nop +/* 9A8ED0 80240AE0 080902FC */ j .L80240BF0 +/* 9A8ED4 80240AE4 00000000 */ nop +.L80240AE8: +/* 9A8ED8 80240AE8 0280282D */ daddu $a1, $s4, $zero +/* 9A8EDC 80240AEC 0C012568 */ jal func_800495A0 +/* 9A8EE0 80240AF0 02A0302D */ daddu $a2, $s5, $zero +/* 9A8EE4 80240AF4 96220086 */ lhu $v0, 0x86($s1) +/* 9A8EE8 80240AF8 A64200A8 */ sh $v0, 0xa8($s2) +.L80240AFC: +/* 9A8EEC 80240AFC 0260202D */ daddu $a0, $s3, $zero +/* 9A8EF0 80240B00 0280282D */ daddu $a1, $s4, $zero +/* 9A8EF4 80240B04 0C0125AE */ jal func_800496B8 +/* 9A8EF8 80240B08 02A0302D */ daddu $a2, $s5, $zero +/* 9A8EFC 80240B0C 080902FC */ j .L80240BF0 +/* 9A8F00 80240B10 00000000 */ nop +.L80240B14: +/* 9A8F04 80240B14 0260202D */ daddu $a0, $s3, $zero +/* 9A8F08 80240B18 0280282D */ daddu $a1, $s4, $zero +/* 9A8F0C 80240B1C 0C0126D1 */ jal func_80049B44 +/* 9A8F10 80240B20 02A0302D */ daddu $a2, $s5, $zero +/* 9A8F14 80240B24 8E230088 */ lw $v1, 0x88($s1) +/* 9A8F18 80240B28 24020006 */ addiu $v0, $zero, 6 +/* 9A8F1C 80240B2C 14620014 */ bne $v1, $v0, .L80240B80 +/* 9A8F20 80240B30 0260202D */ daddu $a0, $s3, $zero +/* 9A8F24 80240B34 0C00A67F */ jal rand_int +/* 9A8F28 80240B38 24040064 */ addiu $a0, $zero, 0x64 +/* 9A8F2C 80240B3C 28420021 */ slti $v0, $v0, 0x21 +/* 9A8F30 80240B40 5040000F */ beql $v0, $zero, .L80240B80 +/* 9A8F34 80240B44 0260202D */ daddu $a0, $s3, $zero +/* 9A8F38 80240B48 8E22008C */ lw $v0, 0x8c($s1) +/* 9A8F3C 80240B4C 10400005 */ beqz $v0, .L80240B64 +/* 9A8F40 80240B50 3C020055 */ lui $v0, 0x55 +/* 9A8F44 80240B54 3442002F */ ori $v0, $v0, 0x2f +/* 9A8F48 80240B58 AE20008C */ sw $zero, 0x8c($s1) +/* 9A8F4C 80240B5C 080902DC */ j .L80240B70 +/* 9A8F50 80240B60 A22000B5 */ sb $zero, 0xb5($s1) +.L80240B64: +/* 9A8F54 80240B64 3442002E */ ori $v0, $v0, 0x2e +/* 9A8F58 80240B68 AE30008C */ sw $s0, 0x8c($s1) +/* 9A8F5C 80240B6C A23000B5 */ sb $s0, 0xb5($s1) +.L80240B70: +/* 9A8F60 80240B70 AE420028 */ sw $v0, 0x28($s2) +/* 9A8F64 80240B74 24020007 */ addiu $v0, $zero, 7 +/* 9A8F68 80240B78 08090317 */ j .L80240C5C +/* 9A8F6C 80240B7C AE220090 */ sw $v0, 0x90($s1) +.L80240B80: +/* 9A8F70 80240B80 0280282D */ daddu $a1, $s4, $zero +/* 9A8F74 80240B84 0C012701 */ jal func_80049C04 +/* 9A8F78 80240B88 02A0302D */ daddu $a2, $s5, $zero +/* 9A8F7C 80240B8C 080902FC */ j .L80240BF0 +/* 9A8F80 80240B90 00000000 */ nop +.L80240B94: +/* 9A8F84 80240B94 0260202D */ daddu $a0, $s3, $zero +/* 9A8F88 80240B98 0280282D */ daddu $a1, $s4, $zero +/* 9A8F8C 80240B9C 0C09012C */ jal func_802404B0_9A88A0 +/* 9A8F90 80240BA0 02A0302D */ daddu $a2, $s5, $zero +/* 9A8F94 80240BA4 0260202D */ daddu $a0, $s3, $zero +.L80240BA8: +/* 9A8F98 80240BA8 0280282D */ daddu $a1, $s4, $zero +/* 9A8F9C 80240BAC 0C09014B */ jal func_8024052C_9A891C +/* 9A8FA0 80240BB0 02A0302D */ daddu $a2, $s5, $zero +/* 9A8FA4 80240BB4 080902FC */ j .L80240BF0 +/* 9A8FA8 80240BB8 00000000 */ nop +.L80240BBC: +/* 9A8FAC 80240BBC 0260202D */ daddu $a0, $s3, $zero +/* 9A8FB0 80240BC0 0280282D */ daddu $a1, $s4, $zero +/* 9A8FB4 80240BC4 0C090198 */ jal func_80240660_9A8A50 +/* 9A8FB8 80240BC8 02A0302D */ daddu $a2, $s5, $zero +/* 9A8FBC 80240BCC 080902FC */ j .L80240BF0 +/* 9A8FC0 80240BD0 00000000 */ nop +.L80240BD4: +/* 9A8FC4 80240BD4 0280282D */ daddu $a1, $s4, $zero +/* 9A8FC8 80240BD8 0C0901F1 */ jal func_802407C4_9A8BB4 +/* 9A8FCC 80240BDC 02A0302D */ daddu $a2, $s5, $zero +/* 9A8FD0 80240BE0 080902FC */ j .L80240BF0 +/* 9A8FD4 80240BE4 00000000 */ nop +.L80240BE8: +/* 9A8FD8 80240BE8 0C0129CF */ jal func_8004A73C +/* 9A8FDC 80240BEC 0260202D */ daddu $a0, $s3, $zero +.L80240BF0: +/* 9A8FE0 80240BF0 8E230088 */ lw $v1, 0x88($s1) +/* 9A8FE4 80240BF4 24020006 */ addiu $v0, $zero, 6 +/* 9A8FE8 80240BF8 14620019 */ bne $v1, $v0, .L80240C60 +/* 9A8FEC 80240BFC 0000102D */ daddu $v0, $zero, $zero +/* 9A8FF0 80240C00 8E22008C */ lw $v0, 0x8c($s1) +/* 9A8FF4 80240C04 10400003 */ beqz $v0, .L80240C14 +/* 9A8FF8 80240C08 24020001 */ addiu $v0, $zero, 1 +/* 9A8FFC 80240C0C 08090306 */ j .L80240C18 +/* 9A9000 80240C10 A22200B5 */ sb $v0, 0xb5($s1) +.L80240C14: +/* 9A9004 80240C14 A22000B5 */ sb $zero, 0xb5($s1) +.L80240C18: +/* 9A9008 80240C18 8E22008C */ lw $v0, 0x8c($s1) +/* 9A900C 80240C1C 1040000F */ beqz $v0, .L80240C5C +/* 9A9010 80240C20 3C03FFAA */ lui $v1, 0xffaa +/* 9A9014 80240C24 8E420028 */ lw $v0, 0x28($s2) +/* 9A9018 80240C28 3463FFFC */ ori $v1, $v1, 0xfffc +/* 9A901C 80240C2C 00431821 */ addu $v1, $v0, $v1 +/* 9A9020 80240C30 2C620015 */ sltiu $v0, $v1, 0x15 +/* 9A9024 80240C34 10400009 */ beqz $v0, .L80240C5C +/* 9A9028 80240C38 00031080 */ sll $v0, $v1, 2 +/* 9A902C 80240C3C 3C018024 */ lui $at, 0x8024 +/* 9A9030 80240C40 00220821 */ addu $at, $at, $v0 +/* 9A9034 80240C44 8C225EE8 */ lw $v0, 0x5ee8($at) +/* 9A9038 80240C48 00400008 */ jr $v0 +/* 9A903C 80240C4C 00000000 */ nop +/* 9A9040 80240C50 8E420028 */ lw $v0, 0x28($s2) +/* 9A9044 80240C54 24420001 */ addiu $v0, $v0, 1 +/* 9A9048 80240C58 AE420028 */ sw $v0, 0x28($s2) +.L80240C5C: +/* 9A904C 80240C5C 0000102D */ daddu $v0, $zero, $zero +.L80240C60: +/* 9A9050 80240C60 8FBF0068 */ lw $ra, 0x68($sp) +/* 9A9054 80240C64 8FB50064 */ lw $s5, 0x64($sp) +/* 9A9058 80240C68 8FB40060 */ lw $s4, 0x60($sp) +/* 9A905C 80240C6C 8FB3005C */ lw $s3, 0x5c($sp) +/* 9A9060 80240C70 8FB20058 */ lw $s2, 0x58($sp) +/* 9A9064 80240C74 8FB10054 */ lw $s1, 0x54($sp) +/* 9A9068 80240C78 8FB00050 */ lw $s0, 0x50($sp) +/* 9A906C 80240C7C 03E00008 */ jr $ra +/* 9A9070 80240C80 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084.s deleted file mode 100644 index 2246cccee1..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241084 -/* 9A9474 80241084 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9A9478 80241088 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A947C 8024108C 0080982D */ daddu $s3, $a0, $zero -/* 9A9480 80241090 AFBF0020 */ sw $ra, 0x20($sp) -/* 9A9484 80241094 AFB20018 */ sw $s2, 0x18($sp) -/* 9A9488 80241098 AFB10014 */ sw $s1, 0x14($sp) -/* 9A948C 8024109C AFB00010 */ sw $s0, 0x10($sp) -/* 9A9490 802410A0 8E720148 */ lw $s2, 0x148($s3) -/* 9A9494 802410A4 86440008 */ lh $a0, 8($s2) -/* 9A9498 802410A8 0C00EABB */ jal get_npc_unsafe -/* 9A949C 802410AC 00A0882D */ daddu $s1, $a1, $zero -/* 9A94A0 802410B0 8E240008 */ lw $a0, 8($s1) -/* 9A94A4 802410B4 0040802D */ daddu $s0, $v0, $zero -/* 9A94A8 802410B8 00041FC2 */ srl $v1, $a0, 0x1f -/* 9A94AC 802410BC 00832021 */ addu $a0, $a0, $v1 -/* 9A94B0 802410C0 00042043 */ sra $a0, $a0, 1 -/* 9A94B4 802410C4 0C00A67F */ jal rand_int -/* 9A94B8 802410C8 24840001 */ addiu $a0, $a0, 1 -/* 9A94BC 802410CC 8E230008 */ lw $v1, 8($s1) -/* 9A94C0 802410D0 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9A94C4 802410D4 00032FC2 */ srl $a1, $v1, 0x1f -/* 9A94C8 802410D8 00651821 */ addu $v1, $v1, $a1 -/* 9A94CC 802410DC 00031843 */ sra $v1, $v1, 1 -/* 9A94D0 802410E0 00621821 */ addu $v1, $v1, $v0 -/* 9A94D4 802410E4 0C00A67F */ jal rand_int -/* 9A94D8 802410E8 A603008E */ sh $v1, 0x8e($s0) -/* 9A94DC 802410EC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9A94E0 802410F0 44820000 */ mtc1 $v0, $f0 -/* 9A94E4 802410F4 00000000 */ nop -/* 9A94E8 802410F8 46800020 */ cvt.s.w $f0, $f0 -/* 9A94EC 802410FC 46006300 */ add.s $f12, $f12, $f0 -/* 9A94F0 80241100 3C0142B4 */ lui $at, 0x42b4 -/* 9A94F4 80241104 44810000 */ mtc1 $at, $f0 -/* 9A94F8 80241108 0C00A6C9 */ jal clamp_angle -/* 9A94FC 8024110C 46006301 */ sub.s $f12, $f12, $f0 -/* 9A9500 80241110 E600000C */ swc1 $f0, 0xc($s0) -/* 9A9504 80241114 8E4200CC */ lw $v0, 0xcc($s2) -/* 9A9508 80241118 8C420000 */ lw $v0, ($v0) -/* 9A950C 8024111C AE020028 */ sw $v0, 0x28($s0) -/* 9A9510 80241120 24020003 */ addiu $v0, $zero, 3 -/* 9A9514 80241124 AE620070 */ sw $v0, 0x70($s3) -/* 9A9518 80241128 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A951C 8024112C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A9520 80241130 8FB20018 */ lw $s2, 0x18($sp) -/* 9A9524 80241134 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9528 80241138 8FB00010 */ lw $s0, 0x10($sp) -/* 9A952C 8024113C 03E00008 */ jr $ra -/* 9A9530 80241140 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s new file mode 100644 index 0000000000..5d3d1ef4e9 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241084_9A9474.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241084_9A9474 +/* 9A9474 80241084 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9A9478 80241088 AFB3001C */ sw $s3, 0x1c($sp) +/* 9A947C 8024108C 0080982D */ daddu $s3, $a0, $zero +/* 9A9480 80241090 AFBF0020 */ sw $ra, 0x20($sp) +/* 9A9484 80241094 AFB20018 */ sw $s2, 0x18($sp) +/* 9A9488 80241098 AFB10014 */ sw $s1, 0x14($sp) +/* 9A948C 8024109C AFB00010 */ sw $s0, 0x10($sp) +/* 9A9490 802410A0 8E720148 */ lw $s2, 0x148($s3) +/* 9A9494 802410A4 86440008 */ lh $a0, 8($s2) +/* 9A9498 802410A8 0C00EABB */ jal get_npc_unsafe +/* 9A949C 802410AC 00A0882D */ daddu $s1, $a1, $zero +/* 9A94A0 802410B0 8E240008 */ lw $a0, 8($s1) +/* 9A94A4 802410B4 0040802D */ daddu $s0, $v0, $zero +/* 9A94A8 802410B8 00041FC2 */ srl $v1, $a0, 0x1f +/* 9A94AC 802410BC 00832021 */ addu $a0, $a0, $v1 +/* 9A94B0 802410C0 00042043 */ sra $a0, $a0, 1 +/* 9A94B4 802410C4 0C00A67F */ jal rand_int +/* 9A94B8 802410C8 24840001 */ addiu $a0, $a0, 1 +/* 9A94BC 802410CC 8E230008 */ lw $v1, 8($s1) +/* 9A94C0 802410D0 240400B4 */ addiu $a0, $zero, 0xb4 +/* 9A94C4 802410D4 00032FC2 */ srl $a1, $v1, 0x1f +/* 9A94C8 802410D8 00651821 */ addu $v1, $v1, $a1 +/* 9A94CC 802410DC 00031843 */ sra $v1, $v1, 1 +/* 9A94D0 802410E0 00621821 */ addu $v1, $v1, $v0 +/* 9A94D4 802410E4 0C00A67F */ jal rand_int +/* 9A94D8 802410E8 A603008E */ sh $v1, 0x8e($s0) +/* 9A94DC 802410EC C60C000C */ lwc1 $f12, 0xc($s0) +/* 9A94E0 802410F0 44820000 */ mtc1 $v0, $f0 +/* 9A94E4 802410F4 00000000 */ nop +/* 9A94E8 802410F8 46800020 */ cvt.s.w $f0, $f0 +/* 9A94EC 802410FC 46006300 */ add.s $f12, $f12, $f0 +/* 9A94F0 80241100 3C0142B4 */ lui $at, 0x42b4 +/* 9A94F4 80241104 44810000 */ mtc1 $at, $f0 +/* 9A94F8 80241108 0C00A6C9 */ jal clamp_angle +/* 9A94FC 8024110C 46006301 */ sub.s $f12, $f12, $f0 +/* 9A9500 80241110 E600000C */ swc1 $f0, 0xc($s0) +/* 9A9504 80241114 8E4200CC */ lw $v0, 0xcc($s2) +/* 9A9508 80241118 8C420000 */ lw $v0, ($v0) +/* 9A950C 8024111C AE020028 */ sw $v0, 0x28($s0) +/* 9A9510 80241120 24020003 */ addiu $v0, $zero, 3 +/* 9A9514 80241124 AE620070 */ sw $v0, 0x70($s3) +/* 9A9518 80241128 8FBF0020 */ lw $ra, 0x20($sp) +/* 9A951C 8024112C 8FB3001C */ lw $s3, 0x1c($sp) +/* 9A9520 80241130 8FB20018 */ lw $s2, 0x18($sp) +/* 9A9524 80241134 8FB10014 */ lw $s1, 0x14($sp) +/* 9A9528 80241138 8FB00010 */ lw $s0, 0x10($sp) +/* 9A952C 8024113C 03E00008 */ jr $ra +/* 9A9530 80241140 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144.s deleted file mode 100644 index 519ced6377..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144.s +++ /dev/null @@ -1,120 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241144 -/* 9A9534 80241144 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9A9538 80241148 AFB40040 */ sw $s4, 0x40($sp) -/* 9A953C 8024114C 0080A02D */ daddu $s4, $a0, $zero -/* 9A9540 80241150 AFBF0044 */ sw $ra, 0x44($sp) -/* 9A9544 80241154 AFB3003C */ sw $s3, 0x3c($sp) -/* 9A9548 80241158 AFB20038 */ sw $s2, 0x38($sp) -/* 9A954C 8024115C AFB10034 */ sw $s1, 0x34($sp) -/* 9A9550 80241160 AFB00030 */ sw $s0, 0x30($sp) -/* 9A9554 80241164 8E910148 */ lw $s1, 0x148($s4) -/* 9A9558 80241168 00A0902D */ daddu $s2, $a1, $zero -/* 9A955C 8024116C 86240008 */ lh $a0, 8($s1) -/* 9A9560 80241170 0C00EABB */ jal get_npc_unsafe -/* 9A9564 80241174 00C0982D */ daddu $s3, $a2, $zero -/* 9A9568 80241178 8E430014 */ lw $v1, 0x14($s2) -/* 9A956C 8024117C 04600031 */ bltz $v1, .L80241244 -/* 9A9570 80241180 0040802D */ daddu $s0, $v0, $zero -/* 9A9574 80241184 0260202D */ daddu $a0, $s3, $zero -/* 9A9578 80241188 AFA00010 */ sw $zero, 0x10($sp) -/* 9A957C 8024118C 8E460024 */ lw $a2, 0x24($s2) -/* 9A9580 80241190 8E470028 */ lw $a3, 0x28($s2) -/* 9A9584 80241194 0C01242D */ jal func_800490B4 -/* 9A9588 80241198 0220282D */ daddu $a1, $s1, $zero -/* 9A958C 8024119C 10400029 */ beqz $v0, .L80241244 -/* 9A9590 802411A0 0000202D */ daddu $a0, $zero, $zero -/* 9A9594 802411A4 0200282D */ daddu $a1, $s0, $zero -/* 9A9598 802411A8 0000302D */ daddu $a2, $zero, $zero -/* 9A959C 802411AC 860300A8 */ lh $v1, 0xa8($s0) -/* 9A95A0 802411B0 3C013F80 */ lui $at, 0x3f80 -/* 9A95A4 802411B4 44810000 */ mtc1 $at, $f0 -/* 9A95A8 802411B8 3C014000 */ lui $at, 0x4000 -/* 9A95AC 802411BC 44811000 */ mtc1 $at, $f2 -/* 9A95B0 802411C0 3C01C1A0 */ lui $at, 0xc1a0 -/* 9A95B4 802411C4 44812000 */ mtc1 $at, $f4 -/* 9A95B8 802411C8 2402000F */ addiu $v0, $zero, 0xf -/* 9A95BC 802411CC AFA2001C */ sw $v0, 0x1c($sp) -/* 9A95C0 802411D0 44833000 */ mtc1 $v1, $f6 -/* 9A95C4 802411D4 00000000 */ nop -/* 9A95C8 802411D8 468031A0 */ cvt.s.w $f6, $f6 -/* 9A95CC 802411DC 44073000 */ mfc1 $a3, $f6 -/* 9A95D0 802411E0 27A20028 */ addiu $v0, $sp, 0x28 -/* 9A95D4 802411E4 AFA20020 */ sw $v0, 0x20($sp) -/* 9A95D8 802411E8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9A95DC 802411EC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9A95E0 802411F0 0C01BFA4 */ jal fx_emote -/* 9A95E4 802411F4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9A95E8 802411F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A95EC 802411FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A95F0 80241200 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9A95F4 80241204 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9A95F8 80241208 8C460028 */ lw $a2, 0x28($v0) -/* 9A95FC 8024120C 0C00A720 */ jal atan2 -/* 9A9600 80241210 8C470030 */ lw $a3, 0x30($v0) -/* 9A9604 80241214 0200202D */ daddu $a0, $s0, $zero -/* 9A9608 80241218 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9A960C 8024121C 3C060020 */ lui $a2, 0x20 -/* 9A9610 80241220 0C012530 */ jal func_800494C0 -/* 9A9614 80241224 E480000C */ swc1 $f0, 0xc($a0) -/* 9A9618 80241228 8E220018 */ lw $v0, 0x18($s1) -/* 9A961C 8024122C 9442002A */ lhu $v0, 0x2a($v0) -/* 9A9620 80241230 30420001 */ andi $v0, $v0, 1 -/* 9A9624 80241234 14400029 */ bnez $v0, .L802412DC -/* 9A9628 80241238 2402000A */ addiu $v0, $zero, 0xa -/* 9A962C 8024123C 080904B7 */ j .L802412DC -/* 9A9630 80241240 2402000C */ addiu $v0, $zero, 0xc -.L80241244: -/* 9A9634 80241244 8602008C */ lh $v0, 0x8c($s0) -/* 9A9638 80241248 14400025 */ bnez $v0, .L802412E0 -/* 9A963C 8024124C 00000000 */ nop -/* 9A9640 80241250 9602008E */ lhu $v0, 0x8e($s0) -/* 9A9644 80241254 2442FFFF */ addiu $v0, $v0, -1 -/* 9A9648 80241258 A602008E */ sh $v0, 0x8e($s0) -/* 9A964C 8024125C 00021400 */ sll $v0, $v0, 0x10 -/* 9A9650 80241260 1440001F */ bnez $v0, .L802412E0 -/* 9A9654 80241264 00000000 */ nop -/* 9A9658 80241268 8E820074 */ lw $v0, 0x74($s4) -/* 9A965C 8024126C 2442FFFF */ addiu $v0, $v0, -1 -/* 9A9660 80241270 10400019 */ beqz $v0, .L802412D8 -/* 9A9664 80241274 AE820074 */ sw $v0, 0x74($s4) -/* 9A9668 80241278 8E220018 */ lw $v0, 0x18($s1) -/* 9A966C 8024127C 9442002A */ lhu $v0, 0x2a($v0) -/* 9A9670 80241280 30420010 */ andi $v0, $v0, 0x10 -/* 9A9674 80241284 14400007 */ bnez $v0, .L802412A4 -/* 9A9678 80241288 00000000 */ nop -/* 9A967C 8024128C C600000C */ lwc1 $f0, 0xc($s0) -/* 9A9680 80241290 3C014334 */ lui $at, 0x4334 -/* 9A9684 80241294 44816000 */ mtc1 $at, $f12 -/* 9A9688 80241298 0C00A6C9 */ jal clamp_angle -/* 9A968C 8024129C 460C0300 */ add.s $f12, $f0, $f12 -/* 9A9690 802412A0 E600000C */ swc1 $f0, 0xc($s0) -.L802412A4: -/* 9A9694 802412A4 8E440008 */ lw $a0, 8($s2) -/* 9A9698 802412A8 000417C2 */ srl $v0, $a0, 0x1f -/* 9A969C 802412AC 00822021 */ addu $a0, $a0, $v0 -/* 9A96A0 802412B0 00042043 */ sra $a0, $a0, 1 -/* 9A96A4 802412B4 0C00A67F */ jal rand_int -/* 9A96A8 802412B8 24840001 */ addiu $a0, $a0, 1 -/* 9A96AC 802412BC 8E430008 */ lw $v1, 8($s2) -/* 9A96B0 802412C0 000327C2 */ srl $a0, $v1, 0x1f -/* 9A96B4 802412C4 00641821 */ addu $v1, $v1, $a0 -/* 9A96B8 802412C8 00031843 */ sra $v1, $v1, 1 -/* 9A96BC 802412CC 00621821 */ addu $v1, $v1, $v0 -/* 9A96C0 802412D0 080904B8 */ j .L802412E0 -/* 9A96C4 802412D4 A603008E */ sh $v1, 0x8e($s0) -.L802412D8: -/* 9A96C8 802412D8 24020004 */ addiu $v0, $zero, 4 -.L802412DC: -/* 9A96CC 802412DC AE820070 */ sw $v0, 0x70($s4) -.L802412E0: -/* 9A96D0 802412E0 8FBF0044 */ lw $ra, 0x44($sp) -/* 9A96D4 802412E4 8FB40040 */ lw $s4, 0x40($sp) -/* 9A96D8 802412E8 8FB3003C */ lw $s3, 0x3c($sp) -/* 9A96DC 802412EC 8FB20038 */ lw $s2, 0x38($sp) -/* 9A96E0 802412F0 8FB10034 */ lw $s1, 0x34($sp) -/* 9A96E4 802412F4 8FB00030 */ lw $s0, 0x30($sp) -/* 9A96E8 802412F8 03E00008 */ jr $ra -/* 9A96EC 802412FC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s new file mode 100644 index 0000000000..210d466521 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241144_9A9534.s @@ -0,0 +1,120 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241144_9A9534 +/* 9A9534 80241144 27BDFFB8 */ addiu $sp, $sp, -0x48 +/* 9A9538 80241148 AFB40040 */ sw $s4, 0x40($sp) +/* 9A953C 8024114C 0080A02D */ daddu $s4, $a0, $zero +/* 9A9540 80241150 AFBF0044 */ sw $ra, 0x44($sp) +/* 9A9544 80241154 AFB3003C */ sw $s3, 0x3c($sp) +/* 9A9548 80241158 AFB20038 */ sw $s2, 0x38($sp) +/* 9A954C 8024115C AFB10034 */ sw $s1, 0x34($sp) +/* 9A9550 80241160 AFB00030 */ sw $s0, 0x30($sp) +/* 9A9554 80241164 8E910148 */ lw $s1, 0x148($s4) +/* 9A9558 80241168 00A0902D */ daddu $s2, $a1, $zero +/* 9A955C 8024116C 86240008 */ lh $a0, 8($s1) +/* 9A9560 80241170 0C00EABB */ jal get_npc_unsafe +/* 9A9564 80241174 00C0982D */ daddu $s3, $a2, $zero +/* 9A9568 80241178 8E430014 */ lw $v1, 0x14($s2) +/* 9A956C 8024117C 04600031 */ bltz $v1, .L80241244 +/* 9A9570 80241180 0040802D */ daddu $s0, $v0, $zero +/* 9A9574 80241184 0260202D */ daddu $a0, $s3, $zero +/* 9A9578 80241188 AFA00010 */ sw $zero, 0x10($sp) +/* 9A957C 8024118C 8E460024 */ lw $a2, 0x24($s2) +/* 9A9580 80241190 8E470028 */ lw $a3, 0x28($s2) +/* 9A9584 80241194 0C01242D */ jal func_800490B4 +/* 9A9588 80241198 0220282D */ daddu $a1, $s1, $zero +/* 9A958C 8024119C 10400029 */ beqz $v0, .L80241244 +/* 9A9590 802411A0 0000202D */ daddu $a0, $zero, $zero +/* 9A9594 802411A4 0200282D */ daddu $a1, $s0, $zero +/* 9A9598 802411A8 0000302D */ daddu $a2, $zero, $zero +/* 9A959C 802411AC 860300A8 */ lh $v1, 0xa8($s0) +/* 9A95A0 802411B0 3C013F80 */ lui $at, 0x3f80 +/* 9A95A4 802411B4 44810000 */ mtc1 $at, $f0 +/* 9A95A8 802411B8 3C014000 */ lui $at, 0x4000 +/* 9A95AC 802411BC 44811000 */ mtc1 $at, $f2 +/* 9A95B0 802411C0 3C01C1A0 */ lui $at, 0xc1a0 +/* 9A95B4 802411C4 44812000 */ mtc1 $at, $f4 +/* 9A95B8 802411C8 2402000F */ addiu $v0, $zero, 0xf +/* 9A95BC 802411CC AFA2001C */ sw $v0, 0x1c($sp) +/* 9A95C0 802411D0 44833000 */ mtc1 $v1, $f6 +/* 9A95C4 802411D4 00000000 */ nop +/* 9A95C8 802411D8 468031A0 */ cvt.s.w $f6, $f6 +/* 9A95CC 802411DC 44073000 */ mfc1 $a3, $f6 +/* 9A95D0 802411E0 27A20028 */ addiu $v0, $sp, 0x28 +/* 9A95D4 802411E4 AFA20020 */ sw $v0, 0x20($sp) +/* 9A95D8 802411E8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9A95DC 802411EC E7A20014 */ swc1 $f2, 0x14($sp) +/* 9A95E0 802411F0 0C01BFA4 */ jal fx_emote +/* 9A95E4 802411F4 E7A40018 */ swc1 $f4, 0x18($sp) +/* 9A95E8 802411F8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9A95EC 802411FC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9A95F0 80241200 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9A95F4 80241204 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9A95F8 80241208 8C460028 */ lw $a2, 0x28($v0) +/* 9A95FC 8024120C 0C00A720 */ jal atan2 +/* 9A9600 80241210 8C470030 */ lw $a3, 0x30($v0) +/* 9A9604 80241214 0200202D */ daddu $a0, $s0, $zero +/* 9A9608 80241218 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 9A960C 8024121C 3C060020 */ lui $a2, 0x20 +/* 9A9610 80241220 0C012530 */ jal func_800494C0 +/* 9A9614 80241224 E480000C */ swc1 $f0, 0xc($a0) +/* 9A9618 80241228 8E220018 */ lw $v0, 0x18($s1) +/* 9A961C 8024122C 9442002A */ lhu $v0, 0x2a($v0) +/* 9A9620 80241230 30420001 */ andi $v0, $v0, 1 +/* 9A9624 80241234 14400029 */ bnez $v0, .L802412DC +/* 9A9628 80241238 2402000A */ addiu $v0, $zero, 0xa +/* 9A962C 8024123C 080904B7 */ j .L802412DC +/* 9A9630 80241240 2402000C */ addiu $v0, $zero, 0xc +.L80241244: +/* 9A9634 80241244 8602008C */ lh $v0, 0x8c($s0) +/* 9A9638 80241248 14400025 */ bnez $v0, .L802412E0 +/* 9A963C 8024124C 00000000 */ nop +/* 9A9640 80241250 9602008E */ lhu $v0, 0x8e($s0) +/* 9A9644 80241254 2442FFFF */ addiu $v0, $v0, -1 +/* 9A9648 80241258 A602008E */ sh $v0, 0x8e($s0) +/* 9A964C 8024125C 00021400 */ sll $v0, $v0, 0x10 +/* 9A9650 80241260 1440001F */ bnez $v0, .L802412E0 +/* 9A9654 80241264 00000000 */ nop +/* 9A9658 80241268 8E820074 */ lw $v0, 0x74($s4) +/* 9A965C 8024126C 2442FFFF */ addiu $v0, $v0, -1 +/* 9A9660 80241270 10400019 */ beqz $v0, .L802412D8 +/* 9A9664 80241274 AE820074 */ sw $v0, 0x74($s4) +/* 9A9668 80241278 8E220018 */ lw $v0, 0x18($s1) +/* 9A966C 8024127C 9442002A */ lhu $v0, 0x2a($v0) +/* 9A9670 80241280 30420010 */ andi $v0, $v0, 0x10 +/* 9A9674 80241284 14400007 */ bnez $v0, .L802412A4 +/* 9A9678 80241288 00000000 */ nop +/* 9A967C 8024128C C600000C */ lwc1 $f0, 0xc($s0) +/* 9A9680 80241290 3C014334 */ lui $at, 0x4334 +/* 9A9684 80241294 44816000 */ mtc1 $at, $f12 +/* 9A9688 80241298 0C00A6C9 */ jal clamp_angle +/* 9A968C 8024129C 460C0300 */ add.s $f12, $f0, $f12 +/* 9A9690 802412A0 E600000C */ swc1 $f0, 0xc($s0) +.L802412A4: +/* 9A9694 802412A4 8E440008 */ lw $a0, 8($s2) +/* 9A9698 802412A8 000417C2 */ srl $v0, $a0, 0x1f +/* 9A969C 802412AC 00822021 */ addu $a0, $a0, $v0 +/* 9A96A0 802412B0 00042043 */ sra $a0, $a0, 1 +/* 9A96A4 802412B4 0C00A67F */ jal rand_int +/* 9A96A8 802412B8 24840001 */ addiu $a0, $a0, 1 +/* 9A96AC 802412BC 8E430008 */ lw $v1, 8($s2) +/* 9A96B0 802412C0 000327C2 */ srl $a0, $v1, 0x1f +/* 9A96B4 802412C4 00641821 */ addu $v1, $v1, $a0 +/* 9A96B8 802412C8 00031843 */ sra $v1, $v1, 1 +/* 9A96BC 802412CC 00621821 */ addu $v1, $v1, $v0 +/* 9A96C0 802412D0 080904B8 */ j .L802412E0 +/* 9A96C4 802412D4 A603008E */ sh $v1, 0x8e($s0) +.L802412D8: +/* 9A96C8 802412D8 24020004 */ addiu $v0, $zero, 4 +.L802412DC: +/* 9A96CC 802412DC AE820070 */ sw $v0, 0x70($s4) +.L802412E0: +/* 9A96D0 802412E0 8FBF0044 */ lw $ra, 0x44($sp) +/* 9A96D4 802412E4 8FB40040 */ lw $s4, 0x40($sp) +/* 9A96D8 802412E8 8FB3003C */ lw $s3, 0x3c($sp) +/* 9A96DC 802412EC 8FB20038 */ lw $s2, 0x38($sp) +/* 9A96E0 802412F0 8FB10034 */ lw $s1, 0x34($sp) +/* 9A96E4 802412F4 8FB00030 */ lw $s0, 0x30($sp) +/* 9A96E8 802412F8 03E00008 */ jr $ra +/* 9A96EC 802412FC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300.s deleted file mode 100644 index 793fd593d4..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241300 -/* 9A96F0 80241300 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A96F4 80241304 AFB10014 */ sw $s1, 0x14($sp) -/* 9A96F8 80241308 0080882D */ daddu $s1, $a0, $zero -/* 9A96FC 8024130C AFBF001C */ sw $ra, 0x1c($sp) -/* 9A9700 80241310 AFB20018 */ sw $s2, 0x18($sp) -/* 9A9704 80241314 AFB00010 */ sw $s0, 0x10($sp) -/* 9A9708 80241318 8E300148 */ lw $s0, 0x148($s1) -/* 9A970C 8024131C 86040008 */ lh $a0, 8($s0) -/* 9A9710 80241320 0C00EABB */ jal get_npc_unsafe -/* 9A9714 80241324 00A0902D */ daddu $s2, $a1, $zero -/* 9A9718 80241328 8E230078 */ lw $v1, 0x78($s1) -/* 9A971C 8024132C 24630001 */ addiu $v1, $v1, 1 -/* 9A9720 80241330 AE230078 */ sw $v1, 0x78($s1) -/* 9A9724 80241334 8E0400D0 */ lw $a0, 0xd0($s0) -/* 9A9728 80241338 8C840000 */ lw $a0, ($a0) -/* 9A972C 8024133C 0064182A */ slt $v1, $v1, $a0 -/* 9A9730 80241340 14600002 */ bnez $v1, .L8024134C -/* 9A9734 80241344 0040282D */ daddu $a1, $v0, $zero -/* 9A9738 80241348 AE200078 */ sw $zero, 0x78($s1) -.L8024134C: -/* 9A973C 8024134C 8E0200CC */ lw $v0, 0xcc($s0) -/* 9A9740 80241350 8C420004 */ lw $v0, 4($v0) -/* 9A9744 80241354 ACA20028 */ sw $v0, 0x28($a1) -/* 9A9748 80241358 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9A974C 8024135C 8C42007C */ lw $v0, 0x7c($v0) -/* 9A9750 80241360 04410004 */ bgez $v0, .L80241374 -/* 9A9754 80241364 00000000 */ nop -/* 9A9758 80241368 C6400000 */ lwc1 $f0, ($s2) -/* 9A975C 8024136C 080904E5 */ j .L80241394 -/* 9A9760 80241370 E4A00018 */ swc1 $f0, 0x18($a1) -.L80241374: -/* 9A9764 80241374 3C018024 */ lui $at, 0x8024 -/* 9A9768 80241378 D4225F48 */ ldc1 $f2, 0x5f48($at) -/* 9A976C 8024137C 44820000 */ mtc1 $v0, $f0 -/* 9A9770 80241380 00000000 */ nop -/* 9A9774 80241384 46800021 */ cvt.d.w $f0, $f0 -/* 9A9778 80241388 46220003 */ div.d $f0, $f0, $f2 -/* 9A977C 8024138C 46200020 */ cvt.s.d $f0, $f0 -/* 9A9780 80241390 E4A00018 */ swc1 $f0, 0x18($a1) -.L80241394: -/* 9A9784 80241394 24020001 */ addiu $v0, $zero, 1 -/* 9A9788 80241398 AE220070 */ sw $v0, 0x70($s1) -/* 9A978C 8024139C 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A9790 802413A0 8FB20018 */ lw $s2, 0x18($sp) -/* 9A9794 802413A4 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9798 802413A8 8FB00010 */ lw $s0, 0x10($sp) -/* 9A979C 802413AC 03E00008 */ jr $ra -/* 9A97A0 802413B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s new file mode 100644 index 0000000000..412efb1079 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241300_9A96F0.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241300_9A96F0 +/* 9A96F0 80241300 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A96F4 80241304 AFB10014 */ sw $s1, 0x14($sp) +/* 9A96F8 80241308 0080882D */ daddu $s1, $a0, $zero +/* 9A96FC 8024130C AFBF001C */ sw $ra, 0x1c($sp) +/* 9A9700 80241310 AFB20018 */ sw $s2, 0x18($sp) +/* 9A9704 80241314 AFB00010 */ sw $s0, 0x10($sp) +/* 9A9708 80241318 8E300148 */ lw $s0, 0x148($s1) +/* 9A970C 8024131C 86040008 */ lh $a0, 8($s0) +/* 9A9710 80241320 0C00EABB */ jal get_npc_unsafe +/* 9A9714 80241324 00A0902D */ daddu $s2, $a1, $zero +/* 9A9718 80241328 8E230078 */ lw $v1, 0x78($s1) +/* 9A971C 8024132C 24630001 */ addiu $v1, $v1, 1 +/* 9A9720 80241330 AE230078 */ sw $v1, 0x78($s1) +/* 9A9724 80241334 8E0400D0 */ lw $a0, 0xd0($s0) +/* 9A9728 80241338 8C840000 */ lw $a0, ($a0) +/* 9A972C 8024133C 0064182A */ slt $v1, $v1, $a0 +/* 9A9730 80241340 14600002 */ bnez $v1, .L8024134C +/* 9A9734 80241344 0040282D */ daddu $a1, $v0, $zero +/* 9A9738 80241348 AE200078 */ sw $zero, 0x78($s1) +.L8024134C: +/* 9A973C 8024134C 8E0200CC */ lw $v0, 0xcc($s0) +/* 9A9740 80241350 8C420004 */ lw $v0, 4($v0) +/* 9A9744 80241354 ACA20028 */ sw $v0, 0x28($a1) +/* 9A9748 80241358 8E0200D0 */ lw $v0, 0xd0($s0) +/* 9A974C 8024135C 8C42007C */ lw $v0, 0x7c($v0) +/* 9A9750 80241360 04410004 */ bgez $v0, .L80241374 +/* 9A9754 80241364 00000000 */ nop +/* 9A9758 80241368 C6400000 */ lwc1 $f0, ($s2) +/* 9A975C 8024136C 080904E5 */ j .L80241394 +/* 9A9760 80241370 E4A00018 */ swc1 $f0, 0x18($a1) +.L80241374: +/* 9A9764 80241374 3C018024 */ lui $at, 0x8024 +/* 9A9768 80241378 D4225F48 */ ldc1 $f2, 0x5f48($at) +/* 9A976C 8024137C 44820000 */ mtc1 $v0, $f0 +/* 9A9770 80241380 00000000 */ nop +/* 9A9774 80241384 46800021 */ cvt.d.w $f0, $f0 +/* 9A9778 80241388 46220003 */ div.d $f0, $f0, $f2 +/* 9A977C 8024138C 46200020 */ cvt.s.d $f0, $f0 +/* 9A9780 80241390 E4A00018 */ swc1 $f0, 0x18($a1) +.L80241394: +/* 9A9784 80241394 24020001 */ addiu $v0, $zero, 1 +/* 9A9788 80241398 AE220070 */ sw $v0, 0x70($s1) +/* 9A978C 8024139C 8FBF001C */ lw $ra, 0x1c($sp) +/* 9A9790 802413A0 8FB20018 */ lw $s2, 0x18($sp) +/* 9A9794 802413A4 8FB10014 */ lw $s1, 0x14($sp) +/* 9A9798 802413A8 8FB00010 */ lw $s0, 0x10($sp) +/* 9A979C 802413AC 03E00008 */ jr $ra +/* 9A97A0 802413B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4.s deleted file mode 100644 index 65ecbcea5a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413B4 -/* 9A97A4 802413B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A97A8 802413B8 AFB10014 */ sw $s1, 0x14($sp) -/* 9A97AC 802413BC 0080882D */ daddu $s1, $a0, $zero -/* 9A97B0 802413C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9A97B4 802413C4 AFB00010 */ sw $s0, 0x10($sp) -/* 9A97B8 802413C8 8E300148 */ lw $s0, 0x148($s1) -/* 9A97BC 802413CC 0C00EABB */ jal get_npc_unsafe -/* 9A97C0 802413D0 86040008 */ lh $a0, 8($s0) -/* 9A97C4 802413D4 8E0300CC */ lw $v1, 0xcc($s0) -/* 9A97C8 802413D8 3C014120 */ lui $at, 0x4120 -/* 9A97CC 802413DC 44812000 */ mtc1 $at, $f4 -/* 9A97D0 802413E0 3C014000 */ lui $at, 0x4000 -/* 9A97D4 802413E4 44810000 */ mtc1 $at, $f0 -/* 9A97D8 802413E8 C442003C */ lwc1 $f2, 0x3c($v0) -/* 9A97DC 802413EC 8C640010 */ lw $a0, 0x10($v1) -/* 9A97E0 802413F0 8C430000 */ lw $v1, ($v0) -/* 9A97E4 802413F4 E444001C */ swc1 $f4, 0x1c($v0) -/* 9A97E8 802413F8 E4400014 */ swc1 $f0, 0x14($v0) -/* 9A97EC 802413FC E4420064 */ swc1 $f2, 0x64($v0) -/* 9A97F0 80241400 34630800 */ ori $v1, $v1, 0x800 -/* 9A97F4 80241404 AC430000 */ sw $v1, ($v0) -/* 9A97F8 80241408 AC440028 */ sw $a0, 0x28($v0) -/* 9A97FC 8024140C 2402000B */ addiu $v0, $zero, 0xb -/* 9A9800 80241410 AE220070 */ sw $v0, 0x70($s1) -/* 9A9804 80241414 8FBF0018 */ lw $ra, 0x18($sp) -/* 9A9808 80241418 8FB10014 */ lw $s1, 0x14($sp) -/* 9A980C 8024141C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A9810 80241420 03E00008 */ jr $ra -/* 9A9814 80241424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4_9A97A4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4_9A97A4.s new file mode 100644 index 0000000000..c142e388a3 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802413B4_9A97A4.s @@ -0,0 +1,33 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802413B4_9A97A4 +/* 9A97A4 802413B4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A97A8 802413B8 AFB10014 */ sw $s1, 0x14($sp) +/* 9A97AC 802413BC 0080882D */ daddu $s1, $a0, $zero +/* 9A97B0 802413C0 AFBF0018 */ sw $ra, 0x18($sp) +/* 9A97B4 802413C4 AFB00010 */ sw $s0, 0x10($sp) +/* 9A97B8 802413C8 8E300148 */ lw $s0, 0x148($s1) +/* 9A97BC 802413CC 0C00EABB */ jal get_npc_unsafe +/* 9A97C0 802413D0 86040008 */ lh $a0, 8($s0) +/* 9A97C4 802413D4 8E0300CC */ lw $v1, 0xcc($s0) +/* 9A97C8 802413D8 3C014120 */ lui $at, 0x4120 +/* 9A97CC 802413DC 44812000 */ mtc1 $at, $f4 +/* 9A97D0 802413E0 3C014000 */ lui $at, 0x4000 +/* 9A97D4 802413E4 44810000 */ mtc1 $at, $f0 +/* 9A97D8 802413E8 C442003C */ lwc1 $f2, 0x3c($v0) +/* 9A97DC 802413EC 8C640010 */ lw $a0, 0x10($v1) +/* 9A97E0 802413F0 8C430000 */ lw $v1, ($v0) +/* 9A97E4 802413F4 E444001C */ swc1 $f4, 0x1c($v0) +/* 9A97E8 802413F8 E4400014 */ swc1 $f0, 0x14($v0) +/* 9A97EC 802413FC E4420064 */ swc1 $f2, 0x64($v0) +/* 9A97F0 80241400 34630800 */ ori $v1, $v1, 0x800 +/* 9A97F4 80241404 AC430000 */ sw $v1, ($v0) +/* 9A97F8 80241408 AC440028 */ sw $a0, 0x28($v0) +/* 9A97FC 8024140C 2402000B */ addiu $v0, $zero, 0xb +/* 9A9800 80241410 AE220070 */ sw $v0, 0x70($s1) +/* 9A9804 80241414 8FBF0018 */ lw $ra, 0x18($sp) +/* 9A9808 80241418 8FB10014 */ lw $s1, 0x14($sp) +/* 9A980C 8024141C 8FB00010 */ lw $s0, 0x10($sp) +/* 9A9810 80241420 03E00008 */ jr $ra +/* 9A9814 80241424 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428.s deleted file mode 100644 index ed3e104e92..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428.s +++ /dev/null @@ -1,35 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241428 -/* 9A9818 80241428 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9A981C 8024142C AFB00010 */ sw $s0, 0x10($sp) -/* 9A9820 80241430 0080802D */ daddu $s0, $a0, $zero -/* 9A9824 80241434 AFBF0014 */ sw $ra, 0x14($sp) -/* 9A9828 80241438 8E020148 */ lw $v0, 0x148($s0) -/* 9A982C 8024143C 0C00EABB */ jal get_npc_unsafe -/* 9A9830 80241440 84440008 */ lh $a0, 8($v0) -/* 9A9834 80241444 0040202D */ daddu $a0, $v0, $zero -/* 9A9838 80241448 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9A983C 8024144C C480001C */ lwc1 $f0, 0x1c($a0) -/* 9A9840 80241450 46001080 */ add.s $f2, $f2, $f0 -/* 9A9844 80241454 C4840014 */ lwc1 $f4, 0x14($a0) -/* 9A9848 80241458 46040001 */ sub.s $f0, $f0, $f4 -/* 9A984C 8024145C C4840064 */ lwc1 $f4, 0x64($a0) -/* 9A9850 80241460 4602203C */ c.lt.s $f4, $f2 -/* 9A9854 80241464 E482003C */ swc1 $f2, 0x3c($a0) -/* 9A9858 80241468 45010009 */ bc1t .L80241490 -/* 9A985C 8024146C E480001C */ swc1 $f0, 0x1c($a0) -/* 9A9860 80241470 8C820000 */ lw $v0, ($a0) -/* 9A9864 80241474 2403F7FF */ addiu $v1, $zero, -0x801 -/* 9A9868 80241478 E484003C */ swc1 $f4, 0x3c($a0) -/* 9A986C 8024147C AC80001C */ sw $zero, 0x1c($a0) -/* 9A9870 80241480 00431024 */ and $v0, $v0, $v1 -/* 9A9874 80241484 AC820000 */ sw $v0, ($a0) -/* 9A9878 80241488 2402000C */ addiu $v0, $zero, 0xc -/* 9A987C 8024148C AE020070 */ sw $v0, 0x70($s0) -.L80241490: -/* 9A9880 80241490 8FBF0014 */ lw $ra, 0x14($sp) -/* 9A9884 80241494 8FB00010 */ lw $s0, 0x10($sp) -/* 9A9888 80241498 03E00008 */ jr $ra -/* 9A988C 8024149C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428_9A9818.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428_9A9818.s new file mode 100644 index 0000000000..1f69a98611 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241428_9A9818.s @@ -0,0 +1,35 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241428_9A9818 +/* 9A9818 80241428 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9A981C 8024142C AFB00010 */ sw $s0, 0x10($sp) +/* 9A9820 80241430 0080802D */ daddu $s0, $a0, $zero +/* 9A9824 80241434 AFBF0014 */ sw $ra, 0x14($sp) +/* 9A9828 80241438 8E020148 */ lw $v0, 0x148($s0) +/* 9A982C 8024143C 0C00EABB */ jal get_npc_unsafe +/* 9A9830 80241440 84440008 */ lh $a0, 8($v0) +/* 9A9834 80241444 0040202D */ daddu $a0, $v0, $zero +/* 9A9838 80241448 C482003C */ lwc1 $f2, 0x3c($a0) +/* 9A983C 8024144C C480001C */ lwc1 $f0, 0x1c($a0) +/* 9A9840 80241450 46001080 */ add.s $f2, $f2, $f0 +/* 9A9844 80241454 C4840014 */ lwc1 $f4, 0x14($a0) +/* 9A9848 80241458 46040001 */ sub.s $f0, $f0, $f4 +/* 9A984C 8024145C C4840064 */ lwc1 $f4, 0x64($a0) +/* 9A9850 80241460 4602203C */ c.lt.s $f4, $f2 +/* 9A9854 80241464 E482003C */ swc1 $f2, 0x3c($a0) +/* 9A9858 80241468 45010009 */ bc1t .L80241490 +/* 9A985C 8024146C E480001C */ swc1 $f0, 0x1c($a0) +/* 9A9860 80241470 8C820000 */ lw $v0, ($a0) +/* 9A9864 80241474 2403F7FF */ addiu $v1, $zero, -0x801 +/* 9A9868 80241478 E484003C */ swc1 $f4, 0x3c($a0) +/* 9A986C 8024147C AC80001C */ sw $zero, 0x1c($a0) +/* 9A9870 80241480 00431024 */ and $v0, $v0, $v1 +/* 9A9874 80241484 AC820000 */ sw $v0, ($a0) +/* 9A9878 80241488 2402000C */ addiu $v0, $zero, 0xc +/* 9A987C 8024148C AE020070 */ sw $v0, 0x70($s0) +.L80241490: +/* 9A9880 80241490 8FBF0014 */ lw $ra, 0x14($sp) +/* 9A9884 80241494 8FB00010 */ lw $s0, 0x10($sp) +/* 9A9888 80241498 03E00008 */ jr $ra +/* 9A988C 8024149C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0.s deleted file mode 100644 index 757cc835a0..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0.s +++ /dev/null @@ -1,82 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414A0 -/* 9A9890 802414A0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 9A9894 802414A4 AFB3001C */ sw $s3, 0x1c($sp) -/* 9A9898 802414A8 0080982D */ daddu $s3, $a0, $zero -/* 9A989C 802414AC AFBF0020 */ sw $ra, 0x20($sp) -/* 9A98A0 802414B0 AFB20018 */ sw $s2, 0x18($sp) -/* 9A98A4 802414B4 AFB10014 */ sw $s1, 0x14($sp) -/* 9A98A8 802414B8 AFB00010 */ sw $s0, 0x10($sp) -/* 9A98AC 802414BC F7B40028 */ sdc1 $f20, 0x28($sp) -/* 9A98B0 802414C0 8E710148 */ lw $s1, 0x148($s3) -/* 9A98B4 802414C4 86240008 */ lh $a0, 8($s1) -/* 9A98B8 802414C8 0C00EABB */ jal get_npc_unsafe -/* 9A98BC 802414CC 00A0802D */ daddu $s0, $a1, $zero -/* 9A98C0 802414D0 8E040020 */ lw $a0, 0x20($s0) -/* 9A98C4 802414D4 0040902D */ daddu $s2, $v0, $zero -/* 9A98C8 802414D8 00041FC2 */ srl $v1, $a0, 0x1f -/* 9A98CC 802414DC 00832021 */ addu $a0, $a0, $v1 -/* 9A98D0 802414E0 00042043 */ sra $a0, $a0, 1 -/* 9A98D4 802414E4 0C00A67F */ jal rand_int -/* 9A98D8 802414E8 24840001 */ addiu $a0, $a0, 1 -/* 9A98DC 802414EC 8E030020 */ lw $v1, 0x20($s0) -/* 9A98E0 802414F0 C64C0038 */ lwc1 $f12, 0x38($s2) -/* 9A98E4 802414F4 000327C2 */ srl $a0, $v1, 0x1f -/* 9A98E8 802414F8 00641821 */ addu $v1, $v1, $a0 -/* 9A98EC 802414FC 00031843 */ sra $v1, $v1, 1 -/* 9A98F0 80241500 00621821 */ addu $v1, $v1, $v0 -/* 9A98F4 80241504 A643008E */ sh $v1, 0x8e($s2) -/* 9A98F8 80241508 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A98FC 8024150C C64E0040 */ lwc1 $f14, 0x40($s2) -/* 9A9900 80241510 8C42000C */ lw $v0, 0xc($v0) -/* 9A9904 80241514 AE420028 */ sw $v0, 0x28($s2) -/* 9A9908 80241518 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9A990C 8024151C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9A9910 80241520 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9A9914 80241524 E6400018 */ swc1 $f0, 0x18($s2) -/* 9A9918 80241528 8C460028 */ lw $a2, 0x28($v0) -/* 9A991C 8024152C 0C00A720 */ jal atan2 -/* 9A9920 80241530 8C470030 */ lw $a3, 0x30($v0) -/* 9A9924 80241534 46000506 */ mov.s $f20, $f0 -/* 9A9928 80241538 C64C000C */ lwc1 $f12, 0xc($s2) -/* 9A992C 8024153C 0C00A70A */ jal get_clamped_angle_diff -/* 9A9930 80241540 4600A386 */ mov.s $f14, $f20 -/* 9A9934 80241544 46000086 */ mov.s $f2, $f0 -/* 9A9938 80241548 8E02001C */ lw $v0, 0x1c($s0) -/* 9A993C 8024154C 46001005 */ abs.s $f0, $f2 -/* 9A9940 80241550 44822000 */ mtc1 $v0, $f4 -/* 9A9944 80241554 00000000 */ nop -/* 9A9948 80241558 46802120 */ cvt.s.w $f4, $f4 -/* 9A994C 8024155C 4600203C */ c.lt.s $f4, $f0 -/* 9A9950 80241560 00000000 */ nop -/* 9A9954 80241564 4500000D */ bc1f .L8024159C -/* 9A9958 80241568 00000000 */ nop -/* 9A995C 8024156C 44800000 */ mtc1 $zero, $f0 -/* 9A9960 80241570 C654000C */ lwc1 $f20, 0xc($s2) -/* 9A9964 80241574 4600103C */ c.lt.s $f2, $f0 -/* 9A9968 80241578 00000000 */ nop -/* 9A996C 8024157C 45000006 */ bc1f .L80241598 -/* 9A9970 80241580 00021023 */ negu $v0, $v0 -/* 9A9974 80241584 44820000 */ mtc1 $v0, $f0 -/* 9A9978 80241588 00000000 */ nop -/* 9A997C 8024158C 46800020 */ cvt.s.w $f0, $f0 -/* 9A9980 80241590 08090567 */ j .L8024159C -/* 9A9984 80241594 4600A500 */ add.s $f20, $f20, $f0 -.L80241598: -/* 9A9988 80241598 4604A500 */ add.s $f20, $f20, $f4 -.L8024159C: -/* 9A998C 8024159C 0C00A6C9 */ jal clamp_angle -/* 9A9990 802415A0 4600A306 */ mov.s $f12, $f20 -/* 9A9994 802415A4 2402000D */ addiu $v0, $zero, 0xd -/* 9A9998 802415A8 E640000C */ swc1 $f0, 0xc($s2) -/* 9A999C 802415AC AE620070 */ sw $v0, 0x70($s3) -/* 9A99A0 802415B0 8FBF0020 */ lw $ra, 0x20($sp) -/* 9A99A4 802415B4 8FB3001C */ lw $s3, 0x1c($sp) -/* 9A99A8 802415B8 8FB20018 */ lw $s2, 0x18($sp) -/* 9A99AC 802415BC 8FB10014 */ lw $s1, 0x14($sp) -/* 9A99B0 802415C0 8FB00010 */ lw $s0, 0x10($sp) -/* 9A99B4 802415C4 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 9A99B8 802415C8 03E00008 */ jr $ra -/* 9A99BC 802415CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0_9A9890.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0_9A9890.s new file mode 100644 index 0000000000..ac3d24498b --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802414A0_9A9890.s @@ -0,0 +1,82 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802414A0_9A9890 +/* 9A9890 802414A0 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* 9A9894 802414A4 AFB3001C */ sw $s3, 0x1c($sp) +/* 9A9898 802414A8 0080982D */ daddu $s3, $a0, $zero +/* 9A989C 802414AC AFBF0020 */ sw $ra, 0x20($sp) +/* 9A98A0 802414B0 AFB20018 */ sw $s2, 0x18($sp) +/* 9A98A4 802414B4 AFB10014 */ sw $s1, 0x14($sp) +/* 9A98A8 802414B8 AFB00010 */ sw $s0, 0x10($sp) +/* 9A98AC 802414BC F7B40028 */ sdc1 $f20, 0x28($sp) +/* 9A98B0 802414C0 8E710148 */ lw $s1, 0x148($s3) +/* 9A98B4 802414C4 86240008 */ lh $a0, 8($s1) +/* 9A98B8 802414C8 0C00EABB */ jal get_npc_unsafe +/* 9A98BC 802414CC 00A0802D */ daddu $s0, $a1, $zero +/* 9A98C0 802414D0 8E040020 */ lw $a0, 0x20($s0) +/* 9A98C4 802414D4 0040902D */ daddu $s2, $v0, $zero +/* 9A98C8 802414D8 00041FC2 */ srl $v1, $a0, 0x1f +/* 9A98CC 802414DC 00832021 */ addu $a0, $a0, $v1 +/* 9A98D0 802414E0 00042043 */ sra $a0, $a0, 1 +/* 9A98D4 802414E4 0C00A67F */ jal rand_int +/* 9A98D8 802414E8 24840001 */ addiu $a0, $a0, 1 +/* 9A98DC 802414EC 8E030020 */ lw $v1, 0x20($s0) +/* 9A98E0 802414F0 C64C0038 */ lwc1 $f12, 0x38($s2) +/* 9A98E4 802414F4 000327C2 */ srl $a0, $v1, 0x1f +/* 9A98E8 802414F8 00641821 */ addu $v1, $v1, $a0 +/* 9A98EC 802414FC 00031843 */ sra $v1, $v1, 1 +/* 9A98F0 80241500 00621821 */ addu $v1, $v1, $v0 +/* 9A98F4 80241504 A643008E */ sh $v1, 0x8e($s2) +/* 9A98F8 80241508 8E2200CC */ lw $v0, 0xcc($s1) +/* 9A98FC 8024150C C64E0040 */ lwc1 $f14, 0x40($s2) +/* 9A9900 80241510 8C42000C */ lw $v0, 0xc($v0) +/* 9A9904 80241514 AE420028 */ sw $v0, 0x28($s2) +/* 9A9908 80241518 C6000018 */ lwc1 $f0, 0x18($s0) +/* 9A990C 8024151C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9A9910 80241520 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9A9914 80241524 E6400018 */ swc1 $f0, 0x18($s2) +/* 9A9918 80241528 8C460028 */ lw $a2, 0x28($v0) +/* 9A991C 8024152C 0C00A720 */ jal atan2 +/* 9A9920 80241530 8C470030 */ lw $a3, 0x30($v0) +/* 9A9924 80241534 46000506 */ mov.s $f20, $f0 +/* 9A9928 80241538 C64C000C */ lwc1 $f12, 0xc($s2) +/* 9A992C 8024153C 0C00A70A */ jal get_clamped_angle_diff +/* 9A9930 80241540 4600A386 */ mov.s $f14, $f20 +/* 9A9934 80241544 46000086 */ mov.s $f2, $f0 +/* 9A9938 80241548 8E02001C */ lw $v0, 0x1c($s0) +/* 9A993C 8024154C 46001005 */ abs.s $f0, $f2 +/* 9A9940 80241550 44822000 */ mtc1 $v0, $f4 +/* 9A9944 80241554 00000000 */ nop +/* 9A9948 80241558 46802120 */ cvt.s.w $f4, $f4 +/* 9A994C 8024155C 4600203C */ c.lt.s $f4, $f0 +/* 9A9950 80241560 00000000 */ nop +/* 9A9954 80241564 4500000D */ bc1f .L8024159C +/* 9A9958 80241568 00000000 */ nop +/* 9A995C 8024156C 44800000 */ mtc1 $zero, $f0 +/* 9A9960 80241570 C654000C */ lwc1 $f20, 0xc($s2) +/* 9A9964 80241574 4600103C */ c.lt.s $f2, $f0 +/* 9A9968 80241578 00000000 */ nop +/* 9A996C 8024157C 45000006 */ bc1f .L80241598 +/* 9A9970 80241580 00021023 */ negu $v0, $v0 +/* 9A9974 80241584 44820000 */ mtc1 $v0, $f0 +/* 9A9978 80241588 00000000 */ nop +/* 9A997C 8024158C 46800020 */ cvt.s.w $f0, $f0 +/* 9A9980 80241590 08090567 */ j .L8024159C +/* 9A9984 80241594 4600A500 */ add.s $f20, $f20, $f0 +.L80241598: +/* 9A9988 80241598 4604A500 */ add.s $f20, $f20, $f4 +.L8024159C: +/* 9A998C 8024159C 0C00A6C9 */ jal clamp_angle +/* 9A9990 802415A0 4600A306 */ mov.s $f12, $f20 +/* 9A9994 802415A4 2402000D */ addiu $v0, $zero, 0xd +/* 9A9998 802415A8 E640000C */ swc1 $f0, 0xc($s2) +/* 9A999C 802415AC AE620070 */ sw $v0, 0x70($s3) +/* 9A99A0 802415B0 8FBF0020 */ lw $ra, 0x20($sp) +/* 9A99A4 802415B4 8FB3001C */ lw $s3, 0x1c($sp) +/* 9A99A8 802415B8 8FB20018 */ lw $s2, 0x18($sp) +/* 9A99AC 802415BC 8FB10014 */ lw $s1, 0x14($sp) +/* 9A99B0 802415C0 8FB00010 */ lw $s0, 0x10($sp) +/* 9A99B4 802415C4 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 9A99B8 802415C8 03E00008 */ jr $ra +/* 9A99BC 802415CC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758.s deleted file mode 100644 index a8e55ca4a1..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758.s +++ /dev/null @@ -1,55 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241758 -/* 9A9B48 80241758 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9A9B4C 8024175C AFB10014 */ sw $s1, 0x14($sp) -/* 9A9B50 80241760 0080882D */ daddu $s1, $a0, $zero -/* 9A9B54 80241764 AFBF001C */ sw $ra, 0x1c($sp) -/* 9A9B58 80241768 AFB20018 */ sw $s2, 0x18($sp) -/* 9A9B5C 8024176C AFB00010 */ sw $s0, 0x10($sp) -/* 9A9B60 80241770 8E300148 */ lw $s0, 0x148($s1) -/* 9A9B64 80241774 86040008 */ lh $a0, 8($s0) -/* 9A9B68 80241778 0C00EABB */ jal get_npc_unsafe -/* 9A9B6C 8024177C 00A0902D */ daddu $s2, $a1, $zero -/* 9A9B70 80241780 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9A9B74 80241784 8E240078 */ lw $a0, 0x78($s1) -/* 9A9B78 80241788 8C630000 */ lw $v1, ($v1) -/* 9A9B7C 8024178C 0083182A */ slt $v1, $a0, $v1 -/* 9A9B80 80241790 10600013 */ beqz $v1, .L802417E0 -/* 9A9B84 80241794 0040302D */ daddu $a2, $v0, $zero -/* 9A9B88 80241798 00041040 */ sll $v0, $a0, 1 -/* 9A9B8C 8024179C 00441021 */ addu $v0, $v0, $a0 -/* 9A9B90 802417A0 00022880 */ sll $a1, $v0, 2 -.L802417A4: -/* 9A9B94 802417A4 8E0300D0 */ lw $v1, 0xd0($s0) -/* 9A9B98 802417A8 C4C2003C */ lwc1 $f2, 0x3c($a2) -/* 9A9B9C 802417AC 00A31021 */ addu $v0, $a1, $v1 -/* 9A9BA0 802417B0 C4400008 */ lwc1 $f0, 8($v0) -/* 9A9BA4 802417B4 46800020 */ cvt.s.w $f0, $f0 -/* 9A9BA8 802417B8 4602003E */ c.le.s $f0, $f2 -/* 9A9BAC 802417BC 00000000 */ nop -/* 9A9BB0 802417C0 45020003 */ bc1fl .L802417D0 -/* 9A9BB4 802417C4 24840001 */ addiu $a0, $a0, 1 -/* 9A9BB8 802417C8 080905F8 */ j .L802417E0 -/* 9A9BBC 802417CC AE240078 */ sw $a0, 0x78($s1) -.L802417D0: -/* 9A9BC0 802417D0 8C620000 */ lw $v0, ($v1) -/* 9A9BC4 802417D4 0082102A */ slt $v0, $a0, $v0 -/* 9A9BC8 802417D8 1440FFF2 */ bnez $v0, .L802417A4 -/* 9A9BCC 802417DC 24A5000C */ addiu $a1, $a1, 0xc -.L802417E0: -/* 9A9BD0 802417E0 C6400000 */ lwc1 $f0, ($s2) -/* 9A9BD4 802417E4 E4C00018 */ swc1 $f0, 0x18($a2) -/* 9A9BD8 802417E8 8E0200CC */ lw $v0, 0xcc($s0) -/* 9A9BDC 802417EC 8C420004 */ lw $v0, 4($v0) -/* 9A9BE0 802417F0 ACC20028 */ sw $v0, 0x28($a2) -/* 9A9BE4 802417F4 24020001 */ addiu $v0, $zero, 1 -/* 9A9BE8 802417F8 AE200074 */ sw $zero, 0x74($s1) -/* 9A9BEC 802417FC AE220070 */ sw $v0, 0x70($s1) -/* 9A9BF0 80241800 8FBF001C */ lw $ra, 0x1c($sp) -/* 9A9BF4 80241804 8FB20018 */ lw $s2, 0x18($sp) -/* 9A9BF8 80241808 8FB10014 */ lw $s1, 0x14($sp) -/* 9A9BFC 8024180C 8FB00010 */ lw $s0, 0x10($sp) -/* 9A9C00 80241810 03E00008 */ jr $ra -/* 9A9C04 80241814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s new file mode 100644 index 0000000000..d3c0e93bf0 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241758_9A9B48.s @@ -0,0 +1,55 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241758_9A9B48 +/* 9A9B48 80241758 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9A9B4C 8024175C AFB10014 */ sw $s1, 0x14($sp) +/* 9A9B50 80241760 0080882D */ daddu $s1, $a0, $zero +/* 9A9B54 80241764 AFBF001C */ sw $ra, 0x1c($sp) +/* 9A9B58 80241768 AFB20018 */ sw $s2, 0x18($sp) +/* 9A9B5C 8024176C AFB00010 */ sw $s0, 0x10($sp) +/* 9A9B60 80241770 8E300148 */ lw $s0, 0x148($s1) +/* 9A9B64 80241774 86040008 */ lh $a0, 8($s0) +/* 9A9B68 80241778 0C00EABB */ jal get_npc_unsafe +/* 9A9B6C 8024177C 00A0902D */ daddu $s2, $a1, $zero +/* 9A9B70 80241780 8E0300D0 */ lw $v1, 0xd0($s0) +/* 9A9B74 80241784 8E240078 */ lw $a0, 0x78($s1) +/* 9A9B78 80241788 8C630000 */ lw $v1, ($v1) +/* 9A9B7C 8024178C 0083182A */ slt $v1, $a0, $v1 +/* 9A9B80 80241790 10600013 */ beqz $v1, .L802417E0 +/* 9A9B84 80241794 0040302D */ daddu $a2, $v0, $zero +/* 9A9B88 80241798 00041040 */ sll $v0, $a0, 1 +/* 9A9B8C 8024179C 00441021 */ addu $v0, $v0, $a0 +/* 9A9B90 802417A0 00022880 */ sll $a1, $v0, 2 +.L802417A4: +/* 9A9B94 802417A4 8E0300D0 */ lw $v1, 0xd0($s0) +/* 9A9B98 802417A8 C4C2003C */ lwc1 $f2, 0x3c($a2) +/* 9A9B9C 802417AC 00A31021 */ addu $v0, $a1, $v1 +/* 9A9BA0 802417B0 C4400008 */ lwc1 $f0, 8($v0) +/* 9A9BA4 802417B4 46800020 */ cvt.s.w $f0, $f0 +/* 9A9BA8 802417B8 4602003E */ c.le.s $f0, $f2 +/* 9A9BAC 802417BC 00000000 */ nop +/* 9A9BB0 802417C0 45020003 */ bc1fl .L802417D0 +/* 9A9BB4 802417C4 24840001 */ addiu $a0, $a0, 1 +/* 9A9BB8 802417C8 080905F8 */ j .L802417E0 +/* 9A9BBC 802417CC AE240078 */ sw $a0, 0x78($s1) +.L802417D0: +/* 9A9BC0 802417D0 8C620000 */ lw $v0, ($v1) +/* 9A9BC4 802417D4 0082102A */ slt $v0, $a0, $v0 +/* 9A9BC8 802417D8 1440FFF2 */ bnez $v0, .L802417A4 +/* 9A9BCC 802417DC 24A5000C */ addiu $a1, $a1, 0xc +.L802417E0: +/* 9A9BD0 802417E0 C6400000 */ lwc1 $f0, ($s2) +/* 9A9BD4 802417E4 E4C00018 */ swc1 $f0, 0x18($a2) +/* 9A9BD8 802417E8 8E0200CC */ lw $v0, 0xcc($s0) +/* 9A9BDC 802417EC 8C420004 */ lw $v0, 4($v0) +/* 9A9BE0 802417F0 ACC20028 */ sw $v0, 0x28($a2) +/* 9A9BE4 802417F4 24020001 */ addiu $v0, $zero, 1 +/* 9A9BE8 802417F8 AE200074 */ sw $zero, 0x74($s1) +/* 9A9BEC 802417FC AE220070 */ sw $v0, 0x70($s1) +/* 9A9BF0 80241800 8FBF001C */ lw $ra, 0x1c($sp) +/* 9A9BF4 80241804 8FB20018 */ lw $s2, 0x18($sp) +/* 9A9BF8 80241808 8FB10014 */ lw $s1, 0x14($sp) +/* 9A9BFC 8024180C 8FB00010 */ lw $s0, 0x10($sp) +/* 9A9C00 80241810 03E00008 */ jr $ra +/* 9A9C04 80241814 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818.s deleted file mode 100644 index f64ae34eb2..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818.s +++ /dev/null @@ -1,202 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241818 -/* 9A9C08 80241818 27BDFF98 */ addiu $sp, $sp, -0x68 -/* 9A9C0C 8024181C AFB40058 */ sw $s4, 0x58($sp) -/* 9A9C10 80241820 0080A02D */ daddu $s4, $a0, $zero -/* 9A9C14 80241824 AFBF0060 */ sw $ra, 0x60($sp) -/* 9A9C18 80241828 AFB5005C */ sw $s5, 0x5c($sp) -/* 9A9C1C 8024182C AFB30054 */ sw $s3, 0x54($sp) -/* 9A9C20 80241830 AFB20050 */ sw $s2, 0x50($sp) -/* 9A9C24 80241834 AFB1004C */ sw $s1, 0x4c($sp) -/* 9A9C28 80241838 AFB00048 */ sw $s0, 0x48($sp) -/* 9A9C2C 8024183C 8E910148 */ lw $s1, 0x148($s4) -/* 9A9C30 80241840 86240008 */ lh $a0, 8($s1) -/* 9A9C34 80241844 0C00EABB */ jal get_npc_unsafe -/* 9A9C38 80241848 00A0802D */ daddu $s0, $a1, $zero -/* 9A9C3C 8024184C 8E83000C */ lw $v1, 0xc($s4) -/* 9A9C40 80241850 0280202D */ daddu $a0, $s4, $zero -/* 9A9C44 80241854 8C650000 */ lw $a1, ($v1) -/* 9A9C48 80241858 0C0B1EAF */ jal get_variable -/* 9A9C4C 8024185C 0040902D */ daddu $s2, $v0, $zero -/* 9A9C50 80241860 AFA00018 */ sw $zero, 0x18($sp) -/* 9A9C54 80241864 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9C58 80241868 8C630094 */ lw $v1, 0x94($v1) -/* 9A9C5C 8024186C AFA3001C */ sw $v1, 0x1c($sp) -/* 9A9C60 80241870 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9C64 80241874 8C630080 */ lw $v1, 0x80($v1) -/* 9A9C68 80241878 AFA30020 */ sw $v1, 0x20($sp) -/* 9A9C6C 8024187C 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9C70 80241880 8C630088 */ lw $v1, 0x88($v1) -/* 9A9C74 80241884 AFA30024 */ sw $v1, 0x24($sp) -/* 9A9C78 80241888 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9C7C 8024188C 8C63008C */ lw $v1, 0x8c($v1) -/* 9A9C80 80241890 27B50018 */ addiu $s5, $sp, 0x18 -/* 9A9C84 80241894 AFA30028 */ sw $v1, 0x28($sp) -/* 9A9C88 80241898 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9A9C8C 8024189C 3C014282 */ lui $at, 0x4282 -/* 9A9C90 802418A0 44810000 */ mtc1 $at, $f0 -/* 9A9C94 802418A4 8C630090 */ lw $v1, 0x90($v1) -/* 9A9C98 802418A8 0040982D */ daddu $s3, $v0, $zero -/* 9A9C9C 802418AC E7A00030 */ swc1 $f0, 0x30($sp) -/* 9A9CA0 802418B0 A7A00034 */ sh $zero, 0x34($sp) -/* 9A9CA4 802418B4 16000005 */ bnez $s0, .L802418CC -/* 9A9CA8 802418B8 AFA3002C */ sw $v1, 0x2c($sp) -/* 9A9CAC 802418BC 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A9CB0 802418C0 30420004 */ andi $v0, $v0, 4 -/* 9A9CB4 802418C4 10400044 */ beqz $v0, .L802419D8 -/* 9A9CB8 802418C8 00000000 */ nop -.L802418CC: -/* 9A9CBC 802418CC 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9A9CC0 802418D0 AE800070 */ sw $zero, 0x70($s4) -/* 9A9CC4 802418D4 A640008E */ sh $zero, 0x8e($s2) -/* 9A9CC8 802418D8 8E2200CC */ lw $v0, 0xcc($s1) -/* 9A9CCC 802418DC 8E430000 */ lw $v1, ($s2) -/* 9A9CD0 802418E0 8C420000 */ lw $v0, ($v0) -/* 9A9CD4 802418E4 00641824 */ and $v1, $v1, $a0 -/* 9A9CD8 802418E8 AE430000 */ sw $v1, ($s2) -/* 9A9CDC 802418EC AE420028 */ sw $v0, 0x28($s2) -/* 9A9CE0 802418F0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9A9CE4 802418F4 8C420098 */ lw $v0, 0x98($v0) -/* 9A9CE8 802418F8 54400005 */ bnel $v0, $zero, .L80241910 -/* 9A9CEC 802418FC 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9A9CF0 80241900 34620200 */ ori $v0, $v1, 0x200 -/* 9A9CF4 80241904 2403FFF7 */ addiu $v1, $zero, -9 -/* 9A9CF8 80241908 08090646 */ j .L80241918 -/* 9A9CFC 8024190C 00431024 */ and $v0, $v0, $v1 -.L80241910: -/* 9A9D00 80241910 00621024 */ and $v0, $v1, $v0 -/* 9A9D04 80241914 34420008 */ ori $v0, $v0, 8 -.L80241918: -/* 9A9D08 80241918 AE420000 */ sw $v0, ($s2) -/* 9A9D0C 8024191C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A9D10 80241920 30420004 */ andi $v0, $v0, 4 -/* 9A9D14 80241924 10400008 */ beqz $v0, .L80241948 -/* 9A9D18 80241928 24020063 */ addiu $v0, $zero, 0x63 -/* 9A9D1C 8024192C AE820070 */ sw $v0, 0x70($s4) -/* 9A9D20 80241930 AE800074 */ sw $zero, 0x74($s4) -/* 9A9D24 80241934 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9A9D28 80241938 2403FFFB */ addiu $v1, $zero, -5 -/* 9A9D2C 8024193C 00431024 */ and $v0, $v0, $v1 -/* 9A9D30 80241940 0809065D */ j .L80241974 -/* 9A9D34 80241944 AE2200B0 */ sw $v0, 0xb0($s1) -.L80241948: -/* 9A9D38 80241948 8E220000 */ lw $v0, ($s1) -/* 9A9D3C 8024194C 3C034000 */ lui $v1, 0x4000 -/* 9A9D40 80241950 00431024 */ and $v0, $v0, $v1 -/* 9A9D44 80241954 10400007 */ beqz $v0, .L80241974 -/* 9A9D48 80241958 3C03BFFF */ lui $v1, 0xbfff -/* 9A9D4C 8024195C 2402000C */ addiu $v0, $zero, 0xc -/* 9A9D50 80241960 AE820070 */ sw $v0, 0x70($s4) -/* 9A9D54 80241964 8E220000 */ lw $v0, ($s1) -/* 9A9D58 80241968 3463FFFF */ ori $v1, $v1, 0xffff -/* 9A9D5C 8024196C 00431024 */ and $v0, $v0, $v1 -/* 9A9D60 80241970 AE220000 */ sw $v0, ($s1) -.L80241974: -/* 9A9D64 80241974 27A50038 */ addiu $a1, $sp, 0x38 -/* 9A9D68 80241978 27A6003C */ addiu $a2, $sp, 0x3c -/* 9A9D6C 8024197C C6400038 */ lwc1 $f0, 0x38($s2) -/* 9A9D70 80241980 864200A8 */ lh $v0, 0xa8($s2) -/* 9A9D74 80241984 3C0142C8 */ lui $at, 0x42c8 -/* 9A9D78 80241988 44812000 */ mtc1 $at, $f4 -/* 9A9D7C 8024198C 44823000 */ mtc1 $v0, $f6 -/* 9A9D80 80241990 00000000 */ nop -/* 9A9D84 80241994 468031A0 */ cvt.s.w $f6, $f6 -/* 9A9D88 80241998 27A20044 */ addiu $v0, $sp, 0x44 -/* 9A9D8C 8024199C E7A00038 */ swc1 $f0, 0x38($sp) -/* 9A9D90 802419A0 C640003C */ lwc1 $f0, 0x3c($s2) -/* 9A9D94 802419A4 C6420040 */ lwc1 $f2, 0x40($s2) -/* 9A9D98 802419A8 46060000 */ add.s $f0, $f0, $f6 -/* 9A9D9C 802419AC E7A40044 */ swc1 $f4, 0x44($sp) -/* 9A9DA0 802419B0 E7A20040 */ swc1 $f2, 0x40($sp) -/* 9A9DA4 802419B4 E7A0003C */ swc1 $f0, 0x3c($sp) -/* 9A9DA8 802419B8 AFA20010 */ sw $v0, 0x10($sp) -/* 9A9DAC 802419BC 8E440080 */ lw $a0, 0x80($s2) -/* 9A9DB0 802419C0 0C0372DF */ jal func_800DCB7C -/* 9A9DB4 802419C4 27A70040 */ addiu $a3, $sp, 0x40 -/* 9A9DB8 802419C8 10400003 */ beqz $v0, .L802419D8 -/* 9A9DBC 802419CC 00000000 */ nop -/* 9A9DC0 802419D0 C7A0003C */ lwc1 $f0, 0x3c($sp) -/* 9A9DC4 802419D4 E640003C */ swc1 $f0, 0x3c($s2) -.L802419D8: -/* 9A9DC8 802419D8 8E830070 */ lw $v1, 0x70($s4) -/* 9A9DCC 802419DC 2C620064 */ sltiu $v0, $v1, 0x64 -/* 9A9DD0 802419E0 10400042 */ beqz $v0, .L80241AEC -/* 9A9DD4 802419E4 00031080 */ sll $v0, $v1, 2 -/* 9A9DD8 802419E8 3C018024 */ lui $at, 0x8024 -/* 9A9DDC 802419EC 00220821 */ addu $at, $at, $v0 -/* 9A9DE0 802419F0 8C225F50 */ lw $v0, 0x5f50($at) -/* 9A9DE4 802419F4 00400008 */ jr $v0 -/* 9A9DE8 802419F8 00000000 */ nop -/* 9A9DEC 802419FC 0280202D */ daddu $a0, $s4, $zero -/* 9A9DF0 80241A00 0260282D */ daddu $a1, $s3, $zero -/* 9A9DF4 80241A04 0C090321 */ jal func_80240C84 -/* 9A9DF8 80241A08 02A0302D */ daddu $a2, $s5, $zero -/* 9A9DFC 80241A0C 0280202D */ daddu $a0, $s4, $zero -/* 9A9E00 80241A10 0260282D */ daddu $a1, $s3, $zero -/* 9A9E04 80241A14 0C090377 */ jal func_80240DDC -/* 9A9E08 80241A18 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E0C 80241A1C 080906BB */ j .L80241AEC -/* 9A9E10 80241A20 00000000 */ nop -/* 9A9E14 80241A24 0280202D */ daddu $a0, $s4, $zero -/* 9A9E18 80241A28 0260282D */ daddu $a1, $s3, $zero -/* 9A9E1C 80241A2C 0C090421 */ jal func_80241084 -/* 9A9E20 80241A30 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E24 80241A34 0280202D */ daddu $a0, $s4, $zero -/* 9A9E28 80241A38 0260282D */ daddu $a1, $s3, $zero -/* 9A9E2C 80241A3C 0C090451 */ jal func_80241144 -/* 9A9E30 80241A40 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E34 80241A44 080906BB */ j .L80241AEC -/* 9A9E38 80241A48 00000000 */ nop -/* 9A9E3C 80241A4C 0280202D */ daddu $a0, $s4, $zero -/* 9A9E40 80241A50 0260282D */ daddu $a1, $s3, $zero -/* 9A9E44 80241A54 0C0904C0 */ jal func_80241300 -/* 9A9E48 80241A58 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E4C 80241A5C 080906BB */ j .L80241AEC -/* 9A9E50 80241A60 00000000 */ nop -/* 9A9E54 80241A64 0280202D */ daddu $a0, $s4, $zero -/* 9A9E58 80241A68 0260282D */ daddu $a1, $s3, $zero -/* 9A9E5C 80241A6C 0C0904ED */ jal func_802413B4 -/* 9A9E60 80241A70 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E64 80241A74 0280202D */ daddu $a0, $s4, $zero -/* 9A9E68 80241A78 0260282D */ daddu $a1, $s3, $zero -/* 9A9E6C 80241A7C 0C09050A */ jal func_80241428 -/* 9A9E70 80241A80 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E74 80241A84 080906BB */ j .L80241AEC -/* 9A9E78 80241A88 00000000 */ nop -/* 9A9E7C 80241A8C 0280202D */ daddu $a0, $s4, $zero -/* 9A9E80 80241A90 0260282D */ daddu $a1, $s3, $zero -/* 9A9E84 80241A94 0C090528 */ jal func_802414A0 -/* 9A9E88 80241A98 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E8C 80241A9C 0280202D */ daddu $a0, $s4, $zero -/* 9A9E90 80241AA0 0260282D */ daddu $a1, $s3, $zero -/* 9A9E94 80241AA4 0C090574 */ jal func_802415D0 -/* 9A9E98 80241AA8 02A0302D */ daddu $a2, $s5, $zero -/* 9A9E9C 80241AAC 080906BB */ j .L80241AEC -/* 9A9EA0 80241AB0 00000000 */ nop -/* 9A9EA4 80241AB4 0280202D */ daddu $a0, $s4, $zero -/* 9A9EA8 80241AB8 0260282D */ daddu $a1, $s3, $zero -/* 9A9EAC 80241ABC 0C0905BC */ jal func_802416F0 -/* 9A9EB0 80241AC0 02A0302D */ daddu $a2, $s5, $zero -/* 9A9EB4 80241AC4 080906BB */ j .L80241AEC -/* 9A9EB8 80241AC8 00000000 */ nop -/* 9A9EBC 80241ACC 0280202D */ daddu $a0, $s4, $zero -/* 9A9EC0 80241AD0 0260282D */ daddu $a1, $s3, $zero -/* 9A9EC4 80241AD4 0C0905D6 */ jal func_80241758 -/* 9A9EC8 80241AD8 02A0302D */ daddu $a2, $s5, $zero -/* 9A9ECC 80241ADC 080906BB */ j .L80241AEC -/* 9A9ED0 80241AE0 00000000 */ nop -/* 9A9ED4 80241AE4 0C0129CF */ jal func_8004A73C -/* 9A9ED8 80241AE8 0280202D */ daddu $a0, $s4, $zero -.L80241AEC: -/* 9A9EDC 80241AEC 8FBF0060 */ lw $ra, 0x60($sp) -/* 9A9EE0 80241AF0 8FB5005C */ lw $s5, 0x5c($sp) -/* 9A9EE4 80241AF4 8FB40058 */ lw $s4, 0x58($sp) -/* 9A9EE8 80241AF8 8FB30054 */ lw $s3, 0x54($sp) -/* 9A9EEC 80241AFC 8FB20050 */ lw $s2, 0x50($sp) -/* 9A9EF0 80241B00 8FB1004C */ lw $s1, 0x4c($sp) -/* 9A9EF4 80241B04 8FB00048 */ lw $s0, 0x48($sp) -/* 9A9EF8 80241B08 0000102D */ daddu $v0, $zero, $zero -/* 9A9EFC 80241B0C 03E00008 */ jr $ra -/* 9A9F00 80241B10 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s new file mode 100644 index 0000000000..e1f7657cac --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241818_9A9C08.s @@ -0,0 +1,202 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241818_9A9C08 +/* 9A9C08 80241818 27BDFF98 */ addiu $sp, $sp, -0x68 +/* 9A9C0C 8024181C AFB40058 */ sw $s4, 0x58($sp) +/* 9A9C10 80241820 0080A02D */ daddu $s4, $a0, $zero +/* 9A9C14 80241824 AFBF0060 */ sw $ra, 0x60($sp) +/* 9A9C18 80241828 AFB5005C */ sw $s5, 0x5c($sp) +/* 9A9C1C 8024182C AFB30054 */ sw $s3, 0x54($sp) +/* 9A9C20 80241830 AFB20050 */ sw $s2, 0x50($sp) +/* 9A9C24 80241834 AFB1004C */ sw $s1, 0x4c($sp) +/* 9A9C28 80241838 AFB00048 */ sw $s0, 0x48($sp) +/* 9A9C2C 8024183C 8E910148 */ lw $s1, 0x148($s4) +/* 9A9C30 80241840 86240008 */ lh $a0, 8($s1) +/* 9A9C34 80241844 0C00EABB */ jal get_npc_unsafe +/* 9A9C38 80241848 00A0802D */ daddu $s0, $a1, $zero +/* 9A9C3C 8024184C 8E83000C */ lw $v1, 0xc($s4) +/* 9A9C40 80241850 0280202D */ daddu $a0, $s4, $zero +/* 9A9C44 80241854 8C650000 */ lw $a1, ($v1) +/* 9A9C48 80241858 0C0B1EAF */ jal get_variable +/* 9A9C4C 8024185C 0040902D */ daddu $s2, $v0, $zero +/* 9A9C50 80241860 AFA00018 */ sw $zero, 0x18($sp) +/* 9A9C54 80241864 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A9C58 80241868 8C630094 */ lw $v1, 0x94($v1) +/* 9A9C5C 8024186C AFA3001C */ sw $v1, 0x1c($sp) +/* 9A9C60 80241870 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A9C64 80241874 8C630080 */ lw $v1, 0x80($v1) +/* 9A9C68 80241878 AFA30020 */ sw $v1, 0x20($sp) +/* 9A9C6C 8024187C 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A9C70 80241880 8C630088 */ lw $v1, 0x88($v1) +/* 9A9C74 80241884 AFA30024 */ sw $v1, 0x24($sp) +/* 9A9C78 80241888 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A9C7C 8024188C 8C63008C */ lw $v1, 0x8c($v1) +/* 9A9C80 80241890 27B50018 */ addiu $s5, $sp, 0x18 +/* 9A9C84 80241894 AFA30028 */ sw $v1, 0x28($sp) +/* 9A9C88 80241898 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9A9C8C 8024189C 3C014282 */ lui $at, 0x4282 +/* 9A9C90 802418A0 44810000 */ mtc1 $at, $f0 +/* 9A9C94 802418A4 8C630090 */ lw $v1, 0x90($v1) +/* 9A9C98 802418A8 0040982D */ daddu $s3, $v0, $zero +/* 9A9C9C 802418AC E7A00030 */ swc1 $f0, 0x30($sp) +/* 9A9CA0 802418B0 A7A00034 */ sh $zero, 0x34($sp) +/* 9A9CA4 802418B4 16000005 */ bnez $s0, .L802418CC +/* 9A9CA8 802418B8 AFA3002C */ sw $v1, 0x2c($sp) +/* 9A9CAC 802418BC 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A9CB0 802418C0 30420004 */ andi $v0, $v0, 4 +/* 9A9CB4 802418C4 10400044 */ beqz $v0, .L802419D8 +/* 9A9CB8 802418C8 00000000 */ nop +.L802418CC: +/* 9A9CBC 802418CC 2404F7FF */ addiu $a0, $zero, -0x801 +/* 9A9CC0 802418D0 AE800070 */ sw $zero, 0x70($s4) +/* 9A9CC4 802418D4 A640008E */ sh $zero, 0x8e($s2) +/* 9A9CC8 802418D8 8E2200CC */ lw $v0, 0xcc($s1) +/* 9A9CCC 802418DC 8E430000 */ lw $v1, ($s2) +/* 9A9CD0 802418E0 8C420000 */ lw $v0, ($v0) +/* 9A9CD4 802418E4 00641824 */ and $v1, $v1, $a0 +/* 9A9CD8 802418E8 AE430000 */ sw $v1, ($s2) +/* 9A9CDC 802418EC AE420028 */ sw $v0, 0x28($s2) +/* 9A9CE0 802418F0 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9A9CE4 802418F4 8C420098 */ lw $v0, 0x98($v0) +/* 9A9CE8 802418F8 54400005 */ bnel $v0, $zero, .L80241910 +/* 9A9CEC 802418FC 2402FDFF */ addiu $v0, $zero, -0x201 +/* 9A9CF0 80241900 34620200 */ ori $v0, $v1, 0x200 +/* 9A9CF4 80241904 2403FFF7 */ addiu $v1, $zero, -9 +/* 9A9CF8 80241908 08090646 */ j .L80241918 +/* 9A9CFC 8024190C 00431024 */ and $v0, $v0, $v1 +.L80241910: +/* 9A9D00 80241910 00621024 */ and $v0, $v1, $v0 +/* 9A9D04 80241914 34420008 */ ori $v0, $v0, 8 +.L80241918: +/* 9A9D08 80241918 AE420000 */ sw $v0, ($s2) +/* 9A9D0C 8024191C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A9D10 80241920 30420004 */ andi $v0, $v0, 4 +/* 9A9D14 80241924 10400008 */ beqz $v0, .L80241948 +/* 9A9D18 80241928 24020063 */ addiu $v0, $zero, 0x63 +/* 9A9D1C 8024192C AE820070 */ sw $v0, 0x70($s4) +/* 9A9D20 80241930 AE800074 */ sw $zero, 0x74($s4) +/* 9A9D24 80241934 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9A9D28 80241938 2403FFFB */ addiu $v1, $zero, -5 +/* 9A9D2C 8024193C 00431024 */ and $v0, $v0, $v1 +/* 9A9D30 80241940 0809065D */ j .L80241974 +/* 9A9D34 80241944 AE2200B0 */ sw $v0, 0xb0($s1) +.L80241948: +/* 9A9D38 80241948 8E220000 */ lw $v0, ($s1) +/* 9A9D3C 8024194C 3C034000 */ lui $v1, 0x4000 +/* 9A9D40 80241950 00431024 */ and $v0, $v0, $v1 +/* 9A9D44 80241954 10400007 */ beqz $v0, .L80241974 +/* 9A9D48 80241958 3C03BFFF */ lui $v1, 0xbfff +/* 9A9D4C 8024195C 2402000C */ addiu $v0, $zero, 0xc +/* 9A9D50 80241960 AE820070 */ sw $v0, 0x70($s4) +/* 9A9D54 80241964 8E220000 */ lw $v0, ($s1) +/* 9A9D58 80241968 3463FFFF */ ori $v1, $v1, 0xffff +/* 9A9D5C 8024196C 00431024 */ and $v0, $v0, $v1 +/* 9A9D60 80241970 AE220000 */ sw $v0, ($s1) +.L80241974: +/* 9A9D64 80241974 27A50038 */ addiu $a1, $sp, 0x38 +/* 9A9D68 80241978 27A6003C */ addiu $a2, $sp, 0x3c +/* 9A9D6C 8024197C C6400038 */ lwc1 $f0, 0x38($s2) +/* 9A9D70 80241980 864200A8 */ lh $v0, 0xa8($s2) +/* 9A9D74 80241984 3C0142C8 */ lui $at, 0x42c8 +/* 9A9D78 80241988 44812000 */ mtc1 $at, $f4 +/* 9A9D7C 8024198C 44823000 */ mtc1 $v0, $f6 +/* 9A9D80 80241990 00000000 */ nop +/* 9A9D84 80241994 468031A0 */ cvt.s.w $f6, $f6 +/* 9A9D88 80241998 27A20044 */ addiu $v0, $sp, 0x44 +/* 9A9D8C 8024199C E7A00038 */ swc1 $f0, 0x38($sp) +/* 9A9D90 802419A0 C640003C */ lwc1 $f0, 0x3c($s2) +/* 9A9D94 802419A4 C6420040 */ lwc1 $f2, 0x40($s2) +/* 9A9D98 802419A8 46060000 */ add.s $f0, $f0, $f6 +/* 9A9D9C 802419AC E7A40044 */ swc1 $f4, 0x44($sp) +/* 9A9DA0 802419B0 E7A20040 */ swc1 $f2, 0x40($sp) +/* 9A9DA4 802419B4 E7A0003C */ swc1 $f0, 0x3c($sp) +/* 9A9DA8 802419B8 AFA20010 */ sw $v0, 0x10($sp) +/* 9A9DAC 802419BC 8E440080 */ lw $a0, 0x80($s2) +/* 9A9DB0 802419C0 0C0372DF */ jal func_800DCB7C +/* 9A9DB4 802419C4 27A70040 */ addiu $a3, $sp, 0x40 +/* 9A9DB8 802419C8 10400003 */ beqz $v0, .L802419D8 +/* 9A9DBC 802419CC 00000000 */ nop +/* 9A9DC0 802419D0 C7A0003C */ lwc1 $f0, 0x3c($sp) +/* 9A9DC4 802419D4 E640003C */ swc1 $f0, 0x3c($s2) +.L802419D8: +/* 9A9DC8 802419D8 8E830070 */ lw $v1, 0x70($s4) +/* 9A9DCC 802419DC 2C620064 */ sltiu $v0, $v1, 0x64 +/* 9A9DD0 802419E0 10400042 */ beqz $v0, .L80241AEC +/* 9A9DD4 802419E4 00031080 */ sll $v0, $v1, 2 +/* 9A9DD8 802419E8 3C018024 */ lui $at, 0x8024 +/* 9A9DDC 802419EC 00220821 */ addu $at, $at, $v0 +/* 9A9DE0 802419F0 8C225F50 */ lw $v0, 0x5f50($at) +/* 9A9DE4 802419F4 00400008 */ jr $v0 +/* 9A9DE8 802419F8 00000000 */ nop +/* 9A9DEC 802419FC 0280202D */ daddu $a0, $s4, $zero +/* 9A9DF0 80241A00 0260282D */ daddu $a1, $s3, $zero +/* 9A9DF4 80241A04 0C090321 */ jal func_80240C84_9A9074 +/* 9A9DF8 80241A08 02A0302D */ daddu $a2, $s5, $zero +/* 9A9DFC 80241A0C 0280202D */ daddu $a0, $s4, $zero +/* 9A9E00 80241A10 0260282D */ daddu $a1, $s3, $zero +/* 9A9E04 80241A14 0C090377 */ jal func_80240DDC_9A91CC +/* 9A9E08 80241A18 02A0302D */ daddu $a2, $s5, $zero +/* 9A9E0C 80241A1C 080906BB */ j .L80241AEC +/* 9A9E10 80241A20 00000000 */ nop +/* 9A9E14 80241A24 0280202D */ daddu $a0, $s4, $zero +/* 9A9E18 80241A28 0260282D */ daddu $a1, $s3, $zero +/* 9A9E1C 80241A2C 0C090421 */ jal func_80241084_9A9474 +/* 9A9E20 80241A30 02A0302D */ daddu $a2, $s5, $zero +/* 9A9E24 80241A34 0280202D */ daddu $a0, $s4, $zero +/* 9A9E28 80241A38 0260282D */ daddu $a1, $s3, $zero +/* 9A9E2C 80241A3C 0C090451 */ jal func_80241144_9A9534 +/* 9A9E30 80241A40 02A0302D */ daddu $a2, $s5, $zero +/* 9A9E34 80241A44 080906BB */ j .L80241AEC +/* 9A9E38 80241A48 00000000 */ nop +/* 9A9E3C 80241A4C 0280202D */ daddu $a0, $s4, $zero +/* 9A9E40 80241A50 0260282D */ daddu $a1, $s3, $zero +/* 9A9E44 80241A54 0C0904C0 */ jal func_80241300_9A96F0 +/* 9A9E48 80241A58 02A0302D */ daddu $a2, $s5, $zero +/* 9A9E4C 80241A5C 080906BB */ j .L80241AEC +/* 9A9E50 80241A60 00000000 */ nop +/* 9A9E54 80241A64 0280202D */ daddu $a0, $s4, $zero +/* 9A9E58 80241A68 0260282D */ daddu $a1, $s3, $zero +/* 9A9E5C 80241A6C 0C0904ED */ jal func_802413B4_9A97A4 +/* 9A9E60 80241A70 02A0302D */ daddu $a2, $s5, $zero +/* 9A9E64 80241A74 0280202D */ daddu $a0, $s4, $zero +/* 9A9E68 80241A78 0260282D */ daddu $a1, $s3, $zero +/* 9A9E6C 80241A7C 0C09050A */ jal func_80241428_9A9818 +/* 9A9E70 80241A80 02A0302D */ daddu $a2, $s5, $zero +/* 9A9E74 80241A84 080906BB */ j .L80241AEC +/* 9A9E78 80241A88 00000000 */ nop +/* 9A9E7C 80241A8C 0280202D */ daddu $a0, $s4, $zero +/* 9A9E80 80241A90 0260282D */ daddu $a1, $s3, $zero +/* 9A9E84 80241A94 0C090528 */ jal func_802414A0_9A9890 +/* 9A9E88 80241A98 02A0302D */ daddu $a2, $s5, $zero +/* 9A9E8C 80241A9C 0280202D */ daddu $a0, $s4, $zero +/* 9A9E90 80241AA0 0260282D */ daddu $a1, $s3, $zero +/* 9A9E94 80241AA4 0C090574 */ jal func_802415D0_9A99C0 +/* 9A9E98 80241AA8 02A0302D */ daddu $a2, $s5, $zero +/* 9A9E9C 80241AAC 080906BB */ j .L80241AEC +/* 9A9EA0 80241AB0 00000000 */ nop +/* 9A9EA4 80241AB4 0280202D */ daddu $a0, $s4, $zero +/* 9A9EA8 80241AB8 0260282D */ daddu $a1, $s3, $zero +/* 9A9EAC 80241ABC 0C0905BC */ jal func_802416F0_9A9AE0 +/* 9A9EB0 80241AC0 02A0302D */ daddu $a2, $s5, $zero +/* 9A9EB4 80241AC4 080906BB */ j .L80241AEC +/* 9A9EB8 80241AC8 00000000 */ nop +/* 9A9EBC 80241ACC 0280202D */ daddu $a0, $s4, $zero +/* 9A9EC0 80241AD0 0260282D */ daddu $a1, $s3, $zero +/* 9A9EC4 80241AD4 0C0905D6 */ jal func_80241758_9A9B48 +/* 9A9EC8 80241AD8 02A0302D */ daddu $a2, $s5, $zero +/* 9A9ECC 80241ADC 080906BB */ j .L80241AEC +/* 9A9ED0 80241AE0 00000000 */ nop +/* 9A9ED4 80241AE4 0C0129CF */ jal func_8004A73C +/* 9A9ED8 80241AE8 0280202D */ daddu $a0, $s4, $zero +.L80241AEC: +/* 9A9EDC 80241AEC 8FBF0060 */ lw $ra, 0x60($sp) +/* 9A9EE0 80241AF0 8FB5005C */ lw $s5, 0x5c($sp) +/* 9A9EE4 80241AF4 8FB40058 */ lw $s4, 0x58($sp) +/* 9A9EE8 80241AF8 8FB30054 */ lw $s3, 0x54($sp) +/* 9A9EEC 80241AFC 8FB20050 */ lw $s2, 0x50($sp) +/* 9A9EF0 80241B00 8FB1004C */ lw $s1, 0x4c($sp) +/* 9A9EF4 80241B04 8FB00048 */ lw $s0, 0x48($sp) +/* 9A9EF8 80241B08 0000102D */ daddu $v0, $zero, $zero +/* 9A9EFC 80241B0C 03E00008 */ jr $ra +/* 9A9F00 80241B10 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s index 4327b261a5..97c6b64e48 100644 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241B14_9A9F04.s @@ -141,51 +141,51 @@ glabel func_80241B14_9A9F04 /* 9AA10C 80241D1C 00000000 */ nop /* 9AA110 80241D20 0260202D */ daddu $a0, $s3, $zero /* 9AA114 80241D24 0280282D */ daddu $a1, $s4, $zero -/* 9AA118 80241D28 0C090321 */ jal func_80240C84 +/* 9AA118 80241D28 0C090321 */ jal func_80240C84_9A9074 /* 9AA11C 80241D2C 02A0302D */ daddu $a2, $s5, $zero /* 9AA120 80241D30 96220086 */ lhu $v0, 0x86($s1) /* 9AA124 80241D34 A64200A8 */ sh $v0, 0xa8($s2) /* 9AA128 80241D38 0260202D */ daddu $a0, $s3, $zero /* 9AA12C 80241D3C 0280282D */ daddu $a1, $s4, $zero -/* 9AA130 80241D40 0C090377 */ jal func_80240DDC +/* 9AA130 80241D40 0C090377 */ jal func_80240DDC_9A91CC /* 9AA134 80241D44 02A0302D */ daddu $a2, $s5, $zero /* 9AA138 80241D48 0809077C */ j .L80241DF0 /* 9AA13C 80241D4C 00000000 */ nop /* 9AA140 80241D50 0260202D */ daddu $a0, $s3, $zero /* 9AA144 80241D54 0280282D */ daddu $a1, $s4, $zero -/* 9AA148 80241D58 0C090421 */ jal func_80241084 +/* 9AA148 80241D58 0C090421 */ jal func_80241084_9A9474 /* 9AA14C 80241D5C 02A0302D */ daddu $a2, $s5, $zero /* 9AA150 80241D60 0260202D */ daddu $a0, $s3, $zero /* 9AA154 80241D64 0280282D */ daddu $a1, $s4, $zero -/* 9AA158 80241D68 0C090451 */ jal func_80241144 +/* 9AA158 80241D68 0C090451 */ jal func_80241144_9A9534 /* 9AA15C 80241D6C 02A0302D */ daddu $a2, $s5, $zero /* 9AA160 80241D70 0809077C */ j .L80241DF0 /* 9AA164 80241D74 00000000 */ nop /* 9AA168 80241D78 0260202D */ daddu $a0, $s3, $zero /* 9AA16C 80241D7C 0280282D */ daddu $a1, $s4, $zero -/* 9AA170 80241D80 0C0904C0 */ jal func_80241300 +/* 9AA170 80241D80 0C0904C0 */ jal func_80241300_9A96F0 /* 9AA174 80241D84 02A0302D */ daddu $a2, $s5, $zero /* 9AA178 80241D88 0809077C */ j .L80241DF0 /* 9AA17C 80241D8C 00000000 */ nop /* 9AA180 80241D90 0260202D */ daddu $a0, $s3, $zero /* 9AA184 80241D94 0280282D */ daddu $a1, $s4, $zero -/* 9AA188 80241D98 0C09012C */ jal func_802404B0 +/* 9AA188 80241D98 0C09012C */ jal func_802404B0_9A88A0 /* 9AA18C 80241D9C 02A0302D */ daddu $a2, $s5, $zero /* 9AA190 80241DA0 0260202D */ daddu $a0, $s3, $zero /* 9AA194 80241DA4 0280282D */ daddu $a1, $s4, $zero -/* 9AA198 80241DA8 0C09014B */ jal func_8024052C +/* 9AA198 80241DA8 0C09014B */ jal func_8024052C_9A891C /* 9AA19C 80241DAC 02A0302D */ daddu $a2, $s5, $zero /* 9AA1A0 80241DB0 0809077C */ j .L80241DF0 /* 9AA1A4 80241DB4 00000000 */ nop /* 9AA1A8 80241DB8 0260202D */ daddu $a0, $s3, $zero /* 9AA1AC 80241DBC 0280282D */ daddu $a1, $s4, $zero -/* 9AA1B0 80241DC0 0C090198 */ jal func_80240660 +/* 9AA1B0 80241DC0 0C090198 */ jal func_80240660_9A8A50 /* 9AA1B4 80241DC4 02A0302D */ daddu $a2, $s5, $zero /* 9AA1B8 80241DC8 0809077C */ j .L80241DF0 /* 9AA1BC 80241DCC 00000000 */ nop /* 9AA1C0 80241DD0 0260202D */ daddu $a0, $s3, $zero /* 9AA1C4 80241DD4 0280282D */ daddu $a1, $s4, $zero -/* 9AA1C8 80241DD8 0C0901F1 */ jal func_802407C4 +/* 9AA1C8 80241DD8 0C0901F1 */ jal func_802407C4_9A8BB4 /* 9AA1CC 80241DDC 02A0302D */ daddu $a2, $s5, $zero /* 9AA1D0 80241DE0 0809077C */ j .L80241DF0 /* 9AA1D4 80241DE4 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18.s deleted file mode 100644 index 71f4383b90..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E18 -/* 9AA208 80241E18 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9AA20C 80241E1C AFB3002C */ sw $s3, 0x2c($sp) -/* 9AA210 80241E20 0080982D */ daddu $s3, $a0, $zero -/* 9AA214 80241E24 AFBF0030 */ sw $ra, 0x30($sp) -/* 9AA218 80241E28 AFB20028 */ sw $s2, 0x28($sp) -/* 9AA21C 80241E2C AFB10024 */ sw $s1, 0x24($sp) -/* 9AA220 80241E30 AFB00020 */ sw $s0, 0x20($sp) -/* 9AA224 80241E34 8E710148 */ lw $s1, 0x148($s3) -/* 9AA228 80241E38 86240008 */ lh $a0, 8($s1) -/* 9AA22C 80241E3C 0C00EABB */ jal get_npc_unsafe -/* 9AA230 80241E40 00A0902D */ daddu $s2, $a1, $zero -/* 9AA234 80241E44 8E440004 */ lw $a0, 4($s2) -/* 9AA238 80241E48 0040802D */ daddu $s0, $v0, $zero -/* 9AA23C 80241E4C 00041FC2 */ srl $v1, $a0, 0x1f -/* 9AA240 80241E50 00832021 */ addu $a0, $a0, $v1 -/* 9AA244 80241E54 00042043 */ sra $a0, $a0, 1 -/* 9AA248 80241E58 0C00A67F */ jal rand_int -/* 9AA24C 80241E5C 24840001 */ addiu $a0, $a0, 1 -/* 9AA250 80241E60 8E430004 */ lw $v1, 4($s2) -/* 9AA254 80241E64 000327C2 */ srl $a0, $v1, 0x1f -/* 9AA258 80241E68 00641821 */ addu $v1, $v1, $a0 -/* 9AA25C 80241E6C 00031843 */ sra $v1, $v1, 1 -/* 9AA260 80241E70 00621821 */ addu $v1, $v1, $v0 -/* 9AA264 80241E74 A603008E */ sh $v1, 0x8e($s0) -/* 9AA268 80241E78 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9AA26C 80241E7C C6000040 */ lwc1 $f0, 0x40($s0) -/* 9AA270 80241E80 C4640000 */ lwc1 $f4, ($v1) -/* 9AA274 80241E84 46802120 */ cvt.s.w $f4, $f4 -/* 9AA278 80241E88 C4620008 */ lwc1 $f2, 8($v1) -/* 9AA27C 80241E8C 468010A0 */ cvt.s.w $f2, $f2 -/* 9AA280 80241E90 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AA284 80241E94 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA288 80241E98 44061000 */ mfc1 $a2, $f2 -/* 9AA28C 80241E9C C440000C */ lwc1 $f0, 0xc($v0) -/* 9AA290 80241EA0 46800020 */ cvt.s.w $f0, $f0 -/* 9AA294 80241EA4 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9AA298 80241EA8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA29C 80241EAC 44052000 */ mfc1 $a1, $f4 -/* 9AA2A0 80241EB0 C4400010 */ lwc1 $f0, 0x10($v0) -/* 9AA2A4 80241EB4 46800020 */ cvt.s.w $f0, $f0 -/* 9AA2A8 80241EB8 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AA2AC 80241EBC 8C640018 */ lw $a0, 0x18($v1) -/* 9AA2B0 80241EC0 0C0123F5 */ jal is_point_within_region -/* 9AA2B4 80241EC4 8E070038 */ lw $a3, 0x38($s0) -/* 9AA2B8 80241EC8 1040000E */ beqz $v0, .L80241F04 -/* 9AA2BC 80241ECC 00000000 */ nop -/* 9AA2C0 80241ED0 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA2C4 80241ED4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AA2C8 80241ED8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AA2CC 80241EDC C4460000 */ lwc1 $f6, ($v0) -/* 9AA2D0 80241EE0 468031A0 */ cvt.s.w $f6, $f6 -/* 9AA2D4 80241EE4 44063000 */ mfc1 $a2, $f6 -/* 9AA2D8 80241EE8 C4460008 */ lwc1 $f6, 8($v0) -/* 9AA2DC 80241EEC 468031A0 */ cvt.s.w $f6, $f6 -/* 9AA2E0 80241EF0 44073000 */ mfc1 $a3, $f6 -/* 9AA2E4 80241EF4 0C00A720 */ jal atan2 -/* 9AA2E8 80241EF8 00000000 */ nop -/* 9AA2EC 80241EFC 080907CD */ j .L80241F34 -/* 9AA2F0 80241F00 E600000C */ swc1 $f0, 0xc($s0) -.L80241F04: -/* 9AA2F4 80241F04 0C00A67F */ jal rand_int -/* 9AA2F8 80241F08 2404003C */ addiu $a0, $zero, 0x3c -/* 9AA2FC 80241F0C C60C000C */ lwc1 $f12, 0xc($s0) -/* 9AA300 80241F10 44820000 */ mtc1 $v0, $f0 -/* 9AA304 80241F14 00000000 */ nop -/* 9AA308 80241F18 46800020 */ cvt.s.w $f0, $f0 -/* 9AA30C 80241F1C 46006300 */ add.s $f12, $f12, $f0 -/* 9AA310 80241F20 3C0141F0 */ lui $at, 0x41f0 -/* 9AA314 80241F24 44810000 */ mtc1 $at, $f0 -/* 9AA318 80241F28 0C00A6C9 */ jal clamp_angle -/* 9AA31C 80241F2C 46006301 */ sub.s $f12, $f12, $f0 -/* 9AA320 80241F30 E600000C */ swc1 $f0, 0xc($s0) -.L80241F34: -/* 9AA324 80241F34 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AA328 80241F38 8C420004 */ lw $v0, 4($v0) -/* 9AA32C 80241F3C AE020028 */ sw $v0, 0x28($s0) -/* 9AA330 80241F40 AE600074 */ sw $zero, 0x74($s3) -/* 9AA334 80241F44 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA338 80241F48 8C420014 */ lw $v0, 0x14($v0) -/* 9AA33C 80241F4C 04410004 */ bgez $v0, .L80241F60 -/* 9AA340 80241F50 00000000 */ nop -/* 9AA344 80241F54 C6400000 */ lwc1 $f0, ($s2) -/* 9AA348 80241F58 080907E0 */ j .L80241F80 -/* 9AA34C 80241F5C E6000018 */ swc1 $f0, 0x18($s0) -.L80241F60: -/* 9AA350 80241F60 3C018024 */ lui $at, 0x8024 -/* 9AA354 80241F64 D4226270 */ ldc1 $f2, 0x6270($at) -/* 9AA358 80241F68 44820000 */ mtc1 $v0, $f0 -/* 9AA35C 80241F6C 00000000 */ nop -/* 9AA360 80241F70 46800021 */ cvt.d.w $f0, $f0 -/* 9AA364 80241F74 46220003 */ div.d $f0, $f0, $f2 -/* 9AA368 80241F78 46200020 */ cvt.s.d $f0, $f0 -/* 9AA36C 80241F7C E6000018 */ swc1 $f0, 0x18($s0) -.L80241F80: -/* 9AA370 80241F80 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA374 80241F84 3C014059 */ lui $at, 0x4059 -/* 9AA378 80241F88 44811800 */ mtc1 $at, $f3 -/* 9AA37C 80241F8C 44801000 */ mtc1 $zero, $f2 -/* 9AA380 80241F90 46000021 */ cvt.d.s $f0, $f0 -/* 9AA384 80241F94 46220002 */ mul.d $f0, $f0, $f2 -/* 9AA388 80241F98 00000000 */ nop -/* 9AA38C 80241F9C 24020001 */ addiu $v0, $zero, 1 -/* 9AA390 80241FA0 4620018D */ trunc.w.d $f6, $f0 -/* 9AA394 80241FA4 E626007C */ swc1 $f6, 0x7c($s1) -/* 9AA398 80241FA8 AE620070 */ sw $v0, 0x70($s3) -/* 9AA39C 80241FAC 8FBF0030 */ lw $ra, 0x30($sp) -/* 9AA3A0 80241FB0 8FB3002C */ lw $s3, 0x2c($sp) -/* 9AA3A4 80241FB4 8FB20028 */ lw $s2, 0x28($sp) -/* 9AA3A8 80241FB8 8FB10024 */ lw $s1, 0x24($sp) -/* 9AA3AC 80241FBC 8FB00020 */ lw $s0, 0x20($sp) -/* 9AA3B0 80241FC0 03E00008 */ jr $ra -/* 9AA3B4 80241FC4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s new file mode 100644 index 0000000000..80ede58581 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241E18_9AA208.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241E18_9AA208 +/* 9AA208 80241E18 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 9AA20C 80241E1C AFB3002C */ sw $s3, 0x2c($sp) +/* 9AA210 80241E20 0080982D */ daddu $s3, $a0, $zero +/* 9AA214 80241E24 AFBF0030 */ sw $ra, 0x30($sp) +/* 9AA218 80241E28 AFB20028 */ sw $s2, 0x28($sp) +/* 9AA21C 80241E2C AFB10024 */ sw $s1, 0x24($sp) +/* 9AA220 80241E30 AFB00020 */ sw $s0, 0x20($sp) +/* 9AA224 80241E34 8E710148 */ lw $s1, 0x148($s3) +/* 9AA228 80241E38 86240008 */ lh $a0, 8($s1) +/* 9AA22C 80241E3C 0C00EABB */ jal get_npc_unsafe +/* 9AA230 80241E40 00A0902D */ daddu $s2, $a1, $zero +/* 9AA234 80241E44 8E440004 */ lw $a0, 4($s2) +/* 9AA238 80241E48 0040802D */ daddu $s0, $v0, $zero +/* 9AA23C 80241E4C 00041FC2 */ srl $v1, $a0, 0x1f +/* 9AA240 80241E50 00832021 */ addu $a0, $a0, $v1 +/* 9AA244 80241E54 00042043 */ sra $a0, $a0, 1 +/* 9AA248 80241E58 0C00A67F */ jal rand_int +/* 9AA24C 80241E5C 24840001 */ addiu $a0, $a0, 1 +/* 9AA250 80241E60 8E430004 */ lw $v1, 4($s2) +/* 9AA254 80241E64 000327C2 */ srl $a0, $v1, 0x1f +/* 9AA258 80241E68 00641821 */ addu $v1, $v1, $a0 +/* 9AA25C 80241E6C 00031843 */ sra $v1, $v1, 1 +/* 9AA260 80241E70 00621821 */ addu $v1, $v1, $v0 +/* 9AA264 80241E74 A603008E */ sh $v1, 0x8e($s0) +/* 9AA268 80241E78 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9AA26C 80241E7C C6000040 */ lwc1 $f0, 0x40($s0) +/* 9AA270 80241E80 C4640000 */ lwc1 $f4, ($v1) +/* 9AA274 80241E84 46802120 */ cvt.s.w $f4, $f4 +/* 9AA278 80241E88 C4620008 */ lwc1 $f2, 8($v1) +/* 9AA27C 80241E8C 468010A0 */ cvt.s.w $f2, $f2 +/* 9AA280 80241E90 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9AA284 80241E94 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9AA288 80241E98 44061000 */ mfc1 $a2, $f2 +/* 9AA28C 80241E9C C440000C */ lwc1 $f0, 0xc($v0) +/* 9AA290 80241EA0 46800020 */ cvt.s.w $f0, $f0 +/* 9AA294 80241EA4 E7A00014 */ swc1 $f0, 0x14($sp) +/* 9AA298 80241EA8 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9AA29C 80241EAC 44052000 */ mfc1 $a1, $f4 +/* 9AA2A0 80241EB0 C4400010 */ lwc1 $f0, 0x10($v0) +/* 9AA2A4 80241EB4 46800020 */ cvt.s.w $f0, $f0 +/* 9AA2A8 80241EB8 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9AA2AC 80241EBC 8C640018 */ lw $a0, 0x18($v1) +/* 9AA2B0 80241EC0 0C0123F5 */ jal is_point_within_region +/* 9AA2B4 80241EC4 8E070038 */ lw $a3, 0x38($s0) +/* 9AA2B8 80241EC8 1040000E */ beqz $v0, .L80241F04 +/* 9AA2BC 80241ECC 00000000 */ nop +/* 9AA2C0 80241ED0 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9AA2C4 80241ED4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9AA2C8 80241ED8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9AA2CC 80241EDC C4460000 */ lwc1 $f6, ($v0) +/* 9AA2D0 80241EE0 468031A0 */ cvt.s.w $f6, $f6 +/* 9AA2D4 80241EE4 44063000 */ mfc1 $a2, $f6 +/* 9AA2D8 80241EE8 C4460008 */ lwc1 $f6, 8($v0) +/* 9AA2DC 80241EEC 468031A0 */ cvt.s.w $f6, $f6 +/* 9AA2E0 80241EF0 44073000 */ mfc1 $a3, $f6 +/* 9AA2E4 80241EF4 0C00A720 */ jal atan2 +/* 9AA2E8 80241EF8 00000000 */ nop +/* 9AA2EC 80241EFC 080907CD */ j .L80241F34 +/* 9AA2F0 80241F00 E600000C */ swc1 $f0, 0xc($s0) +.L80241F04: +/* 9AA2F4 80241F04 0C00A67F */ jal rand_int +/* 9AA2F8 80241F08 2404003C */ addiu $a0, $zero, 0x3c +/* 9AA2FC 80241F0C C60C000C */ lwc1 $f12, 0xc($s0) +/* 9AA300 80241F10 44820000 */ mtc1 $v0, $f0 +/* 9AA304 80241F14 00000000 */ nop +/* 9AA308 80241F18 46800020 */ cvt.s.w $f0, $f0 +/* 9AA30C 80241F1C 46006300 */ add.s $f12, $f12, $f0 +/* 9AA310 80241F20 3C0141F0 */ lui $at, 0x41f0 +/* 9AA314 80241F24 44810000 */ mtc1 $at, $f0 +/* 9AA318 80241F28 0C00A6C9 */ jal clamp_angle +/* 9AA31C 80241F2C 46006301 */ sub.s $f12, $f12, $f0 +/* 9AA320 80241F30 E600000C */ swc1 $f0, 0xc($s0) +.L80241F34: +/* 9AA324 80241F34 8E2200CC */ lw $v0, 0xcc($s1) +/* 9AA328 80241F38 8C420004 */ lw $v0, 4($v0) +/* 9AA32C 80241F3C AE020028 */ sw $v0, 0x28($s0) +/* 9AA330 80241F40 AE600074 */ sw $zero, 0x74($s3) +/* 9AA334 80241F44 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9AA338 80241F48 8C420014 */ lw $v0, 0x14($v0) +/* 9AA33C 80241F4C 04410004 */ bgez $v0, .L80241F60 +/* 9AA340 80241F50 00000000 */ nop +/* 9AA344 80241F54 C6400000 */ lwc1 $f0, ($s2) +/* 9AA348 80241F58 080907E0 */ j .L80241F80 +/* 9AA34C 80241F5C E6000018 */ swc1 $f0, 0x18($s0) +.L80241F60: +/* 9AA350 80241F60 3C018024 */ lui $at, 0x8024 +/* 9AA354 80241F64 D4226270 */ ldc1 $f2, 0x6270($at) +/* 9AA358 80241F68 44820000 */ mtc1 $v0, $f0 +/* 9AA35C 80241F6C 00000000 */ nop +/* 9AA360 80241F70 46800021 */ cvt.d.w $f0, $f0 +/* 9AA364 80241F74 46220003 */ div.d $f0, $f0, $f2 +/* 9AA368 80241F78 46200020 */ cvt.s.d $f0, $f0 +/* 9AA36C 80241F7C E6000018 */ swc1 $f0, 0x18($s0) +.L80241F80: +/* 9AA370 80241F80 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AA374 80241F84 3C014059 */ lui $at, 0x4059 +/* 9AA378 80241F88 44811800 */ mtc1 $at, $f3 +/* 9AA37C 80241F8C 44801000 */ mtc1 $zero, $f2 +/* 9AA380 80241F90 46000021 */ cvt.d.s $f0, $f0 +/* 9AA384 80241F94 46220002 */ mul.d $f0, $f0, $f2 +/* 9AA388 80241F98 00000000 */ nop +/* 9AA38C 80241F9C 24020001 */ addiu $v0, $zero, 1 +/* 9AA390 80241FA0 4620018D */ trunc.w.d $f6, $f0 +/* 9AA394 80241FA4 E626007C */ swc1 $f6, 0x7c($s1) +/* 9AA398 80241FA8 AE620070 */ sw $v0, 0x70($s3) +/* 9AA39C 80241FAC 8FBF0030 */ lw $ra, 0x30($sp) +/* 9AA3A0 80241FB0 8FB3002C */ lw $s3, 0x2c($sp) +/* 9AA3A4 80241FB4 8FB20028 */ lw $s2, 0x28($sp) +/* 9AA3A8 80241FB8 8FB10024 */ lw $s1, 0x24($sp) +/* 9AA3AC 80241FBC 8FB00020 */ lw $s0, 0x20($sp) +/* 9AA3B0 80241FC0 03E00008 */ jr $ra +/* 9AA3B4 80241FC4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8.s deleted file mode 100644 index 213bac02cd..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8.s +++ /dev/null @@ -1,418 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FC8 -/* 9AA3B8 80241FC8 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 9AA3BC 80241FCC AFB3004C */ sw $s3, 0x4c($sp) -/* 9AA3C0 80241FD0 0080982D */ daddu $s3, $a0, $zero -/* 9AA3C4 80241FD4 AFBF0058 */ sw $ra, 0x58($sp) -/* 9AA3C8 80241FD8 AFB50054 */ sw $s5, 0x54($sp) -/* 9AA3CC 80241FDC AFB40050 */ sw $s4, 0x50($sp) -/* 9AA3D0 80241FE0 AFB20048 */ sw $s2, 0x48($sp) -/* 9AA3D4 80241FE4 AFB10044 */ sw $s1, 0x44($sp) -/* 9AA3D8 80241FE8 AFB00040 */ sw $s0, 0x40($sp) -/* 9AA3DC 80241FEC F7BA0078 */ sdc1 $f26, 0x78($sp) -/* 9AA3E0 80241FF0 F7B80070 */ sdc1 $f24, 0x70($sp) -/* 9AA3E4 80241FF4 F7B60068 */ sdc1 $f22, 0x68($sp) -/* 9AA3E8 80241FF8 F7B40060 */ sdc1 $f20, 0x60($sp) -/* 9AA3EC 80241FFC 8E710148 */ lw $s1, 0x148($s3) -/* 9AA3F0 80242000 00A0902D */ daddu $s2, $a1, $zero -/* 9AA3F4 80242004 86240008 */ lh $a0, 8($s1) -/* 9AA3F8 80242008 0C00EABB */ jal get_npc_unsafe -/* 9AA3FC 8024200C 00C0A82D */ daddu $s5, $a2, $zero -/* 9AA400 80242010 0040802D */ daddu $s0, $v0, $zero -/* 9AA404 80242014 0000A02D */ daddu $s4, $zero, $zero -/* 9AA408 80242018 C624007C */ lwc1 $f4, 0x7c($s1) -/* 9AA40C 8024201C 46802120 */ cvt.s.w $f4, $f4 -/* 9AA410 80242020 C6220088 */ lwc1 $f2, 0x88($s1) -/* 9AA414 80242024 468010A0 */ cvt.s.w $f2, $f2 -/* 9AA418 80242028 460010A1 */ cvt.d.s $f2, $f2 -/* 9AA41C 8024202C 46002121 */ cvt.d.s $f4, $f4 -/* 9AA420 80242030 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA424 80242034 3C014059 */ lui $at, 0x4059 -/* 9AA428 80242038 44813800 */ mtc1 $at, $f7 -/* 9AA42C 8024203C 44803000 */ mtc1 $zero, $f6 -/* 9AA430 80242040 46000021 */ cvt.d.s $f0, $f0 -/* 9AA434 80242044 46260002 */ mul.d $f0, $f0, $f6 -/* 9AA438 80242048 00000000 */ nop -/* 9AA43C 8024204C 24020001 */ addiu $v0, $zero, 1 -/* 9AA440 80242050 8E24006C */ lw $a0, 0x6c($s1) -/* 9AA444 80242054 46261083 */ div.d $f2, $f2, $f6 -/* 9AA448 80242058 462010A0 */ cvt.s.d $f2, $f2 -/* 9AA44C 8024205C 46262103 */ div.d $f4, $f4, $f6 -/* 9AA450 80242060 46202520 */ cvt.s.d $f20, $f4 -/* 9AA454 80242064 30830011 */ andi $v1, $a0, 0x11 -/* 9AA458 80242068 4620020D */ trunc.w.d $f8, $f0 -/* 9AA45C 8024206C E628007C */ swc1 $f8, 0x7c($s1) -/* 9AA460 80242070 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9AA464 80242074 46800020 */ cvt.s.w $f0, $f0 -/* 9AA468 80242078 46000021 */ cvt.d.s $f0, $f0 -/* 9AA46C 8024207C 46260003 */ div.d $f0, $f0, $f6 -/* 9AA470 80242080 462006A0 */ cvt.s.d $f26, $f0 -/* 9AA474 80242084 C6200070 */ lwc1 $f0, 0x70($s1) -/* 9AA478 80242088 46800020 */ cvt.s.w $f0, $f0 -/* 9AA47C 8024208C 46000021 */ cvt.d.s $f0, $f0 -/* 9AA480 80242090 46260003 */ div.d $f0, $f0, $f6 -/* 9AA484 80242094 462005A0 */ cvt.s.d $f22, $f0 -/* 9AA488 80242098 14620025 */ bne $v1, $v0, .L80242130 -/* 9AA48C 8024209C 4602D600 */ add.s $f24, $f26, $f2 -/* 9AA490 802420A0 8E020000 */ lw $v0, ($s0) -/* 9AA494 802420A4 30420008 */ andi $v0, $v0, 8 -/* 9AA498 802420A8 10400009 */ beqz $v0, .L802420D0 -/* 9AA49C 802420AC 27A50028 */ addiu $a1, $sp, 0x28 -/* 9AA4A0 802420B0 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA4A4 802420B4 4600C001 */ sub.s $f0, $f24, $f0 -/* 9AA4A8 802420B8 4600B03C */ c.lt.s $f22, $f0 -/* 9AA4AC 802420BC 00000000 */ nop -/* 9AA4B0 802420C0 4500001B */ bc1f .L80242130 -/* 9AA4B4 802420C4 34820010 */ ori $v0, $a0, 0x10 -/* 9AA4B8 802420C8 0809084C */ j .L80242130 -/* 9AA4BC 802420CC AE22006C */ sw $v0, 0x6c($s1) -.L802420D0: -/* 9AA4C0 802420D0 27A6002C */ addiu $a2, $sp, 0x2c -/* 9AA4C4 802420D4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AA4C8 802420D8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AA4CC 802420DC C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AA4D0 802420E0 3C01447A */ lui $at, 0x447a -/* 9AA4D4 802420E4 44813000 */ mtc1 $at, $f6 -/* 9AA4D8 802420E8 27A20034 */ addiu $v0, $sp, 0x34 -/* 9AA4DC 802420EC E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AA4E0 802420F0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9AA4E4 802420F4 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9AA4E8 802420F8 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9AA4EC 802420FC AFA20010 */ sw $v0, 0x10($sp) -/* 9AA4F0 80242100 8E040080 */ lw $a0, 0x80($s0) -/* 9AA4F4 80242104 0C0372DF */ jal func_800DCB7C -/* 9AA4F8 80242108 27A70030 */ addiu $a3, $sp, 0x30 -/* 9AA4FC 8024210C C7A00034 */ lwc1 $f0, 0x34($sp) -/* 9AA500 80242110 4600D001 */ sub.s $f0, $f26, $f0 -/* 9AA504 80242114 4600B03C */ c.lt.s $f22, $f0 -/* 9AA508 80242118 00000000 */ nop -/* 9AA50C 8024211C 45000004 */ bc1f .L80242130 -/* 9AA510 80242120 00000000 */ nop -/* 9AA514 80242124 8E22006C */ lw $v0, 0x6c($s1) -/* 9AA518 80242128 34420010 */ ori $v0, $v0, 0x10 -/* 9AA51C 8024212C AE22006C */ sw $v0, 0x6c($s1) -.L80242130: -/* 9AA520 80242130 8E22006C */ lw $v0, 0x6c($s1) -/* 9AA524 80242134 24030011 */ addiu $v1, $zero, 0x11 -/* 9AA528 80242138 30420011 */ andi $v0, $v0, 0x11 -/* 9AA52C 8024213C 14430039 */ bne $v0, $v1, .L80242224 -/* 9AA530 80242140 00000000 */ nop -/* 9AA534 80242144 8E020000 */ lw $v0, ($s0) -/* 9AA538 80242148 30420008 */ andi $v0, $v0, 8 -/* 9AA53C 8024214C 1040000A */ beqz $v0, .L80242178 -/* 9AA540 80242150 4600C106 */ mov.s $f4, $f24 -/* 9AA544 80242154 4614C081 */ sub.s $f2, $f24, $f20 -/* 9AA548 80242158 3C018024 */ lui $at, 0x8024 -/* 9AA54C 8024215C D4206278 */ ldc1 $f0, 0x6278($at) -/* 9AA550 80242160 460010A1 */ cvt.d.s $f2, $f2 -/* 9AA554 80242164 46201082 */ mul.d $f2, $f2, $f0 -/* 9AA558 80242168 00000000 */ nop -/* 9AA55C 8024216C 4600A021 */ cvt.d.s $f0, $f20 -/* 9AA560 80242170 08090877 */ j .L802421DC -/* 9AA564 80242174 46220000 */ add.d $f0, $f0, $f2 -.L80242178: -/* 9AA568 80242178 27A50028 */ addiu $a1, $sp, 0x28 -/* 9AA56C 8024217C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9AA570 80242180 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AA574 80242184 C6020040 */ lwc1 $f2, 0x40($s0) -/* 9AA578 80242188 3C01447A */ lui $at, 0x447a -/* 9AA57C 8024218C 44812000 */ mtc1 $at, $f4 -/* 9AA580 80242190 27A20034 */ addiu $v0, $sp, 0x34 -/* 9AA584 80242194 E7B4002C */ swc1 $f20, 0x2c($sp) -/* 9AA588 80242198 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AA58C 8024219C E7A20030 */ swc1 $f2, 0x30($sp) -/* 9AA590 802421A0 E7A40034 */ swc1 $f4, 0x34($sp) -/* 9AA594 802421A4 AFA20010 */ sw $v0, 0x10($sp) -/* 9AA598 802421A8 8E040080 */ lw $a0, 0x80($s0) -/* 9AA59C 802421AC 0C0372DF */ jal func_800DCB7C -/* 9AA5A0 802421B0 27A70030 */ addiu $a3, $sp, 0x30 -/* 9AA5A4 802421B4 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* 9AA5A8 802421B8 461A2100 */ add.s $f4, $f4, $f26 -/* 9AA5AC 802421BC 46142081 */ sub.s $f2, $f4, $f20 -/* 9AA5B0 802421C0 3C018024 */ lui $at, 0x8024 -/* 9AA5B4 802421C4 D4206280 */ ldc1 $f0, 0x6280($at) -/* 9AA5B8 802421C8 460010A1 */ cvt.d.s $f2, $f2 -/* 9AA5BC 802421CC 46201082 */ mul.d $f2, $f2, $f0 -/* 9AA5C0 802421D0 00000000 */ nop -/* 9AA5C4 802421D4 4600A021 */ cvt.d.s $f0, $f20 -/* 9AA5C8 802421D8 46220000 */ add.d $f0, $f0, $f2 -.L802421DC: -/* 9AA5CC 802421DC 46200020 */ cvt.s.d $f0, $f0 -/* 9AA5D0 802421E0 E600003C */ swc1 $f0, 0x3c($s0) -/* 9AA5D4 802421E4 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA5D8 802421E8 46002001 */ sub.s $f0, $f4, $f0 -/* 9AA5DC 802421EC 3C013FF0 */ lui $at, 0x3ff0 -/* 9AA5E0 802421F0 44811800 */ mtc1 $at, $f3 -/* 9AA5E4 802421F4 44801000 */ mtc1 $zero, $f2 -/* 9AA5E8 802421F8 46000005 */ abs.s $f0, $f0 -/* 9AA5EC 802421FC 46000021 */ cvt.d.s $f0, $f0 -/* 9AA5F0 80242200 4622003C */ c.lt.d $f0, $f2 -/* 9AA5F4 80242204 00000000 */ nop -/* 9AA5F8 80242208 45000036 */ bc1f .L802422E4 -/* 9AA5FC 8024220C 2403FFEF */ addiu $v1, $zero, -0x11 -/* 9AA600 80242210 E604003C */ swc1 $f4, 0x3c($s0) -/* 9AA604 80242214 8E22006C */ lw $v0, 0x6c($s1) -/* 9AA608 80242218 00431024 */ and $v0, $v0, $v1 -/* 9AA60C 8024221C 080908B9 */ j .L802422E4 -/* 9AA610 80242220 AE22006C */ sw $v0, 0x6c($s1) -.L80242224: -/* 9AA614 80242224 8E220070 */ lw $v0, 0x70($s1) -/* 9AA618 80242228 1840002E */ blez $v0, .L802422E4 -/* 9AA61C 8024222C 00000000 */ nop -/* 9AA620 80242230 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9AA624 80242234 0C00A8BB */ jal sin_deg -/* 9AA628 80242238 46806320 */ cvt.s.w $f12, $f12 -/* 9AA62C 8024223C 8E020000 */ lw $v0, ($s0) -/* 9AA630 80242240 30420008 */ andi $v0, $v0, 8 -/* 9AA634 80242244 10400003 */ beqz $v0, .L80242254 -/* 9AA638 80242248 46000506 */ mov.s $f20, $f0 -/* 9AA63C 8024224C 080908A5 */ j .L80242294 -/* 9AA640 80242250 0000102D */ daddu $v0, $zero, $zero -.L80242254: -/* 9AA644 80242254 27A50028 */ addiu $a1, $sp, 0x28 -/* 9AA648 80242258 27A6002C */ addiu $a2, $sp, 0x2c -/* 9AA64C 8024225C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AA650 80242260 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AA654 80242264 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AA658 80242268 3C01447A */ lui $at, 0x447a -/* 9AA65C 8024226C 44813000 */ mtc1 $at, $f6 -/* 9AA660 80242270 27A20034 */ addiu $v0, $sp, 0x34 -/* 9AA664 80242274 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AA668 80242278 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9AA66C 8024227C E7A40030 */ swc1 $f4, 0x30($sp) -/* 9AA670 80242280 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9AA674 80242284 AFA20010 */ sw $v0, 0x10($sp) -/* 9AA678 80242288 8E040080 */ lw $a0, 0x80($s0) -/* 9AA67C 8024228C 0C0372DF */ jal func_800DCB7C -/* 9AA680 80242290 27A70030 */ addiu $a3, $sp, 0x30 -.L80242294: -/* 9AA684 80242294 10400007 */ beqz $v0, .L802422B4 -/* 9AA688 80242298 00000000 */ nop -/* 9AA68C 8024229C 4616A082 */ mul.s $f2, $f20, $f22 -/* 9AA690 802422A0 00000000 */ nop -/* 9AA694 802422A4 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9AA698 802422A8 461A0000 */ add.s $f0, $f0, $f26 -/* 9AA69C 802422AC 080908B0 */ j .L802422C0 -/* 9AA6A0 802422B0 46020000 */ add.s $f0, $f0, $f2 -.L802422B4: -/* 9AA6A4 802422B4 4616A002 */ mul.s $f0, $f20, $f22 -/* 9AA6A8 802422B8 00000000 */ nop -/* 9AA6AC 802422BC 4600C000 */ add.s $f0, $f24, $f0 -.L802422C0: -/* 9AA6B0 802422C0 E600003C */ swc1 $f0, 0x3c($s0) -/* 9AA6B4 802422C4 8E220074 */ lw $v0, 0x74($s1) -/* 9AA6B8 802422C8 2442000A */ addiu $v0, $v0, 0xa -/* 9AA6BC 802422CC 44826000 */ mtc1 $v0, $f12 -/* 9AA6C0 802422D0 00000000 */ nop -/* 9AA6C4 802422D4 0C00A6C9 */ jal clamp_angle -/* 9AA6C8 802422D8 46806320 */ cvt.s.w $f12, $f12 -/* 9AA6CC 802422DC 4600020D */ trunc.w.s $f8, $f0 -/* 9AA6D0 802422E0 E6280074 */ swc1 $f8, 0x74($s1) -.L802422E4: -/* 9AA6D4 802422E4 8E220090 */ lw $v0, 0x90($s1) -/* 9AA6D8 802422E8 1C40004A */ bgtz $v0, .L80242414 -/* 9AA6DC 802422EC 2442FFFF */ addiu $v0, $v0, -1 -/* 9AA6E0 802422F0 8E430014 */ lw $v1, 0x14($s2) -/* 9AA6E4 802422F4 04600048 */ bltz $v1, .L80242418 -/* 9AA6E8 802422F8 00000000 */ nop -/* 9AA6EC 802422FC 8E620074 */ lw $v0, 0x74($s3) -/* 9AA6F0 80242300 1C400042 */ bgtz $v0, .L8024240C -/* 9AA6F4 80242304 2442FFFF */ addiu $v0, $v0, -1 -/* 9AA6F8 80242308 AE630074 */ sw $v1, 0x74($s3) -/* 9AA6FC 8024230C 860200A8 */ lh $v0, 0xa8($s0) -/* 9AA700 80242310 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AA704 80242314 44820000 */ mtc1 $v0, $f0 -/* 9AA708 80242318 00000000 */ nop -/* 9AA70C 8024231C 46800020 */ cvt.s.w $f0, $f0 -/* 9AA710 80242320 46001080 */ add.s $f2, $f2, $f0 -/* 9AA714 80242324 3C014024 */ lui $at, 0x4024 -/* 9AA718 80242328 44810800 */ mtc1 $at, $f1 -/* 9AA71C 8024232C 44800000 */ mtc1 $zero, $f0 -/* 9AA720 80242330 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AA724 80242334 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AA728 80242338 460010A1 */ cvt.d.s $f2, $f2 -/* 9AA72C 8024233C 46201080 */ add.d $f2, $f2, $f0 -/* 9AA730 80242340 C440002C */ lwc1 $f0, 0x2c($v0) -/* 9AA734 80242344 46000021 */ cvt.d.s $f0, $f0 -/* 9AA738 80242348 4622003C */ c.lt.d $f0, $f2 -/* 9AA73C 8024234C 00000000 */ nop -/* 9AA740 80242350 4500002C */ bc1f .L80242404 -/* 9AA744 80242354 02A0202D */ daddu $a0, $s5, $zero -/* 9AA748 80242358 AFA00010 */ sw $zero, 0x10($sp) -/* 9AA74C 8024235C 8E46000C */ lw $a2, 0xc($s2) -/* 9AA750 80242360 8E470010 */ lw $a3, 0x10($s2) -/* 9AA754 80242364 0C01242D */ jal func_800490B4 -/* 9AA758 80242368 0220282D */ daddu $a1, $s1, $zero -/* 9AA75C 8024236C 10400025 */ beqz $v0, .L80242404 -/* 9AA760 80242370 0000202D */ daddu $a0, $zero, $zero -/* 9AA764 80242374 0200282D */ daddu $a1, $s0, $zero -/* 9AA768 80242378 0000302D */ daddu $a2, $zero, $zero -/* 9AA76C 8024237C 2412000C */ addiu $s2, $zero, 0xc -/* 9AA770 80242380 860300A8 */ lh $v1, 0xa8($s0) -/* 9AA774 80242384 3C013F80 */ lui $at, 0x3f80 -/* 9AA778 80242388 44810000 */ mtc1 $at, $f0 -/* 9AA77C 8024238C 3C014000 */ lui $at, 0x4000 -/* 9AA780 80242390 44811000 */ mtc1 $at, $f2 -/* 9AA784 80242394 3C01C1A0 */ lui $at, 0xc1a0 -/* 9AA788 80242398 44812000 */ mtc1 $at, $f4 -/* 9AA78C 8024239C 44834000 */ mtc1 $v1, $f8 -/* 9AA790 802423A0 00000000 */ nop -/* 9AA794 802423A4 46804220 */ cvt.s.w $f8, $f8 -/* 9AA798 802423A8 44074000 */ mfc1 $a3, $f8 -/* 9AA79C 802423AC 27A20038 */ addiu $v0, $sp, 0x38 -/* 9AA7A0 802423B0 AFB2001C */ sw $s2, 0x1c($sp) -/* 9AA7A4 802423B4 AFA20020 */ sw $v0, 0x20($sp) -/* 9AA7A8 802423B8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AA7AC 802423BC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9AA7B0 802423C0 0C01BFA4 */ jal fx_emote -/* 9AA7B4 802423C4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9AA7B8 802423C8 0200202D */ daddu $a0, $s0, $zero -/* 9AA7BC 802423CC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9AA7C0 802423D0 C480003C */ lwc1 $f0, 0x3c($a0) -/* 9AA7C4 802423D4 3C060020 */ lui $a2, 0x20 -/* 9AA7C8 802423D8 0C012530 */ jal func_800494C0 -/* 9AA7CC 802423DC E4800064 */ swc1 $f0, 0x64($a0) -/* 9AA7D0 802423E0 8E220018 */ lw $v0, 0x18($s1) -/* 9AA7D4 802423E4 9442002A */ lhu $v0, 0x2a($v0) -/* 9AA7D8 802423E8 30420001 */ andi $v0, $v0, 1 -/* 9AA7DC 802423EC 10400003 */ beqz $v0, .L802423FC -/* 9AA7E0 802423F0 2402000A */ addiu $v0, $zero, 0xa -/* 9AA7E4 802423F4 0809096F */ j .L802425BC -/* 9AA7E8 802423F8 AE620070 */ sw $v0, 0x70($s3) -.L802423FC: -/* 9AA7EC 802423FC 0809096F */ j .L802425BC -/* 9AA7F0 80242400 AE720070 */ sw $s2, 0x70($s3) -.L80242404: -/* 9AA7F4 80242404 8E620074 */ lw $v0, 0x74($s3) -/* 9AA7F8 80242408 2442FFFF */ addiu $v0, $v0, -1 -.L8024240C: -/* 9AA7FC 8024240C 08090906 */ j .L80242418 -/* 9AA800 80242410 AE620074 */ sw $v0, 0x74($s3) -.L80242414: -/* 9AA804 80242414 AE220090 */ sw $v0, 0x90($s1) -.L80242418: -/* 9AA808 80242418 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9AA80C 8024241C C6000040 */ lwc1 $f0, 0x40($s0) -/* 9AA810 80242420 C4620000 */ lwc1 $f2, ($v1) -/* 9AA814 80242424 468010A0 */ cvt.s.w $f2, $f2 -/* 9AA818 80242428 C4640008 */ lwc1 $f4, 8($v1) -/* 9AA81C 8024242C 46802120 */ cvt.s.w $f4, $f4 -/* 9AA820 80242430 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AA824 80242434 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA828 80242438 44051000 */ mfc1 $a1, $f2 -/* 9AA82C 8024243C C440000C */ lwc1 $f0, 0xc($v0) -/* 9AA830 80242440 46800020 */ cvt.s.w $f0, $f0 -/* 9AA834 80242444 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9AA838 80242448 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA83C 8024244C 44062000 */ mfc1 $a2, $f4 -/* 9AA840 80242450 C4400010 */ lwc1 $f0, 0x10($v0) -/* 9AA844 80242454 46800020 */ cvt.s.w $f0, $f0 -/* 9AA848 80242458 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AA84C 8024245C 8C640018 */ lw $a0, 0x18($v1) -/* 9AA850 80242460 0C0123F5 */ jal is_point_within_region -/* 9AA854 80242464 8E070038 */ lw $a3, 0x38($s0) -/* 9AA858 80242468 1040001A */ beqz $v0, .L802424D4 -/* 9AA85C 8024246C 00000000 */ nop -/* 9AA860 80242470 8E060038 */ lw $a2, 0x38($s0) -/* 9AA864 80242474 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA868 80242478 8E070040 */ lw $a3, 0x40($s0) -/* 9AA86C 8024247C C44C0000 */ lwc1 $f12, ($v0) -/* 9AA870 80242480 46806320 */ cvt.s.w $f12, $f12 -/* 9AA874 80242484 C44E0008 */ lwc1 $f14, 8($v0) -/* 9AA878 80242488 0C00A7B5 */ jal dist2D -/* 9AA87C 8024248C 468073A0 */ cvt.s.w $f14, $f14 -/* 9AA880 80242490 C6020018 */ lwc1 $f2, 0x18($s0) -/* 9AA884 80242494 4600103C */ c.lt.s $f2, $f0 -/* 9AA888 80242498 00000000 */ nop -/* 9AA88C 8024249C 4500000D */ bc1f .L802424D4 -/* 9AA890 802424A0 E7A00034 */ swc1 $f0, 0x34($sp) -/* 9AA894 802424A4 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AA898 802424A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA89C 802424AC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AA8A0 802424B0 C4480000 */ lwc1 $f8, ($v0) -/* 9AA8A4 802424B4 46804220 */ cvt.s.w $f8, $f8 -/* 9AA8A8 802424B8 44064000 */ mfc1 $a2, $f8 -/* 9AA8AC 802424BC C4480008 */ lwc1 $f8, 8($v0) -/* 9AA8B0 802424C0 46804220 */ cvt.s.w $f8, $f8 -/* 9AA8B4 802424C4 44074000 */ mfc1 $a3, $f8 -/* 9AA8B8 802424C8 0C00A720 */ jal atan2 -/* 9AA8BC 802424CC 24140001 */ addiu $s4, $zero, 1 -/* 9AA8C0 802424D0 E600000C */ swc1 $f0, 0xc($s0) -.L802424D4: -/* 9AA8C4 802424D4 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9AA8C8 802424D8 8C43000C */ lw $v1, 0xc($v0) -/* 9AA8CC 802424DC 8C420010 */ lw $v0, 0x10($v0) -/* 9AA8D0 802424E0 00621825 */ or $v1, $v1, $v0 -/* 9AA8D4 802424E4 00741825 */ or $v1, $v1, $s4 -/* 9AA8D8 802424E8 10600008 */ beqz $v1, .L8024250C -/* 9AA8DC 802424EC 00000000 */ nop -/* 9AA8E0 802424F0 8602008C */ lh $v0, 0x8c($s0) -/* 9AA8E4 802424F4 14400031 */ bnez $v0, .L802425BC -/* 9AA8E8 802424F8 00000000 */ nop -/* 9AA8EC 802424FC 8E050018 */ lw $a1, 0x18($s0) -/* 9AA8F0 80242500 8E06000C */ lw $a2, 0xc($s0) -/* 9AA8F4 80242504 0C00EA95 */ jal npc_move_heading -/* 9AA8F8 80242508 0200202D */ daddu $a0, $s0, $zero -.L8024250C: -/* 9AA8FC 8024250C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AA900 80242510 3C014059 */ lui $at, 0x4059 -/* 9AA904 80242514 44811800 */ mtc1 $at, $f3 -/* 9AA908 80242518 44801000 */ mtc1 $zero, $f2 -/* 9AA90C 8024251C 46000021 */ cvt.d.s $f0, $f0 -/* 9AA910 80242520 46220002 */ mul.d $f0, $f0, $f2 -/* 9AA914 80242524 00000000 */ nop -/* 9AA918 80242528 4620020D */ trunc.w.d $f8, $f0 -/* 9AA91C 8024252C E628007C */ swc1 $f8, 0x7c($s1) -/* 9AA920 80242530 8E420004 */ lw $v0, 4($s2) -/* 9AA924 80242534 18400021 */ blez $v0, .L802425BC -/* 9AA928 80242538 00000000 */ nop -/* 9AA92C 8024253C 8602008E */ lh $v0, 0x8e($s0) -/* 9AA930 80242540 9603008E */ lhu $v1, 0x8e($s0) -/* 9AA934 80242544 18400005 */ blez $v0, .L8024255C -/* 9AA938 80242548 2462FFFF */ addiu $v0, $v1, -1 -/* 9AA93C 8024254C A602008E */ sh $v0, 0x8e($s0) -/* 9AA940 80242550 00021400 */ sll $v0, $v0, 0x10 -/* 9AA944 80242554 1C400019 */ bgtz $v0, .L802425BC -/* 9AA948 80242558 00000000 */ nop -.L8024255C: -/* 9AA94C 8024255C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9AA950 80242560 24020002 */ addiu $v0, $zero, 2 -/* 9AA954 80242564 0C00A67F */ jal rand_int -/* 9AA958 80242568 AE620070 */ sw $v0, 0x70($s3) -/* 9AA95C 8024256C 3C035555 */ lui $v1, 0x5555 -/* 9AA960 80242570 34635556 */ ori $v1, $v1, 0x5556 -/* 9AA964 80242574 00430018 */ mult $v0, $v1 -/* 9AA968 80242578 000227C3 */ sra $a0, $v0, 0x1f -/* 9AA96C 8024257C 00004010 */ mfhi $t0 -/* 9AA970 80242580 01042023 */ subu $a0, $t0, $a0 -/* 9AA974 80242584 00041840 */ sll $v1, $a0, 1 -/* 9AA978 80242588 00641821 */ addu $v1, $v1, $a0 -/* 9AA97C 8024258C 00431023 */ subu $v0, $v0, $v1 -/* 9AA980 80242590 24430002 */ addiu $v1, $v0, 2 -/* 9AA984 80242594 AE630074 */ sw $v1, 0x74($s3) -/* 9AA988 80242598 8E42002C */ lw $v0, 0x2c($s2) -/* 9AA98C 8024259C 58400007 */ blezl $v0, .L802425BC -/* 9AA990 802425A0 AE600070 */ sw $zero, 0x70($s3) -/* 9AA994 802425A4 8E420008 */ lw $v0, 8($s2) -/* 9AA998 802425A8 18400003 */ blez $v0, .L802425B8 -/* 9AA99C 802425AC 28620003 */ slti $v0, $v1, 3 -/* 9AA9A0 802425B0 10400002 */ beqz $v0, .L802425BC -/* 9AA9A4 802425B4 00000000 */ nop -.L802425B8: -/* 9AA9A8 802425B8 AE600070 */ sw $zero, 0x70($s3) -.L802425BC: -/* 9AA9AC 802425BC 8FBF0058 */ lw $ra, 0x58($sp) -/* 9AA9B0 802425C0 8FB50054 */ lw $s5, 0x54($sp) -/* 9AA9B4 802425C4 8FB40050 */ lw $s4, 0x50($sp) -/* 9AA9B8 802425C8 8FB3004C */ lw $s3, 0x4c($sp) -/* 9AA9BC 802425CC 8FB20048 */ lw $s2, 0x48($sp) -/* 9AA9C0 802425D0 8FB10044 */ lw $s1, 0x44($sp) -/* 9AA9C4 802425D4 8FB00040 */ lw $s0, 0x40($sp) -/* 9AA9C8 802425D8 D7BA0078 */ ldc1 $f26, 0x78($sp) -/* 9AA9CC 802425DC D7B80070 */ ldc1 $f24, 0x70($sp) -/* 9AA9D0 802425E0 D7B60068 */ ldc1 $f22, 0x68($sp) -/* 9AA9D4 802425E4 D7B40060 */ ldc1 $f20, 0x60($sp) -/* 9AA9D8 802425E8 03E00008 */ jr $ra -/* 9AA9DC 802425EC 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s new file mode 100644 index 0000000000..7b241fa4c1 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80241FC8_9AA3B8.s @@ -0,0 +1,418 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241FC8_9AA3B8 +/* 9AA3B8 80241FC8 27BDFF80 */ addiu $sp, $sp, -0x80 +/* 9AA3BC 80241FCC AFB3004C */ sw $s3, 0x4c($sp) +/* 9AA3C0 80241FD0 0080982D */ daddu $s3, $a0, $zero +/* 9AA3C4 80241FD4 AFBF0058 */ sw $ra, 0x58($sp) +/* 9AA3C8 80241FD8 AFB50054 */ sw $s5, 0x54($sp) +/* 9AA3CC 80241FDC AFB40050 */ sw $s4, 0x50($sp) +/* 9AA3D0 80241FE0 AFB20048 */ sw $s2, 0x48($sp) +/* 9AA3D4 80241FE4 AFB10044 */ sw $s1, 0x44($sp) +/* 9AA3D8 80241FE8 AFB00040 */ sw $s0, 0x40($sp) +/* 9AA3DC 80241FEC F7BA0078 */ sdc1 $f26, 0x78($sp) +/* 9AA3E0 80241FF0 F7B80070 */ sdc1 $f24, 0x70($sp) +/* 9AA3E4 80241FF4 F7B60068 */ sdc1 $f22, 0x68($sp) +/* 9AA3E8 80241FF8 F7B40060 */ sdc1 $f20, 0x60($sp) +/* 9AA3EC 80241FFC 8E710148 */ lw $s1, 0x148($s3) +/* 9AA3F0 80242000 00A0902D */ daddu $s2, $a1, $zero +/* 9AA3F4 80242004 86240008 */ lh $a0, 8($s1) +/* 9AA3F8 80242008 0C00EABB */ jal get_npc_unsafe +/* 9AA3FC 8024200C 00C0A82D */ daddu $s5, $a2, $zero +/* 9AA400 80242010 0040802D */ daddu $s0, $v0, $zero +/* 9AA404 80242014 0000A02D */ daddu $s4, $zero, $zero +/* 9AA408 80242018 C624007C */ lwc1 $f4, 0x7c($s1) +/* 9AA40C 8024201C 46802120 */ cvt.s.w $f4, $f4 +/* 9AA410 80242020 C6220088 */ lwc1 $f2, 0x88($s1) +/* 9AA414 80242024 468010A0 */ cvt.s.w $f2, $f2 +/* 9AA418 80242028 460010A1 */ cvt.d.s $f2, $f2 +/* 9AA41C 8024202C 46002121 */ cvt.d.s $f4, $f4 +/* 9AA420 80242030 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AA424 80242034 3C014059 */ lui $at, 0x4059 +/* 9AA428 80242038 44813800 */ mtc1 $at, $f7 +/* 9AA42C 8024203C 44803000 */ mtc1 $zero, $f6 +/* 9AA430 80242040 46000021 */ cvt.d.s $f0, $f0 +/* 9AA434 80242044 46260002 */ mul.d $f0, $f0, $f6 +/* 9AA438 80242048 00000000 */ nop +/* 9AA43C 8024204C 24020001 */ addiu $v0, $zero, 1 +/* 9AA440 80242050 8E24006C */ lw $a0, 0x6c($s1) +/* 9AA444 80242054 46261083 */ div.d $f2, $f2, $f6 +/* 9AA448 80242058 462010A0 */ cvt.s.d $f2, $f2 +/* 9AA44C 8024205C 46262103 */ div.d $f4, $f4, $f6 +/* 9AA450 80242060 46202520 */ cvt.s.d $f20, $f4 +/* 9AA454 80242064 30830011 */ andi $v1, $a0, 0x11 +/* 9AA458 80242068 4620020D */ trunc.w.d $f8, $f0 +/* 9AA45C 8024206C E628007C */ swc1 $f8, 0x7c($s1) +/* 9AA460 80242070 C6200078 */ lwc1 $f0, 0x78($s1) +/* 9AA464 80242074 46800020 */ cvt.s.w $f0, $f0 +/* 9AA468 80242078 46000021 */ cvt.d.s $f0, $f0 +/* 9AA46C 8024207C 46260003 */ div.d $f0, $f0, $f6 +/* 9AA470 80242080 462006A0 */ cvt.s.d $f26, $f0 +/* 9AA474 80242084 C6200070 */ lwc1 $f0, 0x70($s1) +/* 9AA478 80242088 46800020 */ cvt.s.w $f0, $f0 +/* 9AA47C 8024208C 46000021 */ cvt.d.s $f0, $f0 +/* 9AA480 80242090 46260003 */ div.d $f0, $f0, $f6 +/* 9AA484 80242094 462005A0 */ cvt.s.d $f22, $f0 +/* 9AA488 80242098 14620025 */ bne $v1, $v0, .L80242130 +/* 9AA48C 8024209C 4602D600 */ add.s $f24, $f26, $f2 +/* 9AA490 802420A0 8E020000 */ lw $v0, ($s0) +/* 9AA494 802420A4 30420008 */ andi $v0, $v0, 8 +/* 9AA498 802420A8 10400009 */ beqz $v0, .L802420D0 +/* 9AA49C 802420AC 27A50028 */ addiu $a1, $sp, 0x28 +/* 9AA4A0 802420B0 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AA4A4 802420B4 4600C001 */ sub.s $f0, $f24, $f0 +/* 9AA4A8 802420B8 4600B03C */ c.lt.s $f22, $f0 +/* 9AA4AC 802420BC 00000000 */ nop +/* 9AA4B0 802420C0 4500001B */ bc1f .L80242130 +/* 9AA4B4 802420C4 34820010 */ ori $v0, $a0, 0x10 +/* 9AA4B8 802420C8 0809084C */ j .L80242130 +/* 9AA4BC 802420CC AE22006C */ sw $v0, 0x6c($s1) +.L802420D0: +/* 9AA4C0 802420D0 27A6002C */ addiu $a2, $sp, 0x2c +/* 9AA4C4 802420D4 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9AA4C8 802420D8 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9AA4CC 802420DC C6040040 */ lwc1 $f4, 0x40($s0) +/* 9AA4D0 802420E0 3C01447A */ lui $at, 0x447a +/* 9AA4D4 802420E4 44813000 */ mtc1 $at, $f6 +/* 9AA4D8 802420E8 27A20034 */ addiu $v0, $sp, 0x34 +/* 9AA4DC 802420EC E7A00028 */ swc1 $f0, 0x28($sp) +/* 9AA4E0 802420F0 E7A2002C */ swc1 $f2, 0x2c($sp) +/* 9AA4E4 802420F4 E7A40030 */ swc1 $f4, 0x30($sp) +/* 9AA4E8 802420F8 E7A60034 */ swc1 $f6, 0x34($sp) +/* 9AA4EC 802420FC AFA20010 */ sw $v0, 0x10($sp) +/* 9AA4F0 80242100 8E040080 */ lw $a0, 0x80($s0) +/* 9AA4F4 80242104 0C0372DF */ jal func_800DCB7C +/* 9AA4F8 80242108 27A70030 */ addiu $a3, $sp, 0x30 +/* 9AA4FC 8024210C C7A00034 */ lwc1 $f0, 0x34($sp) +/* 9AA500 80242110 4600D001 */ sub.s $f0, $f26, $f0 +/* 9AA504 80242114 4600B03C */ c.lt.s $f22, $f0 +/* 9AA508 80242118 00000000 */ nop +/* 9AA50C 8024211C 45000004 */ bc1f .L80242130 +/* 9AA510 80242120 00000000 */ nop +/* 9AA514 80242124 8E22006C */ lw $v0, 0x6c($s1) +/* 9AA518 80242128 34420010 */ ori $v0, $v0, 0x10 +/* 9AA51C 8024212C AE22006C */ sw $v0, 0x6c($s1) +.L80242130: +/* 9AA520 80242130 8E22006C */ lw $v0, 0x6c($s1) +/* 9AA524 80242134 24030011 */ addiu $v1, $zero, 0x11 +/* 9AA528 80242138 30420011 */ andi $v0, $v0, 0x11 +/* 9AA52C 8024213C 14430039 */ bne $v0, $v1, .L80242224 +/* 9AA530 80242140 00000000 */ nop +/* 9AA534 80242144 8E020000 */ lw $v0, ($s0) +/* 9AA538 80242148 30420008 */ andi $v0, $v0, 8 +/* 9AA53C 8024214C 1040000A */ beqz $v0, .L80242178 +/* 9AA540 80242150 4600C106 */ mov.s $f4, $f24 +/* 9AA544 80242154 4614C081 */ sub.s $f2, $f24, $f20 +/* 9AA548 80242158 3C018024 */ lui $at, 0x8024 +/* 9AA54C 8024215C D4206278 */ ldc1 $f0, 0x6278($at) +/* 9AA550 80242160 460010A1 */ cvt.d.s $f2, $f2 +/* 9AA554 80242164 46201082 */ mul.d $f2, $f2, $f0 +/* 9AA558 80242168 00000000 */ nop +/* 9AA55C 8024216C 4600A021 */ cvt.d.s $f0, $f20 +/* 9AA560 80242170 08090877 */ j .L802421DC +/* 9AA564 80242174 46220000 */ add.d $f0, $f0, $f2 +.L80242178: +/* 9AA568 80242178 27A50028 */ addiu $a1, $sp, 0x28 +/* 9AA56C 8024217C 27A6002C */ addiu $a2, $sp, 0x2c +/* 9AA570 80242180 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9AA574 80242184 C6020040 */ lwc1 $f2, 0x40($s0) +/* 9AA578 80242188 3C01447A */ lui $at, 0x447a +/* 9AA57C 8024218C 44812000 */ mtc1 $at, $f4 +/* 9AA580 80242190 27A20034 */ addiu $v0, $sp, 0x34 +/* 9AA584 80242194 E7B4002C */ swc1 $f20, 0x2c($sp) +/* 9AA588 80242198 E7A00028 */ swc1 $f0, 0x28($sp) +/* 9AA58C 8024219C E7A20030 */ swc1 $f2, 0x30($sp) +/* 9AA590 802421A0 E7A40034 */ swc1 $f4, 0x34($sp) +/* 9AA594 802421A4 AFA20010 */ sw $v0, 0x10($sp) +/* 9AA598 802421A8 8E040080 */ lw $a0, 0x80($s0) +/* 9AA59C 802421AC 0C0372DF */ jal func_800DCB7C +/* 9AA5A0 802421B0 27A70030 */ addiu $a3, $sp, 0x30 +/* 9AA5A4 802421B4 C7A4002C */ lwc1 $f4, 0x2c($sp) +/* 9AA5A8 802421B8 461A2100 */ add.s $f4, $f4, $f26 +/* 9AA5AC 802421BC 46142081 */ sub.s $f2, $f4, $f20 +/* 9AA5B0 802421C0 3C018024 */ lui $at, 0x8024 +/* 9AA5B4 802421C4 D4206280 */ ldc1 $f0, 0x6280($at) +/* 9AA5B8 802421C8 460010A1 */ cvt.d.s $f2, $f2 +/* 9AA5BC 802421CC 46201082 */ mul.d $f2, $f2, $f0 +/* 9AA5C0 802421D0 00000000 */ nop +/* 9AA5C4 802421D4 4600A021 */ cvt.d.s $f0, $f20 +/* 9AA5C8 802421D8 46220000 */ add.d $f0, $f0, $f2 +.L802421DC: +/* 9AA5CC 802421DC 46200020 */ cvt.s.d $f0, $f0 +/* 9AA5D0 802421E0 E600003C */ swc1 $f0, 0x3c($s0) +/* 9AA5D4 802421E4 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AA5D8 802421E8 46002001 */ sub.s $f0, $f4, $f0 +/* 9AA5DC 802421EC 3C013FF0 */ lui $at, 0x3ff0 +/* 9AA5E0 802421F0 44811800 */ mtc1 $at, $f3 +/* 9AA5E4 802421F4 44801000 */ mtc1 $zero, $f2 +/* 9AA5E8 802421F8 46000005 */ abs.s $f0, $f0 +/* 9AA5EC 802421FC 46000021 */ cvt.d.s $f0, $f0 +/* 9AA5F0 80242200 4622003C */ c.lt.d $f0, $f2 +/* 9AA5F4 80242204 00000000 */ nop +/* 9AA5F8 80242208 45000036 */ bc1f .L802422E4 +/* 9AA5FC 8024220C 2403FFEF */ addiu $v1, $zero, -0x11 +/* 9AA600 80242210 E604003C */ swc1 $f4, 0x3c($s0) +/* 9AA604 80242214 8E22006C */ lw $v0, 0x6c($s1) +/* 9AA608 80242218 00431024 */ and $v0, $v0, $v1 +/* 9AA60C 8024221C 080908B9 */ j .L802422E4 +/* 9AA610 80242220 AE22006C */ sw $v0, 0x6c($s1) +.L80242224: +/* 9AA614 80242224 8E220070 */ lw $v0, 0x70($s1) +/* 9AA618 80242228 1840002E */ blez $v0, .L802422E4 +/* 9AA61C 8024222C 00000000 */ nop +/* 9AA620 80242230 C62C0074 */ lwc1 $f12, 0x74($s1) +/* 9AA624 80242234 0C00A8BB */ jal sin_deg +/* 9AA628 80242238 46806320 */ cvt.s.w $f12, $f12 +/* 9AA62C 8024223C 8E020000 */ lw $v0, ($s0) +/* 9AA630 80242240 30420008 */ andi $v0, $v0, 8 +/* 9AA634 80242244 10400003 */ beqz $v0, .L80242254 +/* 9AA638 80242248 46000506 */ mov.s $f20, $f0 +/* 9AA63C 8024224C 080908A5 */ j .L80242294 +/* 9AA640 80242250 0000102D */ daddu $v0, $zero, $zero +.L80242254: +/* 9AA644 80242254 27A50028 */ addiu $a1, $sp, 0x28 +/* 9AA648 80242258 27A6002C */ addiu $a2, $sp, 0x2c +/* 9AA64C 8024225C C6000038 */ lwc1 $f0, 0x38($s0) +/* 9AA650 80242260 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9AA654 80242264 C6040040 */ lwc1 $f4, 0x40($s0) +/* 9AA658 80242268 3C01447A */ lui $at, 0x447a +/* 9AA65C 8024226C 44813000 */ mtc1 $at, $f6 +/* 9AA660 80242270 27A20034 */ addiu $v0, $sp, 0x34 +/* 9AA664 80242274 E7A00028 */ swc1 $f0, 0x28($sp) +/* 9AA668 80242278 E7A2002C */ swc1 $f2, 0x2c($sp) +/* 9AA66C 8024227C E7A40030 */ swc1 $f4, 0x30($sp) +/* 9AA670 80242280 E7A60034 */ swc1 $f6, 0x34($sp) +/* 9AA674 80242284 AFA20010 */ sw $v0, 0x10($sp) +/* 9AA678 80242288 8E040080 */ lw $a0, 0x80($s0) +/* 9AA67C 8024228C 0C0372DF */ jal func_800DCB7C +/* 9AA680 80242290 27A70030 */ addiu $a3, $sp, 0x30 +.L80242294: +/* 9AA684 80242294 10400007 */ beqz $v0, .L802422B4 +/* 9AA688 80242298 00000000 */ nop +/* 9AA68C 8024229C 4616A082 */ mul.s $f2, $f20, $f22 +/* 9AA690 802422A0 00000000 */ nop +/* 9AA694 802422A4 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* 9AA698 802422A8 461A0000 */ add.s $f0, $f0, $f26 +/* 9AA69C 802422AC 080908B0 */ j .L802422C0 +/* 9AA6A0 802422B0 46020000 */ add.s $f0, $f0, $f2 +.L802422B4: +/* 9AA6A4 802422B4 4616A002 */ mul.s $f0, $f20, $f22 +/* 9AA6A8 802422B8 00000000 */ nop +/* 9AA6AC 802422BC 4600C000 */ add.s $f0, $f24, $f0 +.L802422C0: +/* 9AA6B0 802422C0 E600003C */ swc1 $f0, 0x3c($s0) +/* 9AA6B4 802422C4 8E220074 */ lw $v0, 0x74($s1) +/* 9AA6B8 802422C8 2442000A */ addiu $v0, $v0, 0xa +/* 9AA6BC 802422CC 44826000 */ mtc1 $v0, $f12 +/* 9AA6C0 802422D0 00000000 */ nop +/* 9AA6C4 802422D4 0C00A6C9 */ jal clamp_angle +/* 9AA6C8 802422D8 46806320 */ cvt.s.w $f12, $f12 +/* 9AA6CC 802422DC 4600020D */ trunc.w.s $f8, $f0 +/* 9AA6D0 802422E0 E6280074 */ swc1 $f8, 0x74($s1) +.L802422E4: +/* 9AA6D4 802422E4 8E220090 */ lw $v0, 0x90($s1) +/* 9AA6D8 802422E8 1C40004A */ bgtz $v0, .L80242414 +/* 9AA6DC 802422EC 2442FFFF */ addiu $v0, $v0, -1 +/* 9AA6E0 802422F0 8E430014 */ lw $v1, 0x14($s2) +/* 9AA6E4 802422F4 04600048 */ bltz $v1, .L80242418 +/* 9AA6E8 802422F8 00000000 */ nop +/* 9AA6EC 802422FC 8E620074 */ lw $v0, 0x74($s3) +/* 9AA6F0 80242300 1C400042 */ bgtz $v0, .L8024240C +/* 9AA6F4 80242304 2442FFFF */ addiu $v0, $v0, -1 +/* 9AA6F8 80242308 AE630074 */ sw $v1, 0x74($s3) +/* 9AA6FC 8024230C 860200A8 */ lh $v0, 0xa8($s0) +/* 9AA700 80242310 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9AA704 80242314 44820000 */ mtc1 $v0, $f0 +/* 9AA708 80242318 00000000 */ nop +/* 9AA70C 8024231C 46800020 */ cvt.s.w $f0, $f0 +/* 9AA710 80242320 46001080 */ add.s $f2, $f2, $f0 +/* 9AA714 80242324 3C014024 */ lui $at, 0x4024 +/* 9AA718 80242328 44810800 */ mtc1 $at, $f1 +/* 9AA71C 8024232C 44800000 */ mtc1 $zero, $f0 +/* 9AA720 80242330 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9AA724 80242334 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9AA728 80242338 460010A1 */ cvt.d.s $f2, $f2 +/* 9AA72C 8024233C 46201080 */ add.d $f2, $f2, $f0 +/* 9AA730 80242340 C440002C */ lwc1 $f0, 0x2c($v0) +/* 9AA734 80242344 46000021 */ cvt.d.s $f0, $f0 +/* 9AA738 80242348 4622003C */ c.lt.d $f0, $f2 +/* 9AA73C 8024234C 00000000 */ nop +/* 9AA740 80242350 4500002C */ bc1f .L80242404 +/* 9AA744 80242354 02A0202D */ daddu $a0, $s5, $zero +/* 9AA748 80242358 AFA00010 */ sw $zero, 0x10($sp) +/* 9AA74C 8024235C 8E46000C */ lw $a2, 0xc($s2) +/* 9AA750 80242360 8E470010 */ lw $a3, 0x10($s2) +/* 9AA754 80242364 0C01242D */ jal func_800490B4 +/* 9AA758 80242368 0220282D */ daddu $a1, $s1, $zero +/* 9AA75C 8024236C 10400025 */ beqz $v0, .L80242404 +/* 9AA760 80242370 0000202D */ daddu $a0, $zero, $zero +/* 9AA764 80242374 0200282D */ daddu $a1, $s0, $zero +/* 9AA768 80242378 0000302D */ daddu $a2, $zero, $zero +/* 9AA76C 8024237C 2412000C */ addiu $s2, $zero, 0xc +/* 9AA770 80242380 860300A8 */ lh $v1, 0xa8($s0) +/* 9AA774 80242384 3C013F80 */ lui $at, 0x3f80 +/* 9AA778 80242388 44810000 */ mtc1 $at, $f0 +/* 9AA77C 8024238C 3C014000 */ lui $at, 0x4000 +/* 9AA780 80242390 44811000 */ mtc1 $at, $f2 +/* 9AA784 80242394 3C01C1A0 */ lui $at, 0xc1a0 +/* 9AA788 80242398 44812000 */ mtc1 $at, $f4 +/* 9AA78C 8024239C 44834000 */ mtc1 $v1, $f8 +/* 9AA790 802423A0 00000000 */ nop +/* 9AA794 802423A4 46804220 */ cvt.s.w $f8, $f8 +/* 9AA798 802423A8 44074000 */ mfc1 $a3, $f8 +/* 9AA79C 802423AC 27A20038 */ addiu $v0, $sp, 0x38 +/* 9AA7A0 802423B0 AFB2001C */ sw $s2, 0x1c($sp) +/* 9AA7A4 802423B4 AFA20020 */ sw $v0, 0x20($sp) +/* 9AA7A8 802423B8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9AA7AC 802423BC E7A20014 */ swc1 $f2, 0x14($sp) +/* 9AA7B0 802423C0 0C01BFA4 */ jal fx_emote +/* 9AA7B4 802423C4 E7A40018 */ swc1 $f4, 0x18($sp) +/* 9AA7B8 802423C8 0200202D */ daddu $a0, $s0, $zero +/* 9AA7BC 802423CC 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 9AA7C0 802423D0 C480003C */ lwc1 $f0, 0x3c($a0) +/* 9AA7C4 802423D4 3C060020 */ lui $a2, 0x20 +/* 9AA7C8 802423D8 0C012530 */ jal func_800494C0 +/* 9AA7CC 802423DC E4800064 */ swc1 $f0, 0x64($a0) +/* 9AA7D0 802423E0 8E220018 */ lw $v0, 0x18($s1) +/* 9AA7D4 802423E4 9442002A */ lhu $v0, 0x2a($v0) +/* 9AA7D8 802423E8 30420001 */ andi $v0, $v0, 1 +/* 9AA7DC 802423EC 10400003 */ beqz $v0, .L802423FC +/* 9AA7E0 802423F0 2402000A */ addiu $v0, $zero, 0xa +/* 9AA7E4 802423F4 0809096F */ j .L802425BC +/* 9AA7E8 802423F8 AE620070 */ sw $v0, 0x70($s3) +.L802423FC: +/* 9AA7EC 802423FC 0809096F */ j .L802425BC +/* 9AA7F0 80242400 AE720070 */ sw $s2, 0x70($s3) +.L80242404: +/* 9AA7F4 80242404 8E620074 */ lw $v0, 0x74($s3) +/* 9AA7F8 80242408 2442FFFF */ addiu $v0, $v0, -1 +.L8024240C: +/* 9AA7FC 8024240C 08090906 */ j .L80242418 +/* 9AA800 80242410 AE620074 */ sw $v0, 0x74($s3) +.L80242414: +/* 9AA804 80242414 AE220090 */ sw $v0, 0x90($s1) +.L80242418: +/* 9AA808 80242418 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9AA80C 8024241C C6000040 */ lwc1 $f0, 0x40($s0) +/* 9AA810 80242420 C4620000 */ lwc1 $f2, ($v1) +/* 9AA814 80242424 468010A0 */ cvt.s.w $f2, $f2 +/* 9AA818 80242428 C4640008 */ lwc1 $f4, 8($v1) +/* 9AA81C 8024242C 46802120 */ cvt.s.w $f4, $f4 +/* 9AA820 80242430 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9AA824 80242434 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9AA828 80242438 44051000 */ mfc1 $a1, $f2 +/* 9AA82C 8024243C C440000C */ lwc1 $f0, 0xc($v0) +/* 9AA830 80242440 46800020 */ cvt.s.w $f0, $f0 +/* 9AA834 80242444 E7A00014 */ swc1 $f0, 0x14($sp) +/* 9AA838 80242448 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9AA83C 8024244C 44062000 */ mfc1 $a2, $f4 +/* 9AA840 80242450 C4400010 */ lwc1 $f0, 0x10($v0) +/* 9AA844 80242454 46800020 */ cvt.s.w $f0, $f0 +/* 9AA848 80242458 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9AA84C 8024245C 8C640018 */ lw $a0, 0x18($v1) +/* 9AA850 80242460 0C0123F5 */ jal is_point_within_region +/* 9AA854 80242464 8E070038 */ lw $a3, 0x38($s0) +/* 9AA858 80242468 1040001A */ beqz $v0, .L802424D4 +/* 9AA85C 8024246C 00000000 */ nop +/* 9AA860 80242470 8E060038 */ lw $a2, 0x38($s0) +/* 9AA864 80242474 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9AA868 80242478 8E070040 */ lw $a3, 0x40($s0) +/* 9AA86C 8024247C C44C0000 */ lwc1 $f12, ($v0) +/* 9AA870 80242480 46806320 */ cvt.s.w $f12, $f12 +/* 9AA874 80242484 C44E0008 */ lwc1 $f14, 8($v0) +/* 9AA878 80242488 0C00A7B5 */ jal dist2D +/* 9AA87C 8024248C 468073A0 */ cvt.s.w $f14, $f14 +/* 9AA880 80242490 C6020018 */ lwc1 $f2, 0x18($s0) +/* 9AA884 80242494 4600103C */ c.lt.s $f2, $f0 +/* 9AA888 80242498 00000000 */ nop +/* 9AA88C 8024249C 4500000D */ bc1f .L802424D4 +/* 9AA890 802424A0 E7A00034 */ swc1 $f0, 0x34($sp) +/* 9AA894 802424A4 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9AA898 802424A8 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9AA89C 802424AC C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9AA8A0 802424B0 C4480000 */ lwc1 $f8, ($v0) +/* 9AA8A4 802424B4 46804220 */ cvt.s.w $f8, $f8 +/* 9AA8A8 802424B8 44064000 */ mfc1 $a2, $f8 +/* 9AA8AC 802424BC C4480008 */ lwc1 $f8, 8($v0) +/* 9AA8B0 802424C0 46804220 */ cvt.s.w $f8, $f8 +/* 9AA8B4 802424C4 44074000 */ mfc1 $a3, $f8 +/* 9AA8B8 802424C8 0C00A720 */ jal atan2 +/* 9AA8BC 802424CC 24140001 */ addiu $s4, $zero, 1 +/* 9AA8C0 802424D0 E600000C */ swc1 $f0, 0xc($s0) +.L802424D4: +/* 9AA8C4 802424D4 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9AA8C8 802424D8 8C43000C */ lw $v1, 0xc($v0) +/* 9AA8CC 802424DC 8C420010 */ lw $v0, 0x10($v0) +/* 9AA8D0 802424E0 00621825 */ or $v1, $v1, $v0 +/* 9AA8D4 802424E4 00741825 */ or $v1, $v1, $s4 +/* 9AA8D8 802424E8 10600008 */ beqz $v1, .L8024250C +/* 9AA8DC 802424EC 00000000 */ nop +/* 9AA8E0 802424F0 8602008C */ lh $v0, 0x8c($s0) +/* 9AA8E4 802424F4 14400031 */ bnez $v0, .L802425BC +/* 9AA8E8 802424F8 00000000 */ nop +/* 9AA8EC 802424FC 8E050018 */ lw $a1, 0x18($s0) +/* 9AA8F0 80242500 8E06000C */ lw $a2, 0xc($s0) +/* 9AA8F4 80242504 0C00EA95 */ jal npc_move_heading +/* 9AA8F8 80242508 0200202D */ daddu $a0, $s0, $zero +.L8024250C: +/* 9AA8FC 8024250C C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AA900 80242510 3C014059 */ lui $at, 0x4059 +/* 9AA904 80242514 44811800 */ mtc1 $at, $f3 +/* 9AA908 80242518 44801000 */ mtc1 $zero, $f2 +/* 9AA90C 8024251C 46000021 */ cvt.d.s $f0, $f0 +/* 9AA910 80242520 46220002 */ mul.d $f0, $f0, $f2 +/* 9AA914 80242524 00000000 */ nop +/* 9AA918 80242528 4620020D */ trunc.w.d $f8, $f0 +/* 9AA91C 8024252C E628007C */ swc1 $f8, 0x7c($s1) +/* 9AA920 80242530 8E420004 */ lw $v0, 4($s2) +/* 9AA924 80242534 18400021 */ blez $v0, .L802425BC +/* 9AA928 80242538 00000000 */ nop +/* 9AA92C 8024253C 8602008E */ lh $v0, 0x8e($s0) +/* 9AA930 80242540 9603008E */ lhu $v1, 0x8e($s0) +/* 9AA934 80242544 18400005 */ blez $v0, .L8024255C +/* 9AA938 80242548 2462FFFF */ addiu $v0, $v1, -1 +/* 9AA93C 8024254C A602008E */ sh $v0, 0x8e($s0) +/* 9AA940 80242550 00021400 */ sll $v0, $v0, 0x10 +/* 9AA944 80242554 1C400019 */ bgtz $v0, .L802425BC +/* 9AA948 80242558 00000000 */ nop +.L8024255C: +/* 9AA94C 8024255C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 9AA950 80242560 24020002 */ addiu $v0, $zero, 2 +/* 9AA954 80242564 0C00A67F */ jal rand_int +/* 9AA958 80242568 AE620070 */ sw $v0, 0x70($s3) +/* 9AA95C 8024256C 3C035555 */ lui $v1, 0x5555 +/* 9AA960 80242570 34635556 */ ori $v1, $v1, 0x5556 +/* 9AA964 80242574 00430018 */ mult $v0, $v1 +/* 9AA968 80242578 000227C3 */ sra $a0, $v0, 0x1f +/* 9AA96C 8024257C 00004010 */ mfhi $t0 +/* 9AA970 80242580 01042023 */ subu $a0, $t0, $a0 +/* 9AA974 80242584 00041840 */ sll $v1, $a0, 1 +/* 9AA978 80242588 00641821 */ addu $v1, $v1, $a0 +/* 9AA97C 8024258C 00431023 */ subu $v0, $v0, $v1 +/* 9AA980 80242590 24430002 */ addiu $v1, $v0, 2 +/* 9AA984 80242594 AE630074 */ sw $v1, 0x74($s3) +/* 9AA988 80242598 8E42002C */ lw $v0, 0x2c($s2) +/* 9AA98C 8024259C 58400007 */ blezl $v0, .L802425BC +/* 9AA990 802425A0 AE600070 */ sw $zero, 0x70($s3) +/* 9AA994 802425A4 8E420008 */ lw $v0, 8($s2) +/* 9AA998 802425A8 18400003 */ blez $v0, .L802425B8 +/* 9AA99C 802425AC 28620003 */ slti $v0, $v1, 3 +/* 9AA9A0 802425B0 10400002 */ beqz $v0, .L802425BC +/* 9AA9A4 802425B4 00000000 */ nop +.L802425B8: +/* 9AA9A8 802425B8 AE600070 */ sw $zero, 0x70($s3) +.L802425BC: +/* 9AA9AC 802425BC 8FBF0058 */ lw $ra, 0x58($sp) +/* 9AA9B0 802425C0 8FB50054 */ lw $s5, 0x54($sp) +/* 9AA9B4 802425C4 8FB40050 */ lw $s4, 0x50($sp) +/* 9AA9B8 802425C8 8FB3004C */ lw $s3, 0x4c($sp) +/* 9AA9BC 802425CC 8FB20048 */ lw $s2, 0x48($sp) +/* 9AA9C0 802425D0 8FB10044 */ lw $s1, 0x44($sp) +/* 9AA9C4 802425D4 8FB00040 */ lw $s0, 0x40($sp) +/* 9AA9C8 802425D8 D7BA0078 */ ldc1 $f26, 0x78($sp) +/* 9AA9CC 802425DC D7B80070 */ ldc1 $f24, 0x70($sp) +/* 9AA9D0 802425E0 D7B60068 */ ldc1 $f22, 0x68($sp) +/* 9AA9D4 802425E4 D7B40060 */ ldc1 $f20, 0x60($sp) +/* 9AA9D8 802425E8 03E00008 */ jr $ra +/* 9AA9DC 802425EC 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802425F0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802425F0.s deleted file mode 100644 index cd59c56a0d..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802425F0.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425F0 -/* 9AA9E0 802425F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9AA9E4 802425F4 AFB3001C */ sw $s3, 0x1c($sp) -/* 9AA9E8 802425F8 0080982D */ daddu $s3, $a0, $zero -/* 9AA9EC 802425FC AFBF0020 */ sw $ra, 0x20($sp) -/* 9AA9F0 80242600 AFB20018 */ sw $s2, 0x18($sp) -/* 9AA9F4 80242604 AFB10014 */ sw $s1, 0x14($sp) -/* 9AA9F8 80242608 AFB00010 */ sw $s0, 0x10($sp) -/* 9AA9FC 8024260C 8E720148 */ lw $s2, 0x148($s3) -/* 9AAA00 80242610 86440008 */ lh $a0, 8($s2) -/* 9AAA04 80242614 0C00EABB */ jal get_npc_unsafe -/* 9AAA08 80242618 00A0882D */ daddu $s1, $a1, $zero -/* 9AAA0C 8024261C 8E240008 */ lw $a0, 8($s1) -/* 9AAA10 80242620 0040802D */ daddu $s0, $v0, $zero -/* 9AAA14 80242624 00041FC2 */ srl $v1, $a0, 0x1f -/* 9AAA18 80242628 00832021 */ addu $a0, $a0, $v1 -/* 9AAA1C 8024262C 00042043 */ sra $a0, $a0, 1 -/* 9AAA20 80242630 0C00A67F */ jal rand_int -/* 9AAA24 80242634 24840001 */ addiu $a0, $a0, 1 -/* 9AAA28 80242638 8E230008 */ lw $v1, 8($s1) -/* 9AAA2C 8024263C 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9AAA30 80242640 00032FC2 */ srl $a1, $v1, 0x1f -/* 9AAA34 80242644 00651821 */ addu $v1, $v1, $a1 -/* 9AAA38 80242648 00031843 */ sra $v1, $v1, 1 -/* 9AAA3C 8024264C 00621821 */ addu $v1, $v1, $v0 -/* 9AAA40 80242650 0C00A67F */ jal rand_int -/* 9AAA44 80242654 A603008E */ sh $v1, 0x8e($s0) -/* 9AAA48 80242658 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9AAA4C 8024265C 44820000 */ mtc1 $v0, $f0 -/* 9AAA50 80242660 00000000 */ nop -/* 9AAA54 80242664 46800020 */ cvt.s.w $f0, $f0 -/* 9AAA58 80242668 46006300 */ add.s $f12, $f12, $f0 -/* 9AAA5C 8024266C 3C0142B4 */ lui $at, 0x42b4 -/* 9AAA60 80242670 44810000 */ mtc1 $at, $f0 -/* 9AAA64 80242674 0C00A6C9 */ jal clamp_angle -/* 9AAA68 80242678 46006301 */ sub.s $f12, $f12, $f0 -/* 9AAA6C 8024267C E600000C */ swc1 $f0, 0xc($s0) -/* 9AAA70 80242680 8E4200CC */ lw $v0, 0xcc($s2) -/* 9AAA74 80242684 8C420000 */ lw $v0, ($v0) -/* 9AAA78 80242688 AE020028 */ sw $v0, 0x28($s0) -/* 9AAA7C 8024268C 24020003 */ addiu $v0, $zero, 3 -/* 9AAA80 80242690 AE620070 */ sw $v0, 0x70($s3) -/* 9AAA84 80242694 8FBF0020 */ lw $ra, 0x20($sp) -/* 9AAA88 80242698 8FB3001C */ lw $s3, 0x1c($sp) -/* 9AAA8C 8024269C 8FB20018 */ lw $s2, 0x18($sp) -/* 9AAA90 802426A0 8FB10014 */ lw $s1, 0x14($sp) -/* 9AAA94 802426A4 8FB00010 */ lw $s0, 0x10($sp) -/* 9AAA98 802426A8 03E00008 */ jr $ra -/* 9AAA9C 802426AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802425F0_9AA9E0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802425F0_9AA9E0.s new file mode 100644 index 0000000000..9e9f9cb230 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802425F0_9AA9E0.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802425F0_9AA9E0 +/* 9AA9E0 802425F0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9AA9E4 802425F4 AFB3001C */ sw $s3, 0x1c($sp) +/* 9AA9E8 802425F8 0080982D */ daddu $s3, $a0, $zero +/* 9AA9EC 802425FC AFBF0020 */ sw $ra, 0x20($sp) +/* 9AA9F0 80242600 AFB20018 */ sw $s2, 0x18($sp) +/* 9AA9F4 80242604 AFB10014 */ sw $s1, 0x14($sp) +/* 9AA9F8 80242608 AFB00010 */ sw $s0, 0x10($sp) +/* 9AA9FC 8024260C 8E720148 */ lw $s2, 0x148($s3) +/* 9AAA00 80242610 86440008 */ lh $a0, 8($s2) +/* 9AAA04 80242614 0C00EABB */ jal get_npc_unsafe +/* 9AAA08 80242618 00A0882D */ daddu $s1, $a1, $zero +/* 9AAA0C 8024261C 8E240008 */ lw $a0, 8($s1) +/* 9AAA10 80242620 0040802D */ daddu $s0, $v0, $zero +/* 9AAA14 80242624 00041FC2 */ srl $v1, $a0, 0x1f +/* 9AAA18 80242628 00832021 */ addu $a0, $a0, $v1 +/* 9AAA1C 8024262C 00042043 */ sra $a0, $a0, 1 +/* 9AAA20 80242630 0C00A67F */ jal rand_int +/* 9AAA24 80242634 24840001 */ addiu $a0, $a0, 1 +/* 9AAA28 80242638 8E230008 */ lw $v1, 8($s1) +/* 9AAA2C 8024263C 240400B4 */ addiu $a0, $zero, 0xb4 +/* 9AAA30 80242640 00032FC2 */ srl $a1, $v1, 0x1f +/* 9AAA34 80242644 00651821 */ addu $v1, $v1, $a1 +/* 9AAA38 80242648 00031843 */ sra $v1, $v1, 1 +/* 9AAA3C 8024264C 00621821 */ addu $v1, $v1, $v0 +/* 9AAA40 80242650 0C00A67F */ jal rand_int +/* 9AAA44 80242654 A603008E */ sh $v1, 0x8e($s0) +/* 9AAA48 80242658 C60C000C */ lwc1 $f12, 0xc($s0) +/* 9AAA4C 8024265C 44820000 */ mtc1 $v0, $f0 +/* 9AAA50 80242660 00000000 */ nop +/* 9AAA54 80242664 46800020 */ cvt.s.w $f0, $f0 +/* 9AAA58 80242668 46006300 */ add.s $f12, $f12, $f0 +/* 9AAA5C 8024266C 3C0142B4 */ lui $at, 0x42b4 +/* 9AAA60 80242670 44810000 */ mtc1 $at, $f0 +/* 9AAA64 80242674 0C00A6C9 */ jal clamp_angle +/* 9AAA68 80242678 46006301 */ sub.s $f12, $f12, $f0 +/* 9AAA6C 8024267C E600000C */ swc1 $f0, 0xc($s0) +/* 9AAA70 80242680 8E4200CC */ lw $v0, 0xcc($s2) +/* 9AAA74 80242684 8C420000 */ lw $v0, ($v0) +/* 9AAA78 80242688 AE020028 */ sw $v0, 0x28($s0) +/* 9AAA7C 8024268C 24020003 */ addiu $v0, $zero, 3 +/* 9AAA80 80242690 AE620070 */ sw $v0, 0x70($s3) +/* 9AAA84 80242694 8FBF0020 */ lw $ra, 0x20($sp) +/* 9AAA88 80242698 8FB3001C */ lw $s3, 0x1c($sp) +/* 9AAA8C 8024269C 8FB20018 */ lw $s2, 0x18($sp) +/* 9AAA90 802426A0 8FB10014 */ lw $s1, 0x14($sp) +/* 9AAA94 802426A4 8FB00010 */ lw $s0, 0x10($sp) +/* 9AAA98 802426A8 03E00008 */ jr $ra +/* 9AAA9C 802426AC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0.s deleted file mode 100644 index 30bdad8c01..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426B0 -/* 9AAAA0 802426B0 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 9AAAA4 802426B4 AFB3004C */ sw $s3, 0x4c($sp) -/* 9AAAA8 802426B8 0080982D */ daddu $s3, $a0, $zero -/* 9AAAAC 802426BC AFBF0054 */ sw $ra, 0x54($sp) -/* 9AAAB0 802426C0 AFB40050 */ sw $s4, 0x50($sp) -/* 9AAAB4 802426C4 AFB20048 */ sw $s2, 0x48($sp) -/* 9AAAB8 802426C8 AFB10044 */ sw $s1, 0x44($sp) -/* 9AAABC 802426CC AFB00040 */ sw $s0, 0x40($sp) -/* 9AAAC0 802426D0 F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 9AAAC4 802426D4 F7B80068 */ sdc1 $f24, 0x68($sp) -/* 9AAAC8 802426D8 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 9AAACC 802426DC F7B40058 */ sdc1 $f20, 0x58($sp) -/* 9AAAD0 802426E0 8E710148 */ lw $s1, 0x148($s3) -/* 9AAAD4 802426E4 00A0902D */ daddu $s2, $a1, $zero -/* 9AAAD8 802426E8 86240008 */ lh $a0, 8($s1) -/* 9AAADC 802426EC 0C00EABB */ jal get_npc_unsafe -/* 9AAAE0 802426F0 00C0A02D */ daddu $s4, $a2, $zero -/* 9AAAE4 802426F4 0040802D */ daddu $s0, $v0, $zero -/* 9AAAE8 802426F8 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9AAAEC 802426FC 46800020 */ cvt.s.w $f0, $f0 -/* 9AAAF0 80242700 46000021 */ cvt.d.s $f0, $f0 -/* 9AAAF4 80242704 3C014059 */ lui $at, 0x4059 -/* 9AAAF8 80242708 44811800 */ mtc1 $at, $f3 -/* 9AAAFC 8024270C 44801000 */ mtc1 $zero, $f2 -/* 9AAB00 80242710 8602008E */ lh $v0, 0x8e($s0) -/* 9AAB04 80242714 9603008E */ lhu $v1, 0x8e($s0) -/* 9AAB08 80242718 46220003 */ div.d $f0, $f0, $f2 -/* 9AAB0C 8024271C 46200620 */ cvt.s.d $f24, $f0 -/* 9AAB10 80242720 C6200088 */ lwc1 $f0, 0x88($s1) -/* 9AAB14 80242724 46800020 */ cvt.s.w $f0, $f0 -/* 9AAB18 80242728 46000021 */ cvt.d.s $f0, $f0 -/* 9AAB1C 8024272C 46220003 */ div.d $f0, $f0, $f2 -/* 9AAB20 80242730 46200020 */ cvt.s.d $f0, $f0 -/* 9AAB24 80242734 18400003 */ blez $v0, .L80242744 -/* 9AAB28 80242738 4600C680 */ add.s $f26, $f24, $f0 -/* 9AAB2C 8024273C 2462FFFF */ addiu $v0, $v1, -1 -/* 9AAB30 80242740 A602008E */ sh $v0, 0x8e($s0) -.L80242744: -/* 9AAB34 80242744 8E220070 */ lw $v0, 0x70($s1) -/* 9AAB38 80242748 18400034 */ blez $v0, .L8024281C -/* 9AAB3C 8024274C 00000000 */ nop -/* 9AAB40 80242750 C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9AAB44 80242754 46806320 */ cvt.s.w $f12, $f12 -/* 9AAB48 80242758 44820000 */ mtc1 $v0, $f0 -/* 9AAB4C 8024275C 00000000 */ nop -/* 9AAB50 80242760 46800020 */ cvt.s.w $f0, $f0 -/* 9AAB54 80242764 46000021 */ cvt.d.s $f0, $f0 -/* 9AAB58 80242768 46220003 */ div.d $f0, $f0, $f2 -/* 9AAB5C 8024276C 0C00A8BB */ jal sin_deg -/* 9AAB60 80242770 462005A0 */ cvt.s.d $f22, $f0 -/* 9AAB64 80242774 8E020000 */ lw $v0, ($s0) -/* 9AAB68 80242778 30420008 */ andi $v0, $v0, 8 -/* 9AAB6C 8024277C 10400003 */ beqz $v0, .L8024278C -/* 9AAB70 80242780 46000506 */ mov.s $f20, $f0 -/* 9AAB74 80242784 080909F3 */ j .L802427CC -/* 9AAB78 80242788 0000102D */ daddu $v0, $zero, $zero -.L8024278C: -/* 9AAB7C 8024278C 27A50028 */ addiu $a1, $sp, 0x28 -/* 9AAB80 80242790 27A6002C */ addiu $a2, $sp, 0x2c -/* 9AAB84 80242794 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AAB88 80242798 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AAB8C 8024279C C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AAB90 802427A0 3C01447A */ lui $at, 0x447a -/* 9AAB94 802427A4 44813000 */ mtc1 $at, $f6 -/* 9AAB98 802427A8 27A20034 */ addiu $v0, $sp, 0x34 -/* 9AAB9C 802427AC E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AABA0 802427B0 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9AABA4 802427B4 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9AABA8 802427B8 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9AABAC 802427BC AFA20010 */ sw $v0, 0x10($sp) -/* 9AABB0 802427C0 8E040080 */ lw $a0, 0x80($s0) -/* 9AABB4 802427C4 0C0372DF */ jal func_800DCB7C -/* 9AABB8 802427C8 27A70030 */ addiu $a3, $sp, 0x30 -.L802427CC: -/* 9AABBC 802427CC 10400007 */ beqz $v0, .L802427EC -/* 9AABC0 802427D0 00000000 */ nop -/* 9AABC4 802427D4 4616A082 */ mul.s $f2, $f20, $f22 -/* 9AABC8 802427D8 00000000 */ nop -/* 9AABCC 802427DC C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9AABD0 802427E0 46180000 */ add.s $f0, $f0, $f24 -/* 9AABD4 802427E4 080909FE */ j .L802427F8 -/* 9AABD8 802427E8 46020000 */ add.s $f0, $f0, $f2 -.L802427EC: -/* 9AABDC 802427EC 4616A002 */ mul.s $f0, $f20, $f22 -/* 9AABE0 802427F0 00000000 */ nop -/* 9AABE4 802427F4 4600D000 */ add.s $f0, $f26, $f0 -.L802427F8: -/* 9AABE8 802427F8 E600003C */ swc1 $f0, 0x3c($s0) -/* 9AABEC 802427FC 8E220074 */ lw $v0, 0x74($s1) -/* 9AABF0 80242800 2442000A */ addiu $v0, $v0, 0xa -/* 9AABF4 80242804 44826000 */ mtc1 $v0, $f12 -/* 9AABF8 80242808 00000000 */ nop -/* 9AABFC 8024280C 0C00A6C9 */ jal clamp_angle -/* 9AAC00 80242810 46806320 */ cvt.s.w $f12, $f12 -/* 9AAC04 80242814 4600020D */ trunc.w.s $f8, $f0 -/* 9AAC08 80242818 E6280074 */ swc1 $f8, 0x74($s1) -.L8024281C: -/* 9AAC0C 8024281C 8E220090 */ lw $v0, 0x90($s1) -/* 9AAC10 80242820 1C400040 */ bgtz $v0, .L80242924 -/* 9AAC14 80242824 2442FFFF */ addiu $v0, $v0, -1 -/* 9AAC18 80242828 860200A8 */ lh $v0, 0xa8($s0) -/* 9AAC1C 8024282C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AAC20 80242830 44821000 */ mtc1 $v0, $f2 -/* 9AAC24 80242834 00000000 */ nop -/* 9AAC28 80242838 468010A0 */ cvt.s.w $f2, $f2 -/* 9AAC2C 8024283C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AAC30 80242840 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AAC34 80242844 46020000 */ add.s $f0, $f0, $f2 -/* 9AAC38 80242848 3C014024 */ lui $at, 0x4024 -/* 9AAC3C 8024284C 44812800 */ mtc1 $at, $f5 -/* 9AAC40 80242850 44802000 */ mtc1 $zero, $f4 -/* 9AAC44 80242854 C442002C */ lwc1 $f2, 0x2c($v0) -/* 9AAC48 80242858 46000021 */ cvt.d.s $f0, $f0 -/* 9AAC4C 8024285C 46240000 */ add.d $f0, $f0, $f4 -/* 9AAC50 80242860 460010A1 */ cvt.d.s $f2, $f2 -/* 9AAC54 80242864 4620103C */ c.lt.d $f2, $f0 -/* 9AAC58 80242868 00000000 */ nop -/* 9AAC5C 8024286C 4500002E */ bc1f .L80242928 -/* 9AAC60 80242870 0280202D */ daddu $a0, $s4, $zero -/* 9AAC64 80242874 24020001 */ addiu $v0, $zero, 1 -/* 9AAC68 80242878 AFA20010 */ sw $v0, 0x10($sp) -/* 9AAC6C 8024287C 8E460024 */ lw $a2, 0x24($s2) -/* 9AAC70 80242880 8E470028 */ lw $a3, 0x28($s2) -/* 9AAC74 80242884 0C01242D */ jal func_800490B4 -/* 9AAC78 80242888 0220282D */ daddu $a1, $s1, $zero -/* 9AAC7C 8024288C 10400026 */ beqz $v0, .L80242928 -/* 9AAC80 80242890 0000202D */ daddu $a0, $zero, $zero -/* 9AAC84 80242894 0200282D */ daddu $a1, $s0, $zero -/* 9AAC88 80242898 0000302D */ daddu $a2, $zero, $zero -/* 9AAC8C 8024289C 2412000C */ addiu $s2, $zero, 0xc -/* 9AAC90 802428A0 860300A8 */ lh $v1, 0xa8($s0) -/* 9AAC94 802428A4 3C013F80 */ lui $at, 0x3f80 -/* 9AAC98 802428A8 44810000 */ mtc1 $at, $f0 -/* 9AAC9C 802428AC 3C014000 */ lui $at, 0x4000 -/* 9AACA0 802428B0 44811000 */ mtc1 $at, $f2 -/* 9AACA4 802428B4 3C01C1A0 */ lui $at, 0xc1a0 -/* 9AACA8 802428B8 44812000 */ mtc1 $at, $f4 -/* 9AACAC 802428BC 44834000 */ mtc1 $v1, $f8 -/* 9AACB0 802428C0 00000000 */ nop -/* 9AACB4 802428C4 46804220 */ cvt.s.w $f8, $f8 -/* 9AACB8 802428C8 44074000 */ mfc1 $a3, $f8 -/* 9AACBC 802428CC 27A20038 */ addiu $v0, $sp, 0x38 -/* 9AACC0 802428D0 AFB2001C */ sw $s2, 0x1c($sp) -/* 9AACC4 802428D4 AFA20020 */ sw $v0, 0x20($sp) -/* 9AACC8 802428D8 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9AACCC 802428DC E7A20014 */ swc1 $f2, 0x14($sp) -/* 9AACD0 802428E0 0C01BFA4 */ jal fx_emote -/* 9AACD4 802428E4 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9AACD8 802428E8 0200202D */ daddu $a0, $s0, $zero -/* 9AACDC 802428EC 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9AACE0 802428F0 C480003C */ lwc1 $f0, 0x3c($a0) -/* 9AACE4 802428F4 3C060020 */ lui $a2, 0x20 -/* 9AACE8 802428F8 0C012530 */ jal func_800494C0 -/* 9AACEC 802428FC E4800064 */ swc1 $f0, 0x64($a0) -/* 9AACF0 80242900 8E220018 */ lw $v0, 0x18($s1) -/* 9AACF4 80242904 9442002A */ lhu $v0, 0x2a($v0) -/* 9AACF8 80242908 30420001 */ andi $v0, $v0, 1 -/* 9AACFC 8024290C 10400003 */ beqz $v0, .L8024291C -/* 9AAD00 80242910 2402000A */ addiu $v0, $zero, 0xa -/* 9AAD04 80242914 08090A71 */ j .L802429C4 -/* 9AAD08 80242918 AE620070 */ sw $v0, 0x70($s3) -.L8024291C: -/* 9AAD0C 8024291C 08090A71 */ j .L802429C4 -/* 9AAD10 80242920 AE720070 */ sw $s2, 0x70($s3) -.L80242924: -/* 9AAD14 80242924 AE220090 */ sw $v0, 0x90($s1) -.L80242928: -/* 9AAD18 80242928 8602008C */ lh $v0, 0x8c($s0) -/* 9AAD1C 8024292C 14400025 */ bnez $v0, .L802429C4 -/* 9AAD20 80242930 00000000 */ nop -/* 9AAD24 80242934 8602008E */ lh $v0, 0x8e($s0) -/* 9AAD28 80242938 1C400022 */ bgtz $v0, .L802429C4 -/* 9AAD2C 8024293C 00000000 */ nop -/* 9AAD30 80242940 8E620074 */ lw $v0, 0x74($s3) -/* 9AAD34 80242944 2442FFFF */ addiu $v0, $v0, -1 -/* 9AAD38 80242948 1840001D */ blez $v0, .L802429C0 -/* 9AAD3C 8024294C AE620074 */ sw $v0, 0x74($s3) -/* 9AAD40 80242950 8E220018 */ lw $v0, 0x18($s1) -/* 9AAD44 80242954 9442002A */ lhu $v0, 0x2a($v0) -/* 9AAD48 80242958 30420010 */ andi $v0, $v0, 0x10 -/* 9AAD4C 8024295C 14400007 */ bnez $v0, .L8024297C -/* 9AAD50 80242960 00000000 */ nop -/* 9AAD54 80242964 C600000C */ lwc1 $f0, 0xc($s0) -/* 9AAD58 80242968 3C014334 */ lui $at, 0x4334 -/* 9AAD5C 8024296C 44816000 */ mtc1 $at, $f12 -/* 9AAD60 80242970 0C00A6C9 */ jal clamp_angle -/* 9AAD64 80242974 460C0300 */ add.s $f12, $f0, $f12 -/* 9AAD68 80242978 E600000C */ swc1 $f0, 0xc($s0) -.L8024297C: -/* 9AAD6C 8024297C 0C00A67F */ jal rand_int -/* 9AAD70 80242980 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9AAD74 80242984 3C032E8B */ lui $v1, 0x2e8b -/* 9AAD78 80242988 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 9AAD7C 8024298C 00430018 */ mult $v0, $v1 -/* 9AAD80 80242990 00021FC3 */ sra $v1, $v0, 0x1f -/* 9AAD84 80242994 00004010 */ mfhi $t0 -/* 9AAD88 80242998 00082043 */ sra $a0, $t0, 1 -/* 9AAD8C 8024299C 00832023 */ subu $a0, $a0, $v1 -/* 9AAD90 802429A0 00041840 */ sll $v1, $a0, 1 -/* 9AAD94 802429A4 00641821 */ addu $v1, $v1, $a0 -/* 9AAD98 802429A8 00031880 */ sll $v1, $v1, 2 -/* 9AAD9C 802429AC 00641823 */ subu $v1, $v1, $a0 -/* 9AADA0 802429B0 00431023 */ subu $v0, $v0, $v1 -/* 9AADA4 802429B4 24420005 */ addiu $v0, $v0, 5 -/* 9AADA8 802429B8 08090A71 */ j .L802429C4 -/* 9AADAC 802429BC A602008E */ sh $v0, 0x8e($s0) -.L802429C0: -/* 9AADB0 802429C0 AE600070 */ sw $zero, 0x70($s3) -.L802429C4: -/* 9AADB4 802429C4 8FBF0054 */ lw $ra, 0x54($sp) -/* 9AADB8 802429C8 8FB40050 */ lw $s4, 0x50($sp) -/* 9AADBC 802429CC 8FB3004C */ lw $s3, 0x4c($sp) -/* 9AADC0 802429D0 8FB20048 */ lw $s2, 0x48($sp) -/* 9AADC4 802429D4 8FB10044 */ lw $s1, 0x44($sp) -/* 9AADC8 802429D8 8FB00040 */ lw $s0, 0x40($sp) -/* 9AADCC 802429DC D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 9AADD0 802429E0 D7B80068 */ ldc1 $f24, 0x68($sp) -/* 9AADD4 802429E4 D7B60060 */ ldc1 $f22, 0x60($sp) -/* 9AADD8 802429E8 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 9AADDC 802429EC 03E00008 */ jr $ra -/* 9AADE0 802429F0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s new file mode 100644 index 0000000000..a5b567956a --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802426B0_9AAAA0.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802426B0_9AAAA0 +/* 9AAAA0 802426B0 27BDFF88 */ addiu $sp, $sp, -0x78 +/* 9AAAA4 802426B4 AFB3004C */ sw $s3, 0x4c($sp) +/* 9AAAA8 802426B8 0080982D */ daddu $s3, $a0, $zero +/* 9AAAAC 802426BC AFBF0054 */ sw $ra, 0x54($sp) +/* 9AAAB0 802426C0 AFB40050 */ sw $s4, 0x50($sp) +/* 9AAAB4 802426C4 AFB20048 */ sw $s2, 0x48($sp) +/* 9AAAB8 802426C8 AFB10044 */ sw $s1, 0x44($sp) +/* 9AAABC 802426CC AFB00040 */ sw $s0, 0x40($sp) +/* 9AAAC0 802426D0 F7BA0070 */ sdc1 $f26, 0x70($sp) +/* 9AAAC4 802426D4 F7B80068 */ sdc1 $f24, 0x68($sp) +/* 9AAAC8 802426D8 F7B60060 */ sdc1 $f22, 0x60($sp) +/* 9AAACC 802426DC F7B40058 */ sdc1 $f20, 0x58($sp) +/* 9AAAD0 802426E0 8E710148 */ lw $s1, 0x148($s3) +/* 9AAAD4 802426E4 00A0902D */ daddu $s2, $a1, $zero +/* 9AAAD8 802426E8 86240008 */ lh $a0, 8($s1) +/* 9AAADC 802426EC 0C00EABB */ jal get_npc_unsafe +/* 9AAAE0 802426F0 00C0A02D */ daddu $s4, $a2, $zero +/* 9AAAE4 802426F4 0040802D */ daddu $s0, $v0, $zero +/* 9AAAE8 802426F8 C6200078 */ lwc1 $f0, 0x78($s1) +/* 9AAAEC 802426FC 46800020 */ cvt.s.w $f0, $f0 +/* 9AAAF0 80242700 46000021 */ cvt.d.s $f0, $f0 +/* 9AAAF4 80242704 3C014059 */ lui $at, 0x4059 +/* 9AAAF8 80242708 44811800 */ mtc1 $at, $f3 +/* 9AAAFC 8024270C 44801000 */ mtc1 $zero, $f2 +/* 9AAB00 80242710 8602008E */ lh $v0, 0x8e($s0) +/* 9AAB04 80242714 9603008E */ lhu $v1, 0x8e($s0) +/* 9AAB08 80242718 46220003 */ div.d $f0, $f0, $f2 +/* 9AAB0C 8024271C 46200620 */ cvt.s.d $f24, $f0 +/* 9AAB10 80242720 C6200088 */ lwc1 $f0, 0x88($s1) +/* 9AAB14 80242724 46800020 */ cvt.s.w $f0, $f0 +/* 9AAB18 80242728 46000021 */ cvt.d.s $f0, $f0 +/* 9AAB1C 8024272C 46220003 */ div.d $f0, $f0, $f2 +/* 9AAB20 80242730 46200020 */ cvt.s.d $f0, $f0 +/* 9AAB24 80242734 18400003 */ blez $v0, .L80242744 +/* 9AAB28 80242738 4600C680 */ add.s $f26, $f24, $f0 +/* 9AAB2C 8024273C 2462FFFF */ addiu $v0, $v1, -1 +/* 9AAB30 80242740 A602008E */ sh $v0, 0x8e($s0) +.L80242744: +/* 9AAB34 80242744 8E220070 */ lw $v0, 0x70($s1) +/* 9AAB38 80242748 18400034 */ blez $v0, .L8024281C +/* 9AAB3C 8024274C 00000000 */ nop +/* 9AAB40 80242750 C62C0074 */ lwc1 $f12, 0x74($s1) +/* 9AAB44 80242754 46806320 */ cvt.s.w $f12, $f12 +/* 9AAB48 80242758 44820000 */ mtc1 $v0, $f0 +/* 9AAB4C 8024275C 00000000 */ nop +/* 9AAB50 80242760 46800020 */ cvt.s.w $f0, $f0 +/* 9AAB54 80242764 46000021 */ cvt.d.s $f0, $f0 +/* 9AAB58 80242768 46220003 */ div.d $f0, $f0, $f2 +/* 9AAB5C 8024276C 0C00A8BB */ jal sin_deg +/* 9AAB60 80242770 462005A0 */ cvt.s.d $f22, $f0 +/* 9AAB64 80242774 8E020000 */ lw $v0, ($s0) +/* 9AAB68 80242778 30420008 */ andi $v0, $v0, 8 +/* 9AAB6C 8024277C 10400003 */ beqz $v0, .L8024278C +/* 9AAB70 80242780 46000506 */ mov.s $f20, $f0 +/* 9AAB74 80242784 080909F3 */ j .L802427CC +/* 9AAB78 80242788 0000102D */ daddu $v0, $zero, $zero +.L8024278C: +/* 9AAB7C 8024278C 27A50028 */ addiu $a1, $sp, 0x28 +/* 9AAB80 80242790 27A6002C */ addiu $a2, $sp, 0x2c +/* 9AAB84 80242794 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9AAB88 80242798 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9AAB8C 8024279C C6040040 */ lwc1 $f4, 0x40($s0) +/* 9AAB90 802427A0 3C01447A */ lui $at, 0x447a +/* 9AAB94 802427A4 44813000 */ mtc1 $at, $f6 +/* 9AAB98 802427A8 27A20034 */ addiu $v0, $sp, 0x34 +/* 9AAB9C 802427AC E7A00028 */ swc1 $f0, 0x28($sp) +/* 9AABA0 802427B0 E7A2002C */ swc1 $f2, 0x2c($sp) +/* 9AABA4 802427B4 E7A40030 */ swc1 $f4, 0x30($sp) +/* 9AABA8 802427B8 E7A60034 */ swc1 $f6, 0x34($sp) +/* 9AABAC 802427BC AFA20010 */ sw $v0, 0x10($sp) +/* 9AABB0 802427C0 8E040080 */ lw $a0, 0x80($s0) +/* 9AABB4 802427C4 0C0372DF */ jal func_800DCB7C +/* 9AABB8 802427C8 27A70030 */ addiu $a3, $sp, 0x30 +.L802427CC: +/* 9AABBC 802427CC 10400007 */ beqz $v0, .L802427EC +/* 9AABC0 802427D0 00000000 */ nop +/* 9AABC4 802427D4 4616A082 */ mul.s $f2, $f20, $f22 +/* 9AABC8 802427D8 00000000 */ nop +/* 9AABCC 802427DC C7A0002C */ lwc1 $f0, 0x2c($sp) +/* 9AABD0 802427E0 46180000 */ add.s $f0, $f0, $f24 +/* 9AABD4 802427E4 080909FE */ j .L802427F8 +/* 9AABD8 802427E8 46020000 */ add.s $f0, $f0, $f2 +.L802427EC: +/* 9AABDC 802427EC 4616A002 */ mul.s $f0, $f20, $f22 +/* 9AABE0 802427F0 00000000 */ nop +/* 9AABE4 802427F4 4600D000 */ add.s $f0, $f26, $f0 +.L802427F8: +/* 9AABE8 802427F8 E600003C */ swc1 $f0, 0x3c($s0) +/* 9AABEC 802427FC 8E220074 */ lw $v0, 0x74($s1) +/* 9AABF0 80242800 2442000A */ addiu $v0, $v0, 0xa +/* 9AABF4 80242804 44826000 */ mtc1 $v0, $f12 +/* 9AABF8 80242808 00000000 */ nop +/* 9AABFC 8024280C 0C00A6C9 */ jal clamp_angle +/* 9AAC00 80242810 46806320 */ cvt.s.w $f12, $f12 +/* 9AAC04 80242814 4600020D */ trunc.w.s $f8, $f0 +/* 9AAC08 80242818 E6280074 */ swc1 $f8, 0x74($s1) +.L8024281C: +/* 9AAC0C 8024281C 8E220090 */ lw $v0, 0x90($s1) +/* 9AAC10 80242820 1C400040 */ bgtz $v0, .L80242924 +/* 9AAC14 80242824 2442FFFF */ addiu $v0, $v0, -1 +/* 9AAC18 80242828 860200A8 */ lh $v0, 0xa8($s0) +/* 9AAC1C 8024282C C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AAC20 80242830 44821000 */ mtc1 $v0, $f2 +/* 9AAC24 80242834 00000000 */ nop +/* 9AAC28 80242838 468010A0 */ cvt.s.w $f2, $f2 +/* 9AAC2C 8024283C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9AAC30 80242840 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9AAC34 80242844 46020000 */ add.s $f0, $f0, $f2 +/* 9AAC38 80242848 3C014024 */ lui $at, 0x4024 +/* 9AAC3C 8024284C 44812800 */ mtc1 $at, $f5 +/* 9AAC40 80242850 44802000 */ mtc1 $zero, $f4 +/* 9AAC44 80242854 C442002C */ lwc1 $f2, 0x2c($v0) +/* 9AAC48 80242858 46000021 */ cvt.d.s $f0, $f0 +/* 9AAC4C 8024285C 46240000 */ add.d $f0, $f0, $f4 +/* 9AAC50 80242860 460010A1 */ cvt.d.s $f2, $f2 +/* 9AAC54 80242864 4620103C */ c.lt.d $f2, $f0 +/* 9AAC58 80242868 00000000 */ nop +/* 9AAC5C 8024286C 4500002E */ bc1f .L80242928 +/* 9AAC60 80242870 0280202D */ daddu $a0, $s4, $zero +/* 9AAC64 80242874 24020001 */ addiu $v0, $zero, 1 +/* 9AAC68 80242878 AFA20010 */ sw $v0, 0x10($sp) +/* 9AAC6C 8024287C 8E460024 */ lw $a2, 0x24($s2) +/* 9AAC70 80242880 8E470028 */ lw $a3, 0x28($s2) +/* 9AAC74 80242884 0C01242D */ jal func_800490B4 +/* 9AAC78 80242888 0220282D */ daddu $a1, $s1, $zero +/* 9AAC7C 8024288C 10400026 */ beqz $v0, .L80242928 +/* 9AAC80 80242890 0000202D */ daddu $a0, $zero, $zero +/* 9AAC84 80242894 0200282D */ daddu $a1, $s0, $zero +/* 9AAC88 80242898 0000302D */ daddu $a2, $zero, $zero +/* 9AAC8C 8024289C 2412000C */ addiu $s2, $zero, 0xc +/* 9AAC90 802428A0 860300A8 */ lh $v1, 0xa8($s0) +/* 9AAC94 802428A4 3C013F80 */ lui $at, 0x3f80 +/* 9AAC98 802428A8 44810000 */ mtc1 $at, $f0 +/* 9AAC9C 802428AC 3C014000 */ lui $at, 0x4000 +/* 9AACA0 802428B0 44811000 */ mtc1 $at, $f2 +/* 9AACA4 802428B4 3C01C1A0 */ lui $at, 0xc1a0 +/* 9AACA8 802428B8 44812000 */ mtc1 $at, $f4 +/* 9AACAC 802428BC 44834000 */ mtc1 $v1, $f8 +/* 9AACB0 802428C0 00000000 */ nop +/* 9AACB4 802428C4 46804220 */ cvt.s.w $f8, $f8 +/* 9AACB8 802428C8 44074000 */ mfc1 $a3, $f8 +/* 9AACBC 802428CC 27A20038 */ addiu $v0, $sp, 0x38 +/* 9AACC0 802428D0 AFB2001C */ sw $s2, 0x1c($sp) +/* 9AACC4 802428D4 AFA20020 */ sw $v0, 0x20($sp) +/* 9AACC8 802428D8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9AACCC 802428DC E7A20014 */ swc1 $f2, 0x14($sp) +/* 9AACD0 802428E0 0C01BFA4 */ jal fx_emote +/* 9AACD4 802428E4 E7A40018 */ swc1 $f4, 0x18($sp) +/* 9AACD8 802428E8 0200202D */ daddu $a0, $s0, $zero +/* 9AACDC 802428EC 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 9AACE0 802428F0 C480003C */ lwc1 $f0, 0x3c($a0) +/* 9AACE4 802428F4 3C060020 */ lui $a2, 0x20 +/* 9AACE8 802428F8 0C012530 */ jal func_800494C0 +/* 9AACEC 802428FC E4800064 */ swc1 $f0, 0x64($a0) +/* 9AACF0 80242900 8E220018 */ lw $v0, 0x18($s1) +/* 9AACF4 80242904 9442002A */ lhu $v0, 0x2a($v0) +/* 9AACF8 80242908 30420001 */ andi $v0, $v0, 1 +/* 9AACFC 8024290C 10400003 */ beqz $v0, .L8024291C +/* 9AAD00 80242910 2402000A */ addiu $v0, $zero, 0xa +/* 9AAD04 80242914 08090A71 */ j .L802429C4 +/* 9AAD08 80242918 AE620070 */ sw $v0, 0x70($s3) +.L8024291C: +/* 9AAD0C 8024291C 08090A71 */ j .L802429C4 +/* 9AAD10 80242920 AE720070 */ sw $s2, 0x70($s3) +.L80242924: +/* 9AAD14 80242924 AE220090 */ sw $v0, 0x90($s1) +.L80242928: +/* 9AAD18 80242928 8602008C */ lh $v0, 0x8c($s0) +/* 9AAD1C 8024292C 14400025 */ bnez $v0, .L802429C4 +/* 9AAD20 80242930 00000000 */ nop +/* 9AAD24 80242934 8602008E */ lh $v0, 0x8e($s0) +/* 9AAD28 80242938 1C400022 */ bgtz $v0, .L802429C4 +/* 9AAD2C 8024293C 00000000 */ nop +/* 9AAD30 80242940 8E620074 */ lw $v0, 0x74($s3) +/* 9AAD34 80242944 2442FFFF */ addiu $v0, $v0, -1 +/* 9AAD38 80242948 1840001D */ blez $v0, .L802429C0 +/* 9AAD3C 8024294C AE620074 */ sw $v0, 0x74($s3) +/* 9AAD40 80242950 8E220018 */ lw $v0, 0x18($s1) +/* 9AAD44 80242954 9442002A */ lhu $v0, 0x2a($v0) +/* 9AAD48 80242958 30420010 */ andi $v0, $v0, 0x10 +/* 9AAD4C 8024295C 14400007 */ bnez $v0, .L8024297C +/* 9AAD50 80242960 00000000 */ nop +/* 9AAD54 80242964 C600000C */ lwc1 $f0, 0xc($s0) +/* 9AAD58 80242968 3C014334 */ lui $at, 0x4334 +/* 9AAD5C 8024296C 44816000 */ mtc1 $at, $f12 +/* 9AAD60 80242970 0C00A6C9 */ jal clamp_angle +/* 9AAD64 80242974 460C0300 */ add.s $f12, $f0, $f12 +/* 9AAD68 80242978 E600000C */ swc1 $f0, 0xc($s0) +.L8024297C: +/* 9AAD6C 8024297C 0C00A67F */ jal rand_int +/* 9AAD70 80242980 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 9AAD74 80242984 3C032E8B */ lui $v1, 0x2e8b +/* 9AAD78 80242988 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* 9AAD7C 8024298C 00430018 */ mult $v0, $v1 +/* 9AAD80 80242990 00021FC3 */ sra $v1, $v0, 0x1f +/* 9AAD84 80242994 00004010 */ mfhi $t0 +/* 9AAD88 80242998 00082043 */ sra $a0, $t0, 1 +/* 9AAD8C 8024299C 00832023 */ subu $a0, $a0, $v1 +/* 9AAD90 802429A0 00041840 */ sll $v1, $a0, 1 +/* 9AAD94 802429A4 00641821 */ addu $v1, $v1, $a0 +/* 9AAD98 802429A8 00031880 */ sll $v1, $v1, 2 +/* 9AAD9C 802429AC 00641823 */ subu $v1, $v1, $a0 +/* 9AADA0 802429B0 00431023 */ subu $v0, $v0, $v1 +/* 9AADA4 802429B4 24420005 */ addiu $v0, $v0, 5 +/* 9AADA8 802429B8 08090A71 */ j .L802429C4 +/* 9AADAC 802429BC A602008E */ sh $v0, 0x8e($s0) +.L802429C0: +/* 9AADB0 802429C0 AE600070 */ sw $zero, 0x70($s3) +.L802429C4: +/* 9AADB4 802429C4 8FBF0054 */ lw $ra, 0x54($sp) +/* 9AADB8 802429C8 8FB40050 */ lw $s4, 0x50($sp) +/* 9AADBC 802429CC 8FB3004C */ lw $s3, 0x4c($sp) +/* 9AADC0 802429D0 8FB20048 */ lw $s2, 0x48($sp) +/* 9AADC4 802429D4 8FB10044 */ lw $s1, 0x44($sp) +/* 9AADC8 802429D8 8FB00040 */ lw $s0, 0x40($sp) +/* 9AADCC 802429DC D7BA0070 */ ldc1 $f26, 0x70($sp) +/* 9AADD0 802429E0 D7B80068 */ ldc1 $f24, 0x68($sp) +/* 9AADD4 802429E4 D7B60060 */ ldc1 $f22, 0x60($sp) +/* 9AADD8 802429E8 D7B40058 */ ldc1 $f20, 0x58($sp) +/* 9AADDC 802429EC 03E00008 */ jr $ra +/* 9AADE0 802429F0 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4.s deleted file mode 100644 index 6b06fc6c33..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429F4 -/* 9AADE4 802429F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9AADE8 802429F8 AFB20018 */ sw $s2, 0x18($sp) -/* 9AADEC 802429FC 0080902D */ daddu $s2, $a0, $zero -/* 9AADF0 80242A00 AFBF001C */ sw $ra, 0x1c($sp) -/* 9AADF4 80242A04 AFB10014 */ sw $s1, 0x14($sp) -/* 9AADF8 80242A08 AFB00010 */ sw $s0, 0x10($sp) -/* 9AADFC 80242A0C 8E510148 */ lw $s1, 0x148($s2) -/* 9AAE00 80242A10 0C00EABB */ jal get_npc_unsafe -/* 9AAE04 80242A14 86240008 */ lh $a0, 8($s1) -/* 9AAE08 80242A18 0040802D */ daddu $s0, $v0, $zero -/* 9AAE0C 80242A1C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AAE10 80242A20 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AAE14 80242A24 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AAE18 80242A28 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AAE1C 80242A2C A600008E */ sh $zero, 0x8e($s0) -/* 9AAE20 80242A30 8C460028 */ lw $a2, 0x28($v0) -/* 9AAE24 80242A34 0C00A720 */ jal atan2 -/* 9AAE28 80242A38 8C470030 */ lw $a3, 0x30($v0) -/* 9AAE2C 80242A3C E600000C */ swc1 $f0, 0xc($s0) -/* 9AAE30 80242A40 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AAE34 80242A44 8C420020 */ lw $v0, 0x20($v0) -/* 9AAE38 80242A48 AE020028 */ sw $v0, 0x28($s0) -/* 9AAE3C 80242A4C 2402000B */ addiu $v0, $zero, 0xb -/* 9AAE40 80242A50 AE420070 */ sw $v0, 0x70($s2) -/* 9AAE44 80242A54 8FBF001C */ lw $ra, 0x1c($sp) -/* 9AAE48 80242A58 8FB20018 */ lw $s2, 0x18($sp) -/* 9AAE4C 80242A5C 8FB10014 */ lw $s1, 0x14($sp) -/* 9AAE50 80242A60 8FB00010 */ lw $s0, 0x10($sp) -/* 9AAE54 80242A64 03E00008 */ jr $ra -/* 9AAE58 80242A68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4_9AADE4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4_9AADE4.s new file mode 100644 index 0000000000..a63b881af7 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802429F4_9AADE4.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802429F4_9AADE4 +/* 9AADE4 802429F4 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9AADE8 802429F8 AFB20018 */ sw $s2, 0x18($sp) +/* 9AADEC 802429FC 0080902D */ daddu $s2, $a0, $zero +/* 9AADF0 80242A00 AFBF001C */ sw $ra, 0x1c($sp) +/* 9AADF4 80242A04 AFB10014 */ sw $s1, 0x14($sp) +/* 9AADF8 80242A08 AFB00010 */ sw $s0, 0x10($sp) +/* 9AADFC 80242A0C 8E510148 */ lw $s1, 0x148($s2) +/* 9AAE00 80242A10 0C00EABB */ jal get_npc_unsafe +/* 9AAE04 80242A14 86240008 */ lh $a0, 8($s1) +/* 9AAE08 80242A18 0040802D */ daddu $s0, $v0, $zero +/* 9AAE0C 80242A1C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9AAE10 80242A20 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9AAE14 80242A24 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9AAE18 80242A28 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9AAE1C 80242A2C A600008E */ sh $zero, 0x8e($s0) +/* 9AAE20 80242A30 8C460028 */ lw $a2, 0x28($v0) +/* 9AAE24 80242A34 0C00A720 */ jal atan2 +/* 9AAE28 80242A38 8C470030 */ lw $a3, 0x30($v0) +/* 9AAE2C 80242A3C E600000C */ swc1 $f0, 0xc($s0) +/* 9AAE30 80242A40 8E2200CC */ lw $v0, 0xcc($s1) +/* 9AAE34 80242A44 8C420020 */ lw $v0, 0x20($v0) +/* 9AAE38 80242A48 AE020028 */ sw $v0, 0x28($s0) +/* 9AAE3C 80242A4C 2402000B */ addiu $v0, $zero, 0xb +/* 9AAE40 80242A50 AE420070 */ sw $v0, 0x70($s2) +/* 9AAE44 80242A54 8FBF001C */ lw $ra, 0x1c($sp) +/* 9AAE48 80242A58 8FB20018 */ lw $s2, 0x18($sp) +/* 9AAE4C 80242A5C 8FB10014 */ lw $s1, 0x14($sp) +/* 9AAE50 80242A60 8FB00010 */ lw $s0, 0x10($sp) +/* 9AAE54 80242A64 03E00008 */ jr $ra +/* 9AAE58 80242A68 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C.s deleted file mode 100644 index 53a3600f8a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C.s +++ /dev/null @@ -1,32 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A6C -/* 9AAE5C 80242A6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AAE60 80242A70 AFB00010 */ sw $s0, 0x10($sp) -/* 9AAE64 80242A74 0080802D */ daddu $s0, $a0, $zero -/* 9AAE68 80242A78 AFBF0014 */ sw $ra, 0x14($sp) -/* 9AAE6C 80242A7C 8E020148 */ lw $v0, 0x148($s0) -/* 9AAE70 80242A80 0C00EABB */ jal get_npc_unsafe -/* 9AAE74 80242A84 84440008 */ lh $a0, 8($v0) -/* 9AAE78 80242A88 9443008E */ lhu $v1, 0x8e($v0) -/* 9AAE7C 80242A8C C440003C */ lwc1 $f0, 0x3c($v0) -/* 9AAE80 80242A90 24640001 */ addiu $a0, $v1, 1 -/* 9AAE84 80242A94 00031C00 */ sll $v1, $v1, 0x10 -/* 9AAE88 80242A98 00031B83 */ sra $v1, $v1, 0xe -/* 9AAE8C 80242A9C A444008E */ sh $a0, 0x8e($v0) -/* 9AAE90 80242AA0 3C018024 */ lui $at, 0x8024 -/* 9AAE94 80242AA4 00230821 */ addu $at, $at, $v1 -/* 9AAE98 80242AA8 C42256F4 */ lwc1 $f2, 0x56f4($at) -/* 9AAE9C 80242AAC 8443008E */ lh $v1, 0x8e($v0) -/* 9AAEA0 80242AB0 46020000 */ add.s $f0, $f0, $f2 -/* 9AAEA4 80242AB4 28630005 */ slti $v1, $v1, 5 -/* 9AAEA8 80242AB8 14600003 */ bnez $v1, .L80242AC8 -/* 9AAEAC 80242ABC E440003C */ swc1 $f0, 0x3c($v0) -/* 9AAEB0 80242AC0 2402000C */ addiu $v0, $zero, 0xc -/* 9AAEB4 80242AC4 AE020070 */ sw $v0, 0x70($s0) -.L80242AC8: -/* 9AAEB8 80242AC8 8FBF0014 */ lw $ra, 0x14($sp) -/* 9AAEBC 80242ACC 8FB00010 */ lw $s0, 0x10($sp) -/* 9AAEC0 80242AD0 03E00008 */ jr $ra -/* 9AAEC4 80242AD4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s new file mode 100644 index 0000000000..85af73b5d4 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242A6C_9AAE5C.s @@ -0,0 +1,32 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A6C_9AAE5C +/* 9AAE5C 80242A6C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9AAE60 80242A70 AFB00010 */ sw $s0, 0x10($sp) +/* 9AAE64 80242A74 0080802D */ daddu $s0, $a0, $zero +/* 9AAE68 80242A78 AFBF0014 */ sw $ra, 0x14($sp) +/* 9AAE6C 80242A7C 8E020148 */ lw $v0, 0x148($s0) +/* 9AAE70 80242A80 0C00EABB */ jal get_npc_unsafe +/* 9AAE74 80242A84 84440008 */ lh $a0, 8($v0) +/* 9AAE78 80242A88 9443008E */ lhu $v1, 0x8e($v0) +/* 9AAE7C 80242A8C C440003C */ lwc1 $f0, 0x3c($v0) +/* 9AAE80 80242A90 24640001 */ addiu $a0, $v1, 1 +/* 9AAE84 80242A94 00031C00 */ sll $v1, $v1, 0x10 +/* 9AAE88 80242A98 00031B83 */ sra $v1, $v1, 0xe +/* 9AAE8C 80242A9C A444008E */ sh $a0, 0x8e($v0) +/* 9AAE90 80242AA0 3C018024 */ lui $at, 0x8024 +/* 9AAE94 80242AA4 00230821 */ addu $at, $at, $v1 +/* 9AAE98 80242AA8 C42256F4 */ lwc1 $f2, 0x56f4($at) +/* 9AAE9C 80242AAC 8443008E */ lh $v1, 0x8e($v0) +/* 9AAEA0 80242AB0 46020000 */ add.s $f0, $f0, $f2 +/* 9AAEA4 80242AB4 28630005 */ slti $v1, $v1, 5 +/* 9AAEA8 80242AB8 14600003 */ bnez $v1, .L80242AC8 +/* 9AAEAC 80242ABC E440003C */ swc1 $f0, 0x3c($v0) +/* 9AAEB0 80242AC0 2402000C */ addiu $v0, $zero, 0xc +/* 9AAEB4 80242AC4 AE020070 */ sw $v0, 0x70($s0) +.L80242AC8: +/* 9AAEB8 80242AC8 8FBF0014 */ lw $ra, 0x14($sp) +/* 9AAEBC 80242ACC 8FB00010 */ lw $s0, 0x10($sp) +/* 9AAEC0 80242AD0 03E00008 */ jr $ra +/* 9AAEC4 80242AD4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8.s deleted file mode 100644 index b26ea49da7..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AD8 -/* 9AAEC8 80242AD8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9AAECC 80242ADC AFB3001C */ sw $s3, 0x1c($sp) -/* 9AAED0 80242AE0 0080982D */ daddu $s3, $a0, $zero -/* 9AAED4 80242AE4 AFBF0020 */ sw $ra, 0x20($sp) -/* 9AAED8 80242AE8 AFB20018 */ sw $s2, 0x18($sp) -/* 9AAEDC 80242AEC AFB10014 */ sw $s1, 0x14($sp) -/* 9AAEE0 80242AF0 AFB00010 */ sw $s0, 0x10($sp) -/* 9AAEE4 80242AF4 8E720148 */ lw $s2, 0x148($s3) -/* 9AAEE8 80242AF8 86440008 */ lh $a0, 8($s2) -/* 9AAEEC 80242AFC 0C00EABB */ jal get_npc_unsafe -/* 9AAEF0 80242B00 00A0802D */ daddu $s0, $a1, $zero -/* 9AAEF4 80242B04 0040882D */ daddu $s1, $v0, $zero -/* 9AAEF8 80242B08 C6420080 */ lwc1 $f2, 0x80($s2) -/* 9AAEFC 80242B0C 468010A0 */ cvt.s.w $f2, $f2 -/* 9AAF00 80242B10 460010A1 */ cvt.d.s $f2, $f2 -/* 9AAF04 80242B14 C6400084 */ lwc1 $f0, 0x84($s2) -/* 9AAF08 80242B18 46800020 */ cvt.s.w $f0, $f0 -/* 9AAF0C 80242B1C 46000021 */ cvt.d.s $f0, $f0 -/* 9AAF10 80242B20 3C014059 */ lui $at, 0x4059 -/* 9AAF14 80242B24 44812800 */ mtc1 $at, $f5 -/* 9AAF18 80242B28 44802000 */ mtc1 $zero, $f4 -/* 9AAF1C 80242B2C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9AAF20 80242B30 C62C0038 */ lwc1 $f12, 0x38($s1) -/* 9AAF24 80242B34 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 9AAF28 80242B38 46241083 */ div.d $f2, $f2, $f4 -/* 9AAF2C 80242B3C 462010A0 */ cvt.s.d $f2, $f2 -/* 9AAF30 80242B40 46240003 */ div.d $f0, $f0, $f4 -/* 9AAF34 80242B44 8C420020 */ lw $v0, 0x20($v0) -/* 9AAF38 80242B48 46200020 */ cvt.s.d $f0, $f0 -/* 9AAF3C 80242B4C E622001C */ swc1 $f2, 0x1c($s1) -/* 9AAF40 80242B50 E6200014 */ swc1 $f0, 0x14($s1) -/* 9AAF44 80242B54 AE220028 */ sw $v0, 0x28($s1) -/* 9AAF48 80242B58 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9AAF4C 80242B5C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AAF50 80242B60 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AAF54 80242B64 E6200018 */ swc1 $f0, 0x18($s1) -/* 9AAF58 80242B68 8C460028 */ lw $a2, 0x28($v0) -/* 9AAF5C 80242B6C 0C00A720 */ jal atan2 -/* 9AAF60 80242B70 8C470030 */ lw $a3, 0x30($v0) -/* 9AAF64 80242B74 E620000C */ swc1 $f0, 0xc($s1) -/* 9AAF68 80242B78 8E420018 */ lw $v0, 0x18($s2) -/* 9AAF6C 80242B7C AE400074 */ sw $zero, 0x74($s2) -/* 9AAF70 80242B80 9442002A */ lhu $v0, 0x2a($v0) -/* 9AAF74 80242B84 30420002 */ andi $v0, $v0, 2 -/* 9AAF78 80242B88 10400005 */ beqz $v0, .L80242BA0 -/* 9AAF7C 80242B8C 24020003 */ addiu $v0, $zero, 3 -/* 9AAF80 80242B90 A622008E */ sh $v0, 0x8e($s1) -/* 9AAF84 80242B94 2402000D */ addiu $v0, $zero, 0xd -/* 9AAF88 80242B98 08090AFC */ j .L80242BF0 -/* 9AAF8C 80242B9C AE620070 */ sw $v0, 0x70($s3) -.L80242BA0: -/* 9AAF90 80242BA0 24030001 */ addiu $v1, $zero, 1 -/* 9AAF94 80242BA4 2402000E */ addiu $v0, $zero, 0xe -/* 9AAF98 80242BA8 A623008E */ sh $v1, 0x8e($s1) -/* 9AAF9C 80242BAC AE620070 */ sw $v0, 0x70($s3) -/* 9AAFA0 80242BB0 C6200038 */ lwc1 $f0, 0x38($s1) -/* 9AAFA4 80242BB4 4600018D */ trunc.w.s $f6, $f0 -/* 9AAFA8 80242BB8 44023000 */ mfc1 $v0, $f6 -/* 9AAFAC 80242BBC 00000000 */ nop -/* 9AAFB0 80242BC0 A6420010 */ sh $v0, 0x10($s2) -/* 9AAFB4 80242BC4 C620003C */ lwc1 $f0, 0x3c($s1) -/* 9AAFB8 80242BC8 4600018D */ trunc.w.s $f6, $f0 -/* 9AAFBC 80242BCC 44023000 */ mfc1 $v0, $f6 -/* 9AAFC0 80242BD0 00000000 */ nop -/* 9AAFC4 80242BD4 A6420012 */ sh $v0, 0x12($s2) -/* 9AAFC8 80242BD8 C6200040 */ lwc1 $f0, 0x40($s1) -/* 9AAFCC 80242BDC A2430007 */ sb $v1, 7($s2) -/* 9AAFD0 80242BE0 4600018D */ trunc.w.s $f6, $f0 -/* 9AAFD4 80242BE4 44023000 */ mfc1 $v0, $f6 -/* 9AAFD8 80242BE8 00000000 */ nop -/* 9AAFDC 80242BEC A6420014 */ sh $v0, 0x14($s2) -.L80242BF0: -/* 9AAFE0 80242BF0 8FBF0020 */ lw $ra, 0x20($sp) -/* 9AAFE4 80242BF4 8FB3001C */ lw $s3, 0x1c($sp) -/* 9AAFE8 80242BF8 8FB20018 */ lw $s2, 0x18($sp) -/* 9AAFEC 80242BFC 8FB10014 */ lw $s1, 0x14($sp) -/* 9AAFF0 80242C00 8FB00010 */ lw $s0, 0x10($sp) -/* 9AAFF4 80242C04 03E00008 */ jr $ra -/* 9AAFF8 80242C08 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s new file mode 100644 index 0000000000..2829b0d086 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242AD8_9AAEC8.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242AD8_9AAEC8 +/* 9AAEC8 80242AD8 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9AAECC 80242ADC AFB3001C */ sw $s3, 0x1c($sp) +/* 9AAED0 80242AE0 0080982D */ daddu $s3, $a0, $zero +/* 9AAED4 80242AE4 AFBF0020 */ sw $ra, 0x20($sp) +/* 9AAED8 80242AE8 AFB20018 */ sw $s2, 0x18($sp) +/* 9AAEDC 80242AEC AFB10014 */ sw $s1, 0x14($sp) +/* 9AAEE0 80242AF0 AFB00010 */ sw $s0, 0x10($sp) +/* 9AAEE4 80242AF4 8E720148 */ lw $s2, 0x148($s3) +/* 9AAEE8 80242AF8 86440008 */ lh $a0, 8($s2) +/* 9AAEEC 80242AFC 0C00EABB */ jal get_npc_unsafe +/* 9AAEF0 80242B00 00A0802D */ daddu $s0, $a1, $zero +/* 9AAEF4 80242B04 0040882D */ daddu $s1, $v0, $zero +/* 9AAEF8 80242B08 C6420080 */ lwc1 $f2, 0x80($s2) +/* 9AAEFC 80242B0C 468010A0 */ cvt.s.w $f2, $f2 +/* 9AAF00 80242B10 460010A1 */ cvt.d.s $f2, $f2 +/* 9AAF04 80242B14 C6400084 */ lwc1 $f0, 0x84($s2) +/* 9AAF08 80242B18 46800020 */ cvt.s.w $f0, $f0 +/* 9AAF0C 80242B1C 46000021 */ cvt.d.s $f0, $f0 +/* 9AAF10 80242B20 3C014059 */ lui $at, 0x4059 +/* 9AAF14 80242B24 44812800 */ mtc1 $at, $f5 +/* 9AAF18 80242B28 44802000 */ mtc1 $zero, $f4 +/* 9AAF1C 80242B2C 8E4200CC */ lw $v0, 0xcc($s2) +/* 9AAF20 80242B30 C62C0038 */ lwc1 $f12, 0x38($s1) +/* 9AAF24 80242B34 C62E0040 */ lwc1 $f14, 0x40($s1) +/* 9AAF28 80242B38 46241083 */ div.d $f2, $f2, $f4 +/* 9AAF2C 80242B3C 462010A0 */ cvt.s.d $f2, $f2 +/* 9AAF30 80242B40 46240003 */ div.d $f0, $f0, $f4 +/* 9AAF34 80242B44 8C420020 */ lw $v0, 0x20($v0) +/* 9AAF38 80242B48 46200020 */ cvt.s.d $f0, $f0 +/* 9AAF3C 80242B4C E622001C */ swc1 $f2, 0x1c($s1) +/* 9AAF40 80242B50 E6200014 */ swc1 $f0, 0x14($s1) +/* 9AAF44 80242B54 AE220028 */ sw $v0, 0x28($s1) +/* 9AAF48 80242B58 C6000018 */ lwc1 $f0, 0x18($s0) +/* 9AAF4C 80242B5C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9AAF50 80242B60 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9AAF54 80242B64 E6200018 */ swc1 $f0, 0x18($s1) +/* 9AAF58 80242B68 8C460028 */ lw $a2, 0x28($v0) +/* 9AAF5C 80242B6C 0C00A720 */ jal atan2 +/* 9AAF60 80242B70 8C470030 */ lw $a3, 0x30($v0) +/* 9AAF64 80242B74 E620000C */ swc1 $f0, 0xc($s1) +/* 9AAF68 80242B78 8E420018 */ lw $v0, 0x18($s2) +/* 9AAF6C 80242B7C AE400074 */ sw $zero, 0x74($s2) +/* 9AAF70 80242B80 9442002A */ lhu $v0, 0x2a($v0) +/* 9AAF74 80242B84 30420002 */ andi $v0, $v0, 2 +/* 9AAF78 80242B88 10400005 */ beqz $v0, .L80242BA0 +/* 9AAF7C 80242B8C 24020003 */ addiu $v0, $zero, 3 +/* 9AAF80 80242B90 A622008E */ sh $v0, 0x8e($s1) +/* 9AAF84 80242B94 2402000D */ addiu $v0, $zero, 0xd +/* 9AAF88 80242B98 08090AFC */ j .L80242BF0 +/* 9AAF8C 80242B9C AE620070 */ sw $v0, 0x70($s3) +.L80242BA0: +/* 9AAF90 80242BA0 24030001 */ addiu $v1, $zero, 1 +/* 9AAF94 80242BA4 2402000E */ addiu $v0, $zero, 0xe +/* 9AAF98 80242BA8 A623008E */ sh $v1, 0x8e($s1) +/* 9AAF9C 80242BAC AE620070 */ sw $v0, 0x70($s3) +/* 9AAFA0 80242BB0 C6200038 */ lwc1 $f0, 0x38($s1) +/* 9AAFA4 80242BB4 4600018D */ trunc.w.s $f6, $f0 +/* 9AAFA8 80242BB8 44023000 */ mfc1 $v0, $f6 +/* 9AAFAC 80242BBC 00000000 */ nop +/* 9AAFB0 80242BC0 A6420010 */ sh $v0, 0x10($s2) +/* 9AAFB4 80242BC4 C620003C */ lwc1 $f0, 0x3c($s1) +/* 9AAFB8 80242BC8 4600018D */ trunc.w.s $f6, $f0 +/* 9AAFBC 80242BCC 44023000 */ mfc1 $v0, $f6 +/* 9AAFC0 80242BD0 00000000 */ nop +/* 9AAFC4 80242BD4 A6420012 */ sh $v0, 0x12($s2) +/* 9AAFC8 80242BD8 C6200040 */ lwc1 $f0, 0x40($s1) +/* 9AAFCC 80242BDC A2430007 */ sb $v1, 7($s2) +/* 9AAFD0 80242BE0 4600018D */ trunc.w.s $f6, $f0 +/* 9AAFD4 80242BE4 44023000 */ mfc1 $v0, $f6 +/* 9AAFD8 80242BE8 00000000 */ nop +/* 9AAFDC 80242BEC A6420014 */ sh $v0, 0x14($s2) +.L80242BF0: +/* 9AAFE0 80242BF0 8FBF0020 */ lw $ra, 0x20($sp) +/* 9AAFE4 80242BF4 8FB3001C */ lw $s3, 0x1c($sp) +/* 9AAFE8 80242BF8 8FB20018 */ lw $s2, 0x18($sp) +/* 9AAFEC 80242BFC 8FB10014 */ lw $s1, 0x14($sp) +/* 9AAFF0 80242C00 8FB00010 */ lw $s0, 0x10($sp) +/* 9AAFF4 80242C04 03E00008 */ jr $ra +/* 9AAFF8 80242C08 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C.s deleted file mode 100644 index 4ec25b5470..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C0C -/* 9AAFFC 80242C0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9AB000 80242C10 AFB00010 */ sw $s0, 0x10($sp) -/* 9AB004 80242C14 0080802D */ daddu $s0, $a0, $zero -/* 9AB008 80242C18 AFBF0014 */ sw $ra, 0x14($sp) -/* 9AB00C 80242C1C 8E020148 */ lw $v0, 0x148($s0) -/* 9AB010 80242C20 0C00EABB */ jal get_npc_unsafe -/* 9AB014 80242C24 84440008 */ lh $a0, 8($v0) -/* 9AB018 80242C28 0040202D */ daddu $a0, $v0, $zero -/* 9AB01C 80242C2C 8482008E */ lh $v0, 0x8e($a0) -/* 9AB020 80242C30 9483008E */ lhu $v1, 0x8e($a0) -/* 9AB024 80242C34 18400005 */ blez $v0, .L80242C4C -/* 9AB028 80242C38 2462FFFF */ addiu $v0, $v1, -1 -/* 9AB02C 80242C3C A482008E */ sh $v0, 0x8e($a0) -/* 9AB030 80242C40 00021400 */ sll $v0, $v0, 0x10 -/* 9AB034 80242C44 1C400006 */ bgtz $v0, .L80242C60 -/* 9AB038 80242C48 00000000 */ nop -.L80242C4C: -/* 9AB03C 80242C4C 8482008C */ lh $v0, 0x8c($a0) -/* 9AB040 80242C50 14400003 */ bnez $v0, .L80242C60 -/* 9AB044 80242C54 2402000E */ addiu $v0, $zero, 0xe -/* 9AB048 80242C58 A480008E */ sh $zero, 0x8e($a0) -/* 9AB04C 80242C5C AE020070 */ sw $v0, 0x70($s0) -.L80242C60: -/* 9AB050 80242C60 8FBF0014 */ lw $ra, 0x14($sp) -/* 9AB054 80242C64 8FB00010 */ lw $s0, 0x10($sp) -/* 9AB058 80242C68 03E00008 */ jr $ra -/* 9AB05C 80242C6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s new file mode 100644 index 0000000000..6fda49ee13 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C0C_9AAFFC.s @@ -0,0 +1,31 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C0C_9AAFFC +/* 9AAFFC 80242C0C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9AB000 80242C10 AFB00010 */ sw $s0, 0x10($sp) +/* 9AB004 80242C14 0080802D */ daddu $s0, $a0, $zero +/* 9AB008 80242C18 AFBF0014 */ sw $ra, 0x14($sp) +/* 9AB00C 80242C1C 8E020148 */ lw $v0, 0x148($s0) +/* 9AB010 80242C20 0C00EABB */ jal get_npc_unsafe +/* 9AB014 80242C24 84440008 */ lh $a0, 8($v0) +/* 9AB018 80242C28 0040202D */ daddu $a0, $v0, $zero +/* 9AB01C 80242C2C 8482008E */ lh $v0, 0x8e($a0) +/* 9AB020 80242C30 9483008E */ lhu $v1, 0x8e($a0) +/* 9AB024 80242C34 18400005 */ blez $v0, .L80242C4C +/* 9AB028 80242C38 2462FFFF */ addiu $v0, $v1, -1 +/* 9AB02C 80242C3C A482008E */ sh $v0, 0x8e($a0) +/* 9AB030 80242C40 00021400 */ sll $v0, $v0, 0x10 +/* 9AB034 80242C44 1C400006 */ bgtz $v0, .L80242C60 +/* 9AB038 80242C48 00000000 */ nop +.L80242C4C: +/* 9AB03C 80242C4C 8482008C */ lh $v0, 0x8c($a0) +/* 9AB040 80242C50 14400003 */ bnez $v0, .L80242C60 +/* 9AB044 80242C54 2402000E */ addiu $v0, $zero, 0xe +/* 9AB048 80242C58 A480008E */ sh $zero, 0x8e($a0) +/* 9AB04C 80242C5C AE020070 */ sw $v0, 0x70($s0) +.L80242C60: +/* 9AB050 80242C60 8FBF0014 */ lw $ra, 0x14($sp) +/* 9AB054 80242C64 8FB00010 */ lw $s0, 0x10($sp) +/* 9AB058 80242C68 03E00008 */ jr $ra +/* 9AB05C 80242C6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70.s deleted file mode 100644 index 4bbc5eafb6..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242C70 -/* 9AB060 80242C70 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9AB064 80242C74 AFB20030 */ sw $s2, 0x30($sp) -/* 9AB068 80242C78 0080902D */ daddu $s2, $a0, $zero -/* 9AB06C 80242C7C AFBF0038 */ sw $ra, 0x38($sp) -/* 9AB070 80242C80 AFB30034 */ sw $s3, 0x34($sp) -/* 9AB074 80242C84 AFB1002C */ sw $s1, 0x2c($sp) -/* 9AB078 80242C88 AFB00028 */ sw $s0, 0x28($sp) -/* 9AB07C 80242C8C F7B60048 */ sdc1 $f22, 0x48($sp) -/* 9AB080 80242C90 F7B40040 */ sdc1 $f20, 0x40($sp) -/* 9AB084 80242C94 8E510148 */ lw $s1, 0x148($s2) -/* 9AB088 80242C98 86240008 */ lh $a0, 8($s1) -/* 9AB08C 80242C9C 0C00EABB */ jal get_npc_unsafe -/* 9AB090 80242CA0 00A0982D */ daddu $s3, $a1, $zero -/* 9AB094 80242CA4 0040802D */ daddu $s0, $v0, $zero -/* 9AB098 80242CA8 0200202D */ daddu $a0, $s0, $zero -/* 9AB09C 80242CAC C6220088 */ lwc1 $f2, 0x88($s1) -/* 9AB0A0 80242CB0 468010A0 */ cvt.s.w $f2, $f2 -/* 9AB0A4 80242CB4 460010A1 */ cvt.d.s $f2, $f2 -/* 9AB0A8 80242CB8 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB0AC 80242CBC C6000014 */ lwc1 $f0, 0x14($s0) -/* 9AB0B0 80242CC0 8E050018 */ lw $a1, 0x18($s0) -/* 9AB0B4 80242CC4 46002100 */ add.s $f4, $f4, $f0 -/* 9AB0B8 80242CC8 8E06000C */ lw $a2, 0xc($s0) -/* 9AB0BC 80242CCC C6200078 */ lwc1 $f0, 0x78($s1) -/* 9AB0C0 80242CD0 46800020 */ cvt.s.w $f0, $f0 -/* 9AB0C4 80242CD4 E604001C */ swc1 $f4, 0x1c($s0) -/* 9AB0C8 80242CD8 3C014059 */ lui $at, 0x4059 -/* 9AB0CC 80242CDC 44812800 */ mtc1 $at, $f5 -/* 9AB0D0 80242CE0 44802000 */ mtc1 $zero, $f4 -/* 9AB0D4 80242CE4 46000021 */ cvt.d.s $f0, $f0 -/* 9AB0D8 80242CE8 46240003 */ div.d $f0, $f0, $f4 -/* 9AB0DC 80242CEC 46200520 */ cvt.s.d $f20, $f0 -/* 9AB0E0 80242CF0 46241083 */ div.d $f2, $f2, $f4 -/* 9AB0E4 80242CF4 0C00EA95 */ jal npc_move_heading -/* 9AB0E8 80242CF8 462015A0 */ cvt.s.d $f22, $f2 -/* 9AB0EC 80242CFC C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB0F0 80242D00 44801000 */ mtc1 $zero, $f2 -/* 9AB0F4 80242D04 44801800 */ mtc1 $zero, $f3 -/* 9AB0F8 80242D08 46002021 */ cvt.d.s $f0, $f4 -/* 9AB0FC 80242D0C 4620103E */ c.le.d $f2, $f0 -/* 9AB100 80242D10 00000000 */ nop -/* 9AB104 80242D14 45000030 */ bc1f .L80242DD8 -/* 9AB108 80242D18 00000000 */ nop -/* 9AB10C 80242D1C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB110 80242D20 46040000 */ add.s $f0, $f0, $f4 -/* 9AB114 80242D24 E600003C */ swc1 $f0, 0x3c($s0) -/* 9AB118 80242D28 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AB11C 80242D2C 8C420024 */ lw $v0, 0x24($v0) -/* 9AB120 80242D30 AE020028 */ sw $v0, 0x28($s0) -/* 9AB124 80242D34 A2200007 */ sb $zero, 7($s1) -/* 9AB128 80242D38 8E020000 */ lw $v0, ($s0) -/* 9AB12C 80242D3C 30420008 */ andi $v0, $v0, 8 -/* 9AB130 80242D40 14400011 */ bnez $v0, .L80242D88 -/* 9AB134 80242D44 0000102D */ daddu $v0, $zero, $zero -/* 9AB138 80242D48 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AB13C 80242D4C 27A6001C */ addiu $a2, $sp, 0x1c -/* 9AB140 80242D50 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AB144 80242D54 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB148 80242D58 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AB14C 80242D5C 3C01447A */ lui $at, 0x447a -/* 9AB150 80242D60 44813000 */ mtc1 $at, $f6 -/* 9AB154 80242D64 27A20024 */ addiu $v0, $sp, 0x24 -/* 9AB158 80242D68 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AB15C 80242D6C E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9AB160 80242D70 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9AB164 80242D74 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9AB168 80242D78 AFA20010 */ sw $v0, 0x10($sp) -/* 9AB16C 80242D7C 8E040080 */ lw $a0, 0x80($s0) -/* 9AB170 80242D80 0C0372DF */ jal func_800DCB7C -/* 9AB174 80242D84 27A70020 */ addiu $a3, $sp, 0x20 -.L80242D88: -/* 9AB178 80242D88 1040000B */ beqz $v0, .L80242DB8 -/* 9AB17C 80242D8C 00000000 */ nop -/* 9AB180 80242D90 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9AB184 80242D94 46140080 */ add.s $f2, $f0, $f20 -/* 9AB188 80242D98 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB18C 80242D9C 4600103E */ c.le.s $f2, $f0 -/* 9AB190 80242DA0 00000000 */ nop -/* 9AB194 80242DA4 4500008D */ bc1f .L80242FDC -/* 9AB198 80242DA8 00000000 */ nop -/* 9AB19C 80242DAC E602003C */ swc1 $f2, 0x3c($s0) -/* 9AB1A0 80242DB0 08090BF7 */ j .L80242FDC -/* 9AB1A4 80242DB4 AE400070 */ sw $zero, 0x70($s2) -.L80242DB8: -/* 9AB1A8 80242DB8 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB1AC 80242DBC C6000064 */ lwc1 $f0, 0x64($s0) -/* 9AB1B0 80242DC0 4602003E */ c.le.s $f0, $f2 -/* 9AB1B4 80242DC4 00000000 */ nop -/* 9AB1B8 80242DC8 45030084 */ bc1tl .L80242FDC -/* 9AB1BC 80242DCC AE400070 */ sw $zero, 0x70($s2) -/* 9AB1C0 80242DD0 08090BF7 */ j .L80242FDC -/* 9AB1C4 80242DD4 00000000 */ nop -.L80242DD8: -/* 9AB1C8 80242DD8 4622003C */ c.lt.d $f0, $f2 -/* 9AB1CC 80242DDC 00000000 */ nop -/* 9AB1D0 80242DE0 4500007E */ bc1f .L80242FDC -/* 9AB1D4 80242DE4 00000000 */ nop -/* 9AB1D8 80242DE8 9602008E */ lhu $v0, 0x8e($s0) -/* 9AB1DC 80242DEC 24420001 */ addiu $v0, $v0, 1 -/* 9AB1E0 80242DF0 A602008E */ sh $v0, 0x8e($s0) -/* 9AB1E4 80242DF4 00021400 */ sll $v0, $v0, 0x10 -/* 9AB1E8 80242DF8 8E630020 */ lw $v1, 0x20($s3) -/* 9AB1EC 80242DFC 00021403 */ sra $v0, $v0, 0x10 -/* 9AB1F0 80242E00 0043102A */ slt $v0, $v0, $v1 -/* 9AB1F4 80242E04 14400026 */ bnez $v0, .L80242EA0 -/* 9AB1F8 80242E08 00000000 */ nop -/* 9AB1FC 80242E0C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AB200 80242E10 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AB204 80242E14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9AB208 80242E18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9AB20C 80242E1C A600008E */ sh $zero, 0x8e($s0) -/* 9AB210 80242E20 8C460028 */ lw $a2, 0x28($v0) -/* 9AB214 80242E24 0C00A720 */ jal atan2 -/* 9AB218 80242E28 8C470030 */ lw $a3, 0x30($v0) -/* 9AB21C 80242E2C 46000506 */ mov.s $f20, $f0 -/* 9AB220 80242E30 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9AB224 80242E34 0C00A70A */ jal get_clamped_angle_diff -/* 9AB228 80242E38 4600A386 */ mov.s $f14, $f20 -/* 9AB22C 80242E3C 46000086 */ mov.s $f2, $f0 -/* 9AB230 80242E40 8E62001C */ lw $v0, 0x1c($s3) -/* 9AB234 80242E44 46001005 */ abs.s $f0, $f2 -/* 9AB238 80242E48 44822000 */ mtc1 $v0, $f4 -/* 9AB23C 80242E4C 00000000 */ nop -/* 9AB240 80242E50 46802120 */ cvt.s.w $f4, $f4 -/* 9AB244 80242E54 4600203C */ c.lt.s $f4, $f0 -/* 9AB248 80242E58 00000000 */ nop -/* 9AB24C 80242E5C 4500000D */ bc1f .L80242E94 -/* 9AB250 80242E60 00000000 */ nop -/* 9AB254 80242E64 44800000 */ mtc1 $zero, $f0 -/* 9AB258 80242E68 C614000C */ lwc1 $f20, 0xc($s0) -/* 9AB25C 80242E6C 4600103C */ c.lt.s $f2, $f0 -/* 9AB260 80242E70 00000000 */ nop -/* 9AB264 80242E74 45000006 */ bc1f .L80242E90 -/* 9AB268 80242E78 00021023 */ negu $v0, $v0 -/* 9AB26C 80242E7C 44820000 */ mtc1 $v0, $f0 -/* 9AB270 80242E80 00000000 */ nop -/* 9AB274 80242E84 46800020 */ cvt.s.w $f0, $f0 -/* 9AB278 80242E88 08090BA5 */ j .L80242E94 -/* 9AB27C 80242E8C 4600A500 */ add.s $f20, $f20, $f0 -.L80242E90: -/* 9AB280 80242E90 4604A500 */ add.s $f20, $f20, $f4 -.L80242E94: -/* 9AB284 80242E94 0C00A6C9 */ jal clamp_angle -/* 9AB288 80242E98 4600A306 */ mov.s $f12, $f20 -/* 9AB28C 80242E9C E600000C */ swc1 $f0, 0xc($s0) -.L80242EA0: -/* 9AB290 80242EA0 8E020000 */ lw $v0, ($s0) -/* 9AB294 80242EA4 30420008 */ andi $v0, $v0, 8 -/* 9AB298 80242EA8 1040000A */ beqz $v0, .L80242ED4 -/* 9AB29C 80242EAC 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AB2A0 80242EB0 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB2A4 80242EB4 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9AB2A8 80242EB8 46001080 */ add.s $f2, $f2, $f0 -/* 9AB2AC 80242EBC 4616103C */ c.lt.s $f2, $f22 -/* 9AB2B0 80242EC0 00000000 */ nop -/* 9AB2B4 80242EC4 45020045 */ bc1fl .L80242FDC -/* 9AB2B8 80242EC8 E602003C */ swc1 $f2, 0x3c($s0) -/* 9AB2BC 80242ECC 08090BF6 */ j .L80242FD8 -/* 9AB2C0 80242ED0 E616003C */ swc1 $f22, 0x3c($s0) -.L80242ED4: -/* 9AB2C4 80242ED4 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AB2C8 80242ED8 27A6001C */ addiu $a2, $sp, 0x1c -/* 9AB2CC 80242EDC E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AB2D0 80242EE0 860200A8 */ lh $v0, 0xa8($s0) -/* 9AB2D4 80242EE4 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9AB2D8 80242EE8 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9AB2DC 80242EEC 44821000 */ mtc1 $v0, $f2 -/* 9AB2E0 80242EF0 00000000 */ nop -/* 9AB2E4 80242EF4 468010A0 */ cvt.s.w $f2, $f2 -/* 9AB2E8 80242EF8 46000005 */ abs.s $f0, $f0 -/* 9AB2EC 80242EFC 46020000 */ add.s $f0, $f0, $f2 -/* 9AB2F0 80242F00 C6060040 */ lwc1 $f6, 0x40($s0) -/* 9AB2F4 80242F04 27A20024 */ addiu $v0, $sp, 0x24 -/* 9AB2F8 80242F08 46022100 */ add.s $f4, $f4, $f2 -/* 9AB2FC 80242F0C 3C014024 */ lui $at, 0x4024 -/* 9AB300 80242F10 44811800 */ mtc1 $at, $f3 -/* 9AB304 80242F14 44801000 */ mtc1 $zero, $f2 -/* 9AB308 80242F18 46000021 */ cvt.d.s $f0, $f0 -/* 9AB30C 80242F1C 46220000 */ add.d $f0, $f0, $f2 -/* 9AB310 80242F20 E7A60020 */ swc1 $f6, 0x20($sp) -/* 9AB314 80242F24 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 9AB318 80242F28 46200020 */ cvt.s.d $f0, $f0 -/* 9AB31C 80242F2C E7A00024 */ swc1 $f0, 0x24($sp) -/* 9AB320 80242F30 AFA20010 */ sw $v0, 0x10($sp) -/* 9AB324 80242F34 8E040080 */ lw $a0, 0x80($s0) -/* 9AB328 80242F38 0C0372DF */ jal func_800DCB7C -/* 9AB32C 80242F3C 27A70020 */ addiu $a3, $sp, 0x20 -/* 9AB330 80242F40 10400015 */ beqz $v0, .L80242F98 -/* 9AB334 80242F44 00000000 */ nop -/* 9AB338 80242F48 860200A8 */ lh $v0, 0xa8($s0) -/* 9AB33C 80242F4C C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB340 80242F50 44820000 */ mtc1 $v0, $f0 -/* 9AB344 80242F54 00000000 */ nop -/* 9AB348 80242F58 46800020 */ cvt.s.w $f0, $f0 -/* 9AB34C 80242F5C 46002085 */ abs.s $f2, $f4 -/* 9AB350 80242F60 46020000 */ add.s $f0, $f0, $f2 -/* 9AB354 80242F64 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9AB358 80242F68 4600103E */ c.le.s $f2, $f0 -/* 9AB35C 80242F6C 00000000 */ nop -/* 9AB360 80242F70 45000005 */ bc1f .L80242F88 -/* 9AB364 80242F74 00000000 */ nop -/* 9AB368 80242F78 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9AB36C 80242F7C AE00001C */ sw $zero, 0x1c($s0) -/* 9AB370 80242F80 08090BF7 */ j .L80242FDC -/* 9AB374 80242F84 E600003C */ swc1 $f0, 0x3c($s0) -.L80242F88: -/* 9AB378 80242F88 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB37C 80242F8C 46040000 */ add.s $f0, $f0, $f4 -/* 9AB380 80242F90 08090BF7 */ j .L80242FDC -/* 9AB384 80242F94 E600003C */ swc1 $f0, 0x3c($s0) -.L80242F98: -/* 9AB388 80242F98 C606003C */ lwc1 $f6, 0x3c($s0) -/* 9AB38C 80242F9C 860200A8 */ lh $v0, 0xa8($s0) -/* 9AB390 80242FA0 46163081 */ sub.s $f2, $f6, $f22 -/* 9AB394 80242FA4 44820000 */ mtc1 $v0, $f0 -/* 9AB398 80242FA8 00000000 */ nop -/* 9AB39C 80242FAC 46800020 */ cvt.s.w $f0, $f0 -/* 9AB3A0 80242FB0 46001080 */ add.s $f2, $f2, $f0 -/* 9AB3A4 80242FB4 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB3A8 80242FB8 46002005 */ abs.s $f0, $f4 -/* 9AB3AC 80242FBC 4602003C */ c.lt.s $f0, $f2 -/* 9AB3B0 80242FC0 00000000 */ nop -/* 9AB3B4 80242FC4 45020005 */ bc1fl .L80242FDC -/* 9AB3B8 80242FC8 AE00001C */ sw $zero, 0x1c($s0) -/* 9AB3BC 80242FCC 46043000 */ add.s $f0, $f6, $f4 -/* 9AB3C0 80242FD0 08090BF7 */ j .L80242FDC -/* 9AB3C4 80242FD4 E600003C */ swc1 $f0, 0x3c($s0) -.L80242FD8: -/* 9AB3C8 80242FD8 AE00001C */ sw $zero, 0x1c($s0) -.L80242FDC: -/* 9AB3CC 80242FDC 8FBF0038 */ lw $ra, 0x38($sp) -/* 9AB3D0 80242FE0 8FB30034 */ lw $s3, 0x34($sp) -/* 9AB3D4 80242FE4 8FB20030 */ lw $s2, 0x30($sp) -/* 9AB3D8 80242FE8 8FB1002C */ lw $s1, 0x2c($sp) -/* 9AB3DC 80242FEC 8FB00028 */ lw $s0, 0x28($sp) -/* 9AB3E0 80242FF0 D7B60048 */ ldc1 $f22, 0x48($sp) -/* 9AB3E4 80242FF4 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 9AB3E8 80242FF8 03E00008 */ jr $ra -/* 9AB3EC 80242FFC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s new file mode 100644 index 0000000000..005a1261cf --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80242C70_9AB060.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C70_9AB060 +/* 9AB060 80242C70 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 9AB064 80242C74 AFB20030 */ sw $s2, 0x30($sp) +/* 9AB068 80242C78 0080902D */ daddu $s2, $a0, $zero +/* 9AB06C 80242C7C AFBF0038 */ sw $ra, 0x38($sp) +/* 9AB070 80242C80 AFB30034 */ sw $s3, 0x34($sp) +/* 9AB074 80242C84 AFB1002C */ sw $s1, 0x2c($sp) +/* 9AB078 80242C88 AFB00028 */ sw $s0, 0x28($sp) +/* 9AB07C 80242C8C F7B60048 */ sdc1 $f22, 0x48($sp) +/* 9AB080 80242C90 F7B40040 */ sdc1 $f20, 0x40($sp) +/* 9AB084 80242C94 8E510148 */ lw $s1, 0x148($s2) +/* 9AB088 80242C98 86240008 */ lh $a0, 8($s1) +/* 9AB08C 80242C9C 0C00EABB */ jal get_npc_unsafe +/* 9AB090 80242CA0 00A0982D */ daddu $s3, $a1, $zero +/* 9AB094 80242CA4 0040802D */ daddu $s0, $v0, $zero +/* 9AB098 80242CA8 0200202D */ daddu $a0, $s0, $zero +/* 9AB09C 80242CAC C6220088 */ lwc1 $f2, 0x88($s1) +/* 9AB0A0 80242CB0 468010A0 */ cvt.s.w $f2, $f2 +/* 9AB0A4 80242CB4 460010A1 */ cvt.d.s $f2, $f2 +/* 9AB0A8 80242CB8 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9AB0AC 80242CBC C6000014 */ lwc1 $f0, 0x14($s0) +/* 9AB0B0 80242CC0 8E050018 */ lw $a1, 0x18($s0) +/* 9AB0B4 80242CC4 46002100 */ add.s $f4, $f4, $f0 +/* 9AB0B8 80242CC8 8E06000C */ lw $a2, 0xc($s0) +/* 9AB0BC 80242CCC C6200078 */ lwc1 $f0, 0x78($s1) +/* 9AB0C0 80242CD0 46800020 */ cvt.s.w $f0, $f0 +/* 9AB0C4 80242CD4 E604001C */ swc1 $f4, 0x1c($s0) +/* 9AB0C8 80242CD8 3C014059 */ lui $at, 0x4059 +/* 9AB0CC 80242CDC 44812800 */ mtc1 $at, $f5 +/* 9AB0D0 80242CE0 44802000 */ mtc1 $zero, $f4 +/* 9AB0D4 80242CE4 46000021 */ cvt.d.s $f0, $f0 +/* 9AB0D8 80242CE8 46240003 */ div.d $f0, $f0, $f4 +/* 9AB0DC 80242CEC 46200520 */ cvt.s.d $f20, $f0 +/* 9AB0E0 80242CF0 46241083 */ div.d $f2, $f2, $f4 +/* 9AB0E4 80242CF4 0C00EA95 */ jal npc_move_heading +/* 9AB0E8 80242CF8 462015A0 */ cvt.s.d $f22, $f2 +/* 9AB0EC 80242CFC C604001C */ lwc1 $f4, 0x1c($s0) +/* 9AB0F0 80242D00 44801000 */ mtc1 $zero, $f2 +/* 9AB0F4 80242D04 44801800 */ mtc1 $zero, $f3 +/* 9AB0F8 80242D08 46002021 */ cvt.d.s $f0, $f4 +/* 9AB0FC 80242D0C 4620103E */ c.le.d $f2, $f0 +/* 9AB100 80242D10 00000000 */ nop +/* 9AB104 80242D14 45000030 */ bc1f .L80242DD8 +/* 9AB108 80242D18 00000000 */ nop +/* 9AB10C 80242D1C C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AB110 80242D20 46040000 */ add.s $f0, $f0, $f4 +/* 9AB114 80242D24 E600003C */ swc1 $f0, 0x3c($s0) +/* 9AB118 80242D28 8E2200CC */ lw $v0, 0xcc($s1) +/* 9AB11C 80242D2C 8C420024 */ lw $v0, 0x24($v0) +/* 9AB120 80242D30 AE020028 */ sw $v0, 0x28($s0) +/* 9AB124 80242D34 A2200007 */ sb $zero, 7($s1) +/* 9AB128 80242D38 8E020000 */ lw $v0, ($s0) +/* 9AB12C 80242D3C 30420008 */ andi $v0, $v0, 8 +/* 9AB130 80242D40 14400011 */ bnez $v0, .L80242D88 +/* 9AB134 80242D44 0000102D */ daddu $v0, $zero, $zero +/* 9AB138 80242D48 27A50018 */ addiu $a1, $sp, 0x18 +/* 9AB13C 80242D4C 27A6001C */ addiu $a2, $sp, 0x1c +/* 9AB140 80242D50 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9AB144 80242D54 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9AB148 80242D58 C6040040 */ lwc1 $f4, 0x40($s0) +/* 9AB14C 80242D5C 3C01447A */ lui $at, 0x447a +/* 9AB150 80242D60 44813000 */ mtc1 $at, $f6 +/* 9AB154 80242D64 27A20024 */ addiu $v0, $sp, 0x24 +/* 9AB158 80242D68 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9AB15C 80242D6C E7A2001C */ swc1 $f2, 0x1c($sp) +/* 9AB160 80242D70 E7A40020 */ swc1 $f4, 0x20($sp) +/* 9AB164 80242D74 E7A60024 */ swc1 $f6, 0x24($sp) +/* 9AB168 80242D78 AFA20010 */ sw $v0, 0x10($sp) +/* 9AB16C 80242D7C 8E040080 */ lw $a0, 0x80($s0) +/* 9AB170 80242D80 0C0372DF */ jal func_800DCB7C +/* 9AB174 80242D84 27A70020 */ addiu $a3, $sp, 0x20 +.L80242D88: +/* 9AB178 80242D88 1040000B */ beqz $v0, .L80242DB8 +/* 9AB17C 80242D8C 00000000 */ nop +/* 9AB180 80242D90 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9AB184 80242D94 46140080 */ add.s $f2, $f0, $f20 +/* 9AB188 80242D98 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AB18C 80242D9C 4600103E */ c.le.s $f2, $f0 +/* 9AB190 80242DA0 00000000 */ nop +/* 9AB194 80242DA4 4500008D */ bc1f .L80242FDC +/* 9AB198 80242DA8 00000000 */ nop +/* 9AB19C 80242DAC E602003C */ swc1 $f2, 0x3c($s0) +/* 9AB1A0 80242DB0 08090BF7 */ j .L80242FDC +/* 9AB1A4 80242DB4 AE400070 */ sw $zero, 0x70($s2) +.L80242DB8: +/* 9AB1A8 80242DB8 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9AB1AC 80242DBC C6000064 */ lwc1 $f0, 0x64($s0) +/* 9AB1B0 80242DC0 4602003E */ c.le.s $f0, $f2 +/* 9AB1B4 80242DC4 00000000 */ nop +/* 9AB1B8 80242DC8 45030084 */ bc1tl .L80242FDC +/* 9AB1BC 80242DCC AE400070 */ sw $zero, 0x70($s2) +/* 9AB1C0 80242DD0 08090BF7 */ j .L80242FDC +/* 9AB1C4 80242DD4 00000000 */ nop +.L80242DD8: +/* 9AB1C8 80242DD8 4622003C */ c.lt.d $f0, $f2 +/* 9AB1CC 80242DDC 00000000 */ nop +/* 9AB1D0 80242DE0 4500007E */ bc1f .L80242FDC +/* 9AB1D4 80242DE4 00000000 */ nop +/* 9AB1D8 80242DE8 9602008E */ lhu $v0, 0x8e($s0) +/* 9AB1DC 80242DEC 24420001 */ addiu $v0, $v0, 1 +/* 9AB1E0 80242DF0 A602008E */ sh $v0, 0x8e($s0) +/* 9AB1E4 80242DF4 00021400 */ sll $v0, $v0, 0x10 +/* 9AB1E8 80242DF8 8E630020 */ lw $v1, 0x20($s3) +/* 9AB1EC 80242DFC 00021403 */ sra $v0, $v0, 0x10 +/* 9AB1F0 80242E00 0043102A */ slt $v0, $v0, $v1 +/* 9AB1F4 80242E04 14400026 */ bnez $v0, .L80242EA0 +/* 9AB1F8 80242E08 00000000 */ nop +/* 9AB1FC 80242E0C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9AB200 80242E10 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9AB204 80242E14 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9AB208 80242E18 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9AB20C 80242E1C A600008E */ sh $zero, 0x8e($s0) +/* 9AB210 80242E20 8C460028 */ lw $a2, 0x28($v0) +/* 9AB214 80242E24 0C00A720 */ jal atan2 +/* 9AB218 80242E28 8C470030 */ lw $a3, 0x30($v0) +/* 9AB21C 80242E2C 46000506 */ mov.s $f20, $f0 +/* 9AB220 80242E30 C60C000C */ lwc1 $f12, 0xc($s0) +/* 9AB224 80242E34 0C00A70A */ jal get_clamped_angle_diff +/* 9AB228 80242E38 4600A386 */ mov.s $f14, $f20 +/* 9AB22C 80242E3C 46000086 */ mov.s $f2, $f0 +/* 9AB230 80242E40 8E62001C */ lw $v0, 0x1c($s3) +/* 9AB234 80242E44 46001005 */ abs.s $f0, $f2 +/* 9AB238 80242E48 44822000 */ mtc1 $v0, $f4 +/* 9AB23C 80242E4C 00000000 */ nop +/* 9AB240 80242E50 46802120 */ cvt.s.w $f4, $f4 +/* 9AB244 80242E54 4600203C */ c.lt.s $f4, $f0 +/* 9AB248 80242E58 00000000 */ nop +/* 9AB24C 80242E5C 4500000D */ bc1f .L80242E94 +/* 9AB250 80242E60 00000000 */ nop +/* 9AB254 80242E64 44800000 */ mtc1 $zero, $f0 +/* 9AB258 80242E68 C614000C */ lwc1 $f20, 0xc($s0) +/* 9AB25C 80242E6C 4600103C */ c.lt.s $f2, $f0 +/* 9AB260 80242E70 00000000 */ nop +/* 9AB264 80242E74 45000006 */ bc1f .L80242E90 +/* 9AB268 80242E78 00021023 */ negu $v0, $v0 +/* 9AB26C 80242E7C 44820000 */ mtc1 $v0, $f0 +/* 9AB270 80242E80 00000000 */ nop +/* 9AB274 80242E84 46800020 */ cvt.s.w $f0, $f0 +/* 9AB278 80242E88 08090BA5 */ j .L80242E94 +/* 9AB27C 80242E8C 4600A500 */ add.s $f20, $f20, $f0 +.L80242E90: +/* 9AB280 80242E90 4604A500 */ add.s $f20, $f20, $f4 +.L80242E94: +/* 9AB284 80242E94 0C00A6C9 */ jal clamp_angle +/* 9AB288 80242E98 4600A306 */ mov.s $f12, $f20 +/* 9AB28C 80242E9C E600000C */ swc1 $f0, 0xc($s0) +.L80242EA0: +/* 9AB290 80242EA0 8E020000 */ lw $v0, ($s0) +/* 9AB294 80242EA4 30420008 */ andi $v0, $v0, 8 +/* 9AB298 80242EA8 1040000A */ beqz $v0, .L80242ED4 +/* 9AB29C 80242EAC 27A50018 */ addiu $a1, $sp, 0x18 +/* 9AB2A0 80242EB0 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9AB2A4 80242EB4 C600001C */ lwc1 $f0, 0x1c($s0) +/* 9AB2A8 80242EB8 46001080 */ add.s $f2, $f2, $f0 +/* 9AB2AC 80242EBC 4616103C */ c.lt.s $f2, $f22 +/* 9AB2B0 80242EC0 00000000 */ nop +/* 9AB2B4 80242EC4 45020045 */ bc1fl .L80242FDC +/* 9AB2B8 80242EC8 E602003C */ swc1 $f2, 0x3c($s0) +/* 9AB2BC 80242ECC 08090BF6 */ j .L80242FD8 +/* 9AB2C0 80242ED0 E616003C */ swc1 $f22, 0x3c($s0) +.L80242ED4: +/* 9AB2C4 80242ED4 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9AB2C8 80242ED8 27A6001C */ addiu $a2, $sp, 0x1c +/* 9AB2CC 80242EDC E7A00018 */ swc1 $f0, 0x18($sp) +/* 9AB2D0 80242EE0 860200A8 */ lh $v0, 0xa8($s0) +/* 9AB2D4 80242EE4 C600001C */ lwc1 $f0, 0x1c($s0) +/* 9AB2D8 80242EE8 C604003C */ lwc1 $f4, 0x3c($s0) +/* 9AB2DC 80242EEC 44821000 */ mtc1 $v0, $f2 +/* 9AB2E0 80242EF0 00000000 */ nop +/* 9AB2E4 80242EF4 468010A0 */ cvt.s.w $f2, $f2 +/* 9AB2E8 80242EF8 46000005 */ abs.s $f0, $f0 +/* 9AB2EC 80242EFC 46020000 */ add.s $f0, $f0, $f2 +/* 9AB2F0 80242F00 C6060040 */ lwc1 $f6, 0x40($s0) +/* 9AB2F4 80242F04 27A20024 */ addiu $v0, $sp, 0x24 +/* 9AB2F8 80242F08 46022100 */ add.s $f4, $f4, $f2 +/* 9AB2FC 80242F0C 3C014024 */ lui $at, 0x4024 +/* 9AB300 80242F10 44811800 */ mtc1 $at, $f3 +/* 9AB304 80242F14 44801000 */ mtc1 $zero, $f2 +/* 9AB308 80242F18 46000021 */ cvt.d.s $f0, $f0 +/* 9AB30C 80242F1C 46220000 */ add.d $f0, $f0, $f2 +/* 9AB310 80242F20 E7A60020 */ swc1 $f6, 0x20($sp) +/* 9AB314 80242F24 E7A4001C */ swc1 $f4, 0x1c($sp) +/* 9AB318 80242F28 46200020 */ cvt.s.d $f0, $f0 +/* 9AB31C 80242F2C E7A00024 */ swc1 $f0, 0x24($sp) +/* 9AB320 80242F30 AFA20010 */ sw $v0, 0x10($sp) +/* 9AB324 80242F34 8E040080 */ lw $a0, 0x80($s0) +/* 9AB328 80242F38 0C0372DF */ jal func_800DCB7C +/* 9AB32C 80242F3C 27A70020 */ addiu $a3, $sp, 0x20 +/* 9AB330 80242F40 10400015 */ beqz $v0, .L80242F98 +/* 9AB334 80242F44 00000000 */ nop +/* 9AB338 80242F48 860200A8 */ lh $v0, 0xa8($s0) +/* 9AB33C 80242F4C C604001C */ lwc1 $f4, 0x1c($s0) +/* 9AB340 80242F50 44820000 */ mtc1 $v0, $f0 +/* 9AB344 80242F54 00000000 */ nop +/* 9AB348 80242F58 46800020 */ cvt.s.w $f0, $f0 +/* 9AB34C 80242F5C 46002085 */ abs.s $f2, $f4 +/* 9AB350 80242F60 46020000 */ add.s $f0, $f0, $f2 +/* 9AB354 80242F64 C7A20024 */ lwc1 $f2, 0x24($sp) +/* 9AB358 80242F68 4600103E */ c.le.s $f2, $f0 +/* 9AB35C 80242F6C 00000000 */ nop +/* 9AB360 80242F70 45000005 */ bc1f .L80242F88 +/* 9AB364 80242F74 00000000 */ nop +/* 9AB368 80242F78 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9AB36C 80242F7C AE00001C */ sw $zero, 0x1c($s0) +/* 9AB370 80242F80 08090BF7 */ j .L80242FDC +/* 9AB374 80242F84 E600003C */ swc1 $f0, 0x3c($s0) +.L80242F88: +/* 9AB378 80242F88 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AB37C 80242F8C 46040000 */ add.s $f0, $f0, $f4 +/* 9AB380 80242F90 08090BF7 */ j .L80242FDC +/* 9AB384 80242F94 E600003C */ swc1 $f0, 0x3c($s0) +.L80242F98: +/* 9AB388 80242F98 C606003C */ lwc1 $f6, 0x3c($s0) +/* 9AB38C 80242F9C 860200A8 */ lh $v0, 0xa8($s0) +/* 9AB390 80242FA0 46163081 */ sub.s $f2, $f6, $f22 +/* 9AB394 80242FA4 44820000 */ mtc1 $v0, $f0 +/* 9AB398 80242FA8 00000000 */ nop +/* 9AB39C 80242FAC 46800020 */ cvt.s.w $f0, $f0 +/* 9AB3A0 80242FB0 46001080 */ add.s $f2, $f2, $f0 +/* 9AB3A4 80242FB4 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9AB3A8 80242FB8 46002005 */ abs.s $f0, $f4 +/* 9AB3AC 80242FBC 4602003C */ c.lt.s $f0, $f2 +/* 9AB3B0 80242FC0 00000000 */ nop +/* 9AB3B4 80242FC4 45020005 */ bc1fl .L80242FDC +/* 9AB3B8 80242FC8 AE00001C */ sw $zero, 0x1c($s0) +/* 9AB3BC 80242FCC 46043000 */ add.s $f0, $f6, $f4 +/* 9AB3C0 80242FD0 08090BF7 */ j .L80242FDC +/* 9AB3C4 80242FD4 E600003C */ swc1 $f0, 0x3c($s0) +.L80242FD8: +/* 9AB3C8 80242FD8 AE00001C */ sw $zero, 0x1c($s0) +.L80242FDC: +/* 9AB3CC 80242FDC 8FBF0038 */ lw $ra, 0x38($sp) +/* 9AB3D0 80242FE0 8FB30034 */ lw $s3, 0x34($sp) +/* 9AB3D4 80242FE4 8FB20030 */ lw $s2, 0x30($sp) +/* 9AB3D8 80242FE8 8FB1002C */ lw $s1, 0x2c($sp) +/* 9AB3DC 80242FEC 8FB00028 */ lw $s0, 0x28($sp) +/* 9AB3E0 80242FF0 D7B60048 */ ldc1 $f22, 0x48($sp) +/* 9AB3E4 80242FF4 D7B40040 */ ldc1 $f20, 0x40($sp) +/* 9AB3E8 80242FF8 03E00008 */ jr $ra +/* 9AB3EC 80242FFC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000.s deleted file mode 100644 index c9770966f7..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243000 -/* 9AB3F0 80243000 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9AB3F4 80243004 AFB00028 */ sw $s0, 0x28($sp) -/* 9AB3F8 80243008 00A0802D */ daddu $s0, $a1, $zero -/* 9AB3FC 8024300C AFB1002C */ sw $s1, 0x2c($sp) -/* 9AB400 80243010 00C0882D */ daddu $s1, $a2, $zero -/* 9AB404 80243014 AFBF0034 */ sw $ra, 0x34($sp) -/* 9AB408 80243018 AFB20030 */ sw $s2, 0x30($sp) -/* 9AB40C 8024301C AE200070 */ sw $zero, 0x70($s1) -/* 9AB410 80243020 8C830000 */ lw $v1, ($a0) -/* 9AB414 80243024 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9AB418 80243028 A480008E */ sh $zero, 0x8e($a0) -/* 9AB41C 8024302C 00621824 */ and $v1, $v1, $v0 -/* 9AB420 80243030 34650800 */ ori $a1, $v1, 0x800 -/* 9AB424 80243034 AC850000 */ sw $a1, ($a0) -/* 9AB428 80243038 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9AB42C 8024303C 8C420034 */ lw $v0, 0x34($v0) -/* 9AB430 80243040 10400003 */ beqz $v0, .L80243050 -/* 9AB434 80243044 00E0902D */ daddu $s2, $a3, $zero -/* 9AB438 80243048 08090C16 */ j .L80243058 -/* 9AB43C 8024304C 34620808 */ ori $v0, $v1, 0x808 -.L80243050: -/* 9AB440 80243050 2402FFF7 */ addiu $v0, $zero, -9 -/* 9AB444 80243054 00A21024 */ and $v0, $a1, $v0 -.L80243058: -/* 9AB448 80243058 AC820000 */ sw $v0, ($a0) -/* 9AB44C 8024305C 27A20024 */ addiu $v0, $sp, 0x24 -/* 9AB450 80243060 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AB454 80243064 C4800038 */ lwc1 $f0, 0x38($a0) -/* 9AB458 80243068 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9AB45C 8024306C C4840040 */ lwc1 $f4, 0x40($a0) -/* 9AB460 80243070 3C01447A */ lui $at, 0x447a -/* 9AB464 80243074 44813000 */ mtc1 $at, $f6 -/* 9AB468 80243078 27A6001C */ addiu $a2, $sp, 0x1c -/* 9AB46C 8024307C E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AB470 80243080 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9AB474 80243084 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9AB478 80243088 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9AB47C 8024308C AFA20010 */ sw $v0, 0x10($sp) -/* 9AB480 80243090 8C840080 */ lw $a0, 0x80($a0) -/* 9AB484 80243094 0C0372DF */ jal func_800DCB7C -/* 9AB488 80243098 27A70020 */ addiu $a3, $sp, 0x20 -/* 9AB48C 8024309C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9AB490 802430A0 3C014059 */ lui $at, 0x4059 -/* 9AB494 802430A4 44812800 */ mtc1 $at, $f5 -/* 9AB498 802430A8 44802000 */ mtc1 $zero, $f4 -/* 9AB49C 802430AC 460010A1 */ cvt.d.s $f2, $f2 -/* 9AB4A0 802430B0 46241082 */ mul.d $f2, $f2, $f4 -/* 9AB4A4 802430B4 00000000 */ nop -/* 9AB4A8 802430B8 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9AB4AC 802430BC 46000021 */ cvt.d.s $f0, $f0 -/* 9AB4B0 802430C0 46240002 */ mul.d $f0, $f0, $f4 -/* 9AB4B4 802430C4 00000000 */ nop -/* 9AB4B8 802430C8 3C013FE0 */ lui $at, 0x3fe0 -/* 9AB4BC 802430CC 44812800 */ mtc1 $at, $f5 -/* 9AB4C0 802430D0 44802000 */ mtc1 $zero, $f4 -/* 9AB4C4 802430D4 00000000 */ nop -/* 9AB4C8 802430D8 46241080 */ add.d $f2, $f2, $f4 -/* 9AB4CC 802430DC AE000074 */ sw $zero, 0x74($s0) -/* 9AB4D0 802430E0 46240000 */ add.d $f0, $f0, $f4 -/* 9AB4D4 802430E4 AE000090 */ sw $zero, 0x90($s0) -/* 9AB4D8 802430E8 4620120D */ trunc.w.d $f8, $f2 -/* 9AB4DC 802430EC E6080078 */ swc1 $f8, 0x78($s0) -/* 9AB4E0 802430F0 4620020D */ trunc.w.d $f8, $f0 -/* 9AB4E4 802430F4 E6080088 */ swc1 $f8, 0x88($s0) -/* 9AB4E8 802430F8 8E420014 */ lw $v0, 0x14($s2) -/* 9AB4EC 802430FC AE220074 */ sw $v0, 0x74($s1) -/* 9AB4F0 80243100 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9AB4F4 80243104 34420010 */ ori $v0, $v0, 0x10 -/* 9AB4F8 80243108 AE0200B0 */ sw $v0, 0xb0($s0) -/* 9AB4FC 8024310C 8FBF0034 */ lw $ra, 0x34($sp) -/* 9AB500 80243110 8FB20030 */ lw $s2, 0x30($sp) -/* 9AB504 80243114 8FB1002C */ lw $s1, 0x2c($sp) -/* 9AB508 80243118 8FB00028 */ lw $s0, 0x28($sp) -/* 9AB50C 8024311C 03E00008 */ jr $ra -/* 9AB510 80243120 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s new file mode 100644 index 0000000000..4bf792f037 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243000_9AB3F0.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243000_9AB3F0 +/* 9AB3F0 80243000 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 9AB3F4 80243004 AFB00028 */ sw $s0, 0x28($sp) +/* 9AB3F8 80243008 00A0802D */ daddu $s0, $a1, $zero +/* 9AB3FC 8024300C AFB1002C */ sw $s1, 0x2c($sp) +/* 9AB400 80243010 00C0882D */ daddu $s1, $a2, $zero +/* 9AB404 80243014 AFBF0034 */ sw $ra, 0x34($sp) +/* 9AB408 80243018 AFB20030 */ sw $s2, 0x30($sp) +/* 9AB40C 8024301C AE200070 */ sw $zero, 0x70($s1) +/* 9AB410 80243020 8C830000 */ lw $v1, ($a0) +/* 9AB414 80243024 2402FDFF */ addiu $v0, $zero, -0x201 +/* 9AB418 80243028 A480008E */ sh $zero, 0x8e($a0) +/* 9AB41C 8024302C 00621824 */ and $v1, $v1, $v0 +/* 9AB420 80243030 34650800 */ ori $a1, $v1, 0x800 +/* 9AB424 80243034 AC850000 */ sw $a1, ($a0) +/* 9AB428 80243038 8E0200D0 */ lw $v0, 0xd0($s0) +/* 9AB42C 8024303C 8C420034 */ lw $v0, 0x34($v0) +/* 9AB430 80243040 10400003 */ beqz $v0, .L80243050 +/* 9AB434 80243044 00E0902D */ daddu $s2, $a3, $zero +/* 9AB438 80243048 08090C16 */ j .L80243058 +/* 9AB43C 8024304C 34620808 */ ori $v0, $v1, 0x808 +.L80243050: +/* 9AB440 80243050 2402FFF7 */ addiu $v0, $zero, -9 +/* 9AB444 80243054 00A21024 */ and $v0, $a1, $v0 +.L80243058: +/* 9AB448 80243058 AC820000 */ sw $v0, ($a0) +/* 9AB44C 8024305C 27A20024 */ addiu $v0, $sp, 0x24 +/* 9AB450 80243060 27A50018 */ addiu $a1, $sp, 0x18 +/* 9AB454 80243064 C4800038 */ lwc1 $f0, 0x38($a0) +/* 9AB458 80243068 C482003C */ lwc1 $f2, 0x3c($a0) +/* 9AB45C 8024306C C4840040 */ lwc1 $f4, 0x40($a0) +/* 9AB460 80243070 3C01447A */ lui $at, 0x447a +/* 9AB464 80243074 44813000 */ mtc1 $at, $f6 +/* 9AB468 80243078 27A6001C */ addiu $a2, $sp, 0x1c +/* 9AB46C 8024307C E7A00018 */ swc1 $f0, 0x18($sp) +/* 9AB470 80243080 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 9AB474 80243084 E7A40020 */ swc1 $f4, 0x20($sp) +/* 9AB478 80243088 E7A60024 */ swc1 $f6, 0x24($sp) +/* 9AB47C 8024308C AFA20010 */ sw $v0, 0x10($sp) +/* 9AB480 80243090 8C840080 */ lw $a0, 0x80($a0) +/* 9AB484 80243094 0C0372DF */ jal func_800DCB7C +/* 9AB488 80243098 27A70020 */ addiu $a3, $sp, 0x20 +/* 9AB48C 8024309C C7A20024 */ lwc1 $f2, 0x24($sp) +/* 9AB490 802430A0 3C014059 */ lui $at, 0x4059 +/* 9AB494 802430A4 44812800 */ mtc1 $at, $f5 +/* 9AB498 802430A8 44802000 */ mtc1 $zero, $f4 +/* 9AB49C 802430AC 460010A1 */ cvt.d.s $f2, $f2 +/* 9AB4A0 802430B0 46241082 */ mul.d $f2, $f2, $f4 +/* 9AB4A4 802430B4 00000000 */ nop +/* 9AB4A8 802430B8 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9AB4AC 802430BC 46000021 */ cvt.d.s $f0, $f0 +/* 9AB4B0 802430C0 46240002 */ mul.d $f0, $f0, $f4 +/* 9AB4B4 802430C4 00000000 */ nop +/* 9AB4B8 802430C8 3C013FE0 */ lui $at, 0x3fe0 +/* 9AB4BC 802430CC 44812800 */ mtc1 $at, $f5 +/* 9AB4C0 802430D0 44802000 */ mtc1 $zero, $f4 +/* 9AB4C4 802430D4 00000000 */ nop +/* 9AB4C8 802430D8 46241080 */ add.d $f2, $f2, $f4 +/* 9AB4CC 802430DC AE000074 */ sw $zero, 0x74($s0) +/* 9AB4D0 802430E0 46240000 */ add.d $f0, $f0, $f4 +/* 9AB4D4 802430E4 AE000090 */ sw $zero, 0x90($s0) +/* 9AB4D8 802430E8 4620120D */ trunc.w.d $f8, $f2 +/* 9AB4DC 802430EC E6080078 */ swc1 $f8, 0x78($s0) +/* 9AB4E0 802430F0 4620020D */ trunc.w.d $f8, $f0 +/* 9AB4E4 802430F4 E6080088 */ swc1 $f8, 0x88($s0) +/* 9AB4E8 802430F8 8E420014 */ lw $v0, 0x14($s2) +/* 9AB4EC 802430FC AE220074 */ sw $v0, 0x74($s1) +/* 9AB4F0 80243100 8E0200B0 */ lw $v0, 0xb0($s0) +/* 9AB4F4 80243104 34420010 */ ori $v0, $v0, 0x10 +/* 9AB4F8 80243108 AE0200B0 */ sw $v0, 0xb0($s0) +/* 9AB4FC 8024310C 8FBF0034 */ lw $ra, 0x34($sp) +/* 9AB500 80243110 8FB20030 */ lw $s2, 0x30($sp) +/* 9AB504 80243114 8FB1002C */ lw $s1, 0x2c($sp) +/* 9AB508 80243118 8FB00028 */ lw $s0, 0x28($sp) +/* 9AB50C 8024311C 03E00008 */ jr $ra +/* 9AB510 80243120 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124.s deleted file mode 100644 index 538053500f..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243124 -/* 9AB514 80243124 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9AB518 80243128 AFB40040 */ sw $s4, 0x40($sp) -/* 9AB51C 8024312C 0080A02D */ daddu $s4, $a0, $zero -/* 9AB520 80243130 AFBF0048 */ sw $ra, 0x48($sp) -/* 9AB524 80243134 AFB50044 */ sw $s5, 0x44($sp) -/* 9AB528 80243138 AFB3003C */ sw $s3, 0x3c($sp) -/* 9AB52C 8024313C AFB20038 */ sw $s2, 0x38($sp) -/* 9AB530 80243140 AFB10034 */ sw $s1, 0x34($sp) -/* 9AB534 80243144 AFB00030 */ sw $s0, 0x30($sp) -/* 9AB538 80243148 8E920148 */ lw $s2, 0x148($s4) -/* 9AB53C 8024314C 86440008 */ lh $a0, 8($s2) -/* 9AB540 80243150 8E90000C */ lw $s0, 0xc($s4) -/* 9AB544 80243154 0C00EABB */ jal get_npc_unsafe -/* 9AB548 80243158 00A0882D */ daddu $s1, $a1, $zero -/* 9AB54C 8024315C 0280202D */ daddu $a0, $s4, $zero -/* 9AB550 80243160 8E050000 */ lw $a1, ($s0) -/* 9AB554 80243164 0C0B1EAF */ jal get_variable -/* 9AB558 80243168 0040A82D */ daddu $s5, $v0, $zero -/* 9AB55C 8024316C AFA00010 */ sw $zero, 0x10($sp) -/* 9AB560 80243170 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB564 80243174 8C630030 */ lw $v1, 0x30($v1) -/* 9AB568 80243178 AFA30014 */ sw $v1, 0x14($sp) -/* 9AB56C 8024317C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB570 80243180 8C63001C */ lw $v1, 0x1c($v1) -/* 9AB574 80243184 AFA30018 */ sw $v1, 0x18($sp) -/* 9AB578 80243188 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB57C 8024318C 8C630024 */ lw $v1, 0x24($v1) -/* 9AB580 80243190 AFA3001C */ sw $v1, 0x1c($sp) -/* 9AB584 80243194 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB588 80243198 8C630028 */ lw $v1, 0x28($v1) -/* 9AB58C 8024319C 27B30010 */ addiu $s3, $sp, 0x10 -/* 9AB590 802431A0 AFA30020 */ sw $v1, 0x20($sp) -/* 9AB594 802431A4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9AB598 802431A8 3C0142F0 */ lui $at, 0x42f0 -/* 9AB59C 802431AC 44810000 */ mtc1 $at, $f0 -/* 9AB5A0 802431B0 8C63002C */ lw $v1, 0x2c($v1) -/* 9AB5A4 802431B4 0040802D */ daddu $s0, $v0, $zero -/* 9AB5A8 802431B8 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9AB5AC 802431BC A7A0002C */ sh $zero, 0x2c($sp) -/* 9AB5B0 802431C0 12200006 */ beqz $s1, .L802431DC -/* 9AB5B4 802431C4 AFA30024 */ sw $v1, 0x24($sp) -/* 9AB5B8 802431C8 02A0202D */ daddu $a0, $s5, $zero -/* 9AB5BC 802431CC 0240282D */ daddu $a1, $s2, $zero -/* 9AB5C0 802431D0 0280302D */ daddu $a2, $s4, $zero -/* 9AB5C4 802431D4 0C090C00 */ jal func_80243000 -/* 9AB5C8 802431D8 0200382D */ daddu $a3, $s0, $zero -.L802431DC: -/* 9AB5CC 802431DC 2402FFFE */ addiu $v0, $zero, -2 -/* 9AB5D0 802431E0 A2A200AB */ sb $v0, 0xab($s5) -/* 9AB5D4 802431E4 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9AB5D8 802431E8 30620004 */ andi $v0, $v1, 4 -/* 9AB5DC 802431EC 10400007 */ beqz $v0, .L8024320C -/* 9AB5E0 802431F0 00000000 */ nop -/* 9AB5E4 802431F4 824200B4 */ lb $v0, 0xb4($s2) -/* 9AB5E8 802431F8 1440003C */ bnez $v0, .L802432EC -/* 9AB5EC 802431FC 0000102D */ daddu $v0, $zero, $zero -/* 9AB5F0 80243200 2402FFFB */ addiu $v0, $zero, -5 -/* 9AB5F4 80243204 00621024 */ and $v0, $v1, $v0 -/* 9AB5F8 80243208 AE4200B0 */ sw $v0, 0xb0($s2) -.L8024320C: -/* 9AB5FC 8024320C 8E830070 */ lw $v1, 0x70($s4) -/* 9AB600 80243210 2C62000F */ sltiu $v0, $v1, 0xf -/* 9AB604 80243214 10400034 */ beqz $v0, .L802432E8 -/* 9AB608 80243218 00031080 */ sll $v0, $v1, 2 -/* 9AB60C 8024321C 3C018024 */ lui $at, 0x8024 -/* 9AB610 80243220 00220821 */ addu $at, $at, $v0 -/* 9AB614 80243224 8C226288 */ lw $v0, 0x6288($at) -/* 9AB618 80243228 00400008 */ jr $v0 -/* 9AB61C 8024322C 00000000 */ nop -/* 9AB620 80243230 0280202D */ daddu $a0, $s4, $zero -/* 9AB624 80243234 0200282D */ daddu $a1, $s0, $zero -/* 9AB628 80243238 0C090786 */ jal func_80241E18 -/* 9AB62C 8024323C 0260302D */ daddu $a2, $s3, $zero -/* 9AB630 80243240 0280202D */ daddu $a0, $s4, $zero -/* 9AB634 80243244 0200282D */ daddu $a1, $s0, $zero -/* 9AB638 80243248 0C0907F2 */ jal func_80241FC8 -/* 9AB63C 8024324C 0260302D */ daddu $a2, $s3, $zero -/* 9AB640 80243250 08090CBB */ j .L802432EC -/* 9AB644 80243254 0000102D */ daddu $v0, $zero, $zero -/* 9AB648 80243258 0280202D */ daddu $a0, $s4, $zero -/* 9AB64C 8024325C 0200282D */ daddu $a1, $s0, $zero -/* 9AB650 80243260 0C09097C */ jal func_802425F0 -/* 9AB654 80243264 0260302D */ daddu $a2, $s3, $zero -/* 9AB658 80243268 0280202D */ daddu $a0, $s4, $zero -/* 9AB65C 8024326C 0200282D */ daddu $a1, $s0, $zero -/* 9AB660 80243270 0C0909AC */ jal func_802426B0 -/* 9AB664 80243274 0260302D */ daddu $a2, $s3, $zero -/* 9AB668 80243278 08090CBB */ j .L802432EC -/* 9AB66C 8024327C 0000102D */ daddu $v0, $zero, $zero -/* 9AB670 80243280 0280202D */ daddu $a0, $s4, $zero -/* 9AB674 80243284 0200282D */ daddu $a1, $s0, $zero -/* 9AB678 80243288 0C090A7D */ jal func_802429F4 -/* 9AB67C 8024328C 0260302D */ daddu $a2, $s3, $zero -/* 9AB680 80243290 0280202D */ daddu $a0, $s4, $zero -/* 9AB684 80243294 0200282D */ daddu $a1, $s0, $zero -/* 9AB688 80243298 0C090A9B */ jal func_80242A6C -/* 9AB68C 8024329C 0260302D */ daddu $a2, $s3, $zero -/* 9AB690 802432A0 08090CBB */ j .L802432EC -/* 9AB694 802432A4 0000102D */ daddu $v0, $zero, $zero -/* 9AB698 802432A8 0280202D */ daddu $a0, $s4, $zero -/* 9AB69C 802432AC 0200282D */ daddu $a1, $s0, $zero -/* 9AB6A0 802432B0 0C090AB6 */ jal func_80242AD8 -/* 9AB6A4 802432B4 0260302D */ daddu $a2, $s3, $zero -/* 9AB6A8 802432B8 08090CBB */ j .L802432EC -/* 9AB6AC 802432BC 0000102D */ daddu $v0, $zero, $zero -/* 9AB6B0 802432C0 0280202D */ daddu $a0, $s4, $zero -/* 9AB6B4 802432C4 0200282D */ daddu $a1, $s0, $zero -/* 9AB6B8 802432C8 0C090B03 */ jal func_80242C0C -/* 9AB6BC 802432CC 0260302D */ daddu $a2, $s3, $zero -/* 9AB6C0 802432D0 08090CBB */ j .L802432EC -/* 9AB6C4 802432D4 0000102D */ daddu $v0, $zero, $zero -/* 9AB6C8 802432D8 0280202D */ daddu $a0, $s4, $zero -/* 9AB6CC 802432DC 0200282D */ daddu $a1, $s0, $zero -/* 9AB6D0 802432E0 0C090B1C */ jal func_80242C70 -/* 9AB6D4 802432E4 0260302D */ daddu $a2, $s3, $zero -.L802432E8: -/* 9AB6D8 802432E8 0000102D */ daddu $v0, $zero, $zero -.L802432EC: -/* 9AB6DC 802432EC 8FBF0048 */ lw $ra, 0x48($sp) -/* 9AB6E0 802432F0 8FB50044 */ lw $s5, 0x44($sp) -/* 9AB6E4 802432F4 8FB40040 */ lw $s4, 0x40($sp) -/* 9AB6E8 802432F8 8FB3003C */ lw $s3, 0x3c($sp) -/* 9AB6EC 802432FC 8FB20038 */ lw $s2, 0x38($sp) -/* 9AB6F0 80243300 8FB10034 */ lw $s1, 0x34($sp) -/* 9AB6F4 80243304 8FB00030 */ lw $s0, 0x30($sp) -/* 9AB6F8 80243308 03E00008 */ jr $ra -/* 9AB6FC 8024330C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s new file mode 100644 index 0000000000..57f32dc4a2 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243124_9AB514.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243124_9AB514 +/* 9AB514 80243124 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 9AB518 80243128 AFB40040 */ sw $s4, 0x40($sp) +/* 9AB51C 8024312C 0080A02D */ daddu $s4, $a0, $zero +/* 9AB520 80243130 AFBF0048 */ sw $ra, 0x48($sp) +/* 9AB524 80243134 AFB50044 */ sw $s5, 0x44($sp) +/* 9AB528 80243138 AFB3003C */ sw $s3, 0x3c($sp) +/* 9AB52C 8024313C AFB20038 */ sw $s2, 0x38($sp) +/* 9AB530 80243140 AFB10034 */ sw $s1, 0x34($sp) +/* 9AB534 80243144 AFB00030 */ sw $s0, 0x30($sp) +/* 9AB538 80243148 8E920148 */ lw $s2, 0x148($s4) +/* 9AB53C 8024314C 86440008 */ lh $a0, 8($s2) +/* 9AB540 80243150 8E90000C */ lw $s0, 0xc($s4) +/* 9AB544 80243154 0C00EABB */ jal get_npc_unsafe +/* 9AB548 80243158 00A0882D */ daddu $s1, $a1, $zero +/* 9AB54C 8024315C 0280202D */ daddu $a0, $s4, $zero +/* 9AB550 80243160 8E050000 */ lw $a1, ($s0) +/* 9AB554 80243164 0C0B1EAF */ jal get_variable +/* 9AB558 80243168 0040A82D */ daddu $s5, $v0, $zero +/* 9AB55C 8024316C AFA00010 */ sw $zero, 0x10($sp) +/* 9AB560 80243170 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9AB564 80243174 8C630030 */ lw $v1, 0x30($v1) +/* 9AB568 80243178 AFA30014 */ sw $v1, 0x14($sp) +/* 9AB56C 8024317C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9AB570 80243180 8C63001C */ lw $v1, 0x1c($v1) +/* 9AB574 80243184 AFA30018 */ sw $v1, 0x18($sp) +/* 9AB578 80243188 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9AB57C 8024318C 8C630024 */ lw $v1, 0x24($v1) +/* 9AB580 80243190 AFA3001C */ sw $v1, 0x1c($sp) +/* 9AB584 80243194 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9AB588 80243198 8C630028 */ lw $v1, 0x28($v1) +/* 9AB58C 8024319C 27B30010 */ addiu $s3, $sp, 0x10 +/* 9AB590 802431A0 AFA30020 */ sw $v1, 0x20($sp) +/* 9AB594 802431A4 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9AB598 802431A8 3C0142F0 */ lui $at, 0x42f0 +/* 9AB59C 802431AC 44810000 */ mtc1 $at, $f0 +/* 9AB5A0 802431B0 8C63002C */ lw $v1, 0x2c($v1) +/* 9AB5A4 802431B4 0040802D */ daddu $s0, $v0, $zero +/* 9AB5A8 802431B8 E7A00028 */ swc1 $f0, 0x28($sp) +/* 9AB5AC 802431BC A7A0002C */ sh $zero, 0x2c($sp) +/* 9AB5B0 802431C0 12200006 */ beqz $s1, .L802431DC +/* 9AB5B4 802431C4 AFA30024 */ sw $v1, 0x24($sp) +/* 9AB5B8 802431C8 02A0202D */ daddu $a0, $s5, $zero +/* 9AB5BC 802431CC 0240282D */ daddu $a1, $s2, $zero +/* 9AB5C0 802431D0 0280302D */ daddu $a2, $s4, $zero +/* 9AB5C4 802431D4 0C090C00 */ jal func_80243000_9AB3F0 +/* 9AB5C8 802431D8 0200382D */ daddu $a3, $s0, $zero +.L802431DC: +/* 9AB5CC 802431DC 2402FFFE */ addiu $v0, $zero, -2 +/* 9AB5D0 802431E0 A2A200AB */ sb $v0, 0xab($s5) +/* 9AB5D4 802431E4 8E4300B0 */ lw $v1, 0xb0($s2) +/* 9AB5D8 802431E8 30620004 */ andi $v0, $v1, 4 +/* 9AB5DC 802431EC 10400007 */ beqz $v0, .L8024320C +/* 9AB5E0 802431F0 00000000 */ nop +/* 9AB5E4 802431F4 824200B4 */ lb $v0, 0xb4($s2) +/* 9AB5E8 802431F8 1440003C */ bnez $v0, .L802432EC +/* 9AB5EC 802431FC 0000102D */ daddu $v0, $zero, $zero +/* 9AB5F0 80243200 2402FFFB */ addiu $v0, $zero, -5 +/* 9AB5F4 80243204 00621024 */ and $v0, $v1, $v0 +/* 9AB5F8 80243208 AE4200B0 */ sw $v0, 0xb0($s2) +.L8024320C: +/* 9AB5FC 8024320C 8E830070 */ lw $v1, 0x70($s4) +/* 9AB600 80243210 2C62000F */ sltiu $v0, $v1, 0xf +/* 9AB604 80243214 10400034 */ beqz $v0, .L802432E8 +/* 9AB608 80243218 00031080 */ sll $v0, $v1, 2 +/* 9AB60C 8024321C 3C018024 */ lui $at, 0x8024 +/* 9AB610 80243220 00220821 */ addu $at, $at, $v0 +/* 9AB614 80243224 8C226288 */ lw $v0, 0x6288($at) +/* 9AB618 80243228 00400008 */ jr $v0 +/* 9AB61C 8024322C 00000000 */ nop +/* 9AB620 80243230 0280202D */ daddu $a0, $s4, $zero +/* 9AB624 80243234 0200282D */ daddu $a1, $s0, $zero +/* 9AB628 80243238 0C090786 */ jal func_80241E18_9AA208 +/* 9AB62C 8024323C 0260302D */ daddu $a2, $s3, $zero +/* 9AB630 80243240 0280202D */ daddu $a0, $s4, $zero +/* 9AB634 80243244 0200282D */ daddu $a1, $s0, $zero +/* 9AB638 80243248 0C0907F2 */ jal func_80241FC8_9AA3B8 +/* 9AB63C 8024324C 0260302D */ daddu $a2, $s3, $zero +/* 9AB640 80243250 08090CBB */ j .L802432EC +/* 9AB644 80243254 0000102D */ daddu $v0, $zero, $zero +/* 9AB648 80243258 0280202D */ daddu $a0, $s4, $zero +/* 9AB64C 8024325C 0200282D */ daddu $a1, $s0, $zero +/* 9AB650 80243260 0C09097C */ jal func_802425F0_9AA9E0 +/* 9AB654 80243264 0260302D */ daddu $a2, $s3, $zero +/* 9AB658 80243268 0280202D */ daddu $a0, $s4, $zero +/* 9AB65C 8024326C 0200282D */ daddu $a1, $s0, $zero +/* 9AB660 80243270 0C0909AC */ jal func_802426B0_9AAAA0 +/* 9AB664 80243274 0260302D */ daddu $a2, $s3, $zero +/* 9AB668 80243278 08090CBB */ j .L802432EC +/* 9AB66C 8024327C 0000102D */ daddu $v0, $zero, $zero +/* 9AB670 80243280 0280202D */ daddu $a0, $s4, $zero +/* 9AB674 80243284 0200282D */ daddu $a1, $s0, $zero +/* 9AB678 80243288 0C090A7D */ jal func_802429F4_9AADE4 +/* 9AB67C 8024328C 0260302D */ daddu $a2, $s3, $zero +/* 9AB680 80243290 0280202D */ daddu $a0, $s4, $zero +/* 9AB684 80243294 0200282D */ daddu $a1, $s0, $zero +/* 9AB688 80243298 0C090A9B */ jal func_80242A6C_9AAE5C +/* 9AB68C 8024329C 0260302D */ daddu $a2, $s3, $zero +/* 9AB690 802432A0 08090CBB */ j .L802432EC +/* 9AB694 802432A4 0000102D */ daddu $v0, $zero, $zero +/* 9AB698 802432A8 0280202D */ daddu $a0, $s4, $zero +/* 9AB69C 802432AC 0200282D */ daddu $a1, $s0, $zero +/* 9AB6A0 802432B0 0C090AB6 */ jal func_80242AD8_9AAEC8 +/* 9AB6A4 802432B4 0260302D */ daddu $a2, $s3, $zero +/* 9AB6A8 802432B8 08090CBB */ j .L802432EC +/* 9AB6AC 802432BC 0000102D */ daddu $v0, $zero, $zero +/* 9AB6B0 802432C0 0280202D */ daddu $a0, $s4, $zero +/* 9AB6B4 802432C4 0200282D */ daddu $a1, $s0, $zero +/* 9AB6B8 802432C8 0C090B03 */ jal func_80242C0C_9AAFFC +/* 9AB6BC 802432CC 0260302D */ daddu $a2, $s3, $zero +/* 9AB6C0 802432D0 08090CBB */ j .L802432EC +/* 9AB6C4 802432D4 0000102D */ daddu $v0, $zero, $zero +/* 9AB6C8 802432D8 0280202D */ daddu $a0, $s4, $zero +/* 9AB6CC 802432DC 0200282D */ daddu $a1, $s0, $zero +/* 9AB6D0 802432E0 0C090B1C */ jal func_80242C70_9AB060 +/* 9AB6D4 802432E4 0260302D */ daddu $a2, $s3, $zero +.L802432E8: +/* 9AB6D8 802432E8 0000102D */ daddu $v0, $zero, $zero +.L802432EC: +/* 9AB6DC 802432EC 8FBF0048 */ lw $ra, 0x48($sp) +/* 9AB6E0 802432F0 8FB50044 */ lw $s5, 0x44($sp) +/* 9AB6E4 802432F4 8FB40040 */ lw $s4, 0x40($sp) +/* 9AB6E8 802432F8 8FB3003C */ lw $s3, 0x3c($sp) +/* 9AB6EC 802432FC 8FB20038 */ lw $s2, 0x38($sp) +/* 9AB6F0 80243300 8FB10034 */ lw $s1, 0x34($sp) +/* 9AB6F4 80243304 8FB00030 */ lw $s0, 0x30($sp) +/* 9AB6F8 80243308 03E00008 */ jr $ra +/* 9AB6FC 8024330C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310.s deleted file mode 100644 index 06f603ad36..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243310 -/* 9AB700 80243310 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9AB704 80243314 AFB3001C */ sw $s3, 0x1c($sp) -/* 9AB708 80243318 0080982D */ daddu $s3, $a0, $zero -/* 9AB70C 8024331C AFBF0020 */ sw $ra, 0x20($sp) -/* 9AB710 80243320 AFB20018 */ sw $s2, 0x18($sp) -/* 9AB714 80243324 AFB10014 */ sw $s1, 0x14($sp) -/* 9AB718 80243328 AFB00010 */ sw $s0, 0x10($sp) -/* 9AB71C 8024332C 8E710148 */ lw $s1, 0x148($s3) -/* 9AB720 80243330 0C00EABB */ jal get_npc_unsafe -/* 9AB724 80243334 86240008 */ lh $a0, 8($s1) -/* 9AB728 80243338 0040802D */ daddu $s0, $v0, $zero -/* 9AB72C 8024333C C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AB730 80243340 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AB734 80243344 3C01C0A0 */ lui $at, 0xc0a0 -/* 9AB738 80243348 44811000 */ mtc1 $at, $f2 -/* 9AB73C 8024334C 3C013E19 */ lui $at, 0x3e19 -/* 9AB740 80243350 3421999A */ ori $at, $at, 0x999a -/* 9AB744 80243354 44810000 */ mtc1 $at, $f0 -/* 9AB748 80243358 8C420024 */ lw $v0, 0x24($v0) -/* 9AB74C 8024335C 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) -/* 9AB750 80243360 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) -/* 9AB754 80243364 E602001C */ swc1 $f2, 0x1c($s0) -/* 9AB758 80243368 E6000014 */ swc1 $f0, 0x14($s0) -/* 9AB75C 8024336C AE020028 */ sw $v0, 0x28($s0) -/* 9AB760 80243370 8E22008C */ lw $v0, 0x8c($s1) -/* 9AB764 80243374 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AB768 80243378 00021FC2 */ srl $v1, $v0, 0x1f -/* 9AB76C 8024337C 00431021 */ addu $v0, $v0, $v1 -/* 9AB770 80243380 8E430000 */ lw $v1, ($s2) -/* 9AB774 80243384 00021043 */ sra $v0, $v0, 1 -/* 9AB778 80243388 A60200A8 */ sh $v0, 0xa8($s0) -/* 9AB77C 8024338C 8C660028 */ lw $a2, 0x28($v1) -/* 9AB780 80243390 0C00A7B5 */ jal dist2D -/* 9AB784 80243394 8C670030 */ lw $a3, 0x30($v1) -/* 9AB788 80243398 0200202D */ daddu $a0, $s0, $zero -/* 9AB78C 8024339C 0000302D */ daddu $a2, $zero, $zero -/* 9AB790 802433A0 C6020038 */ lwc1 $f2, 0x38($s0) -/* 9AB794 802433A4 3C0140E0 */ lui $at, 0x40e0 -/* 9AB798 802433A8 44810000 */ mtc1 $at, $f0 -/* 9AB79C 802433AC 4600110D */ trunc.w.s $f4, $f2 -/* 9AB7A0 802433B0 44022000 */ mfc1 $v0, $f4 -/* 9AB7A4 802433B4 E6000018 */ swc1 $f0, 0x18($s0) -/* 9AB7A8 802433B8 A6220010 */ sh $v0, 0x10($s1) -/* 9AB7AC 802433BC C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB7B0 802433C0 240502C1 */ addiu $a1, $zero, 0x2c1 -/* 9AB7B4 802433C4 4600010D */ trunc.w.s $f4, $f0 -/* 9AB7B8 802433C8 44022000 */ mfc1 $v0, $f4 -/* 9AB7BC 802433CC 00000000 */ nop -/* 9AB7C0 802433D0 A6220012 */ sh $v0, 0x12($s1) -/* 9AB7C4 802433D4 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9AB7C8 802433D8 24020001 */ addiu $v0, $zero, 1 -/* 9AB7CC 802433DC A2220007 */ sb $v0, 7($s1) -/* 9AB7D0 802433E0 4600010D */ trunc.w.s $f4, $f0 -/* 9AB7D4 802433E4 44022000 */ mfc1 $v0, $f4 -/* 9AB7D8 802433E8 0C012530 */ jal func_800494C0 -/* 9AB7DC 802433EC A6220014 */ sh $v0, 0x14($s1) -/* 9AB7E0 802433F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9AB7E4 802433F4 8E420000 */ lw $v0, ($s2) -/* 9AB7E8 802433F8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9AB7EC 802433FC 8C460028 */ lw $a2, 0x28($v0) -/* 9AB7F0 80243400 0C00A720 */ jal atan2 -/* 9AB7F4 80243404 8C470030 */ lw $a3, 0x30($v0) -/* 9AB7F8 80243408 2402000C */ addiu $v0, $zero, 0xc -/* 9AB7FC 8024340C A602008E */ sh $v0, 0x8e($s0) -/* 9AB800 80243410 2402000D */ addiu $v0, $zero, 0xd -/* 9AB804 80243414 E600000C */ swc1 $f0, 0xc($s0) -/* 9AB808 80243418 AE620070 */ sw $v0, 0x70($s3) -/* 9AB80C 8024341C 8FBF0020 */ lw $ra, 0x20($sp) -/* 9AB810 80243420 8FB3001C */ lw $s3, 0x1c($sp) -/* 9AB814 80243424 8FB20018 */ lw $s2, 0x18($sp) -/* 9AB818 80243428 8FB10014 */ lw $s1, 0x14($sp) -/* 9AB81C 8024342C 8FB00010 */ lw $s0, 0x10($sp) -/* 9AB820 80243430 03E00008 */ jr $ra -/* 9AB824 80243434 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310_9AB700.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310_9AB700.s new file mode 100644 index 0000000000..029ad14ea5 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243310_9AB700.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243310_9AB700 +/* 9AB700 80243310 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9AB704 80243314 AFB3001C */ sw $s3, 0x1c($sp) +/* 9AB708 80243318 0080982D */ daddu $s3, $a0, $zero +/* 9AB70C 8024331C AFBF0020 */ sw $ra, 0x20($sp) +/* 9AB710 80243320 AFB20018 */ sw $s2, 0x18($sp) +/* 9AB714 80243324 AFB10014 */ sw $s1, 0x14($sp) +/* 9AB718 80243328 AFB00010 */ sw $s0, 0x10($sp) +/* 9AB71C 8024332C 8E710148 */ lw $s1, 0x148($s3) +/* 9AB720 80243330 0C00EABB */ jal get_npc_unsafe +/* 9AB724 80243334 86240008 */ lh $a0, 8($s1) +/* 9AB728 80243338 0040802D */ daddu $s0, $v0, $zero +/* 9AB72C 8024333C C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9AB730 80243340 8E2200CC */ lw $v0, 0xcc($s1) +/* 9AB734 80243344 3C01C0A0 */ lui $at, 0xc0a0 +/* 9AB738 80243348 44811000 */ mtc1 $at, $f2 +/* 9AB73C 8024334C 3C013E19 */ lui $at, 0x3e19 +/* 9AB740 80243350 3421999A */ ori $at, $at, 0x999a +/* 9AB744 80243354 44810000 */ mtc1 $at, $f0 +/* 9AB748 80243358 8C420024 */ lw $v0, 0x24($v0) +/* 9AB74C 8024335C 3C12800F */ lui $s2, %hi(gPlayerStatusPtr) +/* 9AB750 80243360 26527B30 */ addiu $s2, $s2, %lo(gPlayerStatusPtr) +/* 9AB754 80243364 E602001C */ swc1 $f2, 0x1c($s0) +/* 9AB758 80243368 E6000014 */ swc1 $f0, 0x14($s0) +/* 9AB75C 8024336C AE020028 */ sw $v0, 0x28($s0) +/* 9AB760 80243370 8E22008C */ lw $v0, 0x8c($s1) +/* 9AB764 80243374 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9AB768 80243378 00021FC2 */ srl $v1, $v0, 0x1f +/* 9AB76C 8024337C 00431021 */ addu $v0, $v0, $v1 +/* 9AB770 80243380 8E430000 */ lw $v1, ($s2) +/* 9AB774 80243384 00021043 */ sra $v0, $v0, 1 +/* 9AB778 80243388 A60200A8 */ sh $v0, 0xa8($s0) +/* 9AB77C 8024338C 8C660028 */ lw $a2, 0x28($v1) +/* 9AB780 80243390 0C00A7B5 */ jal dist2D +/* 9AB784 80243394 8C670030 */ lw $a3, 0x30($v1) +/* 9AB788 80243398 0200202D */ daddu $a0, $s0, $zero +/* 9AB78C 8024339C 0000302D */ daddu $a2, $zero, $zero +/* 9AB790 802433A0 C6020038 */ lwc1 $f2, 0x38($s0) +/* 9AB794 802433A4 3C0140E0 */ lui $at, 0x40e0 +/* 9AB798 802433A8 44810000 */ mtc1 $at, $f0 +/* 9AB79C 802433AC 4600110D */ trunc.w.s $f4, $f2 +/* 9AB7A0 802433B0 44022000 */ mfc1 $v0, $f4 +/* 9AB7A4 802433B4 E6000018 */ swc1 $f0, 0x18($s0) +/* 9AB7A8 802433B8 A6220010 */ sh $v0, 0x10($s1) +/* 9AB7AC 802433BC C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AB7B0 802433C0 240502C1 */ addiu $a1, $zero, 0x2c1 +/* 9AB7B4 802433C4 4600010D */ trunc.w.s $f4, $f0 +/* 9AB7B8 802433C8 44022000 */ mfc1 $v0, $f4 +/* 9AB7BC 802433CC 00000000 */ nop +/* 9AB7C0 802433D0 A6220012 */ sh $v0, 0x12($s1) +/* 9AB7C4 802433D4 C6000040 */ lwc1 $f0, 0x40($s0) +/* 9AB7C8 802433D8 24020001 */ addiu $v0, $zero, 1 +/* 9AB7CC 802433DC A2220007 */ sb $v0, 7($s1) +/* 9AB7D0 802433E0 4600010D */ trunc.w.s $f4, $f0 +/* 9AB7D4 802433E4 44022000 */ mfc1 $v0, $f4 +/* 9AB7D8 802433E8 0C012530 */ jal func_800494C0 +/* 9AB7DC 802433EC A6220014 */ sh $v0, 0x14($s1) +/* 9AB7E0 802433F0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9AB7E4 802433F4 8E420000 */ lw $v0, ($s2) +/* 9AB7E8 802433F8 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9AB7EC 802433FC 8C460028 */ lw $a2, 0x28($v0) +/* 9AB7F0 80243400 0C00A720 */ jal atan2 +/* 9AB7F4 80243404 8C470030 */ lw $a3, 0x30($v0) +/* 9AB7F8 80243408 2402000C */ addiu $v0, $zero, 0xc +/* 9AB7FC 8024340C A602008E */ sh $v0, 0x8e($s0) +/* 9AB800 80243410 2402000D */ addiu $v0, $zero, 0xd +/* 9AB804 80243414 E600000C */ swc1 $f0, 0xc($s0) +/* 9AB808 80243418 AE620070 */ sw $v0, 0x70($s3) +/* 9AB80C 8024341C 8FBF0020 */ lw $ra, 0x20($sp) +/* 9AB810 80243420 8FB3001C */ lw $s3, 0x1c($sp) +/* 9AB814 80243424 8FB20018 */ lw $s2, 0x18($sp) +/* 9AB818 80243428 8FB10014 */ lw $s1, 0x14($sp) +/* 9AB81C 8024342C 8FB00010 */ lw $s0, 0x10($sp) +/* 9AB820 80243430 03E00008 */ jr $ra +/* 9AB824 80243434 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438.s deleted file mode 100644 index 507cdd3dbd..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243438 -/* 9AB828 80243438 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9AB82C 8024343C AFB20018 */ sw $s2, 0x18($sp) -/* 9AB830 80243440 0080902D */ daddu $s2, $a0, $zero -/* 9AB834 80243444 AFBF001C */ sw $ra, 0x1c($sp) -/* 9AB838 80243448 AFB10014 */ sw $s1, 0x14($sp) -/* 9AB83C 8024344C AFB00010 */ sw $s0, 0x10($sp) -/* 9AB840 80243450 8E510148 */ lw $s1, 0x148($s2) -/* 9AB844 80243454 0C00EABB */ jal get_npc_unsafe -/* 9AB848 80243458 86240008 */ lh $a0, 8($s1) -/* 9AB84C 8024345C 0040802D */ daddu $s0, $v0, $zero -/* 9AB850 80243460 C602001C */ lwc1 $f2, 0x1c($s0) -/* 9AB854 80243464 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9AB858 80243468 8E050018 */ lw $a1, 0x18($s0) -/* 9AB85C 8024346C 46001080 */ add.s $f2, $f2, $f0 -/* 9AB860 80243470 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB864 80243474 8E06000C */ lw $a2, 0xc($s0) -/* 9AB868 80243478 46020000 */ add.s $f0, $f0, $f2 -/* 9AB86C 8024347C 0200202D */ daddu $a0, $s0, $zero -/* 9AB870 80243480 E602001C */ swc1 $f2, 0x1c($s0) -/* 9AB874 80243484 0C00EA95 */ jal npc_move_heading -/* 9AB878 80243488 E600003C */ swc1 $f0, 0x3c($s0) -/* 9AB87C 8024348C 9602008E */ lhu $v0, 0x8e($s0) -/* 9AB880 80243490 2442FFFF */ addiu $v0, $v0, -1 -/* 9AB884 80243494 A602008E */ sh $v0, 0x8e($s0) -/* 9AB888 80243498 00021400 */ sll $v0, $v0, 0x10 -/* 9AB88C 8024349C 1C40000F */ bgtz $v0, .L802434DC -/* 9AB890 802434A0 00000000 */ nop -/* 9AB894 802434A4 3C013E99 */ lui $at, 0x3e99 -/* 9AB898 802434A8 3421999A */ ori $at, $at, 0x999a -/* 9AB89C 802434AC 44810000 */ mtc1 $at, $f0 -/* 9AB8A0 802434B0 3C014040 */ lui $at, 0x4040 -/* 9AB8A4 802434B4 44811000 */ mtc1 $at, $f2 -/* 9AB8A8 802434B8 A2200007 */ sb $zero, 7($s1) -/* 9AB8AC 802434BC AE00001C */ sw $zero, 0x1c($s0) -/* 9AB8B0 802434C0 E6000014 */ swc1 $f0, 0x14($s0) -/* 9AB8B4 802434C4 E6020018 */ swc1 $f2, 0x18($s0) -/* 9AB8B8 802434C8 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AB8BC 802434CC 8C420028 */ lw $v0, 0x28($v0) -/* 9AB8C0 802434D0 AE020028 */ sw $v0, 0x28($s0) -/* 9AB8C4 802434D4 2402000E */ addiu $v0, $zero, 0xe -/* 9AB8C8 802434D8 AE420070 */ sw $v0, 0x70($s2) -.L802434DC: -/* 9AB8CC 802434DC 8FBF001C */ lw $ra, 0x1c($sp) -/* 9AB8D0 802434E0 8FB20018 */ lw $s2, 0x18($sp) -/* 9AB8D4 802434E4 8FB10014 */ lw $s1, 0x14($sp) -/* 9AB8D8 802434E8 8FB00010 */ lw $s0, 0x10($sp) -/* 9AB8DC 802434EC 03E00008 */ jr $ra -/* 9AB8E0 802434F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438_9AB828.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438_9AB828.s new file mode 100644 index 0000000000..39618f1d67 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243438_9AB828.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243438_9AB828 +/* 9AB828 80243438 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9AB82C 8024343C AFB20018 */ sw $s2, 0x18($sp) +/* 9AB830 80243440 0080902D */ daddu $s2, $a0, $zero +/* 9AB834 80243444 AFBF001C */ sw $ra, 0x1c($sp) +/* 9AB838 80243448 AFB10014 */ sw $s1, 0x14($sp) +/* 9AB83C 8024344C AFB00010 */ sw $s0, 0x10($sp) +/* 9AB840 80243450 8E510148 */ lw $s1, 0x148($s2) +/* 9AB844 80243454 0C00EABB */ jal get_npc_unsafe +/* 9AB848 80243458 86240008 */ lh $a0, 8($s1) +/* 9AB84C 8024345C 0040802D */ daddu $s0, $v0, $zero +/* 9AB850 80243460 C602001C */ lwc1 $f2, 0x1c($s0) +/* 9AB854 80243464 C6000014 */ lwc1 $f0, 0x14($s0) +/* 9AB858 80243468 8E050018 */ lw $a1, 0x18($s0) +/* 9AB85C 8024346C 46001080 */ add.s $f2, $f2, $f0 +/* 9AB860 80243470 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AB864 80243474 8E06000C */ lw $a2, 0xc($s0) +/* 9AB868 80243478 46020000 */ add.s $f0, $f0, $f2 +/* 9AB86C 8024347C 0200202D */ daddu $a0, $s0, $zero +/* 9AB870 80243480 E602001C */ swc1 $f2, 0x1c($s0) +/* 9AB874 80243484 0C00EA95 */ jal npc_move_heading +/* 9AB878 80243488 E600003C */ swc1 $f0, 0x3c($s0) +/* 9AB87C 8024348C 9602008E */ lhu $v0, 0x8e($s0) +/* 9AB880 80243490 2442FFFF */ addiu $v0, $v0, -1 +/* 9AB884 80243494 A602008E */ sh $v0, 0x8e($s0) +/* 9AB888 80243498 00021400 */ sll $v0, $v0, 0x10 +/* 9AB88C 8024349C 1C40000F */ bgtz $v0, .L802434DC +/* 9AB890 802434A0 00000000 */ nop +/* 9AB894 802434A4 3C013E99 */ lui $at, 0x3e99 +/* 9AB898 802434A8 3421999A */ ori $at, $at, 0x999a +/* 9AB89C 802434AC 44810000 */ mtc1 $at, $f0 +/* 9AB8A0 802434B0 3C014040 */ lui $at, 0x4040 +/* 9AB8A4 802434B4 44811000 */ mtc1 $at, $f2 +/* 9AB8A8 802434B8 A2200007 */ sb $zero, 7($s1) +/* 9AB8AC 802434BC AE00001C */ sw $zero, 0x1c($s0) +/* 9AB8B0 802434C0 E6000014 */ swc1 $f0, 0x14($s0) +/* 9AB8B4 802434C4 E6020018 */ swc1 $f2, 0x18($s0) +/* 9AB8B8 802434C8 8E2200CC */ lw $v0, 0xcc($s1) +/* 9AB8BC 802434CC 8C420028 */ lw $v0, 0x28($v0) +/* 9AB8C0 802434D0 AE020028 */ sw $v0, 0x28($s0) +/* 9AB8C4 802434D4 2402000E */ addiu $v0, $zero, 0xe +/* 9AB8C8 802434D8 AE420070 */ sw $v0, 0x70($s2) +.L802434DC: +/* 9AB8CC 802434DC 8FBF001C */ lw $ra, 0x1c($sp) +/* 9AB8D0 802434E0 8FB20018 */ lw $s2, 0x18($sp) +/* 9AB8D4 802434E4 8FB10014 */ lw $s1, 0x14($sp) +/* 9AB8D8 802434E8 8FB00010 */ lw $s0, 0x10($sp) +/* 9AB8DC 802434EC 03E00008 */ jr $ra +/* 9AB8E0 802434F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4.s deleted file mode 100644 index 84a3d28933..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434F4 -/* 9AB8E4 802434F4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 9AB8E8 802434F8 AFB20030 */ sw $s2, 0x30($sp) -/* 9AB8EC 802434FC 0080902D */ daddu $s2, $a0, $zero -/* 9AB8F0 80243500 AFBF0034 */ sw $ra, 0x34($sp) -/* 9AB8F4 80243504 AFB1002C */ sw $s1, 0x2c($sp) -/* 9AB8F8 80243508 AFB00028 */ sw $s0, 0x28($sp) -/* 9AB8FC 8024350C F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9AB900 80243510 8E510148 */ lw $s1, 0x148($s2) -/* 9AB904 80243514 0C00EABB */ jal get_npc_unsafe -/* 9AB908 80243518 86240008 */ lh $a0, 8($s1) -/* 9AB90C 8024351C 0040802D */ daddu $s0, $v0, $zero -/* 9AB910 80243520 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9AB914 80243524 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9AB918 80243528 0200202D */ daddu $a0, $s0, $zero -/* 9AB91C 8024352C 46002100 */ add.s $f4, $f4, $f0 -/* 9AB920 80243530 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB924 80243534 8E050018 */ lw $a1, 0x18($s0) -/* 9AB928 80243538 46041080 */ add.s $f2, $f2, $f4 -/* 9AB92C 8024353C 8E06000C */ lw $a2, 0xc($s0) -/* 9AB930 80243540 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9AB934 80243544 46800020 */ cvt.s.w $f0, $f0 -/* 9AB938 80243548 E602003C */ swc1 $f2, 0x3c($s0) -/* 9AB93C 8024354C 3C014059 */ lui $at, 0x4059 -/* 9AB940 80243550 44811800 */ mtc1 $at, $f3 -/* 9AB944 80243554 44801000 */ mtc1 $zero, $f2 -/* 9AB948 80243558 46000021 */ cvt.d.s $f0, $f0 -/* 9AB94C 8024355C E604001C */ swc1 $f4, 0x1c($s0) -/* 9AB950 80243560 46220003 */ div.d $f0, $f0, $f2 -/* 9AB954 80243564 0C00EA95 */ jal npc_move_heading -/* 9AB958 80243568 46200520 */ cvt.s.d $f20, $f0 -/* 9AB95C 8024356C 27A50018 */ addiu $a1, $sp, 0x18 -/* 9AB960 80243570 27A6001C */ addiu $a2, $sp, 0x1c -/* 9AB964 80243574 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9AB968 80243578 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9AB96C 8024357C C6040040 */ lwc1 $f4, 0x40($s0) -/* 9AB970 80243580 3C01447A */ lui $at, 0x447a -/* 9AB974 80243584 44813000 */ mtc1 $at, $f6 -/* 9AB978 80243588 27A20024 */ addiu $v0, $sp, 0x24 -/* 9AB97C 8024358C E7A00018 */ swc1 $f0, 0x18($sp) -/* 9AB980 80243590 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9AB984 80243594 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9AB988 80243598 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9AB98C 8024359C AFA20010 */ sw $v0, 0x10($sp) -/* 9AB990 802435A0 8E040080 */ lw $a0, 0x80($s0) -/* 9AB994 802435A4 0C0372DF */ jal func_800DCB7C -/* 9AB998 802435A8 27A70020 */ addiu $a3, $sp, 0x20 -/* 9AB99C 802435AC 10400003 */ beqz $v0, .L802435BC -/* 9AB9A0 802435B0 4600A086 */ mov.s $f2, $f20 -/* 9AB9A4 802435B4 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9AB9A8 802435B8 46140080 */ add.s $f2, $f0, $f20 -.L802435BC: -/* 9AB9AC 802435BC C600003C */ lwc1 $f0, 0x3c($s0) -/* 9AB9B0 802435C0 4602003C */ c.lt.s $f0, $f2 -/* 9AB9B4 802435C4 00000000 */ nop -/* 9AB9B8 802435C8 45010009 */ bc1t .L802435F0 -/* 9AB9BC 802435CC 2402000A */ addiu $v0, $zero, 0xa -/* 9AB9C0 802435D0 A602008E */ sh $v0, 0x8e($s0) -/* 9AB9C4 802435D4 8E2200CC */ lw $v0, 0xcc($s1) -/* 9AB9C8 802435D8 8C42002C */ lw $v0, 0x2c($v0) -/* 9AB9CC 802435DC AE020028 */ sw $v0, 0x28($s0) -/* 9AB9D0 802435E0 9622008E */ lhu $v0, 0x8e($s1) -/* 9AB9D4 802435E4 A60200A8 */ sh $v0, 0xa8($s0) -/* 9AB9D8 802435E8 2402000F */ addiu $v0, $zero, 0xf -/* 9AB9DC 802435EC AE420070 */ sw $v0, 0x70($s2) -.L802435F0: -/* 9AB9E0 802435F0 8FBF0034 */ lw $ra, 0x34($sp) -/* 9AB9E4 802435F4 8FB20030 */ lw $s2, 0x30($sp) -/* 9AB9E8 802435F8 8FB1002C */ lw $s1, 0x2c($sp) -/* 9AB9EC 802435FC 8FB00028 */ lw $s0, 0x28($sp) -/* 9AB9F0 80243600 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9AB9F4 80243604 03E00008 */ jr $ra -/* 9AB9F8 80243608 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s new file mode 100644 index 0000000000..d2856a56fc --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_802434F4_9AB8E4.s @@ -0,0 +1,76 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802434F4_9AB8E4 +/* 9AB8E4 802434F4 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 9AB8E8 802434F8 AFB20030 */ sw $s2, 0x30($sp) +/* 9AB8EC 802434FC 0080902D */ daddu $s2, $a0, $zero +/* 9AB8F0 80243500 AFBF0034 */ sw $ra, 0x34($sp) +/* 9AB8F4 80243504 AFB1002C */ sw $s1, 0x2c($sp) +/* 9AB8F8 80243508 AFB00028 */ sw $s0, 0x28($sp) +/* 9AB8FC 8024350C F7B40038 */ sdc1 $f20, 0x38($sp) +/* 9AB900 80243510 8E510148 */ lw $s1, 0x148($s2) +/* 9AB904 80243514 0C00EABB */ jal get_npc_unsafe +/* 9AB908 80243518 86240008 */ lh $a0, 8($s1) +/* 9AB90C 8024351C 0040802D */ daddu $s0, $v0, $zero +/* 9AB910 80243520 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9AB914 80243524 C6000014 */ lwc1 $f0, 0x14($s0) +/* 9AB918 80243528 0200202D */ daddu $a0, $s0, $zero +/* 9AB91C 8024352C 46002100 */ add.s $f4, $f4, $f0 +/* 9AB920 80243530 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9AB924 80243534 8E050018 */ lw $a1, 0x18($s0) +/* 9AB928 80243538 46041080 */ add.s $f2, $f2, $f4 +/* 9AB92C 8024353C 8E06000C */ lw $a2, 0xc($s0) +/* 9AB930 80243540 C6200078 */ lwc1 $f0, 0x78($s1) +/* 9AB934 80243544 46800020 */ cvt.s.w $f0, $f0 +/* 9AB938 80243548 E602003C */ swc1 $f2, 0x3c($s0) +/* 9AB93C 8024354C 3C014059 */ lui $at, 0x4059 +/* 9AB940 80243550 44811800 */ mtc1 $at, $f3 +/* 9AB944 80243554 44801000 */ mtc1 $zero, $f2 +/* 9AB948 80243558 46000021 */ cvt.d.s $f0, $f0 +/* 9AB94C 8024355C E604001C */ swc1 $f4, 0x1c($s0) +/* 9AB950 80243560 46220003 */ div.d $f0, $f0, $f2 +/* 9AB954 80243564 0C00EA95 */ jal npc_move_heading +/* 9AB958 80243568 46200520 */ cvt.s.d $f20, $f0 +/* 9AB95C 8024356C 27A50018 */ addiu $a1, $sp, 0x18 +/* 9AB960 80243570 27A6001C */ addiu $a2, $sp, 0x1c +/* 9AB964 80243574 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9AB968 80243578 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9AB96C 8024357C C6040040 */ lwc1 $f4, 0x40($s0) +/* 9AB970 80243580 3C01447A */ lui $at, 0x447a +/* 9AB974 80243584 44813000 */ mtc1 $at, $f6 +/* 9AB978 80243588 27A20024 */ addiu $v0, $sp, 0x24 +/* 9AB97C 8024358C E7A00018 */ swc1 $f0, 0x18($sp) +/* 9AB980 80243590 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 9AB984 80243594 E7A40020 */ swc1 $f4, 0x20($sp) +/* 9AB988 80243598 E7A60024 */ swc1 $f6, 0x24($sp) +/* 9AB98C 8024359C AFA20010 */ sw $v0, 0x10($sp) +/* 9AB990 802435A0 8E040080 */ lw $a0, 0x80($s0) +/* 9AB994 802435A4 0C0372DF */ jal func_800DCB7C +/* 9AB998 802435A8 27A70020 */ addiu $a3, $sp, 0x20 +/* 9AB99C 802435AC 10400003 */ beqz $v0, .L802435BC +/* 9AB9A0 802435B0 4600A086 */ mov.s $f2, $f20 +/* 9AB9A4 802435B4 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9AB9A8 802435B8 46140080 */ add.s $f2, $f0, $f20 +.L802435BC: +/* 9AB9AC 802435BC C600003C */ lwc1 $f0, 0x3c($s0) +/* 9AB9B0 802435C0 4602003C */ c.lt.s $f0, $f2 +/* 9AB9B4 802435C4 00000000 */ nop +/* 9AB9B8 802435C8 45010009 */ bc1t .L802435F0 +/* 9AB9BC 802435CC 2402000A */ addiu $v0, $zero, 0xa +/* 9AB9C0 802435D0 A602008E */ sh $v0, 0x8e($s0) +/* 9AB9C4 802435D4 8E2200CC */ lw $v0, 0xcc($s1) +/* 9AB9C8 802435D8 8C42002C */ lw $v0, 0x2c($v0) +/* 9AB9CC 802435DC AE020028 */ sw $v0, 0x28($s0) +/* 9AB9D0 802435E0 9622008E */ lhu $v0, 0x8e($s1) +/* 9AB9D4 802435E4 A60200A8 */ sh $v0, 0xa8($s0) +/* 9AB9D8 802435E8 2402000F */ addiu $v0, $zero, 0xf +/* 9AB9DC 802435EC AE420070 */ sw $v0, 0x70($s2) +.L802435F0: +/* 9AB9E0 802435F0 8FBF0034 */ lw $ra, 0x34($sp) +/* 9AB9E4 802435F4 8FB20030 */ lw $s2, 0x30($sp) +/* 9AB9E8 802435F8 8FB1002C */ lw $s1, 0x2c($sp) +/* 9AB9EC 802435FC 8FB00028 */ lw $s0, 0x28($sp) +/* 9AB9F0 80243600 D7B40038 */ ldc1 $f20, 0x38($sp) +/* 9AB9F4 80243604 03E00008 */ jr $ra +/* 9AB9F8 80243608 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C.s deleted file mode 100644 index 8d71d2eab3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024360C -/* 9AB9FC 8024360C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9ABA00 80243610 AFB00010 */ sw $s0, 0x10($sp) -/* 9ABA04 80243614 0080802D */ daddu $s0, $a0, $zero -/* 9ABA08 80243618 AFBF0014 */ sw $ra, 0x14($sp) -/* 9ABA0C 8024361C 8E020148 */ lw $v0, 0x148($s0) -/* 9ABA10 80243620 0C00EABB */ jal get_npc_unsafe -/* 9ABA14 80243624 84440008 */ lh $a0, 8($v0) -/* 9ABA18 80243628 9443008E */ lhu $v1, 0x8e($v0) -/* 9ABA1C 8024362C 2463FFFF */ addiu $v1, $v1, -1 -/* 9ABA20 80243630 A443008E */ sh $v1, 0x8e($v0) -/* 9ABA24 80243634 00031C00 */ sll $v1, $v1, 0x10 -/* 9ABA28 80243638 58600001 */ blezl $v1, .L80243640 -/* 9ABA2C 8024363C AE000070 */ sw $zero, 0x70($s0) -.L80243640: -/* 9ABA30 80243640 8FBF0014 */ lw $ra, 0x14($sp) -/* 9ABA34 80243644 8FB00010 */ lw $s0, 0x10($sp) -/* 9ABA38 80243648 03E00008 */ jr $ra -/* 9ABA3C 8024364C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s new file mode 100644 index 0000000000..beed9d2f54 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_8024360C_9AB9FC.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024360C_9AB9FC +/* 9AB9FC 8024360C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9ABA00 80243610 AFB00010 */ sw $s0, 0x10($sp) +/* 9ABA04 80243614 0080802D */ daddu $s0, $a0, $zero +/* 9ABA08 80243618 AFBF0014 */ sw $ra, 0x14($sp) +/* 9ABA0C 8024361C 8E020148 */ lw $v0, 0x148($s0) +/* 9ABA10 80243620 0C00EABB */ jal get_npc_unsafe +/* 9ABA14 80243624 84440008 */ lh $a0, 8($v0) +/* 9ABA18 80243628 9443008E */ lhu $v1, 0x8e($v0) +/* 9ABA1C 8024362C 2463FFFF */ addiu $v1, $v1, -1 +/* 9ABA20 80243630 A443008E */ sh $v1, 0x8e($v0) +/* 9ABA24 80243634 00031C00 */ sll $v1, $v1, 0x10 +/* 9ABA28 80243638 58600001 */ blezl $v1, .L80243640 +/* 9ABA2C 8024363C AE000070 */ sw $zero, 0x70($s0) +.L80243640: +/* 9ABA30 80243640 8FBF0014 */ lw $ra, 0x14($sp) +/* 9ABA34 80243644 8FB00010 */ lw $s0, 0x10($sp) +/* 9ABA38 80243648 03E00008 */ jr $ra +/* 9ABA3C 8024364C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650.s deleted file mode 100644 index 931a4187f9..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650.s +++ /dev/null @@ -1,156 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243650 -/* 9ABA40 80243650 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9ABA44 80243654 AFB3003C */ sw $s3, 0x3c($sp) -/* 9ABA48 80243658 0080982D */ daddu $s3, $a0, $zero -/* 9ABA4C 8024365C AFBF0048 */ sw $ra, 0x48($sp) -/* 9ABA50 80243660 AFB50044 */ sw $s5, 0x44($sp) -/* 9ABA54 80243664 AFB40040 */ sw $s4, 0x40($sp) -/* 9ABA58 80243668 AFB20038 */ sw $s2, 0x38($sp) -/* 9ABA5C 8024366C AFB10034 */ sw $s1, 0x34($sp) -/* 9ABA60 80243670 AFB00030 */ sw $s0, 0x30($sp) -/* 9ABA64 80243674 8E720148 */ lw $s2, 0x148($s3) -/* 9ABA68 80243678 86440008 */ lh $a0, 8($s2) -/* 9ABA6C 8024367C 8E70000C */ lw $s0, 0xc($s3) -/* 9ABA70 80243680 0C00EABB */ jal get_npc_unsafe -/* 9ABA74 80243684 00A0882D */ daddu $s1, $a1, $zero -/* 9ABA78 80243688 0260202D */ daddu $a0, $s3, $zero -/* 9ABA7C 8024368C 8E050000 */ lw $a1, ($s0) -/* 9ABA80 80243690 0C0B1EAF */ jal get_variable -/* 9ABA84 80243694 0040A82D */ daddu $s5, $v0, $zero -/* 9ABA88 80243698 AFA00010 */ sw $zero, 0x10($sp) -/* 9ABA8C 8024369C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABA90 802436A0 8C630030 */ lw $v1, 0x30($v1) -/* 9ABA94 802436A4 AFA30014 */ sw $v1, 0x14($sp) -/* 9ABA98 802436A8 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABA9C 802436AC 8C63001C */ lw $v1, 0x1c($v1) -/* 9ABAA0 802436B0 AFA30018 */ sw $v1, 0x18($sp) -/* 9ABAA4 802436B4 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABAA8 802436B8 8C630024 */ lw $v1, 0x24($v1) -/* 9ABAAC 802436BC AFA3001C */ sw $v1, 0x1c($sp) -/* 9ABAB0 802436C0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABAB4 802436C4 8C630028 */ lw $v1, 0x28($v1) -/* 9ABAB8 802436C8 27B40010 */ addiu $s4, $sp, 0x10 -/* 9ABABC 802436CC AFA30020 */ sw $v1, 0x20($sp) -/* 9ABAC0 802436D0 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9ABAC4 802436D4 3C0142F0 */ lui $at, 0x42f0 -/* 9ABAC8 802436D8 44810000 */ mtc1 $at, $f0 -/* 9ABACC 802436DC 8C63002C */ lw $v1, 0x2c($v1) -/* 9ABAD0 802436E0 0040802D */ daddu $s0, $v0, $zero -/* 9ABAD4 802436E4 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9ABAD8 802436E8 A7A0002C */ sh $zero, 0x2c($sp) -/* 9ABADC 802436EC 12200009 */ beqz $s1, .L80243714 -/* 9ABAE0 802436F0 AFA30024 */ sw $v1, 0x24($sp) -/* 9ABAE4 802436F4 02A0202D */ daddu $a0, $s5, $zero -/* 9ABAE8 802436F8 0240282D */ daddu $a1, $s2, $zero -/* 9ABAEC 802436FC 0260302D */ daddu $a2, $s3, $zero -/* 9ABAF0 80243700 0C090C00 */ jal func_80243000 -/* 9ABAF4 80243704 0200382D */ daddu $a3, $s0, $zero -/* 9ABAF8 80243708 86A200A8 */ lh $v0, 0xa8($s5) -/* 9ABAFC 8024370C AE42008C */ sw $v0, 0x8c($s2) -/* 9ABB00 80243710 AE600070 */ sw $zero, 0x70($s3) -.L80243714: -/* 9ABB04 80243714 2402FFFD */ addiu $v0, $zero, -3 -/* 9ABB08 80243718 A2A200AB */ sb $v0, 0xab($s5) -/* 9ABB0C 8024371C 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9ABB10 80243720 30620004 */ andi $v0, $v1, 4 -/* 9ABB14 80243724 10400007 */ beqz $v0, .L80243744 -/* 9ABB18 80243728 00000000 */ nop -/* 9ABB1C 8024372C 824200B4 */ lb $v0, 0xb4($s2) -/* 9ABB20 80243730 14400052 */ bnez $v0, .L8024387C -/* 9ABB24 80243734 0000102D */ daddu $v0, $zero, $zero -/* 9ABB28 80243738 2402FFFB */ addiu $v0, $zero, -5 -/* 9ABB2C 8024373C 00621024 */ and $v0, $v1, $v0 -/* 9ABB30 80243740 AE4200B0 */ sw $v0, 0xb0($s2) -.L80243744: -/* 9ABB34 80243744 8E630070 */ lw $v1, 0x70($s3) -/* 9ABB38 80243748 2C620010 */ sltiu $v0, $v1, 0x10 -/* 9ABB3C 8024374C 1040004A */ beqz $v0, .L80243878 -/* 9ABB40 80243750 00031080 */ sll $v0, $v1, 2 -/* 9ABB44 80243754 3C018024 */ lui $at, 0x8024 -/* 9ABB48 80243758 00220821 */ addu $at, $at, $v0 -/* 9ABB4C 8024375C 8C2262C8 */ lw $v0, 0x62c8($at) -/* 9ABB50 80243760 00400008 */ jr $v0 -/* 9ABB54 80243764 00000000 */ nop -/* 9ABB58 80243768 0260202D */ daddu $a0, $s3, $zero -/* 9ABB5C 8024376C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB60 80243770 0C090786 */ jal func_80241E18 -/* 9ABB64 80243774 0280302D */ daddu $a2, $s4, $zero -/* 9ABB68 80243778 0260202D */ daddu $a0, $s3, $zero -/* 9ABB6C 8024377C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB70 80243780 0C0907F2 */ jal func_80241FC8 -/* 9ABB74 80243784 0280302D */ daddu $a2, $s4, $zero -/* 9ABB78 80243788 8E630070 */ lw $v1, 0x70($s3) -/* 9ABB7C 8024378C 24020002 */ addiu $v0, $zero, 2 -/* 9ABB80 80243790 1462003A */ bne $v1, $v0, .L8024387C -/* 9ABB84 80243794 0000102D */ daddu $v0, $zero, $zero -/* 9ABB88 80243798 0260202D */ daddu $a0, $s3, $zero -/* 9ABB8C 8024379C 0200282D */ daddu $a1, $s0, $zero -/* 9ABB90 802437A0 0C09097C */ jal func_802425F0 -/* 9ABB94 802437A4 0280302D */ daddu $a2, $s4, $zero -/* 9ABB98 802437A8 0260202D */ daddu $a0, $s3, $zero -/* 9ABB9C 802437AC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBA0 802437B0 0C0909AC */ jal func_802426B0 -/* 9ABBA4 802437B4 0280302D */ daddu $a2, $s4, $zero -/* 9ABBA8 802437B8 8E630070 */ lw $v1, 0x70($s3) -/* 9ABBAC 802437BC 2402000A */ addiu $v0, $zero, 0xa -/* 9ABBB0 802437C0 1462002E */ bne $v1, $v0, .L8024387C -/* 9ABBB4 802437C4 0000102D */ daddu $v0, $zero, $zero -/* 9ABBB8 802437C8 0260202D */ daddu $a0, $s3, $zero -/* 9ABBBC 802437CC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBC0 802437D0 0C090A7D */ jal func_802429F4 -/* 9ABBC4 802437D4 0280302D */ daddu $a2, $s4, $zero -/* 9ABBC8 802437D8 8E630070 */ lw $v1, 0x70($s3) -/* 9ABBCC 802437DC 2402000B */ addiu $v0, $zero, 0xb -/* 9ABBD0 802437E0 14620026 */ bne $v1, $v0, .L8024387C -/* 9ABBD4 802437E4 0000102D */ daddu $v0, $zero, $zero -/* 9ABBD8 802437E8 0260202D */ daddu $a0, $s3, $zero -/* 9ABBDC 802437EC 0200282D */ daddu $a1, $s0, $zero -/* 9ABBE0 802437F0 0C090A9B */ jal func_80242A6C -/* 9ABBE4 802437F4 0280302D */ daddu $a2, $s4, $zero -/* 9ABBE8 802437F8 8E630070 */ lw $v1, 0x70($s3) -/* 9ABBEC 802437FC 2402000C */ addiu $v0, $zero, 0xc -/* 9ABBF0 80243800 1462001E */ bne $v1, $v0, .L8024387C -/* 9ABBF4 80243804 0000102D */ daddu $v0, $zero, $zero -/* 9ABBF8 80243808 0260202D */ daddu $a0, $s3, $zero -/* 9ABBFC 8024380C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC00 80243810 0C090CC4 */ jal func_80243310 -/* 9ABC04 80243814 0280302D */ daddu $a2, $s4, $zero -/* 9ABC08 80243818 8E630070 */ lw $v1, 0x70($s3) -/* 9ABC0C 8024381C 2402000D */ addiu $v0, $zero, 0xd -/* 9ABC10 80243820 14620016 */ bne $v1, $v0, .L8024387C -/* 9ABC14 80243824 0000102D */ daddu $v0, $zero, $zero -/* 9ABC18 80243828 0260202D */ daddu $a0, $s3, $zero -/* 9ABC1C 8024382C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC20 80243830 0C090D0E */ jal func_80243438 -/* 9ABC24 80243834 0280302D */ daddu $a2, $s4, $zero -/* 9ABC28 80243838 8E630070 */ lw $v1, 0x70($s3) -/* 9ABC2C 8024383C 2402000E */ addiu $v0, $zero, 0xe -/* 9ABC30 80243840 1462000E */ bne $v1, $v0, .L8024387C -/* 9ABC34 80243844 0000102D */ daddu $v0, $zero, $zero -/* 9ABC38 80243848 0260202D */ daddu $a0, $s3, $zero -/* 9ABC3C 8024384C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC40 80243850 0C090D3D */ jal func_802434F4 -/* 9ABC44 80243854 0280302D */ daddu $a2, $s4, $zero -/* 9ABC48 80243858 8E630070 */ lw $v1, 0x70($s3) -/* 9ABC4C 8024385C 2402000F */ addiu $v0, $zero, 0xf -/* 9ABC50 80243860 14620006 */ bne $v1, $v0, .L8024387C -/* 9ABC54 80243864 0000102D */ daddu $v0, $zero, $zero -/* 9ABC58 80243868 0260202D */ daddu $a0, $s3, $zero -/* 9ABC5C 8024386C 0200282D */ daddu $a1, $s0, $zero -/* 9ABC60 80243870 0C090D83 */ jal func_8024360C -/* 9ABC64 80243874 0280302D */ daddu $a2, $s4, $zero -.L80243878: -/* 9ABC68 80243878 0000102D */ daddu $v0, $zero, $zero -.L8024387C: -/* 9ABC6C 8024387C 8FBF0048 */ lw $ra, 0x48($sp) -/* 9ABC70 80243880 8FB50044 */ lw $s5, 0x44($sp) -/* 9ABC74 80243884 8FB40040 */ lw $s4, 0x40($sp) -/* 9ABC78 80243888 8FB3003C */ lw $s3, 0x3c($sp) -/* 9ABC7C 8024388C 8FB20038 */ lw $s2, 0x38($sp) -/* 9ABC80 80243890 8FB10034 */ lw $s1, 0x34($sp) -/* 9ABC84 80243894 8FB00030 */ lw $s0, 0x30($sp) -/* 9ABC88 80243898 03E00008 */ jr $ra -/* 9ABC8C 8024389C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s new file mode 100644 index 0000000000..5741e71c26 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_04/9A88A0/func_80243650_9ABA40.s @@ -0,0 +1,156 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80243650_9ABA40 +/* 9ABA40 80243650 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 9ABA44 80243654 AFB3003C */ sw $s3, 0x3c($sp) +/* 9ABA48 80243658 0080982D */ daddu $s3, $a0, $zero +/* 9ABA4C 8024365C AFBF0048 */ sw $ra, 0x48($sp) +/* 9ABA50 80243660 AFB50044 */ sw $s5, 0x44($sp) +/* 9ABA54 80243664 AFB40040 */ sw $s4, 0x40($sp) +/* 9ABA58 80243668 AFB20038 */ sw $s2, 0x38($sp) +/* 9ABA5C 8024366C AFB10034 */ sw $s1, 0x34($sp) +/* 9ABA60 80243670 AFB00030 */ sw $s0, 0x30($sp) +/* 9ABA64 80243674 8E720148 */ lw $s2, 0x148($s3) +/* 9ABA68 80243678 86440008 */ lh $a0, 8($s2) +/* 9ABA6C 8024367C 8E70000C */ lw $s0, 0xc($s3) +/* 9ABA70 80243680 0C00EABB */ jal get_npc_unsafe +/* 9ABA74 80243684 00A0882D */ daddu $s1, $a1, $zero +/* 9ABA78 80243688 0260202D */ daddu $a0, $s3, $zero +/* 9ABA7C 8024368C 8E050000 */ lw $a1, ($s0) +/* 9ABA80 80243690 0C0B1EAF */ jal get_variable +/* 9ABA84 80243694 0040A82D */ daddu $s5, $v0, $zero +/* 9ABA88 80243698 AFA00010 */ sw $zero, 0x10($sp) +/* 9ABA8C 8024369C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9ABA90 802436A0 8C630030 */ lw $v1, 0x30($v1) +/* 9ABA94 802436A4 AFA30014 */ sw $v1, 0x14($sp) +/* 9ABA98 802436A8 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9ABA9C 802436AC 8C63001C */ lw $v1, 0x1c($v1) +/* 9ABAA0 802436B0 AFA30018 */ sw $v1, 0x18($sp) +/* 9ABAA4 802436B4 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9ABAA8 802436B8 8C630024 */ lw $v1, 0x24($v1) +/* 9ABAAC 802436BC AFA3001C */ sw $v1, 0x1c($sp) +/* 9ABAB0 802436C0 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9ABAB4 802436C4 8C630028 */ lw $v1, 0x28($v1) +/* 9ABAB8 802436C8 27B40010 */ addiu $s4, $sp, 0x10 +/* 9ABABC 802436CC AFA30020 */ sw $v1, 0x20($sp) +/* 9ABAC0 802436D0 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9ABAC4 802436D4 3C0142F0 */ lui $at, 0x42f0 +/* 9ABAC8 802436D8 44810000 */ mtc1 $at, $f0 +/* 9ABACC 802436DC 8C63002C */ lw $v1, 0x2c($v1) +/* 9ABAD0 802436E0 0040802D */ daddu $s0, $v0, $zero +/* 9ABAD4 802436E4 E7A00028 */ swc1 $f0, 0x28($sp) +/* 9ABAD8 802436E8 A7A0002C */ sh $zero, 0x2c($sp) +/* 9ABADC 802436EC 12200009 */ beqz $s1, .L80243714 +/* 9ABAE0 802436F0 AFA30024 */ sw $v1, 0x24($sp) +/* 9ABAE4 802436F4 02A0202D */ daddu $a0, $s5, $zero +/* 9ABAE8 802436F8 0240282D */ daddu $a1, $s2, $zero +/* 9ABAEC 802436FC 0260302D */ daddu $a2, $s3, $zero +/* 9ABAF0 80243700 0C090C00 */ jal func_80243000_9AB3F0 +/* 9ABAF4 80243704 0200382D */ daddu $a3, $s0, $zero +/* 9ABAF8 80243708 86A200A8 */ lh $v0, 0xa8($s5) +/* 9ABAFC 8024370C AE42008C */ sw $v0, 0x8c($s2) +/* 9ABB00 80243710 AE600070 */ sw $zero, 0x70($s3) +.L80243714: +/* 9ABB04 80243714 2402FFFD */ addiu $v0, $zero, -3 +/* 9ABB08 80243718 A2A200AB */ sb $v0, 0xab($s5) +/* 9ABB0C 8024371C 8E4300B0 */ lw $v1, 0xb0($s2) +/* 9ABB10 80243720 30620004 */ andi $v0, $v1, 4 +/* 9ABB14 80243724 10400007 */ beqz $v0, .L80243744 +/* 9ABB18 80243728 00000000 */ nop +/* 9ABB1C 8024372C 824200B4 */ lb $v0, 0xb4($s2) +/* 9ABB20 80243730 14400052 */ bnez $v0, .L8024387C +/* 9ABB24 80243734 0000102D */ daddu $v0, $zero, $zero +/* 9ABB28 80243738 2402FFFB */ addiu $v0, $zero, -5 +/* 9ABB2C 8024373C 00621024 */ and $v0, $v1, $v0 +/* 9ABB30 80243740 AE4200B0 */ sw $v0, 0xb0($s2) +.L80243744: +/* 9ABB34 80243744 8E630070 */ lw $v1, 0x70($s3) +/* 9ABB38 80243748 2C620010 */ sltiu $v0, $v1, 0x10 +/* 9ABB3C 8024374C 1040004A */ beqz $v0, .L80243878 +/* 9ABB40 80243750 00031080 */ sll $v0, $v1, 2 +/* 9ABB44 80243754 3C018024 */ lui $at, 0x8024 +/* 9ABB48 80243758 00220821 */ addu $at, $at, $v0 +/* 9ABB4C 8024375C 8C2262C8 */ lw $v0, 0x62c8($at) +/* 9ABB50 80243760 00400008 */ jr $v0 +/* 9ABB54 80243764 00000000 */ nop +/* 9ABB58 80243768 0260202D */ daddu $a0, $s3, $zero +/* 9ABB5C 8024376C 0200282D */ daddu $a1, $s0, $zero +/* 9ABB60 80243770 0C090786 */ jal func_80241E18_9AA208 +/* 9ABB64 80243774 0280302D */ daddu $a2, $s4, $zero +/* 9ABB68 80243778 0260202D */ daddu $a0, $s3, $zero +/* 9ABB6C 8024377C 0200282D */ daddu $a1, $s0, $zero +/* 9ABB70 80243780 0C0907F2 */ jal func_80241FC8_9AA3B8 +/* 9ABB74 80243784 0280302D */ daddu $a2, $s4, $zero +/* 9ABB78 80243788 8E630070 */ lw $v1, 0x70($s3) +/* 9ABB7C 8024378C 24020002 */ addiu $v0, $zero, 2 +/* 9ABB80 80243790 1462003A */ bne $v1, $v0, .L8024387C +/* 9ABB84 80243794 0000102D */ daddu $v0, $zero, $zero +/* 9ABB88 80243798 0260202D */ daddu $a0, $s3, $zero +/* 9ABB8C 8024379C 0200282D */ daddu $a1, $s0, $zero +/* 9ABB90 802437A0 0C09097C */ jal func_802425F0_9AA9E0 +/* 9ABB94 802437A4 0280302D */ daddu $a2, $s4, $zero +/* 9ABB98 802437A8 0260202D */ daddu $a0, $s3, $zero +/* 9ABB9C 802437AC 0200282D */ daddu $a1, $s0, $zero +/* 9ABBA0 802437B0 0C0909AC */ jal func_802426B0_9AAAA0 +/* 9ABBA4 802437B4 0280302D */ daddu $a2, $s4, $zero +/* 9ABBA8 802437B8 8E630070 */ lw $v1, 0x70($s3) +/* 9ABBAC 802437BC 2402000A */ addiu $v0, $zero, 0xa +/* 9ABBB0 802437C0 1462002E */ bne $v1, $v0, .L8024387C +/* 9ABBB4 802437C4 0000102D */ daddu $v0, $zero, $zero +/* 9ABBB8 802437C8 0260202D */ daddu $a0, $s3, $zero +/* 9ABBBC 802437CC 0200282D */ daddu $a1, $s0, $zero +/* 9ABBC0 802437D0 0C090A7D */ jal func_802429F4_9AADE4 +/* 9ABBC4 802437D4 0280302D */ daddu $a2, $s4, $zero +/* 9ABBC8 802437D8 8E630070 */ lw $v1, 0x70($s3) +/* 9ABBCC 802437DC 2402000B */ addiu $v0, $zero, 0xb +/* 9ABBD0 802437E0 14620026 */ bne $v1, $v0, .L8024387C +/* 9ABBD4 802437E4 0000102D */ daddu $v0, $zero, $zero +/* 9ABBD8 802437E8 0260202D */ daddu $a0, $s3, $zero +/* 9ABBDC 802437EC 0200282D */ daddu $a1, $s0, $zero +/* 9ABBE0 802437F0 0C090A9B */ jal func_80242A6C_9AAE5C +/* 9ABBE4 802437F4 0280302D */ daddu $a2, $s4, $zero +/* 9ABBE8 802437F8 8E630070 */ lw $v1, 0x70($s3) +/* 9ABBEC 802437FC 2402000C */ addiu $v0, $zero, 0xc +/* 9ABBF0 80243800 1462001E */ bne $v1, $v0, .L8024387C +/* 9ABBF4 80243804 0000102D */ daddu $v0, $zero, $zero +/* 9ABBF8 80243808 0260202D */ daddu $a0, $s3, $zero +/* 9ABBFC 8024380C 0200282D */ daddu $a1, $s0, $zero +/* 9ABC00 80243810 0C090CC4 */ jal func_80243310_9AB700 +/* 9ABC04 80243814 0280302D */ daddu $a2, $s4, $zero +/* 9ABC08 80243818 8E630070 */ lw $v1, 0x70($s3) +/* 9ABC0C 8024381C 2402000D */ addiu $v0, $zero, 0xd +/* 9ABC10 80243820 14620016 */ bne $v1, $v0, .L8024387C +/* 9ABC14 80243824 0000102D */ daddu $v0, $zero, $zero +/* 9ABC18 80243828 0260202D */ daddu $a0, $s3, $zero +/* 9ABC1C 8024382C 0200282D */ daddu $a1, $s0, $zero +/* 9ABC20 80243830 0C090D0E */ jal func_80243438_9AB828 +/* 9ABC24 80243834 0280302D */ daddu $a2, $s4, $zero +/* 9ABC28 80243838 8E630070 */ lw $v1, 0x70($s3) +/* 9ABC2C 8024383C 2402000E */ addiu $v0, $zero, 0xe +/* 9ABC30 80243840 1462000E */ bne $v1, $v0, .L8024387C +/* 9ABC34 80243844 0000102D */ daddu $v0, $zero, $zero +/* 9ABC38 80243848 0260202D */ daddu $a0, $s3, $zero +/* 9ABC3C 8024384C 0200282D */ daddu $a1, $s0, $zero +/* 9ABC40 80243850 0C090D3D */ jal func_802434F4_9AB8E4 +/* 9ABC44 80243854 0280302D */ daddu $a2, $s4, $zero +/* 9ABC48 80243858 8E630070 */ lw $v1, 0x70($s3) +/* 9ABC4C 8024385C 2402000F */ addiu $v0, $zero, 0xf +/* 9ABC50 80243860 14620006 */ bne $v1, $v0, .L8024387C +/* 9ABC54 80243864 0000102D */ daddu $v0, $zero, $zero +/* 9ABC58 80243868 0260202D */ daddu $a0, $s3, $zero +/* 9ABC5C 8024386C 0200282D */ daddu $a1, $s0, $zero +/* 9ABC60 80243870 0C090D83 */ jal func_8024360C_9AB9FC +/* 9ABC64 80243874 0280302D */ daddu $a2, $s4, $zero +.L80243878: +/* 9ABC68 80243878 0000102D */ daddu $v0, $zero, $zero +.L8024387C: +/* 9ABC6C 8024387C 8FBF0048 */ lw $ra, 0x48($sp) +/* 9ABC70 80243880 8FB50044 */ lw $s5, 0x44($sp) +/* 9ABC74 80243884 8FB40040 */ lw $s4, 0x40($sp) +/* 9ABC78 80243888 8FB3003C */ lw $s3, 0x3c($sp) +/* 9ABC7C 8024388C 8FB20038 */ lw $s2, 0x38($sp) +/* 9ABC80 80243890 8FB10034 */ lw $s1, 0x34($sp) +/* 9ABC84 80243894 8FB00030 */ lw $s0, 0x30($sp) +/* 9ABC88 80243898 03E00008 */ jr $ra +/* 9ABC8C 8024389C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508.s deleted file mode 100644 index 0806ddb9b3..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240508 -/* 9AEC08 80240508 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9AEC0C 8024050C AFB10014 */ sw $s1, 0x14($sp) -/* 9AEC10 80240510 0080882D */ daddu $s1, $a0, $zero -/* 9AEC14 80240514 AFBF001C */ sw $ra, 0x1c($sp) -/* 9AEC18 80240518 AFB20018 */ sw $s2, 0x18($sp) -/* 9AEC1C 8024051C AFB00010 */ sw $s0, 0x10($sp) -/* 9AEC20 80240520 8E30000C */ lw $s0, 0xc($s1) -/* 9AEC24 80240524 8E050000 */ lw $a1, ($s0) -/* 9AEC28 80240528 0C0B210B */ jal get_float_variable -/* 9AEC2C 8024052C 26100004 */ addiu $s0, $s0, 4 -/* 9AEC30 80240530 8E050000 */ lw $a1, ($s0) -/* 9AEC34 80240534 26100004 */ addiu $s0, $s0, 4 -/* 9AEC38 80240538 4600018D */ trunc.w.s $f6, $f0 -/* 9AEC3C 8024053C 44123000 */ mfc1 $s2, $f6 -/* 9AEC40 80240540 0C0B210B */ jal get_float_variable -/* 9AEC44 80240544 0220202D */ daddu $a0, $s1, $zero -/* 9AEC48 80240548 8E050000 */ lw $a1, ($s0) -/* 9AEC4C 8024054C 4600018D */ trunc.w.s $f6, $f0 -/* 9AEC50 80240550 44103000 */ mfc1 $s0, $f6 -/* 9AEC54 80240554 0C0B210B */ jal get_float_variable -/* 9AEC58 80240558 0220202D */ daddu $a0, $s1, $zero -/* 9AEC5C 8024055C 3C028011 */ lui $v0, 0x8011 -/* 9AEC60 80240560 8442F078 */ lh $v0, -0xf88($v0) -/* 9AEC64 80240564 3C018024 */ lui $at, 0x8024 -/* 9AEC68 80240568 D4223078 */ ldc1 $f2, 0x3078($at) -/* 9AEC6C 8024056C 44822000 */ mtc1 $v0, $f4 -/* 9AEC70 80240570 00000000 */ nop -/* 9AEC74 80240574 46802121 */ cvt.d.w $f4, $f4 -/* 9AEC78 80240578 46222102 */ mul.d $f4, $f4, $f2 -/* 9AEC7C 8024057C 00000000 */ nop -/* 9AEC80 80240580 3C013FE0 */ lui $at, 0x3fe0 -/* 9AEC84 80240584 44811800 */ mtc1 $at, $f3 -/* 9AEC88 80240588 44801000 */ mtc1 $zero, $f2 -/* 9AEC8C 8024058C 00000000 */ nop -/* 9AEC90 80240590 46222102 */ mul.d $f4, $f4, $f2 -/* 9AEC94 80240594 00000000 */ nop -/* 9AEC98 80240598 4600018D */ trunc.w.s $f6, $f0 -/* 9AEC9C 8024059C 44033000 */ mfc1 $v1, $f6 -/* 9AECA0 802405A0 44900000 */ mtc1 $s0, $f0 -/* 9AECA4 802405A4 00000000 */ nop -/* 9AECA8 802405A8 46800021 */ cvt.d.w $f0, $f0 -/* 9AECAC 802405AC 3C028024 */ lui $v0, 0x8024 -/* 9AECB0 802405B0 24423090 */ addiu $v0, $v0, 0x3090 -/* 9AECB4 802405B4 44921000 */ mtc1 $s2, $f2 -/* 9AECB8 802405B8 00000000 */ nop -/* 9AECBC 802405BC 468010A0 */ cvt.s.w $f2, $f2 -/* 9AECC0 802405C0 E4420010 */ swc1 $f2, 0x10($v0) -/* 9AECC4 802405C4 46240000 */ add.d $f0, $f0, $f4 -/* 9AECC8 802405C8 44831000 */ mtc1 $v1, $f2 -/* 9AECCC 802405CC 00000000 */ nop -/* 9AECD0 802405D0 468010A0 */ cvt.s.w $f2, $f2 -/* 9AECD4 802405D4 E4420018 */ swc1 $f2, 0x18($v0) -/* 9AECD8 802405D8 46200020 */ cvt.s.d $f0, $f0 -/* 9AECDC 802405DC E4400014 */ swc1 $f0, 0x14($v0) -/* 9AECE0 802405E0 8FBF001C */ lw $ra, 0x1c($sp) -/* 9AECE4 802405E4 8FB20018 */ lw $s2, 0x18($sp) -/* 9AECE8 802405E8 8FB10014 */ lw $s1, 0x14($sp) -/* 9AECEC 802405EC 8FB00010 */ lw $s0, 0x10($sp) -/* 9AECF0 802405F0 24020002 */ addiu $v0, $zero, 2 -/* 9AECF4 802405F4 03E00008 */ jr $ra -/* 9AECF8 802405F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s new file mode 100644 index 0000000000..fe2a36ff96 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240508_9AEC08 +/* 9AEC08 80240508 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9AEC0C 8024050C AFB10014 */ sw $s1, 0x14($sp) +/* 9AEC10 80240510 0080882D */ daddu $s1, $a0, $zero +/* 9AEC14 80240514 AFBF001C */ sw $ra, 0x1c($sp) +/* 9AEC18 80240518 AFB20018 */ sw $s2, 0x18($sp) +/* 9AEC1C 8024051C AFB00010 */ sw $s0, 0x10($sp) +/* 9AEC20 80240520 8E30000C */ lw $s0, 0xc($s1) +/* 9AEC24 80240524 8E050000 */ lw $a1, ($s0) +/* 9AEC28 80240528 0C0B210B */ jal get_float_variable +/* 9AEC2C 8024052C 26100004 */ addiu $s0, $s0, 4 +/* 9AEC30 80240530 8E050000 */ lw $a1, ($s0) +/* 9AEC34 80240534 26100004 */ addiu $s0, $s0, 4 +/* 9AEC38 80240538 4600018D */ trunc.w.s $f6, $f0 +/* 9AEC3C 8024053C 44123000 */ mfc1 $s2, $f6 +/* 9AEC40 80240540 0C0B210B */ jal get_float_variable +/* 9AEC44 80240544 0220202D */ daddu $a0, $s1, $zero +/* 9AEC48 80240548 8E050000 */ lw $a1, ($s0) +/* 9AEC4C 8024054C 4600018D */ trunc.w.s $f6, $f0 +/* 9AEC50 80240550 44103000 */ mfc1 $s0, $f6 +/* 9AEC54 80240554 0C0B210B */ jal get_float_variable +/* 9AEC58 80240558 0220202D */ daddu $a0, $s1, $zero +/* 9AEC5C 8024055C 3C028011 */ lui $v0, 0x8011 +/* 9AEC60 80240560 8442F078 */ lh $v0, -0xf88($v0) +/* 9AEC64 80240564 3C018024 */ lui $at, 0x8024 +/* 9AEC68 80240568 D4223078 */ ldc1 $f2, 0x3078($at) +/* 9AEC6C 8024056C 44822000 */ mtc1 $v0, $f4 +/* 9AEC70 80240570 00000000 */ nop +/* 9AEC74 80240574 46802121 */ cvt.d.w $f4, $f4 +/* 9AEC78 80240578 46222102 */ mul.d $f4, $f4, $f2 +/* 9AEC7C 8024057C 00000000 */ nop +/* 9AEC80 80240580 3C013FE0 */ lui $at, 0x3fe0 +/* 9AEC84 80240584 44811800 */ mtc1 $at, $f3 +/* 9AEC88 80240588 44801000 */ mtc1 $zero, $f2 +/* 9AEC8C 8024058C 00000000 */ nop +/* 9AEC90 80240590 46222102 */ mul.d $f4, $f4, $f2 +/* 9AEC94 80240594 00000000 */ nop +/* 9AEC98 80240598 4600018D */ trunc.w.s $f6, $f0 +/* 9AEC9C 8024059C 44033000 */ mfc1 $v1, $f6 +/* 9AECA0 802405A0 44900000 */ mtc1 $s0, $f0 +/* 9AECA4 802405A4 00000000 */ nop +/* 9AECA8 802405A8 46800021 */ cvt.d.w $f0, $f0 +/* 9AECAC 802405AC 3C028024 */ lui $v0, 0x8024 +/* 9AECB0 802405B0 24423090 */ addiu $v0, $v0, 0x3090 +/* 9AECB4 802405B4 44921000 */ mtc1 $s2, $f2 +/* 9AECB8 802405B8 00000000 */ nop +/* 9AECBC 802405BC 468010A0 */ cvt.s.w $f2, $f2 +/* 9AECC0 802405C0 E4420010 */ swc1 $f2, 0x10($v0) +/* 9AECC4 802405C4 46240000 */ add.d $f0, $f0, $f4 +/* 9AECC8 802405C8 44831000 */ mtc1 $v1, $f2 +/* 9AECCC 802405CC 00000000 */ nop +/* 9AECD0 802405D0 468010A0 */ cvt.s.w $f2, $f2 +/* 9AECD4 802405D4 E4420018 */ swc1 $f2, 0x18($v0) +/* 9AECD8 802405D8 46200020 */ cvt.s.d $f0, $f0 +/* 9AECDC 802405DC E4400014 */ swc1 $f0, 0x14($v0) +/* 9AECE0 802405E0 8FBF001C */ lw $ra, 0x1c($sp) +/* 9AECE4 802405E4 8FB20018 */ lw $s2, 0x18($sp) +/* 9AECE8 802405E8 8FB10014 */ lw $s1, 0x14($sp) +/* 9AECEC 802405EC 8FB00010 */ lw $s0, 0x10($sp) +/* 9AECF0 802405F0 24020002 */ addiu $v0, $zero, 2 +/* 9AECF4 802405F4 03E00008 */ jr $ra +/* 9AECF8 802405F8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724.s deleted file mode 100644 index 1579371167..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724.s +++ /dev/null @@ -1,66 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240724 -/* 9B1EB4 80240724 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B1EB8 80240728 24040001 */ addiu $a0, $zero, 1 -/* 9B1EBC 8024072C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 9B1EC0 80240730 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 9B1EC4 80240734 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B1EC8 80240738 AFB00010 */ sw $s0, 0x10($sp) -/* 9B1ECC 8024073C 846200B2 */ lh $v0, 0xb2($v1) -/* 9B1ED0 80240740 3C018024 */ lui $at, 0x8024 -/* 9B1ED4 80240744 D42051C0 */ ldc1 $f0, 0x51c0($at) -/* 9B1ED8 80240748 3C013F36 */ lui $at, 0x3f36 -/* 9B1EDC 8024074C 3421DB6E */ ori $at, $at, 0xdb6e -/* 9B1EE0 80240750 44813000 */ mtc1 $at, $f6 -/* 9B1EE4 80240754 3C108024 */ lui $s0, 0x8024 -/* 9B1EE8 80240758 261051F0 */ addiu $s0, $s0, 0x51f0 -/* 9B1EEC 8024075C AE000000 */ sw $zero, ($s0) -/* 9B1EF0 80240760 AE000010 */ sw $zero, 0x10($s0) -/* 9B1EF4 80240764 AE000020 */ sw $zero, 0x20($s0) -/* 9B1EF8 80240768 AE000024 */ sw $zero, 0x24($s0) -/* 9B1EFC 8024076C 44826000 */ mtc1 $v0, $f12 -/* 9B1F00 80240770 00000000 */ nop -/* 9B1F04 80240774 46806320 */ cvt.s.w $f12, $f12 -/* 9B1F08 80240778 46006121 */ cvt.d.s $f4, $f12 -/* 9B1F0C 8024077C 46202102 */ mul.d $f4, $f4, $f0 -/* 9B1F10 80240780 00000000 */ nop -/* 9B1F14 80240784 AE000028 */ sw $zero, 0x28($s0) -/* 9B1F18 80240788 3C013FE0 */ lui $at, 0x3fe0 -/* 9B1F1C 8024078C 44810800 */ mtc1 $at, $f1 -/* 9B1F20 80240790 44800000 */ mtc1 $zero, $f0 -/* 9B1F24 80240794 0080102D */ daddu $v0, $a0, $zero -/* 9B1F28 80240798 AE02000C */ sw $v0, 0xc($s0) -/* 9B1F2C 8024079C 846200B0 */ lh $v0, 0xb0($v1) -/* 9B1F30 802407A0 C46A0028 */ lwc1 $f10, 0x28($v1) -/* 9B1F34 802407A4 C4680030 */ lwc1 $f8, 0x30($v1) -/* 9B1F38 802407A8 46202102 */ mul.d $f4, $f4, $f0 -/* 9B1F3C 802407AC 00000000 */ nop -/* 9B1F40 802407B0 C460002C */ lwc1 $f0, 0x2c($v1) -/* 9B1F44 802407B4 44821000 */ mtc1 $v0, $f2 -/* 9B1F48 802407B8 00000000 */ nop -/* 9B1F4C 802407BC 468010A0 */ cvt.s.w $f2, $f2 -/* 9B1F50 802407C0 E6020038 */ swc1 $f2, 0x38($s0) -/* 9B1F54 802407C4 E60C003C */ swc1 $f12, 0x3c($s0) -/* 9B1F58 802407C8 E60A0014 */ swc1 $f10, 0x14($s0) -/* 9B1F5C 802407CC E608001C */ swc1 $f8, 0x1c($s0) -/* 9B1F60 802407D0 E606002C */ swc1 $f6, 0x2c($s0) -/* 9B1F64 802407D4 46000021 */ cvt.d.s $f0, $f0 -/* 9B1F68 802407D8 46240000 */ add.d $f0, $f0, $f4 -/* 9B1F6C 802407DC E6060030 */ swc1 $f6, 0x30($s0) -/* 9B1F70 802407E0 E6060034 */ swc1 $f6, 0x34($s0) -/* 9B1F74 802407E4 46200020 */ cvt.s.d $f0, $f0 -/* 9B1F78 802407E8 0C04E9C1 */ jal func_8013A704 -/* 9B1F7C 802407EC E6000018 */ swc1 $f0, 0x18($s0) -/* 9B1F80 802407F0 0000202D */ daddu $a0, $zero, $zero -/* 9B1F84 802407F4 3C058024 */ lui $a1, 0x8024 -/* 9B1F88 802407F8 24A50310 */ addiu $a1, $a1, 0x310 -/* 9B1F8C 802407FC 0C048C56 */ jal bind_dynamic_entity_3 -/* 9B1F90 80240800 AE020004 */ sw $v0, 4($s0) -/* 9B1F94 80240804 AE020008 */ sw $v0, 8($s0) -/* 9B1F98 80240808 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B1F9C 8024080C 8FB00010 */ lw $s0, 0x10($sp) -/* 9B1FA0 80240810 24020002 */ addiu $v0, $zero, 2 -/* 9B1FA4 80240814 03E00008 */ jr $ra -/* 9B1FA8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s new file mode 100644 index 0000000000..ed2b687824 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_06/9B1AA0/func_80240724_9B1EB4.s @@ -0,0 +1,66 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240724_9B1EB4 +/* 9B1EB4 80240724 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9B1EB8 80240728 24040001 */ addiu $a0, $zero, 1 +/* 9B1EBC 8024072C 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* 9B1EC0 80240730 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* 9B1EC4 80240734 AFBF0014 */ sw $ra, 0x14($sp) +/* 9B1EC8 80240738 AFB00010 */ sw $s0, 0x10($sp) +/* 9B1ECC 8024073C 846200B2 */ lh $v0, 0xb2($v1) +/* 9B1ED0 80240740 3C018024 */ lui $at, 0x8024 +/* 9B1ED4 80240744 D42051C0 */ ldc1 $f0, 0x51c0($at) +/* 9B1ED8 80240748 3C013F36 */ lui $at, 0x3f36 +/* 9B1EDC 8024074C 3421DB6E */ ori $at, $at, 0xdb6e +/* 9B1EE0 80240750 44813000 */ mtc1 $at, $f6 +/* 9B1EE4 80240754 3C108024 */ lui $s0, 0x8024 +/* 9B1EE8 80240758 261051F0 */ addiu $s0, $s0, 0x51f0 +/* 9B1EEC 8024075C AE000000 */ sw $zero, ($s0) +/* 9B1EF0 80240760 AE000010 */ sw $zero, 0x10($s0) +/* 9B1EF4 80240764 AE000020 */ sw $zero, 0x20($s0) +/* 9B1EF8 80240768 AE000024 */ sw $zero, 0x24($s0) +/* 9B1EFC 8024076C 44826000 */ mtc1 $v0, $f12 +/* 9B1F00 80240770 00000000 */ nop +/* 9B1F04 80240774 46806320 */ cvt.s.w $f12, $f12 +/* 9B1F08 80240778 46006121 */ cvt.d.s $f4, $f12 +/* 9B1F0C 8024077C 46202102 */ mul.d $f4, $f4, $f0 +/* 9B1F10 80240780 00000000 */ nop +/* 9B1F14 80240784 AE000028 */ sw $zero, 0x28($s0) +/* 9B1F18 80240788 3C013FE0 */ lui $at, 0x3fe0 +/* 9B1F1C 8024078C 44810800 */ mtc1 $at, $f1 +/* 9B1F20 80240790 44800000 */ mtc1 $zero, $f0 +/* 9B1F24 80240794 0080102D */ daddu $v0, $a0, $zero +/* 9B1F28 80240798 AE02000C */ sw $v0, 0xc($s0) +/* 9B1F2C 8024079C 846200B0 */ lh $v0, 0xb0($v1) +/* 9B1F30 802407A0 C46A0028 */ lwc1 $f10, 0x28($v1) +/* 9B1F34 802407A4 C4680030 */ lwc1 $f8, 0x30($v1) +/* 9B1F38 802407A8 46202102 */ mul.d $f4, $f4, $f0 +/* 9B1F3C 802407AC 00000000 */ nop +/* 9B1F40 802407B0 C460002C */ lwc1 $f0, 0x2c($v1) +/* 9B1F44 802407B4 44821000 */ mtc1 $v0, $f2 +/* 9B1F48 802407B8 00000000 */ nop +/* 9B1F4C 802407BC 468010A0 */ cvt.s.w $f2, $f2 +/* 9B1F50 802407C0 E6020038 */ swc1 $f2, 0x38($s0) +/* 9B1F54 802407C4 E60C003C */ swc1 $f12, 0x3c($s0) +/* 9B1F58 802407C8 E60A0014 */ swc1 $f10, 0x14($s0) +/* 9B1F5C 802407CC E608001C */ swc1 $f8, 0x1c($s0) +/* 9B1F60 802407D0 E606002C */ swc1 $f6, 0x2c($s0) +/* 9B1F64 802407D4 46000021 */ cvt.d.s $f0, $f0 +/* 9B1F68 802407D8 46240000 */ add.d $f0, $f0, $f4 +/* 9B1F6C 802407DC E6060030 */ swc1 $f6, 0x30($s0) +/* 9B1F70 802407E0 E6060034 */ swc1 $f6, 0x34($s0) +/* 9B1F74 802407E4 46200020 */ cvt.s.d $f0, $f0 +/* 9B1F78 802407E8 0C04E9C1 */ jal func_8013A704 +/* 9B1F7C 802407EC E6000018 */ swc1 $f0, 0x18($s0) +/* 9B1F80 802407F0 0000202D */ daddu $a0, $zero, $zero +/* 9B1F84 802407F4 3C058024 */ lui $a1, 0x8024 +/* 9B1F88 802407F8 24A50310 */ addiu $a1, $a1, 0x310 +/* 9B1F8C 802407FC 0C048C56 */ jal bind_dynamic_entity_3 +/* 9B1F90 80240800 AE020004 */ sw $v0, 4($s0) +/* 9B1F94 80240804 AE020008 */ sw $v0, 8($s0) +/* 9B1F98 80240808 8FBF0014 */ lw $ra, 0x14($sp) +/* 9B1F9C 8024080C 8FB00010 */ lw $s0, 0x10($sp) +/* 9B1FA0 80240810 24020002 */ addiu $v0, $zero, 2 +/* 9B1FA4 80240814 03E00008 */ jr $ra +/* 9B1FA8 80240818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0.s b/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0.s deleted file mode 100644 index a967aed2b4..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0.s +++ /dev/null @@ -1,112 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AF0 -/* 9B2280 80240AF0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B2284 80240AF4 AFB20018 */ sw $s2, 0x18($sp) -/* 9B2288 80240AF8 0080902D */ daddu $s2, $a0, $zero -/* 9B228C 80240AFC AFB10014 */ sw $s1, 0x14($sp) -/* 9B2290 80240B00 00A0882D */ daddu $s1, $a1, $zero -/* 9B2294 80240B04 AFBF0024 */ sw $ra, 0x24($sp) -/* 9B2298 80240B08 AFB40020 */ sw $s4, 0x20($sp) -/* 9B229C 80240B0C AFB3001C */ sw $s3, 0x1c($sp) -/* 9B22A0 80240B10 AFB00010 */ sw $s0, 0x10($sp) -/* 9B22A4 80240B14 8E50000C */ lw $s0, 0xc($s2) -/* 9B22A8 80240B18 8E050000 */ lw $a1, ($s0) -/* 9B22AC 80240B1C 0C0B1EAF */ jal get_variable -/* 9B22B0 80240B20 26100004 */ addiu $s0, $s0, 4 -/* 9B22B4 80240B24 0240202D */ daddu $a0, $s2, $zero -/* 9B22B8 80240B28 8E050000 */ lw $a1, ($s0) -/* 9B22BC 80240B2C 0C0B1EAF */ jal get_variable -/* 9B22C0 80240B30 0040802D */ daddu $s0, $v0, $zero -/* 9B22C4 80240B34 0200202D */ daddu $a0, $s0, $zero -/* 9B22C8 80240B38 0C00EAD2 */ jal get_npc_safe -/* 9B22CC 80240B3C 0040A02D */ daddu $s4, $v0, $zero -/* 9B22D0 80240B40 3C138011 */ lui $s3, %hi(gPlayerData) -/* 9B22D4 80240B44 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) -/* 9B22D8 80240B48 12200006 */ beqz $s1, .L80240B64 -/* 9B22DC 80240B4C 0040802D */ daddu $s0, $v0, $zero -/* 9B22E0 80240B50 82620012 */ lb $v0, 0x12($s3) -/* 9B22E4 80240B54 54400003 */ bnel $v0, $zero, .L80240B64 -/* 9B22E8 80240B58 AE400070 */ sw $zero, 0x70($s2) -/* 9B22EC 80240B5C 24020002 */ addiu $v0, $zero, 2 -/* 9B22F0 80240B60 AE420070 */ sw $v0, 0x70($s2) -.L80240B64: -/* 9B22F4 80240B64 8E430070 */ lw $v1, 0x70($s2) -/* 9B22F8 80240B68 24110001 */ addiu $s1, $zero, 1 -/* 9B22FC 80240B6C 10710013 */ beq $v1, $s1, .L80240BBC -/* 9B2300 80240B70 28620002 */ slti $v0, $v1, 2 -/* 9B2304 80240B74 10400005 */ beqz $v0, .L80240B8C -/* 9B2308 80240B78 24020002 */ addiu $v0, $zero, 2 -/* 9B230C 80240B7C 10600009 */ beqz $v1, .L80240BA4 -/* 9B2310 80240B80 0000102D */ daddu $v0, $zero, $zero -/* 9B2314 80240B84 08090315 */ j .L80240C54 -/* 9B2318 80240B88 00000000 */ nop -.L80240B8C: -/* 9B231C 80240B8C 10620013 */ beq $v1, $v0, .L80240BDC -/* 9B2320 80240B90 24020003 */ addiu $v0, $zero, 3 -/* 9B2324 80240B94 1062001E */ beq $v1, $v0, .L80240C10 -/* 9B2328 80240B98 0000102D */ daddu $v0, $zero, $zero -/* 9B232C 80240B9C 08090315 */ j .L80240C54 -/* 9B2330 80240BA0 00000000 */ nop -.L80240BA4: -/* 9B2334 80240BA4 0C03AC5A */ jal func_800EB168 -/* 9B2338 80240BA8 0000202D */ daddu $a0, $zero, $zero -/* 9B233C 80240BAC 2402001E */ addiu $v0, $zero, 0x1e -/* 9B2340 80240BB0 AE420074 */ sw $v0, 0x74($s2) -/* 9B2344 80240BB4 08090314 */ j .L80240C50 -/* 9B2348 80240BB8 AE510070 */ sw $s1, 0x70($s2) -.L80240BBC: -/* 9B234C 80240BBC 8E420074 */ lw $v0, 0x74($s2) -/* 9B2350 80240BC0 2403FFFF */ addiu $v1, $zero, -1 -/* 9B2354 80240BC4 2442FFFF */ addiu $v0, $v0, -1 -/* 9B2358 80240BC8 14430021 */ bne $v0, $v1, .L80240C50 -/* 9B235C 80240BCC AE420074 */ sw $v0, 0x74($s2) -/* 9B2360 80240BD0 24020002 */ addiu $v0, $zero, 2 -/* 9B2364 80240BD4 08090314 */ j .L80240C50 -/* 9B2368 80240BD8 AE420070 */ sw $v0, 0x70($s2) -.L80240BDC: -/* 9B236C 80240BDC 0200202D */ daddu $a0, $s0, $zero -/* 9B2370 80240BE0 00141600 */ sll $v0, $s4, 0x18 -/* 9B2374 80240BE4 00021543 */ sra $v0, $v0, 0x15 -/* 9B2378 80240BE8 02621021 */ addu $v0, $s3, $v0 -/* 9B237C 80240BEC A2740012 */ sb $s4, 0x12($s3) -/* 9B2380 80240BF0 0C03BD17 */ jal clear_partner_move_history -/* 9B2384 80240BF4 A0510014 */ sb $s1, 0x14($v0) -/* 9B2388 80240BF8 82640012 */ lb $a0, 0x12($s3) -/* 9B238C 80240BFC 0C03ACA9 */ jal func_800EB2A4 -/* 9B2390 80240C00 00000000 */ nop -/* 9B2394 80240C04 24020003 */ addiu $v0, $zero, 3 -/* 9B2398 80240C08 08090314 */ j .L80240C50 -/* 9B239C 80240C0C AE420070 */ sw $v0, 0x70($s2) -.L80240C10: -/* 9B23A0 80240C10 0C00EAD2 */ jal get_npc_safe -/* 9B23A4 80240C14 2404FFFC */ addiu $a0, $zero, -4 -/* 9B23A8 80240C18 8E05000C */ lw $a1, 0xc($s0) -/* 9B23AC 80240C1C 0C00ECD0 */ jal set_npc_yaw -/* 9B23B0 80240C20 0040202D */ daddu $a0, $v0, $zero -/* 9B23B4 80240C24 0200202D */ daddu $a0, $s0, $zero -/* 9B23B8 80240C28 8E020000 */ lw $v0, ($s0) -/* 9B23BC 80240C2C 2403FFFB */ addiu $v1, $zero, -5 -/* 9B23C0 80240C30 00431024 */ and $v0, $v0, $v1 -/* 9B23C4 80240C34 0C00EAFF */ jal disable_npc_shadow -/* 9B23C8 80240C38 AE020000 */ sw $v0, ($s0) -/* 9B23CC 80240C3C 3C01C47A */ lui $at, 0xc47a -/* 9B23D0 80240C40 44810000 */ mtc1 $at, $f0 -/* 9B23D4 80240C44 24020002 */ addiu $v0, $zero, 2 -/* 9B23D8 80240C48 08090315 */ j .L80240C54 -/* 9B23DC 80240C4C E600003C */ swc1 $f0, 0x3c($s0) -.L80240C50: -/* 9B23E0 80240C50 0000102D */ daddu $v0, $zero, $zero -.L80240C54: -/* 9B23E4 80240C54 8FBF0024 */ lw $ra, 0x24($sp) -/* 9B23E8 80240C58 8FB40020 */ lw $s4, 0x20($sp) -/* 9B23EC 80240C5C 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B23F0 80240C60 8FB20018 */ lw $s2, 0x18($sp) -/* 9B23F4 80240C64 8FB10014 */ lw $s1, 0x14($sp) -/* 9B23F8 80240C68 8FB00010 */ lw $s0, 0x10($sp) -/* 9B23FC 80240C6C 03E00008 */ jr $ra -/* 9B2400 80240C70 27BD0028 */ addiu $sp, $sp, 0x28 -/* 9B2404 80240C74 00000000 */ nop -/* 9B2408 80240C78 00000000 */ nop -/* 9B240C 80240C7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s b/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s new file mode 100644 index 0000000000..56643c7af2 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_06/9B2280/func_80240AF0_9B2280.s @@ -0,0 +1,112 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AF0_9B2280 +/* 9B2280 80240AF0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9B2284 80240AF4 AFB20018 */ sw $s2, 0x18($sp) +/* 9B2288 80240AF8 0080902D */ daddu $s2, $a0, $zero +/* 9B228C 80240AFC AFB10014 */ sw $s1, 0x14($sp) +/* 9B2290 80240B00 00A0882D */ daddu $s1, $a1, $zero +/* 9B2294 80240B04 AFBF0024 */ sw $ra, 0x24($sp) +/* 9B2298 80240B08 AFB40020 */ sw $s4, 0x20($sp) +/* 9B229C 80240B0C AFB3001C */ sw $s3, 0x1c($sp) +/* 9B22A0 80240B10 AFB00010 */ sw $s0, 0x10($sp) +/* 9B22A4 80240B14 8E50000C */ lw $s0, 0xc($s2) +/* 9B22A8 80240B18 8E050000 */ lw $a1, ($s0) +/* 9B22AC 80240B1C 0C0B1EAF */ jal get_variable +/* 9B22B0 80240B20 26100004 */ addiu $s0, $s0, 4 +/* 9B22B4 80240B24 0240202D */ daddu $a0, $s2, $zero +/* 9B22B8 80240B28 8E050000 */ lw $a1, ($s0) +/* 9B22BC 80240B2C 0C0B1EAF */ jal get_variable +/* 9B22C0 80240B30 0040802D */ daddu $s0, $v0, $zero +/* 9B22C4 80240B34 0200202D */ daddu $a0, $s0, $zero +/* 9B22C8 80240B38 0C00EAD2 */ jal get_npc_safe +/* 9B22CC 80240B3C 0040A02D */ daddu $s4, $v0, $zero +/* 9B22D0 80240B40 3C138011 */ lui $s3, %hi(gPlayerData) +/* 9B22D4 80240B44 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) +/* 9B22D8 80240B48 12200006 */ beqz $s1, .L80240B64 +/* 9B22DC 80240B4C 0040802D */ daddu $s0, $v0, $zero +/* 9B22E0 80240B50 82620012 */ lb $v0, 0x12($s3) +/* 9B22E4 80240B54 54400003 */ bnel $v0, $zero, .L80240B64 +/* 9B22E8 80240B58 AE400070 */ sw $zero, 0x70($s2) +/* 9B22EC 80240B5C 24020002 */ addiu $v0, $zero, 2 +/* 9B22F0 80240B60 AE420070 */ sw $v0, 0x70($s2) +.L80240B64: +/* 9B22F4 80240B64 8E430070 */ lw $v1, 0x70($s2) +/* 9B22F8 80240B68 24110001 */ addiu $s1, $zero, 1 +/* 9B22FC 80240B6C 10710013 */ beq $v1, $s1, .L80240BBC +/* 9B2300 80240B70 28620002 */ slti $v0, $v1, 2 +/* 9B2304 80240B74 10400005 */ beqz $v0, .L80240B8C +/* 9B2308 80240B78 24020002 */ addiu $v0, $zero, 2 +/* 9B230C 80240B7C 10600009 */ beqz $v1, .L80240BA4 +/* 9B2310 80240B80 0000102D */ daddu $v0, $zero, $zero +/* 9B2314 80240B84 08090315 */ j .L80240C54 +/* 9B2318 80240B88 00000000 */ nop +.L80240B8C: +/* 9B231C 80240B8C 10620013 */ beq $v1, $v0, .L80240BDC +/* 9B2320 80240B90 24020003 */ addiu $v0, $zero, 3 +/* 9B2324 80240B94 1062001E */ beq $v1, $v0, .L80240C10 +/* 9B2328 80240B98 0000102D */ daddu $v0, $zero, $zero +/* 9B232C 80240B9C 08090315 */ j .L80240C54 +/* 9B2330 80240BA0 00000000 */ nop +.L80240BA4: +/* 9B2334 80240BA4 0C03AC5A */ jal func_800EB168 +/* 9B2338 80240BA8 0000202D */ daddu $a0, $zero, $zero +/* 9B233C 80240BAC 2402001E */ addiu $v0, $zero, 0x1e +/* 9B2340 80240BB0 AE420074 */ sw $v0, 0x74($s2) +/* 9B2344 80240BB4 08090314 */ j .L80240C50 +/* 9B2348 80240BB8 AE510070 */ sw $s1, 0x70($s2) +.L80240BBC: +/* 9B234C 80240BBC 8E420074 */ lw $v0, 0x74($s2) +/* 9B2350 80240BC0 2403FFFF */ addiu $v1, $zero, -1 +/* 9B2354 80240BC4 2442FFFF */ addiu $v0, $v0, -1 +/* 9B2358 80240BC8 14430021 */ bne $v0, $v1, .L80240C50 +/* 9B235C 80240BCC AE420074 */ sw $v0, 0x74($s2) +/* 9B2360 80240BD0 24020002 */ addiu $v0, $zero, 2 +/* 9B2364 80240BD4 08090314 */ j .L80240C50 +/* 9B2368 80240BD8 AE420070 */ sw $v0, 0x70($s2) +.L80240BDC: +/* 9B236C 80240BDC 0200202D */ daddu $a0, $s0, $zero +/* 9B2370 80240BE0 00141600 */ sll $v0, $s4, 0x18 +/* 9B2374 80240BE4 00021543 */ sra $v0, $v0, 0x15 +/* 9B2378 80240BE8 02621021 */ addu $v0, $s3, $v0 +/* 9B237C 80240BEC A2740012 */ sb $s4, 0x12($s3) +/* 9B2380 80240BF0 0C03BD17 */ jal clear_partner_move_history +/* 9B2384 80240BF4 A0510014 */ sb $s1, 0x14($v0) +/* 9B2388 80240BF8 82640012 */ lb $a0, 0x12($s3) +/* 9B238C 80240BFC 0C03ACA9 */ jal func_800EB2A4 +/* 9B2390 80240C00 00000000 */ nop +/* 9B2394 80240C04 24020003 */ addiu $v0, $zero, 3 +/* 9B2398 80240C08 08090314 */ j .L80240C50 +/* 9B239C 80240C0C AE420070 */ sw $v0, 0x70($s2) +.L80240C10: +/* 9B23A0 80240C10 0C00EAD2 */ jal get_npc_safe +/* 9B23A4 80240C14 2404FFFC */ addiu $a0, $zero, -4 +/* 9B23A8 80240C18 8E05000C */ lw $a1, 0xc($s0) +/* 9B23AC 80240C1C 0C00ECD0 */ jal set_npc_yaw +/* 9B23B0 80240C20 0040202D */ daddu $a0, $v0, $zero +/* 9B23B4 80240C24 0200202D */ daddu $a0, $s0, $zero +/* 9B23B8 80240C28 8E020000 */ lw $v0, ($s0) +/* 9B23BC 80240C2C 2403FFFB */ addiu $v1, $zero, -5 +/* 9B23C0 80240C30 00431024 */ and $v0, $v0, $v1 +/* 9B23C4 80240C34 0C00EAFF */ jal disable_npc_shadow +/* 9B23C8 80240C38 AE020000 */ sw $v0, ($s0) +/* 9B23CC 80240C3C 3C01C47A */ lui $at, 0xc47a +/* 9B23D0 80240C40 44810000 */ mtc1 $at, $f0 +/* 9B23D4 80240C44 24020002 */ addiu $v0, $zero, 2 +/* 9B23D8 80240C48 08090315 */ j .L80240C54 +/* 9B23DC 80240C4C E600003C */ swc1 $f0, 0x3c($s0) +.L80240C50: +/* 9B23E0 80240C50 0000102D */ daddu $v0, $zero, $zero +.L80240C54: +/* 9B23E4 80240C54 8FBF0024 */ lw $ra, 0x24($sp) +/* 9B23E8 80240C58 8FB40020 */ lw $s4, 0x20($sp) +/* 9B23EC 80240C5C 8FB3001C */ lw $s3, 0x1c($sp) +/* 9B23F0 80240C60 8FB20018 */ lw $s2, 0x18($sp) +/* 9B23F4 80240C64 8FB10014 */ lw $s1, 0x14($sp) +/* 9B23F8 80240C68 8FB00010 */ lw $s0, 0x10($sp) +/* 9B23FC 80240C6C 03E00008 */ jr $ra +/* 9B2400 80240C70 27BD0028 */ addiu $sp, $sp, 0x28 +/* 9B2404 80240C74 00000000 */ nop +/* 9B2408 80240C78 00000000 */ nop +/* 9B240C 80240C7C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C.s deleted file mode 100644 index 467d63ca24..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C.s +++ /dev/null @@ -1,86 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024038C -/* 9B6D0C 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B6D10 80240390 AFB3001C */ sw $s3, 0x1c($sp) -/* 9B6D14 80240394 0080982D */ daddu $s3, $a0, $zero -/* 9B6D18 80240398 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B6D1C 8024039C AFB20018 */ sw $s2, 0x18($sp) -/* 9B6D20 802403A0 AFB10014 */ sw $s1, 0x14($sp) -/* 9B6D24 802403A4 AFB00010 */ sw $s0, 0x10($sp) -/* 9B6D28 802403A8 8E710148 */ lw $s1, 0x148($s3) -/* 9B6D2C 802403AC 86240008 */ lh $a0, 8($s1) -/* 9B6D30 802403B0 0C00EABB */ jal get_npc_unsafe -/* 9B6D34 802403B4 00A0902D */ daddu $s2, $a1, $zero -/* 9B6D38 802403B8 0040802D */ daddu $s0, $v0, $zero -/* 9B6D3C 802403BC 8602008E */ lh $v0, 0x8e($s0) -/* 9B6D40 802403C0 9603008E */ lhu $v1, 0x8e($s0) -/* 9B6D44 802403C4 18400005 */ blez $v0, .L802403DC -/* 9B6D48 802403C8 2462FFFF */ addiu $v0, $v1, -1 -/* 9B6D4C 802403CC A602008E */ sh $v0, 0x8e($s0) -/* 9B6D50 802403D0 00021400 */ sll $v0, $v0, 0x10 -/* 9B6D54 802403D4 1C400033 */ bgtz $v0, .L802404A4 -/* 9B6D58 802403D8 00000000 */ nop -.L802403DC: -/* 9B6D5C 802403DC 8602008C */ lh $v0, 0x8c($s0) -/* 9B6D60 802403E0 14400030 */ bnez $v0, .L802404A4 -/* 9B6D64 802403E4 00000000 */ nop -/* 9B6D68 802403E8 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B6D6C 802403EC 8C420024 */ lw $v0, 0x24($v0) -/* 9B6D70 802403F0 AE020028 */ sw $v0, 0x28($s0) -/* 9B6D74 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) -/* 9B6D78 802403F8 E6000018 */ swc1 $f0, 0x18($s0) -/* 9B6D7C 802403FC 8E230088 */ lw $v1, 0x88($s1) -/* 9B6D80 80240400 24020005 */ addiu $v0, $zero, 5 -/* 9B6D84 80240404 10620005 */ beq $v1, $v0, .L8024041C -/* 9B6D88 80240408 00000000 */ nop -/* 9B6D8C 8024040C 10600003 */ beqz $v1, .L8024041C -/* 9B6D90 80240410 24020001 */ addiu $v0, $zero, 1 -/* 9B6D94 80240414 14620006 */ bne $v1, $v0, .L80240430 -/* 9B6D98 80240418 00000000 */ nop -.L8024041C: -/* 9B6D9C 8024041C 8E220084 */ lw $v0, 0x84($s1) -/* 9B6DA0 80240420 00021FC2 */ srl $v1, $v0, 0x1f -/* 9B6DA4 80240424 00431021 */ addu $v0, $v0, $v1 -/* 9B6DA8 80240428 00021043 */ sra $v0, $v0, 1 -/* 9B6DAC 8024042C A60200A8 */ sh $v0, 0xa8($s0) -.L80240430: -/* 9B6DB0 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B6DB4 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B6DB8 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B6DBC 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B6DC0 80240440 8C460028 */ lw $a2, 0x28($v0) -/* 9B6DC4 80240444 0C00A7B5 */ jal dist2D -/* 9B6DC8 80240448 8C470030 */ lw $a3, 0x30($v0) -/* 9B6DCC 8024044C C6020018 */ lwc1 $f2, 0x18($s0) -/* 9B6DD0 80240450 46020003 */ div.s $f0, $f0, $f2 -/* 9B6DD4 80240454 3C018024 */ lui $at, 0x8024 -/* 9B6DD8 80240458 D4224820 */ ldc1 $f2, 0x4820($at) -/* 9B6DDC 8024045C 46000021 */ cvt.d.s $f0, $f0 -/* 9B6DE0 80240460 46220000 */ add.d $f0, $f0, $f2 -/* 9B6DE4 80240464 4620010D */ trunc.w.d $f4, $f0 -/* 9B6DE8 80240468 44022000 */ mfc1 $v0, $f4 -/* 9B6DEC 8024046C 00000000 */ nop -/* 9B6DF0 80240470 A602008E */ sh $v0, 0x8e($s0) -/* 9B6DF4 80240474 00021400 */ sll $v0, $v0, 0x10 -/* 9B6DF8 80240478 8E230078 */ lw $v1, 0x78($s1) -/* 9B6DFC 8024047C 00021403 */ sra $v0, $v0, 0x10 -/* 9B6E00 80240480 0043102A */ slt $v0, $v0, $v1 -/* 9B6E04 80240484 10400003 */ beqz $v0, .L80240494 -/* 9B6E08 80240488 00000000 */ nop -/* 9B6E0C 8024048C 9622007A */ lhu $v0, 0x7a($s1) -/* 9B6E10 80240490 A602008E */ sh $v0, 0x8e($s0) -.L80240494: -/* 9B6E14 80240494 8602008E */ lh $v0, 0x8e($s0) -/* 9B6E18 80240498 AE22007C */ sw $v0, 0x7c($s1) -/* 9B6E1C 8024049C 2402000E */ addiu $v0, $zero, 0xe -/* 9B6E20 802404A0 AE620070 */ sw $v0, 0x70($s3) -.L802404A4: -/* 9B6E24 802404A4 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B6E28 802404A8 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B6E2C 802404AC 8FB20018 */ lw $s2, 0x18($sp) -/* 9B6E30 802404B0 8FB10014 */ lw $s1, 0x14($sp) -/* 9B6E34 802404B4 8FB00010 */ lw $s0, 0x10($sp) -/* 9B6E38 802404B8 03E00008 */ jr $ra -/* 9B6E3C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s new file mode 100644 index 0000000000..db989e9311 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024038C_9B6D0C.s @@ -0,0 +1,86 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024038C_9B6D0C +/* 9B6D0C 8024038C 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9B6D10 80240390 AFB3001C */ sw $s3, 0x1c($sp) +/* 9B6D14 80240394 0080982D */ daddu $s3, $a0, $zero +/* 9B6D18 80240398 AFBF0020 */ sw $ra, 0x20($sp) +/* 9B6D1C 8024039C AFB20018 */ sw $s2, 0x18($sp) +/* 9B6D20 802403A0 AFB10014 */ sw $s1, 0x14($sp) +/* 9B6D24 802403A4 AFB00010 */ sw $s0, 0x10($sp) +/* 9B6D28 802403A8 8E710148 */ lw $s1, 0x148($s3) +/* 9B6D2C 802403AC 86240008 */ lh $a0, 8($s1) +/* 9B6D30 802403B0 0C00EABB */ jal get_npc_unsafe +/* 9B6D34 802403B4 00A0902D */ daddu $s2, $a1, $zero +/* 9B6D38 802403B8 0040802D */ daddu $s0, $v0, $zero +/* 9B6D3C 802403BC 8602008E */ lh $v0, 0x8e($s0) +/* 9B6D40 802403C0 9603008E */ lhu $v1, 0x8e($s0) +/* 9B6D44 802403C4 18400005 */ blez $v0, .L802403DC +/* 9B6D48 802403C8 2462FFFF */ addiu $v0, $v1, -1 +/* 9B6D4C 802403CC A602008E */ sh $v0, 0x8e($s0) +/* 9B6D50 802403D0 00021400 */ sll $v0, $v0, 0x10 +/* 9B6D54 802403D4 1C400033 */ bgtz $v0, .L802404A4 +/* 9B6D58 802403D8 00000000 */ nop +.L802403DC: +/* 9B6D5C 802403DC 8602008C */ lh $v0, 0x8c($s0) +/* 9B6D60 802403E0 14400030 */ bnez $v0, .L802404A4 +/* 9B6D64 802403E4 00000000 */ nop +/* 9B6D68 802403E8 8E2200CC */ lw $v0, 0xcc($s1) +/* 9B6D6C 802403EC 8C420024 */ lw $v0, 0x24($v0) +/* 9B6D70 802403F0 AE020028 */ sw $v0, 0x28($s0) +/* 9B6D74 802403F4 C6400018 */ lwc1 $f0, 0x18($s2) +/* 9B6D78 802403F8 E6000018 */ swc1 $f0, 0x18($s0) +/* 9B6D7C 802403FC 8E230088 */ lw $v1, 0x88($s1) +/* 9B6D80 80240400 24020005 */ addiu $v0, $zero, 5 +/* 9B6D84 80240404 10620005 */ beq $v1, $v0, .L8024041C +/* 9B6D88 80240408 00000000 */ nop +/* 9B6D8C 8024040C 10600003 */ beqz $v1, .L8024041C +/* 9B6D90 80240410 24020001 */ addiu $v0, $zero, 1 +/* 9B6D94 80240414 14620006 */ bne $v1, $v0, .L80240430 +/* 9B6D98 80240418 00000000 */ nop +.L8024041C: +/* 9B6D9C 8024041C 8E220084 */ lw $v0, 0x84($s1) +/* 9B6DA0 80240420 00021FC2 */ srl $v1, $v0, 0x1f +/* 9B6DA4 80240424 00431021 */ addu $v0, $v0, $v1 +/* 9B6DA8 80240428 00021043 */ sra $v0, $v0, 1 +/* 9B6DAC 8024042C A60200A8 */ sh $v0, 0xa8($s0) +.L80240430: +/* 9B6DB0 80240430 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9B6DB4 80240434 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9B6DB8 80240438 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9B6DBC 8024043C C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9B6DC0 80240440 8C460028 */ lw $a2, 0x28($v0) +/* 9B6DC4 80240444 0C00A7B5 */ jal dist2D +/* 9B6DC8 80240448 8C470030 */ lw $a3, 0x30($v0) +/* 9B6DCC 8024044C C6020018 */ lwc1 $f2, 0x18($s0) +/* 9B6DD0 80240450 46020003 */ div.s $f0, $f0, $f2 +/* 9B6DD4 80240454 3C018024 */ lui $at, 0x8024 +/* 9B6DD8 80240458 D4224820 */ ldc1 $f2, 0x4820($at) +/* 9B6DDC 8024045C 46000021 */ cvt.d.s $f0, $f0 +/* 9B6DE0 80240460 46220000 */ add.d $f0, $f0, $f2 +/* 9B6DE4 80240464 4620010D */ trunc.w.d $f4, $f0 +/* 9B6DE8 80240468 44022000 */ mfc1 $v0, $f4 +/* 9B6DEC 8024046C 00000000 */ nop +/* 9B6DF0 80240470 A602008E */ sh $v0, 0x8e($s0) +/* 9B6DF4 80240474 00021400 */ sll $v0, $v0, 0x10 +/* 9B6DF8 80240478 8E230078 */ lw $v1, 0x78($s1) +/* 9B6DFC 8024047C 00021403 */ sra $v0, $v0, 0x10 +/* 9B6E00 80240480 0043102A */ slt $v0, $v0, $v1 +/* 9B6E04 80240484 10400003 */ beqz $v0, .L80240494 +/* 9B6E08 80240488 00000000 */ nop +/* 9B6E0C 8024048C 9622007A */ lhu $v0, 0x7a($s1) +/* 9B6E10 80240490 A602008E */ sh $v0, 0x8e($s0) +.L80240494: +/* 9B6E14 80240494 8602008E */ lh $v0, 0x8e($s0) +/* 9B6E18 80240498 AE22007C */ sw $v0, 0x7c($s1) +/* 9B6E1C 8024049C 2402000E */ addiu $v0, $zero, 0xe +/* 9B6E20 802404A0 AE620070 */ sw $v0, 0x70($s3) +.L802404A4: +/* 9B6E24 802404A4 8FBF0020 */ lw $ra, 0x20($sp) +/* 9B6E28 802404A8 8FB3001C */ lw $s3, 0x1c($sp) +/* 9B6E2C 802404AC 8FB20018 */ lw $s2, 0x18($sp) +/* 9B6E30 802404B0 8FB10014 */ lw $s1, 0x14($sp) +/* 9B6E34 802404B4 8FB00010 */ lw $s0, 0x10($sp) +/* 9B6E38 802404B8 03E00008 */ jr $ra +/* 9B6E3C 802404BC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4.s deleted file mode 100644 index 19def59c69..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4.s +++ /dev/null @@ -1,301 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406A4 -/* 9B7024 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 9B7028 802406A8 AFB3005C */ sw $s3, 0x5c($sp) -/* 9B702C 802406AC 0080982D */ daddu $s3, $a0, $zero -/* 9B7030 802406B0 AFBF0068 */ sw $ra, 0x68($sp) -/* 9B7034 802406B4 AFB50064 */ sw $s5, 0x64($sp) -/* 9B7038 802406B8 AFB40060 */ sw $s4, 0x60($sp) -/* 9B703C 802406BC AFB20058 */ sw $s2, 0x58($sp) -/* 9B7040 802406C0 AFB10054 */ sw $s1, 0x54($sp) -/* 9B7044 802406C4 AFB00050 */ sw $s0, 0x50($sp) -/* 9B7048 802406C8 8E710148 */ lw $s1, 0x148($s3) -/* 9B704C 802406CC 86240008 */ lh $a0, 8($s1) -/* 9B7050 802406D0 0C00EABB */ jal get_npc_unsafe -/* 9B7054 802406D4 00A0802D */ daddu $s0, $a1, $zero -/* 9B7058 802406D8 8E63000C */ lw $v1, 0xc($s3) -/* 9B705C 802406DC 0260202D */ daddu $a0, $s3, $zero -/* 9B7060 802406E0 8C650000 */ lw $a1, ($v1) -/* 9B7064 802406E4 0C0B1EAF */ jal get_variable -/* 9B7068 802406E8 0040902D */ daddu $s2, $v0, $zero -/* 9B706C 802406EC AFA00028 */ sw $zero, 0x28($sp) -/* 9B7070 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B7074 802406F4 8C630030 */ lw $v1, 0x30($v1) -/* 9B7078 802406F8 AFA3002C */ sw $v1, 0x2c($sp) -/* 9B707C 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B7080 80240700 8C63001C */ lw $v1, 0x1c($v1) -/* 9B7084 80240704 AFA30030 */ sw $v1, 0x30($sp) -/* 9B7088 80240708 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B708C 8024070C 8C630024 */ lw $v1, 0x24($v1) -/* 9B7090 80240710 AFA30034 */ sw $v1, 0x34($sp) -/* 9B7094 80240714 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B7098 80240718 8C630028 */ lw $v1, 0x28($v1) -/* 9B709C 8024071C 27B50028 */ addiu $s5, $sp, 0x28 -/* 9B70A0 80240720 AFA30038 */ sw $v1, 0x38($sp) -/* 9B70A4 80240724 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B70A8 80240728 3C0142C8 */ lui $at, 0x42c8 -/* 9B70AC 8024072C 44810000 */ mtc1 $at, $f0 -/* 9B70B0 80240730 8C63002C */ lw $v1, 0x2c($v1) -/* 9B70B4 80240734 0040A02D */ daddu $s4, $v0, $zero -/* 9B70B8 80240738 E7A00040 */ swc1 $f0, 0x40($sp) -/* 9B70BC 8024073C A7A00044 */ sh $zero, 0x44($sp) -/* 9B70C0 80240740 12000009 */ beqz $s0, .L80240768 -/* 9B70C4 80240744 AFA3003C */ sw $v1, 0x3c($sp) -/* 9B70C8 80240748 864300A8 */ lh $v1, 0xa8($s2) -/* 9B70CC 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9B70D0 80240750 AE20008C */ sw $zero, 0x8c($s1) -/* 9B70D4 80240754 A22000B5 */ sb $zero, 0xb5($s1) -/* 9B70D8 80240758 34420008 */ ori $v0, $v0, 8 -/* 9B70DC 8024075C AE230084 */ sw $v1, 0x84($s1) -/* 9B70E0 80240760 080901DE */ j .L80240778 -/* 9B70E4 80240764 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240768: -/* 9B70E8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9B70EC 8024076C 30420004 */ andi $v0, $v0, 4 -/* 9B70F0 80240770 10400047 */ beqz $v0, .L80240890 -/* 9B70F4 80240774 00000000 */ nop -.L80240778: -/* 9B70F8 80240778 AE600070 */ sw $zero, 0x70($s3) -/* 9B70FC 8024077C A640008E */ sh $zero, 0x8e($s2) -/* 9B7100 80240780 8E2300CC */ lw $v1, 0xcc($s1) -/* 9B7104 80240784 2404F7FF */ addiu $a0, $zero, -0x801 -/* 9B7108 80240788 A2200007 */ sb $zero, 7($s1) -/* 9B710C 8024078C 8E420000 */ lw $v0, ($s2) -/* 9B7110 80240790 8C630000 */ lw $v1, ($v1) -/* 9B7114 80240794 00441024 */ and $v0, $v0, $a0 -/* 9B7118 80240798 AE420000 */ sw $v0, ($s2) -/* 9B711C 8024079C AE430028 */ sw $v1, 0x28($s2) -/* 9B7120 802407A0 96220086 */ lhu $v0, 0x86($s1) -/* 9B7124 802407A4 A64200A8 */ sh $v0, 0xa8($s2) -/* 9B7128 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B712C 802407AC AE200090 */ sw $zero, 0x90($s1) -/* 9B7130 802407B0 8C420034 */ lw $v0, 0x34($v0) -/* 9B7134 802407B4 14400006 */ bnez $v0, .L802407D0 -/* 9B7138 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 -/* 9B713C 802407BC 8E420000 */ lw $v0, ($s2) -/* 9B7140 802407C0 2403FFF7 */ addiu $v1, $zero, -9 -/* 9B7144 802407C4 34420200 */ ori $v0, $v0, 0x200 -/* 9B7148 802407C8 080901F7 */ j .L802407DC -/* 9B714C 802407CC 00431024 */ and $v0, $v0, $v1 -.L802407D0: -/* 9B7150 802407D0 8E420000 */ lw $v0, ($s2) -/* 9B7154 802407D4 00431024 */ and $v0, $v0, $v1 -/* 9B7158 802407D8 34420008 */ ori $v0, $v0, 8 -.L802407DC: -/* 9B715C 802407DC AE420000 */ sw $v0, ($s2) -/* 9B7160 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9B7164 802407E4 30420004 */ andi $v0, $v0, 4 -/* 9B7168 802407E8 1040001E */ beqz $v0, .L80240864 -/* 9B716C 802407EC 24040002 */ addiu $a0, $zero, 2 -/* 9B7170 802407F0 0240282D */ daddu $a1, $s2, $zero -/* 9B7174 802407F4 0000302D */ daddu $a2, $zero, $zero -/* 9B7178 802407F8 24020063 */ addiu $v0, $zero, 0x63 -/* 9B717C 802407FC AE620070 */ sw $v0, 0x70($s3) -/* 9B7180 80240800 AE600074 */ sw $zero, 0x74($s3) -/* 9B7184 80240804 864300A8 */ lh $v1, 0xa8($s2) -/* 9B7188 80240808 3C013F80 */ lui $at, 0x3f80 -/* 9B718C 8024080C 44810000 */ mtc1 $at, $f0 -/* 9B7190 80240810 3C014000 */ lui $at, 0x4000 -/* 9B7194 80240814 44811000 */ mtc1 $at, $f2 -/* 9B7198 80240818 3C01C1A0 */ lui $at, 0xc1a0 -/* 9B719C 8024081C 44812000 */ mtc1 $at, $f4 -/* 9B71A0 80240820 24020028 */ addiu $v0, $zero, 0x28 -/* 9B71A4 80240824 AFA2001C */ sw $v0, 0x1c($sp) -/* 9B71A8 80240828 44833000 */ mtc1 $v1, $f6 -/* 9B71AC 8024082C 00000000 */ nop -/* 9B71B0 80240830 468031A0 */ cvt.s.w $f6, $f6 -/* 9B71B4 80240834 44073000 */ mfc1 $a3, $f6 -/* 9B71B8 80240838 27A20048 */ addiu $v0, $sp, 0x48 -/* 9B71BC 8024083C AFA20020 */ sw $v0, 0x20($sp) -/* 9B71C0 80240840 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B71C4 80240844 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9B71C8 80240848 0C01BFA4 */ jal fx_emote -/* 9B71CC 8024084C E7A40018 */ swc1 $f4, 0x18($sp) -/* 9B71D0 80240850 8E2200B0 */ lw $v0, 0xb0($s1) -/* 9B71D4 80240854 2403FFFB */ addiu $v1, $zero, -5 -/* 9B71D8 80240858 00431024 */ and $v0, $v0, $v1 -/* 9B71DC 8024085C 08090224 */ j .L80240890 -/* 9B71E0 80240860 AE2200B0 */ sw $v0, 0xb0($s1) -.L80240864: -/* 9B71E4 80240864 8E220000 */ lw $v0, ($s1) -/* 9B71E8 80240868 3C034000 */ lui $v1, 0x4000 -/* 9B71EC 8024086C 00431024 */ and $v0, $v0, $v1 -/* 9B71F0 80240870 10400007 */ beqz $v0, .L80240890 -/* 9B71F4 80240874 3C03BFFF */ lui $v1, 0xbfff -/* 9B71F8 80240878 2402000C */ addiu $v0, $zero, 0xc -/* 9B71FC 8024087C AE620070 */ sw $v0, 0x70($s3) -/* 9B7200 80240880 8E220000 */ lw $v0, ($s1) -/* 9B7204 80240884 3463FFFF */ ori $v1, $v1, 0xffff -/* 9B7208 80240888 00431024 */ and $v0, $v0, $v1 -/* 9B720C 8024088C AE220000 */ sw $v0, ($s1) -.L80240890: -/* 9B7210 80240890 8E220090 */ lw $v0, 0x90($s1) -/* 9B7214 80240894 1840000C */ blez $v0, .L802408C8 -/* 9B7218 80240898 2442FFFF */ addiu $v0, $v0, -1 -/* 9B721C 8024089C 14400087 */ bnez $v0, .L80240ABC -/* 9B7220 802408A0 AE220090 */ sw $v0, 0x90($s1) -/* 9B7224 802408A4 3C03FFAA */ lui $v1, 0xffaa -/* 9B7228 802408A8 8E420028 */ lw $v0, 0x28($s2) -/* 9B722C 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 -/* 9B7230 802408B0 00431021 */ addu $v0, $v0, $v1 -/* 9B7234 802408B4 2C420002 */ sltiu $v0, $v0, 2 -/* 9B7238 802408B8 10400003 */ beqz $v0, .L802408C8 -/* 9B723C 802408BC 3C020055 */ lui $v0, 0x55 -/* 9B7240 802408C0 3442000C */ ori $v0, $v0, 0xc -/* 9B7244 802408C4 AE420028 */ sw $v0, 0x28($s2) -.L802408C8: -/* 9B7248 802408C8 8E630070 */ lw $v1, 0x70($s3) -/* 9B724C 802408CC 2402000C */ addiu $v0, $zero, 0xc -/* 9B7250 802408D0 10620048 */ beq $v1, $v0, .L802409F4 -/* 9B7254 802408D4 2862000D */ slti $v0, $v1, 0xd -/* 9B7258 802408D8 1040000F */ beqz $v0, .L80240918 -/* 9B725C 802408DC 24100001 */ addiu $s0, $zero, 1 -/* 9B7260 802408E0 1070001E */ beq $v1, $s0, .L8024095C -/* 9B7264 802408E4 28620002 */ slti $v0, $v1, 2 -/* 9B7268 802408E8 10400005 */ beqz $v0, .L80240900 -/* 9B726C 802408EC 24020002 */ addiu $v0, $zero, 2 -/* 9B7270 802408F0 10600015 */ beqz $v1, .L80240948 -/* 9B7274 802408F4 0260202D */ daddu $a0, $s3, $zero -/* 9B7278 802408F8 08090294 */ j .L80240A50 -/* 9B727C 802408FC 00000000 */ nop -.L80240900: -/* 9B7280 80240900 1062001C */ beq $v1, $v0, .L80240974 -/* 9B7284 80240904 24020003 */ addiu $v0, $zero, 3 -/* 9B7288 80240908 10620035 */ beq $v1, $v0, .L802409E0 -/* 9B728C 8024090C 0260202D */ daddu $a0, $s3, $zero -/* 9B7290 80240910 08090294 */ j .L80240A50 -/* 9B7294 80240914 00000000 */ nop -.L80240918: -/* 9B7298 80240918 2402000E */ addiu $v0, $zero, 0xe -/* 9B729C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C -/* 9B72A0 80240920 0062102A */ slt $v0, $v1, $v0 -/* 9B72A4 80240924 14400038 */ bnez $v0, .L80240A08 -/* 9B72A8 80240928 0260202D */ daddu $a0, $s3, $zero -/* 9B72AC 8024092C 2402000F */ addiu $v0, $zero, 0xf -/* 9B72B0 80240930 10620040 */ beq $v1, $v0, .L80240A34 -/* 9B72B4 80240934 24020063 */ addiu $v0, $zero, 0x63 -/* 9B72B8 80240938 10620043 */ beq $v1, $v0, .L80240A48 -/* 9B72BC 8024093C 00000000 */ nop -/* 9B72C0 80240940 08090294 */ j .L80240A50 -/* 9B72C4 80240944 00000000 */ nop -.L80240948: -/* 9B72C8 80240948 0280282D */ daddu $a1, $s4, $zero -/* 9B72CC 8024094C 0C012568 */ jal func_800495A0 -/* 9B72D0 80240950 02A0302D */ daddu $a2, $s5, $zero -/* 9B72D4 80240954 96220086 */ lhu $v0, 0x86($s1) -/* 9B72D8 80240958 A64200A8 */ sh $v0, 0xa8($s2) -.L8024095C: -/* 9B72DC 8024095C 0260202D */ daddu $a0, $s3, $zero -/* 9B72E0 80240960 0280282D */ daddu $a1, $s4, $zero -/* 9B72E4 80240964 0C0125AE */ jal func_800496B8 -/* 9B72E8 80240968 02A0302D */ daddu $a2, $s5, $zero -/* 9B72EC 8024096C 08090294 */ j .L80240A50 -/* 9B72F0 80240970 00000000 */ nop -.L80240974: -/* 9B72F4 80240974 0260202D */ daddu $a0, $s3, $zero -/* 9B72F8 80240978 0280282D */ daddu $a1, $s4, $zero -/* 9B72FC 8024097C 0C0126D1 */ jal func_80049B44 -/* 9B7300 80240980 02A0302D */ daddu $a2, $s5, $zero -/* 9B7304 80240984 8E230088 */ lw $v1, 0x88($s1) -/* 9B7308 80240988 24020006 */ addiu $v0, $zero, 6 -/* 9B730C 8024098C 14620014 */ bne $v1, $v0, .L802409E0 -/* 9B7310 80240990 0260202D */ daddu $a0, $s3, $zero -/* 9B7314 80240994 0C00A67F */ jal rand_int -/* 9B7318 80240998 24040064 */ addiu $a0, $zero, 0x64 -/* 9B731C 8024099C 28420021 */ slti $v0, $v0, 0x21 -/* 9B7320 802409A0 5040000F */ beql $v0, $zero, .L802409E0 -/* 9B7324 802409A4 0260202D */ daddu $a0, $s3, $zero -/* 9B7328 802409A8 8E22008C */ lw $v0, 0x8c($s1) -/* 9B732C 802409AC 10400005 */ beqz $v0, .L802409C4 -/* 9B7330 802409B0 3C020055 */ lui $v0, 0x55 -/* 9B7334 802409B4 3442002F */ ori $v0, $v0, 0x2f -/* 9B7338 802409B8 AE20008C */ sw $zero, 0x8c($s1) -/* 9B733C 802409BC 08090274 */ j .L802409D0 -/* 9B7340 802409C0 A22000B5 */ sb $zero, 0xb5($s1) -.L802409C4: -/* 9B7344 802409C4 3442002E */ ori $v0, $v0, 0x2e -/* 9B7348 802409C8 AE30008C */ sw $s0, 0x8c($s1) -/* 9B734C 802409CC A23000B5 */ sb $s0, 0xb5($s1) -.L802409D0: -/* 9B7350 802409D0 AE420028 */ sw $v0, 0x28($s2) -/* 9B7354 802409D4 24020007 */ addiu $v0, $zero, 7 -/* 9B7358 802409D8 080902AF */ j .L80240ABC -/* 9B735C 802409DC AE220090 */ sw $v0, 0x90($s1) -.L802409E0: -/* 9B7360 802409E0 0280282D */ daddu $a1, $s4, $zero -/* 9B7364 802409E4 0C012701 */ jal func_80049C04 -/* 9B7368 802409E8 02A0302D */ daddu $a2, $s5, $zero -/* 9B736C 802409EC 08090294 */ j .L80240A50 -/* 9B7370 802409F0 00000000 */ nop -.L802409F4: -/* 9B7374 802409F4 0260202D */ daddu $a0, $s3, $zero -/* 9B7378 802409F8 0280282D */ daddu $a1, $s4, $zero -/* 9B737C 802409FC 0C0900C4 */ jal func_80240310 -/* 9B7380 80240A00 02A0302D */ daddu $a2, $s5, $zero -/* 9B7384 80240A04 0260202D */ daddu $a0, $s3, $zero -.L80240A08: -/* 9B7388 80240A08 0280282D */ daddu $a1, $s4, $zero -/* 9B738C 80240A0C 0C0900E3 */ jal func_8024038C -/* 9B7390 80240A10 02A0302D */ daddu $a2, $s5, $zero -/* 9B7394 80240A14 08090294 */ j .L80240A50 -/* 9B7398 80240A18 00000000 */ nop -.L80240A1C: -/* 9B739C 80240A1C 0260202D */ daddu $a0, $s3, $zero -/* 9B73A0 80240A20 0280282D */ daddu $a1, $s4, $zero -/* 9B73A4 80240A24 0C090130 */ jal func_802404C0 -/* 9B73A8 80240A28 02A0302D */ daddu $a2, $s5, $zero -/* 9B73AC 80240A2C 08090294 */ j .L80240A50 -/* 9B73B0 80240A30 00000000 */ nop -.L80240A34: -/* 9B73B4 80240A34 0280282D */ daddu $a1, $s4, $zero -/* 9B73B8 80240A38 0C090189 */ jal func_80240624 -/* 9B73BC 80240A3C 02A0302D */ daddu $a2, $s5, $zero -/* 9B73C0 80240A40 08090294 */ j .L80240A50 -/* 9B73C4 80240A44 00000000 */ nop -.L80240A48: -/* 9B73C8 80240A48 0C0129CF */ jal func_8004A73C -/* 9B73CC 80240A4C 0260202D */ daddu $a0, $s3, $zero -.L80240A50: -/* 9B73D0 80240A50 8E230088 */ lw $v1, 0x88($s1) -/* 9B73D4 80240A54 24020006 */ addiu $v0, $zero, 6 -/* 9B73D8 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 -/* 9B73DC 80240A5C 0000102D */ daddu $v0, $zero, $zero -/* 9B73E0 80240A60 8E22008C */ lw $v0, 0x8c($s1) -/* 9B73E4 80240A64 10400003 */ beqz $v0, .L80240A74 -/* 9B73E8 80240A68 24020001 */ addiu $v0, $zero, 1 -/* 9B73EC 80240A6C 0809029E */ j .L80240A78 -/* 9B73F0 80240A70 A22200B5 */ sb $v0, 0xb5($s1) -.L80240A74: -/* 9B73F4 80240A74 A22000B5 */ sb $zero, 0xb5($s1) -.L80240A78: -/* 9B73F8 80240A78 8E22008C */ lw $v0, 0x8c($s1) -/* 9B73FC 80240A7C 1040000F */ beqz $v0, .L80240ABC -/* 9B7400 80240A80 3C03FFAA */ lui $v1, 0xffaa -/* 9B7404 80240A84 8E420028 */ lw $v0, 0x28($s2) -/* 9B7408 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc -/* 9B740C 80240A8C 00431821 */ addu $v1, $v0, $v1 -/* 9B7410 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 -/* 9B7414 80240A94 10400009 */ beqz $v0, .L80240ABC -/* 9B7418 80240A98 00031080 */ sll $v0, $v1, 2 -/* 9B741C 80240A9C 3C018024 */ lui $at, 0x8024 -/* 9B7420 80240AA0 00220821 */ addu $at, $at, $v0 -/* 9B7424 80240AA4 8C224828 */ lw $v0, 0x4828($at) -/* 9B7428 80240AA8 00400008 */ jr $v0 -/* 9B742C 80240AAC 00000000 */ nop -/* 9B7430 80240AB0 8E420028 */ lw $v0, 0x28($s2) -/* 9B7434 80240AB4 24420001 */ addiu $v0, $v0, 1 -/* 9B7438 80240AB8 AE420028 */ sw $v0, 0x28($s2) -.L80240ABC: -/* 9B743C 80240ABC 0000102D */ daddu $v0, $zero, $zero -.L80240AC0: -/* 9B7440 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) -/* 9B7444 80240AC4 8FB50064 */ lw $s5, 0x64($sp) -/* 9B7448 80240AC8 8FB40060 */ lw $s4, 0x60($sp) -/* 9B744C 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) -/* 9B7450 80240AD0 8FB20058 */ lw $s2, 0x58($sp) -/* 9B7454 80240AD4 8FB10054 */ lw $s1, 0x54($sp) -/* 9B7458 80240AD8 8FB00050 */ lw $s0, 0x50($sp) -/* 9B745C 80240ADC 03E00008 */ jr $ra -/* 9B7460 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s new file mode 100644 index 0000000000..e0d1e908e7 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802406A4_9B7024.s @@ -0,0 +1,301 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406A4_9B7024 +/* 9B7024 802406A4 27BDFF90 */ addiu $sp, $sp, -0x70 +/* 9B7028 802406A8 AFB3005C */ sw $s3, 0x5c($sp) +/* 9B702C 802406AC 0080982D */ daddu $s3, $a0, $zero +/* 9B7030 802406B0 AFBF0068 */ sw $ra, 0x68($sp) +/* 9B7034 802406B4 AFB50064 */ sw $s5, 0x64($sp) +/* 9B7038 802406B8 AFB40060 */ sw $s4, 0x60($sp) +/* 9B703C 802406BC AFB20058 */ sw $s2, 0x58($sp) +/* 9B7040 802406C0 AFB10054 */ sw $s1, 0x54($sp) +/* 9B7044 802406C4 AFB00050 */ sw $s0, 0x50($sp) +/* 9B7048 802406C8 8E710148 */ lw $s1, 0x148($s3) +/* 9B704C 802406CC 86240008 */ lh $a0, 8($s1) +/* 9B7050 802406D0 0C00EABB */ jal get_npc_unsafe +/* 9B7054 802406D4 00A0802D */ daddu $s0, $a1, $zero +/* 9B7058 802406D8 8E63000C */ lw $v1, 0xc($s3) +/* 9B705C 802406DC 0260202D */ daddu $a0, $s3, $zero +/* 9B7060 802406E0 8C650000 */ lw $a1, ($v1) +/* 9B7064 802406E4 0C0B1EAF */ jal get_variable +/* 9B7068 802406E8 0040902D */ daddu $s2, $v0, $zero +/* 9B706C 802406EC AFA00028 */ sw $zero, 0x28($sp) +/* 9B7070 802406F0 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9B7074 802406F4 8C630030 */ lw $v1, 0x30($v1) +/* 9B7078 802406F8 AFA3002C */ sw $v1, 0x2c($sp) +/* 9B707C 802406FC 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9B7080 80240700 8C63001C */ lw $v1, 0x1c($v1) +/* 9B7084 80240704 AFA30030 */ sw $v1, 0x30($sp) +/* 9B7088 80240708 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9B708C 8024070C 8C630024 */ lw $v1, 0x24($v1) +/* 9B7090 80240710 AFA30034 */ sw $v1, 0x34($sp) +/* 9B7094 80240714 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9B7098 80240718 8C630028 */ lw $v1, 0x28($v1) +/* 9B709C 8024071C 27B50028 */ addiu $s5, $sp, 0x28 +/* 9B70A0 80240720 AFA30038 */ sw $v1, 0x38($sp) +/* 9B70A4 80240724 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9B70A8 80240728 3C0142C8 */ lui $at, 0x42c8 +/* 9B70AC 8024072C 44810000 */ mtc1 $at, $f0 +/* 9B70B0 80240730 8C63002C */ lw $v1, 0x2c($v1) +/* 9B70B4 80240734 0040A02D */ daddu $s4, $v0, $zero +/* 9B70B8 80240738 E7A00040 */ swc1 $f0, 0x40($sp) +/* 9B70BC 8024073C A7A00044 */ sh $zero, 0x44($sp) +/* 9B70C0 80240740 12000009 */ beqz $s0, .L80240768 +/* 9B70C4 80240744 AFA3003C */ sw $v1, 0x3c($sp) +/* 9B70C8 80240748 864300A8 */ lh $v1, 0xa8($s2) +/* 9B70CC 8024074C 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9B70D0 80240750 AE20008C */ sw $zero, 0x8c($s1) +/* 9B70D4 80240754 A22000B5 */ sb $zero, 0xb5($s1) +/* 9B70D8 80240758 34420008 */ ori $v0, $v0, 8 +/* 9B70DC 8024075C AE230084 */ sw $v1, 0x84($s1) +/* 9B70E0 80240760 080901DE */ j .L80240778 +/* 9B70E4 80240764 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240768: +/* 9B70E8 80240768 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9B70EC 8024076C 30420004 */ andi $v0, $v0, 4 +/* 9B70F0 80240770 10400047 */ beqz $v0, .L80240890 +/* 9B70F4 80240774 00000000 */ nop +.L80240778: +/* 9B70F8 80240778 AE600070 */ sw $zero, 0x70($s3) +/* 9B70FC 8024077C A640008E */ sh $zero, 0x8e($s2) +/* 9B7100 80240780 8E2300CC */ lw $v1, 0xcc($s1) +/* 9B7104 80240784 2404F7FF */ addiu $a0, $zero, -0x801 +/* 9B7108 80240788 A2200007 */ sb $zero, 7($s1) +/* 9B710C 8024078C 8E420000 */ lw $v0, ($s2) +/* 9B7110 80240790 8C630000 */ lw $v1, ($v1) +/* 9B7114 80240794 00441024 */ and $v0, $v0, $a0 +/* 9B7118 80240798 AE420000 */ sw $v0, ($s2) +/* 9B711C 8024079C AE430028 */ sw $v1, 0x28($s2) +/* 9B7120 802407A0 96220086 */ lhu $v0, 0x86($s1) +/* 9B7124 802407A4 A64200A8 */ sh $v0, 0xa8($s2) +/* 9B7128 802407A8 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9B712C 802407AC AE200090 */ sw $zero, 0x90($s1) +/* 9B7130 802407B0 8C420034 */ lw $v0, 0x34($v0) +/* 9B7134 802407B4 14400006 */ bnez $v0, .L802407D0 +/* 9B7138 802407B8 2403FDFF */ addiu $v1, $zero, -0x201 +/* 9B713C 802407BC 8E420000 */ lw $v0, ($s2) +/* 9B7140 802407C0 2403FFF7 */ addiu $v1, $zero, -9 +/* 9B7144 802407C4 34420200 */ ori $v0, $v0, 0x200 +/* 9B7148 802407C8 080901F7 */ j .L802407DC +/* 9B714C 802407CC 00431024 */ and $v0, $v0, $v1 +.L802407D0: +/* 9B7150 802407D0 8E420000 */ lw $v0, ($s2) +/* 9B7154 802407D4 00431024 */ and $v0, $v0, $v1 +/* 9B7158 802407D8 34420008 */ ori $v0, $v0, 8 +.L802407DC: +/* 9B715C 802407DC AE420000 */ sw $v0, ($s2) +/* 9B7160 802407E0 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9B7164 802407E4 30420004 */ andi $v0, $v0, 4 +/* 9B7168 802407E8 1040001E */ beqz $v0, .L80240864 +/* 9B716C 802407EC 24040002 */ addiu $a0, $zero, 2 +/* 9B7170 802407F0 0240282D */ daddu $a1, $s2, $zero +/* 9B7174 802407F4 0000302D */ daddu $a2, $zero, $zero +/* 9B7178 802407F8 24020063 */ addiu $v0, $zero, 0x63 +/* 9B717C 802407FC AE620070 */ sw $v0, 0x70($s3) +/* 9B7180 80240800 AE600074 */ sw $zero, 0x74($s3) +/* 9B7184 80240804 864300A8 */ lh $v1, 0xa8($s2) +/* 9B7188 80240808 3C013F80 */ lui $at, 0x3f80 +/* 9B718C 8024080C 44810000 */ mtc1 $at, $f0 +/* 9B7190 80240810 3C014000 */ lui $at, 0x4000 +/* 9B7194 80240814 44811000 */ mtc1 $at, $f2 +/* 9B7198 80240818 3C01C1A0 */ lui $at, 0xc1a0 +/* 9B719C 8024081C 44812000 */ mtc1 $at, $f4 +/* 9B71A0 80240820 24020028 */ addiu $v0, $zero, 0x28 +/* 9B71A4 80240824 AFA2001C */ sw $v0, 0x1c($sp) +/* 9B71A8 80240828 44833000 */ mtc1 $v1, $f6 +/* 9B71AC 8024082C 00000000 */ nop +/* 9B71B0 80240830 468031A0 */ cvt.s.w $f6, $f6 +/* 9B71B4 80240834 44073000 */ mfc1 $a3, $f6 +/* 9B71B8 80240838 27A20048 */ addiu $v0, $sp, 0x48 +/* 9B71BC 8024083C AFA20020 */ sw $v0, 0x20($sp) +/* 9B71C0 80240840 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9B71C4 80240844 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9B71C8 80240848 0C01BFA4 */ jal fx_emote +/* 9B71CC 8024084C E7A40018 */ swc1 $f4, 0x18($sp) +/* 9B71D0 80240850 8E2200B0 */ lw $v0, 0xb0($s1) +/* 9B71D4 80240854 2403FFFB */ addiu $v1, $zero, -5 +/* 9B71D8 80240858 00431024 */ and $v0, $v0, $v1 +/* 9B71DC 8024085C 08090224 */ j .L80240890 +/* 9B71E0 80240860 AE2200B0 */ sw $v0, 0xb0($s1) +.L80240864: +/* 9B71E4 80240864 8E220000 */ lw $v0, ($s1) +/* 9B71E8 80240868 3C034000 */ lui $v1, 0x4000 +/* 9B71EC 8024086C 00431024 */ and $v0, $v0, $v1 +/* 9B71F0 80240870 10400007 */ beqz $v0, .L80240890 +/* 9B71F4 80240874 3C03BFFF */ lui $v1, 0xbfff +/* 9B71F8 80240878 2402000C */ addiu $v0, $zero, 0xc +/* 9B71FC 8024087C AE620070 */ sw $v0, 0x70($s3) +/* 9B7200 80240880 8E220000 */ lw $v0, ($s1) +/* 9B7204 80240884 3463FFFF */ ori $v1, $v1, 0xffff +/* 9B7208 80240888 00431024 */ and $v0, $v0, $v1 +/* 9B720C 8024088C AE220000 */ sw $v0, ($s1) +.L80240890: +/* 9B7210 80240890 8E220090 */ lw $v0, 0x90($s1) +/* 9B7214 80240894 1840000C */ blez $v0, .L802408C8 +/* 9B7218 80240898 2442FFFF */ addiu $v0, $v0, -1 +/* 9B721C 8024089C 14400087 */ bnez $v0, .L80240ABC +/* 9B7220 802408A0 AE220090 */ sw $v0, 0x90($s1) +/* 9B7224 802408A4 3C03FFAA */ lui $v1, 0xffaa +/* 9B7228 802408A8 8E420028 */ lw $v0, 0x28($s2) +/* 9B722C 802408AC 3463FFD2 */ ori $v1, $v1, 0xffd2 +/* 9B7230 802408B0 00431021 */ addu $v0, $v0, $v1 +/* 9B7234 802408B4 2C420002 */ sltiu $v0, $v0, 2 +/* 9B7238 802408B8 10400003 */ beqz $v0, .L802408C8 +/* 9B723C 802408BC 3C020055 */ lui $v0, 0x55 +/* 9B7240 802408C0 3442000C */ ori $v0, $v0, 0xc +/* 9B7244 802408C4 AE420028 */ sw $v0, 0x28($s2) +.L802408C8: +/* 9B7248 802408C8 8E630070 */ lw $v1, 0x70($s3) +/* 9B724C 802408CC 2402000C */ addiu $v0, $zero, 0xc +/* 9B7250 802408D0 10620048 */ beq $v1, $v0, .L802409F4 +/* 9B7254 802408D4 2862000D */ slti $v0, $v1, 0xd +/* 9B7258 802408D8 1040000F */ beqz $v0, .L80240918 +/* 9B725C 802408DC 24100001 */ addiu $s0, $zero, 1 +/* 9B7260 802408E0 1070001E */ beq $v1, $s0, .L8024095C +/* 9B7264 802408E4 28620002 */ slti $v0, $v1, 2 +/* 9B7268 802408E8 10400005 */ beqz $v0, .L80240900 +/* 9B726C 802408EC 24020002 */ addiu $v0, $zero, 2 +/* 9B7270 802408F0 10600015 */ beqz $v1, .L80240948 +/* 9B7274 802408F4 0260202D */ daddu $a0, $s3, $zero +/* 9B7278 802408F8 08090294 */ j .L80240A50 +/* 9B727C 802408FC 00000000 */ nop +.L80240900: +/* 9B7280 80240900 1062001C */ beq $v1, $v0, .L80240974 +/* 9B7284 80240904 24020003 */ addiu $v0, $zero, 3 +/* 9B7288 80240908 10620035 */ beq $v1, $v0, .L802409E0 +/* 9B728C 8024090C 0260202D */ daddu $a0, $s3, $zero +/* 9B7290 80240910 08090294 */ j .L80240A50 +/* 9B7294 80240914 00000000 */ nop +.L80240918: +/* 9B7298 80240918 2402000E */ addiu $v0, $zero, 0xe +/* 9B729C 8024091C 1062003F */ beq $v1, $v0, .L80240A1C +/* 9B72A0 80240920 0062102A */ slt $v0, $v1, $v0 +/* 9B72A4 80240924 14400038 */ bnez $v0, .L80240A08 +/* 9B72A8 80240928 0260202D */ daddu $a0, $s3, $zero +/* 9B72AC 8024092C 2402000F */ addiu $v0, $zero, 0xf +/* 9B72B0 80240930 10620040 */ beq $v1, $v0, .L80240A34 +/* 9B72B4 80240934 24020063 */ addiu $v0, $zero, 0x63 +/* 9B72B8 80240938 10620043 */ beq $v1, $v0, .L80240A48 +/* 9B72BC 8024093C 00000000 */ nop +/* 9B72C0 80240940 08090294 */ j .L80240A50 +/* 9B72C4 80240944 00000000 */ nop +.L80240948: +/* 9B72C8 80240948 0280282D */ daddu $a1, $s4, $zero +/* 9B72CC 8024094C 0C012568 */ jal func_800495A0 +/* 9B72D0 80240950 02A0302D */ daddu $a2, $s5, $zero +/* 9B72D4 80240954 96220086 */ lhu $v0, 0x86($s1) +/* 9B72D8 80240958 A64200A8 */ sh $v0, 0xa8($s2) +.L8024095C: +/* 9B72DC 8024095C 0260202D */ daddu $a0, $s3, $zero +/* 9B72E0 80240960 0280282D */ daddu $a1, $s4, $zero +/* 9B72E4 80240964 0C0125AE */ jal func_800496B8 +/* 9B72E8 80240968 02A0302D */ daddu $a2, $s5, $zero +/* 9B72EC 8024096C 08090294 */ j .L80240A50 +/* 9B72F0 80240970 00000000 */ nop +.L80240974: +/* 9B72F4 80240974 0260202D */ daddu $a0, $s3, $zero +/* 9B72F8 80240978 0280282D */ daddu $a1, $s4, $zero +/* 9B72FC 8024097C 0C0126D1 */ jal func_80049B44 +/* 9B7300 80240980 02A0302D */ daddu $a2, $s5, $zero +/* 9B7304 80240984 8E230088 */ lw $v1, 0x88($s1) +/* 9B7308 80240988 24020006 */ addiu $v0, $zero, 6 +/* 9B730C 8024098C 14620014 */ bne $v1, $v0, .L802409E0 +/* 9B7310 80240990 0260202D */ daddu $a0, $s3, $zero +/* 9B7314 80240994 0C00A67F */ jal rand_int +/* 9B7318 80240998 24040064 */ addiu $a0, $zero, 0x64 +/* 9B731C 8024099C 28420021 */ slti $v0, $v0, 0x21 +/* 9B7320 802409A0 5040000F */ beql $v0, $zero, .L802409E0 +/* 9B7324 802409A4 0260202D */ daddu $a0, $s3, $zero +/* 9B7328 802409A8 8E22008C */ lw $v0, 0x8c($s1) +/* 9B732C 802409AC 10400005 */ beqz $v0, .L802409C4 +/* 9B7330 802409B0 3C020055 */ lui $v0, 0x55 +/* 9B7334 802409B4 3442002F */ ori $v0, $v0, 0x2f +/* 9B7338 802409B8 AE20008C */ sw $zero, 0x8c($s1) +/* 9B733C 802409BC 08090274 */ j .L802409D0 +/* 9B7340 802409C0 A22000B5 */ sb $zero, 0xb5($s1) +.L802409C4: +/* 9B7344 802409C4 3442002E */ ori $v0, $v0, 0x2e +/* 9B7348 802409C8 AE30008C */ sw $s0, 0x8c($s1) +/* 9B734C 802409CC A23000B5 */ sb $s0, 0xb5($s1) +.L802409D0: +/* 9B7350 802409D0 AE420028 */ sw $v0, 0x28($s2) +/* 9B7354 802409D4 24020007 */ addiu $v0, $zero, 7 +/* 9B7358 802409D8 080902AF */ j .L80240ABC +/* 9B735C 802409DC AE220090 */ sw $v0, 0x90($s1) +.L802409E0: +/* 9B7360 802409E0 0280282D */ daddu $a1, $s4, $zero +/* 9B7364 802409E4 0C012701 */ jal func_80049C04 +/* 9B7368 802409E8 02A0302D */ daddu $a2, $s5, $zero +/* 9B736C 802409EC 08090294 */ j .L80240A50 +/* 9B7370 802409F0 00000000 */ nop +.L802409F4: +/* 9B7374 802409F4 0260202D */ daddu $a0, $s3, $zero +/* 9B7378 802409F8 0280282D */ daddu $a1, $s4, $zero +/* 9B737C 802409FC 0C0900C4 */ jal func_80240310_9B6C90 +/* 9B7380 80240A00 02A0302D */ daddu $a2, $s5, $zero +/* 9B7384 80240A04 0260202D */ daddu $a0, $s3, $zero +.L80240A08: +/* 9B7388 80240A08 0280282D */ daddu $a1, $s4, $zero +/* 9B738C 80240A0C 0C0900E3 */ jal func_8024038C_9B6D0C +/* 9B7390 80240A10 02A0302D */ daddu $a2, $s5, $zero +/* 9B7394 80240A14 08090294 */ j .L80240A50 +/* 9B7398 80240A18 00000000 */ nop +.L80240A1C: +/* 9B739C 80240A1C 0260202D */ daddu $a0, $s3, $zero +/* 9B73A0 80240A20 0280282D */ daddu $a1, $s4, $zero +/* 9B73A4 80240A24 0C090130 */ jal func_802404C0_9B6E40 +/* 9B73A8 80240A28 02A0302D */ daddu $a2, $s5, $zero +/* 9B73AC 80240A2C 08090294 */ j .L80240A50 +/* 9B73B0 80240A30 00000000 */ nop +.L80240A34: +/* 9B73B4 80240A34 0280282D */ daddu $a1, $s4, $zero +/* 9B73B8 80240A38 0C090189 */ jal func_80240624_9B6FA4 +/* 9B73BC 80240A3C 02A0302D */ daddu $a2, $s5, $zero +/* 9B73C0 80240A40 08090294 */ j .L80240A50 +/* 9B73C4 80240A44 00000000 */ nop +.L80240A48: +/* 9B73C8 80240A48 0C0129CF */ jal func_8004A73C +/* 9B73CC 80240A4C 0260202D */ daddu $a0, $s3, $zero +.L80240A50: +/* 9B73D0 80240A50 8E230088 */ lw $v1, 0x88($s1) +/* 9B73D4 80240A54 24020006 */ addiu $v0, $zero, 6 +/* 9B73D8 80240A58 14620019 */ bne $v1, $v0, .L80240AC0 +/* 9B73DC 80240A5C 0000102D */ daddu $v0, $zero, $zero +/* 9B73E0 80240A60 8E22008C */ lw $v0, 0x8c($s1) +/* 9B73E4 80240A64 10400003 */ beqz $v0, .L80240A74 +/* 9B73E8 80240A68 24020001 */ addiu $v0, $zero, 1 +/* 9B73EC 80240A6C 0809029E */ j .L80240A78 +/* 9B73F0 80240A70 A22200B5 */ sb $v0, 0xb5($s1) +.L80240A74: +/* 9B73F4 80240A74 A22000B5 */ sb $zero, 0xb5($s1) +.L80240A78: +/* 9B73F8 80240A78 8E22008C */ lw $v0, 0x8c($s1) +/* 9B73FC 80240A7C 1040000F */ beqz $v0, .L80240ABC +/* 9B7400 80240A80 3C03FFAA */ lui $v1, 0xffaa +/* 9B7404 80240A84 8E420028 */ lw $v0, 0x28($s2) +/* 9B7408 80240A88 3463FFFC */ ori $v1, $v1, 0xfffc +/* 9B740C 80240A8C 00431821 */ addu $v1, $v0, $v1 +/* 9B7410 80240A90 2C620015 */ sltiu $v0, $v1, 0x15 +/* 9B7414 80240A94 10400009 */ beqz $v0, .L80240ABC +/* 9B7418 80240A98 00031080 */ sll $v0, $v1, 2 +/* 9B741C 80240A9C 3C018024 */ lui $at, 0x8024 +/* 9B7420 80240AA0 00220821 */ addu $at, $at, $v0 +/* 9B7424 80240AA4 8C224828 */ lw $v0, 0x4828($at) +/* 9B7428 80240AA8 00400008 */ jr $v0 +/* 9B742C 80240AAC 00000000 */ nop +/* 9B7430 80240AB0 8E420028 */ lw $v0, 0x28($s2) +/* 9B7434 80240AB4 24420001 */ addiu $v0, $v0, 1 +/* 9B7438 80240AB8 AE420028 */ sw $v0, 0x28($s2) +.L80240ABC: +/* 9B743C 80240ABC 0000102D */ daddu $v0, $zero, $zero +.L80240AC0: +/* 9B7440 80240AC0 8FBF0068 */ lw $ra, 0x68($sp) +/* 9B7444 80240AC4 8FB50064 */ lw $s5, 0x64($sp) +/* 9B7448 80240AC8 8FB40060 */ lw $s4, 0x60($sp) +/* 9B744C 80240ACC 8FB3005C */ lw $s3, 0x5c($sp) +/* 9B7450 80240AD0 8FB20058 */ lw $s2, 0x58($sp) +/* 9B7454 80240AD4 8FB10054 */ lw $s1, 0x54($sp) +/* 9B7458 80240AD8 8FB00050 */ lw $s0, 0x50($sp) +/* 9B745C 80240ADC 03E00008 */ jr $ra +/* 9B7460 80240AE0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4.s deleted file mode 100644 index b47e22e67a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4.s +++ /dev/null @@ -1,116 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AE4 -/* 9B7464 80240AE4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9B7468 80240AE8 AFB3002C */ sw $s3, 0x2c($sp) -/* 9B746C 80240AEC 0080982D */ daddu $s3, $a0, $zero -/* 9B7470 80240AF0 AFBF0030 */ sw $ra, 0x30($sp) -/* 9B7474 80240AF4 AFB20028 */ sw $s2, 0x28($sp) -/* 9B7478 80240AF8 AFB10024 */ sw $s1, 0x24($sp) -/* 9B747C 80240AFC AFB00020 */ sw $s0, 0x20($sp) -/* 9B7480 80240B00 8E710148 */ lw $s1, 0x148($s3) -/* 9B7484 80240B04 86240008 */ lh $a0, 8($s1) -/* 9B7488 80240B08 0C00EABB */ jal get_npc_unsafe -/* 9B748C 80240B0C 00A0902D */ daddu $s2, $a1, $zero -/* 9B7490 80240B10 8E440004 */ lw $a0, 4($s2) -/* 9B7494 80240B14 0040802D */ daddu $s0, $v0, $zero -/* 9B7498 80240B18 00041FC2 */ srl $v1, $a0, 0x1f -/* 9B749C 80240B1C 00832021 */ addu $a0, $a0, $v1 -/* 9B74A0 80240B20 00042043 */ sra $a0, $a0, 1 -/* 9B74A4 80240B24 0C00A67F */ jal rand_int -/* 9B74A8 80240B28 24840001 */ addiu $a0, $a0, 1 -/* 9B74AC 80240B2C 8E430004 */ lw $v1, 4($s2) -/* 9B74B0 80240B30 000327C2 */ srl $a0, $v1, 0x1f -/* 9B74B4 80240B34 00641821 */ addu $v1, $v1, $a0 -/* 9B74B8 80240B38 00031843 */ sra $v1, $v1, 1 -/* 9B74BC 80240B3C 00621821 */ addu $v1, $v1, $v0 -/* 9B74C0 80240B40 A603008E */ sh $v1, 0x8e($s0) -/* 9B74C4 80240B44 8E2300D0 */ lw $v1, 0xd0($s1) -/* 9B74C8 80240B48 C6000040 */ lwc1 $f0, 0x40($s0) -/* 9B74CC 80240B4C C4640000 */ lwc1 $f4, ($v1) -/* 9B74D0 80240B50 46802120 */ cvt.s.w $f4, $f4 -/* 9B74D4 80240B54 C4620008 */ lwc1 $f2, 8($v1) -/* 9B74D8 80240B58 468010A0 */ cvt.s.w $f2, $f2 -/* 9B74DC 80240B5C E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B74E0 80240B60 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B74E4 80240B64 44061000 */ mfc1 $a2, $f2 -/* 9B74E8 80240B68 C440000C */ lwc1 $f0, 0xc($v0) -/* 9B74EC 80240B6C 46800020 */ cvt.s.w $f0, $f0 -/* 9B74F0 80240B70 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9B74F4 80240B74 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B74F8 80240B78 44052000 */ mfc1 $a1, $f4 -/* 9B74FC 80240B7C C4400010 */ lwc1 $f0, 0x10($v0) -/* 9B7500 80240B80 46800020 */ cvt.s.w $f0, $f0 -/* 9B7504 80240B84 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B7508 80240B88 8C640018 */ lw $a0, 0x18($v1) -/* 9B750C 80240B8C 0C0123F5 */ jal is_point_within_region -/* 9B7510 80240B90 8E070038 */ lw $a3, 0x38($s0) -/* 9B7514 80240B94 1040000E */ beqz $v0, .L80240BD0 -/* 9B7518 80240B98 00000000 */ nop -/* 9B751C 80240B9C 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7520 80240BA0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B7524 80240BA4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B7528 80240BA8 C4460000 */ lwc1 $f6, ($v0) -/* 9B752C 80240BAC 468031A0 */ cvt.s.w $f6, $f6 -/* 9B7530 80240BB0 44063000 */ mfc1 $a2, $f6 -/* 9B7534 80240BB4 C4460008 */ lwc1 $f6, 8($v0) -/* 9B7538 80240BB8 468031A0 */ cvt.s.w $f6, $f6 -/* 9B753C 80240BBC 44073000 */ mfc1 $a3, $f6 -/* 9B7540 80240BC0 0C00A720 */ jal atan2 -/* 9B7544 80240BC4 00000000 */ nop -/* 9B7548 80240BC8 08090300 */ j .L80240C00 -/* 9B754C 80240BCC E600000C */ swc1 $f0, 0xc($s0) -.L80240BD0: -/* 9B7550 80240BD0 0C00A67F */ jal rand_int -/* 9B7554 80240BD4 2404003C */ addiu $a0, $zero, 0x3c -/* 9B7558 80240BD8 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9B755C 80240BDC 44820000 */ mtc1 $v0, $f0 -/* 9B7560 80240BE0 00000000 */ nop -/* 9B7564 80240BE4 46800020 */ cvt.s.w $f0, $f0 -/* 9B7568 80240BE8 46006300 */ add.s $f12, $f12, $f0 -/* 9B756C 80240BEC 3C0141F0 */ lui $at, 0x41f0 -/* 9B7570 80240BF0 44810000 */ mtc1 $at, $f0 -/* 9B7574 80240BF4 0C00A6C9 */ jal clamp_angle -/* 9B7578 80240BF8 46006301 */ sub.s $f12, $f12, $f0 -/* 9B757C 80240BFC E600000C */ swc1 $f0, 0xc($s0) -.L80240C00: -/* 9B7580 80240C00 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B7584 80240C04 8C420004 */ lw $v0, 4($v0) -/* 9B7588 80240C08 AE020028 */ sw $v0, 0x28($s0) -/* 9B758C 80240C0C AE600074 */ sw $zero, 0x74($s3) -/* 9B7590 80240C10 8E2200D0 */ lw $v0, 0xd0($s1) -/* 9B7594 80240C14 8C420014 */ lw $v0, 0x14($v0) -/* 9B7598 80240C18 04410004 */ bgez $v0, .L80240C2C -/* 9B759C 80240C1C 00000000 */ nop -/* 9B75A0 80240C20 C6400000 */ lwc1 $f0, ($s2) -/* 9B75A4 80240C24 08090313 */ j .L80240C4C -/* 9B75A8 80240C28 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C2C: -/* 9B75AC 80240C2C 3C018024 */ lui $at, 0x8024 -/* 9B75B0 80240C30 D4224880 */ ldc1 $f2, 0x4880($at) -/* 9B75B4 80240C34 44820000 */ mtc1 $v0, $f0 -/* 9B75B8 80240C38 00000000 */ nop -/* 9B75BC 80240C3C 46800021 */ cvt.d.w $f0, $f0 -/* 9B75C0 80240C40 46220003 */ div.d $f0, $f0, $f2 -/* 9B75C4 80240C44 46200020 */ cvt.s.d $f0, $f0 -/* 9B75C8 80240C48 E6000018 */ swc1 $f0, 0x18($s0) -.L80240C4C: -/* 9B75CC 80240C4C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B75D0 80240C50 3C014059 */ lui $at, 0x4059 -/* 9B75D4 80240C54 44811800 */ mtc1 $at, $f3 -/* 9B75D8 80240C58 44801000 */ mtc1 $zero, $f2 -/* 9B75DC 80240C5C 46000021 */ cvt.d.s $f0, $f0 -/* 9B75E0 80240C60 46220002 */ mul.d $f0, $f0, $f2 -/* 9B75E4 80240C64 00000000 */ nop -/* 9B75E8 80240C68 24020001 */ addiu $v0, $zero, 1 -/* 9B75EC 80240C6C 4620018D */ trunc.w.d $f6, $f0 -/* 9B75F0 80240C70 E626007C */ swc1 $f6, 0x7c($s1) -/* 9B75F4 80240C74 AE620070 */ sw $v0, 0x70($s3) -/* 9B75F8 80240C78 8FBF0030 */ lw $ra, 0x30($sp) -/* 9B75FC 80240C7C 8FB3002C */ lw $s3, 0x2c($sp) -/* 9B7600 80240C80 8FB20028 */ lw $s2, 0x28($sp) -/* 9B7604 80240C84 8FB10024 */ lw $s1, 0x24($sp) -/* 9B7608 80240C88 8FB00020 */ lw $s0, 0x20($sp) -/* 9B760C 80240C8C 03E00008 */ jr $ra -/* 9B7610 80240C90 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s new file mode 100644 index 0000000000..0e02b9416a --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80240AE4_9B7464.s @@ -0,0 +1,116 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240AE4_9B7464 +/* 9B7464 80240AE4 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 9B7468 80240AE8 AFB3002C */ sw $s3, 0x2c($sp) +/* 9B746C 80240AEC 0080982D */ daddu $s3, $a0, $zero +/* 9B7470 80240AF0 AFBF0030 */ sw $ra, 0x30($sp) +/* 9B7474 80240AF4 AFB20028 */ sw $s2, 0x28($sp) +/* 9B7478 80240AF8 AFB10024 */ sw $s1, 0x24($sp) +/* 9B747C 80240AFC AFB00020 */ sw $s0, 0x20($sp) +/* 9B7480 80240B00 8E710148 */ lw $s1, 0x148($s3) +/* 9B7484 80240B04 86240008 */ lh $a0, 8($s1) +/* 9B7488 80240B08 0C00EABB */ jal get_npc_unsafe +/* 9B748C 80240B0C 00A0902D */ daddu $s2, $a1, $zero +/* 9B7490 80240B10 8E440004 */ lw $a0, 4($s2) +/* 9B7494 80240B14 0040802D */ daddu $s0, $v0, $zero +/* 9B7498 80240B18 00041FC2 */ srl $v1, $a0, 0x1f +/* 9B749C 80240B1C 00832021 */ addu $a0, $a0, $v1 +/* 9B74A0 80240B20 00042043 */ sra $a0, $a0, 1 +/* 9B74A4 80240B24 0C00A67F */ jal rand_int +/* 9B74A8 80240B28 24840001 */ addiu $a0, $a0, 1 +/* 9B74AC 80240B2C 8E430004 */ lw $v1, 4($s2) +/* 9B74B0 80240B30 000327C2 */ srl $a0, $v1, 0x1f +/* 9B74B4 80240B34 00641821 */ addu $v1, $v1, $a0 +/* 9B74B8 80240B38 00031843 */ sra $v1, $v1, 1 +/* 9B74BC 80240B3C 00621821 */ addu $v1, $v1, $v0 +/* 9B74C0 80240B40 A603008E */ sh $v1, 0x8e($s0) +/* 9B74C4 80240B44 8E2300D0 */ lw $v1, 0xd0($s1) +/* 9B74C8 80240B48 C6000040 */ lwc1 $f0, 0x40($s0) +/* 9B74CC 80240B4C C4640000 */ lwc1 $f4, ($v1) +/* 9B74D0 80240B50 46802120 */ cvt.s.w $f4, $f4 +/* 9B74D4 80240B54 C4620008 */ lwc1 $f2, 8($v1) +/* 9B74D8 80240B58 468010A0 */ cvt.s.w $f2, $f2 +/* 9B74DC 80240B5C E7A00010 */ swc1 $f0, 0x10($sp) +/* 9B74E0 80240B60 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9B74E4 80240B64 44061000 */ mfc1 $a2, $f2 +/* 9B74E8 80240B68 C440000C */ lwc1 $f0, 0xc($v0) +/* 9B74EC 80240B6C 46800020 */ cvt.s.w $f0, $f0 +/* 9B74F0 80240B70 E7A00014 */ swc1 $f0, 0x14($sp) +/* 9B74F4 80240B74 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9B74F8 80240B78 44052000 */ mfc1 $a1, $f4 +/* 9B74FC 80240B7C C4400010 */ lwc1 $f0, 0x10($v0) +/* 9B7500 80240B80 46800020 */ cvt.s.w $f0, $f0 +/* 9B7504 80240B84 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9B7508 80240B88 8C640018 */ lw $a0, 0x18($v1) +/* 9B750C 80240B8C 0C0123F5 */ jal is_point_within_region +/* 9B7510 80240B90 8E070038 */ lw $a3, 0x38($s0) +/* 9B7514 80240B94 1040000E */ beqz $v0, .L80240BD0 +/* 9B7518 80240B98 00000000 */ nop +/* 9B751C 80240B9C 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9B7520 80240BA0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9B7524 80240BA4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9B7528 80240BA8 C4460000 */ lwc1 $f6, ($v0) +/* 9B752C 80240BAC 468031A0 */ cvt.s.w $f6, $f6 +/* 9B7530 80240BB0 44063000 */ mfc1 $a2, $f6 +/* 9B7534 80240BB4 C4460008 */ lwc1 $f6, 8($v0) +/* 9B7538 80240BB8 468031A0 */ cvt.s.w $f6, $f6 +/* 9B753C 80240BBC 44073000 */ mfc1 $a3, $f6 +/* 9B7540 80240BC0 0C00A720 */ jal atan2 +/* 9B7544 80240BC4 00000000 */ nop +/* 9B7548 80240BC8 08090300 */ j .L80240C00 +/* 9B754C 80240BCC E600000C */ swc1 $f0, 0xc($s0) +.L80240BD0: +/* 9B7550 80240BD0 0C00A67F */ jal rand_int +/* 9B7554 80240BD4 2404003C */ addiu $a0, $zero, 0x3c +/* 9B7558 80240BD8 C60C000C */ lwc1 $f12, 0xc($s0) +/* 9B755C 80240BDC 44820000 */ mtc1 $v0, $f0 +/* 9B7560 80240BE0 00000000 */ nop +/* 9B7564 80240BE4 46800020 */ cvt.s.w $f0, $f0 +/* 9B7568 80240BE8 46006300 */ add.s $f12, $f12, $f0 +/* 9B756C 80240BEC 3C0141F0 */ lui $at, 0x41f0 +/* 9B7570 80240BF0 44810000 */ mtc1 $at, $f0 +/* 9B7574 80240BF4 0C00A6C9 */ jal clamp_angle +/* 9B7578 80240BF8 46006301 */ sub.s $f12, $f12, $f0 +/* 9B757C 80240BFC E600000C */ swc1 $f0, 0xc($s0) +.L80240C00: +/* 9B7580 80240C00 8E2200CC */ lw $v0, 0xcc($s1) +/* 9B7584 80240C04 8C420004 */ lw $v0, 4($v0) +/* 9B7588 80240C08 AE020028 */ sw $v0, 0x28($s0) +/* 9B758C 80240C0C AE600074 */ sw $zero, 0x74($s3) +/* 9B7590 80240C10 8E2200D0 */ lw $v0, 0xd0($s1) +/* 9B7594 80240C14 8C420014 */ lw $v0, 0x14($v0) +/* 9B7598 80240C18 04410004 */ bgez $v0, .L80240C2C +/* 9B759C 80240C1C 00000000 */ nop +/* 9B75A0 80240C20 C6400000 */ lwc1 $f0, ($s2) +/* 9B75A4 80240C24 08090313 */ j .L80240C4C +/* 9B75A8 80240C28 E6000018 */ swc1 $f0, 0x18($s0) +.L80240C2C: +/* 9B75AC 80240C2C 3C018024 */ lui $at, 0x8024 +/* 9B75B0 80240C30 D4224880 */ ldc1 $f2, 0x4880($at) +/* 9B75B4 80240C34 44820000 */ mtc1 $v0, $f0 +/* 9B75B8 80240C38 00000000 */ nop +/* 9B75BC 80240C3C 46800021 */ cvt.d.w $f0, $f0 +/* 9B75C0 80240C40 46220003 */ div.d $f0, $f0, $f2 +/* 9B75C4 80240C44 46200020 */ cvt.s.d $f0, $f0 +/* 9B75C8 80240C48 E6000018 */ swc1 $f0, 0x18($s0) +.L80240C4C: +/* 9B75CC 80240C4C C600003C */ lwc1 $f0, 0x3c($s0) +/* 9B75D0 80240C50 3C014059 */ lui $at, 0x4059 +/* 9B75D4 80240C54 44811800 */ mtc1 $at, $f3 +/* 9B75D8 80240C58 44801000 */ mtc1 $zero, $f2 +/* 9B75DC 80240C5C 46000021 */ cvt.d.s $f0, $f0 +/* 9B75E0 80240C60 46220002 */ mul.d $f0, $f0, $f2 +/* 9B75E4 80240C64 00000000 */ nop +/* 9B75E8 80240C68 24020001 */ addiu $v0, $zero, 1 +/* 9B75EC 80240C6C 4620018D */ trunc.w.d $f6, $f0 +/* 9B75F0 80240C70 E626007C */ swc1 $f6, 0x7c($s1) +/* 9B75F4 80240C74 AE620070 */ sw $v0, 0x70($s3) +/* 9B75F8 80240C78 8FBF0030 */ lw $ra, 0x30($sp) +/* 9B75FC 80240C7C 8FB3002C */ lw $s3, 0x2c($sp) +/* 9B7600 80240C80 8FB20028 */ lw $s2, 0x28($sp) +/* 9B7604 80240C84 8FB10024 */ lw $s1, 0x24($sp) +/* 9B7608 80240C88 8FB00020 */ lw $s0, 0x20($sp) +/* 9B760C 80240C8C 03E00008 */ jr $ra +/* 9B7610 80240C90 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC.s deleted file mode 100644 index 93d2c0130e..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412BC -/* 9B7C3C 802412BC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B7C40 802412C0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9B7C44 802412C4 0080982D */ daddu $s3, $a0, $zero -/* 9B7C48 802412C8 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B7C4C 802412CC AFB20018 */ sw $s2, 0x18($sp) -/* 9B7C50 802412D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9B7C54 802412D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9B7C58 802412D8 8E720148 */ lw $s2, 0x148($s3) -/* 9B7C5C 802412DC 86440008 */ lh $a0, 8($s2) -/* 9B7C60 802412E0 0C00EABB */ jal get_npc_unsafe -/* 9B7C64 802412E4 00A0882D */ daddu $s1, $a1, $zero -/* 9B7C68 802412E8 8E240008 */ lw $a0, 8($s1) -/* 9B7C6C 802412EC 0040802D */ daddu $s0, $v0, $zero -/* 9B7C70 802412F0 00041FC2 */ srl $v1, $a0, 0x1f -/* 9B7C74 802412F4 00832021 */ addu $a0, $a0, $v1 -/* 9B7C78 802412F8 00042043 */ sra $a0, $a0, 1 -/* 9B7C7C 802412FC 0C00A67F */ jal rand_int -/* 9B7C80 80241300 24840001 */ addiu $a0, $a0, 1 -/* 9B7C84 80241304 8E230008 */ lw $v1, 8($s1) -/* 9B7C88 80241308 240400B4 */ addiu $a0, $zero, 0xb4 -/* 9B7C8C 8024130C 00032FC2 */ srl $a1, $v1, 0x1f -/* 9B7C90 80241310 00651821 */ addu $v1, $v1, $a1 -/* 9B7C94 80241314 00031843 */ sra $v1, $v1, 1 -/* 9B7C98 80241318 00621821 */ addu $v1, $v1, $v0 -/* 9B7C9C 8024131C 0C00A67F */ jal rand_int -/* 9B7CA0 80241320 A603008E */ sh $v1, 0x8e($s0) -/* 9B7CA4 80241324 C60C000C */ lwc1 $f12, 0xc($s0) -/* 9B7CA8 80241328 44820000 */ mtc1 $v0, $f0 -/* 9B7CAC 8024132C 00000000 */ nop -/* 9B7CB0 80241330 46800020 */ cvt.s.w $f0, $f0 -/* 9B7CB4 80241334 46006300 */ add.s $f12, $f12, $f0 -/* 9B7CB8 80241338 3C0142B4 */ lui $at, 0x42b4 -/* 9B7CBC 8024133C 44810000 */ mtc1 $at, $f0 -/* 9B7CC0 80241340 0C00A6C9 */ jal clamp_angle -/* 9B7CC4 80241344 46006301 */ sub.s $f12, $f12, $f0 -/* 9B7CC8 80241348 E600000C */ swc1 $f0, 0xc($s0) -/* 9B7CCC 8024134C 8E4200CC */ lw $v0, 0xcc($s2) -/* 9B7CD0 80241350 8C420000 */ lw $v0, ($v0) -/* 9B7CD4 80241354 AE020028 */ sw $v0, 0x28($s0) -/* 9B7CD8 80241358 24020003 */ addiu $v0, $zero, 3 -/* 9B7CDC 8024135C AE620070 */ sw $v0, 0x70($s3) -/* 9B7CE0 80241360 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B7CE4 80241364 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B7CE8 80241368 8FB20018 */ lw $s2, 0x18($sp) -/* 9B7CEC 8024136C 8FB10014 */ lw $s1, 0x14($sp) -/* 9B7CF0 80241370 8FB00010 */ lw $s0, 0x10($sp) -/* 9B7CF4 80241374 03E00008 */ jr $ra -/* 9B7CF8 80241378 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s new file mode 100644 index 0000000000..4fc5c2f0f9 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802412BC_9B7C3C.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802412BC_9B7C3C +/* 9B7C3C 802412BC 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9B7C40 802412C0 AFB3001C */ sw $s3, 0x1c($sp) +/* 9B7C44 802412C4 0080982D */ daddu $s3, $a0, $zero +/* 9B7C48 802412C8 AFBF0020 */ sw $ra, 0x20($sp) +/* 9B7C4C 802412CC AFB20018 */ sw $s2, 0x18($sp) +/* 9B7C50 802412D0 AFB10014 */ sw $s1, 0x14($sp) +/* 9B7C54 802412D4 AFB00010 */ sw $s0, 0x10($sp) +/* 9B7C58 802412D8 8E720148 */ lw $s2, 0x148($s3) +/* 9B7C5C 802412DC 86440008 */ lh $a0, 8($s2) +/* 9B7C60 802412E0 0C00EABB */ jal get_npc_unsafe +/* 9B7C64 802412E4 00A0882D */ daddu $s1, $a1, $zero +/* 9B7C68 802412E8 8E240008 */ lw $a0, 8($s1) +/* 9B7C6C 802412EC 0040802D */ daddu $s0, $v0, $zero +/* 9B7C70 802412F0 00041FC2 */ srl $v1, $a0, 0x1f +/* 9B7C74 802412F4 00832021 */ addu $a0, $a0, $v1 +/* 9B7C78 802412F8 00042043 */ sra $a0, $a0, 1 +/* 9B7C7C 802412FC 0C00A67F */ jal rand_int +/* 9B7C80 80241300 24840001 */ addiu $a0, $a0, 1 +/* 9B7C84 80241304 8E230008 */ lw $v1, 8($s1) +/* 9B7C88 80241308 240400B4 */ addiu $a0, $zero, 0xb4 +/* 9B7C8C 8024130C 00032FC2 */ srl $a1, $v1, 0x1f +/* 9B7C90 80241310 00651821 */ addu $v1, $v1, $a1 +/* 9B7C94 80241314 00031843 */ sra $v1, $v1, 1 +/* 9B7C98 80241318 00621821 */ addu $v1, $v1, $v0 +/* 9B7C9C 8024131C 0C00A67F */ jal rand_int +/* 9B7CA0 80241320 A603008E */ sh $v1, 0x8e($s0) +/* 9B7CA4 80241324 C60C000C */ lwc1 $f12, 0xc($s0) +/* 9B7CA8 80241328 44820000 */ mtc1 $v0, $f0 +/* 9B7CAC 8024132C 00000000 */ nop +/* 9B7CB0 80241330 46800020 */ cvt.s.w $f0, $f0 +/* 9B7CB4 80241334 46006300 */ add.s $f12, $f12, $f0 +/* 9B7CB8 80241338 3C0142B4 */ lui $at, 0x42b4 +/* 9B7CBC 8024133C 44810000 */ mtc1 $at, $f0 +/* 9B7CC0 80241340 0C00A6C9 */ jal clamp_angle +/* 9B7CC4 80241344 46006301 */ sub.s $f12, $f12, $f0 +/* 9B7CC8 80241348 E600000C */ swc1 $f0, 0xc($s0) +/* 9B7CCC 8024134C 8E4200CC */ lw $v0, 0xcc($s2) +/* 9B7CD0 80241350 8C420000 */ lw $v0, ($v0) +/* 9B7CD4 80241354 AE020028 */ sw $v0, 0x28($s0) +/* 9B7CD8 80241358 24020003 */ addiu $v0, $zero, 3 +/* 9B7CDC 8024135C AE620070 */ sw $v0, 0x70($s3) +/* 9B7CE0 80241360 8FBF0020 */ lw $ra, 0x20($sp) +/* 9B7CE4 80241364 8FB3001C */ lw $s3, 0x1c($sp) +/* 9B7CE8 80241368 8FB20018 */ lw $s2, 0x18($sp) +/* 9B7CEC 8024136C 8FB10014 */ lw $s1, 0x14($sp) +/* 9B7CF0 80241370 8FB00010 */ lw $s0, 0x10($sp) +/* 9B7CF4 80241374 03E00008 */ jr $ra +/* 9B7CF8 80241378 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C.s deleted file mode 100644 index 629860e6d2..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C.s +++ /dev/null @@ -1,225 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024137C -/* 9B7CFC 8024137C 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 9B7D00 80241380 AFB3004C */ sw $s3, 0x4c($sp) -/* 9B7D04 80241384 0080982D */ daddu $s3, $a0, $zero -/* 9B7D08 80241388 AFBF0054 */ sw $ra, 0x54($sp) -/* 9B7D0C 8024138C AFB40050 */ sw $s4, 0x50($sp) -/* 9B7D10 80241390 AFB20048 */ sw $s2, 0x48($sp) -/* 9B7D14 80241394 AFB10044 */ sw $s1, 0x44($sp) -/* 9B7D18 80241398 AFB00040 */ sw $s0, 0x40($sp) -/* 9B7D1C 8024139C F7BA0070 */ sdc1 $f26, 0x70($sp) -/* 9B7D20 802413A0 F7B80068 */ sdc1 $f24, 0x68($sp) -/* 9B7D24 802413A4 F7B60060 */ sdc1 $f22, 0x60($sp) -/* 9B7D28 802413A8 F7B40058 */ sdc1 $f20, 0x58($sp) -/* 9B7D2C 802413AC 8E710148 */ lw $s1, 0x148($s3) -/* 9B7D30 802413B0 00A0902D */ daddu $s2, $a1, $zero -/* 9B7D34 802413B4 86240008 */ lh $a0, 8($s1) -/* 9B7D38 802413B8 0C00EABB */ jal get_npc_unsafe -/* 9B7D3C 802413BC 00C0A02D */ daddu $s4, $a2, $zero -/* 9B7D40 802413C0 0040802D */ daddu $s0, $v0, $zero -/* 9B7D44 802413C4 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9B7D48 802413C8 46800020 */ cvt.s.w $f0, $f0 -/* 9B7D4C 802413CC 46000021 */ cvt.d.s $f0, $f0 -/* 9B7D50 802413D0 3C014059 */ lui $at, 0x4059 -/* 9B7D54 802413D4 44811800 */ mtc1 $at, $f3 -/* 9B7D58 802413D8 44801000 */ mtc1 $zero, $f2 -/* 9B7D5C 802413DC 8602008E */ lh $v0, 0x8e($s0) -/* 9B7D60 802413E0 9603008E */ lhu $v1, 0x8e($s0) -/* 9B7D64 802413E4 46220003 */ div.d $f0, $f0, $f2 -/* 9B7D68 802413E8 46200620 */ cvt.s.d $f24, $f0 -/* 9B7D6C 802413EC C6200088 */ lwc1 $f0, 0x88($s1) -/* 9B7D70 802413F0 46800020 */ cvt.s.w $f0, $f0 -/* 9B7D74 802413F4 46000021 */ cvt.d.s $f0, $f0 -/* 9B7D78 802413F8 46220003 */ div.d $f0, $f0, $f2 -/* 9B7D7C 802413FC 46200020 */ cvt.s.d $f0, $f0 -/* 9B7D80 80241400 18400003 */ blez $v0, .L80241410 -/* 9B7D84 80241404 4600C680 */ add.s $f26, $f24, $f0 -/* 9B7D88 80241408 2462FFFF */ addiu $v0, $v1, -1 -/* 9B7D8C 8024140C A602008E */ sh $v0, 0x8e($s0) -.L80241410: -/* 9B7D90 80241410 8E220070 */ lw $v0, 0x70($s1) -/* 9B7D94 80241414 18400034 */ blez $v0, .L802414E8 -/* 9B7D98 80241418 00000000 */ nop -/* 9B7D9C 8024141C C62C0074 */ lwc1 $f12, 0x74($s1) -/* 9B7DA0 80241420 46806320 */ cvt.s.w $f12, $f12 -/* 9B7DA4 80241424 44820000 */ mtc1 $v0, $f0 -/* 9B7DA8 80241428 00000000 */ nop -/* 9B7DAC 8024142C 46800020 */ cvt.s.w $f0, $f0 -/* 9B7DB0 80241430 46000021 */ cvt.d.s $f0, $f0 -/* 9B7DB4 80241434 46220003 */ div.d $f0, $f0, $f2 -/* 9B7DB8 80241438 0C00A8BB */ jal sin_deg -/* 9B7DBC 8024143C 462005A0 */ cvt.s.d $f22, $f0 -/* 9B7DC0 80241440 8E020000 */ lw $v0, ($s0) -/* 9B7DC4 80241444 30420008 */ andi $v0, $v0, 8 -/* 9B7DC8 80241448 10400003 */ beqz $v0, .L80241458 -/* 9B7DCC 8024144C 46000506 */ mov.s $f20, $f0 -/* 9B7DD0 80241450 08090526 */ j .L80241498 -/* 9B7DD4 80241454 0000102D */ daddu $v0, $zero, $zero -.L80241458: -/* 9B7DD8 80241458 27A50028 */ addiu $a1, $sp, 0x28 -/* 9B7DDC 8024145C 27A6002C */ addiu $a2, $sp, 0x2c -/* 9B7DE0 80241460 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B7DE4 80241464 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B7DE8 80241468 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B7DEC 8024146C 3C01447A */ lui $at, 0x447a -/* 9B7DF0 80241470 44813000 */ mtc1 $at, $f6 -/* 9B7DF4 80241474 27A20034 */ addiu $v0, $sp, 0x34 -/* 9B7DF8 80241478 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B7DFC 8024147C E7A2002C */ swc1 $f2, 0x2c($sp) -/* 9B7E00 80241480 E7A40030 */ swc1 $f4, 0x30($sp) -/* 9B7E04 80241484 E7A60034 */ swc1 $f6, 0x34($sp) -/* 9B7E08 80241488 AFA20010 */ sw $v0, 0x10($sp) -/* 9B7E0C 8024148C 8E040080 */ lw $a0, 0x80($s0) -/* 9B7E10 80241490 0C0372DF */ jal func_800DCB7C -/* 9B7E14 80241494 27A70030 */ addiu $a3, $sp, 0x30 -.L80241498: -/* 9B7E18 80241498 10400007 */ beqz $v0, .L802414B8 -/* 9B7E1C 8024149C 00000000 */ nop -/* 9B7E20 802414A0 4616A082 */ mul.s $f2, $f20, $f22 -/* 9B7E24 802414A4 00000000 */ nop -/* 9B7E28 802414A8 C7A0002C */ lwc1 $f0, 0x2c($sp) -/* 9B7E2C 802414AC 46180000 */ add.s $f0, $f0, $f24 -/* 9B7E30 802414B0 08090531 */ j .L802414C4 -/* 9B7E34 802414B4 46020000 */ add.s $f0, $f0, $f2 -.L802414B8: -/* 9B7E38 802414B8 4616A002 */ mul.s $f0, $f20, $f22 -/* 9B7E3C 802414BC 00000000 */ nop -/* 9B7E40 802414C0 4600D000 */ add.s $f0, $f26, $f0 -.L802414C4: -/* 9B7E44 802414C4 E600003C */ swc1 $f0, 0x3c($s0) -/* 9B7E48 802414C8 8E220074 */ lw $v0, 0x74($s1) -/* 9B7E4C 802414CC 2442000A */ addiu $v0, $v0, 0xa -/* 9B7E50 802414D0 44826000 */ mtc1 $v0, $f12 -/* 9B7E54 802414D4 00000000 */ nop -/* 9B7E58 802414D8 0C00A6C9 */ jal clamp_angle -/* 9B7E5C 802414DC 46806320 */ cvt.s.w $f12, $f12 -/* 9B7E60 802414E0 4600020D */ trunc.w.s $f8, $f0 -/* 9B7E64 802414E4 E6280074 */ swc1 $f8, 0x74($s1) -.L802414E8: -/* 9B7E68 802414E8 8E220090 */ lw $v0, 0x90($s1) -/* 9B7E6C 802414EC 1C400040 */ bgtz $v0, .L802415F0 -/* 9B7E70 802414F0 2442FFFF */ addiu $v0, $v0, -1 -/* 9B7E74 802414F4 860200A8 */ lh $v0, 0xa8($s0) -/* 9B7E78 802414F8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B7E7C 802414FC 44821000 */ mtc1 $v0, $f2 -/* 9B7E80 80241500 00000000 */ nop -/* 9B7E84 80241504 468010A0 */ cvt.s.w $f2, $f2 -/* 9B7E88 80241508 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B7E8C 8024150C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B7E90 80241510 46020000 */ add.s $f0, $f0, $f2 -/* 9B7E94 80241514 3C014024 */ lui $at, 0x4024 -/* 9B7E98 80241518 44812800 */ mtc1 $at, $f5 -/* 9B7E9C 8024151C 44802000 */ mtc1 $zero, $f4 -/* 9B7EA0 80241520 C442002C */ lwc1 $f2, 0x2c($v0) -/* 9B7EA4 80241524 46000021 */ cvt.d.s $f0, $f0 -/* 9B7EA8 80241528 46240000 */ add.d $f0, $f0, $f4 -/* 9B7EAC 8024152C 460010A1 */ cvt.d.s $f2, $f2 -/* 9B7EB0 80241530 4620103C */ c.lt.d $f2, $f0 -/* 9B7EB4 80241534 00000000 */ nop -/* 9B7EB8 80241538 4500002E */ bc1f .L802415F4 -/* 9B7EBC 8024153C 0280202D */ daddu $a0, $s4, $zero -/* 9B7EC0 80241540 24020001 */ addiu $v0, $zero, 1 -/* 9B7EC4 80241544 AFA20010 */ sw $v0, 0x10($sp) -/* 9B7EC8 80241548 8E460024 */ lw $a2, 0x24($s2) -/* 9B7ECC 8024154C 8E470028 */ lw $a3, 0x28($s2) -/* 9B7ED0 80241550 0C01242D */ jal func_800490B4 -/* 9B7ED4 80241554 0220282D */ daddu $a1, $s1, $zero -/* 9B7ED8 80241558 10400026 */ beqz $v0, .L802415F4 -/* 9B7EDC 8024155C 0000202D */ daddu $a0, $zero, $zero -/* 9B7EE0 80241560 0200282D */ daddu $a1, $s0, $zero -/* 9B7EE4 80241564 0000302D */ daddu $a2, $zero, $zero -/* 9B7EE8 80241568 2412000C */ addiu $s2, $zero, 0xc -/* 9B7EEC 8024156C 860300A8 */ lh $v1, 0xa8($s0) -/* 9B7EF0 80241570 3C013F80 */ lui $at, 0x3f80 -/* 9B7EF4 80241574 44810000 */ mtc1 $at, $f0 -/* 9B7EF8 80241578 3C014000 */ lui $at, 0x4000 -/* 9B7EFC 8024157C 44811000 */ mtc1 $at, $f2 -/* 9B7F00 80241580 3C01C1A0 */ lui $at, 0xc1a0 -/* 9B7F04 80241584 44812000 */ mtc1 $at, $f4 -/* 9B7F08 80241588 44834000 */ mtc1 $v1, $f8 -/* 9B7F0C 8024158C 00000000 */ nop -/* 9B7F10 80241590 46804220 */ cvt.s.w $f8, $f8 -/* 9B7F14 80241594 44074000 */ mfc1 $a3, $f8 -/* 9B7F18 80241598 27A20038 */ addiu $v0, $sp, 0x38 -/* 9B7F1C 8024159C AFB2001C */ sw $s2, 0x1c($sp) -/* 9B7F20 802415A0 AFA20020 */ sw $v0, 0x20($sp) -/* 9B7F24 802415A4 E7A00010 */ swc1 $f0, 0x10($sp) -/* 9B7F28 802415A8 E7A20014 */ swc1 $f2, 0x14($sp) -/* 9B7F2C 802415AC 0C01BFA4 */ jal fx_emote -/* 9B7F30 802415B0 E7A40018 */ swc1 $f4, 0x18($sp) -/* 9B7F34 802415B4 0200202D */ daddu $a0, $s0, $zero -/* 9B7F38 802415B8 240502F4 */ addiu $a1, $zero, 0x2f4 -/* 9B7F3C 802415BC C480003C */ lwc1 $f0, 0x3c($a0) -/* 9B7F40 802415C0 3C060020 */ lui $a2, 0x20 -/* 9B7F44 802415C4 0C012530 */ jal func_800494C0 -/* 9B7F48 802415C8 E4800064 */ swc1 $f0, 0x64($a0) -/* 9B7F4C 802415CC 8E220018 */ lw $v0, 0x18($s1) -/* 9B7F50 802415D0 9442002A */ lhu $v0, 0x2a($v0) -/* 9B7F54 802415D4 30420001 */ andi $v0, $v0, 1 -/* 9B7F58 802415D8 10400003 */ beqz $v0, .L802415E8 -/* 9B7F5C 802415DC 2402000A */ addiu $v0, $zero, 0xa -/* 9B7F60 802415E0 080905A4 */ j .L80241690 -/* 9B7F64 802415E4 AE620070 */ sw $v0, 0x70($s3) -.L802415E8: -/* 9B7F68 802415E8 080905A4 */ j .L80241690 -/* 9B7F6C 802415EC AE720070 */ sw $s2, 0x70($s3) -.L802415F0: -/* 9B7F70 802415F0 AE220090 */ sw $v0, 0x90($s1) -.L802415F4: -/* 9B7F74 802415F4 8602008C */ lh $v0, 0x8c($s0) -/* 9B7F78 802415F8 14400025 */ bnez $v0, .L80241690 -/* 9B7F7C 802415FC 00000000 */ nop -/* 9B7F80 80241600 8602008E */ lh $v0, 0x8e($s0) -/* 9B7F84 80241604 1C400022 */ bgtz $v0, .L80241690 -/* 9B7F88 80241608 00000000 */ nop -/* 9B7F8C 8024160C 8E620074 */ lw $v0, 0x74($s3) -/* 9B7F90 80241610 2442FFFF */ addiu $v0, $v0, -1 -/* 9B7F94 80241614 1840001D */ blez $v0, .L8024168C -/* 9B7F98 80241618 AE620074 */ sw $v0, 0x74($s3) -/* 9B7F9C 8024161C 8E220018 */ lw $v0, 0x18($s1) -/* 9B7FA0 80241620 9442002A */ lhu $v0, 0x2a($v0) -/* 9B7FA4 80241624 30420010 */ andi $v0, $v0, 0x10 -/* 9B7FA8 80241628 14400007 */ bnez $v0, .L80241648 -/* 9B7FAC 8024162C 00000000 */ nop -/* 9B7FB0 80241630 C600000C */ lwc1 $f0, 0xc($s0) -/* 9B7FB4 80241634 3C014334 */ lui $at, 0x4334 -/* 9B7FB8 80241638 44816000 */ mtc1 $at, $f12 -/* 9B7FBC 8024163C 0C00A6C9 */ jal clamp_angle -/* 9B7FC0 80241640 460C0300 */ add.s $f12, $f0, $f12 -/* 9B7FC4 80241644 E600000C */ swc1 $f0, 0xc($s0) -.L80241648: -/* 9B7FC8 80241648 0C00A67F */ jal rand_int -/* 9B7FCC 8024164C 240403E8 */ addiu $a0, $zero, 0x3e8 -/* 9B7FD0 80241650 3C032E8B */ lui $v1, 0x2e8b -/* 9B7FD4 80241654 3463A2E9 */ ori $v1, $v1, 0xa2e9 -/* 9B7FD8 80241658 00430018 */ mult $v0, $v1 -/* 9B7FDC 8024165C 00021FC3 */ sra $v1, $v0, 0x1f -/* 9B7FE0 80241660 00004010 */ mfhi $t0 -/* 9B7FE4 80241664 00082043 */ sra $a0, $t0, 1 -/* 9B7FE8 80241668 00832023 */ subu $a0, $a0, $v1 -/* 9B7FEC 8024166C 00041840 */ sll $v1, $a0, 1 -/* 9B7FF0 80241670 00641821 */ addu $v1, $v1, $a0 -/* 9B7FF4 80241674 00031880 */ sll $v1, $v1, 2 -/* 9B7FF8 80241678 00641823 */ subu $v1, $v1, $a0 -/* 9B7FFC 8024167C 00431023 */ subu $v0, $v0, $v1 -/* 9B8000 80241680 24420005 */ addiu $v0, $v0, 5 -/* 9B8004 80241684 080905A4 */ j .L80241690 -/* 9B8008 80241688 A602008E */ sh $v0, 0x8e($s0) -.L8024168C: -/* 9B800C 8024168C AE600070 */ sw $zero, 0x70($s3) -.L80241690: -/* 9B8010 80241690 8FBF0054 */ lw $ra, 0x54($sp) -/* 9B8014 80241694 8FB40050 */ lw $s4, 0x50($sp) -/* 9B8018 80241698 8FB3004C */ lw $s3, 0x4c($sp) -/* 9B801C 8024169C 8FB20048 */ lw $s2, 0x48($sp) -/* 9B8020 802416A0 8FB10044 */ lw $s1, 0x44($sp) -/* 9B8024 802416A4 8FB00040 */ lw $s0, 0x40($sp) -/* 9B8028 802416A8 D7BA0070 */ ldc1 $f26, 0x70($sp) -/* 9B802C 802416AC D7B80068 */ ldc1 $f24, 0x68($sp) -/* 9B8030 802416B0 D7B60060 */ ldc1 $f22, 0x60($sp) -/* 9B8034 802416B4 D7B40058 */ ldc1 $f20, 0x58($sp) -/* 9B8038 802416B8 03E00008 */ jr $ra -/* 9B803C 802416BC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s new file mode 100644 index 0000000000..1a9c938f23 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024137C_9B7CFC.s @@ -0,0 +1,225 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024137C_9B7CFC +/* 9B7CFC 8024137C 27BDFF88 */ addiu $sp, $sp, -0x78 +/* 9B7D00 80241380 AFB3004C */ sw $s3, 0x4c($sp) +/* 9B7D04 80241384 0080982D */ daddu $s3, $a0, $zero +/* 9B7D08 80241388 AFBF0054 */ sw $ra, 0x54($sp) +/* 9B7D0C 8024138C AFB40050 */ sw $s4, 0x50($sp) +/* 9B7D10 80241390 AFB20048 */ sw $s2, 0x48($sp) +/* 9B7D14 80241394 AFB10044 */ sw $s1, 0x44($sp) +/* 9B7D18 80241398 AFB00040 */ sw $s0, 0x40($sp) +/* 9B7D1C 8024139C F7BA0070 */ sdc1 $f26, 0x70($sp) +/* 9B7D20 802413A0 F7B80068 */ sdc1 $f24, 0x68($sp) +/* 9B7D24 802413A4 F7B60060 */ sdc1 $f22, 0x60($sp) +/* 9B7D28 802413A8 F7B40058 */ sdc1 $f20, 0x58($sp) +/* 9B7D2C 802413AC 8E710148 */ lw $s1, 0x148($s3) +/* 9B7D30 802413B0 00A0902D */ daddu $s2, $a1, $zero +/* 9B7D34 802413B4 86240008 */ lh $a0, 8($s1) +/* 9B7D38 802413B8 0C00EABB */ jal get_npc_unsafe +/* 9B7D3C 802413BC 00C0A02D */ daddu $s4, $a2, $zero +/* 9B7D40 802413C0 0040802D */ daddu $s0, $v0, $zero +/* 9B7D44 802413C4 C6200078 */ lwc1 $f0, 0x78($s1) +/* 9B7D48 802413C8 46800020 */ cvt.s.w $f0, $f0 +/* 9B7D4C 802413CC 46000021 */ cvt.d.s $f0, $f0 +/* 9B7D50 802413D0 3C014059 */ lui $at, 0x4059 +/* 9B7D54 802413D4 44811800 */ mtc1 $at, $f3 +/* 9B7D58 802413D8 44801000 */ mtc1 $zero, $f2 +/* 9B7D5C 802413DC 8602008E */ lh $v0, 0x8e($s0) +/* 9B7D60 802413E0 9603008E */ lhu $v1, 0x8e($s0) +/* 9B7D64 802413E4 46220003 */ div.d $f0, $f0, $f2 +/* 9B7D68 802413E8 46200620 */ cvt.s.d $f24, $f0 +/* 9B7D6C 802413EC C6200088 */ lwc1 $f0, 0x88($s1) +/* 9B7D70 802413F0 46800020 */ cvt.s.w $f0, $f0 +/* 9B7D74 802413F4 46000021 */ cvt.d.s $f0, $f0 +/* 9B7D78 802413F8 46220003 */ div.d $f0, $f0, $f2 +/* 9B7D7C 802413FC 46200020 */ cvt.s.d $f0, $f0 +/* 9B7D80 80241400 18400003 */ blez $v0, .L80241410 +/* 9B7D84 80241404 4600C680 */ add.s $f26, $f24, $f0 +/* 9B7D88 80241408 2462FFFF */ addiu $v0, $v1, -1 +/* 9B7D8C 8024140C A602008E */ sh $v0, 0x8e($s0) +.L80241410: +/* 9B7D90 80241410 8E220070 */ lw $v0, 0x70($s1) +/* 9B7D94 80241414 18400034 */ blez $v0, .L802414E8 +/* 9B7D98 80241418 00000000 */ nop +/* 9B7D9C 8024141C C62C0074 */ lwc1 $f12, 0x74($s1) +/* 9B7DA0 80241420 46806320 */ cvt.s.w $f12, $f12 +/* 9B7DA4 80241424 44820000 */ mtc1 $v0, $f0 +/* 9B7DA8 80241428 00000000 */ nop +/* 9B7DAC 8024142C 46800020 */ cvt.s.w $f0, $f0 +/* 9B7DB0 80241430 46000021 */ cvt.d.s $f0, $f0 +/* 9B7DB4 80241434 46220003 */ div.d $f0, $f0, $f2 +/* 9B7DB8 80241438 0C00A8BB */ jal sin_deg +/* 9B7DBC 8024143C 462005A0 */ cvt.s.d $f22, $f0 +/* 9B7DC0 80241440 8E020000 */ lw $v0, ($s0) +/* 9B7DC4 80241444 30420008 */ andi $v0, $v0, 8 +/* 9B7DC8 80241448 10400003 */ beqz $v0, .L80241458 +/* 9B7DCC 8024144C 46000506 */ mov.s $f20, $f0 +/* 9B7DD0 80241450 08090526 */ j .L80241498 +/* 9B7DD4 80241454 0000102D */ daddu $v0, $zero, $zero +.L80241458: +/* 9B7DD8 80241458 27A50028 */ addiu $a1, $sp, 0x28 +/* 9B7DDC 8024145C 27A6002C */ addiu $a2, $sp, 0x2c +/* 9B7DE0 80241460 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9B7DE4 80241464 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9B7DE8 80241468 C6040040 */ lwc1 $f4, 0x40($s0) +/* 9B7DEC 8024146C 3C01447A */ lui $at, 0x447a +/* 9B7DF0 80241470 44813000 */ mtc1 $at, $f6 +/* 9B7DF4 80241474 27A20034 */ addiu $v0, $sp, 0x34 +/* 9B7DF8 80241478 E7A00028 */ swc1 $f0, 0x28($sp) +/* 9B7DFC 8024147C E7A2002C */ swc1 $f2, 0x2c($sp) +/* 9B7E00 80241480 E7A40030 */ swc1 $f4, 0x30($sp) +/* 9B7E04 80241484 E7A60034 */ swc1 $f6, 0x34($sp) +/* 9B7E08 80241488 AFA20010 */ sw $v0, 0x10($sp) +/* 9B7E0C 8024148C 8E040080 */ lw $a0, 0x80($s0) +/* 9B7E10 80241490 0C0372DF */ jal func_800DCB7C +/* 9B7E14 80241494 27A70030 */ addiu $a3, $sp, 0x30 +.L80241498: +/* 9B7E18 80241498 10400007 */ beqz $v0, .L802414B8 +/* 9B7E1C 8024149C 00000000 */ nop +/* 9B7E20 802414A0 4616A082 */ mul.s $f2, $f20, $f22 +/* 9B7E24 802414A4 00000000 */ nop +/* 9B7E28 802414A8 C7A0002C */ lwc1 $f0, 0x2c($sp) +/* 9B7E2C 802414AC 46180000 */ add.s $f0, $f0, $f24 +/* 9B7E30 802414B0 08090531 */ j .L802414C4 +/* 9B7E34 802414B4 46020000 */ add.s $f0, $f0, $f2 +.L802414B8: +/* 9B7E38 802414B8 4616A002 */ mul.s $f0, $f20, $f22 +/* 9B7E3C 802414BC 00000000 */ nop +/* 9B7E40 802414C0 4600D000 */ add.s $f0, $f26, $f0 +.L802414C4: +/* 9B7E44 802414C4 E600003C */ swc1 $f0, 0x3c($s0) +/* 9B7E48 802414C8 8E220074 */ lw $v0, 0x74($s1) +/* 9B7E4C 802414CC 2442000A */ addiu $v0, $v0, 0xa +/* 9B7E50 802414D0 44826000 */ mtc1 $v0, $f12 +/* 9B7E54 802414D4 00000000 */ nop +/* 9B7E58 802414D8 0C00A6C9 */ jal clamp_angle +/* 9B7E5C 802414DC 46806320 */ cvt.s.w $f12, $f12 +/* 9B7E60 802414E0 4600020D */ trunc.w.s $f8, $f0 +/* 9B7E64 802414E4 E6280074 */ swc1 $f8, 0x74($s1) +.L802414E8: +/* 9B7E68 802414E8 8E220090 */ lw $v0, 0x90($s1) +/* 9B7E6C 802414EC 1C400040 */ bgtz $v0, .L802415F0 +/* 9B7E70 802414F0 2442FFFF */ addiu $v0, $v0, -1 +/* 9B7E74 802414F4 860200A8 */ lh $v0, 0xa8($s0) +/* 9B7E78 802414F8 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9B7E7C 802414FC 44821000 */ mtc1 $v0, $f2 +/* 9B7E80 80241500 00000000 */ nop +/* 9B7E84 80241504 468010A0 */ cvt.s.w $f2, $f2 +/* 9B7E88 80241508 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9B7E8C 8024150C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9B7E90 80241510 46020000 */ add.s $f0, $f0, $f2 +/* 9B7E94 80241514 3C014024 */ lui $at, 0x4024 +/* 9B7E98 80241518 44812800 */ mtc1 $at, $f5 +/* 9B7E9C 8024151C 44802000 */ mtc1 $zero, $f4 +/* 9B7EA0 80241520 C442002C */ lwc1 $f2, 0x2c($v0) +/* 9B7EA4 80241524 46000021 */ cvt.d.s $f0, $f0 +/* 9B7EA8 80241528 46240000 */ add.d $f0, $f0, $f4 +/* 9B7EAC 8024152C 460010A1 */ cvt.d.s $f2, $f2 +/* 9B7EB0 80241530 4620103C */ c.lt.d $f2, $f0 +/* 9B7EB4 80241534 00000000 */ nop +/* 9B7EB8 80241538 4500002E */ bc1f .L802415F4 +/* 9B7EBC 8024153C 0280202D */ daddu $a0, $s4, $zero +/* 9B7EC0 80241540 24020001 */ addiu $v0, $zero, 1 +/* 9B7EC4 80241544 AFA20010 */ sw $v0, 0x10($sp) +/* 9B7EC8 80241548 8E460024 */ lw $a2, 0x24($s2) +/* 9B7ECC 8024154C 8E470028 */ lw $a3, 0x28($s2) +/* 9B7ED0 80241550 0C01242D */ jal func_800490B4 +/* 9B7ED4 80241554 0220282D */ daddu $a1, $s1, $zero +/* 9B7ED8 80241558 10400026 */ beqz $v0, .L802415F4 +/* 9B7EDC 8024155C 0000202D */ daddu $a0, $zero, $zero +/* 9B7EE0 80241560 0200282D */ daddu $a1, $s0, $zero +/* 9B7EE4 80241564 0000302D */ daddu $a2, $zero, $zero +/* 9B7EE8 80241568 2412000C */ addiu $s2, $zero, 0xc +/* 9B7EEC 8024156C 860300A8 */ lh $v1, 0xa8($s0) +/* 9B7EF0 80241570 3C013F80 */ lui $at, 0x3f80 +/* 9B7EF4 80241574 44810000 */ mtc1 $at, $f0 +/* 9B7EF8 80241578 3C014000 */ lui $at, 0x4000 +/* 9B7EFC 8024157C 44811000 */ mtc1 $at, $f2 +/* 9B7F00 80241580 3C01C1A0 */ lui $at, 0xc1a0 +/* 9B7F04 80241584 44812000 */ mtc1 $at, $f4 +/* 9B7F08 80241588 44834000 */ mtc1 $v1, $f8 +/* 9B7F0C 8024158C 00000000 */ nop +/* 9B7F10 80241590 46804220 */ cvt.s.w $f8, $f8 +/* 9B7F14 80241594 44074000 */ mfc1 $a3, $f8 +/* 9B7F18 80241598 27A20038 */ addiu $v0, $sp, 0x38 +/* 9B7F1C 8024159C AFB2001C */ sw $s2, 0x1c($sp) +/* 9B7F20 802415A0 AFA20020 */ sw $v0, 0x20($sp) +/* 9B7F24 802415A4 E7A00010 */ swc1 $f0, 0x10($sp) +/* 9B7F28 802415A8 E7A20014 */ swc1 $f2, 0x14($sp) +/* 9B7F2C 802415AC 0C01BFA4 */ jal fx_emote +/* 9B7F30 802415B0 E7A40018 */ swc1 $f4, 0x18($sp) +/* 9B7F34 802415B4 0200202D */ daddu $a0, $s0, $zero +/* 9B7F38 802415B8 240502F4 */ addiu $a1, $zero, 0x2f4 +/* 9B7F3C 802415BC C480003C */ lwc1 $f0, 0x3c($a0) +/* 9B7F40 802415C0 3C060020 */ lui $a2, 0x20 +/* 9B7F44 802415C4 0C012530 */ jal func_800494C0 +/* 9B7F48 802415C8 E4800064 */ swc1 $f0, 0x64($a0) +/* 9B7F4C 802415CC 8E220018 */ lw $v0, 0x18($s1) +/* 9B7F50 802415D0 9442002A */ lhu $v0, 0x2a($v0) +/* 9B7F54 802415D4 30420001 */ andi $v0, $v0, 1 +/* 9B7F58 802415D8 10400003 */ beqz $v0, .L802415E8 +/* 9B7F5C 802415DC 2402000A */ addiu $v0, $zero, 0xa +/* 9B7F60 802415E0 080905A4 */ j .L80241690 +/* 9B7F64 802415E4 AE620070 */ sw $v0, 0x70($s3) +.L802415E8: +/* 9B7F68 802415E8 080905A4 */ j .L80241690 +/* 9B7F6C 802415EC AE720070 */ sw $s2, 0x70($s3) +.L802415F0: +/* 9B7F70 802415F0 AE220090 */ sw $v0, 0x90($s1) +.L802415F4: +/* 9B7F74 802415F4 8602008C */ lh $v0, 0x8c($s0) +/* 9B7F78 802415F8 14400025 */ bnez $v0, .L80241690 +/* 9B7F7C 802415FC 00000000 */ nop +/* 9B7F80 80241600 8602008E */ lh $v0, 0x8e($s0) +/* 9B7F84 80241604 1C400022 */ bgtz $v0, .L80241690 +/* 9B7F88 80241608 00000000 */ nop +/* 9B7F8C 8024160C 8E620074 */ lw $v0, 0x74($s3) +/* 9B7F90 80241610 2442FFFF */ addiu $v0, $v0, -1 +/* 9B7F94 80241614 1840001D */ blez $v0, .L8024168C +/* 9B7F98 80241618 AE620074 */ sw $v0, 0x74($s3) +/* 9B7F9C 8024161C 8E220018 */ lw $v0, 0x18($s1) +/* 9B7FA0 80241620 9442002A */ lhu $v0, 0x2a($v0) +/* 9B7FA4 80241624 30420010 */ andi $v0, $v0, 0x10 +/* 9B7FA8 80241628 14400007 */ bnez $v0, .L80241648 +/* 9B7FAC 8024162C 00000000 */ nop +/* 9B7FB0 80241630 C600000C */ lwc1 $f0, 0xc($s0) +/* 9B7FB4 80241634 3C014334 */ lui $at, 0x4334 +/* 9B7FB8 80241638 44816000 */ mtc1 $at, $f12 +/* 9B7FBC 8024163C 0C00A6C9 */ jal clamp_angle +/* 9B7FC0 80241640 460C0300 */ add.s $f12, $f0, $f12 +/* 9B7FC4 80241644 E600000C */ swc1 $f0, 0xc($s0) +.L80241648: +/* 9B7FC8 80241648 0C00A67F */ jal rand_int +/* 9B7FCC 8024164C 240403E8 */ addiu $a0, $zero, 0x3e8 +/* 9B7FD0 80241650 3C032E8B */ lui $v1, 0x2e8b +/* 9B7FD4 80241654 3463A2E9 */ ori $v1, $v1, 0xa2e9 +/* 9B7FD8 80241658 00430018 */ mult $v0, $v1 +/* 9B7FDC 8024165C 00021FC3 */ sra $v1, $v0, 0x1f +/* 9B7FE0 80241660 00004010 */ mfhi $t0 +/* 9B7FE4 80241664 00082043 */ sra $a0, $t0, 1 +/* 9B7FE8 80241668 00832023 */ subu $a0, $a0, $v1 +/* 9B7FEC 8024166C 00041840 */ sll $v1, $a0, 1 +/* 9B7FF0 80241670 00641821 */ addu $v1, $v1, $a0 +/* 9B7FF4 80241674 00031880 */ sll $v1, $v1, 2 +/* 9B7FF8 80241678 00641823 */ subu $v1, $v1, $a0 +/* 9B7FFC 8024167C 00431023 */ subu $v0, $v0, $v1 +/* 9B8000 80241680 24420005 */ addiu $v0, $v0, 5 +/* 9B8004 80241684 080905A4 */ j .L80241690 +/* 9B8008 80241688 A602008E */ sh $v0, 0x8e($s0) +.L8024168C: +/* 9B800C 8024168C AE600070 */ sw $zero, 0x70($s3) +.L80241690: +/* 9B8010 80241690 8FBF0054 */ lw $ra, 0x54($sp) +/* 9B8014 80241694 8FB40050 */ lw $s4, 0x50($sp) +/* 9B8018 80241698 8FB3004C */ lw $s3, 0x4c($sp) +/* 9B801C 8024169C 8FB20048 */ lw $s2, 0x48($sp) +/* 9B8020 802416A0 8FB10044 */ lw $s1, 0x44($sp) +/* 9B8024 802416A4 8FB00040 */ lw $s0, 0x40($sp) +/* 9B8028 802416A8 D7BA0070 */ ldc1 $f26, 0x70($sp) +/* 9B802C 802416AC D7B80068 */ ldc1 $f24, 0x68($sp) +/* 9B8030 802416B0 D7B60060 */ ldc1 $f22, 0x60($sp) +/* 9B8034 802416B4 D7B40058 */ ldc1 $f20, 0x58($sp) +/* 9B8038 802416B8 03E00008 */ jr $ra +/* 9B803C 802416BC 27BD0078 */ addiu $sp, $sp, 0x78 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0.s deleted file mode 100644 index 5faf771496..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0.s +++ /dev/null @@ -1,34 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C0 -/* 9B8040 802416C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9B8044 802416C4 AFB20018 */ sw $s2, 0x18($sp) -/* 9B8048 802416C8 0080902D */ daddu $s2, $a0, $zero -/* 9B804C 802416CC AFBF001C */ sw $ra, 0x1c($sp) -/* 9B8050 802416D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9B8054 802416D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9B8058 802416D8 8E510148 */ lw $s1, 0x148($s2) -/* 9B805C 802416DC 0C00EABB */ jal get_npc_unsafe -/* 9B8060 802416E0 86240008 */ lh $a0, 8($s1) -/* 9B8064 802416E4 0040802D */ daddu $s0, $v0, $zero -/* 9B8068 802416E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B806C 802416EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B8070 802416F0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B8074 802416F4 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B8078 802416F8 A600008E */ sh $zero, 0x8e($s0) -/* 9B807C 802416FC 8C460028 */ lw $a2, 0x28($v0) -/* 9B8080 80241700 0C00A720 */ jal atan2 -/* 9B8084 80241704 8C470030 */ lw $a3, 0x30($v0) -/* 9B8088 80241708 E600000C */ swc1 $f0, 0xc($s0) -/* 9B808C 8024170C 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8090 80241710 8C420020 */ lw $v0, 0x20($v0) -/* 9B8094 80241714 AE020028 */ sw $v0, 0x28($s0) -/* 9B8098 80241718 2402000B */ addiu $v0, $zero, 0xb -/* 9B809C 8024171C AE420070 */ sw $v0, 0x70($s2) -/* 9B80A0 80241720 8FBF001C */ lw $ra, 0x1c($sp) -/* 9B80A4 80241724 8FB20018 */ lw $s2, 0x18($sp) -/* 9B80A8 80241728 8FB10014 */ lw $s1, 0x14($sp) -/* 9B80AC 8024172C 8FB00010 */ lw $s0, 0x10($sp) -/* 9B80B0 80241730 03E00008 */ jr $ra -/* 9B80B4 80241734 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0_9B8040.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0_9B8040.s new file mode 100644 index 0000000000..fcb384516f --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802416C0_9B8040.s @@ -0,0 +1,34 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802416C0_9B8040 +/* 9B8040 802416C0 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9B8044 802416C4 AFB20018 */ sw $s2, 0x18($sp) +/* 9B8048 802416C8 0080902D */ daddu $s2, $a0, $zero +/* 9B804C 802416CC AFBF001C */ sw $ra, 0x1c($sp) +/* 9B8050 802416D0 AFB10014 */ sw $s1, 0x14($sp) +/* 9B8054 802416D4 AFB00010 */ sw $s0, 0x10($sp) +/* 9B8058 802416D8 8E510148 */ lw $s1, 0x148($s2) +/* 9B805C 802416DC 0C00EABB */ jal get_npc_unsafe +/* 9B8060 802416E0 86240008 */ lh $a0, 8($s1) +/* 9B8064 802416E4 0040802D */ daddu $s0, $v0, $zero +/* 9B8068 802416E8 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9B806C 802416EC 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9B8070 802416F0 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9B8074 802416F4 C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9B8078 802416F8 A600008E */ sh $zero, 0x8e($s0) +/* 9B807C 802416FC 8C460028 */ lw $a2, 0x28($v0) +/* 9B8080 80241700 0C00A720 */ jal atan2 +/* 9B8084 80241704 8C470030 */ lw $a3, 0x30($v0) +/* 9B8088 80241708 E600000C */ swc1 $f0, 0xc($s0) +/* 9B808C 8024170C 8E2200CC */ lw $v0, 0xcc($s1) +/* 9B8090 80241710 8C420020 */ lw $v0, 0x20($v0) +/* 9B8094 80241714 AE020028 */ sw $v0, 0x28($s0) +/* 9B8098 80241718 2402000B */ addiu $v0, $zero, 0xb +/* 9B809C 8024171C AE420070 */ sw $v0, 0x70($s2) +/* 9B80A0 80241720 8FBF001C */ lw $ra, 0x1c($sp) +/* 9B80A4 80241724 8FB20018 */ lw $s2, 0x18($sp) +/* 9B80A8 80241728 8FB10014 */ lw $s1, 0x14($sp) +/* 9B80AC 8024172C 8FB00010 */ lw $s0, 0x10($sp) +/* 9B80B0 80241730 03E00008 */ jr $ra +/* 9B80B4 80241734 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4.s deleted file mode 100644 index e974e4e381..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4.s +++ /dev/null @@ -1,83 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A4 -/* 9B8124 802417A4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9B8128 802417A8 AFB3001C */ sw $s3, 0x1c($sp) -/* 9B812C 802417AC 0080982D */ daddu $s3, $a0, $zero -/* 9B8130 802417B0 AFBF0020 */ sw $ra, 0x20($sp) -/* 9B8134 802417B4 AFB20018 */ sw $s2, 0x18($sp) -/* 9B8138 802417B8 AFB10014 */ sw $s1, 0x14($sp) -/* 9B813C 802417BC AFB00010 */ sw $s0, 0x10($sp) -/* 9B8140 802417C0 8E720148 */ lw $s2, 0x148($s3) -/* 9B8144 802417C4 86440008 */ lh $a0, 8($s2) -/* 9B8148 802417C8 0C00EABB */ jal get_npc_unsafe -/* 9B814C 802417CC 00A0802D */ daddu $s0, $a1, $zero -/* 9B8150 802417D0 0040882D */ daddu $s1, $v0, $zero -/* 9B8154 802417D4 C6420080 */ lwc1 $f2, 0x80($s2) -/* 9B8158 802417D8 468010A0 */ cvt.s.w $f2, $f2 -/* 9B815C 802417DC 460010A1 */ cvt.d.s $f2, $f2 -/* 9B8160 802417E0 C6400084 */ lwc1 $f0, 0x84($s2) -/* 9B8164 802417E4 46800020 */ cvt.s.w $f0, $f0 -/* 9B8168 802417E8 46000021 */ cvt.d.s $f0, $f0 -/* 9B816C 802417EC 3C014059 */ lui $at, 0x4059 -/* 9B8170 802417F0 44812800 */ mtc1 $at, $f5 -/* 9B8174 802417F4 44802000 */ mtc1 $zero, $f4 -/* 9B8178 802417F8 8E4200CC */ lw $v0, 0xcc($s2) -/* 9B817C 802417FC C62C0038 */ lwc1 $f12, 0x38($s1) -/* 9B8180 80241800 C62E0040 */ lwc1 $f14, 0x40($s1) -/* 9B8184 80241804 46241083 */ div.d $f2, $f2, $f4 -/* 9B8188 80241808 462010A0 */ cvt.s.d $f2, $f2 -/* 9B818C 8024180C 46240003 */ div.d $f0, $f0, $f4 -/* 9B8190 80241810 8C420020 */ lw $v0, 0x20($v0) -/* 9B8194 80241814 46200020 */ cvt.s.d $f0, $f0 -/* 9B8198 80241818 E622001C */ swc1 $f2, 0x1c($s1) -/* 9B819C 8024181C E6200014 */ swc1 $f0, 0x14($s1) -/* 9B81A0 80241820 AE220028 */ sw $v0, 0x28($s1) -/* 9B81A4 80241824 C6000018 */ lwc1 $f0, 0x18($s0) -/* 9B81A8 80241828 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B81AC 8024182C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B81B0 80241830 E6200018 */ swc1 $f0, 0x18($s1) -/* 9B81B4 80241834 8C460028 */ lw $a2, 0x28($v0) -/* 9B81B8 80241838 0C00A720 */ jal atan2 -/* 9B81BC 8024183C 8C470030 */ lw $a3, 0x30($v0) -/* 9B81C0 80241840 E620000C */ swc1 $f0, 0xc($s1) -/* 9B81C4 80241844 8E420018 */ lw $v0, 0x18($s2) -/* 9B81C8 80241848 AE400074 */ sw $zero, 0x74($s2) -/* 9B81CC 8024184C 9442002A */ lhu $v0, 0x2a($v0) -/* 9B81D0 80241850 30420002 */ andi $v0, $v0, 2 -/* 9B81D4 80241854 10400005 */ beqz $v0, .L8024186C -/* 9B81D8 80241858 24020003 */ addiu $v0, $zero, 3 -/* 9B81DC 8024185C A622008E */ sh $v0, 0x8e($s1) -/* 9B81E0 80241860 2402000D */ addiu $v0, $zero, 0xd -/* 9B81E4 80241864 0809062F */ j .L802418BC -/* 9B81E8 80241868 AE620070 */ sw $v0, 0x70($s3) -.L8024186C: -/* 9B81EC 8024186C 24030001 */ addiu $v1, $zero, 1 -/* 9B81F0 80241870 2402000E */ addiu $v0, $zero, 0xe -/* 9B81F4 80241874 A623008E */ sh $v1, 0x8e($s1) -/* 9B81F8 80241878 AE620070 */ sw $v0, 0x70($s3) -/* 9B81FC 8024187C C6200038 */ lwc1 $f0, 0x38($s1) -/* 9B8200 80241880 4600018D */ trunc.w.s $f6, $f0 -/* 9B8204 80241884 44023000 */ mfc1 $v0, $f6 -/* 9B8208 80241888 00000000 */ nop -/* 9B820C 8024188C A6420010 */ sh $v0, 0x10($s2) -/* 9B8210 80241890 C620003C */ lwc1 $f0, 0x3c($s1) -/* 9B8214 80241894 4600018D */ trunc.w.s $f6, $f0 -/* 9B8218 80241898 44023000 */ mfc1 $v0, $f6 -/* 9B821C 8024189C 00000000 */ nop -/* 9B8220 802418A0 A6420012 */ sh $v0, 0x12($s2) -/* 9B8224 802418A4 C6200040 */ lwc1 $f0, 0x40($s1) -/* 9B8228 802418A8 A2430007 */ sb $v1, 7($s2) -/* 9B822C 802418AC 4600018D */ trunc.w.s $f6, $f0 -/* 9B8230 802418B0 44023000 */ mfc1 $v0, $f6 -/* 9B8234 802418B4 00000000 */ nop -/* 9B8238 802418B8 A6420014 */ sh $v0, 0x14($s2) -.L802418BC: -/* 9B823C 802418BC 8FBF0020 */ lw $ra, 0x20($sp) -/* 9B8240 802418C0 8FB3001C */ lw $s3, 0x1c($sp) -/* 9B8244 802418C4 8FB20018 */ lw $s2, 0x18($sp) -/* 9B8248 802418C8 8FB10014 */ lw $s1, 0x14($sp) -/* 9B824C 802418CC 8FB00010 */ lw $s0, 0x10($sp) -/* 9B8250 802418D0 03E00008 */ jr $ra -/* 9B8254 802418D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s new file mode 100644 index 0000000000..032e868772 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802417A4_9B8124.s @@ -0,0 +1,83 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802417A4_9B8124 +/* 9B8124 802417A4 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9B8128 802417A8 AFB3001C */ sw $s3, 0x1c($sp) +/* 9B812C 802417AC 0080982D */ daddu $s3, $a0, $zero +/* 9B8130 802417B0 AFBF0020 */ sw $ra, 0x20($sp) +/* 9B8134 802417B4 AFB20018 */ sw $s2, 0x18($sp) +/* 9B8138 802417B8 AFB10014 */ sw $s1, 0x14($sp) +/* 9B813C 802417BC AFB00010 */ sw $s0, 0x10($sp) +/* 9B8140 802417C0 8E720148 */ lw $s2, 0x148($s3) +/* 9B8144 802417C4 86440008 */ lh $a0, 8($s2) +/* 9B8148 802417C8 0C00EABB */ jal get_npc_unsafe +/* 9B814C 802417CC 00A0802D */ daddu $s0, $a1, $zero +/* 9B8150 802417D0 0040882D */ daddu $s1, $v0, $zero +/* 9B8154 802417D4 C6420080 */ lwc1 $f2, 0x80($s2) +/* 9B8158 802417D8 468010A0 */ cvt.s.w $f2, $f2 +/* 9B815C 802417DC 460010A1 */ cvt.d.s $f2, $f2 +/* 9B8160 802417E0 C6400084 */ lwc1 $f0, 0x84($s2) +/* 9B8164 802417E4 46800020 */ cvt.s.w $f0, $f0 +/* 9B8168 802417E8 46000021 */ cvt.d.s $f0, $f0 +/* 9B816C 802417EC 3C014059 */ lui $at, 0x4059 +/* 9B8170 802417F0 44812800 */ mtc1 $at, $f5 +/* 9B8174 802417F4 44802000 */ mtc1 $zero, $f4 +/* 9B8178 802417F8 8E4200CC */ lw $v0, 0xcc($s2) +/* 9B817C 802417FC C62C0038 */ lwc1 $f12, 0x38($s1) +/* 9B8180 80241800 C62E0040 */ lwc1 $f14, 0x40($s1) +/* 9B8184 80241804 46241083 */ div.d $f2, $f2, $f4 +/* 9B8188 80241808 462010A0 */ cvt.s.d $f2, $f2 +/* 9B818C 8024180C 46240003 */ div.d $f0, $f0, $f4 +/* 9B8190 80241810 8C420020 */ lw $v0, 0x20($v0) +/* 9B8194 80241814 46200020 */ cvt.s.d $f0, $f0 +/* 9B8198 80241818 E622001C */ swc1 $f2, 0x1c($s1) +/* 9B819C 8024181C E6200014 */ swc1 $f0, 0x14($s1) +/* 9B81A0 80241820 AE220028 */ sw $v0, 0x28($s1) +/* 9B81A4 80241824 C6000018 */ lwc1 $f0, 0x18($s0) +/* 9B81A8 80241828 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9B81AC 8024182C 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9B81B0 80241830 E6200018 */ swc1 $f0, 0x18($s1) +/* 9B81B4 80241834 8C460028 */ lw $a2, 0x28($v0) +/* 9B81B8 80241838 0C00A720 */ jal atan2 +/* 9B81BC 8024183C 8C470030 */ lw $a3, 0x30($v0) +/* 9B81C0 80241840 E620000C */ swc1 $f0, 0xc($s1) +/* 9B81C4 80241844 8E420018 */ lw $v0, 0x18($s2) +/* 9B81C8 80241848 AE400074 */ sw $zero, 0x74($s2) +/* 9B81CC 8024184C 9442002A */ lhu $v0, 0x2a($v0) +/* 9B81D0 80241850 30420002 */ andi $v0, $v0, 2 +/* 9B81D4 80241854 10400005 */ beqz $v0, .L8024186C +/* 9B81D8 80241858 24020003 */ addiu $v0, $zero, 3 +/* 9B81DC 8024185C A622008E */ sh $v0, 0x8e($s1) +/* 9B81E0 80241860 2402000D */ addiu $v0, $zero, 0xd +/* 9B81E4 80241864 0809062F */ j .L802418BC +/* 9B81E8 80241868 AE620070 */ sw $v0, 0x70($s3) +.L8024186C: +/* 9B81EC 8024186C 24030001 */ addiu $v1, $zero, 1 +/* 9B81F0 80241870 2402000E */ addiu $v0, $zero, 0xe +/* 9B81F4 80241874 A623008E */ sh $v1, 0x8e($s1) +/* 9B81F8 80241878 AE620070 */ sw $v0, 0x70($s3) +/* 9B81FC 8024187C C6200038 */ lwc1 $f0, 0x38($s1) +/* 9B8200 80241880 4600018D */ trunc.w.s $f6, $f0 +/* 9B8204 80241884 44023000 */ mfc1 $v0, $f6 +/* 9B8208 80241888 00000000 */ nop +/* 9B820C 8024188C A6420010 */ sh $v0, 0x10($s2) +/* 9B8210 80241890 C620003C */ lwc1 $f0, 0x3c($s1) +/* 9B8214 80241894 4600018D */ trunc.w.s $f6, $f0 +/* 9B8218 80241898 44023000 */ mfc1 $v0, $f6 +/* 9B821C 8024189C 00000000 */ nop +/* 9B8220 802418A0 A6420012 */ sh $v0, 0x12($s2) +/* 9B8224 802418A4 C6200040 */ lwc1 $f0, 0x40($s1) +/* 9B8228 802418A8 A2430007 */ sb $v1, 7($s2) +/* 9B822C 802418AC 4600018D */ trunc.w.s $f6, $f0 +/* 9B8230 802418B0 44023000 */ mfc1 $v0, $f6 +/* 9B8234 802418B4 00000000 */ nop +/* 9B8238 802418B8 A6420014 */ sh $v0, 0x14($s2) +.L802418BC: +/* 9B823C 802418BC 8FBF0020 */ lw $ra, 0x20($sp) +/* 9B8240 802418C0 8FB3001C */ lw $s3, 0x1c($sp) +/* 9B8244 802418C4 8FB20018 */ lw $s2, 0x18($sp) +/* 9B8248 802418C8 8FB10014 */ lw $s1, 0x14($sp) +/* 9B824C 802418CC 8FB00010 */ lw $s0, 0x10($sp) +/* 9B8250 802418D0 03E00008 */ jr $ra +/* 9B8254 802418D4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C.s deleted file mode 100644 index e939d5f054..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C.s +++ /dev/null @@ -1,243 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024193C -/* 9B82BC 8024193C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9B82C0 80241940 AFB20030 */ sw $s2, 0x30($sp) -/* 9B82C4 80241944 0080902D */ daddu $s2, $a0, $zero -/* 9B82C8 80241948 AFBF0038 */ sw $ra, 0x38($sp) -/* 9B82CC 8024194C AFB30034 */ sw $s3, 0x34($sp) -/* 9B82D0 80241950 AFB1002C */ sw $s1, 0x2c($sp) -/* 9B82D4 80241954 AFB00028 */ sw $s0, 0x28($sp) -/* 9B82D8 80241958 F7B60048 */ sdc1 $f22, 0x48($sp) -/* 9B82DC 8024195C F7B40040 */ sdc1 $f20, 0x40($sp) -/* 9B82E0 80241960 8E510148 */ lw $s1, 0x148($s2) -/* 9B82E4 80241964 86240008 */ lh $a0, 8($s1) -/* 9B82E8 80241968 0C00EABB */ jal get_npc_unsafe -/* 9B82EC 8024196C 00A0982D */ daddu $s3, $a1, $zero -/* 9B82F0 80241970 0040802D */ daddu $s0, $v0, $zero -/* 9B82F4 80241974 0200202D */ daddu $a0, $s0, $zero -/* 9B82F8 80241978 C6220088 */ lwc1 $f2, 0x88($s1) -/* 9B82FC 8024197C 468010A0 */ cvt.s.w $f2, $f2 -/* 9B8300 80241980 460010A1 */ cvt.d.s $f2, $f2 -/* 9B8304 80241984 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B8308 80241988 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9B830C 8024198C 8E050018 */ lw $a1, 0x18($s0) -/* 9B8310 80241990 46002100 */ add.s $f4, $f4, $f0 -/* 9B8314 80241994 8E06000C */ lw $a2, 0xc($s0) -/* 9B8318 80241998 C6200078 */ lwc1 $f0, 0x78($s1) -/* 9B831C 8024199C 46800020 */ cvt.s.w $f0, $f0 -/* 9B8320 802419A0 E604001C */ swc1 $f4, 0x1c($s0) -/* 9B8324 802419A4 3C014059 */ lui $at, 0x4059 -/* 9B8328 802419A8 44812800 */ mtc1 $at, $f5 -/* 9B832C 802419AC 44802000 */ mtc1 $zero, $f4 -/* 9B8330 802419B0 46000021 */ cvt.d.s $f0, $f0 -/* 9B8334 802419B4 46240003 */ div.d $f0, $f0, $f4 -/* 9B8338 802419B8 46200520 */ cvt.s.d $f20, $f0 -/* 9B833C 802419BC 46241083 */ div.d $f2, $f2, $f4 -/* 9B8340 802419C0 0C00EA95 */ jal npc_move_heading -/* 9B8344 802419C4 462015A0 */ cvt.s.d $f22, $f2 -/* 9B8348 802419C8 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B834C 802419CC 44801000 */ mtc1 $zero, $f2 -/* 9B8350 802419D0 44801800 */ mtc1 $zero, $f3 -/* 9B8354 802419D4 46002021 */ cvt.d.s $f0, $f4 -/* 9B8358 802419D8 4620103E */ c.le.d $f2, $f0 -/* 9B835C 802419DC 00000000 */ nop -/* 9B8360 802419E0 45000030 */ bc1f .L80241AA4 -/* 9B8364 802419E4 00000000 */ nop -/* 9B8368 802419E8 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B836C 802419EC 46040000 */ add.s $f0, $f0, $f4 -/* 9B8370 802419F0 E600003C */ swc1 $f0, 0x3c($s0) -/* 9B8374 802419F4 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8378 802419F8 8C420024 */ lw $v0, 0x24($v0) -/* 9B837C 802419FC AE020028 */ sw $v0, 0x28($s0) -/* 9B8380 80241A00 A2200007 */ sb $zero, 7($s1) -/* 9B8384 80241A04 8E020000 */ lw $v0, ($s0) -/* 9B8388 80241A08 30420008 */ andi $v0, $v0, 8 -/* 9B838C 80241A0C 14400011 */ bnez $v0, .L80241A54 -/* 9B8390 80241A10 0000102D */ daddu $v0, $zero, $zero -/* 9B8394 80241A14 27A50018 */ addiu $a1, $sp, 0x18 -/* 9B8398 80241A18 27A6001C */ addiu $a2, $sp, 0x1c -/* 9B839C 80241A1C C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B83A0 80241A20 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B83A4 80241A24 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B83A8 80241A28 3C01447A */ lui $at, 0x447a -/* 9B83AC 80241A2C 44813000 */ mtc1 $at, $f6 -/* 9B83B0 80241A30 27A20024 */ addiu $v0, $sp, 0x24 -/* 9B83B4 80241A34 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B83B8 80241A38 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9B83BC 80241A3C E7A40020 */ swc1 $f4, 0x20($sp) -/* 9B83C0 80241A40 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9B83C4 80241A44 AFA20010 */ sw $v0, 0x10($sp) -/* 9B83C8 80241A48 8E040080 */ lw $a0, 0x80($s0) -/* 9B83CC 80241A4C 0C0372DF */ jal func_800DCB7C -/* 9B83D0 80241A50 27A70020 */ addiu $a3, $sp, 0x20 -.L80241A54: -/* 9B83D4 80241A54 1040000B */ beqz $v0, .L80241A84 -/* 9B83D8 80241A58 00000000 */ nop -/* 9B83DC 80241A5C C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9B83E0 80241A60 46140080 */ add.s $f2, $f0, $f20 -/* 9B83E4 80241A64 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B83E8 80241A68 4600103E */ c.le.s $f2, $f0 -/* 9B83EC 80241A6C 00000000 */ nop -/* 9B83F0 80241A70 4500008D */ bc1f .L80241CA8 -/* 9B83F4 80241A74 00000000 */ nop -/* 9B83F8 80241A78 E602003C */ swc1 $f2, 0x3c($s0) -/* 9B83FC 80241A7C 0809072A */ j .L80241CA8 -/* 9B8400 80241A80 AE400070 */ sw $zero, 0x70($s2) -.L80241A84: -/* 9B8404 80241A84 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B8408 80241A88 C6000064 */ lwc1 $f0, 0x64($s0) -/* 9B840C 80241A8C 4602003E */ c.le.s $f0, $f2 -/* 9B8410 80241A90 00000000 */ nop -/* 9B8414 80241A94 45030084 */ bc1tl .L80241CA8 -/* 9B8418 80241A98 AE400070 */ sw $zero, 0x70($s2) -/* 9B841C 80241A9C 0809072A */ j .L80241CA8 -/* 9B8420 80241AA0 00000000 */ nop -.L80241AA4: -/* 9B8424 80241AA4 4622003C */ c.lt.d $f0, $f2 -/* 9B8428 80241AA8 00000000 */ nop -/* 9B842C 80241AAC 4500007E */ bc1f .L80241CA8 -/* 9B8430 80241AB0 00000000 */ nop -/* 9B8434 80241AB4 9602008E */ lhu $v0, 0x8e($s0) -/* 9B8438 80241AB8 24420001 */ addiu $v0, $v0, 1 -/* 9B843C 80241ABC A602008E */ sh $v0, 0x8e($s0) -/* 9B8440 80241AC0 00021400 */ sll $v0, $v0, 0x10 -/* 9B8444 80241AC4 8E630020 */ lw $v1, 0x20($s3) -/* 9B8448 80241AC8 00021403 */ sra $v0, $v0, 0x10 -/* 9B844C 80241ACC 0043102A */ slt $v0, $v0, $v1 -/* 9B8450 80241AD0 14400026 */ bnez $v0, .L80241B6C -/* 9B8454 80241AD4 00000000 */ nop -/* 9B8458 80241AD8 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 9B845C 80241ADC C60E0040 */ lwc1 $f14, 0x40($s0) -/* 9B8460 80241AE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) -/* 9B8464 80241AE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) -/* 9B8468 80241AE8 A600008E */ sh $zero, 0x8e($s0) -/* 9B846C 80241AEC 8C460028 */ lw $a2, 0x28($v0) -/* 9B8470 80241AF0 0C00A720 */ jal atan2 -/* 9B8474 80241AF4 8C470030 */ lw $a3, 0x30($v0) -/* 9B8478 80241AF8 46000506 */ mov.s $f20, $f0 -/* 9B847C 80241AFC C60C000C */ lwc1 $f12, 0xc($s0) -/* 9B8480 80241B00 0C00A70A */ jal get_clamped_angle_diff -/* 9B8484 80241B04 4600A386 */ mov.s $f14, $f20 -/* 9B8488 80241B08 46000086 */ mov.s $f2, $f0 -/* 9B848C 80241B0C 8E62001C */ lw $v0, 0x1c($s3) -/* 9B8490 80241B10 46001005 */ abs.s $f0, $f2 -/* 9B8494 80241B14 44822000 */ mtc1 $v0, $f4 -/* 9B8498 80241B18 00000000 */ nop -/* 9B849C 80241B1C 46802120 */ cvt.s.w $f4, $f4 -/* 9B84A0 80241B20 4600203C */ c.lt.s $f4, $f0 -/* 9B84A4 80241B24 00000000 */ nop -/* 9B84A8 80241B28 4500000D */ bc1f .L80241B60 -/* 9B84AC 80241B2C 00000000 */ nop -/* 9B84B0 80241B30 44800000 */ mtc1 $zero, $f0 -/* 9B84B4 80241B34 C614000C */ lwc1 $f20, 0xc($s0) -/* 9B84B8 80241B38 4600103C */ c.lt.s $f2, $f0 -/* 9B84BC 80241B3C 00000000 */ nop -/* 9B84C0 80241B40 45000006 */ bc1f .L80241B5C -/* 9B84C4 80241B44 00021023 */ negu $v0, $v0 -/* 9B84C8 80241B48 44820000 */ mtc1 $v0, $f0 -/* 9B84CC 80241B4C 00000000 */ nop -/* 9B84D0 80241B50 46800020 */ cvt.s.w $f0, $f0 -/* 9B84D4 80241B54 080906D8 */ j .L80241B60 -/* 9B84D8 80241B58 4600A500 */ add.s $f20, $f20, $f0 -.L80241B5C: -/* 9B84DC 80241B5C 4604A500 */ add.s $f20, $f20, $f4 -.L80241B60: -/* 9B84E0 80241B60 0C00A6C9 */ jal clamp_angle -/* 9B84E4 80241B64 4600A306 */ mov.s $f12, $f20 -/* 9B84E8 80241B68 E600000C */ swc1 $f0, 0xc($s0) -.L80241B6C: -/* 9B84EC 80241B6C 8E020000 */ lw $v0, ($s0) -/* 9B84F0 80241B70 30420008 */ andi $v0, $v0, 8 -/* 9B84F4 80241B74 1040000A */ beqz $v0, .L80241BA0 -/* 9B84F8 80241B78 27A50018 */ addiu $a1, $sp, 0x18 -/* 9B84FC 80241B7C C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B8500 80241B80 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9B8504 80241B84 46001080 */ add.s $f2, $f2, $f0 -/* 9B8508 80241B88 4616103C */ c.lt.s $f2, $f22 -/* 9B850C 80241B8C 00000000 */ nop -/* 9B8510 80241B90 45020045 */ bc1fl .L80241CA8 -/* 9B8514 80241B94 E602003C */ swc1 $f2, 0x3c($s0) -/* 9B8518 80241B98 08090729 */ j .L80241CA4 -/* 9B851C 80241B9C E616003C */ swc1 $f22, 0x3c($s0) -.L80241BA0: -/* 9B8520 80241BA0 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B8524 80241BA4 27A6001C */ addiu $a2, $sp, 0x1c -/* 9B8528 80241BA8 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B852C 80241BAC 860200A8 */ lh $v0, 0xa8($s0) -/* 9B8530 80241BB0 C600001C */ lwc1 $f0, 0x1c($s0) -/* 9B8534 80241BB4 C604003C */ lwc1 $f4, 0x3c($s0) -/* 9B8538 80241BB8 44821000 */ mtc1 $v0, $f2 -/* 9B853C 80241BBC 00000000 */ nop -/* 9B8540 80241BC0 468010A0 */ cvt.s.w $f2, $f2 -/* 9B8544 80241BC4 46000005 */ abs.s $f0, $f0 -/* 9B8548 80241BC8 46020000 */ add.s $f0, $f0, $f2 -/* 9B854C 80241BCC C6060040 */ lwc1 $f6, 0x40($s0) -/* 9B8550 80241BD0 27A20024 */ addiu $v0, $sp, 0x24 -/* 9B8554 80241BD4 46022100 */ add.s $f4, $f4, $f2 -/* 9B8558 80241BD8 3C014024 */ lui $at, 0x4024 -/* 9B855C 80241BDC 44811800 */ mtc1 $at, $f3 -/* 9B8560 80241BE0 44801000 */ mtc1 $zero, $f2 -/* 9B8564 80241BE4 46000021 */ cvt.d.s $f0, $f0 -/* 9B8568 80241BE8 46220000 */ add.d $f0, $f0, $f2 -/* 9B856C 80241BEC E7A60020 */ swc1 $f6, 0x20($sp) -/* 9B8570 80241BF0 E7A4001C */ swc1 $f4, 0x1c($sp) -/* 9B8574 80241BF4 46200020 */ cvt.s.d $f0, $f0 -/* 9B8578 80241BF8 E7A00024 */ swc1 $f0, 0x24($sp) -/* 9B857C 80241BFC AFA20010 */ sw $v0, 0x10($sp) -/* 9B8580 80241C00 8E040080 */ lw $a0, 0x80($s0) -/* 9B8584 80241C04 0C0372DF */ jal func_800DCB7C -/* 9B8588 80241C08 27A70020 */ addiu $a3, $sp, 0x20 -/* 9B858C 80241C0C 10400015 */ beqz $v0, .L80241C64 -/* 9B8590 80241C10 00000000 */ nop -/* 9B8594 80241C14 860200A8 */ lh $v0, 0xa8($s0) -/* 9B8598 80241C18 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B859C 80241C1C 44820000 */ mtc1 $v0, $f0 -/* 9B85A0 80241C20 00000000 */ nop -/* 9B85A4 80241C24 46800020 */ cvt.s.w $f0, $f0 -/* 9B85A8 80241C28 46002085 */ abs.s $f2, $f4 -/* 9B85AC 80241C2C 46020000 */ add.s $f0, $f0, $f2 -/* 9B85B0 80241C30 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9B85B4 80241C34 4600103E */ c.le.s $f2, $f0 -/* 9B85B8 80241C38 00000000 */ nop -/* 9B85BC 80241C3C 45000005 */ bc1f .L80241C54 -/* 9B85C0 80241C40 00000000 */ nop -/* 9B85C4 80241C44 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9B85C8 80241C48 AE00001C */ sw $zero, 0x1c($s0) -/* 9B85CC 80241C4C 0809072A */ j .L80241CA8 -/* 9B85D0 80241C50 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C54: -/* 9B85D4 80241C54 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B85D8 80241C58 46040000 */ add.s $f0, $f0, $f4 -/* 9B85DC 80241C5C 0809072A */ j .L80241CA8 -/* 9B85E0 80241C60 E600003C */ swc1 $f0, 0x3c($s0) -.L80241C64: -/* 9B85E4 80241C64 C606003C */ lwc1 $f6, 0x3c($s0) -/* 9B85E8 80241C68 860200A8 */ lh $v0, 0xa8($s0) -/* 9B85EC 80241C6C 46163081 */ sub.s $f2, $f6, $f22 -/* 9B85F0 80241C70 44820000 */ mtc1 $v0, $f0 -/* 9B85F4 80241C74 00000000 */ nop -/* 9B85F8 80241C78 46800020 */ cvt.s.w $f0, $f0 -/* 9B85FC 80241C7C 46001080 */ add.s $f2, $f2, $f0 -/* 9B8600 80241C80 C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B8604 80241C84 46002005 */ abs.s $f0, $f4 -/* 9B8608 80241C88 4602003C */ c.lt.s $f0, $f2 -/* 9B860C 80241C8C 00000000 */ nop -/* 9B8610 80241C90 45020005 */ bc1fl .L80241CA8 -/* 9B8614 80241C94 AE00001C */ sw $zero, 0x1c($s0) -/* 9B8618 80241C98 46043000 */ add.s $f0, $f6, $f4 -/* 9B861C 80241C9C 0809072A */ j .L80241CA8 -/* 9B8620 80241CA0 E600003C */ swc1 $f0, 0x3c($s0) -.L80241CA4: -/* 9B8624 80241CA4 AE00001C */ sw $zero, 0x1c($s0) -.L80241CA8: -/* 9B8628 80241CA8 8FBF0038 */ lw $ra, 0x38($sp) -/* 9B862C 80241CAC 8FB30034 */ lw $s3, 0x34($sp) -/* 9B8630 80241CB0 8FB20030 */ lw $s2, 0x30($sp) -/* 9B8634 80241CB4 8FB1002C */ lw $s1, 0x2c($sp) -/* 9B8638 80241CB8 8FB00028 */ lw $s0, 0x28($sp) -/* 9B863C 80241CBC D7B60048 */ ldc1 $f22, 0x48($sp) -/* 9B8640 80241CC0 D7B40040 */ ldc1 $f20, 0x40($sp) -/* 9B8644 80241CC4 03E00008 */ jr $ra -/* 9B8648 80241CC8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s new file mode 100644 index 0000000000..1c716d1648 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024193C_9B82BC.s @@ -0,0 +1,243 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024193C_9B82BC +/* 9B82BC 8024193C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 9B82C0 80241940 AFB20030 */ sw $s2, 0x30($sp) +/* 9B82C4 80241944 0080902D */ daddu $s2, $a0, $zero +/* 9B82C8 80241948 AFBF0038 */ sw $ra, 0x38($sp) +/* 9B82CC 8024194C AFB30034 */ sw $s3, 0x34($sp) +/* 9B82D0 80241950 AFB1002C */ sw $s1, 0x2c($sp) +/* 9B82D4 80241954 AFB00028 */ sw $s0, 0x28($sp) +/* 9B82D8 80241958 F7B60048 */ sdc1 $f22, 0x48($sp) +/* 9B82DC 8024195C F7B40040 */ sdc1 $f20, 0x40($sp) +/* 9B82E0 80241960 8E510148 */ lw $s1, 0x148($s2) +/* 9B82E4 80241964 86240008 */ lh $a0, 8($s1) +/* 9B82E8 80241968 0C00EABB */ jal get_npc_unsafe +/* 9B82EC 8024196C 00A0982D */ daddu $s3, $a1, $zero +/* 9B82F0 80241970 0040802D */ daddu $s0, $v0, $zero +/* 9B82F4 80241974 0200202D */ daddu $a0, $s0, $zero +/* 9B82F8 80241978 C6220088 */ lwc1 $f2, 0x88($s1) +/* 9B82FC 8024197C 468010A0 */ cvt.s.w $f2, $f2 +/* 9B8300 80241980 460010A1 */ cvt.d.s $f2, $f2 +/* 9B8304 80241984 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9B8308 80241988 C6000014 */ lwc1 $f0, 0x14($s0) +/* 9B830C 8024198C 8E050018 */ lw $a1, 0x18($s0) +/* 9B8310 80241990 46002100 */ add.s $f4, $f4, $f0 +/* 9B8314 80241994 8E06000C */ lw $a2, 0xc($s0) +/* 9B8318 80241998 C6200078 */ lwc1 $f0, 0x78($s1) +/* 9B831C 8024199C 46800020 */ cvt.s.w $f0, $f0 +/* 9B8320 802419A0 E604001C */ swc1 $f4, 0x1c($s0) +/* 9B8324 802419A4 3C014059 */ lui $at, 0x4059 +/* 9B8328 802419A8 44812800 */ mtc1 $at, $f5 +/* 9B832C 802419AC 44802000 */ mtc1 $zero, $f4 +/* 9B8330 802419B0 46000021 */ cvt.d.s $f0, $f0 +/* 9B8334 802419B4 46240003 */ div.d $f0, $f0, $f4 +/* 9B8338 802419B8 46200520 */ cvt.s.d $f20, $f0 +/* 9B833C 802419BC 46241083 */ div.d $f2, $f2, $f4 +/* 9B8340 802419C0 0C00EA95 */ jal npc_move_heading +/* 9B8344 802419C4 462015A0 */ cvt.s.d $f22, $f2 +/* 9B8348 802419C8 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9B834C 802419CC 44801000 */ mtc1 $zero, $f2 +/* 9B8350 802419D0 44801800 */ mtc1 $zero, $f3 +/* 9B8354 802419D4 46002021 */ cvt.d.s $f0, $f4 +/* 9B8358 802419D8 4620103E */ c.le.d $f2, $f0 +/* 9B835C 802419DC 00000000 */ nop +/* 9B8360 802419E0 45000030 */ bc1f .L80241AA4 +/* 9B8364 802419E4 00000000 */ nop +/* 9B8368 802419E8 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9B836C 802419EC 46040000 */ add.s $f0, $f0, $f4 +/* 9B8370 802419F0 E600003C */ swc1 $f0, 0x3c($s0) +/* 9B8374 802419F4 8E2200CC */ lw $v0, 0xcc($s1) +/* 9B8378 802419F8 8C420024 */ lw $v0, 0x24($v0) +/* 9B837C 802419FC AE020028 */ sw $v0, 0x28($s0) +/* 9B8380 80241A00 A2200007 */ sb $zero, 7($s1) +/* 9B8384 80241A04 8E020000 */ lw $v0, ($s0) +/* 9B8388 80241A08 30420008 */ andi $v0, $v0, 8 +/* 9B838C 80241A0C 14400011 */ bnez $v0, .L80241A54 +/* 9B8390 80241A10 0000102D */ daddu $v0, $zero, $zero +/* 9B8394 80241A14 27A50018 */ addiu $a1, $sp, 0x18 +/* 9B8398 80241A18 27A6001C */ addiu $a2, $sp, 0x1c +/* 9B839C 80241A1C C6000038 */ lwc1 $f0, 0x38($s0) +/* 9B83A0 80241A20 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9B83A4 80241A24 C6040040 */ lwc1 $f4, 0x40($s0) +/* 9B83A8 80241A28 3C01447A */ lui $at, 0x447a +/* 9B83AC 80241A2C 44813000 */ mtc1 $at, $f6 +/* 9B83B0 80241A30 27A20024 */ addiu $v0, $sp, 0x24 +/* 9B83B4 80241A34 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9B83B8 80241A38 E7A2001C */ swc1 $f2, 0x1c($sp) +/* 9B83BC 80241A3C E7A40020 */ swc1 $f4, 0x20($sp) +/* 9B83C0 80241A40 E7A60024 */ swc1 $f6, 0x24($sp) +/* 9B83C4 80241A44 AFA20010 */ sw $v0, 0x10($sp) +/* 9B83C8 80241A48 8E040080 */ lw $a0, 0x80($s0) +/* 9B83CC 80241A4C 0C0372DF */ jal func_800DCB7C +/* 9B83D0 80241A50 27A70020 */ addiu $a3, $sp, 0x20 +.L80241A54: +/* 9B83D4 80241A54 1040000B */ beqz $v0, .L80241A84 +/* 9B83D8 80241A58 00000000 */ nop +/* 9B83DC 80241A5C C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9B83E0 80241A60 46140080 */ add.s $f2, $f0, $f20 +/* 9B83E4 80241A64 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9B83E8 80241A68 4600103E */ c.le.s $f2, $f0 +/* 9B83EC 80241A6C 00000000 */ nop +/* 9B83F0 80241A70 4500008D */ bc1f .L80241CA8 +/* 9B83F4 80241A74 00000000 */ nop +/* 9B83F8 80241A78 E602003C */ swc1 $f2, 0x3c($s0) +/* 9B83FC 80241A7C 0809072A */ j .L80241CA8 +/* 9B8400 80241A80 AE400070 */ sw $zero, 0x70($s2) +.L80241A84: +/* 9B8404 80241A84 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9B8408 80241A88 C6000064 */ lwc1 $f0, 0x64($s0) +/* 9B840C 80241A8C 4602003E */ c.le.s $f0, $f2 +/* 9B8410 80241A90 00000000 */ nop +/* 9B8414 80241A94 45030084 */ bc1tl .L80241CA8 +/* 9B8418 80241A98 AE400070 */ sw $zero, 0x70($s2) +/* 9B841C 80241A9C 0809072A */ j .L80241CA8 +/* 9B8420 80241AA0 00000000 */ nop +.L80241AA4: +/* 9B8424 80241AA4 4622003C */ c.lt.d $f0, $f2 +/* 9B8428 80241AA8 00000000 */ nop +/* 9B842C 80241AAC 4500007E */ bc1f .L80241CA8 +/* 9B8430 80241AB0 00000000 */ nop +/* 9B8434 80241AB4 9602008E */ lhu $v0, 0x8e($s0) +/* 9B8438 80241AB8 24420001 */ addiu $v0, $v0, 1 +/* 9B843C 80241ABC A602008E */ sh $v0, 0x8e($s0) +/* 9B8440 80241AC0 00021400 */ sll $v0, $v0, 0x10 +/* 9B8444 80241AC4 8E630020 */ lw $v1, 0x20($s3) +/* 9B8448 80241AC8 00021403 */ sra $v0, $v0, 0x10 +/* 9B844C 80241ACC 0043102A */ slt $v0, $v0, $v1 +/* 9B8450 80241AD0 14400026 */ bnez $v0, .L80241B6C +/* 9B8454 80241AD4 00000000 */ nop +/* 9B8458 80241AD8 C60C0038 */ lwc1 $f12, 0x38($s0) +/* 9B845C 80241ADC C60E0040 */ lwc1 $f14, 0x40($s0) +/* 9B8460 80241AE0 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) +/* 9B8464 80241AE4 8C427B30 */ lw $v0, %lo(gPlayerStatusPtr)($v0) +/* 9B8468 80241AE8 A600008E */ sh $zero, 0x8e($s0) +/* 9B846C 80241AEC 8C460028 */ lw $a2, 0x28($v0) +/* 9B8470 80241AF0 0C00A720 */ jal atan2 +/* 9B8474 80241AF4 8C470030 */ lw $a3, 0x30($v0) +/* 9B8478 80241AF8 46000506 */ mov.s $f20, $f0 +/* 9B847C 80241AFC C60C000C */ lwc1 $f12, 0xc($s0) +/* 9B8480 80241B00 0C00A70A */ jal get_clamped_angle_diff +/* 9B8484 80241B04 4600A386 */ mov.s $f14, $f20 +/* 9B8488 80241B08 46000086 */ mov.s $f2, $f0 +/* 9B848C 80241B0C 8E62001C */ lw $v0, 0x1c($s3) +/* 9B8490 80241B10 46001005 */ abs.s $f0, $f2 +/* 9B8494 80241B14 44822000 */ mtc1 $v0, $f4 +/* 9B8498 80241B18 00000000 */ nop +/* 9B849C 80241B1C 46802120 */ cvt.s.w $f4, $f4 +/* 9B84A0 80241B20 4600203C */ c.lt.s $f4, $f0 +/* 9B84A4 80241B24 00000000 */ nop +/* 9B84A8 80241B28 4500000D */ bc1f .L80241B60 +/* 9B84AC 80241B2C 00000000 */ nop +/* 9B84B0 80241B30 44800000 */ mtc1 $zero, $f0 +/* 9B84B4 80241B34 C614000C */ lwc1 $f20, 0xc($s0) +/* 9B84B8 80241B38 4600103C */ c.lt.s $f2, $f0 +/* 9B84BC 80241B3C 00000000 */ nop +/* 9B84C0 80241B40 45000006 */ bc1f .L80241B5C +/* 9B84C4 80241B44 00021023 */ negu $v0, $v0 +/* 9B84C8 80241B48 44820000 */ mtc1 $v0, $f0 +/* 9B84CC 80241B4C 00000000 */ nop +/* 9B84D0 80241B50 46800020 */ cvt.s.w $f0, $f0 +/* 9B84D4 80241B54 080906D8 */ j .L80241B60 +/* 9B84D8 80241B58 4600A500 */ add.s $f20, $f20, $f0 +.L80241B5C: +/* 9B84DC 80241B5C 4604A500 */ add.s $f20, $f20, $f4 +.L80241B60: +/* 9B84E0 80241B60 0C00A6C9 */ jal clamp_angle +/* 9B84E4 80241B64 4600A306 */ mov.s $f12, $f20 +/* 9B84E8 80241B68 E600000C */ swc1 $f0, 0xc($s0) +.L80241B6C: +/* 9B84EC 80241B6C 8E020000 */ lw $v0, ($s0) +/* 9B84F0 80241B70 30420008 */ andi $v0, $v0, 8 +/* 9B84F4 80241B74 1040000A */ beqz $v0, .L80241BA0 +/* 9B84F8 80241B78 27A50018 */ addiu $a1, $sp, 0x18 +/* 9B84FC 80241B7C C602003C */ lwc1 $f2, 0x3c($s0) +/* 9B8500 80241B80 C600001C */ lwc1 $f0, 0x1c($s0) +/* 9B8504 80241B84 46001080 */ add.s $f2, $f2, $f0 +/* 9B8508 80241B88 4616103C */ c.lt.s $f2, $f22 +/* 9B850C 80241B8C 00000000 */ nop +/* 9B8510 80241B90 45020045 */ bc1fl .L80241CA8 +/* 9B8514 80241B94 E602003C */ swc1 $f2, 0x3c($s0) +/* 9B8518 80241B98 08090729 */ j .L80241CA4 +/* 9B851C 80241B9C E616003C */ swc1 $f22, 0x3c($s0) +.L80241BA0: +/* 9B8520 80241BA0 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9B8524 80241BA4 27A6001C */ addiu $a2, $sp, 0x1c +/* 9B8528 80241BA8 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9B852C 80241BAC 860200A8 */ lh $v0, 0xa8($s0) +/* 9B8530 80241BB0 C600001C */ lwc1 $f0, 0x1c($s0) +/* 9B8534 80241BB4 C604003C */ lwc1 $f4, 0x3c($s0) +/* 9B8538 80241BB8 44821000 */ mtc1 $v0, $f2 +/* 9B853C 80241BBC 00000000 */ nop +/* 9B8540 80241BC0 468010A0 */ cvt.s.w $f2, $f2 +/* 9B8544 80241BC4 46000005 */ abs.s $f0, $f0 +/* 9B8548 80241BC8 46020000 */ add.s $f0, $f0, $f2 +/* 9B854C 80241BCC C6060040 */ lwc1 $f6, 0x40($s0) +/* 9B8550 80241BD0 27A20024 */ addiu $v0, $sp, 0x24 +/* 9B8554 80241BD4 46022100 */ add.s $f4, $f4, $f2 +/* 9B8558 80241BD8 3C014024 */ lui $at, 0x4024 +/* 9B855C 80241BDC 44811800 */ mtc1 $at, $f3 +/* 9B8560 80241BE0 44801000 */ mtc1 $zero, $f2 +/* 9B8564 80241BE4 46000021 */ cvt.d.s $f0, $f0 +/* 9B8568 80241BE8 46220000 */ add.d $f0, $f0, $f2 +/* 9B856C 80241BEC E7A60020 */ swc1 $f6, 0x20($sp) +/* 9B8570 80241BF0 E7A4001C */ swc1 $f4, 0x1c($sp) +/* 9B8574 80241BF4 46200020 */ cvt.s.d $f0, $f0 +/* 9B8578 80241BF8 E7A00024 */ swc1 $f0, 0x24($sp) +/* 9B857C 80241BFC AFA20010 */ sw $v0, 0x10($sp) +/* 9B8580 80241C00 8E040080 */ lw $a0, 0x80($s0) +/* 9B8584 80241C04 0C0372DF */ jal func_800DCB7C +/* 9B8588 80241C08 27A70020 */ addiu $a3, $sp, 0x20 +/* 9B858C 80241C0C 10400015 */ beqz $v0, .L80241C64 +/* 9B8590 80241C10 00000000 */ nop +/* 9B8594 80241C14 860200A8 */ lh $v0, 0xa8($s0) +/* 9B8598 80241C18 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9B859C 80241C1C 44820000 */ mtc1 $v0, $f0 +/* 9B85A0 80241C20 00000000 */ nop +/* 9B85A4 80241C24 46800020 */ cvt.s.w $f0, $f0 +/* 9B85A8 80241C28 46002085 */ abs.s $f2, $f4 +/* 9B85AC 80241C2C 46020000 */ add.s $f0, $f0, $f2 +/* 9B85B0 80241C30 C7A20024 */ lwc1 $f2, 0x24($sp) +/* 9B85B4 80241C34 4600103E */ c.le.s $f2, $f0 +/* 9B85B8 80241C38 00000000 */ nop +/* 9B85BC 80241C3C 45000005 */ bc1f .L80241C54 +/* 9B85C0 80241C40 00000000 */ nop +/* 9B85C4 80241C44 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9B85C8 80241C48 AE00001C */ sw $zero, 0x1c($s0) +/* 9B85CC 80241C4C 0809072A */ j .L80241CA8 +/* 9B85D0 80241C50 E600003C */ swc1 $f0, 0x3c($s0) +.L80241C54: +/* 9B85D4 80241C54 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9B85D8 80241C58 46040000 */ add.s $f0, $f0, $f4 +/* 9B85DC 80241C5C 0809072A */ j .L80241CA8 +/* 9B85E0 80241C60 E600003C */ swc1 $f0, 0x3c($s0) +.L80241C64: +/* 9B85E4 80241C64 C606003C */ lwc1 $f6, 0x3c($s0) +/* 9B85E8 80241C68 860200A8 */ lh $v0, 0xa8($s0) +/* 9B85EC 80241C6C 46163081 */ sub.s $f2, $f6, $f22 +/* 9B85F0 80241C70 44820000 */ mtc1 $v0, $f0 +/* 9B85F4 80241C74 00000000 */ nop +/* 9B85F8 80241C78 46800020 */ cvt.s.w $f0, $f0 +/* 9B85FC 80241C7C 46001080 */ add.s $f2, $f2, $f0 +/* 9B8600 80241C80 C604001C */ lwc1 $f4, 0x1c($s0) +/* 9B8604 80241C84 46002005 */ abs.s $f0, $f4 +/* 9B8608 80241C88 4602003C */ c.lt.s $f0, $f2 +/* 9B860C 80241C8C 00000000 */ nop +/* 9B8610 80241C90 45020005 */ bc1fl .L80241CA8 +/* 9B8614 80241C94 AE00001C */ sw $zero, 0x1c($s0) +/* 9B8618 80241C98 46043000 */ add.s $f0, $f6, $f4 +/* 9B861C 80241C9C 0809072A */ j .L80241CA8 +/* 9B8620 80241CA0 E600003C */ swc1 $f0, 0x3c($s0) +.L80241CA4: +/* 9B8624 80241CA4 AE00001C */ sw $zero, 0x1c($s0) +.L80241CA8: +/* 9B8628 80241CA8 8FBF0038 */ lw $ra, 0x38($sp) +/* 9B862C 80241CAC 8FB30034 */ lw $s3, 0x34($sp) +/* 9B8630 80241CB0 8FB20030 */ lw $s2, 0x30($sp) +/* 9B8634 80241CB4 8FB1002C */ lw $s1, 0x2c($sp) +/* 9B8638 80241CB8 8FB00028 */ lw $s0, 0x28($sp) +/* 9B863C 80241CBC D7B60048 */ ldc1 $f22, 0x48($sp) +/* 9B8640 80241CC0 D7B40040 */ ldc1 $f20, 0x40($sp) +/* 9B8644 80241CC4 03E00008 */ jr $ra +/* 9B8648 80241CC8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC.s deleted file mode 100644 index 7552bfc056..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC.s +++ /dev/null @@ -1,79 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CCC -/* 9B864C 80241CCC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9B8650 80241CD0 AFB00028 */ sw $s0, 0x28($sp) -/* 9B8654 80241CD4 00A0802D */ daddu $s0, $a1, $zero -/* 9B8658 80241CD8 AFB1002C */ sw $s1, 0x2c($sp) -/* 9B865C 80241CDC 00C0882D */ daddu $s1, $a2, $zero -/* 9B8660 80241CE0 AFBF0034 */ sw $ra, 0x34($sp) -/* 9B8664 80241CE4 AFB20030 */ sw $s2, 0x30($sp) -/* 9B8668 80241CE8 AE200070 */ sw $zero, 0x70($s1) -/* 9B866C 80241CEC 8C830000 */ lw $v1, ($a0) -/* 9B8670 80241CF0 2402FDFF */ addiu $v0, $zero, -0x201 -/* 9B8674 80241CF4 A480008E */ sh $zero, 0x8e($a0) -/* 9B8678 80241CF8 00621824 */ and $v1, $v1, $v0 -/* 9B867C 80241CFC 34650800 */ ori $a1, $v1, 0x800 -/* 9B8680 80241D00 AC850000 */ sw $a1, ($a0) -/* 9B8684 80241D04 8E0200D0 */ lw $v0, 0xd0($s0) -/* 9B8688 80241D08 8C420034 */ lw $v0, 0x34($v0) -/* 9B868C 80241D0C 10400003 */ beqz $v0, .L80241D1C -/* 9B8690 80241D10 00E0902D */ daddu $s2, $a3, $zero -/* 9B8694 80241D14 08090749 */ j .L80241D24 -/* 9B8698 80241D18 34620808 */ ori $v0, $v1, 0x808 -.L80241D1C: -/* 9B869C 80241D1C 2402FFF7 */ addiu $v0, $zero, -9 -/* 9B86A0 80241D20 00A21024 */ and $v0, $a1, $v0 -.L80241D24: -/* 9B86A4 80241D24 AC820000 */ sw $v0, ($a0) -/* 9B86A8 80241D28 27A20024 */ addiu $v0, $sp, 0x24 -/* 9B86AC 80241D2C 27A50018 */ addiu $a1, $sp, 0x18 -/* 9B86B0 80241D30 C4800038 */ lwc1 $f0, 0x38($a0) -/* 9B86B4 80241D34 C482003C */ lwc1 $f2, 0x3c($a0) -/* 9B86B8 80241D38 C4840040 */ lwc1 $f4, 0x40($a0) -/* 9B86BC 80241D3C 3C01447A */ lui $at, 0x447a -/* 9B86C0 80241D40 44813000 */ mtc1 $at, $f6 -/* 9B86C4 80241D44 27A6001C */ addiu $a2, $sp, 0x1c -/* 9B86C8 80241D48 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B86CC 80241D4C E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9B86D0 80241D50 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9B86D4 80241D54 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9B86D8 80241D58 AFA20010 */ sw $v0, 0x10($sp) -/* 9B86DC 80241D5C 8C840080 */ lw $a0, 0x80($a0) -/* 9B86E0 80241D60 0C0372DF */ jal func_800DCB7C -/* 9B86E4 80241D64 27A70020 */ addiu $a3, $sp, 0x20 -/* 9B86E8 80241D68 C7A20024 */ lwc1 $f2, 0x24($sp) -/* 9B86EC 80241D6C 3C014059 */ lui $at, 0x4059 -/* 9B86F0 80241D70 44812800 */ mtc1 $at, $f5 -/* 9B86F4 80241D74 44802000 */ mtc1 $zero, $f4 -/* 9B86F8 80241D78 460010A1 */ cvt.d.s $f2, $f2 -/* 9B86FC 80241D7C 46241082 */ mul.d $f2, $f2, $f4 -/* 9B8700 80241D80 00000000 */ nop -/* 9B8704 80241D84 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9B8708 80241D88 46000021 */ cvt.d.s $f0, $f0 -/* 9B870C 80241D8C 46240002 */ mul.d $f0, $f0, $f4 -/* 9B8710 80241D90 00000000 */ nop -/* 9B8714 80241D94 3C013FE0 */ lui $at, 0x3fe0 -/* 9B8718 80241D98 44812800 */ mtc1 $at, $f5 -/* 9B871C 80241D9C 44802000 */ mtc1 $zero, $f4 -/* 9B8720 80241DA0 00000000 */ nop -/* 9B8724 80241DA4 46241080 */ add.d $f2, $f2, $f4 -/* 9B8728 80241DA8 AE000074 */ sw $zero, 0x74($s0) -/* 9B872C 80241DAC 46240000 */ add.d $f0, $f0, $f4 -/* 9B8730 80241DB0 AE000090 */ sw $zero, 0x90($s0) -/* 9B8734 80241DB4 4620120D */ trunc.w.d $f8, $f2 -/* 9B8738 80241DB8 E6080078 */ swc1 $f8, 0x78($s0) -/* 9B873C 80241DBC 4620020D */ trunc.w.d $f8, $f0 -/* 9B8740 80241DC0 E6080088 */ swc1 $f8, 0x88($s0) -/* 9B8744 80241DC4 8E420014 */ lw $v0, 0x14($s2) -/* 9B8748 80241DC8 AE220074 */ sw $v0, 0x74($s1) -/* 9B874C 80241DCC 8E0200B0 */ lw $v0, 0xb0($s0) -/* 9B8750 80241DD0 34420010 */ ori $v0, $v0, 0x10 -/* 9B8754 80241DD4 AE0200B0 */ sw $v0, 0xb0($s0) -/* 9B8758 80241DD8 8FBF0034 */ lw $ra, 0x34($sp) -/* 9B875C 80241DDC 8FB20030 */ lw $s2, 0x30($sp) -/* 9B8760 80241DE0 8FB1002C */ lw $s1, 0x2c($sp) -/* 9B8764 80241DE4 8FB00028 */ lw $s0, 0x28($sp) -/* 9B8768 80241DE8 03E00008 */ jr $ra -/* 9B876C 80241DEC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s new file mode 100644 index 0000000000..6d1cb5bded --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241CCC_9B864C.s @@ -0,0 +1,79 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241CCC_9B864C +/* 9B864C 80241CCC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 9B8650 80241CD0 AFB00028 */ sw $s0, 0x28($sp) +/* 9B8654 80241CD4 00A0802D */ daddu $s0, $a1, $zero +/* 9B8658 80241CD8 AFB1002C */ sw $s1, 0x2c($sp) +/* 9B865C 80241CDC 00C0882D */ daddu $s1, $a2, $zero +/* 9B8660 80241CE0 AFBF0034 */ sw $ra, 0x34($sp) +/* 9B8664 80241CE4 AFB20030 */ sw $s2, 0x30($sp) +/* 9B8668 80241CE8 AE200070 */ sw $zero, 0x70($s1) +/* 9B866C 80241CEC 8C830000 */ lw $v1, ($a0) +/* 9B8670 80241CF0 2402FDFF */ addiu $v0, $zero, -0x201 +/* 9B8674 80241CF4 A480008E */ sh $zero, 0x8e($a0) +/* 9B8678 80241CF8 00621824 */ and $v1, $v1, $v0 +/* 9B867C 80241CFC 34650800 */ ori $a1, $v1, 0x800 +/* 9B8680 80241D00 AC850000 */ sw $a1, ($a0) +/* 9B8684 80241D04 8E0200D0 */ lw $v0, 0xd0($s0) +/* 9B8688 80241D08 8C420034 */ lw $v0, 0x34($v0) +/* 9B868C 80241D0C 10400003 */ beqz $v0, .L80241D1C +/* 9B8690 80241D10 00E0902D */ daddu $s2, $a3, $zero +/* 9B8694 80241D14 08090749 */ j .L80241D24 +/* 9B8698 80241D18 34620808 */ ori $v0, $v1, 0x808 +.L80241D1C: +/* 9B869C 80241D1C 2402FFF7 */ addiu $v0, $zero, -9 +/* 9B86A0 80241D20 00A21024 */ and $v0, $a1, $v0 +.L80241D24: +/* 9B86A4 80241D24 AC820000 */ sw $v0, ($a0) +/* 9B86A8 80241D28 27A20024 */ addiu $v0, $sp, 0x24 +/* 9B86AC 80241D2C 27A50018 */ addiu $a1, $sp, 0x18 +/* 9B86B0 80241D30 C4800038 */ lwc1 $f0, 0x38($a0) +/* 9B86B4 80241D34 C482003C */ lwc1 $f2, 0x3c($a0) +/* 9B86B8 80241D38 C4840040 */ lwc1 $f4, 0x40($a0) +/* 9B86BC 80241D3C 3C01447A */ lui $at, 0x447a +/* 9B86C0 80241D40 44813000 */ mtc1 $at, $f6 +/* 9B86C4 80241D44 27A6001C */ addiu $a2, $sp, 0x1c +/* 9B86C8 80241D48 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9B86CC 80241D4C E7A2001C */ swc1 $f2, 0x1c($sp) +/* 9B86D0 80241D50 E7A40020 */ swc1 $f4, 0x20($sp) +/* 9B86D4 80241D54 E7A60024 */ swc1 $f6, 0x24($sp) +/* 9B86D8 80241D58 AFA20010 */ sw $v0, 0x10($sp) +/* 9B86DC 80241D5C 8C840080 */ lw $a0, 0x80($a0) +/* 9B86E0 80241D60 0C0372DF */ jal func_800DCB7C +/* 9B86E4 80241D64 27A70020 */ addiu $a3, $sp, 0x20 +/* 9B86E8 80241D68 C7A20024 */ lwc1 $f2, 0x24($sp) +/* 9B86EC 80241D6C 3C014059 */ lui $at, 0x4059 +/* 9B86F0 80241D70 44812800 */ mtc1 $at, $f5 +/* 9B86F4 80241D74 44802000 */ mtc1 $zero, $f4 +/* 9B86F8 80241D78 460010A1 */ cvt.d.s $f2, $f2 +/* 9B86FC 80241D7C 46241082 */ mul.d $f2, $f2, $f4 +/* 9B8700 80241D80 00000000 */ nop +/* 9B8704 80241D84 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9B8708 80241D88 46000021 */ cvt.d.s $f0, $f0 +/* 9B870C 80241D8C 46240002 */ mul.d $f0, $f0, $f4 +/* 9B8710 80241D90 00000000 */ nop +/* 9B8714 80241D94 3C013FE0 */ lui $at, 0x3fe0 +/* 9B8718 80241D98 44812800 */ mtc1 $at, $f5 +/* 9B871C 80241D9C 44802000 */ mtc1 $zero, $f4 +/* 9B8720 80241DA0 00000000 */ nop +/* 9B8724 80241DA4 46241080 */ add.d $f2, $f2, $f4 +/* 9B8728 80241DA8 AE000074 */ sw $zero, 0x74($s0) +/* 9B872C 80241DAC 46240000 */ add.d $f0, $f0, $f4 +/* 9B8730 80241DB0 AE000090 */ sw $zero, 0x90($s0) +/* 9B8734 80241DB4 4620120D */ trunc.w.d $f8, $f2 +/* 9B8738 80241DB8 E6080078 */ swc1 $f8, 0x78($s0) +/* 9B873C 80241DBC 4620020D */ trunc.w.d $f8, $f0 +/* 9B8740 80241DC0 E6080088 */ swc1 $f8, 0x88($s0) +/* 9B8744 80241DC4 8E420014 */ lw $v0, 0x14($s2) +/* 9B8748 80241DC8 AE220074 */ sw $v0, 0x74($s1) +/* 9B874C 80241DCC 8E0200B0 */ lw $v0, 0xb0($s0) +/* 9B8750 80241DD0 34420010 */ ori $v0, $v0, 0x10 +/* 9B8754 80241DD4 AE0200B0 */ sw $v0, 0xb0($s0) +/* 9B8758 80241DD8 8FBF0034 */ lw $ra, 0x34($sp) +/* 9B875C 80241DDC 8FB20030 */ lw $s2, 0x30($sp) +/* 9B8760 80241DE0 8FB1002C */ lw $s1, 0x2c($sp) +/* 9B8764 80241DE4 8FB00028 */ lw $s0, 0x28($sp) +/* 9B8768 80241DE8 03E00008 */ jr $ra +/* 9B876C 80241DEC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0.s deleted file mode 100644 index d9af169e32..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DF0 -/* 9B8770 80241DF0 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9B8774 80241DF4 AFB40040 */ sw $s4, 0x40($sp) -/* 9B8778 80241DF8 0080A02D */ daddu $s4, $a0, $zero -/* 9B877C 80241DFC AFBF0048 */ sw $ra, 0x48($sp) -/* 9B8780 80241E00 AFB50044 */ sw $s5, 0x44($sp) -/* 9B8784 80241E04 AFB3003C */ sw $s3, 0x3c($sp) -/* 9B8788 80241E08 AFB20038 */ sw $s2, 0x38($sp) -/* 9B878C 80241E0C AFB10034 */ sw $s1, 0x34($sp) -/* 9B8790 80241E10 AFB00030 */ sw $s0, 0x30($sp) -/* 9B8794 80241E14 8E920148 */ lw $s2, 0x148($s4) -/* 9B8798 80241E18 86440008 */ lh $a0, 8($s2) -/* 9B879C 80241E1C 8E90000C */ lw $s0, 0xc($s4) -/* 9B87A0 80241E20 0C00EABB */ jal get_npc_unsafe -/* 9B87A4 80241E24 00A0882D */ daddu $s1, $a1, $zero -/* 9B87A8 80241E28 0280202D */ daddu $a0, $s4, $zero -/* 9B87AC 80241E2C 8E050000 */ lw $a1, ($s0) -/* 9B87B0 80241E30 0C0B1EAF */ jal get_variable -/* 9B87B4 80241E34 0040A82D */ daddu $s5, $v0, $zero -/* 9B87B8 80241E38 AFA00010 */ sw $zero, 0x10($sp) -/* 9B87BC 80241E3C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87C0 80241E40 8C630030 */ lw $v1, 0x30($v1) -/* 9B87C4 80241E44 AFA30014 */ sw $v1, 0x14($sp) -/* 9B87C8 80241E48 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87CC 80241E4C 8C63001C */ lw $v1, 0x1c($v1) -/* 9B87D0 80241E50 AFA30018 */ sw $v1, 0x18($sp) -/* 9B87D4 80241E54 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87D8 80241E58 8C630024 */ lw $v1, 0x24($v1) -/* 9B87DC 80241E5C AFA3001C */ sw $v1, 0x1c($sp) -/* 9B87E0 80241E60 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87E4 80241E64 8C630028 */ lw $v1, 0x28($v1) -/* 9B87E8 80241E68 27B30010 */ addiu $s3, $sp, 0x10 -/* 9B87EC 80241E6C AFA30020 */ sw $v1, 0x20($sp) -/* 9B87F0 80241E70 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B87F4 80241E74 3C0142F0 */ lui $at, 0x42f0 -/* 9B87F8 80241E78 44810000 */ mtc1 $at, $f0 -/* 9B87FC 80241E7C 8C63002C */ lw $v1, 0x2c($v1) -/* 9B8800 80241E80 0040802D */ daddu $s0, $v0, $zero -/* 9B8804 80241E84 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B8808 80241E88 A7A0002C */ sh $zero, 0x2c($sp) -/* 9B880C 80241E8C 12200006 */ beqz $s1, .L80241EA8 -/* 9B8810 80241E90 AFA30024 */ sw $v1, 0x24($sp) -/* 9B8814 80241E94 02A0202D */ daddu $a0, $s5, $zero -/* 9B8818 80241E98 0240282D */ daddu $a1, $s2, $zero -/* 9B881C 80241E9C 0280302D */ daddu $a2, $s4, $zero -/* 9B8820 80241EA0 0C090733 */ jal func_80241CCC -/* 9B8824 80241EA4 0200382D */ daddu $a3, $s0, $zero -.L80241EA8: -/* 9B8828 80241EA8 2402FFFE */ addiu $v0, $zero, -2 -/* 9B882C 80241EAC A2A200AB */ sb $v0, 0xab($s5) -/* 9B8830 80241EB0 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9B8834 80241EB4 30620004 */ andi $v0, $v1, 4 -/* 9B8838 80241EB8 10400007 */ beqz $v0, .L80241ED8 -/* 9B883C 80241EBC 00000000 */ nop -/* 9B8840 80241EC0 824200B4 */ lb $v0, 0xb4($s2) -/* 9B8844 80241EC4 1440003C */ bnez $v0, .L80241FB8 -/* 9B8848 80241EC8 0000102D */ daddu $v0, $zero, $zero -/* 9B884C 80241ECC 2402FFFB */ addiu $v0, $zero, -5 -/* 9B8850 80241ED0 00621024 */ and $v0, $v1, $v0 -/* 9B8854 80241ED4 AE4200B0 */ sw $v0, 0xb0($s2) -.L80241ED8: -/* 9B8858 80241ED8 8E830070 */ lw $v1, 0x70($s4) -/* 9B885C 80241EDC 2C62000F */ sltiu $v0, $v1, 0xf -/* 9B8860 80241EE0 10400034 */ beqz $v0, .L80241FB4 -/* 9B8864 80241EE4 00031080 */ sll $v0, $v1, 2 -/* 9B8868 80241EE8 3C018024 */ lui $at, 0x8024 -/* 9B886C 80241EEC 00220821 */ addu $at, $at, $v0 -/* 9B8870 80241EF0 8C224898 */ lw $v0, 0x4898($at) -/* 9B8874 80241EF4 00400008 */ jr $v0 -/* 9B8878 80241EF8 00000000 */ nop -/* 9B887C 80241EFC 0280202D */ daddu $a0, $s4, $zero -/* 9B8880 80241F00 0200282D */ daddu $a1, $s0, $zero -/* 9B8884 80241F04 0C0902B9 */ jal func_80240AE4 -/* 9B8888 80241F08 0260302D */ daddu $a2, $s3, $zero -/* 9B888C 80241F0C 0280202D */ daddu $a0, $s4, $zero -/* 9B8890 80241F10 0200282D */ daddu $a1, $s0, $zero -/* 9B8894 80241F14 0C090325 */ jal func_80240C94 -/* 9B8898 80241F18 0260302D */ daddu $a2, $s3, $zero -/* 9B889C 80241F1C 080907EE */ j .L80241FB8 -/* 9B88A0 80241F20 0000102D */ daddu $v0, $zero, $zero -/* 9B88A4 80241F24 0280202D */ daddu $a0, $s4, $zero -/* 9B88A8 80241F28 0200282D */ daddu $a1, $s0, $zero -/* 9B88AC 80241F2C 0C0904AF */ jal func_802412BC -/* 9B88B0 80241F30 0260302D */ daddu $a2, $s3, $zero -/* 9B88B4 80241F34 0280202D */ daddu $a0, $s4, $zero -/* 9B88B8 80241F38 0200282D */ daddu $a1, $s0, $zero -/* 9B88BC 80241F3C 0C0904DF */ jal func_8024137C -/* 9B88C0 80241F40 0260302D */ daddu $a2, $s3, $zero -/* 9B88C4 80241F44 080907EE */ j .L80241FB8 -/* 9B88C8 80241F48 0000102D */ daddu $v0, $zero, $zero -/* 9B88CC 80241F4C 0280202D */ daddu $a0, $s4, $zero -/* 9B88D0 80241F50 0200282D */ daddu $a1, $s0, $zero -/* 9B88D4 80241F54 0C0905B0 */ jal func_802416C0 -/* 9B88D8 80241F58 0260302D */ daddu $a2, $s3, $zero -/* 9B88DC 80241F5C 0280202D */ daddu $a0, $s4, $zero -/* 9B88E0 80241F60 0200282D */ daddu $a1, $s0, $zero -/* 9B88E4 80241F64 0C0905CE */ jal func_80241738 -/* 9B88E8 80241F68 0260302D */ daddu $a2, $s3, $zero -/* 9B88EC 80241F6C 080907EE */ j .L80241FB8 -/* 9B88F0 80241F70 0000102D */ daddu $v0, $zero, $zero -/* 9B88F4 80241F74 0280202D */ daddu $a0, $s4, $zero -/* 9B88F8 80241F78 0200282D */ daddu $a1, $s0, $zero -/* 9B88FC 80241F7C 0C0905E9 */ jal func_802417A4 -/* 9B8900 80241F80 0260302D */ daddu $a2, $s3, $zero -/* 9B8904 80241F84 080907EE */ j .L80241FB8 -/* 9B8908 80241F88 0000102D */ daddu $v0, $zero, $zero -/* 9B890C 80241F8C 0280202D */ daddu $a0, $s4, $zero -/* 9B8910 80241F90 0200282D */ daddu $a1, $s0, $zero -/* 9B8914 80241F94 0C090636 */ jal func_802418D8 -/* 9B8918 80241F98 0260302D */ daddu $a2, $s3, $zero -/* 9B891C 80241F9C 080907EE */ j .L80241FB8 -/* 9B8920 80241FA0 0000102D */ daddu $v0, $zero, $zero -/* 9B8924 80241FA4 0280202D */ daddu $a0, $s4, $zero -/* 9B8928 80241FA8 0200282D */ daddu $a1, $s0, $zero -/* 9B892C 80241FAC 0C09064F */ jal func_8024193C -/* 9B8930 80241FB0 0260302D */ daddu $a2, $s3, $zero -.L80241FB4: -/* 9B8934 80241FB4 0000102D */ daddu $v0, $zero, $zero -.L80241FB8: -/* 9B8938 80241FB8 8FBF0048 */ lw $ra, 0x48($sp) -/* 9B893C 80241FBC 8FB50044 */ lw $s5, 0x44($sp) -/* 9B8940 80241FC0 8FB40040 */ lw $s4, 0x40($sp) -/* 9B8944 80241FC4 8FB3003C */ lw $s3, 0x3c($sp) -/* 9B8948 80241FC8 8FB20038 */ lw $s2, 0x38($sp) -/* 9B894C 80241FCC 8FB10034 */ lw $s1, 0x34($sp) -/* 9B8950 80241FD0 8FB00030 */ lw $s0, 0x30($sp) -/* 9B8954 80241FD4 03E00008 */ jr $ra -/* 9B8958 80241FD8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s new file mode 100644 index 0000000000..dbb873afa0 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80241DF0_9B8770.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80241DF0_9B8770 +/* 9B8770 80241DF0 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 9B8774 80241DF4 AFB40040 */ sw $s4, 0x40($sp) +/* 9B8778 80241DF8 0080A02D */ daddu $s4, $a0, $zero +/* 9B877C 80241DFC AFBF0048 */ sw $ra, 0x48($sp) +/* 9B8780 80241E00 AFB50044 */ sw $s5, 0x44($sp) +/* 9B8784 80241E04 AFB3003C */ sw $s3, 0x3c($sp) +/* 9B8788 80241E08 AFB20038 */ sw $s2, 0x38($sp) +/* 9B878C 80241E0C AFB10034 */ sw $s1, 0x34($sp) +/* 9B8790 80241E10 AFB00030 */ sw $s0, 0x30($sp) +/* 9B8794 80241E14 8E920148 */ lw $s2, 0x148($s4) +/* 9B8798 80241E18 86440008 */ lh $a0, 8($s2) +/* 9B879C 80241E1C 8E90000C */ lw $s0, 0xc($s4) +/* 9B87A0 80241E20 0C00EABB */ jal get_npc_unsafe +/* 9B87A4 80241E24 00A0882D */ daddu $s1, $a1, $zero +/* 9B87A8 80241E28 0280202D */ daddu $a0, $s4, $zero +/* 9B87AC 80241E2C 8E050000 */ lw $a1, ($s0) +/* 9B87B0 80241E30 0C0B1EAF */ jal get_variable +/* 9B87B4 80241E34 0040A82D */ daddu $s5, $v0, $zero +/* 9B87B8 80241E38 AFA00010 */ sw $zero, 0x10($sp) +/* 9B87BC 80241E3C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B87C0 80241E40 8C630030 */ lw $v1, 0x30($v1) +/* 9B87C4 80241E44 AFA30014 */ sw $v1, 0x14($sp) +/* 9B87C8 80241E48 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B87CC 80241E4C 8C63001C */ lw $v1, 0x1c($v1) +/* 9B87D0 80241E50 AFA30018 */ sw $v1, 0x18($sp) +/* 9B87D4 80241E54 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B87D8 80241E58 8C630024 */ lw $v1, 0x24($v1) +/* 9B87DC 80241E5C AFA3001C */ sw $v1, 0x1c($sp) +/* 9B87E0 80241E60 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B87E4 80241E64 8C630028 */ lw $v1, 0x28($v1) +/* 9B87E8 80241E68 27B30010 */ addiu $s3, $sp, 0x10 +/* 9B87EC 80241E6C AFA30020 */ sw $v1, 0x20($sp) +/* 9B87F0 80241E70 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B87F4 80241E74 3C0142F0 */ lui $at, 0x42f0 +/* 9B87F8 80241E78 44810000 */ mtc1 $at, $f0 +/* 9B87FC 80241E7C 8C63002C */ lw $v1, 0x2c($v1) +/* 9B8800 80241E80 0040802D */ daddu $s0, $v0, $zero +/* 9B8804 80241E84 E7A00028 */ swc1 $f0, 0x28($sp) +/* 9B8808 80241E88 A7A0002C */ sh $zero, 0x2c($sp) +/* 9B880C 80241E8C 12200006 */ beqz $s1, .L80241EA8 +/* 9B8810 80241E90 AFA30024 */ sw $v1, 0x24($sp) +/* 9B8814 80241E94 02A0202D */ daddu $a0, $s5, $zero +/* 9B8818 80241E98 0240282D */ daddu $a1, $s2, $zero +/* 9B881C 80241E9C 0280302D */ daddu $a2, $s4, $zero +/* 9B8820 80241EA0 0C090733 */ jal func_80241CCC_9B864C +/* 9B8824 80241EA4 0200382D */ daddu $a3, $s0, $zero +.L80241EA8: +/* 9B8828 80241EA8 2402FFFE */ addiu $v0, $zero, -2 +/* 9B882C 80241EAC A2A200AB */ sb $v0, 0xab($s5) +/* 9B8830 80241EB0 8E4300B0 */ lw $v1, 0xb0($s2) +/* 9B8834 80241EB4 30620004 */ andi $v0, $v1, 4 +/* 9B8838 80241EB8 10400007 */ beqz $v0, .L80241ED8 +/* 9B883C 80241EBC 00000000 */ nop +/* 9B8840 80241EC0 824200B4 */ lb $v0, 0xb4($s2) +/* 9B8844 80241EC4 1440003C */ bnez $v0, .L80241FB8 +/* 9B8848 80241EC8 0000102D */ daddu $v0, $zero, $zero +/* 9B884C 80241ECC 2402FFFB */ addiu $v0, $zero, -5 +/* 9B8850 80241ED0 00621024 */ and $v0, $v1, $v0 +/* 9B8854 80241ED4 AE4200B0 */ sw $v0, 0xb0($s2) +.L80241ED8: +/* 9B8858 80241ED8 8E830070 */ lw $v1, 0x70($s4) +/* 9B885C 80241EDC 2C62000F */ sltiu $v0, $v1, 0xf +/* 9B8860 80241EE0 10400034 */ beqz $v0, .L80241FB4 +/* 9B8864 80241EE4 00031080 */ sll $v0, $v1, 2 +/* 9B8868 80241EE8 3C018024 */ lui $at, 0x8024 +/* 9B886C 80241EEC 00220821 */ addu $at, $at, $v0 +/* 9B8870 80241EF0 8C224898 */ lw $v0, 0x4898($at) +/* 9B8874 80241EF4 00400008 */ jr $v0 +/* 9B8878 80241EF8 00000000 */ nop +/* 9B887C 80241EFC 0280202D */ daddu $a0, $s4, $zero +/* 9B8880 80241F00 0200282D */ daddu $a1, $s0, $zero +/* 9B8884 80241F04 0C0902B9 */ jal func_80240AE4_9B7464 +/* 9B8888 80241F08 0260302D */ daddu $a2, $s3, $zero +/* 9B888C 80241F0C 0280202D */ daddu $a0, $s4, $zero +/* 9B8890 80241F10 0200282D */ daddu $a1, $s0, $zero +/* 9B8894 80241F14 0C090325 */ jal func_80240C94_9B7614 +/* 9B8898 80241F18 0260302D */ daddu $a2, $s3, $zero +/* 9B889C 80241F1C 080907EE */ j .L80241FB8 +/* 9B88A0 80241F20 0000102D */ daddu $v0, $zero, $zero +/* 9B88A4 80241F24 0280202D */ daddu $a0, $s4, $zero +/* 9B88A8 80241F28 0200282D */ daddu $a1, $s0, $zero +/* 9B88AC 80241F2C 0C0904AF */ jal func_802412BC_9B7C3C +/* 9B88B0 80241F30 0260302D */ daddu $a2, $s3, $zero +/* 9B88B4 80241F34 0280202D */ daddu $a0, $s4, $zero +/* 9B88B8 80241F38 0200282D */ daddu $a1, $s0, $zero +/* 9B88BC 80241F3C 0C0904DF */ jal func_8024137C_9B7CFC +/* 9B88C0 80241F40 0260302D */ daddu $a2, $s3, $zero +/* 9B88C4 80241F44 080907EE */ j .L80241FB8 +/* 9B88C8 80241F48 0000102D */ daddu $v0, $zero, $zero +/* 9B88CC 80241F4C 0280202D */ daddu $a0, $s4, $zero +/* 9B88D0 80241F50 0200282D */ daddu $a1, $s0, $zero +/* 9B88D4 80241F54 0C0905B0 */ jal func_802416C0_9B8040 +/* 9B88D8 80241F58 0260302D */ daddu $a2, $s3, $zero +/* 9B88DC 80241F5C 0280202D */ daddu $a0, $s4, $zero +/* 9B88E0 80241F60 0200282D */ daddu $a1, $s0, $zero +/* 9B88E4 80241F64 0C0905CE */ jal func_80241738_9B80B8 +/* 9B88E8 80241F68 0260302D */ daddu $a2, $s3, $zero +/* 9B88EC 80241F6C 080907EE */ j .L80241FB8 +/* 9B88F0 80241F70 0000102D */ daddu $v0, $zero, $zero +/* 9B88F4 80241F74 0280202D */ daddu $a0, $s4, $zero +/* 9B88F8 80241F78 0200282D */ daddu $a1, $s0, $zero +/* 9B88FC 80241F7C 0C0905E9 */ jal func_802417A4_9B8124 +/* 9B8900 80241F80 0260302D */ daddu $a2, $s3, $zero +/* 9B8904 80241F84 080907EE */ j .L80241FB8 +/* 9B8908 80241F88 0000102D */ daddu $v0, $zero, $zero +/* 9B890C 80241F8C 0280202D */ daddu $a0, $s4, $zero +/* 9B8910 80241F90 0200282D */ daddu $a1, $s0, $zero +/* 9B8914 80241F94 0C090636 */ jal func_802418D8_9B8258 +/* 9B8918 80241F98 0260302D */ daddu $a2, $s3, $zero +/* 9B891C 80241F9C 080907EE */ j .L80241FB8 +/* 9B8920 80241FA0 0000102D */ daddu $v0, $zero, $zero +/* 9B8924 80241FA4 0280202D */ daddu $a0, $s4, $zero +/* 9B8928 80241FA8 0200282D */ daddu $a1, $s0, $zero +/* 9B892C 80241FAC 0C09064F */ jal func_8024193C_9B82BC +/* 9B8930 80241FB0 0260302D */ daddu $a2, $s3, $zero +.L80241FB4: +/* 9B8934 80241FB4 0000102D */ daddu $v0, $zero, $zero +.L80241FB8: +/* 9B8938 80241FB8 8FBF0048 */ lw $ra, 0x48($sp) +/* 9B893C 80241FBC 8FB50044 */ lw $s5, 0x44($sp) +/* 9B8940 80241FC0 8FB40040 */ lw $s4, 0x40($sp) +/* 9B8944 80241FC4 8FB3003C */ lw $s3, 0x3c($sp) +/* 9B8948 80241FC8 8FB20038 */ lw $s2, 0x38($sp) +/* 9B894C 80241FCC 8FB10034 */ lw $s1, 0x34($sp) +/* 9B8950 80241FD0 8FB00030 */ lw $s0, 0x30($sp) +/* 9B8954 80241FD4 03E00008 */ jr $ra +/* 9B8958 80241FD8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104.s deleted file mode 100644 index edd9e8b14f..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104.s +++ /dev/null @@ -1,52 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242104 -/* 9B8A84 80242104 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9B8A88 80242108 AFB20018 */ sw $s2, 0x18($sp) -/* 9B8A8C 8024210C 0080902D */ daddu $s2, $a0, $zero -/* 9B8A90 80242110 AFBF001C */ sw $ra, 0x1c($sp) -/* 9B8A94 80242114 AFB10014 */ sw $s1, 0x14($sp) -/* 9B8A98 80242118 AFB00010 */ sw $s0, 0x10($sp) -/* 9B8A9C 8024211C 8E510148 */ lw $s1, 0x148($s2) -/* 9B8AA0 80242120 0C00EABB */ jal get_npc_unsafe -/* 9B8AA4 80242124 86240008 */ lh $a0, 8($s1) -/* 9B8AA8 80242128 0040802D */ daddu $s0, $v0, $zero -/* 9B8AAC 8024212C C602001C */ lwc1 $f2, 0x1c($s0) -/* 9B8AB0 80242130 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9B8AB4 80242134 8E050018 */ lw $a1, 0x18($s0) -/* 9B8AB8 80242138 46001080 */ add.s $f2, $f2, $f0 -/* 9B8ABC 8024213C C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B8AC0 80242140 8E06000C */ lw $a2, 0xc($s0) -/* 9B8AC4 80242144 46020000 */ add.s $f0, $f0, $f2 -/* 9B8AC8 80242148 0200202D */ daddu $a0, $s0, $zero -/* 9B8ACC 8024214C E602001C */ swc1 $f2, 0x1c($s0) -/* 9B8AD0 80242150 0C00EA95 */ jal npc_move_heading -/* 9B8AD4 80242154 E600003C */ swc1 $f0, 0x3c($s0) -/* 9B8AD8 80242158 9602008E */ lhu $v0, 0x8e($s0) -/* 9B8ADC 8024215C 2442FFFF */ addiu $v0, $v0, -1 -/* 9B8AE0 80242160 A602008E */ sh $v0, 0x8e($s0) -/* 9B8AE4 80242164 00021400 */ sll $v0, $v0, 0x10 -/* 9B8AE8 80242168 1C40000F */ bgtz $v0, .L802421A8 -/* 9B8AEC 8024216C 00000000 */ nop -/* 9B8AF0 80242170 3C013E99 */ lui $at, 0x3e99 -/* 9B8AF4 80242174 3421999A */ ori $at, $at, 0x999a -/* 9B8AF8 80242178 44810000 */ mtc1 $at, $f0 -/* 9B8AFC 8024217C 3C014040 */ lui $at, 0x4040 -/* 9B8B00 80242180 44811000 */ mtc1 $at, $f2 -/* 9B8B04 80242184 A2200007 */ sb $zero, 7($s1) -/* 9B8B08 80242188 AE00001C */ sw $zero, 0x1c($s0) -/* 9B8B0C 8024218C E6000014 */ swc1 $f0, 0x14($s0) -/* 9B8B10 80242190 E6020018 */ swc1 $f2, 0x18($s0) -/* 9B8B14 80242194 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8B18 80242198 8C420028 */ lw $v0, 0x28($v0) -/* 9B8B1C 8024219C AE020028 */ sw $v0, 0x28($s0) -/* 9B8B20 802421A0 2402000E */ addiu $v0, $zero, 0xe -/* 9B8B24 802421A4 AE420070 */ sw $v0, 0x70($s2) -.L802421A8: -/* 9B8B28 802421A8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9B8B2C 802421AC 8FB20018 */ lw $s2, 0x18($sp) -/* 9B8B30 802421B0 8FB10014 */ lw $s1, 0x14($sp) -/* 9B8B34 802421B4 8FB00010 */ lw $s0, 0x10($sp) -/* 9B8B38 802421B8 03E00008 */ jr $ra -/* 9B8B3C 802421BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s new file mode 100644 index 0000000000..8baa289204 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242104_9B8A84.s @@ -0,0 +1,52 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242104_9B8A84 +/* 9B8A84 80242104 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 9B8A88 80242108 AFB20018 */ sw $s2, 0x18($sp) +/* 9B8A8C 8024210C 0080902D */ daddu $s2, $a0, $zero +/* 9B8A90 80242110 AFBF001C */ sw $ra, 0x1c($sp) +/* 9B8A94 80242114 AFB10014 */ sw $s1, 0x14($sp) +/* 9B8A98 80242118 AFB00010 */ sw $s0, 0x10($sp) +/* 9B8A9C 8024211C 8E510148 */ lw $s1, 0x148($s2) +/* 9B8AA0 80242120 0C00EABB */ jal get_npc_unsafe +/* 9B8AA4 80242124 86240008 */ lh $a0, 8($s1) +/* 9B8AA8 80242128 0040802D */ daddu $s0, $v0, $zero +/* 9B8AAC 8024212C C602001C */ lwc1 $f2, 0x1c($s0) +/* 9B8AB0 80242130 C6000014 */ lwc1 $f0, 0x14($s0) +/* 9B8AB4 80242134 8E050018 */ lw $a1, 0x18($s0) +/* 9B8AB8 80242138 46001080 */ add.s $f2, $f2, $f0 +/* 9B8ABC 8024213C C600003C */ lwc1 $f0, 0x3c($s0) +/* 9B8AC0 80242140 8E06000C */ lw $a2, 0xc($s0) +/* 9B8AC4 80242144 46020000 */ add.s $f0, $f0, $f2 +/* 9B8AC8 80242148 0200202D */ daddu $a0, $s0, $zero +/* 9B8ACC 8024214C E602001C */ swc1 $f2, 0x1c($s0) +/* 9B8AD0 80242150 0C00EA95 */ jal npc_move_heading +/* 9B8AD4 80242154 E600003C */ swc1 $f0, 0x3c($s0) +/* 9B8AD8 80242158 9602008E */ lhu $v0, 0x8e($s0) +/* 9B8ADC 8024215C 2442FFFF */ addiu $v0, $v0, -1 +/* 9B8AE0 80242160 A602008E */ sh $v0, 0x8e($s0) +/* 9B8AE4 80242164 00021400 */ sll $v0, $v0, 0x10 +/* 9B8AE8 80242168 1C40000F */ bgtz $v0, .L802421A8 +/* 9B8AEC 8024216C 00000000 */ nop +/* 9B8AF0 80242170 3C013E99 */ lui $at, 0x3e99 +/* 9B8AF4 80242174 3421999A */ ori $at, $at, 0x999a +/* 9B8AF8 80242178 44810000 */ mtc1 $at, $f0 +/* 9B8AFC 8024217C 3C014040 */ lui $at, 0x4040 +/* 9B8B00 80242180 44811000 */ mtc1 $at, $f2 +/* 9B8B04 80242184 A2200007 */ sb $zero, 7($s1) +/* 9B8B08 80242188 AE00001C */ sw $zero, 0x1c($s0) +/* 9B8B0C 8024218C E6000014 */ swc1 $f0, 0x14($s0) +/* 9B8B10 80242190 E6020018 */ swc1 $f2, 0x18($s0) +/* 9B8B14 80242194 8E2200CC */ lw $v0, 0xcc($s1) +/* 9B8B18 80242198 8C420028 */ lw $v0, 0x28($v0) +/* 9B8B1C 8024219C AE020028 */ sw $v0, 0x28($s0) +/* 9B8B20 802421A0 2402000E */ addiu $v0, $zero, 0xe +/* 9B8B24 802421A4 AE420070 */ sw $v0, 0x70($s2) +.L802421A8: +/* 9B8B28 802421A8 8FBF001C */ lw $ra, 0x1c($sp) +/* 9B8B2C 802421AC 8FB20018 */ lw $s2, 0x18($sp) +/* 9B8B30 802421B0 8FB10014 */ lw $s1, 0x14($sp) +/* 9B8B34 802421B4 8FB00010 */ lw $s0, 0x10($sp) +/* 9B8B38 802421B8 03E00008 */ jr $ra +/* 9B8B3C 802421BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0.s deleted file mode 100644 index 64fd121d26..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0.s +++ /dev/null @@ -1,76 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421C0 -/* 9B8B40 802421C0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 9B8B44 802421C4 AFB20030 */ sw $s2, 0x30($sp) -/* 9B8B48 802421C8 0080902D */ daddu $s2, $a0, $zero -/* 9B8B4C 802421CC AFBF0034 */ sw $ra, 0x34($sp) -/* 9B8B50 802421D0 AFB1002C */ sw $s1, 0x2c($sp) -/* 9B8B54 802421D4 AFB00028 */ sw $s0, 0x28($sp) -/* 9B8B58 802421D8 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9B8B5C 802421DC 8E510148 */ lw $s1, 0x148($s2) -/* 9B8B60 802421E0 0C00EABB */ jal get_npc_unsafe -/* 9B8B64 802421E4 86240008 */ lh $a0, 8($s1) -/* 9B8B68 802421E8 0040802D */ daddu $s0, $v0, $zero -/* 9B8B6C 802421EC C604001C */ lwc1 $f4, 0x1c($s0) -/* 9B8B70 802421F0 C6000014 */ lwc1 $f0, 0x14($s0) -/* 9B8B74 802421F4 0200202D */ daddu $a0, $s0, $zero -/* 9B8B78 802421F8 46002100 */ add.s $f4, $f4, $f0 -/* 9B8B7C 802421FC C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B8B80 80242200 8E050018 */ lw $a1, 0x18($s0) -/* 9B8B84 80242204 46041080 */ add.s $f2, $f2, $f4 -/* 9B8B88 80242208 8E06000C */ lw $a2, 0xc($s0) -/* 9B8B8C 8024220C C6200078 */ lwc1 $f0, 0x78($s1) -/* 9B8B90 80242210 46800020 */ cvt.s.w $f0, $f0 -/* 9B8B94 80242214 E602003C */ swc1 $f2, 0x3c($s0) -/* 9B8B98 80242218 3C014059 */ lui $at, 0x4059 -/* 9B8B9C 8024221C 44811800 */ mtc1 $at, $f3 -/* 9B8BA0 80242220 44801000 */ mtc1 $zero, $f2 -/* 9B8BA4 80242224 46000021 */ cvt.d.s $f0, $f0 -/* 9B8BA8 80242228 E604001C */ swc1 $f4, 0x1c($s0) -/* 9B8BAC 8024222C 46220003 */ div.d $f0, $f0, $f2 -/* 9B8BB0 80242230 0C00EA95 */ jal npc_move_heading -/* 9B8BB4 80242234 46200520 */ cvt.s.d $f20, $f0 -/* 9B8BB8 80242238 27A50018 */ addiu $a1, $sp, 0x18 -/* 9B8BBC 8024223C 27A6001C */ addiu $a2, $sp, 0x1c -/* 9B8BC0 80242240 C6000038 */ lwc1 $f0, 0x38($s0) -/* 9B8BC4 80242244 C602003C */ lwc1 $f2, 0x3c($s0) -/* 9B8BC8 80242248 C6040040 */ lwc1 $f4, 0x40($s0) -/* 9B8BCC 8024224C 3C01447A */ lui $at, 0x447a -/* 9B8BD0 80242250 44813000 */ mtc1 $at, $f6 -/* 9B8BD4 80242254 27A20024 */ addiu $v0, $sp, 0x24 -/* 9B8BD8 80242258 E7A00018 */ swc1 $f0, 0x18($sp) -/* 9B8BDC 8024225C E7A2001C */ swc1 $f2, 0x1c($sp) -/* 9B8BE0 80242260 E7A40020 */ swc1 $f4, 0x20($sp) -/* 9B8BE4 80242264 E7A60024 */ swc1 $f6, 0x24($sp) -/* 9B8BE8 80242268 AFA20010 */ sw $v0, 0x10($sp) -/* 9B8BEC 8024226C 8E040080 */ lw $a0, 0x80($s0) -/* 9B8BF0 80242270 0C0372DF */ jal func_800DCB7C -/* 9B8BF4 80242274 27A70020 */ addiu $a3, $sp, 0x20 -/* 9B8BF8 80242278 10400003 */ beqz $v0, .L80242288 -/* 9B8BFC 8024227C 4600A086 */ mov.s $f2, $f20 -/* 9B8C00 80242280 C7A0001C */ lwc1 $f0, 0x1c($sp) -/* 9B8C04 80242284 46140080 */ add.s $f2, $f0, $f20 -.L80242288: -/* 9B8C08 80242288 C600003C */ lwc1 $f0, 0x3c($s0) -/* 9B8C0C 8024228C 4602003C */ c.lt.s $f0, $f2 -/* 9B8C10 80242290 00000000 */ nop -/* 9B8C14 80242294 45010009 */ bc1t .L802422BC -/* 9B8C18 80242298 2402000A */ addiu $v0, $zero, 0xa -/* 9B8C1C 8024229C A602008E */ sh $v0, 0x8e($s0) -/* 9B8C20 802422A0 8E2200CC */ lw $v0, 0xcc($s1) -/* 9B8C24 802422A4 8C42002C */ lw $v0, 0x2c($v0) -/* 9B8C28 802422A8 AE020028 */ sw $v0, 0x28($s0) -/* 9B8C2C 802422AC 9622008E */ lhu $v0, 0x8e($s1) -/* 9B8C30 802422B0 A60200A8 */ sh $v0, 0xa8($s0) -/* 9B8C34 802422B4 2402000F */ addiu $v0, $zero, 0xf -/* 9B8C38 802422B8 AE420070 */ sw $v0, 0x70($s2) -.L802422BC: -/* 9B8C3C 802422BC 8FBF0034 */ lw $ra, 0x34($sp) -/* 9B8C40 802422C0 8FB20030 */ lw $s2, 0x30($sp) -/* 9B8C44 802422C4 8FB1002C */ lw $s1, 0x2c($sp) -/* 9B8C48 802422C8 8FB00028 */ lw $s0, 0x28($sp) -/* 9B8C4C 802422CC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9B8C50 802422D0 03E00008 */ jr $ra -/* 9B8C54 802422D4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s new file mode 100644 index 0000000000..c02ef98ad9 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802421C0_9B8B40.s @@ -0,0 +1,76 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802421C0_9B8B40 +/* 9B8B40 802421C0 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 9B8B44 802421C4 AFB20030 */ sw $s2, 0x30($sp) +/* 9B8B48 802421C8 0080902D */ daddu $s2, $a0, $zero +/* 9B8B4C 802421CC AFBF0034 */ sw $ra, 0x34($sp) +/* 9B8B50 802421D0 AFB1002C */ sw $s1, 0x2c($sp) +/* 9B8B54 802421D4 AFB00028 */ sw $s0, 0x28($sp) +/* 9B8B58 802421D8 F7B40038 */ sdc1 $f20, 0x38($sp) +/* 9B8B5C 802421DC 8E510148 */ lw $s1, 0x148($s2) +/* 9B8B60 802421E0 0C00EABB */ jal get_npc_unsafe +/* 9B8B64 802421E4 86240008 */ lh $a0, 8($s1) +/* 9B8B68 802421E8 0040802D */ daddu $s0, $v0, $zero +/* 9B8B6C 802421EC C604001C */ lwc1 $f4, 0x1c($s0) +/* 9B8B70 802421F0 C6000014 */ lwc1 $f0, 0x14($s0) +/* 9B8B74 802421F4 0200202D */ daddu $a0, $s0, $zero +/* 9B8B78 802421F8 46002100 */ add.s $f4, $f4, $f0 +/* 9B8B7C 802421FC C602003C */ lwc1 $f2, 0x3c($s0) +/* 9B8B80 80242200 8E050018 */ lw $a1, 0x18($s0) +/* 9B8B84 80242204 46041080 */ add.s $f2, $f2, $f4 +/* 9B8B88 80242208 8E06000C */ lw $a2, 0xc($s0) +/* 9B8B8C 8024220C C6200078 */ lwc1 $f0, 0x78($s1) +/* 9B8B90 80242210 46800020 */ cvt.s.w $f0, $f0 +/* 9B8B94 80242214 E602003C */ swc1 $f2, 0x3c($s0) +/* 9B8B98 80242218 3C014059 */ lui $at, 0x4059 +/* 9B8B9C 8024221C 44811800 */ mtc1 $at, $f3 +/* 9B8BA0 80242220 44801000 */ mtc1 $zero, $f2 +/* 9B8BA4 80242224 46000021 */ cvt.d.s $f0, $f0 +/* 9B8BA8 80242228 E604001C */ swc1 $f4, 0x1c($s0) +/* 9B8BAC 8024222C 46220003 */ div.d $f0, $f0, $f2 +/* 9B8BB0 80242230 0C00EA95 */ jal npc_move_heading +/* 9B8BB4 80242234 46200520 */ cvt.s.d $f20, $f0 +/* 9B8BB8 80242238 27A50018 */ addiu $a1, $sp, 0x18 +/* 9B8BBC 8024223C 27A6001C */ addiu $a2, $sp, 0x1c +/* 9B8BC0 80242240 C6000038 */ lwc1 $f0, 0x38($s0) +/* 9B8BC4 80242244 C602003C */ lwc1 $f2, 0x3c($s0) +/* 9B8BC8 80242248 C6040040 */ lwc1 $f4, 0x40($s0) +/* 9B8BCC 8024224C 3C01447A */ lui $at, 0x447a +/* 9B8BD0 80242250 44813000 */ mtc1 $at, $f6 +/* 9B8BD4 80242254 27A20024 */ addiu $v0, $sp, 0x24 +/* 9B8BD8 80242258 E7A00018 */ swc1 $f0, 0x18($sp) +/* 9B8BDC 8024225C E7A2001C */ swc1 $f2, 0x1c($sp) +/* 9B8BE0 80242260 E7A40020 */ swc1 $f4, 0x20($sp) +/* 9B8BE4 80242264 E7A60024 */ swc1 $f6, 0x24($sp) +/* 9B8BE8 80242268 AFA20010 */ sw $v0, 0x10($sp) +/* 9B8BEC 8024226C 8E040080 */ lw $a0, 0x80($s0) +/* 9B8BF0 80242270 0C0372DF */ jal func_800DCB7C +/* 9B8BF4 80242274 27A70020 */ addiu $a3, $sp, 0x20 +/* 9B8BF8 80242278 10400003 */ beqz $v0, .L80242288 +/* 9B8BFC 8024227C 4600A086 */ mov.s $f2, $f20 +/* 9B8C00 80242280 C7A0001C */ lwc1 $f0, 0x1c($sp) +/* 9B8C04 80242284 46140080 */ add.s $f2, $f0, $f20 +.L80242288: +/* 9B8C08 80242288 C600003C */ lwc1 $f0, 0x3c($s0) +/* 9B8C0C 8024228C 4602003C */ c.lt.s $f0, $f2 +/* 9B8C10 80242290 00000000 */ nop +/* 9B8C14 80242294 45010009 */ bc1t .L802422BC +/* 9B8C18 80242298 2402000A */ addiu $v0, $zero, 0xa +/* 9B8C1C 8024229C A602008E */ sh $v0, 0x8e($s0) +/* 9B8C20 802422A0 8E2200CC */ lw $v0, 0xcc($s1) +/* 9B8C24 802422A4 8C42002C */ lw $v0, 0x2c($v0) +/* 9B8C28 802422A8 AE020028 */ sw $v0, 0x28($s0) +/* 9B8C2C 802422AC 9622008E */ lhu $v0, 0x8e($s1) +/* 9B8C30 802422B0 A60200A8 */ sh $v0, 0xa8($s0) +/* 9B8C34 802422B4 2402000F */ addiu $v0, $zero, 0xf +/* 9B8C38 802422B8 AE420070 */ sw $v0, 0x70($s2) +.L802422BC: +/* 9B8C3C 802422BC 8FBF0034 */ lw $ra, 0x34($sp) +/* 9B8C40 802422C0 8FB20030 */ lw $s2, 0x30($sp) +/* 9B8C44 802422C4 8FB1002C */ lw $s1, 0x2c($sp) +/* 9B8C48 802422C8 8FB00028 */ lw $s0, 0x28($sp) +/* 9B8C4C 802422CC D7B40038 */ ldc1 $f20, 0x38($sp) +/* 9B8C50 802422D0 03E00008 */ jr $ra +/* 9B8C54 802422D4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8.s deleted file mode 100644 index fb26355e04..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422D8 -/* 9B8C58 802422D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B8C5C 802422DC AFB00010 */ sw $s0, 0x10($sp) -/* 9B8C60 802422E0 0080802D */ daddu $s0, $a0, $zero -/* 9B8C64 802422E4 AFBF0014 */ sw $ra, 0x14($sp) -/* 9B8C68 802422E8 8E020148 */ lw $v0, 0x148($s0) -/* 9B8C6C 802422EC 0C00EABB */ jal get_npc_unsafe -/* 9B8C70 802422F0 84440008 */ lh $a0, 8($v0) -/* 9B8C74 802422F4 9443008E */ lhu $v1, 0x8e($v0) -/* 9B8C78 802422F8 2463FFFF */ addiu $v1, $v1, -1 -/* 9B8C7C 802422FC A443008E */ sh $v1, 0x8e($v0) -/* 9B8C80 80242300 00031C00 */ sll $v1, $v1, 0x10 -/* 9B8C84 80242304 58600001 */ blezl $v1, .L8024230C -/* 9B8C88 80242308 AE000070 */ sw $zero, 0x70($s0) -.L8024230C: -/* 9B8C8C 8024230C 8FBF0014 */ lw $ra, 0x14($sp) -/* 9B8C90 80242310 8FB00010 */ lw $s0, 0x10($sp) -/* 9B8C94 80242314 03E00008 */ jr $ra -/* 9B8C98 80242318 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s new file mode 100644 index 0000000000..077ec8258e --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802422D8_9B8C58.s @@ -0,0 +1,22 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802422D8_9B8C58 +/* 9B8C58 802422D8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9B8C5C 802422DC AFB00010 */ sw $s0, 0x10($sp) +/* 9B8C60 802422E0 0080802D */ daddu $s0, $a0, $zero +/* 9B8C64 802422E4 AFBF0014 */ sw $ra, 0x14($sp) +/* 9B8C68 802422E8 8E020148 */ lw $v0, 0x148($s0) +/* 9B8C6C 802422EC 0C00EABB */ jal get_npc_unsafe +/* 9B8C70 802422F0 84440008 */ lh $a0, 8($v0) +/* 9B8C74 802422F4 9443008E */ lhu $v1, 0x8e($v0) +/* 9B8C78 802422F8 2463FFFF */ addiu $v1, $v1, -1 +/* 9B8C7C 802422FC A443008E */ sh $v1, 0x8e($v0) +/* 9B8C80 80242300 00031C00 */ sll $v1, $v1, 0x10 +/* 9B8C84 80242304 58600001 */ blezl $v1, .L8024230C +/* 9B8C88 80242308 AE000070 */ sw $zero, 0x70($s0) +.L8024230C: +/* 9B8C8C 8024230C 8FBF0014 */ lw $ra, 0x14($sp) +/* 9B8C90 80242310 8FB00010 */ lw $s0, 0x10($sp) +/* 9B8C94 80242314 03E00008 */ jr $ra +/* 9B8C98 80242318 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C.s deleted file mode 100644 index 804f8dd8a8..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C.s +++ /dev/null @@ -1,156 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024231C -/* 9B8C9C 8024231C 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9B8CA0 80242320 AFB3003C */ sw $s3, 0x3c($sp) -/* 9B8CA4 80242324 0080982D */ daddu $s3, $a0, $zero -/* 9B8CA8 80242328 AFBF0048 */ sw $ra, 0x48($sp) -/* 9B8CAC 8024232C AFB50044 */ sw $s5, 0x44($sp) -/* 9B8CB0 80242330 AFB40040 */ sw $s4, 0x40($sp) -/* 9B8CB4 80242334 AFB20038 */ sw $s2, 0x38($sp) -/* 9B8CB8 80242338 AFB10034 */ sw $s1, 0x34($sp) -/* 9B8CBC 8024233C AFB00030 */ sw $s0, 0x30($sp) -/* 9B8CC0 80242340 8E720148 */ lw $s2, 0x148($s3) -/* 9B8CC4 80242344 86440008 */ lh $a0, 8($s2) -/* 9B8CC8 80242348 8E70000C */ lw $s0, 0xc($s3) -/* 9B8CCC 8024234C 0C00EABB */ jal get_npc_unsafe -/* 9B8CD0 80242350 00A0882D */ daddu $s1, $a1, $zero -/* 9B8CD4 80242354 0260202D */ daddu $a0, $s3, $zero -/* 9B8CD8 80242358 8E050000 */ lw $a1, ($s0) -/* 9B8CDC 8024235C 0C0B1EAF */ jal get_variable -/* 9B8CE0 80242360 0040A82D */ daddu $s5, $v0, $zero -/* 9B8CE4 80242364 AFA00010 */ sw $zero, 0x10($sp) -/* 9B8CE8 80242368 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8CEC 8024236C 8C630030 */ lw $v1, 0x30($v1) -/* 9B8CF0 80242370 AFA30014 */ sw $v1, 0x14($sp) -/* 9B8CF4 80242374 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8CF8 80242378 8C63001C */ lw $v1, 0x1c($v1) -/* 9B8CFC 8024237C AFA30018 */ sw $v1, 0x18($sp) -/* 9B8D00 80242380 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8D04 80242384 8C630024 */ lw $v1, 0x24($v1) -/* 9B8D08 80242388 AFA3001C */ sw $v1, 0x1c($sp) -/* 9B8D0C 8024238C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8D10 80242390 8C630028 */ lw $v1, 0x28($v1) -/* 9B8D14 80242394 27B40010 */ addiu $s4, $sp, 0x10 -/* 9B8D18 80242398 AFA30020 */ sw $v1, 0x20($sp) -/* 9B8D1C 8024239C 8E4300D0 */ lw $v1, 0xd0($s2) -/* 9B8D20 802423A0 3C0142F0 */ lui $at, 0x42f0 -/* 9B8D24 802423A4 44810000 */ mtc1 $at, $f0 -/* 9B8D28 802423A8 8C63002C */ lw $v1, 0x2c($v1) -/* 9B8D2C 802423AC 0040802D */ daddu $s0, $v0, $zero -/* 9B8D30 802423B0 E7A00028 */ swc1 $f0, 0x28($sp) -/* 9B8D34 802423B4 A7A0002C */ sh $zero, 0x2c($sp) -/* 9B8D38 802423B8 12200009 */ beqz $s1, .L802423E0 -/* 9B8D3C 802423BC AFA30024 */ sw $v1, 0x24($sp) -/* 9B8D40 802423C0 02A0202D */ daddu $a0, $s5, $zero -/* 9B8D44 802423C4 0240282D */ daddu $a1, $s2, $zero -/* 9B8D48 802423C8 0260302D */ daddu $a2, $s3, $zero -/* 9B8D4C 802423CC 0C090733 */ jal func_80241CCC -/* 9B8D50 802423D0 0200382D */ daddu $a3, $s0, $zero -/* 9B8D54 802423D4 86A200A8 */ lh $v0, 0xa8($s5) -/* 9B8D58 802423D8 AE42008C */ sw $v0, 0x8c($s2) -/* 9B8D5C 802423DC AE600070 */ sw $zero, 0x70($s3) -.L802423E0: -/* 9B8D60 802423E0 2402FFFD */ addiu $v0, $zero, -3 -/* 9B8D64 802423E4 A2A200AB */ sb $v0, 0xab($s5) -/* 9B8D68 802423E8 8E4300B0 */ lw $v1, 0xb0($s2) -/* 9B8D6C 802423EC 30620004 */ andi $v0, $v1, 4 -/* 9B8D70 802423F0 10400007 */ beqz $v0, .L80242410 -/* 9B8D74 802423F4 00000000 */ nop -/* 9B8D78 802423F8 824200B4 */ lb $v0, 0xb4($s2) -/* 9B8D7C 802423FC 14400052 */ bnez $v0, .L80242548 -/* 9B8D80 80242400 0000102D */ daddu $v0, $zero, $zero -/* 9B8D84 80242404 2402FFFB */ addiu $v0, $zero, -5 -/* 9B8D88 80242408 00621024 */ and $v0, $v1, $v0 -/* 9B8D8C 8024240C AE4200B0 */ sw $v0, 0xb0($s2) -.L80242410: -/* 9B8D90 80242410 8E630070 */ lw $v1, 0x70($s3) -/* 9B8D94 80242414 2C620010 */ sltiu $v0, $v1, 0x10 -/* 9B8D98 80242418 1040004A */ beqz $v0, .L80242544 -/* 9B8D9C 8024241C 00031080 */ sll $v0, $v1, 2 -/* 9B8DA0 80242420 3C018024 */ lui $at, 0x8024 -/* 9B8DA4 80242424 00220821 */ addu $at, $at, $v0 -/* 9B8DA8 80242428 8C2248D8 */ lw $v0, 0x48d8($at) -/* 9B8DAC 8024242C 00400008 */ jr $v0 -/* 9B8DB0 80242430 00000000 */ nop -/* 9B8DB4 80242434 0260202D */ daddu $a0, $s3, $zero -/* 9B8DB8 80242438 0200282D */ daddu $a1, $s0, $zero -/* 9B8DBC 8024243C 0C0902B9 */ jal func_80240AE4 -/* 9B8DC0 80242440 0280302D */ daddu $a2, $s4, $zero -/* 9B8DC4 80242444 0260202D */ daddu $a0, $s3, $zero -/* 9B8DC8 80242448 0200282D */ daddu $a1, $s0, $zero -/* 9B8DCC 8024244C 0C090325 */ jal func_80240C94 -/* 9B8DD0 80242450 0280302D */ daddu $a2, $s4, $zero -/* 9B8DD4 80242454 8E630070 */ lw $v1, 0x70($s3) -/* 9B8DD8 80242458 24020002 */ addiu $v0, $zero, 2 -/* 9B8DDC 8024245C 1462003A */ bne $v1, $v0, .L80242548 -/* 9B8DE0 80242460 0000102D */ daddu $v0, $zero, $zero -/* 9B8DE4 80242464 0260202D */ daddu $a0, $s3, $zero -/* 9B8DE8 80242468 0200282D */ daddu $a1, $s0, $zero -/* 9B8DEC 8024246C 0C0904AF */ jal func_802412BC -/* 9B8DF0 80242470 0280302D */ daddu $a2, $s4, $zero -/* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero -/* 9B8DF8 80242478 0200282D */ daddu $a1, $s0, $zero -/* 9B8DFC 8024247C 0C0904DF */ jal func_8024137C -/* 9B8E00 80242480 0280302D */ daddu $a2, $s4, $zero -/* 9B8E04 80242484 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E08 80242488 2402000A */ addiu $v0, $zero, 0xa -/* 9B8E0C 8024248C 1462002E */ bne $v1, $v0, .L80242548 -/* 9B8E10 80242490 0000102D */ daddu $v0, $zero, $zero -/* 9B8E14 80242494 0260202D */ daddu $a0, $s3, $zero -/* 9B8E18 80242498 0200282D */ daddu $a1, $s0, $zero -/* 9B8E1C 8024249C 0C0905B0 */ jal func_802416C0 -/* 9B8E20 802424A0 0280302D */ daddu $a2, $s4, $zero -/* 9B8E24 802424A4 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E28 802424A8 2402000B */ addiu $v0, $zero, 0xb -/* 9B8E2C 802424AC 14620026 */ bne $v1, $v0, .L80242548 -/* 9B8E30 802424B0 0000102D */ daddu $v0, $zero, $zero -/* 9B8E34 802424B4 0260202D */ daddu $a0, $s3, $zero -/* 9B8E38 802424B8 0200282D */ daddu $a1, $s0, $zero -/* 9B8E3C 802424BC 0C0905CE */ jal func_80241738 -/* 9B8E40 802424C0 0280302D */ daddu $a2, $s4, $zero -/* 9B8E44 802424C4 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E48 802424C8 2402000C */ addiu $v0, $zero, 0xc -/* 9B8E4C 802424CC 1462001E */ bne $v1, $v0, .L80242548 -/* 9B8E50 802424D0 0000102D */ daddu $v0, $zero, $zero -/* 9B8E54 802424D4 0260202D */ daddu $a0, $s3, $zero -/* 9B8E58 802424D8 0200282D */ daddu $a1, $s0, $zero -/* 9B8E5C 802424DC 0C0907F7 */ jal func_80241FDC -/* 9B8E60 802424E0 0280302D */ daddu $a2, $s4, $zero -/* 9B8E64 802424E4 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E68 802424E8 2402000D */ addiu $v0, $zero, 0xd -/* 9B8E6C 802424EC 14620016 */ bne $v1, $v0, .L80242548 -/* 9B8E70 802424F0 0000102D */ daddu $v0, $zero, $zero -/* 9B8E74 802424F4 0260202D */ daddu $a0, $s3, $zero -/* 9B8E78 802424F8 0200282D */ daddu $a1, $s0, $zero -/* 9B8E7C 802424FC 0C090841 */ jal func_80242104 -/* 9B8E80 80242500 0280302D */ daddu $a2, $s4, $zero -/* 9B8E84 80242504 8E630070 */ lw $v1, 0x70($s3) -/* 9B8E88 80242508 2402000E */ addiu $v0, $zero, 0xe -/* 9B8E8C 8024250C 1462000E */ bne $v1, $v0, .L80242548 -/* 9B8E90 80242510 0000102D */ daddu $v0, $zero, $zero -/* 9B8E94 80242514 0260202D */ daddu $a0, $s3, $zero -/* 9B8E98 80242518 0200282D */ daddu $a1, $s0, $zero -/* 9B8E9C 8024251C 0C090870 */ jal func_802421C0 -/* 9B8EA0 80242520 0280302D */ daddu $a2, $s4, $zero -/* 9B8EA4 80242524 8E630070 */ lw $v1, 0x70($s3) -/* 9B8EA8 80242528 2402000F */ addiu $v0, $zero, 0xf -/* 9B8EAC 8024252C 14620006 */ bne $v1, $v0, .L80242548 -/* 9B8EB0 80242530 0000102D */ daddu $v0, $zero, $zero -/* 9B8EB4 80242534 0260202D */ daddu $a0, $s3, $zero -/* 9B8EB8 80242538 0200282D */ daddu $a1, $s0, $zero -/* 9B8EBC 8024253C 0C0908B6 */ jal func_802422D8 -/* 9B8EC0 80242540 0280302D */ daddu $a2, $s4, $zero -.L80242544: -/* 9B8EC4 80242544 0000102D */ daddu $v0, $zero, $zero -.L80242548: -/* 9B8EC8 80242548 8FBF0048 */ lw $ra, 0x48($sp) -/* 9B8ECC 8024254C 8FB50044 */ lw $s5, 0x44($sp) -/* 9B8ED0 80242550 8FB40040 */ lw $s4, 0x40($sp) -/* 9B8ED4 80242554 8FB3003C */ lw $s3, 0x3c($sp) -/* 9B8ED8 80242558 8FB20038 */ lw $s2, 0x38($sp) -/* 9B8EDC 8024255C 8FB10034 */ lw $s1, 0x34($sp) -/* 9B8EE0 80242560 8FB00030 */ lw $s0, 0x30($sp) -/* 9B8EE4 80242564 03E00008 */ jr $ra -/* 9B8EE8 80242568 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s new file mode 100644 index 0000000000..58acd4ac5c --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024231C_9B8C9C.s @@ -0,0 +1,156 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024231C_9B8C9C +/* 9B8C9C 8024231C 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 9B8CA0 80242320 AFB3003C */ sw $s3, 0x3c($sp) +/* 9B8CA4 80242324 0080982D */ daddu $s3, $a0, $zero +/* 9B8CA8 80242328 AFBF0048 */ sw $ra, 0x48($sp) +/* 9B8CAC 8024232C AFB50044 */ sw $s5, 0x44($sp) +/* 9B8CB0 80242330 AFB40040 */ sw $s4, 0x40($sp) +/* 9B8CB4 80242334 AFB20038 */ sw $s2, 0x38($sp) +/* 9B8CB8 80242338 AFB10034 */ sw $s1, 0x34($sp) +/* 9B8CBC 8024233C AFB00030 */ sw $s0, 0x30($sp) +/* 9B8CC0 80242340 8E720148 */ lw $s2, 0x148($s3) +/* 9B8CC4 80242344 86440008 */ lh $a0, 8($s2) +/* 9B8CC8 80242348 8E70000C */ lw $s0, 0xc($s3) +/* 9B8CCC 8024234C 0C00EABB */ jal get_npc_unsafe +/* 9B8CD0 80242350 00A0882D */ daddu $s1, $a1, $zero +/* 9B8CD4 80242354 0260202D */ daddu $a0, $s3, $zero +/* 9B8CD8 80242358 8E050000 */ lw $a1, ($s0) +/* 9B8CDC 8024235C 0C0B1EAF */ jal get_variable +/* 9B8CE0 80242360 0040A82D */ daddu $s5, $v0, $zero +/* 9B8CE4 80242364 AFA00010 */ sw $zero, 0x10($sp) +/* 9B8CE8 80242368 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B8CEC 8024236C 8C630030 */ lw $v1, 0x30($v1) +/* 9B8CF0 80242370 AFA30014 */ sw $v1, 0x14($sp) +/* 9B8CF4 80242374 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B8CF8 80242378 8C63001C */ lw $v1, 0x1c($v1) +/* 9B8CFC 8024237C AFA30018 */ sw $v1, 0x18($sp) +/* 9B8D00 80242380 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B8D04 80242384 8C630024 */ lw $v1, 0x24($v1) +/* 9B8D08 80242388 AFA3001C */ sw $v1, 0x1c($sp) +/* 9B8D0C 8024238C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B8D10 80242390 8C630028 */ lw $v1, 0x28($v1) +/* 9B8D14 80242394 27B40010 */ addiu $s4, $sp, 0x10 +/* 9B8D18 80242398 AFA30020 */ sw $v1, 0x20($sp) +/* 9B8D1C 8024239C 8E4300D0 */ lw $v1, 0xd0($s2) +/* 9B8D20 802423A0 3C0142F0 */ lui $at, 0x42f0 +/* 9B8D24 802423A4 44810000 */ mtc1 $at, $f0 +/* 9B8D28 802423A8 8C63002C */ lw $v1, 0x2c($v1) +/* 9B8D2C 802423AC 0040802D */ daddu $s0, $v0, $zero +/* 9B8D30 802423B0 E7A00028 */ swc1 $f0, 0x28($sp) +/* 9B8D34 802423B4 A7A0002C */ sh $zero, 0x2c($sp) +/* 9B8D38 802423B8 12200009 */ beqz $s1, .L802423E0 +/* 9B8D3C 802423BC AFA30024 */ sw $v1, 0x24($sp) +/* 9B8D40 802423C0 02A0202D */ daddu $a0, $s5, $zero +/* 9B8D44 802423C4 0240282D */ daddu $a1, $s2, $zero +/* 9B8D48 802423C8 0260302D */ daddu $a2, $s3, $zero +/* 9B8D4C 802423CC 0C090733 */ jal func_80241CCC_9B864C +/* 9B8D50 802423D0 0200382D */ daddu $a3, $s0, $zero +/* 9B8D54 802423D4 86A200A8 */ lh $v0, 0xa8($s5) +/* 9B8D58 802423D8 AE42008C */ sw $v0, 0x8c($s2) +/* 9B8D5C 802423DC AE600070 */ sw $zero, 0x70($s3) +.L802423E0: +/* 9B8D60 802423E0 2402FFFD */ addiu $v0, $zero, -3 +/* 9B8D64 802423E4 A2A200AB */ sb $v0, 0xab($s5) +/* 9B8D68 802423E8 8E4300B0 */ lw $v1, 0xb0($s2) +/* 9B8D6C 802423EC 30620004 */ andi $v0, $v1, 4 +/* 9B8D70 802423F0 10400007 */ beqz $v0, .L80242410 +/* 9B8D74 802423F4 00000000 */ nop +/* 9B8D78 802423F8 824200B4 */ lb $v0, 0xb4($s2) +/* 9B8D7C 802423FC 14400052 */ bnez $v0, .L80242548 +/* 9B8D80 80242400 0000102D */ daddu $v0, $zero, $zero +/* 9B8D84 80242404 2402FFFB */ addiu $v0, $zero, -5 +/* 9B8D88 80242408 00621024 */ and $v0, $v1, $v0 +/* 9B8D8C 8024240C AE4200B0 */ sw $v0, 0xb0($s2) +.L80242410: +/* 9B8D90 80242410 8E630070 */ lw $v1, 0x70($s3) +/* 9B8D94 80242414 2C620010 */ sltiu $v0, $v1, 0x10 +/* 9B8D98 80242418 1040004A */ beqz $v0, .L80242544 +/* 9B8D9C 8024241C 00031080 */ sll $v0, $v1, 2 +/* 9B8DA0 80242420 3C018024 */ lui $at, 0x8024 +/* 9B8DA4 80242424 00220821 */ addu $at, $at, $v0 +/* 9B8DA8 80242428 8C2248D8 */ lw $v0, 0x48d8($at) +/* 9B8DAC 8024242C 00400008 */ jr $v0 +/* 9B8DB0 80242430 00000000 */ nop +/* 9B8DB4 80242434 0260202D */ daddu $a0, $s3, $zero +/* 9B8DB8 80242438 0200282D */ daddu $a1, $s0, $zero +/* 9B8DBC 8024243C 0C0902B9 */ jal func_80240AE4_9B7464 +/* 9B8DC0 80242440 0280302D */ daddu $a2, $s4, $zero +/* 9B8DC4 80242444 0260202D */ daddu $a0, $s3, $zero +/* 9B8DC8 80242448 0200282D */ daddu $a1, $s0, $zero +/* 9B8DCC 8024244C 0C090325 */ jal func_80240C94_9B7614 +/* 9B8DD0 80242450 0280302D */ daddu $a2, $s4, $zero +/* 9B8DD4 80242454 8E630070 */ lw $v1, 0x70($s3) +/* 9B8DD8 80242458 24020002 */ addiu $v0, $zero, 2 +/* 9B8DDC 8024245C 1462003A */ bne $v1, $v0, .L80242548 +/* 9B8DE0 80242460 0000102D */ daddu $v0, $zero, $zero +/* 9B8DE4 80242464 0260202D */ daddu $a0, $s3, $zero +/* 9B8DE8 80242468 0200282D */ daddu $a1, $s0, $zero +/* 9B8DEC 8024246C 0C0904AF */ jal func_802412BC_9B7C3C +/* 9B8DF0 80242470 0280302D */ daddu $a2, $s4, $zero +/* 9B8DF4 80242474 0260202D */ daddu $a0, $s3, $zero +/* 9B8DF8 80242478 0200282D */ daddu $a1, $s0, $zero +/* 9B8DFC 8024247C 0C0904DF */ jal func_8024137C_9B7CFC +/* 9B8E00 80242480 0280302D */ daddu $a2, $s4, $zero +/* 9B8E04 80242484 8E630070 */ lw $v1, 0x70($s3) +/* 9B8E08 80242488 2402000A */ addiu $v0, $zero, 0xa +/* 9B8E0C 8024248C 1462002E */ bne $v1, $v0, .L80242548 +/* 9B8E10 80242490 0000102D */ daddu $v0, $zero, $zero +/* 9B8E14 80242494 0260202D */ daddu $a0, $s3, $zero +/* 9B8E18 80242498 0200282D */ daddu $a1, $s0, $zero +/* 9B8E1C 8024249C 0C0905B0 */ jal func_802416C0_9B8040 +/* 9B8E20 802424A0 0280302D */ daddu $a2, $s4, $zero +/* 9B8E24 802424A4 8E630070 */ lw $v1, 0x70($s3) +/* 9B8E28 802424A8 2402000B */ addiu $v0, $zero, 0xb +/* 9B8E2C 802424AC 14620026 */ bne $v1, $v0, .L80242548 +/* 9B8E30 802424B0 0000102D */ daddu $v0, $zero, $zero +/* 9B8E34 802424B4 0260202D */ daddu $a0, $s3, $zero +/* 9B8E38 802424B8 0200282D */ daddu $a1, $s0, $zero +/* 9B8E3C 802424BC 0C0905CE */ jal func_80241738_9B80B8 +/* 9B8E40 802424C0 0280302D */ daddu $a2, $s4, $zero +/* 9B8E44 802424C4 8E630070 */ lw $v1, 0x70($s3) +/* 9B8E48 802424C8 2402000C */ addiu $v0, $zero, 0xc +/* 9B8E4C 802424CC 1462001E */ bne $v1, $v0, .L80242548 +/* 9B8E50 802424D0 0000102D */ daddu $v0, $zero, $zero +/* 9B8E54 802424D4 0260202D */ daddu $a0, $s3, $zero +/* 9B8E58 802424D8 0200282D */ daddu $a1, $s0, $zero +/* 9B8E5C 802424DC 0C0907F7 */ jal func_80241FDC_9B895C +/* 9B8E60 802424E0 0280302D */ daddu $a2, $s4, $zero +/* 9B8E64 802424E4 8E630070 */ lw $v1, 0x70($s3) +/* 9B8E68 802424E8 2402000D */ addiu $v0, $zero, 0xd +/* 9B8E6C 802424EC 14620016 */ bne $v1, $v0, .L80242548 +/* 9B8E70 802424F0 0000102D */ daddu $v0, $zero, $zero +/* 9B8E74 802424F4 0260202D */ daddu $a0, $s3, $zero +/* 9B8E78 802424F8 0200282D */ daddu $a1, $s0, $zero +/* 9B8E7C 802424FC 0C090841 */ jal func_80242104_9B8A84 +/* 9B8E80 80242500 0280302D */ daddu $a2, $s4, $zero +/* 9B8E84 80242504 8E630070 */ lw $v1, 0x70($s3) +/* 9B8E88 80242508 2402000E */ addiu $v0, $zero, 0xe +/* 9B8E8C 8024250C 1462000E */ bne $v1, $v0, .L80242548 +/* 9B8E90 80242510 0000102D */ daddu $v0, $zero, $zero +/* 9B8E94 80242514 0260202D */ daddu $a0, $s3, $zero +/* 9B8E98 80242518 0200282D */ daddu $a1, $s0, $zero +/* 9B8E9C 8024251C 0C090870 */ jal func_802421C0_9B8B40 +/* 9B8EA0 80242520 0280302D */ daddu $a2, $s4, $zero +/* 9B8EA4 80242524 8E630070 */ lw $v1, 0x70($s3) +/* 9B8EA8 80242528 2402000F */ addiu $v0, $zero, 0xf +/* 9B8EAC 8024252C 14620006 */ bne $v1, $v0, .L80242548 +/* 9B8EB0 80242530 0000102D */ daddu $v0, $zero, $zero +/* 9B8EB4 80242534 0260202D */ daddu $a0, $s3, $zero +/* 9B8EB8 80242538 0200282D */ daddu $a1, $s0, $zero +/* 9B8EBC 8024253C 0C0908B6 */ jal func_802422D8_9B8C58 +/* 9B8EC0 80242540 0280302D */ daddu $a2, $s4, $zero +.L80242544: +/* 9B8EC4 80242544 0000102D */ daddu $v0, $zero, $zero +.L80242548: +/* 9B8EC8 80242548 8FBF0048 */ lw $ra, 0x48($sp) +/* 9B8ECC 8024254C 8FB50044 */ lw $s5, 0x44($sp) +/* 9B8ED0 80242550 8FB40040 */ lw $s4, 0x40($sp) +/* 9B8ED4 80242554 8FB3003C */ lw $s3, 0x3c($sp) +/* 9B8ED8 80242558 8FB20038 */ lw $s2, 0x38($sp) +/* 9B8EDC 8024255C 8FB10034 */ lw $s1, 0x34($sp) +/* 9B8EE0 80242560 8FB00030 */ lw $s0, 0x30($sp) +/* 9B8EE4 80242564 03E00008 */ jr $ra +/* 9B8EE8 80242568 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C.s deleted file mode 100644 index ea533737bc..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C.s +++ /dev/null @@ -1,47 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024256C -/* 9B8EEC 8024256C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9B8EF0 80242570 0000502D */ daddu $t2, $zero, $zero -/* 9B8EF4 80242574 3C03800B */ lui $v1, %hi(gCurrentEncounter) -/* 9B8EF8 80242578 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) -/* 9B8EFC 8024257C AFBF0010 */ sw $ra, 0x10($sp) -/* 9B8F00 80242580 8062001C */ lb $v0, 0x1c($v1) -/* 9B8F04 80242584 8C85000C */ lw $a1, 0xc($a0) -/* 9B8F08 80242588 18400016 */ blez $v0, .L802425E4 -/* 9B8F0C 8024258C 0140302D */ daddu $a2, $t2, $zero -/* 9B8F10 80242590 0040582D */ daddu $t3, $v0, $zero -/* 9B8F14 80242594 0060482D */ daddu $t1, $v1, $zero -.L80242598: -/* 9B8F18 80242598 8D220028 */ lw $v0, 0x28($t1) -/* 9B8F1C 8024259C 5040000E */ beql $v0, $zero, .L802425D8 -/* 9B8F20 802425A0 254A0001 */ addiu $t2, $t2, 1 -/* 9B8F24 802425A4 8C430000 */ lw $v1, ($v0) -/* 9B8F28 802425A8 1860000A */ blez $v1, .L802425D4 -/* 9B8F2C 802425AC 0000382D */ daddu $a3, $zero, $zero -/* 9B8F30 802425B0 0060402D */ daddu $t0, $v1, $zero -/* 9B8F34 802425B4 0040182D */ daddu $v1, $v0, $zero -.L802425B8: -/* 9B8F38 802425B8 8C620004 */ lw $v0, 4($v1) -/* 9B8F3C 802425BC 54400001 */ bnel $v0, $zero, .L802425C4 -/* 9B8F40 802425C0 24C60001 */ addiu $a2, $a2, 1 -.L802425C4: -/* 9B8F44 802425C4 24E70001 */ addiu $a3, $a3, 1 -/* 9B8F48 802425C8 00E8102A */ slt $v0, $a3, $t0 -/* 9B8F4C 802425CC 1440FFFA */ bnez $v0, .L802425B8 -/* 9B8F50 802425D0 24630004 */ addiu $v1, $v1, 4 -.L802425D4: -/* 9B8F54 802425D4 254A0001 */ addiu $t2, $t2, 1 -.L802425D8: -/* 9B8F58 802425D8 014B102A */ slt $v0, $t2, $t3 -/* 9B8F5C 802425DC 1440FFEE */ bnez $v0, .L80242598 -/* 9B8F60 802425E0 25290004 */ addiu $t1, $t1, 4 -.L802425E4: -/* 9B8F64 802425E4 8CA50000 */ lw $a1, ($a1) -/* 9B8F68 802425E8 0C0B2026 */ jal set_variable -/* 9B8F6C 802425EC 00000000 */ nop -/* 9B8F70 802425F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9B8F74 802425F4 24020002 */ addiu $v0, $zero, 2 -/* 9B8F78 802425F8 03E00008 */ jr $ra -/* 9B8F7C 802425FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s new file mode 100644 index 0000000000..a45ff40bc5 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_8024256C_9B8EEC.s @@ -0,0 +1,47 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024256C_9B8EEC +/* 9B8EEC 8024256C 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9B8EF0 80242570 0000502D */ daddu $t2, $zero, $zero +/* 9B8EF4 80242574 3C03800B */ lui $v1, %hi(gCurrentEncounter) +/* 9B8EF8 80242578 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) +/* 9B8EFC 8024257C AFBF0010 */ sw $ra, 0x10($sp) +/* 9B8F00 80242580 8062001C */ lb $v0, 0x1c($v1) +/* 9B8F04 80242584 8C85000C */ lw $a1, 0xc($a0) +/* 9B8F08 80242588 18400016 */ blez $v0, .L802425E4 +/* 9B8F0C 8024258C 0140302D */ daddu $a2, $t2, $zero +/* 9B8F10 80242590 0040582D */ daddu $t3, $v0, $zero +/* 9B8F14 80242594 0060482D */ daddu $t1, $v1, $zero +.L80242598: +/* 9B8F18 80242598 8D220028 */ lw $v0, 0x28($t1) +/* 9B8F1C 8024259C 5040000E */ beql $v0, $zero, .L802425D8 +/* 9B8F20 802425A0 254A0001 */ addiu $t2, $t2, 1 +/* 9B8F24 802425A4 8C430000 */ lw $v1, ($v0) +/* 9B8F28 802425A8 1860000A */ blez $v1, .L802425D4 +/* 9B8F2C 802425AC 0000382D */ daddu $a3, $zero, $zero +/* 9B8F30 802425B0 0060402D */ daddu $t0, $v1, $zero +/* 9B8F34 802425B4 0040182D */ daddu $v1, $v0, $zero +.L802425B8: +/* 9B8F38 802425B8 8C620004 */ lw $v0, 4($v1) +/* 9B8F3C 802425BC 54400001 */ bnel $v0, $zero, .L802425C4 +/* 9B8F40 802425C0 24C60001 */ addiu $a2, $a2, 1 +.L802425C4: +/* 9B8F44 802425C4 24E70001 */ addiu $a3, $a3, 1 +/* 9B8F48 802425C8 00E8102A */ slt $v0, $a3, $t0 +/* 9B8F4C 802425CC 1440FFFA */ bnez $v0, .L802425B8 +/* 9B8F50 802425D0 24630004 */ addiu $v1, $v1, 4 +.L802425D4: +/* 9B8F54 802425D4 254A0001 */ addiu $t2, $t2, 1 +.L802425D8: +/* 9B8F58 802425D8 014B102A */ slt $v0, $t2, $t3 +/* 9B8F5C 802425DC 1440FFEE */ bnez $v0, .L80242598 +/* 9B8F60 802425E0 25290004 */ addiu $t1, $t1, 4 +.L802425E4: +/* 9B8F64 802425E4 8CA50000 */ lw $a1, ($a1) +/* 9B8F68 802425E8 0C0B2026 */ jal set_variable +/* 9B8F6C 802425EC 00000000 */ nop +/* 9B8F70 802425F0 8FBF0010 */ lw $ra, 0x10($sp) +/* 9B8F74 802425F4 24020002 */ addiu $v0, $zero, 2 +/* 9B8F78 802425F8 03E00008 */ jr $ra +/* 9B8F7C 802425FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600.s deleted file mode 100644 index 8cbce3f9a7..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600.s +++ /dev/null @@ -1,131 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242600 -/* 9B8F80 80242600 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 9B8F84 80242604 AFB10014 */ sw $s1, 0x14($sp) -/* 9B8F88 80242608 0080882D */ daddu $s1, $a0, $zero -/* 9B8F8C 8024260C AFBF0018 */ sw $ra, 0x18($sp) -/* 9B8F90 80242610 AFB00010 */ sw $s0, 0x10($sp) -/* 9B8F94 80242614 F7BE0048 */ sdc1 $f30, 0x48($sp) -/* 9B8F98 80242618 F7BC0040 */ sdc1 $f28, 0x40($sp) -/* 9B8F9C 8024261C F7BA0038 */ sdc1 $f26, 0x38($sp) -/* 9B8FA0 80242620 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 9B8FA4 80242624 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 9B8FA8 80242628 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9B8FAC 8024262C 8E30000C */ lw $s0, 0xc($s1) -/* 9B8FB0 80242630 8E050000 */ lw $a1, ($s0) -/* 9B8FB4 80242634 0C0B210B */ jal get_float_variable -/* 9B8FB8 80242638 26100004 */ addiu $s0, $s0, 4 -/* 9B8FBC 8024263C 8E050000 */ lw $a1, ($s0) -/* 9B8FC0 80242640 26100004 */ addiu $s0, $s0, 4 -/* 9B8FC4 80242644 0220202D */ daddu $a0, $s1, $zero -/* 9B8FC8 80242648 0C0B210B */ jal get_float_variable -/* 9B8FCC 8024264C 46000506 */ mov.s $f20, $f0 -/* 9B8FD0 80242650 0220202D */ daddu $a0, $s1, $zero -/* 9B8FD4 80242654 8E050000 */ lw $a1, ($s0) -/* 9B8FD8 80242658 0C0B210B */ jal get_float_variable -/* 9B8FDC 8024265C 46000586 */ mov.s $f22, $f0 -/* 9B8FE0 80242660 3C10800B */ lui $s0, %hi(gCameras) -/* 9B8FE4 80242664 26101D80 */ addiu $s0, $s0, %lo(gCameras) -/* 9B8FE8 80242668 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9B8FEC 8024266C 46000786 */ mov.s $f30, $f0 -/* 9B8FF0 80242670 461E6300 */ add.s $f12, $f12, $f30 -/* 9B8FF4 80242674 3C014387 */ lui $at, 0x4387 -/* 9B8FF8 80242678 4481D000 */ mtc1 $at, $f26 -/* 9B8FFC 8024267C 0C00A6C9 */ jal clamp_angle -/* 9B9000 80242680 461A6300 */ add.s $f12, $f12, $f26 -/* 9B9004 80242684 0C00A8BB */ jal sin_deg -/* 9B9008 80242688 46000306 */ mov.s $f12, $f0 -/* 9B900C 8024268C 3C01447A */ lui $at, 0x447a -/* 9B9010 80242690 44811000 */ mtc1 $at, $f2 -/* 9B9014 80242694 00000000 */ nop -/* 9B9018 80242698 46020002 */ mul.s $f0, $f0, $f2 -/* 9B901C 8024269C 00000000 */ nop -/* 9B9020 802426A0 4600A000 */ add.s $f0, $f20, $f0 -/* 9B9024 802426A4 3C014480 */ lui $at, 0x4480 -/* 9B9028 802426A8 44811000 */ mtc1 $at, $f2 -/* 9B902C 802426AC 00000000 */ nop -/* 9B9030 802426B0 46020002 */ mul.s $f0, $f0, $f2 -/* 9B9034 802426B4 00000000 */ nop -/* 9B9038 802426B8 3C01CD5B */ lui $at, 0xcd5b -/* 9B903C 802426BC 34215858 */ ori $at, $at, 0x5858 -/* 9B9040 802426C0 4481C000 */ mtc1 $at, $f24 -/* 9B9044 802426C4 00000000 */ nop -/* 9B9048 802426C8 46180000 */ add.s $f0, $f0, $f24 -/* 9B904C 802426CC 4600008D */ trunc.w.s $f2, $f0 -/* 9B9050 802426D0 E6220084 */ swc1 $f2, 0x84($s1) -/* 9B9054 802426D4 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9B9058 802426D8 461E6300 */ add.s $f12, $f12, $f30 -/* 9B905C 802426DC 0C00A6C9 */ jal clamp_angle -/* 9B9060 802426E0 461A6300 */ add.s $f12, $f12, $f26 -/* 9B9064 802426E4 0C00A8D4 */ jal cos_deg -/* 9B9068 802426E8 46000306 */ mov.s $f12, $f0 -/* 9B906C 802426EC 3C01447A */ lui $at, 0x447a -/* 9B9070 802426F0 44811000 */ mtc1 $at, $f2 -/* 9B9074 802426F4 00000000 */ nop -/* 9B9078 802426F8 46020002 */ mul.s $f0, $f0, $f2 -/* 9B907C 802426FC 00000000 */ nop -/* 9B9080 80242700 4600B001 */ sub.s $f0, $f22, $f0 -/* 9B9084 80242704 3C014480 */ lui $at, 0x4480 -/* 9B9088 80242708 44811000 */ mtc1 $at, $f2 -/* 9B908C 8024270C 00000000 */ nop -/* 9B9090 80242710 46020002 */ mul.s $f0, $f0, $f2 -/* 9B9094 80242714 00000000 */ nop -/* 9B9098 80242718 46180000 */ add.s $f0, $f0, $f24 -/* 9B909C 8024271C 4600008D */ trunc.w.s $f2, $f0 -/* 9B90A0 80242720 E6220088 */ swc1 $f2, 0x88($s1) -/* 9B90A4 80242724 C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9B90A8 80242728 461E6300 */ add.s $f12, $f12, $f30 -/* 9B90AC 8024272C 3C0142B4 */ lui $at, 0x42b4 -/* 9B90B0 80242730 4481E000 */ mtc1 $at, $f28 -/* 9B90B4 80242734 0C00A6C9 */ jal clamp_angle -/* 9B90B8 80242738 461C6300 */ add.s $f12, $f12, $f28 -/* 9B90BC 8024273C 0C00A8BB */ jal sin_deg -/* 9B90C0 80242740 46000306 */ mov.s $f12, $f0 -/* 9B90C4 80242744 3C01447A */ lui $at, 0x447a -/* 9B90C8 80242748 44811000 */ mtc1 $at, $f2 -/* 9B90CC 8024274C 00000000 */ nop -/* 9B90D0 80242750 46020002 */ mul.s $f0, $f0, $f2 -/* 9B90D4 80242754 00000000 */ nop -/* 9B90D8 80242758 4600A500 */ add.s $f20, $f20, $f0 -/* 9B90DC 8024275C 3C014480 */ lui $at, 0x4480 -/* 9B90E0 80242760 44811000 */ mtc1 $at, $f2 -/* 9B90E4 80242764 00000000 */ nop -/* 9B90E8 80242768 4602A502 */ mul.s $f20, $f20, $f2 -/* 9B90EC 8024276C 00000000 */ nop -/* 9B90F0 80242770 4618A500 */ add.s $f20, $f20, $f24 -/* 9B90F4 80242774 4600A08D */ trunc.w.s $f2, $f20 -/* 9B90F8 80242778 E622008C */ swc1 $f2, 0x8c($s1) -/* 9B90FC 8024277C C60C006C */ lwc1 $f12, 0x6c($s0) -/* 9B9100 80242780 461E6300 */ add.s $f12, $f12, $f30 -/* 9B9104 80242784 0C00A6C9 */ jal clamp_angle -/* 9B9108 80242788 461C6300 */ add.s $f12, $f12, $f28 -/* 9B910C 8024278C 0C00A8D4 */ jal cos_deg -/* 9B9110 80242790 46000306 */ mov.s $f12, $f0 -/* 9B9114 80242794 3C01447A */ lui $at, 0x447a -/* 9B9118 80242798 44811000 */ mtc1 $at, $f2 -/* 9B911C 8024279C 00000000 */ nop -/* 9B9120 802427A0 46020002 */ mul.s $f0, $f0, $f2 -/* 9B9124 802427A4 00000000 */ nop -/* 9B9128 802427A8 4600B581 */ sub.s $f22, $f22, $f0 -/* 9B912C 802427AC 3C014480 */ lui $at, 0x4480 -/* 9B9130 802427B0 44811000 */ mtc1 $at, $f2 -/* 9B9134 802427B4 00000000 */ nop -/* 9B9138 802427B8 4602B582 */ mul.s $f22, $f22, $f2 -/* 9B913C 802427BC 00000000 */ nop -/* 9B9140 802427C0 4618B580 */ add.s $f22, $f22, $f24 -/* 9B9144 802427C4 4600B08D */ trunc.w.s $f2, $f22 -/* 9B9148 802427C8 E6220090 */ swc1 $f2, 0x90($s1) -/* 9B914C 802427CC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9B9150 802427D0 8FB10014 */ lw $s1, 0x14($sp) -/* 9B9154 802427D4 8FB00010 */ lw $s0, 0x10($sp) -/* 9B9158 802427D8 D7BE0048 */ ldc1 $f30, 0x48($sp) -/* 9B915C 802427DC D7BC0040 */ ldc1 $f28, 0x40($sp) -/* 9B9160 802427E0 D7BA0038 */ ldc1 $f26, 0x38($sp) -/* 9B9164 802427E4 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 9B9168 802427E8 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 9B916C 802427EC D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9B9170 802427F0 24020002 */ addiu $v0, $zero, 2 -/* 9B9174 802427F4 03E00008 */ jr $ra -/* 9B9178 802427F8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s new file mode 100644 index 0000000000..ef6eec6ae6 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_80242600_9B8F80.s @@ -0,0 +1,131 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242600_9B8F80 +/* 9B8F80 80242600 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* 9B8F84 80242604 AFB10014 */ sw $s1, 0x14($sp) +/* 9B8F88 80242608 0080882D */ daddu $s1, $a0, $zero +/* 9B8F8C 8024260C AFBF0018 */ sw $ra, 0x18($sp) +/* 9B8F90 80242610 AFB00010 */ sw $s0, 0x10($sp) +/* 9B8F94 80242614 F7BE0048 */ sdc1 $f30, 0x48($sp) +/* 9B8F98 80242618 F7BC0040 */ sdc1 $f28, 0x40($sp) +/* 9B8F9C 8024261C F7BA0038 */ sdc1 $f26, 0x38($sp) +/* 9B8FA0 80242620 F7B80030 */ sdc1 $f24, 0x30($sp) +/* 9B8FA4 80242624 F7B60028 */ sdc1 $f22, 0x28($sp) +/* 9B8FA8 80242628 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 9B8FAC 8024262C 8E30000C */ lw $s0, 0xc($s1) +/* 9B8FB0 80242630 8E050000 */ lw $a1, ($s0) +/* 9B8FB4 80242634 0C0B210B */ jal get_float_variable +/* 9B8FB8 80242638 26100004 */ addiu $s0, $s0, 4 +/* 9B8FBC 8024263C 8E050000 */ lw $a1, ($s0) +/* 9B8FC0 80242640 26100004 */ addiu $s0, $s0, 4 +/* 9B8FC4 80242644 0220202D */ daddu $a0, $s1, $zero +/* 9B8FC8 80242648 0C0B210B */ jal get_float_variable +/* 9B8FCC 8024264C 46000506 */ mov.s $f20, $f0 +/* 9B8FD0 80242650 0220202D */ daddu $a0, $s1, $zero +/* 9B8FD4 80242654 8E050000 */ lw $a1, ($s0) +/* 9B8FD8 80242658 0C0B210B */ jal get_float_variable +/* 9B8FDC 8024265C 46000586 */ mov.s $f22, $f0 +/* 9B8FE0 80242660 3C10800B */ lui $s0, %hi(gCameras) +/* 9B8FE4 80242664 26101D80 */ addiu $s0, $s0, %lo(gCameras) +/* 9B8FE8 80242668 C60C006C */ lwc1 $f12, 0x6c($s0) +/* 9B8FEC 8024266C 46000786 */ mov.s $f30, $f0 +/* 9B8FF0 80242670 461E6300 */ add.s $f12, $f12, $f30 +/* 9B8FF4 80242674 3C014387 */ lui $at, 0x4387 +/* 9B8FF8 80242678 4481D000 */ mtc1 $at, $f26 +/* 9B8FFC 8024267C 0C00A6C9 */ jal clamp_angle +/* 9B9000 80242680 461A6300 */ add.s $f12, $f12, $f26 +/* 9B9004 80242684 0C00A8BB */ jal sin_deg +/* 9B9008 80242688 46000306 */ mov.s $f12, $f0 +/* 9B900C 8024268C 3C01447A */ lui $at, 0x447a +/* 9B9010 80242690 44811000 */ mtc1 $at, $f2 +/* 9B9014 80242694 00000000 */ nop +/* 9B9018 80242698 46020002 */ mul.s $f0, $f0, $f2 +/* 9B901C 8024269C 00000000 */ nop +/* 9B9020 802426A0 4600A000 */ add.s $f0, $f20, $f0 +/* 9B9024 802426A4 3C014480 */ lui $at, 0x4480 +/* 9B9028 802426A8 44811000 */ mtc1 $at, $f2 +/* 9B902C 802426AC 00000000 */ nop +/* 9B9030 802426B0 46020002 */ mul.s $f0, $f0, $f2 +/* 9B9034 802426B4 00000000 */ nop +/* 9B9038 802426B8 3C01CD5B */ lui $at, 0xcd5b +/* 9B903C 802426BC 34215858 */ ori $at, $at, 0x5858 +/* 9B9040 802426C0 4481C000 */ mtc1 $at, $f24 +/* 9B9044 802426C4 00000000 */ nop +/* 9B9048 802426C8 46180000 */ add.s $f0, $f0, $f24 +/* 9B904C 802426CC 4600008D */ trunc.w.s $f2, $f0 +/* 9B9050 802426D0 E6220084 */ swc1 $f2, 0x84($s1) +/* 9B9054 802426D4 C60C006C */ lwc1 $f12, 0x6c($s0) +/* 9B9058 802426D8 461E6300 */ add.s $f12, $f12, $f30 +/* 9B905C 802426DC 0C00A6C9 */ jal clamp_angle +/* 9B9060 802426E0 461A6300 */ add.s $f12, $f12, $f26 +/* 9B9064 802426E4 0C00A8D4 */ jal cos_deg +/* 9B9068 802426E8 46000306 */ mov.s $f12, $f0 +/* 9B906C 802426EC 3C01447A */ lui $at, 0x447a +/* 9B9070 802426F0 44811000 */ mtc1 $at, $f2 +/* 9B9074 802426F4 00000000 */ nop +/* 9B9078 802426F8 46020002 */ mul.s $f0, $f0, $f2 +/* 9B907C 802426FC 00000000 */ nop +/* 9B9080 80242700 4600B001 */ sub.s $f0, $f22, $f0 +/* 9B9084 80242704 3C014480 */ lui $at, 0x4480 +/* 9B9088 80242708 44811000 */ mtc1 $at, $f2 +/* 9B908C 8024270C 00000000 */ nop +/* 9B9090 80242710 46020002 */ mul.s $f0, $f0, $f2 +/* 9B9094 80242714 00000000 */ nop +/* 9B9098 80242718 46180000 */ add.s $f0, $f0, $f24 +/* 9B909C 8024271C 4600008D */ trunc.w.s $f2, $f0 +/* 9B90A0 80242720 E6220088 */ swc1 $f2, 0x88($s1) +/* 9B90A4 80242724 C60C006C */ lwc1 $f12, 0x6c($s0) +/* 9B90A8 80242728 461E6300 */ add.s $f12, $f12, $f30 +/* 9B90AC 8024272C 3C0142B4 */ lui $at, 0x42b4 +/* 9B90B0 80242730 4481E000 */ mtc1 $at, $f28 +/* 9B90B4 80242734 0C00A6C9 */ jal clamp_angle +/* 9B90B8 80242738 461C6300 */ add.s $f12, $f12, $f28 +/* 9B90BC 8024273C 0C00A8BB */ jal sin_deg +/* 9B90C0 80242740 46000306 */ mov.s $f12, $f0 +/* 9B90C4 80242744 3C01447A */ lui $at, 0x447a +/* 9B90C8 80242748 44811000 */ mtc1 $at, $f2 +/* 9B90CC 8024274C 00000000 */ nop +/* 9B90D0 80242750 46020002 */ mul.s $f0, $f0, $f2 +/* 9B90D4 80242754 00000000 */ nop +/* 9B90D8 80242758 4600A500 */ add.s $f20, $f20, $f0 +/* 9B90DC 8024275C 3C014480 */ lui $at, 0x4480 +/* 9B90E0 80242760 44811000 */ mtc1 $at, $f2 +/* 9B90E4 80242764 00000000 */ nop +/* 9B90E8 80242768 4602A502 */ mul.s $f20, $f20, $f2 +/* 9B90EC 8024276C 00000000 */ nop +/* 9B90F0 80242770 4618A500 */ add.s $f20, $f20, $f24 +/* 9B90F4 80242774 4600A08D */ trunc.w.s $f2, $f20 +/* 9B90F8 80242778 E622008C */ swc1 $f2, 0x8c($s1) +/* 9B90FC 8024277C C60C006C */ lwc1 $f12, 0x6c($s0) +/* 9B9100 80242780 461E6300 */ add.s $f12, $f12, $f30 +/* 9B9104 80242784 0C00A6C9 */ jal clamp_angle +/* 9B9108 80242788 461C6300 */ add.s $f12, $f12, $f28 +/* 9B910C 8024278C 0C00A8D4 */ jal cos_deg +/* 9B9110 80242790 46000306 */ mov.s $f12, $f0 +/* 9B9114 80242794 3C01447A */ lui $at, 0x447a +/* 9B9118 80242798 44811000 */ mtc1 $at, $f2 +/* 9B911C 8024279C 00000000 */ nop +/* 9B9120 802427A0 46020002 */ mul.s $f0, $f0, $f2 +/* 9B9124 802427A4 00000000 */ nop +/* 9B9128 802427A8 4600B581 */ sub.s $f22, $f22, $f0 +/* 9B912C 802427AC 3C014480 */ lui $at, 0x4480 +/* 9B9130 802427B0 44811000 */ mtc1 $at, $f2 +/* 9B9134 802427B4 00000000 */ nop +/* 9B9138 802427B8 4602B582 */ mul.s $f22, $f22, $f2 +/* 9B913C 802427BC 00000000 */ nop +/* 9B9140 802427C0 4618B580 */ add.s $f22, $f22, $f24 +/* 9B9144 802427C4 4600B08D */ trunc.w.s $f2, $f22 +/* 9B9148 802427C8 E6220090 */ swc1 $f2, 0x90($s1) +/* 9B914C 802427CC 8FBF0018 */ lw $ra, 0x18($sp) +/* 9B9150 802427D0 8FB10014 */ lw $s1, 0x14($sp) +/* 9B9154 802427D4 8FB00010 */ lw $s0, 0x10($sp) +/* 9B9158 802427D8 D7BE0048 */ ldc1 $f30, 0x48($sp) +/* 9B915C 802427DC D7BC0040 */ ldc1 $f28, 0x40($sp) +/* 9B9160 802427E0 D7BA0038 */ ldc1 $f26, 0x38($sp) +/* 9B9164 802427E4 D7B80030 */ ldc1 $f24, 0x30($sp) +/* 9B9168 802427E8 D7B60028 */ ldc1 $f22, 0x28($sp) +/* 9B916C 802427EC D7B40020 */ ldc1 $f20, 0x20($sp) +/* 9B9170 802427F0 24020002 */ addiu $v0, $zero, 2 +/* 9B9174 802427F4 03E00008 */ jr $ra +/* 9B9178 802427F8 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC.s deleted file mode 100644 index 85ea74d00a..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC.s +++ /dev/null @@ -1,65 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802427FC -/* 9B917C 802427FC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 9B9180 80242800 AFB1001C */ sw $s1, 0x1c($sp) -/* 9B9184 80242804 0080882D */ daddu $s1, $a0, $zero -/* 9B9188 80242808 AFBF0028 */ sw $ra, 0x28($sp) -/* 9B918C 8024280C AFB30024 */ sw $s3, 0x24($sp) -/* 9B9190 80242810 AFB20020 */ sw $s2, 0x20($sp) -/* 9B9194 80242814 AFB00018 */ sw $s0, 0x18($sp) -/* 9B9198 80242818 F7B40030 */ sdc1 $f20, 0x30($sp) -/* 9B919C 8024281C 8E30000C */ lw $s0, 0xc($s1) -/* 9B91A0 80242820 8E050000 */ lw $a1, ($s0) -/* 9B91A4 80242824 0C0B1EAF */ jal get_variable -/* 9B91A8 80242828 26100004 */ addiu $s0, $s0, 4 -/* 9B91AC 8024282C 8E050000 */ lw $a1, ($s0) -/* 9B91B0 80242830 26100004 */ addiu $s0, $s0, 4 -/* 9B91B4 80242834 0220202D */ daddu $a0, $s1, $zero -/* 9B91B8 80242838 0C0B1EAF */ jal get_variable -/* 9B91BC 8024283C 0040982D */ daddu $s3, $v0, $zero -/* 9B91C0 80242840 8E050000 */ lw $a1, ($s0) -/* 9B91C4 80242844 26100004 */ addiu $s0, $s0, 4 -/* 9B91C8 80242848 0220202D */ daddu $a0, $s1, $zero -/* 9B91CC 8024284C 0C0B1EAF */ jal get_variable -/* 9B91D0 80242850 0040902D */ daddu $s2, $v0, $zero -/* 9B91D4 80242854 0220202D */ daddu $a0, $s1, $zero -/* 9B91D8 80242858 8E050000 */ lw $a1, ($s0) -/* 9B91DC 8024285C 0C0B1EAF */ jal get_variable -/* 9B91E0 80242860 0040802D */ daddu $s0, $v0, $zero -/* 9B91E4 80242864 4482A000 */ mtc1 $v0, $f20 -/* 9B91E8 80242868 00000000 */ nop -/* 9B91EC 8024286C 4680A520 */ cvt.s.w $f20, $f20 -/* 9B91F0 80242870 0C00A8BB */ jal sin_deg -/* 9B91F4 80242874 4600A306 */ mov.s $f12, $f20 -/* 9B91F8 80242878 4600A306 */ mov.s $f12, $f20 -/* 9B91FC 8024287C 0C00A8D4 */ jal cos_deg -/* 9B9200 80242880 46000506 */ mov.s $f20, $f0 -/* 9B9204 80242884 24040001 */ addiu $a0, $zero, 1 -/* 9B9208 80242888 44931000 */ mtc1 $s3, $f2 -/* 9B920C 8024288C 00000000 */ nop -/* 9B9210 80242890 468010A0 */ cvt.s.w $f2, $f2 -/* 9B9214 80242894 2652000A */ addiu $s2, $s2, 0xa -/* 9B9218 80242898 44051000 */ mfc1 $a1, $f2 -/* 9B921C 8024289C 44921000 */ mtc1 $s2, $f2 -/* 9B9220 802428A0 00000000 */ nop -/* 9B9224 802428A4 468010A0 */ cvt.s.w $f2, $f2 -/* 9B9228 802428A8 44061000 */ mfc1 $a2, $f2 -/* 9B922C 802428AC 44901000 */ mtc1 $s0, $f2 -/* 9B9230 802428B0 00000000 */ nop -/* 9B9234 802428B4 468010A0 */ cvt.s.w $f2, $f2 -/* 9B9238 802428B8 44071000 */ mfc1 $a3, $f2 -/* 9B923C 802428BC 46000007 */ neg.s $f0, $f0 -/* 9B9240 802428C0 E7B40010 */ swc1 $f20, 0x10($sp) -/* 9B9244 802428C4 0C01BECC */ jal fx_walk_normal -/* 9B9248 802428C8 E7A00014 */ swc1 $f0, 0x14($sp) -/* 9B924C 802428CC 8FBF0028 */ lw $ra, 0x28($sp) -/* 9B9250 802428D0 8FB30024 */ lw $s3, 0x24($sp) -/* 9B9254 802428D4 8FB20020 */ lw $s2, 0x20($sp) -/* 9B9258 802428D8 8FB1001C */ lw $s1, 0x1c($sp) -/* 9B925C 802428DC 8FB00018 */ lw $s0, 0x18($sp) -/* 9B9260 802428E0 D7B40030 */ ldc1 $f20, 0x30($sp) -/* 9B9264 802428E4 24020002 */ addiu $v0, $zero, 2 -/* 9B9268 802428E8 03E00008 */ jr $ra -/* 9B926C 802428EC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s new file mode 100644 index 0000000000..bad2869e8d --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_07/9B6C90/func_802427FC_9B917C.s @@ -0,0 +1,65 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802427FC_9B917C +/* 9B917C 802427FC 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 9B9180 80242800 AFB1001C */ sw $s1, 0x1c($sp) +/* 9B9184 80242804 0080882D */ daddu $s1, $a0, $zero +/* 9B9188 80242808 AFBF0028 */ sw $ra, 0x28($sp) +/* 9B918C 8024280C AFB30024 */ sw $s3, 0x24($sp) +/* 9B9190 80242810 AFB20020 */ sw $s2, 0x20($sp) +/* 9B9194 80242814 AFB00018 */ sw $s0, 0x18($sp) +/* 9B9198 80242818 F7B40030 */ sdc1 $f20, 0x30($sp) +/* 9B919C 8024281C 8E30000C */ lw $s0, 0xc($s1) +/* 9B91A0 80242820 8E050000 */ lw $a1, ($s0) +/* 9B91A4 80242824 0C0B1EAF */ jal get_variable +/* 9B91A8 80242828 26100004 */ addiu $s0, $s0, 4 +/* 9B91AC 8024282C 8E050000 */ lw $a1, ($s0) +/* 9B91B0 80242830 26100004 */ addiu $s0, $s0, 4 +/* 9B91B4 80242834 0220202D */ daddu $a0, $s1, $zero +/* 9B91B8 80242838 0C0B1EAF */ jal get_variable +/* 9B91BC 8024283C 0040982D */ daddu $s3, $v0, $zero +/* 9B91C0 80242840 8E050000 */ lw $a1, ($s0) +/* 9B91C4 80242844 26100004 */ addiu $s0, $s0, 4 +/* 9B91C8 80242848 0220202D */ daddu $a0, $s1, $zero +/* 9B91CC 8024284C 0C0B1EAF */ jal get_variable +/* 9B91D0 80242850 0040902D */ daddu $s2, $v0, $zero +/* 9B91D4 80242854 0220202D */ daddu $a0, $s1, $zero +/* 9B91D8 80242858 8E050000 */ lw $a1, ($s0) +/* 9B91DC 8024285C 0C0B1EAF */ jal get_variable +/* 9B91E0 80242860 0040802D */ daddu $s0, $v0, $zero +/* 9B91E4 80242864 4482A000 */ mtc1 $v0, $f20 +/* 9B91E8 80242868 00000000 */ nop +/* 9B91EC 8024286C 4680A520 */ cvt.s.w $f20, $f20 +/* 9B91F0 80242870 0C00A8BB */ jal sin_deg +/* 9B91F4 80242874 4600A306 */ mov.s $f12, $f20 +/* 9B91F8 80242878 4600A306 */ mov.s $f12, $f20 +/* 9B91FC 8024287C 0C00A8D4 */ jal cos_deg +/* 9B9200 80242880 46000506 */ mov.s $f20, $f0 +/* 9B9204 80242884 24040001 */ addiu $a0, $zero, 1 +/* 9B9208 80242888 44931000 */ mtc1 $s3, $f2 +/* 9B920C 8024288C 00000000 */ nop +/* 9B9210 80242890 468010A0 */ cvt.s.w $f2, $f2 +/* 9B9214 80242894 2652000A */ addiu $s2, $s2, 0xa +/* 9B9218 80242898 44051000 */ mfc1 $a1, $f2 +/* 9B921C 8024289C 44921000 */ mtc1 $s2, $f2 +/* 9B9220 802428A0 00000000 */ nop +/* 9B9224 802428A4 468010A0 */ cvt.s.w $f2, $f2 +/* 9B9228 802428A8 44061000 */ mfc1 $a2, $f2 +/* 9B922C 802428AC 44901000 */ mtc1 $s0, $f2 +/* 9B9230 802428B0 00000000 */ nop +/* 9B9234 802428B4 468010A0 */ cvt.s.w $f2, $f2 +/* 9B9238 802428B8 44071000 */ mfc1 $a3, $f2 +/* 9B923C 802428BC 46000007 */ neg.s $f0, $f0 +/* 9B9240 802428C0 E7B40010 */ swc1 $f20, 0x10($sp) +/* 9B9244 802428C4 0C01BECC */ jal fx_walk_normal +/* 9B9248 802428C8 E7A00014 */ swc1 $f0, 0x14($sp) +/* 9B924C 802428CC 8FBF0028 */ lw $ra, 0x28($sp) +/* 9B9250 802428D0 8FB30024 */ lw $s3, 0x24($sp) +/* 9B9254 802428D4 8FB20020 */ lw $s2, 0x20($sp) +/* 9B9258 802428D8 8FB1001C */ lw $s1, 0x1c($sp) +/* 9B925C 802428DC 8FB00018 */ lw $s0, 0x18($sp) +/* 9B9260 802428E0 D7B40030 */ ldc1 $f20, 0x30($sp) +/* 9B9264 802428E4 24020002 */ addiu $v0, $zero, 2 +/* 9B9268 802428E8 03E00008 */ jr $ra +/* 9B926C 802428EC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904.s b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904.s deleted file mode 100644 index e3370b5b05..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904.s +++ /dev/null @@ -1,81 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240904 -/* 9BBBA4 80240904 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9BBBA8 80240908 AFB00010 */ sw $s0, 0x10($sp) -/* 9BBBAC 8024090C 0080802D */ daddu $s0, $a0, $zero -/* 9BBBB0 80240910 24020001 */ addiu $v0, $zero, 1 -/* 9BBBB4 80240914 10A20019 */ beq $a1, $v0, .L8024097C -/* 9BBBB8 80240918 AFBF0014 */ sw $ra, 0x14($sp) -/* 9BBBBC 8024091C 28A20002 */ slti $v0, $a1, 2 -/* 9BBBC0 80240920 50400005 */ beql $v0, $zero, .L80240938 -/* 9BBBC4 80240924 24020002 */ addiu $v0, $zero, 2 -/* 9BBBC8 80240928 10A00007 */ beqz $a1, .L80240948 -/* 9BBBCC 8024092C 00000000 */ nop -/* 9BBBD0 80240930 08090284 */ j .L80240A10 -/* 9BBBD4 80240934 00000000 */ nop -.L80240938: -/* 9BBBD8 80240938 10A20028 */ beq $a1, $v0, .L802409DC -/* 9BBBDC 8024093C 00000000 */ nop -/* 9BBBE0 80240940 08090284 */ j .L80240A10 -/* 9BBBE4 80240944 00000000 */ nop -.L80240948: -/* 9BBBE8 80240948 8E020000 */ lw $v0, ($s0) -/* 9BBBEC 8024094C 30420002 */ andi $v0, $v0, 2 -/* 9BBBF0 80240950 1040002F */ beqz $v0, .L80240A10 -/* 9BBBF4 80240954 00000000 */ nop -/* 9BBBF8 80240958 C6000010 */ lwc1 $f0, 0x10($s0) -/* 9BBBFC 8024095C 3C013F73 */ lui $at, 0x3f73 -/* 9BBC00 80240960 34213333 */ ori $at, $at, 0x3333 -/* 9BBC04 80240964 44811000 */ mtc1 $at, $f2 -/* 9BBC08 80240968 00000000 */ nop -/* 9BBC0C 8024096C 46020002 */ mul.s $f0, $f0, $f2 -/* 9BBC10 80240970 00000000 */ nop -/* 9BBC14 80240974 08090284 */ j .L80240A10 -/* 9BBC18 80240978 E6000010 */ swc1 $f0, 0x10($s0) -.L8024097C: -/* 9BBC1C 8024097C C6000010 */ lwc1 $f0, 0x10($s0) -/* 9BBC20 80240980 3C013F8F */ lui $at, 0x3f8f -/* 9BBC24 80240984 34215C29 */ ori $at, $at, 0x5c29 -/* 9BBC28 80240988 44811000 */ mtc1 $at, $f2 -/* 9BBC2C 8024098C 00000000 */ nop -/* 9BBC30 80240990 46020002 */ mul.s $f0, $f0, $f2 -/* 9BBC34 80240994 00000000 */ nop -/* 9BBC38 80240998 8E030020 */ lw $v1, 0x20($s0) -/* 9BBC3C 8024099C 2402000A */ addiu $v0, $zero, 0xa -/* 9BBC40 802409A0 1462001B */ bne $v1, $v0, .L80240A10 -/* 9BBC44 802409A4 E6000010 */ swc1 $f0, 0x10($s0) -/* 9BBC48 802409A8 3C048024 */ lui $a0, 0x8024 -/* 9BBC4C 802409AC 24840F2C */ addiu $a0, $a0, 0xf2c -/* 9BBC50 802409B0 24050001 */ addiu $a1, $zero, 1 -/* 9BBC54 802409B4 0C0B0CF8 */ jal start_script -/* 9BBC58 802409B8 0000302D */ daddu $a2, $zero, $zero -/* 9BBC5C 802409BC 8E030014 */ lw $v1, 0x14($s0) -/* 9BBC60 802409C0 AC430084 */ sw $v1, 0x84($v0) -/* 9BBC64 802409C4 8E030018 */ lw $v1, 0x18($s0) -/* 9BBC68 802409C8 AC430088 */ sw $v1, 0x88($v0) -/* 9BBC6C 802409CC 8E020000 */ lw $v0, ($s0) -/* 9BBC70 802409D0 34420002 */ ori $v0, $v0, 2 -/* 9BBC74 802409D4 08090284 */ j .L80240A10 -/* 9BBC78 802409D8 AE020000 */ sw $v0, ($s0) -.L802409DC: -/* 9BBC7C 802409DC C60C0010 */ lwc1 $f12, 0x10($s0) -/* 9BBC80 802409E0 0C00A69F */ jal signF -/* 9BBC84 802409E4 46006307 */ neg.s $f12, $f12 -/* 9BBC88 802409E8 8E02002C */ lw $v0, 0x2c($s0) -/* 9BBC8C 802409EC 8C42000C */ lw $v0, 0xc($v0) -/* 9BBC90 802409F0 04420001 */ bltzl $v0, .L802409F8 -/* 9BBC94 802409F4 00021023 */ negu $v0, $v0 -.L802409F8: -/* 9BBC98 802409F8 44821000 */ mtc1 $v0, $f2 -/* 9BBC9C 802409FC 00000000 */ nop -/* 9BBCA0 80240A00 468010A0 */ cvt.s.w $f2, $f2 -/* 9BBCA4 80240A04 46001082 */ mul.s $f2, $f2, $f0 -/* 9BBCA8 80240A08 00000000 */ nop -/* 9BBCAC 80240A0C E6020010 */ swc1 $f2, 0x10($s0) -.L80240A10: -/* 9BBCB0 80240A10 8FBF0014 */ lw $ra, 0x14($sp) -/* 9BBCB4 80240A14 8FB00010 */ lw $s0, 0x10($sp) -/* 9BBCB8 80240A18 03E00008 */ jr $ra -/* 9BBCBC 80240A1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s new file mode 100644 index 0000000000..ad35a39e06 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_08/9BB5B0/func_80240904_9BBBA4.s @@ -0,0 +1,81 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240904_9BBBA4 +/* 9BBBA4 80240904 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* 9BBBA8 80240908 AFB00010 */ sw $s0, 0x10($sp) +/* 9BBBAC 8024090C 0080802D */ daddu $s0, $a0, $zero +/* 9BBBB0 80240910 24020001 */ addiu $v0, $zero, 1 +/* 9BBBB4 80240914 10A20019 */ beq $a1, $v0, .L8024097C +/* 9BBBB8 80240918 AFBF0014 */ sw $ra, 0x14($sp) +/* 9BBBBC 8024091C 28A20002 */ slti $v0, $a1, 2 +/* 9BBBC0 80240920 50400005 */ beql $v0, $zero, .L80240938 +/* 9BBBC4 80240924 24020002 */ addiu $v0, $zero, 2 +/* 9BBBC8 80240928 10A00007 */ beqz $a1, .L80240948 +/* 9BBBCC 8024092C 00000000 */ nop +/* 9BBBD0 80240930 08090284 */ j .L80240A10 +/* 9BBBD4 80240934 00000000 */ nop +.L80240938: +/* 9BBBD8 80240938 10A20028 */ beq $a1, $v0, .L802409DC +/* 9BBBDC 8024093C 00000000 */ nop +/* 9BBBE0 80240940 08090284 */ j .L80240A10 +/* 9BBBE4 80240944 00000000 */ nop +.L80240948: +/* 9BBBE8 80240948 8E020000 */ lw $v0, ($s0) +/* 9BBBEC 8024094C 30420002 */ andi $v0, $v0, 2 +/* 9BBBF0 80240950 1040002F */ beqz $v0, .L80240A10 +/* 9BBBF4 80240954 00000000 */ nop +/* 9BBBF8 80240958 C6000010 */ lwc1 $f0, 0x10($s0) +/* 9BBBFC 8024095C 3C013F73 */ lui $at, 0x3f73 +/* 9BBC00 80240960 34213333 */ ori $at, $at, 0x3333 +/* 9BBC04 80240964 44811000 */ mtc1 $at, $f2 +/* 9BBC08 80240968 00000000 */ nop +/* 9BBC0C 8024096C 46020002 */ mul.s $f0, $f0, $f2 +/* 9BBC10 80240970 00000000 */ nop +/* 9BBC14 80240974 08090284 */ j .L80240A10 +/* 9BBC18 80240978 E6000010 */ swc1 $f0, 0x10($s0) +.L8024097C: +/* 9BBC1C 8024097C C6000010 */ lwc1 $f0, 0x10($s0) +/* 9BBC20 80240980 3C013F8F */ lui $at, 0x3f8f +/* 9BBC24 80240984 34215C29 */ ori $at, $at, 0x5c29 +/* 9BBC28 80240988 44811000 */ mtc1 $at, $f2 +/* 9BBC2C 8024098C 00000000 */ nop +/* 9BBC30 80240990 46020002 */ mul.s $f0, $f0, $f2 +/* 9BBC34 80240994 00000000 */ nop +/* 9BBC38 80240998 8E030020 */ lw $v1, 0x20($s0) +/* 9BBC3C 8024099C 2402000A */ addiu $v0, $zero, 0xa +/* 9BBC40 802409A0 1462001B */ bne $v1, $v0, .L80240A10 +/* 9BBC44 802409A4 E6000010 */ swc1 $f0, 0x10($s0) +/* 9BBC48 802409A8 3C048024 */ lui $a0, 0x8024 +/* 9BBC4C 802409AC 24840F2C */ addiu $a0, $a0, 0xf2c +/* 9BBC50 802409B0 24050001 */ addiu $a1, $zero, 1 +/* 9BBC54 802409B4 0C0B0CF8 */ jal start_script +/* 9BBC58 802409B8 0000302D */ daddu $a2, $zero, $zero +/* 9BBC5C 802409BC 8E030014 */ lw $v1, 0x14($s0) +/* 9BBC60 802409C0 AC430084 */ sw $v1, 0x84($v0) +/* 9BBC64 802409C4 8E030018 */ lw $v1, 0x18($s0) +/* 9BBC68 802409C8 AC430088 */ sw $v1, 0x88($v0) +/* 9BBC6C 802409CC 8E020000 */ lw $v0, ($s0) +/* 9BBC70 802409D0 34420002 */ ori $v0, $v0, 2 +/* 9BBC74 802409D4 08090284 */ j .L80240A10 +/* 9BBC78 802409D8 AE020000 */ sw $v0, ($s0) +.L802409DC: +/* 9BBC7C 802409DC C60C0010 */ lwc1 $f12, 0x10($s0) +/* 9BBC80 802409E0 0C00A69F */ jal signF +/* 9BBC84 802409E4 46006307 */ neg.s $f12, $f12 +/* 9BBC88 802409E8 8E02002C */ lw $v0, 0x2c($s0) +/* 9BBC8C 802409EC 8C42000C */ lw $v0, 0xc($v0) +/* 9BBC90 802409F0 04420001 */ bltzl $v0, .L802409F8 +/* 9BBC94 802409F4 00021023 */ negu $v0, $v0 +.L802409F8: +/* 9BBC98 802409F8 44821000 */ mtc1 $v0, $f2 +/* 9BBC9C 802409FC 00000000 */ nop +/* 9BBCA0 80240A00 468010A0 */ cvt.s.w $f2, $f2 +/* 9BBCA4 80240A04 46001082 */ mul.s $f2, $f2, $f0 +/* 9BBCA8 80240A08 00000000 */ nop +/* 9BBCAC 80240A0C E6020010 */ swc1 $f2, 0x10($s0) +.L80240A10: +/* 9BBCB0 80240A10 8FBF0014 */ lw $ra, 0x14($sp) +/* 9BBCB4 80240A14 8FB00010 */ lw $s0, 0x10($sp) +/* 9BBCB8 80240A18 03E00008 */ jr $ra +/* 9BBCBC 80240A1C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0.s b/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0.s deleted file mode 100644 index 2e28924d47..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0.s +++ /dev/null @@ -1,78 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802400C0 -/* 9BD720 802400C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9BD724 802400C4 3C048024 */ lui $a0, 0x8024 -/* 9BD728 802400C8 24845234 */ addiu $a0, $a0, 0x5234 -/* 9BD72C 802400CC AFBF0018 */ sw $ra, 0x18($sp) -/* 9BD730 802400D0 AFB10014 */ sw $s1, 0x14($sp) -/* 9BD734 802400D4 AFB00010 */ sw $s0, 0x10($sp) -/* 9BD738 802400D8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9BD73C 802400DC 8C830000 */ lw $v1, ($a0) -/* 9BD740 802400E0 3C118011 */ lui $s1, %hi(gPlayerStatus) -/* 9BD744 802400E4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) -/* 9BD748 802400E8 28620003 */ slti $v0, $v1, 3 -/* 9BD74C 802400EC 50400007 */ beql $v0, $zero, .L8024010C -/* 9BD750 802400F0 24020003 */ addiu $v0, $zero, 3 -/* 9BD754 802400F4 1C60000C */ bgtz $v1, .L80240128 -/* 9BD758 802400F8 24620001 */ addiu $v0, $v1, 1 -/* 9BD75C 802400FC 10600007 */ beqz $v1, .L8024011C -/* 9BD760 80240100 0000102D */ daddu $v0, $zero, $zero -/* 9BD764 80240104 0809006E */ j .L802401B8 -/* 9BD768 80240108 00000000 */ nop -.L8024010C: -/* 9BD76C 8024010C 10620008 */ beq $v1, $v0, .L80240130 -/* 9BD770 80240110 0000102D */ daddu $v0, $zero, $zero -/* 9BD774 80240114 0809006E */ j .L802401B8 -/* 9BD778 80240118 00000000 */ nop -.L8024011C: -/* 9BD77C 8024011C 24020001 */ addiu $v0, $zero, 1 -/* 9BD780 80240120 0809006D */ j .L802401B4 -/* 9BD784 80240124 AC820000 */ sw $v0, ($a0) -.L80240128: -/* 9BD788 80240128 0809006D */ j .L802401B4 -/* 9BD78C 8024012C AC820000 */ sw $v0, ($a0) -.L80240130: -/* 9BD790 80240130 C6200028 */ lwc1 $f0, 0x28($s1) -/* 9BD794 80240134 3C0141F0 */ lui $at, 0x41f0 -/* 9BD798 80240138 44811000 */ mtc1 $at, $f2 -/* 9BD79C 8024013C 3C108011 */ lui $s0, 0x8011 -/* 9BD7A0 80240140 2610C930 */ addiu $s0, $s0, -0x36d0 -/* 9BD7A4 80240144 46020001 */ sub.s $f0, $f0, $f2 -/* 9BD7A8 80240148 8E040000 */ lw $a0, ($s0) -/* 9BD7AC 8024014C E4800038 */ swc1 $f0, 0x38($a0) -/* 9BD7B0 80240150 C6200030 */ lwc1 $f0, 0x30($s1) -/* 9BD7B4 80240154 46020000 */ add.s $f0, $f0, $f2 -/* 9BD7B8 80240158 0C03BD17 */ jal clear_partner_move_history -/* 9BD7BC 8024015C E4800040 */ swc1 $f0, 0x40($a0) -/* 9BD7C0 80240160 C6200028 */ lwc1 $f0, 0x28($s1) -/* 9BD7C4 80240164 C6220030 */ lwc1 $f2, 0x30($s1) -/* 9BD7C8 80240168 4600010D */ trunc.w.s $f4, $f0 -/* 9BD7CC 8024016C 44042000 */ mfc1 $a0, $f4 -/* 9BD7D0 80240170 4600110D */ trunc.w.s $f4, $f2 -/* 9BD7D4 80240174 44052000 */ mfc1 $a1, $f4 -/* 9BD7D8 80240178 0C03BCF0 */ jal func_800EF3C0 -/* 9BD7DC 8024017C 00000000 */ nop -/* 9BD7E0 80240180 0C03BCF5 */ jal func_800EF3D4 -/* 9BD7E4 80240184 0000202D */ daddu $a0, $zero, $zero -/* 9BD7E8 80240188 3C0142B4 */ lui $at, 0x42b4 -/* 9BD7EC 8024018C 4481A000 */ mtc1 $at, $f20 -/* 9BD7F0 80240190 8E040000 */ lw $a0, ($s0) -/* 9BD7F4 80240194 4405A000 */ mfc1 $a1, $f20 -/* 9BD7F8 80240198 0C00ECD0 */ jal set_npc_yaw -/* 9BD7FC 8024019C 00000000 */ nop -/* 9BD800 802401A0 24020002 */ addiu $v0, $zero, 2 -/* 9BD804 802401A4 E6340080 */ swc1 $f20, 0x80($s1) -/* 9BD808 802401A8 E6340084 */ swc1 $f20, 0x84($s1) -/* 9BD80C 802401AC 0809006E */ j .L802401B8 -/* 9BD810 802401B0 AE2000A8 */ sw $zero, 0xa8($s1) -.L802401B4: -/* 9BD814 802401B4 0000102D */ daddu $v0, $zero, $zero -.L802401B8: -/* 9BD818 802401B8 8FBF0018 */ lw $ra, 0x18($sp) -/* 9BD81C 802401BC 8FB10014 */ lw $s1, 0x14($sp) -/* 9BD820 802401C0 8FB00010 */ lw $s0, 0x10($sp) -/* 9BD824 802401C4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9BD828 802401C8 03E00008 */ jr $ra -/* 9BD82C 802401CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s b/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s new file mode 100644 index 0000000000..b4764606cf --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_09/9BD720/func_802400C0_9BD720.s @@ -0,0 +1,78 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802400C0_9BD720 +/* 9BD720 802400C0 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 9BD724 802400C4 3C048024 */ lui $a0, 0x8024 +/* 9BD728 802400C8 24845234 */ addiu $a0, $a0, 0x5234 +/* 9BD72C 802400CC AFBF0018 */ sw $ra, 0x18($sp) +/* 9BD730 802400D0 AFB10014 */ sw $s1, 0x14($sp) +/* 9BD734 802400D4 AFB00010 */ sw $s0, 0x10($sp) +/* 9BD738 802400D8 F7B40020 */ sdc1 $f20, 0x20($sp) +/* 9BD73C 802400DC 8C830000 */ lw $v1, ($a0) +/* 9BD740 802400E0 3C118011 */ lui $s1, %hi(gPlayerStatus) +/* 9BD744 802400E4 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) +/* 9BD748 802400E8 28620003 */ slti $v0, $v1, 3 +/* 9BD74C 802400EC 50400007 */ beql $v0, $zero, .L8024010C +/* 9BD750 802400F0 24020003 */ addiu $v0, $zero, 3 +/* 9BD754 802400F4 1C60000C */ bgtz $v1, .L80240128 +/* 9BD758 802400F8 24620001 */ addiu $v0, $v1, 1 +/* 9BD75C 802400FC 10600007 */ beqz $v1, .L8024011C +/* 9BD760 80240100 0000102D */ daddu $v0, $zero, $zero +/* 9BD764 80240104 0809006E */ j .L802401B8 +/* 9BD768 80240108 00000000 */ nop +.L8024010C: +/* 9BD76C 8024010C 10620008 */ beq $v1, $v0, .L80240130 +/* 9BD770 80240110 0000102D */ daddu $v0, $zero, $zero +/* 9BD774 80240114 0809006E */ j .L802401B8 +/* 9BD778 80240118 00000000 */ nop +.L8024011C: +/* 9BD77C 8024011C 24020001 */ addiu $v0, $zero, 1 +/* 9BD780 80240120 0809006D */ j .L802401B4 +/* 9BD784 80240124 AC820000 */ sw $v0, ($a0) +.L80240128: +/* 9BD788 80240128 0809006D */ j .L802401B4 +/* 9BD78C 8024012C AC820000 */ sw $v0, ($a0) +.L80240130: +/* 9BD790 80240130 C6200028 */ lwc1 $f0, 0x28($s1) +/* 9BD794 80240134 3C0141F0 */ lui $at, 0x41f0 +/* 9BD798 80240138 44811000 */ mtc1 $at, $f2 +/* 9BD79C 8024013C 3C108011 */ lui $s0, 0x8011 +/* 9BD7A0 80240140 2610C930 */ addiu $s0, $s0, -0x36d0 +/* 9BD7A4 80240144 46020001 */ sub.s $f0, $f0, $f2 +/* 9BD7A8 80240148 8E040000 */ lw $a0, ($s0) +/* 9BD7AC 8024014C E4800038 */ swc1 $f0, 0x38($a0) +/* 9BD7B0 80240150 C6200030 */ lwc1 $f0, 0x30($s1) +/* 9BD7B4 80240154 46020000 */ add.s $f0, $f0, $f2 +/* 9BD7B8 80240158 0C03BD17 */ jal clear_partner_move_history +/* 9BD7BC 8024015C E4800040 */ swc1 $f0, 0x40($a0) +/* 9BD7C0 80240160 C6200028 */ lwc1 $f0, 0x28($s1) +/* 9BD7C4 80240164 C6220030 */ lwc1 $f2, 0x30($s1) +/* 9BD7C8 80240168 4600010D */ trunc.w.s $f4, $f0 +/* 9BD7CC 8024016C 44042000 */ mfc1 $a0, $f4 +/* 9BD7D0 80240170 4600110D */ trunc.w.s $f4, $f2 +/* 9BD7D4 80240174 44052000 */ mfc1 $a1, $f4 +/* 9BD7D8 80240178 0C03BCF0 */ jal func_800EF3C0 +/* 9BD7DC 8024017C 00000000 */ nop +/* 9BD7E0 80240180 0C03BCF5 */ jal func_800EF3D4 +/* 9BD7E4 80240184 0000202D */ daddu $a0, $zero, $zero +/* 9BD7E8 80240188 3C0142B4 */ lui $at, 0x42b4 +/* 9BD7EC 8024018C 4481A000 */ mtc1 $at, $f20 +/* 9BD7F0 80240190 8E040000 */ lw $a0, ($s0) +/* 9BD7F4 80240194 4405A000 */ mfc1 $a1, $f20 +/* 9BD7F8 80240198 0C00ECD0 */ jal set_npc_yaw +/* 9BD7FC 8024019C 00000000 */ nop +/* 9BD800 802401A0 24020002 */ addiu $v0, $zero, 2 +/* 9BD804 802401A4 E6340080 */ swc1 $f20, 0x80($s1) +/* 9BD808 802401A8 E6340084 */ swc1 $f20, 0x84($s1) +/* 9BD80C 802401AC 0809006E */ j .L802401B8 +/* 9BD810 802401B0 AE2000A8 */ sw $zero, 0xa8($s1) +.L802401B4: +/* 9BD814 802401B4 0000102D */ daddu $v0, $zero, $zero +.L802401B8: +/* 9BD818 802401B8 8FBF0018 */ lw $ra, 0x18($sp) +/* 9BD81C 802401BC 8FB10014 */ lw $s1, 0x14($sp) +/* 9BD820 802401C0 8FB00010 */ lw $s0, 0x10($sp) +/* 9BD824 802401C4 D7B40020 */ ldc1 $f20, 0x20($sp) +/* 9BD828 802401C8 03E00008 */ jr $ra +/* 9BD82C 802401CC 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820.s b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820.s deleted file mode 100644 index 7a2add2e75..0000000000 --- a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240820 -/* 9C3130 80240820 3C038011 */ lui $v1, 0x8011 -/* 9C3134 80240824 8063F2A2 */ lb $v1, -0xd5e($v1) -/* 9C3138 80240828 24020003 */ addiu $v0, $zero, 3 -/* 9C313C 8024082C 54620003 */ bnel $v1, $v0, .L8024083C -/* 9C3140 80240830 AC800084 */ sw $zero, 0x84($a0) -/* 9C3144 80240834 24020001 */ addiu $v0, $zero, 1 -/* 9C3148 80240838 AC820084 */ sw $v0, 0x84($a0) -.L8024083C: -/* 9C314C 8024083C 03E00008 */ jr $ra -/* 9C3150 80240840 24020002 */ addiu $v0, $zero, 2 -/* 9C3154 80240844 00000000 */ nop -/* 9C3158 80240848 00000000 */ nop -/* 9C315C 8024084C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s new file mode 100644 index 0000000000..2ec406ce53 --- /dev/null +++ b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s @@ -0,0 +1,17 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240820_9C3130 +/* 9C3130 80240820 3C038011 */ lui $v1, 0x8011 +/* 9C3134 80240824 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 9C3138 80240828 24020003 */ addiu $v0, $zero, 3 +/* 9C313C 8024082C 54620003 */ bnel $v1, $v0, .L8024083C +/* 9C3140 80240830 AC800084 */ sw $zero, 0x84($a0) +/* 9C3144 80240834 24020001 */ addiu $v0, $zero, 1 +/* 9C3148 80240838 AC820084 */ sw $v0, 0x84($a0) +.L8024083C: +/* 9C314C 8024083C 03E00008 */ jr $ra +/* 9C3150 80240840 24020002 */ addiu $v0, $zero, 2 +/* 9C3154 80240844 00000000 */ nop +/* 9C3158 80240848 00000000 */ nop +/* 9C315C 8024084C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260.s deleted file mode 100644 index 42fff83704..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240260 -/* B1B7D0 80240260 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1B7D4 80240264 AFB00010 */ sw $s0, 0x10($sp) -/* B1B7D8 80240268 0080802D */ daddu $s0, $a0, $zero -/* B1B7DC 8024026C 3C058024 */ lui $a1, 0x8024 -/* B1B7E0 80240270 24A5029C */ addiu $a1, $a1, 0x29c -/* B1B7E4 80240274 AFBF0014 */ sw $ra, 0x14($sp) -/* B1B7E8 80240278 0C048C8F */ jal bind_dynamic_entity_7 -/* B1B7EC 8024027C 0000202D */ daddu $a0, $zero, $zero -/* B1B7F0 80240280 8E03013C */ lw $v1, 0x13c($s0) -/* B1B7F4 80240284 AC620000 */ sw $v0, ($v1) -/* B1B7F8 80240288 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B7FC 8024028C 8FB00010 */ lw $s0, 0x10($sp) -/* B1B800 80240290 24020002 */ addiu $v0, $zero, 2 -/* B1B804 80240294 03E00008 */ jr $ra -/* B1B808 80240298 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s new file mode 100644 index 0000000000..787b315b57 --- /dev/null +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_80240260_B1B7D0.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240260_B1B7D0 +/* B1B7D0 80240260 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B1B7D4 80240264 AFB00010 */ sw $s0, 0x10($sp) +/* B1B7D8 80240268 0080802D */ daddu $s0, $a0, $zero +/* B1B7DC 8024026C 3C058024 */ lui $a1, 0x8024 +/* B1B7E0 80240270 24A5029C */ addiu $a1, $a1, 0x29c +/* B1B7E4 80240274 AFBF0014 */ sw $ra, 0x14($sp) +/* B1B7E8 80240278 0C048C8F */ jal bind_dynamic_entity_7 +/* B1B7EC 8024027C 0000202D */ daddu $a0, $zero, $zero +/* B1B7F0 80240280 8E03013C */ lw $v1, 0x13c($s0) +/* B1B7F4 80240284 AC620000 */ sw $v0, ($v1) +/* B1B7F8 80240288 8FBF0014 */ lw $ra, 0x14($sp) +/* B1B7FC 8024028C 8FB00010 */ lw $s0, 0x10($sp) +/* B1B800 80240290 24020002 */ addiu $v0, $zero, 2 +/* B1B804 80240294 03E00008 */ jr $ra +/* B1B808 80240298 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0.s deleted file mode 100644 index 46373093bc..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405B0 -/* B1BB20 802405B0 3C048024 */ lui $a0, 0x8024 -/* B1BB24 802405B4 8C840FD0 */ lw $a0, 0xfd0($a0) -/* B1BB28 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BB2C 802405BC AFBF0010 */ sw $ra, 0x10($sp) -/* B1BB30 802405C0 0C047A2F */ jal func_8011E8BC -/* B1BB34 802405C4 00000000 */ nop -/* B1BB38 802405C8 8FBF0010 */ lw $ra, 0x10($sp) -/* B1BB3C 802405CC 03E00008 */ jr $ra -/* B1BB40 802405D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s new file mode 100644 index 0000000000..08a97f7ff2 --- /dev/null +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405B0_B1BB20.s @@ -0,0 +1,13 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405B0_B1BB20 +/* B1BB20 802405B0 3C048024 */ lui $a0, 0x8024 +/* B1BB24 802405B4 8C840FD0 */ lw $a0, 0xfd0($a0) +/* B1BB28 802405B8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B1BB2C 802405BC AFBF0010 */ sw $ra, 0x10($sp) +/* B1BB30 802405C0 0C047A2F */ jal func_8011E8BC +/* B1BB34 802405C4 00000000 */ nop +/* B1BB38 802405C8 8FBF0010 */ lw $ra, 0x10($sp) +/* B1BB3C 802405CC 03E00008 */ jr $ra +/* B1BB40 802405D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4.s deleted file mode 100644 index 5aede6f29c..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405D4 -/* B1BB44 802405D4 27BDFEA8 */ addiu $sp, $sp, -0x158 -/* B1BB48 802405D8 AFB00150 */ sw $s0, 0x150($sp) -/* B1BB4C 802405DC 27B00050 */ addiu $s0, $sp, 0x50 -/* B1BB50 802405E0 3C05C3F2 */ lui $a1, 0xc3f2 -/* B1BB54 802405E4 3C0641C8 */ lui $a2, 0x41c8 -/* B1BB58 802405E8 3C07C220 */ lui $a3, 0xc220 -/* B1BB5C 802405EC AFBF0154 */ sw $ra, 0x154($sp) -/* B1BB60 802405F0 0C019E40 */ jal guTranslateF -/* B1BB64 802405F4 0200202D */ daddu $a0, $s0, $zero -/* B1BB68 802405F8 0200202D */ daddu $a0, $s0, $zero -/* B1BB6C 802405FC 27B00110 */ addiu $s0, $sp, 0x110 -/* B1BB70 80240600 0C019D40 */ jal guMtxF2L -/* B1BB74 80240604 0200282D */ daddu $a1, $s0, $zero -/* B1BB78 80240608 3C048024 */ lui $a0, 0x8024 -/* B1BB7C 8024060C 8C840FD0 */ lw $a0, 0xfd0($a0) -/* B1BB80 80240610 0C047CC1 */ jal func_8011F304 -/* B1BB84 80240614 0200282D */ daddu $a1, $s0, $zero -/* B1BB88 80240618 8FBF0154 */ lw $ra, 0x154($sp) -/* B1BB8C 8024061C 8FB00150 */ lw $s0, 0x150($sp) -/* B1BB90 80240620 03E00008 */ jr $ra -/* B1BB94 80240624 27BD0158 */ addiu $sp, $sp, 0x158 diff --git a/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s new file mode 100644 index 0000000000..0bd009e500 --- /dev/null +++ b/asm/nonmatchings/world/area_tst/tst_04/B1B570/func_802405D4_B1BB44.s @@ -0,0 +1,25 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802405D4_B1BB44 +/* B1BB44 802405D4 27BDFEA8 */ addiu $sp, $sp, -0x158 +/* B1BB48 802405D8 AFB00150 */ sw $s0, 0x150($sp) +/* B1BB4C 802405DC 27B00050 */ addiu $s0, $sp, 0x50 +/* B1BB50 802405E0 3C05C3F2 */ lui $a1, 0xc3f2 +/* B1BB54 802405E4 3C0641C8 */ lui $a2, 0x41c8 +/* B1BB58 802405E8 3C07C220 */ lui $a3, 0xc220 +/* B1BB5C 802405EC AFBF0154 */ sw $ra, 0x154($sp) +/* B1BB60 802405F0 0C019E40 */ jal guTranslateF +/* B1BB64 802405F4 0200202D */ daddu $a0, $s0, $zero +/* B1BB68 802405F8 0200202D */ daddu $a0, $s0, $zero +/* B1BB6C 802405FC 27B00110 */ addiu $s0, $sp, 0x110 +/* B1BB70 80240600 0C019D40 */ jal guMtxF2L +/* B1BB74 80240604 0200282D */ daddu $a1, $s0, $zero +/* B1BB78 80240608 3C048024 */ lui $a0, 0x8024 +/* B1BB7C 8024060C 8C840FD0 */ lw $a0, 0xfd0($a0) +/* B1BB80 80240610 0C047CC1 */ jal func_8011F304 +/* B1BB84 80240614 0200282D */ daddu $a1, $s0, $zero +/* B1BB88 80240618 8FBF0154 */ lw $ra, 0x154($sp) +/* B1BB8C 8024061C 8FB00150 */ lw $s0, 0x150($sp) +/* B1BB90 80240620 03E00008 */ jr $ra +/* B1BB94 80240624 27BD0158 */ addiu $sp, $sp, 0x158 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100.s deleted file mode 100644 index ec1748f650..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100.s +++ /dev/null @@ -1,114 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240100 -/* B1CB50 80240100 3C03800A */ lui $v1, 0x800a -/* B1CB54 80240104 8463A634 */ lh $v1, -0x59cc($v1) -/* B1CB58 80240108 3C07BF80 */ lui $a3, 0xbf80 -/* B1CB5C 8024010C 27BDFEC0 */ addiu $sp, $sp, -0x140 -/* B1CB60 80240110 F7B40128 */ sdc1 $f20, 0x128($sp) -/* B1CB64 80240114 4480A000 */ mtc1 $zero, $f20 -/* B1CB68 80240118 AFB1011C */ sw $s1, 0x11c($sp) -/* B1CB6C 8024011C 0080882D */ daddu $s1, $a0, $zero -/* B1CB70 80240120 AFB00118 */ sw $s0, 0x118($sp) -/* B1CB74 80240124 27B00098 */ addiu $s0, $sp, 0x98 -/* B1CB78 80240128 AFBF0120 */ sw $ra, 0x120($sp) -/* B1CB7C 8024012C F7B80138 */ sdc1 $f24, 0x138($sp) -/* B1CB80 80240130 F7B60130 */ sdc1 $f22, 0x130($sp) -/* B1CB84 80240134 00031080 */ sll $v0, $v1, 2 -/* B1CB88 80240138 00431021 */ addu $v0, $v0, $v1 -/* B1CB8C 8024013C 00021080 */ sll $v0, $v0, 2 -/* B1CB90 80240140 00431023 */ subu $v0, $v0, $v1 -/* B1CB94 80240144 000218C0 */ sll $v1, $v0, 3 -/* B1CB98 80240148 00431021 */ addu $v0, $v0, $v1 -/* B1CB9C 8024014C 000210C0 */ sll $v0, $v0, 3 -/* B1CBA0 80240150 3C01800B */ lui $at, 0x800b -/* B1CBA4 80240154 00220821 */ addu $at, $at, $v0 -/* B1CBA8 80240158 C4361DEC */ lwc1 $f22, 0x1dec($at) -/* B1CBAC 8024015C 4406A000 */ mfc1 $a2, $f20 -/* B1CBB0 80240160 4600B587 */ neg.s $f22, $f22 -/* B1CBB4 80240164 4405B000 */ mfc1 $a1, $f22 -/* B1CBB8 80240168 0200202D */ daddu $a0, $s0, $zero -/* B1CBBC 8024016C 0C019EC8 */ jal guRotateF -/* B1CBC0 80240170 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CBC4 80240174 C62C008C */ lwc1 $f12, 0x8c($s1) -/* B1CBC8 80240178 0C00A6C9 */ jal clamp_angle -/* B1CBCC 8024017C 00000000 */ nop -/* B1CBD0 80240180 44050000 */ mfc1 $a1, $f0 -/* B1CBD4 80240184 4406A000 */ mfc1 $a2, $f20 -/* B1CBD8 80240188 4407A000 */ mfc1 $a3, $f20 -/* B1CBDC 8024018C 3C013F80 */ lui $at, 0x3f80 -/* B1CBE0 80240190 4481C000 */ mtc1 $at, $f24 -/* B1CBE4 80240194 27A40018 */ addiu $a0, $sp, 0x18 -/* B1CBE8 80240198 0C019EC8 */ jal guRotateF -/* B1CBEC 8024019C E7B80010 */ swc1 $f24, 0x10($sp) -/* B1CBF0 802401A0 0200202D */ daddu $a0, $s0, $zero -/* B1CBF4 802401A4 27A50018 */ addiu $a1, $sp, 0x18 -/* B1CBF8 802401A8 0C019D80 */ jal guMtxCatF -/* B1CBFC 802401AC 00A0302D */ daddu $a2, $a1, $zero -/* B1CC00 802401B0 4405B000 */ mfc1 $a1, $f22 -/* B1CC04 802401B4 4406A000 */ mfc1 $a2, $f20 -/* B1CC08 802401B8 4407C000 */ mfc1 $a3, $f24 -/* B1CC0C 802401BC 0200202D */ daddu $a0, $s0, $zero -/* B1CC10 802401C0 0C019EC8 */ jal guRotateF -/* B1CC14 802401C4 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CC18 802401C8 27A40018 */ addiu $a0, $sp, 0x18 -/* B1CC1C 802401CC 0200282D */ daddu $a1, $s0, $zero -/* B1CC20 802401D0 0C019D80 */ jal guMtxCatF -/* B1CC24 802401D4 0080302D */ daddu $a2, $a0, $zero -/* B1CC28 802401D8 E7B40010 */ swc1 $f20, 0x10($sp) -/* B1CC2C 802401DC 8E2500A8 */ lw $a1, 0xa8($s1) -/* B1CC30 802401E0 4406A000 */ mfc1 $a2, $f20 -/* B1CC34 802401E4 4407C000 */ mfc1 $a3, $f24 -/* B1CC38 802401E8 0C019EC8 */ jal guRotateF -/* B1CC3C 802401EC 0200202D */ daddu $a0, $s0, $zero -/* B1CC40 802401F0 27A40018 */ addiu $a0, $sp, 0x18 -/* B1CC44 802401F4 0200282D */ daddu $a1, $s0, $zero -/* B1CC48 802401F8 0C019D80 */ jal guMtxCatF -/* B1CC4C 802401FC 0080302D */ daddu $a2, $a0, $zero -/* B1CC50 80240200 3C013F36 */ lui $at, 0x3f36 -/* B1CC54 80240204 3421DB6E */ ori $at, $at, 0xdb6e -/* B1CC58 80240208 44810000 */ mtc1 $at, $f0 -/* B1CC5C 8024020C 27B000D8 */ addiu $s0, $sp, 0xd8 -/* B1CC60 80240210 44050000 */ mfc1 $a1, $f0 -/* B1CC64 80240214 0200202D */ daddu $a0, $s0, $zero -/* B1CC68 80240218 00A0302D */ daddu $a2, $a1, $zero -/* B1CC6C 8024021C 0C019DF0 */ jal guScaleF -/* B1CC70 80240220 00A0382D */ daddu $a3, $a1, $zero -/* B1CC74 80240224 27A40018 */ addiu $a0, $sp, 0x18 -/* B1CC78 80240228 0200282D */ daddu $a1, $s0, $zero -/* B1CC7C 8024022C 0C019D80 */ jal guMtxCatF -/* B1CC80 80240230 0080302D */ daddu $a2, $a0, $zero -/* B1CC84 80240234 27B00058 */ addiu $s0, $sp, 0x58 -/* B1CC88 80240238 8E250028 */ lw $a1, 0x28($s1) -/* B1CC8C 8024023C C6200030 */ lwc1 $f0, 0x30($s1) -/* B1CC90 80240240 8E26002C */ lw $a2, 0x2c($s1) -/* B1CC94 80240244 46000007 */ neg.s $f0, $f0 -/* B1CC98 80240248 44070000 */ mfc1 $a3, $f0 -/* B1CC9C 8024024C 0C019E40 */ jal guTranslateF -/* B1CCA0 80240250 0200202D */ daddu $a0, $s0, $zero -/* B1CCA4 80240254 27A40018 */ addiu $a0, $sp, 0x18 -/* B1CCA8 80240258 0200282D */ daddu $a1, $s0, $zero -/* B1CCAC 8024025C 0C019D80 */ jal guMtxCatF -/* B1CCB0 80240260 0080302D */ daddu $a2, $a0, $zero -/* B1CCB4 80240264 24040001 */ addiu $a0, $zero, 1 -/* B1CCB8 80240268 3C050100 */ lui $a1, 0x100 -/* B1CCBC 8024026C 8E2200A4 */ lw $v0, 0xa4($s1) -/* B1CCC0 80240270 4406C000 */ mfc1 $a2, $f24 -/* B1CCC4 80240274 0C0B76A3 */ jal func_802DDA8C -/* B1CCC8 80240278 00452826 */ xor $a1, $v0, $a1 -/* B1CCCC 8024027C 24040001 */ addiu $a0, $zero, 1 -/* B1CCD0 80240280 0000282D */ daddu $a1, $zero, $zero -/* B1CCD4 80240284 00A0302D */ daddu $a2, $a1, $zero -/* B1CCD8 80240288 00A0382D */ daddu $a3, $a1, $zero -/* B1CCDC 8024028C 27A20018 */ addiu $v0, $sp, 0x18 -/* B1CCE0 80240290 0C0B7710 */ jal render_sprite -/* B1CCE4 80240294 AFA20010 */ sw $v0, 0x10($sp) -/* B1CCE8 80240298 8FBF0120 */ lw $ra, 0x120($sp) -/* B1CCEC 8024029C 8FB1011C */ lw $s1, 0x11c($sp) -/* B1CCF0 802402A0 8FB00118 */ lw $s0, 0x118($sp) -/* B1CCF4 802402A4 D7B80138 */ ldc1 $f24, 0x138($sp) -/* B1CCF8 802402A8 D7B60130 */ ldc1 $f22, 0x130($sp) -/* B1CCFC 802402AC D7B40128 */ ldc1 $f20, 0x128($sp) -/* B1CD00 802402B0 03E00008 */ jr $ra -/* B1CD04 802402B4 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s new file mode 100644 index 0000000000..cd11dcc7dd --- /dev/null +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_80240100_B1CB50.s @@ -0,0 +1,114 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80240100_B1CB50 +/* B1CB50 80240100 3C03800A */ lui $v1, 0x800a +/* B1CB54 80240104 8463A634 */ lh $v1, -0x59cc($v1) +/* B1CB58 80240108 3C07BF80 */ lui $a3, 0xbf80 +/* B1CB5C 8024010C 27BDFEC0 */ addiu $sp, $sp, -0x140 +/* B1CB60 80240110 F7B40128 */ sdc1 $f20, 0x128($sp) +/* B1CB64 80240114 4480A000 */ mtc1 $zero, $f20 +/* B1CB68 80240118 AFB1011C */ sw $s1, 0x11c($sp) +/* B1CB6C 8024011C 0080882D */ daddu $s1, $a0, $zero +/* B1CB70 80240120 AFB00118 */ sw $s0, 0x118($sp) +/* B1CB74 80240124 27B00098 */ addiu $s0, $sp, 0x98 +/* B1CB78 80240128 AFBF0120 */ sw $ra, 0x120($sp) +/* B1CB7C 8024012C F7B80138 */ sdc1 $f24, 0x138($sp) +/* B1CB80 80240130 F7B60130 */ sdc1 $f22, 0x130($sp) +/* B1CB84 80240134 00031080 */ sll $v0, $v1, 2 +/* B1CB88 80240138 00431021 */ addu $v0, $v0, $v1 +/* B1CB8C 8024013C 00021080 */ sll $v0, $v0, 2 +/* B1CB90 80240140 00431023 */ subu $v0, $v0, $v1 +/* B1CB94 80240144 000218C0 */ sll $v1, $v0, 3 +/* B1CB98 80240148 00431021 */ addu $v0, $v0, $v1 +/* B1CB9C 8024014C 000210C0 */ sll $v0, $v0, 3 +/* B1CBA0 80240150 3C01800B */ lui $at, 0x800b +/* B1CBA4 80240154 00220821 */ addu $at, $at, $v0 +/* B1CBA8 80240158 C4361DEC */ lwc1 $f22, 0x1dec($at) +/* B1CBAC 8024015C 4406A000 */ mfc1 $a2, $f20 +/* B1CBB0 80240160 4600B587 */ neg.s $f22, $f22 +/* B1CBB4 80240164 4405B000 */ mfc1 $a1, $f22 +/* B1CBB8 80240168 0200202D */ daddu $a0, $s0, $zero +/* B1CBBC 8024016C 0C019EC8 */ jal guRotateF +/* B1CBC0 80240170 E7B40010 */ swc1 $f20, 0x10($sp) +/* B1CBC4 80240174 C62C008C */ lwc1 $f12, 0x8c($s1) +/* B1CBC8 80240178 0C00A6C9 */ jal clamp_angle +/* B1CBCC 8024017C 00000000 */ nop +/* B1CBD0 80240180 44050000 */ mfc1 $a1, $f0 +/* B1CBD4 80240184 4406A000 */ mfc1 $a2, $f20 +/* B1CBD8 80240188 4407A000 */ mfc1 $a3, $f20 +/* B1CBDC 8024018C 3C013F80 */ lui $at, 0x3f80 +/* B1CBE0 80240190 4481C000 */ mtc1 $at, $f24 +/* B1CBE4 80240194 27A40018 */ addiu $a0, $sp, 0x18 +/* B1CBE8 80240198 0C019EC8 */ jal guRotateF +/* B1CBEC 8024019C E7B80010 */ swc1 $f24, 0x10($sp) +/* B1CBF0 802401A0 0200202D */ daddu $a0, $s0, $zero +/* B1CBF4 802401A4 27A50018 */ addiu $a1, $sp, 0x18 +/* B1CBF8 802401A8 0C019D80 */ jal guMtxCatF +/* B1CBFC 802401AC 00A0302D */ daddu $a2, $a1, $zero +/* B1CC00 802401B0 4405B000 */ mfc1 $a1, $f22 +/* B1CC04 802401B4 4406A000 */ mfc1 $a2, $f20 +/* B1CC08 802401B8 4407C000 */ mfc1 $a3, $f24 +/* B1CC0C 802401BC 0200202D */ daddu $a0, $s0, $zero +/* B1CC10 802401C0 0C019EC8 */ jal guRotateF +/* B1CC14 802401C4 E7B40010 */ swc1 $f20, 0x10($sp) +/* B1CC18 802401C8 27A40018 */ addiu $a0, $sp, 0x18 +/* B1CC1C 802401CC 0200282D */ daddu $a1, $s0, $zero +/* B1CC20 802401D0 0C019D80 */ jal guMtxCatF +/* B1CC24 802401D4 0080302D */ daddu $a2, $a0, $zero +/* B1CC28 802401D8 E7B40010 */ swc1 $f20, 0x10($sp) +/* B1CC2C 802401DC 8E2500A8 */ lw $a1, 0xa8($s1) +/* B1CC30 802401E0 4406A000 */ mfc1 $a2, $f20 +/* B1CC34 802401E4 4407C000 */ mfc1 $a3, $f24 +/* B1CC38 802401E8 0C019EC8 */ jal guRotateF +/* B1CC3C 802401EC 0200202D */ daddu $a0, $s0, $zero +/* B1CC40 802401F0 27A40018 */ addiu $a0, $sp, 0x18 +/* B1CC44 802401F4 0200282D */ daddu $a1, $s0, $zero +/* B1CC48 802401F8 0C019D80 */ jal guMtxCatF +/* B1CC4C 802401FC 0080302D */ daddu $a2, $a0, $zero +/* B1CC50 80240200 3C013F36 */ lui $at, 0x3f36 +/* B1CC54 80240204 3421DB6E */ ori $at, $at, 0xdb6e +/* B1CC58 80240208 44810000 */ mtc1 $at, $f0 +/* B1CC5C 8024020C 27B000D8 */ addiu $s0, $sp, 0xd8 +/* B1CC60 80240210 44050000 */ mfc1 $a1, $f0 +/* B1CC64 80240214 0200202D */ daddu $a0, $s0, $zero +/* B1CC68 80240218 00A0302D */ daddu $a2, $a1, $zero +/* B1CC6C 8024021C 0C019DF0 */ jal guScaleF +/* B1CC70 80240220 00A0382D */ daddu $a3, $a1, $zero +/* B1CC74 80240224 27A40018 */ addiu $a0, $sp, 0x18 +/* B1CC78 80240228 0200282D */ daddu $a1, $s0, $zero +/* B1CC7C 8024022C 0C019D80 */ jal guMtxCatF +/* B1CC80 80240230 0080302D */ daddu $a2, $a0, $zero +/* B1CC84 80240234 27B00058 */ addiu $s0, $sp, 0x58 +/* B1CC88 80240238 8E250028 */ lw $a1, 0x28($s1) +/* B1CC8C 8024023C C6200030 */ lwc1 $f0, 0x30($s1) +/* B1CC90 80240240 8E26002C */ lw $a2, 0x2c($s1) +/* B1CC94 80240244 46000007 */ neg.s $f0, $f0 +/* B1CC98 80240248 44070000 */ mfc1 $a3, $f0 +/* B1CC9C 8024024C 0C019E40 */ jal guTranslateF +/* B1CCA0 80240250 0200202D */ daddu $a0, $s0, $zero +/* B1CCA4 80240254 27A40018 */ addiu $a0, $sp, 0x18 +/* B1CCA8 80240258 0200282D */ daddu $a1, $s0, $zero +/* B1CCAC 8024025C 0C019D80 */ jal guMtxCatF +/* B1CCB0 80240260 0080302D */ daddu $a2, $a0, $zero +/* B1CCB4 80240264 24040001 */ addiu $a0, $zero, 1 +/* B1CCB8 80240268 3C050100 */ lui $a1, 0x100 +/* B1CCBC 8024026C 8E2200A4 */ lw $v0, 0xa4($s1) +/* B1CCC0 80240270 4406C000 */ mfc1 $a2, $f24 +/* B1CCC4 80240274 0C0B76A3 */ jal func_802DDA8C +/* B1CCC8 80240278 00452826 */ xor $a1, $v0, $a1 +/* B1CCCC 8024027C 24040001 */ addiu $a0, $zero, 1 +/* B1CCD0 80240280 0000282D */ daddu $a1, $zero, $zero +/* B1CCD4 80240284 00A0302D */ daddu $a2, $a1, $zero +/* B1CCD8 80240288 00A0382D */ daddu $a3, $a1, $zero +/* B1CCDC 8024028C 27A20018 */ addiu $v0, $sp, 0x18 +/* B1CCE0 80240290 0C0B7710 */ jal render_sprite +/* B1CCE4 80240294 AFA20010 */ sw $v0, 0x10($sp) +/* B1CCE8 80240298 8FBF0120 */ lw $ra, 0x120($sp) +/* B1CCEC 8024029C 8FB1011C */ lw $s1, 0x11c($sp) +/* B1CCF0 802402A0 8FB00118 */ lw $s0, 0x118($sp) +/* B1CCF4 802402A4 D7B80138 */ ldc1 $f24, 0x138($sp) +/* B1CCF8 802402A8 D7B60130 */ ldc1 $f22, 0x130($sp) +/* B1CCFC 802402AC D7B40128 */ ldc1 $f20, 0x128($sp) +/* B1CD00 802402B0 03E00008 */ jr $ra +/* B1CD04 802402B4 27BD0140 */ addiu $sp, $sp, 0x140 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8.s deleted file mode 100644 index 829860282a..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402B8 -/* B1CD08 802402B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1CD0C 802402BC AFB00010 */ sw $s0, 0x10($sp) -/* B1CD10 802402C0 0080802D */ daddu $s0, $a0, $zero -/* B1CD14 802402C4 3C058024 */ lui $a1, 0x8024 -/* B1CD18 802402C8 24A502F4 */ addiu $a1, $a1, 0x2f4 -/* B1CD1C 802402CC AFBF0014 */ sw $ra, 0x14($sp) -/* B1CD20 802402D0 0C048C8F */ jal bind_dynamic_entity_7 -/* B1CD24 802402D4 0000202D */ daddu $a0, $zero, $zero -/* B1CD28 802402D8 8E03013C */ lw $v1, 0x13c($s0) -/* B1CD2C 802402DC AC620000 */ sw $v0, ($v1) -/* B1CD30 802402E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B1CD34 802402E4 8FB00010 */ lw $s0, 0x10($sp) -/* B1CD38 802402E8 24020002 */ addiu $v0, $zero, 2 -/* B1CD3C 802402EC 03E00008 */ jr $ra -/* B1CD40 802402F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s new file mode 100644 index 0000000000..f842909c3a --- /dev/null +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402B8_B1CD08.s @@ -0,0 +1,19 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402B8_B1CD08 +/* B1CD08 802402B8 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B1CD0C 802402BC AFB00010 */ sw $s0, 0x10($sp) +/* B1CD10 802402C0 0080802D */ daddu $s0, $a0, $zero +/* B1CD14 802402C4 3C058024 */ lui $a1, 0x8024 +/* B1CD18 802402C8 24A502F4 */ addiu $a1, $a1, 0x2f4 +/* B1CD1C 802402CC AFBF0014 */ sw $ra, 0x14($sp) +/* B1CD20 802402D0 0C048C8F */ jal bind_dynamic_entity_7 +/* B1CD24 802402D4 0000202D */ daddu $a0, $zero, $zero +/* B1CD28 802402D8 8E03013C */ lw $v1, 0x13c($s0) +/* B1CD2C 802402DC AC620000 */ sw $v0, ($v1) +/* B1CD30 802402E0 8FBF0014 */ lw $ra, 0x14($sp) +/* B1CD34 802402E4 8FB00010 */ lw $s0, 0x10($sp) +/* B1CD38 802402E8 24020002 */ addiu $v0, $zero, 2 +/* B1CD3C 802402EC 03E00008 */ jr $ra +/* B1CD40 802402F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4.s deleted file mode 100644 index edbdf2dda4..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4.s +++ /dev/null @@ -1,54 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402F4 -/* B1CD44 802402F4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B1CD48 802402F8 AFB00040 */ sw $s0, 0x40($sp) -/* B1CD4C 802402FC 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* B1CD50 80240300 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* B1CD54 80240304 AFBF0048 */ sw $ra, 0x48($sp) -/* B1CD58 80240308 AFB10044 */ sw $s1, 0x44($sp) -/* B1CD5C 8024030C 8E020000 */ lw $v0, ($s0) -/* B1CD60 80240310 30420001 */ andi $v0, $v0, 1 -/* B1CD64 80240314 10400023 */ beqz $v0, .L802403A4 -/* B1CD68 80240318 27B10020 */ addiu $s1, $sp, 0x20 -/* B1CD6C 8024031C 8E0400CC */ lw $a0, 0xcc($s0) -/* B1CD70 80240320 0C044181 */ jal get_shadow_by_index -/* B1CD74 80240324 00000000 */ nop -/* B1CD78 80240328 0C048B77 */ jal func_80122DDC -/* B1CD7C 8024032C 84440008 */ lh $a0, 8($v0) -/* B1CD80 80240330 8C430000 */ lw $v1, ($v0) -/* B1CD84 80240334 3C04800A */ lui $a0, 0x800a -/* B1CD88 80240338 8484A634 */ lh $a0, -0x59cc($a0) -/* B1CD8C 8024033C 34630200 */ ori $v1, $v1, 0x200 -/* B1CD90 80240340 AC430000 */ sw $v1, ($v0) -/* B1CD94 80240344 27A20030 */ addiu $v0, $sp, 0x30 -/* B1CD98 80240348 AFA20010 */ sw $v0, 0x10($sp) -/* B1CD9C 8024034C 27A20034 */ addiu $v0, $sp, 0x34 -/* B1CDA0 80240350 AFA20014 */ sw $v0, 0x14($sp) -/* B1CDA4 80240354 27A20038 */ addiu $v0, $sp, 0x38 -/* B1CDA8 80240358 AFA20018 */ sw $v0, 0x18($sp) -/* B1CDAC 8024035C C600002C */ lwc1 $f0, 0x2c($s0) -/* B1CDB0 80240360 8E050028 */ lw $a1, 0x28($s0) -/* B1CDB4 80240364 8E070030 */ lw $a3, 0x30($s0) -/* B1CDB8 80240368 46000007 */ neg.s $f0, $f0 -/* B1CDBC 8024036C 44060000 */ mfc1 $a2, $f0 -/* B1CDC0 80240370 0C00B94E */ jal get_screen_coords -/* B1CDC4 80240374 00000000 */ nop -/* B1CDC8 80240378 0220202D */ daddu $a0, $s1, $zero -/* B1CDCC 8024037C AFB00028 */ sw $s0, 0x28($sp) -/* B1CDD0 80240380 820500BE */ lb $a1, 0xbe($s0) -/* B1CDD4 80240384 8FA30038 */ lw $v1, 0x38($sp) -/* B1CDD8 80240388 3C028024 */ lui $v0, 0x8024 -/* B1CDDC 8024038C 244203B8 */ addiu $v0, $v0, 0x3b8 -/* B1CDE0 80240390 AFA2002C */ sw $v0, 0x2c($sp) -/* B1CDE4 80240394 00031823 */ negu $v1, $v1 -/* B1CDE8 80240398 AFA50020 */ sw $a1, 0x20($sp) -/* B1CDEC 8024039C 0C047644 */ jal queue_render_task -/* B1CDF0 802403A0 AFA30024 */ sw $v1, 0x24($sp) -.L802403A4: -/* B1CDF4 802403A4 8FBF0048 */ lw $ra, 0x48($sp) -/* B1CDF8 802403A8 8FB10044 */ lw $s1, 0x44($sp) -/* B1CDFC 802403AC 8FB00040 */ lw $s0, 0x40($sp) -/* B1CE00 802403B0 03E00008 */ jr $ra -/* B1CE04 802403B4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s new file mode 100644 index 0000000000..368891ffd3 --- /dev/null +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802402F4_B1CD44.s @@ -0,0 +1,54 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802402F4_B1CD44 +/* B1CD44 802402F4 27BDFFB0 */ addiu $sp, $sp, -0x50 +/* B1CD48 802402F8 AFB00040 */ sw $s0, 0x40($sp) +/* B1CD4C 802402FC 3C108011 */ lui $s0, %hi(gPlayerStatus) +/* B1CD50 80240300 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) +/* B1CD54 80240304 AFBF0048 */ sw $ra, 0x48($sp) +/* B1CD58 80240308 AFB10044 */ sw $s1, 0x44($sp) +/* B1CD5C 8024030C 8E020000 */ lw $v0, ($s0) +/* B1CD60 80240310 30420001 */ andi $v0, $v0, 1 +/* B1CD64 80240314 10400023 */ beqz $v0, .L802403A4 +/* B1CD68 80240318 27B10020 */ addiu $s1, $sp, 0x20 +/* B1CD6C 8024031C 8E0400CC */ lw $a0, 0xcc($s0) +/* B1CD70 80240320 0C044181 */ jal get_shadow_by_index +/* B1CD74 80240324 00000000 */ nop +/* B1CD78 80240328 0C048B77 */ jal func_80122DDC +/* B1CD7C 8024032C 84440008 */ lh $a0, 8($v0) +/* B1CD80 80240330 8C430000 */ lw $v1, ($v0) +/* B1CD84 80240334 3C04800A */ lui $a0, 0x800a +/* B1CD88 80240338 8484A634 */ lh $a0, -0x59cc($a0) +/* B1CD8C 8024033C 34630200 */ ori $v1, $v1, 0x200 +/* B1CD90 80240340 AC430000 */ sw $v1, ($v0) +/* B1CD94 80240344 27A20030 */ addiu $v0, $sp, 0x30 +/* B1CD98 80240348 AFA20010 */ sw $v0, 0x10($sp) +/* B1CD9C 8024034C 27A20034 */ addiu $v0, $sp, 0x34 +/* B1CDA0 80240350 AFA20014 */ sw $v0, 0x14($sp) +/* B1CDA4 80240354 27A20038 */ addiu $v0, $sp, 0x38 +/* B1CDA8 80240358 AFA20018 */ sw $v0, 0x18($sp) +/* B1CDAC 8024035C C600002C */ lwc1 $f0, 0x2c($s0) +/* B1CDB0 80240360 8E050028 */ lw $a1, 0x28($s0) +/* B1CDB4 80240364 8E070030 */ lw $a3, 0x30($s0) +/* B1CDB8 80240368 46000007 */ neg.s $f0, $f0 +/* B1CDBC 8024036C 44060000 */ mfc1 $a2, $f0 +/* B1CDC0 80240370 0C00B94E */ jal get_screen_coords +/* B1CDC4 80240374 00000000 */ nop +/* B1CDC8 80240378 0220202D */ daddu $a0, $s1, $zero +/* B1CDCC 8024037C AFB00028 */ sw $s0, 0x28($sp) +/* B1CDD0 80240380 820500BE */ lb $a1, 0xbe($s0) +/* B1CDD4 80240384 8FA30038 */ lw $v1, 0x38($sp) +/* B1CDD8 80240388 3C028024 */ lui $v0, 0x8024 +/* B1CDDC 8024038C 244203B8 */ addiu $v0, $v0, 0x3b8 +/* B1CDE0 80240390 AFA2002C */ sw $v0, 0x2c($sp) +/* B1CDE4 80240394 00031823 */ negu $v1, $v1 +/* B1CDE8 80240398 AFA50020 */ sw $a1, 0x20($sp) +/* B1CDEC 8024039C 0C047644 */ jal queue_render_task +/* B1CDF0 802403A0 AFA30024 */ sw $v1, 0x24($sp) +.L802403A4: +/* B1CDF4 802403A4 8FBF0048 */ lw $ra, 0x48($sp) +/* B1CDF8 802403A8 8FB10044 */ lw $s1, 0x44($sp) +/* B1CDFC 802403AC 8FB00040 */ lw $s0, 0x40($sp) +/* B1CE00 802403B0 03E00008 */ jr $ra +/* B1CE04 802403B4 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4.s deleted file mode 100644 index e576b48c24..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406D4 -/* B1D124 802406D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1D128 802406D8 AFB00010 */ sw $s0, 0x10($sp) -/* B1D12C 802406DC 0080802D */ daddu $s0, $a0, $zero -/* B1D130 802406E0 3C048024 */ lui $a0, 0x8024 -/* B1D134 802406E4 24840730 */ addiu $a0, $a0, 0x730 -/* B1D138 802406E8 AFBF0014 */ sw $ra, 0x14($sp) -/* B1D13C 802406EC 0C048C56 */ jal bind_dynamic_entity_3 -/* B1D140 802406F0 0000282D */ daddu $a1, $zero, $zero -/* B1D144 802406F4 8E03013C */ lw $v1, 0x13c($s0) -/* B1D148 802406F8 2404FFFC */ addiu $a0, $zero, -4 -/* B1D14C 802406FC 0C00EAD2 */ jal get_npc_safe -/* B1D150 80240700 AC620004 */ sw $v0, 4($v1) -/* B1D154 80240704 0040282D */ daddu $a1, $v0, $zero -/* B1D158 80240708 10A00005 */ beqz $a1, .L80240720 -/* B1D15C 8024070C 24020002 */ addiu $v0, $zero, 2 -/* B1D160 80240710 8CA30000 */ lw $v1, ($a1) -/* B1D164 80240714 3C04000A */ lui $a0, 0xa -/* B1D168 80240718 00641825 */ or $v1, $v1, $a0 -/* B1D16C 8024071C ACA30000 */ sw $v1, ($a1) -.L80240720: -/* B1D170 80240720 8FBF0014 */ lw $ra, 0x14($sp) -/* B1D174 80240724 8FB00010 */ lw $s0, 0x10($sp) -/* B1D178 80240728 03E00008 */ jr $ra -/* B1D17C 8024072C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s new file mode 100644 index 0000000000..77495e0a88 --- /dev/null +++ b/asm/nonmatchings/world/area_tst/tst_11/B1CA50/func_802406D4_B1D124.s @@ -0,0 +1,28 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802406D4_B1D124 +/* B1D124 802406D4 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B1D128 802406D8 AFB00010 */ sw $s0, 0x10($sp) +/* B1D12C 802406DC 0080802D */ daddu $s0, $a0, $zero +/* B1D130 802406E0 3C048024 */ lui $a0, 0x8024 +/* B1D134 802406E4 24840730 */ addiu $a0, $a0, 0x730 +/* B1D138 802406E8 AFBF0014 */ sw $ra, 0x14($sp) +/* B1D13C 802406EC 0C048C56 */ jal bind_dynamic_entity_3 +/* B1D140 802406F0 0000282D */ daddu $a1, $zero, $zero +/* B1D144 802406F4 8E03013C */ lw $v1, 0x13c($s0) +/* B1D148 802406F8 2404FFFC */ addiu $a0, $zero, -4 +/* B1D14C 802406FC 0C00EAD2 */ jal get_npc_safe +/* B1D150 80240700 AC620004 */ sw $v0, 4($v1) +/* B1D154 80240704 0040282D */ daddu $a1, $v0, $zero +/* B1D158 80240708 10A00005 */ beqz $a1, .L80240720 +/* B1D15C 8024070C 24020002 */ addiu $v0, $zero, 2 +/* B1D160 80240710 8CA30000 */ lw $v1, ($a1) +/* B1D164 80240714 3C04000A */ lui $a0, 0xa +/* B1D168 80240718 00641825 */ or $v1, $v1, $a0 +/* B1D16C 8024071C ACA30000 */ sw $v1, ($a1) +.L80240720: +/* B1D170 80240720 8FBF0014 */ lw $ra, 0x14($sp) +/* B1D174 80240724 8FB00010 */ lw $s0, 0x10($sp) +/* B1D178 80240728 03E00008 */ jr $ra +/* B1D17C 8024072C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C.s b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C.s deleted file mode 100644 index 72ef77a9f5..0000000000 --- a/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C.s +++ /dev/null @@ -1,165 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024013C -/* B1D89C 8024013C 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* B1D8A0 80240140 27A40010 */ addiu $a0, $sp, 0x10 -/* B1D8A4 80240144 0000302D */ daddu $a2, $zero, $zero -/* B1D8A8 80240148 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B1D8AC 8024014C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B1D8B0 80240150 AFB00090 */ sw $s0, 0x90($sp) -/* B1D8B4 80240154 3C108024 */ lui $s0, 0x8024 -/* B1D8B8 80240158 26102BF8 */ addiu $s0, $s0, 0x2bf8 -/* B1D8BC 8024015C AFBF00A4 */ sw $ra, 0xa4($sp) -/* B1D8C0 80240160 AFB400A0 */ sw $s4, 0xa0($sp) -/* B1D8C4 80240164 AFB3009C */ sw $s3, 0x9c($sp) -/* B1D8C8 80240168 AFB20098 */ sw $s2, 0x98($sp) -/* B1D8CC 8024016C AFB10094 */ sw $s1, 0x94($sp) -/* B1D8D0 80240170 F7BA00C0 */ sdc1 $f26, 0xc0($sp) -/* B1D8D4 80240174 F7B800B8 */ sdc1 $f24, 0xb8($sp) -/* B1D8D8 80240178 F7B600B0 */ sdc1 $f22, 0xb0($sp) -/* B1D8DC 8024017C F7B400A8 */ sdc1 $f20, 0xa8($sp) -/* B1D8E0 80240180 8C650028 */ lw $a1, 0x28($v1) -/* B1D8E4 80240184 8E020000 */ lw $v0, ($s0) -/* B1D8E8 80240188 8C670030 */ lw $a3, 0x30($v1) -/* B1D8EC 8024018C 24420001 */ addiu $v0, $v0, 1 -/* B1D8F0 80240190 0C019E40 */ jal guTranslateF -/* B1D8F4 80240194 AE020000 */ sw $v0, ($s0) -/* B1D8F8 80240198 3C014248 */ lui $at, 0x4248 -/* B1D8FC 8024019C 4481D000 */ mtc1 $at, $f26 -/* B1D900 802401A0 C60C0000 */ lwc1 $f12, ($s0) -/* B1D904 802401A4 46806320 */ cvt.s.w $f12, $f12 -/* B1D908 802401A8 0C00A85B */ jal sin_rad -/* B1D90C 802401AC 461A6303 */ div.s $f12, $f12, $f26 -/* B1D910 802401B0 3C013FE0 */ lui $at, 0x3fe0 -/* B1D914 802401B4 4481C800 */ mtc1 $at, $f25 -/* 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 -/* B1D928 802401C8 4638B580 */ add.d $f22, $f22, $f24 -/* B1D92C 802401CC C60C0000 */ lwc1 $f12, ($s0) -/* B1D930 802401D0 46806320 */ cvt.s.w $f12, $f12 -/* B1D934 802401D4 461A6303 */ div.s $f12, $f12, $f26 -/* B1D938 802401D8 0C00A874 */ jal cos_rad -/* B1D93C 802401DC 4620B5A0 */ cvt.s.d $f22, $f22 -/* B1D940 802401E0 C60C0000 */ lwc1 $f12, ($s0) -/* B1D944 802401E4 46806320 */ cvt.s.w $f12, $f12 -/* B1D948 802401E8 461A6303 */ div.s $f12, $f12, $f26 -/* 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 -/* B1D95C 802401FC 3C018024 */ lui $at, 0x8024 -/* B1D960 80240200 D4202D00 */ ldc1 $f0, 0x2d00($at) -/* B1D964 80240204 4600A521 */ cvt.d.s $f20, $f20 -/* B1D968 80240208 4620A500 */ add.d $f20, $f20, $f0 -/* B1D96C 8024020C C60C0000 */ lwc1 $f12, ($s0) -/* B1D970 80240210 46806320 */ cvt.s.w $f12, $f12 -/* B1D974 80240214 461A6303 */ div.s $f12, $f12, $f26 -/* B1D978 80240218 0C00A85B */ jal sin_rad -/* 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 -/* B1D98C 8024022C 3C140001 */ lui $s4, 1 -/* B1D990 80240230 36941630 */ ori $s4, $s4, 0x1630 -/* B1D994 80240234 27B00050 */ addiu $s0, $sp, 0x50 -/* B1D998 80240238 46380000 */ add.d $f0, $f0, $f24 -/* B1D99C 8024023C 4405B000 */ mfc1 $a1, $f22 -/* B1D9A0 80240240 4406A000 */ mfc1 $a2, $f20 -/* B1D9A4 80240244 46200020 */ cvt.s.d $f0, $f0 -/* B1D9A8 80240248 44070000 */ mfc1 $a3, $f0 -/* B1D9AC 8024024C 0C019DF0 */ jal guScaleF -/* B1D9B0 80240250 0200202D */ daddu $a0, $s0, $zero -/* B1D9B4 80240254 0200202D */ daddu $a0, $s0, $zero -/* B1D9B8 80240258 27A50010 */ addiu $a1, $sp, 0x10 -/* B1D9BC 8024025C 0C019D80 */ jal guMtxCatF -/* B1D9C0 80240260 00A0302D */ daddu $a2, $a1, $zero -/* B1D9C4 80240264 27A40010 */ addiu $a0, $sp, 0x10 -/* B1D9C8 80240268 3C118007 */ lui $s1, 0x8007 -/* B1D9CC 8024026C 263141F0 */ addiu $s1, $s1, 0x41f0 -/* B1D9D0 80240270 3C12800A */ lui $s2, 0x800a -/* B1D9D4 80240274 2652A674 */ addiu $s2, $s2, -0x598c -/* B1D9D8 80240278 96250000 */ lhu $a1, ($s1) -/* B1D9DC 8024027C 8E420000 */ lw $v0, ($s2) -/* B1D9E0 80240280 00052980 */ sll $a1, $a1, 6 -/* B1D9E4 80240284 00B42821 */ addu $a1, $a1, $s4 -/* B1D9E8 80240288 0C019D40 */ jal guMtxF2L -/* B1D9EC 8024028C 00452821 */ addu $a1, $v0, $a1 -/* B1D9F0 80240290 24040001 */ addiu $a0, $zero, 1 -/* B1D9F4 80240294 3C138024 */ lui $s3, 0x8024 -/* B1D9F8 80240298 26732860 */ addiu $s3, $s3, 0x2860 -/* B1D9FC 8024029C 0260282D */ daddu $a1, $s3, $zero -/* B1DA00 802402A0 27A60010 */ addiu $a2, $sp, 0x10 -/* B1DA04 802402A4 0C0470CB */ jal func_8011C32C -/* B1DA08 802402A8 0000382D */ daddu $a3, $zero, $zero -/* B1DA0C 802402AC 3C07E300 */ lui $a3, 0xe300 -/* B1DA10 802402B0 34E70A01 */ ori $a3, $a3, 0xa01 -/* B1DA14 802402B4 3C09E200 */ lui $t1, 0xe200 -/* 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, 0x800a -/* B1DA28 802402C8 2610A66C */ addiu $s0, $s0, -0x5994 -/* B1DA2C 802402CC 0200202D */ daddu $a0, $s0, $zero -/* B1DA30 802402D0 24050001 */ addiu $a1, $zero, 1 -/* B1DA34 802402D4 8E020000 */ lw $v0, ($s0) -/* B1DA38 802402D8 3C03E700 */ lui $v1, 0xe700 -/* B1DA3C 802402DC 0040302D */ daddu $a2, $v0, $zero -/* B1DA40 802402E0 24420008 */ addiu $v0, $v0, 8 -/* B1DA44 802402E4 AE020000 */ sw $v0, ($s0) -/* B1DA48 802402E8 ACC30000 */ sw $v1, ($a2) -/* B1DA4C 802402EC 24430008 */ addiu $v1, $v0, 8 -/* B1DA50 802402F0 ACC00004 */ sw $zero, 4($a2) -/* B1DA54 802402F4 AE030000 */ sw $v1, ($s0) -/* B1DA58 802402F8 24430010 */ addiu $v1, $v0, 0x10 -/* B1DA5C 802402FC AC470000 */ sw $a3, ($v0) -/* B1DA60 80240300 AC400004 */ sw $zero, 4($v0) -/* B1DA64 80240304 AE030000 */ sw $v1, ($s0) -/* B1DA68 80240308 AC490008 */ sw $t1, 8($v0) -/* B1DA6C 8024030C 0C0475CB */ jal func_8011D72C -/* B1DA70 80240310 AC48000C */ sw $t0, 0xc($v0) -/* B1DA74 80240314 3C03DA38 */ lui $v1, 0xda38 -/* B1DA78 80240318 34630002 */ ori $v1, $v1, 2 -/* B1DA7C 8024031C 3C06D838 */ lui $a2, 0xd838 -/* B1DA80 80240320 34C60002 */ ori $a2, $a2, 2 -/* B1DA84 80240324 8E040000 */ lw $a0, ($s0) -/* B1DA88 80240328 96220000 */ lhu $v0, ($s1) -/* B1DA8C 8024032C 0080282D */ daddu $a1, $a0, $zero -/* B1DA90 80240330 24840008 */ addiu $a0, $a0, 8 -/* B1DA94 80240334 AE040000 */ sw $a0, ($s0) -/* B1DA98 80240338 ACA30000 */ sw $v1, ($a1) -/* B1DA9C 8024033C 24430001 */ addiu $v1, $v0, 1 -/* B1DAA0 80240340 3042FFFF */ andi $v0, $v0, 0xffff -/* B1DAA4 80240344 00021180 */ sll $v0, $v0, 6 -/* B1DAA8 80240348 A6230000 */ sh $v1, ($s1) -/* B1DAAC 8024034C 8E430000 */ lw $v1, ($s2) -/* B1DAB0 80240350 00541021 */ addu $v0, $v0, $s4 -/* B1DAB4 80240354 00621821 */ addu $v1, $v1, $v0 -/* B1DAB8 80240358 24820008 */ addiu $v0, $a0, 8 -/* B1DABC 8024035C ACA30004 */ sw $v1, 4($a1) -/* B1DAC0 80240360 AE020000 */ sw $v0, ($s0) -/* B1DAC4 80240364 3C02DE00 */ lui $v0, 0xde00 -/* B1DAC8 80240368 AC820000 */ sw $v0, ($a0) -/* B1DACC 8024036C 24820010 */ addiu $v0, $a0, 0x10 -/* B1DAD0 80240370 AC930004 */ sw $s3, 4($a0) -/* B1DAD4 80240374 AE020000 */ sw $v0, ($s0) -/* B1DAD8 80240378 24020040 */ addiu $v0, $zero, 0x40 -/* B1DADC 8024037C AC860008 */ sw $a2, 8($a0) -/* B1DAE0 80240380 AC82000C */ sw $v0, 0xc($a0) -/* B1DAE4 80240384 8FBF00A4 */ lw $ra, 0xa4($sp) -/* B1DAE8 80240388 8FB400A0 */ lw $s4, 0xa0($sp) -/* B1DAEC 8024038C 8FB3009C */ lw $s3, 0x9c($sp) -/* B1DAF0 80240390 8FB20098 */ lw $s2, 0x98($sp) -/* B1DAF4 80240394 8FB10094 */ lw $s1, 0x94($sp) -/* B1DAF8 80240398 8FB00090 */ lw $s0, 0x90($sp) -/* B1DAFC 8024039C D7BA00C0 */ ldc1 $f26, 0xc0($sp) -/* B1DB00 802403A0 D7B800B8 */ ldc1 $f24, 0xb8($sp) -/* B1DB04 802403A4 D7B600B0 */ ldc1 $f22, 0xb0($sp) -/* 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 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 new file mode 100644 index 0000000000..375f1e8b19 --- /dev/null +++ b/asm/nonmatchings/world/area_tst/tst_13/B1D760/func_8024013C_B1D89C.s @@ -0,0 +1,165 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8024013C_B1D89C +/* B1D89C 8024013C 27BDFF38 */ addiu $sp, $sp, -0xc8 +/* B1D8A0 80240140 27A40010 */ addiu $a0, $sp, 0x10 +/* B1D8A4 80240144 0000302D */ daddu $a2, $zero, $zero +/* B1D8A8 80240148 3C038011 */ lui $v1, %hi(gPlayerStatus) +/* B1D8AC 8024014C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) +/* B1D8B0 80240150 AFB00090 */ sw $s0, 0x90($sp) +/* B1D8B4 80240154 3C108024 */ lui $s0, 0x8024 +/* B1D8B8 80240158 26102BF8 */ addiu $s0, $s0, 0x2bf8 +/* B1D8BC 8024015C AFBF00A4 */ sw $ra, 0xa4($sp) +/* B1D8C0 80240160 AFB400A0 */ sw $s4, 0xa0($sp) +/* B1D8C4 80240164 AFB3009C */ sw $s3, 0x9c($sp) +/* B1D8C8 80240168 AFB20098 */ sw $s2, 0x98($sp) +/* B1D8CC 8024016C AFB10094 */ sw $s1, 0x94($sp) +/* B1D8D0 80240170 F7BA00C0 */ sdc1 $f26, 0xc0($sp) +/* B1D8D4 80240174 F7B800B8 */ sdc1 $f24, 0xb8($sp) +/* B1D8D8 80240178 F7B600B0 */ sdc1 $f22, 0xb0($sp) +/* B1D8DC 8024017C F7B400A8 */ sdc1 $f20, 0xa8($sp) +/* B1D8E0 80240180 8C650028 */ lw $a1, 0x28($v1) +/* B1D8E4 80240184 8E020000 */ lw $v0, ($s0) +/* B1D8E8 80240188 8C670030 */ lw $a3, 0x30($v1) +/* B1D8EC 8024018C 24420001 */ addiu $v0, $v0, 1 +/* B1D8F0 80240190 0C019E40 */ jal guTranslateF +/* B1D8F4 80240194 AE020000 */ sw $v0, ($s0) +/* B1D8F8 80240198 3C014248 */ lui $at, 0x4248 +/* B1D8FC 8024019C 4481D000 */ mtc1 $at, $f26 +/* B1D900 802401A0 C60C0000 */ lwc1 $f12, ($s0) +/* B1D904 802401A4 46806320 */ cvt.s.w $f12, $f12 +/* B1D908 802401A8 0C00A85B */ jal sin_rad +/* B1D90C 802401AC 461A6303 */ div.s $f12, $f12, $f26 +/* B1D910 802401B0 3C013FE0 */ lui $at, 0x3fe0 +/* B1D914 802401B4 4481C800 */ mtc1 $at, $f25 +/* 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 +/* B1D928 802401C8 4638B580 */ add.d $f22, $f22, $f24 +/* B1D92C 802401CC C60C0000 */ lwc1 $f12, ($s0) +/* B1D930 802401D0 46806320 */ cvt.s.w $f12, $f12 +/* B1D934 802401D4 461A6303 */ div.s $f12, $f12, $f26 +/* B1D938 802401D8 0C00A874 */ jal cos_rad +/* B1D93C 802401DC 4620B5A0 */ cvt.s.d $f22, $f22 +/* B1D940 802401E0 C60C0000 */ lwc1 $f12, ($s0) +/* B1D944 802401E4 46806320 */ cvt.s.w $f12, $f12 +/* B1D948 802401E8 461A6303 */ div.s $f12, $f12, $f26 +/* 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 +/* B1D95C 802401FC 3C018024 */ lui $at, 0x8024 +/* B1D960 80240200 D4202D00 */ ldc1 $f0, 0x2d00($at) +/* B1D964 80240204 4600A521 */ cvt.d.s $f20, $f20 +/* B1D968 80240208 4620A500 */ add.d $f20, $f20, $f0 +/* B1D96C 8024020C C60C0000 */ lwc1 $f12, ($s0) +/* B1D970 80240210 46806320 */ cvt.s.w $f12, $f12 +/* B1D974 80240214 461A6303 */ div.s $f12, $f12, $f26 +/* B1D978 80240218 0C00A85B */ jal sin_rad +/* 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 +/* B1D98C 8024022C 3C140001 */ lui $s4, 1 +/* B1D990 80240230 36941630 */ ori $s4, $s4, 0x1630 +/* B1D994 80240234 27B00050 */ addiu $s0, $sp, 0x50 +/* B1D998 80240238 46380000 */ add.d $f0, $f0, $f24 +/* B1D99C 8024023C 4405B000 */ mfc1 $a1, $f22 +/* B1D9A0 80240240 4406A000 */ mfc1 $a2, $f20 +/* B1D9A4 80240244 46200020 */ cvt.s.d $f0, $f0 +/* B1D9A8 80240248 44070000 */ mfc1 $a3, $f0 +/* B1D9AC 8024024C 0C019DF0 */ jal guScaleF +/* B1D9B0 80240250 0200202D */ daddu $a0, $s0, $zero +/* B1D9B4 80240254 0200202D */ daddu $a0, $s0, $zero +/* B1D9B8 80240258 27A50010 */ addiu $a1, $sp, 0x10 +/* B1D9BC 8024025C 0C019D80 */ jal guMtxCatF +/* B1D9C0 80240260 00A0302D */ daddu $a2, $a1, $zero +/* B1D9C4 80240264 27A40010 */ addiu $a0, $sp, 0x10 +/* B1D9C8 80240268 3C118007 */ lui $s1, 0x8007 +/* B1D9CC 8024026C 263141F0 */ addiu $s1, $s1, 0x41f0 +/* B1D9D0 80240270 3C12800A */ lui $s2, 0x800a +/* B1D9D4 80240274 2652A674 */ addiu $s2, $s2, -0x598c +/* B1D9D8 80240278 96250000 */ lhu $a1, ($s1) +/* B1D9DC 8024027C 8E420000 */ lw $v0, ($s2) +/* B1D9E0 80240280 00052980 */ sll $a1, $a1, 6 +/* B1D9E4 80240284 00B42821 */ addu $a1, $a1, $s4 +/* B1D9E8 80240288 0C019D40 */ jal guMtxF2L +/* B1D9EC 8024028C 00452821 */ addu $a1, $v0, $a1 +/* B1D9F0 80240290 24040001 */ addiu $a0, $zero, 1 +/* B1D9F4 80240294 3C138024 */ lui $s3, 0x8024 +/* B1D9F8 80240298 26732860 */ addiu $s3, $s3, 0x2860 +/* B1D9FC 8024029C 0260282D */ daddu $a1, $s3, $zero +/* B1DA00 802402A0 27A60010 */ addiu $a2, $sp, 0x10 +/* B1DA04 802402A4 0C0470CB */ jal func_8011C32C +/* B1DA08 802402A8 0000382D */ daddu $a3, $zero, $zero +/* B1DA0C 802402AC 3C07E300 */ lui $a3, 0xe300 +/* B1DA10 802402B0 34E70A01 */ ori $a3, $a3, 0xa01 +/* B1DA14 802402B4 3C09E200 */ lui $t1, 0xe200 +/* 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, 0x800a +/* B1DA28 802402C8 2610A66C */ addiu $s0, $s0, -0x5994 +/* B1DA2C 802402CC 0200202D */ daddu $a0, $s0, $zero +/* B1DA30 802402D0 24050001 */ addiu $a1, $zero, 1 +/* B1DA34 802402D4 8E020000 */ lw $v0, ($s0) +/* B1DA38 802402D8 3C03E700 */ lui $v1, 0xe700 +/* B1DA3C 802402DC 0040302D */ daddu $a2, $v0, $zero +/* B1DA40 802402E0 24420008 */ addiu $v0, $v0, 8 +/* B1DA44 802402E4 AE020000 */ sw $v0, ($s0) +/* B1DA48 802402E8 ACC30000 */ sw $v1, ($a2) +/* B1DA4C 802402EC 24430008 */ addiu $v1, $v0, 8 +/* B1DA50 802402F0 ACC00004 */ sw $zero, 4($a2) +/* B1DA54 802402F4 AE030000 */ sw $v1, ($s0) +/* B1DA58 802402F8 24430010 */ addiu $v1, $v0, 0x10 +/* B1DA5C 802402FC AC470000 */ sw $a3, ($v0) +/* B1DA60 80240300 AC400004 */ sw $zero, 4($v0) +/* B1DA64 80240304 AE030000 */ sw $v1, ($s0) +/* B1DA68 80240308 AC490008 */ sw $t1, 8($v0) +/* B1DA6C 8024030C 0C0475CB */ jal func_8011D72C +/* B1DA70 80240310 AC48000C */ sw $t0, 0xc($v0) +/* B1DA74 80240314 3C03DA38 */ lui $v1, 0xda38 +/* B1DA78 80240318 34630002 */ ori $v1, $v1, 2 +/* B1DA7C 8024031C 3C06D838 */ lui $a2, 0xd838 +/* B1DA80 80240320 34C60002 */ ori $a2, $a2, 2 +/* B1DA84 80240324 8E040000 */ lw $a0, ($s0) +/* B1DA88 80240328 96220000 */ lhu $v0, ($s1) +/* B1DA8C 8024032C 0080282D */ daddu $a1, $a0, $zero +/* B1DA90 80240330 24840008 */ addiu $a0, $a0, 8 +/* B1DA94 80240334 AE040000 */ sw $a0, ($s0) +/* B1DA98 80240338 ACA30000 */ sw $v1, ($a1) +/* B1DA9C 8024033C 24430001 */ addiu $v1, $v0, 1 +/* B1DAA0 80240340 3042FFFF */ andi $v0, $v0, 0xffff +/* B1DAA4 80240344 00021180 */ sll $v0, $v0, 6 +/* B1DAA8 80240348 A6230000 */ sh $v1, ($s1) +/* B1DAAC 8024034C 8E430000 */ lw $v1, ($s2) +/* B1DAB0 80240350 00541021 */ addu $v0, $v0, $s4 +/* B1DAB4 80240354 00621821 */ addu $v1, $v1, $v0 +/* B1DAB8 80240358 24820008 */ addiu $v0, $a0, 8 +/* B1DABC 8024035C ACA30004 */ sw $v1, 4($a1) +/* B1DAC0 80240360 AE020000 */ sw $v0, ($s0) +/* B1DAC4 80240364 3C02DE00 */ lui $v0, 0xde00 +/* B1DAC8 80240368 AC820000 */ sw $v0, ($a0) +/* B1DACC 8024036C 24820010 */ addiu $v0, $a0, 0x10 +/* B1DAD0 80240370 AC930004 */ sw $s3, 4($a0) +/* B1DAD4 80240374 AE020000 */ sw $v0, ($s0) +/* B1DAD8 80240378 24020040 */ addiu $v0, $zero, 0x40 +/* B1DADC 8024037C AC860008 */ sw $a2, 8($a0) +/* B1DAE0 80240380 AC82000C */ sw $v0, 0xc($a0) +/* B1DAE4 80240384 8FBF00A4 */ lw $ra, 0xa4($sp) +/* B1DAE8 80240388 8FB400A0 */ lw $s4, 0xa0($sp) +/* B1DAEC 8024038C 8FB3009C */ lw $s3, 0x9c($sp) +/* B1DAF0 80240390 8FB20098 */ lw $s2, 0x98($sp) +/* B1DAF4 80240394 8FB10094 */ lw $s1, 0x94($sp) +/* B1DAF8 80240398 8FB00090 */ lw $s0, 0x90($sp) +/* B1DAFC 8024039C D7BA00C0 */ ldc1 $f26, 0xc0($sp) +/* B1DB00 802403A0 D7B800B8 */ ldc1 $f24, 0xb8($sp) +/* B1DB04 802403A4 D7B600B0 */ ldc1 $f22, 0xb0($sp) +/* 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 diff --git a/src/world/area_arn/arn_03/BDED90.c b/src/world/area_arn/arn_03/BDED90.c index 70424a642c..c2c4ea23d7 100644 --- a/src/world/area_arn/arn_03/BDED90.c +++ b/src/world/area_arn/arn_03/BDED90.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240B94_BDF924); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80240E90_BDFC20); -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80241068); +INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80241068_BDFDF8); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_8024113C_BDFECC); @@ -40,6 +40,6 @@ INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802412B0_BE0040); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_802415F4_BE0384); -INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80241648); +INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80241648_BE03D8); INCLUDE_ASM(s32, "world/area_arn/arn_03/BDED90", func_80241680_BE0410); diff --git a/src/world/area_arn/arn_04/BE37B0.c b/src/world/area_arn/arn_04/BE37B0.c index 3956a87eb6..ee4019be76 100644 --- a/src/world/area_arn/arn_04/BE37B0.c +++ b/src/world/area_arn/arn_04/BE37B0.c @@ -30,50 +30,50 @@ INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241040_BE47F0); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241668_BE4E18); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241728); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241728_BE4ED8); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241A6C); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241A6C_BE521C); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241AE4); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241AE4_BE5294); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241B50_BE5300); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241C84_BE5434); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241CE8); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80241CE8_BE5498); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242078_BE5828); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024219C_BE594C); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242388); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242388_BE5B38); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_802424E8_BE5C98); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024255C); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024255C_BE5D0C); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_8024268C_BE5E3C); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242728); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242728_BE5ED8); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_802427B0_BE5F60); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242858_BE6008); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_802429CC); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_802429CC_BE617C); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242A1C_BE61CC); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242BBC); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242BBC_BE636C); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242D0C); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242D0C_BE64BC); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242DB8); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242DB8_BE6568); INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242EF0_BE66A0); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242F6C); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242F6C_BE671C); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242FD4); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80242FD4_BE6784); -INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80243018); +INCLUDE_ASM(s32, "world/area_arn/arn_04/BE37B0", func_80243018_BE67C8); diff --git a/src/world/area_arn/arn_07/BED740.c b/src/world/area_arn/arn_07/BED740.c index ca7cb0191b..b83dde8d60 100644 --- a/src/world/area_arn/arn_07/BED740.c +++ b/src/world/area_arn/arn_07/BED740.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241128_BEDF18); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802411E8_BEDFD8); -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_8024152C); +INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_8024152C_BEE31C); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802415A4_BEE394); @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241744_BEE534); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_802417A8_BEE598); -INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241B38); +INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241B38_BEE928); INCLUDE_ASM(s32, "world/area_arn/arn_07/BED740", func_80241C5C_BEEA4C); diff --git a/src/world/area_arn/arn_08/BF47A0.c b/src/world/area_arn/arn_08/BF47A0.c index 2d04aceebc..47c8587ec7 100644 --- a/src/world/area_arn/arn_08/BF47A0.c +++ b/src/world/area_arn/arn_08/BF47A0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_arn/arn_08/BF47A0", func_80240000_BF47A0); -INCLUDE_ASM(s32, "world/area_arn/arn_08/BF47A0", func_8024008C); +INCLUDE_ASM(s32, "world/area_arn/arn_08/BF47A0", func_8024008C_BF482C); diff --git a/src/world/area_dgb/dgb_01/BFD9A0.c b/src/world/area_dgb/dgb_01/BFD9A0.c index d86e28d36a..d58b45b5bb 100644 --- a/src/world/area_dgb/dgb_01/BFD9A0.c +++ b/src/world/area_dgb/dgb_01/BFD9A0.c @@ -6,23 +6,23 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802402D0_BFDB50); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802408F8_BFE178); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802409B8); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802409B8_BFE238); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240CFC_BFE57C); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240D74_BFE5F4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240DE0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240DE0_BFE660); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240F14_BFE794); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240F78); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80240F78_BFE7F8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241308); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241308_BFEB88); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024142C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024142C_BFECAC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241618); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241618_BFEE98); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241770_BFEFF0); @@ -30,13 +30,13 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241874_BFF0F4); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241954_BFF1D4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241BF0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241BF0_BFF470); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241CA8_BFF528); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241E28_BFF6A8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241E70); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241E70_BFF6F0); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241EF0_BFF770); @@ -44,25 +44,25 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80241F98_BFF818); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802422B0_BFFB30); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024252C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024252C_BFFDAC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242684); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242684_BFFF04); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024292C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_8024292C_C001AC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802429EC); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_802429EC_C0026C); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242BA8_C00428); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242C5C_C004DC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242CD0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242CD0_C00550); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242D48); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242D48_C005C8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242E78); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242E78_C006F8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242F98); +INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80242F98_C00818); INCLUDE_ASM(s32, "world/area_dgb/dgb_01/BFD9A0", func_80243000_C00880); diff --git a/src/world/area_dgb/dgb_02/C2EBA0.c b/src/world/area_dgb/dgb_02/C2EBA0.c index 2535e242ed..e1ea7a6e19 100644 --- a/src/world/area_dgb/dgb_02/C2EBA0.c +++ b/src/world/area_dgb/dgb_02/C2EBA0.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_8024061C_C2F1BC); INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802408D0_C2F470); -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240958); +INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240958_C2F4F8); INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240C10_C2F7B0); @@ -28,6 +28,6 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240E54_C2F9F4); INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80240F00_C2FAA0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80241078); +INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_80241078_C2FC18); INCLUDE_ASM(s32, "world/area_dgb/dgb_02/C2EBA0", func_802410D4_C2FC74); diff --git a/src/world/area_dgb/dgb_03/C314E0.c b/src/world/area_dgb/dgb_03/C314E0.c index 796aaae3f1..f915f72501 100644 --- a/src/world/area_dgb/dgb_03/C314E0.c +++ b/src/world/area_dgb/dgb_03/C314E0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802400BC_C3159C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_80240170_C31650); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802401A4); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C314E0", func_802401A4_C31684); diff --git a/src/world/area_dgb/dgb_03/C31730.c b/src/world/area_dgb/dgb_03/C31730.c index 5d37416b2e..b8a57d17b8 100644 --- a/src/world/area_dgb/dgb_03/C31730.c +++ b/src/world/area_dgb/dgb_03/C31730.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024032C_C3180C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240404_C318E4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240458); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240458_C31938); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024060C_C31AEC); @@ -24,36 +24,36 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80240FE0_C324C0); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024119C_C3267C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241250); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241250_C32730); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802412C4); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802412C4_C327A4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024133C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024133C_C3281C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024146C_C3294C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024158C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_8024158C_C32A6C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802415F4_C32AD4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802416B4); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802416B4_C32B94); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802419B0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802419B0_C32E90); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241C7C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241C7C_C3315C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241D04); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241D04_C331E4); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80241FBC_C3349C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242020); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242020_C33500); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802420C8); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802420C8_C335A8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242200); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242200_C336E0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802422AC); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_802422AC_C3378C); INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242424_C33904); -INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242480); +INCLUDE_ASM(s32, "world/area_dgb/dgb_03/C31730", func_80242480_C33960); diff --git a/src/world/area_dgb/dgb_04/C36530.c b/src/world/area_dgb/dgb_04/C36530.c index 4a86f21d98..73669aa16b 100644 --- a/src/world/area_dgb/dgb_04/C36530.c +++ b/src/world/area_dgb/dgb_04/C36530.c @@ -28,25 +28,25 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241650_C37B80); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241754_C37C84); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802417F8); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802417F8_C37D28); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241A94); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241A94_C37FC4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241B4C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241B4C_C3807C); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241CCC_C381FC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241D14); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241D14_C38244); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241D94); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241D94_C382C4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241E3C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80241E3C_C3836C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242154); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242154_C38684); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802423D0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802423D0_C38900); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802423EC); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802423EC_C3891C); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_8024240C_C3893C); @@ -56,26 +56,26 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802424A4_C389D4); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802424F0_C38A20); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_8024259C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_8024259C_C38ACC); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802427EC_C38D1C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242818); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242818_C38D48); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242850_C38D80); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802428E0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802428E0_C38E10); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242914); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242914_C38E44); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242978); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242978_C38EA8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802429D0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802429D0_C38F00); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80242F08_C39438); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80243048); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80243048_C39578); INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_80243090_C395C0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802430D8); +INCLUDE_ASM(s32, "world/area_dgb/dgb_04/C36530", func_802430D8_C39608); diff --git a/src/world/area_dgb/dgb_05/C3AA10.c b/src/world/area_dgb/dgb_05/C3AA10.c index a0dcc72c2e..464aab8212 100644 --- a/src/world/area_dgb/dgb_05/C3AA10.c +++ b/src/world/area_dgb/dgb_05/C3AA10.c @@ -20,13 +20,13 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_8024067C_C3B08C); INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240704_C3B114); -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802409BC); +INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802409BC_C3B3CC); INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240A20_C3B430); INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240AC8_C3B4D8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240C00); +INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240C00_C3B610); INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240CAC_C3B6BC); @@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240E24_C3B834); INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_80240E80_C3B890); -INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802411D0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_05/C3AA10", func_802411D0_C3BBE0); diff --git a/src/world/area_dgb/dgb_08/C3FDB0.c b/src/world/area_dgb/dgb_08/C3FDB0.c index 6007c69605..db0542fc28 100644 --- a/src/world/area_dgb/dgb_08/C3FDB0.c +++ b/src/world/area_dgb/dgb_08/C3FDB0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241098_C40E48); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024124C_C40FFC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802414AC); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802414AC_C4125C); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241760_C41510); @@ -44,27 +44,27 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241910_C416C0); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241F38_C41CE8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241FF8); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80241FF8_C41DA8); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_8024233C_C420EC); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802423B4_C42164); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242420); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242420_C421D0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242554); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242554_C42304); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802425B8); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802425B8_C42368); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242948); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242948_C426F8); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242A6C_C4281C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242C58); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242C58_C42A08); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242DB0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242DB0_C42B60); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242EB4); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242EB4_C42C64); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80242F94_C42D44); @@ -74,18 +74,18 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802432E8_C43098); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243468_C43218); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802434B0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802434B0_C43260); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243530); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243530_C432E0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802435D8); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802435D8_C43388); INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_802438F0_C436A0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243B6C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243B6C_C4391C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243B98); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243B98_C43948); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243C10); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243C10_C439C0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243C50); +INCLUDE_ASM(s32, "world/area_dgb/dgb_08/C3FDB0", func_80243C50_C43A00); diff --git a/src/world/area_dgb/dgb_09/C46BE0.c b/src/world/area_dgb/dgb_09/C46BE0.c index 38babb3201..466ed7f7a0 100644 --- a/src/world/area_dgb/dgb_09/C46BE0.c +++ b/src/world/area_dgb/dgb_09/C46BE0.c @@ -34,44 +34,44 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802410D4_C47CB4); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241424_C48004); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802415D4); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802415D4_C481B4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241BFC); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241BFC_C487DC); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80241CBC_C4889C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242000); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242000_C48BE0); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242078_C48C58); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802420E4); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802420E4_C48CC4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242218); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242218_C48DF8); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024227C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024227C_C48E5C); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024260C_C491EC); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242730_C49310); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024291C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_8024291C_C494FC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242A74); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242A74_C49654); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242B78); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242B78_C49758); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242C1C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242C1C_C497FC); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242EB8); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242EB8_C49A98); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242F70); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80242F70_C49B50); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802430F0_C49CD0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80243138); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80243138_C49D18); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802431B8); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_802431B8_C49D98); -INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80243260); +INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80243260_C49E40); INCLUDE_ASM(s32, "world/area_dgb/dgb_09/C46BE0", func_80243578_C4A158); diff --git a/src/world/area_dgb/dgb_15/C4F510.c b/src/world/area_dgb/dgb_15/C4F510.c index 76cc857941..e3bae780b2 100644 --- a/src/world/area_dgb/dgb_15/C4F510.c +++ b/src/world/area_dgb/dgb_15/C4F510.c @@ -18,24 +18,24 @@ INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802408D0_C4FDE0); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240A28_C4FF38); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240CD0); +INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240CD0_C501E0); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240D90_C502A0); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240F4C); +INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80240F4C_C5045C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241000); +INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241000_C50510); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241074); +INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241074_C50584); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802410EC); +INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802410EC_C505FC); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024121C_C5072C); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_8024133C_C5084C); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802413A4); +INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_802413A4_C508B4); -INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241464); +INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241464_C50974); INCLUDE_ASM(s32, "world/area_dgb/dgb_15/C4F510", func_80241760_C50C70); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 4d22a93675..f16416dea8 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -1,111 +1,111 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802405E0); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802405E0_95B7E0); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240738_95B938); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802409E0_95BBE0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240AA0); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240AA0_95BCA0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240C5C); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240C5C_95BE5C); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240D10_95BF10); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240D84); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240D84_95BF84); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240DFC); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240DFC_95BFFC); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240F2C); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80240F2C_95C12C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024104C); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024104C_95C24C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802410B4); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802410B4_95C2B4); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241174_95C374); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470_95C670); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241588); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241588_95C788); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024159C_95C79C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802417D0); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802417D0_95C9D0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024181C); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024181C_95CA1C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024183C); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024183C_95CA3C); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024189C_95CA9C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802419E8); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802419E8_95CBE8); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241B5C); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241B5C_95CD5C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241BE0); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241BE0_95CDE0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241DF8); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241DF8_95CFF8); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241EAC_95D0AC); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241EE0); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241EE0_95D0E0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F60); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F60_95D160); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F78); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F78_95D178); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F94); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F94_95D194); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FAC); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FAC_95D1AC); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FDC); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FDC_95D1DC); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242050); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242050_95D250); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802420F0); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802420F0_95D2F0); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802422F0); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802422F0_95D4F0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242380); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242380_95D580); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242468); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242468_95D668); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802424D4); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802424D4_95D6D4); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242730); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242730_95D930); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242784); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242784_95D984); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802427BC); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802427BC_95D9BC); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242858); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242858_95DA58); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242D98); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242D98_95DF98); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242E88); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242E88_95E088); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243014); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243014_95E214); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243058); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243058_95E258); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243084); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243084_95E284); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024309C); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024309C_95E29C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802430C8); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802430C8_95E2C8); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802431B4_95E3B4); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802431FC); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802431FC_95E3FC); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243350); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80243350_95E550); diff --git a/src/world/area_dro/dro_01/95E660.c b/src/world/area_dro/dro_01/95E660.c index d9a18f99b2..81e6b5d1b6 100644 --- a/src/world/area_dro/dro_01/95E660.c +++ b/src/world/area_dro/dro_01/95E660.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243460); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243460_95E660); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243578); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95E660", func_80243578_95E778); diff --git a/src/world/area_dro/dro_01/95E7A0.c b/src/world/area_dro/dro_01/95E7A0.c index 83a24932b8..7adfe31822 100644 --- a/src/world/area_dro/dro_01/95E7A0.c +++ b/src/world/area_dro/dro_01/95E7A0.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435A0); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435A0_95E7A0); INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435C0_95E7C0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802435D4_95E7D4); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243690); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243690_95E890); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243770); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243770_95E970); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802437DC); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802437DC_95E9DC); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243880); +INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243880_95EA80); INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802438F0_95EAF0); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 166c363390..f9d3a03e1d 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -8,23 +8,23 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240418_9695D8); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024042C_9695EC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240660); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240660_969820); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802406AC_96986C); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802406CC); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802406CC_96988C); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024072C); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024072C_9698EC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240878); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240878_969A38); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802409EC); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802409EC_969BAC); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240A70_969C30); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240C88); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240C88_969E48); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240D3C_969EFC); @@ -32,21 +32,21 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240D70_969F30); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240DF0_969FB0); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E08); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E08_969FC8); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E24); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E24_969FE4); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E3C); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E3C_969FFC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E6C); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E6C_96A02C); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240EE0); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240EE0_96A0A0); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240F80); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240F80_96A140); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241180); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241180_96A340); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241210_96A3D0); @@ -54,68 +54,68 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802412F8_96A4B8); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241364_96A524); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241394); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241394_96A554); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802414C0); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802414C0_96A680); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802415CC); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802415CC_96A78C); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802416FC_96A8BC); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241874_96AA34); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024190C); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024190C_96AACC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80242214); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80242214_96B3D4); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024240C); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024240C_96B5CC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80242EAC); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80242EAC_96C06C); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024303C); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024303C_96C1FC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243068); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243068_96C228); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802432C0); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802432C0_96C480); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243314); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243314_96C4D4); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024334C); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024334C_96C50C); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8_96C5A8); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243484); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243484_96C644); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434A4); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434A4_96C664); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548_96C708); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435C8); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435C8_96C788); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435F8); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435F8_96C7B8); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243624); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243624_96C7E4); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243644); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243644_96C804); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243698); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243698_96C858); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243714); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243714_96C8D4); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243748); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243748_96C908); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243778); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243778_96C938); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243780); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243780_96C940); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243870_96CA30); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802439FC); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802439FC_96CBBC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243A40); +INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243A40_96CC00); diff --git a/src/world/area_end/end_00/DF6A20.c b/src/world/area_end/end_00/DF6A20.c index 19966efc30..f326579754 100644 --- a/src/world/area_end/end_00/DF6A20.c +++ b/src/world/area_end/end_00/DF6A20.c @@ -10,31 +10,31 @@ INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_8024081C_DF721C); INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80240AE8_DF74E8); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80240EB0); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80240EB0_DF78B0); INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80240FEC_DF79EC); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802411CC); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802411CC_DF7BCC); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80241294); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80241294_DF7C94); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802414CC); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802414CC_DF7ECC); INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80241768_DF8168); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802419F8); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802419F8_DF83F8); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80241B34); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80241B34_DF8534); INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802421D8_DF8BD8); INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242358_DF8D58); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242500); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242500_DF8F00); INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242558_DF8F58); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242580); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242580_DF8F80); INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242680_DF9080); @@ -42,8 +42,8 @@ INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242744_DF9144); INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802427A4_DF91A4); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802427D8); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_802427D8_DF91D8); -INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242830); +INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242830_DF9230); INCLUDE_ASM(s32, "world/area_end/end_00/DF6A20", func_80242898_DF9298); diff --git a/src/world/area_end/end_00/DF9300.c b/src/world/area_end/end_00/DF9300.c index c1aba5c614..d53b633dbc 100644 --- a/src/world/area_end/end_00/DF9300.c +++ b/src/world/area_end/end_00/DF9300.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_end/end_00/DF9300", func_80242900); +INCLUDE_ASM(s32, "world/area_end/end_00/DF9300", func_80242900_DF9300); INCLUDE_ASM(s32, "world/area_end/end_00/DF9300", func_80242A30_DF9430); diff --git a/src/world/area_end/end_00/DF9510.c b/src/world/area_end/end_00/DF9510.c index 4a875cedc6..93b83e2b2e 100644 --- a/src/world/area_end/end_00/DF9510.c +++ b/src/world/area_end/end_00/DF9510.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_end/end_00/DF9510", func_80242B10); +INCLUDE_ASM(s32, "world/area_end/end_00/DF9510", func_80242B10_DF9510); diff --git a/src/world/area_end/end_01/E05390.c b/src/world/area_end/end_01/E05390.c index f6b0ca2976..e9ae00e26b 100644 --- a/src/world/area_end/end_01/E05390.c +++ b/src/world/area_end/end_01/E05390.c @@ -12,43 +12,43 @@ INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80240AF8_E05E58); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80240EC0_E06220); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80240FFC); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80240FFC_E0635C); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802411DC); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802411DC_E0653C); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802412A4); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802412A4_E06604); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802414DC); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802414DC_E0683C); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80241778); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80241778_E06AD8); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80241A08_E06D68); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80241B44); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80241B44_E06EA4); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802421E8_E07548); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242368_E076C8); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242510); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242510_E07870); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242568); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242568_E078C8); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242590_E078F0); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242690); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242690_E079F0); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242754_E07AB4); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802427B4); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802427B4_E07B14); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802427E8); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802427E8_E07B48); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242840); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242840_E07BA0); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_8024289C); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_8024289C_E07BFC); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802428C0); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802428C0_E07C20); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242900_E07C60); @@ -56,8 +56,8 @@ INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242978_E07CD8); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242A68_E07DC8); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242B68); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242B68_E07EC8); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C68); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C68_E07FC8); -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C94); +INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C94_E07FF4); diff --git a/src/world/area_end/end_01/E08050.c b/src/world/area_end/end_01/E08050.c index a717b53d94..f8a6fdd0fc 100644 --- a/src/world/area_end/end_01/E08050.c +++ b/src/world/area_end/end_01/E08050.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_end/end_01/E08050", func_80242CF0); +INCLUDE_ASM(s32, "world/area_end/end_01/E08050", func_80242CF0_E08050); -INCLUDE_ASM(s32, "world/area_end/end_01/E08050", func_80242E14); +INCLUDE_ASM(s32, "world/area_end/end_01/E08050", func_80242E14_E08174); diff --git a/src/world/area_flo/flo_00/C9DF60.c b/src/world/area_flo/flo_00/C9DF60.c index 485e04aa67..0f23f5cd6c 100644 --- a/src/world/area_flo/flo_00/C9DF60.c +++ b/src/world/area_flo/flo_00/C9DF60.c @@ -12,11 +12,11 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_802406BC_C9E5DC); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240770_C9E690); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_802407E4); +INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_802407E4_C9E704); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_8024085C_C9E77C); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_8024098C); +INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_8024098C_C9E8AC); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9DF60", func_80240AAC_C9E9CC); diff --git a/src/world/area_flo/flo_00/C9EE30.c b/src/world/area_flo/flo_00/C9EE30.c index 09ccf93aba..1f67fbc848 100644 --- a/src/world/area_flo/flo_00/C9EE30.c +++ b/src/world/area_flo/flo_00/C9EE30.c @@ -12,4 +12,4 @@ INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_8024137C_C9F29C); INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_8024139C_C9F2BC); -INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802413BC); +INCLUDE_ASM(s32, "world/area_flo/flo_00/C9EE30", func_802413BC_C9F2DC); diff --git a/src/world/area_flo/flo_07/CAC5D0.c b/src/world/area_flo/flo_07/CAC5D0.c index 2bda891665..a82bbd8504 100644 --- a/src/world/area_flo/flo_07/CAC5D0.c +++ b/src/world/area_flo/flo_07/CAC5D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_802403E0_CAC5D0); -INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_80240450); +INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_80240450_CAC640); INCLUDE_ASM(s32, "world/area_flo/flo_07/CAC5D0", func_8024061C_CAC80C); diff --git a/src/world/area_flo/flo_08/CAFAC0.c b/src/world/area_flo/flo_08/CAFAC0.c index 1e3abc0bb1..b9dff23bc6 100644 --- a/src/world/area_flo/flo_08/CAFAC0.c +++ b/src/world/area_flo/flo_08/CAFAC0.c @@ -16,14 +16,14 @@ INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241970_CB06B0); INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802419C4_CB0704); -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802419FC); +INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_802419FC_CB073C); -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241A98); +INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241A98_CB07D8); INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241B5C_CB089C); INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241BCC_CB090C); -INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241C00); +INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241C00_CB0940); INCLUDE_ASM(s32, "world/area_flo/flo_08/CAFAC0", func_80241C70_CB09B0); diff --git a/src/world/area_flo/flo_09/CB5320.c b/src/world/area_flo/flo_09/CB5320.c index a24b300374..712219a997 100644 --- a/src/world/area_flo/flo_09/CB5320.c +++ b/src/world/area_flo/flo_09/CB5320.c @@ -10,14 +10,14 @@ INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240BB8_CB5BB8); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240EFC_CB5EFC); -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240F74); +INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240F74_CB5F74); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80240FE0_CB5FE0); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241114_CB6114); -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241178); +INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241178_CB6178); -INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241508); +INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_80241508_CB6508); INCLUDE_ASM(s32, "world/area_flo/flo_09/CB5320", func_8024162C_CB662C); diff --git a/src/world/area_flo/flo_10/CBA430.c b/src/world/area_flo/flo_10/CBA430.c index 4feb0e6710..95a0caf04d 100644 --- a/src/world/area_flo/flo_10/CBA430.c +++ b/src/world/area_flo/flo_10/CBA430.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_flo/flo_10/CBA430", func_80241230); +INCLUDE_ASM(s32, "world/area_flo/flo_10/CBA430", func_80241230_CBA430); INCLUDE_ASM(s32, "world/area_flo/flo_10/CBA430", func_802412A0_CBA4A0); diff --git a/src/world/area_flo/flo_12/CC0E70.c b/src/world/area_flo/flo_12/CC0E70.c index 45d71412a2..b1c43837f2 100644 --- a/src/world/area_flo/flo_12/CC0E70.c +++ b/src/world/area_flo/flo_12/CC0E70.c @@ -14,6 +14,6 @@ INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024027C_CC10AC); INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_802405C0_CC13F0); -INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_80240614); +INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_80240614_CC1444); INCLUDE_ASM(s32, "world/area_flo/flo_12/CC0E70", func_8024064C_CC147C); diff --git a/src/world/area_flo/flo_13/CC3850.c b/src/world/area_flo/flo_13/CC3850.c index e3f5f7b14b..4b73c1d7c0 100644 --- a/src/world/area_flo/flo_13/CC3850.c +++ b/src/world/area_flo/flo_13/CC3850.c @@ -4,9 +4,9 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240040_CC3850); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802401C4_CC39D4); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240374); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240374_CC3B84); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024099C); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024099C_CC41AC); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80240A5C_CC426C); @@ -26,26 +26,26 @@ INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802414D0_CC4CE0); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802416BC_CC4ECC); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80241704); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80241704_CC4F14); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80241B68_CC5378); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80241DB8); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80241DB8_CC55C8); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242298_CC5AA8); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242314); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242314_CC5B24); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242448); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242448_CC5C58); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802425AC); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802425AC_CC5DBC); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024262C); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_8024262C_CC5E3C); INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80242A6C_CC627C); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80243368); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_80243368_CC6B78); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802433C0); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802433C0_CC6BD0); -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802434D4); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC3850", func_802434D4_CC6CE4); diff --git a/src/world/area_flo/flo_13/CC6DE0.c b/src/world/area_flo/flo_13/CC6DE0.c index 2e57a9887a..25519c74e6 100644 --- a/src/world/area_flo/flo_13/CC6DE0.c +++ b/src/world/area_flo/flo_13/CC6DE0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_flo/flo_13/CC6DE0", func_802435D0); +INCLUDE_ASM(s32, "world/area_flo/flo_13/CC6DE0", func_802435D0_CC6DE0); diff --git a/src/world/area_flo/flo_14/CCBE20.c b/src/world/area_flo/flo_14/CCBE20.c index 7e8417f870..d27a4f220a 100644 --- a/src/world/area_flo/flo_14/CCBE20.c +++ b/src/world/area_flo/flo_14/CCBE20.c @@ -6,27 +6,27 @@ INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80240CC0_CCBFD0); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802412E8_CCC5F8); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802413A8); +INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802413A8_CCC6B8); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802416EC_CCC9FC); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241764); +INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241764_CCCA74); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_802417D0_CCCAE0); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241904_CCCC14); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241968); +INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241968_CCCC78); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241CF8); +INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241CF8_CCD008); -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241E1C); +INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80241E1C_CCD12C); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242234); +INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242234_CCD544); INCLUDE_ASM(s32, "world/area_flo/flo_14/CCBE20", func_80242288_CCD598); diff --git a/src/world/area_flo/flo_14/CCD670.c b/src/world/area_flo/flo_14/CCD670.c index b84c29b540..a82b7c1022 100644 --- a/src/world/area_flo/flo_14/CCD670.c +++ b/src/world/area_flo/flo_14/CCD670.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_flo/flo_14/CCD670", func_80242360); +INCLUDE_ASM(s32, "world/area_flo/flo_14/CCD670", func_80242360_CCD670); diff --git a/src/world/area_flo/flo_16/CD1F10.c b/src/world/area_flo/flo_16/CD1F10.c index 39bbbf8ce4..f6f75d65f5 100644 --- a/src/world/area_flo/flo_16/CD1F10.c +++ b/src/world/area_flo/flo_16/CD1F10.c @@ -14,11 +14,11 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240200_CD2030); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802402AC_CD20DC); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802404FC); +INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802404FC_CD232C); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240528_CD2358); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240560); +INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240560_CD2390); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802405F0_CD2420); @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_802406E0_CD2510); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240C18_CD2A48); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240D58); +INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240D58_CD2B88); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD1F10", func_80240DA0_CD2BD0); diff --git a/src/world/area_flo/flo_16/CD2C80.c b/src/world/area_flo/flo_16/CD2C80.c index 9cdbe946b2..6365e8502d 100644 --- a/src/world/area_flo/flo_16/CD2C80.c +++ b/src/world/area_flo/flo_16/CD2C80.c @@ -18,14 +18,14 @@ INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241C44_CD3A74); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80241CA8_CD3AD8); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242038); +INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242038_CD3E68); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_8024215C); +INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_8024215C_CD3F8C); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242348_CD4178); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242478); +INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242478_CD42A8); INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_802426F8_CD4528); -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242754); +INCLUDE_ASM(s32, "world/area_flo/flo_16/CD2C80", func_80242754_CD4584); diff --git a/src/world/area_flo/flo_16/CD4770.c b/src/world/area_flo/flo_16/CD4770.c index 2bd7d61d87..3de56a289e 100644 --- a/src/world/area_flo/flo_16/CD4770.c +++ b/src/world/area_flo/flo_16/CD4770.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_flo/flo_16/CD4770", func_80242940); +INCLUDE_ASM(s32, "world/area_flo/flo_16/CD4770", func_80242940_CD4770); diff --git a/src/world/area_flo/flo_17/CD7350.c b/src/world/area_flo/flo_17/CD7350.c index 7b56d5a0bd..4fd539c0b0 100644 --- a/src/world/area_flo/flo_17/CD7350.c +++ b/src/world/area_flo/flo_17/CD7350.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240070_CD7350); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240220_CD7500); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240848); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240848_CD7B28); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240908_CD7BE8); @@ -14,30 +14,30 @@ INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240CC4_CD7FA4); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240D30_CD8010); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240E64); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240E64_CD8144); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80240EC8_CD81A8); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241258); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241258_CD8538); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_8024137C_CD865C); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241568); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241568_CD8848); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802415B0_CD8890); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241A14); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241A14_CD8CF4); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241C64); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80241C64_CD8F44); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80242144_CD9424); INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802421C0_CD94A0); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802422F4); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802422F4_CD95D4); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80242458); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80242458_CD9738); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802424D8); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_802424D8_CD97B8); -INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80242918); +INCLUDE_ASM(s32, "world/area_flo/flo_17/CD7350", func_80242918_CD9BF8); diff --git a/src/world/area_flo/flo_21/CE6700.c b/src/world/area_flo/flo_21/CE6700.c index f23dfcb639..000729b5ec 100644 --- a/src/world/area_flo/flo_21/CE6700.c +++ b/src/world/area_flo/flo_21/CE6700.c @@ -14,6 +14,6 @@ INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240708_CE6E08); INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_802407F4_CE6EF4); -INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240918); +INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240918_CE7018); INCLUDE_ASM(s32, "world/area_flo/flo_21/CE6700", func_80240B00_CE7200); diff --git a/src/world/area_flo/flo_21/CE7240.c b/src/world/area_flo/flo_21/CE7240.c index 4e6c0e8c6f..c519d8b38a 100644 --- a/src/world/area_flo/flo_21/CE7240.c +++ b/src/world/area_flo/flo_21/CE7240.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240B40); +INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240B40_CE7240); INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240CD0_CE73D0); diff --git a/src/world/area_flo/flo_25/CF2C10.c b/src/world/area_flo/flo_25/CF2C10.c index 3328f27bee..be1743b0e0 100644 --- a/src/world/area_flo/flo_25/CF2C10.c +++ b/src/world/area_flo/flo_25/CF2C10.c @@ -4,9 +4,9 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240040_CF2C10); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802401F0_CF2DC0); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240818); +INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240818_CF33E8); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802408D8); +INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_802408D8_CF34A8); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80240C1C_CF37EC); @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241228_CF3DF8); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_8024134C_CF3F1C); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241538); +INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241538_CF4108); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241668_CF4238); @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241944_CF4514); #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241D58); +INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241D58_CF4928); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241DAC_CF497C); @@ -42,6 +42,6 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241DE4_CF49B4); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241E80_CF4A50); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241F44); +INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241F44_CF4B14); INCLUDE_ASM(s32, "world/area_flo/flo_25/CF2C10", func_80241FB4_CF4B84); diff --git a/src/world/area_flo/flo_25/CF4BC0.c b/src/world/area_flo/flo_25/CF4BC0.c index 60cb839a4c..ccbf7db719 100644 --- a/src/world/area_flo/flo_25/CF4BC0.c +++ b/src/world/area_flo/flo_25/CF4BC0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_flo/flo_25/CF4BC0", func_80241FF0_CF4BC0); -INCLUDE_ASM(s32, "world/area_flo/flo_25/CF4BC0", func_80242060); +INCLUDE_ASM(s32, "world/area_flo/flo_25/CF4BC0", func_80242060_CF4C30); diff --git a/src/world/area_hos/hos_00/A0BD40.c b/src/world/area_hos/hos_00/A0BD40.c index 64d4f207ca..df709ea58f 100644 --- a/src/world/area_hos/hos_00/A0BD40.c +++ b/src/world/area_hos/hos_00/A0BD40.c @@ -2,8 +2,8 @@ INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_80240050_A0BD40); -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_80240170); +INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_80240170_A0BE60); -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_8024036C); +INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_8024036C_A0C05C); INCLUDE_ASM(s32, "world/area_hos/hos_00/A0BD40", func_80240584_A0C274); diff --git a/src/world/area_hos/hos_00/A0C4E0.c b/src/world/area_hos/hos_00/A0C4E0.c index 3b19074131..f67e8d73c2 100644 --- a/src/world/area_hos/hos_00/A0C4E0.c +++ b/src/world/area_hos/hos_00/A0C4E0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_8024091C_A0C60C); INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_80240994_A0C684); -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_80240A54); +INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_80240A54_A0C744); INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C4E0", func_80240B20_A0C810); diff --git a/src/world/area_hos/hos_00/A0C930.c b/src/world/area_hos/hos_00/A0C930.c index c00b59e56f..99a62f5710 100644 --- a/src/world/area_hos/hos_00/A0C930.c +++ b/src/world/area_hos/hos_00/A0C930.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C930", func_80240C40); +INCLUDE_ASM(s32, "world/area_hos/hos_00/A0C930", func_80240C40_A0C930); diff --git a/src/world/area_hos/hos_01/A10880.c b/src/world/area_hos/hos_01/A10880.c index 844624eb22..fd974ca7d7 100644 --- a/src/world/area_hos/hos_01/A10880.c +++ b/src/world/area_hos/hos_01/A10880.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_80240120_A109A0); INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_8024031C_A10B9C); -INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_80240534); +INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_80240534_A10DB4); INCLUDE_ASM(s32, "world/area_hos/hos_01/A10880", func_80240768_A10FE8); diff --git a/src/world/area_hos/hos_01/A11020.c b/src/world/area_hos/hos_01/A11020.c index baf73a4d5a..17e9265fc3 100644 --- a/src/world/area_hos/hos_01/A11020.c +++ b/src/world/area_hos/hos_01/A11020.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_802407A0_A11020); -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_802408C4); +INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_802408C4_A11144); INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240AAC_A1132C); @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240B64_A113E4); INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240BB8_A11438); -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C08); +INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C08_A11488); INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C34_A114B4); @@ -20,4 +20,4 @@ INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240C84_A11504); INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240CB0_A11530); -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240CDC); +INCLUDE_ASM(s32, "world/area_hos/hos_01/A11020", func_80240CDC_A1155C); diff --git a/src/world/area_hos/hos_01/A11650.c b/src/world/area_hos/hos_01/A11650.c index 9d37bc50d9..0616297c3c 100644 --- a/src/world/area_hos/hos_01/A11650.c +++ b/src/world/area_hos/hos_01/A11650.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DD0_A11650); -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DEC); +INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DEC_A1166C); diff --git a/src/world/area_hos/hos_02/A16220.c b/src/world/area_hos/hos_02/A16220.c index 3845b94b27..c990765f53 100644 --- a/src/world/area_hos/hos_02/A16220.c +++ b/src/world/area_hos/hos_02/A16220.c @@ -8,11 +8,11 @@ INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_8024030C_A1652C); INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240434_A16654); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240610); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240610_A16830); INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240904_A16B24); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240BFC); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240BFC_A16E1C); INCLUDE_ASM(s32, "world/area_hos/hos_02/A16220", func_80240EF4_A17114); diff --git a/src/world/area_hos/hos_02/A17210.c b/src/world/area_hos/hos_02/A17210.c index 549251c8ee..7f1ab0da13 100644 --- a/src/world/area_hos/hos_02/A17210.c +++ b/src/world/area_hos/hos_02/A17210.c @@ -1,31 +1,31 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80240FF0); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80240FF0_A17210); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802411A0); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802411A0_A173C0); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802417C8); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802417C8_A179E8); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241888); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241888_A17AA8); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241BCC); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241BCC_A17DEC); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241C44); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241C44_A17E64); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241CB0); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241CB0_A17ED0); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241DE4); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241DE4_A18004); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241E48); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80241E48_A18068); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802421D8); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802421D8_A183F8); INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802422FC_A1851C); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802424E8); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802424E8_A18708); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80242618); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80242618_A18838); INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_80242898_A18AB8); -INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802428F4); +INCLUDE_ASM(s32, "world/area_hos/hos_02/A17210", func_802428F4_A18B14); diff --git a/src/world/area_hos/hos_03/A1B130.c b/src/world/area_hos/hos_03/A1B130.c index 5f0355f6bd..d58fd633f4 100644 --- a/src/world/area_hos/hos_03/A1B130.c +++ b/src/world/area_hos/hos_03/A1B130.c @@ -8,8 +8,8 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024033C_A1B43C); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_8024060C_A1B70C); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_802407E8); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_802407E8_A1B8E8); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240928); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240928_A1BA28); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240A50); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1B130", func_80240A50_A1BB50); diff --git a/src/world/area_hos/hos_03/A1BB70.c b/src/world/area_hos/hos_03/A1BB70.c index 155c9fbf6c..20fb0a1f23 100644 --- a/src/world/area_hos/hos_03/A1BB70.c +++ b/src/world/area_hos/hos_03/A1BB70.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BB70", func_80240A70_A1BB70); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BB70", func_80240AE0); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BB70", func_80240AE0_A1BBE0); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index ec9ee31936..207efcce78 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -4,29 +4,29 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240CB0_A1BDB0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80240E60_A1BF60); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241488); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241488_A1C588); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241548); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241548_A1C648); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024188C_A1C98C); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241904); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241904_A1CA04); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241970); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241970_A1CA70); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241AA4); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241AA4_A1CBA4); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241B08); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241B08_A1CC08); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241E98); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241E98_A1CF98); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421A8); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421A8_A1D2A8); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421C8); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421C8_A1D2C8); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024226C_A1D36C); @@ -34,53 +34,53 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802422EC_A1D3EC); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024231C_A1D41C); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242348); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242348_A1D448); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242368); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242368_A1D468); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802423BC); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802423BC_A1D4BC); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242438); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242438_A1D538); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024246C); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024246C_A1D56C); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024249C); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024249C_A1D59C); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425BC); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425BC_A1D6BC); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425D0); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425D0_A1D6D0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242804_A1D904); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242850); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242850_A1D950); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242870_A1D970); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802428D0); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802428D0_A1D9D0); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242A1C); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242A1C_A1DB1C); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242B90_A1DC90); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242C14); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242C14_A1DD14); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242E2C_A1DF2C); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242EE0); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242EE0_A1DFE0); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242F14); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242F14_A1E014); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242F94); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242F94_A1E094); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FAC); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FAC_A1E0AC); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FC8); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FC8_A1E0C8); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FE0_A1E0E0); @@ -92,10 +92,10 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243124_A1E224); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243324); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243324_A1E424); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802433B4); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802433B4_A1E4B4); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C_A1E59C); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243508); +INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243508_A1E608); diff --git a/src/world/area_hos/hos_04/A26ED0.c b/src/world/area_hos/hos_04/A26ED0.c index 3e0673996d..d68da98bfb 100644 --- a/src/world/area_hos/hos_04/A26ED0.c +++ b/src/world/area_hos/hos_04/A26ED0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240000_A26ED0); INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_80240154_A27024); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_802402A8); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_802402A8_A27178); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_802403CC); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A26ED0", func_802403CC_A2729C); diff --git a/src/world/area_hos/hos_04/A27490.c b/src/world/area_hos/hos_04/A27490.c index 4decfdde5b..faff5ef21f 100644 --- a/src/world/area_hos/hos_04/A27490.c +++ b/src/world/area_hos/hos_04/A27490.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_hos/hos_04/A27490", func_802405C0); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A27490", func_802405C0_A27490); diff --git a/src/world/area_hos/hos_04/A274B0.c b/src/world/area_hos/hos_04/A274B0.c index 1154a77f95..9ace50092f 100644 --- a/src/world/area_hos/hos_04/A274B0.c +++ b/src/world/area_hos/hos_04/A274B0.c @@ -2,16 +2,16 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802405E0_A274B0); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240654); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240654_A27524); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_8024068C); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_8024068C_A2755C); INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240694_A27564); INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240734_A27604); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802408F8); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802408F8_A277C8); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802409B0); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802409B0_A27880); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240A84); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240A84_A27954); diff --git a/src/world/area_hos/hos_04/A27A30.c b/src/world/area_hos/hos_04/A27A30.c index a69c6b10ed..a7162e4b84 100644 --- a/src/world/area_hos/hos_04/A27A30.c +++ b/src/world/area_hos/hos_04/A27A30.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_hos/hos_04/A27A30", func_80240B60); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A27A30", func_80240B60_A27A30); diff --git a/src/world/area_hos/hos_04/A27AA0.c b/src/world/area_hos/hos_04/A27AA0.c index 2497f05123..0d93ecd20c 100644 --- a/src/world/area_hos/hos_04/A27AA0.c +++ b/src/world/area_hos/hos_04/A27AA0.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240BD0_A27AA0); -INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E40); +INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E40_A27D10); INCLUDE_ASM(s32, "world/area_hos/hos_04/A27AA0", func_80240E6C_A27D3C); diff --git a/src/world/area_hos/hos_05/A2A240.c b/src/world/area_hos/hos_05/A2A240.c index d4e4e6d26a..0ab541973d 100644 --- a/src/world/area_hos/hos_05/A2A240.c +++ b/src/world/area_hos/hos_05/A2A240.c @@ -4,12 +4,12 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240000_A2A240); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240124_A2A364); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_802402F8); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_802402F8_A2A538); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_8024041C_A2A65C); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240604); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240604_A2A844); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240634); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240634_A2A874); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240690); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2A240", func_80240690_A2A8D0); diff --git a/src/world/area_hos/hos_05/A2AA70.c b/src/world/area_hos/hos_05/A2AA70.c index e67bf61651..885c59623b 100644 --- a/src/world/area_hos/hos_05/A2AA70.c +++ b/src/world/area_hos/hos_05/A2AA70.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AA70", func_80240830); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AA70", func_80240830_A2AA70); diff --git a/src/world/area_hos/hos_05/A2AAC0.c b/src/world/area_hos/hos_05/A2AAC0.c index 1f8df0e48d..8ec19f8f30 100644 --- a/src/world/area_hos/hos_05/A2AAC0.c +++ b/src/world/area_hos/hos_05/A2AAC0.c @@ -2,9 +2,9 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240880_A2AAC0); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802409C4); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802409C4_A2AC04); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240D54); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240D54_A2AF94); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240DA0_A2AFE0); @@ -12,80 +12,80 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240DF8_A2B038); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240E30_A2B070); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240E50); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240E50_A2B090); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240F30_A2B170); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240F88); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240F88_A2B1C8); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80240FE0_A2B220); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241044); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241044_A2B284); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802410E4); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802410E4_A2B324); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241274); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241274_A2B4B4); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024146C_A2B6AC); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802416BC); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802416BC_A2B8FC); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241850); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241850_A2BA90); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802419F4); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802419F4_A2BC34); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241B40); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241B40_A2BD80); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241C54); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241C54_A2BE94); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241D08_A2BF48); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241D7C); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241D7C_A2BFBC); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241F54); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80241F54_A2C194); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", update_heroes_start_turn_A2C264); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802421E0); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802421E0_A2C420); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802422A0); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802422A0_A2C4E0); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802423D4); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802423D4_A2C614); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802425A0); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802425A0_A2C7E0); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80242704); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80242704_A2C944); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802428C8); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802428C8_A2CB08); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80242F74_A2D1B4); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024301C); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024301C_A2D25C); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243100); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243100_A2D340); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243164); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243164_A2D3A4); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024370C); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024370C_A2D94C); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243758); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243758_A2D998); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243CC0); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243CC0_A2DF00); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243ED0); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243ED0_A2E110); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243FC4); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80243FC4_A2E204); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802440D0); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802440D0_A2E310); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244454); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244454_A2E694); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802444E8); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_802444E8_A2E728); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244550); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244550_A2E790); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244774); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244774_A2E9B4); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024486C); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_8024486C_A2EAAC); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244934); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2AAC0", func_80244934_A2EB74); diff --git a/src/world/area_hos/hos_05/A2EC30.c b/src/world/area_hos/hos_05/A2EC30.c index cf61cad8f0..e4f78d908b 100644 --- a/src/world/area_hos/hos_05/A2EC30.c +++ b/src/world/area_hos/hos_05/A2EC30.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_802449F0); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_802449F0_A2EC30); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_80244C60); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_80244C60_A2EEA0); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_80244C8C); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EC30", func_80244C8C_A2EECC); diff --git a/src/world/area_hos/hos_05/A2EF00.c b/src/world/area_hos/hos_05/A2EF00.c index 493b1619cb..0a3e7d2fa2 100644 --- a/src/world/area_hos/hos_05/A2EF00.c +++ b/src/world/area_hos/hos_05/A2EF00.c @@ -2,24 +2,24 @@ INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", pause_tabs_draw_badges_A2EF00); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80244DE4); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80244DE4_A2F024); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80244FB8); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80244FB8_A2F1F8); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802450DC); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802450DC_A2F31C); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802452C4); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802452C4_A2F504); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_8024564C); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_8024564C_A2F88C); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_8024569C); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_8024569C_A2F8DC); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802456C8_A2F908); INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80245718_A2F958); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80245744); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80245744_A2F984); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80245794); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_80245794_A2F9D4); -INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802457C0); +INCLUDE_ASM(s32, "world/area_hos/hos_05/A2EF00", func_802457C0_A2FA00); diff --git a/src/world/area_hos/hos_06/A397F0.c b/src/world/area_hos/hos_06/A397F0.c index 9a3f10c245..1c44cb553d 100644 --- a/src/world/area_hos/hos_06/A397F0.c +++ b/src/world/area_hos/hos_06/A397F0.c @@ -10,20 +10,20 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240310_A397F0); INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240654_A39B34); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406A8_A39B88); INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802406E0_A39BC0); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_8024077C); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_8024077C_A39C5C); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_8024086C); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_8024086C_A39D4C); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802409F8); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_802409F8_A39ED8); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A3C); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A3C_A39F1C); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A68); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A68_A39F48); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A94); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240A94_A39F74); INCLUDE_ASM(s32, "world/area_hos/hos_06/A397F0", func_80240AD0_A39FB0); diff --git a/src/world/area_hos/hos_06/A3A230.c b/src/world/area_hos/hos_06/A3A230.c index e04cc2dcc0..11ee54957c 100644 --- a/src/world/area_hos/hos_06/A3A230.c +++ b/src/world/area_hos/hos_06/A3A230.c @@ -4,38 +4,38 @@ #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240F7C_A3A45C); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80240FD0_A3A4B0); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241008); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241008_A3A4E8); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802410A4); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802410A4_A3A584); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802411BC); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802411BC_A3A69C); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802411F0); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802411F0_A3A6D0); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_8024126C); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_8024126C_A3A74C); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802414E4); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802414E4_A3A9C4); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241668); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241668_A3AB48); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802417EC_A3ACCC); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241860); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241860_A3AD40); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802418A4_A3AD84); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802418E8); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_802418E8_A3ADC8); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241A58); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241A58_A3AF38); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241B74_A3B054); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241CCC_A3B1AC); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241F98); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3A230", func_80241F98_A3B478); diff --git a/src/world/area_hos/hos_06/A3B4B0.c b/src/world/area_hos/hos_06/A3B4B0.c index 64f4ee3729..7ea441af8d 100644 --- a/src/world/area_hos/hos_06/A3B4B0.c +++ b/src/world/area_hos/hos_06/A3B4B0.c @@ -4,12 +4,12 @@ INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80241FD0_A3B4B0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_802420E8); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_802420E8_A3B5C8); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242238); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242238_A3B718); INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_8024228C_A3B76C); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_802424CC); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_802424CC_A3B9AC); -INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242534); +INCLUDE_ASM(s32, "world/area_hos/hos_06/A3B4B0", func_80242534_A3BA14); diff --git a/src/world/area_hos/hos_10/A3F760.c b/src/world/area_hos/hos_10/A3F760.c index 494f9570dd..a5bbd833e3 100644 --- a/src/world/area_hos/hos_10/A3F760.c +++ b/src/world/area_hos/hos_10/A3F760.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_80240020_A3F760); -INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_80240144); +INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_80240144_A3F884); INCLUDE_ASM(s32, "world/area_hos/hos_10/A3F760", func_8024032C_A3FA6C); diff --git a/src/world/area_hos/hos_10/A3FEB0.c b/src/world/area_hos/hos_10/A3FEB0.c index 200b5b96fb..cecf29fb4d 100644 --- a/src/world/area_hos/hos_10/A3FEB0.c +++ b/src/world/area_hos/hos_10/A3FEB0.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FEB0", func_80240B44_A40284); INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FEB0", func_80240B98_A402D8); -INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FEB0", func_80240BEC); +INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FEB0", func_80240BEC_A4032C); INCLUDE_ASM(s32, "world/area_hos/hos_10/A3FEB0", func_80240BFC_A4033C); diff --git a/src/world/area_isk/isk_04/97B670.c b/src/world/area_isk/isk_04/97B670.c index 76df6567b8..1be6bdb3ae 100644 --- a/src/world/area_isk/isk_04/97B670.c +++ b/src/world/area_isk/isk_04/97B670.c @@ -4,13 +4,13 @@ INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_80240040_97B670); INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802400BC_97B6EC); -INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802401F0); +INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802401F0_97B820); INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_80240354_97B984); -INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802403D4); +INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_802403D4_97BA04); -INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_80240814); +INCLUDE_ASM(s32, "world/area_isk/isk_04/97B670", func_80240814_97BE44); #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_isk/isk_05/97DAD0.c b/src/world/area_isk/isk_05/97DAD0.c index bf4dc8c905..19eac4487d 100644 --- a/src/world/area_isk/isk_05/97DAD0.c +++ b/src/world/area_isk/isk_05/97DAD0.c @@ -2,42 +2,42 @@ INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240000_97DAD0); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240230); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240230_97DD00); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240568); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240568_97E038); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240628_97E0F8); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802407CC); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802407CC_97E29C); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802408AC); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802408AC_97E37C); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240BAC); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240BAC_97E67C); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240BF0_97E6C0); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240E14); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240E14_97E8E4); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240EA8_97E978); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240F3C); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80240F3C_97EA0C); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241108); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241108_97EBD8); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802411F8); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802411F8_97ECC8); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802415C0); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_802415C0_97F090); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241610); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241610_97F0E0); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241B28); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241B28_97F5F8); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241C34); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241C34_97F704); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241C5C); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241C5C_97F72C); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241D44); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241D44_97F814); INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241DF8_97F8C8); -INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241E24); +INCLUDE_ASM(s32, "world/area_isk/isk_05/97DAD0", func_80241E24_97F8F4); diff --git a/src/world/area_isk/isk_07/982440.c b/src/world/area_isk/isk_07/982440.c index 917a5f008e..e56a99ef45 100644 --- a/src/world/area_isk/isk_07/982440.c +++ b/src/world/area_isk/isk_07/982440.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_isk/isk_07/982440", func_80240000_982440); -INCLUDE_ASM(s32, "world/area_isk/isk_07/982440", func_80240014); +INCLUDE_ASM(s32, "world/area_isk/isk_07/982440", func_80240014_982454); diff --git a/src/world/area_isk/isk_08/984E30.c b/src/world/area_isk/isk_08/984E30.c index ba9dbe0f54..cf147abdab 100644 --- a/src/world/area_isk/isk_08/984E30.c +++ b/src/world/area_isk/isk_08/984E30.c @@ -2,16 +2,16 @@ INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_80240000_984E30); -INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_8024007C); +INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_8024007C_984EAC); INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_802401B0_984FE0); INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_80240314_985144); -INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_80240394); +INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_80240394_9851C4); -INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_802407D4); +INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_802407D4_985604); #include "world/common/AwaitPlayerNearNpc.inc.c" -INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_80240874); +INCLUDE_ASM(s32, "world/area_isk/isk_08/984E30", func_80240874_9856A4); diff --git a/src/world/area_isk/isk_10/988B60.c b/src/world/area_isk/isk_10/988B60.c index 3d7f808325..3720b759c8 100644 --- a/src/world/area_isk/isk_10/988B60.c +++ b/src/world/area_isk/isk_10/988B60.c @@ -2,38 +2,38 @@ INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240000_988B60); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024001C); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024001C_988B7C); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024003C); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024003C_988B9C); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240068); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240068_988BC8); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802400D4); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802400D4_988C34); INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240120_988C80); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802401CC); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802401CC_988D2C); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024041C); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_8024041C_988F7C); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240448); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240448_988FA8); INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240480_988FE0); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240510); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240510_989070); INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240544_9890A4); INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_802405A8_989108); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240600); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240600_989160); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240B38); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240B38_989698); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240C78); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240C78_9897D8); INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240CC0_989820); -INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240D08); +INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240D08_989868); INCLUDE_ASM(s32, "world/area_isk/isk_10/988B60", func_80240D38_989898); diff --git a/src/world/area_isk/isk_13/98F7E0.c b/src/world/area_isk/isk_13/98F7E0.c index e8c628b7a8..9f001db4a4 100644 --- a/src/world/area_isk/isk_13/98F7E0.c +++ b/src/world/area_isk/isk_13/98F7E0.c @@ -30,14 +30,14 @@ INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_802415C0_990DA0); INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241610_990DF0); -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241BA8); +INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241BA8_991388); -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241D08); +INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241D08_9914E8); INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241D38_991518); -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241E34); +INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241E34_991614); -INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241EF8); +INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80241EF8_9916D8); INCLUDE_ASM(s32, "world/area_isk/isk_13/98F7E0", func_80242044_991824); diff --git a/src/world/area_isk/isk_14/992730.c b/src/world/area_isk/isk_14/992730.c index e9364f1e6f..b850a78aa0 100644 --- a/src/world/area_isk/isk_14/992730.c +++ b/src/world/area_isk/isk_14/992730.c @@ -30,10 +30,10 @@ INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_802415C0_993CF0); INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80241610_993D40); -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80241AF0); +INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80241AF0_994220); -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80241BC4); +INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80241BC4_9942F4); INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80241BEC_99431C); -INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80241CA0); +INCLUDE_ASM(s32, "world/area_isk/isk_14/992730", func_80241CA0_9943D0); diff --git a/src/world/area_isk/isk_16/9951F0.c b/src/world/area_isk/isk_16/9951F0.c index 17eac4b6f0..0423f3fdb6 100644 --- a/src/world/area_isk/isk_16/9951F0.c +++ b/src/world/area_isk/isk_16/9951F0.c @@ -4,10 +4,10 @@ INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_80240000_9951F0); INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_8024004C_99523C); -INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802401AC); +INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802401AC_99539C); INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802405BC_9957AC); -INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802405FC); +INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_802405FC_9957EC); -INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_80240708); +INCLUDE_ASM(s32, "world/area_isk/isk_16/9951F0", func_80240708_9958F8); diff --git a/src/world/area_isk/isk_16/9959F0.c b/src/world/area_isk/isk_16/9959F0.c index 040f4e32ff..a82a0f44ff 100644 --- a/src/world/area_isk/isk_16/9959F0.c +++ b/src/world/area_isk/isk_16/9959F0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_isk/isk_16/9959F0", func_80240800_9959F0); -INCLUDE_ASM(s32, "world/area_isk/isk_16/9959F0", func_80240924); +INCLUDE_ASM(s32, "world/area_isk/isk_16/9959F0", func_80240924_995B14); diff --git a/src/world/area_iwa/iwa_00/90CEF0.c b/src/world/area_iwa/iwa_00/90CEF0.c index 1b3ca84d72..770a6fa437 100644 --- a/src/world/area_iwa/iwa_00/90CEF0.c +++ b/src/world/area_iwa/iwa_00/90CEF0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CEF0", func_802402B0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_00/90CEF0", func_802402B0_90CEF0); diff --git a/src/world/area_iwa/iwa_01/90F6B0.c b/src/world/area_iwa/iwa_01/90F6B0.c index 3c662bc819..1de6f361fe 100644 --- a/src/world/area_iwa/iwa_01/90F6B0.c +++ b/src/world/area_iwa/iwa_01/90F6B0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90F6B0", func_80240000_90F6B0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90F6B0", func_80240398); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90F6B0", func_80240398_90FA48); diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index ce65c05211..e1c5a8e557 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -1,14 +1,14 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240520); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240520_90FBD0); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240710_90FDC0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240854); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240854_90FF04); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240954); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240954_910004); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240998); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240998_910048); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240A38_9100E8); @@ -18,17 +18,17 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240FB8_910668); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241414_910AC4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802415E0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802415E0_910C90); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802416F0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802416F0_910DA0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_8024192C); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_8024192C_910FDC); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802419C0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802419C0_911070); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241A4C); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241A4C_9110FC); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241B74); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241B74_911224); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241C78_911328); @@ -40,34 +40,34 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241F6C_91161C); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_8024228C_91193C); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802422C4); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802422C4_911974); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242424_911AD4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242498); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242498_911B48); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802425C8); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802425C8_911C78); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242664); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242664_911D14); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802426EC); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802426EC_911D9C); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242794); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242794_911E44); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242908); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242908_911FB8); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242958); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242958_912008); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242AF8); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242AF8_9121A8); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242C48); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242C48_9122F8); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242CF4); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242CF4_9123A4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242E2C); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242E2C_9124DC); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242EA8); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242EA8_912558); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F10); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F10_9125C0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F54); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F54_912604); diff --git a/src/world/area_iwa/iwa_01/912960.c b/src/world/area_iwa/iwa_01/912960.c index c61c7f6353..88a76a7f9e 100644 --- a/src/world/area_iwa/iwa_01/912960.c +++ b/src/world/area_iwa/iwa_01/912960.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/912960", func_802432B0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_01/912960", func_802432B0_912960); diff --git a/src/world/area_iwa/iwa_02/915D70.c b/src/world/area_iwa/iwa_02/915D70.c index 864ee03388..1e4ec43bdb 100644 --- a/src/world/area_iwa/iwa_02/915D70.c +++ b/src/world/area_iwa/iwa_02/915D70.c @@ -12,13 +12,13 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_802403A0_916110); INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240428_916198); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_802404D0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_802404D0_916240); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240644); +INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240644_9163B4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240694); +INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240694_916404); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240834); +INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240834_9165A4); INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240984_9166F4); @@ -26,12 +26,12 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240A30_9167A0); INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240B68_9168D8); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240BE4); +INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240BE4_916954); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C4C); +INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C4C_9169BC); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C90); +INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240C90_916A00); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240FE0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80240FE0_916D50); -INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80241094); +INCLUDE_ASM(s32, "world/area_iwa/iwa_02/915D70", func_80241094_916E04); diff --git a/src/world/area_iwa/iwa_03/918EF0.c b/src/world/area_iwa/iwa_03/918EF0.c index 5767d971c5..0f6a8b3da5 100644 --- a/src/world/area_iwa/iwa_03/918EF0.c +++ b/src/world/area_iwa/iwa_03/918EF0.c @@ -8,28 +8,28 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240514_9190C4); INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240644_9191F4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_802406E0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_802406E0_919290); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240768); +INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240768_919318); INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240810_9193C0); INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240984_919534); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_802409D4); +INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_802409D4_919584); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240B74); +INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240B74_919724); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240CC4); +INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240CC4_919874); INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240D70_919920); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240EA8); +INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240EA8_919A58); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240F24); +INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240F24_919AD4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240F8C); +INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240F8C_919B3C); -INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240FD0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80240FD0_919B80); INCLUDE_ASM(s32, "world/area_iwa/iwa_03/918EF0", func_80241320_919ED0); diff --git a/src/world/area_iwa/iwa_04/91B8E0.c b/src/world/area_iwa/iwa_04/91B8E0.c index c94a55bc4a..ab34e2897b 100644 --- a/src/world/area_iwa/iwa_04/91B8E0.c +++ b/src/world/area_iwa/iwa_04/91B8E0.c @@ -2,38 +2,38 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240000_91B8E0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240080); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240080_91B960); INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_802401E0_91BAC0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240254); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240254_91BB34); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240384); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240384_91BC64); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240420); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240420_91BD00); INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_802404A8_91BD88); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240550); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240550_91BE30); INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_802406C4_91BFA4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240714); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240714_91BFF4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_802408B4); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_802408B4_91C194); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240A04); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240A04_91C2E4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240AB0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240AB0_91C390); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240BE8); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240BE8_91C4C8); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240C64); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240C64_91C544); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240CCC); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240CCC_91C5AC); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240D10); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80240D10_91C5F0); INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_80241060_91C940); -INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_8024107C); +INCLUDE_ASM(s32, "world/area_iwa/iwa_04/91B8E0", func_8024107C_91C95C); diff --git a/src/world/area_iwa/iwa_10/91E5B0.c b/src/world/area_iwa/iwa_10/91E5B0.c index 9d8df67c47..f2f7b867ba 100644 --- a/src/world/area_iwa/iwa_10/91E5B0.c +++ b/src/world/area_iwa/iwa_10/91E5B0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E5B0", func_80240040_91E5B0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E5B0", func_802400F4); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E5B0", func_802400F4_91E664); diff --git a/src/world/area_iwa/iwa_10/91E6D0.c b/src/world/area_iwa/iwa_10/91E6D0.c index e3c1f93751..4f5a3e32b4 100644 --- a/src/world/area_iwa/iwa_10/91E6D0.c +++ b/src/world/area_iwa/iwa_10/91E6D0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240160_91E6D0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802402F0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802402F0_91E860); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024030C_91E87C); @@ -16,13 +16,13 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240410_91E980); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802404BC_91EA2C); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024070C); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_8024070C_91EC7C); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240738); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240738_91ECA8); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240770_91ECE0); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240800); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240800_91ED70); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240834_91EDA4); @@ -30,10 +30,10 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240898_91EE08); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_802408F0_91EE60); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240E28); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240E28_91F398); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240F68_91F4D8); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240FB0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240FB0_91F520); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240FF8); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91E6D0", func_80240FF8_91F568); diff --git a/src/world/area_iwa/iwa_10/91F5A0.c b/src/world/area_iwa/iwa_10/91F5A0.c index 8207525268..c7c7c05d26 100644 --- a/src/world/area_iwa/iwa_10/91F5A0.c +++ b/src/world/area_iwa/iwa_10/91F5A0.c @@ -1,13 +1,13 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241030); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241030_91F5A0); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_802413E0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_802413E0_91F950); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241434); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_80241434_91F9A4); -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_8024146C); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91F5A0", func_8024146C_91F9DC); diff --git a/src/world/area_iwa/iwa_10/91FA80.c b/src/world/area_iwa/iwa_10/91FA80.c index ccda83136d..c1802acaa0 100644 --- a/src/world/area_iwa/iwa_10/91FA80.c +++ b/src/world/area_iwa/iwa_10/91FA80.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91FA80", func_80241510); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91FA80", func_80241510_91FA80); diff --git a/src/world/area_iwa/iwa_10/91FB20.c b/src/world/area_iwa/iwa_10/91FB20.c index d4c74e1b27..619662f4c3 100644 --- a/src/world/area_iwa/iwa_10/91FB20.c +++ b/src/world/area_iwa/iwa_10/91FB20.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91FB20", func_802415B0); +INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91FB20", func_802415B0_91FB20); INCLUDE_ASM(s32, "world/area_iwa/iwa_10/91FB20", func_80241620_91FB90); diff --git a/src/world/area_iwa/iwa_11/926C70.c b/src/world/area_iwa/iwa_11/926C70.c index 17771e7100..6848c6fcd4 100644 --- a/src/world/area_iwa/iwa_11/926C70.c +++ b/src/world/area_iwa/iwa_11/926C70.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_iwa/iwa_11/926C70", func_80240280); +INCLUDE_ASM(s32, "world/area_iwa/iwa_11/926C70", func_80240280_926C70); diff --git a/src/world/area_jan/jan_00/B20540.c b/src/world/area_jan/jan_00/B20540.c index 94b389c691..4334edd8f0 100644 --- a/src/world/area_jan/jan_00/B20540.c +++ b/src/world/area_jan/jan_00/B20540.c @@ -18,15 +18,15 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802403F4_B20934); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240738_B20C78); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024078C); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_8024078C_B20CCC); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_802407C4_B20D04); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240860); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240860_B20DA0); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240950_B20E90); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240ADC); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240ADC_B2101C); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240B20_B21060); @@ -34,6 +34,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240B4C_B2108C); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240CF8_B21238); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240F14); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80240F14_B21454); INCLUDE_ASM(s32, "world/area_jan/jan_00/B20540", func_80241134_B21674); diff --git a/src/world/area_jan/jan_00/B216E0.c b/src/world/area_jan/jan_00/B216E0.c index 9cf68a1a2f..54e3e4ec46 100644 --- a/src/world/area_jan/jan_00/B216E0.c +++ b/src/world/area_jan/jan_00/B216E0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802411A0_B216E0); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802411EC); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802411EC_B2172C); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_80241338); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_80241338_B21878); INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802415B0_B21AF0); INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_80241654_B21B94); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802416F8); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_802416F8_B21C38); -INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_80241868); +INCLUDE_ASM(s32, "world/area_jan/jan_00/B216E0", func_80241868_B21DA8); diff --git a/src/world/area_jan/jan_01/B28030.c b/src/world/area_jan/jan_01/B28030.c index 911a5b4496..9f9aebdc07 100644 --- a/src/world/area_jan/jan_01/B28030.c +++ b/src/world/area_jan/jan_01/B28030.c @@ -10,9 +10,9 @@ INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240340_B28370); INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240570_B285A0); -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_802408A8); +INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_802408A8_B288D8); -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240968); +INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240968_B28998); INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240B0C_B28B3C); @@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80240F30_B28F60); INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80241154_B29184); -INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80241170); +INCLUDE_ASM(s32, "world/area_jan/jan_01/B28030", func_80241170_B291A0); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 9210b5e919..04b91d3809 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240430); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240430_B2C8A0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240588); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240588_B2C9F8); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240830_B2CCA0); @@ -16,13 +16,13 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240BD4_B2D044); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240C4C_B2D0BC); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240D7C); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240D7C_B2D1EC); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240E9C_B2D30C); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240F04_B2D374); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240FC4); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80240FC4_B2D434); #include "world/common/GetNpcCollisionHeight.inc.c" @@ -32,25 +32,25 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802414EC_B2D95C); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241540_B2D9B0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241578_B2D9E8); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024172C); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024172C_B2DB9C); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241740); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241740_B2DBB0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241974); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241974_B2DDE4); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802419C0_B2DE30); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802419E0); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802419E0_B2DE50); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241A40); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241A40_B2DEB0); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241B8C_B2DFFC); @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241D00_B2E170); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241D84_B2E1F4); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241F9C); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241F9C_B2E40C); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242050_B2E4C0); @@ -66,26 +66,26 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242084_B2E4F4); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242104_B2E574); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024211C); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024211C_B2E58C); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242138); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242138_B2E5A8); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242150_B2E5C0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242180); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242180_B2E5F0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802421F4); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802421F4_B2E664); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242294); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242294_B2E704); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242494); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242494_B2E904); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242524); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242524_B2E994); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C_B2EA7C); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242678); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242678_B2EAE8); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802426A8); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802426A8_B2EB18); diff --git a/src/world/area_jan/jan_02/B2EB50.c b/src/world/area_jan/jan_02/B2EB50.c index ef7a3f8f03..3c02b9f1a0 100644 --- a/src/world/area_jan/jan_02/B2EB50.c +++ b/src/world/area_jan/jan_02/B2EB50.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2EB50", func_802426E0); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2EB50", func_802426E0_B2EB50); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2EB50", func_80242750); +INCLUDE_ASM(s32, "world/area_jan/jan_02/B2EB50", func_80242750_B2EBC0); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 93a62caf3a..52ee00e0bb 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -18,15 +18,15 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240404_B34FD4); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802405EC_B351BC); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240620); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240620_B351F0); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240778); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240778_B35348); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240A20); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240A20_B355F0); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240AE0_B356B0); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240C9C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240C9C_B3586C); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240D50_B35920); @@ -34,29 +34,29 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240DC4_B35994); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240E3C_B35A0C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240F6C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80240F6C_B35B3C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024108C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024108C_B35C5C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802410F4); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802410F4_B35CC4); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414B0_B36080); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414D0); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414D0_B360A0); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574_B36144); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802415F4); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802415F4_B361C4); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241624); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241624_B361F4); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241650_B36220); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241670); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241670_B36240); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802416C4_B36294); @@ -70,37 +70,37 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417A4_B36374); #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802419D8_B365A8); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A2C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A2C_B365FC); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241A64_B36634); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B00_B366D0); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CB4); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CB4_B36884); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CC8_B36898); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241EFC); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241EFC_B36ACC); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F48); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F48_B36B18); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F68); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F68_B36B38); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241FC8_B36B98); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242114); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242114_B36CE4); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242288); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242288_B36E58); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024230C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024230C_B36EDC); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242524_B370F4); @@ -108,36 +108,36 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802425D8_B371A8); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024260C_B371DC); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024268C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024268C_B3725C); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426A4_B37274); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426C0); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426C0_B37290); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426D8); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426D8_B372A8); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242708_B372D8); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024277C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024277C_B3734C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024281C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024281C_B373EC); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242A1C_B375EC); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242AAC); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242AAC_B3767C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242C00); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242C00_B377D0); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242C30); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242C30_B37800); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242D20); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242D20_B378F0); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EAC_B37A7C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EF0); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242EF0_B37AC0); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242F1C); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242F1C_B37AEC); diff --git a/src/world/area_jan/jan_03/B37B70.c b/src/world/area_jan/jan_03/B37B70.c index 3f19b7a635..11315f8bb4 100644 --- a/src/world/area_jan/jan_03/B37B70.c +++ b/src/world/area_jan/jan_03/B37B70.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B37B70", func_80242FA0); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B37B70", func_80242FA0_B37B70); diff --git a/src/world/area_jan/jan_03/B37C20.c b/src/world/area_jan/jan_03/B37C20.c index d152f74cb6..896f4bc65f 100644 --- a/src/world/area_jan/jan_03/B37C20.c +++ b/src/world/area_jan/jan_03/B37C20.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B37C20", func_80243050); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B37C20", func_80243050_B37C20); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B37C20", func_802430C0); +INCLUDE_ASM(s32, "world/area_jan/jan_03/B37C20", func_802430C0_B37C90); diff --git a/src/world/area_jan/jan_04/B44AC0.c b/src/world/area_jan/jan_04/B44AC0.c index bb85dc0b7d..7dabc4c22e 100644 --- a/src/world/area_jan/jan_04/B44AC0.c +++ b/src/world/area_jan/jan_04/B44AC0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240350_B44AC0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240468); +INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_80240468_B44BD8); INCLUDE_ASM(s32, "world/area_jan/jan_04/B44AC0", func_802405B8_B44D28); diff --git a/src/world/area_jan/jan_04/B451F0.c b/src/world/area_jan/jan_04/B451F0.c index fd4f62d38b..bed65310e1 100644 --- a/src/world/area_jan/jan_04/B451F0.c +++ b/src/world/area_jan/jan_04/B451F0.c @@ -6,8 +6,8 @@ INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240B48_B452B8); INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240BE8_B45358); -INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240D0C); +INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240D0C_B4547C); -INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240D80); +INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240D80_B454F0); INCLUDE_ASM(s32, "world/area_jan/jan_04/B451F0", func_80240DF0_B45560); diff --git a/src/world/area_jan/jan_04/B45730.c b/src/world/area_jan/jan_04/B45730.c index e682f6fd5b..3c22826e61 100644 --- a/src/world/area_jan/jan_04/B45730.c +++ b/src/world/area_jan/jan_04/B45730.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_04/B45730", func_80240FC0); +INCLUDE_ASM(s32, "world/area_jan/jan_04/B45730", func_80240FC0_B45730); diff --git a/src/world/area_jan/jan_05/B4AF10.c b/src/world/area_jan/jan_05/B4AF10.c index b122d02de0..2e28d1ee68 100644 --- a/src/world/area_jan/jan_05/B4AF10.c +++ b/src/world/area_jan/jan_05/B4AF10.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_802404A0_B4AF10); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_80240510_B4AF80); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_802406DC); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_802406DC_B4B14C); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4AF10", func_80240738_B4B1A8); diff --git a/src/world/area_jan/jan_05/B4B260.c b/src/world/area_jan/jan_05/B4B260.c index 1c662127ca..0524b3e961 100644 --- a/src/world/area_jan/jan_05/B4B260.c +++ b/src/world/area_jan/jan_05/B4B260.c @@ -6,40 +6,40 @@ INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802408A4_B4B314); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240AD4_B4B544); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240E0C); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240E0C_B4B87C); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80240ECC_B4B93C); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241070); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241070_B4BAE0); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241150); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241150_B4BBC0); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241450); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241450_B4BEC0); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241494_B4BF04); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802416B8); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802416B8_B4C128); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241708_B4C178); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802418CC_B4C33C); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241938); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241938_B4C3A8); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802419A8); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802419A8_B4C418); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241A80); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241A80_B4C4F0); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241AD4); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241AD4_B4C544); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241C88_B4C6F8); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241EE8); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80241EE8_B4C958); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024219C); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024219C_B4CC0C); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80242450); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_80242450_B4CEC0); -INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802424C0); +INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_802424C0_B4CF30); INCLUDE_ASM(s32, "world/area_jan/jan_05/B4B260", func_8024268C_B4D0FC); diff --git a/src/world/area_jan/jan_06/B52BE0.c b/src/world/area_jan/jan_06/B52BE0.c index 3962b10893..dd759d3553 100644 --- a/src/world/area_jan/jan_06/B52BE0.c +++ b/src/world/area_jan/jan_06/B52BE0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52BE0", func_802403B0); +INCLUDE_ASM(s32, "world/area_jan/jan_06/B52BE0", func_802403B0_B52BE0); diff --git a/src/world/area_jan/jan_06/B52F70.c b/src/world/area_jan/jan_06/B52F70.c index b8fa43d4dc..500036d72d 100644 --- a/src/world/area_jan/jan_06/B52F70.c +++ b/src/world/area_jan/jan_06/B52F70.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240740); +INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240740_B52F70); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240970_B531A0); @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240F0C_B5373C); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80240FEC_B5381C); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802412EC); +INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802412EC_B53B1C); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241330_B53B60); @@ -26,15 +26,15 @@ INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_8024181C_B5404C); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241888_B540B8); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802418F8); +INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802418F8_B54128); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802419D0_B54200); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241A24); +INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241A24_B54254); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241BD8_B54408); -INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241E38); +INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_80241E38_B54668); INCLUDE_ASM(s32, "world/area_jan/jan_06/B52F70", func_802420EC_B5491C); diff --git a/src/world/area_jan/jan_07/B59870.c b/src/world/area_jan/jan_07/B59870.c index 0b336e8cfc..f25e92fd57 100644 --- a/src/world/area_jan/jan_07/B59870.c +++ b/src/world/area_jan/jan_07/B59870.c @@ -4,13 +4,13 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240000_B59870); INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240050_B598C0); -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240214); +INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240214_B59A84); INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_80240280_B59AF0); INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802402F0_B59B60); -INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802403C8); +INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_802403C8_B59C38); INCLUDE_ASM(s32, "world/area_jan/jan_07/B59870", func_8024041C_B59C8C); diff --git a/src/world/area_jan/jan_07/B5A610.c b/src/world/area_jan/jan_07/B5A610.c index 6a48b19e6c..67bd8781d2 100644 --- a/src/world/area_jan/jan_07/B5A610.c +++ b/src/world/area_jan/jan_07/B5A610.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_07/B5A610", func_80240DA0_B5A610); -INCLUDE_ASM(s32, "world/area_jan/jan_07/B5A610", func_80240E10); +INCLUDE_ASM(s32, "world/area_jan/jan_07/B5A610", func_80240E10_B5A680); diff --git a/src/world/area_jan/jan_08/B5E5C0.c b/src/world/area_jan/jan_08/B5E5C0.c index 2e4ba83745..5dc9e1cabf 100644 --- a/src/world/area_jan/jan_08/B5E5C0.c +++ b/src/world/area_jan/jan_08/B5E5C0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_80240310_B5E5C0); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_80240380_B5E630); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_8024054C); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_8024054C_B5E7FC); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E5C0", func_802405A8_B5E858); diff --git a/src/world/area_jan/jan_08/B5E910.c b/src/world/area_jan/jan_08/B5E910.c index 9c5fa22ab5..2b73cdea52 100644 --- a/src/world/area_jan/jan_08/B5E910.c +++ b/src/world/area_jan/jan_08/B5E910.c @@ -20,17 +20,17 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240AA8_B5ED58); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240AE0_B5ED90); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240B70); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240B70_B5EE20); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240BA4); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240BA4_B5EE54); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240C08_B5EEB8); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80240C60_B5EF10); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241198); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241198_B5F448); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_802412D8); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_802412D8_B5F588); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5E910", func_80241320_B5F5D0); diff --git a/src/world/area_jan/jan_08/B5F650.c b/src/world/area_jan/jan_08/B5F650.c index 7e23337fd5..fb512ae46c 100644 --- a/src/world/area_jan/jan_08/B5F650.c +++ b/src/world/area_jan/jan_08/B5F650.c @@ -1,10 +1,10 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802413A0); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802413A0_B5F650); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241454_B5F704); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_802414A4_B5F754); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241668_B5F918); @@ -18,6 +18,6 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241870_B5FB20); INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241A24_B5FCD4); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241C84); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241C84_B5FF34); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241F38); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B5F650", func_80241F38_B601E8); diff --git a/src/world/area_jan/jan_08/B604A0.c b/src/world/area_jan/jan_08/B604A0.c index 425c7f6ff4..198f32d751 100644 --- a/src/world/area_jan/jan_08/B604A0.c +++ b/src/world/area_jan/jan_08/B604A0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_08/B604A0", func_802421F0_B604A0); -INCLUDE_ASM(s32, "world/area_jan/jan_08/B604A0", func_80242260); +INCLUDE_ASM(s32, "world/area_jan/jan_08/B604A0", func_80242260_B60510); diff --git a/src/world/area_jan/jan_09/B663F0.c b/src/world/area_jan/jan_09/B663F0.c index 6252c52414..207b16bb0e 100644 --- a/src/world/area_jan/jan_09/B663F0.c +++ b/src/world/area_jan/jan_09/B663F0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240B54_B66604); INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240BC0_B66670); -INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240C30); +INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240C30_B666E0); INCLUDE_ASM(s32, "world/area_jan/jan_09/B663F0", func_80240D08_B667B8); diff --git a/src/world/area_jan/jan_09/B67190.c b/src/world/area_jan/jan_09/B67190.c index cb202e5678..734df0c38c 100644 --- a/src/world/area_jan/jan_09/B67190.c +++ b/src/world/area_jan/jan_09/B67190.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_09/B67190", func_802416E0); +INCLUDE_ASM(s32, "world/area_jan/jan_09/B67190", func_802416E0_B67190); INCLUDE_ASM(s32, "world/area_jan/jan_09/B67190", func_80241750_B67200); diff --git a/src/world/area_jan/jan_10/B6C6A0.c b/src/world/area_jan/jan_10/B6C6A0.c index ad69cf5b25..551dfc2645 100644 --- a/src/world/area_jan/jan_10/B6C6A0.c +++ b/src/world/area_jan/jan_10/B6C6A0.c @@ -6,12 +6,12 @@ INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240540_B6C8D0); INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240878_B6CC08); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240938); +INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240938_B6CCC8); INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240ADC_B6CE6C); INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", delete_actor_B6CF4C); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240EBC); +INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240EBC_B6D24C); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240F00); +INCLUDE_ASM(s32, "world/area_jan/jan_10/B6C6A0", func_80240F00_B6D290); diff --git a/src/world/area_jan/jan_10/B6D610.c b/src/world/area_jan/jan_10/B6D610.c index 2400b9763f..f726901aee 100644 --- a/src/world/area_jan/jan_10/B6D610.c +++ b/src/world/area_jan/jan_10/B6D610.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6D610", func_80241280); +INCLUDE_ASM(s32, "world/area_jan/jan_10/B6D610", func_80241280_B6D610); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6D610", func_802412F0); +INCLUDE_ASM(s32, "world/area_jan/jan_10/B6D610", func_802412F0_B6D680); -INCLUDE_ASM(s32, "world/area_jan/jan_10/B6D610", func_802414BC); +INCLUDE_ASM(s32, "world/area_jan/jan_10/B6D610", func_802414BC_B6D84C); diff --git a/src/world/area_jan/jan_11/B70860.c b/src/world/area_jan/jan_11/B70860.c index e36309bf9d..77c127d3d6 100644 --- a/src/world/area_jan/jan_11/B70860.c +++ b/src/world/area_jan/jan_11/B70860.c @@ -6,12 +6,12 @@ INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240158_B709B8); INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240178_B709D8); -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_8024018C); +INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_8024018C_B709EC); -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240248); +INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240248_B70AA8); -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240328); +INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240328_B70B88); INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240394_B70BF4); -INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240438); +INCLUDE_ASM(s32, "world/area_jan/jan_11/B70860", func_80240438_B70C98); diff --git a/src/world/area_jan/jan_11/B71010.c b/src/world/area_jan/jan_11/B71010.c index 3ff59db958..a107a30d50 100644 --- a/src/world/area_jan/jan_11/B71010.c +++ b/src/world/area_jan/jan_11/B71010.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_jan/jan_11/B71010", func_802407B0); +INCLUDE_ASM(s32, "world/area_jan/jan_11/B71010", func_802407B0_B71010); -INCLUDE_ASM(s32, "world/area_jan/jan_11/B71010", func_802407DC); +INCLUDE_ASM(s32, "world/area_jan/jan_11/B71010", func_802407DC_B7103C); diff --git a/src/world/area_jan/jan_12/B730B0.c b/src/world/area_jan/jan_12/B730B0.c index 7005da94bd..1c123c3aa5 100644 --- a/src/world/area_jan/jan_12/B730B0.c +++ b/src/world/area_jan/jan_12/B730B0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_80240000_B730B0); -INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_802400F8); +INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_802400F8_B731A8); INCLUDE_ASM(s32, "world/area_jan/jan_12/B730B0", func_80240170_B73220); diff --git a/src/world/area_jan/jan_12/B73570.c b/src/world/area_jan/jan_12/B73570.c index 86a5ca4271..54836a0819 100644 --- a/src/world/area_jan/jan_12/B73570.c +++ b/src/world/area_jan/jan_12/B73570.c @@ -14,8 +14,8 @@ INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240888_B73938); INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_802408DC_B7398C); -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240A90); +INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240A90_B73B40); INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240CF0_B73DA0); -INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240FA4); +INCLUDE_ASM(s32, "world/area_jan/jan_12/B73570", func_80240FA4_B74054); diff --git a/src/world/area_jan/jan_14/B7A510.c b/src/world/area_jan/jan_14/B7A510.c index 2066bb2f33..f4c2ea9fd9 100644 --- a/src/world/area_jan/jan_14/B7A510.c +++ b/src/world/area_jan/jan_14/B7A510.c @@ -6,12 +6,12 @@ INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802406F0_B7A740); INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240A28_B7AA78); -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240AE8); +INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240AE8_B7AB38); -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240C8C); +INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240C8C_B7ACDC); -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240D6C); +INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_80240D6C_B7ADBC); INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_8024106C_B7B0BC); -INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802410B0); +INCLUDE_ASM(s32, "world/area_jan/jan_14/B7A510", func_802410B0_B7B100); diff --git a/src/world/area_jan/jan_15/B7D9E0.c b/src/world/area_jan/jan_15/B7D9E0.c index 5d0670c6a0..bd8187bcff 100644 --- a/src/world/area_jan/jan_15/B7D9E0.c +++ b/src/world/area_jan/jan_15/B7D9E0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_15/B7D9E0", func_802400C0_B7D9E0); -INCLUDE_ASM(s32, "world/area_jan/jan_15/B7D9E0", func_80240130); +INCLUDE_ASM(s32, "world/area_jan/jan_15/B7D9E0", func_80240130_B7DA50); diff --git a/src/world/area_jan/jan_22/B84180.c b/src/world/area_jan/jan_22/B84180.c index 6f3ca77175..b27659b583 100644 --- a/src/world/area_jan/jan_22/B84180.c +++ b/src/world/area_jan/jan_22/B84180.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240E90_B85010); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FA8); +INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FA8_B85128); INCLUDE_ASM(s32, "world/area_jan/jan_22/B84180", func_80240FC4_B85144); diff --git a/src/world/area_jan/jan_22/B851A0.c b/src/world/area_jan/jan_22/B851A0.c index 0dd1a94dfd..fd64ce3677 100644 --- a/src/world/area_jan/jan_22/B851A0.c +++ b/src/world/area_jan/jan_22/B851A0.c @@ -2,16 +2,16 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241020_B851A0); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_802410C4); +INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_802410C4_B85244); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241168); +INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241168_B852E8); INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_802412E0_B85460); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_802413D0); +INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_802413D0_B85550); INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241440_B855C0); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_8024160C); +INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_8024160C_B8578C); INCLUDE_ASM(s32, "world/area_jan/jan_22/B851A0", func_80241668_B857E8); diff --git a/src/world/area_jan/jan_22/B858A0.c b/src/world/area_jan/jan_22/B858A0.c index a728c8e080..dc369875c0 100644 --- a/src/world/area_jan/jan_22/B858A0.c +++ b/src/world/area_jan/jan_22/B858A0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_jan/jan_22/B858A0", func_80241720_B858A0); -INCLUDE_ASM(s32, "world/area_jan/jan_22/B858A0", func_80241790); +INCLUDE_ASM(s32, "world/area_jan/jan_22/B858A0", func_80241790_B85910); diff --git a/src/world/area_kgr/kgr_01/8A9B70.c b/src/world/area_kgr/kgr_01/8A9B70.c index 83c330a67b..12fa4d25ff 100644 --- a/src/world/area_kgr/kgr_01/8A9B70.c +++ b/src/world/area_kgr/kgr_01/8A9B70.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_80240160); +INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_80240160_8A9B70); -INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_80240354); +INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_80240354_8A9D64); -INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_802403E0); +INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_802403E0_8A9DF0); -INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_80240500); +INCLUDE_ASM(s32, "world/area_kgr/kgr_01/8A9B70", func_80240500_8A9F10); diff --git a/src/world/area_kgr/kgr_02/8AAB80.c b/src/world/area_kgr/kgr_02/8AAB80.c index f7a313219f..4d7b8966b9 100644 --- a/src/world/area_kgr/kgr_02/8AAB80.c +++ b/src/world/area_kgr/kgr_02/8AAB80.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kgr/kgr_02/8AAB80", func_80240730); +INCLUDE_ASM(s32, "world/area_kgr/kgr_02/8AAB80", func_80240730_8AAB80); INCLUDE_ASM(s32, "world/area_kgr/kgr_02/8AAB80", func_80240748_8AAB98); diff --git a/src/world/area_kkj/kkj_00/ABB340.c b/src/world/area_kkj/kkj_00/ABB340.c index 43e5150d90..ccb6314fa5 100644 --- a/src/world/area_kkj/kkj_00/ABB340.c +++ b/src/world/area_kkj/kkj_00/ABB340.c @@ -10,18 +10,18 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240570_ABB800); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_8024072C_ABB9BC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802407E0); +INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802407E0_ABBA70); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240854_ABBAE4); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802408CC); +INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802408CC_ABBB5C); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_802409FC_ABBC8C); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240B1C); +INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240B1C_ABBDAC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240B84); +INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240B84_ABBE14); -INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240C44); +INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240C44_ABBED4); INCLUDE_ASM(s32, "world/area_kkj/kkj_00/ABB340", func_80240F40_ABC1D0); diff --git a/src/world/area_kkj/kkj_10/ACABD0.c b/src/world/area_kkj/kkj_10/ACABD0.c index 3359694270..9e371e093d 100644 --- a/src/world/area_kkj/kkj_10/ACABD0.c +++ b/src/world/area_kkj/kkj_10/ACABD0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACABD0", func_802400B0_ACABD0); -INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACABD0", func_802402C0); +INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACABD0", func_802402C0_ACADE0); INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACABD0", func_8024036C_ACAE8C); diff --git a/src/world/area_kkj/kkj_10/ACB3C0.c b/src/world/area_kkj/kkj_10/ACB3C0.c index 41b268bb09..38e4c9de3b 100644 --- a/src/world/area_kkj/kkj_10/ACB3C0.c +++ b/src/world/area_kkj/kkj_10/ACB3C0.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_802408A0); +INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_802408A0_ACB3C0); INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240AB0_ACB5D0); INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240B5C_ACB67C); -INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240E34); +INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240E34_ACB954); -INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240F18); +INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240F18_ACBA38); -INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240F44); +INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240F44_ACBA64); -INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240F60); +INCLUDE_ASM(s32, "world/area_kkj/kkj_10/ACB3C0", func_80240F60_ACBA80); diff --git a/src/world/area_kkj/kkj_12/AD4100.c b/src/world/area_kkj/kkj_12/AD4100.c index 0b62e320c0..e6071aa85c 100644 --- a/src/world/area_kkj/kkj_12/AD4100.c +++ b/src/world/area_kkj/kkj_12/AD4100.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_12/AD4100", func_80240714_AD47A4); INCLUDE_ASM(s32, "world/area_kkj/kkj_12/AD4100", func_80240730_AD47C0); -INCLUDE_ASM(s32, "world/area_kkj/kkj_12/AD4100", func_8024089C); +INCLUDE_ASM(s32, "world/area_kkj/kkj_12/AD4100", func_8024089C_AD492C); diff --git a/src/world/area_kkj/kkj_16/AED410.c b/src/world/area_kkj/kkj_16/AED410.c index 301e699559..d717936f61 100644 --- a/src/world/area_kkj/kkj_16/AED410.c +++ b/src/world/area_kkj/kkj_16/AED410.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_80240000_AED410); -INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_80240028); +INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_80240028_AED438); INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_80240060_AED470); @@ -12,4 +12,4 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_8024031C_AED72C); INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_802405F4_AEDA04); -INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_802406D8); +INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AED410", func_802406D8_AEDAE8); diff --git a/src/world/area_kkj/kkj_16/AEDC60.c b/src/world/area_kkj/kkj_16/AEDC60.c index 88a371f3e1..44620d7efd 100644 --- a/src/world/area_kkj/kkj_16/AEDC60.c +++ b/src/world/area_kkj/kkj_16/AEDC60.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240850); +INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240850_AEDC60); -INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240A60); +INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240A60_AEDE70); INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240B0C_AEDF1C); -INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240DE4); +INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240DE4_AEE1F4); -INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240EC8); +INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240EC8_AEE2D8); INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240EF4_AEE304); -INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240F10); +INCLUDE_ASM(s32, "world/area_kkj/kkj_16/AEDC60", func_80240F10_AEE320); diff --git a/src/world/area_kkj/kkj_18/AF2FE0.c b/src/world/area_kkj/kkj_18/AF2FE0.c index 5d1dc1a867..39171324fe 100644 --- a/src/world/area_kkj/kkj_18/AF2FE0.c +++ b/src/world/area_kkj/kkj_18/AF2FE0.c @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_80240694_AF3334); INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_80240730_AF33D0); -INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_80240774); +INCLUDE_ASM(s32, "world/area_kkj/kkj_18/AF2FE0", func_80240774_AF3414); diff --git a/src/world/area_kkj/kkj_19/AF7950.c b/src/world/area_kkj/kkj_19/AF7950.c index a1cb71d65e..1bfe49dbc1 100644 --- a/src/world/area_kkj/kkj_19/AF7950.c +++ b/src/world/area_kkj/kkj_19/AF7950.c @@ -4,8 +4,8 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7950", func_80240000_AF7950); INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7950", func_80240068_AF79B8); -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7950", func_802400E4); +INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7950", func_802400E4_AF7A34); -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7950", func_80240178); +INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7950", func_80240178_AF7AC8); INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7950", func_802401FC_AF7B4C); diff --git a/src/world/area_kkj/kkj_19/AF7C00.c b/src/world/area_kkj/kkj_19/AF7C00.c index 7e7a7dba68..b7cad99b2a 100644 --- a/src/world/area_kkj/kkj_19/AF7C00.c +++ b/src/world/area_kkj/kkj_19/AF7C00.c @@ -12,17 +12,17 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240568_AF7EB8); INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240604_AF7F54); -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802406A0); +INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802406A0_AF7FF0); INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_802406C4_AF8014); INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240B4C_AF849C); -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240B8C); +INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240B8C_AF84DC); INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240BE4_AF8534); -INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240C10); +INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240C10_AF8560); INCLUDE_ASM(s32, "world/area_kkj/kkj_19/AF7C00", func_80240C4C_AF859C); diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index 5961d17bcd..04345f1795 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240550_AFE090); INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240584_AFE0C4); -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405B4); +INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405B4_AFE0F4); INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405BC_AFE0FC); diff --git a/src/world/area_kkj/kkj_23/B028A0.c b/src/world/area_kkj/kkj_23/B028A0.c index 90b78df8f1..b4b864d13e 100644 --- a/src/world/area_kkj/kkj_23/B028A0.c +++ b/src/world/area_kkj/kkj_23/B028A0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B028A0", func_8024039C_B02C1C); INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B028A0", func_80240674_B02EF4); -INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B028A0", func_80240758); +INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B028A0", func_80240758_B02FD8); INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B028A0", func_80240784_B03004); diff --git a/src/world/area_kkj/kkj_23/B03190.c b/src/world/area_kkj/kkj_23/B03190.c index 91cef4bac0..0c6a22f9fa 100644 --- a/src/world/area_kkj/kkj_23/B03190.c +++ b/src/world/area_kkj/kkj_23/B03190.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B03190", func_80240910); +INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B03190", func_80240910_B03190); -INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B03190", func_802409AC); +INCLUDE_ASM(s32, "world/area_kkj/kkj_23/B03190", func_802409AC_B0322C); diff --git a/src/world/area_kkj/kkj_25/B06A80.c b/src/world/area_kkj/kkj_25/B06A80.c index db94a07342..3c3a3b9538 100644 --- a/src/world/area_kkj/kkj_25/B06A80.c +++ b/src/world/area_kkj/kkj_25/B06A80.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802400AC_B06AAC); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802400FC_B06AFC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802401C4); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_802401C4_B06BC4); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_80240264); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06A80", func_80240264_B06C64); diff --git a/src/world/area_kkj/kkj_25/B06D10.c b/src/world/area_kkj/kkj_25/B06D10.c index 5987c4d01f..53337e6312 100644 --- a/src/world/area_kkj/kkj_25/B06D10.c +++ b/src/world/area_kkj/kkj_25/B06D10.c @@ -2,34 +2,34 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240310_B06D10); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_802406EC); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_802406EC_B070EC); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240800_B07200); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_8024086C_B0726C); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_8024092C); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_8024092C_B0732C); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_802409EC_B073EC); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240AAC_B074AC); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240B18); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240B18_B07518); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240B8C_B0758C); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240BA0); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240BA0_B075A0); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240C60); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240C60_B07660); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240CD4); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240CD4_B076D4); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240CE8); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240CE8_B076E8); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240D30_B07730); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240E54); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240E54_B07854); -INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240EB8); +INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240EB8_B078B8); INCLUDE_ASM(s32, "world/area_kkj/kkj_25/B06D10", func_80240F2C_B0792C); diff --git a/src/world/area_kmr/kmr_00/8ABF90.c b/src/world/area_kmr/kmr_00/8ABF90.c index 6d36919aa8..58b40de407 100644 --- a/src/world/area_kmr/kmr_00/8ABF90.c +++ b/src/world/area_kmr/kmr_00/8ABF90.c @@ -2,24 +2,24 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240000_8ABF90); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240388); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240388_8AC318); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802403B8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802403B8_8AC348); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404A0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404A0_8AC430); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404E8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802404E8_8AC478); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240530); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240530_8AC4C0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240584); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240584_8AC514); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405A8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405A8_8AC538); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405CC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405CC_8AC55C); INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_802405F0_8AC580); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240BD8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240BD8_8ACB68); -INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240CB0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_00/8ABF90", func_80240CB0_8ACC40); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index a28fe4a31a..abf92b1234 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -16,132 +16,132 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802402E0_8B0350); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240370_8B03E0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404A8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404A8_8B0518); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404BC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404BC_8B052C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802406F0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802406F0_8B0760); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024073C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024073C_8B07AC); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024075C_8B07CC); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802407BC_8B082C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240908); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240908_8B0978); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240A7C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240A7C_8B0AEC); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240B00_8B0B70); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240D18); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240D18_8B0D88); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240DCC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240DCC_8B0E3C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E00); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E00_8B0E70); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E80_8B0EF0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E98); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E98_8B0F08); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EB4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EB4_8B0F24); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240ECC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240ECC_8B0F3C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EFC_8B0F6C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240F70); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240F70_8B0FE0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241010); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241010_8B1080); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241210_8B1280); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802412A0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802412A0_8B1310); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802413F4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802413F4_8B1464); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241424); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241424_8B1494); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802414D8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802414D8_8B1548); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802415F8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802415F8_8B1668); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241658); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241658_8B16C8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802416D0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802416D0_8B1740); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241800); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241800_8B1870); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024191C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024191C_8B198C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241964); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241964_8B19D4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241A10); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241A10_8B1A80); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241C18); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241C18_8B1C88); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241E90); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241E90_8B1F00); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242014_8B2084); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024226C_8B22DC); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422C0_8B2330); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422F8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802422F8_8B2368); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242394_8B2404); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242424); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242424_8B2494); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242514); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242514_8B2584); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426A0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426A0_8B2710); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426E4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802426E4_8B2754); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242710); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242710_8B2780); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242734); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242734_8B27A4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242788); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242788_8B27F8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427B0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427B0_8B2820); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427CC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427CC_8B283C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427EC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802427EC_8B285C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024280C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024280C_8B287C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242860); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242860_8B28D0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024293C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024293C_8B29AC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024295C_8B29CC); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242BA8_8B2C18); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242BC0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242BC0_8B2C30); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242F08_8B2F78); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242F28); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242F28_8B2F98); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242F7C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80242F7C_8B2FEC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80243034); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80243034_8B30A4); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index 5de1f85bde..9d48998606 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -1,33 +1,33 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243070); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243070_8B30E0); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243090_8B3100); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134_8B31A4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431B4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431B4_8B3224); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431E4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431E4_8B3254); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243210); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243210_8B3280); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243230); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243230_8B32A0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243284); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243284_8B32F4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243300); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243300_8B3370); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243334); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243334_8B33A4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243364); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243364_8B33D4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243370); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243370_8B33E0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802433AC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802433AC_8B341C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243474); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243474_8B34E4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243514); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243514_8B3584); diff --git a/src/world/area_kmr/kmr_02/8B36B0.c b/src/world/area_kmr/kmr_02/8B36B0.c index 23cf35f273..cfa246cf12 100644 --- a/src/world/area_kmr/kmr_02/8B36B0.c +++ b/src/world/area_kmr/kmr_02/8B36B0.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_80243640); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_80243640_8B36B0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_8024366C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_8024366C_8B36DC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_802436FC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_802436FC_8B376C); diff --git a/src/world/area_kmr/kmr_02/8B37D0.c b/src/world/area_kmr/kmr_02/8B37D0.c index 16d5c12116..d6a9b5f2f3 100644 --- a/src/world/area_kmr/kmr_02/8B37D0.c +++ b/src/world/area_kmr/kmr_02/8B37D0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B37D0", func_80243760); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B37D0", func_80243760_8B37D0); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B37D0", func_802437D0_8B3840); diff --git a/src/world/area_kmr/kmr_02/8B3A10.c b/src/world/area_kmr/kmr_02/8B3A10.c index 632fd07dd7..bd1e4df099 100644 --- a/src/world/area_kmr/kmr_02/8B3A10.c +++ b/src/world/area_kmr/kmr_02/8B3A10.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B3A10", func_802439A0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B3A10", func_802439A0_8B3A10); diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index 5f8dfc3de5..2c09dc4dff 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -2,8 +2,8 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240000_8C7F90); -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240184); +INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240184_8C8114); INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_802401B0_8C8140); -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240218); +INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240218_8C81A8); diff --git a/src/world/area_kmr/kmr_03/8C82B0.c b/src/world/area_kmr/kmr_03/8C82B0.c index 38361984d5..4a00f52afc 100644 --- a/src/world/area_kmr/kmr_03/8C82B0.c +++ b/src/world/area_kmr/kmr_03/8C82B0.c @@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_80240320_8C82B0); INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_8024033C_8C82CC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_80240358); +INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_80240358_8C82E8); diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c index 3601af77a1..7f6a48c21f 100644 --- a/src/world/area_kmr/kmr_03/8C83A0.c +++ b/src/world/area_kmr/kmr_03/8C83A0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C83A0", func_80240410_8C83A0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C83A0", func_80240480); +INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C83A0", func_80240480_8C8410); diff --git a/src/world/area_kmr/kmr_04/8CA900.c b/src/world/area_kmr/kmr_04/8CA900.c index ba25565702..bf8cfb37db 100644 --- a/src/world/area_kmr/kmr_04/8CA900.c +++ b/src/world/area_kmr/kmr_04/8CA900.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_80240000_8CA900); -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_8024002C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_8024002C_8CA92C); diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c index 50f09ae2e0..c1ade7c548 100644 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ b/src/world/area_kmr/kmr_04/8CA960.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_80240060); +INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_80240060_8CA960); -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802400D0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802400D0_8CA9D0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_8024029C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_8024029C_8CAB9C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8); #include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802403E0_8CACE0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_80240434); +INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_80240434_8CAD34); INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_80240444_8CAD44); diff --git a/src/world/area_kmr/kmr_05/8CE070.c b/src/world/area_kmr/kmr_05/8CE070.c index 047d41d77f..b51def88e8 100644 --- a/src/world/area_kmr/kmr_05/8CE070.c +++ b/src/world/area_kmr/kmr_05/8CE070.c @@ -4,20 +4,20 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240000_8CE070); INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802401B0_8CE220); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802407D8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802407D8_8CE848); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240898); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240898_8CE908); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240BDC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240BDC_8CEC4C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240C54); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240C54_8CECC4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240CC0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240CC0_8CED30); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240DF4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240DF4_8CEE64); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240E58); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_80240E58_8CEEC8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802411E8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_802411E8_8CF258); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_8024130C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CE070", func_8024130C_8CF37C); diff --git a/src/world/area_kmr/kmr_05/8CF570.c b/src/world/area_kmr/kmr_05/8CF570.c index 10c1ed0171..367991469b 100644 --- a/src/world/area_kmr/kmr_05/8CF570.c +++ b/src/world/area_kmr/kmr_05/8CF570.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_80241500); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_80241500_8CF570); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_80241570); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_80241570_8CF5E0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_8024173C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_05/8CF570", func_8024173C_8CF7AC); diff --git a/src/world/area_kmr/kmr_06/8D2A10.c b/src/world/area_kmr/kmr_06/8D2A10.c index de828de02d..adf6e28825 100644 --- a/src/world/area_kmr/kmr_06/8D2A10.c +++ b/src/world/area_kmr/kmr_06/8D2A10.c @@ -2,16 +2,16 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241500_8D2A10); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_802417A8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_802417A8_8D2CB8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_802417E0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_802417E0_8D2CF0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241950); +INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241950_8D2E60); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_802419EC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_802419EC_8D2EFC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241A68); +INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241A68_8D2F78); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241C78); +INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241C78_8D3188); -INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241CC8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_06/8D2A10", func_80241CC8_8D31D8); diff --git a/src/world/area_kmr/kmr_07/8D3DC0.c b/src/world/area_kmr/kmr_07/8D3DC0.c index da0bdcb1ab..fbb7222a9c 100644 --- a/src/world/area_kmr/kmr_07/8D3DC0.c +++ b/src/world/area_kmr/kmr_07/8D3DC0.c @@ -2,22 +2,22 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240000_8D3DC0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802400B4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802400B4_8D3E74); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802401D4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802401D4_8D3F94); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240234); +INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240234_8D3FF4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802402AC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802402AC_8D406C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802403DC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802403DC_8D419C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802404F8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802404F8_8D42B8); INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240540_8D4300); INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802405EC_8D43AC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802407F4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_802407F4_8D45B4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240A6C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_07/8D3DC0", func_80240A6C_8D482C); diff --git a/src/world/area_kmr/kmr_09/8D5E00.c b/src/world/area_kmr/kmr_09/8D5E00.c index a2efd11e2b..a16b5b8ff4 100644 --- a/src/world/area_kmr/kmr_09/8D5E00.c +++ b/src/world/area_kmr/kmr_09/8D5E00.c @@ -22,4 +22,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802411E8_8D6FE8); INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_8024130C_8D710C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802414F8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_09/8D5E00", func_802414F8_8D72F8); diff --git a/src/world/area_kmr/kmr_10/8D84D0.c b/src/world/area_kmr/kmr_10/8D84D0.c index 8a19b9afba..c381d03984 100644 --- a/src/world/area_kmr/kmr_10/8D84D0.c +++ b/src/world/area_kmr/kmr_10/8D84D0.c @@ -4,10 +4,10 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240000_8D84D0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240118); +INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240118_8D85E8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240268); +INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240268_8D8738); -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_802402BC_8D878C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240304); +INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D84D0", func_80240304_8D87D4); diff --git a/src/world/area_kmr/kmr_10/8D88A0.c b/src/world/area_kmr/kmr_10/8D88A0.c index c183650f5b..8b097ab948 100644 --- a/src/world/area_kmr/kmr_10/8D88A0.c +++ b/src/world/area_kmr/kmr_10/8D88A0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D88A0", func_802403D0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D88A0", func_802403D0_8D88A0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D88A0", func_80240440); +INCLUDE_ASM(s32, "world/area_kmr/kmr_10/8D88A0", func_80240440_8D8910); diff --git a/src/world/area_kmr/kmr_11/8DA100.c b/src/world/area_kmr/kmr_11/8DA100.c index 7bee6bfbfa..67517b7dc7 100644 --- a/src/world/area_kmr/kmr_11/8DA100.c +++ b/src/world/area_kmr/kmr_11/8DA100.c @@ -2,8 +2,8 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_80240000_8DA100); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_80240070); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_80240070_8DA170); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024023C_8DA33C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024027C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA100", func_8024027C_8DA37C); diff --git a/src/world/area_kmr/kmr_11/8DA3A0.c b/src/world/area_kmr/kmr_11/8DA3A0.c index acc946eeec..f34add7449 100644 --- a/src/world/area_kmr/kmr_11/8DA3A0.c +++ b/src/world/area_kmr/kmr_11/8DA3A0.c @@ -1,27 +1,27 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802402A0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802402A0_8DA3A0); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240344_8DA444); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240370_8DA470); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240424); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240424_8DA524); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240544); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240544_8DA644); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802405A4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802405A4_8DA6A4); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024061C_8DA71C); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024074C_8DA84C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240868); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240868_8DA968); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802408B0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_802408B0_8DA9B0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024095C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_8024095C_8DAA5C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240B64); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240B64_8DAC64); INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DA3A0", func_80240DDC_8DAEDC); diff --git a/src/world/area_kmr/kmr_11/8DAFC0.c b/src/world/area_kmr/kmr_11/8DAFC0.c index 36c740bad5..709086fa91 100644 --- a/src/world/area_kmr/kmr_11/8DAFC0.c +++ b/src/world/area_kmr/kmr_11/8DAFC0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DAFC0", func_80240EC0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DAFC0", func_80240EC0_8DAFC0); diff --git a/src/world/area_kmr/kmr_11/8DB020.c b/src/world/area_kmr/kmr_11/8DB020.c index ba1ea1fca3..e53d507b05 100644 --- a/src/world/area_kmr/kmr_11/8DB020.c +++ b/src/world/area_kmr/kmr_11/8DB020.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DB020", func_80240F20_8DB020); -INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DB020", func_80240F90); +INCLUDE_ASM(s32, "world/area_kmr/kmr_11/8DB020", func_80240F90_8DB090); diff --git a/src/world/area_kmr/kmr_20/8EBE50.c b/src/world/area_kmr/kmr_20/8EBE50.c index c0fd3513e3..2e569ccd2c 100644 --- a/src/world/area_kmr/kmr_20/8EBE50.c +++ b/src/world/area_kmr/kmr_20/8EBE50.c @@ -4,34 +4,34 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240030_8EBE50); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240050_8EBE70); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240064); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240064_8EBE84); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240120); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240120_8EBF40); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240200); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240200_8EC020); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_8024026C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_8024026C_8EC08C); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240310_8EC130); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240330); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240330_8EC150); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240358_8EC178); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240380); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240380_8EC1A0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802403F0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802403F0_8EC210); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802405BC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802405BC_8EC3DC); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406BC_8EC4DC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406C8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_802406C8_8EC4E8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B20); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B20_8EC940); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B48); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B48_8EC968); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B54); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240B54_8EC974); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EBE50", func_80240DA4_8ECBC4); diff --git a/src/world/area_kmr/kmr_20/8ECBF0.c b/src/world/area_kmr/kmr_20/8ECBF0.c index 18d8118868..c4feab0faf 100644 --- a/src/world/area_kmr/kmr_20/8ECBF0.c +++ b/src/world/area_kmr/kmr_20/8ECBF0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECBF0", func_80240DD0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECBF0", func_80240DD0_8ECBF0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECBF0", func_80240DF8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECBF0", func_80240DF8_8ECC18); diff --git a/src/world/area_kmr/kmr_20/8ECC40.c b/src/world/area_kmr/kmr_20/8ECC40.c index 35324591b3..09153764f4 100644 --- a/src/world/area_kmr/kmr_20/8ECC40.c +++ b/src/world/area_kmr/kmr_20/8ECC40.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECC40", func_80240E20); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECC40", func_80240E20_8ECC40); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECC40", func_80240E90); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECC40", func_80240E90_8ECCB0); diff --git a/src/world/area_kmr/kmr_20/8ECE80.c b/src/world/area_kmr/kmr_20/8ECE80.c index f7e27a09f8..4f45345b62 100644 --- a/src/world/area_kmr/kmr_20/8ECE80.c +++ b/src/world/area_kmr/kmr_20/8ECE80.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECE80", func_80241060_8ECE80); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECE80", func_802410D0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ECE80", func_802410D0_8ECEF0); diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index b7deb30143..6f8ce8e99a 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -2,30 +2,30 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412A0_8ED0C0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412C0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412C0_8ED0E0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364_8ED184); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802413E4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802413E4_8ED204); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241414); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241414_8ED234); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241440); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241440_8ED260); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241460); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241460_8ED280); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802414B4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802414B4_8ED2D4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241530); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241530_8ED350); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241564); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241564_8ED384); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241594); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241594_8ED3B4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_8024159C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_8024159C_8ED3BC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802415C4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802415C4_8ED3E4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802415EC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802415EC_8ED40C); diff --git a/src/world/area_kmr/kmr_20/8ED440.c b/src/world/area_kmr/kmr_20/8ED440.c index 391afcd51e..b9e5b81440 100644 --- a/src/world/area_kmr/kmr_20/8ED440.c +++ b/src/world/area_kmr/kmr_20/8ED440.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241620); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241620_8ED440); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241738); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED440", func_80241738_8ED558); diff --git a/src/world/area_kmr/kmr_20/8ED5A0.c b/src/world/area_kmr/kmr_20/8ED5A0.c index 2af5d7e400..4e934e090f 100644 --- a/src/world/area_kmr/kmr_20/8ED5A0.c +++ b/src/world/area_kmr/kmr_20/8ED5A0.c @@ -1,23 +1,23 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241780); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241780_8ED5A0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417A0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417A0_8ED5C0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802417B4_8ED5D4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241870); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241870_8ED690); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241950_8ED770); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802419BC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_802419BC_8ED7DC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241A60); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241A60_8ED880); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241AD0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241AD0_8ED8F0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241C9C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241C9C_8EDABC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241CF0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241CF0_8EDB10); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241D1C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED5A0", func_80241D1C_8EDB3C); diff --git a/src/world/area_kmr/kmr_20/8EDB70.c b/src/world/area_kmr/kmr_20/8EDB70.c index acac7f1eed..d93df7398b 100644 --- a/src/world/area_kmr/kmr_20/8EDB70.c +++ b/src/world/area_kmr/kmr_20/8EDB70.c @@ -1,23 +1,23 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D50); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D50_8EDB70); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D70_8EDB90); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D84); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241D84_8EDBA4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241E40); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241E40_8EDC60); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241F20); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241F20_8EDD40); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241F8C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80241F8C_8EDDAC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242030); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242030_8EDE50); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242084); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242084_8EDEA4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_802420EC); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_802420EC_8EDF0C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242144); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_80242144_8EDF64); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_8024216C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDB70", func_8024216C_8EDF8C); diff --git a/src/world/area_kmr/kmr_20/8EDFC0.c b/src/world/area_kmr/kmr_20/8EDFC0.c index 9dcf7e0f8e..adb069da28 100644 --- a/src/world/area_kmr/kmr_20/8EDFC0.c +++ b/src/world/area_kmr/kmr_20/8EDFC0.c @@ -2,10 +2,10 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_802421A0_8EDFC0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242870); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242870_8EE690); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242A04); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242A04_8EE824); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242A3C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242A3C_8EE85C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242B04); +INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8EDFC0", func_80242B04_8EE924); diff --git a/src/world/area_kmr/kmr_21/8FEE90.c b/src/world/area_kmr/kmr_21/8FEE90.c index baf0190ed9..52453091b1 100644 --- a/src/world/area_kmr/kmr_21/8FEE90.c +++ b/src/world/area_kmr/kmr_21/8FEE90.c @@ -1,11 +1,11 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_21/8FEE90", func_80240010); +INCLUDE_ASM(s32, "world/area_kmr/kmr_21/8FEE90", func_80240010_8FEE90); -INCLUDE_ASM(s32, "world/area_kmr/kmr_21/8FEE90", func_80240210); +INCLUDE_ASM(s32, "world/area_kmr/kmr_21/8FEE90", func_80240210_8FF090); -INCLUDE_ASM(s32, "world/area_kmr/kmr_21/8FEE90", func_80240298); +INCLUDE_ASM(s32, "world/area_kmr/kmr_21/8FEE90", func_80240298_8FF118); -INCLUDE_ASM(s32, "world/area_kmr/kmr_21/8FEE90", func_802402B4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_21/8FEE90", func_802402B4_8FF134); INCLUDE_ASM(s32, "world/area_kmr/kmr_21/8FEE90", func_802402C8_8FF148); diff --git a/src/world/area_kmr/kmr_22/8FF680.c b/src/world/area_kmr/kmr_22/8FF680.c index d65d9f0d60..d8a7280dce 100644 --- a/src/world/area_kmr/kmr_22/8FF680.c +++ b/src/world/area_kmr/kmr_22/8FF680.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF680", func_80240010_8FF680); -INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF680", func_802401E0); +INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF680", func_802401E0_8FF850); -INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF680", func_80240208); +INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF680", func_80240208_8FF878); diff --git a/src/world/area_kmr/kmr_22/8FF8B0.c b/src/world/area_kmr/kmr_22/8FF8B0.c index d0fa23dbd6..a37c5676cb 100644 --- a/src/world/area_kmr/kmr_22/8FF8B0.c +++ b/src/world/area_kmr/kmr_22/8FF8B0.c @@ -1,18 +1,18 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240240); +INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240240_8FF8B0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240314); +INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240314_8FF984); -INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240418); +INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240418_8FFA88); -INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_802404E4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_802404E4_8FFB54); -INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_8024056C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_8024056C_8FFBDC); INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240B00_900170); -INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240B3C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240B3C_9001AC); INCLUDE_ASM(s32, "world/area_kmr/kmr_22/8FF8B0", func_80240B4C_9001BC); diff --git a/src/world/area_kmr/kmr_23/907A40.c b/src/world/area_kmr/kmr_23/907A40.c index a10638ad54..e0403c7bc8 100644 --- a/src/world/area_kmr/kmr_23/907A40.c +++ b/src/world/area_kmr/kmr_23/907A40.c @@ -4,32 +4,32 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240010_907A40); INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240040_907A70); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240274); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240274_907CA4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240300); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240300_907D30); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_802403A8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_802403A8_907DD8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240494); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240494_907EC4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240528); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240528_907F58); INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_8024061C_90804C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_802407B8); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_802407B8_9081E8); INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_8024088C_9082BC); INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240A00_908430); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240BB4); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240BB4_9085E4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240C94); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240C94_9086C4); INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240CA8_9086D8); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240D14); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240D14_908744); -INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240D5C); +INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240D5C_90878C); INCLUDE_ASM(s32, "world/area_kmr/kmr_23/907A40", func_80240DA4_9087D4); diff --git a/src/world/area_kmr/kmr_24/90B250.c b/src/world/area_kmr/kmr_24/90B250.c index f84564e4fe..58dc705488 100644 --- a/src/world/area_kmr/kmr_24/90B250.c +++ b/src/world/area_kmr/kmr_24/90B250.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_24/90B250", func_80240010_90B250); -INCLUDE_ASM(s32, "world/area_kmr/kmr_24/90B250", func_80240074); +INCLUDE_ASM(s32, "world/area_kmr/kmr_24/90B250", func_80240074_90B2B4); diff --git a/src/world/area_kmr/kmr_30/90B9E0.c b/src/world/area_kmr/kmr_30/90B9E0.c index cb88d4fc18..dce2284226 100644 --- a/src/world/area_kmr/kmr_30/90B9E0.c +++ b/src/world/area_kmr/kmr_30/90B9E0.c @@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_30/90B9E0", func_80240310_90B9E0); INCLUDE_ASM(s32, "world/area_kmr/kmr_30/90B9E0", func_8024045C_90BB2C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_30/90B9E0", func_80240488); +INCLUDE_ASM(s32, "world/area_kmr/kmr_30/90B9E0", func_80240488_90BB58); diff --git a/src/world/area_kpa/kpa_01/A470C0.c b/src/world/area_kpa/kpa_01/A470C0.c index 6ffe914d07..d4ec446e7c 100644 --- a/src/world/area_kpa/kpa_01/A470C0.c +++ b/src/world/area_kpa/kpa_01/A470C0.c @@ -2,15 +2,15 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_80240160_A470C0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802401DC); +INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802401DC_A4713C); INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_80240310_A47270); INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_80240474_A473D4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802404F4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_802404F4_A47454); -INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_80240934); +INCLUDE_ASM(s32, "world/area_kpa/kpa_01/A470C0", func_80240934_A47894); #include "world/common/AwaitPlayerNearNpc.inc.c" diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index 77d2d00e6c..8fd066349b 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -16,38 +16,38 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80240934_A48EF4); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802409D4_A48F94); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80240A48); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80240A48_A49008); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80240C18); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80240C18_A491D8); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241128_A496E8); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_8024119C_A4975C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802412C8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802412C8_A49888); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241368); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241368_A49928); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802413CC_A4998C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_8024150C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_8024150C_A49ACC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802416B0); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802416B0_A49C70); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802416EC_A49CAC); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_802418AC_A49E6C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241918); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241918_A49ED8); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241A4C_A4A00C); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241AB4_A4A074); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D20); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D20_A4A2E0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D6C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D6C_A4A32C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241DC4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241DC4_A4A384); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241DFC_A4A3BC); diff --git a/src/world/area_kpa/kpa_03/A4A410.c b/src/world/area_kpa/kpa_03/A4A410.c index 8e40bbd537..e54c664bf4 100644 --- a/src/world/area_kpa/kpa_03/A4A410.c +++ b/src/world/area_kpa/kpa_03/A4A410.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A4A410", func_80241E50); +INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A4A410", func_80241E50_A4A410); diff --git a/src/world/area_kpa/kpa_08/A4CAC0.c b/src/world/area_kpa/kpa_08/A4CAC0.c index 8cee313ee3..f583d469e5 100644 --- a/src/world/area_kpa/kpa_08/A4CAC0.c +++ b/src/world/area_kpa/kpa_08/A4CAC0.c @@ -2,17 +2,17 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802400A0_A4CAC0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240270); +INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240270_A4CC90); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240780); +INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240780_A4D1A0); INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802407F4_A4D214); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240920); +INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240920_A4D340); INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802409C0_A4D3E0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240A24); +INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240A24_A4D444); INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240B64_A4D584); @@ -20,18 +20,18 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240D08_A4D728); INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240D44_A4D764); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240F04); +INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240F04_A4D924); INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80240F70_A4D990); INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802410A4_A4DAC4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_8024110C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_8024110C_A4DB2C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80241378); +INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80241378_A4DD98); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802413C4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802413C4_A4DDE4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_8024141C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_8024141C_A4DE3C); INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80241454_A4DE74); diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index db4f9d22fa..3e5652d1e7 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -8,14 +8,14 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802403D4_A4F3D4); INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802404D4_A4F4D4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240518); +INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240518_A4F518); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802405B8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802405B8_A4F5B8); INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802405FC_A4F5FC); INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240B38_A4FB38); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240F94); +INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240F94_A4FF94); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802412B4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802412B4_A502B4); diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index 33db8e136d..f4a4ebab79 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -6,25 +6,25 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240500_A93C40); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240644_A93D84); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240744); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240744_A93E84); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240788); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240788_A93EC8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240828); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240828_A93F68); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024086C_A93FAC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240DA8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240DA8_A944E8); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241204_A94944); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241524_A94C64); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024155C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024155C_A94C9C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802415D8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802415D8_A94D18); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024170C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024170C_A94E4C); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241870_A94FB0); @@ -40,24 +40,24 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024244C_A95B8C); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802425D8_A95D18); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802429C8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802429C8_A96108); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242ABC); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242ABC_A961FC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242D00); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242D00_A96440); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242D3C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242D3C_A9647C); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242F08_A96648); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80242F74_A966B4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802430A8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_802430A8_A967E8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243198); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243198_A968D8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243270); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243270_A969B0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243504); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243504_A96C44); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024353C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024353C_A96C7C); diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index c390c37c51..9dc3e6aa43 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -8,13 +8,13 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240170_A99700); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240360_A998F0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802404A4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802404A4_A99A34); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405A4_A99B34); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405E8_A99B78); -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240688); +INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240688_A99C18); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802406CC_A99C5C); @@ -22,4 +22,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240C08_A9A198); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80241064_A9A5F4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80241384); +INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80241384_A9A914); diff --git a/src/world/area_kpa/kpa_113/A9CC70.c b/src/world/area_kpa/kpa_113/A9CC70.c index 496891b3cb..422102b233 100644 --- a/src/world/area_kpa/kpa_113/A9CC70.c +++ b/src/world/area_kpa/kpa_113/A9CC70.c @@ -2,15 +2,15 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_80240040_A9CC70); -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_802400FC); +INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_802400FC_A9CD2C); INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_802401B0_A9CDE0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_8024022C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_8024022C_A9CE5C); INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_80240360_A9CF90); -INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_802404C4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_802404C4_A9D0F4); INCLUDE_ASM(s32, "world/area_kpa/kpa_113/A9CC70", func_80240544_A9D174); diff --git a/src/world/area_kpa/kpa_12/A54CA0.c b/src/world/area_kpa/kpa_12/A54CA0.c index e9da955e98..8b0a0a5ec5 100644 --- a/src/world/area_kpa/kpa_12/A54CA0.c +++ b/src/world/area_kpa/kpa_12/A54CA0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54CA0", func_80240350); +INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54CA0", func_80240350_A54CA0); INCLUDE_ASM(s32, "world/area_kpa/kpa_12/A54CA0", func_8024037C_A54CCC); diff --git a/src/world/area_kpa/kpa_134/AA94B0.c b/src/world/area_kpa/kpa_134/AA94B0.c index 338a10af00..778ffee5eb 100644 --- a/src/world/area_kpa/kpa_134/AA94B0.c +++ b/src/world/area_kpa/kpa_134/AA94B0.c @@ -6,4 +6,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240564_AA9504); INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_80240628_AA95C8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_8024065C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_134/AA94B0", func_8024065C_AA95FC); diff --git a/src/world/area_kpa/kpa_14/A574F0.c b/src/world/area_kpa/kpa_14/A574F0.c index 92badbb876..a08225c8a0 100644 --- a/src/world/area_kpa/kpa_14/A574F0.c +++ b/src/world/area_kpa/kpa_14/A574F0.c @@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_80240040_A574F0); INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_80240164_A57614); -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_8024034C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A574F0", func_8024034C_A577FC); diff --git a/src/world/area_kpa/kpa_14/A57830.c b/src/world/area_kpa/kpa_14/A57830.c index 1d2d282704..b6b983118f 100644 --- a/src/world/area_kpa/kpa_14/A57830.c +++ b/src/world/area_kpa/kpa_14/A57830.c @@ -4,16 +4,16 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240380_A57830); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240498); +INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240498_A57948); INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_802405E8_A57A98); -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_8024063C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_8024063C_A57AEC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240670); +INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240670_A57B20); INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240710_A57BC0); INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_8024073C_A57BEC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240840); +INCLUDE_ASM(s32, "world/area_kpa/kpa_14/A57830", func_80240840_A57CF0); diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index 9a97f924b7..b2be23171e 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240000_A609D0); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802401F0_A60BC0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240334); +INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240334_A60D04); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240434_A60E04); @@ -12,19 +12,19 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240478_A60E48); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240518_A60EE8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_8024055C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_8024055C_A60F2C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240A98); +INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240A98_A61468); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240EF4_A618C4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80241214); +INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80241214_A61BE4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_8024124C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_8024124C_A61C1C); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802412C8_A61C98); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802413FC); +INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802413FC_A61DCC); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80241560_A61F30); diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index ddbf0cdd82..10816b15ea 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240220_A642B0); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240730_A647C0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802407A4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802407A4_A64834); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802408D0_A64960); @@ -14,9 +14,9 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240970_A64A00); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802409D4_A64A64); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240B14); +INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240B14_A64BA4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240CB8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240CB8_A64D48); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240CF4_A64D84); @@ -24,13 +24,13 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240EB4_A64F44); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80240F20_A64FB0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241054); +INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241054_A650E4); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802410BC_A6514C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241328); +INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241328_A653B8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241374); +INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241374_A65404); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802413CC_A6545C); @@ -38,10 +38,10 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241404_A65494); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_8024144C_A654DC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802414C8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802414C8_A65558); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802415FC_A6568C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241760); +INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241760_A657F0); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802417E0_A65870); diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index a27812d567..e3f319b1a9 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -2,20 +2,20 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802400E0_A671E0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802402D0); +INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802402D0_A673D0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240414); +INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240414_A67514); INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240514_A67614); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240558); +INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240558_A67658); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802405F8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802405F8_A676F8); INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_8024063C_A6773C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240B78); +INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240B78_A67C78); INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240FD4_A680D4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802412F4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802412F4_A683F4); diff --git a/src/world/area_kpa/kpa_60/A6CBE0.c b/src/world/area_kpa/kpa_60/A6CBE0.c index 7d39d4b4b3..87d699f73d 100644 --- a/src/world/area_kpa/kpa_60/A6CBE0.c +++ b/src/world/area_kpa/kpa_60/A6CBE0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_60/A6CBE0", func_802400E0_A6CBE0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_60/A6CBE0", func_80240204); +INCLUDE_ASM(s32, "world/area_kpa/kpa_60/A6CBE0", func_80240204_A6CD04); diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c index cc26e9b36d..fdb1a1770a 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -18,9 +18,9 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802411C4_A6F5A4); INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241200_A6F5E0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_8024138C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_8024138C_A6F76C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_8024177C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_8024177C_A6FB5C); INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241870_A6FC50); @@ -30,14 +30,14 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241AF0_A6FED0); INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241CBC_A7009C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241D28); +INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241D28_A70108); INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241E5C_A7023C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241F4C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241F4C_A7032C); INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", update_heroes_start_turn_A70404); -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802422B8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802422B8_A70698); INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802422F0_A706D0); diff --git a/src/world/area_kpa/kpa_81/A78510.c b/src/world/area_kpa/kpa_81/A78510.c index 8418311b5d..872dc48b47 100644 --- a/src/world/area_kpa/kpa_81/A78510.c +++ b/src/world/area_kpa/kpa_81/A78510.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_8024027C_A7873C); INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802402D0_A78790); -INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308); +INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_80240308_A787C8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802403A4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_81/A78510", func_802403A4_A78864); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 87cd3c2ca1..1ae2fb6c75 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240400_A86E50); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802404C0_A86F10); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024067C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024067C_A870CC); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240730_A87180); @@ -16,25 +16,25 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802407A4_A871F4); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024081C_A8726C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024094C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024094C_A8739C); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240A6C_A874BC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240AD4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240AD4_A87524); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240B94); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240B94_A875E4); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240E90_A878E0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240F0C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80240F0C_A8795C); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241040_A87A90); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802411A4); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802411A4_A87BF4); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241528); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241528_A87F78); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241548_A87F98); @@ -42,17 +42,17 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802415EC_A8803C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024166C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024166C_A880BC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024169C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024169C_A880EC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416C8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416C8_A88118); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416E8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416E8_A88138); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024173C_A8818C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802417B8); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802417B8_A88208); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802417EC_A8823C); diff --git a/src/world/area_kpa/kpa_91/A88280.c b/src/world/area_kpa/kpa_91/A88280.c index b99ad2891c..a14b3765a8 100644 --- a/src/world/area_kpa/kpa_91/A88280.c +++ b/src/world/area_kpa/kpa_91/A88280.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A88280", func_80241830); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A88280", func_80241830_A88280); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A88280", func_80241864); +INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A88280", func_80241864_A882B4); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index fc621ef469..d4ec445167 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -2,9 +2,9 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802400E0_A8CB60); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240238); +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240238_A8CCB8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802404E0); +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802404E0_A8CF60); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802405A0_A8D020); @@ -14,9 +14,9 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240810_A8D290); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240884_A8D304); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802408FC); +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802408FC_A8D37C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240A2C); +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240A2C_A8D4AC); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240B4C_A8D5CC); @@ -30,15 +30,15 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80240FEC_A8DA6C); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241120_A8DBA0); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241284); +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241284_A8DD04); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304); +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241608); +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241608_A8E088); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241628_A8E0A8); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650); +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802416CC_A8E14C); @@ -54,6 +54,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024181C_A8E29C); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241898_A8E318); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418CC); +INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418CC_A8E34C); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418FC_A8E37C); diff --git a/src/world/area_kzn/kzn_02/C5AC20.c b/src/world/area_kzn/kzn_02/C5AC20.c index 693226c1c9..ea458dfeec 100644 --- a/src/world/area_kzn/kzn_02/C5AC20.c +++ b/src/world/area_kzn/kzn_02/C5AC20.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240690_C5ADD0); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240CB8_C5B3F8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240D78); +INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80240D78_C5B4B8); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802410BC_C5B7FC); @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241134_C5B874); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802411A0_C5B8E0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802412D4); +INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802412D4_C5BA14); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241338_C5BA78); @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802419D8_C5C118); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241B08_C5C248); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241D88); +INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241D88_C5C4C8); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241DE4_C5C524); @@ -38,16 +38,16 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80241FCC_C5C70C); #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242310); +INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242310_C5CA50); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242364); +INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242364_C5CAA4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_8024239C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_8024239C_C5CADC); INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242438_C5CB78); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242528); +INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_80242528_C5CC68); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802426B4); +INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802426B4_C5CDF4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802426F8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_02/C5AC20", func_802426F8_C5CE38); diff --git a/src/world/area_kzn/kzn_03/C61020.c b/src/world/area_kzn/kzn_03/C61020.c index 3467ed289b..3e5439754b 100644 --- a/src/world/area_kzn/kzn_03/C61020.c +++ b/src/world/area_kzn/kzn_03/C61020.c @@ -16,7 +16,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240AE4_C617F4); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240B84_C61894); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240BF8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240BF8_C61908); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240C64_C61974); @@ -26,19 +26,19 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240DAC_C61ABC); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240E00_C61B10); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240FB4); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80240FB4_C61CC4); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80241214_C61F24); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802414C8_C621D8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80241534); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80241534_C62244); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80241630_C62340); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242070_C62D80); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242100); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242100_C62E10); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242200_C62F10); @@ -56,14 +56,14 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024259C_C632AC); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_802428E0_C635F0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242934); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242934_C63644); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024296C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_8024296C_C6367C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242A08); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242A08_C63718); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242AF8_C63808); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242C84); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242C84_C63994); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242CC8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C61020", func_80242CC8_C639D8); diff --git a/src/world/area_kzn/kzn_03/C63A10.c b/src/world/area_kzn/kzn_03/C63A10.c index d7b8db5b9b..d8635752f8 100644 --- a/src/world/area_kzn/kzn_03/C63A10.c +++ b/src/world/area_kzn/kzn_03/C63A10.c @@ -2,13 +2,13 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D00_C63A10); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D1C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D1C_C63A2C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D38); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D38_C63A48); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242DB0_C63AC0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242E54); +INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242E54_C63B64); INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242EF8_C63C08); diff --git a/src/world/area_kzn/kzn_04/C68440.c b/src/world/area_kzn/kzn_04/C68440.c index 7527754c87..ae4d979b7d 100644 --- a/src/world/area_kzn/kzn_04/C68440.c +++ b/src/world/area_kzn/kzn_04/C68440.c @@ -6,9 +6,9 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024032C_C6845C); INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_8024034C_C6847C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240378); +INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240378_C684A8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802403E4); +INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802403E4_C68514); INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240430_C68560); @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240820_C68950); INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240854_C68984); -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802408B8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_802408B8_C689E8); INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240910_C68A40); @@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240F88_C690B8); INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80240FD0_C69100); -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80241018); +INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C68440", func_80241018_C69148); diff --git a/src/world/area_kzn/kzn_04/C69180.c b/src/world/area_kzn/kzn_04/C69180.c index ea5ff1ff4f..20b2e59d79 100644 --- a/src/world/area_kzn/kzn_04/C69180.c +++ b/src/world/area_kzn/kzn_04/C69180.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C69180", func_80241050_C69180); -INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C69180", func_80241644); +INCLUDE_ASM(s32, "world/area_kzn/kzn_04/C69180", func_80241644_C69774); diff --git a/src/world/area_kzn/kzn_06/C6CD10.c b/src/world/area_kzn/kzn_06/C6CD10.c index 954b718c95..54022b3364 100644 --- a/src/world/area_kzn/kzn_06/C6CD10.c +++ b/src/world/area_kzn/kzn_06/C6CD10.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6CD10", func_802403F0_C6CD10); INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6CD10", func_80240738_C6D058); -INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6CD10", func_802407FC); +INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6CD10", func_802407FC_C6D11C); INCLUDE_ASM(s32, "world/area_kzn/kzn_06/C6CD10", func_80240A44_C6D364); diff --git a/src/world/area_kzn/kzn_07/C6E330.c b/src/world/area_kzn/kzn_07/C6E330.c index 4874f0cad3..db421123a7 100644 --- a/src/world/area_kzn/kzn_07/C6E330.c +++ b/src/world/area_kzn/kzn_07/C6E330.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240000_C6E330); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240348_C6E678); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_8024040C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_8024040C_C6E73C); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6E330", func_80240530_C6E860); diff --git a/src/world/area_kzn/kzn_07/C6EA50.c b/src/world/area_kzn/kzn_07/C6EA50.c index 75e817124a..4d634469b1 100644 --- a/src/world/area_kzn/kzn_07/C6EA50.c +++ b/src/world/area_kzn/kzn_07/C6EA50.c @@ -6,17 +6,17 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802407F4_C6EB24); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240820_C6EB50); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802409D0); +INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802409D0_C6ED00); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80240FF8_C6F328); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802410B8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802410B8_C6F3E8); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802413FC_C6F72C); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241474_C6F7A4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802414E0); +INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802414E0_C6F810); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241614_C6F944); @@ -24,12 +24,12 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241678_C6F9A8); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241A08_C6FD38); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241B2C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241B2C_C6FE5C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241D18); +INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241D18_C70048); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80241E48_C70178); INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_802420C8_C703F8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80242124); +INCLUDE_ASM(s32, "world/area_kzn/kzn_07/C6EA50", func_80242124_C70454); diff --git a/src/world/area_kzn/kzn_08/C71480.c b/src/world/area_kzn/kzn_08/C71480.c index 8f0ab5c3b7..c54d58da84 100644 --- a/src/world/area_kzn/kzn_08/C71480.c +++ b/src/world/area_kzn/kzn_08/C71480.c @@ -8,4 +8,4 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_8024040C_C7188C); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240530_C719B0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240718); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71480", func_80240718_C71B98); diff --git a/src/world/area_kzn/kzn_08/C71ED0.c b/src/world/area_kzn/kzn_08/C71ED0.c index 04a01600a4..4c635254c0 100644 --- a/src/world/area_kzn/kzn_08/C71ED0.c +++ b/src/world/area_kzn/kzn_08/C71ED0.c @@ -4,21 +4,21 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240A50_C71ED0); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80240C00_C72080); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241228); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241228_C726A8); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802412E8_C72768); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_8024162C_C72AAC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802416A4); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802416A4_C72B24); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241710); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241710_C72B90); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241844); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241844_C72CC4); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802418A8_C72D28); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241C38); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241C38_C730B8); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80241D5C_C731DC); @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242078_C734F8); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802422F8_C73778); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242354_C737D4); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_8024253C_C739BC); @@ -36,28 +36,28 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802425A8_C73A28); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242618_C73A98); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802426F0); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802426F0_C73B70); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242744); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242744_C73BC4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802428F8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802428F8_C73D78); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242B58); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242B58_C73FD8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242E0C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242E0C_C7428C); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242E78_C742F8); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80242F74_C743F4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802439B4); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_802439B4_C74E34); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243A44); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243A44_C74EC4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243B44); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243B44_C74FC4); INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243BA4_C75024); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243C90); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243C90_C75110); -INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243EE0); +INCLUDE_ASM(s32, "world/area_kzn/kzn_08/C71ED0", func_80243EE0_C75360); diff --git a/src/world/area_kzn/kzn_09/C77A20.c b/src/world/area_kzn/kzn_09/C77A20.c index 48cb3c7c77..2c01b749ab 100644 --- a/src/world/area_kzn/kzn_09/C77A20.c +++ b/src/world/area_kzn/kzn_09/C77A20.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77A20", func_80240D40_C77A20); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77A20", func_80240DE4_C77AC4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77A20", func_80240E88); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77A20", func_80240E88_C77B68); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77A20", func_80241000_C77CE0); diff --git a/src/world/area_kzn/kzn_09/C77D00.c b/src/world/area_kzn/kzn_09/C77D00.c index e993546db1..c2c10da1f1 100644 --- a/src/world/area_kzn/kzn_09/C77D00.c +++ b/src/world/area_kzn/kzn_09/C77D00.c @@ -6,17 +6,17 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024108C_C77D6C); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802410FC_C77DDC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802411D4); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802411D4_C77EB4); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241228_C77F08); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802413DC); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802413DC_C780BC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024163C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024163C_C7831C); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802418F0_C785D0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024195C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024195C_C7863C); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80241A58_C78738); @@ -24,21 +24,21 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242498_C79178); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242528_C79208); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242628); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242628_C79308); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242688); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242688_C79368); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242774_C79454); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802429C4); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802429C4_C796A4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242A40); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242A40_C79720); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242B74); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242B74_C79854); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242CD8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242CD8_C799B8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242D58); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80242D58_C79A38); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243198_C79E78); @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243198_C79E78); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243238_C79F18); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802432AC); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802432AC_C79F8C); #include "world/common/GetItemName.inc.c" @@ -54,16 +54,16 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802432AC); #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802435F0); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802435F0_C7A2D0); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243644_C7A324); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024367C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_8024367C_C7A35C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243718); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243718_C7A3F8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243808); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243808_C7A4E8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243994); +INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_80243994_C7A674); INCLUDE_ASM(s32, "world/area_kzn/kzn_09/C77D00", func_802439D8_C7A6B8); diff --git a/src/world/area_kzn/kzn_10/C7E4B0.c b/src/world/area_kzn/kzn_10/C7E4B0.c index 9d8e220b95..5c5145a632 100644 --- a/src/world/area_kzn/kzn_10/C7E4B0.c +++ b/src/world/area_kzn/kzn_10/C7E4B0.c @@ -10,8 +10,8 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_80240414_C7E594); INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_802404B4_C7E634); -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_802404EC); +INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_802404EC_C7E66C); INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_802405A4_C7E724); -INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_80240638); +INCLUDE_ASM(s32, "world/area_kzn/kzn_10/C7E4B0", func_80240638_C7E7B8); diff --git a/src/world/area_kzn/kzn_11/C80600.c b/src/world/area_kzn/kzn_11/C80600.c index eefdd3f209..c1e93e4f9a 100644 --- a/src/world/area_kzn/kzn_11/C80600.c +++ b/src/world/area_kzn/kzn_11/C80600.c @@ -8,27 +8,27 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240C38_C80DD8); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80240CF8_C80E98); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_8024103C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_8024103C_C811DC); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802410B4_C81254); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241120_C812C0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241254); +INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241254_C813F4); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802412B8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_802412B8_C81458); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241648_C817E8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_8024176C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_8024176C_C8190C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241958); +INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241958_C81AF8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241A88); +INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241A88_C81C28); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241D08_C81EA8); -INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241D64); +INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241D64_C81F04); INCLUDE_ASM(s32, "world/area_kzn/kzn_11/C80600", func_80241F4C_C820EC); diff --git a/src/world/area_kzn/kzn_17/C85DC0.c b/src/world/area_kzn/kzn_17/C85DC0.c index 3777dd8cfe..a6defb4b83 100644 --- a/src/world/area_kzn/kzn_17/C85DC0.c +++ b/src/world/area_kzn/kzn_17/C85DC0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240310_C85DC0); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_8024037C_C85E2C); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802403EC); +INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802403EC_C85E9C); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_802404C4_C85F74); @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240BE0_C86690); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240C4C_C866FC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240D48); +INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80240D48_C867F8); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241788_C87238); @@ -34,11 +34,11 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241CB4_C87764); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241D30_C877E0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241E64); +INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241E64_C87914); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80241FC8_C87A78); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242048); +INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242048_C87AF8); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C85DC0", func_80242488_C87F38); diff --git a/src/world/area_kzn/kzn_17/C887B0.c b/src/world/area_kzn/kzn_17/C887B0.c index 6ce947ae1d..a011b1b0b3 100644 --- a/src/world/area_kzn/kzn_17/C887B0.c +++ b/src/world/area_kzn/kzn_17/C887B0.c @@ -4,9 +4,9 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242D00_C887B0); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242D20_C887D0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242D4C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242D4C_C887FC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242DE4); +INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242DE4_C88894); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242E84_C88934); @@ -14,4 +14,4 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242EBC_C8896C); INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80242F74_C88A24); -INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80243004); +INCLUDE_ASM(s32, "world/area_kzn/kzn_17/C887B0", func_80243004_C88AB4); diff --git a/src/world/area_kzn/kzn_19/C8DBB0.c b/src/world/area_kzn/kzn_19/C8DBB0.c index f3e19f1d76..7b3921127f 100644 --- a/src/world/area_kzn/kzn_19/C8DBB0.c +++ b/src/world/area_kzn/kzn_19/C8DBB0.c @@ -8,9 +8,9 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024030C_C8DEBC); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240358_C8DF08); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802404B8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802404B8_C8E068); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802408C8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802408C8_C8E478); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240908_C8E4B8); @@ -20,19 +20,19 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240B00_C8E6B0); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240BD4_C8E784); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240CD8); +INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240CD8_C8E888); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240DA4_C8E954); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240E2C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80240E2C_C8E9DC); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802413C0_C8EF70); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802413FC_C8EFAC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024140C); +INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_8024140C_C8EFBC); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241468); +INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241468_C8F018); #include "world/common/GetItemName.inc.c" @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802417AC_C8F35C); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241800_C8F3B0); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241838); +INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241838_C8F3E8); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802418D4_C8F484); @@ -52,6 +52,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_802419C4_C8F574); INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241B50_C8F700); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241B94); +INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241B94_C8F744); -INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241BC0); +INCLUDE_ASM(s32, "world/area_kzn/kzn_19/C8DBB0", func_80241BC0_C8F770); diff --git a/src/world/area_kzn/kzn_23/C9C610.c b/src/world/area_kzn/kzn_23/C9C610.c index 36f5defe5b..1f846b08ba 100644 --- a/src/world/area_kzn/kzn_23/C9C610.c +++ b/src/world/area_kzn/kzn_23/C9C610.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_802403D8_C9C6D8); INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240478_C9C778); -INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240504); +INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240504_C9C804); INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240520_C9C820); diff --git a/src/world/area_mac/mac_00/7EAD10.c b/src/world/area_mac/mac_00/7EAD10.c index fd68fce284..c8d24d21a7 100644 --- a/src/world/area_mac/mac_00/7EAD10.c +++ b/src/world/area_mac/mac_00/7EAD10.c @@ -2,20 +2,20 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240000_7EAD10); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240020); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240020_7EAD30); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034_7EAD44); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802400F0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802400F0_7EAE00); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802401D0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802401D0_7EAEE0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_8024023C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_8024023C_7EAF4C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802402E0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802402E0_7EAFF0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240404); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240404_7EB114); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802405EC); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802405EC_7EB2FC); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240624); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240624_7EB334); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 97dc53eba3..6e7e17daef 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -1,95 +1,95 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240748); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240748_7EB458); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024075C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024075C_7EB46C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240990); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240990_7EB6A0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409DC); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409DC_7EB6EC); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409FC); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409FC_7EB70C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240A5C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240A5C_7EB76C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240BA8); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240BA8_7EB8B8); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240D1C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240D1C_7EBA2C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240DA0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240DA0_7EBAB0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240FB8); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240FB8_7EBCC8); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024106C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024106C_7EBD7C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802410A0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802410A0_7EBDB0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241120); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241120_7EBE30); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241138); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241138_7EBE48); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241154); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241154_7EBE64); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024116C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024116C_7EBE7C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024119C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024119C_7EBEAC); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241210); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241210_7EBF20); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802412B0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802412B0_7EBFC0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802414B0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802414B0_7EC1C0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241540); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241540_7EC250); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628_7EC338); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241694); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241694_7EC3A4); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802418F0_7EC600); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241944_7EC654); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024197C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024197C_7EC68C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241AB4); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241AB4_7EC7C4); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241BA4); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241BA4_7EC8B4); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D30); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D30_7ECA40); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D74); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D74_7ECA84); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241DA0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241DA0_7ECAB0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E04); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E04_7ECB14); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E80); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E80_7ECB90); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242078); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242078_7ECD88); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242178); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242178_7ECE88); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802421D0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802421D0_7ECEE0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242224); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242224_7ECF34); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242250); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242250_7ECF60); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024228C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024228C_7ECF9C); diff --git a/src/world/area_mac/mac_00/7ECFD0.c b/src/world/area_mac/mac_00/7ECFD0.c index 43a0215f77..7be7c5bf19 100644 --- a/src/world/area_mac/mac_00/7ECFD0.c +++ b/src/world/area_mac/mac_00/7ECFD0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ECFD0", func_802422C0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ECFD0", func_802422C0_7ECFD0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ECFD0", func_802423F0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ECFD0", func_802423F0_7ED100); diff --git a/src/world/area_mac/mac_00/7ED280.c b/src/world/area_mac/mac_00/7ED280.c index 37ee6da685..4d70a12c6b 100644 --- a/src/world/area_mac/mac_00/7ED280.c +++ b/src/world/area_mac/mac_00/7ED280.c @@ -1,30 +1,30 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242570); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242570_7ED280); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802426C8); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802426C8_7ED3D8); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242970); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242970_7ED680); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242A30); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242A30_7ED740); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242BEC); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242BEC_7ED8FC); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242CA0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242CA0_7ED9B0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242D14); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242D14_7EDA24); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242D8C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242D8C_7EDA9C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242EBC); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242EBC_7EDBCC); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242FDC); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80242FDC_7EDCEC); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243044); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243044_7EDD54); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243104); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243104_7EDE14); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400_7EE110); #include "world/common/GetItemName.inc.c" @@ -32,16 +32,16 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243400); #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243744_7EE454); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243798_7EE4A8); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_802437D0_7EE4E0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_8024386C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_8024386C_7EE57C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_8024395C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_8024395C_7EE66C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243AE8); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243AE8_7EE7F8); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243B2C); +INCLUDE_ASM(s32, "world/area_mac/mac_00/7ED280", func_80243B2C_7EE83C); diff --git a/src/world/area_mac/mac_01/800880.c b/src/world/area_mac/mac_01/800880.c index 8abfb29c69..d8b5d7a4f9 100644 --- a/src/world/area_mac/mac_01/800880.c +++ b/src/world/area_mac/mac_01/800880.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_80240000_800880); -INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_80240044); +INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_80240044_8008C4); INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_802400C8_800948); diff --git a/src/world/area_mac/mac_01/800C40.c b/src/world/area_mac/mac_01/800C40.c index a616eaf857..8c60d4d8f9 100644 --- a/src/world/area_mac/mac_01/800C40.c +++ b/src/world/area_mac/mac_01/800C40.c @@ -1,7 +1,7 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_01/800C40", func_802403C0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/800C40", func_802403C0_800C40); -INCLUDE_ASM(s32, "world/area_mac/mac_01/800C40", func_802405E8); +INCLUDE_ASM(s32, "world/area_mac/mac_01/800C40", func_802405E8_800E68); -INCLUDE_ASM(s32, "world/area_mac/mac_01/800C40", func_80240628); +INCLUDE_ASM(s32, "world/area_mac/mac_01/800C40", func_80240628_800EA8); diff --git a/src/world/area_mac/mac_01/801700.c b/src/world/area_mac/mac_01/801700.c index 474e632b3f..0b38a9d1bd 100644 --- a/src/world/area_mac/mac_01/801700.c +++ b/src/world/area_mac/mac_01/801700.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_01/801700", func_80240E80); +INCLUDE_ASM(s32, "world/area_mac/mac_01/801700", func_80240E80_801700); -INCLUDE_ASM(s32, "world/area_mac/mac_01/801700", func_80240ED8); +INCLUDE_ASM(s32, "world/area_mac/mac_01/801700", func_80240ED8_801758); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index fff65c2621..beee517673 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -1,189 +1,189 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80240F50); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80240F50_8017D0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241080); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241080_801900); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802411D8); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802411D8_801A58); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241480); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241480_801D00); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241540_801DC0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802416FC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802416FC_801F7C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802417B0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802417B0_802030); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241824); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241824_8020A4); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024189C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024189C_80211C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802419CC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802419CC_80224C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241AEC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241AEC_80236C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241B54); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241B54_8023D4); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241C14); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241C14_802494); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242028); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242028_8028A8); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024203C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024203C_8028BC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242270); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242270_802AF0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422BC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422BC_802B3C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422DC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422DC_802B5C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024233C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024233C_802BBC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242488); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242488_802D08); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802425FC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802425FC_802E7C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242680); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242680_802F00); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242898); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242898_803118); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024294C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024294C_8031CC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242980); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242980_803200); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A00); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A00_803280); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A18); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A18_803298); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A34); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A34_8032B4); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A4C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A4C_8032CC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A7C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A7C_8032FC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242AF0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242AF0_803370); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242B90); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242B90_803410); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D90); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D90_803610); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242E20); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242E20_8036A0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08_803788); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F74); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F74_8037F4); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242FA4); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242FA4_803824); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243380_803C00); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243494); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243494_803D14); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243500); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243500_803D80); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802435C0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802435C0_803E40); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243680); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243680_803F00); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437AC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437AC_80402C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437CC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437CC_80404C); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_804074); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870_8040F0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802438F0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802438F0_804170); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243920); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243920_8041A0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024394C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024394C_8041CC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024396C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024396C_8041EC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802439C0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802439C0_804240); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A3C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A3C_8042BC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A70); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A70_8042F0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243AA0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243AA0_804320); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243CD4_804554); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D28); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D28_8045A8); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243D60_8045E0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243DFC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243DFC_80467C); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243EEC_80476C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244078); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244078_8048F8); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440BC_80493C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440E8); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440E8_804968); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440FC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440FC_80497C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802441EC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802441EC_804A6C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244308); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244308_804B88); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802443E0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802443E0_804C60); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446AC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446AC_804F2C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446E0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446E0_804F60); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802447E0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802447E0_805060); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244848); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244848_8050C8); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802448A0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802448A0_805120); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244984); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244984_805204); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802449F8); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802449F8_805278); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tabs_draw_stats_805418); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tabs_draw_badges_805540); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244D68); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244D68_8055E8); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244E10); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244E10_805690); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244E90); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244E90_805710); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244F5C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244F5C_8057DC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245018); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245018_805898); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245028); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245028_8058A8); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024522C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024522C_805AAC); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245440_805CC0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245488); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245488_805D08); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802454B4); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802454B4_805D34); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245504); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245504_805D84); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024552C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024552C_805DAC); diff --git a/src/world/area_mac/mac_01/805DD0.c b/src/world/area_mac/mac_01/805DD0.c index 21f70ff0c6..dbe49f9106 100644 --- a/src/world/area_mac/mac_01/805DD0.c +++ b/src/world/area_mac/mac_01/805DD0.c @@ -1,27 +1,27 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245550); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245550_805DD0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802456A8); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802456A8_805F28); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245950); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245950_8061D0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245A10); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245A10_806290); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245BCC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245BCC_80644C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245C80); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245C80_806500); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245CF4); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245CF4_806574); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245D6C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245D6C_8065EC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245E9C); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245E9C_80671C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245FBC); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80245FBC_80683C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80246024); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_80246024_8068A4); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802460E4); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802460E4_806964); -INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802463E0); +INCLUDE_ASM(s32, "world/area_mac/mac_01/805DD0", func_802463E0_806C60); diff --git a/src/world/area_mac/mac_01/806D10.c b/src/world/area_mac/mac_01/806D10.c index ab1d7747fd..cf647f390e 100644 --- a/src/world/area_mac/mac_01/806D10.c +++ b/src/world/area_mac/mac_01/806D10.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_01/806D10", func_80246490); +INCLUDE_ASM(s32, "world/area_mac/mac_01/806D10", func_80246490_806D10); -INCLUDE_ASM(s32, "world/area_mac/mac_01/806D10", func_80246500); +INCLUDE_ASM(s32, "world/area_mac/mac_01/806D10", func_80246500_806D80); diff --git a/src/world/area_mac/mac_02/8238B0.c b/src/world/area_mac/mac_02/8238B0.c index 57cf30a21b..b4f10c3f18 100644 --- a/src/world/area_mac/mac_02/8238B0.c +++ b/src/world/area_mac/mac_02/8238B0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_02/8238B0", func_802405F0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/8238B0", func_802405F0_8238B0); diff --git a/src/world/area_mac/mac_02/823970.c b/src/world/area_mac/mac_02/823970.c index b307339ba5..5efbf74c93 100644 --- a/src/world/area_mac/mac_02/823970.c +++ b/src/world/area_mac/mac_02/823970.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823970", func_802406B0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823970", func_802406B0_823970); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823970", func_80240720); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823970", func_80240720_8239E0); diff --git a/src/world/area_mac/mac_02/823BB0.c b/src/world/area_mac/mac_02/823BB0.c index 84473f3f3b..faba47627b 100644 --- a/src/world/area_mac/mac_02/823BB0.c +++ b/src/world/area_mac/mac_02/823BB0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BB0", func_802408F0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BB0", func_802408F0_823BB0); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 82564b747c..6f1b87f44f 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -1,113 +1,113 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240930); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240930_823BF0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240A88); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240A88_823D48); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240D30); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240D30_823FF0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240DF0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240DF0_8240B0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240FAC); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80240FAC_82426C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241060); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241060_824320); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802410D4); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802410D4_824394); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024114C); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024114C_82440C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024127C); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024127C_82453C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024139C); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024139C_82465C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241404); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241404_8246C4); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802414C4); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802414C4_824784); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418D8); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418D8_824B98); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418EC); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418EC_824BAC); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B20); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B20_824DE0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B6C); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B6C_824E2C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B8C); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B8C_824E4C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241BEC); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241BEC_824EAC); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241D38); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241D38_824FF8); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241EAC); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241EAC_82516C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241F30); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241F30_8251F0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242148); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242148_825408); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802421FC); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802421FC_8254BC); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242230); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242230_8254F0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422B0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422B0_825570); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422C8); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422C8_825588); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422E4); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422E4_8255A4); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422FC); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422FC_8255BC); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024232C); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024232C_8255EC); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802423A0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802423A0_825660); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242440); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242440_825700); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242640); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242640_825900); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802426D0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802426D0_825990); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8_825A78); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242824); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242824_825AE4); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242A80_825D40); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242AD4); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242AD4_825D94); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242B0C); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242B0C_825DCC); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242BA8_825E68); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242C44); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242C44_825F04); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242DBC); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242DBC_82607C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242F60); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242F60_826220); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243040); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243040_826300); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243088); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243088_826348); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802430D0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802430D0_826390); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243104_8263C4); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802431F4); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802431F4_8264B4); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80243380_826640); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802433C4); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802433C4_826684); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802433F0); +INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802433F0_8266B0); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index c478247470..9803d69af2 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -1,79 +1,79 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240320); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240320_831B20); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405C8); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405C8_831DC8); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405DC); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405DC_831DDC); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240810); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240810_832010); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024085C); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024085C_83205C); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024087C); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024087C_83207C); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802408DC); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802408DC_8320DC); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240A28); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240A28_832228); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240B9C); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240B9C_83239C); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240C20); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240C20_832420); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240E38); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240E38_832638); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240EEC); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240EEC_8326EC); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240F20); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240F20_832720); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FA0); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FA0_8327A0); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FB8_8327B8); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FD4); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FD4_8327D4); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FEC); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FEC_8327EC); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024101C); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024101C_83281C); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241090); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241090_832890); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241130); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241130_832930); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241330); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241330_832B30); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802413C0); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802413C0_832BC0); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8_832CA8); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241514); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241514_832D14); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241770_832F70); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417C4_832FC4); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802417FC_832FFC); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241898); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241898_833098); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241988); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241988_833188); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B14_833314); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B58); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B58_833358); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B84); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241B84_833384); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241BD8); +INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241BD8_8333D8); diff --git a/src/world/area_mac/mac_03/833500.c b/src/world/area_mac/mac_03/833500.c index 4db4c6ef2c..5f49f00990 100644 --- a/src/world/area_mac/mac_03/833500.c +++ b/src/world/area_mac/mac_03/833500.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_03/833500", func_80241D00); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833500", func_80241D00_833500); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833500", func_80241D70); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833500", func_80241D70_833570); diff --git a/src/world/area_mac/mac_03/833740.c b/src/world/area_mac/mac_03/833740.c index b22cc06a9a..e10d7199b8 100644 --- a/src/world/area_mac/mac_03/833740.c +++ b/src/world/area_mac/mac_03/833740.c @@ -1,25 +1,25 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F40); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F40_833740); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F6C); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F6C_83376C); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F80); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F80_833780); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241FA0); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241FA0_8337A0); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_8024206C); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_8024206C_83386C); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_802421E8); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_802421E8_8339E8); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80242384); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80242384_833B84); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_802424A0); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_802424A0_833CA0); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_802425A8); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_802425A8_833DA8); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80242608); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80242608_833E08); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80242694); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80242694_833E94); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_802427D0); +INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_802427D0_833FD0); diff --git a/src/world/area_mac/mac_04/842C20.c b/src/world/area_mac/mac_04/842C20.c index c996fb8c80..7303579078 100644 --- a/src/world/area_mac/mac_04/842C20.c +++ b/src/world/area_mac/mac_04/842C20.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_04/842C20", func_80240050); +INCLUDE_ASM(s32, "world/area_mac/mac_04/842C20", func_80240050_842C20); -INCLUDE_ASM(s32, "world/area_mac/mac_04/842C20", func_80240194); +INCLUDE_ASM(s32, "world/area_mac/mac_04/842C20", func_80240194_842D64); diff --git a/src/world/area_mac/mac_04/842D90.c b/src/world/area_mac/mac_04/842D90.c index 9c42fcd8f0..a7c3949510 100644 --- a/src/world/area_mac/mac_04/842D90.c +++ b/src/world/area_mac/mac_04/842D90.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_04/842D90", func_802401C0); +INCLUDE_ASM(s32, "world/area_mac/mac_04/842D90", func_802401C0_842D90); diff --git a/src/world/area_mac/mac_04/842DF0.c b/src/world/area_mac/mac_04/842DF0.c index be89f0fcdc..dcd125bb9c 100644 --- a/src/world/area_mac/mac_04/842DF0.c +++ b/src/world/area_mac/mac_04/842DF0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_04/842DF0", func_80240220); +INCLUDE_ASM(s32, "world/area_mac/mac_04/842DF0", func_80240220_842DF0); -INCLUDE_ASM(s32, "world/area_mac/mac_04/842DF0", func_80240290); +INCLUDE_ASM(s32, "world/area_mac/mac_04/842DF0", func_80240290_842E60); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 0a7d1840a5..1fdb846eeb 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -1,56 +1,56 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240578); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240578_843148); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024058C); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024058C_84315C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802407C0); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802407C0_843390); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024080C); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024080C_8433DC); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024082C); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024082C_8433FC); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024088C); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024088C_84345C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802409D8); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802409D8_8435A8); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240B4C); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240B4C_84371C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240BD0); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240BD0_8437A0); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240DE8); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240DE8_8439B8); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240E9C); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240E9C_843A6C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240ED0); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240ED0_843AA0); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F50_843B20); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F68); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F68_843B38); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F84); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F84_843B54); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F9C); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F9C_843B6C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240FCC); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240FCC_843B9C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241040); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241040_843C10); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802410E0); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802410E0_843CB0); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802412E0); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802412E0_843EB0); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241370); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241370_843F40); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458_844028); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802414C4_844094); @@ -60,13 +60,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802414C4_844094); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241720_8442F0); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241774_844344); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802417AC); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802417AC_84437C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241848_844418); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802418AC); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802418AC_84447C); static ApiStatus PostChapter4StatUpdate(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = PLAYER_DATA; @@ -78,22 +78,22 @@ static ApiStatus PostChapter4StatUpdate(ScriptInstance* script, s32 isInitialCal return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241980); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241980_844550); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419AC); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419AC_84457C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419D0); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419D0_8445A0); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419E4); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419E4_8445B4); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241A64); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241A64_844634); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241B90); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241B90_844760); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241BB8); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241BB8_844788); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C20); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C20_8447F0); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C40); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C40_844810); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C60); +INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C60_844830); diff --git a/src/world/area_mac/mac_04/844860.c b/src/world/area_mac/mac_04/844860.c index cb7c7c2aa4..7e35df7504 100644 --- a/src/world/area_mac/mac_04/844860.c +++ b/src/world/area_mac/mac_04/844860.c @@ -1,11 +1,11 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241C90); +INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241C90_844860); -INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241CEC); +INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241CEC_8448BC); INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241D30_844900); -INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241DAC); +INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241DAC_84497C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241EB0); +INCLUDE_ASM(s32, "world/area_mac/mac_04/844860", func_80241EB0_844A80); diff --git a/src/world/area_mac/mac_04/844AC0.c b/src/world/area_mac/mac_04/844AC0.c index c9c9473c46..040915ed86 100644 --- a/src/world/area_mac/mac_04/844AC0.c +++ b/src/world/area_mac/mac_04/844AC0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_04/844AC0", func_80241EF0); +INCLUDE_ASM(s32, "world/area_mac/mac_04/844AC0", func_80241EF0_844AC0); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index eaba5756fd..33f7c4c269 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -2,87 +2,87 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240000_852170); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240124); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240124_852294); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024030C_85247C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024047C_8525EC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240490); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240490_852600); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802405E8_852758); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240890); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240890_852A00); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240950); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240950_852AC0); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240B0C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240B0C_852C7C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240BC0); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240BC0_852D30); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240C34); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240C34_852DA4); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240CAC); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240CAC_852E1C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240DDC); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240DDC_852F4C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240EFC); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240EFC_85306C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240F64); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80240F64_8530D4); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241024); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241024_853194); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241438); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241438_8535A8); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024144C_8535BC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241680); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241680_8537F0); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416CC); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416CC_85383C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416EC); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416EC_85385C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024174C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024174C_8538BC); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241898_853A08); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241A0C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241A0C_853B7C); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241A90); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241A90_853C00); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241CA8); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241CA8_853E18); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D5C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D5C_853ECC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D90); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241D90_853F00); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E10); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E10_853F80); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E28); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E28_853F98); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E44); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E44_853FB4); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E5C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E5C_853FCC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E8C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E8C_853FFC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241F00); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241F00_854070); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241FA0_854110); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802421A0); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802421A0_854310); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242230_8543A0); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318_854488); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242384_8544F4); @@ -90,38 +90,38 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242384_8544F4); #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802425E0_854750); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242634); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242634_8547A4); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024266C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024266C_8547DC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242708_854878); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802427A4); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802427A4_854914); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242894); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242894_854A04); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A20); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A20_854B90); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A64); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A64_854BD4); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242A90_854C00); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242C78); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242C78_854DE8); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242E84); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242E84_854FF4); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80243088_8551F8); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802430B4); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802430B4_855224); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802431B0); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802431B0_855320); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80243254); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80243254_8553C4); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024335C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024335C_8554CC); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80243380_8554F0); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802433BC); +INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802433BC_85552C); diff --git a/src/world/area_mac/mac_05/855560.c b/src/world/area_mac/mac_05/855560.c index dd83cd1e33..3a1fd359b7 100644 --- a/src/world/area_mac/mac_05/855560.c +++ b/src/world/area_mac/mac_05/855560.c @@ -2,20 +2,20 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_802433F0_855560); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_8024343C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_8024343C_8555AC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243588); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243588_8556F8); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243800); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243800_855970); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_802438A4); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_802438A4_855A14); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243948); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243948_855AB8); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243AB8); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243AB8_855C28); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243BA4); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243BA4_855D14); INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243CD4_855E44); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243D78); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855560", func_80243D78_855EE8); diff --git a/src/world/area_mac/mac_05/855F20.c b/src/world/area_mac/mac_05/855F20.c index 81351bcf38..049e9ac5c4 100644 --- a/src/world/area_mac/mac_05/855F20.c +++ b/src/world/area_mac/mac_05/855F20.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_05/855F20", func_80243DB0); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855F20", func_80243DB0_855F20); -INCLUDE_ASM(s32, "world/area_mac/mac_05/855F20", func_80243F0C); +INCLUDE_ASM(s32, "world/area_mac/mac_05/855F20", func_80243F0C_85607C); diff --git a/src/world/area_mac/mac_06/865000.c b/src/world/area_mac/mac_06/865000.c index 84783d20a9..274da46abf 100644 --- a/src/world/area_mac/mac_06/865000.c +++ b/src/world/area_mac/mac_06/865000.c @@ -1,21 +1,21 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_802404C0); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_802404C0_865000); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_8024050C); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_8024050C_86504C); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240658); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240658_865198); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_802408D0); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_802408D0_865410); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240974); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240974_8654B4); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240A18); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240A18_865558); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240B88); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240B88_8656C8); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240C74); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240C74_8657B4); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240DA4); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240DA4_8658E4); -INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240E48); +INCLUDE_ASM(s32, "world/area_mac/mac_06/865000", func_80240E48_865988); diff --git a/src/world/area_mac/mac_06/8659C0.c b/src/world/area_mac/mac_06/8659C0.c index 2b83ef19b2..42fb6a47db 100644 --- a/src/world/area_mac/mac_06/8659C0.c +++ b/src/world/area_mac/mac_06/8659C0.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80240E80_8659C0); -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80241098); +INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80241098_865BD8); -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80241290); +INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80241290_865DD0); -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_802412AC); +INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_802412AC_865DEC); -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80241388); +INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_80241388_865EC8); -INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_802415FC); +INCLUDE_ASM(s32, "world/area_mac/mac_06/8659C0", func_802415FC_86613C); diff --git a/src/world/area_mac/machi/7E73A0.c b/src/world/area_mac/machi/7E73A0.c index 41461dc88c..99f3ea29f7 100644 --- a/src/world/area_mac/machi/7E73A0.c +++ b/src/world/area_mac/machi/7E73A0.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240000); +INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240000_7E73A0); -INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240030); +INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240030_7E73D0); -INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240038); +INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240038_7E73D8); -INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240040); +INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240040_7E73E0); -INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240048); +INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240048_7E73E8); -INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_802400C8); +INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_802400C8_7E7468); -INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240114); +INCLUDE_ASM(s32, "world/area_mac/machi/7E73A0", func_80240114_7E74B4); diff --git a/src/world/area_mac/machi/7E7550.c b/src/world/area_mac/machi/7E7550.c index 4d92f7a56f..9b447c6679 100644 --- a/src/world/area_mac/machi/7E7550.c +++ b/src/world/area_mac/machi/7E7550.c @@ -1,15 +1,15 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_802401B0); +INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_802401B0_7E7550); -INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_802402EC); +INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_802402EC_7E768C); -INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_80240318); +INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_80240318_7E76B8); -INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_80240344); +INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_80240344_7E76E4); -INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_802403A0); +INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_802403A0_7E7740); -INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_80240410); +INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_80240410_7E77B0); -INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_8024045C); +INCLUDE_ASM(s32, "world/area_mac/machi/7E7550", func_8024045C_7E77FC); diff --git a/src/world/area_mac/machi/7E7850.c b/src/world/area_mac/machi/7E7850.c index 65281201dc..350ed6c733 100644 --- a/src/world/area_mac/machi/7E7850.c +++ b/src/world/area_mac/machi/7E7850.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mac/machi/7E7850", func_802404B0); +INCLUDE_ASM(s32, "world/area_mac/machi/7E7850", func_802404B0_7E7850); diff --git a/src/world/area_mgm/mgm_00/E0E7A0.c b/src/world/area_mgm/mgm_00/E0E7A0.c index f3c3a8cf02..3aefa00349 100644 --- a/src/world/area_mgm/mgm_00/E0E7A0.c +++ b/src/world/area_mgm/mgm_00/E0E7A0.c @@ -26,14 +26,14 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240A10_E0F1B0); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240A84_E0F224); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240AFC); +INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240AFC_E0F29C); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240C2C_E0F3CC); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240D4C); +INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240D4C_E0F4EC); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240DB4); +INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240DB4_E0F554); -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240E74); +INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80240E74_E0F614); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0E7A0", func_80241170_E0F910); diff --git a/src/world/area_mgm/mgm_00/E0F980.c b/src/world/area_mgm/mgm_00/E0F980.c index 609762f3a4..cf5f96aff3 100644 --- a/src/world/area_mgm/mgm_00/E0F980.c +++ b/src/world/area_mgm/mgm_00/E0F980.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0F980", func_802411E0); +INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0F980", func_802411E0_E0F980); INCLUDE_ASM(s32, "world/area_mgm/mgm_00/E0F980", func_80241540_E0FCE0); diff --git a/src/world/area_mgm/mgm_01/E12930.c b/src/world/area_mgm/mgm_01/E12930.c index 93d0fd473a..ead774acfa 100644 --- a/src/world/area_mgm/mgm_01/E12930.c +++ b/src/world/area_mgm/mgm_01/E12930.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802407E4_E12F44); INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_8024084C_E12FAC); -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802408EC); +INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_802408EC_E1304C); INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240AAC_E1320C); @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240CD0_E13430); INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240D84_E134E4); -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240DB8); +INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240DB8_E13518); INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240ECC_E1362C); @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80240F90_E136F0); INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241090_E137F0); -INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241234); +INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241234_E13994); INCLUDE_ASM(s32, "world/area_mgm/mgm_01/E12930", func_80241510_E13C70); diff --git a/src/world/area_mgm/mgm_02/E15D80.c b/src/world/area_mgm/mgm_02/E15D80.c index 699769c1eb..27ba4000cc 100644 --- a/src/world/area_mgm/mgm_02/E15D80.c +++ b/src/world/area_mgm/mgm_02/E15D80.c @@ -24,14 +24,14 @@ INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80241DCC_E17B4C); INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80241F38_E17CB8); -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80241FE4); +INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80241FE4_E17D64); -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80242274); +INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80242274_E17FF4); -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_802422D0); +INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_802422D0_E18050); INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80242314_E18094); -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80242340); +INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_80242340_E180C0); -INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_802423A4); +INCLUDE_ASM(s32, "world/area_mgm/mgm_02/E15D80", func_802423A4_E18124); diff --git a/src/world/area_mim/mim_01/B93940.c b/src/world/area_mim/mim_01/B93940.c index 1e4dce542b..9b4d10a521 100644 --- a/src/world/area_mim/mim_01/B93940.c +++ b/src/world/area_mim/mim_01/B93940.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_8024056C_B939AC); INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802405DC_B93A1C); -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802406B4); +INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_802406B4_B93AF4); INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240708_B93B48); @@ -18,14 +18,14 @@ INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240DD0_B94210); INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240E3C_B9427C); -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240F38); +INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80240F38_B94378); -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241978); +INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241978_B94DB8); -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241A08); +INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241A08_B94E48); INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241B08_B94F48); -INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241B68); +INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241B68_B94FA8); INCLUDE_ASM(s32, "world/area_mim/mim_01/B93940", func_80241C54_B95094); diff --git a/src/world/area_mim/mim_02/B97C70.c b/src/world/area_mim/mim_02/B97C70.c index 5ac51dc59b..cdf41823fa 100644 --- a/src/world/area_mim/mim_02/B97C70.c +++ b/src/world/area_mim/mim_02/B97C70.c @@ -6,9 +6,9 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802402A0_B97EA0); INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802405D8_B981D8); -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240698); +INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80240698_B98298); -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024083C); +INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024083C_B9843C); INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024091C_B9851C); @@ -24,4 +24,4 @@ INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_802410B0_B98CB0); INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_80241104_B98D04); -INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024113C); +INCLUDE_ASM(s32, "world/area_mim/mim_02/B97C70", func_8024113C_B98D3C); diff --git a/src/world/area_mim/mim_04/B9DB60.c b/src/world/area_mim/mim_04/B9DB60.c index 0e7a74894c..308370ae04 100644 --- a/src/world/area_mim/mim_04/B9DB60.c +++ b/src/world/area_mim/mim_04/B9DB60.c @@ -16,6 +16,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240DAC_B9E70C); INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80240DF0_B9E750); -INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80241014); +INCLUDE_ASM(s32, "world/area_mim/mim_04/B9DB60", func_80241014_B9E974); #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_mim/mim_05/BA07A0.c b/src/world/area_mim/mim_05/BA07A0.c index de657899d2..9c0cc35d54 100644 --- a/src/world/area_mim/mim_05/BA07A0.c +++ b/src/world/area_mim/mim_05/BA07A0.c @@ -2,13 +2,13 @@ INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240070_BA07A0); -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802400DC); +INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802400DC_BA080C); -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024014C); +INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024014C_BA087C); INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240224_BA0954); -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240278); +INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80240278_BA09A8); INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_8024042C_BA0B5C); @@ -24,8 +24,8 @@ INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802414E8_BA1C18); INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80241578_BA1CA8); -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80241678); +INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_80241678_BA1DA8); -INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802416D8); +INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802416D8_BA1E08); INCLUDE_ASM(s32, "world/area_mim/mim_05/BA07A0", func_802417C4_BA1EF4); diff --git a/src/world/area_mim/mim_06/BA4CF0.c b/src/world/area_mim/mim_06/BA4CF0.c index 061dcb44a3..eb41061801 100644 --- a/src/world/area_mim/mim_06/BA4CF0.c +++ b/src/world/area_mim/mim_06/BA4CF0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240570_BA4CF0); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802405DC_BA4D5C); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024064C); +INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024064C_BA4DCC); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240724_BA4EA4); @@ -16,27 +16,27 @@ INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240B8C_BA530C); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240E40_BA55C0); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240EAC); +INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240EAC_BA562C); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80240FA8_BA5728); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802419E8_BA6168); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241A78); +INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241A78_BA61F8); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241B78); +INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241B78_BA62F8); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241BD8_BA6358); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241CC4); +INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241CC4_BA6444); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241F14); +INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80241F14_BA6694); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_80242144_BA68C4); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024247C_BA6BFC); -INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024253C); +INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_8024253C_BA6CBC); INCLUDE_ASM(s32, "world/area_mim/mim_06/BA4CF0", func_802426E0_BA6E60); diff --git a/src/world/area_mim/mim_07/BAA1B0.c b/src/world/area_mim/mim_07/BAA1B0.c index 36764480e9..e093875da7 100644 --- a/src/world/area_mim/mim_07/BAA1B0.c +++ b/src/world/area_mim/mim_07/BAA1B0.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA1B0", func_80240070_BAA1B0); -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA1B0", func_802400D8); +INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA1B0", func_802400D8_BAA218); -INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA1B0", func_80240244); +INCLUDE_ASM(s32, "world/area_mim/mim_07/BAA1B0", func_80240244_BAA384); diff --git a/src/world/area_mim/mim_08/BAD940.c b/src/world/area_mim/mim_08/BAD940.c index bb3b5e6076..84a78ab8ed 100644 --- a/src/world/area_mim/mim_08/BAD940.c +++ b/src/world/area_mim/mim_08/BAD940.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240878_BAE1B8); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240938_BAE278); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240C7C); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240C7C_BAE5BC); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240CF4_BAE634); @@ -20,38 +20,38 @@ INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240D60_BAE6A0); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240E94_BAE7D4); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240EF8); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80240EF8_BAE838); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241288); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241288_BAEBC8); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802413AC_BAECEC); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241598); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241598_BAEED8); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241604); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241604_BAEF44); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241674); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241674_BAEFB4); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_8024174C_BAF08C); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_802417A0_BAF0E0); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241954); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241954_BAF294); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241BB4); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241BB4_BAF4F4); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241E68); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241E68_BAF7A8); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241ED4); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241ED4_BAF814); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80241FD0_BAF910); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242A10); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242A10_BB0350); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242AA0); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242AA0_BB03E0); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", pause_set_cursor_opacity_BB04E0); INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242C00_BB0540); -INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242CEC); +INCLUDE_ASM(s32, "world/area_mim/mim_08/BAD940", func_80242CEC_BB062C); diff --git a/src/world/area_mim/mim_09/BB2E00.c b/src/world/area_mim/mim_09/BB2E00.c index c0206121fc..c17c2357ec 100644 --- a/src/world/area_mim/mim_09/BB2E00.c +++ b/src/world/area_mim/mim_09/BB2E00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802400A0_BB2EA0); INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802402D0_BB30D0); -INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240608); +INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_80240608_BB3408); INCLUDE_ASM(s32, "world/area_mim/mim_09/BB2E00", func_802406C8_BB34C8); diff --git a/src/world/area_mim/mim_10/BB59E0.c b/src/world/area_mim/mim_10/BB59E0.c index a782ca3fc5..c6c7f124a3 100644 --- a/src/world/area_mim/mim_10/BB59E0.c +++ b/src/world/area_mim/mim_10/BB59E0.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_80240030_BB5A10); INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_80240080_BB5A60); -INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_802400EC); +INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_802400EC_BB5ACC); -INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_80240148); +INCLUDE_ASM(s32, "world/area_mim/mim_10/BB59E0", func_80240148_BB5B28); diff --git a/src/world/area_mim/mim_11/BB7070.c b/src/world/area_mim/mim_11/BB7070.c index 48766532c0..a06925fb17 100644 --- a/src/world/area_mim/mim_11/BB7070.c +++ b/src/world/area_mim/mim_11/BB7070.c @@ -18,6 +18,6 @@ INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240404_BB7474); INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_802405EC_BB765C); -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_8024066C); +INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_8024066C_BB76DC); -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240790); +INCLUDE_ASM(s32, "world/area_mim/mim_11/BB7070", func_80240790_BB7800); diff --git a/src/world/area_mim/mim_11/BB79F0.c b/src/world/area_mim/mim_11/BB79F0.c index 79d5128f73..b25a3d61e4 100644 --- a/src/world/area_mim/mim_11/BB79F0.c +++ b/src/world/area_mim/mim_11/BB79F0.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB79F0", func_80240980); +INCLUDE_ASM(s32, "world/area_mim/mim_11/BB79F0", func_80240980_BB79F0); -INCLUDE_ASM(s32, "world/area_mim/mim_11/BB79F0", func_802409F0); +INCLUDE_ASM(s32, "world/area_mim/mim_11/BB79F0", func_802409F0_BB7A60); diff --git a/src/world/area_mim/mim_12/BBB380.c b/src/world/area_mim/mim_12/BBB380.c index 21d72970ad..6e76a3efd3 100644 --- a/src/world/area_mim/mim_12/BBB380.c +++ b/src/world/area_mim/mim_12/BBB380.c @@ -4,10 +4,10 @@ INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_80240000_BBB380); INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_80240064_BBB3E4); -INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_802400CC); +INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_802400CC_BBB44C); INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_8024019C_BBB51C); -INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_8024025C); +INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_8024025C_BBB5DC); INCLUDE_ASM(s32, "world/area_mim/mim_12/BBB380", func_802404A8_BBB828); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 8b1d0cb012..a39efb44a0 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -22,27 +22,27 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A6C_9C5E4C); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A8C); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A8C_9C5E6C); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30_9C5F10); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240BB0); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240BB0_9C5F90); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240BE0_9C5FC0); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C0C); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C0C_9C5FEC); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C2C); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C2C_9C600C); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C80_9C6060); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240CFC); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240CFC_9C60DC); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D30_9C6110); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D60); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D60_9C6140); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", delete_player_actor_9C6148); @@ -50,21 +50,21 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", delete_player_actor_9C6148); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E80_9C6260); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E94); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E94_9C6274); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802410C8); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802410C8_9C64A8); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241114); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241114_9C64F4); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241134); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241134_9C6514); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241194); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241194_9C6574); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802412E0_9C66C0); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241454); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241454_9C6834); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802414D8_9C68B8); @@ -72,31 +72,31 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802416F0_9C6AD0); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802417A4_9C6B84); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802417D8); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802417D8_9C6BB8); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241858); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241858_9C6C38); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241870_9C6C50); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024188C); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024188C_9C6C6C); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418A4); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418A4_9C6C84); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418D4); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418D4_9C6CB4); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241948); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241948_9C6D28); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802419E8_9C6DC8); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241BE8); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241BE8_9C6FC8); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241C78_9C7058); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60_9C7140); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241DCC); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241DCC_9C71AC); #include "world/common/GetNpcCollisionHeight.inc.c" @@ -104,38 +104,38 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241DCC); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242028_9C7408); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024207C_9C745C); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802420B4_9C7494); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242150); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242150_9C7530); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242240); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242240_9C7620); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802423CC); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802423CC_9C77AC); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242410_9C77F0); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024243C); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024243C_9C781C); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242514_9C78F4); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802426A4); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802426A4_9C7A84); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242760); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242760_9C7B40); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242790); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242790_9C7B70); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802427C0); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802427C0_9C7BA0); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242804); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242804_9C7BE4); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242858_9C7C38); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242898_9C7C78); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428B8); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428B8_9C7C98); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428D8); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802428D8_9C7CB8); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242910); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80242910_9C7CF0); diff --git a/src/world/area_nok/nok_01/9C7D10.c b/src/world/area_nok/nok_01/9C7D10.c index 55f2cb1ec7..b8bba1e40c 100644 --- a/src/world/area_nok/nok_01/9C7D10.c +++ b/src/world/area_nok/nok_01/9C7D10.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C7D10", func_80242930); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C7D10", func_80242930_9C7D10); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C7D10", func_802429A0); +INCLUDE_ASM(s32, "world/area_nok/nok_01/9C7D10", func_802429A0_9C7D80); diff --git a/src/world/area_nok/nok_02/9D7020.c b/src/world/area_nok/nok_02/9D7020.c index 81abb6740e..a25d2aa5b9 100644 --- a/src/world/area_nok/nok_02/9D7020.c +++ b/src/world/area_nok/nok_02/9D7020.c @@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802402E0_9D7300); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240624_9D7644); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240678); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_80240678_9D7698); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7020", func_802406B0_9D76D0); diff --git a/src/world/area_nok/nok_02/9D7770.c b/src/world/area_nok/nok_02/9D7770.c index a8cc77426e..395fbe6b5d 100644 --- a/src/world/area_nok/nok_02/9D7770.c +++ b/src/world/area_nok/nok_02/9D7770.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7770", func_80240750); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7770", func_80240750_9D7770); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 85e5bbacce..6170cb4e2a 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240A80); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240A80_9D7AA0); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240BD8_9D7BF8); @@ -8,104 +8,104 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240E80_9D7EA0); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80240F40_9D7F60); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802410FC); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802410FC_9D811C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802411B0_9D81D0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241224); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241224_9D8244); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024129C); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024129C_9D82BC); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802413CC); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802413CC_9D83EC); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802414EC); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802414EC_9D850C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241554); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241554_9D8574); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241614); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241614_9D8634); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A28); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A28_9D8A48); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A3C); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A3C_9D8A5C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241C70); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241C70_9D8C90); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CBC); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CBC_9D8CDC); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CDC); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CDC_9D8CFC); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241D3C); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241D3C_9D8D5C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241E88); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241E88_9D8EA8); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241FFC); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241FFC_9D901C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242080); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242080_9D90A0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242298); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242298_9D92B8); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024234C); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024234C_9D936C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242380_9D93A0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242400); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242400_9D9420); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242418); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242418_9D9438); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242434); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242434_9D9454); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024244C); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024244C_9D946C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024247C); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024247C_9D949C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802424F0); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802424F0_9D9510); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242590); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242590_9D95B0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242790_9D97B0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242820); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242820_9D9840); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242974); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242974_9D9994); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242BD0_9D9BF0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C24_9D9C44); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242C5C_9D9C7C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242CF8); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242CF8_9D9D18); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242DE8); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242DE8_9D9E08); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242F74_9D9F94); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FB8); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FB8_9D9FD8); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FE4); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242FE4_9DA004); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243010); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243010_9DA030); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802430CC); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802430CC_9DA0EC); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243214); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243214_9DA234); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243294); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243294_9DA2B4); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024351C); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024351C_9DA53C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80243754_9DA774); diff --git a/src/world/area_nok/nok_02/9DA8F0.c b/src/world/area_nok/nok_02/9DA8F0.c index c3d6065933..540933f39f 100644 --- a/src/world/area_nok/nok_02/9DA8F0.c +++ b/src/world/area_nok/nok_02/9DA8F0.c @@ -1,31 +1,31 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802438D0); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802438D0_9DA8F0); #include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243BEC_9DAC0C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C40); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C40_9DAC60); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C78); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243C78_9DAC98); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243D14_9DAD34); INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243DB0_9DADD0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243EC8); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243EC8_9DAEE8); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243F10); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80243F10_9DAF30); INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80244078_9DB098); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80244224); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80244224_9DB244); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80244288); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_80244288_9DB2A8); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802442E0); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DA8F0", func_802442E0_9DB300); diff --git a/src/world/area_nok/nok_02/9DB380.c b/src/world/area_nok/nok_02/9DB380.c index 4779f90a00..484cb3f421 100644 --- a/src/world/area_nok/nok_02/9DB380.c +++ b/src/world/area_nok/nok_02/9DB380.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DB380", func_80244360); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DB380", func_80244360_9DB380); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9DB380", func_802443D0); +INCLUDE_ASM(s32, "world/area_nok/nok_02/9DB380", func_802443D0_9DB3F0); diff --git a/src/world/area_nok/nok_04/9EDBF0.c b/src/world/area_nok/nok_04/9EDBF0.c index 93d122ac21..da5ffa925c 100644 --- a/src/world/area_nok/nok_04/9EDBF0.c +++ b/src/world/area_nok/nok_04/9EDBF0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_802403C0_9EDFB0); INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_802404D0_9EE0C0); -INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_8024051C); +INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_8024051C_9EE10C); INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_80240548_9EE138); @@ -22,6 +22,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_802406C4_9EE2B4); INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_80240814_9EE404); -INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_80240E4C); +INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_80240E4C_9EEA3C); INCLUDE_ASM(s32, "world/area_nok/nok_04/9EDBF0", func_80240E70_9EEA60); diff --git a/src/world/area_nok/nok_11/9F4A40.c b/src/world/area_nok/nok_11/9F4A40.c index c961baf873..5a791e1b92 100644 --- a/src/world/area_nok/nok_11/9F4A40.c +++ b/src/world/area_nok/nok_11/9F4A40.c @@ -18,24 +18,24 @@ INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80240FAC_9F59EC); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024106C_9F5AAC); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802413B0); +INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802413B0_9F5DF0); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241428_9F5E68); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241494); +INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241494_9F5ED4); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802415C8); +INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802415C8_9F6008); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024162C); +INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_8024162C_9F606C); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_802419BC_9F63FC); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241AE0); +INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241AE0_9F6520); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241CCC_9F670C); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241D3C_9F677C); -INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241F08); +INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241F08_9F6948); INCLUDE_ASM(s32, "world/area_nok/nok_11/9F4A40", func_80241F30_9F6970); diff --git a/src/world/area_nok/nok_12/9FA970.c b/src/world/area_nok/nok_12/9FA970.c index 8407070c3d..0e8145a00d 100644 --- a/src/world/area_nok/nok_12/9FA970.c +++ b/src/world/area_nok/nok_12/9FA970.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FA970", func_80240180); +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FA970", func_80240180_9FA970); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FA970", func_80240224); +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FA970", func_80240224_9FAA14); diff --git a/src/world/area_nok/nok_12/9FAD60.c b/src/world/area_nok/nok_12/9FAD60.c index 837440c182..d9ced66057 100644 --- a/src/world/area_nok/nok_12/9FAD60.c +++ b/src/world/area_nok/nok_12/9FAD60.c @@ -1,12 +1,12 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240570); +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240570_9FAD60); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802405EC_9FADDC); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240720_9FAF10); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240884); +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240884_9FB074); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80240904_9FB0F4); @@ -20,13 +20,13 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241204_9FB9F4); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802413C0_9FBBB0); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241474); +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241474_9FBC64); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802414E8); +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802414E8_9FBCD8); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241560_9FBD50); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241690); +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241690_9FBE80); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802417B0_9FBFA0); @@ -34,4 +34,4 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241818_9FC008); INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_802418D8_9FC0C8); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241BD4); +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FAD60", func_80241BD4_9FC3C4); diff --git a/src/world/area_nok/nok_12/9FC6D0.c b/src/world/area_nok/nok_12/9FC6D0.c index e8e501a9ca..6930b814c9 100644 --- a/src/world/area_nok/nok_12/9FC6D0.c +++ b/src/world/area_nok/nok_12/9FC6D0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_nok/nok_12/9FC6D0", func_80241EE0_9FC6D0); -INCLUDE_ASM(s32, "world/area_nok/nok_12/9FC6D0", func_80241FD0); +INCLUDE_ASM(s32, "world/area_nok/nok_12/9FC6D0", func_80241FD0_9FC7C0); diff --git a/src/world/area_nok/nok_13/A01420.c b/src/world/area_nok/nok_13/A01420.c index 7ca7ad8dd4..96d3bc28c1 100644 --- a/src/world/area_nok/nok_13/A01420.c +++ b/src/world/area_nok/nok_13/A01420.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_nok/nok_13/A01420", func_80240E20_A01420); -INCLUDE_ASM(s32, "world/area_nok/nok_13/A01420", func_80241360); +INCLUDE_ASM(s32, "world/area_nok/nok_13/A01420", func_80241360_A01960); INCLUDE_ASM(s32, "world/area_nok/nok_13/A01420", func_802413CC_A019CC); diff --git a/src/world/area_nok/nok_14/A029C0.c b/src/world/area_nok/nok_14/A029C0.c index 7437ad6d2b..323d47678b 100644 --- a/src/world/area_nok/nok_14/A029C0.c +++ b/src/world/area_nok/nok_14/A029C0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A029C0", func_80240180_A029C0); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A029C0", func_8024019C); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A029C0", func_8024019C_A029DC); diff --git a/src/world/area_nok/nok_14/A02A00.c b/src/world/area_nok/nok_14/A02A00.c index 4bdf6c6b66..b7a7ad1e39 100644 --- a/src/world/area_nok/nok_14/A02A00.c +++ b/src/world/area_nok/nok_14/A02A00.c @@ -6,38 +6,38 @@ INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024023C_A02A7C); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240370_A02BB0); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802404D4); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802404D4_A02D14); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240554); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240554_A02D94); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240994); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240994_A031D4); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240B44); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80240B44_A03384); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024116C_A039AC); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024122C); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_8024122C_A03A6C); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241570_A03DB0); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802415E8); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802415E8_A03E28); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241654); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241654_A03E94); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241788); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241788_A03FC8); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802417EC); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802417EC_A0402C); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241B7C); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241B7C_A043BC); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241CA0_A044E0); INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241E8C_A046CC); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241FB4); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80241FB4_A047F4); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80242070); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80242070_A048B0); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80242188); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_80242188_A049C8); -INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802421CC); +INCLUDE_ASM(s32, "world/area_nok/nok_14/A02A00", func_802421CC_A04A0C); diff --git a/src/world/area_nok/nok_15/A06F00.c b/src/world/area_nok/nok_15/A06F00.c index 64ec7f6e2b..cd603871ff 100644 --- a/src/world/area_nok/nok_15/A06F00.c +++ b/src/world/area_nok/nok_15/A06F00.c @@ -18,38 +18,38 @@ INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024035C_A0725C); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240490_A07390); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802405F4); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802405F4_A074F4); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240674); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240674_A07574); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240AB4_A079B4); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80240C64_A07B64); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024128C); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024128C_A0818C); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024134C); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024134C_A0824C); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241690_A08590); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241708); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241708_A08608); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241774_A08674); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802418A8); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802418A8_A087A8); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_8024190C_A0880C); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241C9C_A08B9C); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241DC0); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241DC0_A08CC0); INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80241FAC_A08EAC); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802420D4); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802420D4_A08FD4); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80242190); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_80242190_A09090); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802422A8); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802422A8_A091A8); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802422EC); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A06F00", func_802422EC_A091EC); diff --git a/src/world/area_nok/nok_15/A09440.c b/src/world/area_nok/nok_15/A09440.c index 5763cb958a..94b914ae58 100644 --- a/src/world/area_nok/nok_15/A09440.c +++ b/src/world/area_nok/nok_15/A09440.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_nok/nok_15/A09440", func_80242540); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A09440", func_80242540_A09440); -INCLUDE_ASM(s32, "world/area_nok/nok_15/A09440", func_802425B0); +INCLUDE_ASM(s32, "world/area_nok/nok_15/A09440", func_802425B0_A094B0); diff --git a/src/world/area_obk/obk_01/BBD980.c b/src/world/area_obk/obk_01/BBD980.c index d4b44b3bf9..4d52a8675b 100644 --- a/src/world/area_obk/obk_01/BBD980.c +++ b/src/world/area_obk/obk_01/BBD980.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_802407E0_BBD980); #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B24); +INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B24_BBDCC4); INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD980", func_80240B78_BBDD18); diff --git a/src/world/area_obk/obk_02/BC2A90.c b/src/world/area_obk/obk_02/BC2A90.c index bcf2eb55d5..348fd6fd13 100644 --- a/src/world/area_obk/obk_02/BC2A90.c +++ b/src/world/area_obk/obk_02/BC2A90.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_80240000_BC2A90); -INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_8024000C); +INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_8024000C_BC2A9C); INCLUDE_ASM(s32, "world/area_obk/obk_02/BC2A90", func_80240194_BC2C24); diff --git a/src/world/area_obk/obk_03/BC43F0.c b/src/world/area_obk/obk_03/BC43F0.c index 3dc51e799f..981d70babf 100644 --- a/src/world/area_obk/obk_03/BC43F0.c +++ b/src/world/area_obk/obk_03/BC43F0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240170_BC43F0); #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4); +INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802404B4_BC4734); INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240508_BC4788); @@ -18,6 +18,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802405DC_BC485C); INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_802406CC_BC494C); -INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240858); +INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_80240858_BC4AD8); INCLUDE_ASM(s32, "world/area_obk/obk_03/BC43F0", func_8024089C_BC4B1C); diff --git a/src/world/area_obk/obk_04/BC7EB0.c b/src/world/area_obk/obk_04/BC7EB0.c index 47be1c0b0e..c66cc5c81a 100644 --- a/src/world/area_obk/obk_04/BC7EB0.c +++ b/src/world/area_obk/obk_04/BC7EB0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240050_BC7EB0); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_802400D0_BC7F30); -INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240198); +INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240198_BC7FF8); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_8024022C_BC808C); @@ -22,13 +22,13 @@ INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240940_BC87A0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240A58); +INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240A58_BC88B8); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240C10_BC8A70); -INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240CA0); +INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240CA0_BC8B00); -INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240D00); +INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240D00_BC8B60); INCLUDE_ASM(s32, "world/area_obk/obk_04/BC7EB0", func_80240D14_BC8B74); diff --git a/src/world/area_obk/obk_05/BCD7D0.c b/src/world/area_obk/obk_05/BCD7D0.c index 3d6d57f19e..1f9babc830 100644 --- a/src/world/area_obk/obk_05/BCD7D0.c +++ b/src/world/area_obk/obk_05/BCD7D0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD7D0", func_80240770_BCD7D0); INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD7D0", func_802407A0_BCD800); -INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD7D0", func_802407AC); +INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD7D0", func_802407AC_BCD80C); INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD7D0", func_80240934_BCD994); diff --git a/src/world/area_obk/obk_07/BCEEB0.c b/src/world/area_obk/obk_07/BCEEB0.c index 476701e360..446e84a294 100644 --- a/src/world/area_obk/obk_07/BCEEB0.c +++ b/src/world/area_obk/obk_07/BCEEB0.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_802402C0_BCEEB0); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_802402CC); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_802402CC_BCEEBC); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCEEB0", func_80240454_BCF044); diff --git a/src/world/area_obk/obk_07/BCF0F0.c b/src/world/area_obk/obk_07/BCF0F0.c index 66b41e08ee..82fba5b4c0 100644 --- a/src/world/area_obk/obk_07/BCF0F0.c +++ b/src/world/area_obk/obk_07/BCF0F0.c @@ -6,13 +6,13 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80240540_BCF130); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80240564_BCF154); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80240A10); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80240A10_BCF600); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80240A6C_BCF65C); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80240EF8_BCFAE8); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802410C0); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802410C0_BCFCB0); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241130_BCFD20); @@ -20,21 +20,21 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241168_BCFD58); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_8024130C_BCFEFC); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241358); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241358_BCFF48); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802413D0_BCFFC0); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_8024143C); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_8024143C_BD002C); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_8024146C_BD005C); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802414B4_BD00A4); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241518); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241518_BD0108); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_8024157C); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_8024157C_BD016C); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802415B8); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802415B8_BD01A8); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802415F4_BD01E4); @@ -50,6 +50,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241790_BD0380); INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241898_BD0488); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802418E0); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_802418E0_BD04D0); -INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241B50); +INCLUDE_ASM(s32, "world/area_obk/obk_07/BCF0F0", func_80241B50_BD0740); diff --git a/src/world/area_obk/obk_08/BD3870.c b/src/world/area_obk/obk_08/BD3870.c index 8005960886..1f755a968e 100644 --- a/src/world/area_obk/obk_08/BD3870.c +++ b/src/world/area_obk/obk_08/BD3870.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_80240000_BD3870); INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_802403DC_BD3C4C); -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_802404F0); +INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_802404F0_BD3D60); INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_8024055C_BD3DCC); @@ -12,6 +12,6 @@ INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_8024061C_BD3E8C); INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_802406DC_BD3F4C); -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_8024079C); +INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_8024079C_BD400C); -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_80240808); +INCLUDE_ASM(s32, "world/area_obk/obk_08/BD3870", func_80240808_BD4078); diff --git a/src/world/area_obk/obk_08/BD40B0.c b/src/world/area_obk/obk_08/BD40B0.c index 69e49fdabc..00d4e6dbe9 100644 --- a/src/world/area_obk/obk_08/BD40B0.c +++ b/src/world/area_obk/obk_08/BD40B0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_obk/obk_08/BD40B0", func_80240840_BD40B0); -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD40B0", func_80240870); +INCLUDE_ASM(s32, "world/area_obk/obk_08/BD40B0", func_80240870_BD40E0); diff --git a/src/world/area_obk/obk_08/BD4110.c b/src/world/area_obk/obk_08/BD4110.c index b4c859e42c..f5d46294a8 100644 --- a/src/world/area_obk/obk_08/BD4110.c +++ b/src/world/area_obk/obk_08/BD4110.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_802408A0_BD4110); INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240920_BD4190); -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_802409E8); +INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_802409E8_BD4258); INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240A7C_BD42EC); @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240CA0_BD4510); INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240D10_BD4580); -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240FD8); +INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240FD8_BD4848); INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4110", func_80240FE4_BD4854); diff --git a/src/world/area_obk/obk_08/BD4A90.c b/src/world/area_obk/obk_08/BD4A90.c index 44a56418bf..330366fdd1 100644 --- a/src/world/area_obk/obk_08/BD4A90.c +++ b/src/world/area_obk/obk_08/BD4A90.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4A90", func_80241220); +INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4A90", func_80241220_BD4A90); INCLUDE_ASM(s32, "world/area_obk/obk_08/BD4A90", func_802412BC_BD4B2C); diff --git a/src/world/area_obk/obk_09/BDA940.c b/src/world/area_obk/obk_09/BDA940.c index cde4c3efd7..8264f881b6 100644 --- a/src/world/area_obk/obk_09/BDA940.c +++ b/src/world/area_obk/obk_09/BDA940.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_obk/obk_09/BDA940", func_80240190); +INCLUDE_ASM(s32, "world/area_obk/obk_09/BDA940", func_80240190_BDA940); INCLUDE_ASM(s32, "world/area_obk/obk_09/BDA940", func_80240248_BDA9F8); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index 894a9b94f3..31c21645e0 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -16,13 +16,13 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240B48_D9E018); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240BA8_D9E078); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240EDC); +INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240EDC_D9E3AC); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80240F90_D9E460); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802410B0_D9E580); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241110); +INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241110_D9E5E0); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241188_D9E658); @@ -46,14 +46,14 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241D7C_D9F24C); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241DC0_D9F290); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241E60); +INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241E60_D9F330); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241EA4); +INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241EA4_D9F374); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802423E0); +INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_802423E0_D9F8B0); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024283C); +INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024283C_D9FD0C); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80242B5C); +INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80242B5C_DA002C); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80242B70); +INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80242B70_DA0040); diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index 72956deb47..b31b3aa05d 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -6,16 +6,16 @@ INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024003C_DA527C); INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240104_DA5344); -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240188); +INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240188_DA53C8); -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024020C); +INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024020C_DA544C); INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_802402B0_DA54F0); INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_802403A8_DA55E8); -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240538); +INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240538_DA5778); -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024057C); +INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024057C_DA57BC); INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_802406A0_DA58E0); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 2d770adf6f..3d8fbf8d47 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240C38_DAE038); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240F7C_DAE37C); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240FF4); +INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240FF4_DAE3F4); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241060_DAE460); @@ -34,18 +34,18 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802411F8_DAE5F8); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241588_DAE988); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802416AC); +INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802416AC_DAEAAC); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241898_DAEC98); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241908); +INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241908_DAED08); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802419D8_DAEDD8); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241A70); +INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241A70_DAEE70); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241AD0_DAEED0); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241E04_DAF204); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241E20); +INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80241E20_DAF220); diff --git a/src/world/area_omo/omo_05/DB22C0.c b/src/world/area_omo/omo_05/DB22C0.c index a3bd1769ac..8de8630c93 100644 --- a/src/world/area_omo/omo_05/DB22C0.c +++ b/src/world/area_omo/omo_05/DB22C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240070_DB2330); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240140_DB2400); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802401D8); +INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802401D8_DB2498); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240238_DB24F8); @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240780_DB2A40); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240A54_DB2D14); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240C04); +INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80240C04_DB2EC4); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_8024122C_DB34EC); @@ -26,15 +26,15 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802412EC_DB35AC); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241630_DB38F0); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802416A8); +INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802416A8_DB3968); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241714); +INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241714_DB39D4); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241848_DB3B08); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802418AC_DB3B6C); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241C3C); +INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241C3C_DB3EFC); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80241D60_DB4020); @@ -46,10 +46,10 @@ INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242178_DB4438); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802421CC_DB448C); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242204); +INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242204_DB44C4); INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802422A0_DB4560); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242328); +INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_80242328_DB45E8); -INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802423C8); +INCLUDE_ASM(s32, "world/area_omo/omo_05/DB22C0", func_802423C8_DB4688); diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c index fdabc5156c..339130fac2 100644 --- a/src/world/area_omo/omo_06/DB7910.c +++ b/src/world/area_omo/omo_06/DB7910.c @@ -6,9 +6,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_8024001C_DB792C); INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_802400E4_DB79F4); -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240168); +INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240168_DB7A78); -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_802401EC); +INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_802401EC_DB7AFC); INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240290_DB7BA0); diff --git a/src/world/area_omo/omo_06/DB8180.c b/src/world/area_omo/omo_06/DB8180.c index 175d1fe4f6..9221d79f36 100644 --- a/src/world/area_omo/omo_06/DB8180.c +++ b/src/world/area_omo/omo_06/DB8180.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240870_DB8180); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240988); +INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240988_DB8298); -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240AD8); +INCLUDE_ASM(s32, "world/area_omo/omo_06/DB8180", func_80240AD8_DB83E8); diff --git a/src/world/area_omo/omo_07/DBD2B0.c b/src/world/area_omo/omo_07/DBD2B0.c index 2e16a002a9..85a7a09bc3 100644 --- a/src/world/area_omo/omo_07/DBD2B0.c +++ b/src/world/area_omo/omo_07/DBD2B0.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024056C_DBD81C); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802406C4_DBD974); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024096C); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024096C_DBDC1C); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240A2C_DBDCDC); @@ -32,13 +32,13 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80240FD8_DBE288); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241040_DBE2F0); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241100); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241100_DBE3B0); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802413FC_DBE6AC); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024146C_DBE71C); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024153C); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024153C_DBE7EC); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802415D4_DBE884); @@ -50,24 +50,24 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80241B28_DBEDD8); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242150_DBF400); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242210); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242210_DBF4C0); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242554_DBF804); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802425CC); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802425CC_DBF87C); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242638); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242638_DBF8E8); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024276C); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_8024276C_DBFA1C); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_802427D0_DBFA80); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242B60); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242B60_DBFE10); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242C84_DBFF34); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242E70); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242E70_DC0120); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242E8C); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242E8C_DC013C); INCLUDE_ASM(s32, "world/area_omo/omo_07/DBD2B0", func_80242EA8_DC0158); diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index 7cdaafb08f..ef1bcc379f 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -1,13 +1,13 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243038); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243038_DC02E8); INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431DC); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431DC_DC048C); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431F8); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431F8_DC04A8); diff --git a/src/world/area_omo/omo_07/DC04D0.c b/src/world/area_omo/omo_07/DC04D0.c index 3dc8ca981a..fea804ab41 100644 --- a/src/world/area_omo/omo_07/DC04D0.c +++ b/src/world/area_omo/omo_07/DC04D0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC04D0", func_80243220); +INCLUDE_ASM(s32, "world/area_omo/omo_07/DC04D0", func_80243220_DC04D0); diff --git a/src/world/area_omo/omo_09/DCCCD0.c b/src/world/area_omo/omo_09/DCCCD0.c index 79d25b0345..638cf92aba 100644 --- a/src/world/area_omo/omo_09/DCCCD0.c +++ b/src/world/area_omo/omo_09/DCCCD0.c @@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCCCD0", func_80240000_DCCCD0); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCCCD0", func_80240054_DCCD24); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCCCD0", func_80240078); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCCCD0", func_80240078_DCCD48); diff --git a/src/world/area_omo/omo_09/DCD3F0.c b/src/world/area_omo/omo_09/DCD3F0.c index 355198a5fa..443f397394 100644 --- a/src/world/area_omo/omo_09/DCD3F0.c +++ b/src/world/area_omo/omo_09/DCD3F0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240720_DCD3F0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240838); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240838_DCD508); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD3F0", func_80240988_DCD658); diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index a766b1e18f..19a7e5b3a9 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -20,54 +20,54 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024140C_DCE0DC); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802415C8_DCE298); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024167C); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024167C_DCE34C); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802416F0_DCE3C0); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241768); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241768_DCE438); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241898_DCE568); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802419B8); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802419B8_DCE688); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241A20); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241A20_DCE6F0); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241AE0_DCE7B0); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241DDC); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241DDC_DCEAAC); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241E4C); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241E4C_DCEB1C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241F1C); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241F1C_DCEBEC); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80241FB4_DCEC84); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242014_DCECE4); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242358); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242358_DCF028); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242548); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242548_DCF218); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024268C_DCF35C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024278C); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024278C_DCF45C); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802427D0_DCF4A0); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242870_DCF540); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802428B4); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802428B4_DCF584); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242DF0); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242DF0_DCFAC0); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024324C); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024324C_DCFF1C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024356C); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024356C_DD023C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80243580); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80243580_DD0250); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435B8); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435B8_DD0288); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435CC); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435CC_DD029C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435E8); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435E8_DD02B8); diff --git a/src/world/area_omo/omo_09/DD02E0.c b/src/world/area_omo/omo_09/DD02E0.c index e7901a9bf0..8b0bb33165 100644 --- a/src/world/area_omo/omo_09/DD02E0.c +++ b/src/world/area_omo/omo_09/DD02E0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_omo/omo_09/DD02E0", func_80243610); +INCLUDE_ASM(s32, "world/area_omo/omo_09/DD02E0", func_80243610_DD02E0); diff --git a/src/world/area_omo/omo_11/DDCFC0.c b/src/world/area_omo/omo_11/DDCFC0.c index fb6b5b7497..7def07cec9 100644 --- a/src/world/area_omo/omo_11/DDCFC0.c +++ b/src/world/area_omo/omo_11/DDCFC0.c @@ -6,9 +6,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407AC_DDCFDC); INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407CC_DDCFFC); -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407F8); +INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802407F8_DDD028); -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240864); +INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240864_DDD094); INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802408B0_DDD0E0); @@ -30,8 +30,8 @@ INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80240D90_DDD5C0); INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_802412C8_DDDAF8); -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241408); +INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241408_DDDC38); INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241450_DDDC80); -INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241498); +INCLUDE_ASM(s32, "world/area_omo/omo_11/DDCFC0", func_80241498_DDDCC8); diff --git a/src/world/area_omo/omo_12/DDF310.c b/src/world/area_omo/omo_12/DDF310.c index 6af4777469..2f05b2f8b8 100644 --- a/src/world/area_omo/omo_12/DDF310.c +++ b/src/world/area_omo/omo_12/DDF310.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_80240000_DDF310); INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_80240184_DDF494); -INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_802402DC); +INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_802402DC_DDF5EC); INCLUDE_ASM(s32, "world/area_omo/omo_12/DDF310", func_802402F8_DDF608); diff --git a/src/world/area_omo/omo_13/DE2710.c b/src/world/area_omo/omo_13/DE2710.c index 3a4d3a2e8e..10dad0c07c 100644 --- a/src/world/area_omo/omo_13/DE2710.c +++ b/src/world/area_omo/omo_13/DE2710.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240458_DE28E8); INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802404B8_DE2948); -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802407EC); +INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_802407EC_DE2C7C); INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_8024083C_DE2CCC); @@ -26,4 +26,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F54_DE33E4); INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80240F8C_DE341C); -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80241028); +INCLUDE_ASM(s32, "world/area_omo/omo_13/DE2710", func_80241028_DE34B8); diff --git a/src/world/area_omo/omo_13/DE36C0.c b/src/world/area_omo/omo_13/DE36C0.c index 8d7969f6b2..a13986d719 100644 --- a/src/world/area_omo/omo_13/DE36C0.c +++ b/src/world/area_omo/omo_13/DE36C0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241230_DE36C0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241348); +INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241348_DE37D8); INCLUDE_ASM(s32, "world/area_omo/omo_13/DE36C0", func_80241498_DE3928); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 1b54ef24e6..525d7f33b0 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -14,48 +14,48 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240ACC_DEF96C); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240B1C_DEF9BC); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240CE0); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240CE0_DEFB80); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80240FB4_DEFE54); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241164); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241164_DF0004); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024178C); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024178C_DF062C); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024184C); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024184C_DF06EC); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241B90_DF0A30); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C08); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C08_DF0AA8); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241C74_DF0B14); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241DA8_DF0C48); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241E0C); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80241E0C_DF0CAC); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024219C_DF103C); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802422C0_DF1160); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802424AC); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802424AC_DF134C); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024269C); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024269C_DF153C); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802427E0); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802427E0_DF1680); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802428E0_DF1780); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242924); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242924_DF17C4); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802429C4_DF1864); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242A08_DF18A8); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242F44); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242F44_DF1DE4); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802433A0); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802433A0_DF2240); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802436C0); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802436C0_DF2560); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802436D4); +INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802436D4_DF2574); diff --git a/src/world/area_osr/osr_01/AB0350.c b/src/world/area_osr/osr_01/AB0350.c index d44773f40d..e4fde737d3 100644 --- a/src/world/area_osr/osr_01/AB0350.c +++ b/src/world/area_osr/osr_01/AB0350.c @@ -10,13 +10,13 @@ INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240360_AB0350); INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406A4_AB0694); -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8); +INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802406F8_AB06E8); INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240730_AB0720); INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802407CC_AB07BC); -INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802408BC); +INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_802408BC_AB08AC); INCLUDE_ASM(s32, "world/area_osr/osr_01/AB0350", func_80240A48_AB0A38); diff --git a/src/world/area_osr/osr_03/AB62B0.c b/src/world/area_osr/osr_03/AB62B0.c index 038397fabe..2fc7a110b0 100644 --- a/src/world/area_osr/osr_03/AB62B0.c +++ b/src/world/area_osr/osr_03/AB62B0.c @@ -2,9 +2,9 @@ INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_80240020_AB62B0); -INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_80240090); +INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_80240090_AB6320); -INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_802400C4); +INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_802400C4_AB6354); INCLUDE_ASM(s32, "world/area_osr/osr_03/AB62B0", func_802401A0_AB6430); diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index 11e2ec3a1e..1a5d970bd0 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -2,11 +2,11 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240020_D4D060); -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240054); +INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240054_D4D094); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802400EC_D4D12C); -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240128); +INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240128_D4D168); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802402F0_D4D330); @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802411AC_D4E1EC); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241200_D4E240); -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241238); +INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80241238_D4E278); INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_802412D4_D4E314); diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 11c28fc0d2..5962884b4b 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -38,9 +38,9 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802411D8_D511C8); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241274_D51264); -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241310); +INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241310_D51300); -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802413D8); +INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802413D8_D513C8); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241478_D51468); @@ -48,4 +48,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802414A8_D51498); INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80241588_D51578); -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802415BC); +INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_802415BC_D515AC); diff --git a/src/world/area_pra/pra_03/D53CD0.c b/src/world/area_pra/pra_03/D53CD0.c index 7c53589962..ec0b9843ba 100644 --- a/src/world/area_pra/pra_03/D53CD0.c +++ b/src/world/area_pra/pra_03/D53CD0.c @@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_03/D53CD0", func_80240020_D53CD0); INCLUDE_ASM(s32, "world/area_pra/pra_03/D53CD0", func_802400AC_D53D5C); -INCLUDE_ASM(s32, "world/area_pra/pra_03/D53CD0", func_80240138); +INCLUDE_ASM(s32, "world/area_pra/pra_03/D53CD0", func_80240138_D53DE8); diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index d466056b86..afe309b2ad 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -32,4 +32,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240F20_D56AD0); INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241038_D56BE8); -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241188); +INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80241188_D56D38); diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c index 5c1eeef12a..e7a4efd4ad 100644 --- a/src/world/area_pra/pra_06/D57430.c +++ b/src/world/area_pra/pra_06/D57430.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240000_D57430); INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240050_D57480); -INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240084); +INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240084_D574B4); INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_8024011C_D5754C); @@ -24,6 +24,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240D6C_D5819C); INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240EB4_D582E4); -INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240EE8); +INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240EE8_D58318); -INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240F1C); +INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240F1C_D5834C); diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 96747c2d43..f3daf86c65 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -52,6 +52,6 @@ INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_802416F8_D700A8); INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241710_D700C0); -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024175C); +INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_8024175C_D7010C); INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80241838_D701E8); diff --git a/src/world/area_pra/pra_31/D7ED80.c b/src/world/area_pra/pra_31/D7ED80.c index 8d55fa228f..0553c74ee1 100644 --- a/src/world/area_pra/pra_31/D7ED80.c +++ b/src/world/area_pra/pra_31/D7ED80.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_8024024C_D7EFAC); INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402A0_D7F000); -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402D8); +INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_802402D8_D7F038); INCLUDE_ASM(s32, "world/area_pra/pra_31/D7ED80", func_80240374_D7F0D4); diff --git a/src/world/area_pra/pra_31/D7F270.c b/src/world/area_pra/pra_31/D7F270.c index 79354b8797..e1fe6bcdd0 100644 --- a/src/world/area_pra/pra_31/D7F270.c +++ b/src/world/area_pra/pra_31/D7F270.c @@ -10,9 +10,9 @@ INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240A3C_D7F79C); INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", delete_actor_D7F91C); -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240C70); +INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240C70_D7F9D0); -INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240DBC); +INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240DBC_D7FB1C); INCLUDE_ASM(s32, "world/area_pra/pra_31/D7F270", func_80240E70_D7FBD0); diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index 401b95e9ca..f59ae0ae4e 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -28,4 +28,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240EEC_D8C29C); INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240F20_D8C2D0); -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240F54); +INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240F54_D8C304); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 13d75b0197..887b8d3c9f 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -42,26 +42,26 @@ INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802416C4_D8E914); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024173C_D8E98C); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024186C); +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024186C_D8EABC); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024198C); +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024198C_D8EBDC); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802419F4_D8EC44); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241AB4_D8ED04); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241DB0); +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241DB0_D8F000); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E1C_D8F06C); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241E8C_D8F0DC); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241F64); +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241F64_D8F1B4); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241FB8); +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80241FB8_D8F208); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_8024216C_D8F3BC); INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_802423CC_D8F61C); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80242698); +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80242698_D8F8E8); diff --git a/src/world/area_pra/pra_35/D8FBA0.c b/src/world/area_pra/pra_35/D8FBA0.c index c24aca1e08..e9460a36b2 100644 --- a/src/world/area_pra/pra_35/D8FBA0.c +++ b/src/world/area_pra/pra_35/D8FBA0.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950); +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242950_D8FBA0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242A68); +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242A68_D8FCB8); -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242BB8); +INCLUDE_ASM(s32, "world/area_pra/pra_35/D8FBA0", func_80242BB8_D8FE08); diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index aa235820f4..e29c3b8260 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -30,9 +30,9 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F1C_D93E5C); INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240F50_D93E90); -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240FBC); +INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240FBC_D93EFC); -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024102C); +INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024102C_D93F6C); INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80241104_D94044); @@ -40,4 +40,4 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80241158_D94098); INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024130C_D9424C); -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024156C); +INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_8024156C_D944AC); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 35a244aeb7..a9fa715189 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -4,15 +4,15 @@ #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024053C_CF80AC); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240590_CF8100); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802405C8_CF8138); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240664_CF81D4); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270); #include "world/common/GetItemName.inc.c" @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240A60_CF85D0); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240AAC_CF861C); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240ACC); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240ACC_CF863C); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240B2C_CF869C); @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240DEC_CF895C); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240E70_CF89E0); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241088); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241088_CF8BF8); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024113C_CF8CAC); @@ -44,17 +44,17 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241170_CF8CE0); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802411F0_CF8D60); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241208); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241208_CF8D78); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241224_CF8D94); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024123C); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024123C_CF8DAC); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024126C_CF8DDC); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802412E0_CF8E50); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241380); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241380_CF8EF0); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C); @@ -66,13 +66,13 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241764_CF92D4); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241794); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241794_CF9304); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241884); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241884_CF93F4); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A10_CF9580); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A54); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A54_CF95C4); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241A80_CF95F0); @@ -86,6 +86,6 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241C90_CF9800); //#include "world/common/GetItemName.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241D44_CF98B4); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241DA8); +INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241DA8_CF9918); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241EF8_CF9A68); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 457be5ad1b..0a88650cca 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -6,11 +6,11 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240850_D05F80); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4_D06024); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240974_D060A4); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409A4); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409A4_D060D4); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409D0_D06100); @@ -18,9 +18,9 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409F0_D06120); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240A44_D06174); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AC0); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AC0_D061F0); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AF4); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AF4_D06224); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B24_D06254); @@ -32,9 +32,9 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C44_D06374); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C58_D06388); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240E8C); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240E8C_D065BC); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240ED8_D06608); @@ -54,15 +54,15 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241568_D06C98); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024159C_D06CCC); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024161C); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024161C_D06D4C); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241634); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241634_D06D64); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241650_D06D80); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241668_D06D98); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241698); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241698_D06DC8); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024170C_D06E3C); @@ -74,6 +74,6 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802419AC_D070DC); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241A3C_D0716C); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24); +INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24_D07254); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B90_D072C0); diff --git a/src/world/area_sam/sam_03/D110C0.c b/src/world/area_sam/sam_03/D110C0.c index 2c1d790528..23b4da6db2 100644 --- a/src/world/area_sam/sam_03/D110C0.c +++ b/src/world/area_sam/sam_03/D110C0.c @@ -6,11 +6,11 @@ INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240050_D11110); INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_802400BC_D1117C); -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024012C); +INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024012C_D111EC); INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240204_D112C4); -INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240258); +INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_80240258_D11318); INCLUDE_ASM(s32, "world/area_sam/sam_03/D110C0", func_8024040C_D114CC); diff --git a/src/world/area_sam/sam_05/D187E0.c b/src/world/area_sam/sam_05/D187E0.c index 59ed01c6b8..6e8f12cb65 100644 --- a/src/world/area_sam/sam_05/D187E0.c +++ b/src/world/area_sam/sam_05/D187E0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_8024093C_D1911C); INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80240A38_D19218); -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241478); +INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241478_D19C58); INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241508_D19CE8); @@ -30,6 +30,6 @@ INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241668_D19E48); INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241754_D19F34); -INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802419A4); +INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_802419A4_D1A184); INCLUDE_ASM(s32, "world/area_sam/sam_05/D187E0", func_80241D20_D1A500); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index e19bb37d64..27870c4d3e 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240550_D203E0); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240700_D20590); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240D28); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240D28_D20BB8); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80240DE8_D20C78); @@ -14,15 +14,15 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802411A4_D21034); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241210_D210A0); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241344); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241344_D211D4); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802413A8_D21238); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241738_D215C8); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024185C); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024185C_D216EC); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48_D218D8); #include "world/common/GetItemName.inc.c" @@ -30,44 +30,44 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241A48); #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241D8C_D21C1C); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241DE0); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241DE0_D21C70); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241E18_D21CA8); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F50); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F50_D21DE0); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F70); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F70_D21E00); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242014_D21EA4); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242094); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242094_D21F24); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802420C4); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802420C4_D21F54); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802420F0_D21F80); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242110); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242110_D21FA0); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242164); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242164_D21FF4); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802421E0_D22070); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242214_D220A4); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242244); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242244_D220D4); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024224C); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024224C_D220DC); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024233C_D221CC); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802424C8); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802424C8_D22358); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024250C); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_8024250C_D2239C); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242538); +INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242538_D223C8); diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 59438e2b28..afe419d5ae 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -10,19 +10,19 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240634_D2C364); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240650); +INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240650_D2C380); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802406BC_D2C3EC); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_8024072C_D2C45C); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240804); +INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240804_D2C534); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240858_D2C588); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240A0C_D2C73C); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240C6C); +INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240C6C_D2C99C); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240F20_D2CC50); @@ -30,12 +30,12 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240F8C_D2CCBC); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241088_D2CDB8); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241AC8); +INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241AC8_D2D7F8); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241B58_D2D888); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241C58); +INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241C58_D2D988); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241CB8); +INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241CB8_D2D9E8); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241DA4); +INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80241DA4_D2DAD4); diff --git a/src/world/area_sam/sam_08/D309C0.c b/src/world/area_sam/sam_08/D309C0.c index 2334fd4051..ffcba1c79c 100644 --- a/src/world/area_sam/sam_08/D309C0.c +++ b/src/world/area_sam/sam_08/D309C0.c @@ -8,11 +8,11 @@ INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240E1C_D30A9C); INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240EF4_D30B74); -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240F48); +INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80240F48_D30BC8); INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_802410FC_D30D7C); -INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_8024135C); +INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_8024135C_D30FDC); INCLUDE_ASM(s32, "world/area_sam/sam_08/D309C0", func_80241610_D31290); diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c index 7500ce9236..2bc5309063 100644 --- a/src/world/area_sam/sam_11/D3A930.c +++ b/src/world/area_sam/sam_11/D3A930.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240554_D3AB24); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240564_D3AB34); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240580); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240580_D3AB50); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024059C_D3AB6C); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index aff6c40d25..9de17079f1 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0); #include "world/common/GetItemName.inc.c" @@ -8,11 +8,11 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408E8_D3AEB8); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408FC_D3AECC); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B30_D3B100); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B7C); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B7C_D3B14C); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B9C_D3B16C); @@ -26,9 +26,9 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240F40_D3B510); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241158_D3B728); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024120C); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024120C_D3B7DC); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241240); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241240_D3B810); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412C0_D3B890); @@ -52,22 +52,22 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802416E0_D3BCB0); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802417C8_D3BD98); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241834); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241834_D3BE04); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241864_D3BE34); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802418B4); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802418B4_D3BE84); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241A6C_D3C03C); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241AA0); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241AA0_D3C070); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241BC4_D3C194); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241DAC_D3C37C); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241FB0); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241FB0_D3C580); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241FE8); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241FE8_D3C5B8); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80242074); +INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80242074_D3C644); diff --git a/src/world/area_sbk/sbk_02/92A2B0.c b/src/world/area_sbk/sbk_02/92A2B0.c index 0782103b72..fa88716b1e 100644 --- a/src/world/area_sbk/sbk_02/92A2B0.c +++ b/src/world/area_sbk/sbk_02/92A2B0.c @@ -4,9 +4,9 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240000_92A2B0); INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240040_92A2F0); -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240164); +INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240164_92A414); // Accesses SI_MAP_VAR(0) which is an effect handle -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240338); +INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240338_92A5E8); -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240364); +INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A2B0", func_80240364_92A614); diff --git a/src/world/area_sbk/sbk_02/92A9A0.c b/src/world/area_sbk/sbk_02/92A9A0.c index f7802ba8f6..b81fff6ad3 100644 --- a/src/world/area_sbk/sbk_02/92A9A0.c +++ b/src/world/area_sbk/sbk_02/92A9A0.c @@ -4,13 +4,13 @@ #include "world/common/SomeXYZFuncTodoRename.inc.c" -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C); +INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_8024091C_92ABCC); -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240970); +INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240970_92AC20); -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_802409A8); +INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_802409A8_92AC58); -INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240A44); +INCLUDE_ASM(s32, "world/area_sbk/sbk_02/92A9A0", func_80240A44_92ACF4); #include "world/common/GetItemName.inc.c" diff --git a/src/world/area_sbk/sbk_06/932600.c b/src/world/area_sbk/sbk_06/932600.c index 5e531f4b93..fe83a81123 100644 --- a/src/world/area_sbk/sbk_06/932600.c +++ b/src/world/area_sbk/sbk_06/932600.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_06/932600", func_80240040_932600); -INCLUDE_ASM(s32, "world/area_sbk/sbk_06/932600", func_80240140); +INCLUDE_ASM(s32, "world/area_sbk/sbk_06/932600", func_80240140_932700); INCLUDE_ASM(s32, "world/area_sbk/sbk_06/932600", func_802401B0_932770); diff --git a/src/world/area_sbk/sbk_16/9375B0.c b/src/world/area_sbk/sbk_16/9375B0.c index 00efa867e1..3985402919 100644 --- a/src/world/area_sbk/sbk_16/9375B0.c +++ b/src/world/area_sbk/sbk_16/9375B0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_16/9375B0", func_80240040_9375B0); -INCLUDE_ASM(s32, "world/area_sbk/sbk_16/9375B0", func_802400B0); +INCLUDE_ASM(s32, "world/area_sbk/sbk_16/9375B0", func_802400B0_937620); diff --git a/src/world/area_sbk/sbk_30/93F5B0.c b/src/world/area_sbk/sbk_30/93F5B0.c index fbed1b72b3..bee7738ead 100644 --- a/src/world/area_sbk/sbk_30/93F5B0.c +++ b/src/world/area_sbk/sbk_30/93F5B0.c @@ -42,16 +42,16 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241174_940724); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802411AC_94075C); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241248); +INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241248_9407F8); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802412E4); +INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802412E4_940894); INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802413D4_940984); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241560); +INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241560_940B10); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802415A4); +INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802415A4_940B54); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802415D0); +INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_802415D0_940B80); -INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241640); +INCLUDE_ASM(s32, "world/area_sbk/sbk_30/93F5B0", func_80241640_940BF0); diff --git a/src/world/area_sbk/sbk_34/945F10.c b/src/world/area_sbk/sbk_34/945F10.c index 64a480c16d..8422aa5dc1 100644 --- a/src/world/area_sbk/sbk_34/945F10.c +++ b/src/world/area_sbk/sbk_34/945F10.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240040_945F10); INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240384_946254); -INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802403D8); +INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_802403D8_9462A8); INCLUDE_ASM(s32, "world/area_sbk/sbk_34/945F10", func_80240410_9462E0); diff --git a/src/world/area_sbk/sbk_56/953FC0.c b/src/world/area_sbk/sbk_56/953FC0.c index 3387daa697..b23a705c98 100644 --- a/src/world/area_sbk/sbk_56/953FC0.c +++ b/src/world/area_sbk/sbk_56/953FC0.c @@ -4,40 +4,40 @@ INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240038_953FF8); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024005C); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024005C_95401C); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240080_954040); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024009C); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024009C_95405C); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802400BC); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802400BC_95407C); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802400E8); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802400E8_9540A8); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240154_954114); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802401A0); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802401A0_954160); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024024C); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024024C_95420C); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024049C); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_8024049C_95445C); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802404C8); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802404C8_954488); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240500_9544C0); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240590); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240590_954550); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802405C4); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_802405C4_954584); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240628_9545E8); INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240680_954640); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240BB8); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240BB8_954B78); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240CF8); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240CF8_954CB8); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240D40); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240D40_954D00); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240D88); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/953FC0", func_80240D88_954D48); diff --git a/src/world/area_sbk/sbk_56/954D80.c b/src/world/area_sbk/sbk_56/954D80.c index 3334fc948a..17fda81edd 100644 --- a/src/world/area_sbk/sbk_56/954D80.c +++ b/src/world/area_sbk/sbk_56/954D80.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/954D80", func_80240DC0); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/954D80", func_80240DC0_954D80); -INCLUDE_ASM(s32, "world/area_sbk/sbk_56/954D80", func_80240E30); +INCLUDE_ASM(s32, "world/area_sbk/sbk_56/954D80", func_80240E30_954DF0); diff --git a/src/world/area_tik/tik_01/8694B0.c b/src/world/area_tik/tik_01/8694B0.c index 9603b0a098..f01b1fa2b9 100644 --- a/src/world/area_tik/tik_01/8694B0.c +++ b/src/world/area_tik/tik_01/8694B0.c @@ -6,12 +6,12 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240124_8695D4); INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_8024030C_8697BC); -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_8024032C); +INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_8024032C_8697DC); -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240340); +INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240340_8697F0); -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_802403FC); +INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_802403FC_8698AC); -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_802404DC); +INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_802404DC_86998C); -INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240548); +INCLUDE_ASM(s32, "world/area_tik/tik_01/8694B0", func_80240548_8699F8); diff --git a/src/world/area_tik/tik_01/869AA0.c b/src/world/area_tik/tik_01/869AA0.c index 573cce4024..fe3889f8c8 100644 --- a/src/world/area_tik/tik_01/869AA0.c +++ b/src/world/area_tik/tik_01/869AA0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_01/869AA0", func_802405F0_869AA0); -INCLUDE_ASM(s32, "world/area_tik/tik_01/869AA0", func_80240960); +INCLUDE_ASM(s32, "world/area_tik/tik_01/869AA0", func_80240960_869E10); diff --git a/src/world/area_tik/tik_01/869EE0.c b/src/world/area_tik/tik_01/869EE0.c index 412db1922d..a8ecdeb20b 100644 --- a/src/world/area_tik/tik_01/869EE0.c +++ b/src/world/area_tik/tik_01/869EE0.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_tik/tik_01/869EE0", func_80240A30); +INCLUDE_ASM(s32, "world/area_tik/tik_01/869EE0", func_80240A30_869EE0); diff --git a/src/world/area_tik/tik_02/86CA50.c b/src/world/area_tik/tik_02/86CA50.c index f23d183b34..edb6adf8ff 100644 --- a/src/world/area_tik/tik_02/86CA50.c +++ b/src/world/area_tik/tik_02/86CA50.c @@ -1,9 +1,9 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310); +INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240310_86CA50); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240428); +INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240428_86CB68); INCLUDE_ASM(s32, "world/area_tik/tik_02/86CA50", func_80240578_86CCB8); diff --git a/src/world/area_tik/tik_02/86CD10.c b/src/world/area_tik/tik_02/86CD10.c index f85e6080d3..92ea3dff02 100644 --- a/src/world/area_tik/tik_02/86CD10.c +++ b/src/world/area_tik/tik_02/86CD10.c @@ -1,5 +1,5 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CD10", func_802405D0); +INCLUDE_ASM(s32, "world/area_tik/tik_02/86CD10", func_802405D0_86CD10); -INCLUDE_ASM(s32, "world/area_tik/tik_02/86CD10", func_80240940); +INCLUDE_ASM(s32, "world/area_tik/tik_02/86CD10", func_80240940_86D080); diff --git a/src/world/area_tik/tik_03/86F0F0.c b/src/world/area_tik/tik_03/86F0F0.c index 8f6f7cf958..69be384839 100644 --- a/src/world/area_tik/tik_03/86F0F0.c +++ b/src/world/area_tik/tik_03/86F0F0.c @@ -4,6 +4,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_03/86F0F0", func_802405F0_86F0F0); INCLUDE_ASM(s32, "world/area_tik/tik_03/86F0F0", func_80240960_86F460); -INCLUDE_ASM(s32, "world/area_tik/tik_03/86F0F0", func_802409C0); +INCLUDE_ASM(s32, "world/area_tik/tik_03/86F0F0", func_802409C0_86F4C0); -INCLUDE_ASM(s32, "world/area_tik/tik_03/86F0F0", func_802409E0); +INCLUDE_ASM(s32, "world/area_tik/tik_03/86F0F0", func_802409E0_86F4E0); diff --git a/src/world/area_tik/tik_04/872020.c b/src/world/area_tik/tik_04/872020.c index 5061da3702..51aa06cf8b 100644 --- a/src/world/area_tik/tik_04/872020.c +++ b/src/world/area_tik/tik_04/872020.c @@ -4,8 +4,8 @@ INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_802405F0_872020); INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240960_872390); -INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240A00); +INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240A00_872430); -INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240BF4); +INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240BF4_872624); INCLUDE_ASM(s32, "world/area_tik/tik_04/872020", func_80240C20_872650); diff --git a/src/world/area_tik/tik_05/8750D0.c b/src/world/area_tik/tik_05/8750D0.c index 0216a36dbf..666294c74a 100644 --- a/src/world/area_tik/tik_05/8750D0.c +++ b/src/world/area_tik/tik_05/8750D0.c @@ -2,14 +2,14 @@ INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240310_8750D0); -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680); +INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240680_875440); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240798); +INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240798_875558); -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_802408E8); +INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_802408E8_8756A8); -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_8024093C); +INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_8024093C_8756FC); -INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240984); +INCLUDE_ASM(s32, "world/area_tik/tik_05/8750D0", func_80240984_875744); diff --git a/src/world/area_tik/tik_07/879BE0.c b/src/world/area_tik/tik_07/879BE0.c index 9a91dcc9ab..c1e2481eaa 100644 --- a/src/world/area_tik/tik_07/879BE0.c +++ b/src/world/area_tik/tik_07/879BE0.c @@ -14,36 +14,36 @@ INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_8024023C_879E1C); INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802402E0_879EC0); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802402FC); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802402FC_879EDC); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_8024031C); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_8024031C_879EFC); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240348); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240348_879F28); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802403B4); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802403B4_879F94); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240400); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240400_879FE0); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802404AC); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802404AC_87A08C); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802406FC); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802406FC_87A2DC); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240728); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240728_87A308); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240760); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240760_87A340); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802407F0); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802407F0_87A3D0); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240824); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240824_87A404); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240888); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240888_87A468); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802408E0); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_802408E0_87A4C0); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240E18); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240E18_87A9F8); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240F58); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240F58_87AB38); INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240FA0_87AB80); -INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240FE8); +INCLUDE_ASM(s32, "world/area_tik/tik_07/879BE0", func_80240FE8_87ABC8); diff --git a/src/world/area_tik/tik_07/87AC00.c b/src/world/area_tik/tik_07/87AC00.c index 5d9a273147..408e57c15d 100644 --- a/src/world/area_tik/tik_07/87AC00.c +++ b/src/world/area_tik/tik_07/87AC00.c @@ -1,27 +1,27 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241020); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241020_87AC00); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241390); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241390_87AF70); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802413F0); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802413F0_87AFD0); INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802415A0_87B180); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241BC8); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241BC8_87B7A8); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241C88); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241C88_87B868); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241FCC); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80241FCC_87BBAC); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242044); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242044_87BC24); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802420B0); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802420B0_87BC90); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802421E4); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802421E4_87BDC4); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242248); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_80242248_87BE28); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802425D8); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802425D8_87C1B8); -INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802426FC); +INCLUDE_ASM(s32, "world/area_tik/tik_07/87AC00", func_802426FC_87C2DC); diff --git a/src/world/area_tik/tik_09/882BF0.c b/src/world/area_tik/tik_09/882BF0.c index c9d1a7ae26..44e5565d5a 100644 --- a/src/world/area_tik/tik_09/882BF0.c +++ b/src/world/area_tik/tik_09/882BF0.c @@ -2,12 +2,12 @@ INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240A30_882BF0); -INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240AAC); +INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240AAC_882C6C); -INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240BE0); +INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240BE0_882DA0); -INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240D44); +INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240D44_882F04); -INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240DC4); +INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80240DC4_882F84); -INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80241204); +INCLUDE_ASM(s32, "world/area_tik/tik_09/882BF0", func_80241204_8833C4); diff --git a/src/world/area_tik/tik_10/8866D0.c b/src/world/area_tik/tik_10/8866D0.c index 8cab43ca11..8c970f0f44 100644 --- a/src/world/area_tik/tik_10/8866D0.c +++ b/src/world/area_tik/tik_10/8866D0.c @@ -4,36 +4,36 @@ INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240310_8866D0); INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240680_886A40); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024069C); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024069C_886A5C); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802406BC); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802406BC_886A7C); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802406E8); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802406E8_886AA8); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240754); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240754_886B14); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802407A0); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802407A0_886B60); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024084C); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_8024084C_886C0C); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240A9C); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240A9C_886E5C); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240AC8); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240AC8_886E88); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240B00); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240B00_886EC0); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240B90); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240B90_886F50); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240BC4); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240BC4_886F84); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240C28); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240C28_886FE8); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240C80); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80240C80_887040); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802411B8); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802411B8_887578); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802412F8); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_802412F8_8876B8); -INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80241340); +INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80241340_887700); INCLUDE_ASM(s32, "world/area_tik/tik_10/8866D0", func_80241388_887748); diff --git a/src/world/area_tik/tik_12/8891C0.c b/src/world/area_tik/tik_12/8891C0.c index ed3ff00b59..743c2e5257 100644 --- a/src/world/area_tik/tik_12/8891C0.c +++ b/src/world/area_tik/tik_12/8891C0.c @@ -6,42 +6,42 @@ INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240960_889530); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240A78); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240A78_889648); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240BC8); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240BC8_889798); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C1C); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C1C_8897EC); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C38); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C38_889808); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C58); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C58_889828); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C84); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240C84_889854); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240CF0); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240CF0_8898C0); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240D3C); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240D3C_88990C); INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80240DE8_8899B8); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241038); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241038_889C08); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241064); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241064_889C34); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024109C); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024109C_889C6C); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024112C); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024112C_889CFC); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241160); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241160_889D30); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802411C4); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802411C4_889D94); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024121C); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_8024121C_889DEC); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241754); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241754_88A324); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241894); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241894_88A464); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802418DC); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_802418DC_88A4AC); -INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241924); +INCLUDE_ASM(s32, "world/area_tik/tik_12/8891C0", func_80241924_88A4F4); diff --git a/src/world/area_tik/tik_12/88A530.c b/src/world/area_tik/tik_12/88A530.c index 083796bd84..05893ec137 100644 --- a/src/world/area_tik/tik_12/88A530.c +++ b/src/world/area_tik/tik_12/88A530.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241960); +INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241960_88A530); -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_802419DC); +INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_802419DC_88A5AC); -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241B10); +INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241B10_88A6E0); -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241C74); +INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241C74_88A844); -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241CF4); +INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80241CF4_88A8C4); -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80242134); +INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_80242134_88AD04); #include "world/common/AwaitPlayerNearNpc.inc.c" -INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_802421D4); +INCLUDE_ASM(s32, "world/area_tik/tik_12/88A530", func_802421D4_88ADA4); diff --git a/src/world/area_tik/tik_15/890190.c b/src/world/area_tik/tik_15/890190.c index 437b3acb33..c468a00648 100644 --- a/src/world/area_tik/tik_15/890190.c +++ b/src/world/area_tik/tik_15/890190.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240960_890500); INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240A78_890618); -INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240AA4); +INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240AA4_890644); -INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240AD0); +INCLUDE_ASM(s32, "world/area_tik/tik_15/890190", func_80240AD0_890670); diff --git a/src/world/area_tik/tik_17/892A50.c b/src/world/area_tik/tik_17/892A50.c index aaf7ce48a8..b39058a8ee 100644 --- a/src/world/area_tik/tik_17/892A50.c +++ b/src/world/area_tik/tik_17/892A50.c @@ -2,36 +2,36 @@ INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240030_892A50); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024004C); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024004C_892A6C); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024006C); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024006C_892A8C); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240098); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240098_892AB8); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240104); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240104_892B24); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240150); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240150_892B70); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802401FC); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802401FC_892C1C); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024044C); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_8024044C_892E6C); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240478); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240478_892E98); INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802404B0_892ED0); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240540); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240540_892F60); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240574); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240574_892F94); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802405D8); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_802405D8_892FF8); INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240630_893050); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240B68); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240B68_893588); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240CA8); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240CA8_8936C8); INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240CF0_893710); -INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240D38); +INCLUDE_ASM(s32, "world/area_tik/tik_17/892A50", func_80240D38_893758); diff --git a/src/world/area_tik/tik_17/893790.c b/src/world/area_tik/tik_17/893790.c index 4ecb2861c1..8f9acc89d4 100644 --- a/src/world/area_tik/tik_17/893790.c +++ b/src/world/area_tik/tik_17/893790.c @@ -1,17 +1,17 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240D70); +INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240D70_893790); -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240D90); +INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240D90_8937B0); INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240DA4_8937C4); INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240E60_893880); -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240F40); +INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240F40_893960); INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80240FAC_8939CC); -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80241050); +INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80241050_893A70); -INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80241174); +INCLUDE_ASM(s32, "world/area_tik/tik_17/893790", func_80241174_893B94); diff --git a/src/world/area_tik/tik_19/897BD0.c b/src/world/area_tik/tik_19/897BD0.c index 37909f2451..d2e77956d8 100644 --- a/src/world/area_tik/tik_19/897BD0.c +++ b/src/world/area_tik/tik_19/897BD0.c @@ -2,35 +2,35 @@ INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802405F0_897BD0); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_8024060C); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_8024060C_897BEC); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_8024062C); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_8024062C_897C0C); INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240658_897C38); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802406C4); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802406C4_897CA4); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240710); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240710_897CF0); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802407BC); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802407BC_897D9C); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A0C); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A0C_897FEC); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A38); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A38_898018); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A70); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240A70_898050); INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240B00_8980E0); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240B34); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240B34_898114); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240B98); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240B98_898178); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240BF0); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80240BF0_8981D0); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80241128); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80241128_898708); -INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80241268); +INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_80241268_898848); INCLUDE_ASM(s32, "world/area_tik/tik_19/897BD0", func_802412B0_898890); diff --git a/src/world/area_tik/tik_20/89ACB0.c b/src/world/area_tik/tik_20/89ACB0.c index d040c39c11..e15f84f4a8 100644 --- a/src/world/area_tik/tik_20/89ACB0.c +++ b/src/world/area_tik/tik_20/89ACB0.c @@ -4,8 +4,8 @@ INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_80240960_89ACB0); INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_802409DC_89AD2C); -INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_80240B10); +INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_80240B10_89AE60); INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_80240C74_89AFC4); -INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_80240CF4); +INCLUDE_ASM(s32, "world/area_tik/tik_20/89ACB0", func_80240CF4_89B044); diff --git a/src/world/area_tik/tik_22/89FEF0.c b/src/world/area_tik/tik_22/89FEF0.c index 76a5cdc898..9f1ea4f85d 100644 --- a/src/world/area_tik/tik_22/89FEF0.c +++ b/src/world/area_tik/tik_22/89FEF0.c @@ -2,20 +2,20 @@ INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240030_89FEF0); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240154); +INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240154_8A0014); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024033C); +INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024033C_8A01FC); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024035C); +INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024035C_8A021C); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240370); +INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240370_8A0230); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024042C); +INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024042C_8A02EC); INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024050C_8A03CC); INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240578_8A0438); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024061C); +INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_8024061C_8A04DC); -INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240640); +INCLUDE_ASM(s32, "world/area_tik/tik_22/89FEF0", func_80240640_8A0500); diff --git a/src/world/area_tik/tik_24/8A5AD0.c b/src/world/area_tik/tik_24/8A5AD0.c index 50e7245792..81d735025e 100644 --- a/src/world/area_tik/tik_24/8A5AD0.c +++ b/src/world/area_tik/tik_24/8A5AD0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5AD0", func_80240050_8A5AD0); -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5AD0", func_80240174); +INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5AD0", func_80240174_8A5BF4); diff --git a/src/world/area_tik/tik_24/8A5DE0.c b/src/world/area_tik/tik_24/8A5DE0.c index 84b055f9ea..b4419d7d65 100644 --- a/src/world/area_tik/tik_24/8A5DE0.c +++ b/src/world/area_tik/tik_24/8A5DE0.c @@ -1,13 +1,13 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240360); +INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240360_8A5DE0); -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_802406D0); +INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_802406D0_8A6150); -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_8024074C); +INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_8024074C_8A61CC); -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240880); +INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240880_8A6300); -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_802409E4); +INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_802409E4_8A6464); -INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240A64); +INCLUDE_ASM(s32, "world/area_tik/tik_24/8A5DE0", func_80240A64_8A64E4); diff --git a/src/world/area_tik/tik_25/8A8600.c b/src/world/area_tik/tik_25/8A8600.c index ef93e37717..21ab664ddc 100644 --- a/src/world/area_tik/tik_25/8A8600.c +++ b/src/world/area_tik/tik_25/8A8600.c @@ -2,6 +2,6 @@ INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_80240680_8A8600); -INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_802406AC); +INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_802406AC_8A862C); -INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_80240770); +INCLUDE_ASM(s32, "world/area_tik/tik_25/8A8600", func_80240770_8A86F0); diff --git a/src/world/area_trd/trd_01/99CD80.c b/src/world/area_trd/trd_01/99CD80.c index 6f3eaf2a42..43ea603f7c 100644 --- a/src/world/area_trd/trd_01/99CD80.c +++ b/src/world/area_trd/trd_01/99CD80.c @@ -2,32 +2,32 @@ INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802403F0_99CD80); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_8024046C); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_8024046C_99CDFC); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802405A0); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802405A0_99CF30); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240704); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240704_99D094); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240784); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240784_99D114); INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240BC4_99D554); INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240C78_99D608); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240D98); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240D98_99D728); INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240DF8_99D788); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240E70); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240E70_99D800); INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80240FA0_99D930); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802410BC); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802410BC_99DA4C); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80241104); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80241104_99DA94); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802411B0); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802411B0_99DB40); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802413B8); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_802413B8_99DD48); -INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80241630); +INCLUDE_ASM(s32, "world/area_trd/trd_01/99CD80", func_80241630_99DFC0); diff --git a/src/world/area_trd/trd_02/9A10C0.c b/src/world/area_trd/trd_02/9A10C0.c index ee5b97139d..5dbec9348b 100644 --- a/src/world/area_trd/trd_02/9A10C0.c +++ b/src/world/area_trd/trd_02/9A10C0.c @@ -1,37 +1,37 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802400E0); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802400E0_9A10C0); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_8024015C); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_8024015C_9A113C); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240290_9A1270); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802403F4); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802403F4_9A13D4); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240474); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240474_9A1454); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802408B4_9A1894); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240A0C_9A19EC); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240CB4); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240CB4_9A1C94); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240D74); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240D74_9A1D54); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240F30); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240F30_9A1F10); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240FE4); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80240FE4_9A1FC4); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241058); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241058_9A2038); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_802410D0_9A20B0); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241200); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241200_9A21E0); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241320_9A2300); INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241388_9A2368); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241448); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241448_9A2428); -INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241744); +INCLUDE_ASM(s32, "world/area_trd/trd_02/9A10C0", func_80241744_9A2724); diff --git a/src/world/area_trd/trd_03/9A46F0.c b/src/world/area_trd/trd_03/9A46F0.c index dcb5e39e99..8e4fef6960 100644 --- a/src/world/area_trd/trd_03/9A46F0.c +++ b/src/world/area_trd/trd_03/9A46F0.c @@ -1,10 +1,10 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_802400A0); +INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_802400A0_9A46F0); -INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_8024011C); +INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_8024011C_9A476C); -INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_80240250); +INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_80240250_9A48A0); INCLUDE_ASM(s32, "world/area_trd/trd_03/9A46F0", func_802403B4_9A4A04); diff --git a/src/world/area_trd/trd_04/9A8700.c b/src/world/area_trd/trd_04/9A8700.c index cb146cd193..918177f228 100644 --- a/src/world/area_trd/trd_04/9A8700.c +++ b/src/world/area_trd/trd_04/9A8700.c @@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240310_9A8700); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240344_9A8734); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240408); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A8700", func_80240408_9A87F8); diff --git a/src/world/area_trd/trd_04/9A88A0.c b/src/world/area_trd/trd_04/9A88A0.c index 4d38c57b6c..5163cf3a3b 100644 --- a/src/world/area_trd/trd_04/9A88A0.c +++ b/src/world/area_trd/trd_04/9A88A0.c @@ -2,68 +2,68 @@ INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802404B0_9A88A0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_8024052C); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_8024052C_9A891C); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240660_9A8A50); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802407C4); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802407C4_9A8BB4); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240844); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240844_9A8C34); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240C84_9A9074); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80240DDC_9A91CC); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241084); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241084_9A9474); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241144); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241144_9A9534); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241300); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241300_9A96F0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802413B4); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802413B4_9A97A4); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241428); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241428_9A9818); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802414A0); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802414A0_9A9890); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802415D0_9A99C0); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802416F0_9A9AE0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241758); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241758_9A9B48); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241818); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241818_9A9C08); INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241B14_9A9F04); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241E18); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241E18_9AA208); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241FC8); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80241FC8_9AA3B8); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802425F0); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802425F0_9AA9E0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802426B0); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802426B0_9AAAA0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802429F4); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802429F4_9AADE4); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242A6C); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242A6C_9AAE5C); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242AD8); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242AD8_9AAEC8); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242C0C); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242C0C_9AAFFC); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242C70); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80242C70_9AB060); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243000); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243000_9AB3F0); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243124); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243124_9AB514); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243310); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243310_9AB700); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243438); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243438_9AB828); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802434F4); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_802434F4_9AB8E4); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_8024360C); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_8024360C_9AB9FC); -INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243650); +INCLUDE_ASM(s32, "world/area_trd/trd_04/9A88A0", func_80243650_9ABA40); diff --git a/src/world/area_trd/trd_05/9AE700.c b/src/world/area_trd/trd_05/9AE700.c index 863e95f3b3..f394133b6e 100644 --- a/src/world/area_trd/trd_05/9AE700.c +++ b/src/world/area_trd/trd_05/9AE700.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_80240404_9AEB04); INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_802404D0_9AEBD0); -INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_80240508); +INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_80240508_9AEC08); INCLUDE_ASM(s32, "world/area_trd/trd_05/9AE700", func_802405FC_9AECFC); diff --git a/src/world/area_trd/trd_06/9B1AA0.c b/src/world/area_trd/trd_06/9B1AA0.c index 457775bb9e..852734d83b 100644 --- a/src/world/area_trd/trd_06/9B1AA0.c +++ b/src/world/area_trd/trd_06/9B1AA0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240310_9B1AA0); -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240724); +INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_80240724_9B1EB4); INCLUDE_ASM(s32, "world/area_trd/trd_06/9B1AA0", func_8024081C_9B1FAC); diff --git a/src/world/area_trd/trd_06/9B2280.c b/src/world/area_trd/trd_06/9B2280.c index cc910608fe..e0ddfc61ae 100644 --- a/src/world/area_trd/trd_06/9B2280.c +++ b/src/world/area_trd/trd_06/9B2280.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_trd/trd_06/9B2280", func_80240AF0); +INCLUDE_ASM(s32, "world/area_trd/trd_06/9B2280", func_80240AF0_9B2280); diff --git a/src/world/area_trd/trd_07/9B6C90.c b/src/world/area_trd/trd_07/9B6C90.c index a311dd19f7..834295ba48 100644 --- a/src/world/area_trd/trd_07/9B6C90.c +++ b/src/world/area_trd/trd_07/9B6C90.c @@ -2,48 +2,48 @@ INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240310_9B6C90); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024038C); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024038C_9B6D0C); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802404C0_9B6E40); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240624_9B6FA4); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802406A4); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802406A4_9B7024); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240AE4); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240AE4_9B7464); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80240C94_9B7614); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802412BC); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802412BC_9B7C3C); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024137C); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024137C_9B7CFC); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802416C0); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802416C0_9B8040); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241738_9B80B8); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802417A4); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802417A4_9B8124); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802418D8_9B8258); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024193C); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024193C_9B82BC); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241CCC); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241CCC_9B864C); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241DF0); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241DF0_9B8770); INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80241FDC_9B895C); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80242104); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80242104_9B8A84); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802421C0); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802421C0_9B8B40); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802422D8); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802422D8_9B8C58); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024231C); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024231C_9B8C9C); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024256C); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_8024256C_9B8EEC); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80242600); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_80242600_9B8F80); -INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802427FC); +INCLUDE_ASM(s32, "world/area_trd/trd_07/9B6C90", func_802427FC_9B917C); diff --git a/src/world/area_trd/trd_08/9BB5B0.c b/src/world/area_trd/trd_08/9BB5B0.c index 55cf95bacb..ff4dd91382 100644 --- a/src/world/area_trd/trd_08/9BB5B0.c +++ b/src/world/area_trd/trd_08/9BB5B0.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_trd/trd_08/9BB5B0", func_80240310_9BB5B0); -INCLUDE_ASM(s32, "world/area_trd/trd_08/9BB5B0", func_80240904); +INCLUDE_ASM(s32, "world/area_trd/trd_08/9BB5B0", func_80240904_9BBBA4); diff --git a/src/world/area_trd/trd_09/9BD720.c b/src/world/area_trd/trd_09/9BD720.c index 51e28d29c5..baf6d03779 100644 --- a/src/world/area_trd/trd_09/9BD720.c +++ b/src/world/area_trd/trd_09/9BD720.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_trd/trd_09/9BD720", func_802400C0); +INCLUDE_ASM(s32, "world/area_trd/trd_09/9BD720", func_802400C0_9BD720); diff --git a/src/world/area_trd/trd_10/9C3130.c b/src/world/area_trd/trd_10/9C3130.c index 8af2783e6c..3c12e3b59b 100644 --- a/src/world/area_trd/trd_10/9C3130.c +++ b/src/world/area_trd/trd_10/9C3130.c @@ -1,3 +1,3 @@ #include "common.h" -INCLUDE_ASM(s32, "world/area_trd/trd_10/9C3130", func_80240820); +INCLUDE_ASM(s32, "world/area_trd/trd_10/9C3130", func_80240820_9C3130); diff --git a/src/world/area_tst/tst_04/B1B570.c b/src/world/area_tst/tst_04/B1B570.c index 001fe5bc6e..5a120f7b82 100644 --- a/src/world/area_tst/tst_04/B1B570.c +++ b/src/world/area_tst/tst_04/B1B570.c @@ -4,7 +4,7 @@ INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_80240000_B1B570); INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_802400FC_B1B66C); -INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_80240260); +INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_80240260_B1B7D0); INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_8024029C_B1B80C); @@ -14,8 +14,8 @@ INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_80240510_B1BA80); INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_80240574_B1BAE4); -INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_802405B0); +INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_802405B0_B1BB20); -INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_802405D4); +INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_802405D4_B1BB44); INCLUDE_ASM(s32, "world/area_tst/tst_04/B1B570", func_80240628_B1BB98); diff --git a/src/world/area_tst/tst_11/B1CA50.c b/src/world/area_tst/tst_11/B1CA50.c index 19f18c7ad9..6289c4247f 100644 --- a/src/world/area_tst/tst_11/B1CA50.c +++ b/src/world/area_tst/tst_11/B1CA50.c @@ -4,14 +4,14 @@ INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_80240000_B1CA50); INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_8024003C_B1CA8C); -INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_80240100); +INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_80240100_B1CB50); -INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802402B8); +INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802402B8_B1CD08); -INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802402F4); +INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802402F4_B1CD44); INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802403B8_B1CE08); -INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802406D4); +INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_802406D4_B1D124); INCLUDE_ASM(s32, "world/area_tst/tst_11/B1CA50", func_80240730_B1D180); diff --git a/src/world/area_tst/tst_13/B1D760.c b/src/world/area_tst/tst_13/B1D760.c index 22cae326c7..d22f5dcd0a 100644 --- a/src/world/area_tst/tst_13/B1D760.c +++ b/src/world/area_tst/tst_13/B1D760.c @@ -4,4 +4,4 @@ INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_80240000_B1D760); INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_802400A0_B1D800); -INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_8024013C); +INCLUDE_ASM(s32, "world/area_tst/tst_13/B1D760", func_8024013C_B1D89C); diff --git a/tools/fixc.py b/tools/fixc.py new file mode 100755 index 0000000000..64ab95887a --- /dev/null +++ b/tools/fixc.py @@ -0,0 +1,54 @@ +#!/usr/bin/python3 + +import argparse +from collections import OrderedDict +import os +import re +import pickle +import sys +from pathlib import Path + +script_dir = os.path.dirname(os.path.realpath(__file__)) +root_dir = script_dir + "/../" +src_dir = root_dir + "src/world/" +asm_dir = root_dir + "asm/nonmatchings/world/" + + +def sub_func(match): + m_str = match.group() + m_str_split = m_str.split(", ") + func_name = m_str_split[-1][:-2] + + path_elems = m_str_split[-2].split("/")[1:] + + asmd = os.path.join(asm_dir, path_elems[0], path_elems[1], path_elems[2][:-1]) + + for root, dirs, files in os.walk(asmd): + for f_name in files: + f_name = f_name[:-2] + if f_name.startswith(func_name) and len(f_name) > len(func_name): + return m_str.replace(func_name, f_name) + return m_str + + +for root, dirs, files in os.walk(src_dir): + for f_name in files: + if f_name.endswith(".c"): + f_path = os.path.join(root, f_name) + area_name = Path(f_path).parent.name + with open(f_path) as f: + f_text_orig = f.readlines() + + f_text = [] + + if f_name == "DF6A20.c": + dog = 5 + + for line in f_text_orig: + new_line = re.sub(r"INCLUDE_ASM.*\);", sub_func, line) + f_text.append(new_line) + + if f_text != f_text_orig: + with open(f_path, "w", newline="\n") as f: + f.writelines(f_text) + diff --git a/tools/splat.yaml b/tools/splat.yaml index a002daf2d8..55958fd9c5 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -909,6 +909,7 @@ segments: - [0x7e4d00, "bin"] - name: world/area_mac/machi/ type: code + overlay: True start: 0x7E73A0 vram: 0x80240000 files: @@ -923,6 +924,7 @@ segments: - [0x7EAD10, "bin"] # rodata - name: world/area_mac/mac_00/ type: code + overlay: True start: 0x7EAD10 vram: 0x80240000 files: @@ -946,6 +948,7 @@ segments: - [0x800880, "bin"] # rodata - name: world/area_mac/mac_01/ type: code + overlay: True start: 0x800880 vram: 0x80240000 files: @@ -967,6 +970,7 @@ segments: - [0x8232C0, "bin"] # rodata - name: world/area_mac/mac_02/ type: code + overlay: True start: 0x8232C0 vram: 0x80240000 files: @@ -984,6 +988,7 @@ segments: - [0x831490, "bin"] # rodata - name: world/area_mac/mac_03/ type: code + overlay: True start: 0x831800 vram: 0x80240000 files: @@ -1001,6 +1006,7 @@ segments: - [0x842BB0, "bin"] # rodata - name: world/area_mac/mac_04/ type: code + overlay: True start: 0x842BD0 vram: 0x80240000 files: @@ -1025,6 +1031,7 @@ segments: - [0x852170, "bin"] # rodata - name: world/area_mac/mac_05/ type: code + overlay: True start: 0x852170 vram: 0x80240000 files: @@ -1043,6 +1050,7 @@ segments: - [0x864B20, "bin"] # rodata - name: world/area_mac/mac_06/ type: code + overlay: True start: 0x864B40 vram: 0x80240000 files: @@ -1056,6 +1064,7 @@ segments: - [0x869490, "bin"] # rodata - name: world/area_tik/tik_01/ type: code + overlay: True start: 0x8694B0 vram: 0x80240000 files: @@ -1070,6 +1079,7 @@ segments: - [0x86C740, "bin"] # rodata - name: world/area_tik/tik_02/ type: code + overlay: True start: 0x86C740 vram: 0x80240000 files: @@ -1084,6 +1094,7 @@ segments: - [0x86EB00, "bin"] # rodata - name: world/area_tik/tik_03/ type: code + overlay: True start: 0x86EB00 vram: 0x80240000 files: @@ -1099,6 +1110,7 @@ segments: - [0x871A30, "bin"] # rodata - name: world/area_tik/tik_04/ type: code + overlay: True start: 0x871A30 vram: 0x80240000 files: @@ -1112,6 +1124,7 @@ segments: - [0x874DA0, "bin"] # rodata - name: world/area_tik/tik_05/ type: code + overlay: True start: 0x874DC0 vram: 0x80240000 files: @@ -1126,6 +1139,7 @@ segments: - [0x876EE0, "bin"] # rodata - name: world/area_tik/tik_06/ type: code + overlay: True start: 0x876EE0 vram: 0x80240000 files: @@ -1139,6 +1153,7 @@ segments: - [0x879BE0, "bin"] # rodata - name: world/area_tik/tik_07/ type: code + overlay: True start: 0x879BE0 vram: 0x80240000 files: @@ -1153,6 +1168,7 @@ segments: - [0x87EDF0, "bin"] # rodata - name: world/area_tik/tik_08/ type: code + overlay: True start: 0x87EDF0 vram: 0x80240000 files: @@ -1166,6 +1182,7 @@ segments: - [0x8821A0, "bin"] # rodata - name: world/area_tik/tik_09/ type: code + overlay: True start: 0x8821C0 vram: 0x80240000 files: @@ -1181,6 +1198,7 @@ segments: - [0x8863C0, "bin"] # rodata - name: world/area_tik/tik_10/ type: code + overlay: True start: 0x8863C0 vram: 0x80240000 files: @@ -1194,6 +1212,7 @@ segments: - [0x888BD0, "bin"] # rodata - name: world/area_tik/tik_12/ type: code + overlay: True start: 0x888BD0 vram: 0x80240000 files: @@ -1209,6 +1228,7 @@ segments: - [0x88D600, "bin"] # rodata - name: world/area_tik/tik_14/ type: code + overlay: True start: 0x88D600 vram: 0x80240000 files: @@ -1221,6 +1241,7 @@ segments: - [0x88FB90, "bin"] # rodata - name: world/area_tik/tik_15/ type: code + overlay: True start: 0x88FBA0 vram: 0x80240000 files: @@ -1233,6 +1254,7 @@ segments: - [0x892A10, "bin"] # rodata - name: world/area_tik/tik_17/ type: code + overlay: True start: 0x892A20 vram: 0x80240000 files: @@ -1246,6 +1268,7 @@ segments: - [0x8956E0, "bin"] # rodata - name: world/area_tik/tik_18/ type: code + overlay: True start: 0x8956E0 vram: 0x80240000 files: @@ -1258,6 +1281,7 @@ segments: - [0x8975D0, "bin"] # rodata - name: world/area_tik/tik_19/ type: code + overlay: True start: 0x8975E0 vram: 0x80240000 files: @@ -1270,6 +1294,7 @@ segments: - [0x89A350, "bin"] # rodata - name: world/area_tik/tik_20/ type: code + overlay: True start: 0x89A350 vram: 0x80240000 files: @@ -1283,6 +1308,7 @@ segments: - [0x89D7A0, "bin"] # rodata - name: world/area_tik/tik_21/ type: code + overlay: True start: 0x89D7A0 vram: 0x80240000 files: @@ -1294,6 +1320,7 @@ segments: - [0x89FEC0, "bin"] # rodata - name: world/area_tik/tik_22/ type: code + overlay: True start: 0x89FEC0 vram: 0x80240000 files: @@ -1304,6 +1331,7 @@ segments: - [0x8A23C0, "bin"] # rodata - name: world/area_tik/tik_23/ type: code + overlay: True start: 0x8A23D0 vram: 0x80240000 files: @@ -1316,6 +1344,7 @@ segments: - [0x8A5A80, "bin"] # rodata - name: world/area_tik/tik_24/ type: code + overlay: True start: 0x8A5A80 vram: 0x80240000 files: @@ -1331,6 +1360,7 @@ segments: - [0x8A7F80, "bin"] # rodata - name: world/area_tik/tik_25/ type: code + overlay: True start: 0x8A7F80 vram: 0x80240000 files: @@ -1343,6 +1373,7 @@ segments: - [0x8A9A10, "bin"] # rodata - name: world/area_kgr/kgr_01/ type: code + overlay: True start: 0x8A9A10 vram: 0x80240000 files: @@ -1354,6 +1385,7 @@ segments: - [0x8AA430, "bin"] # rodata - name: world/area_kgr/kgr_02/ type: code + overlay: True start: 0x8AA450 vram: 0x80240000 files: @@ -1366,6 +1398,7 @@ segments: - [0x8ABF80, "bin"] # rodata - name: world/area_kmr/kmr_00/ type: code + overlay: True start: 0x8ABF90 vram: 0x80240000 files: @@ -1378,6 +1411,7 @@ segments: - [0x8B0060, "bin"] # rodata - name: world/area_kmr/kmr_02/ type: code + overlay: True start: 0x8B0070 vram: 0x80240000 files: @@ -1399,6 +1433,7 @@ segments: - [0x8C7F90, "bin"] # rodata - name: world/area_kmr/kmr_03/ type: code + overlay: True start: 0x8C7F90 vram: 0x80240000 files: @@ -1414,6 +1449,7 @@ segments: - [0x8CA8F0, "bin"] # rodata - name: world/area_kmr/kmr_04/ type: code + overlay: True start: 0x8CA900 vram: 0x80240000 files: @@ -1428,6 +1464,7 @@ segments: - [0x8CE070, "bin"] # rodata - name: world/area_kmr/kmr_05/ type: code + overlay: True start: 0x8CE070 vram: 0x80240000 files: @@ -1441,6 +1478,7 @@ segments: - [0x8D1510, "bin"] # rodata - name: world/area_kmr/kmr_06/ type: code + overlay: True start: 0x8D1510 vram: 0x80240000 files: @@ -1454,6 +1492,7 @@ segments: - [0x8D3DC0, "bin"] # rodata - name: world/area_kmr/kmr_07/ type: code + overlay: True start: 0x8D3DC0 vram: 0x80240000 files: @@ -1464,6 +1503,7 @@ segments: - [0x8D5E00, "bin"] # rodata - name: world/area_kmr/kmr_09/ type: code + overlay: True start: 0x8D5E00 vram: 0x80240000 files: @@ -1475,6 +1515,7 @@ segments: - [0x8D84D0, "bin"] # rodata - name: world/area_kmr/kmr_10/ type: code + overlay: True start: 0x8D84D0 vram: 0x80240000 files: @@ -1487,6 +1528,7 @@ segments: - [0x8DA0F0, "bin"] # rodata - name: world/area_kmr/kmr_11/ type: code + overlay: True start: 0x8DA100 vram: 0x80240000 files: @@ -1506,6 +1548,7 @@ segments: - [0x8EB360, "bin"] # rodata - name: world/area_kmr/kmr_12/ type: code + overlay: True start: 0x8EB360 vram: 0x80240000 files: @@ -1515,6 +1558,7 @@ segments: - [0x8EBE10, ".rodata", "world/area_kmr/kmr_12/events"] - name: world/area_kmr/kmr_20/ type: code + overlay: True start: 0x8EBE20 vram: 0x80240000 files: @@ -1544,6 +1588,7 @@ segments: - [0x8FEE80, "bin"] # rodata - name: world/area_kmr/kmr_21/ type: code + overlay: True start: 0x8FEE80 vram: 0x80240000 files: @@ -1554,6 +1599,7 @@ segments: - [0x8FF670, "bin"] # rodata - name: world/area_kmr/kmr_22/ type: code + overlay: True start: 0x8FF670 vram: 0x80240000 files: @@ -1567,6 +1613,7 @@ segments: - [0x907A30, "bin"] # rodata - name: world/area_kmr/kmr_23/ type: code + overlay: True start: 0x907A30 vram: 0x80240000 files: @@ -1577,6 +1624,7 @@ segments: - [0x90B240, "bin"] # rodata - name: world/area_kmr/kmr_24/ type: code + overlay: True start: 0x90B240 vram: 0x80240000 files: @@ -1587,6 +1635,7 @@ segments: - [0x90B6D0, "bin"] # rodata - name: world/area_kmr/kmr_30/ type: code + overlay: True start: 0x90B6D0 vram: 0x80240000 files: @@ -1597,6 +1646,7 @@ segments: - [0x90BFF0, "bin"] - name: world/area_iwa/iwa_00/ type: code + overlay: True start: 0x90CC40 vram: 0x80240000 files: @@ -1606,6 +1656,7 @@ segments: - [0x90F6A0, "bin"] # rodata - name: world/area_iwa/iwa_01/ type: code + overlay: True start: 0x90F6B0 vram: 0x80240000 files: @@ -1622,6 +1673,7 @@ segments: - [0x915D70, "bin"] # rodata - name: world/area_iwa/iwa_02/ type: code + overlay: True start: 0x915D70 vram: 0x80240000 files: @@ -1633,6 +1685,7 @@ segments: - [0x918BB0, "bin"] # rodata - name: world/area_iwa/iwa_03/ type: code + overlay: True start: 0x918BB0 vram: 0x80240000 files: @@ -1646,6 +1699,7 @@ segments: - [0x91B8E0, "bin"] # rodata - name: world/area_iwa/iwa_04/ type: code + overlay: True start: 0x91B8E0 vram: 0x80240000 files: @@ -1657,6 +1711,7 @@ segments: - [0x91E570, "bin"] # rodata - name: world/area_iwa/iwa_10/ type: code + overlay: True start: 0x91E570 vram: 0x80240000 files: @@ -1675,6 +1730,7 @@ segments: - [0x9269D0, "bin"] # rodata - name: world/area_iwa/iwa_11/ type: code + overlay: True start: 0x9269F0 vram: 0x80240000 files: @@ -1688,6 +1744,7 @@ segments: - [0x929270, "bin"] # rodata - name: world/area_sbk/sbk_00/ type: code + overlay: True start: 0x929270 vram: 0x80240000 files: @@ -1698,6 +1755,7 @@ segments: - [0x929A80, "bin"] # rodata - name: world/area_sbk/sbk_01/ type: code + overlay: True start: 0x929A90 vram: 0x80240000 files: @@ -1709,6 +1767,7 @@ segments: - [0x92A2B0, "bin"] # rodata - name: world/area_sbk/sbk_02/ type: code + overlay: True start: 0x92A2B0 vram: 0x80240000 files: @@ -1723,6 +1782,7 @@ segments: - [0x92F8B0, "bin"] # rodata - name: world/area_sbk/sbk_03/ type: code + overlay: True start: 0x92F8B0 vram: 0x80240000 files: @@ -1734,6 +1794,7 @@ segments: - [0x9304D0, "bin"] # rodata - name: world/area_sbk/sbk_04/ type: code + overlay: True start: 0x9304D0 vram: 0x80240000 files: @@ -1745,6 +1806,7 @@ segments: - [0x930CF0, "bin"] # rodata - name: world/area_sbk/sbk_05/ type: code + overlay: True start: 0x930CF0 vram: 0x80240000 files: @@ -1757,6 +1819,7 @@ segments: - [0x9325C0, "bin"] # rodata - name: world/area_sbk/sbk_06/ type: code + overlay: True start: 0x9325C0 vram: 0x80240000 files: @@ -1768,6 +1831,7 @@ segments: - [0x933C70, "bin"] # rodata - name: world/area_sbk/sbk_10/ type: code + overlay: True start: 0x933C80 vram: 0x80240000 files: @@ -1778,6 +1842,7 @@ segments: - [0x934040, "bin"] # rodata - name: world/area_sbk/sbk_11/ type: code + overlay: True start: 0x934040 vram: 0x80240000 files: @@ -1788,6 +1853,7 @@ segments: - [0x934D20, "bin"] # rodata - name: world/area_sbk/sbk_12/ type: code + overlay: True start: 0x934D40 vram: 0x80240000 files: @@ -1798,6 +1864,7 @@ segments: - [0x9357C0, "bin"] # rodata - name: world/area_sbk/sbk_13/ type: code + overlay: True start: 0x9357E0 vram: 0x80240000 files: @@ -1808,6 +1875,7 @@ segments: - [0x9366C0, "bin"] # rodata - name: world/area_sbk/sbk_14/ type: code + overlay: True start: 0x9366E0 vram: 0x80240000 files: @@ -1818,6 +1886,7 @@ segments: - [0x936CD0, "bin"] # rodata - name: world/area_sbk/sbk_15/ type: code + overlay: True start: 0x936CD0 vram: 0x80240000 files: @@ -1828,6 +1897,7 @@ segments: - [0x937550, "bin"] # rodata - name: world/area_sbk/sbk_16/ type: code + overlay: True start: 0x937570 vram: 0x80240000 files: @@ -1839,6 +1909,7 @@ segments: - [0x938590, "bin"] # rodata - name: world/area_sbk/sbk_20/ type: code + overlay: True start: 0x938590 vram: 0x80240000 files: @@ -1851,6 +1922,7 @@ segments: - [0x939560, "bin"] # rodata - name: world/area_sbk/sbk_21/ type: code + overlay: True start: 0x939560 vram: 0x80240000 files: @@ -1859,6 +1931,7 @@ segments: - [0x939910, "bin"] # rodata - name: world/area_sbk/sbk_22/ type: code + overlay: True start: 0x939930 vram: 0x80240000 files: @@ -1869,6 +1942,7 @@ segments: - [0x93A740, "bin"] # rodata - name: world/area_sbk/sbk_23/ type: code + overlay: True start: 0x93A760 vram: 0x80240000 files: @@ -1879,6 +1953,7 @@ segments: - [0x93AC30, "bin"] # rodata - name: world/area_sbk/sbk_24/ type: code + overlay: True start: 0x93AC30 vram: 0x80240000 files: @@ -1890,6 +1965,7 @@ segments: - [0x93C260, "bin"] # rodata - name: world/area_sbk/sbk_25/ type: code + overlay: True start: 0x93C280 vram: 0x80240000 files: @@ -1902,6 +1978,7 @@ segments: - [0x93DCB0, "bin"] # rodata - name: world/area_sbk/sbk_26/ type: code + overlay: True start: 0x93DCD0 vram: 0x80240000 files: @@ -1915,6 +1992,7 @@ segments: - [0x93F5B0, "bin"] # rodata - name: world/area_sbk/sbk_30/ type: code + overlay: True start: 0x93F5B0 vram: 0x80240000 files: @@ -1925,6 +2003,7 @@ segments: - [0x944000, "bin"] # rodata - name: world/area_sbk/sbk_31/ type: code + overlay: True start: 0x944000 vram: 0x80240000 files: @@ -1935,6 +2014,7 @@ segments: - [0x944A40, "bin"] # rodata - name: world/area_sbk/sbk_32/ type: code + overlay: True start: 0x944A60 vram: 0x80240000 files: @@ -1944,6 +2024,7 @@ segments: - [0x9459B0, "bin"] # rodata - name: world/area_sbk/sbk_33/ type: code + overlay: True start: 0x9459D0 vram: 0x80240000 files: @@ -1954,6 +2035,7 @@ segments: - [0x945ED0, "bin"] # rodata - name: world/area_sbk/sbk_34/ type: code + overlay: True start: 0x945ED0 vram: 0x80240000 files: @@ -1965,6 +2047,7 @@ segments: - [0x948690, "bin"] # rodata - name: world/area_sbk/sbk_35/ type: code + overlay: True start: 0x9486B0 vram: 0x80240000 files: @@ -1975,6 +2058,7 @@ segments: - [0x949E40, "bin"] # rodata - name: world/area_sbk/sbk_36/ type: code + overlay: True start: 0x949E60 vram: 0x80240000 files: @@ -1985,6 +2069,7 @@ segments: - [0x94B380, "bin"] # rodata - name: world/area_sbk/sbk_40/ type: code + overlay: True start: 0x94B3A0 vram: 0x80240000 files: @@ -1997,6 +2082,7 @@ segments: - [0x94C040, "bin"] # rodata - name: world/area_sbk/sbk_41/ type: code + overlay: True start: 0x94C040 vram: 0x80240000 files: @@ -2007,6 +2093,7 @@ segments: - [0x94C510, "bin"] # rodata - name: world/area_sbk/sbk_42/ type: code + overlay: True start: 0x94C510 vram: 0x80240000 files: @@ -2017,6 +2104,7 @@ segments: - [0x94D150, "bin"] # rodata - name: world/area_sbk/sbk_43/ type: code + overlay: True start: 0x94D170 vram: 0x80240000 files: @@ -2026,6 +2114,7 @@ segments: - [0x94D580, "bin"] # rodata - name: world/area_sbk/sbk_44/ type: code + overlay: True start: 0x94D5A0 vram: 0x80240000 files: @@ -2036,6 +2125,7 @@ segments: - [0x94E480, "bin"] # rodata - name: world/area_sbk/sbk_45/ type: code + overlay: True start: 0x94E4A0 vram: 0x80240000 files: @@ -2045,6 +2135,7 @@ segments: - [0x94E980, "bin"] # rodata - name: world/area_sbk/sbk_46/ type: code + overlay: True start: 0x94E9A0 vram: 0x80240000 files: @@ -2059,6 +2150,7 @@ segments: - [0x950610, "bin"] # rodata - name: world/area_sbk/sbk_50/ type: code + overlay: True start: 0x950610 vram: 0x80240000 files: @@ -2068,6 +2160,7 @@ segments: - [0x950970, "bin"] # rodata - name: world/area_sbk/sbk_51/ type: code + overlay: True start: 0x950970 vram: 0x80240000 files: @@ -2078,6 +2171,7 @@ segments: - [0x951650, "bin"] # rodata - name: world/area_sbk/sbk_52/ type: code + overlay: True start: 0x951670 vram: 0x80240000 files: @@ -2087,6 +2181,7 @@ segments: - [0x951AC0, "bin"] # rodata - name: world/area_sbk/sbk_53/ type: code + overlay: True start: 0x951AE0 vram: 0x80240000 files: @@ -2097,6 +2192,7 @@ segments: - [0x952560, "bin"] # rodata - name: world/area_sbk/sbk_54/ type: code + overlay: True start: 0x952580 vram: 0x80240000 files: @@ -2107,6 +2203,7 @@ segments: - [0x952A50, "bin"] # rodata - name: world/area_sbk/sbk_55/ type: code + overlay: True start: 0x952A50 vram: 0x80240000 files: @@ -2119,6 +2216,7 @@ segments: - [0x953FA0, "bin"] # rodata - name: world/area_sbk/sbk_56/ type: code + overlay: True start: 0x953FC0 vram: 0x80240000 files: @@ -2130,6 +2228,7 @@ segments: - [0x9569F0, "bin"] # rodata - name: world/area_sbk/sbk_60/ type: code + overlay: True start: 0x9569F0 vram: 0x80240000 files: @@ -2140,6 +2239,7 @@ segments: - [0x956F80, "bin"] # rodata - name: world/area_sbk/sbk_61/ type: code + overlay: True start: 0x956F90 vram: 0x80240000 files: @@ -2150,6 +2250,7 @@ segments: - [0x957350, "bin"] # rodata - name: world/area_sbk/sbk_62/ type: code + overlay: True start: 0x957350 vram: 0x80240000 files: @@ -2161,6 +2262,7 @@ segments: - [0x957D70, "bin"] # rodata - name: world/area_sbk/sbk_63/ type: code + overlay: True start: 0x957D70 vram: 0x80240000 files: @@ -2172,6 +2274,7 @@ segments: - [0x958590, "bin"] # rodata - name: world/area_sbk/sbk_64/ type: code + overlay: True start: 0x958590 vram: 0x80240000 files: @@ -2182,6 +2285,7 @@ segments: - [0x958950, "bin"] # rodata - name: world/area_sbk/sbk_65/ type: code + overlay: True start: 0x958950 vram: 0x80240000 files: @@ -2191,6 +2295,7 @@ segments: - [0x958CB0, "bin"] # rodata - name: world/area_sbk/sbk_66/ type: code + overlay: True start: 0x958CB0 vram: 0x80240000 files: @@ -2203,6 +2308,7 @@ segments: - [0x95AEA0, "bin"] # rodata - name: world/area_sbk/sbk_99/ type: code + overlay: True start: 0x95AEB0 vram: 0x80240000 files: @@ -2211,6 +2317,7 @@ segments: - [0x95B1F0, "bin"] # rodata - name: world/area_dro/dro_01/ type: code + overlay: True start: 0x95B200 vram: 0x80240000 files: @@ -2229,6 +2336,7 @@ segments: - [0x9691C0, "bin"] # rodata - name: world/area_dro/dro_02/ type: code + overlay: True start: 0x9691C0 vram: 0x80240000 files: @@ -2242,6 +2350,7 @@ segments: - [0x9780D0, "bin"] # rodata - name: world/area_isk/isk_01/ type: code + overlay: True start: 0x978140 vram: 0x80240000 files: @@ -2251,6 +2360,7 @@ segments: - [0x978700, "bin"] # rodata - name: world/area_isk/isk_02/ type: code + overlay: True start: 0x978710 vram: 0x80240000 files: @@ -2265,6 +2375,7 @@ segments: - [0x979E40, "bin"] # rodata - name: world/area_isk/isk_03/ type: code + overlay: True start: 0x979E50 vram: 0x80240000 files: @@ -2274,6 +2385,7 @@ segments: - [0x97B620, "bin"] # rodata - name: world/area_isk/isk_04/ type: code + overlay: True start: 0x97B630 vram: 0x80240000 files: @@ -2290,6 +2402,7 @@ segments: - [0x97DAD0, "bin"] # rodata - name: world/area_isk/isk_05/ type: code + overlay: True start: 0x97DAD0 vram: 0x80240000 files: @@ -2304,6 +2417,7 @@ segments: - [0x980A20, "bin"] # rodata - name: world/area_isk/isk_06/ type: code + overlay: True start: 0x980A20 vram: 0x80240000 files: @@ -2314,6 +2428,7 @@ segments: - [0x982440, "bin"] # rodata - name: world/area_isk/isk_07/ type: code + overlay: True start: 0x982440 vram: 0x80240000 files: @@ -2329,6 +2444,7 @@ segments: - [0x984E20, "bin"] # rodata - name: world/area_isk/isk_08/ type: code + overlay: True start: 0x984E30 vram: 0x80240000 files: @@ -2340,6 +2456,7 @@ segments: - [0x9864E0, "bin"] # rodata - name: world/area_isk/isk_09/ type: code + overlay: True start: 0x9864E0 vram: 0x80240000 files: @@ -2354,6 +2471,7 @@ segments: - [0x988B60, "bin"] # rodata - name: world/area_isk/isk_10/ type: code + overlay: True start: 0x988B60 vram: 0x80240000 files: @@ -2364,6 +2482,7 @@ segments: - [0x98AA00, "bin"] # rodata - name: world/area_isk/isk_11/ type: code + overlay: True start: 0x98AA10 vram: 0x80240000 files: @@ -2379,6 +2498,7 @@ segments: - [0x98D640, "bin"] # rodata - name: world/area_isk/isk_12/ type: code + overlay: True start: 0x98D640 vram: 0x80240000 files: @@ -2390,6 +2510,7 @@ segments: - [0x98F7E0, "bin"] # rodata - name: world/area_isk/isk_13/ type: code + overlay: True start: 0x98F7E0 vram: 0x80240000 files: @@ -2403,6 +2524,7 @@ segments: - [0x992730, "bin"] # rodata - name: world/area_isk/isk_14/ type: code + overlay: True start: 0x992730 vram: 0x80240000 files: @@ -2416,6 +2538,7 @@ segments: - [0x9951F0, "bin"] # rodata - name: world/area_isk/isk_16/ type: code + overlay: True start: 0x9951F0 vram: 0x80240000 files: @@ -2429,6 +2552,7 @@ segments: - [0x997F70, "bin"] # rodata - name: world/area_isk/isk_18/ type: code + overlay: True start: 0x997F70 vram: 0x80240000 files: @@ -2440,6 +2564,7 @@ segments: - [0x999740, "bin"] # rodata - name: world/area_isk/isk_19/ type: code + overlay: True start: 0x999740 vram: 0x80240000 files: @@ -2449,6 +2574,7 @@ segments: - [0x999C60, "bin"] # rodata - name: world/area_trd/trd_00/ type: code + overlay: True start: 0x999C70 vram: 0x80240000 files: @@ -2463,6 +2589,7 @@ segments: - [0x99C990, "bin"] # rodata - name: world/area_trd/trd_01/ type: code + overlay: True start: 0x99C990 vram: 0x80240000 files: @@ -2479,6 +2606,7 @@ segments: - [0x9A0FE0, "bin"] # rodata - name: world/area_trd/trd_02/ type: code + overlay: True start: 0x9A0FE0 vram: 0x80240000 files: @@ -2492,6 +2620,7 @@ segments: - [0x9A4320, "bin"] # rodata - name: world/area_trd/trd_03/ type: code + overlay: True start: 0x9A4650 vram: 0x80240000 files: @@ -2506,6 +2635,7 @@ segments: - [0x9A83F0, "bin"] # rodata - name: world/area_trd/trd_04/ type: code + overlay: True start: 0x9A83F0 vram: 0x80240000 files: @@ -2521,6 +2651,7 @@ segments: - [0x9AE700, "bin"] # rodata - name: world/area_trd/trd_05/ type: code + overlay: True start: 0x9AE700 vram: 0x80240000 files: @@ -2534,6 +2665,7 @@ segments: - [0x9B1790, "bin"] # rodata - name: world/area_trd/trd_06/ type: code + overlay: True start: 0x9B1790 vram: 0x80240000 files: @@ -2548,6 +2680,7 @@ segments: - [0x9B6950, "bin"] # rodata - name: world/area_trd/trd_07/ type: code + overlay: True start: 0x9B6980 vram: 0x80240000 files: @@ -2563,6 +2696,7 @@ segments: - [0x9BB2A0, "bin"] # rodata - name: world/area_trd/trd_08/ type: code + overlay: True start: 0x9BB2A0 vram: 0x80240000 files: @@ -2575,6 +2709,7 @@ segments: - [0x9BD660, "bin"] # rodata - name: world/area_trd/trd_09/ type: code + overlay: True start: 0x9BD660 vram: 0x80240000 files: @@ -2589,6 +2724,7 @@ segments: - [0x9C2910, "bin"] # rodata - name: world/area_trd/trd_10/ type: code + overlay: True start: 0x9C2910 vram: 0x80240000 files: @@ -2601,6 +2737,7 @@ segments: - [0x9C53E0, "bin"] # rodata - name: world/area_nok/nok_01/ type: code + overlay: True start: 0x9C53E0 vram: 0x80240000 files: @@ -2619,6 +2756,7 @@ segments: - [0x9D7020, "bin"] # rodata - name: world/area_nok/nok_02/ type: code + overlay: True start: 0x9D7020 vram: 0x80240000 files: @@ -2642,6 +2780,7 @@ segments: - [0x9EB640, "bin"] # rodata - name: world/area_nok/nok_03/ type: code + overlay: True start: 0x9EB7F0 vram: 0x80240000 files: @@ -2653,6 +2792,7 @@ segments: - [0x9EDBF0, "bin"] # rodata - name: world/area_nok/nok_04/ type: code + overlay: True start: 0x9EDBF0 vram: 0x80240000 files: @@ -2667,6 +2807,7 @@ segments: - [0x9F4A30, "bin"] # rodata - name: world/area_nok/nok_11/ type: code + overlay: True start: 0x9F4A40 vram: 0x80240000 files: @@ -2679,6 +2820,7 @@ segments: - [0x9FA7F0, "bin"] # rodata - name: world/area_nok/nok_12/ type: code + overlay: True start: 0x9FA7F0 vram: 0x80240000 files: @@ -2698,6 +2840,7 @@ segments: - [0xA00600, "bin"] # rodata - name: world/area_nok/nok_13/ type: code + overlay: True start: 0xA00600 vram: 0x80240000 files: @@ -2714,6 +2857,7 @@ segments: - [0xA02840, "bin"] # rodata - name: world/area_nok/nok_14/ type: code + overlay: True start: 0xA02840 vram: 0x80240000 files: @@ -2731,6 +2875,7 @@ segments: - [0xA06F00, "bin"] # rodata - name: world/area_nok/nok_15/ type: code + overlay: True start: 0xA06F00 vram: 0x80240000 files: @@ -2747,6 +2892,7 @@ segments: - [0xA0BCF0, "bin"] # rodata - name: world/area_hos/hos_00/ type: code + overlay: True start: 0xA0BCF0 vram: 0x80240000 files: @@ -2766,6 +2912,7 @@ segments: - [0xA10880, "bin"] # rodata - name: world/area_hos/hos_01/ type: code + overlay: True start: 0xA10880 vram: 0x80240000 files: @@ -2780,6 +2927,7 @@ segments: - [0xA161F0, "bin"] # rodata - name: world/area_hos/hos_02/ type: code + overlay: True start: 0xA16220 vram: 0x80240000 files: @@ -2795,6 +2943,7 @@ segments: - [0xA1B100, "bin"] # rodata - name: world/area_hos/hos_03/ type: code + overlay: True start: 0xA1B100 vram: 0x80240000 files: @@ -2814,6 +2963,7 @@ segments: - [0xA26ED0, "bin"] # rodata - name: world/area_hos/hos_04/ type: code + overlay: True start: 0xA26ED0 vram: 0x80240000 files: @@ -2836,6 +2986,7 @@ segments: - [0xA2A240, "bin"] # rodata - name: world/area_hos/hos_05/ type: code + overlay: True start: 0xA2A240 vram: 0x80240000 files: @@ -2856,6 +3007,7 @@ segments: - [0xA394E0, "bin"] # rodata - name: world/area_hos/hos_06/ type: code + overlay: True start: 0xA394E0 vram: 0x80240000 files: @@ -2872,6 +3024,7 @@ segments: - [0xA3F740, "bin"] # rodata - name: world/area_hos/hos_10/ type: code + overlay: True start: 0xA3F740 vram: 0x80240000 files: @@ -2887,6 +3040,7 @@ segments: - [0xA45930, "bin"] # rodata - name: world/area_hos/hos_20/ type: code + overlay: True start: 0xA45930 vram: 0x80240000 files: @@ -2897,6 +3051,7 @@ segments: - [0xA46F40, "bin"] # rodata - name: world/area_kpa/kpa_01/ type: code + overlay: True start: 0xA46F60 vram: 0x80240000 files: @@ -2910,6 +3065,7 @@ segments: - [0xA485C0, "bin"] # rodata - name: world/area_kpa/kpa_03/ type: code + overlay: True start: 0xA485C0 vram: 0x80240000 files: @@ -2925,6 +3081,7 @@ segments: - [0xA4BF60, "bin"] # rodata - name: world/area_kpa/kpa_04/ type: code + overlay: True start: 0xA4BF60 vram: 0x80240000 files: @@ -2934,6 +3091,7 @@ segments: - [0xA4CA10, "bin"] # rodata - name: world/area_kpa/kpa_08/ type: code + overlay: True start: 0xA4CA20 vram: 0x80240000 files: @@ -2948,6 +3106,7 @@ segments: - [0xA4F000, "bin"] # rodata - name: world/area_kpa/kpa_09/ type: code + overlay: True start: 0xA4F000 vram: 0x80240000 files: @@ -2961,6 +3120,7 @@ segments: - [0xA51980, "bin"] # rodata - name: world/area_kpa/kpa_10/ type: code + overlay: True start: 0xA51980 vram: 0x80240000 files: @@ -2971,6 +3131,7 @@ segments: - [0xA528C0, "bin"] # rodata - name: world/area_kpa/kpa_11/ type: code + overlay: True start: 0xA528C0 vram: 0x80240000 files: @@ -2985,6 +3146,7 @@ segments: - [0xA54950, "bin"] # rodata - name: world/area_kpa/kpa_12/ type: code + overlay: True start: 0xA54950 vram: 0x80240000 files: @@ -2997,6 +3159,7 @@ segments: - [0xA55F20, "bin"] # rodata - name: world/area_kpa/kpa_13/ type: code + overlay: True start: 0xA55F20 vram: 0x80240000 files: @@ -3010,6 +3173,7 @@ segments: - [0xA574B0, "bin"] # rodata - name: world/area_kpa/kpa_14/ type: code + overlay: True start: 0xA574B0 vram: 0x80240000 files: @@ -3024,6 +3188,7 @@ segments: - [0xA59390, "bin"] # rodata - name: world/area_kpa/kpa_15/ type: code + overlay: True start: 0xA59390 vram: 0x80240000 files: @@ -3035,6 +3200,7 @@ segments: - [0xA5A030, "bin"] # rodata - name: world/area_kpa/kpa_16/ type: code + overlay: True start: 0xA5A030 vram: 0x80240000 files: @@ -3046,6 +3212,7 @@ segments: - [0xA5CA20, "bin"] # rodata - name: world/area_kpa/kpa_17/ type: code + overlay: True start: 0xA5CA20 vram: 0x80240000 files: @@ -3056,6 +3223,7 @@ segments: - [0xA5E0B0, "bin"] # rodata - name: world/area_kpa/kpa_32/ type: code + overlay: True start: 0xA5E0C0 vram: 0x80240000 files: @@ -3066,6 +3234,7 @@ segments: - [0xA5F060, "bin"] # rodata - name: world/area_kpa/kpa_33/ type: code + overlay: True start: 0xA5F080 vram: 0x80240000 files: @@ -3076,6 +3245,7 @@ segments: - [0xA60020, "bin"] # rodata - name: world/area_kpa/kpa_40/ type: code + overlay: True start: 0xA60040 vram: 0x80240000 files: @@ -3085,6 +3255,7 @@ segments: - [0xA60470, "bin"] # rodata - name: world/area_kpa/kpa_41/ type: code + overlay: True start: 0xA60470 vram: 0x80240000 files: @@ -3094,6 +3265,7 @@ segments: - [0xA609D0, "bin"] # rodata - name: world/area_kpa/kpa_50/ type: code + overlay: True start: 0xA609D0 vram: 0x80240000 files: @@ -3104,6 +3276,7 @@ segments: - [0xA64090, "bin"] # rodata - name: world/area_kpa/kpa_51/ type: code + overlay: True start: 0xA64090 vram: 0x80240000 files: @@ -3119,6 +3292,7 @@ segments: - [0xA67100, "bin"] # rodata - name: world/area_kpa/kpa_52/ type: code + overlay: True start: 0xA67100 vram: 0x80240000 files: @@ -3133,6 +3307,7 @@ segments: - [0xA6ACA0, "bin"] # rodata - name: world/area_kpa/kpa_53/ type: code + overlay: True start: 0xA6ACA0 vram: 0x80240000 files: @@ -3146,6 +3321,7 @@ segments: - [0xA6CB00, "bin"] # rodata - name: world/area_kpa/kpa_60/ type: code + overlay: True start: 0xA6CB00 vram: 0x80240000 files: @@ -3156,6 +3332,7 @@ segments: - [0xA6E3E0, "bin"] # rodata - name: world/area_kpa/kpa_61/ type: code + overlay: True start: 0xA6E3E0 vram: 0x80240000 files: @@ -3171,6 +3348,7 @@ segments: - [0xA72220, "bin"] # rodata - name: world/area_kpa/kpa_62/ type: code + overlay: True start: 0xA72220 vram: 0x80240000 files: @@ -3181,6 +3359,7 @@ segments: - [0xA73590, "bin"] # rodata - name: world/area_kpa/kpa_63/ type: code + overlay: True start: 0xA735B0 vram: 0x80240000 files: @@ -3192,6 +3371,7 @@ segments: - [0xA74860, "bin"] # rodata - name: world/area_kpa/kpa_70/ type: code + overlay: True start: 0xA74870 vram: 0x80240000 files: @@ -3204,6 +3384,7 @@ segments: - [0xA784C0, "bin"] # rodata - name: world/area_kpa/kpa_81/ type: code + overlay: True start: 0xA784C0 vram: 0x80240000 files: @@ -3216,6 +3397,7 @@ segments: - [0xA7A500, "bin"] # rodata - name: world/area_kpa/kpa_82/ type: code + overlay: True start: 0xA7A500 vram: 0x80240000 files: @@ -3228,6 +3410,7 @@ segments: - [0xA83490, "bin"] # rodata - name: world/area_kpa/kpa_83/ type: code + overlay: True start: 0xA83490 vram: 0x80240000 files: @@ -3240,6 +3423,7 @@ segments: - [0xA867B0, "bin"] # rodata - name: world/area_kpa/kpa_90/ type: code + overlay: True start: 0xA867B0 vram: 0x80240000 files: @@ -3248,6 +3432,7 @@ segments: - [0xA86A40, "bin"] # rodata - name: world/area_kpa/kpa_91/ type: code + overlay: True start: 0xA86A50 vram: 0x80240000 files: @@ -3262,6 +3447,7 @@ segments: - [0xA8C7C0, "bin"] # rodata - name: world/area_kpa/kpa_94/ type: code + overlay: True start: 0xA8C7C0 vram: 0x80240000 files: @@ -3270,6 +3456,7 @@ segments: - [0xA8CA70, "bin"] # rodata - name: world/area_kpa/kpa_95/ type: code + overlay: True start: 0xA8CA80 vram: 0x80240000 files: @@ -3284,6 +3471,7 @@ segments: - [0xA927C0, "bin"] # rodata - name: world/area_kpa/kpa_96/ type: code + overlay: True start: 0xA927C0 vram: 0x80240000 files: @@ -3294,6 +3482,7 @@ segments: - [0xA93160, "bin"] # rodata - name: world/area_kpa/kpa_100/ type: code + overlay: True start: 0xA93160 vram: 0x80240000 files: @@ -3305,6 +3494,7 @@ segments: - [0xA93440, "bin"] # rodata - name: world/area_kpa/kpa_101/ type: code + overlay: True start: 0xA93440 vram: 0x80240000 files: @@ -3316,6 +3506,7 @@ segments: - [0xA93740, "bin"] # rodata - name: world/area_kpa/kpa_102/ type: code + overlay: True start: 0xA93740 vram: 0x80240000 files: @@ -3330,6 +3521,7 @@ segments: - [0xA99590, "bin"] # rodata - name: world/area_kpa/kpa_111/ type: code + overlay: True start: 0xA99590 vram: 0x80240000 files: @@ -3342,6 +3534,7 @@ segments: - [0xA9C990, "bin"] # rodata - name: world/area_kpa/kpa_112/ type: code + overlay: True start: 0xA9C990 vram: 0x80240000 files: @@ -3350,6 +3543,7 @@ segments: - [0xA9CC20, "bin"] # rodata - name: world/area_kpa/kpa_113/ type: code + overlay: True start: 0xA9CC30 vram: 0x80240000 files: @@ -3364,6 +3558,7 @@ segments: - [0xA9E980, "bin"] # rodata - name: world/area_kpa/kpa_114/ type: code + overlay: True start: 0xA9E980 vram: 0x80240000 files: @@ -3374,6 +3569,7 @@ segments: - [0xA9ED40, "bin"] # rodata - name: world/area_kpa/kpa_115/ type: code + overlay: True start: 0xA9ED40 vram: 0x80240000 files: @@ -3387,6 +3583,7 @@ segments: - [0xAA1EE0, "bin"] # rodata - name: world/area_kpa/kpa_116/ type: code + overlay: True start: 0xAA1EE0 vram: 0x80240000 files: @@ -3395,6 +3592,7 @@ segments: - [0xAA2170, "bin"] # rodata - name: world/area_kpa/kpa_117/ type: code + overlay: True start: 0xAA2180 vram: 0x80240000 files: @@ -3404,6 +3602,7 @@ segments: - [0xAA23C0, "bin"] # rodata - name: world/area_kpa/kpa_118/ type: code + overlay: True start: 0xAA23C0 vram: 0x80240000 files: @@ -3412,6 +3611,7 @@ segments: - [0xAA2650, "bin"] # rodata - name: world/area_kpa/kpa_119/ type: code + overlay: True start: 0xAA2660 vram: 0x80240000 files: @@ -3422,6 +3622,7 @@ segments: - [0xAA28F0, "bin"] # rodata - name: world/area_kpa/kpa_121/ type: code + overlay: True start: 0xAA28F0 vram: 0x80240000 files: @@ -3430,6 +3631,7 @@ segments: - [0xAA2D10, "bin"] # rodata - name: world/area_kpa/kpa_130/ type: code + overlay: True start: 0xAA2D20 vram: 0x80240000 files: @@ -3440,6 +3642,7 @@ segments: - [0xAA7460, "bin"] # rodata - name: world/area_kpa/kpa_133/ type: code + overlay: True start: 0xAA7480 vram: 0x80240000 files: @@ -3453,6 +3656,7 @@ segments: - [0xAA8F90, "bin"] # rodata - name: world/area_kpa/kpa_134/ type: code + overlay: True start: 0xAA8FA0 vram: 0x80240000 files: @@ -3467,6 +3671,7 @@ segments: - [0xAAC820, "bin"] # rodata - name: world/area_osr/osr_00/ type: code + overlay: True start: 0xAAC830 vram: 0x80240000 files: @@ -3477,6 +3682,7 @@ segments: - [0xAAFFD0, "bin"] # rodata - name: world/area_osr/osr_01/ type: code + overlay: True start: 0xAAFFF0 vram: 0x80240000 files: @@ -3489,6 +3695,7 @@ segments: - [0xAB2150, "bin"] # rodata - name: world/area_osr/osr_02/ type: code + overlay: True start: 0xAB2170 vram: 0x80240000 files: @@ -3504,6 +3711,7 @@ segments: - [0xAB6290, "bin"] # rodata - name: world/area_osr/osr_03/ type: code + overlay: True start: 0xAB6290 vram: 0x80240000 files: @@ -3518,6 +3726,7 @@ segments: - [0xAB92B0, "bin"] # rodata - name: world/area_osr/osr_04/ type: code + overlay: True start: 0xAB92B0 vram: 0x80240000 files: @@ -3528,6 +3737,7 @@ segments: - [0xABB290, "bin"] # rodata - name: world/area_kkj/kkj_00/ type: code + overlay: True start: 0xABB290 vram: 0x80240000 files: @@ -3542,6 +3752,7 @@ segments: - [0xAC5170, "bin"] # rodata - name: world/area_kkj/kkj_01/ type: code + overlay: True start: 0xAC5170 vram: 0x80240000 files: @@ -3553,6 +3764,7 @@ segments: - [0xAC8B80, "bin"] # rodata - name: world/area_kkj/kkj_02/ type: code + overlay: True start: 0xAC8D20 vram: 0x80240000 files: @@ -3562,6 +3774,7 @@ segments: - [0xAC9700, "bin"] # rodata - name: world/area_kkj/kkj_03/ type: code + overlay: True start: 0xAC9710 vram: 0x80240000 files: @@ -3575,6 +3788,7 @@ segments: - [0xACAB20, "bin"] # rodata - name: world/area_kkj/kkj_10/ type: code + overlay: True start: 0xACAB20 vram: 0x80240000 files: @@ -3588,6 +3802,7 @@ segments: - [0xACE0D0, "bin"] # rodata - name: world/area_kkj/kkj_11/ type: code + overlay: True start: 0xACE140 vram: 0x80240000 files: @@ -3603,6 +3818,7 @@ segments: - [0xAD4010, "bin"] # rodata - name: world/area_kkj/kkj_12/ type: code + overlay: True start: 0xAD4090 vram: 0x80240000 files: @@ -3612,6 +3828,7 @@ segments: - [0xAD5EA0, "bin"] # rodata - name: world/area_kkj/kkj_13/ type: code + overlay: True start: 0xAD5ED0 vram: 0x80240000 files: @@ -3627,6 +3844,7 @@ segments: - [0xADAE60, "bin"] # rodata - name: world/area_kkj/kkj_14/ type: code + overlay: True start: 0xADAEA0 vram: 0x80240000 files: @@ -3649,6 +3867,7 @@ segments: - [0xAE5550, "bin"] # rodata - name: world/area_kkj/kkj_15/ type: code + overlay: True start: 0xAE5590 vram: 0x80240000 files: @@ -3670,6 +3889,7 @@ segments: - [0xAED410, "bin"] # rodata - name: world/area_kkj/kkj_16/ type: code + overlay: True start: 0xAED410 vram: 0x80240000 files: @@ -3682,6 +3902,7 @@ segments: - [0xAF1C10, "bin"] # rodata - name: world/area_kkj/kkj_17/ type: code + overlay: True start: 0xAF1C60 vram: 0x80240000 files: @@ -3693,6 +3914,7 @@ segments: - [0xAF2CA0, "bin"] # rodata - name: world/area_kkj/kkj_18/ type: code + overlay: True start: 0xAF2CA0 vram: 0x80240000 files: @@ -3708,6 +3930,7 @@ segments: - [0xAF7950, "bin"] # rodata - name: world/area_kkj/kkj_19/ type: code + overlay: True start: 0xAF7950 vram: 0x80240000 files: @@ -3722,6 +3945,7 @@ segments: - [0xAFDB40, "bin"] # rodata - name: world/area_kkj/kkj_20/ type: code + overlay: True start: 0xAFDB40 vram: 0x80240000 files: @@ -3735,6 +3959,7 @@ segments: - [0xB022A0, "bin"] # rodata - name: world/area_kkj/kkj_21/ type: code + overlay: True start: 0xB022A0 vram: 0x80240000 files: @@ -3743,6 +3968,7 @@ segments: - [0xB024F0, "bin"] # rodata - name: world/area_kkj/kkj_22/ type: code + overlay: True start: 0xB024F0 vram: 0x80240000 files: @@ -3751,6 +3977,7 @@ segments: - [0xB02870, "bin"] # rodata - name: world/area_kkj/kkj_23/ type: code + overlay: True start: 0xB02880 vram: 0x80240000 files: @@ -3766,6 +3993,7 @@ segments: - [0xB06550, "bin"] # rodata - name: world/area_kkj/kkj_24/ type: code + overlay: True start: 0xB06570 vram: 0x80240000 files: @@ -3776,6 +4004,7 @@ segments: - [0xB069F0, "bin"] # rodata - name: world/area_kkj/kkj_25/ type: code + overlay: True start: 0xB06A00 vram: 0x80240000 files: @@ -3792,6 +4021,7 @@ segments: - [0xB13100, "bin"] # rodata - name: world/area_kkj/kkj_26/ type: code + overlay: True start: 0xB13120 vram: 0x80240000 files: @@ -3802,6 +4032,7 @@ segments: - [0xB13D50, "bin"] # rodata - name: world/area_kkj/kkj_26/ type: code + overlay: True start: 0xB13120 vram: 0x80240000 files: @@ -3812,6 +4043,7 @@ segments: - [0xB13D50, "bin"] # rodata - name: world/area_kkj/kkj_27/ type: code + overlay: True start: 0xB13D70 vram: 0x80240000 files: @@ -3823,6 +4055,7 @@ segments: - [0xB14E90, "bin"] # rodata - name: world/area_kkj/kkj_28/ type: code + overlay: True start: 0xB14EA0 vram: 0x80240000 files: @@ -3831,6 +4064,7 @@ segments: - [0xB150B0, "bin"] # rodata - name: world/area_kkj/kkj_29/ type: code + overlay: True start: 0xB150B0 vram: 0x80240000 files: @@ -3842,6 +4076,7 @@ segments: - [0xB1A8F0, "bin"] # rodata - name: world/area_tst/tst_01/ type: code + overlay: True start: 0xB1A900 vram: 0x80240000 files: @@ -3850,6 +4085,7 @@ segments: - [0xB1AC20, "bin"] # rodata - name: world/area_tst/tst_02/ type: code + overlay: True start: 0xB1AC30 vram: 0x80240000 files: @@ -3858,6 +4094,7 @@ segments: - [0xB1AF70, "bin"] # rodata - name: world/area_tst/tst_03/ type: code + overlay: True start: 0xB1AF80 vram: 0x80240000 files: @@ -3866,6 +4103,7 @@ segments: - [0xB1B560, "bin"] # rodata - name: world/area_tst/tst_04/ type: code + overlay: True start: 0xB1B570 vram: 0x80240000 files: @@ -3880,6 +4118,7 @@ segments: - [0xB1C540, "bin"] # rodata - name: world/area_tst/tst_10/ type: code + overlay: True start: 0xB1C540 vram: 0x80240000 files: @@ -3888,6 +4127,7 @@ segments: - [0xB1CA50, "bin"] # rodata - name: world/area_tst/tst_11/ type: code + overlay: True start: 0xB1CA50 vram: 0x80240000 files: @@ -3897,6 +4137,7 @@ segments: - [0xB1D2F0, "bin"] - name: world/area_tst/tst_12/ type: code + overlay: True start: 0xB1D2F0 vram: 0x80240000 files: @@ -3904,6 +4145,7 @@ segments: - [0xB1D760, "bin"] - name: world/area_tst/tst_13/ type: code + overlay: True start: 0xB1D760 vram: 0x80240000 files: @@ -3913,12 +4155,14 @@ segments: - [0xB20470, "bin"] # rodata - name: world/area_tst/tst_20/ type: code + overlay: True start: 0xB20470 vram: 0x80240000 files: - [0xB20470, "bin"] - name: world/area_jan/jan_00/ type: code + overlay: True start: 0xB20540 vram: 0x80240000 files: @@ -3934,6 +4178,7 @@ segments: - [0xB28030, "bin"] # rodata - name: world/area_jan/jan_01/ type: code + overlay: True start: 0xB28030 vram: 0x80240000 files: @@ -3948,6 +4193,7 @@ segments: - [0xB2C470, "bin"] # rodata - name: world/area_jan/jan_02/ type: code + overlay: True start: 0xB2C470 vram: 0x80240000 files: @@ -3963,6 +4209,7 @@ segments: - [0xB34A20, "bin"] # rodata - name: world/area_jan/jan_03/ type: code + overlay: True start: 0xB34BD0 vram: 0x80240000 files: @@ -3979,6 +4226,7 @@ segments: - [0xB44770, "bin"] # rodata - name: world/area_jan/jan_04/ type: code + overlay: True start: 0xB44770 vram: 0x80240000 files: @@ -4004,6 +4252,7 @@ segments: - [0xB4AA70, "bin"] # rodata - name: world/area_jan/jan_05/ type: code + overlay: True start: 0xB4AA70 vram: 0x80240000 files: @@ -4025,6 +4274,7 @@ segments: - [0xB52830, "bin"] # rodata - name: world/area_jan/jan_06/ type: code + overlay: True start: 0xB52830 vram: 0x80240000 files: @@ -4045,6 +4295,7 @@ segments: - [0xB59870, "bin"] # rodata - name: world/area_jan/jan_07/ type: code + overlay: True start: 0xB59870 vram: 0x80240000 files: @@ -4060,6 +4311,7 @@ segments: - [0xB5DF70, "bin"] # rodata - name: world/area_jan/jan_08/ type: code + overlay: True start: 0xB5E2B0 vram: 0x80240000 files: @@ -4078,6 +4330,7 @@ segments: - [0xB65770, "bin"] # rodata - name: world/area_jan/jan_09/ type: code + overlay: True start: 0xB65AB0 vram: 0x80240000 files: @@ -4093,6 +4346,7 @@ segments: - [0xB6C050, "bin"] # rodata - name: world/area_jan/jan_10/ type: code + overlay: True start: 0xB6C390 vram: 0x80240000 files: @@ -4111,6 +4365,7 @@ segments: - [0xB70860, "bin"] # rodata - name: world/area_jan/jan_11/ type: code + overlay: True start: 0xB70860 vram: 0x80240000 files: @@ -4123,6 +4378,7 @@ segments: - [0xB730B0, "bin"] # rodata - name: world/area_jan/jan_12/ type: code + overlay: True start: 0xB730B0 vram: 0x80240000 files: @@ -4135,6 +4391,7 @@ segments: - [0xB76470, "bin"] # rodata - name: world/area_jan/jan_13/ type: code + overlay: True start: 0xB767B0 vram: 0x80240000 files: @@ -4146,6 +4403,7 @@ segments: - [0xB7A020, "bin"] # rodata - name: world/area_jan/jan_14/ type: code + overlay: True start: 0xB7A050 vram: 0x80240000 files: @@ -4160,6 +4418,7 @@ segments: - [0xB7D920, "bin"] # rodata - name: world/area_jan/jan_15/ type: code + overlay: True start: 0xB7D920 vram: 0x80240000 files: @@ -4172,6 +4431,7 @@ segments: - [0xB7FFF0, "bin"] # rodata - name: world/area_jan/jan_16/ type: code + overlay: True start: 0xB80000 vram: 0x80240000 files: @@ -4184,6 +4444,7 @@ segments: - [0xB837C0, "bin"] # rodata - name: world/area_jan/jan_17/ type: code + overlay: True start: 0xB837C0 vram: 0x80240000 files: @@ -4194,6 +4455,7 @@ segments: - [0xB83B80, "bin"] # rodata - name: world/area_jan/jan_18/ type: code + overlay: True start: 0xB83B90 vram: 0x80240000 files: @@ -4202,6 +4464,7 @@ segments: - [0xB83E50, "bin"] # rodata - name: world/area_jan/jan_19/ type: code + overlay: True start: 0xB83E60 vram: 0x80240000 files: @@ -4211,6 +4474,7 @@ segments: - [0xB84170, "bin"] # rodata - name: world/area_jan/jan_22/ type: code + overlay: True start: 0xB84180 vram: 0x80240000 files: @@ -4225,6 +4489,7 @@ segments: - [0xB8FCD0, "bin"] # rodata - name: world/area_jan/jan_23/ type: code + overlay: True start: 0xB8FCD0 vram: 0x80240000 files: @@ -4233,6 +4498,7 @@ segments: - [0xB93430, "bin"] # rodata - name: world/area_mim/mim_01/ type: code + overlay: True start: 0xB93440 vram: 0x80240000 files: @@ -4248,6 +4514,7 @@ segments: - [0xB97C00, "bin"] # rodata - name: world/area_mim/mim_02/ type: code + overlay: True start: 0xB97C00 vram: 0x80240000 files: @@ -4261,6 +4528,7 @@ segments: - [0xB9B480, "bin"] # rodata - name: world/area_mim/mim_03/ type: code + overlay: True start: 0xB9B480 vram: 0x80240000 files: @@ -4273,6 +4541,7 @@ segments: - [0xB9D960, "bin"] # rodata - name: world/area_mim/mim_04/ type: code + overlay: True start: 0xB9D960 vram: 0x80240000 files: @@ -4288,6 +4557,7 @@ segments: - [0xBA0730, "bin"] # rodata - name: world/area_mim/mim_05/ type: code + overlay: True start: 0xBA0730 vram: 0x80240000 files: @@ -4300,6 +4570,7 @@ segments: - [0xBA4780, "bin"] # rodata - name: world/area_mim/mim_06/ type: code + overlay: True start: 0xBA4780 vram: 0x80240000 files: @@ -4315,6 +4586,7 @@ segments: - [0xBAA140, "bin"] # rodata - name: world/area_mim/mim_07/ type: code + overlay: True start: 0xBAA140 vram: 0x80240000 files: @@ -4331,6 +4603,7 @@ segments: - [0xBAD940, "bin"] # rodata - name: world/area_mim/mim_08/ type: code + overlay: True start: 0xBAD940 vram: 0x80240000 files: @@ -4344,6 +4617,7 @@ segments: - [0xBB2C38, "bin"] # rodata - name: world/area_mim/mim_09/ type: code + overlay: True start: 0xBB2E00 vram: 0x80240000 files: @@ -4357,6 +4631,7 @@ segments: - [0xBB59E0, "bin"] # rodata - name: world/area_mim/mim_10/ type: code + overlay: True start: 0xBB59E0 vram: 0x80240000 files: @@ -4369,6 +4644,7 @@ segments: - [0xBB7070, "bin"] # rodata - name: world/area_mim/mim_11/ type: code + overlay: True start: 0xBB7070 vram: 0x80240000 files: @@ -4382,6 +4658,7 @@ segments: - [0xBBB380, "bin"] # rodata - name: world/area_mim/mim_12/ type: code + overlay: True start: 0xBBB380 vram: 0x80240000 files: @@ -4393,6 +4670,7 @@ segments: - [0xBBD190, "bin"] # rodata - name: world/area_obk/obk_01/ type: code + overlay: True start: 0xBBD1A0 vram: 0x80240000 files: @@ -4405,6 +4683,7 @@ segments: - [0xBC2A30, "bin"] # rodata - name: world/area_obk/obk_02/ type: code + overlay: True start: 0xBC2A90 vram: 0x80240000 files: @@ -4419,6 +4698,7 @@ segments: - [0xBC4280, "bin"] # rodata - name: world/area_obk/obk_03/ type: code + overlay: True start: 0xBC4280 vram: 0x80240000 files: @@ -4435,6 +4715,7 @@ segments: - [0xBC7E40, "bin"] # rodata - name: world/area_obk/obk_04/ type: code + overlay: True start: 0xBC7E60 vram: 0x80240000 files: @@ -4449,6 +4730,7 @@ segments: - [0xBCD060, "bin"] # rodata - name: world/area_obk/obk_05/ type: code + overlay: True start: 0xBCD060 vram: 0x80240000 files: @@ -4461,6 +4743,7 @@ segments: - [0xBCE680, "bin"] # rodata - name: world/area_obk/obk_06/ type: code + overlay: True start: 0xBCE690 vram: 0x80240000 files: @@ -4471,6 +4754,7 @@ segments: - [0xBCEBF0, "bin"] # rodata - name: world/area_obk/obk_07/ type: code + overlay: True start: 0xBCEBF0 vram: 0x80240000 files: @@ -4487,6 +4771,7 @@ segments: - [0xBD3870, "bin"] # rodata - name: world/area_obk/obk_08/ type: code + overlay: True start: 0xBD3870 vram: 0x80240000 files: @@ -4502,6 +4787,7 @@ segments: - [0xBDA7B0, "bin"] # rodata - name: world/area_obk/obk_09/ type: code + overlay: True start: 0xBDA7B0 vram: 0x80240000 files: @@ -4516,6 +4802,7 @@ segments: - [0xBDD1B0, "bin"] # rodata - name: world/area_arn/arn_02/ type: code + overlay: True start: 0xBDD1B0 vram: 0x80240000 files: @@ -4527,6 +4814,7 @@ segments: - [0xBDED90, "bin"] # rodata - name: world/area_arn/arn_03/ type: code + overlay: True start: 0xBDED90 vram: 0x80240000 files: @@ -4539,6 +4827,7 @@ segments: - [0xBE37B0, "bin"] # rodata - name: world/area_arn/arn_04/ type: code + overlay: True start: 0xBE37B0 vram: 0x80240000 files: @@ -4552,6 +4841,7 @@ segments: - [0xBE7BE0, "bin"] # rodata - name: world/area_arn/arn_05/ type: code + overlay: True start: 0xBE7BE0 vram: 0x80240000 files: @@ -4563,6 +4853,7 @@ segments: - [0xBECDF0, "bin"] # rodata - name: world/area_arn/arn_07/ type: code + overlay: True start: 0xBECDF0 vram: 0x80240000 files: @@ -4579,6 +4870,7 @@ segments: - [0xBF47A0, "bin"] # rodata - name: world/area_arn/arn_08/ type: code + overlay: True start: 0xBF47A0 vram: 0x80240000 files: @@ -4595,6 +4887,7 @@ segments: - [0xBF6060, "bin"] # rodata - name: world/area_arn/arn_09/ type: code + overlay: True start: 0xBF6060 vram: 0x80240000 files: @@ -4607,6 +4900,7 @@ segments: - [0xBF69F0, "bin"] # rodata - name: world/area_arn/arn_10/ type: code + overlay: True start: 0xBF6A00 vram: 0x80240000 files: @@ -4617,6 +4911,7 @@ segments: - [0xBF7670, "bin"] # rodata - name: world/area_arn/arn_11/ type: code + overlay: True start: 0xBF7680 vram: 0x80240000 files: @@ -4627,6 +4922,7 @@ segments: - [0xBF8790, "bin"] # rodata - name: world/area_arn/arn_12/ type: code + overlay: True start: 0xBF8790 vram: 0x80240000 files: @@ -4636,6 +4932,7 @@ segments: - [0xBF9400, "bin"] # rodata - name: world/area_arn/arn_13/ type: code + overlay: True start: 0xBF9410 vram: 0x80240000 files: @@ -4645,6 +4942,7 @@ segments: - [0xBFA090, "bin"] # rodata - name: world/area_dgb/dgb_00/ type: code + overlay: True start: 0xBFA0A0 vram: 0x80240000 files: @@ -4657,6 +4955,7 @@ segments: - [0xBFD880, "bin"] # rodata - name: world/area_dgb/dgb_01/ type: code + overlay: True start: 0xBFD880 vram: 0x80240000 files: @@ -4672,6 +4971,7 @@ segments: - [0xC20F40, "bin"] # rodata - name: world/area_dgb/dgb_02/ type: code + overlay: True start: 0xC2EBA0 vram: 0x80240000 files: @@ -4682,6 +4982,7 @@ segments: - [0xC31190, "bin"] # rodata - name: world/area_dgb/dgb_03/ type: code + overlay: True start: 0xC314E0 vram: 0x80240000 files: @@ -4695,6 +4996,7 @@ segments: - [0xC35EA0, "bin"] # rodata - name: world/area_dgb/dgb_04/ type: code + overlay: True start: 0xC36530 vram: 0x80240000 files: @@ -4706,6 +5008,7 @@ segments: - [0xC3A978, "bin"] # rodata - name: world/area_dgb/dgb_05/ type: code + overlay: True start: 0xC3AA10 vram: 0x80240000 files: @@ -4718,6 +5021,7 @@ segments: - [0xC3CD40, "bin"] # rodata - name: world/area_dgb/dgb_06/ type: code + overlay: True start: 0xC3D080 vram: 0x80240000 files: @@ -4729,6 +5033,7 @@ segments: - [0xC3DBF0, "bin"] # rodata - name: world/area_dgb/dgb_07/ type: code + overlay: True start: 0xC3DBF0 vram: 0x80240000 files: @@ -4740,6 +5045,7 @@ segments: - [0xC3FA80, "bin"] # rodata - name: world/area_dgb/dgb_08/ type: code + overlay: True start: 0xC3FDB0 vram: 0x80240000 files: @@ -4753,6 +5059,7 @@ segments: - [0xC46B40, "bin"] # rodata - name: world/area_dgb/dgb_09/ type: code + overlay: True start: 0xC46BE0 vram: 0x80240000 files: @@ -4765,6 +5072,7 @@ segments: - [0xC4C2F8, "bin"] # rodata - name: world/area_dgb/dgb_10/ type: code + overlay: True start: 0xC4C390 vram: 0x80240000 files: @@ -4776,6 +5084,7 @@ segments: - [0xC4D3D0, "bin"] # rodata - name: world/area_dgb/dgb_11/ type: code + overlay: True start: 0xC4D3E0 vram: 0x80240000 files: @@ -4786,6 +5095,7 @@ segments: - [0xC4DEE0, "bin"] # rodata - name: world/area_dgb/dgb_12/ type: code + overlay: True start: 0xC4DEF0 vram: 0x80240000 files: @@ -4797,6 +5107,7 @@ segments: - [0xC4E960, "bin"] # rodata - name: world/area_dgb/dgb_13/ type: code + overlay: True start: 0xC4E960 vram: 0x80240000 files: @@ -4807,6 +5118,7 @@ segments: - [0xC4F030, "bin"] # rodata - name: world/area_dgb/dgb_14/ type: code + overlay: True start: 0xC4F030 vram: 0x80240000 files: @@ -4816,6 +5128,7 @@ segments: - [0xC4F500, "bin"] # rodata - name: world/area_dgb/dgb_15/ type: code + overlay: True start: 0xC4F510 vram: 0x80240000 files: @@ -4829,6 +5142,7 @@ segments: - [0xC52200, "bin"] # rodata - name: world/area_dgb/dgb_16/ type: code + overlay: True start: 0xC52540 vram: 0x80240000 files: @@ -4841,6 +5155,7 @@ segments: - [0xC55730, "bin"] # rodata - name: world/area_dgb/dgb_17/ type: code + overlay: True start: 0xC55A60 vram: 0x80240000 files: @@ -4849,6 +5164,7 @@ segments: - [0xC55F30, "bin"] # rodata - name: world/area_dgb/dgb_18/ type: code + overlay: True start: 0xC55F40 vram: 0x80240000 files: @@ -4863,6 +5179,7 @@ segments: - [0xC599D0, "bin"] # rodata - name: world/area_kzn/kzn_01/ type: code + overlay: True start: 0xC599D0 vram: 0x80240000 files: @@ -4871,6 +5188,7 @@ segments: - [0xC5A730, "bin"] # rodata - name: world/area_kzn/kzn_02/ type: code + overlay: True start: 0xC5A740 vram: 0x80240000 files: @@ -4887,6 +5205,7 @@ segments: - [0xC60D10, "bin"] # rodata - name: world/area_kzn/kzn_03/ type: code + overlay: True start: 0xC60D10 vram: 0x80240000 files: @@ -4903,6 +5222,7 @@ segments: - [0xC68130, "bin"] # rodata - name: world/area_kzn/kzn_04/ type: code + overlay: True start: 0xC68130 vram: 0x80240000 files: @@ -4916,6 +5236,7 @@ segments: - [0xC6C0D0, "bin"] # rodata - name: world/area_kzn/kzn_05/ type: code + overlay: True start: 0xC6C0D0 vram: 0x80240000 files: @@ -4924,6 +5245,7 @@ segments: - [0xC6C910, "bin"] # rodata - name: world/area_kzn/kzn_06/ type: code + overlay: True start: 0xC6C920 vram: 0x80240000 files: @@ -4936,6 +5258,7 @@ segments: - [0xC6E330, "bin"] # rodata - name: world/area_kzn/kzn_07/ type: code + overlay: True start: 0xC6E330 vram: 0x80240000 files: @@ -4950,6 +5273,7 @@ segments: - [0xC71480, "bin"] # rodata - name: world/area_kzn/kzn_08/ type: code + overlay: True start: 0xC71480 vram: 0x80240000 files: @@ -4963,6 +5287,7 @@ segments: - [0xC76B18, "bin"] # rodata - name: world/area_kzn/kzn_09/ type: code + overlay: True start: 0xC76CE0 vram: 0x80240000 files: @@ -4976,6 +5301,7 @@ segments: - [0xC7E180, "bin"] # rodata - name: world/area_kzn/kzn_10/ type: code + overlay: True start: 0xC7E180 vram: 0x80240000 files: @@ -4987,6 +5313,7 @@ segments: - [0xC801A0, "bin"] # rodata - name: world/area_kzn/kzn_11/ type: code + overlay: True start: 0xC801A0 vram: 0x80240000 files: @@ -5001,6 +5328,7 @@ segments: - [0xC85AB0, "bin"] # rodata - name: world/area_kzn/kzn_17/ type: code + overlay: True start: 0xC85AB0 vram: 0x80240000 files: @@ -5013,6 +5341,7 @@ segments: - [0xC8C080, "bin"] # rodata - name: world/area_kzn/kzn_18/ type: code + overlay: True start: 0xC8C0A0 vram: 0x80240000 files: @@ -5023,6 +5352,7 @@ segments: - [0xC8DBA0, "bin"] # rodata - name: world/area_kzn/kzn_19/ type: code + overlay: True start: 0xC8DBB0 vram: 0x80240000 files: @@ -5038,6 +5368,7 @@ segments: - [0xC95F30, "bin"] # rodata - name: world/area_kzn/kzn_20/ type: code + overlay: True start: 0xC95F30 vram: 0x80240000 files: @@ -5048,6 +5379,7 @@ segments: - [0xC9A1F0, "bin"] # rodata - name: world/area_kzn/kzn_22/ type: code + overlay: True start: 0xC9A200 vram: 0x80240000 files: @@ -5059,6 +5391,7 @@ segments: - [0xC9C2F0, "bin"] # rodata - name: world/area_kzn/kzn_23/ type: code + overlay: True start: 0xC9C300 vram: 0x80240000 files: @@ -5070,6 +5403,7 @@ segments: - [0xC9DF10, "bin"] # rodata - name: world/area_flo/flo_00/ type: code + overlay: True start: 0xC9DF20 vram: 0x80240000 files: @@ -5086,6 +5420,7 @@ segments: - [0xCA7290, "bin"] # rodata - name: world/area_flo/flo_03/ type: code + overlay: True start: 0xCA72A0 vram: 0x80240000 files: @@ -5097,6 +5432,7 @@ segments: - [0xCAC1D0, "bin"] # rodata - name: world/area_flo/flo_07/ type: code + overlay: True start: 0xCAC1F0 vram: 0x80240000 files: @@ -5109,6 +5445,7 @@ segments: - [0xCAED40, "bin"] # rodata - name: world/area_flo/flo_08/ type: code + overlay: True start: 0xCAED40 vram: 0x80240000 files: @@ -5123,6 +5460,7 @@ segments: - [0xCB4E60, "bin"] # rodata - name: world/area_flo/flo_09/ type: code + overlay: True start: 0xCB5000 vram: 0x80240000 files: @@ -5137,6 +5475,7 @@ segments: - [0xCB9200, "bin"] # rodata - name: world/area_flo/flo_10/ type: code + overlay: True start: 0xCB9200 vram: 0x80240000 files: @@ -5156,6 +5495,7 @@ segments: - [0xCBDCD0, "bin"] # rodata - name: world/area_flo/flo_11/ type: code + overlay: True start: 0xCBDCD0 vram: 0x80240000 files: @@ -5167,6 +5507,7 @@ segments: - [0xCC0E30, "bin"] # rodata - name: world/area_flo/flo_12/ type: code + overlay: True start: 0xCC0E30 vram: 0x80240000 files: @@ -5178,6 +5519,7 @@ segments: - [0xCC3800, "bin"] # rodata - name: world/area_flo/flo_13/ type: code + overlay: True start: 0xCC3810 vram: 0x80240000 files: @@ -5192,6 +5534,7 @@ segments: - [0xCCB2F8, "bin"] # rodata - name: world/area_flo/flo_14/ type: code + overlay: True start: 0xCCB310 vram: 0x80240000 files: @@ -5207,6 +5550,7 @@ segments: - [0xCD06C0, "bin"] # rodata - name: world/area_flo/flo_15/ type: code + overlay: True start: 0xCD06C0 vram: 0x80240000 files: @@ -5218,6 +5562,7 @@ segments: - [0xCD1E20, "bin"] # rodata - name: world/area_flo/flo_16/ type: code + overlay: True start: 0xCD1E30 vram: 0x80240000 files: @@ -5235,6 +5580,7 @@ segments: - [0xCD72E0, "bin"] # rodata - name: world/area_flo/flo_17/ type: code + overlay: True start: 0xCD72E0 vram: 0x80240000 files: @@ -5249,6 +5595,7 @@ segments: - [0xCDC698, "bin"] # rodata - name: world/area_flo/flo_18/ type: code + overlay: True start: 0xCDC6A0 vram: 0x80240000 files: @@ -5262,6 +5609,7 @@ segments: - [0xCE36E0, "bin"] # rodata - name: world/area_flo/flo_19/ type: code + overlay: True start: 0xCE36F0 vram: 0x80240000 files: @@ -5274,6 +5622,7 @@ segments: - [0xCE66F0, "bin"] # rodata - name: world/area_flo/flo_21/ type: code + overlay: True start: 0xCE6700 vram: 0x80240000 files: @@ -5285,6 +5634,7 @@ segments: - [0xCEC240, "bin"] # rodata - name: world/area_flo/flo_22/ type: code + overlay: True start: 0xCEC240 vram: 0x80240000 files: @@ -5299,6 +5649,7 @@ segments: - [0xCEE260, "bin"] # rodata - name: world/area_flo/flo_23/ type: code + overlay: True start: 0xCEE260 vram: 0x80240000 files: @@ -5311,6 +5662,7 @@ segments: - [0xCF0940, "bin"] # rodata - name: world/area_flo/flo_24/ type: code + overlay: True start: 0xCF0940 vram: 0x80240000 files: @@ -5324,6 +5676,7 @@ segments: - [0xCF2BD0, "bin"] # rodata - name: world/area_flo/flo_25/ type: code + overlay: True start: 0xCF2BD0 vram: 0x80240000 files: @@ -5340,6 +5693,7 @@ segments: - [0xCF7B70, "bin"] # rodata - name: world/area_sam/sam_01/ type: code + overlay: True start: 0xCF7B70 vram: 0x80240000 files: @@ -5353,6 +5707,7 @@ segments: - [0xD05730, "bin"] # rodata - name: world/area_sam/sam_02/ type: code + overlay: True start: 0xD05730 vram: 0x80240000 files: @@ -5368,6 +5723,7 @@ segments: - [0xD110C0, "bin"] # rodata - name: world/area_sam/sam_03/ type: code + overlay: True start: 0xD110C0 vram: 0x80240000 files: @@ -5379,6 +5735,7 @@ segments: - [0xD135D0, "bin"] # rodata - name: world/area_sam/sam_04/ type: code + overlay: True start: 0xD135D0 vram: 0x80240000 files: @@ -5394,6 +5751,7 @@ segments: - [0xD187E0, "bin"] # rodata - name: world/area_sam/sam_05/ type: code + overlay: True start: 0xD187E0 vram: 0x80240000 files: @@ -5407,6 +5765,7 @@ segments: - [0xD1FE90, "bin"] # rodata - name: world/area_sam/sam_06/ type: code + overlay: True start: 0xD1FE90 vram: 0x80240000 files: @@ -5421,6 +5780,7 @@ segments: - [0xD2BD30, "bin"] # rodata - name: world/area_sam/sam_07/ type: code + overlay: True start: 0xD2BD30 vram: 0x80240000 files: @@ -5434,6 +5794,7 @@ segments: - [0xD2FC80, "bin"] # rodata - name: world/area_sam/sam_08/ type: code + overlay: True start: 0xD2FC80 vram: 0x80240000 files: @@ -5447,6 +5808,7 @@ segments: - [0xD362F0, "bin"] # rodata - name: world/area_sam/sam_09/ type: code + overlay: True start: 0xD362F0 vram: 0x80240000 files: @@ -5457,6 +5819,7 @@ segments: - [0xD377F0, "bin"] # rodata - name: world/area_sam/sam_10/ type: code + overlay: True start: 0xD37800 vram: 0x80240000 files: @@ -5470,6 +5833,7 @@ segments: - [0xD3A5D0, "bin"] # rodata - name: world/area_sam/sam_11/ type: code + overlay: True start: 0xD3A5D0 vram: 0x80240000 files: @@ -5488,6 +5852,7 @@ segments: - [0xD4BA20, "bin"] # rodata - name: world/area_sam/sam_12/ type: code + overlay: True start: 0xD4BA20 vram: 0x80240000 files: @@ -5502,6 +5867,7 @@ segments: - [0xD4D040, "bin"] # rodata - name: world/area_pra/pra_01/ type: code + overlay: True start: 0xD4D040 vram: 0x80240000 files: @@ -5515,6 +5881,7 @@ segments: - [0xD4FFF0, "bin"] # rodata - name: world/area_pra/pra_02/ type: code + overlay: True start: 0xD4FFF0 vram: 0x80240000 files: @@ -5528,6 +5895,7 @@ segments: - [0xD53CB0, "bin"] # rodata - name: world/area_pra/pra_03/ type: code + overlay: True start: 0xD53CB0 vram: 0x80240000 files: @@ -5540,6 +5908,7 @@ segments: - [0xD54690, "bin"] # rodata - name: world/area_pra/pra_04/ type: code + overlay: True start: 0xD54690 vram: 0x80240000 files: @@ -5554,6 +5923,7 @@ segments: - [0xD55B60, "bin"] # rodata - name: world/area_pra/pra_05/ type: code + overlay: True start: 0xD55BB0 vram: 0x80240000 files: @@ -5565,6 +5935,7 @@ segments: - [0xD57430, "bin"] # rodata - name: world/area_pra/pra_06/ type: code + overlay: True start: 0xD57430 vram: 0x80240000 files: @@ -5575,6 +5946,7 @@ segments: - [0xD58890, "bin"] # rodata - name: world/area_pra/pra_09/ type: code + overlay: True start: 0xD58890 vram: 0x80240000 files: @@ -5585,6 +5957,7 @@ segments: - [0xD5F2A0, "bin"] # rodata - name: world/area_pra/pra_10/ type: code + overlay: True start: 0xD5F2B0 vram: 0x80240000 files: @@ -5595,6 +5968,7 @@ segments: - [0xD614A0, "bin"] # rodata - name: world/area_pra/pra_11/ type: code + overlay: True start: 0xD61500 vram: 0x80240000 files: @@ -5607,6 +5981,7 @@ segments: - [0xD62D10, "bin"] # rodata - name: world/area_pra/pra_12/ type: code + overlay: True start: 0xD62D10 vram: 0x80240000 files: @@ -5617,6 +5992,7 @@ segments: - [0xD645E0, "bin"] # rodata - name: world/area_pra/pra_13/ type: code + overlay: True start: 0xD645E0 vram: 0x80240000 files: @@ -5628,6 +6004,7 @@ segments: - [0xD67CF0, "bin"] # rodata - name: world/area_pra/pra_14/ type: code + overlay: True start: 0xD67D00 vram: 0x80240000 files: @@ -5640,6 +6017,7 @@ segments: - [0xD69810, "bin"] # rodata - name: world/area_pra/pra_15/ type: code + overlay: True start: 0xD69810 vram: 0x80240000 files: @@ -5652,6 +6030,7 @@ segments: - [0xD69B20, "bin"] # rodata - name: world/area_pra/pra_16/ type: code + overlay: True start: 0xD69B20 vram: 0x80240000 files: @@ -5662,6 +6041,7 @@ segments: - [0xD6B610, "bin"] # rodata - name: world/area_pra/pra_18/ type: code + overlay: True start: 0xD6B620 vram: 0x80240000 files: @@ -5673,6 +6053,7 @@ segments: - [0xD6E9A0, "bin"] # rodata - name: world/area_pra/pra_19/ type: code + overlay: True start: 0xD6E9B0 vram: 0x80240000 files: @@ -5684,6 +6065,7 @@ segments: - [0xD76390, "bin"] # rodata - name: world/area_pra/pra_20/ type: code + overlay: True start: 0xD763A0 vram: 0x80240000 files: @@ -5694,6 +6076,7 @@ segments: - [0xD77F00, "bin"] # rodata - name: world/area_pra/pra_21/ type: code + overlay: True start: 0xD77F20 vram: 0x80240000 files: @@ -5705,6 +6088,7 @@ segments: - [0xD78870, "bin"] # rodata - name: world/area_pra/pra_22/ type: code + overlay: True start: 0xD78880 vram: 0x80240000 files: @@ -5716,6 +6100,7 @@ segments: - [0xD799E0, "bin"] # rodata - name: world/area_pra/pra_27/ type: code + overlay: True start: 0xD799F0 vram: 0x80240000 files: @@ -5727,6 +6112,7 @@ segments: - [0xD7B2A0, "bin"] # rodata - name: world/area_pra/pra_28/ type: code + overlay: True start: 0xD7B2A0 vram: 0x80240000 files: @@ -5738,6 +6124,7 @@ segments: - [0xD7CB50, "bin"] # rodata - name: world/area_pra/pra_29/ type: code + overlay: True start: 0xD7CB50 vram: 0x80240000 files: @@ -5749,6 +6136,7 @@ segments: - [0xD7ED50, "bin"] # rodata - name: world/area_pra/pra_31/ type: code + overlay: True start: 0xD7ED60 vram: 0x80240000 files: @@ -5763,6 +6151,7 @@ segments: - [0xD86A00, "bin"] # rodata - name: world/area_pra/pra_32/ type: code + overlay: True start: 0xD86A00 vram: 0x80240000 files: @@ -5774,6 +6163,7 @@ segments: - [0xD896E0, "bin"] # rodata - name: world/area_pra/pra_33/ type: code + overlay: True start: 0xD896E0 vram: 0x80240000 files: @@ -5785,6 +6175,7 @@ segments: - [0xD8B3A0, "bin"] # rodata - name: world/area_pra/pra_34/ type: code + overlay: True start: 0xD8B3B0 vram: 0x80240000 files: @@ -5796,6 +6187,7 @@ segments: - [0xD8D240, "bin"] # rodata - name: world/area_pra/pra_35/ type: code + overlay: True start: 0xD8D250 vram: 0x80240000 files: @@ -5810,6 +6202,7 @@ segments: - [0xD91700, "bin"] # rodata - name: world/area_pra/pra_36/ type: code + overlay: True start: 0xD91700 vram: 0x80240000 files: @@ -5820,6 +6213,7 @@ segments: - [0xD92F40, "bin"] # rodata - name: world/area_pra/pra_37/ type: code + overlay: True start: 0xD92F40 vram: 0x80240000 files: @@ -5831,6 +6225,7 @@ segments: - [0xD955F0, "bin"] # rodata - name: world/area_pra/pra_38/ type: code + overlay: True start: 0xD955F0 vram: 0x80240000 files: @@ -5841,6 +6236,7 @@ segments: - [0xD97840, "bin"] # rodata - name: world/area_pra/pra_39/ type: code + overlay: True start: 0xD97890 vram: 0x80240000 files: @@ -5851,6 +6247,7 @@ segments: - [0xD99960, "bin"] # rodata - name: world/area_pra/pra_40/ type: code + overlay: True start: 0xD999B0 vram: 0x80240000 files: @@ -5862,6 +6259,7 @@ segments: - [0xD9AEE0, "bin"] # rodata - name: world/area_omo/omo_01/ type: code + overlay: True start: 0xD9AEF0 vram: 0x80240000 files: @@ -5876,6 +6274,7 @@ segments: - [0xD9D4D0, "bin"] # rodata - name: world/area_omo/omo_02/ type: code + overlay: True start: 0xD9D4D0 vram: 0x80240000 files: @@ -5890,6 +6289,7 @@ segments: - [0xDA4D30, "bin"] # rodata - name: world/area_omo/omo_03/ type: code + overlay: True start: 0xDA5240 vram: 0x80240000 files: @@ -5901,6 +6301,7 @@ segments: - [0xDAD3B0, "bin"] # rodata - name: world/area_omo/omo_04/ type: code + overlay: True start: 0xDAD400 vram: 0x80240000 files: @@ -5915,6 +6316,7 @@ segments: - [0xDB22C0, "bin"] # rodata - name: world/area_omo/omo_05/ type: code + overlay: True start: 0xDB22C0 vram: 0x80240000 files: @@ -5927,6 +6329,7 @@ segments: - [0xDB7908, "bin"] # rodata - name: world/area_omo/omo_06/ type: code + overlay: True start: 0xDB7910 vram: 0x80240000 files: @@ -5940,6 +6343,7 @@ segments: - [0xDBD2B0, "bin"] # rodata - name: world/area_omo/omo_07/ type: code + overlay: True start: 0xDBD2B0 vram: 0x80240000 files: @@ -5958,6 +6362,7 @@ segments: - [0xDC43D0, "bin"] # rodata - name: world/area_omo/omo_08/ type: code + overlay: True start: 0xDC43D0 vram: 0x80240000 files: @@ -5970,6 +6375,7 @@ segments: - [0xDCCB00, "bin"] # rodata - name: world/area_omo/omo_09/ type: code + overlay: True start: 0xDCCCD0 vram: 0x80240000 files: @@ -5992,6 +6398,7 @@ segments: - [0xDD79B0, "bin"] # rodata - name: world/area_omo/omo_10/ type: code + overlay: True start: 0xDD79B0 vram: 0x80240000 files: @@ -6004,6 +6411,7 @@ segments: - [0xDDC830, "bin"] # rodata - name: world/area_omo/omo_11/ type: code + overlay: True start: 0xDDC830 vram: 0x80240000 files: @@ -6015,6 +6423,7 @@ segments: - [0xDDF300, "bin"] # rodata - name: world/area_omo/omo_12/ type: code + overlay: True start: 0xDDF310 vram: 0x80240000 files: @@ -6026,6 +6435,7 @@ segments: - [0xDE2470, "bin"] # rodata - name: world/area_omo/omo_13/ type: code + overlay: True start: 0xDE2490 vram: 0x80240000 files: @@ -6039,6 +6449,7 @@ segments: - [0xDE5360, "bin"] # rodata - name: world/area_omo/omo_14/ type: code + overlay: True start: 0xDE56B0 vram: 0x80240000 files: @@ -6050,6 +6461,7 @@ segments: - [0xDE8760, "bin"] # rodata - name: world/area_omo/omo_15/ type: code + overlay: True start: 0xDE8770 vram: 0x80240000 files: @@ -6060,6 +6472,7 @@ segments: - [0xDEBED0, "bin"] # rodata - name: world/area_omo/omo_16/ type: code + overlay: True start: 0xDEBED0 vram: 0x80240000 files: @@ -6070,6 +6483,7 @@ segments: - [0xDEEE80, "bin"] # rodata - name: world/area_omo/omo_17/ type: code + overlay: True start: 0xDEEEA0 vram: 0x80240000 files: @@ -6086,6 +6500,7 @@ segments: - [0xDF6848, "bin"] # rodata - name: world/area_end/end_00/ type: code + overlay: True start: 0xDF6A00 vram: 0x80240000 files: @@ -6102,6 +6517,7 @@ segments: - [0xE05300, "bin"] # rodata - name: world/area_end/end_01/ type: code + overlay: True start: 0xE05360 vram: 0x80240000 files: @@ -6118,6 +6534,7 @@ segments: - [0xE0E740, "bin"] # rodata - name: world/area_mgm/mgm_00/ type: code + overlay: True start: 0xE0E7A0 vram: 0x80240000 files: @@ -6131,6 +6548,7 @@ segments: - [0xE12760, "bin"] # rodata - name: world/area_mgm/mgm_01/ type: code + overlay: True start: 0xE12760 vram: 0x80240000 files: @@ -6143,6 +6561,7 @@ segments: - [0xE15D80, "bin"] # rodata - name: world/area_mgm/mgm_02/ type: code + overlay: True start: 0xE15D80 vram: 0x80240000 files: @@ -6155,6 +6574,7 @@ segments: - [0xE1E380, "bin"] # rodata - name: world/area_mgm/mgm_03/ type: code + overlay: True start: 0xE1E380 vram: 0x80240000 files: @@ -6162,6 +6582,7 @@ segments: - [0xE1E460, "bin"] - name: world/area_gv/gv_01/ type: code + overlay: True start: 0xE1E460 vram: 0x80240000 files: @@ -6170,6 +6591,7 @@ segments: - [0xE20110, "bin"] - name: code type: code + overlay: True start: 0xE20EB0 vram: 0x802B7000 files: @@ -6177,6 +6599,7 @@ segments: - [0xE215C0, "bin"] - name: code type: code + overlay: True start: 0xE21870 vram: 0x802B7000 files: